From 4575f61cc8d8919571a72c9023b7cd584c81cba1 Mon Sep 17 00:00:00 2001 From: Piotr Warszawski Date: Fri, 4 Sep 2026 15:52:38 +0200 Subject: [PATCH 001/430] whois: add lookahead mode for the timetable entry after the next stop Dispatcher scripts that route trains at a station based on where they go afterwards (e.g. a big terminal throat with several outbound directions) have no way to read that: whois +40 only exposes the current/next timetable entry (NextStop()/IsStop()), which while the train is at that very station is that station itself. Adds flags::whois_ahead (bit 6, previously unused) plus TTrainParameters::StationNameAhead(Offset)/StationIsStopAhead(Offset), returning the raw TimeTable[] entry Offset positions past StationIndex (name and whether it's a booked stop, "none"/false past the end of the timetable). The new whois branch calls both with Offset=1, mirroring the existing +40 branch's UpdateValues()/WriteLog() shape. Logic-verified with an isolated harness mirroring the touched types (TTrainParameters/TController/TMemCell shapes and the exact function bodies); not yet build-tested against the full engine locally - relying on CI for that. --- world/Event.cpp | 31 ++++++++++++++++++++++++++++++- world/Event.h | 1 + world/mtable.cpp | 16 ++++++++++++++++ world/mtable.h | 4 ++++ 4 files changed, 51 insertions(+), 1 deletion(-) diff --git a/world/Event.cpp b/world/Event.cpp index eb679e720..e47dbea23 100644 --- a/world/Event.cpp +++ b/world/Event.cpp @@ -1018,13 +1018,42 @@ whois_event::run_() { auto *targetcell { static_cast( std::get( target ) ) }; if( targetcell == nullptr ) { continue; } // event effect code + // +64: station after the next one, unused, stop there or passthrough // +40: next station name, unused, stop at next station (duplicate of +0 2nd numeric value) // +32: vehicle name // +24: vehicle type, consist brake level, obstacle distance // +16: load type, load amount, max load amount // +8: destination, direction, engine power // +0: train name, station count, stop on next station - if( m_input.flags & flags::whois_name ) { + if( m_input.flags & flags::whois_ahead ) { + // +64 + // the timetable entry one past the next stop, and whether the train stops there + auto const *owner { ( + m_activator->Mechanik != nullptr && m_activator->Mechanik->primary() ? + m_activator->Mechanik : + m_activator->ctOwner ) }; + auto const aheadname { ( + owner != nullptr ? + owner->TrainTimetable().StationNameAhead( 1 ) : + "none" ) }; + auto const aheadstop { ( + owner != nullptr && owner->TrainTimetable().StationIsStopAhead( 1 ) ? + 1 : + 0 ) }; + + targetcell->UpdateValues( + aheadname, // station after the next one + 0, // unused + aheadstop, // stop there or passthrough + m_input.flags & ( flags::text | flags::value1 | flags::value2 ) ); + + WriteLog( + "Type: WhoIs (" + std::to_string( m_input.flags ) + ") - " + + "[station after next: " + aheadname + "], " + + "[X], " + + "[stop there: " + ( aheadstop != 0 ? "yes" : "no" ) + "]" ); + } + else if( m_input.flags & flags::whois_name ) { // +32 or +40 // next station name if( m_input.flags & flags::mode_alt ) { diff --git a/world/Event.h b/world/Event.h index 52ee3468d..55be65de1 100644 --- a/world/Event.h +++ b/world/Event.h @@ -37,6 +37,7 @@ public: mode_alt = 1 << 3, whois_load = 1 << 4, whois_name = 1 << 5, + whois_ahead = 1 << 6, // condition values track_busy = 1 << 3, track_free = 1 << 4, diff --git a/world/mtable.cpp b/world/mtable.cpp index cec54f870..75e6c8ad0 100644 --- a/world/mtable.cpp +++ b/world/mtable.cpp @@ -77,6 +77,22 @@ bool TTrainParameters::IsLastStop() const { return StationIndex >= StationCount; } +std::string TTrainParameters::StationNameAhead( int Offset ) const +{ // nazwa wpisu rozkladu Offset pozycji za aktualnym (bez pomijania przelotow) + int const idx { StationIndex + Offset }; + if( ( idx < 1 ) || ( idx > StationCount ) ) + return "none"; + return TimeTable[idx].StationName; +} + +bool TTrainParameters::StationIsStopAhead( int Offset ) const +{ // czy wpis Offset pozycji za aktualnym to zaplanowany postoj + int const idx { StationIndex + Offset }; + if( ( idx < 1 ) || ( idx > StationCount ) ) + return false; + return TimeTable[idx].Ah >= 0; //-1 to brak postoju +} + bool TTrainParameters::IsMaintenance() const { if( StationIndex <= StationCount ) diff --git a/world/mtable.h b/world/mtable.h index c58d120ff..701b0c6ca 100644 --- a/world/mtable.h +++ b/world/mtable.h @@ -70,6 +70,10 @@ class TTrainParameters std::string ShowRelation() const; double WatchMTable(double DistCounter); std::string NextStop() const; + // nazwa wpisu rozkladu Offset pozycji za StationIndex (Offset>=1); "none" poza koncem rozkladu + std::string StationNameAhead( int Offset ) const; + // true, gdy ten wpis to zaplanowany postoj (ma godzine przyjazdu), false dla przelotu / poza koncem + bool StationIsStopAhead( int Offset ) const; sound_source next_stop_sound() const; sound_source last_stop_sound() const; bool IsStop() const; From 5705062cd29826b9bb1386eb2ccfa5be258a3204 Mon Sep 17 00:00:00 2001 From: Piotr Warszawski Date: Fri, 4 Sep 2026 20:28:28 +0200 Subject: [PATCH 002/430] whois: select the lookahead mode via +48 instead of a new bit Per review: +48 (whois_name | whois_load, mode_alt clear) was an unused combination of the existing mode bits - use that instead of claiming a new bit 6. +56 (same, with mode_alt set) stays free for a future mode. No new flags::* entry needed; mtable.h/.cpp unchanged. --- world/Event.cpp | 8 +++++--- world/Event.h | 1 - 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/world/Event.cpp b/world/Event.cpp index e47dbea23..ebfc73958 100644 --- a/world/Event.cpp +++ b/world/Event.cpp @@ -1018,15 +1018,17 @@ whois_event::run_() { auto *targetcell { static_cast( std::get( target ) ) }; if( targetcell == nullptr ) { continue; } // event effect code - // +64: station after the next one, unused, stop there or passthrough + // +48: station after the next one, unused, stop there or passthrough // +40: next station name, unused, stop at next station (duplicate of +0 2nd numeric value) // +32: vehicle name // +24: vehicle type, consist brake level, obstacle distance // +16: load type, load amount, max load amount // +8: destination, direction, engine power // +0: train name, station count, stop on next station - if( m_input.flags & flags::whois_ahead ) { - // +64 + if( ( m_input.flags & ( flags::whois_name | flags::whois_load | flags::mode_alt ) ) + == ( flags::whois_name | flags::whois_load ) ) { + // +48 (the whois_name | whois_load combination was unused; +56, same with mode_alt + // set, stays free for a future mode) // the timetable entry one past the next stop, and whether the train stops there auto const *owner { ( m_activator->Mechanik != nullptr && m_activator->Mechanik->primary() ? diff --git a/world/Event.h b/world/Event.h index 55be65de1..52ee3468d 100644 --- a/world/Event.h +++ b/world/Event.h @@ -37,7 +37,6 @@ public: mode_alt = 1 << 3, whois_load = 1 << 4, whois_name = 1 << 5, - whois_ahead = 1 << 6, // condition values track_busy = 1 << 3, track_free = 1 << 4, From 93463a3850e50f8818d12c042a6ef7e3639b84f3 Mon Sep 17 00:00:00 2001 From: Piotr Warszawski Date: Fri, 4 Sep 2026 21:24:01 +0200 Subject: [PATCH 003/430] whois: consolidate the two lookahead accessors into one Per review: StationNameAhead()/StationIsStopAhead() duplicated the same bounds check for no reason. Replaced with a single TimeTableEntryAhead(Offset) returning the TMTableLine itself; the whois branch reads .StationName/.Ah off it directly. --- world/Event.cpp | 12 +++++------- world/mtable.cpp | 17 +++++------------ world/mtable.h | 7 +++---- 3 files changed, 13 insertions(+), 23 deletions(-) diff --git a/world/Event.cpp b/world/Event.cpp index ebfc73958..319ad0591 100644 --- a/world/Event.cpp +++ b/world/Event.cpp @@ -1034,14 +1034,12 @@ whois_event::run_() { m_activator->Mechanik != nullptr && m_activator->Mechanik->primary() ? m_activator->Mechanik : m_activator->ctOwner ) }; - auto const aheadname { ( + auto const *entry { ( owner != nullptr ? - owner->TrainTimetable().StationNameAhead( 1 ) : - "none" ) }; - auto const aheadstop { ( - owner != nullptr && owner->TrainTimetable().StationIsStopAhead( 1 ) ? - 1 : - 0 ) }; + &owner->TrainTimetable().TimeTableEntryAhead( 1 ) : + nullptr ) }; + auto const aheadname { ( entry != nullptr ? entry->StationName : "none" ) }; + auto const aheadstop { ( entry != nullptr && entry->Ah >= 0 ? 1 : 0 ) }; targetcell->UpdateValues( aheadname, // station after the next one diff --git a/world/mtable.cpp b/world/mtable.cpp index 75e6c8ad0..dd84b6c23 100644 --- a/world/mtable.cpp +++ b/world/mtable.cpp @@ -77,20 +77,13 @@ bool TTrainParameters::IsLastStop() const { return StationIndex >= StationCount; } -std::string TTrainParameters::StationNameAhead( int Offset ) const -{ // nazwa wpisu rozkladu Offset pozycji za aktualnym (bez pomijania przelotow) +TMTableLine const &TTrainParameters::TimeTableEntryAhead( int Offset ) const +{ // wpis rozkladu Offset pozycji za aktualnym (bez pomijania przelotow); + // poza zakresem 1..StationCount zwraca techniczny wpis zerowy int const idx { StationIndex + Offset }; if( ( idx < 1 ) || ( idx > StationCount ) ) - return "none"; - return TimeTable[idx].StationName; -} - -bool TTrainParameters::StationIsStopAhead( int Offset ) const -{ // czy wpis Offset pozycji za aktualnym to zaplanowany postoj - int const idx { StationIndex + Offset }; - if( ( idx < 1 ) || ( idx > StationCount ) ) - return false; - return TimeTable[idx].Ah >= 0; //-1 to brak postoju + return TimeTable[0]; + return TimeTable[idx]; } diff --git a/world/mtable.h b/world/mtable.h index 701b0c6ca..2d20a27bb 100644 --- a/world/mtable.h +++ b/world/mtable.h @@ -70,10 +70,9 @@ class TTrainParameters std::string ShowRelation() const; double WatchMTable(double DistCounter); std::string NextStop() const; - // nazwa wpisu rozkladu Offset pozycji za StationIndex (Offset>=1); "none" poza koncem rozkladu - std::string StationNameAhead( int Offset ) const; - // true, gdy ten wpis to zaplanowany postoj (ma godzine przyjazdu), false dla przelotu / poza koncem - bool StationIsStopAhead( int Offset ) const; + // wpis rozkladu Offset pozycji za StationIndex (Offset>=1); poza zakresem 1..StationCount + // zwraca techniczny wpis zerowy (TimeTable[0], StationName=="nowhere", Ah==-1) + TMTableLine const &TimeTableEntryAhead( int Offset ) const; sound_source next_stop_sound() const; sound_source last_stop_sound() const; bool IsStop() const; From 95f41f069f9f918c517410f9ed865d8178da0cf2 Mon Sep 17 00:00:00 2001 From: pawelw Date: Wed, 23 Sep 2026 01:02:11 +0200 Subject: [PATCH 004/430] Speed table: keep it sorted and keep the signal indices valid (#178) * Fix the speed table index remap in TablePurger() TablePurger() rebuilds the speed table and has to move SemNextIndex and SemNextStopIndex along with it. Two cases came out wrong. A trimmed point was never invalidated: the index was first overwritten with the position the next kept point would take, and the guard that should reset it to -1 compared the loop counter against that new value, so it only matched when nothing had been trimmed before it. The index then pointed at an unrelated record, and if that record happens to sit at zero velocity the placement can no longer be updated either, because the update requires the recorded one to be non-zero. An index pointing at the last entry was left untouched, because the loop stops one short of it and that entry is appended afterwards. The stale value ended up past the end of the trimmed table, which is what the provisory check in TableTraceRoute() catches. The placements are now recorded separately and assigned once the new table is complete, with the always-kept last entry handled too. The trim condition is shared by the counting and the copying pass instead of being spelled out twice. TableCheck() drops entries beyond a switch that changed under the scan without adjusting the placements either, so they are invalidated there as well. The check in TableTraceRoute() stays as a safety net, without the TODO. * Sort the whole speed table in TableSort() TableSort() made a single bubble pass over the table. That only moves an entry one place towards the front, but TableTraceRoute() adds the scanned events of a track before the track itself, so a track carrying k scanned events lands k places too far and needs k passes. With two or more events in one slot - a cab signal resonator next to a signal, a signal and a W4 - the track entry stays behind entries that are farther away, and TableUpdate() walks the table out of distance order until enough later scans have shifted it back. The range before the last slot is now sorted with std::stable_sort, and the semaphor placements are moved along by looking their events up again. --------- Co-authored-by: pwarszawski --- vehicle/Driver.cpp | 114 ++++++++++++++++++++++++++------------------- 1 file changed, 67 insertions(+), 47 deletions(-) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 43f2f924c..9a6de8596 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -540,8 +540,7 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) } else { if( iTableDirection == 0 ) { return; } - // NOTE: provisory fix for BUG: sempahor indices no longer matching table size - // TODO: find and really fix the reason it happens + // NOTE: belt and braces; TablePurger() used to leave these pointing past the end of the table if( SemNextIndex != -1 && SemNextIndex >= sSpeedTable.size() ) { SemNextIndex = -1; @@ -800,6 +799,15 @@ void TController::TableCheck(double fDistance) sSpeedTable.pop_back(); --iLast; } + // a semaphor recorded beyond the switch went away with the discarded entries + if( SemNextIndex != -1 + && SemNextIndex >= sSpeedTable.size() ) { + SemNextIndex = -1; + } + if( SemNextStopIndex != -1 + && SemNextStopIndex >= sSpeedTable.size() ) { + SemNextStopIndex = -1; + } tLast = sSpeedTable[ i ].trTrack; TableTraceRoute( fDistance, pVehicles[ end::rear ] ); TableSort(); @@ -1739,14 +1747,16 @@ void TController::TablePurger() return; } // simplest approach should be good enough for start -- just copy whatever is still relevant, then swap + auto const isexpendable = []( TSpeedPos const &Speedpoint ) { + return + 0 == ( Speedpoint.iFlags & spEnabled ) + || ( ( Speedpoint.iFlags & ( spElapsed | spTrack | spCurve | spSwitch ) ) == ( spElapsed | spTrack | spCurve ) + && Speedpoint.fVelNext < 0.0 ); }; // do a trial run first, to see if we need to bother at all std::size_t trimcount{ 0 }; for( std::size_t idx = 0; idx < sSpeedTable.size() - 1; ++idx ) { - auto const &speedpoint = sSpeedTable[ idx ]; - if( 0 == (speedpoint.iFlags & spEnabled) - || ( (speedpoint.iFlags & (spElapsed | spTrack | spCurve | spSwitch)) == (spElapsed | spTrack | spCurve) - && speedpoint.fVelNext < 0.0 ) ) { - // NOTE: we could break out early here, but running through entire thing gives us exact size needed for new table + // NOTE: we could break out early here, but running through entire thing gives us exact size needed for new table + if( isexpendable( sSpeedTable[ idx ] ) ) { ++trimcount; } } @@ -1755,34 +1765,34 @@ void TController::TablePurger() return; } std::vector trimmedtable; trimmedtable.reserve( sSpeedTable.size() - trimcount ); - // we can only update pointers safely after new table is finalized, so record their indices until then + // the indices are only valid for the old table, so the new placements are recorded separately + // and assigned once the new table is complete + auto semnextindex { std::size_t( -1 ) }; + auto semnextstopindex { std::size_t( -1 ) }; + auto const trackplacement = [&]( std::size_t const Index, bool const Kept ) { + // a trimmed point leaves the index invalid, a kept one lands where the new table ends + if( Index == SemNextIndex ) { + semnextindex = ( Kept ? trimmedtable.size() : std::size_t( -1 ) ); + } + if( Index == SemNextStopIndex ) { + semnextstopindex = ( Kept ? trimmedtable.size() : std::size_t( -1 ) ); + } }; + for( std::size_t idx = 0; idx < sSpeedTable.size() - 1; ++idx ) { - // cache placement of semaphors in the new table, if we encounter them - if( idx == SemNextIndex ) { - SemNextIndex = trimmedtable.size(); - } - if( idx == SemNextStopIndex ) { - SemNextStopIndex = trimmedtable.size(); - } auto const &speedpoint = sSpeedTable[ idx ]; - if( 0 == (speedpoint.iFlags & spEnabled) - || ( (speedpoint.iFlags & (spElapsed | spTrack | spCurve | spSwitch)) == (spElapsed | spTrack | spCurve) - && speedpoint.fVelNext < 0.0 ) ) { - // if the trimmed point happens to be currently active semaphor we need to invalidate their placements - if( idx == SemNextIndex ) { - SemNextIndex = -1; - } - if( idx == SemNextStopIndex ) { - SemNextStopIndex = -1; - } - continue; - } + auto const kept { false == isexpendable( speedpoint ) }; + trackplacement( idx, kept ); + if( false == kept ) { continue; } // we're left with useful speed point record we should copy trimmedtable.emplace_back( speedpoint ); } - // always copy the last entry + // always copy the last entry; an index pointing at it has to follow it as well + trackplacement( sSpeedTable.size() - 1, true ); trimmedtable.emplace_back( sSpeedTable.back() ); + SemNextIndex = semnextindex; + SemNextStopIndex = semnextstopindex; + if( Global.iWriteLogEnabled & 8 ) { WriteLog( "Speed table garbage collection for " + OwnerName() + " cut away " + std::to_string( trimcount ) + ( trimcount == 1 ? " record" : " records" ) ); } @@ -1797,25 +1807,35 @@ void TController::TableSort() { // we skip last slot and no point in checking if there's only one other entry return; } - TSpeedPos sp_temp = TSpeedPos(); // uzywany do przenoszenia - for( int i = 0; i < iLast - 1; ++i ) { - // pętla tylko do dwóch pozycji od końca bo ostatniej nie modyfikujemy - if (sSpeedTable[i].fDist > sSpeedTable[i + 1].fDist) - { // jesli pozycja wcześniejsza jest dalej to źle - sp_temp = sSpeedTable[i + 1]; - sSpeedTable[i + 1] = sSpeedTable[i]; // zamiana - sSpeedTable[i] = sp_temp; - // jeszcze sprawdzenie czy pozycja nie była indeksowana dla eventów - if (SemNextIndex == i) - ++SemNextIndex; - else if (SemNextIndex == i + 1) - --SemNextIndex; - if (SemNextStopIndex == i) - ++SemNextStopIndex; - else if (SemNextStopIndex == i + 1) - --SemNextStopIndex; - } - } + // the last slot holds the track the scan stopped at and stays where it is. + // a single bubble pass is not enough: TableTraceRoute() adds the events of a track before the + // track itself, so a track with k scanned events lands k places too far and needs k passes + auto const sortedcount { static_cast( iLast ) }; + auto const inrange = [&]( std::size_t const Index ) { + return Index < sortedcount; }; + // the placements point at semaphor entries; remember which ones, the sort moves them around + auto const *semnextevent { inrange( SemNextIndex ) ? sSpeedTable[ SemNextIndex ].evEvent : nullptr }; + auto const *semnextstopevent { inrange( SemNextStopIndex ) ? sSpeedTable[ SemNextStopIndex ].evEvent : nullptr }; + + std::stable_sort( + std::begin( sSpeedTable ), std::begin( sSpeedTable ) + sortedcount, + []( TSpeedPos const &Left, TSpeedPos const &Right ) { + return Left.fDist < Right.fDist; } ); + + auto const relocate = [&]( basic_event const *Event, std::size_t &Index ) { + if( Event == nullptr ) { return; } + auto const lookup { + std::find_if( + std::begin( sSpeedTable ), std::begin( sSpeedTable ) + sortedcount, + [Event]( TSpeedPos const &Point ) { + return Point.evEvent == Event; } ) }; + Index = ( + lookup != std::begin( sSpeedTable ) + sortedcount ? + static_cast( std::distance( std::begin( sSpeedTable ), lookup ) ) : + std::size_t( -1 ) ); + }; + relocate( semnextevent, SemNextIndex ); + relocate( semnextstopevent, SemNextStopIndex ); } //--------------------------------------------------------------------------- From b1bdd4217818ba82521015968ee18901a4a14cda Mon Sep 17 00:00:00 2001 From: maj00r <73280030+maj00r@users.noreply.github.com> Date: Wed, 23 Sep 2026 01:03:01 +0200 Subject: [PATCH 005/430] Forget a buffer's bindings when it is deleted (#182) The binding tracker kept the name of a deleted buffer. When gl handed that name to a new buffer, the tracker took it for already bound and skipped the bind, so a new vao was left without its index buffer and the nvidia driver read indices from a null pointer. --- gl/buffer.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gl/buffer.cpp b/gl/buffer.cpp index 8b8bd4869..b80cee3e9 100644 --- a/gl/buffer.cpp +++ b/gl/buffer.cpp @@ -58,6 +58,11 @@ gl::buffer::buffer() gl::buffer::~buffer() { + // forget the bindings of this buffer; gl can hand its name to a new buffer, + // which the tracker would then treat as already bound and skip the bind + for (auto &point : binding_points) + if (point == *this) + point = 0; glDeleteBuffers(1, *this); } From 8fbb48235033729d57366444dc5470285469de6a Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 27 Sep 2026 00:09:16 +0200 Subject: [PATCH 006/430] feat(materials): texture randomization for loads * feat(materials): texture randomization for loads --- .../renderer/source/materialparser.cpp | 8 + model/AnimModel.cpp | 4 + model/Model3d.cpp | 117 ++++++++++++ model/Model3d.h | 10 ++ model/material.cpp | 169 ++++++++++++------ model/material.h | 32 +++- rendering/opengl33renderer.cpp | 18 +- rendering/openglrenderer.cpp | 28 ++- utilities/utilities.cpp | 40 ++++- utilities/utilities.h | 8 + vehicle/DynObj.cpp | 4 + vehicle/DynObj.h | 4 + 12 files changed, 379 insertions(+), 63 deletions(-) diff --git a/betterRenderer/renderer/source/materialparser.cpp b/betterRenderer/renderer/source/materialparser.cpp index 20ef43221..0530916be 100644 --- a/betterRenderer/renderer/source/materialparser.cpp +++ b/betterRenderer/renderer/source/materialparser.cpp @@ -187,6 +187,14 @@ bool MaterialAdapterLegacyMatFile::ParseLevel(cParser& parser, int priority) { else if (key.compare(0, 7, "texture") == 0) { key.erase(0, 7); + // "textureN_variants:" declares a pool of textures picked per model instance. this renderer + // doesn't support per instance variants yet, so the pool is reduced to a single entry drawn + // when the material is loaded, which is how such texture used to be picked before variants + if (auto const variantmarker{key.find("_variants")}; + variantmarker != std::string::npos) { + key.erase(variantmarker, std::string("_variants").size()); + } + auto value{deserialize_random_set(parser)}; replace_slashes(value); auto& [tex_priority, texture] = m_texture_mapping[key]; diff --git a/model/AnimModel.cpp b/model/AnimModel.cpp index ef4f90a8a..bc2d6e844 100644 --- a/model/AnimModel.cpp +++ b/model/AnimModel.cpp @@ -627,6 +627,10 @@ void TAnimModel::RaPrepare() } } TSubModel::iInstance = reinterpret_cast( this ); //żeby nie robić cudzych animacji + // NOTE: scenery models don't pick texture variants of their own, so we clear the seed left by the + // last rendered vehicle. instanced draws share a single material bind anyway, which would make + // per instance variants inconsistent between batched and individually drawn models + TSubModel::iVariantSeed = 0; TSubModel::pasText = &asText; // przekazanie tekstu do wyświetlacza (!!!! do przemyślenia) for (auto entry : m_animlist) { diff --git a/model/Model3d.cpp b/model/Model3d.cpp index 5f59558b3..38f39080f 100644 --- a/model/Model3d.cpp +++ b/model/Model3d.cpp @@ -30,6 +30,7 @@ using namespace Mtable; float TSubModel::fSquareDist = 0.f; std::uintptr_t TSubModel::iInstance; // numer renderowanego egzemplarza obiektu +std::uint32_t TSubModel::iVariantSeed = 0; // ziarno losowania wariantów tekstur renderowanego egzemplarza texture_handle const *TSubModel::ReplacableSkinId = nullptr; int TSubModel::iAlpha = 0x30300030; // maska do testowania flag tekstur wymiennych TModel3d *TSubModel::pRoot; // Ra: tymczasowo wskaźnik na model widoczny z submodelu @@ -2460,6 +2461,120 @@ void TModel3d::LoadFromTextFile(std::string const &FileName, bool dynamic) } } +std::uint32_t TSubModel::VariantId(TSubModel const *Submodel) +{ // the seed is already well scattered, so the group is merely added to it. this way branches of one model + // are guaranteed to land on different variants, as long as the pool holds at least as many entries as + // the model has branches -- two containers carried by the same wagon won't come up with the same number + return iVariantSeed + static_cast(Submodel != nullptr ? Submodel->m_variantgroup : 0); +} + +namespace +{ +// two branches sitting no farther than this from each other are treated as one object. +// generous, a simplified lod mesh doesn't have to sit exactly where the detailed one does +float const variantgrouptolerance{0.25f}; + +// assigns provided variant group id to the submodel and all of its children +void mark_variant_group(TSubModel *Submodel, int const Group, bool const Includesiblings) +{ + while (Submodel != nullptr) + { + Submodel->m_variantgroup = Group; + mark_variant_group(Submodel->ChildGet(), Group, true); + if (false == Includesiblings) + { + break; + } + Submodel = Submodel->NextGet(); + } +} + +// expands provided bounding area to cover geometry carried by the submodel and all of its children +void accumulate_mesh_bounds(TSubModel const *Submodel, glm::vec3 &Minimum, glm::vec3 &Maximum, bool &Isempty, bool const Includesiblings) +{ + while (Submodel != nullptr) + { + if (auto const &vertices{(Submodel->m_geometry.handle != null_handle ? GfxRenderer->Vertices(Submodel->m_geometry.handle) : Submodel->Vertices)}; + false == vertices.empty()) + { + // the transformation chain can still hold a rotation, so the vertices go through it + // rather than get taken at their face value + float4x4 parentmatrix; + Submodel->ParentMatrix(&parentmatrix); + auto const transformationmatrix{glm::make_mat4(parentmatrix.readArray())}; + for (auto const &vertex : vertices) + { + auto const position{glm::vec3{transformationmatrix * glm::vec4{vertex.position, 1}}}; + Minimum = glm::min(Minimum, position); + Maximum = glm::max(Maximum, position); + } + Isempty = false; + } + accumulate_mesh_bounds(Submodel->Child, Minimum, Maximum, Isempty, true); + if (false == Includesiblings) + { + break; + } + Submodel = Submodel->Next; + } +} + +// returns position of provided branch of the model, relative to the model root +glm::vec3 branch_position(TSubModel const *Branch) +{ + // the transformation chain is the cheap way to get there, as it doesn't touch the geometry, + // which keeps this affordable even for models made of thousands of branches... + auto const offset{Branch->offset()}; + if (glm::length2(offset) > variantgrouptolerance * variantgrouptolerance) + { + return offset; + } + // ...but it only tells us anything for branches which actually carry a transform. models loaded from + // text format can have theirs baked into the vertices instead, which leaves the whole model piled up + // at the origin and, without the fallback below, all of its branches in a single variant group. + // NOTE: it's the centre of the bounding area we're after, and not the average vertex position offset() + // would give us -- the latter drifts with vertex density, which puts each lod mesh of one object in + // a group of its own and has the object change its texture variant as the lods get swapped + glm::vec3 minimum{std::numeric_limits::max()}; + glm::vec3 maximum{std::numeric_limits::lowest()}; + bool isempty{true}; + accumulate_mesh_bounds(Branch, minimum, maximum, isempty, false); + return (false == isempty ? (minimum + maximum) * 0.5f : offset); +} +} // namespace + +void TModel3d::assign_variant_groups() +{ // each top level branch of the model gets a group id, which it passes down to all of its children. + // for load models a branch is a single load chunk, and the group id is what makes two chunks of the same + // model pick different texture variants, while keeping all parts of one chunk on the same variant. + // the id comes from the position of the branch, not from its ordinal: lod variants of one object are + // separate branches drawn in disjoint distance ranges, and grouping them by position is what keeps the + // object on the same variant no matter which of them is currently on screen + std::vector grouppositions; // position of each group, indexed by its id + auto const groupid = [&grouppositions](TSubModel const *Branch) { + auto const position{branch_position(Branch)}; + for (std::size_t index = 0; index < grouppositions.size(); ++index) + { + if (glm::length2(grouppositions[index] - position) < variantgrouptolerance * variantgrouptolerance) + { + return static_cast(index); + } + } + grouppositions.emplace_back(position); + return static_cast(grouppositions.size() - 1); + }; + + for (auto *trunk = Root; trunk != nullptr; trunk = trunk->NextGet()) + { + // root level submodels are usually mere containers, but can carry geometry of their own + trunk->m_variantgroup = groupid(trunk); + for (auto *branch = trunk->ChildGet(); branch != nullptr; branch = branch->NextGet()) + { + mark_variant_group(branch, groupid(branch), false); + } + } +} + void TModel3d::Init() { // obrócenie początkowe układu współrzędnych, dla // pojazdów wykonywane po analizie animacji @@ -2492,6 +2607,8 @@ void TModel3d::Init() Root->m_boundingradius = std::max(Root->m_boundingradius, root->m_boundingradius); } + assign_variant_groups(); + if (Global.iConvertModels & 1 && false == asBinary.empty()) { SaveToBinFile(asBinary); diff --git a/model/Model3d.h b/model/Model3d.h index 7ebb13170..0e053609e 100644 --- a/model/Model3d.h +++ b/model/Model3d.h @@ -137,6 +137,9 @@ public: TSubModel *Child { nullptr }; public: material_handle m_material { null_handle }; // numer tekstury, -1 wymienna, 0 brak + // index of the top level branch of the model this submodel belongs to. submodels sharing a branch + // also share the texture variant picked for them, so a multi-mesh load chunk stays consistent + int m_variantgroup { 0 }; bool bWire { false }; // nie używane, ale wczytywane float Opacity { 1.0f }; float f_Angle { 0.0f }; @@ -168,6 +171,9 @@ public: public: static size_t iInstance; // identyfikator egzemplarza, który aktualnie renderuje model + // seed of the currently rendered model instance, combined with m_variantgroup it picks + // texture variants for materials which declare them. 0 for instances without own seed + static std::uint32_t iVariantSeed; static material_handle const *ReplacableSkinId; static int iAlpha; // maska bitowa dla danego przebiegu static float fSquareDist; @@ -211,6 +217,8 @@ public: static void ReplacableSet(material_handle const *r, int a) { ReplacableSkinId = r; iAlpha = a; }; + // returns id of texture variant to use for provided submodel of the currently rendered instance + static std::uint32_t VariantId(TSubModel const *Submodel); void Name_Material( std::string const &Name ); void Name( std::string const &Name ); // Ra: funkcje do budowania terenu z E3D @@ -291,6 +299,8 @@ public: void SaveToBinFile(std::string const &FileName); uint32_t Flags() const { return iFlags; }; void Init(); + // assigns each top level branch of the model, and everything below it, its own variant group id + void assign_variant_groups(); std::string NameGet() const { return m_filename; }; nameoffset_sequence const & smoke_sources() const { return m_smokesources; } diff --git a/model/material.cpp b/model/material.cpp index f5e32689b..19fa0b375 100644 --- a/model/material.cpp +++ b/model/material.cpp @@ -64,55 +64,96 @@ std::map texture_bindings { { "normalmap", 1 } }; +int opengl_material::texture_slot( std::string const &Key ) +{ + auto key { Key }; + + if( ( key.size() > 0 ) && ( key[ 0 ] != '_' ) ) + { + // numbered binding, "textureN:" fills the slot N-1 + key.erase( key.find_first_not_of( "-1234567890" ) ); + size_t const num = std::stoi( key ) - 1; + if( num < gl::MAX_TEXTURES ) { + return static_cast( num ); + } + log_error( "invalid texture binding: " + std::to_string( num ) ); + is_good = false; + return -1; + } + + if( key.size() > 2 ) + { + // named binding, the slot it fills is up to the shader + key.erase( 0, 1 ); + key.pop_back(); + if( shader && ( shader->texture_conf.find( key ) != shader->texture_conf.end() ) ) { + return static_cast( shader->texture_conf[ key ].id ); + } + auto const lookup { texture_bindings.find( key ) }; + if( ( shader == nullptr ) && ( lookup != texture_bindings.end() ) ) { + return lookup->second; + } + // ignore unrecognized texture bindings in legacy render mode, it's most likely data for more advanced shaders + if( Global.GfxRenderer == "default" ) { + log_error( "unknown texture binding: " + key ); + is_good = false; + } + return -1; + } + + log_error( "unrecognized texture binding: " + key ); + is_good = false; + return -1; +} + +void opengl_material::build_texture_variants( std::vector const &Bindings, bool const Loadnow ) +{ + if( true == Bindings.empty() ) { return; } + + // build a texture set for each entry of the largest of the declared pools. + // pools of different size can be combined, shorter ones simply repeat from the start + std::size_t variantcount { 0 }; + for( auto const &[ slot, pool ] : Bindings ) { + variantcount = std::max( variantcount, pool->size() ); + } + texture_variants.resize( variantcount, textures ); + + for( auto const &[ slot, pool ] : Bindings ) { + for( std::size_t variantindex = 0; variantindex < variantcount; ++variantindex ) { + auto const &texturename { ( *pool )[ variantindex % pool->size() ] }; + auto const texturehandle { GfxRenderer->Fetch_Texture( texturename, Loadnow ) }; + if( texturehandle == null_handle ) { + // a single bad entry shouldn't take down the whole material, fall back to the basic texture + log_error( "missing texture variant: " + texturename ); + continue; + } + texture_variants[ variantindex ][ slot ] = texturehandle; + } + } +} + void opengl_material::finalize(bool Loadnow) { is_good = true; if (parse_info) { - for (auto it : parse_info->tex_mapping) - { - std::string key = it.first; - std::string value = it.second.name; + // texture bindings which come with a pool of alternatives, gathered while resolving regular bindings + std::vector variantbindings; - if (key.size() > 0 && key[0] != '_') - { - key.erase( key.find_first_not_of( "-1234567890" ) ); - size_t num = std::stoi(key) - 1; - if (num < gl::MAX_TEXTURES) { - textures[num] = GfxRenderer->Fetch_Texture(value, Loadnow); - } - else { - log_error("invalid texture binding: " + std::to_string(num)); - is_good = false; - } - } - else if (key.size() > 2) - { - key.erase(0, 1); - key.pop_back(); - std::map::iterator lookup; - if( shader && shader->texture_conf.find( key ) != shader->texture_conf.end() ) { - textures[ shader->texture_conf[ key ].id ] = GfxRenderer->Fetch_Texture( value, Loadnow ); - } - else if( shader == nullptr - && ( lookup = texture_bindings.find( key ) ) != texture_bindings.end() ) { - textures[ lookup->second ] = GfxRenderer->Fetch_Texture( value, Loadnow ); - } - else { - // ignore unrecognized texture bindings in legacy render mode, it's most likely data for more advanced shaders - if( Global.GfxRenderer == "default" ) { - log_error( "unknown texture binding: " + key ); - is_good = false; - } - } - } - else { - log_error("unrecognized texture binding: " + key); - is_good = false; + for( auto const &[ bindingkey, binding ] : parse_info->tex_mapping ) + { + auto const slot { texture_slot( bindingkey ) }; + if( slot < 0 ) { continue; } + + textures[ slot ] = GfxRenderer->Fetch_Texture( binding.name, Loadnow ); + if( binding.variants.size() > 1 ) { + variantbindings.emplace_back( static_cast( slot ), &( binding.variants ) ); } } + build_texture_variants( variantbindings, Loadnow ); + if (!shader) { // TODO: add error severity to logging, re-enable these errors as low severity messages @@ -289,6 +330,44 @@ bool is_weather( std::string const &String ) { } // imports member data pair from the config file +void opengl_material::deserialize_texture_mapping( cParser &Input, std::string const &Key, int const Priority ) { + + // a texture binding can be provided as a pool of alternatives, "textureN_variants: [ a b c ]". + // unlike a regular random set, which is resolved once when the material is loaded and thus shared + // by everything using it, such pool is preserved whole and one entry is picked per model instance + auto key { Key }; + auto const variantmarker { key.find( "_variants" ) }; + auto const isvariantset { variantmarker != std::string::npos }; + if( true == isvariantset ) { + // reduce the key to its plain form, "N_variants:" becomes "N:" + key.erase( variantmarker, std::string( "_variants" ).size() ); + } + + std::vector variants; + std::string value; + if( false == isvariantset ) { + value = deserialize_random_set( Input ); + replace_slashes( value ); + } + else { + variants = deserialize_set( Input ); + for( auto &variant : variants ) { + replace_slashes( variant ); + } + if( true == variants.empty() ) { + log_error( "empty texture variant pool: " + key ); + return; + } + // first entry doubles as the regular, variant-agnostic texture of the material + value = variants.front(); + } + + auto const [ it, inserted ] { parse_info->tex_mapping.try_emplace( key, parse_info_s::tex_def{ value, Priority, variants } ) }; + if( ( false == inserted ) && ( Priority > it->second.priority ) ) { + it->second = parse_info_s::tex_def{ value, Priority, variants }; + } +} + bool opengl_material::deserialize_mapping( cParser &Input, int const Priority, bool const Loadnow ) { @@ -324,17 +403,7 @@ opengl_material::deserialize_mapping( cParser &Input, int const Priority, bool c else if (key.compare(0, 7, "texture") == 0) { key.erase(0, 7); - - auto value { deserialize_random_set( Input ) }; - replace_slashes( value ); - auto it = parse_info->tex_mapping.find(key); - if (it == parse_info->tex_mapping.end()) - parse_info->tex_mapping.emplace(std::make_pair(key, parse_info_s::tex_def({ value, Priority }))); - else if (Priority > it->second.priority) - { - parse_info->tex_mapping.erase(it); - parse_info->tex_mapping.emplace(std::make_pair(key, parse_info_s::tex_def({ value, Priority }))); - } + deserialize_texture_mapping( Input, key, Priority ); } else if (key.compare(0, 5, "param") == 0) { key.erase(0, 5); diff --git a/model/material.h b/model/material.h index 6d3f2b8d3..7e04514cd 100644 --- a/model/material.h +++ b/model/material.h @@ -18,7 +18,13 @@ http://mozilla.org/MPL/2.0/. // a collection of parameters for the rendering setup. // for modern opengl this translates to set of attributes for shaders struct opengl_material : public IMaterial { - std::array textures = { null_handle }; + using texture_set = std::array; + + texture_set textures = { null_handle }; + // alternative texture sets, defined with "textureN_variants:" key. + // one of them is picked per rendered model instance, empty when the material declares no variants. + // NOTE: all variants share the remaining material properties, opacity and translucency included + std::vector texture_variants; std::array params; std::vector params_state; @@ -60,6 +66,14 @@ struct opengl_material : public IMaterial { { return textures[slot]; } + // returns texture set to use for model instance identified by provided variant id + texture_set const &GetTextures(std::uint32_t const Variant) const + { + return ( + texture_variants.empty() ? + textures : + texture_variants[Variant % texture_variants.size()]); + } // members static struct path_data { std::unordered_map index_map; @@ -71,10 +85,23 @@ struct opengl_material : public IMaterial { bool update_on_season_change{ false }; private: +// types + // texture binding which comes with a pool of alternatives: slot the binding fills, and the pool itself + using variant_binding = std::pair const *>; + // methods // imports member data pair from the config file bool deserialize_mapping( cParser &Input, int const Priority, bool const Loadnow ); + // imports texture binding, potentially carrying a pool of alternatives, from the config file + void + deserialize_texture_mapping( cParser &Input, std::string const &Key, int const Priority ); + // returns texture slot provided binding key resolves to, or -1 if it doesn't resolve to any + int + texture_slot( std::string const &Key ); + // fills the alternative texture sets from provided pools, one set per entry of the longest pool + void + build_texture_variants( std::vector const &Bindings, bool const Loadnow ); void log_error(const std::string &str); // members @@ -90,6 +117,9 @@ private: { std::string name; int priority; + // optional pool of alternative textures for the same binding, one picked per model instance. + // empty for regular, single texture bindings + std::vector variants; }; struct param_def { diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index 576cf404f..5419bbcdf 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -1286,6 +1286,7 @@ bool opengl33_renderer::Render_lowpoly( TDynamicObject *Dynamic, float const Squ if( Setup ) { TSubModel::iInstance = reinterpret_cast( Dynamic ); //żeby nie robić cudzych animacji + TSubModel::iVariantSeed = Dynamic->variant_seed(); glm::dvec3 const originoffset{ Dynamic->vPosition - m_renderpass.pass_camera.position() }; Dynamic->ABuLittleUpdate( Squaredistance ); // ustawianie zmiennych submodeli dla wspólnego modelu @@ -2262,14 +2263,21 @@ void opengl33_renderer::Bind_Material( material_handle const Material, TSubModel else model_ubs.alpha_mult = 1.0f; + // materials which declare texture variants provide a different texture set per model instance, + // picked from the seed of the rendered instance and the variant group of the submodel + auto const &materialtextures{ + material.texture_variants.empty() ? + material.textures : + material.GetTextures(TSubModel::VariantId(sm))}; + if (GLAD_GL_ARB_multi_bind) { GLuint lastdiff = 0; size_t i; for (i = 0; i < gl::MAX_TEXTURES; i++) - if (material.textures[i] != null_handle) + if (materialtextures[i] != null_handle) { - opengl_texture &tex = m_textures.mark_as_used(material.textures[i]); + opengl_texture &tex = m_textures.mark_as_used(materialtextures[i]); tex.create(); if (opengl_texture::units[i] != tex.id) { @@ -2286,7 +2294,7 @@ void opengl33_renderer::Bind_Material( material_handle const Material, TSubModel else { size_t unit = 0; - for (auto &tex : material.textures) + for (auto &tex : materialtextures) { if (tex == null_handle) break; @@ -3351,6 +3359,7 @@ bool opengl33_renderer::Render(TDynamicObject *Dynamic) // setup TSubModel::iInstance = reinterpret_cast(Dynamic); //żeby nie robić cudzych animacji + TSubModel::iVariantSeed = Dynamic->variant_seed(); glm::dvec3 const originoffset = Dynamic->vPosition - m_renderpass.pass_camera.position(); // lod visibility ranges are defined for base (x 1.0) viewing distance. for render we adjust them for actual range multiplier and zoom float squaredistance; @@ -3518,10 +3527,12 @@ bool opengl33_renderer::Render_cab(TDynamicObject const *Dynamic, float const Li { TSubModel::iInstance = 0; + TSubModel::iVariantSeed = 0; return false; } TSubModel::iInstance = reinterpret_cast(Dynamic); + TSubModel::iVariantSeed = Dynamic->variant_seed(); if ((true == FreeFlyModeFlag) || (false == Dynamic->bDisplayCab) || (Dynamic->mdKabina == Dynamic->mdModel)) { @@ -4445,6 +4456,7 @@ bool opengl33_renderer::Render_Alpha(TDynamicObject *Dynamic) // setup TSubModel::iInstance = (size_t)Dynamic; //żeby nie robić cudzych animacji + TSubModel::iVariantSeed = Dynamic->variant_seed(); glm::dvec3 const originoffset = Dynamic->vPosition - m_renderpass.pass_camera.position(); // lod visibility ranges are defined for base (x 1.0) viewing distance. for render we adjust them for actual range multiplier and zoom float squaredistance; diff --git a/rendering/openglrenderer.cpp b/rendering/openglrenderer.cpp index d159c31aa..1da66ba51 100644 --- a/rendering/openglrenderer.cpp +++ b/rendering/openglrenderer.cpp @@ -801,6 +801,7 @@ bool opengl_renderer::Render_lowpoly( TDynamicObject *Dynamic, float const Squar if( Setup ) { TSubModel::iInstance = reinterpret_cast( Dynamic ); //żeby nie robić cudzych animacji + TSubModel::iVariantSeed = Dynamic->variant_seed(); Dynamic->ABuLittleUpdate( Squaredistance ); // ustawianie zmiennych submodeli dla wspólnego modelu ::glPushMatrix(); @@ -1759,10 +1760,17 @@ opengl_renderer::Bind_Material( material_handle const Material, TSubModel const return; } + // materials which declare texture variants provide a different texture set per model instance, + // picked from the seed of the rendered instance and the variant group of the submodel + auto const &materialtextures { + material.texture_variants.empty() ? + material.textures : + material.GetTextures( TSubModel::VariantId( sm ) ) }; + if( false == Global.BasicRenderer ) { - m_textures.bind( m_normaltextureunit, material.textures[1] ); + m_textures.bind( m_normaltextureunit, materialtextures[1] ); } - m_textures.bind( m_diffusetextureunit, material.textures[0] ); + m_textures.bind( m_diffusetextureunit, materialtextures[0] ); } else { // null material, unbind all textures @@ -2475,6 +2483,7 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { // setup TSubModel::iInstance = reinterpret_cast( Dynamic ); //żeby nie robić cudzych animacji + TSubModel::iVariantSeed = Dynamic->variant_seed(); Dynamic->ABuLittleUpdate( squaredistance ); // ustawianie zmiennych submodeli dla wspólnego modelu ::glPushMatrix(); @@ -2574,10 +2583,12 @@ opengl_renderer::Render_cab( TDynamicObject const *Dynamic, float const Lightlev if( Dynamic == nullptr ) { TSubModel::iInstance = 0; + TSubModel::iVariantSeed = 0; return false; } TSubModel::iInstance = reinterpret_cast( Dynamic ); + TSubModel::iVariantSeed = Dynamic->variant_seed(); if( ( true == FreeFlyModeFlag ) || ( false == Dynamic->bDisplayCab ) @@ -2866,11 +2877,11 @@ opengl_renderer::Render( TSubModel *Submodel ) { // material configuration: // textures... if( Submodel->m_material < 0 ) { // zmienialne skóry - Bind_Material( Submodel->ReplacableSkinId[ -Submodel->m_material ] ); + Bind_Material( TSubModel::ReplacableSkinId[ -Submodel->m_material ], Submodel ); } else { // również 0 - Bind_Material( Submodel->m_material ); + Bind_Material( Submodel->m_material, Submodel ); } // main draw call m_geometry.draw( Submodel->m_geometry.handle ); @@ -2884,11 +2895,11 @@ opengl_renderer::Render( TSubModel *Submodel ) { ::glColor3fv( glm::value_ptr( pick_color( m_pickcontrolsitems.size() ) ) ); // textures... if( Submodel->m_material < 0 ) { // zmienialne skóry - Bind_Material( Submodel->ReplacableSkinId[ -Submodel->m_material ] ); + Bind_Material( TSubModel::ReplacableSkinId[ -Submodel->m_material ], Submodel ); } else { // również 0 - Bind_Material( Submodel->m_material ); + Bind_Material( Submodel->m_material, Submodel ); } // main draw call m_geometry.draw( Submodel->m_geometry.handle ); @@ -3657,6 +3668,7 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { // setup TSubModel::iInstance = ( size_t )Dynamic; //żeby nie robić cudzych animacji + TSubModel::iVariantSeed = Dynamic->variant_seed(); glm::dvec3 const originoffset = Dynamic->vPosition - m_renderpass.camera.position(); // lod visibility ranges are defined for base (x 1.0) viewing distance. for render we adjust them for actual range multiplier and zoom float squaredistance; @@ -3909,11 +3921,11 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { // material configuration: // textures... if( Submodel->m_material < 0 ) { // zmienialne skóry - Bind_Material( Submodel->ReplacableSkinId[ -Submodel->m_material ] ); + Bind_Material( TSubModel::ReplacableSkinId[ -Submodel->m_material ], Submodel ); } else { // również 0 - Bind_Material( Submodel->m_material ); + Bind_Material( Submodel->m_material, Submodel ); } // main draw call m_geometry.draw( Submodel->m_geometry.handle ); diff --git a/utilities/utilities.cpp b/utilities/utilities.cpp index c1d0b73d0..14e448973 100644 --- a/utilities/utilities.cpp +++ b/utilities/utilities.cpp @@ -527,4 +527,42 @@ std::string deserialize_random_set(cParser &Input, char const *Break) // shouldn't ever get here but, eh return ""; } -} \ No newline at end of file +} + +// returns hash of provided string, combined with provided seed +std::uint32_t hash_string(std::string const &String, std::uint32_t const Seed) +{ + // FNV-1a, 32 bit, with the seed mixed into the standard offset basis + std::uint32_t hash{2166136261u ^ Seed}; + for (auto const character : String) + { + hash ^= static_cast(static_cast(character)); + hash *= 16777619u; + } + return hash; +} + +// extracts a group of tokens from provided data stream, returns all of them +std::vector deserialize_set(cParser &Input, char const *Break) +{ + + std::vector tokens; + + auto token{Input.getToken(true, Break)}; + std::ranges::replace(token, '\\', '/'); + if (token != "[") + { + // simple case, single token + if (false == token.empty()) + { + tokens.emplace_back(token); + } + return tokens; + } + // '[' marks a beginning of a set, retrieve all entries until it's closed + while ((token = deserialize_random_set(Input, Break)) != "" && token != "]") + { + tokens.emplace_back(token); + } + return tokens; +} diff --git a/utilities/utilities.h b/utilities/utilities.h index 70cf1c07c..91d74e67a 100644 --- a/utilities/utilities.h +++ b/utilities/utilities.h @@ -377,6 +377,14 @@ glm::dvec3 LoadPoint(class cParser &Input); // extracts a group of tokens from provided data stream std::string deserialize_random_set(cParser &Input, char const *Break = "\n\r\t ;"); +// extracts a group of tokens from provided data stream, returns all of them. +// a single token, not enclosed in "[]", is returned as one element sequence +std::vector deserialize_set(cParser &Input, char const *Break = "\n\r\t ;"); + +// returns hash of provided string, combined with provided seed. FNV-1a, picked for having +// identical result regardless of platform and standard library, unlike std::hash +std::uint32_t hash_string(std::string const &String, std::uint32_t const Seed = 0); + // extracts a group of pairs from provided data stream // NOTE: expects no more than single pair per line template void deserialize_map(MapType_ &Map, cParser &Input) diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index 184d432ae..e84af6137 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -1934,6 +1934,10 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" iDirection = Reversed ? 0 : 1; // Ra: 0, jeśli ma być wstawiony jako obrócony tyłem asBaseDir = paths::dynamic + BaseDir + "/"; // McZapkie-310302 asName = Name; + // derived from the name and the seed of the simulation rather than drawn at random, so that the vehicle + // keeps the same look for the whole session and looks the same for everyone in a multiplayer game, while + // another run of the same scenario, with another seed, dresses it differently + m_variantseed = hash_string( asName, Global.random_seed ); std::string asAnimName; // zmienna robocza do wyszukiwania osi i wózków // Ra: zmieniamy znaczenie obsady na jednoliterowe, żeby dosadzić kierownika if (DriverType == "headdriver") diff --git a/vehicle/DynObj.h b/vehicle/DynObj.h index f8f2ce780..c48e40e14 100644 --- a/vehicle/DynObj.h +++ b/vehicle/DynObj.h @@ -634,6 +634,10 @@ private: std::string asName; const std::string &name() const { return asName; } + // seed for texture variants of materials used by this vehicle and its load + std::uint32_t m_variantseed { 0 }; + std::uint32_t variant_seed() const { + return m_variantseed; } std::string asBaseDir; // std::ofstream PneuLogFile; //zapis parametrow pneumatycznych From 36d4f16c01abd9404c7e3b59547260f33191b0ba Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Sun, 27 Sep 2026 17:50:07 +0200 Subject: [PATCH 007/430] Brake force table: take the rapid step threshold from the distributor TMoverParameters::BrakeForceR() halves the force of a vehicle set to R below 40 km/h. That is one approximation for every distributor, but a NESt3/ESt4 distributor with a rapid relay engages the step above 70 km/h and keeps it down to 50 km/h (TNESt3::GetPF, RapidStatus), and below that its cylinder pressure is divided by the relay's own multiplier (TRapid, RapidMult). For a vehicle braking from speed the full force therefore lasts down to 50 km/h, not 40. The AI builds its consist brake table (fBrake_a0/a1) from BrakeForceR(), so between 40 and 50 km/h it expected twice the force the wagons actually deliver. Add TBrake::GetRapidRatio(), which keeps the old approximation as the default, and override it in TNESt3 with the relay's threshold and multiplier. The brake itself is unchanged; only the prediction is. --- McZapkie/Mover.cpp | 4 ++-- McZapkie/Oerlikon_ESt.cpp | 11 +++++++++++ McZapkie/Oerlikon_ESt.h | 2 ++ McZapkie/hamulce.h | 5 +++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 83c918e24..a58878ab4 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -5166,8 +5166,8 @@ double TMoverParameters::BrakeForceR(double ratio, double velocity) press = MaxBrakePress[3]; if (DynamicBrakeType == dbrake_automatic) ratio = ratio + (1.5 - ratio) * std::min(1.0, Vel * 0.02); - if (BrakeDelayFlag & bdelay_R && BrakeMethod % 128 != bp_Cosid && BrakeMethod % 128 != bp_D1 && BrakeMethod % 128 != bp_D2 && Power < 1 && velocity < 40) - ratio = ratio / 2; + if (BrakeDelayFlag & bdelay_R && BrakeMethod % 128 != bp_Cosid && BrakeMethod % 128 != bp_D1 && BrakeMethod % 128 != bp_D2 && Power < 1) + ratio *= Hamulec->GetRapidRatio(velocity); if (TrainType == dt_DMU && velocity < 30.0) { ratio -= 0.3; diff --git a/McZapkie/Oerlikon_ESt.cpp b/McZapkie/Oerlikon_ESt.cpp index 9559d3052..d8d5b3da8 100644 --- a/McZapkie/Oerlikon_ESt.cpp +++ b/McZapkie/Oerlikon_ESt.cpp @@ -324,6 +324,17 @@ void TNESt3::Init( double const PP, double const HPP, double const LPP, double c RapidStaly = false; } +double TNESt3::GetRapidRatio(double const Vel) const +{ + // ESt3 has no rapid relay, and with disc brakes the rapid step stays engaged at all speeds + if( ( PrzekRapid == nullptr ) || ( true == RapidStaly ) ) { + return 1.0; + } + // a braking vehicle comes from above, so the step is still engaged down to the speed + // at which GetPF() drops it, not the one at which it engages + return ( Vel < 50.0 ? 1.0 / PrzekRapid->GetRapidMult() : 1.0 ); +} + double TNESt3::GetCRP() { return CntrlRes->P(); diff --git a/McZapkie/Oerlikon_ESt.h b/McZapkie/Oerlikon_ESt.h index c12691851..180c47206 100644 --- a/McZapkie/Oerlikon_ESt.h +++ b/McZapkie/Oerlikon_ESt.h @@ -117,6 +117,7 @@ class TRapid : public TPrzekladnik { public: void SetRapidParams(double mult, double size); void SetRapidStatus(bool rs); + double GetRapidMult() const { return RapidMult; } void Update(double dt) /*override*/; inline TRapid() : TPrzekladnik() @@ -213,6 +214,7 @@ class TNESt3 : public TBrake { virtual double GetPF( double const PP, double const dt, double const Vel ) /*override*/; // przeplyw miedzy komora wstepna i PG void EStParams(double i_crc); // parametry charakterystyczne dla ESt virtual double GetCRP() /*override*/; + double GetRapidRatio(double const Vel) const override; void CheckState(double const BCP, double &dV1); // glowny przyrzad rozrzadczy void CheckReleaser(double const dt); // odluzniacz double CVs(double const BP); // napelniacz sterujacego diff --git a/McZapkie/hamulce.h b/McZapkie/hamulce.h index a05a36359..11b8bdfb3 100644 --- a/McZapkie/hamulce.h +++ b/McZapkie/hamulce.h @@ -442,6 +442,11 @@ class TBrake /// Sets the rapid step ratio. Default no-op; overridden where supported. /// Rapid ratio. virtual void SetRM(double const RMR) {}; // ustalenie przelozenia rapida + /// Share of the full cylinder pressure the distributor delivers at the given speed + /// while the vehicle is slowing down through it, for a vehicle set to R. Used only to predict + /// the brake force; the default is the approximation BrakeForceR() has always used. + /// Vehicle velocity [km/h]. + virtual double GetRapidRatio(double const Vel) const { return Vel < 40.0 ? 0.5 : 1.0; } /// Sets the velocity threshold for the rapid step. /// Velocity threshold (same unit as Vel passed to GetPF). virtual void SetRV(double const RVR) From 92bd7ef827196e0ae7f3dfa6e5cbabf93eb87390 Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Mon, 28 Sep 2026 15:45:10 +0200 Subject: [PATCH 008/430] AI braking: hold the speed on a descent Two changes that only work together: the first on its own lets a heavy freight train brake less on a descent than it needs (in testing an ET42 with 30 loaded wagons overran the stop signal by 16-48 m at 20 per mille), the second makes the hold on a descent what it should be. The comparison that decides whether the AI may skip its reaction time between two brake steps stays on the brake-only demand, as before: it is about how much brake is asked for, and a heavy train in G approaching a stop on a descent needs its brake built up at once. Compared in the resultant frame, that train built up its brake one step per reaction time and overran the signal (16 copies of the ET42 train, x20: 22 of 32 overruns with the comparison moved, 0 of 48 with it kept). 1. Compare the measured deceleration in the same frame. Going downhill, adjust_desired_speed_for_current_speed() subtracts the gravity component from AccDesired, so that IncBrake() sizes the handle position for what the brake alone has to deliver. control_braking_force() then compares that brake-only value with AbsAccS, which is the resultant acceleration and already contains the gravity. On a 20 per mille descent the two differ by about 0.2 m/s2, so the AI asked for more braking than the target needed and then released, and repeated that. Keep the subtracted part in fAccDesiredGravity and add it back wherever AccDesired is compared with AbsAccS. It is zero everywhere else (flat, uphill, braking test), so the behaviour there does not change. 2. Hold the speed with one continuous law. On a descent the AI looks ahead to decide whether it will exceed the target speed. The look-ahead was (1 - a0) * 30 / 3.6 s, a few seconds, while a pneumatic brake in G takes tens of seconds to apply or to release; the AI therefore acted on an estimate the train had already left behind. The demand then jumped between the braking threshold above the target and a lerp towards full acceleration below it, and with the brake that slow this turned into long alternating applications and releases. - look ahead for half the brake application time while the train is speeding up and half the release time while it is slowing down (brake_response_horizon), never less than before; - use one law on both sides of the target, proportional to the predicted difference, and hold a band just below the limit that widens with the gradient (pneumatic up to 3 km/h, EP/electric up to 1.5 km/h); - once below a lower limit ahead, hold that limit instead of speeding up towards the line speed and braking again. --- vehicle/Driver.cpp | 101 ++++++++++++++++++++++++++++++++++----------- vehicle/Driver.h | 1 + 2 files changed, 77 insertions(+), 25 deletions(-) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 9a6de8596..5b61b6dd1 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -7483,6 +7483,25 @@ TController::adjust_desired_speed_for_limits() { } } +// how long the present acceleration of a consist lasts whatever is done with the handle now: half the time +// its pneumatic brake takes to apply (while speeding up) or to release (while slowing down), which in G +// is tens of seconds; never shorter than the look-ahead the AI has always used +static double +brake_response_horizon( TMoverParameters const *Vehicle, TBrakeSystem const Brakesystem, double const Acceleration, double const Brakea0 ) { + + auto horizon { ( 1.0 - Brakea0 ) * 30.0 / 3.6 }; + if( Brakesystem == TBrakeSystem::Pneumatic ) { + auto const isrelease { Acceleration < 0.0 }; + horizon = std::max( + horizon, + 0.5 * ( + Vehicle->BrakeDelayFlag > bdelay_G ? + Vehicle->BrakeDelay[ isrelease ? 0 : 1 ] : + Vehicle->BrakeDelay[ isrelease ? 2 : 3 ] ) ); + } + return horizon; +} + void TController::adjust_desired_speed_for_target_speed( double const Range ) { // ustalanie zadanego przyspieszenia @@ -7496,6 +7515,7 @@ TController::adjust_desired_speed_for_target_speed( double const Range ) { // gdy jedzie wolniej niż potrzeba, albo nie ma przeszkód na drodze // normalna jazda AccDesired = VelDesired != 0.0 ? AccPreferred : -0.01; + fAccDesiredGravity = 0.0; auto const vel { DirectionalVel() }; @@ -7654,35 +7674,57 @@ TController::adjust_desired_speed_for_current_speed() { if( fAccGravity > 0.025 ) { // going sharply downhill we may need to start braking sooner than usual // try to estimate increase of current velocity before engaged brakes start working - auto const speedestimate = vel + ( 1.0 - fBrake_a0[ 0 ] ) * 30.0 * AbsAccS; - if( speedestimate > VelDesired ) { - // jesli jedzie za szybko do AKTUALNEGO - if( VelDesired == 0.0 ) { - // jesli stoj, to hamuj, ale i tak juz za pozno :) - AccDesired = std::min( AccDesired, -0.85 ); // hamuj solidnie - } - else { - // if it looks like we'll exceed maximum speed start thinking about slight slowing down - AccDesired = std::min( AccDesired, -0.05 + fAccThreshold ); - // HACK: for cargo trains with high braking threshold ensure we cross that threshold - if( true == IsCargoTrain - && fBrake_a0[0] > 0.2 ) { - AccDesired -= std::clamp( fBrake_a0[ 0 ] - 0.2, 0.0, 0.15 ); - } - } + // look ahead for as long as the brake takes to respond, since that is how long the + // present acceleration will last whatever is done with the handle now; a pneumatic + // brake applies and releases on its own time scale, which in G is tens of seconds + auto const horizon { brake_response_horizon( mvOccupied, BrakeSystem, AbsAccS, fBrake_a0[ 0 ] ) }; + auto const speedestimate = vel + 3.6 * horizon * AbsAccS; + // already below a lower limit ahead, the train has no business speeding up towards it + auto holdlimit { VelDesired }; + if( ( VelNext > 0.0 ) + && ( VelNext < holdlimit ) + && ( vel <= VelNext + fVelPlus ) + && ( ActualProximityDist < std::max( 2.0 * fBrakeDist, 500.0 ) ) ) { + holdlimit = VelNext; + } + // hold a band just below the limit; the steeper the descent the harder the train pulls + // away once the brake eases, so the band widens with the gradient (about 3 km/h at 20 per mille) + // an electro-pneumatic or electric brake responds at once and needs far less room + auto const holdspeed { holdlimit - ( + BrakeSystem == TBrakeSystem::Pneumatic ? + std::clamp( fAccGravity * 15.0, 1.0, 3.0 ) : + std::clamp( fAccGravity * 7.5, 1.0, 1.5 ) ) }; + if( ( speedestimate > VelDesired ) + && ( VelDesired == 0.0 ) ) { + // jesli stoj, to hamuj, ale i tak juz za pozno :) + AccDesired = std::min( AccDesired, -0.85 ); // hamuj solidnie } else { - // stop accelerating when close enough to target speed + // one continuous law on both sides of the target, proportional to the predicted + // difference: a demand that jumps to the braking threshold above the target and to + // full acceleration below it alternates, with a brake that responds in seconds, + // between a hard application and a full release AccDesired = std::min( AccDesired, // but don't override decceleration for VelNext - std::lerp( // ease off as you close to the target velocity - EU07_AI_NOACCELERATION, AccPreferred, - std::clamp( VelDesired - speedestimate, 0.0, fVelMinus ) / fVelMinus ) ); + std::clamp( + EU07_AI_NOACCELERATION - 0.04 * ( speedestimate - holdspeed ), + -0.05 + fAccThreshold, + std::max( EU07_AI_NOACCELERATION, AccPreferred ) ) ); + // HACK: for cargo trains with high braking threshold ensure we cross that threshold + if( true == IsCargoTrain + && fBrake_a0[0] > 0.2 + && speedestimate > holdlimit ) { + AccDesired -= std::clamp( fBrake_a0[ 0 ] - 0.2, 0.0, 0.15 ); + } } // final tweaks if( vel > EU07_AI_NOMOVEMENT ) { // going downhill also take into account impact of gravity AccDesired -= fAccGravity; + // from here on AccDesired is what the brake alone has to deliver, which is what + // IncBrake() sizes the handle position for; AbsAccS already contains the gravity, + // so the comparisons with it have to add this part back + fAccDesiredGravity = fAccGravity; // HACK: if the max allowed speed was exceeded something went wrong; brake harder AccDesired -= 0.15 * std::clamp( vel - VelDesired, 0.0, 5.0 ); } @@ -7773,6 +7815,7 @@ TController::adjust_desired_speed_for_braking_test() { } case 1: { AccDesired = EU07_AI_BRAKINGTESTACCELERATION; + fAccDesiredGravity = 0.0; VelDesired = DBT_VelocityBrake; if( ElapsedTime - DBT_BrakingTime > 1 ) { ForcePNBrake = true; @@ -7783,6 +7826,7 @@ TController::adjust_desired_speed_for_braking_test() { } case 2: { AccDesired = EU07_AI_BRAKINGTESTACCELERATION; + fAccDesiredGravity = 0.0; VelDesired = DBT_VelocityBrake; if( ElapsedTime - DBT_BrakingTime > 2 ) { DBT_BrakingTime = ElapsedTime; @@ -7794,6 +7838,7 @@ TController::adjust_desired_speed_for_braking_test() { } case 3: { AccDesired = safe_clamp( -AbsAccS, fAccThreshold * 1.01, fAccThreshold * 1.21 ); + fAccDesiredGravity = 0.0; VelDesired = DBT_VelocityBrake; if( vel <= DBT_VelocityRelease ) { DynamicBrakeTest = 4; @@ -7980,6 +8025,10 @@ void TController::control_braking_force() { } } + // AbsAccS is the resultant acceleration, gravity included, so it is compared with the + // resultant the AI asks for, not with the brake-only demand AccDesired holds on a descent + auto const accdesiredresultant { AccDesired + fAccDesiredGravity }; + if( is_emu() && !ForcePNBrake ) { // właściwie, to warunek powinien być na działający EP // Ra: to dobrze hamuje EP w EZT @@ -7991,13 +8040,13 @@ void TController::control_braking_force() { auto const accmargin = AccMax > 1.1 * AccDesired && fAccGravity < 0.025 ? 0.05 : 0.0; if( AccDesired < accthreshold // jeśli hamować - u góry ustawia się hamowanie na fAccThreshold - && ( AbsAccS > AccDesired + accmargin + && ( AbsAccS > accdesiredresultant + accmargin || BrakeCtrlPosition < 0 ) ) { // hamować bardziej, gdy aktualne opóźnienie hamowania mniejsze niż (AccDesired) cue_action( driver_hint::brakingforceincrease ); } else if( OrderCurrentGet() != Disconnect ) { // przy odłączaniu nie zwalniamy tu hamulca - if( AbsAccS < AccDesired - 0.05 ) { + if( AbsAccS < accdesiredresultant - 0.05 ) { // jeśli opóźnienie większe od wymaganego (z histerezą) luzowanie, gdy za dużo // TBD: check if the condition isn't redundant with the DecBrake() code if( BrakeCtrlPosition >= 0 ) { @@ -8013,10 +8062,12 @@ void TController::control_braking_force() { } // type & dt_ezt else { // a stara wersja w miarę dobrze działa na składy wagonowe - if( ( AccDesired < fAccGravity - 0.1 && AbsAccS > AccDesired + fBrake_a1[0] ) // regular braking + if( ( accdesiredresultant < fAccGravity - 0.1 && AbsAccS > accdesiredresultant + fBrake_a1[0] ) // regular braking || ( fAccGravity < -0.05 && velocity < -0.1 ) ) { // also brake if uphill and slipping back // u góry ustawia się hamowanie na fAccThreshold if( fBrakeTime < 0.0 + // the size of the brake demand decides whether to skip the reaction time, so the brake-only part + // (on a descent a heavy train needs its brake built up at once, the gravity does not help it slow) || AccDesired < fAccGravity - 0.5 || BrakeCtrlPosition <= 0 ) { // jeśli upłynął czas reakcji hamulca, chyba że nagłe albo luzował @@ -8033,8 +8084,8 @@ void TController::control_braking_force() { * 0.5 ); // Ra: tymczasowo, bo przeżyna S1 } } - if ( AccDesired < fAccGravity - 0.05 - && AccDesired - fBrake_a1[0] * 0.51 - AbsAccS > 0.05 ) { + if ( accdesiredresultant < fAccGravity - 0.05 + && accdesiredresultant - fBrake_a1[0] * 0.51 - AbsAccS > 0.05 ) { // jak hamuje, to nie tykaj kranu za często // yB: luzuje hamulec dopiero przy różnicy opóźnień rzędu 0.2 if( OrderCurrentGet() != Disconnect ) { // przy odłączaniu nie zwalniamy tu hamulca diff --git a/vehicle/Driver.h b/vehicle/Driver.h index e7c4fac00..c493afc8a 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -387,6 +387,7 @@ private: double AccDesired = 0.0; // przyspieszenie, jakie ma utrzymywać (<0:nie przyspieszaj,<-0.1:hamuj) double VelDesired = 0.0; // predkość, z jaką ma jechać, wynikająca z analizy tableki; <=VelSignal double fAccDesiredAv = 0.0; // uśrednione przyspieszenie z kolejnych przebłysków świadomości, żeby ograniczyć migotanie + double fAccDesiredGravity = 0.0; // część AccDesired odjęta na spadku jako kompensacja pochylenia; AbsAccS zawiera ją już sam double VelforDriver = -1.0; // prędkość, używana przy zmianie kierunku (ograniczenie przy nieznajmości szlaku?) double VelSignal = 0.0; // ograniczenie prędkości z kompilacji znaków i sygnałów // normalnie na początku ma stać, no chyba że jedzie double VelLimit = -1.0; // predkość zadawana przez event jednokierunkowego ograniczenia prędkości // -1: brak ograniczenia prędkości From ce87aa0e090d4b5fba7042588df6e5e71895d5a1 Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Mon, 28 Sep 2026 15:45:10 +0200 Subject: [PATCH 009/430] AI braking: plan approaches from the consist brake, stop 8-15 m short The new braking curve below plans the stop at the signal itself unless the stopping point moves with it (in testing, trains stopped 0-3 m past the signal), so both go in one change. 1. The braking curve. The braking curve towards a lower speed or a stop assumed a constant deceleration from the present speed over the whole distance. A pneumatic brake does not work like that: - it acts on the state the train is in once it has applied; while the train is still speeding up (downhill), plan from the speed it will have reached by then, over the distance left by then; - cast iron blocks grip harder as the train slows, so a constant deceleration plan asks for too much at the start and then releases; follow the shape of the consist brake table (fBrake_a0/a1) over speed instead (shaped_braking_demand), over the distance left once the brake has had its fill time; - no power while the train is still above the speed it is braking for. IncBrake() only adds braking when the brake table says the present position is not enough. When the table overestimates the consist (see the previous rapid step fix, or a descent), the train keeps slowing too little with the handle held. After the full fill time with the handle unchanged, believe the train rather than the table (fBrakeHeldTime). When the AI asks for no braking and the train is still slowing down more than that, release. With the gentler plan above the demand eases off early, and without this a heavy freight train in G came to a stand a few hundred metres before a W4 with its brake still on (seen in testing). 2. The stopping window. In train running the final approach to a stop signal began at fMaxProximityDist (15-40 m, cargo 25-50 m), aimed at half of fMinProximityDist (10-15 m, cargo 20-25 m), and set VelDesired = 0, which asks for hard braking whatever the distance left. Where a train came to a stand depended on how it entered that phase: on the test sceneries anywhere from 1 to 45 m short of the signal on the flat and 25-42 m uphill for heavy freight. For train running only (a W4 stop point, shunting and coupling keep the old margins and the old final approach): - stop 8-15 m short of the signal whatever the length of the train, aim at the middle of that window (stopping_margin) both with the braking curve and in the final approach, and ask there only for what the distance left takes, following the consist brake table; - start the final approach 50 m out (cargo 60 m) whether the train is moving or standing; it used to be 15-40 m while moving and 50 m once stopped, and with the gentler final approach above a train that came to a stand between the two released to creep closer and, uphill, rolled back and tried again; - uphill, while the gradient alone would bring the train to a stand short of the window, keep it rolling at no more than the speed the gradient can take off by then, with power if needed; - uphill, put the train brake on as the train comes to a stand, keep it on while it stands, and apply it for real if the train rolls back. This is done at the very end of pick_optimal_speed(): the adjustments made before it assume a train moving forward and can raise the demand back to "no braking" (with the rule placed earlier, EMUs rolled back up to 90 m in testing). The EMU branch of control_braking_force() gets the "slipping back" condition the wagon branch has always had. 3. Known limitation. Heavy trains of wagons with the ESt3AL2 distributor (413S, 601W and alike) respond more slowly than the AI expects: with the present brake model the distributor fills the AL2 relay chamber, whose capacity is set to 2 in TNESt3::SetSize (Przekladniki[i]->CreateCap(i)), through orifices sized for about 1 l, so these wagons need 34 s to reach 95 % cylinder pressure in G against 21 s for a plain ESt3. On a 20 per mille descent an ET22 with 20 loaded 413S wagons overran the stop signal by up to 6.5 m in 6 of 24 runs at x20 with this change. With the relay chamber at 1 l and the release orifices at about 80 % of their diameter, as the author of the brake model suggested, none of them did (0 of 16). --- vehicle/Driver.cpp | 217 ++++++++++++++++++++++++++++++++++++++++----- vehicle/Driver.h | 7 ++ 2 files changed, 200 insertions(+), 24 deletions(-) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 5b61b6dd1..09b607b69 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -3122,6 +3122,17 @@ bool TController::IncBrake() } } } + else if( BrakeCtrlPosition > 0.0 + && AccDesired < 0.0 // only while braking is asked for, not when called for a train slipping back while starting + && fBrakeHeldTime > ( + mvOccupied->BrakeDelayFlag > bdelay_G ? + mvOccupied->BrakeDelay[ 1 ] : + mvOccupied->BrakeDelay[ 3 ] ) ) { + // the table says the present position is enough, but the brake has had its full fill + // time since the handle last moved and the train is still not slowing down as asked: + // believe the train rather than the table + OK = BrakeLevelAdd( BrakingLevelIncrease ); + } else OK = false; } @@ -3781,6 +3792,7 @@ void TController::BrakeLevelSet(double b) if (BrakeCtrlPosition == b) return; // nie przeliczać, jak nie ma zmiany BrakeCtrlPosition = std::clamp(b, (double)gbh_MIN, (double)gbh_MAX); + fBrakeHeldTime = 0.0; } bool TController::BrakeLevelAdd(double b) @@ -5911,6 +5923,7 @@ TController::update_timers( double dt ) { ElapsedTime += dt; WaitingTime += dt; fBrakeTime -= dt; // wpisana wartość jest zmniejszana do 0, gdy ujemna należy zmienić nastawę hamulca + fBrakeHeldTime += dt; if( mvOccupied->fBrakeCtrlPos != mvOccupied->Handle->GetPos( bh_FS ) ) { // brake charging timeout starts after charging ends BrakeChargingCooldown += dt; @@ -6659,12 +6672,27 @@ TController::determine_proximity_ranges() { // na jaka odleglosc i z jaka predkoscia ma podjechac do przeszkody // jeśli pociąg if( is_train() ) { - fMinProximityDist = std::clamp( 5 + iVehicles, 10, 15 ); - fMaxProximityDist = std::clamp( 10 + iVehicles, 15, 40 ); + if( true == IsAtPassengerStop ) { + // a stop point keeps the margins its W4 parameters (head or middle of the consist, + // platform length) were set up against + fMinProximityDist = std::clamp( 5 + iVehicles, 10, 15 ); + fMaxProximityDist = std::clamp( 10 + iVehicles, 15, 40 ); + if( IsCargoTrain ) { + fMinProximityDist += 10.0; + } + } + else { + // a train stops 8-15 m short of the signal whatever its length; closer than the lower + // edge it stops at once, the braking aims at the middle of the window, 3.5 m further out + fMinProximityDist = 8.0; + // the final approach begins far enough out to slow from the coasting speed down to the window, + // and at the same distance whether the train is moving or standing, so it does not flip + // between creeping closer and holding still when it comes to a stand short of the window + fMaxProximityDist = 50.0; + } if( IsCargoTrain ) { - // increase distances for cargo trains to take into account slower reaction to brakes - fMinProximityDist += 10.0; + // start the final approach earlier for cargo trains, their brakes react more slowly fMaxProximityDist += 10.0; /* if( IsHeavyCargoTrain ) { @@ -6683,7 +6711,7 @@ TController::determine_proximity_ranges() { if( mvOccupied->Vel < 0.1 ) { // jak stanie za daleko, to niech nie dociąga paru metrów - fMaxProximityDist = 50.0; + fMaxProximityDist = std::max( fMaxProximityDist, 50.0 ); } if( iDrivigFlags & moveLate ) { @@ -7314,6 +7342,26 @@ TController::pick_optimal_speed( double const Range ) { is_car() ? -2.0 : -0.9, is_car() ? 2.0 : 0.9 ); + if( ( true == is_train() ) + && ( ( OrderCurrentGet() & Obey_train ) != 0 ) + && ( VelNext == 0.0 ) + && ( ActualProximityDist <= fMaxProximityDist ) + && ( fAccGravity < -0.025 ) ) { + // uphill, the gradient alone brings a slow train to a stand within metres, far sooner than a released + // brake applies; so the train brake goes on while the train is coming to a stand, stays on while it + // stands, and is applied for real if the train has started to roll back. done last, so that none of + // the adjustments above, made for a train moving forward, can undo it + auto const vel { DirectionalVel() }; + if( std::abs( vel ) < EU07_AI_NOMOVEMENT ) { + VelDesired = 0.0; + AccDesired = std::min( AccDesired, EU07_AI_NOACCELERATION ); + } + else if( ( vel < 0.0 ) + || ( ( vel < 5.0 ) && ( AccDesired < 0.0 ) ) ) { + AccDesired = std::min( AccDesired, fAccGravity - 0.15 ); + } + } + // if the route ahead is blocked we might need to head the other way check_route_behind( 1000 ); // NOTE: legacy scan range value } @@ -7502,6 +7550,55 @@ brake_response_horizon( TMoverParameters const *Vehicle, TBrakeSystem const Brak return horizon; } +// distance [m] in which the gradient alone, with no brake and no power, brings a train rolling uphill at Velocity [km/h] to a stand +static double +uphill_stopping_distance( double const Velocity, double const Gravity ) { + return ( Velocity / 3.6 ) * ( Velocity / 3.6 ) / ( 2.0 * std::max( 0.01, -Gravity ) ); +} + +// speed [km/h] from which the gradient alone brings a train rolling uphill to a stand in Distance [m] +static double +uphill_coasting_speed( double const Distance, double const Gravity ) { + return 3.6 * std::sqrt( 2.0 * std::max( 0.01, -Gravity ) * std::max( 0.0, Distance ) ); +} + +// resultant acceleration [m/s2] to ask for now so that a steady application of the pneumatic brake takes the train +// from Velocity down to Target [km/h] over Distance [m], with the brake force following the speed the way the +// consist brake table says it does (cast iron blocks grip harder as the train slows) +static double +shaped_braking_demand( + double const Velocity, double const Target, double const Distance, double const Gravity, + double const Vmax, double const *Brakea0, double const *Brakea1, int const Tablesize ) { + + auto const fullbraking = [&]( double const Kmh ) { + auto const index { std::clamp( static_cast( Tablesize * Kmh / std::max( 1.0, Vmax ) ), 1, Tablesize ) }; + return std::max( 0.01, Brakea0[ index ] + 12.0 * Brakea1[ index ] ); }; + auto const travel = [&]( double const Ratio ) { + auto const steps { 24 }; + auto const step { ( Velocity - Target ) / steps }; + auto distance { 0.0 }; + for( auto i { 0 }; i < steps; ++i ) { + auto const kmh { Target + ( i + 0.5 ) * step }; + auto const deceleration { Ratio * fullbraking( kmh ) - Gravity }; + if( deceleration <= 0.001 ) { + return std::numeric_limits::max(); + } + distance += ( kmh / 3.6 ) * ( step / 3.6 ) / deceleration; + } + return distance; }; + + auto low { 0.0 }; + auto high { 3.0 }; + if( travel( high ) > Distance ) { + return Gravity - high * fullbraking( Velocity ); + } + for( auto i { 0 }; i < 30; ++i ) { + auto const middle { 0.5 * ( low + high ) }; + ( travel( middle ) > Distance ? low : high ) = middle; + } + return Gravity - high * fullbraking( Velocity ); +} + void TController::adjust_desired_speed_for_target_speed( double const Range ) { // ustalanie zadanego przyspieszenia @@ -7552,9 +7649,33 @@ TController::adjust_desired_speed_for_target_speed( double const Range ) { } else { // hamowanie tak, aby stanąć - VelDesired = VelNext; - AccDesired = ( VelNext * VelNext - vel * vel ) / ( 25.92 * ( ActualProximityDist + 0.1 - 0.5*fMinProximityDist ) ); - AccDesired = std::min( AccDesired, fAccThreshold ); + if( ( OrderCurrentGet() & Obey_train ) == 0 ) { + VelDesired = VelNext; + AccDesired = ( VelNext * VelNext - vel * vel ) / ( 25.92 * ( ActualProximityDist + 0.1 - 0.5*fMinProximityDist ) ); + AccDesired = std::min( AccDesired, fAccThreshold ); + } + else { + // a train keeps its desired speed until the lower edge of the stopping window (a desired + // speed of 0 here asks for hard braking whatever the distance left), aims at the middle + // of the window, and asks only for what that takes + auto const stoppingroom { std::max( 0.5, ActualProximityDist - stopping_margin() ) }; + AccDesired = ( + BrakeSystem == TBrakeSystem::Pneumatic ? + // cast iron blocks grip harder as the train comes to a stand + shaped_braking_demand( + vel, VelNext, stoppingroom, fAccGravity, + mvOccupied->Vmax, fBrake_a0, fBrake_a1, BrakeAccTableSize ) : + ( VelNext * VelNext - vel * vel ) / ( 25.92 * stoppingroom ) ); + if( ( fAccGravity < -0.025 ) + && ( AccDesired >= fAccGravity - 0.001 ) // no brake needed at all + && ( ActualProximityDist - uphill_stopping_distance( vel, fAccGravity ) > stopping_margin() ) ) { + // uphill the gradient alone would bring the train to a stand short of the + // middle of the stopping window; keep it rolling at the present speed until that changes, + // but no faster than the gradient alone can take off by the middle of the window + AccDesired = std::min( 0.0, AccPreferred ); + VelDesired = min_speed( VelDesired, uphill_coasting_speed( ActualProximityDist - stopping_margin(), fAccGravity ) ); + } + } } } else { @@ -7578,17 +7699,57 @@ TController::adjust_desired_speed_for_target_speed( double const Range ) { if( brakingdistance + std::max(slowdowndistance, fMaxProximityDist) >= ActualProximityDist - fMaxProximityDist ) { // don't slow down prematurely; as long as we have room to come to a full stop at a safe distance, we're good // ensure some minimal coasting speed, otherwise a vehicle entering this zone at very low speed will be crawling forever - auto const brakingpointoffset = VelNext * braking_distance_multiplier( VelNext ); - AccDesired = std::min( - AccDesired, - ( VelNext * VelNext - vel * vel ) - / ( 25.92 - * std::max( - ActualProximityDist - brakingpointoffset, - std::min( - ActualProximityDist, - brakingpointoffset ) ) - + 0.1 ) ); // najpierw hamuje mocniej, potem zluzuje + auto const brakingpointoffset = ( + ( VelNext == 0.0 ) && is_train() && ( OrderCurrentGet() & Obey_train ) ? + stopping_margin() : // the same stopping point as the final approach + VelNext * braking_distance_multiplier( VelNext ) ); + // a pneumatic brake acts on the state the train will be in once it has responded; while the + // train is still speeding up, plan the deceleration from there, so more is asked for at once + auto velocity { vel }; + auto distance { ActualProximityDist }; + if( ( BrakeSystem == TBrakeSystem::Pneumatic ) + && ( AbsAccS > 0.0 ) ) { + auto const horizon { brake_response_horizon( mvOccupied, BrakeSystem, AbsAccS, fBrake_a0[ 0 ] ) }; + velocity = vel + 3.6 * horizon * AbsAccS; + distance = std::max( 0.5 * ActualProximityDist, ActualProximityDist - ( vel + velocity ) * 0.5 / 3.6 * horizon ); + } + auto const brakingroom { + std::max( + distance - brakingpointoffset, + std::min( + distance, + brakingpointoffset ) ) }; + auto deceleration { ( VelNext * VelNext - velocity * velocity ) / ( 25.92 * brakingroom + 0.1 ) }; + if( ( BrakeSystem == TBrakeSystem::Pneumatic ) && ( velocity > VelNext ) ) { + // follow the shape of the consist brake force over speed rather than assume a constant + // deceleration, over the distance left once the brake has had time to fill (while the + // train is still speeding up, the prediction above has taken that off already) + auto room { brakingroom }; + if( ( AbsAccS <= 0.0 ) + && ( ( VelNext > 0.0 ) || ( BrakeCtrlPosition <= 0.0 ) ) ) { // for a stop, only while the brake is still to be applied + room = std::max( + 0.5 * brakingroom, + brakingroom - vel / 3.6 * brake_response_horizon( mvOccupied, BrakeSystem, 1.0, fBrake_a0[ 0 ] ) ); + } + deceleration = shaped_braking_demand( + velocity, VelNext, room + 0.1 / 25.92, fAccGravity, + mvOccupied->Vmax, fBrake_a0, fBrake_a1, BrakeAccTableSize ); + } + AccDesired = std::min( AccDesired, deceleration ); // najpierw hamuje mocniej, potem zluzuje + if( vel > VelNext ) { + if( deceleration < fAccGravity - 0.001 ) { + // no power while still above the speed being braked for + AccDesired = std::min( AccDesired, EU07_AI_NOACCELERATION ); + } + else if( ( fAccGravity < -0.025 ) + && ( ( OrderCurrentGet() & Obey_train ) != 0 ) + && ( ActualProximityDist - uphill_stopping_distance( vel, fAccGravity ) > brakingpointoffset ) ) { + // uphill the gradient alone slows the train down more than it is asked to; + // keep it rolling at the present speed until that changes + AccDesired = std::min( 0.0, AccPreferred ); + VelDesired = min_speed( VelDesired, uphill_coasting_speed( ActualProximityDist - brakingpointoffset, fAccGravity ) ); + } + } } } } @@ -7959,7 +8120,13 @@ void TController::control_tractive_force() { if( ActualProximityDist > (is_car() ? fMinProximityDist : // cars are allowed to move within min proximity distance fMaxProximityDist) ? // other vehicle types keep wider margin true : - velocity + 1.0 < VelNext ) { + ( velocity + 1.0 < VelNext ) + // uphill, a train told to hold its speed on the way to a stop needs the power to do it + || ( ( VelNext == 0.0 ) + && ( ( OrderCurrentGet() & Obey_train ) != 0 ) + && ( AccDesired >= 0.0 ) + && ( fAccGravity < -0.025 ) + && ( ActualProximityDist > fMinProximityDist ) ) ) { // ...to można przyspieszyć increase_tractive_force(); } @@ -8039,9 +8206,10 @@ void TController::control_braking_force() { auto const AccMax{ std::min(fBrake_a0[0] + 12 * fBrake_a1[0], mvOccupied->MED_amax) }; auto const accmargin = AccMax > 1.1 * AccDesired && fAccGravity < 0.025 ? 0.05 : 0.0; - if( AccDesired < accthreshold // jeśli hamować - u góry ustawia się hamowanie na fAccThreshold - && ( AbsAccS > accdesiredresultant + accmargin - || BrakeCtrlPosition < 0 ) ) { + if( ( AccDesired < accthreshold // jeśli hamować - u góry ustawia się hamowanie na fAccThreshold + && ( AbsAccS > accdesiredresultant + accmargin + || BrakeCtrlPosition < 0 ) ) + || ( fAccGravity < -0.05 && velocity < -0.1 && AccDesired < 0.0 ) ) { // also brake if uphill and slipping back // hamować bardziej, gdy aktualne opóźnienie hamowania mniejsze niż (AccDesired) cue_action( driver_hint::brakingforceincrease ); } @@ -8084,7 +8252,8 @@ void TController::control_braking_force() { * 0.5 ); // Ra: tymczasowo, bo przeżyna S1 } } - if ( accdesiredresultant < fAccGravity - 0.05 + if ( ( accdesiredresultant < fAccGravity - 0.05 + || AccDesired >= EU07_AI_NOACCELERATION ) // no braking asked for, yet the train is slowing down more than that && accdesiredresultant - fBrake_a1[0] * 0.51 - AbsAccS > 0.05 ) { // jak hamuje, to nie tykaj kranu za często // yB: luzuje hamulec dopiero przy różnicy opóźnień rzędu 0.2 diff --git a/vehicle/Driver.h b/vehicle/Driver.h index c493afc8a..0e65a4b94 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -353,6 +353,12 @@ private: void control_tractive_force(); void increase_tractive_force(); void control_braking_force(); + // how far short of a stop the AI aims: in train running the middle of the 8-15 m window before a signal, + // otherwise (a W4 stop point, shunting, coupling) half the minimum proximity distance, as before + double stopping_margin() const { + return ( ( OrderCurrentGet() & Obey_train ) != 0 ) && ( false == IsAtPassengerStop ) ? + fMinProximityDist + 3.5 : + 0.5 * fMinProximityDist; } void apply_independent_brake_only(); void check_route_ahead( double const Range ); void check_route_behind( double const Range ); @@ -387,6 +393,7 @@ private: double AccDesired = 0.0; // przyspieszenie, jakie ma utrzymywać (<0:nie przyspieszaj,<-0.1:hamuj) double VelDesired = 0.0; // predkość, z jaką ma jechać, wynikająca z analizy tableki; <=VelSignal double fAccDesiredAv = 0.0; // uśrednione przyspieszenie z kolejnych przebłysków świadomości, żeby ograniczyć migotanie + double fBrakeHeldTime = 0.0; // czas od ostatniego przestawienia kranu hamulca zasadniczego double fAccDesiredGravity = 0.0; // część AccDesired odjęta na spadku jako kompensacja pochylenia; AbsAccS zawiera ją już sam double VelforDriver = -1.0; // prędkość, używana przy zmianie kierunku (ograniczenie przy nieznajmości szlaku?) double VelSignal = 0.0; // ograniczenie prędkości z kompilacji znaków i sygnałów // normalnie na początku ma stać, no chyba że jedzie From 551f6dbc3bb7d756d50c5e07f5109377898b26de Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Mon, 28 Sep 2026 20:49:18 +0200 Subject: [PATCH 010/430] seasonal model variants for vehicle exterior model --- rendering/opengl33renderer.cpp | 8 ++++++-- rendering/openglrenderer.cpp | 4 +++- vehicle/DynObj.cpp | 21 +++++++++++++++++++++ vehicle/DynObj.h | 5 +++++ 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index 5419bbcdf..b99378162 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -3730,7 +3730,9 @@ void opengl33_renderer::Render(TSubModel *Submodel) case rendermode::shadows: { // skip if the shadow caster rank is too low for currently set threshold - if( Material( Submodel ).shadow_rank > Global.gfx_shadow_rank_cutoff ) + // or if the submodel is hidden (colour pass only fades it out, e.g. inactive seasonal variant) + if( ( Material( Submodel ).shadow_rank > Global.gfx_shadow_rank_cutoff ) + || ( Submodel->fVisible <= 0.f ) ) { --m_renderpass.draw_stats.submodels; --m_renderpass.draw_stats.drawcalls; @@ -4630,7 +4632,9 @@ void opengl33_renderer::Render_Alpha(TSubModel *Submodel) case rendermode::shadows: { // skip if the shadow caster rank is too low for currently set threshold - if( Material( Submodel ).shadow_rank > Global.gfx_shadow_rank_cutoff ) + // or if the submodel is hidden (colour pass only fades it out, e.g. inactive seasonal variant) + if( ( Material( Submodel ).shadow_rank > Global.gfx_shadow_rank_cutoff ) + || ( Submodel->fVisible <= 0.f ) ) { --m_renderpass.draw_stats.submodels; --m_renderpass.draw_stats.drawcalls; diff --git a/rendering/openglrenderer.cpp b/rendering/openglrenderer.cpp index 1da66ba51..6f06e9b33 100644 --- a/rendering/openglrenderer.cpp +++ b/rendering/openglrenderer.cpp @@ -2863,7 +2863,9 @@ opengl_renderer::Render( TSubModel *Submodel ) { } case rendermode::shadows: { // skip if the shadow caster rank is too low for currently set threshold - if( Material( Submodel ).shadow_rank > Global.gfx_shadow_rank_cutoff ) + // or if the submodel is hidden (colour pass only fades it out, e.g. inactive seasonal variant) + if( ( Material( Submodel ).shadow_rank > Global.gfx_shadow_rank_cutoff ) + || ( Submodel->fVisible <= 0.f ) ) { --m_renderpass.draw_stats.submodels; --m_renderpass.draw_stats.drawcalls; diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index e84af6137..9f8fd161c 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -800,6 +800,19 @@ TDynamicObject::set_cab_lights( int const Cab, float const Level ) { } } +// aktualizujemy submodele w zaleznosci od aktualnej pory roku +void TDynamicObject::on_season_update() +{ + if (sm_winter_variant != nullptr) // pokazujemy wariant zimowy + sm_winter_variant->SetVisibilityLevel(Global.Season == "winter:" ? 1 : 0, true, false); + if (sm_spring_variant != nullptr) // pokazujemy wariant wiosenny + sm_spring_variant->SetVisibilityLevel(Global.Season == "spring:" ? 1 : 0, true, false); + if (sm_summer_variant != nullptr) // pokazujemy wariant letni + sm_summer_variant->SetVisibilityLevel(Global.Season == "summer:" ? 1 : 0, true, false); + if (sm_autumn_variant != nullptr) // pokazujemy wariant jesienny + sm_autumn_variant->SetVisibilityLevel(Global.Season == "autumn:" ? 1 : 0, true, false); +} + // ABu 29.01.05 przeklejone z render i renderalpha: ********************* void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) { // ABu290105: pozbierane i uporzadkowane powtarzajace @@ -814,6 +827,10 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) if (vFloor.z > 0.0) mdLoad->GetSMRoot()->SetTranslate(modelShake + vFloor); + // model jest współdzielony przez pojazdy, a pora roku może się zmienić w trakcie symulacji + if (Global.UpdateMaterials) + on_season_update(); + if (ObjSqrDist < 400 * 400 ) // gdy bliżej niż 400m { for( auto &animation : pAnimations ) { @@ -2493,6 +2510,10 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" smBogie[0]->WillBeAnimated(); if (smBogie[1]) smBogie[1]->WillBeAnimated(); + sm_winter_variant = mdModel->GetFromName("winter_variant"); + sm_spring_variant = mdModel->GetFromName("spring_variant"); + sm_summer_variant = mdModel->GetFromName("summer_variant"); + sm_autumn_variant = mdModel->GetFromName("autumn_variant"); } // ABu: zainicjowanie zmiennej, zeby nic sie nie ruszylo w pierwszej klatce, // potem juz liczona prawidlowa wartosc masy diff --git a/vehicle/DynObj.h b/vehicle/DynObj.h index c48e40e14..36335a320 100644 --- a/vehicle/DynObj.h +++ b/vehicle/DynObj.h @@ -310,6 +310,10 @@ private: TSubModel *smWahacze[4]; // wahacze (np. nogi, dźwignia w drezynie) TSubModel *smBrakeMode; // Ra 15-01: nastawa hamulca też TSubModel *smLoadMode; // Ra 15-01: nastawa próżny/ładowny + TSubModel *sm_winter_variant {}; // submodel zimowego wariantu + TSubModel *sm_spring_variant {}; // submodel wiosennego wariantu + TSubModel *sm_summer_variant {}; // submodel letniego wariantu + TSubModel *sm_autumn_variant {}; // submodel jesiennego wariantu double fWahaczeAmp; // Winger 160204 - pantografy double pantspeedfactor; @@ -462,6 +466,7 @@ private: void ABuLittleUpdate(double ObjSqrDist); void ABuBogies(); void ABuModelRoll(); + void on_season_update(); void TurnOff(); // update state of load exchange operation void update_exchange( double const Deltatime ); From 4137f5504ae71ee0bdd4415ac9dfba593e64d335 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Mon, 28 Sep 2026 21:07:53 +0200 Subject: [PATCH 011/430] fix: sonar sast fixes - sonar.yml, nosonar, linux chmod modification --- .github/workflows/sonar.yml | 22 +++++++++++++++++++--- application/application.cpp | 2 +- sonar-project.properties | 4 +++- utilities/Globals.h | 10 ++++++++-- utilities/uart.cpp | 4 ++-- vehicle/Driver.cpp | 2 +- vehicle/DynObj.cpp | 3 ++- 7 files changed, 36 insertions(+), 11 deletions(-) diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 8140317ea..66213c236 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -70,7 +70,9 @@ jobs: pull-requests: read # verify PR head sha via the API env: BUILD_WRAPPER_OUT_DIR: bw-output - SONAR_EXCLUSIONS: betterRenderer/**,ref/**,imgui/**,stb/**,build/**,bw-output/** + # .trusted/ holds the checkout of master used to restore the scanner config; + # it is not part of the analysed change. + SONAR_EXCLUSIONS: betterRenderer/**,ref/**,imgui/**,stb/**,build/**,bw-output/**,.trusted/** SONAR_SCANNER_JAVA_OPTS: -Xmx5g steps: - name: Post pending status @@ -102,12 +104,26 @@ jobs: - name: Unpack analysis input run: | set -euo pipefail + # The archive holds the whole PR workspace and is unpacked over this one, + # .trusted/ included. Move the trusted config out of reach first, or a PR + # carrying its own .trusted/sonar-project.properties would have it planted + # here and restored below as if it came from master. + if [ -f "$GITHUB_WORKSPACE/.trusted/sonar-project.properties" ]; then + cp "$GITHUB_WORKSPACE/.trusted/sonar-project.properties" /tmp/trusted-sonar-project.properties + fi + # Nothing may be written outside the workspace: reject absolute members and + # any member reaching through a parent directory before unpacking anything. + tar -tzf /tmp/sonar-input/workspace.tar.gz > /tmp/archive-members.txt + if grep -qE '^/|(^|/)[.][.](/|$)' /tmp/archive-members.txt; then + echo "::error::archive contains paths outside the workspace" + exit 1 + fi tar -xzf /tmp/sonar-input/workspace.tar.gz -C "$GITHUB_WORKSPACE" # Strip PR-controlled scanner configuration, restore the trusted one. rm -f "$GITHUB_WORKSPACE/sonar-project.properties" \ "$GITHUB_WORKSPACE/.sonarcloud.properties" - if [ -f "$GITHUB_WORKSPACE/.trusted/sonar-project.properties" ]; then - cp "$GITHUB_WORKSPACE/.trusted/sonar-project.properties" "$GITHUB_WORKSPACE/" + if [ -f /tmp/trusted-sonar-project.properties ]; then + cp /tmp/trusted-sonar-project.properties "$GITHUB_WORKSPACE/sonar-project.properties" fi - name: Resolve and verify PR metadata diff --git a/application/application.cpp b/application/application.cpp index a6b88ae87..26af01fab 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -1105,7 +1105,7 @@ void eu07_application::init_files() #elif __unix__ unlink("log.txt"); unlink("errors.txt"); - mkdir("logs", 0755); + mkdir("logs", 0750); #endif } namespace fs = std::filesystem; diff --git a/sonar-project.properties b/sonar-project.properties index 2e3fc88bd..a1e5b66c5 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,9 @@ sonar.sources=. sonar.sourceEncoding=UTF-8 # Exclusions -sonar.exclusions=betterRenderer/**,ref/**,imgui/**,stb/**,build/**,bw-output/** +# .trusted/ is the copy of master the analysis workflow checks out to restore its +# own configuration; analysing it would duplicate every file of the base branch. +sonar.exclusions=betterRenderer/**,ref/**,imgui/**,stb/**,build/**,bw-output/**,.trusted/** # Excluding all files from coverage making the gate skip that # instead of failing it. diff --git a/utilities/Globals.h b/utilities/Globals.h index c4bd26f67..d0f707017 100644 --- a/utilities/Globals.h +++ b/utilities/Globals.h @@ -38,8 +38,14 @@ struct global_settings { bool shiftState{ false }; //m7todo: brzydko bool ctrlState{ false }; bool altState{ false }; - std::mt19937 random_engine; - std::mt19937 local_random_engine; + // Simulation randomness, never used for anything security related: no keys, tokens or + // credentials come out of these. Reproducibility is a requirement here, which is why both + // are plain mt19937 -- the run's seed can be written down and passed on, and it travels in + // server_hello so that every client in a session replays the same sequence. A generator + // that cannot be seeded to a known state would break both of those. + std::mt19937 random_engine; // NOSONAR shared run seed, kept in sync across the network + std::mt19937 local_random_engine; // NOSONAR re-seeded from a true random source in init_modes, + // drives purely local cosmetics (sound pitch, editor placement) bool ready_to_load{ false }; std::time_t starting_timestamp = 0; // starting time, in local timezone uint32_t random_seed = 0; diff --git a/utilities/uart.cpp b/utilities/uart.cpp index cac7a1986..ab5060fab 100644 --- a/utilities/uart.cpp +++ b/utilities/uart.cpp @@ -399,7 +399,7 @@ void uart_input::poll() char buf[buffer.size() * 3 + 1]; size_t pos = 0; for (uint8_t b : buffer) - pos += sprintf(&buf[pos], "%02X ", b); + pos += snprintf(&buf[pos], sizeof(buf) - pos, "%02X ", b); WriteLog("uart: rx: " + std::string(buf)); } @@ -635,7 +635,7 @@ void uart_input::poll() buf[ buffer.size() * 3 ] = 0; size_t pos = 0; for (uint8_t b : buffer) - pos += sprintf(&buf[pos], "%02X ", b); + pos += snprintf(&buf[pos], sizeof(buf) - pos, "%02X ", b); WriteLog("uart: tx: " + std::string(buf)); } diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 9a6de8596..9771f7db6 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -1901,7 +1901,7 @@ TController::TController(bool AI, TDynamicObject *NewControll, bool InitPsyche, #ifdef _WIN32 CreateDirectory( "physicslog", nullptr); #elif __unix__ - mkdir( "physicslog", 0744 ); + mkdir( "physicslog", 0740 ); #endif LogFile.open( std::string( "physicslog/" + VehicleName + ".dat" ), std::ios::in | std::ios::out | std::ios::trunc ); diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index e84af6137..57cc86609 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -3024,7 +3024,8 @@ TDynamicObject::update_load_offset() { void TDynamicObject::shuffle_load_order() { - std::shuffle( std::begin( SectionLoadOrder ), std::end( SectionLoadOrder ), Global.random_engine ); + // order of visible load chunks, nothing security related -- see the engines in Globals.h + std::shuffle( std::begin( SectionLoadOrder ), std::end( SectionLoadOrder ), Global.random_engine ); // NOSONAR // shift chunks assigned to corridors to the end of the list, so they show up last std::stable_partition( std::begin( SectionLoadOrder ), std::end( SectionLoadOrder ), From 176427f96b26767b81d3da0303dc7890869e22da Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Mon, 28 Sep 2026 21:08:15 +0200 Subject: [PATCH 012/430] refactor: sonar c++20 changes (#185) --- application/application.cpp | 7 +--- launcher/scenery_list.cpp | 2 +- launcher/vehicle_picker.cpp | 2 +- model/Model3d.cpp | 13 +++--- model/Texture.cpp | 6 +-- network/backend/asio.cpp | 6 ++- network/message.h | 16 ++++---- rendering/screenshot.cpp | 8 ++-- scene/sn_utils.cpp | 20 +++++---- simulation/simulationstateserializer.cpp | 5 ++- simulation/simulationtime.cpp | 3 +- utilities/Globals.cpp | 20 ++------- utilities/Logs.cpp | 3 +- utilities/utilities.cpp | 22 ++++++++++ utilities/utilities.h | 4 ++ vehicle/Driver.cpp | 52 ++++++++++-------------- vehicle/Driver.h | 6 +-- widgets/trainingcard.cpp | 22 +++++----- 18 files changed, 111 insertions(+), 106 deletions(-) diff --git a/application/application.cpp b/application/application.cpp index 26af01fab..ceb5ec6c7 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -1479,11 +1479,8 @@ bool eu07_application::init_network() // TODO: sort out this timezone mess std::time_t utc_now = std::time(nullptr); - tm tm_local, tm_utc; - tm *tmp = std::localtime(&utc_now); - memcpy(&tm_local, tmp, sizeof(tm)); - tmp = std::gmtime(&utc_now); - memcpy(&tm_utc, tmp, sizeof(tm)); + std::tm const tm_local = local_tm(utc_now); + std::tm const tm_utc = utc_tm(utc_now); int64_t offset = tm_local.tm_hour * 3600 + tm_local.tm_min * 60 + tm_local.tm_sec - (tm_utc.tm_hour * 3600 + tm_utc.tm_min * 60 + tm_utc.tm_sec); diff --git a/launcher/scenery_list.cpp b/launcher/scenery_list.cpp index 0b49e80f1..77f69a350 100644 --- a/launcher/scenery_list.cpp +++ b/launcher/scenery_list.cpp @@ -281,7 +281,7 @@ void ui::scenerylist_panel::draw_trainset(trainset_desc &trainset) for (auto &dyn_desc : trainset.vehicles) { deferred_image *mini = nullptr; - if (dyn_desc.skin && dyn_desc.skin->mini.get() != -1) + if (dyn_desc.skin && dyn_desc.skin->mini.get() != (GLuint)-1) mini = &dyn_desc.skin->mini; else mini = &placeholder_mini; diff --git a/launcher/vehicle_picker.cpp b/launcher/vehicle_picker.cpp index 88c40ef9b..f7d3503fc 100644 --- a/launcher/vehicle_picker.cpp +++ b/launcher/vehicle_picker.cpp @@ -270,7 +270,7 @@ bool ui::vehiclepicker_panel::selectable_image(const char *desc, bool selected, } GLuint tex = image->get(); - if (tex != -1) { + if (tex != (GLuint)-1) { glm::ivec2 size = image->size(); float width = 30.0f / size.y * size.x; ImGui::SameLine(ImGui::GetContentRegionAvail().x - width); diff --git a/model/Model3d.cpp b/model/Model3d.cpp index 38f39080f..fba07446f 100644 --- a/model/Model3d.cpp +++ b/model/Model3d.cpp @@ -24,6 +24,8 @@ Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others #include "world/mtable.h" #include "scene/sn_utils.h" +#include + //--------------------------------------------------------------------------- using namespace Mtable; @@ -224,16 +226,13 @@ inline void readMatrix(cParser &parser, float4x4 &matrix) template void UserdataParse(cParser &parser, gfx::vertex_userdata &vertex) { + static_assert(sizeof(T) == sizeof(float), "userdata is stored as raw 32-bit values"); parser.getTokens(4); - union - { - T InType; - float FloatType; - } buf{}; for (int i = 0; i < 4; ++i) { - parser >> buf.InType; - vertex.data[i] = buf.FloatType; + T value{}; + parser >> value; + vertex.data[i] = std::bit_cast(value); } } diff --git a/model/Texture.cpp b/model/Texture.cpp index a53976630..5c1d852f4 100644 --- a/model/Texture.cpp +++ b/model/Texture.cpp @@ -394,12 +394,12 @@ opengl_texture::make_from_memory(size_t width, size_t height, const uint8_t *raw void opengl_texture::update_from_memory(size_t width, size_t height, const uint8_t *raw) { - if (id != -1 && (width != data_width || height != data_height || GL_SRGB8_ALPHA8 != data_format || GL_RGBA != data_components)) + if (id != (GLuint)-1 && (width != data_width || height != data_height || GL_SRGB8_ALPHA8 != data_format || GL_RGBA != data_components)) { glDeleteTextures(1, &id); - id = -1; + id = (GLuint)-1; } - if (id == -1) + if (id == (GLuint)-1) { data_width = width; data_height = height; diff --git a/network/backend/asio.cpp b/network/backend/asio.cpp index 958b084ec..c2d1364d8 100644 --- a/network/backend/asio.cpp +++ b/network/backend/asio.cpp @@ -12,8 +12,10 @@ network::tcp::connection::connection(asio::io_context &io_ctx, bool client, size network::tcp::connection::~connection() { - m_socket.shutdown(m_socket.shutdown_both); - m_socket.close(); + // error_code overloads: the throwing ones would escape the destructor, e.g. when the peer is already gone + asio::error_code ec; + m_socket.shutdown(m_socket.shutdown_both, ec); + m_socket.close(ec); } void network::tcp::connection::disconnect() diff --git a/network/message.h b/network/message.h index 43ad13ec7..871e833f9 100644 --- a/network/message.h +++ b/network/message.h @@ -30,17 +30,17 @@ struct client_hello : public message virtual void serialize(std::ostream &stream) const override; virtual void deserialize(std::istream &stream) override; - int32_t version; - uint32_t start_packet; + int32_t version{}; + uint32_t start_packet{}; }; struct server_hello : public message { server_hello() : message(SERVER_HELLO) {} - uint32_t seed; - int64_t timestamp; - int64_t config; + uint32_t seed{}; + int64_t timestamp{}; + int64_t config{}; std::string scenario; virtual void serialize(std::ostream &stream) const override; @@ -62,9 +62,9 @@ struct frame_info : public request_command { frame_info() : request_command(FRAME_INFO) {} - double render_dt; - double dt; - double sync; + double render_dt{}; + double dt{}; + double sync{}; virtual void serialize(std::ostream &stream) const override; virtual void deserialize(std::istream &stream) override; diff --git a/rendering/screenshot.cpp b/rendering/screenshot.cpp index 285679b7e..eb7e7aac0 100644 --- a/rendering/screenshot.cpp +++ b/rendering/screenshot.cpp @@ -2,6 +2,7 @@ #include "rendering/screenshot.h" #include "utilities/Globals.h" #include "utilities/Logs.h" +#include "utilities/utilities.h" #include void screenshot_manager::screenshot_save_thread( char *img, int w, int h ) @@ -29,11 +30,8 @@ void screenshot_manager::screenshot_save_thread( char *img, int w, int h ) } char datetime[64]; - time_t timer; - struct tm* tm_info; - time(&timer); - tm_info = localtime(&timer); - strftime(datetime, 64, "%Y-%m-%d_%H-%M-%S", tm_info); + std::tm const tm_info = local_tm(std::time(nullptr)); + strftime(datetime, 64, "%Y-%m-%d_%H-%M-%S", &tm_info); uint64_t perf; #ifdef _WIN32 diff --git a/scene/sn_utils.cpp b/scene/sn_utils.cpp index 71e6549c8..08825d91c 100644 --- a/scene/sn_utils.cpp +++ b/scene/sn_utils.cpp @@ -5,6 +5,8 @@ #include "stdafx.h" #include "scene/sn_utils.h" +#include + // sanity checks static_assert(std::numeric_limits::is_iec559, "IEEE754 required"); static_assert(sizeof(float) == 4, "Float must be 4 bytes"); @@ -17,7 +19,7 @@ uint16_t sn_utils::ld_uint16(std::istream &s) uint8_t buf[2]; s.read((char*)buf, 2); uint16_t v = buf[1] << 8 | buf[0]; - return reinterpret_cast(v); + return v; } // deserialize little endian uint32 @@ -26,7 +28,7 @@ uint32_t sn_utils::ld_uint32(std::istream &s) uint8_t buf[4]; s.read((char*)buf, 4); uint32_t v = buf[3] << 24 | buf[2] << 16 | buf[1] << 8 | buf[0]; - return reinterpret_cast(v); + return v; } // deserialize little endian int32 @@ -35,7 +37,7 @@ int32_t sn_utils::ld_int32(std::istream &s) uint8_t buf[4]; s.read((char*)buf, 4); uint32_t v = buf[3] << 24 | buf[2] << 16 | buf[1] << 8 | buf[0]; - return reinterpret_cast(v); + return static_cast(v); } // deserialize little endian uint64 @@ -47,7 +49,7 @@ uint64_t sn_utils::ld_uint64(std::istream &s) (uint64_t)buf[5] << 40 | (uint64_t)buf[4] << 32 | (uint64_t)buf[3] << 24 | (uint64_t)buf[2] << 16 | (uint64_t)buf[1] << 8 | (uint64_t)buf[0]; - return reinterpret_cast(v); + return v; } // deserialize little endian int64 @@ -59,7 +61,7 @@ int64_t sn_utils::ld_int64(std::istream &s) (uint64_t)buf[5] << 40 | (uint64_t)buf[4] << 32 | (uint64_t)buf[3] << 24 | (uint64_t)buf[2] << 16 | (uint64_t)buf[1] << 8 | (uint64_t)buf[0]; - return reinterpret_cast(v); + return static_cast(v); } // deserialize little endian ieee754 float32 @@ -68,7 +70,7 @@ float sn_utils::ld_float32(std::istream &s) uint8_t buf[4]; s.read((char*)buf, 4); uint32_t v = buf[3] << 24 | buf[2] << 16 | buf[1] << 8 | buf[0]; - return reinterpret_cast(v); + return std::bit_cast(v); } // deserialize little endian ieee754 float64 @@ -80,7 +82,7 @@ double sn_utils::ld_float64(std::istream &s) (uint64_t)buf[5] << 40 | (uint64_t)buf[4] << 32 | (uint64_t)buf[3] << 24 | (uint64_t)buf[2] << 16 | (uint64_t)buf[1] << 8 | (uint64_t)buf[0]; - return reinterpret_cast(v); + return std::bit_cast(v); } // deserialize null-terminated string @@ -195,7 +197,7 @@ void sn_utils::ls_int64(std::ostream &s, int64_t v) void sn_utils::ls_float32(std::ostream &s, float t) { - uint32_t v = reinterpret_cast(t); + uint32_t v = std::bit_cast(t); uint8_t buf[4]; buf[0] = v; buf[1] = v >> 8; @@ -206,7 +208,7 @@ void sn_utils::ls_float32(std::ostream &s, float t) void sn_utils::ls_float64(std::ostream &s, double t) { - uint64_t v = reinterpret_cast(t); + uint64_t v = std::bit_cast(t); uint8_t buf[8]; buf[0] = v; buf[1] = v >> 8; diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index ef7cd7dbd..99a733d36 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -27,6 +27,7 @@ http://mozilla.org/MPL/2.0/. #include "application/application.h" #include "rendering/renderer.h" #include "utilities/Logs.h" +#include "utilities/utilities.h" #include "editor/editorTerrainStreamer.hpp" namespace simulation { @@ -393,8 +394,8 @@ void state_serializer::init_time() { auto &time = simulation::Time.data(); if( true == Global.ScenarioTimeCurrent ) { // calculate time shift required to match scenario time with local clock - auto const *localtime = std::gmtime( &Global.starting_timestamp ); - Global.ScenarioTimeOffset = ( localtime->tm_hour * 60 + localtime->tm_min - ( time.wHour * 60 + time.wMinute ) ) / 60.f; + auto const localtime = utc_tm( Global.starting_timestamp ); + Global.ScenarioTimeOffset = ( localtime.tm_hour * 60 + localtime.tm_min - ( time.wHour * 60 + time.wMinute ) ) / 60.f; } else if( false == std::isnan( Global.ScenarioTimeOverride ) ) { // scenario time override takes precedence over scenario time offset diff --git a/simulation/simulationtime.cpp b/simulation/simulationtime.cpp index 528867099..f1683c534 100644 --- a/simulation/simulationtime.cpp +++ b/simulation/simulationtime.cpp @@ -32,7 +32,8 @@ scenario_time::init(std::time_t timestamp) { auto const requestedminute { requestedtime % 60 }; // cache requested elements, if any - std::tm *tms = std::gmtime(×tamp); + std::tm const tm = utc_tm(timestamp); + std::tm const *tms = &tm; m_time.wYear = tms->tm_year + 1900; m_time.wMonth = tms->tm_mon + 1; m_time.wDayOfWeek = tms->tm_wday; diff --git a/utilities/Globals.cpp b/utilities/Globals.cpp index f45b6b3eb..47b04d18b 100644 --- a/utilities/Globals.cpp +++ b/utilities/Globals.cpp @@ -18,6 +18,7 @@ http://mozilla.org/MPL/2.0/. #include "simulation/simulationenvironment.h" #include "vehicle/Driver.h" #include "utilities/Logs.h" +#include "utilities/utilities.h" #include "Console.h" #include "scripting/PyInt.h" #include "utilities/Timer.h" @@ -26,15 +27,7 @@ http://mozilla.org/MPL/2.0/. void global_settings::LoadIniFile(std::string asFileName) { // initialize season data in case the main config file doesn't - std::time_t timenow = std::time(nullptr); - - std::tm tm{}; - -#ifdef _WIN32 - localtime_s(&tm, &timenow); -#else - localtime_r(&timenow, &tm); -#endif + std::tm const tm = local_tm(std::time(nullptr)); fMoveLight = tm.tm_yday + 1; // numer bieżącego dnia w roku simulation::Environment.compute_season(fMoveLight); @@ -513,14 +506,7 @@ bool global_settings::ConfigParseSimulation(cParser& Parser, const std::string& if (fMoveLight == 0.f) { - std::time_t timenow = std::time(nullptr); - std::tm tm{}; - -#ifdef _WIN32 - localtime_s(&tm, &timenow); -#else - localtime_r(&timenow, &tm); -#endif + std::tm const tm = local_tm(std::time(nullptr)); fMoveLight = tm.tm_yday + 1; } diff --git a/utilities/Logs.cpp b/utilities/Logs.cpp index 554a77b9e..737d25d74 100644 --- a/utilities/Logs.cpp +++ b/utilities/Logs.cpp @@ -31,7 +31,8 @@ std::string filename_date() { #ifdef __unix__ timespec ts; clock_gettime(CLOCK_REALTIME, &ts); - tm *tms = localtime(&ts.tv_sec); + std::tm const tm = local_tm(ts.tv_sec); + std::tm const *tms = &tm; st.wYear = tms->tm_year; st.wMonth = tms->tm_mon; st.wDayOfWeek = tms->tm_wday; diff --git a/utilities/utilities.cpp b/utilities/utilities.cpp index 14e448973..efaf3e6ce 100644 --- a/utilities/utilities.cpp +++ b/utilities/utilities.cpp @@ -426,6 +426,28 @@ std::time_t last_modified(std::string const &Filename) return 0; } +std::tm local_tm(std::time_t Time) +{ + std::tm tm{}; +#ifdef _WIN32 + localtime_s(&tm, &Time); +#else + localtime_r(&Time, &tm); +#endif + return tm; +} + +std::tm utc_tm(std::time_t Time) +{ + std::tm tm{}; +#ifdef _WIN32 + gmtime_s(&tm, &Time); +#else + gmtime_r(&Time, &tm); +#endif + return tm; +} + // potentially erases file extension from provided file name. returns: true if extension was removed, false otherwise bool erase_extension(std::string &Filename) { diff --git a/utilities/utilities.h b/utilities/utilities.h index 91d74e67a..6e761380a 100644 --- a/utilities/utilities.h +++ b/utilities/utilities.h @@ -220,6 +220,10 @@ std::pair FileExists(std::vector const &N // returns time of last modification for specified file std::time_t last_modified(std::string const &Filename); +// thread-safe replacements for std::localtime and std::gmtime, which hand out a pointer to shared static storage +std::tm local_tm(std::time_t Time); +std::tm utc_tm(std::time_t Time); + // potentially erases file extension from provided file name. returns: true if extension was removed, false otherwise bool erase_extension(std::string &Filename); diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 9771f7db6..9dfd6731b 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -449,8 +449,8 @@ void TController::TableClear() iTableDirection = 0; // nieznany tLast = nullptr; fLastVel = -1.0; - SemNextIndex = -1; - SemNextStopIndex = -1; + SemNextIndex = npos; + SemNextStopIndex = npos; eSignSkip = nullptr; // nic nie pomijamy }; @@ -512,8 +512,8 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) sSpeedTable.clear(); iLast = -1; tLast = nullptr; //żaden nie sprawdzony - SemNextIndex = -1; - SemNextStopIndex = -1; + SemNextIndex = npos; + SemNextStopIndex = npos; */ if( VelSignalLast == 0.0 ) { // don't allow potential red light overrun keep us from reversing @@ -541,16 +541,16 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) else { if( iTableDirection == 0 ) { return; } // NOTE: belt and braces; TablePurger() used to leave these pointing past the end of the table - if( SemNextIndex != -1 + if( SemNextIndex != npos && SemNextIndex >= sSpeedTable.size() ) { - SemNextIndex = -1; + SemNextIndex = npos; } - if( SemNextStopIndex != -1 + if( SemNextStopIndex != npos && SemNextStopIndex >= sSpeedTable.size() ) { - SemNextStopIndex = -1; + SemNextStopIndex = npos; } // kontynuacja skanowania od ostatnio sprawdzonego toru (w ostatniej pozycji zawsze jest tor) - if( SemNextStopIndex != -1 + if( SemNextStopIndex != npos && sSpeedTable[SemNextStopIndex].fVelNext == 0.0 ) { // znaleziono semafor lub tarczę lub tor z prędkością zero, trzeba sprawdzić czy to nadał semafor // jeśli jest następny semafor to sprawdzamy czy to on nadał zero @@ -614,23 +614,23 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) fDistance = newspeedpoint.fDist; // jeśli sygnał stop, to nie ma potrzeby dalej skanować SemNextStopIndex = iLast; - if (SemNextIndex == -1) { + if (SemNextIndex == npos) { SemNextIndex = iLast; } if (Global.iWriteLogEnabled & 8) { WriteLog("(stop signal from " - + (SemNextStopIndex != -1 ? sSpeedTable[SemNextStopIndex].GetName() : "unknown semaphor") + + (SemNextStopIndex != npos ? sSpeedTable[SemNextStopIndex].GetName() : "unknown semaphor") + ")"); } } else { if( true == newspeedpoint.IsProperSemaphor(OrderCurrentGet()) - && SemNextIndex == -1 ) { + && SemNextIndex == npos ) { SemNextIndex = iLast; // sprawdzamy czy pierwszy na drodze } if (Global.iWriteLogEnabled & 8) { WriteLog("(forward signal for " - + (SemNextIndex != -1 ? sSpeedTable[SemNextIndex].GetName() : "unknown semaphor") + + (SemNextIndex != npos ? sSpeedTable[SemNextIndex].GetName() : "unknown semaphor") + ")"); } } @@ -800,13 +800,13 @@ void TController::TableCheck(double fDistance) --iLast; } // a semaphor recorded beyond the switch went away with the discarded entries - if( SemNextIndex != -1 + if( SemNextIndex != npos && SemNextIndex >= sSpeedTable.size() ) { - SemNextIndex = -1; + SemNextIndex = npos; } - if( SemNextStopIndex != -1 + if( SemNextStopIndex != npos && SemNextStopIndex >= sSpeedTable.size() ) { - SemNextStopIndex = -1; + SemNextStopIndex = npos; } tLast = sSpeedTable[ i ].trTrack; TableTraceRoute( fDistance, pVehicles[ end::rear ] ); @@ -1387,13 +1387,13 @@ TController::TableUpdateEvent( double &Velocity, TCommandType &Command, TSpeedPo if( Global.iWriteLogEnabled & 8 ) { WriteLog( "Speed table update for " + OwnerName() + ", passed semaphor " + sSpeedTable[ SemNextIndex ].GetName() ); } - SemNextIndex = -1; // jeśli minęliśmy semafor od ograniczenia to go kasujemy ze zmiennej sprawdzającej dla skanowania w przód + SemNextIndex = npos; // jeśli minęliśmy semafor od ograniczenia to go kasujemy ze zmiennej sprawdzającej dla skanowania w przód } if( SemNextStopIndex == Pointindex ) { if( Global.iWriteLogEnabled & 8 ) { WriteLog( "Speed table update for " + OwnerName() + ", passed semaphor " + sSpeedTable[ SemNextStopIndex ].GetName() ); } - SemNextStopIndex = -1; // jeśli minęliśmy semafor od ograniczenia to go kasujemy ze zmiennej sprawdzającej dla skanowania w przód + SemNextStopIndex = npos; // jeśli minęliśmy semafor od ograniczenia to go kasujemy ze zmiennej sprawdzającej dla skanowania w przód } switch( Point.evEvent->input_command() ) { // TBD, TODO: expand emergency_brake handling to a more generic security system signal @@ -1461,13 +1461,13 @@ TController::TableUpdateEvent( double &Velocity, TCommandType &Command, TSpeedPo } // jeśli jest mienięty poprzedni semafor a wcześniej // byl nowy to go dorzucamy do zmiennej, żeby cały czas widział najbliższy - if( SemNextIndex == -1 ) { + if( SemNextIndex == npos ) { SemNextIndex = Pointindex; if( Global.iWriteLogEnabled & 8 ) { WriteLog( "Speed table update for " + OwnerName() + ", next semaphor is " + sSpeedTable[ SemNextIndex ].GetName() ); } } - if( SemNextStopIndex == -1 + if( SemNextStopIndex == npos || ( sSpeedTable[SemNextStopIndex].fVelNext != 0 && Point.fVelNext == 0 ) ) { SemNextStopIndex = Pointindex; @@ -1926,17 +1926,9 @@ TController::TController(bool AI, TDynamicObject *NewControll, bool InitPsyche, fActionTime = -5.0; }; -void TController::CloseLog() -{ - if (WriteLogFlag) - { - LogFile.close(); - } -}; - TController::~TController() { // wykopanie mechanika z roboty - CloseLog(); + // LogFile is closed by its own destructor }; // zamiana kodu rozkazu na opis diff --git a/vehicle/Driver.h b/vehicle/Driver.h index e7c4fac00..b76dbf086 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -542,8 +542,9 @@ private: double fLastVel = 0.0; // prędkość na poprzednio sprawdzonym torze TTrack *tLast = nullptr; // ostatni analizowany tor basic_event *eSignSkip = nullptr; // można pominąć ten SBL po zatrzymaniu - std::size_t SemNextIndex{ std::size_t( -1 ) }; - std::size_t SemNextStopIndex{ std::size_t( -1 ) }; + static constexpr std::size_t npos{ std::size_t( -1 ) }; + std::size_t SemNextIndex{ npos }; + std::size_t SemNextStopIndex{ npos }; double dMoveLen = 0.0; // odległość przejechana od ostatniego sprawdzenia tabelki basic_event *eSignNext = nullptr; // sygnał zmieniający prędkość, do pokazania na [F2] neighbour_data Obstacle; // nearest vehicle detected ahead on current route @@ -622,7 +623,6 @@ private: // logs // methods void PhysicsLog(); - void CloseLog(); // members std::ofstream LogFile; // zapis parametrow fizycznych double LastUpdatedTime = 0.0; // czas od ostatniego logu diff --git a/widgets/trainingcard.cpp b/widgets/trainingcard.cpp index d4d11e5b3..27fb0965d 100644 --- a/widgets/trainingcard.cpp +++ b/widgets/trainingcard.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "widgets/trainingcard.h" #include "simulation/simulation.h" +#include "utilities/utilities.h" #ifdef __linux__ #include @@ -46,12 +47,11 @@ void trainingcard_panel::clear() void trainingcard_panel::save_thread_func() { - std::tm *tm = std::localtime(&(*start_time_wall)); - std::string date = std::to_string(tm->tm_year + 1900) + "-" + std::to_string(tm->tm_mon + 1) + "-" + std::to_string(tm->tm_mday); - std::string from = std::to_string(tm->tm_hour) + ":" + std::to_string(tm->tm_min); - std::time_t now = std::time(nullptr); - tm = std::localtime(&now); - std::string to = std::to_string(tm->tm_hour) + ":" + std::to_string(tm->tm_min); + std::tm tm = local_tm(*start_time_wall); + std::string date = std::to_string(tm.tm_year + 1900) + "-" + std::to_string(tm.tm_mon + 1) + "-" + std::to_string(tm.tm_mday); + std::string from = std::to_string(tm.tm_hour) + ":" + std::to_string(tm.tm_min); + tm = local_tm(std::time(nullptr)); + std::string to = std::to_string(tm.tm_hour) + ":" + std::to_string(tm.tm_min); std::fstream temp("reports/" + recording_timestamp + ".html", std::ios_base::out | std::ios_base::binary); std::fstream input("report_template.html", std::ios_base::in | std::ios_base::binary); @@ -121,9 +121,9 @@ void trainingcard_panel::render_contents() if (start_time_wall) { - std::tm *tm = std::localtime(&(*start_time_wall)); - std::string rep = "Czas rozpoczęcia: " + std::to_string(tm->tm_year + 1900) + "-" + std::to_string(tm->tm_mon + 1) + "-" + std::to_string(tm->tm_mday) + " " + std::to_string(tm->tm_hour) + - ":" + std::to_string(tm->tm_min); + std::tm const tm = local_tm(*start_time_wall); + std::string rep = "Czas rozpoczęcia: " + std::to_string(tm.tm_year + 1900) + "-" + std::to_string(tm.tm_mon + 1) + "-" + std::to_string(tm.tm_mday) + " " + std::to_string(tm.tm_hour) + + ":" + std::to_string(tm.tm_min); ImGui::TextUnformatted(rep.c_str()); } @@ -159,8 +159,8 @@ void trainingcard_panel::render_contents() if (ImGui::Button("Rozpocznij szkolenie")) { start_time_wall = std::time(nullptr); - std::tm *tm = std::localtime(&(*start_time_wall)); - recording_timestamp = std::to_string(tm->tm_year + 1900) + std::to_string(tm->tm_mon + 1) + std::to_string(tm->tm_mday) + std::to_string(tm->tm_hour) + std::to_string(tm->tm_min) + "_" + + std::tm const tm = local_tm(*start_time_wall); + recording_timestamp = std::to_string(tm.tm_year + 1900) + std::to_string(tm.tm_mon + 1) + std::to_string(tm.tm_mday) + std::to_string(tm.tm_hour) + std::to_string(tm.tm_min) + "_" + std::string(trainee_name.c_str()) + "_" + std::string(instructor_name.c_str()); int ret = StartRecording(); From f2f152e5d35a896c5cd43046579e5d23038ea3b3 Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Mon, 28 Sep 2026 20:53:58 +0200 Subject: [PATCH 013/430] AI: don't cut the power for a brake already released below 0.4 bar When the AI takes power after a brake release, determine_consist_state() marks the consist not Ready if any vehicle's distributor reports the lap or application state (b_hld | b_on), whatever the speed, and the sanity check in control_handles() then puts the master controller back to zero. A distributor stays in the lap position until the brake pipe has fully recharged, so a few seconds after a release, with 0.2-0.3 bar left in a cylinder, one wagon of a train is enough to throw an EU07 or EP09 that has just reached the 2nd-5th position back to zero; it starts again moments later. The check in motion was meant to be lenient (brake force over 10 kN), but the distributor state was applied at any speed. In motion it now counts only when the cylinder holds more than 0.4 bar, the UIC figure already used a few lines below for a released brake. At a stand the check is unchanged. Measured in real time against master, two runs of each scenery (a 20 per mille descent, flat and a 10 per mille climb with 32 consists each, and a descent with 15 freight trains of other wagon types), with a 20 km/h restriction one coach long: throttle-downs to zero in motion caused by readiness drop from 13 to 1, 7 to 2, 0 to 0 and 13 to 6. Each of those left has a wagon over 0.4 bar that is applying or lapped, or one still releasing with more than 10 kN at walking pace. No coupler broke; signal overruns, speeds in the restriction and rolling back on the climb are the same as on master within run-to-run spread. --- vehicle/Driver.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 9a6de8596..7e92c7c9e 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -5983,9 +5983,12 @@ TController::determine_consist_state() { auto const bp { std::max( 0.0, vehicle->BrakePress - ( vehicle->SpeedCtrlUnit.Parking ? vehicle->MaxBrakePress[ 0 ] * vehicle->StopBrakeDecc : 0.0 ) ) }; if (Ready) { // bo jak coś nie odhamowane, to dalej nie ma co sprawdzać - if( TestFlagAny(vehicle->Hamulec->GetBrakeStatus(), b_hld | b_on) - || ( vehicle->Vel < 1.0 ? bp > 0.4 : // ensure the brakes are sufficiently released when starting to move - vehicle->Fb * 0.001 > 10.0 ) ) { // once in motion we can make a more lenient check + auto const isbraking { TestFlagAny( vehicle->Hamulec->GetBrakeStatus(), b_hld | b_on ) }; + if( vehicle->Vel < 1.0 ? + isbraking || bp > 0.4 : // ensure the brakes are sufficiently released when starting to move + // once in motion a brake down to 0.4 bar counts as released (UIC), even if its distributor + // is still in the lap position while the brake pipe recharges + ( isbraking && bp > 0.4 ) || vehicle->Fb * 0.001 > 10.0 ) { Ready = false; } // Ra: odluźnianie przeładowanych lokomotyw, ciągniętych na zimno - prowizorka... From 4f2dfd93186f218f20c499ef20572b9fa5b30b83 Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Tue, 29 Sep 2026 09:47:51 +0200 Subject: [PATCH 014/430] Drop redundant comparisons with true/false In the conditions this PR adds; no change in behaviour. --- McZapkie/Oerlikon_ESt.cpp | 2 +- vehicle/Driver.cpp | 6 +++--- vehicle/Driver.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/McZapkie/Oerlikon_ESt.cpp b/McZapkie/Oerlikon_ESt.cpp index d8d5b3da8..8705000a4 100644 --- a/McZapkie/Oerlikon_ESt.cpp +++ b/McZapkie/Oerlikon_ESt.cpp @@ -327,7 +327,7 @@ void TNESt3::Init( double const PP, double const HPP, double const LPP, double c double TNESt3::GetRapidRatio(double const Vel) const { // ESt3 has no rapid relay, and with disc brakes the rapid step stays engaged at all speeds - if( ( PrzekRapid == nullptr ) || ( true == RapidStaly ) ) { + if( ( PrzekRapid == nullptr ) || RapidStaly ) { return 1.0; } // a braking vehicle comes from above, so the step is still engaged down to the speed diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 09b607b69..d75500dbe 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -6672,7 +6672,7 @@ TController::determine_proximity_ranges() { // na jaka odleglosc i z jaka predkoscia ma podjechac do przeszkody // jeśli pociąg if( is_train() ) { - if( true == IsAtPassengerStop ) { + if( IsAtPassengerStop ) { // a stop point keeps the margins its W4 parameters (head or middle of the consist, // platform length) were set up against fMinProximityDist = std::clamp( 5 + iVehicles, 10, 15 ); @@ -7342,7 +7342,7 @@ TController::pick_optimal_speed( double const Range ) { is_car() ? -2.0 : -0.9, is_car() ? 2.0 : 0.9 ); - if( ( true == is_train() ) + if( is_train() && ( ( OrderCurrentGet() & Obey_train ) != 0 ) && ( VelNext == 0.0 ) && ( ActualProximityDist <= fMaxProximityDist ) @@ -7872,7 +7872,7 @@ TController::adjust_desired_speed_for_current_speed() { -0.05 + fAccThreshold, std::max( EU07_AI_NOACCELERATION, AccPreferred ) ) ); // HACK: for cargo trains with high braking threshold ensure we cross that threshold - if( true == IsCargoTrain + if( IsCargoTrain && fBrake_a0[0] > 0.2 && speedestimate > holdlimit ) { AccDesired -= std::clamp( fBrake_a0[ 0 ] - 0.2, 0.0, 0.15 ); diff --git a/vehicle/Driver.h b/vehicle/Driver.h index 0e65a4b94..fefa950ca 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -356,7 +356,7 @@ private: // how far short of a stop the AI aims: in train running the middle of the 8-15 m window before a signal, // otherwise (a W4 stop point, shunting, coupling) half the minimum proximity distance, as before double stopping_margin() const { - return ( ( OrderCurrentGet() & Obey_train ) != 0 ) && ( false == IsAtPassengerStop ) ? + return ( ( OrderCurrentGet() & Obey_train ) != 0 ) && !IsAtPassengerStop ? fMinProximityDist + 3.5 : 0.5 * fMinProximityDist; } void apply_independent_brake_only(); From 96be688d1374d33234869625394bbc039d78364b Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Wed, 30 Sep 2026 14:51:36 +0200 Subject: [PATCH 015/430] Send the reverser position, not the absolute direction, when activating a cab CabActivisation() passed DirAbsolute (DirActive * CabActive) as the value of the "Direction" command, which every receiving vehicle stores as its own DirActive. Every other sender passes DirActive. With the cab at the rear end (CabActive = -1) the two have opposite signs, so the other units got their reverser flipped against the controlling one. It shows whenever a rear cab is activated after the reverser has been set: - the AI takes over an occupied cab (TakeControl() calls CabActivisation(true)), e.g. an EN57 inserted with reardriver and a starting velocity: the motor car drives the train backwards; - a vehicle without automatic cab activation (SA134) driven by the AI from the start: the cab is activated by a driver hint after the reverser is set, and the two units pull against each other. Fixes #169. --- McZapkie/Mover.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 83c918e24..68b889188 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -2901,7 +2901,7 @@ bool TMoverParameters::CabActivisation(bool const Enforce) CabMaster = true; SecuritySystem.set_enabled(true); // activate the alerter TODO: make it part of control based cab selection SendCtrlToNext("CabActivisation", 1, CabActive); - SendCtrlToNext("Direction", DirAbsolute, CabActive); + SendCtrlToNext("Direction", DirActive, CabActive); if (InactiveCabFlag & activation::springbrakeoff) { SpringBrakeActivate(false); From 39dd1c057f8f3293a82a0fb28bd9621cd8650b41 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Thu, 1 Oct 2026 01:17:21 +0200 Subject: [PATCH 016/430] fix(editor): stuck brush after clicks on UI; add polygon area fill --- application/editormode.cpp | 619 +++++++++++++++++++++++++++++++-- application/editormode.h | 26 +- application/editoruilayer.cpp | 10 + application/editoruilayer.h | 2 + application/editoruipanels.cpp | 43 ++- application/editoruipanels.h | 7 +- 6 files changed, 674 insertions(+), 33 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 46a8edadf..94b1424da 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -24,6 +24,8 @@ http://mozilla.org/MPL/2.0/. #include "model/Model3d.h" #include "utilities/Float3d.h" #include "scene/scene.h" +#include "utilities/parser.h" +#include "utilities/utilities.h" #include "imgui/imgui.h" @@ -58,6 +60,14 @@ namespace return state == GLFW_PRESS; } + // true when the most recent left button press landed in the viewport rather than on an ImGui window. + // valid once ImGui has processed the press (i.e. from mode update onwards), so it's also used to + // discard deferred pick callbacks of a press that leaked past the application's UI filter + inline bool viewport_click() + { + return false == ImGui::GetIO().MouseDownOwned[0]; + } + // tests whether the vertical line through (Px,Pz) passes over triangle abc; if so returns the // surface height at that point through OutY. used by the "snap to ground" (END) feature. inline bool triangle_height_at(glm::dvec3 const &a, glm::dvec3 const &b, glm::dvec3 const &c, @@ -117,6 +127,158 @@ namespace } } + // world transform of a model instance, matching the renderer: translate * rotateY * rotateX * rotateZ * scale + glm::dmat4 instance_matrix(TAnimModel const &Model) + { + glm::dmat4 rootm(1.0); + rootm = glm::translate(rootm, Model.location()); + glm::vec3 const angles = Model.Angles(); + if (angles.y != 0.0f) rootm = glm::rotate(rootm, glm::radians(static_cast(angles.y)), glm::dvec3(0.0, 1.0, 0.0)); + if (angles.x != 0.0f) rootm = glm::rotate(rootm, glm::radians(static_cast(angles.x)), glm::dvec3(1.0, 0.0, 0.0)); + if (angles.z != 0.0f) rootm = glm::rotate(rootm, glm::radians(static_cast(angles.z)), glm::dvec3(0.0, 0.0, 1.0)); + return glm::scale(rootm, glm::dvec3(Model.Scale())); + } + + // even-odd test of a point against a polygon outline projected onto the XZ plane + bool point_in_polygon_xz(std::vector const &Polygon, double const X, double const Z) + { + bool inside = false; + for (std::size_t i = 0, j = Polygon.size() - 1; i < Polygon.size(); j = i++) + { + auto const &a = Polygon[i]; + auto const &b = Polygon[j]; + if ((a.z > Z) != (b.z > Z) && X < (b.x - a.x) * (Z - a.z) / (b.z - a.z) + a.x) + inside = !inside; + } + return inside; + } + + // area of a polygon outline projected onto the XZ plane (shoelace formula) + double polygon_area_xz(std::vector const &Polygon) + { + if (Polygon.size() < 3) + return 0.0; + double sum = 0.0; + for (std::size_t i = 0, j = Polygon.size() - 1; i < Polygon.size(); j = i++) + sum += Polygon[j].x * Polygon[i].z - Polygon[i].x * Polygon[j].z; + return std::abs(sum) * 0.5; + } + + // short readable name of a node template (model file and texture), like the node bank shows it + std::string template_label(std::string const &Template) + { + cParser tokenizer(Template); + tokenizer.getTokens(9, false); // node, ranges, name, type, position, rotation + auto model{tokenizer.getToken(false)}; + auto texture{tokenizer.getToken(false)}; + replace_slashes(model); + erase_extension(model); + replace_slashes(texture); + return texture == "none" || texture.empty() ? model : model + " (" + texture + ")"; + } + + // world triangles bucketed on a uniform XZ grid, for many ground height queries over one area + class triangle_grid + { + public: + triangle_grid(std::vector Triangles, glm::dvec2 const &Min, glm::dvec2 const &Max) : m_triangles(std::move(Triangles)), m_min(Min) + { + glm::dvec2 const extent = glm::max(Max - Min, glm::dvec2(1.0)); + // ~8 m cells, coarser for big areas so large terrain triangles don't flood the grid + m_cellsize = std::max(8.0, std::max(extent.x, extent.y) / 128.0); + m_columns = static_cast(std::ceil(extent.x / m_cellsize)) + 1; + m_rows = static_cast(std::ceil(extent.y / m_cellsize)) + 1; + m_cells.resize(static_cast(m_columns) * m_rows); + + for (std::uint32_t idx = 0; idx < m_triangles.size(); ++idx) + { + auto const &t = m_triangles[idx]; + int const c0 = column(std::min({t[0].x, t[1].x, t[2].x})); + int const c1 = column(std::max({t[0].x, t[1].x, t[2].x})); + int const r0 = row(std::min({t[0].z, t[1].z, t[2].z})); + int const r1 = row(std::max({t[0].z, t[1].z, t[2].z})); + for (int r = r0; r <= r1; ++r) + for (int c = c0; c <= c1; ++c) + m_cells[static_cast(r) * m_columns + c].push_back(idx); + } + } + + // highest surface at (X,Z) that isn't above Ceiling. returns: true if there is one + bool height_at(double const X, double const Z, double const Ceiling, double &OutY) const + { + bool found = false; + for (auto const idx : m_cells[static_cast(row(Z)) * m_columns + column(X)]) + { + auto const &t = m_triangles[idx]; + double y; + if (triangle_height_at(t[0], t[1], t[2], X, Z, y) && y <= Ceiling && (!found || y > OutY)) + { + OutY = y; + found = true; + } + } + return found; + } + + private: + int column(double const X) const + { + return std::clamp(static_cast(std::floor((X - m_min.x) / m_cellsize)), 0, m_columns - 1); + } + int row(double const Z) const + { + return std::clamp(static_cast(std::floor((Z - m_min.y) / m_cellsize)), 0, m_rows - 1); + } + + std::vector m_triangles; + std::vector> m_cells; + glm::dvec2 m_min; + double m_cellsize{8.0}; + int m_columns{1}; + int m_rows{1}; + }; + + // appends triangles of a shape node which overlap specified XZ rectangle + void gather_shape_triangles(scene::shape_node const &Shape, glm::dvec2 const &Min, glm::dvec2 const &Max, std::vector &Out) + { + auto const &data = Shape.data(); + if (data.area.radius >= 0.0f) + { + double const r = data.area.radius; + if (data.area.center.x + r < Min.x || data.area.center.x - r > Max.x || data.area.center.z + r < Min.y || data.area.center.z - r > Max.y) + return; + } + + auto const add = [&](glm::dvec3 const &a, glm::dvec3 const &b, glm::dvec3 const &c) { + if (std::max({a.x, b.x, c.x}) < Min.x || std::min({a.x, b.x, c.x}) > Max.x || std::max({a.z, b.z, c.z}) < Min.y || std::min({a.z, b.z, c.z}) > Max.y) + return; + Out.push_back({a, b, c}); + }; + + if (false == data.vertices.empty()) + { + for (std::size_t i = 0; i + 2 < data.vertices.size(); i += 3) + add(data.vertices[i].position, data.vertices[i + 1].position, data.vertices[i + 2].position); + return; + } + // once the shape is uploaded its world-space source is released; the renderer keeps an origin-relative copy + if (data.geometry.bank == 0 && data.geometry.chunk == 0) + return; + auto const &verts = GfxRenderer->Vertices(data.geometry); + auto const &indices = GfxRenderer->Indices(data.geometry); + auto const to_world = [&](gfx::basic_vertex const &v) { return data.origin + glm::dvec3(v.position); }; + if (false == indices.empty()) + { + for (std::size_t i = 0; i + 2 < indices.size(); i += 3) + add(to_world(verts[indices[i]]), to_world(verts[indices[i + 1]]), to_world(verts[indices[i + 2]])); + } + else + { + for (std::size_t i = 0; i + 2 < verts.size(); i += 3) + add(to_world(verts[i]), to_world(verts[i + 1]), to_world(verts[i + 2])); + } + } + } bool editor_mode::editormode_input::init() @@ -306,32 +468,38 @@ void editor_mode::handle_brush_mouse_hold(int Action, int Button) GfxRenderer->Pick_Node_Callback( [this, mode, rotation_mode, fixed_rotation_value, Action, Button](scene::basic_node * /*node*/) { + // picks are resolved a few frames later; drop the ones queued before the button went up, + // or for a press that turned out to belong to the UI + if (!mouseHold || !viewport_click()) + return; + const std::string *src = ui()->get_active_node_template(); if (!src) return; std::string name = "editor_"; - glm::dvec3 newPos = clamp_mouse_offset_to_max(GfxRenderer->Mouse_Position()); - double distance = glm::distance(newPos, oldPos); - if (distance < ui()->getSpacing()) + // spacing is measured in world space: the mouse offset is camera-relative and the camera may move mid-stroke + glm::dvec3 const newPos = Camera.Pos + clamp_mouse_offset_to_max(GfxRenderer->Mouse_Position()); + if (m_brush_has_last && glm::distance(newPos, oldPos) < ui()->getSpacing()) return; - TAnimModel *cloned = simulation::State.create_model(*src, name, Camera.Pos + newPos); + TAnimModel *cloned = simulation::State.create_model(*src, name, newPos); oldPos = newPos; + m_brush_has_last = true; if (!cloned) return; std::string new_name = "editor_" + cloned->uuid.to_string(); cloned->m_name = new_name; - + apply_rotation_for_new_node(cloned, rotation_mode, fixed_rotation_value); + std::string as_text; cloned->export_as_text(as_text); push_snapshot(cloned, EditorSnapshot::Action::Add, as_text); m_node = cloned; - apply_rotation_for_new_node(m_node, rotation_mode, fixed_rotation_value); ui()->set_node(m_node); }); } @@ -439,6 +607,9 @@ void editor_mode::nullify_history_pointers(scene::basic_node *node) if (s.node_ptr == node) s.node_ptr = nullptr; } + + // deleted nodes also drop out of the "undo last fill" set + m_fill_last.erase(std::remove(m_fill_last.begin(), m_fill_last.end(), node), m_fill_last.end()); } void editor_mode::undo_last() @@ -626,6 +797,19 @@ bool editor_mode::update() Application.set_cursor(GLFW_CURSOR_NORMAL); } + // same for the left button (brush / sculpt / click placement). the UI filter in the application + // uses io.WantCaptureMouse from the previous frame, so a press on a panel the cursor has just + // moved onto can leak into the viewport, and its release is then swallowed by the UI; the brush + // would keep painting with the button up. by now ImGui has processed this frame's input, so + // MouseDown is the real button state and MouseDownOwned tells whether the press hit the UI. + // (pick callbacks queued by such a press are discarded separately, see viewport_click()) + if (mouseHold && (!ImGui::GetIO().MouseDown[0] || !viewport_click())) + { + mouseHold = false; + m_dragging = false; + m_input.mouse.button(GLFW_MOUSE_BUTTON_LEFT, GLFW_RELEASE); + } + // fixed step render time routines (50 Hz) fTime50Hz += deltarealtime; // accumulate even when paused to keep frame reads stable while (fTime50Hz >= 1.0 / 50.0) @@ -708,6 +892,13 @@ bool editor_mode::update() // --- ImGuizmo: in-viewport transform gizmo for the selected node --- render_gizmo(); + // --- area fill: outline overlay and settings, while the mode is active --- + if (ui()->mode() == nodebank_panel::FILL) + { + draw_area_fill_outline(); + render_area_fill(); + } + // --- ImGui: Editor Settings & History windows --- if(m_settings_open) render_settings(); @@ -1097,18 +1288,8 @@ void editor_mode::capture_terrain() return; } - // instance world transform, matching the renderer: translate * rotateY * rotateX * rotateZ * scale - glm::dmat4 rootm(1.0); - rootm = glm::translate(rootm, model->location()); - glm::vec3 const angles = model->Angles(); - if (angles.y != 0.0f) rootm = glm::rotate(rootm, glm::radians(static_cast(angles.y)), glm::dvec3(0.0, 1.0, 0.0)); - if (angles.x != 0.0f) rootm = glm::rotate(rootm, glm::radians(static_cast(angles.x)), glm::dvec3(1.0, 0.0, 0.0)); - if (angles.z != 0.0f) rootm = glm::rotate(rootm, glm::radians(static_cast(angles.z)), glm::dvec3(0.0, 0.0, 1.0)); - glm::vec3 const scale = model->Scale(); - rootm = glm::scale(rootm, glm::dvec3(scale)); - std::vector tris; - gather_submodel_triangles(model->pModel->Root, rootm, tris); + gather_submodel_triangles(model->pModel->Root, instance_matrix(*model), tris); if (tris.empty()) { WriteLog("Editor: selected model has no readable geometry to capture", logtype::generic); @@ -1174,6 +1355,366 @@ void editor_mode::capture_terrain() simulation::State.delete_model(model); } +void editor_mode::add_area_fill_point() +{ + // like the other placement tools, the point comes from the depth buffer under the cursor + // (ground geometry only), relative to the camera + glm::dvec3 const offset = GfxRenderer->Mouse_Position(); + if (glm::length(offset) < 1e-3) + return; // no ground under the cursor (yet) + + m_fill_points.push_back(Camera.Pos + offset); +} + +void editor_mode::undo_last_area_fill() +{ + // nullify_history_pointers() removes deleted nodes from m_fill_last, so work on a copy + auto const created = std::move(m_fill_last); + m_fill_last.clear(); + + for (TAnimModel *model : created) + { + if (model == nullptr) + continue; + if (m_node == model) + { + m_node = nullptr; + ui()->set_node(nullptr); + } + nullify_history_pointers(model); + remove_from_hierarchy(model); + simulation::State.delete_model(model); + } + m_fill_status = "Removed " + std::to_string(created.size()) + " objects of the last fill"; +} + +void editor_mode::run_area_fill() +{ + // limits keeping a single click from freezing the editor for too long + std::size_t constexpr max_objects = 20000; + // large model instances (e.g. terrain tiles) are treated as ground, smaller ones (houses, trees) are not + float constexpr terrain_model_radius = 50.0f; + // ground is searched up to this far above the height interpolated from the outline points, + // so hills inside the outline are found but bridges or roofs high above it are not + double constexpr height_tolerance = 50.0; + + if (m_fill_points.size() < 3) + { + m_fill_status = "Outline needs at least 3 points"; + return; + } + + // model package + std::vector package; + if (m_fill_package == 0) + package = m_fill_custom; + else + package = ui()->nodebank_group_templates(static_cast(m_fill_package - 1)); + package.erase(std::remove_if(package.begin(), package.end(), [](std::string const &Template) { return Template.empty(); }), package.end()); + if (package.empty()) + { + m_fill_status = "Selected model package is empty"; + return; + } + + // area bounds + glm::dvec2 bmin(std::numeric_limits::max()); + glm::dvec2 bmax(-std::numeric_limits::max()); + for (auto const &p : m_fill_points) + { + bmin = glm::min(bmin, glm::dvec2(p.x, p.z)); + bmax = glm::max(bmax, glm::dvec2(p.x, p.z)); + } + double const area = polygon_area_xz(m_fill_points); + auto const target = static_cast(std::min(std::round(area / 10000.0 * std::max(0.0f, m_fill_density)), max_objects)); + if (target == 0) + { + m_fill_status = "Density too low for this area, nothing to place"; + return; + } + + // scatter points: random samples inside the outline, rejecting the ones closer than the minimal spacing + // to an already accepted point (checked on a hashed grid with cell size == spacing) + double const spacing = std::max(0.0f, m_fill_min_spacing); + std::unordered_map> occupancy; + auto const cell_key = [](std::int64_t const X, std::int64_t const Z) { return (X << 32) ^ (Z & 0xffffffff); }; + std::vector points; + points.reserve(target); + for (std::size_t attempt = 0; attempt < target * 30 && points.size() < target; ++attempt) + { + glm::dvec2 const p(LocalRandom(bmin.x, bmax.x), LocalRandom(bmin.y, bmax.y)); + if (false == point_in_polygon_xz(m_fill_points, p.x, p.y)) + continue; + if (spacing > 0.0) + { + auto const cx = static_cast(std::floor(p.x / spacing)); + auto const cz = static_cast(std::floor(p.y / spacing)); + bool free = true; + for (std::int64_t dz = -1; dz <= 1 && free; ++dz) + for (std::int64_t dx = -1; dx <= 1 && free; ++dx) + { + auto const lookup = occupancy.find(cell_key(cx + dx, cz + dz)); + if (lookup == occupancy.end()) + continue; + for (auto const idx : lookup->second) + if (glm::distance(points[idx], p) < spacing) + { + free = false; + break; + } + } + if (!free) + continue; + occupancy[cell_key(cx, cz)].push_back(points.size()); + } + points.push_back(p); + } + + // ground geometry within the area. shapes hold the (legacy) terrain, large instances the terrain tiles + std::vector triangles; + glm::dvec2 const center = (bmin + bmax) * 0.5; + float const radius = static_cast(glm::length(bmax - bmin) * 0.5); + auto const sections = simulation::Region->sections(glm::dvec3(center.x, 0.0, center.y), radius); // copy, the result is a scratchpad + for (auto *section : sections) + { + for (auto const &shape : section->m_shapes) + gather_shape_triangles(shape, bmin, bmax, triangles); + for (auto &cell : section->m_cells) + { + double const r = cell.m_area.radius; + if (cell.m_area.center.x + r < bmin.x || cell.m_area.center.x - r > bmax.x || cell.m_area.center.z + r < bmin.y || cell.m_area.center.z - r > bmax.y) + continue; + for (auto const &shape : cell.m_shapesopaque) + gather_shape_triangles(shape, bmin, bmax, triangles); + if (false == m_fill_models_as_ground) + continue; + for (auto *instance : cell.m_instancesopaque) + { + if (instance == nullptr || instance->Model() == nullptr || instance->radius() < terrain_model_radius) + continue; + std::vector modeltriangles; + gather_submodel_triangles(instance->Model()->Root, instance_matrix(*instance), modeltriangles); + for (auto const &t : modeltriangles) + if (std::max({t[0].x, t[1].x, t[2].x}) >= bmin.x && std::min({t[0].x, t[1].x, t[2].x}) <= bmax.x && std::max({t[0].z, t[1].z, t[2].z}) >= bmin.y && + std::min({t[0].z, t[1].z, t[2].z}) <= bmax.y) + triangles.push_back(t); + } + } + } + triangle_grid const ground(std::move(triangles), bmin, bmax); + auto const terrains = active_terrains(); + + auto const rotation_mode = m_fill_random_rotation ? functions_panel::RANDOM : ui()->rot_mode(); + auto const fixed_rotation_value = ui()->rot_val(); + float const scalemin = std::max(0.01f, std::min(m_fill_scale_min, m_fill_scale_max)); + float const scalemax = std::max(0.01f, std::max(m_fill_scale_min, m_fill_scale_max)); + + std::vector created; + created.reserve(points.size()); + std::size_t unsupported = 0; + for (auto const &p : points) + { + // reference height: the outline points, weighted by inverse squared distance + double weights = 0.0, reference = 0.0; + for (auto const &v : m_fill_points) + { + double const w = 1.0 / std::max(1e-6, glm::length2(glm::dvec2(v.x, v.z) - p)); + weights += w; + reference += w * v.y; + } + reference /= weights; + double const ceiling = reference + height_tolerance; + + double y = -std::numeric_limits::max(); + bool found = ground.height_at(p.x, p.y, ceiling, y); + for (editor_terrain *terrain : terrains) + { + if (!terrain->contains(p.x, p.y)) + continue; + double const h = terrain->height_at(p.x, p.y); + if (h <= ceiling && (!found || h > y)) + { + y = h; + found = true; + } + } + if (!found) + { + y = reference; + ++unsupported; + } + + glm::dvec3 const location(p.x, y, p.y); + if (!simulation::Region->point_inside(location)) + continue; + + auto const &src = package[package.size() > 1 ? std::min(package.size() - 1, static_cast(LocalRandom(0.0, static_cast(package.size())))) : 0]; + TAnimModel *cloned = simulation::State.create_model(src, "editor_", location); + if (!cloned) + continue; + cloned->m_name = "editor_" + cloned->uuid.to_string(); + apply_rotation_for_new_node(cloned, rotation_mode, fixed_rotation_value); + if (scalemin != 1.0f || scalemax != 1.0f) + cloned->Scale(static_cast(LocalRandom(scalemin, scalemax))); + created.push_back(cloned); + } + + // a new fill replaces the "last fill" undo set; the previous objects stay in the scene + m_fill_last = std::move(created); + + m_fill_status = "Placed " + std::to_string(m_fill_last.size()) + " of " + std::to_string(target) + " objects"; + if (points.size() < target) + m_fill_status += " (limited by min. spacing)"; + if (unsupported > 0) + m_fill_status += ", " + std::to_string(unsupported) + " without ground found (height interpolated)"; + WriteLog("Editor: area fill - " + m_fill_status, logtype::generic); +} + +void editor_mode::draw_area_fill_outline() const +{ + if (m_fill_points.empty()) + return; + + // same camera-relative view and clean perspective the transform gizmo uses + ImGuiIO const &io = ImGui::GetIO(); + glm::mat4 const view = GfxRenderer->Camera_View_Matrix(); + glm::dvec3 const camerapos = GfxRenderer->Camera_Position(); + float const fovy = glm::radians(Global.FieldOfView / Global.ZoomFactor); + float const aspect = io.DisplaySize.y > 0.0f ? io.DisplaySize.x / io.DisplaySize.y : 1.0f; + glm::mat4 const viewprojection = glm::perspective(fovy, aspect, 0.1f, 10000.0f) * view; + + auto const to_clip = [&](glm::dvec3 const &Point) { return viewprojection * glm::vec4(glm::vec3(Point - camerapos), 1.0f); }; + auto const to_screen = [&](glm::vec4 const &Clip) { + return ImVec2((Clip.x / Clip.w * 0.5f + 0.5f) * io.DisplaySize.x, (0.5f - Clip.y / Clip.w * 0.5f) * io.DisplaySize.y); + }; + float constexpr nearw = 0.1f; + + ImDrawList *drawlist = ImGui::GetBackgroundDrawList(); + ImU32 const edgecolor = IM_COL32(255, 200, 40, 230); + ImU32 const closingcolor = IM_COL32(255, 200, 40, 110); + + std::size_t const count = m_fill_points.size(); + for (std::size_t i = 0; i < count; ++i) + { + bool const closing = (i + 1 == count); + if (closing && count < 3) + break; + glm::vec4 a = to_clip(m_fill_points[i]); + glm::vec4 b = to_clip(m_fill_points[(i + 1) % count]); + // clip the edge against the near plane, so points behind the camera don't flip across the screen + if (a.w < nearw && b.w < nearw) + continue; + if (a.w < nearw) + a = glm::mix(a, b, (nearw - a.w) / (b.w - a.w)); + else if (b.w < nearw) + b = glm::mix(b, a, (nearw - b.w) / (a.w - b.w)); + drawlist->AddLine(to_screen(a), to_screen(b), closing ? closingcolor : edgecolor, 2.0f); + } + for (std::size_t i = 0; i < count; ++i) + { + glm::vec4 const c = to_clip(m_fill_points[i]); + if (c.w < nearw) + continue; + drawlist->AddCircleFilled(to_screen(c), i == 0 ? 6.0f : 4.0f, i == 0 ? IM_COL32(255, 90, 40, 255) : edgecolor); + } +} + +void editor_mode::render_area_fill() +{ + ImGui::Begin("Area fill", nullptr, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoFocusOnAppearing); + + ImGui::TextUnformatted("LMB: add outline point, Backspace: remove last point"); + double const area = polygon_area_xz(m_fill_points); + ImGui::Text("Points: %zu Area: %.0f m2 (%.2f ha)", m_fill_points.size(), area, area / 10000.0); + if (ImGui::Button("Remove last point") && !m_fill_points.empty()) + m_fill_points.pop_back(); + ImGui::SameLine(); + if (ImGui::Button("Clear outline")) + m_fill_points.clear(); + + ImGui::Separator(); + + // model package: a node bank group, or a custom set assembled from node bank templates + auto const groups = ui()->nodebank_groups(); + m_fill_package = std::clamp(m_fill_package, 0, static_cast(groups.size())); + std::string const current = m_fill_package == 0 ? std::string("Custom set") : groups[m_fill_package - 1]; + ImGui::SetNextItemWidth(250.0f); + if (ImGui::BeginCombo("Model package", current.c_str())) + { + if (ImGui::Selectable("Custom set", m_fill_package == 0)) + m_fill_package = 0; + for (int i = 0; i < static_cast(groups.size()); ++i) + { + auto const label = groups[i] + "##fillgroup" + std::to_string(i); + if (ImGui::Selectable(label.c_str(), m_fill_package == i + 1)) + m_fill_package = i + 1; + } + ImGui::EndCombo(); + } + + if (m_fill_package == 0) + { + ImGui::BeginChild("fill_custom_set", ImVec2(350.0f, 110.0f), true); + for (int i = 0; i < static_cast(m_fill_custom.size()); ++i) + { + auto const label = template_label(m_fill_custom[i]) + "##fillcustom" + std::to_string(i); + if (ImGui::Selectable(label.c_str(), m_fill_custom_idx == i)) + m_fill_custom_idx = i; + } + ImGui::EndChild(); + if (ImGui::Button("Add selected template")) + { + // the node bank selection, not a random pick from the brush set + auto const *src = ui()->get_active_node_template(true); + if (src && !src->empty()) + m_fill_custom.push_back(*src); + } + ImGui::SameLine(); + if (ImGui::Button("Remove") && m_fill_custom_idx >= 0 && m_fill_custom_idx < static_cast(m_fill_custom.size())) + { + m_fill_custom.erase(m_fill_custom.begin() + m_fill_custom_idx); + m_fill_custom_idx = -1; + } + ImGui::SameLine(); + if (ImGui::Button("Clear set")) + { + m_fill_custom.clear(); + m_fill_custom_idx = -1; + } + } + else + { + ImGui::Text("Templates in group: %zu", ui()->nodebank_group_templates(static_cast(m_fill_package - 1)).size()); + } + + ImGui::Separator(); + + ImGui::SetNextItemWidth(120.0f); + ImGui::InputFloat("Density (objects/ha)", &m_fill_density, 10.0f, 100.0f, "%.1f"); + m_fill_density = std::max(0.0f, m_fill_density); + ImGui::SetNextItemWidth(120.0f); + ImGui::InputFloat("Min. spacing (m)", &m_fill_min_spacing, 0.5f, 2.0f, "%.1f"); + m_fill_min_spacing = std::max(0.0f, m_fill_min_spacing); + ImGui::SetNextItemWidth(200.0f); + ImGui::DragFloatRange2("Scale", &m_fill_scale_min, &m_fill_scale_max, 0.01f, 0.1f, 5.0f, "min %.2f", "max %.2f"); + ImGui::Checkbox("Random rotation (off: Functions panel setting)", &m_fill_random_rotation); + ImGui::Checkbox("Large models count as ground (terrain tiles)", &m_fill_models_as_ground); + + ImGui::Text("Estimated objects: %.0f", std::round(area / 10000.0 * m_fill_density)); + + if (ImGui::Button("Fill area")) + run_area_fill(); + ImGui::SameLine(); + std::string const undolabel = "Undo last fill (" + std::to_string(m_fill_last.size()) + ")"; + if (ImGui::Button(undolabel.c_str()) && !m_fill_last.empty()) + undo_last_area_fill(); + + if (!m_fill_status.empty()) + ImGui::TextUnformatted(m_fill_status.c_str()); + + ImGui::End(); +} + void editor_mode::render_gizmo() { // the transform gizmo is suppressed while editing terrain, so the brush/chunk tool owns the mouse @@ -1381,6 +1922,7 @@ void editor_mode::exit() g_redo.clear(); m_history.clear(); + m_fill_last.clear(); // drop selection so a stale/dangling node pointer isn't used on the next editor session m_node = nullptr; @@ -1496,6 +2038,12 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in } break; + case GLFW_KEY_BACKSPACE: + // area fill: remove the last outline point + if (is_press(Action) && ui()->mode() == nodebank_panel::FILL && !m_fill_points.empty()) + m_fill_points.pop_back(); + break; + case GLFW_KEY_F: if (is_press(Action)) { @@ -1565,11 +2113,30 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const if (is_press(Action)) { mouseHold = true; - m_node = nullptr; + m_brush_has_last = false; // every brush stroke starts with a placement - // delegate node picking behaviour depending on current panel mode + // in area fill mode the left button only adds outline points, it doesn't touch the selection + if (mode == nodebank_panel::FILL) + { + GfxRenderer->Pick_Node_Callback([this](scene::basic_node * /*node*/) { + if (viewport_click()) + add_area_fill_point(); + }); + m_input.mouse.button(Button, Action); + return; + } + + // delegate node picking behaviour depending on current panel mode. + // NOTE: the pick is resolved a few frames later, often after the button was already released, + // so the callback mustn't depend on the button still being held GfxRenderer->Pick_Node_Callback( [this, mode, rotation_mode, fixed_rotation_value](scene::basic_node *node) { + // the press turned out to be meant for the UI + if (!viewport_click()) + return; + + m_node = nullptr; + // ignore picks that are beyond allowed placement distance if (node) { double const dist = glm::distance(node->location(), glm::dvec3{Global.pCamera.Pos}); @@ -1578,9 +2145,6 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const } if (mode == nodebank_panel::MODIFY) { - if (!m_dragging) - return; - m_node = node; ui()->set_node(m_node); } @@ -1607,19 +2171,16 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const if (!cloned) return; - // record addition for undo - std::string as_text; std::string new_name = "editor_" + cloned->uuid.to_string(); - cloned->m_name = new_name; + apply_rotation_for_new_node(cloned, rotation_mode, fixed_rotation_value); + + // record addition for undo (after rotation, so a redo recreates the same thing) + std::string as_text; cloned->export_as_text(as_text); push_snapshot(cloned, EditorSnapshot::Action::Add, as_text); - if (!m_dragging) - return; - m_node = cloned; - apply_rotation_for_new_node(m_node, rotation_mode, fixed_rotation_value); ui()->set_node(m_node); } }); diff --git a/application/editormode.h b/application/editormode.h index 29b1ad690..413b4225a 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -19,6 +19,10 @@ http://mozilla.org/MPL/2.0/. #include "editor/editorTerrainStreamer.hpp" #include +#include +#include + +class TAnimModel; class editor_mode : public application_mode { @@ -122,7 +126,8 @@ class editor_mode : public application_mode scene::basic_node *m_node{nullptr}; // currently selected scene node bool m_takesnapshot{true}; // helper, hints whether snapshot of selected node(s) should be taken before modification bool m_dragging = false; - glm::dvec3 oldPos; + glm::dvec3 oldPos; // world position of the last brush placement + bool m_brush_has_last{false}; // false at the start of a brush stroke, so the first placement ignores spacing bool mouseHold{false}; float kMaxPlacementDistance = 200.0f; static bool m_change_history; @@ -196,6 +201,25 @@ class editor_mode : public application_mode void render_change_history(); void render_settings(); + // area fill: scatters models from a package over a polygon outlined in the viewport + void render_area_fill(); + void draw_area_fill_outline() const; + void add_area_fill_point(); + void run_area_fill(); + void undo_last_area_fill(); + std::vector m_fill_points; // outline vertices (world space) in click order + std::vector m_fill_last; // instances created by the most recent fill, for "Undo last fill" + std::vector m_fill_custom; // user-assembled package of node templates + int m_fill_custom_idx{-1}; + int m_fill_package{0}; // 0 = custom set, N = nodebank group N-1 + float m_fill_density{200.0f}; // objects per hectare + float m_fill_min_spacing{2.0f}; // minimal distance between placed objects (m) + bool m_fill_random_rotation{true}; // random yaw; otherwise the Functions panel rotation settings apply + float m_fill_scale_min{1.0f}; + float m_fill_scale_max{1.0f}; + bool m_fill_models_as_ground{true}; // large model instances (terrain tiles) count as ground + std::string m_fill_status; // result of the last fill, shown in the panel + // ImGuizmo-based transform gizmo for the selected node enum class gizmo_operation { translate, rotate, scale }; void render_gizmo(); diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index d87dd8fab..b00b1e516 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -55,6 +55,16 @@ void editor_ui::toggleBrushSettings(bool isVisible) m_brushobjects.is_open = isVisible; } +std::vector editor_ui::nodebank_groups() const +{ + return m_nodebankpanel.group_names(); +} + +std::vector editor_ui::nodebank_group_templates(std::size_t const Group) const +{ + return m_nodebankpanel.group_templates(Group); +} + void editor_ui::set_node(scene::basic_node *Node) { m_node = Node; diff --git a/application/editoruilayer.h b/application/editoruilayer.h index ad3d5447b..57d75466b 100644 --- a/application/editoruilayer.h +++ b/application/editoruilayer.h @@ -37,6 +37,8 @@ class editor_ui : public ui_layer nodebank_panel::edit_mode mode(); float getSpacing(); void toggleBrushSettings(bool isVisible); + std::vector nodebank_groups() const; + std::vector nodebank_group_templates(std::size_t const Group) const; private: // members diff --git a/application/editoruipanels.cpp b/application/editoruipanels.cpp index cbfe0ae71..80eec0ba5 100644 --- a/application/editoruipanels.cpp +++ b/application/editoruipanels.cpp @@ -434,13 +434,13 @@ void brush_object_list::render() { Objects.erase(Objects.begin() + idx); } - if (ImGui::Button("Remove all") && idx >= 0 && idx < Objects.size()) + if (ImGui::Button("Remove all")) { Objects.clear(); } } - ImGui::End(); } + ImGui::End(); } nodebank_panel::nodebank_panel(std::string const &Name, bool const Isopen) : ui_panel(Name, Isopen) @@ -535,6 +535,8 @@ void nodebank_panel::render() ImGui::SameLine(); ImGui::RadioButton("Copy to bank", (int *)&mode, COPY); ImGui::SameLine(); + ImGui::RadioButton("Area fill", (int *)&mode, FILL); + ImGui::SameLine(); if (ImGui::Button("Reload Nodebank")) { nodebank_reload(); @@ -598,6 +600,43 @@ const std::string *nodebank_panel::get_active_template() return m_selectedtemplate.get(); } +std::vector nodebank_panel::group_names() const +{ + std::vector names; + for (auto const &entry : m_nodebank) + { + if (entry.second->empty()) + names.emplace_back(entry.first); + else if (names.empty()) + names.emplace_back("(ungrouped)"); // templates listed before the first header + } + return names; +} + +std::vector nodebank_panel::group_templates(std::size_t const Group) const +{ + std::vector templates; + std::size_t group{0}; + bool started{false}; + for (auto const &entry : m_nodebank) + { + if (entry.second->empty()) + { + // header: opens the next group, unless it's the very first entry + if (started) + ++group; + started = true; + continue; + } + started = true; + if (group == Group) + templates.emplace_back(*entry.second); + else if (group > Group) + break; + } + return templates; +} + std::string nodebank_panel::generate_node_label(std::string Input) const { diff --git a/application/editoruipanels.h b/application/editoruipanels.h index 41da71735..50e8bf99c 100644 --- a/application/editoruipanels.h +++ b/application/editoruipanels.h @@ -81,7 +81,8 @@ class nodebank_panel : public ui_panel MODIFY, COPY, ADD, - BRUSH + BRUSH, + FILL }; edit_mode mode = MODIFY; @@ -90,6 +91,10 @@ class nodebank_panel : public ui_panel void render() override; void add_template(const std::string &desc); const std::string *get_active_template(); + // nodebank groups (collapsing headers), in file order; entries listed before the first header form an unnamed group + std::vector group_names() const; + // node templates of the group with specified index (as returned by group_names()) + std::vector group_templates(std::size_t const Group) const; private: // methods: From f9deee5cfdd63db40ace5c555fdec13cf61cb24e Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Thu, 1 Oct 2026 02:03:49 +0200 Subject: [PATCH 017/430] fix(editor): stuck brush after clicks on UI; add polygon area fill (#191) --- application/editormode.cpp | 619 +++++++++++++++++++++++++++++++-- application/editormode.h | 26 +- application/editoruilayer.cpp | 10 + application/editoruilayer.h | 2 + application/editoruipanels.cpp | 43 ++- application/editoruipanels.h | 7 +- 6 files changed, 674 insertions(+), 33 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 46a8edadf..94b1424da 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -24,6 +24,8 @@ http://mozilla.org/MPL/2.0/. #include "model/Model3d.h" #include "utilities/Float3d.h" #include "scene/scene.h" +#include "utilities/parser.h" +#include "utilities/utilities.h" #include "imgui/imgui.h" @@ -58,6 +60,14 @@ namespace return state == GLFW_PRESS; } + // true when the most recent left button press landed in the viewport rather than on an ImGui window. + // valid once ImGui has processed the press (i.e. from mode update onwards), so it's also used to + // discard deferred pick callbacks of a press that leaked past the application's UI filter + inline bool viewport_click() + { + return false == ImGui::GetIO().MouseDownOwned[0]; + } + // tests whether the vertical line through (Px,Pz) passes over triangle abc; if so returns the // surface height at that point through OutY. used by the "snap to ground" (END) feature. inline bool triangle_height_at(glm::dvec3 const &a, glm::dvec3 const &b, glm::dvec3 const &c, @@ -117,6 +127,158 @@ namespace } } + // world transform of a model instance, matching the renderer: translate * rotateY * rotateX * rotateZ * scale + glm::dmat4 instance_matrix(TAnimModel const &Model) + { + glm::dmat4 rootm(1.0); + rootm = glm::translate(rootm, Model.location()); + glm::vec3 const angles = Model.Angles(); + if (angles.y != 0.0f) rootm = glm::rotate(rootm, glm::radians(static_cast(angles.y)), glm::dvec3(0.0, 1.0, 0.0)); + if (angles.x != 0.0f) rootm = glm::rotate(rootm, glm::radians(static_cast(angles.x)), glm::dvec3(1.0, 0.0, 0.0)); + if (angles.z != 0.0f) rootm = glm::rotate(rootm, glm::radians(static_cast(angles.z)), glm::dvec3(0.0, 0.0, 1.0)); + return glm::scale(rootm, glm::dvec3(Model.Scale())); + } + + // even-odd test of a point against a polygon outline projected onto the XZ plane + bool point_in_polygon_xz(std::vector const &Polygon, double const X, double const Z) + { + bool inside = false; + for (std::size_t i = 0, j = Polygon.size() - 1; i < Polygon.size(); j = i++) + { + auto const &a = Polygon[i]; + auto const &b = Polygon[j]; + if ((a.z > Z) != (b.z > Z) && X < (b.x - a.x) * (Z - a.z) / (b.z - a.z) + a.x) + inside = !inside; + } + return inside; + } + + // area of a polygon outline projected onto the XZ plane (shoelace formula) + double polygon_area_xz(std::vector const &Polygon) + { + if (Polygon.size() < 3) + return 0.0; + double sum = 0.0; + for (std::size_t i = 0, j = Polygon.size() - 1; i < Polygon.size(); j = i++) + sum += Polygon[j].x * Polygon[i].z - Polygon[i].x * Polygon[j].z; + return std::abs(sum) * 0.5; + } + + // short readable name of a node template (model file and texture), like the node bank shows it + std::string template_label(std::string const &Template) + { + cParser tokenizer(Template); + tokenizer.getTokens(9, false); // node, ranges, name, type, position, rotation + auto model{tokenizer.getToken(false)}; + auto texture{tokenizer.getToken(false)}; + replace_slashes(model); + erase_extension(model); + replace_slashes(texture); + return texture == "none" || texture.empty() ? model : model + " (" + texture + ")"; + } + + // world triangles bucketed on a uniform XZ grid, for many ground height queries over one area + class triangle_grid + { + public: + triangle_grid(std::vector Triangles, glm::dvec2 const &Min, glm::dvec2 const &Max) : m_triangles(std::move(Triangles)), m_min(Min) + { + glm::dvec2 const extent = glm::max(Max - Min, glm::dvec2(1.0)); + // ~8 m cells, coarser for big areas so large terrain triangles don't flood the grid + m_cellsize = std::max(8.0, std::max(extent.x, extent.y) / 128.0); + m_columns = static_cast(std::ceil(extent.x / m_cellsize)) + 1; + m_rows = static_cast(std::ceil(extent.y / m_cellsize)) + 1; + m_cells.resize(static_cast(m_columns) * m_rows); + + for (std::uint32_t idx = 0; idx < m_triangles.size(); ++idx) + { + auto const &t = m_triangles[idx]; + int const c0 = column(std::min({t[0].x, t[1].x, t[2].x})); + int const c1 = column(std::max({t[0].x, t[1].x, t[2].x})); + int const r0 = row(std::min({t[0].z, t[1].z, t[2].z})); + int const r1 = row(std::max({t[0].z, t[1].z, t[2].z})); + for (int r = r0; r <= r1; ++r) + for (int c = c0; c <= c1; ++c) + m_cells[static_cast(r) * m_columns + c].push_back(idx); + } + } + + // highest surface at (X,Z) that isn't above Ceiling. returns: true if there is one + bool height_at(double const X, double const Z, double const Ceiling, double &OutY) const + { + bool found = false; + for (auto const idx : m_cells[static_cast(row(Z)) * m_columns + column(X)]) + { + auto const &t = m_triangles[idx]; + double y; + if (triangle_height_at(t[0], t[1], t[2], X, Z, y) && y <= Ceiling && (!found || y > OutY)) + { + OutY = y; + found = true; + } + } + return found; + } + + private: + int column(double const X) const + { + return std::clamp(static_cast(std::floor((X - m_min.x) / m_cellsize)), 0, m_columns - 1); + } + int row(double const Z) const + { + return std::clamp(static_cast(std::floor((Z - m_min.y) / m_cellsize)), 0, m_rows - 1); + } + + std::vector m_triangles; + std::vector> m_cells; + glm::dvec2 m_min; + double m_cellsize{8.0}; + int m_columns{1}; + int m_rows{1}; + }; + + // appends triangles of a shape node which overlap specified XZ rectangle + void gather_shape_triangles(scene::shape_node const &Shape, glm::dvec2 const &Min, glm::dvec2 const &Max, std::vector &Out) + { + auto const &data = Shape.data(); + if (data.area.radius >= 0.0f) + { + double const r = data.area.radius; + if (data.area.center.x + r < Min.x || data.area.center.x - r > Max.x || data.area.center.z + r < Min.y || data.area.center.z - r > Max.y) + return; + } + + auto const add = [&](glm::dvec3 const &a, glm::dvec3 const &b, glm::dvec3 const &c) { + if (std::max({a.x, b.x, c.x}) < Min.x || std::min({a.x, b.x, c.x}) > Max.x || std::max({a.z, b.z, c.z}) < Min.y || std::min({a.z, b.z, c.z}) > Max.y) + return; + Out.push_back({a, b, c}); + }; + + if (false == data.vertices.empty()) + { + for (std::size_t i = 0; i + 2 < data.vertices.size(); i += 3) + add(data.vertices[i].position, data.vertices[i + 1].position, data.vertices[i + 2].position); + return; + } + // once the shape is uploaded its world-space source is released; the renderer keeps an origin-relative copy + if (data.geometry.bank == 0 && data.geometry.chunk == 0) + return; + auto const &verts = GfxRenderer->Vertices(data.geometry); + auto const &indices = GfxRenderer->Indices(data.geometry); + auto const to_world = [&](gfx::basic_vertex const &v) { return data.origin + glm::dvec3(v.position); }; + if (false == indices.empty()) + { + for (std::size_t i = 0; i + 2 < indices.size(); i += 3) + add(to_world(verts[indices[i]]), to_world(verts[indices[i + 1]]), to_world(verts[indices[i + 2]])); + } + else + { + for (std::size_t i = 0; i + 2 < verts.size(); i += 3) + add(to_world(verts[i]), to_world(verts[i + 1]), to_world(verts[i + 2])); + } + } + } bool editor_mode::editormode_input::init() @@ -306,32 +468,38 @@ void editor_mode::handle_brush_mouse_hold(int Action, int Button) GfxRenderer->Pick_Node_Callback( [this, mode, rotation_mode, fixed_rotation_value, Action, Button](scene::basic_node * /*node*/) { + // picks are resolved a few frames later; drop the ones queued before the button went up, + // or for a press that turned out to belong to the UI + if (!mouseHold || !viewport_click()) + return; + const std::string *src = ui()->get_active_node_template(); if (!src) return; std::string name = "editor_"; - glm::dvec3 newPos = clamp_mouse_offset_to_max(GfxRenderer->Mouse_Position()); - double distance = glm::distance(newPos, oldPos); - if (distance < ui()->getSpacing()) + // spacing is measured in world space: the mouse offset is camera-relative and the camera may move mid-stroke + glm::dvec3 const newPos = Camera.Pos + clamp_mouse_offset_to_max(GfxRenderer->Mouse_Position()); + if (m_brush_has_last && glm::distance(newPos, oldPos) < ui()->getSpacing()) return; - TAnimModel *cloned = simulation::State.create_model(*src, name, Camera.Pos + newPos); + TAnimModel *cloned = simulation::State.create_model(*src, name, newPos); oldPos = newPos; + m_brush_has_last = true; if (!cloned) return; std::string new_name = "editor_" + cloned->uuid.to_string(); cloned->m_name = new_name; - + apply_rotation_for_new_node(cloned, rotation_mode, fixed_rotation_value); + std::string as_text; cloned->export_as_text(as_text); push_snapshot(cloned, EditorSnapshot::Action::Add, as_text); m_node = cloned; - apply_rotation_for_new_node(m_node, rotation_mode, fixed_rotation_value); ui()->set_node(m_node); }); } @@ -439,6 +607,9 @@ void editor_mode::nullify_history_pointers(scene::basic_node *node) if (s.node_ptr == node) s.node_ptr = nullptr; } + + // deleted nodes also drop out of the "undo last fill" set + m_fill_last.erase(std::remove(m_fill_last.begin(), m_fill_last.end(), node), m_fill_last.end()); } void editor_mode::undo_last() @@ -626,6 +797,19 @@ bool editor_mode::update() Application.set_cursor(GLFW_CURSOR_NORMAL); } + // same for the left button (brush / sculpt / click placement). the UI filter in the application + // uses io.WantCaptureMouse from the previous frame, so a press on a panel the cursor has just + // moved onto can leak into the viewport, and its release is then swallowed by the UI; the brush + // would keep painting with the button up. by now ImGui has processed this frame's input, so + // MouseDown is the real button state and MouseDownOwned tells whether the press hit the UI. + // (pick callbacks queued by such a press are discarded separately, see viewport_click()) + if (mouseHold && (!ImGui::GetIO().MouseDown[0] || !viewport_click())) + { + mouseHold = false; + m_dragging = false; + m_input.mouse.button(GLFW_MOUSE_BUTTON_LEFT, GLFW_RELEASE); + } + // fixed step render time routines (50 Hz) fTime50Hz += deltarealtime; // accumulate even when paused to keep frame reads stable while (fTime50Hz >= 1.0 / 50.0) @@ -708,6 +892,13 @@ bool editor_mode::update() // --- ImGuizmo: in-viewport transform gizmo for the selected node --- render_gizmo(); + // --- area fill: outline overlay and settings, while the mode is active --- + if (ui()->mode() == nodebank_panel::FILL) + { + draw_area_fill_outline(); + render_area_fill(); + } + // --- ImGui: Editor Settings & History windows --- if(m_settings_open) render_settings(); @@ -1097,18 +1288,8 @@ void editor_mode::capture_terrain() return; } - // instance world transform, matching the renderer: translate * rotateY * rotateX * rotateZ * scale - glm::dmat4 rootm(1.0); - rootm = glm::translate(rootm, model->location()); - glm::vec3 const angles = model->Angles(); - if (angles.y != 0.0f) rootm = glm::rotate(rootm, glm::radians(static_cast(angles.y)), glm::dvec3(0.0, 1.0, 0.0)); - if (angles.x != 0.0f) rootm = glm::rotate(rootm, glm::radians(static_cast(angles.x)), glm::dvec3(1.0, 0.0, 0.0)); - if (angles.z != 0.0f) rootm = glm::rotate(rootm, glm::radians(static_cast(angles.z)), glm::dvec3(0.0, 0.0, 1.0)); - glm::vec3 const scale = model->Scale(); - rootm = glm::scale(rootm, glm::dvec3(scale)); - std::vector tris; - gather_submodel_triangles(model->pModel->Root, rootm, tris); + gather_submodel_triangles(model->pModel->Root, instance_matrix(*model), tris); if (tris.empty()) { WriteLog("Editor: selected model has no readable geometry to capture", logtype::generic); @@ -1174,6 +1355,366 @@ void editor_mode::capture_terrain() simulation::State.delete_model(model); } +void editor_mode::add_area_fill_point() +{ + // like the other placement tools, the point comes from the depth buffer under the cursor + // (ground geometry only), relative to the camera + glm::dvec3 const offset = GfxRenderer->Mouse_Position(); + if (glm::length(offset) < 1e-3) + return; // no ground under the cursor (yet) + + m_fill_points.push_back(Camera.Pos + offset); +} + +void editor_mode::undo_last_area_fill() +{ + // nullify_history_pointers() removes deleted nodes from m_fill_last, so work on a copy + auto const created = std::move(m_fill_last); + m_fill_last.clear(); + + for (TAnimModel *model : created) + { + if (model == nullptr) + continue; + if (m_node == model) + { + m_node = nullptr; + ui()->set_node(nullptr); + } + nullify_history_pointers(model); + remove_from_hierarchy(model); + simulation::State.delete_model(model); + } + m_fill_status = "Removed " + std::to_string(created.size()) + " objects of the last fill"; +} + +void editor_mode::run_area_fill() +{ + // limits keeping a single click from freezing the editor for too long + std::size_t constexpr max_objects = 20000; + // large model instances (e.g. terrain tiles) are treated as ground, smaller ones (houses, trees) are not + float constexpr terrain_model_radius = 50.0f; + // ground is searched up to this far above the height interpolated from the outline points, + // so hills inside the outline are found but bridges or roofs high above it are not + double constexpr height_tolerance = 50.0; + + if (m_fill_points.size() < 3) + { + m_fill_status = "Outline needs at least 3 points"; + return; + } + + // model package + std::vector package; + if (m_fill_package == 0) + package = m_fill_custom; + else + package = ui()->nodebank_group_templates(static_cast(m_fill_package - 1)); + package.erase(std::remove_if(package.begin(), package.end(), [](std::string const &Template) { return Template.empty(); }), package.end()); + if (package.empty()) + { + m_fill_status = "Selected model package is empty"; + return; + } + + // area bounds + glm::dvec2 bmin(std::numeric_limits::max()); + glm::dvec2 bmax(-std::numeric_limits::max()); + for (auto const &p : m_fill_points) + { + bmin = glm::min(bmin, glm::dvec2(p.x, p.z)); + bmax = glm::max(bmax, glm::dvec2(p.x, p.z)); + } + double const area = polygon_area_xz(m_fill_points); + auto const target = static_cast(std::min(std::round(area / 10000.0 * std::max(0.0f, m_fill_density)), max_objects)); + if (target == 0) + { + m_fill_status = "Density too low for this area, nothing to place"; + return; + } + + // scatter points: random samples inside the outline, rejecting the ones closer than the minimal spacing + // to an already accepted point (checked on a hashed grid with cell size == spacing) + double const spacing = std::max(0.0f, m_fill_min_spacing); + std::unordered_map> occupancy; + auto const cell_key = [](std::int64_t const X, std::int64_t const Z) { return (X << 32) ^ (Z & 0xffffffff); }; + std::vector points; + points.reserve(target); + for (std::size_t attempt = 0; attempt < target * 30 && points.size() < target; ++attempt) + { + glm::dvec2 const p(LocalRandom(bmin.x, bmax.x), LocalRandom(bmin.y, bmax.y)); + if (false == point_in_polygon_xz(m_fill_points, p.x, p.y)) + continue; + if (spacing > 0.0) + { + auto const cx = static_cast(std::floor(p.x / spacing)); + auto const cz = static_cast(std::floor(p.y / spacing)); + bool free = true; + for (std::int64_t dz = -1; dz <= 1 && free; ++dz) + for (std::int64_t dx = -1; dx <= 1 && free; ++dx) + { + auto const lookup = occupancy.find(cell_key(cx + dx, cz + dz)); + if (lookup == occupancy.end()) + continue; + for (auto const idx : lookup->second) + if (glm::distance(points[idx], p) < spacing) + { + free = false; + break; + } + } + if (!free) + continue; + occupancy[cell_key(cx, cz)].push_back(points.size()); + } + points.push_back(p); + } + + // ground geometry within the area. shapes hold the (legacy) terrain, large instances the terrain tiles + std::vector triangles; + glm::dvec2 const center = (bmin + bmax) * 0.5; + float const radius = static_cast(glm::length(bmax - bmin) * 0.5); + auto const sections = simulation::Region->sections(glm::dvec3(center.x, 0.0, center.y), radius); // copy, the result is a scratchpad + for (auto *section : sections) + { + for (auto const &shape : section->m_shapes) + gather_shape_triangles(shape, bmin, bmax, triangles); + for (auto &cell : section->m_cells) + { + double const r = cell.m_area.radius; + if (cell.m_area.center.x + r < bmin.x || cell.m_area.center.x - r > bmax.x || cell.m_area.center.z + r < bmin.y || cell.m_area.center.z - r > bmax.y) + continue; + for (auto const &shape : cell.m_shapesopaque) + gather_shape_triangles(shape, bmin, bmax, triangles); + if (false == m_fill_models_as_ground) + continue; + for (auto *instance : cell.m_instancesopaque) + { + if (instance == nullptr || instance->Model() == nullptr || instance->radius() < terrain_model_radius) + continue; + std::vector modeltriangles; + gather_submodel_triangles(instance->Model()->Root, instance_matrix(*instance), modeltriangles); + for (auto const &t : modeltriangles) + if (std::max({t[0].x, t[1].x, t[2].x}) >= bmin.x && std::min({t[0].x, t[1].x, t[2].x}) <= bmax.x && std::max({t[0].z, t[1].z, t[2].z}) >= bmin.y && + std::min({t[0].z, t[1].z, t[2].z}) <= bmax.y) + triangles.push_back(t); + } + } + } + triangle_grid const ground(std::move(triangles), bmin, bmax); + auto const terrains = active_terrains(); + + auto const rotation_mode = m_fill_random_rotation ? functions_panel::RANDOM : ui()->rot_mode(); + auto const fixed_rotation_value = ui()->rot_val(); + float const scalemin = std::max(0.01f, std::min(m_fill_scale_min, m_fill_scale_max)); + float const scalemax = std::max(0.01f, std::max(m_fill_scale_min, m_fill_scale_max)); + + std::vector created; + created.reserve(points.size()); + std::size_t unsupported = 0; + for (auto const &p : points) + { + // reference height: the outline points, weighted by inverse squared distance + double weights = 0.0, reference = 0.0; + for (auto const &v : m_fill_points) + { + double const w = 1.0 / std::max(1e-6, glm::length2(glm::dvec2(v.x, v.z) - p)); + weights += w; + reference += w * v.y; + } + reference /= weights; + double const ceiling = reference + height_tolerance; + + double y = -std::numeric_limits::max(); + bool found = ground.height_at(p.x, p.y, ceiling, y); + for (editor_terrain *terrain : terrains) + { + if (!terrain->contains(p.x, p.y)) + continue; + double const h = terrain->height_at(p.x, p.y); + if (h <= ceiling && (!found || h > y)) + { + y = h; + found = true; + } + } + if (!found) + { + y = reference; + ++unsupported; + } + + glm::dvec3 const location(p.x, y, p.y); + if (!simulation::Region->point_inside(location)) + continue; + + auto const &src = package[package.size() > 1 ? std::min(package.size() - 1, static_cast(LocalRandom(0.0, static_cast(package.size())))) : 0]; + TAnimModel *cloned = simulation::State.create_model(src, "editor_", location); + if (!cloned) + continue; + cloned->m_name = "editor_" + cloned->uuid.to_string(); + apply_rotation_for_new_node(cloned, rotation_mode, fixed_rotation_value); + if (scalemin != 1.0f || scalemax != 1.0f) + cloned->Scale(static_cast(LocalRandom(scalemin, scalemax))); + created.push_back(cloned); + } + + // a new fill replaces the "last fill" undo set; the previous objects stay in the scene + m_fill_last = std::move(created); + + m_fill_status = "Placed " + std::to_string(m_fill_last.size()) + " of " + std::to_string(target) + " objects"; + if (points.size() < target) + m_fill_status += " (limited by min. spacing)"; + if (unsupported > 0) + m_fill_status += ", " + std::to_string(unsupported) + " without ground found (height interpolated)"; + WriteLog("Editor: area fill - " + m_fill_status, logtype::generic); +} + +void editor_mode::draw_area_fill_outline() const +{ + if (m_fill_points.empty()) + return; + + // same camera-relative view and clean perspective the transform gizmo uses + ImGuiIO const &io = ImGui::GetIO(); + glm::mat4 const view = GfxRenderer->Camera_View_Matrix(); + glm::dvec3 const camerapos = GfxRenderer->Camera_Position(); + float const fovy = glm::radians(Global.FieldOfView / Global.ZoomFactor); + float const aspect = io.DisplaySize.y > 0.0f ? io.DisplaySize.x / io.DisplaySize.y : 1.0f; + glm::mat4 const viewprojection = glm::perspective(fovy, aspect, 0.1f, 10000.0f) * view; + + auto const to_clip = [&](glm::dvec3 const &Point) { return viewprojection * glm::vec4(glm::vec3(Point - camerapos), 1.0f); }; + auto const to_screen = [&](glm::vec4 const &Clip) { + return ImVec2((Clip.x / Clip.w * 0.5f + 0.5f) * io.DisplaySize.x, (0.5f - Clip.y / Clip.w * 0.5f) * io.DisplaySize.y); + }; + float constexpr nearw = 0.1f; + + ImDrawList *drawlist = ImGui::GetBackgroundDrawList(); + ImU32 const edgecolor = IM_COL32(255, 200, 40, 230); + ImU32 const closingcolor = IM_COL32(255, 200, 40, 110); + + std::size_t const count = m_fill_points.size(); + for (std::size_t i = 0; i < count; ++i) + { + bool const closing = (i + 1 == count); + if (closing && count < 3) + break; + glm::vec4 a = to_clip(m_fill_points[i]); + glm::vec4 b = to_clip(m_fill_points[(i + 1) % count]); + // clip the edge against the near plane, so points behind the camera don't flip across the screen + if (a.w < nearw && b.w < nearw) + continue; + if (a.w < nearw) + a = glm::mix(a, b, (nearw - a.w) / (b.w - a.w)); + else if (b.w < nearw) + b = glm::mix(b, a, (nearw - b.w) / (a.w - b.w)); + drawlist->AddLine(to_screen(a), to_screen(b), closing ? closingcolor : edgecolor, 2.0f); + } + for (std::size_t i = 0; i < count; ++i) + { + glm::vec4 const c = to_clip(m_fill_points[i]); + if (c.w < nearw) + continue; + drawlist->AddCircleFilled(to_screen(c), i == 0 ? 6.0f : 4.0f, i == 0 ? IM_COL32(255, 90, 40, 255) : edgecolor); + } +} + +void editor_mode::render_area_fill() +{ + ImGui::Begin("Area fill", nullptr, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoFocusOnAppearing); + + ImGui::TextUnformatted("LMB: add outline point, Backspace: remove last point"); + double const area = polygon_area_xz(m_fill_points); + ImGui::Text("Points: %zu Area: %.0f m2 (%.2f ha)", m_fill_points.size(), area, area / 10000.0); + if (ImGui::Button("Remove last point") && !m_fill_points.empty()) + m_fill_points.pop_back(); + ImGui::SameLine(); + if (ImGui::Button("Clear outline")) + m_fill_points.clear(); + + ImGui::Separator(); + + // model package: a node bank group, or a custom set assembled from node bank templates + auto const groups = ui()->nodebank_groups(); + m_fill_package = std::clamp(m_fill_package, 0, static_cast(groups.size())); + std::string const current = m_fill_package == 0 ? std::string("Custom set") : groups[m_fill_package - 1]; + ImGui::SetNextItemWidth(250.0f); + if (ImGui::BeginCombo("Model package", current.c_str())) + { + if (ImGui::Selectable("Custom set", m_fill_package == 0)) + m_fill_package = 0; + for (int i = 0; i < static_cast(groups.size()); ++i) + { + auto const label = groups[i] + "##fillgroup" + std::to_string(i); + if (ImGui::Selectable(label.c_str(), m_fill_package == i + 1)) + m_fill_package = i + 1; + } + ImGui::EndCombo(); + } + + if (m_fill_package == 0) + { + ImGui::BeginChild("fill_custom_set", ImVec2(350.0f, 110.0f), true); + for (int i = 0; i < static_cast(m_fill_custom.size()); ++i) + { + auto const label = template_label(m_fill_custom[i]) + "##fillcustom" + std::to_string(i); + if (ImGui::Selectable(label.c_str(), m_fill_custom_idx == i)) + m_fill_custom_idx = i; + } + ImGui::EndChild(); + if (ImGui::Button("Add selected template")) + { + // the node bank selection, not a random pick from the brush set + auto const *src = ui()->get_active_node_template(true); + if (src && !src->empty()) + m_fill_custom.push_back(*src); + } + ImGui::SameLine(); + if (ImGui::Button("Remove") && m_fill_custom_idx >= 0 && m_fill_custom_idx < static_cast(m_fill_custom.size())) + { + m_fill_custom.erase(m_fill_custom.begin() + m_fill_custom_idx); + m_fill_custom_idx = -1; + } + ImGui::SameLine(); + if (ImGui::Button("Clear set")) + { + m_fill_custom.clear(); + m_fill_custom_idx = -1; + } + } + else + { + ImGui::Text("Templates in group: %zu", ui()->nodebank_group_templates(static_cast(m_fill_package - 1)).size()); + } + + ImGui::Separator(); + + ImGui::SetNextItemWidth(120.0f); + ImGui::InputFloat("Density (objects/ha)", &m_fill_density, 10.0f, 100.0f, "%.1f"); + m_fill_density = std::max(0.0f, m_fill_density); + ImGui::SetNextItemWidth(120.0f); + ImGui::InputFloat("Min. spacing (m)", &m_fill_min_spacing, 0.5f, 2.0f, "%.1f"); + m_fill_min_spacing = std::max(0.0f, m_fill_min_spacing); + ImGui::SetNextItemWidth(200.0f); + ImGui::DragFloatRange2("Scale", &m_fill_scale_min, &m_fill_scale_max, 0.01f, 0.1f, 5.0f, "min %.2f", "max %.2f"); + ImGui::Checkbox("Random rotation (off: Functions panel setting)", &m_fill_random_rotation); + ImGui::Checkbox("Large models count as ground (terrain tiles)", &m_fill_models_as_ground); + + ImGui::Text("Estimated objects: %.0f", std::round(area / 10000.0 * m_fill_density)); + + if (ImGui::Button("Fill area")) + run_area_fill(); + ImGui::SameLine(); + std::string const undolabel = "Undo last fill (" + std::to_string(m_fill_last.size()) + ")"; + if (ImGui::Button(undolabel.c_str()) && !m_fill_last.empty()) + undo_last_area_fill(); + + if (!m_fill_status.empty()) + ImGui::TextUnformatted(m_fill_status.c_str()); + + ImGui::End(); +} + void editor_mode::render_gizmo() { // the transform gizmo is suppressed while editing terrain, so the brush/chunk tool owns the mouse @@ -1381,6 +1922,7 @@ void editor_mode::exit() g_redo.clear(); m_history.clear(); + m_fill_last.clear(); // drop selection so a stale/dangling node pointer isn't used on the next editor session m_node = nullptr; @@ -1496,6 +2038,12 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in } break; + case GLFW_KEY_BACKSPACE: + // area fill: remove the last outline point + if (is_press(Action) && ui()->mode() == nodebank_panel::FILL && !m_fill_points.empty()) + m_fill_points.pop_back(); + break; + case GLFW_KEY_F: if (is_press(Action)) { @@ -1565,11 +2113,30 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const if (is_press(Action)) { mouseHold = true; - m_node = nullptr; + m_brush_has_last = false; // every brush stroke starts with a placement - // delegate node picking behaviour depending on current panel mode + // in area fill mode the left button only adds outline points, it doesn't touch the selection + if (mode == nodebank_panel::FILL) + { + GfxRenderer->Pick_Node_Callback([this](scene::basic_node * /*node*/) { + if (viewport_click()) + add_area_fill_point(); + }); + m_input.mouse.button(Button, Action); + return; + } + + // delegate node picking behaviour depending on current panel mode. + // NOTE: the pick is resolved a few frames later, often after the button was already released, + // so the callback mustn't depend on the button still being held GfxRenderer->Pick_Node_Callback( [this, mode, rotation_mode, fixed_rotation_value](scene::basic_node *node) { + // the press turned out to be meant for the UI + if (!viewport_click()) + return; + + m_node = nullptr; + // ignore picks that are beyond allowed placement distance if (node) { double const dist = glm::distance(node->location(), glm::dvec3{Global.pCamera.Pos}); @@ -1578,9 +2145,6 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const } if (mode == nodebank_panel::MODIFY) { - if (!m_dragging) - return; - m_node = node; ui()->set_node(m_node); } @@ -1607,19 +2171,16 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const if (!cloned) return; - // record addition for undo - std::string as_text; std::string new_name = "editor_" + cloned->uuid.to_string(); - cloned->m_name = new_name; + apply_rotation_for_new_node(cloned, rotation_mode, fixed_rotation_value); + + // record addition for undo (after rotation, so a redo recreates the same thing) + std::string as_text; cloned->export_as_text(as_text); push_snapshot(cloned, EditorSnapshot::Action::Add, as_text); - if (!m_dragging) - return; - m_node = cloned; - apply_rotation_for_new_node(m_node, rotation_mode, fixed_rotation_value); ui()->set_node(m_node); } }); diff --git a/application/editormode.h b/application/editormode.h index 29b1ad690..413b4225a 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -19,6 +19,10 @@ http://mozilla.org/MPL/2.0/. #include "editor/editorTerrainStreamer.hpp" #include +#include +#include + +class TAnimModel; class editor_mode : public application_mode { @@ -122,7 +126,8 @@ class editor_mode : public application_mode scene::basic_node *m_node{nullptr}; // currently selected scene node bool m_takesnapshot{true}; // helper, hints whether snapshot of selected node(s) should be taken before modification bool m_dragging = false; - glm::dvec3 oldPos; + glm::dvec3 oldPos; // world position of the last brush placement + bool m_brush_has_last{false}; // false at the start of a brush stroke, so the first placement ignores spacing bool mouseHold{false}; float kMaxPlacementDistance = 200.0f; static bool m_change_history; @@ -196,6 +201,25 @@ class editor_mode : public application_mode void render_change_history(); void render_settings(); + // area fill: scatters models from a package over a polygon outlined in the viewport + void render_area_fill(); + void draw_area_fill_outline() const; + void add_area_fill_point(); + void run_area_fill(); + void undo_last_area_fill(); + std::vector m_fill_points; // outline vertices (world space) in click order + std::vector m_fill_last; // instances created by the most recent fill, for "Undo last fill" + std::vector m_fill_custom; // user-assembled package of node templates + int m_fill_custom_idx{-1}; + int m_fill_package{0}; // 0 = custom set, N = nodebank group N-1 + float m_fill_density{200.0f}; // objects per hectare + float m_fill_min_spacing{2.0f}; // minimal distance between placed objects (m) + bool m_fill_random_rotation{true}; // random yaw; otherwise the Functions panel rotation settings apply + float m_fill_scale_min{1.0f}; + float m_fill_scale_max{1.0f}; + bool m_fill_models_as_ground{true}; // large model instances (terrain tiles) count as ground + std::string m_fill_status; // result of the last fill, shown in the panel + // ImGuizmo-based transform gizmo for the selected node enum class gizmo_operation { translate, rotate, scale }; void render_gizmo(); diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index d87dd8fab..b00b1e516 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -55,6 +55,16 @@ void editor_ui::toggleBrushSettings(bool isVisible) m_brushobjects.is_open = isVisible; } +std::vector editor_ui::nodebank_groups() const +{ + return m_nodebankpanel.group_names(); +} + +std::vector editor_ui::nodebank_group_templates(std::size_t const Group) const +{ + return m_nodebankpanel.group_templates(Group); +} + void editor_ui::set_node(scene::basic_node *Node) { m_node = Node; diff --git a/application/editoruilayer.h b/application/editoruilayer.h index ad3d5447b..57d75466b 100644 --- a/application/editoruilayer.h +++ b/application/editoruilayer.h @@ -37,6 +37,8 @@ class editor_ui : public ui_layer nodebank_panel::edit_mode mode(); float getSpacing(); void toggleBrushSettings(bool isVisible); + std::vector nodebank_groups() const; + std::vector nodebank_group_templates(std::size_t const Group) const; private: // members diff --git a/application/editoruipanels.cpp b/application/editoruipanels.cpp index cbfe0ae71..80eec0ba5 100644 --- a/application/editoruipanels.cpp +++ b/application/editoruipanels.cpp @@ -434,13 +434,13 @@ void brush_object_list::render() { Objects.erase(Objects.begin() + idx); } - if (ImGui::Button("Remove all") && idx >= 0 && idx < Objects.size()) + if (ImGui::Button("Remove all")) { Objects.clear(); } } - ImGui::End(); } + ImGui::End(); } nodebank_panel::nodebank_panel(std::string const &Name, bool const Isopen) : ui_panel(Name, Isopen) @@ -535,6 +535,8 @@ void nodebank_panel::render() ImGui::SameLine(); ImGui::RadioButton("Copy to bank", (int *)&mode, COPY); ImGui::SameLine(); + ImGui::RadioButton("Area fill", (int *)&mode, FILL); + ImGui::SameLine(); if (ImGui::Button("Reload Nodebank")) { nodebank_reload(); @@ -598,6 +600,43 @@ const std::string *nodebank_panel::get_active_template() return m_selectedtemplate.get(); } +std::vector nodebank_panel::group_names() const +{ + std::vector names; + for (auto const &entry : m_nodebank) + { + if (entry.second->empty()) + names.emplace_back(entry.first); + else if (names.empty()) + names.emplace_back("(ungrouped)"); // templates listed before the first header + } + return names; +} + +std::vector nodebank_panel::group_templates(std::size_t const Group) const +{ + std::vector templates; + std::size_t group{0}; + bool started{false}; + for (auto const &entry : m_nodebank) + { + if (entry.second->empty()) + { + // header: opens the next group, unless it's the very first entry + if (started) + ++group; + started = true; + continue; + } + started = true; + if (group == Group) + templates.emplace_back(*entry.second); + else if (group > Group) + break; + } + return templates; +} + std::string nodebank_panel::generate_node_label(std::string Input) const { diff --git a/application/editoruipanels.h b/application/editoruipanels.h index 41da71735..50e8bf99c 100644 --- a/application/editoruipanels.h +++ b/application/editoruipanels.h @@ -81,7 +81,8 @@ class nodebank_panel : public ui_panel MODIFY, COPY, ADD, - BRUSH + BRUSH, + FILL }; edit_mode mode = MODIFY; @@ -90,6 +91,10 @@ class nodebank_panel : public ui_panel void render() override; void add_template(const std::string &desc); const std::string *get_active_template(); + // nodebank groups (collapsing headers), in file order; entries listed before the first header form an unnamed group + std::vector group_names() const; + // node templates of the group with specified index (as returned by group_names()) + std::vector group_templates(std::size_t const Group) const; private: // methods: From 99c5a0090b63d931db62fe8b801493e447f0a681 Mon Sep 17 00:00:00 2001 From: jakubg1 <24206305+jakubg1@users.noreply.github.com> Date: Thu, 1 Oct 2026 02:10:21 +0200 Subject: [PATCH 018/430] Remove brake position check from `TController::PrepareEngine()` The function would flag the consist as not ready (`iEngineActive` set to `false`) when the brake handle was at a cutoff position. Since this is what the brake lever is exactly starting at in the EW58 train, the train when asked to move the brake lever to operating position would not listen since the `control_tractive_and_braking_force()` function which is supposed to do that is gated behind the readiness flag in the `TController::Update()` function. This makes sure EW58 trains can be driven by AI once again instead of being stuck. I don't really know why the brake position check was there, since it would fail only if: - There is a brake handle - The brake handle is in the cutoff position - The brake handle is NOT in the operating position The third check seems redundant but curiously there is one case where this matters and it's... MHZ_EN57. Its operating and cutoff positions are both defined as `0`, which might be a hack, since the actual cutoff position in the MHZ_EN57 handle is meant to be `6`. --- vehicle/Driver.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 9dfd6731b..6f3c41003 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -2857,10 +2857,7 @@ bool TController::PrepareEngine() && false == IsAnyLineBreakerOpen && ( false == IsAnyConverterPresent || true == IsAnyConverterEnabled ) && ( false == IsAnyCompressorPresent || true == IsAnyCompressorEnabled ) - && ( mvControlling->ScndPipePress > 4.5 || mvControlling->VeselVolume == 0.0 ) - && ( static_cast(mvOccupied->fBrakeCtrlPos) == static_cast(mvOccupied->Handle->GetPos(bh_RP)) - || static_cast(mvOccupied->fBrakeCtrlPos) != static_cast(mvOccupied->Handle->GetPos(bh_NP)) - || mvOccupied->BrakeHandle == TBrakeHandle::NoHandle ); + && ( mvControlling->ScndPipePress > 4.5 || mvControlling->VeselVolume == 0.0 ); } if( true == isready ) { From 403a6d1f9f6ed080a01da23218a21fcd8cca1894 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Thu, 1 Oct 2026 07:58:28 +0200 Subject: [PATCH 019/430] fix: yet other sonar sast fixes --- McZapkie/Mover.cpp | 19 ++++++++----------- rendering/opengl33renderer.cpp | 8 ++++---- rendering/openglrenderer.cpp | 8 ++++---- simulation/simulationenvironment.cpp | 6 +++--- 4 files changed, 19 insertions(+), 22 deletions(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 68b889188..61bdc17a7 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -2408,7 +2408,7 @@ bool TMoverParameters::IncMainCtrl(int CtrlSpeed) { ++MainCtrlPos; OK = true; - if (EIMCtrlType == 0 && SpeedCtrlAutoTurnOffFlag & 1 == 1 && MainCtrlActualPos != MainCtrlPos) + if (EIMCtrlType == 0 && ( SpeedCtrlAutoTurnOffFlag & 1 ) == 1 && MainCtrlActualPos != MainCtrlPos) { DecScndCtrl(2); SpeedCtrlUnit.IsActive = false; @@ -2591,7 +2591,7 @@ bool TMoverParameters::DecMainCtrl(int CtrlSpeed) { MainCtrlPos--; OK = true; - if (EIMCtrlType == 0 && SpeedCtrlAutoTurnOffFlag & 1 == 1 && MainCtrlActualPos != MainCtrlPos) + if (EIMCtrlType == 0 && (SpeedCtrlAutoTurnOffFlag & 1) == 1 && MainCtrlActualPos != MainCtrlPos) { DecScndCtrl(2); SpeedCtrlUnit.IsActive = false; @@ -2780,7 +2780,7 @@ bool TMoverParameters::IncScndCtrl(int CtrlSpeed) if (OK && EngineType == TEngineType::ElectricInductionMotor && ScndCtrlPosNo == 1 && MainCtrlPos > 0) { SpeedCtrlValue = Vel; - if (EIMCtrlType == 0 && SpeedCtrlAutoTurnOffFlag & 1 == 1) + if (EIMCtrlType == 0 && (SpeedCtrlAutoTurnOffFlag & 1) == 1) { MainCtrlActualPos = MainCtrlPos; } @@ -4586,14 +4586,11 @@ void TMoverParameters::UpdatePipePressure(double dt) auto const lowvoltagepower{Power24vIsAvailable || Power110vIsAvailable}; - if (true == RadioStopFlag || true == AlarmChainFlag || (true == EIMCtrlEmergency && LocalBrakePosA >= 1.0) || SecuritySystem.is_braking() || - (SpringBrakeDriveEmergencyVel >= 0 && Vel > SpringBrakeDriveEmergencyVel && SpringBrake.IsActive) - /* - // NOTE: disabled because 32 is 'load destroyed' flag, what does this have to do with emergency brake? - // (if it's supposed to be broken coupler, such event sets alarmchainflag instead when appropriate) - || ( true == TestFlag( EngDmgFlag, 32 ) ) - */ - || (0 == CabActive && InactiveCabFlag & activation::emergencybrake) || (SpringBrakeDriveEmergencyVel >= 0 && Vel > SpringBrakeDriveEmergencyVel && SpringBrake.IsActive)) + // EngDmgFlag 32 (load destroyed) used to trigger this too; dropped, it has nothing to do with + // the emergency brake (a broken coupler sets AlarmChainFlag instead) + if (RadioStopFlag || AlarmChainFlag || (EIMCtrlEmergency && LocalBrakePosA >= 1.0) || SecuritySystem.is_braking() || + (SpringBrakeDriveEmergencyVel >= 0 && Vel > SpringBrakeDriveEmergencyVel && SpringBrake.IsActive) || + (0 == CabActive && (InactiveCabFlag & activation::emergencybrake) != 0)) { EmergencyValveFlow = PF(0, PipePress, 0.15) * dt; } diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index b99378162..06fad0cdb 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -81,9 +81,9 @@ bool opengl33_renderer::Init(GLFWwindow *Window) } // rgb value for 5780 kelvin - Global.DayLight.diffuse[0] = 255.0f / 255.0f; - Global.DayLight.diffuse[1] = 242.0f / 255.0f; - Global.DayLight.diffuse[2] = 231.0f / 255.0f; + Global.DayLight.diffuse[0] = 1.0f; // 255 / 255 + Global.DayLight.diffuse[1] = 0.9490196f; // 242 / 255 + Global.DayLight.diffuse[2] = 0.9058824f; // 231 / 255 Global.DayLight.is_directional = true; m_sunlight.id = opengl33_renderer::sunlight; @@ -1956,7 +1956,7 @@ bool opengl33_renderer::Render(world_environment *Environment) // moon { Bind_Texture(0, m_moontexture); - glm::vec3 mooncolor(255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f); + glm::vec3 mooncolor(1.0f, 0.9490196f, 0.9058824f); glm::vec4 color(mooncolor.r, mooncolor.g, mooncolor.b, // fade the moon if it's near the sun in the sky, especially during the day std::max(0.f, 1.0 - 0.5 * Global.fLuminance - 0.65 * std::max(0.f, glm::dot(Environment->m_sun.getDirection(), Environment->m_moon.getDirection()))) * fogfactor); diff --git a/rendering/openglrenderer.cpp b/rendering/openglrenderer.cpp index 6f06e9b33..dcbd1df2c 100644 --- a/rendering/openglrenderer.cpp +++ b/rendering/openglrenderer.cpp @@ -88,9 +88,9 @@ opengl_renderer::Init( GLFWwindow *Window ) { ::glEnable( opengl_renderer::sunlight ); // rgb value for 5780 kelvin - Global.DayLight.diffuse[ 0 ] = 255.0f / 255.0f; - Global.DayLight.diffuse[ 1 ] = 242.0f / 255.0f; - Global.DayLight.diffuse[ 2 ] = 231.0f / 255.0f; + Global.DayLight.diffuse[0] = 1.0f; // 255 / 255 + Global.DayLight.diffuse[1] = 0.9490196f; // 242 / 255 + Global.DayLight.diffuse[2] = 0.9058824f; // 231 / 255 Global.DayLight.is_directional = true; m_sunlight.id = opengl_renderer::sunlight; // ::glLightf( opengl_renderer::sunlight, GL_SPOT_CUTOFF, 90.0f ); @@ -1603,7 +1603,7 @@ opengl_renderer::Render( world_environment *Environment ) { if (!m_isATI) { Bind_Texture( m_moontexture ); - glm::vec3 mooncolor( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ); + glm::vec3 mooncolor(1.0f, 0.9490196f, 0.9058824f); ::glColor4f( mooncolor.r, mooncolor.g, mooncolor.b, // fade the moon if it's near the sun in the sky, especially during the day diff --git a/simulation/simulationenvironment.cpp b/simulation/simulationenvironment.cpp index 9837e0e85..b96cea20d 100644 --- a/simulation/simulationenvironment.cpp +++ b/simulation/simulationenvironment.cpp @@ -140,7 +140,7 @@ world_environment::update() { m_lightintensity = moonlightlevel; // if the moon is up, it overrides the twilight twilightfactor = 0.0f; - keylightcolor = glm::vec3( 255.0f / 255.0f, 242.0f / 255.0f, 202.0f / 255.0f ); + keylightcolor = glm::vec3( 1.0f, 0.9490196f, 0.7921569f ); } else { // regular situation with sun as the key light @@ -152,8 +152,8 @@ world_environment::update() { // include 'golden hour' effect in twilight lighting float const duskfactor = 1.25f - std::clamp( Global.SunAngle, 0.0f, 18.0f ) / 18.0f; keylightcolor = glm::mix( - glm::vec3( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ), - glm::vec3( 235.0f / 255.0f, 120.0f / 255.0f, 36.0f / 255.0f ), + glm::vec3( 1.0f, 0.9490196f, 0.9058824f ), // 255, 242, 231 / 255 + glm::vec3( 0.9215686f, 0.4705882f, 0.1411765f ), // 235, 120, 36 / 255 duskfactor ); } // ...retrieve current sky colour and brightness... From f05b58b0e9995991e841c6562f36f8585d761af7 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Thu, 1 Oct 2026 08:01:23 +0200 Subject: [PATCH 020/430] Revert "fix: yet other sonar sast fixes" This reverts commit 403a6d1f9f6ed080a01da23218a21fcd8cca1894. --- McZapkie/Mover.cpp | 19 +++++++++++-------- rendering/opengl33renderer.cpp | 8 ++++---- rendering/openglrenderer.cpp | 8 ++++---- simulation/simulationenvironment.cpp | 6 +++--- 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 61bdc17a7..68b889188 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -2408,7 +2408,7 @@ bool TMoverParameters::IncMainCtrl(int CtrlSpeed) { ++MainCtrlPos; OK = true; - if (EIMCtrlType == 0 && ( SpeedCtrlAutoTurnOffFlag & 1 ) == 1 && MainCtrlActualPos != MainCtrlPos) + if (EIMCtrlType == 0 && SpeedCtrlAutoTurnOffFlag & 1 == 1 && MainCtrlActualPos != MainCtrlPos) { DecScndCtrl(2); SpeedCtrlUnit.IsActive = false; @@ -2591,7 +2591,7 @@ bool TMoverParameters::DecMainCtrl(int CtrlSpeed) { MainCtrlPos--; OK = true; - if (EIMCtrlType == 0 && (SpeedCtrlAutoTurnOffFlag & 1) == 1 && MainCtrlActualPos != MainCtrlPos) + if (EIMCtrlType == 0 && SpeedCtrlAutoTurnOffFlag & 1 == 1 && MainCtrlActualPos != MainCtrlPos) { DecScndCtrl(2); SpeedCtrlUnit.IsActive = false; @@ -2780,7 +2780,7 @@ bool TMoverParameters::IncScndCtrl(int CtrlSpeed) if (OK && EngineType == TEngineType::ElectricInductionMotor && ScndCtrlPosNo == 1 && MainCtrlPos > 0) { SpeedCtrlValue = Vel; - if (EIMCtrlType == 0 && (SpeedCtrlAutoTurnOffFlag & 1) == 1) + if (EIMCtrlType == 0 && SpeedCtrlAutoTurnOffFlag & 1 == 1) { MainCtrlActualPos = MainCtrlPos; } @@ -4586,11 +4586,14 @@ void TMoverParameters::UpdatePipePressure(double dt) auto const lowvoltagepower{Power24vIsAvailable || Power110vIsAvailable}; - // EngDmgFlag 32 (load destroyed) used to trigger this too; dropped, it has nothing to do with - // the emergency brake (a broken coupler sets AlarmChainFlag instead) - if (RadioStopFlag || AlarmChainFlag || (EIMCtrlEmergency && LocalBrakePosA >= 1.0) || SecuritySystem.is_braking() || - (SpringBrakeDriveEmergencyVel >= 0 && Vel > SpringBrakeDriveEmergencyVel && SpringBrake.IsActive) || - (0 == CabActive && (InactiveCabFlag & activation::emergencybrake) != 0)) + if (true == RadioStopFlag || true == AlarmChainFlag || (true == EIMCtrlEmergency && LocalBrakePosA >= 1.0) || SecuritySystem.is_braking() || + (SpringBrakeDriveEmergencyVel >= 0 && Vel > SpringBrakeDriveEmergencyVel && SpringBrake.IsActive) + /* + // NOTE: disabled because 32 is 'load destroyed' flag, what does this have to do with emergency brake? + // (if it's supposed to be broken coupler, such event sets alarmchainflag instead when appropriate) + || ( true == TestFlag( EngDmgFlag, 32 ) ) + */ + || (0 == CabActive && InactiveCabFlag & activation::emergencybrake) || (SpringBrakeDriveEmergencyVel >= 0 && Vel > SpringBrakeDriveEmergencyVel && SpringBrake.IsActive)) { EmergencyValveFlow = PF(0, PipePress, 0.15) * dt; } diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index 06fad0cdb..b99378162 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -81,9 +81,9 @@ bool opengl33_renderer::Init(GLFWwindow *Window) } // rgb value for 5780 kelvin - Global.DayLight.diffuse[0] = 1.0f; // 255 / 255 - Global.DayLight.diffuse[1] = 0.9490196f; // 242 / 255 - Global.DayLight.diffuse[2] = 0.9058824f; // 231 / 255 + Global.DayLight.diffuse[0] = 255.0f / 255.0f; + Global.DayLight.diffuse[1] = 242.0f / 255.0f; + Global.DayLight.diffuse[2] = 231.0f / 255.0f; Global.DayLight.is_directional = true; m_sunlight.id = opengl33_renderer::sunlight; @@ -1956,7 +1956,7 @@ bool opengl33_renderer::Render(world_environment *Environment) // moon { Bind_Texture(0, m_moontexture); - glm::vec3 mooncolor(1.0f, 0.9490196f, 0.9058824f); + glm::vec3 mooncolor(255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f); glm::vec4 color(mooncolor.r, mooncolor.g, mooncolor.b, // fade the moon if it's near the sun in the sky, especially during the day std::max(0.f, 1.0 - 0.5 * Global.fLuminance - 0.65 * std::max(0.f, glm::dot(Environment->m_sun.getDirection(), Environment->m_moon.getDirection()))) * fogfactor); diff --git a/rendering/openglrenderer.cpp b/rendering/openglrenderer.cpp index dcbd1df2c..6f06e9b33 100644 --- a/rendering/openglrenderer.cpp +++ b/rendering/openglrenderer.cpp @@ -88,9 +88,9 @@ opengl_renderer::Init( GLFWwindow *Window ) { ::glEnable( opengl_renderer::sunlight ); // rgb value for 5780 kelvin - Global.DayLight.diffuse[0] = 1.0f; // 255 / 255 - Global.DayLight.diffuse[1] = 0.9490196f; // 242 / 255 - Global.DayLight.diffuse[2] = 0.9058824f; // 231 / 255 + Global.DayLight.diffuse[ 0 ] = 255.0f / 255.0f; + Global.DayLight.diffuse[ 1 ] = 242.0f / 255.0f; + Global.DayLight.diffuse[ 2 ] = 231.0f / 255.0f; Global.DayLight.is_directional = true; m_sunlight.id = opengl_renderer::sunlight; // ::glLightf( opengl_renderer::sunlight, GL_SPOT_CUTOFF, 90.0f ); @@ -1603,7 +1603,7 @@ opengl_renderer::Render( world_environment *Environment ) { if (!m_isATI) { Bind_Texture( m_moontexture ); - glm::vec3 mooncolor(1.0f, 0.9490196f, 0.9058824f); + glm::vec3 mooncolor( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ); ::glColor4f( mooncolor.r, mooncolor.g, mooncolor.b, // fade the moon if it's near the sun in the sky, especially during the day diff --git a/simulation/simulationenvironment.cpp b/simulation/simulationenvironment.cpp index b96cea20d..9837e0e85 100644 --- a/simulation/simulationenvironment.cpp +++ b/simulation/simulationenvironment.cpp @@ -140,7 +140,7 @@ world_environment::update() { m_lightintensity = moonlightlevel; // if the moon is up, it overrides the twilight twilightfactor = 0.0f; - keylightcolor = glm::vec3( 1.0f, 0.9490196f, 0.7921569f ); + keylightcolor = glm::vec3( 255.0f / 255.0f, 242.0f / 255.0f, 202.0f / 255.0f ); } else { // regular situation with sun as the key light @@ -152,8 +152,8 @@ world_environment::update() { // include 'golden hour' effect in twilight lighting float const duskfactor = 1.25f - std::clamp( Global.SunAngle, 0.0f, 18.0f ) / 18.0f; keylightcolor = glm::mix( - glm::vec3( 1.0f, 0.9490196f, 0.9058824f ), // 255, 242, 231 / 255 - glm::vec3( 0.9215686f, 0.4705882f, 0.1411765f ), // 235, 120, 36 / 255 + glm::vec3( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ), + glm::vec3( 235.0f / 255.0f, 120.0f / 255.0f, 36.0f / 255.0f ), duskfactor ); } // ...retrieve current sky colour and brightness... From 20f536f05e68acb9e3a9fe1140cbd310b29cded2 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Thu, 1 Oct 2026 11:51:41 +0200 Subject: [PATCH 021/430] fix(instancing): keep batches correct after load-time classification --- model/AnimModel.cpp | 5 + rendering/opengl33geometrybank.cpp | 35 +++++-- rendering/opengl33renderer.cpp | 156 ++++++++++++++++++++--------- rendering/opengl33renderer.h | 7 +- scene/scene.cpp | 26 ++--- 5 files changed, 158 insertions(+), 71 deletions(-) diff --git a/model/AnimModel.cpp b/model/AnimModel.cpp index bc2d6e844..d5d856e0c 100644 --- a/model/AnimModel.cpp +++ b/model/AnimModel.cpp @@ -478,6 +478,9 @@ std::shared_ptr TAnimModel::AddContainer(std::string const &Name auto tmp = std::make_shared(); tmp->Init(tsb); m_animlist.push_back(tmp); + // containers are added by events after the instance was loaded and bucketed; + // the instanced path skips RaAnimate(), so this instance has to be drawn on its own + m_instanceable = false; return tmp; } return nullptr; @@ -688,6 +691,8 @@ std::optional> > TAnimModel::L void TAnimModel::SkinSet( int const Index, material_handle const Material ) { m_materialdata.replacable_skins[ std::clamp( Index, 1, 4 ) ] = Material; + // the instance stays in the bucket of its old skin set, where it would get the textures of the batch + m_instanceable = false; } void TAnimModel::AnimUpdate(double dt) diff --git a/rendering/opengl33geometrybank.cpp b/rendering/opengl33geometrybank.cpp index 91c9a8dd8..506d22f1e 100644 --- a/rendering/opengl33geometrybank.cpp +++ b/rendering/opengl33geometrybank.cpp @@ -215,13 +215,34 @@ opengl33_vaogeometrybank::draw_instanced_( gfx::geometry_handle const &Geometry, GLsizei const inst_count = static_cast(InstanceCount); if( chunkrecord.index_count > 0 ) { - m_vao->bind(); - ::glDrawElementsInstancedBaseVertex( - chunk.type, - chunkrecord.index_count, GL_UNSIGNED_INT, - reinterpret_cast( chunkrecord.index_offset * sizeof( gfx::basic_index ) ), - inst_count, - chunkrecord.vertex_offset ); + // GLES 3.0 context doesn't provide the base vertex variant, same fallbacks as in draw_() + if( glDrawElementsInstancedBaseVertex ) { + m_vao->bind(); + ::glDrawElementsInstancedBaseVertex( + chunk.type, + chunkrecord.index_count, GL_UNSIGNED_INT, + reinterpret_cast( chunkrecord.index_offset * sizeof( gfx::basic_index ) ), + inst_count, + chunkrecord.vertex_offset ); + } + else if( glDrawElementsInstancedBaseVertexOES ) { + m_vao->bind(); + ::glDrawElementsInstancedBaseVertexOES( + chunk.type, + chunkrecord.index_count, GL_UNSIGNED_INT, + reinterpret_cast( chunkrecord.index_offset * sizeof( gfx::basic_index ) ), + inst_count, + chunkrecord.vertex_offset ); + } + else { + setup_attrib( chunkrecord.vertex_offset ); + m_vao->bind(); + ::glDrawElementsInstanced( + chunk.type, + chunkrecord.index_count, GL_UNSIGNED_INT, + reinterpret_cast( chunkrecord.index_offset * sizeof( gfx::basic_index ) ), + inst_count ); + } } else { m_vao->bind(); diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index b99378162..352d9632e 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -2382,8 +2382,11 @@ void opengl33_renderer::Render(scene::basic_region *Region) m_sectionqueue.clear(); m_cellqueue.clear(); - // discard last pass's accumulated instance buckets before this pass starts - m_frame_instance_buckets.clear(); + // discard last pass's accumulated instance buckets before this pass starts. + // the vectors themselves are kept, so their allocations get reused by the following passes + for( auto &bucket : m_frame_instance_buckets ) { + bucket.second.clear(); + } // build a list of region sections to render glm::vec3 const cameraposition{m_renderpass.pass_camera.position()}; auto const camerax = static_cast(std::floor(cameraposition.x / scene::EU07_SECTIONSIZE + scene::EU07_REGIONSIDESECTIONCOUNT / 2)); @@ -2802,10 +2805,11 @@ void opengl33_renderer::Render(cell_sequence::iterator First, cell_sequence::ite // still happens inside Render_Instanced(), so correctness is unchanged -- only // the number of calls and glBufferSubData round-trips drops sharply. // (For pickscenery/pickcontrols modes the map stays empty, so this is a no-op.) - for( auto const &bucket : m_frame_instance_buckets ) { + for( auto &bucket : m_frame_instance_buckets ) { + if( bucket.second.empty() ) { continue; } Render_Instanced( bucket.first.pModel, bucket.second ); + bucket.second.clear(); } - m_frame_instance_buckets.clear(); } void opengl33_renderer::Draw_Geometry(std::vector::iterator begin, std::vector::iterator end) @@ -3024,13 +3028,13 @@ void opengl33_renderer::Render_Instanced( TModel3d *Model, std::vector::max(); + float farthest_distancesquared = 0.f; material_data const *batch_material { nullptr }; for( auto *Instance : Instances ) { if( Instance == nullptr ) { continue; } + // instances which lost their instanceable status after being bucketed (animation or skin + // assigned by an event) are drawn by the per-node path + if( false == Instance->m_instanceable ) { continue; } if( false == Instance->m_visible ) { continue; } if( false == m_renderpass.pass_camera.visible( Instance->m_area ) ) { continue; } @@ -3077,6 +3085,7 @@ void opengl33_renderer::Render_Instanced( TModel3d *Model, std::vectorm_framestamp = m_framestamp; closest_distancesquared = std::min( closest_distancesquared, static_cast(distancesquared) ); + farthest_distancesquared = std::max( farthest_distancesquared, static_cast(distancesquared) ); // Build the camera-relative root modelview for this instance: // mv = view * translate(instance_pos - camera_pos) * rotate(instance_angles) * scale(m_scale) @@ -3095,55 +3104,106 @@ void opengl33_renderer::Render_Instanced( TModel3d *Model, std::vector( distancesquared ), mv ); } - if( m_instance_modelviews.empty() ) { return; } + if( m_instance_survivors.empty() ) { return; } + + // LOD: a submodel is drawn only while fSquareDist lies inside its [fSquareMinDist, fSquareMaxDist) + // range, so the distinct range bounds split distance into bands with constant LOD. The bucket + // collects instances from every visible cell, so a single fSquareDist for all of them would draw + // far instances at the LOD of the nearest one. When some bound falls inside the distance span of + // the survivors they're sorted near-to-far and drawn one band at a time, like Render_Sleepers(). + m_instance_lodbounds.clear(); + m_instance_lodpending.clear(); + m_instance_lodpending.push_back( Model->Root ); + while( false == m_instance_lodpending.empty() ) { + auto const *submodel = m_instance_lodpending.back(); + m_instance_lodpending.pop_back(); + if( submodel == nullptr ) { continue; } + if( ( submodel->fSquareMinDist > closest_distancesquared ) && ( submodel->fSquareMinDist <= farthest_distancesquared ) ) { + m_instance_lodbounds.emplace_back( submodel->fSquareMinDist ); + } + if( ( submodel->fSquareMaxDist > closest_distancesquared ) && ( submodel->fSquareMaxDist <= farthest_distancesquared ) ) { + m_instance_lodbounds.emplace_back( submodel->fSquareMaxDist ); + } + m_instance_lodpending.push_back( submodel->Child ); + m_instance_lodpending.push_back( submodel->Next ); + } + if( false == m_instance_lodbounds.empty() ) { + std::sort( m_instance_lodbounds.begin(), m_instance_lodbounds.end() ); + m_instance_lodbounds.erase( std::unique( m_instance_lodbounds.begin(), m_instance_lodbounds.end() ), m_instance_lodbounds.end() ); + std::sort( m_instance_survivors.begin(), m_instance_survivors.end(), + []( std::pair const &Left, std::pair const &Right ) { + return Left.first < Right.first; } ); + } + // contiguous copy of the (sorted) modelview matrices, for the UBO upload + m_instance_modelviews.clear(); + m_instance_modelviews.reserve( m_instance_survivors.size() ); + for( auto const &survivor : m_instance_survivors ) { + m_instance_modelviews.emplace_back( survivor.second ); + } + + auto alpha = ( batch_material != nullptr ? batch_material->textures_alpha : 0x30300030 ); + alpha ^= 0x0F0F000F; // 2. Walk the submodel tree once per sub-batch. The submodel-local matrix // stack starts at identity; the per-instance camera transform comes from // instance_modelview[gl_InstanceID] in the shader. std::size_t const total = m_instance_modelviews.size(); - std::size_t offset_idx = 0; - while( offset_idx < total ) { - std::size_t const this_batch = std::min( total - offset_idx, gl::MAX_INSTANCES_PER_BATCH ); - - // 2a. Upload N modelviews to instance_ubo[0..N-1]. - instance_ubo->update( - reinterpret_cast( m_instance_modelviews.data() + offset_idx ), - 0, - static_cast( this_batch * sizeof( glm::mat4 ) ) ); - - // 2b. Push identity onto the matrix stack so submodel transforms - // accumulate from identity, not from camera/instance space. - ::glPushMatrix(); - ::glLoadIdentity(); - - // 2c. Configure the existing TModel3d/TSubModel render path. Setting - // m_current_instance_count routes draw(handle) calls to draw_instanced. - m_current_instance_count = this_batch; - - Model->Root->fSquareDist = closest_distancesquared; // shared global, used by submodel LOD - auto alpha = ( batch_material != nullptr ? batch_material->textures_alpha : 0x30300030 ); - alpha ^= 0x0F0F000F; - Model->Root->ReplacableSet( ( batch_material != nullptr ? batch_material->replacable_skins : nullptr ), alpha ); - Model->Root->pRoot = Model; - - Render( Model->Root ); - - m_current_instance_count = 0; - - ::glPopMatrix(); - - // 2d. Restore instance_modelview[0] to identity so subsequent - // non-instanced draws continue to compute identity * modelview. - { - glm::mat4 const identity( 1.0f ); - instance_ubo->update( reinterpret_cast( &identity ), 0, sizeof( identity ) ); + std::size_t band_start = 0; + while( band_start < total ) { + // the band ends at the first instance distance which reaches the next lod bound + // (without bounds inside the distance span the whole set forms a single band) + auto const upperbound = std::upper_bound( m_instance_lodbounds.begin(), m_instance_lodbounds.end(), m_instance_survivors[ band_start ].first ); + float const band_limit = ( upperbound == m_instance_lodbounds.end() ? std::numeric_limits::max() : *upperbound ); + std::size_t band_end = band_start; + while( ( band_end < total ) && ( m_instance_survivors[ band_end ].first < band_limit ) ) { + ++band_end; } + // every distance in the band selects the same lod; the nearest one represents the band + float const band_distancesquared = ( m_instance_lodbounds.empty() ? closest_distancesquared : m_instance_survivors[ band_start ].first ); - offset_idx += this_batch; - ++m_renderpass.draw_stats.instanced_drawcalls; + std::size_t offset_idx = band_start; + while( offset_idx < band_end ) { + std::size_t const this_batch = std::min( band_end - offset_idx, gl::MAX_INSTANCES_PER_BATCH ); + + // 2a. Upload N modelviews to instance_ubo[0..N-1]. + instance_ubo->update( + reinterpret_cast( m_instance_modelviews.data() + offset_idx ), + 0, + static_cast( this_batch * sizeof( glm::mat4 ) ) ); + + // 2b. Push identity onto the matrix stack so submodel transforms + // accumulate from identity, not from camera/instance space. + ::glPushMatrix(); + ::glLoadIdentity(); + + // 2c. Configure the existing TModel3d/TSubModel render path. Setting + // m_current_instance_count routes draw(handle) calls to draw_instanced. + m_current_instance_count = this_batch; + + Model->Root->fSquareDist = band_distancesquared; // shared global, used by submodel LOD + Model->Root->ReplacableSet( ( batch_material != nullptr ? batch_material->replacable_skins : nullptr ), alpha ); + Model->Root->pRoot = Model; + + Render( Model->Root ); + + m_current_instance_count = 0; + + ::glPopMatrix(); + + // 2d. Restore instance_modelview[0] to identity so subsequent + // non-instanced draws continue to compute identity * modelview. + { + glm::mat4 const identity( 1.0f ); + instance_ubo->update( reinterpret_cast( &identity ), 0, sizeof( identity ) ); + } + + offset_idx += this_batch; + ++m_renderpass.draw_stats.instanced_drawcalls; + } + band_start = band_end; } m_renderpass.draw_stats.instances += static_cast( total ); diff --git a/rendering/opengl33renderer.h b/rendering/opengl33renderer.h index 6fda37c39..8e5c0b147 100644 --- a/rendering/opengl33renderer.h +++ b/rendering/opengl33renderer.h @@ -376,7 +376,7 @@ class opengl33_renderer : public gfx_renderer { // cell's buckets are merged here keyed by (TModel3d*, skins), so that // Render_Instanced() runs once per unique model across the whole pass instead // of once per cell -- collapsing many tiny instanced draws into a few large - // batches. Reused every pass; cleared at the top of Render(scene::basic_region*). + // batches. Reused every pass; the vectors are emptied (not freed) at the top of Render(scene::basic_region*). scene::basic_cell::instance_bucket_map m_frame_instance_buckets; renderpass_config m_colorpass; // parametrs of most recent color pass std::array m_shadowpass; // parametrs of most recent shadowmap pass for each of csm stages @@ -426,6 +426,11 @@ class opengl33_renderer : public gfx_renderer { // reused across calls -- clear() retains capacity, so once it has grown to // the largest batch seen, steady-state frames perform no allocation here. std::vector m_instance_modelviews; + // further persistent scratch buffers for Render_Instanced(): culled instances paired with their + // squared distance, and the lod bounds of the drawn model which split them into lod bands + std::vector> m_instance_survivors; + std::vector m_instance_lodbounds; + std::vector m_instance_lodpending; gl::scene_ubs scene_ubs; gl::model_ubs model_ubs; gl::light_ubs light_ubs; diff --git a/scene/scene.cpp b/scene/scene.cpp index 14825705a..8ebff031e 100644 --- a/scene/scene.cpp +++ b/scene/scene.cpp @@ -442,22 +442,18 @@ basic_cell::erase( TAnimModel *Instance ) { [=]( TAnimModel *instance ) { return instance == Instance; } ), std::end( m_instancesopaque ) ); - // also remove from the per-(pModel, skins) instance bucket if present - if( Instance->m_instanceable && Instance->Model() != nullptr ) { - instance_bucket_key key; - key.pModel = Instance->Model(); - auto const *mat = Instance->Material(); - if( mat != nullptr ) { - for( int i = 0; i < 5; ++i ) { key.skins[i] = mat->replacable_skins[i]; } + // also remove from the per-(pModel, skins) instance bucket if present. + // NOTE: searched by pointer rather than by key: the instance may have lost its instanceable + // status or changed its skins since it was inserted, which would leave a dangling pointer behind + for( auto bucket = m_instancebuckets_opaque.begin(); bucket != m_instancebuckets_opaque.end(); ) { + bucket->second.erase( + std::remove( std::begin( bucket->second ), std::end( bucket->second ), Instance ), + std::end( bucket->second ) ); + if( bucket->second.empty() ) { + bucket = m_instancebuckets_opaque.erase( bucket ); } - auto bucket = m_instancebuckets_opaque.find( key ); - if( bucket != m_instancebuckets_opaque.end() ) { - bucket->second.erase( - std::remove( std::begin( bucket->second ), std::end( bucket->second ), Instance ), - std::end( bucket->second ) ); - if( bucket->second.empty() ) { - m_instancebuckets_opaque.erase( bucket ); - } + else { + ++bucket; } } } From 4eabf3c3b53dfcc61ef56fc21a667c8b0e98d695 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Thu, 1 Oct 2026 12:07:54 +0200 Subject: [PATCH 022/430] feat(instancing): batch models animated only by time, wind or sky --- model/AnimModel.cpp | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/model/AnimModel.cpp b/model/AnimModel.cpp index d5d856e0c..09f01c8cd 100644 --- a/model/AnimModel.cpp +++ b/model/AnimModel.cpp @@ -403,8 +403,8 @@ namespace { // TSubModel tree, which would make batched rendering unsafe. Most animations // loaded from .t3d files are global functions of time (clocks, wind, sky) and // only transform the local modelview matrix — those are safe to share. Camera- -// relative billboards also operate purely on the local matrix using whatever -// modelview the caller pushed, which is exactly per-instance behaviour. +// relative billboards are not: they're computed on the cpu from the modelview of +// the drawn instance, which in a batch is only the submodel-local chain. // The runtime SetRotate/SetTranslate animations (at_Rotate / at_RotateXYZ / // at_Translate) are tied to per-instance iAnimOwner and are unsafe to share. // at_Undefined is the type assigned to .t3d submodels declared with `anim: true` @@ -425,17 +425,40 @@ bool anim_type_unsafe_for_instancing( TAnimType a ) { } } +// returns true if this animation type depends only on global state (simulation +// time, wind, sky) and so gives every instance of the model the same local +// transform. The batch evaluates it once and the per-instance placement comes +// from the instance matrix, the result is the same as with per-instance drawing. +bool anim_type_shared_by_instances( TAnimType a ) { + switch( a ) { + case TAnimType::at_SecondsJump: + case TAnimType::at_MinutesJump: + case TAnimType::at_HoursJump: + case TAnimType::at_Hours24Jump: + case TAnimType::at_Seconds: + case TAnimType::at_Minutes: + case TAnimType::at_Hours: + case TAnimType::at_Hours24: + case TAnimType::at_Wind: + case TAnimType::at_Sky: + return true; + default: + return false; + } +} + // recursively walks a submodel tree and returns true if any submodel declares // an animation type that's unsafe to batch, OR carries the runtime "needs -// animation matrix" flag (iFlags bit 0x4000), which is set whenever the -// submodel was tagged as animatable in the .t3d file or had WillBeAnimated() -// called on it during model load. Either signal means the submodel may receive +// animation matrix" flag (iFlags bit 0x4000) for anything else than an animation +// shared by all instances. The flag is set whenever the submodel was tagged as +// animatable in the .t3d file (any `anim:` other than `false`) or had +// WillBeAnimated() called on it during model load. Such a submodel may receive // per-instance event-driven animation commands at runtime, which the GPU- // instanced path (one shared submodel tree across all instances) cannot serve. bool submodel_tree_blocks_instancing( TSubModel const *Sub ) { if( Sub == nullptr ) { return false; } if( anim_type_unsafe_for_instancing( Sub->b_Anim ) ) { return true; } - if( ( Sub->iFlags & 0x4000 ) != 0 ) { return true; } + if( ( ( Sub->iFlags & 0x4000 ) != 0 ) && ( false == anim_type_shared_by_instances( Sub->b_Anim ) ) ) { return true; } if( submodel_tree_blocks_instancing( Sub->Child ) ) { return true; } if( submodel_tree_blocks_instancing( Sub->Next ) ) { return true; } return false; From 2130d175e941a69b47b4ce47cbda8cb379923efc Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Thu, 1 Oct 2026 12:43:07 +0200 Subject: [PATCH 023/430] perf(instancing): cache instance rotation and group lod bands linearly --- model/AnimModel.cpp | 17 +++++ model/AnimModel.h | 8 ++ rendering/opengl33renderer.cpp | 135 ++++++++++++++------------------- rendering/opengl33renderer.h | 11 ++- 4 files changed, 93 insertions(+), 78 deletions(-) diff --git a/model/AnimModel.cpp b/model/AnimModel.cpp index 09f01c8cd..cc54a2a24 100644 --- a/model/AnimModel.cpp +++ b/model/AnimModel.cpp @@ -664,6 +664,23 @@ void TAnimModel::RaPrepare() } } +glm::mat4 const &TAnimModel::rotation_scale() { + + if( ( false == m_rotationscalevalid ) || ( vAngle != m_rotationscaleangles ) || ( m_scale != m_rotationscalescale ) ) { + // same order as the per-instance render path + glm::mat4 transform( 1.0f ); + if( vAngle.y != 0.0f ) { transform = glm::rotate( transform, glm::radians( vAngle.y ), glm::vec3( 0.f, 1.f, 0.f ) ); } + if( vAngle.x != 0.0f ) { transform = glm::rotate( transform, glm::radians( vAngle.x ), glm::vec3( 1.f, 0.f, 0.f ) ); } + if( vAngle.z != 0.0f ) { transform = glm::rotate( transform, glm::radians( vAngle.z ), glm::vec3( 0.f, 0.f, 1.f ) ); } + if( m_scale != glm::vec3( 1.0f ) ) { transform = glm::scale( transform, m_scale ); } + m_rotationscale = transform; + m_rotationscaleangles = vAngle; + m_rotationscalescale = m_scale; + m_rotationscalevalid = true; + } + return m_rotationscale; +} + int TAnimModel::Flags() { // informacja dla TGround, czy ma być w Render, RenderAlpha, czy RenderMixed int i = pModel ? pModel->Flags() : 0; // pobranie flag całego modelu diff --git a/model/AnimModel.h b/model/AnimModel.h index 435c1dba9..3c4b9f111 100644 --- a/model/AnimModel.h +++ b/model/AnimModel.h @@ -172,6 +172,8 @@ public: public: // methods void RaPrepare(); // ustawienie animacji egzemplarza na wzorcu + // rotation and scale of the instance as a matrix: rotate y * rotate x * rotate z * scale + glm::mat4 const &rotation_scale(); void RaAnimate( unsigned int const Framestamp ); // przeliczenie animacji egzemplarza // radius() subclass details, calculates node's bounding radius @@ -190,6 +192,12 @@ public: TModel3d *pModel { nullptr }; glm::vec3 vAngle; // bazowe obroty egzemplarza względem osi glm::vec3 m_scale { 1.0f, 1.0f, 1.0f }; // per-axis scale (see Scale() accessors above) + // rotation and scale part of the instance transform, cached for the instanced render path. + // rebuilt by rotation_scale() whenever the angles or the scale differ from the ones it was built from + glm::mat4 m_rotationscale { 1.0f }; + glm::vec3 m_rotationscaleangles { 0.0f, 0.0f, 0.0f }; + glm::vec3 m_rotationscalescale { 1.0f, 1.0f, 1.0f }; + bool m_rotationscalevalid { false }; material_data m_materialdata; std::string asText; // tekst dla wyświetlacza znakowego diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index 352d9632e..f96ddffa7 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -3026,13 +3026,33 @@ void opengl33_renderer::Render_Instanced( TModel3d *Model, std::vectorRoot ); + while( false == m_instance_lodpending.empty() ) { + auto const *submodel = m_instance_lodpending.back(); + m_instance_lodpending.pop_back(); + if( submodel == nullptr ) { continue; } + if( submodel->fSquareMinDist > 0.f ) { m_instance_lodbounds.emplace_back( submodel->fSquareMinDist ); } + if( submodel->fSquareMaxDist < std::numeric_limits::max() ) { m_instance_lodbounds.emplace_back( submodel->fSquareMaxDist ); } + m_instance_lodpending.push_back( submodel->Child ); + m_instance_lodpending.push_back( submodel->Next ); + } + std::sort( m_instance_lodbounds.begin(), m_instance_lodbounds.end() ); + m_instance_lodbounds.erase( std::unique( m_instance_lodbounds.begin(), m_instance_lodbounds.end() ), m_instance_lodbounds.end() ); + auto const bandcount { m_instance_lodbounds.size() + 1 }; + + // 1. Visibility / distance cull. Collect surviving instances with their precomputed + // camera-space root modelview matrices and lod bands. m_instance_survivors and the other + // scratch vectors are persistent members reused across every Render_Instanced() call: + // clear() drops the contents but keeps the allocated capacity, so after the first few + // frames this stops calling malloc/free entirely. m_instance_survivors.clear(); m_instance_survivors.reserve( Instances.size() ); @@ -3043,8 +3063,6 @@ void opengl33_renderer::Render_Instanced( TModel3d *Model, std::vector::max(); - float farthest_distancesquared = 0.f; material_data const *batch_material { nullptr }; for( auto *Instance : Instances ) { @@ -3084,64 +3102,39 @@ void opengl33_renderer::Render_Instanced( TModel3d *Model, std::vectorMaterial(); } Instance->m_framestamp = m_framestamp; - closest_distancesquared = std::min( closest_distancesquared, static_cast(distancesquared) ); - farthest_distancesquared = std::max( farthest_distancesquared, static_cast(distancesquared) ); // Build the camera-relative root modelview for this instance: // mv = view * translate(instance_pos - camera_pos) * rotate(instance_angles) * scale(m_scale) - // The scale is folded in here so the GPU-instanced path produces visually - // identical output to the regular per-instance path: each instance gets - // its own (translate × rotate × scale) baked into instance_modelview[i], - // which the shader applies via effective_modelview = instance_mv * model_local. - glm::dvec3 const offset = Instance->location() - m_renderpass.pass_camera.position(); - glm::mat4 mv = view_matrix; - mv = glm::translate( mv, glm::vec3( offset ) ); - auto const &angle = Instance->vAngle; - if( angle.y != 0.0f ) { mv = glm::rotate( mv, glm::radians( angle.y ), glm::vec3( 0.f, 1.f, 0.f ) ); } - if( angle.x != 0.0f ) { mv = glm::rotate( mv, glm::radians( angle.x ), glm::vec3( 1.f, 0.f, 0.f ) ); } - if( angle.z != 0.0f ) { mv = glm::rotate( mv, glm::radians( angle.z ), glm::vec3( 0.f, 0.f, 1.f ) ); } - auto const &scale = Instance->Scale(); - if( scale.x != 1.0f || scale.y != 1.0f || scale.z != 1.0f ) { - mv = glm::scale( mv, scale ); - } - m_instance_survivors.emplace_back( static_cast( distancesquared ), mv ); + // The rotation and scale part is cached by the instance, the translation goes into its last + // column. The scale is folded in so the GPU-instanced path produces visually identical output + // to the regular per-instance path; the shader applies it via effective_modelview = instance_mv * model_local. + glm::mat4 root { Instance->rotation_scale() }; + root[ 3 ] = glm::vec4( glm::vec3( Instance->location() - m_renderpass.pass_camera.position() ), 1.f ); + + auto const distance { static_cast( distancesquared ) }; + m_instance_survivors.push_back( { + view_matrix * root, + distance, + static_cast( std::upper_bound( m_instance_lodbounds.begin(), m_instance_lodbounds.end(), distance ) - m_instance_lodbounds.begin() ) } ); } if( m_instance_survivors.empty() ) { return; } - // LOD: a submodel is drawn only while fSquareDist lies inside its [fSquareMinDist, fSquareMaxDist) - // range, so the distinct range bounds split distance into bands with constant LOD. The bucket - // collects instances from every visible cell, so a single fSquareDist for all of them would draw - // far instances at the LOD of the nearest one. When some bound falls inside the distance span of - // the survivors they're sorted near-to-far and drawn one band at a time, like Render_Sleepers(). - m_instance_lodbounds.clear(); - m_instance_lodpending.clear(); - m_instance_lodpending.push_back( Model->Root ); - while( false == m_instance_lodpending.empty() ) { - auto const *submodel = m_instance_lodpending.back(); - m_instance_lodpending.pop_back(); - if( submodel == nullptr ) { continue; } - if( ( submodel->fSquareMinDist > closest_distancesquared ) && ( submodel->fSquareMinDist <= farthest_distancesquared ) ) { - m_instance_lodbounds.emplace_back( submodel->fSquareMinDist ); - } - if( ( submodel->fSquareMaxDist > closest_distancesquared ) && ( submodel->fSquareMaxDist <= farthest_distancesquared ) ) { - m_instance_lodbounds.emplace_back( submodel->fSquareMaxDist ); - } - m_instance_lodpending.push_back( submodel->Child ); - m_instance_lodpending.push_back( submodel->Next ); - } - if( false == m_instance_lodbounds.empty() ) { - std::sort( m_instance_lodbounds.begin(), m_instance_lodbounds.end() ); - m_instance_lodbounds.erase( std::unique( m_instance_lodbounds.begin(), m_instance_lodbounds.end() ), m_instance_lodbounds.end() ); - std::sort( m_instance_survivors.begin(), m_instance_survivors.end(), - []( std::pair const &Left, std::pair const &Right ) { - return Left.first < Right.first; } ); - } - // contiguous copy of the (sorted) modelview matrices, for the UBO upload - m_instance_modelviews.clear(); - m_instance_modelviews.reserve( m_instance_survivors.size() ); + // group the modelviews by lod band (counting sort) into a contiguous array, for the UBO upload. + // every distance in a band selects the same lod; the nearest one represents the band + m_instance_bandstarts.assign( bandcount + 1, 0 ); + m_instance_banddistances.assign( bandcount, std::numeric_limits::max() ); for( auto const &survivor : m_instance_survivors ) { - m_instance_modelviews.emplace_back( survivor.second ); + ++m_instance_bandstarts[ survivor.band + 1 ]; + m_instance_banddistances[ survivor.band ] = std::min( m_instance_banddistances[ survivor.band ], survivor.distancesquared ); + } + for( std::size_t band = 1; band <= bandcount; ++band ) { + m_instance_bandstarts[ band ] += m_instance_bandstarts[ band - 1 ]; + } + m_instance_bandcursors.assign( m_instance_bandstarts.begin(), m_instance_bandstarts.end() - 1 ); + m_instance_modelviews.resize( m_instance_survivors.size() ); + for( auto const &survivor : m_instance_survivors ) { + m_instance_modelviews[ m_instance_bandcursors[ survivor.band ]++ ] = survivor.modelview; } auto alpha = ( batch_material != nullptr ? batch_material->textures_alpha : 0x30300030 ); @@ -3150,21 +3143,10 @@ void opengl33_renderer::Render_Instanced( TModel3d *Model, std::vector::max() : *upperbound ); - std::size_t band_end = band_start; - while( ( band_end < total ) && ( m_instance_survivors[ band_end ].first < band_limit ) ) { - ++band_end; - } - // every distance in the band selects the same lod; the nearest one represents the band - float const band_distancesquared = ( m_instance_lodbounds.empty() ? closest_distancesquared : m_instance_survivors[ band_start ].first ); + for( std::size_t band = 0; band < bandcount; ++band ) { - std::size_t offset_idx = band_start; + std::size_t offset_idx = m_instance_bandstarts[ band ]; + std::size_t const band_end = m_instance_bandstarts[ band + 1 ]; while( offset_idx < band_end ) { std::size_t const this_batch = std::min( band_end - offset_idx, gl::MAX_INSTANCES_PER_BATCH ); @@ -3183,7 +3165,7 @@ void opengl33_renderer::Render_Instanced( TModel3d *Model, std::vectorRoot->fSquareDist = band_distancesquared; // shared global, used by submodel LOD + Model->Root->fSquareDist = m_instance_banddistances[ band ]; // shared global, used by submodel LOD Model->Root->ReplacableSet( ( batch_material != nullptr ? batch_material->replacable_skins : nullptr ), alpha ); Model->Root->pRoot = Model; @@ -3203,11 +3185,10 @@ void opengl33_renderer::Render_Instanced( TModel3d *Model, std::vector( total ); - m_renderpass.draw_stats.models += static_cast( total ); + m_renderpass.draw_stats.instances += static_cast( m_instance_survivors.size() ); + m_renderpass.draw_stats.models += static_cast( m_instance_survivors.size() ); } // Renders the per-track sleeper instances (TTrack::m_sleeper_local_transforms) using the diff --git a/rendering/opengl33renderer.h b/rendering/opengl33renderer.h index 8e5c0b147..2f86117fd 100644 --- a/rendering/opengl33renderer.h +++ b/rendering/opengl33renderer.h @@ -428,9 +428,18 @@ class opengl33_renderer : public gfx_renderer { std::vector m_instance_modelviews; // further persistent scratch buffers for Render_Instanced(): culled instances paired with their // squared distance, and the lod bounds of the drawn model which split them into lod bands - std::vector> m_instance_survivors; + struct instance_survivor { + glm::mat4 modelview; + float distancesquared; + std::uint32_t band; + }; + std::vector m_instance_survivors; std::vector m_instance_lodbounds; std::vector m_instance_lodpending; + // per lod band: first index in m_instance_modelviews (with end sentinel), fill cursor, nearest distance + std::vector m_instance_bandstarts; + std::vector m_instance_bandcursors; + std::vector m_instance_banddistances; gl::scene_ubs scene_ubs; gl::model_ubs model_ubs; gl::light_ubs light_ubs; From d670c4b116fe1436b30da734d4b419ad7f339cfb Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Thu, 1 Oct 2026 12:57:33 +0200 Subject: [PATCH 024/430] perf(instancing): skip models without shadow casters in shadow passes --- rendering/opengl33renderer.cpp | 40 ++++++++++++++++++++++++++-------- rendering/opengl33renderer.h | 3 ++- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index f96ddffa7..aba5212a7 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -3032,6 +3032,12 @@ void opengl33_renderer::Render_Instanced( TModel3d *Model, std::vectorMaterial() != nullptr ? Instances.front()->Material()->replacable_skins : nullptr }; + bool castsshadow { m_renderpass.draw_mode != rendermode::shadows }; m_instance_lodbounds.clear(); m_instance_lodpending.clear(); m_instance_lodpending.push_back( Model->Root ); @@ -3041,9 +3047,14 @@ void opengl33_renderer::Render_Instanced( TModel3d *Model, std::vectorfSquareMinDist > 0.f ) { m_instance_lodbounds.emplace_back( submodel->fSquareMinDist ); } if( submodel->fSquareMaxDist < std::numeric_limits::max() ) { m_instance_lodbounds.emplace_back( submodel->fSquareMaxDist ); } + if( ( false == castsshadow ) && ( submodel->eType < TP_ROTATOR ) ) { + auto const material { submodel->m_material >= 0 ? submodel->m_material : ( skins != nullptr ? skins[ -submodel->m_material ] : null_handle ) }; + castsshadow = ( Material( material ).shadow_rank <= Global.gfx_shadow_rank_cutoff ); + } m_instance_lodpending.push_back( submodel->Child ); m_instance_lodpending.push_back( submodel->Next ); } + if( false == castsshadow ) { return; } std::sort( m_instance_lodbounds.begin(), m_instance_lodbounds.end() ); m_instance_lodbounds.erase( std::unique( m_instance_lodbounds.begin(), m_instance_lodbounds.end() ), m_instance_lodbounds.end() ); auto const bandcount { m_instance_lodbounds.size() + 1 }; @@ -3064,6 +3075,7 @@ void opengl33_renderer::Render_Instanced( TModel3d *Model, std::vectorlocation() - m_renderpass.pass_camera.position() ), 1.f ); auto const distance { static_cast( distancesquared ) }; + farthest_distancesquared = std::max( farthest_distancesquared, distance ); m_instance_survivors.push_back( { view_matrix * root, distance, @@ -3120,16 +3133,25 @@ void opengl33_renderer::Render_Instanced( TModel3d *Model, std::vector::max() ); - for( auto const &survivor : m_instance_survivors ) { - ++m_instance_bandstarts[ survivor.band + 1 ]; + for( auto &survivor : m_instance_survivors ) { m_instance_banddistances[ survivor.band ] = std::min( m_instance_banddistances[ survivor.band ], survivor.distancesquared ); + auto const slot { std::min( distanceslots - 1, static_cast( std::sqrt( survivor.distancesquared ) * slotscale ) ) }; + survivor.band = static_cast( survivor.band * distanceslots + slot ); // from now on it's the sort key + ++m_instance_bandstarts[ survivor.band + 1 ]; } - for( std::size_t band = 1; band <= bandcount; ++band ) { - m_instance_bandstarts[ band ] += m_instance_bandstarts[ band - 1 ]; + for( std::size_t key = 1; key <= keycount; ++key ) { + m_instance_bandstarts[ key ] += m_instance_bandstarts[ key - 1 ]; } m_instance_bandcursors.assign( m_instance_bandstarts.begin(), m_instance_bandstarts.end() - 1 ); m_instance_modelviews.resize( m_instance_survivors.size() ); @@ -3145,8 +3167,8 @@ void opengl33_renderer::Render_Instanced( TModel3d *Model, std::vector( band_end - offset_idx, gl::MAX_INSTANCES_PER_BATCH ); diff --git a/rendering/opengl33renderer.h b/rendering/opengl33renderer.h index 2f86117fd..43cd24b05 100644 --- a/rendering/opengl33renderer.h +++ b/rendering/opengl33renderer.h @@ -436,7 +436,8 @@ class opengl33_renderer : public gfx_renderer { std::vector m_instance_survivors; std::vector m_instance_lodbounds; std::vector m_instance_lodpending; - // per lod band: first index in m_instance_modelviews (with end sentinel), fill cursor, nearest distance + // per sort key (lod band and distance slot): first index in m_instance_modelviews (with end sentinel) + // and fill cursor; per lod band: nearest distance std::vector m_instance_bandstarts; std::vector m_instance_bandcursors; std::vector m_instance_banddistances; From 06078ddab928bbc2bb0c5eaf43e541dbb84b436e Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Thu, 1 Oct 2026 13:30:25 +0200 Subject: [PATCH 025/430] fix: other sonar sast fixes (#193) --- McZapkie/Mover.cpp | 19 ++++++++----------- rendering/opengl33renderer.cpp | 8 ++++---- rendering/openglrenderer.cpp | 8 ++++---- simulation/simulationenvironment.cpp | 6 +++--- 4 files changed, 19 insertions(+), 22 deletions(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 68b889188..61bdc17a7 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -2408,7 +2408,7 @@ bool TMoverParameters::IncMainCtrl(int CtrlSpeed) { ++MainCtrlPos; OK = true; - if (EIMCtrlType == 0 && SpeedCtrlAutoTurnOffFlag & 1 == 1 && MainCtrlActualPos != MainCtrlPos) + if (EIMCtrlType == 0 && ( SpeedCtrlAutoTurnOffFlag & 1 ) == 1 && MainCtrlActualPos != MainCtrlPos) { DecScndCtrl(2); SpeedCtrlUnit.IsActive = false; @@ -2591,7 +2591,7 @@ bool TMoverParameters::DecMainCtrl(int CtrlSpeed) { MainCtrlPos--; OK = true; - if (EIMCtrlType == 0 && SpeedCtrlAutoTurnOffFlag & 1 == 1 && MainCtrlActualPos != MainCtrlPos) + if (EIMCtrlType == 0 && (SpeedCtrlAutoTurnOffFlag & 1) == 1 && MainCtrlActualPos != MainCtrlPos) { DecScndCtrl(2); SpeedCtrlUnit.IsActive = false; @@ -2780,7 +2780,7 @@ bool TMoverParameters::IncScndCtrl(int CtrlSpeed) if (OK && EngineType == TEngineType::ElectricInductionMotor && ScndCtrlPosNo == 1 && MainCtrlPos > 0) { SpeedCtrlValue = Vel; - if (EIMCtrlType == 0 && SpeedCtrlAutoTurnOffFlag & 1 == 1) + if (EIMCtrlType == 0 && (SpeedCtrlAutoTurnOffFlag & 1) == 1) { MainCtrlActualPos = MainCtrlPos; } @@ -4586,14 +4586,11 @@ void TMoverParameters::UpdatePipePressure(double dt) auto const lowvoltagepower{Power24vIsAvailable || Power110vIsAvailable}; - if (true == RadioStopFlag || true == AlarmChainFlag || (true == EIMCtrlEmergency && LocalBrakePosA >= 1.0) || SecuritySystem.is_braking() || - (SpringBrakeDriveEmergencyVel >= 0 && Vel > SpringBrakeDriveEmergencyVel && SpringBrake.IsActive) - /* - // NOTE: disabled because 32 is 'load destroyed' flag, what does this have to do with emergency brake? - // (if it's supposed to be broken coupler, such event sets alarmchainflag instead when appropriate) - || ( true == TestFlag( EngDmgFlag, 32 ) ) - */ - || (0 == CabActive && InactiveCabFlag & activation::emergencybrake) || (SpringBrakeDriveEmergencyVel >= 0 && Vel > SpringBrakeDriveEmergencyVel && SpringBrake.IsActive)) + // EngDmgFlag 32 (load destroyed) used to trigger this too; dropped, it has nothing to do with + // the emergency brake (a broken coupler sets AlarmChainFlag instead) + if (RadioStopFlag || AlarmChainFlag || (EIMCtrlEmergency && LocalBrakePosA >= 1.0) || SecuritySystem.is_braking() || + (SpringBrakeDriveEmergencyVel >= 0 && Vel > SpringBrakeDriveEmergencyVel && SpringBrake.IsActive) || + (0 == CabActive && (InactiveCabFlag & activation::emergencybrake) != 0)) { EmergencyValveFlow = PF(0, PipePress, 0.15) * dt; } diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index b99378162..06fad0cdb 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -81,9 +81,9 @@ bool opengl33_renderer::Init(GLFWwindow *Window) } // rgb value for 5780 kelvin - Global.DayLight.diffuse[0] = 255.0f / 255.0f; - Global.DayLight.diffuse[1] = 242.0f / 255.0f; - Global.DayLight.diffuse[2] = 231.0f / 255.0f; + Global.DayLight.diffuse[0] = 1.0f; // 255 / 255 + Global.DayLight.diffuse[1] = 0.9490196f; // 242 / 255 + Global.DayLight.diffuse[2] = 0.9058824f; // 231 / 255 Global.DayLight.is_directional = true; m_sunlight.id = opengl33_renderer::sunlight; @@ -1956,7 +1956,7 @@ bool opengl33_renderer::Render(world_environment *Environment) // moon { Bind_Texture(0, m_moontexture); - glm::vec3 mooncolor(255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f); + glm::vec3 mooncolor(1.0f, 0.9490196f, 0.9058824f); glm::vec4 color(mooncolor.r, mooncolor.g, mooncolor.b, // fade the moon if it's near the sun in the sky, especially during the day std::max(0.f, 1.0 - 0.5 * Global.fLuminance - 0.65 * std::max(0.f, glm::dot(Environment->m_sun.getDirection(), Environment->m_moon.getDirection()))) * fogfactor); diff --git a/rendering/openglrenderer.cpp b/rendering/openglrenderer.cpp index 6f06e9b33..dcbd1df2c 100644 --- a/rendering/openglrenderer.cpp +++ b/rendering/openglrenderer.cpp @@ -88,9 +88,9 @@ opengl_renderer::Init( GLFWwindow *Window ) { ::glEnable( opengl_renderer::sunlight ); // rgb value for 5780 kelvin - Global.DayLight.diffuse[ 0 ] = 255.0f / 255.0f; - Global.DayLight.diffuse[ 1 ] = 242.0f / 255.0f; - Global.DayLight.diffuse[ 2 ] = 231.0f / 255.0f; + Global.DayLight.diffuse[0] = 1.0f; // 255 / 255 + Global.DayLight.diffuse[1] = 0.9490196f; // 242 / 255 + Global.DayLight.diffuse[2] = 0.9058824f; // 231 / 255 Global.DayLight.is_directional = true; m_sunlight.id = opengl_renderer::sunlight; // ::glLightf( opengl_renderer::sunlight, GL_SPOT_CUTOFF, 90.0f ); @@ -1603,7 +1603,7 @@ opengl_renderer::Render( world_environment *Environment ) { if (!m_isATI) { Bind_Texture( m_moontexture ); - glm::vec3 mooncolor( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ); + glm::vec3 mooncolor(1.0f, 0.9490196f, 0.9058824f); ::glColor4f( mooncolor.r, mooncolor.g, mooncolor.b, // fade the moon if it's near the sun in the sky, especially during the day diff --git a/simulation/simulationenvironment.cpp b/simulation/simulationenvironment.cpp index 9837e0e85..b96cea20d 100644 --- a/simulation/simulationenvironment.cpp +++ b/simulation/simulationenvironment.cpp @@ -140,7 +140,7 @@ world_environment::update() { m_lightintensity = moonlightlevel; // if the moon is up, it overrides the twilight twilightfactor = 0.0f; - keylightcolor = glm::vec3( 255.0f / 255.0f, 242.0f / 255.0f, 202.0f / 255.0f ); + keylightcolor = glm::vec3( 1.0f, 0.9490196f, 0.7921569f ); } else { // regular situation with sun as the key light @@ -152,8 +152,8 @@ world_environment::update() { // include 'golden hour' effect in twilight lighting float const duskfactor = 1.25f - std::clamp( Global.SunAngle, 0.0f, 18.0f ) / 18.0f; keylightcolor = glm::mix( - glm::vec3( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ), - glm::vec3( 235.0f / 255.0f, 120.0f / 255.0f, 36.0f / 255.0f ), + glm::vec3( 1.0f, 0.9490196f, 0.9058824f ), // 255, 242, 231 / 255 + glm::vec3( 0.9215686f, 0.4705882f, 0.1411765f ), // 235, 120, 36 / 255 duskfactor ); } // ...retrieve current sky colour and brightness... From 1474d2b773ce1510d0c2e73505c464d2616b0045 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Thu, 1 Oct 2026 13:30:36 +0200 Subject: [PATCH 026/430] fix: merge nested ifs in Driver.cpp cpp:s1066 (#194) --- vehicle/Driver.cpp | 1723 ++++++++++++++++++++------------------------ 1 file changed, 785 insertions(+), 938 deletions(-) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 6f3c41003..9f1b2586c 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -219,13 +219,13 @@ void TSpeedPos::CommandCheck() fVelNext = value1; iFlags &= ~(spShuntSemaphor | spPassengerStopPoint | spStopOnSBL); iFlags |= spSemaphor;// nie manewrowa, nie przystanek, nie zatrzymać na SBL, ale semafor - if (value1 == 0.0) // jeśli pierwsza zerowa - if (value2 != 0.0) // a druga nie - { // S1 na SBL, można przejechać po zatrzymaniu (tu nie mamy prędkości ani odległości) - fVelNext = value2; // normalnie będzie zezwolenie na jazdę, aby się usunął z tabelki - iFlags |= spStopOnSBL; // flaga, że ma zatrzymać; na pewno nie zezwoli na manewry - } - break; + if (value1 == 0.0 && value2 != 0.0) // jeśli pierwsza zerowa + // a druga nie + { // S1 na SBL, można przejechać po zatrzymaniu (tu nie mamy prędkości ani odległości) + fVelNext = value2; // normalnie będzie zezwolenie na jazdę, aby się usunął z tabelki + iFlags |= spStopOnSBL; // flaga, że ma zatrzymać; na pewno nie zezwoli na manewry + } + break; case TCommandType::cm_SectionVelocity: // odcinek z ograniczeniem prędkości fVelNext = value1; @@ -301,46 +301,39 @@ bool TSpeedPos::Update() if( trTrack->iCategoryFlag & 1 ) { // railways - if( iFlags & spSwitch ) { + if( iFlags & spSwitch && (trTrack->GetSwitchState() & 1) != 0 != ((iFlags & spSwitchStatus) != 0) ) { // jeśli odcinek zmienny - if( (trTrack->GetSwitchState() & 1) != 0 != - ( ( iFlags & spSwitchStatus ) != 0 ) ) { - // czy stan się zmienił? - // Ra: zakładam, że są tylko 2 możliwe stany - iFlags ^= spSwitchStatus; - if( ( iFlags & spElapsed ) == 0 ) { - // jeszcze trzeba skanowanie wykonać od tego toru - // problem jest chyba, jeśli zwrotnica się przełoży zaraz po zjechaniu z niej - // na Mydelniczce potrafi skanować na wprost mimo pojechania na bok - return true; - } - } - } + // czy stan się zmienił? + // Ra: zakładam, że są tylko 2 możliwe stany + iFlags ^= spSwitchStatus; + if ((iFlags & spElapsed) == 0) + { + // jeszcze trzeba skanowanie wykonać od tego toru + // problem jest chyba, jeśli zwrotnica się przełoży zaraz po zjechaniu z niej + // na Mydelniczce potrafi skanować na wprost mimo pojechania na bok + return true; + } + } } else { // roads and others - if( iFlags & 0xF0000000 ) { + if( iFlags & 0xF0000000 && (iFlags & 0xF0000000) > 0x10000000 ) { // jeśli skrzyżowanie, ograniczyć prędkość przy skręcaniu - if( ( iFlags & 0xF0000000 ) > 0x10000000 ) { - // ±1 to jazda na wprost, ±2 nieby też, ale z przecięciem głównej drogi - chyba że jest równorzędne... - // TODO: uzależnić prędkość od promienia; - // albo niech będzie ograniczona w skrzyżowaniu (velocity z ujemną wartością) - fVelNext = 30.0; - } - } + // ±1 to jazda na wprost, ±2 nieby też, ale z przecięciem głównej drogi - chyba że jest równorzędne... + // TODO: uzależnić prędkość od promienia; + // albo niech będzie ograniczona w skrzyżowaniu (velocity z ujemną wartością) + fVelNext = 30.0; + } } } } - else if (iFlags & spEvent) { + else if (iFlags & spEvent && ((iFlags & spElapsed) == 0 || fVelNext == 0.0)) { // jeśli event - if( (iFlags & spElapsed) == 0 - || fVelNext == 0.0 ) { - // ignore already passed signals, but keep an eye on overrun stops - // odczyt komórki pamięci najlepiej by było zrobić jako notyfikację, - // czyli zmiana komórki wywoła jakąś podaną funkcję - CommandCheck(); // sprawdzenie typu komendy w evencie i określenie prędkości - } - } + // ignore already passed signals, but keep an eye on overrun stops + // odczyt komórki pamięci najlepiej by było zrobić jako notyfikację, + // czyli zmiana komórki wywoła jakąś podaną funkcję + CommandCheck(); // sprawdzenie typu komendy w evencie i określenie prędkości + } return false; }; @@ -377,11 +370,10 @@ bool TSpeedPos::IsProperSemaphor(TOrders order) else if (iFlags & spOutsideStation) return true; } - else if (order & Obey_train) + else if (order & Obey_train && iFlags & spSemaphor) { - if (iFlags & spSemaphor) - return true; - } + return true; + } return false; // true gdy zatrzymanie, wtedy nie ma po co skanować dalej } @@ -408,11 +400,10 @@ bool TSpeedPos::Set(basic_event *event, double dist, double length, TOrders orde else if (iFlags & spOutsideStation) return true; } - else if (order & Obey_train) + else if (order & Obey_train && iFlags & spSemaphor && fVelNext == 0.0) { - if (iFlags & spSemaphor && fVelNext == 0.0) - return true; - } + return true; + } return false; // true gdy zatrzymanie, wtedy nie ma po co skanować dalej }; @@ -423,10 +414,9 @@ void TSpeedPos::Set(TTrack *track, double dist, int flag) if (trTrack) { iFlags = flag | (trTrack->eType == tt_Normal ? spTrack : spTrack | spSwitch ); // zapamiętanie kierunku wraz z typem - if (iFlags & spSwitch) - if (trTrack->GetSwitchState() & 1) - iFlags |= spSwitchStatus; - fVelNext = trTrack->VelocityGet(); + if (iFlags & spSwitch && trTrack->GetSwitchState() & 1) + iFlags |= spSwitchStatus; + fVelNext = trTrack->VelocityGet(); if (trTrack->iDamageFlag & 128) fVelNext = 0.0; // jeśli uszkodzony, to też stój if (iFlags & spEnd) @@ -590,52 +580,48 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) auto const events { CheckTrackEvent( pTrack, fLastDir ) }; for( auto *pEvent : events ) { - if( pEvent != nullptr ) // jeśli jest semafor na tym torze + if( pEvent != nullptr && TableNotFound(pEvent, fCurrentDistance) ) // jeśli jest semafor na tym torze { // trzeba sprawdzić tabelkę, bo dodawanie drugi raz tego samego przystanku nie jest korzystne - if (TableNotFound(pEvent, fCurrentDistance)) // jeśli nie ma - { - TableAddNew(); // zawsze jest true + // jeśli nie ma + TableAddNew(); // zawsze jest true - if (Global.iWriteLogEnabled & 8) { - WriteLog("Speed table for " + OwnerName() + " found new event, " + pEvent->m_name); - } - auto &newspeedpoint = sSpeedTable[iLast]; -/* - if( newspeedpoint.Set( - pEvent, - fCurrentDistance + ProjectEventOnTrack( pEvent, pTrack, fLastDir ), - OrderCurrentGet() ) ) { -*/ - if( newspeedpoint.Set( - pEvent, - GetDistanceToEvent( pTrack, pEvent, fLastDir, fCurrentDistance ), - fLength, - OrderCurrentGet() ) ) { + if (Global.iWriteLogEnabled & 8) + { + WriteLog("Speed table for " + OwnerName() + " found new event, " + pEvent->m_name); + } + auto &newspeedpoint = sSpeedTable[iLast]; + /* + if( newspeedpoint.Set( + pEvent, + fCurrentDistance + ProjectEventOnTrack( pEvent, pTrack, fLastDir ), + OrderCurrentGet() ) ) { + */ + if (newspeedpoint.Set(pEvent, GetDistanceToEvent(pTrack, pEvent, fLastDir, fCurrentDistance), fLength, OrderCurrentGet())) + { - fDistance = newspeedpoint.fDist; // jeśli sygnał stop, to nie ma potrzeby dalej skanować - SemNextStopIndex = iLast; - if (SemNextIndex == npos) { - SemNextIndex = iLast; - } - if (Global.iWriteLogEnabled & 8) { - WriteLog("(stop signal from " - + (SemNextStopIndex != npos ? sSpeedTable[SemNextStopIndex].GetName() : "unknown semaphor") - + ")"); - } - } - else { - if( true == newspeedpoint.IsProperSemaphor(OrderCurrentGet()) - && SemNextIndex == npos ) { - SemNextIndex = iLast; // sprawdzamy czy pierwszy na drodze - } - if (Global.iWriteLogEnabled & 8) { - WriteLog("(forward signal for " - + (SemNextIndex != npos ? sSpeedTable[SemNextIndex].GetName() : "unknown semaphor") - + ")"); - } - } - } - } + fDistance = newspeedpoint.fDist; // jeśli sygnał stop, to nie ma potrzeby dalej skanować + SemNextStopIndex = iLast; + if (SemNextIndex == npos) + { + SemNextIndex = iLast; + } + if (Global.iWriteLogEnabled & 8) + { + WriteLog("(stop signal from " + (SemNextStopIndex != npos ? sSpeedTable[SemNextStopIndex].GetName() : "unknown semaphor") + ")"); + } + } + else + { + if (true == newspeedpoint.IsProperSemaphor(OrderCurrentGet()) && SemNextIndex == npos) + { + SemNextIndex = iLast; // sprawdzamy czy pierwszy na drodze + } + if (Global.iWriteLogEnabled & 8) + { + WriteLog("(forward signal for " + (SemNextIndex != npos ? sSpeedTable[SemNextIndex].GetName() : "unknown semaphor") + ")"); + } + } + } } // event dodajemy najpierw, żeby móc sprawdzić, czy tor został dodany po odczytaniu prędkości następnego if( pTrack->VelocityGet() == 0.0 // zatrzymanie @@ -686,17 +672,13 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) */ } } - else if ( pTrack->fRadius != 0.0 // odległość na łuku lepiej aproksymować cięciwami - || ( tLast != nullptr - && tLast->fRadius != 0.0 )) // koniec łuku też jest istotny + else if ( (pTrack->fRadius != 0.0 // odległość na łuku lepiej aproksymować cięciwami + || tLast != nullptr && tLast->fRadius != 0.0) && + TableAddNew()) // koniec łuku też jest istotny { // albo dla liczenia odległości przy pomocy cięciw - te usuwać po przejechaniu - if (TableAddNew()) { - // dodanie odcinka do tabelki - sSpeedTable[iLast].Set( - pTrack, fCurrentDistance, - fLastDir < 0 ? spEnabled | spCurve | spReverse : spEnabled | spCurve ); - } - } + // dodanie odcinka do tabelki + sSpeedTable[iLast].Set(pTrack, fCurrentDistance, fLastDir < 0 ? spEnabled | spCurve | spReverse : spEnabled | spCurve); + } } fCurrentDistance += fTrackLength; // doliczenie kolejnego odcinka do przeskanowanej długości @@ -708,31 +690,22 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) if (pTrack != nullptr ) { // jeśli kolejny istnieje - if( tLast != nullptr ) { + if( tLast != nullptr && tLast->VelocityGet() > 0 && (tLast->VelocityGet() < pTrack->VelocityGet() || pTrack->VelocityGet() < 0) ) { - if( tLast->VelocityGet() > 0 - && ( tLast->VelocityGet() < pTrack->VelocityGet() - || pTrack->VelocityGet() < 0 ) ) { - - if( iLast != -1 - && sSpeedTable[iLast].trTrack == tLast ) { - // if the track is already in the table we only need to mark it as relevant - sSpeedTable[ iLast ].iFlags |= spEnabled; - } - else { - // otherwise add it - TableAddNew(); - sSpeedTable[ iLast ].Set( - tLast, - fCurrentDistance - fTrackLength, // by now the current distance points to beginning of next track - ( fLastDir > 0 ? - pTrack->iPrevDirection : - pTrack->iNextDirection ) ? - spEnabled : - spEnabled | spReverse ); - } - } - } + if (iLast != -1 && sSpeedTable[iLast].trTrack == tLast) + { + // if the track is already in the table we only need to mark it as relevant + sSpeedTable[iLast].iFlags |= spEnabled; + } + else + { + // otherwise add it + TableAddNew(); + sSpeedTable[iLast].Set(tLast, + fCurrentDistance - fTrackLength, // by now the current distance points to beginning of next track + (fLastDir > 0 ? pTrack->iPrevDirection : pTrack->iNextDirection) ? spEnabled : spEnabled | spReverse); + } + } // zwiększenie skanowanej odległości tylko jeśli istnieje dalszy tor fTrackLength = pTrack->Length(); } @@ -749,14 +722,12 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) fLastDir < 0 ? spEnabled | spEnd | spReverse : spEnabled | spEnd); } } - else if( sSpeedTable[ iLast ].trTrack == tLast ) { + else if( sSpeedTable[iLast].trTrack == tLast && false == TestFlag(sSpeedTable[iLast].trTrack->iCategoryFlag, 0x100) ) { // otherwise just mark the last added track as the final one // TODO: investigate exactly how we can wind up not marking the last existing track as actual end - if( false == TestFlag( sSpeedTable[ iLast ].trTrack->iCategoryFlag, 0x100 ) ) { - // don't mark portals, as these aren't exactly track ends, but teleport devices - sSpeedTable[ iLast ].iFlags |= spEnabled | spEnd; - } - } + // don't mark portals, as these aren't exactly track ends, but teleport devices + sSpeedTable[iLast].iFlags |= spEnabled | spEnd; + } // to ostatnia pozycja, bo NULL nic nie da, a może się podpiąć obrotnica, czy jakieś transportery return; } @@ -820,27 +791,21 @@ void TController::TableCheck(double fDistance) { // degradacja pozycji sSpeedTable[i].iFlags &= ~spEnabled; // nie liczy się } - else if( ( sSpeedTable[ i ].iFlags & 0xF0000028 ) == spElapsed ) { + else if( (sSpeedTable[i].iFlags & 0xF0000028) == spElapsed && sSpeedTable[i].fVelNext < 0 ) { // jest z tyłu (najechany) i nie jest zwrotnicą ani skrzyżowaniem - if( sSpeedTable[ i ].fVelNext < 0 ) // a nie ma ograniczenia prędkości - { - sSpeedTable[ i ].iFlags = 0; // to nie ma go po co trzymać (odtykacz usunie ze środka) - } - } + // a nie ma ograniczenia prędkości + sSpeedTable[i].iFlags = 0; // to nie ma go po co trzymać (odtykacz usunie ze środka) + } } - else if (sSpeedTable[i].iFlags & spEvent) // jeśli event + else if (sSpeedTable[i].iFlags & spEvent && sSpeedTable[i].fDist < (typeid(*sSpeedTable[i].evEvent) == typeid(putvalues_event) ? -fLength : 0) && mvOccupied->CategoryFlag == 2 && + sSpeedTable[i].fDist < -0.75) // jeśli event { - if (sSpeedTable[i].fDist < ( - typeid( *sSpeedTable[i].evEvent ) == typeid( putvalues_event ) ? - -fLength : - 0)) // jeśli jest z tyłu - if (mvOccupied->CategoryFlag == 2 && sSpeedTable[i].fDist < -0.75) - { // pociąg staje zawsze, a samochód tylko jeśli nie przejedzie całą długością (może być zaskoczony zmianą) - // WriteLog("TableCheck: Event is behind. Delete from table: " + sSpeedTable[i].evEvent->asName); - sSpeedTable[i].iFlags &= ~spEnabled; // degradacja pozycji dla samochodu; - // semafory usuwane tylko przy sprawdzaniu, bo wysyłają komendy - } - } + // jeśli jest z tyłu + // pociąg staje zawsze, a samochód tylko jeśli nie przejedzie całą długością (może być zaskoczony zmianą) + // WriteLog("TableCheck: Event is behind. Delete from table: " + sSpeedTable[i].evEvent->asName); + sSpeedTable[i].iFlags &= ~spEnabled; // degradacja pozycji dla samochodu; + // semafory usuwane tylko przy sprawdzaniu, bo wysyłają komendy + } } } sSpeedTable[iLast].Update(); // aktualizacja ostatniego @@ -890,10 +855,10 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN iDrivigFlags |= moveSwitchFound; // rozjazd z przodu/pod ogranicza np. sens skanowania wstecz SwitchClearDist = point.fDist + point.trTrack->Length() + fLength; } - else if ( TestFlag( point.iFlags, spEvent ) ) // W4 może się deaktywować + else if ( TestFlag(point.iFlags, spEvent) && TableUpdateEvent(v, go, point, d_to_next_sem, idx) ) // W4 może się deaktywować { // jeżeli event, może być potrzeba wysłania komendy, aby ruszył - if( TableUpdateEvent( v, go, point, d_to_next_sem, idx ) ) { continue; } - } + continue; + } auto const railwaytrackend { true == TestFlag(point.iFlags, spEnd) && is_train() }; if( v >= 0.0 // pozycje z prędkością -1 można spokojnie pomijać @@ -938,14 +903,10 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN // points located behind can affect our current speed, but little else else if ( point.iFlags & spTrack) // jeśli tor { // tor ogranicza prędkość, dopóki cały skład nie przejedzie, - if( v >= 1.0 ) { // EU06 się zawieszało po dojechaniu na koniec toru postojowego - if( d + point.trTrack->Length() < -fLength ) { - if( false == railwaytrackend ) { - // zapętlenie, jeśli już wyjechał za ten odcinek - continue; - } - } - } + if( v >= 1.0 && d + point.trTrack->Length() < -fLength && false == railwaytrackend ) { // EU06 się zawieszało po dojechaniu na koniec toru postojowego + // zapętlenie, jeśli już wyjechał za ten odcinek + continue; + } if( v < fVelDes ) { // ograniczenie aktualnej prędkości aż do wyjechania za ograniczenie fVelDes = v; @@ -953,11 +914,9 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN if( v < VelLimitLastDist.first ) { VelLimitLastDist.second = d + point.trTrack->Length() + fLength; } - else if( VelLimitLastDist.second > 0 ) { // the speed limit can potentially start afterwards, so don't mark it as broken too soon - if( ( point.iFlags & ( spSwitch | spPassengerStopPoint ) ) == 0 ) { - speedlimitiscontinuous = false; - } - } + else if( VelLimitLastDist.second > 0 && (point.iFlags & (spSwitch | spPassengerStopPoint)) == 0 ) { // the speed limit can potentially start afterwards, so don't mark it as broken too soon + speedlimitiscontinuous = false; + } if( false == railwaytrackend ) { continue; // i tyle wystarczy } @@ -1029,19 +988,16 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN } // if (v>=0.0) // finding a point which doesn't impose speed limit means any potential active speed limit can't extend through entire scan table // NOTE: we test actual speed value for the given point, as events may receive (v = -1) as a way to disable them in irrelevant modes - if( point.fVelNext < 0 ) { + if( point.fVelNext < 0 && (point.iFlags & (spSwitch | spPassengerStopPoint)) == 0 ) { // NOTE: we exclude switches from this rule, as speed limits generally extend through these - if( ( point.iFlags & ( spSwitch | spPassengerStopPoint ) ) == 0 ) { - speedlimitiscontinuous = false; - } - } + speedlimitiscontinuous = false; + } if (fNext >= 0.0) { // jeśli ograniczenie - if( ( point.iFlags & ( spEnabled | spEvent ) ) == ( spEnabled | spEvent ) ) { // tylko sygnał przypisujemy - if( eSignNext == nullptr ) { // jeśli jeszcze nic nie zapisane tam - eSignNext = point.evEvent; // dla informacji - } - } + if( (point.iFlags & (spEnabled | spEvent)) == (spEnabled | spEvent) && eSignNext == nullptr ) { // tylko sygnał przypisujemy + // jeśli jeszcze nic nie zapisane tam + eSignNext = point.evEvent; // dla informacji + } if( fNext == 0.0 ) { break; // nie ma sensu analizować tabelki dalej } @@ -1408,20 +1364,13 @@ TController::TableUpdateEvent( double &Velocity, TCommandType &Command, TSpeedPo auto const magnetlocation { pVehicles[ end::front ]->MoverParameters->SecuritySystem.MagnetLocation }; auto const magnetrange { 1.0 }; auto const ismagnetpassed { Point.fDist < -( magnetlocation + magnetrange ) }; - if( Point.fDist < -magnetlocation ) { + if( Point.fDist < -magnetlocation && (mvOccupied->Vel > EU07_AI_NOMOVEMENT || false == ismagnetpassed) ) { // NOTE: normally we'd activate the magnet once the leading vehicle passes it // but on a fresh scan after direction change it would be detected as long as it's under consist, and meet the (simple) activation condition // thus we're doing a more precise check in such situation (we presume direction change takes place only if the vehicle is standing still) - if( mvOccupied->Vel > EU07_AI_NOMOVEMENT - || false == ismagnetpassed ) { - mvOccupied->SecuritySystem.set_cabsignal_lock(!AIControllFlag); // don't make life difficult for the ai, but a human driver is a fair game - PutCommand( - Point.evEvent->input_text(), - Point.evEvent->input_value( 1 ), - Point.evEvent->input_value( 2 ), - nullptr ); - } - } + mvOccupied->SecuritySystem.set_cabsignal_lock(!AIControllFlag); // don't make life difficult for the ai, but a human driver is a fair game + PutCommand(Point.evEvent->input_text(), Point.evEvent->input_value(1), Point.evEvent->input_value(2), nullptr); + } if( ismagnetpassed ) { Point.Clear(); mvOccupied->SecuritySystem.set_cabsignal_lock(false); @@ -1507,21 +1456,18 @@ TController::TableUpdateEvent( double &Velocity, TCommandType &Command, TSpeedPo } else if ( Point.iFlags & spStopOnSBL) { // jeśli S1 na SBL - if( mvOccupied->Vel < 2.0 ) { + if( mvOccupied->Vel < 2.0 && Point.fDist < fMaxProximityDist && Obstacle.distance > 1000 ) { // stanąć nie musi, ale zwolnić przynajmniej // jest w maksymalnym zasięgu to można go pominąć (wziąć drugą prędkosć) // as long as there isn't any obstacle in arbitrary view range - if( Point.fDist < fMaxProximityDist - && Obstacle.distance > 1000 ) { - eSignSkip = Point.evEvent; - // jazda na widoczność - skanować możliwość kolizji i nie podjeżdżać zbyt blisko - // usunąć flagę po podjechaniu blisko semafora zezwalającego na jazdę - // ostrożnie interpretować sygnały - semafor może zezwalać na jazdę pociągu z przodu! - iDrivigFlags |= moveVisibility; - // store the ordered restricted speed and don't exceed it until the flag is cleared - VelRestricted = Point.evEvent->input_value( 2 ); - } - } + eSignSkip = Point.evEvent; + // jazda na widoczność - skanować możliwość kolizji i nie podjeżdżać zbyt blisko + // usunąć flagę po podjechaniu blisko semafora zezwalającego na jazdę + // ostrożnie interpretować sygnały - semafor może zezwalać na jazdę pociągu z przodu! + iDrivigFlags |= moveVisibility; + // store the ordered restricted speed and don't exceed it until the flag is cleared + VelRestricted = Point.evEvent->input_value(2); + } if( eSignSkip != Point.evEvent ) { // jeśli ten SBL nie jest do pominięcia to ma 0 odczytywać Velocity = Point.evEvent->input_value( 1 ); @@ -1570,54 +1516,59 @@ TController::TableUpdateEvent( double &Velocity, TCommandType &Command, TSpeedPo if ( Point.fDist < 0) VelRoad = Point.fVelNext; } - else if ( Point.iFlags & spSectionVel) + else if ( Point.iFlags & spSectionVel && Point.fDist < 0) { // to W27 - if ( Point.fDist < 0) // teraz trzeba sprawdzić inne warunki - { - if ( Point.fSectionVelocityDist == 0.0) { - if( Global.iWriteLogEnabled & 8 ) { - WriteLog( "TableUpdate: Event is behind. SVD = 0: " + Point.evEvent->m_name ); - } - Point.Clear(); // jeśli punktowy to kasujemy i nie dajemy ograniczenia na stałe - } - else if ( Point.fSectionVelocityDist < 0.0) { - // ograniczenie obowiązujące do następnego - if ( Point.fVelNext == min_speed(Point.fVelNext, VelLimitLast) - && Point.fVelNext != VelLimitLast) { - // jeśli ograniczenie jest mniejsze niż obecne to obowiązuje od zaraz - VelLimitLast = Point.fVelNext; - } - else if ( Point.fDist < -fLength) { - // jeśli większe to musi wyjechać za poprzednie - VelLimitLast = Point.fVelNext; - if( Global.iWriteLogEnabled & 8 ) { - WriteLog( "TableUpdate: Event is behind. SVD < 0: " + Point.evEvent->m_name ); - } - Point.Clear(); // wyjechaliśmy poza poprzednie, można skasować - } - } - else - { // jeśli większe to ograniczenie ma swoją długość - if ( Point.fVelNext == min_speed(Point.fVelNext, VelLimitLast) - && Point.fVelNext != VelLimitLast) { - // jeśli ograniczenie jest mniejsze niż obecne to obowiązuje od zaraz - VelLimitLast = Point.fVelNext; - } - else if ( Point.fDist < -fLength - && Point.fVelNext != VelLimitLast) { - // jeśli większe to musi wyjechać za poprzednie - VelLimitLast = Point.fVelNext; - } - else if (Point.fDist < -fLength - Point.fSectionVelocityDist) { - VelLimitLast = -1.0; - if( Global.iWriteLogEnabled & 8 ) { - WriteLog( "TableUpdate: Event is behind. SVD > 0: " + Point.evEvent->m_name ); - } - Point.Clear(); // wyjechaliśmy poza poprzednie, można skasować - } - } - } - } + // teraz trzeba sprawdzić inne warunki + if (Point.fSectionVelocityDist == 0.0) + { + if (Global.iWriteLogEnabled & 8) + { + WriteLog("TableUpdate: Event is behind. SVD = 0: " + Point.evEvent->m_name); + } + Point.Clear(); // jeśli punktowy to kasujemy i nie dajemy ograniczenia na stałe + } + else if (Point.fSectionVelocityDist < 0.0) + { + // ograniczenie obowiązujące do następnego + if (Point.fVelNext == min_speed(Point.fVelNext, VelLimitLast) && Point.fVelNext != VelLimitLast) + { + // jeśli ograniczenie jest mniejsze niż obecne to obowiązuje od zaraz + VelLimitLast = Point.fVelNext; + } + else if (Point.fDist < -fLength) + { + // jeśli większe to musi wyjechać za poprzednie + VelLimitLast = Point.fVelNext; + if (Global.iWriteLogEnabled & 8) + { + WriteLog("TableUpdate: Event is behind. SVD < 0: " + Point.evEvent->m_name); + } + Point.Clear(); // wyjechaliśmy poza poprzednie, można skasować + } + } + else + { // jeśli większe to ograniczenie ma swoją długość + if (Point.fVelNext == min_speed(Point.fVelNext, VelLimitLast) && Point.fVelNext != VelLimitLast) + { + // jeśli ograniczenie jest mniejsze niż obecne to obowiązuje od zaraz + VelLimitLast = Point.fVelNext; + } + else if (Point.fDist < -fLength && Point.fVelNext != VelLimitLast) + { + // jeśli większe to musi wyjechać za poprzednie + VelLimitLast = Point.fVelNext; + } + else if (Point.fDist < -fLength - Point.fSectionVelocityDist) + { + VelLimitLast = -1.0; + if (Global.iWriteLogEnabled & 8) + { + WriteLog("TableUpdate: Event is behind. SVD > 0: " + Point.evEvent->m_name); + } + Point.Clear(); // wyjechaliśmy poza poprzednie, można skasować + } + } + } //sprawdzenie eventów pasywnych przed nami { // zawalidrogi nie ma (albo pojazd jest samochodem), sprawdzić sygnał @@ -1632,81 +1583,89 @@ TController::TableUpdateEvent( double &Velocity, TCommandType &Command, TSpeedPo Point.Clear(); } } - else if( Command == TCommandType::cm_Unknown ) { + else if( Command == TCommandType::cm_Unknown && Velocity != 0.0 ) { // jeśli jeszcze nie ma komendy // komenda jest tylko gdy ma jechać, bo stoi na podstawie tabelki - if( Velocity != 0.0 ) { - // jeśli nie było komendy wcześniej - pierwsza się liczy - ustawianie VelSignal - Command = TCommandType::cm_ShuntVelocity; // w trybie pociągowym tylko jeśli włącza tryb manewrowy (v!=0.0) - // Ra 2014-06: (VelSignal) nie może być tu ustawiane, bo Tm może być daleko - if( VelSignal == 0.0 ) { - // aby stojący ruszył - VelSignal = Velocity; - } - if( Point.fDist < 0.0 ) { - // jeśli przejechany - //!!! ustawienie, gdy przejechany jest lepsze niż wcale, ale to jeszcze nie to - VelSignal = Velocity; - // to można usunąć (nie mogą być usuwane w skanowaniu) - Point.Clear(); - } - } - } + // jeśli nie było komendy wcześniej - pierwsza się liczy - ustawianie VelSignal + Command = TCommandType::cm_ShuntVelocity; // w trybie pociągowym tylko jeśli włącza tryb manewrowy (v!=0.0) + // Ra 2014-06: (VelSignal) nie może być tu ustawiane, bo Tm może być daleko + if (VelSignal == 0.0) + { + // aby stojący ruszył + VelSignal = Velocity; + } + if (Point.fDist < 0.0) + { + // jeśli przejechany + //!!! ustawienie, gdy przejechany jest lepsze niż wcale, ale to jeszcze nie to + VelSignal = Velocity; + // to można usunąć (nie mogą być usuwane w skanowaniu) + Point.Clear(); + } + } } else if( ( Point.iFlags & spSectionVel ) == 0 ) { //jeśli jakiś event pasywny ale nie ograniczenie - if( Command == TCommandType::cm_Unknown ) { - // jeśli nie było komendy wcześniej - pierwsza się liczy - ustawianie VelSignal - if( Velocity < 0.0 - || Velocity >= 1.0 ) { - // bo wartość 0.1 służy do hamowania tylko - Command = TCommandType::cm_SetVelocity; // może odjechać - // Ra 2014-06: (VelSignal) nie może być tu ustawiane, bo semafor może być daleko - // VelSignal=v; //nie do końca tak, to jest druga prędkość; -1 nie wpisywać... - if( VelSignal == 0.0 ) { - // aby stojący ruszył - VelSignal = -1.0; - } - if( Point.fDist < 0.0 ) { - // jeśli przejechany - VelSignal = Velocity == 0.0 ? 0.0 : -1.0; - // ustawienie, gdy przejechany jest lepsze niż wcale, ale to jeszcze nie to - if( Point.iFlags & spEvent ) { - // jeśli event - if( Point.evEvent != eSignSkip - || Point.fVelNext != VelRestricted ) { - // ale inny niż ten, na którym minięto S1, chyba że się już zmieniło - // sygnał zezwalający na jazdę wyłącza jazdę na widoczność (po S1 na SBL) - iDrivigFlags &= ~moveVisibility; - // remove restricted speed - VelRestricted = -1.0; - } - } - // jeśli nie jest ograniczeniem prędkości to można usunąć - // (nie mogą być usuwane w skanowaniu) - Point.Clear(); - } - } - else if( Point.evEvent->is_command() ) { - // jeśli prędkość jest zerowa, a komórka zawiera komendę - eSignNext = Point.evEvent; // dla informacji - // make sure the command isn't for someone else - // TBD, TODO: revise this check for bank/loose_shunt; we might want to ignore obstacles with no owner in these modes - if( Point.fDist < Obstacle.distance ) { - if( true == TestFlag( iDrivigFlags, moveStopHere ) ) { - // jeśli ma stać, dostaje komendę od razu - Command = TCommandType::cm_Command; // komenda z komórki, do wykonania po zatrzymaniu - } - // NOTE: human drivers are likely to stop wherever and expect things to still work, so we give them more leeway - else if( Point.fDist <= ( AIControllFlag ? fMaxProximityDist : std::max( 250.0, fMaxProximityDist ) ) ) { - // jeśli ma dociągnąć, to niech dociąga - // (moveStopCloser dotyczy dociągania do W4, nie semafora) - Command = TCommandType::cm_Command; // komenda z komórki, do wykonania po zatrzymaniu - } - } - } - } - } + if( Command != TCommandType::cm_Unknown ) + { + } + else + { + // jeśli nie było komendy wcześniej - pierwsza się liczy - ustawianie VelSignal + if (Velocity < 0.0 || Velocity >= 1.0) + { + // bo wartość 0.1 służy do hamowania tylko + Command = TCommandType::cm_SetVelocity; // może odjechać + // Ra 2014-06: (VelSignal) nie może być tu ustawiane, bo semafor może być daleko + // VelSignal=v; //nie do końca tak, to jest druga prędkość; -1 nie wpisywać... + if (VelSignal == 0.0) + { + // aby stojący ruszył + VelSignal = -1.0; + } + if (Point.fDist < 0.0) + { + // jeśli przejechany + VelSignal = Velocity == 0.0 ? 0.0 : -1.0; + // ustawienie, gdy przejechany jest lepsze niż wcale, ale to jeszcze nie to + if (Point.iFlags & spEvent && (Point.evEvent != eSignSkip || Point.fVelNext != VelRestricted)) + { + // jeśli event + // ale inny niż ten, na którym minięto S1, chyba że się już zmieniło + // sygnał zezwalający na jazdę wyłącza jazdę na widoczność (po S1 na SBL) + iDrivigFlags &= ~moveVisibility; + // remove restricted speed + VelRestricted = -1.0; + } + // jeśli nie jest ograniczeniem prędkości to można usunąć + // (nie mogą być usuwane w skanowaniu) + Point.Clear(); + } + } + else if (Point.evEvent->is_command()) + { + // jeśli prędkość jest zerowa, a komórka zawiera komendę + eSignNext = Point.evEvent; // dla informacji + // make sure the command isn't for someone else + // TBD, TODO: revise this check for bank/loose_shunt; we might want to ignore obstacles with no owner in these modes + if (Point.fDist < Obstacle.distance) + { + if (true == TestFlag(iDrivigFlags, moveStopHere)) + { + // jeśli ma stać, dostaje komendę od razu + Command = TCommandType::cm_Command; // komenda z komórki, do wykonania po zatrzymaniu + } + // NOTE: human drivers are likely to stop wherever and expect things to still work, so we give them more leeway + else if (Point.fDist <= (AIControllFlag ? fMaxProximityDist : std::max(250.0, fMaxProximityDist))) + { + // jeśli ma dociągnąć, to niech dociąga + // (moveStopCloser dotyczy dociągania do W4, nie semafora) + Command = TCommandType::cm_Command; // komenda z komórki, do wykonania po zatrzymaniu + } + } + } + } + } } // jeśli nie ma zawalidrogi return false; @@ -1964,12 +1923,10 @@ std::string TController::OrderCurrent() const { // pobranie aktualnego rozkazu celem wyświetlenia auto const order { OrderCurrentGet() }; // generally prioritize direction change... - if( order & Change_direction ) { + if( order & Change_direction && false == TestFlag(iDrivigFlags, moveConnect) ) { // ...but not in the middle of coupling operation - if( false == TestFlag( iDrivigFlags, moveConnect ) ) { - return STR("Change direction"); - } - } + return STR("Change direction"); + } switch( static_cast( order & ~Change_direction ) ) { case Wait_for_orders: { return STR("Wait for orders"); } @@ -2085,14 +2042,10 @@ void TController::Activation() } BrakeLevelSet( mvOccupied->BrakeCtrlPos ); } - if( mvControlling->EngineType == TEngineType::DieselEngine ) { + if( mvControlling->EngineType == TEngineType::DieselEngine && mvControlling->ShuntModeAllow ) { // dla 2Ls150 - przed ustawieniem kierunku - można zmienić tryb pracy - if( mvControlling->ShuntModeAllow ) { - mvControlling->CurrentSwitch( - (OrderCurrentGet() & (Shunt | Loose_shunt)) != 0 - || fMass > 224000.0 ); // do tego na wzniesieniu może nie dać rady na liniowym - } - } + mvControlling->CurrentSwitch((OrderCurrentGet() & (Shunt | Loose_shunt)) != 0 || fMass > 224000.0); // do tego na wzniesieniu może nie dać rady na liniowym + } // Ra: to przełączanie poniżej jest tu bez sensu mvOccupied->CabOccupied = iDirection; // aktywacja kabiny w prowadzonym pojeżdzie (silnikowy może być odwrotnie?) mvOccupied->CabActivisation(); // uruchomienie kabin w członach @@ -2379,24 +2332,22 @@ bool TController::CheckVehicles(TOrders user) while (p) { // sprawdzanie, czy jest głównym sterującym, żeby nie było konfliktu if( p->Mechanik // jeśli ma obsadę - && p->Mechanik != this ) { // ale chodzi o inny pojazd, niż aktualnie sprawdzający - if( p->Mechanik->iDrivigFlags & movePrimary ) { - // a tamten ma priorytet - // TODO: take into account drivers' operating modes, one or more of them might be on banking duty - if( iDrivigFlags & movePrimary - && mvOccupied->DirAbsolute - && mvOccupied->BrakeCtrlPos >= -1 ) { - // jeśli rządzi i ma kierunek - p->Mechanik->primary( false ); // dezaktywuje tamtego - p->Mechanik->ZeroLocalBrake(); - p->MoverParameters->BrakeLevelSet( p->MoverParameters->Handle->GetPos( bh_NP ) ); // odcięcie na zaworze maszynisty - p->Mechanik->BrakeLevelSet( p->MoverParameters->BrakeCtrlPos ); //ustawienie zmiennej GBH - } - else { - main = false; // nici z rządzenia - } - } - } + && p->Mechanik != this && p->Mechanik->iDrivigFlags & movePrimary ) { // ale chodzi o inny pojazd, niż aktualnie sprawdzający + // a tamten ma priorytet + // TODO: take into account drivers' operating modes, one or more of them might be on banking duty + if (iDrivigFlags & movePrimary && mvOccupied->DirAbsolute && mvOccupied->BrakeCtrlPos >= -1) + { + // jeśli rządzi i ma kierunek + p->Mechanik->primary(false); // dezaktywuje tamtego + p->Mechanik->ZeroLocalBrake(); + p->MoverParameters->BrakeLevelSet(p->MoverParameters->Handle->GetPos(bh_NP)); // odcięcie na zaworze maszynisty + p->Mechanik->BrakeLevelSet(p->MoverParameters->BrakeCtrlPos); // ustawienie zmiennej GBH + } + else + { + main = false; // nici z rządzenia + } + } ++iVehicles; // jest jeden pojazd więcej pVehicles[end::rear] = p; // zapamiętanie ostatniego fLength += p->MoverParameters->Dim.L; // dodanie długości pojazdu @@ -2523,19 +2474,17 @@ bool TController::CheckVehicles(TOrders user) // potentially adjust light state control_lights(); // custom ai action for disconnect mode: switch off lights on disconnected vehicle(s) - if( is_train() ) { - if( true == TestFlag( OrderCurrentGet(), Disconnect ) ) { - if( AIControllFlag ) { - // światła manewrowe (Tb1) tylko z przodu, aby nie pozostawić odczepionego ze światłem - if( mvOccupied->DirActive >= 0 ) { // jak ma kierunek do przodu - pVehicles[ end::rear ]->RaLightsSet( -1, 0 ); - } - else { // jak dociska - pVehicles[ end::front ]->RaLightsSet( 0, -1 ); - } - } - } - } + if( is_train() && true == TestFlag(OrderCurrentGet(), Disconnect) && AIControllFlag ) { + // światła manewrowe (Tb1) tylko z przodu, aby nie pozostawić odczepionego ze światłem + if (mvOccupied->DirActive >= 0) + { // jak ma kierunek do przodu + pVehicles[end::rear]->RaLightsSet(-1, 0); + } + else + { // jak dociska + pVehicles[end::front]->RaLightsSet(0, -1); + } + } // enable door locks cue_action( driver_hint::consistdoorlockson ); // potentially enable train heating @@ -2642,10 +2591,10 @@ int TController::OrderDirectionChange(int newdir, TMoverParameters *Vehicle) IncBrake(); // niech hamuje if (Vehicle->DirActive == testd * Vehicle->CabActive) VelforDriver = -1; // można jechać, bo kierunek jest zgodny z żądanym - if (is_emu()) - if (Vehicle->DirActive > 0) - // if () //tylko jeśli jazda pociągowa (tego nie wiemy w momencie odpalania silnika) - Vehicle->DirectionForward(); // Ra: z przekazaniem do silnikowego + if (is_emu() && Vehicle->DirActive > 0) + // if () //tylko jeśli jazda pociągowa (tego nie wiemy w momencie odpalania silnika) + Vehicle->DirectionForward(); + // Ra: z przekazaniem do silnikowego return (int)VelforDriver; // zwraca prędkość mechanika } @@ -3115,11 +3064,10 @@ bool TController::IncBrake() OK = false; } } - if( /*GBH mvOccupied->BrakeCtrlPos*/BrakeCtrlPosition > 0 ) { - if( mvOccupied->Hamulec->Releaser() ) { - mvOccupied->BrakeReleaser( 0 ); - } - } + if( /*GBH mvOccupied->BrakeCtrlPos*/ + /*GBH mvOccupied->BrakeCtrlPos*/ BrakeCtrlPosition > 0 && mvOccupied->Hamulec->Releaser() ) { + mvOccupied->BrakeReleaser(0); + } break; } case TBrakeSystem::ElectroPneumatic: { @@ -3230,15 +3178,13 @@ bool TController::DecBrake() { auto const pos_diff { ( is_dmu() ? 0.25 : 1.0 ) }; deltaAcc = -AccDesired * BrakeAccFactor() - ( fBrake_a0[ 0 ] + 4 * (/*GBH mvOccupied->BrakeCtrlPosR*/BrakeCtrlPosition - pos_diff )*fBrake_a1[ 0 ] ); } - if (deltaAcc < 0) { - if(/*GBH mvOccupied->BrakeCtrlPosR*/BrakeCtrlPosition > 0 ) { - OK = /*mvOccupied->*/BrakeLevelAdd( -0.25 ); - //if ((deltaAcc < 5 * fBrake_a1[0]) && (mvOccupied->BrakeCtrlPosR >= 1.2)) - // mvOccupied->BrakeLevelAdd(-1.0); - /* if (mvOccupied->BrakeCtrlPosR < 0.74) GBH */ - if( BrakeCtrlPosition < 0.74 ) - /*mvOccupied->*/BrakeLevelSet( gbh_RP ); - } + if (deltaAcc < 0 && /*GBH mvOccupied->BrakeCtrlPosR*/ BrakeCtrlPosition > 0) { + OK = /*mvOccupied->*/ BrakeLevelAdd(-0.25); + // if ((deltaAcc < 5 * fBrake_a1[0]) && (mvOccupied->BrakeCtrlPosR >= 1.2)) + // mvOccupied->BrakeLevelAdd(-1.0); + /* if (mvOccupied->BrakeCtrlPosR < 0.74) GBH */ + if (BrakeCtrlPosition < 0.74) + /*mvOccupied->*/ BrakeLevelSet(gbh_RP); } if( !OK ) { OK = mvOccupied->DecLocalBrakeLevel(2); @@ -3380,183 +3326,173 @@ bool TController::IncSpeed() if( mvControlling->EnginePowerSource.SourceType == TPowerSource::Accumulator ) { fVoltage = mvControlling->BatteryVoltage; } - if (!IsAnyMotorOverloadRelayOpen - && !mvControlling->ControlPressureSwitch) { - if (mvControlling->IsMainCtrlNoPowerPos() - || mvControlling->StLinFlag) { // youBy polecił dodać 2012-09-08 v367 - // na pozycji 0 przejdzie, a na pozostałych będzie czekać, aż się załączą liniowe (zgaśnie DelayCtrlFlag) - if (Ready || iDrivigFlags & movePress) { - auto const usehighoverloadrelaythreshold { - mvControlling->TrainType != dt_ET42 // ET42 uses these variables for different purpose. TODO: fix this - && mvControlling->ImaxHi > mvControlling->ImaxLo - && mvOccupied->Vel < (mvControlling->IsMotorOverloadRelayHighThresholdOn() ? 30.0 : 20.0) - && iVehicles - ControlledEnginesCount > 0 -// && ( std::fabs( mvControlling->Im ) > 0.85 * mvControlling->Imax ) - && mvControlling->Imax * mvControlling->EngineVoltage * ControlledEnginesCount / - (fMass * (fAccGravity == 0.025 ? -0.01 : // prevent div/0 - fAccGravity - 0.025)) < - -2.8 }; - // use series mode: - // if high threshold is set for motor overload relay, - // if the power station is heavily burdened, - // if it generates enough traction force - // to build up speed to 30/40 km/h for passenger/cargo train (10 km/h less if going uphill) - auto const sufficienttractionforce { std::abs( mvControlling->Ft ) * ControlledEnginesCount > ( IsHeavyCargoTrain ? 75 : 50 ) * 1000.0 }; - auto const sufficientacceleration { AbsAccS >= ( IsHeavyCargoTrain ? 0.03 : IsCargoTrain ? 0.06 : 0.09 ) }; - auto const seriesmodefieldshunting { mvControlling->ScndCtrlPos > 0 && mvControlling->RList[mvControlling->MainCtrlPos].Bn == 1 }; - auto const parallelmodefieldshunting { mvControlling->ScndCtrlPos > 0 && mvControlling->RList[mvControlling->MainCtrlPos].Bn > 1 }; - auto const minvoltage { ( mvPantographUnit->EnginePowerSource.SourceType == TPowerSource::CurrentCollector ? mvPantographUnit->EnginePowerSource.CollectorParameters.MinV : 0.0 ) }; - auto const maxvoltage { ( mvPantographUnit->EnginePowerSource.SourceType == TPowerSource::CurrentCollector ? mvPantographUnit->EnginePowerSource.CollectorParameters.MaxV : 0.0 ) }; - auto const seriesmodevoltage { - std::lerp( - minvoltage, - maxvoltage, - IsHeavyCargoTrain ? 0.35 : 0.40 ) }; - auto const useseriesmode = mvControlling->Imax > mvControlling->ImaxLo || true == usehighoverloadrelaythreshold || fVoltage < seriesmodevoltage || - (true == sufficientacceleration && true == sufficienttractionforce && - mvOccupied->Vel <= (IsCargoTrain ? 40 : 30) + (seriesmodefieldshunting ? 5 : 0) - (fAccGravity < -0.025 ? 10 : 0)); - // when not in series mode use the first available parallel mode configuration until 50/60 km/h for passenger/cargo train - // (if there's only one parallel mode configuration it'll be used regardless of current speed) - auto const usefieldshunting = mvControlling->StLinFlag && mvControlling->RList[mvControlling->MainCtrlPos].R < 0.01 && - (useseriesmode ? mvControlling->RList[mvControlling->MainCtrlPos].Bn == 1 : - true == sufficientacceleration && true == sufficienttractionforce && mvOccupied->Vel <= (IsCargoTrain ? 60 : 50) + (parallelmodefieldshunting ? 5 : 0) ? - mvControlling->RList[mvControlling->MainCtrlPos].Bn > 1 : - mvControlling->MainCtrlPos == mvControlling->MainCtrlPosNo); + if (!IsAnyMotorOverloadRelayOpen && !mvControlling->ControlPressureSwitch && (mvControlling->IsMainCtrlNoPowerPos() || mvControlling->StLinFlag) && (Ready || iDrivigFlags & movePress)) { + // youBy polecił dodać 2012-09-08 v367 + // na pozycji 0 przejdzie, a na pozostałych będzie czekać, aż się załączą liniowe (zgaśnie DelayCtrlFlag) + auto const usehighoverloadrelaythreshold{mvControlling->TrainType != dt_ET42 // ET42 uses these variables for different purpose. TODO: fix this + && mvControlling->ImaxHi > mvControlling->ImaxLo && mvOccupied->Vel < (mvControlling->IsMotorOverloadRelayHighThresholdOn() ? 30.0 : 20.0) && + iVehicles - ControlledEnginesCount > 0 + // && ( std::fabs( mvControlling->Im ) > 0.85 * mvControlling->Imax ) + && mvControlling->Imax * mvControlling->EngineVoltage * ControlledEnginesCount / + (fMass * (fAccGravity == 0.025 ? -0.01 : // prevent div/0 + fAccGravity - 0.025)) < + -2.8}; + // use series mode: + // if high threshold is set for motor overload relay, + // if the power station is heavily burdened, + // if it generates enough traction force + // to build up speed to 30/40 km/h for passenger/cargo train (10 km/h less if going uphill) + auto const sufficienttractionforce{std::abs(mvControlling->Ft) * ControlledEnginesCount > (IsHeavyCargoTrain ? 75 : 50) * 1000.0}; + auto const sufficientacceleration{AbsAccS >= (IsHeavyCargoTrain ? 0.03 : IsCargoTrain ? 0.06 : 0.09)}; + auto const seriesmodefieldshunting{mvControlling->ScndCtrlPos > 0 && mvControlling->RList[mvControlling->MainCtrlPos].Bn == 1}; + auto const parallelmodefieldshunting{mvControlling->ScndCtrlPos > 0 && mvControlling->RList[mvControlling->MainCtrlPos].Bn > 1}; + auto const minvoltage{(mvPantographUnit->EnginePowerSource.SourceType == TPowerSource::CurrentCollector ? mvPantographUnit->EnginePowerSource.CollectorParameters.MinV : 0.0)}; + auto const maxvoltage{(mvPantographUnit->EnginePowerSource.SourceType == TPowerSource::CurrentCollector ? mvPantographUnit->EnginePowerSource.CollectorParameters.MaxV : 0.0)}; + auto const seriesmodevoltage{std::lerp(minvoltage, maxvoltage, IsHeavyCargoTrain ? 0.35 : 0.40)}; + auto const useseriesmode = mvControlling->Imax > mvControlling->ImaxLo || true == usehighoverloadrelaythreshold || fVoltage < seriesmodevoltage || + (true == sufficientacceleration && true == sufficienttractionforce && + mvOccupied->Vel <= (IsCargoTrain ? 40 : 30) + (seriesmodefieldshunting ? 5 : 0) - (fAccGravity < -0.025 ? 10 : 0)); + // when not in series mode use the first available parallel mode configuration until 50/60 km/h for passenger/cargo train + // (if there's only one parallel mode configuration it'll be used regardless of current speed) + auto const usefieldshunting = mvControlling->StLinFlag && mvControlling->RList[mvControlling->MainCtrlPos].R < 0.01 && + (useseriesmode ? mvControlling->RList[mvControlling->MainCtrlPos].Bn == 1 : + true == sufficientacceleration && true == sufficienttractionforce && mvOccupied->Vel <= (IsCargoTrain ? 60 : 50) + (parallelmodefieldshunting ? 5 : 0) ? + mvControlling->RList[mvControlling->MainCtrlPos].Bn > 1 : + mvControlling->MainCtrlPos == mvControlling->MainCtrlPosNo); - // if needed enable high threshold for overload relay... - if( mvControlling->TrainType != dt_ET42 ) { // ET42 uses these variables for different purpose. TODO: fix this - if( usehighoverloadrelaythreshold ) { - if( mvControlling->Imax < mvControlling->ImaxHi ) { - // to enable this setting we'll typically need the main controller in series mode (which is not guaranteed) - if( mvControlling->RList[ mvControlling->MainCtrlPos ].Bn > 1 ) { - if( false == mvControlling->IsScndCtrlNoPowerPos() ) { - mvControlling->DecScndCtrl( 2 ); - } - while( false == mvControlling->IsMainCtrlNoPowerPos() - && mvControlling->RList[mvControlling->MainCtrlPos].Bn > 1 ) { - mvControlling->DecMainCtrl( 1 ); // kręcimy nastawnik jazdy o 1 wstecz - } - } - mvControlling->CurrentSwitch( true ); // rozruch wysoki (za to może się ślizgać) - } - } - // ...or disable high threshold for overload relay if no longer needed - else { - if( mvControlling->IsMotorOverloadRelayHighThresholdOn() - && std::fabs(mvControlling->Im) < mvControlling->ImaxLo ) { - mvControlling->CurrentSwitch( false ); // rozruch wysoki wyłącz - } - } - } - - double Vs = 99999; - if( usefieldshunting ? - mvControlling->ScndCtrlPos < mvControlling->ScndCtrlPosNo : - mvControlling->MainCtrlPos < mvControlling->MainCtrlPosNo ) { - Vs = ESMVelocity( !usefieldshunting ); - } - - if( std::abs(mvControlling->Im) < (fReady < 0.4 ? mvControlling->Imin : mvControlling->IminLo) - || mvControlling->Vel > Vs ) { - // Ra: wywalał nadmiarowy, bo Im może być ujemne; jak nie odhamowany, to nie przesadzać z prądem - if( usefieldshunting ) { - // to dać bocznik - // engage the shuntfield only if there's sufficient power margin to draw from - auto const sufficientpowermargin { fVoltage - seriesmodevoltage > ( IsHeavyCargoTrain ? 100.0 : 75.0 ) * ControlledEnginesCount }; - - OK = sufficientpowermargin ? mvControlling->IncScndCtrl(1) : true; - } - else { - // jeśli ustawiony bocznik to bocznik na zero po chamsku - if( mvControlling->ScndCtrlPos ) { - mvControlling->DecScndCtrl( 2 ); - } - // kręcimy nastawnik jazdy - // don't draw too much power; - // keep from dropping into series mode when entering/using parallel mode, and from shutting down in the series mode - auto const sufficientpowermargin { - fVoltage - ( - mvControlling->RList[ std::min( mvControlling->MainCtrlPos + 1, mvControlling->MainCtrlPosNo ) ].Bn == 1 ? - minvoltage : - seriesmodevoltage ) - > ( IsHeavyCargoTrain ? 100.0 : 75.0 ) * ControlledEnginesCount }; - - OK = sufficientpowermargin && false == mvControlling->DelayCtrlFlag ? mvControlling->IncMainCtrl(1) : true; - // czekaj na 1 pozycji, zanim się nie włączą liniowe - if( true == mvControlling->StLinFlag ) { - iDrivigFlags |= moveIncSpeed; - } - else { - iDrivigFlags &= ~moveIncSpeed; - } - - if( mvControlling->Im == 0 - && mvControlling->MainCtrlPowerPos() > 1 ) { - // brak prądu na dalszych pozycjach - // nie załączona lokomotywa albo wywalił nadmiarowy - Need_TryAgain = true; - } - } + // if needed enable high threshold for overload relay... + if (mvControlling->TrainType != dt_ET42) + { // ET42 uses these variables for different purpose. TODO: fix this + if (usehighoverloadrelaythreshold) + { + if (mvControlling->Imax < mvControlling->ImaxHi) + { + // to enable this setting we'll typically need the main controller in series mode (which is not guaranteed) + if (mvControlling->RList[mvControlling->MainCtrlPos].Bn > 1) + { + if (false == mvControlling->IsScndCtrlNoPowerPos()) + { + mvControlling->DecScndCtrl(2); + } + while (false == mvControlling->IsMainCtrlNoPowerPos() && mvControlling->RList[mvControlling->MainCtrlPos].Bn > 1) + { + mvControlling->DecMainCtrl(1); // kręcimy nastawnik jazdy o 1 wstecz + } + } + mvControlling->CurrentSwitch(true); // rozruch wysoki (za to może się ślizgać) } - else { - OK = false; - } } - } - } + // ...or disable high threshold for overload relay if no longer needed + else + { + if (mvControlling->IsMotorOverloadRelayHighThresholdOn() && std::fabs(mvControlling->Im) < mvControlling->ImaxLo) + { + mvControlling->CurrentSwitch(false); // rozruch wysoki wyłącz + } + } + } + + double Vs = 99999; + if (usefieldshunting ? mvControlling->ScndCtrlPos < mvControlling->ScndCtrlPosNo : mvControlling->MainCtrlPos < mvControlling->MainCtrlPosNo) + { + Vs = ESMVelocity(!usefieldshunting); + } + + if (std::abs(mvControlling->Im) < (fReady < 0.4 ? mvControlling->Imin : mvControlling->IminLo) || mvControlling->Vel > Vs) + { + // Ra: wywalał nadmiarowy, bo Im może być ujemne; jak nie odhamowany, to nie przesadzać z prądem + if (usefieldshunting) + { + // to dać bocznik + // engage the shuntfield only if there's sufficient power margin to draw from + auto const sufficientpowermargin{fVoltage - seriesmodevoltage > (IsHeavyCargoTrain ? 100.0 : 75.0) * ControlledEnginesCount}; + + OK = sufficientpowermargin ? mvControlling->IncScndCtrl(1) : true; + } + else + { + // jeśli ustawiony bocznik to bocznik na zero po chamsku + if (mvControlling->ScndCtrlPos) + { + mvControlling->DecScndCtrl(2); + } + // kręcimy nastawnik jazdy + // don't draw too much power; + // keep from dropping into series mode when entering/using parallel mode, and from shutting down in the series mode + auto const sufficientpowermargin{fVoltage - + (mvControlling->RList[std::min(mvControlling->MainCtrlPos + 1, mvControlling->MainCtrlPosNo)].Bn == 1 ? minvoltage : seriesmodevoltage) > + (IsHeavyCargoTrain ? 100.0 : 75.0) * ControlledEnginesCount}; + + OK = sufficientpowermargin && false == mvControlling->DelayCtrlFlag ? mvControlling->IncMainCtrl(1) : true; + // czekaj na 1 pozycji, zanim się nie włączą liniowe + if (true == mvControlling->StLinFlag) + { + iDrivigFlags |= moveIncSpeed; + } + else + { + iDrivigFlags &= ~moveIncSpeed; + } + + if (mvControlling->Im == 0 && mvControlling->MainCtrlPowerPos() > 1) + { + // brak prądu na dalszych pozycjach + // nie załączona lokomotywa albo wywalił nadmiarowy + Need_TryAgain = true; + } + } + } + else + { + OK = false; + } + } // mvControlling->AutoRelayCheck(); // sprawdzenie logiki sterowania break; case TEngineType::Dumb: - if (!IsAnyMotorOverloadRelayOpen) - if (Ready || iDrivigFlags & movePress) //{(BrakePress<=0.01*MaxBrakePress)} - { - OK = IncSpeedEIM(); - if( !OK ) - OK = mvControlling->IncMainCtrl(1); - if (!OK) - OK = mvControlling->IncScndCtrl(1); - } - break; + if (!IsAnyMotorOverloadRelayOpen && (Ready || iDrivigFlags & movePress)) + //{(BrakePress<=0.01*MaxBrakePress)} + { + OK = IncSpeedEIM(); + if (!OK) + OK = mvControlling->IncMainCtrl(1); + if (!OK) + OK = mvControlling->IncScndCtrl(1); + } + break; case TEngineType::DieselElectric: - if (!IsAnyMotorOverloadRelayOpen - && !mvControlling->ControlPressureSwitch) { - if (mvControlling->IsMainCtrlNoPowerPos() || - mvControlling->StLinFlag) { // youBy polecił dodać 2012-09-08 v367 - // na pozycji 0 przejdzie, a na pozostałych będzie czekać, aż się załączą liniowe (zgaśnie DelayCtrlFlag) - if (Ready || iDrivigFlags & movePress) //{(BrakePress<=0.01*MaxBrakePress)} - { - OK = IncSpeedEIM(); - if( !OK ) - OK = mvControlling->IncMainCtrl(1); - if (!OK) - OK = mvControlling->IncScndCtrl(1); - } - } - } + if (!IsAnyMotorOverloadRelayOpen && !mvControlling->ControlPressureSwitch && (mvControlling->IsMainCtrlNoPowerPos() || mvControlling->StLinFlag) && (Ready || iDrivigFlags & movePress)) { + // youBy polecił dodać 2012-09-08 v367 + // na pozycji 0 przejdzie, a na pozostałych będzie czekać, aż się załączą liniowe (zgaśnie DelayCtrlFlag) + //{(BrakePress<=0.01*MaxBrakePress)} + OK = IncSpeedEIM(); + if (!OK) + OK = mvControlling->IncMainCtrl(1); + if (!OK) + OK = mvControlling->IncScndCtrl(1); + } break; case TEngineType::ElectricInductionMotor: - if( !IsAnyMotorOverloadRelayOpen ) { - if( Ready || iDrivigFlags & movePress || mvOccupied->ShuntMode ) //{(BrakePress<=0.01*MaxBrakePress)} - { - OK = IncSpeedEIM(); - if( mvControlling->SpeedCtrl && mvControlling->Mains ) { - // cruise control - auto const couplinginprogress{ true == TestFlag(iDrivigFlags, moveConnect) && true == TestFlag(OrderCurrentGet(), Connect) }; - auto const SpeedCntrlVel{ ( - ActualProximityDist > std::max(50.0, fMaxProximityDist) || couplinginprogress ? - VelDesired : - min_speed( VelDesired, VelNext ) ) }; - if( SpeedCntrlVel >= mvControlling->SpeedCtrlUnit.MinVelocity - && SpeedCntrlVel - mvControlling->SpeedCtrlUnit.MinVelocity == quantize(SpeedCntrlVel - mvControlling->SpeedCtrlUnit.MinVelocity, mvControlling->SpeedCtrlUnit.VelocityStep) ) { - SpeedCntrl( SpeedCntrlVel ); - } - else if( SpeedCntrlVel > 0.1 ) { - SpeedCntrl( 0.0 ); - mvControlling->DecScndCtrl( 2 ); - } - } - } - } + if( !IsAnyMotorOverloadRelayOpen && (Ready || iDrivigFlags & movePress || mvOccupied->ShuntMode) ) { + //{(BrakePress<=0.01*MaxBrakePress)} + OK = IncSpeedEIM(); + if (mvControlling->SpeedCtrl && mvControlling->Mains) + { + // cruise control + auto const couplinginprogress{true == TestFlag(iDrivigFlags, moveConnect) && true == TestFlag(OrderCurrentGet(), Connect)}; + auto const SpeedCntrlVel{(ActualProximityDist > std::max(50.0, fMaxProximityDist) || couplinginprogress ? VelDesired : min_speed(VelDesired, VelNext))}; + if (SpeedCntrlVel >= mvControlling->SpeedCtrlUnit.MinVelocity && + SpeedCntrlVel - mvControlling->SpeedCtrlUnit.MinVelocity == quantize(SpeedCntrlVel - mvControlling->SpeedCtrlUnit.MinVelocity, mvControlling->SpeedCtrlUnit.VelocityStep)) + { + SpeedCntrl(SpeedCntrlVel); + } + else if (SpeedCntrlVel > 0.1) + { + SpeedCntrl(0.0); + mvControlling->DecScndCtrl(2); + } + } + } break; case TEngineType::WheelsDriven: if (!mvControlling->CabActive) @@ -3633,10 +3569,10 @@ bool TController::DecSpeed(bool force) { case TEngineType::None: // McZapkie-041003: wagon sterowniczy iDrivigFlags &= ~moveIncSpeed; // usunięcie flagi jazdy - if (force) // przy aktywacji kabiny jest potrzeba natychmiastowego wyzerowania - if (mvControlling->MainCtrlPosNo > 0) // McZapkie-041003: wagon sterowniczy, np. EZT - mvControlling->DecMainCtrl( std::min( mvControlling->MainCtrlPowerPos(), 2 ) ); -// mvControlling->AutoRelayCheck(); // sprawdzenie logiki sterowania + if (force && mvControlling->MainCtrlPosNo > 0) // przy aktywacji kabiny jest potrzeba natychmiastowego wyzerowania + // McZapkie-041003: wagon sterowniczy, np. EZT + mvControlling->DecMainCtrl(std::min(mvControlling->MainCtrlPowerPos(), 2)); + // mvControlling->AutoRelayCheck(); // sprawdzenie logiki sterowania return false; case TEngineType::ElectricSeriesMotor: OK = mvControlling->DecScndCtrl(2); // najpierw bocznik na zero @@ -3927,17 +3863,15 @@ void TController::SpeedSet() { } } // jak prędkość mniejsza niż minimalna na danym biegu, wrzucić niższy - else if( velocity < motorparams.fi ) { + else if( velocity < motorparams.fi && mvControlling->ScndCtrlPos > 1 ) { // ... but ensure we don't switch all way down to 0 - if( mvControlling->ScndCtrlPos > 1 ) { - mvControlling->DecMainCtrl( 2 ); - while( mvControlling->ScndCtrlPos > 1 // repeat the entry check as we're working in a loop - && mvControlling->DecScndCtrl(1) - && mvControlling->MotorParam[mvControlling->ScndCtrlPos].mIsat == 0.0 ) { // jeśli bieg jałowy to kolejny - ; - } - } - } + mvControlling->DecMainCtrl(2); + while (mvControlling->ScndCtrlPos > 1 // repeat the entry check as we're working in a loop + && mvControlling->DecScndCtrl(1) && mvControlling->MotorParam[mvControlling->ScndCtrlPos].mIsat == 0.0) + { // jeśli bieg jałowy to kolejny + ; + } + } } break; } @@ -4149,37 +4083,40 @@ void TController::SetTimeControllers() } } // 5.5 universal control for diesel electric vehicles - if (mvControlling->EngineType == TEngineType::DieselElectric && mvControlling->EIMCtrlType == 3) + if (mvControlling->EngineType == TEngineType::DieselElectric && mvControlling->EIMCtrlType == 3 && AccDesired >= 0.0 && mvControlling->StLinFlag) { // NOTE: partial implementation for speedinc/dec // TBD, TODO: implement fully? - if( AccDesired >= 0.0 - && mvControlling->StLinFlag ) { + auto const PosInc{mvControlling->MainCtrlPosNo}; + auto PosKeep{0}; + auto PosDec{0}; + for (int i = PosInc; i >= 0; --i) + { + if (mvControlling->UniCtrlList[i].SetCtrlVal <= 0) + { + if (mvControlling->UniCtrlList[i].SpeedDown == 0.0) + { + PosKeep = i; + } + if (mvControlling->UniCtrlList[i].SpeedDown > 0.01) + { + PosDec = i; + break; + } + } + } - auto const PosInc { mvControlling->MainCtrlPosNo }; - auto PosKeep { 0 }; - auto PosDec{ 0 }; - for( int i = PosInc; i >= 0; --i ) { - if( mvControlling->UniCtrlList[ i ].SetCtrlVal <= 0 ) { - if( mvControlling->UniCtrlList[ i ].SpeedDown == 0.0 ) { - PosKeep = i; - } - if( mvControlling->UniCtrlList[ i ].SpeedDown > 0.01 ) { - PosDec = i; - break; - } - } - } + auto const DesiredPos{(AccDesired > AbsAccS + 0.05 ? PosInc : AccDesired < AbsAccS - 0.05 ? PosDec : PosKeep)}; - auto const DesiredPos { ( - AccDesired > AbsAccS + 0.05 ? PosInc : - AccDesired < AbsAccS - 0.05 ? PosDec : - PosKeep ) }; - - while( mvControlling->MainCtrlPos > DesiredPos && mvControlling->DecMainCtrl( 1 ) ) { ; } - while( mvControlling->MainCtrlPos < DesiredPos && mvControlling->IncMainCtrl( 1 ) ) { ; } - } - } + while (mvControlling->MainCtrlPos > DesiredPos && mvControlling->DecMainCtrl(1)) + { + ; + } + while (mvControlling->MainCtrlPos < DesiredPos && mvControlling->IncMainCtrl(1)) + { + ; + } + } //6. UniversalBrakeButtons //6.1. Checking flags for Over pressure if (std::abs(BrakeCtrlPosition - gbh_FS)<0.5) { @@ -4228,12 +4165,9 @@ void TController::CheckTimeControllers() } } //4. Check Speed Control System - if (mvOccupied->EngineType == TEngineType::ElectricInductionMotor && mvOccupied->ScndCtrlPosNo>1 && mvOccupied->SpeedCtrlTypeTime) + if (mvOccupied->EngineType == TEngineType::ElectricInductionMotor && mvOccupied->ScndCtrlPosNo > 1 && mvOccupied->SpeedCtrlTypeTime && mvOccupied->ScndCtrlPosNo == 4) { - if (mvOccupied->ScndCtrlPosNo == 4) - { - mvOccupied->ScndCtrlPos = 2; - } + mvOccupied->ScndCtrlPos = 2; } //5. Check Main Controller in Dizels @@ -4315,15 +4249,12 @@ void TController::Doors( bool const Open, int const Side ) { return; } - if( true == doors_open() ) { + if( true == doors_open() && (pVehicle->MoverParameters->Doors.close_control == control_t::conductor || pVehicle->MoverParameters->Doors.close_control == control_t::driver || + pVehicle->MoverParameters->Doors.close_control == control_t::mixed) ) { // consist-wide remote signals to close doors - if( pVehicle->MoverParameters->Doors.close_control == control_t::conductor - || pVehicle->MoverParameters->Doors.close_control == control_t::driver - || pVehicle->MoverParameters->Doors.close_control == control_t::mixed ) { - cue_action( driver_hint::doorrightclose ); - cue_action( driver_hint::doorleftclose ); - } - } + cue_action(driver_hint::doorrightclose); + cue_action(driver_hint::doorleftclose); + } if( true == doors_permit_active() ) { cue_action( driver_hint::doorrightpermitoff ); cue_action( driver_hint::doorleftpermitoff ); @@ -5058,15 +4989,13 @@ void TController::JumpToNextOrder( bool const Ignoremergedchangedirection ) if (OrderList[OrderPos] != Wait_for_orders) { if( (OrderList[OrderPos] & Change_direction) != 0 // jeśli zmiana kierunku - && OrderList[OrderPos] != Change_direction ) { // ale nałożona na coś + && OrderList[OrderPos] != Change_direction && false == Ignoremergedchangedirection ) { // ale nałożona na coś - if( false == Ignoremergedchangedirection ) { - // usunięcie zmiany kierunku z innej komendy - OrderList[ OrderPos ] = TOrders( OrderList[ OrderPos ] & ~Change_direction ); - OrderCheck(); - return; - } - } + // usunięcie zmiany kierunku z innej komendy + OrderList[OrderPos] = TOrders(OrderList[OrderPos] & ~Change_direction); + OrderCheck(); + return; + } if (OrderPos < maxorders - 1) ++OrderPos; else @@ -5142,9 +5071,10 @@ void TController::OrderNext(TOrders NewOrder) void TController::OrderPush(TOrders NewOrder) { // zapisanie na stosie kolejnego rozkazu do wykonania - if (OrderPos == OrderTop) // jeśli miałby być zapis na aktalnej pozycji - if (OrderList[OrderPos] < Shunt) // ale nie jedzie - ++OrderTop; // niektóre operacje muszą zostać najpierw dokończone => zapis na kolejnej + if (OrderPos == OrderTop && OrderList[OrderPos] < Shunt) // jeśli miałby być zapis na aktalnej pozycji + // ale nie jedzie + ++OrderTop; + // niektóre operacje muszą zostać najpierw dokończone => zapis na kolejnej if (OrderList[OrderTop] != NewOrder) // jeśli jest to samo, to nie dodajemy OrderList[OrderTop++] = NewOrder; // dodanie rozkazu na stos // if (OrderTop" : " " ) + (std::to_string(b) + ": " + Order2Str(OrderList[b]))); - if (b) // z wyjątkiem pierwszej pozycji - if (OrderList[b] == Wait_for_orders) // jeśli końcowa komenda - break; // dalej nie trzeba + if (b && OrderList[b] == Wait_for_orders) // z wyjątkiem pierwszej pozycji + // jeśli końcowa komenda + break; + // dalej nie trzeba } }; @@ -5523,66 +5454,64 @@ TCommandType TController::BackwardScan( double const Range ) } } // reakcja AI w trybie manewrowym dodatkowo na sygnały manewrowe - if (OrderCurrentGet() ? OrderCurrentGet() & (Shunt | Loose_shunt | Connect) : - true) // w Wait_for_orders też widzi tarcze + if ((OrderCurrentGet() ? OrderCurrentGet() & (Shunt | Loose_shunt | Connect) : true) && (move || e->input_command() == TCommandType::cm_ShuntVelocity)) // w Wait_for_orders też widzi tarcze { - if (move || e->input_command() == TCommandType::cm_ShuntVelocity) - { // jeśli powyżej było SetVelocity 0 0, to dociągamy pod S1 -/* - if ((scandist > fMinProximityDist) && - ((mvOccupied->Vel > EU07_AI_NOMOVEMENT) || (scanvel == 0.0))) - { - // jeśli tarcza jest daleko, to: - //- jesli pojazd jedzie, to informujemy o zmianie prędkości - //- jeśli stoi, to z własnej inicjatywy może podjechać pod zamkniętą tarczę - if (mvOccupied->Vel > EU07_AI_NOMOVEMENT) // tylko jeśli jedzie - { // Mechanik->PutCommand("SetProximityVelocity",scandist,scanvel,sl); -#if LOGBACKSCAN - // WriteLog(edir+"SetProximityVelocity "+AnsiString(scandist)+" - // "+AnsiString(scanvel)); - WriteLog(edir); -#endif - // SetProximityVelocity(scandist,scanvel,&sl); - // jeśli jedzie na W5 albo koniec toru, to można zmienić kierunek - return (iDrivigFlags & moveTrackEnd) ? TCommandType::cm_ChangeDirection : - TCommandType::cm_Unknown; - // TBD: request direction change also if VelNext in current direction is 0, - // while signal behind requests movement? - } - } - else - { - // ustawiamy prędkość tylko wtedy, gdy ma ruszyć, albo stanąć albo ma stać pod - // tarczą stop trzeba powtarzać, bo inaczej zatrąbi i pojedzie sam if - // ((MoverParameters->Vel==0.0)||(scanvel==0.0)) //jeśli jedzie lub ma stanąć/stać - { // nie dostanie komendy jeśli jedzie i ma jechać - // PutCommand("ShuntVelocity",scanvel,e->Params[9].asMemCell->Value2(),&sl,stopSem); -#if LOGBACKSCAN - WriteLog(edir + " - [ShuntVelocity] [" + to_string(scanvel, 2) + "] [" + - to_string(e->input_value(2), 2) + "]"); -#endif - return (scanvel > 0 ? TCommandType::cm_ShuntVelocity : - TCommandType::cm_Unknown); - } - } - // NOTE: dead code due to returns in branching above - if ((scanvel != 0.0) && (scandist < 100.0)) - { - // jeśli Tm w odległości do 100m podaje zezwolenie na jazdę, to od razu ją - // ignorujemy, aby móc szukać kolejnej eSignSkip=e; //wtedy uznajemy ignorowaną przy - // poszukiwaniu nowej -#if LOGBACKSCAN - WriteLog(edir + " - will be ignored due to Ms2"); -#endif - return (scanvel > 0 ? TCommandType::cm_ShuntVelocity : TCommandType::cm_Unknown); - } -*/ - return VelNext > 0 ? + // jeśli powyżej było SetVelocity 0 0, to dociągamy pod S1 + /* + if ((scandist > fMinProximityDist) && + ((mvOccupied->Vel > EU07_AI_NOMOVEMENT) || (scanvel == 0.0))) + { + // jeśli tarcza jest daleko, to: + //- jesli pojazd jedzie, to informujemy o zmianie prędkości + //- jeśli stoi, to z własnej inicjatywy może podjechać pod zamkniętą tarczę + if (mvOccupied->Vel > EU07_AI_NOMOVEMENT) // tylko jeśli jedzie + { // Mechanik->PutCommand("SetProximityVelocity",scandist,scanvel,sl); + #if LOGBACKSCAN + // WriteLog(edir+"SetProximityVelocity "+AnsiString(scandist)+" + // "+AnsiString(scanvel)); + WriteLog(edir); + #endif + // SetProximityVelocity(scandist,scanvel,&sl); + // jeśli jedzie na W5 albo koniec toru, to można zmienić kierunek + return (iDrivigFlags & moveTrackEnd) ? TCommandType::cm_ChangeDirection : + TCommandType::cm_Unknown; + // TBD: request direction change also if VelNext in current direction is 0, + // while signal behind requests movement? + } + } + else + { + // ustawiamy prędkość tylko wtedy, gdy ma ruszyć, albo stanąć albo ma stać pod + // tarczą stop trzeba powtarzać, bo inaczej zatrąbi i pojedzie sam if + // ((MoverParameters->Vel==0.0)||(scanvel==0.0)) //jeśli jedzie lub ma stanąć/stać + { // nie dostanie komendy jeśli jedzie i ma jechać + // PutCommand("ShuntVelocity",scanvel,e->Params[9].asMemCell->Value2(),&sl,stopSem); + #if LOGBACKSCAN + WriteLog(edir + " - [ShuntVelocity] [" + to_string(scanvel, 2) + "] [" + + to_string(e->input_value(2), 2) + "]"); + #endif + return (scanvel > 0 ? TCommandType::cm_ShuntVelocity : + TCommandType::cm_Unknown); + } + } + // NOTE: dead code due to returns in branching above + if ((scanvel != 0.0) && (scandist < 100.0)) + { + // jeśli Tm w odległości do 100m podaje zezwolenie na jazdę, to od razu ją + // ignorujemy, aby móc szukać kolejnej eSignSkip=e; //wtedy uznajemy ignorowaną przy + // poszukiwaniu nowej + #if LOGBACKSCAN + WriteLog(edir + " - will be ignored due to Ms2"); + #endif + return (scanvel > 0 ? TCommandType::cm_ShuntVelocity : TCommandType::cm_Unknown); + } + */ + return VelNext > 0 ? TCommandType::cm_Unknown : // no need to bother if we can continue in current direction scanvel == 0 ? TCommandType::cm_Unknown : // no need to bother with a stop signal TCommandType::cm_ShuntVelocity; // otherwise report a relevant shunt signal behind - } // if (move?... + // if (move?... } // if (OrderCurrentGet()==Shunt) return e->m_passive && e->is_command() ? TCommandType::cm_Command : TCommandType::cm_Unknown; @@ -5978,25 +5907,19 @@ TController::determine_consist_state() { Ready = false; } // Ra: odluźnianie przeładowanych lokomotyw, ciągniętych na zimno - prowizorka... - if( bp >= 0.4 ) { // wg UIC określone sztywno na 0.04 - if( AIControllFlag || (Global.AITrainman && mvOccupied->Vel < EU07_AI_NOMOVEMENT && !is_emu() && !is_dmu())) { - if( BrakeCtrlPosition == gbh_RP // jest pozycja jazdy - && false == TestFlag(vehicle->Hamulec->GetBrakeStatus(), b_dmg) // brake isn't broken - && vehicle->PipePress - mvOccupied->Handle->GetRP() > -0.1 // jeśli ciśnienie jak dla jazdy - && vehicle->Hamulec->GetCRP() > vehicle->PipePress + 0.12 ) { // za dużo w zbiorniku - // indywidualne luzowanko - vehicle->BrakeReleaser( 1 ); - } - } - } - if (bp < 0.1) { - if ( AIControllFlag || Global.AITrainman ) { - if (false == TestFlag(vehicle->Hamulec->GetBrakeStatus(), b_dmg) // brake isn't broken - && vehicle->Hamulec->GetCRP() < vehicle->PipePress - 0.1 ) { // już nie jest za dużo w zbiorniku - // koniec indywidualnego luzowanka - vehicle->BrakeReleaser( 0 ); - } - } + if( bp >= 0.4 && (AIControllFlag || Global.AITrainman && mvOccupied->Vel < EU07_AI_NOMOVEMENT && !is_emu() && !is_dmu()) && BrakeCtrlPosition == gbh_RP // jest pozycja jazdy + && false == TestFlag(vehicle->Hamulec->GetBrakeStatus(), b_dmg) // brake isn't broken + && vehicle->PipePress - mvOccupied->Handle->GetRP() > -0.1 // jeśli ciśnienie jak dla jazdy + && vehicle->Hamulec->GetCRP() > vehicle->PipePress + 0.12 ) { // wg UIC określone sztywno na 0.04 + // za dużo w zbiorniku + // indywidualne luzowanko + vehicle->BrakeReleaser(1); + } + if (bp < 0.1 && (AIControllFlag || Global.AITrainman) && false == TestFlag(vehicle->Hamulec->GetBrakeStatus(), b_dmg) // brake isn't broken + && vehicle->Hamulec->GetCRP() < vehicle->PipePress - 0.1) { + // już nie jest za dużo w zbiorniku + // koniec indywidualnego luzowanka + vehicle->BrakeReleaser(0); } } fReady = std::max( bp, fReady ); // szukanie najbardziej zahamowanego @@ -6148,13 +6071,11 @@ TController::control_pantographs() { // uśrednione napięcie sieci: przy spadku poniżej wartości minimalnej opóźnić rozruch o losowy czas fVoltage = 0.5 * (fVoltage + std::max( mvControlling->GetTrainsetHighVoltage(), mvControlling->PantographVoltage ) ); - if( fVoltage < mvControlling->EnginePowerSource.CollectorParameters.MinV ) { + if( fVoltage < mvControlling->EnginePowerSource.CollectorParameters.MinV && fActionTime >= PrepareTime ) { // gdy rozłączenie WS z powodu niskiego napięcia - if( fActionTime >= PrepareTime ) { - // jeśli czas oczekiwania nie został ustawiony, losowy czas oczekiwania przed ponownym załączeniem jazdy - fActionTime = -2.0 - Random( 10 ); - } - } + // jeśli czas oczekiwania nie został ustawiony, losowy czas oczekiwania przed ponownym załączeniem jazdy + fActionTime = -2.0 - Random(10); + } // raise/lower pantographs as needed auto const useregularpantographlayout { @@ -6203,24 +6124,23 @@ TController::control_pantographs() { } } - if( mvOccupied->Vel > 5 ) { + if( mvOccupied->Vel > 5 && mvPantographUnit->EnginePowerSource.CollectorParameters.CollectorsNo > 1 ) { // opuszczenie przedniego po rozpędzeniu się o ile jest więcej niż jeden - if( mvPantographUnit->EnginePowerSource.CollectorParameters.CollectorsNo > 1 ) { - if( iDirection >= 0 && useregularpantographlayout ) // jak jedzie w kierunku sprzęgu 0 - { // poczekać na podniesienie tylnego - if( mvPantographUnit->PantFrontVolt != 0.0 - && mvPantographUnit->PantRearVolt != 0.0 ) { // czy jest napięcie zasilające na tylnym? - cue_action( driver_hint::frontpantographvalveoff ); // opuszcza od sprzęgu 0 - } - } - else { // poczekać na podniesienie przedniego - if( mvPantographUnit->PantRearVolt != 0.0 - && mvPantographUnit->PantFrontVolt != 0.0 ) { // czy jest napięcie zasilające na przednim? - cue_action( driver_hint::rearpantographvalveoff ); // opuszcza od sprzęgu 1 - } - } - } - } + if (iDirection >= 0 && useregularpantographlayout) // jak jedzie w kierunku sprzęgu 0 + { // poczekać na podniesienie tylnego + if (mvPantographUnit->PantFrontVolt != 0.0 && mvPantographUnit->PantRearVolt != 0.0) + { // czy jest napięcie zasilające na tylnym? + cue_action(driver_hint::frontpantographvalveoff); // opuszcza od sprzęgu 0 + } + } + else + { // poczekać na podniesienie przedniego + if (mvPantographUnit->PantRearVolt != 0.0 && mvPantographUnit->PantFrontVolt != 0.0) + { // czy jest napięcie zasilające na przednim? + cue_action(driver_hint::rearpantographvalveoff); // opuszcza od sprzęgu 1 + } + } + } } else { @@ -6237,26 +6157,29 @@ TController::control_pantographs() { } } else { - if( mvOccupied->AIHintPantUpIfIdle - && IdleTime > 45.0 - // NOTE: abs(stoptime) covers either at least 15 sec remaining for a scheduled stop, or 15+ secs spent at a basic stop - && std::abs(fStopTime) > 15.0 ) { - // spending a longer at a stop, raise also front pantograph - if( mvPantographUnit->EnginePowerSource.CollectorParameters.CollectorsNo > 1 ) { - if( iDirection >= 0 && useregularpantographlayout ) { - // jak jedzie w kierunku sprzęgu 0 - if( mvPantographUnit->PantFrontVolt == 0.0 ) { - cue_action( driver_hint::frontpantographvalveon, 5 ); // discard the hint if speed exceeds 5 km/h - } - } - else { - if( mvPantographUnit->PantRearVolt == 0.0 ) { - cue_action( driver_hint::rearpantographvalveon, 5 ); // discard the hint if speed exceeds 5 km/h - } - } - } - } - } + if( !mvOccupied->AIHintPantUpIfIdle || IdleTime <= 45.0 || std::abs(fStopTime) <= 15.0 || mvPantographUnit->EnginePowerSource.CollectorParameters.CollectorsNo <= 1 ) + { + } + else + { + // spending a longer at a stop, raise also front pantograph + if (iDirection >= 0 && useregularpantographlayout) + { + // jak jedzie w kierunku sprzęgu 0 + if (mvPantographUnit->PantFrontVolt == 0.0) + { + cue_action(driver_hint::frontpantographvalveon, 5); // discard the hint if speed exceeds 5 km/h + } + } + else + { + if (mvPantographUnit->PantRearVolt == 0.0) + { + cue_action(driver_hint::rearpantographvalveon, 5); // discard the hint if speed exceeds 5 km/h + } + } + } + } } void @@ -6465,25 +6388,21 @@ TController::control_doors() { // HACK: crude way to deal with automatic door opening on W4 preventing further ride // for human-controlled vehicles with no door control and dynamic brake auto-activating with door open // TODO: check if this situation still happens and the hack is still needed - if( false == AIControllFlag ) { + if( false == AIControllFlag && (mvControlling->EngineType == TEngineType::DieselEngine ? mvControlling->RList[mvControlling->MainCtrlPos].Mn > 0 : mvControlling->MainCtrlPowerPos() > 0) ) { // for diesel engines react when engine is put past idle revolutions // for others straightforward master controller check - if( mvControlling->EngineType == TEngineType::DieselEngine ? mvControlling->RList[mvControlling->MainCtrlPos].Mn > 0 : mvControlling->MainCtrlPowerPos() > 0 ) { - Doors( false ); - return; - } - } + Doors(false); + return; + } } void TController::UpdateCommand() { - if( false == mvOccupied->CommandIn.Command.empty() ) { - if( false == mvOccupied->RunInternalCommand() ) { - // rozpoznaj komende bo lokomotywa jej nie rozpoznaje - RecognizeCommand(); // samo czyta komendę wstawioną do pojazdu? - } - } + if( false == mvOccupied->CommandIn.Command.empty() && false == mvOccupied->RunInternalCommand() ) { + // rozpoznaj komende bo lokomotywa jej nie rozpoznaje + RecognizeCommand(); // samo czyta komendę wstawioną do pojazdu? + } } void @@ -6751,12 +6670,10 @@ TController::check_departure() { } } } - else if( VelSignal == 0.0 && VelNext > 0.0 && mvOccupied->Vel < 1.0 ) { - if( iCoupler > 0 || (iDrivigFlags & moveStopHere) == 0 ) { - // Ra: tu jest coś nie tak, bo bez tego warunku ruszało w manewrowym !!!! - SetVelocity( VelNext, VelNext, stopSem ); // omijanie SBL - } - } + else if( VelSignal == 0.0 && VelNext > 0.0 && mvOccupied->Vel < 1.0 && (iCoupler > 0 || (iDrivigFlags & moveStopHere) == 0) ) { + // Ra: tu jest coś nie tak, bo bez tego warunku ruszało w manewrowym !!!! + SetVelocity(VelNext, VelNext, stopSem); // omijanie SBL + } } // verify progress of load exchange @@ -6802,12 +6719,11 @@ TController::UpdateChangeDirection() { // TODO: rework into driver mode independent routine if( false == TestFlag( OrderCurrentGet(), Change_direction ) ) { return; } - if( true == AIControllFlag ) { + if( true == AIControllFlag && mvOccupied->Vel < EU07_AI_NOMOVEMENT ) { // sprobuj zmienic kierunek (może być zmieszane z jeszcze jakąś komendą) - if( mvOccupied->Vel < EU07_AI_NOMOVEMENT ) { - // jeśli się zatrzymał, to zmieniamy kierunek jazdy, a nawet kabinę/człon - Activation(); // ustawienie zadanego wcześniej kierunku i ewentualne przemieszczenie AI - } // Change_direction (tylko dla AI) + // jeśli się zatrzymał, to zmieniamy kierunek jazdy, a nawet kabinę/człon + Activation(); // ustawienie zadanego wcześniej kierunku i ewentualne przemieszczenie AI + // Change_direction (tylko dla AI) } // shared part of the routine, implement if direction matches what was requested if( mvOccupied->Vel < EU07_AI_NOMOVEMENT @@ -6818,15 +6734,13 @@ TController::UpdateChangeDirection() { VelSignalNext = -1; PrepareEngine(); JumpToNextOrder(); // następnie robimy, co jest do zrobienia (Shunt albo Obey_train) - if( OrderCurrentGet() & ( Shunt | Loose_shunt | Connect ) ) { + if( OrderCurrentGet() & (Shunt | Loose_shunt | Connect) && false == TestFlag(iDrivigFlags, moveStopHere) ) { // jeśli dalej mamy manewry - if( false == TestFlag( iDrivigFlags, moveStopHere ) ) { - // o ile nie ma stać w miejscu, - // jechać od razu w przeciwną stronę i nie trąbić z tego tytułu: - iDrivigFlags &= ~moveStartHorn; - SetVelocity( fShuntVelocity, fShuntVelocity ); - } - } + // o ile nie ma stać w miejscu, + // jechać od razu w przeciwną stronę i nie trąbić z tego tytułu: + iDrivigFlags &= ~moveStartHorn; + SetVelocity(fShuntVelocity, fShuntVelocity); + } } } @@ -6906,29 +6820,25 @@ TController::UpdateConnect() { auto *vehicleparameters { vehicle->MoverParameters }; if( vehicleparameters->Couplers[ couplingend ].CouplingFlag != iCoupler ) { auto const &neighbour { vehicleparameters->Neighbours[ couplingend ] }; - if( neighbour.vehicle != nullptr ) { - if( neighbour.distance < 10 ) { - // check whether we need to attach coupler adapter - auto coupleriscompatible { true }; - auto const &coupler { vehicleparameters->Couplers[ couplingend ] }; - if( coupler.type() != TCouplerType::Automatic ) { - auto const &othercoupler = neighbour.vehicle->MoverParameters->Couplers[ ( neighbour.vehicle_end != 2 ? neighbour.vehicle_end : coupler.ConnectedNr ) ]; - if( othercoupler.type() == TCouplerType::Automatic ) { - coupleriscompatible = false; - cue_action( driver_hint::couplingadapterattach, couplingend ); - } - } - // próba podczepienia - if( AIControllFlag || Global.AITrainman ) { - if( coupleriscompatible && neighbour.distance < 2 ) { - vehicleparameters->Attach( - couplingend, neighbour.vehicle_end, - neighbour.vehicle->MoverParameters, - iCoupler ); - } - } - } - } + if( neighbour.vehicle != nullptr && neighbour.distance < 10 ) { + // check whether we need to attach coupler adapter + auto coupleriscompatible{true}; + auto const &coupler{vehicleparameters->Couplers[couplingend]}; + if (coupler.type() != TCouplerType::Automatic) + { + auto const &othercoupler = neighbour.vehicle->MoverParameters->Couplers[(neighbour.vehicle_end != 2 ? neighbour.vehicle_end : coupler.ConnectedNr)]; + if (othercoupler.type() == TCouplerType::Automatic) + { + coupleriscompatible = false; + cue_action(driver_hint::couplingadapterattach, couplingend); + } + } + // próba podczepienia + if ((AIControllFlag || Global.AITrainman) && coupleriscompatible && neighbour.distance < 2) + { + vehicleparameters->Attach(couplingend, neighbour.vehicle_end, neighbour.vehicle->MoverParameters, iCoupler); + } + } } // NOTE: no else as the preceeding block can potentially establish expected connection if( vehicleparameters->Couplers[ couplingend ].CouplingFlag == iCoupler ) { @@ -6943,18 +6853,12 @@ TController::UpdateConnect() { } // moveConnect else { // początek podczepiania, z wyłączeniem sprawdzania fTrackBlock - if( Obstacle.distance <= 20.0 ) { - if( !iCouplingVehicle ) { - // write down which vehicle should be coupled with the target consist, - // so we don't lose track of it if the user does something unexpected - iCouplingVehicle = { - pVehicles[ end::front ], - ( pVehicles[ end::front ]->DirectionGet() > 0 ? - end::front : - end::rear ) }; - iDrivigFlags |= moveConnect; - } - } + if( Obstacle.distance <= 20.0 && !iCouplingVehicle ) { + // write down which vehicle should be coupled with the target consist, + // so we don't lose track of it if the user does something unexpected + iCouplingVehicle = {pVehicles[end::front], (pVehicles[end::front]->DirectionGet() > 0 ? end::front : end::rear)}; + iDrivigFlags |= moveConnect; + } } } @@ -7009,13 +6913,11 @@ TController::UpdateDisconnect() { if( iVehicleCount >= 0 ) { // early test for human drivers, who might disregard the proper procedure, or perform it before they receive the order to - if( false == AIControllFlag ) { + if( false == AIControllFlag && unit_count(iVehicleCount + 2) <= iVehicleCount + 1 ) { // iVehicleCount = 0 means the consist should be reduced to (1) leading unit, thus we increase our test values by 1 - if( unit_count( iVehicleCount + 2 ) <= iVehicleCount + 1 ) { - iVehicleCount = -2; // odczepiono, co było do odczepienia - return; // we'll wrap up the procedure on the next update beat - } - } + iVehicleCount = -2; // odczepiono, co było do odczepienia + return; // we'll wrap up the procedure on the next update beat + } // regular uncoupling procedure, performed by ai and naively expected from the human drivers // 3rd stage: change direction, compress buffers and uncouple if( iDirection != iDirectionOrder ) { @@ -7135,11 +7037,10 @@ TController::handle_engine() { OrderNext( Prepare_engine ); } // basic engine preparation - if( OrderCurrentGet() == Prepare_engine ) { - if( PrepareEngine() ) { // gotowy do drogi? - JumpToNextOrder(); - } - } + if( OrderCurrentGet() == Prepare_engine && PrepareEngine() ) { + // gotowy do drogi? + JumpToNextOrder(); + } // engine state can potentially deteriorate in one of usual driving modes if( OrderCurrentGet() & (Change_direction | Connect | Disconnect | Shunt | Loose_shunt | Obey_train | Bank) && false == iEngineActive ) { @@ -7454,16 +7355,12 @@ TController::adjust_desired_speed_for_limits() { return; // speed limit can't get any lower } - if( ( OrderCurrentGet() & ( Shunt | Loose_shunt | Obey_train | Bank ) ) != 0 ) { + if( (OrderCurrentGet() & (Shunt | Loose_shunt | Obey_train | Bank)) != 0 && (iDrivigFlags & moveStopHere) != 0 && mvOccupied->Vel < 0.01 && VelSignalNext == 0.0 ) { // w Connect nie, bo moveStopHere odnosi się do stanu po połączeniu - if( (iDrivigFlags & moveStopHere) != 0 - && mvOccupied->Vel < 0.01 - && VelSignalNext == 0.0 ) { - // jeśli ma czekać na wolną drogę, stoi a wyjazdu nie ma, to ma stać - VelDesired = 0.0; - return; // speed limit can't get any lower - } - } + // jeśli ma czekać na wolną drogę, stoi a wyjazdu nie ma, to ma stać + VelDesired = 0.0; + return; // speed limit can't get any lower + } if( OrderCurrentGet() == Wait_for_orders ) { // wait means sit and wait @@ -7719,18 +7616,11 @@ TController::adjust_desired_speed_for_current_speed() { } // NOTE: as a stop-gap measure the routine is limited to trains only while car calculations seem off - if( is_train() ) { - if( vel < VelDesired ) { - // don't adjust acceleration when going above current target speed - if( -AccDesired * BrakeAccFactor() < ( - false == Ready || VelNext > vel - 40.0 ? - fBrake_a0[ 0 ] * 0.8 : - -fAccThreshold ) - / ( 1.2 * braking_distance_multiplier( VelNext ) ) ) { - AccDesired = std::max( EU07_AI_NOACCELERATION, AccDesired ); - } - } - } + if( is_train() && vel < VelDesired && + -AccDesired * BrakeAccFactor() < (false == Ready || VelNext > vel - 40.0 ? fBrake_a0[0] * 0.8 : -fAccThreshold) / (1.2 * braking_distance_multiplier(VelNext)) ) { + // don't adjust acceleration when going above current target speed + AccDesired = std::max(EU07_AI_NOACCELERATION, AccDesired); + } } // hamowanie kontrolne @@ -7876,15 +7766,11 @@ void TController::control_relays() { void TController::control_motor_connectors() { // ensure motor connectors are active - if( mvControlling->EngineType == TEngineType::ElectricSeriesMotor - || mvControlling->EngineType == TEngineType::DieselElectric - || is_emu() ) { - if( Need_TryAgain ) { - // true, jeśli druga pozycja w elektryku nie załapała - cue_action( driver_hint::mastercontrollersetzerospeed ); - Need_TryAgain = false; - } - } + if( (mvControlling->EngineType == TEngineType::ElectricSeriesMotor || mvControlling->EngineType == TEngineType::DieselElectric || is_emu()) && Need_TryAgain ) { + // true, jeśli druga pozycja w elektryku nie załapała + cue_action(driver_hint::mastercontrollersetzerospeed); + Need_TryAgain = false; + } } void TController::control_tractive_force() { @@ -7892,23 +7778,20 @@ void TController::control_tractive_force() { auto const velocity { DirectionalVel() }; // jeśli przyspieszenie pojazdu jest mniejsze niż żądane oraz... if( AccDesired > EU07_AI_NOACCELERATION // don't add power if not asked for actual speed-up - && (AbsAccS < AccDesired /*- std::min( 0.05, 0.01 * iDriverFailCount )*/ || (mvOccupied->SpeedCtrlUnit.IsActive && velocity < mvOccupied->SpeedCtrlUnit.FullPowerVelocity)) - && false == TestFlag(iDrivigFlags, movePress) ) { + && (AbsAccS < AccDesired /*- std::min( 0.05, 0.01 * iDriverFailCount )*/ || mvOccupied->SpeedCtrlUnit.IsActive && velocity < mvOccupied->SpeedCtrlUnit.FullPowerVelocity) && + false == TestFlag(iDrivigFlags, movePress) && + velocity < (VelDesired == 1.0 ? // work around for trains getting stuck on tracks with speed limit = 1 + VelDesired : + VelDesired - fVelMinus) && + (ActualProximityDist > (is_car() ? fMinProximityDist : // cars are allowed to move within min proximity distance + fMaxProximityDist) ? // other vehicle types keep wider margin + true : + velocity + 1.0 < VelNext) ) { // ...jeśli prędkość w kierunku czoła jest mniejsza od dozwolonej o margines... - if( velocity < ( - VelDesired == 1.0 ? // work around for trains getting stuck on tracks with speed limit = 1 - VelDesired : - VelDesired - fVelMinus ) ) { - // within proximity margin don't exceed next scheduled speed, outside of the margin accelerate as you like - if( ActualProximityDist > (is_car() ? fMinProximityDist : // cars are allowed to move within min proximity distance - fMaxProximityDist) ? // other vehicle types keep wider margin - true : - velocity + 1.0 < VelNext ) { - // ...to można przyspieszyć - increase_tractive_force(); - } - } - } + // within proximity margin don't exceed next scheduled speed, outside of the margin accelerate as you like + // ...to można przyspieszyć + increase_tractive_force(); + } // zmniejszanie predkosci // margines dla prędkości jest doliczany tylko jeśli oczekiwana prędkość jest większa od 5km/h if( false == TestFlag( iDrivigFlags, movePress ) ) { @@ -7962,12 +7845,10 @@ void TController::control_braking_force() { auto const velocity { DirectionalVel() }; // jeśli przyspieszamy, to nie hamujemy - if( AccDesired > 0.0 ) { - if( OrderCurrentGet() != Disconnect // przy odłączaniu nie zwalniamy tu hamulca - && false == TestFlag(iDrivigFlags, movePress) ) { - cue_action( driver_hint::brakingforcesetzero ); - } - } + if( AccDesired > 0.0 && OrderCurrentGet() != Disconnect // przy odłączaniu nie zwalniamy tu hamulca + && false == TestFlag(iDrivigFlags, movePress) ) { + cue_action(driver_hint::brakingforcesetzero); + } if( is_emu() && !ForcePNBrake ) { // właściwie, to warunek powinien być na działający EP @@ -7989,11 +7870,10 @@ void TController::control_braking_force() { if( AbsAccS < AccDesired - 0.05 ) { // jeśli opóźnienie większe od wymaganego (z histerezą) luzowanie, gdy za dużo // TBD: check if the condition isn't redundant with the DecBrake() code - if( BrakeCtrlPosition >= 0 ) { - if( VelDesired > 0.0 ) { // sanity check to prevent unintended brake release on sharp slopes - cue_action( driver_hint::brakingforcedecrease ); - } - } + if( BrakeCtrlPosition >= 0 && VelDesired > 0.0 ) { + // sanity check to prevent unintended brake release on sharp slopes + cue_action(driver_hint::brakingforcedecrease); + } } else { cue_action( driver_hint::brakingforcelap ); @@ -8002,50 +7882,30 @@ void TController::control_braking_force() { } // type & dt_ezt else { // a stara wersja w miarę dobrze działa na składy wagonowe - if( ( AccDesired < fAccGravity - 0.1 && AbsAccS > AccDesired + fBrake_a1[0] ) // regular braking - || ( fAccGravity < -0.05 && velocity < -0.1 ) ) { // also brake if uphill and slipping back + if( (AccDesired < fAccGravity - 0.1 && AbsAccS > AccDesired + fBrake_a1[0] // regular braking + || fAccGravity < -0.05 && velocity < -0.1) && + (fBrakeTime < 0.0 || AccDesired < fAccGravity - 0.5 || BrakeCtrlPosition <= 0) ) { // also brake if uphill and slipping back // u góry ustawia się hamowanie na fAccThreshold - if( fBrakeTime < 0.0 - || AccDesired < fAccGravity - 0.5 - || BrakeCtrlPosition <= 0 ) { - // jeśli upłynął czas reakcji hamulca, chyba że nagłe albo luzował - // TODO: check whether brake delay variable still has any purpose - cue_action( - driver_hint::brakingforceincrease, - // Ra: ten czas należy zmniejszyć, jeśli czas dojazdu do zatrzymania jest mniejszy - ( 3.0 - + 0.5 * ( ( - mvOccupied->BrakeDelayFlag > bdelay_G ? - mvOccupied->BrakeDelay[ 1 ] : - mvOccupied->BrakeDelay[ 3 ] ) - - 3.0 ) ) - * 0.5 ); // Ra: tymczasowo, bo przeżyna S1 - } - } - if ( AccDesired < fAccGravity - 0.05 - && AccDesired - fBrake_a1[0] * 0.51 - AbsAccS > 0.05 ) { + // jeśli upłynął czas reakcji hamulca, chyba że nagłe albo luzował + // TODO: check whether brake delay variable still has any purpose + cue_action(driver_hint::brakingforceincrease, + // Ra: ten czas należy zmniejszyć, jeśli czas dojazdu do zatrzymania jest mniejszy + (3.0 + 0.5 * ((mvOccupied->BrakeDelayFlag > bdelay_G ? mvOccupied->BrakeDelay[1] : mvOccupied->BrakeDelay[3]) - 3.0)) * 0.5); // Ra: tymczasowo, bo przeżyna S1 + } + if ( AccDesired < fAccGravity - 0.05 && AccDesired - fBrake_a1[0] * 0.51 - AbsAccS > 0.05 && OrderCurrentGet() != Disconnect && VelDesired > 0.0 ) { // jak hamuje, to nie tykaj kranu za często // yB: luzuje hamulec dopiero przy różnicy opóźnień rzędu 0.2 - if( OrderCurrentGet() != Disconnect ) { // przy odłączaniu nie zwalniamy tu hamulca - if( VelDesired > 0.0 ) { // sanity check to prevent unintended brake release on sharp slopes - // TODO: check whether brake delay variable still has any purpose - cue_action( - driver_hint::brakingforcedecrease, - (mvOccupied->BrakeDelayFlag > bdelay_G ? mvOccupied->BrakeDelay[0] : mvOccupied->BrakeDelay[2]) / 3.0 - * 0.5 ); // Ra: tymczasowo, bo przeżyna S1 - } - } - } + // przy odłączaniu nie zwalniamy tu hamulca + // sanity check to prevent unintended brake release on sharp slopes + // TODO: check whether brake delay variable still has any purpose + cue_action(driver_hint::brakingforcedecrease, + (mvOccupied->BrakeDelayFlag > bdelay_G ? mvOccupied->BrakeDelay[0] : mvOccupied->BrakeDelay[2]) / 3.0 * 0.5); // Ra: tymczasowo, bo przeżyna S1 + } // stop-gap measure to ensure cars actually brake to stop even when above calculactions go awry // instead of releasing the brakes and creeping into obstacle at 1-2 km/h - if( is_car() ) { - if( VelDesired == 0.0 - && velocity > VelDesired - && ActualProximityDist <= fMinProximityDist - && mvOccupied->LocalBrakePosA < 0.01 ) { - cue_action( driver_hint::brakingforceincrease ); - } - } + if( is_car() && VelDesired == 0.0 && velocity > VelDesired && ActualProximityDist <= fMinProximityDist && mvOccupied->LocalBrakePosA < 0.01 ) { + cue_action(driver_hint::brakingforceincrease); + } } // odhamowywanie składu po zatrzymaniu i zabezpieczanie lokomotywy @@ -8158,27 +8018,17 @@ void TController::control_main_pipe() { || mvOccupied->BrakeHandle == TBrakeHandle::MHZ_K8P || mvOccupied->BrakeHandle == TBrakeHandle::M394 ) { - if( iDrivigFlags & moveOerlikons - || true == IsCargoTrain ) { + if( (iDrivigFlags & moveOerlikons || true == IsCargoTrain) && BrakeCtrlPosition == gbh_RP && AbsAccS < 0.03 && AccDesired > -0.03 && VelDesired - mvOccupied->Vel > 2.0 && fReady > 0.35 && + mvOccupied->EqvtPipePress < 4.5 // don't charge with a risk of overcharging the main pipe + && mvOccupied->Compressor >= 7.5 // don't charge without sufficient pressure in the tank + && BrakeChargingCooldown >= 0.0 // don't charge while cooldown is active + && (ActualProximityDist > 100.0 // don't charge if we're about to be braking soon + || min_speed(mvOccupied->Vel, VelNext) >= mvOccupied->Vel) ) { - if( BrakeCtrlPosition == gbh_RP - && AbsAccS < 0.03 - && AccDesired > -0.03 - && VelDesired - mvOccupied->Vel > 2.0 ) { - - if( fReady > 0.35 - && mvOccupied->EqvtPipePress < 4.5 // don't charge with a risk of overcharging the main pipe - && mvOccupied->Compressor >= 7.5 // don't charge without sufficient pressure in the tank - && BrakeChargingCooldown >= 0.0 // don't charge while cooldown is active - && ( ActualProximityDist > 100.0 // don't charge if we're about to be braking soon - || min_speed(mvOccupied->Vel, VelNext) >= mvOccupied->Vel ) ) { - - BrakeLevelSet( gbh_FS ); - // don't charge the brakes too often, or we risk overcharging - BrakeChargingCooldown = -1 * std::clamp( iVehicles * 3, 30, 90 ); - } - } - } + BrakeLevelSet(gbh_FS); + // don't charge the brakes too often, or we risk overcharging + BrakeChargingCooldown = -1 * std::clamp(iVehicles * 3, 30, 90); + } if( mvOccupied->Compressor < 5.0 || ( BrakeCtrlPosition < gbh_RP @@ -8208,11 +8058,10 @@ TController::check_route_ahead( double const Range ) { break; } case TCommandType::cm_SetVelocity: { // od wersji 357 semafor nie budzi wyłączonej lokomotywy - if( ( OrderCurrentGet() & ~( Shunt | Loose_shunt | Obey_train | Bank ) ) == 0 ) { // jedzie w dowolnym trybie albo Wait_for_orders - if( std::fabs( VelSignal ) >= 1.0 ) { // 0.1 nie wysyła się do samochodow, bo potem nie ruszą - PutCommand( "SetVelocity", VelSignal, VelNext, nullptr ); // komenda robi dodatkowe operacje - } - } + if( (OrderCurrentGet() & ~(Shunt | Loose_shunt | Obey_train | Bank)) == 0 && std::fabs(VelSignal) >= 1.0 ) { // jedzie w dowolnym trybie albo Wait_for_orders + // 0.1 nie wysyła się do samochodow, bo potem nie ruszą + PutCommand("SetVelocity", VelSignal, VelNext, nullptr); // komenda robi dodatkowe operacje + } break; } case TCommandType::cm_ShuntVelocity: { // od wersji 357 Tm nie budzi wyłączonej lokomotywy @@ -8225,17 +8074,15 @@ TController::check_route_ahead( double const Range ) { break; } case TCommandType::cm_Command: { // komenda z komórki - if( ( OrderCurrentGet() & ~( Shunt | Loose_shunt | Obey_train | Bank ) ) == 0 ) { + if( (OrderCurrentGet() & ~(Shunt | Loose_shunt | Obey_train | Bank)) == 0 && mvOccupied->Vel < 0.1 ) { // jedzie w dowolnym trybie albo Wait_for_orders - if( mvOccupied->Vel < 0.1 ) { - // dopiero jak stanie -/* - PutCommand( eSignNext->text(), eSignNext->value( 1 ), eSignNext->value( 2 ), nullptr ); - eSignNext->StopCommandSent(); // się wykonało już -*/ // replacement of the above - eSignNext->send_command( *this ); - } - } + // dopiero jak stanie + /* + PutCommand( eSignNext->text(), eSignNext->value( 1 ), eSignNext->value( 2 ), nullptr ); + eSignNext->StopCommandSent(); // się wykonało już + */ // replacement of the above + eSignNext->send_command(*this); + } break; } default: { From 1497d081ffc19bb35e86b87848af5426573f82ca Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Thu, 1 Oct 2026 18:41:35 +0200 Subject: [PATCH 027/430] feat(editor): user-defined model sets, random insert from set, tabbed editor panel --- CMakeLists.txt | 1 + application/editormode.cpp | 175 +++++------ application/editormode.h | 7 +- application/editoruilayer.cpp | 87 +++++- application/editoruilayer.h | 35 ++- application/editoruipanels.cpp | 531 +++++++++++++++++++++++++++------ application/editoruipanels.h | 61 +++- application/uilayer.cpp | 116 ++++--- editor/editorModelSets.cpp | 235 +++++++++++++++ editor/editorModelSets.hpp | 56 ++++ 10 files changed, 1033 insertions(+), 271 deletions(-) create mode 100644 editor/editorModelSets.cpp create mode 100644 editor/editorModelSets.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 56cf1bce2..5f4ae6451 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -167,6 +167,7 @@ set(SOURCES "application/driveruipanels.cpp" "input/editorkeyboardinput.cpp" "editor/editorSettings.cpp" +"editor/editorModelSets.cpp" "editor/editorTerrain.cpp" "editor/editorTerrainStreamer.cpp" "application/editormode.cpp" diff --git a/application/editormode.cpp b/application/editormode.cpp index 94b1424da..1bdd4ed74 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -13,6 +13,7 @@ http://mozilla.org/MPL/2.0/. #include "application/application.h" #include "editor/editorSettings.hpp" +#include "editor/editorModelSets.hpp" #include "utilities/Globals.h" #include "simulation/simulation.h" #include "simulation/simulationtime.h" @@ -164,19 +165,6 @@ namespace return std::abs(sum) * 0.5; } - // short readable name of a node template (model file and texture), like the node bank shows it - std::string template_label(std::string const &Template) - { - cParser tokenizer(Template); - tokenizer.getTokens(9, false); // node, ranges, name, type, position, rotation - auto model{tokenizer.getToken(false)}; - auto texture{tokenizer.getToken(false)}; - replace_slashes(model); - erase_extension(model); - replace_slashes(texture); - return texture == "none" || texture.empty() ? model : model + " (" + texture + ")"; - } - // world triangles bucketed on a uniform XZ grid, for many ground height queries over one area class triangle_grid { @@ -293,6 +281,9 @@ void editor_mode::editormode_input::poll() editor_mode::editor_mode() { m_userinterface = std::make_shared(); + // the area fill settings live in the node bank window, in the tab of the fill mode + ui()->set_fill_options([this]() { render_area_fill(); }); + ui()->set_gizmo_options([this]() { render_gizmo_options(); }); } editor_ui *editor_mode::ui() const @@ -303,6 +294,7 @@ editor_ui *editor_mode::ui() const bool editor_mode::init() { EditorSettings.load(); + EditorModelSets.load(); Camera.Init({0, 15, 0}, {glm::radians(-30.0), glm::radians(180.0), 0}, nullptr); return m_input.init(); } @@ -473,17 +465,18 @@ void editor_mode::handle_brush_mouse_hold(int Action, int Button) if (!mouseHold || !viewport_click()) return; + // spacing is measured in world space: the mouse offset is camera-relative and the camera may move mid-stroke + glm::dvec3 const newPos = Camera.Pos + clamp_mouse_offset_to_max(GfxRenderer->Mouse_Position()); + if (m_brush_has_last && glm::distance(newPos, oldPos) < ui()->getSpacing()) + return; + + // picked only when a placement is due, so a random pick from a set isn't drawn every tick const std::string *src = ui()->get_active_node_template(); if (!src) return; std::string name = "editor_"; - // spacing is measured in world space: the mouse offset is camera-relative and the camera may move mid-stroke - glm::dvec3 const newPos = Camera.Pos + clamp_mouse_offset_to_max(GfxRenderer->Mouse_Position()); - if (m_brush_has_last && glm::distance(newPos, oldPos) < ui()->getSpacing()) - return; - TAnimModel *cloned = simulation::State.create_model(*src, name, newPos); oldPos = newPos; m_brush_has_last = true; @@ -819,9 +812,6 @@ bool editor_mode::update() #endif m_userinterface->update(); - // update brush settings visibility depending on panel mode - ui()->toggleBrushSettings(ui()->mode() == nodebank_panel::BRUSH); - if (mouseHold) { // process continuous brush placement @@ -892,12 +882,9 @@ bool editor_mode::update() // --- ImGuizmo: in-viewport transform gizmo for the selected node --- render_gizmo(); - // --- area fill: outline overlay and settings, while the mode is active --- + // --- area fill: outline overlay while the mode is active (its settings are drawn in the node bank window) --- if (ui()->mode() == nodebank_panel::FILL) - { draw_area_fill_outline(); - render_area_fill(); - } // --- ImGui: Editor Settings & History windows --- if(m_settings_open) @@ -914,31 +901,39 @@ void editor_mode::render_settings() { ImGui::Begin("Editor Settings", &m_settings_open, ImGuiWindowFlags_AlwaysAutoResize); - ImGui::TextUnformatted("Camera movement"); - - const char *schemes[] = {"WSAD (new)", "Arrows (legacy)"}; - int current = EditorSettings.movement() == editorSettings::movement_scheme::legacy ? 1 : 0; - if (ImGui::Combo("##movement_scheme", ¤t, schemes, IM_ARRAYSIZE(schemes))) + if (ImGui::BeginTabBar("##editorsettings")) { - EditorSettings.movement(current == 1 ? editorSettings::movement_scheme::legacy - : editorSettings::movement_scheme::wsad); - m_input.keyboard.apply_scheme(); - EditorSettings.save(); + if (ImGui::BeginTabItem("General")) + { + ImGui::TextUnformatted("Camera movement"); + + const char *schemes[] = {"WSAD (new)", "Arrows (legacy)"}; + int current = EditorSettings.movement() == editorSettings::movement_scheme::legacy ? 1 : 0; + if (ImGui::Combo("##movement_scheme", ¤t, schemes, IM_ARRAYSIZE(schemes))) + { + EditorSettings.movement(current == 1 ? editorSettings::movement_scheme::legacy + : editorSettings::movement_scheme::wsad); + m_input.keyboard.apply_scheme(); + EditorSettings.save(); + } + + ImGui::Separator(); + ImGui::Checkbox("Transform gizmo (ImGuizmo)", &m_gizmo_enabled); + ImGui::EndTabItem(); + } + if (ImGui::BeginTabItem("Terrain")) + { + render_terrain_ui(); + ImGui::EndTabItem(); + } + ImGui::EndTabBar(); } - ImGui::Separator(); - ImGui::Checkbox("Transform gizmo (ImGuizmo)", &m_gizmo_enabled); - - render_terrain_ui(); - ImGui::End(); } void editor_mode::render_terrain_ui() { - ImGui::Separator(); - ImGui::TextUnformatted("Terrain"); - ImGui::SetNextItemWidth(120.0f); ImGui::InputInt("Grid cells", &m_terrain_cells); m_terrain_cells = std::clamp(m_terrain_cells, 1, 512); @@ -1406,10 +1401,11 @@ void editor_mode::run_area_fill() // model package std::vector package; - if (m_fill_package == 0) + if (m_fill_source.kind == model_set_ref::source::manual) package = m_fill_custom; else - package = ui()->nodebank_group_templates(static_cast(m_fill_package - 1)); + for (auto const *entry : ui()->nodebank().set_entries(m_fill_source)) + package.push_back(*entry); package.erase(std::remove_if(package.begin(), package.end(), [](std::string const &Template) { return Template.empty(); }), package.end()); if (package.empty()) { @@ -1621,9 +1617,7 @@ void editor_mode::draw_area_fill_outline() const void editor_mode::render_area_fill() { - ImGui::Begin("Area fill", nullptr, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoFocusOnAppearing); - - ImGui::TextUnformatted("LMB: add outline point, Backspace: remove last point"); + ImGui::TextDisabled("LMB: add outline point Backspace: remove last point"); double const area = polygon_area_xz(m_fill_points); ImGui::Text("Points: %zu Area: %.0f m2 (%.2f ha)", m_fill_points.size(), area, area / 10000.0); if (ImGui::Button("Remove last point") && !m_fill_points.empty()) @@ -1634,58 +1628,13 @@ void editor_mode::render_area_fill() ImGui::Separator(); - // model package: a node bank group, or a custom set assembled from node bank templates - auto const groups = ui()->nodebank_groups(); - m_fill_package = std::clamp(m_fill_package, 0, static_cast(groups.size())); - std::string const current = m_fill_package == 0 ? std::string("Custom set") : groups[m_fill_package - 1]; - ImGui::SetNextItemWidth(250.0f); - if (ImGui::BeginCombo("Model package", current.c_str())) - { - if (ImGui::Selectable("Custom set", m_fill_package == 0)) - m_fill_package = 0; - for (int i = 0; i < static_cast(groups.size()); ++i) - { - auto const label = groups[i] + "##fillgroup" + std::to_string(i); - if (ImGui::Selectable(label.c_str(), m_fill_package == i + 1)) - m_fill_package = i + 1; - } - ImGui::EndCombo(); - } - - if (m_fill_package == 0) - { - ImGui::BeginChild("fill_custom_set", ImVec2(350.0f, 110.0f), true); - for (int i = 0; i < static_cast(m_fill_custom.size()); ++i) - { - auto const label = template_label(m_fill_custom[i]) + "##fillcustom" + std::to_string(i); - if (ImGui::Selectable(label.c_str(), m_fill_custom_idx == i)) - m_fill_custom_idx = i; - } - ImGui::EndChild(); - if (ImGui::Button("Add selected template")) - { - // the node bank selection, not a random pick from the brush set - auto const *src = ui()->get_active_node_template(true); - if (src && !src->empty()) - m_fill_custom.push_back(*src); - } - ImGui::SameLine(); - if (ImGui::Button("Remove") && m_fill_custom_idx >= 0 && m_fill_custom_idx < static_cast(m_fill_custom.size())) - { - m_fill_custom.erase(m_fill_custom.begin() + m_fill_custom_idx); - m_fill_custom_idx = -1; - } - ImGui::SameLine(); - if (ImGui::Button("Clear set")) - { - m_fill_custom.clear(); - m_fill_custom_idx = -1; - } - } + // model package: a hand-assembled list, a user-defined set or a node bank group + auto &bank = ui()->nodebank(); + bank.set_combo("Model set", m_fill_source, "Custom list"); + if (m_fill_source.kind == model_set_ref::source::manual) + bank.manual_list("fillset", m_fill_custom, m_fill_custom_idx); else - { - ImGui::Text("Templates in group: %zu", ui()->nodebank_group_templates(static_cast(m_fill_package - 1)).size()); - } + ImGui::TextDisabled("%zu templates in set", bank.set_entries(m_fill_source).size()); ImGui::Separator(); @@ -1697,7 +1646,9 @@ void editor_mode::render_area_fill() m_fill_min_spacing = std::max(0.0f, m_fill_min_spacing); ImGui::SetNextItemWidth(200.0f); ImGui::DragFloatRange2("Scale", &m_fill_scale_min, &m_fill_scale_max, 0.01f, 0.1f, 5.0f, "min %.2f", "max %.2f"); - ImGui::Checkbox("Random rotation (off: Functions panel setting)", &m_fill_random_rotation); + ImGui::Checkbox("Random rotation", &m_fill_random_rotation); + if (!m_fill_random_rotation) + ui()->render_rotation_controls(); ImGui::Checkbox("Large models count as ground (terrain tiles)", &m_fill_models_as_ground); ImGui::Text("Estimated objects: %.0f", std::round(area / 10000.0 * m_fill_density)); @@ -1711,21 +1662,20 @@ void editor_mode::render_area_fill() if (!m_fill_status.empty()) ImGui::TextUnformatted(m_fill_status.c_str()); - - ImGui::End(); } -void editor_mode::render_gizmo() +void editor_mode::render_gizmo_options() { - // the transform gizmo is suppressed while editing terrain, so the brush/chunk tool owns the mouse - if (!m_gizmo_enabled || m_terrain_sculpt || m_chunk_edit) + ImGui::Checkbox("Enabled", &m_gizmo_enabled); + if (!m_gizmo_enabled) + return; + if (m_terrain_sculpt || m_chunk_edit) { - m_gizmo_using = false; + ImGui::TextDisabled("Suspended while editing terrain"); return; } - // compact control window: lets the user pick the transform mode without keyboard shortcuts - ImGui::Begin("Gizmo", nullptr, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoFocusOnAppearing); + // lets the user pick the transform mode without keyboard shortcuts int op = static_cast(m_gizmo_op); ImGui::RadioButton("Translate (Q)", &op, static_cast(gizmo_operation::translate)); ImGui::SameLine(); @@ -1745,7 +1695,16 @@ void editor_mode::render_gizmo() } if (!m_node) ImGui::TextDisabled("No node selected"); - ImGui::End(); +} + +void editor_mode::render_gizmo() +{ + // the transform gizmo is suppressed while editing terrain, so the brush/chunk tool owns the mouse + if (!m_gizmo_enabled || m_terrain_sculpt || m_chunk_edit) + { + m_gizmo_using = false; + return; + } if (!m_node) { diff --git a/application/editormode.h b/application/editormode.h index 413b4225a..d8dfa979c 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -1,4 +1,4 @@ -/* +/* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include "application/applicationmode.h" +#include "application/editoruipanels.h" #include "input/editormouseinput.h" #include "input/editorkeyboardinput.h" #include "vehicle/Camera.h" @@ -211,7 +212,7 @@ class editor_mode : public application_mode std::vector m_fill_last; // instances created by the most recent fill, for "Undo last fill" std::vector m_fill_custom; // user-assembled package of node templates int m_fill_custom_idx{-1}; - int m_fill_package{0}; // 0 = custom set, N = nodebank group N-1 + model_set_ref m_fill_source; // manual = m_fill_custom, otherwise a user set or node bank group float m_fill_density{200.0f}; // objects per hectare float m_fill_min_spacing{2.0f}; // minimal distance between placed objects (m) bool m_fill_random_rotation{true}; // random yaw; otherwise the Functions panel rotation settings apply @@ -223,6 +224,8 @@ class editor_mode : public application_mode // ImGuizmo-based transform gizmo for the selected node enum class gizmo_operation { translate, rotate, scale }; void render_gizmo(); + // gizmo settings, drawn in the toolset window + void render_gizmo_options(); bool m_gizmo_enabled{true}; // master switch for the in-viewport gizmo bool m_gizmo_using{false}; // tracks an ongoing drag, so a single undo snapshot is taken per drag bool m_gizmo_local{false}; // manipulate in the object's local space instead of world space diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index b00b1e516..17514efb8 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -21,10 +21,10 @@ editor_ui::editor_ui() clear_panels(); // bind the panels with ui object. maybe not the best place for this but, eh - add_external_panel(&m_itempropertiespanel); add_external_panel(&m_nodebankpanel); - add_external_panel(&m_functionspanel); - add_external_panel(&m_brushobjects); + + m_nodebankpanel.mode_options = [this](nodebank_panel::edit_mode const Mode) { render_mode_options(Mode); }; + m_nodebankpanel.header_sections = [this]() { render_header_sections(); }; } // updates state of UI elements @@ -43,26 +43,67 @@ void editor_ui::update() ui_layer::update(); m_itempropertiespanel.update(m_node); m_functionspanel.update(m_node); - - auto ptr = get_active_node_template(true); - if (ptr) - m_brushobjects.update(*ptr); } -void editor_ui::toggleBrushSettings(bool isVisible) +void editor_ui::render_mode_options(nodebank_panel::edit_mode const Mode) { - if (m_brushobjects.is_open != isVisible) - m_brushobjects.is_open = isVisible; + switch (Mode) + { + case nodebank_panel::MODIFY: + ImGui::TextDisabled("LMB: select node F: focus End: drop to ground Del: delete"); + break; + case nodebank_panel::COPY: + ImGui::TextDisabled("LMB: copy the clicked model to the node bank"); + break; + case nodebank_panel::ADD: + { + ImGui::TextDisabled("LMB: insert a model at the cursor"); + ImGui::Checkbox("Random model from set", &m_insertrandom); + if (m_insertrandom) + { + m_nodebankpanel.set_combo("Set##insert", m_insertset, nullptr); + auto const count{m_nodebankpanel.set_entries(m_insertset).size()}; + ImGui::TextDisabled("%zu templates in set%s", count, count == 0 ? ", the node bank selection is used" : ""); + } + else + { + ImGui::TextDisabled("Inserts the template selected in the node bank"); + } + m_functionspanel.render_controls(); + break; + } + case nodebank_panel::BRUSH: + ImGui::TextDisabled("Hold LMB: paint models along the cursor path"); + m_brushobjects.render_options(m_nodebankpanel); + m_functionspanel.render_controls(); + break; + case nodebank_panel::FILL: + if (m_filloptions) + m_filloptions(); + break; + default: + break; + } } -std::vector editor_ui::nodebank_groups() const +void editor_ui::render_header_sections() { - return m_nodebankpanel.group_names(); + if (ImGui::CollapsingHeader("Gizmo", ImGuiTreeNodeFlags_DefaultOpen)) + { + if (m_gizmooptions) + m_gizmooptions(); + } + if (ImGui::CollapsingHeader("Node properties", ImGuiTreeNodeFlags_DefaultOpen)) + { + ImGui::Indent(); + m_itempropertiespanel.render_body(); + ImGui::Unindent(); + } } -std::vector editor_ui::nodebank_group_templates(std::size_t const Group) const +void editor_ui::render_rotation_controls() { - return m_nodebankpanel.group_templates(Group); + m_functionspanel.render_controls(); } void editor_ui::set_node(scene::basic_node *Node) @@ -77,9 +118,23 @@ void editor_ui::add_node_template(const std::string &desc) std::string const *editor_ui::get_active_node_template(bool bypassRandom) { - if (!bypassRandom && m_brushobjects.is_open && m_brushobjects.useRandom && m_brushobjects.Objects.size() > 0) + if (!bypassRandom) { - return m_brushobjects.GetRandomObject(); + // random pick from the active tool's set; an empty set falls back to the node bank selection + std::string const *pick{nullptr}; + if (m_nodebankpanel.mode == nodebank_panel::BRUSH && m_brushobjects.useRandom) + { + if (m_brushobjects.source.kind == model_set_ref::source::manual) + pick = m_brushobjects.Objects.empty() ? nullptr : m_brushobjects.GetRandomObject(); + else + pick = m_nodebankpanel.random_template(m_brushobjects.source); + } + else if (m_nodebankpanel.mode == nodebank_panel::ADD && m_insertrandom) + { + pick = m_nodebankpanel.random_template(m_insertset); + } + if (pick != nullptr) + return pick; } return m_nodebankpanel.get_active_template(); } diff --git a/application/editoruilayer.h b/application/editoruilayer.h index 57d75466b..8b15d35d9 100644 --- a/application/editoruilayer.h +++ b/application/editoruilayer.h @@ -36,15 +36,36 @@ class editor_ui : public ui_layer const std::string *get_active_node_template(bool bypassRandom = false); nodebank_panel::edit_mode mode(); float getSpacing(); - void toggleBrushSettings(bool isVisible); - std::vector nodebank_groups() const; - std::vector nodebank_group_templates(std::size_t const Group) const; + // node bank and model set access (set selection widgets, set contents) + nodebank_panel &nodebank() + { + return m_nodebankpanel; + } + // rotation settings widgets, for tools drawn by the editor mode + void render_rotation_controls(); + // draws the area fill settings in its node bank tab (the fill state lives in the editor mode) + void set_fill_options(std::function Renderer) + { + m_filloptions = std::move(Renderer); + } + // draws the gizmo settings in the toolset window (the gizmo state lives in the editor mode) + void set_gizmo_options(std::function Renderer) + { + m_gizmooptions = std::move(Renderer); + } private: + // methods + void render_mode_options(nodebank_panel::edit_mode const Mode); + void render_header_sections(); // members - itemproperties_panel m_itempropertiespanel{"Node Properties", true}; - functions_panel m_functionspanel{"Functions", true}; - nodebank_panel m_nodebankpanel{"Node Bank", true}; - brush_object_list m_brushobjects{"Brush properties", false}; + itemproperties_panel m_itempropertiespanel{"Node Properties", true}; // not a window of its own, drawn in the toolset window + functions_panel m_functionspanel{"Functions", true}; // not a window of its own, its settings are drawn in the toolset tabs + nodebank_panel m_nodebankpanel{"Toolset", true}; // main editor window: gizmo, node properties, edit modes and the node bank + brush_object_list m_brushobjects; + bool m_insertrandom{false}; // insert mode picks a random template from m_insertset + model_set_ref m_insertset; + std::function m_filloptions; + std::function m_gizmooptions; scene::basic_node *m_node{nullptr}; // currently bound scene node, if any }; diff --git a/application/editoruipanels.cpp b/application/editoruipanels.cpp index 80eec0ba5..6c9a2df9f 100644 --- a/application/editoruipanels.cpp +++ b/application/editoruipanels.cpp @@ -19,6 +19,21 @@ http://mozilla.org/MPL/2.0/. #include "world/MemCell.h" #include "application/editoruilayer.h" #include "rendering/renderer.h" +#include "editor/editorModelSets.hpp" + +namespace +{ +// list entry; the selected one is drawn with the accent colour, like selections in the starter +bool list_item(char const *Label, bool const Selected) +{ + if (Selected) + ImGui::PushStyleColor(ImGuiCol_Header, ImGui::GetStyleColorVec4(ImGuiCol_HeaderActive)); + auto const clicked{ImGui::Selectable(Label, Selected)}; + if (Selected) + ImGui::PopStyleColor(); + return clicked; +} +} // namespace void itemproperties_panel::update(scene::basic_node *Node) { @@ -285,19 +300,24 @@ void itemproperties_panel::render() auto const panelname{(title.empty() ? m_name : title) + "###" + m_name}; if (true == ImGui::Begin(panelname.c_str(), nullptr, flags)) { - // header section - for (auto const &line : text_lines) - { - ImGui::TextColored(ImVec4(line.color.r, line.color.g, line.color.b, line.color.a), line.data.c_str()); - } - // transform editor (position/rotation/scale) — TAnimModel only - render_transform_editor(); - // group section - render_group(); + render_body(); } ImGui::End(); } +void itemproperties_panel::render_body() +{ + // header section + for (auto const &line : text_lines) + { + ImGui::TextColored(ImVec4(line.color.r, line.color.g, line.color.b, line.color.a), line.data.c_str()); + } + // transform editor (position/rotation/scale) — TAnimModel only + render_transform_editor(); + // group section + render_group(); +} + // In-place editor for position (double precision), rotation (degrees, 0-360), // and uniform scale (per-axis float, 1.000) of a picked TAnimModel. // Other node subclasses don't expose these knobs through the same API, so the @@ -375,27 +395,6 @@ bool itemproperties_panel::render_group() return true; } -brush_object_list::brush_object_list(std::string const &Name, bool const Isopen) : ui_panel(Name, Isopen) -{ - size_min = {50, 100}; - size_max = {1000, 500}; -} - -bool brush_object_list::VectorGetter(void *data, int idx, const char **out_text) -{ - auto *vec = static_cast *>(data); - - if (idx < 0 || idx >= vec->size()) - return false; - - *out_text = (*vec)[idx].c_str(); - return true; -} - -void brush_object_list::update(std::string nodeTemplate) -{ - Template = nodeTemplate; -} std::string *brush_object_list::GetRandomObject() { static std::string empty; // fallback @@ -408,39 +407,25 @@ std::string *brush_object_list::GetRandomObject() return &Objects[dist(Global.local_random_engine)]; } -void brush_object_list::render() +void brush_object_list::render_options(nodebank_panel &Bank) { - if (false == is_open) + ImGui::SliderFloat("Spacing", &spacing, 0.1f, 20.0f, "%.1f m"); + ImGui::Checkbox("Random model from set", &useRandom); + if (false == useRandom) { + ImGui::TextDisabled("Paints the template selected in the node bank"); return; } - - auto flags = ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoCollapse | (size.x > 0 ? ImGuiWindowFlags_NoResize : 0); - if (ImGui::Begin("Brush random set", nullptr, flags)) + Bank.set_combo("Preset", source, "Manual list"); + if (source.kind == model_set_ref::source::manual) { - ImGui::SliderFloat("Spacing", &spacing, 0.1f, 20.0f, "%.1f m"); - ImGui::Checkbox("Enable brush random from set", &useRandom); - if (useRandom) - { - ImGui::Text("Set of objects to choose from:"); - ImGui::ListBox("", &idx, VectorGetter, (void *)&Objects, Objects.size(), 6); - if (ImGui::Button("Add")) - { - if (!Template.empty()) - Objects.push_back(Template); - } - ImGui::SameLine(); - if (ImGui::Button("Remove") && idx >= 0 && idx < Objects.size()) - { - Objects.erase(Objects.begin() + idx); - } - if (ImGui::Button("Remove all")) - { - Objects.clear(); - } - } + Bank.manual_list("brushset", Objects, idx); + } + else + { + auto const count{Bank.set_entries(source).size()}; + ImGui::TextDisabled("%zu templates in set%s", count, count == 0 ? ", the node bank selection is used" : ""); } - ImGui::End(); } nodebank_panel::nodebank_panel(std::string const &Name, bool const Isopen) : ui_panel(Name, Isopen) @@ -518,6 +503,11 @@ void nodebank_panel::render() { ImGui::SetNextWindowSize(ImVec2S(size.x, size.y)); } + else + { + // mode settings are drawn above the list, so start with a window tall enough for both + ImGui::SetNextWindowSize(ImVec2S(440, 640), ImGuiCond_FirstUseEver); + } if (size_min.x > 0) { ImGui::SetNextWindowSizeConstraints(ImVec2S(size_min.x, size_min.y), ImVec2S(size_max.x, size_max.y)); @@ -526,30 +516,47 @@ void nodebank_panel::render() if (true == ImGui::Begin(panelname.c_str(), nullptr, flags)) { - - ImGui::RadioButton("Modify node", (int *)&mode, MODIFY); - ImGui::SameLine(); - ImGui::RadioButton("Insert from bank", (int *)&mode, ADD); - ImGui::SameLine(); - ImGui::RadioButton("Brush mode", (int *)&mode, BRUSH); - ImGui::SameLine(); - ImGui::RadioButton("Copy to bank", (int *)&mode, COPY); - ImGui::SameLine(); - ImGui::RadioButton("Area fill", (int *)&mode, FILL); - ImGui::SameLine(); - if (ImGui::Button("Reload Nodebank")) + if (ImGui::Button("Reload node bank")) { nodebank_reload(); } - - if (mode == BRUSH) + ImGui::SameLine(); + if (ImGui::Button(m_setsopen ? "Close model sets" : "Model sets...")) { - // ImGui::SliderFloat("Spacing", &spacing, 0.1f, 20.0f, "%.1f m"); + m_setsopen = !m_setsopen; } + if (header_sections) + { + header_sections(); + } + + // edit modes as tabs, each with its own settings + std::pair const modes[] = {{"Select", MODIFY}, {"Insert", ADD}, {"Brush", BRUSH}, {"Area fill", FILL}, {"Copy to bank", COPY}}; + if (ImGui::BeginTabBar("##editmodes", ImGuiTabBarFlags_FittingPolicyResizeDown)) + { + for (auto const &tab : modes) + { + if (false == ImGui::BeginTabItem(tab.first)) + { + continue; + } + mode = tab.second; + if (mode_options) + { + mode_options(mode); + } + ImGui::EndTabItem(); + } + ImGui::EndTabBar(); + } + + ImGui::Separator(); ImGui::PushItemWidth(-1); ImGui::InputTextWithHint("Search", "Search node bank", m_nodesearch, IM_ARRAYSIZE(m_nodesearch)); - if (ImGui::ListBoxHeader("##nodebank", ImVec2(-1, -1))) + // the list takes the rest of the window, but keeps a usable height when the sections above are expanded (the window scrolls then) + auto const listheight{std::max(ImGui::GetContentRegionAvail().y, ImGui::GetTextLineHeightWithSpacing() * 10.0f)}; + if (ImGui::ListBoxHeader("##nodebank", ImVec2(-1, listheight))) { auto idx{0}; auto isvisible{false}; @@ -572,16 +579,366 @@ void nodebank_panel::render() continue; } auto const label{" " + entry.first + "##" + std::to_string(idx)}; - if (ImGui::Selectable(label.c_str(), entry.second == m_selectedtemplate)) + if (list_item(label.c_str(), entry.second == m_selectedtemplate)) m_selectedtemplate = entry.second; ++idx; } } ImGui::ListBoxFooter(); } + ImGui::PopItemWidth(); } ImGui::End(); + + if (m_setsopen) + { + render_sets_window(); + } +} + +bool nodebank_panel::set_combo(char const *Label, model_set_ref &Ref, char const *Manuallabel) +{ + auto changed{false}; + auto const preview{set_name(Ref, Manuallabel)}; + if (false == ImGui::BeginCombo(Label, preview.c_str())) + { + return false; + } + if (Manuallabel != nullptr) + { + if (ImGui::Selectable(Manuallabel, Ref.kind == model_set_ref::source::manual)) + { + Ref = model_set_ref{}; + changed = true; + } + } + ImGui::TextDisabled("User sets"); + auto const &sets{EditorModelSets.sets()}; + if (sets.empty()) + { + ImGui::TextDisabled(" (none yet, see Model sets...)"); + } + for (auto const &set : sets) + { + auto const label{" " + set.name + " (" + std::to_string(set.templates.size()) + ")##userset" + std::to_string(set.id)}; + if (ImGui::Selectable(label.c_str(), Ref.kind == model_set_ref::source::user && Ref.id == set.id)) + { + Ref = {model_set_ref::source::user, set.id}; + changed = true; + } + } + ImGui::TextDisabled("Node bank groups"); + auto const groups{group_names()}; + for (int idx = 0; idx < static_cast(groups.size()); ++idx) + { + auto const label{" " + groups[idx] + "##bankgroup" + std::to_string(idx)}; + if (ImGui::Selectable(label.c_str(), Ref.kind == model_set_ref::source::nodebank && Ref.id == idx)) + { + Ref = {model_set_ref::source::nodebank, idx}; + changed = true; + } + } + ImGui::EndCombo(); + return changed; +} + +void nodebank_panel::manual_list(char const *Id, std::vector &List, int &Selected) +{ + ImGui::PushID(Id); + if (ImGui::ListBoxHeader("##list", ImVec2(-1, ImGui::GetTextLineHeightWithSpacing() * 6.5f))) + { + for (int idx = 0; idx < static_cast(List.size()); ++idx) + { + auto const label{generate_node_label(List[idx]) + "##" + std::to_string(idx)}; + if (list_item(label.c_str(), Selected == idx)) + Selected = idx; + } + if (List.empty()) + { + ImGui::TextDisabled("(empty)"); + } + ImGui::ListBoxFooter(); + } + if (ImGui::Button("Add selected")) + { + if (m_selectedtemplate && false == m_selectedtemplate->empty()) + List.push_back(*m_selectedtemplate); + } + if (ImGui::IsItemHovered()) + { + ImGui::SetTooltip("Adds the template selected in the node bank list"); + } + ImGui::SameLine(); + if (ImGui::Button("Remove") && Selected >= 0 && Selected < static_cast(List.size())) + { + List.erase(List.begin() + Selected); + Selected = -1; + } + ImGui::SameLine(); + if (ImGui::Button("Clear")) + { + List.clear(); + Selected = -1; + } + ImGui::SameLine(); + if (ImGui::Button("Save as set") && false == List.empty()) + { + open_sets_window(EditorModelSets.create("New set", List)); + } + ImGui::PopID(); +} + +std::vector nodebank_panel::set_entries(model_set_ref const &Ref) const +{ + std::vector entries; + if (Ref.kind == model_set_ref::source::user) + { + if (auto const *set = EditorModelSets.find(Ref.id)) + { + for (auto const &entry : set->templates) + entries.push_back(&entry); + } + } + else if (Ref.kind == model_set_ref::source::nodebank && Ref.id >= 0) + { + // same grouping as group_templates(), without copying the templates + int group{0}; + bool started{false}; + for (auto const &entry : m_nodebank) + { + if (entry.second->empty()) + { + if (started) + ++group; + started = true; + continue; + } + started = true; + if (group == Ref.id) + entries.push_back(entry.second.get()); + else if (group > Ref.id) + break; + } + } + return entries; +} + +std::string const *nodebank_panel::random_template(model_set_ref const &Ref) const +{ + auto const entries{set_entries(Ref)}; + if (entries.empty()) + return nullptr; + + std::uniform_int_distribution dist(0, entries.size() - 1); + return entries[dist(Global.local_random_engine)]; +} + +std::string nodebank_panel::set_name(model_set_ref const &Ref, char const *Manuallabel) const +{ + switch (Ref.kind) + { + case model_set_ref::source::user: + { + auto const *set = EditorModelSets.find(Ref.id); + return set != nullptr ? set->name : "(deleted set)"; + } + case model_set_ref::source::nodebank: + { + auto const groups{group_names()}; + return Ref.id >= 0 && Ref.id < static_cast(groups.size()) ? "Node bank: " + groups[Ref.id] : "(missing node bank group)"; + } + default: + return Manuallabel != nullptr ? Manuallabel : "(none)"; + } +} + +void nodebank_panel::open_sets_window(int const Setid) +{ + m_setsopen = true; + if (Setid != 0) + { + m_setsselected = Setid; + m_setsentry = -1; + } +} + +void nodebank_panel::render_sets_window() +{ + ImGui::SetNextWindowSize(ImVec2S(600, 380), ImGuiCond_FirstUseEver); + if (false == ImGui::Begin("Model sets", &m_setsopen, ImGuiWindowFlags_NoCollapse)) + { + ImGui::End(); + return; + } + + auto const &sets{EditorModelSets.sets()}; + if (EditorModelSets.find(m_setsselected) == nullptr) + { + m_setsselected = sets.empty() ? 0 : sets.front().id; + m_setsentry = -1; + } + + // left side: the sets + auto const buttonsheight{ImGui::GetFrameHeightWithSpacing()}; + ImGui::BeginGroup(); + ImGui::BeginChild("##setlist", ImVec2(190 * Global.ui_scale, -buttonsheight), true); + for (auto const &set : sets) + { + auto const label{set.name + " (" + std::to_string(set.templates.size()) + ")##set" + std::to_string(set.id)}; + if (list_item(label.c_str(), set.id == m_setsselected)) + { + m_setsselected = set.id; + m_setsentry = -1; + } + } + if (sets.empty()) + { + ImGui::TextDisabled("No sets yet"); + } + ImGui::EndChild(); + if (ImGui::Button("New")) + { + open_sets_window(EditorModelSets.create("New set")); + } + auto const *edited{EditorModelSets.find(m_setsselected)}; + if (edited != nullptr) + { + ImGui::SameLine(); + if (ImGui::Button("Duplicate")) + { + open_sets_window(EditorModelSets.create(edited->name + " copy", edited->templates)); + edited = EditorModelSets.find(m_setsselected); + } + ImGui::SameLine(); + if (ImGui::Button("Delete")) + { + ImGui::OpenPopup("##deleteset"); + } + if (ImGui::BeginPopup("##deleteset")) + { + ImGui::Text("Delete set \"%s\"?", edited->name.c_str()); + if (ImGui::Button("Delete##confirm")) + { + EditorModelSets.remove(edited->id); + edited = nullptr; + ImGui::CloseCurrentPopup(); + } + ImGui::SameLine(); + if (ImGui::Button("Cancel")) + { + ImGui::CloseCurrentPopup(); + } + ImGui::EndPopup(); + } + } + ImGui::EndGroup(); + + ImGui::SameLine(); + + // right side: content of the selected set + ImGui::BeginGroup(); + if (edited == nullptr) + { + ImGui::TextDisabled("Create a set with \"New\", or use \"Save as set\" on a brush or area fill list."); + ImGui::TextDisabled("Sets can be chosen in Insert (random model), Brush and Area fill."); + } + else + { + if (m_setsnameid != edited->id) + { + // selection changed, load its name into the edit buffer + std::snprintf(m_setsname, sizeof(m_setsname), "%s", edited->name.c_str()); + m_setsnameid = edited->id; + } + ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x - ImGui::CalcTextSize("Rename").x - ImGui::GetStyle().FramePadding.x * 2 - ImGui::GetStyle().ItemSpacing.x); + auto const entered{ImGui::InputText("##setname", m_setsname, IM_ARRAYSIZE(m_setsname), ImGuiInputTextFlags_EnterReturnsTrue)}; + ImGui::PopItemWidth(); + ImGui::SameLine(); + if (ImGui::Button("Rename") || entered) + { + EditorModelSets.rename(edited->id, m_setsname); + m_setsnameid = 0; // reload, the name could have been adjusted to stay unique + } + + ImGui::BeginChild("##setentries", ImVec2(0, -buttonsheight * 2), true); + for (int idx = 0; idx < static_cast(edited->labels.size()); ++idx) + { + auto const label{edited->labels[idx] + "##entry" + std::to_string(idx)}; + if (list_item(label.c_str(), idx == m_setsentry)) + m_setsentry = idx; + } + if (edited->templates.empty()) + { + ImGui::TextDisabled("(empty) select a template in the node bank and press \"Add selected\""); + } + ImGui::EndChild(); + + auto const setid{edited->id}; + if (ImGui::Button("Add selected")) + { + if (m_selectedtemplate && false == m_selectedtemplate->empty()) + EditorModelSets.add(setid, {*m_selectedtemplate}); + } + if (ImGui::IsItemHovered()) + { + ImGui::SetTooltip("Adds the template selected in the node bank list"); + } + ImGui::SameLine(); + if (ImGui::Button("Remove") && m_setsentry >= 0) + { + EditorModelSets.erase(setid, static_cast(m_setsentry)); + m_setsentry = -1; + } + ImGui::SameLine(); + if (ImGui::Button("Clear")) + { + ImGui::OpenPopup("##clearset"); + } + if (ImGui::BeginPopup("##clearset")) + { + ImGui::TextUnformatted("Remove all templates from this set?"); + if (ImGui::Button("Clear##confirm")) + { + EditorModelSets.clear(setid); + m_setsentry = -1; + ImGui::CloseCurrentPopup(); + } + ImGui::SameLine(); + if (ImGui::Button("Cancel")) + { + ImGui::CloseCurrentPopup(); + } + ImGui::EndPopup(); + } + + // whole node bank group at once + ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x - ImGui::CalcTextSize("Add group").x - ImGui::GetStyle().FramePadding.x * 2 - ImGui::GetStyle().ItemSpacing.x); + auto const groups{group_names()}; + m_setsgroup.id = groups.empty() ? -1 : std::clamp(m_setsgroup.id, 0, static_cast(groups.size()) - 1); + if (ImGui::BeginCombo("##addgroup", m_setsgroup.id >= 0 ? groups[m_setsgroup.id].c_str() : "(no node bank groups)")) + { + for (int idx = 0; idx < static_cast(groups.size()); ++idx) + { + auto const label{groups[idx] + "##addgroup" + std::to_string(idx)}; + if (ImGui::Selectable(label.c_str(), idx == m_setsgroup.id)) + m_setsgroup.id = idx; + } + ImGui::EndCombo(); + } + ImGui::PopItemWidth(); + ImGui::SameLine(); + if (ImGui::Button("Add group")) + { + std::vector templates; + for (auto const *entry : set_entries(m_setsgroup)) + templates.push_back(*entry); + EditorModelSets.add(setid, templates); + } + } + ImGui::EndGroup(); + + ImGui::End(); } void nodebank_panel::add_template(const std::string &desc) @@ -691,19 +1048,27 @@ void functions_panel::render() if (true == ImGui::Begin(panelname.c_str(), nullptr, flags)) { // header section - - ImGui::RadioButton("Random rotation", (int *)&rot_mode, RANDOM); - ImGui::RadioButton("Fixed rotation", (int *)&rot_mode, FIXED); - if (rot_mode == FIXED) - { - // ImGui::Checkbox("Get rotation from last object", &rot_from_last); - ImGui::SliderFloat("Rotation Value", &rot_value, 0.0f, 360.0f, "%.1f"); - }; - ImGui::RadioButton("Default rotation", (int *)&rot_mode, DEFAULT); + render_controls(); for (auto const &line : text_lines) { ImGui::TextColored(ImVec4(line.color.r, line.color.g, line.color.b, line.color.a), line.data.c_str()); } } ImGui::End(); +} + +void functions_panel::render_controls() +{ + // order matches rotation_mode + char const *const modes[] = {"Random", "Fixed", "Default (from template)"}; + auto current{static_cast(rot_mode)}; + if (ImGui::Combo("Rotation", ¤t, modes, IM_ARRAYSIZE(modes))) + { + rot_mode = static_cast(current); + } + if (rot_mode == FIXED) + { + // ImGui::Checkbox("Get rotation from last object", &rot_from_last); + ImGui::SliderFloat("Rotation value", &rot_value, 0.0f, 360.0f, "%.1f deg"); + } } \ No newline at end of file diff --git a/application/editoruipanels.h b/application/editoruipanels.h index 50e8bf99c..55a0ca1a1 100644 --- a/application/editoruipanels.h +++ b/application/editoruipanels.h @@ -11,6 +11,8 @@ http://mozilla.org/MPL/2.0/. #include "application/uilayer.h" #include "utilities/Classes.h" + +#include /* // helper, associated bool is set when the primary value was changed and expects processing at the observer's leisure template @@ -37,6 +39,8 @@ class itemproperties_panel : public ui_panel // are still treated as read-only. void update(scene::basic_node *Node); void render() override; + // panel content without the window, also drawn inside the toolset window + void render_body(); private: // methods @@ -53,22 +57,35 @@ class itemproperties_panel : public ui_panel std::vector m_grouplines; }; -class brush_object_list : public ui_panel +// reference to a set of node templates, used by the random insert, the brush and the area fill +struct model_set_ref +{ + enum class source + { + manual, // list assembled by hand in the tool itself (or no set, where the tool has no such list) + user, // user-defined set (see EditorModelSets), id == set id + nodebank // node bank group, id == group index (as returned by nodebank_panel::group_names()) + }; + source kind{source::manual}; + int id{-1}; +}; + +class nodebank_panel; + +// brush settings, drawn inside the node bank window when the brush mode is active +class brush_object_list { private: - int idx; - static bool VectorGetter(void *data, int idx, const char **out_text); - std::string Template; + int idx{-1}; public: - brush_object_list(std::string const &Name, bool const Isopen); - void render() override; - void update(std::string nodeTemplate); + void render_options(nodebank_panel &Bank); // class use - std::vector Objects; + std::vector Objects; // manual list, used when source is set to manual std::string *GetRandomObject(); bool useRandom = {false}; + model_set_ref source; float spacing{1.0f}; }; @@ -96,13 +113,39 @@ class nodebank_panel : public ui_panel // node templates of the group with specified index (as returned by group_names()) std::vector group_templates(std::size_t const Group) const; + // model sets (user-defined sets and node bank groups) + // combo selecting a set. Manuallabel names the tool's own hand-made list; nullptr hides that choice. returns: true on change + bool set_combo(char const *Label, model_set_ref &Ref, char const *Manuallabel); + // list of templates assembled by hand, with buttons to add the node bank selection, remove entries and save it as a user set + void manual_list(char const *Id, std::vector &List, int &Selected); + // node templates of referenced set; empty for the manual list or a set which no longer exists + std::vector set_entries(model_set_ref const &Ref) const; + // random template from referenced set, or nullptr if the set is empty + std::string const *random_template(model_set_ref const &Ref) const; + std::string set_name(model_set_ref const &Ref, char const *Manuallabel) const; + // shows the set manager window, optionally with specified user set selected + void open_sets_window(int const Setid = 0); + + // draws settings of the active edit mode inside its tab + std::function mode_options; + // draws sections attached above the mode tabs (gizmo, node properties) + std::function header_sections; + private: // methods: std::string generate_node_label(std::string Input) const; + void render_sets_window(); // members: std::vector>> m_nodebank; char m_nodesearch[128]; std::shared_ptr m_selectedtemplate; + // set manager window + bool m_setsopen{false}; + int m_setsselected{0}; // id of the user set being edited + int m_setsentry{-1}; // selected template of the edited set + int m_setsnameid{0}; // id of the set whose name is held in the edit buffer + char m_setsname[128]{}; + model_set_ref m_setsgroup{model_set_ref::source::nodebank, 0}; // node bank group to append to the edited set }; class functions_panel : public ui_panel @@ -124,6 +167,8 @@ class functions_panel : public ui_panel void update(scene::basic_node const *Node); void render() override; + // rotation settings widgets, also drawn inside the node bank window + void render_controls(); private: // methods diff --git a/application/uilayer.cpp b/application/uilayer.cpp index 60c8a778a..19f32302b 100644 --- a/application/uilayer.cpp +++ b/application/uilayer.cpp @@ -130,67 +130,89 @@ bool ui_layer::mouse_button_callback(int button, int action, int mods) return m_imguiio->WantCaptureMouse; } -static ImVec4 imvec_lerp(const ImVec4 &a, const ImVec4 &b, float t) -{ - return ImVec4(a.x + (b.x - a.x) * t, a.y + (b.y - a.y) * t, a.z + (b.z - a.z) * t, a.w + (b.w - a.w) * t); -} - void ui_layer::imgui_style() { + // palette shared with the MaSzyna starter: flat dark panels, thin borders, green accents + auto const rgb = [](int const Color, float const Alpha = 1.0f) { + return ImVec4(((Color >> 16) & 0xff) / 255.0f, ((Color >> 8) & 0xff) / 255.0f, (Color & 0xff) / 255.0f, Alpha); + }; + int constexpr panel{0x1e2327}; // window background + int constexpr base{0x15171b}; // darker background, between panels + int constexpr header{0x2a3036}; // section headers, hovered items + int constexpr border{0x3a424a}; + int constexpr field{0x121517}; // input fields, combos + int constexpr accent{0x177f00}; // selection, active elements + int constexpr accentbright{0x41c400}; // marks: checkmarks, active tab underline + int constexpr accentdim{0x164b0e}; + ImVec4 *colors = ImGui::GetStyle().Colors; - colors[ImGuiCol_Text] = ImVec4(1.00f, 1.00f, 1.00f, 1.00f); - colors[ImGuiCol_TextDisabled] = ImVec4(0.35f, 0.35f, 0.35f, 1.00f); - colors[ImGuiCol_WindowBg] = ImVec4(0.04f, 0.04f, 0.04f, Global.UIBgOpacity); // ui.bg.opacity from config file + colors[ImGuiCol_Text] = rgb(0xffffff); + colors[ImGuiCol_TextDisabled] = rgb(0xa0a0a2); + colors[ImGuiCol_WindowBg] = rgb(panel, Global.UIBgOpacity); // ui.bg.opacity from config file colors[ImGuiCol_ChildBg] = ImVec4(0.00f, 0.00f, 0.00f, 0.00f); - colors[ImGuiCol_PopupBg] = ImVec4(0.06f, 0.06f, 0.06f, 0.94f); - colors[ImGuiCol_Border] = ImVec4(0.31f, 0.34f, 0.31f, 0.50f); + colors[ImGuiCol_PopupBg] = rgb(base, 0.98f); + colors[ImGuiCol_Border] = rgb(border); colors[ImGuiCol_BorderShadow] = ImVec4(0.00f, 0.00f, 0.00f, 0.00f); - colors[ImGuiCol_FrameBg] = ImVec4(0.21f, 0.28f, 0.17f, 0.54f); - colors[ImGuiCol_FrameBgHovered] = ImVec4(0.42f, 0.64f, 0.23f, 0.40f); - colors[ImGuiCol_FrameBgActive] = ImVec4(0.42f, 0.64f, 0.23f, 0.67f); - colors[ImGuiCol_TitleBg] = ImVec4(0.03f, 0.03f, 0.03f, 1.00f); - colors[ImGuiCol_TitleBgActive] = ImVec4(0.21f, 0.28f, 0.17f, 1.00f); - colors[ImGuiCol_TitleBgCollapsed] = ImVec4(0.00f, 0.00f, 0.00f, 0.51f); - colors[ImGuiCol_MenuBarBg] = ImVec4(0.10f, 0.10f, 0.10f, 1.00f); - colors[ImGuiCol_ScrollbarBg] = ImVec4(0.01f, 0.01f, 0.01f, 0.53f); - colors[ImGuiCol_ScrollbarGrab] = ImVec4(0.22f, 0.22f, 0.22f, 1.00f); - colors[ImGuiCol_ScrollbarGrabHovered] = ImVec4(0.29f, 0.29f, 0.29f, 1.00f); - colors[ImGuiCol_ScrollbarGrabActive] = ImVec4(0.36f, 0.36f, 0.36f, 1.00f); - colors[ImGuiCol_CheckMark] = ImVec4(0.42f, 0.64f, 0.23f, 1.00f); - colors[ImGuiCol_SliderGrab] = ImVec4(0.37f, 0.53f, 0.25f, 1.00f); - colors[ImGuiCol_SliderGrabActive] = ImVec4(0.42f, 0.64f, 0.23f, 1.00f); - colors[ImGuiCol_Button] = ImVec4(0.42f, 0.64f, 0.23f, 0.40f); - colors[ImGuiCol_ButtonHovered] = ImVec4(0.42f, 0.64f, 0.23f, 1.00f); - colors[ImGuiCol_ButtonActive] = ImVec4(0.37f, 0.54f, 0.19f, 1.00f); - colors[ImGuiCol_Header] = ImVec4(0.42f, 0.64f, 0.23f, 0.31f); - colors[ImGuiCol_HeaderHovered] = ImVec4(0.42f, 0.64f, 0.23f, 0.80f); - colors[ImGuiCol_HeaderActive] = ImVec4(0.42f, 0.64f, 0.23f, 1.00f); - colors[ImGuiCol_SeparatorHovered] = ImVec4(0.29f, 0.41f, 0.18f, 0.78f); - colors[ImGuiCol_SeparatorActive] = ImVec4(0.29f, 0.41f, 0.18f, 1.00f); - colors[ImGuiCol_ResizeGrip] = ImVec4(0.42f, 0.64f, 0.23f, 0.25f); - colors[ImGuiCol_ResizeGripHovered] = ImVec4(0.42f, 0.64f, 0.23f, 0.67f); - colors[ImGuiCol_ResizeGripActive] = ImVec4(0.42f, 0.64f, 0.23f, 0.95f); + colors[ImGuiCol_FrameBg] = rgb(field); + colors[ImGuiCol_FrameBgHovered] = rgb(header); + colors[ImGuiCol_FrameBgActive] = rgb(border); + colors[ImGuiCol_TitleBg] = rgb(base); + colors[ImGuiCol_TitleBgActive] = rgb(header); + colors[ImGuiCol_TitleBgCollapsed] = rgb(base, 0.75f); + colors[ImGuiCol_MenuBarBg] = rgb(panel); + colors[ImGuiCol_ScrollbarBg] = rgb(base, 0.60f); + colors[ImGuiCol_ScrollbarGrab] = rgb(border); + colors[ImGuiCol_ScrollbarGrabHovered] = rgb(0x5a636c); + colors[ImGuiCol_ScrollbarGrabActive] = rgb(0x858585); + colors[ImGuiCol_CheckMark] = rgb(accentbright); + colors[ImGuiCol_SliderGrab] = rgb(accent); + colors[ImGuiCol_SliderGrabActive] = rgb(accentbright); + colors[ImGuiCol_Button] = rgb(header); + colors[ImGuiCol_ButtonHovered] = rgb(border); + colors[ImGuiCol_ButtonActive] = rgb(accent); + // shared by section headers and selected list items + colors[ImGuiCol_Header] = rgb(header); + colors[ImGuiCol_HeaderHovered] = rgb(accentdim); + colors[ImGuiCol_HeaderActive] = rgb(accent); + colors[ImGuiCol_Separator] = rgb(border); + colors[ImGuiCol_SeparatorHovered] = rgb(accent); + colors[ImGuiCol_SeparatorActive] = rgb(accentbright); + colors[ImGuiCol_ResizeGrip] = rgb(border, 0.50f); + colors[ImGuiCol_ResizeGripHovered] = rgb(accent); + colors[ImGuiCol_ResizeGripActive] = rgb(accentbright); + colors[ImGuiCol_Tab] = rgb(header); + colors[ImGuiCol_TabHovered] = rgb(border); + colors[ImGuiCol_TabActive] = rgb(accent); // also the line under the tab bar + colors[ImGuiCol_TabUnfocused] = rgb(header); + colors[ImGuiCol_TabUnfocusedActive] = rgb(accentdim); colors[ImGuiCol_PlotLines] = ImVec4(0.61f, 0.61f, 0.61f, 1.00f); colors[ImGuiCol_PlotLinesHovered] = ImVec4(1.00f, 0.43f, 0.35f, 1.00f); colors[ImGuiCol_PlotHistogram] = ImVec4(0.90f, 0.70f, 0.00f, 1.00f); - colors[ImGuiCol_PlotHistogramHovered] = ImVec4(1.00f, 0.60f, 0.00f, 1.00f); - colors[ImGuiCol_TextSelectedBg] = ImVec4(0.42f, 0.64f, 0.23f, 0.35f); - colors[ImGuiCol_DragDropTarget] = ImVec4(1.00f, 1.00f, 0.00f, 0.90f); - colors[ImGuiCol_NavHighlight] = ImVec4(0.26f, 0.59f, 0.98f, 1.00f); + colors[ImGuiCol_TextSelectedBg] = rgb(accent, 0.60f); + colors[ImGuiCol_DragDropTarget] = rgb(accentbright, 0.90f); + colors[ImGuiCol_NavHighlight] = rgb(accentbright); colors[ImGuiCol_NavWindowingHighlight] = ImVec4(1.00f, 1.00f, 1.00f, 0.70f); colors[ImGuiCol_NavWindowingDimBg] = ImVec4(0.80f, 0.80f, 0.80f, 0.20f); - colors[ImGuiCol_ModalWindowDimBg] = ImVec4(0.80f, 0.80f, 0.80f, 0.35f); + colors[ImGuiCol_ModalWindowDimBg] = rgb(base, 0.60f); - colors[ImGuiCol_Separator] = colors[ImGuiCol_Border]; - colors[ImGuiCol_Tab] = imvec_lerp(colors[ImGuiCol_Header], colors[ImGuiCol_TitleBgActive], 0.80f); - colors[ImGuiCol_TabHovered] = colors[ImGuiCol_HeaderHovered]; - colors[ImGuiCol_TabActive] = imvec_lerp(colors[ImGuiCol_HeaderActive], colors[ImGuiCol_TitleBgActive], 0.60f); - colors[ImGuiCol_TabUnfocused] = imvec_lerp(colors[ImGuiCol_Tab], colors[ImGuiCol_TitleBg], 0.80f); - colors[ImGuiCol_TabUnfocusedActive] = imvec_lerp(colors[ImGuiCol_TabActive], colors[ImGuiCol_TitleBg], 0.40f); + // flat, square elements with thin borders + auto &style = ImGui::GetStyle(); + style.WindowRounding = 0.0f; + style.ChildRounding = 0.0f; + style.FrameRounding = 0.0f; + style.PopupRounding = 0.0f; + style.ScrollbarRounding = 0.0f; + style.GrabRounding = 0.0f; + style.TabRounding = 0.0f; + style.WindowBorderSize = 1.0f; + style.ChildBorderSize = 1.0f; + style.PopupBorderSize = 1.0f; + style.FrameBorderSize = 1.0f; + style.TabBorderSize = 0.0f; - ImGui::GetStyle().ScaleAllSizes(Global.ui_scale); + style.ScaleAllSizes(Global.ui_scale); } bool ui_layer::init(GLFWwindow *Window) diff --git a/editor/editorModelSets.cpp b/editor/editorModelSets.cpp new file mode 100644 index 000000000..4a9c10ec4 --- /dev/null +++ b/editor/editorModelSets.cpp @@ -0,0 +1,235 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "editor/editorModelSets.hpp" +#include "utilities/Logs.h" +#include "utilities/parser.h" +#include "utilities/utilities.h" + +#include +#include +#include + +editorModelSets EditorModelSets; + +// file layout: +// set +// +// ... +// endset +namespace +{ +namespace fs = std::filesystem; + +fs::path sets_path() +{ + fs::path p = user_config_path("eu07_editor_sets.txt"); + return p.empty() ? fs::path("eu07_editor_sets.txt") : p; +} + +std::string trimmed(std::string Text) +{ + auto const first = Text.find_first_not_of(" \t"); + if (first == std::string::npos) + return {}; + auto const last = Text.find_last_not_of(" \t"); + return Text.substr(first, last - first + 1); +} + +// the file stores one template per line, so line breaks inside a template (e.g. from export_as_text) become plain separators +std::string single_line(std::string Text) +{ + std::replace_if(Text.begin(), Text.end(), [](char const Character) { return Character == '\r' || Character == '\n' || Character == '\t'; }, ' '); + return trimmed(Text); +} +} // namespace + +bool editorModelSets::load() +{ + m_sets.clear(); + + const fs::path path = sets_path(); + std::error_code ec; + if (!fs::exists(path, ec)) + return false; + + std::ifstream stream(path, std::ios_base::in | std::ios_base::binary); + if (!stream.is_open()) + return false; + + editor_model_set *current{nullptr}; + std::string line; + while (std::getline(stream, line)) + { + line = single_line(line); + if (line.empty() || line.rfind("//", 0) == 0) + continue; + + // a set header also closes a set with missing "endset"; templates always start with "node" + if (line.rfind("set", 0) == 0 && (line.size() == 3 || line[3] == ' ')) + { + editor_model_set set; + set.id = m_nextid++; + set.name = unique_name(line.substr(3)); + m_sets.push_back(std::move(set)); + current = &m_sets.back(); + continue; + } + if (line == "endset") + { + current = nullptr; + continue; + } + if (current == nullptr) + continue; + current->labels.push_back(label(line)); + current->templates.push_back(std::move(line)); + } + return true; +} + +bool editorModelSets::save() const +{ + const fs::path path = sets_path(); + std::error_code ec; + fs::create_directories(path.parent_path(), ec); + + std::ofstream stream(path, std::ios_base::out | std::ios_base::trunc | std::ios_base::binary); + if (!stream.is_open()) + { + ErrorLog("failed to save editor model sets"); + return false; + } + + stream << "// MaSzyna editor: user-defined model sets\n"; + for (auto const &set : m_sets) + { + stream << "\nset " << set.name << "\n"; + for (auto const &entry : set.templates) + stream << entry << "\n"; + stream << "endset\n"; + } + return true; +} + +editor_model_set const *editorModelSets::find(int const Id) const +{ + auto const lookup = std::find_if(m_sets.begin(), m_sets.end(), [Id](auto const &Set) { return Set.id == Id; }); + return lookup != m_sets.end() ? &(*lookup) : nullptr; +} + +editor_model_set *editorModelSets::find_(int const Id) +{ + auto const lookup = std::find_if(m_sets.begin(), m_sets.end(), [Id](auto const &Set) { return Set.id == Id; }); + return lookup != m_sets.end() ? &(*lookup) : nullptr; +} + +int editorModelSets::create(std::string const &Name, std::vector const &Templates) +{ + editor_model_set set; + set.id = m_nextid++; + set.name = unique_name(Name); + for (auto const &entry : Templates) + { + auto line = single_line(entry); + if (line.empty()) + continue; + set.labels.push_back(label(line)); + set.templates.push_back(std::move(line)); + } + m_sets.push_back(std::move(set)); + save(); + return m_sets.back().id; +} + +void editorModelSets::remove(int const Id) +{ + auto const lookup = std::find_if(m_sets.begin(), m_sets.end(), [Id](auto const &Set) { return Set.id == Id; }); + if (lookup == m_sets.end()) + return; + m_sets.erase(lookup); + save(); +} + +void editorModelSets::rename(int const Id, std::string const &Name) +{ + auto *set = find_(Id); + if (set == nullptr) + return; + auto const name = unique_name(Name, Id); + if (name == set->name) + return; + set->name = name; + save(); +} + +void editorModelSets::add(int const Id, std::vector const &Templates) +{ + auto *set = find_(Id); + if (set == nullptr) + return; + auto const count{set->templates.size()}; + for (auto const &entry : Templates) + { + auto line = single_line(entry); + if (line.empty()) + continue; + set->labels.push_back(label(line)); + set->templates.push_back(std::move(line)); + } + if (set->templates.size() != count) + save(); +} + +void editorModelSets::erase(int const Id, std::size_t const Index) +{ + auto *set = find_(Id); + if (set == nullptr || Index >= set->templates.size()) + return; + set->templates.erase(set->templates.begin() + Index); + set->labels.erase(set->labels.begin() + Index); + save(); +} + +void editorModelSets::clear(int const Id) +{ + auto *set = find_(Id); + if (set == nullptr || set->templates.empty()) + return; + set->templates.clear(); + set->labels.clear(); + save(); +} + +std::string editorModelSets::unique_name(std::string const &Base, int const IgnoreId) const +{ + auto base = single_line(Base); + if (base.empty()) + base = "New set"; + auto const taken = [&](std::string const &Name) { + return std::any_of(m_sets.begin(), m_sets.end(), [&](auto const &Set) { return Set.id != IgnoreId && Set.name == Name; }); + }; + auto name = base; + for (int suffix = 2; taken(name); ++suffix) + name = base + " " + std::to_string(suffix); + return name; +} + +std::string editorModelSets::label(std::string const &Template) +{ + cParser tokenizer(Template); + tokenizer.getTokens(9, false); // node, ranges, name, type, position, rotation + auto model{tokenizer.getToken(false)}; + auto texture{tokenizer.getToken(false)}; + replace_slashes(model); + erase_extension(model); + replace_slashes(texture); + return texture == "none" || texture.empty() ? model : model + " (" + texture + ")"; +} diff --git a/editor/editorModelSets.hpp b/editor/editorModelSets.hpp new file mode 100644 index 000000000..9e9f63622 --- /dev/null +++ b/editor/editorModelSets.hpp @@ -0,0 +1,56 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include + +// user-defined sets of node templates (e.g. "deciduous trees", "bushes"), used by the editor brush, +// random insert and area fill. stored next to the user's ini files +struct editor_model_set +{ + int id{0}; // runtime identifier, stable while the editor runs (renames don't break references) + std::string name; + std::vector templates; // node definitions, one per entry, same format as nodebank entries + std::vector labels; // short readable names of the templates, cached for the UI +}; + +class editorModelSets +{ + public: + bool load(); + bool save() const; + + std::vector const &sets() const + { + return m_sets; + } + editor_model_set const *find(int Id) const; + // all modifying methods save the sets right away + // returns: id of the new set + int create(std::string const &Name, std::vector const &Templates = {}); + void remove(int Id); + void rename(int Id, std::string const &Name); + void add(int Id, std::vector const &Templates); + void erase(int Id, std::size_t Index); + void clear(int Id); + // name not used by any other set, built from specified base + std::string unique_name(std::string const &Base, int IgnoreId = 0) const; + // short readable name of a node template (model file and texture) + static std::string label(std::string const &Template); + + private: + editor_model_set *find_(int Id); + + std::vector m_sets; + int m_nextid{1}; +}; + +extern editorModelSets EditorModelSets; From 8da445bcb5795abfa3af72c1813bc43f02a5870b Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Thu, 1 Oct 2026 20:09:34 +0200 Subject: [PATCH 028/430] feat(editor): geoportal orthophoto layer streamed around the camera --- CMakeLists.txt | 14 + application/editormode.cpp | 173 +++++++ application/editormode.h | 11 + editor/editorOrthophoto.cpp | 963 ++++++++++++++++++++++++++++++++++++ editor/editorOrthophoto.hpp | 154 ++++++ editor/editorSettings.cpp | 71 +++ editor/editorSettings.hpp | 20 + 7 files changed, 1406 insertions(+) create mode 100644 editor/editorOrthophoto.cpp create mode 100644 editor/editorOrthophoto.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f4ae6451..1485e520e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -170,6 +170,7 @@ set(SOURCES "editor/editorModelSets.cpp" "editor/editorTerrain.cpp" "editor/editorTerrainStreamer.cpp" +"editor/editorOrthophoto.cpp" "application/editormode.cpp" "input/editormouseinput.cpp" "application/editoruilayer.cpp" @@ -564,6 +565,19 @@ if (WIN32) target_link_libraries(${PROJECT_NAME} ws2_32) endif() +# http client of the editor's geoportal orthophoto layer: WinHTTP on Windows, libcurl elsewhere when available +if (WIN32) + target_link_libraries(${PROJECT_NAME} winhttp) +else() + find_package(CURL QUIET) + if (CURL_FOUND) + target_link_libraries(${PROJECT_NAME} CURL::libcurl) + target_compile_definitions(${PROJECT_NAME} PRIVATE EU07_WITH_CURL) + else() + message(STATUS "libcurl not found: the editor's orthophoto layer will only show cached tiles") + endif() +endif() + if (WITH_ZMQ) find_package(cppzmq REQUIRED) target_include_directories(${PROJECT_NAME} PRIVATE ${cppzmq_INCLUDE_DIR}) diff --git a/application/editormode.cpp b/application/editormode.cpp index 1bdd4ed74..4da9fe987 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -35,6 +35,7 @@ http://mozilla.org/MPL/2.0/. #include #include #include +#include #include #include #include @@ -267,6 +268,19 @@ namespace } } + // scenery file name without path and extension + std::string scenery_stem() + { + std::string scenery = Global.SceneryFile; + auto const slash = scenery.find_last_of("/\\"); + if (slash != std::string::npos) + scenery = scenery.substr(slash + 1); + auto const dot = scenery.find_last_of('.'); + if (dot != std::string::npos) + scenery = scenery.substr(0, dot); + return scenery.empty() ? "default" : scenery; + } + } bool editor_mode::editormode_input::init() @@ -879,6 +893,10 @@ bool editor_mode::update() } } + // --- geoportal orthophoto: streamed around the camera, drawn beneath the other overlays --- + m_orthophoto.update(Camera.Pos); + draw_orthophoto(); + // --- ImGuizmo: in-viewport transform gizmo for the selected node --- render_gizmo(); @@ -926,6 +944,11 @@ void editor_mode::render_settings() render_terrain_ui(); ImGui::EndTabItem(); } + if (ImGui::BeginTabItem("Orthophoto")) + { + render_orthophoto_ui(); + ImGui::EndTabItem(); + } ImGui::EndTabBar(); } @@ -1094,6 +1117,153 @@ void editor_mode::render_terrain_ui() } } +void editor_mode::load_orthophoto_settings() +{ + std::string const scenery = scenery_stem(); + if (scenery == m_orthophoto_scenery) + return; + m_orthophoto_scenery = scenery; + + auto const &stored = EditorSettings.orthophoto(); + editor_orthophoto::config config = m_orthophoto.settings(); + config.radius = stored.radius; + config.height = stored.height; + config.opacity = stored.opacity; + config.year = stored.year; + config.hires = stored.hires; + config.north = 0.0; + config.east = 0.0; + EditorSettings.orthophoto_origin(scenery, config.north, config.east); + m_orthophoto.settings(config); + m_orthophoto_origin_edit = {config.north, config.east}; +} + +void editor_mode::save_orthophoto_settings() +{ + editor_orthophoto::config const &config = m_orthophoto.settings(); + auto &stored = EditorSettings.orthophoto(); + stored.radius = config.radius; + stored.height = config.height; + stored.opacity = config.opacity; + stored.year = config.year; + stored.hires = config.hires; + if (config.north != 0.0 || config.east != 0.0) + EditorSettings.orthophoto_origin(m_orthophoto_scenery, config.north, config.east); + EditorSettings.save(); +} + +void editor_mode::render_orthophoto_ui() +{ + load_orthophoto_settings(); + + editor_orthophoto::config config = m_orthophoto.settings(); + bool changed = false; // apply to the layer + bool persist = false; // and store in the editor settings + + bool enabled = m_orthophoto.enabled(); + if (ImGui::Checkbox("Show orthophoto (geoportal.gov.pl)", &enabled)) + m_orthophoto.enabled(enabled); + + ImGui::Separator(); + ImGui::TextUnformatted("Scenery origin (0,0,0) in PUWG 1992 / EPSG:2180"); + // geodetic convention, as displayed by geoportal.gov.pl: X grows north, Y grows east. + // applied once editing ends, so half-typed numbers don't trigger downloads + ImGui::SetNextItemWidth(160.0f); + ImGui::InputDouble("X (northing, m)", &m_orthophoto_origin_edit.x, 0.0, 0.0, "%.2f"); + bool const northedited = ImGui::IsItemDeactivatedAfterEdit(); + ImGui::SetNextItemWidth(160.0f); + ImGui::InputDouble("Y (easting, m)", &m_orthophoto_origin_edit.y, 0.0, 0.0, "%.2f"); + bool const eastedited = ImGui::IsItemDeactivatedAfterEdit(); + if (northedited || eastedited) + { + config.north = m_orthophoto_origin_edit.x; + config.east = m_orthophoto_origin_edit.y; + changed = persist = true; + } + if (config.north == 0.0 && config.east == 0.0) + ImGui::TextColored(ImVec4(1.0f, 0.75f, 0.2f, 1.0f), "Enter the origin of this scenery first"); + else + ImGui::TextDisabled("Camera at X %.1f Y %.1f", config.north + Camera.Pos.z, config.east - Camera.Pos.x); + + ImGui::Separator(); + ImGui::SetNextItemWidth(160.0f); + changed |= ImGui::SliderInt("Distance (tiles)", &config.radius, 0, editor_orthophoto::max_radius); + persist |= ImGui::IsItemDeactivatedAfterEdit(); + ImGui::SameLine(); + int const span = static_cast((2 * config.radius + 1) * editor_orthophoto::tile_size); + ImGui::TextDisabled("%d x %d m", span, span); + + ImGui::SetNextItemWidth(160.0f); + changed |= ImGui::DragFloat("Height (m)", &config.height, 0.1f, -1000.0f, 3000.0f, "%.2f"); + persist |= ImGui::IsItemDeactivatedAfterEdit(); + + ImGui::SetNextItemWidth(160.0f); + changed |= ImGui::SliderFloat("Opacity", &config.opacity, 0.0f, 1.0f, "%.2f"); + persist |= ImGui::IsItemDeactivatedAfterEdit(); + + // newest imagery, or the newest imagery taken up to the end of the selected year + int const thisyear = static_cast(std::chrono::year_month_day{std::chrono::floor(std::chrono::system_clock::now())}.year()); + std::string const yearlabel = config.year ? std::to_string(config.year) : std::string("Newest"); + ImGui::SetNextItemWidth(160.0f); + if (ImGui::BeginCombo("Photo year", yearlabel.c_str())) + { + if (ImGui::Selectable("Newest", config.year == 0)) + { + config.year = 0; + changed = persist = true; + } + for (int year = thisyear; year >= editor_orthophoto::oldest_year; --year) + { + if (ImGui::Selectable(std::to_string(year).c_str(), config.year == year)) + { + config.year = year; + changed = persist = true; + } + } + ImGui::EndCombo(); + } + + if (ImGui::Checkbox("4K tiles where available", &config.hires)) + changed = persist = true; + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("4096 px tiles (~6 cm/px) from the high-resolution orthophoto, for the tiles around the camera.\n" + "Areas it doesn't cover use the standard imagery. Each 4K tile takes ~85 MB of video memory."); + + if (changed) + m_orthophoto.settings(config); + if (persist) + save_orthophoto_settings(); + + ImGui::Separator(); + auto const stats = m_orthophoto.stats(); + ImGui::Text("Tiles: %d shown, %d loading, %d failed", stats.resident, stats.loading, stats.failed); + if (stats.failed > 0) + { + ImGui::SameLine(); + if (ImGui::Button("Retry")) + m_orthophoto.retry_failed(); + } + if (!editor_orthophoto::can_download()) + ImGui::TextDisabled("This build has no HTTP client, only cached tiles are shown"); + ImGui::TextDisabled("Cache: %s", editor_orthophoto::cache_directory().c_str()); + ImGui::TextDisabled("Imagery: GUGiK, geoportal.gov.pl"); +} + +void editor_mode::draw_orthophoto() +{ + if (!m_orthophoto.enabled()) + return; + // the camera was just published to the renderer (update_camera), so build the view from it rather than + // from the renderer's previous frame; camera-relative rotation, same projection as the other overlays + glm::dmat4 viewmatrix{1.0}; + Camera.SetMatrix(viewmatrix); + glm::mat4 const view = glm::mat4(glm::mat3(viewmatrix)); + ImGuiIO const &io = ImGui::GetIO(); + float const fovy = glm::radians(Global.FieldOfView / Global.ZoomFactor); + float const aspect = io.DisplaySize.y > 0.0f ? io.DisplaySize.x / io.DisplaySize.y : 1.0f; + m_orthophoto.draw(glm::perspective(fovy, aspect, 0.1f, 10000.0f) * view, Camera.Pos, io.DisplaySize.x, io.DisplaySize.y); +} + editor_terrain *editor_mode::terrain_at(double X, double Z) { for (auto &terrain : m_terrains) @@ -1869,6 +2039,8 @@ void editor_mode::enter() Global.ControlPicking = true; EditorModeFlag = true; + load_orthophoto_settings(); + Application.set_cursor(GLFW_CURSOR_NORMAL); } @@ -1882,6 +2054,7 @@ void editor_mode::exit() g_redo.clear(); m_history.clear(); m_fill_last.clear(); + m_orthophoto.cancel_pending(); // drop selection so a stale/dangling node pointer isn't used on the next editor session m_node = nullptr; diff --git a/application/editormode.h b/application/editormode.h index d8dfa979c..c251186a4 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -18,6 +18,7 @@ http://mozilla.org/MPL/2.0/. #include "scene/scenenode.h" #include "editor/editorTerrain.hpp" #include "editor/editorTerrainStreamer.hpp" +#include "editor/editorOrthophoto.hpp" #include #include @@ -191,6 +192,16 @@ class editor_mode : public application_mode int m_stream_radius{2}; bool m_stream_persist{true}; // save edited chunks to disk and load them back + // geoportal orthophoto layer drawn under the other viewport overlays + void render_orthophoto_ui(); + void draw_orthophoto(); + // picks up the stored settings and the origin of the current scenery + void load_orthophoto_settings(); + void save_orthophoto_settings(); + editor_orthophoto m_orthophoto; + std::string m_orthophoto_scenery; // scenery whose origin is loaded + glm::dvec2 m_orthophoto_origin_edit{0.0}; // origin being typed in (northing, easting); applied when editing ends + // hierarchy management void add_to_hierarchy(scene::basic_node *node); void remove_from_hierarchy(scene::basic_node *node); diff --git a/editor/editorOrthophoto.cpp b/editor/editorOrthophoto.cpp new file mode 100644 index 000000000..74137b626 --- /dev/null +++ b/editor/editorOrthophoto.cpp @@ -0,0 +1,963 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "editor/editorOrthophoto.hpp" + +#include "rendering/renderer.h" +#include "utilities/Logs.h" +#include "utilities/utilities.h" +#include "imgui/imgui.h" +#include "stb/stb_image.h" + +#if defined(_WIN32) +#include +#elif defined(EU07_WITH_CURL) +#include +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace +{ +namespace fs = std::filesystem; + +constexpr int standard_pixels{1024}; // ~25 cm/px for a 256 m tile, matches the standard orthophoto +constexpr int hires_pixels{4096}; // ~6 cm/px, the WMS MaxWidth/MaxHeight of the geoportal services +constexpr int probe_pixels{64}; // coverage test of the high-resolution product +constexpr int worker_count{3}; // concurrent requests; the service is slow but shouldn't be hammered +constexpr std::size_t upload_budget{16u << 20}; // bytes of texture data uploaded per frame (always at least one tile) +constexpr std::size_t vertex_budget{60000}; // ImGui uses 16-bit indices and not every backend supports vertex offsets +constexpr float near_w{0.5f}; + +using stop_check = std::function; + +double steady_seconds() +{ + return std::chrono::duration(std::chrono::steady_clock::now().time_since_epoch()).count(); +} + +// --------------------------------------------------------------------------------------------- +// minimal blocking https GET; one instance per worker thread + +class http_client +{ + public: + http_client(); + ~http_client(); + http_client(http_client const &) = delete; + http_client &operator=(http_client const &) = delete; + + bool get(std::string const &Url, std::vector &Out, std::string &Error, stop_check const &Stop); + + private: +#if defined(_WIN32) + HINTERNET m_session{nullptr}; +#elif defined(EU07_WITH_CURL) + CURL *m_curl{nullptr}; +#endif +}; + +#if defined(_WIN32) + +http_client::http_client() +{ + wchar_t const *agent = L"MaSzyna-editor"; +#ifdef WINHTTP_ACCESS_TYPE_AUTOMATIC_PROXY + m_session = ::WinHttpOpen(agent, WINHTTP_ACCESS_TYPE_AUTOMATIC_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); +#endif + if (m_session == nullptr) // automatic proxy needs windows 8.1+ + m_session = ::WinHttpOpen(agent, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); + if (m_session != nullptr) + ::WinHttpSetTimeouts(m_session, 10000, 10000, 15000, 20000); +} + +http_client::~http_client() +{ + if (m_session != nullptr) + ::WinHttpCloseHandle(m_session); +} + +bool http_client::get(std::string const &Url, std::vector &Out, std::string &Error, stop_check const &Stop) +{ + Out.clear(); + if (m_session == nullptr) + { + Error = "WinHttpOpen failed (" + std::to_string(::GetLastError()) + ")"; + return false; + } + + std::wstring const url(Url.begin(), Url.end()); // the requests are plain ascii + URL_COMPONENTS parts{}; + parts.dwStructSize = sizeof(parts); + parts.dwSchemeLength = static_cast(-1); + parts.dwHostNameLength = static_cast(-1); + parts.dwUrlPathLength = static_cast(-1); + parts.dwExtraInfoLength = static_cast(-1); + if (!::WinHttpCrackUrl(url.c_str(), 0, 0, &parts)) + { + Error = "invalid url"; + return false; + } + std::wstring const host(parts.lpszHostName, parts.dwHostNameLength); + std::wstring const path = std::wstring(parts.lpszUrlPath, parts.dwUrlPathLength) + std::wstring(parts.lpszExtraInfo, parts.dwExtraInfoLength); + + HINTERNET connection = ::WinHttpConnect(m_session, host.c_str(), parts.nPort, 0); + HINTERNET request = connection ? ::WinHttpOpenRequest(connection, L"GET", path.c_str(), nullptr, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, + parts.nScheme == INTERNET_SCHEME_HTTPS ? WINHTTP_FLAG_SECURE : 0) + : nullptr; + auto const close = [&]() { + if (request != nullptr) + ::WinHttpCloseHandle(request); + if (connection != nullptr) + ::WinHttpCloseHandle(connection); + }; + + if (request == nullptr || !::WinHttpSendRequest(request, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, 0) || !::WinHttpReceiveResponse(request, nullptr)) + { + Error = "WinHTTP error " + std::to_string(::GetLastError()); + close(); + return false; + } + + DWORD status{0}; + DWORD statussize{sizeof(status)}; + ::WinHttpQueryHeaders(request, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, WINHTTP_HEADER_NAME_BY_INDEX, &status, &statussize, WINHTTP_NO_HEADER_INDEX); + + for (;;) + { + if (Stop()) + { + Error = "cancelled"; + close(); + return false; + } + DWORD available{0}; + if (!::WinHttpQueryDataAvailable(request, &available)) + { + Error = "WinHTTP error " + std::to_string(::GetLastError()); + close(); + return false; + } + if (available == 0) + break; + std::size_t const offset = Out.size(); + Out.resize(offset + available); + DWORD received{0}; + if (!::WinHttpReadData(request, Out.data() + offset, available, &received)) + { + Error = "WinHTTP error " + std::to_string(::GetLastError()); + close(); + return false; + } + Out.resize(offset + received); + } + close(); + + if (status != 200) + { + Error = "HTTP " + std::to_string(status); + return false; + } + return true; +} + +#elif defined(EU07_WITH_CURL) + +http_client::http_client() +{ + static std::once_flag initialized; + std::call_once(initialized, []() { ::curl_global_init(CURL_GLOBAL_DEFAULT); }); + m_curl = ::curl_easy_init(); +} + +http_client::~http_client() +{ + if (m_curl != nullptr) + ::curl_easy_cleanup(m_curl); +} + +bool http_client::get(std::string const &Url, std::vector &Out, std::string &Error, stop_check const &Stop) +{ + Out.clear(); + if (m_curl == nullptr) + { + Error = "curl_easy_init failed"; + return false; + } + + auto const write = +[](char *Data, std::size_t Size, std::size_t Count, void *User) -> std::size_t { + auto *out = static_cast *>(User); + out->insert(out->end(), Data, Data + Size * Count); + return Size * Count; + }; + auto const progress = +[](void *User, curl_off_t, curl_off_t, curl_off_t, curl_off_t) -> int { return (*static_cast(User))() ? 1 : 0; }; + + ::curl_easy_reset(m_curl); + ::curl_easy_setopt(m_curl, CURLOPT_URL, Url.c_str()); + ::curl_easy_setopt(m_curl, CURLOPT_USERAGENT, "MaSzyna-editor"); + ::curl_easy_setopt(m_curl, CURLOPT_FOLLOWLOCATION, 1L); + ::curl_easy_setopt(m_curl, CURLOPT_NOSIGNAL, 1L); + ::curl_easy_setopt(m_curl, CURLOPT_CONNECTTIMEOUT, 10L); + ::curl_easy_setopt(m_curl, CURLOPT_LOW_SPEED_LIMIT, 1L); + ::curl_easy_setopt(m_curl, CURLOPT_LOW_SPEED_TIME, 20L); + ::curl_easy_setopt(m_curl, CURLOPT_WRITEFUNCTION, write); + ::curl_easy_setopt(m_curl, CURLOPT_WRITEDATA, &Out); + ::curl_easy_setopt(m_curl, CURLOPT_NOPROGRESS, 0L); + ::curl_easy_setopt(m_curl, CURLOPT_XFERINFOFUNCTION, progress); + ::curl_easy_setopt(m_curl, CURLOPT_XFERINFODATA, const_cast(&Stop)); + + CURLcode const code = ::curl_easy_perform(m_curl); + if (code != CURLE_OK) + { + Error = ::curl_easy_strerror(code); + return false; + } + long status{0}; + ::curl_easy_getinfo(m_curl, CURLINFO_RESPONSE_CODE, &status); + if (status != 200) + { + Error = "HTTP " + std::to_string(status); + return false; + } + return true; +} + +#else + +http_client::http_client() = default; +http_client::~http_client() = default; + +bool http_client::get(std::string const &, std::vector &Out, std::string &Error, stop_check const &) +{ + Out.clear(); + Error = "no http client in this build"; + return false; +} + +#endif + +// --------------------------------------------------------------------------------------------- +// geoportal requests and the disk cache + +struct tile_request +{ + int ix{0}; // easting index + int iy{0}; // northing index + int level{standard_pixels}; + int year{0}; + bool hires{false}; +}; + +struct image +{ + int width{0}; + int height{0}; + std::vector rgba; +}; + +// the archival services return the newest imagery taken up to TIME, but a TIME in the future yields a blank +// image, so the end of the requested year is clamped to the current month +std::string time_parameter(int Year) +{ + using namespace std::chrono; + year_month_day const today{floor(system_clock::now())}; + int year = Year; + unsigned month = 12; + int const thisyear = static_cast(today.year()); + if (year >= thisyear) + { + year = thisyear; + month = static_cast(today.month()); + } + char buffer[32]; + std::snprintf(buffer, sizeof(buffer), "%04d-%02u-01", year, month); + return buffer; +} + +std::string wms_url(tile_request const &Request, bool Hires, int Pixels, bool Png) +{ + std::string const service = Hires ? (Request.year ? "HighResolutionTime" : "HighResolution") : (Request.year ? "StandardResolutionTime" : "StandardResolution"); + std::string const layer = (Hires && Request.year) ? "Image" : "Raster"; + auto const size = static_cast(editor_orthophoto::tile_size); + long long const minn = Request.iy * size; + long long const mine = Request.ix * size; + + std::string url = "https://mapy.geoportal.gov.pl/wss/service/PZGIK/ORTO/WMS/" + service + + "?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=EPSG:2180&STYLES=&LAYERS=" + layer; + url += Png ? "&FORMAT=image/png&TRANSPARENT=TRUE" : "&FORMAT=image/jpeg"; + url += "&WIDTH=" + std::to_string(Pixels) + "&HEIGHT=" + std::to_string(Pixels); + // WMS 1.3.0 uses the axis order of the CRS, which for EPSG:2180 is northing first + url += "&BBOX=" + std::to_string(minn) + "," + std::to_string(mine) + "," + std::to_string(minn + size) + "," + std::to_string(mine + size); + if (Request.year) + url += "&TIME=" + time_parameter(Request.year); + return url; +} + +fs::path cache_root() +{ + fs::path root = user_config_path(".cache"); + if (root.empty()) + root = ".cache"; + return root / "geoportal"; +} + +fs::path cache_file(tile_request const &Request, bool Hires, std::string const &Suffix) +{ + std::string const product = std::string(Hires ? "hr_" : "sr_") + (Request.year ? std::to_string(Request.year) : std::string("latest")); + std::string const name = std::to_string(static_cast(editor_orthophoto::tile_size)) + "_" + std::to_string(Request.iy) + "_" + std::to_string(Request.ix) + "_" + Suffix; + return cache_root() / product / name; +} + +bool is_image(std::vector const &Data) +{ + if (Data.size() >= 3 && Data[0] == 0xFF && Data[1] == 0xD8 && Data[2] == 0xFF) + return true; // jpeg + return Data.size() >= 4 && Data[0] == 0x89 && Data[1] == 'P' && Data[2] == 'N' && Data[3] == 'G'; +} + +bool read_file(fs::path const &Path, std::vector &Out) +{ + std::ifstream file(Path, std::ios::binary); + if (!file.is_open()) + return false; + Out.assign(std::istreambuf_iterator(file), std::istreambuf_iterator()); + return !Out.empty(); +} + +void write_file(fs::path const &Path, std::vector const &Data) +{ + std::error_code ec; + fs::create_directories(Path.parent_path(), ec); + // write under a per-thread name and rename, so an interrupted write never leaves a truncated tile behind + std::ostringstream suffix; + suffix << ".part" << std::this_thread::get_id(); + fs::path temporary = Path; + temporary += suffix.str(); + { + std::ofstream file(temporary, std::ios::binary | std::ios::trunc); + if (!file.is_open()) + return; + file.write(reinterpret_cast(Data.data()), static_cast(Data.size())); + if (!file) + { + file.close(); + fs::remove(temporary, ec); + return; + } + } + fs::rename(temporary, Path, ec); + if (ec) + fs::remove(temporary, ec); +} + +// cached file if present, otherwise downloads (with a few retries, the service drops connections and answers 404 now and then) +bool fetch(http_client &Client, std::string const &Url, fs::path const &Path, std::vector &Out, std::string &Error, stop_check const &Stop) +{ + if (read_file(Path, Out) && is_image(Out)) + return true; + + for (int attempt = 0; attempt < 4; ++attempt) + { + if (Stop()) + { + Error = "cancelled"; + return false; + } + if (attempt > 0) + { + // back off, but stay responsive to shutdown + for (int wait = 0; wait < attempt * 5 && !Stop(); ++wait) + std::this_thread::sleep_for(std::chrono::milliseconds(100)); + } + if (!Client.get(Url, Out, Error, Stop)) + continue; + if (!is_image(Out)) + { + // service exception report (xml) or similar + Error = "unexpected response: " + std::string(Out.begin(), Out.begin() + std::min(Out.size(), 200)); + continue; + } + write_file(Path, Out); + return true; + } + return false; +} + +bool decode(std::vector const &Data, image &Out, std::string &Error) +{ + int width{0}, height{0}, components{0}; + stbi_uc *pixels = stbi_load_from_memory(Data.data(), static_cast(Data.size()), &width, &height, &components, 4); + if (pixels == nullptr) + { + Error = std::string("image decoding failed: ") + stbi_failure_reason(); + return false; + } + Out.width = width; + Out.height = height; + Out.rgba.assign(pixels, pixels + static_cast(width) * height * 4); + stbi_image_free(pixels); + return true; +} + +// 2x2 box filter +void halve(image &Image) +{ + int const width = std::max(1, Image.width / 2); + int const height = std::max(1, Image.height / 2); + std::vector out(static_cast(width) * height * 4); + for (int y = 0; y < height; ++y) + for (int x = 0; x < width; ++x) + for (int c = 0; c < 4; ++c) + { + auto const at = [&](int X, int Y) { return static_cast(Image.rgba[(static_cast(std::min(Y, Image.height - 1)) * Image.width + std::min(X, Image.width - 1)) * 4 + c]); }; + out[(static_cast(y) * width + x) * 4 + c] = static_cast((at(2 * x, 2 * y) + at(2 * x + 1, 2 * y) + at(2 * x, 2 * y + 1) + at(2 * x + 1, 2 * y + 1) + 2) / 4); + } + Image.width = width; + Image.height = height; + Image.rgba = std::move(out); +} + +// areas without imagery come back plain white (jpeg) or fully transparent (png) +bool is_blank(image const &Image) +{ + for (std::size_t i = 0; i + 3 < Image.rgba.size(); i += 4) + if (Image.rgba[i + 3] != 0 && (Image.rgba[i] < 250 || Image.rgba[i + 1] < 250 || Image.rgba[i + 2] < 250)) + return false; + return true; +} + +bool load_standard(http_client &Client, tile_request const &Request, image &Out, std::string &Error, stop_check const &Stop) +{ + std::vector data; + return fetch(Client, wms_url(Request, false, standard_pixels, false), cache_file(Request, false, std::to_string(standard_pixels) + ".jpg"), data, Error, Stop) && decode(data, Out, Error); +} + +// returns false on failure (to be retried later); Empty is set when the place has no imagery +bool load_tile(http_client &Client, tile_request const &Request, image &Out, bool &Empty, std::string &Error, stop_check const &Stop) +{ + Empty = false; + if (Request.hires && Request.level >= hires_pixels) + { + // the high-resolution product covers only parts of the country; a tiny transparent png tells whether this tile is covered + std::vector data; + image probe; + if (!fetch(Client, wms_url(Request, true, probe_pixels, true), cache_file(Request, true, "probe.png"), data, Error, Stop) || !decode(data, probe, Error)) + return false; + std::size_t covered{0}; + for (std::size_t i = 3; i < probe.rgba.size(); i += 4) + covered += (probe.rgba[i] != 0); + std::size_t const total = probe.rgba.size() / 4; + + if (covered == total) + { + return fetch(Client, wms_url(Request, true, hires_pixels, false), cache_file(Request, true, std::to_string(hires_pixels) + ".jpg"), data, Error, Stop) && decode(data, Out, Error); + } + if (covered > 0) + { + // edge of the covered area: transparent png, holes filled from the standard imagery + if (!fetch(Client, wms_url(Request, true, hires_pixels, true), cache_file(Request, true, std::to_string(hires_pixels) + ".png"), data, Error, Stop) || !decode(data, Out, Error)) + return false; + image standard; + std::string ignored; + if (load_standard(Client, Request, standard, ignored, Stop) && standard.width > 0 && standard.height > 0) + { + for (int y = 0; y < Out.height; ++y) + for (int x = 0; x < Out.width; ++x) + { + std::uint8_t *pixel = &Out.rgba[(static_cast(y) * Out.width + x) * 4]; + if (pixel[3] == 255) + continue; + int const sx = std::min(standard.width - 1, x * standard.width / Out.width); + int const sy = std::min(standard.height - 1, y * standard.height / Out.height); + std::uint8_t const *source = &standard.rgba[(static_cast(sy) * standard.width + sx) * 4]; + unsigned const alpha = pixel[3]; + for (int c = 0; c < 3; ++c) + pixel[c] = static_cast((pixel[c] * alpha + source[c] * (255u - alpha) + 127u) / 255u); + pixel[3] = 255; + } + } + return true; + } + // not covered at all: fall back to the standard imagery + } + + if (!load_standard(Client, Request, Out, Error, Stop)) + return false; + if (is_blank(Out)) + { + Empty = true; + Out = image{}; + return true; + } + while (Out.width > Request.level && Out.width > 1) + halve(Out); + return true; +} + +// the services cover Poland only (EPSG:2180 extent from their capabilities, plus a margin); no point asking about other places +bool in_service_area(int Ix, int Iy) +{ + double const east = (Ix + 0.5) * editor_orthophoto::tile_size; + double const north = (Iy + 0.5) * editor_orthophoto::tile_size; + return north > 100000.0 && north < 900000.0 && east > 100000.0 && east < 900000.0; +} + +// homogeneous clip-space vertex with texture coordinates +struct clip_vertex +{ + glm::vec4 position; + glm::vec2 uv; +}; + +// Sutherland-Hodgman against a single clip plane; Distance(v) >= 0 is inside +template int clip_polygon(clip_vertex const *In, int Count, clip_vertex *Out, Distance_ const &Distance) +{ + int count{0}; + for (int i = 0; i < Count; ++i) + { + clip_vertex const &a = In[i]; + clip_vertex const &b = In[(i + 1) % Count]; + float const da = Distance(a.position); + float const db = Distance(b.position); + if (da >= 0.0f) + Out[count++] = a; + if ((da >= 0.0f) != (db >= 0.0f)) + { + float const t = da / (da - db); + Out[count++] = {glm::mix(a.position, b.position, t), glm::mix(a.uv, b.uv, t)}; + } + } + return count; +} +} // namespace + +// --------------------------------------------------------------------------------------------- + +editor_orthophoto::~editor_orthophoto() +{ + { + std::lock_guard lock(m_mutex); + m_stop = true; + m_queue.clear(); + } + m_wakeup.notify_all(); + for (auto &worker : m_workers) + if (worker.joinable()) + worker.join(); +} + +bool editor_orthophoto::can_download() +{ +#if defined(_WIN32) || defined(EU07_WITH_CURL) + return true; +#else + return false; +#endif +} + +std::string editor_orthophoto::cache_directory() +{ + auto const path = cache_root().u8string(); + return std::string(path.begin(), path.end()); +} + +void editor_orthophoto::enabled(bool State) +{ + if (State == m_enabled) + return; + m_enabled = State; + if (m_enabled) + { + start_workers(); + return; + } + cancel_pending(); + for (auto &entry : m_tiles) + release_tile(entry.second); + m_tiles.clear(); + ++m_generation; // results still in flight are now stale + std::lock_guard lock(m_mutex); + m_done.clear(); +} + +void editor_orthophoto::settings(config const &Config) +{ + bool const sourcechanged = (Config.year != m_config.year || Config.hires != m_config.hires); + m_config = Config; + m_config.radius = std::clamp(m_config.radius, 0, max_radius); + m_config.opacity = std::clamp(m_config.opacity, 0.0f, 1.0f); + if (!sourcechanged) + return; + cancel_pending(); + for (auto &entry : m_tiles) + release_tile(entry.second); + m_tiles.clear(); + ++m_generation; +} + +void editor_orthophoto::cancel_pending() +{ + { + std::lock_guard lock(m_mutex); + m_queue.clear(); + } + // jobs already picked up by a worker still deliver their result, which is accepted if the tile is still wanted + for (auto &entry : m_tiles) + entry.second.requested = 0; +} + +void editor_orthophoto::retry_failed() +{ + for (auto &entry : m_tiles) + { + entry.second.failures = 0; + entry.second.retry_at = 0.0; + } +} + +editor_orthophoto::statistics editor_orthophoto::stats() const +{ + statistics out; + for (auto const &entry : m_tiles) + { + tile const &t = entry.second; + if (t.level > 0 && !t.empty && t.texture != null_handle) + ++out.resident; + if (t.requested != 0) + ++out.loading; + else if (t.failures > 0 && t.level == 0) + ++out.failed; + } + return out; +} + +int editor_orthophoto::level_for(int Distance, bool Hires) +{ + // coarser imagery further away keeps the memory use of large radii in check + if (Distance <= 1) + return Hires ? hires_pixels : standard_pixels; + if (Distance <= 3) + return standard_pixels; + if (Distance <= 6) + return standard_pixels / 2; + return standard_pixels / 4; +} + +editor_orthophoto::tile_key editor_orthophoto::camera_tile(glm::dvec3 const &Camera) const +{ + double const east = m_config.east - Camera.x; + double const north = m_config.north + Camera.z; + return {static_cast(std::floor(east / tile_size)), static_cast(std::floor(north / tile_size))}; +} + +void editor_orthophoto::start_workers() +{ + if (!m_workers.empty()) + return; + for (int i = 0; i < worker_count; ++i) + m_workers.emplace_back(&editor_orthophoto::worker, this); +} + +texture_handle editor_orthophoto::acquire_texture() +{ + if (!m_free_textures.empty()) + { + texture_handle const handle = m_free_textures.back(); + m_free_textures.pop_back(); + return handle; + } + // script-style generated texture: no file behind it, the content is supplied through update_from_memory() + return GfxRenderer->Fetch_Texture("internal_src:editor_orthophoto_" + std::to_string(m_texture_count++), true); +} + +void editor_orthophoto::release_tile(tile &Tile) +{ + if (Tile.texture == null_handle) + return; + // shrink to a single texel to give the gpu memory back; the slot is reused by the next tile + std::uint8_t const texel[4] = {0, 0, 0, 0}; + GfxRenderer->Texture(Tile.texture).update_from_memory(1, 1, texel); + m_free_textures.push_back(Tile.texture); + Tile.texture = null_handle; +} + +void editor_orthophoto::schedule(tile_key const &Key, tile &Tile, int Level) +{ + { + std::lock_guard lock(m_mutex); + m_queue.erase(std::remove_if(m_queue.begin(), m_queue.end(), [&](job const &Job) { return Job.key == Key; }), m_queue.end()); + m_queue.push_back(job{Key, Level, source{m_config.year, m_config.hires}, m_generation.load()}); + } + Tile.requested = Level; + m_wakeup.notify_one(); +} + +std::size_t editor_orthophoto::apply(result &Result, double Now) +{ + if (Result.generation != m_generation.load()) + return 0; + auto const lookup = m_tiles.find(Result.key); + if (lookup == m_tiles.end()) + return 0; // left the area in the meantime; the imagery stays in the disk cache + tile &t = lookup->second; + bool const current = (t.requested == Result.level); + if (current) + t.requested = 0; + + if (!Result.ok) + { + if (current) + { + ++t.failures; + t.retry_at = (t.failures >= 5) ? std::numeric_limits::max() : Now + std::min(120.0, 5.0 * std::pow(2.0, t.failures - 1)); + } + return 0; + } + + t.failures = 0; + t.level = Result.level; + t.empty = Result.empty; + if (Result.empty) + { + release_tile(t); + return 0; + } + if (t.texture == null_handle) + t.texture = acquire_texture(); + if (t.texture == null_handle) + { + t.level = 0; + return 0; + } + GfxRenderer->Texture(t.texture).update_from_memory(Result.width, Result.height, Result.pixels.data()); + return Result.pixels.size(); +} + +void editor_orthophoto::update(glm::dvec3 const &Camera) +{ + double const now = steady_seconds(); + + // finished work first, within a per-frame upload budget + std::size_t uploaded{0}; + while (uploaded < upload_budget) + { + result done; + { + std::lock_guard lock(m_mutex); + if (m_done.empty()) + break; + done = std::move(m_done.front()); + m_done.pop_front(); + } + if (m_enabled) + uploaded += apply(done, now); + } + + if (!m_enabled) + return; + + tile_key const centre = camera_tile(Camera); + if (centre != m_camera_tile) + { + m_camera_tile = centre; + std::lock_guard lock(m_mutex); + m_focus = centre; + } + int const radius = m_config.radius; + auto const distance = [&](tile_key const &Key) { return std::max(std::abs(Key.first - centre.first), std::abs(Key.second - centre.second)); }; + + // tiles which left the area + bool evicted{false}; + for (auto it = m_tiles.begin(); it != m_tiles.end();) + { + if (distance(it->first) > radius) + { + release_tile(it->second); + it = m_tiles.erase(it); + evicted = true; + } + else + ++it; + } + if (evicted) + { + std::lock_guard lock(m_mutex); + m_queue.erase(std::remove_if(m_queue.begin(), m_queue.end(), [&](job const &Job) { return distance(Job.key) > radius; }), m_queue.end()); + } + + // tiles which need (different) imagery + for (int dy = -radius; dy <= radius; ++dy) + for (int dx = -radius; dx <= radius; ++dx) + { + tile_key const key{centre.first + dx, centre.second + dy}; + tile &t = m_tiles[key]; + if (!in_service_area(key.first, key.second)) + t.empty = true; + int const level = level_for(std::max(std::abs(dx), std::abs(dy)), m_config.hires); + if (t.empty || t.level == level || t.requested == level || now < t.retry_at) + continue; + schedule(key, t, level); + } +} + +void editor_orthophoto::worker() +{ + stbi_set_flip_vertically_on_load_thread(0); // the texture loader flips globally; tiles keep the north edge in the first row + http_client client; + stop_check const stopping = [this]() { return m_stop.load(); }; + + for (;;) + { + job current; + { + std::unique_lock lock(m_mutex); + m_wakeup.wait(lock, [this]() { return m_stop.load() || !m_queue.empty(); }); + if (m_stop) + return; + // nearest tile first + auto best = m_queue.begin(); + long long bestdistance = LLONG_MAX; + for (auto it = m_queue.begin(); it != m_queue.end(); ++it) + { + long long const dx = it->key.first - m_focus.first; + long long const dy = it->key.second - m_focus.second; + long long const d = dx * dx + dy * dy; + if (d < bestdistance) + { + bestdistance = d; + best = it; + } + } + current = *best; + m_queue.erase(best); + } + + result out; + out.key = current.key; + out.level = current.level; + out.generation = current.generation; + + image picture; + std::string error; + tile_request const request{current.key.first, current.key.second, current.level, current.src.year, current.src.hires}; + out.ok = load_tile(client, request, picture, out.empty, error, stopping); + if (m_stop) + return; + if (!out.ok) + ErrorLog("Editor orthophoto: tile " + std::to_string(current.key.second) + "_" + std::to_string(current.key.first) + " failed: " + error); + out.width = picture.width; + out.height = picture.height; + out.pixels = std::move(picture.rgba); + + std::lock_guard lock(m_mutex); + m_done.push_back(std::move(out)); + } +} + +void editor_orthophoto::draw(glm::mat4 const &ViewProjection, glm::dvec3 const &CameraPos, float ScreenWidth, float ScreenHeight) const +{ + if (!m_enabled || m_config.opacity <= 0.0f || ScreenWidth <= 0.0f || ScreenHeight <= 0.0f) + return; + + ImDrawList *drawlist = ImGui::GetBackgroundDrawList(); + ImU32 const color = IM_COL32(255, 255, 255, static_cast(m_config.opacity * 255.0f + 0.5f)); + auto const tosceen = [&](glm::vec4 const &Clip) { return ImVec2((Clip.x / Clip.w * 0.5f + 0.5f) * ScreenWidth, (0.5f - Clip.y / Clip.w * 0.5f) * ScreenHeight); }; + // slightly wider than the view so clipped edges never show on screen + float constexpr guard{1.02f}; + auto const outside = [&](glm::vec4 const *Corners) { + auto const all = [&](auto const &Test) { return Test(Corners[0]) && Test(Corners[1]) && Test(Corners[2]) && Test(Corners[3]); }; + return all([](glm::vec4 const &v) { return v.w < near_w; }) || all([&](glm::vec4 const &v) { return v.x > v.w * guard; }) || + all([&](glm::vec4 const &v) { return v.x < -v.w * guard; }) || all([&](glm::vec4 const &v) { return v.y > v.w * guard; }) || + all([&](glm::vec4 const &v) { return v.y < -v.w * guard; }); + }; + + double const height = static_cast(m_config.height); + for (auto const &entry : m_tiles) + { + tile const &t = entry.second; + if (t.level == 0 || t.empty || t.texture == null_handle) + continue; + std::size_t const textureid = GfxRenderer->Texture(t.texture).get_id(); + if (textureid == 0 || textureid == static_cast(static_cast(-1))) + continue; + + // world extent of the tile; u runs west->east (-x), v runs north->south (-z), matching the image rows + double const westx = m_config.east - entry.first.first * tile_size; + double const northz = (entry.first.second + 1) * tile_size - m_config.north; + auto const relative = [&](double U, double V) { return glm::vec3(glm::dvec3(westx - U * tile_size, height, northz - V * tile_size) - CameraPos); }; + // the tile is a parallelogram and the projection is linear before the divide, so clip positions interpolate exactly + glm::vec4 const c00 = ViewProjection * glm::vec4(relative(0.0, 0.0), 1.0f); + glm::vec4 const du = ViewProjection * glm::vec4(relative(1.0, 0.0), 1.0f) - c00; + glm::vec4 const dv = ViewProjection * glm::vec4(relative(0.0, 1.0), 1.0f) - c00; + glm::vec4 const corners[4] = {c00, c00 + du, c00 + du + dv, c00 + dv}; + if (outside(corners)) + continue; + + // ImGui interpolates texture coordinates affinely, so subdivide finer where the camera is close + double const nearestx = std::clamp(CameraPos.x, westx - tile_size, westx); + double const nearestz = std::clamp(CameraPos.z, northz - tile_size, northz); + double const distance = glm::length(glm::dvec3(nearestx, height, nearestz) - CameraPos); + double const step = std::clamp(distance * 0.2, 4.0, tile_size); + int const segments = std::clamp(static_cast(std::ceil(tile_size / step)), 1, 64); + float const segmentsize = 1.0f / static_cast(segments); + + drawlist->PushTextureID(reinterpret_cast(textureid)); + for (int j = 0; j < segments; ++j) + for (int i = 0; i < segments; ++i) + { + if (static_cast(drawlist->VtxBuffer.Size) + 16 > vertex_budget) + { + drawlist->PopTextureID(); + return; + } + float const u0 = i * segmentsize, u1 = (i + 1) * segmentsize; + float const v0 = j * segmentsize, v1 = (j + 1) * segmentsize; + clip_vertex quad[4] = { + {c00 + du * u0 + dv * v0, {u0, v0}}, + {c00 + du * u1 + dv * v0, {u1, v0}}, + {c00 + du * u1 + dv * v1, {u1, v1}}, + {c00 + du * u0 + dv * v1, {u0, v1}}, + }; + glm::vec4 const positions[4] = {quad[0].position, quad[1].position, quad[2].position, quad[3].position}; + if (outside(positions)) + continue; + + // clip against the near plane and the (slightly widened) sides of the view + clip_vertex buffer0[12], buffer1[12]; + int count = clip_polygon(quad, 4, buffer0, [](glm::vec4 const &v) { return v.w - near_w; }); + count = clip_polygon(buffer0, count, buffer1, [&](glm::vec4 const &v) { return v.w * guard - v.x; }); + count = clip_polygon(buffer1, count, buffer0, [&](glm::vec4 const &v) { return v.w * guard + v.x; }); + count = clip_polygon(buffer0, count, buffer1, [&](glm::vec4 const &v) { return v.w * guard - v.y; }); + count = clip_polygon(buffer1, count, buffer0, [&](glm::vec4 const &v) { return v.w * guard + v.y; }); + if (count < 3) + continue; + + drawlist->PrimReserve((count - 2) * 3, count); + auto const base = static_cast(drawlist->_VtxCurrentIdx); + for (int k = 1; k + 1 < count; ++k) + { + drawlist->PrimWriteIdx(base); + drawlist->PrimWriteIdx(static_cast(base + k)); + drawlist->PrimWriteIdx(static_cast(base + k + 1)); + } + for (int k = 0; k < count; ++k) + drawlist->PrimWriteVtx(tosceen(buffer0[k].position), ImVec2(buffer0[k].uv.x, buffer0[k].uv.y), color); + } + drawlist->PopTextureID(); + } +} diff --git a/editor/editorOrthophoto.hpp b/editor/editorOrthophoto.hpp new file mode 100644 index 000000000..40fdf98ee --- /dev/null +++ b/editor/editorOrthophoto.hpp @@ -0,0 +1,154 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "interfaces/ITexture.h" // texture_handle + +// Editor aid: aerial orthophoto tiles from geoportal.gov.pl (GUGiK WMS), drawn as a translucent +// horizontal layer around the camera. +// +// Tiles are aligned to an absolute 256 m grid in PUWG 1992 (EPSG:2180), so the disk cache is shared +// between sceneries. The scenery is placed on that grid through the PUWG coordinates of its (0,0,0) +// point; MaSzyna's +Z points north and +X points west, hence easting = E0 - x, northing = N0 + z. +// +// Downloading, cache I/O and image decoding run on worker threads; the main thread only uploads +// finished images (a bounded amount per frame) and emits the overlay geometry. The overlay goes into +// the ImGui background draw list, like the other editor viewport overlays, so it works with every +// renderer backend, but it isn't depth-tested against the scene. +class editor_orthophoto +{ + public: + struct config + { + double north{0.0}; // PUWG 1992 X (northing) of the scenery origin + double east{0.0}; // PUWG 1992 Y (easting) of the scenery origin + int radius{2}; // tiles loaded around the camera tile (Chebyshev distance) + float height{0.0f}; // world Y of the layer + float opacity{0.6f}; // 0..1 + int year{0}; // 0 = newest available imagery, otherwise newest imagery taken up to the end of that year + bool hires{false}; // 4096 px tiles from the high-resolution product next to the camera, where it exists + }; + + struct statistics + { + int resident{0}; // tiles with imagery on screen + int loading{0}; // tiles waiting for or being processed by a worker + int failed{0}; // tiles whose last attempt failed + }; + + static constexpr double tile_size{256.0}; // metres per tile side + static constexpr int max_radius{10}; + static constexpr int oldest_year{1995}; // first year offered by the archival service + + editor_orthophoto() = default; + ~editor_orthophoto(); + editor_orthophoto(editor_orthophoto const &) = delete; + editor_orthophoto &operator=(editor_orthophoto const &) = delete; + + bool enabled() const { return m_enabled; } + // disabling drops the queue and returns the gpu memory of the resident tiles + void enabled(bool State); + config const &settings() const { return m_config; } + // changes of year / resolution invalidate resident tiles, the rest applies immediately + void settings(config const &Config); + + // main thread, once per frame: schedules tiles around the camera and uploads finished ones + void update(glm::dvec3 const &Camera); + // main thread, inside an ImGui frame: emits the overlay into the background draw list. + // ViewProjection must map camera-relative world positions (world - CameraPos) to clip space. + void draw(glm::mat4 const &ViewProjection, glm::dvec3 const &CameraPos, float ScreenWidth, float ScreenHeight) const; + // forgets pending (not yet started) downloads, e.g. when the editor is left + void cancel_pending(); + // clears failure state so failed tiles are attempted again + void retry_failed(); + + statistics stats() const; + // false when the build has no http client; cached tiles are still shown + static bool can_download(); + static std::string cache_directory(); + + private: + using tile_key = std::pair; // (easting index, northing index) on the PUWG tile grid + + struct source + { + int year{0}; + bool hires{false}; + }; + + struct job + { + tile_key key; + int level{0}; // requested texture size in pixels + source src; + std::uint32_t generation{0}; + }; + + struct result + { + tile_key key; + int level{0}; + std::uint32_t generation{0}; + bool ok{false}; + bool empty{false}; // no imagery for this place/year: nothing to draw + int width{0}; + int height{0}; + std::vector pixels; // RGBA8, first row = north edge + }; + + struct tile + { + texture_handle texture{null_handle}; + int level{0}; // size of the imagery currently held (0 = nothing yet) + int requested{0}; // level of the job scheduled for this tile (0 = none) + bool empty{false}; + int failures{0}; + double retry_at{0.0}; // steady clock seconds + }; + + static int level_for(int Distance, bool Hires); + tile_key camera_tile(glm::dvec3 const &Camera) const; + void schedule(tile_key const &Key, tile &Tile, int Level); + std::size_t apply(result &Result, double Now); // returns bytes uploaded + void release_tile(tile &Tile); + texture_handle acquire_texture(); + void start_workers(); + void worker(); + + config m_config; + bool m_enabled{false}; + std::map m_tiles; // main thread only + tile_key m_camera_tile{0, 0}; + std::vector m_free_textures; // pool of texture slots, reused between tiles + int m_texture_count{0}; + + // shared with the workers, guarded by m_mutex + mutable std::mutex m_mutex; + std::condition_variable m_wakeup; + std::deque m_queue; + std::deque m_done; + tile_key m_focus{0, 0}; // workers pick the queued tile closest to it + + std::atomic m_stop{false}; + std::atomic m_generation{1}; + std::vector m_workers; +}; diff --git a/editor/editorSettings.cpp b/editor/editorSettings.cpp index 86214d6bf..3f7956e2d 100644 --- a/editor/editorSettings.cpp +++ b/editor/editorSettings.cpp @@ -12,9 +12,13 @@ http://mozilla.org/MPL/2.0/. #include "utilities/Logs.h" #include "utilities/utilities.h" +#include #include #include #include +#include +#include +#include editorSettings EditorSettings; @@ -32,6 +36,28 @@ const char *scheme_to_string(editorSettings::movement_scheme scheme) { return scheme == editorSettings::movement_scheme::legacy ? "legacy" : "wsad"; } + +// numbers are stored locale-independent +template void parse(std::string const &Text, Type_ &Out) +{ + std::istringstream stream(Text); + stream.imbue(std::locale::classic()); + Type_ value; + if (stream >> value) + Out = value; +} + +const std::string origin_prefix{"ortho_origin@"}; + +// settings are whitespace separated key/value pairs, so the scenery name used in the key can't contain spaces +std::string origin_key(std::string const &Scenery) +{ + std::string key = origin_prefix + Scenery; + for (char &c : key) + if (std::isspace(static_cast(c))) + c = '_'; + return key; +} } bool editorSettings::load() @@ -50,6 +76,27 @@ bool editorSettings::load() { if (key == "movement_scheme") m_movement = (value == "legacy") ? movement_scheme::legacy : movement_scheme::wsad; + else if (key == "ortho_radius") + parse(value, m_orthophoto.radius); + else if (key == "ortho_height") + parse(value, m_orthophoto.height); + else if (key == "ortho_opacity") + parse(value, m_orthophoto.opacity); + else if (key == "ortho_year") + parse(value, m_orthophoto.year); + else if (key == "ortho_4k") + m_orthophoto.hires = (value == "1"); + else if (key.rfind(origin_prefix, 0) == 0) + { + // northing;easting + auto const separator = value.find(';'); + if (separator == std::string::npos) + continue; + double north{0.0}, east{0.0}; + parse(value.substr(0, separator), north); + parse(value.substr(separator + 1), east); + m_orthophoto_origins[key] = {north, east}; + } } return true; } @@ -67,6 +114,30 @@ bool editorSettings::save() return false; } + stream.imbue(std::locale::classic()); stream << "movement_scheme " << scheme_to_string(m_movement) << "\n"; + stream << "ortho_radius " << m_orthophoto.radius << "\n"; + stream << "ortho_height " << m_orthophoto.height << "\n"; + stream << "ortho_opacity " << m_orthophoto.opacity << "\n"; + stream << "ortho_year " << m_orthophoto.year << "\n"; + stream << "ortho_4k " << (m_orthophoto.hires ? 1 : 0) << "\n"; + stream << std::fixed << std::setprecision(3); + for (auto const &origin : m_orthophoto_origins) + stream << origin.first << " " << origin.second.first << ";" << origin.second.second << "\n"; return true; } + +bool editorSettings::orthophoto_origin(std::string const &Scenery, double &North, double &East) const +{ + auto const lookup = m_orthophoto_origins.find(origin_key(Scenery)); + if (lookup == m_orthophoto_origins.end()) + return false; + North = lookup->second.first; + East = lookup->second.second; + return true; +} + +void editorSettings::orthophoto_origin(std::string const &Scenery, double North, double East) +{ + m_orthophoto_origins[origin_key(Scenery)] = {North, East}; +} diff --git a/editor/editorSettings.hpp b/editor/editorSettings.hpp index 4ed09444e..122a6f049 100644 --- a/editor/editorSettings.hpp +++ b/editor/editorSettings.hpp @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + class editorSettings { public: @@ -18,8 +22,24 @@ public: movement_scheme movement() const { return m_movement; } void movement(movement_scheme scheme) { m_movement = scheme; } + // geoportal orthophoto layer (editor_orthophoto); the origin is kept per scenery + struct orthophoto_settings + { + int radius{2}; + float height{0.0f}; + float opacity{0.6f}; + int year{0}; + bool hires{false}; + }; + orthophoto_settings &orthophoto() { return m_orthophoto; } + // PUWG 1992 northing/easting of the scenery's (0,0,0) point; false when none was stored + bool orthophoto_origin(std::string const &Scenery, double &North, double &East) const; + void orthophoto_origin(std::string const &Scenery, double North, double East); + private: movement_scheme m_movement{movement_scheme::wsad}; + orthophoto_settings m_orthophoto; + std::map> m_orthophoto_origins; }; // global editor settings instance From 41a660e0c33a9bd575bf0af904241d6addd86406 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Thu, 1 Oct 2026 20:13:59 +0200 Subject: [PATCH 029/430] Update editoruilayer.cpp --- application/editoruilayer.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index 1c9a64605..17514efb8 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -106,16 +106,6 @@ void editor_ui::render_rotation_controls() m_functionspanel.render_controls(); } -std::vector editor_ui::nodebank_groups() const -{ - return m_nodebankpanel.group_names(); -} - -std::vector editor_ui::nodebank_group_templates(std::size_t const Group) const -{ - return m_nodebankpanel.group_templates(Group); -} - void editor_ui::set_node(scene::basic_node *Node) { m_node = Node; From 76a39af8c229d39f8d89122b39d1c41670bb4c4a Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Thu, 1 Oct 2026 20:21:01 +0200 Subject: [PATCH 030/430] fix: bound MotorParam and MPTRelay indices (#196) --- McZapkie/MOVER.h | 7 +++- McZapkie/Mover.cpp | 83 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 65 insertions(+), 25 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index a66584941..e7bd1d234 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1086,7 +1086,7 @@ struct TMPTRelay double Iup = 0.0; double Idown = 0.0; }; -typedef TMPTRelay TMPTRelayTable[8]; +typedef TMPTRelay TMPTRelayTable[MotorParametersArraySize + 1]; // indexed like MotorParam struct TMotorParameters { @@ -1729,6 +1729,11 @@ class TMoverParameters TMotorParameters MotorParam[MotorParametersArraySize + 1]; /*rozne parametry silnika przy bocznikowaniach*/ /*dla lokomotywy spalinowej z przekladnia mechaniczna: przelozenia biegow*/ + // bounds-safe read access to MotorParam + TMotorParameters const &motor_param(int const Position) const + { + return MotorParam[std::clamp(Position, 0, MotorParametersArraySize)]; + } TTransmision Transmision; // record {liczba zebow przekladni} // NToothM, NToothW : byte; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 61bdc17a7..82dd245fd 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -355,7 +355,7 @@ double TMoverParameters::Current(double n, double U) if (DynamicBrakeFlag && !FuseFlag && DynamicBrakeType == dbrake_automatic && Power110vIsAvailable && Mains) // hamowanie EP09 //TUHEX { // TODO: zrobic bardziej uniwersalne nie tylko dla EP09 - MotorCurrent = -std::max(MotorParam[0].fi * (Vadd / (Vadd + MotorParam[0].Isat) - MotorParam[0].fi0), 0.) * n * 2.0 / DynamicBrakeRes; + MotorCurrent = -std::max(motor_param(0).fi * (Vadd / (Vadd + motor_param(0).Isat) - motor_param(0).fi0), 0.) * n * 2.0 / DynamicBrakeRes; } else if (RList[MainCtrlActualPos].Bn == 0 || false == StLinFlag) { @@ -390,7 +390,7 @@ double TMoverParameters::Current(double n, double U) if (DynamicBrakeType == dbrake_switch && TrainType == dt_ET42) { // z Megapacka Rz = WindingRes + R; - MotorCurrent = -MotorParam[SP].fi * n / Rz; //{hamowanie silnikiem na oporach rozruchowych} + MotorCurrent = -motor_param(SP).fi * n / Rz; //{hamowanie silnikiem na oporach rozruchowych} } } else @@ -398,13 +398,13 @@ double TMoverParameters::Current(double n, double U) } else { - U1 = U + Mn * n * MotorParam[SP].fi0 * MotorParam[SP].fi; + U1 = U + Mn * n * motor_param(SP).fi0 * motor_param(SP).fi; // writepaslog("U1 ", FloatToStr(U1)); // writepaslog("Isat ", FloatToStr(MotorParam[SP].Isat)); // writepaslog("fi ", FloatToStr(MotorParam[SP].fi)); - Isf = Sign(U1) * MotorParam[SP].Isat; + Isf = Sign(U1) * motor_param(SP).Isat; // writepaslog("Isf ", FloatToStr(Isf)); - Delta = square(Isf * Rz + Mn * MotorParam[SP].fi * n - U1) + 4.0 * U1 * Isf * Rz; // 105 * 1.67 + Mn * 140.9 * 20.532 - U1 + Delta = square(Isf * Rz + Mn * motor_param(SP).fi * n - U1) + 4.0 * U1 * Isf * Rz; // 105 * 1.67 + Mn * 140.9 * 20.532 - U1 // DeltaQ = Isf * Rz + Mn * MotorParam[SP].fi * n - U1 + 4 * U1 * Isf * Rz; // writepaslog("Delta ", FloatToStr(Delta)); // writepaslog("DeltaQ ", FloatToStr(DeltaQ)); @@ -412,9 +412,9 @@ double TMoverParameters::Current(double n, double U) if (Mains) { if (U > 0) - MotorCurrent = (U1 - Isf * Rz - Mn * MotorParam[SP].fi * n + std::sqrt(Delta)) / (2.0 * Rz); + MotorCurrent = (U1 - Isf * Rz - Mn * motor_param(SP).fi * n + std::sqrt(Delta)) / (2.0 * Rz); else - MotorCurrent = (U1 - Isf * Rz - Mn * MotorParam[SP].fi * n - std::sqrt(Delta)) / (2.0 * Rz); + MotorCurrent = (U1 - Isf * Rz - Mn * motor_param(SP).fi * n - std::sqrt(Delta)) / (2.0 * Rz); } else MotorCurrent = 0; @@ -5534,9 +5534,9 @@ double TMoverParameters::TractionForce(double dt) case TEngineType::DieselEngine: { if (ShuntMode) // dodatkowa przekładnia np. dla 2Ls150 - dtrans = AnPos * Transmision.Ratio * MotorParam[ScndCtrlActualPos].mIsat; + dtrans = AnPos * Transmision.Ratio * motor_param(ScndCtrlActualPos).mIsat; else - dtrans = Transmision.Ratio * MotorParam[ScndCtrlActualPos].mIsat; + dtrans = Transmision.Ratio * motor_param(ScndCtrlActualPos).mIsat; dmoment = dizel_Momentum(dizel_fill, dtrans * nrot * DirActive, dt); // oblicza tez enrot break; @@ -5981,10 +5981,10 @@ double TMoverParameters::TractionForce(double dt) Mm = Mw / Transmision.Ratio; // moment silnika trakcyjnego // with MotorParam[ScndCtrlPos] do - if (abs(Mm) > MotorParam[ScndCtrlPos].fi) - Im = NPoweredAxles * abs(abs(Mm) / MotorParam[ScndCtrlPos].mfi + MotorParam[ScndCtrlPos].mIsat); + if (abs(Mm) > motor_param(ScndCtrlPos).fi) + Im = NPoweredAxles * abs(abs(Mm) / motor_param(ScndCtrlPos).mfi + motor_param(ScndCtrlPos).mIsat); else - Im = NPoweredAxles * sqrt(abs(Mm * MotorParam[ScndCtrlPos].Isat)); + Im = NPoweredAxles * sqrt(abs(Mm * motor_param(ScndCtrlPos).Isat)); if (ShuntMode) { @@ -6762,7 +6762,7 @@ double TMoverParameters::Momentum(double I) SP = RList[MainCtrlActualPos].ScndAct; // Momentum:=mfi*I*(1-1.0/(Abs(I)/mIsat+1)); - return MotorParam[SP].mfi * I * (abs(I) / (abs(I) + MotorParam[SP].mIsat) - MotorParam[SP].mfi0); + return motor_param(SP).mfi * I * (abs(I) / (abs(I) + motor_param(SP).mIsat) - motor_param(SP).mfi0); } // ************************************************************************************************* @@ -6773,7 +6773,7 @@ double TMoverParameters::MomentumF(double I, double Iw, int SCP) { // umozliwia dokladne sterowanie wzbudzeniem - return MotorParam[SCP].mfi * I * std::max(abs(Iw) / (abs(Iw) + MotorParam[SCP].mIsat) - MotorParam[SCP].mfi0, 0.); + return motor_param(SCP).mfi * I * std::max(abs(Iw) / (abs(Iw) + motor_param(SCP).mIsat) - motor_param(SCP).mfi0, 0.); } // ************************************************************************************************* @@ -6906,7 +6906,7 @@ bool TMoverParameters::AutoRelayCheck(void) } // sprawdzenie wszystkich warunkow (AutoRelayFlag, AutoSwitch, Im VelUp) { @@ -7831,7 +7831,7 @@ bool TMoverParameters::dizel_AutoGearCheck(void) } else dizel_EngageSwitch(0.0); - if (!(MotorParam[ScndCtrlActualPos].mIsat > 0)) + if (!(motor_param(ScndCtrlActualPos).mIsat > 0)) dizel_EngageSwitch(0.0); // wylacz sprzeglo na pozycjach neutralnych if (!AutoRelayFlag) ScndCtrlActualPos = ScndCtrlPos; @@ -7953,7 +7953,7 @@ double TMoverParameters::dizel_fillcheck(int mcp, double dt) // napelnienie zalezne od MainCtrlPos if (EIMCtrlType > 0) { - realfill = std::max(0.0, std::min(eimic_real, 1 - MotorParam[ScndCtrlActualPos].Isat)); + realfill = std::max(0.0, std::min(eimic_real, 1 - motor_param(ScndCtrlActualPos).Isat)); if (eimic_real > 0.005 && !hydro_TC_Lockup) { dizel_nreg_min = std::min(dizel_nreg_min + 2.5 * dt, dizel_nmin_hdrive + eimic_real * dizel_nmin_hdrive_factor); @@ -8041,7 +8041,7 @@ double TMoverParameters::dizel_Momentum(double dizel_fill, double n, double dt) double Moment = 0, enMoment = 0, gearMoment = 0, eps = 0, newn = 0, friction = 0, neps = 0; double TorqueH = 0, TorqueL = 0, TorqueC = 0; n = n * CabActive; - if (MotorParam[ScndCtrlActualPos].mIsat < 0.001 || DirActive == 0) + if (motor_param(ScndCtrlActualPos).mIsat < 0.001 || DirActive == 0) n = enrot; friction = dizel_engagefriction; hydro_TC_nIn = enrot; // wal wejsciowy przetwornika momentu @@ -9076,6 +9076,17 @@ int s2NNW(std::string s) // Q: 20160717 // ************************************************************************************************* // parsowanie Motor Param Table +// checks a motor parameter table position read from the .fiz file against the table size +static bool is_valid_mpt_index(int const Index) +{ + if (Index >= 0 && Index <= MotorParametersArraySize) + { + return true; + } + WriteLog("Read MPT: position " + std::to_string(Index) + " out of range 0-" + std::to_string(MotorParametersArraySize) + " in line " + std::to_string(LISTLINE)); + return false; +} + bool TMoverParameters::readMPT0(std::string const &line) { @@ -9088,6 +9099,10 @@ bool TMoverParameters::readMPT0(std::string const &line) } int idx = 0; // numer pozycji parser >> idx; + if (false == is_valid_mpt_index(idx)) + { + return false; + } switch (EngineType) { case TEngineType::DieselEngine: @@ -9152,6 +9167,10 @@ bool TMoverParameters::readMPTElectricSeries(std::string const &line) } int idx = 0; // numer pozycji parser >> idx; + if (false == is_valid_mpt_index(idx)) + { + return false; + } parser >> MotorParam[idx].mfi >> MotorParam[idx].mIsat >> MotorParam[idx].fi >> MotorParam[idx].Isat; if (true == parser.getTokens(1, false)) { @@ -9177,6 +9196,10 @@ bool TMoverParameters::readMPTDieselElectric(std::string const &line) } int idx = 0; // numer pozycji parser >> idx; + if (false == is_valid_mpt_index(idx)) + { + return false; + } parser >> MotorParam[idx].mfi >> MotorParam[idx].mIsat >> MotorParam[idx].fi >> MotorParam[idx].Isat >> MPTRelay[idx].Iup >> MPTRelay[idx].Idown; return true; @@ -9193,6 +9216,10 @@ bool TMoverParameters::readMPTDieselEngine(std::string const &line) } int idx = 0; // numer pozycji parser >> idx; + if (false == is_valid_mpt_index(idx)) + { + return false; + } parser >> MotorParam[idx].mIsat >> MotorParam[idx].fi >> MotorParam[idx].mfi; if (true == parser.getTokens(1, false)) { @@ -11737,6 +11764,14 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) CompressorPower = 3; } + // for these engine types secondary controller positions index MotorParam table + if ((EngineType == TEngineType::ElectricSeriesMotor || EngineType == TEngineType::DieselEngine || EngineType == TEngineType::DieselElectric) && + ScndCtrlPosNo > MotorParametersArraySize) + { + WriteLog("SCPN=" + std::to_string(ScndCtrlPosNo) + " exceeds motor parameter table size, limited to " + std::to_string(MotorParametersArraySize)); + ScndCtrlPosNo = MotorParametersArraySize; + } + // WriteLog("aa = " + AxleArangement + " " + std::string( Pos("o", AxleArangement)) ); if (contains(AxleArangement, "o") && EngineType == TEngineType::ElectricSeriesMotor) From adc6328a09c5dcaf2e67bada22a353a0261f220f Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Thu, 1 Oct 2026 21:31:43 +0200 Subject: [PATCH 031/430] feat(editor): orthophoto fitted to terrain and optionally part of the scene --- application/editormode.cpp | 118 ++++++--- editor/editorOrthophoto.cpp | 514 +++++++++++++++++++++++++++++++++--- editor/editorOrthophoto.hpp | 73 ++++- editor/editorSettings.cpp | 6 + editor/editorSettings.hpp | 2 + 5 files changed, 631 insertions(+), 82 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 4da9fe987..f4e1e2d29 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -30,6 +30,7 @@ http://mozilla.org/MPL/2.0/. #include "imgui/imgui.h" +#include "imgui/imgui_internal.h" #include "imgui/ImGuizmo.h" #include "utilities/Logs.h" #include @@ -231,6 +232,8 @@ namespace void gather_shape_triangles(scene::shape_node const &Shape, glm::dvec2 const &Min, glm::dvec2 const &Max, std::vector &Out) { auto const &data = Shape.data(); + if (editor_orthophoto::owns(data.geometry)) + return; // the orthophoto laid over the ground isn't ground itself if (data.area.radius >= 0.0f) { double const r = data.area.radius; @@ -268,6 +271,41 @@ namespace } } + // ground triangles overlapping an XZ rectangle (Min/Max are x,z). shapes hold the (legacy) terrain, + // model instances at least ModelRadius large (if ModelsAsGround) the terrain tiles + void gather_ground_triangles(glm::dvec2 const &Min, glm::dvec2 const &Max, bool const ModelsAsGround, float const ModelRadius, std::vector &Out) + { + glm::dvec2 const center = (Min + Max) * 0.5; + float const radius = static_cast(glm::length(Max - Min) * 0.5); + auto const sections = simulation::Region->sections(glm::dvec3(center.x, 0.0, center.y), radius); // copy, the result is a scratchpad + for (auto *section : sections) + { + for (auto const &shape : section->m_shapes) + gather_shape_triangles(shape, Min, Max, Out); + for (auto &cell : section->m_cells) + { + double const r = cell.m_area.radius; + if (cell.m_area.center.x + r < Min.x || cell.m_area.center.x - r > Max.x || cell.m_area.center.z + r < Min.y || cell.m_area.center.z - r > Max.y) + continue; + for (auto const &shape : cell.m_shapesopaque) + gather_shape_triangles(shape, Min, Max, Out); + if (false == ModelsAsGround) + continue; + for (auto *instance : cell.m_instancesopaque) + { + if (instance == nullptr || instance->Model() == nullptr || instance->radius() < ModelRadius) + continue; + std::vector modeltriangles; + gather_submodel_triangles(instance->Model()->Root, instance_matrix(*instance), modeltriangles); + for (auto const &t : modeltriangles) + if (std::max({t[0].x, t[1].x, t[2].x}) >= Min.x && std::min({t[0].x, t[1].x, t[2].x}) <= Max.x && std::max({t[0].z, t[1].z, t[2].z}) >= Min.y && + std::min({t[0].z, t[1].z, t[2].z}) <= Max.y) + Out.push_back(t); + } + } + } + } + // scenery file name without path and extension std::string scenery_stem() { @@ -298,6 +336,10 @@ editor_mode::editor_mode() { // the area fill settings live in the node bank window, in the tab of the fill mode ui()->set_fill_options([this]() { render_area_fill(); }); ui()->set_gizmo_options([this]() { render_gizmo_options(); }); + // the orthophoto is fitted onto the same ground as the area fill uses, terrain tile models included + m_orthophoto.ground_source([](glm::dvec2 const &Min, glm::dvec2 const &Max, std::vector &Out) { + gather_ground_triangles(Min, Max, true, 50.0f, Out); + }); } editor_ui *editor_mode::ui() const @@ -1131,6 +1173,8 @@ void editor_mode::load_orthophoto_settings() config.opacity = stored.opacity; config.year = stored.year; config.hires = stored.hires; + config.drape = stored.drape; + config.in_scene = stored.in_scene; config.north = 0.0; config.east = 0.0; EditorSettings.orthophoto_origin(scenery, config.north, config.east); @@ -1147,6 +1191,8 @@ void editor_mode::save_orthophoto_settings() stored.opacity = config.opacity; stored.year = config.year; stored.hires = config.hires; + stored.drape = config.drape; + stored.in_scene = config.in_scene; if (config.north != 0.0 || config.east != 0.0) EditorSettings.orthophoto_origin(m_orthophoto_scenery, config.north, config.east); EditorSettings.save(); @@ -1193,13 +1239,52 @@ void editor_mode::render_orthophoto_ui() int const span = static_cast((2 * config.radius + 1) * editor_orthophoto::tile_size); ImGui::TextDisabled("%d x %d m", span, span); + // ImGui 1.73 has no public disabled state yet, the internal item flag does the job + auto const begin_disabled = [](bool Disabled) { + if (!Disabled) + return; + ImGui::PushItemFlag(ImGuiItemFlags_Disabled, true); + ImGui::PushStyleVar(ImGuiStyleVar_Alpha, ImGui::GetStyle().Alpha * 0.5f); + }; + auto const end_disabled = [](bool Disabled) { + if (!Disabled) + return; + ImGui::PopStyleVar(); + ImGui::PopItemFlag(); + }; + + if (ImGui::Checkbox("Fit to terrain", &config.drape)) + changed = persist = true; + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("Lays the imagery onto the ground geometry (terrain shapes, terrain tile models, editor terrain).\n" + "Places without any ground use the height below."); + if (config.drape) + { + ImGui::SameLine(); + if (ImGui::Button("Refit")) + m_orthophoto.refit(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("Samples the ground again, after it was edited"); + } + + begin_disabled(config.drape); ImGui::SetNextItemWidth(160.0f); changed |= ImGui::DragFloat("Height (m)", &config.height, 0.1f, -1000.0f, 3000.0f, "%.2f"); persist |= ImGui::IsItemDeactivatedAfterEdit(); + end_disabled(config.drape); + if (ImGui::Checkbox("Covered by objects and terrain", &config.in_scene)) + changed = persist = true; + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("Draws the imagery as part of the scene, so tracks, models and terrain in front of it hide it.\n" + "It is opaque then and lit like the scene; mouse placement lands on it as on any surface.\n" + "Not available with the Better Renderer, which doesn't pick up geometry added in the editor."); + + begin_disabled(config.in_scene); ImGui::SetNextItemWidth(160.0f); changed |= ImGui::SliderFloat("Opacity", &config.opacity, 0.0f, 1.0f, "%.2f"); persist |= ImGui::IsItemDeactivatedAfterEdit(); + end_disabled(config.in_scene); // newest imagery, or the newest imagery taken up to the end of the selected year int const thisyear = static_cast(std::chrono::year_month_day{std::chrono::floor(std::chrono::system_clock::now())}.year()); @@ -1636,37 +1721,9 @@ void editor_mode::run_area_fill() points.push_back(p); } - // ground geometry within the area. shapes hold the (legacy) terrain, large instances the terrain tiles + // ground geometry within the area std::vector triangles; - glm::dvec2 const center = (bmin + bmax) * 0.5; - float const radius = static_cast(glm::length(bmax - bmin) * 0.5); - auto const sections = simulation::Region->sections(glm::dvec3(center.x, 0.0, center.y), radius); // copy, the result is a scratchpad - for (auto *section : sections) - { - for (auto const &shape : section->m_shapes) - gather_shape_triangles(shape, bmin, bmax, triangles); - for (auto &cell : section->m_cells) - { - double const r = cell.m_area.radius; - if (cell.m_area.center.x + r < bmin.x || cell.m_area.center.x - r > bmax.x || cell.m_area.center.z + r < bmin.y || cell.m_area.center.z - r > bmax.y) - continue; - for (auto const &shape : cell.m_shapesopaque) - gather_shape_triangles(shape, bmin, bmax, triangles); - if (false == m_fill_models_as_ground) - continue; - for (auto *instance : cell.m_instancesopaque) - { - if (instance == nullptr || instance->Model() == nullptr || instance->radius() < terrain_model_radius) - continue; - std::vector modeltriangles; - gather_submodel_triangles(instance->Model()->Root, instance_matrix(*instance), modeltriangles); - for (auto const &t : modeltriangles) - if (std::max({t[0].x, t[1].x, t[2].x}) >= bmin.x && std::min({t[0].x, t[1].x, t[2].x}) <= bmax.x && std::max({t[0].z, t[1].z, t[2].z}) >= bmin.y && - std::min({t[0].z, t[1].z, t[2].z}) <= bmax.y) - triangles.push_back(t); - } - } - } + gather_ground_triangles(bmin, bmax, m_fill_models_as_ground, terrain_model_radius, triangles); triangle_grid const ground(std::move(triangles), bmin, bmax); auto const terrains = active_terrains(); @@ -2055,6 +2112,7 @@ void editor_mode::exit() m_history.clear(); m_fill_last.clear(); m_orthophoto.cancel_pending(); + m_orthophoto.detach_scene(); // the layer is an editor aid, keep it out of the other modes // drop selection so a stale/dangling node pointer isn't used on the next editor session m_node = nullptr; diff --git a/editor/editorOrthophoto.cpp b/editor/editorOrthophoto.cpp index 74137b626..3d478eb9b 100644 --- a/editor/editorOrthophoto.cpp +++ b/editor/editorOrthophoto.cpp @@ -11,6 +11,9 @@ http://mozilla.org/MPL/2.0/. #include "editor/editorOrthophoto.hpp" #include "rendering/renderer.h" +#include "scene/scene.h" +#include "simulation/simulation.h" +#include "model/vertex.h" #include "utilities/Logs.h" #include "utilities/utilities.h" #include "imgui/imgui.h" @@ -30,7 +33,9 @@ http://mozilla.org/MPL/2.0/. #include #include #include +#include #include +#include namespace { @@ -544,12 +549,88 @@ template int clip_polygon(clip_vertex const *In, int Count, } return count; } + +// --------------------------------------------------------------------------------------------- +// ground fit and in-scene geometry + +constexpr int ground_grid{32}; // ground samples per tile side (8 m) for the draped overlay +constexpr double surface_offset{0.05}; // lift of the in-scene imagery above the ground it covers, against z-fighting +constexpr double steepest_ground{0.3}; // minimal normal.y of ground triangles receiving the imagery +constexpr float no_height{-std::numeric_limits::max()}; + +gfx::geometrybank_handle scene_bank{0, 0}; // created on first use, shared by every tile + +std::string slot_name(int Index) +{ + // script-style generated resource: no file behind it, the content is supplied through update_from_memory() + return "internal_src:editor_orthophoto_" + std::to_string(Index); +} + +// clips a polygon in the XZ plane against Point[Axis] <= Limit (Below) or Point[Axis] >= Limit +int clip_xz(glm::dvec3 const *In, int Count, glm::dvec3 *Out, int Axis, double Limit, bool Below) +{ + auto const inside = [&](glm::dvec3 const &Point) { return Below ? Point[Axis] <= Limit : Point[Axis] >= Limit; }; + int count{0}; + for (int i = 0; i < Count; ++i) + { + glm::dvec3 const &a = In[i]; + glm::dvec3 const &b = In[(i + 1) % Count]; + bool const ina = inside(a); + if (ina) + Out[count++] = a; + if (ina != inside(b)) + Out[count++] = a + (b - a) * ((Limit - a[Axis]) / (b[Axis] - a[Axis])); + } + return count; +} + +// height of triangle abc above (X,Z), if the vertical line through it hits the triangle +bool triangle_height(glm::dvec3 const &A, glm::dvec3 const &B, glm::dvec3 const &C, double X, double Z, double &Out) +{ + double const ux = B.x - A.x, uz = B.z - A.z; + double const vx = C.x - A.x, vz = C.z - A.z; + double const den = ux * vz - vx * uz; + if (std::abs(den) < 1e-9) + return false; + double const wx = X - A.x, wz = Z - A.z; + double const s = (wx * vz - vx * wz) / den; + double const t = (ux * wz - wx * uz) / den; + double constexpr epsilon{1e-9}; + if (s < -epsilon || t < -epsilon || s + t > 1.0 + epsilon) + return false; + Out = A.y + s * (B.y - A.y) + t * (C.y - A.y); + return true; +} + +// bilinear lookup in a tile heightfield; U runs west->east, V north->south, both 0..1 +double sample_heights(std::vector const &Heights, double U, double V) +{ + double const fx = std::clamp(U, 0.0, 1.0) * ground_grid; + double const fy = std::clamp(V, 0.0, 1.0) * ground_grid; + int const ix = std::min(static_cast(fx), ground_grid - 1); + int const iy = std::min(static_cast(fy), ground_grid - 1); + double const tx = fx - ix, ty = fy - iy; + auto const at = [&](int X, int Y) { return static_cast(Heights[static_cast(Y) * (ground_grid + 1) + X]); }; + double const top = at(ix, iy) + (at(ix + 1, iy) - at(ix, iy)) * tx; + double const bottom = at(ix, iy + 1) + (at(ix + 1, iy + 1) - at(ix, iy + 1)) * tx; + return top + (bottom - top) * ty; +} + +// smooth normal from the heightfield (u grows towards -x, v towards -z) +glm::vec3 heights_normal(std::vector const &Heights, double U, double V) +{ + double constexpr delta{1.0 / ground_grid}; + double const dhdu = (sample_heights(Heights, U + delta, V) - sample_heights(Heights, U - delta, V)) / (2.0 * delta * editor_orthophoto::tile_size); + double const dhdv = (sample_heights(Heights, U, V + delta) - sample_heights(Heights, U, V - delta)) / (2.0 * delta * editor_orthophoto::tile_size); + return glm::normalize(glm::vec3(static_cast(dhdu), 1.0f, static_cast(dhdv))); +} } // namespace // --------------------------------------------------------------------------------------------- editor_orthophoto::~editor_orthophoto() { + // the scene geometry is left alone: on shutdown the region may already be gone { std::lock_guard lock(m_mutex); m_stop = true; @@ -576,6 +657,11 @@ std::string editor_orthophoto::cache_directory() return std::string(path.begin(), path.end()); } +bool editor_orthophoto::owns(gfx::geometry_handle const &Geometry) +{ + return scene_bank.bank != 0 && Geometry.bank == scene_bank.bank; +} + void editor_orthophoto::enabled(bool State) { if (State == m_enabled) @@ -598,9 +684,13 @@ void editor_orthophoto::enabled(bool State) void editor_orthophoto::settings(config const &Config) { bool const sourcechanged = (Config.year != m_config.year || Config.hires != m_config.hires); + bool const shapechanged = (Config.height != m_config.height || Config.drape != m_config.drape || Config.in_scene != m_config.in_scene); m_config = Config; m_config.radius = std::clamp(m_config.radius, 0, max_radius); m_config.opacity = std::clamp(m_config.opacity, 0.0f, 1.0f); + if (shapechanged) + for (auto &entry : m_tiles) + entry.second.scene_dirty = true; if (!sourcechanged) return; cancel_pending(); @@ -610,6 +700,22 @@ void editor_orthophoto::settings(config const &Config) ++m_generation; } +void editor_orthophoto::refit() +{ + // the current shapes stay until their tile is sampled again, so nothing blinks + for (auto &entry : m_tiles) + entry.second.grounded = false; +} + +void editor_orthophoto::detach_scene() +{ + for (auto &entry : m_tiles) + { + remove_shape(entry.second); + release_geometry(entry.second); + } +} + void editor_orthophoto::cancel_pending() { { @@ -636,7 +742,7 @@ editor_orthophoto::statistics editor_orthophoto::stats() const for (auto const &entry : m_tiles) { tile const &t = entry.second; - if (t.level > 0 && !t.empty && t.texture != null_handle) + if (t.level > 0 && !t.empty && t.slot.texture != null_handle) ++out.resident; if (t.requested != 0) ++out.loading; @@ -665,6 +771,12 @@ editor_orthophoto::tile_key editor_orthophoto::camera_tile(glm::dvec3 const &Cam return {static_cast(std::floor(east / tile_size)), static_cast(std::floor(north / tile_size))}; } +glm::dvec2 editor_orthophoto::tile_corner(tile_key const &Key) const +{ + // image u runs west->east (towards -x), v north->south (towards -z) + return {m_config.east - Key.first * tile_size, (Key.second + 1) * tile_size - m_config.north}; +} + void editor_orthophoto::start_workers() { if (!m_workers.empty()) @@ -673,27 +785,31 @@ void editor_orthophoto::start_workers() m_workers.emplace_back(&editor_orthophoto::worker, this); } -texture_handle editor_orthophoto::acquire_texture() +editor_orthophoto::texture_slot editor_orthophoto::acquire_slot() { - if (!m_free_textures.empty()) + if (!m_free_slots.empty()) { - texture_handle const handle = m_free_textures.back(); - m_free_textures.pop_back(); - return handle; + texture_slot const slot = m_free_slots.back(); + m_free_slots.pop_back(); + return slot; } - // script-style generated texture: no file behind it, the content is supplied through update_from_memory() - return GfxRenderer->Fetch_Texture("internal_src:editor_orthophoto_" + std::to_string(m_texture_count++), true); + texture_slot slot; + slot.index = m_texture_count++; + slot.texture = GfxRenderer->Fetch_Texture(slot_name(slot.index), true); + return slot; } void editor_orthophoto::release_tile(tile &Tile) { - if (Tile.texture == null_handle) + remove_shape(Tile); + release_geometry(Tile); + if (Tile.slot.texture == null_handle) return; // shrink to a single texel to give the gpu memory back; the slot is reused by the next tile std::uint8_t const texel[4] = {0, 0, 0, 0}; - GfxRenderer->Texture(Tile.texture).update_from_memory(1, 1, texel); - m_free_textures.push_back(Tile.texture); - Tile.texture = null_handle; + GfxRenderer->Texture(Tile.slot.texture).update_from_memory(1, 1, texel); + m_free_slots.push_back(Tile.slot); + Tile.slot = texture_slot{}; } void editor_orthophoto::schedule(tile_key const &Key, tile &Tile, int Level) @@ -737,17 +853,291 @@ std::size_t editor_orthophoto::apply(result &Result, double Now) release_tile(t); return 0; } - if (t.texture == null_handle) - t.texture = acquire_texture(); - if (t.texture == null_handle) + if (t.slot.texture == null_handle) + t.slot = acquire_slot(); + if (t.slot.texture == null_handle) { t.level = 0; return 0; } - GfxRenderer->Texture(t.texture).update_from_memory(Result.width, Result.height, Result.pixels.data()); + // a shape already in the scene shows the new content right away, it refers to the same texture + GfxRenderer->Texture(t.slot.texture).update_from_memory(Result.width, Result.height, Result.pixels.data()); return Result.pixels.size(); } +void editor_orthophoto::sample_ground(tile_key const &Key, tile &Tile) +{ + Tile.grounded = true; + Tile.scene_dirty = true; + Tile.heights.clear(); + Tile.surface.clear(); + + glm::dvec2 const corner = tile_corner(Key); + glm::dvec2 const min(corner.x - tile_size, corner.y - tile_size); + glm::dvec2 const max(corner.x, corner.y); + std::vector triangles; + m_ground(min, max, triangles); + + int constexpr samples{ground_grid + 1}; + double constexpr step{tile_size / ground_grid}; + std::vector heights(static_cast(samples) * samples, no_height); + + for (auto const &triangle : triangles) + { + glm::dvec3 a = triangle[0], b = triangle[1], c = triangle[2]; + glm::dvec3 normal = glm::cross(b - a, c - a); + if (normal.y < 0.0) + { + // keep every triangle facing up, with the winding the editor terrain uses + std::swap(b, c); + normal = -normal; + } + double const length = glm::length(normal); + if (length < 1e-9 || normal.y / length < steepest_ground) + continue; // walls and the like don't receive the imagery + + glm::dvec3 polygon[8] = {a, b, c}; + glm::dvec3 scratch[8]; + int count = clip_xz(polygon, 3, scratch, 0, max.x, true); + count = clip_xz(scratch, count, polygon, 0, min.x, false); + count = clip_xz(polygon, count, scratch, 2, max.y, true); + count = clip_xz(scratch, count, polygon, 2, min.y, false); + for (int k = 1; k + 1 < count; ++k) + { + Tile.surface.push_back(polygon[0]); + Tile.surface.push_back(polygon[k]); + Tile.surface.push_back(polygon[k + 1]); + } + + // heightfield samples under the (whole) triangle, the highest surface wins + double const xlo = std::min({a.x, b.x, c.x}), xhi = std::max({a.x, b.x, c.x}); + double const zlo = std::min({a.z, b.z, c.z}), zhi = std::max({a.z, b.z, c.z}); + int const i0 = std::clamp(static_cast(std::ceil((corner.x - xhi) / step)), 0, samples - 1); + int const i1 = std::clamp(static_cast(std::floor((corner.x - xlo) / step)), 0, samples - 1); + int const j0 = std::clamp(static_cast(std::ceil((corner.y - zhi) / step)), 0, samples - 1); + int const j1 = std::clamp(static_cast(std::floor((corner.y - zlo) / step)), 0, samples - 1); + for (int j = j0; j <= j1; ++j) + for (int i = i0; i <= i1; ++i) + { + double y; + if (triangle_height(a, b, c, corner.x - i * step, corner.y - j * step, y)) + { + float &sample = heights[static_cast(j) * samples + i]; + sample = std::max(sample, static_cast(y)); + } + } + } + + // holes (places without ground) take the average of their neighbours, spreading inwards + std::size_t missing = std::count(heights.begin(), heights.end(), no_height); + if (missing == heights.size()) + return; // no ground at all: the tile stays flat at the layer height + while (missing > 0) + { + std::vector next = heights; + for (int j = 0; j < samples; ++j) + for (int i = 0; i < samples; ++i) + { + if (heights[static_cast(j) * samples + i] != no_height) + continue; + double sum{0.0}; + int found{0}; + int const offsets[4][2] = {{-1, 0}, {1, 0}, {0, -1}, {0, 1}}; + for (auto const &offset : offsets) + { + int const x = i + offset[0], y = j + offset[1]; + if (x < 0 || y < 0 || x >= samples || y >= samples) + continue; + float const neighbour = heights[static_cast(y) * samples + x]; + if (neighbour == no_height) + continue; + sum += neighbour; + ++found; + } + if (found > 0) + { + next[static_cast(j) * samples + i] = static_cast(sum / found); + --missing; + } + } + heights.swap(next); + } + Tile.heights = std::move(heights); + auto const range = std::minmax_element(Tile.heights.begin(), Tile.heights.end()); + Tile.height_min = *range.first; + Tile.height_max = *range.second; +} + +void editor_orthophoto::remove_shape(tile &Tile) +{ + if (Tile.section == nullptr) + return; + if (m_region == simulation::Region) + { + auto &shapes = Tile.section->m_shapes; + for (auto it = shapes.begin(); it != shapes.end(); ++it) + { + auto const &geometry = it->data().geometry; + if (geometry.bank == Tile.geometry.bank && geometry.chunk == Tile.geometry.chunk) + { + shapes.erase(it); + break; + } + } + } + Tile.section = nullptr; +} + +void editor_orthophoto::release_geometry(tile &Tile) +{ + // the chunk stays in the bank and is reused by a tile needing the same capacity + if (Tile.geometry.chunk != 0) + m_free_chunks.emplace(Tile.capacity, Tile.geometry); + Tile.geometry = gfx::geometry_handle{0, 0}; + Tile.capacity = 0; +} + +void editor_orthophoto::build_shape(tile_key const &Key, tile &Tile) +{ + remove_shape(Tile); + Tile.scene_dirty = false; + if (Tile.level == 0 || Tile.empty || Tile.slot.texture == null_handle || simulation::Region == nullptr) + return; + if (Tile.slot.material == null_handle) + Tile.slot.material = GfxRenderer->Fetch_Material(slot_name(Tile.slot.index), true); + + glm::dvec2 const corner = tile_corner(Key); + bool const draped = m_config.drape && !Tile.surface.empty(); + auto const uv_of = [&](glm::dvec3 const &Point) { return glm::vec2((corner.x - Point.x) / tile_size, (corner.y - Point.z) / tile_size); }; + + std::vector vertices; + auto const add = [&](glm::dvec3 const &Point, double Lift) { + world_vertex vertex; + vertex.position = Point + glm::dvec3(0.0, Lift, 0.0); + vertex.texture = uv_of(Point); + // smooth normals from the heightfield, the clipped triangles alone would look faceted + vertex.normal = (draped && !Tile.heights.empty()) ? heights_normal(Tile.heights, vertex.texture.x, vertex.texture.y) : glm::vec3(0.0f, 1.0f, 0.0f); + vertices.push_back(vertex); + }; + double ylo, yhi; + if (draped) + { + vertices.reserve(Tile.surface.size()); + for (auto const &point : Tile.surface) + add(point, surface_offset); + ylo = Tile.height_min; + yhi = Tile.height_max + surface_offset; + } + else + { + // flat quad at the layer height, triangles facing up like the draped surface + double const y = m_config.height; + glm::dvec3 const nw(corner.x, y, corner.y), ne(corner.x - tile_size, y, corner.y); + glm::dvec3 const sw(corner.x, y, corner.y - tile_size), se(corner.x - tile_size, y, corner.y - tile_size); + for (auto const &point : {nw, sw, ne, se, ne, sw}) + add(point, 0.0); + ylo = yhi = y; + } + + glm::dvec3 const centre(corner.x - tile_size * 0.5, (ylo + yhi) * 0.5, corner.y - tile_size * 0.5); + scene::basic_section §ion = simulation::Region->section(centre); + section.create_geometry(); // existing section geometry has to be in place before we add ours (idempotent) + glm::dvec3 const origin = section.m_area.center; + + // chunks are padded to a few fixed sizes (whole triangles), so ones freed by other tiles can be refilled in place + std::size_t capacity{6}; + while (capacity < vertices.size()) + capacity *= 2; + gfx::vertex_array gpuvertices; + gpuvertices.reserve(capacity); + for (auto const &vertex : vertices) + gpuvertices.emplace_back(gfx::basic_vertex::convert(vertex, origin)); + world_vertex padding; // degenerate triangles at the origin + padding.position = origin; + padding.normal = glm::vec3(0.0f, 1.0f, 0.0f); + padding.texture = glm::vec2(0.0f); + gpuvertices.resize(capacity, gfx::basic_vertex::convert(padding, origin)); + gfx::userdata_array userdata; + + if (Tile.geometry.chunk != 0 && Tile.capacity != capacity) + release_geometry(Tile); + if (Tile.geometry.chunk == 0) + { + auto const reusable = m_free_chunks.find(capacity); + if (reusable != m_free_chunks.end()) + { + Tile.geometry = reusable->second; + Tile.capacity = capacity; + m_free_chunks.erase(reusable); + } + } + if (Tile.geometry.chunk != 0) + { + GfxRenderer->Replace(gpuvertices, userdata, Tile.geometry, GL_TRIANGLES); + } + else + { + if (scene_bank.bank == 0) + scene_bank = GfxRenderer->Create_Bank(); + Tile.geometry = GfxRenderer->Insert(gpuvertices, userdata, scene_bank, GL_TRIANGLES); + Tile.capacity = capacity; + if (Tile.geometry.chunk == 0) + { + Tile.capacity = 0; + return; + } + } + + // the shape gets just two bounding vertices: they give it its area, and leave no triangles behind for + // code which reads the source vertices of the section shapes (e.g. snapping nodes to the ground) + std::vector bounds(2, padding); + bounds[0].position = glm::dvec3(corner.x - tile_size, ylo, corner.y - tile_size); + bounds[1].position = glm::dvec3(corner.x, yhi, corner.y); + scene::shape_node shape; + shape.make_terrain(Tile.slot.material, std::move(bounds), origin); + shape.geometry(Tile.geometry); + section.m_shapes.emplace_back(std::move(shape)); + // extend the section bounds so the tile isn't culled at its edges + double const reach = glm::length(glm::dvec3(tile_size * 0.5, (yhi - ylo) * 0.5, tile_size * 0.5)); + section.m_area.radius = std::max(section.m_area.radius, static_cast(glm::length(section.m_area.center - centre) + reach)); + + Tile.section = §ion; + m_region = simulation::Region; +} + +void editor_orthophoto::update_scene() +{ + if (m_region != simulation::Region) + { + // another scenery was loaded: the sections holding our shapes are gone, forget them without touching + for (auto &entry : m_tiles) + entry.second.section = nullptr; + m_region = simulation::Region; + } + if (!m_config.in_scene) + { + detach_scene(); + return; + } + if (simulation::Region == nullptr) + return; + + int built{0}; + for (auto &entry : m_tiles) + { + tile &t = entry.second; + if (t.section != nullptr && !t.scene_dirty) + continue; + if (t.level == 0 || t.empty) + continue; + if (m_config.drape && !t.grounded && m_ground) + continue; // wait for the ground fit; a shape already in place stays until then + build_shape(entry.first, t); + if (++built >= 8) + break; // the rest next frame + } +} + void editor_orthophoto::update(glm::dvec3 const &Camera) { double const now = steady_seconds(); @@ -813,6 +1203,30 @@ void editor_orthophoto::update(glm::dvec3 const &Camera) continue; schedule(key, t, level); } + + // ground fit, one tile per frame (it walks the scene geometry), nearest first + if (m_config.drape && m_ground && simulation::Region != nullptr) + { + tile *nearest{nullptr}; + tile_key nearestkey{0, 0}; + int nearestdistance{INT_MAX}; + for (auto &entry : m_tiles) + { + if (entry.second.grounded || entry.second.empty) + continue; + int const d = distance(entry.first); + if (d < nearestdistance) + { + nearestdistance = d; + nearest = &entry.second; + nearestkey = entry.first; + } + } + if (nearest != nullptr) + sample_ground(nearestkey, *nearest); + } + + update_scene(); } void editor_orthophoto::worker() @@ -871,56 +1285,74 @@ void editor_orthophoto::worker() void editor_orthophoto::draw(glm::mat4 const &ViewProjection, glm::dvec3 const &CameraPos, float ScreenWidth, float ScreenHeight) const { - if (!m_enabled || m_config.opacity <= 0.0f || ScreenWidth <= 0.0f || ScreenHeight <= 0.0f) + if (!m_enabled || m_config.in_scene || m_config.opacity <= 0.0f || ScreenWidth <= 0.0f || ScreenHeight <= 0.0f) return; ImDrawList *drawlist = ImGui::GetBackgroundDrawList(); + // without vertex offset support in the backend the whole list has to fit 16-bit indices + std::size_t const vertexbudget = (ImGui::GetIO().BackendFlags & ImGuiBackendFlags_RendererHasVtxOffset) ? vertex_budget * 8 : vertex_budget; ImU32 const color = IM_COL32(255, 255, 255, static_cast(m_config.opacity * 255.0f + 0.5f)); - auto const tosceen = [&](glm::vec4 const &Clip) { return ImVec2((Clip.x / Clip.w * 0.5f + 0.5f) * ScreenWidth, (0.5f - Clip.y / Clip.w * 0.5f) * ScreenHeight); }; + auto const toscreen = [&](glm::vec4 const &Clip) { return ImVec2((Clip.x / Clip.w * 0.5f + 0.5f) * ScreenWidth, (0.5f - Clip.y / Clip.w * 0.5f) * ScreenHeight); }; // slightly wider than the view so clipped edges never show on screen float constexpr guard{1.02f}; - auto const outside = [&](glm::vec4 const *Corners) { - auto const all = [&](auto const &Test) { return Test(Corners[0]) && Test(Corners[1]) && Test(Corners[2]) && Test(Corners[3]); }; + auto const outside = [&](glm::vec4 const *Corners, int Count) { + auto const all = [&](auto const &Test) { + for (int i = 0; i < Count; ++i) + if (!Test(Corners[i])) + return false; + return true; + }; return all([](glm::vec4 const &v) { return v.w < near_w; }) || all([&](glm::vec4 const &v) { return v.x > v.w * guard; }) || all([&](glm::vec4 const &v) { return v.x < -v.w * guard; }) || all([&](glm::vec4 const &v) { return v.y > v.w * guard; }) || all([&](glm::vec4 const &v) { return v.y < -v.w * guard; }); }; + // clip-space change per metre of height + glm::vec4 const up = ViewProjection * glm::vec4(0.0f, 1.0f, 0.0f, 0.0f); - double const height = static_cast(m_config.height); for (auto const &entry : m_tiles) { tile const &t = entry.second; - if (t.level == 0 || t.empty || t.texture == null_handle) + if (t.level == 0 || t.empty || t.slot.texture == null_handle) continue; - std::size_t const textureid = GfxRenderer->Texture(t.texture).get_id(); + std::size_t const textureid = GfxRenderer->Texture(t.slot.texture).get_id(); if (textureid == 0 || textureid == static_cast(static_cast(-1))) continue; + bool const draped = m_config.drape && !t.heights.empty(); + double const flat = m_config.height; + double const ylo = draped ? t.height_min : flat; + double const yhi = draped ? t.height_max : flat; + // world extent of the tile; u runs west->east (-x), v runs north->south (-z), matching the image rows - double const westx = m_config.east - entry.first.first * tile_size; - double const northz = (entry.first.second + 1) * tile_size - m_config.north; - auto const relative = [&](double U, double V) { return glm::vec3(glm::dvec3(westx - U * tile_size, height, northz - V * tile_size) - CameraPos); }; - // the tile is a parallelogram and the projection is linear before the divide, so clip positions interpolate exactly + glm::dvec2 const corner = tile_corner(entry.first); + auto const relative = [&](double U, double V) { return glm::vec3(glm::dvec3(corner.x - U * tile_size, 0.0, corner.y - V * tile_size) - CameraPos); }; + // the projection is linear before the divide, so clip positions interpolate exactly: c = c00 + du*u + dv*v + up*height glm::vec4 const c00 = ViewProjection * glm::vec4(relative(0.0, 0.0), 1.0f); glm::vec4 const du = ViewProjection * glm::vec4(relative(1.0, 0.0), 1.0f) - c00; glm::vec4 const dv = ViewProjection * glm::vec4(relative(0.0, 1.0), 1.0f) - c00; - glm::vec4 const corners[4] = {c00, c00 + du, c00 + du + dv, c00 + dv}; - if (outside(corners)) + auto const clip = [&](float U, float V, double Height) { return c00 + du * U + dv * V + up * static_cast(Height); }; + glm::vec4 const box[8] = {clip(0, 0, ylo), clip(1, 0, ylo), clip(1, 1, ylo), clip(0, 1, ylo), clip(0, 0, yhi), clip(1, 0, yhi), clip(1, 1, yhi), clip(0, 1, yhi)}; + if (outside(box, 8)) continue; - // ImGui interpolates texture coordinates affinely, so subdivide finer where the camera is close - double const nearestx = std::clamp(CameraPos.x, westx - tile_size, westx); - double const nearestz = std::clamp(CameraPos.z, northz - tile_size, northz); - double const distance = glm::length(glm::dvec3(nearestx, height, nearestz) - CameraPos); + // ImGui interpolates texture coordinates affinely, so subdivide finer where the camera is close; + // draped tiles also need enough segments to follow the ground + double const nearestx = std::clamp(CameraPos.x, corner.x - tile_size, corner.x); + double const nearestz = std::clamp(CameraPos.z, corner.y - tile_size, corner.y); + double const nearesty = std::clamp(CameraPos.y, ylo, yhi); + double const distance = glm::length(glm::dvec3(nearestx, nearesty, nearestz) - CameraPos); double const step = std::clamp(distance * 0.2, 4.0, tile_size); - int const segments = std::clamp(static_cast(std::ceil(tile_size / step)), 1, 64); + int segments = std::clamp(static_cast(std::ceil(tile_size / step)), 1, 64); + if (draped) + segments = std::max(segments, distance < 300.0 ? ground_grid : distance < 800.0 ? ground_grid / 2 : ground_grid / 4); float const segmentsize = 1.0f / static_cast(segments); + auto const height_at = [&](float U, float V) { return draped ? sample_heights(t.heights, U, V) : flat; }; drawlist->PushTextureID(reinterpret_cast(textureid)); for (int j = 0; j < segments; ++j) for (int i = 0; i < segments; ++i) { - if (static_cast(drawlist->VtxBuffer.Size) + 16 > vertex_budget) + if (static_cast(drawlist->VtxBuffer.Size) + 16 > vertexbudget) { drawlist->PopTextureID(); return; @@ -928,13 +1360,13 @@ void editor_orthophoto::draw(glm::mat4 const &ViewProjection, glm::dvec3 const & float const u0 = i * segmentsize, u1 = (i + 1) * segmentsize; float const v0 = j * segmentsize, v1 = (j + 1) * segmentsize; clip_vertex quad[4] = { - {c00 + du * u0 + dv * v0, {u0, v0}}, - {c00 + du * u1 + dv * v0, {u1, v0}}, - {c00 + du * u1 + dv * v1, {u1, v1}}, - {c00 + du * u0 + dv * v1, {u0, v1}}, + {clip(u0, v0, height_at(u0, v0)), {u0, v0}}, + {clip(u1, v0, height_at(u1, v0)), {u1, v0}}, + {clip(u1, v1, height_at(u1, v1)), {u1, v1}}, + {clip(u0, v1, height_at(u0, v1)), {u0, v1}}, }; glm::vec4 const positions[4] = {quad[0].position, quad[1].position, quad[2].position, quad[3].position}; - if (outside(positions)) + if (outside(positions, 4)) continue; // clip against the near plane and the (slightly widened) sides of the view @@ -956,7 +1388,7 @@ void editor_orthophoto::draw(glm::mat4 const &ViewProjection, glm::dvec3 const & drawlist->PrimWriteIdx(static_cast(base + k + 1)); } for (int k = 0; k < count; ++k) - drawlist->PrimWriteVtx(tosceen(buffer0[k].position), ImVec2(buffer0[k].uv.x, buffer0[k].uv.y), color); + drawlist->PrimWriteVtx(toscreen(buffer0[k].position), ImVec2(buffer0[k].uv.x, buffer0[k].uv.y), color); } drawlist->PopTextureID(); } diff --git a/editor/editorOrthophoto.hpp b/editor/editorOrthophoto.hpp index 40fdf98ee..5f246db48 100644 --- a/editor/editorOrthophoto.hpp +++ b/editor/editorOrthophoto.hpp @@ -9,10 +9,12 @@ http://mozilla.org/MPL/2.0/. #pragma once +#include #include #include #include #include +#include #include #include #include @@ -21,19 +23,28 @@ http://mozilla.org/MPL/2.0/. #include #include -#include "interfaces/ITexture.h" // texture_handle +#include "interfaces/ITexture.h" // texture_handle +#include "utilities/Classes.h" // material_handle +#include "rendering/geometrybank.h" // gfx::geometry_handle -// Editor aid: aerial orthophoto tiles from geoportal.gov.pl (GUGiK WMS), drawn as a translucent -// horizontal layer around the camera. +namespace scene +{ +class basic_region; +class basic_section; +} // namespace scene + +// Editor aid: aerial orthophoto tiles from geoportal.gov.pl (GUGiK WMS), shown around the camera either +// on a horizontal plane or fitted onto the terrain. // // Tiles are aligned to an absolute 256 m grid in PUWG 1992 (EPSG:2180), so the disk cache is shared // between sceneries. The scenery is placed on that grid through the PUWG coordinates of its (0,0,0) // point; MaSzyna's +Z points north and +X points west, hence easting = E0 - x, northing = N0 + z. // // Downloading, cache I/O and image decoding run on worker threads; the main thread only uploads -// finished images (a bounded amount per frame) and emits the overlay geometry. The overlay goes into -// the ImGui background draw list, like the other editor viewport overlays, so it works with every -// renderer backend, but it isn't depth-tested against the scene. +// finished images (a bounded amount per frame) and emits the geometry. By default the layer goes into +// the ImGui background draw list, like the other editor viewport overlays: translucent and drawn over +// everything. Optionally it is put into the scene instead (opaque shapes in the region sections, like the +// editor terrain), so tracks, models and terrain in front of it cover it. class editor_orthophoto { public: @@ -42,12 +53,18 @@ class editor_orthophoto double north{0.0}; // PUWG 1992 X (northing) of the scenery origin double east{0.0}; // PUWG 1992 Y (easting) of the scenery origin int radius{2}; // tiles loaded around the camera tile (Chebyshev distance) - float height{0.0f}; // world Y of the layer - float opacity{0.6f}; // 0..1 + float height{0.0f}; // world Y of the layer (with drape: only where no ground was found) + float opacity{0.6f}; // 0..1, overlay only int year{0}; // 0 = newest available imagery, otherwise newest imagery taken up to the end of that year bool hires{false}; // 4096 px tiles from the high-resolution product next to the camera, where it exists + bool drape{true}; // fit the imagery onto the ground geometry instead of a flat plane + bool in_scene{false}; // render as opaque scene geometry, covered by whatever is in front of it }; + using world_triangle = std::array; + // supplies the ground triangles overlapping an XZ rectangle (Min/Max are x,z); used to drape the imagery + using ground_query = std::function &Out)>; + struct statistics { int resident{0}; // tiles with imagery on screen @@ -70,6 +87,13 @@ class editor_orthophoto config const &settings() const { return m_config; } // changes of year / resolution invalidate resident tiles, the rest applies immediately void settings(config const &Config); + void ground_source(ground_query Query) { m_ground = std::move(Query); } + // samples the ground again (after it was edited); tiles are refitted progressively + void refit(); + // takes the scene geometry out of the region (e.g. when the editor is left); it's re-created on the next update + void detach_scene(); + // true for geometry created by the layer, so ground queries can skip it + static bool owns(gfx::geometry_handle const &Geometry); // main thread, once per frame: schedules tiles around the camera and uploads finished ones void update(glm::dvec3 const &Camera); @@ -115,22 +139,46 @@ class editor_orthophoto std::vector pixels; // RGBA8, first row = north edge }; + struct texture_slot + { + int index{-1}; // names the texture and its material + texture_handle texture{null_handle}; + material_handle material{null_handle}; // created on first use by the scene geometry + }; + struct tile { - texture_handle texture{null_handle}; + texture_slot slot; int level{0}; // size of the imagery currently held (0 = nothing yet) int requested{0}; // level of the job scheduled for this tile (0 = none) bool empty{false}; int failures{0}; double retry_at{0.0}; // steady clock seconds + // ground fit + bool grounded{false}; // ground was sampled + std::vector heights; // (ground_grid+1)^2 world Y, rows north->south, columns west->east; empty if no ground + float height_min{0.0f}; + float height_max{0.0f}; + std::vector surface; // upward facing ground triangles clipped to the tile (3 vertices each) + // scene geometry + scene::basic_section *section{nullptr}; // section holding the shape (nullptr = not in the scene) + gfx::geometry_handle geometry{0, 0}; + std::size_t capacity{0}; // vertex count of the geometry chunk + bool scene_dirty{true}; // the shape needs to be rebuilt }; static int level_for(int Distance, bool Hires); tile_key camera_tile(glm::dvec3 const &Camera) const; + glm::dvec2 tile_corner(tile_key const &Key) const; // world (x,z) of the north-west corner void schedule(tile_key const &Key, tile &Tile, int Level); std::size_t apply(result &Result, double Now); // returns bytes uploaded void release_tile(tile &Tile); - texture_handle acquire_texture(); + texture_slot acquire_slot(); + void sample_ground(tile_key const &Key, tile &Tile); + void build_shape(tile_key const &Key, tile &Tile); + void remove_shape(tile &Tile); + void release_geometry(tile &Tile); + void update_scene(); void start_workers(); void worker(); @@ -138,8 +186,11 @@ class editor_orthophoto bool m_enabled{false}; std::map m_tiles; // main thread only tile_key m_camera_tile{0, 0}; - std::vector m_free_textures; // pool of texture slots, reused between tiles + std::vector m_free_slots; // pool of textures, reused between tiles int m_texture_count{0}; + ground_query m_ground; + scene::basic_region *m_region{nullptr}; // region the scene geometry was put into + std::multimap m_free_chunks; // geometry chunks by capacity, reused between tiles // shared with the workers, guarded by m_mutex mutable std::mutex m_mutex; diff --git a/editor/editorSettings.cpp b/editor/editorSettings.cpp index 3f7956e2d..3e7516c11 100644 --- a/editor/editorSettings.cpp +++ b/editor/editorSettings.cpp @@ -86,6 +86,10 @@ bool editorSettings::load() parse(value, m_orthophoto.year); else if (key == "ortho_4k") m_orthophoto.hires = (value == "1"); + else if (key == "ortho_drape") + m_orthophoto.drape = (value == "1"); + else if (key == "ortho_in_scene") + m_orthophoto.in_scene = (value == "1"); else if (key.rfind(origin_prefix, 0) == 0) { // northing;easting @@ -121,6 +125,8 @@ bool editorSettings::save() stream << "ortho_opacity " << m_orthophoto.opacity << "\n"; stream << "ortho_year " << m_orthophoto.year << "\n"; stream << "ortho_4k " << (m_orthophoto.hires ? 1 : 0) << "\n"; + stream << "ortho_drape " << (m_orthophoto.drape ? 1 : 0) << "\n"; + stream << "ortho_in_scene " << (m_orthophoto.in_scene ? 1 : 0) << "\n"; stream << std::fixed << std::setprecision(3); for (auto const &origin : m_orthophoto_origins) stream << origin.first << " " << origin.second.first << ";" << origin.second.second << "\n"; diff --git a/editor/editorSettings.hpp b/editor/editorSettings.hpp index 122a6f049..9d46a0003 100644 --- a/editor/editorSettings.hpp +++ b/editor/editorSettings.hpp @@ -30,6 +30,8 @@ public: float opacity{0.6f}; int year{0}; bool hires{false}; + bool drape{true}; + bool in_scene{false}; }; orthophoto_settings &orthophoto() { return m_orthophoto; } // PUWG 1992 northing/easting of the scenery's (0,0,0) point; false when none was stored From 314e7df29434bda29dd3a9da92a141163fd74df2 Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 1 Oct 2026 21:57:18 +0200 Subject: [PATCH 032/430] braking diagnostics --- vehicle/Driver.cpp | 107 +++++++++++++++++++++++++++++++++++++++++++++ vehicle/Driver.h | 7 +++ 2 files changed, 114 insertions(+) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 9f1b2586c..6cf01f307 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -34,6 +34,7 @@ http://mozilla.org/MPL/2.0/. #define LOGSTOPS 1 #define LOGBACKSCAN 0 #define LOGPRESS 0 +#define LOGBRAKECHARGE 1 // finds point of specified track nearest to specified event. returns: distance to that point from the specified end of the track // TODO: move this to file with all generic routines, too easy to forget it's here and it may come useful @@ -5885,6 +5886,10 @@ TController::determine_consist_state() { Ready = true; // wstępnie gotowy fReady = 0.0; // założenie, że odhamowany + fConsistMaxCRP = 0.0; + fConsistMinCRP = 99.0; + fConsistBrakedCount = 0; + fConsistReleaserCount = 0; IsConsistBraked = mvOccupied->BrakeSystem == TBrakeSystem::ElectroPneumatic && false == ForcePNBrake ? mvOccupied->BrakePress > 2.0 : mvOccupied->PipePress < std::max(3.9, mvOccupied->BrakePressureActual.PipePressureVal) + 0.1; fAccGravity = 0.0; // przyspieszenie wynikające z pochylenia @@ -5914,6 +5919,9 @@ TController::determine_consist_state() { // za dużo w zbiorniku // indywidualne luzowanko vehicle->BrakeReleaser(1); +#if LOGBRAKECHARGE + ++fConsistReleaserCount; +#endif } if (bp < 0.1 && (AIControllFlag || Global.AITrainman) && false == TestFlag(vehicle->Hamulec->GetBrakeStatus(), b_dmg) // brake isn't broken && vehicle->Hamulec->GetCRP() < vehicle->PipePress - 0.1) { @@ -5923,6 +5931,9 @@ TController::determine_consist_state() { } } fReady = std::max( bp, fReady ); // szukanie najbardziej zahamowanego + fConsistMaxCRP = std::max( fConsistMaxCRP, vehicle->Hamulec->GetCRP() ); + fConsistMinCRP = std::min( fConsistMinCRP, vehicle->Hamulec->GetCRP() ); + if( bp > 0.4 ) { ++fConsistBrakedCount; } if( ( dy = p->VectorFront().y ) != 0.0 ) { // istotne tylko dla pojazdów na pochyleniu // ciężar razy składowa styczna grawitacji @@ -8028,8 +8039,104 @@ void TController::control_main_pipe() { BrakeLevelSet(gbh_FS); // don't charge the brakes too often, or we risk overcharging BrakeChargingCooldown = -1 * std::clamp(iVehicles * 3, 30, 90); +#if LOGBRAKECHARGE + fBrakeChargeFSStart = ElapsedTime; + WriteLog( "BRAKECHARGE-FIRE " + OwnerName() + + " t=" + to_string( ElapsedTime, 1 ) + + " Vel=" + to_string( mvOccupied->Vel, 1 ) + + " VelDes=" + to_string( VelDesired, 1 ) + + " VelNext=" + to_string( VelNext, 1 ) + + " AccDes=" + to_string( AccDesired, 3 ) + + " AbsAccS=" + to_string( AbsAccS, 3 ) + + " AccGrav=" + to_string( fAccGravity, 3 ) + + " fReady=" + to_string( fReady, 2 ) + + " PipeP=" + to_string( mvOccupied->PipePress, 2 ) + + " EqPipeP=" + to_string( mvOccupied->EqvtPipePress, 2 ) + + " minCRP=" + to_string( fConsistMinCRP, 2 ) + + " maxCRP=" + to_string( fConsistMaxCRP, 2 ) + + " braked=" + std::to_string( fConsistBrakedCount ) + "/" + std::to_string( iVehicles ) + + " releaser=" + std::to_string( fConsistReleaserCount ) + + " ProxDist=" + to_string( ActualProximityDist, 1 ) + + " nVeh=" + std::to_string( iVehicles ) + + " heavyCargo=" + std::to_string( IsHeavyCargoTrain ) ); +#endif } +#if LOGBRAKECHARGE + if( fBrakeChargeFSStart >= 0.0 + && BrakeCtrlPosition > gbh_FS + 0.5 ) { + WriteLog( "BRAKECHARGE-FSEND " + OwnerName() + + " t=" + to_string( ElapsedTime, 1 ) + + " durationS=" + to_string( ElapsedTime - fBrakeChargeFSStart, 2 ) + + " Vel=" + to_string( mvOccupied->Vel, 1 ) + + " AccGrav=" + to_string( fAccGravity, 3 ) + + " PipeP=" + to_string( mvOccupied->PipePress, 2 ) + + " EqPipeP=" + to_string( mvOccupied->EqvtPipePress, 2 ) + + " maxCRP=" + to_string( fConsistMaxCRP, 2 ) ); + fBrakeChargeFSStart = -1.0; + } + + { + auto const wantsdepart { mvOccupied->Vel < EU07_AI_NOMOVEMENT && VelDesired > 0.0 }; + auto const blocked { wantsdepart && ( false == Ready || fReady > 0.4 ) }; + if( blocked ) { + if( fDepartBlockStart < 0.0 ) { fDepartBlockStart = ElapsedTime; } + if( ElapsedTime - fBrakeChargeLogTimer >= 2.0 ) { + fBrakeChargeLogTimer = ElapsedTime; + WriteLog( "BRAKECHARGE-DEPART " + OwnerName() + + " t=" + to_string( ElapsedTime, 1 ) + + " blockedS=" + to_string( ElapsedTime - fDepartBlockStart, 1 ) + + " Ready=" + std::to_string( Ready ) + + " fReady=" + to_string( fReady, 2 ) + + " braked=" + std::to_string( fConsistBrakedCount ) + "/" + std::to_string( iVehicles ) + + " releaser=" + std::to_string( fConsistReleaserCount ) + + " minCRP=" + to_string( fConsistMinCRP, 2 ) + + " maxCRP=" + to_string( fConsistMaxCRP, 2 ) + + " PipeP=" + to_string( mvOccupied->PipePress, 2 ) + + " EqPipeP=" + to_string( mvOccupied->EqvtPipePress, 2 ) + + " Compr=" + to_string( mvOccupied->Compressor, 2 ) + + " BCP=" + to_string( BrakeCtrlPosition, 2 ) ); + } + } + else if( fDepartBlockStart >= 0.0 ) { + WriteLog( "BRAKECHARGE-DEPARTOK " + OwnerName() + + " t=" + to_string( ElapsedTime, 1 ) + + " blockedTotalS=" + to_string( ElapsedTime - fDepartBlockStart, 1 ) + + " fReady=" + to_string( fReady, 2 ) + + " maxCRP=" + to_string( fConsistMaxCRP, 2 ) + + " PipeP=" + to_string( mvOccupied->PipePress, 2 ) ); + fDepartBlockStart = -1.0; + } + } +#endif + +#if LOGBRAKECHARGE + if( ( std::abs( fAccGravity ) > 0.01 + || ( mvOccupied->Vel < 1.0 && fReady > 0.3 ) ) + && ElapsedTime - fBrakeChargeLogTimer >= 2.0 ) { + fBrakeChargeLogTimer = ElapsedTime; + WriteLog( "BRAKECHARGE-STATE " + OwnerName() + + " t=" + to_string( ElapsedTime, 1 ) + + " Vel=" + to_string( mvOccupied->Vel, 1 ) + + " VelDes=" + to_string( VelDesired, 1 ) + + " VelNext=" + to_string( VelNext, 1 ) + + " AccDes=" + to_string( AccDesired, 3 ) + + " AbsAccS=" + to_string( AbsAccS, 3 ) + + " AccGrav=" + to_string( fAccGravity, 3 ) + + " fReady=" + to_string( fReady, 2 ) + + " braked=" + std::to_string( fConsistBrakedCount ) + "/" + std::to_string( iVehicles ) + + " releaser=" + std::to_string( fConsistReleaserCount ) + + " minCRP=" + to_string( fConsistMinCRP, 2 ) + + " maxCRP=" + to_string( fConsistMaxCRP, 2 ) + + " BCP=" + to_string( BrakeCtrlPosition, 2 ) + + " PipeP=" + to_string( mvOccupied->PipePress, 2 ) + + " EqPipeP=" + to_string( mvOccupied->EqvtPipePress, 2 ) + + " Compr=" + to_string( mvOccupied->Compressor, 2 ) + + " Cooldown=" + to_string( BrakeChargingCooldown, 1 ) + + " ProxDist=" + to_string( ActualProximityDist, 1 ) ); + } +#endif + if( mvOccupied->Compressor < 5.0 || ( BrakeCtrlPosition < gbh_RP && mvOccupied->EqvtPipePress > (fReady < 0.25 ? 5.1 : 5.2) ) ) { diff --git a/vehicle/Driver.h b/vehicle/Driver.h index b76dbf086..c87a79942 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -450,6 +450,13 @@ private: double ReactionTime = 0.0; // czas reakcji Ra: czego i na co? świadomości AI double fBrakeTime = 0.0; // wpisana wartość jest zmniejszana do 0, gdy ujemna należy zmienić nastawę hamulca double BrakeChargingCooldown{}; // prevents the ai from trying to charge the train brake too frequently + double fBrakeChargeLogTimer = 0.0; + double fBrakeChargeFSStart = -1.0; + double fConsistMaxCRP = 0.0; + double fConsistMinCRP = 0.0; + int fConsistBrakedCount = 0; + int fConsistReleaserCount = 0; + double fDepartBlockStart = -1.0; TBrakeSystem BrakeSystem = TBrakeSystem::Individual; //type of main brake bool ForcePNBrake = false; //is it necessary to use PN brake instead of EP brake int DynamicBrakeTest = 0; //is it necessary to make brake test while driving From 69f5f551a179fffb0aa47b15c56841f78632e5c7 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Thu, 1 Oct 2026 22:17:12 +0200 Subject: [PATCH 033/430] feat(editor): orthophoto lift above the ground and opacity in the scene --- application/editormode.cpp | 19 ++++++++-- editor/editorOrthophoto.cpp | 72 ++++++++++++++++++++++++++++--------- editor/editorOrthophoto.hpp | 23 +++++++++--- editor/editorSettings.cpp | 3 ++ editor/editorSettings.hpp | 1 + 5 files changed, 94 insertions(+), 24 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index f4e1e2d29..745941187 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -1174,6 +1174,7 @@ void editor_mode::load_orthophoto_settings() config.year = stored.year; config.hires = stored.hires; config.drape = stored.drape; + config.lift = stored.lift; config.in_scene = stored.in_scene; config.north = 0.0; config.east = 0.0; @@ -1192,6 +1193,7 @@ void editor_mode::save_orthophoto_settings() stored.year = config.year; stored.hires = config.hires; stored.drape = config.drape; + stored.lift = config.lift; stored.in_scene = config.in_scene; if (config.north != 0.0 || config.east != 0.0) EditorSettings.orthophoto_origin(m_orthophoto_scenery, config.north, config.east); @@ -1267,6 +1269,15 @@ void editor_mode::render_orthophoto_ui() ImGui::SetTooltip("Samples the ground again, after it was edited"); } + begin_disabled(!config.drape); + ImGui::SetNextItemWidth(160.0f); + changed |= ImGui::DragFloat("Lift above ground (m)", &config.lift, 0.01f, 0.0f, 50.0f, "%.2f"); + persist |= ImGui::IsItemDeactivatedAfterEdit(); + end_disabled(!config.drape); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("Raises the fitted imagery above the ground. Keep it below the objects you want to see:\n" + "in the scene everything lower than this ends up under the imagery."); + begin_disabled(config.drape); ImGui::SetNextItemWidth(160.0f); changed |= ImGui::DragFloat("Height (m)", &config.height, 0.1f, -1000.0f, 3000.0f, "%.2f"); @@ -1277,14 +1288,16 @@ void editor_mode::render_orthophoto_ui() changed = persist = true; if (ImGui::IsItemHovered()) ImGui::SetTooltip("Draws the imagery as part of the scene, so tracks, models and terrain in front of it hide it.\n" - "It is opaque then and lit like the scene; mouse placement lands on it as on any surface.\n" + "It is lit like the scene. Fully opaque, mouse placement lands on it as on any surface;\n" + "translucent, it doesn't catch the mouse.\n" "Not available with the Better Renderer, which doesn't pick up geometry added in the editor."); - begin_disabled(config.in_scene); ImGui::SetNextItemWidth(160.0f); changed |= ImGui::SliderFloat("Opacity", &config.opacity, 0.0f, 1.0f, "%.2f"); persist |= ImGui::IsItemDeactivatedAfterEdit(); - end_disabled(config.in_scene); + if (config.in_scene && ImGui::IsItemHovered()) + ImGui::SetTooltip("In the scene the opacity is part of the textures: the tiles are read again from the cache\n" + "shortly after the slider stops, which takes a moment."); // newest imagery, or the newest imagery taken up to the end of the selected year int const thisyear = static_cast(std::chrono::year_month_day{std::chrono::floor(std::chrono::system_clock::now())}.year()); diff --git a/editor/editorOrthophoto.cpp b/editor/editorOrthophoto.cpp index 3d478eb9b..935fd825c 100644 --- a/editor/editorOrthophoto.cpp +++ b/editor/editorOrthophoto.cpp @@ -554,7 +554,6 @@ template int clip_polygon(clip_vertex const *In, int Count, // ground fit and in-scene geometry constexpr int ground_grid{32}; // ground samples per tile side (8 m) for the draped overlay -constexpr double surface_offset{0.05}; // lift of the in-scene imagery above the ground it covers, against z-fighting constexpr double steepest_ground{0.3}; // minimal normal.y of ground triangles receiving the imagery constexpr float no_height{-std::numeric_limits::max()}; @@ -684,8 +683,9 @@ void editor_orthophoto::enabled(bool State) void editor_orthophoto::settings(config const &Config) { bool const sourcechanged = (Config.year != m_config.year || Config.hires != m_config.hires); - bool const shapechanged = (Config.height != m_config.height || Config.drape != m_config.drape || Config.in_scene != m_config.in_scene); + bool const shapechanged = (Config.height != m_config.height || Config.drape != m_config.drape || Config.in_scene != m_config.in_scene || Config.lift != m_config.lift); m_config = Config; + m_config.lift = std::clamp(m_config.lift, 0.0f, 50.0f); m_config.radius = std::clamp(m_config.radius, 0, max_radius); m_config.opacity = std::clamp(m_config.opacity, 0.0f, 1.0f); if (shapechanged) @@ -812,17 +812,24 @@ void editor_orthophoto::release_tile(tile &Tile) Tile.slot = texture_slot{}; } -void editor_orthophoto::schedule(tile_key const &Key, tile &Tile, int Level) +void editor_orthophoto::schedule(tile_key const &Key, tile &Tile, int Level, std::uint8_t Alpha) { { std::lock_guard lock(m_mutex); m_queue.erase(std::remove_if(m_queue.begin(), m_queue.end(), [&](job const &Job) { return Job.key == Key; }), m_queue.end()); - m_queue.push_back(job{Key, Level, source{m_config.year, m_config.hires}, m_generation.load()}); + m_queue.push_back(job{Key, Level, Alpha, source{m_config.year, m_config.hires}, m_generation.load()}); } Tile.requested = Level; + Tile.requested_alpha = Alpha; m_wakeup.notify_one(); } +std::uint8_t editor_orthophoto::texture_alpha() const +{ + // the overlay applies its opacity when drawing, the scene shapes can only take it from the texture + return m_config.in_scene ? static_cast(std::lround(m_config.opacity * 255.0f)) : 255; +} + std::size_t editor_orthophoto::apply(result &Result, double Now) { if (Result.generation != m_generation.load()) @@ -831,7 +838,7 @@ std::size_t editor_orthophoto::apply(result &Result, double Now) if (lookup == m_tiles.end()) return 0; // left the area in the meantime; the imagery stays in the disk cache tile &t = lookup->second; - bool const current = (t.requested == Result.level); + bool const current = (t.requested == Result.level && t.requested_alpha == Result.alpha); if (current) t.requested = 0; @@ -847,6 +854,9 @@ std::size_t editor_orthophoto::apply(result &Result, double Now) t.failures = 0; t.level = Result.level; + if ((t.alpha < 255) != (Result.alpha < 255)) + t.scene_dirty = true; // the shape moves between the opaque and the translucent pass + t.alpha = Result.alpha; t.empty = Result.empty; if (Result.empty) { @@ -974,7 +984,7 @@ void editor_orthophoto::remove_shape(tile &Tile) return; if (m_region == simulation::Region) { - auto &shapes = Tile.section->m_shapes; + auto &shapes = (Tile.cell != nullptr ? Tile.cell->m_shapestranslucent : Tile.section->m_shapes); for (auto it = shapes.begin(); it != shapes.end(); ++it) { auto const &geometry = it->data().geometry; @@ -986,6 +996,7 @@ void editor_orthophoto::remove_shape(tile &Tile) } } Tile.section = nullptr; + Tile.cell = nullptr; } void editor_orthophoto::release_geometry(tile &Tile) @@ -1024,9 +1035,9 @@ void editor_orthophoto::build_shape(tile_key const &Key, tile &Tile) { vertices.reserve(Tile.surface.size()); for (auto const &point : Tile.surface) - add(point, surface_offset); + add(point, m_config.lift); ylo = Tile.height_min; - yhi = Tile.height_max + surface_offset; + yhi = Tile.height_max + m_config.lift; } else { @@ -1042,7 +1053,11 @@ void editor_orthophoto::build_shape(tile_key const &Key, tile &Tile) glm::dvec3 const centre(corner.x - tile_size * 0.5, (ylo + yhi) * 0.5, corner.y - tile_size * 0.5); scene::basic_section §ion = simulation::Region->section(centre); section.create_geometry(); // existing section geometry has to be in place before we add ours (idempotent) - glm::dvec3 const origin = section.m_area.center; + // opaque imagery goes with the section geometry; translucent one has to be drawn in the translucent pass, + // which only covers the cells. shapes are drawn relative to the centre of their container + bool const translucent = (Tile.alpha < 255); + scene::basic_cell *cell = translucent ? §ion.cell(centre) : nullptr; + glm::dvec3 const origin = translucent ? cell->m_area.center : section.m_area.center; // chunks are padded to a few fixed sizes (whole triangles), so ones freed by other tiles can be refilled in place std::size_t capacity{6}; @@ -1096,12 +1111,22 @@ void editor_orthophoto::build_shape(tile_key const &Key, tile &Tile) scene::shape_node shape; shape.make_terrain(Tile.slot.material, std::move(bounds), origin); shape.geometry(Tile.geometry); - section.m_shapes.emplace_back(std::move(shape)); - // extend the section bounds so the tile isn't culled at its edges + // extend the bounds of the containers so the tile isn't culled at its edges double const reach = glm::length(glm::dvec3(tile_size * 0.5, (yhi - ylo) * 0.5, tile_size * 0.5)); section.m_area.radius = std::max(section.m_area.radius, static_cast(glm::length(section.m_area.center - centre) + reach)); + if (cell != nullptr) + { + cell->m_shapestranslucent.emplace_back(std::move(shape)); + cell->m_area.radius = std::max(cell->m_area.radius, static_cast(glm::length(cell->m_area.center - centre) + reach)); + cell->m_active = true; // the renderer skips cells which held nothing so far + } + else + { + section.m_shapes.emplace_back(std::move(shape)); + } Tile.section = §ion; + Tile.cell = cell; m_region = simulation::Region; } @@ -1171,6 +1196,16 @@ void editor_orthophoto::update(glm::dvec3 const &Camera) int const radius = m_config.radius; auto const distance = [&](tile_key const &Key) { return std::max(std::abs(Key.first - centre.first), std::abs(Key.second - centre.second)); }; + // opacity of the scene shapes: the tiles are read again with the new alpha once the slider stops moving + std::uint8_t const alpha = texture_alpha(); + if (alpha != m_alpha_pending) + { + m_alpha_pending = alpha; + m_alpha_changed = now; + } + if (m_alpha != m_alpha_pending && now - m_alpha_changed > 0.3) + m_alpha = m_alpha_pending; + // tiles which left the area bool evicted{false}; for (auto it = m_tiles.begin(); it != m_tiles.end();) @@ -1199,9 +1234,9 @@ void editor_orthophoto::update(glm::dvec3 const &Camera) if (!in_service_area(key.first, key.second)) t.empty = true; int const level = level_for(std::max(std::abs(dx), std::abs(dy)), m_config.hires); - if (t.empty || t.level == level || t.requested == level || now < t.retry_at) + if (t.empty || (t.level == level && t.alpha == m_alpha) || (t.requested == level && t.requested_alpha == m_alpha) || now < t.retry_at) continue; - schedule(key, t, level); + schedule(key, t, level, m_alpha); } // ground fit, one tile per frame (it walks the scene geometry), nearest first @@ -1265,6 +1300,7 @@ void editor_orthophoto::worker() out.key = current.key; out.level = current.level; out.generation = current.generation; + out.alpha = current.alpha; image picture; std::string error; @@ -1274,6 +1310,9 @@ void editor_orthophoto::worker() return; if (!out.ok) ErrorLog("Editor orthophoto: tile " + std::to_string(current.key.second) + "_" + std::to_string(current.key.first) + " failed: " + error); + if (out.ok && current.alpha < 255) + for (std::size_t i = 3; i < picture.rgba.size(); i += 4) + picture.rgba[i] = static_cast((picture.rgba[i] * current.alpha + 127u) / 255u); out.width = picture.width; out.height = picture.height; out.pixels = std::move(picture.rgba); @@ -1320,8 +1359,9 @@ void editor_orthophoto::draw(glm::mat4 const &ViewProjection, glm::dvec3 const & bool const draped = m_config.drape && !t.heights.empty(); double const flat = m_config.height; - double const ylo = draped ? t.height_min : flat; - double const yhi = draped ? t.height_max : flat; + double const lift = m_config.lift; + double const ylo = draped ? t.height_min + lift : flat; + double const yhi = draped ? t.height_max + lift : flat; // world extent of the tile; u runs west->east (-x), v runs north->south (-z), matching the image rows glm::dvec2 const corner = tile_corner(entry.first); @@ -1346,7 +1386,7 @@ void editor_orthophoto::draw(glm::mat4 const &ViewProjection, glm::dvec3 const & if (draped) segments = std::max(segments, distance < 300.0 ? ground_grid : distance < 800.0 ? ground_grid / 2 : ground_grid / 4); float const segmentsize = 1.0f / static_cast(segments); - auto const height_at = [&](float U, float V) { return draped ? sample_heights(t.heights, U, V) : flat; }; + auto const height_at = [&](float U, float V) { return draped ? sample_heights(t.heights, U, V) + lift : flat; }; drawlist->PushTextureID(reinterpret_cast(textureid)); for (int j = 0; j < segments; ++j) diff --git a/editor/editorOrthophoto.hpp b/editor/editorOrthophoto.hpp index 5f246db48..cfaf925a6 100644 --- a/editor/editorOrthophoto.hpp +++ b/editor/editorOrthophoto.hpp @@ -31,6 +31,7 @@ namespace scene { class basic_region; class basic_section; +class basic_cell; } // namespace scene // Editor aid: aerial orthophoto tiles from geoportal.gov.pl (GUGiK WMS), shown around the camera either @@ -43,8 +44,9 @@ class basic_section; // Downloading, cache I/O and image decoding run on worker threads; the main thread only uploads // finished images (a bounded amount per frame) and emits the geometry. By default the layer goes into // the ImGui background draw list, like the other editor viewport overlays: translucent and drawn over -// everything. Optionally it is put into the scene instead (opaque shapes in the region sections, like the -// editor terrain), so tracks, models and terrain in front of it cover it. +// everything. Optionally it is put into the scene instead (shapes in the region sections, like the editor +// terrain, or translucent shapes in the cells when it isn't fully opaque), so tracks, models and terrain in +// front of it cover it. class editor_orthophoto { public: @@ -54,10 +56,11 @@ class editor_orthophoto double east{0.0}; // PUWG 1992 Y (easting) of the scenery origin int radius{2}; // tiles loaded around the camera tile (Chebyshev distance) float height{0.0f}; // world Y of the layer (with drape: only where no ground was found) - float opacity{0.6f}; // 0..1, overlay only + float opacity{0.6f}; // 0..1 int year{0}; // 0 = newest available imagery, otherwise newest imagery taken up to the end of that year bool hires{false}; // 4096 px tiles from the high-resolution product next to the camera, where it exists bool drape{true}; // fit the imagery onto the ground geometry instead of a flat plane + float lift{0.05f}; // with drape: distance above the ground (in the scene it has to clear the ground to be seen) bool in_scene{false}; // render as opaque scene geometry, covered by whatever is in front of it }; @@ -122,7 +125,8 @@ class editor_orthophoto struct job { tile_key key; - int level{0}; // requested texture size in pixels + int level{0}; // requested texture size in pixels + std::uint8_t alpha{255}; // baked into the texture, for translucency in the scene source src; std::uint32_t generation{0}; }; @@ -131,6 +135,7 @@ class editor_orthophoto { tile_key key; int level{0}; + std::uint8_t alpha{255}; std::uint32_t generation{0}; bool ok{false}; bool empty{false}; // no imagery for this place/year: nothing to draw @@ -151,6 +156,8 @@ class editor_orthophoto texture_slot slot; int level{0}; // size of the imagery currently held (0 = nothing yet) int requested{0}; // level of the job scheduled for this tile (0 = none) + std::uint8_t alpha{255}; // alpha of the imagery currently held + std::uint8_t requested_alpha{255}; // alpha of the scheduled job bool empty{false}; int failures{0}; double retry_at{0.0}; // steady clock seconds @@ -162,6 +169,7 @@ class editor_orthophoto std::vector surface; // upward facing ground triangles clipped to the tile (3 vertices each) // scene geometry scene::basic_section *section{nullptr}; // section holding the shape (nullptr = not in the scene) + scene::basic_cell *cell{nullptr}; // set instead of the section's shape list when the shape is translucent gfx::geometry_handle geometry{0, 0}; std::size_t capacity{0}; // vertex count of the geometry chunk bool scene_dirty{true}; // the shape needs to be rebuilt @@ -170,7 +178,8 @@ class editor_orthophoto static int level_for(int Distance, bool Hires); tile_key camera_tile(glm::dvec3 const &Camera) const; glm::dvec2 tile_corner(tile_key const &Key) const; // world (x,z) of the north-west corner - void schedule(tile_key const &Key, tile &Tile, int Level); + void schedule(tile_key const &Key, tile &Tile, int Level, std::uint8_t Alpha); + std::uint8_t texture_alpha() const; // alpha the textures should carry with the current settings std::size_t apply(result &Result, double Now); // returns bytes uploaded void release_tile(tile &Tile); texture_slot acquire_slot(); @@ -191,6 +200,10 @@ class editor_orthophoto ground_query m_ground; scene::basic_region *m_region{nullptr}; // region the scene geometry was put into std::multimap m_free_chunks; // geometry chunks by capacity, reused between tiles + // the scene opacity is baked into the textures, which means reading the tiles again; applied once the value settles + std::uint8_t m_alpha{255}; // in effect + std::uint8_t m_alpha_pending{255}; // latest requested + double m_alpha_changed{0.0}; // when the requested value last changed // shared with the workers, guarded by m_mutex mutable std::mutex m_mutex; diff --git a/editor/editorSettings.cpp b/editor/editorSettings.cpp index 3e7516c11..f97258184 100644 --- a/editor/editorSettings.cpp +++ b/editor/editorSettings.cpp @@ -88,6 +88,8 @@ bool editorSettings::load() m_orthophoto.hires = (value == "1"); else if (key == "ortho_drape") m_orthophoto.drape = (value == "1"); + else if (key == "ortho_lift") + parse(value, m_orthophoto.lift); else if (key == "ortho_in_scene") m_orthophoto.in_scene = (value == "1"); else if (key.rfind(origin_prefix, 0) == 0) @@ -126,6 +128,7 @@ bool editorSettings::save() stream << "ortho_year " << m_orthophoto.year << "\n"; stream << "ortho_4k " << (m_orthophoto.hires ? 1 : 0) << "\n"; stream << "ortho_drape " << (m_orthophoto.drape ? 1 : 0) << "\n"; + stream << "ortho_lift " << m_orthophoto.lift << "\n"; stream << "ortho_in_scene " << (m_orthophoto.in_scene ? 1 : 0) << "\n"; stream << std::fixed << std::setprecision(3); for (auto const &origin : m_orthophoto_origins) diff --git a/editor/editorSettings.hpp b/editor/editorSettings.hpp index 9d46a0003..b43410fc3 100644 --- a/editor/editorSettings.hpp +++ b/editor/editorSettings.hpp @@ -31,6 +31,7 @@ public: int year{0}; bool hires{false}; bool drape{true}; + float lift{0.05f}; bool in_scene{false}; }; orthophoto_settings &orthophoto() { return m_orthophoto; } From affa7cdaa92eba4a9a0b7854668f1ef6c332288d Mon Sep 17 00:00:00 2001 From: maj00r Date: Fri, 2 Oct 2026 19:55:23 +0200 Subject: [PATCH 034/430] AI - prevent overcharge when pipe pressure of car is too high for too long --- vehicle/Driver.cpp | 146 ++++++++++++--------------------------------- vehicle/Driver.h | 11 ++-- 2 files changed, 43 insertions(+), 114 deletions(-) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 6cf01f307..be326dc55 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -34,7 +34,6 @@ http://mozilla.org/MPL/2.0/. #define LOGSTOPS 1 #define LOGBACKSCAN 0 #define LOGPRESS 0 -#define LOGBRAKECHARGE 1 // finds point of specified track nearest to specified event. returns: distance to that point from the specified end of the track // TODO: move this to file with all generic routines, too easy to forget it's here and it may come useful @@ -155,6 +154,9 @@ const double HeavyPassengetTrainAcceleration = 0.20; const double CargoTrainAcceleration = 0.25; const double HeavyCargoTrainAcceleration = 0.10; const double PrepareTime = 2.0; //[s] przebłyski świadomości przy odpalaniu +const double FSOverchargePipePress = 5.2; +const double FSOverchargeTime = 2.0; +const double FSMaxTime = 10.0; bool WriteLogFlag = false; double const deltalog = 0.05; // przyrost czasu @@ -5886,10 +5888,6 @@ TController::determine_consist_state() { Ready = true; // wstępnie gotowy fReady = 0.0; // założenie, że odhamowany - fConsistMaxCRP = 0.0; - fConsistMinCRP = 99.0; - fConsistBrakedCount = 0; - fConsistReleaserCount = 0; IsConsistBraked = mvOccupied->BrakeSystem == TBrakeSystem::ElectroPneumatic && false == ForcePNBrake ? mvOccupied->BrakePress > 2.0 : mvOccupied->PipePress < std::max(3.9, mvOccupied->BrakePressureActual.PipePressureVal) + 0.1; fAccGravity = 0.0; // przyspieszenie wynikające z pochylenia @@ -5919,9 +5917,6 @@ TController::determine_consist_state() { // za dużo w zbiorniku // indywidualne luzowanko vehicle->BrakeReleaser(1); -#if LOGBRAKECHARGE - ++fConsistReleaserCount; -#endif } if (bp < 0.1 && (AIControllFlag || Global.AITrainman) && false == TestFlag(vehicle->Hamulec->GetBrakeStatus(), b_dmg) // brake isn't broken && vehicle->Hamulec->GetCRP() < vehicle->PipePress - 0.1) { @@ -5931,9 +5926,6 @@ TController::determine_consist_state() { } } fReady = std::max( bp, fReady ); // szukanie najbardziej zahamowanego - fConsistMaxCRP = std::max( fConsistMaxCRP, vehicle->Hamulec->GetCRP() ); - fConsistMinCRP = std::min( fConsistMinCRP, vehicle->Hamulec->GetCRP() ); - if( bp > 0.4 ) { ++fConsistBrakedCount; } if( ( dy = p->VectorFront().y ) != 0.0 ) { // istotne tylko dla pojazdów na pochyleniu // ciężar razy składowa styczna grawitacji @@ -8039,112 +8031,52 @@ void TController::control_main_pipe() { BrakeLevelSet(gbh_FS); // don't charge the brakes too often, or we risk overcharging BrakeChargingCooldown = -1 * std::clamp(iVehicles * 3, 30, 90); -#if LOGBRAKECHARGE - fBrakeChargeFSStart = ElapsedTime; - WriteLog( "BRAKECHARGE-FIRE " + OwnerName() - + " t=" + to_string( ElapsedTime, 1 ) - + " Vel=" + to_string( mvOccupied->Vel, 1 ) - + " VelDes=" + to_string( VelDesired, 1 ) - + " VelNext=" + to_string( VelNext, 1 ) - + " AccDes=" + to_string( AccDesired, 3 ) - + " AbsAccS=" + to_string( AbsAccS, 3 ) - + " AccGrav=" + to_string( fAccGravity, 3 ) - + " fReady=" + to_string( fReady, 2 ) - + " PipeP=" + to_string( mvOccupied->PipePress, 2 ) - + " EqPipeP=" + to_string( mvOccupied->EqvtPipePress, 2 ) - + " minCRP=" + to_string( fConsistMinCRP, 2 ) - + " maxCRP=" + to_string( fConsistMaxCRP, 2 ) - + " braked=" + std::to_string( fConsistBrakedCount ) + "/" + std::to_string( iVehicles ) - + " releaser=" + std::to_string( fConsistReleaserCount ) - + " ProxDist=" + to_string( ActualProximityDist, 1 ) - + " nVeh=" + std::to_string( iVehicles ) - + " heavyCargo=" + std::to_string( IsHeavyCargoTrain ) ); -#endif } -#if LOGBRAKECHARGE - if( fBrakeChargeFSStart >= 0.0 - && BrakeCtrlPosition > gbh_FS + 0.5 ) { - WriteLog( "BRAKECHARGE-FSEND " + OwnerName() - + " t=" + to_string( ElapsedTime, 1 ) - + " durationS=" + to_string( ElapsedTime - fBrakeChargeFSStart, 2 ) - + " Vel=" + to_string( mvOccupied->Vel, 1 ) - + " AccGrav=" + to_string( fAccGravity, 3 ) - + " PipeP=" + to_string( mvOccupied->PipePress, 2 ) - + " EqPipeP=" + to_string( mvOccupied->EqvtPipePress, 2 ) - + " maxCRP=" + to_string( fConsistMaxCRP, 2 ) ); - fBrakeChargeFSStart = -1.0; - } - - { - auto const wantsdepart { mvOccupied->Vel < EU07_AI_NOMOVEMENT && VelDesired > 0.0 }; - auto const blocked { wantsdepart && ( false == Ready || fReady > 0.4 ) }; - if( blocked ) { - if( fDepartBlockStart < 0.0 ) { fDepartBlockStart = ElapsedTime; } - if( ElapsedTime - fBrakeChargeLogTimer >= 2.0 ) { - fBrakeChargeLogTimer = ElapsedTime; - WriteLog( "BRAKECHARGE-DEPART " + OwnerName() - + " t=" + to_string( ElapsedTime, 1 ) - + " blockedS=" + to_string( ElapsedTime - fDepartBlockStart, 1 ) - + " Ready=" + std::to_string( Ready ) - + " fReady=" + to_string( fReady, 2 ) - + " braked=" + std::to_string( fConsistBrakedCount ) + "/" + std::to_string( iVehicles ) - + " releaser=" + std::to_string( fConsistReleaserCount ) - + " minCRP=" + to_string( fConsistMinCRP, 2 ) - + " maxCRP=" + to_string( fConsistMaxCRP, 2 ) - + " PipeP=" + to_string( mvOccupied->PipePress, 2 ) - + " EqPipeP=" + to_string( mvOccupied->EqvtPipePress, 2 ) - + " Compr=" + to_string( mvOccupied->Compressor, 2 ) - + " BCP=" + to_string( BrakeCtrlPosition, 2 ) ); - } - } - else if( fDepartBlockStart >= 0.0 ) { - WriteLog( "BRAKECHARGE-DEPARTOK " + OwnerName() - + " t=" + to_string( ElapsedTime, 1 ) - + " blockedTotalS=" + to_string( ElapsedTime - fDepartBlockStart, 1 ) - + " fReady=" + to_string( fReady, 2 ) - + " maxCRP=" + to_string( fConsistMaxCRP, 2 ) - + " PipeP=" + to_string( mvOccupied->PipePress, 2 ) ); - fDepartBlockStart = -1.0; - } - } -#endif - -#if LOGBRAKECHARGE - if( ( std::abs( fAccGravity ) > 0.01 - || ( mvOccupied->Vel < 1.0 && fReady > 0.3 ) ) - && ElapsedTime - fBrakeChargeLogTimer >= 2.0 ) { - fBrakeChargeLogTimer = ElapsedTime; - WriteLog( "BRAKECHARGE-STATE " + OwnerName() - + " t=" + to_string( ElapsedTime, 1 ) - + " Vel=" + to_string( mvOccupied->Vel, 1 ) - + " VelDes=" + to_string( VelDesired, 1 ) - + " VelNext=" + to_string( VelNext, 1 ) - + " AccDes=" + to_string( AccDesired, 3 ) - + " AbsAccS=" + to_string( AbsAccS, 3 ) - + " AccGrav=" + to_string( fAccGravity, 3 ) - + " fReady=" + to_string( fReady, 2 ) - + " braked=" + std::to_string( fConsistBrakedCount ) + "/" + std::to_string( iVehicles ) - + " releaser=" + std::to_string( fConsistReleaserCount ) - + " minCRP=" + to_string( fConsistMinCRP, 2 ) - + " maxCRP=" + to_string( fConsistMaxCRP, 2 ) - + " BCP=" + to_string( BrakeCtrlPosition, 2 ) - + " PipeP=" + to_string( mvOccupied->PipePress, 2 ) - + " EqPipeP=" + to_string( mvOccupied->EqvtPipePress, 2 ) - + " Compr=" + to_string( mvOccupied->Compressor, 2 ) - + " Cooldown=" + to_string( BrakeChargingCooldown, 1 ) - + " ProxDist=" + to_string( ActualProximityDist, 1 ) ); - } -#endif + update_brake_charging(); if( mvOccupied->Compressor < 5.0 || ( BrakeCtrlPosition < gbh_RP - && mvOccupied->EqvtPipePress > (fReady < 0.25 ? 5.1 : 5.2) ) ) { + && ( mvOccupied->EqvtPipePress > (fReady < 0.25 ? 5.1 : 5.2) || is_brake_charging_done() ) ) ) { cue_action( driver_hint::trainbrakerelease ); } } } +void TController::update_brake_charging() { + + if( std::abs( BrakeCtrlPosition - gbh_FS ) >= 0.5 ) { + BrakeChargingStart = -1.0; + BrakeChargingPipeOverchargeStart.clear(); + return; + } + if( BrakeChargingStart < 0.0 ) { + BrakeChargingStart = ElapsedTime; + } + for( auto const *vehicle { pVehicles[ end::front ] }; vehicle != nullptr; vehicle = vehicle->Next() ) { + auto const isovercharged { + vehicle->MoverParameters != mvOccupied + && vehicle->MoverParameters->PipePress > FSOverchargePipePress }; + if( isovercharged ) { + BrakeChargingPipeOverchargeStart.try_emplace( vehicle, ElapsedTime ); + } + else { + BrakeChargingPipeOverchargeStart.erase( vehicle ); + } + } +} + +bool TController::is_brake_charging_done() const { + + if( BrakeChargingStart < 0.0 ) { + return false; + } + return ElapsedTime - BrakeChargingStart > FSMaxTime + || std::ranges::any_of( + BrakeChargingPipeOverchargeStart, + [this]( auto const &Vehicle ) { return ElapsedTime - Vehicle.second > FSOverchargeTime; } ); +} + void TController::check_route_ahead( double const Range ) { diff --git a/vehicle/Driver.h b/vehicle/Driver.h index c87a79942..02ad63857 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -348,6 +348,8 @@ private: void control_tractive_and_braking_force(); void control_releaser(); void control_main_pipe(); + void update_brake_charging(); + bool is_brake_charging_done() const; void control_relays(); void control_motor_connectors(); void control_tractive_force(); @@ -450,13 +452,8 @@ private: double ReactionTime = 0.0; // czas reakcji Ra: czego i na co? świadomości AI double fBrakeTime = 0.0; // wpisana wartość jest zmniejszana do 0, gdy ujemna należy zmienić nastawę hamulca double BrakeChargingCooldown{}; // prevents the ai from trying to charge the train brake too frequently - double fBrakeChargeLogTimer = 0.0; - double fBrakeChargeFSStart = -1.0; - double fConsistMaxCRP = 0.0; - double fConsistMinCRP = 0.0; - int fConsistBrakedCount = 0; - int fConsistReleaserCount = 0; - double fDepartBlockStart = -1.0; + double BrakeChargingStart = -1.0; + std::unordered_map BrakeChargingPipeOverchargeStart; TBrakeSystem BrakeSystem = TBrakeSystem::Individual; //type of main brake bool ForcePNBrake = false; //is it necessary to use PN brake instead of EP brake int DynamicBrakeTest = 0; //is it necessary to make brake test while driving From 06fc3915f48393f5f7b77186dc9aac551cc4ee82 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Fri, 2 Oct 2026 21:19:16 +0200 Subject: [PATCH 035/430] fix(renderer): guard replacable skin lookup and light colour access (#200) --- rendering/openglrenderer.cpp | 66 +++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 28 deletions(-) diff --git a/rendering/openglrenderer.cpp b/rendering/openglrenderer.cpp index dcbd1df2c..bc6c9d146 100644 --- a/rendering/openglrenderer.cpp +++ b/rendering/openglrenderer.cpp @@ -31,6 +31,23 @@ int constexpr EU07_PICKBUFFERSIZE { 1024 }; // size of (square) textures bound w int constexpr EU07_ENVIRONMENTBUFFERSIZE { 256 }; // size of (square) environmental cube map texture int constexpr EU07_REFLECTIONFIDELITYOFFSET { 250 }; // artificial increase of range for reflection pass detail reduction +namespace { + +// returns material assigned to the submodel, resolving replacable skins. null_handle if no skin set is bound +material_handle +submodel_material( TSubModel const *Submodel ) { + + if( Submodel->m_material >= 0 ) { + return Submodel->m_material; + } + return ( + TSubModel::ReplacableSkinId != nullptr ? + TSubModel::ReplacableSkinId[ -Submodel->m_material ] : + null_handle ); +} + +} // namespace + float const EU07_OPACITYDEFAULT { 0.5f }; bool @@ -1790,8 +1807,7 @@ opengl_renderer::Material( material_handle const Material ) const { opengl_material const & opengl_renderer::Material( TSubModel const * Submodel ) const { - auto const material { Submodel->m_material >= 0 ? Submodel->m_material : Submodel->ReplacableSkinId[ -Submodel->m_material ] }; - return m_materials.material( material ); + return m_materials.material( submodel_material( Submodel ) ); } // shader methods @@ -2768,10 +2784,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { } #endif // material configuration: - auto const material{ ( - Submodel->m_material < 0 ? - Submodel->ReplacableSkinId[ -Submodel->m_material ] : // zmienialne skóry - Submodel->m_material ) }; // również 0 + auto const material{ submodel_material( Submodel ) }; // zmienialne skóry, również 0 // textures... Bind_Material( material ); // ...colors and opacity... @@ -2879,7 +2892,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { // material configuration: // textures... if( Submodel->m_material < 0 ) { // zmienialne skóry - Bind_Material( TSubModel::ReplacableSkinId[ -Submodel->m_material ], Submodel ); + Bind_Material( submodel_material( Submodel ), Submodel ); } else { // również 0 @@ -2897,7 +2910,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { ::glColor3fv( glm::value_ptr( pick_color( m_pickcontrolsitems.size() ) ) ); // textures... if( Submodel->m_material < 0 ) { // zmienialne skóry - Bind_Material( TSubModel::ReplacableSkinId[ -Submodel->m_material ], Submodel ); + Bind_Material( submodel_material( Submodel ), Submodel ); } else { // również 0 @@ -2971,10 +2984,10 @@ opengl_renderer::Render( TSubModel *Submodel ) { auto const unitstate = m_unitstate; switch_units( m_unitstate.diffuse, false, false ); - auto const *lightcolor { + glm::vec3 const lightcolor { Submodel->DiffuseOverride.r < 0.f ? // -1 indicates no override - glm::value_ptr( Submodel->f4Diffuse ) : - glm::value_ptr( Submodel->DiffuseOverride ) }; + glm::vec3( Submodel->f4Diffuse ) : + Submodel->DiffuseOverride }; // main draw call if( Global.Overcast > 1.f ) { @@ -2987,9 +3000,9 @@ opengl_renderer::Render( TSubModel *Submodel ) { ::glPointSize( pointsize * fogfactor ); ::glColor4f( - lightcolor[ 0 ], - lightcolor[ 1 ], - lightcolor[ 2 ], + lightcolor.r, + lightcolor.g, + lightcolor.b, Submodel->fVisible * std::min( 1.f, lightlevel ) * 0.5f ); ::glDepthMask( GL_FALSE ); m_geometry.draw( Submodel->m_geometry.handle ); @@ -2997,9 +3010,9 @@ opengl_renderer::Render( TSubModel *Submodel ) { } ::glPointSize( pointsize ); ::glColor4f( - lightcolor[ 0 ], - lightcolor[ 1 ], - lightcolor[ 2 ], + lightcolor.r, + lightcolor.g, + lightcolor.b, Submodel->fVisible * std::min( 1.f, lightlevel ) ); m_geometry.draw( Submodel->m_geometry.handle ); @@ -3845,10 +3858,7 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { #endif // material configuration: // textures... - auto const material { ( - Submodel->m_material < 0 ? - Submodel->ReplacableSkinId[ -Submodel->m_material ] : // zmienialne skóry - Submodel->m_material ) }; // również 0 + auto const material { submodel_material( Submodel ) }; // zmienialne skóry, również 0 // textures... Bind_Material( material ); // ...colors and opacity... @@ -3923,7 +3933,7 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { // material configuration: // textures... if( Submodel->m_material < 0 ) { // zmienialne skóry - Bind_Material( TSubModel::ReplacableSkinId[ -Submodel->m_material ], Submodel ); + Bind_Material( submodel_material( Submodel ), Submodel ); } else { // również 0 @@ -3986,14 +3996,14 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { auto const unitstate = m_unitstate; switch_units( unitstate.diffuse, false, false ); - auto const *lightcolor { + glm::vec3 const lightcolor { Submodel->DiffuseOverride.r < 0.f ? // -1 indicates no override - glm::value_ptr( Submodel->f4Diffuse ) : - glm::value_ptr( Submodel->DiffuseOverride ) }; + glm::vec3( Submodel->f4Diffuse ) : + Submodel->DiffuseOverride }; ::glColor4f( - lightcolor[ 0 ], - lightcolor[ 1 ], - lightcolor[ 2 ], + lightcolor.r, + lightcolor.g, + lightcolor.b, Submodel->fVisible * glarelevel ); // main draw call From 73f2f68aa0cac38d126342b33b37386b8edcf25d Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Fri, 2 Oct 2026 21:29:18 +0200 Subject: [PATCH 036/430] feat(editor): edit session (-edit) and scenery layers --- CMakeLists.txt | 1 + application/application.cpp | 11 ++ application/drivermode.cpp | 10 ++ application/drivermode.h | 1 + application/editormode.cpp | 32 +++- application/editormode.h | 2 + application/editoruilayer.cpp | 93 +++++++++++ application/editoruilayer.h | 2 + application/editoruipanels.cpp | 5 + scene/scenelayers.cpp | 194 +++++++++++++++++++++++ scene/scenelayers.h | 117 ++++++++++++++ scene/scenenode.cpp | 3 +- scene/scenenode.h | 19 +++ simulation/simulation.cpp | 2 + simulation/simulationstateserializer.cpp | 42 +++++ utilities/Classes.h | 1 + utilities/Globals.h | 1 + utilities/parser.cpp | 25 +++ utilities/parser.h | 2 + 19 files changed, 560 insertions(+), 3 deletions(-) create mode 100644 scene/scenelayers.cpp create mode 100644 scene/scenelayers.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 1485e520e..139902611 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -178,6 +178,7 @@ set(SOURCES "application/scenarioloadermode.cpp" "application/scenarioloaderuilayer.cpp" "scene/scenenodegroups.cpp" +"scene/scenelayers.cpp" "simulation/simulationenvironment.cpp" "simulation/simulationstateserializer.cpp" "rendering/precipitation.cpp" diff --git a/application/application.cpp b/application/application.cpp index ceb5ec6c7..db77c976f 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -1145,6 +1145,16 @@ int eu07_application::init_settings(int Argc, char *Argv[]) Global.local_start_vehicle = ToLower(Argv[++i]); } } + else if (token == "-edit") + { + // edit session: the scenery is loaded without player vehicle, straight into the editor + if (i + 1 < Argc) + { + Global.SceneryFile = ToLower(Argv[++i]); + Global.local_start_vehicle = "ghostview"; + Global.editor_session = true; + } + } else if (token == "-seed") { // a number is the seed; anything else is a word that stands for one. said in the @@ -1159,6 +1169,7 @@ int eu07_application::init_settings(int Argc, char *Argv[]) { std::cout << "usage: " << std::string(Argv[0]) << " [-s sceneryfilepath]" << " [-v vehiclename]" + << " [-edit sceneryfilepath]" << " [-seed number|word]" << std::endl; return -1; } diff --git a/application/drivermode.cpp b/application/drivermode.cpp index 80fd3b17d..dbe3e1762 100644 --- a/application/drivermode.cpp +++ b/application/drivermode.cpp @@ -412,6 +412,14 @@ bool driver_mode::update() simulation::is_ready = simulation::is_ready || (simulation::Train != nullptr && simulation::Train->is_cab_initialized) || Global.local_start_vehicle == "ghostview"; + if (m_editorpending) + { + // edit session starts in the editor. the switch is made after the initial update on purpose, so the + // simulation state is set up the same way as when the editor is entered by hand right after the load + m_editorpending = false; + Application.push_mode(eu07_application::mode::editor); + } + return true; } @@ -458,6 +466,8 @@ void driver_mode::enter() Timer::ResetTimers(); set_picking(!Global.captureonstart); + + m_editorpending = Global.editor_session; } // maintenance method, called when the mode is deactivated diff --git a/application/drivermode.h b/application/drivermode.h index 66ff6936e..e0406043d 100644 --- a/application/drivermode.h +++ b/application/drivermode.h @@ -116,4 +116,5 @@ private: int iPause { 0 }; // wykrywanie zmian w zapauzowaniu command_relay m_relay; std::string change_train; // train name awaiting entering + bool m_editorpending { false }; // scenery was opened for editing, switch to the editor after the initial update }; diff --git a/application/editormode.cpp b/application/editormode.cpp index 745941187..2dd32555e 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -25,6 +25,7 @@ http://mozilla.org/MPL/2.0/. #include "model/Model3d.h" #include "utilities/Float3d.h" #include "scene/scene.h" +#include "scene/scenelayers.h" #include "utilities/parser.h" #include "utilities/utilities.h" @@ -891,6 +892,14 @@ bool editor_mode::update() // variable step routines update_camera(deltarealtime); + // drop the selection if its layer was hidden or locked in the meantime + if (m_node != nullptr && false == scene::Layers.editable(m_node->layer())) + { + m_node = nullptr; + m_dragging = false; + ui()->set_node(nullptr); + } + simulation::Region->update_sounds(); audio::renderer.update(Global.iPause ? 0.0 : deltarealtime); @@ -1522,10 +1531,24 @@ void editor_mode::save_scene_with_terrain() m_streamer.flush(); // save resident edited chunks to disk // export scenery; the exported .scm now carries an `editorterrain` directive (streamer is active) - simulation::State.export_as_text(Global.SceneryFile); + export_scenery(); WriteLog("Editor: saved scene + terrain", logtype::generic); } +void editor_mode::export_scenery() +{ + // hiding a layer clears the visibility flag of its nodes, and the flag is a part of exported node data. + // show the hidden layers for the duration of the export, so the files get the visibility defined in the scenery + auto const hiddenlayers = scene::Layers.hidden(); + for (auto const layer : hiddenlayers) + scene::Layers.visible(layer, true); + + simulation::State.export_as_text(Global.SceneryFile); + + for (auto const layer : hiddenlayers) + scene::Layers.visible(layer, false); +} + void editor_mode::handle_terrain_sculpt(double Deltatime) { // world point under the cursor (Mouse_Position is camera-relative, like the brush placement uses) @@ -2126,6 +2149,7 @@ void editor_mode::exit() m_fill_last.clear(); m_orthophoto.cancel_pending(); m_orthophoto.detach_scene(); // the layer is an editor aid, keep it out of the other modes + scene::Layers.show_all(); // likewise for hidden scenery layers, the other modes get the scenery as it was defined // drop selection so a stale/dangling node pointer isn't used on the next editor session m_node = nullptr; @@ -2204,7 +2228,7 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in } else if (Global.ctrlState && Global.shiftState) { - simulation::State.export_as_text(Global.SceneryFile); + export_scenery(); } break; @@ -2340,6 +2364,10 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const m_node = nullptr; + // nodes of locked layers can't be selected + if (node && false == scene::Layers.editable(node->layer())) + node = nullptr; + // ignore picks that are beyond allowed placement distance if (node) { double const dist = glm::distance(node->location(), glm::dvec3{Global.pCamera.Pos}); diff --git a/application/editormode.h b/application/editormode.h index c251186a4..550d05a26 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -162,6 +162,8 @@ class editor_mode : public application_mode void handle_chunk_edit_click(bool DeleteMode); // commits authored terrain to disk, enables streaming, and exports the scenery (Ctrl+S) void save_scene_with_terrain(); + // exports the scenery in legacy (text) format, with layers hidden in the editor left out of the picture + void export_scenery(); // raises/lowers terrain under the cursor while the left mouse button is held in sculpt mode void handle_terrain_sculpt(double Deltatime); // returns the terrain patch (if any) whose footprint covers the given world point diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index 17514efb8..99423d609 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -13,6 +13,7 @@ http://mozilla.org/MPL/2.0/. #include "utilities/Globals.h" #include "utilities/utilities.h" #include "scene/scenenode.h" +#include "scene/scenelayers.h" #include "rendering/renderer.h" editor_ui::editor_ui() @@ -99,6 +100,98 @@ void editor_ui::render_header_sections() m_itempropertiespanel.render_body(); ImGui::Unindent(); } + if (ImGui::CollapsingHeader("Layers")) + { + ImGui::Indent(); + render_layers(); + ImGui::Unindent(); + } +} + +void editor_ui::render_layers() +{ + if (scene::Layers.empty()) + { + // layers are established only when the scenery is loaded for editing, regular load skips the bookkeeping + ImGui::TextDisabled("Scenery layers are available in an edit session.\nStart the simulator with: -edit "); + return; + } + + ImGui::TextDisabled("visible, locked, layer file (click: make active)"); + + std::pair const itemlabels[] = {{"models", scene::layer_item::model}, + {"tracks", scene::layer_item::track}, + {"traction", scene::layer_item::traction}, + {"power sources", scene::layer_item::powersource}, + {"memory cells", scene::layer_item::memcell}, + {"event launchers", scene::layer_item::launcher}, + {"events", scene::layer_item::event}, + {"vehicles", scene::layer_item::vehicle}, + {"sounds", scene::layer_item::sound}, + {"terrain shapes", scene::layer_item::shape}, + {"lines", scene::layer_item::lines}}; + + for (std::size_t idx = 1; idx <= scene::Layers.size(); ++idx) + { + auto const handle{static_cast(idx)}; + auto const &layer{scene::Layers.layer(handle)}; + auto const isactive{handle == scene::Layers.active()}; + + ImGui::PushID(static_cast(idx)); + // active layer receives new nodes, so it can't be hidden nor locked + if (isactive) + { + ImGui::PushStyleVar(ImGuiStyleVar_Alpha, ImGui::GetStyle().Alpha * 0.5f); + } + auto visible{layer.visible}; + if (ImGui::Checkbox("##visible", &visible) && false == isactive) + { + scene::Layers.visible(handle, visible); + } + if (ImGui::IsItemHovered()) + { + ImGui::SetTooltip("%s", isactive ? "Active layer is always visible" : "Show or hide models, tracks and traction of the layer"); + } + ImGui::SameLine(); + auto locked{layer.locked}; + if (ImGui::Checkbox("##locked", &locked) && false == isactive) + { + scene::Layers.locked(handle, locked); + } + if (ImGui::IsItemHovered()) + { + ImGui::SetTooltip("%s", isactive ? "Active layer can't be locked" : "Nodes of locked layer can't be selected in the viewport"); + } + if (isactive) + { + ImGui::PopStyleVar(); + } + ImGui::SameLine(); + // layers are listed in the order the files were first opened, so indentation alone shows the include tree + auto const label{std::string(2 * scene::Layers.depth(handle), ' ') + Bezogonkow(layer.name) + " (" + (layer.binary ? "binary terrain" : std::to_string(layer.item_count())) + ")"}; + if (ImGui::Selectable(label.c_str(), isactive)) + { + scene::Layers.active(handle); + } + if (ImGui::IsItemHovered()) + { + std::string content{isactive ? "Active layer, nodes created in the editor are placed here" : "Click to make this the active layer"}; + if (layer.binary) + { + content += "\nThe file wasn't parsed, its content was loaded from binary terrain file"; + } + for (auto const &itemlabel : itemlabels) + { + auto const count{layer.items[static_cast(itemlabel.second)]}; + if (count > 0) + { + content += "\n" + std::string{itemlabel.first} + ": " + std::to_string(count); + } + } + ImGui::SetTooltip("%s", content.c_str()); + } + ImGui::PopID(); + } } void editor_ui::render_rotation_controls() diff --git a/application/editoruilayer.h b/application/editoruilayer.h index 8b15d35d9..68808d2e4 100644 --- a/application/editoruilayer.h +++ b/application/editoruilayer.h @@ -58,6 +58,8 @@ class editor_ui : public ui_layer // methods void render_mode_options(nodebank_panel::edit_mode const Mode); void render_header_sections(); + // list of scenery layers: visibility, selection lock and choice of the layer receiving new nodes + void render_layers(); // members itemproperties_panel m_itempropertiespanel{"Node Properties", true}; // not a window of its own, drawn in the toolset window functions_panel m_functionspanel{"Functions", true}; // not a window of its own, its settings are drawn in the toolset tabs diff --git a/application/editoruipanels.cpp b/application/editoruipanels.cpp index 6c9a2df9f..41849a8a5 100644 --- a/application/editoruipanels.cpp +++ b/application/editoruipanels.cpp @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "application/editoruipanels.h" #include "scene/scenenodegroups.h" +#include "scene/scenelayers.h" #include "utilities/Globals.h" #include "vehicle/Camera.h" @@ -78,6 +79,10 @@ void itemproperties_panel::update(scene::basic_node *Node) textline = "name: " + (node->name().empty() ? "(none)" : Bezogonkow(node->name())) + "\ntype: " + node->node_type + "\nlocation: [" + to_string(node->location().x, 2) + ", " + to_string(node->location().y, 2) + ", " + to_string(node->location().z, 2) + "]" + " (distance: " + to_string(glm::length(glm::dvec3{node->location().x, 0.0, node->location().z} - glm::dvec3{camera.Pos.x, 0.0, camera.Pos.z}), 1) + " m)" + "\nUUID: " + node->uuid.to_string(); + if (scene::Layers.valid(node->layer())) + { + textline += "\nlayer: " + Bezogonkow(scene::Layers.layer(node->layer()).name); + } text_lines.emplace_back(textline, Global.UITextColor); // subclass-specific data diff --git a/scene/scenelayers.cpp b/scene/scenelayers.cpp new file mode 100644 index 000000000..3acb01546 --- /dev/null +++ b/scene/scenelayers.cpp @@ -0,0 +1,194 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "scene/scenelayers.h" + +#include "simulation/simulation.h" +#include "model/AnimModel.h" +#include "world/Track.h" +#include "world/Traction.h" + +namespace scene +{ + +node_layers Layers; + +std::size_t basic_layer::item_count() const +{ + return std::accumulate(std::begin(items), std::end(items), std::size_t{0}); +} + +// indicates start of content of specified scenery file. returns: handle to the layer of the file +layer_handle node_layers::open(std::string const &Name) +{ + // the same file can be included more than once, all its content goes to a single layer then + auto const lookup{std::find_if(std::begin(m_layers), std::end(m_layers), [&](basic_layer const &Layer) { return Layer.name == Name; })}; + auto layerhandle{static_cast(std::distance(std::begin(m_layers), lookup) + 1)}; + if (lookup == std::end(m_layers)) + { + if (m_layers.size() < static_cast(std::numeric_limits::max())) + { + m_layers.emplace_back(); + m_layers.back().name = Name; + m_layers.back().parent = handle(); + } + else + { + // out of handles, content of the file is attributed to the parent layer + layerhandle = handle(); + } + } + // NOTE: the stack receives an entry even if the layer wasn't created, to keep it in sync with close() calls + m_stack.emplace_back(layerhandle); + + return layerhandle; +} + +// indicates end of content of the current scenery file. returns: handle to the parent layer, or null_handle if the stack is empty +layer_handle node_layers::close() +{ + if (false == m_stack.empty()) + { + m_stack.pop_back(); + } + return handle(); +} + +void node_layers::clear() +{ + m_layers.clear(); + m_stack.clear(); + m_active = null_handle; +} + +int node_layers::depth(layer_handle Layer) const +{ + auto depth{0}; + // NOTE: parent is always created before its children, which rules out cycles + while (valid(Layer) && layer(Layer).parent != null_handle && layer(Layer).parent < Layer) + { + Layer = layer(Layer).parent; + ++depth; + } + return depth; +} + +void node_layers::count(layer_handle const Layer, layer_item const Item, int const Change) +{ + if (false == valid(Layer)) + { + return; + } + auto &itemcount{layer(Layer).items[static_cast(Item)]}; + if (Change >= 0) + { + itemcount += static_cast(Change); + } + else + { + itemcount -= std::min(itemcount, static_cast(-Change)); + } +} + +void node_layers::active(layer_handle const Layer) +{ + if (false == valid(Layer)) + { + return; + } + // new items land in the active layer, they'd be out of reach right away if it was hidden or locked + visible(Layer, true); + locked(Layer, false); + m_active = Layer; +} + +// shows or hides nodes of specified layer. visibility defined in the scenery is preserved, hidden layer only overrides it +void node_layers::visible(layer_handle const Layer, bool const Visible) +{ + if (false == valid(Layer) || layer(Layer).visible == Visible) + { + return; + } + layer(Layer).visible = Visible; + + auto const update_node = [Layer, Visible](basic_node *Node) { + if (Node == nullptr || Node->layer() != Layer) + { + return; + } + if (Visible) + { + if (Node->m_layerhidden) + { + Node->visible(true); + Node->m_layerhidden = false; + } + } + else if (Node->visible()) + { + // nodes which are invisible on their own aren't marked, so they stay that way when the layer is shown again + Node->visible(false); + Node->m_layerhidden = true; + } + }; + // only these node types are drawn by the renderers basing on their visibility flag + for (auto *instance : simulation::Instances.sequence()) + { + update_node(instance); + } + for (auto *path : simulation::Paths.sequence()) + { + update_node(path); + } + for (auto *traction : simulation::Traction.sequence()) + { + update_node(traction); + } +} + +void node_layers::locked(layer_handle const Layer, bool const Locked) +{ + if (valid(Layer)) + { + layer(Layer).locked = Locked; + } +} + +// true if nodes of specified layer can be selected and modified in the editor +bool node_layers::editable(layer_handle const Layer) const +{ + // nodes without a layer (regular load, or created by the simulation) aren't restricted + return false == valid(Layer) || (layer(Layer).visible && false == layer(Layer).locked); +} + +std::vector node_layers::hidden() const +{ + std::vector layers; + for (std::size_t idx = 0; idx < m_layers.size(); ++idx) + { + if (false == m_layers[idx].visible) + { + layers.emplace_back(static_cast(idx + 1)); + } + } + return layers; +} + +void node_layers::show_all() +{ + for (auto const hiddenlayer : hidden()) + { + visible(hiddenlayer, true); + } +} + +} // namespace scene + +//--------------------------------------------------------------------------- diff --git a/scene/scenelayers.h b/scene/scenelayers.h new file mode 100644 index 000000000..71df37267 --- /dev/null +++ b/scene/scenelayers.h @@ -0,0 +1,117 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "scene/scenenode.h" + +namespace scene +{ + +// kinds of scenery items a layer keeps count of +enum class layer_item +{ + model, + track, + traction, + powersource, + memcell, + launcher, + event, + vehicle, + sound, + shape, + lines, + count_ +}; + +// scenery layer: content of a single scenery file (.scn, .scm, .ctr...) other than an .inc node template +struct basic_layer +{ + std::string name; // file name, relative to the scenery directory + layer_handle parent{null_handle}; // layer of the file this one was included from + bool visible{true}; + bool locked{false}; // items of locked layer can't be selected in the editor + bool binary{false}; // the file wasn't parsed, its content came from binary terrain file + std::array(layer_item::count_)> items{}; // amount of items of each kind + + std::size_t item_count() const; +}; + +// holds scenery layers, established during load of scenery opened for editing (-edit) +// NOTE: regular load doesn't create any layers, all nodes are left with null_handle +class node_layers +{ + public: + // methods + // indicates start of content of specified scenery file. returns: handle to the layer of the file + layer_handle open(std::string const &Name); + // indicates end of content of the current scenery file. returns: handle to the parent layer, or null_handle if the stack is empty + layer_handle close(); + // returns layer of the scenery file being loaded, or null_handle if there's none + layer_handle handle() const + { + return m_stack.empty() ? null_handle : m_stack.back(); + } + // removes all layers; layer handles stored in the nodes aren't touched + void clear(); + bool empty() const + { + return m_layers.empty(); + } + std::size_t size() const + { + return m_layers.size(); + } + bool valid(layer_handle const Layer) const + { + return Layer != null_handle && Layer <= m_layers.size(); + } + // grants direct access to specified layer. NOTE: handle has to be valid + basic_layer &layer(layer_handle const Layer) + { + return m_layers[Layer - 1]; + } + basic_layer const &layer(layer_handle const Layer) const + { + return m_layers[Layer - 1]; + } + // number of layers between specified layer and the scenario file + int depth(layer_handle Layer) const; + // adjusts item count of specified layer + void count(layer_handle const Layer, layer_item const Item, int const Change = 1); + // layer receiving the items created in the editor, or null_handle if there's none + layer_handle active() const + { + return m_active; + } + // NOTE: active layer is made visible and unlocked + void active(layer_handle const Layer); + // shows or hides nodes of specified layer. visibility defined in the scenery is preserved, hidden layer only overrides it + void visible(layer_handle const Layer, bool const Visible); + void locked(layer_handle const Layer, bool const Locked); + // true if nodes of specified layer can be selected and modified in the editor + bool editable(layer_handle const Layer) const; + // handles of layers which are currently hidden + std::vector hidden() const; + // restores visibility of all layers + void show_all(); + + private: + // members + std::vector m_layers; // layer handle is index in the vector + 1 + std::vector m_stack; // helper, layers of scenery files being loaded + layer_handle m_active{null_handle}; +}; + +extern node_layers Layers; + +} // namespace scene + +//--------------------------------------------------------------------------- diff --git a/scene/scenenode.cpp b/scene/scenenode.cpp index 1ba822e1c..41b035bd1 100644 --- a/scene/scenenode.cpp +++ b/scene/scenenode.cpp @@ -717,7 +717,8 @@ memory_node::deserialize( cParser &Input, node_data const &Nodedata ) { basic_node::basic_node( scene::node_data const &Nodedata ) : - m_name( Nodedata.name ) + m_name( Nodedata.name ), + m_layer( Nodedata.layer ) { uuid = UID::random(); node_type = Nodedata.type; diff --git a/scene/scenenode.h b/scene/scenenode.h index ca727c2cb..533ed41ad 100644 --- a/scene/scenenode.h +++ b/scene/scenenode.h @@ -70,6 +70,7 @@ struct node_data { double range_max { std::numeric_limits::max() }; std::string name; std::string type; + layer_handle layer { null_handle }; // scenery layer the node is defined in, if any }; // holds unique piece of geometry, covered with single material @@ -359,6 +360,10 @@ public: group( scene::group_handle Group ); scene::group_handle group() const; + void + layer( scene::layer_handle Layer ); + scene::layer_handle + layer() const; void mark_dirty() { m_dirty = true; } bool @@ -375,6 +380,8 @@ public: bool m_visible { true }; // visibility flag std::string m_name; bool m_dirty { false }; + bool m_layerhidden { false }; // the node was visible until its scenery layer was hidden + scene::layer_handle m_layer { null_handle }; // scenery layer this node belongs to, if any UID uuid; private: @@ -443,6 +450,18 @@ basic_node::group() const { return m_group; } +inline +void +basic_node::layer( scene::layer_handle Layer ) { + m_layer = Layer; +} + +inline +scene::layer_handle +basic_node::layer() const { + return m_layer; +} + } // scene //--------------------------------------------------------------------------- diff --git a/simulation/simulation.cpp b/simulation/simulation.cpp index a1493f630..e10b08432 100644 --- a/simulation/simulation.cpp +++ b/simulation/simulation.cpp @@ -24,6 +24,7 @@ http://mozilla.org/MPL/2.0/. #include "rendering/lightarray.h" #include "rendering/particles.h" #include "scene/scene.h" +#include "scene/scenelayers.h" #include "vehicle/Train.h" #include "application/application.h" #include "utilities/Logs.h" @@ -493,6 +494,7 @@ TEventLauncher * state_manager::create_eventlauncher(const std::string &src, con } void state_manager::delete_model(TAnimModel *model) { + scene::Layers.count(model->layer(), scene::layer_item::model, -1); Region->erase(model); Instances.purge(model); } diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index 99a733d36..f7429b1df 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -16,6 +16,7 @@ http://mozilla.org/MPL/2.0/. #include "simulation/simulationsounds.h" #include "simulation/simulationenvironment.h" #include "scene/scenenodegroups.h" +#include "scene/scenelayers.h" #include "rendering/particles.h" #include "world/Event.h" #include "world/MemCell.h" @@ -73,6 +74,14 @@ state_serializer::deserialize_begin( std::string const &Scenariofile ) { } scene::Groups.create(); + scene::Layers.clear(); + if( true == Global.editor_session ) { + // scenery opened for editing: keep track of which scenery file defines each node. + // the scenario file itself is the root layer, and the default target for nodes created in the editor + state->input.sceneryLayers = true; + scene::Layers.active( scene::Layers.open( Scenariofile ) ); + } + if( false == state->input.ok() ) throw invalid_scenery_exception(); @@ -155,6 +164,7 @@ state_serializer::deserialize_continue(std::shared_ptr state } scene::Groups.close(); + scene::Layers.close(); scene::Groups.update_map(); Region->create_map_geometry(); @@ -345,6 +355,7 @@ state_serializer::deserialize_event( cParser &Input, scene::scratch_data &Scratc if( true == simulation::Events.insert( event ) ) { scene::Groups.insert( scene::Groups.handle(), event ); + scene::Layers.count( scene::Layers.handle(), scene::layer_item::event ); } else { delete event; @@ -436,6 +447,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch >> nodedata.name >> nodedata.type; if( nodedata.name == "none" ) { nodedata.name.clear(); } + nodedata.layer = scene::Layers.handle(); // type-based deserialization. not elegant but it'll do if( nodedata.type == "dynamic" ) { @@ -643,6 +655,34 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch simulation::Region->insert( sound ); } + if( nodedata.layer != null_handle ) { + // scenery opened for editing: keep count of what the scenery file contains + // NOTE: node types which failed to load bail out earlier and aren't counted + static std::unordered_map const itemtypes { + { "dynamic", scene::layer_item::vehicle }, + { "track", scene::layer_item::track }, + { "traction", scene::layer_item::traction }, + { "tractionpowersource", scene::layer_item::powersource }, + { "model", scene::layer_item::model }, + { "triangles", scene::layer_item::shape }, + { "triangle_strip", scene::layer_item::shape }, + { "triangle_fan", scene::layer_item::shape }, + { "lines", scene::layer_item::lines }, + { "line_strip", scene::layer_item::lines }, + { "line_loop", scene::layer_item::lines }, + { "memcell", scene::layer_item::memcell }, + { "eventlauncher", scene::layer_item::launcher }, + { "sound", scene::layer_item::sound } }; + auto const lookup { itemtypes.find( nodedata.type ) }; + if( lookup != itemtypes.end() ) { + scene::Layers.count( + nodedata.layer, + // models with negative minimum range are 3d terrain, converted to shapes + ( lookup->second == scene::layer_item::model && nodedata.range_min < 0.0 ) ? + scene::layer_item::shape : + lookup->second ); + } + } } void @@ -1328,6 +1368,7 @@ TAnimModel *state_serializer::create_model(const std::string &src, const std::st parser.getTokens(2); // name, type nodedata.name = name; nodedata.type = "model"; + nodedata.layer = scene::Layers.active(); // null_handle unless the scenery was opened for editing scene::scratch_data scratch; @@ -1340,6 +1381,7 @@ TAnimModel *state_serializer::create_model(const std::string &src, const std::st cloned->location(position); simulation::Instances.insert(cloned); simulation::Region->insert(cloned); + scene::Layers.count(cloned->layer(), scene::layer_item::model); return cloned; } diff --git a/utilities/Classes.h b/utilities/Classes.h index f79cb8513..568e3ae9f 100644 --- a/utilities/Classes.h +++ b/utilities/Classes.h @@ -56,6 +56,7 @@ namespace scene { struct node_data; class basic_node; using group_handle = std::size_t; +using layer_handle = std::uint16_t; } namespace Mtable diff --git a/utilities/Globals.h b/utilities/Globals.h index d0f707017..800737f61 100644 --- a/utilities/Globals.h +++ b/utilities/Globals.h @@ -84,6 +84,7 @@ struct global_settings { std::string szDefaultExt{ szTexturesDDS }; std::string SceneryFile; std::string local_start_vehicle{ "EU07-424" }; + bool editor_session{ false }; // scenery was opened for editing (-edit): loader keeps track of scenery layers and hands over to the editor int iConvertModels{ 0 }; // tworzenie plików binarnych int iConvertIndexRange{ 1000 }; // range of duplicate vertex scan bool file_binary_terrain{ true }; // enable binary terrain (de)serialization diff --git a/utilities/parser.cpp b/utilities/parser.cpp index 7209df015..4219765c6 100644 --- a/utilities/parser.cpp +++ b/utilities/parser.cpp @@ -12,6 +12,7 @@ http://mozilla.org/MPL/2.0/. #include "utilities/Logs.h" #include "scene/scenenodegroups.h" +#include "scene/scenelayers.h" /* MaSzyna EU07 locomotive simulator parser @@ -118,6 +119,11 @@ cParser::~cParser() // wrap up the node group holding content of processed file scene::Groups.close(); } + if (true == mLayerFile) + { + // content of the processed file ended, following nodes belong to the parent layer again + scene::Layers.close(); + } } template <> glm::vec3 cParser::getToken(bool const ToLower, char const *Break) @@ -336,6 +342,12 @@ void cParser::startIncludeFromParser(cParser& srcParser, bool ToLower, std::stri if (isTerrain && true == Global.file_binary_terrain_state) { WriteLog("SBT found, ignoring: " + includefile); readParameters(srcParser); // preserve original side-effect: still consume parameters + if (sceneryLayers) + { + // the file is still a part of the scenery, even though its content comes from the binary terrain file + scene::Layers.layer(scene::Layers.open(includefile)).binary = true; + scene::Layers.close(); + } return; } @@ -355,6 +367,18 @@ void cParser::startIncludeFromParser(cParser& srcParser, bool ToLower, std::stri if (mIncludeParser->mSize <= 0) { ErrorLog("Bad include: can't open file \"" + includefile + "\""); } + + if (sceneryLayers) + { + mIncludeParser->sceneryLayers = true; + // content of an included scenery file forms a layer of its own. *.inc files are node templates + // reused all over the scenery, so their content stays in the layer of the file which includes them + if (false == mIncludeParser->mIncFile && mIncludeParser->mSize > 0) + { + scene::Layers.open(includefile); + mIncludeParser->mLayerFile = true; + } + } } bool cParser::handleIncludeIfPresent(std::string& token, bool ToLower, const char* Break) { @@ -524,6 +548,7 @@ void cParser::injectString(const std::string &str) { mIncludeParser = std::make_shared(str, buffer_TEXT, "", LoadTraction, std::vector(), allowRandomIncludes); mIncludeParser->autoclear(m_autoclear); + mIncludeParser->sceneryLayers = sceneryLayers; } } diff --git a/utilities/parser.h b/utilities/parser.h index 0cf51d8cc..1a8065820 100644 --- a/utilities/parser.h +++ b/utilities/parser.h @@ -97,6 +97,7 @@ class cParser //: public std::stringstream bool expandIncludes = true; bool allowRandomIncludes = false; bool skipComments = true; + bool sceneryLayers = false; // included scenery files are registered as scenery layers (scenery opened for editing) private: void startIncludeFromParser(cParser &srcParser, bool ToLower, std::string includefile); @@ -118,6 +119,7 @@ class cParser //: public std::stringstream std::streamoff mSize { 0 }; // size of open stream, for progress report. std::size_t mLine { 0 }; // currently processed line bool mIncFile { false }; // the parser is processing an *.inc file + bool mLayerFile { false }; // the parser is processing a file registered as scenery layer bool mFirstToken { true }; // processing first token in the current file; helper used when checking for utf bom typedef std::map commentmap; commentmap mComments { From 3199f3796ed53569b0208c9503b59db8c2ab9b5b Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Fri, 2 Oct 2026 22:40:52 +0200 Subject: [PATCH 037/430] feat(editor): layers window, scenery save and include descriptions --- CMakeLists.txt | 9 + application/editormode.cpp | 67 +- application/editormode.h | 7 +- application/editoruilayer.cpp | 132 ++- application/editoruilayer.h | 11 +- application/editoruipanels.cpp | 579 +++++++++++++- application/editoruipanels.h | 51 ++ editor/editorIncludeInfo.cpp | 509 ++++++++++++ editor/editorIncludeInfo.hpp | 59 ++ scene/scenelayers.cpp | 510 +++++++++++- scene/scenelayers.h | 159 +++- scene/scenelayerssave.cpp | 972 +++++++++++++++++++++++ scene/scenenode.cpp | 1 + scene/scenenode.h | 2 + simulation/simulation.cpp | 1 + simulation/simulationstateserializer.cpp | 28 +- utilities/parser.cpp | 56 +- utilities/parser.h | 15 + 18 files changed, 3045 insertions(+), 123 deletions(-) create mode 100644 editor/editorIncludeInfo.cpp create mode 100644 editor/editorIncludeInfo.hpp create mode 100644 scene/scenelayerssave.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 139902611..0f13c2b8c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -168,6 +168,7 @@ set(SOURCES "input/editorkeyboardinput.cpp" "editor/editorSettings.cpp" "editor/editorModelSets.cpp" +"editor/editorIncludeInfo.cpp" "editor/editorTerrain.cpp" "editor/editorTerrainStreamer.cpp" "editor/editorOrthophoto.cpp" @@ -179,6 +180,7 @@ set(SOURCES "application/scenarioloaderuilayer.cpp" "scene/scenenodegroups.cpp" "scene/scenelayers.cpp" +"scene/scenelayerssave.cpp" "simulation/simulationenvironment.cpp" "simulation/simulationstateserializer.cpp" "rendering/precipitation.cpp" @@ -608,6 +610,13 @@ if (WITH_BETTER_RENDERER) target_link_libraries(${PROJECT_NAME} "betterRenderer") endif () +# yaml-cpp, for the descriptions of scenery templates edited in the scenery editor. +# the experimental renderer brings in the same copy on its own, when enabled +if (NOT TARGET yaml-cpp) + add_subdirectory("betterRenderer/thirdparty/yaml-cpp" "${CMAKE_CURRENT_BINARY_DIR}/yaml-cpp" EXCLUDE_FROM_ALL) +endif () +target_link_libraries(${PROJECT_NAME} yaml-cpp) + # Enable compiling with debug symbols if(GENERATE_PDB) diff --git a/application/editormode.cpp b/application/editormode.cpp index 2dd32555e..9cc938dda 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -337,6 +337,7 @@ editor_mode::editor_mode() { // the area fill settings live in the node bank window, in the tab of the fill mode ui()->set_fill_options([this]() { render_area_fill(); }); ui()->set_gizmo_options([this]() { render_gizmo_options(); }); + ui()->set_file_actions([this]() { save(); }, [this]() { export_scenery(); }); // the orthophoto is fitted onto the same ground as the area fill uses, terrain tile models included m_orthophoto.ground_source([](glm::dvec2 const &Min, glm::dvec2 const &Max, std::vector &Out) { gather_ground_triangles(Min, Max, true, 50.0f, Out); @@ -606,6 +607,7 @@ void editor_mode::push_snapshot(scene::basic_node *node, EditorSnapshot::Action snap.node_name = node->name(); snap.position = node->location(); snap.uuid = node->uuid; + snap.layer = node->layer(); if (auto *model = dynamic_cast(node)) { @@ -679,11 +681,13 @@ void editor_mode::undo_last() redoSnap.serialized = snap.serialized; redoSnap.position = snap.position; redoSnap.node_ptr = nullptr; + redoSnap.layer = snap.layer; g_redo.push_back(std::move(redoSnap)); TAnimModel *created = simulation::State.create_model(snap.serialized, snap.node_name, snap.position); if (created) { + scene::Layers.move(created, snap.layer); // back to the layer it was deleted from, rather than the active one created->location(snap.position); created->Angles(snap.rotation); m_node = created; @@ -702,6 +706,7 @@ void editor_mode::undo_last() current.action = snap.action; current.node_name = snap.node_name; current.node_ptr = target; + current.layer = target->layer(); current.position = target->location(); if (auto *model = dynamic_cast(target)) { @@ -758,6 +763,7 @@ void editor_mode::redo_last() hist.serialized = snap.serialized; hist.position = snap.position; hist.uuid = snap.uuid; + hist.layer = snap.layer; m_history.push_back(std::move(hist)); scene::basic_node *target = simulation::Instances.find(snap.node_name); @@ -799,6 +805,7 @@ void editor_mode::redo_last() TAnimModel *created = simulation::State.create_model(snap.serialized, snap.node_name, snap.position); if (created) { + scene::Layers.move(created, snap.layer); created->location(snap.position); created->Angles(snap.rotation); created->Scale(snap.scale); @@ -893,7 +900,7 @@ bool editor_mode::update() update_camera(deltarealtime); // drop the selection if its layer was hidden or locked in the meantime - if (m_node != nullptr && false == scene::Layers.editable(m_node->layer())) + if (m_node != nullptr && false == scene::Layers.editable(m_node)) { m_node = nullptr; m_dragging = false; @@ -1497,6 +1504,15 @@ void editor_mode::create_chunked_terrain() } void editor_mode::save_scene_with_terrain() +{ + commit_terrain(); + + // export scenery; the exported .scm now carries an `editorterrain` directive (streamer is active) + export_scenery(); + WriteLog("Editor: saved scene + terrain", logtype::generic); +} + +void editor_mode::commit_terrain() { // commit authored terrain so the scenery streams it on load. if not already streaming, hand the // manual grid chunks over to the streamer (same as toggling Stream terrain on) @@ -1529,10 +1545,37 @@ void editor_mode::save_scene_with_terrain() } m_streamer.flush(); // save resident edited chunks to disk +} - // export scenery; the exported .scm now carries an `editorterrain` directive (streamer is active) - export_scenery(); - WriteLog("Editor: saved scene + terrain", logtype::generic); +void editor_mode::save() +{ + if (scene::Layers.empty()) + { + // without the sources tracked during the load there's no telling where the changes belong + ui()->set_status("The scenery wasn't opened for editing. Start the simulator with: -edit ", true); + return; + } + + // terrain made in the editor is kept in files of its own, the scenery only needs the directive which loads it + std::vector rootstatements; + if (m_streamer.active() || false == m_grid_chunks.empty()) + { + commit_terrain(); + if (false == scene::Layers.terrain_directive()) + { + rootstatements.emplace_back( + "editorterrain " + m_streamer.directory() + ' ' + std::to_string(m_streamer.cells()) + ' ' + to_string(m_streamer.cellsize(), 3) + ' ' + + std::to_string(m_streamer.radius()) + " endeditorterrain"); + } + } + + auto const result = scene::Layers.save(rootstatements); + if (result.success && false == rootstatements.empty()) + { + scene::Layers.terrain_directive(true); + } + ui()->set_status(result.message, false == result.success); + WriteLog("Editor: " + result.message, logtype::generic); } void editor_mode::export_scenery() @@ -2196,6 +2239,14 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in return; } + // save; checked ahead of the camera keys, which have S bound to moving back + if (Global.ctrlState && false == Global.shiftState && Key == GLFW_KEY_S) + { + if (is_press(Action)) + save(); + return; + } + // then internal input handling if (m_input.keyboard.key(Key, Action)) return; @@ -2364,9 +2415,13 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const m_node = nullptr; - // nodes of locked layers can't be selected - if (node && false == scene::Layers.editable(node->layer())) + // in a scenery opened for editing some nodes are off limits: the ones in locked layers, + // and the ones whose definitions can't be rewritten on save + if (std::string reason; node && false == scene::Layers.editable(node, &reason)) + { + ui()->set_status("\"" + (node->name().empty() ? std::string{"(unnamed node)"} : node->name()) + "\" can't be edited: " + reason, true); node = nullptr; + } // ignore picks that are beyond allowed placement distance if (node) { diff --git a/application/editormode.h b/application/editormode.h index 550d05a26..b39e34083 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -96,6 +96,7 @@ class editor_mode : public application_mode glm::vec3 rotation{0.0f, 0.0f, 0.0f}; glm::vec3 scale{1.0f, 1.0f, 1.0f}; UID uuid; // node UUID for reference, used as fallback lookup for deleted/recreated nodes + scene::layer_handle layer{null_handle}; // scenery layer of the node, so a recreated node returns to it }; void push_snapshot(scene::basic_node *node, EditorSnapshot::Action Action = EditorSnapshot::Action::Move, std::string const &Serialized = std::string()); @@ -160,8 +161,12 @@ class editor_mode : public application_mode void remove_grid_chunk(int Cx, int Cz); // handles a click in chunk-edit mode (add a neighbour, or Shift = delete the clicked chunk) void handle_chunk_edit_click(bool DeleteMode); - // commits authored terrain to disk, enables streaming, and exports the scenery (Ctrl+S) + // commits authored terrain to disk, enables streaming, and exports the scenery void save_scene_with_terrain(); + // commits authored terrain to disk and enables streaming + void commit_terrain(); + // writes the changes to the files of scenery opened for editing (Ctrl+S) + void save(); // exports the scenery in legacy (text) format, with layers hidden in the editor left out of the picture void export_scenery(); // raises/lowers terrain under the cursor while the left mouse button is held in sculpt mode diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index 99423d609..3ca3e1f11 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -15,6 +15,7 @@ http://mozilla.org/MPL/2.0/. #include "scene/scenenode.h" #include "scene/scenelayers.h" #include "rendering/renderer.h" +#include "utilities/translation.h" editor_ui::editor_ui() { @@ -23,6 +24,8 @@ editor_ui::editor_ui() // bind the panels with ui object. maybe not the best place for this but, eh add_external_panel(&m_nodebankpanel); + add_external_panel(&m_layerspanel); + add_external_panel(&m_includespanel); m_nodebankpanel.mode_options = [this](nodebank_panel::edit_mode const Mode) { render_mode_options(Mode); }; m_nodebankpanel.header_sections = [this]() { render_header_sections(); }; @@ -100,98 +103,55 @@ void editor_ui::render_header_sections() m_itempropertiespanel.render_body(); ImGui::Unindent(); } - if (ImGui::CollapsingHeader("Layers")) +} + +void editor_ui::render_menu_contents() +{ + if (ImGui::BeginMenu(STR_C("File"))) { - ImGui::Indent(); - render_layers(); - ImGui::Unindent(); + // changes go to the scenery files only if the scenery was loaded with its sources tracked + auto const editsession{false == scene::Layers.empty()}; + if (ImGui::MenuItem(STR_C("Save"), "Ctrl+S", false, editsession) && m_save) + { + m_save(); + } + if (false == editsession && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled)) + { + ImGui::SetTooltip("%s", STR_C("Start the simulator with -edit to save changes to the scenery files")); + } + if (ImGui::MenuItem(STR_C("Export scenery dump"), "Ctrl+Shift+F11") && m_export) + { + m_export(); + } + if (ImGui::IsItemHovered()) + { + ImGui::SetTooltip("%s", STR_C("Writes the whole scene to _export files next to the scenario, the scenery files are left as they are")); + } + ImGui::EndMenu(); + } + + ui_layer::render_menu_contents(); + + if (ImGui::BeginMenu(STR_C("Mode windows"))) + { + ImGui::MenuItem(STR_C("Toolset"), nullptr, &m_nodebankpanel.is_open); + ImGui::MenuItem(STR_C("Layers"), nullptr, &m_layerspanel.is_open); + ImGui::MenuItem(STR_C("Include descriptions"), nullptr, &m_includespanel.is_open); + ImGui::EndMenu(); } } -void editor_ui::render_layers() +void editor_ui::set_file_actions(std::function Save, std::function Export) { - if (scene::Layers.empty()) - { - // layers are established only when the scenery is loaded for editing, regular load skips the bookkeeping - ImGui::TextDisabled("Scenery layers are available in an edit session.\nStart the simulator with: -edit "); - return; - } + m_save = Save; + m_export = std::move(Export); + m_layerspanel.save = std::move(Save); +} - ImGui::TextDisabled("visible, locked, layer file (click: make active)"); - - std::pair const itemlabels[] = {{"models", scene::layer_item::model}, - {"tracks", scene::layer_item::track}, - {"traction", scene::layer_item::traction}, - {"power sources", scene::layer_item::powersource}, - {"memory cells", scene::layer_item::memcell}, - {"event launchers", scene::layer_item::launcher}, - {"events", scene::layer_item::event}, - {"vehicles", scene::layer_item::vehicle}, - {"sounds", scene::layer_item::sound}, - {"terrain shapes", scene::layer_item::shape}, - {"lines", scene::layer_item::lines}}; - - for (std::size_t idx = 1; idx <= scene::Layers.size(); ++idx) - { - auto const handle{static_cast(idx)}; - auto const &layer{scene::Layers.layer(handle)}; - auto const isactive{handle == scene::Layers.active()}; - - ImGui::PushID(static_cast(idx)); - // active layer receives new nodes, so it can't be hidden nor locked - if (isactive) - { - ImGui::PushStyleVar(ImGuiStyleVar_Alpha, ImGui::GetStyle().Alpha * 0.5f); - } - auto visible{layer.visible}; - if (ImGui::Checkbox("##visible", &visible) && false == isactive) - { - scene::Layers.visible(handle, visible); - } - if (ImGui::IsItemHovered()) - { - ImGui::SetTooltip("%s", isactive ? "Active layer is always visible" : "Show or hide models, tracks and traction of the layer"); - } - ImGui::SameLine(); - auto locked{layer.locked}; - if (ImGui::Checkbox("##locked", &locked) && false == isactive) - { - scene::Layers.locked(handle, locked); - } - if (ImGui::IsItemHovered()) - { - ImGui::SetTooltip("%s", isactive ? "Active layer can't be locked" : "Nodes of locked layer can't be selected in the viewport"); - } - if (isactive) - { - ImGui::PopStyleVar(); - } - ImGui::SameLine(); - // layers are listed in the order the files were first opened, so indentation alone shows the include tree - auto const label{std::string(2 * scene::Layers.depth(handle), ' ') + Bezogonkow(layer.name) + " (" + (layer.binary ? "binary terrain" : std::to_string(layer.item_count())) + ")"}; - if (ImGui::Selectable(label.c_str(), isactive)) - { - scene::Layers.active(handle); - } - if (ImGui::IsItemHovered()) - { - std::string content{isactive ? "Active layer, nodes created in the editor are placed here" : "Click to make this the active layer"}; - if (layer.binary) - { - content += "\nThe file wasn't parsed, its content was loaded from binary terrain file"; - } - for (auto const &itemlabel : itemlabels) - { - auto const count{layer.items[static_cast(itemlabel.second)]}; - if (count > 0) - { - content += "\n" + std::string{itemlabel.first} + ": " + std::to_string(count); - } - } - ImGui::SetTooltip("%s", content.c_str()); - } - ImGui::PopID(); - } +void editor_ui::set_status(std::string const &Status, bool const Error) +{ + m_layerspanel.status = Status; + m_layerspanel.status_error = Error; } void editor_ui::render_rotation_controls() diff --git a/application/editoruilayer.h b/application/editoruilayer.h index 68808d2e4..fb5444afe 100644 --- a/application/editoruilayer.h +++ b/application/editoruilayer.h @@ -53,17 +53,24 @@ class editor_ui : public ui_layer { m_gizmooptions = std::move(Renderer); } + // actions of the file menu, performed by the editor mode + void set_file_actions(std::function Save, std::function Export); + // shows outcome of an operation in the layers window + void set_status(std::string const &Status, bool const Error = false); private: // methods void render_mode_options(nodebank_panel::edit_mode const Mode); void render_header_sections(); - // list of scenery layers: visibility, selection lock and choice of the layer receiving new nodes - void render_layers(); + void render_menu_contents() override; // members itemproperties_panel m_itempropertiespanel{"Node Properties", true}; // not a window of its own, drawn in the toolset window functions_panel m_functionspanel{"Functions", true}; // not a window of its own, its settings are drawn in the toolset tabs nodebank_panel m_nodebankpanel{"Toolset", true}; // main editor window: gizmo, node properties, edit modes and the node bank + layers_panel m_layerspanel{"Layers", true}; + includes_panel m_includespanel{"Include descriptions", false}; + std::function m_save; + std::function m_export; brush_object_list m_brushobjects; bool m_insertrandom{false}; // insert mode picks a random template from m_insertset model_set_ref m_insertset; diff --git a/application/editoruipanels.cpp b/application/editoruipanels.cpp index 41849a8a5..2f22f8f0a 100644 --- a/application/editoruipanels.cpp +++ b/application/editoruipanels.cpp @@ -1076,4 +1076,581 @@ void functions_panel::render_controls() // ImGui::Checkbox("Get rotation from last object", &rot_from_last); ImGui::SliderFloat("Rotation value", &rot_value, 0.0f, 360.0f, "%.1f deg"); } -} \ No newline at end of file +} + +namespace +{ + +std::pair const layer_itemlabels[] = {{"models", scene::layer_item::model}, + {"tracks", scene::layer_item::track}, + {"traction", scene::layer_item::traction}, + {"power sources", scene::layer_item::powersource}, + {"memory cells", scene::layer_item::memcell}, + {"event launchers", scene::layer_item::launcher}, + {"events", scene::layer_item::event}, + {"vehicles", scene::layer_item::vehicle}, + {"sounds", scene::layer_item::sound}, + {"terrain shapes", scene::layer_item::shape}, + {"lines", scene::layer_item::lines}}; + +// what the layer holds, a line per kind of item +std::string layer_content(scene::basic_layer const &Layer) +{ + std::string content; + for (auto const &itemlabel : layer_itemlabels) + { + auto const count{Layer.items[static_cast(itemlabel.second)]}; + if (count > 0) + { + content += (content.empty() ? "" : "\n") + std::string{itemlabel.first} + ": " + std::to_string(count); + } + } + return content; +} + +std::string layer_name(scene::layer_handle const Layer) +{ + return scene::Layers.valid(Layer) ? Bezogonkow(scene::Layers.layer(Layer).name) : "(none)"; +} + +// button which can be greyed out, with an explanation shown when it's hovered +bool action_button(char const *Label, bool const Enabled, std::string const &Reason = std::string()) +{ + if (false == Enabled) + { + ImGui::PushStyleVar(ImGuiStyleVar_Alpha, ImGui::GetStyle().Alpha * 0.5f); + } + auto const clicked{ImGui::Button(Label) && Enabled}; + if (false == Enabled) + { + ImGui::PopStyleVar(); + if (false == Reason.empty() && ImGui::IsItemHovered()) + { + ImGui::SetTooltip("%s", Reason.c_str()); + } + } + return clicked; +} + +// text field bound to a string +bool input_text(char const *Label, std::string &Value) +{ + std::array buffer{}; + Value.copy(buffer.data(), buffer.size() - 1); + if (false == ImGui::InputText(Label, buffer.data(), buffer.size())) + { + return false; + } + Value = buffer.data(); + return true; +} + +ImVec4 const status_errorcolor{1.0f, 0.45f, 0.4f, 1.0f}; + +} // namespace + +void layers_panel::report(std::string const &Status, bool const Error) +{ + status = Status; + status_error = Error; +} + +void layers_panel::render() +{ + if (false == is_open) + { + return; + } + + // initially next to the toolset window + ImGui::SetNextWindowPos(ImVec2S(520, 60), ImGuiCond_FirstUseEver); + ImGui::SetNextWindowSize(ImVec2S(440, 340), ImGuiCond_FirstUseEver); + auto const panelname{(title.empty() ? m_name : title) + "###" + m_name}; + if (ImGui::Begin(panelname.c_str(), &is_open, ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoCollapse)) + { + if (scene::Layers.empty()) + { + // layers are established only when the scenery is loaded for editing, regular load skips the bookkeeping + ImGui::TextDisabled("Scenery layers are available in an edit session.\nStart the simulator with: -edit "); + } + else + { + if (false == scene::Layers.listed(m_selected)) + { + m_selected = null_handle; + } + auto const selected{m_selected != null_handle}; + auto const removed{selected && scene::Layers.layer(m_selected).removed}; + std::string reason{"Select a layer first"}; + + if (ImGui::Button("New...")) + { + m_newname[0] = '\0'; + m_newparent = (selected && false == removed && false == scene::Layers.layer(m_selected).binary ? m_selected : scene::layer_handle{1}); + m_popuperror.clear(); + ImGui::OpenPopup("New layer"); + } + ImGui::SameLine(); + if (removed) + { + if (ImGui::Button("Restore")) + { + scene::Layers.restore(m_selected); + report("Layer \"" + layer_name(m_selected) + "\" restored"); + } + } + else if (action_button("Remove...", selected && scene::Layers.can_remove(m_selected, reason), reason)) + { + ImGui::OpenPopup("Remove layer"); + } + ImGui::SameLine(); + // the scenario file is what holds the scenery together, it stays where it is + auto const mergeable{selected && false == removed && (scene::Layers.layer(m_selected).created || false == scene::Layers.layer(m_selected).sites.empty())}; + if (action_button("Merge into...", mergeable, selected && false == removed ? "The scenario file can't be merged into another layer" : "Select a layer first")) + { + // the layer which includes the selected one is the most likely target + m_mergetarget = scene::Layers.resolve(scene::Layers.layer(m_selected).parent); + if (false == scene::Layers.can_merge(m_selected, m_mergetarget, reason)) + { + m_mergetarget = null_handle; + } + ImGui::OpenPopup("Merge layer"); + } + ImGui::SameLine(); + if (ImGui::Button("Save") && save) + { + save(); + } + if (ImGui::IsItemHovered()) + { + ImGui::SetTooltip("Writes changed nodes and layers to the scenery files (Ctrl+S)"); + } + ImGui::Separator(); + + render_list(); + + if (false == status.empty()) + { + ImGui::PushTextWrapPos(0.0f); + if (status_error) + { + ImGui::TextColored(status_errorcolor, "%s", status.c_str()); + } + else + { + ImGui::TextUnformatted(status.c_str()); + } + ImGui::PopTextWrapPos(); + } + + render_popups(); + } + } + ImGui::End(); +} + +void layers_panel::render_list() +{ + // the list takes the window except for the room left for the status + ImGui::BeginChild("##layers", ImVec2(0.0f, -ImGui::GetTextLineHeightWithSpacing() * 2.5f)); + ImGui::TextDisabled("visible, locked, active, layer file"); + + for (auto const handle : scene::Layers.tree()) + { + // NOTE: copies of the flags, as the calls below can change the layer + auto const &layer{scene::Layers.layer(handle)}; + auto const isactive{handle == scene::Layers.active()}; + auto const isremoved{layer.removed}; + std::string readonly; + auto const iswritable{scene::Layers.writable(handle, &readonly)}; + + ImGui::PushID(static_cast(handle)); + if (isremoved) + { + ImGui::PushStyleVar(ImGuiStyleVar_Alpha, ImGui::GetStyle().Alpha * 0.5f); + } + // active layer receives new nodes, so it can't be hidden nor locked. removed layer is out of the picture altogether + auto const fixed{isactive || isremoved}; + auto visible{layer.visible}; + if (ImGui::Checkbox("##visible", &visible) && false == fixed) + { + scene::Layers.visible(handle, visible); + } + if (ImGui::IsItemHovered()) + { + ImGui::SetTooltip("%s", isactive ? "Active layer is always visible" : "Show or hide models, tracks and traction of the layer"); + } + ImGui::SameLine(); + auto locked{layer.locked}; + if (ImGui::Checkbox("##locked", &locked) && false == fixed) + { + scene::Layers.locked(handle, locked); + } + if (ImGui::IsItemHovered()) + { + ImGui::SetTooltip("%s", isactive ? "Active layer can't be locked" : "Nodes of locked layer can't be selected in the viewport"); + } + ImGui::SameLine(); + if (ImGui::RadioButton("##active", isactive) && false == isactive) + { + if (isremoved || false == iswritable) + { + report("Layer \"" + layer_name(handle) + "\" can't take new nodes" + (isremoved ? "" : ": " + readonly), true); + } + else + { + scene::Layers.active(handle); + } + } + if (ImGui::IsItemHovered()) + { + ImGui::SetTooltip("Active layer: nodes created in the editor are placed in it"); + } + ImGui::SameLine(); + auto label{std::string(2 * scene::Layers.depth(handle), ' ') + layer_name(handle) + " (" + (layer.binary ? "binary terrain" : std::to_string(layer.item_count())) + ")"}; + if (layer.created) + { + label += " [new]"; + } + if (isremoved) + { + label += " [removed]"; + } + else if (false == iswritable) + { + label += " [read-only]"; + } + if (ImGui::Selectable(label.c_str(), handle == m_selected)) + { + m_selected = handle; + } + if (ImGui::IsItemHovered()) + { + std::string content{layer.created ? "New layer, its file is created on save" : isremoved ? "Dropped from the scenery on save" : "Scenery file"}; + if (scene::Layers.valid(layer.parent)) + { + content += "\nincluded by: " + layer_name(scene::Layers.resolve(layer.parent)); + } + if (false == iswritable) + { + content += "\nread-only: " + readonly; + } + if (auto const items{layer_content(layer)}; false == items.empty()) + { + content += "\n" + items; + } + ImGui::SetTooltip("%s", content.c_str()); + } + if (isremoved) + { + ImGui::PopStyleVar(); + } + ImGui::PopID(); + } + ImGui::EndChild(); +} + +void layers_panel::render_popups() +{ + if (ImGui::BeginPopupModal("New layer", nullptr, ImGuiWindowFlags_AlwaysAutoResize)) + { + ImGui::TextUnformatted("File of the new layer, in the scenery directory:"); + ImGui::InputTextWithHint("##name", "name.scm", m_newname, IM_ARRAYSIZE(m_newname)); + if (ImGui::BeginCombo("Included by", layer_name(m_newparent).c_str())) + { + for (std::size_t idx = 1; idx <= scene::Layers.size(); ++idx) + { + auto const handle{static_cast(idx)}; + if (false == scene::Layers.listed(handle) || scene::Layers.layer(handle).removed || scene::Layers.layer(handle).binary) + { + continue; + } + if (ImGui::Selectable((layer_name(handle) + "##" + std::to_string(idx)).c_str(), handle == m_newparent)) + { + m_newparent = handle; + } + } + ImGui::EndCombo(); + } + if (false == m_popuperror.empty()) + { + ImGui::TextColored(status_errorcolor, "%s", m_popuperror.c_str()); + } + if (ImGui::Button("Create")) + { + auto const created{scene::Layers.create(m_newname, m_newparent, m_popuperror)}; + if (created != null_handle) + { + m_selected = created; + report("Layer \"" + layer_name(created) + "\" created and made active. Its file is written on save."); + ImGui::CloseCurrentPopup(); + } + } + ImGui::SameLine(); + if (ImGui::Button("Cancel")) + { + ImGui::CloseCurrentPopup(); + } + ImGui::EndPopup(); + } + + if (ImGui::BeginPopupModal("Remove layer", nullptr, ImGuiWindowFlags_AlwaysAutoResize)) + { + if (false == scene::Layers.listed(m_selected)) + { + ImGui::CloseCurrentPopup(); + } + else + { + auto const &layer{scene::Layers.layer(m_selected)}; + auto included{0}; + for (std::size_t idx = 1; idx <= scene::Layers.size(); ++idx) + { + auto const handle{static_cast(idx)}; + if (handle != m_selected && scene::Layers.listed(handle) && scene::Layers.is_descendant(handle, m_selected)) + { + ++included; + } + } + ImGui::Text("Remove layer \"%s\" from the scenery?", layer_name(m_selected).c_str()); + ImGui::TextUnformatted(layer.created ? "The layer wasn't saved yet, so it leaves no file behind." : "Its include directive is erased on save. The file itself stays on the disk."); + if (included > 0) + { + ImGui::Text("%d layer(s) it includes are removed with it.", included); + } + if (auto const items{layer_content(layer)}; false == items.empty()) + { + ImGui::Separator(); + ImGui::TextUnformatted("The layer holds:"); + ImGui::TextUnformatted(items.c_str()); + ImGui::TextDisabled("Make sure the rest of the scenery doesn't refer to its tracks, events or memory cells."); + } + if (ImGui::Button("Remove")) + { + auto const name{layer_name(m_selected)}; + if (scene::Layers.remove(m_selected)) + { + report("Layer \"" + name + "\" removed. It can be restored until the scenery is saved."); + } + ImGui::CloseCurrentPopup(); + } + ImGui::SameLine(); + if (ImGui::Button("Cancel")) + { + ImGui::CloseCurrentPopup(); + } + } + ImGui::EndPopup(); + } + + if (ImGui::BeginPopupModal("Merge layer", nullptr, ImGuiWindowFlags_AlwaysAutoResize)) + { + if (false == scene::Layers.listed(m_selected)) + { + ImGui::CloseCurrentPopup(); + } + else + { + ImGui::Text("Move content of layer \"%s\" to:", layer_name(m_selected).c_str()); + std::string reason; + auto targets{0}; + if (ImGui::BeginCombo("##target", layer_name(m_mergetarget).c_str())) + { + for (std::size_t idx = 1; idx <= scene::Layers.size(); ++idx) + { + auto const handle{static_cast(idx)}; + if (false == scene::Layers.listed(handle) || false == scene::Layers.can_merge(m_selected, handle, reason)) + { + continue; + } + ++targets; + if (ImGui::Selectable((layer_name(handle) + "##" + std::to_string(idx)).c_str(), handle == m_mergetarget)) + { + m_mergetarget = handle; + } + } + if (targets == 0) + { + ImGui::TextDisabled("no layer can take it"); + } + ImGui::EndCombo(); + } + ImGui::TextDisabled("The text of the file is moved on save, the emptied file stays on the disk.\n" + "Merged into the layer which includes it, the content stays where the include was.\n" + "Merged into any other layer it's placed at its end, which changes the load order."); + auto const possible{m_mergetarget != null_handle && scene::Layers.can_merge(m_selected, m_mergetarget, reason)}; + if (action_button("Merge", possible, m_mergetarget != null_handle ? reason : "Pick the target layer")) + { + auto const name{layer_name(m_selected)}; + auto const target{m_mergetarget}; + if (scene::Layers.merge(m_selected, target)) + { + report("Layer \"" + name + "\" merged into \"" + layer_name(target) + "\". The files are changed on save."); + m_selected = target; + } + ImGui::CloseCurrentPopup(); + } + ImGui::SameLine(); + if (ImGui::Button("Cancel")) + { + ImGui::CloseCurrentPopup(); + } + } + ImGui::EndPopup(); + } +} + +void includes_panel::open(std::string const &File) +{ + m_file = File; + m_statuserror = false; + std::string error; + m_loaded = editor_includes::load(File, m_info, error); + if (false == m_loaded) + { + m_status = error; + m_statuserror = true; + return; + } + // every parameter the template uses gets an entry, described or not + auto const count{editor_includes::parameter_count(File)}; + for (auto id = 1; id <= count; ++id) + { + m_info.parameter(id); + } + m_status = "The template uses " + std::to_string(count) + " parameter(s)"; +} + +void includes_panel::render() +{ + if (false == is_open) + { + return; + } + + ImGui::SetNextWindowPos(ImVec2S(560, 110), ImGuiCond_FirstUseEver); + ImGui::SetNextWindowSize(ImVec2S(520, 440), ImGuiCond_FirstUseEver); + auto const panelname{(title.empty() ? m_name : title) + "###" + m_name}; + if (ImGui::Begin(panelname.c_str(), &is_open, ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoCollapse)) + { + ImGui::PushStyleColor(ImGuiCol_Text, ImGui::GetStyleColorVec4(ImGuiCol_TextDisabled)); + ImGui::TextWrapped("Describes .inc templates and their parameters. The description is stored in the template file, as //$e comment lines."); + ImGui::PopStyleColor(); + // templates the loaded scenery makes use of; known only for scenery opened for editing + auto const &templates{scene::Layers.templates()}; + if (false == templates.empty()) + { + ImGui::BeginChild("##templates", ImVec2(0.0f, ImGui::GetTextLineHeightWithSpacing() * 6.0f), true); + for (auto const &file : templates) + { + if (ImGui::Selectable(Bezogonkow(file).c_str(), file == m_file)) + { + open(file); + } + } + ImGui::EndChild(); + } + ImGui::PushItemWidth(-ImGui::CalcTextSize(" Open ").x - ImGui::GetStyle().ItemSpacing.x * 2.0f); + auto const entered{ImGui::InputTextWithHint("##file", "path of an .inc file in the scenery directory", m_filename, IM_ARRAYSIZE(m_filename), ImGuiInputTextFlags_EnterReturnsTrue)}; + ImGui::PopItemWidth(); + ImGui::SameLine(); + if ((ImGui::Button("Open") || entered) && m_filename[0] != '\0') + { + std::string file{ToLower(m_filename)}; + replace_slashes(file); + open(file); + } + + if (m_loaded) + { + ImGui::Separator(); + ImGui::Text("%s", Bezogonkow(m_file).c_str()); + input_text("Name", m_info.name); + input_text("Category", m_info.category); + input_text("Description", m_info.description); + + ImGui::Columns(4, "##parameters", false); + ImGui::SetColumnWidth(0, ImGui::CalcTextSize("(p000) ").x); + ImGui::SetColumnWidth(1, ImGui::CalcTextSize("texture ").x + ImGui::GetFrameHeight() * 2.0f); + ImGui::TextDisabled("param"); + ImGui::NextColumn(); + ImGui::TextDisabled("role"); + ImGui::NextColumn(); + ImGui::TextDisabled("label"); + ImGui::NextColumn(); + ImGui::TextDisabled("default"); + ImGui::NextColumn(); + for (auto ¶meter : m_info.parameters) + { + ImGui::PushID(parameter.id); + ImGui::AlignTextToFramePadding(); + ImGui::Text("(p%d)", parameter.id); + ImGui::NextColumn(); + ImGui::PushItemWidth(-1.0f); + if (ImGui::BeginCombo("##role", parameter.role.c_str())) + { + for (auto const &role : editor_includes::roles) + { + if (ImGui::Selectable(role.c_str(), role == parameter.role)) + { + parameter.role = role; + } + } + ImGui::EndCombo(); + } + ImGui::PopItemWidth(); + ImGui::NextColumn(); + ImGui::PushItemWidth(-1.0f); + input_text("##label", parameter.label); + ImGui::PopItemWidth(); + ImGui::NextColumn(); + ImGui::PushItemWidth(-1.0f); + input_text("##default", parameter.value); + ImGui::PopItemWidth(); + ImGui::NextColumn(); + ImGui::PopID(); + } + ImGui::Columns(1); + + if (ImGui::Button("Suggest roles")) + { + editor_includes::suggest(m_file, m_info); + } + if (ImGui::IsItemHovered()) + { + ImGui::SetTooltip("Sets roles of the parameters still marked as free, where the way the template uses them tells what they are"); + } + ImGui::SameLine(); + if (ImGui::Button("Add parameter")) + { + m_info.parameter(m_info.parameters.empty() ? 1 : m_info.parameters.back().id + 1); + } + ImGui::SameLine(); + if (ImGui::Button("Save to file")) + { + std::string error; + m_statuserror = false == editor_includes::save(m_file, m_info, error); + m_status = m_statuserror ? error : "Description saved in \"" + m_file + "\""; + } + ImGui::SameLine(); + if (ImGui::Button("Reload")) + { + open(m_file); + } + } + if (false == m_status.empty()) + { + ImGui::PushTextWrapPos(0.0f); + if (m_statuserror) + { + ImGui::TextColored(status_errorcolor, "%s", Bezogonkow(m_status).c_str()); + } + else + { + ImGui::TextUnformatted(Bezogonkow(m_status).c_str()); + } + ImGui::PopTextWrapPos(); + } + } + ImGui::End(); +} diff --git a/application/editoruipanels.h b/application/editoruipanels.h index 55a0ca1a1..53cfe938b 100644 --- a/application/editoruipanels.h +++ b/application/editoruipanels.h @@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/. #include "application/uilayer.h" #include "utilities/Classes.h" +#include "editor/editorIncludeInfo.hpp" #include /* @@ -148,6 +149,56 @@ class nodebank_panel : public ui_panel model_set_ref m_setsgroup{model_set_ref::source::nodebank, 0}; // node bank group to append to the edited set }; +// scenery layers of a scenery opened for editing: their visibility, selection lock, the layer receiving new nodes, +// and layer management. the changes are applied to the scenery files on save +class layers_panel : public ui_panel +{ + + public: + layers_panel(std::string const &Name, bool const Isopen) : ui_panel(Name, Isopen) {} + + void render() override; + + // saves the scenery; provided by the editor mode + std::function save; + // outcome of the most recent operation, shown at the bottom of the window + std::string status; + bool status_error{false}; + + private: + // methods + void render_list(); + void render_popups(); + void report(std::string const &Status, bool const Error = false); + // members + scene::layer_handle m_selected{null_handle}; // layer the buttons act on + char m_newname[128]{}; // file name of the layer being created + scene::layer_handle m_newparent{null_handle}; // layer which is going to include it + scene::layer_handle m_mergetarget{null_handle}; + std::string m_popuperror; +}; + +// editor of the descriptions of *.inc scenery templates, see editorIncludeInfo.hpp +class includes_panel : public ui_panel +{ + + public: + includes_panel(std::string const &Name, bool const Isopen) : ui_panel(Name, Isopen) {} + + void render() override; + + private: + // methods + void open(std::string const &File); + // members + std::string m_file; // template being edited, relative to the scenery directory + char m_filename[256]{}; // name of a template typed in by hand + include_info m_info; + bool m_loaded{false}; + std::string m_status; + bool m_statuserror{false}; +}; + class functions_panel : public ui_panel { diff --git a/editor/editorIncludeInfo.cpp b/editor/editorIncludeInfo.cpp new file mode 100644 index 000000000..f9f09920e --- /dev/null +++ b/editor/editorIncludeInfo.cpp @@ -0,0 +1,509 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "editor/editorIncludeInfo.hpp" + +#include "utilities/Globals.h" +#include "utilities/utilities.h" + +#include + +#include +#include +#include + +namespace +{ + +std::string const linemark{"//$e"}; + +// template file split into the description and the rest +struct template_text +{ + std::string content; // whole file + std::string yaml; // description, with the line marks taken off; utf-8 + std::vector> lines; // ranges of the content taken by the description lines, line ends included + std::string eol{"\r\n"}; + std::size_t start{0}; // location of the first character past the byte order mark + bool utf8{false}; // the file is utf-8 encoded, rather than windows-1250 like most of the scenery files +}; + +// true if specified text is valid utf-8. HasExtended: set if the text has any characters outside of ascii +bool is_utf8(std::string const &Text, bool &HasExtended) +{ + HasExtended = false; + for (std::size_t idx = 0; idx < Text.size();) + { + auto const lead{static_cast(Text[idx])}; + if (lead < 0x80) + { + ++idx; + continue; + } + HasExtended = true; + auto const length{(lead & 0xE0) == 0xC0 ? 2 : (lead & 0xF0) == 0xE0 ? 3 : (lead & 0xF8) == 0xF0 ? 4 : 0}; + if (length == 0 || idx + length > Text.size()) + { + return false; + } + for (auto offset = 1; offset < length; ++offset) + { + if ((static_cast(Text[idx + offset]) & 0xC0) != 0x80) + { + return false; + } + } + idx += length; + } + return true; +} + +// counterpart of win1250_to_utf8(). characters outside of the supported set are replaced with question marks +std::string utf8_to_win1250(std::string const &Text) +{ + // polish letters, as utf-8 sequences; the same set win1250_to_utf8() handles + static std::unordered_map const charmap{{"\xC4\x84", '\xA5'}, {"\xC4\x86", '\xC6'}, {"\xC4\x98", '\xCA'}, {"\xC5\x81", '\xA3'}, {"\xC5\x83", '\xD1'}, {"\xC3\x93", '\xD3'}, + {"\xC5\x9A", '\x8C'}, {"\xC5\xB9", '\x8F'}, {"\xC5\xBB", '\xAF'}, {"\xC4\x85", '\xB9'}, {"\xC4\x87", '\xE6'}, {"\xC4\x99", '\xEA'}, + {"\xC5\x82", '\xB3'}, {"\xC5\x84", '\xF1'}, {"\xC3\xB3", '\xF3'}, {"\xC5\x9B", '\x9C'}, {"\xC5\xBA", '\x9F'}, {"\xC5\xBC", '\xBF'}}; + std::string output; + for (std::size_t idx = 0; idx < Text.size();) + { + auto const lead{static_cast(Text[idx])}; + if (lead < 0x80) + { + output += Text[idx++]; + continue; + } + auto const length{std::min((lead & 0xE0) == 0xC0 ? 2 : (lead & 0xF0) == 0xE0 ? 3 : (lead & 0xF8) == 0xF0 ? 4 : 1, Text.size() - idx)}; + auto const lookup{charmap.find(Text.substr(idx, length))}; + output += (lookup != charmap.end() ? lookup->second : '?'); + idx += length; + } + return output; +} + +bool read_template(std::string const &File, template_text &Text, std::string &Error) +{ + std::ifstream input{Global.asCurrentSceneryPath + File, std::ios_base::binary}; + if (false == input.is_open()) + { + Error = "can't open file \"" + File + "\""; + return false; + } + auto &content{Text.content}; + content.assign(std::istreambuf_iterator(input), std::istreambuf_iterator()); + + auto const bom{content.compare(0, 3, "\xEF\xBB\xBF") == 0}; + Text.start = bom ? 3 : 0; + bool extended; + Text.utf8 = bom || (is_utf8(content, extended) && extended); + if (auto const linebreak{content.find('\n')}; linebreak != std::string::npos) + { + Text.eol = (linebreak > 0 && content[linebreak - 1] == '\r') ? "\r\n" : "\n"; + } + + for (auto linebegin{Text.start}; linebegin < content.size();) + { + auto const linebreak{content.find('\n', linebegin)}; + auto const next{linebreak == std::string::npos ? content.size() : linebreak + 1}; + if (content.compare(linebegin, linemark.size(), linemark) == 0) + { + auto line{content.substr(linebegin + linemark.size(), next - linebegin - linemark.size())}; + line.erase(line.find_last_not_of("\r\n") + 1); + // a single space separates the mark from the document; the rest is indentation, which carries meaning + if (false == line.empty() && line.front() == ' ') + { + line.erase(0, 1); + } + Text.yaml += line + '\n'; + Text.lines.emplace_back(linebegin, next); + } + linebegin = next; + } + if (false == is_utf8(Text.yaml, extended)) + { + Text.yaml = win1250_to_utf8(Text.yaml); + } + return true; +} + +// number of the parameter if specified text holds (pN) placeholder at specified location, 0 otherwise. Length: size of the placeholder +int placeholder(std::string const &Text, std::size_t const Location, std::size_t &Length) +{ + if (Text.compare(Location, 2, "(p") != 0) + { + return 0; + } + auto idx{Location + 2}; + auto id{0}; + while (idx < Text.size() && std::isdigit(static_cast(Text[idx])) && id < 1000) + { + id = id * 10 + (Text[idx] - '0'); + ++idx; + } + if (idx == Location + 2 || idx >= Text.size() || Text[idx] != ')') + { + return 0; + } + Length = idx + 1 - Location; + return id; +} + +// number of the parameter if the token is nothing but its placeholder, 0 otherwise +int exact_placeholder(std::string const &Token) +{ + std::size_t length{0}; + auto const id{placeholder(Token, 0, length)}; + return length == Token.size() ? id : 0; +} + +// number of the first parameter whose placeholder is a part of the token, 0 if there's none +int first_placeholder(std::string const &Token) +{ + std::size_t length{0}; + for (auto location{Token.find("(p")}; location != std::string::npos; location = Token.find("(p", location + 1)) + { + if (auto const id{placeholder(Token, location, length)}; id != 0) + { + return id; + } + } + return 0; +} + +// tokens of scenery text, in lower case and with the comments left out +std::vector tokenize(std::string const &Text) +{ + std::vector tokens; + std::string token; + auto const flush = [&]() { + if (false == token.empty()) + { + tokens.emplace_back(ToLower(token)); + token.clear(); + } + }; + for (std::size_t idx = 0; idx < Text.size(); ++idx) + { + if (Text.compare(idx, 2, "//") == 0) + { + flush(); + idx = Text.find('\n', idx); + if (idx == std::string::npos) + { + break; + } + } + else if (Text.compare(idx, 2, "/*") == 0) + { + flush(); + idx = Text.find("*/", idx + 2); + if (idx == std::string::npos) + { + break; + } + ++idx; + } + else if (Text[idx] == ' ' || Text[idx] == '\t' || Text[idx] == '\n' || Text[idx] == '\r' || Text[idx] == ';') + { + flush(); + } + else + { + token += Text[idx]; + } + } + flush(); + return tokens; +} + +} // namespace + +include_parameter &include_info::parameter(int const Id) +{ + auto lookup{std::find_if(std::begin(parameters), std::end(parameters), [=](include_parameter const &Parameter) { return Parameter.id >= Id; })}; + if (lookup == std::end(parameters) || lookup->id != Id) + { + lookup = parameters.emplace(lookup); + lookup->id = Id; + } + return *lookup; +} + +namespace editor_includes +{ + +std::vector const roles{"free", "name", "pos.x", "pos.y", "pos.z", "rot.x", "rot.y", "rot.z", "track", "memcell", "event", "model", "texture", "number", "text"}; + +bool load(std::string const &File, include_info &Info, std::string &Error) +{ + Info = include_info(); + template_text text; + if (false == read_template(File, text, Error)) + { + return false; + } + try + { + auto const document{YAML::Load(text.yaml)}; + if (document.IsNull()) + { + return true; + } + if (false == document.IsMap()) + { + Error = "the description isn't a list of named values"; + return false; + } + Info.name = document["name"].as(""); + Info.category = document["category"].as(""); + Info.description = document["description"].as(""); + if (auto const parameters{document["params"]}; parameters.IsDefined() && parameters.IsSequence()) + { + for (auto const &entry : parameters) + { + auto const id{entry.IsMap() ? entry["id"].as(0) : 0}; + if (id <= 0) + { + continue; + } + auto ¶meter{Info.parameter(id)}; + parameter.role = entry["role"].as("free"); + parameter.label = entry["label"].as(""); + parameter.value = entry["default"].as(""); + } + } + } + catch (YAML::Exception const &exception) + { + Error = std::string{"the description is malformed: "} + exception.what(); + return false; + } + return true; +} + +bool save(std::string const &File, include_info const &Info, std::string &Error) +{ + template_text text; + if (false == read_template(File, text, Error)) + { + return false; + } + std::string yaml; + try + { + // start with the existing description, to keep the entries we don't know + auto document{YAML::Load(text.yaml)}; + if (false == document.IsNull() && false == document.IsMap()) + { + Error = "the existing description isn't a list of named values"; + return false; + } + if (false == document["version"].IsDefined()) + { + document["version"] = 1; + } + auto const set = [&](char const *Key, std::string const &Value) { + if (false == Value.empty()) + { + document[Key] = Value; + } + else + { + document.remove(Key); + } + }; + set("name", Info.name); + set("category", Info.category); + set("description", Info.description); + + YAML::Node parameters{YAML::NodeType::Sequence}; + for (auto const ¶meter : Info.parameters) + { + YAML::Node entry{YAML::NodeType::Map}; + if (auto const existing{document["params"]}; existing.IsDefined() && existing.IsSequence()) + { + for (auto const &candidate : existing) + { + if (candidate.IsMap() && candidate["id"].as(0) == parameter.id) + { + entry = YAML::Clone(candidate); + break; + } + } + } + entry["id"] = parameter.id; + entry["role"] = parameter.role.empty() ? std::string{"free"} : parameter.role; + if (false == parameter.label.empty()) + { + entry["label"] = parameter.label; + } + else + { + entry.remove("label"); + } + if (false == parameter.value.empty()) + { + entry["default"] = parameter.value; + } + else + { + entry.remove("default"); + } + entry.SetStyle(YAML::EmitterStyle::Flow); + parameters.push_back(entry); + } + if (parameters.size() > 0) + { + document["params"] = parameters; + } + else + { + document.remove("params"); + } + + YAML::Emitter emitter; + emitter << document; + yaml = emitter.c_str(); + } + catch (YAML::Exception const &exception) + { + Error = std::string{"the existing description is malformed, fix or remove it first: "} + exception.what(); + return false; + } + if (false == text.utf8) + { + yaml = utf8_to_win1250(yaml); + } + + std::string block; + std::istringstream lines{yaml}; + for (std::string line; std::getline(lines, line);) + { + block += linemark + (line.empty() ? "" : " " + line) + text.eol; + } + // the description replaces the old one, or goes to the top of the file if there was none + auto content{text.content}; + auto location{text.lines.empty() ? text.start : text.lines.front().first}; + for (auto line{text.lines.rbegin()}; line != text.lines.rend(); ++line) + { + content.erase(line->first, line->second - line->first); + } + content.insert(location, block); + + auto const filepath{Global.asCurrentSceneryPath + File}; + std::ofstream output{filepath + ".tmp", std::ios_base::binary | std::ios_base::trunc}; + output << content; + output.close(); + std::error_code error; + if (output.fail()) + { + std::filesystem::remove(filepath + ".tmp", error); + Error = "can't write file \"" + File + "\""; + return false; + } + // the first save of a file leaves its original content next to it + if (false == std::filesystem::exists(filepath + ".bak", error)) + { + std::filesystem::copy_file(filepath, filepath + ".bak", error); + } + std::filesystem::rename(filepath + ".tmp", filepath, error); + if (error) + { + Error = "can't replace file \"" + File + "\": " + error.message(); + return false; + } + return true; +} + +int parameter_count(std::string const &File) +{ + template_text text; + std::string error; + if (false == read_template(File, text, error)) + { + return 0; + } + // the description lines may mention parameters the template doesn't use + auto content{text.content}; + for (auto line{text.lines.rbegin()}; line != text.lines.rend(); ++line) + { + content.erase(line->first, line->second - line->first); + } + auto count{0}; + std::size_t length{0}; + for (auto location{content.find("(p")}; location != std::string::npos; location = content.find("(p", location + 1)) + { + count = std::max(count, placeholder(content, location, length)); + } + return count; +} + +void suggest(std::string const &File, include_info &Info) +{ + template_text text; + std::string error; + if (false == read_template(File, text, error)) + { + return; + } + auto const tokens{tokenize(text.content)}; + auto const assign = [&](std::size_t const Index, char const *Role, bool const Exact = true) { + if (Index >= tokens.size()) + { + return; + } + auto const id{Exact ? exact_placeholder(tokens[Index]) : first_placeholder(tokens[Index])}; + if (id != 0 && Info.parameter(id).role == "free") + { + Info.parameter(id).role = Role; + } + }; + for (std::size_t idx = 0; idx < tokens.size(); ++idx) + { + auto const &token{tokens[idx]}; + if (token == "origin") + { + assign(idx + 1, "pos.x"); + assign(idx + 2, "pos.y"); + assign(idx + 3, "pos.z"); + } + else if (token == "rotate") + { + assign(idx + 1, "rot.x"); + assign(idx + 2, "rot.y"); + assign(idx + 3, "rot.z"); + } + else if (token == "node" && idx + 4 < tokens.size()) + { + // node ... + assign(idx + 3, "name", false); + auto const &type{tokens[idx + 4]}; + if (type == "model" || type == "memcell" || type == "eventlauncher" || type == "sound") + { + assign(idx + 5, "pos.x"); + assign(idx + 6, "pos.y"); + assign(idx + 7, "pos.z"); + } + if (type == "model") + { + assign(idx + 8, "rot.y"); + assign(idx + 9, "model"); + assign(idx + 10, "texture"); + } + if (type == "memcell") + { + assign(idx + 11, "track"); + } + } + } +} + +} // namespace editor_includes diff --git a/editor/editorIncludeInfo.hpp b/editor/editorIncludeInfo.hpp new file mode 100644 index 000000000..9aa47af25 --- /dev/null +++ b/editor/editorIncludeInfo.hpp @@ -0,0 +1,59 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include + +// description of an *.inc scenery template: what the template is, and what its (pN) parameters mean. +// it's kept in the template file itself, as a YAML document made of the comment lines starting with "//$e", e.g. +// //$e version: 1 +// //$e name: Semaphore, 5 lights +// //$e params: +// //$e - {id: 1, role: name, label: Name} +// being a comment it's invisible to the scenery parser and to the older tools +struct include_parameter +{ + int id{0}; // number of the (pN) placeholder + std::string role{"free"}; // what the value is; one of editor_includes::roles + std::string label; // name to show to the user + std::string value; // default value +}; + +struct include_info +{ + std::string name; + std::string category; + std::string description; + std::vector parameters; + + // description of specified parameter, created if there's none + include_parameter ¶meter(int Id); +}; + +namespace editor_includes +{ + +// recognized parameter roles. "free" is a value typed in by the user, with no meaning to the editor; +// the placement roles (pos.*, rot.*) and "name" are the ones the editor can fill in on its own +extern std::vector const roles; + +// reads description of specified template, located in the scenery directory. a template without the description +// yields an empty one. returns: false if the file can't be read or its description isn't a valid YAML document +bool load(std::string const &File, include_info &Info, std::string &Error); +// stores provided description in specified template. entries of the existing description which aren't +// a part of include_info are preserved. returns: false if the file can't be updated +bool save(std::string const &File, include_info const &Info, std::string &Error); +// highest number of (pN) placeholder used by specified template, 0 if it has none +int parameter_count(std::string const &File); +// sets roles of the parameters whose use in the template makes their meaning clear. roles already set are left alone +void suggest(std::string const &File, include_info &Info); + +} // namespace editor_includes diff --git a/scene/scenelayers.cpp b/scene/scenelayers.cpp index 3acb01546..abbd56d63 100644 --- a/scene/scenelayers.cpp +++ b/scene/scenelayers.cpp @@ -14,22 +14,44 @@ http://mozilla.org/MPL/2.0/. #include "model/AnimModel.h" #include "world/Track.h" #include "world/Traction.h" +#include "utilities/Globals.h" +#include "utilities/utilities.h" + +#include namespace scene { node_layers Layers; +// converts world space location to the one which produces it when loaded with this context in effect +glm::dvec3 layer_context::to_local(glm::dvec3 Location) const +{ + // reverse of the transformation done by the scenery loader: rotation around the vertical axis, then scale, then offset + Location -= offset; + Location /= glm::dvec3{scale}; + if (rotation != glm::vec3{0.f}) + { + Location = glm::rotateY(Location, -glm::radians(static_cast(rotation.y))); + } + return Location; +} + +bool layer_context::matches(layer_context const &Other) const +{ + return glm::all(glm::epsilonEqual(offset, Other.offset, 1e-4)) && glm::all(glm::epsilonEqual(rotation, Other.rotation, 1e-4f)) && glm::all(glm::epsilonEqual(scale, Other.scale, 1e-5f)); +} + std::size_t basic_layer::item_count() const { return std::accumulate(std::begin(items), std::end(items), std::size_t{0}); } -// indicates start of content of specified scenery file. returns: handle to the layer of the file +// indicates start of content of the scenario file. returns: handle to its layer layer_handle node_layers::open(std::string const &Name) { // the same file can be included more than once, all its content goes to a single layer then - auto const lookup{std::find_if(std::begin(m_layers), std::end(m_layers), [&](basic_layer const &Layer) { return Layer.name == Name; })}; + auto const lookup{std::find_if(std::begin(m_layers), std::end(m_layers), [&](basic_layer const &Layer) { return Layer.name == Name && false == Layer.dead; })}; auto layerhandle{static_cast(std::distance(std::begin(m_layers), lookup) + 1)}; if (lookup == std::end(m_layers)) { @@ -38,6 +60,7 @@ layer_handle node_layers::open(std::string const &Name) m_layers.emplace_back(); m_layers.back().name = Name; m_layers.back().parent = handle(); + stat(layerhandle); } else { @@ -45,18 +68,39 @@ layer_handle node_layers::open(std::string const &Name) layerhandle = handle(); } } + if (valid(layerhandle) && layerhandle != handle()) + { + layer(layerhandle).context_begin = m_context; + } // NOTE: the stack receives an entry even if the layer wasn't created, to keep it in sync with close() calls m_stack.emplace_back(layerhandle); return layerhandle; } +// indicates start of content of specified scenery file, included by specified directive. returns: handle to the layer of the file +layer_handle node_layers::open(std::string const &Name, include_site Site) +{ + Site.parent = handle(); + auto const layerhandle{open(Name)}; + if (valid(layerhandle) && layerhandle != Site.parent) + { + layer(layerhandle).sites.emplace_back(Site); + } + return layerhandle; +} + // indicates end of content of the current scenery file. returns: handle to the parent layer, or null_handle if the stack is empty layer_handle node_layers::close() { if (false == m_stack.empty()) { + auto const closing{m_stack.back()}; m_stack.pop_back(); + if (valid(closing) && closing != handle()) + { + layer(closing).context_end = m_context; + } } return handle(); } @@ -66,22 +110,59 @@ void node_layers::clear() m_layers.clear(); m_stack.clear(); m_active = null_handle; + m_context = layer_context(); + m_sources.clear(); + m_erased.clear(); + m_templates.clear(); + m_terraindirective = false; +} + +// follows layer merges. returns: handle of the layer which currently holds content of specified layer +layer_handle node_layers::resolve(layer_handle Layer) const +{ + // NOTE: merge() rules out cycles, the counter is only a safeguard + for (auto hops = 0; hops < 64 && valid(Layer) && layer(Layer).merged != null_handle; ++hops) + { + Layer = layer(Layer).merged; + } + return Layer; } int node_layers::depth(layer_handle Layer) const { auto depth{0}; - // NOTE: parent is always created before its children, which rules out cycles - while (valid(Layer) && layer(Layer).parent != null_handle && layer(Layer).parent < Layer) + Layer = resolve(Layer); + while (valid(Layer) && layer(Layer).parent != null_handle && depth < 64) { - Layer = layer(Layer).parent; + Layer = resolve(layer(Layer).parent); ++depth; } return depth; } -void node_layers::count(layer_handle const Layer, layer_item const Item, int const Change) +std::vector node_layers::tree() const { + std::vector order; + order.reserve(m_layers.size()); + // NOTE: the layers are few, plain scans do + std::function const add = [&](layer_handle const Parent) { + for (std::size_t idx = 0; idx < m_layers.size(); ++idx) + { + auto const candidate{static_cast(idx + 1)}; + if (listed(candidate) && resolve(layer(candidate).parent) == Parent && order.size() < m_layers.size()) + { + order.emplace_back(candidate); + add(candidate); + } + } + }; + add(null_handle); + return order; +} + +void node_layers::count(layer_handle Layer, layer_item const Item, int const Change) +{ + Layer = resolve(Layer); if (false == valid(Layer)) { return; @@ -97,9 +178,10 @@ void node_layers::count(layer_handle const Layer, layer_item const Item, int con } } -void node_layers::active(layer_handle const Layer) +void node_layers::active(layer_handle Layer) { - if (false == valid(Layer)) + Layer = resolve(Layer); + if (false == valid(Layer) || layer(Layer).removed || false == writable(Layer)) { return; } @@ -110,16 +192,17 @@ void node_layers::active(layer_handle const Layer) } // shows or hides nodes of specified layer. visibility defined in the scenery is preserved, hidden layer only overrides it -void node_layers::visible(layer_handle const Layer, bool const Visible) +void node_layers::visible(layer_handle Layer, bool const Visible) { + Layer = resolve(Layer); if (false == valid(Layer) || layer(Layer).visible == Visible) { return; } layer(Layer).visible = Visible; - auto const update_node = [Layer, Visible](basic_node *Node) { - if (Node == nullptr || Node->layer() != Layer) + auto const update_node = [this, Layer, Visible](basic_node *Node) { + if (Node == nullptr || resolve(Node->layer()) != Layer) { return; } @@ -153,19 +236,101 @@ void node_layers::visible(layer_handle const Layer, bool const Visible) } } -void node_layers::locked(layer_handle const Layer, bool const Locked) +void node_layers::locked(layer_handle Layer, bool const Locked) { + Layer = resolve(Layer); if (valid(Layer)) { layer(Layer).locked = Locked; } } -// true if nodes of specified layer can be selected and modified in the editor -bool node_layers::editable(layer_handle const Layer) const +// true if the file of specified layer can be rewritten with changed nodes. optionally explains why it can't +bool node_layers::writable(layer_handle Layer, std::string *Reason) const { + Layer = resolve(Layer); + if (false == valid(Layer)) + { + return false; + } + auto const &target{layer(Layer)}; + char const *reason{nullptr}; + if (target.binary) + { + reason = "the file is loaded from binary terrain cache"; + } + else if (target.sites.size() > 1) + { + // one definition yields several nodes, there's no telling which of them should be written back + reason = "the file is included more than once"; + } + else if (false == target.sites.empty() && target.sites.front().parameters) + { + reason = "the file is included with parameters"; + } + if (reason != nullptr && Reason != nullptr) + { + *Reason = reason; + } + return reason == nullptr; +} + +// true if nodes of specified layer can be selected and modified in the editor +bool node_layers::editable(layer_handle Layer) const +{ + Layer = resolve(Layer); // nodes without a layer (regular load, or created by the simulation) aren't restricted - return false == valid(Layer) || (layer(Layer).visible && false == layer(Layer).locked); + return false == valid(Layer) || (layer(Layer).visible && false == layer(Layer).locked && false == layer(Layer).removed && writable(Layer)); +} + +// true if specified node can be selected and modified in the editor. optionally explains why it can't +bool node_layers::editable(basic_node const *Node, std::string *Reason) const +{ + if (Node == nullptr) + { + return false; + } + auto const nodelayer{resolve(Node->layer())}; + if (false == valid(nodelayer)) + { + return true; + } + std::string reason; + if (Node->m_template) + { + reason = "it's a part of an include template (.inc)"; + } + else if (false == writable(nodelayer, &reason)) + { + // reason was filled by the call + } + else if (layer(nodelayer).locked) + { + reason = "its layer is locked"; + } + else if (false == layer(nodelayer).visible || layer(nodelayer).removed) + { + reason = "its layer is hidden"; + } + if (false == reason.empty() && Reason != nullptr) + { + *Reason = reason; + } + return reason.empty(); +} + +// moves specified node to specified layer +void node_layers::move(basic_node *Node, layer_handle Layer) +{ + Layer = resolve(Layer); + if (Node == nullptr || false == valid(Layer) || resolve(Node->layer()) == Layer) + { + return; + } + // NOTE: the only nodes the editor creates and moves between layers are model instances + count(Node->layer(), layer_item::model, -1); + Node->layer(Layer); + count(Layer, layer_item::model, 1); } std::vector node_layers::hidden() const @@ -185,10 +350,323 @@ void node_layers::show_all() { for (auto const hiddenlayer : hidden()) { - visible(hiddenlayer, true); + // layers dropped from the scenery stay out of sight + if (false == layer(hiddenlayer).removed) + { + visible(hiddenlayer, true); + } } } +// stores origin of a node defined directly in a layer file, to allow rewriting its definition on save +void node_layers::track(basic_node const *Node, source_span const &Span, glm::vec3 const &Angles, glm::vec3 const &Scale) +{ + if (Node == nullptr || Node->m_template || false == valid(Node->layer()) || false == Span.valid()) + { + return; + } + m_sources[Node] = {Node->layer(), Span, m_context, Node->location(), Angles, Scale}; +} + +// indicates specified node was removed from the scene +void node_layers::forget(basic_node const *Node) +{ + auto const lookup{m_sources.find(Node)}; + if (lookup == m_sources.end()) + { + return; + } + m_erased.emplace_back(lookup->second.layer, lookup->second.span); + m_sources.erase(lookup); +} + +bool node_layers::is_descendant(layer_handle Layer, layer_handle const Ancestor) const +{ + // NOTE: content of a merged layer, includes of other files among it, belongs to the layer it was merged into + for (auto hops = 0; hops < 64 && valid(Layer); ++hops) + { + Layer = resolve(layer(Layer).parent); + if (Layer == Ancestor) + { + return true; + } + } + return false; +} + +std::string node_layers::path(layer_handle const Layer) const +{ + return Global.asCurrentSceneryPath + layer(Layer).name; +} + +// stores current state of the layer file, to detect later whether it was changed behind our back +void node_layers::stat(layer_handle const Layer) +{ + std::error_code error; + auto const filepath{std::filesystem::path(path(Layer))}; + auto const filesize{std::filesystem::file_size(filepath, error)}; + layer(Layer).filesize = error ? 0 : filesize; + auto const filetime{std::filesystem::last_write_time(filepath, error)}; + layer(Layer).filetime = error ? std::filesystem::file_time_type{} : filetime; +} + +// creates empty layer, included from specified one. returns: handle to the new layer, or null_handle with the explanation in Reason +layer_handle node_layers::create(std::string Name, layer_handle Parent, std::string &Reason) +{ + Parent = resolve(Parent); + if (false == valid(Parent) || layer(Parent).removed || layer(Parent).binary) + { + Reason = "the parent layer can't include other files"; + return null_handle; + } + // file names in the scenery are processed in lower case, with forward slashes + Name = ToLower(Name); + replace_slashes(Name); + Name.erase(0, Name.find_first_not_of(" \t")); + Name.erase(Name.find_last_not_of(" \t") + 1); + if (Name.empty()) + { + Reason = "the layer needs a file name"; + return null_handle; + } + if (Name.find_first_of(" \t\";:*?<>|") != std::string::npos || Name.front() == '/' || Name.back() == '/' || contains(Name, "..")) + { + Reason = "the file name has to be a plain path inside the scenery directory, without spaces"; + return null_handle; + } + if (std::filesystem::path(Name).extension().empty()) + { + Name += ".scm"; + } + if (Name.ends_with(".inc")) + { + Reason = ".inc files are include templates, not layers"; + return null_handle; + } + if (m_layers.size() >= static_cast(std::numeric_limits::max())) + { + Reason = "too many layers"; + return null_handle; + } + auto const taken{std::any_of(std::begin(m_layers), std::end(m_layers), [&](basic_layer const &Layer) { return Layer.name == Name && false == Layer.dead; })}; + if (taken || FileExists(Global.asCurrentSceneryPath + Name)) + { + Reason = "the file \"" + Name + "\" already exists"; + return null_handle; + } + + // the include directive goes after the last file included by the parent, so the scenery files stay ahead of + // what may follow them in a scenario, like the vehicles + auto anchor{null_handle}; + std::streamoff anchorend{-1}; + for (std::size_t idx = 0; idx < m_layers.size(); ++idx) + { + auto const &sibling{m_layers[idx]}; + if (sibling.dead || sibling.created || sibling.sites.size() != 1) + { + continue; + } + auto const &site{sibling.sites.front()}; + if (site.parent == Parent && false == site.fixed && site.span.end > anchorend) + { + anchor = static_cast(idx + 1); + anchorend = site.span.end; + } + } + + m_layers.emplace_back(); + auto const layerhandle{static_cast(m_layers.size())}; + auto &created{m_layers.back()}; + created.name = Name; + created.parent = Parent; + created.created = true; + created.editormade = true; + created.anchor = anchor; + // placement the new file is going to be loaded with + created.context_begin = valid(anchor) ? layer(anchor).context_end : layer(Parent).context_end; + created.context_end = created.context_begin; + + active(layerhandle); + + return layerhandle; +} + +bool node_layers::can_remove(layer_handle Layer, std::string &Reason) const +{ + if (false == listed(Layer) || layer(Layer).removed) + { + Reason = "no such layer"; + return false; + } + auto const &target{layer(Layer)}; + if (target.created) + { + return true; + } + if (target.sites.empty()) + { + Reason = "the scenario file can't be removed"; + return false; + } + if (target.binary) + { + Reason = "the file is loaded from binary terrain cache"; + return false; + } + if (target.sites.size() > 1) + { + Reason = "the file is included more than once"; + return false; + } + if (target.sites.front().fixed) + { + Reason = "the file is included by an include template (.inc)"; + return false; + } + return true; +} + +// marks specified layer and the layers it includes as dropped from the scenery. their files are left on the disk +bool node_layers::remove(layer_handle Layer) +{ + std::string reason; + if (false == can_remove(Layer, reason)) + { + return false; + } + for (std::size_t idx = 0; idx < m_layers.size(); ++idx) + { + auto const candidate{static_cast(idx + 1)}; + // layers merged elsewhere keep going, their content is no longer a part of the removed file + if (false == listed(candidate) || (candidate != Layer && false == is_descendant(candidate, Layer))) + { + continue; + } + visible(candidate, false); + layer(candidate).removed = true; + if (m_active == candidate) + { + m_active = null_handle; + } + } + if (m_active == null_handle) + { + // fall back on the scenario file, which is always there + active(1); + } + return true; +} + +// takes back remove() which wasn't saved yet +void node_layers::restore(layer_handle Layer) +{ + if (false == valid(Layer) || false == layer(Layer).removed || layer(Layer).dead) + { + return; + } + // a layer can't be brought back without the file which includes it + auto const parent{resolve(layer(Layer).parent)}; + if (valid(parent) && layer(parent).removed) + { + restore(parent); + } + for (std::size_t idx = 0; idx < m_layers.size(); ++idx) + { + auto const candidate{static_cast(idx + 1)}; + if (false == listed(candidate) || (candidate != Layer && false == is_descendant(candidate, Layer))) + { + continue; + } + layer(candidate).removed = false; + visible(candidate, true); + } +} + +bool node_layers::can_merge(layer_handle Source, layer_handle Target, std::string &Reason) const +{ + if (false == listed(Source) || false == listed(Target) || layer(Source).removed || layer(Target).removed) + { + Reason = "no such layer"; + return false; + } + if (Source == Target) + { + Reason = "pick another layer to merge into"; + return false; + } + auto const &source{layer(Source)}; + auto const &target{layer(Target)}; + if (false == writable(Target, &Reason)) + { + return false; + } + if (is_descendant(Target, Source)) + { + // the merged text would include the file it was put in + Reason = "the target layer is included by the merged one"; + return false; + } + if (source.created) + { + // nothing but the nodes made in the editor to move + return true; + } + if (source.sites.empty()) + { + Reason = "the scenario file can't be merged into another layer"; + return false; + } + if (false == writable(Source, &Reason)) + { + return false; + } + if (source.sites.front().fixed) + { + Reason = "the file is included by an include template (.inc)"; + return false; + } + if (resolve(source.sites.front().parent) != Target) + { + // the text is moved to the end of another file. its statements have to keep their meaning there, + // and can't leave anything behind for what used to follow it + if (false == source.context_begin.matches(target.context_end) || false == source.context_end.matches(source.context_begin)) + { + Reason = "the layers are loaded with different origin, rotation or scale"; + return false; + } + } + return true; +} + +// moves content of the source layer to the target layer +bool node_layers::merge(layer_handle Source, layer_handle Target) +{ + std::string reason; + if (false == can_merge(Source, Target, reason)) + { + return false; + } + // start with the same visibility on both sides, as it's kept per node + visible(Source, true); + visible(Target, true); + for (std::size_t idx = 0; idx < layer(Source).items.size(); ++idx) + { + layer(Target).items[idx] += layer(Source).items[idx]; + } + layer(Source).merged = Target; + if (m_active == Source) + { + active(Target); + } + return true; +} + +// true if there are layer changes awaiting save. NOTE: doesn't account for modified nodes +bool node_layers::pending() const +{ + return std::any_of(std::begin(m_layers), std::end(m_layers), [](basic_layer const &Layer) { return false == Layer.dead && (Layer.created || Layer.removed || Layer.merged != null_handle); }); +} + } // namespace scene //--------------------------------------------------------------------------- diff --git a/scene/scenelayers.h b/scene/scenelayers.h index 71df37267..394f607d1 100644 --- a/scene/scenelayers.h +++ b/scene/scenelayers.h @@ -11,6 +11,9 @@ http://mozilla.org/MPL/2.0/. #include "scene/scenenode.h" +#include +#include + namespace scene { @@ -31,6 +34,39 @@ enum class layer_item count_ }; +// placement applied to scenery statements by the origin, rotate and scale directives in effect +struct layer_context +{ + glm::dvec3 offset{0.0}; + glm::vec3 rotation{0.f}; + glm::vec3 scale{1.f}; + + // converts world space location to the one which produces it when loaded with this context in effect + glm::dvec3 to_local(glm::dvec3 Location) const; + bool matches(layer_context const &Other) const; +}; + +// location of a piece of text in a scenery file, as byte offsets +struct source_span +{ + std::streamoff begin{-1}; + std::streamoff end{-1}; + + bool valid() const + { + return begin >= 0 && end > begin; + } +}; + +// include directive bringing a scenery file into another one +struct include_site +{ + layer_handle parent{null_handle}; // layer of the file holding the directive + source_span span; // location of the whole directive in that file + bool parameters{false}; // the file is included with parameters + bool fixed{false}; // the directive can't be rewritten: it's a part of an *.inc template, or its location is unknown +}; + // scenery layer: content of a single scenery file (.scn, .scm, .ctr...) other than an .inc node template struct basic_layer { @@ -40,18 +76,51 @@ struct basic_layer bool locked{false}; // items of locked layer can't be selected in the editor bool binary{false}; // the file wasn't parsed, its content came from binary terrain file std::array(layer_item::count_)> items{}; // amount of items of each kind + // source data, used by the scenery save + std::vector sites; // include directives bringing the file in; empty for the scenario file + layer_context context_begin; // placement in effect at the start of the file... + layer_context context_end; // ...and right after its end + std::uintmax_t filesize{0}; // state of the file when it was loaded or saved the last time + std::filesystem::file_time_type filetime{}; + // pending changes, applied by the scenery save + bool created{false}; // layer was created in the editor, its file doesn't exist yet + bool editormade{false}; // the file was made by the editor during this session, there's no original content to keep a backup of + layer_handle anchor{null_handle}; // for created layer: sibling its include directive goes after + bool removed{false}; // layer is to be dropped from the scenery + layer_handle merged{null_handle}; // layer which took over the content of this one + bool dead{false}; // removal or merge of the layer was saved, it's no longer a part of the scenery std::size_t item_count() const; }; +// origin of a node defined in a scenery layer file, with the placement it was loaded with +struct node_source +{ + layer_handle layer{null_handle}; // layer of the file holding the node definition + source_span span; // location of the definition in that file + layer_context context; // placement in effect at the definition + glm::dvec3 location{0.0}; + glm::vec3 angles{0.f}; + glm::vec3 scale{1.f}; +}; + +struct save_result +{ + bool success{false}; + std::vector files; // names of saved files + std::string message; // summary, or cause of the failure +}; + // holds scenery layers, established during load of scenery opened for editing (-edit) // NOTE: regular load doesn't create any layers, all nodes are left with null_handle class node_layers { public: // methods - // indicates start of content of specified scenery file. returns: handle to the layer of the file + // indicates start of content of the scenario file. returns: handle to its layer layer_handle open(std::string const &Name); + // indicates start of content of specified scenery file, included by specified directive. returns: handle to the layer of the file + layer_handle open(std::string const &Name, include_site Site); // indicates end of content of the current scenery file. returns: handle to the parent layer, or null_handle if the stack is empty layer_handle close(); // returns layer of the scenery file being loaded, or null_handle if there's none @@ -82,32 +151,110 @@ class node_layers { return m_layers[Layer - 1]; } + // follows layer merges. returns: handle of the layer which currently holds content of specified layer + layer_handle resolve(layer_handle Layer) const; + // true if the layer is a part of the scenery and should be presented to the user + bool listed(layer_handle const Layer) const + { + return valid(Layer) && false == layer(Layer).dead && layer(Layer).merged == null_handle; + } // number of layers between specified layer and the scenario file int depth(layer_handle Layer) const; + // handles of the layers to present to the user, each followed by the layers it includes + std::vector tree() const; // adjusts item count of specified layer - void count(layer_handle const Layer, layer_item const Item, int const Change = 1); + void count(layer_handle Layer, layer_item const Item, int const Change = 1); // layer receiving the items created in the editor, or null_handle if there's none layer_handle active() const { return m_active; } // NOTE: active layer is made visible and unlocked - void active(layer_handle const Layer); + void active(layer_handle Layer); // shows or hides nodes of specified layer. visibility defined in the scenery is preserved, hidden layer only overrides it - void visible(layer_handle const Layer, bool const Visible); - void locked(layer_handle const Layer, bool const Locked); + void visible(layer_handle Layer, bool const Visible); + void locked(layer_handle Layer, bool const Locked); + // true if the file of specified layer can be rewritten with changed nodes. optionally explains why it can't + bool writable(layer_handle Layer, std::string *Reason = nullptr) const; // true if nodes of specified layer can be selected and modified in the editor - bool editable(layer_handle const Layer) const; + bool editable(layer_handle Layer) const; + // true if specified node can be selected and modified in the editor. optionally explains why it can't + bool editable(basic_node const *Node, std::string *Reason = nullptr) const; + // moves specified node to specified layer + void move(basic_node *Node, layer_handle Layer); // handles of layers which are currently hidden std::vector hidden() const; // restores visibility of all layers void show_all(); + // scenery load bookkeeping + // registers *.inc template used by the scenery + void template_used(std::string const &Name) + { + m_templates.emplace(Name); + } + std::set const &templates() const + { + return m_templates; + } + // updates placement in effect for the statements which follow + void context(layer_context const &Context) + { + m_context = Context; + } + // stores origin of a node defined directly in a layer file, to allow rewriting its definition on save + void track(basic_node const *Node, source_span const &Span, glm::vec3 const &Angles = glm::vec3{0.f}, glm::vec3 const &Scale = glm::vec3{1.f}); + // indicates specified node was removed from the scene + void forget(basic_node const *Node); + // notes the scenery already holds the directive setting up terrain made in the editor + void terrain_directive(bool const Present) + { + m_terraindirective = Present; + } + bool terrain_directive() const + { + return m_terraindirective; + } + + // layer management. changes are applied to the scenery files by save() + // creates empty layer, included from specified one. returns: handle to the new layer, or null_handle with the explanation in Reason + layer_handle create(std::string Name, layer_handle Parent, std::string &Reason); + bool can_remove(layer_handle Layer, std::string &Reason) const; + // marks specified layer and the layers it includes as dropped from the scenery. their files are left on the disk + bool remove(layer_handle Layer); + // takes back remove() which wasn't saved yet + void restore(layer_handle Layer); + bool can_merge(layer_handle Source, layer_handle Target, std::string &Reason) const; + // moves content of the source layer to the target layer + bool merge(layer_handle Source, layer_handle Target); + // true if there are layer changes awaiting save. NOTE: doesn't account for modified nodes + bool pending() const; + // true if specified layer is included, directly or not, by the other one + bool is_descendant(layer_handle Layer, layer_handle const Ancestor) const; + + // writes changes made in the editor to the scenery files: changed, created and deleted model instances and + // memory cells, and layer changes. the files are left intact unless the whole operation can be performed. + // Rootstatements: additional statements to place at the end of the scenario file + save_result save(std::vector const &Rootstatements = {}); + private: + // types + struct file_patch; + struct composition; + struct save_state; + // methods + std::string path(layer_handle const Layer) const; + void stat(layer_handle const Layer); + bool compose(save_state &State, layer_handle const Layer, composition &Output, int const Depth) const; // members std::vector m_layers; // layer handle is index in the vector + 1 std::vector m_stack; // helper, layers of scenery files being loaded layer_handle m_active{null_handle}; + layer_context m_context; // placement in effect at the current point of scenery load + std::unordered_map m_sources; // origins of nodes which can be rewritten on save + std::vector> m_erased; // definitions of nodes deleted since the load or the last save + std::set m_templates; // *.inc templates used by the scenery + bool m_terraindirective{false}; }; extern node_layers Layers; diff --git a/scene/scenelayerssave.cpp b/scene/scenelayerssave.cpp new file mode 100644 index 000000000..b76a9f2b7 --- /dev/null +++ b/scene/scenelayerssave.cpp @@ -0,0 +1,972 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "scene/scenelayers.h" + +#include "simulation/simulation.h" +#include "model/AnimModel.h" +#include "world/MemCell.h" +#include "utilities/Globals.h" +#include "utilities/Logs.h" +#include "utilities/utilities.h" + +#include +#include +#include + +// scenery save for sceneries opened for editing. +// the scenery files are patched rather than generated: text of a file is carried over as it is, except for the +// definitions of nodes changed in the editor and the include directives affected by layer changes. this keeps +// everything the editor doesn't understand or didn't touch, comments and formatting included. + +namespace scene +{ + +namespace +{ + +struct text_token +{ + std::size_t begin; + std::size_t end; + std::string text; // lower case +}; + +struct text_change +{ + std::size_t begin; + std::size_t end; + std::string text; +}; + +bool is_separator(char const Char) +{ + return Char == ' ' || Char == '\t' || Char == '\n' || Char == '\r' || Char == ';'; +} + +// splits scenery text into tokens the same way the scenery parser does: comments are skipped, quoted text is kept together +std::vector tokenize(std::string const &Text) +{ + std::vector tokens; + auto const size{Text.size()}; + std::size_t idx{0}; + auto const starts = [&](char const *Mark) { return Text.compare(idx, 2, Mark) == 0; }; + while (idx < size) + { + if (is_separator(Text[idx])) + { + ++idx; + continue; + } + if (starts("//")) + { + idx = Text.find('\n', idx); + idx = (idx == std::string::npos ? size : idx + 1); + continue; + } + if (starts("/*")) + { + idx = Text.find("*/", idx + 2); + idx = (idx == std::string::npos ? size : idx + 2); + continue; + } + auto const begin{idx}; + while (idx < size && false == is_separator(Text[idx]) && false == starts("//") && false == starts("/*")) + { + if (Text[idx] == '\"') + { + // quoted part runs up to the closing quote, whatever is inside + ++idx; + while (idx < size && Text[idx] != '\"') + { + idx += (Text[idx] == '\\' ? 2 : 1); + } + } + ++idx; + } + idx = std::min(idx, size); + tokens.push_back({begin, idx, ToLower(Text.substr(begin, idx - begin))}); + } + return tokens; +} + +std::string number(double const Value) +{ + std::ostringstream converter; + converter.imbue(std::locale::classic()); + converter << std::fixed << std::setprecision(3) << Value; + auto text{converter.str()}; + return text == "-0.000" ? "0.000" : text; +} + +std::string numbers(glm::dvec3 const &Values) +{ + return number(Values.x) + ' ' + number(Values.y) + ' ' + number(Values.z); +} + +void apply(std::string &Text, std::vector Changes) +{ + // from the end, so the locations of pending changes stay valid + std::sort(std::begin(Changes), std::end(Changes), [](text_change const &Left, text_change const &Right) { return Left.begin > Right.begin; }); + for (auto const &change : Changes) + { + Text.replace(change.begin, change.end - change.begin, change.text); + } +} + +// placement to write into definition of a model instance. empty parts are left as they are +struct model_placement +{ + std::optional location; // in the coordinates used by the definition + std::optional angles; // complete rotation of the instance + glm::vec3 rotation{0.f}; // rotation the loader adds to the angle specified in the definition + std::optional scale; // scale factor to put in the definition +}; + +bool about_equal(float const Left, float const Right) +{ + return std::abs(Left - Right) < 1e-3f; +} + +// definition layout: node model [options] endmodel +bool patch_model(std::string &Text, model_placement const &Placement, std::string &Error) +{ + auto const tokens{tokenize(Text)}; + if (tokens.size() < 12 || tokens[0].text != "node" || tokens[4].text != "model" || tokens.back().text != "endmodel") + { + Error = "unexpected layout of model definition"; + return false; + } + std::vector changes; + auto const replace = [&](std::size_t const Index, std::string const &Value) { changes.push_back({tokens[Index].begin, tokens[Index].end, Value}); }; + // optional blocks of three values, located past the texture + auto const last{tokens.size() - 1}; + auto const find_block = [&](char const *Keyword) { + for (std::size_t idx = 11; idx + 3 < last; ++idx) + { + if (tokens[idx].text == Keyword) + { + return idx; + } + } + return std::size_t{0}; + }; + std::string additions; // blocks to insert ahead of the closing keyword + + if (Placement.location) + { + replace(5, number(Placement.location->x)); + replace(6, number(Placement.location->y)); + replace(7, number(Placement.location->z)); + } + if (Placement.angles) + { + auto const &angles{*Placement.angles}; + auto const block{find_block("angles")}; + if (block != 0) + { + // the block specifies complete rotation of the instance, regardless of anything else + replace(block + 1, number(angles.x)); + replace(block + 2, number(angles.y)); + replace(block + 3, number(angles.z)); + } + else if (about_equal(angles.x, Placement.rotation.x) && about_equal(angles.z, Placement.rotation.z)) + { + // rotation around the vertical axis alone fits in the basic angle parameter + replace(8, number(angles.y - Placement.rotation.y)); + } + else + { + additions += "angles " + numbers(angles) + ' '; + } + } + if (Placement.scale) + { + auto const &scale{*Placement.scale}; + auto const unit{about_equal(scale.x, 1.f) && about_equal(scale.y, 1.f) && about_equal(scale.z, 1.f)}; + auto const block{find_block("scale")}; + if (block != 0) + { + if (unit) + { + // drop the block along with the whitespace separating it from the next token + changes.push_back({tokens[block].begin, tokens[block + 4].begin, ""}); + } + else + { + replace(block + 1, number(scale.x)); + replace(block + 2, number(scale.y)); + replace(block + 3, number(scale.z)); + } + } + else if (false == unit) + { + additions += "scale " + numbers(scale) + ' '; + } + } + if (false == additions.empty()) + { + changes.push_back({tokens[last].begin, tokens[last].begin, additions}); + } + apply(Text, changes); + return true; +} + +// definition layout: node memcell endmemcell +bool patch_memcell(std::string &Text, glm::dvec3 const &Location, std::string &Error) +{ + auto const tokens{tokenize(Text)}; + if (tokens.size() < 13 || tokens[0].text != "node" || tokens[4].text != "memcell" || tokens.back().text != "endmemcell") + { + Error = "unexpected layout of memory cell definition"; + return false; + } + apply(Text, {{tokens[5].begin, tokens[5].end, number(Location.x)}, {tokens[6].begin, tokens[6].end, number(Location.y)}, {tokens[7].begin, tokens[7].end, number(Location.z)}}); + return true; +} + +std::string detect_eol(std::string const &Text, std::string const &Fallback) +{ + auto const linebreak{Text.find('\n')}; + if (linebreak == std::string::npos) + { + return Fallback; + } + return (linebreak > 0 && Text[linebreak - 1] == '\r') ? "\r\n" : "\n"; +} + +void ensure_newline(std::string &Text, std::string const &Eol) +{ + if (false == Text.empty() && Text.back() != '\n') + { + Text += Eol; + } +} + +bool read_file(std::string const &Path, std::string &Content) +{ + std::ifstream input{Path, std::ios_base::binary}; + if (false == input.is_open()) + { + return false; + } + Content.assign(std::istreambuf_iterator(input), std::istreambuf_iterator()); + return true; +} + +} // namespace + +// changes to make in the text of a single scenery file +struct node_layers::file_patch +{ + struct edit + { + std::streamoff begin{0}; // replaced range of the original text. empty range inserts, negative location stands for the end of the text + std::streamoff end{0}; + std::string text; // replacement + std::size_t lead{0}; // size of the part of replacement preceding the definition it carries + std::size_t length{0}; // size of that definition + basic_node const *node{nullptr}; // node defined by the replacement + layer_handle site{null_handle}; // layer included by the directive in the replacement + layer_handle inlined{null_handle}; // layer whose content replaces the range + }; + std::vector edits; +}; + +// text of a scenery file after the changes, with the new locations of what it defines +struct node_layers::composition +{ + struct node_place + { + basic_node const *node; + source_span span; + bool rewritten; + }; + struct site_place + { + layer_handle layer; + source_span span; + }; + std::string text; + std::vector nodes; + std::vector sites; + + // adds another piece of text at the end + void append(composition const &Other) + { + auto const offset{static_cast(text.size())}; + text += Other.text; + for (auto place : Other.nodes) + { + place.span.begin += offset; + place.span.end += offset; + nodes.emplace_back(place); + } + for (auto place : Other.sites) + { + place.span.begin += offset; + place.span.end += offset; + sites.emplace_back(place); + } + } +}; + +struct node_layers::save_state +{ + std::map content; // original text of the files + std::map patches; + std::map> nodes; // unchanged nodes defined in each file + std::map> includes; // unchanged include directives in each file, by included layer + std::string eol{"\r\n"}; + std::string error; +}; + +// produces text of specified file with the changes applied +bool node_layers::compose(save_state &State, layer_handle const Layer, composition &Output, int const Depth) const +{ + if (Depth > 32) + { + State.error = "layers include each other in a loop"; + return false; + } + static std::string const empty; + auto const contentlookup{State.content.find(Layer)}; + auto const &base{contentlookup != State.content.end() ? contentlookup->second : empty}; + auto const basesize{static_cast(base.size())}; + auto const eol{detect_eol(base, State.eol)}; + + std::vector edits; + if (auto const lookup{State.patches.find(Layer)}; lookup != State.patches.end()) + { + edits = lookup->second.edits; + } + for (auto &edit : edits) + { + if (edit.begin < 0) + { + edit.begin = edit.end = basesize; + } + } + std::stable_sort(std::begin(edits), std::end(edits), [](file_patch::edit const &Left, file_patch::edit const &Right) { return Left.begin < Right.begin; }); + std::streamoff cursor{0}; + for (auto const &edit : edits) + { + if (edit.begin < cursor || edit.end < edit.begin || edit.end > basesize) + { + State.error = "conflicting changes in file \"" + layer(Layer).name + "\""; + return false; + } + cursor = edit.end; + } + + // locations in the original text past which everything is shifted by given amount + std::vector> shifts; + cursor = 0; + for (std::size_t idx = 0; idx < edits.size(); ++idx) + { + auto const &edit{edits[idx]}; + auto begin{edit.begin}; + auto end{edit.end}; + if (edit.text.empty() && edit.inlined == null_handle && end > begin) + { + // a definition is removed. if it had a line for itself take the whole line out, instead of leaving it blank + auto const limit{idx + 1 < edits.size() ? edits[idx + 1].begin : basesize}; + auto linebegin{begin}; + while (linebegin > cursor && (base[linebegin - 1] == ' ' || base[linebegin - 1] == '\t')) + { + --linebegin; + } + auto lineend{end}; + while (lineend < limit && (base[lineend] == ' ' || base[lineend] == '\t')) + { + ++lineend; + } + auto const startsline{linebegin == 0 || base[linebegin - 1] == '\n'}; + auto endsline{lineend == basesize}; + if (lineend + 1 < limit && base[lineend] == '\r' && base[lineend + 1] == '\n') + { + lineend += 2; + endsline = true; + } + else if (lineend < limit && base[lineend] == '\n') + { + lineend += 1; + endsline = true; + } + if (startsline && endsline) + { + begin = linebegin; + end = lineend; + } + } + Output.text.append(base, static_cast(cursor), static_cast(begin - cursor)); + if (edit.inlined != null_handle) + { + // content of the included file takes place of the include directive + composition included; + if (false == compose(State, edit.inlined, included, Depth + 1)) + { + return false; + } + if (end < basesize && (base[end] == '\r' || base[end] == '\n')) + { + // the line break which followed the directive ends the included text now, a second one would leave a blank line + if (false == included.text.empty() && included.text.back() == '\n') + { + included.text.pop_back(); + if (false == included.text.empty() && included.text.back() == '\r') + { + included.text.pop_back(); + } + } + } + else + { + ensure_newline(included.text, eol); + } + Output.append(included); + } + else + { + // the line break leading the replacement isn't needed if the text ahead happens to end with one + auto const lead{(Output.text.empty() || Output.text.back() == '\n') ? std::size_t{0} : edit.lead}; + auto const offset{static_cast(Output.text.size() + lead)}; + auto const span{source_span{offset, offset + static_cast(edit.length)}}; + if (edit.node != nullptr) + { + Output.nodes.push_back({edit.node, span, true}); + } + if (edit.site != null_handle) + { + Output.sites.push_back({edit.site, span}); + } + Output.text.append(edit.text, edit.lead - lead, std::string::npos); + } + cursor = end; + shifts.emplace_back(end, static_cast(Output.text.size()) - end); + } + Output.text.append(base, static_cast(cursor), std::string::npos); + + // what the changes didn't touch only moves along with the text around it + auto const shift = [&](source_span Span) { + auto const lookup{std::upper_bound(std::begin(shifts), std::end(shifts), Span.begin, + [](std::streamoff const Location, std::pair const &Shift) { return Location < Shift.first; })}; + auto const offset{lookup == std::begin(shifts) ? 0 : std::prev(lookup)->second}; + Span.begin += offset; + Span.end += offset; + return Span; + }; + if (auto const lookup{State.nodes.find(Layer)}; lookup != State.nodes.end()) + { + for (auto const *node : lookup->second) + { + Output.nodes.push_back({node, shift(m_sources.at(node).span), false}); + } + } + if (auto const lookup{State.includes.find(Layer)}; lookup != State.includes.end()) + { + for (auto const included : lookup->second) + { + Output.sites.push_back({included, shift(layer(included).sites.front().span)}); + } + } + return true; +} + +// writes changes made in the editor to the scenery files +save_result node_layers::save(std::vector const &Rootstatements) +{ + save_result result; + if (m_layers.empty()) + { + result.message = "The scenery wasn't opened for editing, there are no layers to save."; + return result; + } + auto const root{layer_handle{1}}; + save_state state; + auto const fail = [&](std::string const &Message) { + result.message = "Scenery not saved: " + Message; + ErrorLog(result.message); + return result; + }; + // loads text of specified layer file, if it wasn't loaded yet + auto const load = [&](layer_handle const Layer) { + if (layer(Layer).created || state.content.count(Layer) != 0) + { + return true; + } + std::error_code error; + auto const filepath{std::filesystem::path(path(Layer))}; + auto const filesize{std::filesystem::file_size(filepath, error)}; + auto const filetime{error ? std::filesystem::file_time_type{} : std::filesystem::last_write_time(filepath, error)}; + std::string content; + if (error || false == read_file(path(Layer), content)) + { + state.error = "can't read file \"" + layer(Layer).name + "\""; + return false; + } + if (filesize != layer(Layer).filesize || filetime != layer(Layer).filetime || content.size() != filesize) + { + // locations of the definitions are no longer valid + state.error = "file \"" + layer(Layer).name + "\" was changed outside of the editor since the scenery was loaded"; + return false; + } + state.content.emplace(Layer, std::move(content)); + return true; + }; + // a layer is saved if it's still a part of the scenery, as a file of its own + auto const is_output = [&](layer_handle const Layer) { return listed(Layer) && false == layer(Layer).removed && false == layer(Layer).binary; }; + + if (false == load(root)) + { + return fail(state.error); + } + state.eol = detect_eol(state.content[root], "\r\n"); + + // changed and deleted nodes + std::set rewritten; + std::map>> created; // new definitions, by target layer + auto const process = [&](basic_node const *Node, TAnimModel const *Model) { + auto const nodelayer{resolve(Node->layer())}; + if (false == is_output(nodelayer)) + { + return true; + } + auto const location{Node->location()}; + auto const angles{Model != nullptr ? Model->Angles() : glm::vec3{0.f}}; + auto const scale{Model != nullptr ? Model->Scale() : glm::vec3{1.f}}; + auto const lookup{m_sources.find(Node)}; + std::string error; + if (lookup != m_sources.end()) + { + // defined in a scenery file. rewrite the placement in its definition if it's no longer the one it was loaded with + auto const &source{lookup->second}; + if (false == writable(source.layer)) + { + // the editor doesn't let these be changed, as one definition stands for more than one node + return true; + } + auto const moved{glm::distance(location, source.location) > 1e-4}; + auto const rotated{false == glm::all(glm::epsilonEqual(angles, source.angles, 1e-3f))}; + auto const scaled{false == glm::all(glm::epsilonEqual(scale, source.scale, 1e-4f))}; + if (false == (moved || rotated || scaled)) + { + return true; + } + if (false == load(source.layer)) + { + return false; + } + auto const &content{state.content[source.layer]}; + if (source.span.end > static_cast(content.size())) + { + state.error = "definition of \"" + Node->name() + "\" is out of bounds of file \"" + layer(source.layer).name + "\""; + return false; + } + auto text{content.substr(static_cast(source.span.begin), static_cast(source.span.end - source.span.begin))}; + auto patched{false}; + if (Model != nullptr) + { + model_placement placement; + placement.rotation = source.context.rotation; + if (moved) + { + placement.location = source.context.to_local(location); + } + if (rotated) + { + placement.angles = angles; + } + if (scaled) + { + placement.scale = scale / source.context.scale; + } + patched = patch_model(text, placement, error); + } + else + { + patched = patch_memcell(text, source.context.to_local(location), error); + } + if (false == patched) + { + state.error = error + " of \"" + Node->name() + "\" in file \"" + layer(source.layer).name + "\""; + return false; + } + file_patch::edit edit; + edit.begin = source.span.begin; + edit.end = source.span.end; + edit.length = text.size(); + edit.text = std::move(text); + edit.node = Node; + state.patches[source.layer].edits.emplace_back(std::move(edit)); + rewritten.emplace(Node); + } + else if (Model != nullptr && false == Node->m_template) + { + // created in the editor. the definition is placed at the end of the layer file, with the placement in effect there + std::string text; + Node->export_as_text(text); + text.erase(text.find_last_not_of(" \t\r\n") + 1); + auto const &context{layer(nodelayer).context_end}; + if (false == context.matches(layer_context())) + { + model_placement placement; + placement.rotation = context.rotation; + placement.location = context.to_local(location); + placement.angles = angles; + placement.scale = scale / context.scale; + if (false == patch_model(text, placement, error)) + { + state.error = error + " of \"" + Node->name() + "\""; + return false; + } + } + created[nodelayer].emplace_back(Node, std::move(text)); + } + return true; + }; + for (auto const *instance : simulation::Instances.sequence()) + { + if (instance != nullptr && false == process(instance, instance)) + { + return fail(state.error); + } + } + for (auto const *memorycell : simulation::Memory.sequence()) + { + if (memorycell != nullptr && false == process(memorycell, nullptr)) + { + return fail(state.error); + } + } + for (auto const &erased : m_erased) + { + file_patch::edit edit; + edit.begin = erased.second.begin; + edit.end = erased.second.end; + state.patches[erased.first].edits.emplace_back(std::move(edit)); + } + + // layer changes + std::map> appended; // merged layers placed at the end of their target + std::set absorbed; // merged layers which cease to exist as files + std::set detached; // layers whose include directives are replaced + for (std::size_t idx = 0; idx < m_layers.size(); ++idx) + { + auto const candidate{static_cast(idx + 1)}; + auto const &source{layer(candidate)}; + if (source.dead) + { + continue; + } + auto const hassite{false == source.created && source.sites.size() == 1 && false == source.sites.front().fixed && source.sites.front().span.valid()}; + if (source.merged != null_handle) + { + auto const target{resolve(candidate)}; + absorbed.emplace(candidate); + if (hassite) + { + file_patch::edit edit; + edit.begin = source.sites.front().span.begin; + edit.end = source.sites.front().span.end; + if (resolve(source.sites.front().parent) == target) + { + edit.inlined = candidate; + } + else + { + appended[target].emplace_back(candidate); + } + state.patches[source.sites.front().parent].edits.emplace_back(std::move(edit)); + detached.emplace(candidate); + } + else + { + appended[target].emplace_back(candidate); + } + } + else if (source.removed) + { + if (hassite) + { + file_patch::edit edit; + edit.begin = source.sites.front().span.begin; + edit.end = source.sites.front().span.end; + state.patches[source.sites.front().parent].edits.emplace_back(std::move(edit)); + detached.emplace(candidate); + } + } + else if (source.created) + { + // include directive for the new file, on a line of its own + auto const parent{source.parent}; + auto const directive{"include " + source.name + " end"}; + file_patch::edit edit; + edit.site = candidate; + edit.length = directive.size(); + if (valid(source.anchor) && layer(source.anchor).sites.size() == 1 && layer(source.anchor).sites.front().parent == parent && layer(source.anchor).sites.front().span.valid()) + { + edit.begin = edit.end = layer(source.anchor).sites.front().span.end; + edit.text = state.eol + directive; + edit.lead = state.eol.size(); + } + else + { + edit.begin = edit.end = -1; + if (false == layer(parent).created) + { + if (false == load(parent)) + { + return fail(state.error); + } + auto const &content{state.content[parent]}; + if (false == content.empty() && content.back() != '\n') + { + edit.text = state.eol; + edit.lead = state.eol.size(); + } + } + edit.text += directive + state.eol; + } + state.patches[parent].edits.emplace_back(std::move(edit)); + } + } + + // files to write + std::vector outputs; + for (std::size_t idx = 0; idx < m_layers.size(); ++idx) + { + auto const candidate{static_cast(idx + 1)}; + if (false == is_output(candidate)) + { + continue; + } + if (layer(candidate).created || state.patches.count(candidate) != 0 || appended.count(candidate) != 0 || created.count(candidate) != 0 || + (candidate == root && false == Rootstatements.empty())) + { + outputs.emplace_back(candidate); + } + } + // text of the merged layers travels with the file they end up in, but changes made to it are still theirs + std::vector composed{outputs}; + composed.insert(std::end(composed), std::begin(absorbed), std::end(absorbed)); + for (auto const candidate : composed) + { + if (false == load(candidate)) + { + return fail(state.error); + } + } + // what is defined in these files and isn't rewritten moves along with the text + for (auto const &source : m_sources) + { + if (state.content.count(source.second.layer) != 0 && rewritten.count(source.first) == 0) + { + state.nodes[source.second.layer].emplace_back(source.first); + } + } + for (std::size_t idx = 0; idx < m_layers.size(); ++idx) + { + auto const candidate{static_cast(idx + 1)}; + auto const &included{layer(candidate)}; + if (included.dead || included.created || detached.count(candidate) != 0 || included.sites.size() != 1 || included.sites.front().fixed || false == included.sites.front().span.valid()) + { + continue; + } + state.includes[included.sites.front().parent].emplace_back(candidate); + } + + std::map texts; + for (auto const output : outputs) + { + auto &text{texts[output]}; + auto const eol{detect_eol(state.content.count(output) != 0 ? state.content[output] : std::string{}, state.eol)}; + if (layer(output).created) + { + // NOTE: the parser treats an empty file as a missing one + text.text = "// scenery layer created in the editor" + eol; + } + composition body; + if (false == compose(state, output, body, 0)) + { + return fail(state.error); + } + text.append(body); + if (auto const lookup{appended.find(output)}; lookup != appended.end()) + { + for (auto const merged : lookup->second) + { + composition mergedtext; + if (false == compose(state, merged, mergedtext, 0)) + { + return fail(state.error); + } + ensure_newline(text.text, eol); + text.append(mergedtext); + } + } + if (auto const lookup{created.find(output)}; lookup != created.end()) + { + for (auto const &definition : lookup->second) + { + ensure_newline(text.text, eol); + auto const offset{static_cast(text.text.size())}; + text.nodes.push_back({definition.first, {offset, offset + static_cast(definition.second.size())}, true}); + text.text += definition.second + eol; + } + } + if (output == root) + { + for (auto const &statement : Rootstatements) + { + ensure_newline(text.text, eol); + text.text += statement + eol; + } + } + } + + // with everything worked out it's safe to touch the files. new content goes to temporary files first, + // so a failure half way through doesn't leave the scenery with only a part of the changes + std::error_code error; + std::vector written; + for (auto const output : outputs) + { + auto const lookup{state.content.find(output)}; + if (lookup != state.content.end() && lookup->second == texts[output].text) + { + continue; + } + auto const filepath{std::filesystem::path(path(output))}; + if (filepath.has_parent_path()) + { + std::filesystem::create_directories(filepath.parent_path(), error); + } + std::ofstream file{path(output) + ".tmp", std::ios_base::binary | std::ios_base::trunc}; + file << texts[output].text; + file.close(); + if (file.fail()) + { + for (auto const leftover : written) + { + std::filesystem::remove(path(leftover) + ".tmp", error); + } + std::filesystem::remove(path(output) + ".tmp", error); + return fail("can't write file \"" + layer(output).name + "\""); + } + written.emplace_back(output); + } + for (auto const output : written) + { + auto const filepath{path(output)}; + // the first save of a file leaves its original content next to it + if (false == layer(output).editormade && std::filesystem::exists(filepath, error) && false == std::filesystem::exists(filepath + ".bak", error)) + { + std::filesystem::copy_file(filepath, filepath + ".bak", error); + } + std::filesystem::rename(filepath + ".tmp", filepath, error); + if (error) + { + return fail("can't replace file \"" + layer(output).name + "\": " + error.message()); + } + result.files.emplace_back(layer(output).name); + WriteLog("Scenery save: file \"" + layer(output).name + "\" updated"); + } + + // the scenery files now match the scene, update the bookkeeping to reflect it + auto removedterrain{false}; + for (auto const output : outputs) + { + for (auto const &place : texts[output].nodes) + { + auto &source{m_sources[place.node]}; + auto const isnew{source.layer == null_handle}; + source.layer = output; + source.span = place.span; + if (isnew) + { + source.context = layer(output).context_end; + } + if (isnew || place.rewritten) + { + auto const *model{dynamic_cast(place.node)}; + source.location = place.node->location(); + source.angles = (model != nullptr ? model->Angles() : glm::vec3{0.f}); + source.scale = (model != nullptr ? model->Scale() : glm::vec3{1.f}); + } + } + for (auto const &place : texts[output].sites) + { + auto &included{layer(place.layer)}; + if (included.sites.empty()) + { + // directive of a layer created in the editor + included.sites.emplace_back(); + } + included.sites.front().parent = output; + included.sites.front().span = place.span; + included.parent = output; + } + } + for (std::size_t idx = 0; idx < m_layers.size(); ++idx) + { + auto const candidate{static_cast(idx + 1)}; + auto &saved{layer(candidate)}; + if (saved.dead) + { + continue; + } + if (saved.merged != null_handle || saved.removed) + { + removedterrain |= saved.removed && (saved.items[static_cast(layer_item::shape)] + saved.items[static_cast(layer_item::lines)] > 0); + saved.dead = true; + saved.sites.clear(); + } + saved.created = false; + saved.anchor = null_handle; + } + for (auto const output : written) + { + stat(output); + } + m_erased.clear(); + if (removedterrain) + { + // binary terrain file still holds geometry of the dropped layer, have it rebuilt on the next load + auto terrainfile{layer(root).name}; + while (false == terrainfile.empty() && terrainfile.front() == '$') + { + terrainfile.erase(0, 1); + } + erase_extension(terrainfile); + if (std::filesystem::remove(Global.asCurrentSceneryPath + terrainfile + ".sbt", error)) + { + WriteLog("Scenery save: binary terrain file removed, it'll be generated again on the next load"); + } + } + + result.success = true; + if (result.files.empty()) + { + result.message = "No changes to save."; + } + else + { + result.message = "Saved: "; + for (auto const &file : result.files) + { + result.message += file + (&file != &result.files.back() ? ", " : ""); + } + } + return result; +} + +} // namespace scene + +//--------------------------------------------------------------------------- diff --git a/scene/scenenode.cpp b/scene/scenenode.cpp index 41b035bd1..788d07178 100644 --- a/scene/scenenode.cpp +++ b/scene/scenenode.cpp @@ -718,6 +718,7 @@ memory_node::deserialize( cParser &Input, node_data const &Nodedata ) { basic_node::basic_node( scene::node_data const &Nodedata ) : m_name( Nodedata.name ), + m_template( Nodedata.is_template ), m_layer( Nodedata.layer ) { uuid = UID::random(); diff --git a/scene/scenenode.h b/scene/scenenode.h index 533ed41ad..549eb0b48 100644 --- a/scene/scenenode.h +++ b/scene/scenenode.h @@ -71,6 +71,7 @@ struct node_data { std::string name; std::string type; layer_handle layer { null_handle }; // scenery layer the node is defined in, if any + bool is_template { false }; // the node is defined by an *.inc template rather than directly by a scenery layer file }; // holds unique piece of geometry, covered with single material @@ -381,6 +382,7 @@ public: std::string m_name; bool m_dirty { false }; bool m_layerhidden { false }; // the node was visible until its scenery layer was hidden + bool m_template { false }; // the node is defined by an *.inc template, which the editor can't rewrite. set only for scenery opened for editing scene::layer_handle m_layer { null_handle }; // scenery layer this node belongs to, if any UID uuid; diff --git a/simulation/simulation.cpp b/simulation/simulation.cpp index e10b08432..ed381572c 100644 --- a/simulation/simulation.cpp +++ b/simulation/simulation.cpp @@ -495,6 +495,7 @@ TEventLauncher * state_manager::create_eventlauncher(const std::string &src, con void state_manager::delete_model(TAnimModel *model) { scene::Layers.count(model->layer(), scene::layer_item::model, -1); + scene::Layers.forget(model); Region->erase(model); Instances.purge(model); } diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index f7429b1df..d1d449639 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -437,8 +437,11 @@ void state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad ) { auto const inputline = Input.Line(); // cache in case we need to report error + auto const sourcebegin = Input.TokenBegin(); // location of the node definition, for scenery opened for editing scene::node_data nodedata; + nodedata.layer = scene::Layers.handle(); + nodedata.is_template = ( nodedata.layer != null_handle ) && ( false == Input.InLayerFile() ); // common data and node type indicator Input.getTokens( 4 ); Input @@ -447,7 +450,6 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch >> nodedata.name >> nodedata.type; if( nodedata.name == "none" ) { nodedata.name.clear(); } - nodedata.layer = scene::Layers.handle(); // type-based deserialization. not elegant but it'll do if( nodedata.type == "dynamic" ) { @@ -571,6 +573,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch } scene::Groups.insert( scene::Groups.handle(), instance ); simulation::Region->insert( instance ); + scene::Layers.track( instance, { sourcebegin, Input.TokenEnd() }, instance->Angles(), instance->Scale() ); scene::basic_node *hierarchy_node = instance; if (hierarchy_node) { scene::Hierarchy[hierarchy_node->uuid.to_string()] = hierarchy_node; @@ -626,6 +629,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch } scene::Groups.insert( scene::Groups.handle(), memorycell ); simulation::Region->insert( memorycell ); + scene::Layers.track( memorycell, { sourcebegin, Input.TokenEnd() } ); } else if( nodedata.type == "eventlauncher" ) { @@ -685,6 +689,22 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch } } +namespace { + +// passes the placement in effect to the layer bookkeeping of scenery opened for editing +void +sync_layer_context( scene::scratch_data const &Scratchpad ) { + + if( true == scene::Layers.empty() ) { return; } + + scene::Layers.context( { + ( Scratchpad.location.offset.empty() ? glm::dvec3{ 0.0 } : Scratchpad.location.offset.top() ), + Scratchpad.location.rotation, + ( Scratchpad.location.scale.empty() ? glm::vec3{ 1.f } : Scratchpad.location.scale.top() ) } ); +} + +} // namespace + void state_serializer::deserialize_origin( cParser &Input, scene::scratch_data &Scratchpad ) { @@ -700,6 +720,7 @@ state_serializer::deserialize_origin( cParser &Input, scene::scratch_data &Scrat Scratchpad.location.offset.empty() ? glm::dvec3() : Scratchpad.location.offset.top() ) ); + sync_layer_context( Scratchpad ); } void @@ -711,6 +732,7 @@ state_serializer::deserialize_endorigin( cParser &Input, scene::scratch_data &Sc else { ErrorLog( "Bad origin: endorigin instruction with empty origin stack in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() - 1 ) + ")" ); } + sync_layer_context( Scratchpad ); } void @@ -734,6 +756,7 @@ state_serializer::deserialize_scale( cParser &Input, scene::scratch_data &Scratc // scales compose component-wise, mirroring how origin offsets compose additively. glm::vec3 const parent = Scratchpad.location.scale.empty() ? glm::vec3(1.0f) : Scratchpad.location.scale.top(); Scratchpad.location.scale.emplace( factor * parent ); + sync_layer_context( Scratchpad ); } void @@ -745,6 +768,7 @@ state_serializer::deserialize_endscale( cParser &Input, scene::scratch_data &Scr else { ErrorLog( "Bad scale: endscale instruction with empty scale stack in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() - 1 ) + ")" ); } + sync_layer_context( Scratchpad ); } void @@ -755,6 +779,7 @@ state_serializer::deserialize_rotate( cParser &Input, scene::scratch_data &Scrat >> Scratchpad.location.rotation.x >> Scratchpad.location.rotation.y >> Scratchpad.location.rotation.z; + sync_layer_context( Scratchpad ); } void @@ -860,6 +885,7 @@ state_serializer::deserialize_editorterrain(cParser &Input, scene::scratch_data Input.getTokens(4); Input >> folder >> cells >> cellsize >> radius; skip_until(Input, "endeditorterrain"); + scene::Layers.terrain_directive(true); if (!folder.empty() && cells > 0 && cellsize > 0.0f) { diff --git a/utilities/parser.cpp b/utilities/parser.cpp index 4219765c6..36592d96b 100644 --- a/utilities/parser.cpp +++ b/utilities/parser.cpp @@ -237,11 +237,13 @@ std::string cParser::readTokenFromStream(bool ToLower, const char *Break) const auto breakTable = makeBreakTable(Break); char c = 0; + bool separated = false; // the token was ended by a separator, which isn't a part of it while (token.empty() && mStream->peek() != EOF) { while (mStream->peek() != EOF) { // idk why but with mStream->get(c) not all cars are loaded c = static_cast(mStream->get()); + ++mPosition; if (c == '\n') { ++mLine; } @@ -249,11 +251,16 @@ std::string cParser::readTokenFromStream(bool ToLower, const char *Break) const unsigned char uc = static_cast(c); if (breakTable[uc]) { // separator ends token (or continues skipping if token empty) - if (!token.empty()) + if (!token.empty()) { + separated = true; break; + } continue; } + if (token.empty()) { + mTokenBegin = mPosition - 1; + } if (ToLower) c = toLowerChar(c); token.push_back(c); @@ -265,6 +272,8 @@ std::string cParser::readTokenFromStream(bool ToLower, const char *Break) } } } + // NOTE: comment glued to the end of a token is counted as a part of it + mTokenEnd = separated ? mPosition - 1 : mPosition; return token; } @@ -275,6 +284,7 @@ void cParser::stripFirstTokenBOM(std::string& token, bool ToLower, const char* B if (startsWithBOM(token)) { token.erase(0, 3); + mTokenBegin += 3; } // if first "token" was standalone BOM, read the next real token (avoid recursion) @@ -345,7 +355,7 @@ void cParser::startIncludeFromParser(cParser& srcParser, bool ToLower, std::stri if (sceneryLayers) { // the file is still a part of the scenery, even though its content comes from the binary terrain file - scene::Layers.layer(scene::Layers.open(includefile)).binary = true; + scene::Layers.layer(scene::Layers.open(includefile, include_site())).binary = true; scene::Layers.close(); } return; @@ -373,17 +383,37 @@ void cParser::startIncludeFromParser(cParser& srcParser, bool ToLower, std::stri mIncludeParser->sceneryLayers = true; // content of an included scenery file forms a layer of its own. *.inc files are node templates // reused all over the scenery, so their content stays in the layer of the file which includes them - if (false == mIncludeParser->mIncFile && mIncludeParser->mSize > 0) + if (mIncludeParser->mIncFile) { - scene::Layers.open(includefile); + scene::Layers.template_used(includefile); + } + else if (mIncludeParser->mSize > 0) + { + auto site{include_site()}; + site.parameters = false == mIncludeParser->parameters.empty(); + scene::Layers.open(includefile, site); mIncludeParser->mLayerFile = true; } } } +// describes the include directive being processed, for the scenery layer bookkeeping +scene::include_site cParser::include_site() const +{ + scene::include_site site; + // the directive can be rewritten on scenery save only if we know where it is, and it sits in a layer file + site.fixed = mIncludeBegin < 0 || mFile.empty() || mIncFile; + if (false == site.fixed) + { + site.span = {mIncludeBegin, mTokenEnd}; + } + return site; +} + bool cParser::handleIncludeIfPresent(std::string& token, bool ToLower, const char* Break) { // token-mode include: token == "include" if (expandIncludes && token == "include") { + mIncludeBegin = mTokenBegin; std::string includefile; if (allowRandomIncludes) includefile = deserialize_random_set(*this); @@ -399,6 +429,7 @@ bool cParser::handleIncludeIfPresent(std::string& token, bool ToLower, const cha // line-mode HACK: Break == "\n\r" and line begins with "include" if (std::strcmp(Break, "\n\r") == 0 && token.compare(0, 7, "include") == 0) { + mIncludeBegin = -1; // the directive is parsed out of a line of text, its exact location isn't known cParser includeparser(token.substr(7)); std::string includefile; if (allowRandomIncludes) @@ -459,6 +490,7 @@ std::string cParser::readQuotes(char const Quote) bool escaped = false; while (mStream->get(c)) { // get all chars until the quote mark + ++mPosition; if (escaped) { escaped = false; @@ -489,6 +521,7 @@ void cParser::skipComment(std::string const &Endmark) auto const endmarksize = Endmark.size(); while (mStream->get(c)) { + ++mPosition; if (c == '\n') { // update line counter @@ -626,3 +659,18 @@ int cParser::LineMain() const { return mIncludeParser ? -1 : mLine; } + +std::streamoff cParser::TokenBegin() const +{ + return mIncludeParser ? mIncludeParser->TokenBegin() : mTokenBegin; +} + +std::streamoff cParser::TokenEnd() const +{ + return mIncludeParser ? mIncludeParser->TokenEnd() : mTokenEnd; +} + +bool cParser::InLayerFile() const +{ + return mIncludeParser ? mIncludeParser->InLayerFile() : (false == mFile.empty() && false == mIncFile); +} diff --git a/utilities/parser.h b/utilities/parser.h index 1a8065820..c64ed1313 100644 --- a/utilities/parser.h +++ b/utilities/parser.h @@ -15,6 +15,11 @@ http://mozilla.org/MPL/2.0/. #include #include +namespace scene +{ +struct include_site; +} + ///////////////////////////////////////////////////////////////////////////////////////////////////// // cParser -- generic class for parsing text data, either from file or provided string @@ -94,6 +99,11 @@ class cParser //: public std::stringstream std::size_t Line() const; // returns number of currently processed line in main file, -1 if inside include int LineMain() const; + // location of the most recently read token in its source file, as byte offsets + std::streamoff TokenBegin() const; + std::streamoff TokenEnd() const; + // true if the most recently read token came straight from a scenery file which isn't an *.inc node template + bool InLayerFile() const; bool expandIncludes = true; bool allowRandomIncludes = false; bool skipComments = true; @@ -101,6 +111,7 @@ class cParser //: public std::stringstream private: void startIncludeFromParser(cParser &srcParser, bool ToLower, std::string includefile); + scene::include_site include_site() const; bool handleIncludeIfPresent(std::string &token, bool ToLower, const char *Break); // methods: void readToken(std::string& out, bool ToLower = true, const char *Break = "\n\r\t ;"); @@ -120,6 +131,10 @@ class cParser //: public std::stringstream std::size_t mLine { 0 }; // currently processed line bool mIncFile { false }; // the parser is processing an *.inc file bool mLayerFile { false }; // the parser is processing a file registered as scenery layer + std::streamoff mPosition { 0 }; // amount of bytes read from the stream so far + std::streamoff mTokenBegin { 0 }; // location of the most recently read token + std::streamoff mTokenEnd { 0 }; + std::streamoff mIncludeBegin { -1 }; // location of the include directive being processed, -1 if unknown bool mFirstToken { true }; // processing first token in the current file; helper used when checking for utf bom typedef std::map commentmap; commentmap mComments { From a612b0c96c919a0aa5b75332b592ff7901d70a84 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Fri, 2 Oct 2026 22:54:19 +0200 Subject: [PATCH 038/430] fix(editor): release the scenario file after load, undo a failed save --- application/scenarioloadermode.cpp | 3 +++ editor/editorIncludeInfo.cpp | 1 + scene/scenelayerssave.cpp | 30 ++++++++++++++++++++++++++++-- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/application/scenarioloadermode.cpp b/application/scenarioloadermode.cpp index f05c3869b..a2293fe5f 100644 --- a/application/scenarioloadermode.cpp +++ b/application/scenarioloadermode.cpp @@ -55,6 +55,9 @@ bool scenarioloader_mode::update() { ErrorLog( "Bad init: scenario loading failed" ); Application.pop_mode(); } + // the loading state holds the scenario file open, which on some systems keeps the file from being replaced + // when the scenery is saved in the editor. it'd also get in the way of another load + state.reset(); WriteLog( "Scenario loading time: " + std::to_string( std::chrono::duration_cast( std::chrono::system_clock::now() - timestart ).count() ) + " seconds" ); // TODO: implement and use next mode cue diff --git a/editor/editorIncludeInfo.cpp b/editor/editorIncludeInfo.cpp index f9f09920e..720bab29d 100644 --- a/editor/editorIncludeInfo.cpp +++ b/editor/editorIncludeInfo.cpp @@ -418,6 +418,7 @@ bool save(std::string const &File, include_info const &Info, std::string &Error) if (error) { Error = "can't replace file \"" + File + "\": " + error.message(); + std::filesystem::remove(filepath + ".tmp", error); return false; } return true; diff --git a/scene/scenelayerssave.cpp b/scene/scenelayerssave.cpp index b76a9f2b7..b42c72865 100644 --- a/scene/scenelayerssave.cpp +++ b/scene/scenelayerssave.cpp @@ -862,6 +862,7 @@ save_result node_layers::save(std::vector const &Rootstatements) } written.emplace_back(output); } + std::vector replaced; for (auto const output : written) { auto const filepath{path(output)}; @@ -873,10 +874,35 @@ save_result node_layers::save(std::vector const &Rootstatements) std::filesystem::rename(filepath + ".tmp", filepath, error); if (error) { - return fail("can't replace file \"" + layer(output).name + "\": " + error.message()); + // e.g. the file is held open by another program. take back what was done so far: the scenery files + // have to stay in step with each other, and with what we know about them + auto const cause{error.message()}; + for (auto const restored : replaced) + { + auto const lookup{state.content.find(restored)}; + if (lookup != state.content.end()) + { + std::ofstream{path(restored), std::ios_base::binary | std::ios_base::trunc} << lookup->second; + stat(restored); + } + else + { + std::filesystem::remove(path(restored), error); + } + } + for (auto const leftover : written) + { + std::filesystem::remove(path(leftover) + ".tmp", error); + } + result.files.clear(); + return fail("can't replace file \"" + layer(output).name + "\": " + cause); } + replaced.emplace_back(output); result.files.emplace_back(layer(output).name); - WriteLog("Scenery save: file \"" + layer(output).name + "\" updated"); + } + for (auto const &file : result.files) + { + WriteLog("Scenery save: file \"" + file + "\" updated"); } // the scenery files now match the scene, update the bookkeeping to reflect it From 968594c3e927bf042596319867c4d6e8b2ab0e00 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Fri, 2 Oct 2026 23:57:35 +0200 Subject: [PATCH 039/430] feat(editor): include database, placing .inc templates from the node bank --- application/editormode.cpp | 143 ++++++++- application/editormode.h | 6 + application/editoruilayer.cpp | 2 +- application/editoruilayer.h | 2 +- application/editoruipanels.cpp | 367 ++++++++++++++++------- application/editoruipanels.h | 17 +- editor/editorIncludeInfo.cpp | 283 ++++++++++++++--- editor/editorIncludeInfo.hpp | 66 ++++ scene/scenelayers.cpp | 130 +++++++- scene/scenelayers.h | 50 +++ scene/scenelayerssave.cpp | 90 +++++- scene/scenenode.cpp | 4 +- scene/scenenode.h | 11 +- simulation/simulation.cpp | 4 + simulation/simulation.h | 3 + simulation/simulationstateserializer.cpp | 77 ++++- simulation/simulationstateserializer.h | 5 + utilities/Classes.h | 1 + utilities/parser.cpp | 12 + utilities/parser.h | 1 + 20 files changed, 1106 insertions(+), 168 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 9cc938dda..86b51e975 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -14,6 +14,7 @@ http://mozilla.org/MPL/2.0/. #include "application/application.h" #include "editor/editorSettings.hpp" #include "editor/editorModelSets.hpp" +#include "editor/editorIncludeInfo.hpp" #include "utilities/Globals.h" #include "simulation/simulation.h" #include "simulation/simulationtime.h" @@ -530,7 +531,7 @@ void editor_mode::handle_brush_mouse_hold(int Action, int Button) // picked only when a placement is due, so a random pick from a set isn't drawn every tick const std::string *src = ui()->get_active_node_template(); - if (!src) + if (!src || src->starts_with(editor_includes::directive_mark)) // scenery templates are placed one at a time return; std::string name = "editor_"; @@ -672,6 +673,15 @@ void editor_mode::undo_last() EditorSnapshot snap = m_history.back(); m_history.pop_back(); + if (snap.instance != 0) + { + // include of a scenery template was placed or removed; either is taken back by flipping its removal + toggle_include(snap.instance); + g_redo.push_back(std::move(snap)); + m_instance = 0; + return; + } + if (snap.action == EditorSnapshot::Action::Delete) { // undo delete -> recreate model @@ -754,6 +764,14 @@ void editor_mode::redo_last() EditorSnapshot snap = g_redo.back(); g_redo.pop_back(); + if (snap.instance != 0) + { + toggle_include(snap.instance); + m_history.push_back(std::move(snap)); + m_instance = 0; + return; + } + // handle delete redo (re-delete) separately if (snap.action == EditorSnapshot::Action::Delete) { @@ -906,6 +924,10 @@ bool editor_mode::update() m_dragging = false; ui()->set_node(nullptr); } + if (m_instance != 0 && false == scene::Layers.removable(m_instance)) + { + m_instance = 0; + } simulation::Region->update_sounds(); audio::renderer.update(Global.iPause ? 0.0 : deltarealtime); @@ -1578,6 +1600,82 @@ void editor_mode::save() WriteLog("Editor: " + result.message, logtype::generic); } +void editor_mode::toggle_include(scene::instance_handle const Instance) +{ + if (false == scene::Layers.tracked(Instance)) + return; + auto const &included = scene::Layers.instance(Instance); + if (included.dead) + { + // its directive is gone from the scenery file, and the place it was at with it + ui()->set_status("Include of \"" + *included.file + "\" was removed from the saved scenery, this can't be taken back.", true); + return; + } + scene::Layers.removed(Instance, false == included.removed); + ui()->set_status("Include of \"" + *included.file + "\" " + (included.removed ? "removed." : "restored.")); +} + +void editor_mode::place_include(std::string const &File, int const RotationMode, float const FixedRotation) +{ + if (scene::Layers.empty()) + { + // the directive has to go to a scenery file, and without the sources tracked there's no telling which + ui()->set_status("Scenery templates can be placed only in a scenery opened for editing (-edit).", true); + WriteLog("Editor: scenery templates can be placed only in a scenery opened for editing (-edit)", logtype::generic); + return; + } + include_info info; + std::string issue; + auto const parameters = editor_includes::parameter_count(File); + if (false == editor_includes::load(File, info, issue) || false == editor_includes::complete(info, parameters, &issue)) + { + ui()->set_status("Template \"" + File + "\" can't be placed: " + issue, true); + return; + } + + // the directive is written at the end of the file of the active layer, and has to make sense with the placement in effect there + auto const layer = scene::Layers.resolve(scene::Layers.active()); + if (std::string reason; false == scene::Layers.valid(layer) || scene::Layers.layer(layer).removed || false == scene::Layers.writable(layer, &reason)) + { + ui()->set_status("Template \"" + File + "\" can't be placed: " + (reason.empty() ? "there's no active layer to put it in" : "the active layer can't be saved, " + reason), true); + return; + } + auto const context = scene::Layers.layer(layer).context_end; + if (context.rotation != glm::vec3{0.f} || context.scale != glm::vec3{1.f}) + { + // a template can pass its parameters to an origin directive, which isn't affected by these, or straight to + // the nodes, which are. there's no single set of parameter values which puts both at the cursor + ui()->set_status("Template \"" + File + "\" can't be placed: the file of the active layer ends with a rotation or a scale in effect. Pick another layer.", true); + return; + } + glm::dvec3 const location = Camera.Pos + clamp_mouse_offset_to_max(GfxRenderer->Mouse_Position()); + std::optional yaw; + if (RotationMode == functions_panel::RANDOM) + yaw = static_cast(LocalRandom(0.0, 360.0)); + else if (RotationMode == functions_panel::FIXED) + yaw = FixedRotation; + + auto const directive = editor_includes::directive(File, info, parameters, context.to_local(location), yaw); + auto const instance = scene::Layers.place(layer, File, directive); + if (instance == 0) + { + ui()->set_status("Template \"" + File + "\" can't be placed in the active layer.", true); + return; + } + // show the models of the template right away. the rest of it comes into play when the saved scenery is loaded + auto const preview = simulation::State.preview_include(directive, context, layer, instance); + + EditorSnapshot snap; + snap.instance = instance; + snap.node_name = File; + m_history.push_back(std::move(snap)); + g_redo.clear(); + + ui()->set_status( + "\"" + info.name + "\" placed in layer \"" + scene::Layers.layer(layer).name + "\": " + std::to_string(preview.first) + " model(s) shown" + + (preview.second > 0 ? ", " + std::to_string(preview.second) + " other statement(s) of the template take effect once the scenery is saved and loaded again." : ".")); +} + void editor_mode::export_scenery() { // hiding a layer clears the visibility flag of its nodes, and the flag is a part of exported node data. @@ -2196,6 +2294,7 @@ void editor_mode::exit() // drop selection so a stale/dangling node pointer isn't used on the next editor session m_node = nullptr; + m_instance = 0; m_gizmo_using = false; ui()->set_node(nullptr); @@ -2291,6 +2390,19 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in break; case GLFW_KEY_DELETE: + if (is_press(Action) && m_instance != 0) + { + // include of a scenery template. what it shows goes out of sight, the directive is erased on save + scene::Layers.removed(m_instance, true); + EditorSnapshot snap; + snap.instance = m_instance; + snap.node_name = *scene::Layers.instance(m_instance).file; + m_history.push_back(std::move(snap)); + g_redo.clear(); + ui()->set_status("Include of \"" + *scene::Layers.instance(m_instance).file + "\" removed, Ctrl+Z brings it back. Its directive is erased when the scenery is saved."); + m_instance = 0; + break; + } if (is_press(Action)) { TAnimModel *model = dynamic_cast(m_node); @@ -2414,13 +2526,25 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const return; m_node = nullptr; + m_instance = 0; - // in a scenery opened for editing some nodes are off limits: the ones in locked layers, - // and the ones whose definitions can't be rewritten on save - if (std::string reason; node && false == scene::Layers.editable(node, &reason)) + // in a scenery opened for editing selection has its limits. nodes of locked layers are off limits. + // nodes defined by a scenery template can't be rewritten one by one on save, so a click on one + // selects the include of the template as a whole + if (node && mode == nodebank_panel::MODIFY) { - ui()->set_status("\"" + (node->name().empty() ? std::string{"(unnamed node)"} : node->name()) + "\" can't be edited: " + reason, true); - node = nullptr; + std::string reason; + if (node->from_template() && scene::Layers.removable(node->m_instance, &reason)) + { + m_instance = node->m_instance; + ui()->set_status("Include of \"" + *scene::Layers.instance(m_instance).file + "\" selected. Del removes it from the scenery."); + node = nullptr; + } + else if (node->from_template() || false == scene::Layers.editable(node, &reason)) + { + ui()->set_status("\"" + (node->name().empty() ? std::string{"(unnamed node)"} : node->name()) + "\" can't be edited: " + reason, true); + node = nullptr; + } } // ignore picks that are beyond allowed placement distance @@ -2451,6 +2575,13 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const if (!src) return; + if (src->starts_with(editor_includes::directive_mark)) + { + // a scenery template rather than a single node + place_include(src->substr(editor_includes::directive_mark.size()), rotation_mode, fixed_rotation_value); + return; + } + std::string name = "editor_"; glm::dvec3 mouseOffset = clamp_mouse_offset_to_max(GfxRenderer->Mouse_Position()); TAnimModel *cloned = simulation::State.create_model(*src, name, Camera.Pos + mouseOffset); diff --git a/application/editormode.h b/application/editormode.h index b39e34083..f5248c711 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -97,6 +97,7 @@ class editor_mode : public application_mode glm::vec3 scale{1.0f, 1.0f, 1.0f}; UID uuid; // node UUID for reference, used as fallback lookup for deleted/recreated nodes scene::layer_handle layer{null_handle}; // scenery layer of the node, so a recreated node returns to it + scene::instance_handle instance{0}; // include of a scenery template which was placed or removed, instead of a node }; void push_snapshot(scene::basic_node *node, EditorSnapshot::Action Action = EditorSnapshot::Action::Move, std::string const &Serialized = std::string()); @@ -127,6 +128,7 @@ class editor_mode : public application_mode double fTime50Hz{0.0}; // bufor czasu dla komunikacji z PoKeys scene::basic_editor m_editor; scene::basic_node *m_node{nullptr}; // currently selected scene node + scene::instance_handle m_instance{0}; // currently selected include of a scenery template; these are handled as a whole bool m_takesnapshot{true}; // helper, hints whether snapshot of selected node(s) should be taken before modification bool m_dragging = false; glm::dvec3 oldPos; // world position of the last brush placement @@ -167,6 +169,10 @@ class editor_mode : public application_mode void commit_terrain(); // writes the changes to the files of scenery opened for editing (Ctrl+S) void save(); + // places include of specified scenery template at the cursor, in the active layer + void place_include(std::string const &File, int RotationMode, float FixedRotation); + // undo and redo of placing or removing an include: brings removed include back, or removes it + void toggle_include(scene::instance_handle Instance); // exports the scenery in legacy (text) format, with layers hidden in the editor left out of the picture void export_scenery(); // raises/lowers terrain under the cursor while the left mouse button is held in sculpt mode diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index 3ca3e1f11..70b6e0e19 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -136,7 +136,7 @@ void editor_ui::render_menu_contents() { ImGui::MenuItem(STR_C("Toolset"), nullptr, &m_nodebankpanel.is_open); ImGui::MenuItem(STR_C("Layers"), nullptr, &m_layerspanel.is_open); - ImGui::MenuItem(STR_C("Include descriptions"), nullptr, &m_includespanel.is_open); + ImGui::MenuItem(STR_C("Include database"), nullptr, &m_includespanel.is_open); ImGui::EndMenu(); } } diff --git a/application/editoruilayer.h b/application/editoruilayer.h index fb5444afe..3f24d7c46 100644 --- a/application/editoruilayer.h +++ b/application/editoruilayer.h @@ -68,7 +68,7 @@ class editor_ui : public ui_layer functions_panel m_functionspanel{"Functions", true}; // not a window of its own, its settings are drawn in the toolset tabs nodebank_panel m_nodebankpanel{"Toolset", true}; // main editor window: gizmo, node properties, edit modes and the node bank layers_panel m_layerspanel{"Layers", true}; - includes_panel m_includespanel{"Include descriptions", false}; + includes_panel m_includespanel{"Include database", false}; std::function m_save; std::function m_export; brush_object_list m_brushobjects; diff --git a/application/editoruipanels.cpp b/application/editoruipanels.cpp index 2f22f8f0a..b93b5b0f4 100644 --- a/application/editoruipanels.cpp +++ b/application/editoruipanels.cpp @@ -589,6 +589,38 @@ void nodebank_panel::render() ++idx; } } + // scenery templates. placing one adds an include directive to a scenery file, so they take scenery opened for editing + if (Global.editor_session && ImGui::CollapsingHeader("Scenery templates (.inc)")) + { + if (false == EditorIncludes.scanned()) + { + EditorIncludes.scan(); + } + auto const &templates{EditorIncludes.entries()}; + std::string const *category{nullptr}; + auto listed{0}; + for (auto const entryidx : EditorIncludes.ready()) + { + auto const &entry{templates[entryidx]}; + if (false == searchfilter.empty() && false == contains(entry.name, searchfilter) && false == contains(entry.file, searchfilter) && false == contains(entry.category, searchfilter)) + { + continue; + } + if (false == entry.category.empty() && (category == nullptr || *category != entry.category)) + { + ImGui::TextDisabled(" %s", entry.category.c_str()); + } + category = &entry.category; + auto const label{(entry.category.empty() ? " " : " ") + entry.name + " (" + Bezogonkow(entry.file) + ")##inc" + std::to_string(entryidx)}; + if (list_item(label.c_str(), entry.statement == m_selectedtemplate)) + m_selectedtemplate = entry.statement; + ++listed; + } + if (listed == 0) + { + ImGui::TextDisabled(EditorIncludes.ready().empty() ? " (none yet, describe the templates in the Include database window)" : " (no match)"); + } + } ImGui::ListBoxFooter(); } ImGui::PopItemWidth(); @@ -667,7 +699,7 @@ void nodebank_panel::manual_list(char const *Id, std::vector &List, } if (ImGui::Button("Add selected")) { - if (m_selectedtemplate && false == m_selectedtemplate->empty()) + if (node_selected()) List.push_back(*m_selectedtemplate); } if (ImGui::IsItemHovered()) @@ -882,7 +914,7 @@ void nodebank_panel::render_sets_window() auto const setid{edited->id}; if (ImGui::Button("Add selected")) { - if (m_selectedtemplate && false == m_selectedtemplate->empty()) + if (node_selected()) EditorModelSets.add(setid, {*m_selectedtemplate}); } if (ImGui::IsItemHovered()) @@ -962,6 +994,12 @@ const std::string *nodebank_panel::get_active_template() return m_selectedtemplate.get(); } +bool nodebank_panel::node_selected() const +{ + // scenery templates are placed with include directives, the tools which scatter nodes have no use for them + return m_selectedtemplate && false == m_selectedtemplate->empty() && false == m_selectedtemplate->starts_with(editor_includes::directive_mark); +} + std::vector nodebank_panel::group_names() const { std::vector names; @@ -1504,6 +1542,7 @@ void includes_panel::open(std::string const &File) { m_file = File; m_statuserror = false; + m_parameters = 0; std::string error; m_loaded = editor_includes::load(File, m_info, error); if (false == m_loaded) @@ -1512,13 +1551,217 @@ void includes_panel::open(std::string const &File) m_statuserror = true; return; } + auto const described{false == m_info.name.empty() || false == m_info.parameters.empty()}; // every parameter the template uses gets an entry, described or not - auto const count{editor_includes::parameter_count(File)}; - for (auto id = 1; id <= count; ++id) + m_parameters = editor_includes::parameter_count(File); + for (auto id = 1; id <= m_parameters; ++id) { m_info.parameter(id); } - m_status = "The template uses " + std::to_string(count) + " parameter(s)"; + m_status = "The template uses " + std::to_string(m_parameters) + " parameter(s)."; + if (false == described) + { + // starting point for a new description + editor_includes::suggest(File, m_info); + m_status += " It has no description yet; the roles are a suggestion based on how the template uses the parameters."; + } +} + +void includes_panel::render_list() +{ + if (false == EditorIncludes.scanned()) + { + EditorIncludes.scan(); + } + auto const &entries{EditorIncludes.entries()}; + + ImGui::PushItemWidth(ImGui::GetFontSize() * 12.0f); + auto changed{ImGui::InputTextWithHint("##filter", "Search templates", m_filter, IM_ARRAYSIZE(m_filter))}; + ImGui::PopItemWidth(); + ImGui::SameLine(); + changed |= ImGui::Checkbox("Described", &m_describedonly); + if (false == scene::Layers.templates().empty()) + { + // known only for scenery opened for editing + ImGui::SameLine(); + changed |= ImGui::Checkbox("Used by the scenery", &m_usedonly); + } + ImGui::SameLine(); + if (ImGui::Button("Rescan")) + { + EditorIncludes.scan(); + } + if (ImGui::IsItemHovered()) + { + ImGui::SetTooltip("Looks through the scenery directory again, for the templates added or changed outside of the editor"); + } + + if (changed || m_listrevision != EditorIncludes.revision()) + { + m_listrevision = EditorIncludes.revision(); + m_listed.clear(); + m_described = 0; + std::string const filter{m_filter}; + auto const &used{scene::Layers.templates()}; + for (std::size_t idx = 0; idx < entries.size(); ++idx) + { + auto const &entry{entries[idx]}; + m_described += (entry.described ? 1 : 0); + if ((m_describedonly && false == entry.described) || (m_usedonly && false == used.empty() && used.count(entry.file) == 0)) + { + continue; + } + if (false == filter.empty() && false == contains(entry.file, filter) && false == contains(entry.name, filter) && false == contains(entry.category, filter)) + { + continue; + } + m_listed.emplace_back(idx); + } + } + ImGui::TextDisabled("%d template(s) in the scenery directory, %d described, %d ready for the node bank", static_cast(entries.size()), m_described, + static_cast(EditorIncludes.ready().size())); + + ImGui::BeginChild("##templates", ImVec2(0.0f, ImGui::GetTextLineHeightWithSpacing() * 9.0f), true); + ImGuiListClipper clipper(static_cast(m_listed.size())); + while (clipper.Step()) + { + for (auto row = clipper.DisplayStart; row < clipper.DisplayEnd; ++row) + { + auto const &entry{entries[m_listed[row]]}; + auto const marker{entry.complete ? "[ready] " : entry.described ? "[incomplete] " : ""}; + auto const label{marker + Bezogonkow(entry.file) + (entry.name.empty() ? "" : " - " + entry.name) + "##" + std::to_string(m_listed[row])}; + if (false == entry.described) + { + ImGui::PushStyleColor(ImGuiCol_Text, ImGui::GetStyleColorVec4(ImGuiCol_TextDisabled)); + } + auto const clicked{list_item(label.c_str(), entry.file == m_file)}; + if (false == entry.described) + { + ImGui::PopStyleColor(); + } + if (false == entry.complete && false == entry.issue.empty() && ImGui::IsItemHovered()) + { + ImGui::SetTooltip("Not in the node bank: %s", Bezogonkow(entry.issue).c_str()); + } + if (clicked) + { + open(entry.file); + } + } + } + if (m_listed.empty()) + { + ImGui::TextDisabled(entries.empty() ? "(no .inc files in the scenery directory)" : "(no match)"); + } + ImGui::EndChild(); +} + +void includes_panel::render_description() +{ + ImGui::Separator(); + ImGui::Text("%s", Bezogonkow(m_file).c_str()); + input_text("Name", m_info.name); + input_text("Category", m_info.category); + input_text("Description", m_info.description); + + ImGui::Columns(4, "##parameters", false); + ImGui::SetColumnWidth(0, ImGui::CalcTextSize("(p000) ").x); + ImGui::SetColumnWidth(1, ImGui::CalcTextSize("texture ").x + ImGui::GetFrameHeight() * 2.0f); + ImGui::TextDisabled("param"); + ImGui::NextColumn(); + ImGui::TextDisabled("role"); + ImGui::NextColumn(); + ImGui::TextDisabled("label"); + ImGui::NextColumn(); + ImGui::TextDisabled("default"); + ImGui::NextColumn(); + for (auto ¶meter : m_info.parameters) + { + ImGui::PushID(parameter.id); + ImGui::AlignTextToFramePadding(); + // parameters which keep the template out of the node bank stand out + if (parameter.id <= m_parameters && parameter.value.empty() && false == editor_includes::automatic(parameter.role)) + { + ImGui::TextColored(status_errorcolor, "(p%d)", parameter.id); + } + else + { + ImGui::Text("(p%d)", parameter.id); + } + ImGui::NextColumn(); + ImGui::PushItemWidth(-1.0f); + if (ImGui::BeginCombo("##role", parameter.role.c_str())) + { + for (auto const &role : editor_includes::roles) + { + if (ImGui::Selectable(role.c_str(), role == parameter.role)) + { + parameter.role = role; + } + } + ImGui::EndCombo(); + } + ImGui::PopItemWidth(); + ImGui::NextColumn(); + ImGui::PushItemWidth(-1.0f); + input_text("##label", parameter.label); + ImGui::PopItemWidth(); + ImGui::NextColumn(); + ImGui::PushItemWidth(-1.0f); + input_text("##default", parameter.value); + ImGui::PopItemWidth(); + ImGui::NextColumn(); + ImGui::PopID(); + } + ImGui::Columns(1); + + // what the node bank is going to make of the description + ImGui::PushTextWrapPos(0.0f); + if (std::string issue; editor_includes::complete(m_info, m_parameters, &issue)) + { + ImGui::TextUnformatted("Complete: once saved, the template is offered by the node bank (Insert tab, Scenery templates)."); + } + else + { + ImGui::TextColored(status_errorcolor, "Not for the node bank yet: %s.", issue.c_str()); + } + ImGui::PopTextWrapPos(); + if (ImGui::IsItemHovered()) + { + ImGui::SetTooltip("A template placed from the node bank gets the cursor location in the pos.* parameters, the rotation set in the\n" + "Insert tab in rot.y, and a unique name (the default value followed by a random suffix) in the name parameter.\n" + "The other parameters receive their default values."); + } + + if (ImGui::Button("Suggest roles")) + { + editor_includes::suggest(m_file, m_info); + } + if (ImGui::IsItemHovered()) + { + ImGui::SetTooltip("Sets roles of the parameters still marked as free, where the way the template uses them tells what they are"); + } + ImGui::SameLine(); + if (ImGui::Button("Add parameter")) + { + m_info.parameter(m_info.parameters.empty() ? 1 : m_info.parameters.back().id + 1); + } + ImGui::SameLine(); + if (ImGui::Button("Save to file")) + { + std::string error; + m_statuserror = false == editor_includes::save(m_file, m_info, error); + m_status = m_statuserror ? error : "Description saved in \"" + m_file + "\""; + if (false == m_statuserror) + { + EditorIncludes.update(m_file); + } + } + ImGui::SameLine(); + if (ImGui::Button("Reload")) + { + open(m_file); + } } void includes_panel::render() @@ -1528,115 +1771,27 @@ void includes_panel::render() return; } - ImGui::SetNextWindowPos(ImVec2S(560, 110), ImGuiCond_FirstUseEver); - ImGui::SetNextWindowSize(ImVec2S(520, 440), ImGuiCond_FirstUseEver); + // next to the layers window where the screen is wide enough for both + auto const position{ImVec2S(970, 60)}; + auto const windowsize{ImVec2S(600, 600)}; + ImGui::SetNextWindowPos(position.x + windowsize.x <= ImGui::GetIO().DisplaySize.x ? position : ImVec2S(560, 110), ImGuiCond_FirstUseEver); + ImGui::SetNextWindowSize(windowsize, ImGuiCond_FirstUseEver); auto const panelname{(title.empty() ? m_name : title) + "###" + m_name}; if (ImGui::Begin(panelname.c_str(), &is_open, ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoCollapse)) { ImGui::PushStyleColor(ImGuiCol_Text, ImGui::GetStyleColorVec4(ImGuiCol_TextDisabled)); - ImGui::TextWrapped("Describes .inc templates and their parameters. The description is stored in the template file, as //$e comment lines."); + ImGui::TextWrapped("The .inc templates of the scenery directory. Describe a template and its parameters to add it to the node bank; " + "the description is stored in the template file, as //$e comment lines."); + if (false == Global.editor_session) + { + ImGui::TextWrapped("The node bank offers the templates in a scenery opened for editing (-edit)."); + } ImGui::PopStyleColor(); - // templates the loaded scenery makes use of; known only for scenery opened for editing - auto const &templates{scene::Layers.templates()}; - if (false == templates.empty()) - { - ImGui::BeginChild("##templates", ImVec2(0.0f, ImGui::GetTextLineHeightWithSpacing() * 6.0f), true); - for (auto const &file : templates) - { - if (ImGui::Selectable(Bezogonkow(file).c_str(), file == m_file)) - { - open(file); - } - } - ImGui::EndChild(); - } - ImGui::PushItemWidth(-ImGui::CalcTextSize(" Open ").x - ImGui::GetStyle().ItemSpacing.x * 2.0f); - auto const entered{ImGui::InputTextWithHint("##file", "path of an .inc file in the scenery directory", m_filename, IM_ARRAYSIZE(m_filename), ImGuiInputTextFlags_EnterReturnsTrue)}; - ImGui::PopItemWidth(); - ImGui::SameLine(); - if ((ImGui::Button("Open") || entered) && m_filename[0] != '\0') - { - std::string file{ToLower(m_filename)}; - replace_slashes(file); - open(file); - } + render_list(); if (m_loaded) { - ImGui::Separator(); - ImGui::Text("%s", Bezogonkow(m_file).c_str()); - input_text("Name", m_info.name); - input_text("Category", m_info.category); - input_text("Description", m_info.description); - - ImGui::Columns(4, "##parameters", false); - ImGui::SetColumnWidth(0, ImGui::CalcTextSize("(p000) ").x); - ImGui::SetColumnWidth(1, ImGui::CalcTextSize("texture ").x + ImGui::GetFrameHeight() * 2.0f); - ImGui::TextDisabled("param"); - ImGui::NextColumn(); - ImGui::TextDisabled("role"); - ImGui::NextColumn(); - ImGui::TextDisabled("label"); - ImGui::NextColumn(); - ImGui::TextDisabled("default"); - ImGui::NextColumn(); - for (auto ¶meter : m_info.parameters) - { - ImGui::PushID(parameter.id); - ImGui::AlignTextToFramePadding(); - ImGui::Text("(p%d)", parameter.id); - ImGui::NextColumn(); - ImGui::PushItemWidth(-1.0f); - if (ImGui::BeginCombo("##role", parameter.role.c_str())) - { - for (auto const &role : editor_includes::roles) - { - if (ImGui::Selectable(role.c_str(), role == parameter.role)) - { - parameter.role = role; - } - } - ImGui::EndCombo(); - } - ImGui::PopItemWidth(); - ImGui::NextColumn(); - ImGui::PushItemWidth(-1.0f); - input_text("##label", parameter.label); - ImGui::PopItemWidth(); - ImGui::NextColumn(); - ImGui::PushItemWidth(-1.0f); - input_text("##default", parameter.value); - ImGui::PopItemWidth(); - ImGui::NextColumn(); - ImGui::PopID(); - } - ImGui::Columns(1); - - if (ImGui::Button("Suggest roles")) - { - editor_includes::suggest(m_file, m_info); - } - if (ImGui::IsItemHovered()) - { - ImGui::SetTooltip("Sets roles of the parameters still marked as free, where the way the template uses them tells what they are"); - } - ImGui::SameLine(); - if (ImGui::Button("Add parameter")) - { - m_info.parameter(m_info.parameters.empty() ? 1 : m_info.parameters.back().id + 1); - } - ImGui::SameLine(); - if (ImGui::Button("Save to file")) - { - std::string error; - m_statuserror = false == editor_includes::save(m_file, m_info, error); - m_status = m_statuserror ? error : "Description saved in \"" + m_file + "\""; - } - ImGui::SameLine(); - if (ImGui::Button("Reload")) - { - open(m_file); - } + render_description(); } if (false == m_status.empty()) { diff --git a/application/editoruipanels.h b/application/editoruipanels.h index 53cfe938b..099dc85fb 100644 --- a/application/editoruipanels.h +++ b/application/editoruipanels.h @@ -136,6 +136,8 @@ class nodebank_panel : public ui_panel // methods: std::string generate_node_label(std::string Input) const; void render_sets_window(); + // true if the node bank selection is a definition of a node, which the hand-made lists and the model sets can take + bool node_selected() const; // members: std::vector>> m_nodebank; char m_nodesearch[128]; @@ -178,7 +180,8 @@ class layers_panel : public ui_panel std::string m_popuperror; }; -// editor of the descriptions of *.inc scenery templates, see editorIncludeInfo.hpp +// database of the *.inc scenery templates: the templates found in the scenery directory, with the editor of their +// descriptions (see editorIncludeInfo.hpp). templates whose descriptions are complete are offered by the node bank class includes_panel : public ui_panel { @@ -190,10 +193,20 @@ class includes_panel : public ui_panel private: // methods void open(std::string const &File); + void render_list(); + void render_description(); // members + // template list + char m_filter[128]{}; + bool m_describedonly{false}; + bool m_usedonly{false}; + std::vector m_listed; // entries of the template bank matching the filter + int m_listrevision{-1}; // revision of the template bank the list was made for + int m_described{0}; + // description editor std::string m_file; // template being edited, relative to the scenery directory - char m_filename[256]{}; // name of a template typed in by hand include_info m_info; + int m_parameters{0}; // number of parameters the template uses bool m_loaded{false}; std::string m_status; bool m_statuserror{false}; diff --git a/editor/editorIncludeInfo.cpp b/editor/editorIncludeInfo.cpp index 720bab29d..48c14062c 100644 --- a/editor/editorIncludeInfo.cpp +++ b/editor/editorIncludeInfo.cpp @@ -16,7 +16,9 @@ http://mozilla.org/MPL/2.0/. #include #include +#include #include +#include #include namespace @@ -224,32 +226,11 @@ std::vector tokenize(std::string const &Text) return tokens; } -} // namespace - -include_parameter &include_info::parameter(int const Id) -{ - auto lookup{std::find_if(std::begin(parameters), std::end(parameters), [=](include_parameter const &Parameter) { return Parameter.id >= Id; })}; - if (lookup == std::end(parameters) || lookup->id != Id) - { - lookup = parameters.emplace(lookup); - lookup->id = Id; - } - return *lookup; -} - -namespace editor_includes -{ - -std::vector const roles{"free", "name", "pos.x", "pos.y", "pos.z", "rot.x", "rot.y", "rot.z", "track", "memcell", "event", "model", "texture", "number", "text"}; - -bool load(std::string const &File, include_info &Info, std::string &Error) +// reads description held by specified template text +bool parse(template_text const &Text, include_info &Info, std::string &Error) { Info = include_info(); - template_text text; - if (false == read_template(File, text, Error)) - { - return false; - } + auto const &text{Text}; try { auto const document{YAML::Load(text.yaml)}; @@ -289,6 +270,48 @@ bool load(std::string const &File, include_info &Info, std::string &Error) return true; } +// highest number of (pN) placeholder used by specified template text +int count_parameters(template_text const &Text) +{ + // the description lines may mention parameters the template doesn't use + auto content{Text.content}; + for (auto line{Text.lines.rbegin()}; line != Text.lines.rend(); ++line) + { + content.erase(line->first, line->second - line->first); + } + auto count{0}; + std::size_t length{0}; + for (auto location{content.find("(p")}; location != std::string::npos; location = content.find("(p", location + 1)) + { + count = std::max(count, placeholder(content, location, length)); + } + return count; +} + +} // namespace + +include_parameter &include_info::parameter(int const Id) +{ + auto lookup{std::find_if(std::begin(parameters), std::end(parameters), [=](include_parameter const &Parameter) { return Parameter.id >= Id; })}; + if (lookup == std::end(parameters) || lookup->id != Id) + { + lookup = parameters.emplace(lookup); + lookup->id = Id; + } + return *lookup; +} + +namespace editor_includes +{ + +std::vector const roles{"free", "name", "pos.x", "pos.y", "pos.z", "rot.x", "rot.y", "rot.z", "track", "memcell", "event", "model", "texture", "number", "text"}; + +bool load(std::string const &File, include_info &Info, std::string &Error) +{ + template_text text; + return read_template(File, text, Error) && parse(text, Info, Error); +} + bool save(std::string const &File, include_info const &Info, std::string &Error) { template_text text; @@ -428,23 +451,7 @@ int parameter_count(std::string const &File) { template_text text; std::string error; - if (false == read_template(File, text, error)) - { - return 0; - } - // the description lines may mention parameters the template doesn't use - auto content{text.content}; - for (auto line{text.lines.rbegin()}; line != text.lines.rend(); ++line) - { - content.erase(line->first, line->second - line->first); - } - auto count{0}; - std::size_t length{0}; - for (auto location{content.find("(p")}; location != std::string::npos; location = content.find("(p", location + 1)) - { - count = std::max(count, placeholder(content, location, length)); - } - return count; + return read_template(File, text, error) ? count_parameters(text) : 0; } void suggest(std::string const &File, include_info &Info) @@ -507,4 +514,198 @@ void suggest(std::string const &File, include_info &Info) } } +std::string const directive_mark{"include "}; + +bool automatic(std::string const &Role) +{ + return Role == "name" || Role.starts_with("pos.") || Role.starts_with("rot."); +} + +bool complete(include_info const &Info, int const Parameters, std::string *Issue) +{ + std::string issue; + if (Info.name.empty()) + { + issue = "the template needs a name"; + } + for (auto id = 1; id <= Parameters && issue.empty(); ++id) + { + auto const lookup{std::find_if(std::begin(Info.parameters), std::end(Info.parameters), [=](include_parameter const &Parameter) { return Parameter.id == id; })}; + if (lookup == std::end(Info.parameters) || (false == automatic(lookup->role) && lookup->value.empty())) + { + issue = "(p" + std::to_string(id) + ") needs a default value, or a role filled in by the editor (name, pos.*, rot.*)"; + } + } + if (false == issue.empty() && Issue != nullptr) + { + *Issue = issue; + } + return issue.empty(); +} + +std::string directive(std::string const &File, include_info const &Info, int const Parameters, glm::dvec3 const &Location, std::optional Yaw) +{ + auto const number = [](double const Value) { + std::ostringstream converter; + converter.imbue(std::locale::classic()); + converter << std::fixed << std::setprecision(3) << Value; + return converter.str(); + }; + std::string text{"include " + File}; + for (auto id = 1; id <= Parameters; ++id) + { + auto const lookup{std::find_if(std::begin(Info.parameters), std::end(Info.parameters), [=](include_parameter const &Parameter) { return Parameter.id == id; })}; + auto const role{lookup != std::end(Info.parameters) ? lookup->role : std::string{"free"}}; + auto value{lookup != std::end(Info.parameters) ? lookup->value : std::string{}}; + if (role == "pos.x") + { + value = number(Location.x); + } + else if (role == "pos.y") + { + value = number(Location.y); + } + else if (role == "pos.z") + { + value = number(Location.z); + } + else if (role == "rot.y" && Yaw) + { + value = number(*Yaw); + } + else if (role.starts_with("rot.") && value.empty()) + { + value = "0"; + } + else if (role == "name") + { + // names have to be unique in the scenery. the default value, or the name of the template, makes them recognizable + static std::mt19937 engine{std::random_device{}()}; + char suffix[16]; + std::snprintf(suffix, sizeof(suffix), "_%08x", static_cast(engine())); + value = (value.empty() ? std::filesystem::path(File).stem().string() : value) + suffix; + } + if (value.empty()) + { + // a parameter can't be left out, as the ones after it would take its place + value = "none"; + } + text += ' ' + (value.find_first_of(" \t;") != std::string::npos ? '\"' + value + '\"' : value); + } + return text + " end"; +} + } // namespace editor_includes + +editorIncludeBank EditorIncludes; + +namespace +{ + +include_entry examine(std::string const &File) +{ + include_entry entry; + entry.file = File; + entry.statement = std::make_shared(editor_includes::directive_mark + File); + template_text text; + if (false == read_template(File, text, entry.issue)) + { + return entry; + } + entry.described = false == text.lines.empty(); + if (false == entry.described) + { + entry.issue = "the template has no description"; + return entry; + } + include_info info; + if (false == parse(text, info, entry.issue)) + { + return entry; + } + entry.name = info.name; + entry.category = info.category; + entry.complete = editor_includes::complete(info, count_parameters(text), &entry.issue); + return entry; +} + +} // namespace + +void editorIncludeBank::scan() +{ + // the node bank may hold one of the templates selected, the statements stay in place across the scans + std::unordered_map> statements; + for (auto &entry : m_entries) + { + statements.emplace(entry.file, entry.statement); + } + m_entries.clear(); + m_scanned = true; + std::error_code error; + auto const root{std::filesystem::path(Global.asCurrentSceneryPath)}; + // NOTE: on an error the iterator turns into the end one + for (std::filesystem::recursive_directory_iterator file{root, std::filesystem::directory_options::skip_permission_denied, error}, end; file != end; file.increment(error)) + { + if (false == file->is_regular_file(error)) + { + continue; + } + // the scenery refers to its files with lower case names, relative to the scenery directory + std::string name; + try + { + name = ToLower(file->path().lexically_relative(root).generic_string()); + } + catch (std::exception const &) + { + // the name can't be expressed in the encoding the scenery files use, so nothing can include the file anyway + continue; + } + if (false == name.ends_with(".inc")) + { + continue; + } + m_entries.emplace_back(examine(name)); + if (auto const lookup{statements.find(name)}; lookup != statements.end()) + { + m_entries.back().statement = lookup->second; + } + } + std::sort(std::begin(m_entries), std::end(m_entries), [](include_entry const &Left, include_entry const &Right) { return Left.file < Right.file; }); + index(); +} + +void editorIncludeBank::index() +{ + m_ready.clear(); + for (std::size_t idx = 0; idx < m_entries.size(); ++idx) + { + if (m_entries[idx].complete) + { + m_ready.emplace_back(idx); + } + } + std::sort(std::begin(m_ready), std::end(m_ready), [this](std::size_t const Left, std::size_t const Right) { + auto const &left{m_entries[Left]}; + auto const &right{m_entries[Right]}; + return std::tie(left.category, left.name, left.file) < std::tie(right.category, right.name, right.file); + }); + ++m_revision; +} + +void editorIncludeBank::update(std::string const &File) +{ + auto const lookup{std::find_if(std::begin(m_entries), std::end(m_entries), [&](include_entry const &Entry) { return Entry.file == File; })}; + if (lookup == std::end(m_entries)) + { + m_entries.insert(std::upper_bound(std::begin(m_entries), std::end(m_entries), File, [](std::string const &Name, include_entry const &Entry) { return Name < Entry.file; }), examine(File)); + } + else + { + // the node bank may hold the template selected, keep its statement + auto const statement{lookup->statement}; + *lookup = examine(File); + lookup->statement = statement; + } + index(); +} diff --git a/editor/editorIncludeInfo.hpp b/editor/editorIncludeInfo.hpp index 9aa47af25..1273a049b 100644 --- a/editor/editorIncludeInfo.hpp +++ b/editor/editorIncludeInfo.hpp @@ -9,6 +9,8 @@ http://mozilla.org/MPL/2.0/. #pragma once +#include +#include #include #include @@ -55,5 +57,69 @@ bool save(std::string const &File, include_info const &Info, std::string &Error) int parameter_count(std::string const &File); // sets roles of the parameters whose use in the template makes their meaning clear. roles already set are left alone void suggest(std::string const &File, include_info &Info); +// true if value of a parameter with specified role is supplied by the editor when the template is placed +bool automatic(std::string const &Role); +// true if the description has everything it takes to place the template straight from the node bank: a name, and +// either a default value or a role filled in by the editor for each of specified number of parameters. +// optionally tells what is missing +bool complete(include_info const &Info, int Parameters, std::string *Issue = nullptr); +// builds include directive which places specified template. Location and Yaw are the placement to pass through +// the parameters with matching roles, in the coordinates of the place the directive goes to; without Yaw the +// rotation parameters receive their default values +std::string directive(std::string const &File, include_info const &Info, int Parameters, glm::dvec3 const &Location, std::optional Yaw); + +// marks node bank template which stands for a scenery template rather than for definition of a single node +extern std::string const directive_mark; } // namespace editor_includes + +// *.inc template found in the scenery directory +struct include_entry +{ + std::string file; // name of the template, relative to the scenery directory + std::string name; // from the description + std::string category; + bool described{false}; + bool complete{false}; // can be placed from the node bank, see editor_includes::complete() + std::string issue; // what keeps the template out of the node bank + std::shared_ptr statement; // node bank template standing for the include +}; + +// the scenery templates available to the editor: every *.inc file in the scenery directory. the templates whose +// descriptions are complete are offered by the node bank +class editorIncludeBank +{ + public: + // looks through the scenery directory for the templates, and reads their descriptions + void scan(); + bool scanned() const + { + return m_scanned; + } + std::vector const &entries() const + { + return m_entries; + } + // indices of the entries offered by the node bank, ordered by category and name + std::vector const &ready() const + { + return m_ready; + } + // reads description of specified template again, after it was changed + void update(std::string const &File); + // changes with each change of the entries + int revision() const + { + return m_revision; + } + + private: + void index(); + + std::vector m_entries; // sorted by file name + std::vector m_ready; + bool m_scanned{false}; + int m_revision{0}; +}; + +extern editorIncludeBank EditorIncludes; diff --git a/scene/scenelayers.cpp b/scene/scenelayers.cpp index abbd56d63..a3b3f51ee 100644 --- a/scene/scenelayers.cpp +++ b/scene/scenelayers.cpp @@ -114,6 +114,8 @@ void node_layers::clear() m_sources.clear(); m_erased.clear(); m_templates.clear(); + m_instances.clear(); + m_instance = 0; m_terraindirective = false; } @@ -208,7 +210,8 @@ void node_layers::visible(layer_handle Layer, bool const Visible) } if (Visible) { - if (Node->m_layerhidden) + // nodes of a removed include stay out of sight + if (Node->m_layerhidden && (false == tracked(Node->m_instance) || false == instance(Node->m_instance).removed)) { Node->visible(true); Node->m_layerhidden = false; @@ -296,7 +299,7 @@ bool node_layers::editable(basic_node const *Node, std::string *Reason) const return true; } std::string reason; - if (Node->m_template) + if (Node->from_template()) { reason = "it's a part of an include template (.inc)"; } @@ -361,7 +364,7 @@ void node_layers::show_all() // stores origin of a node defined directly in a layer file, to allow rewriting its definition on save void node_layers::track(basic_node const *Node, source_span const &Span, glm::vec3 const &Angles, glm::vec3 const &Scale) { - if (Node == nullptr || Node->m_template || false == valid(Node->layer()) || false == Span.valid()) + if (Node == nullptr || Node->from_template() || false == valid(Node->layer()) || false == Span.valid()) { return; } @@ -606,6 +609,18 @@ bool node_layers::can_merge(layer_handle Source, layer_handle Target, std::strin Reason = "the target layer is included by the merged one"; return false; } + if (false == source.context_end.matches(target.context_end)) + { + // directives of includes placed in the editor are prepared for the end of their layer file + auto const unsaved{std::any_of(std::begin(m_instances), std::end(m_instances), [&](include_instance const &Instance) { + return false == Instance.dead && false == Instance.removed && false == Instance.directive.empty() && resolve(Instance.layer) == Source; + })}; + if (unsaved) + { + Reason = "the merged layer has includes which weren't saved yet, save the scenery first"; + return false; + } + } if (source.created) { // nothing but the nodes made in the editor to move @@ -667,6 +682,115 @@ bool node_layers::pending() const return std::any_of(std::begin(m_layers), std::end(m_layers), [](basic_layer const &Layer) { return false == Layer.dead && (Layer.created || Layer.removed || Layer.merged != null_handle); }); } +// indicates start of content of a template, included by directive at specified location of the layer file being loaded +void node_layers::instance_begin(std::string const &File, source_span const &Span) +{ + if (m_instances.size() + 1 >= untracked_instance) + { + m_instance = untracked_instance; + return; + } + m_instances.emplace_back(); + auto &included{m_instances.back()}; + included.layer = handle(); + included.file = &(*m_templates.emplace(File).first); + included.span = Span; + m_instance = static_cast(m_instances.size()); +} + +// true if specified include can be removed in the editor. optionally explains why it can't +bool node_layers::removable(instance_handle Instance, std::string *Reason) const +{ + std::string reason; + if (false == tracked(Instance) || instance(Instance).dead) + { + reason = "it's a part of an include template (.inc)"; + } + else + { + auto const includelayer{resolve(instance(Instance).layer)}; + if (false == valid(includelayer) || layer(includelayer).removed) + { + reason = "its layer is no longer a part of the scenery"; + } + else if (false == writable(includelayer, &reason)) + { + // reason was filled by the call + } + else if (layer(includelayer).locked) + { + reason = "its layer is locked"; + } + } + if (false == reason.empty() && Reason != nullptr) + { + *Reason = reason; + } + return reason.empty(); +} + +// drops specified include from the scenery, or brings it back +void node_layers::removed(instance_handle Instance, bool Removed) +{ + if (false == tracked(Instance) || m_instances[Instance - 1].dead || m_instances[Instance - 1].removed == Removed) + { + return; + } + m_instances[Instance - 1].removed = Removed; + + auto const includelayer{resolve(m_instances[Instance - 1].layer)}; + auto const layervisible{false == valid(includelayer) || layer(includelayer).visible}; + auto const update_node = [=, this](basic_node *Node, layer_item const Item) { + if (Node == nullptr || Node->m_instance != Instance) + { + return; + } + count(Node->layer(), Item, Removed ? -1 : 1); + if (Removed) + { + if (Node->visible()) + { + Node->visible(false); + Node->m_layerhidden = true; + } + } + else if (Node->m_layerhidden && layervisible) + { + Node->visible(true); + Node->m_layerhidden = false; + } + }; + for (auto *modelinstance : simulation::Instances.sequence()) + { + update_node(modelinstance, layer_item::model); + } + for (auto *path : simulation::Paths.sequence()) + { + update_node(path, layer_item::track); + } + for (auto *traction : simulation::Traction.sequence()) + { + update_node(traction, layer_item::traction); + } +} + +// registers include directive made in the editor, to be written to the file of specified layer on save +instance_handle node_layers::place(layer_handle Layer, std::string const &File, std::string const &Directive) +{ + Layer = resolve(Layer); + if (false == valid(Layer) || m_instances.size() + 1 >= untracked_instance) + { + return 0; + } + m_instances.emplace_back(); + auto &included{m_instances.back()}; + included.layer = Layer; + included.file = &(*m_templates.emplace(File).first); + included.directive = Directive; + included.context = layer(Layer).context_end; + return static_cast(m_instances.size()); +} + } // namespace scene //--------------------------------------------------------------------------- diff --git a/scene/scenelayers.h b/scene/scenelayers.h index 394f607d1..44661fc56 100644 --- a/scene/scenelayers.h +++ b/scene/scenelayers.h @@ -12,6 +12,7 @@ http://mozilla.org/MPL/2.0/. #include "scene/scenenode.h" #include +#include #include namespace scene @@ -93,6 +94,21 @@ struct basic_layer std::size_t item_count() const; }; +// include directive bringing an *.inc template into a scenery layer file +struct include_instance +{ + layer_handle layer{null_handle}; // layer of the file holding the directive + std::string const *file{nullptr}; // name of the included template + source_span span; // location of the whole directive in the file; invalid for directive which wasn't saved yet + std::string directive; // text of the directive, for include placed in the editor and not saved yet + layer_context context; // placement the directive of include placed in the editor was prepared for + bool removed{false}; // the include is to be dropped from the scenery + bool dead{false}; // removal of the include was saved +}; + +// marks nodes defined by a template which was included in a way the editor doesn't keep track of +instance_handle const untracked_instance{std::numeric_limits::max()}; + // origin of a node defined in a scenery layer file, with the placement it was loaded with struct node_source { @@ -197,6 +213,18 @@ class node_layers { return m_templates; } + // indicates start of content of a template, included by directive at specified location of the layer file being loaded + void instance_begin(std::string const &File, source_span const &Span); + // indicates end of content of the template + void instance_end() + { + m_instance = 0; + } + // include whose template is being loaded, 0 if there's none + instance_handle instance() const + { + return m_instance; + } // updates placement in effect for the statements which follow void context(layer_context const &Context) { @@ -229,6 +257,26 @@ class node_layers bool merge(layer_handle Source, layer_handle Target); // true if there are layer changes awaiting save. NOTE: doesn't account for modified nodes bool pending() const; + + // includes of *.inc templates. the editor handles each as a whole: it can be placed and removed, but not taken apart + // true if specified handle stands for an include the editor keeps track of + bool tracked(instance_handle const Instance) const + { + return Instance != 0 && Instance <= m_instances.size(); + } + // grants access to specified include. NOTE: the include has to be tracked + include_instance const &instance(instance_handle const Instance) const + { + return m_instances[Instance - 1]; + } + // true if specified include can be removed in the editor. optionally explains why it can't + bool removable(instance_handle Instance, std::string *Reason = nullptr) const; + // drops specified include from the scenery, or brings it back. its nodes are hidden right away, the directive + // is erased from the layer file on save; what else the template defines stays in the scene until the next load + void removed(instance_handle Instance, bool Removed); + // registers include directive made in the editor, to be written to the file of specified layer on save. + // the directive has to be prepared for the placement in effect at the end of that file. returns: handle to the include + instance_handle place(layer_handle Layer, std::string const &File, std::string const &Directive); // true if specified layer is included, directly or not, by the other one bool is_descendant(layer_handle Layer, layer_handle const Ancestor) const; @@ -254,6 +302,8 @@ class node_layers std::unordered_map m_sources; // origins of nodes which can be rewritten on save std::vector> m_erased; // definitions of nodes deleted since the load or the last save std::set m_templates; // *.inc templates used by the scenery + std::vector m_instances; // includes of the templates; instance handle is index in the vector + 1 + instance_handle m_instance{0}; // helper, include whose template is being loaded bool m_terraindirective{false}; }; diff --git a/scene/scenelayerssave.cpp b/scene/scenelayerssave.cpp index b42c72865..f56c5c111 100644 --- a/scene/scenelayerssave.cpp +++ b/scene/scenelayerssave.cpp @@ -294,9 +294,15 @@ struct node_layers::composition layer_handle layer; source_span span; }; + struct instance_place + { + instance_handle instance; + source_span span; + }; std::string text; std::vector nodes; std::vector sites; + std::vector instances; // adds another piece of text at the end void append(composition const &Other) @@ -315,6 +321,12 @@ struct node_layers::composition place.span.end += offset; sites.emplace_back(place); } + for (auto place : Other.instances) + { + place.span.begin += offset; + place.span.end += offset; + instances.emplace_back(place); + } } }; @@ -324,6 +336,7 @@ struct node_layers::save_state std::map patches; std::map> nodes; // unchanged nodes defined in each file std::map> includes; // unchanged include directives in each file, by included layer + std::map> instances; // unchanged includes of templates in each file std::string eol{"\r\n"}; std::string error; }; @@ -477,6 +490,13 @@ bool node_layers::compose(save_state &State, layer_handle const Layer, compositi Output.sites.push_back({included, shift(layer(included).sites.front().span)}); } } + if (auto const lookup{State.instances.find(Layer)}; lookup != State.instances.end()) + { + for (auto const included : lookup->second) + { + Output.instances.push_back({included, shift(instance(included).span)}); + } + } return true; } @@ -608,7 +628,7 @@ save_result node_layers::save(std::vector const &Rootstatements) state.patches[source.layer].edits.emplace_back(std::move(edit)); rewritten.emplace(Node); } - else if (Model != nullptr && false == Node->m_template) + else if (Model != nullptr && false == Node->from_template()) { // created in the editor. the definition is placed at the end of the layer file, with the placement in effect there std::string text; @@ -654,6 +674,41 @@ save_result node_layers::save(std::vector const &Rootstatements) state.patches[erased.first].edits.emplace_back(std::move(edit)); } + // includes of templates + std::map> placed; // directives made in the editor, by target layer + for (std::size_t idx = 0; idx < m_instances.size(); ++idx) + { + auto const &included{m_instances[idx]}; + if (included.dead) + { + continue; + } + if (included.span.valid()) + { + if (included.removed) + { + file_patch::edit edit; + edit.begin = included.span.begin; + edit.end = included.span.end; + state.patches[included.layer].edits.emplace_back(std::move(edit)); + } + } + else if (false == included.removed && false == included.directive.empty()) + { + auto const target{resolve(included.layer)}; + if (false == is_output(target)) + { + continue; + } + if (false == included.context.matches(layer(target).context_end)) + { + // shouldn't happen, merge of layers is refused when it'd lead to this + return fail("include \"" + *included.file + "\" was placed for different origin, rotation or scale than its layer ends with"); + } + placed[target].emplace_back(static_cast(idx + 1)); + } + } + // layer changes std::map> appended; // merged layers placed at the end of their target std::set absorbed; // merged layers which cease to exist as files @@ -748,7 +803,7 @@ save_result node_layers::save(std::vector const &Rootstatements) { continue; } - if (layer(candidate).created || state.patches.count(candidate) != 0 || appended.count(candidate) != 0 || created.count(candidate) != 0 || + if (layer(candidate).created || state.patches.count(candidate) != 0 || appended.count(candidate) != 0 || created.count(candidate) != 0 || placed.count(candidate) != 0 || (candidate == root && false == Rootstatements.empty())) { outputs.emplace_back(candidate); @@ -782,6 +837,14 @@ save_result node_layers::save(std::vector const &Rootstatements) } state.includes[included.sites.front().parent].emplace_back(candidate); } + for (std::size_t idx = 0; idx < m_instances.size(); ++idx) + { + auto const &included{m_instances[idx]}; + if (false == included.dead && false == included.removed && included.span.valid() && state.content.count(included.layer) != 0) + { + state.instances[included.layer].emplace_back(static_cast(idx + 1)); + } + } std::map texts; for (auto const output : outputs) @@ -822,6 +885,17 @@ save_result node_layers::save(std::vector const &Rootstatements) text.text += definition.second + eol; } } + if (auto const lookup{placed.find(output)}; lookup != placed.end()) + { + for (auto const included : lookup->second) + { + auto const &directive{instance(included).directive}; + ensure_newline(text.text, eol); + auto const offset{static_cast(text.text.size())}; + text.instances.push_back({included, {offset, offset + static_cast(directive.size())}}); + text.text += directive + eol; + } + } if (output == root) { for (auto const &statement : Rootstatements) @@ -927,6 +1001,13 @@ save_result node_layers::save(std::vector const &Rootstatements) source.scale = (model != nullptr ? model->Scale() : glm::vec3{1.f}); } } + for (auto const &place : texts[output].instances) + { + auto &included{m_instances[place.instance - 1]}; + included.layer = output; + included.span = place.span; + included.directive.clear(); + } for (auto const &place : texts[output].sites) { auto &included{layer(place.layer)}; @@ -961,6 +1042,11 @@ save_result node_layers::save(std::vector const &Rootstatements) { stat(output); } + for (auto &included : m_instances) + { + // removed includes are gone from the files now + included.dead = included.dead || included.removed; + } m_erased.clear(); if (removedterrain) { diff --git a/scene/scenenode.cpp b/scene/scenenode.cpp index 788d07178..9f07a0036 100644 --- a/scene/scenenode.cpp +++ b/scene/scenenode.cpp @@ -718,8 +718,8 @@ memory_node::deserialize( cParser &Input, node_data const &Nodedata ) { basic_node::basic_node( scene::node_data const &Nodedata ) : m_name( Nodedata.name ), - m_template( Nodedata.is_template ), - m_layer( Nodedata.layer ) + m_layer( Nodedata.layer ), + m_instance( Nodedata.instance ) { uuid = UID::random(); node_type = Nodedata.type; diff --git a/scene/scenenode.h b/scene/scenenode.h index 549eb0b48..8de0e0604 100644 --- a/scene/scenenode.h +++ b/scene/scenenode.h @@ -71,7 +71,7 @@ struct node_data { std::string name; std::string type; layer_handle layer { null_handle }; // scenery layer the node is defined in, if any - bool is_template { false }; // the node is defined by an *.inc template rather than directly by a scenery layer file + instance_handle instance { 0 }; // include of an *.inc template which defines the node, if it isn't defined directly by a scenery layer file }; // holds unique piece of geometry, covered with single material @@ -365,6 +365,9 @@ public: layer( scene::layer_handle Layer ); scene::layer_handle layer() const; + // true if the node is defined by an *.inc template + bool + from_template() const { return m_instance != 0; } void mark_dirty() { m_dirty = true; } bool @@ -381,9 +384,11 @@ public: bool m_visible { true }; // visibility flag std::string m_name; bool m_dirty { false }; - bool m_layerhidden { false }; // the node was visible until its scenery layer was hidden - bool m_template { false }; // the node is defined by an *.inc template, which the editor can't rewrite. set only for scenery opened for editing + bool m_layerhidden { false }; // the node was visible until the editor hid its scenery layer, or the include which defines it scene::layer_handle m_layer { null_handle }; // scenery layer this node belongs to, if any + // include of an *.inc template which defines the node; 0 if the node is defined directly by a scenery layer file. + // such nodes can't be rewritten one by one on scenery save. set only for scenery opened for editing + scene::instance_handle m_instance { 0 }; UID uuid; private: diff --git a/simulation/simulation.cpp b/simulation/simulation.cpp index ed381572c..e50eff37e 100644 --- a/simulation/simulation.cpp +++ b/simulation/simulation.cpp @@ -493,6 +493,10 @@ TEventLauncher * state_manager::create_eventlauncher(const std::string &src, con return m_serializer.create_eventlauncher(src, name, position); } +std::pair state_manager::preview_include(std::string const &Directive, scene::layer_context const &Context, scene::layer_handle Layer, scene::instance_handle Instance) { + return m_serializer.preview_include(Directive, Context, Layer, Instance); +} + void state_manager::delete_model(TAnimModel *model) { scene::Layers.count(model->layer(), scene::layer_item::model, -1); scene::Layers.forget(model); diff --git a/simulation/simulation.h b/simulation/simulation.h index 09ea4d42f..fe5fc87be 100644 --- a/simulation/simulation.h +++ b/simulation/simulation.h @@ -43,6 +43,9 @@ public: // create eventlauncher from node string TEventLauncher * create_eventlauncher(const std::string &src, const std::string &name, const glm::dvec3 &position); + // creates model instances defined by an include directive placed in the scenery editor + std::pair + preview_include(std::string const &Directive, scene::layer_context const &Context, scene::layer_handle Layer, scene::instance_handle Instance); // delete TAnimModel instance void delete_model(TAnimModel *model); diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index d1d449639..ae0841af2 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -441,7 +441,10 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch scene::node_data nodedata; nodedata.layer = scene::Layers.handle(); - nodedata.is_template = ( nodedata.layer != null_handle ) && ( false == Input.InLayerFile() ); + if( ( nodedata.layer != null_handle ) && ( false == Input.InLayerFile() ) ) { + // defined by a template, or by something else which isn't a scenery layer file + nodedata.instance = ( scene::Layers.instance() != 0 ? scene::Layers.instance() : scene::untracked_instance ); + } // common data and node type indicator Input.getTokens( 4 ); Input @@ -1412,6 +1415,78 @@ TAnimModel *state_serializer::create_model(const std::string &src, const std::st return cloned; } +std::pair state_serializer::preview_include(std::string const &Directive, scene::layer_context const &Context, scene::layer_handle Layer, scene::instance_handle Instance) { + // statements which take more than a single token, with the tokens ending them + static std::unordered_map const nodeends { + { "dynamic", "enddynamic" }, { "track", "endtrack" }, { "traction", "endtraction" }, { "tractionpowersource", "end" }, { "model", "endmodel" }, + { "triangles", "endtri" }, { "triangle_strip", "endtri" }, { "triangle_fan", "endtri" }, { "lines", "endline" }, { "line_strip", "endline" }, { "line_loop", "endline" }, + { "memcell", "endmemcell" }, { "eventlauncher", "end" }, { "sound", "endsound" } }; + static std::unordered_map const statementends { + { "event", "endevent" }, { "trainset", "endtrainset" }, { "isolated", "endisolated" }, { "area", "endarea" }, { "assignment", "endassignment" }, + { "atmo", "endatmo" }, { "camera", "endcamera" }, { "config", "endconfig" }, { "description", "enddescription" }, { "light", "endlight" }, + { "sky", "endsky" }, { "test", "endtest" }, { "time", "endtime" }, { "terrain", "endterrain" }, { "editorterrain", "endeditorterrain" } }; + + cParser parser(Directive, cParser::buffer_TEXT, Global.asCurrentSceneryPath, Global.bLoadTraction); + // the template is processed with the placement its directive is going to be loaded with + scene::scratch_data scratch; + scratch.location.offset.emplace(Context.offset); + scratch.location.rotation = Context.rotation; + scratch.location.scale.emplace(Context.scale); + + auto created { 0 }; + auto skipped { 0 }; + auto token { parser.getToken() }; + while (false == token.empty()) { + if (token == "origin") { deserialize_origin(parser, scratch); } + else if (token == "endorigin") { deserialize_endorigin(parser, scratch); } + else if (token == "scale") { deserialize_scale(parser, scratch); } + else if (token == "endscale") { deserialize_endscale(parser, scratch); } + else if (token == "rotate") { deserialize_rotate(parser, scratch); } + else if (token == "node") { + scene::node_data nodedata; + parser.getTokens(4); + parser >> nodedata.range_max >> nodedata.range_min >> nodedata.name >> nodedata.type; + if (nodedata.name == "none") { nodedata.name.clear(); } + nodedata.layer = Layer; + nodedata.instance = Instance; + auto *instance { (nodedata.type == "model" && nodedata.range_min >= 0.0) ? deserialize_model(parser, scratch, nodedata) : nullptr }; + if (instance != nullptr) { + // same as for a model loaded with the scenery + if (instance->Model() != nullptr) { + for (auto const &smokesource : instance->Model()->smoke_sources()) { + Particles.insert(smokesource.first, instance, smokesource.second); + } + } + simulation::Instances.insert(instance); + simulation::Region->insert(instance); + scene::Hierarchy[instance->uuid.to_string()] = instance; + scene::Layers.count(Layer, scene::layer_item::model); + ++created; + } + else if (nodedata.type != "model" || nodedata.range_min < 0.0) { + // NOTE: a model which failed to load is consumed up to its end already + auto const lookup { nodeends.find(nodedata.type) }; + if (lookup != nodeends.end()) { skip_until(parser, lookup->second); } + ++skipped; + } + } + else if (token == "lua") { + parser.getTokens(1, false); + ++skipped; + } + else { + auto const lookup { statementends.find(token) }; + if (lookup != statementends.end()) { + skip_until(parser, lookup->second); + ++skipped; + } + // anything else is a single token with no parameters, or something the loader wouldn't recognize either + } + token = parser.getToken(); + } + return { created, skipped }; +} + TEventLauncher *state_serializer::create_eventlauncher(const std::string &src, const std::string &name, const glm::dvec3 &position) { cParser parser(src); parser.getTokens(); // "node" diff --git a/simulation/simulationstateserializer.h b/simulation/simulationstateserializer.h index a5d6f2dcc..2dd643074 100644 --- a/simulation/simulationstateserializer.h +++ b/simulation/simulationstateserializer.h @@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/. #include "utilities/parser.h" #include "scene/scene.h" +#include "scene/scenelayers.h" namespace simulation { @@ -45,6 +46,10 @@ public: TAnimModel * create_model(std::string const &src, std::string const &name, const glm::dvec3 &position); // create new eventlauncher from node stirng TEventLauncher * create_eventlauncher(std::string const &src, std::string const &name, const glm::dvec3 &position); + // creates model instances defined by an include directive placed in the scenery editor, to show what was placed. + // everything else the included template defines is left out, and takes effect when the saved scenery is loaded. + // Context: placement in effect at the location of the directive. returns: number of created models and of skipped statements + std::pair preview_include(std::string const &Directive, scene::layer_context const &Context, scene::layer_handle Layer, scene::instance_handle Instance); private: // methods diff --git a/utilities/Classes.h b/utilities/Classes.h index 568e3ae9f..1e91bc967 100644 --- a/utilities/Classes.h +++ b/utilities/Classes.h @@ -57,6 +57,7 @@ struct node_data; class basic_node; using group_handle = std::size_t; using layer_handle = std::uint16_t; +using instance_handle = std::uint32_t; } namespace Mtable diff --git a/utilities/parser.cpp b/utilities/parser.cpp index 36592d96b..293f5156b 100644 --- a/utilities/parser.cpp +++ b/utilities/parser.cpp @@ -124,6 +124,10 @@ cParser::~cParser() // content of the processed file ended, following nodes belong to the parent layer again scene::Layers.close(); } + if (true == mInstanceFile) + { + scene::Layers.instance_end(); + } } template <> glm::vec3 cParser::getToken(bool const ToLower, char const *Break) @@ -386,6 +390,14 @@ void cParser::startIncludeFromParser(cParser& srcParser, bool ToLower, std::stri if (mIncludeParser->mIncFile) { scene::Layers.template_used(includefile); + // include of a template made directly by a layer file is handled by the editor as a whole. templates + // included by that template are a part of it + auto const site{include_site()}; + if (false == site.fixed && scene::Layers.instance() == 0 && mIncludeParser->mSize > 0) + { + scene::Layers.instance_begin(includefile, site.span); + mIncludeParser->mInstanceFile = true; + } } else if (mIncludeParser->mSize > 0) { diff --git a/utilities/parser.h b/utilities/parser.h index c64ed1313..bafcdff9b 100644 --- a/utilities/parser.h +++ b/utilities/parser.h @@ -131,6 +131,7 @@ class cParser //: public std::stringstream std::size_t mLine { 0 }; // currently processed line bool mIncFile { false }; // the parser is processing an *.inc file bool mLayerFile { false }; // the parser is processing a file registered as scenery layer + bool mInstanceFile { false }; // the parser is processing a template whose include is registered with the scenery layers std::streamoff mPosition { 0 }; // amount of bytes read from the stream so far std::streamoff mTokenBegin { 0 }; // location of the most recently read token std::streamoff mTokenEnd { 0 }; From ced26d171f036bdc3e914066b1323db03ac9493f Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Sat, 3 Oct 2026 00:37:17 +0200 Subject: [PATCH 040/430] feat(editor): edit parameters of a placed include --- application/editormode.cpp | 245 +++++++++++++++++++++-- application/editormode.h | 13 ++ application/editoruilayer.cpp | 5 + application/editoruilayer.h | 2 + application/editoruipanels.cpp | 73 +++++++ application/editoruipanels.h | 22 ++ editor/editorIncludeInfo.cpp | 107 ++++++++-- editor/editorIncludeInfo.hpp | 10 + scene/scenelayers.cpp | 70 ++++++- scene/scenelayers.h | 17 +- scene/scenelayerssave.cpp | 18 +- scene/scenenode.h | 1 + simulation/simulation.cpp | 45 +++++ simulation/simulation.h | 5 + simulation/simulationstateserializer.cpp | 9 +- simulation/simulationstateserializer.h | 2 +- 16 files changed, 603 insertions(+), 41 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 86b51e975..ce22371d7 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -675,10 +675,8 @@ void editor_mode::undo_last() if (snap.instance != 0) { - // include of a scenery template was placed or removed; either is taken back by flipping its removal - toggle_include(snap.instance); + restore_include(snap); g_redo.push_back(std::move(snap)); - m_instance = 0; return; } @@ -766,9 +764,8 @@ void editor_mode::redo_last() if (snap.instance != 0) { - toggle_include(snap.instance); + restore_include(snap); m_history.push_back(std::move(snap)); - m_instance = 0; return; } @@ -926,8 +923,27 @@ bool editor_mode::update() } if (m_instance != 0 && false == scene::Layers.removable(m_instance)) { - m_instance = 0; + select_include(0); } + if (m_include.changed) + { + // a parameter of the selected include was changed in the node properties + m_include.changed = false; + apply_include(); + } + if (false == m_include.active && false == m_gizmo_using) + { + m_include_gesture = false; + } + // models replaced after changes of includes are destroyed once the renderer can't have them among its pick candidates + for (auto &retired : m_retired) + { + if (--retired.second <= 0) + { + simulation::Instances.purge(retired.first); + } + } + m_retired.erase(std::remove_if(m_retired.begin(), m_retired.end(), [](std::pair const &Retired) { return Retired.second <= 0; }), m_retired.end()); simulation::Region->update_sounds(); audio::renderer.update(Global.iPause ? 0.0 : deltarealtime); @@ -1615,6 +1631,97 @@ void editor_mode::toggle_include(scene::instance_handle const Instance) ui()->set_status("Include of \"" + *included.file + "\" " + (included.removed ? "removed." : "restored.")); } +void editor_mode::restore_include(EditorSnapshot &Snapshot) +{ + if (Snapshot.serialized.empty()) + { + // the include was placed or removed; either is taken back by flipping its removal + toggle_include(Snapshot.instance); + select_include(0); + return; + } + // parameters of the include were changed. the snapshot holds the directive to go back to, and leaves with the current one + auto current = scene::Layers.directive(Snapshot.instance); + if (current.empty() || scene::Layers.instance(Snapshot.instance).dead) + { + ui()->set_status("Include of \"" + Snapshot.node_name + "\" is gone from the scenery, the change can't be taken back.", true); + return; + } + set_include_directive(Snapshot.instance, Snapshot.serialized); + Snapshot.serialized = std::move(current); + select_include(scene::Layers.removable(Snapshot.instance) ? Snapshot.instance : 0); +} + +void editor_mode::select_include(scene::instance_handle const Instance) +{ + m_instance = (scene::Layers.tracked(Instance) ? Instance : 0); + m_include = include_selection{}; + m_include_gesture = false; + if (m_instance == 0) + { + ui()->set_include(nullptr); + return; + } + auto const &included = scene::Layers.instance(m_instance); + m_include.instance = m_instance; + m_include.target = *included.file; + // NOTE: a template without a usable description is still presented, with its parameters unnamed + std::string error; + editor_includes::load(*included.file, m_include.info, error); + if (false == editor_includes::parse_directive(scene::Layers.directive(m_instance), m_include.target, m_include.values)) + { + m_include.values.clear(); + m_include.issue = "The directive of the include can't be read from the scenery file, its parameters can't be changed."; + } + // with a rotation or a scale in effect the parameters don't translate to a location in the scene in a single way, + // see place_include() + m_include.placement = (included.context.rotation == glm::vec3{0.f} && included.context.scale == glm::vec3{1.f}); + ui()->set_include(&m_include); +} + +void editor_mode::set_include_directive(scene::instance_handle const Instance, std::string const &Directive) +{ + if (false == scene::Layers.modify(Instance, Directive)) + return; + std::vector retired; + simulation::State.rebuild_include(Instance, retired); + // the pick of the renderer is resolved a few frames after it's requested, and can still deliver one of these + for (auto *model : retired) + m_retired.emplace_back(model, 120); +} + +void editor_mode::apply_include() +{ + if (m_instance == 0 || false == m_include.issue.empty()) + return; + for (auto const &value : m_include.values) + { + if (value == "end" || value.find_first_of("\"\r\n") != std::string::npos) + { + // either would cut the directive short + ui()->set_status("A parameter of an include can't be \"end\", or have a quotation mark in it.", true); + select_include(m_instance); // back to the values of the directive + return; + } + } + auto before = scene::Layers.directive(m_instance); + auto const directive = editor_includes::compose_directive(m_include.target, m_include.values); + if (directive == before) + return; + if (false == m_include_gesture) + { + // a single undo step for the whole drag + EditorSnapshot snap; + snap.instance = m_instance; + snap.node_name = *scene::Layers.instance(m_instance).file; + snap.serialized = std::move(before); + m_history.push_back(std::move(snap)); + g_redo.clear(); + m_include_gesture = true; + } + set_include_directive(m_instance, directive); +} + void editor_mode::place_include(std::string const &File, int const RotationMode, float const FixedRotation) { if (scene::Layers.empty()) @@ -1670,6 +1777,7 @@ void editor_mode::place_include(std::string const &File, int const RotationMode, snap.node_name = File; m_history.push_back(std::move(snap)); g_redo.clear(); + select_include(instance); ui()->set_status( "\"" + info.name + "\" placed in layer \"" + scene::Layers.layer(layer).name + "\": " + std::to_string(preview.first) + " model(s) shown" @@ -2097,7 +2205,15 @@ void editor_mode::render_gizmo_options() if (m_gizmo_snap < 0.0f) m_gizmo_snap = 0.0f; } - if (!m_node) + if (m_instance != 0) + { + auto const located = editor_includes::parameter_with_role(m_include.info, "pos.x") != 0 || editor_includes::parameter_with_role(m_include.info, "pos.y") != 0 || + editor_includes::parameter_with_role(m_include.info, "pos.z") != 0; + ImGui::TextDisabled("%s", false == located ? "Include selected, no position parameters described" : + false == m_include.placement ? "Include selected, no gizmo under rotate or scale" : + "Include selected, axes as its template allows"); + } + else if (!m_node) ImGui::TextDisabled("No node selected"); } @@ -2110,7 +2226,7 @@ void editor_mode::render_gizmo() return; } - if (!m_node) + if (!m_node && m_instance == 0) { m_gizmo_using = false; return; @@ -2134,6 +2250,12 @@ void editor_mode::render_gizmo() float const aspect = io.DisplaySize.y > 0.0f ? io.DisplaySize.x / io.DisplaySize.y : 1.0f; glm::mat4 const projection = glm::perspective(fovy, aspect, 0.1f, 10000.0f); + if (!m_node) + { + render_include_gizmo(view, projection, camerapos); + return; + } + // rotation/scale are only meaningful for instanced models; other node types translate only TAnimModel *model = dynamic_cast(m_node); @@ -2211,6 +2333,103 @@ void editor_mode::render_gizmo() } } +void editor_mode::render_include_gizmo(glm::mat4 const &View, glm::mat4 const &Projection, glm::dvec3 const &Camerapos) +{ + m_gizmo_using = false; + if (false == m_include.placement || false == m_include.issue.empty()) + return; + + // parameters of the template the gizmo can drive, as indices of their values; -1 where the template has none + static char const *const positionroles[] = {"pos.x", "pos.y", "pos.z"}; + static char const *const rotationroles[] = {"rot.x", "rot.y", "rot.z"}; + auto const numeric_parameter = [this](char const *Role, double &Value) { + auto const index = editor_includes::parameter_with_role(m_include.info, Role) - 1; + if (index < 0 || index >= static_cast(m_include.values.size())) + return -1; + auto const &text = m_include.values[index]; + char *end = nullptr; + auto const number = std::strtod(text.c_str(), &end); + if (text.empty() || *end != '\0') + return -1; + Value = number; + return index; + }; + int position[3], rotation[3]; + double location[3] = {0.0, 0.0, 0.0}, angles[3] = {0.0, 0.0, 0.0}; + auto positions = 0, rotations = 0; + for (auto axis = 0; axis < 3; ++axis) + { + position[axis] = numeric_parameter(positionroles[axis], location[axis]); + rotation[axis] = numeric_parameter(rotationroles[axis], angles[axis]); + positions += (position[axis] >= 0 ? 1 : 0); + rotations += (rotation[axis] >= 0 ? 1 : 0); + } + if (positions == 0) + return; // nothing tells where the include is + + // only the axes the template has parameters for can be manipulated + auto operation = 0; + for (auto axis = 0; axis < 3; ++axis) + { + if (m_gizmo_op == gizmo_operation::translate && position[axis] >= 0) + operation |= (ImGuizmo::TRANSLATE_X << axis); + else if (m_gizmo_op == gizmo_operation::rotate && rotation[axis] >= 0) + operation |= (ImGuizmo::ROTATE_X << axis); + } + if (operation == 0) + return; + auto const translating = (m_gizmo_op == gizmo_operation::translate); + + // the parameters are relative to the origin in effect at the directive + auto const &offset = scene::Layers.instance(m_instance).context.offset; + glm::vec3 const relativepos = glm::vec3(offset + glm::dvec3{location[0], location[1], location[2]} - Camerapos); + float const translation[3] = {relativepos.x, relativepos.y, relativepos.z}; + float const rotationangles[3] = {static_cast(angles[0]), static_cast(angles[1]), static_cast(angles[2])}; + float const scale[3] = {1.0f, 1.0f, 1.0f}; + glm::mat4 matrix(1.0f); + ImGuizmo::RecomposeMatrixFromComponents(translation, rotationangles, scale, glm::value_ptr(matrix)); + + // moving along the axes of the include would need all three of them + ImGuizmo::MODE const mode = (m_gizmo_local && (false == translating || positions == 3)) ? ImGuizmo::LOCAL : ImGuizmo::WORLD; + glm::vec3 const snapvalue(translating ? m_gizmo_snap : 5.0f); + float const *snap = Global.ctrlState && snapvalue.x > 0.0f ? glm::value_ptr(snapvalue) : nullptr; + + ImGuizmo::Manipulate(glm::value_ptr(View), glm::value_ptr(Projection), static_cast(operation), mode, glm::value_ptr(matrix), nullptr, snap); + + if (false == ImGuizmo::IsUsing()) + return; + m_gizmo_using = true; + + float newtranslation[3], newrotation[3], newscale[3]; + ImGuizmo::DecomposeMatrixToComponents(glm::value_ptr(matrix), newtranslation, newrotation, newscale); + if (translating) + { + glm::dvec3 const newlocation = Camerapos + glm::dvec3{newtranslation[0], newtranslation[1], newtranslation[2]} - offset; + for (auto axis = 0; axis < 3; ++axis) + { + if (position[axis] >= 0) + m_include.values[position[axis]] = editor_includes::number(newlocation[axis]); + } + } + else + { + if (rotations == 1) + { + // the decomposition spreads a turn of more than a quarter over all three angles; + // with a single axis to turn around the angle is taken straight from the matrix + newrotation[0] = glm::degrees(std::atan2(matrix[1][2], matrix[1][1])); + newrotation[1] = glm::degrees(std::atan2(-matrix[0][2], matrix[0][0])); + newrotation[2] = glm::degrees(std::atan2(matrix[0][1], matrix[0][0])); + } + for (auto axis = 0; axis < 3; ++axis) + { + if (rotation[axis] >= 0) + m_include.values[rotation[axis]] = editor_includes::number(clamp_circular(newrotation[axis])); + } + } + apply_include(); +} + void editor_mode::update_camera(double const Deltatime) { Camera.Update(); @@ -2294,7 +2513,7 @@ void editor_mode::exit() // drop selection so a stale/dangling node pointer isn't used on the next editor session m_node = nullptr; - m_instance = 0; + select_include(0); m_gizmo_using = false; ui()->set_node(nullptr); @@ -2400,7 +2619,7 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in m_history.push_back(std::move(snap)); g_redo.clear(); ui()->set_status("Include of \"" + *scene::Layers.instance(m_instance).file + "\" removed, Ctrl+Z brings it back. Its directive is erased when the scenery is saved."); - m_instance = 0; + select_include(0); break; } if (is_press(Action)) @@ -2526,7 +2745,7 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const return; m_node = nullptr; - m_instance = 0; + select_include(0); // in a scenery opened for editing selection has its limits. nodes of locked layers are off limits. // nodes defined by a scenery template can't be rewritten one by one on save, so a click on one @@ -2536,8 +2755,8 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const std::string reason; if (node->from_template() && scene::Layers.removable(node->m_instance, &reason)) { - m_instance = node->m_instance; - ui()->set_status("Include of \"" + *scene::Layers.instance(m_instance).file + "\" selected. Del removes it from the scenery."); + select_include(node->m_instance); + ui()->set_status("Include of \"" + *scene::Layers.instance(m_instance).file + "\" selected. Its parameters are in the node properties, Del removes it from the scenery."); node = nullptr; } else if (node->from_template() || false == scene::Layers.editable(node, &reason)) diff --git a/application/editormode.h b/application/editormode.h index f5248c711..edd35ea7e 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -129,6 +129,9 @@ class editor_mode : public application_mode scene::basic_editor m_editor; scene::basic_node *m_node{nullptr}; // currently selected scene node scene::instance_handle m_instance{0}; // currently selected include of a scenery template; these are handled as a whole + include_selection m_include; // parameters of the selected include, changed with the gizmo and in the node properties + bool m_include_gesture{false}; // a change of the selected include is under way, and has its undo snapshot already + std::vector> m_retired; // models replaced after changes of includes, with the frames left until they're destroyed bool m_takesnapshot{true}; // helper, hints whether snapshot of selected node(s) should be taken before modification bool m_dragging = false; glm::dvec3 oldPos; // world position of the last brush placement @@ -173,6 +176,16 @@ class editor_mode : public application_mode void place_include(std::string const &File, int RotationMode, float FixedRotation); // undo and redo of placing or removing an include: brings removed include back, or removes it void toggle_include(scene::instance_handle Instance); + // makes specified include the selected one, 0 clears the selection + void select_include(scene::instance_handle Instance); + // writes parameter values of the selected include to its directive, and shows the outcome in the scene + void apply_include(); + // replaces directive of specified include, and the models shown for it + void set_include_directive(scene::instance_handle Instance, std::string const &Directive); + // undo and redo of an include snapshot + void restore_include(EditorSnapshot &Snapshot); + // gizmo for the selected include, limited to what the parameters of its template can express + void render_include_gizmo(glm::mat4 const &View, glm::mat4 const &Projection, glm::dvec3 const &Camerapos); // exports the scenery in legacy (text) format, with layers hidden in the editor left out of the picture void export_scenery(); // raises/lowers terrain under the cursor while the left mouse button is held in sculpt mode diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index 70b6e0e19..422396900 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -164,6 +164,11 @@ void editor_ui::set_node(scene::basic_node *Node) m_node = Node; } +void editor_ui::set_include(include_selection *Include) +{ + m_itempropertiespanel.include(Include); +} + void editor_ui::add_node_template(const std::string &desc) { m_nodebankpanel.add_template(desc); diff --git a/application/editoruilayer.h b/application/editoruilayer.h index 3f24d7c46..bc9edbe1a 100644 --- a/application/editoruilayer.h +++ b/application/editoruilayer.h @@ -29,6 +29,8 @@ class editor_ui : public ui_layer // updates state of UI elements void update() override; void set_node(scene::basic_node *Node); + // include of a scenery template to show in the node properties in place of a node; nullptr if there's none + void set_include(include_selection *Include); void add_node_template(const std::string &desc); float rot_val(); bool rot_from_last(); diff --git a/application/editoruipanels.cpp b/application/editoruipanels.cpp index b93b5b0f4..fee74f2f8 100644 --- a/application/editoruipanels.cpp +++ b/application/editoruipanels.cpp @@ -312,6 +312,11 @@ void itemproperties_panel::render() void itemproperties_panel::render_body() { + if (m_include != nullptr) + { + render_include(); + return; + } // header section for (auto const &line : text_lines) { @@ -1187,6 +1192,74 @@ ImVec4 const status_errorcolor{1.0f, 0.45f, 0.4f, 1.0f}; } // namespace +void itemproperties_panel::render_include() +{ + auto &include{*m_include}; + include.active = false; + + ImGui::Text("include: %s", Bezogonkow(include.target).c_str()); + if (false == include.info.name.empty()) + { + ImGui::TextDisabled("%s", include.info.name.c_str()); + } + if (false == include.issue.empty()) + { + ImGui::PushTextWrapPos(0.0f); + ImGui::TextColored(status_errorcolor, "%s", Bezogonkow(include.issue).c_str()); + ImGui::PopTextWrapPos(); + return; + } + if (include.values.empty()) + { + ImGui::TextDisabled("The template takes no parameters."); + return; + } + + ImGui::PushItemWidth(ImGui::GetFontSize() * 14.0f); + for (std::size_t idx = 0; idx < include.values.size(); ++idx) + { + auto const id{static_cast(idx + 1)}; + auto const lookup{std::find_if(std::begin(include.info.parameters), std::end(include.info.parameters), [=](include_parameter const &Parameter) { return Parameter.id == id; })}; + auto const described{lookup != std::end(include.info.parameters)}; + auto const role{described ? lookup->role : std::string{"free"}}; + // the label from the description, or what the description tells about the parameter + auto const label{described && false == lookup->label.empty() ? lookup->label : role != "free" ? role : "(p" + std::to_string(id) + ")"}; + auto &value{include.values[idx]}; + + ImGui::PushID(id); + char *end{nullptr}; + auto number{std::strtod(value.c_str(), &end)}; + if ((role.starts_with("pos.") || role.starts_with("rot.") || role == "number") && false == value.empty() && *end == '\0') + { + if (ImGui::DragScalar(label.c_str(), ImGuiDataType_Double, &number, role.starts_with("pos.") ? 0.05f : 0.5f, nullptr, nullptr, "%.3f")) + { + value = editor_includes::number(number); + include.changed = true; + } + } + else + { + // applied once the field is left, so the template isn't processed with a half-typed value + input_text(label.c_str(), value); + if (ImGui::IsItemDeactivatedAfterEdit()) + { + include.changed = true; + } + } + include.active |= ImGui::IsItemActive(); + if (ImGui::IsItemHovered()) + { + ImGui::SetTooltip("(p%d), %s", id, role.c_str()); + } + ImGui::PopID(); + } + ImGui::PopItemWidth(); + + ImGui::PushStyleColor(ImGuiCol_Text, ImGui::GetStyleColorVec4(ImGuiCol_TextDisabled)); + ImGui::TextWrapped("Models of the template follow the changes at once, the rest of it once the scenery is saved and loaded again."); + ImGui::PopStyleColor(); +} + void layers_panel::report(std::string const &Status, bool const Error) { status = Status; diff --git a/application/editoruipanels.h b/application/editoruipanels.h index 099dc85fb..9d48ccce0 100644 --- a/application/editoruipanels.h +++ b/application/editoruipanels.h @@ -29,6 +29,20 @@ struct item_properties { changeable rotation {}; }; */ +// include of a scenery template selected in the editor, with the values its directive passes to the template. +// owned by the editor mode; the node properties let the user change the values +struct include_selection +{ + scene::instance_handle instance{0}; + std::string target; // name of the template, the way the directive spells it + include_info info; // description of the template + std::vector values; // value of each parameter in turn + bool placement{false}; // the position and rotation parameters can be driven by the gizmo + std::string issue; // why the values can't be changed, if they can't + bool changed{false}; // set by the UI when a value was changed, cleared by the editor mode once the change is applied + bool active{false}; // the UI is in the middle of changing a value +}; + class itemproperties_panel : public ui_panel { @@ -39,6 +53,11 @@ class itemproperties_panel : public ui_panel // position/rotation/scale of TAnimModel nodes in place. Other node types // are still treated as read-only. void update(scene::basic_node *Node); + // binds include of a scenery template to the panel, shown in place of a node; nullptr unbinds + void include(include_selection *Include) + { + m_include = Include; + } void render() override; // panel content without the window, also drawn inside the toolset window void render_body(); @@ -50,9 +69,12 @@ class itemproperties_panel : public ui_panel // renders DragFloat3/DragScalarN widgets for position, rotation and scale // of the currently bound TAnimModel; no-op for other node subclasses. void render_transform_editor(); + // renders widgets for the parameters of the bound include + void render_include(); // members scene::basic_node *m_node{nullptr}; // scene node bound to the panel + include_selection *m_include{nullptr}; // include of a scenery template bound to the panel scene::group_handle m_grouphandle{null_handle}; // scene group bound to the panel std::string m_groupprefix; std::vector m_grouplines; diff --git a/editor/editorIncludeInfo.cpp b/editor/editorIncludeInfo.cpp index 48c14062c..46116f9e8 100644 --- a/editor/editorIncludeInfo.cpp +++ b/editor/editorIncludeInfo.cpp @@ -543,15 +543,99 @@ bool complete(include_info const &Info, int const Parameters, std::string *Issue return issue.empty(); } +std::string number(double const Value) +{ + std::ostringstream converter; + converter.imbue(std::locale::classic()); + converter << std::fixed << std::setprecision(3) << Value; + return converter.str(); +} + +int parameter_with_role(include_info const &Info, std::string const &Role) +{ + auto const lookup{std::find_if(std::begin(Info.parameters), std::end(Info.parameters), [&](include_parameter const &Parameter) { return Parameter.role == Role; })}; + return lookup != std::end(Info.parameters) ? lookup->id : 0; +} + +bool parse_directive(std::string const &Directive, std::string &File, std::vector &Values) +{ + // the same rules the scenery parser goes by, except the text is taken as it is written + std::vector tokens; + std::string token; + auto const flush = [&]() { + if (false == token.empty()) + { + tokens.emplace_back(token); + token.clear(); + } + }; + for (std::size_t idx = 0; idx < Directive.size(); ++idx) + { + auto const character{Directive[idx]}; + if (character == '\"') + { + flush(); + auto const end{Directive.find('\"', idx + 1)}; + if (end == std::string::npos) + { + return false; + } + tokens.emplace_back(Directive, idx + 1, end - idx - 1); + idx = end; + } + else if (Directive.compare(idx, 2, "//") == 0) + { + flush(); + idx = Directive.find('\n', idx); + if (idx == std::string::npos) + { + break; + } + } + else if (Directive.compare(idx, 2, "/*") == 0) + { + flush(); + idx = Directive.find("*/", idx + 2); + if (idx == std::string::npos) + { + break; + } + ++idx; + } + else if (character == ' ' || character == '\t' || character == '\n' || character == '\r' || character == ';') + { + flush(); + } + else + { + token += character; + } + } + flush(); + if (tokens.size() < 3 || ToLower(tokens.front()) != "include" || tokens.back() != "end") + { + return false; + } + File = tokens[1]; + Values.assign(std::begin(tokens) + 2, std::end(tokens) - 1); + return true; +} + +std::string compose_directive(std::string const &File, std::vector const &Values) +{ + auto const quoted = [](std::string const &Text) { return Text.find_first_of(" \t;") != std::string::npos ? '\"' + Text + '\"' : Text; }; + std::string text{"include " + quoted(File)}; + for (auto const &value : Values) + { + // a parameter can't be left out, as the ones after it would take its place + text += ' ' + (value.empty() ? std::string{"none"} : quoted(value)); + } + return text + " end"; +} + std::string directive(std::string const &File, include_info const &Info, int const Parameters, glm::dvec3 const &Location, std::optional Yaw) { - auto const number = [](double const Value) { - std::ostringstream converter; - converter.imbue(std::locale::classic()); - converter << std::fixed << std::setprecision(3) << Value; - return converter.str(); - }; - std::string text{"include " + File}; + std::vector values; for (auto id = 1; id <= Parameters; ++id) { auto const lookup{std::find_if(std::begin(Info.parameters), std::end(Info.parameters), [=](include_parameter const &Parameter) { return Parameter.id == id; })}; @@ -585,14 +669,9 @@ std::string directive(std::string const &File, include_info const &Info, int con std::snprintf(suffix, sizeof(suffix), "_%08x", static_cast(engine())); value = (value.empty() ? std::filesystem::path(File).stem().string() : value) + suffix; } - if (value.empty()) - { - // a parameter can't be left out, as the ones after it would take its place - value = "none"; - } - text += ' ' + (value.find_first_of(" \t;") != std::string::npos ? '\"' + value + '\"' : value); + values.emplace_back(value); } - return text + " end"; + return compose_directive(File, values); } } // namespace editor_includes diff --git a/editor/editorIncludeInfo.hpp b/editor/editorIncludeInfo.hpp index 1273a049b..90241406f 100644 --- a/editor/editorIncludeInfo.hpp +++ b/editor/editorIncludeInfo.hpp @@ -68,6 +68,16 @@ bool complete(include_info const &Info, int Parameters, std::string *Issue = nul // rotation parameters receive their default values std::string directive(std::string const &File, include_info const &Info, int Parameters, glm::dvec3 const &Location, std::optional Yaw); +// splits include directive into the name of the included file and the values of the parameters, both as they're +// written. returns: false if the text isn't a complete include directive +bool parse_directive(std::string const &Directive, std::string &File, std::vector &Values); +// builds include directive out of the name of the included file and the values of the parameters +std::string compose_directive(std::string const &File, std::vector const &Values); +// text of a number passed as a parameter value +std::string number(double Value); +// number of the parameter with specified role, 0 if the description has none +int parameter_with_role(include_info const &Info, std::string const &Role); + // marks node bank template which stands for a scenery template rather than for definition of a single node extern std::string const directive_mark; diff --git a/scene/scenelayers.cpp b/scene/scenelayers.cpp index a3b3f51ee..990154423 100644 --- a/scene/scenelayers.cpp +++ b/scene/scenelayers.cpp @@ -210,8 +210,8 @@ void node_layers::visible(layer_handle Layer, bool const Visible) } if (Visible) { - // nodes of a removed include stay out of sight - if (Node->m_layerhidden && (false == tracked(Node->m_instance) || false == instance(Node->m_instance).removed)) + // nodes of a removed include stay out of sight, and so do the ones the editor replaced with its own + if (Node->m_layerhidden && (false == tracked(Node->m_instance) || (false == instance(Node->m_instance).removed && false == stale(Node)))) { Node->visible(true); Node->m_layerhidden = false; @@ -613,7 +613,7 @@ bool node_layers::can_merge(layer_handle Source, layer_handle Target, std::strin { // directives of includes placed in the editor are prepared for the end of their layer file auto const unsaved{std::any_of(std::begin(m_instances), std::end(m_instances), [&](include_instance const &Instance) { - return false == Instance.dead && false == Instance.removed && false == Instance.directive.empty() && resolve(Instance.layer) == Source; + return false == Instance.dead && false == Instance.removed && false == Instance.span.valid() && resolve(Instance.layer) == Source; })}; if (unsaved) { @@ -695,6 +695,7 @@ void node_layers::instance_begin(std::string const &File, source_span const &Spa included.layer = handle(); included.file = &(*m_templates.emplace(File).first); included.span = Span; + included.context = m_context; m_instance = static_cast(m_instances.size()); } @@ -741,7 +742,7 @@ void node_layers::removed(instance_handle Instance, bool Removed) auto const includelayer{resolve(m_instances[Instance - 1].layer)}; auto const layervisible{false == valid(includelayer) || layer(includelayer).visible}; auto const update_node = [=, this](basic_node *Node, layer_item const Item) { - if (Node == nullptr || Node->m_instance != Instance) + if (Node == nullptr || Node->m_instance != Instance || (Item == layer_item::model && stale(Node))) { return; } @@ -791,6 +792,67 @@ instance_handle node_layers::place(layer_handle Layer, std::string const &File, return static_cast(m_instances.size()); } +// text of the directive of specified include, as changed in the editor or as it stands in the scenery file +std::string node_layers::directive(instance_handle const Instance) const +{ + if (false == tracked(Instance)) + { + return {}; + } + auto const &included{instance(Instance)}; + if (false == included.directive.empty() || false == included.span.valid() || false == valid(included.layer)) + { + return included.directive; + } + std::string text(static_cast(included.span.end - included.span.begin), '\0'); + std::ifstream input{path(included.layer), std::ios_base::binary}; + if (false == input.is_open() || false == input.seekg(included.span.begin).good() || false == input.read(text.data(), static_cast(text.size())).good()) + { + return {}; + } + return text; +} + +// replaces the directive of specified include, the scenery file receives it on save +bool node_layers::modify(instance_handle const Instance, std::string const &Directive) +{ + if (false == tracked(Instance) || m_instances[Instance - 1].dead || Directive.empty()) + { + return false; + } + m_instances[Instance - 1].directive = Directive; + return true; +} + +// takes the models specified include was loaded with out of the scene, once the editor shows its own in their place +void node_layers::rebuilt(instance_handle const Instance) +{ + if (false == tracked(Instance) || m_instances[Instance - 1].rebuilt) + { + return; + } + auto const removed{m_instances[Instance - 1].removed}; + for (auto *model : simulation::Instances.sequence()) + { + if (model == nullptr || model->m_instance != Instance || model->m_preview) + { + continue; + } + // NOTE: the models themselves are left alone, events of the scenery can refer to them + simulation::Region->erase(model); + if (false == removed) + { + count(model->layer(), layer_item::model, -1); + } + if (model->visible()) + { + model->visible(false); + model->m_layerhidden = true; + } + } + m_instances[Instance - 1].rebuilt = true; +} + } // namespace scene //--------------------------------------------------------------------------- diff --git a/scene/scenelayers.h b/scene/scenelayers.h index 44661fc56..eacc64214 100644 --- a/scene/scenelayers.h +++ b/scene/scenelayers.h @@ -100,10 +100,11 @@ struct include_instance layer_handle layer{null_handle}; // layer of the file holding the directive std::string const *file{nullptr}; // name of the included template source_span span; // location of the whole directive in the file; invalid for directive which wasn't saved yet - std::string directive; // text of the directive, for include placed in the editor and not saved yet - layer_context context; // placement the directive of include placed in the editor was prepared for + std::string directive; // text of the directive, for include placed or changed in the editor and not saved yet + layer_context context; // placement in effect at the directive bool removed{false}; // the include is to be dropped from the scenery bool dead{false}; // removal of the include was saved + bool rebuilt{false}; // models the include was loaded with gave way to the ones made by the editor }; // marks nodes defined by a template which was included in a way the editor doesn't keep track of @@ -277,6 +278,18 @@ class node_layers // registers include directive made in the editor, to be written to the file of specified layer on save. // the directive has to be prepared for the placement in effect at the end of that file. returns: handle to the include instance_handle place(layer_handle Layer, std::string const &File, std::string const &Directive); + // text of the directive of specified include, as changed in the editor or as it stands in the scenery file. + // returns: empty text if the directive can't be read + std::string directive(instance_handle Instance) const; + // replaces the directive of specified include, the scenery file receives it on save. NOTE: the nodes aren't touched + bool modify(instance_handle Instance, std::string const &Directive); + // takes the models specified include was loaded with out of the scene, once the editor shows its own in their place + void rebuilt(instance_handle Instance); + // true if specified node was replaced by the editor with a node showing the current state of its include + bool stale(basic_node const *Node) const + { + return tracked(Node->m_instance) && instance(Node->m_instance).rebuilt && false == Node->m_preview; + } // true if specified layer is included, directly or not, by the other one bool is_descendant(layer_handle Layer, layer_handle const Ancestor) const; diff --git a/scene/scenelayerssave.cpp b/scene/scenelayerssave.cpp index f56c5c111..3a4071a21 100644 --- a/scene/scenelayerssave.cpp +++ b/scene/scenelayerssave.cpp @@ -275,6 +275,7 @@ struct node_layers::file_patch std::size_t length{0}; // size of that definition basic_node const *node{nullptr}; // node defined by the replacement layer_handle site{null_handle}; // layer included by the directive in the replacement + instance_handle instance{0}; // include of a template made by the directive in the replacement layer_handle inlined{null_handle}; // layer whose content replaces the range }; std::vector edits; @@ -460,6 +461,10 @@ bool node_layers::compose(save_state &State, layer_handle const Layer, compositi { Output.sites.push_back({edit.site, span}); } + if (edit.instance != 0) + { + Output.instances.push_back({edit.instance, span}); + } Output.text.append(edit.text, edit.lead - lead, std::string::npos); } cursor = end; @@ -692,6 +697,17 @@ save_result node_layers::save(std::vector const &Rootstatements) edit.end = included.span.end; state.patches[included.layer].edits.emplace_back(std::move(edit)); } + else if (false == included.directive.empty()) + { + // changed in the editor, the new directive takes the place of the one in the file + file_patch::edit edit; + edit.begin = included.span.begin; + edit.end = included.span.end; + edit.length = included.directive.size(); + edit.text = included.directive; + edit.instance = static_cast(idx + 1); + state.patches[included.layer].edits.emplace_back(std::move(edit)); + } } else if (false == included.removed && false == included.directive.empty()) { @@ -840,7 +856,7 @@ save_result node_layers::save(std::vector const &Rootstatements) for (std::size_t idx = 0; idx < m_instances.size(); ++idx) { auto const &included{m_instances[idx]}; - if (false == included.dead && false == included.removed && included.span.valid() && state.content.count(included.layer) != 0) + if (false == included.dead && false == included.removed && included.directive.empty() && included.span.valid() && state.content.count(included.layer) != 0) { state.instances[included.layer].emplace_back(static_cast(idx + 1)); } diff --git a/scene/scenenode.h b/scene/scenenode.h index 8de0e0604..df60187fe 100644 --- a/scene/scenenode.h +++ b/scene/scenenode.h @@ -385,6 +385,7 @@ public: std::string m_name; bool m_dirty { false }; bool m_layerhidden { false }; // the node was visible until the editor hid its scenery layer, or the include which defines it + bool m_preview { false }; // the node was made by the editor to show an include it placed or changed, and is replaced when the include changes scene::layer_handle m_layer { null_handle }; // scenery layer this node belongs to, if any // include of an *.inc template which defines the node; 0 if the node is defined directly by a scenery layer file. // such nodes can't be rewritten one by one on scenery save. set only for scenery opened for editing diff --git a/simulation/simulation.cpp b/simulation/simulation.cpp index e50eff37e..5f04c6114 100644 --- a/simulation/simulation.cpp +++ b/simulation/simulation.cpp @@ -497,6 +497,51 @@ std::pair state_manager::preview_include(std::string const &Directive, return m_serializer.preview_include(Directive, Context, Layer, Instance); } +std::pair state_manager::rebuild_include(scene::instance_handle const Instance, std::vector &Retired) { + if (false == scene::Layers.tracked(Instance)) { + return { 0, 0 }; + } + auto const &included { scene::Layers.instance(Instance) }; + // the models the include was loaded with don't match it anymore. + // NOTE: done ahead of retiring the models made by the editor, which are told from the loaded ones by their preview flag + scene::Layers.rebuilt(Instance); + for (auto *model : Instances.sequence()) { + if (model == nullptr || model->m_instance != Instance || false == model->m_preview) { + continue; + } + if (false == included.removed) { + scene::Layers.count(model->layer(), scene::layer_item::model, -1); + } + Region->erase(model); + scene::Hierarchy.erase(model->uuid.to_string()); + model->visible(false); + model->m_preview = false; + Retired.emplace_back(model); + } + if (included.dead) { + return { 0, 0 }; + } + auto const layer { scene::Layers.resolve(included.layer) }; + auto const result { m_serializer.preview_include(scene::Layers.directive(Instance), included.context, layer, Instance) }; + // what's shown for an include which is out of sight at the moment goes out of sight as well + auto const layerhidden { scene::Layers.valid(layer) && false == scene::Layers.layer(layer).visible }; + if (included.removed || layerhidden) { + for (auto *model : Instances.sequence()) { + if (model == nullptr || model->m_instance != Instance || false == model->m_preview) { + continue; + } + if (included.removed) { + scene::Layers.count(model->layer(), scene::layer_item::model, -1); + } + if (model->visible()) { + model->visible(false); + model->m_layerhidden = true; + } + } + } + return result; +} + void state_manager::delete_model(TAnimModel *model) { scene::Layers.count(model->layer(), scene::layer_item::model, -1); scene::Layers.forget(model); diff --git a/simulation/simulation.h b/simulation/simulation.h index fe5fc87be..b75056adb 100644 --- a/simulation/simulation.h +++ b/simulation/simulation.h @@ -46,6 +46,11 @@ public: // creates model instances defined by an include directive placed in the scenery editor std::pair preview_include(std::string const &Directive, scene::layer_context const &Context, scene::layer_handle Layer, scene::instance_handle Instance); + // replaces models shown for specified include with the ones defined by its current directive. Retired: receives + // the replaced models made by the editor. they're out of the scene already, but the renderer can still hold on + // to them for a few frames; pass them to Instances.purge() afterwards + std::pair + rebuild_include(scene::instance_handle Instance, std::vector &Retired); // delete TAnimModel instance void delete_model(TAnimModel *model); diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index ae0841af2..459e77551 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -1451,12 +1451,9 @@ std::pair state_serializer::preview_include(std::string const &Directi nodedata.instance = Instance; auto *instance { (nodedata.type == "model" && nodedata.range_min >= 0.0) ? deserialize_model(parser, scratch, nodedata) : nullptr }; if (instance != nullptr) { - // same as for a model loaded with the scenery - if (instance->Model() != nullptr) { - for (auto const &smokesource : instance->Model()->smoke_sources()) { - Particles.insert(smokesource.first, instance, smokesource.second); - } - } + // NOTE: unlike for a model loaded with the scenery, smoke sources of the model aren't set up. + // they'd be left with a dangling owner when the model is replaced after a change of the include + instance->m_preview = true; simulation::Instances.insert(instance); simulation::Region->insert(instance); scene::Hierarchy[instance->uuid.to_string()] = instance; diff --git a/simulation/simulationstateserializer.h b/simulation/simulationstateserializer.h index 2dd643074..2a39c9347 100644 --- a/simulation/simulationstateserializer.h +++ b/simulation/simulationstateserializer.h @@ -46,7 +46,7 @@ public: TAnimModel * create_model(std::string const &src, std::string const &name, const glm::dvec3 &position); // create new eventlauncher from node stirng TEventLauncher * create_eventlauncher(std::string const &src, std::string const &name, const glm::dvec3 &position); - // creates model instances defined by an include directive placed in the scenery editor, to show what was placed. + // creates model instances defined by an include directive placed or changed in the scenery editor, to show the outcome. // everything else the included template defines is left out, and takes effect when the saved scenery is loaded. // Context: placement in effect at the location of the directive. returns: number of created models and of skipped statements std::pair preview_include(std::string const &Directive, scene::layer_context const &Context, scene::layer_handle Layer, scene::instance_handle Instance); From 521c4f9ebb00235ab3557314d2b6e0368c3a8b7a Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Sat, 3 Oct 2026 01:59:13 +0200 Subject: [PATCH 041/430] feat(editor): keep content added by the editor ahead of FirstInit --- application/editormode.cpp | 10 +- application/editoruipanels.cpp | 12 +- scene/scenelayers.cpp | 110 +++++++++++++-- scene/scenelayers.h | 17 +++ scene/scenelayerssave.cpp | 164 ++++++++++++++++++----- simulation/simulationstateserializer.cpp | 3 + 6 files changed, 266 insertions(+), 50 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index ce22371d7..6edf40e4b 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -1740,19 +1740,19 @@ void editor_mode::place_include(std::string const &File, int const RotationMode, return; } - // the directive is written at the end of the file of the active layer, and has to make sense with the placement in effect there + // the directive is added to the file of the active layer, and has to make sense with the placement in effect where it goes auto const layer = scene::Layers.resolve(scene::Layers.active()); - if (std::string reason; false == scene::Layers.valid(layer) || scene::Layers.layer(layer).removed || false == scene::Layers.writable(layer, &reason)) + if (std::string reason; false == scene::Layers.accepts(layer, &reason)) { - ui()->set_status("Template \"" + File + "\" can't be placed: " + (reason.empty() ? "there's no active layer to put it in" : "the active layer can't be saved, " + reason), true); + ui()->set_status("Template \"" + File + "\" can't be placed: " + (reason.empty() ? "there's no active layer to put it in" : "the active layer can't take it, " + reason), true); return; } - auto const context = scene::Layers.layer(layer).context_end; + auto const context = scene::Layers.layer(layer).context_insert(); if (context.rotation != glm::vec3{0.f} || context.scale != glm::vec3{1.f}) { // a template can pass its parameters to an origin directive, which isn't affected by these, or straight to // the nodes, which are. there's no single set of parameter values which puts both at the cursor - ui()->set_status("Template \"" + File + "\" can't be placed: the file of the active layer ends with a rotation or a scale in effect. Pick another layer.", true); + ui()->set_status("Template \"" + File + "\" can't be placed: the file of the active layer would receive it with a rotation or a scale in effect. Pick another layer.", true); return; } glm::dvec3 const location = Camera.Pos + clamp_mouse_offset_to_max(GfxRenderer->Mouse_Position()); diff --git a/application/editoruipanels.cpp b/application/editoruipanels.cpp index fee74f2f8..4e9d423ea 100644 --- a/application/editoruipanels.cpp +++ b/application/editoruipanels.cpp @@ -1404,9 +1404,9 @@ void layers_panel::render_list() ImGui::SameLine(); if (ImGui::RadioButton("##active", isactive) && false == isactive) { - if (isremoved || false == iswritable) + if (std::string reason; false == scene::Layers.accepts(handle, &reason)) { - report("Layer \"" + layer_name(handle) + "\" can't take new nodes" + (isremoved ? "" : ": " + readonly), true); + report("Layer \"" + layer_name(handle) + "\" can't take new nodes" + (reason.empty() ? "" : ": " + reason), true); } else { @@ -1431,6 +1431,10 @@ void layers_panel::render_list() { label += " [read-only]"; } + else if (layer.late) + { + label += " [after FirstInit]"; + } if (ImGui::Selectable(label.c_str(), handle == m_selected)) { m_selected = handle; @@ -1446,6 +1450,10 @@ void layers_panel::render_list() { content += "\nread-only: " + readonly; } + if (layer.late) + { + content += "\nloaded after the scenario initialization (FirstInit): takes no new nodes, only vehicles belong there"; + } if (auto const items{layer_content(layer)}; false == items.empty()) { content += "\n" + items; diff --git a/scene/scenelayers.cpp b/scene/scenelayers.cpp index 990154423..0c9a1c5d2 100644 --- a/scene/scenelayers.cpp +++ b/scene/scenelayers.cpp @@ -60,6 +60,7 @@ layer_handle node_layers::open(std::string const &Name) m_layers.emplace_back(); m_layers.back().name = Name; m_layers.back().parent = handle(); + m_layers.back().late = m_initialized; stat(layerhandle); } else @@ -116,9 +117,83 @@ void node_layers::clear() m_templates.clear(); m_instances.clear(); m_instance = 0; + m_initialized = false; m_terraindirective = false; } +// indicates the scenario initialization (FirstInit) is being performed +void node_layers::initialization(source_span const &Span, bool const Infile) +{ + if (m_initialized) + { + return; + } + m_initialized = true; + if (m_stack.empty() || false == valid(m_stack.back())) + { + return; + } + // the layer file being loaded holds the directive, or includes the template which does + auto &holder{layer(m_stack.back())}; + if (Infile) + { + // NOTE: scenario without the directive is initialized at its end, with nothing in the file to point at + std::string text(Span.valid() ? static_cast(Span.end - Span.begin) : 0, '\0'); + std::ifstream input{path(m_stack.back()), std::ios_base::binary}; + if (text.empty() || false == input.is_open() || false == input.seekg(Span.begin).good() || false == input.read(text.data(), static_cast(text.size())).good() || + ToLower(text) != "firstinit") + { + return; + } + holder.init = Span; + } + else if (tracked(m_instance) && instance(m_instance).layer == m_stack.back()) + { + holder.init = instance(m_instance).span; + } + else + { + return; + } + holder.context_init = m_context; + // for the files it was included through the initialization takes place at their include directives + for (auto level{m_stack.size() - 1}; level > 0; --level) + { + auto const child{m_stack[level]}; + auto const parent{m_stack[level - 1]}; + if (false == valid(parent) || parent == child || layer(child).sites.empty() || layer(child).sites.back().parent != parent || layer(child).sites.back().fixed || + false == layer(child).sites.back().span.valid()) + { + break; + } + layer(parent).init = layer(child).sites.back().span; + layer(parent).context_init = layer(child).context_begin; + } +} + +// true if specified layer can receive content added in the editor +bool node_layers::accepts(layer_handle Layer, std::string *Reason) const +{ + Layer = resolve(Layer); + if (false == valid(Layer) || layer(Layer).removed) + { + return false; + } + if (false == writable(Layer, Reason)) + { + return false; + } + if (layer(Layer).late) + { + if (Reason != nullptr) + { + *Reason = "the file is loaded after the scenario initialization (FirstInit), which only vehicles should follow"; + } + return false; + } + return true; +} + // follows layer merges. returns: handle of the layer which currently holds content of specified layer layer_handle node_layers::resolve(layer_handle Layer) const { @@ -183,7 +258,7 @@ void node_layers::count(layer_handle Layer, layer_item const Item, int const Cha void node_layers::active(layer_handle Layer) { Layer = resolve(Layer); - if (false == valid(Layer) || layer(Layer).removed || false == writable(Layer)) + if (false == accepts(Layer)) { return; } @@ -422,6 +497,11 @@ layer_handle node_layers::create(std::string Name, layer_handle Parent, std::str Reason = "the parent layer can't include other files"; return null_handle; } + if (layer(Parent).late) + { + Reason = "the parent layer is loaded after the scenario initialization (FirstInit), which only vehicles should follow"; + return null_handle; + } // file names in the scenery are processed in lower case, with forward slashes Name = ToLower(Name); replace_slashes(Name); @@ -458,10 +538,11 @@ layer_handle node_layers::create(std::string Name, layer_handle Parent, std::str return null_handle; } - // the include directive goes after the last file included by the parent, so the scenery files stay ahead of - // what may follow them in a scenario, like the vehicles + // the include directive goes after the last file included by the parent ahead of the scenario initialization, + // so the scenery files stay ahead of what follows them in a scenario, like the vehicles auto anchor{null_handle}; std::streamoff anchorend{-1}; + auto const &init{layer(Parent).init}; for (std::size_t idx = 0; idx < m_layers.size(); ++idx) { auto const &sibling{m_layers[idx]}; @@ -470,7 +551,7 @@ layer_handle node_layers::create(std::string Name, layer_handle Parent, std::str continue; } auto const &site{sibling.sites.front()}; - if (site.parent == Parent && false == site.fixed && site.span.end > anchorend) + if (site.parent == Parent && false == site.fixed && site.span.end > anchorend && (false == init.valid() || site.span.end <= init.begin)) { anchor = static_cast(idx + 1); anchorend = site.span.end; @@ -486,7 +567,7 @@ layer_handle node_layers::create(std::string Name, layer_handle Parent, std::str created.editormade = true; created.anchor = anchor; // placement the new file is going to be loaded with - created.context_begin = valid(anchor) ? layer(anchor).context_end : layer(Parent).context_end; + created.context_begin = valid(anchor) ? layer(anchor).context_end : layer(Parent).context_insert(); created.context_end = created.context_begin; active(layerhandle); @@ -609,9 +690,16 @@ bool node_layers::can_merge(layer_handle Source, layer_handle Target, std::strin Reason = "the target layer is included by the merged one"; return false; } - if (false == source.context_end.matches(target.context_end)) + if (target.late != source.late && (source.created || source.sites.empty() || resolve(source.sites.front().parent) != Target)) { - // directives of includes placed in the editor are prepared for the end of their layer file + // the content would change sides of the scenario initialization + Reason = (target.late ? "the target layer is loaded after the scenario initialization (FirstInit), which only vehicles should follow" : + "the merged layer is loaded after the scenario initialization (FirstInit), its content has to stay there"); + return false; + } + if (false == source.context_insert().matches(target.context_insert())) + { + // directives of includes placed in the editor are prepared for the place their layer file receives them at auto const unsaved{std::any_of(std::begin(m_instances), std::end(m_instances), [&](include_instance const &Instance) { return false == Instance.dead && false == Instance.removed && false == Instance.span.valid() && resolve(Instance.layer) == Source; })}; @@ -642,9 +730,9 @@ bool node_layers::can_merge(layer_handle Source, layer_handle Target, std::strin } if (resolve(source.sites.front().parent) != Target) { - // the text is moved to the end of another file. its statements have to keep their meaning there, + // the text is moved to another file. its statements have to keep their meaning there, // and can't leave anything behind for what used to follow it - if (false == source.context_begin.matches(target.context_end) || false == source.context_end.matches(source.context_begin)) + if (false == source.context_begin.matches(target.context_insert()) || false == source.context_end.matches(source.context_begin)) { Reason = "the layers are loaded with different origin, rotation or scale"; return false; @@ -779,7 +867,7 @@ void node_layers::removed(instance_handle Instance, bool Removed) instance_handle node_layers::place(layer_handle Layer, std::string const &File, std::string const &Directive) { Layer = resolve(Layer); - if (false == valid(Layer) || m_instances.size() + 1 >= untracked_instance) + if (false == accepts(Layer) || m_instances.size() + 1 >= untracked_instance) { return 0; } @@ -788,7 +876,7 @@ instance_handle node_layers::place(layer_handle Layer, std::string const &File, included.layer = Layer; included.file = &(*m_templates.emplace(File).first); included.directive = Directive; - included.context = layer(Layer).context_end; + included.context = layer(Layer).context_insert(); return static_cast(m_instances.size()); } diff --git a/scene/scenelayers.h b/scene/scenelayers.h index eacc64214..211de91fc 100644 --- a/scene/scenelayers.h +++ b/scene/scenelayers.h @@ -81,6 +81,12 @@ struct basic_layer std::vector sites; // include directives bringing the file in; empty for the scenario file layer_context context_begin; // placement in effect at the start of the file... layer_context context_end; // ...and right after its end + // location in the file of what performs the scenario initialization, if the file takes a part in it: the FirstInit + // directive, or the directive including the file which holds it. only vehicles are meant to follow the + // initialization, so what the editor adds to the file goes ahead of this point rather than at the end + source_span init; + layer_context context_init; // placement in effect at that point + bool late{false}; // the file is loaded after the scenario initialization std::uintmax_t filesize{0}; // state of the file when it was loaded or saved the last time std::filesystem::file_time_type filetime{}; // pending changes, applied by the scenery save @@ -92,6 +98,11 @@ struct basic_layer bool dead{false}; // removal or merge of the layer was saved, it's no longer a part of the scenery std::size_t item_count() const; + // placement in effect at the point of the file which receives the content added by the editor + layer_context const &context_insert() const + { + return init.valid() ? context_init : context_end; + } }; // include directive bringing an *.inc template into a scenery layer file @@ -235,6 +246,11 @@ class node_layers void track(basic_node const *Node, source_span const &Span, glm::vec3 const &Angles = glm::vec3{0.f}, glm::vec3 const &Scale = glm::vec3{1.f}); // indicates specified node was removed from the scene void forget(basic_node const *Node); + // indicates the scenario initialization (FirstInit) is being performed. Span: location of the directive. + // Infile: the directive comes straight from the layer file being loaded + void initialization(source_span const &Span, bool Infile); + // true if specified layer can receive content added in the editor. optionally explains why it can't + bool accepts(layer_handle Layer, std::string *Reason = nullptr) const; // notes the scenery already holds the directive setting up terrain made in the editor void terrain_directive(bool const Present) { @@ -317,6 +333,7 @@ class node_layers std::set m_templates; // *.inc templates used by the scenery std::vector m_instances; // includes of the templates; instance handle is index in the vector + 1 instance_handle m_instance{0}; // helper, include whose template is being loaded + bool m_initialized{false}; // helper, the scenario initialization was performed already bool m_terraindirective{false}; }; diff --git a/scene/scenelayerssave.cpp b/scene/scenelayerssave.cpp index 3a4071a21..ade1b8847 100644 --- a/scene/scenelayerssave.cpp +++ b/scene/scenelayerssave.cpp @@ -304,28 +304,61 @@ struct node_layers::composition std::vector nodes; std::vector sites; std::vector instances; + source_span init; // location of what performs the scenario initialization, see basic_layer::init // adds another piece of text at the end void append(composition const &Other) { - auto const offset{static_cast(text.size())}; - text += Other.text; + insert(static_cast(text.size()), Other); + } + // adds another piece of text at specified location + void insert(std::streamoff const Location, composition const &Other) + { + auto const size{static_cast(Other.text.size())}; + auto const move = [=](source_span &Span) { + if (Span.begin >= Location) + { + Span.begin += size; + Span.end += size; + } + }; + for (auto &place : nodes) + { + move(place.span); + } + for (auto &place : sites) + { + move(place.span); + } + for (auto &place : instances) + { + move(place.span); + } + if (init.valid()) + { + move(init); + } + else if (Other.init.valid()) + { + init = {Other.init.begin + Location, Other.init.end + Location}; + } + text.insert(static_cast(Location), Other.text); for (auto place : Other.nodes) { - place.span.begin += offset; - place.span.end += offset; + place.span.begin += Location; + place.span.end += Location; nodes.emplace_back(place); } for (auto place : Other.sites) { - place.span.begin += offset; - place.span.end += offset; + place.span.begin += Location; + place.span.end += Location; sites.emplace_back(place); } for (auto place : Other.instances) { - place.span.begin += offset; - place.span.end += offset; + place.span.begin += Location; + place.span.end += Location; instances.emplace_back(place); } } @@ -361,12 +394,32 @@ bool node_layers::compose(save_state &State, layer_handle const Layer, compositi { edits = lookup->second.edits; } + // what's added to the file goes ahead of the scenario initialization, if the file takes a part in it + auto const &init{layer(Layer).init}; + auto const hasinit{init.valid() && init.end <= basesize}; + auto addition{basesize}; + if (hasinit) + { + addition = init.begin; + // on a line of its own, where the initialization has one + auto linebegin{addition}; + while (linebegin > 0 && (base[linebegin - 1] == ' ' || base[linebegin - 1] == '\t')) + { + --linebegin; + } + if (linebegin == 0 || base[linebegin - 1] == '\n') + { + addition = linebegin; + } + } + auto initedited{false}; // the directive standing for the initialization is replaced or removed for (auto &edit : edits) { if (edit.begin < 0) { - edit.begin = edit.end = basesize; + edit.begin = edit.end = addition; } + initedited |= hasinit && edit.begin == init.begin && edit.end == init.end; } std::stable_sort(std::begin(edits), std::end(edits), [](file_patch::edit const &Left, file_patch::edit const &Right) { return Left.begin < Right.begin; }); std::streamoff cursor{0}; @@ -502,6 +555,11 @@ bool node_layers::compose(save_state &State, layer_handle const Layer, compositi Output.instances.push_back({included, shift(instance(included).span)}); } } + // NOTE: with the file holding the initialization inlined, its own mark was carried over along with its text + if (hasinit && false == initedited && false == Output.init.valid()) + { + Output.init = shift(init); + } return true; } @@ -635,11 +693,11 @@ save_result node_layers::save(std::vector const &Rootstatements) } else if (Model != nullptr && false == Node->from_template()) { - // created in the editor. the definition is placed at the end of the layer file, with the placement in effect there + // created in the editor. the definition is added to the layer file, with the placement in effect at the place it goes to std::string text; Node->export_as_text(text); text.erase(text.find_last_not_of(" \t\r\n") + 1); - auto const &context{layer(nodelayer).context_end}; + auto const &context{layer(nodelayer).context_insert()}; if (false == context.matches(layer_context())) { model_placement placement; @@ -716,10 +774,10 @@ save_result node_layers::save(std::vector const &Rootstatements) { continue; } - if (false == included.context.matches(layer(target).context_end)) + if (false == included.context.matches(layer(target).context_insert())) { // shouldn't happen, merge of layers is refused when it'd lead to this - return fail("include \"" + *included.file + "\" was placed for different origin, rotation or scale than its layer ends with"); + return fail("include \"" + *included.file + "\" was placed for different origin, rotation or scale than its layer file receives it with"); } placed[target].emplace_back(static_cast(idx + 1)); } @@ -790,6 +848,7 @@ save_result node_layers::save(std::vector const &Rootstatements) } else { + // NOTE: negative location stands for the place the file receives additions at edit.begin = edit.end = -1; if (false == layer(parent).created) { @@ -797,12 +856,9 @@ save_result node_layers::save(std::vector const &Rootstatements) { return fail(state.error); } - auto const &content{state.content[parent]}; - if (false == content.empty() && content.back() != '\n') - { - edit.text = state.eol; - edit.lead = state.eol.size(); - } + // dropped by compose() if the text ahead ends with a line break already + edit.text = state.eol; + edit.lead = state.eol.size(); } edit.text += directive + state.eol; } @@ -878,6 +934,8 @@ save_result node_layers::save(std::vector const &Rootstatements) return fail(state.error); } text.append(body); + // what the editor adds to the file + composition added; if (auto const lookup{appended.find(output)}; lookup != appended.end()) { for (auto const merged : lookup->second) @@ -887,18 +945,18 @@ save_result node_layers::save(std::vector const &Rootstatements) { return fail(state.error); } - ensure_newline(text.text, eol); - text.append(mergedtext); + ensure_newline(added.text, eol); + added.append(mergedtext); } } if (auto const lookup{created.find(output)}; lookup != created.end()) { for (auto const &definition : lookup->second) { - ensure_newline(text.text, eol); - auto const offset{static_cast(text.text.size())}; - text.nodes.push_back({definition.first, {offset, offset + static_cast(definition.second.size())}, true}); - text.text += definition.second + eol; + ensure_newline(added.text, eol); + auto const offset{static_cast(added.text.size())}; + added.nodes.push_back({definition.first, {offset, offset + static_cast(definition.second.size())}, true}); + added.text += definition.second + eol; } } if (auto const lookup{placed.find(output)}; lookup != placed.end()) @@ -906,20 +964,49 @@ save_result node_layers::save(std::vector const &Rootstatements) for (auto const included : lookup->second) { auto const &directive{instance(included).directive}; - ensure_newline(text.text, eol); - auto const offset{static_cast(text.text.size())}; - text.instances.push_back({included, {offset, offset + static_cast(directive.size())}}); - text.text += directive + eol; + ensure_newline(added.text, eol); + auto const offset{static_cast(added.text.size())}; + added.instances.push_back({included, {offset, offset + static_cast(directive.size())}}); + added.text += directive + eol; } } if (output == root) { for (auto const &statement : Rootstatements) { - ensure_newline(text.text, eol); - text.text += statement + eol; + ensure_newline(added.text, eol); + added.text += statement + eol; } } + if (added.text.empty()) + { + continue; + } + if (false == text.init.valid()) + { + ensure_newline(text.text, eol); + text.append(added); + continue; + } + // the scenario initialization is meant to be followed by nothing but the vehicles, so the additions go ahead + // of it. they take whole lines, with the initialization left at the start of a line the way it was + ensure_newline(added.text, eol); + auto location{text.init.begin}; + while (location > 0 && (text.text[location - 1] == ' ' || text.text[location - 1] == '\t')) + { + --location; + } + if (location == 0 || text.text[location - 1] == '\n') + { + text.insert(location, added); + } + else + { + composition separated; + separated.text = eol; + separated.append(added); + text.insert(text.init.begin, separated); + } } // with everything worked out it's safe to touch the files. new content goes to temporary files first, @@ -1007,7 +1094,7 @@ save_result node_layers::save(std::vector const &Rootstatements) source.span = place.span; if (isnew) { - source.context = layer(output).context_end; + source.context = layer(output).context_insert(); } if (isnew || place.rewritten) { @@ -1036,6 +1123,19 @@ save_result node_layers::save(std::vector const &Rootstatements) included.sites.front().span = place.span; included.parent = output; } + // the mark of the scenario initialization moved along with the text around it, or came with the text of a merged layer + auto &saved{layer(output)}; + if (false == saved.init.valid() && texts[output].init.valid()) + { + for (std::size_t idx = 0; idx < m_layers.size(); ++idx) + { + if (m_layers[idx].init.valid() && m_layers[idx].merged != null_handle && resolve(static_cast(idx + 1)) == output) + { + saved.context_init = m_layers[idx].context_init; + } + } + } + saved.init = texts[output].init; } for (std::size_t idx = 0; idx < m_layers.size(); ++idx) { diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index 459e77551..9e90941f2 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -379,6 +379,9 @@ state_serializer::deserialize_firstinit( cParser &Input, scene::scratch_data &Sc if( true == Scratchpad.initialized ) { return; } + // scenery opened for editing: what the editor adds to the scenery files is kept ahead of the initialization + scene::Layers.initialization( { Input.TokenBegin(), Input.TokenEnd() }, Input.InLayerFile() ); + if( true == Scratchpad.binary.terrain ) { // at this stage it should be safe to import terrain from the binary scene file // TBD: postpone loading furter and only load required blocks during the simulation? From e46fe6d06c86c891ddbfdb45fd724fb90d6d82da Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 1 Oct 2026 22:48:39 +0200 Subject: [PATCH 042/430] refactor(track): reusable segment init, geometry rebuild, cell removal --- rendering/geometrybank.cpp | 4 +- scene/scene.cpp | 34 ++++ scene/scene.h | 19 ++ world/Track.cpp | 397 ++++++++++++++++++++----------------- world/Track.h | 7 + 5 files changed, 282 insertions(+), 179 deletions(-) diff --git a/rendering/geometrybank.cpp b/rendering/geometrybank.cpp index fcd731ddc..e853f4dc7 100644 --- a/rendering/geometrybank.cpp +++ b/rendering/geometrybank.cpp @@ -300,8 +300,8 @@ geometry_bank::replace( gfx::vertex_array &Vertices, userdata_array &Userdata, g // TBD: we could bail out with an error instead if such request occurs chunk.vertices.resize( Offset + Vertices.size(), gfx::basic_vertex() ); chunk.userdata.resize( Offset + Userdata.size(), gfx::vertex_userdata() ); - chunk.vertices.insert( std::end( chunk.vertices ), std::begin( Vertices ), std::end( Vertices ) ); - chunk.userdata.insert( std::end( chunk.userdata ), std::begin( Userdata ), std::end( Userdata ) ); + std::copy( std::begin( Vertices ), std::end( Vertices ), std::begin( chunk.vertices ) + Offset ); + std::copy( std::begin( Userdata ), std::end( Userdata ), std::begin( chunk.userdata ) + Offset ); } // template method implementation replace_( Geometry ); diff --git a/scene/scene.cpp b/scene/scene.cpp index 8ebff031e..7655ace6c 100644 --- a/scene/scene.cpp +++ b/scene/scene.cpp @@ -416,6 +416,40 @@ basic_cell::insert( TMemCell *Memorycell ) { // NOTE: memory cells are virtual 'points' hence they don't ever expand cell range } +// removes provided path from the cell +void +basic_cell::erase( TTrack *Path ) { + + m_paths.erase( + std::remove( std::begin( m_paths ), std::end( m_paths ), Path ), + std::end( m_paths ) ); + // drop the path from the animation list, the cell won't update it anymore + if( tTrackAnim == Path ) { + tTrackAnim = Path->SwitchExtension->pNextAnim; + Path->SwitchExtension->pNextAnim = nullptr; + } + else { + for( auto *track = tTrackAnim; track != nullptr; track = track->SwitchExtension->pNextAnim ) { + if( track->SwitchExtension->pNextAnim == Path ) { + track->SwitchExtension->pNextAnim = Path->SwitchExtension->pNextAnim; + Path->SwitchExtension->pNextAnim = nullptr; + break; + } + } + } + Path->RaOwnerSet( nullptr ); + // TODO: update cell bounding area +} + +// removes provided path from the lookup directory of the cell +void +basic_cell::unregister_end( TTrack *Path ) { + + m_directories.paths.erase( + std::remove( std::begin( m_directories.paths ), std::end( m_directories.paths ), Path ), + std::end( m_directories.paths ) ); +} + // removes provided model instance from the cell void basic_cell::erase( TAnimModel *Instance ) { diff --git a/scene/scene.h b/scene/scene.h index 9f5201f85..7b5901823 100644 --- a/scene/scene.h +++ b/scene/scene.h @@ -145,6 +145,12 @@ public: // registers provided traction piece in the lookup directory of the cell void register_end( TTraction *Traction ); + // removes provided path from the cell + void + erase( TTrack *Path ); + // removes provided path from the lookup directory of the cell + void + unregister_end( TTrack *Path ); // removes provided model instance from the cell void erase( TAnimModel *Instance ); @@ -308,6 +314,11 @@ public: void register_node( Type_ *Node, glm::dvec3 const &Point ) { cell( Point ).register_end( Node ); } + // removes provided node from the lookup directory of the section enclosing specified point + template + void + unregister_node( Type_ *Node, glm::dvec3 const &Point ) { + cell( Point ).unregister_end( Node ); } // find a vehicle located nearest to specified point, within specified radius. reurns: located vehicle and distance std::tuple find( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled, bool const Findbycoupler ); @@ -435,6 +446,14 @@ public: auto const location{ Node->location() }; if( point_inside( location ) ) { section( location ).erase( Node ); } } + // removes specified node from the region and from the lookup directories of its ends + template + void + erase_and_unregister( Type_ *Node ) { + for( auto const &point : Node->endpoints() ) { + if( point_inside( point ) ) { + section( point ).unregister_node( Node, point ); } } + erase( Node ); } // find a vehicle located nearest to specified point, within specified radius. reurns: located vehicle and distance std::tuple find_vehicle( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled, bool const Findbycoupler ); diff --git a/world/Track.cpp b/world/Track.cpp index 6155116ce..75f0ec6f1 100644 --- a/world/Track.cpp +++ b/world/Track.cpp @@ -382,8 +382,7 @@ void TTrack::ConnectNextNext(TTrack *pTrack, int typ) void TTrack::Load(cParser *parser, glm::dvec3 const &pOrigin) { // pobranie obiektu trajektorii ruchu - glm::dvec3 pt, vec, p1, p2, cp1, cp2, p3, p4, cp3, cp4; // dodatkowe punkty potrzebne do skrzyżowań - double a1, a2, r1, r2, r3, r4; + double a1, a2; std::string str; size_t i; //,state; //Ra: teraz już nie ma początkowego stanu zwrotnicy we wpisie std::string token; @@ -501,8 +500,6 @@ void TTrack::Load(cParser *parser, glm::dvec3 const &pOrigin) else if (Global.iWriteLogEnabled & 4) WriteLog("unvis"); Init(); // ustawia SwitchExtension - double segsize = 5.0; // długość odcinka segmentowania - // path data // all subtypes contain at least one path m_paths.emplace_back(); @@ -521,6 +518,198 @@ void TTrack::Load(cParser *parser, glm::dvec3 const &pOrigin) } } + init_segments( true ); + + // optional attributes + parser->getTokens(); + *parser >> token; + str = token; + while (str != "endtrack") + { + if (str == "event0") + { + parser->getTokens(); + *parser >> token; + m_events0.emplace_back( token, nullptr ); + } + else if (str == "event1") + { + parser->getTokens(); + *parser >> token; + m_events1.emplace_back( token, nullptr ); + } + else if (str == "event2") + { + parser->getTokens(); + *parser >> token; + m_events2.emplace_back( token, nullptr ); + } + else if (str == "eventall0") + { + parser->getTokens(); + *parser >> token; + m_events0all.emplace_back( token, nullptr ); + } + else if (str == "eventall1") + { + parser->getTokens(); + *parser >> token; + m_events1all.emplace_back( token, nullptr ); + } + else if (str == "eventall2") + { + parser->getTokens(); + *parser >> token; + m_events2all.emplace_back( token, nullptr ); + } + else if (str == "velocity") + { + parser->getTokens(); + *parser >> fVelocity; //*0.28; McZapkie-010602 + if (SwitchExtension) // jeśli tor ruchomy + if (std::abs(fVelocity) >= 1.0) //żeby zero nie ograniczało dożywotnio + // zapamiętanie głównego ograniczenia; a np. -40 ogranicza tylko na bok + SwitchExtension->fVelocity = static_cast(fVelocity); + } + else if (str == "isolated") + { // obwód izolowany, do którego tor należy + parser->getTokens(); + *parser >> token; + Isolated.push_back(TIsolated::Find(token)); + } + else if (str == "angle1") + { // kąt ścięcia końca od strony 1 + // NOTE: not used/implemented + parser->getTokens(); + *parser >> a1; + //Segment->AngleSet(0, a1); + } + else if (str == "angle2") + { // kąt ścięcia końca od strony 2 + // NOTE: not used/implemented + parser->getTokens(); + *parser >> a2; + //Segment->AngleSet(1, a2); + } + else if (str == "fouling1") + { // wskazanie modelu ukresu w kierunku 1 + // NOTE: not used/implemented + parser->getTokens(); + *parser >> token; + // nFouling[0]= + } + else if (str == "fouling2") + { // wskazanie modelu ukresu w kierunku 2 + // NOTE: not used/implemented + parser->getTokens(); + *parser >> token; + // nFouling[1]= + } + else if (str == "overhead") + { // informacja o stanie sieci: 0-jazda bezprądowa, >0-z opuszczonym i ograniczeniem prędkości + parser->getTokens(); + *parser >> fOverhead; + if (fOverhead > 0.0) + iAction |= 0x40; // flaga opuszczenia pantografu (tor uwzględniany w skanowaniu jako + // ograniczenie dla pantografujących) + } + else if( str == "vradius" ) { + // y-axis track radius + // NOTE: not used/implemented + parser->getTokens(); + *parser >> fVerticalRadius; + } + else if( str == "trackbed" ) { + // switch trackbed texture + auto const trackbedtexture { parser->getToken() }; + if( eType == tt_Switch ) { + SwitchExtension->m_material3 = GfxRenderer->Fetch_Material( trackbedtexture ); + } + } + else if( str == "railprofile" ) { + // rail profile + auto const railprofile { parser->getToken() }; + if( iCategoryFlag == 1 ) { + m_profile1 = fetch_track_rail_profile( railprofile ); + } + } + else if( str == "friction" ) { + // memory cell holding friction value modifiers + m_friction.first = parser->getToken(); + } + else if( str == "sleepermodel" ) { + // sleepermodel + // - frequency: meters between consecutive sleeper instances (must be > 0) + // - model: path to the .e3d sleeper model + // - skin: replacable skin path, or "none" for the model's defaults + // - offset: local-space offset applied per-instance (x=left/right, y=forward/back, z=up/down) + // - ballastZ: vertical shift applied to the auto-generated trackbed (ballast). negative pushes ballast down. + float frequency { 0.f }; + float offsetx { 0.f }, offsety { 0.f }, offsetz { 0.f }; + float ballastz { 0.f }; + parser->getTokens( 1, false ); *parser >> frequency; + auto modelpath { parser->getToken( false ) }; + auto skinpath { parser->getToken( false ) }; + parser->getTokens( 3, false ); *parser >> offsetx >> offsety >> offsetz; + parser->getTokens( 1, false ); *parser >> ballastz; + + if( frequency <= 0.01f ) { + ErrorLog( "Bad track: invalid sleepermodel frequency (" + std::to_string( frequency ) + ") for track \"" + m_name + "\"" ); + } + else { + replace_slashes( modelpath ); + m_sleeper_enabled = true; + m_sleeper_frequency = frequency; + m_sleeper_model_name = modelpath; + m_sleeper_skin_name = skinpath; + m_sleeper_offset = glm::vec3( offsetx, offsety, offsetz ); + m_sleeper_ballast_z = ballastz; + // model and skin are resolved (and instance transforms baked) in build_sleeper_transforms, + // called after segment initialisation so the path geometry is final. + } + } + else + ErrorLog("Bad track: unknown property: \"" + str + "\" defined for track \"" + m_name + "\""); + parser->getTokens(); + *parser >> token; + str = token; + } + // alternatywny zapis nazwy odcinka izolowanego - po znaku "@" w nazwie toru + if ((i = m_name.find("@")) != std::string::npos && i < m_name.length()) + { + Isolated.push_back(TIsolated::Find(m_name.substr(i + 1, m_name.length()))); + m_name = m_name.substr(0, i - 1); // usunięcie z nazwy + } + + update_location(); + // sleeper transforms are baked later in create_geometry(), once the owning cell has + // assigned this track its m_origin (otherwise the local-space matrices would be relative + // to a stale origin and the renderer would draw sleepers in the wrong place). +} + +// calculates path location from the current segment +void TTrack::update_location() { + + location( ( + CurrentSegment()->FastGetPoint_0() + + CurrentSegment()->FastGetPoint( 0.5 ) + + CurrentSegment()->FastGetPoint_1() ) + / 3.0 ); +} + +// (re)creates path segments from the source path data in m_paths +// Initial: true when called during deserialization; the editor passes false to keep the current switch state +void TTrack::init_segments( bool const Initial ) { + + glm::dvec3 p1, p2, cp1, cp2, p3, p4, cp3, cp4; // dodatkowe punkty potrzebne do skrzyżowań + double r1, r2, r3, r4; + double segsize = 5.0; // długość odcinka segmentowania + + // TSegment::Init() raises the trackbed for the roll fix through MovedUp1(); drop the previous adjustment + // so repeated initialization doesn't accumulate it + fTexHeight1 -= fTexHeightOffset; + fTexHeightOffset = 0.f; + switch (eType) { // Ra: łuki segmentowane co 5m albo 314-kątem foremnym case tt_Table: { @@ -773,7 +962,9 @@ void TTrack::Load(cParser *parser, glm::dvec3 const &pOrigin) } } - Switch(0); // na stałe w położeniu 0 - nie ma początkowego stanu zwrotnicy we wpisie + if( Initial ) { + Switch(0); + } // na stałe w położeniu 0 - nie ma początkowego stanu zwrotnicy we wpisie if( eType == tt_Switch ) // Ra: zamienić później na iloczyn wektorowy @@ -796,177 +987,6 @@ void TTrack::Load(cParser *parser, glm::dvec3 const &pOrigin) break; } } - - // optional attributes - parser->getTokens(); - *parser >> token; - str = token; - while (str != "endtrack") - { - if (str == "event0") - { - parser->getTokens(); - *parser >> token; - m_events0.emplace_back( token, nullptr ); - } - else if (str == "event1") - { - parser->getTokens(); - *parser >> token; - m_events1.emplace_back( token, nullptr ); - } - else if (str == "event2") - { - parser->getTokens(); - *parser >> token; - m_events2.emplace_back( token, nullptr ); - } - else if (str == "eventall0") - { - parser->getTokens(); - *parser >> token; - m_events0all.emplace_back( token, nullptr ); - } - else if (str == "eventall1") - { - parser->getTokens(); - *parser >> token; - m_events1all.emplace_back( token, nullptr ); - } - else if (str == "eventall2") - { - parser->getTokens(); - *parser >> token; - m_events2all.emplace_back( token, nullptr ); - } - else if (str == "velocity") - { - parser->getTokens(); - *parser >> fVelocity; //*0.28; McZapkie-010602 - if (SwitchExtension) // jeśli tor ruchomy - if (std::abs(fVelocity) >= 1.0) //żeby zero nie ograniczało dożywotnio - // zapamiętanie głównego ograniczenia; a np. -40 ogranicza tylko na bok - SwitchExtension->fVelocity = static_cast(fVelocity); - } - else if (str == "isolated") - { // obwód izolowany, do którego tor należy - parser->getTokens(); - *parser >> token; - Isolated.push_back(TIsolated::Find(token)); - } - else if (str == "angle1") - { // kąt ścięcia końca od strony 1 - // NOTE: not used/implemented - parser->getTokens(); - *parser >> a1; - //Segment->AngleSet(0, a1); - } - else if (str == "angle2") - { // kąt ścięcia końca od strony 2 - // NOTE: not used/implemented - parser->getTokens(); - *parser >> a2; - //Segment->AngleSet(1, a2); - } - else if (str == "fouling1") - { // wskazanie modelu ukresu w kierunku 1 - // NOTE: not used/implemented - parser->getTokens(); - *parser >> token; - // nFouling[0]= - } - else if (str == "fouling2") - { // wskazanie modelu ukresu w kierunku 2 - // NOTE: not used/implemented - parser->getTokens(); - *parser >> token; - // nFouling[1]= - } - else if (str == "overhead") - { // informacja o stanie sieci: 0-jazda bezprądowa, >0-z opuszczonym i ograniczeniem prędkości - parser->getTokens(); - *parser >> fOverhead; - if (fOverhead > 0.0) - iAction |= 0x40; // flaga opuszczenia pantografu (tor uwzględniany w skanowaniu jako - // ograniczenie dla pantografujących) - } - else if( str == "vradius" ) { - // y-axis track radius - // NOTE: not used/implemented - parser->getTokens(); - *parser >> fVerticalRadius; - } - else if( str == "trackbed" ) { - // switch trackbed texture - auto const trackbedtexture { parser->getToken() }; - if( eType == tt_Switch ) { - SwitchExtension->m_material3 = GfxRenderer->Fetch_Material( trackbedtexture ); - } - } - else if( str == "railprofile" ) { - // rail profile - auto const railprofile { parser->getToken() }; - if( iCategoryFlag == 1 ) { - m_profile1 = fetch_track_rail_profile( railprofile ); - } - } - else if( str == "friction" ) { - // memory cell holding friction value modifiers - m_friction.first = parser->getToken(); - } - else if( str == "sleepermodel" ) { - // sleepermodel - // - frequency: meters between consecutive sleeper instances (must be > 0) - // - model: path to the .e3d sleeper model - // - skin: replacable skin path, or "none" for the model's defaults - // - offset: local-space offset applied per-instance (x=left/right, y=forward/back, z=up/down) - // - ballastZ: vertical shift applied to the auto-generated trackbed (ballast). negative pushes ballast down. - float frequency { 0.f }; - float offsetx { 0.f }, offsety { 0.f }, offsetz { 0.f }; - float ballastz { 0.f }; - parser->getTokens( 1, false ); *parser >> frequency; - auto modelpath { parser->getToken( false ) }; - auto skinpath { parser->getToken( false ) }; - parser->getTokens( 3, false ); *parser >> offsetx >> offsety >> offsetz; - parser->getTokens( 1, false ); *parser >> ballastz; - - if( frequency <= 0.01f ) { - ErrorLog( "Bad track: invalid sleepermodel frequency (" + std::to_string( frequency ) + ") for track \"" + m_name + "\"" ); - } - else { - replace_slashes( modelpath ); - m_sleeper_enabled = true; - m_sleeper_frequency = frequency; - m_sleeper_model_name = modelpath; - m_sleeper_skin_name = skinpath; - m_sleeper_offset = glm::vec3( offsetx, offsety, offsetz ); - m_sleeper_ballast_z = ballastz; - // model and skin are resolved (and instance transforms baked) in build_sleeper_transforms, - // called after segment initialisation so the path geometry is final. - } - } - else - ErrorLog("Bad track: unknown property: \"" + str + "\" defined for track \"" + m_name + "\""); - parser->getTokens(); - *parser >> token; - str = token; - } - // alternatywny zapis nazwy odcinka izolowanego - po znaku "@" w nazwie toru - if ((i = m_name.find("@")) != std::string::npos && i < m_name.length()) - { - Isolated.push_back(TIsolated::Find(m_name.substr(i + 1, m_name.length()))); - m_name = m_name.substr(0, i - 1); // usunięcie z nazwy - } - - // calculate path location - location( ( - CurrentSegment()->FastGetPoint_0() - + CurrentSegment()->FastGetPoint( 0.5 ) - + CurrentSegment()->FastGetPoint_1() ) - / 3.0 ); - // sleeper transforms are baked later in create_geometry(), once the owning cell has - // assigned this track its m_origin (otherwise the local-space matrices would be relative - // to a stale origin and the renderer would draw sleepers in the wrong place). } bool TTrack::AssignEvents() { @@ -1333,6 +1353,22 @@ glm::vec3 TTrack::get_nearest_point(const glm::dvec3 &point) const } // wypełnianie tablic VBO +// discards references to current render geometry and generates it anew in specified bank +// NOTE: geometry banks can't release chunks, so the old data stays in the bank, unused +void TTrack::rebuild_geometry( gfx::geometrybank_handle const &Bank ) { + + if( Bank == null_handle ) { return; } + + Geometry1.clear(); + Geometry2.clear(); + if( SwitchExtension ) { + SwitchExtension->Geometry3 = gfx::geometry_handle{}; + } + m_sleeper_local_transforms.clear(); + + create_geometry( Bank ); +} + void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { gfx::userdata_array empty_userdata; // bake per-instance sleeper transforms now that the owning cell has assigned m_origin. @@ -2319,6 +2355,8 @@ TTrack::export_as_text_( std::ostream &Output ) const { << fTexSlope << ' '; } // path data + // NOTE: default stream precision would round coordinates to centimetres or worse, breaking path connections + auto const precision { Output.precision( std::numeric_limits::digits10 ) }; for( auto const &path : m_paths ) { Output << path.points[ segment_data::point::start ].x << ' ' @@ -2341,6 +2379,7 @@ TTrack::export_as_text_( std::ostream &Output ) const { << path.radius << ' '; } + Output.precision( precision ); // optional attributes std::vector< std::pair< std::string, event_sequence const * > > const eventsequences { { "event0", &m_events0 }, { "eventall0", &m_events0all }, @@ -2379,13 +2418,17 @@ TTrack::export_as_text_( std::ostream &Output ) const { } if( eType == tt_Switch && SwitchExtension->m_material3 != null_handle) { - auto texturefile { GfxRenderer->Material( m_material2 )->GetName() }; + auto texturefile { GfxRenderer->Material( SwitchExtension->m_material3 )->GetName() }; if( texturefile.find( paths::textures ) == 0 ) { // don't include 'textures/' in the path texturefile.erase( 0, std::string{ paths::textures }.size() ); } Output << "trackbed " << texturefile << ' '; } + if( iCategoryFlag == 1 + && false == m_profile1.first.empty() ) { + Output << "railprofile " << m_profile1.first << ' '; + } if( false == m_friction.first.empty() ) { Output << "friction " << m_friction.first << ' '; } diff --git a/world/Track.h b/world/Track.h index 9bf38e0a5..33379dfd7 100644 --- a/world/Track.h +++ b/world/Track.h @@ -154,6 +154,7 @@ class TTrack : public scene::basic_node friend opengl33_renderer; // NOTE: temporary arrangement friend itemproperties_panel; + friend class editor_track; public: std::vector Isolated; // obwód izolowany obsługujący zajęcia/zwolnienia grupy torów @@ -278,6 +279,10 @@ public: RouteCount() const { return SwitchExtension != nullptr ? SwitchExtension->iRoads - 1 : 1; } void Load(cParser *parser, glm::dvec3 const &pOrigin); + // (re)creates path segments from the source path data in m_paths + void init_segments( bool const Initial ); + // calculates path location from the current segment + void update_location(); bool AssignEvents(); bool AssignForcedEvents(basic_event *NewEventPlus, basic_event *NewEventMinus); void QueueEvents( event_sequence const &Events, TDynamicObject const *Owner ); @@ -300,6 +305,8 @@ public: double ActiveLength(); void create_geometry( gfx::geometrybank_handle const &Bank ); // wypełnianie VBO + // discards current render geometry and generates it anew in specified bank + void rebuild_geometry( gfx::geometrybank_handle const &Bank ); void create_map_geometry(std::vector &Bank, const gfx::geometrybank_handle Extra); void get_map_active_paths(map_colored_paths &handles); void get_map_paths_for_state(map_colored_paths &handles, int state); From b93c5dde60b5253fe1e6e5b833dc1a49bfe9207f Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 1 Oct 2026 23:00:16 +0200 Subject: [PATCH 043/430] feat(editor): edit tracks loaded from the scenery --- CMakeLists.txt | 2 + application/editormode.cpp | 54 ++- application/editormode.h | 41 +- application/editormodetrack.cpp | 613 ++++++++++++++++++++++++++++++ application/editoruilayer.cpp | 4 + application/editoruilayer.h | 6 + application/editoruipanels.cpp | 2 +- application/editoruipanels.h | 3 +- editor/editorTrack.cpp | 645 ++++++++++++++++++++++++++++++++ editor/editorTrack.hpp | 136 +++++++ world/Track.cpp | 7 +- 11 files changed, 1507 insertions(+), 6 deletions(-) create mode 100644 application/editormodetrack.cpp create mode 100644 editor/editorTrack.cpp create mode 100644 editor/editorTrack.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f13c2b8c..dabcc1679 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -170,9 +170,11 @@ set(SOURCES "editor/editorModelSets.cpp" "editor/editorIncludeInfo.cpp" "editor/editorTerrain.cpp" +"editor/editorTrack.cpp" "editor/editorTerrainStreamer.cpp" "editor/editorOrthophoto.cpp" "application/editormode.cpp" +"application/editormodetrack.cpp" "input/editormouseinput.cpp" "application/editoruilayer.cpp" "application/editoruipanels.cpp" diff --git a/application/editormode.cpp b/application/editormode.cpp index 6edf40e4b..0e044433f 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -339,6 +339,7 @@ editor_mode::editor_mode() { ui()->set_fill_options([this]() { render_area_fill(); }); ui()->set_gizmo_options([this]() { render_gizmo_options(); }); ui()->set_file_actions([this]() { save(); }, [this]() { export_scenery(); }); + ui()->set_track_options([this]() { render_track_ui(); }); // the orthophoto is fitted onto the same ground as the area fill uses, terrain tile models included m_orthophoto.ground_source([](glm::dvec2 const &Min, glm::dvec2 const &Max, std::vector &Out) { gather_ground_triangles(Min, Max, true, 50.0f, Out); @@ -680,6 +681,12 @@ void editor_mode::undo_last() return; } + if (snap.action == EditorSnapshot::Action::TrackEdit) + { + restore_track_snapshot(snap, g_redo); + return; + } + if (snap.action == EditorSnapshot::Action::Delete) { // undo delete -> recreate model @@ -769,6 +776,12 @@ void editor_mode::redo_last() return; } + if (snap.action == EditorSnapshot::Action::TrackEdit) + { + restore_track_snapshot(snap, m_history); + return; + } + // handle delete redo (re-delete) separately if (snap.action == EditorSnapshot::Action::Delete) { @@ -996,6 +1009,10 @@ bool editor_mode::update() // --- ImGuizmo: in-viewport transform gizmo for the selected node --- render_gizmo(); + // --- path editing: course and point handles of the selected path --- + if (selected_track()) + draw_track_overlay(); + // --- area fill: outline overlay while the mode is active (its settings are drawn in the node bank window) --- if (ui()->mode() == nodebank_panel::FILL) draw_area_fill_outline(); @@ -2232,6 +2249,13 @@ void editor_mode::render_gizmo() return; } + // paths aren't transformed as a whole node, they're edited through their source data + if (selected_track()) + { + render_track_gizmo(); + return; + } + ImGuizmo::BeginFrame(); ImGuizmo::SetOrthographic(false); @@ -2504,6 +2528,13 @@ void editor_mode::exit() FreeFlyModeFlag = m_statebackup.freefly; Global.pCamera = m_statebackup.camera; + commit_track_drag(true); + m_track_gizmo_using = false; + m_track_drag.clear(); + m_track_drag_points.clear(); + m_track_snap = {}; + m_track_point = {}; + g_redo.clear(); m_history.clear(); m_fill_last.clear(); @@ -2647,6 +2678,12 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in } break; + case GLFW_KEY_ESCAPE: + // track mode: release the selected point handle, so the gizmo moves the whole path again + if (is_press(Action) && ui()->mode() == nodebank_panel::TRACK) + m_track_point = {}; + break; + case GLFW_KEY_BACKSPACE: // area fill: remove the last outline point if (is_press(Action) && ui()->mode() == nodebank_panel::FILL && !m_fill_points.empty()) @@ -2735,6 +2772,20 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const return; } + // in track mode the left button selects a point handle of the selected path, or another path + if (mode == nodebank_panel::TRACK) + { + if (false == ImGuizmo::IsOver() && false == pick_track_handle()) + { + GfxRenderer->Pick_Node_Callback([this](scene::basic_node *node) { + if (viewport_click()) + select_track(node); + }); + } + m_input.mouse.button(Button, Action); + return; + } + // delegate node picking behaviour depending on current panel mode. // NOTE: the pick is resolved a few frames later, often after the button was already released, // so the callback mustn't depend on the button still being held @@ -2879,7 +2930,8 @@ void editor_mode::render_change_history(){ s.action == EditorSnapshot::Action::Delete ? "DEL" : s.action == EditorSnapshot::Action::Move ? "MOV" : s.action == EditorSnapshot::Action::Rotate ? "ROT" : - s.action == EditorSnapshot::Action::Scale ? "SCA" : "OTH", + s.action == EditorSnapshot::Action::Scale ? "SCA" : + s.action == EditorSnapshot::Action::TrackEdit ? "TRK" : "OTH", s.node_name.empty() ? "(noname)" : s.node_name.c_str(), s.position.x, s.position.y, s.position.z); diff --git a/application/editormode.h b/application/editormode.h index edd35ea7e..6dc9320de 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -19,12 +19,16 @@ http://mozilla.org/MPL/2.0/. #include "editor/editorTerrain.hpp" #include "editor/editorTerrainStreamer.hpp" #include "editor/editorOrthophoto.hpp" +#include "editor/editorTrack.hpp" +#include +#include #include #include #include class TAnimModel; +class TTrack; class editor_mode : public application_mode { @@ -85,7 +89,7 @@ class editor_mode : public application_mode struct EditorSnapshot { - enum class Action { Move, Rotate, Scale, Add, Delete, Other }; + enum class Action { Move, Rotate, Scale, Add, Delete, TrackEdit, Other }; Action action{Action::Other}; std::string node_name; // node identifier (basic_node::name()) @@ -98,6 +102,8 @@ class editor_mode : public application_mode UID uuid; // node UUID for reference, used as fallback lookup for deleted/recreated nodes scene::layer_handle layer{null_handle}; // scenery layer of the node, so a recreated node returns to it scene::instance_handle instance{0}; // include of a scenery template which was placed or removed, instead of a node + // TrackEdit: state of all paths modified by the change (the edited path and neighbours dragged along) + std::vector> tracks; }; void push_snapshot(scene::basic_node *node, EditorSnapshot::Action Action = EditorSnapshot::Action::Move, std::string const &Serialized = std::string()); @@ -268,4 +274,37 @@ class editor_mode : public application_mode bool m_gizmo_local{false}; // manipulate in the object's local space instead of world space gizmo_operation m_gizmo_op{gizmo_operation::translate}; // current transform mode (translate/rotate/scale) float m_gizmo_snap{1.0f}; // translation snap step (metres) applied while Ctrl is held + + // path (track) editing, implemented in editormodetrack.cpp + TTrack *selected_track() const; + // settings and parameters of the selected path, drawn in the node bank tab of the track mode + void render_track_ui(); + // curve and point handles of the selected path + void draw_track_overlay() const; + // selects the point handle of the selected path located under the cursor. returns: true if a handle was hit + bool pick_track_handle(); + // selects the path picked in the viewport + void select_track(scene::basic_node *Node); + // gizmo for the selected path: moves the selected point handle, or the whole path + void render_track_gizmo(); + // rebuilds paths modified by the ongoing drag; unless forced, at most a few times per second + void commit_track_drag(bool const Force); + // records provided state of paths in the undo history + void push_track_snapshot(std::vector> States); + // restores state of paths stored in the history, moving their current state to the opposite stack + void restore_track_snapshot(EditorSnapshot const &Snapshot, std::vector &Opposite); + editor_track::point_ref m_track_point; // selected point handle of the selected path + std::vector m_track_drag; // paths modified by the ongoing gizmo drag + std::vector> m_track_drag_points; // end points of neighbours dragged along + editor_track::snap_target m_track_snap; // connection made at the end of the ongoing drag + glm::dvec3 m_track_pivot{0.0}; // rotation pivot of the ongoing drag + glm::mat4 m_track_gizmo{1.0f}; // gizmo matrix, kept for the duration of a drag + bool m_track_gizmo_using{false}; + bool m_track_dirty{false}; // drag changes waiting for rebuild + std::chrono::steady_clock::time_point m_track_last_commit; + editor_track::state m_track_field_before; // state of the path before the ongoing field edit + std::array, 3> m_track_materials{}; // material names being edited + float m_track_snap_radius{1.0f}; + bool m_track_align_tangent{true}; + bool m_track_drag_connected{true}; }; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp new file mode 100644 index 000000000..ab2831297 --- /dev/null +++ b/application/editormodetrack.cpp @@ -0,0 +1,613 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +// path (track) editing part of the editor mode + +#include "stdafx.h" +#include "application/editormode.h" +#include "application/editoruilayer.h" + +#include "utilities/Globals.h" +#include "rendering/renderer.h" +#include "world/Track.h" + +#include "imgui/imgui.h" +#include "imgui/ImGuizmo.h" +#include +#include +#include +#include +#include + +namespace +{ + +// projects world points onto the screen, with the same camera-relative view and clean perspective the gizmo uses +class screen_projection +{ + public: + screen_projection() + { + ImGuiIO const &io = ImGui::GetIO(); + m_size = io.DisplaySize; + m_camera = GfxRenderer->Camera_Position(); + float const fovy = glm::radians(Global.FieldOfView / Global.ZoomFactor); + float const aspect = m_size.y > 0.0f ? m_size.x / m_size.y : 1.0f; + m_viewprojection = glm::perspective(fovy, aspect, 0.1f, 10000.0f) * GfxRenderer->Camera_View_Matrix(); + } + + glm::vec4 clip(glm::dvec3 const &Point) const + { + return m_viewprojection * glm::vec4(glm::vec3(Point - m_camera), 1.0f); + } + ImVec2 screen(glm::vec4 const &Clip) const + { + return ImVec2((Clip.x / Clip.w * 0.5f + 0.5f) * m_size.x, (0.5f - Clip.y / Clip.w * 0.5f) * m_size.y); + } + // returns: true if the point is in front of the camera + bool project(glm::dvec3 const &Point, ImVec2 &Screen) const + { + auto const c = clip(Point); + if (c.w < kNear) + return false; + Screen = screen(c); + return true; + } + // draws a line, clipped against the near plane so points behind the camera don't flip across the screen + void line(ImDrawList *Drawlist, glm::dvec3 const &A, glm::dvec3 const &B, ImU32 const Color, float const Thickness) const + { + glm::vec4 a = clip(A); + glm::vec4 b = clip(B); + if (a.w < kNear && b.w < kNear) + return; + if (a.w < kNear) + a = glm::mix(a, b, (kNear - a.w) / (b.w - a.w)); + else if (b.w < kNear) + b = glm::mix(b, a, (kNear - b.w) / (a.w - b.w)); + Drawlist->AddLine(screen(a), screen(b), Color, Thickness); + } + + private: + static constexpr float kNear{0.1f}; + ImVec2 m_size; + glm::dvec3 m_camera; + glm::mat4 m_viewprojection; +}; + +// point on the course of a path, matching the curve TSegment builds from the same data +glm::dvec3 path_point(segment_data const &Path, double const T) +{ + auto const &p0 = Path.points[segment_data::point::start]; + auto const &p3 = Path.points[segment_data::point::end]; + auto const &cp1 = Path.points[segment_data::point::control1]; + auto const &cp2 = Path.points[segment_data::point::control2]; + if (cp1 == glm::dvec3{} && cp2 == glm::dvec3{}) + return glm::mix(p0, p3, T); + auto const p1 = p0 + cp1; + auto const p2 = p3 + cp2; + double const u = 1.0 - T; + return u * u * u * p0 + 3.0 * u * u * T * p1 + 3.0 * u * T * T * p2 + T * T * T * p3; +} + +char const *point_label(editor_track::point_kind const Kind) +{ + switch (Kind) + { + case editor_track::point_kind::start: return "Start"; + case editor_track::point_kind::control1: return "Control 1"; + case editor_track::point_kind::control2: return "Control 2"; + default: return "End"; + } +} + +bool is_end(editor_track::point_kind const Kind) +{ + return Kind == editor_track::point_kind::start || Kind == editor_track::point_kind::end; +} + +editor_track::point_kind const kPointKinds[] = {editor_track::point_kind::start, editor_track::point_kind::control1, editor_track::point_kind::control2, editor_track::point_kind::end}; + +// screen distance within which a click grabs a point handle +float const kHandleRadius{10.0f}; + +} // namespace + +TTrack *editor_mode::selected_track() const +{ + return dynamic_cast(m_node); +} + +void editor_mode::select_track(scene::basic_node *Node) +{ + auto *track = dynamic_cast(Node); + if (track == nullptr) + { + // a click beside the selected path releases its point handle + m_track_point = {}; + return; + } + // paths are long, so the distance is measured to the nearest point of the path rather than its centre + glm::dvec3 const camera{Global.pCamera.Pos}; + if (glm::distance(glm::dvec3(track->get_nearest_point(camera)), camera) > static_cast(kMaxPlacementDistance)) + return; + + if (track != m_node) + m_track_point = {}; + m_node = track; + ui()->set_node(m_node); +} + +bool editor_mode::pick_track_handle() +{ + auto *track = selected_track(); + if (track == nullptr || false == editor_track::is_supported(*track)) + return false; + + screen_projection const projection; + ImVec2 const mouse = ImGui::GetIO().MousePos; + float best = kHandleRadius * kHandleRadius; + editor_track::point_ref hit; + for (int i = 0; i < static_cast(track->m_paths.size()); ++i) + { + for (auto const kind : kPointKinds) + { + editor_track::point_ref const point{i, kind}; + ImVec2 screen; + if (false == projection.project(editor_track::point_position(*track, point), screen)) + continue; + float const dx = screen.x - mouse.x; + float const dy = screen.y - mouse.y; + // end points take precedence over control points placed at the same spot + float const distance = (dx * dx + dy * dy) * (is_end(kind) ? 0.5f : 1.0f); + if (distance < best) + { + best = distance; + hit = point; + } + } + } + if (false == hit.valid()) + return false; + m_track_point = hit; + return true; +} + +void editor_mode::draw_track_overlay() const +{ + auto const *track = selected_track(); + if (track == nullptr) + return; + + screen_projection const projection; + ImDrawList *drawlist = ImGui::GetBackgroundDrawList(); + bool const trackmode = ui()->mode() == nodebank_panel::TRACK; + + // course of the path, from its source data so it follows the edits before the path is rebuilt + ImU32 const coursecolor = IM_COL32(40, 220, 255, 220); + int constexpr samples{32}; + for (auto const &path : track->m_paths) + { + auto previous = path_point(path, 0.0); + for (int i = 1; i <= samples; ++i) + { + auto const next = path_point(path, static_cast(i) / samples); + projection.line(drawlist, previous, next, coursecolor, 2.5f); + previous = next; + } + } + if (false == trackmode || false == editor_track::is_supported(*track)) + return; + + // control vectors + ImU32 const vectorcolor = IM_COL32(200, 200, 200, 160); + for (int i = 0; i < static_cast(track->m_paths.size()); ++i) + { + projection.line(drawlist, editor_track::point_position(*track, {i, editor_track::point_kind::start}), editor_track::point_position(*track, {i, editor_track::point_kind::control1}), vectorcolor, 1.0f); + projection.line(drawlist, editor_track::point_position(*track, {i, editor_track::point_kind::end}), editor_track::point_position(*track, {i, editor_track::point_kind::control2}), vectorcolor, 1.0f); + } + // handles: end points coloured by connection state (green: connected, red: free), control points as squares + for (int i = 0; i < static_cast(track->m_paths.size()); ++i) + { + for (auto const kind : kPointKinds) + { + editor_track::point_ref const point{i, kind}; + ImVec2 screen; + if (false == projection.project(editor_track::point_position(*track, point), screen)) + continue; + bool const selected = (point == m_track_point); + if (is_end(kind)) + { + ImU32 const color = editor_track::is_connected(*track, point) ? IM_COL32(60, 220, 60, 255) : IM_COL32(240, 60, 60, 255); + drawlist->AddCircleFilled(screen, 6.0f, color); + } + else + { + drawlist->AddRectFilled(ImVec2(screen.x - 4.0f, screen.y - 4.0f), ImVec2(screen.x + 4.0f, screen.y + 4.0f), IM_COL32(230, 230, 230, 255)); + } + if (selected) + drawlist->AddCircle(screen, 10.0f, IM_COL32(255, 220, 40, 255), 16, 2.5f); + } + } + // connection to be made when the ongoing drag ends + if (m_track_snap.track != nullptr) + { + ImVec2 screen; + if (projection.project(m_track_snap.position, screen)) + drawlist->AddCircle(screen, 14.0f, IM_COL32(255, 60, 255, 255), 20, 3.0f); + projection.line(drawlist, m_track_snap.position, m_track_snap.position + m_track_snap.direction * 5.0, IM_COL32(255, 60, 255, 200), 2.0f); + } +} + +void editor_mode::render_track_gizmo() +{ + auto *track = selected_track(); + std::string reason; + if (track == nullptr || false == editor_track::can_edit_geometry(*track, reason)) + { + m_track_gizmo_using = false; + return; + } + bool const pointmode = ui()->mode() == nodebank_panel::TRACK && m_track_point.valid() && m_track_point.path < static_cast(track->m_paths.size()); + + ImGuizmo::BeginFrame(); + ImGuizmo::SetOrthographic(false); + ImGuiIO const &io = ImGui::GetIO(); + ImGuizmo::SetRect(0.0f, 0.0f, io.DisplaySize.x, io.DisplaySize.y); + + // same camera-relative view and clean perspective as the transform gizmo of the other nodes + glm::mat4 const view = GfxRenderer->Camera_View_Matrix(); + glm::dvec3 const camerapos = GfxRenderer->Camera_Position(); + float const fovy = glm::radians(Global.FieldOfView / Global.ZoomFactor); + float const aspect = io.DisplaySize.y > 0.0f ? io.DisplaySize.x / io.DisplaySize.y : 1.0f; + glm::mat4 const projection = glm::perspective(fovy, aspect, 0.1f, 10000.0f); + + // point handles only move; the whole path moves or turns around the vertical axis + ImGuizmo::OPERATION const operation = (false == pointmode && m_gizmo_op == gizmo_operation::rotate) ? ImGuizmo::ROTATE_Y : ImGuizmo::TRANSLATE; + + if (false == m_track_gizmo_using) + { + auto const anchor = pointmode ? editor_track::point_position(*track, m_track_point) : editor_track::pivot(*track); + m_track_gizmo = glm::translate(glm::mat4(1.0f), glm::vec3(anchor - camerapos)); + } + + glm::vec3 snapvalue(operation == ImGuizmo::ROTATE_Y ? 5.0f : m_gizmo_snap); + float const *snap = Global.ctrlState && snapvalue.x > 0.0f ? glm::value_ptr(snapvalue) : nullptr; + glm::mat4 delta(1.0f); + ImGuizmo::Manipulate(glm::value_ptr(view), glm::value_ptr(projection), operation, ImGuizmo::WORLD, glm::value_ptr(m_track_gizmo), glm::value_ptr(delta), snap); + + if (ImGuizmo::IsUsing()) + { + if (false == m_track_gizmo_using) + { + // drag start: gather the paths it modifies and record their state for undo + m_track_gizmo_using = true; + m_track_pivot = editor_track::pivot(*track); + m_track_drag = {track}; + m_track_drag_points.clear(); + m_track_snap = {}; + if (pointmode && is_end(m_track_point.kind) && m_track_drag_connected) + { + for (auto const &connection : editor_track::connected_points(*track, editor_track::point_position(*track, m_track_point))) + { + std::string neighbourreason; + if (false == editor_track::can_edit_geometry(*connection.first, neighbourreason)) + continue; + m_track_drag_points.emplace_back(connection); + if (std::find(m_track_drag.begin(), m_track_drag.end(), connection.first) == m_track_drag.end()) + m_track_drag.emplace_back(connection.first); + } + } + std::vector> states; + for (auto *dragged : m_track_drag) + states.emplace_back(dragged, editor_track::capture(*dragged)); + push_track_snapshot(std::move(states)); + } + + if (operation == ImGuizmo::ROTATE_Y) + { + double const angle = std::atan2(delta[2][0], delta[0][0]); + if (std::abs(angle) > 1e-9) + { + editor_track::rotate_y(*track, m_track_pivot, angle); + m_track_dirty = true; + } + } + else if (pointmode) + { + glm::dvec3 const position = camerapos + glm::dvec3(m_track_gizmo[3]); + editor_track::move_point(*track, m_track_point, position); + for (auto const &connection : m_track_drag_points) + editor_track::move_point(*connection.first, connection.second, position); + m_track_dirty = true; + // a free end point can be connected with another path; a joint moved as a whole stays as it is + if (is_end(m_track_point.kind) && m_track_drag_points.empty()) + { + std::vector const exclude(m_track_drag.begin(), m_track_drag.end()); + m_track_snap = editor_track::find_snap_target(*track, position, m_track_snap_radius, exclude); + } + } + else + { + glm::dvec3 const offset{delta[3]}; + if (glm::length(offset) > 1e-9) + { + editor_track::translate(*track, offset); + m_track_dirty = true; + } + } + commit_track_drag(false); + } + else if (m_track_gizmo_using) + { + // drag end: make the offered connection and rebuild everything for good + if (m_track_snap.track != nullptr && pointmode) + { + editor_track::snap_point(*track, m_track_point, m_track_snap, m_track_align_tangent); + m_track_dirty = true; + } + m_track_snap = {}; + commit_track_drag(true); + m_track_gizmo_using = false; + m_track_drag.clear(); + m_track_drag_points.clear(); + } +} + +void editor_mode::commit_track_drag(bool const Force) +{ + if (false == m_track_dirty || m_track_drag.empty()) + return; + // each rebuild re-uploads geometry of the affected sections, so it isn't done on every frame of a drag + auto const now = std::chrono::steady_clock::now(); + if (false == Force && now - m_track_last_commit < std::chrono::milliseconds(100)) + return; + editor_track::commit(m_track_drag); + m_track_dirty = false; + m_track_last_commit = now; +} + +void editor_mode::push_track_snapshot(std::vector> States) +{ + if (States.empty()) + return; + + if (m_max_history_size >= 0 && (int)m_history.size() >= m_max_history_size) + m_history.erase(m_history.begin(), m_history.begin() + ((int)m_history.size() - m_max_history_size + 1)); + + auto *track = States.front().first; + EditorSnapshot snap; + snap.action = EditorSnapshot::Action::TrackEdit; + snap.node_name = track->name(); + snap.node_ptr = track; + snap.position = track->location(); + snap.uuid = track->uuid; + snap.tracks = std::move(States); + m_history.push_back(std::move(snap)); + g_redo.clear(); +} + +void editor_mode::restore_track_snapshot(EditorSnapshot const &Snapshot, std::vector &Opposite) +{ + if (Snapshot.tracks.empty()) + return; + + EditorSnapshot current{Snapshot}; + std::vector tracks; + for (auto &entry : current.tracks) + { + tracks.emplace_back(entry.first); + entry.second = editor_track::capture(*entry.first); + } + Opposite.push_back(std::move(current)); + + for (auto const &entry : Snapshot.tracks) + editor_track::apply(*entry.first, entry.second); + editor_track::commit(tracks); + + m_track_snap = {}; + m_track_dirty = false; + if (m_node != tracks.front()) + m_track_point = {}; + m_node = tracks.front(); + ui()->set_node(m_node); +} + +void editor_mode::render_track_ui() +{ + ImGui::TextDisabled("LMB: select path or point handle Esc: release point\nGizmo moves the selected point, otherwise the whole path (W: turn)"); + auto *track = selected_track(); + if (track == nullptr) + { + ImGui::TextDisabled("No path selected"); + return; + } + + char const *type = track->eType == tt_Normal ? "normal" : track->eType == tt_Switch ? "switch" : track->eType == tt_Cross ? "cross" : track->eType == tt_Table ? "turntable" : track->eType == tt_Tributary ? "tributary" : "unknown"; + char const *category = (track->iCategoryFlag & 1) ? "rail" : (track->iCategoryFlag & 2) ? "road" : (track->iCategoryFlag & 4) ? "river" : "other"; + ImGui::Text("%s (%s %s, %.2f m)", track->name().empty() ? "(noname)" : track->name().c_str(), category, type, track->Length()); + + if (false == editor_track::is_supported(*track)) + { + ImGui::TextDisabled("Editing of this path type isn't supported"); + return; + } + std::string reason; + bool const geometry = editor_track::can_edit_geometry(*track, reason); + if (false == geometry) + ImGui::TextColored(ImVec4(1.0f, 0.6f, 0.2f, 1.0f), "Geometry locked: %s", reason.c_str()); + + auto const before = editor_track::capture(*track); + // records undo state when a field edit starts, and rebuilds the path once it's finished + enum class rebuild { none, parameters, geometry }; + auto const finish_edit = [&](rebuild const Rebuild) { + if (ImGui::IsItemActivated()) + m_track_field_before = before; + if (ImGui::IsItemDeactivatedAfterEdit()) + { + push_track_snapshot({{track, m_track_field_before}}); + switch (Rebuild) + { + case rebuild::geometry: editor_track::commit({track}); break; + case rebuild::parameters: editor_track::commit_parameters(*track); break; + default: track->mark_dirty(); break; + } + } + }; + // applies a change made with a widget which reports it at once, like a combo box + auto const apply_now = [&](rebuild const Rebuild) { + push_track_snapshot({{track, before}}); + if (Rebuild == rebuild::parameters) + editor_track::commit_parameters(*track); + else + track->mark_dirty(); + }; + + if (ImGui::CollapsingHeader("Path parameters", ImGuiTreeNodeFlags_DefaultOpen)) + { + ImGui::PushItemWidth(120.0f); + double velocity = editor_track::velocity(*track); + if (ImGui::InputDouble("Velocity (km/h, -1: none)", &velocity, 0.0, 0.0, "%.1f")) + editor_track::velocity(*track, velocity); + finish_edit(rebuild::none); + if (ImGui::InputFloat("Friction", &track->fFriction, 0.0f, 0.0f, "%.3f")) + track->fFriction = std::max(0.0f, track->fFriction); + finish_edit(rebuild::none); + ImGui::InputFloat("Sound distance", &track->fSoundDistance, 0.0f, 0.0f, "%.1f"); + finish_edit(rebuild::none); + ImGui::InputInt("Quality", &track->iQualityFlag, 0); + finish_edit(rebuild::none); + int damage = track->iDamageFlag; + if (ImGui::InputInt("Damage flags", &damage, 0)) + editor_track::damage(*track, damage); + finish_edit(rebuild::none); + + char const *environments[] = {"flat", "mountains", "canyon", "tunnel", "bridge", "bank"}; + int environment = std::clamp(static_cast(track->eEnvironment), 0, 5); + if (ImGui::Combo("Environment", &environment, environments, IM_ARRAYSIZE(environments))) + { + track->eEnvironment = static_cast(environment); + apply_now(rebuild::none); + } + + if (ImGui::InputFloat("Width", &track->fTrackWidth, 0.0f, 0.0f, "%.3f")) + track->fTrackWidth = std::max(0.01f, track->fTrackWidth); + finish_edit(rebuild::parameters); + ImGui::PopItemWidth(); + + if (track->m_visible) + { + // material names are edited in local buffers, refreshed from the path whenever no field is being edited + material_handle *materials[] = {&track->m_material1, &track->m_material2, track->SwitchExtension ? &track->SwitchExtension->m_material3 : nullptr}; + char const *labels[] = {"Texture 1 (rails/surface)", "Texture 2 (trackbed/side)", "Trackbed (switch)"}; + if (false == ImGui::IsAnyItemActive()) + { + for (int i = 0; i < 3; ++i) + { + auto const name = materials[i] ? editor_track::material_name(*materials[i]) : std::string{}; + std::strncpy(m_track_materials[i].data(), name.c_str(), m_track_materials[i].size() - 1); + m_track_materials[i].back() = '\0'; + } + } + for (int i = 0; i < 3; ++i) + { + if (materials[i] == nullptr || (i == 2 && track->eType != tt_Switch)) + continue; + ImGui::PushItemWidth(-160.0f); + if (ImGui::InputText(labels[i], m_track_materials[i].data(), m_track_materials[i].size(), ImGuiInputTextFlags_EnterReturnsTrue)) + { + *materials[i] = editor_track::fetch_material(m_track_materials[i].data()); + apply_now(rebuild::parameters); + } + ImGui::PopItemWidth(); + } + ImGui::TextDisabled("Enter applies a texture name, \"none\" removes the texture"); + + ImGui::PushItemWidth(120.0f); + if (ImGui::InputFloat("Texture length", &track->fTexLength, 0.0f, 0.0f, "%.2f")) + track->fTexLength = std::max(0.01f, track->fTexLength); + finish_edit(rebuild::parameters); + float height = editor_track::texture_height(*track); + if (ImGui::InputFloat("Trackbed height", &height, 0.0f, 0.0f, "%.3f")) + editor_track::texture_height(*track, height); + finish_edit(rebuild::parameters); + ImGui::InputFloat("Trackbed width", &track->fTexWidth, 0.0f, 0.0f, "%.3f"); + finish_edit(rebuild::parameters); + ImGui::InputFloat("Trackbed slope", &track->fTexSlope, 0.0f, 0.0f, "%.3f"); + finish_edit(rebuild::parameters); + ImGui::PopItemWidth(); + } + } + + if (ImGui::CollapsingHeader("Path geometry", ImGuiTreeNodeFlags_DefaultOpen)) + { + ImGui::PushItemWidth(120.0f); + ImGui::InputFloat("Snap radius (m)", &m_track_snap_radius, 0.0f, 0.0f, "%.2f"); + m_track_snap_radius = std::max(0.0f, m_track_snap_radius); + ImGui::PopItemWidth(); + ImGui::Checkbox("Align with snapped path", &m_track_align_tangent); + ImGui::SameLine(); + ImGui::Checkbox("Drag connected ends", &m_track_drag_connected); + + for (int i = 0; i < static_cast(track->m_paths.size()); ++i) + { + ImGui::PushID(i); + if (track->m_paths.size() > 1) + ImGui::Text("Path %d", i + 1); + // point selection, same as clicking the handle in the viewport + for (auto const kind : kPointKinds) + { + editor_track::point_ref const point{i, kind}; + if (kind != editor_track::point_kind::start) + ImGui::SameLine(); + std::string label = point_label(kind); + if (is_end(kind)) + label += editor_track::is_connected(*track, point) ? " (+)" : " (-)"; + if (ImGui::Selectable(label.c_str(), m_track_point == point, 0, ImVec2(90.0f, 0.0f))) + m_track_point = (m_track_point == point ? editor_track::point_ref{} : point); + } + + auto &path = track->m_paths[i]; + if (geometry) + { + ImGui::PushItemWidth(-160.0f); + for (auto const kind : {editor_track::point_kind::start, editor_track::point_kind::end}) + { + auto position = path.points[kind == editor_track::point_kind::start ? segment_data::point::start : segment_data::point::end]; + if (ImGui::InputScalarN(point_label(kind), ImGuiDataType_Double, glm::value_ptr(position), 3, nullptr, nullptr, "%.3f")) + editor_track::move_point(*track, {i, kind}, position); // keeps the common start of a switch together + finish_edit(rebuild::geometry); + } + ImGui::InputScalarN("Control 1 (relative)", ImGuiDataType_Double, glm::value_ptr(path.points[segment_data::point::control1]), 3, nullptr, nullptr, "%.3f"); + finish_edit(rebuild::geometry); + ImGui::InputScalarN("Control 2 (relative)", ImGuiDataType_Double, glm::value_ptr(path.points[segment_data::point::control2]), 3, nullptr, nullptr, "%.3f"); + finish_edit(rebuild::geometry); + ImGui::InputFloat2("Roll (deg)", path.rolls.data(), "%.2f"); + finish_edit(rebuild::geometry); + ImGui::InputFloat("Radius", &path.radius, 0.0f, 0.0f, "%.1f"); + finish_edit(rebuild::geometry); + ImGui::PopItemWidth(); + if (ImGui::Button("Straighten")) + { + push_track_snapshot({{track, before}}); + path.points[segment_data::point::control1] = glm::dvec3{}; + path.points[segment_data::point::control2] = glm::dvec3{}; + path.radius = 0.0f; + editor_track::commit({track}); + } + } + else + { + auto const &start = path.points[segment_data::point::start]; + auto const &end = path.points[segment_data::point::end]; + ImGui::TextDisabled("Start (%.2f, %.2f, %.2f) End (%.2f, %.2f, %.2f)", start.x, start.y, start.z, end.x, end.y, end.z); + } + ImGui::PopID(); + } + } +} diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index 422396900..aaef57837 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -85,6 +85,10 @@ void editor_ui::render_mode_options(nodebank_panel::edit_mode const Mode) if (m_filloptions) m_filloptions(); break; + case nodebank_panel::TRACK: + if (m_trackoptions) + m_trackoptions(); + break; default: break; } diff --git a/application/editoruilayer.h b/application/editoruilayer.h index bc9edbe1a..28773754f 100644 --- a/application/editoruilayer.h +++ b/application/editoruilayer.h @@ -50,6 +50,11 @@ class editor_ui : public ui_layer { m_filloptions = std::move(Renderer); } + // draws the path editing settings in its node bank tab (the editing state lives in the editor mode) + void set_track_options(std::function Renderer) + { + m_trackoptions = std::move(Renderer); + } // draws the gizmo settings in the toolset window (the gizmo state lives in the editor mode) void set_gizmo_options(std::function Renderer) { @@ -77,6 +82,7 @@ class editor_ui : public ui_layer bool m_insertrandom{false}; // insert mode picks a random template from m_insertset model_set_ref m_insertset; std::function m_filloptions; + std::function m_trackoptions; std::function m_gizmooptions; scene::basic_node *m_node{nullptr}; // currently bound scene node, if any }; diff --git a/application/editoruipanels.cpp b/application/editoruipanels.cpp index 4e9d423ea..09bfa683b 100644 --- a/application/editoruipanels.cpp +++ b/application/editoruipanels.cpp @@ -542,7 +542,7 @@ void nodebank_panel::render() } // edit modes as tabs, each with its own settings - std::pair const modes[] = {{"Select", MODIFY}, {"Insert", ADD}, {"Brush", BRUSH}, {"Area fill", FILL}, {"Copy to bank", COPY}}; + std::pair const modes[] = {{"Select", MODIFY}, {"Track", TRACK}, {"Insert", ADD}, {"Brush", BRUSH}, {"Area fill", FILL}, {"Copy to bank", COPY}}; if (ImGui::BeginTabBar("##editmodes", ImGuiTabBarFlags_FittingPolicyResizeDown)) { for (auto const &tab : modes) diff --git a/application/editoruipanels.h b/application/editoruipanels.h index 9d48ccce0..d86ec06e8 100644 --- a/application/editoruipanels.h +++ b/application/editoruipanels.h @@ -122,7 +122,8 @@ class nodebank_panel : public ui_panel COPY, ADD, BRUSH, - FILL + FILL, + TRACK }; edit_mode mode = MODIFY; diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp new file mode 100644 index 000000000..5a1278332 --- /dev/null +++ b/editor/editorTrack.cpp @@ -0,0 +1,645 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "editor/editorTrack.hpp" + +#include "world/Track.h" +#include "scene/scene.h" +#include "simulation/simulation.h" +#include "rendering/renderer.h" +#include "utilities/Globals.h" +#include "utilities/utilities.h" + +#include +#include +#include + +namespace +{ + +// end points closer than this are treated as the same point +double const kSamePoint{0.05}; + +segment_data::point point_index(editor_track::point_kind const Kind) +{ + switch (Kind) + { + case editor_track::point_kind::start: return segment_data::point::start; + case editor_track::point_kind::control1: return segment_data::point::control1; + case editor_track::point_kind::control2: return segment_data::point::control2; + default: return segment_data::point::end; + } +} + +bool is_end(editor_track::point_kind const Kind) +{ + return Kind == editor_track::point_kind::start || Kind == editor_track::point_kind::end; +} + +bool has_switch_paths(TTrack const &Track) +{ + return Track.SwitchExtension != nullptr && (Track.eType == tt_Switch || Track.eType == tt_Cross); +} + +void add_unique(std::vector &Tracks, TTrack *Track) +{ + if (Track != nullptr && std::find(Tracks.begin(), Tracks.end(), Track) == Tracks.end()) + Tracks.emplace_back(Track); +} + +} // namespace + +editor_track::state editor_track::capture(TTrack const &Track) +{ + state result; + result.paths = Track.m_paths; + result.velocity = Track.fVelocity; + result.switchvelocity = Track.SwitchExtension ? Track.SwitchExtension->fVelocity : -1.f; + result.width = Track.fTrackWidth; + result.friction = Track.fFriction; + result.sounddistance = Track.fSoundDistance; + result.quality = Track.iQualityFlag; + result.damage = Track.iDamageFlag; + result.environment = static_cast(Track.eEnvironment); + result.material1 = Track.m_material1; + result.material2 = Track.m_material2; + result.material3 = Track.SwitchExtension ? Track.SwitchExtension->m_material3 : null_handle; + result.texlength = Track.fTexLength; + result.texheight = texture_height(Track); + result.texwidth = Track.fTexWidth; + result.texslope = Track.fTexSlope; + return result; +} + +void editor_track::apply(TTrack &Track, state const &State) +{ + Track.m_paths = State.paths; + Track.fVelocity = State.velocity; + if (Track.SwitchExtension) + { + Track.SwitchExtension->fVelocity = State.switchvelocity; + Track.SwitchExtension->m_material3 = State.material3; + } + Track.fTrackWidth = State.width; + Track.fTrackWidth2 = State.width; + Track.fFriction = State.friction; + Track.fSoundDistance = State.sounddistance; + Track.iQualityFlag = State.quality; + damage(Track, State.damage); + Track.eEnvironment = static_cast(State.environment); + Track.m_material1 = State.material1; + Track.m_material2 = State.material2; + Track.fTexLength = State.texlength; + texture_height(Track, State.texheight); + Track.fTexWidth = State.texwidth; + Track.fTexSlope = State.texslope; +} + +bool editor_track::is_supported(TTrack const &Track) +{ + if ((Track.iCategoryFlag & 0x80) != 0) + return false; // auto-generated helper path + if (Track.eType == tt_Normal) + return Track.Segment != nullptr; + if (Track.eType == tt_Switch) + return Track.SwitchExtension != nullptr && Track.m_paths.size() >= 2; + return false; +} + +bool editor_track::can_edit_geometry(TTrack const &Track, std::string &Reason) +{ + if (false == is_supported(Track)) + { + Reason = "Editing of this path type isn't supported"; + return false; + } + if (Global.NvRenderer) + { + Reason = "Path geometry can't be rebuilt with the experimental renderer"; + return false; + } + if (false == Track.Dynamics.empty()) + { + Reason = "There are vehicles placed on this path"; + return false; + } + Reason.clear(); + return true; +} + +void editor_track::commit(std::vector const &Tracks) +{ + if (Tracks.empty()) + return; + + // paths whose render geometry depends on the modified ones + std::vector affected; + for (auto *track : Tracks) + { + add_unique(affected, track); + for (auto *neighbour : neighbours(*track)) + add_unique(affected, neighbour); + } + // take the paths out of the scene while their ends still match the old segments... + for (auto *track : Tracks) + { + disconnect(*track); + simulation::Region->erase_and_unregister(track); + } + // ...rebuild the segments and put the paths back in their new place... + for (auto *track : Tracks) + { + track->init_segments(false); + track->update_location(); + track->m_area.radius = -1.f; // forces radius recalculation + simulation::Region->insert_and_register(track); + } + // ...connect them with whatever they touch now... + for (auto *track : Tracks) + join(*track); + for (auto *track : Tracks) + for (auto *neighbour : neighbours(*track)) + add_unique(affected, neighbour); + // ...and update the visuals + for (auto *track : affected) + update_transition(*track); + for (auto *track : affected) + rebuild_geometry(*track); + for (auto *track : Tracks) + track->mark_dirty(); +} + +void editor_track::commit_parameters(TTrack &Track) +{ + Track.fTrackWidth2 = Track.fTrackWidth; + // segments are re-created from unchanged data, but road texture proportions and roll fix depend on parameters + Track.init_segments(false); + + std::vector affected{&Track}; + for (auto *neighbour : neighbours(Track)) + add_unique(affected, neighbour); + for (auto *track : affected) + update_transition(*track); + for (auto *track : affected) + rebuild_geometry(*track); + Track.mark_dirty(); +} + +glm::dvec3 editor_track::point_position(TTrack const &Track, point_ref const &Point) +{ + if (Point.path < 0 || Point.path >= static_cast(Track.m_paths.size())) + return Track.location(); + + auto const &path{Track.m_paths[Point.path]}; + auto const &start{path.points[segment_data::point::start]}; + auto const &end{path.points[segment_data::point::end]}; + switch (Point.kind) + { + case point_kind::start: return start; + case point_kind::end: return end; + case point_kind::control1: + { + auto const &control{path.points[segment_data::point::control1]}; + return control == glm::dvec3{} ? start + (end - start) / 3.0 : start + control; + } + case point_kind::control2: + { + auto const &control{path.points[segment_data::point::control2]}; + return control == glm::dvec3{} ? end + (start - end) / 3.0 : end + control; + } + } + return start; +} + +void editor_track::move_point(TTrack &Track, point_ref const &Point, glm::dvec3 const &Position) +{ + if (Point.path < 0 || Point.path >= static_cast(Track.m_paths.size())) + return; + + auto &path{Track.m_paths[Point.path]}; + switch (Point.kind) + { + case point_kind::start: + case point_kind::end: + { + auto &point{path.points[point_index(Point.kind)]}; + auto const oldposition{point}; + point = Position; + // control vectors are relative to their end points, so they follow them automatically. + // other paths of the same piece sharing this point (the common start of a switch) follow as well + for (auto &otherpath : Track.m_paths) + { + if (&otherpath == &path) + continue; + for (auto const index : {segment_data::point::start, segment_data::point::end}) + if (glm::distance(otherpath.points[index], oldposition) < kSamePoint) + otherpath.points[index] = Position; + } + break; + } + case point_kind::control1: + { + auto control{Position - path.points[segment_data::point::start]}; + path.points[segment_data::point::control1] = (glm::length(control) < 0.01 ? glm::dvec3{} : control); + break; + } + case point_kind::control2: + { + auto control{Position - path.points[segment_data::point::end]}; + path.points[segment_data::point::control2] = (glm::length(control) < 0.01 ? glm::dvec3{} : control); + break; + } + } +} + +void editor_track::translate(TTrack &Track, glm::dvec3 const &Offset) +{ + for (auto &path : Track.m_paths) + { + path.points[segment_data::point::start] += Offset; + path.points[segment_data::point::end] += Offset; + } +} + +void editor_track::rotate_y(TTrack &Track, glm::dvec3 const &Pivot, double const Angle) +{ + auto const c{std::cos(Angle)}; + auto const s{std::sin(Angle)}; + auto const rotate = [&](glm::dvec3 const &Vector) { return glm::dvec3{Vector.x * c + Vector.z * s, Vector.y, -Vector.x * s + Vector.z * c}; }; + + for (auto &path : Track.m_paths) + { + for (auto const index : {segment_data::point::start, segment_data::point::end}) + path.points[index] = Pivot + rotate(path.points[index] - Pivot); + for (auto const index : {segment_data::point::control1, segment_data::point::control2}) + path.points[index] = rotate(path.points[index]); + } +} + +glm::dvec3 editor_track::pivot(TTrack const &Track) +{ + return Track.location(); +} + +std::vector editor_track::neighbours(TTrack const &Track) +{ + std::vector result; + add_unique(result, Track.trPrev); + add_unique(result, Track.trNext); + if (has_switch_paths(Track)) + { + for (int i = 0; i < 2; ++i) + { + add_unique(result, Track.SwitchExtension->pPrevs[i]); + add_unique(result, Track.SwitchExtension->pNexts[i]); + } + } + result.erase(std::remove(result.begin(), result.end(), &Track), result.end()); + return result; +} + +std::vector> editor_track::connected_points(TTrack const &Track, glm::dvec3 const &Position) +{ + std::vector> result; + for (auto *neighbour : neighbours(Track)) + { + for (int i = 0; i < static_cast(neighbour->m_paths.size()); ++i) + { + for (auto const kind : {point_kind::start, point_kind::end}) + { + if (glm::distance(neighbour->m_paths[i].points[point_index(kind)], Position) < kSamePoint) + result.emplace_back(neighbour, point_ref{i, kind}); + } + } + } + return result; +} + +bool editor_track::is_connected(TTrack const &Track, point_ref const &Point) +{ + if (false == is_end(Point.kind)) + return false; + return false == connected_points(Track, point_position(Track, Point)).empty(); +} + +editor_track::snap_target editor_track::find_snap_target(TTrack const &Track, glm::dvec3 const &Position, double const Radius, std::vector const &Exclude) +{ + snap_target result; + result.distance = std::numeric_limits::max(); + + auto const excluded = [&](TTrack const *Other) { return std::find(Exclude.begin(), Exclude.end(), Other) != Exclude.end(); }; + auto const category{Track.iCategoryFlag & 15}; + // NOTE: copy, the region returns its scratchpad + auto const sections{simulation::Region->sections(Position, static_cast(Radius))}; + for (auto *section : sections) + { + for (auto const &cell : section->m_cells) + { + for (auto *other : cell.m_directories.paths) + { + if (other == &Track || excluded(other) || (other->iCategoryFlag & 15) != category || false == is_supported(*other)) + continue; + for (int i = 0; i < static_cast(other->m_paths.size()); ++i) + { + auto const &path{other->m_paths[i]}; + for (auto const kind : {point_kind::start, point_kind::end}) + { + auto const &point{path.points[point_index(kind)]}; + auto const distance{glm::distance(point, Position)}; + if (distance > Radius || distance >= result.distance) + continue; + // skip ends already connected with something which stays in place + auto const connections{connected_points(*other, point)}; + if (std::any_of(connections.begin(), connections.end(), [&](auto const &Connection) { return false == excluded(Connection.first); })) + continue; + + glm::dvec3 direction; + if (kind == point_kind::start) + { + auto const &control{path.points[segment_data::point::control1]}; + direction = control != glm::dvec3{} ? control : path.points[segment_data::point::end] - point; + } + else + { + auto const &control{path.points[segment_data::point::control2]}; + direction = control != glm::dvec3{} ? control : path.points[segment_data::point::start] - point; + } + if (glm::length(direction) < 1e-6) + continue; + + result.track = other; + result.point = point_ref{i, kind}; + result.position = point; + result.direction = glm::normalize(direction); + result.distance = distance; + } + } + } + } + } + return result; +} + +void editor_track::snap_point(TTrack &Track, point_ref const &Point, snap_target const &Target, bool const Aligntangent) +{ + if (Target.track == nullptr || false == is_end(Point.kind)) + return; + + move_point(Track, Point, Target.position); + if (false == Aligntangent) + return; + + // the path continues the target, so it leaves the shared point in the opposite direction + auto &path{Track.m_paths[Point.path]}; + auto const &start{path.points[segment_data::point::start]}; + auto const &end{path.points[segment_data::point::end]}; + auto &control{path.points[Point.kind == point_kind::start ? segment_data::point::control1 : segment_data::point::control2]}; + auto const length{control != glm::dvec3{} ? glm::length(control) : glm::distance(start, end) / 3.0}; + control = -Target.direction * length; +} + +std::string editor_track::material_name(material_handle const Material) +{ + if (Material == null_handle) + return "none"; + auto name{GfxRenderer->Material(Material)->GetName()}; + if (name.find(paths::textures) == 0) + name.erase(0, std::string{paths::textures}.size()); + return name; +} + +material_handle editor_track::fetch_material(std::string const &Name) +{ + if (Name.empty() || Name == "none") + return null_handle; + auto name{Name}; + replace_slashes(name); + return GfxRenderer->Fetch_Material(name); +} + +float editor_track::texture_height(TTrack const &Track) +{ + return (Track.fTexHeight1 - Track.fTexHeightOffset) * (Track.iCategoryFlag & 4 ? -1.f : 1.f); +} + +void editor_track::texture_height(TTrack &Track, float const Height) +{ + Track.fTexHeight1 = Height * (Track.iCategoryFlag & 4 ? -1.f : 1.f) + Track.fTexHeightOffset; +} + +double editor_track::velocity(TTrack const &Track) +{ + if (Track.SwitchExtension && Track.eType == tt_Switch) + return Track.SwitchExtension->fVelocity; + return Track.fVelocity; +} + +void editor_track::velocity(TTrack &Track, double const Velocity) +{ + if (Track.SwitchExtension && Track.eType == tt_Switch) + { + // same rules as TTrack::Switch() + Track.SwitchExtension->fVelocity = static_cast(Velocity); + if (Velocity <= -2.0) + Track.fVelocity = Track.SwitchExtension->CurrentIndex ? -Velocity : -1.0; + else + Track.fVelocity = Velocity; + return; + } + Track.fVelocity = Velocity; +} + +void editor_track::damage(TTrack &Track, int const Damage) +{ + Track.iDamageFlag = Damage; + if (Damage & 128) + Track.iAction |= 0x80; + else + Track.iAction &= ~0x80; +} + +void editor_track::disconnect(TTrack &Track) +{ + for (auto *neighbour : neighbours(Track)) + { + if (has_switch_paths(*neighbour)) + { + auto &extension{*neighbour->SwitchExtension}; + for (int i = 0; i < 2; ++i) + { + if (extension.pPrevs[i] == &Track) + extension.pPrevs[i] = nullptr; + if (extension.pNexts[i] == &Track) + extension.pNexts[i] = nullptr; + } + bind_switch_path(*neighbour, extension.CurrentIndex); + } + else + { + if (neighbour->trPrev == &Track) + neighbour->trPrev = nullptr; + if (neighbour->trNext == &Track) + neighbour->trNext = nullptr; + } + } + Track.trPrev = nullptr; + Track.trNext = nullptr; + if (has_switch_paths(Track)) + { + auto &extension{*Track.SwitchExtension}; + for (int i = 0; i < 2; ++i) + { + extension.pPrevs[i] = nullptr; + extension.pNexts[i] = nullptr; + } + } +} + +void editor_track::join(TTrack &Track) +{ + TTrack *other; + int endpointid; + switch (Track.eType) + { + case tt_Normal: + { + if (Track.trPrev == nullptr) + { + std::tie(other, endpointid) = simulation::Region->find_path(Track.Segment->FastGetPoint_0(), &Track); + connect(Track, true, other, endpointid); + } + if (Track.trNext == nullptr) + { + std::tie(other, endpointid) = simulation::Region->find_path(Track.Segment->FastGetPoint_1(), &Track); + connect(Track, false, other, endpointid); + } + break; + } + case tt_Switch: + { + // like during scenery load, switches are connected from the side of the regular paths + for (int i = 0; i < 2; ++i) + { + auto const &segment{Track.SwitchExtension->Segments[i]}; + for (auto const &point : {segment->FastGetPoint_0(), segment->FastGetPoint_1()}) + { + std::tie(other, endpointid) = simulation::Region->find_path(point, &Track); + if (other != nullptr && other->eType == tt_Normal) + join(*other); + } + } + break; + } + default: + break; + } +} + +void editor_track::connect(TTrack &Track, bool const Prevside, TTrack *Other, int const Endpointid) +{ + if (Other == nullptr) + return; + + switch (Endpointid) + { + case 0: + if (Prevside) + Track.ConnectPrevPrev(Other, 0); + else + Track.ConnectNextPrev(Other, 0); + break; + case 1: + if (Prevside) + Track.ConnectPrevNext(Other, 1); + else + Track.ConnectNextNext(Other, 1); + break; + case 2: + case 3: + case 4: + case 5: + { + if (false == has_switch_paths(*Other)) + break; + // same connections as in path_table::InitTracks(), but made without moving the switch blades + auto const path{(Endpointid - 2) / 2}; + auto const atend{((Endpointid - 2) % 2) != 0}; + bind_switch_path(*Other, path); + if (Prevside) + { + if (atend) + Track.ConnectPrevNext(Other, path ? 3 : 1); + else + Track.ConnectPrevPrev(Other, path ? 2 : 0); + } + else + { + if (atend) + Track.ConnectNextNext(Other, path ? 3 : 1); + else + Track.ConnectNextPrev(Other, path ? 2 : 0); + } + store_switch_path(*Other, path); + bind_switch_path(*Other, Other->SwitchExtension->CurrentIndex); + break; + } + default: + break; + } +} + +void editor_track::update_transition(TTrack &Track) +{ + // same rule as TTrack::ConnectNextPrev(): transition is drawn by the path whose end 2 meets start of a different path + Track.iTrapezoid &= ~2; + auto const *next{Track.trNext}; + if (next == nullptr || Track.iNextDirection != 0) + return; + if (Track.m_visible && next->m_visible && Track.eType == tt_Normal && next->eType == tt_Normal) + { + if (Track.fTrackWidth != next->fTrackWidth || Track.fTexHeight1 != next->fTexHeight1 || Track.fTexWidth != next->fTexWidth || Track.fTexSlope != next->fTexSlope) + Track.iTrapezoid |= 2; + } +} + +void editor_track::bind_switch_path(TTrack &Switch, int const Path) +{ + auto &extension{*Switch.SwitchExtension}; + auto const path{Path & 1}; + Switch.Segment = extension.Segments[path]; + Switch.trNext = extension.pNexts[path]; + Switch.trPrev = extension.pPrevs[path]; + Switch.iNextDirection = extension.iNextDirection[path]; + Switch.iPrevDirection = extension.iPrevDirection[path]; +} + +void editor_track::store_switch_path(TTrack &Switch, int const Path) +{ + // same as TTrack::SetConnections(), without switching back to the base position + auto &extension{*Switch.SwitchExtension}; + auto const path{Path & 1}; + extension.pNexts[path] = Switch.trNext; + extension.pPrevs[path] = Switch.trPrev; + extension.iNextDirection[path] = Switch.iNextDirection; + extension.iPrevDirection[path] = Switch.iPrevDirection; + if (Switch.eType == tt_Switch) + { + // switch paths share their start point, so they share the path connected there as well + extension.pPrevs[path ^ 1] = Switch.trPrev; + extension.iPrevDirection[path ^ 1] = Switch.iPrevDirection; + } +} + +void editor_track::rebuild_geometry(TTrack &Track) +{ + auto §ion{simulation::Region->section(Track.location())}; + // sections which weren't displayed yet create geometry of their content on their own + Track.rebuild_geometry(section.m_geometrycreated ? section.m_geometrybank : gfx::geometrybank_handle{}); +} diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp new file mode 100644 index 000000000..bd39766cb --- /dev/null +++ b/editor/editorTrack.hpp @@ -0,0 +1,136 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include +#include +#include + +#include "world/Segment.h" +#include "utilities/Classes.h" + +class TTrack; + +// Editing of paths (tracks, roads, rivers) loaded from the scenery. +// +// The source of truth for path geometry is TTrack::m_paths (the same data the scenery export writes). +// Edits modify m_paths and then commit() rebuilds everything derived from it: the segments, placement +// in the scene cells, connections with neighbouring paths and the render geometry. +class editor_track +{ + public: + // identifies an editable point of a path + enum class point_kind { start, control1, control2, end }; + struct point_ref + { + int path{-1}; // index into TTrack::m_paths + point_kind kind{point_kind::start}; + bool valid() const { return path >= 0; } + bool operator==(point_ref const &Other) const { return path == Other.path && kind == Other.kind; } + }; + + // snapshot of the editable state of a path, used by the undo history + struct state + { + std::vector paths; + double velocity{-1.0}; + float switchvelocity{-1.f}; + float width{1.435f}; + float friction{0.15f}; + float sounddistance{-1.f}; + int quality{20}; + int damage{0}; + int environment{0}; + material_handle material1{0}; + material_handle material2{0}; + material_handle material3{0}; + float texlength{4.f}; + float texheight{0.6f}; + float texwidth{0.9f}; + float texslope{0.9f}; + }; + static state capture(TTrack const &Track); + // restores provided state; follow with commit() to rebuild the path + static void apply(TTrack &Track, state const &State); + + // checks whether geometry of the path can be modified. returns: true if it can, otherwise false and the reason + static bool can_edit_geometry(TTrack const &Track, std::string &Reason); + // checks whether the path type is supported by the editor at all + static bool is_supported(TTrack const &Track); + + // rebuilds provided paths after modification of their source data (m_paths): segments, placement in the region, + // connections with neighbours and render geometry of the paths and all their old and new neighbours + static void commit(std::vector const &Tracks); + // rebuilds the path after change of parameters which don't affect its course (width, textures, etc) + static void commit_parameters(TTrack &Track); + + // world position of specified point. for control points it's the absolute position of the handle; + // a zero (straight) control vector is presented at 1/3 of the chord so it can be grabbed + static glm::dvec3 point_position(TTrack const &Track, point_ref const &Point); + // moves specified point to provided world position. moving an end point carries its control vector along. + // switches keep the start points of both their paths together + static void move_point(TTrack &Track, point_ref const &Point, glm::dvec3 const &Position); + // moves the whole path by provided offset + static void translate(TTrack &Track, glm::dvec3 const &Offset); + // rotates the whole path around vertical axis going through provided pivot point + static void rotate_y(TTrack &Track, glm::dvec3 const &Pivot, double const Angle); + // pivot used for rotation of the whole path + static glm::dvec3 pivot(TTrack const &Track); + + // lists paths currently connected to provided path + static std::vector neighbours(TTrack const &Track); + // lists end points of other paths connected to the end point located at provided position, + // as pairs of the neighbour and its matching point + static std::vector> connected_points(TTrack const &Track, glm::dvec3 const &Position); + // checks whether end point located at provided position is connected to another path + static bool is_connected(TTrack const &Track, point_ref const &Point); + + // candidate to connect a dragged end point with + struct snap_target + { + TTrack *track{nullptr}; + point_ref point; + glm::dvec3 position{0.0}; + glm::dvec3 direction{0.0}; // direction from the point into the target path + double distance{0.0}; + }; + // finds the nearest free end point of another path of the same category as provided path, within specified radius. + // paths listed in Exclude are skipped, and connections to them don't count as occupying an end point + static snap_target find_snap_target(TTrack const &Track, glm::dvec3 const &Position, double const Radius, std::vector const &Exclude); + // places the point at the target and optionally aligns the control vector with the target path + static void snap_point(TTrack &Track, point_ref const &Point, snap_target const &Target, bool const Aligntangent); + + // names of the materials used by the path; "none" for missing ones + static std::string material_name(material_handle const Material); + static material_handle fetch_material(std::string const &Name); + + // height of the trackbed edge as written in the scenery (without roll fix adjustment) + static float texture_height(TTrack const &Track); + static void texture_height(TTrack &Track, float const Height); + static double velocity(TTrack const &Track); + static void velocity(TTrack &Track, double const Velocity); + static void damage(TTrack &Track, int const Damage); + + private: + // unlinks the path from all its neighbours + static void disconnect(TTrack &Track); + // links the path with paths whose free end points match its own free end points + static void join(TTrack &Track); + // links specified end of a regular path with matching end of another path + static void connect(TTrack &Track, bool const Prevside, TTrack *Other, int const Endpointid); + // recalculates the trackbed transition flag + static void update_transition(TTrack &Track); + // sets active connections of a switch to specified path, without moving the blades + static void bind_switch_path(TTrack &Switch, int const Path); + static void store_switch_path(TTrack &Switch, int const Path); + // rebuilds render geometry of the path in the bank of the section it's placed in + static void rebuild_geometry(TTrack &Track); +}; diff --git a/world/Track.cpp b/world/Track.cpp index 75f0ec6f1..3900bd77e 100644 --- a/world/Track.cpp +++ b/world/Track.cpp @@ -709,6 +709,8 @@ void TTrack::init_segments( bool const Initial ) { // so repeated initialization doesn't accumulate it fTexHeight1 -= fTexHeightOffset; fTexHeightOffset = 0.f; + // the roll flag is re-evaluated below, the transition flag is set again when the path gets connected + iTrapezoid = 0; switch (eType) { // Ra: łuki segmentowane co 5m albo 314-kątem foremnym @@ -1355,10 +1357,9 @@ glm::vec3 TTrack::get_nearest_point(const glm::dvec3 &point) const // wypełnianie tablic VBO // discards references to current render geometry and generates it anew in specified bank // NOTE: geometry banks can't release chunks, so the old data stays in the bank, unused +// with null bank the geometry is only discarded, to be created later along with the rest of the owning section void TTrack::rebuild_geometry( gfx::geometrybank_handle const &Bank ) { - if( Bank == null_handle ) { return; } - Geometry1.clear(); Geometry2.clear(); if( SwitchExtension ) { @@ -1366,6 +1367,8 @@ void TTrack::rebuild_geometry( gfx::geometrybank_handle const &Bank ) { } m_sleeper_local_transforms.clear(); + if( Bank == null_handle ) { return; } + create_geometry( Bank ); } From 8f2a34b3cfdd813d052b5058edb166e9f8864664 Mon Sep 17 00:00:00 2001 From: maj00r Date: Fri, 2 Oct 2026 00:09:09 +0200 Subject: [PATCH 044/430] feat(editor): route design with curves and transitions --- CMakeLists.txt | 1 + application/editormode.cpp | 22 +- application/editormode.h | 39 +- application/editormodetrack.cpp | 557 +++++++++++++++++- editor/editorAlignment.cpp | 696 +++++++++++++++++++++++ editor/editorAlignment.hpp | 184 ++++++ editor/editorTrack.cpp | 245 ++++++++ editor/editorTrack.hpp | 26 + simulation/simulationstateserializer.cpp | 3 + world/Track.h | 1 + 10 files changed, 1758 insertions(+), 16 deletions(-) create mode 100644 editor/editorAlignment.cpp create mode 100644 editor/editorAlignment.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index dabcc1679..fe5b1f2bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -171,6 +171,7 @@ set(SOURCES "editor/editorIncludeInfo.cpp" "editor/editorTerrain.cpp" "editor/editorTrack.cpp" +"editor/editorAlignment.cpp" "editor/editorTerrainStreamer.cpp" "editor/editorOrthophoto.cpp" "application/editormode.cpp" diff --git a/application/editormode.cpp b/application/editormode.cpp index 0e044433f..f6a0a472a 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -683,7 +683,7 @@ void editor_mode::undo_last() if (snap.action == EditorSnapshot::Action::TrackEdit) { - restore_track_snapshot(snap, g_redo); + restore_track_snapshot(snap, g_redo, true); return; } @@ -778,7 +778,7 @@ void editor_mode::redo_last() if (snap.action == EditorSnapshot::Action::TrackEdit) { - restore_track_snapshot(snap, m_history); + restore_track_snapshot(snap, m_history, false); return; } @@ -1009,9 +1009,11 @@ bool editor_mode::update() // --- ImGuizmo: in-viewport transform gizmo for the selected node --- render_gizmo(); - // --- path editing: course and point handles of the selected path --- + // --- path editing: course and point handles of the selected path, designed route --- if (selected_track()) draw_track_overlay(); + if (route_active()) + draw_route_overlay(); // --- area fill: outline overlay while the mode is active (its settings are drawn in the node bank window) --- if (ui()->mode() == nodebank_panel::FILL) @@ -2243,6 +2245,13 @@ void editor_mode::render_gizmo() return; } + // route design: the gizmo moves the selected vertex of the designed alignment + if (route_active()) + { + render_route_gizmo(); + return; + } + if (!m_node && m_instance == 0) { m_gizmo_using = false; @@ -2534,6 +2543,8 @@ void editor_mode::exit() m_track_drag_points.clear(); m_track_snap = {}; m_track_point = {}; + m_route = {}; + m_route_gizmo_using = false; g_redo.clear(); m_history.clear(); @@ -2681,7 +2692,10 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in case GLFW_KEY_ESCAPE: // track mode: release the selected point handle, so the gizmo moves the whole path again if (is_press(Action) && ui()->mode() == nodebank_panel::TRACK) + { m_track_point = {}; + m_route.vertex = -1; + } break; case GLFW_KEY_BACKSPACE: @@ -2775,7 +2789,7 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const // in track mode the left button selects a point handle of the selected path, or another path if (mode == nodebank_panel::TRACK) { - if (false == ImGuizmo::IsOver() && false == pick_track_handle()) + if (false == ImGuizmo::IsOver() && false == pick_route_vertex() && false == pick_track_handle()) { GfxRenderer->Pick_Node_Callback([this](scene::basic_node *node) { if (viewport_click()) diff --git a/application/editormode.h b/application/editormode.h index 6dc9320de..597fecbfd 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -20,6 +20,7 @@ http://mozilla.org/MPL/2.0/. #include "editor/editorTerrainStreamer.hpp" #include "editor/editorOrthophoto.hpp" #include "editor/editorTrack.hpp" +#include "editor/editorAlignment.hpp" #include #include @@ -104,6 +105,7 @@ class editor_mode : public application_mode scene::instance_handle instance{0}; // include of a scenery template which was placed or removed, instead of a node // TrackEdit: state of all paths modified by the change (the edited path and neighbours dragged along) std::vector> tracks; + std::vector created; // TrackEdit: paths added by the change }; void push_snapshot(scene::basic_node *node, EditorSnapshot::Action Action = EditorSnapshot::Action::Move, std::string const &Serialized = std::string()); @@ -279,6 +281,8 @@ class editor_mode : public application_mode TTrack *selected_track() const; // settings and parameters of the selected path, drawn in the node bank tab of the track mode void render_track_ui(); + // parameters and points of the selected path + void render_path_ui(); // curve and point handles of the selected path void draw_track_overlay() const; // selects the point handle of the selected path located under the cursor. returns: true if a handle was hit @@ -289,10 +293,10 @@ class editor_mode : public application_mode void render_track_gizmo(); // rebuilds paths modified by the ongoing drag; unless forced, at most a few times per second void commit_track_drag(bool const Force); - // records provided state of paths in the undo history - void push_track_snapshot(std::vector> States); + // records provided state of paths in the undo history, along with paths added by the change + void push_track_snapshot(std::vector> States, std::vector Created = {}); // restores state of paths stored in the history, moving their current state to the opposite stack - void restore_track_snapshot(EditorSnapshot const &Snapshot, std::vector &Opposite); + void restore_track_snapshot(EditorSnapshot const &Snapshot, std::vector &Opposite, bool const Undo); editor_track::point_ref m_track_point; // selected point handle of the selected path std::vector m_track_drag; // paths modified by the ongoing gizmo drag std::vector> m_track_drag_points; // end points of neighbours dragged along @@ -304,6 +308,35 @@ class editor_mode : public application_mode std::chrono::steady_clock::time_point m_track_last_commit; editor_track::state m_track_field_before; // state of the path before the ongoing field edit std::array, 3> m_track_materials{}; // material names being edited + // route design: re-lays a chain of paths along an alignment designed with intersection points + struct route_design + { + TTrack *from{nullptr}; // first and last path of the re-laid fragment + TTrack *to{nullptr}; + editor_track::chain chain; + std::string error; + std::string status; // outcome of the last application + alignment::design design; + alignment::result result; + int vertex{-1}; // selected vertex + }; + void render_route_ui(); + // finds the chain between the selected fragment ends and proposes an initial design for it + void route_reset(); + void route_update() { m_route.result = alignment::compute(m_route.design); } + void route_apply(); + // sets recommended cant, transitions and vertical curve for the vertex + void route_recommend(alignment::vertex &Vertex) const; + void draw_route_overlay() const; + bool pick_route_vertex(); + void render_route_gizmo(); + // 3d position of the vertex handle + glm::dvec3 route_vertex_position(int const Vertex) const; + bool route_active() const; + route_design m_route; + bool m_route_tab{true}; // route design tab of the track mode is shown + bool m_route_gizmo_using{false}; + glm::mat4 m_route_gizmo{1.0f}; float m_track_snap_radius{1.0f}; bool m_track_align_tangent{true}; bool m_track_drag_connected{true}; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index ab2831297..44fe66490 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -16,6 +16,7 @@ http://mozilla.org/MPL/2.0/. #include "utilities/Globals.h" #include "rendering/renderer.h" #include "world/Track.h" +#include "utilities/Logs.h" #include "imgui/imgui.h" #include "imgui/ImGuizmo.h" @@ -146,7 +147,7 @@ void editor_mode::select_track(scene::basic_node *Node) bool editor_mode::pick_track_handle() { auto *track = selected_track(); - if (track == nullptr || false == editor_track::is_supported(*track)) + if (track == nullptr || false == editor_track::is_supported(*track) || m_route_tab) return false; screen_projection const projection; @@ -201,7 +202,7 @@ void editor_mode::draw_track_overlay() const previous = next; } } - if (false == trackmode || false == editor_track::is_supported(*track)) + if (false == trackmode || m_route_tab || false == editor_track::is_supported(*track)) return; // control vectors @@ -372,7 +373,7 @@ void editor_mode::commit_track_drag(bool const Force) m_track_last_commit = now; } -void editor_mode::push_track_snapshot(std::vector> States) +void editor_mode::push_track_snapshot(std::vector> States, std::vector Created) { if (States.empty()) return; @@ -388,27 +389,49 @@ void editor_mode::push_track_snapshot(std::vectorlocation(); snap.uuid = track->uuid; snap.tracks = std::move(States); + snap.created = std::move(Created); m_history.push_back(std::move(snap)); g_redo.clear(); } -void editor_mode::restore_track_snapshot(EditorSnapshot const &Snapshot, std::vector &Opposite) +void editor_mode::restore_track_snapshot(EditorSnapshot const &Snapshot, std::vector &Opposite, bool const Undo) { if (Snapshot.tracks.empty()) return; - EditorSnapshot current{Snapshot}; + // paths restored by this step; paths added by the change exist only on its redo side std::vector tracks; - for (auto &entry : current.tracks) - { + for (auto const &entry : Snapshot.tracks) tracks.emplace_back(entry.first); - entry.second = editor_track::capture(*entry.first); - } + // current state goes to the opposite stack, including paths added by the change when it's being undone + EditorSnapshot current{Snapshot}; + current.tracks.clear(); + auto involved{tracks}; + if (Undo) + involved.insert(involved.end(), Snapshot.created.begin(), Snapshot.created.end()); + for (auto *track : involved) + current.tracks.emplace_back(track, editor_track::capture(*track)); Opposite.push_back(std::move(current)); + if (Undo) + { + for (auto *track : Snapshot.created) + editor_track::retire(*track); + } + else + { + for (auto *track : Snapshot.created) + track->m_editorremoved = false; + } for (auto const &entry : Snapshot.tracks) editor_track::apply(*entry.first, entry.second); editor_track::commit(tracks); + // the designed route refers to the chain, which might have changed + if (false == m_route.chain.tracks.empty()) + { + std::string error; + editor_track::find_chain(m_route.from, m_route.to, m_route.chain, error); + } m_track_snap = {}; m_track_dirty = false; @@ -419,6 +442,26 @@ void editor_mode::restore_track_snapshot(EditorSnapshot const &Snapshot, std::ve } void editor_mode::render_track_ui() +{ + if (ImGui::BeginTabBar("##trackediting")) + { + if (ImGui::BeginTabItem("Route design")) + { + m_route_tab = true; + render_route_ui(); + ImGui::EndTabItem(); + } + if (ImGui::BeginTabItem("Single path")) + { + m_route_tab = false; + render_path_ui(); + ImGui::EndTabItem(); + } + ImGui::EndTabBar(); + } +} + +void editor_mode::render_path_ui() { ImGui::TextDisabled("LMB: select path or point handle Esc: release point\nGizmo moves the selected point, otherwise the whole path (W: turn)"); auto *track = selected_track(); @@ -611,3 +654,499 @@ void editor_mode::render_track_ui() } } } + +// route design + +bool editor_mode::route_active() const +{ + return ui()->mode() == nodebank_panel::TRACK && m_route_tab && false == m_route.chain.tracks.empty(); +} + +void editor_mode::route_recommend(alignment::vertex &Vertex) const +{ + auto const recommended{alignment::recommend(m_route.design.speed, Vertex.radius, m_route.design.norms)}; + Vertex.cant = recommended.cant; + Vertex.transition_in = recommended.transition; + Vertex.transition_out = recommended.transition; + Vertex.vertical_radius = 0.0; +} + +void editor_mode::route_reset() +{ + auto &route{m_route}; + route.chain = {}; + route.error.clear(); + route.status.clear(); + route.vertex = -1; + route.result = {}; + if (route.from == nullptr || route.to == nullptr) + return; + if (false == editor_track::find_chain(route.from, route.to, route.chain, route.error)) + return; + + auto const &chain{route.chain}; + alignment::design design; + // limits and the curve type are the user's choice, they carry over to the next fragment + design.norms = route.design.norms; + design.shape = route.design.shape; + design.start = chain.start; + design.end = chain.end; + auto const plan = [](glm::dvec3 const &Direction) { return glm::normalize(glm::dvec2{Direction.x, Direction.z}); }; + auto const slope = [](glm::dvec3 const &Direction) { return Direction.y / std::max(1e-9, std::hypot(Direction.x, Direction.z)); }; + design.start_direction = plan(chain.start_direction); + design.end_direction = plan(chain.end_direction); + design.start_grade = slope(chain.start_direction); + design.end_grade = slope(chain.end_direction); + design.start_radius = chain.start_radius; + design.end_radius = chain.end_radius; + design.speed = chain.velocity > 0.0 ? chain.velocity : 100.0; + route.design = design; + + // initial layout: a straight, a single curve at the intersection of the end tangents, or a pair of curves + glm::dvec2 intersection; + if (false == alignment::collinear(design)) + { + alignment::vertex vertex; + vertex.radius = chain.radius > 0.0 ? std::max(10.0, std::round(chain.radius / 10.0) * 10.0) : 1000.0; + route_recommend(vertex); + if (alignment::tangent_intersection(design, intersection)) + { + route.design.vertices.push_back(vertex); + } + else + { + auto const distance{glm::distance(glm::dvec2{design.start.x, design.start.z}, glm::dvec2{design.end.x, design.end.z})}; + vertex.offset = distance / 3.0; + route.design.vertices.push_back(vertex); + route.design.vertices.push_back(vertex); + } + } + route_update(); +} + +void editor_mode::route_apply() +{ + auto &route{m_route}; + route.status.clear(); + if (false == route.result.valid || route.chain.tracks.empty()) + return; + // the paths might have changed since the fragment was selected + editor_track::chain chain; + if (false == editor_track::find_chain(route.from, route.to, chain, route.error)) + return; + if (glm::distance(chain.start, route.chain.start) > 1e-3 || glm::distance(chain.end, route.chain.end) > 1e-3) + { + route.error = "The fragment changed since it was selected, select it again"; + return; + } + for (auto *track : chain.tracks) + { + std::string reason; + if (false == editor_track::can_edit_geometry(*track, reason)) + { + route.error = track->name() + ": " + reason; + return; + } + } + + auto const pieces{alignment::pieces(route.result, route.design, chain.tracks.size())}; + std::vector> states; + for (auto *track : chain.tracks) + states.emplace_back(track, editor_track::capture(*track)); + auto created{editor_track::relay(chain, pieces)}; + auto const added{created.size()}; + push_track_snapshot(std::move(states), std::move(created)); + + editor_track::find_chain(route.from, route.to, route.chain, route.error); + route.status = "Re-laid " + std::to_string(chain.tracks.size()) + " paths" + (added > 0 ? ", added " + std::to_string(added) : std::string{}); + WriteLog("Editor: route design - " + route.status, logtype::generic); +} + +glm::dvec3 editor_mode::route_vertex_position(int const Vertex) const +{ + auto const &design{m_route.design}; + auto const &result{m_route.result}; + auto const count{static_cast(design.vertices.size())}; + glm::dvec2 const start{design.start.x, design.start.z}; + glm::dvec2 const end{design.end.x, design.end.z}; + glm::dvec2 position; + if (Vertex < static_cast(result.vertices.size()) && false == result.vertices.empty()) + position = result.vertices[Vertex]; + else if (count == 1) + { + if (false == alignment::tangent_intersection(design, position)) + position = (start + end) * 0.5; + } + else if (Vertex == 0) + position = start + glm::normalize(design.start_direction) * design.vertices.front().offset; + else if (Vertex == count - 1) + position = end - glm::normalize(design.end_direction) * design.vertices.back().offset; + else + position = design.vertices[Vertex].position; + + double height; + if (Vertex < static_cast(result.vertex_elevations.size())) + height = result.vertex_elevations[Vertex]; + else if (false == design.vertices[Vertex].auto_elevation) + height = design.vertices[Vertex].elevation; + else + height = design.start.y + (design.end.y - design.start.y) * (Vertex + 1) / (count + 1.0); + return {position.x, height, position.y}; +} + +bool editor_mode::pick_route_vertex() +{ + if (false == route_active()) + return false; + screen_projection const projection; + ImVec2 const mouse = ImGui::GetIO().MousePos; + float best = kHandleRadius * kHandleRadius; + int hit{-1}; + for (int i = 0; i < static_cast(m_route.design.vertices.size()); ++i) + { + ImVec2 screen; + if (false == projection.project(route_vertex_position(i), screen)) + continue; + float const dx = screen.x - mouse.x; + float const dy = screen.y - mouse.y; + if (dx * dx + dy * dy < best) + { + best = dx * dx + dy * dy; + hit = i; + } + } + if (hit < 0) + return false; + m_route.vertex = hit; + return true; +} + +void editor_mode::draw_route_overlay() const +{ + auto const &route{m_route}; + auto const &design{route.design}; + auto const &result{route.result}; + screen_projection const projection; + ImDrawList *drawlist = ImGui::GetBackgroundDrawList(); + + // polygon of tangents + std::vector polygon{design.start}; + for (int i = 0; i < static_cast(design.vertices.size()); ++i) + polygon.push_back(route_vertex_position(i)); + polygon.push_back(design.end); + for (std::size_t i = 0; i + 1 < polygon.size(); ++i) + projection.line(drawlist, polygon[i], polygon[i + 1], IM_COL32(255, 210, 60, 150), 1.5f); + + // designed alignment, coloured by element: straight white, transition orange, circular curve green + if (result.length > 0.0 && result.profile.size() >= 2) + { + for (auto const &e : result.elements) + { + ImU32 const color = e.kind == alignment::element_kind::straight ? IM_COL32(255, 255, 255, 230) : e.kind == alignment::element_kind::arc ? IM_COL32(60, 230, 90, 255) : IM_COL32(255, 140, 30, 255); + int const steps = std::clamp(static_cast(e.length / 2.0), 1, 400); + auto previous{alignment::evaluate(result, e.chainage).position}; + for (int j = 1; j <= steps; ++j) + { + auto const next{alignment::evaluate(result, e.chainage + e.length * j / steps).position}; + projection.line(drawlist, previous, next, color, 3.0f); + previous = next; + } + ImVec2 screen; + if (projection.project(alignment::evaluate(result, e.chainage).position, screen)) + drawlist->AddCircleFilled(screen, 3.5f, IM_COL32(255, 255, 255, 255)); + } + } + + // fixed ends with their directions, and the vertices + for (auto const atend : {false, true}) + { + auto const &point{atend ? design.end : design.start}; + auto const direction{atend ? design.end_direction : design.start_direction}; + ImVec2 screen; + if (projection.project(point, screen)) + drawlist->AddRectFilled(ImVec2(screen.x - 5.0f, screen.y - 5.0f), ImVec2(screen.x + 5.0f, screen.y + 5.0f), IM_COL32(70, 140, 255, 255)); + auto const arrow{glm::dvec3{direction.x, 0.0, direction.y} * (atend ? 15.0 : -15.0)}; + projection.line(drawlist, point, point + arrow, IM_COL32(70, 140, 255, 255), 2.0f); + } + for (int i = 0; i < static_cast(design.vertices.size()); ++i) + { + ImVec2 screen; + if (false == projection.project(route_vertex_position(i), screen)) + continue; + drawlist->AddCircleFilled(screen, 6.0f, IM_COL32(255, 210, 60, 255)); + if (i == route.vertex) + drawlist->AddCircle(screen, 11.0f, IM_COL32(255, 255, 255, 255), 16, 2.5f); + char label[8]; + std::snprintf(label, sizeof(label), "W%d", i + 1); + drawlist->AddText(ImVec2(screen.x + 9.0f, screen.y - 18.0f), IM_COL32(255, 210, 60, 255), label); + } +} + +void editor_mode::render_route_gizmo() +{ + auto &route{m_route}; + auto const count{static_cast(route.design.vertices.size())}; + if (route.vertex < 0 || route.vertex >= count || false == m_gizmo_enabled) + { + m_route_gizmo_using = false; + return; + } + + ImGuizmo::BeginFrame(); + ImGuizmo::SetOrthographic(false); + ImGuiIO const &io = ImGui::GetIO(); + ImGuizmo::SetRect(0.0f, 0.0f, io.DisplaySize.x, io.DisplaySize.y); + glm::mat4 const view = GfxRenderer->Camera_View_Matrix(); + glm::dvec3 const camerapos = GfxRenderer->Camera_Position(); + float const fovy = glm::radians(Global.FieldOfView / Global.ZoomFactor); + float const aspect = io.DisplaySize.y > 0.0f ? io.DisplaySize.x / io.DisplaySize.y : 1.0f; + glm::mat4 const projection = glm::perspective(fovy, aspect, 0.1f, 10000.0f); + + auto const position{route_vertex_position(route.vertex)}; + if (false == m_route_gizmo_using) + m_route_gizmo = glm::translate(glm::mat4(1.0f), glm::vec3(position - camerapos)); + glm::vec3 snapvalue(m_gizmo_snap); + float const *snap = Global.ctrlState && snapvalue.x > 0.0f ? glm::value_ptr(snapvalue) : nullptr; + ImGuizmo::Manipulate(glm::value_ptr(view), glm::value_ptr(projection), ImGuizmo::TRANSLATE, ImGuizmo::WORLD, glm::value_ptr(m_route_gizmo), nullptr, snap); + + if (false == ImGuizmo::IsUsing()) + { + m_route_gizmo_using = false; + return; + } + m_route_gizmo_using = true; + glm::dvec3 const moved{camerapos + glm::dvec3(m_route_gizmo[3])}; + auto &vertex{route.design.vertices[route.vertex]}; + glm::dvec2 const point{moved.x, moved.z}; + // the first and the last vertex slide along the tangents of the fixed ends; a single vertex stays at their intersection + if (count >= 2) + { + if (route.vertex == 0) + vertex.offset = std::max(0.1, glm::dot(point - glm::dvec2{route.design.start.x, route.design.start.z}, glm::normalize(route.design.start_direction))); + else if (route.vertex == count - 1) + vertex.offset = std::max(0.1, glm::dot(glm::dvec2{route.design.end.x, route.design.end.z} - point, glm::normalize(route.design.end_direction))); + else + vertex.position = point; + } + if (std::abs(moved.y - position.y) > 1e-3) + { + vertex.auto_elevation = false; + vertex.elevation = moved.y; + } + route_update(); +} + +void editor_mode::render_route_ui() +{ + auto &route{m_route}; + auto &design{route.design}; + ImGui::TextDisabled("Re-lays a chain of regular paths along an alignment designed with intersection points.\n" + "The outer ends of the chain and their directions stay fixed.\n" + "LMB: select a path or a vertex (W1, W2...) Esc: release the vertex"); + + auto *track = selected_track(); + auto const name = [](TTrack const *Track) { return Track == nullptr ? std::string{"-"} : (Track->name().empty() ? std::string{"(noname)"} : Track->name()); }; + ImGui::Text("First path: %s", name(route.from).c_str()); + ImGui::SameLine(ImGui::GetWindowContentRegionWidth() - 110.0f); + if (ImGui::Button("Use selected##routefrom", ImVec2(110.0f, 0.0f)) && track != nullptr) + { + route.from = track; + if (route.to == nullptr) + route.to = track; + route_reset(); + } + ImGui::Text("Last path: %s", name(route.to).c_str()); + ImGui::SameLine(ImGui::GetWindowContentRegionWidth() - 110.0f); + if (ImGui::Button("Use selected##routeto", ImVec2(110.0f, 0.0f)) && track != nullptr) + { + route.to = track; + if (route.from == nullptr) + route.from = track; + route_reset(); + } + if (false == route.error.empty()) + ImGui::TextColored(ImVec4(1.0f, 0.35f, 0.3f, 1.0f), "%s", route.error.c_str()); + if (route.chain.tracks.empty()) + return; + + ImGui::Text("Fragment: %zu paths, %.2f m", route.chain.tracks.size(), route.chain.length); + ImGui::SameLine(); + if (ImGui::SmallButton("Reset design")) + { + route_reset(); + return; + } + + bool changed{false}; + ImGui::PushItemWidth(120.0f); + changed |= ImGui::InputDouble("Design speed (km/h)", &design.speed, 0.0, 0.0, "%.0f"); + design.speed = std::max(1.0, design.speed); + int shape = static_cast(design.shape); + char const *shapes[] = {"Cubic parabola", "Clothoid"}; + if (ImGui::Combo("Transition curve", &shape, shapes, IM_ARRAYSIZE(shapes))) + { + design.shape = static_cast(shape); + changed = true; + } + ImGui::PopItemWidth(); + + if (ImGui::TreeNode("Limits")) + { + auto &norms{design.norms}; + ImGui::PushItemWidth(100.0f); + changed |= ImGui::InputDouble("Rail axes distance (mm)", &norms.gauge, 0.0, 0.0, "%.0f"); + changed |= ImGui::InputDouble("Unbalanced acceleration (m/s2)", &norms.unbalanced, 0.0, 0.0, "%.2f"); + changed |= ImGui::InputDouble("Maximum cant (mm)", &norms.cant_max, 0.0, 0.0, "%.0f"); + changed |= ImGui::InputDouble("Cant change rate (mm/s)", &norms.cant_rate, 0.0, 0.0, "%.0f"); + changed |= ImGui::InputDouble("Cant ramp 1:(k*V), k", &norms.ramp_factor, 0.0, 0.0, "%.1f"); + changed |= ImGui::InputDouble("Unbalanced acc. change rate (m/s3)", &norms.jerk, 0.0, 0.0, "%.2f"); + changed |= ImGui::InputDouble("Vertical curve R >= k*V^2, k", &norms.vertical_factor, 0.0, 0.0, "%.2f"); + changed |= ImGui::InputDouble("Vertical curve R min (m)", &norms.vertical_min, 0.0, 0.0, "%.0f"); + changed |= ImGui::InputDouble("Straight between curves (s of travel)", &norms.tangent_min_time, 0.0, 0.0, "%.1f"); + ImGui::PopItemWidth(); + norms.gauge = std::max(100.0, norms.gauge); + norms.cant_rate = std::max(1.0, norms.cant_rate); + norms.jerk = std::max(0.01, norms.jerk); + ImGui::TreePop(); + } + + // vertices + auto &vertices{design.vertices}; + if (ImGui::Button("Add vertex")) + { + alignment::vertex vertex; + vertex.radius = vertices.empty() ? 1000.0 : vertices.back().radius; + route_recommend(vertex); + auto const distance{glm::distance(glm::dvec2{design.start.x, design.start.z}, glm::dvec2{design.end.x, design.end.z})}; + if (vertices.size() == 1) + { + // a single vertex sits at the intersection of the tangents; two vertices slide along them + vertices.front().offset = distance / 3.0; + vertex.offset = distance / 3.0; + vertices.push_back(vertex); + } + else if (vertices.empty()) + { + vertices.push_back(vertex); + } + else + { + // new vertex between the selected one (or the last but one) and the next + auto const index{std::clamp(route.vertex, 0, static_cast(vertices.size()) - 2)}; + auto const a{route_vertex_position(index)}; + auto const b{route_vertex_position(index + 1)}; + vertex.position = glm::dvec2{(a.x + b.x) * 0.5, (a.z + b.z) * 0.5}; + // the moved vertices keep their place, so the former first/last vertex positions become free positions + for (int i = 0; i < static_cast(vertices.size()); ++i) + { + auto const p{route_vertex_position(i)}; + vertices[i].position = {p.x, p.z}; + } + vertices.insert(vertices.begin() + index + 1, vertex); + } + changed = true; + } + ImGui::SameLine(); + if (ImGui::Button("Remove vertex") && false == vertices.empty()) + { + auto const index{route.vertex >= 0 && route.vertex < static_cast(vertices.size()) ? route.vertex : static_cast(vertices.size()) - 1}; + vertices.erase(vertices.begin() + index); + route.vertex = -1; + changed = true; + } + + auto const count{static_cast(vertices.size())}; + for (int i = 0; i < count; ++i) + { + auto &vertex{vertices[i]}; + ImGui::PushID(i); + char header[32]; + std::snprintf(header, sizeof(header), "Vertex W%d", i + 1); + if (ImGui::Selectable(header, route.vertex == i)) + route.vertex = (route.vertex == i ? -1 : i); + ImGui::Indent(); + ImGui::PushItemWidth(110.0f); + if (count == 1) + ImGui::TextDisabled("At the intersection of the end tangents"); + else if (i == 0) + changed |= ImGui::InputDouble("Distance from the start (m)", &vertex.offset, 0.0, 0.0, "%.2f"); + else if (i == count - 1) + changed |= ImGui::InputDouble("Distance from the end (m)", &vertex.offset, 0.0, 0.0, "%.2f"); + else + { + ImGui::PushItemWidth(220.0f); + changed |= ImGui::InputScalarN("Position (x, z)", ImGuiDataType_Double, glm::value_ptr(vertex.position), 2, nullptr, nullptr, "%.2f"); + ImGui::PopItemWidth(); + } + changed |= ImGui::InputDouble("Radius R (m)", &vertex.radius, 0.0, 0.0, "%.1f"); + changed |= ImGui::InputDouble("Transition in (m)", &vertex.transition_in, 0.0, 0.0, "%.1f"); + changed |= ImGui::InputDouble("Transition out (m)", &vertex.transition_out, 0.0, 0.0, "%.1f"); + changed |= ImGui::InputDouble("Cant (mm)", &vertex.cant, 0.0, 0.0, "%.0f"); + changed |= ImGui::Checkbox("Elevation from the ends", &vertex.auto_elevation); + if (false == vertex.auto_elevation) + changed |= ImGui::InputDouble("Elevation (m)", &vertex.elevation, 0.0, 0.0, "%.3f"); + changed |= ImGui::InputDouble("Vertical curve R (0: min)", &vertex.vertical_radius, 0.0, 0.0, "%.0f"); + ImGui::PopItemWidth(); + vertex.radius = std::max(1.0, vertex.radius); + vertex.transition_in = std::max(0.0, vertex.transition_in); + vertex.transition_out = std::max(0.0, vertex.transition_out); + vertex.cant = std::max(0.0, vertex.cant); + vertex.vertical_radius = std::max(0.0, vertex.vertical_radius); + if (ImGui::SmallButton("Apply recommended for V")) + { + route_recommend(vertex); + changed = true; + } + + auto const recommended{alignment::recommend(design.speed, vertex.radius, design.norms)}; + ImGui::TextDisabled("For %.0f km/h: R min %.0f m, cant %.0f mm (equilibrium %.0f, min %.0f), transition %.0f m", design.speed, recommended.radius_min, recommended.cant, recommended.cant_equilibrium, recommended.cant_min, recommended.transition); + for (auto const &curve : route.result.curves) + { + if (curve.vertex != i) + continue; + ImGui::Text("Deflection %.4f deg, tangents %.2f / %.2f m, arc %.2f m", glm::degrees(curve.deflection), curve.tangent_in, curve.tangent_out, curve.arc_length); + ImGui::Text("Unbalanced acc. %.3f m/s2, cant rate %.1f / %.1f mm/s, acc. rate %.3f / %.3f m/s3", curve.unbalanced, curve.cant_rate_in, curve.cant_rate_out, curve.jerk_in, curve.jerk_out); + } + ImGui::Unindent(); + ImGui::PopID(); + } + if (changed) + route_update(); + + // outcome + ImGui::Separator(); + auto const &result{route.result}; + if (result.length > 0.0) + { + auto const pieces{alignment::minimum_pieces(result, design)}; + ImGui::Text("Length %.2f m (now %.2f m), %zu elements", result.length, route.chain.length, result.elements.size()); + ImGui::TextDisabled("Paths: %zu in the fragment, %zu needed%s", route.chain.tracks.size(), pieces, pieces > route.chain.tracks.size() ? " (copies of the neighbours will be added)" : ""); + } + for (auto const &error : result.errors) + ImGui::TextColored(ImVec4(1.0f, 0.35f, 0.3f, 1.0f), "%s", error.c_str()); + for (auto const &warning : result.warnings) + ImGui::TextColored(ImVec4(1.0f, 0.7f, 0.2f, 1.0f), "%s", warning.c_str()); + + if (ImGui::TreeNode("Elements")) + { + char const *kinds[] = {"straight", "transition", "curve", "transition"}; + for (auto const &e : result.elements) + ImGui::Text("%8.2f m %-10s L %8.2f m%s", e.chainage, kinds[static_cast(e.kind)], e.length, e.kind == alignment::element_kind::straight ? "" : (" R " + std::to_string(static_cast(std::round(e.radius))) + " m").c_str()); + ImGui::TreePop(); + } + + if (result.valid) + { + if (ImGui::Button("Apply to the scenery")) + route_apply(); + } + else + { + ImGui::TextDisabled("Correct the errors to apply the design"); + } + if (false == route.status.empty()) + { + ImGui::SameLine(); + ImGui::TextUnformatted(route.status.c_str()); + } +} diff --git a/editor/editorAlignment.cpp b/editor/editorAlignment.cpp new file mode 100644 index 000000000..82ad834a9 --- /dev/null +++ b/editor/editorAlignment.cpp @@ -0,0 +1,696 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "editor/editorAlignment.hpp" + +#include +#include +#include +#include +#include + +namespace alignment +{ + +namespace +{ + +double const kGravity{9.81}; +double const kPi{3.14159265358979323846}; + +double cross(glm::dvec2 const &A, glm::dvec2 const &B) +{ + return A.x * B.y - A.y * B.x; +} + +// vector rotated by 90 degrees counter-clockwise +glm::dvec2 perpendicular(glm::dvec2 const &Vector) +{ + return {-Vector.y, Vector.x}; +} + +glm::dvec2 rotate(glm::dvec2 const &Vector, double const Angle) +{ + auto const c{std::cos(Angle)}; + auto const s{std::sin(Angle)}; + return {Vector.x * c - Vector.y * s, Vector.x * s + Vector.y * c}; +} + +glm::dvec2 plan(glm::dvec3 const &Point) +{ + return {Point.x, Point.z}; +} + +double ceil_to(double const Value, double const Step) +{ + return std::ceil(Value / Step - 1e-9) * Step; +} + +std::string format(char const *Format, ...) +{ + char buffer[512]; + va_list arguments; + va_start(arguments, Format); + std::vsnprintf(buffer, sizeof(buffer), Format, arguments); + va_end(arguments); + return buffer; +} + +// point of a transition curve in its local frame: x along the tangent at its start, y towards the curve centre +struct local_point +{ + double x{0.0}; + double y{0.0}; + double angle{0.0}; // tangent angle relative to the initial tangent +}; + +// Parameter is the fraction of the transition length, from the straight (0) to the circular curve (1) +local_point transition_point(transition_shape const Shape, double const Length, double const Radius, double const Parameter) +{ + if (Length <= 0.0 || Radius <= 0.0) + return {}; + if (Shape == transition_shape::cubic_parabola) + { + auto const x{Length * Parameter}; + return {x, x * x * x / (6.0 * Radius * Length), std::atan(x * x / (2.0 * Radius * Length))}; + } + // clothoid, tangent angle grows with the square of the travelled distance + auto const distance{Length * Parameter}; + auto const angle = [&](double const S) { return S * S / (2.0 * Radius * Length); }; + int const steps{std::max(8, static_cast(std::ceil(distance / 0.5)) * 2)}; + double const h{distance / steps}; + double x{0.0}, y{0.0}; + for (int i = 0; i <= steps; ++i) + { + double const weight = (i == 0 || i == steps) ? 1.0 : (i % 2 ? 4.0 : 2.0); + auto const a{angle(i * h)}; + x += weight * std::cos(a); + y += weight * std::sin(a); + } + return {x * h / 3.0, y * h / 3.0, angle(distance)}; +} + +// plan position and direction of travel at given distance from the start of the element +void element_point(element const &Element, transition_shape const Shape, double const Distance, glm::dvec2 &Position, glm::dvec2 &Direction) +{ + switch (Element.kind) + { + case element_kind::straight: + Position = Element.origin + Element.direction * Distance; + Direction = Element.direction; + break; + case element_kind::arc: + { + auto const angle{Element.turn * Distance / Element.radius}; + Position = Element.origin + rotate(Element.normal, angle); + Direction = rotate(Element.direction, angle); + break; + } + case element_kind::transition_in: + { + auto const local{transition_point(Shape, Element.transition, Element.radius, Distance / Element.transition)}; + Position = Element.origin + Element.direction * local.x + Element.normal * local.y; + Direction = Element.direction * std::cos(local.angle) + Element.normal * std::sin(local.angle); + break; + } + case element_kind::transition_out: + { + auto const local{transition_point(Shape, Element.transition, Element.radius, 1.0 - Distance / Element.transition)}; + Position = Element.origin + Element.direction * local.x + Element.normal * local.y; + Direction = -(Element.direction * std::cos(local.angle) + Element.normal * std::sin(local.angle)); + break; + } + } +} + +double element_cant(element const &Element, double const Distance) +{ + switch (Element.kind) + { + case element_kind::transition_in: return Element.cant * Distance / Element.transition; + case element_kind::transition_out: return Element.cant * (1.0 - Distance / Element.transition); + case element_kind::arc: return Element.cant; + default: return 0.0; + } +} + +element const &element_at(result const &Result, double const Chainage) +{ + auto const lookup = std::upper_bound(Result.elements.begin(), Result.elements.end(), Chainage, [](double const Value, element const &Element) { return Value < Element.chainage; }); + return lookup == Result.elements.begin() ? Result.elements.front() : *std::prev(lookup); +} + +// polar form of a cubic Bezier curve; control points of the part between parameters a and b are f(a,a,a), f(a,a,b), f(a,b,b), f(b,b,b) +glm::dvec2 blossom(std::array const &Points, double const A, double const B, double const C) +{ + glm::dvec2 r[3], s[2]; + for (int i = 0; i < 3; ++i) + r[i] = glm::mix(Points[i], Points[i + 1], A); + for (int i = 0; i < 2; ++i) + s[i] = glm::mix(r[i], r[i + 1], B); + return glm::mix(s[0], s[1], C); +} + +// number of cubic pieces needed to represent the element accurately +std::size_t element_pieces(element const &Element, transition_shape const Shape) +{ + if (Element.length < 1e-3) + return 0; + switch (Element.kind) + { + case element_kind::arc: + // cubic approximation of a 10 degree arc deviates from the circle by less than 1e-7 of its radius + return static_cast(std::max(1.0, std::ceil(Element.length / Element.radius / (10.0 * kPi / 180.0) - 1e-9))); + case element_kind::transition_in: + case element_kind::transition_out: + return Shape == transition_shape::cubic_parabola ? 1 : static_cast(std::max(1.0, std::ceil(Element.length / 20.0 - 1e-9))); + default: + return 1; + } +} + +} // namespace + +double unbalanced_acceleration(double const Speed, double const Radius, double const Cant, limits const &Limits) +{ + if (Radius <= 0.0) + return 0.0; + return Speed * Speed / (12.96 * Radius) - kGravity * Cant / Limits.gauge; +} + +double transition_length(double const Speed, double const Radius, double const Cant, limits const &Limits) +{ + double length{0.0}; + if (Cant > 0.0) + { + // rate of cant change in time, and the inclination of the cant ramp + length = std::max(length, Speed * Cant / (3.6 * Limits.cant_rate)); + length = std::max(length, Cant / 1000.0 * Limits.ramp_factor * Speed); + } + // rate of change of the unbalanced acceleration + auto const unbalanced{std::max(0.0, unbalanced_acceleration(Speed, Radius, Cant, Limits))}; + length = std::max(length, unbalanced * Speed / (3.6 * Limits.jerk)); + return length > 0.0 ? ceil_to(length, 5.0) : 0.0; +} + +recommendation recommend(double const Speed, double const Radius, limits const &Limits) +{ + recommendation result; + auto const factor{Limits.gauge / (kGravity * 12.96)}; // ~11.8 for standard gauge + auto const allowance{Limits.gauge * Limits.unbalanced / kGravity}; + result.radius_min = factor * Speed * Speed / (Limits.cant_max + allowance); + result.vertical_radius = std::max(Limits.vertical_min, Limits.vertical_factor * Speed * Speed); + if (Radius <= 0.0) + return result; + result.cant_equilibrium = factor * Speed * Speed / Radius; + result.cant_min = std::max(0.0, result.cant_equilibrium - allowance); + // keep a part of the permissible unbalanced acceleration in reserve, but never go below the required minimum + result.cant = std::min(Limits.cant_max, ceil_to(std::max(result.cant_min, result.cant_equilibrium * 2.0 / 3.0), 5.0)); + result.transition = transition_length(Speed, Radius, result.cant, Limits); + return result; +} + +result compute(design const &Design) +{ + result r; + r.shape = Design.shape; + r.gauge = Design.norms.gauge; + + auto const start{plan(Design.start)}; + auto const end{plan(Design.end)}; + auto const startdirection{glm::normalize(Design.start_direction)}; + auto const enddirection{glm::normalize(Design.end_direction)}; + auto const count{Design.vertices.size()}; + + // resolve vertex positions; the first and the last vertex lie on the tangents of the fixed ends + r.vertices.resize(count); + if (count == 0) + { + auto const offset{end - start}; + if (std::abs(cross(startdirection, offset)) > 0.01 || glm::dot(startdirection, enddirection) < std::cos(1e-4) || glm::dot(startdirection, offset) <= 0.0) + r.errors.emplace_back("The ends don't lie on a common straight line, add a vertex"); + } + else if (count == 1) + { + auto const offset{end - start}; + auto const determinant{cross(startdirection, enddirection)}; + if (std::abs(determinant) < 1e-9) + { + r.errors.emplace_back("Tangents of the ends are parallel, use two vertices"); + } + else + { + auto const t{cross(offset, enddirection) / determinant}; + auto const u{cross(startdirection, offset) / determinant}; + if (t <= 0.0 || u <= 0.0) + r.errors.emplace_back("Tangents of the ends intersect outside of the fragment, use two vertices"); + r.vertices[0] = start + startdirection * t; + } + } + else + { + for (std::size_t i = 1; i + 1 < count; ++i) + r.vertices[i] = Design.vertices[i].position; + r.vertices.front() = start + startdirection * Design.vertices.front().offset; + r.vertices.back() = end - enddirection * Design.vertices.back().offset; + } + if (false == r.errors.empty()) + return r; + + std::vector polygon{start}; + polygon.insert(polygon.end(), r.vertices.begin(), r.vertices.end()); + polygon.push_back(end); + for (std::size_t i = 0; i + 1 < polygon.size(); ++i) + { + if (glm::distance(polygon[i], polygon[i + 1]) < 1e-3) + { + r.errors.emplace_back(format("Tangent %zu has zero length", i + 1)); + return r; + } + } + + double chainage{0.0}; + auto const push = [&](element Element) { + Element.chainage = chainage; + chainage += Element.length; + r.elements.push_back(Element); + }; + auto const push_straight = [&](glm::dvec2 const &From, glm::dvec2 const &Direction, double const Length) { + if (Length <= 1e-6) + return; + element straight; + straight.kind = element_kind::straight; + straight.origin = From; + straight.direction = Direction; + straight.length = Length; + push(straight); + }; + + std::vector vertexchainage(count, 0.0); + glm::dvec2 cursor{start}; + for (std::size_t k = 0; k < count; ++k) + { + auto const &vertex{Design.vertices[k]}; + auto const &position{polygon[k + 1]}; + auto const directionin{glm::normalize(polygon[k + 1] - polygon[k])}; + auto const directionout{glm::normalize(polygon[k + 2] - polygon[k + 1])}; + auto const turn{cross(directionin, directionout)}; + auto const deflection{std::atan2(std::abs(turn), glm::dot(directionin, directionout))}; + + auto const lead{glm::dot(position - cursor, directionin)}; + if (deflection < 1e-7) + { + // tangents are collinear, there's no curve to fit + if (lead < -1e-4) + r.errors.emplace_back(format("Vertex %zu lies inside the curve of the previous vertex", k + 1)); + push_straight(cursor, directionin, lead); + vertexchainage[k] = chainage; + cursor = position; + continue; + } + if (deflection > kPi - 1e-3) + { + r.errors.emplace_back(format("Vertex %zu: the route turns back on itself", k + 1)); + return r; + } + if (vertex.radius < 1.0) + { + r.errors.emplace_back(format("Vertex %zu: radius is too small", k + 1)); + return r; + } + + int const side{turn > 0.0 ? 1 : -1}; + auto const radius{vertex.radius}; + auto const lengthin{std::max(0.0, vertex.transition_in)}; + auto const lengthout{std::max(0.0, vertex.transition_out)}; + auto const endin{transition_point(Design.shape, lengthin, radius, 1.0)}; + auto const endout{transition_point(Design.shape, lengthout, radius, 1.0)}; + // shift of the circular curve towards its centre, and position of the shifted curve start along the tangent + auto const shiftin{endin.y - radius * (1.0 - std::cos(endin.angle))}; + auto const shiftout{endout.y - radius * (1.0 - std::cos(endout.angle))}; + auto const middlein{endin.x - radius * std::sin(endin.angle)}; + auto const middleout{endout.x - radius * std::sin(endout.angle)}; + + // the centre lies at distances R + shift from both tangents + auto const normalin{perpendicular(directionin) * static_cast(side)}; + auto const normalout{perpendicular(directionout) * static_cast(side)}; + auto const a{radius + shiftin}; + auto const b{radius + shiftout}; + auto const determinant{cross(normalin, normalout)}; + glm::dvec2 const centre{position + glm::dvec2{(a * normalout.y - normalin.y * b) / determinant, (normalin.x * b - a * normalout.x) / determinant}}; + auto const curvestart{centre - normalin * a - directionin * middlein}; + auto const curveend{centre - normalout * b + directionout * middleout}; + auto const arcangle{deflection - endin.angle - endout.angle}; + if (arcangle < -1e-9) + { + r.errors.emplace_back(format("Vertex %zu: transition curves are too long for the deflection angle", k + 1)); + return r; + } + + auto const straight{glm::dot(curvestart - cursor, directionin)}; + if (straight < -1e-4) + { + if (k == 0) + r.errors.emplace_back(format("Vertex 1: the curve starts %.2f m before the fixed start", -straight)); + else + r.errors.emplace_back(format("Curves of vertices %zu and %zu overlap by %.2f m", k, k + 1, -straight)); + } + push_straight(cursor, directionin, straight); + + element curve; + curve.vertex = static_cast(k); + curve.radius = radius; + curve.turn = side; + curve.cant = std::max(0.0, vertex.cant); + if (lengthin > 0.0) + { + curve.kind = element_kind::transition_in; + curve.transition = curve.length = lengthin; + curve.origin = curvestart; + curve.direction = directionin; + curve.normal = normalin; + push(curve); + } + auto const arcstart{curvestart + directionin * endin.x + normalin * endin.y}; + curve.kind = element_kind::arc; + curve.transition = 0.0; + curve.length = radius * std::max(0.0, arcangle); + curve.origin = centre; + curve.normal = arcstart - centre; + curve.direction = rotate(directionin, side * endin.angle); + vertexchainage[k] = chainage + curve.length * 0.5; + if (curve.length > 1e-6) + push(curve); + if (lengthout > 0.0) + { + curve.kind = element_kind::transition_out; + curve.transition = curve.length = lengthout; + curve.origin = curveend; + curve.direction = -directionout; + curve.normal = normalout; + push(curve); + } + cursor = curveend; + + curve_report report; + report.vertex = static_cast(k); + report.deflection = deflection; + report.arc_length = radius * std::max(0.0, arcangle); + report.tangent_in = glm::distance(position, curvestart); + report.tangent_out = glm::distance(position, curveend); + report.unbalanced = unbalanced_acceleration(Design.speed, radius, curve.cant, Design.norms); + auto const speed{Design.speed / 3.6}; + if (lengthin > 0.0) + { + report.cant_rate_in = curve.cant * speed / lengthin; + report.jerk_in = std::max(0.0, report.unbalanced) * speed / lengthin; + } + if (lengthout > 0.0) + { + report.cant_rate_out = curve.cant * speed / lengthout; + report.jerk_out = std::max(0.0, report.unbalanced) * speed / lengthout; + } + report.recommended = recommend(Design.speed, radius, Design.norms); + r.curves.push_back(report); + + // verification against the limits + auto const &norms{Design.norms}; + if (radius < report.recommended.radius_min - 1e-6) + r.warnings.emplace_back(format("Vertex %zu: R %.0f m is below the minimum %.0f m for %.0f km/h", k + 1, radius, report.recommended.radius_min, Design.speed)); + if (curve.cant > norms.cant_max + 1e-6) + r.warnings.emplace_back(format("Vertex %zu: cant %.0f mm exceeds %.0f mm", k + 1, curve.cant, norms.cant_max)); + if (report.unbalanced > norms.unbalanced + 1e-6) + r.warnings.emplace_back(format("Vertex %zu: unbalanced acceleration %.2f m/s2 exceeds %.2f m/s2 (cant at least %.0f mm)", k + 1, report.unbalanced, norms.unbalanced, report.recommended.cant_min)); + auto const required{transition_length(Design.speed, radius, curve.cant, norms)}; + if (lengthin + 1e-6 < required || lengthout + 1e-6 < required) + r.warnings.emplace_back(format("Vertex %zu: transition curves shorter than the required %.0f m", k + 1, required)); + if (curve.cant > 0.0 && (lengthin <= 0.0 || lengthout <= 0.0)) + r.warnings.emplace_back(format("Vertex %zu: cant without a transition curve to ramp it", k + 1)); + } + auto const lastdirection{glm::normalize(polygon.back() - polygon[polygon.size() - 2])}; + auto const tail{glm::dot(end - cursor, lastdirection)}; + if (tail < -1e-4) + r.errors.emplace_back(format("Vertex %zu: the curve ends %.2f m past the fixed end", count, -tail)); + push_straight(cursor, lastdirection, tail); + r.length = chainage; + + // straights between curves, measured as travel time + if (Design.norms.tangent_min_time > 0.0) + { + auto const minimum{Design.norms.tangent_min_time * Design.speed / 3.6}; + for (std::size_t i = 1; i + 1 < r.elements.size(); ++i) + { + auto const &e{r.elements[i]}; + if (e.kind == element_kind::straight && e.length < minimum && r.elements[i - 1].kind != element_kind::straight && r.elements[i + 1].kind != element_kind::straight) + r.warnings.emplace_back(format("Straight between curves is %.1f m long, less than %.0f m", e.length, minimum)); + } + } + + // vertical profile: grades between the fixed ends and the vertex elevations, joined with vertical curves + r.vertex_chainages = vertexchainage; + r.profile.push_back({0.0, Design.start.y, 0.0, 0.0}); + for (std::size_t k = 0; k < count; ++k) + { + auto const &vertex{Design.vertices[k]}; + auto const elevation{vertex.auto_elevation ? Design.start.y + (Design.end.y - Design.start.y) * vertexchainage[k] / std::max(r.length, 1e-6) : vertex.elevation}; + r.vertex_elevations.push_back(elevation); + auto const radius{vertex.vertical_radius > 0.0 ? vertex.vertical_radius : std::max(Design.norms.vertical_min, Design.norms.vertical_factor * Design.speed * Design.speed)}; + if (vertexchainage[k] <= r.profile.back().chainage + 1e-3) + continue; // vertex without its own place in the profile + r.profile.push_back({vertexchainage[k], elevation, radius, 0.0}); + } + r.profile.push_back({r.length, Design.end.y, 0.0, 0.0}); + for (std::size_t i = 1; i + 1 < r.profile.size(); ++i) + { + auto &point{r.profile[i]}; + auto const gradebefore{(point.elevation - r.profile[i - 1].elevation) / (point.chainage - r.profile[i - 1].chainage)}; + auto const gradeafter{(r.profile[i + 1].elevation - point.elevation) / (r.profile[i + 1].chainage - point.chainage)}; + point.tangent = point.radius * std::abs(gradeafter - gradebefore) / 2.0; + } + for (std::size_t i = 0; i + 1 < r.profile.size(); ++i) + { + if (r.profile[i].tangent + r.profile[i + 1].tangent > r.profile[i + 1].chainage - r.profile[i].chainage + 1e-6) + r.warnings.emplace_back(format("Vertical curves overlap between chainage %.0f m and %.0f m", r.profile[i].chainage, r.profile[i + 1].chainage)); + } + if (r.profile.size() >= 2) + { + auto const first{(r.profile[1].elevation - r.profile[0].elevation) / (r.profile[1].chainage - r.profile[0].chainage)}; + auto const last{(r.profile.back().elevation - r.profile[r.profile.size() - 2].elevation) / (r.profile.back().chainage - r.profile[r.profile.size() - 2].chainage)}; + if (std::abs(first - Design.start_grade) > 0.0005) + r.warnings.emplace_back(format("Grade break at the start: %.1f per mille against %.1f of the adjoining track", first * 1000.0, Design.start_grade * 1000.0)); + if (std::abs(last - Design.end_grade) > 0.0005) + r.warnings.emplace_back(format("Grade break at the end: %.1f per mille against %.1f of the adjoining track", last * 1000.0, Design.end_grade * 1000.0)); + } + // curvature continuity with the adjoining tracks; the designed fragment starts and ends on a tangent + if (Design.start_radius > 0.0 && Design.start_radius < 10000.0) + r.warnings.emplace_back(format("The adjoining track at the start is curved (R %.0f m), the curvature changes abruptly", Design.start_radius)); + if (Design.end_radius > 0.0 && Design.end_radius < 10000.0) + r.warnings.emplace_back(format("The adjoining track at the end is curved (R %.0f m), the curvature changes abruptly", Design.end_radius)); + + r.valid = r.errors.empty() && r.length > 1e-3; + return r; +} + +bool tangent_intersection(design const &Design, glm::dvec2 &Point) +{ + auto const start{plan(Design.start)}; + auto const offset{plan(Design.end) - start}; + auto const startdirection{glm::normalize(Design.start_direction)}; + auto const enddirection{glm::normalize(Design.end_direction)}; + auto const determinant{cross(startdirection, enddirection)}; + if (std::abs(determinant) < 1e-9) + return false; + auto const t{cross(offset, enddirection) / determinant}; + auto const u{cross(startdirection, offset) / determinant}; + if (t <= 0.0 || u <= 0.0) + return false; + Point = start + startdirection * t; + return true; +} + +bool collinear(design const &Design) +{ + auto const offset{plan(Design.end) - plan(Design.start)}; + auto const startdirection{glm::normalize(Design.start_direction)}; + auto const enddirection{glm::normalize(Design.end_direction)}; + return std::abs(cross(startdirection, offset)) <= 0.01 && glm::dot(startdirection, enddirection) >= std::cos(1e-4) && glm::dot(startdirection, offset) > 0.0; +} + +double elevation(result const &Result, double const Chainage) +{ + auto const &profile{Result.profile}; + if (profile.size() < 2) + return 0.0; + auto const s{std::clamp(Chainage, 0.0, Result.length)}; + std::size_t segment{0}; + while (segment + 2 < profile.size() && s > profile[segment + 1].chainage) + ++segment; + auto const &from{profile[segment]}; + auto const &to{profile[segment + 1]}; + double height{from.elevation + (to.elevation - from.elevation) * (s - from.chainage) / (to.chainage - from.chainage)}; + for (std::size_t i = 1; i + 1 < profile.size(); ++i) + { + auto const &point{profile[i]}; + auto const distance{std::abs(s - point.chainage)}; + if (point.tangent <= 0.0 || distance >= point.tangent) + continue; + auto const gradebefore{(point.elevation - profile[i - 1].elevation) / (point.chainage - profile[i - 1].chainage)}; + auto const gradeafter{(profile[i + 1].elevation - point.elevation) / (profile[i + 1].chainage - point.chainage)}; + auto const offset{(point.tangent - distance) * (point.tangent - distance) / (2.0 * point.radius)}; + height += gradeafter > gradebefore ? offset : -offset; + } + return height; +} + +double grade(result const &Result, double const Chainage) +{ + auto const &profile{Result.profile}; + if (profile.size() < 2) + return 0.0; + auto const s{std::clamp(Chainage, 0.0, Result.length)}; + std::size_t segment{0}; + while (segment + 2 < profile.size() && s > profile[segment + 1].chainage) + ++segment; + auto const &from{profile[segment]}; + auto const &to{profile[segment + 1]}; + double slope{(to.elevation - from.elevation) / (to.chainage - from.chainage)}; + for (std::size_t i = 1; i + 1 < profile.size(); ++i) + { + auto const &point{profile[i]}; + auto const distance{s - point.chainage}; + if (point.tangent <= 0.0 || std::abs(distance) >= point.tangent) + continue; + auto const gradebefore{(point.elevation - profile[i - 1].elevation) / (point.chainage - profile[i - 1].chainage)}; + auto const gradeafter{(profile[i + 1].elevation - point.elevation) / (profile[i + 1].chainage - point.chainage)}; + auto const change{(point.tangent - std::abs(distance)) / point.radius * (distance < 0.0 ? 1.0 : -1.0)}; + slope += gradeafter > gradebefore ? change : -change; + } + return slope; +} + +station evaluate(result const &Result, double const Chainage) +{ + station result; + if (Result.elements.empty()) + return result; + auto const s{std::clamp(Chainage, 0.0, Result.length)}; + auto const &e{element_at(Result, s)}; + auto const distance{std::clamp(s - e.chainage, 0.0, e.length)}; + glm::dvec2 position, direction; + element_point(e, Result.shape, distance, position, direction); + result.position = {position.x, elevation(Result, s), position.y}; + result.direction = glm::normalize(glm::dvec3{direction.x, grade(Result, s), direction.y}); + result.cant = element_cant(e, distance); + result.turn = e.turn; + return result; +} + +std::size_t minimum_pieces(result const &Result, design const &Design) +{ + std::size_t count{0}; + for (auto const &e : Result.elements) + count += element_pieces(e, Design.shape); + return count; +} + +std::vector pieces(result const &Result, design const &Design, std::size_t const Count) +{ + struct span + { + std::size_t element; + double from, to; + }; + std::vector spans; + for (std::size_t i = 0; i < Result.elements.size(); ++i) + { + auto const &e{Result.elements[i]}; + auto const count{element_pieces(e, Design.shape)}; + for (std::size_t j = 0; j < count; ++j) + spans.push_back({i, e.length * j / count, e.length * (j + 1) / count}); + } + // use up the requested number of pieces by dividing the longest ones + while (false == spans.empty() && spans.size() < Count) + { + auto longest = std::max_element(spans.begin(), spans.end(), [](span const &A, span const &B) { return A.to - A.from < B.to - B.from; }); + auto const middle{(longest->from + longest->to) * 0.5}; + span const second{longest->element, middle, longest->to}; + longest->to = middle; + spans.insert(std::next(longest), second); + } + + std::vector result; + for (auto const &piece : spans) + { + auto const &e{Result.elements[piece.element]}; + glm::dvec2 p0, p3, d0, d3; + element_point(e, Design.shape, piece.from, p0, d0); + element_point(e, Design.shape, piece.to, p3, d3); + glm::dvec2 p1, p2; + switch (e.kind) + { + case element_kind::straight: + p1 = p0 + (p3 - p0) / 3.0; + p2 = p0 + (p3 - p0) * (2.0 / 3.0); + break; + case element_kind::arc: + { + auto const angle{(piece.to - piece.from) / e.radius}; + auto const handle{4.0 / 3.0 * std::tan(angle / 4.0) * e.radius}; + p1 = p0 + d0 * handle; + p2 = p3 - d3 * handle; + break; + } + default: + { + if (Design.shape == transition_shape::cubic_parabola) + { + // exact: part of the cubic which describes the whole transition + std::array const local{glm::dvec2{0.0, 0.0}, glm::dvec2{e.transition / 3.0, 0.0}, glm::dvec2{e.transition * 2.0 / 3.0, 0.0}, glm::dvec2{e.transition, e.transition * e.transition / (6.0 * e.radius)}}; + auto const a{e.kind == element_kind::transition_in ? piece.from / e.transition : 1.0 - piece.from / e.transition}; + auto const b{e.kind == element_kind::transition_in ? piece.to / e.transition : 1.0 - piece.to / e.transition}; + auto const world = [&](glm::dvec2 const &Point) { return e.origin + e.direction * Point.x + e.normal * Point.y; }; + p0 = world(blossom(local, a, a, a)); + p1 = world(blossom(local, a, a, b)); + p2 = world(blossom(local, a, b, b)); + p3 = world(blossom(local, b, b, b)); + } + else + { + auto const chord{glm::distance(p0, p3) / 3.0}; + p1 = p0 + d0 * chord; + p2 = p3 - d3 * chord; + } + break; + } + } + // heights follow the profile, with end slopes matching its grade + auto const s0{e.chainage + piece.from}; + auto const s3{e.chainage + piece.to}; + auto const y0{elevation(Result, s0)}; + auto const y3{elevation(Result, s3)}; + auto const y1{y0 + grade(Result, s0) * glm::distance(p0, p1)}; + auto const y2{y3 - grade(Result, s3) * glm::distance(p2, p3)}; + + auto const roll = [&](double const Cant) { return static_cast(e.turn * glm::degrees(std::asin(std::clamp(Cant / Design.norms.gauge, -1.0, 1.0)))); }; + + segment_data path; + path.points[segment_data::point::start] = {p0.x, y0, p0.y}; + path.points[segment_data::point::end] = {p3.x, y3, p3.y}; + path.points[segment_data::point::control1] = glm::dvec3{p1.x, y1, p1.y} - path.points[segment_data::point::start]; + path.points[segment_data::point::control2] = glm::dvec3{p2.x, y2, p2.y} - path.points[segment_data::point::end]; + path.rolls[0] = roll(element_cant(e, piece.from)); + path.rolls[1] = roll(element_cant(e, piece.to)); + path.radius = e.kind == element_kind::straight ? 0.f : static_cast(e.radius); + result.push_back(path); + } + return result; +} + +} // namespace alignment diff --git a/editor/editorAlignment.hpp b/editor/editorAlignment.hpp new file mode 100644 index 000000000..4241eb2b1 --- /dev/null +++ b/editor/editorAlignment.hpp @@ -0,0 +1,184 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include +#include + +#include "world/Segment.h" + +// Railway alignment design: horizontal alignment defined by a polygon of tangents, with a circular curve +// and transition curves fitted at each intersection point (vertex), and a vertical profile made of grades +// joined with parabolic vertical curves. +// +// Plan coordinates are (x, z) of the scene; heights are scene y. Design values follow the usual railway +// conventions: speed in km/h, cant in mm, radii and lengths in metres. All the limits are configurable. +namespace alignment +{ + +enum class transition_shape +{ + cubic_parabola, // y = x^3 / (6RL), represented exactly by a single cubic Bezier + clothoid // curvature linear along the length, approximated by cubic pieces +}; + +// permissible values used to recommend and verify the design +struct limits +{ + double gauge{1500.0}; // distance between rail axes, mm + double unbalanced{0.6}; // permissible unbalanced lateral acceleration, m/s2 + double cant_max{150.0}; // maximum cant, mm + double cant_rate{35.0}; // permissible rate of cant change along transition, mm/s + double ramp_factor{10.0}; // cant ramp inclination limited to 1 / (factor * V) + double jerk{0.3}; // permissible rate of change of unbalanced acceleration, m/s3 + double vertical_factor{0.4}; // minimum vertical curve radius = factor * V^2 + double vertical_min{2000.0}; // absolute minimum vertical curve radius, m + double tangent_min_time{0.0}; // minimum length of a straight between curves expressed as travel time, s (0: not checked) +}; + +// intersection point of two tangents of the horizontal alignment, with the curve fitted there +struct vertex +{ + glm::dvec2 position{0.0}; // plan position of an unconstrained vertex + double offset{100.0}; // first/last vertex: distance from the fixed end along its tangent + double radius{1000.0}; + double transition_in{0.0}; + double transition_out{0.0}; + double cant{0.0}; // mm + bool auto_elevation{true}; // elevation interpolated between the fixed ends + double elevation{0.0}; // height of the profile at the vertex + double vertical_radius{0.0}; // 0: minimum radius from the limits +}; + +struct design +{ + // fixed ends of the designed fragment, with plan directions pointing along the route + glm::dvec3 start{0.0}; + glm::dvec3 end{0.0}; + glm::dvec2 start_direction{0.0, 1.0}; + glm::dvec2 end_direction{0.0, 1.0}; + double start_grade{0.0}; // grade of the adjoining track, for continuity check + double end_grade{0.0}; + double start_radius{0.0}; // plan radius of the adjoining track at the joint, 0 for straight + double end_radius{0.0}; + std::vector vertices; + transition_shape shape{transition_shape::cubic_parabola}; + double speed{100.0}; // design speed, km/h + limits norms; +}; + +// values derived from the design speed for a curve of given radius +struct recommendation +{ + double cant_equilibrium{0.0}; // cant compensating the lateral acceleration fully, mm + double cant_min{0.0}; // smallest cant keeping the unbalanced acceleration within the limit, mm + double cant{0.0}; // proposed cant, mm + double radius_min{0.0}; // smallest radius for the design speed with maximum cant, m + double transition{0.0}; // minimum transition length for the proposed cant, m + double vertical_radius{0.0}; // minimum vertical curve radius, m +}; +recommendation recommend(double const Speed, double const Radius, limits const &Limits); +// minimum transition length for given speed, cant and radius +double transition_length(double const Speed, double const Radius, double const Cant, limits const &Limits); +// unbalanced lateral acceleration, m/s2 +double unbalanced_acceleration(double const Speed, double const Radius, double const Cant, limits const &Limits); + +enum class element_kind +{ + straight, + transition_in, + arc, + transition_out +}; + +// single geometric element of the computed alignment +struct element +{ + element_kind kind{element_kind::straight}; + int vertex{-1}; // vertex the curve element belongs to + double chainage{0.0}; // distance from the start of the fragment to the start of the element + double length{0.0}; + double radius{0.0}; // curve radius (also the final radius of a transition) + double transition{0.0}; // transition length + int turn{0}; // +1/-1 direction of the curve, 0 for straights + double cant{0.0}; // full cant of the curve, mm + // geometric frame: straight - start point and direction; arc - centre, radius vector to its start point + // and direction at the start; transition_in - its start point (TS) with the tangent direction and inner normal; + // transition_out - its end point (ST) with the direction pointing backwards and inner normal + glm::dvec2 origin{0.0}; + glm::dvec2 direction{0.0, 1.0}; + glm::dvec2 normal{0.0}; +}; + +// verification of a single curve against the limits +struct curve_report +{ + int vertex{-1}; + double deflection{0.0}; // angle between the tangents, radians + double arc_length{0.0}; + double tangent_in{0.0}; // distance from the vertex to the start of the curve + double tangent_out{0.0}; // distance from the vertex to the end of the curve + double unbalanced{0.0}; // m/s2 + double cant_rate_in{0.0}, cant_rate_out{0.0}; // mm/s + double jerk_in{0.0}, jerk_out{0.0}; // m/s3 + recommendation recommended; +}; + +struct profile_point +{ + double chainage{0.0}; + double elevation{0.0}; + double radius{0.0}; // vertical curve radius at the grade break + double tangent{0.0}; // vertical curve tangent length +}; + +struct result +{ + bool valid{false}; + transition_shape shape{transition_shape::cubic_parabola}; + double gauge{1500.0}; + std::vector errors; + std::vector warnings; + std::vector vertices; // resolved plan positions of the vertices + std::vector vertex_chainages; // chainage of the middle of each vertex curve + std::vector vertex_elevations; // profile elevation at each vertex + std::vector elements; + std::vector curves; + std::vector profile; + double length{0.0}; +}; + +result compute(design const &Design); +// intersection of the tangents of the fixed ends, if it lies ahead of both ends +bool tangent_intersection(design const &Design, glm::dvec2 &Point); +// checks whether the fixed ends lie on a common straight line +bool collinear(design const &Design); + +// position, direction of travel (unit, 3d), cant and curvature direction at specified chainage +struct station +{ + glm::dvec3 position{0.0}; + glm::dvec3 direction{0.0}; + double cant{0.0}; + int turn{0}; +}; +station evaluate(result const &Result, double const Chainage); +// profile height and grade at specified chainage +double elevation(result const &Result, double const Chainage); +double grade(result const &Result, double const Chainage); + +// smallest number of cubic pieces representing the alignment with the required accuracy +std::size_t minimum_pieces(result const &Result, design const &Design); +// splits the alignment into at least Count cubic pieces (the longest pieces are divided further to reach the count), +// in the order of the route, as path source data with absolute end points and relative control vectors +std::vector pieces(result const &Result, design const &Design, std::size_t const Count); + +} // namespace alignment diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index 5a1278332..c4ae7c2a6 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -16,10 +16,12 @@ http://mozilla.org/MPL/2.0/. #include "rendering/renderer.h" #include "utilities/Globals.h" #include "utilities/utilities.h" +#include "utilities/parser.h" #include #include #include +#include namespace { @@ -54,6 +56,74 @@ void add_unique(std::vector &Tracks, TTrack *Track) Tracks.emplace_back(Track); } +// first derivative of the path curve at its start or end, in the direction from the start to the end +glm::dvec3 path_tangent(segment_data const &Path, bool const Atend) +{ + auto const &start{Path.points[segment_data::point::start]}; + auto const &end{Path.points[segment_data::point::end]}; + auto const &control1{Path.points[segment_data::point::control1]}; + auto const &control2{Path.points[segment_data::point::control2]}; + if (false == Atend) + return control1 != glm::dvec3{} ? control1 : (end + control2) - start; + return control2 != glm::dvec3{} ? -control2 : end - (start + control1); +} + +// plan radius of the path curve at specified parameter, 0 if it's straight there +double path_radius(segment_data const &Path, double const T) +{ + auto const &p0{Path.points[segment_data::point::start]}; + auto const &p3{Path.points[segment_data::point::end]}; + auto const &control1{Path.points[segment_data::point::control1]}; + auto const &control2{Path.points[segment_data::point::control2]}; + if (control1 == glm::dvec3{} && control2 == glm::dvec3{}) + return 0.0; + auto const p1{p0 + control1}; + auto const p2{p3 + control2}; + auto const u{1.0 - T}; + auto const first{3.0 * u * u * (p1 - p0) + 6.0 * u * T * (p2 - p1) + 3.0 * T * T * (p3 - p2)}; + auto const second{6.0 * u * (p2 - 2.0 * p1 + p0) + 6.0 * T * (p3 - 2.0 * p2 + p1)}; + auto const speed{std::hypot(first.x, first.z)}; + auto const curvature{std::abs(first.x * second.z - first.z * second.x) / (speed * speed * speed)}; + return curvature > 1e-7 ? 1.0 / curvature : 0.0; +} + +// the same path run in the opposite direction +segment_data reversed(segment_data const &Path) +{ + segment_data result{Path}; + result.points[segment_data::point::start] = Path.points[segment_data::point::end]; + result.points[segment_data::point::end] = Path.points[segment_data::point::start]; + result.points[segment_data::point::control1] = Path.points[segment_data::point::control2]; + result.points[segment_data::point::control2] = Path.points[segment_data::point::control1]; + // roll follows the direction of the curve, which flips along with the direction of travel + result.rolls = {-Path.rolls[1], -Path.rolls[0]}; + return result; +} + +// direction of travel and plan radius at the joint of a chain with an adjoining path. +// Leaving: the chain continues into the adjoining path (its end), otherwise it comes from it (its start) +bool adjoining_direction(TTrack const *Neighbour, glm::dvec3 const &Joint, bool const Leaving, glm::dvec3 &Direction, double &Radius) +{ + if (Neighbour == nullptr) + return false; + for (auto const &path : Neighbour->m_paths) + { + for (auto const atend : {false, true}) + { + auto const &point{path.points[atend ? segment_data::point::end : segment_data::point::start]}; + if (glm::distance(point, Joint) > kSamePoint) + continue; + // the tangent runs from the start of the neighbour to its end; it's the direction of travel when + // entering the neighbour at its start, or arriving from it through its end + auto const tangent{glm::normalize(path_tangent(path, atend))}; + Direction = (Leaving != atend) ? tangent : -tangent; + Radius = path_radius(path, atend ? 1.0 : 0.0); + return true; + } + } + return false; +} + } // namespace editor_track::state editor_track::capture(TTrack const &Track) @@ -637,6 +707,181 @@ void editor_track::store_switch_path(TTrack &Switch, int const Path) } } +bool editor_track::find_chain(TTrack *From, TTrack *To, chain &Chain, std::string &Error) +{ + Chain = {}; + if (From == nullptr || To == nullptr) + { + Error = "Select the first and the last path of the fragment"; + return false; + } + auto const regular = [](TTrack const *Track) { return Track->eType == tt_Normal && is_supported(*Track); }; + if (false == regular(From) || false == regular(To)) + { + Error = "The fragment has to consist of regular paths, without switches"; + return false; + } + + Chain.tracks = {From}; + Chain.forward = {true}; + if (From != To) + { + bool found{false}; + // try to reach the last path leaving the first one through its end, then through its start + for (auto const throughend : {true, false}) + { + Chain.tracks = {From}; + Chain.forward = {throughend}; + TTrack *previous{From}; + TTrack *current{throughend ? From->trNext : From->trPrev}; + while (current != nullptr && current != From && Chain.tracks.size() < 10000 && regular(current)) + { + auto const entersatstart{current->trPrev == previous}; + Chain.tracks.push_back(current); + Chain.forward.push_back(entersatstart); + if (current == To) + { + found = true; + break; + } + previous = current; + current = entersatstart ? current->trNext : current->trPrev; + } + if (found) + break; + } + if (false == found) + { + Chain = {}; + Error = "The selected paths aren't connected by a chain of regular paths (switches end the chain)"; + return false; + } + } + + auto const category{From->iCategoryFlag & 15}; + for (auto const *track : Chain.tracks) + { + if ((track->iCategoryFlag & 15) != category) + { + Error = "The fragment mixes different kinds of paths"; + Chain = {}; + return false; + } + if (false == track->Dynamics.empty()) + { + Error = "There are vehicles placed on path " + track->name(); + Chain = {}; + return false; + } + Chain.length += track->Length(); + Chain.velocity = std::max(Chain.velocity, velocity(*track)); + auto const radius{path_radius(track->m_paths.front(), 0.5)}; + if (radius > 0.0 && (Chain.radius == 0.0 || radius < Chain.radius)) + Chain.radius = radius; + } + + // fixed ends, with directions taken from the adjoining paths when there are any + auto const &first{From->m_paths.front()}; + auto const firstforward{Chain.forward.front()}; + Chain.start = first.points[firstforward ? segment_data::point::start : segment_data::point::end]; + Chain.start_direction = firstforward ? path_tangent(first, false) : -path_tangent(first, true); + adjoining_direction(firstforward ? From->trPrev : From->trNext, Chain.start, false, Chain.start_direction, Chain.start_radius); + Chain.start_direction = glm::normalize(Chain.start_direction); + + auto const &last{To->m_paths.front()}; + auto const lastforward{Chain.forward.back()}; + Chain.end = last.points[lastforward ? segment_data::point::end : segment_data::point::start]; + Chain.end_direction = lastforward ? path_tangent(last, true) : -path_tangent(last, false); + adjoining_direction(lastforward ? To->trNext : To->trPrev, Chain.end, true, Chain.end_direction, Chain.end_radius); + Chain.end_direction = glm::normalize(Chain.end_direction); + + Error.clear(); + return true; +} + +std::vector editor_track::relay(chain const &Chain, std::vector const &Pieces) +{ + std::vector created; + auto const count{Chain.tracks.size()}; + if (count == 0 || Pieces.size() < count) + return created; + + // existing paths are spread evenly over the pieces, added paths fill the gaps between them + std::vector tracks; + std::size_t previous{count}; + for (std::size_t i = 0; i < Pieces.size(); ++i) + { + auto const index{i * count / Pieces.size()}; + TTrack *track; + bool forward; + if (index != previous) + { + track = Chain.tracks[index]; + forward = Chain.forward[index]; + } + else + { + track = clone(*Chain.tracks[index]); + created.push_back(track); + forward = true; + } + previous = index; + track->m_paths.resize(1); + track->m_paths.front() = forward ? Pieces[i] : reversed(Pieces[i]); + tracks.push_back(track); + } + commit(tracks); + return created; +} + +TTrack *editor_track::clone(TTrack const &Template) +{ + std::ostringstream text; + Template.export_as_text_(text); + cParser parser(text.str(), cParser::buffer_TEXT); + parser.getTokens(); + std::string token; + parser >> token; // node type, consumed before the path is loaded + + scene::node_data data; + data.type = "track"; + if (false == Template.name().empty() && Template.name() != "none") + { + for (int i = 1; data.name.empty() || simulation::Paths.find(data.name) != nullptr; ++i) + data.name = Template.name() + "_" + std::to_string(i); + } + auto *track = new TTrack(data); + track->m_rangesquaredmin = Template.m_rangesquaredmin; + track->m_rangesquaredmax = Template.m_rangesquaredmax; + track->Load(&parser, glm::dvec3{}); + // events stay with the original path only + for (auto *events : {&track->m_events0, &track->m_events1, &track->m_events2, &track->m_events0all, &track->m_events1all, &track->m_events2all}) + events->clear(); + track->m_events = false; + track->m_friction = Template.m_friction; + simulation::Paths.insert(track); + return track; +} + +void editor_track::retire(TTrack &Track) +{ + auto const adjoining{neighbours(Track)}; + disconnect(Track); + simulation::Region->erase_and_unregister(&Track); + Track.m_editorremoved = true; + for (auto *neighbour : adjoining) + { + update_transition(*neighbour); + rebuild_geometry(*neighbour); + } +} + +void editor_track::revive(TTrack &Track) +{ + Track.m_editorremoved = false; + commit({&Track}); +} + void editor_track::rebuild_geometry(TTrack &Track) { auto §ion{simulation::Region->section(Track.location())}; diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index bd39766cb..17ed02479 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -108,6 +108,30 @@ class editor_track // places the point at the target and optionally aligns the control vector with the target path static void snap_point(TTrack &Track, point_ref const &Point, snap_target const &Target, bool const Aligntangent); + // sequence of regular paths connected end to end + struct chain + { + std::vector tracks; + std::vector forward; // the path runs in the direction of the chain (its start is closer to the chain start) + glm::dvec3 start{0.0}; // outer end of the first path + glm::dvec3 end{0.0}; // outer end of the last path + glm::dvec3 start_direction{0.0}; // direction of travel along the chain at its ends, from the adjoining paths if there are any + glm::dvec3 end_direction{0.0}; + double start_radius{0.0}; // plan radius of the adjoining paths at the joints, 0 for straight + double end_radius{0.0}; + double length{0.0}; + double velocity{-1.0}; // highest speed limit of the paths in the chain + double radius{0.0}; // smallest radius of the paths in the chain, 0 if all are straight + }; + // collects regular paths connected between provided paths, both included. returns: true on success + static bool find_chain(TTrack *From, TTrack *To, chain &Chain, std::string &Error); + // lays the paths of the chain along provided pieces, in the order of the chain. if there are more pieces than paths, + // additional paths are made as copies of their neighbours. returns: the added paths + static std::vector relay(chain const &Chain, std::vector const &Pieces); + // takes a path added by the editor out of the scene, or puts it back + static void retire(TTrack &Track); + static void revive(TTrack &Track); + // names of the materials used by the path; "none" for missing ones static std::string material_name(material_handle const Material); static material_handle fetch_material(std::string const &Name); @@ -133,4 +157,6 @@ class editor_track static void store_switch_path(TTrack &Switch, int const Path); // rebuilds render geometry of the path in the bank of the section it's placed in static void rebuild_geometry(TTrack &Track); + // makes a new path with the parameters of provided path (without its events) and registers it in the path table + static TTrack *clone(TTrack const &Template); }; diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index 9e90941f2..f6f0c3c5f 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -1362,6 +1362,9 @@ state_serializer::export_nodes_to_stream(std::ostream &scmfile, bool Dirty) cons // tracks scmfile << "// paths\n"; for( auto const *path : Paths.sequence() ) { + if( path == nullptr || path->m_editorremoved ) { + continue; + } if( path->dirty() == Dirty && path->group() == null_handle ) { path->export_as_text( scmfile ); } diff --git a/world/Track.h b/world/Track.h index 33379dfd7..3cadd9813 100644 --- a/world/Track.h +++ b/world/Track.h @@ -185,6 +185,7 @@ public: geometryhandle_sequence Geometry2; // geometry chunks textured with texture 2 std::vector m_paths; // source data for owned paths + bool m_editorremoved { false }; // taken out of the scene by the editor, kept alive for its undo history int iterate_stamp = 0; // sleepermodel optional parameter ------------------------------------------------- From 7ede96df5ffcad918d5ae23525e33d5874926288 Mon Sep 17 00:00:00 2001 From: maj00r Date: Fri, 2 Oct 2026 22:28:45 +0200 Subject: [PATCH 045/430] chore(editor): cleanup comments --- application/editormode.cpp | 5 -- application/editormode.h | 43 ++++-------- application/editormodetrack.cpp | 45 +------------ application/editoruilayer.h | 1 - editor/editorAlignment.cpp | 34 ++-------- editor/editorAlignment.hpp | 114 +++++++++++++------------------- editor/editorTrack.cpp | 41 ++---------- editor/editorTrack.hpp | 62 +++-------------- scene/scene.cpp | 3 - scene/scene.h | 4 -- world/Track.cpp | 10 --- world/Track.h | 5 +- 12 files changed, 84 insertions(+), 283 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index f6a0a472a..41c8e9259 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -1009,7 +1009,6 @@ bool editor_mode::update() // --- ImGuizmo: in-viewport transform gizmo for the selected node --- render_gizmo(); - // --- path editing: course and point handles of the selected path, designed route --- if (selected_track()) draw_track_overlay(); if (route_active()) @@ -2245,7 +2244,6 @@ void editor_mode::render_gizmo() return; } - // route design: the gizmo moves the selected vertex of the designed alignment if (route_active()) { render_route_gizmo(); @@ -2258,7 +2256,6 @@ void editor_mode::render_gizmo() return; } - // paths aren't transformed as a whole node, they're edited through their source data if (selected_track()) { render_track_gizmo(); @@ -2690,7 +2687,6 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in break; case GLFW_KEY_ESCAPE: - // track mode: release the selected point handle, so the gizmo moves the whole path again if (is_press(Action) && ui()->mode() == nodebank_panel::TRACK) { m_track_point = {}; @@ -2786,7 +2782,6 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const return; } - // in track mode the left button selects a point handle of the selected path, or another path if (mode == nodebank_panel::TRACK) { if (false == ImGuizmo::IsOver() && false == pick_route_vertex() && false == pick_track_handle()) diff --git a/application/editormode.h b/application/editormode.h index 597fecbfd..a5bc4e158 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -103,9 +103,8 @@ class editor_mode : public application_mode UID uuid; // node UUID for reference, used as fallback lookup for deleted/recreated nodes scene::layer_handle layer{null_handle}; // scenery layer of the node, so a recreated node returns to it scene::instance_handle instance{0}; // include of a scenery template which was placed or removed, instead of a node - // TrackEdit: state of all paths modified by the change (the edited path and neighbours dragged along) std::vector> tracks; - std::vector created; // TrackEdit: paths added by the change + std::vector created; }; void push_snapshot(scene::basic_node *node, EditorSnapshot::Action Action = EditorSnapshot::Action::Move, std::string const &Serialized = std::string()); @@ -277,64 +276,50 @@ class editor_mode : public application_mode gizmo_operation m_gizmo_op{gizmo_operation::translate}; // current transform mode (translate/rotate/scale) float m_gizmo_snap{1.0f}; // translation snap step (metres) applied while Ctrl is held - // path (track) editing, implemented in editormodetrack.cpp TTrack *selected_track() const; - // settings and parameters of the selected path, drawn in the node bank tab of the track mode void render_track_ui(); - // parameters and points of the selected path void render_path_ui(); - // curve and point handles of the selected path void draw_track_overlay() const; - // selects the point handle of the selected path located under the cursor. returns: true if a handle was hit bool pick_track_handle(); - // selects the path picked in the viewport void select_track(scene::basic_node *Node); - // gizmo for the selected path: moves the selected point handle, or the whole path void render_track_gizmo(); - // rebuilds paths modified by the ongoing drag; unless forced, at most a few times per second void commit_track_drag(bool const Force); - // records provided state of paths in the undo history, along with paths added by the change void push_track_snapshot(std::vector> States, std::vector Created = {}); - // restores state of paths stored in the history, moving their current state to the opposite stack void restore_track_snapshot(EditorSnapshot const &Snapshot, std::vector &Opposite, bool const Undo); - editor_track::point_ref m_track_point; // selected point handle of the selected path - std::vector m_track_drag; // paths modified by the ongoing gizmo drag - std::vector> m_track_drag_points; // end points of neighbours dragged along - editor_track::snap_target m_track_snap; // connection made at the end of the ongoing drag - glm::dvec3 m_track_pivot{0.0}; // rotation pivot of the ongoing drag - glm::mat4 m_track_gizmo{1.0f}; // gizmo matrix, kept for the duration of a drag + editor_track::point_ref m_track_point; + std::vector m_track_drag; + std::vector> m_track_drag_points; + editor_track::snap_target m_track_snap; + glm::dvec3 m_track_pivot{0.0}; + glm::mat4 m_track_gizmo{1.0f}; bool m_track_gizmo_using{false}; - bool m_track_dirty{false}; // drag changes waiting for rebuild + bool m_track_dirty{false}; std::chrono::steady_clock::time_point m_track_last_commit; - editor_track::state m_track_field_before; // state of the path before the ongoing field edit - std::array, 3> m_track_materials{}; // material names being edited - // route design: re-lays a chain of paths along an alignment designed with intersection points + editor_track::state m_track_field_before; + std::array, 3> m_track_materials{}; struct route_design { - TTrack *from{nullptr}; // first and last path of the re-laid fragment + TTrack *from{nullptr}; TTrack *to{nullptr}; editor_track::chain chain; std::string error; - std::string status; // outcome of the last application + std::string status; alignment::design design; alignment::result result; - int vertex{-1}; // selected vertex + int vertex{-1}; }; void render_route_ui(); - // finds the chain between the selected fragment ends and proposes an initial design for it void route_reset(); void route_update() { m_route.result = alignment::compute(m_route.design); } void route_apply(); - // sets recommended cant, transitions and vertical curve for the vertex void route_recommend(alignment::vertex &Vertex) const; void draw_route_overlay() const; bool pick_route_vertex(); void render_route_gizmo(); - // 3d position of the vertex handle glm::dvec3 route_vertex_position(int const Vertex) const; bool route_active() const; route_design m_route; - bool m_route_tab{true}; // route design tab of the track mode is shown + bool m_route_tab{true}; bool m_route_gizmo_using{false}; glm::mat4 m_route_gizmo{1.0f}; float m_track_snap_radius{1.0f}; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 44fe66490..51882ae84 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -4,10 +4,9 @@ terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at -http://mozilla.org/MPL/2.0/. +http: */ -// path (track) editing part of the editor mode #include "stdafx.h" #include "application/editormode.h" @@ -29,7 +28,6 @@ http://mozilla.org/MPL/2.0/. namespace { -// projects world points onto the screen, with the same camera-relative view and clean perspective the gizmo uses class screen_projection { public: @@ -51,7 +49,6 @@ class screen_projection { return ImVec2((Clip.x / Clip.w * 0.5f + 0.5f) * m_size.x, (0.5f - Clip.y / Clip.w * 0.5f) * m_size.y); } - // returns: true if the point is in front of the camera bool project(glm::dvec3 const &Point, ImVec2 &Screen) const { auto const c = clip(Point); @@ -60,7 +57,6 @@ class screen_projection Screen = screen(c); return true; } - // draws a line, clipped against the near plane so points behind the camera don't flip across the screen void line(ImDrawList *Drawlist, glm::dvec3 const &A, glm::dvec3 const &B, ImU32 const Color, float const Thickness) const { glm::vec4 a = clip(A); @@ -81,7 +77,6 @@ class screen_projection glm::mat4 m_viewprojection; }; -// point on the course of a path, matching the curve TSegment builds from the same data glm::dvec3 path_point(segment_data const &Path, double const T) { auto const &p0 = Path.points[segment_data::point::start]; @@ -114,10 +109,9 @@ bool is_end(editor_track::point_kind const Kind) editor_track::point_kind const kPointKinds[] = {editor_track::point_kind::start, editor_track::point_kind::control1, editor_track::point_kind::control2, editor_track::point_kind::end}; -// screen distance within which a click grabs a point handle float const kHandleRadius{10.0f}; -} // namespace +} TTrack *editor_mode::selected_track() const { @@ -129,11 +123,9 @@ void editor_mode::select_track(scene::basic_node *Node) auto *track = dynamic_cast(Node); if (track == nullptr) { - // a click beside the selected path releases its point handle m_track_point = {}; return; } - // paths are long, so the distance is measured to the nearest point of the path rather than its centre glm::dvec3 const camera{Global.pCamera.Pos}; if (glm::distance(glm::dvec3(track->get_nearest_point(camera)), camera) > static_cast(kMaxPlacementDistance)) return; @@ -164,7 +156,6 @@ bool editor_mode::pick_track_handle() continue; float const dx = screen.x - mouse.x; float const dy = screen.y - mouse.y; - // end points take precedence over control points placed at the same spot float const distance = (dx * dx + dy * dy) * (is_end(kind) ? 0.5f : 1.0f); if (distance < best) { @@ -189,7 +180,6 @@ void editor_mode::draw_track_overlay() const ImDrawList *drawlist = ImGui::GetBackgroundDrawList(); bool const trackmode = ui()->mode() == nodebank_panel::TRACK; - // course of the path, from its source data so it follows the edits before the path is rebuilt ImU32 const coursecolor = IM_COL32(40, 220, 255, 220); int constexpr samples{32}; for (auto const &path : track->m_paths) @@ -205,14 +195,12 @@ void editor_mode::draw_track_overlay() const if (false == trackmode || m_route_tab || false == editor_track::is_supported(*track)) return; - // control vectors ImU32 const vectorcolor = IM_COL32(200, 200, 200, 160); for (int i = 0; i < static_cast(track->m_paths.size()); ++i) { projection.line(drawlist, editor_track::point_position(*track, {i, editor_track::point_kind::start}), editor_track::point_position(*track, {i, editor_track::point_kind::control1}), vectorcolor, 1.0f); projection.line(drawlist, editor_track::point_position(*track, {i, editor_track::point_kind::end}), editor_track::point_position(*track, {i, editor_track::point_kind::control2}), vectorcolor, 1.0f); } - // handles: end points coloured by connection state (green: connected, red: free), control points as squares for (int i = 0; i < static_cast(track->m_paths.size()); ++i) { for (auto const kind : kPointKinds) @@ -235,7 +223,6 @@ void editor_mode::draw_track_overlay() const drawlist->AddCircle(screen, 10.0f, IM_COL32(255, 220, 40, 255), 16, 2.5f); } } - // connection to be made when the ongoing drag ends if (m_track_snap.track != nullptr) { ImVec2 screen; @@ -261,14 +248,12 @@ void editor_mode::render_track_gizmo() ImGuiIO const &io = ImGui::GetIO(); ImGuizmo::SetRect(0.0f, 0.0f, io.DisplaySize.x, io.DisplaySize.y); - // same camera-relative view and clean perspective as the transform gizmo of the other nodes glm::mat4 const view = GfxRenderer->Camera_View_Matrix(); glm::dvec3 const camerapos = GfxRenderer->Camera_Position(); float const fovy = glm::radians(Global.FieldOfView / Global.ZoomFactor); float const aspect = io.DisplaySize.y > 0.0f ? io.DisplaySize.x / io.DisplaySize.y : 1.0f; glm::mat4 const projection = glm::perspective(fovy, aspect, 0.1f, 10000.0f); - // point handles only move; the whole path moves or turns around the vertical axis ImGuizmo::OPERATION const operation = (false == pointmode && m_gizmo_op == gizmo_operation::rotate) ? ImGuizmo::ROTATE_Y : ImGuizmo::TRANSLATE; if (false == m_track_gizmo_using) @@ -286,7 +271,6 @@ void editor_mode::render_track_gizmo() { if (false == m_track_gizmo_using) { - // drag start: gather the paths it modifies and record their state for undo m_track_gizmo_using = true; m_track_pivot = editor_track::pivot(*track); m_track_drag = {track}; @@ -326,7 +310,6 @@ void editor_mode::render_track_gizmo() for (auto const &connection : m_track_drag_points) editor_track::move_point(*connection.first, connection.second, position); m_track_dirty = true; - // a free end point can be connected with another path; a joint moved as a whole stays as it is if (is_end(m_track_point.kind) && m_track_drag_points.empty()) { std::vector const exclude(m_track_drag.begin(), m_track_drag.end()); @@ -346,7 +329,6 @@ void editor_mode::render_track_gizmo() } else if (m_track_gizmo_using) { - // drag end: make the offered connection and rebuild everything for good if (m_track_snap.track != nullptr && pointmode) { editor_track::snap_point(*track, m_track_point, m_track_snap, m_track_align_tangent); @@ -364,7 +346,6 @@ void editor_mode::commit_track_drag(bool const Force) { if (false == m_track_dirty || m_track_drag.empty()) return; - // each rebuild re-uploads geometry of the affected sections, so it isn't done on every frame of a drag auto const now = std::chrono::steady_clock::now(); if (false == Force && now - m_track_last_commit < std::chrono::milliseconds(100)) return; @@ -399,11 +380,9 @@ void editor_mode::restore_track_snapshot(EditorSnapshot const &Snapshot, std::ve if (Snapshot.tracks.empty()) return; - // paths restored by this step; paths added by the change exist only on its redo side std::vector tracks; for (auto const &entry : Snapshot.tracks) tracks.emplace_back(entry.first); - // current state goes to the opposite stack, including paths added by the change when it's being undone EditorSnapshot current{Snapshot}; current.tracks.clear(); auto involved{tracks}; @@ -426,7 +405,6 @@ void editor_mode::restore_track_snapshot(EditorSnapshot const &Snapshot, std::ve for (auto const &entry : Snapshot.tracks) editor_track::apply(*entry.first, entry.second); editor_track::commit(tracks); - // the designed route refers to the chain, which might have changed if (false == m_route.chain.tracks.empty()) { std::string error; @@ -486,7 +464,6 @@ void editor_mode::render_path_ui() ImGui::TextColored(ImVec4(1.0f, 0.6f, 0.2f, 1.0f), "Geometry locked: %s", reason.c_str()); auto const before = editor_track::capture(*track); - // records undo state when a field edit starts, and rebuilds the path once it's finished enum class rebuild { none, parameters, geometry }; auto const finish_edit = [&](rebuild const Rebuild) { if (ImGui::IsItemActivated()) @@ -502,7 +479,6 @@ void editor_mode::render_path_ui() } } }; - // applies a change made with a widget which reports it at once, like a combo box auto const apply_now = [&](rebuild const Rebuild) { push_track_snapshot({{track, before}}); if (Rebuild == rebuild::parameters) @@ -545,7 +521,6 @@ void editor_mode::render_path_ui() if (track->m_visible) { - // material names are edited in local buffers, refreshed from the path whenever no field is being edited material_handle *materials[] = {&track->m_material1, &track->m_material2, track->SwitchExtension ? &track->SwitchExtension->m_material3 : nullptr}; char const *labels[] = {"Texture 1 (rails/surface)", "Texture 2 (trackbed/side)", "Trackbed (switch)"}; if (false == ImGui::IsAnyItemActive()) @@ -602,7 +577,6 @@ void editor_mode::render_path_ui() ImGui::PushID(i); if (track->m_paths.size() > 1) ImGui::Text("Path %d", i + 1); - // point selection, same as clicking the handle in the viewport for (auto const kind : kPointKinds) { editor_track::point_ref const point{i, kind}; @@ -623,7 +597,7 @@ void editor_mode::render_path_ui() { auto position = path.points[kind == editor_track::point_kind::start ? segment_data::point::start : segment_data::point::end]; if (ImGui::InputScalarN(point_label(kind), ImGuiDataType_Double, glm::value_ptr(position), 3, nullptr, nullptr, "%.3f")) - editor_track::move_point(*track, {i, kind}, position); // keeps the common start of a switch together + editor_track::move_point(*track, {i, kind}, position); finish_edit(rebuild::geometry); } ImGui::InputScalarN("Control 1 (relative)", ImGuiDataType_Double, glm::value_ptr(path.points[segment_data::point::control1]), 3, nullptr, nullptr, "%.3f"); @@ -655,7 +629,6 @@ void editor_mode::render_path_ui() } } -// route design bool editor_mode::route_active() const { @@ -686,7 +659,6 @@ void editor_mode::route_reset() auto const &chain{route.chain}; alignment::design design; - // limits and the curve type are the user's choice, they carry over to the next fragment design.norms = route.design.norms; design.shape = route.design.shape; design.start = chain.start; @@ -702,7 +674,6 @@ void editor_mode::route_reset() design.speed = chain.velocity > 0.0 ? chain.velocity : 100.0; route.design = design; - // initial layout: a straight, a single curve at the intersection of the end tangents, or a pair of curves glm::dvec2 intersection; if (false == alignment::collinear(design)) { @@ -730,7 +701,6 @@ void editor_mode::route_apply() route.status.clear(); if (false == route.result.valid || route.chain.tracks.empty()) return; - // the paths might have changed since the fragment was selected editor_track::chain chain; if (false == editor_track::find_chain(route.from, route.to, chain, route.error)) return; @@ -829,7 +799,6 @@ void editor_mode::draw_route_overlay() const screen_projection const projection; ImDrawList *drawlist = ImGui::GetBackgroundDrawList(); - // polygon of tangents std::vector polygon{design.start}; for (int i = 0; i < static_cast(design.vertices.size()); ++i) polygon.push_back(route_vertex_position(i)); @@ -837,7 +806,6 @@ void editor_mode::draw_route_overlay() const for (std::size_t i = 0; i + 1 < polygon.size(); ++i) projection.line(drawlist, polygon[i], polygon[i + 1], IM_COL32(255, 210, 60, 150), 1.5f); - // designed alignment, coloured by element: straight white, transition orange, circular curve green if (result.length > 0.0 && result.profile.size() >= 2) { for (auto const &e : result.elements) @@ -857,7 +825,6 @@ void editor_mode::draw_route_overlay() const } } - // fixed ends with their directions, and the vertices for (auto const atend : {false, true}) { auto const &point{atend ? design.end : design.start}; @@ -918,7 +885,6 @@ void editor_mode::render_route_gizmo() glm::dvec3 const moved{camerapos + glm::dvec3(m_route_gizmo[3])}; auto &vertex{route.design.vertices[route.vertex]}; glm::dvec2 const point{moved.x, moved.z}; - // the first and the last vertex slide along the tangents of the fixed ends; a single vertex stays at their intersection if (count >= 2) { if (route.vertex == 0) @@ -1010,7 +976,6 @@ void editor_mode::render_route_ui() ImGui::TreePop(); } - // vertices auto &vertices{design.vertices}; if (ImGui::Button("Add vertex")) { @@ -1020,7 +985,6 @@ void editor_mode::render_route_ui() auto const distance{glm::distance(glm::dvec2{design.start.x, design.start.z}, glm::dvec2{design.end.x, design.end.z})}; if (vertices.size() == 1) { - // a single vertex sits at the intersection of the tangents; two vertices slide along them vertices.front().offset = distance / 3.0; vertex.offset = distance / 3.0; vertices.push_back(vertex); @@ -1031,12 +995,10 @@ void editor_mode::render_route_ui() } else { - // new vertex between the selected one (or the last but one) and the next auto const index{std::clamp(route.vertex, 0, static_cast(vertices.size()) - 2)}; auto const a{route_vertex_position(index)}; auto const b{route_vertex_position(index + 1)}; vertex.position = glm::dvec2{(a.x + b.x) * 0.5, (a.z + b.z) * 0.5}; - // the moved vertices keep their place, so the former first/last vertex positions become free positions for (int i = 0; i < static_cast(vertices.size()); ++i) { auto const p{route_vertex_position(i)}; @@ -1113,7 +1075,6 @@ void editor_mode::render_route_ui() if (changed) route_update(); - // outcome ImGui::Separator(); auto const &result{route.result}; if (result.length > 0.0) diff --git a/application/editoruilayer.h b/application/editoruilayer.h index 28773754f..f4b3c9712 100644 --- a/application/editoruilayer.h +++ b/application/editoruilayer.h @@ -50,7 +50,6 @@ class editor_ui : public ui_layer { m_filloptions = std::move(Renderer); } - // draws the path editing settings in its node bank tab (the editing state lives in the editor mode) void set_track_options(std::function Renderer) { m_trackoptions = std::move(Renderer); diff --git a/editor/editorAlignment.cpp b/editor/editorAlignment.cpp index 82ad834a9..7cdeb3284 100644 --- a/editor/editorAlignment.cpp +++ b/editor/editorAlignment.cpp @@ -4,7 +4,7 @@ terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at -http://mozilla.org/MPL/2.0/. +http: */ #include "stdafx.h" @@ -30,7 +30,6 @@ double cross(glm::dvec2 const &A, glm::dvec2 const &B) return A.x * B.y - A.y * B.x; } -// vector rotated by 90 degrees counter-clockwise glm::dvec2 perpendicular(glm::dvec2 const &Vector) { return {-Vector.y, Vector.x}; @@ -63,15 +62,13 @@ std::string format(char const *Format, ...) return buffer; } -// point of a transition curve in its local frame: x along the tangent at its start, y towards the curve centre struct local_point { double x{0.0}; double y{0.0}; - double angle{0.0}; // tangent angle relative to the initial tangent + double angle{0.0}; }; -// Parameter is the fraction of the transition length, from the straight (0) to the circular curve (1) local_point transition_point(transition_shape const Shape, double const Length, double const Radius, double const Parameter) { if (Length <= 0.0 || Radius <= 0.0) @@ -81,7 +78,6 @@ local_point transition_point(transition_shape const Shape, double const Length, auto const x{Length * Parameter}; return {x, x * x * x / (6.0 * Radius * Length), std::atan(x * x / (2.0 * Radius * Length))}; } - // clothoid, tangent angle grows with the square of the travelled distance auto const distance{Length * Parameter}; auto const angle = [&](double const S) { return S * S / (2.0 * Radius * Length); }; int const steps{std::max(8, static_cast(std::ceil(distance / 0.5)) * 2)}; @@ -97,7 +93,6 @@ local_point transition_point(transition_shape const Shape, double const Length, return {x * h / 3.0, y * h / 3.0, angle(distance)}; } -// plan position and direction of travel at given distance from the start of the element void element_point(element const &Element, transition_shape const Shape, double const Distance, glm::dvec2 &Position, glm::dvec2 &Direction) { switch (Element.kind) @@ -147,7 +142,6 @@ element const &element_at(result const &Result, double const Chainage) return lookup == Result.elements.begin() ? Result.elements.front() : *std::prev(lookup); } -// polar form of a cubic Bezier curve; control points of the part between parameters a and b are f(a,a,a), f(a,a,b), f(a,b,b), f(b,b,b) glm::dvec2 blossom(std::array const &Points, double const A, double const B, double const C) { glm::dvec2 r[3], s[2]; @@ -158,7 +152,6 @@ glm::dvec2 blossom(std::array const &Points, double const A, doub return glm::mix(s[0], s[1], C); } -// number of cubic pieces needed to represent the element accurately std::size_t element_pieces(element const &Element, transition_shape const Shape) { if (Element.length < 1e-3) @@ -166,7 +159,6 @@ std::size_t element_pieces(element const &Element, transition_shape const Shape) switch (Element.kind) { case element_kind::arc: - // cubic approximation of a 10 degree arc deviates from the circle by less than 1e-7 of its radius return static_cast(std::max(1.0, std::ceil(Element.length / Element.radius / (10.0 * kPi / 180.0) - 1e-9))); case element_kind::transition_in: case element_kind::transition_out: @@ -176,7 +168,7 @@ std::size_t element_pieces(element const &Element, transition_shape const Shape) } } -} // namespace +} double unbalanced_acceleration(double const Speed, double const Radius, double const Cant, limits const &Limits) { @@ -190,11 +182,9 @@ double transition_length(double const Speed, double const Radius, double const C double length{0.0}; if (Cant > 0.0) { - // rate of cant change in time, and the inclination of the cant ramp length = std::max(length, Speed * Cant / (3.6 * Limits.cant_rate)); length = std::max(length, Cant / 1000.0 * Limits.ramp_factor * Speed); } - // rate of change of the unbalanced acceleration auto const unbalanced{std::max(0.0, unbalanced_acceleration(Speed, Radius, Cant, Limits))}; length = std::max(length, unbalanced * Speed / (3.6 * Limits.jerk)); return length > 0.0 ? ceil_to(length, 5.0) : 0.0; @@ -203,7 +193,7 @@ double transition_length(double const Speed, double const Radius, double const C recommendation recommend(double const Speed, double const Radius, limits const &Limits) { recommendation result; - auto const factor{Limits.gauge / (kGravity * 12.96)}; // ~11.8 for standard gauge + auto const factor{Limits.gauge / (kGravity * 12.96)}; auto const allowance{Limits.gauge * Limits.unbalanced / kGravity}; result.radius_min = factor * Speed * Speed / (Limits.cant_max + allowance); result.vertical_radius = std::max(Limits.vertical_min, Limits.vertical_factor * Speed * Speed); @@ -211,7 +201,6 @@ recommendation recommend(double const Speed, double const Radius, limits const & return result; result.cant_equilibrium = factor * Speed * Speed / Radius; result.cant_min = std::max(0.0, result.cant_equilibrium - allowance); - // keep a part of the permissible unbalanced acceleration in reserve, but never go below the required minimum result.cant = std::min(Limits.cant_max, ceil_to(std::max(result.cant_min, result.cant_equilibrium * 2.0 / 3.0), 5.0)); result.transition = transition_length(Speed, Radius, result.cant, Limits); return result; @@ -229,7 +218,6 @@ result compute(design const &Design) auto const enddirection{glm::normalize(Design.end_direction)}; auto const count{Design.vertices.size()}; - // resolve vertex positions; the first and the last vertex lie on the tangents of the fixed ends r.vertices.resize(count); if (count == 0) { @@ -307,7 +295,6 @@ result compute(design const &Design) auto const lead{glm::dot(position - cursor, directionin)}; if (deflection < 1e-7) { - // tangents are collinear, there's no curve to fit if (lead < -1e-4) r.errors.emplace_back(format("Vertex %zu lies inside the curve of the previous vertex", k + 1)); push_straight(cursor, directionin, lead); @@ -332,13 +319,11 @@ result compute(design const &Design) auto const lengthout{std::max(0.0, vertex.transition_out)}; auto const endin{transition_point(Design.shape, lengthin, radius, 1.0)}; auto const endout{transition_point(Design.shape, lengthout, radius, 1.0)}; - // shift of the circular curve towards its centre, and position of the shifted curve start along the tangent auto const shiftin{endin.y - radius * (1.0 - std::cos(endin.angle))}; auto const shiftout{endout.y - radius * (1.0 - std::cos(endout.angle))}; auto const middlein{endin.x - radius * std::sin(endin.angle)}; auto const middleout{endout.x - radius * std::sin(endout.angle)}; - // the centre lies at distances R + shift from both tangents auto const normalin{perpendicular(directionin) * static_cast(side)}; auto const normalout{perpendicular(directionout) * static_cast(side)}; auto const a{radius + shiftin}; @@ -420,7 +405,6 @@ result compute(design const &Design) report.recommended = recommend(Design.speed, radius, Design.norms); r.curves.push_back(report); - // verification against the limits auto const &norms{Design.norms}; if (radius < report.recommended.radius_min - 1e-6) r.warnings.emplace_back(format("Vertex %zu: R %.0f m is below the minimum %.0f m for %.0f km/h", k + 1, radius, report.recommended.radius_min, Design.speed)); @@ -441,7 +425,6 @@ result compute(design const &Design) push_straight(cursor, lastdirection, tail); r.length = chainage; - // straights between curves, measured as travel time if (Design.norms.tangent_min_time > 0.0) { auto const minimum{Design.norms.tangent_min_time * Design.speed / 3.6}; @@ -453,7 +436,6 @@ result compute(design const &Design) } } - // vertical profile: grades between the fixed ends and the vertex elevations, joined with vertical curves r.vertex_chainages = vertexchainage; r.profile.push_back({0.0, Design.start.y, 0.0, 0.0}); for (std::size_t k = 0; k < count; ++k) @@ -463,7 +445,7 @@ result compute(design const &Design) r.vertex_elevations.push_back(elevation); auto const radius{vertex.vertical_radius > 0.0 ? vertex.vertical_radius : std::max(Design.norms.vertical_min, Design.norms.vertical_factor * Design.speed * Design.speed)}; if (vertexchainage[k] <= r.profile.back().chainage + 1e-3) - continue; // vertex without its own place in the profile + continue; r.profile.push_back({vertexchainage[k], elevation, radius, 0.0}); } r.profile.push_back({r.length, Design.end.y, 0.0, 0.0}); @@ -488,7 +470,6 @@ result compute(design const &Design) if (std::abs(last - Design.end_grade) > 0.0005) r.warnings.emplace_back(format("Grade break at the end: %.1f per mille against %.1f of the adjoining track", last * 1000.0, Design.end_grade * 1000.0)); } - // curvature continuity with the adjoining tracks; the designed fragment starts and ends on a tangent if (Design.start_radius > 0.0 && Design.start_radius < 10000.0) r.warnings.emplace_back(format("The adjoining track at the start is curved (R %.0f m), the curvature changes abruptly", Design.start_radius)); if (Design.end_radius > 0.0 && Design.end_radius < 10000.0) @@ -615,7 +596,6 @@ std::vector pieces(result const &Result, design const &Design, std for (std::size_t j = 0; j < count; ++j) spans.push_back({i, e.length * j / count, e.length * (j + 1) / count}); } - // use up the requested number of pieces by dividing the longest ones while (false == spans.empty() && spans.size() < Count) { auto longest = std::max_element(spans.begin(), spans.end(), [](span const &A, span const &B) { return A.to - A.from < B.to - B.from; }); @@ -651,7 +631,6 @@ std::vector pieces(result const &Result, design const &Design, std { if (Design.shape == transition_shape::cubic_parabola) { - // exact: part of the cubic which describes the whole transition std::array const local{glm::dvec2{0.0, 0.0}, glm::dvec2{e.transition / 3.0, 0.0}, glm::dvec2{e.transition * 2.0 / 3.0, 0.0}, glm::dvec2{e.transition, e.transition * e.transition / (6.0 * e.radius)}}; auto const a{e.kind == element_kind::transition_in ? piece.from / e.transition : 1.0 - piece.from / e.transition}; auto const b{e.kind == element_kind::transition_in ? piece.to / e.transition : 1.0 - piece.to / e.transition}; @@ -670,7 +649,6 @@ std::vector pieces(result const &Result, design const &Design, std break; } } - // heights follow the profile, with end slopes matching its grade auto const s0{e.chainage + piece.from}; auto const s3{e.chainage + piece.to}; auto const y0{elevation(Result, s0)}; @@ -693,4 +671,4 @@ std::vector pieces(result const &Result, design const &Design, std return result; } -} // namespace alignment +} diff --git a/editor/editorAlignment.hpp b/editor/editorAlignment.hpp index 4241eb2b1..9e5a9bc22 100644 --- a/editor/editorAlignment.hpp +++ b/editor/editorAlignment.hpp @@ -4,7 +4,7 @@ terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at -http://mozilla.org/MPL/2.0/. +http: */ #pragma once @@ -15,80 +15,68 @@ http://mozilla.org/MPL/2.0/. #include "world/Segment.h" -// Railway alignment design: horizontal alignment defined by a polygon of tangents, with a circular curve -// and transition curves fitted at each intersection point (vertex), and a vertical profile made of grades -// joined with parabolic vertical curves. -// -// Plan coordinates are (x, z) of the scene; heights are scene y. Design values follow the usual railway -// conventions: speed in km/h, cant in mm, radii and lengths in metres. All the limits are configurable. namespace alignment { enum class transition_shape { - cubic_parabola, // y = x^3 / (6RL), represented exactly by a single cubic Bezier - clothoid // curvature linear along the length, approximated by cubic pieces + cubic_parabola, + clothoid }; -// permissible values used to recommend and verify the design struct limits { - double gauge{1500.0}; // distance between rail axes, mm - double unbalanced{0.6}; // permissible unbalanced lateral acceleration, m/s2 - double cant_max{150.0}; // maximum cant, mm - double cant_rate{35.0}; // permissible rate of cant change along transition, mm/s - double ramp_factor{10.0}; // cant ramp inclination limited to 1 / (factor * V) - double jerk{0.3}; // permissible rate of change of unbalanced acceleration, m/s3 - double vertical_factor{0.4}; // minimum vertical curve radius = factor * V^2 - double vertical_min{2000.0}; // absolute minimum vertical curve radius, m - double tangent_min_time{0.0}; // minimum length of a straight between curves expressed as travel time, s (0: not checked) + double gauge{1500.0}; + double unbalanced{0.6}; + double cant_max{150.0}; + double cant_rate{35.0}; + double ramp_factor{10.0}; + double jerk{0.3}; + double vertical_factor{0.4}; + double vertical_min{2000.0}; + double tangent_min_time{0.0}; }; -// intersection point of two tangents of the horizontal alignment, with the curve fitted there struct vertex { - glm::dvec2 position{0.0}; // plan position of an unconstrained vertex - double offset{100.0}; // first/last vertex: distance from the fixed end along its tangent + glm::dvec2 position{0.0}; + double offset{100.0}; double radius{1000.0}; double transition_in{0.0}; double transition_out{0.0}; - double cant{0.0}; // mm - bool auto_elevation{true}; // elevation interpolated between the fixed ends - double elevation{0.0}; // height of the profile at the vertex - double vertical_radius{0.0}; // 0: minimum radius from the limits + double cant{0.0}; + bool auto_elevation{true}; + double elevation{0.0}; + double vertical_radius{0.0}; }; struct design { - // fixed ends of the designed fragment, with plan directions pointing along the route glm::dvec3 start{0.0}; glm::dvec3 end{0.0}; glm::dvec2 start_direction{0.0, 1.0}; glm::dvec2 end_direction{0.0, 1.0}; - double start_grade{0.0}; // grade of the adjoining track, for continuity check + double start_grade{0.0}; double end_grade{0.0}; - double start_radius{0.0}; // plan radius of the adjoining track at the joint, 0 for straight + double start_radius{0.0}; double end_radius{0.0}; std::vector vertices; transition_shape shape{transition_shape::cubic_parabola}; - double speed{100.0}; // design speed, km/h + double speed{100.0}; limits norms; }; -// values derived from the design speed for a curve of given radius struct recommendation { - double cant_equilibrium{0.0}; // cant compensating the lateral acceleration fully, mm - double cant_min{0.0}; // smallest cant keeping the unbalanced acceleration within the limit, mm - double cant{0.0}; // proposed cant, mm - double radius_min{0.0}; // smallest radius for the design speed with maximum cant, m - double transition{0.0}; // minimum transition length for the proposed cant, m - double vertical_radius{0.0}; // minimum vertical curve radius, m + double cant_equilibrium{0.0}; + double cant_min{0.0}; + double cant{0.0}; + double radius_min{0.0}; + double transition{0.0}; + double vertical_radius{0.0}; }; recommendation recommend(double const Speed, double const Radius, limits const &Limits); -// minimum transition length for given speed, cant and radius double transition_length(double const Speed, double const Radius, double const Cant, limits const &Limits); -// unbalanced lateral acceleration, m/s2 double unbalanced_acceleration(double const Speed, double const Radius, double const Cant, limits const &Limits); enum class element_kind @@ -99,36 +87,31 @@ enum class element_kind transition_out }; -// single geometric element of the computed alignment struct element { element_kind kind{element_kind::straight}; - int vertex{-1}; // vertex the curve element belongs to - double chainage{0.0}; // distance from the start of the fragment to the start of the element + int vertex{-1}; + double chainage{0.0}; double length{0.0}; - double radius{0.0}; // curve radius (also the final radius of a transition) - double transition{0.0}; // transition length - int turn{0}; // +1/-1 direction of the curve, 0 for straights - double cant{0.0}; // full cant of the curve, mm - // geometric frame: straight - start point and direction; arc - centre, radius vector to its start point - // and direction at the start; transition_in - its start point (TS) with the tangent direction and inner normal; - // transition_out - its end point (ST) with the direction pointing backwards and inner normal + double radius{0.0}; + double transition{0.0}; + int turn{0}; + double cant{0.0}; glm::dvec2 origin{0.0}; glm::dvec2 direction{0.0, 1.0}; glm::dvec2 normal{0.0}; }; -// verification of a single curve against the limits struct curve_report { int vertex{-1}; - double deflection{0.0}; // angle between the tangents, radians + double deflection{0.0}; double arc_length{0.0}; - double tangent_in{0.0}; // distance from the vertex to the start of the curve - double tangent_out{0.0}; // distance from the vertex to the end of the curve - double unbalanced{0.0}; // m/s2 - double cant_rate_in{0.0}, cant_rate_out{0.0}; // mm/s - double jerk_in{0.0}, jerk_out{0.0}; // m/s3 + double tangent_in{0.0}; + double tangent_out{0.0}; + double unbalanced{0.0}; + double cant_rate_in{0.0}, cant_rate_out{0.0}; + double jerk_in{0.0}, jerk_out{0.0}; recommendation recommended; }; @@ -136,8 +119,8 @@ struct profile_point { double chainage{0.0}; double elevation{0.0}; - double radius{0.0}; // vertical curve radius at the grade break - double tangent{0.0}; // vertical curve tangent length + double radius{0.0}; + double tangent{0.0}; }; struct result @@ -147,9 +130,9 @@ struct result double gauge{1500.0}; std::vector errors; std::vector warnings; - std::vector vertices; // resolved plan positions of the vertices - std::vector vertex_chainages; // chainage of the middle of each vertex curve - std::vector vertex_elevations; // profile elevation at each vertex + std::vector vertices; + std::vector vertex_chainages; + std::vector vertex_elevations; std::vector elements; std::vector curves; std::vector profile; @@ -157,12 +140,9 @@ struct result }; result compute(design const &Design); -// intersection of the tangents of the fixed ends, if it lies ahead of both ends bool tangent_intersection(design const &Design, glm::dvec2 &Point); -// checks whether the fixed ends lie on a common straight line bool collinear(design const &Design); -// position, direction of travel (unit, 3d), cant and curvature direction at specified chainage struct station { glm::dvec3 position{0.0}; @@ -171,14 +151,10 @@ struct station int turn{0}; }; station evaluate(result const &Result, double const Chainage); -// profile height and grade at specified chainage double elevation(result const &Result, double const Chainage); double grade(result const &Result, double const Chainage); -// smallest number of cubic pieces representing the alignment with the required accuracy std::size_t minimum_pieces(result const &Result, design const &Design); -// splits the alignment into at least Count cubic pieces (the longest pieces are divided further to reach the count), -// in the order of the route, as path source data with absolute end points and relative control vectors std::vector pieces(result const &Result, design const &Design, std::size_t const Count); -} // namespace alignment +} diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index c4ae7c2a6..94bb7b453 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -4,7 +4,7 @@ terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at -http://mozilla.org/MPL/2.0/. +http: */ #include "stdafx.h" @@ -26,7 +26,6 @@ http://mozilla.org/MPL/2.0/. namespace { -// end points closer than this are treated as the same point double const kSamePoint{0.05}; segment_data::point point_index(editor_track::point_kind const Kind) @@ -56,7 +55,6 @@ void add_unique(std::vector &Tracks, TTrack *Track) Tracks.emplace_back(Track); } -// first derivative of the path curve at its start or end, in the direction from the start to the end glm::dvec3 path_tangent(segment_data const &Path, bool const Atend) { auto const &start{Path.points[segment_data::point::start]}; @@ -68,7 +66,6 @@ glm::dvec3 path_tangent(segment_data const &Path, bool const Atend) return control2 != glm::dvec3{} ? -control2 : end - (start + control1); } -// plan radius of the path curve at specified parameter, 0 if it's straight there double path_radius(segment_data const &Path, double const T) { auto const &p0{Path.points[segment_data::point::start]}; @@ -87,7 +84,6 @@ double path_radius(segment_data const &Path, double const T) return curvature > 1e-7 ? 1.0 / curvature : 0.0; } -// the same path run in the opposite direction segment_data reversed(segment_data const &Path) { segment_data result{Path}; @@ -95,13 +91,10 @@ segment_data reversed(segment_data const &Path) result.points[segment_data::point::end] = Path.points[segment_data::point::start]; result.points[segment_data::point::control1] = Path.points[segment_data::point::control2]; result.points[segment_data::point::control2] = Path.points[segment_data::point::control1]; - // roll follows the direction of the curve, which flips along with the direction of travel result.rolls = {-Path.rolls[1], -Path.rolls[0]}; return result; } -// direction of travel and plan radius at the joint of a chain with an adjoining path. -// Leaving: the chain continues into the adjoining path (its end), otherwise it comes from it (its start) bool adjoining_direction(TTrack const *Neighbour, glm::dvec3 const &Joint, bool const Leaving, glm::dvec3 &Direction, double &Radius) { if (Neighbour == nullptr) @@ -113,8 +106,6 @@ bool adjoining_direction(TTrack const *Neighbour, glm::dvec3 const &Joint, bool auto const &point{path.points[atend ? segment_data::point::end : segment_data::point::start]}; if (glm::distance(point, Joint) > kSamePoint) continue; - // the tangent runs from the start of the neighbour to its end; it's the direction of travel when - // entering the neighbour at its start, or arriving from it through its end auto const tangent{glm::normalize(path_tangent(path, atend))}; Direction = (Leaving != atend) ? tangent : -tangent; Radius = path_radius(path, atend ? 1.0 : 0.0); @@ -124,7 +115,7 @@ bool adjoining_direction(TTrack const *Neighbour, glm::dvec3 const &Joint, bool return false; } -} // namespace +} editor_track::state editor_track::capture(TTrack const &Track) { @@ -175,7 +166,7 @@ void editor_track::apply(TTrack &Track, state const &State) bool editor_track::is_supported(TTrack const &Track) { if ((Track.iCategoryFlag & 0x80) != 0) - return false; // auto-generated helper path + return false; if (Track.eType == tt_Normal) return Track.Segment != nullptr; if (Track.eType == tt_Switch) @@ -209,7 +200,6 @@ void editor_track::commit(std::vector const &Tracks) if (Tracks.empty()) return; - // paths whose render geometry depends on the modified ones std::vector affected; for (auto *track : Tracks) { @@ -217,27 +207,23 @@ void editor_track::commit(std::vector const &Tracks) for (auto *neighbour : neighbours(*track)) add_unique(affected, neighbour); } - // take the paths out of the scene while their ends still match the old segments... for (auto *track : Tracks) { disconnect(*track); simulation::Region->erase_and_unregister(track); } - // ...rebuild the segments and put the paths back in their new place... for (auto *track : Tracks) { track->init_segments(false); track->update_location(); - track->m_area.radius = -1.f; // forces radius recalculation + track->m_area.radius = -1.f; simulation::Region->insert_and_register(track); } - // ...connect them with whatever they touch now... for (auto *track : Tracks) join(*track); for (auto *track : Tracks) for (auto *neighbour : neighbours(*track)) add_unique(affected, neighbour); - // ...and update the visuals for (auto *track : affected) update_transition(*track); for (auto *track : affected) @@ -249,7 +235,6 @@ void editor_track::commit(std::vector const &Tracks) void editor_track::commit_parameters(TTrack &Track) { Track.fTrackWidth2 = Track.fTrackWidth; - // segments are re-created from unchanged data, but road texture proportions and roll fix depend on parameters Track.init_segments(false); std::vector affected{&Track}; @@ -302,8 +287,6 @@ void editor_track::move_point(TTrack &Track, point_ref const &Point, glm::dvec3 auto &point{path.points[point_index(Point.kind)]}; auto const oldposition{point}; point = Position; - // control vectors are relative to their end points, so they follow them automatically. - // other paths of the same piece sharing this point (the common start of a switch) follow as well for (auto &otherpath : Track.m_paths) { if (&otherpath == &path) @@ -406,7 +389,6 @@ editor_track::snap_target editor_track::find_snap_target(TTrack const &Track, gl auto const excluded = [&](TTrack const *Other) { return std::find(Exclude.begin(), Exclude.end(), Other) != Exclude.end(); }; auto const category{Track.iCategoryFlag & 15}; - // NOTE: copy, the region returns its scratchpad auto const sections{simulation::Region->sections(Position, static_cast(Radius))}; for (auto *section : sections) { @@ -425,7 +407,6 @@ editor_track::snap_target editor_track::find_snap_target(TTrack const &Track, gl auto const distance{glm::distance(point, Position)}; if (distance > Radius || distance >= result.distance) continue; - // skip ends already connected with something which stays in place auto const connections{connected_points(*other, point)}; if (std::any_of(connections.begin(), connections.end(), [&](auto const &Connection) { return false == excluded(Connection.first); })) continue; @@ -466,7 +447,6 @@ void editor_track::snap_point(TTrack &Track, point_ref const &Point, snap_target if (false == Aligntangent) return; - // the path continues the target, so it leaves the shared point in the opposite direction auto &path{Track.m_paths[Point.path]}; auto const &start{path.points[segment_data::point::start]}; auto const &end{path.points[segment_data::point::end]}; @@ -515,7 +495,6 @@ void editor_track::velocity(TTrack &Track, double const Velocity) { if (Track.SwitchExtension && Track.eType == tt_Switch) { - // same rules as TTrack::Switch() Track.SwitchExtension->fVelocity = static_cast(Velocity); if (Velocity <= -2.0) Track.fVelocity = Track.SwitchExtension->CurrentIndex ? -Velocity : -1.0; @@ -594,7 +573,6 @@ void editor_track::join(TTrack &Track) } case tt_Switch: { - // like during scenery load, switches are connected from the side of the regular paths for (int i = 0; i < 2; ++i) { auto const &segment{Track.SwitchExtension->Segments[i]}; @@ -638,7 +616,6 @@ void editor_track::connect(TTrack &Track, bool const Prevside, TTrack *Other, in { if (false == has_switch_paths(*Other)) break; - // same connections as in path_table::InitTracks(), but made without moving the switch blades auto const path{(Endpointid - 2) / 2}; auto const atend{((Endpointid - 2) % 2) != 0}; bind_switch_path(*Other, path); @@ -667,7 +644,6 @@ void editor_track::connect(TTrack &Track, bool const Prevside, TTrack *Other, in void editor_track::update_transition(TTrack &Track) { - // same rule as TTrack::ConnectNextPrev(): transition is drawn by the path whose end 2 meets start of a different path Track.iTrapezoid &= ~2; auto const *next{Track.trNext}; if (next == nullptr || Track.iNextDirection != 0) @@ -692,7 +668,6 @@ void editor_track::bind_switch_path(TTrack &Switch, int const Path) void editor_track::store_switch_path(TTrack &Switch, int const Path) { - // same as TTrack::SetConnections(), without switching back to the base position auto &extension{*Switch.SwitchExtension}; auto const path{Path & 1}; extension.pNexts[path] = Switch.trNext; @@ -701,7 +676,6 @@ void editor_track::store_switch_path(TTrack &Switch, int const Path) extension.iPrevDirection[path] = Switch.iPrevDirection; if (Switch.eType == tt_Switch) { - // switch paths share their start point, so they share the path connected there as well extension.pPrevs[path ^ 1] = Switch.trPrev; extension.iPrevDirection[path ^ 1] = Switch.iPrevDirection; } @@ -727,7 +701,6 @@ bool editor_track::find_chain(TTrack *From, TTrack *To, chain &Chain, std::strin if (From != To) { bool found{false}; - // try to reach the last path leaving the first one through its end, then through its start for (auto const throughend : {true, false}) { Chain.tracks = {From}; @@ -780,7 +753,6 @@ bool editor_track::find_chain(TTrack *From, TTrack *To, chain &Chain, std::strin Chain.radius = radius; } - // fixed ends, with directions taken from the adjoining paths when there are any auto const &first{From->m_paths.front()}; auto const firstforward{Chain.forward.front()}; Chain.start = first.points[firstforward ? segment_data::point::start : segment_data::point::end]; @@ -806,7 +778,6 @@ std::vector editor_track::relay(chain const &Chain, std::vector tracks; std::size_t previous{count}; for (std::size_t i = 0; i < Pieces.size(); ++i) @@ -841,7 +812,7 @@ TTrack *editor_track::clone(TTrack const &Template) cParser parser(text.str(), cParser::buffer_TEXT); parser.getTokens(); std::string token; - parser >> token; // node type, consumed before the path is loaded + parser >> token; scene::node_data data; data.type = "track"; @@ -854,7 +825,6 @@ TTrack *editor_track::clone(TTrack const &Template) track->m_rangesquaredmin = Template.m_rangesquaredmin; track->m_rangesquaredmax = Template.m_rangesquaredmax; track->Load(&parser, glm::dvec3{}); - // events stay with the original path only for (auto *events : {&track->m_events0, &track->m_events1, &track->m_events2, &track->m_events0all, &track->m_events1all, &track->m_events2all}) events->clear(); track->m_events = false; @@ -885,6 +855,5 @@ void editor_track::revive(TTrack &Track) void editor_track::rebuild_geometry(TTrack &Track) { auto §ion{simulation::Region->section(Track.location())}; - // sections which weren't displayed yet create geometry of their content on their own Track.rebuild_geometry(section.m_geometrycreated ? section.m_geometrybank : gfx::geometrybank_handle{}); } diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index 17ed02479..267c0c032 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -4,7 +4,7 @@ terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at -http://mozilla.org/MPL/2.0/. +http: */ #pragma once @@ -19,25 +19,18 @@ http://mozilla.org/MPL/2.0/. class TTrack; -// Editing of paths (tracks, roads, rivers) loaded from the scenery. -// -// The source of truth for path geometry is TTrack::m_paths (the same data the scenery export writes). -// Edits modify m_paths and then commit() rebuilds everything derived from it: the segments, placement -// in the scene cells, connections with neighbouring paths and the render geometry. class editor_track { public: - // identifies an editable point of a path enum class point_kind { start, control1, control2, end }; struct point_ref { - int path{-1}; // index into TTrack::m_paths + int path{-1}; point_kind kind{point_kind::start}; bool valid() const { return path >= 0; } bool operator==(point_ref const &Other) const { return path == Other.path && kind == Other.kind; } }; - // snapshot of the editable state of a path, used by the undo history struct state { std::vector paths; @@ -58,85 +51,57 @@ class editor_track float texslope{0.9f}; }; static state capture(TTrack const &Track); - // restores provided state; follow with commit() to rebuild the path static void apply(TTrack &Track, state const &State); - // checks whether geometry of the path can be modified. returns: true if it can, otherwise false and the reason static bool can_edit_geometry(TTrack const &Track, std::string &Reason); - // checks whether the path type is supported by the editor at all static bool is_supported(TTrack const &Track); - // rebuilds provided paths after modification of their source data (m_paths): segments, placement in the region, - // connections with neighbours and render geometry of the paths and all their old and new neighbours static void commit(std::vector const &Tracks); - // rebuilds the path after change of parameters which don't affect its course (width, textures, etc) static void commit_parameters(TTrack &Track); - // world position of specified point. for control points it's the absolute position of the handle; - // a zero (straight) control vector is presented at 1/3 of the chord so it can be grabbed static glm::dvec3 point_position(TTrack const &Track, point_ref const &Point); - // moves specified point to provided world position. moving an end point carries its control vector along. - // switches keep the start points of both their paths together static void move_point(TTrack &Track, point_ref const &Point, glm::dvec3 const &Position); - // moves the whole path by provided offset static void translate(TTrack &Track, glm::dvec3 const &Offset); - // rotates the whole path around vertical axis going through provided pivot point static void rotate_y(TTrack &Track, glm::dvec3 const &Pivot, double const Angle); - // pivot used for rotation of the whole path static glm::dvec3 pivot(TTrack const &Track); - // lists paths currently connected to provided path static std::vector neighbours(TTrack const &Track); - // lists end points of other paths connected to the end point located at provided position, - // as pairs of the neighbour and its matching point static std::vector> connected_points(TTrack const &Track, glm::dvec3 const &Position); - // checks whether end point located at provided position is connected to another path static bool is_connected(TTrack const &Track, point_ref const &Point); - // candidate to connect a dragged end point with struct snap_target { TTrack *track{nullptr}; point_ref point; glm::dvec3 position{0.0}; - glm::dvec3 direction{0.0}; // direction from the point into the target path + glm::dvec3 direction{0.0}; double distance{0.0}; }; - // finds the nearest free end point of another path of the same category as provided path, within specified radius. - // paths listed in Exclude are skipped, and connections to them don't count as occupying an end point static snap_target find_snap_target(TTrack const &Track, glm::dvec3 const &Position, double const Radius, std::vector const &Exclude); - // places the point at the target and optionally aligns the control vector with the target path static void snap_point(TTrack &Track, point_ref const &Point, snap_target const &Target, bool const Aligntangent); - // sequence of regular paths connected end to end struct chain { std::vector tracks; - std::vector forward; // the path runs in the direction of the chain (its start is closer to the chain start) - glm::dvec3 start{0.0}; // outer end of the first path - glm::dvec3 end{0.0}; // outer end of the last path - glm::dvec3 start_direction{0.0}; // direction of travel along the chain at its ends, from the adjoining paths if there are any + std::vector forward; + glm::dvec3 start{0.0}; + glm::dvec3 end{0.0}; + glm::dvec3 start_direction{0.0}; glm::dvec3 end_direction{0.0}; - double start_radius{0.0}; // plan radius of the adjoining paths at the joints, 0 for straight + double start_radius{0.0}; double end_radius{0.0}; double length{0.0}; - double velocity{-1.0}; // highest speed limit of the paths in the chain - double radius{0.0}; // smallest radius of the paths in the chain, 0 if all are straight + double velocity{-1.0}; + double radius{0.0}; }; - // collects regular paths connected between provided paths, both included. returns: true on success static bool find_chain(TTrack *From, TTrack *To, chain &Chain, std::string &Error); - // lays the paths of the chain along provided pieces, in the order of the chain. if there are more pieces than paths, - // additional paths are made as copies of their neighbours. returns: the added paths static std::vector relay(chain const &Chain, std::vector const &Pieces); - // takes a path added by the editor out of the scene, or puts it back static void retire(TTrack &Track); static void revive(TTrack &Track); - // names of the materials used by the path; "none" for missing ones static std::string material_name(material_handle const Material); static material_handle fetch_material(std::string const &Name); - // height of the trackbed edge as written in the scenery (without roll fix adjustment) static float texture_height(TTrack const &Track); static void texture_height(TTrack &Track, float const Height); static double velocity(TTrack const &Track); @@ -144,19 +109,12 @@ class editor_track static void damage(TTrack &Track, int const Damage); private: - // unlinks the path from all its neighbours static void disconnect(TTrack &Track); - // links the path with paths whose free end points match its own free end points static void join(TTrack &Track); - // links specified end of a regular path with matching end of another path static void connect(TTrack &Track, bool const Prevside, TTrack *Other, int const Endpointid); - // recalculates the trackbed transition flag static void update_transition(TTrack &Track); - // sets active connections of a switch to specified path, without moving the blades static void bind_switch_path(TTrack &Switch, int const Path); static void store_switch_path(TTrack &Switch, int const Path); - // rebuilds render geometry of the path in the bank of the section it's placed in static void rebuild_geometry(TTrack &Track); - // makes a new path with the parameters of provided path (without its events) and registers it in the path table static TTrack *clone(TTrack const &Template); }; diff --git a/scene/scene.cpp b/scene/scene.cpp index 7655ace6c..e72ab9301 100644 --- a/scene/scene.cpp +++ b/scene/scene.cpp @@ -416,14 +416,12 @@ basic_cell::insert( TMemCell *Memorycell ) { // NOTE: memory cells are virtual 'points' hence they don't ever expand cell range } -// removes provided path from the cell void basic_cell::erase( TTrack *Path ) { m_paths.erase( std::remove( std::begin( m_paths ), std::end( m_paths ), Path ), std::end( m_paths ) ); - // drop the path from the animation list, the cell won't update it anymore if( tTrackAnim == Path ) { tTrackAnim = Path->SwitchExtension->pNextAnim; Path->SwitchExtension->pNextAnim = nullptr; @@ -441,7 +439,6 @@ basic_cell::erase( TTrack *Path ) { // TODO: update cell bounding area } -// removes provided path from the lookup directory of the cell void basic_cell::unregister_end( TTrack *Path ) { diff --git a/scene/scene.h b/scene/scene.h index 7b5901823..5cad1fcc6 100644 --- a/scene/scene.h +++ b/scene/scene.h @@ -145,10 +145,8 @@ public: // registers provided traction piece in the lookup directory of the cell void register_end( TTraction *Traction ); - // removes provided path from the cell void erase( TTrack *Path ); - // removes provided path from the lookup directory of the cell void unregister_end( TTrack *Path ); // removes provided model instance from the cell @@ -314,7 +312,6 @@ public: void register_node( Type_ *Node, glm::dvec3 const &Point ) { cell( Point ).register_end( Node ); } - // removes provided node from the lookup directory of the section enclosing specified point template void unregister_node( Type_ *Node, glm::dvec3 const &Point ) { @@ -446,7 +443,6 @@ public: auto const location{ Node->location() }; if( point_inside( location ) ) { section( location ).erase( Node ); } } - // removes specified node from the region and from the lookup directories of its ends template void erase_and_unregister( Type_ *Node ) { diff --git a/world/Track.cpp b/world/Track.cpp index 3900bd77e..3df6aa542 100644 --- a/world/Track.cpp +++ b/world/Track.cpp @@ -687,7 +687,6 @@ void TTrack::Load(cParser *parser, glm::dvec3 const &pOrigin) // to a stale origin and the renderer would draw sleepers in the wrong place). } -// calculates path location from the current segment void TTrack::update_location() { location( ( @@ -697,19 +696,14 @@ void TTrack::update_location() { / 3.0 ); } -// (re)creates path segments from the source path data in m_paths -// Initial: true when called during deserialization; the editor passes false to keep the current switch state void TTrack::init_segments( bool const Initial ) { glm::dvec3 p1, p2, cp1, cp2, p3, p4, cp3, cp4; // dodatkowe punkty potrzebne do skrzyżowań double r1, r2, r3, r4; double segsize = 5.0; // długość odcinka segmentowania - // TSegment::Init() raises the trackbed for the roll fix through MovedUp1(); drop the previous adjustment - // so repeated initialization doesn't accumulate it fTexHeight1 -= fTexHeightOffset; fTexHeightOffset = 0.f; - // the roll flag is re-evaluated below, the transition flag is set again when the path gets connected iTrapezoid = 0; switch (eType) { @@ -1355,9 +1349,6 @@ glm::vec3 TTrack::get_nearest_point(const glm::dvec3 &point) const } // wypełnianie tablic VBO -// discards references to current render geometry and generates it anew in specified bank -// NOTE: geometry banks can't release chunks, so the old data stays in the bank, unused -// with null bank the geometry is only discarded, to be created later along with the rest of the owning section void TTrack::rebuild_geometry( gfx::geometrybank_handle const &Bank ) { Geometry1.clear(); @@ -2358,7 +2349,6 @@ TTrack::export_as_text_( std::ostream &Output ) const { << fTexSlope << ' '; } // path data - // NOTE: default stream precision would round coordinates to centimetres or worse, breaking path connections auto const precision { Output.precision( std::numeric_limits::digits10 ) }; for( auto const &path : m_paths ) { Output diff --git a/world/Track.h b/world/Track.h index 3cadd9813..ea974cbd5 100644 --- a/world/Track.h +++ b/world/Track.h @@ -185,7 +185,7 @@ public: geometryhandle_sequence Geometry2; // geometry chunks textured with texture 2 std::vector m_paths; // source data for owned paths - bool m_editorremoved { false }; // taken out of the scene by the editor, kept alive for its undo history + bool m_editorremoved { false }; int iterate_stamp = 0; // sleepermodel optional parameter ------------------------------------------------- @@ -280,9 +280,7 @@ public: RouteCount() const { return SwitchExtension != nullptr ? SwitchExtension->iRoads - 1 : 1; } void Load(cParser *parser, glm::dvec3 const &pOrigin); - // (re)creates path segments from the source path data in m_paths void init_segments( bool const Initial ); - // calculates path location from the current segment void update_location(); bool AssignEvents(); bool AssignForcedEvents(basic_event *NewEventPlus, basic_event *NewEventMinus); @@ -306,7 +304,6 @@ public: double ActiveLength(); void create_geometry( gfx::geometrybank_handle const &Bank ); // wypełnianie VBO - // discards current render geometry and generates it anew in specified bank void rebuild_geometry( gfx::geometrybank_handle const &Bank ); void create_map_geometry(std::vector &Bank, const gfx::geometrybank_handle Extra); void get_map_active_paths(map_colored_paths &handles); From d6519531ed2e810e5ec011f0e00280fb406be1b8 Mon Sep 17 00:00:00 2001 From: maj00r Date: Fri, 2 Oct 2026 22:40:11 +0200 Subject: [PATCH 046/430] feat(editor): fit curves between fixed ends --- editor/editorAlignment.cpp | 133 ++++++++++++++++++++++++++++++++++--- editor/editorAlignment.hpp | 3 + 2 files changed, 127 insertions(+), 9 deletions(-) diff --git a/editor/editorAlignment.cpp b/editor/editorAlignment.cpp index 7cdeb3284..815c0045a 100644 --- a/editor/editorAlignment.cpp +++ b/editor/editorAlignment.cpp @@ -15,6 +15,7 @@ http: #include #include #include +#include namespace alignment { @@ -281,11 +282,128 @@ result compute(design const &Design) push(straight); }; + struct fitted + { + double radius{0.0}; + double transition_in{0.0}; + double transition_out{0.0}; + double tangent_in{0.0}; + double tangent_out{0.0}; + double deflection{0.0}; + std::function tangents; + }; + std::vector fits(count); + for (std::size_t k = 0; k < count; ++k) + { + auto const &vertex{Design.vertices[k]}; + auto &fit{fits[k]}; + fit.radius = std::max(1.0, vertex.radius); + fit.transition_in = std::max(0.0, vertex.transition_in); + fit.transition_out = std::max(0.0, vertex.transition_out); + auto const directionin{glm::normalize(polygon[k + 1] - polygon[k])}; + auto const directionout{glm::normalize(polygon[k + 2] - polygon[k + 1])}; + auto const turn{cross(directionin, directionout)}; + auto const deflection{std::atan2(std::abs(turn), glm::dot(directionin, directionout))}; + if (deflection < 1e-7) + continue; + if (deflection > kPi - 1e-3) + { + r.errors.emplace_back(format("Vertex %zu: the route turns back on itself", k + 1)); + return r; + } + auto const angles = [&](double const Factor) { + return transition_point(Design.shape, fit.transition_in * Factor, fit.radius, 1.0).angle + transition_point(Design.shape, fit.transition_out * Factor, fit.radius, 1.0).angle; + }; + if (angles(1.0) > deflection) + { + double low{0.0}, high{1.0}; + for (int i = 0; i < 50; ++i) + { + auto const middle{(low + high) * 0.5}; + (angles(middle) > deflection ? high : low) = middle; + } + r.warnings.emplace_back(format("Vertex %zu: transition curves shortened to %.1f / %.1f m to fit the deflection angle", k + 1, fit.transition_in * low, fit.transition_out * low)); + fit.transition_in *= low; + fit.transition_out *= low; + } + fit.deflection = deflection; + fit.tangents = [&, k, directionin, directionout, turn](double const Radius, double &Tangentin, double &Tangentout) { + int const side{turn > 0.0 ? 1 : -1}; + auto const endin{transition_point(Design.shape, fits[k].transition_in, Radius, 1.0)}; + auto const endout{transition_point(Design.shape, fits[k].transition_out, Radius, 1.0)}; + auto const a{Radius + endin.y - Radius * (1.0 - std::cos(endin.angle))}; + auto const b{Radius + endout.y - Radius * (1.0 - std::cos(endout.angle))}; + auto const normalin{perpendicular(directionin) * static_cast(side)}; + auto const normalout{perpendicular(directionout) * static_cast(side)}; + auto const determinant{cross(normalin, normalout)}; + glm::dvec2 const offset{(a * normalout.y - normalin.y * b) / determinant, (normalin.x * b - a * normalout.x) / determinant}; + auto const curvestart{offset - normalin * a - directionin * (endin.x - Radius * std::sin(endin.angle))}; + auto const curveend{offset - normalout * b + directionout * (endout.x - Radius * std::sin(endout.angle))}; + Tangentin = std::max(0.0, -glm::dot(curvestart, directionin)); + Tangentout = std::max(0.0, glm::dot(curveend, directionout)); + }; + fit.tangents(fit.radius, fit.tangent_in, fit.tangent_out); + } + std::vector scales(count, 1.0); + for (std::size_t leg = 0; leg + 1 < polygon.size(); ++leg) + { + auto const available{glm::distance(polygon[leg], polygon[leg + 1])}; + auto const required{(leg > 0 ? fits[leg - 1].tangent_out : 0.0) + (leg < count ? fits[leg].tangent_in : 0.0)}; + if (required <= available) + continue; + auto const scale{available / required * (1.0 - 1e-9)}; + if (leg > 0) + scales[leg - 1] = std::min(scales[leg - 1], scale); + if (leg < count) + scales[leg] = std::min(scales[leg], scale); + } + for (std::size_t k = 0; k < count; ++k) + { + if (scales[k] >= 1.0) + continue; + auto &fit{fits[k]}; + auto const budgetin{fit.tangent_in * scales[k]}; + auto const budgetout{fit.tangent_out * scales[k]}; + auto const fits_budget = [&](double const Radius) { + if (transition_point(Design.shape, fit.transition_in, Radius, 1.0).angle + transition_point(Design.shape, fit.transition_out, Radius, 1.0).angle > fit.deflection) + return false; + double tangentin, tangentout; + fit.tangents(Radius, tangentin, tangentout); + return tangentin <= budgetin && tangentout <= budgetout; + }; + double low{1e-3}; + double high{fit.radius}; + for (int i = 0; i < 60; ++i) + { + auto const middle{(low + high) * 0.5}; + (transition_point(Design.shape, fit.transition_in, middle, 1.0).angle + transition_point(Design.shape, fit.transition_out, middle, 1.0).angle > fit.deflection ? low : high) = middle; + } + low = high * (1.0 + 1e-9); + high = fit.radius; + if (fits_budget(low)) + { + for (int i = 0; i < 60; ++i) + { + auto const middle{(low + high) * 0.5}; + (fits_budget(middle) ? low : high) = middle; + } + fit.radius = low; + } + else + { + fit.radius *= scales[k]; + fit.transition_in *= scales[k]; + fit.transition_out *= scales[k]; + } + r.warnings.emplace_back(format("Vertex %zu: R reduced from %.1f to %.1f m, transitions to %.1f / %.1f m, to fit between the ends", k + 1, Design.vertices[k].radius, fit.radius, fit.transition_in, fit.transition_out)); + } + std::vector vertexchainage(count, 0.0); glm::dvec2 cursor{start}; for (std::size_t k = 0; k < count; ++k) { auto const &vertex{Design.vertices[k]}; + auto const &fit{fits[k]}; auto const &position{polygon[k + 1]}; auto const directionin{glm::normalize(polygon[k + 1] - polygon[k])}; auto const directionout{glm::normalize(polygon[k + 2] - polygon[k + 1])}; @@ -307,16 +425,10 @@ result compute(design const &Design) r.errors.emplace_back(format("Vertex %zu: the route turns back on itself", k + 1)); return r; } - if (vertex.radius < 1.0) - { - r.errors.emplace_back(format("Vertex %zu: radius is too small", k + 1)); - return r; - } - int const side{turn > 0.0 ? 1 : -1}; - auto const radius{vertex.radius}; - auto const lengthin{std::max(0.0, vertex.transition_in)}; - auto const lengthout{std::max(0.0, vertex.transition_out)}; + auto const radius{fit.radius}; + auto const lengthin{fit.transition_in}; + auto const lengthout{fit.transition_out}; auto const endin{transition_point(Design.shape, lengthin, radius, 1.0)}; auto const endout{transition_point(Design.shape, lengthout, radius, 1.0)}; auto const shiftin{endin.y - radius * (1.0 - std::cos(endin.angle))}; @@ -386,6 +498,9 @@ result compute(design const &Design) curve_report report; report.vertex = static_cast(k); + report.radius = radius; + report.transition_in = lengthin; + report.transition_out = lengthout; report.deflection = deflection; report.arc_length = radius * std::max(0.0, arcangle); report.tangent_in = glm::distance(position, curvestart); diff --git a/editor/editorAlignment.hpp b/editor/editorAlignment.hpp index 9e5a9bc22..0928af7b4 100644 --- a/editor/editorAlignment.hpp +++ b/editor/editorAlignment.hpp @@ -105,6 +105,9 @@ struct element struct curve_report { int vertex{-1}; + double radius{0.0}; + double transition_in{0.0}; + double transition_out{0.0}; double deflection{0.0}; double arc_length{0.0}; double tangent_in{0.0}; From b19f3de0d486e89d959d2ac06f14e995515cb38c Mon Sep 17 00:00:00 2001 From: maj00r Date: Fri, 2 Oct 2026 22:42:09 +0200 Subject: [PATCH 047/430] feat(editor): recognize collinear straights, measure --- application/editormode.cpp | 2 + application/editormode.h | 19 ++++ application/editormodetrack.cpp | 165 +++++++++++++++++++++++++++++++- editor/editorTrack.cpp | 115 ++++++++++++++++++++++ editor/editorTrack.hpp | 19 ++++ 5 files changed, 319 insertions(+), 1 deletion(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 41c8e9259..063f46cbe 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -1013,6 +1013,8 @@ bool editor_mode::update() draw_track_overlay(); if (route_active()) draw_route_overlay(); + if (ui()->mode() == nodebank_panel::TRACK && m_track_tab == track_tab::straights) + draw_straights_overlay(); // --- area fill: outline overlay while the mode is active (its settings are drawn in the node bank window) --- if (ui()->mode() == nodebank_panel::FILL) diff --git a/application/editormode.h b/application/editormode.h index a5bc4e158..b08857181 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -319,6 +319,25 @@ class editor_mode : public application_mode glm::dvec3 route_vertex_position(int const Vertex) const; bool route_active() const; route_design m_route; + + struct straights_state + { + editor_track::straight_tolerance tolerance; + double minimum_length{50.0}; + std::vector found; + int listed{-1}; + TTrack *current_for{nullptr}; + editor_track::straight current; + editor_track::straight a; + editor_track::straight b; + char filter[32]{}; + }; + void render_straights_ui(); + void draw_straights_overlay() const; + editor_track::straight const ¤t_straight(); + straights_state m_straights; + enum class track_tab { straights, route, path }; + track_tab m_track_tab{track_tab::straights}; bool m_route_tab{true}; bool m_route_gizmo_using{false}; glm::mat4 m_route_gizmo{1.0f}; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 51882ae84..4799ce626 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -423,14 +423,23 @@ void editor_mode::render_track_ui() { if (ImGui::BeginTabBar("##trackediting")) { + if (ImGui::BeginTabItem("Straights")) + { + m_track_tab = track_tab::straights; + m_route_tab = true; + render_straights_ui(); + ImGui::EndTabItem(); + } if (ImGui::BeginTabItem("Route design")) { + m_track_tab = track_tab::route; m_route_tab = true; render_route_ui(); ImGui::EndTabItem(); } if (ImGui::BeginTabItem("Single path")) { + m_track_tab = track_tab::path; m_route_tab = false; render_path_ui(); ImGui::EndTabItem(); @@ -632,7 +641,7 @@ void editor_mode::render_path_ui() bool editor_mode::route_active() const { - return ui()->mode() == nodebank_panel::TRACK && m_route_tab && false == m_route.chain.tracks.empty(); + return ui()->mode() == nodebank_panel::TRACK && m_track_tab == track_tab::route && false == m_route.chain.tracks.empty(); } void editor_mode::route_recommend(alignment::vertex &Vertex) const @@ -1111,3 +1120,157 @@ void editor_mode::render_route_ui() ImGui::TextUnformatted(route.status.c_str()); } } + +editor_track::straight const &editor_mode::current_straight() +{ + auto *track{selected_track()}; + if (track != m_straights.current_for) + { + m_straights.current_for = track; + m_straights.current = track != nullptr ? editor_track::find_straight(*track, m_straights.tolerance) : editor_track::straight{}; + } + return m_straights.current; +} + +void editor_mode::draw_straights_overlay() const +{ + screen_projection const projection; + ImDrawList *drawlist = ImGui::GetBackgroundDrawList(); + glm::dvec3 const camera{Global.pCamera.Pos}; + auto const nearby = [&](editor_track::straight const &Line) { + auto const offset{camera - Line.start}; + auto const along{std::clamp(glm::dot(glm::dvec2{offset.x, offset.z}, Line.direction), 0.0, Line.length)}; + auto const closest{Line.start + glm::dvec3{Line.direction.x, 0.0, Line.direction.y} * along}; + return glm::distance(glm::dvec2{closest.x, closest.z}, glm::dvec2{camera.x, camera.z}) < 3000.0; + }; + auto const draw = [&](editor_track::straight const &Line, ImU32 const Color, float const Thickness) { + if (Line.tracks.empty()) + return; + projection.line(drawlist, Line.start, Line.end, Color, Thickness); + for (auto const &point : {Line.start, Line.end}) + { + ImVec2 screen; + if (projection.project(point, screen)) + drawlist->AddCircleFilled(screen, Thickness + 2.0f, Color); + } + }; + for (int i = 0; i < static_cast(m_straights.found.size()); ++i) + { + auto const &line{m_straights.found[i]}; + if (nearby(line)) + draw(line, i == m_straights.listed ? IM_COL32(40, 220, 255, 255) : IM_COL32(255, 255, 255, 110), i == m_straights.listed ? 4.0f : 2.0f); + } + draw(m_straights.current, IM_COL32(40, 220, 255, 255), 4.0f); + draw(m_straights.a, IM_COL32(60, 230, 90, 255), 5.0f); + draw(m_straights.b, IM_COL32(255, 60, 255, 255), 5.0f); + if (false == m_straights.a.tracks.empty() && false == m_straights.b.tracks.empty()) + { + auto const &a{m_straights.a}; + for (auto const &point : {m_straights.b.start, m_straights.b.end}) + { + auto const along{glm::dot(glm::dvec2{point.x - a.start.x, point.z - a.start.z}, a.direction)}; + auto const foot{a.start + glm::dvec3{a.direction.x, 0.0, a.direction.y} * along + glm::dvec3{0.0, a.grade * along, 0.0}}; + projection.line(drawlist, foot, point, IM_COL32(255, 210, 60, 220), 1.5f); + } + } +} + +void editor_mode::render_straights_ui() +{ + auto &state{m_straights}; + ImGui::TextDisabled("Straights recognized from chains of collinear straight paths.\nLMB: select a path to see the straight it belongs to"); + + ImGui::PushItemWidth(100.0f); + double angle{glm::degrees(state.tolerance.angle)}; + if (ImGui::InputDouble("Angle tolerance (deg)", &angle, 0.0, 0.0, "%.4f")) + state.tolerance.angle = glm::radians(std::max(0.0, angle)); + ImGui::InputDouble("Offset tolerance (m)", &state.tolerance.offset, 0.0, 0.0, "%.3f"); + ImGui::InputDouble("Minimum length (m)", &state.minimum_length, 0.0, 0.0, "%.0f"); + ImGui::PopItemWidth(); + if (ImGui::Button("Recognize straights in the scenery")) + { + state.found = editor_track::find_straights(state.minimum_length, state.tolerance); + state.listed = -1; + state.current_for = nullptr; + } + auto const describe = [](editor_track::straight const &Line) { + char text[160]; + std::snprintf(text, sizeof(text), "L %.2f m az %.4f deg i %.2f per mille %zu paths", Line.length, Line.azimuth, Line.grade * 1000.0, Line.tracks.size()); + return std::string{text}; + }; + if (false == state.found.empty()) + { + ImGui::Text("%zu straights", state.found.size()); + ImGui::SameLine(); + ImGui::PushItemWidth(150.0f); + ImGui::InputTextWithHint("##straightfilter", "path name", state.filter, sizeof(state.filter)); + ImGui::PopItemWidth(); + ImGui::BeginChild("##straights", ImVec2(0.0f, 160.0f), true); + for (int i = 0; i < static_cast(state.found.size()); ++i) + { + auto const &line{state.found[i]}; + if (state.filter[0] != '\0' && std::none_of(line.tracks.begin(), line.tracks.end(), [&](TTrack const *Track) { return Track->name().find(state.filter) != std::string::npos; })) + continue; + auto const label{std::to_string(i + 1) + ". " + describe(line) + "##straight" + std::to_string(i)}; + if (ImGui::Selectable(label.c_str(), state.listed == i)) + { + state.listed = i; + m_node = line.tracks[line.tracks.size() / 2]; + ui()->set_node(m_node); + start_focus(m_node); + } + } + ImGui::EndChild(); + } + + ImGui::Separator(); + auto const &line{current_straight()}; + if (line.tracks.empty()) + { + ImGui::TextDisabled(selected_track() != nullptr ? "The selected path isn't straight" : "No path selected"); + } + else + { + ImGui::Text("Straight of the selected path"); + ImGui::Indent(); + ImGui::TextUnformatted(describe(line).c_str()); + ImGui::Text("From (%.3f, %.3f, %.3f)", line.start.x, line.start.y, line.start.z); + ImGui::Text("To (%.3f, %.3f, %.3f)", line.end.x, line.end.y, line.end.z); + ImGui::Text("Paths: %s ... %s", line.tracks.front()->name().c_str(), line.tracks.back()->name().c_str()); + ImGui::Unindent(); + if (ImGui::Button("Set as A")) + state.a = line; + ImGui::SameLine(); + if (ImGui::Button("Set as B")) + state.b = line; + } + + ImGui::Separator(); + auto const &a{state.a}; + auto const &b{state.b}; + ImGui::TextColored(ImVec4(0.25f, 0.9f, 0.35f, 1.0f), "A: %s", a.tracks.empty() ? "-" : describe(a).c_str()); + ImGui::TextColored(ImVec4(1.0f, 0.25f, 1.0f, 1.0f), "B: %s", b.tracks.empty() ? "-" : describe(b).c_str()); + if (a.tracks.empty() || b.tracks.empty()) + return; + + auto const cross{a.direction.x * b.direction.y - a.direction.y * b.direction.x}; + auto const dot{glm::dot(a.direction, b.direction)}; + auto const between{glm::degrees(std::atan2(std::abs(cross), std::abs(dot)))}; + auto const offset = [&](glm::dvec3 const &Point) { + glm::dvec2 const relative{Point.x - a.start.x, Point.z - a.start.z}; + return a.direction.x * relative.y - a.direction.y * relative.x; + }; + auto const along = [&](glm::dvec3 const &Point) { return glm::dot(glm::dvec2{Point.x - a.start.x, Point.z - a.start.z}, a.direction); }; + auto const height = [&](glm::dvec3 const &Point) { return Point.y - (a.start.y + a.grade * along(Point)); }; + auto const startoffset{offset(b.start)}; + auto const endoffset{offset(b.end)}; + auto const from{std::max(0.0, std::min(along(b.start), along(b.end)))}; + auto const to{std::min(a.length, std::max(along(b.start), along(b.end)))}; + + ImGui::Text("Angle between A and B: %.5f deg%s", between, between < 0.001 ? " (parallel)" : ""); + ImGui::Text("Distance of B from A: start %.3f m, end %.3f m, change %.3f m", std::abs(startoffset), std::abs(endoffset), std::abs(endoffset - startoffset)); + ImGui::Text("B lies on the %s of A", (startoffset + endoffset) > 0.0 ? "left" : "right"); + ImGui::Text("Height of B above A: start %.3f m, end %.3f m", height(b.start), height(b.end)); + ImGui::Text("Grade difference: %.2f per mille", (b.grade * (dot < 0.0 ? -1.0 : 1.0) - a.grade) * 1000.0); + ImGui::Text("Overlap along A: %.2f m", std::max(0.0, to - from)); +} diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index 94bb7b453..ca17787a6 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -21,7 +21,9 @@ http: #include #include #include +#include #include +#include namespace { @@ -771,6 +773,119 @@ bool editor_track::find_chain(TTrack *From, TTrack *To, chain &Chain, std::strin return true; } +bool editor_track::is_straight(TTrack const &Track, straight_tolerance const &Tolerance) +{ + if (Track.eType != tt_Normal || false == is_supported(Track) || Track.m_paths.empty()) + return false; + auto const &path{Track.m_paths.front()}; + glm::dvec2 const start{path.points[segment_data::point::start].x, path.points[segment_data::point::start].z}; + glm::dvec2 const end{path.points[segment_data::point::end].x, path.points[segment_data::point::end].z}; + auto const length{glm::distance(start, end)}; + if (length < 1e-3) + return false; + auto const direction{(end - start) / length}; + for (auto const index : {segment_data::point::control1, segment_data::point::control2}) + { + auto const &control{path.points[index]}; + glm::dvec2 const offset{control.x, control.z}; + if (std::abs(direction.x * offset.y - direction.y * offset.x) > Tolerance.offset) + return false; + } + return true; +} + +editor_track::straight editor_track::find_straight(TTrack &Track, straight_tolerance const &Tolerance) +{ + straight result; + if (false == is_straight(Track, Tolerance)) + return result; + + auto const plan = [](glm::dvec3 const &Point) { return glm::dvec2{Point.x, Point.z}; }; + auto const &first{Track.m_paths.front()}; + auto const origin{first.points[segment_data::point::start]}; + auto const direction{glm::normalize(plan(first.points[segment_data::point::end] - origin))}; + auto const lateral = [&](glm::dvec3 const &Point) { + auto const offset{plan(Point - origin)}; + return std::abs(direction.x * offset.y - direction.y * offset.x); + }; + auto const continues = [&](TTrack const *Other) { + if (Other == nullptr || false == is_straight(*Other, Tolerance)) + return false; + auto const &path{Other->m_paths.front()}; + auto const otherdirection{glm::normalize(plan(path.points[segment_data::point::end] - path.points[segment_data::point::start]))}; + if (std::abs(direction.x * otherdirection.y - direction.y * otherdirection.x) > Tolerance.angle) + return false; + return lateral(path.points[segment_data::point::start]) <= Tolerance.offset && lateral(path.points[segment_data::point::end]) <= Tolerance.offset; + }; + + std::deque run{&Track}; + for (auto const throughend : {true, false}) + { + TTrack *previous{&Track}; + TTrack *current{throughend ? Track.trNext : Track.trPrev}; + while (continues(current) && std::find(run.begin(), run.end(), current) == run.end()) + { + if (throughend) + run.push_back(current); + else + run.push_front(current); + auto *next{current->trPrev == previous ? current->trNext : current->trPrev}; + previous = current; + current = next; + } + } + + double low{0.0}, high{0.0}; + glm::dvec3 lowpoint{origin}, highpoint{origin}; + for (auto *track : run) + { + for (auto const index : {segment_data::point::start, segment_data::point::end}) + { + auto const &point{track->m_paths.front().points[index]}; + auto const along{glm::dot(plan(point - origin), direction)}; + if (along < low) + { + low = along; + lowpoint = point; + } + if (along > high) + { + high = along; + highpoint = point; + } + } + } + result.tracks.assign(run.begin(), run.end()); + result.start = lowpoint; + result.end = highpoint; + result.direction = direction; + result.length = high - low; + result.grade = result.length > 0.0 ? (highpoint.y - lowpoint.y) / result.length : 0.0; + auto azimuth{glm::degrees(std::atan2(direction.x, direction.y))}; + if (azimuth < 0.0) + azimuth += 360.0; + result.azimuth = azimuth; + return result; +} + +std::vector editor_track::find_straights(double const Minimumlength, straight_tolerance const &Tolerance) +{ + std::vector result; + std::unordered_set visited; + for (auto *track : simulation::Paths.sequence()) + { + if (track == nullptr || track->m_editorremoved || visited.count(track) > 0 || false == is_straight(*track, Tolerance)) + continue; + auto line{find_straight(*track, Tolerance)}; + for (auto const *member : line.tracks) + visited.insert(member); + if (line.length >= Minimumlength) + result.push_back(std::move(line)); + } + std::sort(result.begin(), result.end(), [](straight const &A, straight const &B) { return A.length > B.length; }); + return result; +} + std::vector editor_track::relay(chain const &Chain, std::vector const &Pieces) { std::vector created; diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index 267c0c032..1ed25cae6 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -95,6 +95,25 @@ class editor_track double radius{0.0}; }; static bool find_chain(TTrack *From, TTrack *To, chain &Chain, std::string &Error); + + struct straight + { + std::vector tracks; + glm::dvec3 start{0.0}; + glm::dvec3 end{0.0}; + glm::dvec2 direction{0.0, 1.0}; + double length{0.0}; + double grade{0.0}; + double azimuth{0.0}; + }; + struct straight_tolerance + { + double angle{0.0002}; + double offset{0.02}; + }; + static bool is_straight(TTrack const &Track, straight_tolerance const &Tolerance); + static straight find_straight(TTrack &Track, straight_tolerance const &Tolerance); + static std::vector find_straights(double const Minimumlength, straight_tolerance const &Tolerance); static std::vector relay(chain const &Chain, std::vector const &Pieces); static void retire(TTrack &Track); static void revive(TTrack &Track); From 78c4b9f6df3b7cc14d12c3cf1da5fd925f6debce Mon Sep 17 00:00:00 2001 From: maj00r Date: Fri, 2 Oct 2026 22:47:29 +0200 Subject: [PATCH 048/430] feat(editor): add orthographic top view toggle --- application/editormode.cpp | 59 +++++++++++++++++++++++++++++---- application/editormode.h | 8 ++--- application/editormodetrack.cpp | 13 +++----- rendering/opengl33renderer.cpp | 14 ++++++++ utilities/Globals.h | 2 ++ 5 files changed, 77 insertions(+), 19 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 063f46cbe..4e7fb1c2f 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -1431,9 +1431,8 @@ void editor_mode::draw_orthophoto() Camera.SetMatrix(viewmatrix); glm::mat4 const view = glm::mat4(glm::mat3(viewmatrix)); ImGuiIO const &io = ImGui::GetIO(); - float const fovy = glm::radians(Global.FieldOfView / Global.ZoomFactor); float const aspect = io.DisplaySize.y > 0.0f ? io.DisplaySize.x / io.DisplaySize.y : 1.0f; - m_orthophoto.draw(glm::perspective(fovy, aspect, 0.1f, 10000.0f) * view, Camera.Pos, io.DisplaySize.x, io.DisplaySize.y); + m_orthophoto.draw(editor_mode::projection_matrix(aspect) * view, Camera.Pos, io.DisplaySize.x, io.DisplaySize.y); } editor_terrain *editor_mode::terrain_at(double X, double Z) @@ -2107,9 +2106,8 @@ void editor_mode::draw_area_fill_outline() const ImGuiIO const &io = ImGui::GetIO(); glm::mat4 const view = GfxRenderer->Camera_View_Matrix(); glm::dvec3 const camerapos = GfxRenderer->Camera_Position(); - float const fovy = glm::radians(Global.FieldOfView / Global.ZoomFactor); float const aspect = io.DisplaySize.y > 0.0f ? io.DisplaySize.x / io.DisplaySize.y : 1.0f; - glm::mat4 const viewprojection = glm::perspective(fovy, aspect, 0.1f, 10000.0f) * view; + glm::mat4 const viewprojection = editor_mode::projection_matrix(aspect) * view; auto const to_clip = [&](glm::dvec3 const &Point) { return viewprojection * glm::vec4(glm::vec3(Point - camerapos), 1.0f); }; auto const to_screen = [&](glm::vec4 const &Clip) { @@ -2198,6 +2196,14 @@ void editor_mode::render_area_fill() void editor_mode::render_gizmo_options() { + if (ImGui::Button(Global.EditorOrtho ? "3D view (O)" : "Top view, orthographic (O)")) + toggle_ortho(); + if (Global.EditorOrtho) + { + ImGui::SameLine(); + ImGui::SetNextItemWidth(120.0f); + ImGui::SliderFloat("Extent (m), wheel", &Global.EditorOrthoExtent, 5.0f, 5000.0f, "%.0f", 3.0f); + } ImGui::Checkbox("Enabled", &m_gizmo_enabled); if (!m_gizmo_enabled) return; @@ -2265,7 +2271,7 @@ void editor_mode::render_gizmo() } ImGuizmo::BeginFrame(); - ImGuizmo::SetOrthographic(false); + ImGuizmo::SetOrthographic(Global.EditorOrtho); ImGuiIO const &io = ImGui::GetIO(); ImGuizmo::SetRect(0.0f, 0.0f, io.DisplaySize.x, io.DisplaySize.y); @@ -2278,9 +2284,8 @@ void editor_mode::render_gizmo() // the engine's own projection bakes in reverse-Z (and screen orientation), which ImGuizmo // doesn't expect; rebuild a clean, standard perspective that matches the rendered view. // for the main viewport the engine uses a symmetric frustum with this exact fov/aspect. - float const fovy = glm::radians(Global.FieldOfView / Global.ZoomFactor); float const aspect = io.DisplaySize.y > 0.0f ? io.DisplaySize.x / io.DisplaySize.y : 1.0f; - glm::mat4 const projection = glm::perspective(fovy, aspect, 0.1f, 10000.0f); + glm::mat4 const projection = editor_mode::projection_matrix(aspect); if (!m_node) { @@ -2462,9 +2467,46 @@ void editor_mode::render_include_gizmo(glm::mat4 const &View, glm::mat4 const &P apply_include(); } +glm::mat4 editor_mode::projection_matrix(float const Aspect) +{ + if (Global.EditorOrtho) + { + auto const height{Global.EditorOrthoExtent}; + return glm::ortho(-height * Aspect, height * Aspect, -height, height, -10000.0f, 10000.0f); + } + return glm::perspective(glm::radians(Global.FieldOfView / Global.ZoomFactor), Aspect, 0.1f, 10000.0f); +} + +void editor_mode::toggle_ortho() +{ + Global.EditorOrtho = !Global.EditorOrtho; + if (Global.EditorOrtho) + { + m_ortho_pitch = Camera.Angle.x; + Camera.Angle.x = -M_PI_2; + Camera.Angle.z = 0.0; + } + else + { + Camera.Angle.x = m_ortho_pitch; + } +} + +void editor_mode::on_scroll(double const Xoffset, double const Yoffset) +{ + if (false == Global.EditorOrtho || ImGui::GetIO().WantCaptureMouse) + return; + Global.EditorOrthoExtent = std::clamp(Global.EditorOrthoExtent * static_cast(std::pow(0.85, Yoffset)), 5.0f, 5000.0f); +} + void editor_mode::update_camera(double const Deltatime) { Camera.Update(); + if (Global.EditorOrtho) + { + Camera.Angle.x = -M_PI_2; + Camera.Angle.z = 0.0; + } // focus animation runs after Camera.Update() so it overrides any residual velocity/rotation; // it smoothly drives both position and orientation toward the framed object @@ -2544,6 +2586,8 @@ void editor_mode::exit() m_track_point = {}; m_route = {}; m_route_gizmo_using = false; + if (Global.EditorOrtho) + toggle_ortho(); g_redo.clear(); m_history.clear(); @@ -2588,6 +2632,7 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in bool handled = true; switch (Key) { + case GLFW_KEY_O: toggle_ortho(); break; case GLFW_KEY_Q: m_gizmo_op = gizmo_operation::translate; break; case GLFW_KEY_W: m_gizmo_op = gizmo_operation::rotate; break; case GLFW_KEY_E: m_gizmo_op = gizmo_operation::scale; break; diff --git a/application/editormode.h b/application/editormode.h index b08857181..67019ad64 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -50,10 +50,7 @@ class editor_mode : public application_mode void on_key(int Key, int Scancode, int Action, int Mods) override; void on_cursor_pos(double Horizontal, double Vertical) override; void on_mouse_button(int Button, int Action, int Mods) override; - void on_scroll(double const Xoffset, double const Yoffset) override - { - ; - } + void on_scroll(double const Xoffset, double const Yoffset) override; void on_window_resize(int w, int h) override { ; @@ -64,6 +61,8 @@ class editor_mode : public application_mode static bool focus_active(); static void set_focus_active(bool isActive); static TCamera& get_camera() { return Camera; } + static glm::mat4 projection_matrix(float const Aspect); + void toggle_ortho(); static bool change_history() { return m_change_history; } static void set_change_history(bool enabled) { m_change_history = enabled; } static bool settings_open() { return m_settings_open; } @@ -148,6 +147,7 @@ class editor_mode : public application_mode static bool m_change_history; static bool m_settings_open; + double m_ortho_pitch{0.0}; // camera fly-mode (right mouse button held); used to flush motion when it's released command_relay m_camera_relay; bool m_camera_flying{false}; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 4799ce626..1c8c55e8b 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -36,9 +36,8 @@ class screen_projection ImGuiIO const &io = ImGui::GetIO(); m_size = io.DisplaySize; m_camera = GfxRenderer->Camera_Position(); - float const fovy = glm::radians(Global.FieldOfView / Global.ZoomFactor); float const aspect = m_size.y > 0.0f ? m_size.x / m_size.y : 1.0f; - m_viewprojection = glm::perspective(fovy, aspect, 0.1f, 10000.0f) * GfxRenderer->Camera_View_Matrix(); + m_viewprojection = editor_mode::projection_matrix(aspect) * GfxRenderer->Camera_View_Matrix(); } glm::vec4 clip(glm::dvec3 const &Point) const @@ -244,15 +243,14 @@ void editor_mode::render_track_gizmo() bool const pointmode = ui()->mode() == nodebank_panel::TRACK && m_track_point.valid() && m_track_point.path < static_cast(track->m_paths.size()); ImGuizmo::BeginFrame(); - ImGuizmo::SetOrthographic(false); + ImGuizmo::SetOrthographic(Global.EditorOrtho); ImGuiIO const &io = ImGui::GetIO(); ImGuizmo::SetRect(0.0f, 0.0f, io.DisplaySize.x, io.DisplaySize.y); glm::mat4 const view = GfxRenderer->Camera_View_Matrix(); glm::dvec3 const camerapos = GfxRenderer->Camera_Position(); - float const fovy = glm::radians(Global.FieldOfView / Global.ZoomFactor); float const aspect = io.DisplaySize.y > 0.0f ? io.DisplaySize.x / io.DisplaySize.y : 1.0f; - glm::mat4 const projection = glm::perspective(fovy, aspect, 0.1f, 10000.0f); + glm::mat4 const projection = editor_mode::projection_matrix(aspect); ImGuizmo::OPERATION const operation = (false == pointmode && m_gizmo_op == gizmo_operation::rotate) ? ImGuizmo::ROTATE_Y : ImGuizmo::TRANSLATE; @@ -869,14 +867,13 @@ void editor_mode::render_route_gizmo() } ImGuizmo::BeginFrame(); - ImGuizmo::SetOrthographic(false); + ImGuizmo::SetOrthographic(Global.EditorOrtho); ImGuiIO const &io = ImGui::GetIO(); ImGuizmo::SetRect(0.0f, 0.0f, io.DisplaySize.x, io.DisplaySize.y); glm::mat4 const view = GfxRenderer->Camera_View_Matrix(); glm::dvec3 const camerapos = GfxRenderer->Camera_Position(); - float const fovy = glm::radians(Global.FieldOfView / Global.ZoomFactor); float const aspect = io.DisplaySize.y > 0.0f ? io.DisplaySize.x / io.DisplaySize.y : 1.0f; - glm::mat4 const projection = glm::perspective(fovy, aspect, 0.1f, 10000.0f); + glm::mat4 const projection = editor_mode::projection_matrix(aspect); auto const position{route_vertex_position(route.vertex)}; if (false == m_route_gizmo_using) diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index c07efca45..767618a16 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -1593,6 +1593,13 @@ void opengl33_renderer::setup_pass(viewport_config &Viewport, renderpass_config auto const znear = ( Znear > 1.f ? Znear : Znear > 0.f ? Znear * zfar : 0.1f * Global.ZoomFactor); camera.projection() = perspective_projection(Viewport.projection, znear, zfar, frustumtest_proj); + if (EditorModeFlag && Global.EditorOrtho && Viewport.main) + { + auto const height{Global.EditorOrthoExtent}; + auto const width{height * Global.window_size.x / std::max(1.f, static_cast(Global.window_size.y))}; + camera.projection() = ortho_projection(-width, width, -height, height, -zfar, zfar); + frustumtest_proj = ortho_frustumtest_projection(-width, width, -height, height, -zfar, zfar); + } break; } case rendermode::shadows: @@ -1692,6 +1699,13 @@ void opengl33_renderer::setup_pass(viewport_config &Viewport, renderpass_config } camera.projection() = perspective_projection(proj, znear, zfar, frustumtest_proj); + if (EditorModeFlag && Global.EditorOrtho && Viewport.main) + { + auto const height{Global.EditorOrthoExtent}; + auto const width{height * Global.window_size.x / std::max(1.f, static_cast(Global.window_size.y))}; + camera.projection() = ortho_projection(-width, width, -height, height, -zfar, zfar); + frustumtest_proj = ortho_frustumtest_projection(-width, width, -height, height, -zfar, zfar); + } break; } case rendermode::reflections: diff --git a/utilities/Globals.h b/utilities/Globals.h index 800737f61..b7c20f690 100644 --- a/utilities/Globals.h +++ b/utilities/Globals.h @@ -168,6 +168,8 @@ struct global_settings { bool bUseVBO{ true }; // czy jest VBO w karcie graficznej (czy użyć) float AnisotropicFiltering{ 8.f }; // requested level of anisotropic filtering. TODO: move it to renderer object float FieldOfView{ 45.f }; // vertical field of view for the camera. TODO: move it to the renderer + bool EditorOrtho{ false }; + float EditorOrthoExtent{ 150.f }; GLint iMaxTextureSize{ 4096 }; // maksymalny rozmiar tekstury GLint iMaxCabTextureSize{ 4096 }; // largest allowed texture in vehicle cab int iMultisampling{ 2 }; // tryb antyaliasingu: 0=brak,1=2px,2=4px,3=8px,4=16px From 9198840d0f6d5059e656670ed802274c18459bf3 Mon Sep 17 00:00:00 2001 From: maj00r Date: Fri, 2 Oct 2026 22:52:25 +0200 Subject: [PATCH 049/430] feat(editor): straights include switches, drag to edit --- application/editormode.cpp | 9 +- application/editormode.h | 18 ++ application/editormodetrack.cpp | 216 +++++++++++++++++++++ editor/editorTrack.cpp | 326 +++++++++++++++++++++++++++----- editor/editorTrack.hpp | 3 + 5 files changed, 528 insertions(+), 44 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 4e7fb1c2f..624285c31 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -2252,6 +2252,12 @@ void editor_mode::render_gizmo() return; } + if (straights_active()) + { + render_straight_gizmo(); + return; + } + if (route_active()) { render_route_gizmo(); @@ -2738,6 +2744,7 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in { m_track_point = {}; m_route.vertex = -1; + m_straights.handle = -1; } break; @@ -2831,7 +2838,7 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const if (mode == nodebank_panel::TRACK) { - if (false == ImGuizmo::IsOver() && false == pick_route_vertex() && false == pick_track_handle()) + if (false == ImGuizmo::IsOver() && false == pick_route_vertex() && false == pick_straight_handle() && false == pick_track_handle()) { GfxRenderer->Pick_Node_Callback([this](scene::basic_node *node) { if (viewport_click()) diff --git a/application/editormode.h b/application/editormode.h index 67019ad64..42eb590fa 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -331,10 +331,28 @@ class editor_mode : public application_mode editor_track::straight a; editor_track::straight b; char filter[32]{}; + int handle{-1}; + bool dragging{false}; + editor_track::straight drag_line; + std::vector> drag_states; + glm::dvec3 preview_start{0.0}; + glm::dvec3 preview_end{0.0}; + glm::mat4 gizmo{1.0f}; + glm::dvec3 edit_start{0.0}; + glm::dvec3 edit_end{0.0}; + double edit_length{0.0}; + double edit_azimuth{0.0}; + double distance{4.0}; + std::string status; }; void render_straights_ui(); void draw_straights_overlay() const; editor_track::straight const ¤t_straight(); + bool straights_active(); + bool pick_straight_handle(); + void render_straight_gizmo(); + void straight_apply(editor_track::straight const &Line, glm::dvec3 const &Start, glm::dvec3 const &End); + void straight_refresh(); straights_state m_straights; enum class track_tab { straights, route, path }; track_tab m_track_tab{track_tab::straights}; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 1c8c55e8b..5e412fa8a 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -1124,6 +1124,7 @@ editor_track::straight const &editor_mode::current_straight() if (track != m_straights.current_for) { m_straights.current_for = track; + m_straights.handle = -1; m_straights.current = track != nullptr ? editor_track::find_straight(*track, m_straights.tolerance) : editor_track::straight{}; } return m_straights.current; @@ -1158,6 +1159,27 @@ void editor_mode::draw_straights_overlay() const draw(line, i == m_straights.listed ? IM_COL32(40, 220, 255, 255) : IM_COL32(255, 255, 255, 110), i == m_straights.listed ? 4.0f : 2.0f); } draw(m_straights.current, IM_COL32(40, 220, 255, 255), 4.0f); + if (m_straights.dragging) + { + projection.line(drawlist, m_straights.preview_start, m_straights.preview_end, IM_COL32(255, 210, 60, 255), 3.0f); + } + else if (false == m_straights.current.tracks.empty()) + { + auto const &line{m_straights.current}; + glm::dvec3 const handles[] = {line.start, line.end, (line.start + line.end) * 0.5}; + for (int i = 0; i < 3; ++i) + { + ImVec2 screen; + if (false == projection.project(handles[i], screen)) + continue; + if (i < 2) + drawlist->AddRectFilled(ImVec2(screen.x - 6.0f, screen.y - 6.0f), ImVec2(screen.x + 6.0f, screen.y + 6.0f), IM_COL32(40, 220, 255, 255)); + else + drawlist->AddCircleFilled(screen, 6.0f, IM_COL32(40, 220, 255, 255), 4); + if (i == m_straights.handle) + drawlist->AddCircle(screen, 12.0f, IM_COL32(255, 255, 255, 255), 16, 2.5f); + } + } draw(m_straights.a, IM_COL32(60, 230, 90, 255), 5.0f); draw(m_straights.b, IM_COL32(255, 60, 255, 255), 5.0f); if (false == m_straights.a.tracks.empty() && false == m_straights.b.tracks.empty()) @@ -1240,7 +1262,41 @@ void editor_mode::render_straights_ui() ImGui::SameLine(); if (ImGui::Button("Set as B")) state.b = line; + + if (false == ImGui::IsAnyItemActive()) + { + state.edit_start = line.start; + state.edit_end = line.end; + state.edit_length = line.length; + state.edit_azimuth = line.azimuth; + } + ImGui::TextDisabled("Drag the ends or the middle of the straight with the gizmo, or enter the values"); + ImGui::PushItemWidth(260.0f); + ImGui::InputScalarN("Start (x, y, z)", ImGuiDataType_Double, glm::value_ptr(state.edit_start), 3, nullptr, nullptr, "%.3f"); + ImGui::InputScalarN("End (x, y, z)", ImGuiDataType_Double, glm::value_ptr(state.edit_end), 3, nullptr, nullptr, "%.3f"); + ImGui::PopItemWidth(); + if (ImGui::Button("Apply ends")) + straight_apply(line, state.edit_start, state.edit_end); + ImGui::PushItemWidth(120.0f); + ImGui::InputDouble("Length (m)", &state.edit_length, 0.0, 0.0, "%.3f"); + ImGui::SameLine(); + if (ImGui::Button("Set length from the start")) + { + glm::dvec3 const direction{line.direction.x, line.grade, line.direction.y}; + straight_apply(line, line.start, line.start + direction * std::max(0.1, state.edit_length)); + } + ImGui::InputDouble("Azimuth (deg)", &state.edit_azimuth, 0.0, 0.0, "%.5f"); + ImGui::SameLine(); + if (ImGui::Button("Turn around the start")) + { + auto const azimuth{glm::radians(state.edit_azimuth)}; + glm::dvec3 const direction{std::sin(azimuth), line.grade, std::cos(azimuth)}; + straight_apply(line, line.start, line.start + direction * line.length); + } + ImGui::PopItemWidth(); } + if (false == state.status.empty()) + ImGui::TextColored(ImVec4(1.0f, 0.35f, 0.3f, 1.0f), "%s", state.status.c_str()); ImGui::Separator(); auto const &a{state.a}; @@ -1270,4 +1326,164 @@ void editor_mode::render_straights_ui() ImGui::Text("Height of B above A: start %.3f m, end %.3f m", height(b.start), height(b.end)); ImGui::Text("Grade difference: %.2f per mille", (b.grade * (dot < 0.0 ? -1.0 : 1.0) - a.grade) * 1000.0); ImGui::Text("Overlap along A: %.2f m", std::max(0.0, to - from)); + + ImGui::PushItemWidth(120.0f); + ImGui::InputDouble("Distance (m)", &state.distance, 0.0, 0.0, "%.3f"); + ImGui::PopItemWidth(); + ImGui::SameLine(); + if (ImGui::Button("Make B parallel to A at this distance")) + { + auto const side{(startoffset + endoffset) >= 0.0 ? 1.0 : -1.0}; + glm::dvec2 const direction{a.direction * (dot < 0.0 ? -1.0 : 1.0)}; + glm::dvec2 const normal{-a.direction.y, a.direction.x}; + auto const startalong{along(b.start)}; + auto const start2d{glm::dvec2{a.start.x, a.start.z} + a.direction * startalong + normal * (side * std::abs(state.distance))}; + auto const end2d{start2d + direction * b.length}; + straight_apply(b, {start2d.x, b.start.y, start2d.y}, {end2d.x, b.end.y, end2d.y}); + } +} + +bool editor_mode::straights_active() +{ + return ui()->mode() == nodebank_panel::TRACK && m_track_tab == track_tab::straights && false == current_straight().tracks.empty(); +} + +bool editor_mode::pick_straight_handle() +{ + if (false == straights_active()) + return false; + auto const &line{current_straight()}; + glm::dvec3 const handles[] = {line.start, line.end, (line.start + line.end) * 0.5}; + screen_projection const projection; + ImVec2 const mouse = ImGui::GetIO().MousePos; + float best = kHandleRadius * kHandleRadius; + int hit{-1}; + for (int i = 0; i < 3; ++i) + { + ImVec2 screen; + if (false == projection.project(handles[i], screen)) + continue; + float const dx = screen.x - mouse.x; + float const dy = screen.y - mouse.y; + if (dx * dx + dy * dy < best) + { + best = dx * dx + dy * dy; + hit = i; + } + } + if (hit < 0) + return false; + m_straights.handle = hit; + return true; +} + +void editor_mode::straight_refresh() +{ + auto &state{m_straights}; + state.current_for = nullptr; + for (auto *line : {&state.a, &state.b}) + if (false == line->tracks.empty()) + *line = editor_track::find_straight(*line->tracks.front(), state.tolerance); + for (auto &line : state.found) + if (false == line.tracks.empty()) + line = editor_track::find_straight(*line.tracks.front(), state.tolerance); +} + +void editor_mode::straight_apply(editor_track::straight const &Line, glm::dvec3 const &Start, glm::dvec3 const &End) +{ + auto &state{m_straights}; + state.status.clear(); + auto const tracks{editor_track::straight_affected(Line)}; + for (auto *track : tracks) + { + if (false == track->Dynamics.empty()) + { + state.status = "There are vehicles placed on path " + track->name(); + return; + } + } + std::vector> states; + for (auto *track : tracks) + states.emplace_back(track, editor_track::capture(*track)); + push_track_snapshot(std::move(states)); + editor_track::move_straight(Line, Start, End); + editor_track::commit(tracks); + straight_refresh(); +} + +void editor_mode::render_straight_gizmo() +{ + auto &state{m_straights}; + auto const &line{state.dragging ? state.drag_line : current_straight()}; + if (state.handle < 0 || line.tracks.empty() || false == m_gizmo_enabled) + { + state.dragging = false; + return; + } + + ImGuizmo::BeginFrame(); + ImGuizmo::SetOrthographic(Global.EditorOrtho); + ImGuiIO const &io = ImGui::GetIO(); + ImGuizmo::SetRect(0.0f, 0.0f, io.DisplaySize.x, io.DisplaySize.y); + glm::mat4 const view = GfxRenderer->Camera_View_Matrix(); + glm::dvec3 const camerapos = GfxRenderer->Camera_Position(); + float const aspect = io.DisplaySize.y > 0.0f ? io.DisplaySize.x / io.DisplaySize.y : 1.0f; + glm::mat4 const projection = editor_mode::projection_matrix(aspect); + + glm::dvec3 const anchors[] = {line.start, line.end, (line.start + line.end) * 0.5}; + auto const anchor{anchors[state.handle]}; + if (false == state.dragging) + state.gizmo = glm::translate(glm::mat4(1.0f), glm::vec3(anchor - camerapos)); + glm::vec3 snapvalue(m_gizmo_snap); + float const *snap = Global.ctrlState && snapvalue.x > 0.0f ? glm::value_ptr(snapvalue) : nullptr; + ImGuizmo::Manipulate(glm::value_ptr(view), glm::value_ptr(projection), ImGuizmo::TRANSLATE, ImGuizmo::WORLD, glm::value_ptr(state.gizmo), nullptr, snap); + + if (ImGuizmo::IsUsing()) + { + if (false == state.dragging) + { + auto const tracks{editor_track::straight_affected(line)}; + if (std::any_of(tracks.begin(), tracks.end(), [](TTrack const *Track) { return false == Track->Dynamics.empty(); })) + { + state.status = "There are vehicles placed on the straight or the paths attached to it"; + return; + } + state.dragging = true; + state.drag_line = line; + state.drag_states.clear(); + for (auto *track : tracks) + state.drag_states.emplace_back(track, editor_track::capture(*track)); + push_track_snapshot(state.drag_states); + m_track_drag = tracks; + } + auto const &original{state.drag_line}; + glm::dvec3 const moved{camerapos + glm::dvec3(state.gizmo[3])}; + auto start{original.start}; + auto end{original.end}; + if (state.handle == 0) + start = moved; + else if (state.handle == 1) + end = moved; + else + { + auto const offset{moved - (original.start + original.end) * 0.5}; + start += offset; + end += offset; + } + state.preview_start = start; + state.preview_end = end; + for (auto const &entry : state.drag_states) + editor_track::apply(*entry.first, entry.second); + editor_track::move_straight(original, start, end); + m_track_dirty = true; + commit_track_drag(false); + } + else if (state.dragging) + { + commit_track_drag(true); + state.dragging = false; + m_track_drag.clear(); + state.drag_states.clear(); + straight_refresh(); + } } diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index ca17787a6..81ed916f6 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -773,76 +773,161 @@ bool editor_track::find_chain(TTrack *From, TTrack *To, chain &Chain, std::strin return true; } -bool editor_track::is_straight(TTrack const &Track, straight_tolerance const &Tolerance) +namespace { - if (Track.eType != tt_Normal || false == is_supported(Track) || Track.m_paths.empty()) - return false; - auto const &path{Track.m_paths.front()}; - glm::dvec2 const start{path.points[segment_data::point::start].x, path.points[segment_data::point::start].z}; - glm::dvec2 const end{path.points[segment_data::point::end].x, path.points[segment_data::point::end].z}; - auto const length{glm::distance(start, end)}; + +glm::dvec2 plan_of(glm::dvec3 const &Point) +{ + return {Point.x, Point.z}; +} + +glm::dvec2 turned(glm::dvec2 const &Vector, double const Angle) +{ + auto const c{std::cos(Angle)}; + auto const s{std::sin(Angle)}; + return {Vector.x * c - Vector.y * s, Vector.x * s + Vector.y * c}; +} + +double lateral_of(glm::dvec2 const &Direction, glm::dvec2 const &Offset) +{ + return Direction.x * Offset.y - Direction.y * Offset.x; +} + +bool plan_straight(segment_data const &Path, double const Tolerance) +{ + auto const chord{plan_of(Path.points[segment_data::point::end] - Path.points[segment_data::point::start])}; + auto const length{glm::length(chord)}; if (length < 1e-3) return false; - auto const direction{(end - start) / length}; + auto const direction{chord / length}; for (auto const index : {segment_data::point::control1, segment_data::point::control2}) - { - auto const &control{path.points[index]}; - glm::dvec2 const offset{control.x, control.z}; - if (std::abs(direction.x * offset.y - direction.y * offset.x) > Tolerance.offset) + if (std::abs(lateral_of(direction, plan_of(Path.points[index]))) > Tolerance) return false; - } return true; } +TTrack *neighbour_at(TTrack const &Track, int const Path, bool const Atend) +{ + if (has_switch_paths(Track)) + return Atend ? Track.SwitchExtension->pNexts[Path & 1] : Track.SwitchExtension->pPrevs[Path & 1]; + return Atend ? Track.trNext : Track.trPrev; +} + +void rigid_move(TTrack &Track, glm::dvec3 const &Pivot, glm::dvec3 const &Target, double const Angle) +{ + for (auto &path : Track.m_paths) + { + for (auto const index : {segment_data::point::start, segment_data::point::end}) + { + auto &point{path.points[index]}; + auto const moved{plan_of(Target) + turned(plan_of(point - Pivot), Angle)}; + point = {moved.x, point.y + Target.y - Pivot.y, moved.y}; + } + for (auto const index : {segment_data::point::control1, segment_data::point::control2}) + { + auto &control{path.points[index]}; + auto const moved{turned(plan_of(control), Angle)}; + control = {moved.x, control.y, moved.y}; + } + } +} + +void follow_joint(TTrack &Track, glm::dvec3 const &From, glm::dvec3 const &To, double const Angle) +{ + for (auto &path : Track.m_paths) + { + for (auto const atend : {false, true}) + { + auto &point{path.points[atend ? segment_data::point::end : segment_data::point::start]}; + if (glm::distance(point, From) > kSamePoint) + continue; + point = To; + auto &control{path.points[atend ? segment_data::point::control2 : segment_data::point::control1]}; + auto const moved{turned(plan_of(control), Angle)}; + control = {moved.x, control.y, moved.y}; + } + } +} + +} // namespace + +bool editor_track::is_straight(TTrack const &Track, straight_tolerance const &Tolerance) +{ + if (false == is_supported(Track) || Track.m_editorremoved) + return false; + return std::any_of(Track.m_paths.begin(), Track.m_paths.end(), [&](segment_data const &Path) { return plan_straight(Path, Tolerance.offset); }); +} + editor_track::straight editor_track::find_straight(TTrack &Track, straight_tolerance const &Tolerance) { straight result; if (false == is_straight(Track, Tolerance)) return result; - auto const plan = [](glm::dvec3 const &Point) { return glm::dvec2{Point.x, Point.z}; }; - auto const &first{Track.m_paths.front()}; + int firstpath{0}; + while (false == plan_straight(Track.m_paths[firstpath], Tolerance.offset)) + ++firstpath; + auto const &first{Track.m_paths[firstpath]}; auto const origin{first.points[segment_data::point::start]}; - auto const direction{glm::normalize(plan(first.points[segment_data::point::end] - origin))}; - auto const lateral = [&](glm::dvec3 const &Point) { - auto const offset{plan(Point - origin)}; - return std::abs(direction.x * offset.y - direction.y * offset.x); - }; - auto const continues = [&](TTrack const *Other) { - if (Other == nullptr || false == is_straight(*Other, Tolerance)) - return false; - auto const &path{Other->m_paths.front()}; - auto const otherdirection{glm::normalize(plan(path.points[segment_data::point::end] - path.points[segment_data::point::start]))}; - if (std::abs(direction.x * otherdirection.y - direction.y * otherdirection.x) > Tolerance.angle) - return false; - return lateral(path.points[segment_data::point::start]) <= Tolerance.offset && lateral(path.points[segment_data::point::end]) <= Tolerance.offset; + auto const direction{glm::normalize(plan_of(first.points[segment_data::point::end] - origin))}; + auto const lateral = [&](glm::dvec3 const &Point) { return std::abs(lateral_of(direction, plan_of(Point - origin))); }; + auto const accepts = [&](TTrack const *Other, glm::dvec3 const &Joint) { + if (Other == nullptr || false == is_supported(*Other) || Other->m_editorremoved) + return -1; + for (int i = 0; i < static_cast(Other->m_paths.size()); ++i) + { + auto const &path{Other->m_paths[i]}; + if (false == plan_straight(path, Tolerance.offset)) + continue; + auto const &start{path.points[segment_data::point::start]}; + auto const &end{path.points[segment_data::point::end]}; + if (glm::distance(start, Joint) > kSamePoint && glm::distance(end, Joint) > kSamePoint) + continue; + auto const otherdirection{glm::normalize(plan_of(end - start))}; + if (std::abs(lateral_of(direction, otherdirection)) > Tolerance.angle) + continue; + if (lateral(start) > Tolerance.offset || lateral(end) > Tolerance.offset) + continue; + return i; + } + return -1; }; - std::deque run{&Track}; - for (auto const throughend : {true, false}) + std::deque> run{{&Track, firstpath}}; + for (auto const forward : {true, false}) { - TTrack *previous{&Track}; - TTrack *current{throughend ? Track.trNext : Track.trPrev}; - while (continues(current) && std::find(run.begin(), run.end(), current) == run.end()) + TTrack *current{&Track}; + int path{firstpath}; + bool atend{forward}; + while (true) { - if (throughend) - run.push_back(current); + auto const &exit{current->m_paths[path].points[atend ? segment_data::point::end : segment_data::point::start]}; + auto *next{neighbour_at(*current, path, atend)}; + if (std::any_of(run.begin(), run.end(), [&](auto const &Member) { return Member.first == next; })) + break; + auto const nextpath{accepts(next, exit)}; + if (nextpath < 0) + break; + if (forward) + run.emplace_back(next, nextpath); else - run.push_front(current); - auto *next{current->trPrev == previous ? current->trNext : current->trPrev}; - previous = current; + run.emplace_front(next, nextpath); + atend = glm::distance(next->m_paths[nextpath].points[segment_data::point::start], exit) <= kSamePoint; current = next; + path = nextpath; } } double low{0.0}, high{0.0}; glm::dvec3 lowpoint{origin}, highpoint{origin}; - for (auto *track : run) + for (auto const &member : run) { + result.tracks.push_back(member.first); + result.paths.push_back(member.second); for (auto const index : {segment_data::point::start, segment_data::point::end}) { - auto const &point{track->m_paths.front().points[index]}; - auto const along{glm::dot(plan(point - origin), direction)}; + auto const &point{member.first->m_paths[member.second].points[index]}; + auto const along{glm::dot(plan_of(point - origin), direction)}; if (along < low) { low = along; @@ -855,7 +940,6 @@ editor_track::straight editor_track::find_straight(TTrack &Track, straight_toler } } } - result.tracks.assign(run.begin(), run.end()); result.start = lowpoint; result.end = highpoint; result.direction = direction; @@ -874,7 +958,7 @@ std::vector editor_track::find_straights(double const Mi std::unordered_set visited; for (auto *track : simulation::Paths.sequence()) { - if (track == nullptr || track->m_editorremoved || visited.count(track) > 0 || false == is_straight(*track, Tolerance)) + if (track == nullptr || visited.count(track) > 0 || false == is_straight(*track, Tolerance)) continue; auto line{find_straight(*track, Tolerance)}; for (auto const *member : line.tracks) @@ -886,6 +970,162 @@ std::vector editor_track::find_straights(double const Mi return result; } +std::vector editor_track::straight_affected(straight const &Line) +{ + std::vector result(Line.tracks.begin(), Line.tracks.end()); + auto const member = [&](TTrack const *Track) { return std::find(Line.tracks.begin(), Line.tracks.end(), Track) != Line.tracks.end(); }; + for (auto *track : Line.tracks) + { + for (int i = 0; i < static_cast(track->m_paths.size()); ++i) + { + for (auto const atend : {false, true}) + { + auto *neighbour{neighbour_at(*track, i, atend)}; + if (neighbour == nullptr || member(neighbour)) + continue; + add_unique(result, neighbour); + if (false == has_switch_paths(*neighbour)) + continue; + for (auto *next : neighbours(*neighbour)) + if (false == member(next)) + add_unique(result, next); + } + } + } + return result; +} + +void editor_track::move_straight(straight const &Line, glm::dvec3 const &Start, glm::dvec3 const &End) +{ + if (Line.tracks.empty() || Line.length < 1e-6) + return; + auto const &direction{Line.direction}; + auto const newplan{plan_of(End - Start)}; + auto const newlength{glm::length(newplan)}; + if (newlength < 1e-3) + return; + auto const newdirection{newplan / newlength}; + auto const angle{std::atan2(lateral_of(direction, newdirection), glm::dot(direction, newdirection))}; + auto const along = [&](glm::dvec3 const &Point) { return glm::dot(plan_of(Point - Line.start), direction); }; + + struct interval + { + double from, to; + bool rigid; + }; + std::vector intervals; + double rigidlength{0.0}; + for (std::size_t i = 0; i < Line.tracks.size(); ++i) + { + auto const &path{Line.tracks[i]->m_paths[Line.paths[i]]}; + auto const a{along(path.points[segment_data::point::start])}; + auto const b{along(path.points[segment_data::point::end])}; + auto const rigid{has_switch_paths(*Line.tracks[i])}; + intervals.push_back({std::min(a, b), std::max(a, b), rigid}); + if (rigid) + rigidlength += std::abs(b - a); + } + std::sort(intervals.begin(), intervals.end(), [](interval const &A, interval const &B) { return A.from < B.from; }); + auto const scale{Line.length - rigidlength > 1e-6 ? (newlength - rigidlength) / (Line.length - rigidlength) : 1.0}; + auto const remap = [&](double const Along) { + double mapped{0.0}, previous{0.0}; + for (auto const &span : intervals) + { + if (Along <= span.from) + return mapped + (Along - previous) * scale; + mapped += (span.from - previous) * scale; + previous = span.from; + auto const factor{span.rigid ? 1.0 : scale}; + if (Along <= span.to) + return mapped + (Along - previous) * factor; + mapped += (span.to - previous) * factor; + previous = span.to; + } + return mapped + (Along - previous) * scale; + }; + auto const transform = [&](glm::dvec3 const &Point) { + auto const a{along(Point)}; + auto const offset{lateral_of(direction, plan_of(Point - Line.start))}; + auto const mapped{remap(a)}; + auto const oldheight{Line.start.y + (Line.end.y - Line.start.y) * a / Line.length}; + auto const newheight{Start.y + (End.y - Start.y) * mapped / newlength}; + auto const moved{plan_of(Start) + newdirection * mapped + glm::dvec2{-newdirection.y, newdirection.x} * offset}; + return glm::dvec3{moved.x, Point.y - oldheight + newheight, moved.y}; + }; + + auto const member = [&](TTrack const *Track) { return std::find(Line.tracks.begin(), Line.tracks.end(), Track) != Line.tracks.end(); }; + std::vector> joints; + for (std::size_t i = 0; i < Line.tracks.size(); ++i) + { + auto &track{*Line.tracks[i]}; + auto const before{track.m_paths}; + if (has_switch_paths(track)) + { + auto const pivot{before[Line.paths[i]].points[segment_data::point::start]}; + rigid_move(track, pivot, transform(pivot), angle); + } + else + { + for (auto &path : track.m_paths) + { + for (auto const index : {segment_data::point::start, segment_data::point::end}) + path.points[index] = transform(path.points[index]); + for (auto const index : {segment_data::point::control1, segment_data::point::control2}) + { + auto &control{path.points[index]}; + auto const moved{turned(plan_of(control), angle) * scale}; + control = {moved.x, control.y * scale, moved.y}; + } + } + } + for (std::size_t j = 0; j < before.size(); ++j) + for (auto const index : {segment_data::point::start, segment_data::point::end}) + joints.emplace_back(before[j].points[index], track.m_paths[j].points[index]); + } + + std::vector moved; + for (auto *track : Line.tracks) + { + for (int i = 0; i < static_cast(track->m_paths.size()); ++i) + { + for (auto const atend : {false, true}) + { + auto *neighbour{neighbour_at(*track, i, atend)}; + if (neighbour == nullptr || member(neighbour) || std::find(moved.begin(), moved.end(), neighbour) != moved.end()) + continue; + moved.push_back(neighbour); + for (auto const &joint : joints) + { + bool touches{false}; + for (auto const &path : neighbour->m_paths) + for (auto const index : {segment_data::point::start, segment_data::point::end}) + touches |= glm::distance(path.points[index], joint.first) <= kSamePoint; + if (false == touches) + continue; + if (has_switch_paths(*neighbour)) + { + auto const before{neighbour->m_paths}; + rigid_move(*neighbour, joint.first, joint.second, angle); + for (auto *next : neighbours(*neighbour)) + { + if (member(next) || next == neighbour) + continue; + for (std::size_t j = 0; j < before.size(); ++j) + for (auto const index : {segment_data::point::start, segment_data::point::end}) + follow_joint(*next, before[j].points[index], neighbour->m_paths[j].points[index], angle); + } + } + else + { + follow_joint(*neighbour, joint.first, joint.second, angle); + } + break; + } + } + } + } +} + std::vector editor_track::relay(chain const &Chain, std::vector const &Pieces) { std::vector created; diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index 1ed25cae6..d58e7f366 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -99,6 +99,7 @@ class editor_track struct straight { std::vector tracks; + std::vector paths; glm::dvec3 start{0.0}; glm::dvec3 end{0.0}; glm::dvec2 direction{0.0, 1.0}; @@ -114,6 +115,8 @@ class editor_track static bool is_straight(TTrack const &Track, straight_tolerance const &Tolerance); static straight find_straight(TTrack &Track, straight_tolerance const &Tolerance); static std::vector find_straights(double const Minimumlength, straight_tolerance const &Tolerance); + static std::vector straight_affected(straight const &Line); + static void move_straight(straight const &Line, glm::dvec3 const &Start, glm::dvec3 const &End); static std::vector relay(chain const &Chain, std::vector const &Pieces); static void retire(TTrack &Track); static void revive(TTrack &Track); From 90f03849c0041db96cf5a102747f0794f6403e32 Mon Sep 17 00:00:00 2001 From: maj00r Date: Fri, 2 Oct 2026 22:53:04 +0200 Subject: [PATCH 050/430] fix(editor): keep straight handle selected after drag --- application/editormodetrack.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 5e412fa8a..f02ca0188 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -1380,7 +1380,8 @@ bool editor_mode::pick_straight_handle() void editor_mode::straight_refresh() { auto &state{m_straights}; - state.current_for = nullptr; + state.current_for = selected_track(); + state.current = state.current_for != nullptr ? editor_track::find_straight(*state.current_for, state.tolerance) : editor_track::straight{}; for (auto *line : {&state.a, &state.b}) if (false == line->tracks.empty()) *line = editor_track::find_straight(*line->tracks.front(), state.tolerance); From b986cc899005607654872f27e09f9b2863be244a Mon Sep 17 00:00:00 2001 From: maj00r Date: Fri, 2 Oct 2026 22:59:55 +0200 Subject: [PATCH 051/430] feat(editor): move straights keeping parallel --- application/editormode.h | 4 ++ application/editormodetrack.cpp | 111 ++++++++++++++++++++++++++------ editor/editorTrack.cpp | 28 ++++++-- editor/editorTrack.hpp | 6 +- 4 files changed, 123 insertions(+), 26 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index 42eb590fa..8f7107a12 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -334,6 +334,8 @@ class editor_mode : public application_mode int handle{-1}; bool dragging{false}; editor_track::straight drag_line; + std::vector set; + std::vector drag_lines; std::vector> drag_states; glm::dvec3 preview_start{0.0}; glm::dvec3 preview_end{0.0}; @@ -352,6 +354,8 @@ class editor_mode : public application_mode bool pick_straight_handle(); void render_straight_gizmo(); void straight_apply(editor_track::straight const &Line, glm::dvec3 const &Start, glm::dvec3 const &End); + void straights_apply(std::vector const &Lines, std::vector> const &Ends); + bool in_straight_set(editor_track::straight const &Line) const; void straight_refresh(); straights_state m_straights; enum class track_tab { straights, route, path }; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index f02ca0188..41804b448 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -24,6 +24,7 @@ http: #include #include #include +#include namespace { @@ -1158,10 +1159,19 @@ void editor_mode::draw_straights_overlay() const if (nearby(line)) draw(line, i == m_straights.listed ? IM_COL32(40, 220, 255, 255) : IM_COL32(255, 255, 255, 110), i == m_straights.listed ? 4.0f : 2.0f); } + for (auto const &member : m_straights.set) + draw(member, IM_COL32(255, 150, 30, 255), 4.0f); draw(m_straights.current, IM_COL32(40, 220, 255, 255), 4.0f); if (m_straights.dragging) { - projection.line(drawlist, m_straights.preview_start, m_straights.preview_end, IM_COL32(255, 210, 60, 255), 3.0f); + for (auto const &member : m_straights.drag_lines) + { + for (auto const *track : member.tracks) + { + auto const &path{track->m_paths.front()}; + projection.line(drawlist, path.points[segment_data::point::start], path.points[segment_data::point::end], IM_COL32(255, 210, 60, 255), 3.0f); + } + } } else if (false == m_straights.current.tracks.empty()) { @@ -1262,6 +1272,16 @@ void editor_mode::render_straights_ui() ImGui::SameLine(); if (ImGui::Button("Set as B")) state.b = line; + ImGui::SameLine(); + if (in_straight_set(line)) + { + if (ImGui::Button("Remove from the set")) + state.set.erase(std::remove_if(state.set.begin(), state.set.end(), [&](editor_track::straight const &Member) { return std::any_of(line.tracks.begin(), line.tracks.end(), [&](TTrack const *Track) { return std::find(Member.tracks.begin(), Member.tracks.end(), Track) != Member.tracks.end(); }); }), state.set.end()); + } + else if (ImGui::Button("Add to the set")) + { + state.set.push_back(line); + } if (false == ImGui::IsAnyItemActive()) { @@ -1298,6 +1318,14 @@ void editor_mode::render_straights_ui() if (false == state.status.empty()) ImGui::TextColored(ImVec4(1.0f, 0.35f, 0.3f, 1.0f), "%s", state.status.c_str()); + if (false == state.set.empty()) + { + ImGui::Text("Set: %zu straights, dragging any of them moves the whole set, keeping it parallel", state.set.size()); + ImGui::SameLine(); + if (ImGui::SmallButton("Clear the set")) + state.set.clear(); + } + ImGui::Separator(); auto const &a{state.a}; auto const &b{state.b}; @@ -1388,13 +1416,30 @@ void editor_mode::straight_refresh() for (auto &line : state.found) if (false == line.tracks.empty()) line = editor_track::find_straight(*line.tracks.front(), state.tolerance); + for (auto &line : state.set) + if (false == line.tracks.empty()) + line = editor_track::find_straight(*line.tracks.front(), state.tolerance); +} + +bool editor_mode::in_straight_set(editor_track::straight const &Line) const +{ + for (auto const &member : m_straights.set) + for (auto const *track : Line.tracks) + if (std::find(member.tracks.begin(), member.tracks.end(), track) != member.tracks.end()) + return true; + return false; } void editor_mode::straight_apply(editor_track::straight const &Line, glm::dvec3 const &Start, glm::dvec3 const &End) +{ + straights_apply({Line}, {{Start, End}}); +} + +void editor_mode::straights_apply(std::vector const &Lines, std::vector> const &Ends) { auto &state{m_straights}; state.status.clear(); - auto const tracks{editor_track::straight_affected(Line)}; + auto const tracks{editor_track::straight_affected(Lines)}; for (auto *track : tracks) { if (false == track->Dynamics.empty()) @@ -1407,7 +1452,7 @@ void editor_mode::straight_apply(editor_track::straight const &Line, glm::dvec3 for (auto *track : tracks) states.emplace_back(track, editor_track::capture(*track)); push_track_snapshot(std::move(states)); - editor_track::move_straight(Line, Start, End); + editor_track::move_straights(Lines, Ends); editor_track::commit(tracks); straight_refresh(); } @@ -1443,39 +1488,68 @@ void editor_mode::render_straight_gizmo() { if (false == state.dragging) { - auto const tracks{editor_track::straight_affected(line)}; + std::vector lines; + if (in_straight_set(line)) + { + for (auto const &member : state.set) + if (false == member.tracks.empty()) + lines.push_back(editor_track::find_straight(*member.tracks.front(), state.tolerance)); + } + else + { + lines.push_back(line); + } + auto const tracks{editor_track::straight_affected(lines)}; if (std::any_of(tracks.begin(), tracks.end(), [](TTrack const *Track) { return false == Track->Dynamics.empty(); })) { - state.status = "There are vehicles placed on the straight or the paths attached to it"; + state.status = "There are vehicles placed on the straights or the paths attached to them"; return; } state.dragging = true; state.drag_line = line; + state.drag_lines = lines; state.drag_states.clear(); for (auto *track : tracks) state.drag_states.emplace_back(track, editor_track::capture(*track)); push_track_snapshot(state.drag_states); m_track_drag = tracks; } - auto const &original{state.drag_line}; + auto const &grabbed{state.drag_line}; glm::dvec3 const moved{camerapos + glm::dvec3(state.gizmo[3])}; - auto start{original.start}; - auto end{original.end}; - if (state.handle == 0) - start = moved; - else if (state.handle == 1) - end = moved; + std::function transform; + if (state.handle == 2) + { + auto const offset{moved - (grabbed.start + grabbed.end) * 0.5}; + transform = [offset](glm::dvec3 const &Point) { return Point + offset; }; + } else { - auto const offset{moved - (original.start + original.end) * 0.5}; - start += offset; - end += offset; + auto const pivot{state.handle == 0 ? grabbed.end : grabbed.start}; + auto const original{state.handle == 0 ? grabbed.start : grabbed.end}; + glm::dvec2 const before{original.x - pivot.x, original.z - pivot.z}; + glm::dvec2 const after{moved.x - pivot.x, moved.z - pivot.z}; + auto const lengthbefore{glm::length(before)}; + auto const lengthafter{std::max(0.1, glm::length(after))}; + auto const axis{before / std::max(1e-9, lengthbefore)}; + auto const newaxis{after / lengthafter}; + auto const scale{lengthafter / std::max(1e-9, lengthbefore)}; + auto const rise{moved.y - original.y}; + transform = [=](glm::dvec3 const &Point) { + glm::dvec2 const offset{Point.x - pivot.x, Point.z - pivot.z}; + auto const along{glm::dot(offset, axis)}; + auto const across{axis.x * offset.y - axis.y * offset.x}; + auto const planar{glm::dvec2{pivot.x, pivot.z} + newaxis * (along * scale) + glm::dvec2{-newaxis.y, newaxis.x} * across}; + return glm::dvec3{planar.x, Point.y + rise * along / std::max(1e-9, lengthbefore), planar.y}; + }; } - state.preview_start = start; - state.preview_end = end; + std::vector> ends; + for (auto const &member : state.drag_lines) + ends.emplace_back(transform(member.start), transform(member.end)); + state.preview_start = transform(grabbed.start); + state.preview_end = transform(grabbed.end); for (auto const &entry : state.drag_states) editor_track::apply(*entry.first, entry.second); - editor_track::move_straight(original, start, end); + editor_track::move_straights(state.drag_lines, ends); m_track_dirty = true; commit_track_drag(false); } @@ -1485,6 +1559,7 @@ void editor_mode::render_straight_gizmo() state.dragging = false; m_track_drag.clear(); state.drag_states.clear(); + state.drag_lines.clear(); straight_refresh(); } } diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index 81ed916f6..e8d7eddec 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -22,6 +22,7 @@ http: #include #include #include +#include #include #include @@ -970,11 +971,15 @@ std::vector editor_track::find_straights(double const Mi return result; } -std::vector editor_track::straight_affected(straight const &Line) +std::vector editor_track::straight_affected(std::vector const &Lines) { - std::vector result(Line.tracks.begin(), Line.tracks.end()); - auto const member = [&](TTrack const *Track) { return std::find(Line.tracks.begin(), Line.tracks.end(), Track) != Line.tracks.end(); }; - for (auto *track : Line.tracks) + std::vector result; + for (auto const &line : Lines) + for (auto *track : line.tracks) + add_unique(result, track); + auto const members{result}; + auto const member = [&](TTrack const *Track) { return std::find(members.begin(), members.end(), Track) != members.end(); }; + for (auto *track : members) { for (int i = 0; i < static_cast(track->m_paths.size()); ++i) { @@ -995,7 +1000,18 @@ std::vector editor_track::straight_affected(straight const &Line) return result; } -void editor_track::move_straight(straight const &Line, glm::dvec3 const &Start, glm::dvec3 const &End) +void editor_track::move_straights(std::vector const &Lines, std::vector> const &Ends) +{ + std::vector members; + for (auto const &line : Lines) + for (auto *track : line.tracks) + add_unique(members, track); + auto const member = [&](TTrack const *Track) { return std::find(members.begin(), members.end(), Track) != members.end(); }; + for (std::size_t i = 0; i < Lines.size() && i < Ends.size(); ++i) + move_straight(Lines[i], Ends[i].first, Ends[i].second, member); +} + +void editor_track::move_straight(straight const &Line, glm::dvec3 const &Start, glm::dvec3 const &End, std::function const &Member) { if (Line.tracks.empty() || Line.length < 1e-6) return; @@ -1053,7 +1069,7 @@ void editor_track::move_straight(straight const &Line, glm::dvec3 const &Start, return glm::dvec3{moved.x, Point.y - oldheight + newheight, moved.y}; }; - auto const member = [&](TTrack const *Track) { return std::find(Line.tracks.begin(), Line.tracks.end(), Track) != Line.tracks.end(); }; + auto const &member{Member}; std::vector> joints; for (std::size_t i = 0; i < Line.tracks.size(); ++i) { diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index d58e7f366..58a6c2f15 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -9,6 +9,7 @@ http: #pragma once +#include #include #include #include @@ -115,8 +116,8 @@ class editor_track static bool is_straight(TTrack const &Track, straight_tolerance const &Tolerance); static straight find_straight(TTrack &Track, straight_tolerance const &Tolerance); static std::vector find_straights(double const Minimumlength, straight_tolerance const &Tolerance); - static std::vector straight_affected(straight const &Line); - static void move_straight(straight const &Line, glm::dvec3 const &Start, glm::dvec3 const &End); + static std::vector straight_affected(std::vector const &Lines); + static void move_straights(std::vector const &Lines, std::vector> const &Ends); static std::vector relay(chain const &Chain, std::vector const &Pieces); static void retire(TTrack &Track); static void revive(TTrack &Track); @@ -139,4 +140,5 @@ class editor_track static void store_switch_path(TTrack &Switch, int const Path); static void rebuild_geometry(TTrack &Track); static TTrack *clone(TTrack const &Template); + static void move_straight(straight const &Line, glm::dvec3 const &Start, glm::dvec3 const &End, std::function const &Member); }; From 9877ebe2618d3b0aec05da8dac1510a8ab2e8404 Mon Sep 17 00:00:00 2001 From: maj00r Date: Fri, 2 Oct 2026 23:12:06 +0200 Subject: [PATCH 052/430] feat(editor): break straight with curve, S-curve shift --- application/editormode.h | 11 +++ application/editormodetrack.cpp | 169 +++++++++++++++++++++++++++++++- 2 files changed, 179 insertions(+), 1 deletion(-) diff --git a/application/editormode.h b/application/editormode.h index 8f7107a12..08e42fa3a 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -24,6 +24,7 @@ http://mozilla.org/MPL/2.0/. #include #include +#include #include #include #include @@ -345,6 +346,15 @@ class editor_mode : public application_mode double edit_length{0.0}; double edit_azimuth{0.0}; double distance{4.0}; + double break_at{100.0}; + double break_angle{5.0}; + double break_radius{1000.0}; + double shift_at{100.0}; + double shift_length{200.0}; + double shift_offset{4.0}; + double curve_radius{0.0}; + bool auto_transitions{true}; + double transition{0.0}; std::string status; }; void render_straights_ui(); @@ -356,6 +366,7 @@ class editor_mode : public application_mode void straight_apply(editor_track::straight const &Line, glm::dvec3 const &Start, glm::dvec3 const &End); void straights_apply(std::vector const &Lines, std::vector> const &Ends); bool in_straight_set(editor_track::straight const &Line) const; + void straight_reshape(editor_track::straight const &Line, double const From, double const To, std::function const &Tail, double const Radius); void straight_refresh(); straights_state m_straights; enum class track_tab { straights, route, path }; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 41804b448..2bcb39fd1 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -1315,8 +1315,53 @@ void editor_mode::render_straights_ui() } ImGui::PopItemWidth(); } + if (false == line.tracks.empty()) + { + ImGui::Separator(); + ImGui::Text("Curves"); + ImGui::PushItemWidth(100.0f); + ImGui::Checkbox("Transitions from the design speed", &state.auto_transitions); + if (false == state.auto_transitions) + { + ImGui::SameLine(); + ImGui::InputDouble("Transition (m)", &state.transition, 0.0, 0.0, "%.1f"); + } + ImGui::TextDisabled("Break: the straight turns at the given distance from its start, the rest of it follows"); + ImGui::InputDouble("Break at (m from start)", &state.break_at, 0.0, 0.0, "%.2f"); + ImGui::InputDouble("Angle (deg, +/- side)", &state.break_angle, 0.0, 0.0, "%.4f"); + ImGui::InputDouble("Radius R (m)##break", &state.break_radius, 0.0, 0.0, "%.1f"); + if (ImGui::Button("Break the straight")) + { + auto const pivot2d{glm::dvec2{line.start.x, line.start.z} + line.direction * state.break_at}; + auto const angle{glm::radians(state.break_angle)}; + auto const radius{std::max(1.0, state.break_radius)}; + auto const reach{radius * std::tan(std::abs(angle) * 0.5) + 200.0}; + straight_reshape(line, state.break_at - reach, state.break_at + reach, + [pivot2d, angle](glm::dvec3 const &Point) { + glm::dvec2 const offset{Point.x - pivot2d.x, Point.z - pivot2d.y}; + auto const c{std::cos(angle)}; + auto const s{std::sin(angle)}; + return glm::dvec3{pivot2d.x + offset.x * c - offset.y * s, Point.y, pivot2d.y + offset.x * s + offset.y * c}; + }, + radius); + } + ImGui::TextDisabled("S-curve: the straight is shifted sideways by the offset over the given length"); + ImGui::InputDouble("Shift from (m from start)", &state.shift_at, 0.0, 0.0, "%.2f"); + ImGui::InputDouble("Over the length (m)", &state.shift_length, 0.0, 0.0, "%.2f"); + ImGui::InputDouble("Offset (m, +/- side)", &state.shift_offset, 0.0, 0.0, "%.3f"); + ImGui::InputDouble("Radius R (m)##shift", &state.curve_radius, 0.0, 0.0, "%.1f"); + ImGui::PopItemWidth(); + if (ImGui::Button("Shift the straight (S-curve)")) + { + glm::dvec2 const normal{-line.direction.y, line.direction.x}; + auto const offset{normal * state.shift_offset}; + straight_reshape(line, state.shift_at, state.shift_at + std::max(1.0, state.shift_length), + [offset](glm::dvec3 const &Point) { return glm::dvec3{Point.x + offset.x, Point.y, Point.z + offset.y}; }, + state.curve_radius > 0.0 ? state.curve_radius : 100000.0); + } + } if (false == state.status.empty()) - ImGui::TextColored(ImVec4(1.0f, 0.35f, 0.3f, 1.0f), "%s", state.status.c_str()); + ImGui::TextColored(ImVec4(1.0f, 0.7f, 0.2f, 1.0f), "%s", state.status.c_str()); if (false == state.set.empty()) { @@ -1563,3 +1608,125 @@ void editor_mode::render_straight_gizmo() straight_refresh(); } } + +void editor_mode::straight_reshape(editor_track::straight const &Line, double const From, double const To, std::function const &Tail, double const Radius) +{ + auto &state{m_straights}; + state.status.clear(); + struct span + { + TTrack *track; + int path; + double from, to; + }; + std::vector spans; + for (std::size_t i = 0; i < Line.tracks.size(); ++i) + { + auto const &path{Line.tracks[i]->m_paths[Line.paths[i]]}; + auto const along = [&](glm::dvec3 const &Point) { return glm::dot(glm::dvec2{Point.x - Line.start.x, Point.z - Line.start.z}, Line.direction); }; + auto const a{along(path.points[segment_data::point::start])}; + auto const b{along(path.points[segment_data::point::end])}; + spans.push_back({Line.tracks[i], Line.paths[i], std::min(a, b), std::max(a, b)}); + } + std::sort(spans.begin(), spans.end(), [](span const &A, span const &B) { return A.from < B.from; }); + + int first{-1}, last{-1}; + for (int i = 0; i < static_cast(spans.size()); ++i) + { + if (spans[i].to > From && spans[i].from < To) + { + if (first < 0) + first = i; + last = i; + } + } + if (first < 0 || last + 1 >= static_cast(spans.size())) + { + state.status = "The reshaped part has to end before the end of the straight"; + return; + } + for (int i = first; i <= last; ++i) + { + if (spans[i].track->eType != tt_Normal) + { + state.status = "There's a switch in the reshaped part of the straight"; + return; + } + } + + editor_track::straight tail; + tail.direction = Line.direction; + for (int i = last + 1; i < static_cast(spans.size()); ++i) + { + tail.tracks.push_back(spans[i].track); + tail.paths.push_back(spans[i].path); + } + auto const point = [&](double const Along) { + auto const planar{glm::dvec2{Line.start.x, Line.start.z} + Line.direction * Along}; + return glm::dvec3{planar.x, Line.start.y + Line.grade * Along, planar.y}; + }; + tail.start = point(spans[last + 1].from); + tail.end = Line.end; + tail.length = Line.length - spans[last + 1].from; + tail.grade = Line.grade; + + std::vector chainpaths; + for (int i = first; i <= last; ++i) + chainpaths.push_back(spans[i].track); + auto tracks{editor_track::straight_affected({tail})}; + for (auto *track : chainpaths) + if (std::find(tracks.begin(), tracks.end(), track) == tracks.end()) + tracks.push_back(track); + for (auto *track : tracks) + { + if (false == track->Dynamics.empty()) + { + state.status = "There are vehicles placed on path " + track->name(); + return; + } + } + std::vector> states; + for (auto *track : tracks) + states.emplace_back(track, editor_track::capture(*track)); + + editor_track::move_straights({tail}, {{Tail(tail.start), Tail(tail.end)}}); + + m_route.from = spans[first].track; + m_route.to = spans[last].track; + route_reset(); + if (m_route.chain.tracks.empty()) + { + for (auto const &entry : states) + editor_track::apply(*entry.first, entry.second); + editor_track::commit(tracks); + state.status = m_route.error; + return; + } + for (auto &vertex : m_route.design.vertices) + { + vertex.radius = Radius; + route_recommend(vertex); + if (false == state.auto_transitions) + { + vertex.transition_in = state.transition; + vertex.transition_out = state.transition; + } + } + route_update(); + if (false == m_route.result.valid) + { + for (auto const &entry : states) + editor_track::apply(*entry.first, entry.second); + editor_track::commit(tracks); + state.status = m_route.result.errors.empty() ? "The curve can't be fitted" : m_route.result.errors.front(); + return; + } + auto const pieces{alignment::pieces(m_route.result, m_route.design, m_route.chain.tracks.size())}; + auto created{editor_track::relay(m_route.chain, pieces)}; + editor_track::commit(tracks); + push_track_snapshot(std::move(states), std::move(created)); + std::string error; + editor_track::find_chain(m_route.from, m_route.to, m_route.chain, error); + straight_refresh(); + state.status = "Done, the curves can be adjusted in the Route design tab"; +} From a392364f065ae9033d600b42baf28623fe2e69c1 Mon Sep 17 00:00:00 2001 From: maj00r Date: Fri, 2 Oct 2026 23:14:03 +0200 Subject: [PATCH 053/430] =?UTF-8?q?feat(editor):=20curves=20over=20180?= =?UTF-8?q?=C2=B0,=20click=20to=20load=20curve?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/editormode.h | 1 + application/editormodetrack.cpp | 45 +++++++++++++++++++-- editor/editorAlignment.cpp | 26 +++++++----- editor/editorAlignment.hpp | 1 + editor/editorTrack.cpp | 72 +++++++++++++++++++++++++++++++++ editor/editorTrack.hpp | 12 ++++++ 6 files changed, 143 insertions(+), 14 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index 08e42fa3a..7b1dcdb79 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -311,6 +311,7 @@ class editor_mode : public application_mode }; void render_route_ui(); void route_reset(); + bool route_from_curve(TTrack &Track); void route_update() { m_route.result = alignment::compute(m_route.design); } void route_apply(); void route_recommend(alignment::vertex &Vertex) const; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 2bcb39fd1..db5b14120 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -134,6 +134,8 @@ void editor_mode::select_track(scene::basic_node *Node) m_track_point = {}; m_node = track; ui()->set_node(m_node); + if (ui()->mode() == nodebank_panel::TRACK && m_track_tab == track_tab::route && std::find(m_route.chain.tracks.begin(), m_route.chain.tracks.end(), track) == m_route.chain.tracks.end()) + route_from_curve(*track); } bool editor_mode::pick_track_handle() @@ -703,6 +705,42 @@ void editor_mode::route_reset() route_update(); } +bool editor_mode::route_from_curve(TTrack &Track) +{ + editor_track::curve curve; + if (false == editor_track::find_curve(Track, m_straights.tolerance, m_route.design.norms.gauge, curve)) + return false; + m_route.from = curve.from; + m_route.to = curve.to; + route_reset(); + if (m_route.chain.tracks.empty()) + return false; + auto &design{m_route.design}; + alignment::vertex vertex; + vertex.radius = curve.radius > 0.0 ? std::max(10.0, std::round(curve.radius)) : 1000.0; + route_recommend(vertex); + if (curve.transition_in > 0.0) + vertex.transition_in = std::round(curve.transition_in); + if (curve.transition_out > 0.0) + vertex.transition_out = std::round(curve.transition_out); + if (curve.cant > 0.0) + vertex.cant = std::round(curve.cant); + if (curve.reversals == 0) + { + vertex.reverse_turn = std::abs(curve.turn) > glm::pi(); + design.vertices = {vertex}; + } + else + { + auto const distance{glm::distance(glm::dvec2{design.start.x, design.start.z}, glm::dvec2{design.end.x, design.end.z})}; + vertex.offset = distance / 3.0; + design.vertices = {vertex, vertex}; + } + route_update(); + m_route.status = "Curve of " + std::to_string(m_route.chain.tracks.size()) + " paths, turning " + std::to_string(static_cast(std::round(glm::degrees(curve.turn)))) + " deg"; + return true; +} + void editor_mode::route_apply() { auto &route{m_route}; @@ -913,9 +951,9 @@ void editor_mode::render_route_ui() { auto &route{m_route}; auto &design{route.design}; - ImGui::TextDisabled("Re-lays a chain of regular paths along an alignment designed with intersection points.\n" - "The outer ends of the chain and their directions stay fixed.\n" - "LMB: select a path or a vertex (W1, W2...) Esc: release the vertex"); + ImGui::TextDisabled("LMB on a curve: loads the whole curve between the adjoining straights.\n" + "The ends of the curve and their directions stay fixed.\n" + "LMB on a vertex (W1, W2...): moves it with the gizmo Esc: release the vertex"); auto *track = selected_track(); auto const name = [](TTrack const *Track) { return Track == nullptr ? std::string{"-"} : (Track->name().empty() ? std::string{"(noname)"} : Track->name()); }; @@ -1051,6 +1089,7 @@ void editor_mode::render_route_ui() changed |= ImGui::InputDouble("Transition in (m)", &vertex.transition_in, 0.0, 0.0, "%.1f"); changed |= ImGui::InputDouble("Transition out (m)", &vertex.transition_out, 0.0, 0.0, "%.1f"); changed |= ImGui::InputDouble("Cant (mm)", &vertex.cant, 0.0, 0.0, "%.0f"); + changed |= ImGui::Checkbox("Turn the longer way (over 180 deg)", &vertex.reverse_turn); changed |= ImGui::Checkbox("Elevation from the ends", &vertex.auto_elevation); if (false == vertex.auto_elevation) changed |= ImGui::InputDouble("Elevation (m)", &vertex.elevation, 0.0, 0.0, "%.3f"); diff --git a/editor/editorAlignment.cpp b/editor/editorAlignment.cpp index 815c0045a..3dfdbeec3 100644 --- a/editor/editorAlignment.cpp +++ b/editor/editorAlignment.cpp @@ -238,8 +238,8 @@ result compute(design const &Design) { auto const t{cross(offset, enddirection) / determinant}; auto const u{cross(startdirection, offset) / determinant}; - if (t <= 0.0 || u <= 0.0) - r.errors.emplace_back("Tangents of the ends intersect outside of the fragment, use two vertices"); + if ((t <= 0.0 || u <= 0.0) && false == Design.vertices.front().reverse_turn) + r.errors.emplace_back("Tangents of the ends intersect outside of the fragment, turn the longer way or use two vertices"); r.vertices[0] = start + startdirection * t; } } @@ -303,12 +303,15 @@ result compute(design const &Design) auto const directionin{glm::normalize(polygon[k + 1] - polygon[k])}; auto const directionout{glm::normalize(polygon[k + 2] - polygon[k + 1])}; auto const turn{cross(directionin, directionout)}; - auto const deflection{std::atan2(std::abs(turn), glm::dot(directionin, directionout))}; + auto const geometric{std::atan2(std::abs(turn), glm::dot(directionin, directionout))}; + auto const reverse{Design.vertices[k].reverse_turn}; + auto const deflection{reverse ? 2.0 * kPi - geometric : geometric}; + int const side{(turn > 0.0) != reverse ? 1 : -1}; if (deflection < 1e-7) continue; - if (deflection > kPi - 1e-3) + if (geometric > kPi - 1e-3 || (reverse && geometric < 1e-3)) { - r.errors.emplace_back(format("Vertex %zu: the route turns back on itself", k + 1)); + r.errors.emplace_back(format("Vertex %zu: a turn of about 180 or 360 degrees needs one more vertex", k + 1)); return r; } auto const angles = [&](double const Factor) { @@ -327,8 +330,7 @@ result compute(design const &Design) fit.transition_out *= low; } fit.deflection = deflection; - fit.tangents = [&, k, directionin, directionout, turn](double const Radius, double &Tangentin, double &Tangentout) { - int const side{turn > 0.0 ? 1 : -1}; + fit.tangents = [&, k, directionin, directionout, side](double const Radius, double &Tangentin, double &Tangentout) { auto const endin{transition_point(Design.shape, fits[k].transition_in, Radius, 1.0)}; auto const endout{transition_point(Design.shape, fits[k].transition_out, Radius, 1.0)}; auto const a{Radius + endin.y - Radius * (1.0 - std::cos(endin.angle))}; @@ -408,7 +410,10 @@ result compute(design const &Design) auto const directionin{glm::normalize(polygon[k + 1] - polygon[k])}; auto const directionout{glm::normalize(polygon[k + 2] - polygon[k + 1])}; auto const turn{cross(directionin, directionout)}; - auto const deflection{std::atan2(std::abs(turn), glm::dot(directionin, directionout))}; + auto const geometric{std::atan2(std::abs(turn), glm::dot(directionin, directionout))}; + auto const reverse{Design.vertices[k].reverse_turn}; + auto const deflection{reverse ? 2.0 * kPi - geometric : geometric}; + int const side{(turn > 0.0) != reverse ? 1 : -1}; auto const lead{glm::dot(position - cursor, directionin)}; if (deflection < 1e-7) @@ -420,12 +425,11 @@ result compute(design const &Design) cursor = position; continue; } - if (deflection > kPi - 1e-3) + if (geometric > kPi - 1e-3 || (reverse && geometric < 1e-3)) { - r.errors.emplace_back(format("Vertex %zu: the route turns back on itself", k + 1)); + r.errors.emplace_back(format("Vertex %zu: a turn of about 180 or 360 degrees needs one more vertex", k + 1)); return r; } - int const side{turn > 0.0 ? 1 : -1}; auto const radius{fit.radius}; auto const lengthin{fit.transition_in}; auto const lengthout{fit.transition_out}; diff --git a/editor/editorAlignment.hpp b/editor/editorAlignment.hpp index 0928af7b4..a790b8665 100644 --- a/editor/editorAlignment.hpp +++ b/editor/editorAlignment.hpp @@ -48,6 +48,7 @@ struct vertex bool auto_elevation{true}; double elevation{0.0}; double vertical_radius{0.0}; + bool reverse_turn{false}; }; struct design diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index e8d7eddec..32542f323 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -22,6 +22,7 @@ http: #include #include #include +#include #include #include #include @@ -971,6 +972,77 @@ std::vector editor_track::find_straights(double const Mi return result; } +bool editor_track::find_curve(TTrack &Track, straight_tolerance const &Tolerance, double const Gauge, curve &Curve) +{ + Curve = {}; + auto const curved = [&](TTrack const *Other) { return Other != nullptr && Other->eType == tt_Normal && is_supported(*Other) && false == Other->m_editorremoved && false == is_straight(*Other, Tolerance); }; + if (false == curved(&Track)) + return false; + + std::deque> run{{&Track, true}}; + for (auto const throughend : {true, false}) + { + TTrack *previous{&Track}; + TTrack *current{throughend ? Track.trNext : Track.trPrev}; + while (curved(current) && std::none_of(run.begin(), run.end(), [&](auto const &Member) { return Member.first == current; })) + { + auto const entersatstart{current->trPrev == previous}; + if (throughend) + run.emplace_back(current, entersatstart); + else + run.emplace_front(current, false == entersatstart); + previous = current; + current = entersatstart ? current->trNext : current->trPrev; + } + } + + std::vector turns; + std::vector lengths; + std::vector varying; + double smallest{0.0}; + for (auto const &member : run) + { + auto const &path{member.first->m_paths.front()}; + auto const tangentstart{glm::normalize(plan_of(path_tangent(path, false)))}; + auto const tangentend{glm::normalize(plan_of(path_tangent(path, true)))}; + auto turn{std::atan2(lateral_of(tangentstart, tangentend), glm::dot(tangentstart, tangentend))}; + if (false == member.second) + turn = -turn; + turns.push_back(turn); + lengths.push_back(member.first->Length()); + auto const radiusstart{path_radius(path, 0.0)}; + auto const radiusend{path_radius(path, 1.0)}; + auto const curvaturestart{radiusstart > 0.0 ? 1.0 / radiusstart : 0.0}; + auto const curvatureend{radiusend > 0.0 ? 1.0 / radiusend : 0.0}; + varying.push_back(std::abs(curvaturestart - curvatureend) > 0.1 * std::max(curvaturestart, curvatureend)); + auto const radius{path_radius(path, 0.5)}; + if (radius > 0.0 && (smallest == 0.0 || radius < smallest)) + smallest = radius; + for (auto const roll : path.rolls) + Curve.cant = std::max(Curve.cant, Gauge * std::sin(std::abs(glm::radians(static_cast(roll))))); + } + int sign{0}; + for (auto const turn : turns) + { + Curve.turn += turn; + int const current{turn > 1e-9 ? 1 : turn < -1e-9 ? -1 : 0}; + if (current != 0 && sign != 0 && current != sign) + ++Curve.reversals; + if (current != 0) + sign = current; + } + for (std::size_t i = 0; i < run.size() && varying[i]; ++i) + Curve.transition_in += lengths[i]; + for (std::size_t i = run.size(); i > 0 && varying[i - 1]; --i) + Curve.transition_out += lengths[i - 1]; + if (Curve.transition_in + Curve.transition_out >= std::accumulate(lengths.begin(), lengths.end(), 0.0)) + Curve.transition_in = Curve.transition_out = 0.0; + Curve.radius = smallest; + Curve.from = run.front().first; + Curve.to = run.back().first; + return true; +} + std::vector editor_track::straight_affected(std::vector const &Lines) { std::vector result; diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index 58a6c2f15..27b9ac923 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -117,6 +117,18 @@ class editor_track static straight find_straight(TTrack &Track, straight_tolerance const &Tolerance); static std::vector find_straights(double const Minimumlength, straight_tolerance const &Tolerance); static std::vector straight_affected(std::vector const &Lines); + struct curve + { + TTrack *from{nullptr}; + TTrack *to{nullptr}; + double turn{0.0}; + int reversals{0}; + double radius{0.0}; + double transition_in{0.0}; + double transition_out{0.0}; + double cant{0.0}; + }; + static bool find_curve(TTrack &Track, straight_tolerance const &Tolerance, double const Gauge, curve &Curve); static void move_straights(std::vector const &Lines, std::vector> const &Ends); static std::vector relay(chain const &Chain, std::vector const &Pieces); static void retire(TTrack &Track); From e910af471286bb566e9d059a39be698be903ecd1 Mon Sep 17 00:00:00 2001 From: maj00r Date: Fri, 2 Oct 2026 23:17:42 +0200 Subject: [PATCH 054/430] feat(editor): break and S-curve with mouse --- application/editormode.cpp | 2 +- application/editormode.h | 18 ++- application/editormodetrack.cpp | 195 ++++++++++++++++++++++++++------ 3 files changed, 174 insertions(+), 41 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 624285c31..706d7e46d 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -2838,7 +2838,7 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const if (mode == nodebank_panel::TRACK) { - if (false == ImGuizmo::IsOver() && false == pick_route_vertex() && false == pick_straight_handle() && false == pick_track_handle()) + if (false == ImGuizmo::IsOver() && false == pick_route_vertex() && false == place_straight_tool() && false == pick_straight_handle() && false == pick_track_handle()) { GfxRenderer->Pick_Node_Callback([this](scene::basic_node *node) { if (viewport_click()) diff --git a/application/editormode.h b/application/editormode.h index 7b1dcdb79..4038eca2d 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -347,15 +347,17 @@ class editor_mode : public application_mode double edit_length{0.0}; double edit_azimuth{0.0}; double distance{4.0}; - double break_at{100.0}; - double break_angle{5.0}; - double break_radius{1000.0}; - double shift_at{100.0}; - double shift_length{200.0}; - double shift_offset{4.0}; double curve_radius{0.0}; bool auto_transitions{true}; double transition{0.0}; + int tool{0}; + bool tool_placed{false}; + bool tool_dragging{false}; + double tool_at{0.0}; + glm::dvec3 tool_point{0.0}; + glm::dvec3 tool_handle{0.0}; + editor_track::straight tool_line; + glm::mat4 tool_gizmo{1.0f}; std::string status; }; void render_straights_ui(); @@ -367,6 +369,10 @@ class editor_mode : public application_mode void straight_apply(editor_track::straight const &Line, glm::dvec3 const &Start, glm::dvec3 const &End); void straights_apply(std::vector const &Lines, std::vector> const &Ends); bool in_straight_set(editor_track::straight const &Line) const; + bool place_straight_tool(); + void render_straight_tool_gizmo(); + void apply_straight_tool(); + double straight_tool_radius(editor_track::straight const &Line) const; void straight_reshape(editor_track::straight const &Line, double const From, double const To, std::function const &Tail, double const Radius); void straight_refresh(); straights_state m_straights; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index db5b14120..9d73ac302 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -1201,6 +1201,37 @@ void editor_mode::draw_straights_overlay() const for (auto const &member : m_straights.set) draw(member, IM_COL32(255, 150, 30, 255), 4.0f); draw(m_straights.current, IM_COL32(40, 220, 255, 255), 4.0f); + if (m_straights.tool_placed) + { + auto const &state{m_straights}; + auto const &line{state.tool_line}; + ImVec2 screen; + if (projection.project(state.tool_point, screen)) + drawlist->AddCircleFilled(screen, 7.0f, IM_COL32(255, 60, 60, 255)); + if (projection.project(state.tool_handle, screen)) + drawlist->AddCircleFilled(screen, 7.0f, IM_COL32(255, 210, 60, 255)); + if (state.tool == 1) + { + auto const direction{glm::dvec2{state.tool_handle.x - state.tool_point.x, state.tool_handle.z - state.tool_point.z}}; + if (glm::length(direction) > 1e-3) + { + auto const unit{glm::normalize(direction)}; + auto const rest{std::max(0.0, line.length - state.tool_at)}; + projection.line(drawlist, state.tool_point, state.tool_point + glm::dvec3{unit.x, line.grade, unit.y} * rest, IM_COL32(255, 210, 60, 255), 3.0f); + } + } + else + { + glm::dvec2 const normal{-line.direction.y, line.direction.x}; + auto const offset{glm::dvec2{state.tool_handle.x - state.tool_point.x, state.tool_handle.z - state.tool_point.z}}; + auto const shift{glm::dot(offset, normal)}; + auto const length{glm::dot(offset, line.direction)}; + auto const shifted{glm::dvec3{normal.x, 0.0, normal.y} * shift}; + auto const along{glm::dvec3{line.direction.x, 0.0, line.direction.y}}; + projection.line(drawlist, state.tool_point, state.tool_point + along * length + shifted, IM_COL32(255, 210, 60, 160), 2.0f); + projection.line(drawlist, state.tool_point + along * length + shifted, line.end + shifted, IM_COL32(255, 210, 60, 255), 3.0f); + } + } if (m_straights.dragging) { for (auto const &member : m_straights.drag_lines) @@ -1357,47 +1388,36 @@ void editor_mode::render_straights_ui() if (false == line.tracks.empty()) { ImGui::Separator(); - ImGui::Text("Curves"); + ImGui::Text("Mouse tools"); + auto const toolbutton = [&](char const *Label, int const Tool) { + bool const active{state.tool == Tool}; + if (active) + ImGui::PushStyleColor(ImGuiCol_Button, ImGui::GetStyleColorVec4(ImGuiCol_ButtonActive)); + if (ImGui::Button(Label)) + { + state.tool = active ? 0 : Tool; + state.tool_placed = false; + state.handle = -1; + } + if (active) + ImGui::PopStyleColor(); + }; + toolbutton("Break", 1); + ImGui::SameLine(); + toolbutton("S-curve", 2); + if (state.tool == 1) + ImGui::TextDisabled(state.tool_placed ? "Drag the handle to turn the rest of the straight, release to fit the curve" : "LMB on the straight: place the break point"); + else if (state.tool == 2) + ImGui::TextDisabled(state.tool_placed ? "Drag the handle: sideways sets the shift, along sets its length" : "LMB on the straight: place the start of the shift"); ImGui::PushItemWidth(100.0f); - ImGui::Checkbox("Transitions from the design speed", &state.auto_transitions); + ImGui::InputDouble("Curve R (m, 0: automatic)", &state.curve_radius, 0.0, 0.0, "%.0f"); + ImGui::Checkbox("Transitions from the line speed", &state.auto_transitions); if (false == state.auto_transitions) { ImGui::SameLine(); ImGui::InputDouble("Transition (m)", &state.transition, 0.0, 0.0, "%.1f"); } - ImGui::TextDisabled("Break: the straight turns at the given distance from its start, the rest of it follows"); - ImGui::InputDouble("Break at (m from start)", &state.break_at, 0.0, 0.0, "%.2f"); - ImGui::InputDouble("Angle (deg, +/- side)", &state.break_angle, 0.0, 0.0, "%.4f"); - ImGui::InputDouble("Radius R (m)##break", &state.break_radius, 0.0, 0.0, "%.1f"); - if (ImGui::Button("Break the straight")) - { - auto const pivot2d{glm::dvec2{line.start.x, line.start.z} + line.direction * state.break_at}; - auto const angle{glm::radians(state.break_angle)}; - auto const radius{std::max(1.0, state.break_radius)}; - auto const reach{radius * std::tan(std::abs(angle) * 0.5) + 200.0}; - straight_reshape(line, state.break_at - reach, state.break_at + reach, - [pivot2d, angle](glm::dvec3 const &Point) { - glm::dvec2 const offset{Point.x - pivot2d.x, Point.z - pivot2d.y}; - auto const c{std::cos(angle)}; - auto const s{std::sin(angle)}; - return glm::dvec3{pivot2d.x + offset.x * c - offset.y * s, Point.y, pivot2d.y + offset.x * s + offset.y * c}; - }, - radius); - } - ImGui::TextDisabled("S-curve: the straight is shifted sideways by the offset over the given length"); - ImGui::InputDouble("Shift from (m from start)", &state.shift_at, 0.0, 0.0, "%.2f"); - ImGui::InputDouble("Over the length (m)", &state.shift_length, 0.0, 0.0, "%.2f"); - ImGui::InputDouble("Offset (m, +/- side)", &state.shift_offset, 0.0, 0.0, "%.3f"); - ImGui::InputDouble("Radius R (m)##shift", &state.curve_radius, 0.0, 0.0, "%.1f"); ImGui::PopItemWidth(); - if (ImGui::Button("Shift the straight (S-curve)")) - { - glm::dvec2 const normal{-line.direction.y, line.direction.x}; - auto const offset{normal * state.shift_offset}; - straight_reshape(line, state.shift_at, state.shift_at + std::max(1.0, state.shift_length), - [offset](glm::dvec3 const &Point) { return glm::dvec3{Point.x + offset.x, Point.y, Point.z + offset.y}; }, - state.curve_radius > 0.0 ? state.curve_radius : 100000.0); - } } if (false == state.status.empty()) ImGui::TextColored(ImVec4(1.0f, 0.7f, 0.2f, 1.0f), "%s", state.status.c_str()); @@ -1544,6 +1564,11 @@ void editor_mode::straights_apply(std::vector const &Lin void editor_mode::render_straight_gizmo() { auto &state{m_straights}; + if (state.tool_placed && m_gizmo_enabled) + { + render_straight_tool_gizmo(); + return; + } auto const &line{state.dragging ? state.drag_line : current_straight()}; if (state.handle < 0 || line.tracks.empty() || false == m_gizmo_enabled) { @@ -1769,3 +1794,105 @@ void editor_mode::straight_reshape(editor_track::straight const &Line, double co straight_refresh(); state.status = "Done, the curves can be adjusted in the Route design tab"; } + +double editor_mode::straight_tool_radius(editor_track::straight const &Line) const +{ + if (m_straights.curve_radius > 0.0) + return m_straights.curve_radius; + double speed{-1.0}; + for (auto const *track : Line.tracks) + speed = std::max(speed, editor_track::velocity(*track)); + if (speed <= 0.0) + speed = 100.0; + auto const recommended{alignment::recommend(speed, 1000.0, m_route.design.norms)}; + return std::max(150.0, std::ceil(recommended.radius_min * 1.5 / 50.0) * 50.0); +} + +bool editor_mode::place_straight_tool() +{ + auto &state{m_straights}; + if (ui()->mode() != nodebank_panel::TRACK || m_track_tab != track_tab::straights || state.tool == 0) + return false; + auto const &line{current_straight()}; + if (line.tracks.empty()) + return false; + glm::dvec3 const ground{Global.pCamera.Pos + GfxRenderer->Mouse_Position()}; + auto const along{std::clamp(glm::dot(glm::dvec2{ground.x - line.start.x, ground.z - line.start.z}, line.direction), 0.0, line.length)}; + glm::dvec3 const axis{line.direction.x, line.grade, line.direction.y}; + state.tool_line = line; + state.tool_at = along; + state.tool_point = line.start + axis * along; + auto const reach{std::min(50.0, std::max(1.0, line.length - along))}; + state.tool_handle = state.tool_point + axis * reach; + state.tool_placed = true; + state.tool_dragging = false; + state.handle = -1; + return true; +} + +void editor_mode::render_straight_tool_gizmo() +{ + auto &state{m_straights}; + ImGuizmo::BeginFrame(); + ImGuizmo::SetOrthographic(Global.EditorOrtho); + ImGuiIO const &io = ImGui::GetIO(); + ImGuizmo::SetRect(0.0f, 0.0f, io.DisplaySize.x, io.DisplaySize.y); + glm::mat4 const view = GfxRenderer->Camera_View_Matrix(); + glm::dvec3 const camerapos = GfxRenderer->Camera_Position(); + float const aspect = io.DisplaySize.y > 0.0f ? io.DisplaySize.x / io.DisplaySize.y : 1.0f; + glm::mat4 const projection = editor_mode::projection_matrix(aspect); + if (false == state.tool_dragging) + state.tool_gizmo = glm::translate(glm::mat4(1.0f), glm::vec3(state.tool_handle - camerapos)); + ImGuizmo::Manipulate(glm::value_ptr(view), glm::value_ptr(projection), ImGuizmo::TRANSLATE, ImGuizmo::WORLD, glm::value_ptr(state.tool_gizmo), nullptr, nullptr); + if (ImGuizmo::IsUsing()) + { + state.tool_dragging = true; + auto const moved{camerapos + glm::dvec3(state.tool_gizmo[3])}; + state.tool_handle = {moved.x, state.tool_handle.y, moved.z}; + } + else if (state.tool_dragging) + { + state.tool_dragging = false; + apply_straight_tool(); + } +} + +void editor_mode::apply_straight_tool() +{ + auto &state{m_straights}; + auto const line{state.tool_line}; + auto const offset{glm::dvec2{state.tool_handle.x - state.tool_point.x, state.tool_handle.z - state.tool_point.z}}; + auto const radius{straight_tool_radius(line)}; + if (state.tool == 1) + { + if (glm::length(offset) < 1e-3) + return; + auto const unit{glm::normalize(offset)}; + auto const angle{std::atan2(line.direction.x * unit.y - line.direction.y * unit.x, glm::dot(line.direction, unit))}; + if (std::abs(angle) < 1e-5) + return; + glm::dvec2 const pivot{state.tool_point.x, state.tool_point.z}; + auto const reach{radius * std::tan(std::min(std::abs(angle), 3.0) * 0.5) + 200.0}; + straight_reshape(line, state.tool_at - reach, state.tool_at + reach, + [pivot, angle](glm::dvec3 const &Point) { + glm::dvec2 const relative{Point.x - pivot.x, Point.z - pivot.y}; + auto const c{std::cos(angle)}; + auto const s{std::sin(angle)}; + return glm::dvec3{pivot.x + relative.x * c - relative.y * s, Point.y, pivot.y + relative.x * s + relative.y * c}; + }, + radius); + } + else + { + glm::dvec2 const normal{-line.direction.y, line.direction.x}; + auto const shift{glm::dot(offset, normal)}; + auto const length{glm::dot(offset, line.direction)}; + if (std::abs(shift) < 1e-3 || length < 1.0) + return; + auto const translation{normal * shift}; + straight_reshape(line, state.tool_at, state.tool_at + length, + [translation](glm::dvec3 const &Point) { return glm::dvec3{Point.x + translation.x, Point.y, Point.z + translation.y}; }, + radius); + } + state.tool_placed = false; +} From 5caefa297b80bc3a1e8272a08d3716b48573e01e Mon Sep 17 00:00:00 2001 From: maj00r Date: Fri, 2 Oct 2026 23:24:22 +0200 Subject: [PATCH 055/430] feat(editor): context from path, modifier keys, radius grip, viewport hints --- application/editormode.cpp | 27 +++++ application/editormode.h | 9 ++ application/editormodetrack.cpp | 175 +++++++++++++++++++++++++++++--- 3 files changed, 199 insertions(+), 12 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 706d7e46d..e4479803a 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -1015,6 +1015,8 @@ bool editor_mode::update() draw_route_overlay(); if (ui()->mode() == nodebank_panel::TRACK && m_track_tab == track_tab::straights) draw_straights_overlay(); + if (ui()->mode() == nodebank_panel::TRACK) + draw_track_hints(); // --- area fill: outline overlay while the mode is active (its settings are drawn in the node bank window) --- if (ui()->mode() == nodebank_panel::FILL) @@ -2736,6 +2738,10 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in ui()->set_node(nullptr); simulation::State.delete_model(model); } + else if (selected_track() != nullptr) + { + delete_selected_track(); + } } break; @@ -2745,6 +2751,8 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in m_track_point = {}; m_route.vertex = -1; m_straights.handle = -1; + m_route.grip = -1; + m_straights.tool_placed = false; } break; @@ -2838,6 +2846,21 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const if (mode == nodebank_panel::TRACK) { + if ((Mods & GLFW_MOD_ALT) != 0) + { + GfxRenderer->Pick_Node_Callback([this](scene::basic_node *node) { + if (viewport_click() && dynamic_cast(node) != nullptr) + toggle_straight_set(*dynamic_cast(node)); + }); + m_input.mouse.button(Button, Action); + return; + } + if ((Mods & (GLFW_MOD_CONTROL | GLFW_MOD_SHIFT)) != 0 && m_track_tab == track_tab::straights && false == current_straight().tracks.empty()) + { + start_straight_gesture((Mods & GLFW_MOD_CONTROL) != 0 ? 1 : 2); + m_input.mouse.button(Button, Action); + return; + } if (false == ImGuizmo::IsOver() && false == pick_route_vertex() && false == place_straight_tool() && false == pick_straight_handle() && false == pick_track_handle()) { GfxRenderer->Pick_Node_Callback([this](scene::basic_node *node) { @@ -2941,7 +2964,11 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const else { if (is_release(Action)) + { mouseHold = false; + if (m_straights.tool_mouse) + finish_straight_gesture(); + } m_dragging = false; } diff --git a/application/editormode.h b/application/editormode.h index 4038eca2d..2d7e25201 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -105,6 +105,7 @@ class editor_mode : public application_mode scene::instance_handle instance{0}; // include of a scenery template which was placed or removed, instead of a node std::vector> tracks; std::vector created; + std::vector removed; }; void push_snapshot(scene::basic_node *node, EditorSnapshot::Action Action = EditorSnapshot::Action::Move, std::string const &Serialized = std::string()); @@ -308,6 +309,7 @@ class editor_mode : public application_mode alignment::design design; alignment::result result; int vertex{-1}; + int grip{-1}; }; void render_route_ui(); void route_reset(); @@ -351,6 +353,7 @@ class editor_mode : public application_mode bool auto_transitions{true}; double transition{0.0}; int tool{0}; + bool tool_mouse{false}; bool tool_placed{false}; bool tool_dragging{false}; double tool_at{0.0}; @@ -378,6 +381,12 @@ class editor_mode : public application_mode straights_state m_straights; enum class track_tab { straights, route, path }; track_tab m_track_tab{track_tab::straights}; + int m_track_tab_request{-1}; + void delete_selected_track(); + void start_straight_gesture(int const Tool); + void finish_straight_gesture(); + void toggle_straight_set(TTrack &Track); + void draw_track_hints(); bool m_route_tab{true}; bool m_route_gizmo_using{false}; glm::mat4 m_route_gizmo{1.0f}; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 9d73ac302..fccc54cc9 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -134,8 +134,18 @@ void editor_mode::select_track(scene::basic_node *Node) m_track_point = {}; m_node = track; ui()->set_node(m_node); - if (ui()->mode() == nodebank_panel::TRACK && m_track_tab == track_tab::route && std::find(m_route.chain.tracks.begin(), m_route.chain.tracks.end(), track) == m_route.chain.tracks.end()) - route_from_curve(*track); + if (ui()->mode() != nodebank_panel::TRACK || m_track_tab == track_tab::path) + return; + if (editor_track::is_straight(*track, m_straights.tolerance)) + { + m_track_tab_request = 0; + m_track_tab = track_tab::straights; + } + else if (std::find(m_route.chain.tracks.begin(), m_route.chain.tracks.end(), track) != m_route.chain.tracks.end() || route_from_curve(*track)) + { + m_track_tab_request = 1; + m_track_tab = track_tab::route; + } } bool editor_mode::pick_track_handle() @@ -378,7 +388,7 @@ void editor_mode::push_track_snapshot(std::vector &Opposite, bool const Undo) { - if (Snapshot.tracks.empty()) + if (Snapshot.tracks.empty() && Snapshot.created.empty() && Snapshot.removed.empty()) return; std::vector tracks; @@ -397,11 +407,18 @@ void editor_mode::restore_track_snapshot(EditorSnapshot const &Snapshot, std::ve { for (auto *track : Snapshot.created) editor_track::retire(*track); + for (auto *track : Snapshot.removed) + { + track->m_editorremoved = false; + tracks.push_back(track); + } } else { for (auto *track : Snapshot.created) track->m_editorremoved = false; + for (auto *track : Snapshot.removed) + editor_track::retire(*track); } for (auto const &entry : Snapshot.tracks) editor_track::apply(*entry.first, entry.second); @@ -414,24 +431,26 @@ void editor_mode::restore_track_snapshot(EditorSnapshot const &Snapshot, std::ve m_track_snap = {}; m_track_dirty = false; - if (m_node != tracks.front()) - m_track_point = {}; - m_node = tracks.front(); + m_track_point = {}; + m_node = tracks.empty() || tracks.front()->m_editorremoved ? nullptr : tracks.front(); ui()->set_node(m_node); + straight_refresh(); } void editor_mode::render_track_ui() { if (ImGui::BeginTabBar("##trackediting")) { - if (ImGui::BeginTabItem("Straights")) + auto const request{m_track_tab_request}; + m_track_tab_request = -1; + if (ImGui::BeginTabItem("Straights", nullptr, request == 0 ? ImGuiTabItemFlags_SetSelected : 0)) { m_track_tab = track_tab::straights; m_route_tab = true; render_straights_ui(); ImGui::EndTabItem(); } - if (ImGui::BeginTabItem("Route design")) + if (ImGui::BeginTabItem("Route design", nullptr, request == 1 ? ImGuiTabItemFlags_SetSelected : 0)) { m_track_tab = track_tab::route; m_route_tab = true; @@ -661,6 +680,7 @@ void editor_mode::route_reset() route.error.clear(); route.status.clear(); route.vertex = -1; + route.grip = -1; route.result = {}; if (route.from == nullptr || route.to == nullptr) return; @@ -831,9 +851,25 @@ bool editor_mode::pick_route_vertex() hit = i; } } - if (hit < 0) + int griphit{-1}; + for (int i = 0; i < static_cast(m_route.result.vertex_chainages.size()) && m_route.result.length > 0.0; ++i) + { + ImVec2 screen; + if (false == projection.project(alignment::evaluate(m_route.result, m_route.result.vertex_chainages[i]).position, screen)) + continue; + float const dx = screen.x - mouse.x; + float const dy = screen.y - mouse.y; + if (dx * dx + dy * dy < best) + { + best = dx * dx + dy * dy; + griphit = i; + hit = -1; + } + } + if (hit < 0 && griphit < 0) return false; m_route.vertex = hit; + m_route.grip = griphit; return true; } @@ -889,6 +925,15 @@ void editor_mode::draw_route_overlay() const drawlist->AddCircleFilled(screen, 6.0f, IM_COL32(255, 210, 60, 255)); if (i == route.vertex) drawlist->AddCircle(screen, 11.0f, IM_COL32(255, 255, 255, 255), 16, 2.5f); + if (i < static_cast(result.vertex_chainages.size()) && result.length > 0.0 && projection.project(alignment::evaluate(result, result.vertex_chainages[i]).position, screen)) + { + drawlist->AddCircleFilled(screen, 6.0f, IM_COL32(60, 230, 90, 255), 4); + if (i == route.grip) + drawlist->AddCircle(screen, 11.0f, IM_COL32(255, 255, 255, 255), 16, 2.5f); + char radius[24]; + std::snprintf(radius, sizeof(radius), "R %.0f", i < static_cast(result.curves.size()) ? result.curves[i].radius : design.vertices[i].radius); + drawlist->AddText(ImVec2(screen.x + 9.0f, screen.y + 4.0f), IM_COL32(60, 230, 90, 255), radius); + } char label[8]; std::snprintf(label, sizeof(label), "W%d", i + 1); drawlist->AddText(ImVec2(screen.x + 9.0f, screen.y - 18.0f), IM_COL32(255, 210, 60, 255), label); @@ -899,7 +944,8 @@ void editor_mode::render_route_gizmo() { auto &route{m_route}; auto const count{static_cast(route.design.vertices.size())}; - if (route.vertex < 0 || route.vertex >= count || false == m_gizmo_enabled) + bool const grip{route.grip >= 0 && route.grip < count && route.grip < static_cast(route.result.vertex_chainages.size())}; + if ((false == grip && (route.vertex < 0 || route.vertex >= count)) || false == m_gizmo_enabled) { m_route_gizmo_using = false; return; @@ -914,7 +960,7 @@ void editor_mode::render_route_gizmo() float const aspect = io.DisplaySize.y > 0.0f ? io.DisplaySize.x / io.DisplaySize.y : 1.0f; glm::mat4 const projection = editor_mode::projection_matrix(aspect); - auto const position{route_vertex_position(route.vertex)}; + auto const position{grip ? alignment::evaluate(route.result, route.result.vertex_chainages[route.grip]).position : route_vertex_position(route.vertex)}; if (false == m_route_gizmo_using) m_route_gizmo = glm::translate(glm::mat4(1.0f), glm::vec3(position - camerapos)); glm::vec3 snapvalue(m_gizmo_snap); @@ -923,11 +969,31 @@ void editor_mode::render_route_gizmo() if (false == ImGuizmo::IsUsing()) { - m_route_gizmo_using = false; + if (m_route_gizmo_using) + { + m_route_gizmo_using = false; + route_apply(); + } return; } m_route_gizmo_using = true; glm::dvec3 const moved{camerapos + glm::dvec3(m_route_gizmo[3])}; + if (grip) + { + auto &vertex{route.design.vertices[route.grip]}; + auto const corner{route_vertex_position(route.grip)}; + auto const distance{glm::distance(glm::dvec2{moved.x, moved.z}, glm::dvec2{corner.x, corner.z})}; + for (auto const &curve : route.result.curves) + { + if (curve.vertex != route.grip || vertex.reverse_turn) + continue; + auto const secant{1.0 / std::cos(curve.deflection * 0.5) - 1.0}; + if (secant > 1e-6) + vertex.radius = std::max(10.0, std::round(distance / secant)); + } + route_update(); + return; + } auto &vertex{route.design.vertices[route.vertex]}; glm::dvec2 const point{moved.x, moved.z}; if (count >= 2) @@ -1564,6 +1630,12 @@ void editor_mode::straights_apply(std::vector const &Lin void editor_mode::render_straight_gizmo() { auto &state{m_straights}; + if (state.tool_mouse) + { + glm::dvec3 const ground{Global.pCamera.Pos + GfxRenderer->Mouse_Position()}; + state.tool_handle = {ground.x, state.tool_handle.y, ground.z}; + return; + } if (state.tool_placed && m_gizmo_enabled) { render_straight_tool_gizmo(); @@ -1896,3 +1968,82 @@ void editor_mode::apply_straight_tool() } state.tool_placed = false; } + +void editor_mode::start_straight_gesture(int const Tool) +{ + auto &state{m_straights}; + auto const previous{state.tool}; + state.tool = Tool; + if (false == place_straight_tool()) + { + state.tool = previous; + return; + } + state.tool_mouse = true; +} + +void editor_mode::finish_straight_gesture() +{ + auto &state{m_straights}; + state.tool_mouse = false; + apply_straight_tool(); + state.tool = 0; + state.tool_placed = false; +} + +void editor_mode::toggle_straight_set(TTrack &Track) +{ + auto &state{m_straights}; + auto const line{editor_track::find_straight(Track, state.tolerance)}; + if (line.tracks.empty()) + return; + if (in_straight_set(line)) + state.set.erase(std::remove_if(state.set.begin(), state.set.end(), [&](editor_track::straight const &Member) { return std::any_of(line.tracks.begin(), line.tracks.end(), [&](TTrack const *Other) { return std::find(Member.tracks.begin(), Member.tracks.end(), Other) != Member.tracks.end(); }); }), state.set.end()); + else + state.set.push_back(line); + m_node = &Track; + ui()->set_node(m_node); + m_track_tab_request = 0; + m_track_tab = track_tab::straights; +} + +void editor_mode::delete_selected_track() +{ + auto *track{selected_track()}; + if (track == nullptr || false == track->Dynamics.empty()) + return; + EditorSnapshot snap; + snap.action = EditorSnapshot::Action::TrackEdit; + snap.node_name = track->name(); + snap.position = track->location(); + snap.removed = {track}; + if (m_max_history_size >= 0 && (int)m_history.size() >= m_max_history_size) + m_history.erase(m_history.begin(), m_history.begin() + ((int)m_history.size() - m_max_history_size + 1)); + m_history.push_back(std::move(snap)); + g_redo.clear(); + editor_track::retire(*track); + if (std::find(m_route.chain.tracks.begin(), m_route.chain.tracks.end(), track) != m_route.chain.tracks.end()) + m_route = {}; + m_node = nullptr; + ui()->set_node(nullptr); + m_track_point = {}; + straight_refresh(); +} + +void editor_mode::draw_track_hints() +{ + std::string hint; + if (m_track_tab == track_tab::straights) + hint = current_straight().tracks.empty() ? "LMB: select a straight or a curve" : "Drag the ends or the middle of the straight Ctrl+drag: break Shift+drag: S-curve Alt+click: add to the set Del: delete path"; + else if (m_track_tab == track_tab::route) + hint = m_route.chain.tracks.empty() ? "LMB: select a curve" : "Drag the vertex (yellow) or the radius grip (green), the change is applied on release Ctrl+Z: undo"; + else + hint = "LMB: select a path or a point handle"; + hint += " O: top view"; + ImGuiIO const &io = ImGui::GetIO(); + auto *drawlist{ImGui::GetBackgroundDrawList()}; + ImVec2 const position{12.0f, io.DisplaySize.y - 28.0f}; + auto const size{ImGui::CalcTextSize(hint.c_str())}; + drawlist->AddRectFilled(ImVec2(position.x - 6.0f, position.y - 4.0f), ImVec2(position.x + size.x + 6.0f, position.y + size.y + 4.0f), IM_COL32(0, 0, 0, 150), 4.0f); + drawlist->AddText(position, IM_COL32(255, 255, 255, 230), hint.c_str()); +} From 32798a32bb17a39329f2b1f97284f5088d125e24 Mon Sep 17 00:00:00 2001 From: maj00r Date: Fri, 2 Oct 2026 23:56:19 +0200 Subject: [PATCH 056/430] feat(editor): switch templates, auto distances with snapping --- application/editormode.h | 7 +- application/editormodetrack.cpp | 178 +++++++++++++++++++---------- editor/editorTrack.cpp | 195 ++++++++++++++++++++++++++++++-- editor/editorTrack.hpp | 18 +++ 4 files changed, 326 insertions(+), 72 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index 2d7e25201..2545c5e81 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -332,8 +332,8 @@ class editor_mode : public application_mode int listed{-1}; TTrack *current_for{nullptr}; editor_track::straight current; - editor_track::straight a; - editor_track::straight b; + std::vector neighbours; + std::vector spacings{3.5, 4.0, 4.5, 4.75, 5.0, 5.5, 6.0}; char filter[32]{}; int handle{-1}; bool dragging{false}; @@ -378,6 +378,9 @@ class editor_mode : public application_mode double straight_tool_radius(editor_track::straight const &Line) const; void straight_reshape(editor_track::straight const &Line, double const From, double const To, std::function const &Tail, double const Radius); void straight_refresh(); + void find_neighbour_straights(); + glm::dvec3 snap_straight_offset(editor_track::straight const &Line, glm::dvec3 const &Offset) const; + glm::dvec3 snap_straight_direction(glm::dvec3 const &Pivot, glm::dvec3 const &Moved) const; straights_state m_straights; enum class track_tab { straights, route, path }; track_tab m_track_tab{track_tab::straights}; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index fccc54cc9..fc4796b9d 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -15,6 +15,8 @@ http: #include "utilities/Globals.h" #include "rendering/renderer.h" #include "world/Track.h" +#include "scene/scene.h" +#include "simulation/simulation.h" #include "utilities/Logs.h" #include "imgui/imgui.h" @@ -1232,6 +1234,7 @@ editor_track::straight const &editor_mode::current_straight() m_straights.current_for = track; m_straights.handle = -1; m_straights.current = track != nullptr ? editor_track::find_straight(*track, m_straights.tolerance) : editor_track::straight{}; + find_neighbour_straights(); } return m_straights.current; } @@ -1326,20 +1329,119 @@ void editor_mode::draw_straights_overlay() const drawlist->AddCircle(screen, 12.0f, IM_COL32(255, 255, 255, 255), 16, 2.5f); } } - draw(m_straights.a, IM_COL32(60, 230, 90, 255), 5.0f); - draw(m_straights.b, IM_COL32(255, 60, 255, 255), 5.0f); - if (false == m_straights.a.tracks.empty() && false == m_straights.b.tracks.empty()) + auto const &line{m_straights.current}; + if (line.tracks.empty() || m_straights.dragging) + return; + glm::dvec2 const normal{-line.direction.y, line.direction.x}; + for (auto const &other : m_straights.neighbours) { - auto const &a{m_straights.a}; - for (auto const &point : {m_straights.b.start, m_straights.b.end}) + auto const along = [&](glm::dvec3 const &Point) { return glm::dot(glm::dvec2{Point.x - line.start.x, Point.z - line.start.z}, line.direction); }; + auto const across = [&](glm::dvec3 const &Point) { return glm::dot(glm::dvec2{Point.x - line.start.x, Point.z - line.start.z}, normal); }; + auto const a0{along(other.start)}, a1{along(other.end)}; + auto const from{std::max(0.0, std::min(a0, a1))}; + auto const to{std::min(line.length, std::max(a0, a1))}; + if (to <= from) + continue; + auto const middle{(from + to) * 0.5}; + auto const fraction{std::abs(a1 - a0) > 1e-6 ? (middle - a0) / (a1 - a0) : 0.0}; + auto const lateral{across(other.start) + (across(other.end) - across(other.start)) * fraction}; + glm::dvec3 const foot{line.start.x + line.direction.x * middle, line.start.y + line.grade * middle, line.start.z + line.direction.y * middle}; + glm::dvec3 const target{foot.x + normal.x * lateral, foot.y, foot.z + normal.y * lateral}; + projection.line(drawlist, foot, target, IM_COL32(255, 230, 120, 230), 1.5f); + ImVec2 screen; + if (projection.project((foot + target) * 0.5, screen)) { - auto const along{glm::dot(glm::dvec2{point.x - a.start.x, point.z - a.start.z}, a.direction)}; - auto const foot{a.start + glm::dvec3{a.direction.x, 0.0, a.direction.y} * along + glm::dvec3{0.0, a.grade * along, 0.0}}; - projection.line(drawlist, foot, point, IM_COL32(255, 210, 60, 220), 1.5f); + auto const angle{glm::degrees(std::abs(std::asin(std::clamp(line.direction.x * other.direction.y - line.direction.y * other.direction.x, -1.0, 1.0))))}; + char label[48]; + if (angle > 0.001) + std::snprintf(label, sizeof(label), "%.3f m %.3f deg", std::abs(lateral), angle); + else + std::snprintf(label, sizeof(label), "%.3f m", std::abs(lateral)); + auto const size{ImGui::CalcTextSize(label)}; + drawlist->AddRectFilled(ImVec2(screen.x - 3.0f, screen.y - 2.0f), ImVec2(screen.x + size.x + 3.0f, screen.y + size.y + 2.0f), IM_COL32(0, 0, 0, 170), 3.0f); + drawlist->AddText(screen, IM_COL32(255, 230, 120, 255), label); } } } +void editor_mode::find_neighbour_straights() +{ + auto &state{m_straights}; + state.neighbours.clear(); + auto const &line{state.current}; + if (line.tracks.empty()) + return; + glm::dvec2 const normal{-line.direction.y, line.direction.x}; + auto const middle{(line.start + line.end) * 0.5}; + std::vector visited(line.tracks.begin(), line.tracks.end()); + auto const sections{simulation::Region->sections(middle, static_cast(line.length * 0.5 + 60.0))}; + for (auto *section : sections) + { + for (auto const &cell : section->m_cells) + { + for (auto *track : cell.m_paths) + { + if (std::find(visited.begin(), visited.end(), track) != visited.end() || false == editor_track::is_straight(*track, state.tolerance)) + continue; + auto other{editor_track::find_straight(*track, state.tolerance)}; + visited.insert(visited.end(), other.tracks.begin(), other.tracks.end()); + if (other.tracks.empty() || std::abs(line.direction.x * other.direction.y - line.direction.y * other.direction.x) > std::sin(glm::radians(10.0))) + continue; + auto const offset{glm::dvec2{(other.start + other.end).x * 0.5 - line.start.x, (other.start + other.end).z * 0.5 - line.start.z}}; + if (std::abs(glm::dot(offset, normal)) > 60.0) + continue; + auto const a0{glm::dot(glm::dvec2{other.start.x - line.start.x, other.start.z - line.start.z}, line.direction)}; + auto const a1{glm::dot(glm::dvec2{other.end.x - line.start.x, other.end.z - line.start.z}, line.direction)}; + if (std::max(a0, a1) <= 0.0 || std::min(a0, a1) >= line.length) + continue; + state.neighbours.push_back(std::move(other)); + } + } + } +} + +glm::dvec3 editor_mode::snap_straight_offset(editor_track::straight const &Line, glm::dvec3 const &Offset) const +{ + glm::dvec2 const normal{-Line.direction.y, Line.direction.x}; + auto const middle{(Line.start + Line.end) * 0.5 + Offset}; + double best{0.2}; + double correction{0.0}; + for (auto const &other : m_straights.neighbours) + { + if (std::abs(Line.direction.x * other.direction.y - Line.direction.y * other.direction.x) > std::sin(glm::radians(0.5))) + continue; + auto const distance{glm::dot(glm::dvec2{other.start.x - middle.x, other.start.z - middle.z}, normal)}; + for (auto const spacing : m_straights.spacings) + { + auto const error{std::abs(distance) - spacing}; + if (std::abs(error) < best) + { + best = std::abs(error); + correction = distance > 0.0 ? error : -error; + } + } + } + return Offset + glm::dvec3{normal.x, 0.0, normal.y} * correction; +} + +glm::dvec3 editor_mode::snap_straight_direction(glm::dvec3 const &Pivot, glm::dvec3 const &Moved) const +{ + glm::dvec2 const offset{Moved.x - Pivot.x, Moved.z - Pivot.z}; + auto const length{glm::length(offset)}; + if (length < 1e-3) + return Moved; + auto const direction{offset / length}; + for (auto const &other : m_straights.neighbours) + { + auto const sine{direction.x * other.direction.y - direction.y * other.direction.x}; + if (std::abs(sine) > std::sin(glm::radians(0.5))) + continue; + auto const aligned{other.direction * (glm::dot(direction, other.direction) < 0.0 ? -1.0 : 1.0)}; + return {Pivot.x + aligned.x * length, Moved.y, Pivot.z + aligned.y * length}; + } + return Moved; +} + void editor_mode::render_straights_ui() { auto &state{m_straights}; @@ -1403,12 +1505,6 @@ void editor_mode::render_straights_ui() ImGui::Text("To (%.3f, %.3f, %.3f)", line.end.x, line.end.y, line.end.z); ImGui::Text("Paths: %s ... %s", line.tracks.front()->name().c_str(), line.tracks.back()->name().c_str()); ImGui::Unindent(); - if (ImGui::Button("Set as A")) - state.a = line; - ImGui::SameLine(); - if (ImGui::Button("Set as B")) - state.b = line; - ImGui::SameLine(); if (in_straight_set(line)) { if (ImGui::Button("Remove from the set")) @@ -1496,48 +1592,11 @@ void editor_mode::render_straights_ui() state.set.clear(); } - ImGui::Separator(); - auto const &a{state.a}; - auto const &b{state.b}; - ImGui::TextColored(ImVec4(0.25f, 0.9f, 0.35f, 1.0f), "A: %s", a.tracks.empty() ? "-" : describe(a).c_str()); - ImGui::TextColored(ImVec4(1.0f, 0.25f, 1.0f, 1.0f), "B: %s", b.tracks.empty() ? "-" : describe(b).c_str()); - if (a.tracks.empty() || b.tracks.empty()) - return; - - auto const cross{a.direction.x * b.direction.y - a.direction.y * b.direction.x}; - auto const dot{glm::dot(a.direction, b.direction)}; - auto const between{glm::degrees(std::atan2(std::abs(cross), std::abs(dot)))}; - auto const offset = [&](glm::dvec3 const &Point) { - glm::dvec2 const relative{Point.x - a.start.x, Point.z - a.start.z}; - return a.direction.x * relative.y - a.direction.y * relative.x; - }; - auto const along = [&](glm::dvec3 const &Point) { return glm::dot(glm::dvec2{Point.x - a.start.x, Point.z - a.start.z}, a.direction); }; - auto const height = [&](glm::dvec3 const &Point) { return Point.y - (a.start.y + a.grade * along(Point)); }; - auto const startoffset{offset(b.start)}; - auto const endoffset{offset(b.end)}; - auto const from{std::max(0.0, std::min(along(b.start), along(b.end)))}; - auto const to{std::min(a.length, std::max(along(b.start), along(b.end)))}; - - ImGui::Text("Angle between A and B: %.5f deg%s", between, between < 0.001 ? " (parallel)" : ""); - ImGui::Text("Distance of B from A: start %.3f m, end %.3f m, change %.3f m", std::abs(startoffset), std::abs(endoffset), std::abs(endoffset - startoffset)); - ImGui::Text("B lies on the %s of A", (startoffset + endoffset) > 0.0 ? "left" : "right"); - ImGui::Text("Height of B above A: start %.3f m, end %.3f m", height(b.start), height(b.end)); - ImGui::Text("Grade difference: %.2f per mille", (b.grade * (dot < 0.0 ? -1.0 : 1.0) - a.grade) * 1000.0); - ImGui::Text("Overlap along A: %.2f m", std::max(0.0, to - from)); - - ImGui::PushItemWidth(120.0f); - ImGui::InputDouble("Distance (m)", &state.distance, 0.0, 0.0, "%.3f"); - ImGui::PopItemWidth(); - ImGui::SameLine(); - if (ImGui::Button("Make B parallel to A at this distance")) + if (false == state.neighbours.empty()) { - auto const side{(startoffset + endoffset) >= 0.0 ? 1.0 : -1.0}; - glm::dvec2 const direction{a.direction * (dot < 0.0 ? -1.0 : 1.0)}; - glm::dvec2 const normal{-a.direction.y, a.direction.x}; - auto const startalong{along(b.start)}; - auto const start2d{glm::dvec2{a.start.x, a.start.z} + a.direction * startalong + normal * (side * std::abs(state.distance))}; - auto const end2d{start2d + direction * b.length}; - straight_apply(b, {start2d.x, b.start.y, start2d.y}, {end2d.x, b.end.y, end2d.y}); + ImGui::Separator(); + ImGui::Text("Neighbouring straights: %zu (distances shown in the view)", state.neighbours.size()); + ImGui::TextDisabled("Dragging the middle snaps the distance to: 3.5, 4.0, 4.5, 4.75, 5.0, 5.5, 6.0 m; dragging an end snaps parallel"); } } @@ -1580,9 +1639,7 @@ void editor_mode::straight_refresh() auto &state{m_straights}; state.current_for = selected_track(); state.current = state.current_for != nullptr ? editor_track::find_straight(*state.current_for, state.tolerance) : editor_track::straight{}; - for (auto *line : {&state.a, &state.b}) - if (false == line->tracks.empty()) - *line = editor_track::find_straight(*line->tracks.front(), state.tolerance); + find_neighbour_straights(); for (auto &line : state.found) if (false == line.tracks.empty()) line = editor_track::find_straight(*line.tracks.front(), state.tolerance); @@ -1696,17 +1753,18 @@ void editor_mode::render_straight_gizmo() m_track_drag = tracks; } auto const &grabbed{state.drag_line}; - glm::dvec3 const moved{camerapos + glm::dvec3(state.gizmo[3])}; + glm::dvec3 moved{camerapos + glm::dvec3(state.gizmo[3])}; std::function transform; if (state.handle == 2) { - auto const offset{moved - (grabbed.start + grabbed.end) * 0.5}; + auto const offset{snap_straight_offset(grabbed, moved - (grabbed.start + grabbed.end) * 0.5)}; transform = [offset](glm::dvec3 const &Point) { return Point + offset; }; } else { auto const pivot{state.handle == 0 ? grabbed.end : grabbed.start}; auto const original{state.handle == 0 ? grabbed.start : grabbed.end}; + moved = snap_straight_direction(pivot, moved); glm::dvec2 const before{original.x - pivot.x, original.z - pivot.z}; glm::dvec2 const after{moved.x - pivot.x, moved.z - pivot.z}; auto const lengthbefore{glm::length(before)}; diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index 32542f323..f7a4f778a 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -22,6 +22,7 @@ http: #include #include #include +#include #include #include #include @@ -1043,6 +1044,176 @@ bool editor_track::find_curve(TTrack &Track, straight_tolerance const &Tolerance return true; } +std::vector editor_track::find_switch_templates() +{ + std::vector result; + std::map lookup; + for (auto *track : simulation::Paths.sequence()) + { + if (track == nullptr || track->m_editorremoved || track->eType != tt_Switch || track->m_paths.size() < 2 || (track->iCategoryFlag & 0x80) != 0) + continue; + auto const &main{track->m_paths[0]}; + auto const origin{main.points[segment_data::point::start]}; + auto const chord{plan_of(main.points[segment_data::point::end] - origin)}; + if (glm::length(chord) < 1.0) + continue; + auto const axis{glm::normalize(chord)}; + glm::dvec2 const normal{-axis.y, axis.x}; + auto const tolocal = [&](glm::dvec3 const &Vector) { + auto const planar{plan_of(Vector)}; + return glm::dvec3{glm::dot(planar, normal), Vector.y, glm::dot(planar, axis)}; + }; + switch_template entry; + entry.source = track; + for (int i = 0; i < 2; ++i) + { + auto const &path{track->m_paths[i]}; + auto &local{entry.local[i]}; + local = path; + local.points[segment_data::point::start] = tolocal(path.points[segment_data::point::start] - origin); + local.points[segment_data::point::end] = tolocal(path.points[segment_data::point::end] - origin); + local.points[segment_data::point::control1] = tolocal(path.points[segment_data::point::control1]); + local.points[segment_data::point::control2] = tolocal(path.points[segment_data::point::control2]); + } + if (glm::length(glm::dvec2{entry.local[1].points[segment_data::point::start].x, entry.local[1].points[segment_data::point::start].z}) > kSamePoint) + continue; + if (entry.local[1].points[segment_data::point::end].x < 0.0) + { + for (auto &path : entry.local) + { + for (auto &point : path.points) + point.x = -point.x; + path.rolls = {-path.rolls[0], -path.rolls[1]}; + } + } + entry.length = entry.local[0].points[segment_data::point::end].z; + auto const tangent{path_tangent(entry.local[1], true)}; + auto const angle{std::atan2(std::abs(tangent.x), tangent.z)}; + entry.ratio = angle > 1e-6 ? 1.0 / std::tan(angle) : 0.0; + entry.radius = path_radius(entry.local[1], 0.25); + char key[256]; + std::snprintf(key, sizeof(key), "%.2f|%.2f|%.2f|%s|%s", entry.length, entry.local[1].points[segment_data::point::end].x, entry.local[1].points[segment_data::point::end].z, material_name(track->m_material1).c_str(), material_name(track->m_material2).c_str()); + auto const found{lookup.find(key)}; + if (found != lookup.end()) + { + ++result[found->second].count; + continue; + } + entry.count = 1; + char label[256]; + std::snprintf(label, sizeof(label), "L %.2f m 1:%.1f R %.0f m %s", entry.length, entry.ratio, entry.radius, material_name(track->m_material1).c_str()); + entry.label = label; + lookup.emplace(key, result.size()); + result.push_back(entry); + } + std::sort(result.begin(), result.end(), [](switch_template const &A, switch_template const &B) { return A.count > B.count; }); + return result; +} + +std::vector editor_track::place_switch(switch_template const &Template, glm::dvec3 const &Origin, glm::dvec2 const &Direction, int const Side, double const Grade) +{ + std::vector result; + glm::dvec2 const normal{-Direction.y, Direction.x}; + auto const side{static_cast(Side)}; + auto const vector = [&](glm::dvec3 const &Local) { + auto const planar{Direction * Local.z + normal * (Local.x * side)}; + return glm::dvec3{planar.x, Local.y + Grade * Local.z, planar.y}; + }; + for (auto const &local : Template.local) + { + segment_data path{local}; + path.points[segment_data::point::start] = Origin + vector(local.points[segment_data::point::start]); + path.points[segment_data::point::end] = Origin + vector(local.points[segment_data::point::end]); + path.points[segment_data::point::control1] = vector(local.points[segment_data::point::control1]); + path.points[segment_data::point::control2] = vector(local.points[segment_data::point::control2]); + if (Side < 0) + path.rolls = {-local.rolls[0], -local.rolls[1]}; + result.push_back(path); + } + return result; +} + +std::vector editor_track::standard_switch_templates() +{ + struct definition + { + char const *name; + double radius; + double ratio; + double a; + double b; + }; + definition const definitions[] = { + {"Rz 1:9 R190", 190.0, 9.0, 10.523, 16.615}, + {"Rz 1:9 R300", 300.0, 9.0, 16.615, 16.615}, + {"Rz 1:12 R500", 500.0, 12.0, 20.797, 0.0}, + {"Rz 1:14 R760", 760.0, 14.0, 0.0, 0.0}, + {"Rz 1:18,5 R1200", 1200.0, 18.5, 32.409, 34.943}, + {"Rz 1:26,5 R2500", 2500.0, 26.5, 0.0, 0.0}, + }; + std::vector result; + for (auto const &definition : definitions) + { + auto const angle{std::atan(1.0 / definition.ratio)}; + auto const a{definition.a > 0.0 ? definition.a : definition.radius * std::tan(angle * 0.5)}; + auto const estimated{definition.b <= 0.0}; + auto const b{estimated ? 1.87 * definition.ratio : definition.b}; + auto const offset{b * std::tan(angle)}; + switch_template entry; + entry.a = a; + entry.b = b; + entry.length = a + b; + entry.ratio = definition.ratio; + entry.radius = definition.radius; + auto &main{entry.local[0]}; + main.points[segment_data::point::end] = {0.0, 0.0, a + b}; + auto &diverging{entry.local[1]}; + diverging.points[segment_data::point::end] = {offset, 0.0, a + b}; + diverging.points[segment_data::point::control1] = {0.0, 0.0, a * 2.0 / 3.0}; + diverging.points[segment_data::point::control2] = {-offset * 2.0 / 3.0, 0.0, -b * 2.0 / 3.0}; + diverging.radius = static_cast(definition.radius); + entry.label = std::string{definition.name} + " a " + std::to_string(a).substr(0, std::to_string(a).find('.') + 4) + " b " + std::to_string(b).substr(0, std::to_string(b).find('.') + 4) + (estimated ? " (b est.)" : ""); + result.push_back(entry); + } + return result; +} + +TTrack *editor_track::create_switch(switch_template const &Template, std::vector const &Paths, TTrack const &Style) +{ + if (Paths.size() < 2) + return nullptr; + TTrack *track{nullptr}; + if (Template.source != nullptr) + { + track = clone(*Template.source); + } + else + { + char const *environments[] = {"flat", "mountains", "canyon", "tunnel", "bridge", "bank"}; + auto const environment{Style.eEnvironment >= e_flat && Style.eEnvironment <= e_bank ? environments[Style.eEnvironment] : "flat"}; + std::ostringstream text; + text.precision(std::numeric_limits::digits10); + text << "switch " << Template.length << ' ' << Style.fTrackWidth << ' ' << Style.fFriction << ' ' << 10.0 << ' ' << Style.iQualityFlag << ' ' << 0 << ' ' << environment << ' '; + if (Style.m_visible) + text << "vis " << material_name(Style.m_material1) << ' ' << Style.fTexLength << ' ' << material_name(Style.m_material2) << ' ' << texture_height(Style) << ' ' << Style.fTexWidth << ' ' << Style.fTexSlope << ' '; + else + text << "unvis "; + for (int i = 0; i < 2; ++i) + { + auto const &path{Paths[i]}; + auto const &start{path.points[segment_data::point::start]}; + auto const &control1{path.points[segment_data::point::control1]}; + auto const &control2{path.points[segment_data::point::control2]}; + auto const &end{path.points[segment_data::point::end]}; + text << start.x << ' ' << start.y << ' ' << start.z << ' ' << path.rolls[0] << ' ' << control1.x << ' ' << control1.y << ' ' << control1.z << ' ' << control2.x << ' ' << control2.y << ' ' << control2.z << ' ' << end.x << ' ' << end.y << ' ' << end.z << ' ' << path.rolls[1] << ' ' << path.radius << ' '; + } + text << "endtrack\n"; + track = load_path(text.str(), Style); + } + track->m_paths.assign(Paths.begin(), Paths.begin() + 2); + return track; +} + std::vector editor_track::straight_affected(std::vector const &Lines) { std::vector result; @@ -1252,18 +1423,23 @@ TTrack *editor_track::clone(TTrack const &Template) { std::ostringstream text; Template.export_as_text_(text); - cParser parser(text.str(), cParser::buffer_TEXT); - parser.getTokens(); - std::string token; - parser >> token; + auto content{text.str()}; + auto const type{content.find("track ")}; + if (type == 0) + content.erase(0, 6); + auto *track{load_path(content, Template)}; + track->m_friction = Template.m_friction; + return track; +} +TTrack *editor_track::load_path(std::string const &Text, TTrack const &Template) +{ + cParser parser(Text, cParser::buffer_TEXT); scene::node_data data; data.type = "track"; - if (false == Template.name().empty() && Template.name() != "none") - { - for (int i = 1; data.name.empty() || simulation::Paths.find(data.name) != nullptr; ++i) - data.name = Template.name() + "_" + std::to_string(i); - } + auto const base{Template.name().empty() || Template.name() == "none" ? std::string{"editor_track"} : Template.name()}; + for (int i = 1; data.name.empty() || simulation::Paths.find(data.name) != nullptr; ++i) + data.name = base + "_" + std::to_string(i); auto *track = new TTrack(data); track->m_rangesquaredmin = Template.m_rangesquaredmin; track->m_rangesquaredmax = Template.m_rangesquaredmax; @@ -1271,7 +1447,6 @@ TTrack *editor_track::clone(TTrack const &Template) for (auto *events : {&track->m_events0, &track->m_events1, &track->m_events2, &track->m_events0all, &track->m_events1all, &track->m_events2all}) events->clear(); track->m_events = false; - track->m_friction = Template.m_friction; simulation::Paths.insert(track); return track; } diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index 27b9ac923..ad8282847 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -9,6 +9,7 @@ http: #pragma once +#include #include #include #include @@ -129,6 +130,22 @@ class editor_track double cant{0.0}; }; static bool find_curve(TTrack &Track, straight_tolerance const &Tolerance, double const Gauge, curve &Curve); + struct switch_template + { + TTrack *source{nullptr}; + std::array local; + double length{0.0}; + double ratio{0.0}; + double radius{0.0}; + int count{0}; + std::string label; + double a{0.0}; + double b{0.0}; + }; + static std::vector standard_switch_templates(); + static std::vector find_switch_templates(); + static std::vector place_switch(switch_template const &Template, glm::dvec3 const &Origin, glm::dvec2 const &Direction, int const Side, double const Grade); + static TTrack *create_switch(switch_template const &Template, std::vector const &Paths, TTrack const &Style); static void move_straights(std::vector const &Lines, std::vector> const &Ends); static std::vector relay(chain const &Chain, std::vector const &Pieces); static void retire(TTrack &Track); @@ -152,5 +169,6 @@ class editor_track static void store_switch_path(TTrack &Switch, int const Path); static void rebuild_geometry(TTrack &Track); static TTrack *clone(TTrack const &Template); + static TTrack *load_path(std::string const &Text, TTrack const &Template); static void move_straight(straight const &Line, glm::dvec3 const &Start, glm::dvec3 const &End, std::function const &Member); }; From 1985758a86c8e36d867e26b09d7ceba3ba709513 Mon Sep 17 00:00:00 2001 From: maj00r Date: Fri, 2 Oct 2026 23:58:48 +0200 Subject: [PATCH 057/430] feat(editor): insert switches by dragging, paths from free ends --- application/editormode.cpp | 13 ++ application/editormode.h | 33 ++++ application/editormodetrack.cpp | 341 +++++++++++++++++++++++++++++++- editor/editorTrack.cpp | 28 +++ editor/editorTrack.hpp | 3 +- 5 files changed, 415 insertions(+), 3 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index e4479803a..77afe2e71 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -1016,7 +1016,11 @@ bool editor_mode::update() if (ui()->mode() == nodebank_panel::TRACK && m_track_tab == track_tab::straights) draw_straights_overlay(); if (ui()->mode() == nodebank_panel::TRACK) + { + update_build_tools(); + draw_build_overlay(); draw_track_hints(); + } // --- area fill: outline overlay while the mode is active (its settings are drawn in the node bank window) --- if (ui()->mode() == nodebank_panel::FILL) @@ -2846,6 +2850,11 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const if (mode == nodebank_panel::TRACK) { + if (start_extend() || start_switch_placement()) + { + m_input.mouse.button(Button, Action); + return; + } if ((Mods & GLFW_MOD_ALT) != 0) { GfxRenderer->Pick_Node_Callback([this](scene::basic_node *node) { @@ -2968,6 +2977,10 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const mouseHold = false; if (m_straights.tool_mouse) finish_straight_gesture(); + if (m_extend.active) + finish_extend(); + if (m_switch.placing) + finish_switch_placement(); } m_dragging = false; diff --git a/application/editormode.h b/application/editormode.h index 2545c5e81..1ff98fd3b 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -382,6 +382,39 @@ class editor_mode : public application_mode glm::dvec3 snap_straight_offset(editor_track::straight const &Line, glm::dvec3 const &Offset) const; glm::dvec3 snap_straight_direction(glm::dvec3 const &Pivot, glm::dvec3 const &Moved) const; straights_state m_straights; + + struct switch_tool + { + std::vector templates; + bool collected{false}; + int armed{-1}; + bool placing{false}; + double along{0.0}; + glm::dvec3 point{0.0}; + glm::dvec3 mouse{0.0}; + editor_track::straight line; + }; + switch_tool m_switch; + struct extend_tool + { + bool active{false}; + TTrack *track{nullptr}; + glm::dvec3 point{0.0}; + glm::dvec2 direction{0.0, 1.0}; + double grade{0.0}; + glm::dvec3 mouse{0.0}; + }; + extend_tool m_extend; + void render_switch_ui(); + bool start_switch_placement(); + void finish_switch_placement(); + std::vector switch_preview() const; + void insert_switch(editor_track::straight const &Line, double const Along, int const Direction, int const Side); + bool start_extend(); + void finish_extend(); + std::vector extend_pieces() const; + void update_build_tools(); + void draw_build_overlay() const; enum class track_tab { straights, route, path }; track_tab m_track_tab{track_tab::straights}; int m_track_tab_request{-1}; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index fc4796b9d..57cd984b0 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -1583,6 +1583,7 @@ void editor_mode::render_straights_ui() } if (false == state.status.empty()) ImGui::TextColored(ImVec4(1.0f, 0.7f, 0.2f, 1.0f), "%s", state.status.c_str()); + render_switch_ui(); if (false == state.set.empty()) { @@ -2091,8 +2092,14 @@ void editor_mode::delete_selected_track() void editor_mode::draw_track_hints() { std::string hint; - if (m_track_tab == track_tab::straights) - hint = current_straight().tracks.empty() ? "LMB: select a straight or a curve" : "Drag the ends or the middle of the straight Ctrl+drag: break Shift+drag: S-curve Alt+click: add to the set Del: delete path"; + if (m_extend.active) + hint = "Drag: curve through the cursor, along the end: straight Ctrl: straight"; + else if (m_switch.placing) + hint = "Drag along the straight to set the direction of the switch, sideways to set its side"; + else if (m_switch.armed >= 0 && m_track_tab == track_tab::straights) + hint = "Press on the selected straight where the switch starts and drag"; + else if (m_track_tab == track_tab::straights) + hint = current_straight().tracks.empty() ? "LMB: select a straight or a curve" : "Drag the ends or the middle Ctrl+drag: break Shift+drag: S-curve Alt+click: add to the set Drag from a red ring: new path Del: delete"; else if (m_track_tab == track_tab::route) hint = m_route.chain.tracks.empty() ? "LMB: select a curve" : "Drag the vertex (yellow) or the radius grip (green), the change is applied on release Ctrl+Z: undo"; else @@ -2105,3 +2112,333 @@ void editor_mode::draw_track_hints() drawlist->AddRectFilled(ImVec2(position.x - 6.0f, position.y - 4.0f), ImVec2(position.x + size.x + 6.0f, position.y + size.y + 4.0f), IM_COL32(0, 0, 0, 150), 4.0f); drawlist->AddText(position, IM_COL32(255, 255, 255, 230), hint.c_str()); } + +void editor_mode::update_build_tools() +{ + glm::dvec3 const ground{Global.pCamera.Pos + GfxRenderer->Mouse_Position()}; + if (m_extend.active) + m_extend.mouse = ground; + if (m_switch.placing) + m_switch.mouse = ground; +} + +bool editor_mode::start_extend() +{ + auto *track{selected_track()}; + if (track == nullptr || track->eType != tt_Normal || false == editor_track::is_supported(*track) || false == track->Dynamics.empty()) + return false; + screen_projection const projection; + ImVec2 const mouse = ImGui::GetIO().MousePos; + auto const &path{track->m_paths.front()}; + for (auto const atend : {false, true}) + { + editor_track::point_ref const point{0, atend ? editor_track::point_kind::end : editor_track::point_kind::start}; + if (editor_track::is_connected(*track, point)) + continue; + auto const position{editor_track::point_position(*track, point)}; + ImVec2 screen; + if (false == projection.project(position, screen)) + continue; + if ((screen.x - mouse.x) * (screen.x - mouse.x) + (screen.y - mouse.y) * (screen.y - mouse.y) > kHandleRadius * kHandleRadius * 1.5f) + continue; + auto const &start{path.points[segment_data::point::start]}; + auto const &end{path.points[segment_data::point::end]}; + auto const &control1{path.points[segment_data::point::control1]}; + auto const &control2{path.points[segment_data::point::control2]}; + glm::dvec3 tangent; + if (atend) + tangent = control2 != glm::dvec3{} ? -control2 : end - (start + control1); + else + tangent = -(control1 != glm::dvec3{} ? control1 : (end + control2) - start); + glm::dvec2 const planar{tangent.x, tangent.z}; + if (glm::length(planar) < 1e-6) + return false; + m_extend.active = true; + m_extend.track = track; + m_extend.point = position; + m_extend.direction = glm::normalize(planar); + m_extend.grade = tangent.y / glm::length(planar); + m_extend.mouse = position; + return true; + } + return false; +} + +std::vector editor_mode::extend_pieces() const +{ + std::vector result; + auto const &tool{m_extend}; + glm::dvec2 const offset{tool.mouse.x - tool.point.x, tool.mouse.z - tool.point.z}; + auto const chord{glm::length(offset)}; + if (chord < 0.5) + return result; + auto const &direction{tool.direction}; + auto const along{glm::dot(offset, direction)}; + auto const lateral{direction.x * offset.y - direction.y * offset.x}; + auto const height = [&](double const Distance) { return tool.point.y + tool.grade * Distance; }; + if (ImGui::GetIO().KeyCtrl || std::abs(lateral) < 0.005 * chord + 0.05) + { + if (along < 0.5) + return result; + segment_data path; + path.points[segment_data::point::start] = tool.point; + path.points[segment_data::point::end] = {tool.point.x + direction.x * along, height(along), tool.point.z + direction.y * along}; + result.push_back(path); + return result; + } + auto const angle{2.0 * std::atan2(std::abs(lateral), along)}; + auto const radius{chord / (2.0 * std::sin(angle * 0.5))}; + double const side{lateral > 0.0 ? 1.0 : -1.0}; + glm::dvec2 const centre{glm::dvec2{tool.point.x, tool.point.z} + glm::dvec2{-direction.y, direction.x} * (side * radius)}; + auto const count{std::max(1, static_cast(std::ceil(angle / glm::radians(10.0) - 1e-9)))}; + auto const step{angle / count}; + auto const handle{4.0 / 3.0 * std::tan(step / 4.0) * radius}; + auto const turn = [&](glm::dvec2 const &Vector, double const Angle) { + auto const c{std::cos(Angle)}; + auto const s{std::sin(Angle)}; + return glm::dvec2{Vector.x * c - Vector.y * s, Vector.x * s + Vector.y * c}; + }; + glm::dvec2 const radial{glm::dvec2{tool.point.x, tool.point.z} - centre}; + for (int i = 0; i < count; ++i) + { + auto const a0{side * step * i}; + auto const a1{side * step * (i + 1)}; + auto const p0{centre + turn(radial, a0)}; + auto const p3{centre + turn(radial, a1)}; + auto const d0{turn(direction, a0)}; + auto const d3{turn(direction, a1)}; + auto const y0{height(radius * step * i)}; + auto const y3{height(radius * step * (i + 1))}; + segment_data path; + path.points[segment_data::point::start] = {p0.x, y0, p0.y}; + path.points[segment_data::point::end] = {p3.x, y3, p3.y}; + path.points[segment_data::point::control1] = {d0.x * handle, tool.grade * handle, d0.y * handle}; + path.points[segment_data::point::control2] = {-d3.x * handle, -tool.grade * handle, -d3.y * handle}; + path.radius = static_cast(radius); + result.push_back(path); + } + return result; +} + +void editor_mode::finish_extend() +{ + auto const pieces{extend_pieces()}; + auto *style{m_extend.track}; + m_extend.active = false; + if (pieces.empty() || style == nullptr) + return; + std::vector created; + for (auto const &piece : pieces) + created.push_back(editor_track::create_path(*style, piece)); + editor_track::commit(created); + push_track_snapshot({}, created); + m_node = created.back(); + ui()->set_node(m_node); + straight_refresh(); +} + +std::vector editor_mode::switch_preview() const +{ + auto const &tool{m_switch}; + if (false == tool.placing || tool.armed < 0 || tool.armed >= static_cast(tool.templates.size())) + return {}; + auto const &line{tool.line}; + glm::dvec2 const offset{tool.mouse.x - tool.point.x, tool.mouse.z - tool.point.z}; + auto const forward{glm::dot(offset, line.direction) >= 0.0 ? 1 : -1}; + glm::dvec2 const direction{line.direction * static_cast(forward)}; + auto const side{direction.x * offset.y - direction.y * offset.x >= 0.0 ? 1 : -1}; + return editor_track::place_switch(tool.templates[tool.armed], tool.point, direction, side, line.grade * forward); +} + +bool editor_mode::start_switch_placement() +{ + auto &tool{m_switch}; + if (tool.armed < 0 || m_track_tab != track_tab::straights) + return false; + auto const &line{current_straight()}; + if (line.tracks.empty()) + return false; + glm::dvec3 const ground{Global.pCamera.Pos + GfxRenderer->Mouse_Position()}; + tool.along = std::clamp(glm::dot(glm::dvec2{ground.x - line.start.x, ground.z - line.start.z}, line.direction), 0.0, line.length); + tool.point = line.start + glm::dvec3{line.direction.x, line.grade, line.direction.y} * tool.along; + tool.mouse = ground; + tool.line = line; + tool.placing = true; + return true; +} + +void editor_mode::finish_switch_placement() +{ + auto &tool{m_switch}; + tool.placing = false; + if (tool.armed < 0 || tool.armed >= static_cast(tool.templates.size())) + return; + glm::dvec2 const offset{tool.mouse.x - tool.point.x, tool.mouse.z - tool.point.z}; + auto const forward{glm::dot(offset, tool.line.direction) >= 0.0 ? 1 : -1}; + glm::dvec2 const direction{tool.line.direction * static_cast(forward)}; + auto const side{direction.x * offset.y - direction.y * offset.x >= 0.0 ? 1 : -1}; + insert_switch(tool.line, tool.along, forward, side); +} + +void editor_mode::insert_switch(editor_track::straight const &Line, double const Along, int const Direction, int const Side) +{ + auto &state{m_straights}; + state.status.clear(); + auto const &shape{m_switch.templates[m_switch.armed]}; + auto const from{Direction > 0 ? Along : Along - shape.length}; + auto const to{from + shape.length}; + if (from < -0.01 || to > Line.length + 0.01) + { + state.status = "The switch doesn't fit on the straight here"; + return; + } + struct span + { + TTrack *track; + int path; + double from, to; + bool forward; + }; + auto const along = [&](glm::dvec3 const &Point) { return glm::dot(glm::dvec2{Point.x - Line.start.x, Point.z - Line.start.z}, Line.direction); }; + std::vector spans; + for (std::size_t i = 0; i < Line.tracks.size(); ++i) + { + auto const &path{Line.tracks[i]->m_paths[Line.paths[i]]}; + auto const a{along(path.points[segment_data::point::start])}; + auto const b{along(path.points[segment_data::point::end])}; + spans.push_back({Line.tracks[i], Line.paths[i], std::min(a, b), std::max(a, b), a < b}); + } + std::sort(spans.begin(), spans.end(), [](span const &A, span const &B) { return A.from < B.from; }); + int first{-1}, last{-1}; + for (int i = 0; i < static_cast(spans.size()); ++i) + { + if (spans[i].to > from + 1e-3 && spans[i].from < to - 1e-3) + { + if (first < 0) + first = i; + last = i; + } + } + if (first < 0) + return; + editor_track::chain chain; + for (int i = first; i <= last; ++i) + { + if (spans[i].track->eType != tt_Normal || false == spans[i].track->Dynamics.empty()) + { + state.status = "The switch would overlap another switch or a path with vehicles"; + return; + } + chain.tracks.push_back(spans[i].track); + chain.forward.push_back(spans[i].forward); + } + auto const before{std::max(0.0, from - spans[first].from)}; + auto const after{std::max(0.0, spans[last].to - to)}; + bool const hasbefore{before > 0.01}; + bool const hasafter{after > 0.01}; + if (false == hasbefore && false == hasafter) + { + state.status = "The switch would replace the paths completely, place it so that a piece of the straight remains"; + return; + } + auto const count{std::max(chain.tracks.size(), (hasbefore ? 1 : 0) + (hasafter ? 1 : 0))}; + std::size_t countbefore{0}; + if (hasbefore && hasafter) + countbefore = std::clamp(static_cast(std::round(count * before / (before + after))), 1, count - 1); + else if (hasbefore) + countbefore = count; + auto const point = [&](double const Distance) { return Line.start + glm::dvec3{Line.direction.x, Line.grade, Line.direction.y} * Distance; }; + std::vector pieces; + auto const straight = [&](double const From, double const To, std::size_t const Count) { + for (std::size_t i = 0; i < Count; ++i) + { + segment_data path; + path.points[segment_data::point::start] = point(From + (To - From) * i / Count); + path.points[segment_data::point::end] = point(From + (To - From) * (i + 1) / Count); + pieces.push_back(path); + } + }; + if (hasbefore) + straight(spans[first].from, from, countbefore); + if (hasafter) + straight(to, spans[last].to, count - countbefore); + + std::vector> states; + for (auto *track : chain.tracks) + states.emplace_back(track, editor_track::capture(*track)); + auto created{editor_track::relay(chain, pieces)}; + glm::dvec2 const direction{Line.direction * static_cast(Direction)}; + auto const paths{editor_track::place_switch(shape, point(Along), direction, Side, Line.grade * Direction)}; + auto *track{editor_track::create_switch(shape, paths, *spans[first].track)}; + if (track != nullptr) + { + editor_track::commit({track}); + created.push_back(track); + } + push_track_snapshot(std::move(states), std::move(created)); + straight_refresh(); + state.status = "Switch inserted"; +} + +void editor_mode::draw_build_overlay() const +{ + screen_projection const projection; + ImDrawList *drawlist = ImGui::GetBackgroundDrawList(); + auto const drawpath = [&](segment_data const &Path, ImU32 const Color) { + auto previous{path_point(Path, 0.0)}; + for (int i = 1; i <= 24; ++i) + { + auto const next{path_point(Path, i / 24.0)}; + projection.line(drawlist, previous, next, Color, 3.0f); + previous = next; + } + }; + if (m_extend.active) + for (auto const &piece : extend_pieces()) + drawpath(piece, IM_COL32(255, 210, 60, 255)); + if (m_switch.placing) + for (auto const &piece : switch_preview()) + drawpath(piece, IM_COL32(255, 210, 60, 255)); + auto const *track{selected_track()}; + if (track == nullptr || track->eType != tt_Normal || m_extend.active) + return; + for (auto const atend : {false, true}) + { + editor_track::point_ref const point{0, atend ? editor_track::point_kind::end : editor_track::point_kind::start}; + if (editor_track::is_connected(*track, point)) + continue; + ImVec2 screen; + if (projection.project(editor_track::point_position(*track, point), screen)) + drawlist->AddCircle(screen, 10.0f, IM_COL32(240, 60, 60, 255), 16, 3.0f); + } +} + +void editor_mode::render_switch_ui() +{ + auto &tool{m_switch}; + if (false == ImGui::CollapsingHeader("Switches", ImGuiTreeNodeFlags_DefaultOpen)) + return; + if (false == tool.collected) + { + tool.templates = editor_track::standard_switch_templates(); + auto const found{editor_track::find_switch_templates()}; + tool.templates.insert(tool.templates.end(), found.begin(), found.end()); + tool.collected = true; + } + ImGui::TextDisabled(tool.armed >= 0 ? "Press on the straight where the switch starts and drag: along sets its direction, sideways its side" : "Click a template, then drag on the selected straight"); + ImGui::BeginChild("##switchtemplates", ImVec2(0.0f, 150.0f), true); + for (int i = 0; i < static_cast(tool.templates.size()); ++i) + { + auto const &entry{tool.templates[i]}; + auto label{entry.source != nullptr ? "Scenery: " + entry.label + " (" + std::to_string(entry.count) + "x)" : "PLK: " + entry.label}; + label += "##switch" + std::to_string(i); + if (ImGui::Selectable(label.c_str(), tool.armed == i)) + tool.armed = (tool.armed == i ? -1 : i); + } + ImGui::EndChild(); + if (ImGui::SmallButton("Collect again from the scenery")) + { + tool.collected = false; + tool.armed = -1; + } +} diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index f7a4f778a..261afe2ec 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -1432,6 +1432,34 @@ TTrack *editor_track::clone(TTrack const &Template) return track; } +TTrack *editor_track::create_path(TTrack const &Style, segment_data const &Path) +{ + char const *environments[] = {"flat", "mountains", "canyon", "tunnel", "bridge", "bank"}; + auto const environment{Style.eEnvironment >= e_flat && Style.eEnvironment <= e_bank ? environments[Style.eEnvironment] : "flat"}; + auto const category{Style.iCategoryFlag & 15}; + std::ostringstream text; + text.precision(std::numeric_limits::digits10); + text << (category == 2 ? "road " : category == 4 ? "river " : "normal ") << glm::distance(Path.points[segment_data::point::start], Path.points[segment_data::point::end]) << ' ' << Style.fTrackWidth << ' ' << Style.fFriction << ' ' << Style.fSoundDistance << ' ' << Style.iQualityFlag << ' ' << 0 << ' ' << environment << ' '; + if (Style.m_visible) + text << "vis " << material_name(Style.m_material1) << ' ' << Style.fTexLength << ' ' << material_name(Style.m_material2) << ' ' << texture_height(Style) << ' ' << Style.fTexWidth << ' ' << Style.fTexSlope << ' '; + else + text << "unvis "; + auto const &start{Path.points[segment_data::point::start]}; + auto const &control1{Path.points[segment_data::point::control1]}; + auto const &control2{Path.points[segment_data::point::control2]}; + auto const &end{Path.points[segment_data::point::end]}; + text << start.x << ' ' << start.y << ' ' << start.z << ' ' << Path.rolls[0] << ' ' << control1.x << ' ' << control1.y << ' ' << control1.z << ' ' << control2.x << ' ' << control2.y << ' ' << control2.z << ' ' << end.x << ' ' << end.y << ' ' << end.z << ' ' << Path.rolls[1] << ' ' << Path.radius << ' '; + auto const speed{velocity(Style)}; + if (speed > 0.0) + text << "velocity " << speed << ' '; + if (category == 1 && false == Style.m_profile1.first.empty()) + text << "railprofile " << Style.m_profile1.first << ' '; + text << "endtrack\n"; + auto *track{load_path(text.str(), Style)}; + track->m_paths = {Path}; + return track; +} + TTrack *editor_track::load_path(std::string const &Text, TTrack const &Template) { cParser parser(Text, cParser::buffer_TEXT); diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index ad8282847..bab1d75c9 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -144,6 +144,8 @@ class editor_track }; static std::vector standard_switch_templates(); static std::vector find_switch_templates(); + static TTrack *load_path(std::string const &Text, TTrack const &Template); + static TTrack *create_path(TTrack const &Style, segment_data const &Path); static std::vector place_switch(switch_template const &Template, glm::dvec3 const &Origin, glm::dvec2 const &Direction, int const Side, double const Grade); static TTrack *create_switch(switch_template const &Template, std::vector const &Paths, TTrack const &Style); static void move_straights(std::vector const &Lines, std::vector> const &Ends); @@ -169,6 +171,5 @@ class editor_track static void store_switch_path(TTrack &Switch, int const Path); static void rebuild_geometry(TTrack &Track); static TTrack *clone(TTrack const &Template); - static TTrack *load_path(std::string const &Text, TTrack const &Template); static void move_straight(straight const &Line, glm::dvec3 const &Start, glm::dvec3 const &End, std::function const &Member); }; From 40422aec30d35d5051a7b49bdf3ed8660602fa16 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 3 Oct 2026 00:01:05 +0200 Subject: [PATCH 058/430] feat(editor): compound curves with dual radii and transition --- application/editormodetrack.cpp | 31 +++++- editor/editorAlignment.cpp | 167 +++++++++++++++++++++++++++++++- editor/editorAlignment.hpp | 11 ++- editor/editorTrack.cpp | 40 ++++++++ editor/editorTrack.hpp | 4 + 5 files changed, 247 insertions(+), 6 deletions(-) diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 57cd984b0..583a49546 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -750,6 +750,13 @@ bool editor_mode::route_from_curve(TTrack &Track) if (curve.reversals == 0) { vertex.reverse_turn = std::abs(curve.turn) > glm::pi(); + if (curve.compound) + { + vertex.compound = true; + vertex.radius2 = std::round(curve.radius2); + vertex.transition_middle = std::round(curve.transition_middle); + vertex.split = curve.split; + } design.vertices = {vertex}; } else @@ -932,8 +939,12 @@ void editor_mode::draw_route_overlay() const drawlist->AddCircleFilled(screen, 6.0f, IM_COL32(60, 230, 90, 255), 4); if (i == route.grip) drawlist->AddCircle(screen, 11.0f, IM_COL32(255, 255, 255, 255), 16, 2.5f); - char radius[24]; - std::snprintf(radius, sizeof(radius), "R %.0f", i < static_cast(result.curves.size()) ? result.curves[i].radius : design.vertices[i].radius); + char radius[40]; + auto const *report{i < static_cast(result.curves.size()) ? &result.curves[i] : nullptr}; + if (report != nullptr && report->radius2 > 0.0) + std::snprintf(radius, sizeof(radius), "R %.0f / %.0f", report->radius, report->radius2); + else + std::snprintf(radius, sizeof(radius), "R %.0f", report != nullptr ? report->radius : design.vertices[i].radius); drawlist->AddText(ImVec2(screen.x + 9.0f, screen.y + 4.0f), IM_COL32(60, 230, 90, 255), radius); } char label[8]; @@ -1153,7 +1164,21 @@ void editor_mode::render_route_ui() changed |= ImGui::InputScalarN("Position (x, z)", ImGuiDataType_Double, glm::value_ptr(vertex.position), 2, nullptr, nullptr, "%.2f"); ImGui::PopItemWidth(); } - changed |= ImGui::InputDouble("Radius R (m)", &vertex.radius, 0.0, 0.0, "%.1f"); + changed |= ImGui::InputDouble(vertex.compound ? "Radius R1 (m)" : "Radius R (m)", &vertex.radius, 0.0, 0.0, "%.1f"); + changed |= ImGui::Checkbox("Compound curve (two radii)", &vertex.compound); + if (vertex.compound) + { + changed |= ImGui::InputDouble("Radius R2 (m)", &vertex.radius2, 0.0, 0.0, "%.1f"); + changed |= ImGui::InputDouble("Transition R1-R2 (m)", &vertex.transition_middle, 0.0, 0.0, "%.1f"); + float split{static_cast(vertex.split)}; + if (ImGui::SliderFloat("Share of R1", &split, 0.0f, 1.0f, "%.2f")) + { + vertex.split = split; + changed = true; + } + vertex.radius2 = std::max(1.0, vertex.radius2); + vertex.transition_middle = std::max(0.0, vertex.transition_middle); + } changed |= ImGui::InputDouble("Transition in (m)", &vertex.transition_in, 0.0, 0.0, "%.1f"); changed |= ImGui::InputDouble("Transition out (m)", &vertex.transition_out, 0.0, 0.0, "%.1f"); changed |= ImGui::InputDouble("Cant (mm)", &vertex.cant, 0.0, 0.0, "%.0f"); diff --git a/editor/editorAlignment.cpp b/editor/editorAlignment.cpp index 3dfdbeec3..39df9129e 100644 --- a/editor/editorAlignment.cpp +++ b/editor/editorAlignment.cpp @@ -94,6 +94,58 @@ local_point transition_point(transition_shape const Shape, double const Length, return {x * h / 3.0, y * h / 3.0, angle(distance)}; } +local_point spiral_point(double const Start, double const End, double const Length, double const Distance) +{ + if (Distance <= 0.0) + return {}; + auto const heading = [&](double const S) { return Start * S + (End - Start) * S * S / (2.0 * std::max(Length, 1e-9)); }; + int const steps{std::max(8, static_cast(std::ceil(Distance / 0.5)) * 2)}; + double const h{Distance / steps}; + double x{0.0}, y{0.0}; + for (int i = 0; i <= steps; ++i) + { + double const weight = (i == 0 || i == steps) ? 1.0 : (i % 2 ? 4.0 : 2.0); + auto const a{heading(i * h)}; + x += weight * std::cos(a); + y += weight * std::sin(a); + } + return {x * h / 3.0, y * h / 3.0, heading(Distance)}; +} + +struct compound_curve +{ + std::vector> segments; + local_point end; + double shortened{1.0}; +}; + +compound_curve build_compound(double const Deflection, double const Radius1, double const Radius2, double const Lengthin, double const Lengthmiddle, double const Lengthout, double const Split) +{ + compound_curve result; + auto const k1{1.0 / Radius1}; + auto const k2{1.0 / Radius2}; + auto const transitions{(k1 * Lengthin + (k1 + k2) * Lengthmiddle + k2 * Lengthout) * 0.5}; + if (transitions > Deflection) + result.shortened = Deflection / transitions * (1.0 - 1e-9); + auto const f{result.shortened}; + auto const arcs{std::max(0.0, Deflection - transitions * f)}; + auto const split{std::clamp(Split, 0.0, 1.0)}; + std::array const segments[] = {{0.0, k1, Lengthin * f}, {k1, k1, split * arcs / k1}, {k1, k2, Lengthmiddle * f}, {k2, k2, (1.0 - split) * arcs / k2}, {k2, 0.0, Lengthout * f}}; + double x{0.0}, y{0.0}, heading{0.0}; + for (auto const &segment : segments) + { + if (segment[2] < 1e-6) + continue; + result.segments.push_back(segment); + auto const local{spiral_point(segment[0], segment[1], segment[2], segment[2])}; + x += local.x * std::cos(heading) - local.y * std::sin(heading); + y += local.x * std::sin(heading) + local.y * std::cos(heading); + heading += local.angle; + } + result.end = {x, y, heading}; + return result; +} + void element_point(element const &Element, transition_shape const Shape, double const Distance, glm::dvec2 &Position, glm::dvec2 &Direction) { switch (Element.kind) @@ -116,6 +168,13 @@ void element_point(element const &Element, transition_shape const Shape, double Direction = Element.direction * std::cos(local.angle) + Element.normal * std::sin(local.angle); break; } + case element_kind::spiral: + { + auto const local{spiral_point(Element.curvature_start, Element.curvature_end, Element.length, Distance)}; + Position = Element.origin + Element.direction * local.x + Element.normal * local.y; + Direction = Element.direction * std::cos(local.angle) + Element.normal * std::sin(local.angle); + break; + } case element_kind::transition_out: { auto const local{transition_point(Shape, Element.transition, Element.radius, 1.0 - Distance / Element.transition)}; @@ -133,6 +192,11 @@ double element_cant(element const &Element, double const Distance) case element_kind::transition_in: return Element.cant * Distance / Element.transition; case element_kind::transition_out: return Element.cant * (1.0 - Distance / Element.transition); case element_kind::arc: return Element.cant; + case element_kind::spiral: + { + auto const curvature{Element.curvature_start + (Element.curvature_end - Element.curvature_start) * Distance / std::max(Element.length, 1e-9)}; + return Element.curvature_peak > 0.0 ? Element.cant * curvature / Element.curvature_peak : 0.0; + } default: return 0.0; } } @@ -164,6 +228,11 @@ std::size_t element_pieces(element const &Element, transition_shape const Shape) case element_kind::transition_in: case element_kind::transition_out: return Shape == transition_shape::cubic_parabola ? 1 : static_cast(std::max(1.0, std::ceil(Element.length / 20.0 - 1e-9))); + case element_kind::spiral: + { + auto const turn{(Element.curvature_start + Element.curvature_end) * 0.5 * Element.length}; + return static_cast(std::max({1.0, std::ceil(turn / (10.0 * kPi / 180.0) - 1e-9), std::ceil(Element.length / 20.0 - 1e-9)})); + } default: return 1; } @@ -290,6 +359,9 @@ result compute(design const &Design) double tangent_in{0.0}; double tangent_out{0.0}; double deflection{0.0}; + bool compound{false}; + double radius2{0.0}; + double transition_middle{0.0}; std::function tangents; }; std::vector fits(count); @@ -314,6 +386,25 @@ result compute(design const &Design) r.errors.emplace_back(format("Vertex %zu: a turn of about 180 or 360 degrees needs one more vertex", k + 1)); return r; } + if (vertex.compound) + { + fit.compound = true; + fit.radius2 = std::max(1.0, vertex.radius2); + fit.transition_middle = std::max(0.0, vertex.transition_middle); + fit.deflection = deflection; + fit.tangents = [&, k, directionin, directionout, side](double const Radius, double &Tangentin, double &Tangentout) { + auto const &own{fits[k]}; + auto const scale{Radius / own.radius}; + auto const shape{build_compound(own.deflection, Radius, own.radius2 * scale, own.transition_in * scale, own.transition_middle * scale, own.transition_out * scale, Design.vertices[k].split)}; + auto const normalin{perpendicular(directionin) * static_cast(side)}; + auto const end{directionin * shape.end.x + normalin * shape.end.y}; + auto const along{cross(directionout, end) / cross(directionout, directionin)}; + Tangentin = std::max(0.0, along); + Tangentout = std::max(0.0, glm::dot(end - directionin * along, directionout)); + }; + fit.tangents(fit.radius, fit.tangent_in, fit.tangent_out); + continue; + } auto const angles = [&](double const Factor) { return transition_point(Design.shape, fit.transition_in * Factor, fit.radius, 1.0).angle + transition_point(Design.shape, fit.transition_out * Factor, fit.radius, 1.0).angle; }; @@ -382,7 +473,7 @@ result compute(design const &Design) } low = high * (1.0 + 1e-9); high = fit.radius; - if (fits_budget(low)) + if (false == fit.compound && fits_budget(low)) { for (int i = 0; i < 60; ++i) { @@ -394,7 +485,9 @@ result compute(design const &Design) else { fit.radius *= scales[k]; + fit.radius2 *= scales[k]; fit.transition_in *= scales[k]; + fit.transition_middle *= scales[k]; fit.transition_out *= scales[k]; } r.warnings.emplace_back(format("Vertex %zu: R reduced from %.1f to %.1f m, transitions to %.1f / %.1f m, to fit between the ends", k + 1, Design.vertices[k].radius, fit.radius, fit.transition_in, fit.transition_out)); @@ -430,6 +523,71 @@ result compute(design const &Design) r.errors.emplace_back(format("Vertex %zu: a turn of about 180 or 360 degrees needs one more vertex", k + 1)); return r; } + if (fit.compound) + { + auto const shape{build_compound(deflection, fit.radius, fit.radius2, fit.transition_in, fit.transition_middle, fit.transition_out, vertex.split)}; + if (shape.shortened < 1.0) + r.warnings.emplace_back(format("Vertex %zu: transition curves shortened to fit the deflection angle", k + 1)); + auto const normalin{perpendicular(directionin) * static_cast(side)}; + auto const endoffset{directionin * shape.end.x + normalin * shape.end.y}; + auto const along{cross(directionout, endoffset) / cross(directionout, directionin)}; + auto const curvestart{position - directionin * along}; + auto const straight{glm::dot(curvestart - cursor, directionin)}; + if (straight < -1e-4) + { + if (k == 0) + r.errors.emplace_back(format("Vertex 1: the curve starts %.2f m before the fixed start", -straight)); + else + r.errors.emplace_back(format("Curves of vertices %zu and %zu overlap by %.2f m", k, k + 1, -straight)); + } + push_straight(cursor, directionin, straight); + auto const startchainage{chainage}; + glm::dvec2 origin{curvestart}; + glm::dvec2 heading{directionin}; + auto const peak{std::max(1.0 / fit.radius, 1.0 / fit.radius2)}; + for (auto const &segment : shape.segments) + { + element piece; + piece.kind = element_kind::spiral; + piece.vertex = static_cast(k); + piece.turn = side; + piece.cant = std::max(0.0, vertex.cant); + piece.curvature_start = segment[0]; + piece.curvature_end = segment[1]; + piece.curvature_peak = peak; + piece.radius = std::max(segment[0], segment[1]) > 0.0 ? 1.0 / std::max(segment[0], segment[1]) : 0.0; + piece.length = segment[2]; + piece.origin = origin; + piece.direction = heading; + piece.normal = perpendicular(heading) * static_cast(side); + push(piece); + auto const local{spiral_point(segment[0], segment[1], segment[2], segment[2])}; + origin += heading * local.x + piece.normal * local.y; + heading = rotate(heading, side * local.angle); + } + vertexchainage[k] = (startchainage + chainage) * 0.5; + cursor = origin; + + curve_report report; + report.vertex = static_cast(k); + report.radius = fit.radius; + report.radius2 = fit.radius2; + report.transition_in = fit.transition_in * shape.shortened; + report.transition_out = fit.transition_out * shape.shortened; + report.deflection = deflection; + report.arc_length = chainage - startchainage; + report.tangent_in = glm::distance(position, curvestart); + report.tangent_out = glm::distance(position, cursor); + auto const sharpest{std::min(fit.radius, fit.radius2)}; + report.unbalanced = unbalanced_acceleration(Design.speed, sharpest, std::max(0.0, vertex.cant), Design.norms); + report.recommended = recommend(Design.speed, sharpest, Design.norms); + r.curves.push_back(report); + if (sharpest < report.recommended.radius_min - 1e-6) + r.warnings.emplace_back(format("Vertex %zu: R %.0f m is below the minimum %.0f m for %.0f km/h", k + 1, sharpest, report.recommended.radius_min, Design.speed)); + if (report.unbalanced > Design.norms.unbalanced + 1e-6) + r.warnings.emplace_back(format("Vertex %zu: unbalanced acceleration %.2f m/s2 exceeds %.2f m/s2", k + 1, report.unbalanced, Design.norms.unbalanced)); + continue; + } auto const radius{fit.radius}; auto const lengthin{fit.transition_in}; auto const lengthout{fit.transition_out}; @@ -748,7 +906,7 @@ std::vector pieces(result const &Result, design const &Design, std } default: { - if (Design.shape == transition_shape::cubic_parabola) + if (Design.shape == transition_shape::cubic_parabola && e.kind != element_kind::spiral) { std::array const local{glm::dvec2{0.0, 0.0}, glm::dvec2{e.transition / 3.0, 0.0}, glm::dvec2{e.transition * 2.0 / 3.0, 0.0}, glm::dvec2{e.transition, e.transition * e.transition / (6.0 * e.radius)}}; auto const a{e.kind == element_kind::transition_in ? piece.from / e.transition : 1.0 - piece.from / e.transition}; @@ -785,6 +943,11 @@ std::vector pieces(result const &Result, design const &Design, std path.rolls[0] = roll(element_cant(e, piece.from)); path.rolls[1] = roll(element_cant(e, piece.to)); path.radius = e.kind == element_kind::straight ? 0.f : static_cast(e.radius); + if (e.kind == element_kind::spiral) + { + auto const curvature{e.curvature_start + (e.curvature_end - e.curvature_start) * (piece.from + piece.to) * 0.5 / std::max(e.length, 1e-9)}; + path.radius = curvature > 1e-9 ? static_cast(1.0 / curvature) : 0.f; + } result.push_back(path); } return result; diff --git a/editor/editorAlignment.hpp b/editor/editorAlignment.hpp index a790b8665..51c597a4e 100644 --- a/editor/editorAlignment.hpp +++ b/editor/editorAlignment.hpp @@ -49,6 +49,10 @@ struct vertex double elevation{0.0}; double vertical_radius{0.0}; bool reverse_turn{false}; + bool compound{false}; + double radius2{600.0}; + double transition_middle{0.0}; + double split{0.5}; }; struct design @@ -85,7 +89,8 @@ enum class element_kind straight, transition_in, arc, - transition_out + transition_out, + spiral }; struct element @@ -98,6 +103,9 @@ struct element double transition{0.0}; int turn{0}; double cant{0.0}; + double curvature_start{0.0}; + double curvature_end{0.0}; + double curvature_peak{0.0}; glm::dvec2 origin{0.0}; glm::dvec2 direction{0.0, 1.0}; glm::dvec2 normal{0.0}; @@ -107,6 +115,7 @@ struct curve_report { int vertex{-1}; double radius{0.0}; + double radius2{0.0}; double transition_in{0.0}; double transition_out{0.0}; double deflection{0.0}; diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index 261afe2ec..b7d82d870 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -1039,6 +1039,46 @@ bool editor_track::find_curve(TTrack &Track, straight_tolerance const &Tolerance if (Curve.transition_in + Curve.transition_out >= std::accumulate(lengths.begin(), lengths.end(), 0.0)) Curve.transition_in = Curve.transition_out = 0.0; Curve.radius = smallest; + std::vector> arcs; + for (std::size_t i = 0; i < run.size(); ++i) + { + if (varying[i]) + continue; + auto const radius{path_radius(run[i].first->m_paths.front(), 0.5)}; + if (radius <= 0.0) + continue; + if (false == arcs.empty() && std::abs(arcs.back().first - radius) < 0.05 * radius) + arcs.back().second += lengths[i]; + else + arcs.emplace_back(radius, lengths[i]); + } + if (arcs.size() >= 2 && Curve.reversals == 0) + { + auto const &first{arcs.front()}; + auto const &last{arcs.back()}; + if (std::abs(first.first - last.first) > 0.1 * std::min(first.first, last.first)) + { + Curve.compound = true; + Curve.radius = first.first; + Curve.radius2 = last.first; + auto const turnfirst{first.second / first.first}; + auto const turnlast{last.second / last.first}; + Curve.split = turnfirst / std::max(1e-9, turnfirst + turnlast); + double middle{0.0}; + bool inside{false}; + for (std::size_t i = 0; i < run.size(); ++i) + { + if (false == varying[i]) + { + inside = true; + continue; + } + if (inside && i + 1 < run.size() && std::any_of(varying.begin() + i + 1, varying.end(), [](bool const Varying) { return false == Varying; })) + middle += lengths[i]; + } + Curve.transition_middle = middle; + } + } Curve.from = run.front().first; Curve.to = run.back().first; return true; diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index bab1d75c9..d96358d4c 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -128,6 +128,10 @@ class editor_track double transition_in{0.0}; double transition_out{0.0}; double cant{0.0}; + bool compound{false}; + double radius2{0.0}; + double transition_middle{0.0}; + double split{0.5}; }; static bool find_curve(TTrack &Track, straight_tolerance const &Tolerance, double const Gauge, curve &Curve); struct switch_template From a5955f322e444a9019f949269d5796e5cd4e0b20 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 3 Oct 2026 00:15:27 +0200 Subject: [PATCH 059/430] feat(editor): context editor for geometry, paths behind switches, switch textures --- application/editormode.cpp | 1 + application/editormode.h | 8 +- application/editormodetrack.cpp | 337 +++++++++++++++++++++++--------- editor/editorTrack.cpp | 11 +- 4 files changed, 266 insertions(+), 91 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 77afe2e71..2b44933f1 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -1020,6 +1020,7 @@ bool editor_mode::update() update_build_tools(); draw_build_overlay(); draw_track_hints(); + render_track_window(); } // --- area fill: outline overlay while the mode is active (its settings are drawn in the node bank window) --- diff --git a/application/editormode.h b/application/editormode.h index 1ff98fd3b..6ac172c75 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -395,6 +395,7 @@ class editor_mode : public application_mode editor_track::straight line; }; switch_tool m_switch; + int m_turnout_template{0}; struct extend_tool { bool active{false}; @@ -415,7 +416,12 @@ class editor_mode : public application_mode std::vector extend_pieces() const; void update_build_tools(); void draw_build_overlay() const; - enum class track_tab { straights, route, path }; + enum class track_tab { straights, route, path, turnout }; + bool m_track_window_open{false}; + void render_track_window(); + void render_turnout_ui(); + void render_path_parameters(TTrack &Track); + void render_straight_ui(); track_tab m_track_tab{track_tab::straights}; int m_track_tab_request{-1}; void delete_selected_track(); diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 583a49546..848d509db 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -136,9 +136,14 @@ void editor_mode::select_track(scene::basic_node *Node) m_track_point = {}; m_node = track; ui()->set_node(m_node); - if (ui()->mode() != nodebank_panel::TRACK || m_track_tab == track_tab::path) + if (ui()->mode() != nodebank_panel::TRACK) return; - if (editor_track::is_straight(*track, m_straights.tolerance)) + m_track_window_open = true; + if (track->eType == tt_Switch) + { + m_track_tab = track_tab::turnout; + } + else if (editor_track::is_straight(*track, m_straights.tolerance)) { m_track_tab_request = 0; m_track_tab = track_tab::straights; @@ -441,59 +446,145 @@ void editor_mode::restore_track_snapshot(EditorSnapshot const &Snapshot, std::ve void editor_mode::render_track_ui() { - if (ImGui::BeginTabBar("##trackediting")) - { - auto const request{m_track_tab_request}; - m_track_tab_request = -1; - if (ImGui::BeginTabItem("Straights", nullptr, request == 0 ? ImGuiTabItemFlags_SetSelected : 0)) - { - m_track_tab = track_tab::straights; - m_route_tab = true; - render_straights_ui(); - ImGui::EndTabItem(); - } - if (ImGui::BeginTabItem("Route design", nullptr, request == 1 ? ImGuiTabItemFlags_SetSelected : 0)) - { - m_track_tab = track_tab::route; - m_route_tab = true; - render_route_ui(); - ImGui::EndTabItem(); - } - if (ImGui::BeginTabItem("Single path")) - { - m_track_tab = track_tab::path; - m_route_tab = false; - render_path_ui(); - ImGui::EndTabItem(); - } - ImGui::EndTabBar(); - } + ImGui::TextDisabled("LMB on a path opens its editor: straight, curve or switch"); + if (ImGui::Button("Open the editor window")) + m_track_window_open = true; + if (ImGui::CollapsingHeader("Straights in the scenery")) + render_straights_ui(); + render_switch_ui(); } -void editor_mode::render_path_ui() +void editor_mode::render_track_window() { - ImGui::TextDisabled("LMB: select path or point handle Esc: release point\nGizmo moves the selected point, otherwise the whole path (W: turn)"); - auto *track = selected_track(); - if (track == nullptr) + if (false == m_track_window_open || selected_track() == nullptr) + return; + char const *title{"Path###trackeditor"}; + switch (m_track_tab) { - ImGui::TextDisabled("No path selected"); + case track_tab::straights: title = "Straight###trackeditor"; break; + case track_tab::route: title = "Curve###trackeditor"; break; + case track_tab::turnout: title = "Switch###trackeditor"; break; + default: break; + } + ImGui::SetNextWindowSize(ImVec2(460.0f, 520.0f), ImGuiCond_FirstUseEver); + if (false == ImGui::Begin(title, &m_track_window_open)) + { + ImGui::End(); return; } - - char const *type = track->eType == tt_Normal ? "normal" : track->eType == tt_Switch ? "switch" : track->eType == tt_Cross ? "cross" : track->eType == tt_Table ? "turntable" : track->eType == tt_Tributary ? "tributary" : "unknown"; - char const *category = (track->iCategoryFlag & 1) ? "rail" : (track->iCategoryFlag & 2) ? "road" : (track->iCategoryFlag & 4) ? "river" : "other"; - ImGui::Text("%s (%s %s, %.2f m)", track->name().empty() ? "(noname)" : track->name().c_str(), category, type, track->Length()); - - if (false == editor_track::is_supported(*track)) + switch (m_track_tab) { - ImGui::TextDisabled("Editing of this path type isn't supported"); - return; + case track_tab::straights: + m_route_tab = true; + render_straight_ui(); + break; + case track_tab::route: + m_route_tab = true; + render_route_ui(); + break; + case track_tab::turnout: + m_route_tab = true; + render_turnout_ui(); + break; + default: + m_route_tab = false; + render_path_ui(); + break; } - std::string reason; - bool const geometry = editor_track::can_edit_geometry(*track, reason); - if (false == geometry) - ImGui::TextColored(ImVec4(1.0f, 0.6f, 0.2f, 1.0f), "Geometry locked: %s", reason.c_str()); + if (m_track_tab != track_tab::path) + { + ImGui::Separator(); + if (ImGui::SmallButton("Edit points and parameters of the single path")) + m_track_tab = track_tab::path; + } + ImGui::End(); +} +void editor_mode::render_turnout_ui() +{ + auto *track{selected_track()}; + if (track == nullptr || track->eType != tt_Switch || track->m_paths.size() < 2) + return; + auto const &main{track->m_paths[0]}; + auto const &diverging{track->m_paths[1]}; + auto const origin{main.points[segment_data::point::start]}; + glm::dvec2 const axis{glm::normalize(glm::dvec2{main.points[segment_data::point::end].x - origin.x, main.points[segment_data::point::end].z - origin.z})}; + glm::dvec2 const normal{-axis.y, axis.x}; + auto const length{glm::dot(glm::dvec2{main.points[segment_data::point::end].x - origin.x, main.points[segment_data::point::end].z - origin.z}, axis)}; + glm::dvec2 const end{diverging.points[segment_data::point::end].x - origin.x, diverging.points[segment_data::point::end].z - origin.z}; + auto const offset{glm::dot(end, normal)}; + auto const &control{diverging.points[segment_data::point::control2]}; + glm::dvec2 const tangent{glm::normalize(glm::dvec2{-control.x, -control.z})}; + auto const angle{std::atan2(std::abs(tangent.x * axis.y - tangent.y * axis.x), glm::dot(tangent, axis))}; + ImGui::Text("%s", track->name().empty() ? "(noname)" : track->name().c_str()); + ImGui::Text("Length %.3f m, diverging %s, end offset %.3f m", length, offset > 0.0 ? "left" : "right", std::abs(offset)); + if (angle > 1e-6) + ImGui::Text("Angle 1:%.2f (%.4f deg), R in the entry %.0f m", 1.0 / std::tan(angle), glm::degrees(angle), diverging.radius); + ImGui::TextDisabled("Gizmo moves the whole switch (W: turn), drag from a red ring at a free end to add a path"); + + auto &tool{m_switch}; + if (false == tool.collected) + { + tool.templates = editor_track::standard_switch_templates(); + auto const found{editor_track::find_switch_templates()}; + tool.templates.insert(tool.templates.end(), found.begin(), found.end()); + tool.collected = true; + } + if (tool.templates.empty()) + return; + m_turnout_template = std::clamp(m_turnout_template, 0, static_cast(tool.templates.size()) - 1); + ImGui::Separator(); + ImGui::PushItemWidth(-1.0f); + if (ImGui::BeginCombo("##turnouttemplate", tool.templates[m_turnout_template].label.c_str())) + { + for (int i = 0; i < static_cast(tool.templates.size()); ++i) + { + auto const label{(tool.templates[i].source != nullptr ? "Scenery: " : "PLK: ") + tool.templates[i].label}; + if (ImGui::Selectable(label.c_str(), i == m_turnout_template)) + m_turnout_template = i; + } + ImGui::EndCombo(); + } + ImGui::PopItemWidth(); + auto const replace = [&](editor_track::switch_template const &Template, int const Side) { + if (false == track->Dynamics.empty()) + return; + auto const grade{length > 0.0 ? (main.points[segment_data::point::end].y - origin.y) / length : 0.0}; + auto const paths{editor_track::place_switch(Template, origin, axis, Side, grade)}; + push_track_snapshot({{track, editor_track::capture(*track)}}); + track->m_paths.assign(paths.begin(), paths.begin() + 2); + editor_track::commit({track}); + }; + int const side{offset > 0.0 ? 1 : -1}; + if (ImGui::Button("Replace the geometry with the template")) + replace(tool.templates[m_turnout_template], side); + ImGui::SameLine(); + if (ImGui::Button("Flip the side")) + { + auto const current{editor_track::find_switch_templates()}; + editor_track::switch_template own; + own.source = track; + for (int i = 0; i < 2; ++i) + { + auto &local{own.local[i]}; + local = track->m_paths[i]; + auto const tolocal = [&](glm::dvec3 const &Vector) { return glm::dvec3{glm::dot(glm::dvec2{Vector.x, Vector.z}, normal) * side, Vector.y, glm::dot(glm::dvec2{Vector.x, Vector.z}, axis)}; }; + local.points[segment_data::point::start] = tolocal(track->m_paths[i].points[segment_data::point::start] - origin); + local.points[segment_data::point::end] = tolocal(track->m_paths[i].points[segment_data::point::end] - origin); + local.points[segment_data::point::control1] = tolocal(track->m_paths[i].points[segment_data::point::control1]); + local.points[segment_data::point::control2] = tolocal(track->m_paths[i].points[segment_data::point::control2]); + if (side < 0) + local.rolls = {-local.rolls[0], -local.rolls[1]}; + } + replace(own, -side); + } + ImGui::Separator(); + render_path_parameters(*track); +} + +void editor_mode::render_path_parameters(TTrack &Track) +{ + auto *track{&Track}; auto const before = editor_track::capture(*track); enum class rebuild { none, parameters, geometry }; auto const finish_edit = [&](rebuild const Rebuild) { @@ -553,7 +644,9 @@ void editor_mode::render_path_ui() if (track->m_visible) { material_handle *materials[] = {&track->m_material1, &track->m_material2, track->SwitchExtension ? &track->SwitchExtension->m_material3 : nullptr}; - char const *labels[] = {"Texture 1 (rails/surface)", "Texture 2 (trackbed/side)", "Trackbed (switch)"}; + char const *pathlabels[] = {"Texture 1 (rails/surface)", "Texture 2 (trackbed/side)", "Trackbed (switch)"}; + char const *switchlabels[] = {"Rails P1-P2", "Rails P3-P4", "Trackbed"}; + auto const &labels{track->eType == tt_Switch ? switchlabels : pathlabels}; if (false == ImGui::IsAnyItemActive()) { for (int i = 0; i < 3; ++i) @@ -593,6 +686,58 @@ void editor_mode::render_path_ui() } } +} + +void editor_mode::render_path_ui() +{ + ImGui::TextDisabled("LMB: select path or point handle Esc: release point\nGizmo moves the selected point, otherwise the whole path (W: turn)"); + auto *track = selected_track(); + if (track == nullptr) + { + ImGui::TextDisabled("No path selected"); + return; + } + + char const *type = track->eType == tt_Normal ? "normal" : track->eType == tt_Switch ? "switch" : track->eType == tt_Cross ? "cross" : track->eType == tt_Table ? "turntable" : track->eType == tt_Tributary ? "tributary" : "unknown"; + char const *category = (track->iCategoryFlag & 1) ? "rail" : (track->iCategoryFlag & 2) ? "road" : (track->iCategoryFlag & 4) ? "river" : "other"; + ImGui::Text("%s (%s %s, %.2f m)", track->name().empty() ? "(noname)" : track->name().c_str(), category, type, track->Length()); + + if (false == editor_track::is_supported(*track)) + { + ImGui::TextDisabled("Editing of this path type isn't supported"); + return; + } + std::string reason; + bool const geometry = editor_track::can_edit_geometry(*track, reason); + if (false == geometry) + ImGui::TextColored(ImVec4(1.0f, 0.6f, 0.2f, 1.0f), "Geometry locked: %s", reason.c_str()); + + auto const before = editor_track::capture(*track); + enum class rebuild { none, parameters, geometry }; + auto const finish_edit = [&](rebuild const Rebuild) { + if (ImGui::IsItemActivated()) + m_track_field_before = before; + if (ImGui::IsItemDeactivatedAfterEdit()) + { + push_track_snapshot({{track, m_track_field_before}}); + switch (Rebuild) + { + case rebuild::geometry: editor_track::commit({track}); break; + case rebuild::parameters: editor_track::commit_parameters(*track); break; + default: track->mark_dirty(); break; + } + } + }; + auto const apply_now = [&](rebuild const Rebuild) { + push_track_snapshot({{track, before}}); + if (Rebuild == rebuild::parameters) + editor_track::commit_parameters(*track); + else + track->mark_dirty(); + }; + + render_path_parameters(*track); + if (ImGui::CollapsingHeader("Path geometry", ImGuiTreeNodeFlags_DefaultOpen)) { ImGui::PushItemWidth(120.0f); @@ -1515,8 +1660,17 @@ void editor_mode::render_straights_ui() ImGui::EndChild(); } - ImGui::Separator(); +} + +void editor_mode::render_straight_ui() +{ + auto &state{m_straights}; auto const &line{current_straight()}; + auto const describe = [](editor_track::straight const &Line) { + char text[160]; + std::snprintf(text, sizeof(text), "L %.2f m az %.4f deg i %.2f per mille %zu paths", Line.length, Line.azimuth, Line.grade * 1000.0, Line.tracks.size()); + return std::string{text}; + }; if (line.tracks.empty()) { ImGui::TextDisabled(selected_track() != nullptr ? "The selected path isn't straight" : "No path selected"); @@ -1608,7 +1762,6 @@ void editor_mode::render_straights_ui() } if (false == state.status.empty()) ImGui::TextColored(ImVec4(1.0f, 0.7f, 0.2f, 1.0f), "%s", state.status.c_str()); - render_switch_ui(); if (false == state.set.empty()) { @@ -2125,6 +2278,8 @@ void editor_mode::draw_track_hints() hint = "Press on the selected straight where the switch starts and drag"; else if (m_track_tab == track_tab::straights) hint = current_straight().tracks.empty() ? "LMB: select a straight or a curve" : "Drag the ends or the middle Ctrl+drag: break Shift+drag: S-curve Alt+click: add to the set Drag from a red ring: new path Del: delete"; + else if (m_track_tab == track_tab::turnout) + hint = "Gizmo: move the switch (W: turn) Drag from a red ring: new path Del: delete"; else if (m_track_tab == track_tab::route) hint = m_route.chain.tracks.empty() ? "LMB: select a curve" : "Drag the vertex (yellow) or the radius grip (green), the change is applied on release Ctrl+Z: undo"; else @@ -2150,41 +2305,44 @@ void editor_mode::update_build_tools() bool editor_mode::start_extend() { auto *track{selected_track()}; - if (track == nullptr || track->eType != tt_Normal || false == editor_track::is_supported(*track) || false == track->Dynamics.empty()) + if (track == nullptr || (track->eType != tt_Normal && track->eType != tt_Switch) || false == editor_track::is_supported(*track) || false == track->Dynamics.empty()) return false; screen_projection const projection; ImVec2 const mouse = ImGui::GetIO().MousePos; - auto const &path{track->m_paths.front()}; - for (auto const atend : {false, true}) + for (int i = 0; i < static_cast(track->m_paths.size()); ++i) { - editor_track::point_ref const point{0, atend ? editor_track::point_kind::end : editor_track::point_kind::start}; - if (editor_track::is_connected(*track, point)) - continue; - auto const position{editor_track::point_position(*track, point)}; - ImVec2 screen; - if (false == projection.project(position, screen)) - continue; - if ((screen.x - mouse.x) * (screen.x - mouse.x) + (screen.y - mouse.y) * (screen.y - mouse.y) > kHandleRadius * kHandleRadius * 1.5f) - continue; - auto const &start{path.points[segment_data::point::start]}; - auto const &end{path.points[segment_data::point::end]}; - auto const &control1{path.points[segment_data::point::control1]}; - auto const &control2{path.points[segment_data::point::control2]}; - glm::dvec3 tangent; - if (atend) - tangent = control2 != glm::dvec3{} ? -control2 : end - (start + control1); - else - tangent = -(control1 != glm::dvec3{} ? control1 : (end + control2) - start); - glm::dvec2 const planar{tangent.x, tangent.z}; - if (glm::length(planar) < 1e-6) - return false; - m_extend.active = true; - m_extend.track = track; - m_extend.point = position; - m_extend.direction = glm::normalize(planar); - m_extend.grade = tangent.y / glm::length(planar); - m_extend.mouse = position; - return true; + auto const &path{track->m_paths[i]}; + for (auto const atend : {false, true}) + { + editor_track::point_ref const point{i, atend ? editor_track::point_kind::end : editor_track::point_kind::start}; + if (editor_track::is_connected(*track, point)) + continue; + auto const position{editor_track::point_position(*track, point)}; + ImVec2 screen; + if (false == projection.project(position, screen)) + continue; + if ((screen.x - mouse.x) * (screen.x - mouse.x) + (screen.y - mouse.y) * (screen.y - mouse.y) > kHandleRadius * kHandleRadius * 1.5f) + continue; + auto const &start{path.points[segment_data::point::start]}; + auto const &end{path.points[segment_data::point::end]}; + auto const &control1{path.points[segment_data::point::control1]}; + auto const &control2{path.points[segment_data::point::control2]}; + glm::dvec3 tangent; + if (atend) + tangent = control2 != glm::dvec3{} ? -control2 : end - (start + control1); + else + tangent = -(control1 != glm::dvec3{} ? control1 : (end + control2) - start); + glm::dvec2 const planar{tangent.x, tangent.z}; + if (glm::length(planar) < 1e-6) + return false; + m_extend.active = true; + m_extend.track = track; + m_extend.point = position; + m_extend.direction = glm::normalize(planar); + m_extend.grade = tangent.y / glm::length(planar); + m_extend.mouse = position; + return true; + } } return false; } @@ -2425,16 +2583,19 @@ void editor_mode::draw_build_overlay() const for (auto const &piece : switch_preview()) drawpath(piece, IM_COL32(255, 210, 60, 255)); auto const *track{selected_track()}; - if (track == nullptr || track->eType != tt_Normal || m_extend.active) + if (track == nullptr || (track->eType != tt_Normal && track->eType != tt_Switch) || m_extend.active) return; - for (auto const atend : {false, true}) + for (int i = 0; i < static_cast(track->m_paths.size()); ++i) { - editor_track::point_ref const point{0, atend ? editor_track::point_kind::end : editor_track::point_kind::start}; - if (editor_track::is_connected(*track, point)) - continue; - ImVec2 screen; - if (projection.project(editor_track::point_position(*track, point), screen)) - drawlist->AddCircle(screen, 10.0f, IM_COL32(240, 60, 60, 255), 16, 3.0f); + for (auto const atend : {false, true}) + { + editor_track::point_ref const point{i, atend ? editor_track::point_kind::end : editor_track::point_kind::start}; + if (editor_track::is_connected(*track, point)) + continue; + ImVec2 screen; + if (projection.project(editor_track::point_position(*track, point), screen)) + drawlist->AddCircle(screen, 10.0f, IM_COL32(240, 60, 60, 255), 16, 3.0f); + } } } diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index b7d82d870..63134cbe5 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -1234,8 +1234,10 @@ TTrack *editor_track::create_switch(switch_template const &Template, std::vector std::ostringstream text; text.precision(std::numeric_limits::digits10); text << "switch " << Template.length << ' ' << Style.fTrackWidth << ' ' << Style.fFriction << ' ' << 10.0 << ' ' << Style.iQualityFlag << ' ' << 0 << ' ' << environment << ' '; + auto const rails{Style.m_material1}; + auto const trackbed{Style.eType == tt_Switch ? (Style.SwitchExtension ? Style.SwitchExtension->m_material3 : null_handle) : Style.m_material2}; if (Style.m_visible) - text << "vis " << material_name(Style.m_material1) << ' ' << Style.fTexLength << ' ' << material_name(Style.m_material2) << ' ' << texture_height(Style) << ' ' << Style.fTexWidth << ' ' << Style.fTexSlope << ' '; + text << "vis " << material_name(rails) << ' ' << Style.fTexLength << ' ' << material_name(rails) << ' ' << texture_height(Style) << ' ' << Style.fTexWidth << ' ' << Style.fTexSlope << ' '; else text << "unvis "; for (int i = 0; i < 2; ++i) @@ -1247,6 +1249,10 @@ TTrack *editor_track::create_switch(switch_template const &Template, std::vector auto const &end{path.points[segment_data::point::end]}; text << start.x << ' ' << start.y << ' ' << start.z << ' ' << path.rolls[0] << ' ' << control1.x << ' ' << control1.y << ' ' << control1.z << ' ' << control2.x << ' ' << control2.y << ' ' << control2.z << ' ' << end.x << ' ' << end.y << ' ' << end.z << ' ' << path.rolls[1] << ' ' << path.radius << ' '; } + if (trackbed != null_handle) + text << "trackbed " << material_name(trackbed) << ' '; + if ((Style.iCategoryFlag & 15) == 1 && false == Style.m_profile1.first.empty()) + text << "railprofile " << Style.m_profile1.first << ' '; text << "endtrack\n"; track = load_path(text.str(), Style); } @@ -1480,8 +1486,9 @@ TTrack *editor_track::create_path(TTrack const &Style, segment_data const &Path) std::ostringstream text; text.precision(std::numeric_limits::digits10); text << (category == 2 ? "road " : category == 4 ? "river " : "normal ") << glm::distance(Path.points[segment_data::point::start], Path.points[segment_data::point::end]) << ' ' << Style.fTrackWidth << ' ' << Style.fFriction << ' ' << Style.fSoundDistance << ' ' << Style.iQualityFlag << ' ' << 0 << ' ' << environment << ' '; + auto const ballast{Style.eType == tt_Switch ? (Style.SwitchExtension ? Style.SwitchExtension->m_material3 : null_handle) : Style.m_material2}; if (Style.m_visible) - text << "vis " << material_name(Style.m_material1) << ' ' << Style.fTexLength << ' ' << material_name(Style.m_material2) << ' ' << texture_height(Style) << ' ' << Style.fTexWidth << ' ' << Style.fTexSlope << ' '; + text << "vis " << material_name(Style.m_material1) << ' ' << Style.fTexLength << ' ' << material_name(ballast) << ' ' << texture_height(Style) << ' ' << Style.fTexWidth << ' ' << Style.fTexSlope << ' '; else text << "unvis "; auto const &start{Path.points[segment_data::point::start]}; From b5e1510c1e61c9881ac1c457865b040c89d9dbda Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 3 Oct 2026 00:26:35 +0200 Subject: [PATCH 060/430] fix(editor): break near end splits last path --- application/editormodetrack.cpp | 131 ++++++++++++++++++++++++-------- 1 file changed, 100 insertions(+), 31 deletions(-) diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 848d509db..5209f1646 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -1991,57 +1991,110 @@ void editor_mode::straight_reshape(editor_track::straight const &Line, double co TTrack *track; int path; double from, to; + bool forward; + }; + auto line{Line}; + auto const point = [&](double const Along) { + auto const planar{glm::dvec2{line.start.x, line.start.z} + line.direction * Along}; + return glm::dvec3{planar.x, line.start.y + line.grade * Along, planar.y}; }; std::vector spans; - for (std::size_t i = 0; i < Line.tracks.size(); ++i) - { - auto const &path{Line.tracks[i]->m_paths[Line.paths[i]]}; - auto const along = [&](glm::dvec3 const &Point) { return glm::dot(glm::dvec2{Point.x - Line.start.x, Point.z - Line.start.z}, Line.direction); }; - auto const a{along(path.points[segment_data::point::start])}; - auto const b{along(path.points[segment_data::point::end])}; - spans.push_back({Line.tracks[i], Line.paths[i], std::min(a, b), std::max(a, b)}); - } - std::sort(spans.begin(), spans.end(), [](span const &A, span const &B) { return A.from < B.from; }); - - int first{-1}, last{-1}; - for (int i = 0; i < static_cast(spans.size()); ++i) - { - if (spans[i].to > From && spans[i].from < To) + auto const collect = [&]() { + spans.clear(); + for (std::size_t i = 0; i < line.tracks.size(); ++i) { - if (first < 0) - first = i; - last = i; + auto const &path{line.tracks[i]->m_paths[line.paths[i]]}; + auto const along = [&](glm::dvec3 const &Point) { return glm::dot(glm::dvec2{Point.x - line.start.x, Point.z - line.start.z}, line.direction); }; + auto const a{along(path.points[segment_data::point::start])}; + auto const b{along(path.points[segment_data::point::end])}; + spans.push_back({line.tracks[i], line.paths[i], std::min(a, b), std::max(a, b), a < b}); + } + std::sort(spans.begin(), spans.end(), [](span const &A, span const &B) { return A.from < B.from; }); + }; + int first{-1}, last{-1}; + auto const select = [&](double const End) { + first = last = -1; + for (int i = 0; i < static_cast(spans.size()); ++i) + { + if (spans[i].to > From && spans[i].from < End) + { + if (first < 0) + first = i; + last = i; + } + } + }; + collect(); + select(To); + if (first < 0) + return; + + std::vector> splitstates; + std::vector splitcreated; + auto end{To}; + if (last + 1 >= static_cast(spans.size())) + { + auto const final{spans.back()}; + if (final.track->eType != tt_Normal || false == final.track->Dynamics.empty()) + { + state.status = "The end of the straight can't be reshaped here"; + return; + } + auto const length{final.to - final.from}; + auto const cut{To < final.to - 1.0 ? std::max(To, final.from + std::min(1.0, length * 0.5)) : final.from + length * 0.7}; + splitstates.emplace_back(final.track, editor_track::capture(*final.track)); + editor_track::chain split; + split.tracks = {final.track}; + split.forward = {final.forward}; + std::vector pieces(2); + pieces[0].points[segment_data::point::start] = point(final.from); + pieces[0].points[segment_data::point::end] = point(cut); + pieces[1].points[segment_data::point::start] = point(cut); + pieces[1].points[segment_data::point::end] = point(final.to); + splitcreated = editor_track::relay(split, pieces); + line = editor_track::find_straight(*line.tracks.front(), state.tolerance); + collect(); + end = std::min(To, cut); + select(end); + if (first < 0 || last + 1 >= static_cast(spans.size())) + { + for (auto *track : splitcreated) + editor_track::retire(*track); + editor_track::apply(*splitstates.front().first, splitstates.front().second); + editor_track::commit({splitstates.front().first}); + return; } } - if (first < 0 || last + 1 >= static_cast(spans.size())) - { - state.status = "The reshaped part has to end before the end of the straight"; - return; - } + auto const undo_split = [&]() { + for (auto *track : splitcreated) + editor_track::retire(*track); + for (auto const &entry : splitstates) + { + editor_track::apply(*entry.first, entry.second); + editor_track::commit({entry.first}); + } + }; for (int i = first; i <= last; ++i) { if (spans[i].track->eType != tt_Normal) { + undo_split(); state.status = "There's a switch in the reshaped part of the straight"; return; } } editor_track::straight tail; - tail.direction = Line.direction; + tail.direction = line.direction; for (int i = last + 1; i < static_cast(spans.size()); ++i) { tail.tracks.push_back(spans[i].track); tail.paths.push_back(spans[i].path); } - auto const point = [&](double const Along) { - auto const planar{glm::dvec2{Line.start.x, Line.start.z} + Line.direction * Along}; - return glm::dvec3{planar.x, Line.start.y + Line.grade * Along, planar.y}; - }; tail.start = point(spans[last + 1].from); - tail.end = Line.end; - tail.length = Line.length - spans[last + 1].from; - tail.grade = Line.grade; + tail.end = line.end; + tail.length = line.length - spans[last + 1].from; + tail.grade = line.grade; std::vector chainpaths; for (int i = first; i <= last; ++i) @@ -2054,6 +2107,7 @@ void editor_mode::straight_reshape(editor_track::straight const &Line, double co { if (false == track->Dynamics.empty()) { + undo_split(); state.status = "There are vehicles placed on path " + track->name(); return; } @@ -2072,6 +2126,7 @@ void editor_mode::straight_reshape(editor_track::straight const &Line, double co for (auto const &entry : states) editor_track::apply(*entry.first, entry.second); editor_track::commit(tracks); + undo_split(); state.status = m_route.error; return; } @@ -2091,12 +2146,22 @@ void editor_mode::straight_reshape(editor_track::straight const &Line, double co for (auto const &entry : states) editor_track::apply(*entry.first, entry.second); editor_track::commit(tracks); + undo_split(); state.status = m_route.result.errors.empty() ? "The curve can't be fitted" : m_route.result.errors.front(); return; } auto const pieces{alignment::pieces(m_route.result, m_route.design, m_route.chain.tracks.size())}; auto created{editor_track::relay(m_route.chain, pieces)}; editor_track::commit(tracks); + for (auto const &entry : splitstates) + { + auto const found{std::find_if(states.begin(), states.end(), [&](auto const &State) { return State.first == entry.first; })}; + if (found != states.end()) + found->second = entry.second; + else + states.push_back(entry); + } + created.insert(created.begin(), splitcreated.begin(), splitcreated.end()); push_track_snapshot(std::move(states), std::move(created)); std::string error; editor_track::find_chain(m_route.from, m_route.to, m_route.chain, error); @@ -2181,7 +2246,11 @@ void editor_mode::apply_straight_tool() if (std::abs(angle) < 1e-5) return; glm::dvec2 const pivot{state.tool_point.x, state.tool_point.z}; - auto const reach{radius * std::tan(std::min(std::abs(angle), 3.0) * 0.5) + 200.0}; + double speed{-1.0}; + for (auto const *track : line.tracks) + speed = std::max(speed, editor_track::velocity(*track)); + auto const transition{state.auto_transitions ? alignment::recommend(speed > 0.0 ? speed : 100.0, radius, m_route.design.norms).transition : state.transition}; + auto const reach{radius * std::tan(std::min(std::abs(angle), 3.0) * 0.5) + transition * 0.5 + 10.0}; straight_reshape(line, state.tool_at - reach, state.tool_at + reach, [pivot, angle](glm::dvec3 const &Point) { glm::dvec2 const relative{Point.x - pivot.x, Point.z - pivot.y}; From 8a50d352fbd221938ce702545babddd8b1bb8ba8 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 3 Oct 2026 00:39:16 +0200 Subject: [PATCH 061/430] feat(editor): shift with 4 points, single path curves, undo --- application/editormode.cpp | 6 +- application/editormode.h | 6 + application/editormodetrack.cpp | 287 +++++++++++++++++++++++++------- editor/editorTrack.cpp | 15 +- 4 files changed, 245 insertions(+), 69 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 2b44933f1..ff40cc266 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -2758,6 +2758,7 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in m_straights.handle = -1; m_route.grip = -1; m_straights.tool_placed = false; + m_straights.detour.clear(); } break; @@ -2867,7 +2868,10 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const } if ((Mods & (GLFW_MOD_CONTROL | GLFW_MOD_SHIFT)) != 0 && m_track_tab == track_tab::straights && false == current_straight().tracks.empty()) { - start_straight_gesture((Mods & GLFW_MOD_CONTROL) != 0 ? 1 : 2); + if ((Mods & GLFW_MOD_CONTROL) != 0) + start_straight_gesture(1); + else + add_detour_point(); m_input.mouse.button(Button, Action); return; } diff --git a/application/editormode.h b/application/editormode.h index 6ac172c75..02cbd5445 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -354,6 +354,9 @@ class editor_mode : public application_mode double transition{0.0}; int tool{0}; bool tool_mouse{false}; + std::vector detour; + editor_track::straight detour_line; + glm::dvec3 detour_mouse{0.0}; bool tool_placed{false}; bool tool_dragging{false}; double tool_at{0.0}; @@ -378,6 +381,9 @@ class editor_mode : public application_mode double straight_tool_radius(editor_track::straight const &Line) const; void straight_reshape(editor_track::straight const &Line, double const From, double const To, std::function const &Tail, double const Radius); void straight_refresh(); + void add_detour_point(); + void apply_detour(); + std::vector detour_outline() const; void find_neighbour_straights(); glm::dvec3 snap_straight_offset(editor_track::straight const &Line, glm::dvec3 const &Offset) const; glm::dvec3 snap_straight_direction(glm::dvec3 const &Pivot, glm::dvec3 const &Moved) const; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 5209f1646..4f727c408 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -374,13 +374,13 @@ void editor_mode::commit_track_drag(bool const Force) void editor_mode::push_track_snapshot(std::vector> States, std::vector Created) { - if (States.empty()) + if (States.empty() && Created.empty()) return; if (m_max_history_size >= 0 && (int)m_history.size() >= m_max_history_size) m_history.erase(m_history.begin(), m_history.begin() + ((int)m_history.size() - m_max_history_size + 1)); - auto *track = States.front().first; + auto *track = States.empty() ? Created.front() : States.front().first; EditorSnapshot snap; snap.action = EditorSnapshot::Action::TrackEdit; snap.node_name = track->name(); @@ -547,8 +547,6 @@ void editor_mode::render_turnout_ui() } ImGui::PopItemWidth(); auto const replace = [&](editor_track::switch_template const &Template, int const Side) { - if (false == track->Dynamics.empty()) - return; auto const grade{length > 0.0 ? (main.points[segment_data::point::end].y - origin.y) / length : 0.0}; auto const paths{editor_track::place_switch(Template, origin, axis, Side, grade)}; push_track_snapshot({{track, editor_track::capture(*track)}}); @@ -1846,14 +1844,6 @@ void editor_mode::straights_apply(std::vector const &Lin auto &state{m_straights}; state.status.clear(); auto const tracks{editor_track::straight_affected(Lines)}; - for (auto *track : tracks) - { - if (false == track->Dynamics.empty()) - { - state.status = "There are vehicles placed on path " + track->name(); - return; - } - } std::vector> states; for (auto *track : tracks) states.emplace_back(track, editor_track::capture(*track)); @@ -1917,11 +1907,6 @@ void editor_mode::render_straight_gizmo() lines.push_back(line); } auto const tracks{editor_track::straight_affected(lines)}; - if (std::any_of(tracks.begin(), tracks.end(), [](TTrack const *Track) { return false == Track->Dynamics.empty(); })) - { - state.status = "There are vehicles placed on the straights or the paths attached to them"; - return; - } state.dragging = true; state.drag_line = line; state.drag_lines = lines; @@ -2024,8 +2009,38 @@ void editor_mode::straight_reshape(editor_track::straight const &Line, double co } } }; + auto const keep_regular = [&]() { + if (first < 0) + return; + auto const centre{(std::max(From, 0.0) + std::min(To, line.length)) * 0.5}; + int middle{first}; + for (int i = first; i <= last; ++i) + if (spans[i].from <= centre && spans[i].to >= centre) + middle = i; + if (spans[middle].track->eType != tt_Normal) + { + int best{-1}; + for (int i = first; i <= last; ++i) + if (spans[i].track->eType == tt_Normal && (best < 0 || std::abs(i - middle) < std::abs(best - middle))) + best = i; + if (best < 0) + { + first = last = -1; + return; + } + middle = best; + } + int low{middle}, high{middle}; + while (low > first && spans[low - 1].track->eType == tt_Normal) + --low; + while (high < last && spans[high + 1].track->eType == tt_Normal) + ++high; + first = low; + last = high; + }; collect(); select(To); + keep_regular(); if (first < 0) return; @@ -2035,11 +2050,8 @@ void editor_mode::straight_reshape(editor_track::straight const &Line, double co if (last + 1 >= static_cast(spans.size())) { auto const final{spans.back()}; - if (final.track->eType != tt_Normal || false == final.track->Dynamics.empty()) - { - state.status = "The end of the straight can't be reshaped here"; + if (final.track->eType != tt_Normal) return; - } auto const length{final.to - final.from}; auto const cut{To < final.to - 1.0 ? std::max(To, final.from + std::min(1.0, length * 0.5)) : final.from + length * 0.7}; splitstates.emplace_back(final.track, editor_track::capture(*final.track)); @@ -2056,6 +2068,7 @@ void editor_mode::straight_reshape(editor_track::straight const &Line, double co collect(); end = std::min(To, cut); select(end); + keep_regular(); if (first < 0 || last + 1 >= static_cast(spans.size())) { for (auto *track : splitcreated) @@ -2074,15 +2087,6 @@ void editor_mode::straight_reshape(editor_track::straight const &Line, double co editor_track::commit({entry.first}); } }; - for (int i = first; i <= last; ++i) - { - if (spans[i].track->eType != tt_Normal) - { - undo_split(); - state.status = "There's a switch in the reshaped part of the straight"; - return; - } - } editor_track::straight tail; tail.direction = line.direction; @@ -2103,15 +2107,6 @@ void editor_mode::straight_reshape(editor_track::straight const &Line, double co for (auto *track : chainpaths) if (std::find(tracks.begin(), tracks.end(), track) == tracks.end()) tracks.push_back(track); - for (auto *track : tracks) - { - if (false == track->Dynamics.empty()) - { - undo_split(); - state.status = "There are vehicles placed on path " + track->name(); - return; - } - } std::vector> states; for (auto *track : tracks) states.emplace_back(track, editor_track::capture(*track)); @@ -2187,6 +2182,11 @@ bool editor_mode::place_straight_tool() auto &state{m_straights}; if (ui()->mode() != nodebank_panel::TRACK || m_track_tab != track_tab::straights || state.tool == 0) return false; + if (state.tool == 2) + { + add_detour_point(); + return true; + } auto const &line{current_straight()}; if (line.tracks.empty()) return false; @@ -2339,14 +2339,16 @@ void editor_mode::delete_selected_track() void editor_mode::draw_track_hints() { std::string hint; - if (m_extend.active) + if (false == m_straights.detour.empty()) + hint = "Shift+click: point " + std::to_string(m_straights.detour.size() + 1) + " of 4 (1: leave the axis, 2: shifted, 3: start back, 4: back on the axis) Esc: cancel"; + else if (m_extend.active) hint = "Drag: curve through the cursor, along the end: straight Ctrl: straight"; else if (m_switch.placing) hint = "Drag along the straight to set the direction of the switch, sideways to set its side"; else if (m_switch.armed >= 0 && m_track_tab == track_tab::straights) hint = "Press on the selected straight where the switch starts and drag"; else if (m_track_tab == track_tab::straights) - hint = current_straight().tracks.empty() ? "LMB: select a straight or a curve" : "Drag the ends or the middle Ctrl+drag: break Shift+drag: S-curve Alt+click: add to the set Drag from a red ring: new path Del: delete"; + hint = current_straight().tracks.empty() ? "LMB: select a straight or a curve" : "Drag the ends or the middle Ctrl+drag: break Shift+click x4: shift around Alt+click: add to the set Drag from a red ring: new path Del: delete"; else if (m_track_tab == track_tab::turnout) hint = "Gizmo: move the switch (W: turn) Drag from a red ring: new path Del: delete"; else if (m_track_tab == track_tab::route) @@ -2365,6 +2367,7 @@ void editor_mode::draw_track_hints() void editor_mode::update_build_tools() { glm::dvec3 const ground{Global.pCamera.Pos + GfxRenderer->Mouse_Position()}; + m_straights.detour_mouse = ground; if (m_extend.active) m_extend.mouse = ground; if (m_switch.placing) @@ -2374,7 +2377,7 @@ void editor_mode::update_build_tools() bool editor_mode::start_extend() { auto *track{selected_track()}; - if (track == nullptr || (track->eType != tt_Normal && track->eType != tt_Switch) || false == editor_track::is_supported(*track) || false == track->Dynamics.empty()) + if (track == nullptr || (track->eType != tt_Normal && track->eType != tt_Switch) || false == editor_track::is_supported(*track)) return false; screen_projection const projection; ImVec2 const mouse = ImGui::GetIO().MousePos; @@ -2442,7 +2445,7 @@ std::vector editor_mode::extend_pieces() const auto const radius{chord / (2.0 * std::sin(angle * 0.5))}; double const side{lateral > 0.0 ? 1.0 : -1.0}; glm::dvec2 const centre{glm::dvec2{tool.point.x, tool.point.z} + glm::dvec2{-direction.y, direction.x} * (side * radius)}; - auto const count{std::max(1, static_cast(std::ceil(angle / glm::radians(10.0) - 1e-9)))}; + auto const count{std::max(1, static_cast(std::ceil(angle / glm::radians(90.0) - 1e-9)))}; auto const step{angle / count}; auto const handle{4.0 / 3.0 * std::tan(step / 4.0) * radius}; auto const turn = [&](glm::dvec2 const &Vector, double const Angle) { @@ -2537,13 +2540,11 @@ void editor_mode::insert_switch(editor_track::straight const &Line, double const auto &state{m_straights}; state.status.clear(); auto const &shape{m_switch.templates[m_switch.armed]}; - auto const from{Direction > 0 ? Along : Along - shape.length}; - auto const to{from + shape.length}; - if (from < -0.01 || to > Line.length + 0.01) - { - state.status = "The switch doesn't fit on the straight here"; + if (shape.length > Line.length - 0.02) return; - } + auto const from{std::clamp(Direction > 0 ? Along : Along - shape.length, 0.01, Line.length - shape.length - 0.01)}; + auto const to{from + shape.length}; + auto const origin{Direction > 0 ? from : to}; struct span { TTrack *track; @@ -2576,11 +2577,8 @@ void editor_mode::insert_switch(editor_track::straight const &Line, double const editor_track::chain chain; for (int i = first; i <= last; ++i) { - if (spans[i].track->eType != tt_Normal || false == spans[i].track->Dynamics.empty()) - { - state.status = "The switch would overlap another switch or a path with vehicles"; + if (spans[i].track->eType != tt_Normal) return; - } chain.tracks.push_back(spans[i].track); chain.forward.push_back(spans[i].forward); } @@ -2588,9 +2586,23 @@ void editor_mode::insert_switch(editor_track::straight const &Line, double const auto const after{std::max(0.0, spans[last].to - to)}; bool const hasbefore{before > 0.01}; bool const hasafter{after > 0.01}; + auto const point = [&](double const Distance) { return Line.start + glm::dvec3{Line.direction.x, Line.grade, Line.direction.y} * Distance; }; + glm::dvec2 const direction{Line.direction * static_cast(Direction)}; if (false == hasbefore && false == hasafter) { - state.status = "The switch would replace the paths completely, place it so that a piece of the straight remains"; + for (auto *track : chain.tracks) + editor_track::retire(*track); + auto const paths{editor_track::place_switch(shape, point(origin), direction, Side, Line.grade * Direction)}; + auto *track{editor_track::create_switch(shape, paths, *spans[first].track)}; + std::vector created; + if (track != nullptr) + { + editor_track::commit({track}); + created.push_back(track); + } + push_track_snapshot({}, std::move(created)); + m_history.back().removed = chain.tracks; + straight_refresh(); return; } auto const count{std::max(chain.tracks.size(), (hasbefore ? 1 : 0) + (hasafter ? 1 : 0))}; @@ -2599,7 +2611,6 @@ void editor_mode::insert_switch(editor_track::straight const &Line, double const countbefore = std::clamp(static_cast(std::round(count * before / (before + after))), 1, count - 1); else if (hasbefore) countbefore = count; - auto const point = [&](double const Distance) { return Line.start + glm::dvec3{Line.direction.x, Line.grade, Line.direction.y} * Distance; }; std::vector pieces; auto const straight = [&](double const From, double const To, std::size_t const Count) { for (std::size_t i = 0; i < Count; ++i) @@ -2619,8 +2630,7 @@ void editor_mode::insert_switch(editor_track::straight const &Line, double const for (auto *track : chain.tracks) states.emplace_back(track, editor_track::capture(*track)); auto created{editor_track::relay(chain, pieces)}; - glm::dvec2 const direction{Line.direction * static_cast(Direction)}; - auto const paths{editor_track::place_switch(shape, point(Along), direction, Side, Line.grade * Direction)}; + auto const paths{editor_track::place_switch(shape, point(origin), direction, Side, Line.grade * Direction)}; auto *track{editor_track::create_switch(shape, paths, *spans[first].track)}; if (track != nullptr) { @@ -2651,6 +2661,18 @@ void editor_mode::draw_build_overlay() const if (m_switch.placing) for (auto const &piece : switch_preview()) drawpath(piece, IM_COL32(255, 210, 60, 255)); + if (false == m_straights.detour.empty()) + { + auto const outline{detour_outline()}; + for (std::size_t i = 0; i + 1 < outline.size(); ++i) + projection.line(drawlist, outline[i], outline[i + 1], IM_COL32(255, 210, 60, 255), 3.0f); + for (std::size_t i = 0; i < outline.size() && i < m_straights.detour.size(); ++i) + { + ImVec2 screen; + if (projection.project(outline[i], screen)) + drawlist->AddCircleFilled(screen, 6.0f, IM_COL32(255, 60, 60, 255)); + } + } auto const *track{selected_track()}; if (track == nullptr || (track->eType != tt_Normal && track->eType != tt_Switch) || m_extend.active) return; @@ -2697,3 +2719,154 @@ void editor_mode::render_switch_ui() tool.armed = -1; } } + +std::vector editor_mode::detour_outline() const +{ + auto const &state{m_straights}; + std::vector result; + if (state.detour.empty()) + return result; + auto const &line{state.detour_line}; + glm::dvec2 const normal{-line.direction.y, line.direction.x}; + auto points{state.detour}; + if (points.size() < 4) + points.push_back(state.detour_mouse); + auto const along = [&](glm::dvec3 const &Point) { return glm::dot(glm::dvec2{Point.x - line.start.x, Point.z - line.start.z}, line.direction); }; + auto const offset{points.size() >= 2 ? glm::dot(glm::dvec2{points[1].x - line.start.x, points[1].z - line.start.z}, normal) : 0.0}; + auto const place = [&](double const Along, double const Lateral) { + auto const planar{glm::dvec2{line.start.x, line.start.z} + line.direction * Along + normal * Lateral}; + return glm::dvec3{planar.x, line.start.y + line.grade * Along, planar.y}; + }; + for (std::size_t i = 0; i < points.size(); ++i) + result.push_back(place(along(points[i]), (i == 1 || i == 2) ? offset : 0.0)); + return result; +} + +void editor_mode::add_detour_point() +{ + auto &state{m_straights}; + if (state.detour.empty()) + { + auto const &line{current_straight()}; + if (line.tracks.empty()) + return; + state.detour_line = line; + } + state.detour.push_back(Global.pCamera.Pos + GfxRenderer->Mouse_Position()); + if (state.detour.size() >= 4) + { + apply_detour(); + state.detour.clear(); + } +} + +void editor_mode::apply_detour() +{ + auto &state{m_straights}; + auto line{editor_track::find_straight(*state.detour_line.tracks.front(), state.tolerance)}; + if (line.tracks.empty()) + return; + glm::dvec2 const normal{-line.direction.y, line.direction.x}; + auto const along = [&](glm::dvec3 const &Point) { return glm::dot(glm::dvec2{Point.x - line.start.x, Point.z - line.start.z}, line.direction); }; + auto const offset{glm::dot(glm::dvec2{state.detour[1].x - line.start.x, state.detour[1].z - line.start.z}, normal)}; + std::array stations{along(state.detour[0]), along(state.detour[1]), along(state.detour[2]), along(state.detour[3])}; + if (stations[0] > stations[3]) + { + std::swap(stations[0], stations[3]); + std::swap(stations[1], stations[2]); + } + for (auto &station : stations) + station = std::clamp(station, 0.0, line.length); + stations[1] = std::clamp(stations[1], stations[0] + 1.0, stations[3] - 1.0); + stations[2] = std::clamp(stations[2], stations[1], stations[3] - 1.0); + if (std::abs(offset) < 0.01 || stations[3] - stations[0] < 3.0) + return; + + auto const radius{straight_tool_radius(line)}; + auto const slope{std::atan(std::abs(offset) / std::max(1.0, std::min(stations[1] - stations[0], stations[3] - stations[2])))}; + double speed{-1.0}; + for (auto const *track : line.tracks) + speed = std::max(speed, editor_track::velocity(*track)); + auto const transition{state.auto_transitions ? alignment::recommend(speed > 0.0 ? speed : 100.0, radius, m_route.design.norms).transition : state.transition}; + auto const reach{radius * std::tan(slope * 0.5) + transition * 0.5 + 5.0}; + auto const from{std::max(0.0, stations[0] - reach)}; + auto const to{std::min(line.length, stations[3] + reach)}; + + struct span + { + TTrack *track; + double from, to; + }; + std::vector spans; + for (std::size_t i = 0; i < line.tracks.size(); ++i) + { + auto const &path{line.tracks[i]->m_paths[line.paths[i]]}; + auto const a{along(path.points[segment_data::point::start])}; + auto const b{along(path.points[segment_data::point::end])}; + spans.push_back({line.tracks[i], std::min(a, b), std::max(a, b)}); + } + std::sort(spans.begin(), spans.end(), [](span const &A, span const &B) { return A.from < B.from; }); + int first{-1}, last{-1}; + for (int i = 0; i < static_cast(spans.size()); ++i) + { + if (spans[i].to > from && spans[i].from < to && spans[i].track->eType == tt_Normal) + { + if (first < 0) + first = i; + last = i; + } + else if (first >= 0 && spans[i].from < to) + { + if (spans[i].from > stations[3]) + break; + first = last = -1; + } + } + if (first < 0) + return; + + m_route.from = spans[first].track; + m_route.to = spans[last].track; + route_reset(); + if (m_route.chain.tracks.empty()) + return; + auto &design{m_route.design}; + auto const startalong{along(design.start)}; + auto const endalong{along(design.end)}; + auto const place = [&](double const Along, double const Lateral) { + auto const planar{glm::dvec2{line.start.x, line.start.z} + line.direction * Along + normal * Lateral}; + return planar; + }; + alignment::vertex vertex; + vertex.radius = radius; + route_recommend(vertex); + if (false == state.auto_transitions) + vertex.transition_in = vertex.transition_out = state.transition; + design.vertices.clear(); + auto first_vertex{vertex}; + first_vertex.offset = std::max(0.1, stations[0] - startalong); + design.vertices.push_back(first_vertex); + if (stations[2] - stations[1] < 1.0) + { + auto middle{vertex}; + middle.position = place((stations[1] + stations[2]) * 0.5, offset); + design.vertices.push_back(middle); + } + else + { + auto second{vertex}; + second.position = place(stations[1], offset); + auto third{vertex}; + third.position = place(stations[2], offset); + design.vertices.push_back(second); + design.vertices.push_back(third); + } + auto last_vertex{vertex}; + last_vertex.offset = std::max(0.1, endalong - stations[3]); + design.vertices.push_back(last_vertex); + route_update(); + if (false == m_route.result.valid) + return; + route_apply(); + straight_refresh(); +} diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index 63134cbe5..bc6fddc34 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -11,6 +11,7 @@ http: #include "editor/editorTrack.hpp" #include "world/Track.h" +#include "vehicle/DynObj.h" #include "scene/scene.h" #include "simulation/simulation.h" #include "rendering/renderer.h" @@ -191,11 +192,6 @@ bool editor_track::can_edit_geometry(TTrack const &Track, std::string &Reason) Reason = "Path geometry can't be rebuilt with the experimental renderer"; return false; } - if (false == Track.Dynamics.empty()) - { - Reason = "There are vehicles placed on this path"; - return false; - } Reason.clear(); return true; } @@ -235,6 +231,9 @@ void editor_track::commit(std::vector const &Tracks) rebuild_geometry(*track); for (auto *track : Tracks) track->mark_dirty(); + for (auto *track : affected) + for (auto *vehicle : track->Dynamics) + vehicle->Move(0.000001); } void editor_track::commit_parameters(TTrack &Track) @@ -745,12 +744,6 @@ bool editor_track::find_chain(TTrack *From, TTrack *To, chain &Chain, std::strin Chain = {}; return false; } - if (false == track->Dynamics.empty()) - { - Error = "There are vehicles placed on path " + track->name(); - Chain = {}; - return false; - } Chain.length += track->Length(); Chain.velocity = std::max(Chain.velocity, velocity(*track)); auto const radius{path_radius(track->m_paths.front(), 0.5)}; From bf24c3983a4def01561e49caf4d8cc87ac472636 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 3 Oct 2026 00:49:35 +0200 Subject: [PATCH 062/430] feat(editor): no sub-metre straights, switches snap, K splits path --- application/editormode.cpp | 14 +++++ application/editormodetrack.cpp | 33 +++++++++++- editor/editorAlignment.cpp | 90 +++++++++++++++++++++++++++++---- editor/editorAlignment.hpp | 1 + editor/editorTrack.cpp | 71 ++++++++++++++++++++++++++ editor/editorTrack.hpp | 2 + 6 files changed, 200 insertions(+), 11 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index ff40cc266..dd8bafa27 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -2768,6 +2768,20 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in m_fill_points.pop_back(); break; + case GLFW_KEY_K: + if (is_press(Action) && ui()->mode() == nodebank_panel::TRACK && selected_track() != nullptr) + { + auto *track{selected_track()}; + auto const parameter{editor_track::nearest_parameter(*track, Global.pCamera.Pos + GfxRenderer->Mouse_Position())}; + auto const before{editor_track::capture(*track)}; + if (auto *created{editor_track::split_path(*track, parameter)}) + { + push_track_snapshot({{track, before}}, {created}); + straight_refresh(); + } + } + break; + case GLFW_KEY_F: if (is_press(Action)) { diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 4f727c408..98e08fbc0 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -836,6 +836,7 @@ void editor_mode::route_reset() alignment::design design; design.norms = route.design.norms; design.shape = route.design.shape; + design.transition_pieces = route.design.transition_pieces; design.start = chain.start; design.end = chain.end; auto const plan = [](glm::dvec3 const &Direction) { return glm::normalize(glm::dvec2{Direction.x, Direction.z}); }; @@ -1221,6 +1222,11 @@ void editor_mode::render_route_ui() design.shape = static_cast(shape); changed = true; } + if (ImGui::SliderInt("Paths per transition curve", &design.transition_pieces, 1, 4)) + { + route_update(); + route_apply(); + } ImGui::PopItemWidth(); if (ImGui::TreeNode("Limits")) @@ -2355,7 +2361,7 @@ void editor_mode::draw_track_hints() hint = m_route.chain.tracks.empty() ? "LMB: select a curve" : "Drag the vertex (yellow) or the radius grip (green), the change is applied on release Ctrl+Z: undo"; else hint = "LMB: select a path or a point handle"; - hint += " O: top view"; + hint += " K: split the path under the cursor O: top view"; ImGuiIO const &io = ImGui::GetIO(); auto *drawlist{ImGui::GetBackgroundDrawList()}; ImVec2 const position{12.0f, io.DisplaySize.y - 28.0f}; @@ -2542,7 +2548,30 @@ void editor_mode::insert_switch(editor_track::straight const &Line, double const auto const &shape{m_switch.templates[m_switch.armed]}; if (shape.length > Line.length - 0.02) return; - auto const from{std::clamp(Direction > 0 ? Along : Along - shape.length, 0.01, Line.length - shape.length - 0.01)}; + auto from{std::clamp(Direction > 0 ? Along : Along - shape.length, 0.0, Line.length - shape.length)}; + { + std::vector joints{0.0, Line.length}; + for (std::size_t i = 0; i < Line.tracks.size(); ++i) + { + auto const &path{Line.tracks[i]->m_paths[Line.paths[i]]}; + for (auto const index : {segment_data::point::start, segment_data::point::end}) + joints.push_back(glm::dot(glm::dvec2{path.points[index].x - Line.start.x, path.points[index].z - Line.start.z}, Line.direction)); + } + auto const nearest = [&](double const Value) { + double best{Value}; + for (auto const joint : joints) + if (std::abs(joint - Value) < std::abs(best - Value) || best == Value) + best = std::abs(joint - Value) < 1.0 ? joint : best; + return best; + }; + auto const snappedstart{nearest(from)}; + auto const snappedend{nearest(from + shape.length)}; + if (snappedstart != from) + from = snappedstart; + else if (snappedend != from + shape.length) + from = snappedend - shape.length; + from = std::clamp(from, 0.0, Line.length - shape.length); + } auto const to{from + shape.length}; auto const origin{Direction > 0 ? from : to}; struct span diff --git a/editor/editorAlignment.cpp b/editor/editorAlignment.cpp index 39df9129e..5f41b0b7c 100644 --- a/editor/editorAlignment.cpp +++ b/editor/editorAlignment.cpp @@ -217,7 +217,7 @@ glm::dvec2 blossom(std::array const &Points, double const A, doub return glm::mix(s[0], s[1], C); } -std::size_t element_pieces(element const &Element, transition_shape const Shape) +std::size_t element_pieces(element const &Element, transition_shape const Shape, int const Transitions) { if (Element.length < 1e-3) return 0; @@ -227,11 +227,12 @@ std::size_t element_pieces(element const &Element, transition_shape const Shape) return static_cast(std::max(1.0, std::ceil(Element.length / Element.radius / (10.0 * kPi / 180.0) - 1e-9))); case element_kind::transition_in: case element_kind::transition_out: - return Shape == transition_shape::cubic_parabola ? 1 : static_cast(std::max(1.0, std::ceil(Element.length / 20.0 - 1e-9))); + return std::max(std::max(1, Transitions), Shape == transition_shape::cubic_parabola ? 1 : static_cast(std::max(1.0, std::ceil(Element.length / 20.0 - 1e-9)))); case element_kind::spiral: { auto const turn{(Element.curvature_start + Element.curvature_end) * 0.5 * Element.length}; - return static_cast(std::max({1.0, std::ceil(turn / (10.0 * kPi / 180.0) - 1e-9), std::ceil(Element.length / 20.0 - 1e-9)})); + auto const count{static_cast(std::max({1.0, std::ceil(turn / (10.0 * kPi / 180.0) - 1e-9), std::ceil(Element.length / 20.0 - 1e-9)}))}; + return Element.curvature_start != Element.curvature_end ? std::max(count, std::max(1, Transitions)) : count; } default: return 1; @@ -854,7 +855,7 @@ std::size_t minimum_pieces(result const &Result, design const &Design) { std::size_t count{0}; for (auto const &e : Result.elements) - count += element_pieces(e, Design.shape); + count += element_pieces(e, Design.shape, Design.transition_pieces); return count; } @@ -864,27 +865,98 @@ std::vector pieces(result const &Result, design const &Design, std { std::size_t element; double from, to; + bool generic{false}; + double start{0.0}; + double end{0.0}; }; + auto const extent = [&](span const &Span) { return Span.generic ? Span.end - Span.start : Span.to - Span.from; }; + auto const chainage_from = [&](span const &Span) { return Span.generic ? Span.start : Result.elements[Span.element].chainage + Span.from; }; + auto const chainage_to = [&](span const &Span) { return Span.generic ? Span.end : Result.elements[Span.element].chainage + Span.to; }; std::vector spans; for (std::size_t i = 0; i < Result.elements.size(); ++i) { auto const &e{Result.elements[i]}; - auto const count{element_pieces(e, Design.shape)}; + auto const count{element_pieces(e, Design.shape, Design.transition_pieces)}; for (std::size_t j = 0; j < count; ++j) spans.push_back({i, e.length * j / count, e.length * (j + 1) / count}); } + double const shortest{1.0}; + for (std::size_t i = 0; i < spans.size() && spans.size() > 1;) + { + auto const &e{Result.elements[spans[i].element]}; + if (e.kind != element_kind::straight || extent(spans[i]) >= shortest) + { + ++i; + continue; + } + auto const start{chainage_from(spans[i])}; + auto const end{chainage_to(spans[i])}; + if (i > 0) + { + auto &previous{spans[i - 1]}; + previous.start = chainage_from(previous); + previous.end = end; + previous.generic = true; + } + else + { + auto &next{spans[i + 1]}; + next.end = chainage_to(next); + next.start = start; + next.generic = true; + } + spans.erase(spans.begin() + i); + } while (false == spans.empty() && spans.size() < Count) { - auto longest = std::max_element(spans.begin(), spans.end(), [](span const &A, span const &B) { return A.to - A.from < B.to - B.from; }); - auto const middle{(longest->from + longest->to) * 0.5}; - span const second{longest->element, middle, longest->to}; - longest->to = middle; + auto longest = std::max_element(spans.begin(), spans.end(), [&](span const &A, span const &B) { return extent(A) < extent(B); }); + span second{*longest}; + if (longest->generic) + { + auto const middle{(longest->start + longest->end) * 0.5}; + second.start = middle; + longest->end = middle; + } + else + { + auto const middle{(longest->from + longest->to) * 0.5}; + second.from = middle; + longest->to = middle; + } spans.insert(std::next(longest), second); } std::vector result; for (auto const &piece : spans) { + if (piece.generic) + { + auto const first{evaluate(Result, piece.start)}; + auto const last{evaluate(Result, piece.end)}; + glm::dvec2 const p0{first.position.x, first.position.z}; + glm::dvec2 const p3{last.position.x, last.position.z}; + auto const d0{glm::normalize(glm::dvec2{first.direction.x, first.direction.z})}; + auto const d3{glm::normalize(glm::dvec2{last.direction.x, last.direction.z})}; + auto const handle{glm::distance(p0, p3) / 3.0}; + auto const p1{p0 + d0 * handle}; + auto const p2{p3 - d3 * handle}; + auto const y0{first.position.y}; + auto const y3{last.position.y}; + auto const y1{y0 + grade(Result, piece.start) * handle}; + auto const y2{y3 - grade(Result, piece.end) * handle}; + auto const roll = [&](station const &Station) { return static_cast(Station.turn * glm::degrees(std::asin(std::clamp(Station.cant / Design.norms.gauge, -1.0, 1.0)))); }; + segment_data path; + path.points[segment_data::point::start] = first.position; + path.points[segment_data::point::end] = last.position; + path.points[segment_data::point::control1] = glm::dvec3{p1.x, y1, p1.y} - first.position; + path.points[segment_data::point::control2] = glm::dvec3{p2.x, y2, p2.y} - last.position; + path.rolls[0] = roll(first); + path.rolls[1] = roll(last); + auto const &e{Result.elements[piece.element]}; + path.radius = e.kind == element_kind::straight ? 0.f : static_cast(e.radius); + result.push_back(path); + continue; + } auto const &e{Result.elements[piece.element]}; glm::dvec2 p0, p3, d0, d3; element_point(e, Design.shape, piece.from, p0, d0); diff --git a/editor/editorAlignment.hpp b/editor/editorAlignment.hpp index 51c597a4e..139841809 100644 --- a/editor/editorAlignment.hpp +++ b/editor/editorAlignment.hpp @@ -68,6 +68,7 @@ struct design std::vector vertices; transition_shape shape{transition_shape::cubic_parabola}; double speed{100.0}; + int transition_pieces{1}; limits norms; }; diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index bc6fddc34..d6e80d05a 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -1500,6 +1500,77 @@ TTrack *editor_track::create_path(TTrack const &Style, segment_data const &Path) return track; } +double editor_track::nearest_parameter(TTrack const &Track, glm::dvec3 const &Point) +{ + if (Track.m_paths.empty()) + return 0.5; + auto const &path{Track.m_paths.front()}; + auto const p0{path.points[segment_data::point::start]}; + auto const p3{path.points[segment_data::point::end]}; + auto const p1{p0 + path.points[segment_data::point::control1]}; + auto const p2{p3 + path.points[segment_data::point::control2]}; + auto const at = [&](double const T) { + auto const u{1.0 - T}; + return u * u * u * p0 + 3.0 * u * u * T * p1 + 3.0 * u * T * T * p2 + T * T * T * p3; + }; + auto const distance = [&](double const T) { auto const q{at(T)}; return glm::distance(glm::dvec2{q.x, q.z}, glm::dvec2{Point.x, Point.z}); }; + double best{0.5}; + for (int i = 0; i <= 200; ++i) + if (distance(i / 200.0) < distance(best)) + best = i / 200.0; + double step{1.0 / 200.0}; + for (int i = 0; i < 30; ++i) + { + step *= 0.5; + if (best - step > 0.0 && distance(best - step) < distance(best)) + best -= step; + else if (best + step < 1.0 && distance(best + step) < distance(best)) + best += step; + } + return best; +} + +TTrack *editor_track::split_path(TTrack &Track, double const T) +{ + if (Track.eType != tt_Normal || Track.m_paths.empty() || T <= 0.001 || T >= 0.999) + return nullptr; + auto const path{Track.m_paths.front()}; + auto const p0{path.points[segment_data::point::start]}; + auto const p3{path.points[segment_data::point::end]}; + segment_data first{path}; + segment_data second{path}; + auto const roll{static_cast(path.rolls[0] + (path.rolls[1] - path.rolls[0]) * T)}; + if (path.points[segment_data::point::control1] == glm::dvec3{} && path.points[segment_data::point::control2] == glm::dvec3{}) + { + auto const middle{glm::mix(p0, p3, T)}; + first.points[segment_data::point::end] = middle; + second.points[segment_data::point::start] = middle; + } + else + { + auto const p1{p0 + path.points[segment_data::point::control1]}; + auto const p2{p3 + path.points[segment_data::point::control2]}; + auto const p01{glm::mix(p0, p1, T)}; + auto const p12{glm::mix(p1, p2, T)}; + auto const p23{glm::mix(p2, p3, T)}; + auto const p012{glm::mix(p01, p12, T)}; + auto const p123{glm::mix(p12, p23, T)}; + auto const middle{glm::mix(p012, p123, T)}; + first.points[segment_data::point::control1] = p01 - p0; + first.points[segment_data::point::control2] = p012 - middle; + first.points[segment_data::point::end] = middle; + second.points[segment_data::point::start] = middle; + second.points[segment_data::point::control1] = p123 - middle; + second.points[segment_data::point::control2] = p23 - p3; + } + first.rolls[1] = roll; + second.rolls[0] = roll; + auto *created{create_path(Track, second)}; + Track.m_paths.front() = first; + commit({&Track, created}); + return created; +} + TTrack *editor_track::load_path(std::string const &Text, TTrack const &Template) { cParser parser(Text, cParser::buffer_TEXT); diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index d96358d4c..f1b535a14 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -150,6 +150,8 @@ class editor_track static std::vector find_switch_templates(); static TTrack *load_path(std::string const &Text, TTrack const &Template); static TTrack *create_path(TTrack const &Style, segment_data const &Path); + static TTrack *split_path(TTrack &Track, double const T); + static double nearest_parameter(TTrack const &Track, glm::dvec3 const &Point); static std::vector place_switch(switch_template const &Template, glm::dvec3 const &Origin, glm::dvec2 const &Direction, int const Side, double const Grade); static TTrack *create_switch(switch_template const &Template, std::vector const &Paths, TTrack const &Style); static void move_straights(std::vector const &Lines, std::vector> const &Ends); From 613ee89c6917b29df953fb58ce922bd9c239177b Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 3 Oct 2026 00:53:32 +0200 Subject: [PATCH 063/430] fix(editor): apply the transition split when the slider is released --- application/editormodetrack.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 98e08fbc0..586a6fc84 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -1223,10 +1223,9 @@ void editor_mode::render_route_ui() changed = true; } if (ImGui::SliderInt("Paths per transition curve", &design.transition_pieces, 1, 4)) - { route_update(); + if (ImGui::IsItemDeactivatedAfterEdit()) route_apply(); - } ImGui::PopItemWidth(); if (ImGui::TreeNode("Limits")) From de5f2069f78e52518bfc2895909a8bff29ddd696 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 3 Oct 2026 00:55:29 +0200 Subject: [PATCH 064/430] feat(editor): dragging straight refits neighbor curves --- application/editormode.h | 5 ++ application/editormodetrack.cpp | 101 ++++++++++++++++++++++++++++++-- editor/editorTrack.cpp | 27 +++++++++ editor/editorTrack.hpp | 2 + 4 files changed, 131 insertions(+), 4 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index 02cbd5445..7c56b5e30 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -340,6 +340,9 @@ class editor_mode : public application_mode editor_track::straight drag_line; std::vector set; std::vector drag_lines; + bool fitting{false}; + editor_track::curve fit_before; + editor_track::curve fit_after; std::vector> drag_states; glm::dvec3 preview_start{0.0}; glm::dvec3 preview_end{0.0}; @@ -381,6 +384,8 @@ class editor_mode : public application_mode double straight_tool_radius(editor_track::straight const &Line) const; void straight_reshape(editor_track::straight const &Line, double const From, double const To, std::function const &Tail, double const Radius); void straight_refresh(); + bool start_curve_fit(editor_track::straight const &Line); + void update_curve_fit(glm::dvec3 const &Start, glm::dvec3 const &End); void add_detour_point(); void apply_detour(); std::vector detour_outline() const; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 586a6fc84..f3a10879e 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -1474,7 +1474,22 @@ void editor_mode::draw_straights_overlay() const projection.line(drawlist, state.tool_point + along * length + shifted, line.end + shifted, IM_COL32(255, 210, 60, 255), 3.0f); } } - if (m_straights.dragging) + if (m_straights.dragging && m_straights.fitting) + { + auto const &result{m_route.result}; + if (result.length > 0.0 && result.profile.size() >= 2) + { + int const steps{std::clamp(static_cast(result.length / 2.0), 2, 2000)}; + auto previous{alignment::evaluate(result, 0.0).position}; + for (int i = 1; i <= steps; ++i) + { + auto const next{alignment::evaluate(result, result.length * i / steps).position}; + projection.line(drawlist, previous, next, result.valid ? IM_COL32(255, 210, 60, 255) : IM_COL32(255, 60, 60, 255), 3.0f); + previous = next; + } + } + } + else if (m_straights.dragging) { for (auto const &member : m_straights.drag_lines) { @@ -1911,15 +1926,19 @@ void editor_mode::render_straight_gizmo() { lines.push_back(line); } - auto const tracks{editor_track::straight_affected(lines)}; + state.fitting = lines.size() == 1 && start_curve_fit(line); + auto const tracks{state.fitting ? std::vector{} : editor_track::straight_affected(lines)}; state.dragging = true; state.drag_line = line; state.drag_lines = lines; state.drag_states.clear(); for (auto *track : tracks) state.drag_states.emplace_back(track, editor_track::capture(*track)); - push_track_snapshot(state.drag_states); - m_track_drag = tracks; + if (false == state.fitting) + { + push_track_snapshot(state.drag_states); + m_track_drag = tracks; + } } auto const &grabbed{state.drag_line}; glm::dvec3 moved{camerapos + glm::dvec3(state.gizmo[3])}; @@ -1955,6 +1974,11 @@ void editor_mode::render_straight_gizmo() ends.emplace_back(transform(member.start), transform(member.end)); state.preview_start = transform(grabbed.start); state.preview_end = transform(grabbed.end); + if (state.fitting) + { + update_curve_fit(state.preview_start, state.preview_end); + return; + } for (auto const &entry : state.drag_states) editor_track::apply(*entry.first, entry.second); editor_track::move_straights(state.drag_lines, ends); @@ -1963,6 +1987,16 @@ void editor_mode::render_straight_gizmo() } else if (state.dragging) { + if (state.fitting) + { + state.fitting = false; + state.dragging = false; + state.drag_lines.clear(); + if (m_route.result.valid) + route_apply(); + straight_refresh(); + return; + } commit_track_drag(true); state.dragging = false; m_track_drag.clear(); @@ -2898,3 +2932,62 @@ void editor_mode::apply_detour() route_apply(); straight_refresh(); } + +bool editor_mode::start_curve_fit(editor_track::straight const &Line) +{ + auto &state{m_straights}; + auto *before{editor_track::outside_neighbour(Line, false)}; + auto *after{editor_track::outside_neighbour(Line, true)}; + if (before == nullptr || after == nullptr) + return false; + if (false == editor_track::find_curve(*before, state.tolerance, m_route.design.norms.gauge, state.fit_before) || false == editor_track::find_curve(*after, state.tolerance, m_route.design.norms.gauge, state.fit_after)) + return false; + if (state.fit_before.reversals != 0 || state.fit_after.reversals != 0) + return false; + auto const far = [](editor_track::curve const &Curve, glm::dvec3 const &Joint) { return editor_track::touches(*Curve.from, Joint) ? Curve.to : Curve.from; }; + m_route.from = far(state.fit_before, Line.start); + m_route.to = far(state.fit_after, Line.end); + route_reset(); + if (m_route.chain.tracks.empty()) + return false; + return true; +} + +void editor_mode::update_curve_fit(glm::dvec3 const &Start, glm::dvec3 const &End) +{ + auto &state{m_straights}; + auto &design{m_route.design}; + glm::dvec2 const point{Start.x, Start.z}; + glm::dvec2 const direction{glm::normalize(glm::dvec2{End.x - Start.x, End.z - Start.z})}; + auto const cross = [](glm::dvec2 const &A, glm::dvec2 const &B) { return A.x * B.y - A.y * B.x; }; + glm::dvec2 const start{design.start.x, design.start.z}; + glm::dvec2 const end{design.end.x, design.end.z}; + auto const startdirection{glm::normalize(design.start_direction)}; + auto const enddirection{glm::normalize(design.end_direction)}; + auto const first{cross(point - start, direction) / cross(startdirection, direction)}; + auto const last{cross(end - point, direction) / cross(enddirection, direction)}; + auto const make = [&](editor_track::curve const &Curve, double const Offset) { + alignment::vertex vertex; + vertex.radius = Curve.radius > 0.0 ? std::round(Curve.radius) : 1000.0; + route_recommend(vertex); + if (Curve.transition_in > 0.0) + vertex.transition_in = std::round(Curve.transition_in); + if (Curve.transition_out > 0.0) + vertex.transition_out = std::round(Curve.transition_out); + if (Curve.cant > 0.0) + vertex.cant = std::round(Curve.cant); + if (Curve.compound) + { + vertex.compound = true; + vertex.radius2 = std::round(Curve.radius2); + vertex.transition_middle = std::round(Curve.transition_middle); + vertex.split = Curve.split; + } + vertex.offset = std::max(0.1, Offset); + return vertex; + }; + auto before{make(state.fit_before, first)}; + auto after{make(state.fit_after, last)}; + design.vertices = {before, after}; + route_update(); +} diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index d6e80d05a..2ecfc9e8c 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -1253,6 +1253,33 @@ TTrack *editor_track::create_switch(switch_template const &Template, std::vector return track; } +bool editor_track::touches(TTrack const &Track, glm::dvec3 const &Point) +{ + for (auto const &path : Track.m_paths) + for (auto const index : {segment_data::point::start, segment_data::point::end}) + if (glm::distance(path.points[index], Point) <= kSamePoint) + return true; + return false; +} + +TTrack *editor_track::outside_neighbour(straight const &Line, bool const Atend) +{ + auto const &point{Atend ? Line.end : Line.start}; + for (std::size_t i = 0; i < Line.tracks.size(); ++i) + { + auto const &path{Line.tracks[i]->m_paths[Line.paths[i]]}; + for (auto const end : {false, true}) + { + if (glm::distance(path.points[end ? segment_data::point::end : segment_data::point::start], point) > kSamePoint) + continue; + auto *neighbour{neighbour_at(*Line.tracks[i], Line.paths[i], end)}; + if (neighbour != nullptr && std::find(Line.tracks.begin(), Line.tracks.end(), neighbour) == Line.tracks.end()) + return neighbour; + } + } + return nullptr; +} + std::vector editor_track::straight_affected(std::vector const &Lines) { std::vector result; diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index f1b535a14..297d217b1 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -118,6 +118,8 @@ class editor_track static straight find_straight(TTrack &Track, straight_tolerance const &Tolerance); static std::vector find_straights(double const Minimumlength, straight_tolerance const &Tolerance); static std::vector straight_affected(std::vector const &Lines); + static TTrack *outside_neighbour(straight const &Line, bool const Atend); + static bool touches(TTrack const &Track, glm::dvec3 const &Point); struct curve { TTrack *from{nullptr}; From a9e63e94960d7677c18d87a68e7cc70e30a3bfb7 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 3 Oct 2026 01:02:18 +0200 Subject: [PATCH 065/430] fix(editor): fix: zero-vector curves detection --- application/editormodetrack.cpp | 1 + editor/editorTrack.cpp | 150 +++++++++++++++++++++++++++----- editor/editorTrack.hpp | 1 + 3 files changed, 128 insertions(+), 24 deletions(-) diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index f3a10879e..ab5a29527 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -1640,6 +1640,7 @@ void editor_mode::render_straights_ui() if (ImGui::InputDouble("Angle tolerance (deg)", &angle, 0.0, 0.0, "%.4f")) state.tolerance.angle = glm::radians(std::max(0.0, angle)); ImGui::InputDouble("Offset tolerance (m)", &state.tolerance.offset, 0.0, 0.0, "%.3f"); + ImGui::InputDouble("Treat as straight above R (m)", &state.tolerance.radius, 0.0, 0.0, "%.0f"); ImGui::InputDouble("Minimum length (m)", &state.minimum_length, 0.0, 0.0, "%.0f"); ImGui::PopItemWidth(); if (ImGui::Button("Recognize straights in the scenery")) diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index 2ecfc9e8c..0a86e6067 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -746,7 +746,9 @@ bool editor_track::find_chain(TTrack *From, TTrack *To, chain &Chain, std::strin } Chain.length += track->Length(); Chain.velocity = std::max(Chain.velocity, velocity(*track)); - auto const radius{path_radius(track->m_paths.front(), 0.5)}; + auto radius{path_radius(track->m_paths.front(), 0.5)}; + if (radius == 0.0 && track->m_paths.front().radius != 0.f) + radius = std::abs(track->m_paths.front().radius); if (radius > 0.0 && (Chain.radius == 0.0 || radius < Chain.radius)) Chain.radius = radius; } @@ -789,17 +791,56 @@ double lateral_of(glm::dvec2 const &Direction, glm::dvec2 const &Offset) return Direction.x * Offset.y - Direction.y * Offset.x; } -bool plan_straight(segment_data const &Path, double const Tolerance) +bool plan_straight(segment_data const &Path, editor_track::straight_tolerance const &Tolerance) { auto const chord{plan_of(Path.points[segment_data::point::end] - Path.points[segment_data::point::start])}; auto const length{glm::length(chord)}; if (length < 1e-3) return false; + auto const &control1{Path.points[segment_data::point::control1]}; + auto const &control2{Path.points[segment_data::point::control2]}; + if (Path.radius != 0.f && std::abs(Path.radius) < Tolerance.radius) + return false; + if (control1 == glm::dvec3{} && control2 == glm::dvec3{}) + return true; auto const direction{chord / length}; for (auto const index : {segment_data::point::control1, segment_data::point::control2}) - if (std::abs(lateral_of(direction, plan_of(Path.points[index]))) > Tolerance) + if (std::abs(lateral_of(direction, plan_of(Path.points[index]))) > Tolerance.offset) return false; - return true; + auto const tangentstart{plan_of(path_tangent(Path, false))}; + auto const tangentend{plan_of(path_tangent(Path, true))}; + if (glm::length(tangentstart) < 1e-9 || glm::length(tangentend) < 1e-9) + return false; + auto const a{glm::normalize(tangentstart)}; + auto const b{glm::normalize(tangentend)}; + auto const turn{std::abs(std::atan2(lateral_of(a, b), glm::dot(a, b)))}; + auto const deviation{std::max(std::abs(lateral_of(direction, a)), std::abs(lateral_of(direction, b)))}; + return turn * Tolerance.radius <= length && deviation * Tolerance.radius <= length; +} + +glm::dvec2 direction_at(TTrack const &Track, glm::dvec3 const &Joint, bool const Arriving, bool &Found) +{ + Found = false; + for (auto const &path : Track.m_paths) + { + for (auto const atend : {false, true}) + { + if (glm::distance(path.points[atend ? segment_data::point::end : segment_data::point::start], Joint) > kSamePoint) + continue; + auto const tangent{plan_of(path_tangent(path, atend))}; + if (glm::length(tangent) < 1e-9) + continue; + Found = true; + auto const unit{glm::normalize(tangent)}; + return (atend == Arriving) ? unit : -unit; + } + } + return {0.0, 1.0}; +} + +double signed_angle(glm::dvec2 const &From, glm::dvec2 const &To) +{ + return std::atan2(lateral_of(From, To), glm::dot(From, To)); } TTrack *neighbour_at(TTrack const &Track, int const Path, bool const Atend) @@ -851,7 +892,25 @@ bool editor_track::is_straight(TTrack const &Track, straight_tolerance const &To { if (false == is_supported(Track) || Track.m_editorremoved) return false; - return std::any_of(Track.m_paths.begin(), Track.m_paths.end(), [&](segment_data const &Path) { return plan_straight(Path, Tolerance.offset); }); + if (false == std::any_of(Track.m_paths.begin(), Track.m_paths.end(), [&](segment_data const &Path) { return plan_straight(Path, Tolerance); })) + return false; + if (Track.eType != tt_Normal || Track.trPrev == nullptr || Track.trNext == nullptr) + return true; + auto const &path{Track.m_paths.front()}; + auto const &start{path.points[segment_data::point::start]}; + auto const &end{path.points[segment_data::point::end]}; + auto const length{glm::length(plan_of(end - start))}; + auto const direction{glm::normalize(plan_of(end - start))}; + bool foundbefore, foundafter; + auto const before{direction_at(*Track.trPrev, start, true, foundbefore)}; + auto const after{direction_at(*Track.trNext, end, false, foundafter)}; + if (false == foundbefore || false == foundafter) + return true; + auto const kinkbefore{signed_angle(before, direction)}; + auto const kinkafter{signed_angle(direction, after)}; + if (std::abs(kinkbefore) <= Tolerance.angle || std::abs(kinkafter) <= Tolerance.angle || (kinkbefore > 0.0) != (kinkafter > 0.0)) + return true; + return length / ((std::abs(kinkbefore) + std::abs(kinkafter)) * 0.5) >= Tolerance.radius; } editor_track::straight editor_track::find_straight(TTrack &Track, straight_tolerance const &Tolerance) @@ -861,7 +920,7 @@ editor_track::straight editor_track::find_straight(TTrack &Track, straight_toler return result; int firstpath{0}; - while (false == plan_straight(Track.m_paths[firstpath], Tolerance.offset)) + while (false == plan_straight(Track.m_paths[firstpath], Tolerance)) ++firstpath; auto const &first{Track.m_paths[firstpath]}; auto const origin{first.points[segment_data::point::start]}; @@ -873,7 +932,7 @@ editor_track::straight editor_track::find_straight(TTrack &Track, straight_toler for (int i = 0; i < static_cast(Other->m_paths.size()); ++i) { auto const &path{Other->m_paths[i]}; - if (false == plan_straight(path, Tolerance.offset)) + if (false == plan_straight(path, Tolerance)) continue; auto const &start{path.points[segment_data::point::start]}; auto const &end{path.points[segment_data::point::end]}; @@ -993,28 +1052,73 @@ bool editor_track::find_curve(TTrack &Track, straight_tolerance const &Tolerance std::vector turns; std::vector lengths; std::vector varying; - double smallest{0.0}; - for (auto const &member : run) + std::vector curvatures; + auto const incoming = [&](std::size_t const Index) { + auto const &path{run[Index].first->m_paths.front()}; + auto const tangent{glm::normalize(plan_of(run[Index].second ? path_tangent(path, false) : -path_tangent(path, true)))}; + return tangent; + }; + auto const outgoing = [&](std::size_t const Index) { + auto const &path{run[Index].first->m_paths.front()}; + auto const tangent{glm::normalize(plan_of(run[Index].second ? path_tangent(path, true) : -path_tangent(path, false)))}; + return tangent; + }; + auto const joint = [&](std::size_t const Index, bool const Atend) { + auto const &path{run[Index].first->m_paths.front()}; + return path.points[(run[Index].second == Atend) ? segment_data::point::end : segment_data::point::start]; + }; + std::vector kinks(run.size() + 1, 0.0); { - auto const &path{member.first->m_paths.front()}; - auto const tangentstart{glm::normalize(plan_of(path_tangent(path, false)))}; - auto const tangentend{glm::normalize(plan_of(path_tangent(path, true)))}; - auto turn{std::atan2(lateral_of(tangentstart, tangentend), glm::dot(tangentstart, tangentend))}; - if (false == member.second) - turn = -turn; - turns.push_back(turn); - lengths.push_back(member.first->Length()); + auto *before{run.front().second ? run.front().first->trPrev : run.front().first->trNext}; + bool found{false}; + if (before != nullptr) + { + auto const direction{direction_at(*before, joint(0, false), true, found)}; + if (found) + kinks.front() = signed_angle(direction, incoming(0)); + } + auto *after{run.back().second ? run.back().first->trNext : run.back().first->trPrev}; + if (after != nullptr) + { + auto const direction{direction_at(*after, joint(run.size() - 1, true), false, found)}; + if (found) + kinks.back() = signed_angle(outgoing(run.size() - 1), direction); + } + for (std::size_t i = 1; i < run.size(); ++i) + kinks[i] = signed_angle(outgoing(i - 1), incoming(i)); + } + for (std::size_t i = 0; i < run.size(); ++i) + { + auto const &path{run[i].first->m_paths.front()}; + auto const length{run[i].first->Length()}; + auto const internal{signed_angle(incoming(i), outgoing(i))}; + turns.push_back(internal + kinks[i] * 0.5 + kinks[i + 1] * 0.5); + lengths.push_back(length); auto const radiusstart{path_radius(path, 0.0)}; auto const radiusend{path_radius(path, 1.0)}; auto const curvaturestart{radiusstart > 0.0 ? 1.0 / radiusstart : 0.0}; auto const curvatureend{radiusend > 0.0 ? 1.0 / radiusend : 0.0}; + auto const middle{path_radius(path, 0.5)}; + double curvature{middle > 0.0 ? 1.0 / middle : 0.0}; + if (curvature == 0.0 && path.radius != 0.f) + curvature = 1.0 / std::abs(path.radius); + if (curvature == 0.0 && length > 1e-3) + curvature = std::abs(turns.back()) / length; + curvatures.push_back(curvature); varying.push_back(std::abs(curvaturestart - curvatureend) > 0.1 * std::max(curvaturestart, curvatureend)); - auto const radius{path_radius(path, 0.5)}; - if (radius > 0.0 && (smallest == 0.0 || radius < smallest)) - smallest = radius; for (auto const roll : path.rolls) Curve.cant = std::max(Curve.cant, Gauge * std::sin(std::abs(glm::radians(static_cast(roll))))); } + auto const peak{*std::max_element(curvatures.begin(), curvatures.end())}; + for (std::size_t i = 0; i < run.size(); ++i) + if (curvatures[i] < 0.9 * peak) + varying[i] = true; + double smallest{0.0}; + for (std::size_t i = 0; i < run.size(); ++i) + if (false == varying[i] && curvatures[i] > 0.0 && (smallest == 0.0 || 1.0 / curvatures[i] < smallest)) + smallest = 1.0 / curvatures[i]; + if (smallest == 0.0 && peak > 0.0) + smallest = 1.0 / peak; int sign{0}; for (auto const turn : turns) { @@ -1035,11 +1139,9 @@ bool editor_track::find_curve(TTrack &Track, straight_tolerance const &Tolerance std::vector> arcs; for (std::size_t i = 0; i < run.size(); ++i) { - if (varying[i]) - continue; - auto const radius{path_radius(run[i].first->m_paths.front(), 0.5)}; - if (radius <= 0.0) + if (varying[i] || curvatures[i] <= 0.0) continue; + auto const radius{1.0 / curvatures[i]}; if (false == arcs.empty() && std::abs(arcs.back().first - radius) < 0.05 * radius) arcs.back().second += lengths[i]; else diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index 297d217b1..17f3b1159 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -113,6 +113,7 @@ class editor_track { double angle{0.0002}; double offset{0.02}; + double radius{20000.0}; }; static bool is_straight(TTrack const &Track, straight_tolerance const &Tolerance); static straight find_straight(TTrack &Track, straight_tolerance const &Tolerance); From de6053e18a09ecc46e3dcc20a350d0a5e324f819 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 3 Oct 2026 01:10:43 +0200 Subject: [PATCH 066/430] feat(editor): crossover snaps to parallel straight --- application/editormode.h | 15 ++ application/editormodetrack.cpp | 240 +++++++++++++++++++++++++++++--- editor/editorAlignment.cpp | 10 +- editor/editorAlignment.hpp | 1 + 4 files changed, 238 insertions(+), 28 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index 7c56b5e30..d64fe1fea 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -415,6 +415,8 @@ class editor_mode : public application_mode glm::dvec2 direction{0.0, 1.0}; double grade{0.0}; glm::dvec3 mouse{0.0}; + int path{0}; + bool atend{true}; }; extend_tool m_extend; void render_switch_ui(); @@ -422,9 +424,22 @@ class editor_mode : public application_mode void finish_switch_placement(); std::vector switch_preview() const; void insert_switch(editor_track::straight const &Line, double const Along, int const Direction, int const Side); + bool place_switch_on_straight(editor_track::straight const &Line, editor_track::switch_template const &Shape, TTrack const *Style, double const Along, int const Direction, int const Side, bool const Snap, std::vector> &States, std::vector &Created, std::vector &Removed); + struct crossover_plan + { + editor_track::straight target; + editor_track::switch_template shape; + double along{0.0}; + int direction{1}; + int side{1}; + segment_data insert; + std::vector paths; + }; + bool plan_crossover(crossover_plan &Plan) const; bool start_extend(); void finish_extend(); std::vector extend_pieces() const; + bool extend_snap(editor_track::snap_target &Target) const; void update_build_tools(); void draw_build_overlay() const; enum class track_tab { straights, route, path, turnout }; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index ab5a29527..05175aa82 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -2448,6 +2448,8 @@ bool editor_mode::start_extend() if (glm::length(planar) < 1e-6) return false; m_extend.active = true; + m_extend.path = i; + m_extend.atend = atend; m_extend.track = track; m_extend.point = position; m_extend.direction = glm::normalize(planar); @@ -2459,10 +2461,53 @@ bool editor_mode::start_extend() return false; } +bool editor_mode::extend_snap(editor_track::snap_target &Target) const +{ + auto const &tool{m_extend}; + if (false == tool.active || tool.track == nullptr) + return false; + Target = editor_track::find_snap_target(*tool.track, tool.mouse, 5.0, {tool.track}); + return Target.track != nullptr && glm::distance(Target.position, tool.point) > 0.5; +} + std::vector editor_mode::extend_pieces() const { std::vector result; auto const &tool{m_extend}; + editor_track::snap_target target; + if (extend_snap(target)) + { + alignment::design design; + design.norms = m_route.design.norms; + design.shape = m_route.design.shape; + design.arc_piece_angle = 90.0; + design.start = tool.point; + design.end = target.position; + design.start_direction = tool.direction; + design.end_direction = glm::normalize(glm::dvec2{target.direction.x, target.direction.z}); + auto const speed{editor_track::velocity(*tool.track)}; + design.speed = speed > 0.0 ? speed : 100.0; + if (false == alignment::collinear(design)) + { + alignment::vertex vertex; + vertex.radius = 100000.0; + auto const recommended{alignment::recommend(design.speed, 1000.0, design.norms)}; + vertex.transition_in = vertex.transition_out = recommended.transition; + glm::dvec2 intersection; + if (alignment::tangent_intersection(design, intersection)) + { + design.vertices.push_back(vertex); + } + else + { + vertex.offset = glm::distance(glm::dvec2{design.start.x, design.start.z}, glm::dvec2{design.end.x, design.end.z}) / 3.0; + design.vertices = {vertex, vertex}; + } + } + auto const shape{alignment::compute(design)}; + if (shape.valid) + return alignment::pieces(shape, design, 0); + } glm::dvec2 const offset{tool.mouse.x - tool.point.x, tool.mouse.z - tool.point.z}; auto const chord{glm::length(offset)}; if (chord < 0.5) @@ -2517,6 +2562,28 @@ std::vector editor_mode::extend_pieces() const void editor_mode::finish_extend() { + crossover_plan plan; + editor_track::snap_target target; + if (false == extend_snap(target) && plan_crossover(plan)) + { + auto *origin{m_extend.track}; + m_extend.active = false; + std::vector> states; + std::vector created; + std::vector removed; + if (false == place_switch_on_straight(plan.target, plan.shape, origin, plan.along, plan.direction, plan.side, false, states, created, removed)) + return; + if (glm::distance(plan.insert.points[segment_data::point::start], plan.insert.points[segment_data::point::end]) > 0.01) + { + auto *insert{editor_track::create_path(*origin, plan.insert)}; + editor_track::commit({insert}); + created.push_back(insert); + } + push_track_snapshot(std::move(states), std::move(created)); + m_history.back().removed = std::move(removed); + straight_refresh(); + return; + } auto const pieces{extend_pieces()}; auto *style{m_extend.track}; m_extend.active = false; @@ -2577,12 +2644,23 @@ void editor_mode::finish_switch_placement() void editor_mode::insert_switch(editor_track::straight const &Line, double const Along, int const Direction, int const Side) { - auto &state{m_straights}; - state.status.clear(); - auto const &shape{m_switch.templates[m_switch.armed]}; - if (shape.length > Line.length - 0.02) + std::vector> states; + std::vector created; + std::vector removed; + if (false == place_switch_on_straight(Line, m_switch.templates[m_switch.armed], nullptr, Along, Direction, Side, true, states, created, removed)) return; + push_track_snapshot(std::move(states), std::move(created)); + m_history.back().removed = std::move(removed); + straight_refresh(); +} + +bool editor_mode::place_switch_on_straight(editor_track::straight const &Line, editor_track::switch_template const &Shape, TTrack const *Style, double const Along, int const Direction, int const Side, bool const Snap, std::vector> &States, std::vector &Created, std::vector &Removed) +{ + auto const &shape{Shape}; + if (shape.length > Line.length - 0.02) + return false; auto from{std::clamp(Direction > 0 ? Along : Along - shape.length, 0.0, Line.length - shape.length)}; + if (Snap) { std::vector joints{0.0, Line.length}; for (std::size_t i = 0; i < Line.tracks.size(); ++i) @@ -2636,12 +2714,12 @@ void editor_mode::insert_switch(editor_track::straight const &Line, double const } } if (first < 0) - return; + return false; editor_track::chain chain; for (int i = first; i <= last; ++i) { if (spans[i].track->eType != tt_Normal) - return; + return false; chain.tracks.push_back(spans[i].track); chain.forward.push_back(spans[i].forward); } @@ -2651,22 +2729,20 @@ void editor_mode::insert_switch(editor_track::straight const &Line, double const bool const hasafter{after > 0.01}; auto const point = [&](double const Distance) { return Line.start + glm::dvec3{Line.direction.x, Line.grade, Line.direction.y} * Distance; }; glm::dvec2 const direction{Line.direction * static_cast(Direction)}; + auto const &style{Style != nullptr ? *Style : *spans[first].track}; if (false == hasbefore && false == hasafter) { for (auto *track : chain.tracks) editor_track::retire(*track); + Removed.insert(Removed.end(), chain.tracks.begin(), chain.tracks.end()); auto const paths{editor_track::place_switch(shape, point(origin), direction, Side, Line.grade * Direction)}; - auto *track{editor_track::create_switch(shape, paths, *spans[first].track)}; - std::vector created; + auto *track{editor_track::create_switch(shape, paths, style)}; if (track != nullptr) { editor_track::commit({track}); - created.push_back(track); + Created.push_back(track); } - push_track_snapshot({}, std::move(created)); - m_history.back().removed = chain.tracks; - straight_refresh(); - return; + return true; } auto const count{std::max(chain.tracks.size(), (hasbefore ? 1 : 0) + (hasafter ? 1 : 0))}; std::size_t countbefore{0}; @@ -2689,20 +2765,18 @@ void editor_mode::insert_switch(editor_track::straight const &Line, double const if (hasafter) straight(to, spans[last].to, count - countbefore); - std::vector> states; for (auto *track : chain.tracks) - states.emplace_back(track, editor_track::capture(*track)); - auto created{editor_track::relay(chain, pieces)}; + States.emplace_back(track, editor_track::capture(*track)); + auto const relaid{editor_track::relay(chain, pieces)}; + Created.insert(Created.end(), relaid.begin(), relaid.end()); auto const paths{editor_track::place_switch(shape, point(origin), direction, Side, Line.grade * Direction)}; - auto *track{editor_track::create_switch(shape, paths, *spans[first].track)}; + auto *track{editor_track::create_switch(shape, paths, style)}; if (track != nullptr) { editor_track::commit({track}); - created.push_back(track); + Created.push_back(track); } - push_track_snapshot(std::move(states), std::move(created)); - straight_refresh(); - state.status = "Switch inserted"; + return true; } void editor_mode::draw_build_overlay() const @@ -2719,8 +2793,29 @@ void editor_mode::draw_build_overlay() const } }; if (m_extend.active) - for (auto const &piece : extend_pieces()) - drawpath(piece, IM_COL32(255, 210, 60, 255)); + { + crossover_plan plan; + editor_track::snap_target target; + if (extend_snap(target)) + { + ImVec2 screen; + if (projection.project(target.position, screen)) + drawlist->AddCircle(screen, 14.0f, IM_COL32(255, 60, 255, 255), 20, 3.0f); + for (auto const &piece : extend_pieces()) + drawpath(piece, IM_COL32(255, 210, 60, 255)); + } + else if (plan_crossover(plan)) + { + for (auto const &piece : plan.paths) + drawpath(piece, IM_COL32(255, 210, 60, 255)); + drawpath(plan.insert, IM_COL32(60, 230, 90, 255)); + } + else + { + for (auto const &piece : extend_pieces()) + drawpath(piece, IM_COL32(255, 210, 60, 255)); + } + } if (m_switch.placing) for (auto const &piece : switch_preview()) drawpath(piece, IM_COL32(255, 210, 60, 255)); @@ -2992,3 +3087,102 @@ void editor_mode::update_curve_fit(glm::dvec3 const &Start, glm::dvec3 const &En design.vertices = {before, after}; route_update(); } + +bool editor_mode::plan_crossover(crossover_plan &Plan) const +{ + auto const &tool{m_extend}; + if (false == tool.active || tool.track == nullptr || tool.track->eType != tt_Switch || tool.track->m_paths.size() < 2 || tool.path != 1 || false == tool.atend) + return false; + auto const &own{*tool.track}; + auto const &main{own.m_paths[0]}; + auto const &diverging{own.m_paths[1]}; + auto const plan = [](glm::dvec3 const &Point) { return glm::dvec2{Point.x, Point.z}; }; + auto const cross = [](glm::dvec2 const &A, glm::dvec2 const &B) { return A.x * B.y - A.y * B.x; }; + auto const origin{main.points[segment_data::point::start]}; + auto const axis{glm::normalize(plan(main.points[segment_data::point::end] - origin))}; + glm::dvec2 const perpendicular{-axis.y, axis.x}; + auto const &frog{diverging.points[segment_data::point::end]}; + auto const lateral{glm::dot(plan(frog - origin), perpendicular)}; + if (std::abs(lateral) < 0.01) + return false; + auto const side{lateral > 0.0 ? 1.0 : -1.0}; + auto const normal{perpendicular * side}; + auto const offset{std::abs(lateral)}; + auto const &control{diverging.points[segment_data::point::control2]}; + auto const tangent{glm::normalize(control != glm::dvec3{} ? -plan(control) : plan(frog - origin))}; + auto const angle{std::atan2(std::abs(cross(axis, tangent)), glm::dot(axis, tangent))}; + if (angle < 1e-4) + return false; + + auto const ground{tool.mouse}; + TTrack *target{nullptr}; + double best{8.0}; + auto const sections{simulation::Region->sections(ground, 40.f)}; + for (auto *section : sections) + { + for (auto const &cell : section->m_cells) + { + for (auto *track : cell.m_paths) + { + if (track == &own || track->eType != tt_Normal || track->m_editorremoved || false == editor_track::is_straight(*track, m_straights.tolerance)) + continue; + auto const &path{track->m_paths.front()}; + auto const a{plan(path.points[segment_data::point::start])}; + auto const b{plan(path.points[segment_data::point::end])}; + auto const segment{b - a}; + auto const t{std::clamp(glm::dot(plan(ground) - a, segment) / std::max(1e-9, glm::dot(segment, segment)), 0.0, 1.0)}; + auto const distance{glm::distance(plan(ground), a + segment * t)}; + if (distance < best) + { + best = distance; + target = track; + } + } + } + } + if (target == nullptr) + return false; + Plan.target = editor_track::find_straight(*target, m_straights.tolerance); + auto const &line{Plan.target}; + if (line.tracks.empty() || std::abs(cross(line.direction, axis)) > std::sin(glm::radians(1.0))) + return false; + auto const distance{glm::dot(plan(line.start) - plan(origin), normal)}; + auto const remaining{distance - 2.0 * offset}; + if (remaining < 0.01) + return false; + auto const length{remaining / std::sin(angle)}; + glm::dvec2 const crossing{axis * std::cos(angle) + normal * std::sin(angle)}; + auto const alongfrog{glm::dot(plan(frog - origin), axis)}; + auto const otherfrog{plan(frog) + crossing * length}; + auto const otherorigin{otherfrog + axis * alongfrog + normal * offset}; + Plan.along = glm::dot(otherorigin - plan(line.start), line.direction); + if (Plan.along < 0.0 || Plan.along > line.length) + return false; + Plan.direction = glm::dot(-axis, line.direction) > 0.0 ? 1 : -1; + glm::dvec2 const direction{line.direction * static_cast(Plan.direction)}; + Plan.side = glm::dot(glm::dvec2{-direction.y, direction.x}, -normal) > 0.0 ? 1 : -1; + + editor_track::switch_template shape; + shape.source = tool.track; + shape.length = glm::dot(plan(main.points[segment_data::point::end] - origin), axis); + for (int i = 0; i < 2; ++i) + { + auto const &path{own.m_paths[i]}; + auto &local{shape.local[i]}; + local = path; + auto const tolocal = [&](glm::dvec3 const &Vector) { return glm::dvec3{glm::dot(plan(Vector), perpendicular) * side, Vector.y, glm::dot(plan(Vector), axis)}; }; + local.points[segment_data::point::start] = tolocal(path.points[segment_data::point::start] - origin); + local.points[segment_data::point::end] = tolocal(path.points[segment_data::point::end] - origin); + local.points[segment_data::point::control1] = tolocal(path.points[segment_data::point::control1]); + local.points[segment_data::point::control2] = tolocal(path.points[segment_data::point::control2]); + if (side < 0.0) + local.rolls = {-local.rolls[0], -local.rolls[1]}; + } + Plan.shape = shape; + auto const station{line.start + glm::dvec3{line.direction.x, line.grade, line.direction.y} * Plan.along}; + Plan.paths = editor_track::place_switch(shape, station, direction, Plan.side, line.grade * Plan.direction); + Plan.insert = segment_data{}; + Plan.insert.points[segment_data::point::start] = frog; + Plan.insert.points[segment_data::point::end] = Plan.paths[1].points[segment_data::point::end]; + return true; +} diff --git a/editor/editorAlignment.cpp b/editor/editorAlignment.cpp index 5f41b0b7c..703683cef 100644 --- a/editor/editorAlignment.cpp +++ b/editor/editorAlignment.cpp @@ -217,21 +217,21 @@ glm::dvec2 blossom(std::array const &Points, double const A, doub return glm::mix(s[0], s[1], C); } -std::size_t element_pieces(element const &Element, transition_shape const Shape, int const Transitions) +std::size_t element_pieces(element const &Element, transition_shape const Shape, int const Transitions, double const Arcangle) { if (Element.length < 1e-3) return 0; switch (Element.kind) { case element_kind::arc: - return static_cast(std::max(1.0, std::ceil(Element.length / Element.radius / (10.0 * kPi / 180.0) - 1e-9))); + return static_cast(std::max(1.0, std::ceil(Element.length / Element.radius / (Arcangle * kPi / 180.0) - 1e-9))); case element_kind::transition_in: case element_kind::transition_out: return std::max(std::max(1, Transitions), Shape == transition_shape::cubic_parabola ? 1 : static_cast(std::max(1.0, std::ceil(Element.length / 20.0 - 1e-9)))); case element_kind::spiral: { auto const turn{(Element.curvature_start + Element.curvature_end) * 0.5 * Element.length}; - auto const count{static_cast(std::max({1.0, std::ceil(turn / (10.0 * kPi / 180.0) - 1e-9), std::ceil(Element.length / 20.0 - 1e-9)}))}; + auto const count{static_cast(std::max({1.0, std::ceil(turn / (Arcangle * kPi / 180.0) - 1e-9), std::ceil(Element.length / 20.0 - 1e-9)}))}; return Element.curvature_start != Element.curvature_end ? std::max(count, std::max(1, Transitions)) : count; } default: @@ -855,7 +855,7 @@ std::size_t minimum_pieces(result const &Result, design const &Design) { std::size_t count{0}; for (auto const &e : Result.elements) - count += element_pieces(e, Design.shape, Design.transition_pieces); + count += element_pieces(e, Design.shape, Design.transition_pieces, Design.arc_piece_angle); return count; } @@ -876,7 +876,7 @@ std::vector pieces(result const &Result, design const &Design, std for (std::size_t i = 0; i < Result.elements.size(); ++i) { auto const &e{Result.elements[i]}; - auto const count{element_pieces(e, Design.shape, Design.transition_pieces)}; + auto const count{element_pieces(e, Design.shape, Design.transition_pieces, Design.arc_piece_angle)}; for (std::size_t j = 0; j < count; ++j) spans.push_back({i, e.length * j / count, e.length * (j + 1) / count}); } diff --git a/editor/editorAlignment.hpp b/editor/editorAlignment.hpp index 139841809..f86281704 100644 --- a/editor/editorAlignment.hpp +++ b/editor/editorAlignment.hpp @@ -69,6 +69,7 @@ struct design transition_shape shape{transition_shape::cubic_parabola}; double speed{100.0}; int transition_pieces{1}; + double arc_piece_angle{10.0}; limits norms; }; From 55fd0c74bd99ac251f6377338e485c43b0442f67 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 3 Oct 2026 01:23:47 +0200 Subject: [PATCH 067/430] feat(editor): insert double slip at crossing --- application/editormode.h | 2 + application/editormodetrack.cpp | 263 ++++++++++++++++++++++++++------ editor/editorTrack.cpp | 15 +- editor/editorTrack.hpp | 5 +- 4 files changed, 235 insertions(+), 50 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index d64fe1fea..ae11cbcd1 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -436,6 +436,8 @@ class editor_mode : public application_mode std::vector paths; }; bool plan_crossover(crossover_plan &Plan) const; + bool cut_straight(editor_track::straight const &Line, double const From, double const To, std::vector> &States, std::vector &Created, std::vector &Removed, TTrack **Style); + bool insert_double_slip(editor_track::straight const &Line, glm::dvec3 const &Point, editor_track::switch_template const &Shape); bool start_extend(); void finish_extend(); std::vector extend_pieces() const; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 05175aa82..7373b3c48 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -2621,6 +2621,11 @@ bool editor_mode::start_switch_placement() if (line.tracks.empty()) return false; glm::dvec3 const ground{Global.pCamera.Pos + GfxRenderer->Mouse_Position()}; + if (tool.templates[tool.armed].double_slip) + { + insert_double_slip(line, ground, tool.templates[tool.armed]); + return true; + } tool.along = std::clamp(glm::dot(glm::dvec2{ground.x - line.start.x, ground.z - line.start.z}, line.direction), 0.0, line.length); tool.point = line.start + glm::dvec3{line.direction.x, line.grade, line.direction.y} * tool.along; tool.mouse = ground; @@ -2654,38 +2659,10 @@ void editor_mode::insert_switch(editor_track::straight const &Line, double const straight_refresh(); } -bool editor_mode::place_switch_on_straight(editor_track::straight const &Line, editor_track::switch_template const &Shape, TTrack const *Style, double const Along, int const Direction, int const Side, bool const Snap, std::vector> &States, std::vector &Created, std::vector &Removed) +bool editor_mode::cut_straight(editor_track::straight const &Line, double const From, double const To, std::vector> &States, std::vector &Created, std::vector &Removed, TTrack **Style) { - auto const &shape{Shape}; - if (shape.length > Line.length - 0.02) - return false; - auto from{std::clamp(Direction > 0 ? Along : Along - shape.length, 0.0, Line.length - shape.length)}; - if (Snap) - { - std::vector joints{0.0, Line.length}; - for (std::size_t i = 0; i < Line.tracks.size(); ++i) - { - auto const &path{Line.tracks[i]->m_paths[Line.paths[i]]}; - for (auto const index : {segment_data::point::start, segment_data::point::end}) - joints.push_back(glm::dot(glm::dvec2{path.points[index].x - Line.start.x, path.points[index].z - Line.start.z}, Line.direction)); - } - auto const nearest = [&](double const Value) { - double best{Value}; - for (auto const joint : joints) - if (std::abs(joint - Value) < std::abs(best - Value) || best == Value) - best = std::abs(joint - Value) < 1.0 ? joint : best; - return best; - }; - auto const snappedstart{nearest(from)}; - auto const snappedend{nearest(from + shape.length)}; - if (snappedstart != from) - from = snappedstart; - else if (snappedend != from + shape.length) - from = snappedend - shape.length; - from = std::clamp(from, 0.0, Line.length - shape.length); - } - auto const to{from + shape.length}; - auto const origin{Direction > 0 ? from : to}; + auto const from{From}; + auto const to{To}; struct span { TTrack *track; @@ -2723,25 +2700,18 @@ bool editor_mode::place_switch_on_straight(editor_track::straight const &Line, e chain.tracks.push_back(spans[i].track); chain.forward.push_back(spans[i].forward); } + if (Style != nullptr) + *Style = spans[first].track; auto const before{std::max(0.0, from - spans[first].from)}; auto const after{std::max(0.0, spans[last].to - to)}; bool const hasbefore{before > 0.01}; bool const hasafter{after > 0.01}; auto const point = [&](double const Distance) { return Line.start + glm::dvec3{Line.direction.x, Line.grade, Line.direction.y} * Distance; }; - glm::dvec2 const direction{Line.direction * static_cast(Direction)}; - auto const &style{Style != nullptr ? *Style : *spans[first].track}; if (false == hasbefore && false == hasafter) { for (auto *track : chain.tracks) editor_track::retire(*track); Removed.insert(Removed.end(), chain.tracks.begin(), chain.tracks.end()); - auto const paths{editor_track::place_switch(shape, point(origin), direction, Side, Line.grade * Direction)}; - auto *track{editor_track::create_switch(shape, paths, style)}; - if (track != nullptr) - { - editor_track::commit({track}); - Created.push_back(track); - } return true; } auto const count{std::max(chain.tracks.size(), (hasbefore ? 1 : 0) + (hasafter ? 1 : 0))}; @@ -2751,12 +2721,12 @@ bool editor_mode::place_switch_on_straight(editor_track::straight const &Line, e else if (hasbefore) countbefore = count; std::vector pieces; - auto const straight = [&](double const From, double const To, std::size_t const Count) { + auto const straight = [&](double const Start, double const End, std::size_t const Count) { for (std::size_t i = 0; i < Count; ++i) { segment_data path; - path.points[segment_data::point::start] = point(From + (To - From) * i / Count); - path.points[segment_data::point::end] = point(From + (To - From) * (i + 1) / Count); + path.points[segment_data::point::start] = point(Start + (End - Start) * i / Count); + path.points[segment_data::point::end] = point(Start + (End - Start) * (i + 1) / Count); pieces.push_back(path); } }; @@ -2764,13 +2734,52 @@ bool editor_mode::place_switch_on_straight(editor_track::straight const &Line, e straight(spans[first].from, from, countbefore); if (hasafter) straight(to, spans[last].to, count - countbefore); - for (auto *track : chain.tracks) States.emplace_back(track, editor_track::capture(*track)); auto const relaid{editor_track::relay(chain, pieces)}; Created.insert(Created.end(), relaid.begin(), relaid.end()); + return true; +} + +bool editor_mode::place_switch_on_straight(editor_track::straight const &Line, editor_track::switch_template const &Shape, TTrack const *Style, double const Along, int const Direction, int const Side, bool const Snap, std::vector> &States, std::vector &Created, std::vector &Removed) +{ + auto const &shape{Shape}; + if (shape.length > Line.length - 0.02) + return false; + auto from{std::clamp(Direction > 0 ? Along : Along - shape.length, 0.0, Line.length - shape.length)}; + if (Snap) + { + std::vector joints{0.0, Line.length}; + for (std::size_t i = 0; i < Line.tracks.size(); ++i) + { + auto const &path{Line.tracks[i]->m_paths[Line.paths[i]]}; + for (auto const index : {segment_data::point::start, segment_data::point::end}) + joints.push_back(glm::dot(glm::dvec2{path.points[index].x - Line.start.x, path.points[index].z - Line.start.z}, Line.direction)); + } + auto const nearest = [&](double const Value) { + double best{Value}; + for (auto const joint : joints) + if (std::abs(joint - Value) < std::abs(best - Value) || best == Value) + best = std::abs(joint - Value) < 1.0 ? joint : best; + return best; + }; + auto const snappedstart{nearest(from)}; + auto const snappedend{nearest(from + shape.length)}; + if (snappedstart != from) + from = snappedstart; + else if (snappedend != from + shape.length) + from = snappedend - shape.length; + from = std::clamp(from, 0.0, Line.length - shape.length); + } + auto const to{from + shape.length}; + auto const origin{Direction > 0 ? from : to}; + TTrack *first{nullptr}; + if (false == cut_straight(Line, from, to, States, Created, Removed, &first)) + return false; + auto const point = [&](double const Distance) { return Line.start + glm::dvec3{Line.direction.x, Line.grade, Line.direction.y} * Distance; }; + glm::dvec2 const direction{Line.direction * static_cast(Direction)}; auto const paths{editor_track::place_switch(shape, point(origin), direction, Side, Line.grade * Direction)}; - auto *track{editor_track::create_switch(shape, paths, style)}; + auto *track{editor_track::create_switch(shape, paths, Style != nullptr ? *Style : *first)}; if (track != nullptr) { editor_track::commit({track}); @@ -3186,3 +3195,167 @@ bool editor_mode::plan_crossover(crossover_plan &Plan) const Plan.insert.points[segment_data::point::end] = Plan.paths[1].points[segment_data::point::end]; return true; } + +bool editor_mode::insert_double_slip(editor_track::straight const &Line, glm::dvec3 const &Point, editor_track::switch_template const &Shape) +{ + auto const plan = [](glm::dvec3 const &Vector) { return glm::dvec2{Vector.x, Vector.z}; }; + auto const cross = [](glm::dvec2 const &A, glm::dvec2 const &B) { return A.x * B.y - A.y * B.x; }; + TTrack *other{nullptr}; + glm::dvec2 crossing{0.0}; + double best{40.0}; + auto const sections{simulation::Region->sections(Point, 60.f)}; + for (auto *section : sections) + { + for (auto const &cell : section->m_cells) + { + for (auto *track : cell.m_paths) + { + if (std::find(Line.tracks.begin(), Line.tracks.end(), track) != Line.tracks.end() || track->eType != tt_Normal || track->m_editorremoved || false == editor_track::is_straight(*track, m_straights.tolerance)) + continue; + auto const &path{track->m_paths.front()}; + auto const a{plan(path.points[segment_data::point::start])}; + auto const b{plan(path.points[segment_data::point::end])}; + auto const segment{b - a}; + auto const determinant{cross(Line.direction, segment)}; + if (std::abs(determinant) < 1e-9) + continue; + auto const offset{a - plan(Line.start)}; + auto const along{cross(offset, segment) / determinant}; + auto const fraction{cross(offset, Line.direction) / determinant}; + if (fraction < -0.01 || fraction > 1.01 || along < 0.0 || along > Line.length) + continue; + auto const position{plan(Line.start) + Line.direction * along}; + auto const distance{glm::distance(position, plan(Point))}; + if (distance < best) + { + best = distance; + other = track; + crossing = position; + } + } + } + } + if (other == nullptr) + return false; + auto const second{editor_track::find_straight(*other, m_straights.tolerance)}; + if (second.tracks.empty()) + return false; + auto const first{Line.direction}; + auto direction{second.direction}; + if (glm::dot(first, direction) < 0.0) + direction = -direction; + auto const angle{std::atan2(std::abs(cross(first, direction)), glm::dot(first, direction))}; + if (angle < glm::radians(0.5) || angle > glm::radians(30.0)) + return false; + auto const radius{Shape.radius}; + auto const half{radius * std::tan(angle * 0.5)}; + auto const alongfirst{glm::dot(crossing - plan(Line.start), Line.direction)}; + auto const alongsecond{glm::dot(crossing - plan(second.start), second.direction)}; + if (alongfirst - half < 0.0 || alongfirst + half > Line.length || alongsecond - half < 0.0 || alongsecond + half > second.length) + return false; + + auto const heightfirst = [&](double const Along) { return Line.start.y + Line.grade * Along; }; + auto const heightsecond = [&](double const Along) { return second.start.y + second.grade * Along; }; + auto const centreheight{heightfirst(alongfirst)}; + auto const sign{glm::dot(second.direction, direction) > 0.0 ? 1.0 : -1.0}; + auto const at = [&](glm::dvec2 const &Planar, double const Height) { return glm::dvec3{Planar.x, Height, Planar.y}; }; + auto const pointA{at(crossing - first * half, heightfirst(alongfirst - half))}; + auto const pointB{at(crossing + first * half, heightfirst(alongfirst + half))}; + auto const pointC{at(crossing - direction * half, heightsecond(alongsecond - sign * half))}; + auto const pointD{at(crossing + direction * half, heightsecond(alongsecond + sign * half))}; + + std::vector> states; + std::vector created; + std::vector removed; + TTrack *style{nullptr}; + if (false == cut_straight(Line, alongfirst - half, alongfirst + half, states, created, removed, &style)) + return false; + auto const secondline{editor_track::find_straight(*other, m_straights.tolerance)}; + auto const secondalong{glm::dot(crossing - plan(secondline.start), secondline.direction)}; + if (secondline.tracks.empty() || false == cut_straight(secondline, secondalong - half, secondalong + half, states, created, removed, nullptr)) + { + for (auto *track : created) + editor_track::retire(*track); + for (auto const &entry : states) + { + editor_track::apply(*entry.first, entry.second); + editor_track::commit({entry.first}); + } + for (auto *track : removed) + { + track->m_editorremoved = false; + editor_track::commit({track}); + } + return false; + } + + auto const straight = [&](glm::dvec3 const &Start, glm::dvec3 const &End) { + segment_data path; + path.points[segment_data::point::start] = Start; + path.points[segment_data::point::end] = End; + return path; + }; + double const gap{0.25}; + auto const side{cross(first, direction) > 0.0 ? 1.0 : -1.0}; + auto const turn = [](glm::dvec2 const &Vector, double const Angle) { + auto const c{std::cos(Angle)}; + auto const s{std::sin(Angle)}; + return glm::dvec2{Vector.x * c - Vector.y * s, Vector.x * s + Vector.y * c}; + }; + auto const arc = [&](glm::dvec3 const &Start, glm::dvec2 const &Heading, double const Turn, glm::dvec3 const &Finish, double const From, double const To) { + glm::dvec2 const centre{plan(Start) + glm::dvec2{-Heading.y, Heading.x} * (Turn * radius)}; + auto const radial{plan(Start) - centre}; + auto const p0{centre + turn(radial, Turn * From)}; + auto const p3{centre + turn(radial, Turn * To)}; + auto const d0{turn(Heading, Turn * From)}; + auto const d3{turn(Heading, Turn * To)}; + auto const handle{4.0 / 3.0 * std::tan((To - From) / 4.0) * radius}; + auto const y0{Start.y + (Finish.y - Start.y) * From / angle}; + auto const y3{Start.y + (Finish.y - Start.y) * To / angle}; + segment_data path; + path.points[segment_data::point::start] = {p0.x, y0, p0.y}; + path.points[segment_data::point::end] = {p3.x, y3, p3.y}; + path.points[segment_data::point::control1] = {d0.x * handle, 0.0, d0.y * handle}; + path.points[segment_data::point::control2] = {-d3.x * handle, 0.0, -d3.y * handle}; + path.radius = static_cast(radius); + return path; + }; + auto const reversed = [](segment_data const &Path) { + segment_data result{Path}; + result.points[segment_data::point::start] = Path.points[segment_data::point::end]; + result.points[segment_data::point::end] = Path.points[segment_data::point::start]; + result.points[segment_data::point::control1] = Path.points[segment_data::point::control2]; + result.points[segment_data::point::control2] = Path.points[segment_data::point::control1]; + result.rolls = {-Path.rolls[1], -Path.rolls[0]}; + return result; + }; + auto const middle{angle * 0.5}; + auto const split{gap / radius}; + auto const centreA{at(crossing - first * gap, centreheight)}; + auto const centreB{at(crossing + first * gap, centreheight)}; + auto const centreC{at(crossing - direction * gap, centreheight)}; + auto const centreD{at(crossing + direction * gap, centreheight)}; + + std::string base; + for (int i = 1; base.empty() || simulation::Paths.find(base + "_a") != nullptr; ++i) + base = "editor_dks" + std::to_string(i); + editor_track::switch_template shape; + shape.length = half; + auto *slipstyle{style != nullptr ? style : Line.tracks.front()}; + std::vector parts; + parts.push_back(editor_track::create_switch(shape, {straight(pointA, centreA), arc(pointA, first, side, pointD, 0.0, middle - split)}, *slipstyle, base + "_a")); + parts.push_back(editor_track::create_switch(shape, {straight(pointB, centreB), reversed(arc(pointC, direction, -side, pointB, middle + split, angle))}, *slipstyle, base + "_b")); + parts.push_back(editor_track::create_switch(shape, {straight(pointC, centreC), arc(pointC, direction, -side, pointB, 0.0, middle - split)}, *slipstyle, base + "_c")); + parts.push_back(editor_track::create_switch(shape, {straight(pointD, centreD), reversed(arc(pointA, first, side, pointD, middle + split, angle))}, *slipstyle, base + "_d")); + parts.push_back(editor_track::create_path(*slipstyle, straight(centreA, centreB))); + parts.push_back(editor_track::create_path(*slipstyle, straight(centreC, centreD))); + parts.push_back(editor_track::create_path(*slipstyle, arc(pointA, first, side, pointD, middle - split, middle + split))); + parts.push_back(editor_track::create_path(*slipstyle, arc(pointC, direction, -side, pointB, middle - split, middle + split))); + parts.erase(std::remove(parts.begin(), parts.end(), nullptr), parts.end()); + editor_track::commit(parts); + created.insert(created.end(), parts.begin(), parts.end()); + push_track_snapshot(std::move(states), std::move(created)); + m_history.back().removed = std::move(removed); + straight_refresh(); + return true; +} diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index 0a86e6067..268e040bb 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -1287,6 +1287,14 @@ std::vector editor_track::standard_switch_templat {"Rz 1:26,5 R2500", 2500.0, 26.5, 0.0, 0.0}, }; std::vector result; + { + switch_template slip; + slip.double_slip = true; + slip.radius = 190.0; + slip.ratio = 9.0; + slip.label = "Rkpd 1:9 R190 double slip (click at a crossing of two straights)"; + result.push_back(slip); + } for (auto const &definition : definitions) { auto const angle{std::atan(1.0 / definition.ratio)}; @@ -1313,7 +1321,7 @@ std::vector editor_track::standard_switch_templat return result; } -TTrack *editor_track::create_switch(switch_template const &Template, std::vector const &Paths, TTrack const &Style) +TTrack *editor_track::create_switch(switch_template const &Template, std::vector const &Paths, TTrack const &Style, std::string const &Name) { if (Paths.size() < 2) return nullptr; @@ -1349,7 +1357,7 @@ TTrack *editor_track::create_switch(switch_template const &Template, std::vector if ((Style.iCategoryFlag & 15) == 1 && false == Style.m_profile1.first.empty()) text << "railprofile " << Style.m_profile1.first << ' '; text << "endtrack\n"; - track = load_path(text.str(), Style); + track = load_path(text.str(), Style, Name); } track->m_paths.assign(Paths.begin(), Paths.begin() + 2); return track; @@ -1700,12 +1708,13 @@ TTrack *editor_track::split_path(TTrack &Track, double const T) return created; } -TTrack *editor_track::load_path(std::string const &Text, TTrack const &Template) +TTrack *editor_track::load_path(std::string const &Text, TTrack const &Template, std::string const &Name) { cParser parser(Text, cParser::buffer_TEXT); scene::node_data data; data.type = "track"; auto const base{Template.name().empty() || Template.name() == "none" ? std::string{"editor_track"} : Template.name()}; + data.name = Name; for (int i = 1; data.name.empty() || simulation::Paths.find(data.name) != nullptr; ++i) data.name = base + "_" + std::to_string(i); auto *track = new TTrack(data); diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index 17f3b1159..450352127 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -148,15 +148,16 @@ class editor_track std::string label; double a{0.0}; double b{0.0}; + bool double_slip{false}; }; static std::vector standard_switch_templates(); static std::vector find_switch_templates(); - static TTrack *load_path(std::string const &Text, TTrack const &Template); + static TTrack *load_path(std::string const &Text, TTrack const &Template, std::string const &Name = {}); static TTrack *create_path(TTrack const &Style, segment_data const &Path); static TTrack *split_path(TTrack &Track, double const T); static double nearest_parameter(TTrack const &Track, glm::dvec3 const &Point); static std::vector place_switch(switch_template const &Template, glm::dvec3 const &Origin, glm::dvec2 const &Direction, int const Side, double const Grade); - static TTrack *create_switch(switch_template const &Template, std::vector const &Paths, TTrack const &Style); + static TTrack *create_switch(switch_template const &Template, std::vector const &Paths, TTrack const &Style, std::string const &Name = {}); static void move_straights(std::vector const &Lines, std::vector> const &Ends); static std::vector relay(chain const &Chain, std::vector const &Pieces); static void retire(TTrack &Track); From 4d060f166e57418a8fa5bb2a983c655996ec3565 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 3 Oct 2026 01:32:56 +0200 Subject: [PATCH 068/430] feat(editor): add R300 double slip --- editor/editorTrack.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index 268e040bb..9b8981bc9 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -1287,12 +1287,13 @@ std::vector editor_track::standard_switch_templat {"Rz 1:26,5 R2500", 2500.0, 26.5, 0.0, 0.0}, }; std::vector result; + for (auto const radius : {190.0, 300.0}) { switch_template slip; slip.double_slip = true; - slip.radius = 190.0; + slip.radius = radius; slip.ratio = 9.0; - slip.label = "Rkpd 1:9 R190 double slip (click at a crossing of two straights)"; + slip.label = "Rkpd 1:9 R" + std::to_string(static_cast(radius)) + " double slip (click at a crossing of two straights)"; result.push_back(slip); } for (auto const &definition : definitions) From 7825b92190fd015a259206d272c4e575aa683c0e Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 3 Oct 2026 01:38:40 +0200 Subject: [PATCH 069/430] feat(editor): add R500 double slip --- editor/editorTrack.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index 9b8981bc9..739e7d2fb 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -1287,13 +1287,12 @@ std::vector editor_track::standard_switch_templat {"Rz 1:26,5 R2500", 2500.0, 26.5, 0.0, 0.0}, }; std::vector result; - for (auto const radius : {190.0, 300.0}) + for (auto const &definition : {std::pair{190.0, "1:9"}, {300.0, "1:9"}, {500.0, "1:12"}}) { switch_template slip; slip.double_slip = true; - slip.radius = radius; - slip.ratio = 9.0; - slip.label = "Rkpd 1:9 R" + std::to_string(static_cast(radius)) + " double slip (click at a crossing of two straights)"; + slip.radius = definition.first; + slip.label = std::string{"Rkpd "} + definition.second + " R" + std::to_string(static_cast(definition.first)) + " double slip (click at a crossing of two straights)"; result.push_back(slip); } for (auto const &definition : definitions) From 5fba2a4a68a9da93cd589a8278b7ffb22f35b94d Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 3 Oct 2026 01:44:22 +0200 Subject: [PATCH 070/430] feat(editor): double slip auto-fits radius, click to replace --- application/editormode.h | 2 + application/editormodetrack.cpp | 313 +++++++++++++++++++++++++------- 2 files changed, 245 insertions(+), 70 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index ae11cbcd1..427c1c4d9 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -438,6 +438,8 @@ class editor_mode : public application_mode bool plan_crossover(crossover_plan &Plan) const; bool cut_straight(editor_track::straight const &Line, double const From, double const To, std::vector> &States, std::vector &Created, std::vector &Removed, TTrack **Style); bool insert_double_slip(editor_track::straight const &Line, glm::dvec3 const &Point, editor_track::switch_template const &Shape); + bool replace_double_slip(TTrack &Part, editor_track::switch_template const &Shape); + std::vector build_double_slip(glm::dvec3 const &PointA, glm::dvec3 const &PointB, glm::dvec3 const &PointC, glm::dvec3 const &PointD, glm::dvec2 const &Crossing, double const Height, glm::dvec2 const &First, glm::dvec2 const &Second, double const Angle, double const Radius, TTrack &Style); bool start_extend(); void finish_extend(); std::vector extend_pieces() const; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 7373b3c48..a2d9ed25b 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -3196,10 +3196,89 @@ bool editor_mode::plan_crossover(crossover_plan &Plan) const return true; } -bool editor_mode::insert_double_slip(editor_track::straight const &Line, glm::dvec3 const &Point, editor_track::switch_template const &Shape) +std::vector editor_mode::build_double_slip(glm::dvec3 const &PointA, glm::dvec3 const &PointB, glm::dvec3 const &PointC, glm::dvec3 const &PointD, glm::dvec2 const &Crossing, double const Height, glm::dvec2 const &First, glm::dvec2 const &Second, double const Angle, double const Radius, TTrack &Style) { auto const plan = [](glm::dvec3 const &Vector) { return glm::dvec2{Vector.x, Vector.z}; }; auto const cross = [](glm::dvec2 const &A, glm::dvec2 const &B) { return A.x * B.y - A.y * B.x; }; + auto const at = [](glm::dvec2 const &Planar, double const Y) { return glm::dvec3{Planar.x, Y, Planar.y}; }; + auto const straight = [](glm::dvec3 const &Start, glm::dvec3 const &End) { + segment_data path; + path.points[segment_data::point::start] = Start; + path.points[segment_data::point::end] = End; + return path; + }; + double const gap{0.25}; + auto const side{cross(First, Second) > 0.0 ? 1.0 : -1.0}; + auto const turn = [](glm::dvec2 const &Vector, double const Rotation) { + auto const c{std::cos(Rotation)}; + auto const s{std::sin(Rotation)}; + return glm::dvec2{Vector.x * c - Vector.y * s, Vector.x * s + Vector.y * c}; + }; + auto const arc = [&](glm::dvec3 const &Start, glm::dvec2 const &Heading, double const Turn, glm::dvec3 const &Finish, double const From, double const To) { + glm::dvec2 const centre{plan(Start) + glm::dvec2{-Heading.y, Heading.x} * (Turn * Radius)}; + auto const radial{plan(Start) - centre}; + auto const p0{centre + turn(radial, Turn * From)}; + auto const p3{centre + turn(radial, Turn * To)}; + auto const d0{turn(Heading, Turn * From)}; + auto const d3{turn(Heading, Turn * To)}; + auto const handle{4.0 / 3.0 * std::tan((To - From) / 4.0) * Radius}; + auto const y0{Start.y + (Finish.y - Start.y) * From / Angle}; + auto const y3{Start.y + (Finish.y - Start.y) * To / Angle}; + segment_data path; + path.points[segment_data::point::start] = {p0.x, y0, p0.y}; + path.points[segment_data::point::end] = {p3.x, y3, p3.y}; + path.points[segment_data::point::control1] = {d0.x * handle, 0.0, d0.y * handle}; + path.points[segment_data::point::control2] = {-d3.x * handle, 0.0, -d3.y * handle}; + path.radius = static_cast(Radius); + return path; + }; + auto const reversed = [](segment_data const &Path) { + segment_data result{Path}; + result.points[segment_data::point::start] = Path.points[segment_data::point::end]; + result.points[segment_data::point::end] = Path.points[segment_data::point::start]; + result.points[segment_data::point::control1] = Path.points[segment_data::point::control2]; + result.points[segment_data::point::control2] = Path.points[segment_data::point::control1]; + result.rolls = {-Path.rolls[1], -Path.rolls[0]}; + return result; + }; + auto const middle{Angle * 0.5}; + auto const split{gap / Radius}; + auto const centreA{at(Crossing - First * gap, Height)}; + auto const centreB{at(Crossing + First * gap, Height)}; + auto const centreC{at(Crossing - Second * gap, Height)}; + auto const centreD{at(Crossing + Second * gap, Height)}; + std::string base; + for (int i = 1; base.empty() || simulation::Paths.find(base + "_a") != nullptr; ++i) + base = "editor_dks" + std::to_string(i); + editor_track::switch_template shape; + shape.length = glm::distance(plan(PointA), Crossing); + std::vector parts; + parts.push_back(editor_track::create_switch(shape, {straight(PointA, centreA), arc(PointA, First, side, PointD, 0.0, middle - split)}, Style, base + "_a")); + parts.push_back(editor_track::create_switch(shape, {straight(PointB, centreB), reversed(arc(PointC, Second, -side, PointB, middle + split, Angle))}, Style, base + "_b")); + parts.push_back(editor_track::create_switch(shape, {straight(PointC, centreC), arc(PointC, Second, -side, PointB, 0.0, middle - split)}, Style, base + "_c")); + parts.push_back(editor_track::create_switch(shape, {straight(PointD, centreD), reversed(arc(PointA, First, side, PointD, middle + split, Angle))}, Style, base + "_d")); + parts.push_back(editor_track::create_path(Style, straight(centreA, centreB))); + parts.push_back(editor_track::create_path(Style, straight(centreC, centreD))); + parts.push_back(editor_track::create_path(Style, arc(PointA, First, side, PointD, middle - split, middle + split))); + parts.push_back(editor_track::create_path(Style, arc(PointC, Second, -side, PointB, middle - split, middle + split))); + parts.erase(std::remove(parts.begin(), parts.end(), nullptr), parts.end()); + return parts; +} + +bool editor_mode::insert_double_slip(editor_track::straight const &Line, glm::dvec3 const &Point, editor_track::switch_template const &Shape) +{ + auto &state{m_straights}; + state.status.clear(); + auto const plan = [](glm::dvec3 const &Vector) { return glm::dvec2{Vector.x, Vector.z}; }; + auto const cross = [](glm::dvec2 const &A, glm::dvec2 const &B) { return A.x * B.y - A.y * B.x; }; + { + auto const sections{simulation::Region->sections(Point, 40.f)}; + for (auto *section : sections) + for (auto const &cell : section->m_cells) + for (auto *track : cell.m_paths) + if (track->eType == tt_Switch && false == track->m_editorremoved && track->DoubleSlip() && glm::distance(plan(track->location()), plan(Point)) < 25.0) + return replace_double_slip(*track, Shape); + } TTrack *other{nullptr}; glm::dvec2 crossing{0.0}; double best{40.0}; @@ -3236,7 +3315,10 @@ bool editor_mode::insert_double_slip(editor_track::straight const &Line, glm::dv } } if (other == nullptr) + { + state.status = "No straight crossing the selected one near the click"; return false; + } auto const second{editor_track::find_straight(*other, m_straights.tolerance)}; if (second.tracks.empty()) return false; @@ -3246,17 +3328,29 @@ bool editor_mode::insert_double_slip(editor_track::straight const &Line, glm::dv direction = -direction; auto const angle{std::atan2(std::abs(cross(first, direction)), glm::dot(first, direction))}; if (angle < glm::radians(0.5) || angle > glm::radians(30.0)) + { + state.status = "The straights cross at an angle unsuitable for a double slip"; return false; - auto const radius{Shape.radius}; - auto const half{radius * std::tan(angle * 0.5)}; + } auto const alongfirst{glm::dot(crossing - plan(Line.start), Line.direction)}; auto const alongsecond{glm::dot(crossing - plan(second.start), second.direction)}; - if (alongfirst - half < 0.0 || alongfirst + half > Line.length || alongsecond - half < 0.0 || alongsecond + half > second.length) - return false; + auto const available{std::min({alongfirst, Line.length - alongfirst, alongsecond, second.length - alongsecond}) - 0.5}; + auto radius{Shape.radius}; + auto half{radius * std::tan(angle * 0.5)}; + if (half > available) + { + half = available; + radius = half / std::tan(angle * 0.5); + if (radius < 50.0) + { + state.status = "Not enough straight track around the crossing"; + return false; + } + state.status = "R reduced to " + std::to_string(static_cast(radius)) + " m, the straights end " + std::to_string(static_cast(available)) + " m from the crossing"; + } auto const heightfirst = [&](double const Along) { return Line.start.y + Line.grade * Along; }; auto const heightsecond = [&](double const Along) { return second.start.y + second.grade * Along; }; - auto const centreheight{heightfirst(alongfirst)}; auto const sign{glm::dot(second.direction, direction) > 0.0 ? 1.0 : -1.0}; auto const at = [&](glm::dvec2 const &Planar, double const Height) { return glm::dvec3{Planar.x, Height, Planar.y}; }; auto const pointA{at(crossing - first * half, heightfirst(alongfirst - half))}; @@ -3288,70 +3382,7 @@ bool editor_mode::insert_double_slip(editor_track::straight const &Line, glm::dv } return false; } - - auto const straight = [&](glm::dvec3 const &Start, glm::dvec3 const &End) { - segment_data path; - path.points[segment_data::point::start] = Start; - path.points[segment_data::point::end] = End; - return path; - }; - double const gap{0.25}; - auto const side{cross(first, direction) > 0.0 ? 1.0 : -1.0}; - auto const turn = [](glm::dvec2 const &Vector, double const Angle) { - auto const c{std::cos(Angle)}; - auto const s{std::sin(Angle)}; - return glm::dvec2{Vector.x * c - Vector.y * s, Vector.x * s + Vector.y * c}; - }; - auto const arc = [&](glm::dvec3 const &Start, glm::dvec2 const &Heading, double const Turn, glm::dvec3 const &Finish, double const From, double const To) { - glm::dvec2 const centre{plan(Start) + glm::dvec2{-Heading.y, Heading.x} * (Turn * radius)}; - auto const radial{plan(Start) - centre}; - auto const p0{centre + turn(radial, Turn * From)}; - auto const p3{centre + turn(radial, Turn * To)}; - auto const d0{turn(Heading, Turn * From)}; - auto const d3{turn(Heading, Turn * To)}; - auto const handle{4.0 / 3.0 * std::tan((To - From) / 4.0) * radius}; - auto const y0{Start.y + (Finish.y - Start.y) * From / angle}; - auto const y3{Start.y + (Finish.y - Start.y) * To / angle}; - segment_data path; - path.points[segment_data::point::start] = {p0.x, y0, p0.y}; - path.points[segment_data::point::end] = {p3.x, y3, p3.y}; - path.points[segment_data::point::control1] = {d0.x * handle, 0.0, d0.y * handle}; - path.points[segment_data::point::control2] = {-d3.x * handle, 0.0, -d3.y * handle}; - path.radius = static_cast(radius); - return path; - }; - auto const reversed = [](segment_data const &Path) { - segment_data result{Path}; - result.points[segment_data::point::start] = Path.points[segment_data::point::end]; - result.points[segment_data::point::end] = Path.points[segment_data::point::start]; - result.points[segment_data::point::control1] = Path.points[segment_data::point::control2]; - result.points[segment_data::point::control2] = Path.points[segment_data::point::control1]; - result.rolls = {-Path.rolls[1], -Path.rolls[0]}; - return result; - }; - auto const middle{angle * 0.5}; - auto const split{gap / radius}; - auto const centreA{at(crossing - first * gap, centreheight)}; - auto const centreB{at(crossing + first * gap, centreheight)}; - auto const centreC{at(crossing - direction * gap, centreheight)}; - auto const centreD{at(crossing + direction * gap, centreheight)}; - - std::string base; - for (int i = 1; base.empty() || simulation::Paths.find(base + "_a") != nullptr; ++i) - base = "editor_dks" + std::to_string(i); - editor_track::switch_template shape; - shape.length = half; - auto *slipstyle{style != nullptr ? style : Line.tracks.front()}; - std::vector parts; - parts.push_back(editor_track::create_switch(shape, {straight(pointA, centreA), arc(pointA, first, side, pointD, 0.0, middle - split)}, *slipstyle, base + "_a")); - parts.push_back(editor_track::create_switch(shape, {straight(pointB, centreB), reversed(arc(pointC, direction, -side, pointB, middle + split, angle))}, *slipstyle, base + "_b")); - parts.push_back(editor_track::create_switch(shape, {straight(pointC, centreC), arc(pointC, direction, -side, pointB, 0.0, middle - split)}, *slipstyle, base + "_c")); - parts.push_back(editor_track::create_switch(shape, {straight(pointD, centreD), reversed(arc(pointA, first, side, pointD, middle + split, angle))}, *slipstyle, base + "_d")); - parts.push_back(editor_track::create_path(*slipstyle, straight(centreA, centreB))); - parts.push_back(editor_track::create_path(*slipstyle, straight(centreC, centreD))); - parts.push_back(editor_track::create_path(*slipstyle, arc(pointA, first, side, pointD, middle - split, middle + split))); - parts.push_back(editor_track::create_path(*slipstyle, arc(pointC, direction, -side, pointB, middle - split, middle + split))); - parts.erase(std::remove(parts.begin(), parts.end(), nullptr), parts.end()); + auto const parts{build_double_slip(pointA, pointB, pointC, pointD, crossing, heightfirst(alongfirst), first, direction, angle, radius, style != nullptr ? *style : *Line.tracks.front())}; editor_track::commit(parts); created.insert(created.end(), parts.begin(), parts.end()); push_track_snapshot(std::move(states), std::move(created)); @@ -3359,3 +3390,145 @@ bool editor_mode::insert_double_slip(editor_track::straight const &Line, glm::dv straight_refresh(); return true; } + +bool editor_mode::replace_double_slip(TTrack &Part, editor_track::switch_template const &Shape) +{ + auto &state{m_straights}; + auto const plan = [](glm::dvec3 const &Vector) { return glm::dvec2{Vector.x, Vector.z}; }; + auto const cross = [](glm::dvec2 const &A, glm::dvec2 const &B) { return A.x * B.y - A.y * B.x; }; + auto const base{Part.name().substr(0, Part.name().size() - 2)}; + std::array switches{}; + for (int i = 0; i < 4; ++i) + { + switches[i] = simulation::Paths.find(base + "_" + static_cast('a' + i)); + if (switches[i] == nullptr || switches[i]->m_editorremoved || switches[i]->eType != tt_Switch || switches[i]->m_paths.size() < 2) + { + state.status = "The double slip isn't complete, it can't be replaced"; + return false; + } + } + struct end + { + TTrack *track; + glm::dvec3 point; + glm::dvec2 inward; + TTrack *outer; + }; + std::vector ends; + std::vector parts(switches.begin(), switches.end()); + for (auto *track : switches) + { + segment_data const *straight{nullptr}; + for (auto const &path : track->m_paths) + if (path.points[segment_data::point::control1] == glm::dvec3{} && path.points[segment_data::point::control2] == glm::dvec3{}) + straight = &path; + if (straight == nullptr) + straight = &track->m_paths.front(); + auto const start{straight->points[segment_data::point::start]}; + ends.push_back({track, start, glm::normalize(plan(straight->points[segment_data::point::end] - start)), track->SwitchExtension->pPrevs[0]}); + for (int i = 0; i < 2; ++i) + { + auto *inner{track->SwitchExtension->pNexts[i]}; + if (inner != nullptr && inner->eType == tt_Normal && std::find(parts.begin(), parts.end(), inner) == parts.end() && inner->Length() < 5.0) + parts.push_back(inner); + } + } + int partner{-1}; + for (int i = 1; i < 4; ++i) + if (glm::dot(ends[0].inward, ends[i].inward) < -0.999) + partner = i; + if (partner < 0) + { + state.status = "The double slip geometry isn't recognized"; + return false; + } + auto const &a{ends[0]}; + auto const &b{ends[partner]}; + std::vector others; + for (int i = 1; i < 4; ++i) + if (i != partner) + others.push_back(i); + if (glm::dot(ends[0].inward, ends[others[0]].inward) < 0.0) + std::swap(others[0], others[1]); + auto const &c{ends[others[0]]}; + auto const &d{ends[others[1]]}; + auto const first{a.inward}; + auto direction{c.inward}; + auto const determinant{cross(first, direction)}; + if (std::abs(determinant) < 1e-9) + return false; + auto const t{cross(plan(c.point) - plan(a.point), direction) / determinant}; + glm::dvec2 const crossing{plan(a.point) + first * t}; + auto const angle{std::atan2(std::abs(cross(first, direction)), glm::dot(first, direction))}; + auto const oldhalf{glm::distance(plan(a.point), crossing)}; + auto radius{Shape.radius}; + auto half{radius * std::tan(angle * 0.5)}; + auto const height{(a.point.y + b.point.y) * 0.5}; + + std::vector> states; + std::vector created; + std::vector removed; + if (half > oldhalf) + { + for (auto const *e : {&a, &b, &c, &d}) + { + if (e->outer == nullptr || false == editor_track::is_straight(*e->outer, m_straights.tolerance)) + { + half = oldhalf; + radius = half / std::tan(angle * 0.5); + state.status = "R limited to " + std::to_string(static_cast(radius)) + " m, a neighbouring path isn't straight"; + break; + } + auto const line{editor_track::find_straight(*e->outer, m_straights.tolerance)}; + auto const reach{std::abs(glm::dot(plan(line.end) - crossing, -e->inward))}; + auto const reachstart{std::abs(glm::dot(plan(line.start) - crossing, -e->inward))}; + if (std::max(reach, reachstart) - 0.5 < half) + { + half = std::min(half, std::max(reach, reachstart) - 0.5); + radius = half / std::tan(angle * 0.5); + state.status = "R reduced to " + std::to_string(static_cast(radius)) + " m to fit the straights"; + } + } + } + for (auto *track : parts) + editor_track::retire(*track); + removed.insert(removed.end(), parts.begin(), parts.end()); + TTrack *style{a.outer != nullptr && a.outer->eType == tt_Normal ? a.outer : switches[0]}; + std::array points; + std::array order{&a, &b, &c, &d}; + for (int i = 0; i < 4; ++i) + { + auto const &e{*order[i]}; + auto const outward{-e.inward}; + auto const target{crossing + outward * half}; + points[i] = {target.x, e.point.y, target.y}; + if (half < oldhalf - 0.01) + { + auto *filler{editor_track::create_path(*style, [&] { + segment_data path; + path.points[segment_data::point::start] = points[i]; + path.points[segment_data::point::end] = e.point; + return path; + }())}; + created.push_back(filler); + } + else if (half > oldhalf + 0.01 && e.outer != nullptr) + { + auto const line{editor_track::find_straight(*e.outer, m_straights.tolerance)}; + auto const alongold{glm::dot(plan(e.point) - plan(line.start), line.direction)}; + auto const alongnew{glm::dot(target - plan(line.start), line.direction)}; + cut_straight(line, std::min(alongold, alongnew), std::max(alongold, alongnew), states, created, removed, nullptr); + } + } + auto const parts2{build_double_slip(points[0], points[1], points[2], points[3], crossing, height, first, direction, angle, radius, *style)}; + std::vector commitlist(parts2.begin(), parts2.end()); + for (auto *track : created) + if (std::find(commitlist.begin(), commitlist.end(), track) == commitlist.end()) + commitlist.push_back(track); + editor_track::commit(commitlist); + created.insert(created.end(), parts2.begin(), parts2.end()); + push_track_snapshot(std::move(states), std::move(created)); + m_history.back().removed = std::move(removed); + straight_refresh(); + return true; +} From acd2f8a28a8245716819aec3a539b0977ac2d488 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 3 Oct 2026 01:53:05 +0200 Subject: [PATCH 071/430] feat(editor): switches bend along curves --- application/editormode.h | 16 +++ application/editormodetrack.cpp | 248 +++++++++++++++++++++++++++++++- 2 files changed, 262 insertions(+), 2 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index 427c1c4d9..262b1b1b9 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -394,8 +394,19 @@ class editor_mode : public application_mode glm::dvec3 snap_straight_direction(glm::dvec3 const &Pivot, glm::dvec3 const &Moved) const; straights_state m_straights; + struct curve_sample + { + double station{0.0}; + glm::dvec3 position{0.0}; + glm::dvec2 tangent{0.0, 1.0}; + float roll{0.f}; + float radius{0.f}; + }; struct switch_tool { + bool curved{false}; + std::vector frame; + std::vector frame_tracks; std::vector templates; bool collected{false}; int armed{-1}; @@ -424,6 +435,11 @@ class editor_mode : public application_mode void finish_switch_placement(); std::vector switch_preview() const; void insert_switch(editor_track::straight const &Line, double const Along, int const Direction, int const Side); + static std::vector sample_chain(editor_track::chain const &Chain); + static curve_sample sample_at(std::vector const &Frame, double const Station); + static double nearest_station(std::vector const &Frame, glm::dvec3 const &Point); + static std::vector curved_switch_paths(editor_track::switch_template const &Shape, std::vector const &Frame, double const Station, int const Direction, int const Side); + void insert_curved_switch(int const Direction, int const Side); bool place_switch_on_straight(editor_track::straight const &Line, editor_track::switch_template const &Shape, TTrack const *Style, double const Along, int const Direction, int const Side, bool const Snap, std::vector> &States, std::vector &Created, std::vector &Removed); struct crossover_plan { diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index a2d9ed25b..faa117774 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -2604,6 +2604,15 @@ std::vector editor_mode::switch_preview() const auto const &tool{m_switch}; if (false == tool.placing || tool.armed < 0 || tool.armed >= static_cast(tool.templates.size())) return {}; + if (tool.curved) + { + auto const sample{sample_at(tool.frame, tool.along)}; + glm::dvec2 const offset{tool.mouse.x - tool.point.x, tool.mouse.z - tool.point.z}; + auto const forward{glm::dot(offset, sample.tangent) >= 0.0 ? 1 : -1}; + glm::dvec2 const direction{sample.tangent * static_cast(forward)}; + auto const side{direction.x * offset.y - direction.y * offset.x >= 0.0 ? 1 : -1}; + return curved_switch_paths(tool.templates[tool.armed], tool.frame, tool.along, forward, side); + } auto const &line{tool.line}; glm::dvec2 const offset{tool.mouse.x - tool.point.x, tool.mouse.z - tool.point.z}; auto const forward{glm::dot(offset, line.direction) >= 0.0 ? 1 : -1}; @@ -2615,12 +2624,34 @@ std::vector editor_mode::switch_preview() const bool editor_mode::start_switch_placement() { auto &tool{m_switch}; - if (tool.armed < 0 || m_track_tab != track_tab::straights) + if (tool.armed < 0 || (m_track_tab != track_tab::straights && m_track_tab != track_tab::route)) return false; + glm::dvec3 const ground{Global.pCamera.Pos + GfxRenderer->Mouse_Position()}; + tool.curved = false; + if (m_track_tab == track_tab::route || current_straight().tracks.empty()) + { + auto *track{selected_track()}; + if (track == nullptr || track->eType != tt_Normal || tool.templates[tool.armed].double_slip) + return false; + editor_track::curve curve; + editor_track::chain chain; + std::string error; + if (false == editor_track::find_curve(*track, m_straights.tolerance, m_route.design.norms.gauge, curve) || false == editor_track::find_chain(curve.from, curve.to, chain, error)) + return false; + tool.frame = sample_chain(chain); + tool.frame_tracks = chain.tracks; + if (tool.frame.size() < 2) + return false; + tool.curved = true; + tool.along = nearest_station(tool.frame, ground); + tool.point = sample_at(tool.frame, tool.along).position; + tool.mouse = ground; + tool.placing = true; + return true; + } auto const &line{current_straight()}; if (line.tracks.empty()) return false; - glm::dvec3 const ground{Global.pCamera.Pos + GfxRenderer->Mouse_Position()}; if (tool.templates[tool.armed].double_slip) { insert_double_slip(line, ground, tool.templates[tool.armed]); @@ -2640,6 +2671,16 @@ void editor_mode::finish_switch_placement() tool.placing = false; if (tool.armed < 0 || tool.armed >= static_cast(tool.templates.size())) return; + if (tool.curved) + { + auto const sample{sample_at(tool.frame, tool.along)}; + glm::dvec2 const offset{tool.mouse.x - tool.point.x, tool.mouse.z - tool.point.z}; + auto const forward{glm::dot(offset, sample.tangent) >= 0.0 ? 1 : -1}; + glm::dvec2 const direction{sample.tangent * static_cast(forward)}; + auto const side{direction.x * offset.y - direction.y * offset.x >= 0.0 ? 1 : -1}; + insert_curved_switch(forward, side); + return; + } glm::dvec2 const offset{tool.mouse.x - tool.point.x, tool.mouse.z - tool.point.z}; auto const forward{glm::dot(offset, tool.line.direction) >= 0.0 ? 1 : -1}; glm::dvec2 const direction{tool.line.direction * static_cast(forward)}; @@ -3532,3 +3573,206 @@ bool editor_mode::replace_double_slip(TTrack &Part, editor_track::switch_templat straight_refresh(); return true; } + +std::vector editor_mode::sample_chain(editor_track::chain const &Chain) +{ + std::vector result; + double station{0.0}; + for (std::size_t i = 0; i < Chain.tracks.size(); ++i) + { + auto const &path{Chain.tracks[i]->m_paths.front()}; + auto const forward{Chain.forward[i]}; + auto const p0{path.points[segment_data::point::start]}; + auto const p3{path.points[segment_data::point::end]}; + auto const p1{p0 + path.points[segment_data::point::control1]}; + auto const p2{p3 + path.points[segment_data::point::control2]}; + bool const straight{path.points[segment_data::point::control1] == glm::dvec3{} && path.points[segment_data::point::control2] == glm::dvec3{}}; + auto const length{glm::distance(p0, p3)}; + int const steps{std::max(8, static_cast(std::ceil(length / 0.5)))}; + for (int k = (result.empty() ? 0 : 1); k <= steps; ++k) + { + auto const t{forward ? static_cast(k) / steps : 1.0 - static_cast(k) / steps}; + auto const u{1.0 - t}; + glm::dvec3 position, derivative; + if (straight) + { + position = glm::mix(p0, p3, t); + derivative = p3 - p0; + } + else + { + position = u * u * u * p0 + 3.0 * u * u * t * p1 + 3.0 * u * t * t * p2 + t * t * t * p3; + derivative = 3.0 * u * u * (p1 - p0) + 6.0 * u * t * (p2 - p1) + 3.0 * t * t * (p3 - p2); + } + if (false == forward) + derivative = -derivative; + if (false == result.empty()) + station += glm::length(glm::dvec2{position.x - result.back().position.x, position.z - result.back().position.z}); + curve_sample sample; + sample.station = station; + sample.position = position; + sample.tangent = glm::normalize(glm::dvec2{derivative.x, derivative.z}); + auto const roll{path.rolls[0] + (path.rolls[1] - path.rolls[0]) * t}; + sample.roll = static_cast(forward ? roll : -roll); + sample.radius = path.radius; + result.push_back(sample); + } + } + return result; +} + +editor_mode::curve_sample editor_mode::sample_at(std::vector const &Frame, double const Station) +{ + if (Frame.empty()) + return {}; + if (Station <= Frame.front().station) + return Frame.front(); + if (Station >= Frame.back().station) + return Frame.back(); + auto const next{std::lower_bound(Frame.begin(), Frame.end(), Station, [](curve_sample const &Sample, double const Value) { return Sample.station < Value; })}; + auto const previous{std::prev(next)}; + auto const span{std::max(1e-9, next->station - previous->station)}; + auto const f{(Station - previous->station) / span}; + curve_sample result; + result.station = Station; + result.position = glm::mix(previous->position, next->position, f); + result.tangent = glm::normalize(glm::mix(previous->tangent, next->tangent, f)); + result.roll = static_cast(previous->roll + (next->roll - previous->roll) * f); + result.radius = previous->radius; + return result; +} + +double editor_mode::nearest_station(std::vector const &Frame, glm::dvec3 const &Point) +{ + double best{std::numeric_limits::max()}; + double station{0.0}; + for (std::size_t i = 0; i + 1 < Frame.size(); ++i) + { + glm::dvec2 const a{Frame[i].position.x, Frame[i].position.z}; + glm::dvec2 const b{Frame[i + 1].position.x, Frame[i + 1].position.z}; + auto const segment{b - a}; + auto const t{std::clamp(glm::dot(glm::dvec2{Point.x, Point.z} - a, segment) / std::max(1e-12, glm::dot(segment, segment)), 0.0, 1.0)}; + auto const distance{glm::distance(glm::dvec2{Point.x, Point.z}, a + segment * t)}; + if (distance < best) + { + best = distance; + station = Frame[i].station + (Frame[i + 1].station - Frame[i].station) * t; + } + } + return station; +} + +std::vector editor_mode::curved_switch_paths(editor_track::switch_template const &Shape, std::vector const &Frame, double const Station, int const Direction, int const Side) +{ + auto const map = [&](glm::dvec3 const &Local, glm::dvec2 &Tangent, glm::dvec2 const &Localtangent) { + auto const sample{sample_at(Frame, Station + Direction * Local.z)}; + auto const along{sample.tangent * static_cast(Direction)}; + glm::dvec2 const across{glm::dvec2{-along.y, along.x} * static_cast(Side)}; + Tangent = glm::normalize(along * Localtangent.y + across * Localtangent.x); + auto const planar{glm::dvec2{sample.position.x, sample.position.z} + across * Local.x}; + return glm::dvec3{planar.x, sample.position.y + Local.y, planar.y}; + }; + auto const hermite = [](glm::dvec3 const &Start, glm::dvec2 const &Startdirection, glm::dvec3 const &End, glm::dvec2 const &Enddirection) { + auto const handle{glm::distance(glm::dvec2{Start.x, Start.z}, glm::dvec2{End.x, End.z}) / 3.0}; + segment_data path; + path.points[segment_data::point::start] = Start; + path.points[segment_data::point::end] = End; + path.points[segment_data::point::control1] = {Startdirection.x * handle, (End.y - Start.y) / 3.0, Startdirection.y * handle}; + path.points[segment_data::point::control2] = {-Enddirection.x * handle, -(End.y - Start.y) / 3.0, -Enddirection.y * handle}; + return path; + }; + std::vector result; + for (auto const &local : Shape.local) + { + auto const &start{local.points[segment_data::point::start]}; + auto const &end{local.points[segment_data::point::end]}; + auto const &control1{local.points[segment_data::point::control1]}; + auto const &control2{local.points[segment_data::point::control2]}; + glm::dvec2 const chord{end.x - start.x, end.z - start.z}; + auto const localstart{glm::normalize(control1 != glm::dvec3{} ? glm::dvec2{control1.x, control1.z} : chord)}; + auto const localend{glm::normalize(control2 != glm::dvec3{} ? -glm::dvec2{control2.x, control2.z} : chord)}; + glm::dvec2 startdirection, enddirection; + auto const p0{map(start, startdirection, localstart)}; + auto const p3{map(end, enddirection, localend)}; + auto path{hermite(p0, startdirection, p3, enddirection)}; + auto const rollstart{sample_at(Frame, Station + Direction * start.z).roll * Direction}; + auto const rollend{sample_at(Frame, Station + Direction * end.z).roll * Direction}; + path.rolls = {static_cast(rollstart), static_cast(rollend)}; + path.radius = local.radius; + result.push_back(path); + } + if (false == result.empty()) + result.front().radius = sample_at(Frame, Station).radius; + return result; +} + +void editor_mode::insert_curved_switch(int const Direction, int const Side) +{ + auto &tool{m_switch}; + auto const &shape{tool.templates[tool.armed]}; + auto const total{tool.frame.back().station}; + auto station{std::clamp(tool.along, Direction > 0 ? 0.0 : shape.length, Direction > 0 ? total - shape.length : total)}; + if (shape.length > total - 0.02) + return; + auto const from{Direction > 0 ? station : station - shape.length}; + auto const to{from + shape.length}; + std::vector> states; + std::vector created; + std::vector removed; + std::vector candidates{tool.frame_tracks}; + auto const bezier = [](TTrack const &Track, double const T) { + auto const &path{Track.m_paths.front()}; + auto const p0{path.points[segment_data::point::start]}; + auto const p3{path.points[segment_data::point::end]}; + auto const p1{p0 + path.points[segment_data::point::control1]}; + auto const p2{p3 + path.points[segment_data::point::control2]}; + auto const u{1.0 - T}; + return u * u * u * p0 + 3.0 * u * u * T * p1 + 3.0 * u * T * T * p2 + T * T * T * p3; + }; + for (auto const cut : {from, to}) + { + auto const point{sample_at(tool.frame, cut).position}; + for (auto *candidate : std::vector(candidates)) + { + if (candidate->m_editorremoved || candidate->eType != tt_Normal) + continue; + auto const t{editor_track::nearest_parameter(*candidate, point)}; + auto const found{bezier(*candidate, t)}; + if (glm::distance(glm::dvec2{found.x, found.z}, glm::dvec2{point.x, point.z}) > 0.05) + continue; + if (t > 0.002 && t < 0.998) + { + if (std::find(created.begin(), created.end(), candidate) == created.end() && std::none_of(states.begin(), states.end(), [&](auto const &Entry) { return Entry.first == candidate; })) + states.emplace_back(candidate, editor_track::capture(*candidate)); + if (auto *second{editor_track::split_path(*candidate, t)}) + { + created.push_back(second); + candidates.push_back(second); + } + } + break; + } + } + for (auto *candidate : candidates) + { + if (candidate->m_editorremoved) + continue; + auto const middle{bezier(*candidate, 0.5)}; + auto const where{nearest_station(tool.frame, middle)}; + if (where > from + 0.01 && where < to - 0.01) + { + editor_track::retire(*candidate); + removed.push_back(candidate); + } + } + auto const paths{curved_switch_paths(shape, tool.frame, station, Direction, Side)}; + auto *track{editor_track::create_switch(shape, paths, *tool.frame_tracks.front())}; + if (track != nullptr) + { + editor_track::commit({track}); + created.push_back(track); + } + push_track_snapshot(std::move(states), std::move(created)); + m_history.back().removed = std::move(removed); + straight_refresh(); +} From 38161572b42034b6dcdf1b5a0cf2b06857cfafdc Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 3 Oct 2026 01:58:53 +0200 Subject: [PATCH 072/430] fix(editor): switches follow cant on curves --- application/editormodetrack.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index faa117774..e8adfae14 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -3670,7 +3670,9 @@ std::vector editor_mode::curved_switch_paths(editor_track::switch_ glm::dvec2 const across{glm::dvec2{-along.y, along.x} * static_cast(Side)}; Tangent = glm::normalize(along * Localtangent.y + across * Localtangent.x); auto const planar{glm::dvec2{sample.position.x, sample.position.z} + across * Local.x}; - return glm::dvec3{planar.x, sample.position.y + Local.y, planar.y}; + auto const cant{glm::radians(static_cast(sample.roll) * Direction)}; + auto const cone{-Local.x * Side * std::tan(cant)}; + return glm::dvec3{planar.x, sample.position.y + Local.y + cone, planar.y}; }; auto const hermite = [](glm::dvec3 const &Start, glm::dvec2 const &Startdirection, glm::dvec3 const &End, glm::dvec2 const &Enddirection) { auto const handle{glm::distance(glm::dvec2{Start.x, Start.z}, glm::dvec2{End.x, End.z}) / 3.0}; From 676bf39136303ee8ce9059d454153920ce9af89f Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 3 Oct 2026 02:25:28 +0200 Subject: [PATCH 073/430] feat(editor): track editor saves changed paths to scenery --- editor/editorTrack.cpp | 1 + scene/scenelayerssave.cpp | 72 ++++++++++++++++++++++++ simulation/simulationstateserializer.cpp | 1 + 3 files changed, 74 insertions(+) diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index 739e7d2fb..73ebb580d 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -1715,6 +1715,7 @@ TTrack *editor_track::load_path(std::string const &Text, TTrack const &Template, data.type = "track"; auto const base{Template.name().empty() || Template.name() == "none" ? std::string{"editor_track"} : Template.name()}; data.name = Name; + data.layer = Template.layer(); for (int i = 1; data.name.empty() || simulation::Paths.find(data.name) != nullptr; ++i) data.name = base + "_" + std::to_string(i); auto *track = new TTrack(data); diff --git a/scene/scenelayerssave.cpp b/scene/scenelayerssave.cpp index ade1b8847..df077aa74 100644 --- a/scene/scenelayerssave.cpp +++ b/scene/scenelayerssave.cpp @@ -9,6 +9,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "scene/scenelayers.h" +#include "world/Track.h" #include "simulation/simulation.h" #include "model/AnimModel.h" @@ -729,6 +730,69 @@ save_result node_layers::save(std::vector const &Rootstatements) return fail(state.error); } } + std::vector savedpaths; + std::vector droppedpaths; + auto const path_text = [](TTrack &Path, glm::dvec3 const &Offset) { + auto const paths{Path.m_paths}; + for (auto &path : Path.m_paths) + { + path.points[segment_data::point::start] -= Offset; + path.points[segment_data::point::end] -= Offset; + } + std::string text; + Path.export_as_text(text); + Path.m_paths = paths; + text.erase(text.find_last_not_of(" \t\r\n") + 1); + return text; + }; + for (auto *path : simulation::Paths.sequence()) + { + if (path == nullptr || (path->iCategoryFlag & 0x80) != 0 || path->from_template()) + { + continue; + } + auto const nodelayer{resolve(path->layer())}; + if (false == is_output(nodelayer)) + { + continue; + } + auto const lookup{m_sources.find(path)}; + if (lookup == m_sources.end()) + { + if (path->m_editorremoved || false == path->dirty()) + { + continue; + } + created[nodelayer].emplace_back(path, path_text(*path, layer(nodelayer).context_insert().offset)); + savedpaths.push_back(path); + continue; + } + auto const &source{lookup->second}; + if ((false == path->m_editorremoved && false == path->dirty()) || false == writable(source.layer)) + { + continue; + } + if (false == load(source.layer)) + { + return fail(state.error); + } + file_patch::edit edit; + edit.begin = source.span.begin; + edit.end = source.span.end; + if (path->m_editorremoved) + { + droppedpaths.push_back(path); + } + else + { + edit.text = path_text(*path, source.context.offset); + edit.length = edit.text.size(); + edit.node = path; + savedpaths.push_back(path); + } + state.patches[source.layer].edits.emplace_back(std::move(edit)); + rewritten.emplace(path); + } for (auto const &erased : m_erased) { file_patch::edit edit; @@ -1164,6 +1228,14 @@ save_result node_layers::save(std::vector const &Rootstatements) included.dead = included.dead || included.removed; } m_erased.clear(); + for (auto *path : savedpaths) + { + path->m_dirty = false; + } + for (auto const *path : droppedpaths) + { + m_sources.erase(path); + } if (removedterrain) { // binary terrain file still holds geometry of the dropped layer, have it rebuilt on the next load diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index f6f0c3c5f..18cd07af5 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -497,6 +497,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch } scene::Groups.insert( scene::Groups.handle(), path ); simulation::Region->insert_and_register( path ); + scene::Layers.track( path, { sourcebegin, Input.TokenEnd() } ); } else if( nodedata.type == "traction" ) { From 51521a135a8b83a63d0fa3c4c7fbad12ff203e3f Mon Sep 17 00:00:00 2001 From: pawelw Date: Sat, 3 Oct 2026 12:05:32 +0200 Subject: [PATCH 074/430] Text displays: accept characters above 127, in windows-1250 or utf-8 (#198) * Text displays: accept characters above 127, in windows-1250 or utf-8 A text display (sub-model of type "text") looks up the sub-model of each character in a 256 entry table, and indexed it with a plain char. With char being signed, any character above 127 gave a negative index: reading the text went outside the table, and so did filling the table if a character sub-model had such a name. In effect the displays could only show ASCII, and a text with national characters could crash. The lookup is now keyed by unicode code point. Both the displayed text and the names of the character sub-models are decoded as utf-8 if they are valid utf-8, and as windows-1250 otherwise, so legacy (ansi) sceneries and models work next to utf-8 ones, and the two can be mixed. A short ansi text can be valid utf-8 by accident (two upper case accented letters in a row will do); when both readings are possible the one which finds more of its characters in the model is used. The rest is unchanged: the first character of the text still isn't displayed, the characters are still drawn in the translucent pass only. A missing text pointer no longer gets dereferenced. * Text displays: prepare the characters once for each text The sequence of character sub-models was cached for the last text only, so displays of several instances drawn in turn decoded their texts again on every draw. It is now kept for each text the display shows; the texts of the instances don't change, so a draw costs a single lookup. Also the comments added in the renderers are now in English. * Text displays: move the text decoding to utilities utf8_to_utf32() and win1250_to_utf32(), with the windows-1250 table, now sit next to win1250_to_utf8(). The existing function maps only the Polish letters and passes other bytes above 127 through, so it can't serve the displays. * Text displays: address the SonarCloud findings std::array instead of the C-style arrays, the utf-8 sequence length worked out in a function of its own instead of nested conditional operators, std::byte for the bit operations, std::ranges::count_if and contains(). The character loop of the renderers moved to Render_Alpha_text(), which takes the nesting back to the limit, and the static pasText is accessed through the class. --- model/Model3d.cpp | 64 ++++++++++++++++++++++++++- model/Model3d.h | 7 ++- rendering/opengl33renderer.cpp | 39 +++++++--------- rendering/opengl33renderer.h | 1 + rendering/openglrenderer.cpp | 33 ++++++-------- rendering/openglrenderer.h | 3 ++ utilities/utilities.cpp | 81 ++++++++++++++++++++++++++++++++++ utilities/utilities.h | 4 ++ 8 files changed, 187 insertions(+), 45 deletions(-) diff --git a/model/Model3d.cpp b/model/Model3d.cpp index fba07446f..e1a3a79e6 100644 --- a/model/Model3d.cpp +++ b/model/Model3d.cpp @@ -17,6 +17,7 @@ Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others #include "utilities/Globals.h" #include "utilities/Logs.h" +#include "utilities/utilities.h" #include "rendering/renderer.h" #include "utilities/Timer.h" #include "simulation/simulation.h" @@ -55,8 +56,6 @@ TSubModel::~TSubModel() SafeDelete(Child); delete fMatrix; // własny transform trzeba usunąć (zawsze jeden) } - delete[] smLetter; // używany tylko roboczo dla TP_TEXT, do przyspieszenia - // wyświetlania }; void TSubModel::Name_Material(std::string const &Name) @@ -892,6 +891,67 @@ void TSubModel::InitialRotate(bool doit) Next->InitialRotate(doit); }; +// text display (TP_TEXT): returns sub-models of the characters to draw for provided text, in drawing order. +// a character is matched with the first character of a child sub-model name. both the text and the names can be +// encoded either in utf-8 or in windows-1250, so the legacy (ansi) scenery and model files work along the utf-8 ones +std::vector const &TSubModel::text_letters(std::string const &Text) +{ + // the sequence is prepared once for each text the display shows. the texts of the model instances don't change, + // so drawing a display afterwards costs a single lookup, however many instances and passes take turns + auto const prepared{m_textlayouts.find(Text)}; + if (prepared != m_textlayouts.end()) + { + return prepared->second; + } + + std::u32string characters; + if (false == m_lettersready) + { + for (auto *letter = Child; letter != nullptr; letter = letter->Next) + { + if (letter->pName.empty()) + { + continue; + } + if (false == utf8_to_utf32(letter->pName, characters)) + { + win1250_to_utf32(letter->pName, characters); + } + if (characters.front() != 0) + { + m_letters[characters.front()] = letter; + } + } + m_lettersready = true; + } + + // the text is taken for utf-8 if it's valid as such, and for windows-1250 otherwise. a short ansi text can pass + // for utf-8 by accident (two upper case accented letters in a row are enough for this to happen), + // so if both readings are possible the one which finds more of its characters in the model wins + auto const known = [this](std::u32string const &Characters) { + return std::ranges::count_if(Characters, [this](char32_t const Character) { return m_letters.contains(Character); }); + }; + std::u32string ansi; + win1250_to_utf32(Text, ansi); + if (false == utf8_to_utf32(Text, characters) || known(ansi) > known(characters)) + { + characters = ansi; + } + + auto &textletters{m_textlayouts[Text]}; + // NOTE: the first character of the text isn't displayed. the displays always worked this way, and the existing + // content relies on it + for (std::size_t idx = 1; idx < characters.size(); ++idx) + { + auto const lookup{m_letters.find(characters[idx])}; + if (lookup != m_letters.end()) + { + textletters.emplace_back(lookup->second); + } + } + return textletters; +} + void TSubModel::ChildAdd(TSubModel *SubModel) { // dodanie submodelu potemnego (uzależnionego) // Ra: zmiana kolejności, żeby kolejne móc renderować po aktualnym (było diff --git a/model/Model3d.h b/model/Model3d.h index 0e053609e..53e9084fc 100644 --- a/model/Model3d.h +++ b/model/Model3d.h @@ -156,7 +156,10 @@ public: // chwilowo std::uintptr_t iAnimOwner{ 0 }; // roboczy numer egzemplarza, który ustawił animację TAnimType b_aAnim{ TAnimType::at_None }; // kody animacji oddzielnie, bo zerowane std::shared_ptr mAnimMatrix; // macierz do animacji kwaternionowych - TSubModel **smLetter{ nullptr }; // wskaźnik na tablicę submdeli do generoania tekstu (docelowo zapisać do E3D) + // text display (TP_TEXT) data, filled on first use + std::unordered_map m_letters; // sub-models of the available characters, by unicode code point + bool m_lettersready { false }; // whether the character lookup was built yet + std::unordered_map> m_textlayouts; // sub-models of consecutive characters, for each text shown TSubModel *Parent{ nullptr }; // nadrzędny, np. do wymnażania macierzy int iVisible { 1 }; // roboczy stan widoczności float fVisible { 1.f }; // visibility level @@ -202,6 +205,8 @@ public: void SetTranslate(float3 vNewTransVector); void SetRotateIK1(float3 vNewAngles); TSubModel * GetFromName( std::string const &search, bool i = true ); + // text display (TP_TEXT): returns sub-models of the characters to draw for provided text, in drawing order + std::vector const & text_letters( std::string const &Text ); inline float4x4 * GetMatrix() { return fMatrix; }; inline float4x4 const * GetMatrix() const { return fMatrix; }; // returns offset vector from root diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index c07efca45..2f587033e 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -4634,6 +4634,21 @@ bool opengl33_renderer::Render_Alpha(TModel3d *Model, material_data const *Mater return result; } +// characters of a text display, laid out in a row. the text can be encoded in utf-8 or in windows-1250 +void opengl33_renderer::Render_Alpha_text(TSubModel *Submodel) +{ + if (TSubModel::pasText == nullptr) + { + return; + } + for (auto *p : Submodel->text_letters(*TSubModel::pasText)) + { // translucent only, for the time being + Render_Alpha(p); + if (p->fMatrix) + ::glMultMatrixf(p->fMatrix->readArray()); // move on to the place of the next character + } +} + void opengl33_renderer::Render_Alpha(TSubModel *Submodel) { // renderowanie przezroczystych przez DL @@ -4862,29 +4877,7 @@ void opengl33_renderer::Render_Alpha(TSubModel *Submodel) { if (Submodel->eType == TP_TEXT) { // tekst renderujemy w specjalny sposób, zamiast submodeli z łańcucha Child - int i, j = (int)Submodel->pasText->size(); - TSubModel *p; - if (!Submodel->smLetter) - { // jeśli nie ma tablicy, to ją stworzyć; miejsce nieodpowiednie, ale tymczasowo może być - Submodel->smLetter = new TSubModel *[256]; // tablica wskaźników submodeli dla wyświetlania tekstu - memset(Submodel->smLetter, 0, 256 * sizeof(TSubModel *)); // wypełnianie zerami - p = Submodel->Child; - while (p) - { - Submodel->smLetter[p->pName[0]] = p; - p = p->Next; // kolejny znak - } - } - for (i = 1; i <= j; ++i) - { - p = Submodel->smLetter[(*(Submodel->pasText))[i]]; // znak do wyświetlenia - if (p) - { // na razie tylko jako przezroczyste - Render_Alpha(p); - if (p->fMatrix) - ::glMultMatrixf(p->fMatrix->readArray()); // przesuwanie widoku - } - } + Render_Alpha_text(Submodel); } else if (Submodel->iAlpha & Submodel->iFlags & 0x002F0000) Render_Alpha(Submodel->Child); diff --git a/rendering/opengl33renderer.h b/rendering/opengl33renderer.h index 43cd24b05..562670d93 100644 --- a/rendering/opengl33renderer.h +++ b/rendering/opengl33renderer.h @@ -310,6 +310,7 @@ class opengl33_renderer : public gfx_renderer { bool Render_Alpha(TModel3d *Model, material_data const *Material, float const Squaredistance, glm::dvec3 const &Position, glm::vec3 const &Angle); bool Render_Alpha(TModel3d *Model, material_data const *Material, float const Squaredistance); void Render_Alpha(TSubModel *Submodel); + void Render_Alpha_text(TSubModel *Submodel); // characters of a text display void Update_Lights(light_array &Lights); glm::vec3 pick_color(std::size_t const Index); std::size_t pick_index(glm::ivec3 const &Color); diff --git a/rendering/openglrenderer.cpp b/rendering/openglrenderer.cpp index bc6c9d146..b675c38f6 100644 --- a/rendering/openglrenderer.cpp +++ b/rendering/openglrenderer.cpp @@ -3813,6 +3813,19 @@ opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, f return result; } +// characters of a text display, laid out in a row. the text can be encoded in utf-8 or in windows-1250 +void +opengl_renderer::Render_Alpha_text( TSubModel *Submodel ) { + + if( TSubModel::pasText == nullptr ) { return; } + + for( auto *p : Submodel->text_letters( *TSubModel::pasText ) ) { // translucent only, for the time being + Render_Alpha( p ); + if( p->fMatrix ) + ::glMultMatrixf( p->fMatrix->readArray() ); // move on to the place of the next character + } +} + void opengl_renderer::Render_Alpha( TSubModel *Submodel ) { // renderowanie przezroczystych przez DL @@ -4028,25 +4041,7 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { if( Submodel->Child != nullptr ) { if( Submodel->eType == TP_TEXT ) { // tekst renderujemy w specjalny sposób, zamiast submodeli z łańcucha Child - int i, j = (int)Submodel->pasText->size(); - TSubModel *p; - if( !Submodel->smLetter ) { // jeśli nie ma tablicy, to ją stworzyć; miejsce nieodpowiednie, ale tymczasowo może być - Submodel->smLetter = new TSubModel *[ 256 ]; // tablica wskaźników submodeli dla wyświetlania tekstu - std::memset(Submodel->smLetter, 0, 256 * sizeof( TSubModel * )); // wypełnianie zerami - p = Submodel->Child; - while( p ) { - Submodel->smLetter[ p->pName[ 0 ] ] = p; - p = p->Next; // kolejny znak - } - } - for( i = 1; i <= j; ++i ) { - p = Submodel->smLetter[ ( *( Submodel->pasText) )[ i ] ]; // znak do wyświetlenia - if( p ) { // na razie tylko jako przezroczyste - Render_Alpha( p ); - if( p->fMatrix ) - ::glMultMatrixf( p->fMatrix->readArray() ); // przesuwanie widoku - } - } + Render_Alpha_text( Submodel ); } else if( Submodel->iAlpha & Submodel->iFlags & 0x002F0000 ) Render_Alpha( Submodel->Child ); diff --git a/rendering/openglrenderer.h b/rendering/openglrenderer.h index 820deb924..83dca483a 100644 --- a/rendering/openglrenderer.h +++ b/rendering/openglrenderer.h @@ -270,6 +270,9 @@ private: Render_Alpha( TModel3d *Model, material_data const *Material, float const Squaredistance ); void Render_Alpha( TSubModel *Submodel ); + // characters of a text display + void + Render_Alpha_text( TSubModel *Submodel ); void Update_Lights( light_array &Lights ); bool diff --git a/utilities/utilities.cpp b/utilities/utilities.cpp index efaf3e6ce..804ca66c0 100644 --- a/utilities/utilities.cpp +++ b/utilities/utilities.cpp @@ -339,6 +339,87 @@ std::string win1250_to_utf8(const std::string &Input) return output; } +namespace +{ +// unicode code points of the upper half of the windows-1250 code page; 0 marks the unassigned bytes +std::array const win1250_upperhalf{ + 0x20AC, 0x0000, 0x201A, 0x0000, 0x201E, 0x2026, 0x2020, 0x2021, 0x0000, 0x2030, 0x0160, 0x2039, 0x015A, 0x0164, 0x017D, 0x0179, + 0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x0000, 0x2122, 0x0161, 0x203A, 0x015B, 0x0165, 0x017E, 0x017A, + 0x00A0, 0x02C7, 0x02D8, 0x0141, 0x00A4, 0x0104, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x015E, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x017B, + 0x00B0, 0x00B1, 0x02DB, 0x0142, 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x0105, 0x015F, 0x00BB, 0x013D, 0x02DD, 0x013E, 0x017C, + 0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7, 0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E, + 0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7, 0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF, + 0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7, 0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F, + 0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7, 0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9}; + +// returns number of bytes of the utf-8 sequence started by provided byte, or 0 if it can't start one +std::size_t utf8_sequence_length(std::byte const Lead) +{ + if ((Lead & std::byte{0x80}) == std::byte{0x00}) + { + return 1; + } + if ((Lead & std::byte{0xE0}) == std::byte{0xC0}) + { + return 2; + } + if ((Lead & std::byte{0xF0}) == std::byte{0xE0}) + { + return 3; + } + if ((Lead & std::byte{0xF8}) == std::byte{0xF0}) + { + return 4; + } + return 0; // a continuation byte, or a lead of a sequence utf-8 doesn't allow +} +} // namespace + +bool utf8_to_utf32(std::string const &Text, std::u32string &Output) +{ + // lowest code point which needs given number of bytes; shorter values are overlong forms + static std::array const minimum{0, 0, 0x80, 0x800, 0x10000}; + + Output.clear(); + auto const size{Text.size()}; + for (std::size_t idx = 0; idx < size;) + { + auto const lead{static_cast(Text[idx])}; + auto const length{utf8_sequence_length(lead)}; + if (length == 0 || idx + length > size) + { + return false; + } + auto codepoint{std::to_integer(lead & (std::byte{0xFF} >> (length > 1 ? length + 1 : 1)))}; + for (std::size_t offset = 1; offset < length; ++offset) + { + auto const next{static_cast(Text[idx + offset])}; + if ((next & std::byte{0xC0}) != std::byte{0x80}) + { + return false; + } + codepoint = (codepoint << 6) | std::to_integer(next & std::byte{0x3F}); + } + if (codepoint < minimum[length] || codepoint > 0x10FFFF || (codepoint >= 0xD800 && codepoint <= 0xDFFF)) + { + return false; + } + Output += codepoint; + idx += length; + } + return true; +} + +void win1250_to_utf32(std::string const &Text, std::u32string &Output) +{ + Output.clear(); + for (auto const character : Text) + { + auto const value{std::to_integer(static_cast(character))}; + Output += (value < 0x80 ? static_cast(value) : win1250_upperhalf[value - 0x80]); + } +} + // Ra: tymczasowe rozwiązanie kwestii zagranicznych (czeskich) napisów char charsetconversiontable[] = "E?,?\"_++?%Sstzz" " ^^L$A|S^CS<--RZo±,l'uP.,as>L\"lz" diff --git a/utilities/utilities.h b/utilities/utilities.h index 6e761380a..6b8111e33 100644 --- a/utilities/utilities.h +++ b/utilities/utilities.h @@ -166,6 +166,10 @@ void win1250_to_ascii(std::string &Input); std::string Bezogonkow(std::string Input, bool const Underscorestospaces = false); std::string win1250_to_utf8(const std::string &input); +// decodes utf-8 encoded text into unicode code points. returns false if the text isn't valid utf-8 +bool utf8_to_utf32(std::string const &Text, std::u32string &Output); +// decodes windows-1250 (ansi) encoded text into unicode code points +void win1250_to_utf32(std::string const &Text, std::u32string &Output); inline std::string extract_value(std::string const &Key, std::string const &Input) { From b71ad90c93ba909ca11c77b9cfe3b590616cadb8 Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Sat, 3 Oct 2026 14:32:09 +0200 Subject: [PATCH 075/430] Declare isbraking in the init-statement of the if --- vehicle/Driver.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index a6223689c..4b6d81ffb 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -5901,8 +5901,8 @@ TController::determine_consist_state() { auto const bp { std::max( 0.0, vehicle->BrakePress - ( vehicle->SpeedCtrlUnit.Parking ? vehicle->MaxBrakePress[ 0 ] * vehicle->StopBrakeDecc : 0.0 ) ) }; if (Ready) { // bo jak coś nie odhamowane, to dalej nie ma co sprawdzać - auto const isbraking { TestFlagAny( vehicle->Hamulec->GetBrakeStatus(), b_hld | b_on ) }; - if( vehicle->Vel < 1.0 ? + if( auto const isbraking { TestFlagAny( vehicle->Hamulec->GetBrakeStatus(), b_hld | b_on ) }; + vehicle->Vel < 1.0 ? isbraking || bp > 0.4 : // ensure the brakes are sufficiently released when starting to move // once in motion a brake down to 0.4 bar counts as released (UIC), even if its distributor // is still in the lap position while the brake pipe recharges From 3eb1f42e8e19f8a2e2910c0ec3d73b382e473679 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Sat, 3 Oct 2026 17:34:48 +0200 Subject: [PATCH 076/430] fix(editor): rename lambda clashing with the windows far macro --- application/editormodetrack.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index e8adfae14..db67af755 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -3090,9 +3090,9 @@ bool editor_mode::start_curve_fit(editor_track::straight const &Line) return false; if (state.fit_before.reversals != 0 || state.fit_after.reversals != 0) return false; - auto const far = [](editor_track::curve const &Curve, glm::dvec3 const &Joint) { return editor_track::touches(*Curve.from, Joint) ? Curve.to : Curve.from; }; - m_route.from = far(state.fit_before, Line.start); - m_route.to = far(state.fit_after, Line.end); + auto const far_end = [](editor_track::curve const &Curve, glm::dvec3 const &Joint) { return editor_track::touches(*Curve.from, Joint) ? Curve.to : Curve.from; }; + m_route.from = far_end(state.fit_before, Line.start); + m_route.to = far_end(state.fit_after, Line.end); route_reset(); if (m_route.chain.tracks.empty()) return false; From 2f417fddcca7f107be46a5a63eb001e45766b973 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Sat, 3 Oct 2026 17:35:08 +0200 Subject: [PATCH 077/430] feat(roads): road node with generated lanes, surface and markings --- CMakeLists.txt | 1 + editor/editorTrack.cpp | 3 + scene/scenelayerssave.cpp | 2 +- scene/scenenode.h | 9 + simulation/simulation.cpp | 2 + simulation/simulation.h | 1 + simulation/simulationstateserializer.cpp | 34 +- utilities/Classes.h | 2 + vehicle/DynObj.cpp | 3 +- world/Road.cpp | 958 +++++++++++++++++++++++ world/Road.h | 153 ++++ world/Track.h | 1 + 12 files changed, 1166 insertions(+), 3 deletions(-) create mode 100644 world/Road.cpp create mode 100644 world/Road.h diff --git a/CMakeLists.txt b/CMakeLists.txt index fe5b1f2bf..58b3e4ca7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,6 +95,7 @@ set(SOURCES "model/Texture.cpp" "utilities/Timer.cpp" "world/Track.cpp" +"world/Road.cpp" "world/Traction.cpp" "world/TractionPower.cpp" "vehicle/Train.cpp" diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index 73ebb580d..9c2bb1004 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -173,6 +173,9 @@ bool editor_track::is_supported(TTrack const &Track) { if ((Track.iCategoryFlag & 0x80) != 0) return false; + // lanes are generated from their road, and change only along with it + if (Track.m_road != nullptr) + return false; if (Track.eType == tt_Normal) return Track.Segment != nullptr; if (Track.eType == tt_Switch) diff --git a/scene/scenelayerssave.cpp b/scene/scenelayerssave.cpp index df077aa74..c45e24e8c 100644 --- a/scene/scenelayerssave.cpp +++ b/scene/scenelayerssave.cpp @@ -747,7 +747,7 @@ save_result node_layers::save(std::vector const &Rootstatements) }; for (auto *path : simulation::Paths.sequence()) { - if (path == nullptr || (path->iCategoryFlag & 0x80) != 0 || path->from_template()) + if (path == nullptr || (path->iCategoryFlag & 0x80) != 0 || path->m_road != nullptr || path->from_template()) { continue; } diff --git a/scene/scenenode.h b/scene/scenenode.h index df60187fe..7d1db4243 100644 --- a/scene/scenenode.h +++ b/scene/scenenode.h @@ -145,6 +145,9 @@ public: // replaces the renderable geometry handle (used by the editor when it re-uploads terrain geometry) void geometry( gfx::geometry_handle const &Handle ); + // set lighting (used by generated geometry painted with plain colour) + void + lighting( lighting_data const &Lighting ); // data access shapenode_data const & data() const; @@ -176,6 +179,12 @@ void shape_node::geometry( gfx::geometry_handle const &Handle ) { m_data.geometry = Handle; } +// set lighting +inline +void +shape_node::lighting( lighting_data const &Lighting ) { + m_data.lighting = Lighting; +} // data access inline shape_node::shapenode_data const & diff --git a/simulation/simulation.cpp b/simulation/simulation.cpp index 5f04c6114..e8e4542f0 100644 --- a/simulation/simulation.cpp +++ b/simulation/simulation.cpp @@ -16,6 +16,7 @@ http://mozilla.org/MPL/2.0/. #include "world/Event.h" #include "world/MemCell.h" #include "world/Track.h" +#include "world/Road.h" #include "world/Traction.h" #include "world/TractionPower.h" #include "audio/sound.h" @@ -36,6 +37,7 @@ state_manager State; event_manager Events; memory_table Memory; path_table Paths; +road_table Roads; traction_table Traction; powergridsource_table Powergrid; instance_table Instances; diff --git a/simulation/simulation.h b/simulation/simulation.h index b75056adb..03448007e 100644 --- a/simulation/simulation.h +++ b/simulation/simulation.h @@ -82,6 +82,7 @@ extern state_manager State; extern event_manager Events; extern memory_table Memory; extern path_table Paths; +extern road_table Roads; extern traction_table Traction; extern powergridsource_table Powergrid; extern instance_table Instances; diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index 18cd07af5..e6f609346 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -25,6 +25,7 @@ http://mozilla.org/MPL/2.0/. #include "model/AnimModel.h" #include "rendering/lightarray.h" #include "world/TractionPower.h" +#include "world/Road.h" #include "application/application.h" #include "rendering/renderer.h" #include "utilities/Logs.h" @@ -177,6 +178,10 @@ state_serializer::deserialize_continue(std::shared_ptr state Region->serialize( state->scenariofile ); } + // geometry of the roads is generated on each load instead of being kept in the binary terrain file, + // so it's inserted in the region only after that file had its chance to be written + simulation::Roads.create_geometry( Scratchpad ); + return false; } @@ -393,6 +398,7 @@ state_serializer::deserialize_firstinit( cParser &Input, scene::scratch_data &Sc } simulation::Paths.InitTracks(); + simulation::Roads.InitRoads(); simulation::Traction.InitTraction(); simulation::Events.InitEvents(); simulation::Events.InitLaunchers(); @@ -499,6 +505,21 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch simulation::Region->insert_and_register( path ); scene::Layers.track( path, { sourcebegin, Input.TokenEnd() } ); } + else if( nodedata.type == "road" ) { + + auto *road { new road_node( nodedata ) }; + road->import( + Input, + ( Scratchpad.location.offset.empty() ? + glm::dvec3 { 0.0 } : + glm::dvec3 { Scratchpad.location.offset.top() } ) ); + if( false == simulation::Roads.insert( road ) ) { + ErrorLog( "Bad scenario: duplicate road name \"" + road->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + } + scene::Groups.insert( scene::Groups.handle(), road ); + // the lanes are regular paths, registered right away so they get joined with their neighbours along with the tracks + road->create_lanes(); + } else if( nodedata.type == "traction" ) { auto *traction { deserialize_traction( Input, Scratchpad, nodedata ) }; @@ -1366,10 +1387,21 @@ state_serializer::export_nodes_to_stream(std::ostream &scmfile, bool Dirty) cons if( path == nullptr || path->m_editorremoved ) { continue; } + if( path->m_road != nullptr ) { + // lanes are generated anew from their road + continue; + } if( path->dirty() == Dirty && path->group() == null_handle ) { path->export_as_text( scmfile ); } } + // roads + scmfile << "// roads\n"; + for( auto const *road : Roads.sequence() ) { + if( road != nullptr && road->dirty() == Dirty && road->group() == null_handle ) { + road->export_as_text( scmfile ); + } + } // traction scmfile << "// traction\n"; for( auto const *traction : Traction.sequence() ) { @@ -1425,7 +1457,7 @@ TAnimModel *state_serializer::create_model(const std::string &src, const std::st std::pair state_serializer::preview_include(std::string const &Directive, scene::layer_context const &Context, scene::layer_handle Layer, scene::instance_handle Instance) { // statements which take more than a single token, with the tokens ending them static std::unordered_map const nodeends { - { "dynamic", "enddynamic" }, { "track", "endtrack" }, { "traction", "endtraction" }, { "tractionpowersource", "end" }, { "model", "endmodel" }, + { "dynamic", "enddynamic" }, { "track", "endtrack" }, { "road", "endroad" }, { "traction", "endtraction" }, { "tractionpowersource", "end" }, { "model", "endmodel" }, { "triangles", "endtri" }, { "triangle_strip", "endtri" }, { "triangle_fan", "endtri" }, { "lines", "endline" }, { "line_strip", "endline" }, { "line_loop", "endline" }, { "memcell", "endmemcell" }, { "eventlauncher", "end" }, { "sound", "endsound" } }; static std::unordered_map const statementends { diff --git a/utilities/Classes.h b/utilities/Classes.h index 1e91bc967..7622a57c9 100644 --- a/utilities/Classes.h +++ b/utilities/Classes.h @@ -43,6 +43,8 @@ class vehicle_table; class train_table; struct light_array; class particle_manager; +class road_node; // kawałek drogi, z którego powstają pasy ruchu +class road_table; struct dictionary_source; class trainset_desc; class scenery_desc; diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index 873cc4d32..0bf8815ba 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -2275,7 +2275,8 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" if (MoverParameters->CategoryFlag & 2) // jeśli samochód { // ustawianie samochodow na poboczu albo na środku drogi - if( Track->fTrackWidth < 3.5 ) // jeśli droga wąska + if( Track->fTrackWidth < 3.5 // jeśli droga wąska + || Track->m_road != nullptr ) // a lane of a road node is one-way, the vehicle keeps to its middle MoverParameters->OffsetTrackH = 0.0; // to stawiamy na środku, niezależnie od stanu // ruchu else if( driveractive ) {// od 3.5m do 8.0m jedzie po środku pasa, dla diff --git a/world/Road.cpp b/world/Road.cpp new file mode 100644 index 000000000..f52a4e51d --- /dev/null +++ b/world/Road.cpp @@ -0,0 +1,958 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "world/Road.h" + +#include "world/Track.h" +#include "simulation/simulation.h" +#include "scene/scene.h" +#include "rendering/renderer.h" +#include "utilities/Globals.h" +#include "utilities/Logs.h" +#include "utilities/parser.h" +#include "utilities/utilities.h" + +namespace +{ + +// dimensions of the markings, in metres +// NOTE: these give a layout resembling an ordinary polish road, they weren't taken from the regulations +constexpr double line_width{0.12}; +constexpr double line_spacing{0.12}; // gap between two lines painted side by side +constexpr double line_lift{0.02}; // the markings are raised over the surface, so the two don't fight for depth +constexpr double edge_inset{0.15}; // distance between the edge of the surface and the line running along it +constexpr double dash_period{12.0}; // a third of it is painted, the rest is the gap +constexpr double dash_step{2.0}; // longest straight piece of a painted line +// speed and reach of the paths made to turn the vehicles back at a loose end of the road +constexpr float turn_velocity{10.f}; +constexpr double turn_reach{6.0}; + +glm::dvec3 const up{0.0, 1.0, 0.0}; + +// placement of a cross-section of the road +struct axis_frame +{ + glm::dvec3 position; + glm::dvec3 tangent; // direction of the axis + glm::dvec3 left; // direction across the road, tilted by the roll + double roll{0.0}; +}; + +// the axis of a road piece; a cubic bezier curve, the same thing the paths of the tracks are made of +class road_axis +{ + + public: + explicit road_axis(segment_data const &Path) + { + auto const &start{Path.points[segment_data::point::start]}; + auto const &end{Path.points[segment_data::point::end]}; + auto const &control1{Path.points[segment_data::point::control1]}; + auto const &control2{Path.points[segment_data::point::control2]}; + m_curved = (control1 != glm::dvec3{0.0}) || (control2 != glm::dvec3{0.0}); + m_points[0] = start; + m_points[3] = end; + if (m_curved) + { + m_points[1] = start + control1; + m_points[2] = end + control2; + } + else + { + // a straight gets its control points in thirds of the length, the way the tracks do it + m_points[1] = start + (end - start) / 3.0; + m_points[2] = end - (end - start) / 3.0; + } + m_rolls = {glm::radians(static_cast(Path.rolls[0])), glm::radians(static_cast(Path.rolls[1]))}; + m_radius = std::abs(Path.radius); + // distances along the curve for evenly spaced values of its parameter, to convert the former into the latter + m_stations.resize(samples + 1); + m_stations[0] = 0.0; + auto previous{m_points[0]}; + for (int idx = 1; idx <= samples; ++idx) + { + auto const current{point(static_cast(idx) / samples)}; + m_stations[idx] = m_stations[idx - 1] + glm::distance(previous, current); + previous = current; + } + } + bool curved() const + { + return m_curved; + } + double length() const + { + return m_stations.back(); + } + // control vector of specified end of the curve, relative to that end + glm::dvec3 control(int const End) const + { + return End == 0 ? m_points[1] - m_points[0] : m_points[2] - m_points[3]; + } + glm::dvec3 point(double const T) const + { + auto const u{1.0 - T}; + return u * u * u * m_points[0] + 3.0 * u * u * T * m_points[1] + 3.0 * u * T * T * m_points[2] + T * T * T * m_points[3]; + } + // curvature of the axis seen from above, positive when it bends to the left + double curvature(double const T) const + { + auto const first{derivative(T)}; + auto const second{6.0 * (1.0 - T) * (m_points[2] - 2.0 * m_points[1] + m_points[0]) + 6.0 * T * (m_points[3] - 2.0 * m_points[2] + m_points[1])}; + auto const speedsquared{first.x * first.x + first.z * first.z}; + if (speedsquared < 1e-9) + { + return 0.0; + } + return (second.x * first.z - second.z * first.x) / (speedsquared * std::sqrt(speedsquared)); + } + // cross-section at specified value of the curve parameter + axis_frame frame(double const T) const + { + axis_frame frame; + frame.position = point(T); + auto direction{derivative(T)}; + if (glm::length2(direction) < 1e-9) + { + // a control point placed right at the end of the curve + direction = derivative(std::clamp(T, 0.01, 0.99)); + } + if (glm::length2(direction) < 1e-9) + { + direction = m_points[3] - m_points[0]; + } + if (glm::length2(direction) < 1e-9) + { + direction = glm::dvec3{0.0, 0.0, 1.0}; + } + frame.tangent = glm::normalize(direction); + // with the y axis up and the vehicle facing along z its left side is at positive x + glm::dvec3 across{frame.tangent.z, 0.0, -frame.tangent.x}; + across = (glm::length2(across) < 1e-9 ? glm::dvec3{1.0, 0.0, 0.0} : glm::normalize(across)); + // positive roll lowers the right side of the road, same as it does for the tracks + frame.roll = glm::mix(m_rolls[0], m_rolls[1], T); + frame.left = across * std::cos(frame.roll) + up * std::sin(frame.roll); + return frame; + } + // cross-section at specified distance from the start of the axis + axis_frame at(double const Station) const + { + return frame(parameter(Station)); + } + // length of pieces the road is cut into along the axis; follows the rules the tracks use + double step() const + { + if (false == m_curved) + { + return 10.0; + } + auto const fidelity{std::max(1.0, static_cast(Global.SplineFidelity))}; + return std::clamp(m_radius != 0.0 ? m_radius * 0.02 / fidelity : length() * 0.1, 2.0 / fidelity, 10.0 / fidelity); + } + + private: + static constexpr int samples{64}; + + glm::dvec3 derivative(double const T) const + { + auto const u{1.0 - T}; + return 3.0 * u * u * (m_points[1] - m_points[0]) + 6.0 * u * T * (m_points[2] - m_points[1]) + 3.0 * T * T * (m_points[3] - m_points[2]); + } + double parameter(double const Station) const + { + if (Station <= 0.0) + { + return 0.0; + } + if (Station >= length()) + { + return 1.0; + } + // first of the sampled distances past the requested one; it's never the very first sample + auto const idx{std::distance(m_stations.begin(), std::upper_bound(m_stations.begin(), m_stations.end(), Station))}; + auto const span{m_stations[idx] - m_stations[idx - 1]}; + auto const fraction{span > 0.0 ? (Station - m_stations[idx - 1]) / span : 0.0}; + return (static_cast(idx - 1) + fraction) / samples; + } + + std::array m_points; + std::array m_rolls{}; + double m_radius{0.0}; + bool m_curved{false}; + std::vector m_stations; +}; + +// corner of the cross-section of something laid along the road +struct profile_point +{ + double offset; // distance from the axis, positive to the left + double height; // above the surface + float texture; // texture coordinate across the road +}; + +// stretches provided profile along a part of the axis. the profile points go left to right, each two neighbours make a band of triangles. +void loft(std::vector &Output, road_axis const &Axis, std::vector const &Profile, double const From, double const To, double const Step, double const Texturelength) +{ + if (Profile.size() < 2 || To <= From || Step <= 0.0) + { + return; + } + auto const count{std::max(1, static_cast(std::ceil((To - From) / Step - 0.001)))}; + auto const pointcount{Profile.size()}; + // each band is flat across the road, and follows its bends along it + auto const normal = [](glm::dvec3 const &Tangent, glm::dvec3 const &Across) { + auto const result{glm::cross(Tangent, Across)}; + return glm::vec3{glm::length2(result) < 1e-12 ? up : glm::normalize(result)}; + }; + std::vector previous(pointcount), current(pointcount); + axis_frame previousframe; + double previousstation{From}; + + for (int section = 0; section <= count; ++section) + { + auto const station{From + (To - From) * section / count}; + auto const frame{Axis.at(station)}; + for (std::size_t idx = 0; idx < pointcount; ++idx) + { + current[idx] = frame.position + frame.left * Profile[idx].offset + up * Profile[idx].height; + } + if (section > 0) + { + auto const texturestart{static_cast(previousstation / Texturelength)}; + auto const textureend{static_cast(station / Texturelength)}; + for (std::size_t idx = 0; idx + 1 < pointcount; ++idx) + { + auto const normalstart{normal(previousframe.tangent, previous[idx] - previous[idx + 1])}; + auto const normalend{normal(frame.tangent, current[idx] - current[idx + 1])}; + world_vertex const leftstart{previous[idx], normalstart, {Profile[idx].texture, texturestart}}; + world_vertex const rightstart{previous[idx + 1], normalstart, {Profile[idx + 1].texture, texturestart}}; + world_vertex const leftend{current[idx], normalend, {Profile[idx].texture, textureend}}; + world_vertex const rightend{current[idx + 1], normalend, {Profile[idx + 1].texture, textureend}}; + Output.push_back(leftstart); + Output.push_back(rightstart); + Output.push_back(leftend); + + Output.push_back(rightstart); + Output.push_back(rightend); + Output.push_back(leftend); + } + } + previous.swap(current); + previousframe = frame; + previousstation = station; + } +} + +// proportions of the image specified material is painted with +float texture_ratio(std::string const &Material) +{ + auto const material{GfxRenderer->Fetch_Material(Material)}; + if (material == null_handle) + { + return 1.f; + } + auto const texture{GfxRenderer->Material(material)->GetTexture(0)}; + if (texture == null_handle) + { + return 1.f; + } + auto const &image{GfxRenderer->Texture(texture)}; + return image.get_height() > 0 ? static_cast(image.get_width()) / static_cast(image.get_height()) : 1.f; +} + +} // namespace + +road_node::road_node(scene::node_data const &Nodedata) : basic_node(Nodedata) {} + +// restores content of the node from provided input stream; reads up to and including the closing 'endroad' +void road_node::import(cParser &Input, glm::dvec3 const &Offset) +{ + auto const label{m_name.empty() ? std::string{"unnamed road"} : "road \"" + m_name + "\""}; + + m_axis.deserialize(Input, Offset); + + // properties of the lanes can precede the statement which sets how many of them there are, so they wait until everything is read + struct lane_property + { + std::string lane; + std::string property; + float value; + }; + struct change_property + { + std::string first; + std::string second; + std::string mode; + }; + std::vector laneproperties; + std::vector changeproperties; + + auto token{Input.getToken()}; + while (false == token.empty() && token != "endroad") + { + if (token == "lanes") + { + // lanes + Input.getTokens(2); + Input >> m_forward >> m_backward; + } + else if (token == "width") + { + Input.getTokens(); + Input >> m_lanewidth; + } + else if (token == "velocity") + { + Input.getTokens(); + Input >> m_velocity; + } + else if (token == "lane") + { + // lane + lane_property property; + property.lane = Input.getToken(); + property.property = Input.getToken(); + property.value = 0.f; + Input.getTokens(); + Input >> property.value; + laneproperties.emplace_back(property); + } + else if (token == "change") + { + // change + change_property property; + property.first = Input.getToken(); + property.second = Input.getToken(); + property.mode = Input.getToken(); + changeproperties.emplace_back(property); + } + else if (token == "surface") + { + m_surface = Input.getToken(); + replace_slashes(m_surface); + } + else if (token == "texlength") + { + Input.getTokens(); + Input >> m_texturelength; + } + else if (token == "side") + { + // side + auto const where{Input.getToken()}; + auto const type{Input.getToken()}; + side_data side; + Input.getTokens(); + Input >> side.width; + side.material = Input.getToken(); + replace_slashes(side.material); + side.type = (type == "shoulder" ? side_type::shoulder : type == "sidewalk" ? side_type::sidewalk : side_type::none); + if (type != "shoulder" && type != "sidewalk" && type != "none") + { + ErrorLog("Bad road: unknown kind of side \"" + type + "\" defined for " + label); + } + if (where == "left" || where == "both") + { + m_sides[0] = side; + } + if (where == "right" || where == "both") + { + m_sides[1] = side; + } + if (where != "left" && where != "right" && where != "both") + { + ErrorLog("Bad road: unknown side \"" + where + "\" defined for " + label); + } + } + else if (token == "kerb") + { + Input.getTokens(); + Input >> m_kerbheight; + } + else if (token == "slope") + { + // slope + Input.getTokens(2); + Input >> m_slope.x >> m_slope.y; + } + else if (token == "markings") + { + auto const colour{Input.getToken()}; + m_markings = (colour == "white" ? marking_colour::white : colour == "orange" ? marking_colour::orange : marking_colour::none); + if (colour != "white" && colour != "orange" && colour != "none") + { + ErrorLog("Bad road: unknown colour of markings \"" + colour + "\" defined for " + label); + } + } + else if (token == "friction") + { + Input.getTokens(); + Input >> m_friction; + } + else if (token == "environment") + { + m_environment = Input.getToken(); + } + else + { + ErrorLog("Bad road: unknown property: \"" + token + "\" defined for " + label); + } + token = Input.getToken(); + } + + // the paths of the lanes are loaded from text, so what goes into it has to be something they understand + static std::array const environments{"flat", "mountains", "mountain", "canyon", "tunnel", "bridge", "bank"}; + if (std::find(environments.begin(), environments.end(), m_environment) == environments.end()) + { + ErrorLog("Bad road: unknown environment \"" + m_environment + "\" defined for " + label); + m_environment = "flat"; + } + m_forward = std::clamp(m_forward, 0, 8); + m_backward = std::clamp(m_backward, 0, 8); + if (m_forward + m_backward == 0) + { + ErrorLog("Bad road: " + label + " has no lanes, a single one is used instead"); + m_forward = 1; + } + m_lanewidth = std::max(1.f, m_lanewidth); + if (m_texturelength < 0.01f) + { + m_texturelength = 4.f; + } + if (m_surface.empty()) + { + m_surface = "none"; + } + + lane_data lanetemplate; + lanetemplate.width = m_lanewidth; + lanetemplate.velocity = m_velocity; + m_lanes.assign(static_cast(m_forward + m_backward), lanetemplate); + for (auto const &property : laneproperties) + { + auto const lane{lane_index(property.lane)}; + if (lane < 0) + { + ErrorLog("Bad road: " + label + " has no lane \"" + property.lane + "\""); + continue; + } + if (property.property == "width") + { + m_lanes[lane].width = std::max(1.f, property.value); + } + else if (property.property == "velocity") + { + m_lanes[lane].velocity = property.value; + } + else + { + ErrorLog("Bad road: unknown lane property: \"" + property.property + "\" defined for " + label); + } + } + + m_changes.resize(m_lanes.size() - 1); + for (std::size_t boundary = 0; boundary < m_changes.size(); ++boundary) + { + m_changes[boundary] = default_change(boundary); + } + for (auto const &property : changeproperties) + { + auto const first{lane_index(property.first)}; + auto const second{lane_index(property.second)}; + if (first < 0 || second < 0 || std::abs(first - second) != 1) + { + ErrorLog("Bad road: lanes \"" + property.first + "\" and \"" + property.second + "\" aren't neighbours on " + label); + continue; + } + // the permissions are stored for the pair taken left to right + auto const firstonleft{first < second}; + auto &change{m_changes[std::min(first, second)]}; + if (property.mode == "both") + { + change = change_both; + } + else if (property.mode == "none") + { + change = change_none; + } + else if (property.mode == "ab") + { + change = (firstonleft ? change_toright : change_toleft); + } + else if (property.mode == "ba") + { + change = (firstonleft ? change_toleft : change_toright); + } + else + { + ErrorLog("Bad road: unknown lane change mode: \"" + property.mode + "\" defined for " + label); + } + } + + location(road_axis{m_axis}.frame(0.5).position); +} + +// creates paths of the lanes and hands them over to the simulation +void road_node::create_lanes() +{ + for (std::size_t lane = 0; lane < m_lanes.size(); ++lane) + { + m_lanes[lane].track = create_track(m_name.empty() ? std::string{} : m_name + ":" + lane_id(lane), lane_path(lane), m_lanes[lane].width, m_lanes[lane].velocity); + } +} + +// links lanes of opposite directions at an end of the road which leads nowhere, so the vehicles can turn back +void road_node::close_ends() +{ + // NOTE: without the link a vehicle reaching the end would be sent back on the lane it came by, against its direction + road_axis const axis{m_axis}; + for (int end = 0; end < 2; ++end) + { + // the lanes going along the axis leave the road at its end, the ones going against it leave at its start + auto const outwards{end == 1 ? axis.frame(1.0).tangent : -axis.frame(0.0).tangent}; + for (int pair = 1; pair <= std::min(m_forward, m_backward); ++pair) + { + auto const forward{static_cast(m_backward + pair - 1)}; + auto const backward{static_cast(m_backward - pair)}; + auto *exit{m_lanes[end == 1 ? forward : backward].track}; + auto *entry{m_lanes[end == 1 ? backward : forward].track}; + if (exit == nullptr || entry == nullptr || exit->trNext != nullptr || entry->trPrev != nullptr) + { + continue; + } + segment_data path; + path.points[segment_data::point::start] = exit->CurrentSegment()->FastGetPoint_1(); + path.points[segment_data::point::end] = entry->CurrentSegment()->FastGetPoint_0(); + auto const span{glm::distance(path.points[segment_data::point::start], path.points[segment_data::point::end])}; + path.points[segment_data::point::control1] = outwards * std::max(turn_reach, 1.5 * span); + path.points[segment_data::point::control2] = outwards * std::max(turn_reach, 1.5 * span); + path.radius = static_cast(std::max(2.0, 0.5 * span)); + auto *turn{create_track(m_name.empty() ? std::string{} : m_name + ":" + (end == 1 ? "endturn" : "startturn") + std::to_string(pair), path, m_lanes[forward].width, turn_velocity)}; + exit->ConnectNextPrev(turn, 0); + turn->ConnectNextPrev(entry, 0); + m_turns.emplace_back(turn); + } + } +} + +// generates geometry of the surface, the sides and the markings +std::vector road_node::create_shapes() const +{ + // triangles are gathered separately for each look, so the lot can be drawn with as few shapes as possible + struct batch + { + std::string material; + lighting_data lighting; + std::vector vertices; + }; + std::vector batches; + auto const vertices = [&batches](std::string const &Material, lighting_data const &Lighting) -> std::vector & { + for (auto &entry : batches) + { + if (entry.material == Material && entry.lighting == Lighting) + { + return entry.vertices; + } + } + batches.emplace_back(); + batches.back().material = Material; + batches.back().lighting = Lighting; + return batches.back().vertices; + }; + + road_axis const axis{m_axis}; + auto const length{axis.length()}; + auto const step{axis.step()}; + auto const halfwidth{0.5 * width()}; + + // surface. the image is centered on the axis, and repeated if the road is wider + if (m_surface != "none") + { + auto const tile{static_cast(texture_ratio(m_surface) * m_texturelength)}; + loft(vertices(m_surface, lighting_data{}), axis, {{halfwidth, 0.0, static_cast(0.5 + halfwidth / tile)}, {-halfwidth, 0.0, static_cast(0.5 - halfwidth / tile)}}, 0.0, length, step, m_texturelength); + } + + // sides + for (int side = 0; side < 2; ++side) + { + auto const &data{m_sides[side]}; + if (data.type == side_type::none || data.width <= 0.f || data.material.empty() || data.material == "none") + { + continue; + } + auto const direction{side == 0 ? 1.0 : -1.0}; + // corners of the profile, from the edge of the surface outwards + std::vector profile; + if (data.type == side_type::shoulder) + { + // the image is laid out like the one of the legacy roads: the edge of the surface on its right, the bank on its left half + profile.push_back({direction * halfwidth, 0.0, 1.f}); + profile.push_back({direction * (halfwidth + data.width), 0.0, 0.5f}); + if (m_slope.x > 0.f) + { + profile.push_back({direction * (halfwidth + data.width + m_slope.x), -m_slope.y, 0.f}); + } + } + else + { + // the image starts at the foot of the kerb, and is laid out in its own proportions + auto const tile{static_cast(texture_ratio(data.material) * m_texturelength)}; + profile.push_back({direction * halfwidth, 0.0, 0.f}); + profile.push_back({direction * halfwidth, m_kerbheight, static_cast(m_kerbheight / tile)}); + profile.push_back({direction * (halfwidth + data.width), m_kerbheight, static_cast((m_kerbheight + data.width) / tile)}); + } + if (side == 0) + { + // the loft takes the corners left to right + std::reverse(profile.begin(), profile.end()); + } + loft(vertices(data.material, lighting_data{}), axis, profile, 0.0, length, step, m_texturelength); + } + + // markings. these are painted with plain colour instead of an image + if (m_markings != marking_colour::none) + { + lighting_data paint; + paint.diffuse = (m_markings == marking_colour::white ? glm::vec4{0.92f, 0.92f, 0.92f, 1.f} : glm::vec4{0.95f, 0.5f, 0.08f, 1.f}); + paint.ambient = paint.diffuse; + auto &lines{vertices("colored", paint)}; + + auto const solid = [&](double const Offset) { + loft(lines, axis, {{Offset + 0.5 * line_width, line_lift, 0.f}, {Offset - 0.5 * line_width, line_lift, 1.f}}, 0.0, length, std::min(step, dash_step), m_texturelength); + }; + // the dashes are fitted so the gaps at both ends of the road are a half of the regular one, which makes them match the next piece + auto const dashed = [&](double const Offset) { + auto const count{std::max(1, static_cast(std::lround(length / dash_period)))}; + auto const period{length / count}; + for (int dash = 0; dash < count; ++dash) + { + auto const from{(dash + 1.0 / 3.0) * period}; + loft(lines, axis, {{Offset + 0.5 * line_width, line_lift, 0.f}, {Offset - 0.5 * line_width, line_lift, 1.f}}, from, from + period / 3.0, dash_step, m_texturelength); + } + }; + + // edges of the surface + auto const edge{halfwidth - edge_inset - 0.5 * line_width}; + if (edge > 0.5) + { + solid(edge); + solid(-edge); + } + // lines between the lanes. a lane can be left across a dashed line, or across a pair of lines if the dashed one is on its side + auto offset{halfwidth}; + for (std::size_t boundary = 0; boundary < m_changes.size(); ++boundary) + { + offset -= m_lanes[boundary].width; + auto const opposite{m_backward > 0 && boundary + 1 == static_cast(m_backward)}; + auto const pair{0.5 * (line_width + line_spacing)}; + switch (m_changes[boundary]) + { + case change_both: + { + dashed(offset); + break; + } + case change_toright: + { + dashed(offset + pair); + solid(offset - pair); + break; + } + case change_toleft: + { + solid(offset + pair); + dashed(offset - pair); + break; + } + default: + { + if (opposite) + { + // traffic going opposite ways is kept apart with a double line + solid(offset + pair); + solid(offset - pair); + } + else + { + solid(offset); + } + break; + } + } + } + } + + std::vector shapes; + for (auto &entry : batches) + { + if (entry.vertices.empty()) + { + continue; + } + scene::shape_node shape; + shape.make_terrain(GfxRenderer->Fetch_Material(entry.material), std::move(entry.vertices), glm::dvec3{0.0}); + shape.lighting(entry.lighting); + shapes.emplace_back(std::move(shape)); + } + return shapes; +} + +// identifier of a lane: f1..fn go along the axis and b1..bn against it, both counted outwards from where the directions meet +std::string road_node::lane_id(std::size_t const Lane) const +{ + auto const backward{static_cast(m_backward)}; + return Lane < backward ? "b" + std::to_string(backward - Lane) : "f" + std::to_string(Lane - backward + 1); +} + +// number of a lane in the left to right order, -1 if the road has no lane with such identifier +int road_node::lane_index(std::string const &Id) const +{ + if (Id.size() < 2 || Id.size() > 3 || (Id[0] != 'f' && Id[0] != 'b')) + { + return -1; + } + int number{0}; + for (std::size_t idx = 1; idx < Id.size(); ++idx) + { + if (Id[idx] < '0' || Id[idx] > '9') + { + return -1; + } + number = number * 10 + (Id[idx] - '0'); + } + if (number < 1 || number > (Id[0] == 'f' ? m_forward : m_backward)) + { + return -1; + } + return Id[0] == 'f' ? m_backward + number - 1 : m_backward - number; +} + +// permission to change the lane a pair of neighbouring lanes gets if the scenery doesn't say otherwise +int road_node::default_change(std::size_t const Boundary) const +{ + auto const opposite{m_backward > 0 && m_forward > 0 && Boundary + 1 == static_cast(m_backward)}; + if (false == opposite) + { + return change_both; + } + // overtaking across the oncoming lane is left for the simple two lane roads + return (m_forward == 1 && m_backward == 1) ? change_both : change_none; +} + +// distance of the middle of a lane from the axis, positive to the left when facing along the axis +double road_node::lane_offset(std::size_t const Lane) const +{ + auto offset{0.5 * width()}; + for (std::size_t idx = 0; idx < Lane && idx < m_lanes.size(); ++idx) + { + offset -= m_lanes[idx].width; + } + return Lane < m_lanes.size() ? offset - 0.5 * m_lanes[Lane].width : offset; +} + +// combined width of the lanes +double road_node::width() const +{ + double width{0.0}; + for (auto const &lane : m_lanes) + { + width += lane.width; + } + return width; +} + +// shape of the middle of a lane, laid out in the direction of travel +segment_data road_node::lane_path(std::size_t const Lane) const +{ + road_axis const axis{m_axis}; + auto const offset{lane_offset(Lane)}; + auto const begin{axis.frame(0.0)}; + auto const end{axis.frame(1.0)}; + + segment_data path; + path.points[segment_data::point::start] = begin.position + begin.left * offset; + path.points[segment_data::point::end] = end.position + end.left * offset; + if (axis.curved()) + { + // a line running beside a bend is shorter or longer than the bend itself, and so are its control vectors + path.points[segment_data::point::control1] = axis.control(0) * std::max(0.05, 1.0 - offset * std::cos(begin.roll) * axis.curvature(0.0)); + path.points[segment_data::point::control2] = axis.control(1) * std::max(0.05, 1.0 - offset * std::cos(end.roll) * axis.curvature(1.0)); + // if the roll changes along the road its sides rise or fall relative to the axis + auto const climb{offset * (std::sin(end.roll) - std::sin(begin.roll)) / 3.0}; + path.points[segment_data::point::control1].y += climb; + path.points[segment_data::point::control2].y -= climb; + } + path.rolls = m_axis.rolls; + if (m_axis.radius != 0.f) + { + // the lanes on the inner side of the bend have it tighter + auto const turn{axis.curvature(0.5) >= 0.0 ? 1.0 : -1.0}; + path.radius = static_cast(std::max(1.0, std::abs(m_axis.radius) - turn * offset)); + } + if (Lane < static_cast(m_backward)) + { + // the lane goes against the axis + std::swap(path.points[segment_data::point::start], path.points[segment_data::point::end]); + std::swap(path.points[segment_data::point::control1], path.points[segment_data::point::control2]); + path.rolls = {-m_axis.rolls[1], -m_axis.rolls[0]}; + } + if (Global.bRollFix) + { + // with this setting on a rolled path gets raised when it's set up, by an amount fit for a railway track. + // the surface of the road stays where it is, so the lane is lowered beforehand to make up for it + path.points[segment_data::point::start].y -= std::abs(std::sin(glm::radians(static_cast(path.rolls[0])))) * 0.75; + path.points[segment_data::point::end].y -= std::abs(std::sin(glm::radians(static_cast(path.rolls[1])))) * 0.75; + } + return path; +} + +// creates a path for the vehicles and registers it with the simulation +TTrack *road_node::create_track(std::string const &Name, segment_data const &Path, float const Width, float const Velocity) +{ + auto const &start{Path.points[segment_data::point::start]}; + auto const &control1{Path.points[segment_data::point::control1]}; + auto const &control2{Path.points[segment_data::point::control2]}; + auto const &end{Path.points[segment_data::point::end]}; + // the path is put together the way the scenery defines an invisible road, to have it set up by the code which loads these + std::ostringstream text; + text.precision(std::numeric_limits::digits10); + text << "road " << glm::distance(start, end) << ' ' << Width << ' ' << m_friction << ' ' << m_sounddistance << ' ' << m_quality << " 0 " << m_environment << " unvis " << start.x << ' ' << start.y << ' ' << start.z << ' ' << Path.rolls[0] << ' ' + << control1.x << ' ' << control1.y << ' ' << control1.z << ' ' << control2.x << ' ' << control2.y << ' ' << control2.z << ' ' << end.x << ' ' << end.y << ' ' << end.z << ' ' << Path.rolls[1] << ' ' << Path.radius << ' '; + if (Velocity > 0.f) + { + text << "velocity " << Velocity << ' '; + } + text << "endtrack"; + + cParser parser(text.str(), cParser::buffer_TEXT); + scene::node_data nodedata; + nodedata.range_max = -1.0; + nodedata.name = Name; + nodedata.type = "track"; + auto *track{new TTrack(nodedata)}; + track->Load(&parser, glm::dvec3{0.0}); + track->m_road = this; + if (false == simulation::Paths.insert(track)) + { + ErrorLog("Bad scenario: duplicate track name \"" + track->name() + "\" generated for a road"); + } + simulation::Region->insert_and_register(track); + return track; +} + +// radius() subclass details, calculates node's bounding radius +float road_node::radius_() +{ + return static_cast(0.5 * road_axis{m_axis}.length() + 0.5 * width() + std::max(m_sides[0].width, m_sides[1].width) + m_slope.x); +} + +// serialize() subclass details, sends content of the subclass to provided stream +void road_node::serialize_(std::ostream &Output) const +{ + // TODO: implement +} + +// deserialize() subclass details, restores content of the subclass from provided stream +void road_node::deserialize_(std::istream &Input) +{ + // TODO: implement +} + +// export() subclass details, sends basic content of the class in legacy (text) format to provided stream +void road_node::export_as_text_(std::ostream &Output) const +{ + Output << "road "; + // axis + auto const precision{Output.precision(std::numeric_limits::digits10)}; + Output << m_axis.points[segment_data::point::start].x << ' ' << m_axis.points[segment_data::point::start].y << ' ' << m_axis.points[segment_data::point::start].z << ' ' << m_axis.rolls[0] << ' ' + << m_axis.points[segment_data::point::control1].x << ' ' << m_axis.points[segment_data::point::control1].y << ' ' << m_axis.points[segment_data::point::control1].z << ' ' + << m_axis.points[segment_data::point::control2].x << ' ' << m_axis.points[segment_data::point::control2].y << ' ' << m_axis.points[segment_data::point::control2].z << ' ' + << m_axis.points[segment_data::point::end].x << ' ' << m_axis.points[segment_data::point::end].y << ' ' << m_axis.points[segment_data::point::end].z << ' ' << m_axis.rolls[1] << ' ' + << m_axis.radius << ' '; + Output.precision(precision); + // lanes + Output << "lanes " << m_forward << ' ' << m_backward << ' ' << "width " << m_lanewidth << ' '; + if (m_velocity > 0.f) + { + Output << "velocity " << m_velocity << ' '; + } + for (std::size_t lane = 0; lane < m_lanes.size(); ++lane) + { + if (m_lanes[lane].width != m_lanewidth) + { + Output << "lane " << lane_id(lane) << " width " << m_lanes[lane].width << ' '; + } + if (m_lanes[lane].velocity != m_velocity) + { + Output << "lane " << lane_id(lane) << " velocity " << m_lanes[lane].velocity << ' '; + } + } + for (std::size_t boundary = 0; boundary < m_changes.size(); ++boundary) + { + if (m_changes[boundary] == default_change(boundary)) + { + continue; + } + Output << "change " << lane_id(boundary) << ' ' << lane_id(boundary + 1) << ' ' << (m_changes[boundary] == change_both ? "both" : m_changes[boundary] == change_toright ? "ab" : m_changes[boundary] == change_toleft ? "ba" : "none") << ' '; + } + // appearance + Output << "surface " << m_surface << ' ' << "texlength " << m_texturelength << ' '; + char const *sidenames[]{"left", "right"}; + for (int side = 0; side < 2; ++side) + { + auto const &data{m_sides[side]}; + if (data.type == side_type::none) + { + continue; + } + Output << "side " << sidenames[side] << ' ' << (data.type == side_type::shoulder ? "shoulder" : "sidewalk") << ' ' << data.width << ' ' << (data.material.empty() ? "none" : data.material) << ' '; + } + Output << "kerb " << m_kerbheight << ' ' << "slope " << m_slope.x << ' ' << m_slope.y << ' ' << "markings " << (m_markings == marking_colour::white ? "white" : m_markings == marking_colour::orange ? "orange" : "none") << ' '; + // properties passed on to the lanes + Output << "friction " << m_friction << ' ' << "environment " << m_environment << ' '; + // footer + Output << "endroad" + << "\n"; +} + +// legacy style initialization, to be performed when the tracks are already joined +void road_table::InitRoads() +{ + for (auto *road : m_items) + { + if (road != nullptr) + { + road->close_ends(); + } + } +} + +// generates geometry of the roads and inserts it in the region +void road_table::create_geometry(scene::scratch_data &Scratchpad) +{ + if (simulation::Region == nullptr) + { + return; + } + for (auto *road : m_items) + { + if (road == nullptr) + { + continue; + } + for (auto &shape : road->create_shapes()) + { + // the geometry is already where it belongs, so the placement set by the scenery isn't to be applied to it + simulation::Region->insert(shape, Scratchpad, false); + } + } +} + +//--------------------------------------------------------------------------- diff --git a/world/Road.h b/world/Road.h new file mode 100644 index 000000000..5d4184c1e --- /dev/null +++ b/world/Road.h @@ -0,0 +1,153 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include +#include + +#include + +#include "utilities/Classes.h" +#include "utilities/Names.h" +#include "scene/scenenode.h" +#include "world/Segment.h" + +namespace scene +{ +struct scratch_data; +} + +// a piece of a road for wheeled traffic: an axis, and a cross-section which stays the same along it. +// the node itself is neither driven on nor drawn. it produces the lanes, which are ordinary invisible one-way tracks, +// and the surface, the sides and the markings, which are ordinary shapes. this way the vehicles, the ai and the renderers +// deal with a road without knowing about it. +// scenery entry: +// node road [ ]... endroad +class road_node : public scene::basic_node +{ + + public: + // types + enum class side_type + { + none, + shoulder, // level with the surface, closed with a bank + sidewalk // raised on a kerb + }; + enum class marking_colour + { + none, + white, + orange + }; + // which of two neighbouring lanes can be left across the line they share; the lanes are taken left to right, facing along the axis + enum lane_change : int + { + change_none = 0, + change_toright = 1, // from the left lane to the right one + change_toleft = 2, // from the right lane to the left one + change_both = 3 + }; + struct lane_data + { + float width{3.5f}; + float velocity{-1.f}; // speed limit, none if negative + TTrack *track{nullptr}; // the generated path; owned by the path table, like every other track + }; + struct side_data + { + side_type type{side_type::none}; + float width{0.f}; + std::string material; + }; + // constructors + explicit road_node(scene::node_data const &Nodedata); + // methods + // restores content of the node from provided input stream; reads up to and including the closing 'endroad' + void import(cParser &Input, glm::dvec3 const &Offset); + // creates paths of the lanes and hands them over to the simulation + void create_lanes(); + // links lanes of opposite directions at an end of the road which leads nowhere, so the vehicles can turn back + void close_ends(); + // generates geometry of the surface, the sides and the markings + std::vector create_shapes() const; + // identifier of a lane: f1..fn go along the axis and b1..bn against it, both counted outwards from where the directions meet + std::string lane_id(std::size_t const Lane) const; + // distance of the middle of a lane from the axis, positive to the left when facing along the axis + double lane_offset(std::size_t const Lane) const; + // combined width of the lanes + double width() const; + // lanes, left to right when facing along the axis: the ones going against it, outermost first, then the ones going along it + std::vector const &lanes() const + { + return m_lanes; + } + // permissions to change the lane, one for each pair of neighbouring lanes + std::vector const &lane_changes() const + { + return m_changes; + } + segment_data const &axis() const + { + return m_axis; + } + + private: + // methods + // radius() subclass details, calculates node's bounding radius + float radius_() override; + // serialize() subclass details, sends content of the subclass to provided stream + void serialize_(std::ostream &Output) const override; + // deserialize() subclass details, restores content of the subclass from provided stream + void deserialize_(std::istream &Input) override; + // export() subclass details, sends basic content of the class in legacy (text) format to provided stream + void export_as_text_(std::ostream &Output) const override; + // number of a lane in the left to right order, -1 if the road has no lane with such identifier + int lane_index(std::string const &Id) const; + // permission to change the lane a pair of neighbouring lanes gets if the scenery doesn't say otherwise + int default_change(std::size_t const Boundary) const; + // shape of the middle of a lane, laid out in the direction of travel + segment_data lane_path(std::size_t const Lane) const; + // creates a path for the vehicles and registers it with the simulation + TTrack *create_track(std::string const &Name, segment_data const &Path, float const Width, float const Velocity); + // members + segment_data m_axis; + int m_forward{1}; // number of lanes going along the axis + int m_backward{1}; // number of lanes going against the axis + float m_lanewidth{3.5f}; + float m_velocity{-1.f}; + std::vector m_lanes; + std::vector m_changes; + std::string m_surface{"asphaltdark1"}; + float m_texturelength{4.f}; + std::array m_sides; // left, right + float m_kerbheight{0.12f}; + glm::vec2 m_slope{1.f, 0.4f}; // width and drop of the bank which closes a shoulder + marking_colour m_markings{marking_colour::white}; + float m_friction{0.85f}; + float m_sounddistance{25.f}; + int m_quality{15}; + std::string m_environment{"flat"}; + std::vector m_turns; // paths made to close loose ends of the road +}; + +// collection of roads present in the scene +class road_table : public basic_table +{ + + public: + // legacy style initialization, to be performed when the tracks are already joined + void InitRoads(); + // generates geometry of the roads and inserts it in the region + void create_geometry(scene::scratch_data &Scratchpad); +}; + +//--------------------------------------------------------------------------- diff --git a/world/Track.h b/world/Track.h index ea974cbd5..2fb9b0ce5 100644 --- a/world/Track.h +++ b/world/Track.h @@ -186,6 +186,7 @@ public: std::vector m_paths; // source data for owned paths bool m_editorremoved { false }; + road_node *m_road { nullptr }; // road which generated this path as one of its lanes. such path is one-way, and isn't saved nor edited on its own int iterate_stamp = 0; // sleepermodel optional parameter ------------------------------------------------- From e4083d507f7e7eeec20c327e9029a392eecb9d40 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Sat, 3 Oct 2026 18:21:10 +0200 Subject: [PATCH 078/430] feat(roads): editor menu and window for building roads, lanes shown as trajectories --- CMakeLists.txt | 2 + application/editormode.cpp | 50 +- application/editormode.h | 42 +- application/editormoderoad.cpp | 839 +++++++++++++++++++++++ application/editoruilayer.cpp | 3 + application/editoruilayer.h | 6 + editor/editorRoad.cpp | 564 +++++++++++++++ editor/editorRoad.hpp | 65 ++ scene/scenelayerssave.cpp | 72 ++ simulation/simulationstateserializer.cpp | 4 +- world/Road.cpp | 569 +++++++++------ world/Road.h | 127 ++-- 12 files changed, 2094 insertions(+), 249 deletions(-) create mode 100644 application/editormoderoad.cpp create mode 100644 editor/editorRoad.cpp create mode 100644 editor/editorRoad.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 58b3e4ca7..bdda3ea9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -172,11 +172,13 @@ set(SOURCES "editor/editorIncludeInfo.cpp" "editor/editorTerrain.cpp" "editor/editorTrack.cpp" +"editor/editorRoad.cpp" "editor/editorAlignment.cpp" "editor/editorTerrainStreamer.cpp" "editor/editorOrthophoto.cpp" "application/editormode.cpp" "application/editormodetrack.cpp" +"application/editormoderoad.cpp" "input/editormouseinput.cpp" "application/editoruilayer.cpp" "application/editoruipanels.cpp" diff --git a/application/editormode.cpp b/application/editormode.cpp index dd8bafa27..37a779dcf 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -340,6 +340,9 @@ editor_mode::editor_mode() { ui()->set_gizmo_options([this]() { render_gizmo_options(); }); ui()->set_file_actions([this]() { save(); }, [this]() { export_scenery(); }); ui()->set_track_options([this]() { render_track_ui(); }); + ui()->set_menu_options([this]() { render_road_menu(); }); + m_roadtool.settings.normalize(); + road_select(nullptr); // the orthophoto is fitted onto the same ground as the area fill uses, terrain tile models included m_orthophoto.ground_source([](glm::dvec2 const &Min, glm::dvec2 const &Max, std::vector &Out) { gather_ground_triangles(Min, Max, true, 50.0f, Out); @@ -687,6 +690,12 @@ void editor_mode::undo_last() return; } + if (snap.action == EditorSnapshot::Action::RoadEdit) + { + restore_road_snapshot(snap, g_redo, true); + return; + } + if (snap.action == EditorSnapshot::Action::Delete) { // undo delete -> recreate model @@ -782,6 +791,12 @@ void editor_mode::redo_last() return; } + if (snap.action == EditorSnapshot::Action::RoadEdit) + { + restore_road_snapshot(snap, m_history, false); + return; + } + // handle delete redo (re-delete) separately if (snap.action == EditorSnapshot::Action::Delete) { @@ -1023,6 +1038,11 @@ bool editor_mode::update() render_track_window(); } + // roads: trajectories of the lanes, and the tools of the road window + update_road_tool(); + draw_road_overlay(); + render_road_window(); + // --- area fill: outline overlay while the mode is active (its settings are drawn in the node bank window) --- if (ui()->mode() == nodebank_panel::FILL) draw_area_fill_outline(); @@ -2708,6 +2728,10 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in break; case GLFW_KEY_DELETE: + if (is_press(Action) && road_delete()) + { + break; + } if (is_press(Action) && m_instance != 0) { // include of a scenery template. what it shows goes out of sight, the directive is erased on save @@ -2751,6 +2775,10 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in break; case GLFW_KEY_ESCAPE: + if (is_press(Action)) + { + road_cancel(); + } if (is_press(Action) && ui()->mode() == nodebank_panel::TRACK) { m_track_point = {}; @@ -2769,6 +2797,10 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in break; case GLFW_KEY_K: + if (is_press(Action) && road_split()) + { + break; + } if (is_press(Action) && ui()->mode() == nodebank_panel::TRACK && selected_track() != nullptr) { auto *track{selected_track()}; @@ -2841,6 +2873,21 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const return; } + // with the road window open the left button works its tools, whichever edit mode is on + if (m_roadtool.window && Button == GLFW_MOUSE_BUTTON_LEFT) + { + if (is_press(Action)) + { + // NOTE: the pick is resolved a few frames later, by then it's known whether the press was meant for the UI + GfxRenderer->Pick_Node_Callback([this](scene::basic_node * /*node*/) { + if (viewport_click()) + road_click(); + }); + } + m_input.mouse.button(Button, Action); + return; + } + if (Button == GLFW_MOUSE_BUTTON_LEFT) { @@ -3053,7 +3100,8 @@ void editor_mode::render_change_history(){ s.action == EditorSnapshot::Action::Move ? "MOV" : s.action == EditorSnapshot::Action::Rotate ? "ROT" : s.action == EditorSnapshot::Action::Scale ? "SCA" : - s.action == EditorSnapshot::Action::TrackEdit ? "TRK" : "OTH", + s.action == EditorSnapshot::Action::TrackEdit ? "TRK" : + s.action == EditorSnapshot::Action::RoadEdit ? "ROAD" : "OTH", s.node_name.empty() ? "(noname)" : s.node_name.c_str(), s.position.x, s.position.y, s.position.z); diff --git a/application/editormode.h b/application/editormode.h index 262b1b1b9..f7cfff48e 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -21,6 +21,7 @@ http://mozilla.org/MPL/2.0/. #include "editor/editorOrthophoto.hpp" #include "editor/editorTrack.hpp" #include "editor/editorAlignment.hpp" +#include "editor/editorRoad.hpp" #include #include @@ -90,7 +91,7 @@ class editor_mode : public application_mode struct EditorSnapshot { - enum class Action { Move, Rotate, Scale, Add, Delete, TrackEdit, Other }; + enum class Action { Move, Rotate, Scale, Add, Delete, TrackEdit, Other, RoadEdit }; Action action{Action::Other}; std::string node_name; // node identifier (basic_node::name()) @@ -106,6 +107,9 @@ class editor_mode : public application_mode std::vector> tracks; std::vector created; std::vector removed; + std::vector> roads; // road pieces with what they were like before the change + std::vector roads_created; + std::vector roads_removed; }; void push_snapshot(scene::basic_node *node, EditorSnapshot::Action Action = EditorSnapshot::Action::Move, std::string const &Serialized = std::string()); @@ -481,4 +485,40 @@ class editor_mode : public application_mode float m_track_snap_radius{1.0f}; bool m_track_align_tangent{true}; bool m_track_drag_connected{true}; + + // roads: a menu and a window of their own, independent from the edit modes of the toolset + struct road_tool + { + bool window{false}; // the road window is open, the left mouse button belongs to its tools + bool lanes{true}; // lanes of the roads are drawn as trajectories + int tool{0}; // 0: select, 1: build + road_node *selected{nullptr}; + road_node::state settings; // layout shown in the window: of the selected piece, or of the pieces about to be built + bool whole{true}; // layout changes go to every piece of the road the selected one belongs to + bool chain{false}; // the point to build from is set + glm::dvec3 point{0.0}; // where the next piece starts + glm::dvec2 direction{0.0, 1.0}; // the way it has to leave that point + bool hasdirection{false}; + bool reversed{false}; // the pieces are laid from their ends, to carry on a road from its start + glm::dvec3 mouse{0.0}; + std::string status; + char surface[128]{}; + char sides[2][128]{}; + char filter[64]{"asph"}; + }; + void render_road_menu(); + void render_road_window(); + bool render_road_layout(road_node::state &State); + void draw_road_overlay() const; + void update_road_tool(); + void road_click(); + void road_select(road_node *Road); + void road_apply(); + bool road_delete(); + bool road_split(); + void road_cancel(); + std::vector road_preview(editor_road::loose_end &Snap, std::string &Error) const; + void push_road_snapshot(std::vector> States, std::vector Created, std::vector Removed); + void restore_road_snapshot(EditorSnapshot const &Snapshot, std::vector &Opposite, bool const Undo); + road_tool m_roadtool; }; diff --git a/application/editormoderoad.cpp b/application/editormoderoad.cpp new file mode 100644 index 000000000..27210dc2c --- /dev/null +++ b/application/editormoderoad.cpp @@ -0,0 +1,839 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "application/editormode.h" +#include "application/editoruilayer.h" + +#include "utilities/Globals.h" +#include "rendering/renderer.h" +#include "world/Track.h" +#include "world/Road.h" +#include "simulation/simulation.h" + +#include "imgui/imgui.h" +#include +#include +#include + +namespace +{ + +// the same helper the track tools use to draw over the viewport +class screen_projection +{ + public: + screen_projection() + { + ImGuiIO const &io = ImGui::GetIO(); + m_size = io.DisplaySize; + m_camera = GfxRenderer->Camera_Position(); + float const aspect = m_size.y > 0.0f ? m_size.x / m_size.y : 1.0f; + m_viewprojection = editor_mode::projection_matrix(aspect) * GfxRenderer->Camera_View_Matrix(); + } + + glm::vec4 clip(glm::dvec3 const &Point) const + { + return m_viewprojection * glm::vec4(glm::vec3(Point - m_camera), 1.0f); + } + ImVec2 screen(glm::vec4 const &Clip) const + { + return ImVec2((Clip.x / Clip.w * 0.5f + 0.5f) * m_size.x, (0.5f - Clip.y / Clip.w * 0.5f) * m_size.y); + } + bool project(glm::dvec3 const &Point, ImVec2 &Screen) const + { + auto const c = clip(Point); + if (c.w < kNear) + return false; + Screen = screen(c); + return true; + } + void line(ImDrawList *Drawlist, glm::dvec3 const &A, glm::dvec3 const &B, ImU32 const Color, float const Thickness) const + { + glm::vec4 a = clip(A); + glm::vec4 b = clip(B); + if (a.w < kNear && b.w < kNear) + return; + if (a.w < kNear) + a = glm::mix(a, b, (kNear - a.w) / (b.w - a.w)); + else if (b.w < kNear) + b = glm::mix(b, a, (kNear - b.w) / (a.w - b.w)); + Drawlist->AddLine(screen(a), screen(b), Color, Thickness); + } + + private: + static constexpr float kNear{0.1f}; + ImVec2 m_size; + glm::dvec3 m_camera; + glm::mat4 m_viewprojection; +}; + +glm::dvec3 path_point(segment_data const &Path, double const T) +{ + auto const &p0 = Path.points[segment_data::point::start]; + auto const &p3 = Path.points[segment_data::point::end]; + auto const &cp1 = Path.points[segment_data::point::control1]; + auto const &cp2 = Path.points[segment_data::point::control2]; + if (cp1 == glm::dvec3{0.0} && cp2 == glm::dvec3{0.0}) + return glm::mix(p0, p3, T); + auto const p1 = p0 + cp1; + auto const p2 = p3 + cp2; + double const u = 1.0 - T; + return u * u * u * p0 + 3.0 * u * u * T * p1 + 3.0 * u * T * T * p2 + T * T * T * p3; +} + +bool is_curved(segment_data const &Path) +{ + return Path.points[segment_data::point::control1] != glm::dvec3{0.0} || Path.points[segment_data::point::control2] != glm::dvec3{0.0}; +} + +void copy_text(char *Buffer, std::size_t const Size, std::string const &Text) +{ + std::strncpy(Buffer, Text.c_str(), Size - 1); + Buffer[Size - 1] = 0; +} + +std::string lower_case(std::string Text) +{ + std::transform(Text.begin(), Text.end(), Text.begin(), [](unsigned char c) { return static_cast(std::tolower(c)); }); + return Text; +} + +double const kSnapRadius{4.0}; // an end of a road this close to the cursor is what the click is taken to mean +double const kReach{3000.0}; // clicks landing further than this are taken for misses +double const kLaneRange{600.0}; // lanes are drawn for the roads this close to the camera + +ImU32 const kForwardColor{IM_COL32(70, 230, 110, 230)}; +ImU32 const kBackwardColor{IM_COL32(255, 170, 50, 230)}; +ImU32 const kTurnColor{IM_COL32(210, 210, 210, 150)}; +ImU32 const kSelectedColor{IM_COL32(40, 220, 255, 230)}; +ImU32 const kPreviewColor{IM_COL32(255, 210, 60, 255)}; +ImU32 const kRefusedColor{IM_COL32(240, 60, 60, 255)}; +ImU32 const kSnapColor{IM_COL32(255, 60, 255, 255)}; + +} + +void editor_mode::render_road_menu() +{ + if (ImGui::BeginMenu("Roads")) + { + ImGui::MenuItem("Road editor", nullptr, &m_roadtool.window); + ImGui::MenuItem("Show lanes", nullptr, &m_roadtool.lanes); + ImGui::EndMenu(); + } +} + +void editor_mode::update_road_tool() +{ + auto &tool{m_roadtool}; + if (tool.selected != nullptr && tool.selected->m_editorremoved) + tool.selected = nullptr; + if (false == tool.window) + { + tool.chain = false; + return; + } + tool.mouse = Global.pCamera.Pos + GfxRenderer->Mouse_Position(); +} + +void editor_mode::road_select(road_node *Road) +{ + auto &tool{m_roadtool}; + tool.selected = Road; + if (Road != nullptr) + { + tool.settings = Road->definition(); + std::string reason; + tool.status = "Selected: " + (Road->name().empty() ? std::string{"(unnamed road)"} : Road->name()); + if (false == editor_road::can_edit(*Road, &reason)) + tool.status += ". It can't be changed: " + reason; + } + copy_text(tool.surface, sizeof(tool.surface), tool.settings.surface); + for (int side = 0; side < 2; ++side) + copy_text(tool.sides[side], sizeof(tool.sides[side]), tool.settings.sides[side].material); +} + +void editor_mode::road_cancel() +{ + m_roadtool.chain = false; +} + +std::vector editor_mode::road_preview(editor_road::loose_end &Snap, std::string &Error) const +{ + auto const &tool{m_roadtool}; + Snap = editor_road::find_end(tool.mouse, kSnapRadius); + // the end the road is being drawn from isn't somewhere to lead it to + if (Snap.road != nullptr && glm::distance(Snap.position, tool.point) < 0.5) + Snap = {}; + glm::dvec2 enddirection{0.0, 1.0}; + if (Snap.road != nullptr) + { + glm::dvec2 const outwards{Snap.outwards.x, Snap.outwards.z}; + if (glm::length(outwards) > 1e-6) + enddirection = -glm::normalize(outwards); + else + Snap = {}; + } + return editor_road::plan(tool.point, tool.hasdirection ? &tool.direction : nullptr, Snap.road != nullptr ? Snap.position : tool.mouse, Snap.road != nullptr ? &enddirection : nullptr, Global.ctrlState, Error); +} + +void editor_mode::road_click() +{ + auto &tool{m_roadtool}; + glm::dvec3 const camera{Global.pCamera.Pos}; + glm::dvec3 const ground{camera + GfxRenderer->Mouse_Position()}; + if (glm::distance(ground, camera) > kReach) + { + tool.status = "The click didn't land on anything near enough"; + return; + } + tool.mouse = ground; + if (tool.tool == 0) + { + auto *road{editor_road::nearest(ground, 1.5)}; + if (road == nullptr) + tool.status = "No road here"; + road_select(road); + return; + } + + std::string reason; + if (false == editor_road::available(&reason)) + { + tool.status = reason; + return; + } + if (false == tool.chain) + { + // first click sets where the road starts. started from a loose end of a road it carries that road on + auto const end{editor_road::find_end(ground, kSnapRadius)}; + glm::dvec2 const outwards{end.outwards.x, end.outwards.z}; + if (end.road != nullptr && glm::length(outwards) > 1e-6) + { + tool.point = end.position; + tool.direction = glm::normalize(outwards); + tool.hasdirection = true; + // carried on from its start the road keeps the direction of its axis, so the lanes stay what they were + tool.reversed = (false == end.atend); + auto const layout{end.road->definition()}; + tool.selected = nullptr; + tool.settings = layout; + road_select(nullptr); + tool.status = "Carrying on \"" + end.road->name() + "\" with its layout"; + } + else + { + tool.point = ground; + tool.hasdirection = false; + tool.reversed = false; + tool.selected = nullptr; + tool.status = "Start set"; + } + tool.chain = true; + return; + } + + editor_road::loose_end snap; + std::string error; + auto pieces{road_preview(snap, error)}; + if (pieces.empty()) + { + tool.status = "Can't build this: " + error; + return; + } + // where the next piece is going to carry on from + auto const &last{pieces.back()}; + auto const endpoint{last.points[segment_data::point::end]}; + auto const tangent{last.points[segment_data::point::control2] != glm::dvec3{0.0} ? -last.points[segment_data::point::control2] : last.points[segment_data::point::end] - last.points[segment_data::point::start]}; + if (tool.reversed) + { + for (auto &piece : pieces) + { + std::swap(piece.points[segment_data::point::start], piece.points[segment_data::point::end]); + std::swap(piece.points[segment_data::point::control1], piece.points[segment_data::point::control2]); + } + std::reverse(pieces.begin(), pieces.end()); + } + std::vector states; + for (auto const &piece : pieces) + { + auto state{tool.settings}; + state.axis = piece; + states.emplace_back(state); + } + auto const created{editor_road::create(states)}; + if (created.empty()) + { + tool.status = "The road wasn't created"; + return; + } + push_road_snapshot({}, created, {}); + if (snap.road != nullptr) + { + tool.chain = false; + tool.status = "Joined with \"" + snap.road->name() + "\""; + return; + } + glm::dvec2 const planar{tangent.x, tangent.z}; + tool.point = endpoint; + if (glm::length(planar) > 1e-6) + { + tool.direction = glm::normalize(planar); + tool.hasdirection = true; + } + tool.status = std::to_string(created.size()) + (created.size() == 1 ? " piece added" : " pieces added"); +} + +void editor_mode::road_apply() +{ + auto &tool{m_roadtool}; + if (tool.selected == nullptr) + return; + tool.settings.normalize(); + auto const pieces{tool.whole ? editor_road::chain(*tool.selected) : std::vector{tool.selected}}; + std::vector> before; + std::vector> changes; + for (auto *road : pieces) + { + std::string reason; + if (false == editor_road::can_edit(*road, &reason)) + { + tool.status = "\"" + road->name() + "\" can't be changed: " + reason; + // what the window shows goes back to what the road is like + road_select(tool.selected); + tool.status = "\"" + road->name() + "\" can't be changed: " + reason; + return; + } + auto state{tool.settings}; + state.axis = road->definition().axis; + if (road != tool.selected && road->definition().changes.size() == state.changes.size()) + { + // where the lanes can be changed is set for each piece on its own + state.changes = road->definition().changes; + } + before.emplace_back(road, road->definition()); + changes.emplace_back(road, state); + } + editor_road::apply(changes); + push_road_snapshot(before, {}, {}); + tool.settings = tool.selected->definition(); + tool.status = (pieces.size() == 1 ? std::string{"Changed"} : "Changed " + std::to_string(pieces.size()) + " pieces"); +} + +bool editor_mode::road_delete() +{ + auto &tool{m_roadtool}; + if (false == tool.window || tool.selected == nullptr) + return false; + auto *road{tool.selected}; + std::string reason; + if (false == editor_road::can_edit(*road, &reason)) + { + tool.status = "Can't delete: " + reason; + return true; + } + editor_road::remove({road}); + push_road_snapshot({}, {}, {road}); + tool.selected = nullptr; + tool.status = "\"" + road->name() + "\" deleted, Ctrl+Z brings it back"; + return true; +} + +bool editor_mode::road_split() +{ + auto &tool{m_roadtool}; + if (false == tool.window || tool.selected == nullptr) + return false; + auto *road{tool.selected}; + std::string reason; + if (false == editor_road::can_edit(*road, &reason)) + { + tool.status = "Can't split: " + reason; + return true; + } + auto const before{road->definition()}; + auto *created{editor_road::split(*road, editor_road::nearest_parameter(before, tool.mouse))}; + if (created == nullptr) + { + tool.status = "Can't split this close to the end"; + return true; + } + push_road_snapshot({{road, before}}, {created}, {}); + road_select(road); + tool.status = "Split in two: \"" + road->name() + "\" and \"" + created->name() + "\""; + return true; +} + +void editor_mode::push_road_snapshot(std::vector> States, std::vector Created, std::vector Removed) +{ + if (States.empty() && Created.empty() && Removed.empty()) + return; + + if (m_max_history_size >= 0 && (int)m_history.size() >= m_max_history_size) + m_history.erase(m_history.begin(), m_history.begin() + ((int)m_history.size() - m_max_history_size + 1)); + + auto const *road = false == States.empty() ? States.front().first : false == Created.empty() ? Created.front() : Removed.front(); + EditorSnapshot snap; + snap.action = EditorSnapshot::Action::RoadEdit; + snap.node_name = road->name(); + snap.position = road->location(); + snap.roads = std::move(States); + snap.roads_created = std::move(Created); + snap.roads_removed = std::move(Removed); + m_history.push_back(std::move(snap)); + g_redo.clear(); +} + +void editor_mode::restore_road_snapshot(EditorSnapshot const &Snapshot, std::vector &Opposite, bool const Undo) +{ + if (Snapshot.roads.empty() && Snapshot.roads_created.empty() && Snapshot.roads_removed.empty()) + return; + + // what the roads are like now is what the opposite operation brings back + EditorSnapshot current{Snapshot}; + current.roads.clear(); + for (auto const &entry : Snapshot.roads) + current.roads.emplace_back(entry.first, entry.first->definition()); + Opposite.push_back(std::move(current)); + + if (Undo) + { + editor_road::remove(Snapshot.roads_created); + editor_road::revive(Snapshot.roads_removed); + } + else + { + editor_road::revive(Snapshot.roads_created); + editor_road::remove(Snapshot.roads_removed); + } + editor_road::apply(Snapshot.roads); + + auto &tool{m_roadtool}; + tool.chain = false; + if (tool.selected != nullptr) + road_select(tool.selected->m_editorremoved ? nullptr : tool.selected); +} + +// draws controls for the layout of a road. returns: true if the layout was changed in a way which calls for the road to be made anew +bool editor_mode::render_road_layout(road_node::state &State) +{ + auto &tool{m_roadtool}; + bool changed{false}; + // typed values are taken when confirmed, so the road isn't made anew with each digit + auto const number = [](char const *Label, float &Value, float const Step, char const *Format) { + ImGui::SetNextItemWidth(120.0f); + return ImGui::InputFloat(Label, &Value, Step, Step * 4.0f, Format, ImGuiInputTextFlags_EnterReturnsTrue); + }; + auto const material = [&tool](char const *Label, char *Buffer, std::size_t const Size, std::string &Value) { + bool picked{false}; + ImGui::PushID(Label); + ImGui::SetNextItemWidth(200.0f); + if (ImGui::InputText("##name", Buffer, Size, ImGuiInputTextFlags_EnterReturnsTrue) || ImGui::IsItemDeactivatedAfterEdit()) + { + auto const name{lower_case(Buffer)}; + if (name != Value && name.find(' ') == std::string::npos) + { + Value = name.empty() ? std::string{"none"} : name; + picked = true; + } + copy_text(Buffer, Size, Value); + } + ImGui::SameLine(); + if (ImGui::Button("...")) + ImGui::OpenPopup("pick"); + ImGui::SameLine(); + ImGui::TextUnformatted(Label); + if (ImGui::BeginPopup("pick")) + { + ImGui::TextDisabled("Materials and images found in the texture folder"); + ImGui::SetNextItemWidth(200.0f); + ImGui::InputText("Filter", tool.filter, sizeof(tool.filter)); + auto const filter{lower_case(tool.filter)}; + std::vector listed; + for (auto const &name : editor_road::materials()) + if (filter.empty() || name.find(filter) != std::string::npos) + listed.emplace_back(&name); + ImGui::BeginChild("list", ImVec2(340.0f, 280.0f), true); + ImGuiListClipper clipper(static_cast(listed.size())); + while (clipper.Step()) + { + for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; ++i) + { + if (ImGui::Selectable(listed[i]->c_str(), *listed[i] == Value)) + { + Value = *listed[i]; + copy_text(Buffer, Size, Value); + picked = true; + ImGui::CloseCurrentPopup(); + } + } + } + ImGui::EndChild(); + ImGui::EndPopup(); + } + ImGui::PopID(); + return picked; + }; + + // lanes + ImGui::SetNextItemWidth(120.0f); + if (ImGui::InputInt("Lanes along the axis", &State.forward)) + changed = true; + ImGui::SetNextItemWidth(120.0f); + if (ImGui::InputInt("Lanes against the axis", &State.backward)) + changed = true; + if (changed) + { + // a different set of lanes starts with the common width and speed limit, and the default rules for changing lanes + State.lanes.clear(); + State.changes.clear(); + State.normalize(); + } + if (number("Lane width [m]", State.lanewidth, 0.25f, "%.2f")) + { + State.lanewidth = std::clamp(State.lanewidth, 1.0f, 10.0f); + for (auto &lane : State.lanes) + lane.width = State.lanewidth; + changed = true; + } + float limit{State.velocity > 0.0f ? State.velocity : 0.0f}; + if (number("Speed limit [km/h], 0: none", limit, 10.0f, "%.0f")) + { + State.velocity = (limit > 0.0f ? limit : -1.0f); + for (auto &lane : State.lanes) + lane.velocity = State.velocity; + changed = true; + } + + // appearance + ImGui::Separator(); + char const *colours[]{"none", "white", "orange"}; + int colour{State.markings == road_node::marking_colour::white ? 1 : State.markings == road_node::marking_colour::orange ? 2 : 0}; + ImGui::SetNextItemWidth(120.0f); + if (ImGui::Combo("Markings", &colour, colours, 3)) + { + State.markings = (colour == 1 ? road_node::marking_colour::white : colour == 2 ? road_node::marking_colour::orange : road_node::marking_colour::none); + changed = true; + } + if (material("Surface", tool.surface, sizeof(tool.surface), State.surface)) + changed = true; + if (number("Texture length [m]", State.texturelength, 0.5f, "%.2f")) + { + State.texturelength = std::max(0.1f, State.texturelength); + changed = true; + } + char const *sidenames[]{"Left side", "Right side"}; + char const *sidetypes[]{"none", "shoulder", "sidewalk"}; + for (int side = 0; side < 2; ++side) + { + ImGui::PushID(side); + auto &data{State.sides[side]}; + int type{data.type == road_node::side_type::shoulder ? 1 : data.type == road_node::side_type::sidewalk ? 2 : 0}; + ImGui::SetNextItemWidth(120.0f); + if (ImGui::Combo(sidenames[side], &type, sidetypes, 3)) + { + data.type = (type == 1 ? road_node::side_type::shoulder : type == 2 ? road_node::side_type::sidewalk : road_node::side_type::none); + if (data.type != road_node::side_type::none && data.width <= 0.0f) + data.width = 1.5f; + changed = true; + } + if (data.type != road_node::side_type::none) + { + ImGui::Indent(); + if (number("Width [m]", data.width, 0.25f, "%.2f")) + { + data.width = std::clamp(data.width, 0.1f, 20.0f); + changed = true; + } + if (material("Material", tool.sides[side], sizeof(tool.sides[side]), data.material)) + changed = true; + if (data.material.empty() || data.material == "none") + ImGui::TextDisabled("Pick a material to have the side drawn"); + ImGui::Unindent(); + } + ImGui::PopID(); + } + if (State.sides[0].type == road_node::side_type::sidewalk || State.sides[1].type == road_node::side_type::sidewalk) + { + if (number("Kerb height [m]", State.kerbheight, 0.01f, "%.2f")) + { + State.kerbheight = std::clamp(State.kerbheight, 0.0f, 1.0f); + changed = true; + } + } + if (State.sides[0].type == road_node::side_type::shoulder || State.sides[1].type == road_node::side_type::shoulder) + { + if (number("Bank width [m]", State.slope.x, 0.25f, "%.2f")) + { + State.slope.x = std::clamp(State.slope.x, 0.0f, 20.0f); + changed = true; + } + if (number("Bank drop [m]", State.slope.y, 0.1f, "%.2f")) + { + State.slope.y = std::clamp(State.slope.y, 0.0f, 20.0f); + changed = true; + } + } + + // single lanes, and the rules for changing between them + if (ImGui::CollapsingHeader("Lanes and lane changes", ImGuiTreeNodeFlags_DefaultOpen)) + { + ImGui::TextDisabled("Left to right when facing along the axis. f: along the axis, b: against it"); + for (std::size_t lane = 0; lane < State.lanes.size(); ++lane) + { + ImGui::PushID(static_cast(lane)); + auto &data{State.lanes[lane]}; + auto const id{State.lane_id(lane)}; + ImGui::TextColored(lane >= static_cast(State.backward) ? ImVec4(0.3f, 0.9f, 0.45f, 1.0f) : ImVec4(1.0f, 0.67f, 0.2f, 1.0f), "%-3s", id.c_str()); + ImGui::SameLine(); + if (number("m##width", data.width, 0.25f, "%.2f")) + { + data.width = std::clamp(data.width, 1.0f, 10.0f); + changed = true; + } + ImGui::SameLine(); + float lanelimit{data.velocity > 0.0f ? data.velocity : 0.0f}; + if (number("km/h##velocity", lanelimit, 10.0f, "%.0f")) + { + data.velocity = (lanelimit > 0.0f ? lanelimit : -1.0f); + changed = true; + } + if (lane + 1 < State.lanes.size() && lane < State.changes.size()) + { + // the entries are in the order of the stored values: none, to the right, to the left, both + auto const next{State.lane_id(lane + 1)}; + auto const toright{"only " + id + " to " + next}; + auto const toleft{"only " + next + " to " + id}; + char const *modes[]{"no lane change", toright.c_str(), toleft.c_str(), "lane change both ways"}; + ImGui::Indent(); + ImGui::SetNextItemWidth(200.0f); + if (ImGui::Combo("##change", &State.changes[lane], modes, 4)) + changed = true; + ImGui::Unindent(); + } + ImGui::PopID(); + } + } + return changed; +} + +void editor_mode::render_road_window() +{ + auto &tool{m_roadtool}; + if (false == tool.window) + return; + ImGui::SetNextWindowSize(ImVec2(440.0f, 620.0f), ImGuiCond_FirstUseEver); + if (false == ImGui::Begin("Roads###roadeditor", &tool.window)) + { + ImGui::End(); + return; + } + std::string reason; + if (false == editor_road::available(&reason)) + ImGui::TextColored(ImVec4(1.0f, 0.4f, 0.4f, 1.0f), "%s", reason.c_str()); + + auto const previoustool{tool.tool}; + ImGui::RadioButton("Select", &tool.tool, 0); + ImGui::SameLine(); + ImGui::RadioButton("Build", &tool.tool, 1); + if (tool.tool != previoustool) + { + tool.chain = false; + if (tool.tool == 1) + tool.selected = nullptr; + } + ImGui::SameLine(); + ImGui::Checkbox("Show lanes", &tool.lanes); + + if (tool.tool == 1) + { + ImGui::TextDisabled("LMB: start, then each next point. Ctrl: straight ahead. Esc: finish"); + ImGui::TextDisabled("Start or end on a loose end of a road to join it"); + if (tool.chain) + { + if (ImGui::Button("Finish (Esc)")) + tool.chain = false; + } + ImGui::Separator(); + // what's set here is what the next pieces get + render_road_layout(tool.settings); + } + else if (tool.selected != nullptr) + { + auto const &road{*tool.selected}; + ImGui::Text("%s, %.1f m, %d + %d lanes", road.name().c_str(), road.definition().length(), road.definition().forward, road.definition().backward); + if (ImGui::Button("Delete (Del)")) + road_delete(); + ImGui::SameLine(); + ImGui::TextDisabled("K: split at the cursor"); + ImGui::Checkbox("Changes go to the whole road", &tool.whole); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "A road is a string of pieces. With this on a change of the layout is made to all of them,\nexcept for the lane change rules, which are always set for the selected piece alone.\nSplit a piece (K) to get a zone with rules of its own."); + ImGui::Separator(); + if (tool.selected != nullptr && render_road_layout(tool.settings)) + road_apply(); + } + else + { + ImGui::TextDisabled("LMB: select a road piece"); + } + if (false == tool.status.empty()) + { + ImGui::Separator(); + ImGui::TextWrapped("%s", tool.status.c_str()); + } + ImGui::End(); +} + +void editor_mode::draw_road_overlay() const +{ + auto const &tool{m_roadtool}; + if (false == tool.lanes && false == tool.window) + return; + + screen_projection const projection; + ImDrawList *drawlist = ImGui::GetBackgroundDrawList(); + glm::dvec3 const camera{Global.pCamera.Pos}; + auto const drawpath = [&](segment_data const &Path, ImU32 const Color, float const Thickness, int const Samples) { + auto previous{path_point(Path, 0.0)}; + for (int i = 1; i <= Samples; ++i) + { + auto const next{path_point(Path, static_cast(i) / Samples)}; + projection.line(drawlist, previous, next, Color, Thickness); + previous = next; + } + }; + + // lanes, as the vehicles see them: a line for each, with an arrow pointing where the traffic goes + if (tool.lanes) + { + for (auto const *road : simulation::Roads.sequence()) + { + if (road == nullptr || road->m_editorremoved) + continue; + auto const range{glm::distance(road->location(), camera)}; + if (range > kLaneRange + 0.5 * road->definition().length()) + continue; + auto const samples{is_curved(road->definition().axis) ? (range < 150.0 ? 12 : 6) : 1}; + auto const against{static_cast(road->definition().backward)}; + auto const &tracks{road->tracks()}; + for (std::size_t lane = 0; lane < tracks.size(); ++lane) + { + if (tracks[lane] == nullptr || tracks[lane]->m_paths.empty()) + continue; + auto const &path{tracks[lane]->m_paths.front()}; + auto const color{lane >= against ? kForwardColor : kBackwardColor}; + drawpath(path, color, 2.0f, samples); + if (range > 300.0) + continue; + auto const middle{path_point(path, 0.5)}; + auto direction{path_point(path, 0.52) - middle}; + if (glm::length(direction) < 1e-6) + continue; + direction = glm::normalize(direction); + glm::dvec3 const across{direction.z, 0.0, -direction.x}; + auto const tip{middle + direction * 1.2}; + projection.line(drawlist, tip, middle - direction * 0.6 + across * 0.6, color, 2.0f); + projection.line(drawlist, tip, middle - direction * 0.6 - across * 0.6, color, 2.0f); + } + for (auto const *turn : road->turns()) + { + if (turn != nullptr && false == turn->m_paths.empty()) + drawpath(turn->m_paths.front(), kTurnColor, 1.5f, 8); + } + } + } + if (false == tool.window) + return; + + // outline of a road piece: its axis and the edges of its surface + auto const drawroad = [&](road_node::state const &State, ImU32 const Color) { + auto const samples{is_curved(State.axis) ? 12 : 1}; + auto const halfwidth{0.5 * State.width()}; + drawpath(State.axis, Color, 3.0f, samples); + glm::dvec3 previous[2]; + for (int i = 0; i <= samples; ++i) + { + auto const t{static_cast(i) / samples}; + auto const position{path_point(State.axis, t)}; + auto const tangent{State.tangent(t)}; + glm::dvec3 across{tangent.z, 0.0, -tangent.x}; + if (glm::length(across) > 1e-6) + across = glm::normalize(across); + glm::dvec3 const edges[2]{position + across * halfwidth, position - across * halfwidth}; + if (i > 0) + { + projection.line(drawlist, previous[0], edges[0], Color, 1.5f); + projection.line(drawlist, previous[1], edges[1], Color, 1.5f); + } + previous[0] = edges[0]; + previous[1] = edges[1]; + } + }; + auto const drawpoint = [&](glm::dvec3 const &Point, ImU32 const Color, float const Radius, bool const Filled) { + ImVec2 screen; + if (false == projection.project(Point, screen)) + return; + if (Filled) + drawlist->AddCircleFilled(screen, Radius, Color); + else + drawlist->AddCircle(screen, Radius, Color, 20, 3.0f); + }; + + if (tool.selected != nullptr && false == tool.selected->m_editorremoved) + { + auto const &state{tool.selected->definition()}; + drawroad(state, kSelectedColor); + drawpoint(state.axis.points[segment_data::point::start], kSelectedColor, 6.0f, true); + drawpoint(state.axis.points[segment_data::point::end], kSelectedColor, 6.0f, true); + } + + std::string hint; + if (tool.tool == 1) + { + if (tool.chain) + { + editor_road::loose_end snap; + std::string error; + auto const pieces{road_preview(snap, error)}; + drawpoint(tool.point, kPreviewColor, 6.0f, true); + if (pieces.empty()) + { + projection.line(drawlist, tool.point, tool.mouse, kRefusedColor, 2.0f); + hint = error + " "; + } + for (auto const &piece : pieces) + { + auto state{tool.settings}; + state.axis = piece; + drawroad(state, kPreviewColor); + } + if (snap.road != nullptr) + drawpoint(snap.position, kSnapColor, 14.0f, false); + hint += "LMB: build up to the cursor Ctrl: straight ahead Esc: finish Ctrl+Z: undo the last piece"; + } + else + { + auto const end{editor_road::find_end(tool.mouse, kSnapRadius)}; + if (end.road != nullptr) + drawpoint(end.position, kSnapColor, 14.0f, false); + hint = "LMB: set where the road starts; on a loose end of a road (ring) to carry it on"; + } + } + else + { + hint = tool.selected != nullptr ? "LMB: select a road piece K: split at the cursor Del: delete Ctrl+Z: undo" : "LMB: select a road piece"; + } + // shown above the place the track tools put their hints at + ImGuiIO const &io = ImGui::GetIO(); + ImVec2 const position{12.0f, io.DisplaySize.y - 56.0f}; + auto const size{ImGui::CalcTextSize(hint.c_str())}; + drawlist->AddRectFilled(ImVec2(position.x - 6.0f, position.y - 4.0f), ImVec2(position.x + size.x + 6.0f, position.y + size.y + 4.0f), IM_COL32(0, 0, 0, 150), 4.0f); + drawlist->AddText(position, IM_COL32(255, 255, 255, 230), hint.c_str()); +} diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index aaef57837..f0c5d6c28 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -143,6 +143,9 @@ void editor_ui::render_menu_contents() ImGui::MenuItem(STR_C("Include database"), nullptr, &m_includespanel.is_open); ImGui::EndMenu(); } + + if (m_menuoptions) + m_menuoptions(); } void editor_ui::set_file_actions(std::function Save, std::function Export) diff --git a/application/editoruilayer.h b/application/editoruilayer.h index f4b3c9712..31cfc5309 100644 --- a/application/editoruilayer.h +++ b/application/editoruilayer.h @@ -54,6 +54,11 @@ class editor_ui : public ui_layer { m_trackoptions = std::move(Renderer); } + // draws menus of the editor mode in the menu bar, past the ones of the user interface + void set_menu_options(std::function Renderer) + { + m_menuoptions = std::move(Renderer); + } // draws the gizmo settings in the toolset window (the gizmo state lives in the editor mode) void set_gizmo_options(std::function Renderer) { @@ -82,6 +87,7 @@ class editor_ui : public ui_layer model_set_ref m_insertset; std::function m_filloptions; std::function m_trackoptions; + std::function m_menuoptions; std::function m_gizmooptions; scene::basic_node *m_node{nullptr}; // currently bound scene node, if any }; diff --git a/editor/editorRoad.cpp b/editor/editorRoad.cpp new file mode 100644 index 000000000..bb2039b29 --- /dev/null +++ b/editor/editorRoad.cpp @@ -0,0 +1,564 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "editor/editorRoad.hpp" + +#include "editor/editorTrack.hpp" +#include "world/Track.h" +#include "scene/scene.h" +#include "scene/scenelayers.h" +#include "simulation/simulation.h" +#include "utilities/Globals.h" +#include "utilities/utilities.h" + +#include +#include +#include +#include + +namespace +{ + +double const kSamePoint{0.25}; // ends of two pieces this close are taken for joined +double const kPieceLength{50.0}; // longest piece the planner makes +double const kPieceTurn{glm::radians(30.0)}; // largest turn of a single piece +double const kShortestRoad{2.0}; +double const kTightestRadius{6.0}; + +void add_unique(std::vector &Roads, road_node *Road) +{ + if (Road != nullptr && std::find(Roads.begin(), Roads.end(), Road) == Roads.end()) + Roads.emplace_back(Road); +} + +glm::dvec3 axis_end(road_node::state const &State, bool const Atend) +{ + return State.axis.points[Atend ? segment_data::point::end : segment_data::point::start]; +} + +// roads other than the specified one, with an end at specified point +std::vector roads_at(glm::dvec3 const &Point, road_node const *Exclude) +{ + std::vector result; + for (auto *road : simulation::Roads.sequence()) + { + if (road == nullptr || road == Exclude || road->m_editorremoved) + continue; + for (auto const atend : {false, true}) + { + if (glm::distance(axis_end(road->definition(), atend), Point) < kSamePoint) + { + result.emplace_back(road); + break; + } + } + } + return result; +} + +void retire(std::vector const &Tracks) +{ + for (auto *track : Tracks) + if (track != nullptr) + editor_track::retire(*track); +} + +// smallest radius of the bend made by a bezier curve, seen from above; 0 if the curve is practically straight +double tightest_radius(segment_data const &Path) +{ + auto const &p0{Path.points[segment_data::point::start]}; + auto const &p3{Path.points[segment_data::point::end]}; + auto const p1{p0 + Path.points[segment_data::point::control1]}; + auto const p2{p3 + Path.points[segment_data::point::control2]}; + double curvature{0.0}; + for (int i = 0; i <= 16; ++i) + { + auto const t{i / 16.0}; + auto const u{1.0 - t}; + auto const first{3.0 * u * u * (p1 - p0) + 6.0 * u * t * (p2 - p1) + 3.0 * t * t * (p3 - p2)}; + auto const second{6.0 * u * (p2 - 2.0 * p1 + p0) + 6.0 * t * (p3 - 2.0 * p2 + p1)}; + auto const speedsquared{first.x * first.x + first.z * first.z}; + if (speedsquared < 1e-9) + continue; + curvature = std::max(curvature, std::abs(second.x * first.z - second.z * first.x) / (speedsquared * std::sqrt(speedsquared))); + } + return curvature > 1e-5 ? 1.0 / curvature : 0.0; +} + +} + +bool editor_road::available(std::string *Reason) +{ + if (Global.NvRenderer) + { + if (Reason != nullptr) + *Reason = "Geometry of the roads can't be rebuilt with the experimental renderer"; + return false; + } + if (simulation::Region == nullptr) + { + if (Reason != nullptr) + *Reason = "No scenery is loaded"; + return false; + } + return true; +} + +bool editor_road::can_edit(road_node const &Road, std::string *Reason) +{ + std::string reason; + if (false == available(&reason)) + { + // reason was filled by the call + } + else if (Road.merged()) + { + reason = "the scenery wasn't opened for editing (-edit), geometry of the roads it came with can't be taken apart"; + } + else if (false == scene::Layers.editable(&Road, &reason)) + { + // reason was filled by the call + } + else if (Road.occupied()) + { + reason = "there are vehicles on it"; + } + else + { + // the paths made to turn the vehicles back at the loose ends of the neighbours go away too + for (auto const *neighbour : neighbours(Road)) + for (auto const *turn : neighbour->turns()) + if (turn != nullptr && false == turn->Dynamics.empty()) + reason = "there are vehicles turning back next to it"; + } + if (false == reason.empty() && Reason != nullptr) + *Reason = reason; + return reason.empty(); +} + +std::vector editor_road::neighbours(road_node const &Road) +{ + std::vector result; + if (Road.m_editorremoved) + return result; + for (auto const atend : {false, true}) + for (auto *road : roads_at(axis_end(Road.definition(), atend), &Road)) + add_unique(result, road); + return result; +} + +template +void editor_road::refresh(std::vector const &Roads, Change_ Change) +{ + // the pieces next to the changed ones keep their shape, but what they're joined with changes + std::vector affected; + for (auto *road : Roads) + { + add_unique(affected, road); + for (auto *neighbour : neighbours(*road)) + add_unique(affected, neighbour); + } + for (auto *road : affected) + retire(road->release_turns()); + for (auto *road : Roads) + { + road->hide(); + retire(road->release_lanes()); + } + + Change(); + + // the change could have moved the pieces next to other ones + for (auto *road : Roads) + { + for (auto *neighbour : neighbours(*road)) + { + if (std::find(affected.begin(), affected.end(), neighbour) == affected.end()) + { + retire(neighbour->release_turns()); + affected.emplace_back(neighbour); + } + } + } + std::vector lanes; + for (auto *road : Roads) + { + if (road->m_editorremoved) + continue; + road->create_lanes(); + road->show(); + lanes.insert(lanes.end(), road->tracks().begin(), road->tracks().end()); + } + // joins the lanes with the lanes of the neighbours, by the ends they share + editor_track::commit(lanes); + for (auto *road : affected) + if (false == road->m_editorremoved) + road->close_ends(); +} + +std::vector editor_road::create(std::vector const &States) +{ + static int counter{0}; + std::vector created; + if (false == available()) + return created; + for (auto const &state : States) + { + scene::node_data data; + data.type = "road"; + data.range_max = -1.0; + data.layer = scene::Layers.active(); // null_handle unless the scenery was opened for editing + // the name is what the lanes are known by to the vehicles put on them, so each piece needs one of its own + do + { + data.name = "road_" + std::to_string(++counter); + } while (simulation::Roads.find(data.name) != nullptr); + auto *road{new road_node(data)}; + road->define(state); + road->mark_dirty(); + simulation::Roads.insert(road); + scene::Layers.count(road->layer(), scene::layer_item::track); + created.emplace_back(road); + } + refresh(created, []() {}); + return created; +} + +void editor_road::apply(std::vector> const &Changes) +{ + std::vector roads; + for (auto const &change : Changes) + add_unique(roads, change.first); + if (roads.empty()) + return; + refresh(roads, [&]() { + for (auto const &change : Changes) + { + change.first->define(change.second); + change.first->mark_dirty(); + } + }); +} + +void editor_road::remove(std::vector const &Roads) +{ + std::vector roads; + for (auto *road : Roads) + if (road != nullptr && false == road->m_editorremoved) + add_unique(roads, road); + if (roads.empty()) + return; + refresh(roads, [&]() { + for (auto *road : roads) + { + road->m_editorremoved = true; + scene::Layers.count(road->layer(), scene::layer_item::track, -1); + } + }); +} + +void editor_road::revive(std::vector const &Roads) +{ + std::vector roads; + for (auto *road : Roads) + if (road != nullptr && road->m_editorremoved) + add_unique(roads, road); + if (roads.empty()) + return; + refresh(roads, [&]() { + for (auto *road : roads) + { + road->m_editorremoved = false; + road->mark_dirty(); + scene::Layers.count(road->layer(), scene::layer_item::track); + } + }); +} + +road_node *editor_road::split(road_node &Road, double const T) +{ + if (T <= 0.001 || T >= 0.999) + return nullptr; + auto first{Road.definition()}; + auto second{first}; + auto const &path{Road.definition().axis}; + auto const p0{path.points[segment_data::point::start]}; + auto const p3{path.points[segment_data::point::end]}; + if (path.points[segment_data::point::control1] == glm::dvec3{0.0} && path.points[segment_data::point::control2] == glm::dvec3{0.0}) + { + auto const middle{glm::mix(p0, p3, T)}; + first.axis.points[segment_data::point::end] = middle; + second.axis.points[segment_data::point::start] = middle; + } + else + { + auto const p1{p0 + path.points[segment_data::point::control1]}; + auto const p2{p3 + path.points[segment_data::point::control2]}; + auto const p01{glm::mix(p0, p1, T)}; + auto const p12{glm::mix(p1, p2, T)}; + auto const p23{glm::mix(p2, p3, T)}; + auto const p012{glm::mix(p01, p12, T)}; + auto const p123{glm::mix(p12, p23, T)}; + auto const middle{glm::mix(p012, p123, T)}; + first.axis.points[segment_data::point::control1] = p01 - p0; + first.axis.points[segment_data::point::control2] = p012 - middle; + first.axis.points[segment_data::point::end] = middle; + second.axis.points[segment_data::point::start] = middle; + second.axis.points[segment_data::point::control1] = p123 - middle; + second.axis.points[segment_data::point::control2] = p23 - p3; + } + auto const roll{static_cast(path.rolls[0] + (path.rolls[1] - path.rolls[0]) * T)}; + first.axis.rolls[1] = roll; + second.axis.rolls[0] = roll; + apply({{&Road, first}}); + auto const created{create({second})}; + return created.empty() ? nullptr : created.front(); +} + +std::vector editor_road::chain(road_node &Road) +{ + std::vector result{&Road}; + for (std::size_t idx = 0; idx < result.size(); ++idx) + { + for (auto const atend : {false, true}) + { + // a road goes on only where exactly two pieces meet + auto const next{roads_at(axis_end(result[idx]->definition(), atend), result[idx])}; + if (next.size() == 1) + add_unique(result, next.front()); + } + } + return result; +} + +double editor_road::nearest_parameter(road_node::state const &State, glm::dvec3 const &Point) +{ + auto const distance = [&](double const T) { + auto const position{State.point(T)}; + return glm::distance(glm::dvec2{position.x, position.z}, glm::dvec2{Point.x, Point.z}); + }; + double best{0.0}; + for (int i = 1; i <= 64; ++i) + if (distance(i / 64.0) < distance(best)) + best = i / 64.0; + double step{1.0 / 64.0}; + for (int i = 0; i < 24; ++i) + { + step *= 0.5; + if (best - step >= 0.0 && distance(best - step) < distance(best)) + best -= step; + else if (best + step <= 1.0 && distance(best + step) < distance(best)) + best += step; + } + return best; +} + +road_node *editor_road::nearest(glm::dvec3 const &Point, double const Margin) +{ + road_node *result{nullptr}; + double best{std::numeric_limits::max()}; + for (auto *road : simulation::Roads.sequence()) + { + if (road == nullptr || road->m_editorremoved) + continue; + auto const &state{road->definition()}; + auto const reach{0.5 * state.width() + std::max(state.sides[0].width, state.sides[1].width) + Margin}; + if (glm::distance(road->location(), Point) > 0.5 * state.length() + reach + 10.0) + continue; + auto const position{state.point(nearest_parameter(state, Point))}; + auto const distance{glm::distance(glm::dvec2{position.x, position.z}, glm::dvec2{Point.x, Point.z})}; + // roads passing over or under the point don't count + if (distance > reach || std::abs(position.y - Point.y) > 3.0) + continue; + if (distance < best) + { + best = distance; + result = road; + } + } + return result; +} + +editor_road::loose_end editor_road::find_end(glm::dvec3 const &Point, double const Radius) +{ + loose_end result; + double best{Radius}; + for (auto *road : simulation::Roads.sequence()) + { + if (road == nullptr || road->m_editorremoved) + continue; + auto const &state{road->definition()}; + for (auto const atend : {false, true}) + { + auto const position{axis_end(state, atend)}; + auto const distance{glm::distance(glm::dvec2{position.x, position.z}, glm::dvec2{Point.x, Point.z})}; + if (distance > best || std::abs(position.y - Point.y) > 3.0 || false == roads_at(position, road).empty()) + continue; + best = distance; + result.road = road; + result.atend = atend; + result.position = position; + result.outwards = (atend ? state.tangent(1.0) : -state.tangent(0.0)); + } + } + return result; +} + +std::vector editor_road::plan(glm::dvec3 const &Start, glm::dvec2 const *Direction, glm::dvec3 const &Target, glm::dvec2 const *Enddirection, bool const Straight, std::string &Error) +{ + std::vector pieces; + glm::dvec2 const chord{Target.x - Start.x, Target.z - Start.z}; + auto const span{glm::length(chord)}; + if (span < kShortestRoad) + { + Error = "Too short"; + return pieces; + } + // straight road, cut into pieces of reasonable length + auto const straight = [&](glm::dvec3 const &End) { + auto const count{std::max(1, static_cast(std::ceil(glm::distance(Start, End) / kPieceLength)))}; + for (int i = 0; i < count; ++i) + { + segment_data piece; + piece.points[segment_data::point::start] = glm::mix(Start, End, static_cast(i) / count); + piece.points[segment_data::point::end] = glm::mix(Start, End, static_cast(i + 1) / count); + pieces.emplace_back(piece); + } + }; + + if (Direction != nullptr && Enddirection != nullptr) + { + // both ends are tied, which leaves a single curve with the tangents set + if (glm::dot(*Direction, chord) < 0.1 * span || glm::dot(*Enddirection, chord) < 0.1 * span) + { + Error = "The road would have to turn back to meet the end"; + return pieces; + } + auto const rise{(Target.y - Start.y) / 3.0}; + segment_data piece; + piece.points[segment_data::point::start] = Start; + piece.points[segment_data::point::end] = Target; + piece.points[segment_data::point::control1] = glm::dvec3{Direction->x * span / 3.0, rise, Direction->y * span / 3.0}; + piece.points[segment_data::point::control2] = glm::dvec3{-Enddirection->x * span / 3.0, -rise, -Enddirection->y * span / 3.0}; + auto const radius{tightest_radius(piece)}; + if (radius == 0.0) + { + pieces.clear(); + straight(Target); + return pieces; + } + if (radius < kTightestRadius) + { + Error = "The bend is too tight"; + return pieces; + } + piece.radius = static_cast(radius); + pieces.emplace_back(piece); + return pieces; + } + if (Direction == nullptr && Enddirection != nullptr) + { + // only the far end is tied: the same road as the one leading back from there, turned around + glm::dvec2 const back{-*Enddirection}; + auto reversed{plan(Target, &back, Start, nullptr, Straight, Error)}; + for (auto &piece : reversed) + { + std::swap(piece.points[segment_data::point::start], piece.points[segment_data::point::end]); + std::swap(piece.points[segment_data::point::control1], piece.points[segment_data::point::control2]); + } + std::reverse(reversed.begin(), reversed.end()); + return reversed; + } + if (Direction == nullptr) + { + straight(Target); + return pieces; + } + + // the road leaves the start in set direction, and reaches the target with an arc + auto const forward{*Direction}; + glm::dvec2 const left{forward.y, -forward.x}; + auto const along{glm::dot(chord, forward)}; + auto const side{glm::dot(chord, left)}; + if (Straight || std::abs(side) < 0.02 * span) + { + if (along < kShortestRoad) + { + Error = "The target is behind the start"; + return pieces; + } + straight(glm::dvec3{Start.x + forward.x * along, Target.y, Start.z + forward.y * along}); + return pieces; + } + auto const turn{2.0 * std::atan2(side, along)}; // positive to the left + auto const radius{span * span / (2.0 * side)}; // likewise + if (std::abs(turn) > glm::radians(170.0)) + { + Error = "The road would have to turn back to reach the target"; + return pieces; + } + if (std::abs(radius) < kTightestRadius) + { + Error = "The bend is too tight"; + return pieces; + } + glm::dvec2 const start{Start.x, Start.z}; + auto const centre{start + left * radius}; + auto const count{std::max(1, static_cast(std::ceil(std::max(std::abs(turn) / kPieceTurn, std::abs(radius * turn) / kPieceLength))))}; + auto const handle{4.0 / 3.0 * std::tan(std::abs(turn) / count / 4.0) * std::abs(radius)}; + auto const rise{(Target.y - Start.y) / count}; + for (int i = 0; i < count; ++i) + { + auto const angle0{turn * i / count}; + auto const angle1{turn * (i + 1) / count}; + auto const point0{centre - left * (radius * std::cos(angle0)) + forward * (radius * std::sin(angle0))}; + auto const point1{centre - left * (radius * std::cos(angle1)) + forward * (radius * std::sin(angle1))}; + auto const tangent0{forward * std::cos(angle0) + left * std::sin(angle0)}; + auto const tangent1{forward * std::cos(angle1) + left * std::sin(angle1)}; + segment_data piece; + piece.points[segment_data::point::start] = glm::dvec3{point0.x, Start.y + rise * i, point0.y}; + piece.points[segment_data::point::end] = glm::dvec3{point1.x, Start.y + rise * (i + 1), point1.y}; + piece.points[segment_data::point::control1] = glm::dvec3{tangent0.x * handle, rise / 3.0, tangent0.y * handle}; + piece.points[segment_data::point::control2] = glm::dvec3{-tangent1.x * handle, -rise / 3.0, -tangent1.y * handle}; + piece.radius = static_cast(std::abs(radius)); + pieces.emplace_back(piece); + } + // the arc is worked out from the start, make sure it ends exactly at the target + pieces.back().points[segment_data::point::end] = Target; + return pieces; +} + +std::vector const &editor_road::materials() +{ + static std::vector names; + static bool scanned{false}; + if (scanned) + return names; + scanned = true; + std::set found; + std::error_code error; + for (std::filesystem::directory_iterator file{Global.asCurrentTexturePath, std::filesystem::directory_options::skip_permission_denied, error}, end; file != end; file.increment(error)) + { + if (error || false == file->is_regular_file(error)) + continue; + auto extension{file->path().extension().string()}; + std::transform(extension.begin(), extension.end(), extension.begin(), [](unsigned char c) { return static_cast(std::tolower(c)); }); + if (extension != ".mat" && extension != ".dds" && extension != ".tga" && extension != ".png" && extension != ".bmp" && extension != ".jpg" && extension != ".ktx" && extension != ".tex") + continue; + auto name{file->path().stem().string()}; + std::transform(name.begin(), name.end(), name.begin(), [](unsigned char c) { return static_cast(std::tolower(c)); }); + // names with spaces can't be put in a scenery file + if (name.empty() || name.find(' ') != std::string::npos) + continue; + found.emplace(name); + } + names.assign(found.begin(), found.end()); + return names; +} diff --git a/editor/editorRoad.hpp b/editor/editorRoad.hpp new file mode 100644 index 000000000..40f21cb43 --- /dev/null +++ b/editor/editorRoad.hpp @@ -0,0 +1,65 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include +#include +#include + +#include "world/Road.h" + +// editor operations on the roads. a road in the scenery is a string of pieces joined end to end, +// each piece being a road node with lanes and geometry of its own +class editor_road +{ + public: + // an end of a road piece nothing is attached to + struct loose_end + { + road_node *road{nullptr}; + bool atend{false}; + glm::dvec3 position{0.0}; + glm::dvec3 outwards{0.0}; // direction the road would continue in + }; + // true if the roads can be built and changed at all. optionally explains why they can't + static bool available(std::string *Reason = nullptr); + // true if specified road piece can be changed or removed. optionally explains why it can't + static bool can_edit(road_node const &Road, std::string *Reason = nullptr); + // makes road pieces out of provided definitions, with their lanes joined to the neighbours and geometry in the scene + static std::vector create(std::vector const &States); + // replaces definitions of the pieces and makes their lanes and geometry anew + static void apply(std::vector> const &Changes); + // takes the pieces out of the scenery. they're kept around, so they can be brought back + static void remove(std::vector const &Roads); + static void revive(std::vector const &Roads); + // cuts the piece in two at specified point of its axis. returns: the new piece, holding the part past the cut + static road_node *split(road_node &Road, double const T); + // the pieces which make a single road together with specified one, in no particular order + static std::vector chain(road_node &Road); + // the piece under specified point, or within specified distance from it + static road_node *nearest(glm::dvec3 const &Point, double const Margin); + // value of the curve parameter for the point of the axis nearest to specified point + static double nearest_parameter(road_node::state const &State, glm::dvec3 const &Point); + // end of a piece with nothing attached, within specified distance from specified point + static loose_end find_end(glm::dvec3 const &Point, double const Radius); + // lays out axes of the pieces for a road leading from a point to another. the directions are optional requirements + // for the road at its ends; without them it starts straight at the target, with them it bends to meet them. + // returns: the axes in order, or nothing if there's no reasonable road to make, with the reason in Error + static std::vector plan(glm::dvec3 const &Start, glm::dvec2 const *Direction, glm::dvec3 const &Target, glm::dvec2 const *Enddirection, bool const Straight, std::string &Error); + // names of materials and images present in the texture folder, to pick from + static std::vector const &materials(); + + private: + // takes down what depends on shape of the listed pieces, lets the caller change them, then builds it all again + template + static void refresh(std::vector const &Roads, Change_ Change); + static std::vector neighbours(road_node const &Road); +}; diff --git a/scene/scenelayerssave.cpp b/scene/scenelayerssave.cpp index c45e24e8c..71bc26b3a 100644 --- a/scene/scenelayerssave.cpp +++ b/scene/scenelayerssave.cpp @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "scene/scenelayers.h" #include "world/Track.h" +#include "world/Road.h" #include "simulation/simulation.h" #include "model/AnimModel.h" @@ -793,6 +794,69 @@ save_result node_layers::save(std::vector const &Rootstatements) state.patches[source.layer].edits.emplace_back(std::move(edit)); rewritten.emplace(path); } + // roads. the lanes aren't saved, they're generated from the definition of the road + std::vector savedroads; + std::vector droppedroads; + auto const road_text = [](road_node &Road, glm::dvec3 const &Offset) { + auto const definition{Road.definition()}; + auto local{definition}; + local.axis.points[segment_data::point::start] -= Offset; + local.axis.points[segment_data::point::end] -= Offset; + Road.define(local); + std::string text; + Road.export_as_text(text); + Road.define(definition); + text.erase(text.find_last_not_of(" \t\r\n") + 1); + return text; + }; + for (auto *road : simulation::Roads.sequence()) + { + if (road == nullptr || road->from_template()) + { + continue; + } + auto const nodelayer{resolve(road->layer())}; + if (false == is_output(nodelayer)) + { + continue; + } + auto const lookup{m_sources.find(road)}; + if (lookup == m_sources.end()) + { + if (road->m_editorremoved || false == road->dirty()) + { + continue; + } + created[nodelayer].emplace_back(road, road_text(*road, layer(nodelayer).context_insert().offset)); + savedroads.push_back(road); + continue; + } + auto const &source{lookup->second}; + if ((false == road->m_editorremoved && false == road->dirty()) || false == writable(source.layer)) + { + continue; + } + if (false == load(source.layer)) + { + return fail(state.error); + } + file_patch::edit edit; + edit.begin = source.span.begin; + edit.end = source.span.end; + if (road->m_editorremoved) + { + droppedroads.push_back(road); + } + else + { + edit.text = road_text(*road, source.context.offset); + edit.length = edit.text.size(); + edit.node = road; + savedroads.push_back(road); + } + state.patches[source.layer].edits.emplace_back(std::move(edit)); + rewritten.emplace(road); + } for (auto const &erased : m_erased) { file_patch::edit edit; @@ -1236,6 +1300,14 @@ save_result node_layers::save(std::vector const &Rootstatements) { m_sources.erase(path); } + for (auto *road : savedroads) + { + road->m_dirty = false; + } + for (auto const *road : droppedroads) + { + m_sources.erase(road); + } if (removedterrain) { // binary terrain file still holds geometry of the dropped layer, have it rebuilt on the next load diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index e6f609346..828439609 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -519,6 +519,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch scene::Groups.insert( scene::Groups.handle(), road ); // the lanes are regular paths, registered right away so they get joined with their neighbours along with the tracks road->create_lanes(); + scene::Layers.track( road, { sourcebegin, Input.TokenEnd() } ); } else if( nodedata.type == "traction" ) { @@ -693,6 +694,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch static std::unordered_map const itemtypes { { "dynamic", scene::layer_item::vehicle }, { "track", scene::layer_item::track }, + { "road", scene::layer_item::track }, { "traction", scene::layer_item::traction }, { "tractionpowersource", scene::layer_item::powersource }, { "model", scene::layer_item::model }, @@ -1398,7 +1400,7 @@ state_serializer::export_nodes_to_stream(std::ostream &scmfile, bool Dirty) cons // roads scmfile << "// roads\n"; for( auto const *road : Roads.sequence() ) { - if( road != nullptr && road->dirty() == Dirty && road->group() == null_handle ) { + if( road != nullptr && false == road->m_editorremoved && road->dirty() == Dirty && road->group() == null_handle ) { road->export_as_text( scmfile ); } } diff --git a/world/Road.cpp b/world/Road.cpp index f52a4e51d..7553b5eb5 100644 --- a/world/Road.cpp +++ b/world/Road.cpp @@ -269,6 +269,182 @@ float texture_ratio(std::string const &Material) } // namespace +// brings the content to a usable form: values within their limits, an entry for each lane and for each pair of neighbours +void road_node::state::normalize() +{ + forward = std::clamp(forward, 0, 8); + backward = std::clamp(backward, 0, 8); + if (forward + backward == 0) + { + forward = 1; + } + lanewidth = std::max(1.f, lanewidth); + if (texturelength < 0.01f) + { + texturelength = 4.f; + } + if (surface.empty()) + { + surface = "none"; + } + // the paths of the lanes are loaded from text, so what goes into it has to be something they understand + static std::array const environments{"flat", "mountains", "mountain", "canyon", "tunnel", "bridge", "bank"}; + if (std::find(environments.begin(), environments.end(), environment) == environments.end()) + { + environment = "flat"; + } + auto const count{static_cast(forward + backward)}; + if (lanes.size() != count) + { + lane_data fresh; + fresh.width = lanewidth; + fresh.velocity = velocity; + lanes.assign(count, fresh); + } + for (auto &lane : lanes) + { + lane.width = std::max(1.f, lane.width); + } + if (changes.size() != count - 1) + { + changes.resize(count - 1); + for (std::size_t boundary = 0; boundary < changes.size(); ++boundary) + { + changes[boundary] = default_change(boundary); + } + } + for (auto &change : changes) + { + change = std::clamp(change, static_cast(change_none), static_cast(change_both)); + } +} + +// identifier of a lane: f1..fn go along the axis and b1..bn against it, both counted outwards from where the directions meet +std::string road_node::state::lane_id(std::size_t const Lane) const +{ + auto const against{static_cast(backward)}; + return Lane < against ? "b" + std::to_string(against - Lane) : "f" + std::to_string(Lane - against + 1); +} + +// number of a lane in the left to right order, -1 if there's no lane with such identifier +int road_node::state::lane_index(std::string const &Id) const +{ + if (Id.size() < 2 || Id.size() > 3 || (Id[0] != 'f' && Id[0] != 'b')) + { + return -1; + } + int number{0}; + for (std::size_t idx = 1; idx < Id.size(); ++idx) + { + if (Id[idx] < '0' || Id[idx] > '9') + { + return -1; + } + number = number * 10 + (Id[idx] - '0'); + } + if (number < 1 || number > (Id[0] == 'f' ? forward : backward)) + { + return -1; + } + return Id[0] == 'f' ? backward + number - 1 : backward - number; +} + +// permission to change the lane a pair of neighbouring lanes gets if the scenery doesn't say otherwise +int road_node::state::default_change(std::size_t const Boundary) const +{ + auto const opposite{backward > 0 && forward > 0 && Boundary + 1 == static_cast(backward)}; + if (false == opposite) + { + return change_both; + } + // overtaking across the oncoming lane is left for the simple two lane roads + return (forward == 1 && backward == 1) ? change_both : change_none; +} + +// distance of the middle of a lane from the axis, positive to the left when facing along the axis +double road_node::state::lane_offset(std::size_t const Lane) const +{ + auto offset{0.5 * width()}; + for (std::size_t idx = 0; idx < Lane && idx < lanes.size(); ++idx) + { + offset -= lanes[idx].width; + } + return Lane < lanes.size() ? offset - 0.5 * lanes[Lane].width : offset; +} + +// combined width of the lanes +double road_node::state::width() const +{ + double total{0.0}; + for (auto const &lane : lanes) + { + total += lane.width; + } + return total; +} + +// shape of the middle of a lane, laid out in the direction of travel +segment_data road_node::state::lane_path(std::size_t const Lane) const +{ + road_axis const centre{axis}; + auto const offset{lane_offset(Lane)}; + auto const begin{centre.frame(0.0)}; + auto const end{centre.frame(1.0)}; + + segment_data path; + path.points[segment_data::point::start] = begin.position + begin.left * offset; + path.points[segment_data::point::end] = end.position + end.left * offset; + if (centre.curved()) + { + // a line running beside a bend is shorter or longer than the bend itself, and so are its control vectors + path.points[segment_data::point::control1] = centre.control(0) * std::max(0.05, 1.0 - offset * std::cos(begin.roll) * centre.curvature(0.0)); + path.points[segment_data::point::control2] = centre.control(1) * std::max(0.05, 1.0 - offset * std::cos(end.roll) * centre.curvature(1.0)); + // if the roll changes along the road its sides rise or fall relative to the axis + auto const climb{offset * (std::sin(end.roll) - std::sin(begin.roll)) / 3.0}; + path.points[segment_data::point::control1].y += climb; + path.points[segment_data::point::control2].y -= climb; + } + path.rolls = axis.rolls; + if (axis.radius != 0.f) + { + // the lanes on the inner side of the bend have it tighter + auto const turn{centre.curvature(0.5) >= 0.0 ? 1.0 : -1.0}; + path.radius = static_cast(std::max(1.0, std::abs(axis.radius) - turn * offset)); + } + if (Lane < static_cast(backward)) + { + // the lane goes against the axis + std::swap(path.points[segment_data::point::start], path.points[segment_data::point::end]); + std::swap(path.points[segment_data::point::control1], path.points[segment_data::point::control2]); + path.rolls = {-axis.rolls[1], -axis.rolls[0]}; + } + if (Global.bRollFix) + { + // with this setting on a rolled path gets raised when it's set up, by an amount fit for a railway track. + // the surface of the road stays where it is, so the lane is lowered beforehand to make up for it + path.points[segment_data::point::start].y -= std::abs(std::sin(glm::radians(static_cast(path.rolls[0])))) * 0.75; + path.points[segment_data::point::end].y -= std::abs(std::sin(glm::radians(static_cast(path.rolls[1])))) * 0.75; + } + return path; +} + +// length of the axis +double road_node::state::length() const +{ + return road_axis{axis}.length(); +} + +// position on the axis and direction of the axis, for specified value of the curve parameter +glm::dvec3 road_node::state::point(double const T) const +{ + return road_axis{axis}.point(T); +} + +glm::dvec3 road_node::state::tangent(double const T) const +{ + return road_axis{axis}.frame(T).tangent; +} + road_node::road_node(scene::node_data const &Nodedata) : basic_node(Nodedata) {} // restores content of the node from provided input stream; reads up to and including the closing 'endroad' @@ -276,7 +452,8 @@ void road_node::import(cParser &Input, glm::dvec3 const &Offset) { auto const label{m_name.empty() ? std::string{"unnamed road"} : "road \"" + m_name + "\""}; - m_axis.deserialize(Input, Offset); + m_state = state{}; + m_state.axis.deserialize(Input, Offset); // properties of the lanes can precede the statement which sets how many of them there are, so they wait until everything is read struct lane_property @@ -301,17 +478,17 @@ void road_node::import(cParser &Input, glm::dvec3 const &Offset) { // lanes Input.getTokens(2); - Input >> m_forward >> m_backward; + Input >> m_state.forward >> m_state.backward; } else if (token == "width") { Input.getTokens(); - Input >> m_lanewidth; + Input >> m_state.lanewidth; } else if (token == "velocity") { Input.getTokens(); - Input >> m_velocity; + Input >> m_state.velocity; } else if (token == "lane") { @@ -335,13 +512,13 @@ void road_node::import(cParser &Input, glm::dvec3 const &Offset) } else if (token == "surface") { - m_surface = Input.getToken(); - replace_slashes(m_surface); + m_state.surface = Input.getToken(); + replace_slashes(m_state.surface); } else if (token == "texlength") { Input.getTokens(); - Input >> m_texturelength; + Input >> m_state.texturelength; } else if (token == "side") { @@ -360,11 +537,11 @@ void road_node::import(cParser &Input, glm::dvec3 const &Offset) } if (where == "left" || where == "both") { - m_sides[0] = side; + m_state.sides[0] = side; } if (where == "right" || where == "both") { - m_sides[1] = side; + m_state.sides[1] = side; } if (where != "left" && where != "right" && where != "both") { @@ -374,18 +551,18 @@ void road_node::import(cParser &Input, glm::dvec3 const &Offset) else if (token == "kerb") { Input.getTokens(); - Input >> m_kerbheight; + Input >> m_state.kerbheight; } else if (token == "slope") { // slope Input.getTokens(2); - Input >> m_slope.x >> m_slope.y; + Input >> m_state.slope.x >> m_state.slope.y; } else if (token == "markings") { auto const colour{Input.getToken()}; - m_markings = (colour == "white" ? marking_colour::white : colour == "orange" ? marking_colour::orange : marking_colour::none); + m_state.markings = (colour == "white" ? marking_colour::white : colour == "orange" ? marking_colour::orange : marking_colour::none); if (colour != "white" && colour != "orange" && colour != "none") { ErrorLog("Bad road: unknown colour of markings \"" + colour + "\" defined for " + label); @@ -394,11 +571,11 @@ void road_node::import(cParser &Input, glm::dvec3 const &Offset) else if (token == "friction") { Input.getTokens(); - Input >> m_friction; + Input >> m_state.friction; } else if (token == "environment") { - m_environment = Input.getToken(); + m_state.environment = Input.getToken(); } else { @@ -407,37 +584,20 @@ void road_node::import(cParser &Input, glm::dvec3 const &Offset) token = Input.getToken(); } - // the paths of the lanes are loaded from text, so what goes into it has to be something they understand - static std::array const environments{"flat", "mountains", "mountain", "canyon", "tunnel", "bridge", "bank"}; - if (std::find(environments.begin(), environments.end(), m_environment) == environments.end()) - { - ErrorLog("Bad road: unknown environment \"" + m_environment + "\" defined for " + label); - m_environment = "flat"; - } - m_forward = std::clamp(m_forward, 0, 8); - m_backward = std::clamp(m_backward, 0, 8); - if (m_forward + m_backward == 0) + if (m_state.forward + m_state.backward <= 0) { ErrorLog("Bad road: " + label + " has no lanes, a single one is used instead"); - m_forward = 1; } - m_lanewidth = std::max(1.f, m_lanewidth); - if (m_texturelength < 0.01f) + auto const environment{m_state.environment}; + m_state.normalize(); + if (environment != m_state.environment) { - m_texturelength = 4.f; - } - if (m_surface.empty()) - { - m_surface = "none"; + ErrorLog("Bad road: unknown environment \"" + environment + "\" defined for " + label); } - lane_data lanetemplate; - lanetemplate.width = m_lanewidth; - lanetemplate.velocity = m_velocity; - m_lanes.assign(static_cast(m_forward + m_backward), lanetemplate); for (auto const &property : laneproperties) { - auto const lane{lane_index(property.lane)}; + auto const lane{m_state.lane_index(property.lane)}; if (lane < 0) { ErrorLog("Bad road: " + label + " has no lane \"" + property.lane + "\""); @@ -445,27 +605,21 @@ void road_node::import(cParser &Input, glm::dvec3 const &Offset) } if (property.property == "width") { - m_lanes[lane].width = std::max(1.f, property.value); + m_state.lanes[lane].width = std::max(1.f, property.value); } else if (property.property == "velocity") { - m_lanes[lane].velocity = property.value; + m_state.lanes[lane].velocity = property.value; } else { ErrorLog("Bad road: unknown lane property: \"" + property.property + "\" defined for " + label); } } - - m_changes.resize(m_lanes.size() - 1); - for (std::size_t boundary = 0; boundary < m_changes.size(); ++boundary) - { - m_changes[boundary] = default_change(boundary); - } for (auto const &property : changeproperties) { - auto const first{lane_index(property.first)}; - auto const second{lane_index(property.second)}; + auto const first{m_state.lane_index(property.first)}; + auto const second{m_state.lane_index(property.second)}; if (first < 0 || second < 0 || std::abs(first - second) != 1) { ErrorLog("Bad road: lanes \"" + property.first + "\" and \"" + property.second + "\" aren't neighbours on " + label); @@ -473,7 +627,7 @@ void road_node::import(cParser &Input, glm::dvec3 const &Offset) } // the permissions are stored for the pair taken left to right auto const firstonleft{first < second}; - auto &change{m_changes[std::min(first, second)]}; + auto &change{m_state.changes[std::min(first, second)]}; if (property.mode == "both") { change = change_both; @@ -496,15 +650,25 @@ void road_node::import(cParser &Input, glm::dvec3 const &Offset) } } - location(road_axis{m_axis}.frame(0.5).position); + location(m_state.point(0.5)); +} + +// replaces what the node knows about the road +void road_node::define(state const &State) +{ + m_state = State; + m_state.normalize(); + location(m_state.point(0.5)); + m_area.radius = -1.f; } // creates paths of the lanes and hands them over to the simulation void road_node::create_lanes() { - for (std::size_t lane = 0; lane < m_lanes.size(); ++lane) + m_tracks.assign(m_state.lanes.size(), nullptr); + for (std::size_t lane = 0; lane < m_state.lanes.size(); ++lane) { - m_lanes[lane].track = create_track(m_name.empty() ? std::string{} : m_name + ":" + lane_id(lane), lane_path(lane), m_lanes[lane].width, m_lanes[lane].velocity); + m_tracks[lane] = create_track(m_name.empty() ? std::string{} : m_name + ":" + m_state.lane_id(lane), m_state.lane_path(lane), m_state.lanes[lane].width, m_state.lanes[lane].velocity); } } @@ -512,17 +676,21 @@ void road_node::create_lanes() void road_node::close_ends() { // NOTE: without the link a vehicle reaching the end would be sent back on the lane it came by, against its direction - road_axis const axis{m_axis}; + if (m_tracks.size() != m_state.lanes.size()) + { + return; + } + road_axis const axis{m_state.axis}; for (int end = 0; end < 2; ++end) { // the lanes going along the axis leave the road at its end, the ones going against it leave at its start auto const outwards{end == 1 ? axis.frame(1.0).tangent : -axis.frame(0.0).tangent}; - for (int pair = 1; pair <= std::min(m_forward, m_backward); ++pair) + for (int pair = 1; pair <= std::min(m_state.forward, m_state.backward); ++pair) { - auto const forward{static_cast(m_backward + pair - 1)}; - auto const backward{static_cast(m_backward - pair)}; - auto *exit{m_lanes[end == 1 ? forward : backward].track}; - auto *entry{m_lanes[end == 1 ? backward : forward].track}; + auto const forward{static_cast(m_state.backward + pair - 1)}; + auto const backward{static_cast(m_state.backward - pair)}; + auto *exit{m_tracks[end == 1 ? forward : backward]}; + auto *entry{m_tracks[end == 1 ? backward : forward]}; if (exit == nullptr || entry == nullptr || exit->trNext != nullptr || entry->trPrev != nullptr) { continue; @@ -534,7 +702,7 @@ void road_node::close_ends() path.points[segment_data::point::control1] = outwards * std::max(turn_reach, 1.5 * span); path.points[segment_data::point::control2] = outwards * std::max(turn_reach, 1.5 * span); path.radius = static_cast(std::max(2.0, 0.5 * span)); - auto *turn{create_track(m_name.empty() ? std::string{} : m_name + ":" + (end == 1 ? "endturn" : "startturn") + std::to_string(pair), path, m_lanes[forward].width, turn_velocity)}; + auto *turn{create_track(m_name.empty() ? std::string{} : m_name + ":" + (end == 1 ? "endturn" : "startturn") + std::to_string(pair), path, m_state.lanes[forward].width, turn_velocity)}; exit->ConnectNextPrev(turn, 0); turn->ConnectNextPrev(entry, 0); m_turns.emplace_back(turn); @@ -542,6 +710,39 @@ void road_node::close_ends() } } +// gives up the paths of the lanes +std::vector road_node::release_lanes() +{ + std::vector released; + released.swap(m_tracks); + released.erase(std::remove(released.begin(), released.end(), nullptr), released.end()); + return released; +} + +// gives up the paths made to close the loose ends +std::vector road_node::release_turns() +{ + std::vector released; + released.swap(m_turns); + return released; +} + +// true if there's a vehicle on any path of the road +bool road_node::occupied() const +{ + for (auto const *tracks : {&m_tracks, &m_turns}) + { + for (auto const *track : *tracks) + { + if (track != nullptr && false == track->Dynamics.empty()) + { + return true; + } + } + } + return false; +} + // generates geometry of the surface, the sides and the markings std::vector road_node::create_shapes() const { @@ -567,22 +768,24 @@ std::vector road_node::create_shapes() const return batches.back().vertices; }; - road_axis const axis{m_axis}; + auto const &road{m_state}; + road_axis const axis{road.axis}; auto const length{axis.length()}; auto const step{axis.step()}; - auto const halfwidth{0.5 * width()}; + auto const halfwidth{0.5 * road.width()}; + double const texturelength{road.texturelength}; // surface. the image is centered on the axis, and repeated if the road is wider - if (m_surface != "none") + if (road.surface != "none") { - auto const tile{static_cast(texture_ratio(m_surface) * m_texturelength)}; - loft(vertices(m_surface, lighting_data{}), axis, {{halfwidth, 0.0, static_cast(0.5 + halfwidth / tile)}, {-halfwidth, 0.0, static_cast(0.5 - halfwidth / tile)}}, 0.0, length, step, m_texturelength); + auto const tile{static_cast(texture_ratio(road.surface)) * texturelength}; + loft(vertices(road.surface, lighting_data{}), axis, {{halfwidth, 0.0, static_cast(0.5 + halfwidth / tile)}, {-halfwidth, 0.0, static_cast(0.5 - halfwidth / tile)}}, 0.0, length, step, texturelength); } // sides for (int side = 0; side < 2; ++side) { - auto const &data{m_sides[side]}; + auto const &data{road.sides[side]}; if (data.type == side_type::none || data.width <= 0.f || data.material.empty() || data.material == "none") { continue; @@ -595,37 +798,37 @@ std::vector road_node::create_shapes() const // the image is laid out like the one of the legacy roads: the edge of the surface on its right, the bank on its left half profile.push_back({direction * halfwidth, 0.0, 1.f}); profile.push_back({direction * (halfwidth + data.width), 0.0, 0.5f}); - if (m_slope.x > 0.f) + if (road.slope.x > 0.f) { - profile.push_back({direction * (halfwidth + data.width + m_slope.x), -m_slope.y, 0.f}); + profile.push_back({direction * (halfwidth + data.width + road.slope.x), -road.slope.y, 0.f}); } } else { // the image starts at the foot of the kerb, and is laid out in its own proportions - auto const tile{static_cast(texture_ratio(data.material) * m_texturelength)}; + auto const tile{static_cast(texture_ratio(data.material)) * texturelength}; profile.push_back({direction * halfwidth, 0.0, 0.f}); - profile.push_back({direction * halfwidth, m_kerbheight, static_cast(m_kerbheight / tile)}); - profile.push_back({direction * (halfwidth + data.width), m_kerbheight, static_cast((m_kerbheight + data.width) / tile)}); + profile.push_back({direction * halfwidth, road.kerbheight, static_cast(road.kerbheight / tile)}); + profile.push_back({direction * (halfwidth + data.width), road.kerbheight, static_cast((road.kerbheight + data.width) / tile)}); } if (side == 0) { // the loft takes the corners left to right std::reverse(profile.begin(), profile.end()); } - loft(vertices(data.material, lighting_data{}), axis, profile, 0.0, length, step, m_texturelength); + loft(vertices(data.material, lighting_data{}), axis, profile, 0.0, length, step, texturelength); } // markings. these are painted with plain colour instead of an image - if (m_markings != marking_colour::none) + if (road.markings != marking_colour::none) { lighting_data paint; - paint.diffuse = (m_markings == marking_colour::white ? glm::vec4{0.92f, 0.92f, 0.92f, 1.f} : glm::vec4{0.95f, 0.5f, 0.08f, 1.f}); + paint.diffuse = (road.markings == marking_colour::white ? glm::vec4{0.92f, 0.92f, 0.92f, 1.f} : glm::vec4{0.95f, 0.5f, 0.08f, 1.f}); paint.ambient = paint.diffuse; auto &lines{vertices("colored", paint)}; auto const solid = [&](double const Offset) { - loft(lines, axis, {{Offset + 0.5 * line_width, line_lift, 0.f}, {Offset - 0.5 * line_width, line_lift, 1.f}}, 0.0, length, std::min(step, dash_step), m_texturelength); + loft(lines, axis, {{Offset + 0.5 * line_width, line_lift, 0.f}, {Offset - 0.5 * line_width, line_lift, 1.f}}, 0.0, length, std::min(step, dash_step), texturelength); }; // the dashes are fitted so the gaps at both ends of the road are a half of the regular one, which makes them match the next piece auto const dashed = [&](double const Offset) { @@ -634,7 +837,7 @@ std::vector road_node::create_shapes() const for (int dash = 0; dash < count; ++dash) { auto const from{(dash + 1.0 / 3.0) * period}; - loft(lines, axis, {{Offset + 0.5 * line_width, line_lift, 0.f}, {Offset - 0.5 * line_width, line_lift, 1.f}}, from, from + period / 3.0, dash_step, m_texturelength); + loft(lines, axis, {{Offset + 0.5 * line_width, line_lift, 0.f}, {Offset - 0.5 * line_width, line_lift, 1.f}}, from, from + period / 3.0, dash_step, texturelength); } }; @@ -647,12 +850,12 @@ std::vector road_node::create_shapes() const } // lines between the lanes. a lane can be left across a dashed line, or across a pair of lines if the dashed one is on its side auto offset{halfwidth}; - for (std::size_t boundary = 0; boundary < m_changes.size(); ++boundary) + for (std::size_t boundary = 0; boundary < road.changes.size() && boundary < road.lanes.size(); ++boundary) { - offset -= m_lanes[boundary].width; - auto const opposite{m_backward > 0 && boundary + 1 == static_cast(m_backward)}; + offset -= road.lanes[boundary].width; + auto const opposite{road.backward > 0 && boundary + 1 == static_cast(road.backward)}; auto const pair{0.5 * (line_width + line_spacing)}; - switch (m_changes[boundary]) + switch (road.changes[boundary]) { case change_both: { @@ -704,113 +907,57 @@ std::vector road_node::create_shapes() const return shapes; } -// identifier of a lane: f1..fn go along the axis and b1..bn against it, both counted outwards from where the directions meet -std::string road_node::lane_id(std::size_t const Lane) const +// puts geometry of the road in the scene as shapes of its own, which can be taken back +void road_node::show() { - auto const backward{static_cast(m_backward)}; - return Lane < backward ? "b" + std::to_string(backward - Lane) : "f" + std::to_string(Lane - backward + 1); + if (m_section != nullptr || m_merged || simulation::Region == nullptr || false == simulation::Region->point_inside(location())) + { + return; + } + auto shapes{create_shapes()}; + if (shapes.empty()) + { + return; + } + auto §ion{simulation::Region->section(location())}; + // the rest of the section has to be built by now, or it'd count our shapes as waiting for it too + section.create_geometry(); + if (m_bank.bank == 0 && m_bank.chunk == 0) + { + m_bank = GfxRenderer->Create_Bank(); + } + for (auto &shape : shapes) + { + // shapes held by a section are drawn relative to its centre + shape.origin(section.m_area.center); + auto const centre{shape.data().area.center}; + auto const radius{shape.radius()}; + shape.create_geometry(m_bank); + m_geometry.emplace_back(shape.data().geometry); + section.m_shapes.emplace_back(std::move(shape)); + // the section may need to reach further to keep the road from being culled at its edges + section.m_area.radius = std::max(section.m_area.radius, static_cast(glm::length(section.m_area.center - centre) + radius)); + } + m_section = §ion; } -// number of a lane in the left to right order, -1 if the road has no lane with such identifier -int road_node::lane_index(std::string const &Id) const +// takes back geometry put in the scene by show() +void road_node::hide() { - if (Id.size() < 2 || Id.size() > 3 || (Id[0] != 'f' && Id[0] != 'b')) + if (m_section == nullptr) { - return -1; + return; } - int number{0}; - for (std::size_t idx = 1; idx < Id.size(); ++idx) - { - if (Id[idx] < '0' || Id[idx] > '9') - { - return -1; - } - number = number * 10 + (Id[idx] - '0'); - } - if (number < 1 || number > (Id[0] == 'f' ? m_forward : m_backward)) - { - return -1; - } - return Id[0] == 'f' ? m_backward + number - 1 : m_backward - number; -} - -// permission to change the lane a pair of neighbouring lanes gets if the scenery doesn't say otherwise -int road_node::default_change(std::size_t const Boundary) const -{ - auto const opposite{m_backward > 0 && m_forward > 0 && Boundary + 1 == static_cast(m_backward)}; - if (false == opposite) - { - return change_both; - } - // overtaking across the oncoming lane is left for the simple two lane roads - return (m_forward == 1 && m_backward == 1) ? change_both : change_none; -} - -// distance of the middle of a lane from the axis, positive to the left when facing along the axis -double road_node::lane_offset(std::size_t const Lane) const -{ - auto offset{0.5 * width()}; - for (std::size_t idx = 0; idx < Lane && idx < m_lanes.size(); ++idx) - { - offset -= m_lanes[idx].width; - } - return Lane < m_lanes.size() ? offset - 0.5 * m_lanes[Lane].width : offset; -} - -// combined width of the lanes -double road_node::width() const -{ - double width{0.0}; - for (auto const &lane : m_lanes) - { - width += lane.width; - } - return width; -} - -// shape of the middle of a lane, laid out in the direction of travel -segment_data road_node::lane_path(std::size_t const Lane) const -{ - road_axis const axis{m_axis}; - auto const offset{lane_offset(Lane)}; - auto const begin{axis.frame(0.0)}; - auto const end{axis.frame(1.0)}; - - segment_data path; - path.points[segment_data::point::start] = begin.position + begin.left * offset; - path.points[segment_data::point::end] = end.position + end.left * offset; - if (axis.curved()) - { - // a line running beside a bend is shorter or longer than the bend itself, and so are its control vectors - path.points[segment_data::point::control1] = axis.control(0) * std::max(0.05, 1.0 - offset * std::cos(begin.roll) * axis.curvature(0.0)); - path.points[segment_data::point::control2] = axis.control(1) * std::max(0.05, 1.0 - offset * std::cos(end.roll) * axis.curvature(1.0)); - // if the roll changes along the road its sides rise or fall relative to the axis - auto const climb{offset * (std::sin(end.roll) - std::sin(begin.roll)) / 3.0}; - path.points[segment_data::point::control1].y += climb; - path.points[segment_data::point::control2].y -= climb; - } - path.rolls = m_axis.rolls; - if (m_axis.radius != 0.f) - { - // the lanes on the inner side of the bend have it tighter - auto const turn{axis.curvature(0.5) >= 0.0 ? 1.0 : -1.0}; - path.radius = static_cast(std::max(1.0, std::abs(m_axis.radius) - turn * offset)); - } - if (Lane < static_cast(m_backward)) - { - // the lane goes against the axis - std::swap(path.points[segment_data::point::start], path.points[segment_data::point::end]); - std::swap(path.points[segment_data::point::control1], path.points[segment_data::point::control2]); - path.rolls = {-m_axis.rolls[1], -m_axis.rolls[0]}; - } - if (Global.bRollFix) - { - // with this setting on a rolled path gets raised when it's set up, by an amount fit for a railway track. - // the surface of the road stays where it is, so the lane is lowered beforehand to make up for it - path.points[segment_data::point::start].y -= std::abs(std::sin(glm::radians(static_cast(path.rolls[0])))) * 0.75; - path.points[segment_data::point::end].y -= std::abs(std::sin(glm::radians(static_cast(path.rolls[1])))) * 0.75; - } - return path; + // our shapes are told from the others by their geometry. the renderer reclaims the chunks once they're no longer drawn + auto &shapes{m_section->m_shapes}; + shapes.erase(std::remove_if(shapes.begin(), shapes.end(), + [this](scene::shape_node const &Shape) { + auto const handle{Shape.data().geometry}; + return std::any_of(m_geometry.begin(), m_geometry.end(), [&handle](gfx::geometry_handle const &Own) { return Own.bank == handle.bank && Own.chunk == handle.chunk; }); + }), + shapes.end()); + m_geometry.clear(); + m_section = nullptr; } // creates a path for the vehicles and registers it with the simulation @@ -823,7 +970,7 @@ TTrack *road_node::create_track(std::string const &Name, segment_data const &Pat // the path is put together the way the scenery defines an invisible road, to have it set up by the code which loads these std::ostringstream text; text.precision(std::numeric_limits::digits10); - text << "road " << glm::distance(start, end) << ' ' << Width << ' ' << m_friction << ' ' << m_sounddistance << ' ' << m_quality << " 0 " << m_environment << " unvis " << start.x << ' ' << start.y << ' ' << start.z << ' ' << Path.rolls[0] << ' ' + text << "road " << glm::distance(start, end) << ' ' << Width << ' ' << m_state.friction << ' ' << m_state.sounddistance << ' ' << m_state.quality << " 0 " << m_state.environment << " unvis " << start.x << ' ' << start.y << ' ' << start.z << ' ' << Path.rolls[0] << ' ' << control1.x << ' ' << control1.y << ' ' << control1.z << ' ' << control2.x << ' ' << control2.y << ' ' << control2.z << ' ' << end.x << ' ' << end.y << ' ' << end.z << ' ' << Path.rolls[1] << ' ' << Path.radius << ' '; if (Velocity > 0.f) { @@ -841,7 +988,11 @@ TTrack *road_node::create_track(std::string const &Name, segment_data const &Pat track->m_road = this; if (false == simulation::Paths.insert(track)) { - ErrorLog("Bad scenario: duplicate track name \"" + track->name() + "\" generated for a road"); + // NOTE: the table points the name at the newest path, which is what a road made anew in the editor needs + if (false == m_editorremoved && false == dirty()) + { + ErrorLog("Bad scenario: duplicate track name \"" + track->name() + "\" generated for a road"); + } } simulation::Region->insert_and_register(track); return track; @@ -850,7 +1001,7 @@ TTrack *road_node::create_track(std::string const &Name, segment_data const &Pat // radius() subclass details, calculates node's bounding radius float road_node::radius_() { - return static_cast(0.5 * road_axis{m_axis}.length() + 0.5 * width() + std::max(m_sides[0].width, m_sides[1].width) + m_slope.x); + return static_cast(0.5 * m_state.length() + 0.5 * m_state.width() + std::max(m_state.sides[0].width, m_state.sides[1].width) + m_state.slope.x); } // serialize() subclass details, sends content of the subclass to provided stream @@ -868,55 +1019,56 @@ void road_node::deserialize_(std::istream &Input) // export() subclass details, sends basic content of the class in legacy (text) format to provided stream void road_node::export_as_text_(std::ostream &Output) const { + auto const &road{m_state}; Output << "road "; // axis auto const precision{Output.precision(std::numeric_limits::digits10)}; - Output << m_axis.points[segment_data::point::start].x << ' ' << m_axis.points[segment_data::point::start].y << ' ' << m_axis.points[segment_data::point::start].z << ' ' << m_axis.rolls[0] << ' ' - << m_axis.points[segment_data::point::control1].x << ' ' << m_axis.points[segment_data::point::control1].y << ' ' << m_axis.points[segment_data::point::control1].z << ' ' - << m_axis.points[segment_data::point::control2].x << ' ' << m_axis.points[segment_data::point::control2].y << ' ' << m_axis.points[segment_data::point::control2].z << ' ' - << m_axis.points[segment_data::point::end].x << ' ' << m_axis.points[segment_data::point::end].y << ' ' << m_axis.points[segment_data::point::end].z << ' ' << m_axis.rolls[1] << ' ' - << m_axis.radius << ' '; + Output << road.axis.points[segment_data::point::start].x << ' ' << road.axis.points[segment_data::point::start].y << ' ' << road.axis.points[segment_data::point::start].z << ' ' << road.axis.rolls[0] << ' ' + << road.axis.points[segment_data::point::control1].x << ' ' << road.axis.points[segment_data::point::control1].y << ' ' << road.axis.points[segment_data::point::control1].z << ' ' + << road.axis.points[segment_data::point::control2].x << ' ' << road.axis.points[segment_data::point::control2].y << ' ' << road.axis.points[segment_data::point::control2].z << ' ' + << road.axis.points[segment_data::point::end].x << ' ' << road.axis.points[segment_data::point::end].y << ' ' << road.axis.points[segment_data::point::end].z << ' ' << road.axis.rolls[1] << ' ' + << road.axis.radius << ' '; Output.precision(precision); // lanes - Output << "lanes " << m_forward << ' ' << m_backward << ' ' << "width " << m_lanewidth << ' '; - if (m_velocity > 0.f) + Output << "lanes " << road.forward << ' ' << road.backward << ' ' << "width " << road.lanewidth << ' '; + if (road.velocity > 0.f) { - Output << "velocity " << m_velocity << ' '; + Output << "velocity " << road.velocity << ' '; } - for (std::size_t lane = 0; lane < m_lanes.size(); ++lane) + for (std::size_t lane = 0; lane < road.lanes.size(); ++lane) { - if (m_lanes[lane].width != m_lanewidth) + if (road.lanes[lane].width != road.lanewidth) { - Output << "lane " << lane_id(lane) << " width " << m_lanes[lane].width << ' '; + Output << "lane " << road.lane_id(lane) << " width " << road.lanes[lane].width << ' '; } - if (m_lanes[lane].velocity != m_velocity) + if (road.lanes[lane].velocity != road.velocity) { - Output << "lane " << lane_id(lane) << " velocity " << m_lanes[lane].velocity << ' '; + Output << "lane " << road.lane_id(lane) << " velocity " << road.lanes[lane].velocity << ' '; } } - for (std::size_t boundary = 0; boundary < m_changes.size(); ++boundary) + for (std::size_t boundary = 0; boundary < road.changes.size(); ++boundary) { - if (m_changes[boundary] == default_change(boundary)) + if (road.changes[boundary] == road.default_change(boundary)) { continue; } - Output << "change " << lane_id(boundary) << ' ' << lane_id(boundary + 1) << ' ' << (m_changes[boundary] == change_both ? "both" : m_changes[boundary] == change_toright ? "ab" : m_changes[boundary] == change_toleft ? "ba" : "none") << ' '; + Output << "change " << road.lane_id(boundary) << ' ' << road.lane_id(boundary + 1) << ' ' << (road.changes[boundary] == change_both ? "both" : road.changes[boundary] == change_toright ? "ab" : road.changes[boundary] == change_toleft ? "ba" : "none") << ' '; } // appearance - Output << "surface " << m_surface << ' ' << "texlength " << m_texturelength << ' '; + Output << "surface " << road.surface << ' ' << "texlength " << road.texturelength << ' '; char const *sidenames[]{"left", "right"}; for (int side = 0; side < 2; ++side) { - auto const &data{m_sides[side]}; + auto const &data{road.sides[side]}; if (data.type == side_type::none) { continue; } Output << "side " << sidenames[side] << ' ' << (data.type == side_type::shoulder ? "shoulder" : "sidewalk") << ' ' << data.width << ' ' << (data.material.empty() ? "none" : data.material) << ' '; } - Output << "kerb " << m_kerbheight << ' ' << "slope " << m_slope.x << ' ' << m_slope.y << ' ' << "markings " << (m_markings == marking_colour::white ? "white" : m_markings == marking_colour::orange ? "orange" : "none") << ' '; + Output << "kerb " << road.kerbheight << ' ' << "slope " << road.slope.x << ' ' << road.slope.y << ' ' << "markings " << (road.markings == marking_colour::white ? "white" : road.markings == marking_colour::orange ? "orange" : "none") << ' '; // properties passed on to the lanes - Output << "friction " << m_friction << ' ' << "environment " << m_environment << ' '; + Output << "friction " << road.friction << ' ' << "environment " << road.environment << ' '; // footer Output << "endroad" << "\n"; @@ -934,7 +1086,7 @@ void road_table::InitRoads() } } -// generates geometry of the roads and inserts it in the region +// generates geometry of the roads and puts it in the scene void road_table::create_geometry(scene::scratch_data &Scratchpad) { if (simulation::Region == nullptr) @@ -947,11 +1099,20 @@ void road_table::create_geometry(scene::scratch_data &Scratchpad) { continue; } + if (Global.editor_session && false == Global.NvRenderer) + { + // scenery opened for editing: the road keeps its geometry apart, so it can be changed later. + // NOTE: the experimental renderer draws only what the scenery had when it was loaded + road->show(); + continue; + } + // otherwise the geometry joins the rest of the scenery, which lets it be drawn along with it at no extra cost for (auto &shape : road->create_shapes()) { - // the geometry is already where it belongs, so the placement set by the scenery isn't to be applied to it + // it's already where it belongs, so the placement set by the scenery isn't to be applied to it simulation::Region->insert(shape, Scratchpad, false); } + road->merged(true); } } diff --git a/world/Road.h b/world/Road.h index 5d4184c1e..c444ab8ab 100644 --- a/world/Road.h +++ b/world/Road.h @@ -23,6 +23,7 @@ http://mozilla.org/MPL/2.0/. namespace scene { struct scratch_data; +class basic_section; } // a piece of a road for wheeled traffic: an axis, and a cross-section which stays the same along it. @@ -60,7 +61,6 @@ class road_node : public scene::basic_node { float width{3.5f}; float velocity{-1.f}; // speed limit, none if negative - TTrack *track{nullptr}; // the generated path; owned by the path table, like every other track }; struct side_data { @@ -68,37 +68,96 @@ class road_node : public scene::basic_node float width{0.f}; std::string material; }; + // everything the scenery says about the road. the lanes go left to right when facing along the axis: + // the ones going against it, outermost first, then the ones going along it + struct state + { + segment_data axis; + int forward{1}; // number of lanes going along the axis + int backward{1}; // number of lanes going against the axis + float lanewidth{3.5f}; // what a lane gets unless it's told otherwise + float velocity{-1.f}; + std::vector lanes; + std::vector changes; // permissions to change the lane, one for each pair of neighbouring lanes + std::string surface{"asphaltdark1"}; + float texturelength{4.f}; + std::array sides; // left, right + float kerbheight{0.12f}; + glm::vec2 slope{1.f, 0.4f}; // width and drop of the bank which closes a shoulder + marking_colour markings{marking_colour::white}; + float friction{0.85f}; + float sounddistance{25.f}; + int quality{15}; + std::string environment{"flat"}; + + // brings the content to a usable form: values within their limits, an entry for each lane and for each pair of neighbours + void normalize(); + // identifier of a lane: f1..fn go along the axis and b1..bn against it, both counted outwards from where the directions meet + std::string lane_id(std::size_t const Lane) const; + // number of a lane in the left to right order, -1 if there's no lane with such identifier + int lane_index(std::string const &Id) const; + // permission to change the lane a pair of neighbouring lanes gets if the scenery doesn't say otherwise + int default_change(std::size_t const Boundary) const; + // distance of the middle of a lane from the axis, positive to the left when facing along the axis + double lane_offset(std::size_t const Lane) const; + // combined width of the lanes + double width() const; + // shape of the middle of a lane, laid out in the direction of travel + segment_data lane_path(std::size_t const Lane) const; + // length of the axis + double length() const; + // position on the axis and direction of the axis, for specified value of the curve parameter + glm::dvec3 point(double const T) const; + glm::dvec3 tangent(double const T) const; + }; // constructors explicit road_node(scene::node_data const &Nodedata); // methods // restores content of the node from provided input stream; reads up to and including the closing 'endroad' void import(cParser &Input, glm::dvec3 const &Offset); + state const &definition() const + { + return m_state; + } + // replaces what the node knows about the road. the lanes and the geometry stay the way they were made, + // it's up to the caller to take them down beforehand and make them again + void define(state const &State); // creates paths of the lanes and hands them over to the simulation void create_lanes(); // links lanes of opposite directions at an end of the road which leads nowhere, so the vehicles can turn back void close_ends(); + // gives up the paths of the lanes, or the ones made to close the loose ends. the paths belong to the path table, + // the caller is expected to take them out of use + std::vector release_lanes(); + std::vector release_turns(); + // paths of the lanes, in the order of the lanes, and the ones made to close the loose ends + std::vector const &tracks() const + { + return m_tracks; + } + std::vector const &turns() const + { + return m_turns; + } + // true if there's a vehicle on any path of the road + bool occupied() const; // generates geometry of the surface, the sides and the markings std::vector create_shapes() const; - // identifier of a lane: f1..fn go along the axis and b1..bn against it, both counted outwards from where the directions meet - std::string lane_id(std::size_t const Lane) const; - // distance of the middle of a lane from the axis, positive to the left when facing along the axis - double lane_offset(std::size_t const Lane) const; - // combined width of the lanes - double width() const; - // lanes, left to right when facing along the axis: the ones going against it, outermost first, then the ones going along it - std::vector const &lanes() const + // puts geometry of the road in the scene as shapes of its own, which can be taken back + void show(); + // takes back geometry put in the scene by show() + void hide(); + // marks geometry of the road as mixed with other shapes of the scenery; such road can't be changed anymore + void merged(bool const Merged) { - return m_lanes; + m_merged = Merged; } - // permissions to change the lane, one for each pair of neighbouring lanes - std::vector const &lane_changes() const + bool merged() const { - return m_changes; - } - segment_data const &axis() const - { - return m_axis; + return m_merged; } + // members + bool m_editorremoved{false}; // removed in the editor; kept around so the removal can be undone private: // methods @@ -110,33 +169,17 @@ class road_node : public scene::basic_node void deserialize_(std::istream &Input) override; // export() subclass details, sends basic content of the class in legacy (text) format to provided stream void export_as_text_(std::ostream &Output) const override; - // number of a lane in the left to right order, -1 if the road has no lane with such identifier - int lane_index(std::string const &Id) const; - // permission to change the lane a pair of neighbouring lanes gets if the scenery doesn't say otherwise - int default_change(std::size_t const Boundary) const; - // shape of the middle of a lane, laid out in the direction of travel - segment_data lane_path(std::size_t const Lane) const; // creates a path for the vehicles and registers it with the simulation TTrack *create_track(std::string const &Name, segment_data const &Path, float const Width, float const Velocity); // members - segment_data m_axis; - int m_forward{1}; // number of lanes going along the axis - int m_backward{1}; // number of lanes going against the axis - float m_lanewidth{3.5f}; - float m_velocity{-1.f}; - std::vector m_lanes; - std::vector m_changes; - std::string m_surface{"asphaltdark1"}; - float m_texturelength{4.f}; - std::array m_sides; // left, right - float m_kerbheight{0.12f}; - glm::vec2 m_slope{1.f, 0.4f}; // width and drop of the bank which closes a shoulder - marking_colour m_markings{marking_colour::white}; - float m_friction{0.85f}; - float m_sounddistance{25.f}; - int m_quality{15}; - std::string m_environment{"flat"}; - std::vector m_turns; // paths made to close loose ends of the road + state m_state; + std::vector m_tracks; + std::vector m_turns; + bool m_merged{false}; + // geometry put in the scene by show() + gfx::geometrybank_handle m_bank{0, 0}; + std::vector m_geometry; + scene::basic_section *m_section{nullptr}; }; // collection of roads present in the scene @@ -146,7 +189,7 @@ class road_table : public basic_table public: // legacy style initialization, to be performed when the tracks are already joined void InitRoads(); - // generates geometry of the roads and inserts it in the region + // generates geometry of the roads and puts it in the scene void create_geometry(scene::scratch_data &Scratchpad); }; From daeed40f1539c46228ea748eee8480d73841dca3 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Sat, 3 Oct 2026 20:28:37 +0200 Subject: [PATCH 079/430] feat(roads): junctions, height above the ground and rounded profile following the terrain --- application/editormode.cpp | 73 ++- application/editormode.h | 29 +- application/editormoderoad.cpp | 464 ++++++++++++-- editor/editorRoad.cpp | 463 +++++++++++++- editor/editorRoad.hpp | 60 +- scene/scenelayerssave.cpp | 74 +++ simulation/simulation.cpp | 1 + simulation/simulation.h | 1 + simulation/simulationstateserializer.cpp | 25 +- utilities/Classes.h | 2 + world/Road.cpp | 734 ++++++++++++++++++++++- world/Road.h | 138 ++++- world/Track.h | 2 +- 13 files changed, 1963 insertions(+), 103 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 37a779dcf..7053fe6a1 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -231,11 +231,13 @@ namespace }; // appends triangles of a shape node which overlap specified XZ rectangle - void gather_shape_triangles(scene::shape_node const &Shape, glm::dvec2 const &Min, glm::dvec2 const &Max, std::vector &Out) + void gather_shape_triangles(scene::shape_node const &Shape, glm::dvec2 const &Min, glm::dvec2 const &Max, std::vector &Out, bool const Skiproads = false) { auto const &data = Shape.data(); if (editor_orthophoto::owns(data.geometry)) return; // the orthophoto laid over the ground isn't ground itself + if (Skiproads && owned_shapes::owns(data.geometry)) + return; // neither are the roads, for the ones which ask where to put a road if (data.area.radius >= 0.0f) { double const r = data.area.radius; @@ -275,7 +277,7 @@ namespace // ground triangles overlapping an XZ rectangle (Min/Max are x,z). shapes hold the (legacy) terrain, // model instances at least ModelRadius large (if ModelsAsGround) the terrain tiles - void gather_ground_triangles(glm::dvec2 const &Min, glm::dvec2 const &Max, bool const ModelsAsGround, float const ModelRadius, std::vector &Out) + void gather_ground_triangles(glm::dvec2 const &Min, glm::dvec2 const &Max, bool const ModelsAsGround, float const ModelRadius, std::vector &Out, bool const Skiproads = false) { glm::dvec2 const center = (Min + Max) * 0.5; float const radius = static_cast(glm::length(Max - Min) * 0.5); @@ -283,7 +285,7 @@ namespace for (auto *section : sections) { for (auto const &shape : section->m_shapes) - gather_shape_triangles(shape, Min, Max, Out); + gather_shape_triangles(shape, Min, Max, Out, Skiproads); for (auto &cell : section->m_cells) { double const r = cell.m_area.radius; @@ -349,6 +351,71 @@ editor_mode::editor_mode() { }); } +std::vector editor_mode::ground_heights(std::vector const &Points, bool const Fresh) +{ + std::vector heights; + heights.reserve(Points.size()); + for (auto const &point : Points) + heights.push_back(point.y); + if (Points.empty() || simulation::Region == nullptr) + return heights; + + glm::dvec2 bmin{Points.front().x, Points.front().z}; + glm::dvec2 bmax{bmin}; + for (auto const &point : Points) + { + bmin = glm::min(bmin, glm::dvec2{point.x, point.z}); + bmax = glm::max(bmax, glm::dvec2{point.x, point.z}); + } + // the road tools ask about the same place frame after frame, so the ground is gathered with room to spare and kept for a moment + struct ground_cache + { + glm::dvec2 min{0.0}; + glm::dvec2 max{0.0}; + std::unique_ptr grid; + double time{0.0}; + }; + static ground_cache cache; + double constexpr cache_margin = 60.0; + double constexpr cache_lifetime = 5.0; + double const now = ImGui::GetTime(); + if (Fresh || cache.grid == nullptr || now < cache.time || now - cache.time > cache_lifetime || bmin.x < cache.min.x || bmin.y < cache.min.y || bmax.x > cache.max.x || bmax.y > cache.max.y) + { + cache.min = bmin - glm::dvec2{cache_margin}; + cache.max = bmax + glm::dvec2{cache_margin}; + std::vector triangles; + // the same ground as the area fill uses, terrain tile models included + gather_ground_triangles(cache.min, cache.max, true, 50.0f, triangles, true); + cache.grid = std::make_unique(std::move(triangles), cache.min, cache.max); + cache.time = now; + } + + // surfaces much higher than the point are something it's under, rather than the ground + double constexpr height_tolerance = 50.0; + auto const terrains = active_terrains(); + for (std::size_t i = 0; i < Points.size(); ++i) + { + auto const &p = Points[i]; + double const ceiling = p.y + height_tolerance; + double y = 0.0; + bool found = cache.grid->height_at(p.x, p.z, ceiling, y); + for (editor_terrain *terrain : terrains) + { + if (!terrain->contains(p.x, p.z)) + continue; + double const h = terrain->height_at(p.x, p.z); + if (h <= ceiling && (!found || h > y)) + { + y = h; + found = true; + } + } + if (found) + heights[i] = y; + } + return heights; +} + editor_ui *editor_mode::ui() const { return static_cast(m_userinterface.get()); diff --git a/application/editormode.h b/application/editormode.h index f7cfff48e..125625590 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -110,6 +110,8 @@ class editor_mode : public application_mode std::vector> roads; // road pieces with what they were like before the change std::vector roads_created; std::vector roads_removed; + std::vector junctions_created; + std::vector junctions_removed; }; void push_snapshot(scene::basic_node *node, EditorSnapshot::Action Action = EditorSnapshot::Action::Move, std::string const &Serialized = std::string()); @@ -491,8 +493,9 @@ class editor_mode : public application_mode { bool window{false}; // the road window is open, the left mouse button belongs to its tools bool lanes{true}; // lanes of the roads are drawn as trajectories - int tool{0}; // 0: select, 1: build + int tool{0}; // 0: select, 1: build, 2: junction road_node *selected{nullptr}; + junction_node *junction{nullptr}; // selected junction road_node::state settings; // layout shown in the window: of the selected piece, or of the pieces about to be built bool whole{true}; // layout changes go to every piece of the road the selected one belongs to bool chain{false}; // the point to build from is set @@ -500,6 +503,18 @@ class editor_mode : public application_mode glm::dvec2 direction{0.0, 1.0}; // the way it has to leave that point bool hasdirection{false}; bool reversed{false}; // the pieces are laid from their ends, to carry on a road from its start + double grade{0.0}; // slope the next piece has to start with, to carry on what it's attached to + bool hasgrade{false}; + float offset{0.1f}; // height above the ground the roads and junctions are built at + bool follow{true}; // built roads are led over the ground between the clicked points + int kind{0}; // kind of the junctions being placed, an editor_road::junction_kind + float crossingspeed{30.f}; // speed limit on the junctions being placed + // what a click would make at the moment, worked out once a frame for display + std::vector preview; + junction_node::state previewjunction; + bool hasjunction{false}; + editor_road::loose_end previewsnap; + std::string previewerror; glm::dvec3 mouse{0.0}; std::string status; char surface[128]{}; @@ -513,12 +528,20 @@ class editor_mode : public application_mode void update_road_tool(); void road_click(); void road_select(road_node *Road); + void junction_select(junction_node *Junction); + void junction_click(); + bool junction_preview(junction_node::state &State, editor_road::loose_end &Snap, std::string &Error) const; void road_apply(); bool road_delete(); bool road_split(); void road_cancel(); - std::vector road_preview(editor_road::loose_end &Snap, std::string &Error) const; - void push_road_snapshot(std::vector> States, std::vector Created, std::vector Removed); + // Fresh: the ground is looked up anew instead of going by what was gathered for the previous frames + std::vector road_preview(editor_road::loose_end &Snap, std::string &Error, bool const Fresh); + void road_profile(std::vector &Pieces, editor_road::loose_end const &Snap, bool const Fresh); + // height of the ground under each of the points, with the roads not taken for the ground. a point with nothing under it keeps its height + std::vector ground_heights(std::vector const &Points, bool const Fresh); + void push_road_snapshot(std::vector> States, std::vector Created, std::vector Removed, std::vector Junctionscreated = {}, + std::vector Junctionsremoved = {}); void restore_road_snapshot(EditorSnapshot const &Snapshot, std::vector &Opposite, bool const Undo); road_tool m_roadtool; }; diff --git a/application/editormoderoad.cpp b/application/editormoderoad.cpp index 27210dc2c..2dcba2237 100644 --- a/application/editormoderoad.cpp +++ b/application/editormoderoad.cpp @@ -20,6 +20,7 @@ http://mozilla.org/MPL/2.0/. #include "imgui/imgui.h" #include #include +#include #include namespace @@ -108,10 +109,16 @@ std::string lower_case(std::string Text) double const kSnapRadius{4.0}; // an end of a road this close to the cursor is what the click is taken to mean double const kReach{3000.0}; // clicks landing further than this are taken for misses double const kLaneRange{600.0}; // lanes are drawn for the roads this close to the camera +double const kLongestStretch{2000.0}; // a single click doesn't lead a road further than this +// lengths of the pieces a road following the ground is tried with, from the longest; the first one to fit the ground is taken +double const kProfileSteps[]{50.0, 25.0, 12.5}; +double const kSunkTolerance{0.05}; // how far under the height it's built at the road can get between the points it's led through +double const kRaisedTolerance{0.5}; // and how far over it ImU32 const kForwardColor{IM_COL32(70, 230, 110, 230)}; ImU32 const kBackwardColor{IM_COL32(255, 170, 50, 230)}; ImU32 const kTurnColor{IM_COL32(210, 210, 210, 150)}; +ImU32 const kWayColor{IM_COL32(120, 200, 255, 170)}; ImU32 const kSelectedColor{IM_COL32(40, 220, 255, 230)}; ImU32 const kPreviewColor{IM_COL32(255, 210, 60, 255)}; ImU32 const kRefusedColor{IM_COL32(240, 60, 60, 255)}; @@ -134,12 +141,29 @@ void editor_mode::update_road_tool() auto &tool{m_roadtool}; if (tool.selected != nullptr && tool.selected->m_editorremoved) tool.selected = nullptr; + if (tool.junction != nullptr && tool.junction->m_editorremoved) + tool.junction = nullptr; + tool.preview.clear(); + tool.hasjunction = false; + tool.previewsnap = {}; + tool.previewerror.clear(); if (false == tool.window) { tool.chain = false; return; } - tool.mouse = Global.pCamera.Pos + GfxRenderer->Mouse_Position(); + glm::dvec3 const camera{Global.pCamera.Pos}; + tool.mouse = camera + GfxRenderer->Mouse_Position(); + if (glm::distance(tool.mouse, camera) > kReach) + { + tool.previewerror = "The cursor isn't over anything near enough"; + return; + } + // what a click would make at the moment, to be drawn over the view + if (tool.tool == 1 && tool.chain) + tool.preview = road_preview(tool.previewsnap, tool.previewerror, false); + else if (tool.tool == 2) + tool.hasjunction = junction_preview(tool.previewjunction, tool.previewsnap, tool.previewerror); } void editor_mode::road_select(road_node *Road) @@ -148,6 +172,7 @@ void editor_mode::road_select(road_node *Road) tool.selected = Road; if (Road != nullptr) { + tool.junction = nullptr; tool.settings = Road->definition(); std::string reason; tool.status = "Selected: " + (Road->name().empty() ? std::string{"(unnamed road)"} : Road->name()); @@ -159,20 +184,33 @@ void editor_mode::road_select(road_node *Road) copy_text(tool.sides[side], sizeof(tool.sides[side]), tool.settings.sides[side].material); } +void editor_mode::junction_select(junction_node *Junction) +{ + auto &tool{m_roadtool}; + tool.junction = Junction; + if (Junction == nullptr) + return; + tool.selected = nullptr; + std::string reason; + tool.status = "Selected: " + Junction->name(); + if (false == editor_road::can_edit(*Junction, &reason)) + tool.status += ". It can't be removed: " + reason; +} + void editor_mode::road_cancel() { m_roadtool.chain = false; } -std::vector editor_mode::road_preview(editor_road::loose_end &Snap, std::string &Error) const +std::vector editor_mode::road_preview(editor_road::loose_end &Snap, std::string &Error, bool const Fresh) { auto const &tool{m_roadtool}; Snap = editor_road::find_end(tool.mouse, kSnapRadius); // the end the road is being drawn from isn't somewhere to lead it to - if (Snap.road != nullptr && glm::distance(Snap.position, tool.point) < 0.5) + if (Snap.valid() && glm::distance(Snap.position, tool.point) < 0.5) Snap = {}; glm::dvec2 enddirection{0.0, 1.0}; - if (Snap.road != nullptr) + if (Snap.valid()) { glm::dvec2 const outwards{Snap.outwards.x, Snap.outwards.z}; if (glm::length(outwards) > 1e-6) @@ -180,7 +218,204 @@ std::vector editor_mode::road_preview(editor_road::loose_end &Snap else Snap = {}; } - return editor_road::plan(tool.point, tool.hasdirection ? &tool.direction : nullptr, Snap.road != nullptr ? Snap.position : tool.mouse, Snap.road != nullptr ? &enddirection : nullptr, Global.ctrlState, Error); + // in the open the road is put over what's under the cursor + auto const target{Snap.valid() ? Snap.position : tool.mouse + glm::dvec3{0.0, tool.offset, 0.0}}; + if (glm::distance(tool.point, target) > kLongestStretch) + { + Error = "Too far from the last point"; + return {}; + } + if (Snap.junction != nullptr) + { + // the junction has its ways through made for a set of lanes at each arm + auto const arriving{tool.reversed ? tool.settings.backward : tool.settings.forward}; + auto const leaving{tool.reversed ? tool.settings.forward : tool.settings.backward}; + if (arriving != Snap.backward || leaving != Snap.forward || std::abs(tool.settings.lanewidth - Snap.width) > 0.01f) + { + char width[32]; + std::snprintf(width, sizeof(width), "%.2f", Snap.width); + Error = "This arm of the junction takes a road with " + std::to_string(Snap.backward) + " lane(s) leading into it and " + std::to_string(Snap.forward) + " out of it, " + width + " m wide each"; + return {}; + } + } + auto pieces{editor_road::plan(tool.point, tool.hasdirection ? &tool.direction : nullptr, target, Snap.valid() ? &enddirection : nullptr, Global.ctrlState, Error)}; + road_profile(pieces, Snap, Fresh); + return pieces; +} + +// gives the pieces laid out by the planner their heights: over the ground if the road is to follow it, with the slopes +// of the pieces matched where they meet, and with what the road is attached to +void editor_mode::road_profile(std::vector &Pieces, editor_road::loose_end const &Snap, bool const Fresh) +{ + auto const &tool{m_roadtool}; + if (Pieces.empty()) + return; + // an end of a road or an arm of a junction is reached with the slope it has + double endgrade{0.0}; + if (Snap.valid()) + { + auto const run{glm::length(glm::dvec2{Snap.outwards.x, Snap.outwards.z})}; + endgrade = (run > 1e-6 ? -Snap.outwards.y / run : 0.0); + } + auto const *firstgrade{tool.hasgrade ? &tool.grade : nullptr}; + auto const *lastgrade{Snap.valid() ? &endgrade : nullptr}; + if (false == tool.follow) + { + // straight from a point to the next one, the way a ramp or a viaduct goes + std::vector heights; + for (auto const &piece : Pieces) + heights.emplace_back(piece.points[segment_data::point::start].y); + heights.emplace_back(Pieces.back().points[segment_data::point::end].y); + editor_road::profile(Pieces, heights, firstgrade, lastgrade); + return; + } + auto const planned{Pieces}; + bool fresh{Fresh}; + for (auto const step : kProfileSteps) + { + Pieces = editor_road::refine(planned, step); + auto const count{Pieces.size()}; + // the ground is looked up where the pieces meet, and in the middle of each to see how the result fits it + std::vector points; + points.reserve(2 * count + 1); + for (auto const &piece : Pieces) + points.emplace_back(piece.points[segment_data::point::start]); + points.emplace_back(Pieces.back().points[segment_data::point::end]); + for (auto const &piece : Pieces) + points.emplace_back(path_point(piece, 0.5)); + // the planner leads the road between its ends, which are over the ground already + for (auto &point : points) + point.y -= tool.offset; + auto ground{ground_heights(points, fresh)}; + fresh = false; + for (auto &height : ground) + height += tool.offset; + std::vector heights(ground.begin(), ground.begin() + count + 1); + // the ends are where they were put + heights.front() = Pieces.front().points[segment_data::point::start].y; + heights.back() = Pieces.back().points[segment_data::point::end].y; + editor_road::profile(Pieces, heights, firstgrade, lastgrade); + // shorter pieces are called for if the ground shows through the road, or the road hangs over it. + // the pieces attached to something are let off, as they have to get to its height one way or another + bool fits{true}; + for (std::size_t i = 0; i < count; ++i) + { + if ((i == 0 && firstgrade != nullptr) || (i + 1 == count && lastgrade != nullptr)) + continue; + auto const over{path_point(Pieces[i], 0.5).y - ground[count + 1 + i]}; + if (over < -kSunkTolerance || over > kRaisedTolerance) + { + fits = false; + break; + } + } + if (fits) + break; + } +} + +// lays out the junction a click would make. returns: false if there's none to make, with the reason in Error unless +// it's a matter of the first click being still ahead +bool editor_mode::junction_preview(junction_node::state &State, editor_road::loose_end &Snap, std::string &Error) const +{ + auto const &tool{m_roadtool}; + auto const kind{static_cast(std::clamp(tool.kind, 0, 3))}; + Snap = {}; + junction_node::state state; + // the look goes after the road the junction is made for + auto const dress = [&state](road_node::state const &Layout) { + state.surface = Layout.surface; + state.texturelength = Layout.texturelength; + state.markings = Layout.markings; + state.friction = Layout.friction; + state.sounddistance = Layout.sounddistance; + state.quality = Layout.quality; + state.environment = Layout.environment; + }; + if (false == tool.chain) + { + // at a loose end of a road the junction is made for that road, and put right past its end + Snap = editor_road::find_end(tool.mouse, kSnapRadius, false); + if (Snap.road == nullptr) + return false; + auto const &layout{Snap.road->definition()}; + glm::dvec2 const outwards{Snap.outwards.x, Snap.outwards.z}; + if (glm::length(outwards) < 1e-6 || layout.lanes.empty()) + { + Error = "There's no telling which way this road goes at its end"; + return false; + } + // the ways through the junction start and end where the lanes of the road are expected, which takes lanes of the same width + auto const width{layout.lanes.front().width}; + for (auto const &lane : layout.lanes) + { + if (std::abs(lane.width - width) > 0.01f) + { + Error = "Lanes of this road differ in width, and a junction takes roads with lanes of the same width"; + return false; + } + } + state = editor_road::junction(kind, Snap.position, glm::normalize(outwards), Snap.atend ? layout.forward : layout.backward, Snap.atend ? layout.backward : layout.forward, width); + dress(layout); + } + else + { + // in the open the centre is set already, and the cursor shows where the first road comes from + glm::dvec2 const away{tool.mouse.x - tool.point.x, tool.mouse.z - tool.point.z}; + if (glm::length(away) < 1.0) + { + Error = "Move the cursor away from the centre to turn the junction"; + return false; + } + auto const heading{-glm::normalize(away)}; + auto const &layout{tool.settings}; + auto const reach{editor_road::junction_reach(layout.forward + layout.backward, layout.lanewidth)}; + glm::dvec3 const entry{tool.point.x - heading.x * reach, tool.point.y, tool.point.z - heading.y * reach}; + state = editor_road::junction(kind, entry, heading, layout.forward, layout.backward, layout.lanewidth); + dress(layout); + } + state.velocity = tool.crossingspeed; + state.normalize(); + State = state; + return true; +} + +void editor_mode::junction_click() +{ + auto &tool{m_roadtool}; + junction_node::state state; + editor_road::loose_end snap; + std::string error; + if (false == junction_preview(state, snap, error)) + { + if (false == error.empty()) + { + tool.status = "Can't make the junction: " + error; + } + else if (false == tool.chain) + { + // away from the roads the first click sets the centre, the second one turns the junction + tool.point = tool.mouse + glm::dvec3{0.0, tool.offset, 0.0}; + tool.chain = true; + tool.status = "Centre set"; + } + return; + } + std::string reason; + if (snap.valid() && false == editor_road::can_join(snap, &reason)) + { + tool.status = "Can't make the junction here: " + reason; + return; + } + auto const created{editor_road::create(std::vector{state})}; + if (created.empty()) + { + tool.status = "The junction wasn't created"; + return; + } + push_road_snapshot({}, {}, {}, created, {}); + tool.chain = false; + tool.status = "\"" + created.front()->name() + "\" made" + (snap.road != nullptr ? " at the end of \"" + snap.road->name() + "\"" : std::string{}) + ". Lead roads out of its arms with the Build tool"; } void editor_mode::road_click() @@ -197,9 +432,11 @@ void editor_mode::road_click() if (tool.tool == 0) { auto *road{editor_road::nearest(ground, 1.5)}; - if (road == nullptr) + auto *junction{road == nullptr ? editor_road::nearest_junction(ground) : nullptr}; + if (road == nullptr && junction == nullptr) tool.status = "No road here"; road_select(road); + junction_select(junction); return; } @@ -209,30 +446,58 @@ void editor_mode::road_click() tool.status = reason; return; } + if (tool.tool == 2) + { + junction_click(); + return; + } if (false == tool.chain) { - // first click sets where the road starts. started from a loose end of a road it carries that road on + // first click sets where the road starts. started from a loose end of a road it carries that road on, + // started from an arm of a junction it's the road the junction is made for there auto const end{editor_road::find_end(ground, kSnapRadius)}; glm::dvec2 const outwards{end.outwards.x, end.outwards.z}; - if (end.road != nullptr && glm::length(outwards) > 1e-6) + if (end.valid() && glm::length(outwards) > 1e-6) { + if (false == editor_road::can_join(end, &reason)) + { + tool.status = "Can't build from here: " + reason; + return; + } tool.point = end.position; tool.direction = glm::normalize(outwards); tool.hasdirection = true; - // carried on from its start the road keeps the direction of its axis, so the lanes stay what they were - tool.reversed = (false == end.atend); - auto const layout{end.road->definition()}; - tool.selected = nullptr; - tool.settings = layout; + tool.grade = end.outwards.y / glm::length(outwards); + tool.hasgrade = true; + tool.junction = nullptr; + if (end.road != nullptr) + { + // carried on from its start the road keeps the direction of its axis, so the lanes stay what they were + tool.reversed = (false == end.atend); + tool.settings = end.road->definition(); + tool.status = "Carrying on \"" + end.road->name() + "\" with its layout"; + } + else + { + tool.reversed = false; + tool.settings.forward = end.forward; + tool.settings.backward = end.backward; + tool.settings.lanewidth = end.width; + tool.settings.lanes.clear(); + tool.settings.changes.clear(); + tool.settings.normalize(); + tool.status = "Leading a road out of \"" + end.junction->name() + "\", with the lanes the junction has there"; + } road_select(nullptr); - tool.status = "Carrying on \"" + end.road->name() + "\" with its layout"; } else { - tool.point = ground; + tool.point = ground + glm::dvec3{0.0, tool.offset, 0.0}; tool.hasdirection = false; + tool.hasgrade = false; tool.reversed = false; tool.selected = nullptr; + tool.junction = nullptr; tool.status = "Start set"; } tool.chain = true; @@ -241,16 +506,22 @@ void editor_mode::road_click() editor_road::loose_end snap; std::string error; - auto pieces{road_preview(snap, error)}; + auto pieces{road_preview(snap, error, true)}; if (pieces.empty()) { tool.status = "Can't build this: " + error; return; } + if (snap.valid() && false == editor_road::can_join(snap, &reason)) + { + tool.status = "Can't join here: " + reason; + return; + } // where the next piece is going to carry on from auto const &last{pieces.back()}; auto const endpoint{last.points[segment_data::point::end]}; auto const tangent{last.points[segment_data::point::control2] != glm::dvec3{0.0} ? -last.points[segment_data::point::control2] : last.points[segment_data::point::end] - last.points[segment_data::point::start]}; + auto const grade{editor_road::end_grade(last)}; if (tool.reversed) { for (auto &piece : pieces) @@ -274,10 +545,10 @@ void editor_mode::road_click() return; } push_road_snapshot({}, created, {}); - if (snap.road != nullptr) + if (snap.valid()) { tool.chain = false; - tool.status = "Joined with \"" + snap.road->name() + "\""; + tool.status = "Joined with \"" + (snap.road != nullptr ? snap.road->name() : snap.junction->name()) + "\""; return; } glm::dvec2 const planar{tangent.x, tangent.z}; @@ -287,6 +558,8 @@ void editor_mode::road_click() tool.direction = glm::normalize(planar); tool.hasdirection = true; } + tool.grade = grade; + tool.hasgrade = true; tool.status = std::to_string(created.size()) + (created.size() == 1 ? " piece added" : " pieces added"); } @@ -329,16 +602,30 @@ void editor_mode::road_apply() bool editor_mode::road_delete() { auto &tool{m_roadtool}; - if (false == tool.window || tool.selected == nullptr) + if (false == tool.window || (tool.selected == nullptr && tool.junction == nullptr)) return false; - auto *road{tool.selected}; std::string reason; + if (tool.junction != nullptr) + { + auto *junction{tool.junction}; + if (false == editor_road::can_edit(*junction, &reason)) + { + tool.status = "Can't delete: " + reason; + return true; + } + editor_road::remove(std::vector{junction}); + push_road_snapshot({}, {}, {}, {}, {junction}); + tool.junction = nullptr; + tool.status = "\"" + junction->name() + "\" deleted, Ctrl+Z brings it back"; + return true; + } + auto *road{tool.selected}; if (false == editor_road::can_edit(*road, &reason)) { tool.status = "Can't delete: " + reason; return true; } - editor_road::remove({road}); + editor_road::remove(std::vector{road}); push_road_snapshot({}, {}, {road}); tool.selected = nullptr; tool.status = "\"" + road->name() + "\" deleted, Ctrl+Z brings it back"; @@ -370,29 +657,43 @@ bool editor_mode::road_split() return true; } -void editor_mode::push_road_snapshot(std::vector> States, std::vector Created, std::vector Removed) +void editor_mode::push_road_snapshot(std::vector> States, std::vector Created, std::vector Removed, std::vector Junctionscreated, + std::vector Junctionsremoved) { - if (States.empty() && Created.empty() && Removed.empty()) + if (States.empty() && Created.empty() && Removed.empty() && Junctionscreated.empty() && Junctionsremoved.empty()) return; if (m_max_history_size >= 0 && (int)m_history.size() >= m_max_history_size) m_history.erase(m_history.begin(), m_history.begin() + ((int)m_history.size() - m_max_history_size + 1)); - auto const *road = false == States.empty() ? States.front().first : false == Created.empty() ? Created.front() : Removed.front(); + // the entry is listed under the name of the first thing it's about + scene::basic_node const *node{nullptr}; + if (false == States.empty()) + node = States.front().first; + else if (false == Created.empty()) + node = Created.front(); + else if (false == Removed.empty()) + node = Removed.front(); + else if (false == Junctionscreated.empty()) + node = Junctionscreated.front(); + else + node = Junctionsremoved.front(); EditorSnapshot snap; snap.action = EditorSnapshot::Action::RoadEdit; - snap.node_name = road->name(); - snap.position = road->location(); + snap.node_name = node->name(); + snap.position = node->location(); snap.roads = std::move(States); snap.roads_created = std::move(Created); snap.roads_removed = std::move(Removed); + snap.junctions_created = std::move(Junctionscreated); + snap.junctions_removed = std::move(Junctionsremoved); m_history.push_back(std::move(snap)); g_redo.clear(); } void editor_mode::restore_road_snapshot(EditorSnapshot const &Snapshot, std::vector &Opposite, bool const Undo) { - if (Snapshot.roads.empty() && Snapshot.roads_created.empty() && Snapshot.roads_removed.empty()) + if (Snapshot.roads.empty() && Snapshot.roads_created.empty() && Snapshot.roads_removed.empty() && Snapshot.junctions_created.empty() && Snapshot.junctions_removed.empty()) return; // what the roads are like now is what the opposite operation brings back @@ -405,11 +706,15 @@ void editor_mode::restore_road_snapshot(EditorSnapshot const &Snapshot, std::vec if (Undo) { editor_road::remove(Snapshot.roads_created); + editor_road::remove(Snapshot.junctions_created); + editor_road::revive(Snapshot.junctions_removed); editor_road::revive(Snapshot.roads_removed); } else { editor_road::revive(Snapshot.roads_created); + editor_road::revive(Snapshot.junctions_created); + editor_road::remove(Snapshot.junctions_removed); editor_road::remove(Snapshot.roads_removed); } editor_road::apply(Snapshot.roads); @@ -418,6 +723,8 @@ void editor_mode::restore_road_snapshot(EditorSnapshot const &Snapshot, std::vec tool.chain = false; if (tool.selected != nullptr) road_select(tool.selected->m_editorremoved ? nullptr : tool.selected); + if (tool.junction != nullptr && tool.junction->m_editorremoved) + tool.junction = nullptr; } // draws controls for the layout of a road. returns: true if the layout was changed in a way which calls for the road to be made anew @@ -642,28 +949,71 @@ void editor_mode::render_road_window() ImGui::RadioButton("Select", &tool.tool, 0); ImGui::SameLine(); ImGui::RadioButton("Build", &tool.tool, 1); + ImGui::SameLine(); + ImGui::RadioButton("Junction", &tool.tool, 2); if (tool.tool != previoustool) { tool.chain = false; - if (tool.tool == 1) + if (tool.tool != 0) + { tool.selected = nullptr; + tool.junction = nullptr; + } } ImGui::SameLine(); ImGui::Checkbox("Show lanes", &tool.lanes); + // how the things being built are put on the ground + auto const placement = [&tool](bool const Road) { + ImGui::SetNextItemWidth(120.0f); + if (ImGui::InputFloat("Height above the ground [m]", &tool.offset, 0.05f, 0.25f, "%.2f")) + tool.offset = std::clamp(tool.offset, -10.0f, 100.0f); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "How far over the ground under the cursor the points are put.\nA few centimetres keep the surface from flickering where it lies on the ground."); + if (false == Road) + return; + ImGui::Checkbox("Follow the ground", &tool.follow); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "On: the road is led over the ground between the clicked points, in pieces as short as the ground calls for,\nwith the profile rounded so the slope doesn't change abruptly.\nOff: the road goes straight from a point to the next one, like a ramp or a viaduct."); + }; if (tool.tool == 1) { ImGui::TextDisabled("LMB: start, then each next point. Ctrl: straight ahead. Esc: finish"); - ImGui::TextDisabled("Start or end on a loose end of a road to join it"); + ImGui::TextDisabled("Start or end on a loose end of a road or an arm of a junction to join it"); if (tool.chain) { if (ImGui::Button("Finish (Esc)")) tool.chain = false; } + placement(true); ImGui::Separator(); // what's set here is what the next pieces get render_road_layout(tool.settings); } + else if (tool.tool == 2) + { + ImGui::TextDisabled("LMB on a loose end of a road: junction for that road, right past its end"); + ImGui::TextDisabled("LMB elsewhere: the centre, then the side the first road comes from. Esc: start over"); + char const *kinds[]{"Crossroads", "T: the road ends, roads to both sides", "T: the road goes on, a road to the left", "T: the road goes on, a road to the right"}; + ImGui::SetNextItemWidth(280.0f); + ImGui::Combo("Kind", &tool.kind, kinds, 4); + ImGui::SetNextItemWidth(120.0f); + if (ImGui::InputFloat("Speed limit on the junction [km/h]", &tool.crossingspeed, 5.0f, 10.0f, "%.0f")) + tool.crossingspeed = std::clamp(tool.crossingspeed, 5.0f, 200.0f); + placement(false); + ImGui::Separator(); + ImGui::TextWrapped("Away from the roads the junction is made for roads with the lanes set in the Build tool: %d + %d, %.2f m wide. Its surface and markings go after the road it's made for.", tool.settings.forward, tool.settings.backward, + tool.settings.lanewidth); + ImGui::TextWrapped("Roads are led out of the arms with the Build tool, and get the lanes the junction has there."); + } + else if (tool.junction != nullptr) + { + auto const &junction{*tool.junction}; + ImGui::Text("%s, %d arms, %d ways through", junction.name().c_str(), static_cast(junction.definition().arms.size()), static_cast(junction.movements().size())); + ImGui::TextDisabled("Speed limit %.0f km/h. The ways through are made for the roads attached at the moment", junction.definition().velocity); + if (ImGui::Button("Delete (Del)")) + road_delete(); + } else if (tool.selected != nullptr) { auto const &road{*tool.selected}; @@ -681,7 +1031,7 @@ void editor_mode::render_road_window() } else { - ImGui::TextDisabled("LMB: select a road piece"); + ImGui::TextDisabled("LMB: select a road piece or a junction"); } if (false == tool.status.empty()) { @@ -748,6 +1098,14 @@ void editor_mode::draw_road_overlay() const drawpath(turn->m_paths.front(), kTurnColor, 1.5f, 8); } } + // ways through the junctions + for (auto const *junction : simulation::Junctions.sequence()) + { + if (junction == nullptr || junction->m_editorremoved || glm::distance(junction->location(), camera) > kLaneRange) + continue; + for (auto const &way : junction->movements()) + drawpath(way, kWayColor, 1.5f, 8); + } } if (false == tool.window) return; @@ -786,6 +1144,15 @@ void editor_mode::draw_road_overlay() const drawlist->AddCircle(screen, Radius, Color, 20, 3.0f); }; + // outline of a junction: the edge of its surface, with the ends of the roads it's made for + auto const drawjunction = [&](junction_node::state const &State, ImU32 const Color) { + auto const outline{State.outline()}; + for (std::size_t i = 0; i < outline.size(); ++i) + projection.line(drawlist, outline[i], outline[(i + 1) % outline.size()], Color, 2.0f); + for (auto const &arm : State.arms) + drawpoint(arm.position, Color, 5.0f, true); + }; + if (tool.selected != nullptr && false == tool.selected->m_editorremoved) { auto const &state{tool.selected->definition()}; @@ -793,42 +1160,57 @@ void editor_mode::draw_road_overlay() const drawpoint(state.axis.points[segment_data::point::start], kSelectedColor, 6.0f, true); drawpoint(state.axis.points[segment_data::point::end], kSelectedColor, 6.0f, true); } + if (tool.junction != nullptr && false == tool.junction->m_editorremoved) + drawjunction(tool.junction->definition(), kSelectedColor); std::string hint; if (tool.tool == 1) { if (tool.chain) { - editor_road::loose_end snap; - std::string error; - auto const pieces{road_preview(snap, error)}; drawpoint(tool.point, kPreviewColor, 6.0f, true); - if (pieces.empty()) + if (tool.preview.empty()) { projection.line(drawlist, tool.point, tool.mouse, kRefusedColor, 2.0f); - hint = error + " "; + hint = tool.previewerror + " "; } - for (auto const &piece : pieces) + for (auto const &piece : tool.preview) { auto state{tool.settings}; state.axis = piece; drawroad(state, kPreviewColor); } - if (snap.road != nullptr) - drawpoint(snap.position, kSnapColor, 14.0f, false); + if (tool.previewsnap.valid()) + drawpoint(tool.previewsnap.position, kSnapColor, 14.0f, false); hint += "LMB: build up to the cursor Ctrl: straight ahead Esc: finish Ctrl+Z: undo the last piece"; } else { auto const end{editor_road::find_end(tool.mouse, kSnapRadius)}; - if (end.road != nullptr) + if (end.valid()) drawpoint(end.position, kSnapColor, 14.0f, false); - hint = "LMB: set where the road starts; on a loose end of a road (ring) to carry it on"; + hint = "LMB: set where the road starts; on a loose end of a road or an arm of a junction (ring) to carry on from there"; } } + else if (tool.tool == 2) + { + if (tool.chain) + drawpoint(tool.point, kPreviewColor, 6.0f, true); + if (tool.hasjunction) + drawjunction(tool.previewjunction, kPreviewColor); + else if (false == tool.previewerror.empty()) + hint = tool.previewerror + " "; + if (tool.previewsnap.valid()) + drawpoint(tool.previewsnap.position, kSnapColor, 14.0f, false); + hint += (tool.chain ? "LMB: make the junction, with the first road coming from the side of the cursor Esc: start over" : + tool.previewsnap.valid() ? "LMB: make the junction at the end of this road" : + "LMB: on a loose end of a road (ring) to make its junction there; elsewhere to set the centre of one"); + } else { - hint = tool.selected != nullptr ? "LMB: select a road piece K: split at the cursor Del: delete Ctrl+Z: undo" : "LMB: select a road piece"; + hint = tool.selected != nullptr ? "LMB: select a road piece or a junction K: split at the cursor Del: delete Ctrl+Z: undo" : + tool.junction != nullptr ? "LMB: select a road piece or a junction Del: delete Ctrl+Z: undo" : + "LMB: select a road piece or a junction"; } // shown above the place the track tools put their hints at ImGuiIO const &io = ImGui::GetIO(); diff --git a/editor/editorRoad.cpp b/editor/editorRoad.cpp index bb2039b29..4cbd40510 100644 --- a/editor/editorRoad.cpp +++ b/editor/editorRoad.cpp @@ -63,6 +63,72 @@ std::vector roads_at(glm::dvec3 const &Point, road_node const *Excl return result; } +// junctions with an arm at specified point +std::vector junctions_at(glm::dvec3 const &Point) +{ + std::vector result; + for (auto *junction : simulation::Junctions.sequence()) + { + if (junction == nullptr || junction->m_editorremoved) + continue; + for (auto const &arm : junction->definition().arms) + { + if (glm::distance(arm.position, Point) < kSamePoint) + { + result.emplace_back(junction); + break; + } + } + } + return result; +} + +void add_unique(std::vector &Junctions, junction_node *Junction) +{ + if (Junction != nullptr && std::find(Junctions.begin(), Junctions.end(), Junction) == Junctions.end()) + Junctions.emplace_back(Junction); +} + +// part of a path between two values of its curve parameter +segment_data subpath(segment_data const &Path, double const From, double const To) +{ + segment_data part{Path}; + auto const &p0{Path.points[segment_data::point::start]}; + auto const &p3{Path.points[segment_data::point::end]}; + part.rolls = {static_cast(Path.rolls[0] + (Path.rolls[1] - Path.rolls[0]) * From), static_cast(Path.rolls[0] + (Path.rolls[1] - Path.rolls[0]) * To)}; + if (Path.points[segment_data::point::control1] == glm::dvec3{0.0} && Path.points[segment_data::point::control2] == glm::dvec3{0.0}) + { + part.points[segment_data::point::start] = glm::mix(p0, p3, From); + part.points[segment_data::point::end] = glm::mix(p0, p3, To); + return part; + } + auto const p1{p0 + Path.points[segment_data::point::control1]}; + auto const p2{p3 + Path.points[segment_data::point::control2]}; + auto const point = [&](double const T) { + auto const u{1.0 - T}; + return u * u * u * p0 + 3.0 * u * u * T * p1 + 3.0 * u * T * T * p2 + T * T * T * p3; + }; + auto const derivative = [&](double const T) { + auto const u{1.0 - T}; + return 3.0 * u * u * (p1 - p0) + 6.0 * u * T * (p2 - p1) + 3.0 * T * T * (p3 - p2); + }; + // a part of a cubic curve is a cubic curve, with the tangents scaled to the part of the parameter range it takes + part.points[segment_data::point::start] = point(From); + part.points[segment_data::point::end] = point(To); + part.points[segment_data::point::control1] = derivative(From) * ((To - From) / 3.0); + part.points[segment_data::point::control2] = derivative(To) * (-(To - From) / 3.0); + return part; +} + +// true if there's a vehicle on any of the paths turning the traffic back at the loose ends of the road +bool turning(road_node const &Road) +{ + for (auto const *turn : Road.turns()) + if (turn != nullptr && false == turn->Dynamics.empty()) + return true; + return false; +} + void retire(std::vector const &Tracks) { for (auto *track : Tracks) @@ -138,6 +204,66 @@ bool editor_road::can_edit(road_node const &Road, std::string *Reason) if (turn != nullptr && false == turn->Dynamics.empty()) reason = "there are vehicles turning back next to it"; } + if (reason.empty()) + { + // so do the ways through the junctions it leads to + for (auto const atend : {false, true}) + for (auto const *junction : junctions_at(axis_end(Road.definition(), atend))) + if (junction->occupied()) + reason = "there are vehicles on the junction it leads to"; + } + if (false == reason.empty() && Reason != nullptr) + *Reason = reason; + return reason.empty(); +} + +bool editor_road::can_edit(junction_node const &Junction, std::string *Reason) +{ + std::string reason; + if (false == available(&reason)) + { + // reason was filled by the call + } + else if (Junction.merged()) + { + reason = "the scenery wasn't opened for editing (-edit), geometry of the junctions it came with can't be taken apart"; + } + else if (false == scene::Layers.editable(&Junction, &reason)) + { + // reason was filled by the call + } + else if (Junction.occupied()) + { + reason = "there are vehicles on it"; + } + else + { + // the roads attached to it get their loose ends closed anew + for (auto const &arm : Junction.definition().arms) + for (auto const *road : roads_at(arm.position, nullptr)) + if (turning(*road)) + reason = "there are vehicles turning back on the roads it leads to"; + } + if (false == reason.empty() && Reason != nullptr) + *Reason = reason; + return reason.empty(); +} + +bool editor_road::can_join(loose_end const &End, std::string *Reason) +{ + // what gets attached takes the place of the paths made for the end as it was + std::string reason; + if (End.road != nullptr && turning(*End.road)) + reason = "there are vehicles turning back on the road"; + if (End.junction != nullptr) + { + if (End.junction->occupied()) + reason = "there are vehicles on the junction"; + for (auto const &arm : End.junction->definition().arms) + for (auto const *road : roads_at(arm.position, nullptr)) + if (turning(*road)) + reason = "there are vehicles turning back on the roads the junction leads to"; + } if (false == reason.empty() && Reason != nullptr) *Reason = reason; return reason.empty(); @@ -155,38 +281,64 @@ std::vector editor_road::neighbours(road_node const &Road) } template -void editor_road::refresh(std::vector const &Roads, Change_ Change) +void editor_road::refresh(std::vector const &Roads, std::vector const &Junctions, Change_ Change) { - // the pieces next to the changed ones keep their shape, but what they're joined with changes + // the pieces and junctions next to the changed ones keep their shape, but what they're joined with changes. + // this takes down the paths made for the joints, so they can be made again once the change is done std::vector affected; - for (auto *road : Roads) - { - add_unique(affected, road); - for (auto *neighbour : neighbours(*road)) - add_unique(affected, neighbour); - } - for (auto *road : affected) - retire(road->release_turns()); + std::vector crossings; + auto const gather = [&]() { + std::vector roads{affected}; + std::vector junctions{crossings}; + for (auto *road : Roads) + { + add_unique(roads, road); + if (road->m_editorremoved) + continue; + for (auto *neighbour : neighbours(*road)) + add_unique(roads, neighbour); + for (auto const atend : {false, true}) + for (auto *junction : junctions_at(axis_end(road->definition(), atend))) + add_unique(junctions, junction); + } + for (auto *junction : Junctions) + add_unique(junctions, junction); + // a junction changes what the roads attached to it do at their ends + for (auto *junction : junctions) + if (false == junction->m_editorremoved) + for (auto const &arm : junction->definition().arms) + for (auto *road : roads_at(arm.position, nullptr)) + add_unique(roads, road); + for (auto *road : roads) + { + if (std::find(affected.begin(), affected.end(), road) == affected.end()) + { + retire(road->release_turns()); + affected.emplace_back(road); + } + } + for (auto *junction : junctions) + { + if (std::find(crossings.begin(), crossings.end(), junction) == crossings.end()) + { + retire(junction->release_links()); + crossings.emplace_back(junction); + } + } + }; + gather(); for (auto *road : Roads) { road->hide(); retire(road->release_lanes()); } + for (auto *junction : Junctions) + junction->hide(); Change(); - // the change could have moved the pieces next to other ones - for (auto *road : Roads) - { - for (auto *neighbour : neighbours(*road)) - { - if (std::find(affected.begin(), affected.end(), neighbour) == affected.end()) - { - retire(neighbour->release_turns()); - affected.emplace_back(neighbour); - } - } - } + // the change could have moved things next to other ones + gather(); std::vector lanes; for (auto *road : Roads) { @@ -198,6 +350,13 @@ void editor_road::refresh(std::vector const &Roads, Change_ Change) } // joins the lanes with the lanes of the neighbours, by the ends they share editor_track::commit(lanes); + for (auto *junction : Junctions) + if (false == junction->m_editorremoved) + junction->show(); + // the junctions take the lanes which end at them, what's left loose after that is closed by the roads + for (auto *junction : crossings) + if (false == junction->m_editorremoved) + junction->create_links(); for (auto *road : affected) if (false == road->m_editorremoved) road->close_ends(); @@ -227,7 +386,7 @@ std::vector editor_road::create(std::vector const scene::Layers.count(road->layer(), scene::layer_item::track); created.emplace_back(road); } - refresh(created, []() {}); + refresh(created, {}, []() {}); return created; } @@ -238,7 +397,7 @@ void editor_road::apply(std::vector> co add_unique(roads, change.first); if (roads.empty()) return; - refresh(roads, [&]() { + refresh(roads, {}, [&]() { for (auto const &change : Changes) { change.first->define(change.second); @@ -255,7 +414,7 @@ void editor_road::remove(std::vector const &Roads) add_unique(roads, road); if (roads.empty()) return; - refresh(roads, [&]() { + refresh(roads, {}, [&]() { for (auto *road : roads) { road->m_editorremoved = true; @@ -272,7 +431,7 @@ void editor_road::revive(std::vector const &Roads) add_unique(roads, road); if (roads.empty()) return; - refresh(roads, [&]() { + refresh(roads, {}, [&]() { for (auto *road : roads) { road->m_editorremoved = false; @@ -282,6 +441,68 @@ void editor_road::revive(std::vector const &Roads) }); } +std::vector editor_road::create(std::vector const &States) +{ + static int counter{0}; + std::vector created; + if (false == available()) + return created; + for (auto const &state : States) + { + scene::node_data data; + data.type = "junction"; + data.range_max = -1.0; + data.layer = scene::Layers.active(); // null_handle unless the scenery was opened for editing + do + { + data.name = "junction_" + std::to_string(++counter); + } while (simulation::Junctions.find(data.name) != nullptr); + auto *junction{new junction_node(data)}; + junction->define(state); + junction->mark_dirty(); + simulation::Junctions.insert(junction); + scene::Layers.count(junction->layer(), scene::layer_item::track); + created.emplace_back(junction); + } + refresh({}, created, []() {}); + return created; +} + +void editor_road::remove(std::vector const &Junctions) +{ + std::vector junctions; + for (auto *junction : Junctions) + if (junction != nullptr && false == junction->m_editorremoved) + add_unique(junctions, junction); + if (junctions.empty()) + return; + refresh({}, junctions, [&]() { + for (auto *junction : junctions) + { + junction->m_editorremoved = true; + scene::Layers.count(junction->layer(), scene::layer_item::track, -1); + } + }); +} + +void editor_road::revive(std::vector const &Junctions) +{ + std::vector junctions; + for (auto *junction : Junctions) + if (junction != nullptr && junction->m_editorremoved) + add_unique(junctions, junction); + if (junctions.empty()) + return; + refresh({}, junctions, [&]() { + for (auto *junction : junctions) + { + junction->m_editorremoved = false; + junction->mark_dirty(); + scene::Layers.count(junction->layer(), scene::layer_item::track); + } + }); +} + road_node *editor_road::split(road_node &Road, double const T) { if (T <= 0.001 || T >= 0.999) @@ -386,7 +607,29 @@ road_node *editor_road::nearest(glm::dvec3 const &Point, double const Margin) return result; } -editor_road::loose_end editor_road::find_end(glm::dvec3 const &Point, double const Radius) +junction_node *editor_road::nearest_junction(glm::dvec3 const &Point) +{ + junction_node *result{nullptr}; + double best{std::numeric_limits::max()}; + for (auto *junction : simulation::Junctions.sequence()) + { + if (junction == nullptr || junction->m_editorremoved) + continue; + auto const &state{junction->definition()}; + // the junction takes the ground up to the ends of the roads it's made for + double reach{0.0}; + for (auto const &arm : state.arms) + reach = std::max(reach, glm::distance(glm::dvec2{arm.position.x, arm.position.z}, glm::dvec2{state.centre.x, state.centre.z})); + auto const distance{glm::distance(glm::dvec2{state.centre.x, state.centre.z}, glm::dvec2{Point.x, Point.z})}; + if (distance > reach || std::abs(state.centre.y - Point.y) > 3.0 || distance > best) + continue; + best = distance; + result = junction; + } + return result; +} + +editor_road::loose_end editor_road::find_end(glm::dvec3 const &Point, double const Radius, bool const Junctions) { loose_end result; double best{Radius}; @@ -399,15 +642,38 @@ editor_road::loose_end editor_road::find_end(glm::dvec3 const &Point, double con { auto const position{axis_end(state, atend)}; auto const distance{glm::distance(glm::dvec2{position.x, position.z}, glm::dvec2{Point.x, Point.z})}; - if (distance > best || std::abs(position.y - Point.y) > 3.0 || false == roads_at(position, road).empty()) + if (distance > best || std::abs(position.y - Point.y) > 3.0 || false == roads_at(position, road).empty() || false == junctions_at(position).empty()) continue; best = distance; + result = loose_end{}; result.road = road; result.atend = atend; result.position = position; result.outwards = (atend ? state.tangent(1.0) : -state.tangent(0.0)); } } + if (false == Junctions) + return result; + for (auto *junction : simulation::Junctions.sequence()) + { + if (junction == nullptr || junction->m_editorremoved) + continue; + for (auto const &arm : junction->definition().arms) + { + auto const distance{glm::distance(glm::dvec2{arm.position.x, arm.position.z}, glm::dvec2{Point.x, Point.z})}; + if (distance > best || std::abs(arm.position.y - Point.y) > 3.0 || false == roads_at(arm.position, nullptr).empty()) + continue; + best = distance; + result = loose_end{}; + result.junction = junction; + result.position = arm.position; + result.outwards = glm::dvec3{arm.direction.x, 0.0, arm.direction.y}; + // a road leading away from the junction has the lanes going out of it as the ones going along its axis + result.forward = arm.outgoing; + result.backward = arm.incoming; + result.width = arm.width; + } + } return result; } @@ -535,6 +801,147 @@ std::vector editor_road::plan(glm::dvec3 const &Start, glm::dvec2 return pieces; } +double editor_road::planar_length(segment_data const &Path) +{ + auto const whole{subpath(Path, 0.0, 1.0)}; + auto const &p0{whole.points[segment_data::point::start]}; + auto const &p3{whole.points[segment_data::point::end]}; + if (whole.points[segment_data::point::control1] == glm::dvec3{0.0} && whole.points[segment_data::point::control2] == glm::dvec3{0.0}) + return glm::distance(glm::dvec2{p0.x, p0.z}, glm::dvec2{p3.x, p3.z}); + auto const p1{p0 + whole.points[segment_data::point::control1]}; + auto const p2{p3 + whole.points[segment_data::point::control2]}; + double length{0.0}; + glm::dvec2 previous{p0.x, p0.z}; + for (int i = 1; i <= 32; ++i) + { + auto const t{i / 32.0}; + auto const u{1.0 - t}; + auto const point{u * u * u * p0 + 3.0 * u * u * t * p1 + 3.0 * u * t * t * p2 + t * t * t * p3}; + glm::dvec2 const current{point.x, point.z}; + length += glm::distance(previous, current); + previous = current; + } + return length; +} + +double editor_road::end_grade(segment_data const &Path) +{ + auto const &control{Path.points[segment_data::point::control2]}; + if (control != glm::dvec3{0.0}) + { + auto const run{glm::length(glm::dvec2{control.x, control.z})}; + return run > 1e-6 ? -control.y / run : 0.0; + } + auto const length{planar_length(Path)}; + return length > 1e-6 ? (Path.points[segment_data::point::end].y - Path.points[segment_data::point::start].y) / length : 0.0; +} + +std::vector editor_road::refine(std::vector const &Pieces, double const Length) +{ + std::vector result; + for (auto const &piece : Pieces) + { + auto const count{std::max(1, static_cast(std::ceil(planar_length(piece) / std::max(1.0, Length) - 0.01)))}; + for (int i = 0; i < count; ++i) + result.emplace_back(count == 1 ? piece : subpath(piece, static_cast(i) / count, static_cast(i + 1) / count)); + } + return result; +} + +void editor_road::profile(std::vector &Pieces, std::vector Heights, double const *Startgrade, double const *Endgrade) +{ + auto const count{Pieces.size()}; + if (count == 0 || Heights.size() != count + 1) + return; + std::vector lengths(count); + for (std::size_t i = 0; i < count; ++i) + lengths[i] = std::max(0.01, planar_length(Pieces[i])); + // the heights in between are evened out, so the road doesn't ride every dip. it's never lowered though, + // as that would let the ground the heights were taken from come through the surface + { + auto const sampled{Heights}; + for (std::size_t i = 1; i < count; ++i) + Heights[i] = std::max(sampled[i], 0.25 * sampled[i - 1] + 0.5 * sampled[i] + 0.25 * sampled[i + 1]); + } + std::vector slopes(count); + for (std::size_t i = 0; i < count; ++i) + slopes[i] = (Heights[i + 1] - Heights[i]) / lengths[i]; + // slope at each joint is shared by the pieces on both its sides, which is what rounds the profile + std::vector grades(count + 1); + grades.front() = (Startgrade != nullptr ? *Startgrade : slopes.front()); + grades.back() = (Endgrade != nullptr ? *Endgrade : slopes.back()); + for (std::size_t i = 1; i < count; ++i) + { + auto const before{slopes[i - 1]}; + auto const after{slopes[i]}; + if (before * after <= 0.0) + { + // a crest or a bottom + grades[i] = 0.0; + continue; + } + auto grade{(before * lengths[i] + after * lengths[i - 1]) / (lengths[i - 1] + lengths[i])}; + // kept from overshooting the heights the road is led through + auto const limit{3.0 * std::min(std::abs(before), std::abs(after))}; + grades[i] = std::clamp(grade, -limit, limit); + } + for (std::size_t i = 0; i < count; ++i) + { + auto &piece{Pieces[i]}; + auto &start{piece.points[segment_data::point::start]}; + auto &end{piece.points[segment_data::point::end]}; + auto &control1{piece.points[segment_data::point::control1]}; + auto &control2{piece.points[segment_data::point::control2]}; + start.y = Heights[i]; + end.y = Heights[i + 1]; + if (control1 == glm::dvec3{0.0} && control2 == glm::dvec3{0.0}) + { + if (std::abs(grades[i] - slopes[i]) < 1e-4 && std::abs(grades[i + 1] - slopes[i]) < 1e-4) + continue; // even slope, the piece stays a plain straight + // a straight needs its control points spelled out to bend up or down + control1 = (end - start) / 3.0; + control2 = (start - end) / 3.0; + } + control1.y = grades[i] * glm::length(glm::dvec2{control1.x, control1.z}); + control2.y = -grades[i + 1] * glm::length(glm::dvec2{control2.x, control2.z}); + } +} + +double editor_road::junction_reach(int const Lanes, float const Width) +{ + // half of the road, and room for the corners + return 0.5 * std::max(1, Lanes) * Width + 6.0; +} + +junction_node::state editor_road::junction(junction_kind const Kind, glm::dvec3 const &Entry, glm::dvec2 const &Heading, int const Incoming, int const Outgoing, float const Width) +{ + junction_node::state state; + auto const heading{glm::length(Heading) > 1e-6 ? glm::normalize(Heading) : glm::dvec2{0.0, 1.0}}; + glm::dvec2 const left{heading.y, -heading.x}; + auto const reach{junction_reach(Incoming + Outgoing, Width)}; + auto const spot = [&](glm::dvec2 const &Direction, double const Distance) { return glm::dvec3{Entry.x + Direction.x * Distance, Entry.y, Entry.z + Direction.y * Distance}; }; + state.centre = spot(heading, reach); + auto const arm = [&](glm::dvec2 const &Direction, int const In, int const Out) { + junction_node::arm_data data; + data.position = glm::dvec3{state.centre.x + Direction.x * reach, Entry.y, state.centre.z + Direction.y * reach}; + data.direction = Direction; + data.incoming = In; + data.outgoing = Out; + data.width = Width; + state.arms.emplace_back(data); + }; + // the road the junction is entered by, then the others: what comes in by one leaves by them + arm(-heading, Incoming, Outgoing); + if (Kind == junction_kind::cross || Kind == junction_kind::tee_left || Kind == junction_kind::tee_right) + arm(heading, Outgoing, Incoming); + if (Kind == junction_kind::cross || Kind == junction_kind::tee_sides || Kind == junction_kind::tee_left) + arm(left, Outgoing, Incoming); + if (Kind == junction_kind::cross || Kind == junction_kind::tee_sides || Kind == junction_kind::tee_right) + arm(-left, Outgoing, Incoming); + state.normalize(); + return state; +} + std::vector const &editor_road::materials() { static std::vector names; diff --git a/editor/editorRoad.hpp b/editor/editorRoad.hpp index 40f21cb43..e7f7fff37 100644 --- a/editor/editorRoad.hpp +++ b/editor/editorRoad.hpp @@ -17,22 +17,42 @@ http://mozilla.org/MPL/2.0/. #include "world/Road.h" // editor operations on the roads. a road in the scenery is a string of pieces joined end to end, -// each piece being a road node with lanes and geometry of its own +// each piece being a road node with lanes and geometry of its own; roads meet at junctions class editor_road { public: - // an end of a road piece nothing is attached to + // an end of a road piece, or an arm of a junction, nothing is attached to struct loose_end { road_node *road{nullptr}; - bool atend{false}; + junction_node *junction{nullptr}; + bool atend{false}; // of a road: the end of its axis rather than the start glm::dvec3 position{0.0}; - glm::dvec3 outwards{0.0}; // direction the road would continue in + glm::dvec3 outwards{0.0}; // direction a road would continue in + // of a junction arm: lanes of a road leading away from it + int forward{0}; + int backward{0}; + float width{0.f}; + + bool valid() const + { + return road != nullptr || junction != nullptr; + } + }; + enum class junction_kind + { + cross, // four roads + tee_sides, // the road ends, with roads to both sides + tee_left, // the road goes on, with a road to the left + tee_right // the road goes on, with a road to the right }; // true if the roads can be built and changed at all. optionally explains why they can't static bool available(std::string *Reason = nullptr); - // true if specified road piece can be changed or removed. optionally explains why it can't + // true if specified road piece or junction can be changed or removed. optionally explains why it can't static bool can_edit(road_node const &Road, std::string *Reason = nullptr); + static bool can_edit(junction_node const &Junction, std::string *Reason = nullptr); + // true if a road or a junction can be attached to specified loose end. optionally explains why it can't + static bool can_join(loose_end const &End, std::string *Reason = nullptr); // makes road pieces out of provided definitions, with their lanes joined to the neighbours and geometry in the scene static std::vector create(std::vector const &States); // replaces definitions of the pieces and makes their lanes and geometry anew @@ -40,26 +60,48 @@ class editor_road // takes the pieces out of the scenery. they're kept around, so they can be brought back static void remove(std::vector const &Roads); static void revive(std::vector const &Roads); + // the same for the junctions + static std::vector create(std::vector const &States); + static void remove(std::vector const &Junctions); + static void revive(std::vector const &Junctions); // cuts the piece in two at specified point of its axis. returns: the new piece, holding the part past the cut static road_node *split(road_node &Road, double const T); // the pieces which make a single road together with specified one, in no particular order static std::vector chain(road_node &Road); // the piece under specified point, or within specified distance from it static road_node *nearest(glm::dvec3 const &Point, double const Margin); + // the junction specified point lies on + static junction_node *nearest_junction(glm::dvec3 const &Point); // value of the curve parameter for the point of the axis nearest to specified point static double nearest_parameter(road_node::state const &State, glm::dvec3 const &Point); - // end of a piece with nothing attached, within specified distance from specified point - static loose_end find_end(glm::dvec3 const &Point, double const Radius); + // end of a road with nothing attached, within specified distance from specified point; optionally arms of junctions too + static loose_end find_end(glm::dvec3 const &Point, double const Radius, bool const Junctions = true); // lays out axes of the pieces for a road leading from a point to another. the directions are optional requirements // for the road at its ends; without them it starts straight at the target, with them it bends to meet them. // returns: the axes in order, or nothing if there's no reasonable road to make, with the reason in Error static std::vector plan(glm::dvec3 const &Start, glm::dvec2 const *Direction, glm::dvec3 const &Target, glm::dvec2 const *Enddirection, bool const Straight, std::string &Error); + // cuts the pieces so none is longer than specified + static std::vector refine(std::vector const &Pieces, double const Length); + // gives a string of pieces a smooth profile running through provided heights. + // Heights: one for the start of each piece and one for the end of the last. these of the ends are kept, the others are evened out: + // the dips are filled while the tops stay, so the ground the heights were taken from doesn't come through the road. + // Startgrade, Endgrade: slopes to keep at the ends, to carry on what the road joins; nullptr for none + static void profile(std::vector &Pieces, std::vector Heights, double const *Startgrade, double const *Endgrade); + // length of the path seen from above + static double planar_length(segment_data const &Path); + // slope of the path at its end, in the direction it's laid out + static double end_grade(segment_data const &Path); + // distance from the centre of a junction to the ends of the roads it's made for + static double junction_reach(int const Lanes, float const Width); + // lays out a junction entered by a road. Entry: middle of the end of that road, Heading: the way the road goes there, + // Incoming, Outgoing: lanes of that road leading into the junction and out of it + static junction_node::state junction(junction_kind const Kind, glm::dvec3 const &Entry, glm::dvec2 const &Heading, int const Incoming, int const Outgoing, float const Width); // names of materials and images present in the texture folder, to pick from static std::vector const &materials(); private: - // takes down what depends on shape of the listed pieces, lets the caller change them, then builds it all again + // takes down what depends on the listed pieces and junctions, lets the caller change them, then builds it all again template - static void refresh(std::vector const &Roads, Change_ Change); + static void refresh(std::vector const &Roads, std::vector const &Junctions, Change_ Change); static std::vector neighbours(road_node const &Road); }; diff --git a/scene/scenelayerssave.cpp b/scene/scenelayerssave.cpp index 71bc26b3a..9fe5baf4d 100644 --- a/scene/scenelayerssave.cpp +++ b/scene/scenelayerssave.cpp @@ -857,6 +857,72 @@ save_result node_layers::save(std::vector const &Rootstatements) state.patches[source.layer].edits.emplace_back(std::move(edit)); rewritten.emplace(road); } + // road junctions, likewise + std::vector savedjunctions; + std::vector droppedjunctions; + auto const junction_text = [](junction_node &Junction, glm::dvec3 const &Offset) { + auto const definition{Junction.definition()}; + auto local{definition}; + local.centre -= Offset; + for (auto &arm : local.arms) + { + arm.position -= Offset; + } + Junction.define(local); + std::string text; + Junction.export_as_text(text); + Junction.define(definition); + text.erase(text.find_last_not_of(" \t\r\n") + 1); + return text; + }; + for (auto *junction : simulation::Junctions.sequence()) + { + if (junction == nullptr || junction->from_template()) + { + continue; + } + auto const nodelayer{resolve(junction->layer())}; + if (false == is_output(nodelayer)) + { + continue; + } + auto const lookup{m_sources.find(junction)}; + if (lookup == m_sources.end()) + { + if (junction->m_editorremoved || false == junction->dirty()) + { + continue; + } + created[nodelayer].emplace_back(junction, junction_text(*junction, layer(nodelayer).context_insert().offset)); + savedjunctions.push_back(junction); + continue; + } + auto const &source{lookup->second}; + if ((false == junction->m_editorremoved && false == junction->dirty()) || false == writable(source.layer)) + { + continue; + } + if (false == load(source.layer)) + { + return fail(state.error); + } + file_patch::edit edit; + edit.begin = source.span.begin; + edit.end = source.span.end; + if (junction->m_editorremoved) + { + droppedjunctions.push_back(junction); + } + else + { + edit.text = junction_text(*junction, source.context.offset); + edit.length = edit.text.size(); + edit.node = junction; + savedjunctions.push_back(junction); + } + state.patches[source.layer].edits.emplace_back(std::move(edit)); + rewritten.emplace(junction); + } for (auto const &erased : m_erased) { file_patch::edit edit; @@ -1308,6 +1374,14 @@ save_result node_layers::save(std::vector const &Rootstatements) { m_sources.erase(road); } + for (auto *junction : savedjunctions) + { + junction->m_dirty = false; + } + for (auto const *junction : droppedjunctions) + { + m_sources.erase(junction); + } if (removedterrain) { // binary terrain file still holds geometry of the dropped layer, have it rebuilt on the next load diff --git a/simulation/simulation.cpp b/simulation/simulation.cpp index e8e4542f0..b24ffb705 100644 --- a/simulation/simulation.cpp +++ b/simulation/simulation.cpp @@ -38,6 +38,7 @@ event_manager Events; memory_table Memory; path_table Paths; road_table Roads; +junction_table Junctions; traction_table Traction; powergridsource_table Powergrid; instance_table Instances; diff --git a/simulation/simulation.h b/simulation/simulation.h index 03448007e..67bfae0e1 100644 --- a/simulation/simulation.h +++ b/simulation/simulation.h @@ -83,6 +83,7 @@ extern event_manager Events; extern memory_table Memory; extern path_table Paths; extern road_table Roads; +extern junction_table Junctions; extern traction_table Traction; extern powergridsource_table Powergrid; extern instance_table Instances; diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index 828439609..e2598fdca 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -181,6 +181,7 @@ state_serializer::deserialize_continue(std::shared_ptr state // geometry of the roads is generated on each load instead of being kept in the binary terrain file, // so it's inserted in the region only after that file had its chance to be written simulation::Roads.create_geometry( Scratchpad ); + simulation::Junctions.create_geometry( Scratchpad ); return false; } @@ -398,6 +399,8 @@ state_serializer::deserialize_firstinit( cParser &Input, scene::scratch_data &Sc } simulation::Paths.InitTracks(); + // the junctions tie the lanes of the roads together, what's left loose after that gets closed by the roads + simulation::Junctions.InitJunctions(); simulation::Roads.InitRoads(); simulation::Traction.InitTraction(); simulation::Events.InitEvents(); @@ -521,6 +524,20 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch road->create_lanes(); scene::Layers.track( road, { sourcebegin, Input.TokenEnd() } ); } + else if( nodedata.type == "junction" ) { + + auto *junction { new junction_node( nodedata ) }; + junction->import( + Input, + ( Scratchpad.location.offset.empty() ? + glm::dvec3 { 0.0 } : + glm::dvec3 { Scratchpad.location.offset.top() } ) ); + if( false == simulation::Junctions.insert( junction ) ) { + ErrorLog( "Bad scenario: duplicate junction name \"" + junction->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + } + scene::Groups.insert( scene::Groups.handle(), junction ); + scene::Layers.track( junction, { sourcebegin, Input.TokenEnd() } ); + } else if( nodedata.type == "traction" ) { auto *traction { deserialize_traction( Input, Scratchpad, nodedata ) }; @@ -695,6 +712,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch { "dynamic", scene::layer_item::vehicle }, { "track", scene::layer_item::track }, { "road", scene::layer_item::track }, + { "junction", scene::layer_item::track }, { "traction", scene::layer_item::traction }, { "tractionpowersource", scene::layer_item::powersource }, { "model", scene::layer_item::model }, @@ -1404,6 +1422,11 @@ state_serializer::export_nodes_to_stream(std::ostream &scmfile, bool Dirty) cons road->export_as_text( scmfile ); } } + for( auto const *junction : Junctions.sequence() ) { + if( junction != nullptr && false == junction->m_editorremoved && junction->dirty() == Dirty && junction->group() == null_handle ) { + junction->export_as_text( scmfile ); + } + } // traction scmfile << "// traction\n"; for( auto const *traction : Traction.sequence() ) { @@ -1459,7 +1482,7 @@ TAnimModel *state_serializer::create_model(const std::string &src, const std::st std::pair state_serializer::preview_include(std::string const &Directive, scene::layer_context const &Context, scene::layer_handle Layer, scene::instance_handle Instance) { // statements which take more than a single token, with the tokens ending them static std::unordered_map const nodeends { - { "dynamic", "enddynamic" }, { "track", "endtrack" }, { "road", "endroad" }, { "traction", "endtraction" }, { "tractionpowersource", "end" }, { "model", "endmodel" }, + { "dynamic", "enddynamic" }, { "track", "endtrack" }, { "road", "endroad" }, { "junction", "endjunction" }, { "traction", "endtraction" }, { "tractionpowersource", "end" }, { "model", "endmodel" }, { "triangles", "endtri" }, { "triangle_strip", "endtri" }, { "triangle_fan", "endtri" }, { "lines", "endline" }, { "line_strip", "endline" }, { "line_loop", "endline" }, { "memcell", "endmemcell" }, { "eventlauncher", "end" }, { "sound", "endsound" } }; static std::unordered_map const statementends { diff --git a/utilities/Classes.h b/utilities/Classes.h index 7622a57c9..74aface6a 100644 --- a/utilities/Classes.h +++ b/utilities/Classes.h @@ -45,6 +45,8 @@ struct light_array; class particle_manager; class road_node; // kawałek drogi, z którego powstają pasy ruchu class road_table; +class junction_node; +class junction_table; struct dictionary_source; class trainset_desc; class scenery_desc; diff --git a/world/Road.cpp b/world/Road.cpp index 7553b5eb5..a0da0b620 100644 --- a/world/Road.cpp +++ b/world/Road.cpp @@ -907,26 +907,52 @@ std::vector road_node::create_shapes() const return shapes; } -// puts geometry of the road in the scene as shapes of its own, which can be taken back -void road_node::show() +namespace { - if (m_section != nullptr || m_merged || simulation::Region == nullptr || false == simulation::Region->point_inside(location())) + +// banks holding geometry put in the scene by the owned shapes +std::unordered_set ownedbanks; + +double const junction_reach{0.25}; // an end of a road this close to an arm is attached to it +double const junction_fit{0.05}; // a lane has to end this close to where the junction expects it +int const corner_steps{6}; // pieces a rounded corner is made of + +// direction on the ground as a vector in space +glm::dvec3 flat(glm::dvec2 const &Direction) +{ + return glm::dvec3{Direction.x, 0.0, Direction.y}; +} + +// direction to the left of the provided one, on the ground +glm::dvec2 left_of(glm::dvec2 const &Direction) +{ + return glm::dvec2{Direction.y, -Direction.x}; +} + +// angle of the turn from one direction to another, positive to the left +double turn_angle(glm::dvec2 const &From, glm::dvec2 const &To) +{ + return std::atan2(glm::dot(To, left_of(From)), glm::dot(To, From)); +} + +} // namespace + +// puts provided shapes in the section of the scene holding specified point +void owned_shapes::show(std::vector Shapes, glm::dvec3 const &Location) +{ + if (m_section != nullptr || Shapes.empty() || simulation::Region == nullptr || false == simulation::Region->point_inside(Location)) { return; } - auto shapes{create_shapes()}; - if (shapes.empty()) - { - return; - } - auto §ion{simulation::Region->section(location())}; + auto §ion{simulation::Region->section(Location)}; // the rest of the section has to be built by now, or it'd count our shapes as waiting for it too section.create_geometry(); if (m_bank.bank == 0 && m_bank.chunk == 0) { m_bank = GfxRenderer->Create_Bank(); + ownedbanks.emplace(m_bank.bank); } - for (auto &shape : shapes) + for (auto &shape : Shapes) { // shapes held by a section are drawn relative to its centre shape.origin(section.m_area.center); @@ -935,14 +961,14 @@ void road_node::show() shape.create_geometry(m_bank); m_geometry.emplace_back(shape.data().geometry); section.m_shapes.emplace_back(std::move(shape)); - // the section may need to reach further to keep the road from being culled at its edges + // the section may need to reach further to keep the shape from being culled at its edges section.m_area.radius = std::max(section.m_area.radius, static_cast(glm::length(section.m_area.center - centre) + radius)); } m_section = §ion; } -// takes back geometry put in the scene by show() -void road_node::hide() +// takes the shapes back +void owned_shapes::hide() { if (m_section == nullptr) { @@ -960,6 +986,650 @@ void road_node::hide() m_section = nullptr; } +// true if specified geometry was put in the scene by any object of this class +bool owned_shapes::owns(gfx::geometry_handle const &Geometry) +{ + return Geometry.bank != 0 && ownedbanks.count(Geometry.bank) != 0; +} + +// puts geometry of the road in the scene as shapes of its own, which can be taken back +void road_node::show() +{ + if (m_merged || m_shapes.shown()) + { + return; + } + m_shapes.show(create_shapes(), location()); +} + +// takes back geometry put in the scene by show() +void road_node::hide() +{ + m_shapes.hide(); +} + +// brings the content to a usable form +void junction_node::state::normalize() +{ + for (auto &arm : arms) + { + arm.incoming = std::clamp(arm.incoming, 0, 8); + arm.outgoing = std::clamp(arm.outgoing, 0, 8); + arm.width = std::max(1.f, arm.width); + arm.direction = (glm::length(arm.direction) > 1e-6 ? glm::normalize(arm.direction) : glm::dvec2{0.0, 1.0}); + } + if (texturelength < 0.01f) + { + texturelength = 4.f; + } + if (surface.empty()) + { + surface = "none"; + } + static std::array const environments{"flat", "mountains", "mountain", "canyon", "tunnel", "bridge", "bank"}; + if (std::find(environments.begin(), environments.end(), environment) == environments.end()) + { + environment = "flat"; + } +} + +// width of the road at specified arm +double junction_node::state::arm_width(std::size_t const Arm) const +{ + return Arm < arms.size() ? static_cast(arms[Arm].incoming + arms[Arm].outgoing) * arms[Arm].width : 0.0; +} + +// where a lane of an arm meets the junction; the lanes of each kind are counted from the middle of the road, starting with 1 +glm::dvec3 junction_node::state::lane_point(std::size_t const Arm, bool const Incoming, int const Lane) const +{ + auto const &arm{arms[Arm]}; + // seen from the junction the traffic coming in is on the left side of the road, and the one going out on the right + auto const divide{0.5 * arm_width(Arm) - static_cast(arm.incoming) * arm.width}; + auto const offset{Incoming ? divide + (Lane - 0.5) * arm.width : divide - (Lane - 0.5) * arm.width}; + return arm.position + flat(left_of(arm.direction)) * offset; +} + +// arms in the order they're met going around the junction +std::vector junction_node::state::arm_order() const +{ + std::vector order(arms.size()); + for (std::size_t idx = 0; idx < order.size(); ++idx) + { + order[idx] = idx; + } + // the order goes from the z axis towards the x axis, which makes triangles spanned from the centre face up + std::sort(order.begin(), order.end(), [this](std::size_t const Left, std::size_t const Right) { return std::atan2(arms[Left].direction.x, arms[Left].direction.y) < std::atan2(arms[Right].direction.x, arms[Right].direction.y); }); + return order; +} + +// edge of the surface: ends of the arms joined with rounded corners, going around the junction +std::vector junction_node::state::outline(std::vector> *Corners) const +{ + std::vector points; + auto const order{arm_order()}; + for (std::size_t idx = 0; idx < order.size(); ++idx) + { + auto const &arm{arms[order[idx]]}; + auto const &next{arms[order[(idx + 1) % order.size()]]}; + auto const halfwidth{0.5 * arm_width(order[idx])}; + auto const nexthalfwidth{0.5 * arm_width(order[(idx + 1) % order.size()])}; + // the end of the arm, then the corner leading to the next one + auto const right{arm.position - flat(left_of(arm.direction)) * halfwidth}; + auto const left{arm.position + flat(left_of(arm.direction)) * halfwidth}; + auto const nextright{next.position - flat(left_of(next.direction)) * nexthalfwidth}; + points.emplace_back(right); + points.emplace_back(left); + // the corner is bent towards the point where the edges of both roads would meet, if there's a reasonable one + auto control{0.5 * (left + nextright)}; + auto const cross{arm.direction.x * next.direction.y - arm.direction.y * next.direction.x}; + if (std::abs(cross) > 0.05) + { + // left - arm.direction * t == nextright - next.direction * s + glm::dvec2 const delta{nextright.x - left.x, nextright.z - left.z}; + auto const t{-(delta.x * next.direction.y - delta.y * next.direction.x) / cross}; + auto const s{-(delta.x * arm.direction.y - delta.y * arm.direction.x) / cross}; + if (t > 0.0 && s > 0.0 && t < 100.0 && s < 100.0) + { + control = left - flat(arm.direction) * t; + control.y = 0.5 * (left.y + nextright.y); + } + } + std::vector corner{left}; + for (int step = 1; step < corner_steps; ++step) + { + auto const t{static_cast(step) / corner_steps}; + auto const point{(1.0 - t) * (1.0 - t) * left + 2.0 * (1.0 - t) * t * control + t * t * nextright}; + points.emplace_back(point); + corner.emplace_back(point); + } + corner.emplace_back(nextright); + if (Corners != nullptr) + { + Corners->emplace_back(std::move(corner)); + } + } + return points; +} + +junction_node::junction_node(scene::node_data const &Nodedata) : basic_node(Nodedata) {} + +// restores content of the node from provided input stream; reads up to and including the closing 'endjunction' +void junction_node::import(cParser &Input, glm::dvec3 const &Offset) +{ + auto const label{m_name.empty() ? std::string{"unnamed junction"} : "junction \"" + m_name + "\""}; + + m_state = state{}; + Input.getTokens(3); + Input >> m_state.centre.x >> m_state.centre.y >> m_state.centre.z; + m_state.centre += Offset; + + auto token{Input.getToken()}; + while (false == token.empty() && token != "endjunction") + { + if (token == "arm") + { + // arm + arm_data arm; + Input.getTokens(3); + Input >> arm.position.x >> arm.position.y >> arm.position.z; + arm.position += Offset; + Input.getTokens(2); + Input >> arm.direction.x >> arm.direction.y; + Input.getTokens(3); + Input >> arm.incoming >> arm.outgoing >> arm.width; + m_state.arms.emplace_back(arm); + } + else if (token == "surface") + { + m_state.surface = Input.getToken(); + replace_slashes(m_state.surface); + } + else if (token == "texlength") + { + Input.getTokens(); + Input >> m_state.texturelength; + } + else if (token == "markings") + { + auto const colour{Input.getToken()}; + m_state.markings = (colour == "white" ? road_node::marking_colour::white : colour == "orange" ? road_node::marking_colour::orange : road_node::marking_colour::none); + } + else if (token == "velocity") + { + Input.getTokens(); + Input >> m_state.velocity; + } + else if (token == "friction") + { + Input.getTokens(); + Input >> m_state.friction; + } + else if (token == "environment") + { + m_state.environment = Input.getToken(); + } + else + { + ErrorLog("Bad junction: unknown property: \"" + token + "\" defined for " + label); + } + token = Input.getToken(); + } + if (m_state.arms.size() < 2 || m_state.arms.size() > 4) + { + ErrorLog("Bad junction: " + label + " has " + std::to_string(m_state.arms.size()) + " arms, it takes 2 to 4"); + if (m_state.arms.size() > 4) + { + m_state.arms.resize(4); + } + } + m_state.normalize(); + location(m_state.centre); +} + +void junction_node::define(state const &State) +{ + m_state = State; + m_state.normalize(); + location(m_state.centre); + m_area.radius = -1.f; +} + +// makes paths leading through the junction, between the lanes of the roads attached to it at the moment +void junction_node::create_links() +{ + m_movements.clear(); + auto const &arms{m_state.arms}; + // lanes of the roads attached to the arms; a road is attached if one of its ends is where the arm is + struct arm_lanes + { + std::vector incoming; + std::vector outgoing; + }; + std::vector lanes(arms.size()); + for (std::size_t arm = 0; arm < arms.size(); ++arm) + { + lanes[arm].incoming.assign(static_cast(arms[arm].incoming), nullptr); + lanes[arm].outgoing.assign(static_cast(arms[arm].outgoing), nullptr); + for (auto const *road : simulation::Roads.sequence()) + { + if (road == nullptr || road->m_editorremoved || road->tracks().size() != road->definition().lanes.size()) + { + continue; + } + auto const &layout{road->definition()}; + for (auto const atend : {false, true}) + { + if (glm::distance(layout.axis.points[atend ? segment_data::point::end : segment_data::point::start], arms[arm].position) > junction_reach) + { + continue; + } + // the lanes heading for this end of the road lead into the junction, the others lead out of it + for (int lane = 1; lane <= arms[arm].incoming; ++lane) + { + auto const index{layout.lane_index((atend ? "f" : "b") + std::to_string(lane))}; + if (index >= 0 && road->tracks()[index] != nullptr && glm::distance(glm::dvec3{road->tracks()[index]->CurrentSegment()->FastGetPoint_1()}, m_state.lane_point(arm, true, lane)) < junction_fit) + { + lanes[arm].incoming[lane - 1] = road->tracks()[index]; + } + } + for (int lane = 1; lane <= arms[arm].outgoing; ++lane) + { + auto const index{layout.lane_index((atend ? "b" : "f") + std::to_string(lane))}; + if (index >= 0 && road->tracks()[index] != nullptr && glm::distance(glm::dvec3{road->tracks()[index]->CurrentSegment()->FastGetPoint_0()}, m_state.lane_point(arm, false, lane)) < junction_fit) + { + lanes[arm].outgoing[lane - 1] = road->tracks()[index]; + } + } + } + } + } + + enum class way + { + left, + straight, + right + }; + struct exit_data + { + std::size_t arm; + double turn; + way kind; + TTrack *track; + }; + std::ostringstream text; + text.precision(std::numeric_limits::digits10); + auto const write_point = [&text](glm::dvec3 const &Point) { text << Point.x << ' ' << Point.y << ' ' << Point.z << ' '; }; + + for (std::size_t arm = 0; arm < arms.size(); ++arm) + { + auto const heading{-arms[arm].direction}; + // the other arms with a road to leave by, from the leftmost to the rightmost + std::vector exits; + for (std::size_t other = 0; other < arms.size(); ++other) + { + if (other == arm || std::all_of(lanes[other].outgoing.begin(), lanes[other].outgoing.end(), [](TTrack const *Track) { return Track == nullptr; })) + { + continue; + } + exits.push_back({other, turn_angle(heading, arms[other].direction), way::straight, nullptr}); + } + std::sort(exits.begin(), exits.end(), [](exit_data const &Left, exit_data const &Right) { return Left.turn > Right.turn; }); + if (exits.size() == 3) + { + exits[0].kind = way::left; + exits[2].kind = way::right; + } + else + { + auto const sideways{glm::radians(50.0)}; + for (auto &exit : exits) + { + exit.kind = (exit.turn > sideways ? way::left : exit.turn < -sideways ? way::right : way::straight); + } + if (exits.size() == 2 && exits[0].kind == exits[1].kind) + { + // two ways of the same kind are told apart by which one is more to the left + if (exits[0].kind == way::right) + { + exits[0].kind = way::straight; + } + else if (exits[0].kind == way::left) + { + exits[1].kind = way::straight; + } + else + { + exits[0].kind = way::left; + exits[1].kind = way::right; + } + } + } + auto const lanecount{static_cast(lanes[arm].incoming.size())}; + for (int lane = 1; lane <= lanecount; ++lane) + { + auto *entry{lanes[arm].incoming[lane - 1]}; + if (entry == nullptr) + { + continue; + } + // with more lanes than one the inner lane takes the left turns, the outer one the right turns, and all go straight + std::vector ways; + for (auto const &exit : exits) + { + auto const allowed{lanecount == 1 || exit.kind == way::straight || (exit.kind == way::left && lane == 1) || (exit.kind == way::right && lane == lanecount)}; + if (allowed) + { + ways.emplace_back(exit); + } + } + if (ways.empty()) + { + ways = exits; + } + for (auto &exit : ways) + { + // the lane of the same number on the road to leave by, or the nearest one there is + auto const &candidates{lanes[exit.arm].outgoing}; + for (int shift = 0; shift < static_cast(candidates.size()) && exit.track == nullptr; ++shift) + { + for (auto const index : {lane - 1 - shift, lane - 1 + shift}) + { + if (index >= 0 && index < static_cast(candidates.size()) && candidates[index] != nullptr) + { + exit.track = candidates[index]; + break; + } + } + } + if (exit.track == nullptr) + { + exit.track = candidates.back(); + } + } + ways.erase(std::remove_if(ways.begin(), ways.end(), [](exit_data const &Exit) { return Exit.track == nullptr; }), ways.end()); + if (ways.empty()) + { + continue; + } + if (ways.size() == 3) + { + // the legacy crossroads has the way straight ahead at its second point, the left one at the third and the right one at the fourth + std::swap(ways[0], ways[1]); + } + + // shape of the ways: each leaves the lane coming in the way that lane goes, and joins the lane going out the way that one goes + glm::dvec3 const start{entry->CurrentSegment()->FastGetPoint_1()}; + std::vector ends; + std::vector endcontrols; + double reach{0.0}; + for (auto const &exit : ways) + { + glm::dvec3 const end{exit.track->CurrentSegment()->FastGetPoint_0()}; + auto const span{glm::distance(start, end)}; + ends.emplace_back(end); + endcontrols.emplace_back(-flat(arms[exit.arm].direction) * (0.39 * span)); + reach += 0.39 * span / ways.size(); + } + auto const startcontrol{flat(heading) * reach}; + for (std::size_t idx = 0; idx < ways.size(); ++idx) + { + segment_data movement; + movement.points[segment_data::point::start] = start; + movement.points[segment_data::point::control1] = startcontrol; + movement.points[segment_data::point::control2] = endcontrols[idx]; + movement.points[segment_data::point::end] = ends[idx]; + m_movements.emplace_back(movement); + } + + text.str(""); + text << (ways.size() == 1 ? "road " : "cross ") << glm::distance(start, ends[0]) << ' ' << arms[arm].width << ' ' << m_state.friction << ' ' << m_state.sounddistance << ' ' << m_state.quality << " 0 " << m_state.environment << " unvis "; + // first path: from the lane coming in to the first way out + write_point(start); + text << "0 "; + write_point(startcontrol); + write_point(endcontrols[0]); + write_point(ends[0]); + text << "0 0 "; + if (ways.size() == 2) + { + // second path of a crossroads of three roads starts where the first one does + write_point(start); + text << "0 "; + write_point(startcontrol); + write_point(endcontrols[1]); + write_point(ends[1]); + text << "0 0 "; + } + else if (ways.size() == 3) + { + // second path of a crossroads of four roads runs between its third and fourth point + write_point(ends[1]); + text << "0 "; + write_point(endcontrols[1]); + write_point(endcontrols[2]); + write_point(ends[2]); + text << "0 0 "; + } + if (m_state.velocity > 0.f) + { + text << "velocity " << m_state.velocity << ' '; + } + text << "endtrack"; + auto *link{create_track(text.str(), m_links.size())}; + + // the path is tied to the lanes by hand: the lanes going out are shared by the paths from all the other arms, + // which is more than the automatic joining of path ends can express + if (ways.size() == 1) + { + entry->ConnectNextPrev(link, 0); + link->trNext = ways[0].track; + link->iNextDirection = 0; + if (ways[0].track->trPrev == nullptr) + { + ways[0].track->trPrev = link; + ways[0].track->iPrevDirection = 1; + } + } + else if (link->SwitchExtension != nullptr) + { + auto &extension{*link->SwitchExtension}; + // the points of the crossroads are stored as: first, second, fourth, third + extension.pPrevs[0] = entry; + extension.iPrevDirection[0] = 1; + extension.pNexts[0] = ways[0].track; + extension.iNextDirection[0] = 0; + extension.pPrevs[1] = (ways.size() == 3 ? ways[2].track : ways[1].track); + extension.iPrevDirection[1] = 0; + extension.pNexts[1] = (ways.size() == 3 ? ways[1].track : nullptr); + extension.iNextDirection[1] = 0; + link->Switch(0); + entry->trNext = link; + entry->iNextDirection = 0; + // the lanes going out get to know one of the paths leading to them, for whatever goes backwards + int const ends2[]{1, 2}; + int const ends3[]{1, 3, 2}; + for (std::size_t idx = 0; idx < ways.size(); ++idx) + { + if (ways[idx].track->trPrev == nullptr) + { + ways[idx].track->trPrev = link; + ways[idx].track->iPrevDirection = (ways.size() == 3 ? ends3[idx] : ends2[idx]); + } + } + } + m_links.emplace_back(link); + } + } +} + +// gives up the paths leading through the junction +std::vector junction_node::release_links() +{ + std::vector released; + released.swap(m_links); + m_movements.clear(); + return released; +} + +// true if there's a vehicle on any path of the junction +bool junction_node::occupied() const +{ + return std::any_of(m_links.begin(), m_links.end(), [](TTrack const *Track) { return Track != nullptr && false == Track->Dynamics.empty(); }); +} + +// generates geometry of the surface +std::vector junction_node::create_shapes() const +{ + std::vector shapes; + std::vector> corners; + auto const points{m_state.outline(&corners)}; + if (points.size() < 3) + { + return shapes; + } + auto const ¢re{m_state.centre}; + if (m_state.surface != "none") + { + // a fan of triangles spanned from the centre, with the image laid out flat over the ground + auto const tile{static_cast(texture_ratio(m_state.surface)) * m_state.texturelength}; + auto const vertex = [&](glm::dvec3 const &Point, glm::vec3 const &Normal) { + return world_vertex{Point, Normal, {static_cast(0.5 + (Point.x - centre.x) / tile), static_cast(0.5 + (Point.z - centre.z) / m_state.texturelength)}}; + }; + std::vector vertices; + for (std::size_t idx = 0; idx < points.size(); ++idx) + { + auto const ¤t{points[idx]}; + auto const &next{points[(idx + 1) % points.size()]}; + auto normal{glm::cross(current - centre, next - centre)}; + if (glm::length2(normal) < 1e-12) + { + continue; + } + glm::vec3 const facing{glm::normalize(normal)}; + vertices.emplace_back(vertex(centre, facing)); + vertices.emplace_back(vertex(current, facing)); + vertices.emplace_back(vertex(next, facing)); + } + if (false == vertices.empty()) + { + scene::shape_node shape; + shape.make_terrain(GfxRenderer->Fetch_Material(m_state.surface), std::move(vertices), glm::dvec3{0.0}); + shapes.emplace_back(std::move(shape)); + } + } + if (m_state.markings != road_node::marking_colour::none) + { + // edge lines carried around the corners + std::vector vertices; + glm::dvec3 const lift{0.0, line_lift, 0.0}; + glm::vec3 const upwards{0.f, 1.f, 0.f}; + for (auto const &corner : corners) + { + for (std::size_t idx = 0; idx + 1 < corner.size(); ++idx) + { + // the line keeps its distance from the edge, on the side of the centre + auto const inwards = [&](glm::dvec3 const &Point) { + auto direction{centre - Point}; + direction.y = 0.0; + return glm::length2(direction) > 1e-12 ? glm::normalize(direction) : glm::dvec3{0.0}; + }; + auto const outer0{corner[idx] + inwards(corner[idx]) * edge_inset + lift}; + auto const inner0{corner[idx] + inwards(corner[idx]) * (edge_inset + line_width) + lift}; + auto const outer1{corner[idx + 1] + inwards(corner[idx + 1]) * edge_inset + lift}; + auto const inner1{corner[idx + 1] + inwards(corner[idx + 1]) * (edge_inset + line_width) + lift}; + // the corners are listed going around the junction the way which makes these face up + vertices.push_back({inner0, upwards, {0.f, 0.f}}); + vertices.push_back({outer0, upwards, {1.f, 0.f}}); + vertices.push_back({outer1, upwards, {1.f, 1.f}}); + vertices.push_back({inner0, upwards, {0.f, 0.f}}); + vertices.push_back({outer1, upwards, {1.f, 1.f}}); + vertices.push_back({inner1, upwards, {0.f, 1.f}}); + } + } + if (false == vertices.empty()) + { + lighting_data paint; + paint.diffuse = (m_state.markings == road_node::marking_colour::white ? glm::vec4{0.92f, 0.92f, 0.92f, 1.f} : glm::vec4{0.95f, 0.5f, 0.08f, 1.f}); + paint.ambient = paint.diffuse; + scene::shape_node shape; + shape.make_terrain(GfxRenderer->Fetch_Material("colored"), std::move(vertices), glm::dvec3{0.0}); + shape.lighting(paint); + shapes.emplace_back(std::move(shape)); + } + } + return shapes; +} + +void junction_node::show() +{ + if (m_merged || m_shapes.shown()) + { + return; + } + m_shapes.show(create_shapes(), location()); +} + +void junction_node::hide() +{ + m_shapes.hide(); +} + +// creates a path through the junction from provided definition and registers it with the simulation +TTrack *junction_node::create_track(std::string const &Definition, std::size_t const Index) +{ + cParser parser(Definition, cParser::buffer_TEXT); + scene::node_data nodedata; + nodedata.range_max = -1.0; + nodedata.name = (m_name.empty() ? std::string{} : m_name + ":way" + std::to_string(Index + 1)); + nodedata.type = "track"; + auto *track{new TTrack(nodedata)}; + track->Load(&parser, glm::dvec3{0.0}); + track->m_road = this; + // NOTE: the table points the name at the newest path, which is what a junction made anew in the editor needs + simulation::Paths.insert(track); + simulation::Region->insert_and_register(track); + return track; +} + +float junction_node::radius_() +{ + float radius{0.f}; + for (std::size_t arm = 0; arm < m_state.arms.size(); ++arm) + { + radius = std::max(radius, static_cast(glm::distance(m_state.arms[arm].position, m_state.centre) + 0.5 * m_state.arm_width(arm))); + } + return radius; +} + +void junction_node::serialize_(std::ostream &Output) const +{ + // TODO: implement +} + +void junction_node::deserialize_(std::istream &Input) +{ + // TODO: implement +} + +// export() subclass details, sends basic content of the class in legacy (text) format to provided stream +void junction_node::export_as_text_(std::ostream &Output) const +{ + Output << "junction "; + auto const precision{Output.precision(std::numeric_limits::digits10)}; + Output << m_state.centre.x << ' ' << m_state.centre.y << ' ' << m_state.centre.z << ' '; + for (auto const &arm : m_state.arms) + { + Output << "arm " << arm.position.x << ' ' << arm.position.y << ' ' << arm.position.z << ' ' << arm.direction.x << ' ' << arm.direction.y << ' ' << arm.incoming << ' ' << arm.outgoing << ' ' << arm.width << ' '; + } + Output.precision(precision); + Output << "surface " << m_state.surface << ' ' << "texlength " << m_state.texturelength << ' ' << "markings " + << (m_state.markings == road_node::marking_colour::white ? "white" : m_state.markings == road_node::marking_colour::orange ? "orange" : "none") << ' ' << "velocity " << m_state.velocity << ' ' << "friction " << m_state.friction << ' ' + << "environment " << m_state.environment << ' '; + Output << "endjunction" + << "\n"; +} + // creates a path for the vehicles and registers it with the simulation TTrack *road_node::create_track(std::string const &Name, segment_data const &Path, float const Width, float const Velocity) { @@ -1116,4 +1786,42 @@ void road_table::create_geometry(scene::scratch_data &Scratchpad) } } +// legacy style initialization, to be performed when the tracks are joined, ahead of the roads +void junction_table::InitJunctions() +{ + for (auto *junction : m_items) + { + if (junction != nullptr) + { + junction->create_links(); + } + } +} + +// generates geometry of the junctions and puts it in the scene +void junction_table::create_geometry(scene::scratch_data &Scratchpad) +{ + if (simulation::Region == nullptr) + { + return; + } + for (auto *junction : m_items) + { + if (junction == nullptr) + { + continue; + } + if (Global.editor_session && false == Global.NvRenderer) + { + junction->show(); + continue; + } + for (auto &shape : junction->create_shapes()) + { + simulation::Region->insert(shape, Scratchpad, false); + } + junction->merged(true); + } +} + //--------------------------------------------------------------------------- diff --git a/world/Road.h b/world/Road.h index c444ab8ab..de77977fa 100644 --- a/world/Road.h +++ b/world/Road.h @@ -26,6 +26,27 @@ struct scratch_data; class basic_section; } +// geometry a node puts in the scene as shapes of its own, apart from the shapes of the scenery, so it can take it back +class owned_shapes +{ + public: + // puts provided shapes in the section of the scene holding specified point + void show(std::vector Shapes, glm::dvec3 const &Location); + // takes the shapes back + void hide(); + bool shown() const + { + return m_section != nullptr; + } + // true if specified geometry was put in the scene by any object of this class + static bool owns(gfx::geometry_handle const &Geometry); + + private: + gfx::geometrybank_handle m_bank{0, 0}; + std::vector m_geometry; + scene::basic_section *m_section{nullptr}; +}; + // a piece of a road for wheeled traffic: an axis, and a cross-section which stays the same along it. // the node itself is neither driven on nor drawn. it produces the lanes, which are ordinary invisible one-way tracks, // and the surface, the sides and the markings, which are ordinary shapes. this way the vehicles, the ai and the renderers @@ -176,10 +197,108 @@ class road_node : public scene::basic_node std::vector m_tracks; std::vector m_turns; bool m_merged{false}; - // geometry put in the scene by show() - gfx::geometrybank_handle m_bank{0, 0}; - std::vector m_geometry; - scene::basic_section *m_section{nullptr}; + owned_shapes m_shapes; // geometry put in the scene by show() +}; + +// a place where roads meet. each arm of the junction is where a road ends: a point in the middle of that end, the way +// the road leaves, and the lanes it has there. the junction produces the surface between the arms, and paths leading +// the vehicles from each lane coming in to the lanes going out of the other arms. a lane with more than one way out +// gets a legacy crossroads path, which is what the vehicles and their drivers already know how to pick a way through. +// scenery entry: +// node junction arm ... [ ]... endjunction +class junction_node : public scene::basic_node +{ + + public: + // types + struct arm_data + { + glm::dvec3 position{0.0}; // middle of the end of the road + glm::dvec2 direction{0.0, 1.0}; // the way out of the junction, seen from above (x, z) + int incoming{1}; // lanes leading into the junction + int outgoing{1}; // lanes leading out of it + float width{3.5f}; // width of a lane + }; + struct state + { + glm::dvec3 centre{0.0}; + std::vector arms; + std::string surface{"asphaltdark1"}; + float texturelength{4.f}; + road_node::marking_colour markings{road_node::marking_colour::white}; + float velocity{30.f}; // speed limit on the way through + float friction{0.85f}; + float sounddistance{25.f}; + int quality{15}; + std::string environment{"flat"}; + + // brings the content to a usable form + void normalize(); + // width of the road at specified arm + double arm_width(std::size_t const Arm) const; + // where a lane of an arm meets the junction; the lanes of each kind are counted from the middle of the road, starting with 1 + glm::dvec3 lane_point(std::size_t const Arm, bool const Incoming, int const Lane) const; + // arms in the order they're met going around the junction + std::vector arm_order() const; + // edge of the surface: ends of the arms joined with rounded corners, going around the junction. + // Corners, if provided, receives the points of each corner apart + std::vector outline(std::vector> *Corners = nullptr) const; + }; + // constructors + explicit junction_node(scene::node_data const &Nodedata); + // methods + // restores content of the node from provided input stream; reads up to and including the closing 'endjunction' + void import(cParser &Input, glm::dvec3 const &Offset); + state const &definition() const + { + return m_state; + } + void define(state const &State); + // makes paths leading through the junction, between the lanes of the roads attached to it at the moment + void create_links(); + // gives up the paths leading through the junction; the caller is expected to take them out of use + std::vector release_links(); + std::vector const &links() const + { + return m_links; + } + // shapes of the ways through the junction, for display + std::vector const &movements() const + { + return m_movements; + } + // true if there's a vehicle on any path of the junction + bool occupied() const; + // generates geometry of the surface + std::vector create_shapes() const; + // puts geometry of the junction in the scene as shapes of its own, or takes it back + void show(); + void hide(); + void merged(bool const Merged) + { + m_merged = Merged; + } + bool merged() const + { + return m_merged; + } + // members + bool m_editorremoved{false}; + + private: + // methods + float radius_() override; + void serialize_(std::ostream &Output) const override; + void deserialize_(std::istream &Input) override; + void export_as_text_(std::ostream &Output) const override; + // creates a path through the junction from provided definition and registers it with the simulation + TTrack *create_track(std::string const &Definition, std::size_t const Index); + // members + state m_state; + std::vector m_links; + std::vector m_movements; + bool m_merged{false}; + owned_shapes m_shapes; }; // collection of roads present in the scene @@ -193,4 +312,15 @@ class road_table : public basic_table void create_geometry(scene::scratch_data &Scratchpad); }; +// collection of road junctions present in the scene +class junction_table : public basic_table +{ + + public: + // legacy style initialization, to be performed when the tracks are joined, ahead of the roads + void InitJunctions(); + // generates geometry of the junctions and puts it in the scene + void create_geometry(scene::scratch_data &Scratchpad); +}; + //--------------------------------------------------------------------------- diff --git a/world/Track.h b/world/Track.h index 2fb9b0ce5..b894655db 100644 --- a/world/Track.h +++ b/world/Track.h @@ -186,7 +186,7 @@ public: std::vector m_paths; // source data for owned paths bool m_editorremoved { false }; - road_node *m_road { nullptr }; // road which generated this path as one of its lanes. such path is one-way, and isn't saved nor edited on its own + scene::basic_node *m_road { nullptr }; // road or road junction which generated this path. such path is one-way, and isn't saved nor edited on its own int iterate_stamp = 0; // sleepermodel optional parameter ------------------------------------------------- From 1d4c448e30cef3abd36ceadb62af5b7808f3bb61 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Sat, 3 Oct 2026 21:20:00 +0200 Subject: [PATCH 080/430] feat(roads): junctions made by leading a road out of another, width and height set at road points --- application/editormode.h | 53 ++- application/editormoderoad.cpp | 800 +++++++++++++++++++++------------ editor/editorRoad.cpp | 415 +++++++++++++++-- editor/editorRoad.hpp | 59 ++- world/Road.cpp | 106 +++-- world/Road.h | 9 +- 6 files changed, 1059 insertions(+), 383 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index 125625590..b23521791 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -107,11 +107,7 @@ class editor_mode : public application_mode std::vector> tracks; std::vector created; std::vector removed; - std::vector> roads; // road pieces with what they were like before the change - std::vector roads_created; - std::vector roads_removed; - std::vector junctions_created; - std::vector junctions_removed; + editor_road::record roads; // what a change of the roads comes to }; void push_snapshot(scene::basic_node *node, EditorSnapshot::Action Action = EditorSnapshot::Action::Move, std::string const &Serialized = std::string()); @@ -489,13 +485,25 @@ class editor_mode : public application_mode bool m_track_drag_connected{true}; // roads: a menu and a window of their own, independent from the edit modes of the toolset + // what a click of the build tool would make + struct road_plan + { + std::vector pieces; // axes of the pieces, in the order they're laid + editor_road::loose_end snap; // loose end of a road or arm of a junction the road is led to + editor_road::branch start; // junction made, or given another arm, for a road led out of the side of a road or out of a junction + bool hasstart{false}; + editor_road::branch end; // the same for a road led into the side of a road or into a junction + bool hasend{false}; + std::string error; // why there's nothing to make + }; struct road_tool { bool window{false}; // the road window is open, the left mouse button belongs to its tools bool lanes{true}; // lanes of the roads are drawn as trajectories - int tool{0}; // 0: select, 1: build, 2: junction + int tool{0}; // 0: select, 1: build road_node *selected{nullptr}; junction_node *junction{nullptr}; // selected junction + std::vector points; // selected points where the pieces meet or end road_node::state settings; // layout shown in the window: of the selected piece, or of the pieces about to be built bool whole{true}; // layout changes go to every piece of the road the selected one belongs to bool chain{false}; // the point to build from is set @@ -505,16 +513,17 @@ class editor_mode : public application_mode bool reversed{false}; // the pieces are laid from their ends, to carry on a road from its start double grade{0.0}; // slope the next piece has to start with, to carry on what it's attached to bool hasgrade{false}; - float offset{0.1f}; // height above the ground the roads and junctions are built at + // the road being built leaves the side of a road, or a junction between its roads. the point to build from is the centre + // of the junction, which gets made, or gets another arm, along with the first piece + road_node *branchroad{nullptr}; + double branchat{0.0}; // value of the curve parameter of the axis of that road + junction_node *branchjunction{nullptr}; + float offset{0.1f}; // height above the ground the roads are built at bool follow{true}; // built roads are led over the ground between the clicked points - int kind{0}; // kind of the junctions being placed, an editor_road::junction_kind - float crossingspeed{30.f}; // speed limit on the junctions being placed - // what a click would make at the moment, worked out once a frame for display - std::vector preview; - junction_node::state previewjunction; - bool hasjunction{false}; - editor_road::loose_end previewsnap; - std::string previewerror; + float crossingspeed{30.f}; // speed limit on the junctions being made + road_plan plan; // what a click would make at the moment, worked out once a frame for display + glm::dvec3 hover{0.0}; // point of a road or a junction under the cursor a road can be led out of + bool hashover{false}; glm::dvec3 mouse{0.0}; std::string status; char surface[128]{}; @@ -529,19 +538,21 @@ class editor_mode : public application_mode void road_click(); void road_select(road_node *Road); void junction_select(junction_node *Junction); - void junction_click(); - bool junction_preview(junction_node::state &State, editor_road::loose_end &Snap, std::string &Error) const; void road_apply(); bool road_delete(); bool road_split(); void road_cancel(); + // sets the width of the road, or its height, at the selected points + void road_point_width(float const Width); + void road_point_height(double const Height); + bool road_points_apply(std::vector> const &Changes, std::size_t const Skipped); // Fresh: the ground is looked up anew instead of going by what was gathered for the previous frames - std::vector road_preview(editor_road::loose_end &Snap, std::string &Error, bool const Fresh); - void road_profile(std::vector &Pieces, editor_road::loose_end const &Snap, bool const Fresh); + road_plan road_preview(bool const Fresh); + // Firstgrade, Lastgrade: slopes the road has to start and end with, nullptr for none + void road_profile(std::vector &Pieces, double const *Firstgrade, double const *Lastgrade, bool const Fresh); // height of the ground under each of the points, with the roads not taken for the ground. a point with nothing under it keeps its height std::vector ground_heights(std::vector const &Points, bool const Fresh); - void push_road_snapshot(std::vector> States, std::vector Created, std::vector Removed, std::vector Junctionscreated = {}, - std::vector Junctionsremoved = {}); + void push_road_snapshot(editor_road::record Record); void restore_road_snapshot(EditorSnapshot const &Snapshot, std::vector &Opposite, bool const Undo); road_tool m_roadtool; }; diff --git a/application/editormoderoad.cpp b/application/editormoderoad.cpp index 2dcba2237..09427d7f5 100644 --- a/application/editormoderoad.cpp +++ b/application/editormoderoad.cpp @@ -107,6 +107,10 @@ std::string lower_case(std::string Text) } double const kSnapRadius{4.0}; // an end of a road this close to the cursor is what the click is taken to mean +double const kPointRadius{2.5}; // a point where pieces meet this close to the click is what gets selected, instead of the piece +double const kPointRange{400.0}; // the points are drawn for the roads this close to the camera +double const kSideMargin{1.0}; // how far past the edge of a road the cursor still counts as being on it +double const kJoinClearance{15.0}; // a road isn't led into the side of another this close to the point it's led from double const kReach{3000.0}; // clicks landing further than this are taken for misses double const kLaneRange{600.0}; // lanes are drawn for the roads this close to the camera double const kLongestStretch{2000.0}; // a single click doesn't lead a road further than this @@ -119,11 +123,41 @@ ImU32 const kForwardColor{IM_COL32(70, 230, 110, 230)}; ImU32 const kBackwardColor{IM_COL32(255, 170, 50, 230)}; ImU32 const kTurnColor{IM_COL32(210, 210, 210, 150)}; ImU32 const kWayColor{IM_COL32(120, 200, 255, 170)}; +ImU32 const kPointColor{IM_COL32(255, 255, 255, 200)}; ImU32 const kSelectedColor{IM_COL32(40, 220, 255, 230)}; ImU32 const kPreviewColor{IM_COL32(255, 210, 60, 255)}; ImU32 const kRefusedColor{IM_COL32(240, 60, 60, 255)}; ImU32 const kSnapColor{IM_COL32(255, 60, 255, 255)}; +// gathers new definitions for the pieces which meet or end at provided points. Change: receives a definition, and which end of it is at the point. +// Skipped: receives the number of points left out for being at a junction, which is made for the road the way it is +template +std::vector> point_changes(std::vector const &Points, std::size_t &Skipped, Change_ Change) +{ + std::vector> changes; + Skipped = 0; + for (auto const &point : Points) + { + if (editor_road::at_junction(point)) + { + ++Skipped; + continue; + } + for (auto const &end : editor_road::ends_at(point)) + { + // a piece with both its ends among the points gets both changed + auto entry{std::find_if(changes.begin(), changes.end(), [&end](std::pair const &Listed) { return Listed.first == end.road; })}; + if (entry == changes.end()) + { + changes.emplace_back(end.road, end.road->definition()); + entry = std::prev(changes.end()); + } + Change(entry->second, end.atend); + } + } + return changes; +} + } void editor_mode::render_road_menu() @@ -143,10 +177,17 @@ void editor_mode::update_road_tool() tool.selected = nullptr; if (tool.junction != nullptr && tool.junction->m_editorremoved) tool.junction = nullptr; - tool.preview.clear(); - tool.hasjunction = false; - tool.previewsnap = {}; - tool.previewerror.clear(); + if ((tool.branchroad != nullptr && tool.branchroad->m_editorremoved) || (tool.branchjunction != nullptr && tool.branchjunction->m_editorremoved)) + { + // what the road was to be led out of is gone + tool.branchroad = nullptr; + tool.branchjunction = nullptr; + tool.chain = false; + } + // so are the points whose pieces were removed or changed behind the back of the selection + tool.points.erase(std::remove_if(tool.points.begin(), tool.points.end(), [](glm::dvec3 const &Point) { return editor_road::ends_at(Point).empty(); }), tool.points.end()); + tool.plan = road_plan{}; + tool.hashover = false; if (false == tool.window) { tool.chain = false; @@ -156,14 +197,30 @@ void editor_mode::update_road_tool() tool.mouse = camera + GfxRenderer->Mouse_Position(); if (glm::distance(tool.mouse, camera) > kReach) { - tool.previewerror = "The cursor isn't over anything near enough"; + tool.plan.error = "The cursor isn't over anything near enough"; return; } - // what a click would make at the moment, to be drawn over the view - if (tool.tool == 1 && tool.chain) - tool.preview = road_preview(tool.previewsnap, tool.previewerror, false); - else if (tool.tool == 2) - tool.hasjunction = junction_preview(tool.previewjunction, tool.previewsnap, tool.previewerror); + if (tool.tool != 1) + return; + if (tool.chain) + { + // what a click would make at the moment, to be drawn over the view + tool.plan = road_preview(false); + return; + } + // where a click would lead a road out of the side of a road, or out of a junction + if (editor_road::find_end(tool.mouse, kSnapRadius).valid()) + return; + if (auto const *road{editor_road::nearest(tool.mouse, kSideMargin)}; road != nullptr) + { + tool.hover = road->definition().point(editor_road::nearest_parameter(road->definition(), tool.mouse)); + tool.hashover = true; + } + else if (auto const *junction{editor_road::nearest_junction(tool.mouse)}; junction != nullptr) + { + tool.hover = junction->definition().centre; + tool.hashover = true; + } } void editor_mode::road_select(road_node *Road) @@ -194,71 +251,162 @@ void editor_mode::junction_select(junction_node *Junction) std::string reason; tool.status = "Selected: " + Junction->name(); if (false == editor_road::can_edit(*Junction, &reason)) - tool.status += ". It can't be removed: " + reason; + tool.status += ". It can't be changed: " + reason; } void editor_mode::road_cancel() { - m_roadtool.chain = false; + auto &tool{m_roadtool}; + tool.chain = false; + tool.branchroad = nullptr; + tool.branchjunction = nullptr; } -std::vector editor_mode::road_preview(editor_road::loose_end &Snap, std::string &Error, bool const Fresh) +// works out what a click of the build tool would make with the cursor where it is +editor_mode::road_plan editor_mode::road_preview(bool const Fresh) { auto const &tool{m_roadtool}; - Snap = editor_road::find_end(tool.mouse, kSnapRadius); + auto const &layout{tool.settings}; + road_plan plan; + // lanes of the road being built which lead to its far end, and the ones leading back from there + auto const arriving{tool.reversed ? layout.backward : layout.forward}; + auto const leaving{tool.reversed ? layout.forward : layout.backward}; + float lanewidth{0.f}; + auto const evenlanes{editor_road::lane_width(layout, 0.0, lanewidth)}; + char const *unevenlanes{"Lanes of the road being built differ in width, and a junction takes roads with lanes of the same width"}; + + // where the road is led to. a loose end of a road or an arm of a junction near the cursor comes first + plan.snap = editor_road::find_end(tool.mouse, kSnapRadius); // the end the road is being drawn from isn't somewhere to lead it to - if (Snap.valid() && glm::distance(Snap.position, tool.point) < 0.5) - Snap = {}; + if (plan.snap.valid() && glm::distance(plan.snap.position, tool.point) < 0.5) + plan.snap = {}; + auto target{tool.mouse + glm::dvec3{0.0, tool.offset, 0.0}}; glm::dvec2 enddirection{0.0, 1.0}; - if (Snap.valid()) + double endgrade{0.0}; + bool tied{false}; // the road has to arrive at the target in set direction, with set slope + if (plan.snap.valid()) { - glm::dvec2 const outwards{Snap.outwards.x, Snap.outwards.z}; + glm::dvec2 const outwards{plan.snap.outwards.x, plan.snap.outwards.z}; if (glm::length(outwards) > 1e-6) - enddirection = -glm::normalize(outwards); - else - Snap = {}; - } - // in the open the road is put over what's under the cursor - auto const target{Snap.valid() ? Snap.position : tool.mouse + glm::dvec3{0.0, tool.offset, 0.0}}; - if (glm::distance(tool.point, target) > kLongestStretch) - { - Error = "Too far from the last point"; - return {}; - } - if (Snap.junction != nullptr) - { - // the junction has its ways through made for a set of lanes at each arm - auto const arriving{tool.reversed ? tool.settings.backward : tool.settings.forward}; - auto const leaving{tool.reversed ? tool.settings.forward : tool.settings.backward}; - if (arriving != Snap.backward || leaving != Snap.forward || std::abs(tool.settings.lanewidth - Snap.width) > 0.01f) { - char width[32]; - std::snprintf(width, sizeof(width), "%.2f", Snap.width); - Error = "This arm of the junction takes a road with " + std::to_string(Snap.backward) + " lane(s) leading into it and " + std::to_string(Snap.forward) + " out of it, " + width + " m wide each"; - return {}; + target = plan.snap.position; + enddirection = -glm::normalize(outwards); + endgrade = -plan.snap.outwards.y / glm::length(outwards); + tied = true; + } + else + { + plan.snap = {}; } } - auto pieces{editor_road::plan(tool.point, tool.hasdirection ? &tool.direction : nullptr, target, Snap.valid() ? &enddirection : nullptr, Global.ctrlState, Error)}; - road_profile(pieces, Snap, Fresh); - return pieces; + if (plan.snap.junction != nullptr) + { + // the junction has its ways through made for a set of lanes at each arm + if (false == evenlanes || arriving != plan.snap.backward || leaving != plan.snap.forward || std::abs(lanewidth - plan.snap.width) > 0.01f) + { + char width[32]; + std::snprintf(width, sizeof(width), "%.2f", plan.snap.width); + plan.error = "This arm of the junction takes a road with " + std::to_string(plan.snap.backward) + " lane(s) leading into it and " + std::to_string(plan.snap.forward) + " out of it, " + width + " m wide each"; + return plan; + } + } + else if (false == plan.snap.valid() && glm::distance(tool.mouse, tool.point) > kJoinClearance) + { + // then the side of a road, or a junction between its roads: the road is taken in with a junction made there, or with another arm of the one which is there + auto *road{editor_road::nearest(tool.mouse, kSideMargin)}; + auto *junction{road == nullptr ? editor_road::nearest_junction(tool.mouse) : nullptr}; + if (road != nullptr && road == tool.branchroad) + road = nullptr; + if (junction != nullptr && junction == tool.branchjunction) + junction = nullptr; + if (road != nullptr || junction != nullptr) + { + if (false == evenlanes) + { + plan.error = unevenlanes; + return plan; + } + auto const t{road != nullptr ? editor_road::nearest_parameter(road->definition(), tool.mouse) : 0.0}; + auto const centre{road != nullptr ? road->definition().point(t) : junction->definition().centre}; + // seen from the junction the road comes from where it's being led from + glm::dvec2 const from{tool.point.x - centre.x, tool.point.z - centre.z}; + if (false == (road != nullptr ? editor_road::branch_from(*road, t, from, arriving, leaving, lanewidth, plan.end, plan.error) : editor_road::branch_from(*junction, from, arriving, leaving, lanewidth, plan.end, plan.error))) + return plan; + plan.hasend = true; + auto const &arm{plan.end.layout.arms[plan.end.arm]}; + target = arm.position; + enddirection = -arm.direction; + tied = true; + } + } + + // where the road starts + auto start{tool.point}; + auto direction{tool.direction}; + auto hasdirection{tool.hasdirection}; + auto startgrade{tool.grade}; + auto hasgrade{tool.hasgrade}; + if (tool.branchroad != nullptr || tool.branchjunction != nullptr) + { + // out of the side of a road, or out of a junction, in the direction of where it's led to + if (false == evenlanes) + { + plan.error = unevenlanes; + return plan; + } + glm::dvec2 const away{target.x - tool.point.x, target.z - tool.point.z}; + if (glm::length(away) < 1.0) + { + plan.error = "Move the cursor to where the road is to go"; + return plan; + } + // the axis of the road goes away from the junction, so the lanes going against it are the ones leading into the junction + if (false == (tool.branchroad != nullptr ? editor_road::branch_from(*tool.branchroad, tool.branchat, away, layout.backward, layout.forward, lanewidth, plan.start, plan.error) : + editor_road::branch_from(*tool.branchjunction, away, layout.backward, layout.forward, lanewidth, plan.start, plan.error))) + return plan; + plan.hasstart = true; + auto const &arm{plan.start.layout.arms[plan.start.arm]}; + start = arm.position; + direction = arm.direction; + hasdirection = true; + startgrade = 0.0; + hasgrade = true; + } + if (plan.hasstart && plan.hasend) + { + // the two junctions are laid out for the roads as they are now, which stops being true for the second once the first is made + bool shared{plan.start.junction != nullptr && plan.start.junction == plan.end.junction}; + auto const touches = [](editor_road::branch const &Branch, road_node const *Road) { + return std::any_of(Branch.changes.begin(), Branch.changes.end(), [Road](std::pair const &Change) { return Change.first == Road; }) || + std::find(Branch.removed.begin(), Branch.removed.end(), Road) != Branch.removed.end(); + }; + for (auto const &change : plan.start.changes) + shared = shared || touches(plan.end, change.first); + for (auto const *road : plan.start.removed) + shared = shared || touches(plan.end, road); + if (shared) + { + plan.error = "The junctions at both ends would take the same piece of road; lead the road somewhere else first"; + return plan; + } + } + if (glm::distance(start, target) > kLongestStretch) + { + plan.error = "Too far from the last point"; + return plan; + } + plan.pieces = editor_road::plan(start, hasdirection ? &direction : nullptr, target, tied ? &enddirection : nullptr, Global.ctrlState, plan.error); + road_profile(plan.pieces, hasgrade ? &startgrade : nullptr, tied ? &endgrade : nullptr, Fresh); + return plan; } // gives the pieces laid out by the planner their heights: over the ground if the road is to follow it, with the slopes // of the pieces matched where they meet, and with what the road is attached to -void editor_mode::road_profile(std::vector &Pieces, editor_road::loose_end const &Snap, bool const Fresh) +void editor_mode::road_profile(std::vector &Pieces, double const *Firstgrade, double const *Lastgrade, bool const Fresh) { auto const &tool{m_roadtool}; if (Pieces.empty()) return; - // an end of a road or an arm of a junction is reached with the slope it has - double endgrade{0.0}; - if (Snap.valid()) - { - auto const run{glm::length(glm::dvec2{Snap.outwards.x, Snap.outwards.z})}; - endgrade = (run > 1e-6 ? -Snap.outwards.y / run : 0.0); - } - auto const *firstgrade{tool.hasgrade ? &tool.grade : nullptr}; - auto const *lastgrade{Snap.valid() ? &endgrade : nullptr}; if (false == tool.follow) { // straight from a point to the next one, the way a ramp or a viaduct goes @@ -266,7 +414,7 @@ void editor_mode::road_profile(std::vector &Pieces, editor_road::l for (auto const &piece : Pieces) heights.emplace_back(piece.points[segment_data::point::start].y); heights.emplace_back(Pieces.back().points[segment_data::point::end].y); - editor_road::profile(Pieces, heights, firstgrade, lastgrade); + editor_road::profile(Pieces, heights, Firstgrade, Lastgrade); return; } auto const planned{Pieces}; @@ -294,13 +442,13 @@ void editor_mode::road_profile(std::vector &Pieces, editor_road::l // the ends are where they were put heights.front() = Pieces.front().points[segment_data::point::start].y; heights.back() = Pieces.back().points[segment_data::point::end].y; - editor_road::profile(Pieces, heights, firstgrade, lastgrade); + editor_road::profile(Pieces, heights, Firstgrade, Lastgrade); // shorter pieces are called for if the ground shows through the road, or the road hangs over it. // the pieces attached to something are let off, as they have to get to its height one way or another bool fits{true}; for (std::size_t i = 0; i < count; ++i) { - if ((i == 0 && firstgrade != nullptr) || (i + 1 == count && lastgrade != nullptr)) + if ((i == 0 && Firstgrade != nullptr) || (i + 1 == count && Lastgrade != nullptr)) continue; auto const over{path_point(Pieces[i], 0.5).y - ground[count + 1 + i]}; if (over < -kSunkTolerance || over > kRaisedTolerance) @@ -314,110 +462,6 @@ void editor_mode::road_profile(std::vector &Pieces, editor_road::l } } -// lays out the junction a click would make. returns: false if there's none to make, with the reason in Error unless -// it's a matter of the first click being still ahead -bool editor_mode::junction_preview(junction_node::state &State, editor_road::loose_end &Snap, std::string &Error) const -{ - auto const &tool{m_roadtool}; - auto const kind{static_cast(std::clamp(tool.kind, 0, 3))}; - Snap = {}; - junction_node::state state; - // the look goes after the road the junction is made for - auto const dress = [&state](road_node::state const &Layout) { - state.surface = Layout.surface; - state.texturelength = Layout.texturelength; - state.markings = Layout.markings; - state.friction = Layout.friction; - state.sounddistance = Layout.sounddistance; - state.quality = Layout.quality; - state.environment = Layout.environment; - }; - if (false == tool.chain) - { - // at a loose end of a road the junction is made for that road, and put right past its end - Snap = editor_road::find_end(tool.mouse, kSnapRadius, false); - if (Snap.road == nullptr) - return false; - auto const &layout{Snap.road->definition()}; - glm::dvec2 const outwards{Snap.outwards.x, Snap.outwards.z}; - if (glm::length(outwards) < 1e-6 || layout.lanes.empty()) - { - Error = "There's no telling which way this road goes at its end"; - return false; - } - // the ways through the junction start and end where the lanes of the road are expected, which takes lanes of the same width - auto const width{layout.lanes.front().width}; - for (auto const &lane : layout.lanes) - { - if (std::abs(lane.width - width) > 0.01f) - { - Error = "Lanes of this road differ in width, and a junction takes roads with lanes of the same width"; - return false; - } - } - state = editor_road::junction(kind, Snap.position, glm::normalize(outwards), Snap.atend ? layout.forward : layout.backward, Snap.atend ? layout.backward : layout.forward, width); - dress(layout); - } - else - { - // in the open the centre is set already, and the cursor shows where the first road comes from - glm::dvec2 const away{tool.mouse.x - tool.point.x, tool.mouse.z - tool.point.z}; - if (glm::length(away) < 1.0) - { - Error = "Move the cursor away from the centre to turn the junction"; - return false; - } - auto const heading{-glm::normalize(away)}; - auto const &layout{tool.settings}; - auto const reach{editor_road::junction_reach(layout.forward + layout.backward, layout.lanewidth)}; - glm::dvec3 const entry{tool.point.x - heading.x * reach, tool.point.y, tool.point.z - heading.y * reach}; - state = editor_road::junction(kind, entry, heading, layout.forward, layout.backward, layout.lanewidth); - dress(layout); - } - state.velocity = tool.crossingspeed; - state.normalize(); - State = state; - return true; -} - -void editor_mode::junction_click() -{ - auto &tool{m_roadtool}; - junction_node::state state; - editor_road::loose_end snap; - std::string error; - if (false == junction_preview(state, snap, error)) - { - if (false == error.empty()) - { - tool.status = "Can't make the junction: " + error; - } - else if (false == tool.chain) - { - // away from the roads the first click sets the centre, the second one turns the junction - tool.point = tool.mouse + glm::dvec3{0.0, tool.offset, 0.0}; - tool.chain = true; - tool.status = "Centre set"; - } - return; - } - std::string reason; - if (snap.valid() && false == editor_road::can_join(snap, &reason)) - { - tool.status = "Can't make the junction here: " + reason; - return; - } - auto const created{editor_road::create(std::vector{state})}; - if (created.empty()) - { - tool.status = "The junction wasn't created"; - return; - } - push_road_snapshot({}, {}, {}, created, {}); - tool.chain = false; - tool.status = "\"" + created.front()->name() + "\" made" + (snap.road != nullptr ? " at the end of \"" + snap.road->name() + "\"" : std::string{}) + ". Lead roads out of its arms with the Build tool"; -} - void editor_mode::road_click() { auto &tool{m_roadtool}; @@ -431,6 +475,23 @@ void editor_mode::road_click() tool.mouse = ground; if (tool.tool == 0) { + glm::dvec3 joint; + if (editor_road::nearest_joint(ground, kPointRadius, joint)) + { + // a point where pieces meet or end. with Shift it's added to the selected ones, or taken out of them + auto const listed{std::find_if(tool.points.begin(), tool.points.end(), [&joint](glm::dvec3 const &Point) { return glm::distance(Point, joint) < 0.25; })}; + if (false == Global.shiftState) + tool.points.assign(1, joint); + else if (listed != tool.points.end()) + tool.points.erase(listed); + else + tool.points.emplace_back(joint); + tool.selected = nullptr; + tool.junction = nullptr; + tool.status = std::to_string(tool.points.size()) + (tool.points.size() == 1 ? " point selected" : " points selected"); + return; + } + tool.points.clear(); auto *road{editor_road::nearest(ground, 1.5)}; auto *junction{road == nullptr ? editor_road::nearest_junction(ground) : nullptr}; if (road == nullptr && junction == nullptr) @@ -446,19 +507,19 @@ void editor_mode::road_click() tool.status = reason; return; } - if (tool.tool == 2) - { - junction_click(); - return; - } if (false == tool.chain) { - // first click sets where the road starts. started from a loose end of a road it carries that road on, - // started from an arm of a junction it's the road the junction is made for there + // first click sets where the road starts + tool.branchroad = nullptr; + tool.branchjunction = nullptr; + tool.selected = nullptr; + tool.junction = nullptr; + tool.points.clear(); auto const end{editor_road::find_end(ground, kSnapRadius)}; glm::dvec2 const outwards{end.outwards.x, end.outwards.z}; if (end.valid() && glm::length(outwards) > 1e-6) { + // started from a loose end of a road it carries that road on, started from an arm of a junction it's the road the junction is made for there if (false == editor_road::can_join(end, &reason)) { tool.status = "Can't build from here: " + reason; @@ -469,12 +530,14 @@ void editor_mode::road_click() tool.hasdirection = true; tool.grade = end.outwards.y / glm::length(outwards); tool.hasgrade = true; - tool.junction = nullptr; if (end.road != nullptr) { // carried on from its start the road keeps the direction of its axis, so the lanes stay what they were tool.reversed = (false == end.atend); tool.settings = end.road->definition(); + // and it stays as wide as it is at that end + auto const scale{tool.settings.taper[end.atend ? 1 : 0]}; + tool.settings.taper = {scale, scale}; tool.status = "Carrying on \"" + end.road->name() + "\" with its layout"; } else @@ -483,6 +546,7 @@ void editor_mode::road_click() tool.settings.forward = end.forward; tool.settings.backward = end.backward; tool.settings.lanewidth = end.width; + tool.settings.taper = {1.f, 1.f}; tool.settings.lanes.clear(); tool.settings.changes.clear(); tool.settings.normalize(); @@ -492,31 +556,52 @@ void editor_mode::road_click() } else { - tool.point = ground + glm::dvec3{0.0, tool.offset, 0.0}; tool.hasdirection = false; tool.hasgrade = false; tool.reversed = false; - tool.selected = nullptr; - tool.junction = nullptr; - tool.status = "Start set"; + tool.settings.taper = {1.f, 1.f}; + if (auto *road{editor_road::nearest(ground, kSideMargin)}; road != nullptr) + { + // started from the side of a road it leaves that road at a junction, made along with its first piece + tool.branchroad = road; + tool.branchat = editor_road::nearest_parameter(road->definition(), ground); + tool.point = road->definition().point(tool.branchat); + tool.status = "Leading a road out of the side of \"" + road->name() + "\": click where it goes"; + } + else if (auto *junction{editor_road::nearest_junction(ground)}; junction != nullptr) + { + // started from a junction it's another road of that junction + if (junction->definition().arms.size() >= 4) + { + tool.status = "\"" + junction->name() + "\" has four roads already"; + return; + } + tool.branchjunction = junction; + tool.point = junction->definition().centre; + tool.status = "Leading another road out of \"" + junction->name() + "\": click where it goes"; + } + else + { + tool.point = ground + glm::dvec3{0.0, tool.offset, 0.0}; + tool.status = "Start set"; + } } tool.chain = true; return; } - editor_road::loose_end snap; - std::string error; - auto pieces{road_preview(snap, error, true)}; - if (pieces.empty()) + auto plan{road_preview(true)}; + if (plan.pieces.empty()) { - tool.status = "Can't build this: " + error; + tool.status = "Can't build this: " + plan.error; return; } - if (snap.valid() && false == editor_road::can_join(snap, &reason)) + if (plan.snap.valid() && false == editor_road::can_join(plan.snap, &reason)) { tool.status = "Can't join here: " + reason; return; } + auto pieces{plan.pieces}; // where the next piece is going to carry on from auto const &last{pieces.back()}; auto const endpoint{last.points[segment_data::point::end]}; @@ -531,6 +616,20 @@ void editor_mode::road_click() } std::reverse(pieces.begin(), pieces.end()); } + // the junctions the road starts or ends with are made first, so the road finds them when it's made + editor_road::record record; + if (plan.hasstart) + { + if (plan.start.junction == nullptr) + plan.start.layout.velocity = tool.crossingspeed; + editor_road::carry_out(plan.start, record); + } + if (plan.hasend) + { + if (plan.end.junction == nullptr) + plan.end.layout.velocity = tool.crossingspeed; + editor_road::carry_out(plan.end, record); + } std::vector states; for (auto const &piece : pieces) { @@ -539,16 +638,22 @@ void editor_mode::road_click() states.emplace_back(state); } auto const created{editor_road::create(states)}; + record.roads_created.insert(record.roads_created.end(), created.begin(), created.end()); + push_road_snapshot(std::move(record)); + tool.branchroad = nullptr; + tool.branchjunction = nullptr; if (created.empty()) { + tool.chain = false; tool.status = "The road wasn't created"; return; } - push_road_snapshot({}, created, {}); - if (snap.valid()) + if (plan.snap.valid() || plan.hasend) { tool.chain = false; - tool.status = "Joined with \"" + (snap.road != nullptr ? snap.road->name() : snap.junction->name()) + "\""; + tool.status = (plan.snap.valid() ? "Joined with \"" + (plan.snap.road != nullptr ? plan.snap.road->name() : plan.snap.junction->name()) + "\"" : + plan.end.junction != nullptr ? "Led into \"" + plan.end.junction->name() + "\" as another of its roads" : + std::string{"Led into the side of the road, with a junction made there"}); return; } glm::dvec2 const planar{tangent.x, tangent.z}; @@ -561,6 +666,8 @@ void editor_mode::road_click() tool.grade = grade; tool.hasgrade = true; tool.status = std::to_string(created.size()) + (created.size() == 1 ? " piece added" : " pieces added"); + if (plan.hasstart) + tool.status += (plan.start.junction != nullptr ? ", as another road of the junction" : ", with a junction where the road leaves"); } void editor_mode::road_apply() @@ -570,14 +677,13 @@ void editor_mode::road_apply() return; tool.settings.normalize(); auto const pieces{tool.whole ? editor_road::chain(*tool.selected) : std::vector{tool.selected}}; - std::vector> before; + editor_road::record record; std::vector> changes; for (auto *road : pieces) { std::string reason; if (false == editor_road::can_edit(*road, &reason)) { - tool.status = "\"" + road->name() + "\" can't be changed: " + reason; // what the window shows goes back to what the road is like road_select(tool.selected); tool.status = "\"" + road->name() + "\" can't be changed: " + reason; @@ -585,16 +691,18 @@ void editor_mode::road_apply() } auto state{tool.settings}; state.axis = road->definition().axis; + // how wide the road is at its points is set at these points, for each piece on its own + state.taper = road->definition().taper; if (road != tool.selected && road->definition().changes.size() == state.changes.size()) { // where the lanes can be changed is set for each piece on its own state.changes = road->definition().changes; } - before.emplace_back(road, road->definition()); + record.roads.emplace_back(road, road->definition()); changes.emplace_back(road, state); } editor_road::apply(changes); - push_road_snapshot(before, {}, {}); + push_road_snapshot(std::move(record)); tool.settings = tool.selected->definition(); tool.status = (pieces.size() == 1 ? std::string{"Changed"} : "Changed " + std::to_string(pieces.size()) + " pieces"); } @@ -603,8 +711,12 @@ bool editor_mode::road_delete() { auto &tool{m_roadtool}; if (false == tool.window || (tool.selected == nullptr && tool.junction == nullptr)) - return false; + { + // with points selected the key isn't meant for whatever else is selected in the editor + return tool.window && false == tool.points.empty(); + } std::string reason; + editor_road::record record; if (tool.junction != nullptr) { auto *junction{tool.junction}; @@ -614,7 +726,8 @@ bool editor_mode::road_delete() return true; } editor_road::remove(std::vector{junction}); - push_road_snapshot({}, {}, {}, {}, {junction}); + record.junctions_removed.emplace_back(junction); + push_road_snapshot(std::move(record)); tool.junction = nullptr; tool.status = "\"" + junction->name() + "\" deleted, Ctrl+Z brings it back"; return true; @@ -626,7 +739,8 @@ bool editor_mode::road_delete() return true; } editor_road::remove(std::vector{road}); - push_road_snapshot({}, {}, {road}); + record.roads_removed.emplace_back(road); + push_road_snapshot(std::move(record)); tool.selected = nullptr; tool.status = "\"" + road->name() + "\" deleted, Ctrl+Z brings it back"; return true; @@ -644,23 +758,80 @@ bool editor_mode::road_split() tool.status = "Can't split: " + reason; return true; } - auto const before{road->definition()}; - auto *created{editor_road::split(*road, editor_road::nearest_parameter(before, tool.mouse))}; + editor_road::record record; + record.roads.emplace_back(road, road->definition()); + auto *created{editor_road::split(*road, editor_road::nearest_parameter(road->definition(), tool.mouse))}; if (created == nullptr) { tool.status = "Can't split this close to the end"; return true; } - push_road_snapshot({{road, before}}, {created}, {}); + record.roads_created.emplace_back(created); + push_road_snapshot(std::move(record)); road_select(road); - tool.status = "Split in two: \"" + road->name() + "\" and \"" + created->name() + "\""; + tool.status = "Split in two: \"" + road->name() + "\" and \"" + created->name() + "\". Click the point between them to set the width or the height of the road there"; return true; } -void editor_mode::push_road_snapshot(std::vector> States, std::vector Created, std::vector Removed, std::vector Junctionscreated, - std::vector Junctionsremoved) +// makes the changes gathered for the selected points. returns: true if they were made +bool editor_mode::road_points_apply(std::vector> const &Changes, std::size_t const Skipped) { - if (States.empty() && Created.empty() && Removed.empty() && Junctionscreated.empty() && Junctionsremoved.empty()) + auto &tool{m_roadtool}; + std::string const leftalone{Skipped > 0 ? " The points at junctions were left alone, as a junction is made for the road the way it is." : ""}; + if (Changes.empty()) + { + tool.status = "Nothing was changed." + leftalone; + return false; + } + editor_road::record record; + for (auto const &change : Changes) + { + std::string reason; + if (false == editor_road::can_edit(*change.first, &reason)) + { + tool.status = "\"" + change.first->name() + "\" can't be changed: " + reason; + return false; + } + record.roads.emplace_back(change.first, change.first->definition()); + } + editor_road::apply(Changes); + push_road_snapshot(std::move(record)); + tool.status = (Changes.size() == 1 ? std::string{"Changed 1 piece."} : "Changed " + std::to_string(Changes.size()) + " pieces.") + leftalone; + return true; +} + +void editor_mode::road_point_width(float const Width) +{ + std::size_t skipped{0}; + // the pieces on both sides of a point get to that width there, and from there go back to their own along their length + auto const changes{point_changes(m_roadtool.points, skipped, [Width](road_node::state &State, bool const Atend) { + auto const width{State.width()}; + if (width > 0.0) + State.taper[Atend ? 1 : 0] = std::clamp(static_cast(Width / width), 0.25f, 4.f); + })}; + road_points_apply(changes, skipped); +} + +void editor_mode::road_point_height(double const Height) +{ + auto &tool{m_roadtool}; + std::size_t skipped{0}; + // the control points are kept relative to the ends, so the slopes the pieces have at the point stay + auto const changes{point_changes(tool.points, skipped, [Height](road_node::state &State, bool const Atend) { State.axis.points[Atend ? segment_data::point::end : segment_data::point::start].y = Height; })}; + // the selection follows what it's made of + std::vector moved; + for (auto const &point : tool.points) + moved.emplace_back(false == editor_road::at_junction(point)); + if (false == road_points_apply(changes, skipped)) + return; + for (std::size_t i = 0; i < tool.points.size(); ++i) + if (moved[i]) + tool.points[i].y = Height; +} + +void editor_mode::push_road_snapshot(editor_road::record Record) +{ + if (Record.empty()) return; if (m_max_history_size >= 0 && (int)m_history.size() >= m_max_history_size) @@ -668,59 +839,67 @@ void editor_mode::push_road_snapshot(std::vectorname(); snap.position = node->location(); - snap.roads = std::move(States); - snap.roads_created = std::move(Created); - snap.roads_removed = std::move(Removed); - snap.junctions_created = std::move(Junctionscreated); - snap.junctions_removed = std::move(Junctionsremoved); + snap.roads = std::move(Record); m_history.push_back(std::move(snap)); g_redo.clear(); } void editor_mode::restore_road_snapshot(EditorSnapshot const &Snapshot, std::vector &Opposite, bool const Undo) { - if (Snapshot.roads.empty() && Snapshot.roads_created.empty() && Snapshot.roads_removed.empty() && Snapshot.junctions_created.empty() && Snapshot.junctions_removed.empty()) + auto const &record{Snapshot.roads}; + if (record.empty()) return; // what the roads are like now is what the opposite operation brings back EditorSnapshot current{Snapshot}; - current.roads.clear(); - for (auto const &entry : Snapshot.roads) - current.roads.emplace_back(entry.first, entry.first->definition()); + for (auto &entry : current.roads.roads) + entry.second = entry.first->definition(); + for (auto &entry : current.roads.junctions) + entry.second = entry.first->definition(); Opposite.push_back(std::move(current)); + // things are taken out before the rest is changed and put in after it, so nothing gets joined with what's on its way out if (Undo) { - editor_road::remove(Snapshot.roads_created); - editor_road::remove(Snapshot.junctions_created); - editor_road::revive(Snapshot.junctions_removed); - editor_road::revive(Snapshot.roads_removed); + editor_road::remove(record.roads_created); + editor_road::remove(record.junctions_created); } else { - editor_road::revive(Snapshot.roads_created); - editor_road::revive(Snapshot.junctions_created); - editor_road::remove(Snapshot.junctions_removed); - editor_road::remove(Snapshot.roads_removed); + editor_road::remove(record.roads_removed); + editor_road::remove(record.junctions_removed); + } + editor_road::apply(record.roads); + editor_road::apply(record.junctions); + if (Undo) + { + editor_road::revive(record.roads_removed); + editor_road::revive(record.junctions_removed); + } + else + { + editor_road::revive(record.roads_created); + editor_road::revive(record.junctions_created); } - editor_road::apply(Snapshot.roads); auto &tool{m_roadtool}; - tool.chain = false; + road_cancel(); if (tool.selected != nullptr) road_select(tool.selected->m_editorremoved ? nullptr : tool.selected); if (tool.junction != nullptr && tool.junction->m_editorremoved) @@ -949,68 +1128,98 @@ void editor_mode::render_road_window() ImGui::RadioButton("Select", &tool.tool, 0); ImGui::SameLine(); ImGui::RadioButton("Build", &tool.tool, 1); - ImGui::SameLine(); - ImGui::RadioButton("Junction", &tool.tool, 2); if (tool.tool != previoustool) { - tool.chain = false; + road_cancel(); if (tool.tool != 0) { tool.selected = nullptr; tool.junction = nullptr; + tool.points.clear(); } } ImGui::SameLine(); ImGui::Checkbox("Show lanes", &tool.lanes); - // how the things being built are put on the ground - auto const placement = [&tool](bool const Road) { + // typed values are taken when confirmed, so nothing is made anew with each digit + auto const number = [](char const *Label, float &Value, float const Step, char const *Format) { + ImGui::SetNextItemWidth(120.0f); + return ImGui::InputFloat(Label, &Value, Step, Step * 4.0f, Format, ImGuiInputTextFlags_EnterReturnsTrue); + }; + if (tool.tool == 1) + { + ImGui::TextDisabled("LMB: start, then each next point. Ctrl: straight ahead. Esc: finish"); + ImGui::TextDisabled("Start or end on a loose end of a road to join it."); + ImGui::TextDisabled("Start or end on the side of a road to make a junction there,"); + ImGui::TextDisabled("or on a junction to give it another road."); + if (tool.chain) + { + if (ImGui::Button("Finish (Esc)")) + road_cancel(); + } + // how the road is put on the ground ImGui::SetNextItemWidth(120.0f); if (ImGui::InputFloat("Height above the ground [m]", &tool.offset, 0.05f, 0.25f, "%.2f")) tool.offset = std::clamp(tool.offset, -10.0f, 100.0f); if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", "How far over the ground under the cursor the points are put.\nA few centimetres keep the surface from flickering where it lies on the ground."); - if (false == Road) - return; ImGui::Checkbox("Follow the ground", &tool.follow); if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", "On: the road is led over the ground between the clicked points, in pieces as short as the ground calls for,\nwith the profile rounded so the slope doesn't change abruptly.\nOff: the road goes straight from a point to the next one, like a ramp or a viaduct."); - }; - if (tool.tool == 1) - { - ImGui::TextDisabled("LMB: start, then each next point. Ctrl: straight ahead. Esc: finish"); - ImGui::TextDisabled("Start or end on a loose end of a road or an arm of a junction to join it"); - if (tool.chain) - { - if (ImGui::Button("Finish (Esc)")) - tool.chain = false; - } - placement(true); + ImGui::SetNextItemWidth(120.0f); + if (ImGui::InputFloat("Speed limit on new junctions [km/h]", &tool.crossingspeed, 5.0f, 10.0f, "%.0f")) + tool.crossingspeed = std::clamp(tool.crossingspeed, 5.0f, 200.0f); ImGui::Separator(); // what's set here is what the next pieces get render_road_layout(tool.settings); } - else if (tool.tool == 2) + else if (false == tool.points.empty()) { - ImGui::TextDisabled("LMB on a loose end of a road: junction for that road, right past its end"); - ImGui::TextDisabled("LMB elsewhere: the centre, then the side the first road comes from. Esc: start over"); - char const *kinds[]{"Crossroads", "T: the road ends, roads to both sides", "T: the road goes on, a road to the left", "T: the road goes on, a road to the right"}; - ImGui::SetNextItemWidth(280.0f); - ImGui::Combo("Kind", &tool.kind, kinds, 4); - ImGui::SetNextItemWidth(120.0f); - if (ImGui::InputFloat("Speed limit on the junction [km/h]", &tool.crossingspeed, 5.0f, 10.0f, "%.0f")) - tool.crossingspeed = std::clamp(tool.crossingspeed, 5.0f, 200.0f); - placement(false); - ImGui::Separator(); - ImGui::TextWrapped("Away from the roads the junction is made for roads with the lanes set in the Build tool: %d + %d, %.2f m wide. Its surface and markings go after the road it's made for.", tool.settings.forward, tool.settings.backward, - tool.settings.lanewidth); - ImGui::TextWrapped("Roads are led out of the arms with the Build tool, and get the lanes the junction has there."); + // the road at the selected points + ImGui::Text("%d %s selected", static_cast(tool.points.size()), tool.points.size() == 1 ? "point" : "points"); + ImGui::TextDisabled("Shift+LMB: add a point, or take it out. K on a selected piece: make a point at the cursor"); + auto const ends{editor_road::ends_at(tool.points.front())}; + if (false == ends.empty()) + { + auto const &layout{ends.front().road->definition()}; + auto width{static_cast(layout.width() * layout.taper[ends.front().atend ? 1 : 0])}; + if (number("Road width here [m]", width, 0.25f, "%.2f")) + road_point_width(std::clamp(width, 1.0f, 100.0f)); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "Combined width of the lanes at this point; each lane takes its share of it.\nThe pieces on both sides get wider or narrower along their length to meet it.\nSelect several points to keep the width over the pieces between them."); + auto height{static_cast(tool.points.front().y)}; + if (number("Height [m]", height, 0.1f, "%.2f")) + road_point_height(height); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "Height of the axis of the road at this point. The slopes of the pieces at the point are kept."); + if (editor_road::at_junction(tool.points.front())) + ImGui::TextDisabled("This point is at a junction, which is made for the road the way it is"); + } } else if (tool.junction != nullptr) { - auto const &junction{*tool.junction}; - ImGui::Text("%s, %d arms, %d ways through", junction.name().c_str(), static_cast(junction.definition().arms.size()), static_cast(junction.movements().size())); - ImGui::TextDisabled("Speed limit %.0f km/h. The ways through are made for the roads attached at the moment", junction.definition().velocity); + auto &junction{*tool.junction}; + ImGui::Text("%s, %d roads, %d ways through", junction.name().c_str(), static_cast(junction.definition().arms.size()), static_cast(junction.movements().size())); + ImGui::TextDisabled("The ways through are made for the roads attached at the moment."); + ImGui::TextDisabled("Build tool, LMB on the junction: lead another road out of it"); + auto limit{junction.definition().velocity > 0.f ? junction.definition().velocity : 0.f}; + if (number("Speed limit [km/h], 0: none", limit, 5.0f, "%.0f")) + { + if (editor_road::can_edit(junction, &reason)) + { + editor_road::record record; + record.junctions.emplace_back(&junction, junction.definition()); + auto state{junction.definition()}; + state.velocity = (limit > 0.f ? limit : -1.f); + editor_road::apply(std::vector>{{&junction, state}}); + push_road_snapshot(std::move(record)); + tool.status = "Changed"; + } + else + { + tool.status = "\"" + junction.name() + "\" can't be changed: " + reason; + } + } if (ImGui::Button("Delete (Del)")) road_delete(); } @@ -1031,7 +1240,7 @@ void editor_mode::render_road_window() } else { - ImGui::TextDisabled("LMB: select a road piece or a junction"); + ImGui::TextDisabled("LMB: select a road piece, a junction, or a point where pieces meet"); } if (false == tool.status.empty()) { @@ -1112,8 +1321,7 @@ void editor_mode::draw_road_overlay() const // outline of a road piece: its axis and the edges of its surface auto const drawroad = [&](road_node::state const &State, ImU32 const Color) { - auto const samples{is_curved(State.axis) ? 12 : 1}; - auto const halfwidth{0.5 * State.width()}; + auto const samples{is_curved(State.axis) || State.taper[0] != State.taper[1] ? 12 : 1}; drawpath(State.axis, Color, 3.0f, samples); glm::dvec3 previous[2]; for (int i = 0; i <= samples; ++i) @@ -1124,6 +1332,7 @@ void editor_mode::draw_road_overlay() const glm::dvec3 across{tangent.z, 0.0, -tangent.x}; if (glm::length(across) > 1e-6) across = glm::normalize(across); + auto const halfwidth{0.5 * State.width() * State.scale(t)}; glm::dvec3 const edges[2]{position + across * halfwidth, position - across * halfwidth}; if (i > 0) { @@ -1168,49 +1377,72 @@ void editor_mode::draw_road_overlay() const { if (tool.chain) { + auto const &plan{tool.plan}; drawpoint(tool.point, kPreviewColor, 6.0f, true); - if (tool.preview.empty()) + if (plan.pieces.empty()) { projection.line(drawlist, tool.point, tool.mouse, kRefusedColor, 2.0f); - hint = tool.previewerror + " "; + hint = plan.error + " "; } - for (auto const &piece : tool.preview) + else + { + // junctions the road would start or end with + if (plan.hasstart) + drawjunction(plan.start.layout, kPreviewColor); + if (plan.hasend) + drawjunction(plan.end.layout, kPreviewColor); + } + for (auto const &piece : plan.pieces) { auto state{tool.settings}; state.axis = piece; drawroad(state, kPreviewColor); } - if (tool.previewsnap.valid()) - drawpoint(tool.previewsnap.position, kSnapColor, 14.0f, false); - hint += "LMB: build up to the cursor Ctrl: straight ahead Esc: finish Ctrl+Z: undo the last piece"; + if (plan.snap.valid()) + drawpoint(plan.snap.position, kSnapColor, 14.0f, false); + hint += (tool.branchroad != nullptr ? "LMB: lead the road out to the cursor, with a junction where it leaves Esc: give up" : + tool.branchjunction != nullptr ? "LMB: lead the road out to the cursor, as another road of the junction Esc: give up" : + "LMB: build up to the cursor Ctrl: straight ahead Esc: finish Ctrl+Z: undo the last piece"); } else { auto const end{editor_road::find_end(tool.mouse, kSnapRadius)}; if (end.valid()) + { drawpoint(end.position, kSnapColor, 14.0f, false); - hint = "LMB: set where the road starts; on a loose end of a road or an arm of a junction (ring) to carry on from there"; + hint = "LMB: carry on from this end"; + } + else if (tool.hashover) + { + drawpoint(tool.hover, kSnapColor, 5.0f, true); + drawpoint(tool.hover, kSnapColor, 14.0f, false); + hint = "LMB: lead a road out of here, with a junction"; + } + else + { + hint = "LMB: set where the road starts; on a loose end of a road to carry it on, on the side of a road or on a junction to lead a road out of it"; + } } } - else if (tool.tool == 2) - { - if (tool.chain) - drawpoint(tool.point, kPreviewColor, 6.0f, true); - if (tool.hasjunction) - drawjunction(tool.previewjunction, kPreviewColor); - else if (false == tool.previewerror.empty()) - hint = tool.previewerror + " "; - if (tool.previewsnap.valid()) - drawpoint(tool.previewsnap.position, kSnapColor, 14.0f, false); - hint += (tool.chain ? "LMB: make the junction, with the first road coming from the side of the cursor Esc: start over" : - tool.previewsnap.valid() ? "LMB: make the junction at the end of this road" : - "LMB: on a loose end of a road (ring) to make its junction there; elsewhere to set the centre of one"); - } else { - hint = tool.selected != nullptr ? "LMB: select a road piece or a junction K: split at the cursor Del: delete Ctrl+Z: undo" : - tool.junction != nullptr ? "LMB: select a road piece or a junction Del: delete Ctrl+Z: undo" : - "LMB: select a road piece or a junction"; + // points where the pieces meet or end, to pick from + for (auto const *road : simulation::Roads.sequence()) + { + if (road == nullptr || road->m_editorremoved || glm::distance(road->location(), camera) > kPointRange) + continue; + drawpoint(road->definition().axis.points[segment_data::point::start], kPointColor, 3.5f, true); + drawpoint(road->definition().axis.points[segment_data::point::end], kPointColor, 3.5f, true); + } + for (auto const &point : tool.points) + { + drawpoint(point, kSelectedColor, 6.0f, true); + drawpoint(point, kSelectedColor, 11.0f, false); + } + hint = false == tool.points.empty() ? "LMB: select a point Shift+LMB: add a point or take it out Ctrl+Z: undo" : + tool.selected != nullptr ? "LMB: select a piece, a junction or a point (white dot) K: split at the cursor Del: delete Ctrl+Z: undo" : + tool.junction != nullptr ? "LMB: select a piece, a junction or a point (white dot) Del: delete Ctrl+Z: undo" : + "LMB: select a piece, a junction or a point (white dot)"; } // shown above the place the track tools put their hints at ImGuiIO const &io = ImGui::GetIO(); diff --git a/editor/editorRoad.cpp b/editor/editorRoad.cpp index 4cbd40510..aa37f6922 100644 --- a/editor/editorRoad.cpp +++ b/editor/editorRoad.cpp @@ -31,6 +31,9 @@ double const kPieceLength{50.0}; // longest piece the planner makes double const kPieceTurn{glm::radians(30.0)}; // largest turn of a single piece double const kShortestRoad{2.0}; double const kTightestRadius{6.0}; +double const kCornerRoom{4.0}; // length of an arm of a junction past the point where its edge meets the edge of the next one, taken by the rounded corner +double const kSharpestBranch{glm::radians(30.0)}; // smallest angle between two roads leaving a junction +double const kWidestCorner{glm::radians(120.0)}; // arms further apart than this don't have to make room for each other void add_unique(std::vector &Roads, road_node *Road) { @@ -129,6 +132,135 @@ bool turning(road_node const &Road) return false; } +// definition of a part of a piece, between two values of the curve parameter of its axis +road_node::state part(road_node::state const &State, double const From, double const To) +{ + auto result{State}; + result.axis = subpath(State.axis, From, To); + result.taper = {static_cast(State.scale(From)), static_cast(State.scale(To))}; + return result; +} + +int const kStations{64}; + +// distances along a path for evenly spaced values of its curve parameter +std::vector stations(road_node::state const &State) +{ + std::vector result(kStations + 1, 0.0); + auto previous{State.point(0.0)}; + for (int i = 1; i <= kStations; ++i) + { + auto const current{State.point(static_cast(i) / kStations)}; + result[i] = result[i - 1] + glm::distance(previous, current); + previous = current; + } + return result; +} + +// distance along a path for specified value of its curve parameter, and the other way around +double station_at(std::vector const &Stations, double const T) +{ + auto const position{std::clamp(T, 0.0, 1.0) * kStations}; + auto const index{std::min(kStations - 1, static_cast(position))}; + return glm::mix(Stations[index], Stations[index + 1], position - index); +} + +double parameter_at(std::vector const &Stations, double const Station) +{ + if (Station <= 0.0) + return 0.0; + if (Station >= Stations.back()) + return 1.0; + auto const index{static_cast(std::distance(Stations.begin(), std::upper_bound(Stations.begin(), Stations.end(), Station)))}; + auto const span{Stations[index] - Stations[index - 1]}; + return (index - 1 + (span > 0.0 ? (Station - Stations[index - 1]) / span : 0.0)) / kStations; +} + +// direction seen from above +glm::dvec2 planar(glm::dvec3 const &Direction) +{ + glm::dvec2 const result{Direction.x, Direction.z}; + return glm::length(result) > 1e-9 ? glm::normalize(result) : glm::dvec2{0.0, 1.0}; +} + +// where a junction made in the middle of a road ends on one of its sides +struct road_cut +{ + road_node *road{nullptr}; + double t{0.0}; + bool keepstart{false}; // what stays of the piece: from its start up to the cut, or from the cut to its end +}; + +// follows a road from a point of a piece for specified distance, to find where a junction made at that point ends. +// Consumed: receives the pieces past the first one which lie within the distance whole +bool follow(road_node &Road, double const T, bool const Forward, double const Distance, road_cut &Cut, std::vector &Consumed, std::string &Error) +{ + auto *piece{&Road}; + auto from{T}; + auto forward{Forward}; + auto remaining{Distance}; + for (int guard = 0; guard < 64; ++guard) + { + auto const &state{piece->definition()}; + auto const lengths{stations(state)}; + auto const here{station_at(lengths, from)}; + auto const available{forward ? lengths.back() - here : here}; + if (remaining <= 0.0 || available >= remaining + kShortestRoad) + { + // the cut is put here; with nothing left to go the piece is kept whole + Cut.road = piece; + Cut.t = (remaining <= 0.0 ? from : parameter_at(lengths, forward ? here + remaining : here - remaining)); + Cut.keepstart = (false == forward); + return true; + } + // the junction takes this piece up to its end, as what would be left of it is too short to be a road + remaining = std::max(0.0, remaining - available); + if (piece != &Road) + Consumed.emplace_back(piece); + auto const end{axis_end(state, forward)}; + if (false == junctions_at(end).empty()) + { + Error = "Too close to a junction"; + return false; + } + auto const next{roads_at(end, piece)}; + if (next.size() != 1) + { + Error = (next.empty() ? "Too close to the end of the road" : "Too close to a place where roads meet"); + return false; + } + if (next.front() == &Road || std::find(Consumed.begin(), Consumed.end(), next.front()) != Consumed.end()) + { + Error = "The road is too short for a junction"; + return false; + } + piece = next.front(); + forward = (glm::distance(axis_end(piece->definition(), false), end) < kSamePoint); + from = (forward ? 0.0 : 1.0); + } + Error = "The road is cut into too many pieces here"; + return false; +} + +// how far from the centre of a junction the edges of two of its roads meet, measured along the first one. +// Halfwidth, Otherhalfwidth: of the two roads, Angle: between the ways they leave +double edge_reach(double const Halfwidth, double const Otherhalfwidth, double const Angle) +{ + return (Otherhalfwidth + Halfwidth * std::cos(Angle)) / std::sin(Angle); +} + +// the look of a junction goes after the road it's made on +void dress(junction_node::state &Junction, road_node::state const &Road) +{ + Junction.surface = Road.surface; + Junction.texturelength = Road.texturelength; + Junction.markings = Road.markings; + Junction.friction = Road.friction; + Junction.sounddistance = Road.sounddistance; + Junction.quality = Road.quality; + Junction.environment = Road.environment; +} + void retire(std::vector const &Tracks) { for (auto *track : Tracks) @@ -441,6 +573,24 @@ void editor_road::revive(std::vector const &Roads) }); } +void editor_road::apply(std::vector> const &Changes) +{ + std::vector junctions; + for (auto const &change : Changes) + add_unique(junctions, change.first); + if (junctions.empty()) + return; + refresh({}, junctions, [&]() { + for (auto const &change : Changes) + { + if (change.first == nullptr) + continue; + change.first->define(change.second); + change.first->mark_dirty(); + } + }); +} + std::vector editor_road::create(std::vector const &States) { static int counter{0}; @@ -538,8 +688,12 @@ road_node *editor_road::split(road_node &Road, double const T) auto const roll{static_cast(path.rolls[0] + (path.rolls[1] - path.rolls[0]) * T)}; first.axis.rolls[1] = roll; second.axis.rolls[0] = roll; - apply({{&Road, first}}); - auto const created{create({second})}; + // the width at the cut is what it was there + auto const scale{static_cast(Road.definition().scale(T))}; + first.taper[1] = scale; + second.taper[0] = scale; + apply(std::vector>{{&Road, first}}); + auto const created{create(std::vector{second})}; return created.empty() ? nullptr : created.front(); } @@ -907,39 +1061,238 @@ void editor_road::profile(std::vector &Pieces, std::vector } } -double editor_road::junction_reach(int const Lanes, float const Width) +bool editor_road::nearest_joint(glm::dvec3 const &Point, double const Radius, glm::dvec3 &Joint) { - // half of the road, and room for the corners - return 0.5 * std::max(1, Lanes) * Width + 6.0; + auto best{Radius}; + bool found{false}; + for (auto const *road : simulation::Roads.sequence()) + { + if (road == nullptr || road->m_editorremoved) + continue; + for (auto const atend : {false, true}) + { + auto const position{axis_end(road->definition(), atend)}; + auto const distance{glm::distance(glm::dvec2{position.x, position.z}, glm::dvec2{Point.x, Point.z})}; + if (distance > best || std::abs(position.y - Point.y) > 3.0) + continue; + best = distance; + Joint = position; + found = true; + } + } + return found; } -junction_node::state editor_road::junction(junction_kind const Kind, glm::dvec3 const &Entry, glm::dvec2 const &Heading, int const Incoming, int const Outgoing, float const Width) +std::vector editor_road::ends_at(glm::dvec3 const &Point) { - junction_node::state state; - auto const heading{glm::length(Heading) > 1e-6 ? glm::normalize(Heading) : glm::dvec2{0.0, 1.0}}; - glm::dvec2 const left{heading.y, -heading.x}; - auto const reach{junction_reach(Incoming + Outgoing, Width)}; - auto const spot = [&](glm::dvec2 const &Direction, double const Distance) { return glm::dvec3{Entry.x + Direction.x * Distance, Entry.y, Entry.z + Direction.y * Distance}; }; - state.centre = spot(heading, reach); - auto const arm = [&](glm::dvec2 const &Direction, int const In, int const Out) { - junction_node::arm_data data; - data.position = glm::dvec3{state.centre.x + Direction.x * reach, Entry.y, state.centre.z + Direction.y * reach}; - data.direction = Direction; - data.incoming = In; - data.outgoing = Out; - data.width = Width; - state.arms.emplace_back(data); - }; - // the road the junction is entered by, then the others: what comes in by one leaves by them - arm(-heading, Incoming, Outgoing); - if (Kind == junction_kind::cross || Kind == junction_kind::tee_left || Kind == junction_kind::tee_right) - arm(heading, Outgoing, Incoming); - if (Kind == junction_kind::cross || Kind == junction_kind::tee_sides || Kind == junction_kind::tee_left) - arm(left, Outgoing, Incoming); - if (Kind == junction_kind::cross || Kind == junction_kind::tee_sides || Kind == junction_kind::tee_right) - arm(-left, Outgoing, Incoming); - state.normalize(); - return state; + std::vector result; + for (auto *road : simulation::Roads.sequence()) + { + if (road == nullptr || road->m_editorremoved) + continue; + for (auto const atend : {false, true}) + if (glm::distance(axis_end(road->definition(), atend), Point) < kSamePoint) + result.push_back({road, atend}); + } + return result; +} + +bool editor_road::at_junction(glm::dvec3 const &Point) +{ + return false == junctions_at(Point).empty(); +} + +bool editor_road::lane_width(road_node::state const &State, double const T, float &Width) +{ + if (State.lanes.empty()) + return false; + for (auto const &lane : State.lanes) + if (std::abs(lane.width - State.lanes.front().width) > 0.005f) + return false; + Width = static_cast(State.lanes.front().width * State.scale(T)); + return true; +} + +bool editor_road::branch_from(road_node &Road, double const T, glm::dvec2 const &Direction, int const Incoming, int const Outgoing, float const Width, branch &Result, std::string &Error) +{ + Result = branch{}; + auto const &layout{Road.definition()}; + auto const centre{layout.point(T)}; + auto const along{planar(layout.tangent(T))}; + auto const direction{glm::length(Direction) > 1e-9 ? glm::normalize(Direction) : glm::dvec2{0.0, 1.0}}; + // the sharper the angle the road leaves at, the further from the centre the edges of the roads part + auto const angle{std::acos(std::clamp(std::abs(glm::dot(direction, along)), 0.0, 1.0))}; + if (angle < kSharpestBranch) + { + Error = "The road would leave at too sharp an angle"; + return false; + } + float lanewidth{0.f}; + if (false == lane_width(layout, T, lanewidth)) + { + Error = "Lanes of \"" + Road.name() + "\" differ in width, and a junction takes roads with lanes of the same width"; + return false; + } + auto const halfwidth{0.5 * (layout.forward + layout.backward) * lanewidth}; + auto const branchhalfwidth{0.5 * (Incoming + Outgoing) * Width}; + auto const reach{edge_reach(halfwidth, branchhalfwidth, angle) + kCornerRoom}; + auto const branchreach{edge_reach(branchhalfwidth, halfwidth, angle) + kCornerRoom}; + + // where the road is cut on both sides of the centre + road_cut cuts[2]; + std::vector consumed; + if (false == follow(Road, T, false, reach, cuts[0], consumed, Error) || false == follow(Road, T, true, reach, cuts[1], consumed, Error)) + return false; + if (cuts[0].road == cuts[1].road && cuts[0].road != &Road) + { + Error = "The road is too short for a junction"; + return false; + } + // what's left of the pieces + if (cuts[0].road == &Road && cuts[1].road == &Road) + { + Result.changes.emplace_back(&Road, part(layout, 0.0, cuts[0].t)); + Result.added.emplace_back(part(layout, cuts[1].t, 1.0)); + } + else if (cuts[0].road != &Road && cuts[1].road != &Road) + { + Result.removed.emplace_back(&Road); + } + for (auto const &cut : cuts) + { + if (cut.road == &Road && cuts[0].road == cuts[1].road) + continue; + // a cut at the very end the piece is kept from leaves it whole + if (cut.keepstart ? cut.t < 0.999 : cut.t > 0.001) + Result.changes.emplace_back(cut.road, cut.keepstart ? part(cut.road->definition(), 0.0, cut.t) : part(cut.road->definition(), cut.t, 1.0)); + } + for (auto *piece : consumed) + Result.removed.emplace_back(piece); + std::string reason; + for (auto const &change : Result.changes) + { + if (false == can_edit(*change.first, &reason)) + { + Error = "\"" + change.first->name() + "\" can't be changed: " + reason; + return false; + } + } + for (auto const *piece : Result.removed) + { + if (false == can_edit(*piece, &reason)) + { + Error = "\"" + piece->name() + "\" can't be changed: " + reason; + return false; + } + } + + // the junction: the road on both its sides, and the one leaving + auto &junction{Result.layout}; + junction.centre = centre; + for (auto const &cut : cuts) + { + auto const &state{cut.road->definition()}; + junction_node::arm_data arm; + arm.position = state.point(cut.t); + // the way out of the junction is the way the kept part of the piece goes from the cut + arm.direction = planar(state.tangent(cut.t)) * (cut.keepstart ? -1.0 : 1.0); + // lanes heading for the cut lead into the junction + arm.incoming = (cut.keepstart ? state.forward : state.backward); + arm.outgoing = (cut.keepstart ? state.backward : state.forward); + if (false == lane_width(state, cut.t, arm.width)) + { + Error = "Lanes of \"" + cut.road->name() + "\" differ in width, and a junction takes roads with lanes of the same width"; + return false; + } + junction.arms.emplace_back(arm); + } + junction_node::arm_data arm; + arm.position = centre + glm::dvec3{direction.x, 0.0, direction.y} * branchreach; + arm.direction = direction; + arm.incoming = Incoming; + arm.outgoing = Outgoing; + arm.width = Width; + junction.arms.emplace_back(arm); + Result.arm = junction.arms.size() - 1; + dress(junction, layout); + junction.normalize(); + return true; +} + +bool editor_road::branch_from(junction_node &Junction, glm::dvec2 const &Direction, int const Incoming, int const Outgoing, float const Width, branch &Result, std::string &Error) +{ + Result = branch{}; + auto const &layout{Junction.definition()}; + if (layout.arms.size() >= 4) + { + Error = "The junction has four roads already"; + return false; + } + std::string reason; + if (false == can_edit(Junction, &reason)) + { + Error = "\"" + Junction.name() + "\" can't be changed: " + reason; + return false; + } + auto const direction{glm::length(Direction) > 1e-9 ? glm::normalize(Direction) : glm::dvec2{0.0, 1.0}}; + auto const halfwidth{0.5 * (Incoming + Outgoing) * Width}; + // the roads which are there stay where they are, so the new one has to fit between them + auto reach{kCornerRoom}; + for (std::size_t idx = 0; idx < layout.arms.size(); ++idx) + { + auto const &other{layout.arms[idx]}; + auto const angle{std::acos(std::clamp(glm::dot(direction, other.direction), -1.0, 1.0))}; + if (angle < kSharpestBranch) + { + Error = "The road would leave too close to another road of the junction"; + return false; + } + if (angle > kWidestCorner) + continue; + auto const otherhalfwidth{0.5 * layout.arm_width(idx)}; + auto const otherreach{glm::distance(glm::dvec2{other.position.x, other.position.z}, glm::dvec2{layout.centre.x, layout.centre.z})}; + if (edge_reach(otherhalfwidth, halfwidth, angle) > otherreach - 0.5) + { + Error = "There's no room for the road between the roads the junction has; lead it out at a wider angle to them"; + return false; + } + reach = std::max(reach, edge_reach(halfwidth, otherhalfwidth, angle) + kCornerRoom); + } + Result.junction = &Junction; + Result.layout = layout; + junction_node::arm_data arm; + arm.position = layout.centre + glm::dvec3{direction.x, 0.0, direction.y} * reach; + arm.direction = direction; + arm.incoming = Incoming; + arm.outgoing = Outgoing; + arm.width = Width; + Result.layout.arms.emplace_back(arm); + Result.arm = Result.layout.arms.size() - 1; + Result.layout.normalize(); + return true; +} + +junction_node *editor_road::carry_out(branch const &Branch, record &Record) +{ + if (Branch.junction != nullptr) + { + Record.junctions.emplace_back(Branch.junction, Branch.junction->definition()); + apply(std::vector>{{Branch.junction, Branch.layout}}); + return Branch.junction; + } + // room is made first, so nothing gets joined with what's about to go + remove(Branch.removed); + Record.roads_removed.insert(Record.roads_removed.end(), Branch.removed.begin(), Branch.removed.end()); + for (auto const &change : Branch.changes) + Record.roads.emplace_back(change.first, change.first->definition()); + apply(Branch.changes); + auto const added{create(Branch.added)}; + Record.roads_created.insert(Record.roads_created.end(), added.begin(), added.end()); + auto const junctions{create(std::vector{Branch.layout})}; + if (junctions.empty()) + return nullptr; + Record.junctions_created.emplace_back(junctions.front()); + return junctions.front(); } std::vector const &editor_road::materials() diff --git a/editor/editorRoad.hpp b/editor/editorRoad.hpp index e7f7fff37..751d04c6f 100644 --- a/editor/editorRoad.hpp +++ b/editor/editorRoad.hpp @@ -39,12 +39,37 @@ class editor_road return road != nullptr || junction != nullptr; } }; - enum class junction_kind + // an end of a road piece + struct piece_end { - cross, // four roads - tee_sides, // the road ends, with roads to both sides - tee_left, // the road goes on, with a road to the left - tee_right // the road goes on, with a road to the right + road_node *road{nullptr}; + bool atend{false}; // the end of its axis rather than the start + }; + // what an operation changed, in the form needed to take it back + struct record + { + std::vector> roads; // pieces with what they were like before + std::vector roads_created; + std::vector roads_removed; + std::vector> junctions; // junctions with what they were like before + std::vector junctions_created; + std::vector junctions_removed; + + bool empty() const + { + return roads.empty() && roads_created.empty() && roads_removed.empty() && junctions.empty() && junctions_created.empty() && junctions_removed.empty(); + } + }; + // a road led out of the side of another road, or out of a junction between its arms: the junction this takes, + // and what has to be done with the roads to make room for it + struct branch + { + junction_node *junction{nullptr}; // the junction which gets another arm, nullptr if a new one is made + junction_node::state layout; // the junction as it's going to be + std::size_t arm{0}; // the arm of it made for the road + std::vector> changes; // pieces cut short, with their new definitions + std::vector added; // part of a piece left past the junction, to be made a piece of its own + std::vector removed; // pieces which lie within the junction }; // true if the roads can be built and changed at all. optionally explains why they can't static bool available(std::string *Reason = nullptr); @@ -57,6 +82,8 @@ class editor_road static std::vector create(std::vector const &States); // replaces definitions of the pieces and makes their lanes and geometry anew static void apply(std::vector> const &Changes); + // replaces definitions of the junctions, and makes their geometry and the ways through them anew + static void apply(std::vector> const &Changes); // takes the pieces out of the scenery. they're kept around, so they can be brought back static void remove(std::vector const &Roads); static void revive(std::vector const &Roads); @@ -72,6 +99,23 @@ class editor_road static road_node *nearest(glm::dvec3 const &Point, double const Margin); // the junction specified point lies on static junction_node *nearest_junction(glm::dvec3 const &Point); + // the point where pieces meet or end which is nearest to specified one, within specified distance from it. returns: false if there's none + static bool nearest_joint(glm::dvec3 const &Point, double const Radius, glm::dvec3 &Joint); + // ends of the pieces which meet at specified point + static std::vector ends_at(glm::dvec3 const &Point); + // true if there's an arm of a junction at specified point + static bool at_junction(glm::dvec3 const &Point); + // width shared by all lanes of the road at specified value of the curve parameter of its axis. returns: false if the lanes differ in width + static bool lane_width(road_node::state const &State, double const T, float &Width); + // lays out a junction for a road leaving the side of specified piece at specified value of the curve parameter of its axis. + // Direction: the way the road leaves; Incoming, Outgoing: lanes of that road leading into the junction and out of it. + // nothing is changed until the result is carried out. returns: false if it can't be done, with the reason in Error + static bool branch_from(road_node &Road, double const T, glm::dvec2 const &Direction, int const Incoming, int const Outgoing, float const Width, branch &Result, std::string &Error); + // the same for a road leaving a junction between its arms, which gives the junction another arm + static bool branch_from(junction_node &Junction, glm::dvec2 const &Direction, int const Incoming, int const Outgoing, float const Width, branch &Result, std::string &Error); + // makes the junction laid out for a branch, or gives the existing one its new arm, and cuts the roads to fit. what it does is added to Record. + // returns: the junction + static junction_node *carry_out(branch const &Branch, record &Record); // value of the curve parameter for the point of the axis nearest to specified point static double nearest_parameter(road_node::state const &State, glm::dvec3 const &Point); // end of a road with nothing attached, within specified distance from specified point; optionally arms of junctions too @@ -91,11 +135,6 @@ class editor_road static double planar_length(segment_data const &Path); // slope of the path at its end, in the direction it's laid out static double end_grade(segment_data const &Path); - // distance from the centre of a junction to the ends of the roads it's made for - static double junction_reach(int const Lanes, float const Width); - // lays out a junction entered by a road. Entry: middle of the end of that road, Heading: the way the road goes there, - // Incoming, Outgoing: lanes of that road leading into the junction and out of it - static junction_node::state junction(junction_kind const Kind, glm::dvec3 const &Entry, glm::dvec2 const &Heading, int const Incoming, int const Outgoing, float const Width); // names of materials and images present in the texture folder, to pick from static std::vector const &materials(); diff --git a/world/Road.cpp b/world/Road.cpp index a0da0b620..b9e4a537b 100644 --- a/world/Road.cpp +++ b/world/Road.cpp @@ -192,13 +192,24 @@ class road_axis // corner of the cross-section of something laid along the road struct profile_point { - double offset; // distance from the axis, positive to the left + double offset; // distance from the axis, positive to the left. this part of it follows the taper of the road double height; // above the surface float texture; // texture coordinate across the road + double shift{0.0}; // further distance from the axis, which the taper leaves alone }; +// how far the taper of a road has got at specified part of its length. it starts and ends level, so the pieces of a road +// meet without a bend in their edges, and it's what a lane running from one width to another comes to on a straight +double taper_progress(double const Fraction) +{ + auto const t{std::clamp(Fraction, 0.0, 1.0)}; + return t * t * (3.0 - 2.0 * t); +} + // stretches provided profile along a part of the axis. the profile points go left to right, each two neighbours make a band of triangles. -void loft(std::vector &Output, road_axis const &Axis, std::vector const &Profile, double const From, double const To, double const Step, double const Texturelength) +// Taper: what the offsets of the profile are multiplied by at the start and at the end of the axis +void loft(std::vector &Output, road_axis const &Axis, std::vector const &Profile, double const From, double const To, double const Step, double const Texturelength, + std::array const &Taper) { if (Profile.size() < 2 || To <= From || Step <= 0.0) { @@ -219,9 +230,10 @@ void loft(std::vector &Output, road_axis const &Axis, std::vector< { auto const station{From + (To - From) * section / count}; auto const frame{Axis.at(station)}; + auto const scale{Taper[0] == Taper[1] ? static_cast(Taper[0]) : glm::mix(static_cast(Taper[0]), static_cast(Taper[1]), taper_progress(station / Axis.length()))}; for (std::size_t idx = 0; idx < pointcount; ++idx) { - current[idx] = frame.position + frame.left * Profile[idx].offset + up * Profile[idx].height; + current[idx] = frame.position + frame.left * (Profile[idx].offset * scale + Profile[idx].shift) + up * Profile[idx].height; } if (section > 0) { @@ -279,6 +291,10 @@ void road_node::state::normalize() forward = 1; } lanewidth = std::max(1.f, lanewidth); + for (auto &end : taper) + { + end = std::clamp(end, 0.25f, 4.f); + } if (texturelength < 0.01f) { texturelength = 4.f; @@ -372,7 +388,7 @@ double road_node::state::lane_offset(std::size_t const Lane) const return Lane < lanes.size() ? offset - 0.5 * lanes[Lane].width : offset; } -// combined width of the lanes +// combined width of the lanes, before the taper double road_node::state::width() const { double total{0.0}; @@ -383,24 +399,33 @@ double road_node::state::width() const return total; } +// what the widths of the lanes are multiplied by at specified value of the curve parameter +double road_node::state::scale(double const T) const +{ + return glm::mix(static_cast(taper[0]), static_cast(taper[1]), taper_progress(T)); +} + // shape of the middle of a lane, laid out in the direction of travel segment_data road_node::state::lane_path(std::size_t const Lane) const { road_axis const centre{axis}; - auto const offset{lane_offset(Lane)}; + // on a road which gets wider or narrower the lane moves away from the axis or towards it along the way + auto const beginoffset{lane_offset(Lane) * taper[0]}; + auto const endoffset{lane_offset(Lane) * taper[1]}; auto const begin{centre.frame(0.0)}; auto const end{centre.frame(1.0)}; segment_data path; - path.points[segment_data::point::start] = begin.position + begin.left * offset; - path.points[segment_data::point::end] = end.position + end.left * offset; - if (centre.curved()) + path.points[segment_data::point::start] = begin.position + begin.left * beginoffset; + path.points[segment_data::point::end] = end.position + end.left * endoffset; + if (centre.curved() || beginoffset != endoffset) { - // a line running beside a bend is shorter or longer than the bend itself, and so are its control vectors - path.points[segment_data::point::control1] = centre.control(0) * std::max(0.05, 1.0 - offset * std::cos(begin.roll) * centre.curvature(0.0)); - path.points[segment_data::point::control2] = centre.control(1) * std::max(0.05, 1.0 - offset * std::cos(end.roll) * centre.curvature(1.0)); + // a line running beside a bend is shorter or longer than the bend itself, and so are its control vectors. + // the control vectors go along the axis at both ends, which is what makes the lane meet the next piece without a bend + path.points[segment_data::point::control1] = centre.control(0) * std::max(0.05, 1.0 - beginoffset * std::cos(begin.roll) * centre.curvature(0.0)); + path.points[segment_data::point::control2] = centre.control(1) * std::max(0.05, 1.0 - endoffset * std::cos(end.roll) * centre.curvature(1.0)); // if the roll changes along the road its sides rise or fall relative to the axis - auto const climb{offset * (std::sin(end.roll) - std::sin(begin.roll)) / 3.0}; + auto const climb{(endoffset * std::sin(end.roll) - beginoffset * std::sin(begin.roll)) / 3.0}; path.points[segment_data::point::control1].y += climb; path.points[segment_data::point::control2].y -= climb; } @@ -409,7 +434,7 @@ segment_data road_node::state::lane_path(std::size_t const Lane) const { // the lanes on the inner side of the bend have it tighter auto const turn{centre.curvature(0.5) >= 0.0 ? 1.0 : -1.0}; - path.radius = static_cast(std::max(1.0, std::abs(axis.radius) - turn * offset)); + path.radius = static_cast(std::max(1.0, std::abs(axis.radius) - turn * 0.5 * (beginoffset + endoffset))); } if (Lane < static_cast(backward)) { @@ -490,6 +515,12 @@ void road_node::import(cParser &Input, glm::dvec3 const &Offset) Input.getTokens(); Input >> m_state.velocity; } + else if (token == "taper") + { + // taper + Input.getTokens(2); + Input >> m_state.taper[0] >> m_state.taper[1]; + } else if (token == "lane") { // lane @@ -779,7 +810,7 @@ std::vector road_node::create_shapes() const if (road.surface != "none") { auto const tile{static_cast(texture_ratio(road.surface)) * texturelength}; - loft(vertices(road.surface, lighting_data{}), axis, {{halfwidth, 0.0, static_cast(0.5 + halfwidth / tile)}, {-halfwidth, 0.0, static_cast(0.5 - halfwidth / tile)}}, 0.0, length, step, texturelength); + loft(vertices(road.surface, lighting_data{}), axis, {{halfwidth, 0.0, static_cast(0.5 + halfwidth / tile)}, {-halfwidth, 0.0, static_cast(0.5 - halfwidth / tile)}}, 0.0, length, step, texturelength, road.taper); } // sides @@ -797,10 +828,10 @@ std::vector road_node::create_shapes() const { // the image is laid out like the one of the legacy roads: the edge of the surface on its right, the bank on its left half profile.push_back({direction * halfwidth, 0.0, 1.f}); - profile.push_back({direction * (halfwidth + data.width), 0.0, 0.5f}); + profile.push_back({direction * halfwidth, 0.0, 0.5f, direction * data.width}); if (road.slope.x > 0.f) { - profile.push_back({direction * (halfwidth + data.width + road.slope.x), -road.slope.y, 0.f}); + profile.push_back({direction * halfwidth, -road.slope.y, 0.f, direction * (data.width + road.slope.x)}); } } else @@ -809,14 +840,14 @@ std::vector road_node::create_shapes() const auto const tile{static_cast(texture_ratio(data.material)) * texturelength}; profile.push_back({direction * halfwidth, 0.0, 0.f}); profile.push_back({direction * halfwidth, road.kerbheight, static_cast(road.kerbheight / tile)}); - profile.push_back({direction * (halfwidth + data.width), road.kerbheight, static_cast((road.kerbheight + data.width) / tile)}); + profile.push_back({direction * halfwidth, road.kerbheight, static_cast((road.kerbheight + data.width) / tile), direction * data.width}); } if (side == 0) { // the loft takes the corners left to right std::reverse(profile.begin(), profile.end()); } - loft(vertices(data.material, lighting_data{}), axis, profile, 0.0, length, step, texturelength); + loft(vertices(data.material, lighting_data{}), axis, profile, 0.0, length, step, texturelength, road.taper); } // markings. these are painted with plain colour instead of an image @@ -827,26 +858,27 @@ std::vector road_node::create_shapes() const paint.ambient = paint.diffuse; auto &lines{vertices("colored", paint)}; - auto const solid = [&](double const Offset) { - loft(lines, axis, {{Offset + 0.5 * line_width, line_lift, 0.f}, {Offset - 0.5 * line_width, line_lift, 1.f}}, 0.0, length, std::min(step, dash_step), texturelength); + // Offset: where the line runs on a road as wide as its lanes say, Shift: how far from there it's kept whatever the width + auto const solid = [&](double const Offset, double const Shift) { + loft(lines, axis, {{Offset, line_lift, 0.f, Shift + 0.5 * line_width}, {Offset, line_lift, 1.f, Shift - 0.5 * line_width}}, 0.0, length, std::min(step, dash_step), texturelength, road.taper); }; // the dashes are fitted so the gaps at both ends of the road are a half of the regular one, which makes them match the next piece - auto const dashed = [&](double const Offset) { + auto const dashed = [&](double const Offset, double const Shift) { auto const count{std::max(1, static_cast(std::lround(length / dash_period)))}; auto const period{length / count}; for (int dash = 0; dash < count; ++dash) { auto const from{(dash + 1.0 / 3.0) * period}; - loft(lines, axis, {{Offset + 0.5 * line_width, line_lift, 0.f}, {Offset - 0.5 * line_width, line_lift, 1.f}}, from, from + period / 3.0, dash_step, texturelength); + loft(lines, axis, {{Offset, line_lift, 0.f, Shift + 0.5 * line_width}, {Offset, line_lift, 1.f, Shift - 0.5 * line_width}}, from, from + period / 3.0, dash_step, texturelength, road.taper); } }; // edges of the surface - auto const edge{halfwidth - edge_inset - 0.5 * line_width}; - if (edge > 0.5) + auto const inset{edge_inset + 0.5 * line_width}; + if (halfwidth * std::min(road.taper[0], road.taper[1]) - inset > 0.5) { - solid(edge); - solid(-edge); + solid(halfwidth, -inset); + solid(-halfwidth, inset); } // lines between the lanes. a lane can be left across a dashed line, or across a pair of lines if the dashed one is on its side auto offset{halfwidth}; @@ -859,19 +891,19 @@ std::vector road_node::create_shapes() const { case change_both: { - dashed(offset); + dashed(offset, 0.0); break; } case change_toright: { - dashed(offset + pair); - solid(offset - pair); + dashed(offset, pair); + solid(offset, -pair); break; } case change_toleft: { - solid(offset + pair); - dashed(offset - pair); + solid(offset, pair); + dashed(offset, -pair); break; } default: @@ -879,12 +911,12 @@ std::vector road_node::create_shapes() const if (opposite) { // traffic going opposite ways is kept apart with a double line - solid(offset + pair); - solid(offset - pair); + solid(offset, pair); + solid(offset, -pair); } else { - solid(offset); + solid(offset, 0.0); } break; } @@ -1671,7 +1703,7 @@ TTrack *road_node::create_track(std::string const &Name, segment_data const &Pat // radius() subclass details, calculates node's bounding radius float road_node::radius_() { - return static_cast(0.5 * m_state.length() + 0.5 * m_state.width() + std::max(m_state.sides[0].width, m_state.sides[1].width) + m_state.slope.x); + return static_cast(0.5 * m_state.length() + 0.5 * m_state.width() * std::max(m_state.taper[0], m_state.taper[1]) + std::max(m_state.sides[0].width, m_state.sides[1].width) + m_state.slope.x); } // serialize() subclass details, sends content of the subclass to provided stream @@ -1701,6 +1733,10 @@ void road_node::export_as_text_(std::ostream &Output) const Output.precision(precision); // lanes Output << "lanes " << road.forward << ' ' << road.backward << ' ' << "width " << road.lanewidth << ' '; + if (road.taper[0] != 1.f || road.taper[1] != 1.f) + { + Output << "taper " << road.taper[0] << ' ' << road.taper[1] << ' '; + } if (road.velocity > 0.f) { Output << "velocity " << road.velocity << ' '; diff --git a/world/Road.h b/world/Road.h index de77977fa..db4e8d75a 100644 --- a/world/Road.h +++ b/world/Road.h @@ -47,7 +47,8 @@ class owned_shapes scene::basic_section *m_section{nullptr}; }; -// a piece of a road for wheeled traffic: an axis, and a cross-section which stays the same along it. +// a piece of a road for wheeled traffic: an axis, and a cross-section which stays the same along it, save for getting +// evenly wider or narrower if it's told to. // the node itself is neither driven on nor drawn. it produces the lanes, which are ordinary invisible one-way tracks, // and the surface, the sides and the markings, which are ordinary shapes. this way the vehicles, the ai and the renderers // deal with a road without knowing about it. @@ -100,6 +101,7 @@ class road_node : public scene::basic_node float velocity{-1.f}; std::vector lanes; std::vector changes; // permissions to change the lane, one for each pair of neighbouring lanes + std::array taper{1.f, 1.f}; // what the widths of the lanes are multiplied by at the start and at the end of the axis std::string surface{"asphaltdark1"}; float texturelength{4.f}; std::array sides; // left, right @@ -121,8 +123,10 @@ class road_node : public scene::basic_node int default_change(std::size_t const Boundary) const; // distance of the middle of a lane from the axis, positive to the left when facing along the axis double lane_offset(std::size_t const Lane) const; - // combined width of the lanes + // combined width of the lanes, before the taper double width() const; + // what the widths of the lanes are multiplied by at specified value of the curve parameter + double scale(double const T) const; // shape of the middle of a lane, laid out in the direction of travel segment_data lane_path(std::size_t const Lane) const; // length of the axis @@ -206,6 +210,7 @@ class road_node : public scene::basic_node // gets a legacy crossroads path, which is what the vehicles and their drivers already know how to pick a way through. // scenery entry: // node junction arm ... [ ]... endjunction +// the arms don't have to be level with each other: the surface is spanned between their ends and the centre class junction_node : public scene::basic_node { From 502c609b1309b901edf2e8da52a050273bf20b66 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Sat, 3 Oct 2026 22:18:53 +0200 Subject: [PATCH 081/430] feat(roads): single piece widening with generated transitions, point height tools, fix for the frame rate drop in the road tools --- application/editormode.cpp | 82 +++++++----- application/editormode.h | 9 +- application/editormoderoad.cpp | 227 +++++++++++++++++++++++-------- editor/editorRoad.cpp | 236 ++++++++++++++++++++++++++++++--- editor/editorRoad.hpp | 9 +- world/Road.cpp | 73 +++++++++- 6 files changed, 528 insertions(+), 108 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 7053fe6a1..1a947be5e 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -299,6 +299,10 @@ namespace { if (instance == nullptr || instance->Model() == nullptr || instance->radius() < ModelRadius) continue; + // going through the triangles of a model which doesn't reach the rectangle is all cost and no gain + double const reach = instance->radius(); + if (instance->location().x + reach < Min.x || instance->location().x - reach > Max.x || instance->location().z + reach < Min.y || instance->location().z - reach > Max.y) + continue; std::vector modeltriangles; gather_submodel_triangles(instance->Model()->Root, instance_matrix(*instance), modeltriangles); for (auto const &t : modeltriangles) @@ -310,6 +314,20 @@ namespace } } + // ground kept for the road tools, which ask about the same places frame after frame. it's gathered a tile at a time: + // gathering is what takes time, so a place asked about for the first time costs a single tile a frame instead of a stall + struct ground_tile + { + std::unique_ptr grid; + double gathered{0.0}; // when, on the clock of the user interface + int used{0}; // frame it was last asked for + }; + double constexpr ground_tile_size = 256.0; + double constexpr ground_tile_lifetime = 30.0; // older tiles are gathered again when asked for, to catch up with the scenery + std::size_t constexpr ground_tile_limit = 96; + std::map, ground_tile> ground_tiles; + int ground_tile_frame{-1}; // frame the last tile was gathered in without being told to + // scenery file name without path and extension std::string scenery_stem() { @@ -360,45 +378,36 @@ std::vector editor_mode::ground_heights(std::vector const &P if (Points.empty() || simulation::Region == nullptr) return heights; - glm::dvec2 bmin{Points.front().x, Points.front().z}; - glm::dvec2 bmax{bmin}; - for (auto const &point : Points) - { - bmin = glm::min(bmin, glm::dvec2{point.x, point.z}); - bmax = glm::max(bmax, glm::dvec2{point.x, point.z}); - } - // the road tools ask about the same place frame after frame, so the ground is gathered with room to spare and kept for a moment - struct ground_cache - { - glm::dvec2 min{0.0}; - glm::dvec2 max{0.0}; - std::unique_ptr grid; - double time{0.0}; - }; - static ground_cache cache; - double constexpr cache_margin = 60.0; - double constexpr cache_lifetime = 5.0; double const now = ImGui::GetTime(); - if (Fresh || cache.grid == nullptr || now < cache.time || now - cache.time > cache_lifetime || bmin.x < cache.min.x || bmin.y < cache.min.y || bmax.x > cache.max.x || bmax.y > cache.max.y) - { - cache.min = bmin - glm::dvec2{cache_margin}; - cache.max = bmax + glm::dvec2{cache_margin}; - std::vector triangles; - // the same ground as the area fill uses, terrain tile models included - gather_ground_triangles(cache.min, cache.max, true, 50.0f, triangles, true); - cache.grid = std::make_unique(std::move(triangles), cache.min, cache.max); - cache.time = now; - } - + int const frame = ImGui::GetFrameCount(); // surfaces much higher than the point are something it's under, rather than the ground double constexpr height_tolerance = 50.0; auto const terrains = active_terrains(); for (std::size_t i = 0; i < Points.size(); ++i) { auto const &p = Points[i]; + std::pair const key{static_cast(std::floor(p.x / ground_tile_size)), static_cast(std::floor(p.z / ground_tile_size))}; + auto &tile = ground_tiles[key]; + bool const missing = (tile.grid == nullptr); + bool const stale = missing || now < tile.gathered || now - tile.gathered > ground_tile_lifetime; + // told to wait the caller gets every tile it needs, otherwise what's there, with one tile gathered each frame + if (stale && (Fresh ? missing : ground_tile_frame != frame)) + { + glm::dvec2 const tilemin{key.first * ground_tile_size, key.second * ground_tile_size}; + glm::dvec2 const tilemax{tilemin + glm::dvec2{ground_tile_size}}; + std::vector triangles; + // the same ground as the area fill uses, terrain tile models included + gather_ground_triangles(tilemin, tilemax, true, 50.0f, triangles, true); + tile.grid = std::make_unique(std::move(triangles), tilemin, tilemax); + tile.gathered = now; + if (false == Fresh) + ground_tile_frame = frame; + } + tile.used = frame; + double const ceiling = p.y + height_tolerance; double y = 0.0; - bool found = cache.grid->height_at(p.x, p.z, ceiling, y); + bool found = (tile.grid != nullptr) && tile.grid->height_at(p.x, p.z, ceiling, y); for (editor_terrain *terrain : terrains) { if (!terrain->contains(p.x, p.z)) @@ -413,6 +422,17 @@ std::vector editor_mode::ground_heights(std::vector const &P if (found) heights[i] = y; } + // the tiles left alone the longest go once there are too many + while (ground_tiles.size() > ground_tile_limit) + { + auto oldest = ground_tiles.begin(); + for (auto tile = ground_tiles.begin(); tile != ground_tiles.end(); ++tile) + if (tile->second.used < oldest->second.used) + oldest = tile; + if (oldest->second.used == frame) + break; + ground_tiles.erase(oldest); + } return heights; } @@ -1925,6 +1945,8 @@ void editor_mode::handle_terrain_sculpt(double Deltatime) // crossing a chunk boundary edits both and shared-edge vertices stay in sync for (editor_terrain *terrain : active_terrains()) terrain->sculpt(world.x, world.z, m_terrain_brush_radius, signedrate); + // what the road tools know about the ground is no longer true + ground_tiles.clear(); } void editor_mode::capture_terrain() diff --git a/application/editormode.h b/application/editormode.h index b23521791..e34c6e2ff 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -521,6 +521,7 @@ class editor_mode : public application_mode float offset{0.1f}; // height above the ground the roads are built at bool follow{true}; // built roads are led over the ground between the clicked points float crossingspeed{30.f}; // speed limit on the junctions being made + float heightstep{0.1f}; // how much the selected points are raised or lowered at a time road_plan plan; // what a click would make at the moment, worked out once a frame for display glm::dvec3 hover{0.0}; // point of a road or a junction under the cursor a road can be led out of bool hashover{false}; @@ -542,11 +543,11 @@ class editor_mode : public application_mode bool road_delete(); bool road_split(); void road_cancel(); - // sets the width of the road, or its height, at the selected points + // sets the width of the road at the selected points, or the height of each of them void road_point_width(float const Width); - void road_point_height(double const Height); - bool road_points_apply(std::vector> const &Changes, std::size_t const Skipped); - // Fresh: the ground is looked up anew instead of going by what was gathered for the previous frames + void road_point_heights(std::vector const &Heights); + bool road_points_apply(std::vector> const &Changes, std::vector> const &Junctions); + // Fresh: the ground which wasn't looked up yet is gathered on the spot, instead of a bit of it each frame road_plan road_preview(bool const Fresh); // Firstgrade, Lastgrade: slopes the road has to start and end with, nullptr for none void road_profile(std::vector &Pieces, double const *Firstgrade, double const *Lastgrade, bool const Fresh); diff --git a/application/editormoderoad.cpp b/application/editormoderoad.cpp index 09427d7f5..300899f42 100644 --- a/application/editormoderoad.cpp +++ b/application/editormoderoad.cpp @@ -55,8 +55,22 @@ class screen_projection Screen = screen(c); return true; } + // true while there's room in the draw list for more. the user interface is drawn with 16 bit indices, so a list + // can't hold more than 65536 vertices; past that the lines come out as triangles strewn all over the screen, + // which takes the frame rate down with it. the limit doesn't apply if the renderer can deal with larger lists + bool room(ImDrawList const *Drawlist) const + { + return (Drawlist->Flags & ImDrawListFlags_AllowVtxOffset) != 0 || Drawlist->VtxBuffer.Size < limit; + } + // true if a line between two points on the screen can't be seen + bool outside(ImVec2 const &A, ImVec2 const &B) const + { + return (A.x < 0.0f && B.x < 0.0f) || (A.y < 0.0f && B.y < 0.0f) || (A.x > m_size.x && B.x > m_size.x) || (A.y > m_size.y && B.y > m_size.y); + } void line(ImDrawList *Drawlist, glm::dvec3 const &A, glm::dvec3 const &B, ImU32 const Color, float const Thickness) const { + if (false == room(Drawlist)) + return; glm::vec4 a = clip(A); glm::vec4 b = clip(B); if (a.w < kNear && b.w < kNear) @@ -65,8 +79,17 @@ class screen_projection a = glm::mix(a, b, (kNear - a.w) / (b.w - a.w)); else if (b.w < kNear) b = glm::mix(b, a, (kNear - b.w) / (a.w - b.w)); - Drawlist->AddLine(screen(a), screen(b), Color, Thickness); + auto const from{screen(a)}; + auto const to{screen(b)}; + if (outside(from, to)) + return; + Drawlist->AddLine(from, to, Color, Thickness); } + // members + int limit{kVertexLimit}; // vertices the draw list can hold before the drawing stops + + static constexpr int kVertexLimit{56000}; // leaves room for what's drawn after the overlay + static constexpr int kLaneVertexLimit{36000}; // the lanes give way to the tools, which are drawn after them private: static constexpr float kNear{0.1f}; @@ -129,21 +152,15 @@ ImU32 const kPreviewColor{IM_COL32(255, 210, 60, 255)}; ImU32 const kRefusedColor{IM_COL32(240, 60, 60, 255)}; ImU32 const kSnapColor{IM_COL32(255, 60, 255, 255)}; -// gathers new definitions for the pieces which meet or end at provided points. Change: receives a definition, and which end of it is at the point. -// Skipped: receives the number of points left out for being at a junction, which is made for the road the way it is +// gathers new definitions for the pieces which meet or end at provided points. +// Change: receives a definition, which end of it is at the point, and the number of the point template -std::vector> point_changes(std::vector const &Points, std::size_t &Skipped, Change_ Change) +std::vector> point_changes(std::vector const &Points, Change_ Change) { std::vector> changes; - Skipped = 0; - for (auto const &point : Points) + for (std::size_t index = 0; index < Points.size(); ++index) { - if (editor_road::at_junction(point)) - { - ++Skipped; - continue; - } - for (auto const &end : editor_road::ends_at(point)) + for (auto const &end : editor_road::ends_at(Points[index])) { // a piece with both its ends among the points gets both changed auto entry{std::find_if(changes.begin(), changes.end(), [&end](std::pair const &Listed) { return Listed.first == end.road; })}; @@ -152,12 +169,27 @@ std::vector> point_changes(std::vector< changes.emplace_back(end.road, end.road->definition()); entry = std::prev(changes.end()); } - Change(entry->second, end.atend); + Change(entry->second, end.atend, index); } } return changes; } +// direction of a path for specified value of its curve parameter. like path_point() it's cheap enough to be asked for a lot each frame +glm::dvec3 path_direction(segment_data const &Path, double const T) +{ + auto const &p0 = Path.points[segment_data::point::start]; + auto const &p3 = Path.points[segment_data::point::end]; + auto const &cp1 = Path.points[segment_data::point::control1]; + auto const &cp2 = Path.points[segment_data::point::control2]; + if (cp1 == glm::dvec3{0.0} && cp2 == glm::dvec3{0.0}) + return p3 - p0; + auto const p1 = p0 + cp1; + auto const p2 = p3 + cp2; + double const u = 1.0 - T; + return 3.0 * u * u * (p1 - p0) + 6.0 * u * T * (p2 - p1) + 3.0 * T * T * (p3 - p2); +} + } void editor_mode::render_road_menu() @@ -418,7 +450,6 @@ void editor_mode::road_profile(std::vector &Pieces, double const * return; } auto const planned{Pieces}; - bool fresh{Fresh}; for (auto const step : kProfileSteps) { Pieces = editor_road::refine(planned, step); @@ -434,8 +465,7 @@ void editor_mode::road_profile(std::vector &Pieces, double const * // the planner leads the road between its ends, which are over the ground already for (auto &point : points) point.y -= tool.offset; - auto ground{ground_heights(points, fresh)}; - fresh = false; + auto ground{ground_heights(points, Fresh)}; for (auto &height : ground) height += tool.offset; std::vector heights(ground.begin(), ground.begin() + count + 1); @@ -702,9 +732,19 @@ void editor_mode::road_apply() changes.emplace_back(road, state); } editor_road::apply(changes); + // what's next to the changed pieces is fitted to them: junctions take the lanes they have now, the pieces of the road + // which stay as they were get wider or narrower towards them, or give up their ends for the lanes to change + std::string notes; + for (auto *road : pieces) + editor_road::settle(*road, record, notes); + auto const fitted{record.roads.size() + record.roads_removed.size() + record.junctions.size() + record.junctions_created.size() - pieces.size()}; push_road_snapshot(std::move(record)); tool.settings = tool.selected->definition(); - tool.status = (pieces.size() == 1 ? std::string{"Changed"} : "Changed " + std::to_string(pieces.size()) + " pieces"); + tool.status = (pieces.size() == 1 ? std::string{"Changed."} : "Changed " + std::to_string(pieces.size()) + " pieces."); + if (fitted > 0) + tool.status += " What's next to it was fitted to it."; + if (false == notes.empty()) + tool.status += " " + notes; } bool editor_mode::road_delete() @@ -774,19 +814,18 @@ bool editor_mode::road_split() } // makes the changes gathered for the selected points. returns: true if they were made -bool editor_mode::road_points_apply(std::vector> const &Changes, std::size_t const Skipped) +bool editor_mode::road_points_apply(std::vector> const &Changes, std::vector> const &Junctions) { auto &tool{m_roadtool}; - std::string const leftalone{Skipped > 0 ? " The points at junctions were left alone, as a junction is made for the road the way it is." : ""}; - if (Changes.empty()) + if (Changes.empty() && Junctions.empty()) { - tool.status = "Nothing was changed." + leftalone; + tool.status = "There's nothing to change at the selected points"; return false; } editor_road::record record; + std::string reason; for (auto const &change : Changes) { - std::string reason; if (false == editor_road::can_edit(*change.first, &reason)) { tool.status = "\"" + change.first->name() + "\" can't be changed: " + reason; @@ -794,39 +833,67 @@ bool editor_mode::road_points_apply(std::vectordefinition()); } + for (auto const &change : Junctions) + { + if (false == editor_road::can_edit(*change.first, &reason)) + { + tool.status = "\"" + change.first->name() + "\" can't be changed: " + reason; + return false; + } + record.junctions.emplace_back(change.first, change.first->definition()); + } editor_road::apply(Changes); + editor_road::apply(Junctions); + // junctions the changed pieces lead to are made for the roads as they are now + std::string notes; + for (auto const &change : Changes) + editor_road::settle(*change.first, record, notes); push_road_snapshot(std::move(record)); - tool.status = (Changes.size() == 1 ? std::string{"Changed 1 piece."} : "Changed " + std::to_string(Changes.size()) + " pieces.") + leftalone; + tool.status = (Changes.size() == 1 ? std::string{"Changed 1 piece."} : "Changed " + std::to_string(Changes.size()) + " pieces."); + if (false == notes.empty()) + tool.status += " " + notes; return true; } void editor_mode::road_point_width(float const Width) { - std::size_t skipped{0}; // the pieces on both sides of a point get to that width there, and from there go back to their own along their length - auto const changes{point_changes(m_roadtool.points, skipped, [Width](road_node::state &State, bool const Atend) { + auto const changes{point_changes(m_roadtool.points, [Width](road_node::state &State, bool const Atend, std::size_t const) { auto const width{State.width()}; if (width > 0.0) State.taper[Atend ? 1 : 0] = std::clamp(static_cast(Width / width), 0.25f, 4.f); })}; - road_points_apply(changes, skipped); + road_points_apply(changes, {}); } -void editor_mode::road_point_height(double const Height) +// Heights: one for each of the selected points +void editor_mode::road_point_heights(std::vector const &Heights) { auto &tool{m_roadtool}; - std::size_t skipped{0}; - // the control points are kept relative to the ends, so the slopes the pieces have at the point stay - auto const changes{point_changes(tool.points, skipped, [Height](road_node::state &State, bool const Atend) { State.axis.points[Atend ? segment_data::point::end : segment_data::point::start].y = Height; })}; - // the selection follows what it's made of - std::vector moved; - for (auto const &point : tool.points) - moved.emplace_back(false == editor_road::at_junction(point)); - if (false == road_points_apply(changes, skipped)) + if (Heights.size() != tool.points.size()) return; - for (std::size_t i = 0; i < tool.points.size(); ++i) - if (moved[i]) - tool.points[i].y = Height; + // the control points are kept relative to the ends, so the slopes the pieces have at a point stay what they are + auto const changes{point_changes(tool.points, [&Heights](road_node::state &State, bool const Atend, std::size_t const Point) { State.axis.points[Atend ? segment_data::point::end : segment_data::point::start].y = Heights[Point]; })}; + // an arm of a junction goes up or down with the end of the road it's made for + std::vector> junctions; + for (std::size_t index = 0; index < tool.points.size(); ++index) + { + for (auto const &arm : editor_road::arms_at(tool.points[index])) + { + auto entry{std::find_if(junctions.begin(), junctions.end(), [&arm](std::pair const &Listed) { return Listed.first == arm.first; })}; + if (entry == junctions.end()) + { + junctions.emplace_back(arm.first, arm.first->definition()); + entry = std::prev(junctions.end()); + } + entry->second.arms[arm.second].position.y = Heights[index]; + } + } + if (false == road_points_apply(changes, junctions)) + return; + // the selection follows what it's made of + for (std::size_t index = 0; index < tool.points.size(); ++index) + tool.points[index].y = Heights[index]; } void editor_mode::push_road_snapshot(editor_road::record Record) @@ -1187,13 +1254,40 @@ void editor_mode::render_road_window() road_point_width(std::clamp(width, 1.0f, 100.0f)); if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", "Combined width of the lanes at this point; each lane takes its share of it.\nThe pieces on both sides get wider or narrower along their length to meet it.\nSelect several points to keep the width over the pieces between them."); + // heights: set outright, moved by a step, or taken from the ground auto height{static_cast(tool.points.front().y)}; if (number("Height [m]", height, 0.1f, "%.2f")) - road_point_height(height); + road_point_heights(std::vector(tool.points.size(), height)); if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", "Height of the axis of the road at this point. The slopes of the pieces at the point are kept."); - if (editor_road::at_junction(tool.points.front())) - ImGui::TextDisabled("This point is at a junction, which is made for the road the way it is"); + ImGui::SetTooltip("%s", "Height of the axis of the road at the point; with several points selected all are put at this height.\nThe slopes of the pieces at the point are kept, so the road stays smooth."); + std::vector heights; + for (auto const &point : tool.points) + heights.emplace_back(point.y); + auto const moved{ImGui::Button("Lower") ? -1.0 : 0.0}; + ImGui::SameLine(); + auto const raised{ImGui::Button("Raise") ? 1.0 : 0.0}; + ImGui::SameLine(); + ImGui::SetNextItemWidth(80.0f); + if (ImGui::InputFloat("by [m]", &tool.heightstep, 0.0f, 0.0f, "%.2f")) + tool.heightstep = std::clamp(tool.heightstep, 0.01f, 50.0f); + if (moved + raised != 0.0) + { + // each point moves from where it is, so the shape of the road between them is kept + for (auto &entry : heights) + entry += (moved + raised) * tool.heightstep; + road_point_heights(heights); + } + if (ImGui::Button("Put on the ground")) + { + // a point with nothing under it comes back with the height it has, and is left where it is + auto const ground{ground_heights(tool.points, true)}; + for (std::size_t index = 0; index < heights.size(); ++index) + if (ground[index] != tool.points[index].y) + heights[index] = ground[index] + tool.offset; + road_point_heights(heights); + } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("Puts each point %.2f m over the ground under it; the height above the ground is set in the Build tool.", tool.offset); } } else if (tool.junction != nullptr) @@ -1220,6 +1314,26 @@ void editor_mode::render_road_window() tool.status = "\"" + junction.name() + "\" can't be changed: " + reason; } } + auto centre{static_cast(junction.definition().centre.y)}; + if (number("Height of the middle [m]", centre, 0.1f, "%.2f")) + { + if (editor_road::can_edit(junction, &reason)) + { + editor_road::record record; + record.junctions.emplace_back(&junction, junction.definition()); + auto state{junction.definition()}; + state.centre.y = centre; + editor_road::apply(std::vector>{{&junction, state}}); + push_road_snapshot(std::move(record)); + tool.status = "Changed"; + } + else + { + tool.status = "\"" + junction.name() + "\" can't be changed: " + reason; + } + } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "The surface is spanned between the ends of the roads and this point.\nThe ends of the roads are raised or lowered as points: select the white dot at the end of a road."); if (ImGui::Button("Delete (Del)")) road_delete(); } @@ -1233,7 +1347,7 @@ void editor_mode::render_road_window() ImGui::TextDisabled("K: split at the cursor"); ImGui::Checkbox("Changes go to the whole road", &tool.whole); if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", "A road is a string of pieces. With this on a change of the layout is made to all of them,\nexcept for the lane change rules, which are always set for the selected piece alone.\nSplit a piece (K) to get a zone with rules of its own."); + ImGui::SetTooltip("%s", "A road is a string of pieces. With this on a change of the layout is made to all of them,\nexcept for the lane change rules, which are always set for the selected piece alone.\nWith this off the selected piece alone is changed, and the road next to it is fitted to it:\nmade wider or narrower towards it, or given a stretch where the lanes change if their number differs.\nSplit a piece (K) to get a piece of the length you need."); ImGui::Separator(); if (tool.selected != nullptr && render_road_layout(tool.settings)) road_apply(); @@ -1256,9 +1370,15 @@ void editor_mode::draw_road_overlay() const if (false == tool.lanes && false == tool.window) return; - screen_projection const projection; + screen_projection projection; ImDrawList *drawlist = ImGui::GetBackgroundDrawList(); glm::dvec3 const camera{Global.pCamera.Pos}; + // pieces of a line needed to draw a path: one for a straight, more the longer a bend is and the nearer it is + auto const pieces = [&camera](segment_data const &Path, glm::dvec3 const &Location) { + auto const range{glm::distance(Location, camera)}; + auto const length{glm::distance(Path.points[segment_data::point::start], Path.points[segment_data::point::end])}; + return std::clamp(static_cast(length / (range < 100.0 ? 3.0 : range < 300.0 ? 8.0 : 20.0)), 2, 12); + }; auto const drawpath = [&](segment_data const &Path, ImU32 const Color, float const Thickness, int const Samples) { auto previous{path_point(Path, 0.0)}; for (int i = 1; i <= Samples; ++i) @@ -1272,14 +1392,16 @@ void editor_mode::draw_road_overlay() const // lanes, as the vehicles see them: a line for each, with an arrow pointing where the traffic goes if (tool.lanes) { + projection.limit = screen_projection::kLaneVertexLimit; for (auto const *road : simulation::Roads.sequence()) { if (road == nullptr || road->m_editorremoved) continue; auto const range{glm::distance(road->location(), camera)}; - if (range > kLaneRange + 0.5 * road->definition().length()) + if (range > kLaneRange + 0.5 * glm::distance(road->definition().axis.points[segment_data::point::start], road->definition().axis.points[segment_data::point::end])) continue; - auto const samples{is_curved(road->definition().axis) ? (range < 150.0 ? 12 : 6) : 1}; + if (false == projection.room(drawlist)) + break; auto const against{static_cast(road->definition().backward)}; auto const &tracks{road->tracks()}; for (std::size_t lane = 0; lane < tracks.size(); ++lane) @@ -1288,7 +1410,7 @@ void editor_mode::draw_road_overlay() const continue; auto const &path{tracks[lane]->m_paths.front()}; auto const color{lane >= against ? kForwardColor : kBackwardColor}; - drawpath(path, color, 2.0f, samples); + drawpath(path, color, 2.0f, is_curved(path) ? pieces(path, road->location()) : 1); if (range > 300.0) continue; auto const middle{path_point(path, 0.5)}; @@ -1303,7 +1425,7 @@ void editor_mode::draw_road_overlay() const } for (auto const *turn : road->turns()) { - if (turn != nullptr && false == turn->m_paths.empty()) + if (turn != nullptr && false == turn->m_paths.empty() && range < 300.0) drawpath(turn->m_paths.front(), kTurnColor, 1.5f, 8); } } @@ -1313,22 +1435,23 @@ void editor_mode::draw_road_overlay() const if (junction == nullptr || junction->m_editorremoved || glm::distance(junction->location(), camera) > kLaneRange) continue; for (auto const &way : junction->movements()) - drawpath(way, kWayColor, 1.5f, 8); + drawpath(way, kWayColor, 1.5f, pieces(way, junction->location())); } + projection.limit = screen_projection::kVertexLimit; } if (false == tool.window) return; // outline of a road piece: its axis and the edges of its surface auto const drawroad = [&](road_node::state const &State, ImU32 const Color) { - auto const samples{is_curved(State.axis) || State.taper[0] != State.taper[1] ? 12 : 1}; + auto const samples{is_curved(State.axis) || State.taper[0] != State.taper[1] ? pieces(State.axis, State.axis.points[segment_data::point::start]) : 1}; drawpath(State.axis, Color, 3.0f, samples); glm::dvec3 previous[2]; for (int i = 0; i <= samples; ++i) { auto const t{static_cast(i) / samples}; auto const position{path_point(State.axis, t)}; - auto const tangent{State.tangent(t)}; + auto const tangent{path_direction(State.axis, t)}; glm::dvec3 across{tangent.z, 0.0, -tangent.x}; if (glm::length(across) > 1e-6) across = glm::normalize(across); @@ -1345,7 +1468,7 @@ void editor_mode::draw_road_overlay() const }; auto const drawpoint = [&](glm::dvec3 const &Point, ImU32 const Color, float const Radius, bool const Filled) { ImVec2 screen; - if (false == projection.project(Point, screen)) + if (false == projection.room(drawlist) || false == projection.project(Point, screen) || projection.outside(screen, screen)) return; if (Filled) drawlist->AddCircleFilled(screen, Radius, Color); diff --git a/editor/editorRoad.cpp b/editor/editorRoad.cpp index aa37f6922..65358eb09 100644 --- a/editor/editorRoad.cpp +++ b/editor/editorRoad.cpp @@ -34,6 +34,7 @@ double const kTightestRadius{6.0}; double const kCornerRoom{4.0}; // length of an arm of a junction past the point where its edge meets the edge of the next one, taken by the rounded corner double const kSharpestBranch{glm::radians(30.0)}; // smallest angle between two roads leaving a junction double const kWidestCorner{glm::radians(120.0)}; // arms further apart than this don't have to make room for each other +double const kTransitionLength{30.0}; // length of the road taken by a change of its lanes void add_unique(std::vector &Roads, road_node *Road) { @@ -141,22 +142,53 @@ road_node::state part(road_node::state const &State, double const From, double c return result; } +// points of a path as a bezier curve, and a point of that curve. unlike the methods of a road definition +// these don't measure the whole axis for each call, which matters for what's done every frame +std::array curve_points(segment_data const &Path) +{ + auto const &p0{Path.points[segment_data::point::start]}; + auto const &p3{Path.points[segment_data::point::end]}; + if (Path.points[segment_data::point::control1] == glm::dvec3{0.0} && Path.points[segment_data::point::control2] == glm::dvec3{0.0}) + return {p0, p0 + (p3 - p0) / 3.0, p3 - (p3 - p0) / 3.0, p3}; + return {p0, p0 + Path.points[segment_data::point::control1], p3 + Path.points[segment_data::point::control2], p3}; +} + +glm::dvec3 curve_point(std::array const &Points, double const T) +{ + auto const u{1.0 - T}; + return u * u * u * Points[0] + 3.0 * u * u * T * Points[1] + 3.0 * u * T * T * Points[2] + T * T * T * Points[3]; +} + int const kStations{64}; // distances along a path for evenly spaced values of its curve parameter std::vector stations(road_node::state const &State) { std::vector result(kStations + 1, 0.0); - auto previous{State.point(0.0)}; + auto const points{curve_points(State.axis)}; + auto previous{points[0]}; for (int i = 1; i <= kStations; ++i) { - auto const current{State.point(static_cast(i) / kStations)}; + auto const current{curve_point(points, static_cast(i) / kStations)}; result[i] = result[i - 1] + glm::distance(previous, current); previous = current; } return result; } +// adds to a record what a piece or a junction is like, ahead of changing it. the first entry stays, as it's what taking the lot back has to end with +void remember(editor_road::record &Record, road_node *Road) +{ + if (std::none_of(Record.roads.begin(), Record.roads.end(), [Road](std::pair const &Entry) { return Entry.first == Road; })) + Record.roads.emplace_back(Road, Road->definition()); +} + +void remember(editor_road::record &Record, junction_node *Junction) +{ + if (std::none_of(Record.junctions.begin(), Record.junctions.end(), [Junction](std::pair const &Entry) { return Entry.first == Junction; })) + Record.junctions.emplace_back(Junction, Junction->definition()); +} + // distance along a path for specified value of its curve parameter, and the other way around double station_at(std::vector const &Stations, double const T) { @@ -242,6 +274,19 @@ bool follow(road_node &Road, double const T, bool const Forward, double const Di return false; } +// arm of a junction for the part of a road left on one side of it. returns: false if the lanes there differ in width +bool cut_arm(road_cut const &Cut, junction_node::arm_data &Arm) +{ + auto const &state{Cut.road->definition()}; + Arm.position = state.point(Cut.t); + // the way out of the junction is the way the kept part of the piece goes from the cut + Arm.direction = planar(state.tangent(Cut.t)) * (Cut.keepstart ? -1.0 : 1.0); + // lanes heading for the cut lead into the junction + Arm.incoming = (Cut.keepstart ? state.forward : state.backward); + Arm.outgoing = (Cut.keepstart ? state.backward : state.forward); + return editor_road::lane_width(state, Cut.t, Arm.width); +} + // how far from the centre of a junction the edges of two of its roads meet, measured along the first one. // Halfwidth, Otherhalfwidth: of the two roads, Angle: between the ways they leave double edge_reach(double const Halfwidth, double const Otherhalfwidth, double const Angle) @@ -715,8 +760,9 @@ std::vector editor_road::chain(road_node &Road) double editor_road::nearest_parameter(road_node::state const &State, glm::dvec3 const &Point) { + auto const points{curve_points(State.axis)}; auto const distance = [&](double const T) { - auto const position{State.point(T)}; + auto const position{curve_point(points, T)}; return glm::distance(glm::dvec2{position.x, position.z}, glm::dvec2{Point.x, Point.z}); }; double best{0.0}; @@ -744,10 +790,12 @@ road_node *editor_road::nearest(glm::dvec3 const &Point, double const Margin) if (road == nullptr || road->m_editorremoved) continue; auto const &state{road->definition()}; - auto const reach{0.5 * state.width() + std::max(state.sides[0].width, state.sides[1].width) + Margin}; - if (glm::distance(road->location(), Point) > 0.5 * state.length() + reach + 10.0) + auto const reach{0.5 * state.width() * std::max(state.taper[0], state.taper[1]) + std::max(state.sides[0].width, state.sides[1].width) + Margin}; + // the axis is no longer than the lines joining its points, which is good enough to tell the road is nowhere near + auto const points{curve_points(state.axis)}; + if (glm::distance(road->location(), Point) > 0.5 * (glm::distance(points[0], points[1]) + glm::distance(points[1], points[2]) + glm::distance(points[2], points[3])) + reach + 10.0) continue; - auto const position{state.point(nearest_parameter(state, Point))}; + auto const position{curve_point(points, nearest_parameter(state, Point))}; auto const distance{glm::distance(glm::dvec2{position.x, position.z}, glm::dvec2{Point.x, Point.z})}; // roads passing over or under the point don't count if (distance > reach || std::abs(position.y - Point.y) > 3.0) @@ -1097,9 +1145,168 @@ std::vector editor_road::ends_at(glm::dvec3 const &Point return result; } -bool editor_road::at_junction(glm::dvec3 const &Point) +std::vector> editor_road::arms_at(glm::dvec3 const &Point) { - return false == junctions_at(Point).empty(); + std::vector> result; + for (auto *junction : simulation::Junctions.sequence()) + { + if (junction == nullptr || junction->m_editorremoved) + continue; + auto const &arms{junction->definition().arms}; + for (std::size_t arm = 0; arm < arms.size(); ++arm) + if (glm::distance(arms[arm].position, Point) < kSamePoint) + result.emplace_back(junction, arm); + } + return result; +} + +void editor_road::settle(road_node &Road, record &Record, std::string &Notes) +{ + for (auto const atend : {false, true}) + { + if (Road.m_editorremoved) + return; + auto const &layout{Road.definition()}; + auto const position{axis_end(layout, atend)}; + // lanes heading for this end of the piece, and the ones leading away from it + auto const arriving{atend ? layout.forward : layout.backward}; + auto const leaving{atend ? layout.backward : layout.forward}; + float lanewidth{0.f}; + auto const evenlanes{lane_width(layout, atend ? 1.0 : 0.0, lanewidth)}; + char const *unevenlanes{" differ in width, and a junction takes roads with lanes of the same width. "}; + std::string reason; + + auto const junctions{arms_at(position)}; + if (false == junctions.empty()) + { + // a junction is made for the lanes of the road at each arm + for (auto const &entry : junctions) + { + auto *junction{entry.first}; + auto state{junction->definition()}; + auto &arm{state.arms[entry.second]}; + if (arm.incoming == arriving && arm.outgoing == leaving && std::abs(arm.width - lanewidth) < 0.001f) + continue; + if (false == evenlanes) + { + Notes += "Lanes of \"" + Road.name() + "\"" + unevenlanes; + continue; + } + if (false == can_edit(*junction, &reason)) + { + Notes += "\"" + junction->name() + "\" wasn't fitted: " + reason + ". "; + continue; + } + arm.incoming = arriving; + arm.outgoing = leaving; + arm.width = lanewidth; + remember(Record, junction); + apply(std::vector>{{junction, state}}); + } + continue; + } + + auto const neighbours{roads_at(position, &Road)}; + if (neighbours.size() != 1) + continue; + auto *other{neighbours.front()}; + auto const otherlayout{other->definition()}; + auto const otheratend{glm::distance(axis_end(otherlayout, true), position) < kSamePoint}; + // lanes of the neighbour heading for the place they meet, and the ones leading away from it + auto const otherarriving{otheratend ? otherlayout.forward : otherlayout.backward}; + auto const otherleaving{otheratend ? otherlayout.backward : otherlayout.forward}; + if (otherarriving == leaving && otherleaving == arriving) + { + // the same lanes: the neighbour is made as wide as the piece where they meet, and gets to that width along its length + auto const width{layout.width() * layout.taper[atend ? 1 : 0]}; + if (std::abs(width - otherlayout.width() * otherlayout.taper[otheratend ? 1 : 0]) < 0.001) + continue; + if (false == can_edit(*other, &reason)) + { + Notes += "\"" + other->name() + "\" wasn't fitted: " + reason + ". "; + continue; + } + auto state{otherlayout}; + state.taper[otheratend ? 1 : 0] = std::clamp(static_cast(width / otherlayout.width()), 0.25f, 4.f); + remember(Record, other); + apply(std::vector>{{other, state}}); + continue; + } + + // other lanes: the end of the neighbour is given up for a junction of the two, where the lanes of one are led to the lanes of the other + if (false == evenlanes) + { + Notes += "Lanes of \"" + Road.name() + "\"" + unevenlanes; + continue; + } + road_cut cut; + std::vector consumed; + std::string error; + bool room{false}; + for (auto const length : {kTransitionLength, 0.5 * kTransitionLength}) + { + consumed.clear(); + if (follow(*other, otheratend ? 1.0 : 0.0, false == otheratend, length, cut, consumed, error)) + { + room = true; + break; + } + } + if (false == room) + { + Notes += "There's no room next to \"" + Road.name() + "\" for the lanes to change (" + error + "), so they don't lead on there. "; + continue; + } + if (cut.road == &Road) + { + Notes += "The road is too short for its lanes to change. "; + continue; + } + std::vector removed{consumed}; + if (cut.road != other) + removed.emplace_back(other); + // a cut at the very end the piece is kept from leaves it whole + auto const trimmed{cut.keepstart ? cut.t < 0.999 : cut.t > 0.001}; + bool allowed{false == trimmed || can_edit(*cut.road, &reason)}; + for (auto const *piece : removed) + allowed = allowed && can_edit(*piece, &reason); + junction_node::state junction; + junction_node::arm_data arms[2]; + if (false == allowed) + { + Notes += "The lanes next to \"" + Road.name() + "\" weren't fitted: " + reason + ". "; + continue; + } + if (false == cut_arm(cut, arms[0])) + { + Notes += "Lanes of \"" + cut.road->name() + "\"" + unevenlanes; + continue; + } + arms[1].position = position; + arms[1].direction = planar(layout.tangent(atend ? 1.0 : 0.0)) * (atend ? -1.0 : 1.0); + arms[1].incoming = arriving; + arms[1].outgoing = leaving; + arms[1].width = lanewidth; + junction.arms.assign(std::begin(arms), std::end(arms)); + junction.centre = 0.5 * (arms[0].position + arms[1].position); + dress(junction, layout); + // it's a stretch of the road, with the speed limit the road has + junction.velocity = std::min(layout.velocity > 0.f ? layout.velocity : std::numeric_limits::max(), otherlayout.velocity > 0.f ? otherlayout.velocity : std::numeric_limits::max()); + if (junction.velocity == std::numeric_limits::max()) + junction.velocity = -1.f; + junction.normalize(); + + // room is made first, so nothing gets joined with what's about to go + remove(removed); + Record.roads_removed.insert(Record.roads_removed.end(), removed.begin(), removed.end()); + if (trimmed) + { + remember(Record, cut.road); + apply(std::vector>{{cut.road, cut.keepstart ? part(cut.road->definition(), 0.0, cut.t) : part(cut.road->definition(), cut.t, 1.0)}}); + } + auto const created{create(std::vector{junction})}; + Record.junctions_created.insert(Record.junctions_created.end(), created.begin(), created.end()); + } } bool editor_road::lane_width(road_node::state const &State, double const T, float &Width) @@ -1191,15 +1398,8 @@ bool editor_road::branch_from(road_node &Road, double const T, glm::dvec2 const junction.centre = centre; for (auto const &cut : cuts) { - auto const &state{cut.road->definition()}; junction_node::arm_data arm; - arm.position = state.point(cut.t); - // the way out of the junction is the way the kept part of the piece goes from the cut - arm.direction = planar(state.tangent(cut.t)) * (cut.keepstart ? -1.0 : 1.0); - // lanes heading for the cut lead into the junction - arm.incoming = (cut.keepstart ? state.forward : state.backward); - arm.outgoing = (cut.keepstart ? state.backward : state.forward); - if (false == lane_width(state, cut.t, arm.width)) + if (false == cut_arm(cut, arm)) { Error = "Lanes of \"" + cut.road->name() + "\" differ in width, and a junction takes roads with lanes of the same width"; return false; @@ -1276,7 +1476,7 @@ junction_node *editor_road::carry_out(branch const &Branch, record &Record) { if (Branch.junction != nullptr) { - Record.junctions.emplace_back(Branch.junction, Branch.junction->definition()); + remember(Record, Branch.junction); apply(std::vector>{{Branch.junction, Branch.layout}}); return Branch.junction; } @@ -1284,7 +1484,7 @@ junction_node *editor_road::carry_out(branch const &Branch, record &Record) remove(Branch.removed); Record.roads_removed.insert(Record.roads_removed.end(), Branch.removed.begin(), Branch.removed.end()); for (auto const &change : Branch.changes) - Record.roads.emplace_back(change.first, change.first->definition()); + remember(Record, change.first); apply(Branch.changes); auto const added{create(Branch.added)}; Record.roads_created.insert(Record.roads_created.end(), added.begin(), added.end()); diff --git a/editor/editorRoad.hpp b/editor/editorRoad.hpp index 751d04c6f..fd41bb0f0 100644 --- a/editor/editorRoad.hpp +++ b/editor/editorRoad.hpp @@ -103,8 +103,13 @@ class editor_road static bool nearest_joint(glm::dvec3 const &Point, double const Radius, glm::dvec3 &Joint); // ends of the pieces which meet at specified point static std::vector ends_at(glm::dvec3 const &Point); - // true if there's an arm of a junction at specified point - static bool at_junction(glm::dvec3 const &Point); + // junctions with an arm at specified point, each with the number of that arm + static std::vector> arms_at(glm::dvec3 const &Point); + // brings what's next to the ends of a piece in line with the piece, after its lanes or its width were changed: + // a junction gets its arm made for the lanes the piece has now, a neighbouring piece with the same lanes is made as wide + // as the piece where they meet, and one with other lanes gets a transition cut out of its end - a junction of two roads, + // which leads the lanes of one to the lanes of the other. what gets done is added to Record, what couldn't be done to Notes + static void settle(road_node &Road, record &Record, std::string &Notes); // width shared by all lanes of the road at specified value of the curve parameter of its axis. returns: false if the lanes differ in width static bool lane_width(road_node::state const &State, double const T, float &Width); // lays out a junction for a road leaving the side of specified piece at specified value of the curve parameter of its axis. diff --git a/world/Road.cpp b/world/Road.cpp index b9e4a537b..c43a75169 100644 --- a/world/Road.cpp +++ b/world/Road.cpp @@ -967,6 +967,20 @@ double turn_angle(glm::dvec2 const &From, glm::dvec2 const &To) return std::atan2(glm::dot(To, left_of(From)), glm::dot(To, From)); } +// slope a lane has at one of its ends, in the direction of travel +double lane_grade(TTrack const &Lane, bool const Atend) +{ + if (Lane.m_paths.empty()) + { + return 0.0; + } + auto const &path{Lane.m_paths.front()}; + auto const &control{path.points[Atend ? segment_data::point::control2 : segment_data::point::control1]}; + auto const direction{control != glm::dvec3{0.0} ? (Atend ? -control : control) : path.points[segment_data::point::end] - path.points[segment_data::point::start]}; + auto const run{glm::length(glm::dvec2{direction.x, direction.z})}; + return run > 1e-6 ? direction.y / run : 0.0; +} + } // namespace // puts provided shapes in the section of the scene holding specified point @@ -1389,6 +1403,21 @@ void junction_node::create_links() // the legacy crossroads has the way straight ahead at its second point, the left one at the third and the right one at the fourth std::swap(ways[0], ways[1]); } + if (exits.size() == 1 && lane == lanecount) + { + // where the only road to leave by has more lanes than the one coming in, the road gets wider: the lanes it gains + // are entered from the outermost lane. a path has up to three ways out, so that's two lanes gained at most + auto const &candidates{lanes[exits[0].arm].outgoing}; + for (auto extra = static_cast(lanecount); extra < candidates.size() && ways.size() < 3; ++extra) + { + if (candidates[extra] != nullptr && candidates[extra] != ways.front().track) + { + auto way{ways.front()}; + way.track = candidates[extra]; + ways.emplace_back(way); + } + } + } // shape of the ways: each leaves the lane coming in the way that lane goes, and joins the lane going out the way that one goes glm::dvec3 const start{entry->CurrentSegment()->FastGetPoint_1()}; @@ -1400,10 +1429,11 @@ void junction_node::create_links() glm::dvec3 const end{exit.track->CurrentSegment()->FastGetPoint_0()}; auto const span{glm::distance(start, end)}; ends.emplace_back(end); - endcontrols.emplace_back(-flat(arms[exit.arm].direction) * (0.39 * span)); + // the slopes of the lanes are carried on, so a junction on a hill doesn't make a step + endcontrols.emplace_back(-(flat(arms[exit.arm].direction) + up * lane_grade(*exit.track, false)) * (0.39 * span)); reach += 0.39 * span / ways.size(); } - auto const startcontrol{flat(heading) * reach}; + auto const startcontrol{(flat(heading) + up * lane_grade(*entry, true)) * reach}; for (std::size_t idx = 0; idx < ways.size(); ++idx) { segment_data movement; @@ -1556,6 +1586,45 @@ std::vector junction_node::create_shapes() const std::vector vertices; glm::dvec3 const lift{0.0, line_lift, 0.0}; glm::vec3 const upwards{0.f, 1.f, 0.f}; + auto const &arms{m_state.arms}; + if (arms.size() == 2 && arms[0].incoming > 0 && arms[0].outgoing > 0 && arms[1].incoming > 0 && arms[1].outgoing > 0) + { + // a junction of two roads is where a road changes its lanes. the double line keeping the directions apart is led through it + auto const divide = [&](std::size_t const Arm) { return arms[Arm].position + flat(left_of(arms[Arm].direction)) * (0.5 * m_state.arm_width(Arm) - static_cast(arms[Arm].incoming) * arms[Arm].width); }; + auto const p0{divide(0)}; + auto const p3{divide(1)}; + auto const reach{0.39 * glm::distance(p0, p3)}; + auto const p1{p0 - flat(arms[0].direction) * reach}; + auto const p2{p3 - flat(arms[1].direction) * reach}; + auto const pair{0.5 * (line_width + line_spacing)}; + int const steps{12}; + glm::dvec3 previous{p0}; + glm::dvec3 previousleft{flat(left_of(-arms[0].direction))}; + for (int step = 1; step <= steps; ++step) + { + auto const t{static_cast(step) / steps}; + auto const u{1.0 - t}; + auto const current{u * u * u * p0 + 3.0 * u * u * t * p1 + 3.0 * u * t * t * p2 + t * t * t * p3}; + auto const direction{3.0 * u * u * (p1 - p0) + 6.0 * u * t * (p2 - p1) + 3.0 * t * t * (p3 - p2)}; + glm::dvec2 const heading{direction.x, direction.z}; + auto const left{glm::length(heading) > 1e-9 ? flat(left_of(glm::normalize(heading))) : previousleft}; + for (auto const side : {-1.0, 1.0}) + { + auto const leftstart{previous + previousleft * (side * pair + 0.5 * line_width) + lift}; + auto const rightstart{previous + previousleft * (side * pair - 0.5 * line_width) + lift}; + auto const leftend{current + left * (side * pair + 0.5 * line_width) + lift}; + auto const rightend{current + left * (side * pair - 0.5 * line_width) + lift}; + vertices.push_back({leftstart, upwards, {0.f, 0.f}}); + vertices.push_back({rightstart, upwards, {1.f, 0.f}}); + vertices.push_back({leftend, upwards, {0.f, 1.f}}); + vertices.push_back({rightstart, upwards, {1.f, 0.f}}); + vertices.push_back({rightend, upwards, {1.f, 1.f}}); + vertices.push_back({leftend, upwards, {0.f, 1.f}}); + } + previous = current; + previousleft = left; + } + } for (auto const &corner : corners) { for (std::size_t idx = 0; idx + 1 < corner.size(); ++idx) From d37dff11e166d24f55349edf524e4f5add86b4be Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Sat, 3 Oct 2026 23:13:01 +0200 Subject: [PATCH 082/430] fix(editor): ground lookups sorted once instead of walking every terrain model, orthophoto kept under the roads; feat(roads): junction sides, stop lines and junction options --- application/editormode.cpp | 137 +++++++++++++++- application/editormode.h | 3 + application/editormoderoad.cpp | 284 ++++++++++++++++++++++----------- editor/editorGroundMesh.hpp | 148 +++++++++++++++++ editor/editorRoad.cpp | 4 + world/Road.cpp | 168 ++++++++++++++++++- world/Road.h | 6 + 7 files changed, 650 insertions(+), 100 deletions(-) create mode 100644 editor/editorGroundMesh.hpp diff --git a/application/editormode.cpp b/application/editormode.cpp index 1a947be5e..d690a1991 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -15,6 +15,7 @@ http://mozilla.org/MPL/2.0/. #include "editor/editorSettings.hpp" #include "editor/editorModelSets.hpp" #include "editor/editorIncludeInfo.hpp" +#include "editor/editorGroundMesh.hpp" #include "utilities/Globals.h" #include "simulation/simulation.h" #include "simulation/simulationtime.h" @@ -230,6 +231,69 @@ namespace int m_rows{1}; }; + // meshes of the shapes and the models asked about as ground. the ground is asked about a tile at a time, by the orthophoto + // and by the road tools, and without these every question meant going through every triangle of every terrain model in reach + struct ground_record + { + ground_mesh mesh; + // what the mesh was made of, to tell when it has to be made again + std::size_t vertices{0}; + std::size_t indices{0}; + glm::dvec3 origin{0.0}; + TModel3d const *model{nullptr}; + glm::dmat4 matrix{0.0}; + std::uint64_t used{0}; // number of the last question it served + }; + std::unordered_map ground_shapes; // by the geometry of the shape + std::unordered_map ground_models; + std::uint64_t ground_question{0}; + std::size_t ground_held{0}; // triangles in the meshes + std::size_t constexpr ground_limit = 8000000; // triangles kept; some 400 MB with the grids + std::size_t constexpr ground_small = 256; // triangles; anything smaller is quicker to go through than to look up + + // lets go of the meshes left alone the longest, once there's too much of them + void trim_ground_meshes() + { + if (ground_held <= ground_limit) + return; + std::vector ages; + for (auto const &record : ground_shapes) + ages.emplace_back(record.second.used); + for (auto const &record : ground_models) + ages.emplace_back(record.second.used); + std::sort(ages.begin(), ages.end()); + // the older half goes, except for what the current question needed + auto const threshold = std::min(ages[ages.size() / 2], ground_question - 1); + for (auto record = ground_shapes.begin(); record != ground_shapes.end();) + { + if (record->second.used <= threshold) + { + ground_held -= record->second.mesh.size(); + record = ground_shapes.erase(record); + } + else + ++record; + } + for (auto record = ground_models.begin(); record != ground_models.end();) + { + if (record->second.used <= threshold) + { + ground_held -= record->second.mesh.size(); + record = ground_models.erase(record); + } + else + ++record; + } + } + + // forgets the meshes of the shapes, whose geometry can be changed in place (terrain being sculpted) + void forget_ground_shapes() + { + for (auto const &record : ground_shapes) + ground_held -= record.second.mesh.size(); + ground_shapes.clear(); + } + // appends triangles of a shape node which overlap specified XZ rectangle void gather_shape_triangles(scene::shape_node const &Shape, glm::dvec2 const &Min, glm::dvec2 const &Max, std::vector &Out, bool const Skiproads = false) { @@ -262,6 +326,36 @@ namespace return; auto const &verts = GfxRenderer->Vertices(data.geometry); auto const &indices = GfxRenderer->Indices(data.geometry); + auto const count = (indices.empty() ? verts.size() : indices.size()) / 3; + if (count >= ground_small) + { + // a large shape is sorted once, and asked for what's in the rectangle from then on + auto &record = ground_shapes[(static_cast(data.geometry.bank) << 32) | data.geometry.chunk]; + if (record.mesh.size() == 0 || record.vertices != verts.size() || record.indices != indices.size() || record.origin != data.origin) + { + std::vector triangles; + triangles.reserve(count); + if (false == indices.empty()) + { + for (std::size_t i = 0; i + 2 < indices.size(); i += 3) + triangles.push_back({verts[indices[i]].position, verts[indices[i + 1]].position, verts[indices[i + 2]].position}); + } + else + { + for (std::size_t i = 0; i + 2 < verts.size(); i += 3) + triangles.push_back({verts[i].position, verts[i + 1].position, verts[i + 2].position}); + } + ground_held -= record.mesh.size(); + record.mesh.assign(std::move(triangles), data.origin); + ground_held += record.mesh.size(); + record.vertices = verts.size(); + record.indices = indices.size(); + record.origin = data.origin; + } + record.used = ground_question; + record.mesh.collect(Min, Max, Out); + return; + } auto const to_world = [&](gfx::basic_vertex const &v) { return data.origin + glm::dvec3(v.position); }; if (false == indices.empty()) { @@ -279,6 +373,8 @@ namespace // model instances at least ModelRadius large (if ModelsAsGround) the terrain tiles void gather_ground_triangles(glm::dvec2 const &Min, glm::dvec2 const &Max, bool const ModelsAsGround, float const ModelRadius, std::vector &Out, bool const Skiproads = false) { + auto const started = std::chrono::steady_clock::now(); + ++ground_question; glm::dvec2 const center = (Min + Max) * 0.5; float const radius = static_cast(glm::length(Max - Min) * 0.5); auto const sections = simulation::Region->sections(glm::dvec3(center.x, 0.0, center.y), radius); // copy, the result is a scratchpad @@ -303,15 +399,35 @@ namespace double const reach = instance->radius(); if (instance->location().x + reach < Min.x || instance->location().x - reach > Max.x || instance->location().z + reach < Min.y || instance->location().z - reach > Max.y) continue; - std::vector modeltriangles; - gather_submodel_triangles(instance->Model()->Root, instance_matrix(*instance), modeltriangles); - for (auto const &t : modeltriangles) - if (std::max({t[0].x, t[1].x, t[2].x}) >= Min.x && std::min({t[0].x, t[1].x, t[2].x}) <= Max.x && std::max({t[0].z, t[1].z, t[2].z}) >= Min.y && - std::min({t[0].z, t[1].z, t[2].z}) <= Max.y) - Out.push_back(t); + // the model is gone through once, and asked for what's in the rectangle from then on, for as long as it stays put + auto const matrix = instance_matrix(*instance); + auto &record = ground_models[instance]; + if (record.model != instance->Model() || record.matrix != matrix) + { + std::vector modeltriangles; + gather_submodel_triangles(instance->Model()->Root, matrix, modeltriangles); + glm::dvec3 const origin = instance->location(); + std::vector triangles; + triangles.reserve(modeltriangles.size()); + for (auto const &t : modeltriangles) + triangles.push_back({glm::vec3(t[0] - origin), glm::vec3(t[1] - origin), glm::vec3(t[2] - origin)}); + ground_held -= record.mesh.size(); + record.mesh.assign(std::move(triangles), origin); + ground_held += record.mesh.size(); + // a model which isn't loaded yet has nothing to show for itself, and is looked at again the next time + record.model = (record.mesh.size() > 0 ? instance->Model() : nullptr); + record.matrix = matrix; + } + record.used = ground_question; + record.mesh.collect(Min, Max, Out); } } } + trim_ground_meshes(); + // going through the scenery is the one thing here which can take long enough to be felt; when it does it's worth knowing + auto const elapsed = std::chrono::duration(std::chrono::steady_clock::now() - started).count(); + if (elapsed > 250.0) + WriteLog("editor: gathering the ground took " + std::to_string(static_cast(elapsed)) + " ms, for " + std::to_string(Out.size()) + " triangles; " + std::to_string(ground_held) + " are kept for the next time"); } // ground kept for the road tools, which ask about the same places frame after frame. it's gathered a tile at a time: @@ -364,8 +480,9 @@ editor_mode::editor_mode() { m_roadtool.settings.normalize(); road_select(nullptr); // the orthophoto is fitted onto the same ground as the area fill uses, terrain tile models included + // the roads built in the editor aren't ground: the imagery goes under them m_orthophoto.ground_source([](glm::dvec2 const &Min, glm::dvec2 const &Max, std::vector &Out) { - gather_ground_triangles(Min, Max, true, 50.0f, Out); + gather_ground_triangles(Min, Max, true, 50.0f, Out, true); }); } @@ -1452,7 +1569,12 @@ void editor_mode::render_orthophoto_ui() { ImGui::SameLine(); if (ImGui::Button("Refit")) + { + // the ground was edited: what's kept of it has to go as well + ground_tiles.clear(); + forget_ground_shapes(); m_orthophoto.refit(); + } if (ImGui::IsItemHovered()) ImGui::SetTooltip("Samples the ground again, after it was edited"); } @@ -1947,6 +2069,7 @@ void editor_mode::handle_terrain_sculpt(double Deltatime) terrain->sculpt(world.x, world.z, m_terrain_brush_radius, signedrate); // what the road tools know about the ground is no longer true ground_tiles.clear(); + forget_ground_shapes(); } void editor_mode::capture_terrain() diff --git a/application/editormode.h b/application/editormode.h index e34c6e2ff..15d5de4d4 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -534,6 +534,9 @@ class editor_mode : public application_mode void render_road_menu(); void render_road_window(); bool render_road_layout(road_node::state &State); + bool render_road_material(char const *Label, char *Buffer, std::size_t const Size, std::string &Value); + void render_junction_layout(junction_node &Junction); + void junction_apply(junction_node &Junction, junction_node::state const &State); void draw_road_overlay() const; void update_road_tool(); void road_click(); diff --git a/application/editormoderoad.cpp b/application/editormoderoad.cpp index 300899f42..59c78b984 100644 --- a/application/editormoderoad.cpp +++ b/application/editormoderoad.cpp @@ -284,6 +284,139 @@ void editor_mode::junction_select(junction_node *Junction) tool.status = "Selected: " + Junction->name(); if (false == editor_road::can_edit(*Junction, &reason)) tool.status += ". It can't be changed: " + reason; + // the fields for the names of materials are shared with the roads + copy_text(tool.surface, sizeof(tool.surface), Junction->definition().surface); + copy_text(tool.sides[0], sizeof(tool.sides[0]), Junction->definition().side.material); +} + +// replaces the definition of a junction, as a step which can be taken back +void editor_mode::junction_apply(junction_node &Junction, junction_node::state const &State) +{ + auto &tool{m_roadtool}; + std::string reason; + if (false == editor_road::can_edit(Junction, &reason)) + { + tool.status = "\"" + Junction.name() + "\" can't be changed: " + reason; + // what the window shows goes back to what the junction is like + junction_select(&Junction); + tool.status = "\"" + Junction.name() + "\" can't be changed: " + reason; + return; + } + editor_road::record record; + record.junctions.emplace_back(&Junction, Junction.definition()); + editor_road::apply(std::vector>{{&Junction, State}}); + push_road_snapshot(std::move(record)); + tool.status = "Changed"; +} + +// draws controls for what a junction is like, and makes the changes as they're made +void editor_mode::render_junction_layout(junction_node &Junction) +{ + auto &tool{m_roadtool}; + auto state{Junction.definition()}; + bool changed{false}; + // typed values are taken when confirmed, so the junction isn't made anew with each digit + auto const number = [](char const *Label, float &Value, float const Step, char const *Format) { + ImGui::SetNextItemWidth(120.0f); + return ImGui::InputFloat(Label, &Value, Step, Step * 4.0f, Format, ImGuiInputTextFlags_EnterReturnsTrue); + }; + + auto limit{state.velocity > 0.f ? state.velocity : 0.f}; + if (number("Speed limit [km/h], 0: none", limit, 5.0f, "%.0f")) + { + state.velocity = (limit > 0.f ? limit : -1.f); + changed = true; + } + auto centre{static_cast(state.centre.y)}; + if (number("Height of the middle [m]", centre, 0.1f, "%.2f")) + { + state.centre.y = centre; + changed = true; + } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "The surface is spanned between the ends of the roads and this point.\nThe ends of the roads are raised or lowered as points: select the white dot at the end of a road."); + + // appearance + ImGui::Separator(); + char const *colours[]{"none", "white", "orange"}; + int colour{state.markings == road_node::marking_colour::white ? 1 : state.markings == road_node::marking_colour::orange ? 2 : 0}; + ImGui::SetNextItemWidth(120.0f); + if (ImGui::Combo("Markings", &colour, colours, 3)) + { + state.markings = (colour == 1 ? road_node::marking_colour::white : colour == 2 ? road_node::marking_colour::orange : road_node::marking_colour::none); + changed = true; + } + if (render_road_material("Surface", tool.surface, sizeof(tool.surface), state.surface)) + changed = true; + if (number("Texture length [m]", state.texturelength, 0.5f, "%.2f")) + { + state.texturelength = std::max(0.1f, state.texturelength); + changed = true; + } + // what the corners between the roads are lined with + char const *sidetypes[]{"none", "shoulder", "sidewalk"}; + int type{state.side.type == road_node::side_type::shoulder ? 1 : state.side.type == road_node::side_type::sidewalk ? 2 : 0}; + ImGui::SetNextItemWidth(120.0f); + if (ImGui::Combo("Sides of the corners", &type, sidetypes, 3)) + { + state.side.type = (type == 1 ? road_node::side_type::shoulder : type == 2 ? road_node::side_type::sidewalk : road_node::side_type::none); + if (state.side.type != road_node::side_type::none && state.side.width <= 0.0f) + state.side.width = 1.5f; + changed = true; + } + if (state.side.type != road_node::side_type::none) + { + ImGui::Indent(); + if (number("Width [m]", state.side.width, 0.25f, "%.2f")) + { + state.side.width = std::clamp(state.side.width, 0.1f, 20.0f); + changed = true; + } + if (render_road_material("Material", tool.sides[0], sizeof(tool.sides[0]), state.side.material)) + changed = true; + if (state.side.material.empty() || state.side.material == "none") + ImGui::TextDisabled("Pick a material to have the sides drawn"); + if (state.side.type == road_node::side_type::sidewalk) + { + if (number("Kerb height [m]", state.kerbheight, 0.01f, "%.2f")) + { + state.kerbheight = std::clamp(state.kerbheight, 0.0f, 1.0f); + changed = true; + } + } + else + { + if (number("Bank width [m]", state.slope.x, 0.25f, "%.2f")) + { + state.slope.x = std::clamp(state.slope.x, 0.0f, 20.0f); + changed = true; + } + if (number("Bank drop [m]", state.slope.y, 0.1f, "%.2f")) + { + state.slope.y = std::clamp(state.slope.y, 0.0f, 20.0f); + changed = true; + } + } + ImGui::Unindent(); + } + + // the roads + if (ImGui::CollapsingHeader("Roads of the junction", ImGuiTreeNodeFlags_DefaultOpen)) + { + ImGui::TextDisabled("The lanes are taken from the roads: change them on the road, the junction follows"); + for (std::size_t arm = 0; arm < state.arms.size(); ++arm) + { + ImGui::PushID(static_cast(arm)); + auto &data{state.arms[arm]}; + ImGui::Text("%d: %d in, %d out, %.2f m a lane", static_cast(arm) + 1, data.incoming, data.outgoing, data.width); + ImGui::SameLine(); + if (ImGui::Checkbox("Stop line", &data.stopline)) + changed = true; + ImGui::PopID(); + } + } + if (changed) + junction_apply(Junction, state); } void editor_mode::road_cancel() @@ -969,8 +1102,62 @@ void editor_mode::restore_road_snapshot(EditorSnapshot const &Snapshot, std::vec road_cancel(); if (tool.selected != nullptr) road_select(tool.selected->m_editorremoved ? nullptr : tool.selected); - if (tool.junction != nullptr && tool.junction->m_editorremoved) - tool.junction = nullptr; + if (tool.junction != nullptr) + junction_select(tool.junction->m_editorremoved ? nullptr : tool.junction); +} + +// a field for the name of a material, with a list of the ones in the texture folder to pick from. returns: true if the material was changed +bool editor_mode::render_road_material(char const *Label, char *Buffer, std::size_t const Size, std::string &Value) +{ + auto &tool{m_roadtool}; + bool picked{false}; + ImGui::PushID(Label); + ImGui::SetNextItemWidth(200.0f); + if (ImGui::InputText("##name", Buffer, Size, ImGuiInputTextFlags_EnterReturnsTrue) || ImGui::IsItemDeactivatedAfterEdit()) + { + auto const name{lower_case(Buffer)}; + if (name != Value && name.find(' ') == std::string::npos) + { + Value = name.empty() ? std::string{"none"} : name; + picked = true; + } + copy_text(Buffer, Size, Value); + } + ImGui::SameLine(); + if (ImGui::Button("...")) + ImGui::OpenPopup("pick"); + ImGui::SameLine(); + ImGui::TextUnformatted(Label); + if (ImGui::BeginPopup("pick")) + { + ImGui::TextDisabled("Materials and images found in the texture folder"); + ImGui::SetNextItemWidth(200.0f); + ImGui::InputText("Filter", tool.filter, sizeof(tool.filter)); + auto const filter{lower_case(tool.filter)}; + std::vector listed; + for (auto const &name : editor_road::materials()) + if (filter.empty() || name.find(filter) != std::string::npos) + listed.emplace_back(&name); + ImGui::BeginChild("list", ImVec2(340.0f, 280.0f), true); + ImGuiListClipper clipper(static_cast(listed.size())); + while (clipper.Step()) + { + for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; ++i) + { + if (ImGui::Selectable(listed[i]->c_str(), *listed[i] == Value)) + { + Value = *listed[i]; + copy_text(Buffer, Size, Value); + picked = true; + ImGui::CloseCurrentPopup(); + } + } + } + ImGui::EndChild(); + ImGui::EndPopup(); + } + ImGui::PopID(); + return picked; } // draws controls for the layout of a road. returns: true if the layout was changed in a way which calls for the road to be made anew @@ -983,56 +1170,7 @@ bool editor_mode::render_road_layout(road_node::state &State) ImGui::SetNextItemWidth(120.0f); return ImGui::InputFloat(Label, &Value, Step, Step * 4.0f, Format, ImGuiInputTextFlags_EnterReturnsTrue); }; - auto const material = [&tool](char const *Label, char *Buffer, std::size_t const Size, std::string &Value) { - bool picked{false}; - ImGui::PushID(Label); - ImGui::SetNextItemWidth(200.0f); - if (ImGui::InputText("##name", Buffer, Size, ImGuiInputTextFlags_EnterReturnsTrue) || ImGui::IsItemDeactivatedAfterEdit()) - { - auto const name{lower_case(Buffer)}; - if (name != Value && name.find(' ') == std::string::npos) - { - Value = name.empty() ? std::string{"none"} : name; - picked = true; - } - copy_text(Buffer, Size, Value); - } - ImGui::SameLine(); - if (ImGui::Button("...")) - ImGui::OpenPopup("pick"); - ImGui::SameLine(); - ImGui::TextUnformatted(Label); - if (ImGui::BeginPopup("pick")) - { - ImGui::TextDisabled("Materials and images found in the texture folder"); - ImGui::SetNextItemWidth(200.0f); - ImGui::InputText("Filter", tool.filter, sizeof(tool.filter)); - auto const filter{lower_case(tool.filter)}; - std::vector listed; - for (auto const &name : editor_road::materials()) - if (filter.empty() || name.find(filter) != std::string::npos) - listed.emplace_back(&name); - ImGui::BeginChild("list", ImVec2(340.0f, 280.0f), true); - ImGuiListClipper clipper(static_cast(listed.size())); - while (clipper.Step()) - { - for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; ++i) - { - if (ImGui::Selectable(listed[i]->c_str(), *listed[i] == Value)) - { - Value = *listed[i]; - copy_text(Buffer, Size, Value); - picked = true; - ImGui::CloseCurrentPopup(); - } - } - } - ImGui::EndChild(); - ImGui::EndPopup(); - } - ImGui::PopID(); - return picked; - }; + auto const material = [this](char const *Label, char *Buffer, std::size_t const Size, std::string &Value) { return render_road_material(Label, Buffer, Size, Value); }; // lanes ImGui::SetNextItemWidth(120.0f); @@ -1200,9 +1338,10 @@ void editor_mode::render_road_window() road_cancel(); if (tool.tool != 0) { - tool.selected = nullptr; tool.junction = nullptr; tool.points.clear(); + // the fields for the names of materials show the layout for the roads to be built again + road_select(nullptr); } } ImGui::SameLine(); @@ -1296,44 +1435,7 @@ void editor_mode::render_road_window() ImGui::Text("%s, %d roads, %d ways through", junction.name().c_str(), static_cast(junction.definition().arms.size()), static_cast(junction.movements().size())); ImGui::TextDisabled("The ways through are made for the roads attached at the moment."); ImGui::TextDisabled("Build tool, LMB on the junction: lead another road out of it"); - auto limit{junction.definition().velocity > 0.f ? junction.definition().velocity : 0.f}; - if (number("Speed limit [km/h], 0: none", limit, 5.0f, "%.0f")) - { - if (editor_road::can_edit(junction, &reason)) - { - editor_road::record record; - record.junctions.emplace_back(&junction, junction.definition()); - auto state{junction.definition()}; - state.velocity = (limit > 0.f ? limit : -1.f); - editor_road::apply(std::vector>{{&junction, state}}); - push_road_snapshot(std::move(record)); - tool.status = "Changed"; - } - else - { - tool.status = "\"" + junction.name() + "\" can't be changed: " + reason; - } - } - auto centre{static_cast(junction.definition().centre.y)}; - if (number("Height of the middle [m]", centre, 0.1f, "%.2f")) - { - if (editor_road::can_edit(junction, &reason)) - { - editor_road::record record; - record.junctions.emplace_back(&junction, junction.definition()); - auto state{junction.definition()}; - state.centre.y = centre; - editor_road::apply(std::vector>{{&junction, state}}); - push_road_snapshot(std::move(record)); - tool.status = "Changed"; - } - else - { - tool.status = "\"" + junction.name() + "\" can't be changed: " + reason; - } - } - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", "The surface is spanned between the ends of the roads and this point.\nThe ends of the roads are raised or lowered as points: select the white dot at the end of a road."); + render_junction_layout(junction); if (ImGui::Button("Delete (Del)")) road_delete(); } diff --git a/editor/editorGroundMesh.hpp b/editor/editorGroundMesh.hpp new file mode 100644 index 000000000..068b3fbbb --- /dev/null +++ b/editor/editorGroundMesh.hpp @@ -0,0 +1,148 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include +#include +#include +#include +#include + +// triangles of a single piece of the scenery - a shape or a model - sorted on a grid seen from above, so the ones +// overlapping an area can be picked without going through all of them. +// the editor asks about the ground a tile at a time, frame after frame, and a terrain model can hold a million +// triangles: walking it whole for every question is what used to bring the simulator down to a frame a second +class ground_mesh +{ + public: + using triangle = std::array; // relative to the origin of the mesh + using world_triangle = std::array; + + // takes over provided triangles. Origin: the point their vertices are relative to + void assign(std::vector Triangles, glm::dvec3 const &Origin) + { + m_triangles = std::move(Triangles); + m_origin = Origin; + m_starts.clear(); + m_items.clear(); + m_seen.assign(m_triangles.size(), 0); + m_query = 0; + if (m_triangles.empty()) + return; + + glm::vec2 low{m_triangles.front()[0].x, m_triangles.front()[0].z}; + glm::vec2 high{low}; + for (auto const &entry : m_triangles) + { + for (auto const &vertex : entry) + { + low = glm::min(low, glm::vec2{vertex.x, vertex.z}); + high = glm::max(high, glm::vec2{vertex.x, vertex.z}); + } + } + m_low = low; + auto const extent{glm::max(high - low, glm::vec2{1.f})}; + // cells of a few metres, larger for a large mesh so the grid stays small + m_cellsize = std::max(8.f, std::max(extent.x, extent.y) / 96.f); + m_columns = static_cast(extent.x / m_cellsize) + 1; + m_rows = static_cast(extent.y / m_cellsize) + 1; + + // a triangle is listed in every cell its bounds reach. the lists are kept one after another, with the place each starts at + std::vector counts(static_cast(m_columns) * m_rows + 1, 0); + for (auto const &entry : m_triangles) + { + auto const span{cells(entry)}; + for (int row = span[1]; row <= span[3]; ++row) + for (int column = span[0]; column <= span[2]; ++column) + ++counts[static_cast(row) * m_columns + column + 1]; + } + for (std::size_t cell = 1; cell < counts.size(); ++cell) + counts[cell] += counts[cell - 1]; + m_starts = counts; + m_items.resize(m_starts.back()); + for (std::uint32_t index = 0; index < m_triangles.size(); ++index) + { + auto const span{cells(m_triangles[index])}; + for (int row = span[1]; row <= span[3]; ++row) + for (int column = span[0]; column <= span[2]; ++column) + m_items[counts[static_cast(row) * m_columns + column]++] = index; + } + } + std::size_t size() const + { + return m_triangles.size(); + } + // appends the triangles whose bounds overlap specified rectangle of the world, seen from above (x, z) + void collect(glm::dvec2 const &Min, glm::dvec2 const &Max, std::vector &Out) const + { + if (m_triangles.empty()) + return; + // the rectangle as the mesh sees it, widened by what's lost turning the numbers into single precision + glm::vec2 const low{static_cast(Min.x - m_origin.x) - 0.001f, static_cast(Min.y - m_origin.z) - 0.001f}; + glm::vec2 const high{static_cast(Max.x - m_origin.x) + 0.001f, static_cast(Max.y - m_origin.z) + 0.001f}; + auto const firstcolumn{column(low.x)}; + auto const lastcolumn{column(high.x)}; + auto const firstrow{row(low.y)}; + auto const lastrow{row(high.y)}; + if (++m_query == 0) + { + // the counter went all the way round + std::fill(m_seen.begin(), m_seen.end(), 0); + m_query = 1; + } + for (int row = firstrow; row <= lastrow; ++row) + { + for (int column = firstcolumn; column <= lastcolumn; ++column) + { + auto const cell{static_cast(row) * m_columns + column}; + for (auto item = m_starts[cell]; item < m_starts[cell + 1]; ++item) + { + auto const index{m_items[item]}; + if (m_seen[index] == m_query) + continue; + m_seen[index] = m_query; + auto const &entry{m_triangles[index]}; + if (std::max({entry[0].x, entry[1].x, entry[2].x}) < low.x || std::min({entry[0].x, entry[1].x, entry[2].x}) > high.x || std::max({entry[0].z, entry[1].z, entry[2].z}) < low.y || + std::min({entry[0].z, entry[1].z, entry[2].z}) > high.y) + continue; + Out.push_back({m_origin + glm::dvec3{entry[0]}, m_origin + glm::dvec3{entry[1]}, m_origin + glm::dvec3{entry[2]}}); + } + } + } + } + + private: + int column(float const X) const + { + return std::clamp(static_cast(std::floor((X - m_low.x) / m_cellsize)), 0, m_columns - 1); + } + int row(float const Z) const + { + return std::clamp(static_cast(std::floor((Z - m_low.y) / m_cellsize)), 0, m_rows - 1); + } + // cells the bounds of a triangle reach: first column, first row, last column, last row + std::array cells(triangle const &Triangle) const + { + return {column(std::min({Triangle[0].x, Triangle[1].x, Triangle[2].x})), row(std::min({Triangle[0].z, Triangle[1].z, Triangle[2].z})), column(std::max({Triangle[0].x, Triangle[1].x, Triangle[2].x})), + row(std::max({Triangle[0].z, Triangle[1].z, Triangle[2].z}))}; + } + + std::vector m_triangles; + glm::dvec3 m_origin{0.0}; + glm::vec2 m_low{0.f}; + float m_cellsize{8.f}; + int m_columns{1}; + int m_rows{1}; + std::vector m_starts; // for each cell: where its list starts; one more entry closes the last list + std::vector m_items; // numbers of the triangles, cell after cell + mutable std::vector m_seen; // number of the last lookup each triangle was reported in + mutable std::uint32_t m_query{0}; +}; diff --git a/editor/editorRoad.cpp b/editor/editorRoad.cpp index 65358eb09..d713bfc1d 100644 --- a/editor/editorRoad.cpp +++ b/editor/editorRoad.cpp @@ -300,6 +300,10 @@ void dress(junction_node::state &Junction, road_node::state const &Road) Junction.surface = Road.surface; Junction.texturelength = Road.texturelength; Junction.markings = Road.markings; + // one kind of side goes around the whole junction; the right side of the road is the one facing the corner a road leaves by + Junction.side = (Road.sides[1].type != road_node::side_type::none ? Road.sides[1] : Road.sides[0]); + Junction.kerbheight = Road.kerbheight; + Junction.slope = Road.slope; Junction.friction = Road.friction; Junction.sounddistance = Road.sounddistance; Junction.quality = Road.quality; diff --git a/world/Road.cpp b/world/Road.cpp index c43a75169..22c65289b 100644 --- a/world/Road.cpp +++ b/world/Road.cpp @@ -948,6 +948,8 @@ std::unordered_set ownedbanks; double const junction_reach{0.25}; // an end of a road this close to an arm is attached to it double const junction_fit{0.05}; // a lane has to end this close to where the junction expects it int const corner_steps{6}; // pieces a rounded corner is made of +double const stopline_width{0.5}; +double const stopline_inset{0.2}; // distance of a stop line from the end of its road // direction on the ground as a vector in space glm::dvec3 flat(glm::dvec2 const &Direction) @@ -1064,6 +1066,9 @@ void junction_node::state::normalize() arm.width = std::max(1.f, arm.width); arm.direction = (glm::length(arm.direction) > 1e-6 ? glm::normalize(arm.direction) : glm::dvec2{0.0, 1.0}); } + side.width = std::max(0.f, side.width); + kerbheight = std::max(0.f, kerbheight); + slope = glm::max(slope, glm::vec2{0.f}); if (texturelength < 0.01f) { texturelength = 4.f; @@ -1168,6 +1173,7 @@ void junction_node::import(cParser &Input, glm::dvec3 const &Offset) Input.getTokens(3); Input >> m_state.centre.x >> m_state.centre.y >> m_state.centre.z; m_state.centre += Offset; + std::vector stoplines; auto token{Input.getToken()}; while (false == token.empty() && token != "endjunction") @@ -1200,6 +1206,39 @@ void junction_node::import(cParser &Input, glm::dvec3 const &Offset) auto const colour{Input.getToken()}; m_state.markings = (colour == "white" ? road_node::marking_colour::white : colour == "orange" ? road_node::marking_colour::orange : road_node::marking_colour::none); } + else if (token == "side") + { + // side + auto const type{Input.getToken()}; + Input.getTokens(); + Input >> m_state.side.width; + m_state.side.material = Input.getToken(); + replace_slashes(m_state.side.material); + m_state.side.type = (type == "shoulder" ? road_node::side_type::shoulder : type == "sidewalk" ? road_node::side_type::sidewalk : road_node::side_type::none); + if (type != "shoulder" && type != "sidewalk" && type != "none") + { + ErrorLog("Bad junction: unknown kind of side \"" + type + "\" defined for " + label); + } + } + else if (token == "kerb") + { + Input.getTokens(); + Input >> m_state.kerbheight; + } + else if (token == "slope") + { + // slope + Input.getTokens(2); + Input >> m_state.slope.x >> m_state.slope.y; + } + else if (token == "stopline") + { + // stopline ; the arms it's for may come later, so the numbers wait + int number{0}; + Input.getTokens(); + Input >> number; + stoplines.emplace_back(number); + } else if (token == "velocity") { Input.getTokens(); @@ -1220,6 +1259,15 @@ void junction_node::import(cParser &Input, glm::dvec3 const &Offset) } token = Input.getToken(); } + for (auto const number : stoplines) + { + if (number < 1 || number > static_cast(m_state.arms.size())) + { + ErrorLog("Bad junction: " + label + " has no arm " + std::to_string(number) + " to put a stop line at"); + continue; + } + m_state.arms[number - 1].stopline = true; + } if (m_state.arms.size() < 2 || m_state.arms.size() > 4) { ErrorLog("Bad junction: " + label + " has " + std::to_string(m_state.arms.size()) + " arms, it takes 2 to 4"); @@ -1580,6 +1628,87 @@ std::vector junction_node::create_shapes() const shapes.emplace_back(std::move(shape)); } } + auto const &side{m_state.side}; + if (side.type != road_node::side_type::none && side.width > 0.f && false == side.material.empty() && side.material != "none") + { + // the corners are lined the way the sides of a road are, so the shoulders and the sidewalks of the roads carry on around the junction + struct corner_point + { + double offset; // distance from the edge of the surface + double height; + float texture; + }; + std::vector profile; + if (side.type == road_node::side_type::shoulder) + { + profile.push_back({0.0, 0.0, 1.f}); + profile.push_back({side.width, 0.0, 0.5f}); + if (m_state.slope.x > 0.f) + { + profile.push_back({static_cast(side.width) + m_state.slope.x, -m_state.slope.y, 0.f}); + } + } + else + { + auto const tile{static_cast(texture_ratio(side.material)) * m_state.texturelength}; + profile.push_back({0.0, 0.0, 0.f}); + profile.push_back({0.0, m_state.kerbheight, static_cast(m_state.kerbheight / tile)}); + profile.push_back({side.width, m_state.kerbheight, static_cast((m_state.kerbheight + side.width) / tile)}); + } + auto const order{m_state.arm_order()}; + std::vector vertices; + for (std::size_t idx = 0; idx < corners.size() && idx < order.size(); ++idx) + { + auto const &corner{corners[idx]}; + if (corner.size() < 2) + { + continue; + } + // the way out of the surface at each point of the corner. at its ends it's the way across the roads there, + // so the side meets what the roads have along their edges + std::vector outwards(corner.size()); + outwards.front() = flat(left_of(m_state.arms[order[idx]].direction)); + outwards.back() = -flat(left_of(m_state.arms[order[(idx + 1) % order.size()]].direction)); + for (std::size_t point = 1; point + 1 < corner.size(); ++point) + { + // going around the junction the surface is on the left, and the way out of it on the right + glm::dvec2 const along{corner[point + 1].x - corner[point - 1].x, corner[point + 1].z - corner[point - 1].z}; + outwards[point] = (glm::length(along) > 1e-9 ? -flat(left_of(glm::normalize(along))) : outwards[point - 1]); + } + double station{0.0}; + for (std::size_t point = 0; point + 1 < corner.size(); ++point) + { + auto const length{glm::distance(corner[point], corner[point + 1])}; + auto const tangent{corner[point + 1] - corner[point]}; + auto const texturestart{static_cast(station / m_state.texturelength)}; + auto const textureend{static_cast((station + length) / m_state.texturelength)}; + for (std::size_t band = 0; band + 1 < profile.size(); ++band) + { + auto const &inner{profile[band]}; + auto const &outer{profile[band + 1]}; + auto const leftstart{corner[point] + outwards[point] * inner.offset + up * inner.height}; + auto const rightstart{corner[point] + outwards[point] * outer.offset + up * outer.height}; + auto const leftend{corner[point + 1] + outwards[point + 1] * inner.offset + up * inner.height}; + auto const rightend{corner[point + 1] + outwards[point + 1] * outer.offset + up * outer.height}; + auto facing{glm::cross(tangent, leftstart - rightstart)}; + glm::vec3 const normal{glm::length2(facing) < 1e-12 ? up : glm::normalize(facing)}; + vertices.push_back({leftstart, normal, {inner.texture, texturestart}}); + vertices.push_back({rightstart, normal, {outer.texture, texturestart}}); + vertices.push_back({leftend, normal, {inner.texture, textureend}}); + vertices.push_back({rightstart, normal, {outer.texture, texturestart}}); + vertices.push_back({rightend, normal, {outer.texture, textureend}}); + vertices.push_back({leftend, normal, {inner.texture, textureend}}); + } + station += length; + } + } + if (false == vertices.empty()) + { + scene::shape_node shape; + shape.make_terrain(GfxRenderer->Fetch_Material(side.material), std::move(vertices), glm::dvec3{0.0}); + shapes.emplace_back(std::move(shape)); + } + } if (m_state.markings != road_node::marking_colour::none) { // edge lines carried around the corners @@ -1587,6 +1716,29 @@ std::vector junction_node::create_shapes() const glm::dvec3 const lift{0.0, line_lift, 0.0}; glm::vec3 const upwards{0.f, 1.f, 0.f}; auto const &arms{m_state.arms}; + for (std::size_t arm = 0; arm < arms.size(); ++arm) + { + if (false == arms[arm].stopline || arms[arm].incoming < 1) + { + continue; + } + // a stop line: across the lanes leading into the junction, right where the road ends + auto const across{flat(left_of(arms[arm].direction))}; + auto const inwards{-flat(arms[arm].direction)}; + auto const halfwidth{0.5 * m_state.arm_width(arm)}; + auto const from{arms[arm].position + across * (halfwidth - static_cast(arms[arm].incoming) * arms[arm].width + 0.5 * line_width) + lift}; + auto const to{arms[arm].position + across * (halfwidth - edge_inset - line_width) + lift}; + auto const leftstart{from + inwards * (stopline_inset + stopline_width)}; + auto const rightstart{from + inwards * stopline_inset}; + auto const leftend{to + inwards * (stopline_inset + stopline_width)}; + auto const rightend{to + inwards * stopline_inset}; + vertices.push_back({leftstart, upwards, {0.f, 0.f}}); + vertices.push_back({rightstart, upwards, {1.f, 0.f}}); + vertices.push_back({leftend, upwards, {0.f, 1.f}}); + vertices.push_back({rightstart, upwards, {1.f, 0.f}}); + vertices.push_back({rightend, upwards, {1.f, 1.f}}); + vertices.push_back({leftend, upwards, {0.f, 1.f}}); + } if (arms.size() == 2 && arms[0].incoming > 0 && arms[0].outgoing > 0 && arms[1].incoming > 0 && arms[1].outgoing > 0) { // a junction of two roads is where a road changes its lanes. the double line keeping the directions apart is led through it @@ -1725,8 +1877,20 @@ void junction_node::export_as_text_(std::ostream &Output) const } Output.precision(precision); Output << "surface " << m_state.surface << ' ' << "texlength " << m_state.texturelength << ' ' << "markings " - << (m_state.markings == road_node::marking_colour::white ? "white" : m_state.markings == road_node::marking_colour::orange ? "orange" : "none") << ' ' << "velocity " << m_state.velocity << ' ' << "friction " << m_state.friction << ' ' - << "environment " << m_state.environment << ' '; + << (m_state.markings == road_node::marking_colour::white ? "white" : m_state.markings == road_node::marking_colour::orange ? "orange" : "none") << ' '; + if (m_state.side.type != road_node::side_type::none) + { + Output << "side " << (m_state.side.type == road_node::side_type::shoulder ? "shoulder" : "sidewalk") << ' ' << m_state.side.width << ' ' << (m_state.side.material.empty() ? "none" : m_state.side.material) << ' ' << "kerb " << m_state.kerbheight << ' ' + << "slope " << m_state.slope.x << ' ' << m_state.slope.y << ' '; + } + for (std::size_t arm = 0; arm < m_state.arms.size(); ++arm) + { + if (m_state.arms[arm].stopline) + { + Output << "stopline " << arm + 1 << ' '; + } + } + Output << "velocity " << m_state.velocity << ' ' << "friction " << m_state.friction << ' ' << "environment " << m_state.environment << ' '; Output << "endjunction" << "\n"; } diff --git a/world/Road.h b/world/Road.h index db4e8d75a..11465b5b8 100644 --- a/world/Road.h +++ b/world/Road.h @@ -210,6 +210,8 @@ class road_node : public scene::basic_node // gets a legacy crossroads path, which is what the vehicles and their drivers already know how to pick a way through. // scenery entry: // node junction arm ... [ ]... endjunction +// properties: surface , texlength , markings , side , kerb , +// slope , stopline , velocity , friction , environment // the arms don't have to be level with each other: the surface is spanned between their ends and the centre class junction_node : public scene::basic_node { @@ -223,6 +225,7 @@ class junction_node : public scene::basic_node int incoming{1}; // lanes leading into the junction int outgoing{1}; // lanes leading out of it float width{3.5f}; // width of a lane + bool stopline{false}; // a line is painted across the lanes leading into the junction }; struct state { @@ -231,6 +234,9 @@ class junction_node : public scene::basic_node std::string surface{"asphaltdark1"}; float texturelength{4.f}; road_node::marking_colour markings{road_node::marking_colour::white}; + road_node::side_data side; // what the corners between the roads are lined with, the way the sides of a road are + float kerbheight{0.12f}; + glm::vec2 slope{1.f, 0.4f}; // width and drop of the bank which closes a shoulder float velocity{30.f}; // speed limit on the way through float friction{0.85f}; float sounddistance{25.f}; From cdd5c242d1ccddf6b521abdb83f978be43220801 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 00:14:03 +0200 Subject: [PATCH 083/430] feat(editor): curves take over the adjoining straights --- application/editormode.h | 1 + application/editormodetrack.cpp | 112 ++++++++++++++++++++++++------ editor/editorAlignment.cpp | 89 ++++++++++++++++++------ editor/editorAlignment.hpp | 7 ++ editor/editorTrack.cpp | 116 ++++++++++++++++++++++++++++++++ editor/editorTrack.hpp | 10 +++ 6 files changed, 297 insertions(+), 38 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index 262b1b1b9..19438feb6 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -313,6 +313,7 @@ class editor_mode : public application_mode }; void render_route_ui(); void route_reset(); + void route_bind_ends(); bool route_from_curve(TTrack &Track); void route_update() { m_route.result = alignment::compute(m_route.design); } void route_apply(); diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index e8adfae14..8ebd64f96 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -433,7 +433,17 @@ void editor_mode::restore_track_snapshot(EditorSnapshot const &Snapshot, std::ve if (false == m_route.chain.tracks.empty()) { std::string error; - editor_track::find_chain(m_route.from, m_route.to, m_route.chain, error); + if (m_route.from->m_editorremoved || m_route.to->m_editorremoved || false == editor_track::find_chain(m_route.from, m_route.to, m_route.chain, error)) + { + m_route.chain = {}; + m_route.result = {}; + m_route.vertex = m_route.grip = -1; + } + else + { + route_bind_ends(); + route_update(); + } } m_track_snap = {}; @@ -818,6 +828,24 @@ void editor_mode::route_recommend(alignment::vertex &Vertex) const Vertex.vertical_radius = 0.0; } +void editor_mode::route_bind_ends() +{ + auto const &chain{m_route.chain}; + auto &design{m_route.design}; + auto const plan = [](glm::dvec3 const &Direction) { return glm::normalize(glm::dvec2{Direction.x, Direction.z}); }; + auto const slope = [](glm::dvec3 const &Direction) { return Direction.y / std::max(1e-9, std::hypot(Direction.x, Direction.z)); }; + design.start = chain.start; + design.end = chain.end; + design.start_direction = plan(chain.start_direction); + design.end_direction = plan(chain.end_direction); + design.start_grade = slope(chain.start_direction); + design.end_grade = slope(chain.end_direction); + design.start_radius = chain.start_radius; + design.end_radius = chain.end_radius; + design.start_reserve = editor_track::run_reserve(editor_track::straight_beyond(chain, false, m_straights.tolerance)); + design.end_reserve = editor_track::run_reserve(editor_track::straight_beyond(chain, true, m_straights.tolerance)); +} + void editor_mode::route_reset() { auto &route{m_route}; @@ -837,18 +865,10 @@ void editor_mode::route_reset() design.norms = route.design.norms; design.shape = route.design.shape; design.transition_pieces = route.design.transition_pieces; - design.start = chain.start; - design.end = chain.end; - auto const plan = [](glm::dvec3 const &Direction) { return glm::normalize(glm::dvec2{Direction.x, Direction.z}); }; - auto const slope = [](glm::dvec3 const &Direction) { return Direction.y / std::max(1e-9, std::hypot(Direction.x, Direction.z)); }; - design.start_direction = plan(chain.start_direction); - design.end_direction = plan(chain.end_direction); - design.start_grade = slope(chain.start_direction); - design.end_grade = slope(chain.end_direction); - design.start_radius = chain.start_radius; - design.end_radius = chain.end_radius; design.speed = chain.velocity > 0.0 ? chain.velocity : 100.0; route.design = design; + route_bind_ends(); + design = route.design; glm::dvec2 intersection; if (false == alignment::collinear(design)) @@ -938,16 +958,64 @@ void editor_mode::route_apply() } } - auto const pieces{alignment::pieces(route.result, route.design, chain.tracks.size())}; std::vector> states; + std::vector created; + auto *from{route.from}; + auto *to{route.to}; + auto const startextension{route.result.start_extension}; + auto const endextension{route.result.end_extension}; + if (startextension > 0.0 || endextension > 0.0) + { + auto const before{chain}; + if (startextension > 0.0) + from = editor_track::take_straight(editor_track::straight_beyond(before, false, m_straights.tolerance), from, before.start, route.result.start, states, created); + if (endextension > 0.0) + to = editor_track::take_straight(editor_track::straight_beyond(before, true, m_straights.tolerance), to, before.end, route.result.end, states, created); + auto const plandistance = [](glm::dvec3 const &A, glm::dvec3 const &B) { return glm::distance(glm::dvec2{A.x, A.z}, glm::dvec2{B.x, B.z}); }; + std::string error; + if (false == editor_track::find_chain(from, to, chain, error) || plandistance(chain.start, route.result.start) > 5.0 || plandistance(chain.end, route.result.end) > 5.0) + { + for (auto *track : created) + editor_track::retire(*track); + for (auto entry = states.rbegin(); entry != states.rend(); ++entry) + { + editor_track::apply(*entry->first, entry->second); + editor_track::commit({entry->first}); + } + route.error = error.empty() ? "The adjoining straights can't be cut at the ends of the curve" : error; + return; + } + } for (auto *track : chain.tracks) - states.emplace_back(track, editor_track::capture(*track)); - auto created{editor_track::relay(chain, pieces)}; - auto const added{created.size()}; + if (std::none_of(states.begin(), states.end(), [&](auto const &Entry) { return Entry.first == track; })) + states.emplace_back(track, editor_track::capture(*track)); + auto pieces{alignment::pieces(route.result, route.design, chain.tracks.size())}; + auto relaid{editor_track::relay(chain, pieces)}; + auto const added{relaid.size()}; + created.insert(created.end(), relaid.begin(), relaid.end()); push_track_snapshot(std::move(states), std::move(created)); + route.from = from; + route.to = to; editor_track::find_chain(route.from, route.to, route.chain, route.error); + if (startextension > 0.0 || endextension > 0.0) + { + route_bind_ends(); + auto &vertices{route.design.vertices}; + if (vertices.size() >= 2) + { + vertices.front().offset += startextension; + vertices.back().offset += endextension; + } + route_update(); + } route.status = "Re-laid " + std::to_string(chain.tracks.size()) + " paths" + (added > 0 ? ", added " + std::to_string(added) : std::string{}); + if (startextension > 0.0 || endextension > 0.0) + { + char text[96]; + std::snprintf(text, sizeof(text), ", the curve took over %.2f / %.2f m of the adjoining straights", startextension, endextension); + route.status += text; + } WriteLog("Editor: route design - " + route.status, logtype::generic); } @@ -1033,11 +1101,13 @@ void editor_mode::draw_route_overlay() const auto const &result{route.result}; screen_projection const projection; ImDrawList *drawlist = ImGui::GetBackgroundDrawList(); + auto const &start{result.valid ? result.start : design.start}; + auto const &end{result.valid ? result.end : design.end}; - std::vector polygon{design.start}; + std::vector polygon{start}; for (int i = 0; i < static_cast(design.vertices.size()); ++i) polygon.push_back(route_vertex_position(i)); - polygon.push_back(design.end); + polygon.push_back(end); for (std::size_t i = 0; i + 1 < polygon.size(); ++i) projection.line(drawlist, polygon[i], polygon[i + 1], IM_COL32(255, 210, 60, 150), 1.5f); @@ -1062,7 +1132,7 @@ void editor_mode::draw_route_overlay() const for (auto const atend : {false, true}) { - auto const &point{atend ? design.end : design.start}; + auto const &point{atend ? end : start}; auto const direction{atend ? design.end_direction : design.start_direction}; ImVec2 screen; if (projection.project(point, screen)) @@ -1369,7 +1439,10 @@ void editor_mode::render_route_ui() auto const pieces{alignment::minimum_pieces(result, design)}; ImGui::Text("Length %.2f m (now %.2f m), %zu elements", result.length, route.chain.length, result.elements.size()); ImGui::TextDisabled("Paths: %zu in the fragment, %zu needed%s", route.chain.tracks.size(), pieces, pieces > route.chain.tracks.size() ? " (copies of the neighbours will be added)" : ""); + if (result.start_extension > 0.0 || result.end_extension > 0.0) + ImGui::Text("Takes over %.2f m of the straight at the start, %.2f m at the end", result.start_extension, result.end_extension); } + ImGui::TextDisabled("Straight available beyond the ends: %.2f / %.2f m", design.start_reserve, design.end_reserve); for (auto const &error : result.errors) ImGui::TextColored(ImVec4(1.0f, 0.35f, 0.3f, 1.0f), "%s", error.c_str()); for (auto const &warning : result.warnings) @@ -2165,6 +2238,7 @@ void editor_mode::straight_reshape(editor_track::straight const &Line, double co state.status = m_route.error; return; } + m_route.design.start_reserve = m_route.design.end_reserve = 0.0; for (auto &vertex : m_route.design.vertices) { vertex.radius = Radius; @@ -2185,7 +2259,7 @@ void editor_mode::straight_reshape(editor_track::straight const &Line, double co state.status = m_route.result.errors.empty() ? "The curve can't be fitted" : m_route.result.errors.front(); return; } - auto const pieces{alignment::pieces(m_route.result, m_route.design, m_route.chain.tracks.size())}; + auto pieces{alignment::pieces(m_route.result, m_route.design, m_route.chain.tracks.size())}; auto created{editor_track::relay(m_route.chain, pieces)}; editor_track::commit(tracks); for (auto const &entry : splitstates) diff --git a/editor/editorAlignment.cpp b/editor/editorAlignment.cpp index 703683cef..b93046b98 100644 --- a/editor/editorAlignment.cpp +++ b/editor/editorAlignment.cpp @@ -277,11 +277,18 @@ recommendation recommend(double const Speed, double const Radius, limits const & return result; } -result compute(design const &Design) +namespace +{ + +result fit_between(design const &Design) { result r; r.shape = Design.shape; r.gauge = Design.norms.gauge; + r.start = Design.start; + r.end = Design.end; + auto const startreserve{std::max(0.0, Design.start_reserve)}; + auto const endreserve{std::max(0.0, Design.end_reserve)}; auto const start{plan(Design.start)}; auto const end{plan(Design.end)}; @@ -351,6 +358,16 @@ result compute(design const &Design) straight.length = Length; push(straight); }; + auto const starts_early = [&](double const Straight) { + if (Straight < 0.0) + r.start_extension = -Straight; + if (Straight >= -1e-4 || -Straight <= startreserve + 1e-4) + return; + if (startreserve > 0.0) + r.errors.emplace_back(format("Vertex 1: the curve starts %.2f m before the adjoining straight", -Straight - startreserve)); + else + r.errors.emplace_back(format("Vertex 1: the curve starts %.2f m before the fixed start", -Straight)); + }; struct fitted { @@ -441,9 +458,9 @@ result compute(design const &Design) std::vector scales(count, 1.0); for (std::size_t leg = 0; leg + 1 < polygon.size(); ++leg) { - auto const available{glm::distance(polygon[leg], polygon[leg + 1])}; + auto const available{glm::distance(polygon[leg], polygon[leg + 1]) + (leg == 0 ? startreserve : 0.0) + (leg == count ? endreserve : 0.0)}; auto const required{(leg > 0 ? fits[leg - 1].tangent_out : 0.0) + (leg < count ? fits[leg].tangent_in : 0.0)}; - if (required <= available) + if (required <= available + 1e-6) continue; auto const scale{available / required * (1.0 - 1e-9)}; if (leg > 0) @@ -534,13 +551,10 @@ result compute(design const &Design) auto const along{cross(directionout, endoffset) / cross(directionout, directionin)}; auto const curvestart{position - directionin * along}; auto const straight{glm::dot(curvestart - cursor, directionin)}; - if (straight < -1e-4) - { - if (k == 0) - r.errors.emplace_back(format("Vertex 1: the curve starts %.2f m before the fixed start", -straight)); - else - r.errors.emplace_back(format("Curves of vertices %zu and %zu overlap by %.2f m", k, k + 1, -straight)); - } + if (k == 0) + starts_early(straight); + else if (straight < -1e-4) + r.errors.emplace_back(format("Curves of vertices %zu and %zu overlap by %.2f m", k, k + 1, -straight)); push_straight(cursor, directionin, straight); auto const startchainage{chainage}; glm::dvec2 origin{curvestart}; @@ -615,13 +629,10 @@ result compute(design const &Design) } auto const straight{glm::dot(curvestart - cursor, directionin)}; - if (straight < -1e-4) - { - if (k == 0) - r.errors.emplace_back(format("Vertex 1: the curve starts %.2f m before the fixed start", -straight)); - else - r.errors.emplace_back(format("Curves of vertices %zu and %zu overlap by %.2f m", k, k + 1, -straight)); - } + if (k == 0) + starts_early(straight); + else if (straight < -1e-4) + r.errors.emplace_back(format("Curves of vertices %zu and %zu overlap by %.2f m", k, k + 1, -straight)); push_straight(cursor, directionin, straight); element curve; @@ -698,8 +709,15 @@ result compute(design const &Design) } auto const lastdirection{glm::normalize(polygon.back() - polygon[polygon.size() - 2])}; auto const tail{glm::dot(end - cursor, lastdirection)}; - if (tail < -1e-4) - r.errors.emplace_back(format("Vertex %zu: the curve ends %.2f m past the fixed end", count, -tail)); + if (tail < 0.0) + r.end_extension = -tail; + if (tail < -1e-4 && -tail > endreserve + 1e-4) + { + if (endreserve > 0.0) + r.errors.emplace_back(format("Vertex %zu: the curve ends %.2f m past the adjoining straight", count, -tail - endreserve)); + else + r.errors.emplace_back(format("Vertex %zu: the curve ends %.2f m past the fixed end", count, -tail)); + } push_straight(cursor, lastdirection, tail); r.length = chainage; @@ -757,6 +775,39 @@ result compute(design const &Design) return r; } +glm::dvec3 along_end(glm::dvec3 const &Point, glm::dvec2 const &Direction, double const Grade, double const Distance) +{ + auto const direction{glm::normalize(Direction)}; + return {Point.x + direction.x * Distance, Point.y + Grade * Distance, Point.z + direction.y * Distance}; +} + +} // namespace + +result compute(design const &Design) +{ + auto first{fit_between(Design)}; + auto const startextension{first.start_extension > 1e-4 ? first.start_extension : 0.0}; + auto const endextension{first.end_extension > 1e-4 ? first.end_extension : 0.0}; + if (false == first.errors.empty() || (startextension == 0.0 && endextension == 0.0)) + { + first.start_extension = first.end_extension = 0.0; + return first; + } + auto extended{Design}; + extended.start = along_end(Design.start, Design.start_direction, Design.start_grade, -startextension); + extended.end = along_end(Design.end, Design.end_direction, Design.end_grade, endextension); + extended.start_reserve = extended.end_reserve = 0.0; + if (extended.vertices.size() >= 2) + { + extended.vertices.front().offset += startextension; + extended.vertices.back().offset += endextension; + } + auto r{fit_between(extended)}; + r.start_extension = startextension; + r.end_extension = endextension; + return r; +} + bool tangent_intersection(design const &Design, glm::dvec2 &Point) { auto const start{plan(Design.start)}; diff --git a/editor/editorAlignment.hpp b/editor/editorAlignment.hpp index f86281704..a3e4572f4 100644 --- a/editor/editorAlignment.hpp +++ b/editor/editorAlignment.hpp @@ -65,6 +65,9 @@ struct design double end_grade{0.0}; double start_radius{0.0}; double end_radius{0.0}; + // length of the straight beyond the start and the end, which the curves can take over + double start_reserve{0.0}; + double end_reserve{0.0}; std::vector vertices; transition_shape shape{transition_shape::cubic_parabola}; double speed{100.0}; @@ -152,6 +155,10 @@ struct result std::vector curves; std::vector profile; double length{0.0}; + glm::dvec3 start{0.0}; + glm::dvec3 end{0.0}; + double start_extension{0.0}; + double end_extension{0.0}; }; result compute(design const &Design); diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index 73ebb580d..6df8d41b9 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -27,6 +27,7 @@ http: #include #include #include +#include #include namespace @@ -1179,6 +1180,121 @@ bool editor_track::find_curve(TTrack &Track, straight_tolerance const &Tolerance return true; } +namespace +{ + +// shorter remainders of a straight path are absorbed by moving the joint instead of splitting the path +double split_margin(double const Length) +{ + return std::max(0.5, 0.002 * Length); +} + +double plan_length(segment_data const &Path) +{ + return glm::length(plan_of(Path.points[segment_data::point::end] - Path.points[segment_data::point::start])); +} + +} // namespace + +editor_track::straight_run editor_track::straight_beyond(chain const &Chain, bool const Atend, straight_tolerance const &Tolerance) +{ + straight_run run; + if (Chain.tracks.empty()) + return run; + auto *edge{Atend ? Chain.tracks.back() : Chain.tracks.front()}; + bool const forward{Atend ? Chain.forward.back() : Chain.forward.front()}; + TTrack *current{forward == Atend ? edge->trNext : edge->trPrev}; + auto joint{Atend ? Chain.end : Chain.start}; + auto const origin{plan_of(joint)}; + auto direction{glm::normalize(plan_of(Atend ? Chain.end_direction : -Chain.start_direction))}; + while (current != nullptr && run.tracks.size() < 1000) + { + std::string reason; + if (current->eType != tt_Normal || current->m_editorremoved || false == can_edit_geometry(*current, reason)) + break; + if (std::find(Chain.tracks.begin(), Chain.tracks.end(), current) != Chain.tracks.end() || std::find(run.tracks.begin(), run.tracks.end(), current) != run.tracks.end()) + break; + auto const &path{current->m_paths.front()}; + if (false == plan_straight(path, Tolerance)) + break; + bool outward; + if (glm::distance(path.points[segment_data::point::start], joint) <= kSamePoint) + outward = true; + else if (glm::distance(path.points[segment_data::point::end], joint) <= kSamePoint) + outward = false; + else + break; + auto const &far{path.points[outward ? segment_data::point::end : segment_data::point::start]}; + if (run.tracks.empty()) + { + auto const own{glm::normalize(plan_of(far - joint))}; + if (std::abs(lateral_of(direction, own)) > 0.01 || glm::dot(direction, own) <= 0.0) + break; + direction = own; + } + auto const offset{plan_of(far) - origin}; + auto const along{glm::dot(offset, direction)}; + if (along <= run.length + 1e-3 || std::abs(lateral_of(direction, offset)) > Tolerance.offset) + break; + run.tracks.push_back(current); + run.outward.push_back(outward); + run.length = along; + joint = far; + current = outward ? current->trNext : current->trPrev; + } + return run; +} + +double editor_track::run_reserve(straight_run const &Run) +{ + if (Run.tracks.empty()) + return 0.0; + return std::max(0.0, Run.length - split_margin(plan_length(Run.tracks.back()->m_paths.front())) - 0.01); +} + +TTrack *editor_track::take_straight(straight_run const &Run, TTrack *Edge, glm::dvec3 const &Joint, glm::dvec3 const &Cut, std::vector> &States, std::vector &Created) +{ + auto const length{glm::length(plan_of(Cut - Joint))}; + auto *edge{Edge}; + double covered{0.0}; + for (std::size_t i = 0; i < Run.tracks.size(); ++i) + { + auto *track{Run.tracks[i]}; + auto const outward{Run.outward[i]}; + auto const &path{track->m_paths.front()}; + auto const pathlength{plan_length(path)}; + auto const margin{split_margin(pathlength)}; + auto const remaining{length - covered}; + if (remaining <= margin) + { + if (std::abs(remaining) > 1e-4) + { + States.emplace_back(track, capture(*track)); + move_point(*track, {0, outward ? point_kind::start : point_kind::end}, Cut); + commit({track}); + } + break; + } + if (remaining < pathlength - margin) + { + auto const &nearpoint{path.points[outward ? segment_data::point::start : segment_data::point::end]}; + auto const &farpoint{path.points[outward ? segment_data::point::end : segment_data::point::start]}; + auto const t{nearest_parameter(*track, nearpoint + (farpoint - nearpoint) * (remaining / pathlength))}; + auto const before{capture(*track)}; + auto *created{split_path(*track, t)}; + if (created == nullptr) + break; + States.emplace_back(track, before); + Created.push_back(created); + edge = outward ? track : created; + break; + } + edge = track; + covered += pathlength; + } + return edge; +} + std::vector editor_track::find_switch_templates() { std::vector result; diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index 450352127..13800f431 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -137,6 +137,16 @@ class editor_track double split{0.5}; }; static bool find_curve(TTrack &Track, straight_tolerance const &Tolerance, double const Gauge, curve &Curve); + // regular straight paths continuing a chain end in line, which the chain can take over + struct straight_run + { + std::vector tracks; + std::vector outward; + double length{0.0}; + }; + static straight_run straight_beyond(chain const &Chain, bool const Atend, straight_tolerance const &Tolerance); + static double run_reserve(straight_run const &Run); + static TTrack *take_straight(straight_run const &Run, TTrack *Edge, glm::dvec3 const &Joint, glm::dvec3 const &Cut, std::vector> &States, std::vector &Created); struct switch_template { TTrack *source{nullptr}; From 7371b189106c0891e9b265cc07cf76ac480da9f1 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 00:14:03 +0200 Subject: [PATCH 084/430] feat(editor): vertical profile editor, grade lines kept in the scenery --- CMakeLists.txt | 2 + application/editormode.cpp | 4 + application/editormode.h | 68 ++ application/editormodeprofile.cpp | 1189 +++++++++++++++++++++++++++++ application/editormodetrack.cpp | 73 +- application/editorprojection.h | 63 ++ editor/editorAlignment.cpp | 14 - editor/editorProfile.cpp | 422 ++++++++++ editor/editorProfile.hpp | 119 +++ editor/editorTrack.cpp | 480 ++++++++++++ editor/editorTrack.hpp | 45 ++ scene/scenelayers.cpp | 116 ++- scene/scenelayers.h | 21 + scene/scenelayerssave.cpp | 51 +- 14 files changed, 2591 insertions(+), 76 deletions(-) create mode 100644 application/editormodeprofile.cpp create mode 100644 application/editorprojection.h create mode 100644 editor/editorProfile.cpp create mode 100644 editor/editorProfile.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index fe5b1f2bf..8900a0beb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -172,10 +172,12 @@ set(SOURCES "editor/editorTerrain.cpp" "editor/editorTrack.cpp" "editor/editorAlignment.cpp" +"editor/editorProfile.cpp" "editor/editorTerrainStreamer.cpp" "editor/editorOrthophoto.cpp" "application/editormode.cpp" "application/editormodetrack.cpp" +"application/editormodeprofile.cpp" "input/editormouseinput.cpp" "application/editoruilayer.cpp" "application/editoruipanels.cpp" diff --git a/application/editormode.cpp b/application/editormode.cpp index dd8bafa27..3b83664d0 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -1021,6 +1021,8 @@ bool editor_mode::update() draw_build_overlay(); draw_track_hints(); render_track_window(); + draw_profile_overlay(); + render_profile_window(); } // --- area fill: outline overlay while the mode is active (its settings are drawn in the node bank window) --- @@ -1633,6 +1635,8 @@ void editor_mode::save() } } + if (m_profile.changed) + profile_store(); auto const result = scene::Layers.save(rootstatements); if (result.success && false == rootstatements.empty()) { diff --git a/application/editormode.h b/application/editormode.h index 19438feb6..b517736c8 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -21,6 +21,7 @@ http://mozilla.org/MPL/2.0/. #include "editor/editorOrthophoto.hpp" #include "editor/editorTrack.hpp" #include "editor/editorAlignment.hpp" +#include "editor/editorProfile.hpp" #include #include @@ -477,6 +478,73 @@ class editor_mode : public application_mode void toggle_straight_set(TTrack &Track); void draw_track_hints(); bool m_route_tab{true}; + + // vertical profile (grade line) along a route + struct profile_state + { + bool open{false}; + TTrack *from{nullptr}; + TTrack *to{nullptr}; + TTrack *picked_from{nullptr}; + TTrack *picked_to{nullptr}; + double run_length{3000.0}; + editor_track::route route; + std::vector samples; + std::vector terrain; // NaN where there's no terrain + profile::line line; + profile::context context; + std::vector issues; + double origin{0.0}; // chainage of the start of the route + double departure{0.0}; // largest difference between the grade line and the track + double view_from{0.0}; + double view_to{100.0}; + double view_centre{0.0}; + float exaggeration{20.0f}; + bool show_terrain{true}; + bool show_track{true}; + bool show_plan{true}; + int selected{-1}; + int dragging{-1}; + int curve_grip{-1}; + bool panning{false}; + bool changed{false}; + double hover{-1.0}; + std::string status; + std::string error; + }; + profile_state m_profile; + // grade lines designed in the editor, kept in the scenery files as "//$p" comment lines + struct stored_profile + { + scene::layer_handle layer{null_handle}; + double length{0.0}; + glm::dvec3 start{0.0}, end{0.0}, middle{0.0}; // of the route, world space + double origin{0.0}; + profile::line line; + }; + std::vector m_profiles; + bool m_profiles_loaded{false}; + void profile_library_load(); + void profile_library_mark(std::vector Layers); + int profile_find(bool &Reversed) const; + bool profile_restore(); + void profile_store(); + void profile_forget(); + void profile_open_stored(std::size_t const Index); + void profile_edited(); + void render_profile_window(); + void profile_open(TTrack *From, TTrack *To); + void profile_open_run(TTrack &Track); + void profile_resample(); + void profile_recognize(); + void profile_check(); + void profile_apply(); + void profile_fit_view(); + void profile_after_undo(); + void render_profile_canvas(); + void render_profile_point(); + void draw_profile_overlay() const; + bool m_route_gizmo_using{false}; glm::mat4 m_route_gizmo{1.0f}; float m_track_snap_radius{1.0f}; diff --git a/application/editormodeprofile.cpp b/application/editormodeprofile.cpp new file mode 100644 index 000000000..8a6aa1e66 --- /dev/null +++ b/application/editormodeprofile.cpp @@ -0,0 +1,1189 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "application/editormode.h" +#include "application/editorprojection.h" + +#include "world/Track.h" +#include "scene/scenelayers.h" +#include "simulation/simulation.h" +#include "utilities/Logs.h" + +#include "imgui/imgui.h" +#include +#include +#include +#include +#include +#include + +namespace +{ + +ImU32 const kGradeLine{IM_COL32(90, 230, 110, 255)}; +ImU32 const kTangents{IM_COL32(255, 210, 60, 130)}; +ImU32 const kTrack{IM_COL32(190, 190, 190, 255)}; +ImU32 const kTerrain{IM_COL32(170, 120, 70, 255)}; +ImU32 const kGrid{IM_COL32(255, 255, 255, 22)}; +ImU32 const kLabel{IM_COL32(200, 200, 200, 200)}; +ImU32 const kSwitch{IM_COL32(160, 100, 220, 45)}; +ImU32 const kError{IM_COL32(255, 80, 70, 255)}; +ImU32 const kWarning{IM_COL32(255, 200, 60, 255)}; + +template +std::string format(char const *Format, Args... Arguments) +{ + char text[256]; + std::snprintf(text, sizeof(text), Format, Arguments...); + return text; +} + +double nice_step(double const Approximate) +{ + auto const power{std::pow(10.0, std::floor(std::log10(std::max(Approximate, 1e-6))))}; + for (auto const factor : {1.0, 2.0, 5.0, 10.0}) + if (power * factor >= Approximate) + return power * factor; + return power * 10.0; +} + +glm::dvec3 position_at(std::vector const &Samples, double const Chainage) +{ + auto const next{std::lower_bound(Samples.begin(), Samples.end(), Chainage, [](editor_track::route_sample const &Sample, double const Value) { return Sample.chainage < Value; })}; + if (next == Samples.begin()) + return Samples.front().position; + if (next == Samples.end()) + return Samples.back().position; + auto const &before{*std::prev(next)}; + auto const run{next->chainage - before.chainage}; + return run > 1e-9 ? glm::mix(before.position, next->position, (Chainage - before.chainage) / run) : before.position; +} + +double route_speed(editor_track::route const &Route) +{ + double speed{-1.0}; + for (auto const &span : Route.spans) + speed = std::max(speed, editor_track::velocity(*span.track)); + return speed > 0.0 ? speed : 100.0; +} + +std::string const kProfileMark{"//$p"}; + +double plan_distance(glm::dvec3 const &A, glm::dvec3 const &B) +{ + return std::hypot(A.x - B.x, A.z - B.z); +} + +profile::line reversed_line(profile::line Line, double const Length) +{ + std::reverse(Line.points.begin(), Line.points.end()); + for (auto &point : Line.points) + point.chainage = Length - point.chainage; + std::swap(Line.join_start, Line.join_end); + return Line; +} + +bool end_locked(profile::line const &Line, profile::context const &Context, int const Index) +{ + if (Index == 0) + return Line.join_start && Context.start_joined; + if (Index + 1 == static_cast(Line.points.size())) + return Line.join_end && Context.end_joined; + return false; +} + +bool has_errors(std::vector const &Issues) +{ + return std::any_of(Issues.begin(), Issues.end(), [](profile::issue const &Issue) { return Issue.error; }); +} + +} + +// format of the lines, coordinates in the space of the file: +// profile +// speed origin join +// norms = k*V^2> +// point +// end +void editor_mode::profile_library_load() +{ + if (m_profiles_loaded) + return; + m_profiles_loaded = true; + m_profiles.clear(); + for (auto const layer : scene::Layers.marked_layers(kProfileMark)) + { + auto const &context{scene::Layers.layer(layer).context_insert()}; + auto const height = [&](double const Local) { return context.to_world({0.0, Local, 0.0}).y; }; + std::optional current; + for (auto const &text : scene::Layers.marked(layer, kProfileMark)) + { + std::istringstream line{text}; + std::string keyword; + line >> keyword; + if (keyword == "profile") + { + stored_profile entry; + entry.layer = layer; + glm::dvec3 start, end, middle; + line >> entry.length >> start.x >> start.y >> start.z >> end.x >> end.y >> end.z >> middle.x >> middle.y >> middle.z; + if (line.fail()) + { + current.reset(); + continue; + } + entry.start = context.to_world(start); + entry.end = context.to_world(end); + entry.middle = context.to_world(middle); + current = entry; + continue; + } + if (false == current.has_value()) + continue; + auto &entry{*current}; + std::string word; + if (keyword == "speed") + { + int start{1}, end{1}; + line >> entry.line.speed >> word >> entry.origin >> word >> start >> end; + entry.line.join_start = (start != 0); + entry.line.join_end = (end != 0); + } + else if (keyword == "norms") + { + auto &norms{entry.line.norms}; + line >> norms.grade_max >> norms.grade_switch_max >> norms.radius_factor >> norms.radius_min >> norms.curve_threshold >> norms.element_min >> norms.fixed_tolerance; + } + else if (keyword == "point") + { + profile::pvi point; + int automatic{0}; + line >> point.chainage >> point.elevation >> point.radius >> automatic; + if (line.fail()) + continue; + point.elevation = height(point.elevation); + point.automatic = (automatic != 0); + entry.line.points.push_back(point); + } + else if (keyword == "end") + { + if (entry.line.points.size() >= 2 && entry.length > 0.0) + m_profiles.push_back(entry); + current.reset(); + } + } + } + if (false == m_profiles.empty()) + WriteLog("Editor: " + std::to_string(m_profiles.size()) + " vertical profile design(s) read from the scenery", logtype::generic); +} + +void editor_mode::profile_library_mark(std::vector Layers) +{ + std::sort(Layers.begin(), Layers.end()); + Layers.erase(std::unique(Layers.begin(), Layers.end()), Layers.end()); + for (auto const layer : Layers) + { + if (false == scene::Layers.valid(layer)) + continue; + auto const &context{scene::Layers.layer(layer).context_insert()}; + auto const local = [&](glm::dvec3 const &Point) { + auto const point{context.to_local(Point)}; + return format("%.4f %.4f %.4f", point.x, point.y, point.z); + }; + std::vector lines; + for (auto const &entry : m_profiles) + { + if (entry.layer != layer) + continue; + if (lines.empty()) + lines.emplace_back("# vertical profiles (grade lines) designed in the track editor, the simulation skips these lines"); + lines.push_back(format("profile %.4f ", entry.length) + local(entry.start) + ' ' + local(entry.end) + ' ' + local(entry.middle)); + lines.push_back(format("speed %.1f origin %.4f join %d %d", entry.line.speed, entry.origin, entry.line.join_start ? 1 : 0, entry.line.join_end ? 1 : 0)); + auto const &norms{entry.line.norms}; + lines.push_back(format("norms %.4f %.4f %.4f %.1f %.4f %.2f %.4f", norms.grade_max, norms.grade_switch_max, norms.radius_factor, norms.radius_min, norms.curve_threshold, norms.element_min, norms.fixed_tolerance)); + for (auto const &point : entry.line.points) + lines.push_back(format("point %.4f %.4f %.1f %d", point.chainage, context.to_local({0.0, point.elevation, 0.0}).y, point.radius, point.automatic ? 1 : 0)); + lines.emplace_back("end"); + } + scene::Layers.mark(layer, kProfileMark, std::move(lines)); + } +} + +int editor_mode::profile_find(bool &Reversed) const +{ + auto const &state{m_profile}; + Reversed = false; + if (state.samples.empty()) + return -1; + auto const start{state.samples.front().position}; + auto const end{state.samples.back().position}; + auto const middle{position_at(state.samples, state.route.length * 0.5)}; + for (std::size_t i = 0; i < m_profiles.size(); ++i) + { + auto const &entry{m_profiles[i]}; + if (std::abs(entry.length - state.route.length) > 0.5 || plan_distance(entry.middle, middle) > 0.5) + continue; + if (plan_distance(entry.start, start) <= 0.1 && plan_distance(entry.end, end) <= 0.1) + return static_cast(i); + if (plan_distance(entry.start, end) <= 0.1 && plan_distance(entry.end, start) <= 0.1) + { + Reversed = true; + return static_cast(i); + } + } + return -1; +} + +bool editor_mode::profile_restore() +{ + profile_library_load(); + auto &state{m_profile}; + bool reversed; + auto const index{profile_find(reversed)}; + if (index < 0) + return false; + auto const &entry{m_profiles[index]}; + state.line = reversed ? reversed_line(entry.line, entry.length) : entry.line; + state.origin = entry.origin; + state.selected = -1; + state.changed = false; + profile_check(); + state.status = "Design read from the scenery file " + scene::Layers.layer(entry.layer).name + format(", largest departure from the track %.3f m", state.departure); + return true; +} + +void editor_mode::profile_store() +{ + auto &state{m_profile}; + if (state.route.spans.empty() || state.samples.empty() || state.line.points.size() < 2) + return; + if (scene::Layers.empty()) + { + state.error = "The scenery wasn't opened for editing, the design can't be kept in its files"; + return; + } + profile_library_load(); + stored_profile entry; + entry.length = state.route.length; + entry.start = state.samples.front().position; + entry.end = state.samples.back().position; + entry.middle = position_at(state.samples, state.route.length * 0.5); + entry.origin = state.origin; + entry.line = state.line; + auto &points{entry.line.points}; + points.erase(std::remove_if(points.begin(), points.end(), [](profile::pvi const &Point) { return Point.joint; }), points.end()); + + bool reversed; + auto const index{profile_find(reversed)}; + if (index >= 0) + { + entry.layer = m_profiles[index].layer; + m_profiles[index] = entry; + } + else + { + auto layer{scene::Layers.resolve(state.route.spans.front().track->layer())}; + if (false == scene::Layers.valid(layer) || false == scene::Layers.accepts(layer)) + layer = scene::Layers.active(); + if (false == scene::Layers.valid(layer)) + layer = 1; + entry.layer = layer; + m_profiles.push_back(entry); + } + profile_library_mark({entry.layer}); + state.changed = false; +} + +void editor_mode::profile_forget() +{ + auto &state{m_profile}; + profile_library_load(); + bool reversed; + auto const index{profile_find(reversed)}; + if (index < 0) + return; + auto const layer{m_profiles[index].layer}; + m_profiles.erase(m_profiles.begin() + index); + profile_library_mark({layer}); + state.status = "The design will be removed from " + scene::Layers.layer(layer).name + " on save"; +} + +void editor_mode::profile_open_stored(std::size_t const Index) +{ + auto &state{m_profile}; + if (Index >= m_profiles.size()) + return; + auto const entry{m_profiles[Index]}; + auto const touching = [](glm::dvec3 const &Point) { + std::vector result; + for (auto *track : simulation::Paths.sequence()) + { + if (track == nullptr || track->m_editorremoved || false == editor_track::is_supported(*track)) + continue; + for (auto const &path : track->m_paths) + for (auto const index : {segment_data::point::start, segment_data::point::end}) + if (plan_distance(path.points[index], Point) <= 0.1 && std::abs(path.points[index].y - Point.y) < 3.0) + { + if (std::find(result.begin(), result.end(), track) == result.end()) + result.push_back(track); + } + } + return result; + }; + for (auto *from : touching(entry.start)) + for (auto *to : touching(entry.end)) + { + editor_track::route route; + std::string error; + if (false == editor_track::find_route(from, to, route, error) || std::abs(route.length - entry.length) > 0.5) + continue; + auto const samples{editor_track::sample_route(route, 1.0)}; + if (samples.empty() || plan_distance(samples.front().position, entry.start) > 0.1 || plan_distance(position_at(samples, route.length * 0.5), entry.middle) > 0.5) + continue; + profile_open(from, to); + return; + } + state.open = true; + state.error = "The route of the stored design isn't in the scenery any more (paths moved or removed)"; +} + +void editor_mode::profile_edited() +{ + m_profile.changed = true; + profile_check(); +} + +void editor_mode::profile_open(TTrack *From, TTrack *To) +{ + auto &state{m_profile}; + state.open = true; + state.status.clear(); + editor_track::route route; + if (false == editor_track::find_route(From, To, route, state.error)) + return; + state.from = state.picked_from = From; + state.to = state.picked_to = To; + state.route = std::move(route); + state.selected = -1; + profile_resample(); + if (false == profile_restore()) + profile_recognize(); + profile_fit_view(); +} + +void editor_mode::profile_open_run(TTrack &Track) +{ + auto &state{m_profile}; + state.open = true; + state.status.clear(); + state.error.clear(); + auto route{editor_track::run_route(Track, state.run_length)}; + if (route.spans.empty()) + { + state.error = "The path can't carry a profile"; + return; + } + state.route = std::move(route); + state.from = state.picked_from = state.route.spans.front().track; + state.to = state.picked_to = state.route.spans.back().track; + state.selected = -1; + profile_resample(); + if (false == profile_restore()) + profile_recognize(); + profile_fit_view(); +} + +void editor_mode::profile_resample() +{ + auto &state{m_profile}; + state.samples = editor_track::sample_route(state.route, 1.0); + auto const &samples{state.samples}; + state.terrain.assign(samples.size(), std::numeric_limits::quiet_NaN()); + for (std::size_t i = 0; i < samples.size(); ++i) + { + auto const &position{samples[i].position}; + auto *patch{terrain_at(position.x, position.z)}; + if (patch != nullptr && patch->contains(position.x, position.z)) + state.terrain[i] = patch->height_at(position.x, position.z); + } + + auto &context{state.context}; + context = {}; + context.length = state.route.length; + if (samples.empty()) + return; + for (auto const &span : state.route.spans) + if (span.track->eType != tt_Normal) + context.switches.push_back({span.from, span.to, span.track->name()}); + context.start_elevation = samples.front().position.y; + context.end_elevation = samples.back().position.y; + context.start_joined = editor_track::adjoining_grade(state.route, false, context.start_grade); + context.end_joined = editor_track::adjoining_grade(state.route, true, context.end_grade); + profile_check(); +} + +void editor_mode::profile_recognize() +{ + auto &state{m_profile}; + std::vector chainages, elevations, grades; + for (auto const &sample : state.samples) + { + chainages.push_back(sample.chainage); + elevations.push_back(sample.position.y); + grades.push_back(sample.grade); + } + auto const norms{state.line.norms}; + state.line = profile::recognize(chainages, elevations, grades, {}); + state.line.norms = norms; + state.line.speed = route_speed(state.route); + state.selected = -1; + profile_check(); + state.status = format("Grade line recognized from the track: %zu points, largest departure %.3f m", state.line.points.size(), state.departure); +} + +void editor_mode::profile_check() +{ + auto &state{m_profile}; + auto &points{state.line.points}; + // joint points come and go, the selection follows the point it was made on + struct mark + { + int *index; + double chainage; + bool joint; + }; + std::vector marks; + for (auto *index : {&state.selected, &state.dragging, &state.curve_grip}) + if (*index >= 0 && *index < static_cast(points.size())) + marks.push_back({index, points[*index].chainage, points[*index].joint}); + profile::complete(state.line, state.context); + for (auto const &mark : marks) + { + int best{-1}; + double distance{std::numeric_limits::max()}; + for (int i = 0; i < static_cast(points.size()); ++i) + if (points[i].joint == mark.joint && std::abs(points[i].chainage - mark.chainage) < distance) + { + distance = std::abs(points[i].chainage - mark.chainage); + best = i; + } + *mark.index = (mark.joint || distance < 1e-6) ? best : -1; + } + state.issues = profile::check(state.line, state.context); + state.departure = 0.0; + for (auto const &sample : state.samples) + state.departure = std::max(state.departure, std::abs(profile::elevation(state.line, sample.chainage) - sample.position.y)); +} + +void editor_mode::profile_fit_view() +{ + auto &state{m_profile}; + auto const length{std::max(1.0, state.route.length)}; + state.view_from = -0.02 * length; + state.view_to = length * 1.02; + state.exaggeration = 0.0f; +} + +void editor_mode::profile_apply() +{ + auto &state{m_profile}; + state.status.clear(); + state.error.clear(); + if (state.route.spans.empty() || state.line.points.size() < 2) + return; + if (has_errors(state.issues)) + { + state.error = "Correct the errors to apply the grade line"; + return; + } + auto const line{state.line}; + std::vector> states; + std::vector created; + auto const gaps{editor_track::apply_profile( + state.route, [&](double const Chainage) { return profile::elevation(line, Chainage); }, [&](double const Chainage) { return profile::grade(line, Chainage); }, profile::breaks(line), states, created)}; + auto const changed{states.size()}; + auto const added{created.size()}; + push_track_snapshot(std::move(states), std::move(created)); + state.from = state.route.spans.front().track; + state.to = state.route.spans.back().track; + profile_resample(); + profile_store(); + state.status = format("Grade line applied: %zu paths changed, %zu added, largest departure %.3f m", changed, added, state.departure); + if (false == scene::Layers.empty()) + state.status += "\nThe paths and the design (//$p lines) go to the scenery files on save"; + if (false == gaps.empty()) + state.status += "\nSwitch ends off the adjoining paths, to be corrected:"; + for (auto const &gap : gaps) + state.status += format("\n %s -> %s: %+.3f m", gap.track->name().c_str(), gap.neighbour->name().c_str(), gap.gap); + WriteLog("Editor: vertical profile - " + state.status, logtype::generic); +} + +void editor_mode::profile_after_undo() +{ + auto &state{m_profile}; + if (state.route.spans.empty()) + return; + auto const removed = [](TTrack const *Track) { return Track == nullptr || Track->m_editorremoved; }; + if (removed(state.from) || removed(state.to)) + { + state.from = state.picked_from; + state.to = state.picked_to; + } + std::string error; + if (removed(state.from) || removed(state.to) || false == editor_track::find_route(state.from, state.to, state.route, error)) + { + state.route = {}; + state.samples.clear(); + state.selected = state.dragging = state.curve_grip = -1; + return; + } + profile_resample(); +} + +void editor_mode::render_profile_window() +{ + auto &state{m_profile}; + if (false == state.open) + return; + ImGui::SetNextWindowSize(ImVec2(960.0f, 640.0f), ImGuiCond_FirstUseEver); + if (false == ImGui::Begin("Vertical profile###trackprofile", &state.open)) + { + ImGui::End(); + return; + } + auto *selected{selected_track()}; + if (ImGui::Button("Along the line from the selected path") && selected != nullptr) + profile_open_run(*selected); + ImGui::SameLine(); + ImGui::PushItemWidth(70.0f); + ImGui::InputDouble("m each way##profilerun", &state.run_length, 0.0, 0.0, "%.0f"); + ImGui::PopItemWidth(); + state.run_length = std::clamp(state.run_length, 10.0, 50000.0); + ImGui::SameLine(); + if (ImGui::Button("Start: selected path") && selected != nullptr) + state.picked_from = selected; + ImGui::SameLine(); + if (ImGui::Button("End: selected path") && selected != nullptr && state.picked_from != nullptr) + profile_open(state.picked_from, selected); + profile_library_load(); + if (false == m_profiles.empty() && ImGui::TreeNode("##profilestored", "Designs kept in the scenery (%zu)", m_profiles.size())) + { + for (std::size_t i = 0; i < m_profiles.size(); ++i) + { + auto const &entry{m_profiles[i]}; + ImGui::PushID(static_cast(i)); + if (ImGui::SmallButton("Open")) + profile_open_stored(i); + ImGui::SameLine(); + ImGui::Text("%s %.1f m, %zu points, from (%.1f, %.1f) to (%.1f, %.1f)", scene::Layers.layer(entry.layer).name.c_str(), entry.length, entry.line.points.size(), entry.start.x, entry.start.z, entry.end.x, entry.end.z); + ImGui::PopID(); + } + ImGui::TreePop(); + } + if (state.route.spans.empty()) + { + ImGui::TextDisabled("Select a path in the viewport, then build the route along the line, or set its start and end paths (switches are passed through)"); + if (state.picked_from != nullptr) + ImGui::Text("Start: %s", state.picked_from->name().c_str()); + if (false == state.error.empty()) + ImGui::TextColored(ImVec4(1.0f, 0.4f, 0.3f, 1.0f), "%s", state.error.c_str()); + ImGui::End(); + return; + } + ImGui::Text("Route: %zu paths, %.2f m, %s ... %s", state.route.spans.size(), state.route.length, state.route.spans.front().track->name().c_str(), state.route.spans.back().track->name().c_str()); + { + bool reversed; + auto const stored{profile_find(reversed)}; + if (stored >= 0) + { + ImGui::TextDisabled("Design kept in %s%s", scene::Layers.layer(m_profiles[stored].layer).name.c_str(), state.changed ? ", changes go there on save" : ""); + ImGui::SameLine(); + if (ImGui::SmallButton("Forget the design")) + profile_forget(); + } + else if (state.changed) + ImGui::TextDisabled("The design goes to the scenery file of the route on save"); + } + + auto &line{state.line}; + bool changed{false}; + ImGui::PushItemWidth(90.0f); + ImGui::InputDouble("Chainage of the start (m)", &state.origin, 0.0, 0.0, "%.2f"); + ImGui::SameLine(); + changed |= ImGui::InputDouble("Design speed (km/h)", &line.speed, 0.0, 0.0, "%.0f"); + ImGui::SameLine(); + ImGui::SliderFloat("Exaggeration##profile", &state.exaggeration, 1.0f, 500.0f, "1:%.0f", 2.0f); + ImGui::PopItemWidth(); + line.speed = std::max(1.0, line.speed); + ImGui::Checkbox("Track", &state.show_track); + ImGui::SameLine(); + ImGui::Checkbox("Terrain", &state.show_terrain); + ImGui::SameLine(); + ImGui::Checkbox("Plan curvature", &state.show_plan); + ImGui::SameLine(); + if (ImGui::Button("Fit the view")) + profile_fit_view(); + ImGui::SameLine(); + if (ImGui::Button("Recognize from the track")) + { + profile_recognize(); + state.changed = true; + } + ImGui::SameLine(); + if (ImGui::Button("Apply to the scenery")) + profile_apply(); + if (ImGui::TreeNode("Limits##profile")) + { + auto &norms{line.norms}; + ImGui::PushItemWidth(90.0f); + changed |= ImGui::InputDouble("Maximum grade (per mille)", &norms.grade_max, 0.0, 0.0, "%.2f"); + changed |= ImGui::InputDouble("Maximum grade over switches (per mille)", &norms.grade_switch_max, 0.0, 0.0, "%.2f"); + changed |= ImGui::InputDouble("Vertical curve R >= k*V^2, k", &norms.radius_factor, 0.0, 0.0, "%.2f"); + changed |= ImGui::InputDouble("Vertical curve R min (m)", &norms.radius_min, 0.0, 0.0, "%.0f"); + changed |= ImGui::InputDouble("Vertical curve needed above a change of (per mille)", &norms.curve_threshold, 0.0, 0.0, "%.2f"); + changed |= ImGui::InputDouble("Constant grade between curves at least (m)", &norms.element_min, 0.0, 0.0, "%.0f"); + changed |= ImGui::InputDouble("Tolerance at fixed points (m)", &norms.fixed_tolerance, 0.0, 0.0, "%.3f"); + ImGui::PopItemWidth(); + if (ImGui::SmallButton("Automatic R at all points")) + { + for (auto &point : line.points) + point.automatic = true; + changed = true; + } + ImGui::TextDisabled("Required R for %.0f km/h: %.0f m", line.speed, profile::required_radius(line)); + ImGui::TreePop(); + } + if (state.context.start_joined) + changed |= ImGui::Checkbox("Join the adjoining track at the start", &line.join_start); + if (state.context.start_joined && state.context.end_joined) + ImGui::SameLine(); + if (state.context.end_joined) + changed |= ImGui::Checkbox("Join the adjoining track at the end", &line.join_end); + if ((state.context.start_joined || state.context.end_joined) && ImGui::IsItemHovered()) + ImGui::SetTooltip("Keeps the elevation of the joint and takes over the grade of the adjoining track,\n" + "with a vertical curve which starts right at the joint"); + if (changed) + profile_edited(); + + render_profile_canvas(); + + ImGui::Columns(2, "##profilecolumns", true); + render_profile_point(); + ImGui::NextColumn(); + ImGui::Text("Largest departure from the track: %.3f m", state.departure); + ImGui::BeginChild("##profileissues", ImVec2(0.0f, 0.0f), false); + if (state.issues.empty()) + ImGui::TextColored(ImVec4(0.4f, 0.9f, 0.4f, 1.0f), "The grade line meets the limits"); + for (std::size_t i = 0; i < state.issues.size(); ++i) + { + auto const &issue{state.issues[i]}; + ImGui::PushID(static_cast(i)); + ImGui::PushStyleColor(ImGuiCol_Text, issue.error ? ImVec4(1.0f, 0.4f, 0.3f, 1.0f) : ImVec4(1.0f, 0.8f, 0.3f, 1.0f)); + if (ImGui::Selectable(issue.text.c_str())) + { + if (issue.point >= 0) + state.selected = issue.point; + auto const half{(state.view_to - state.view_from) * 0.5}; + state.view_from = issue.chainage - half; + state.view_to = issue.chainage + half; + } + ImGui::PopStyleColor(); + ImGui::PopID(); + } + if (false == state.status.empty()) + ImGui::TextWrapped("%s", state.status.c_str()); + if (false == state.error.empty()) + ImGui::TextColored(ImVec4(1.0f, 0.4f, 0.3f, 1.0f), "%s", state.error.c_str()); + ImGui::EndChild(); + ImGui::Columns(1); + ImGui::End(); +} + +void editor_mode::render_profile_point() +{ + auto &state{m_profile}; + auto &points{state.line.points}; + bool changed{false}; + auto const count{static_cast(points.size())}; + if (state.selected >= count) + state.selected = -1; + if (state.selected < 0) + { + ImGui::TextDisabled("LMB: select and drag a point (Ctrl: height only, Shift: keep the grade before)\n" + "Green grip on a curve: drag to set R Double click on the line: insert a point\n" + "Del: remove the point Wheel: zoom Ctrl+wheel: exaggeration RMB/MMB: pan"); + } + else if (points[state.selected].joint) + { + auto const index{state.selected}; + auto const &point{points[index]}; + auto const change{(profile::grade_after(state.line, index) - profile::grade_after(state.line, index - 1)) * 1000.0}; + ImGui::Text("Point %d: joint with the adjoining track (placed automatically)", index + 1); + ImGui::Text("km %s H %.3f R %.0f", profile::format_chainage(point.chainage + state.origin).c_str(), point.elevation, point.radius); + ImGui::Text("Grade %+.3f -> %+.3f per mille (%s)", profile::grade_after(state.line, index - 1) * 1000.0, profile::grade_after(state.line, index) * 1000.0, change > 0.0 ? "sag" : "crest"); + ImGui::TextDisabled("Moves with the neighbouring point; untick the joining to edit the end freely"); + } + else + { + auto const index{state.selected}; + auto &point{points[index]}; + bool const end{index == 0 || index == count - 1}; + bool const locked{end_locked(state.line, state.context, index)}; + ImGui::Text("Point %d%s", index + 1, locked ? " (end, joined to the adjoining track)" : end ? " (end of the route)" : ""); + ImGui::PushItemWidth(110.0f); + auto chainage{point.chainage + state.origin}; + if (ImGui::InputDouble("Chainage (m)", &chainage, 0.0, 0.0, "%.2f") && false == end) + { + point.chainage = std::clamp(chainage - state.origin, points[index - 1].chainage + 0.5, points[index + 1].chainage - 0.5); + changed = true; + } + ImGui::SameLine(); + ImGui::TextDisabled("km %s", profile::format_chainage(point.chainage + state.origin).c_str()); + changed |= ImGui::InputDouble("Elevation (m)", &point.elevation, 0.0, 0.0, "%.3f", locked ? ImGuiInputTextFlags_ReadOnly : 0); + if (index > 0 && false == locked) + { + auto grade{profile::grade_after(state.line, index - 1) * 1000.0}; + if (ImGui::InputDouble("Grade from the previous (per mille)", &grade, 0.0, 0.0, "%.3f")) + { + point.elevation = points[index - 1].elevation + grade / 1000.0 * (point.chainage - points[index - 1].chainage); + changed = true; + } + } + if (index + 1 < count) + { + auto grade{profile::grade_after(state.line, index) * 1000.0}; + if (ImGui::InputDouble("Grade to the next (per mille)", &grade, 0.0, 0.0, "%.3f")) + { + points[index + 1].elevation = point.elevation + grade / 1000.0 * (points[index + 1].chainage - point.chainage); + changed = true; + } + } + if (false == end) + { + if (ImGui::InputDouble("Vertical curve R (m, 0: none)", &point.radius, 0.0, 0.0, "%.0f")) + { + point.automatic = false; + changed = true; + } + point.radius = std::max(0.0, point.radius); + ImGui::SameLine(); + changed |= ImGui::Checkbox("Auto", &point.automatic); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("R follows the limits: the required radius where the change of grade needs a curve"); + auto const change{(profile::grade_after(state.line, index) - profile::grade_after(state.line, index - 1)) * 1000.0}; + auto const tangent{point.radius * std::abs(change) / 2000.0}; + ImGui::Text("Change of grade %+.3f per mille, %s", change, change > 0.0 ? "sag" : "crest"); + if (point.radius > 0.0) + ImGui::Text("Tangent T %.2f m, sagitta f %.3f m", tangent, tangent * tangent / (2.0 * point.radius)); + } + ImGui::PopItemWidth(); + if (index + 1 < count && ImGui::SmallButton("Insert a point halfway to the next")) + { + profile::pvi inserted; + inserted.chainage = (point.chainage + points[index + 1].chainage) * 0.5; + inserted.elevation = (point.elevation + points[index + 1].elevation) * 0.5; + points.insert(points.begin() + index + 1, inserted); + state.selected = index + 1; + changed = true; + } + if (false == end) + { + ImGui::SameLine(); + if (ImGui::SmallButton("Remove the point")) + { + points.erase(points.begin() + index); + state.selected = -1; + changed = true; + } + } + } + ImGui::BeginChild("##profilepoints", ImVec2(0.0f, 0.0f), true); + for (int i = 0; i < static_cast(points.size()); ++i) + { + auto const &point{points[i]}; + auto const label{format("%2d km %s H %.3f %s##point%d", i + 1, profile::format_chainage(point.chainage + state.origin).c_str(), point.elevation, point.radius > 0.0 ? format("R %.0f%s", point.radius, point.joint ? " joint" : point.automatic ? " auto" : "").c_str() : "", i)}; + if (ImGui::Selectable(label.c_str(), state.selected == i)) + state.selected = (state.selected == i ? -1 : i); + } + ImGui::EndChild(); + if (changed) + profile_edited(); +} + +void editor_mode::render_profile_canvas() +{ + auto &state{m_profile}; + auto &line{state.line}; + auto &points{line.points}; + auto const &samples{state.samples}; + ImGuiIO const &io{ImGui::GetIO()}; + + auto const available{ImGui::GetContentRegionAvail()}; + ImVec2 const size{std::max(200.0f, available.x), std::max(240.0f, available.y * 0.6f)}; + ImVec2 const corner{ImGui::GetCursorScreenPos()}; + ImGui::InvisibleButton("##profilecanvas", size); + bool const hovered{ImGui::IsItemHovered()}; + ImDrawList *draw{ImGui::GetWindowDrawList()}; + + float const strip{state.show_plan ? 44.0f : 0.0f}; + float const top{18.0f}; + float const height{size.y - strip - top}; + auto const width{std::max(1.0, state.view_to - state.view_from)}; + auto const across{width / size.x}; + if (state.exaggeration <= 0.0f) + { + double low{std::numeric_limits::max()}, high{std::numeric_limits::lowest()}; + for (auto const &sample : samples) + { + low = std::min(low, sample.position.y); + high = std::max(high, sample.position.y); + } + for (auto const &point : points) + { + low = std::min(low, point.elevation); + high = std::max(high, point.elevation); + } + if (low > high) + low = high = 0.0; + auto const range{std::max(1.0, (high - low) * 1.3)}; + state.exaggeration = static_cast(std::clamp(across / (range / height), 1.0, 500.0)); + state.view_centre = (low + high) * 0.5; + } + auto const vertical{across / state.exaggeration}; + auto const x_of = [&](double const Chainage) { return corner.x + static_cast((Chainage - state.view_from) / across); }; + auto const y_of = [&](double const Height) { return corner.y + top + height * 0.5f - static_cast((Height - state.view_centre) / vertical); }; + auto const chainage_of = [&](float const X) { return state.view_from + (X - corner.x) * across; }; + auto const height_of = [&](float const Y) { return state.view_centre - (Y - corner.y - top - height * 0.5f) * vertical; }; + ImVec2 const mouse{io.MousePos}; + + if (hovered && io.MouseWheel != 0.0f) + { + if (io.KeyCtrl) + state.exaggeration = std::clamp(state.exaggeration * std::pow(1.2f, io.MouseWheel), 1.0f, 500.0f); + else + { + auto const anchor{chainage_of(mouse.x)}; + auto const factor{std::pow(0.8, static_cast(io.MouseWheel))}; + state.view_from = anchor - (anchor - state.view_from) * factor; + state.view_to = anchor + (state.view_to - anchor) * factor; + } + } + if (hovered && (ImGui::IsMouseClicked(1) || ImGui::IsMouseClicked(2))) + state.panning = true; + if (state.panning) + { + if (ImGui::IsMouseDown(1) || ImGui::IsMouseDown(2)) + { + state.view_from -= io.MouseDelta.x * across; + state.view_to -= io.MouseDelta.x * across; + state.view_centre += io.MouseDelta.y * vertical; + } + else + state.panning = false; + } + + auto const curves{profile::curves(line)}; + auto const hit_point = [&]() { + int hit{-1}; + float best{64.0f}; + for (int i = 0; i < static_cast(points.size()); ++i) + { + if (points[i].joint) + continue; + auto const dx{x_of(points[i].chainage) - mouse.x}; + auto const dy{y_of(points[i].elevation) - mouse.y}; + if (dx * dx + dy * dy < best) + { + best = dx * dx + dy * dy; + hit = i; + } + } + return hit; + }; + auto const hit_grip = [&]() { + for (auto const &c : curves) + { + if (points[c.point].joint) + continue; + auto const chainage{points[c.point].chainage}; + auto const dx{x_of(chainage) - mouse.x}; + auto const dy{y_of(profile::elevation(line, chainage)) - mouse.y}; + if (dx * dx + dy * dy < 64.0f) + return static_cast(c.point); + } + return -1; + }; + bool changed{false}; + if (hovered && ImGui::IsMouseClicked(0)) + { + auto const point{hit_point()}; + auto const grip{point < 0 ? hit_grip() : -1}; + if (point >= 0) + state.selected = state.dragging = point; + else if (grip >= 0) + state.selected = state.curve_grip = grip; + else + state.selected = -1; + } + if (hovered && ImGui::IsMouseDoubleClicked(0) && state.dragging < 0 && state.curve_grip < 0 && points.size() >= 2) + { + auto const chainage{chainage_of(mouse.x)}; + if (chainage > points.front().chainage + 0.5 && chainage < points.back().chainage - 0.5 && std::abs(y_of(profile::elevation(line, chainage)) - mouse.y) < 12.0f) + { + std::size_t index{0}; + while (index + 2 < points.size() && points[index + 1].chainage < chainage) + ++index; + profile::pvi inserted; + inserted.chainage = std::round(chainage * 100.0) / 100.0; + inserted.elevation = points[index].elevation + profile::grade_after(line, index) * (inserted.chainage - points[index].chainage); + points.insert(points.begin() + index + 1, inserted); + state.selected = static_cast(index) + 1; + changed = true; + } + } + if (state.dragging >= 0 && state.dragging < static_cast(points.size())) + { + if (ImGui::IsMouseDown(0)) + { + auto const index{state.dragging}; + auto &point{points[index]}; + bool const end{index == 0 || index + 1 == static_cast(points.size())}; + auto const incoming{index > 0 ? profile::grade_after(line, index - 1) : 0.0}; + if (false == end && false == io.KeyCtrl) + point.chainage = std::clamp(std::round(chainage_of(mouse.x) * 100.0) / 100.0, points[index - 1].chainage + 0.5, points[index + 1].chainage - 0.5); + if (end_locked(line, state.context, index)) + ; + else if (io.KeyShift && index > 0) + point.elevation = points[index - 1].elevation + incoming * (point.chainage - points[index - 1].chainage); + else + point.elevation = std::round(height_of(mouse.y) * 1000.0) / 1000.0; + changed = true; + } + else + state.dragging = -1; + } + else + state.dragging = -1; + if (state.curve_grip > 0 && state.curve_grip + 1 < static_cast(points.size())) + { + if (ImGui::IsMouseDown(0)) + { + auto const sagitta{height_of(mouse.y) - points[state.curve_grip].elevation}; + points[state.curve_grip].radius = std::max(10.0, std::round(profile::radius_for_sagitta(line, state.curve_grip, sagitta) / 10.0) * 10.0); + points[state.curve_grip].automatic = false; + changed = true; + } + else + state.curve_grip = -1; + } + else + state.curve_grip = -1; + if ((hovered || ImGui::IsWindowFocused()) && state.selected > 0 && state.selected + 1 < static_cast(points.size()) && false == points[state.selected].joint && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Delete))) + { + points.erase(points.begin() + state.selected); + state.selected = -1; + changed = true; + } + if (changed) + profile_edited(); + state.hover = hovered ? chainage_of(mouse.x) : -1.0; + + ImVec2 const bottomright{corner.x + size.x, corner.y + size.y}; + draw->AddRectFilled(corner, bottomright, IM_COL32(22, 24, 28, 255)); + draw->PushClipRect(corner, bottomright, true); + auto const plotbottom{corner.y + top + height}; + + auto const step{nice_step(across * 110.0)}; + for (auto s = std::ceil((state.view_from + state.origin) / step) * step - state.origin; s <= state.view_to; s += step) + { + auto const x{x_of(s)}; + draw->AddLine(ImVec2(x, corner.y + top), ImVec2(x, plotbottom), kGrid); + draw->AddText(ImVec2(x + 2.0f, corner.y + 2.0f), kLabel, profile::format_chainage(s + state.origin).c_str()); + } + auto const heightstep{nice_step(vertical * 45.0)}; + for (auto h = std::floor(height_of(plotbottom) / heightstep) * heightstep; h <= height_of(corner.y + top); h += heightstep) + { + auto const y{y_of(h)}; + draw->AddLine(ImVec2(corner.x, y), ImVec2(bottomright.x, y), kGrid); + draw->AddText(ImVec2(corner.x + 2.0f, y - 14.0f), kLabel, format("%.1f", h).c_str()); + } + for (auto const &zone : state.context.switches) + { + draw->AddRectFilled(ImVec2(x_of(zone.from), corner.y + top), ImVec2(std::max(x_of(zone.to), x_of(zone.from) + 2.0f), plotbottom), kSwitch); + draw->AddText(ImVec2(x_of(zone.from) + 2.0f, corner.y + top + 2.0f), IM_COL32(200, 160, 255, 220), zone.name.c_str()); + } + + auto const polyline = [&](auto const &Height, ImU32 const Colour, float const Thickness) { + ImVec2 previous{}; + bool open{false}; + float lastx{-1e9f}; + for (std::size_t i = 0; i < samples.size(); ++i) + { + auto const x{x_of(samples[i].chainage)}; + auto const h{Height(i)}; + if (std::isnan(h) || x < corner.x - 50.0f || x > bottomright.x + 50.0f) + { + open = false; + continue; + } + if (open && x - lastx < 1.0f && i + 1 < samples.size()) + continue; + ImVec2 const next{x, y_of(h)}; + if (open) + draw->AddLine(previous, next, Colour, Thickness); + previous = next; + lastx = x; + open = true; + } + }; + if (state.show_terrain) + polyline([&](std::size_t const I) { return state.terrain[I]; }, kTerrain, 1.5f); + if (state.show_track) + polyline([&](std::size_t const I) { return samples[I].position.y; }, kTrack, 1.5f); + + for (std::size_t i = 0; i + 1 < points.size(); ++i) + draw->AddLine(ImVec2(x_of(points[i].chainage), y_of(points[i].elevation)), ImVec2(x_of(points[i + 1].chainage), y_of(points[i + 1].elevation)), kTangents, 1.0f); + { + auto const from{std::max(points.front().chainage, chainage_of(corner.x))}; + auto const to{std::min(points.back().chainage, chainage_of(bottomright.x))}; + ImVec2 previous{x_of(from), y_of(profile::elevation(line, from))}; + for (auto x = previous.x + 2.0f; x <= x_of(to) + 2.0f; x += 2.0f) + { + auto const chainage{std::min(to, chainage_of(x))}; + ImVec2 const next{x_of(chainage), y_of(profile::elevation(line, chainage))}; + draw->AddLine(previous, next, kGradeLine, 2.5f); + previous = next; + } + } + for (std::size_t i = 0; i + 1 < points.size(); ++i) + { + auto const middle{(points[i].chainage + points[i + 1].chainage) * 0.5}; + auto const x{x_of(middle)}; + if (x_of(points[i + 1].chainage) - x_of(points[i].chainage) < 70.0f) + continue; + auto const text{format("%+.2f o/oo L %.1f", profile::grade_after(line, i) * 1000.0, points[i + 1].chainage - points[i].chainage)}; + draw->AddText(ImVec2(x - 40.0f, y_of(profile::elevation(line, middle)) - 30.0f), kGradeLine, text.c_str()); + } + for (auto const &c : curves) + { + for (auto const at : {c.start, c.end}) + { + auto const y{y_of(profile::elevation(line, at))}; + draw->AddLine(ImVec2(x_of(at), y - 7.0f), ImVec2(x_of(at), y + 7.0f), kGradeLine, 1.5f); + } + auto const chainage{points[c.point].chainage}; + ImVec2 const grip{x_of(chainage), y_of(profile::elevation(line, chainage))}; + draw->AddCircleFilled(grip, 4.5f, IM_COL32(60, 230, 90, 255), 4); + if (static_cast(c.point) == state.curve_grip) + draw->AddCircle(grip, 9.0f, IM_COL32(255, 255, 255, 255), 12, 2.0f); + draw->AddText(ImVec2(grip.x + 7.0f, grip.y + 4.0f), IM_COL32(60, 230, 90, 255), format("R %.0f", points[c.point].radius).c_str()); + } + for (int i = 0; i < static_cast(points.size()); ++i) + { + ImVec2 const at{x_of(points[i].chainage), y_of(points[i].elevation)}; + if (i == 0 || i + 1 == static_cast(points.size())) + draw->AddRectFilled(ImVec2(at.x - 5.0f, at.y - 5.0f), ImVec2(at.x + 5.0f, at.y + 5.0f), IM_COL32(70, 140, 255, 255)); + else if (points[i].joint) + draw->AddQuadFilled(ImVec2(at.x, at.y - 6.0f), ImVec2(at.x + 6.0f, at.y), ImVec2(at.x, at.y + 6.0f), ImVec2(at.x - 6.0f, at.y), IM_COL32(90, 210, 230, 255)); + else + draw->AddCircleFilled(at, 5.5f, IM_COL32(255, 210, 60, 255)); + if (i == state.selected) + draw->AddCircle(at, 10.0f, IM_COL32(255, 255, 255, 255), 16, 2.0f); + draw->AddText(ImVec2(at.x + 7.0f, at.y - 18.0f), IM_COL32(255, 210, 60, 255), format("%d %.3f", i + 1, points[i].elevation).c_str()); + } + for (auto const &issue : state.issues) + { + auto const x{x_of(issue.chainage)}; + auto const colour{issue.error ? kError : kWarning}; + draw->AddTriangleFilled(ImVec2(x - 5.0f, corner.y + top), ImVec2(x + 5.0f, corner.y + top), ImVec2(x, corner.y + top + 8.0f), colour); + } + if (state.show_plan && false == samples.empty()) + { + auto const middle{plotbottom + strip * 0.5f}; + draw->AddLine(ImVec2(corner.x, plotbottom), ImVec2(bottomright.x, plotbottom), IM_COL32(255, 255, 255, 60)); + draw->AddLine(ImVec2(corner.x, middle), ImVec2(bottomright.x, middle), IM_COL32(255, 255, 255, 40)); + ImVec2 previous{}; + bool open{false}; + float lastx{-1e9f}; + for (std::size_t i = 0; i < samples.size(); ++i) + { + auto const x{x_of(samples[i].chainage)}; + if (x < corner.x - 50.0f || x > bottomright.x + 50.0f || (open && x - lastx < 1.0f)) + continue; + ImVec2 const next{x, middle - std::clamp(static_cast(samples[i].curvature * 300.0 * strip * 0.4), -strip * 0.45f, strip * 0.45f)}; + if (open) + draw->AddLine(previous, next, IM_COL32(120, 190, 255, 255), 1.5f); + previous = next; + lastx = x; + open = true; + } + draw->AddText(ImVec2(corner.x + 2.0f, plotbottom + 1.0f), kLabel, "plan: curvature (up: left)"); + } + if (hovered && state.hover >= 0.0 && state.hover <= state.route.length && false == samples.empty()) + { + auto const x{x_of(state.hover)}; + draw->AddLine(ImVec2(x, corner.y + top), ImVec2(x, bottomright.y), IM_COL32(255, 255, 255, 90)); + auto const designed{profile::elevation(line, state.hover)}; + auto const existing{editor_track::sampled_elevation(samples, state.hover)}; + ImGui::BeginTooltip(); + ImGui::Text("km %s", profile::format_chainage(state.hover + state.origin).c_str()); + ImGui::Text("Grade line %.3f m, %+.2f per mille", designed, profile::grade(line, state.hover) * 1000.0); + ImGui::Text("Track %.3f m (%+.3f), %+.2f per mille", existing, existing - designed, editor_track::sampled_grade(samples, state.hover) * 1000.0); + auto const next{std::lower_bound(samples.begin(), samples.end(), state.hover, [](editor_track::route_sample const &Sample, double const Value) { return Sample.chainage < Value; })}; + auto const index{static_cast(std::distance(samples.begin(), std::min(next, std::prev(samples.end()))))}; + if (index < state.terrain.size() && false == std::isnan(state.terrain[index])) + ImGui::Text("Terrain %.3f m, %s %.2f m", state.terrain[index], designed > state.terrain[index] ? "fill" : "cut", std::abs(designed - state.terrain[index])); + auto const &span{state.route.spans[samples[index].span]}; + ImGui::TextDisabled("%s%s", span.track->name().c_str(), span.track->eType != tt_Normal ? " (switch, tilted as a whole with its branch)" : ""); + ImGui::EndTooltip(); + } + draw->PopClipRect(); +} + +void editor_mode::draw_profile_overlay() const +{ + auto const &state{m_profile}; + if (false == state.open || state.samples.size() < 2) + return; + screen_projection const projection; + ImDrawList *drawlist{ImGui::GetBackgroundDrawList()}; + auto const &samples{state.samples}; + glm::dvec3 previous{samples.front().position}; + glm::dvec3 designedprevious{previous.x, profile::elevation(state.line, 0.0), previous.z}; + for (std::size_t i = 1; i < samples.size(); ++i) + { + if (glm::distance(samples[i].position, previous) < 2.0 && i + 1 < samples.size()) + continue; + auto const &next{samples[i].position}; + projection.line(drawlist, previous, next, IM_COL32(255, 150, 40, 200), 2.5f); + glm::dvec3 const designed{next.x, profile::elevation(state.line, samples[i].chainage), next.z}; + if (std::abs(designed.y - next.y) > 0.01 || std::abs(designedprevious.y - previous.y) > 0.01) + projection.line(drawlist, designedprevious, designed, kGradeLine, 2.0f); + previous = next; + designedprevious = designed; + } + auto const &points{state.line.points}; + for (int i = 0; i < static_cast(points.size()); ++i) + { + auto position{position_at(samples, points[i].chainage)}; + position.y = profile::elevation(state.line, points[i].chainage); + ImVec2 screen; + if (false == projection.project(position, screen)) + continue; + drawlist->AddCircleFilled(screen, i == state.selected ? 7.0f : 5.0f, IM_COL32(255, 210, 60, 255)); + drawlist->AddText(ImVec2(screen.x + 8.0f, screen.y - 16.0f), IM_COL32(255, 210, 60, 255), format("%d", i + 1).c_str()); + } + if (state.hover >= 0.0 && state.hover <= state.route.length) + { + ImVec2 screen; + if (projection.project(position_at(samples, state.hover), screen)) + drawlist->AddCircle(screen, 12.0f, IM_COL32(255, 255, 255, 230), 16, 2.5f); + } +} diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 8ebd64f96..ed5ecd308 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -11,6 +11,7 @@ http: #include "stdafx.h" #include "application/editormode.h" #include "application/editoruilayer.h" +#include "application/editorprojection.h" #include "utilities/Globals.h" #include "rendering/renderer.h" @@ -31,54 +32,6 @@ http: namespace { -class screen_projection -{ - public: - screen_projection() - { - ImGuiIO const &io = ImGui::GetIO(); - m_size = io.DisplaySize; - m_camera = GfxRenderer->Camera_Position(); - float const aspect = m_size.y > 0.0f ? m_size.x / m_size.y : 1.0f; - m_viewprojection = editor_mode::projection_matrix(aspect) * GfxRenderer->Camera_View_Matrix(); - } - - glm::vec4 clip(glm::dvec3 const &Point) const - { - return m_viewprojection * glm::vec4(glm::vec3(Point - m_camera), 1.0f); - } - ImVec2 screen(glm::vec4 const &Clip) const - { - return ImVec2((Clip.x / Clip.w * 0.5f + 0.5f) * m_size.x, (0.5f - Clip.y / Clip.w * 0.5f) * m_size.y); - } - bool project(glm::dvec3 const &Point, ImVec2 &Screen) const - { - auto const c = clip(Point); - if (c.w < kNear) - return false; - Screen = screen(c); - return true; - } - void line(ImDrawList *Drawlist, glm::dvec3 const &A, glm::dvec3 const &B, ImU32 const Color, float const Thickness) const - { - glm::vec4 a = clip(A); - glm::vec4 b = clip(B); - if (a.w < kNear && b.w < kNear) - return; - if (a.w < kNear) - a = glm::mix(a, b, (kNear - a.w) / (b.w - a.w)); - else if (b.w < kNear) - b = glm::mix(b, a, (kNear - b.w) / (a.w - b.w)); - Drawlist->AddLine(screen(a), screen(b), Color, Thickness); - } - - private: - static constexpr float kNear{0.1f}; - ImVec2 m_size; - glm::dvec3 m_camera; - glm::mat4 m_viewprojection; -}; - glm::dvec3 path_point(segment_data const &Path, double const T) { auto const &p0 = Path.points[segment_data::point::start]; @@ -452,6 +405,7 @@ void editor_mode::restore_track_snapshot(EditorSnapshot const &Snapshot, std::ve m_node = tracks.empty() || tracks.front()->m_editorremoved ? nullptr : tracks.front(); ui()->set_node(m_node); straight_refresh(); + profile_after_undo(); } void editor_mode::render_track_ui() @@ -459,6 +413,13 @@ void editor_mode::render_track_ui() ImGui::TextDisabled("LMB on a path opens its editor: straight, curve or switch"); if (ImGui::Button("Open the editor window")) m_track_window_open = true; + ImGui::SameLine(); + if (ImGui::Button("Vertical profile (grade line)")) + { + if (auto *track{selected_track()}; track != nullptr && m_profile.route.spans.empty()) + profile_open_run(*track); + m_profile.open = true; + } if (ImGui::CollapsingHeader("Straights in the scenery")) render_straights_ui(); render_switch_ui(); @@ -507,6 +468,8 @@ void editor_mode::render_track_window() if (ImGui::SmallButton("Edit points and parameters of the single path")) m_track_tab = track_tab::path; } + if (ImGui::SmallButton("Vertical profile along this line") && selected_track() != nullptr) + profile_open_run(*selected_track()); ImGui::End(); } @@ -990,6 +953,7 @@ void editor_mode::route_apply() if (std::none_of(states.begin(), states.end(), [&](auto const &Entry) { return Entry.first == track; })) states.emplace_back(track, editor_track::capture(*track)); auto pieces{alignment::pieces(route.result, route.design, chain.tracks.size())}; + editor_track::keep_heights(chain, pieces); auto relaid{editor_track::relay(chain, pieces)}; auto const added{relaid.size()}; created.insert(created.end(), relaid.begin(), relaid.end()); @@ -1232,11 +1196,6 @@ void editor_mode::render_route_gizmo() else vertex.position = point; } - if (std::abs(moved.y - position.y) > 1e-3) - { - vertex.auto_elevation = false; - vertex.elevation = moved.y; - } route_update(); } @@ -1308,8 +1267,6 @@ void editor_mode::render_route_ui() changed |= ImGui::InputDouble("Cant change rate (mm/s)", &norms.cant_rate, 0.0, 0.0, "%.0f"); changed |= ImGui::InputDouble("Cant ramp 1:(k*V), k", &norms.ramp_factor, 0.0, 0.0, "%.1f"); changed |= ImGui::InputDouble("Unbalanced acc. change rate (m/s3)", &norms.jerk, 0.0, 0.0, "%.2f"); - changed |= ImGui::InputDouble("Vertical curve R >= k*V^2, k", &norms.vertical_factor, 0.0, 0.0, "%.2f"); - changed |= ImGui::InputDouble("Vertical curve R min (m)", &norms.vertical_min, 0.0, 0.0, "%.0f"); changed |= ImGui::InputDouble("Straight between curves (s of travel)", &norms.tangent_min_time, 0.0, 0.0, "%.1f"); ImGui::PopItemWidth(); norms.gauge = std::max(100.0, norms.gauge); @@ -1401,16 +1358,11 @@ void editor_mode::render_route_ui() changed |= ImGui::InputDouble("Transition out (m)", &vertex.transition_out, 0.0, 0.0, "%.1f"); changed |= ImGui::InputDouble("Cant (mm)", &vertex.cant, 0.0, 0.0, "%.0f"); changed |= ImGui::Checkbox("Turn the longer way (over 180 deg)", &vertex.reverse_turn); - changed |= ImGui::Checkbox("Elevation from the ends", &vertex.auto_elevation); - if (false == vertex.auto_elevation) - changed |= ImGui::InputDouble("Elevation (m)", &vertex.elevation, 0.0, 0.0, "%.3f"); - changed |= ImGui::InputDouble("Vertical curve R (0: min)", &vertex.vertical_radius, 0.0, 0.0, "%.0f"); ImGui::PopItemWidth(); vertex.radius = std::max(1.0, vertex.radius); vertex.transition_in = std::max(0.0, vertex.transition_in); vertex.transition_out = std::max(0.0, vertex.transition_out); vertex.cant = std::max(0.0, vertex.cant); - vertex.vertical_radius = std::max(0.0, vertex.vertical_radius); if (ImGui::SmallButton("Apply recommended for V")) { route_recommend(vertex); @@ -2260,6 +2212,7 @@ void editor_mode::straight_reshape(editor_track::straight const &Line, double co return; } auto pieces{alignment::pieces(m_route.result, m_route.design, m_route.chain.tracks.size())}; + editor_track::keep_heights(m_route.chain, pieces); auto created{editor_track::relay(m_route.chain, pieces)}; editor_track::commit(tracks); for (auto const &entry : splitstates) diff --git a/application/editorprojection.h b/application/editorprojection.h new file mode 100644 index 000000000..aa5cd45d0 --- /dev/null +++ b/application/editorprojection.h @@ -0,0 +1,63 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "application/editormode.h" +#include "rendering/renderer.h" +#include "imgui/imgui.h" + +// world to screen projection of the current camera, for overlays drawn with ImGui +class screen_projection +{ + public: + screen_projection() + { + ImGuiIO const &io = ImGui::GetIO(); + m_size = io.DisplaySize; + m_camera = GfxRenderer->Camera_Position(); + float const aspect = m_size.y > 0.0f ? m_size.x / m_size.y : 1.0f; + m_viewprojection = editor_mode::projection_matrix(aspect) * GfxRenderer->Camera_View_Matrix(); + } + + glm::vec4 clip(glm::dvec3 const &Point) const + { + return m_viewprojection * glm::vec4(glm::vec3(Point - m_camera), 1.0f); + } + ImVec2 screen(glm::vec4 const &Clip) const + { + return ImVec2((Clip.x / Clip.w * 0.5f + 0.5f) * m_size.x, (0.5f - Clip.y / Clip.w * 0.5f) * m_size.y); + } + bool project(glm::dvec3 const &Point, ImVec2 &Screen) const + { + auto const c = clip(Point); + if (c.w < kNear) + return false; + Screen = screen(c); + return true; + } + void line(ImDrawList *Drawlist, glm::dvec3 const &A, glm::dvec3 const &B, ImU32 const Color, float const Thickness) const + { + glm::vec4 a = clip(A); + glm::vec4 b = clip(B); + if (a.w < kNear && b.w < kNear) + return; + if (a.w < kNear) + a = glm::mix(a, b, (kNear - a.w) / (b.w - a.w)); + else if (b.w < kNear) + b = glm::mix(b, a, (kNear - b.w) / (a.w - b.w)); + Drawlist->AddLine(screen(a), screen(b), Color, Thickness); + } + + private: + static constexpr float kNear{0.1f}; + ImVec2 m_size; + glm::dvec3 m_camera; + glm::mat4 m_viewprojection; +}; diff --git a/editor/editorAlignment.cpp b/editor/editorAlignment.cpp index b93046b98..c2940c2e1 100644 --- a/editor/editorAlignment.cpp +++ b/editor/editorAlignment.cpp @@ -752,20 +752,6 @@ result fit_between(design const &Design) auto const gradeafter{(r.profile[i + 1].elevation - point.elevation) / (r.profile[i + 1].chainage - point.chainage)}; point.tangent = point.radius * std::abs(gradeafter - gradebefore) / 2.0; } - for (std::size_t i = 0; i + 1 < r.profile.size(); ++i) - { - if (r.profile[i].tangent + r.profile[i + 1].tangent > r.profile[i + 1].chainage - r.profile[i].chainage + 1e-6) - r.warnings.emplace_back(format("Vertical curves overlap between chainage %.0f m and %.0f m", r.profile[i].chainage, r.profile[i + 1].chainage)); - } - if (r.profile.size() >= 2) - { - auto const first{(r.profile[1].elevation - r.profile[0].elevation) / (r.profile[1].chainage - r.profile[0].chainage)}; - auto const last{(r.profile.back().elevation - r.profile[r.profile.size() - 2].elevation) / (r.profile.back().chainage - r.profile[r.profile.size() - 2].chainage)}; - if (std::abs(first - Design.start_grade) > 0.0005) - r.warnings.emplace_back(format("Grade break at the start: %.1f per mille against %.1f of the adjoining track", first * 1000.0, Design.start_grade * 1000.0)); - if (std::abs(last - Design.end_grade) > 0.0005) - r.warnings.emplace_back(format("Grade break at the end: %.1f per mille against %.1f of the adjoining track", last * 1000.0, Design.end_grade * 1000.0)); - } if (Design.start_radius > 0.0 && Design.start_radius < 10000.0) r.warnings.emplace_back(format("The adjoining track at the start is curved (R %.0f m), the curvature changes abruptly", Design.start_radius)); if (Design.end_radius > 0.0 && Design.end_radius < 10000.0) diff --git a/editor/editorProfile.cpp b/editor/editorProfile.cpp new file mode 100644 index 000000000..f093dee43 --- /dev/null +++ b/editor/editorProfile.cpp @@ -0,0 +1,422 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "editor/editorProfile.hpp" + +#include +#include +#include +#include + +namespace profile +{ + +namespace +{ + +template +std::string format(char const *Format, Args... Arguments) +{ + char text[256]; + std::snprintf(text, sizeof(text), Format, Arguments...); + return text; +} + +double polyline(line const &Line, double const Chainage) +{ + auto const &points{Line.points}; + if (points.empty()) + return 0.0; + if (points.size() == 1 || Chainage <= points.front().chainage) + return points.front().elevation + (points.size() > 1 ? grade_after(Line, 0) * (Chainage - points.front().chainage) : 0.0); + if (Chainage >= points.back().chainage) + return points.back().elevation + grade_after(Line, points.size() - 2) * (Chainage - points.back().chainage); + auto const next{std::upper_bound(points.begin(), points.end(), Chainage, [](double const Value, pvi const &Point) { return Value < Point.chainage; })}; + auto const index{static_cast(std::distance(points.begin(), next)) - 1}; + return points[index].elevation + grade_after(Line, index) * (Chainage - points[index].chainage); +} + +bool overlaps(double const From, double const To, context::zone const &Zone) +{ + return From < Zone.to - 1e-6 && To > Zone.from + 1e-6; +} + +} // namespace + +double grade_after(line const &Line, std::size_t const Index) +{ + auto const &points{Line.points}; + if (Index + 1 >= points.size()) + return 0.0; + auto const run{points[Index + 1].chainage - points[Index].chainage}; + return run > 1e-9 ? (points[Index + 1].elevation - points[Index].elevation) / run : 0.0; +} + +double required_radius(line const &Line) +{ + return std::max(Line.norms.radius_min, Line.norms.radius_factor * Line.speed * Line.speed); +} + +void assign_radii(line &Line) +{ + auto const required{std::ceil(required_radius(Line) / 10.0) * 10.0}; + for (std::size_t k = 1; k + 1 < Line.points.size(); ++k) + { + auto &point{Line.points[k]}; + if (false == point.automatic || point.joint) + continue; + auto const change{std::abs(grade_after(Line, k) - grade_after(Line, k - 1)) * 1000.0}; + point.radius = change > Line.norms.curve_threshold + 1e-6 ? required : 0.0; + } +} + +void complete(line &Line, context const &Context) +{ + auto &points{Line.points}; + points.erase(std::remove_if(points.begin(), points.end(), [](pvi const &Point) { return Point.joint; }), points.end()); + if (points.size() < 2) + return; + bool const start{Line.join_start && Context.start_joined}; + bool const end{Line.join_end && Context.end_joined}; + if (start) + points.front().elevation = Context.start_elevation; + if (end) + points.back().elevation = Context.end_elevation; + + // the vertical curve of the joint starts right at the end of the route, off the adjoining track + auto const joint = [&](pvi const &End, pvi const &Neighbour, double const Grade, double const Direction) -> std::optional { + auto const run{(Neighbour.chainage - End.chainage) * Direction}; + if (run < 1.0) + return std::nullopt; + auto const offset{std::abs(Neighbour.elevation - (End.elevation + Grade * run * Direction))}; + if (offset / run * 1000.0 <= Line.norms.curve_threshold + 1e-6) + return std::nullopt; + auto radius{std::ceil(required_radius(Line) / 10.0) * 10.0}; + double tangent; + if (run * run >= 2.0 * radius * offset) + tangent = (run - std::sqrt(run * run - 2.0 * radius * offset)) * 0.5; + else + { + tangent = run * 0.5; + radius = run * run / (2.0 * offset); + } + pvi result; + result.chainage = End.chainage + tangent * Direction; + result.elevation = End.elevation + Grade * tangent * Direction; + result.radius = radius; + result.automatic = false; + result.joint = true; + return result; + }; + if (start) + if (auto const point{joint(points.front(), points[1], Context.start_grade, 1.0)}) + points.insert(points.begin() + 1, *point); + if (end) + if (auto const point{joint(points.back(), points[points.size() - 2], Context.end_grade, -1.0)}) + points.insert(points.end() - 1, *point); + assign_radii(Line); +} + +std::vector curves(line const &Line) +{ + std::vector result; + auto const &points{Line.points}; + for (std::size_t k = 1; k + 1 < points.size(); ++k) + { + auto const radius{points[k].radius}; + if (radius <= 0.0) + continue; + curve c; + c.point = k; + c.change = grade_after(Line, k) - grade_after(Line, k - 1); + c.tangent = radius * std::abs(c.change) * 0.5; + if (c.tangent < 1e-6) + continue; + c.sagitta = c.tangent * c.tangent / (2.0 * radius); + c.start = points[k].chainage - c.tangent; + c.end = points[k].chainage + c.tangent; + result.push_back(c); + } + return result; +} + +double elevation(line const &Line, double const Chainage) +{ + auto height{polyline(Line, Chainage)}; + for (auto const &c : curves(Line)) + { + auto const distance{std::abs(Chainage - Line.points[c.point].chainage)}; + if (distance >= c.tangent) + continue; + height += c.change * (c.tangent - distance) * (c.tangent - distance) / (4.0 * c.tangent); + } + return height; +} + +double grade(line const &Line, double const Chainage) +{ + auto const &points{Line.points}; + if (points.size() < 2) + return 0.0; + std::size_t index{0}; + while (index + 2 < points.size() && Chainage >= points[index + 1].chainage) + ++index; + auto slope{grade_after(Line, index)}; + for (auto const &c : curves(Line)) + { + auto const offset{Chainage - points[c.point].chainage}; + if (std::abs(offset) >= c.tangent) + continue; + slope -= c.change * (c.tangent - std::abs(offset)) / (2.0 * c.tangent) * (offset < 0.0 ? -1.0 : 1.0); + } + return slope; +} + +double radius_for_sagitta(line const &Line, std::size_t const Point, double const Sagitta) +{ + if (Point == 0 || Point + 1 >= Line.points.size()) + return 0.0; + auto const change{std::abs(grade_after(Line, Point) - grade_after(Line, Point - 1))}; + if (change < 1e-9) + return Line.points[Point].radius; + return std::max(0.0, 8.0 * std::abs(Sagitta) / (change * change)); +} + +std::vector check(line const &Line, context const &Context) +{ + std::vector result; + auto const &points{Line.points}; + auto const &norms{Line.norms}; + auto const add = [&](bool const Error, int const Point, double const Chainage, std::string Text) { + result.push_back({Error, Point, Chainage, std::move(Text)}); + }; + if (points.size() < 2) + { + add(true, -1, 0.0, "The grade line needs at least the two ends"); + return result; + } + for (std::size_t k = 0; k + 1 < points.size(); ++k) + { + if (points[k + 1].chainage - points[k].chainage < 0.5) + add(true, static_cast(k + 1), points[k + 1].chainage, format("Points %zu and %zu are closer than 0.5 m", k + 1, k + 2)); + auto const slope{grade_after(Line, k) * 1000.0}; + if (std::abs(slope) > norms.grade_max + 1e-6) + add(false, static_cast(k), points[k].chainage, format("Grade %.2f per mille between points %zu and %zu exceeds %.2f", slope, k + 1, k + 2, norms.grade_max)); + } + + auto const list{curves(Line)}; + auto const required{required_radius(Line)}; + for (std::size_t k = 1; k + 1 < points.size(); ++k) + { + auto const change{std::abs(grade_after(Line, k) - grade_after(Line, k - 1)) * 1000.0}; + auto const radius{points[k].radius}; + if (radius <= 0.0 && change > norms.curve_threshold + 1e-6) + add(false, static_cast(k), points[k].chainage, format("Point %zu: change of grade %.2f per mille needs a vertical curve", k + 1, change)); + else if (radius > 0.0 && radius < required - 1e-6) + add(false, static_cast(k), points[k].chainage, format("Point %zu: R %.0f m is below the required %.0f m for %.0f km/h", k + 1, radius, required, Line.speed)); + if (radius <= 0.0 && change > 1e-3) + for (auto const &zone : Context.switches) + if (points[k].chainage > zone.from + 1e-3 && points[k].chainage < zone.to - 1e-3) + add(true, static_cast(k), points[k].chainage, format("Point %zu: the grade changes inside switch %s", k + 1, zone.name.c_str())); + } + for (std::size_t i = 0; i < list.size(); ++i) + { + auto const &c{list[i]}; + auto const point{static_cast(c.point)}; + if (c.start < points.front().chainage - 1e-6 || c.end > points.back().chainage + 1e-6) + add(true, point, points[c.point].chainage, format("Point %zu: the vertical curve reaches past the end of the route", c.point + 1)); + if (i + 1 < list.size() && c.end > list[i + 1].start + 1e-6) + add(true, point, c.end, format("Vertical curves of points %zu and %zu overlap by %.2f m", c.point + 1, list[i + 1].point + 1, c.end - list[i + 1].start)); + for (auto const &zone : Context.switches) + if (overlaps(c.start, c.end, zone)) + add(true, point, points[c.point].chainage, format("Point %zu: the vertical curve lies on switch %s", c.point + 1, zone.name.c_str())); + } + if (norms.element_min > 0.0) + { + for (std::size_t k = 1; k + 2 < points.size(); ++k) + { + auto const tangent = [&](std::size_t const Point) { + for (auto const &c : list) + if (c.point == Point) + return c.tangent; + return 0.0; + }; + auto const free{(points[k + 1].chainage - tangent(k + 1)) - (points[k].chainage + tangent(k))}; + if (free < norms.element_min - 1e-6) + add(false, static_cast(k), points[k].chainage, format("Constant grade between points %zu and %zu is %.1f m long, less than %.0f m", k + 1, k + 2, std::max(0.0, free), norms.element_min)); + } + } + for (auto const &zone : Context.switches) + { + auto const slope{std::abs(grade(Line, (zone.from + zone.to) * 0.5)) * 1000.0}; + if (slope > norms.grade_switch_max + 1e-6) + add(false, -1, zone.from, format("Grade %.2f per mille over switch %s exceeds %.2f", slope, zone.name.c_str(), norms.grade_switch_max)); + } + for (auto const &fixed : Context.fixed) + { + auto const departure{elevation(Line, fixed.first) - fixed.second}; + if (std::abs(departure) > norms.fixed_tolerance) + { + add(true, -1, fixed.first, format("At %s the grade line departs %.3f m from a fixed point", format_chainage(fixed.first).c_str(), departure)); + break; + } + } + auto const ends = [&](bool const Atend) { + auto const joined{Atend ? Context.end_joined : Context.start_joined}; + if (false == joined) + return; + auto const chainage{Atend ? points.back().chainage : points.front().chainage}; + auto const departure{elevation(Line, chainage) - (Atend ? Context.end_elevation : Context.start_elevation)}; + if (std::abs(departure) > norms.fixed_tolerance) + add(false, Atend ? static_cast(points.size()) - 1 : 0, chainage, format("The %s of the grade line is %.3f m off the adjoining track", Atend ? "end" : "start", departure)); + auto const slope{grade(Line, chainage)}; + auto const change{std::abs(slope - (Atend ? Context.end_grade : Context.start_grade)) * 1000.0}; + if (change > norms.curve_threshold + 1e-6) + add(false, Atend ? static_cast(points.size()) - 1 : 0, chainage, format("Change of grade %.2f per mille against the adjoining track at the %s", change, Atend ? "end" : "start")); + }; + ends(false); + ends(true); + std::stable_sort(result.begin(), result.end(), [](issue const &A, issue const &B) { return A.error && false == B.error; }); + return result; +} + +line recognize(std::vector const &Chainages, std::vector const &Elevations, std::vector const &Grades, recognition const &Options) +{ + line result; + auto const count{std::min({Chainages.size(), Elevations.size(), Grades.size()})}; + if (count < 2) + return result; + + struct part + { + std::size_t first, last; + double slope{0.0}, offset{0.0}; + }; + auto const fit = [&](part &Part) { + double sx{0.0}, sy{0.0}, sxx{0.0}, sxy{0.0}; + auto const origin{Chainages[Part.first]}; + auto const n{static_cast(Part.last - Part.first + 1)}; + for (auto i = Part.first; i <= Part.last; ++i) + { + auto const x{Chainages[i] - origin}; + sx += x; + sy += Elevations[i]; + sxx += x * x; + sxy += x * Elevations[i]; + } + auto const denominator{n * sxx - sx * sx}; + Part.slope = std::abs(denominator) > 1e-12 ? (n * sxy - sx * sy) / denominator : 0.0; + Part.offset = (sy - Part.slope * sx) / n - Part.slope * origin; + }; + + std::vector parts; + for (std::size_t i = 0; i < count;) + { + auto j{i}; + auto low{Grades[i]}, high{Grades[i]}; + while (j + 1 < count && std::max(high, Grades[j + 1]) - std::min(low, Grades[j + 1]) <= Options.grade_tolerance) + { + ++j; + low = std::min(low, Grades[j]); + high = std::max(high, Grades[j]); + } + if (Chainages[j] - Chainages[i] >= Options.minimum_length) + { + part p{i, j}; + fit(p); + parts.push_back(p); + i = j + 1; + } + else + ++i; + } + for (std::size_t i = 0; i + 1 < parts.size();) + { + if (std::abs(parts[i].slope - parts[i + 1].slope) < Options.grade_tolerance * 0.5) + { + parts[i].last = parts[i + 1].last; + fit(parts[i]); + parts.erase(parts.begin() + i + 1); + } + else + ++i; + } + + result.points.push_back({Chainages.front(), Elevations.front(), 0.0}); + for (std::size_t i = 0; i + 1 < parts.size(); ++i) + { + auto const &a{parts[i]}; + auto const &b{parts[i + 1]}; + auto const from{Chainages[a.last]}; + auto const to{Chainages[b.first]}; + auto const change{b.slope - a.slope}; + auto chainage{std::abs(change) > 1e-9 ? (a.offset - b.offset) / change : (from + to) * 0.5}; + chainage = std::clamp(chainage, from, std::max(from, to)); + pvi point; + point.automatic = false; + point.chainage = chainage; + point.elevation = a.slope * chainage + a.offset; + auto const gap{to - from}; + if (gap >= Options.sharp_gap && std::abs(change) > 1e-9) + point.radius = std::round(gap / std::abs(change)); + if (point.chainage - result.points.back().chainage >= 0.5) + result.points.push_back(point); + } + if (Chainages[count - 1] - result.points.back().chainage < 0.5 && result.points.size() > 1) + result.points.pop_back(); + result.points.push_back({Chainages[count - 1], Elevations[count - 1], 0.0}); + + // the gap between constant grades is shorter than the curve, the sagitta gives the radius + for (std::size_t i = 1; i + 1 < result.points.size(); ++i) + { + auto &point{result.points[i]}; + if (point.radius <= 0.0) + continue; + auto const next{std::lower_bound(Chainages.begin(), Chainages.begin() + count, point.chainage)}; + if (next == Chainages.begin() || next == Chainages.begin() + count) + continue; + auto const index{static_cast(std::distance(Chainages.begin(), next))}; + auto const run{Chainages[index] - Chainages[index - 1]}; + auto const measured{run > 1e-9 ? Elevations[index - 1] + (Elevations[index] - Elevations[index - 1]) * (point.chainage - Chainages[index - 1]) / run : Elevations[index]}; + auto const radius{radius_for_sagitta(result, i, measured - point.elevation)}; + if (radius > 0.0) + point.radius = std::round(radius); + } + return result; +} + +std::vector breaks(line const &Line) +{ + std::vector result; + auto const &points{Line.points}; + for (std::size_t k = 1; k + 1 < points.size(); ++k) + { + if (points[k].radius > 0.0) + continue; + if (std::abs(grade_after(Line, k) - grade_after(Line, k - 1)) > 1e-7) + result.push_back(points[k].chainage); + } + for (auto const &c : curves(Line)) + { + result.push_back(c.start); + result.push_back(c.end); + } + std::sort(result.begin(), result.end()); + return result; +} + +std::string format_chainage(double const Chainage) +{ + auto const value{std::abs(Chainage)}; + auto const kilometres{static_cast(value / 1000.0)}; + return format("%s%ld+%06.2f", Chainage < 0.0 ? "-" : "", kilometres, value - kilometres * 1000.0); +} + +} diff --git a/editor/editorProfile.hpp b/editor/editorProfile.hpp new file mode 100644 index 000000000..ebc1ca0b9 --- /dev/null +++ b/editor/editorProfile.hpp @@ -0,0 +1,119 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include +#include + +// vertical alignment (grade line) of the rail top along the chainage of a route +namespace profile +{ + +// point of intersection of two grades, with a parabolic vertical curve of radius R (0: none) +struct pvi +{ + double chainage{0.0}; + double elevation{0.0}; + double radius{0.0}; + bool automatic{true}; // radius follows the limits + bool joint{false}; // placed by complete(), takes the grade over from the adjoining track +}; + +struct limits +{ + double grade_max{6.0}; // per mille + double grade_switch_max{2.5}; // per mille, over switches + double radius_factor{0.4}; // R >= k * V^2 + double radius_min{2000.0}; + double curve_threshold{2.0}; // per mille, change of grade which needs a vertical curve + double element_min{0.0}; // m, constant grade between vertical curves + double fixed_tolerance{0.005}; // m, allowed departure from fixed points +}; + +struct line +{ + std::vector points; // ordered by chainage; the first and the last are the ends of the route + double speed{100.0}; + limits norms; + // at the joined ends: keep the elevation and take over the grade of the adjoining track + bool join_start{true}; + bool join_end{true}; +}; + +double elevation(line const &Line, double const Chainage); +// dy/ds +double grade(line const &Line, double const Chainage); +// grade of the element between points Index and Index + 1 +double grade_after(line const &Line, std::size_t const Index); +double required_radius(line const &Line); +// radii of the automatic points: the required one where the change of grade needs a curve, none elsewhere +void assign_radii(line &Line); + +struct curve +{ + std::size_t point{0}; + double start{0.0}; + double end{0.0}; + double tangent{0.0}; + double sagitta{0.0}; + double change{0.0}; // grade after - grade before +}; +std::vector curves(line const &Line); + +// radius which gives specified elevation of the curve at the point of intersection +double radius_for_sagitta(line const &Line, std::size_t const Point, double const Sagitta); + +// facts about the route which the checks take into account +struct context +{ + double length{0.0}; + struct zone + { + double from{0.0}; + double to{0.0}; + std::string name; + }; + std::vector switches; + // elevations which the grade line has to keep (chainage, elevation) + std::vector> fixed; + // adjoining track at the ends; grades rise along the route + double start_elevation{0.0}, end_elevation{0.0}; + double start_grade{0.0}, end_grade{0.0}; + bool start_joined{false}, end_joined{false}; +}; + +// locks the joined ends, places the joint points and sets the automatic radii +void complete(line &Line, context const &Context); + +struct issue +{ + bool error{false}; + int point{-1}; + double chainage{0.0}; + std::string text; +}; +std::vector check(line const &Line, context const &Context); + +struct recognition +{ + double grade_tolerance{0.0004}; + double minimum_length{15.0}; + double sharp_gap{2.0}; +}; +// grade line of existing track, from its elevations and grades sampled along the chainage +line recognize(std::vector const &Chainages, std::vector const &Elevations, std::vector const &Grades, recognition const &Options); + +// chainages where the paths have to end so that each of them carries a single grade or a single curve +std::vector breaks(line const &Line); + +std::string format_chainage(double const Chainage); + +} diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index 6df8d41b9..a579defe8 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -1295,6 +1295,486 @@ TTrack *editor_track::take_straight(straight_run const &Run, TTrack *Edge, glm:: return edge; } +namespace +{ + +struct bezier +{ + glm::dvec3 p0, p1, p2, p3; + explicit bezier(segment_data const &Path) + { + p0 = Path.points[segment_data::point::start]; + p3 = Path.points[segment_data::point::end]; + auto const &control1{Path.points[segment_data::point::control1]}; + auto const &control2{Path.points[segment_data::point::control2]}; + if (control1 == glm::dvec3{} && control2 == glm::dvec3{}) + { + p1 = glm::mix(p0, p3, 1.0 / 3.0); + p2 = glm::mix(p0, p3, 2.0 / 3.0); + } + else + { + p1 = p0 + control1; + p2 = p3 + control2; + } + } + glm::dvec3 point(double const T) const + { + auto const u{1.0 - T}; + return u * u * u * p0 + 3.0 * u * u * T * p1 + 3.0 * u * T * T * p2 + T * T * T * p3; + } + glm::dvec3 first(double const T) const + { + auto const u{1.0 - T}; + return 3.0 * u * u * (p1 - p0) + 6.0 * u * T * (p2 - p1) + 3.0 * T * T * (p3 - p2); + } + glm::dvec3 second(double const T) const + { + return 6.0 * (1.0 - T) * (p2 - 2.0 * p1 + p0) + 6.0 * T * (p3 - 2.0 * p2 + p1); + } + double plan_length(int const Steps = 32) const + { + double length{0.0}; + auto previous{plan_of(point(0.0))}; + for (int i = 1; i <= Steps; ++i) + { + auto const next{plan_of(point(static_cast(i) / Steps))}; + length += glm::distance(previous, next); + previous = next; + } + return length; + } + // parameter at specified plan distance from the start + double parameter(double const Distance) const + { + int constexpr steps{256}; + double length{0.0}; + auto previous{plan_of(point(0.0))}; + for (int i = 1; i <= steps; ++i) + { + auto const next{plan_of(point(static_cast(i) / steps))}; + auto const step{glm::distance(previous, next)}; + if (length + step >= Distance) + return (i - 1 + (step > 1e-12 ? (Distance - length) / step : 0.0)) / steps; + length += step; + previous = next; + } + return 1.0; + } +}; + +using route_node = std::tuple; + +std::vector route_next(route_node const &Node) +{ + std::vector result; + auto *track{std::get<0>(Node)}; + auto const path{std::get<1>(Node)}; + auto const forward{std::get<2>(Node)}; + auto const &exit{track->m_paths[path].points[forward ? segment_data::point::end : segment_data::point::start]}; + auto *next{neighbour_at(*track, path, forward)}; + if (next == nullptr || next == track || next->m_editorremoved || false == editor_track::is_supported(*next) || (next->iCategoryFlag & 15) != (track->iCategoryFlag & 15)) + return result; + for (int i = 0; i < static_cast(next->m_paths.size()); ++i) + { + auto const &candidate{next->m_paths[i]}; + if (glm::distance(candidate.points[segment_data::point::start], exit) <= kSamePoint) + result.emplace_back(next, i, true); + else if (glm::distance(candidate.points[segment_data::point::end], exit) <= kSamePoint) + result.emplace_back(next, i, false); + } + return result; +} + +} // namespace + +bool editor_track::find_route(TTrack *From, TTrack *To, route &Route, std::string &Error) +{ + Route = {}; + if (From == nullptr || To == nullptr || false == is_supported(*From) || false == is_supported(*To)) + { + Error = "Select the first and the last path of the route"; + return false; + } + if (From == To) + { + Route.spans.push_back({From, 0, true}); + Error.clear(); + return true; + } + std::vector nodes; + std::vector parents; + std::map visited; + for (int i = 0; i < static_cast(From->m_paths.size()); ++i) + for (auto const forward : {true, false}) + { + route_node const node{From, i, forward}; + visited.emplace(node, static_cast(nodes.size())); + nodes.push_back(node); + parents.push_back(-1); + } + int goal{-1}; + for (std::size_t index = 0; index < nodes.size() && goal < 0 && nodes.size() < 200000; ++index) + { + for (auto const &next : route_next(nodes[index])) + { + if (std::get<0>(next) == From || visited.count(next) > 0) + continue; + visited.emplace(next, static_cast(nodes.size())); + nodes.push_back(next); + parents.push_back(static_cast(index)); + if (std::get<0>(next) == To) + { + goal = static_cast(nodes.size()) - 1; + break; + } + } + } + if (goal < 0) + { + Error = "No route connects the selected paths"; + return false; + } + for (int index = goal; index >= 0; index = parents[index]) + Route.spans.push_back({std::get<0>(nodes[index]), std::get<1>(nodes[index]), std::get<2>(nodes[index])}); + std::reverse(Route.spans.begin(), Route.spans.end()); + Error.clear(); + return true; +} + +editor_track::route editor_track::run_route(TTrack &Track, double const Maximum) +{ + route result; + if (false == is_supported(Track)) + return result; + auto const walk = [&](route_node Node) { + std::vector nodes; + double length{0.0}; + while (nodes.size() < 5000 && length < Maximum) + { + auto candidates{route_next(Node)}; + if (candidates.empty()) + break; + auto chosen{candidates.front()}; + for (auto const &candidate : candidates) + if (std::get<1>(candidate) == 0) + chosen = candidate; + auto *track{std::get<0>(chosen)}; + if (track == &Track || std::any_of(nodes.begin(), nodes.end(), [&](route_node const &Other) { return std::get<0>(Other) == track; })) + break; + nodes.push_back(chosen); + length += bezier(track->m_paths[std::get<1>(chosen)]).plan_length(8); + Node = chosen; + } + return nodes; + }; + auto const ahead{walk({&Track, 0, true})}; + auto const behind{walk({&Track, 0, false})}; + for (auto node = behind.rbegin(); node != behind.rend(); ++node) + if (std::none_of(ahead.begin(), ahead.end(), [&](route_node const &Other) { return std::get<0>(Other) == std::get<0>(*node); })) + result.spans.push_back({std::get<0>(*node), std::get<1>(*node), false == std::get<2>(*node)}); + result.spans.push_back({&Track, 0, true}); + for (auto const &node : ahead) + result.spans.push_back({std::get<0>(node), std::get<1>(node), std::get<2>(node)}); + return result; +} + +editor_track::route editor_track::route_of(chain const &Chain) +{ + route result; + for (std::size_t i = 0; i < Chain.tracks.size(); ++i) + result.spans.push_back({Chain.tracks[i], 0, Chain.forward[i]}); + return result; +} + +std::vector editor_track::sample_route(route &Route, double const Step) +{ + std::vector samples; + double chainage{0.0}; + for (std::size_t i = 0; i < Route.spans.size(); ++i) + { + auto &span{Route.spans[i]}; + bezier const curve{span.track->m_paths[span.path]}; + auto const count{std::max(2, static_cast(std::ceil(curve.plan_length(16) / std::max(0.1, Step))))}; + span.from = chainage; + auto previous{plan_of(curve.point(span.forward ? 0.0 : 1.0))}; + for (int j = (samples.empty() ? 0 : 1); j <= count; ++j) + { + auto const t{span.forward ? static_cast(j) / count : 1.0 - static_cast(j) / count}; + auto const position{curve.point(t)}; + chainage += glm::distance(previous, plan_of(position)); + previous = plan_of(position); + auto derivative{curve.first(t)}; + if (false == span.forward) + derivative = -derivative; + auto const second{curve.second(t)}; + auto const planar{std::hypot(derivative.x, derivative.z)}; + route_sample sample; + sample.chainage = chainage; + sample.position = position; + sample.span = i; + if (planar > 1e-9) + { + sample.direction = glm::dvec2{derivative.x, derivative.z} / planar; + sample.grade = derivative.y / planar; + sample.curvature = (derivative.x * second.z - derivative.z * second.x) / (planar * planar * planar); + } + samples.push_back(sample); + } + span.to = chainage; + } + Route.length = chainage; + return samples; +} + +namespace +{ + +template +double interpolate(std::vector const &Samples, double const Chainage, Getter const &Get) +{ + if (Samples.empty()) + return 0.0; + auto const next{std::lower_bound(Samples.begin(), Samples.end(), Chainage, [](editor_track::route_sample const &Sample, double const Value) { return Sample.chainage < Value; })}; + if (next == Samples.begin()) + return Get(Samples.front()); + if (next == Samples.end()) + return Get(Samples.back()); + auto const &before{*std::prev(next)}; + auto const run{next->chainage - before.chainage}; + return run > 1e-9 ? Get(before) + (Get(*next) - Get(before)) * (Chainage - before.chainage) / run : Get(before); +} + +void set_heights(segment_data &Path, double const Startheight, double const Endheight, double const Startgrade, double const Endgrade) +{ + auto &start{Path.points[segment_data::point::start]}; + auto &end{Path.points[segment_data::point::end]}; + auto &control1{Path.points[segment_data::point::control1]}; + auto &control2{Path.points[segment_data::point::control2]}; + if (control1 == glm::dvec3{} && control2 == glm::dvec3{}) + { + control1 = (end - start) / 3.0; + control2 = (start - end) / 3.0; + } + start.y = Startheight; + end.y = Endheight; + control1.y = Startgrade * std::hypot(control1.x, control1.z); + control2.y = -Endgrade * std::hypot(control2.x, control2.z); +} + +// the path lies in the plane through Origin which rises with Grade along Direction (unit, in plan) and is level across it +void plane_heights(segment_data &Path, glm::dvec3 const &Origin, glm::dvec2 const &Direction, double const Grade) +{ + auto &start{Path.points[segment_data::point::start]}; + auto &end{Path.points[segment_data::point::end]}; + auto &control1{Path.points[segment_data::point::control1]}; + auto &control2{Path.points[segment_data::point::control2]}; + if (control1 == glm::dvec3{} && control2 == glm::dvec3{}) + { + control1 = (end - start) / 3.0; + control2 = (start - end) / 3.0; + } + auto const height = [&](glm::dvec3 const &Point) { return Origin.y + Grade * glm::dot(glm::dvec2{Point.x - Origin.x, Point.z - Origin.z}, Direction); }; + auto const first{start + control1}; + auto const second{end + control2}; + start.y = height(start); + end.y = height(end); + control1.y = height(first) - start.y; + control2.y = height(second) - end.y; +} + +glm::dvec2 start_direction(segment_data const &Path) +{ + auto const &start{Path.points[segment_data::point::start]}; + auto const &control{Path.points[segment_data::point::control1]}; + glm::dvec2 direction{control.x, control.z}; + if (glm::length(direction) < 1e-6) + direction = {Path.points[segment_data::point::end].x - start.x, Path.points[segment_data::point::end].z - start.z}; + return glm::length(direction) > 1e-9 ? glm::normalize(direction) : glm::dvec2{1.0, 0.0}; +} + +} // namespace + +double editor_track::sampled_elevation(std::vector const &Samples, double const Chainage) +{ + return interpolate(Samples, Chainage, [](route_sample const &Sample) { return Sample.position.y; }); +} + +double editor_track::sampled_grade(std::vector const &Samples, double const Chainage) +{ + return interpolate(Samples, Chainage, [](route_sample const &Sample) { return Sample.grade; }); +} + +bool editor_track::adjoining_grade(route const &Route, bool const Atend, double &Grade) +{ + if (Route.spans.empty()) + return false; + auto const &span{Atend ? Route.spans.back() : Route.spans.front()}; + auto const outward{Atend ? span.forward : false == span.forward}; + auto const next{route_next({span.track, span.path, outward})}; + if (next.empty()) + return false; + auto const &[track, path, forward]{next.front()}; + auto const tangent{path_tangent(track->m_paths[path], false == forward)}; + auto const plan{std::hypot(tangent.x, tangent.z)}; + if (plan < 1e-9) + return false; + auto const along{(forward ? 1.0 : -1.0) * tangent.y / plan}; + Grade = Atend ? along : -along; + return true; +} + +std::vector editor_track::apply_profile(route &Route, std::function const &Elevation, std::function const &Grade, std::vector const &Breaks, std::vector> &States, std::vector &Created) +{ + double constexpr margin{0.25}; + auto const remember = [&](TTrack *Track) { + if (std::none_of(States.begin(), States.end(), [&](auto const &Entry) { return Entry.first == Track; }) && std::find(Created.begin(), Created.end(), Track) == Created.end()) + States.emplace_back(Track, capture(*Track)); + }; + sample_route(Route, 1.0); + std::vector spans; + for (auto const &span : Route.spans) + { + if (span.track->eType != tt_Normal) + { + spans.push_back(span); + continue; + } + std::vector cuts; + for (auto const chainage : Breaks) + if (chainage > span.from + margin && chainage < span.to - margin) + cuts.push_back(chainage); + if (cuts.empty()) + { + spans.push_back(span); + continue; + } + remember(span.track); + if (span.forward) + { + auto *piece{span.track}; + auto origin{span.from}; + spans.push_back({piece, 0, true}); + for (auto const cut : cuts) + { + auto const t{bezier(piece->m_paths.front()).parameter(cut - origin)}; + auto *created{split_path(*piece, t)}; + if (created == nullptr) + continue; + Created.push_back(created); + spans.push_back({created, 0, true}); + piece = created; + origin = cut; + } + } + else + { + std::vector order; + for (auto cut = cuts.begin(); cut != cuts.end(); ++cut) + { + auto const t{bezier(span.track->m_paths.front()).parameter(span.to - *cut)}; + auto *created{split_path(*span.track, t)}; + if (created == nullptr) + continue; + Created.push_back(created); + order.push_back(created); + } + for (auto *piece : order) + spans.push_back({piece, 0, false}); + spans.push_back({span.track, 0, false}); + } + } + Route.spans = spans; + sample_route(Route, 1.0); + + auto const on_route = [&](TTrack const *Track) { + return std::any_of(Route.spans.begin(), Route.spans.end(), [&](route_span const &Span) { return Span.track == Track; }); + }; + struct joint + { + TTrack *track; + int path; + bool atend; + TTrack *neighbour; + }; + std::vector joints; + std::vector changed; + for (auto const &span : Route.spans) + { + remember(span.track); + auto const startchainage{span.forward ? span.from : span.to}; + auto const endchainage{span.forward ? span.to : span.from}; + auto const sign{span.forward ? 1.0 : -1.0}; + auto &path{span.track->m_paths[span.path]}; + set_heights(path, Elevation(startchainage), Elevation(endchainage), Grade(startchainage) * sign, Grade(endchainage) * sign); + add_unique(changed, span.track); + if (span.track->eType == tt_Normal) + continue; + auto const grade{Grade((span.from + span.to) * 0.5) * sign}; + for (int i = 0; i < static_cast(span.track->m_paths.size()); ++i) + { + for (auto const atend : {false, true}) + { + auto *neighbour{neighbour_at(*span.track, i, atend)}; + if (neighbour != nullptr && false == on_route(neighbour) && std::none_of(joints.begin(), joints.end(), [&](joint const &Joint) { return Joint.track == span.track && Joint.neighbour == neighbour; })) + joints.push_back({span.track, i, atend, neighbour}); + } + if (i != span.path) + plane_heights(span.track->m_paths[i], path.points[segment_data::point::start], start_direction(path), grade); + } + } + commit(changed); + sample_route(Route, 1.0); + + std::vector gaps; + for (auto const &joint : joints) + { + auto const &end{joint.track->m_paths[joint.path].points[joint.atend ? segment_data::point::end : segment_data::point::start]}; + double nearest{std::numeric_limits::max()}; + double gap{0.0}; + for (auto const &path : joint.neighbour->m_paths) + for (auto const index : {segment_data::point::start, segment_data::point::end}) + { + auto const &point{path.points[index]}; + auto const distance{std::hypot(point.x - end.x, point.z - end.z)}; + if (distance < nearest) + { + nearest = distance; + gap = point.y - end.y; + } + } + if (nearest <= kSamePoint && std::abs(gap) > 0.001) + gaps.push_back({joint.track, joint.neighbour, gap}); + } + return gaps; +} + +void editor_track::keep_heights(chain const &Chain, std::vector &Pieces) +{ + auto existing{route_of(Chain)}; + auto const samples{sample_route(existing, 1.0)}; + if (samples.empty() || existing.length <= 1e-6) + return; + std::vector lengths; + double total{0.0}; + for (auto const &piece : Pieces) + { + lengths.push_back(bezier(piece).plan_length()); + total += lengths.back(); + } + if (total <= 1e-6) + return; + auto const scale{existing.length / total}; + double chainage{0.0}; + for (std::size_t i = 0; i < Pieces.size(); ++i) + { + auto const from{chainage * scale}; + auto const to{(chainage + lengths[i]) * scale}; + set_heights(Pieces[i], sampled_elevation(samples, from), sampled_elevation(samples, to), sampled_grade(samples, from) * scale, sampled_grade(samples, to) * scale); + chainage += lengths[i]; + } +} + std::vector editor_track::find_switch_templates() { std::vector result; diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index 13800f431..396a66c5d 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -147,6 +147,51 @@ class editor_track static straight_run straight_beyond(chain const &Chain, bool const Atend, straight_tolerance const &Tolerance); static double run_reserve(straight_run const &Run); static TTrack *take_straight(straight_run const &Run, TTrack *Edge, glm::dvec3 const &Joint, glm::dvec3 const &Cut, std::vector> &States, std::vector &Created); + // sequence of paths, switches included, which a train can run along + struct route_span + { + TTrack *track{nullptr}; + int path{0}; + bool forward{true}; + double from{0.0}; // chainage, measured in the plan + double to{0.0}; + }; + struct route + { + std::vector spans; + double length{0.0}; + }; + static bool find_route(TTrack *From, TTrack *To, route &Route, std::string &Error); + // continues both ways from the path, through switches along their path 0 + static route run_route(TTrack &Track, double const Maximum); + static route route_of(chain const &Chain); + struct route_sample + { + double chainage{0.0}; + glm::dvec3 position{0.0}; + glm::dvec2 direction{0.0, 1.0}; + double grade{0.0}; + double curvature{0.0}; // signed, 1/m, positive turning left + std::size_t span{0}; + }; + static std::vector sample_route(route &Route, double const Step); + static double sampled_elevation(std::vector const &Samples, double const Chainage); + static double sampled_grade(std::vector const &Samples, double const Chainage); + // grade of the path which adjoins the end of the route, positive rising along the route + static bool adjoining_grade(route const &Route, bool const Atend, double &Grade); + // path off the route whose end no longer meets the adjoining path in height + struct height_gap + { + TTrack *track{nullptr}; + TTrack *neighbour{nullptr}; + double gap{0.0}; // neighbour - track + }; + // sets elevations of the paths of the route; regular paths are split at the chainages in Breaks, + // switches are tilted as a whole in the plane of their grade, branches included + static std::vector apply_profile(route &Route, std::function const &Elevation, std::function const &Grade, std::vector const &Breaks, std::vector> &States, std::vector &Created); + // carries elevations of the chain over to the new pieces, in proportion of the length + static void keep_heights(chain const &Chain, std::vector &Pieces); + struct switch_template { TTrack *source{nullptr}; diff --git a/scene/scenelayers.cpp b/scene/scenelayers.cpp index 0c9a1c5d2..2b8436e12 100644 --- a/scene/scenelayers.cpp +++ b/scene/scenelayers.cpp @@ -17,7 +17,10 @@ http://mozilla.org/MPL/2.0/. #include "utilities/Globals.h" #include "utilities/utilities.h" +#include +#include #include +#include namespace scene { @@ -37,6 +40,17 @@ glm::dvec3 layer_context::to_local(glm::dvec3 Location) const return Location; } +glm::dvec3 layer_context::to_world(glm::dvec3 Location) const +{ + if (rotation != glm::vec3{0.f}) + { + Location = glm::rotateY(Location, glm::radians(static_cast(rotation.y))); + } + Location *= glm::dvec3{scale}; + Location += offset; + return Location; +} + bool layer_context::matches(layer_context const &Other) const { return glm::all(glm::epsilonEqual(offset, Other.offset, 1e-4)) && glm::all(glm::epsilonEqual(rotation, Other.rotation, 1e-4f)) && glm::all(glm::epsilonEqual(scale, Other.scale, 1e-5f)); @@ -62,6 +76,7 @@ layer_handle node_layers::open(std::string const &Name) m_layers.back().parent = handle(); m_layers.back().late = m_initialized; stat(layerhandle); + scan(layerhandle); } else { @@ -119,6 +134,8 @@ void node_layers::clear() m_instance = 0; m_initialized = false; m_terraindirective = false; + m_marked.clear(); + m_marking.clear(); } // indicates the scenario initialization (FirstInit) is being performed @@ -767,7 +784,104 @@ bool node_layers::merge(layer_handle Source, layer_handle Target) // true if there are layer changes awaiting save. NOTE: doesn't account for modified nodes bool node_layers::pending() const { - return std::any_of(std::begin(m_layers), std::end(m_layers), [](basic_layer const &Layer) { return false == Layer.dead && (Layer.created || Layer.removed || Layer.merged != null_handle); }); + return false == m_marking.empty() || + std::any_of(std::begin(m_layers), std::end(m_layers), [](basic_layer const &Layer) { return false == Layer.dead && (Layer.created || Layer.removed || Layer.merged != null_handle); }); +} + +namespace +{ +// marks of the lines the editor keeps track of +std::array const editormarks{"//$p", "//$b"}; +} // namespace + +void node_layers::scan(layer_handle const Layer) +{ + m_marked.erase(Layer); + std::ifstream file{path(Layer), std::ios_base::binary}; + if (false == file.is_open()) + { + return; + } + std::string content{std::istreambuf_iterator(file), std::istreambuf_iterator()}; + if (content.find("//$") == std::string::npos) + { + return; + } + std::size_t begin{0}; + while (begin < content.size()) + { + auto end{content.find('\n', begin)}; + end = (end == std::string::npos ? content.size() : end + 1); + auto const first{content.find_first_not_of(" \t", begin)}; + if (first < end) + { + for (auto const *mark : editormarks) + { + auto const length{std::char_traits::length(mark)}; + if (content.compare(first, length, mark) != 0 || (first + length < end && content[first + length] != ' ' && content[first + length] != '\t' && content[first + length] != '\r' && content[first + length] != '\n')) + { + continue; + } + auto text{content.substr(first + length, end - first - length)}; + while (false == text.empty() && (text.back() == '\n' || text.back() == '\r')) + { + text.pop_back(); + } + text.erase(0, text.find_first_not_of(" \t")); + m_marked[Layer].push_back({mark, {static_cast(begin), static_cast(end)}, std::move(text)}); + break; + } + } + begin = end; + } +} + +std::vector node_layers::marked(layer_handle const Layer, std::string const &Mark) const +{ + std::vector result; + if (auto const pending{m_marking.find({Layer, Mark})}; pending != m_marking.end()) + { + return pending->second; + } + if (auto const lookup{m_marked.find(Layer)}; lookup != m_marked.end()) + { + for (auto const &line : lookup->second) + { + if (line.mark == Mark) + { + result.push_back(line.text); + } + } + } + return result; +} + +std::vector node_layers::marked_layers(std::string const &Mark) const +{ + std::vector result; + for (auto const &entry : m_marked) + { + if (listed(entry.first) && std::any_of(entry.second.begin(), entry.second.end(), [&](marked_line const &Line) { return Line.mark == Mark; })) + { + result.push_back(entry.first); + } + } + for (auto const &entry : m_marking) + { + if (entry.first.second == Mark && std::find(result.begin(), result.end(), entry.first.first) == result.end()) + { + result.push_back(entry.first.first); + } + } + return result; +} + +void node_layers::mark(layer_handle const Layer, std::string const &Mark, std::vector Lines) +{ + if (valid(Layer)) + { + m_marking[{Layer, Mark}] = std::move(Lines); + } } // indicates start of content of a template, included by directive at specified location of the layer file being loaded diff --git a/scene/scenelayers.h b/scene/scenelayers.h index 211de91fc..523e2da3a 100644 --- a/scene/scenelayers.h +++ b/scene/scenelayers.h @@ -13,6 +13,7 @@ http://mozilla.org/MPL/2.0/. #include #include +#include #include namespace scene @@ -44,6 +45,8 @@ struct layer_context // converts world space location to the one which produces it when loaded with this context in effect glm::dvec3 to_local(glm::dvec3 Location) const; + // reverse of to_local() + glm::dvec3 to_world(glm::dvec3 Location) const; bool matches(layer_context const &Other) const; }; @@ -261,6 +264,14 @@ class node_layers return m_terraindirective; } + // editor data kept in the scenery files as comment lines starting with a mark, e.g. "//$p ...", which the simulation skips + // text of the lines with specified mark in specified layer, with the mark taken off + std::vector marked(layer_handle Layer, std::string const &Mark) const; + // layers whose files hold lines with specified mark + std::vector marked_layers(std::string const &Mark) const; + // lines to take the place of the ones with specified mark in the layer file, on save. the mark is added to each + void mark(layer_handle Layer, std::string const &Mark, std::vector Lines); + // layer management. changes are applied to the scenery files by save() // creates empty layer, included from specified one. returns: handle to the new layer, or null_handle with the explanation in Reason layer_handle create(std::string Name, layer_handle Parent, std::string &Reason); @@ -319,9 +330,17 @@ class node_layers struct file_patch; struct composition; struct save_state; + struct marked_line + { + std::string mark; + source_span span; // whole line, its end included + std::string text; + }; // methods std::string path(layer_handle const Layer) const; void stat(layer_handle const Layer); + // finds the marked lines in the layer file + void scan(layer_handle const Layer); bool compose(save_state &State, layer_handle const Layer, composition &Output, int const Depth) const; // members std::vector m_layers; // layer handle is index in the vector + 1 @@ -335,6 +354,8 @@ class node_layers instance_handle m_instance{0}; // helper, include whose template is being loaded bool m_initialized{false}; // helper, the scenario initialization was performed already bool m_terraindirective{false}; + std::map> m_marked; + std::map, std::vector> m_marking; // changes awaiting save }; extern node_layers Layers; diff --git a/scene/scenelayerssave.cpp b/scene/scenelayerssave.cpp index df077aa74..9d5f9297b 100644 --- a/scene/scenelayerssave.cpp +++ b/scene/scenelayerssave.cpp @@ -801,6 +801,37 @@ save_result node_layers::save(std::vector const &Rootstatements) state.patches[erased.first].edits.emplace_back(std::move(edit)); } + // editor data in the comment lines: the old lines go, the new ones are added to the file like new definitions + std::map> markedtext; + for (auto const &marking : m_marking) + { + auto const markedlayer{marking.first.first}; + auto const &mark{marking.first.second}; + if (auto const lookup{m_marked.find(markedlayer)}; lookup != m_marked.end()) + { + for (auto const &line : lookup->second) + { + if (line.mark != mark) + { + continue; + } + file_patch::edit edit; + edit.begin = line.span.begin; + edit.end = line.span.end; + state.patches[markedlayer].edits.emplace_back(std::move(edit)); + } + } + auto const target{resolve(markedlayer)}; + if (marking.second.empty() || false == is_output(target)) + { + continue; + } + for (auto const &text : marking.second) + { + markedtext[target].push_back(mark + ' ' + text); + } + } + // includes of templates std::map> placed; // directives made in the editor, by target layer for (std::size_t idx = 0; idx < m_instances.size(); ++idx) @@ -940,7 +971,7 @@ save_result node_layers::save(std::vector const &Rootstatements) continue; } if (layer(candidate).created || state.patches.count(candidate) != 0 || appended.count(candidate) != 0 || created.count(candidate) != 0 || placed.count(candidate) != 0 || - (candidate == root && false == Rootstatements.empty())) + markedtext.count(candidate) != 0 || (candidate == root && false == Rootstatements.empty())) { outputs.emplace_back(candidate); } @@ -1034,6 +1065,14 @@ save_result node_layers::save(std::vector const &Rootstatements) added.text += directive + eol; } } + if (auto const lookup{markedtext.find(output)}; lookup != markedtext.end()) + { + for (auto const &line : lookup->second) + { + ensure_newline(added.text, eol); + added.text += line + eol; + } + } if (output == root) { for (auto const &statement : Rootstatements) @@ -1221,7 +1260,17 @@ save_result node_layers::save(std::vector const &Rootstatements) for (auto const output : written) { stat(output); + scan(output); } + for (auto const &marking : m_marking) + { + if (resolve(marking.first.first) != marking.first.first) + { + // the lines of the merged layer are now in the file of its target + m_marked.erase(marking.first.first); + } + } + m_marking.clear(); for (auto &included : m_instances) { // removed includes are gone from the files now From 8778353b221be8ec2eb70df4bfa676cdcb176836 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 00:14:03 +0200 Subject: [PATCH 085/430] feat(editor): infrastructure bound to the paths follows their changes --- CMakeLists.txt | 2 + application/editormode.cpp | 7 + application/editormode.h | 54 +- application/editormodeinfra.cpp | 1390 ++++++++++++++++++++++ application/editormodetrack.cpp | 20 + editor/editorInfra.cpp | 304 +++++ editor/editorInfra.hpp | 128 ++ editor/editorTrack.cpp | 13 + editor/editorTrack.hpp | 7 + scene/scene.cpp | 24 + scene/scene.h | 8 + scene/scenelayers.h | 5 + scene/scenelayerssave.cpp | 112 ++ simulation/simulationstateserializer.cpp | 2 + world/Event.h | 8 + 15 files changed, 2083 insertions(+), 1 deletion(-) create mode 100644 application/editormodeinfra.cpp create mode 100644 editor/editorInfra.cpp create mode 100644 editor/editorInfra.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 8900a0beb..94d71aa65 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,11 +173,13 @@ set(SOURCES "editor/editorTrack.cpp" "editor/editorAlignment.cpp" "editor/editorProfile.cpp" +"editor/editorInfra.cpp" "editor/editorTerrainStreamer.cpp" "editor/editorOrthophoto.cpp" "application/editormode.cpp" "application/editormodetrack.cpp" "application/editormodeprofile.cpp" +"application/editormodeinfra.cpp" "input/editormouseinput.cpp" "application/editoruilayer.cpp" "application/editoruipanels.cpp" diff --git a/application/editormode.cpp b/application/editormode.cpp index 3b83664d0..c4cedb689 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -344,6 +344,7 @@ editor_mode::editor_mode() { m_orthophoto.ground_source([](glm::dvec2 const &Min, glm::dvec2 const &Max, std::vector &Out) { gather_ground_triangles(Min, Max, true, 50.0f, Out); }); + infra_hooks(); } editor_ui *editor_mode::ui() const @@ -869,6 +870,9 @@ bool editor_mode::update() simulation::State.update_clocks(); simulation::Environment.update(); + // bindings are matched with the objects by their locations, before anything gets moved + if (false == m_bindings_loaded && simulation::is_ready) + infra_load(); auto const deltarealtime = Timer::GetDeltaRenderTime(); @@ -1023,6 +1027,8 @@ bool editor_mode::update() render_track_window(); draw_profile_overlay(); render_profile_window(); + draw_infra_overlay(); + render_infra_window(); } // --- area fill: outline overlay while the mode is active (its settings are drawn in the node bank window) --- @@ -1637,6 +1643,7 @@ void editor_mode::save() if (m_profile.changed) profile_store(); + infra_store(); auto const result = scene::Layers.save(rootstatements); if (result.success && false == rootstatements.empty()) { diff --git a/application/editormode.h b/application/editormode.h index b517736c8..082682e43 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -22,6 +22,7 @@ http://mozilla.org/MPL/2.0/. #include "editor/editorTrack.hpp" #include "editor/editorAlignment.hpp" #include "editor/editorProfile.hpp" +#include "editor/editorInfra.hpp" #include #include @@ -107,7 +108,7 @@ class editor_mode : public application_mode std::vector> tracks; std::vector created; std::vector removed; - + std::vector infra; // objects which followed the paths }; void push_snapshot(scene::basic_node *node, EditorSnapshot::Action Action = EditorSnapshot::Action::Move, std::string const &Serialized = std::string()); @@ -545,6 +546,57 @@ class editor_mode : public application_mode void render_profile_point(); void draw_profile_overlay() const; + // infrastructure along the track: objects bound to the paths follow their changes. bindings are kept in the + // scenery files as "//$b" comment lines + struct infra_candidate + { + infra::binding binding; + double offset{0.0}; // sideways from the axis + std::string reason; + bool chosen{false}; + bool bound{false}; + }; + struct infra_window + { + bool open{false}; + int scope{1}; // 0: the selected path, 1: the line through it, 2: the route of the vertical profile + float reach{1500.0f}; + float corridor{8.0f}; + bool follow{true}; + bool show{true}; + std::vector rules{infra::default_rules()}; + std::vector tracks; // of the scope + std::vector candidates; + int hovered{-1}; + std::string status; + std::string error; + }; + infra_window m_infra; + std::vector m_bindings; + std::vector> m_bindings_unresolved; // lines kept as they are + bool m_bindings_loaded{false}; + bool m_bindings_changed{false}; + std::vector m_infra_buffer; // states of the objects before the change in progress + bool m_infra_suspended{false}; + void infra_hooks(); + void infra_load(); + void infra_store(); + std::vector infra_scope() const; + void infra_recognize(); + void infra_bind_chosen(); + void infra_unbind(std::vector Indices); + infra::binding *infra_find(infra::binding const &Binding); + infra::object_state infra_state_of(infra::binding const &Binding) const; + void infra_restore_state(infra::object_state const &State); + void infra_buffer(infra::binding const &Binding, bool const Refresh); + void infra_capture(TTrack const &Track); + void infra_follow(std::vector const &Tracks); + void infra_split(TTrack &Original, TTrack &Created, segment_data const &First); + void infra_move(infra::binding &Binding); + void infra_attach(EditorSnapshot &Snapshot); + void render_infra_window(); + void draw_infra_overlay() const; + bool m_route_gizmo_using{false}; glm::mat4 m_route_gizmo{1.0f}; float m_track_snap_radius{1.0f}; diff --git a/application/editormodeinfra.cpp b/application/editormodeinfra.cpp new file mode 100644 index 000000000..0fb987e54 --- /dev/null +++ b/application/editormodeinfra.cpp @@ -0,0 +1,1390 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "application/editormode.h" +#include "application/editorprojection.h" + +#include "editor/editorIncludeInfo.hpp" +#include "model/AnimModel.h" +#include "model/Model3d.h" +#include "scene/scenelayers.h" +#include "simulation/simulation.h" +#include "utilities/Logs.h" +#include "utilities/utilities.h" +#include "world/Event.h" +#include "world/EvLaunch.h" +#include "world/MemCell.h" +#include "world/Track.h" +#include "world/Traction.h" + +#include "imgui/imgui.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace +{ + +std::string const kBindingMark{"//$b"}; + +template +std::string format(char const *Format, Args... Arguments) +{ + char text[256]; + std::snprintf(text, sizeof(text), Format, Arguments...); + return text; +} + +double plan_distance(glm::dvec3 const &A, glm::dvec3 const &B) +{ + return std::hypot(A.x - B.x, A.z - B.z); +} + +template +bool contains(std::vector const &Items, Type_ const &Item) +{ + return std::find(Items.begin(), Items.end(), Item) != Items.end(); +} + +ImU32 colour(infra::category const Category, int const Alpha = 255) +{ + switch (Category) + { + case infra::category::signal: return IM_COL32(255, 80, 80, Alpha); + case infra::category::sign: return IM_COL32(255, 220, 60, Alpha); + case infra::category::pole: return IM_COL32(160, 160, 255, Alpha); + case infra::category::catenary: return IM_COL32(80, 200, 255, Alpha); + case infra::category::logic: return IM_COL32(220, 120, 255, Alpha); + case infra::category::other: return IM_COL32(200, 200, 200, Alpha); + } + return IM_COL32(200, 200, 200, Alpha); +} + +// nodes still present in the scene; the editor deletes models outright +class live_nodes +{ + public: + void refresh() + { + std::array const sizes{simulation::Instances.sequence().size(), simulation::Traction.sequence().size(), simulation::Memory.sequence().size(), simulation::Events.launchers().size()}; + if (sizes == m_sizes && m_valid) + return; + m_sizes = sizes; + m_valid = true; + m_nodes.clear(); + for (auto *node : simulation::Instances.sequence()) + m_nodes.insert(node); + for (auto *node : simulation::Traction.sequence()) + m_nodes.insert(node); + for (auto *node : simulation::Memory.sequence()) + m_nodes.insert(node); + for (auto *node : simulation::Events.launchers()) + m_nodes.insert(node); + } + bool alive(scene::basic_node const *Node) const + { + return Node != nullptr && m_nodes.count(Node) > 0; + } + + private: + std::unordered_set m_nodes; + std::array m_sizes{}; + bool m_valid{false}; +}; +live_nodes Live; + +bool alive(infra::binding const &Binding) +{ + if (Binding.type == infra::kind::include) + { + if (false == scene::Layers.tracked(Binding.include)) + return false; + auto const &included{scene::Layers.instance(Binding.include)}; + return false == included.removed && false == included.dead; + } + return Live.alive(Binding.node); +} + +// placement parameters of an include +struct include_place +{ + std::string file; + std::vector values; + std::array position{-1, -1, -1}; // indices of the values + int yaw{-1}; + glm::dvec3 offset{0.0}; + std::string description; // name and category of the template +}; + +bool numeric(std::string const &Text, double &Value) +{ + char *end{nullptr}; + Value = std::strtod(Text.c_str(), &end); + return false == Text.empty() && *end == '\0'; +} + +bool include_place_of(scene::instance_handle const Instance, include_place &Place) +{ + if (false == scene::Layers.tracked(Instance)) + return false; + auto const &included{scene::Layers.instance(Instance)}; + if (included.removed || included.dead || included.file == nullptr) + return false; + // with a rotation or a scale in effect the parameters don't translate to a location in a single way + if (included.context.rotation != glm::vec3{0.f} || included.context.scale != glm::vec3{1.f}) + return false; + if (false == editor_includes::parse_directive(scene::Layers.directive(Instance), Place.file, Place.values)) + return false; + static std::map descriptions; + auto found{descriptions.find(*included.file)}; + if (found == descriptions.end()) + { + include_info info; + std::string error; + editor_includes::load(*included.file, info, error); + editor_includes::suggest(*included.file, info); + found = descriptions.emplace(*included.file, std::move(info)).first; + } + auto const &info{found->second}; + auto const index = [&](char const *Role) { + auto const result{editor_includes::parameter_with_role(info, Role) - 1}; + double value; + return (result >= 0 && result < static_cast(Place.values.size()) && numeric(Place.values[result], value)) ? result : -1; + }; + Place.position = {index("pos.x"), index("pos.y"), index("pos.z")}; + Place.yaw = index("rot.y"); + Place.offset = included.context.offset; + Place.description = info.name + ' ' + info.category; + return Place.position[0] >= 0 && Place.position[1] >= 0 && Place.position[2] >= 0; +} + +glm::dvec3 include_location(include_place const &Place) +{ + glm::dvec3 result{Place.offset}; + for (int axis = 0; axis < 3; ++axis) + { + double value{0.0}; + numeric(Place.values[Place.position[axis]], value); + result[axis] += value; + } + return result; +} + +// points which define the object, and its rotation around the vertical axis if it has one +bool object_points(infra::binding const &Binding, std::vector &Points, std::optional &Yaw) +{ + Points.clear(); + Yaw.reset(); + switch (Binding.type) + { + case infra::kind::model: + { + auto const *model{static_cast(Binding.node)}; + Points.push_back(model->location()); + Yaw = model->Angles().y; + return true; + } + case infra::kind::include: + { + include_place place; + if (false == include_place_of(Binding.include, place)) + return false; + Points.push_back(include_location(place)); + if (place.yaw >= 0) + { + double value{0.0}; + numeric(place.values[place.yaw], value); + Yaw = value; + } + return true; + } + case infra::kind::traction: + { + auto const *traction{static_cast(Binding.node)}; + Points = {traction->pPoint1, traction->pPoint2, traction->pPoint3, traction->pPoint4}; + return true; + } + case infra::kind::memcell: + case infra::kind::launcher: Points.push_back(Binding.node->location()); return true; + } + return false; +} + +std::string object_key(infra::binding const &Binding) +{ + std::string result; + switch (Binding.type) + { + case infra::kind::model: + { + auto const *model{static_cast(Binding.node)}; + result = model->Model() != nullptr ? model->Model()->NameGet() : std::string{}; + break; + } + case infra::kind::include: result = *scene::Layers.instance(Binding.include).file; break; + case infra::kind::traction: break; + case infra::kind::memcell: + case infra::kind::launcher: result = Binding.node->name(); break; + } + if (result.empty() || result.find_first_of(" \t\r\n") != std::string::npos) + result = "-"; + return result; +} + +std::string object_label(infra::binding const &Binding) +{ + switch (Binding.type) + { + case infra::kind::model: + { + auto const *model{static_cast(Binding.node)}; + auto name{model->Model() != nullptr ? model->Model()->NameGet() : std::string{}}; + if (false == model->name().empty() && model->name() != "none") + name = model->name() + " (" + name + ')'; + return name; + } + case infra::kind::include: return *scene::Layers.instance(Binding.include).file; + case infra::kind::traction: return Binding.node->name().empty() || Binding.node->name() == "none" ? std::string{"traction"} : Binding.node->name(); + case infra::kind::memcell: return "memcell " + Binding.node->name(); + case infra::kind::launcher: return "eventlauncher " + Binding.node->name(); + } + return {}; +} + +void move_model(TAnimModel *Model, glm::dvec3 const &Location, glm::vec3 const &Angles) +{ + if (glm::distance(Model->location(), Location) > 1e-6) + { + simulation::Region->erase(Model); + Model->location(Location); + simulation::Region->insert(Model); + } + Model->Angles(Angles); +} + +void move_traction(TTraction *Traction, std::array const &Points) +{ + if (Traction->pPoint1 == Points[0] && Traction->pPoint2 == Points[1] && Traction->pPoint3 == Points[2] && Traction->pPoint4 == Points[3]) + return; + // the height of the lowest dropper stays the same + auto const minheight{(Traction->pPoint3.y - Traction->pPoint1.y + Traction->pPoint4.y - Traction->pPoint2.y) * 0.5 - Traction->fHeightDifference}; + simulation::Region->erase_and_unregister(Traction); + Traction->pPoint1 = Points[0]; + Traction->pPoint2 = Points[1]; + Traction->pPoint3 = Points[2]; + Traction->pPoint4 = Points[3]; + Traction->fHeightDifference = (Points[2].y - Points[0].y + Points[3].y - Points[1].y) * 0.5 - minheight; + Traction->Init(); + Traction->location(glm::mix(Points[1], Points[0], 0.5)); + Traction->m_area.radius = -1.f; + simulation::Region->insert_and_register(Traction); + Traction->m_geometry = gfx::geometry_handle{}; + auto §ion{simulation::Region->section(Traction->location())}; + if (section.m_geometrycreated) + Traction->create_geometry(section.m_geometrybank); + Traction->mark_dirty(); +} + +void move_memcell(TMemCell *Memcell, glm::dvec3 const &Location) +{ + if (glm::distance(Memcell->location(), Location) <= 1e-6) + return; + simulation::Region->erase(Memcell); + Memcell->location(Location); + simulation::Region->insert(Memcell); +} + +void move_launcher(TEventLauncher *Launcher, glm::dvec3 const &Location) +{ + if (glm::distance(Launcher->location(), Location) <= 1e-6) + return; + // global and radio launchers aren't a part of the region + auto const placed{false == Launcher->IsGlobal() && false == Launcher->IsRadioActivated()}; + if (placed) + simulation::Region->erase(Launcher); + Launcher->location(Location); + if (placed) + simulation::Region->insert(Launcher); + Launcher->mark_dirty(); +} + +// bounding circle of the paths of a track, in the plan +struct track_area +{ + TTrack *track{nullptr}; + glm::dvec3 centre{0.0}; + double radius{0.0}; +}; + +track_area area_of(TTrack &Track) +{ + track_area result; + result.track = &Track; + std::vector points; + for (auto const &path : Track.m_paths) + { + auto const &start{path.points[segment_data::point::start]}; + auto const &end{path.points[segment_data::point::end]}; + points.insert(points.end(), {start, end, start + path.points[segment_data::point::control1], end + path.points[segment_data::point::control2]}); + } + if (points.empty()) + return result; + for (auto const &point : points) + result.centre += point / static_cast(points.size()); + for (auto const &point : points) + result.radius = std::max(result.radius, plan_distance(point, result.centre)); + return result; +} + +// the point lies sideways of the path, not beyond one of its ends +bool beside(infra::station const &Station, glm::dvec3 const &Point, bool const Interior) +{ + if (Interior) + return true; + auto const axis{infra::frame_at(Station)}; + return std::abs(glm::dot(glm::dvec2{Point.x - axis.point.x, Point.z - axis.point.z}, axis.forward)) <= 0.5; +} + +// nearest point of the tracks, sideways from the axis within the corridor +template +bool nearest_beside(Areas_ const &Areas, glm::dvec3 const &Point, double const Corridor, infra::station &Station) +{ + auto best{-1.0}; + for (auto const &entry : Areas) + { + track_area const &area{entry}; + if (plan_distance(Point, area.centre) > area.radius + Corridor) + continue; + infra::station station; + bool interior; + auto const distance{infra::project(*area.track, Point, station, interior)}; + if (distance <= Corridor && (best < 0.0 || distance < best) && beside(station, Point, interior)) + { + best = distance; + Station = station; + } + } + return best >= 0.0; +} + +bool station_near(std::vector const &Areas, glm::dvec3 const &Point, double const Corridor, infra::station &Station) +{ + return nearest_beside(Areas, Point, Corridor, Station); +} + +// paths of the whole scenery by cells of the plan, for the lookups reaching up to kReach from the axis +class track_index +{ + public: + static constexpr double kReach{55.0}; + void add(TTrack &Track) + { + auto const index{m_areas.size()}; + m_areas.push_back(area_of(Track)); + std::set cells; + for (auto const &path : Track.m_paths) + for (auto const &point : infra::outline(path, kCell * 0.5)) + for (auto x = key(point.x - kReach - kCell * 0.25); x <= key(point.x + kReach + kCell * 0.25); ++x) + for (auto z = key(point.z - kReach - kCell * 0.25); z <= key(point.z + kReach + kCell * 0.25); ++z) + cells.insert({x, z}); + for (auto const &cell : cells) + m_cells[cell].push_back(index); + } + bool nearest(glm::dvec3 const &Point, double const Corridor, infra::station &Station) const + { + auto const cell{m_cells.find({key(Point.x), key(Point.z)})}; + if (cell == m_cells.end()) + return false; + std::vector> areas; + for (auto const index : cell->second) + areas.emplace_back(m_areas[index]); + return nearest_beside(areas, Point, std::min(Corridor, kReach), Station); + } + bool empty() const + { + return m_areas.empty(); + } + + private: + static constexpr double kCell{64.0}; + using cell_key = std::pair; + static long long key(double const Value) + { + return static_cast(std::floor(Value / kCell)); + } + std::vector m_areas; + std::map> m_cells; +}; + +// lookup of points by a grid of 1 m cells in the plan +template +class point_grid +{ + public: + void add(glm::dvec3 const &Point, Type_ Item) + { + m_cells[key(Point)].emplace_back(Point, Item); + } + template + std::optional find(glm::dvec3 const &Point, double const Tolerance, Match_ const &Match) const + { + auto const centre{key(Point)}; + for (auto x = centre.first - 1; x <= centre.first + 1; ++x) + for (auto z = centre.second - 1; z <= centre.second + 1; ++z) + { + auto const cell{m_cells.find({x, z})}; + if (cell == m_cells.end()) + continue; + for (auto const &entry : cell->second) + if (glm::distance(entry.first, Point) <= Tolerance && Match(entry.second)) + return entry.second; + } + return std::nullopt; + } + + private: + using cell_key = std::pair; + static cell_key key(glm::dvec3 const &Point) + { + return {static_cast(std::floor(Point.x)), static_cast(std::floor(Point.z))}; + } + std::map>> m_cells; +}; + +double turn_of(infra::binding const &Binding, double const Yaw) +{ + auto const axis{infra::frame_at(Binding.anchors.front().at)}; + return clamp_circular(Yaw - infra::heading(axis.forward)); +} + +} // namespace + +void editor_mode::infra_hooks() +{ + editor_track::on_capture = [this](TTrack const &Track) { infra_capture(Track); }; + editor_track::on_commit = [this](std::vector const &Tracks) { infra_follow(Tracks); }; + editor_track::on_retire = [this](TTrack &) { infra_follow({}); }; + editor_track::on_split = [this](TTrack &Original, TTrack &Created, segment_data const &First) { infra_split(Original, Created, First); }; +} + +// format of the lines, coordinates in the space of the file: +// { } +// the object is the model, the include (position from its parameters), the traction piece (its first point), the memory +// cell or the event launcher found at the location; the anchors name the paths by their ends +void editor_mode::infra_load() +{ + if (m_bindings_loaded || scene::Layers.empty()) + return; + m_bindings_loaded = true; + auto const marked{scene::Layers.marked_layers(kBindingMark)}; + if (marked.empty()) + return; + + point_grid paths; + for (auto *track : simulation::Paths.sequence()) + if (track != nullptr && false == track->m_editorremoved) + for (auto const &path : track->m_paths) + paths.add(path.points[segment_data::point::start], track); + point_grid models; + for (auto *model : simulation::Instances.sequence()) + if (model != nullptr && false == model->from_template() && model->Model() != nullptr) + models.add(model->location(), model); + point_grid traction; + for (auto *piece : simulation::Traction.sequence()) + if (piece != nullptr && false == piece->from_template()) + traction.add(piece->pPoint1, piece); + point_grid logic; + for (auto *memcell : simulation::Memory.sequence()) + if (memcell != nullptr && false == memcell->from_template()) + logic.add(memcell->location(), memcell); + for (auto *launcher : simulation::Events.launchers()) + if (launcher != nullptr && false == launcher->from_template()) + logic.add(launcher->location(), launcher); + point_grid includes; + for (scene::instance_handle handle = 1; handle <= scene::Layers.instance_count(); ++handle) + { + include_place place; + if (include_place_of(handle, place)) + includes.add(include_location(place), handle); + } + + double const tolerance{0.05}; + auto resolved{0}; + for (auto const layer : marked) + { + auto const &context{scene::Layers.layer(layer).context_insert()}; + for (auto const &text : scene::Layers.marked(layer, kBindingMark)) + { + if (text.empty() || text.front() == '#') + continue; + std::istringstream line{text}; + std::string kindname, key; + int group{0}, turns{0}, count{0}; + glm::dvec3 location; + line >> kindname >> group >> location.x >> location.y >> location.z >> key >> turns >> count; + auto const keep = [&]() { m_bindings_unresolved.emplace_back(layer, text); }; + if (line.fail() || count < 1 || count > 4) + { + keep(); + continue; + } + location = context.to_world(location); + infra::binding binding; + binding.group = static_cast(std::clamp(group, 0, static_cast(infra::category::other))); + binding.turns = (turns != 0); + auto found{false}; + if (kindname == infra::name(infra::kind::model)) + { + binding.type = infra::kind::model; + auto const model{models.find(location, tolerance, [&](TAnimModel *Model) { return Model->Model()->NameGet() == key; })}; + if ((found = model.has_value())) + binding.node = *model; + } + else if (kindname == infra::name(infra::kind::include)) + { + binding.type = infra::kind::include; + auto const handle{includes.find(location, tolerance, [&](scene::instance_handle Handle) { return *scene::Layers.instance(Handle).file == key; })}; + if ((found = handle.has_value())) + binding.include = *handle; + } + else if (kindname == infra::name(infra::kind::traction)) + { + binding.type = infra::kind::traction; + auto const piece{traction.find(location, tolerance, [](TTraction *) { return true; })}; + if ((found = piece.has_value())) + binding.node = *piece; + } + else if (kindname == infra::name(infra::kind::memcell) || kindname == infra::name(infra::kind::launcher)) + { + binding.type = (kindname == infra::name(infra::kind::memcell) ? infra::kind::memcell : infra::kind::launcher); + auto const node{logic.find(location, tolerance, [&](scene::basic_node *Node) { + auto const ismemcell{dynamic_cast(Node) != nullptr}; + return ismemcell == (binding.type == infra::kind::memcell) && (key == "-" || Node->name() == key); + })}; + if ((found = node.has_value())) + binding.node = *node; + } + std::vector points; + std::optional yaw; + if (false == found || false == object_points(binding, points, yaw)) + { + keep(); + continue; + } + for (int i = 0; i < count && found; ++i) + { + int path{0}; + glm::dvec3 start, end; + line >> path >> start.x >> start.y >> start.z >> end.x >> end.y >> end.z; + start = context.to_world(start); + end = context.to_world(end); + auto const track{paths.find(start, tolerance, [&](TTrack *Track) { + return path >= 0 && path < static_cast(Track->m_paths.size()) && + glm::distance(Track->m_paths[path].points[segment_data::point::start], start) <= tolerance && + glm::distance(Track->m_paths[path].points[segment_data::point::end], end) <= tolerance; + })}; + if (line.fail() || false == track.has_value()) + { + found = false; + break; + } + auto const &point{points[std::min(i, points.size() - 1)]}; + double s; + bool interior; + infra::project((*track)->m_paths[path], point, s, interior); + binding.anchors.push_back(infra::make_anchor({*track, path, s}, point)); + } + if (false == found || binding.anchors.size() != points.size()) + { + keep(); + continue; + } + binding.turns = binding.turns && yaw.has_value(); + if (binding.turns) + binding.yaw = turn_of(binding, *yaw); + binding.label = object_label(binding); + m_bindings.push_back(std::move(binding)); + ++resolved; + } + } + WriteLog("Editor: " + std::to_string(resolved) + " object(s) bound to the paths read from the scenery" + + (m_bindings_unresolved.empty() ? std::string{} : ", " + std::to_string(m_bindings_unresolved.size()) + " binding(s) whose objects or paths weren't found are kept as they are"), + logtype::generic); +} + +void editor_mode::infra_store() +{ + if (false == m_bindings_loaded || scene::Layers.empty()) + return; + Live.refresh(); + m_bindings.erase(std::remove_if(m_bindings.begin(), m_bindings.end(), [](infra::binding const &Binding) { return false == alive(Binding); }), m_bindings.end()); + + std::map> lines; + for (auto const layer : scene::Layers.marked_layers(kBindingMark)) + lines[layer]; + for (auto const &entry : m_bindings_unresolved) + lines[entry.first].push_back(entry.second); + for (auto const &binding : m_bindings) + { + std::vector points; + std::optional yaw; + if (binding.anchors.empty() || false == object_points(binding, points, yaw)) + continue; + auto layer{scene::Layers.resolve(binding.anchors.front().at.track->layer())}; + if (false == scene::Layers.valid(layer) || false == scene::Layers.accepts(layer)) + layer = scene::Layers.active(); + if (false == scene::Layers.valid(layer)) + layer = 1; + auto const &context{scene::Layers.layer(layer).context_insert()}; + auto const local = [&](glm::dvec3 const &Point) { + auto const point{context.to_local(Point)}; + return format("%.4f %.4f %.4f", point.x, point.y, point.z); + }; + auto text{std::string{infra::name(binding.type)} + ' ' + std::to_string(static_cast(binding.group)) + ' ' + local(points.front()) + ' ' + object_key(binding) + ' ' + + (binding.turns ? "1 " : "0 ") + std::to_string(binding.anchors.size())}; + for (auto const &anchor : binding.anchors) + { + auto const &path{anchor.at.track->m_paths[anchor.at.path]}; + text += ' ' + std::to_string(anchor.at.path) + ' ' + local(path.points[segment_data::point::start]) + ' ' + local(path.points[segment_data::point::end]); + } + lines[layer].push_back(std::move(text)); + } + for (auto &entry : lines) + { + if (false == entry.second.empty()) + entry.second.insert(entry.second.begin(), "# objects bound to the paths in the track editor, they follow changes of the track; the simulation skips these lines"); + scene::Layers.mark(entry.first, kBindingMark, std::move(entry.second)); + } + m_bindings_changed = false; +} + +std::vector editor_mode::infra_scope() const +{ + std::vector result; + auto const add = [&](TTrack *Track) { + if (Track != nullptr && false == Track->m_editorremoved && editor_track::is_supported(*Track) && false == contains(result, Track)) + result.push_back(Track); + }; + auto *selected{selected_track()}; + switch (m_infra.scope) + { + case 0: add(selected); break; + case 1: + if (selected != nullptr) + for (auto const &span : editor_track::run_route(*selected, m_infra.reach).spans) + add(span.track); + break; + case 2: + for (auto const &span : m_profile.route.spans) + add(span.track); + break; + case 3: + for (auto *track : simulation::Paths.sequence()) + if (track != nullptr && false == track->m_editorremoved && editor_track::is_supported(*track)) + result.push_back(track); + break; + default: break; + } + return result; +} + +infra::binding *editor_mode::infra_find(infra::binding const &Binding) +{ + for (auto &binding : m_bindings) + if (binding.same(Binding)) + return &binding; + return nullptr; +} + +void editor_mode::infra_recognize() +{ + auto &state{m_infra}; + infra_load(); + state.candidates.clear(); + state.hovered = -1; + state.error.clear(); + state.status.clear(); + state.tracks = infra_scope(); + if (state.tracks.empty()) + { + state.error = (state.scope == 2 ? "Open the vertical profile of a route first" : state.scope == 3 ? "The scenery has no paths the editor can handle" : "Select a path first"); + return; + } + track_index index; + std::unordered_set names; + for (auto *track : state.tracks) + { + index.add(*track); + if (false == track->name().empty() && track->name() != "none") + names.insert(track->name()); + } + Live.refresh(); + + auto const corridor{static_cast(state.corridor)}; + auto const add = [&](infra::binding Binding, std::string const &Reason, double const Reach) { + std::vector points; + std::optional yaw; + if (false == object_points(Binding, points, yaw)) + return; + for (auto const &point : points) + { + infra::station station; + if (false == index.nearest(point, Reach, station)) + return; + Binding.anchors.push_back(infra::make_anchor(station, point)); + } + if (std::abs(Binding.anchors.front().height) > 40.0) + return; + Binding.turns = yaw.has_value() && Binding.type != infra::kind::traction; + if (Binding.turns) + Binding.yaw = turn_of(Binding, *yaw); + Binding.label = object_label(Binding); + infra_candidate candidate; + candidate.offset = Binding.anchors.front().offset; + candidate.reason = Reason; + candidate.bound = (infra_find(Binding) != nullptr); + candidate.chosen = (false == candidate.bound && Binding.group != infra::category::other); + candidate.binding = std::move(Binding); + state.candidates.push_back(std::move(candidate)); + }; + auto const rule_reason = [](infra::category const Group, char const *What) { return Group == infra::category::other ? std::string{"nearby, no rule matches the "} + What : std::string{"the "} + What + " matches a rule"; }; + + for (auto *model : simulation::Instances.sequence()) + { + // models of the includes follow along with their include + if (model == nullptr || model->from_template() || model->Model() == nullptr) + continue; + infra::binding binding; + binding.type = infra::kind::model; + binding.node = model; + binding.group = infra::classify(model->Model()->NameGet() + ' ' + model->name(), state.rules); + add(binding, rule_reason(binding.group, "file name"), corridor); + } + for (scene::instance_handle handle = 1; handle <= scene::Layers.instance_count(); ++handle) + { + include_place place; + if (false == include_place_of(handle, place)) + continue; + infra::binding binding; + binding.type = infra::kind::include; + binding.include = handle; + binding.group = infra::classify(place.file + ' ' + place.description, state.rules); + add(binding, rule_reason(binding.group, "template or its description"), corridor); + } + for (auto *piece : simulation::Traction.sequence()) + { + if (piece == nullptr || piece->from_template()) + continue; + infra::binding binding; + binding.type = infra::kind::traction; + binding.node = piece; + binding.group = infra::category::catenary; + add(binding, "wire over the track", corridor); + } + for (auto *memcell : simulation::Memory.sequence()) + { + if (memcell == nullptr || memcell->from_template()) + continue; + infra::binding binding; + binding.type = infra::kind::memcell; + binding.node = memcell; + binding.group = infra::category::logic; + auto const named{false == memcell->asTrackName.empty() && names.count(memcell->asTrackName) > 0}; + add(binding, named ? "names the path " + memcell->asTrackName : std::string{"nearby"}, named ? std::max(corridor, 50.0) : corridor); + } + for (auto *launcher : simulation::Events.launchers()) + { + if (launcher == nullptr || launcher->from_template()) + continue; + infra::binding binding; + binding.type = infra::kind::launcher; + binding.node = launcher; + binding.group = infra::category::logic; + add(binding, "nearby", corridor); + } + std::stable_sort(state.candidates.begin(), state.candidates.end(), [](infra_candidate const &A, infra_candidate const &B) { return A.binding.group < B.binding.group; }); + state.status = format("%d object(s) found along %d path(s)", static_cast(state.candidates.size()), static_cast(state.tracks.size())); +} + +void editor_mode::infra_bind_chosen() +{ + auto &state{m_infra}; + auto count{0}; + Live.refresh(); + for (auto &candidate : state.candidates) + { + if (false == candidate.chosen || candidate.bound || false == alive(candidate.binding)) + continue; + if (auto *existing{infra_find(candidate.binding)}) + *existing = candidate.binding; + else + m_bindings.push_back(candidate.binding); + candidate.bound = true; + candidate.chosen = false; + ++count; + } + if (count > 0) + m_bindings_changed = true; + state.status = format("%d object(s) bound, they follow the changes of the track. The bindings are kept in the scenery files on save", count); +} + +void editor_mode::infra_unbind(std::vector Indices) +{ + std::sort(Indices.begin(), Indices.end()); + Indices.erase(std::unique(Indices.begin(), Indices.end()), Indices.end()); + for (auto index{Indices.rbegin()}; index != Indices.rend(); ++index) + { + if (*index >= m_bindings.size()) + continue; + for (auto &candidate : m_infra.candidates) + if (candidate.binding.same(m_bindings[*index])) + candidate.bound = false; + m_bindings.erase(m_bindings.begin() + *index); + } + if (false == Indices.empty()) + m_bindings_changed = true; +} + +infra::object_state editor_mode::infra_state_of(infra::binding const &Binding) const +{ + infra::object_state result; + result.saved = Binding; + switch (Binding.type) + { + case infra::kind::model: + { + auto const *model{static_cast(Binding.node)}; + result.location = model->location(); + result.angles = model->Angles(); + break; + } + case infra::kind::include: result.directive = scene::Layers.directive(Binding.include); break; + case infra::kind::traction: + { + auto const *traction{static_cast(Binding.node)}; + result.points = {traction->pPoint1, traction->pPoint2, traction->pPoint3, traction->pPoint4}; + break; + } + case infra::kind::memcell: + case infra::kind::launcher: result.location = Binding.node->location(); break; + } + return result; +} + +void editor_mode::infra_restore_state(infra::object_state const &State) +{ + Live.refresh(); + if (false == alive(State.saved)) + return; + if (auto *binding{infra_find(State.saved)}) + *binding = State.saved; + switch (State.saved.type) + { + case infra::kind::model: move_model(static_cast(State.saved.node), State.location, State.angles); break; + case infra::kind::include: + if (false == State.directive.empty() && State.directive != scene::Layers.directive(State.saved.include)) + set_include_directive(State.saved.include, State.directive); + break; + case infra::kind::traction: move_traction(static_cast(State.saved.node), State.points); break; + case infra::kind::memcell: move_memcell(static_cast(State.saved.node), State.location); break; + case infra::kind::launcher: move_launcher(static_cast(State.saved.node), State.location); break; + } +} + +void editor_mode::infra_buffer(infra::binding const &Binding, bool const Refresh) +{ + for (auto &entry : m_infra_buffer) + { + if (false == entry.saved.same(Binding)) + continue; + if (Refresh && false == entry.moved) + entry = infra_state_of(Binding); + return; + } + if (false == Refresh && false == m_history.empty() && m_history.back().action == EditorSnapshot::Action::TrackEdit) + { + // a drag keeps a single undo step, which holds the state from before the drag already + for (auto const &entry : m_history.back().infra) + if (entry.saved.same(Binding)) + return; + } + m_infra_buffer.push_back(infra_state_of(Binding)); +} + +void editor_mode::infra_capture(TTrack const &Track) +{ + if (m_infra_suspended || false == m_infra.follow) + return; + infra_load(); + if (m_bindings.empty()) + return; + Live.refresh(); + for (auto &binding : m_bindings) + { + if (std::none_of(binding.anchors.begin(), binding.anchors.end(), [&](infra::anchor const &Anchor) { return Anchor.at.track == &Track; }) || false == alive(binding)) + continue; + // an object moved by hand since it was bound is measured again, as long as the path is the way it was measured + std::vector points; + std::optional yaw; + if (object_points(binding, points, yaw) && points.size() == binding.anchors.size()) + { + for (std::size_t i = 0; i < points.size(); ++i) + { + auto &anchor{binding.anchors[i]}; + if (anchor.at.track != &Track || anchor.at.path >= static_cast(Track.m_paths.size())) + continue; + auto const &path{Track.m_paths[anchor.at.path]}; + if (glm::distance(path.points[segment_data::point::start], anchor.start) > 1e-4 || glm::distance(path.points[segment_data::point::end], anchor.end) > 1e-4) + continue; + auto placed{anchor}; + if (glm::distance(infra::place(placed), points[i]) <= 0.01) + continue; + double s; + bool interior; + infra::project(path, points[i], s, interior); + anchor = infra::make_anchor({anchor.at.track, anchor.at.path, s}, points[i]); + } + if (binding.turns && yaw.has_value() && binding.anchors.front().at.track == &Track) + binding.yaw = turn_of(binding, *yaw); + } + infra_buffer(binding, true); + } +} + +void editor_mode::infra_follow(std::vector const &Tracks) +{ + if (m_infra_suspended || false == m_infra.follow) + return; + infra_load(); + if (m_bindings.empty()) + return; + Live.refresh(); + std::vector areas; + for (auto *track : Tracks) + if (false == track->m_editorremoved) + areas.push_back(area_of(*track)); + // paths which took over may have been committed before the old ones were retired + std::optional> everywhere; + auto const take_over = [&](glm::dvec3 const &Foot, infra::station &Station) { + if (station_near(areas, Foot, 30.0, Station)) + return true; + if (false == everywhere.has_value()) + { + everywhere.emplace(); + for (auto *track : simulation::Paths.sequence()) + if (track != nullptr && false == track->m_editorremoved && editor_track::is_supported(*track)) + everywhere->push_back(area_of(*track)); + } + // only a path running where the old one did, not the one alongside + return station_near(*everywhere, Foot, 1.0, Station); + }; + for (auto &binding : m_bindings) + { + auto const affected{std::any_of(binding.anchors.begin(), binding.anchors.end(), [&](infra::anchor const &Anchor) { + return Anchor.at.track != nullptr && (Anchor.at.track->m_editorremoved || contains(Tracks, Anchor.at.track)); + })}; + if (false == affected || false == alive(binding)) + continue; + auto moved{binding}; + auto lost{false}; + for (auto &anchor : moved.anchors) + { + auto *track{anchor.at.track}; + if (false == track->m_editorremoved && false == contains(Tracks, track)) + continue; + // the object goes square to the new axis from the point of the old one, so a shift of the track carries it + // sideways rather than along; its own path goes first, then the ones which took over + infra::station station; + auto found{false}; + if (false == track->m_editorremoved && anchor.at.path < static_cast(track->m_paths.size())) + { + double s; + bool interior; + auto const distance{infra::project(track->m_paths[anchor.at.path], anchor.foot, s, interior)}; + station = {track, anchor.at.path, s}; + found = (distance <= 30.0 && beside(station, anchor.foot, interior)); + } + if (false == found && false == take_over(anchor.foot, station)) + { + lost = true; + break; + } + auto const offset{anchor.offset}; + auto const height{anchor.height}; + anchor = infra::make_anchor(station, anchor.foot); + anchor.offset = offset; + anchor.height = height; + } + if (lost) + { + binding.lost = true; + continue; + } + infra_buffer(binding, false); + moved.lost = false; + binding = std::move(moved); + infra_move(binding); + for (auto &entry : m_infra_buffer) + if (entry.saved.same(binding)) + entry.moved = true; + } +} + +void editor_mode::infra_split(TTrack &Original, TTrack &Created, segment_data const &First) +{ + if (m_infra_suspended || Created.m_paths.empty()) + return; + auto const length{infra::plan_length(First)}; + auto const &second{Created.m_paths.front()}; + for (auto &binding : m_bindings) + for (auto &anchor : binding.anchors) + { + if (anchor.at.track != &Original || anchor.at.path != 0) + continue; + if (anchor.at.s > length) + { + anchor.at.track = &Created; + anchor.at.s -= length; + anchor.start = second.points[segment_data::point::start]; + anchor.end = second.points[segment_data::point::end]; + anchor.length = infra::plan_length(second); + } + else + { + anchor.end = First.points[segment_data::point::end]; + anchor.length = length; + } + } +} + +void editor_mode::infra_move(infra::binding &Binding) +{ + if (Binding.anchors.empty()) + return; + auto const location{infra::place(Binding.anchors.front())}; + auto const facing = [&]() { return clamp_circular(infra::heading(infra::frame_at(Binding.anchors.front().at).forward) + Binding.yaw); }; + switch (Binding.type) + { + case infra::kind::model: + { + auto *model{static_cast(Binding.node)}; + auto angles{model->Angles()}; + if (Binding.turns) + angles.y = static_cast(facing()); + move_model(model, location, angles); + break; + } + case infra::kind::include: + { + include_place place; + if (false == include_place_of(Binding.include, place)) + return; + for (int axis = 0; axis < 3; ++axis) + place.values[place.position[axis]] = editor_includes::number(location[axis] - place.offset[axis]); + if (Binding.turns && place.yaw >= 0) + place.values[place.yaw] = editor_includes::number(facing()); + auto const directive{editor_includes::compose_directive(place.file, place.values)}; + if (directive != scene::Layers.directive(Binding.include)) + set_include_directive(Binding.include, directive); + break; + } + case infra::kind::traction: + { + if (Binding.anchors.size() != 4) + return; + std::array points; + for (std::size_t i = 0; i < 4; ++i) + points[i] = infra::place(Binding.anchors[i]); + move_traction(static_cast(Binding.node), points); + break; + } + case infra::kind::memcell: move_memcell(static_cast(Binding.node), location); break; + case infra::kind::launcher: move_launcher(static_cast(Binding.node), location); break; + } +} + +void editor_mode::infra_attach(EditorSnapshot &Snapshot) +{ + auto const involved = [&](infra::object_state const &State) { + if (State.moved) + return true; + for (auto const &anchor : State.saved.anchors) + { + if (contains(Snapshot.created, anchor.at.track)) + return true; + for (auto const &entry : Snapshot.tracks) + if (entry.first == anchor.at.track) + return true; + } + return false; + }; + for (auto &entry : m_infra_buffer) + if (involved(entry)) + Snapshot.infra.push_back(std::move(entry)); + m_infra_buffer.clear(); +} + +void editor_mode::render_infra_window() +{ + auto &state{m_infra}; + if (false == state.open) + return; + ImGui::SetNextWindowSize(ImVec2(560, 620), ImGuiCond_FirstUseEver); + if (false == ImGui::Begin("Infrastructure along the track###trackinfra", &state.open)) + { + ImGui::End(); + return; + } + infra_load(); + Live.refresh(); + + auto follow{state.follow}; + if (ImGui::Checkbox("Bound objects follow the changes of the track", &follow)) + { + state.follow = follow; + if (follow) + { + // what changed in the meantime becomes the new starting point + for (auto &binding : m_bindings) + { + std::vector points; + std::optional yaw; + if (false == alive(binding) || false == object_points(binding, points, yaw) || points.size() != binding.anchors.size()) + continue; + for (std::size_t i = 0; i < points.size(); ++i) + { + auto &anchor{binding.anchors[i]}; + if (anchor.at.track == nullptr || anchor.at.track->m_editorremoved || anchor.at.path >= static_cast(anchor.at.track->m_paths.size())) + { + binding.lost = true; + continue; + } + double s; + bool interior; + infra::project(anchor.at.track->m_paths[anchor.at.path], points[i], s, interior); + anchor = infra::make_anchor({anchor.at.track, anchor.at.path, s}, points[i]); + } + if (binding.turns && yaw.has_value()) + binding.yaw = turn_of(binding, *yaw); + } + } + } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("Bound objects keep their chainage along the path, the offset from its axis and the height above the rail top;\n" + "models and includes turn with the path and stay upright. The move is a part of the undo step of the change."); + ImGui::SameLine(); + ImGui::Checkbox("Show in 3D", &state.show); + ImGui::Text("Objects bound in the scenery: %d", static_cast(m_bindings.size())); + if (false == m_bindings_unresolved.empty()) + { + ImGui::SameLine(); + ImGui::TextColored(ImVec4(1.f, 0.8f, 0.3f, 1.f), "(%d stored binding(s) not found, kept as they are)", static_cast(m_bindings_unresolved.size())); + } + + ImGui::Separator(); + static char const *const scopes[] = {"Selected path", "Line through the selected path", "Route of the vertical profile", "Whole scenery"}; + ImGui::SetNextItemWidth(260.f); + ImGui::Combo("Look along", &state.scope, scopes, IM_ARRAYSIZE(scopes)); + if (state.scope == 1) + { + ImGui::SetNextItemWidth(120.f); + ImGui::InputFloat("Reach each way, m", &state.reach, 100.f, 500.f, "%.0f"); + state.reach = std::clamp(state.reach, 10.f, 20000.f); + } + ImGui::SetNextItemWidth(120.f); + ImGui::InputFloat("Corridor each side of the axis, m", &state.corridor, 0.5f, 2.f, "%.1f"); + state.corridor = std::clamp(state.corridor, 0.5f, 50.f); + if (ImGui::TreeNode("Rules for names of the files")) + { + ImGui::TextDisabled("Parts of the names, separated by spaces; the first rule which matches decides"); + for (std::size_t i = 0; i < state.rules.size(); ++i) + { + auto &rule{state.rules[i]}; + char buffer[512]; + std::snprintf(buffer, sizeof(buffer), "%s", rule.keywords.c_str()); + ImGui::SetNextItemWidth(360.f); + if (ImGui::InputText((std::string{infra::name(rule.group)} + "##rule" + std::to_string(i)).c_str(), buffer, sizeof(buffer))) + rule.keywords = buffer; + } + if (ImGui::SmallButton("Default rules")) + state.rules = infra::default_rules(); + ImGui::TextDisabled("Includes are matched by the template name and its //$e description, models by the file and node name;\n" + "traction is always the catenary, memory cells and event launchers the logic"); + ImGui::TreePop(); + } + if (ImGui::Button("Find objects")) + infra_recognize(); + + auto &candidates{state.candidates}; + state.hovered = -1; + if (false == candidates.empty()) + { + int chosen{0}; + for (auto const &candidate : candidates) + chosen += candidate.chosen ? 1 : 0; + ImGui::SameLine(); + if (ImGui::Button(format("Bind the chosen (%d)", chosen).c_str())) + infra_bind_chosen(); + ImGui::SameLine(); + if (ImGui::SmallButton("All")) + for (auto &candidate : candidates) + candidate.chosen = (false == candidate.bound); + ImGui::SameLine(); + if (ImGui::SmallButton("None")) + for (auto &candidate : candidates) + candidate.chosen = false; + + ImGui::BeginChild("##infracandidates", ImVec2(0.f, 260.f), true); + for (auto const group : infra::categories()) + { + auto const count{std::count_if(candidates.begin(), candidates.end(), [&](infra_candidate const &Candidate) { return Candidate.binding.group == group; })}; + if (count == 0) + continue; + ImGui::PushStyleColor(ImGuiCol_Text, ImGui::ColorConvertU32ToFloat4(colour(group))); + auto const open{ImGui::TreeNodeEx(format("%s (%d)", infra::name(group), static_cast(count)).c_str(), group == infra::category::other ? 0 : ImGuiTreeNodeFlags_DefaultOpen)}; + ImGui::PopStyleColor(); + ImGui::SameLine(); + if (ImGui::SmallButton((std::string{"all##g"} + infra::name(group)).c_str())) + for (auto &candidate : candidates) + if (candidate.binding.group == group) + candidate.chosen = (false == candidate.bound); + ImGui::SameLine(); + if (ImGui::SmallButton((std::string{"none##g"} + infra::name(group)).c_str())) + for (auto &candidate : candidates) + if (candidate.binding.group == group) + candidate.chosen = false; + if (false == open) + continue; + // the candidates are sorted by the category + auto const first{static_cast(std::distance(candidates.begin(), std::find_if(candidates.begin(), candidates.end(), [&](infra_candidate const &Candidate) { return Candidate.binding.group == group; })))}; + ImGuiListClipper clipper(static_cast(count)); + while (clipper.Step()) + for (int row = clipper.DisplayStart; row < clipper.DisplayEnd; ++row) + { + auto const i{static_cast(first + row)}; + auto &candidate{candidates[i]}; + ImGui::PushID(static_cast(i)); + if (candidate.bound) + { + ImGui::TextDisabled("[bound]"); + } + else + { + ImGui::Checkbox("##chosen", &candidate.chosen); + } + ImGui::SameLine(); + ImGui::Text("%s", candidate.binding.label.c_str()); + if (ImGui::IsItemHovered()) + { + state.hovered = static_cast(i); + ImGui::SetTooltip("%s, %s\n%.2f m %s of the axis, %.2f m above the rail top\n%s", infra::name(candidate.binding.type), candidate.binding.anchors.front().at.track->name().c_str(), + std::abs(candidate.offset), candidate.offset >= 0.0 ? "right" : "left", candidate.binding.anchors.front().height, candidate.reason.c_str()); + } + ImGui::SameLine(); + ImGui::TextDisabled("%s %+.1f m", infra::name(candidate.binding.type), candidate.offset); + ImGui::PopID(); + } + ImGui::TreePop(); + } + ImGui::EndChild(); + } + + if (ImGui::TreeNode("Bound objects along the scope")) + { + auto const scope{infra_scope()}; + std::unordered_set const tracks(scope.begin(), scope.end()); + std::vector along; + for (std::size_t i = 0; i < m_bindings.size(); ++i) + if (std::any_of(m_bindings[i].anchors.begin(), m_bindings[i].anchors.end(), [&](infra::anchor const &Anchor) { return tracks.count(Anchor.at.track) > 0; })) + along.push_back(i); + ImGui::Text("%d of %d", static_cast(along.size()), static_cast(m_bindings.size())); + if (false == along.empty()) + { + ImGui::SameLine(); + if (ImGui::SmallButton("Unbind all of these")) + { + infra_unbind(along); + along.clear(); + } + } + std::optional unbind; + ImGui::BeginChild("##infrabound", ImVec2(0.f, 160.f), true); + ImGuiListClipper clipper(static_cast(along.size())); + while (clipper.Step()) + for (int row = clipper.DisplayStart; row < clipper.DisplayEnd; ++row) + { + auto const index{along[row]}; + auto const &binding{m_bindings[index]}; + ImGui::PushID(static_cast(index)); + if (ImGui::SmallButton("unbind")) + unbind = index; + ImGui::SameLine(); + ImGui::PushStyleColor(ImGuiCol_Text, ImGui::ColorConvertU32ToFloat4(binding.lost ? IM_COL32(255, 80, 70, 255) : colour(binding.group))); + ImGui::Text("%s%s", binding.label.c_str(), binding.lost ? " (no path to follow)" : ""); + ImGui::PopStyleColor(); + ImGui::PopID(); + } + ImGui::EndChild(); + if (unbind) + infra_unbind({*unbind}); + ImGui::TreePop(); + } + + if (false == state.error.empty()) + ImGui::TextColored(ImVec4(1.f, 0.4f, 0.35f, 1.f), "%s", state.error.c_str()); + else if (false == state.status.empty()) + ImGui::TextWrapped("%s", state.status.c_str()); + ImGui::End(); +} + +void editor_mode::draw_infra_overlay() const +{ + auto const &state{m_infra}; + if (false == state.open || false == state.show) + return; + Live.refresh(); + screen_projection const projection; + ImDrawList *drawlist{ImGui::GetBackgroundDrawList()}; + auto const camera{GfxRenderer->Camera_Position()}; + auto const draw = [&](infra::binding const &Binding, ImU32 const Colour, float const Size) { + if (Binding.anchors.empty() || glm::distance(Binding.anchors.front().foot, camera) > 2000.0) + return; + std::vector points; + std::optional yaw; + if (false == alive(Binding) || false == object_points(Binding, points, yaw)) + return; + for (std::size_t i = 0; i < points.size() && i < Binding.anchors.size(); ++i) + { + auto anchor{Binding.anchors[i]}; + auto const foot{infra::frame_at(anchor.at).point}; + projection.line(drawlist, foot, points[i], Colour, 1.5f); + } + ImVec2 screen; + if (projection.project(points.front(), screen)) + drawlist->AddCircleFilled(screen, Size, Colour); + }; + for (auto const &binding : m_bindings) + draw(binding, binding.lost ? IM_COL32(255, 60, 60, 255) : IM_COL32(90, 230, 110, 220), 3.5f); + for (int i = 0; i < static_cast(state.candidates.size()); ++i) + { + auto const &candidate{state.candidates[i]}; + if (candidate.bound) + continue; + draw(candidate.binding, colour(candidate.binding.group, candidate.chosen ? 255 : 110), i == state.hovered ? 9.f : (candidate.chosen ? 5.f : 3.f)); + } +} diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index ed5ecd308..29a2ab9b6 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -342,6 +342,7 @@ void editor_mode::push_track_snapshot(std::vectoruuid; snap.tracks = std::move(States); snap.created = std::move(Created); + infra_attach(snap); m_history.push_back(std::move(snap)); g_redo.clear(); } @@ -354,6 +355,7 @@ void editor_mode::restore_track_snapshot(EditorSnapshot const &Snapshot, std::ve std::vector tracks; for (auto const &entry : Snapshot.tracks) tracks.emplace_back(entry.first); + m_infra_suspended = true; EditorSnapshot current{Snapshot}; current.tracks.clear(); auto involved{tracks}; @@ -361,6 +363,10 @@ void editor_mode::restore_track_snapshot(EditorSnapshot const &Snapshot, std::ve involved.insert(involved.end(), Snapshot.created.begin(), Snapshot.created.end()); for (auto *track : involved) current.tracks.emplace_back(track, editor_track::capture(*track)); + current.infra.clear(); + for (auto const &entry : Snapshot.infra) + if (auto const *binding{infra_find(entry.saved)}) + current.infra.push_back(infra_state_of(*binding)); Opposite.push_back(std::move(current)); if (Undo) @@ -383,6 +389,10 @@ void editor_mode::restore_track_snapshot(EditorSnapshot const &Snapshot, std::ve for (auto const &entry : Snapshot.tracks) editor_track::apply(*entry.first, entry.second); editor_track::commit(tracks); + for (auto const &entry : Snapshot.infra) + infra_restore_state(entry); + m_infra_buffer.clear(); + m_infra_suspended = false; if (false == m_route.chain.tracks.empty()) { std::string error; @@ -420,6 +430,9 @@ void editor_mode::render_track_ui() profile_open_run(*track); m_profile.open = true; } + ImGui::SameLine(); + if (ImGui::Button("Infrastructure")) + m_infra.open = true; if (ImGui::CollapsingHeader("Straights in the scenery")) render_straights_ui(); render_switch_ui(); @@ -470,6 +483,13 @@ void editor_mode::render_track_window() } if (ImGui::SmallButton("Vertical profile along this line") && selected_track() != nullptr) profile_open_run(*selected_track()); + ImGui::SameLine(); + if (ImGui::SmallButton("Infrastructure along this line")) + { + m_infra.open = true; + m_infra.scope = 1; + infra_recognize(); + } ImGui::End(); } diff --git a/editor/editorInfra.cpp b/editor/editorInfra.cpp new file mode 100644 index 000000000..974b5689a --- /dev/null +++ b/editor/editorInfra.cpp @@ -0,0 +1,304 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "editor/editorInfra.hpp" + +#include "world/Track.h" + +#include +#include +#include +#include + +namespace infra +{ + +namespace +{ + +int const kSteps{128}; + +struct curve +{ + glm::dvec3 p0, p1, p2, p3; +}; + +curve curve_of(segment_data const &Path) +{ + auto const &start{Path.points[segment_data::point::start]}; + auto const &end{Path.points[segment_data::point::end]}; + auto const &control1{Path.points[segment_data::point::control1]}; + auto const &control2{Path.points[segment_data::point::control2]}; + if (control1 == glm::dvec3{} && control2 == glm::dvec3{}) + return {start, start + (end - start) / 3.0, end + (start - end) / 3.0, end}; + return {start, start + control1, end + control2, end}; +} + +glm::dvec3 point(curve const &Curve, double const T) +{ + auto const u{1.0 - T}; + return Curve.p0 * (u * u * u) + Curve.p1 * (3.0 * u * u * T) + Curve.p2 * (3.0 * u * T * T) + Curve.p3 * (T * T * T); +} + +glm::dvec3 derivative(curve const &Curve, double const T) +{ + auto const u{1.0 - T}; + return (Curve.p1 - Curve.p0) * (3.0 * u * u) + (Curve.p2 - Curve.p1) * (6.0 * u * T) + (Curve.p3 - Curve.p2) * (3.0 * T * T); +} + +double plan(glm::dvec3 const &A, glm::dvec3 const &B) +{ + return std::hypot(A.x - B.x, A.z - B.z); +} + +// arc length in the plan at the evenly spread parameters +std::array lengths(curve const &Curve) +{ + std::array result{}; + auto previous{Curve.p0}; + for (int i = 1; i <= kSteps; ++i) + { + auto const next{point(Curve, static_cast(i) / kSteps)}; + result[i] = result[i - 1] + plan(previous, next); + previous = next; + } + return result; +} + +double parameter(std::array const &Lengths, double const S) +{ + if (S <= 0.0) + return 0.0; + if (S >= Lengths.back()) + return 1.0; + auto const next{std::upper_bound(Lengths.begin(), Lengths.end(), S)}; + auto const index{static_cast(std::distance(Lengths.begin(), next)) - 1}; + auto const run{Lengths[index + 1] - Lengths[index]}; + auto const fraction{run > 1e-12 ? (S - Lengths[index]) / run : 0.0}; + return (index + fraction) / kSteps; +} + +double length_at(std::array const &Lengths, double const T) +{ + auto const position{std::clamp(T, 0.0, 1.0) * kSteps}; + auto const index{std::min(static_cast(position), kSteps - 1)}; + return Lengths[index] + (Lengths[index + 1] - Lengths[index]) * (position - index); +} + +glm::dvec2 plan_direction(curve const &Curve, double const T) +{ + auto tangent{derivative(Curve, T)}; + glm::dvec2 result{tangent.x, tangent.z}; + if (glm::length(result) < 1e-9) + result = {Curve.p3.x - Curve.p0.x, Curve.p3.z - Curve.p0.z}; + return glm::length(result) > 1e-9 ? glm::normalize(result) : glm::dvec2{0.0, 1.0}; +} + +std::string lower(std::string Text) +{ + std::transform(Text.begin(), Text.end(), Text.begin(), [](unsigned char c) { return static_cast(std::tolower(c)); }); + return Text; +} + +} // namespace + +char const *name(kind const Kind) +{ + switch (Kind) + { + case kind::model: return "model"; + case kind::include: return "include"; + case kind::traction: return "traction"; + case kind::memcell: return "memcell"; + case kind::launcher: return "eventlauncher"; + } + return ""; +} + +char const *name(category const Category) +{ + switch (Category) + { + case category::signal: return "Signals"; + case category::sign: return "Signs"; + case category::pole: return "Poles and gantries"; + case category::catenary: return "Catenary"; + case category::logic: return "Logic"; + case category::other: return "Other"; + } + return ""; +} + +std::vector const &categories() +{ + static std::vector const result{category::signal, category::sign, category::pole, category::catenary, category::logic, category::other}; + return result; +} + +double plan_length(segment_data const &Path) +{ + return lengths(curve_of(Path)).back(); +} + +std::vector outline(segment_data const &Path, double const Step) +{ + auto const shape{curve_of(Path)}; + // the speed along the curve doesn't exceed three times the longest leg of the control polygon + auto const leg{std::max({plan(shape.p0, shape.p1), plan(shape.p1, shape.p2), plan(shape.p2, shape.p3)})}; + auto const count{std::clamp(static_cast(std::ceil(3.0 * leg / std::max(Step, 0.1))), 1, 4096)}; + std::vector result; + result.reserve(count + 1); + for (int i = 0; i <= count; ++i) + result.push_back(point(shape, static_cast(i) / count)); + return result; +} + +frame frame_at(segment_data const &Path, double const S) +{ + auto const shape{curve_of(Path)}; + auto const t{parameter(lengths(shape), S)}; + return {point(shape, t), plan_direction(shape, t)}; +} + +frame frame_at(station const &Station) +{ + if (Station.track == nullptr || Station.path < 0 || Station.path >= static_cast(Station.track->m_paths.size())) + return {}; + return frame_at(Station.track->m_paths[Station.path], Station.s); +} + +double project(segment_data const &Path, glm::dvec3 const &Point, double &S, bool &Interior) +{ + auto const shape{curve_of(Path)}; + auto const table{lengths(shape)}; + auto const distance = [&](double const T) { return plan(point(shape, T), Point); }; + auto best{0}; + auto bestdistance{distance(0.0)}; + for (int i = 1; i <= kSteps; ++i) + { + auto const d{distance(static_cast(i) / kSteps)}; + if (d < bestdistance) + { + bestdistance = d; + best = i; + } + } + // golden section search around the nearest sample + auto low{std::max(0, best - 1) / static_cast(kSteps)}; + auto high{std::min(kSteps, best + 1) / static_cast(kSteps)}; + double const ratio{0.6180339887498949}; + auto a{high - ratio * (high - low)}; + auto b{low + ratio * (high - low)}; + auto da{distance(a)}, db{distance(b)}; + for (int i = 0; i < 40; ++i) + { + if (da < db) + { + high = b; + b = a; + db = da; + a = high - ratio * (high - low); + da = distance(a); + } + else + { + low = a; + a = b; + da = db; + b = low + ratio * (high - low); + db = distance(b); + } + } + auto t{(low + high) * 0.5}; + if (distance(0.0) <= distance(t)) + t = 0.0; + if (distance(1.0) <= distance(t)) + t = 1.0; + S = length_at(table, t); + Interior = (t > 1e-6 && t < 1.0 - 1e-6); + return distance(t); +} + +double project(TTrack &Track, glm::dvec3 const &Point, station &Station, bool &Interior) +{ + auto best{-1.0}; + for (int i = 0; i < static_cast(Track.m_paths.size()); ++i) + { + double s; + bool interior; + auto const d{project(Track.m_paths[i], Point, s, interior)}; + // an interior point takes precedence over an end shared with the other path + if (best < 0.0 || d < best - 1e-6 || (std::abs(d - best) <= 1e-6 && interior && false == Interior)) + { + best = d; + Station = {&Track, i, s}; + Interior = interior; + } + } + return best; +} + +double heading(glm::dvec2 const &Forward) +{ + return glm::degrees(std::atan2(Forward.x, Forward.y)); +} + +anchor make_anchor(station const &At, glm::dvec3 const &Point) +{ + anchor result; + result.at = At; + auto const axis{frame_at(At)}; + glm::dvec2 const side{axis.forward.y, -axis.forward.x}; + result.offset = glm::dot(glm::dvec2{Point.x - axis.point.x, Point.z - axis.point.z}, side); + result.height = Point.y - axis.point.y; + result.foot = axis.point; + if (At.track != nullptr && At.path >= 0 && At.path < static_cast(At.track->m_paths.size())) + { + auto const &path{At.track->m_paths[At.path]}; + result.start = path.points[segment_data::point::start]; + result.end = path.points[segment_data::point::end]; + result.length = plan_length(path); + } + return result; +} + +glm::dvec3 place(anchor &Anchor) +{ + auto const axis{frame_at(Anchor.at)}; + Anchor.foot = axis.point; + glm::dvec2 const side{axis.forward.y, -axis.forward.x}; + return {axis.point.x + side.x * Anchor.offset, axis.point.y + Anchor.height, axis.point.z + side.y * Anchor.offset}; +} + +std::vector default_rules() +{ + return { + {category::signal, "semafor sem_ sem- tarcza tarcz_ tz_ tm_ tzw powtarz sygnaliz sygnal signal"}, + {category::sign, "wskaz wsk_ wsk- w4 w8 w11 w24 w27 kilometr hektometr slupek_km znak tablic sign"}, + {category::catenary, "trakcj siec_ siec- catenary przewod lina_nosna"}, + {category::pole, "slup maszt wysieg bramk konstrukcj kotw odciag pole gantry"}, + }; +} + +category classify(std::string const &Name, std::vector const &Rules) +{ + auto const text{lower(Name)}; + for (auto const &rule : Rules) + { + std::istringstream words{lower(rule.keywords)}; + std::string word; + while (words >> word) + if (text.find(word) != std::string::npos) + return rule.group; + } + return category::other; +} + +} // namespace infra diff --git a/editor/editorInfra.hpp b/editor/editorInfra.hpp new file mode 100644 index 000000000..afb76d8e8 --- /dev/null +++ b/editor/editorInfra.hpp @@ -0,0 +1,128 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include +#include +#include + +#include "world/Segment.h" +#include "scene/scenenode.h" + +class TTrack; + +// objects which belong to the railway infrastructure (signals, signs, catenary, poles, the logic placed along the +// line) bound to the paths they stand by, so they follow the changes of the track geometry +namespace infra +{ + +enum class kind +{ + model, + include, + traction, + memcell, + launcher +}; +enum class category +{ + signal, + sign, + pole, + catenary, + logic, + other +}; +char const *name(kind Kind); +char const *name(category Category); +std::vector const &categories(); + +// point of a path, measured in the plan from the start of the path +struct station +{ + TTrack *track{nullptr}; + int path{0}; + double s{0.0}; +}; +struct frame +{ + glm::dvec3 point{0.0}; + glm::dvec2 forward{0.0, 1.0}; // in the plan, x and z +}; + +double plan_length(segment_data const &Path); +// points of the path, no farther apart in the plan than about specified step; the ends included +std::vector outline(segment_data const &Path, double Step); +frame frame_at(segment_data const &Path, double S); +frame frame_at(station const &Station); +// nearest point of specified path in the plan. returns: distance in the plan; Interior tells the nearest point +// isn't one of the ends of the path +double project(segment_data const &Path, glm::dvec3 const &Point, double &S, bool &Interior); +// nearest point among the paths of the track +double project(TTrack &Track, glm::dvec3 const &Point, station &Station, bool &Interior); +// angle around the vertical axis which turns a model to face specified direction, in degrees +double heading(glm::dvec2 const &Forward); + +// location of a point relative to the rail axis: the station, a sideways offset and a height above the rail top +struct anchor +{ + station at; + double offset{0.0}; // positive to the right of the direction of the path + double height{0.0}; + glm::dvec3 foot{0.0}; // point of the axis the location was measured from + // ends and length of the path when the station was measured, to tell whether the path changed since + glm::dvec3 start{0.0}, end{0.0}; + double length{0.0}; +}; +anchor make_anchor(station const &At, glm::dvec3 const &Point); +// location for the current geometry of the path +glm::dvec3 place(anchor &Anchor); + +// rules telling infrastructure apart by the names of the files and nodes +struct rule +{ + category group{category::other}; + std::string keywords; // separated by spaces, matched as parts of the lower case name +}; +std::vector default_rules(); +// first rule in the list which matches. returns: category::other if none does +category classify(std::string const &Name, std::vector const &Rules); + +struct binding +{ + kind type{kind::model}; + category group{category::other}; + scene::basic_node *node{nullptr}; // the object, unless it's an include + scene::instance_handle include{0}; + std::vector anchors; // one per point which defines the object: four for a traction piece + double yaw{0.0}; // rotation of the object relative to the direction of the path + bool turns{false}; // the object has a rotation which follows the path + std::string label; + bool lost{false}; // none of the paths around could take the object over + + bool same(binding const &Other) const + { + return type == Other.type && node == Other.node && include == Other.include; + } +}; + +// placement of a bound object, to take a change back +struct object_state +{ + binding saved; + glm::dvec3 location{0.0}; + glm::vec3 angles{0.f}; + std::array points{}; + std::string directive; + bool moved{false}; // the object followed a change since the state was taken +}; + +} // namespace infra diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index a579defe8..f86f012fb 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -124,8 +124,15 @@ bool adjoining_direction(TTrack const *Neighbour, glm::dvec3 const &Joint, bool } +std::function editor_track::on_capture; +std::function const &)> editor_track::on_commit; +std::function editor_track::on_retire; +std::function editor_track::on_split; + editor_track::state editor_track::capture(TTrack const &Track) { + if (on_capture) + on_capture(Track); state result; result.paths = Track.m_paths; result.velocity = Track.fVelocity; @@ -235,6 +242,8 @@ void editor_track::commit(std::vector const &Tracks) for (auto *track : affected) for (auto *vehicle : track->Dynamics) vehicle->Move(0.000001); + if (on_commit) + on_commit(Tracks); } void editor_track::commit_parameters(TTrack &Track) @@ -2300,6 +2309,8 @@ TTrack *editor_track::split_path(TTrack &Track, double const T) second.rolls[0] = roll; auto *created{create_path(Track, second)}; Track.m_paths.front() = first; + if (on_split) + on_split(Track, *created, first); commit({&Track, created}); return created; } @@ -2336,6 +2347,8 @@ void editor_track::retire(TTrack &Track) update_transition(*neighbour); rebuild_geometry(*neighbour); } + if (on_retire) + on_retire(Track); } void editor_track::revive(TTrack &Track) diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index 396a66c5d..34b0a7d8e 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -227,6 +227,13 @@ class editor_track static void velocity(TTrack &Track, double const Velocity); static void damage(TTrack &Track, int const Damage); + // let the objects which belong to the paths follow their changes + static std::function on_capture; + static std::function const &)> on_commit; + static std::function on_retire; + // called before the commit; the first argument keeps the beginning of the path, given in the last one + static std::function on_split; + private: static void disconnect(TTrack &Track); static void join(TTrack &Track); diff --git a/scene/scene.cpp b/scene/scene.cpp index e72ab9301..d876a7ba1 100644 --- a/scene/scene.cpp +++ b/scene/scene.cpp @@ -503,6 +503,30 @@ basic_cell::erase( TMemCell *Memorycell ) { std::end( m_memorycells ) ); } +void +basic_cell::erase( TTraction *Traction ) { + + m_traction.erase( + std::remove( std::begin( m_traction ), std::end( m_traction ), Traction ), + std::end( m_traction ) ); +} + +void +basic_cell::unregister_end( TTraction *Traction ) { + + m_directories.traction.erase( + std::remove( std::begin( m_directories.traction ), std::end( m_directories.traction ), Traction ), + std::end( m_directories.traction ) ); +} + +void +basic_cell::erase( TEventLauncher *Launcher ) { + + m_eventlaunchers.erase( + std::remove( std::begin( m_eventlaunchers ), std::end( m_eventlaunchers ), Launcher ), + std::end( m_eventlaunchers ) ); +} + // registers provided path in the lookup directory of the cell void basic_cell::register_end( TTrack *Path ) { diff --git a/scene/scene.h b/scene/scene.h index 5cad1fcc6..23c912d72 100644 --- a/scene/scene.h +++ b/scene/scene.h @@ -155,6 +155,14 @@ public: // removes provided memory cell from the cell void erase( TMemCell *Memorycell ); + // removes provided traction piece from the cell + void + erase( TTraction *Traction ); + void + unregister_end( TTraction *Traction ); + // removes provided event launcher from the cell + void + erase( TEventLauncher *Launcher ); // find a vehicle located nearest to specified point, within specified radius. reurns: located vehicle and distance std::tuple find( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled, bool const Findbycoupler ) const; diff --git a/scene/scenelayers.h b/scene/scenelayers.h index 523e2da3a..28517c163 100644 --- a/scene/scenelayers.h +++ b/scene/scenelayers.h @@ -292,6 +292,11 @@ class node_layers { return Instance != 0 && Instance <= m_instances.size(); } + // handles of the includes run from 1 up to this number + std::size_t instance_count() const + { + return m_instances.size(); + } // grants access to specified include. NOTE: the include has to be tracked include_instance const &instance(instance_handle const Instance) const { diff --git a/scene/scenelayerssave.cpp b/scene/scenelayerssave.cpp index 9d5f9297b..02029a3a5 100644 --- a/scene/scenelayerssave.cpp +++ b/scene/scenelayerssave.cpp @@ -14,6 +14,9 @@ http://mozilla.org/MPL/2.0/. #include "simulation/simulation.h" #include "model/AnimModel.h" #include "world/MemCell.h" +#include "world/Traction.h" +#include "world/EvLaunch.h" +#include "world/Event.h" #include "utilities/Globals.h" #include "utilities/Logs.h" #include "utilities/utilities.h" @@ -233,6 +236,54 @@ bool patch_memcell(std::string &Text, glm::dvec3 const &Location, std::string &E return true; } +// definition layout: node traction +// [parallel ] endtraction +bool patch_traction(std::string &Text, TTraction const &Traction, glm::dvec3 const &Offset, std::string &Error) +{ + auto const tokens{tokenize(Text)}; + if (tokens.size() < 30 || tokens[0].text != "node" || tokens[4].text != "traction" || tokens.back().text != "endtraction") + { + Error = "unexpected layout of traction definition"; + return false; + } + std::vector changes; + std::size_t index{12}; + for (auto const &point : {Traction.pPoint1, Traction.pPoint2, Traction.pPoint3, Traction.pPoint4}) + { + auto const local{point - Offset}; + for (auto const value : {local.x, local.y, local.z}) + { + changes.push_back({tokens[index].begin, tokens[index].end, number(value)}); + ++index; + } + } + auto const &p1{Traction.pPoint1}; + auto const &p2{Traction.pPoint2}; + auto const &p3{Traction.pPoint3}; + auto const &p4{Traction.pPoint4}; + changes.push_back({tokens[24].begin, tokens[24].end, number((p3.y - p1.y + p4.y - p2.y) * 0.5 - Traction.fHeightDifference)}); + if (Traction.iNumSections > 0) + { + // the load truncates length / segment length, the margin keeps the rounding of the number from losing a section + changes.push_back({tokens[25].begin, tokens[25].end, number(glm::length(p1 - p2) / (Traction.iNumSections + 0.001))}); + } + apply(Text, changes); + return true; +} + +// definition layout: node eventlauncher ... end +bool patch_launcher(std::string &Text, glm::dvec3 const &Location, std::string &Error) +{ + auto const tokens{tokenize(Text)}; + if (tokens.size() < 9 || tokens[0].text != "node" || tokens[4].text != "eventlauncher") + { + Error = "unexpected layout of event launcher definition"; + return false; + } + apply(Text, {{tokens[5].begin, tokens[5].end, number(Location.x)}, {tokens[6].begin, tokens[6].end, number(Location.y)}, {tokens[7].begin, tokens[7].end, number(Location.z)}}); + return true; +} + std::string detect_eol(std::string const &Text, std::string const &Fallback) { auto const linebreak{Text.find('\n')}; @@ -730,6 +781,63 @@ save_result node_layers::save(std::vector const &Rootstatements) return fail(state.error); } } + // traction and event launchers are rewritten when the editor moved them along with the track they belong to + std::vector patchednodes; + auto const patch_node = [&](basic_node *Node, auto const &Patch) { + auto const lookup{m_sources.find(Node)}; + if (lookup == m_sources.end() || false == Node->dirty()) + { + return true; + } + auto const &source{lookup->second}; + if (false == is_output(resolve(source.layer)) || false == writable(source.layer)) + { + return true; + } + if (false == load(source.layer)) + { + return false; + } + auto const &content{state.content[source.layer]}; + if (source.span.end > static_cast(content.size())) + { + state.error = "definition of \"" + Node->name() + "\" is out of bounds of file \"" + layer(source.layer).name + "\""; + return false; + } + auto text{content.substr(static_cast(source.span.begin), static_cast(source.span.end - source.span.begin))}; + std::string error; + if (false == Patch(text, source, error)) + { + state.error = error + " of \"" + Node->name() + "\" in file \"" + layer(source.layer).name + "\""; + return false; + } + file_patch::edit edit; + edit.begin = source.span.begin; + edit.end = source.span.end; + edit.length = text.size(); + edit.text = std::move(text); + edit.node = Node; + state.patches[source.layer].edits.emplace_back(std::move(edit)); + rewritten.emplace(Node); + patchednodes.push_back(Node); + return true; + }; + for (auto *traction : simulation::Traction.sequence()) + { + if (traction != nullptr && + false == patch_node(traction, [&](std::string &Text, node_source const &Source, std::string &Error) { return patch_traction(Text, *traction, Source.context.offset, Error); })) + { + return fail(state.error); + } + } + for (auto *launcher : simulation::Events.launchers()) + { + if (launcher != nullptr && + false == patch_node(launcher, [&](std::string &Text, node_source const &Source, std::string &Error) { return patch_launcher(Text, Source.context.to_local(launcher->location()), Error); })) + { + return fail(state.error); + } + } std::vector savedpaths; std::vector droppedpaths; auto const path_text = [](TTrack &Path, glm::dvec3 const &Offset) { @@ -1281,6 +1389,10 @@ save_result node_layers::save(std::vector const &Rootstatements) { path->m_dirty = false; } + for (auto *node : patchednodes) + { + node->m_dirty = false; + } for (auto const *path : droppedpaths) { m_sources.erase(path); diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index 18cd07af5..da0813a8a 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -510,6 +510,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch } scene::Groups.insert( scene::Groups.handle(), traction ); simulation::Region->insert_and_register( traction ); + scene::Layers.track( traction, { sourcebegin, Input.TokenEnd() } ); } else if( nodedata.type == "tractionpowersource" ) { @@ -656,6 +657,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch simulation::Region->insert( eventlauncher ); } } + scene::Layers.track( eventlauncher, { sourcebegin, Input.TokenEnd() } ); } else if( nodedata.type == "sound" ) { diff --git a/world/Event.h b/world/Event.h index 52ee3468d..9b8f32d84 100644 --- a/world/Event.h +++ b/world/Event.h @@ -699,6 +699,14 @@ public: // returns all eventlaunchers in radius ignoring height std::vector find_eventlaunchers(glm::vec2 center, float radius) const; + // all event launchers, global ones included + std::vector + launchers() const { + auto const &input { m_inputdrivenlaunchers.sequence() }; + auto const &radio { m_radiodrivenlaunchers.sequence() }; + std::vector result( input.begin(), input.end() ); + result.insert( result.end(), radio.begin(), radio.end() ); + return result; } private: // types From 3ce9102da080f0dde342ba8a8dcbee60e7f86418 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Sun, 4 Oct 2026 00:31:44 +0200 Subject: [PATCH 086/430] feat(roads): level crossings, spawn and removal points for road vehicles, deleting points of a road --- CMakeLists.txt | 1 + application/editormode.h | 24 +- application/editormoderoad.cpp | 547 ++++++++++- editor/editorRoad.cpp | 365 ++++++- editor/editorRoad.hpp | 26 +- scene/scenelayerssave.cpp | 71 ++ simulation/simulation.cpp | 4 + simulation/simulation.h | 1 + simulation/simulationstateserializer.cpp | 29 +- utilities/Classes.h | 2 + world/RoadPoint.cpp | 1125 ++++++++++++++++++++++ world/RoadPoint.h | 207 ++++ 12 files changed, 2369 insertions(+), 33 deletions(-) create mode 100644 world/RoadPoint.cpp create mode 100644 world/RoadPoint.h diff --git a/CMakeLists.txt b/CMakeLists.txt index bdda3ea9c..091446470 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,6 +96,7 @@ set(SOURCES "utilities/Timer.cpp" "world/Track.cpp" "world/Road.cpp" +"world/RoadPoint.cpp" "world/Traction.cpp" "world/TractionPower.cpp" "vehicle/Train.cpp" diff --git a/application/editormode.h b/application/editormode.h index 15d5de4d4..47f218929 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -500,9 +500,10 @@ class editor_mode : public application_mode { bool window{false}; // the road window is open, the left mouse button belongs to its tools bool lanes{true}; // lanes of the roads are drawn as trajectories - int tool{0}; // 0: select, 1: build + int tool{0}; // 0: select, 1: build, 2: place road_node *selected{nullptr}; junction_node *junction{nullptr}; // selected junction + roadpoint_node *marker{nullptr}; // selected level crossing or traffic point std::vector points; // selected points where the pieces meet or end road_node::state settings; // layout shown in the window: of the selected piece, or of the pieces about to be built bool whole{true}; // layout changes go to every piece of the road the selected one belongs to @@ -522,6 +523,17 @@ class editor_mode : public application_mode bool follow{true}; // built roads are led over the ground between the clicked points float crossingspeed{30.f}; // speed limit on the junctions being made float heightstep{0.1f}; // how much the selected points are raised or lowered at a time + // level crossings and traffic points + int placekind{0}; // what the place tool puts down: 0: level crossing, 1: spawn point, 2: removal point + roadpoint_node::state placing[3]; // what the next point of each kind is going to be like + float stopmargin{5.f}; // distance from the outermost track of a new crossing to the places the vehicles stop at + roadpoint_node::state target; // the point a click of the place tool would make at the moment + bool hastarget{false}; + glm::dvec3 targetdirection{0.0}; // the way the traffic goes there + std::string targetnote; // what's worth knowing about that point, or why there's none + glm::dvec3 aimed{0.0}; // where the cursor was when the target was worked out, and for what kind of point + int aimedkind{-1}; + char vehicles[4096]{}; // vehicles to add to the set of a spawn point, written the way they're put in a scenery road_plan plan; // what a click would make at the moment, worked out once a frame for display glm::dvec3 hover{0.0}; // point of a road or a junction under the cursor a road can be led out of bool hashover{false}; @@ -550,6 +562,16 @@ class editor_mode : public application_mode void road_point_width(float const Width); void road_point_heights(std::vector const &Heights); bool road_points_apply(std::vector> const &Changes, std::vector> const &Junctions); + // takes the selected points out of their roads + bool road_points_delete(); + // level crossings and traffic points + void roadpoint_select(roadpoint_node *Point); + // works out the point a click of the place tool would make. Fresh: even if the cursor is where it was the last time + void roadpoint_aim(bool const Fresh); + void roadpoint_place(); + void roadpoint_apply(roadpoint_node &Point, roadpoint_node::state const &State); + // Point: the point the controls are for, nullptr for the one about to be made + bool render_roadpoint_layout(roadpoint_node::state &State, roadpoint_node const *Point); // Fresh: the ground which wasn't looked up yet is gathered on the spot, instead of a bit of it each frame road_plan road_preview(bool const Fresh); // Firstgrade, Lastgrade: slopes the road has to start and end with, nullptr for none diff --git a/application/editormoderoad.cpp b/application/editormoderoad.cpp index 59c78b984..4c38c7988 100644 --- a/application/editormoderoad.cpp +++ b/application/editormoderoad.cpp @@ -15,6 +15,7 @@ http://mozilla.org/MPL/2.0/. #include "rendering/renderer.h" #include "world/Track.h" #include "world/Road.h" +#include "world/RoadPoint.h" #include "simulation/simulation.h" #include "imgui/imgui.h" @@ -133,6 +134,10 @@ double const kSnapRadius{4.0}; // an end of a road this close to the cursor is w double const kPointRadius{2.5}; // a point where pieces meet this close to the click is what gets selected, instead of the piece double const kPointRange{400.0}; // the points are drawn for the roads this close to the camera double const kSideMargin{1.0}; // how far past the edge of a road the cursor still counts as being on it +double const kMarkerRadius{2.0}; // a level crossing or a traffic point this close to the click is what gets selected +double const kRailReach{40.0}; // rails crossing the road this close to the cursor are taken for a single level crossing +double const kLaneReach{2.5}; // a lane with its middle this close to the cursor is the one a traffic point is put on +double const kFullTurn{6.283185307179586}; double const kJoinClearance{15.0}; // a road isn't led into the side of another this close to the point it's led from double const kReach{3000.0}; // clicks landing further than this are taken for misses double const kLaneRange{600.0}; // lanes are drawn for the roads this close to the camera @@ -151,6 +156,19 @@ ImU32 const kSelectedColor{IM_COL32(40, 220, 255, 230)}; ImU32 const kPreviewColor{IM_COL32(255, 210, 60, 255)}; ImU32 const kRefusedColor{IM_COL32(240, 60, 60, 255)}; ImU32 const kSnapColor{IM_COL32(255, 60, 255, 255)}; +ImU32 const kCrossingColor{IM_COL32(255, 220, 60, 230)}; +ImU32 const kSpawnColor{IM_COL32(90, 230, 120, 230)}; +ImU32 const kDespawnColor{IM_COL32(255, 110, 110, 230)}; + +roadpoint_node::kind_type point_kind(int const Index) +{ + return Index == 1 ? roadpoint_node::kind_type::spawn : Index == 2 ? roadpoint_node::kind_type::despawn : roadpoint_node::kind_type::crossing; +} + +char const *point_label(roadpoint_node::kind_type const Kind) +{ + return Kind == roadpoint_node::kind_type::spawn ? "spawn point" : Kind == roadpoint_node::kind_type::despawn ? "removal point" : "level crossing"; +} // gathers new definitions for the pieces which meet or end at provided points. // Change: receives a definition, which end of it is at the point, and the number of the point @@ -209,6 +227,8 @@ void editor_mode::update_road_tool() tool.selected = nullptr; if (tool.junction != nullptr && tool.junction->m_editorremoved) tool.junction = nullptr; + if (tool.marker != nullptr && tool.marker->m_editorremoved) + tool.marker = nullptr; if ((tool.branchroad != nullptr && tool.branchroad->m_editorremoved) || (tool.branchjunction != nullptr && tool.branchjunction->m_editorremoved)) { // what the road was to be led out of is gone @@ -220,6 +240,11 @@ void editor_mode::update_road_tool() tool.points.erase(std::remove_if(tool.points.begin(), tool.points.end(), [](glm::dvec3 const &Point) { return editor_road::ends_at(Point).empty(); }), tool.points.end()); tool.plan = road_plan{}; tool.hashover = false; + if (false == tool.window || tool.tool != 2) + { + tool.hastarget = false; + tool.aimedkind = -1; + } if (false == tool.window) { tool.chain = false; @@ -230,6 +255,14 @@ void editor_mode::update_road_tool() if (glm::distance(tool.mouse, camera) > kReach) { tool.plan.error = "The cursor isn't over anything near enough"; + tool.hastarget = false; + tool.aimedkind = -1; + return; + } + if (tool.tool == 2) + { + // the point a click would make at the moment, to be drawn over the view + roadpoint_aim(false); return; } if (tool.tool != 1) @@ -289,6 +322,280 @@ void editor_mode::junction_select(junction_node *Junction) copy_text(tool.sides[0], sizeof(tool.sides[0]), Junction->definition().side.material); } +void editor_mode::roadpoint_select(roadpoint_node *Point) +{ + auto &tool{m_roadtool}; + tool.marker = Point; + if (Point == nullptr) + return; + std::string reason; + tool.status = "Selected: " + Point->name(); + if (false == editor_road::can_edit(*Point, &reason)) + tool.status += ". It can't be changed: " + reason; +} + +// works out the point a click of the place tool would make with the cursor where it is +void editor_mode::roadpoint_aim(bool const Fresh) +{ + auto &tool{m_roadtool}; + if (false == Fresh && tool.aimedkind == tool.placekind && glm::distance(tool.aimed, tool.mouse) < 0.1) + { + // the cursor didn't move, so neither did what it points at + return; + } + tool.aimed = tool.mouse; + tool.aimedkind = tool.placekind; + auto const kind{point_kind(tool.placekind)}; + tool.target = tool.placing[tool.placekind]; + tool.target.kind = kind; + tool.hastarget = false; + tool.targetnote.clear(); + tool.targetdirection = glm::dvec3{0.0}; + if (kind == roadpoint_node::kind_type::crossing) + { + auto const *road{editor_road::nearest(tool.mouse, kSideMargin)}; + if (road == nullptr) + { + tool.targetnote = "Point at the place a road crosses the rails"; + return; + } + glm::dvec3 middle{0.0}; + double halfspan{0.0}; + if (editor_road::rails_across(*road, tool.mouse, kRailReach, middle, halfspan)) + { + // the crossing goes halfway between the outermost tracks. the distance is rounded up, so it reads well in the scenery file + tool.target.position = middle; + tool.target.clearance = static_cast(std::ceil((halfspan + tool.stopmargin) * 2.0) * 0.5); + } + else + { + tool.target.position = road->definition().point(editor_road::nearest_parameter(road->definition(), tool.mouse)); + tool.target.clearance = std::max(tool.stopmargin, 2.0f); + tool.targetnote = "No rails cross the road here; a crossing put here won't close until some do"; + } + tool.hastarget = true; + return; + } + if (false == editor_road::nearest_lane(tool.mouse, kLaneReach, tool.target.position, tool.targetdirection)) + { + tool.targetnote = "Point at a lane of a road"; + return; + } + tool.hastarget = true; +} + +// puts down the point the place tool is set for, as a step which can be taken back +void editor_mode::roadpoint_place() +{ + auto &tool{m_roadtool}; + roadpoint_aim(true); + if (false == tool.hastarget) + { + tool.status = tool.targetnote; + return; + } + auto const created{editor_road::create(std::vector{tool.target})}; + if (created.empty()) + { + tool.status = "No scenery is loaded"; + return; + } + auto const *point{created.front()}; + auto const &state{point->definition()}; + editor_road::record record; + record.points_created = created; + push_road_snapshot(std::move(record)); + char text[64]; + switch (state.kind) + { + case roadpoint_node::kind_type::crossing: + { + std::snprintf(text, sizeof(text), "%.1f", state.clearance); + tool.status = "Level crossing made: " + std::to_string(point->stops().size()) + " lanes stop " + text + " m from its middle, "; + tool.status += std::to_string(point->rails()) + " tracks are watched for trains."; + break; + } + case roadpoint_node::kind_type::spawn: + { + tool.status = (state.vehicles.empty() ? std::string{"Spawn point made, with no vehicles: nothing appears there until it's given some (Select, click the point)."} : + "Spawn point made, with " + std::to_string(state.vehicles.size() * state.copies) + " vehicles. They appear while the simulation runs."); + break; + } + case roadpoint_node::kind_type::despawn: + { + tool.status = "Removal point made, it takes vehicles from " + std::to_string(point->lanes().size()) + (point->lanes().size() == 1 ? " lane." : " lanes."); + break; + } + } + if (false == tool.targetnote.empty()) + tool.status += " " + tool.targetnote + "."; +} + +// replaces the definition of a level crossing or a traffic point, as a step which can be taken back +void editor_mode::roadpoint_apply(roadpoint_node &Point, roadpoint_node::state const &State) +{ + auto &tool{m_roadtool}; + std::string reason; + if (false == editor_road::can_edit(Point, &reason)) + { + tool.status = "\"" + Point.name() + "\" can't be changed: " + reason; + return; + } + editor_road::record record; + record.points.emplace_back(&Point, Point.definition()); + editor_road::apply(std::vector>{{&Point, State}}); + push_road_snapshot(std::move(record)); + tool.status = "Changed"; +} + +// draws controls for a level crossing or a traffic point. returns: true if something was changed +bool editor_mode::render_roadpoint_layout(roadpoint_node::state &State, roadpoint_node const *Point) +{ + auto &tool{m_roadtool}; + bool changed{false}; + // values typed for a point which is there already are taken when confirmed, so the point isn't made anew with each digit + auto const flags{Point != nullptr ? ImGuiInputTextFlags_EnterReturnsTrue : ImGuiInputTextFlags_None}; + auto const number = [flags](char const *Label, float &Value, float const Step, char const *Format) { + ImGui::SetNextItemWidth(120.0f); + return ImGui::InputFloat(Label, &Value, Step, Step * 4.0f, Format, flags); + }; + ImVec4 const warning{1.0f, 0.6f, 0.3f, 1.0f}; + switch (State.kind) + { + case roadpoint_node::kind_type::crossing: + { + if (Point != nullptr) + { + ImGui::Text("%d lanes stop here, %d tracks are watched for trains", static_cast(Point->stops().size()), static_cast(Point->rails())); + if (Point->rails() == 0) + ImGui::TextColored(warning, "No rails pass through it, so it never closes"); + // the crossing is tied to what's there when it's made or changed, and when the roads change + if (ImGui::Button("Look for the rails again")) + changed = true; + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "For when the tracks were laid or changed after the crossing was made."); + if (number("Stop this far from the middle [m]", State.clearance, 0.5f, "%.1f")) + changed = true; + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "Where the vehicles stop, measured along the road from the middle of the crossing.\n" + "The tracks passing within that distance from the middle are the ones the crossing is closed for."); + } + else + { + if (number("Stop this far from the outermost track [m]", tool.stopmargin, 0.5f, "%.1f")) + tool.stopmargin = std::clamp(tool.stopmargin, 2.0f, 50.0f); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "Where the vehicles stop, measured along the road from the axis of the first track they'd get to."); + } + if (number("Closes with a train this far away [m]", State.warning, 50.0f, "%.0f")) + changed = true; + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "Measured along the tracks, both ways, with both ways of each switch counted.\n" + "A rail vehicle within that distance which gets nearer closes the crossing, and so does one right at it.\n" + "It opens a few seconds after the last one is gone."); + if (ImGui::Checkbox("Paint the stop lines", &State.stoplines)) + changed = true; + break; + } + case roadpoint_node::kind_type::spawn: + { + if (Point != nullptr) + { + if (Point->lanes().empty()) + ImGui::TextColored(warning, "It isn't on a lane, so nothing appears here"); + else if (Point->vehicles() == 0) + ImGui::TextDisabled("The vehicles are made when the simulation runs"); + else + ImGui::Text("%d vehicles made, %d of them wait for their turn", static_cast(Point->vehicles()), static_cast(Point->waiting())); + } + if (number("A vehicle every [s]", State.interval, 1.0f, "%.0f")) + changed = true; + if (number("Uneven by [0-1]", State.variation, 0.1f, "%.2f")) + changed = true; + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "Part of the time between vehicles which is drawn at random each time.\n" + "0: they come like clockwork, 1: anything from one right after another to twice the time."); + if (number("Speed [km/h]", State.velocity, 5.0f, "%.0f")) + changed = true; + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "The speed the vehicles appear with. From there on the drivers go by the speed limits of the lanes."); + ImGui::SetNextItemWidth(120.0f); + if (ImGui::InputInt("Copies of each vehicle", &State.copies, 1, 1, flags)) + changed = true; + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "How many of each vehicle of the set are made. A vehicle can't be in two places at once,\n" + "so this is how many of a kind can be on the road together. All of them are loaded along with the scenery,\n" + "and a vehicle taken by a removal point goes back to wait for its next turn."); + // the set + ImGui::Separator(); + ImGui::Text("Vehicles of the set: %d", static_cast(State.vehicles.size())); + int removed{-1}; + for (std::size_t index = 0; index < State.vehicles.size(); ++index) + { + auto const &vehicle{State.vehicles[index]}; + ImGui::PushID(static_cast(index)); + if (ImGui::SmallButton("x")) + removed = static_cast(index); + ImGui::SameLine(); + if (vehicle.load > 0) + ImGui::Text("%s / %s, %s, %d %s", vehicle.folder.c_str(), vehicle.type.c_str(), vehicle.skin.c_str(), vehicle.load, vehicle.loadtype.c_str()); + else + ImGui::Text("%s / %s, %s", vehicle.folder.c_str(), vehicle.type.c_str(), vehicle.skin.c_str()); + ImGui::PopID(); + } + if (removed >= 0) + { + State.vehicles.erase(State.vehicles.begin() + removed); + changed = true; + } + if (State.vehicles.empty()) + ImGui::TextColored(warning, "No vehicles, so nothing appears here"); + ImGui::InputTextMultiline("##vehicles", tool.vehicles, sizeof(tool.vehicles), ImVec2(-1.0f, ImGui::GetTextLineHeight() * 5.0f)); + if (ImGui::Button("Add to the set")) + { + auto const parsed{roadpoint_node::parse_vehicles(tool.vehicles)}; + if (parsed.empty()) + { + tool.status = "No vehicle found in the text"; + } + else + { + State.vehicles.insert(State.vehicles.end(), parsed.begin(), parsed.end()); + tool.vehicles[0] = 0; + changed = true; + } + } + ImGui::SameLine(); + if (ImGui::Button("Empty the set") && false == State.vehicles.empty()) + { + State.vehicles.clear(); + changed = true; + } + ImGui::TextDisabled("Paste the vehicles the way they're put in a scenery:"); + ImGui::TextDisabled("node -1 0 none dynamic "); + ImGui::TextDisabled(" enddynamic"); + ImGui::TextDisabled("or as , one vehicle a line."); + ImGui::TextDisabled("The path, the offset, the driver and the velocity don't matter."); + break; + } + case roadpoint_node::kind_type::despawn: + { + if (Point != nullptr) + ImGui::Text("Takes vehicles from %d %s", static_cast(Point->lanes().size()), Point->lanes().size() == 1 ? "lane" : "lanes"); + if (number("Takes vehicles this close [m]", State.radius, 0.5f, "%.1f")) + changed = true; + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "Road vehicles on the lanes passing within this distance from the point are taken off the road when they get here,\n" + "except for the one the user drives. Vehicles which came from a spawn point go back to wait for their next turn.\n" + "The distance it starts with takes in a single lane."); + break; + } + } + if (changed && Point != nullptr) + State.normalize(); + return changed; +} + // replaces the definition of a junction, as a step which can be taken back void editor_mode::junction_apply(junction_node &Junction, junction_node::state const &State) { @@ -636,8 +943,23 @@ void editor_mode::road_click() return; } tool.mouse = ground; + if (tool.tool == 2) + { + roadpoint_place(); + return; + } if (tool.tool == 0) { + if (auto *marker{editor_road::nearest_point(ground, kMarkerRadius)}; marker != nullptr) + { + // a level crossing or a traffic point + tool.points.clear(); + tool.junction = nullptr; + road_select(nullptr); + roadpoint_select(marker); + return; + } + tool.marker = nullptr; glm::dvec3 joint; if (editor_road::nearest_joint(ground, kPointRadius, joint)) { @@ -883,13 +1205,29 @@ void editor_mode::road_apply() bool editor_mode::road_delete() { auto &tool{m_roadtool}; - if (false == tool.window || (tool.selected == nullptr && tool.junction == nullptr)) - { - // with points selected the key isn't meant for whatever else is selected in the editor - return tool.window && false == tool.points.empty(); - } + if (false == tool.window) + return false; std::string reason; editor_road::record record; + if (tool.marker != nullptr) + { + auto *point{tool.marker}; + if (false == editor_road::can_edit(*point, &reason)) + { + tool.status = "Can't delete: " + reason; + return true; + } + editor_road::remove(std::vector{point}); + record.points_removed.emplace_back(point); + push_road_snapshot(std::move(record)); + tool.marker = nullptr; + tool.status = "\"" + point->name() + "\" deleted, Ctrl+Z brings it back"; + return true; + } + if (false == tool.points.empty()) + return road_points_delete(); + if (tool.selected == nullptr && tool.junction == nullptr) + return false; if (tool.junction != nullptr) { auto *junction{tool.junction}; @@ -919,6 +1257,30 @@ bool editor_mode::road_delete() return true; } +// takes the selected points out of their roads +bool editor_mode::road_points_delete() +{ + auto &tool{m_roadtool}; + editor_road::record record; + std::string notes; + int taken{0}; + for (auto const &point : tool.points) + { + std::string error; + if (editor_road::dissolve(point, record, error)) + ++taken; + else if (notes.find(error) == std::string::npos) + notes += " A point was left: " + error + "."; + } + push_road_snapshot(std::move(record)); + // the points which stayed are still selected, so it's clear which ones these are + tool.points.erase(std::remove_if(tool.points.begin(), tool.points.end(), [](glm::dvec3 const &Point) { return editor_road::ends_at(Point).empty(); }), tool.points.end()); + tool.status = (taken == 0 ? std::string{"Nothing deleted."} : taken == 1 ? std::string{"Point deleted, Ctrl+Z brings it back."} : + std::to_string(taken) + " points deleted, Ctrl+Z brings them back."); + tool.status += notes; + return true; +} + bool editor_mode::road_split() { auto &tool{m_roadtool}; @@ -1049,8 +1411,14 @@ void editor_mode::push_road_snapshot(editor_road::record Record) node = Record.junctions.front().first; else if (false == Record.junctions_created.empty()) node = Record.junctions_created.front(); - else + else if (false == Record.junctions_removed.empty()) node = Record.junctions_removed.front(); + else if (false == Record.points.empty()) + node = Record.points.front().first; + else if (false == Record.points_created.empty()) + node = Record.points_created.front(); + else + node = Record.points_removed.front(); EditorSnapshot snap; snap.action = EditorSnapshot::Action::RoadEdit; snap.node_name = node->name(); @@ -1072,6 +1440,8 @@ void editor_mode::restore_road_snapshot(EditorSnapshot const &Snapshot, std::vec entry.second = entry.first->definition(); for (auto &entry : current.roads.junctions) entry.second = entry.first->definition(); + for (auto &entry : current.roads.points) + entry.second = entry.first->definition(); Opposite.push_back(std::move(current)); // things are taken out before the rest is changed and put in after it, so nothing gets joined with what's on its way out @@ -1079,23 +1449,28 @@ void editor_mode::restore_road_snapshot(EditorSnapshot const &Snapshot, std::vec { editor_road::remove(record.roads_created); editor_road::remove(record.junctions_created); + editor_road::remove(record.points_created); } else { editor_road::remove(record.roads_removed); editor_road::remove(record.junctions_removed); + editor_road::remove(record.points_removed); } editor_road::apply(record.roads); editor_road::apply(record.junctions); + editor_road::apply(record.points); if (Undo) { editor_road::revive(record.roads_removed); editor_road::revive(record.junctions_removed); + editor_road::revive(record.points_removed); } else { editor_road::revive(record.roads_created); editor_road::revive(record.junctions_created); + editor_road::revive(record.points_created); } auto &tool{m_roadtool}; @@ -1104,6 +1479,9 @@ void editor_mode::restore_road_snapshot(EditorSnapshot const &Snapshot, std::vec road_select(tool.selected->m_editorremoved ? nullptr : tool.selected); if (tool.junction != nullptr) junction_select(tool.junction->m_editorremoved ? nullptr : tool.junction); + if (tool.marker != nullptr && tool.marker->m_editorremoved) + tool.marker = nullptr; + tool.aimedkind = -1; } // a field for the name of a material, with a list of the ones in the texture folder to pick from. returns: true if the material was changed @@ -1333,6 +1711,10 @@ void editor_mode::render_road_window() ImGui::RadioButton("Select", &tool.tool, 0); ImGui::SameLine(); ImGui::RadioButton("Build", &tool.tool, 1); + ImGui::SameLine(); + ImGui::RadioButton("Place", &tool.tool, 2); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "Level crossings, and the points where vehicles appear on the roads or are taken off them"); if (tool.tool != previoustool) { road_cancel(); @@ -1340,6 +1722,7 @@ void editor_mode::render_road_window() { tool.junction = nullptr; tool.points.clear(); + tool.marker = nullptr; // the fields for the names of materials show the layout for the roads to be built again road_select(nullptr); } @@ -1379,6 +1762,45 @@ void editor_mode::render_road_window() // what's set here is what the next pieces get render_road_layout(tool.settings); } + else if (tool.tool == 2) + { + ImGui::RadioButton("Level crossing", &tool.placekind, 0); + ImGui::SameLine(); + ImGui::RadioButton("Spawn point", &tool.placekind, 1); + ImGui::SameLine(); + ImGui::RadioButton("Removal point", &tool.placekind, 2); + tool.placekind = std::clamp(tool.placekind, 0, 2); + switch (tool.placekind) + { + case 0: + ImGui::TextDisabled("LMB on a road where the rails cross it. The vehicles stop ahead"); + ImGui::TextDisabled("of the rails for as long as a train is coming."); + break; + case 1: + ImGui::TextDisabled("LMB on a lane. The vehicles of the set appear there one by one"); + ImGui::TextDisabled("and drive on the way the lane goes."); + break; + default: + ImGui::TextDisabled("LMB on a lane. The vehicles which get there are taken off the road;"); + ImGui::TextDisabled("put one where the road leaves the scenery."); + break; + } + ImGui::Separator(); + // what's set here is what the next points get + auto &placing{tool.placing[tool.placekind]}; + placing.kind = point_kind(tool.placekind); + render_roadpoint_layout(placing, nullptr); + } + else if (tool.marker != nullptr) + { + auto &point{*tool.marker}; + auto state{point.definition()}; + ImGui::Text("%s, %s", point.name().c_str(), point_label(state.kind)); + if (render_roadpoint_layout(state, &point)) + roadpoint_apply(point, state); + if (ImGui::Button("Delete (Del)")) + road_delete(); + } else if (false == tool.points.empty()) { // the road at the selected points @@ -1428,6 +1850,12 @@ void editor_mode::render_road_window() if (ImGui::IsItemHovered()) ImGui::SetTooltip("Puts each point %.2f m over the ground under it; the height above the ground is set in the Build tool.", tool.offset); } + if (ImGui::Button(tool.points.size() == 1 ? "Delete the point (Del)" : "Delete the points (Del)")) + road_points_delete(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "Takes the point out of the road: the pieces on its two sides become one piece,\n" + "led from the far end of one to the far end of the other the way the road goes there.\n" + "A point the road ends at takes the last piece of the road with it."); } else if (tool.junction != nullptr) { @@ -1456,7 +1884,8 @@ void editor_mode::render_road_window() } else { - ImGui::TextDisabled("LMB: select a road piece, a junction, or a point where pieces meet"); + ImGui::TextDisabled("LMB: select a road piece, a junction, a point where pieces meet,"); + ImGui::TextDisabled("a level crossing or a traffic point"); } if (false == tool.status.empty()) { @@ -1587,6 +2016,77 @@ void editor_mode::draw_road_overlay() const drawpoint(arm.position, Color, 5.0f, true); }; + // a circle lying on the ground + auto const drawring = [&](glm::dvec3 const &Centre, double const Radius, ImU32 const Color) { + int const pieces{24}; + glm::dvec3 previous{Centre + glm::dvec3{Radius, 0.0, 0.0}}; + for (int i = 1; i <= pieces; ++i) + { + auto const angle{kFullTurn * i / pieces}; + glm::dvec3 const next{Centre + glm::dvec3{Radius * std::cos(angle), 0.0, Radius * std::sin(angle)}}; + projection.line(drawlist, previous, next, Color, 2.0f); + previous = next; + } + }; + auto const drawlabel = [&](glm::dvec3 const &Point, ImU32 const Color, char const *Text) { + ImVec2 screen; + if (false == projection.room(drawlist) || false == projection.project(Point, screen) || projection.outside(screen, screen)) + return; + drawlist->AddText(ImVec2(screen.x + 14.0f, screen.y - 8.0f), Color, Text); + }; + // a level crossing or a traffic point. Point: the node it's drawn for, nullptr for one which isn't made yet + auto const drawmarker = [&](roadpoint_node::state const &State, roadpoint_node const *Point, ImU32 const Color) { + drawpoint(State.position, Color, 6.0f, true); + auto const labelled{glm::distance(State.position, camera) < 200.0}; + switch (State.kind) + { + case roadpoint_node::kind_type::crossing: + { + // the tracks within the circle are the ones it's closed for, the lines are where the vehicles stop + drawring(State.position, State.clearance, Color); + auto const closed{Point != nullptr && Point->closed()}; + if (Point != nullptr) + { + for (auto const &stop : Point->stops()) + { + glm::dvec3 across{stop.direction.z, 0.0, -stop.direction.x}; + if (glm::length(across) < 1e-6) + continue; + across = glm::normalize(across) * (0.5 * stop.width); + projection.line(drawlist, stop.position - across, stop.position + across, closed ? kRefusedColor : Color, 4.0f); + } + } + if (labelled) + drawlabel(State.position, Color, closed ? "crossing, closed" : "crossing"); + break; + } + case roadpoint_node::kind_type::spawn: + { + drawpoint(State.position, Color, 11.0f, false); + if (labelled) + drawlabel(State.position, Color, "spawn"); + break; + } + case roadpoint_node::kind_type::despawn: + { + drawring(State.position, State.radius, Color); + if (labelled) + drawlabel(State.position, Color, "removal"); + break; + } + } + }; + for (auto const *point : simulation::Roadpoints.sequence()) + { + if (point == nullptr || point->m_editorremoved || glm::distance(point->location(), camera) > kPointRange) + continue; + auto const kind{point->definition().kind}; + drawmarker(point->definition(), point, + point == tool.marker ? kSelectedColor : kind == roadpoint_node::kind_type::spawn ? kSpawnColor : kind == roadpoint_node::kind_type::despawn ? kDespawnColor : kCrossingColor); + if (point == tool.marker) + drawpoint(point->definition().position, kSelectedColor, 15.0f, false); + } + if (tool.selected != nullptr && false == tool.selected->m_editorremoved) { auto const &state{tool.selected->definition()}; @@ -1649,6 +2149,30 @@ void editor_mode::draw_road_overlay() const } } } + else if (tool.tool == 2) + { + if (tool.hastarget) + { + drawmarker(tool.target, nullptr, kPreviewColor); + if (glm::length(tool.targetdirection) > 1e-6) + { + // the way the traffic goes on the lane + auto const direction{glm::normalize(tool.targetdirection)}; + glm::dvec3 const across{direction.z, 0.0, -direction.x}; + auto const tip{tool.target.position + direction * 5.0}; + projection.line(drawlist, tool.target.position, tip, kPreviewColor, 2.0f); + projection.line(drawlist, tip, tip - direction * 1.2 + across * 0.8, kPreviewColor, 2.0f); + projection.line(drawlist, tip, tip - direction * 1.2 - across * 0.8, kPreviewColor, 2.0f); + } + hint = std::string{"LMB: put a "} + point_label(tool.target.kind) + " here"; + if (false == tool.targetnote.empty()) + hint += " " + tool.targetnote; + } + else + { + hint = (tool.targetnote.empty() ? std::string{"LMB: put a "} + point_label(point_kind(tool.placekind)) + " on a road" : tool.targetnote); + } + } else { // points where the pieces meet or end, to pick from @@ -1664,10 +2188,11 @@ void editor_mode::draw_road_overlay() const drawpoint(point, kSelectedColor, 6.0f, true); drawpoint(point, kSelectedColor, 11.0f, false); } - hint = false == tool.points.empty() ? "LMB: select a point Shift+LMB: add a point or take it out Ctrl+Z: undo" : - tool.selected != nullptr ? "LMB: select a piece, a junction or a point (white dot) K: split at the cursor Del: delete Ctrl+Z: undo" : - tool.junction != nullptr ? "LMB: select a piece, a junction or a point (white dot) Del: delete Ctrl+Z: undo" : - "LMB: select a piece, a junction or a point (white dot)"; + hint = tool.marker != nullptr ? "LMB: select a piece, a junction, a point or a marker Del: delete Ctrl+Z: undo" : + false == tool.points.empty() ? "LMB: select a point Shift+LMB: add a point or take it out Del: delete the points Ctrl+Z: undo" : + tool.selected != nullptr ? "LMB: select a piece, a junction or a point (white dot) K: split at the cursor Del: delete Ctrl+Z: undo" : + tool.junction != nullptr ? "LMB: select a piece, a junction or a point (white dot) Del: delete Ctrl+Z: undo" : + "LMB: select a piece, a junction, a point (white dot) or a marker"; } // shown above the place the track tools put their hints at ImGuiIO const &io = ImGui::GetIO(); diff --git a/editor/editorRoad.cpp b/editor/editorRoad.cpp index d713bfc1d..339ff00a6 100644 --- a/editor/editorRoad.cpp +++ b/editor/editorRoad.cpp @@ -317,6 +317,66 @@ void retire(std::vector const &Tracks) editor_track::retire(*track); } +// value of the curve parameter for the point of a curve nearest to specified point, seen from above +double nearest_on(std::array const &Points, glm::dvec3 const &Point) +{ + auto const distance = [&](double const T) { + auto const position{curve_point(Points, T)}; + return glm::distance(glm::dvec2{position.x, position.z}, glm::dvec2{Point.x, Point.z}); + }; + double best{0.0}; + for (int i = 1; i <= 64; ++i) + if (distance(i / 64.0) < distance(best)) + best = i / 64.0; + double step{1.0 / 64.0}; + for (int i = 0; i < 24; ++i) + { + step *= 0.5; + if (best - step >= 0.0 && distance(best - step) < distance(best)) + best -= step; + else if (best + step <= 1.0 && distance(best + step) < distance(best)) + best += step; + } + return best; +} + +double planar_distance(glm::dvec3 const &Left, glm::dvec3 const &Right) +{ + return glm::distance(glm::dvec2{Left.x, Left.z}, glm::dvec2{Right.x, Right.z}); +} + +// true if two lines cross when seen from above. Along, Otheralong: receive how far along each of them the crossing is, 0 to 1 +bool lines_cross(glm::dvec3 const &Start, glm::dvec3 const &End, glm::dvec3 const &Otherstart, glm::dvec3 const &Otherend, double &Along, double &Otheralong) +{ + glm::dvec2 const line{End.x - Start.x, End.z - Start.z}; + glm::dvec2 const other{Otherend.x - Otherstart.x, Otherend.z - Otherstart.z}; + auto const denominator{line.x * other.y - line.y * other.x}; + if (std::abs(denominator) < 1e-12) + return false; + glm::dvec2 const offset{Otherstart.x - Start.x, Otherstart.z - Start.z}; + Along = (offset.x * other.y - offset.y * other.x) / denominator; + Otheralong = (offset.x * line.y - offset.y * line.x) / denominator; + return Along >= 0.0 && Along <= 1.0 && Otheralong >= 0.0 && Otheralong <= 1.0; +} + +// the same piece of a road laid out from its other end: what it looks like and where its lanes lead stays as it was +road_node::state flipped(road_node::state const &State) +{ + auto result{State}; + std::swap(result.axis.points[segment_data::point::start], result.axis.points[segment_data::point::end]); + std::swap(result.axis.points[segment_data::point::control1], result.axis.points[segment_data::point::control2]); + result.axis.rolls = {-State.axis.rolls[1], -State.axis.rolls[0]}; + std::swap(result.forward, result.backward); + // the lanes are listed left to right for someone facing along the axis, who's now looking the other way + std::reverse(result.lanes.begin(), result.lanes.end()); + std::reverse(result.changes.begin(), result.changes.end()); + for (auto &change : result.changes) + change = ((change & road_node::change_toright) != 0 ? road_node::change_toleft : 0) | ((change & road_node::change_toleft) != 0 ? road_node::change_toright : 0); + std::swap(result.sides[0], result.sides[1]); + std::swap(result.taper[0], result.taper[1]); + return result; +} + // smallest radius of the bend made by a bezier curve, seen from above; 0 if the curve is practically straight double tightest_radius(segment_data const &Path) { @@ -468,6 +528,8 @@ void editor_road::refresh(std::vector const &Roads, std::vector affected; std::vector crossings; + // level crossings and traffic points hold on to the lanes, which are about to be replaced + simulation::Roadpoints.unbind(); auto const gather = [&]() { std::vector roads{affected}; std::vector junctions{crossings}; @@ -541,6 +603,7 @@ void editor_road::refresh(std::vector const &Roads, std::vectorm_editorremoved) road->close_ends(); + simulation::Roadpoints.bind(); } std::vector editor_road::create(std::vector const &States) @@ -702,6 +765,288 @@ void editor_road::revive(std::vector const &Junctions) }); } +bool editor_road::can_edit(roadpoint_node const &Point, std::string *Reason) +{ + std::string reason; + auto editable{true}; + if (simulation::Region == nullptr) + { + reason = "No scenery is loaded"; + editable = false; + } + else + { + editable = scene::Layers.editable(&Point, &reason); + } + if (false == editable && Reason != nullptr) + *Reason = reason; + return editable; +} + +std::vector editor_road::create(std::vector const &States) +{ + static int counter{0}; + std::vector created; + if (simulation::Region == nullptr) + return created; + for (auto const &state : States) + { + scene::node_data data; + data.type = roadpoint_node::keyword(state.kind); + data.range_max = -1.0; + data.layer = scene::Layers.active(); // null_handle unless the scenery was opened for editing + // the vehicles of a spawn point are named after it, so each point needs a name of its own + do + { + data.name = data.type + "_" + std::to_string(++counter); + } while (simulation::Roadpoints.find(data.name) != nullptr); + auto *point{new roadpoint_node(data)}; + point->define(state); + point->mark_dirty(); + simulation::Roadpoints.insert(point); + scene::Layers.count(point->layer(), scene::layer_item::track); + point->bind(); + point->show(); + created.emplace_back(point); + } + return created; +} + +void editor_road::apply(std::vector> const &Changes) +{ + for (auto const &change : Changes) + { + auto *point{change.first}; + if (point == nullptr) + continue; + point->hide(); + point->unbind(); + point->define(change.second); + point->mark_dirty(); + point->bind(); + point->show(); + } +} + +void editor_road::remove(std::vector const &Points) +{ + for (auto *point : Points) + { + if (point == nullptr || point->m_editorremoved) + continue; + point->hide(); + // a crossing which goes lets the vehicles it was holding drive on + point->unbind(); + point->m_editorremoved = true; + scene::Layers.count(point->layer(), scene::layer_item::track, -1); + } +} + +void editor_road::revive(std::vector const &Points) +{ + for (auto *point : Points) + { + if (point == nullptr || false == point->m_editorremoved) + continue; + point->m_editorremoved = false; + point->mark_dirty(); + scene::Layers.count(point->layer(), scene::layer_item::track); + point->bind(); + point->show(); + } +} + +roadpoint_node *editor_road::nearest_point(glm::dvec3 const &Point, double const Radius) +{ + roadpoint_node *result{nullptr}; + auto best{Radius}; + for (auto *point : simulation::Roadpoints.sequence()) + { + if (point == nullptr || point->m_editorremoved) + continue; + auto const &position{point->definition().position}; + auto const distance{planar_distance(position, Point)}; + if (distance > best || std::abs(position.y - Point.y) > 3.0) + continue; + best = distance; + result = point; + } + return result; +} + +bool editor_road::nearest_lane(glm::dvec3 const &Point, double const Reach, glm::dvec3 &Position, glm::dvec3 &Direction) +{ + auto best{Reach}; + auto found{false}; + for (auto const *road : simulation::Roads.sequence()) + { + if (road == nullptr || road->m_editorremoved) + continue; + auto const &state{road->definition()}; + auto const axis{curve_points(state.axis)}; + // the axis is no longer than the lines joining its points, which is good enough to tell the road is nowhere near + if (glm::distance(road->location(), Point) > + 0.5 * (glm::distance(axis[0], axis[1]) + glm::distance(axis[1], axis[2]) + glm::distance(axis[2], axis[3])) + 0.5 * state.width() * std::max(state.taper[0], state.taper[1]) + Reach + 10.0) + continue; + for (auto const *lane : road->tracks()) + { + if (lane == nullptr || lane->m_paths.empty()) + continue; + auto const points{curve_points(lane->m_paths.front())}; + auto const t{nearest_on(points, Point)}; + auto const position{curve_point(points, t)}; + auto const distance{planar_distance(position, Point)}; + // lanes passing over or under the point don't count + if (distance > best || std::abs(position.y - Point.y) > 3.0) + continue; + best = distance; + Position = position; + // the lanes are laid out the way the traffic goes + Direction = curve_point(points, std::min(1.0, t + 0.01)) - curve_point(points, std::max(0.0, t - 0.01)); + found = true; + } + } + return found; +} + +bool editor_road::rails_across(road_node const &Road, glm::dvec3 const &Near, double const Reach, glm::dvec3 &Middle, double &Halfspan) +{ + int const pieces{32}; // lines the axis is taken for + int const railpieces{16}; // and each of the rails + auto const axis{curve_points(Road.definition().axis)}; + std::vector line; + for (int i = 0; i <= pieces; ++i) + line.emplace_back(curve_point(axis, static_cast(i) / pieces)); + // values of the curve parameter of the axis the rails cross it at + auto first{2.0}; + auto last{-1.0}; + for (auto const *track : simulation::Paths.sequence()) + { + if (track == nullptr || track->m_editorremoved || (track->iCategoryFlag & 1) == 0) + continue; + for (auto const &path : track->m_paths) + { + auto const rail{curve_points(path)}; + // the path is no longer than the lines joining its points, which is good enough to tell it's nowhere near + if (planar_distance(rail[0], Near) > glm::distance(rail[0], rail[1]) + glm::distance(rail[1], rail[2]) + glm::distance(rail[2], rail[3]) + Reach) + continue; + auto previous{rail[0]}; + for (int j = 1; j <= railpieces; ++j) + { + auto const next{curve_point(rail, static_cast(j) / railpieces)}; + for (int i = 0; i < pieces; ++i) + { + double along{0.0}; + double railalong{0.0}; + if (false == lines_cross(line[i], line[i + 1], previous, next, along, railalong)) + continue; + auto const point{glm::mix(line[i], line[i + 1], along)}; + // rails passing over or under the road don't make a level crossing + if (planar_distance(point, Near) > Reach || std::abs(glm::mix(previous.y, next.y, railalong) - point.y) > 3.0) + continue; + auto const t{(i + along) / pieces}; + first = std::min(first, t); + last = std::max(last, t); + } + previous = next; + } + } + } + if (last < first) + return false; + Middle = curve_point(axis, 0.5 * (first + last)); + Halfspan = std::max(planar_distance(curve_point(axis, first), Middle), planar_distance(curve_point(axis, last), Middle)); + return true; +} + +bool editor_road::dissolve(glm::dvec3 const &Joint, record &Record, std::string &Error) +{ + if (false == junctions_at(Joint).empty()) + { + Error = "the point is where a road meets a junction. Delete the junction or the road instead"; + return false; + } + auto const ends{ends_at(Joint)}; + if (ends.empty()) + { + Error = "there's no point of a road there"; + return false; + } + if (ends.size() > 2 || (ends.size() == 2 && ends[0].road == ends[1].road)) + { + Error = "more than two ends of roads meet at the point"; + return false; + } + std::string reason; + for (auto const &end : ends) + { + if (false == can_edit(*end.road, &reason)) + { + Error = "\"" + end.road->name() + "\" can't be changed: " + reason; + return false; + } + } + if (ends.size() == 1) + { + // the point a road ends at: the last piece goes + remove(std::vector{ends.front().road}); + Record.roads_removed.emplace_back(ends.front().road); + return true; + } + // the piece which leads to the point stays, and takes the place of the two + auto kept{ends[0]}; + auto dropped{ends[1]}; + if (false == kept.atend && dropped.atend) + std::swap(kept, dropped); + auto before{kept.road->definition()}; + auto after{dropped.road->definition()}; + if (false == kept.atend) + before = flipped(before); + if (dropped.atend) + after = flipped(after); + if (before.forward != after.forward || before.backward != after.backward) + { + Error = "the road has other lanes on each side of the point. Give both sides the same lanes first"; + return false; + } + auto const lengths{std::make_pair(before.length(), after.length())}; + auto const whole{lengths.first + lengths.second}; + if (lengths.first < 0.01 || lengths.second < 0.01 || before.width() <= 0.0) + { + Error = "the pieces at the point are too short"; + return false; + } + auto const start{curve_points(before.axis)}; + auto const end{curve_points(after.axis)}; + auto merged{before}; + merged.axis.points[segment_data::point::end] = end[3]; + merged.axis.rolls[1] = after.axis.rolls[1]; + // the far ends keep the way they go, with their control points moved out to make up for the ones which go with the point. + // a piece cut in two has the control points at the cut as far from it as the parts of the piece each of the two took, + // so going by these brings such a piece back to what it was + auto const reach{std::make_pair(glm::distance(start[2], start[3]), glm::distance(end[0], end[1]))}; + auto const share{std::clamp(reach.first + reach.second > 1e-6 ? reach.first / (reach.first + reach.second) : lengths.first / whole, 0.05, 0.95)}; + auto control1{(start[1] - start[0]) / share}; + auto control2{(end[2] - end[3]) / (1.0 - share)}; + auto const straight{end[3] - start[0]}; + auto const along = [&straight](glm::dvec3 const &Direction) { return glm::length(glm::cross(glm::normalize(Direction), glm::normalize(straight))) < 1e-4; }; + if (glm::length(straight) > 0.01 && along(control1) && along(-control2) && glm::dot(control1, straight) > 0.0 && glm::dot(control2, straight) < 0.0) + { + // two pieces of a straight make a straight + control1 = glm::dvec3{0.0}; + control2 = glm::dvec3{0.0}; + } + merged.axis.points[segment_data::point::control1] = control1; + merged.axis.points[segment_data::point::control2] = control2; + // the road is as wide at its far ends as it was + merged.taper[1] = static_cast(after.taper[1] * after.width() / before.width()); + remember(Record, kept.road); + remove(std::vector{dropped.road}); + Record.roads_removed.emplace_back(dropped.road); + apply(std::vector>{{kept.road, merged}}); + return true; +} + road_node *editor_road::split(road_node &Road, double const T) { if (T <= 0.001 || T >= 0.999) @@ -764,25 +1109,7 @@ std::vector editor_road::chain(road_node &Road) double editor_road::nearest_parameter(road_node::state const &State, glm::dvec3 const &Point) { - auto const points{curve_points(State.axis)}; - auto const distance = [&](double const T) { - auto const position{curve_point(points, T)}; - return glm::distance(glm::dvec2{position.x, position.z}, glm::dvec2{Point.x, Point.z}); - }; - double best{0.0}; - for (int i = 1; i <= 64; ++i) - if (distance(i / 64.0) < distance(best)) - best = i / 64.0; - double step{1.0 / 64.0}; - for (int i = 0; i < 24; ++i) - { - step *= 0.5; - if (best - step >= 0.0 && distance(best - step) < distance(best)) - best -= step; - else if (best + step <= 1.0 && distance(best + step) < distance(best)) - best += step; - } - return best; + return nearest_on(curve_points(State.axis), Point); } road_node *editor_road::nearest(glm::dvec3 const &Point, double const Margin) diff --git a/editor/editorRoad.hpp b/editor/editorRoad.hpp index fd41bb0f0..a05a05ac1 100644 --- a/editor/editorRoad.hpp +++ b/editor/editorRoad.hpp @@ -15,6 +15,7 @@ http://mozilla.org/MPL/2.0/. #include #include "world/Road.h" +#include "world/RoadPoint.h" // editor operations on the roads. a road in the scenery is a string of pieces joined end to end, // each piece being a road node with lanes and geometry of its own; roads meet at junctions @@ -54,10 +55,14 @@ class editor_road std::vector> junctions; // junctions with what they were like before std::vector junctions_created; std::vector junctions_removed; + std::vector> points; // crossings and traffic points with what they were like before + std::vector points_created; + std::vector points_removed; bool empty() const { - return roads.empty() && roads_created.empty() && roads_removed.empty() && junctions.empty() && junctions_created.empty() && junctions_removed.empty(); + return roads.empty() && roads_created.empty() && roads_removed.empty() && junctions.empty() && junctions_created.empty() && junctions_removed.empty() && points.empty() && + points_created.empty() && points_removed.empty(); } }; // a road led out of the side of another road, or out of a junction between its arms: the junction this takes, @@ -91,6 +96,25 @@ class editor_road static std::vector create(std::vector const &States); static void remove(std::vector const &Junctions); static void revive(std::vector const &Junctions); + // level crossings, and the points the vehicles appear at or are taken away at. these go by the lanes and the rails they find + // around them, so unlike the roads they can be changed with vehicles around + static bool can_edit(roadpoint_node const &Point, std::string *Reason = nullptr); + static std::vector create(std::vector const &States); + static void apply(std::vector> const &Changes); + static void remove(std::vector const &Points); + static void revive(std::vector const &Points); + // the crossing or traffic point nearest to specified point, within specified distance from it + static roadpoint_node *nearest_point(glm::dvec3 const &Point, double const Radius); + // place on the middle of a lane nearest to specified point, within specified distance from it. + // Direction: receives the way the traffic goes there. returns: false if there's no lane that close + static bool nearest_lane(glm::dvec3 const &Point, double const Reach, glm::dvec3 &Position, glm::dvec3 &Direction); + // rails crossing specified piece within specified distance from a point. Middle: receives the point of the axis halfway between + // the outermost of them, Halfspan: how far along the road these are from it. returns: false if no rails cross the piece there + static bool rails_across(road_node const &Road, glm::dvec3 const &Near, double const Reach, glm::dvec3 &Middle, double &Halfspan); + // takes a point out of a road. the two pieces which meet at it are made one, led from the far end of one to the far end + // of the other the way these ends go; a point a road ends at takes the last piece of the road with it. + // what gets done is added to Record. returns: false if it can't be done, with the reason in Error + static bool dissolve(glm::dvec3 const &Joint, record &Record, std::string &Error); // cuts the piece in two at specified point of its axis. returns: the new piece, holding the part past the cut static road_node *split(road_node &Road, double const T); // the pieces which make a single road together with specified one, in no particular order diff --git a/scene/scenelayerssave.cpp b/scene/scenelayerssave.cpp index 9fe5baf4d..2036d0635 100644 --- a/scene/scenelayerssave.cpp +++ b/scene/scenelayerssave.cpp @@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/. #include "scene/scenelayers.h" #include "world/Track.h" #include "world/Road.h" +#include "world/RoadPoint.h" #include "simulation/simulation.h" #include "model/AnimModel.h" @@ -923,6 +924,68 @@ save_result node_layers::save(std::vector const &Rootstatements) state.patches[source.layer].edits.emplace_back(std::move(edit)); rewritten.emplace(junction); } + // level crossings and traffic points of the roads + std::vector savedroadpoints; + std::vector droppedroadpoints; + auto const roadpoint_text = [](roadpoint_node &Point, glm::dvec3 const &Offset) { + auto const definition{Point.definition()}; + auto local{definition}; + local.position -= Offset; + Point.define(local); + std::string text; + Point.export_as_text(text); + Point.define(definition); + text.erase(text.find_last_not_of(" \t\r\n") + 1); + return text; + }; + for (auto *point : simulation::Roadpoints.sequence()) + { + if (point == nullptr || point->from_template()) + { + continue; + } + auto const nodelayer{resolve(point->layer())}; + if (false == is_output(nodelayer)) + { + continue; + } + auto const lookup{m_sources.find(point)}; + if (lookup == m_sources.end()) + { + if (point->m_editorremoved || false == point->dirty()) + { + continue; + } + created[nodelayer].emplace_back(point, roadpoint_text(*point, layer(nodelayer).context_insert().offset)); + savedroadpoints.push_back(point); + continue; + } + auto const &source{lookup->second}; + if ((false == point->m_editorremoved && false == point->dirty()) || false == writable(source.layer)) + { + continue; + } + if (false == load(source.layer)) + { + return fail(state.error); + } + file_patch::edit edit; + edit.begin = source.span.begin; + edit.end = source.span.end; + if (point->m_editorremoved) + { + droppedroadpoints.push_back(point); + } + else + { + edit.text = roadpoint_text(*point, source.context.offset); + edit.length = edit.text.size(); + edit.node = point; + savedroadpoints.push_back(point); + } + state.patches[source.layer].edits.emplace_back(std::move(edit)); + rewritten.emplace(point); + } for (auto const &erased : m_erased) { file_patch::edit edit; @@ -1382,6 +1445,14 @@ save_result node_layers::save(std::vector const &Rootstatements) { m_sources.erase(junction); } + for (auto *point : savedroadpoints) + { + point->m_dirty = false; + } + for (auto const *point : droppedroadpoints) + { + m_sources.erase(point); + } if (removedterrain) { // binary terrain file still holds geometry of the dropped layer, have it rebuilt on the next load diff --git a/simulation/simulation.cpp b/simulation/simulation.cpp index b24ffb705..18e3c701e 100644 --- a/simulation/simulation.cpp +++ b/simulation/simulation.cpp @@ -17,6 +17,7 @@ http://mozilla.org/MPL/2.0/. #include "world/MemCell.h" #include "world/Track.h" #include "world/Road.h" +#include "world/RoadPoint.h" #include "world/Traction.h" #include "world/TractionPower.h" #include "audio/sound.h" @@ -39,6 +40,7 @@ memory_table Memory; path_table Paths; road_table Roads; junction_table Junctions; +roadpoint_table Roadpoints; traction_table Traction; powergridsource_table Powergrid; instance_table Instances; @@ -117,6 +119,8 @@ state_manager::update( double const Deltatime, int Iterationcount ) { TAnimModel::AnimUpdate( totaltime ); // wykonanie zakolejkowanych animacji simulation::Powergrid.update( totaltime ); + // level crossings and the points road vehicles appear at; ahead of the vehicles, so the drivers act on what these decide + simulation::Roadpoints.update( totaltime ); simulation::Vehicles.update( Deltatime, Iterationcount ); } diff --git a/simulation/simulation.h b/simulation/simulation.h index 67bfae0e1..b36d70a02 100644 --- a/simulation/simulation.h +++ b/simulation/simulation.h @@ -84,6 +84,7 @@ extern memory_table Memory; extern path_table Paths; extern road_table Roads; extern junction_table Junctions; +extern roadpoint_table Roadpoints; extern traction_table Traction; extern powergridsource_table Powergrid; extern instance_table Instances; diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index e2598fdca..16013c67c 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -26,6 +26,7 @@ http://mozilla.org/MPL/2.0/. #include "rendering/lightarray.h" #include "world/TractionPower.h" #include "world/Road.h" +#include "world/RoadPoint.h" #include "application/application.h" #include "rendering/renderer.h" #include "utilities/Logs.h" @@ -182,6 +183,7 @@ state_serializer::deserialize_continue(std::shared_ptr state // so it's inserted in the region only after that file had its chance to be written simulation::Roads.create_geometry( Scratchpad ); simulation::Junctions.create_geometry( Scratchpad ); + simulation::Roadpoints.create_geometry(); return false; } @@ -402,6 +404,8 @@ state_serializer::deserialize_firstinit( cParser &Input, scene::scratch_data &Sc // the junctions tie the lanes of the roads together, what's left loose after that gets closed by the roads simulation::Junctions.InitJunctions(); simulation::Roads.InitRoads(); + // crossings and traffic points go by the lanes, which are complete at this point + simulation::Roadpoints.InitRoadpoints(); simulation::Traction.InitTraction(); simulation::Events.InitEvents(); simulation::Events.InitLaunchers(); @@ -538,6 +542,20 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch scene::Groups.insert( scene::Groups.handle(), junction ); scene::Layers.track( junction, { sourcebegin, Input.TokenEnd() } ); } + else if( roadpoint_node::is_keyword( nodedata.type ) ) { + // level crossing, or a point where road vehicles appear or are taken away + auto *point { new roadpoint_node( nodedata ) }; + point->import( + Input, + ( Scratchpad.location.offset.empty() ? + glm::dvec3 { 0.0 } : + glm::dvec3 { Scratchpad.location.offset.top() } ) ); + if( false == simulation::Roadpoints.insert( point ) ) { + ErrorLog( "Bad scenario: duplicate road point name \"" + point->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + } + scene::Groups.insert( scene::Groups.handle(), point ); + scene::Layers.track( point, { sourcebegin, Input.TokenEnd() } ); + } else if( nodedata.type == "traction" ) { auto *traction { deserialize_traction( Input, Scratchpad, nodedata ) }; @@ -713,6 +731,9 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch { "track", scene::layer_item::track }, { "road", scene::layer_item::track }, { "junction", scene::layer_item::track }, + { "crossing", scene::layer_item::track }, + { "spawn", scene::layer_item::track }, + { "despawn", scene::layer_item::track }, { "traction", scene::layer_item::traction }, { "tractionpowersource", scene::layer_item::powersource }, { "model", scene::layer_item::model }, @@ -1427,6 +1448,11 @@ state_serializer::export_nodes_to_stream(std::ostream &scmfile, bool Dirty) cons junction->export_as_text( scmfile ); } } + for( auto const *point : Roadpoints.sequence() ) { + if( point != nullptr && false == point->m_editorremoved && point->dirty() == Dirty && point->group() == null_handle ) { + point->export_as_text( scmfile ); + } + } // traction scmfile << "// traction\n"; for( auto const *traction : Traction.sequence() ) { @@ -1482,7 +1508,8 @@ TAnimModel *state_serializer::create_model(const std::string &src, const std::st std::pair state_serializer::preview_include(std::string const &Directive, scene::layer_context const &Context, scene::layer_handle Layer, scene::instance_handle Instance) { // statements which take more than a single token, with the tokens ending them static std::unordered_map const nodeends { - { "dynamic", "enddynamic" }, { "track", "endtrack" }, { "road", "endroad" }, { "junction", "endjunction" }, { "traction", "endtraction" }, { "tractionpowersource", "end" }, { "model", "endmodel" }, + { "dynamic", "enddynamic" }, { "track", "endtrack" }, { "road", "endroad" }, { "junction", "endjunction" }, { "crossing", "endcrossing" }, { "spawn", "endspawn" }, { "despawn", "enddespawn" }, + { "traction", "endtraction" }, { "tractionpowersource", "end" }, { "model", "endmodel" }, { "triangles", "endtri" }, { "triangle_strip", "endtri" }, { "triangle_fan", "endtri" }, { "lines", "endline" }, { "line_strip", "endline" }, { "line_loop", "endline" }, { "memcell", "endmemcell" }, { "eventlauncher", "end" }, { "sound", "endsound" } }; static std::unordered_map const statementends { diff --git a/utilities/Classes.h b/utilities/Classes.h index 74aface6a..ec60965c2 100644 --- a/utilities/Classes.h +++ b/utilities/Classes.h @@ -47,6 +47,8 @@ class road_node; // kawałek drogi, z którego powstają pasy ruchu class road_table; class junction_node; class junction_table; +class roadpoint_node; // przejazd kolejowy albo miejsce, w którym pojazdy drogowe się pojawiają lub znikają +class roadpoint_table; struct dictionary_source; class trainset_desc; class scenery_desc; diff --git a/world/RoadPoint.cpp b/world/RoadPoint.cpp new file mode 100644 index 000000000..4946cf81c --- /dev/null +++ b/world/RoadPoint.cpp @@ -0,0 +1,1125 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "world/RoadPoint.h" + +#include "world/Track.h" +#include "world/Event.h" +#include "vehicle/DynObj.h" +#include "vehicle/Driver.h" +#include "vehicle/Train.h" +#include "model/Model3d.h" +#include "simulation/simulation.h" +#include "rendering/particles.h" +#include "rendering/renderer.h" +#include "scene/scene.h" +#include "utilities/Globals.h" +#include "utilities/Logs.h" +#include "utilities/parser.h" +#include "utilities/utilities.h" + +namespace +{ + +constexpr double stopline_width{0.5}; +constexpr double stopline_inset{0.15}; // gap between the ends of a stop line and the edges of its lane +constexpr double line_lift{0.02}; // the line is raised over the surface, so the two don't fight for depth +constexpr double scan_period{0.2}; // seconds between looks at the rails of a crossing +constexpr double hold_time{4.0}; // seconds a crossing stays closed after the last train was seen +constexpr double near_zone{30.0}; // a rail vehicle this close to the stop lines keeps the crossing closed whichever way it goes +constexpr double clear_zone{20.0}; // a vehicle isn't put on the road with another one this close +constexpr double retry_period{1.0}; // seconds to the next try, when a vehicle can't be put on the road +constexpr double front_room{2.5}; // half the length a vehicle is presumed to have before it's made + +// a path as a curve: points along it, and distances along it +class path_curve +{ + + public: + explicit path_curve(segment_data const &Path) + { + auto const &start{Path.points[segment_data::point::start]}; + auto const &end{Path.points[segment_data::point::end]}; + auto const &control1{Path.points[segment_data::point::control1]}; + auto const &control2{Path.points[segment_data::point::control2]}; + m_points[0] = start; + m_points[3] = end; + if (control1 == glm::dvec3{0.0} && control2 == glm::dvec3{0.0}) + { + m_points[1] = start + (end - start) / 3.0; + m_points[2] = end - (end - start) / 3.0; + } + else + { + m_points[1] = start + control1; + m_points[2] = end + control2; + } + m_stations[0] = 0.0; + auto previous{m_points[0]}; + for (int idx = 1; idx <= samples; ++idx) + { + auto const current{point(static_cast(idx) / samples)}; + m_stations[idx] = m_stations[idx - 1] + glm::distance(previous, current); + previous = current; + } + } + double length() const + { + return m_stations[samples]; + } + glm::dvec3 point(double const T) const + { + auto const u{1.0 - T}; + return u * u * u * m_points[0] + 3.0 * u * u * T * m_points[1] + 3.0 * u * T * T * m_points[2] + T * T * T * m_points[3]; + } + glm::dvec3 direction(double const T) const + { + auto const u{1.0 - T}; + auto const result{3.0 * u * u * (m_points[1] - m_points[0]) + 6.0 * u * T * (m_points[2] - m_points[1]) + 3.0 * T * T * (m_points[3] - m_points[2])}; + return glm::length2(result) > 1e-12 ? glm::normalize(result) : glm::dvec3{0.0, 0.0, 1.0}; + } + // value of the curve parameter for specified distance from the start, and the other way around + double parameter(double const Station) const + { + if (Station <= 0.0) + { + return 0.0; + } + if (Station >= length()) + { + return 1.0; + } + auto const idx{std::distance(m_stations.begin(), std::upper_bound(m_stations.begin(), m_stations.end(), Station))}; + auto const span{m_stations[idx] - m_stations[idx - 1]}; + return (static_cast(idx - 1) + (span > 0.0 ? (Station - m_stations[idx - 1]) / span : 0.0)) / samples; + } + double station(double const T) const + { + auto const position{std::clamp(T, 0.0, 1.0) * samples}; + auto const idx{std::min(samples - 1, static_cast(position))}; + return glm::mix(m_stations[idx], m_stations[idx + 1], position - idx); + } + // value of the curve parameter for the point nearest to specified one, seen from above; Distance receives how far it is + double nearest(glm::dvec3 const &Point, double &Distance) const + { + auto const distance = [&](double const T) { + auto const position{point(T)}; + return glm::distance(glm::dvec2{position.x, position.z}, glm::dvec2{Point.x, Point.z}); + }; + double best{0.0}; + for (int idx = 1; idx <= samples; ++idx) + { + if (distance(static_cast(idx) / samples) < distance(best)) + { + best = static_cast(idx) / samples; + } + } + auto step{1.0 / samples}; + for (int pass = 0; pass < 16; ++pass) + { + step *= 0.5; + if (best - step >= 0.0 && distance(best - step) < distance(best)) + { + best -= step; + } + else if (best + step <= 1.0 && distance(best + step) < distance(best)) + { + best += step; + } + } + Distance = distance(best); + return best; + } + + private: + static constexpr int samples{32}; + std::array m_points; + std::array m_stations{}; +}; + +// true if the path can't have a point within specified distance from specified one; a cheap way to tell most of the scenery apart +bool out_of_reach(segment_data const &Path, glm::dvec3 const &Point, double const Reach) +{ + auto const &start{Path.points[segment_data::point::start]}; + auto const &end{Path.points[segment_data::point::end]}; + // the curve lies within its control points, which are no further from the start than this + auto const span{glm::length(Path.points[segment_data::point::control1]) + glm::distance(start, end) + glm::length(Path.points[segment_data::point::control2])}; + return glm::distance(glm::dvec2{start.x, start.z}, glm::dvec2{Point.x, Point.z}) > span + Reach; +} + +// an order for the drivers heading for a closed crossing; to them it's what a signal showing stop is to the driver of a train. +// it doesn't go to the event manager and never runs: the drivers find it on the lane they scan, and ask it what speed it allows +class stop_event : public basic_event +{ + + public: + stop_event() + { + m_passive = true; + } + void init() override {} + std::string input_text() const override + { + return "SetVelocity"; + } + TCommandType input_command() const override + { + return TCommandType::cm_SetVelocity; + } + double input_value(int const Index) const override + { + return m_velocity; + } + glm::dvec3 input_location() const override + { + return m_location; + } + // members + double m_velocity{-1.0}; // 0: stop, -1: no limit + glm::dvec3 m_location{0.0}; + + private: + std::string type() const override + { + return "roadstop"; + } + void deserialize_(cParser &Input, scene::scratch_data &Scratchpad) override {} + void run_() override {} + void export_as_text_(std::ostream &Output) const override {} +}; + +// lane of a road with the point nearest to specified one, within specified distance from it. Station: receives the distance of that point from the start of the lane +TTrack *nearest_lane(glm::dvec3 const &Point, double const Reach, double &Station) +{ + TTrack *result{nullptr}; + auto best{Reach}; + for (auto const *road : simulation::Roads.sequence()) + { + if (road == nullptr || road->m_editorremoved) + { + continue; + } + for (auto *lane : road->tracks()) + { + if (lane == nullptr || lane->m_paths.empty() || out_of_reach(lane->m_paths.front(), Point, Reach)) + { + continue; + } + path_curve const curve{lane->m_paths.front()}; + double distance{0.0}; + auto const t{curve.nearest(Point, distance)}; + if (distance >= best || std::abs(curve.point(t).y - Point.y) > 3.0) + { + continue; + } + best = distance; + result = lane; + Station = curve.station(t); + } + } + return result; +} + +double planar_distance(glm::dvec3 const &Left, glm::dvec3 const &Right) +{ + return glm::distance(glm::dvec2{Left.x, Left.z}, glm::dvec2{Right.x, Right.z}); +} + +} // namespace + +// brings the content to a usable form +void roadpoint_node::state::normalize() +{ + clearance = std::clamp(clearance, 1.f, 100.f); + warning = std::clamp(warning, 50.f, 5000.f); + interval = std::clamp(interval, 1.f, 3600.f); + variation = std::clamp(variation, 0.f, 1.f); + velocity = std::clamp(velocity, 5.f, 200.f); + copies = std::clamp(copies, 1, 16); + radius = std::clamp(radius, 0.5f, 50.f); +} + +roadpoint_node::roadpoint_node(scene::node_data const &Nodedata) : basic_node(Nodedata) +{ + m_state.kind = (Nodedata.type == "spawn" ? kind_type::spawn : Nodedata.type == "despawn" ? kind_type::despawn : kind_type::crossing); +} + +// scenery keyword for specified kind of point +std::string roadpoint_node::keyword(kind_type const Kind) +{ + return Kind == kind_type::spawn ? "spawn" : Kind == kind_type::despawn ? "despawn" : "crossing"; +} + +bool roadpoint_node::is_keyword(std::string const &Type) +{ + return Type == "crossing" || Type == "spawn" || Type == "despawn"; +} + +// reads vehicles out of a text +std::vector roadpoint_node::parse_vehicles(std::string const &Text) +{ + std::vector result; + auto const add = [&result](std::vector const &Tokens, std::size_t const First, std::string const &Load, std::string const &Loadtype) { + vehicle_data vehicle; + vehicle.folder = Tokens[First]; + vehicle.skin = Tokens[First + 1]; + vehicle.type = Tokens[First + 2]; + replace_slashes(vehicle.folder); + replace_slashes(vehicle.skin); + replace_slashes(vehicle.type); + vehicle.load = std::max(0, std::atoi(Load.c_str())); + if (vehicle.load > 0) + { + vehicle.loadtype = Loadtype; + } + result.emplace_back(vehicle); + }; + std::vector tokens; + { + std::istringstream stream{Text}; + std::string token; + while (stream >> token) + { + tokens.emplace_back(token); + } + } + if (std::find(tokens.begin(), tokens.end(), "dynamic") != tokens.end()) + { + // node dynamic [] enddynamic + for (std::size_t idx = 0; idx < tokens.size(); ++idx) + { + if (tokens[idx] != "dynamic" || idx + 3 >= tokens.size()) + { + continue; + } + auto last{idx + 4}; + while (last < tokens.size() && tokens[last] != "enddynamic") + { + ++last; + } + // past the vehicle itself come the path, the offset, the driver and the velocity, then the load + auto const load{idx + 8}; + add(tokens, idx + 1, load < last ? tokens[load] : std::string{}, load + 1 < last ? tokens[load + 1] : std::string{}); + idx = last; + } + return result; + } + std::istringstream lines{Text}; + std::string line; + while (std::getline(lines, line)) + { + std::istringstream stream{line}; + std::vector parts; + std::string part; + while (stream >> part) + { + parts.emplace_back(part); + } + if (parts.size() >= 3) + { + add(parts, 0, parts.size() > 3 ? parts[3] : std::string{}, parts.size() > 4 ? parts[4] : std::string{}); + } + } + return result; +} + +// restores content of the node from provided input stream; reads up to and including the closing statement +void roadpoint_node::import(cParser &Input, glm::dvec3 const &Offset) +{ + auto const type{keyword(m_state.kind)}; + auto const label{type + " \"" + m_name + "\""}; + auto const kind{m_state.kind}; + m_state = state{}; + m_state.kind = kind; + Input.getTokens(3); + Input >> m_state.position.x >> m_state.position.y >> m_state.position.z; + m_state.position += Offset; + + auto token{Input.getToken()}; + while (false == token.empty() && token != "end" + type) + { + if (token == "clearance") + { + Input.getTokens(); + Input >> m_state.clearance; + } + else if (token == "warning") + { + Input.getTokens(); + Input >> m_state.warning; + } + else if (token == "stoplines") + { + m_state.stoplines = (Input.getToken() != "no"); + } + else if (token == "interval") + { + Input.getTokens(); + Input >> m_state.interval; + } + else if (token == "variation") + { + Input.getTokens(); + Input >> m_state.variation; + } + else if (token == "velocity") + { + Input.getTokens(); + Input >> m_state.velocity; + } + else if (token == "copies") + { + Input.getTokens(); + Input >> m_state.copies; + } + else if (token == "radius") + { + Input.getTokens(); + Input >> m_state.radius; + } + else if (token == "node") + { + // a vehicle, given the way vehicles are put in a scenery: + // node dynamic [] enddynamic + std::string discard; + std::string nodetype; + Input.getTokens(4); + Input >> discard >> discard >> discard >> nodetype; + vehicle_data vehicle; + if (nodetype == "dynamic") + { + vehicle.folder = Input.getToken(); + vehicle.skin = Input.getToken(); + vehicle.type = Input.getToken(); + replace_slashes(vehicle.folder); + replace_slashes(vehicle.skin); + replace_slashes(vehicle.type); + } + else + { + ErrorLog("Bad road point: " + label + " lists a \"" + nodetype + "\" where it takes vehicles only"); + } + // where the vehicle is put and how it's driven is up to the point, what's left to take is its load + std::vector rest; + auto part{Input.getToken()}; + while (false == part.empty() && part != "enddynamic" && part != "end" + type) + { + rest.emplace_back(part); + part = Input.getToken(); + } + if (rest.size() > 4) + { + vehicle.load = std::atoi(rest[4].c_str()); + } + if (rest.size() > 5 && vehicle.load > 0) + { + vehicle.loadtype = rest[5]; + } + if (false == vehicle.type.empty()) + { + m_state.vehicles.emplace_back(vehicle); + } + if (part != "enddynamic") + { + ErrorLog("Bad road point: a vehicle of " + label + " isn't closed with \"enddynamic\""); + if (part == "end" + type) + { + break; + } + } + } + else + { + ErrorLog("Bad road point: unknown property: \"" + token + "\" defined for " + label); + } + token = Input.getToken(); + } + m_state.normalize(); + location(m_state.position); +} + +// replaces what the node knows about itself +void roadpoint_node::define(state const &State) +{ + auto const vehicles{m_state.vehicles}; + auto const copies{m_state.copies}; + m_state = State; + m_state.normalize(); + if (m_prepared && (m_state.vehicles != vehicles || m_state.copies != copies)) + { + // vehicles can't be unmade, there's too much holding on to them. the old ones are left alone: + // those which wait stay where they are, those on the road drive on until something takes them away + m_pool.clear(); + m_prepared = false; + } + location(m_state.position); + m_area.radius = -1.f; +} + +// ties the point to the lanes and the rails as they are at the moment +void roadpoint_node::bind() +{ + unbind(); + m_bound = true; + if (m_editorremoved) + { + return; + } + switch (m_state.kind) + { + case kind_type::crossing: + { + bind_crossing(); + break; + } + case kind_type::spawn: + { + // the vehicles are put on the lane the point is on + double station{0.0}; + auto *lane{nearest_lane(m_state.position, 3.0, station)}; + if (lane != nullptr) + { + m_lanes.emplace_back(lane); + // at the very start of a lane which leads from nowhere the vehicle would hang over its end + m_offset = (lane->trPrev == nullptr ? std::max(station, 2.0 * front_room) : station); + } + break; + } + case kind_type::despawn: + { + // the vehicles are taken from every lane which passes close enough + for (auto const *road : simulation::Roads.sequence()) + { + if (road == nullptr || road->m_editorremoved) + { + continue; + } + for (auto *lane : road->tracks()) + { + if (lane == nullptr || lane->m_paths.empty() || out_of_reach(lane->m_paths.front(), m_state.position, m_state.radius)) + { + continue; + } + path_curve const curve{lane->m_paths.front()}; + double distance{0.0}; + auto const t{curve.nearest(m_state.position, distance)}; + if (distance <= m_state.radius && std::abs(curve.point(t).y - m_state.position.y) <= 3.0) + { + m_lanes.emplace_back(lane); + } + } + } + break; + } + } +} + +// finds the rails of a crossing, and the places the vehicles of each lane are to stop at +void roadpoint_node::bind_crossing() +{ + // the road the crossing is on: the one whose axis passes nearest + road_node const *crossed{nullptr}; + auto best{std::numeric_limits::max()}; + for (auto const *road : simulation::Roads.sequence()) + { + if (road == nullptr || road->m_editorremoved || out_of_reach(road->definition().axis, m_state.position, 50.0)) + { + continue; + } + auto const &layout{road->definition()}; + path_curve const axis{layout.axis}; + double distance{0.0}; + auto const t{axis.nearest(m_state.position, distance)}; + if (distance > 0.5 * layout.width() * layout.scale(t) + 1.0 || std::abs(axis.point(t).y - m_state.position.y) > 3.0 || distance >= best) + { + continue; + } + best = distance; + crossed = road; + } + if (crossed != nullptr) + { + auto const &lanes{crossed->tracks()}; + for (std::size_t idx = 0; idx < lanes.size(); ++idx) + { + auto *lane{lanes[idx]}; + if (lane == nullptr || lane->m_paths.empty()) + { + continue; + } + // the lanes are laid out the way the traffic goes, so the place to stop at is back along the lane from the crossing + double distance{0.0}; + path_curve curve{lane->m_paths.front()}; + auto station{curve.station(curve.nearest(m_state.position, distance))}; + double remaining{m_state.clearance}; + for (int guard = 0; guard < 16; ++guard) + { + if (station >= remaining) + { + station -= remaining; + break; + } + // it's on the piece before this one, if there's any: the same lane of the road, not a way through a junction + auto *previous{lane->trPrev}; + auto const *owner{previous != nullptr ? dynamic_cast(previous->m_road) : nullptr}; + if (owner == nullptr || previous->m_paths.empty() || previous->trNext != lane || std::find(owner->tracks().begin(), owner->tracks().end(), previous) == owner->tracks().end()) + { + station = 0.0; + break; + } + remaining -= station; + lane = previous; + curve = path_curve{lane->m_paths.front()}; + station = curve.length(); + } + auto const t{curve.parameter(station)}; + stop_data stop; + stop.track = lane; + stop.position = curve.point(t); + stop.direction = curve.direction(t); + stop.width = (idx < crossed->definition().lanes.size() ? crossed->definition().lanes[idx].width : crossed->definition().lanewidth); + m_stops.emplace_back(stop); + } + } + // orders for the drivers. the ones made before are used again, as a driver may still hold on to one + while (m_events.size() < m_stops.size()) + { + auto *event{new stop_event()}; + event->m_name = m_name + ":stop" + std::to_string(m_events.size() + 1); + m_events.emplace_back(event); + } + for (std::size_t idx = 0; idx < m_stops.size(); ++idx) + { + auto *event{static_cast(m_events[idx])}; + event->m_location = m_stops[idx].position; + // lanes are driven from their first point to the second, which is the way events of the second kind are for + m_stops[idx].track->m_events2.emplace_back(event->m_name, event); + } + + // rails: the tracks passing between the stop lines, and what leads to them within the warning distance + std::vector> reached; + auto const known = [&reached](TTrack const *Track) { return std::any_of(reached.begin(), reached.end(), [Track](std::pair const &Entry) { return Entry.first == Track; }); }; + for (auto *track : simulation::Paths.sequence()) + { + if (track == nullptr || track->m_editorremoved || (track->iCategoryFlag & 1) == 0) + { + continue; + } + for (auto const &path : track->m_paths) + { + if (out_of_reach(path, m_state.position, m_state.clearance)) + { + continue; + } + path_curve const curve{path}; + double distance{0.0}; + auto const t{curve.nearest(m_state.position, distance)}; + if (distance <= m_state.clearance && std::abs(curve.point(t).y - m_state.position.y) <= 3.0) + { + reached.emplace_back(track, 0.0); + break; + } + } + } + for (std::size_t idx = 0; idx < reached.size(); ++idx) + { + auto *track{reached[idx].first}; + double length{0.0}; + for (auto const &path : track->m_paths) + { + length = std::max(length, path_curve{path}.length()); + } + auto const travelled{reached[idx].second + length}; + if (travelled > m_state.warning) + { + continue; + } + std::vector neighbours{track->trPrev, track->trNext}; + if (track->SwitchExtension != nullptr) + { + // both ways of a switch count, as the train can come by either + neighbours.insert(neighbours.end(), {track->SwitchExtension->pPrevs[0], track->SwitchExtension->pPrevs[1], track->SwitchExtension->pNexts[0], track->SwitchExtension->pNexts[1]}); + } + for (auto *neighbour : neighbours) + { + if (neighbour != nullptr && (neighbour->iCategoryFlag & 1) != 0 && false == known(neighbour)) + { + reached.emplace_back(neighbour, travelled); + } + } + } + for (auto const &entry : reached) + { + m_rails.emplace_back(entry.first); + } + close(m_closed); +} + +// lets go of the lanes and the rails +void roadpoint_node::unbind() +{ + if (false == m_bound) + { + return; + } + m_bound = false; + for (std::size_t idx = 0; idx < m_stops.size() && idx < m_events.size(); ++idx) + { + auto &events{m_stops[idx].track->m_events2}; + auto const *event{m_events[idx]}; + events.erase(std::remove_if(events.begin(), events.end(), [event](std::pair const &Entry) { return Entry.second == event; }), events.end()); + } + // a driver who has one of the orders in sight keeps it; it's not to hold anyone anymore + for (auto *event : m_events) + { + static_cast(event)->m_velocity = -1.0; + } + m_stops.clear(); + m_rails.clear(); + m_lanes.clear(); + m_seen.clear(); +} + +// makes the vehicles of a spawn point +void roadpoint_node::prepare() +{ + if (m_prepared || m_state.kind != kind_type::spawn || m_editorremoved) + { + return; + } + if (false == m_bound) + { + bind(); + } + if (m_lanes.empty()) + { + ErrorLog("Bad road point: spawn \"" + m_name + "\" isn't on a lane of a road, there's nowhere to put its vehicles"); + return; + } + m_prepared = true; + // the first vehicle shows up after a part of the interval, so points with the same interval don't all start at once + m_timer = LocalRandom(0.0, m_state.interval); + // vehicles are known by their names, so a point without one makes something up for them + static int nameless{0}; + auto const basename{m_name.empty() ? "roadspawn" + std::to_string(++nameless) : m_name}; + for (auto const &definition : m_state.vehicles) + { + for (int copy = 0; copy < m_state.copies; ++copy) + { + // a vehicle like any other of the scenery, made where the point is and driven at the speed of the point... + auto *vehicle{new TDynamicObject()}; + auto const length{vehicle->Init(basename + ":" + std::to_string(++m_made), definition.folder, definition.skin, definition.type, m_lanes.front(), m_offset + front_room, "headdriver", + m_state.velocity, "", static_cast(definition.load), definition.loadtype, false, "")}; + if (length == 0.0) + { + ErrorLog("Bad road point: vehicle \"" + definition.folder + "/" + definition.type + "\" of spawn \"" + m_name + "\" couldn't be made"); + if (vehicle->MyTrack != nullptr) + { + vehicle->MyTrack->RemoveDynamicObject(vehicle); + } + delete vehicle; + continue; + } + if (vehicle->mdModel != nullptr) + { + for (auto const &smokesource : vehicle->mdModel->smoke_sources()) + { + simulation::Particles.insert(smokesource.first, vehicle, smokesource.second); + } + } + if (false == simulation::Vehicles.insert(vehicle)) + { + ErrorLog("Bad road point: vehicle name \"" + vehicle->name() + "\" made for spawn \"" + m_name + "\" is taken already"); + } + pooled_vehicle entry; + entry.vehicle = vehicle; + entry.velocity = vehicle->MoverParameters->V; + m_pool.emplace_back(entry); + // ...which is taken off the road right away, the way the vehicles leaving the scenery are, to wait for its turn + if (vehicle->MyTrack != nullptr) + { + vehicle->MyTrack->RemoveDynamicObject(vehicle); + vehicle->MyTrack = nullptr; + } + vehicle->bEnabled = false; + } + } + if (m_pool.empty()) + { + ErrorLog("Bad road point: spawn \"" + m_name + "\" has no vehicles to put on the road"); + } +} + +std::size_t roadpoint_node::waiting() const +{ + return static_cast(std::count_if(m_pool.begin(), m_pool.end(), [](pooled_vehicle const &Entry) { return false == Entry.vehicle->bEnabled && Entry.vehicle->MyTrack == nullptr; })); +} + +// to be called with each step of the simulation +void roadpoint_node::update(double const Deltatime) +{ + if (m_editorremoved) + { + return; + } + if (false == m_bound) + { + bind(); + } + switch (m_state.kind) + { + case kind_type::crossing: + { + update_crossing(Deltatime); + break; + } + case kind_type::spawn: + { + update_spawn(Deltatime); + break; + } + case kind_type::despawn: + { + update_despawn(); + break; + } + } +} + +// closes the crossing while there's a rail vehicle coming, or standing right at it +void roadpoint_node::update_crossing(double const Deltatime) +{ + m_scan -= Deltatime; + m_hold -= Deltatime; + if (m_scan <= 0.0) + { + m_scan = scan_period; + std::map seen; + for (auto const *track : m_rails) + { + for (auto const *vehicle : track->Dynamics) + { + if (vehicle == nullptr) + { + continue; + } + auto const distance{planar_distance(vehicle->GetPosition(), m_state.position)}; + seen.emplace(vehicle, distance); + auto const before{m_seen.find(vehicle)}; + // a vehicle getting closer is on its way here; one which stands still or goes away isn't, unless it's at the crossing itself + if (distance < m_state.clearance + near_zone || (before != m_seen.end() && distance < before->second - 0.01)) + { + m_hold = hold_time; + } + } + } + m_seen.swap(seen); + } + if ((m_hold > 0.0) != m_closed) + { + close(m_hold > 0.0); + } +} + +// tells the drivers whether they can go +void roadpoint_node::close(bool const Closed) +{ + m_closed = Closed; + for (std::size_t idx = 0; idx < m_stops.size() && idx < m_events.size(); ++idx) + { + static_cast(m_events[idx])->m_velocity = (Closed ? 0.0 : -1.0); + } +} + +// puts a waiting vehicle on the road when its time comes +void roadpoint_node::update_spawn(double const Deltatime) +{ + if (false == m_prepared) + { + // the point was made in the editor, or the scenery was loaded for editing + prepare(); + } + if (m_pool.empty() || m_lanes.empty()) + { + return; + } + m_timer -= Deltatime; + if (m_timer > 0.0) + { + return; + } + // not with something in the way + auto const *lane{m_lanes.front()}; + for (auto const *track : {lane, static_cast(lane->trPrev), static_cast(lane->trNext)}) + { + if (track == nullptr) + { + continue; + } + for (auto const *other : track->Dynamics) + { + if (other != nullptr && planar_distance(other->GetPosition(), m_state.position) < clear_zone) + { + m_timer = retry_period; + return; + } + } + } + // one of the vehicles which wait, picked at random + std::vector ready; + for (auto const &entry : m_pool) + { + if (false == entry.vehicle->bEnabled && entry.vehicle->MyTrack == nullptr) + { + ready.emplace_back(&entry); + } + } + if (ready.empty()) + { + m_timer = retry_period; + return; + } + auto const &entry{*ready[std::min(ready.size() - 1, static_cast(LocalRandom(0.0, static_cast(ready.size()))))]}; + auto *vehicle{entry.vehicle}; + // it comes back the way it was made: whole, at speed, with the driver told to drive on + vehicle->bEnabled = true; + vehicle->MoverParameters->DamageFlag = 0; + vehicle->MoverParameters->EngDmgFlag = 0; + vehicle->MoverParameters->V = entry.velocity; + vehicle->place_on_track(m_lanes.front(), m_offset + 0.5 * vehicle->MoverParameters->Dim.L, false); + if (vehicle->Mechanik != nullptr) + { + // the same order a vehicle put in the scenery gets; it has the driver forget the road they knew + vehicle->Mechanik->PutCommand("Timetable:", m_state.velocity, 0, nullptr); + } + m_timer = m_state.interval * (1.0 + m_state.variation * LocalRandom(-1.0, 1.0)); +} + +// takes away the road vehicles which got to the point +void roadpoint_node::update_despawn() +{ + for (auto const *lane : m_lanes) + { + for (auto *vehicle : lane->Dynamics) + { + if (vehicle == nullptr || false == vehicle->bEnabled || vehicle->MoverParameters->CategoryFlag != 2) + { + continue; + } + if (simulation::Train != nullptr && simulation::Train->Dynamic() == vehicle) + { + // not the one the user sits in + continue; + } + if (planar_distance(vehicle->GetPosition(), m_state.position) > m_state.radius + 0.5 * vehicle->MoverParameters->Dim.L) + { + continue; + } + // the way vehicles reaching the end of the scenery go: marked here, taken off the road once all vehicles made their move + vehicle->bEnabled = false; + TDynamicObject::bDynamicRemove = true; + } + } +} + +// generates geometry of the stop lines +std::vector roadpoint_node::create_shapes() const +{ + std::vector shapes; + if (m_state.kind != kind_type::crossing || false == m_state.stoplines || m_stops.empty()) + { + return shapes; + } + std::vector vertices; + glm::dvec3 const lift{0.0, line_lift, 0.0}; + glm::vec3 const upwards{0.f, 1.f, 0.f}; + for (auto const &stop : m_stops) + { + // a line across the lane, ending where the vehicles are to stop + glm::dvec3 across{stop.direction.z, 0.0, -stop.direction.x}; + if (glm::length2(across) < 1e-12) + { + continue; + } + across = glm::normalize(across); + glm::dvec3 back{-stop.direction.x, 0.0, -stop.direction.z}; + back = glm::normalize(back) * stopline_width; + auto const reach{std::max(0.25, 0.5 * stop.width - stopline_inset)}; + auto const right{stop.position - across * reach + lift}; + auto const left{stop.position + across * reach + lift}; + vertices.push_back({right + back, upwards, {0.f, 0.f}}); + vertices.push_back({right, upwards, {1.f, 0.f}}); + vertices.push_back({left + back, upwards, {0.f, 1.f}}); + vertices.push_back({right, upwards, {1.f, 0.f}}); + vertices.push_back({left, upwards, {1.f, 1.f}}); + vertices.push_back({left + back, upwards, {0.f, 1.f}}); + } + if (false == vertices.empty()) + { + lighting_data paint; + paint.diffuse = glm::vec4{0.92f, 0.92f, 0.92f, 1.f}; + paint.ambient = paint.diffuse; + scene::shape_node shape; + shape.make_terrain(GfxRenderer->Fetch_Material("colored"), std::move(vertices), glm::dvec3{0.0}); + shape.lighting(paint); + shapes.emplace_back(std::move(shape)); + } + return shapes; +} + +// puts geometry of the point in the scene as shapes of its own, which can be taken back +void roadpoint_node::show() +{ + if (m_shapes.shown() || m_editorremoved || simulation::Region == nullptr || Global.NvRenderer) + { + // NOTE: the experimental renderer draws only what the scenery had when it was loaded + return; + } + m_shapes.show(create_shapes(), m_state.position); +} + +void roadpoint_node::hide() +{ + m_shapes.hide(); +} + +// radius() subclass details, calculates node's bounding radius +float roadpoint_node::radius_() +{ + return m_state.kind == kind_type::crossing ? m_state.clearance + 5.f : m_state.radius; +} + +// serialize() subclass details, sends content of the subclass to provided stream +void roadpoint_node::serialize_(std::ostream &Output) const +{ + // TODO: implement +} + +// deserialize() subclass details, restores content of the subclass from provided stream +void roadpoint_node::deserialize_(std::istream &Input) +{ + // TODO: implement +} + +// export() subclass details, sends basic content of the class in legacy (text) format to provided stream +void roadpoint_node::export_as_text_(std::ostream &Output) const +{ + auto const type{keyword(m_state.kind)}; + Output << type << ' '; + auto const precision{Output.precision(std::numeric_limits::digits10)}; + Output << m_state.position.x << ' ' << m_state.position.y << ' ' << m_state.position.z << ' '; + Output.precision(precision); + switch (m_state.kind) + { + case kind_type::crossing: + { + Output << "clearance " << m_state.clearance << ' ' << "warning " << m_state.warning << ' ' << "stoplines " << (m_state.stoplines ? "yes" : "no") << ' '; + break; + } + case kind_type::spawn: + { + Output << "interval " << m_state.interval << ' ' << "variation " << m_state.variation << ' ' << "velocity " << m_state.velocity << ' ' << "copies " << m_state.copies << ' '; + for (auto const &vehicle : m_state.vehicles) + { + // the way vehicles are put in a scenery. the path and the offset are there to keep that form, the point doesn't use them + Output << "node -1 0 none dynamic " << vehicle.folder << ' ' << vehicle.skin << ' ' << vehicle.type << " none 0 headdriver " << m_state.velocity << ' ' << vehicle.load << ' '; + if (vehicle.load > 0 && false == vehicle.loadtype.empty()) + { + Output << vehicle.loadtype << ' '; + } + Output << "enddynamic "; + } + break; + } + case kind_type::despawn: + { + Output << "radius " << m_state.radius << ' '; + break; + } + } + Output << "end" << type << "\n"; +} + +// legacy style initialization, to be performed when the lanes of the roads are tied together +void roadpoint_table::InitRoadpoints() +{ + for (auto *point : m_items) + { + if (point == nullptr) + { + continue; + } + point->bind(); + if (false == Global.editor_session) + { + // the vehicles are made now, so they don't hold the simulation up later. a scenery opened for editing + // does without them until the simulation is run + point->prepare(); + } + } +} + +// lets go of the lanes and the rails, ahead of a change of the roads +void roadpoint_table::unbind() +{ + for (auto *point : m_items) + { + if (point != nullptr) + { + point->unbind(); + } + } +} + +// ties all points anew, after the roads were changed +void roadpoint_table::bind() +{ + for (auto *point : m_items) + { + if (point == nullptr) + { + continue; + } + // the stop lines go where the lanes are now + point->hide(); + point->bind(); + if (m_geometry) + { + point->show(); + } + } +} + +// puts geometry of the points in the scene +void roadpoint_table::create_geometry() +{ + m_geometry = true; + for (auto *point : m_items) + { + if (point != nullptr) + { + point->show(); + } + } +} + +// to be called with each step of the simulation +void roadpoint_table::update(double const Deltatime) +{ + for (auto *point : m_items) + { + if (point != nullptr) + { + point->update(Deltatime); + } + } +} + +//--------------------------------------------------------------------------- diff --git a/world/RoadPoint.h b/world/RoadPoint.h new file mode 100644 index 000000000..e4a91d46b --- /dev/null +++ b/world/RoadPoint.h @@ -0,0 +1,207 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include +#include +#include + +#include + +#include "utilities/Classes.h" +#include "utilities/Names.h" +#include "scene/scenenode.h" +#include "world/Road.h" + +class TDynamicObject; +class basic_event; + +// a place on a road where something happens to the traffic. three kinds of it: +// - a level crossing: vehicles are stopped ahead of the rails for as long as a train is near, +// - a point where vehicles appear, drawn from a set made ready while the scenery is loaded, +// - a point where vehicles are taken away. the ones which came from a point of the previous kind go back to its set. +// scenery entries: +// node crossing [clearance ] [warning ] [stoplines ] endcrossing +// node spawn [interval ] [variation <0..1>] [velocity ] [copies ] +// [node dynamic [] enddynamic]... endspawn +// node despawn [radius ] enddespawn +// the vehicles of a spawn point are given the way vehicles are put in a scenery; where they're put and how they're driven +// is up to the point, so the path, the offset, the driver and the velocity of these entries don't matter +class roadpoint_node : public scene::basic_node +{ + + public: + // types + enum class kind_type + { + crossing, + spawn, + despawn + }; + struct vehicle_data + { + std::string folder; // where the vehicle is defined, in the folder of the vehicles + std::string skin; + std::string type; // name of its definition files + int load{0}; + std::string loadtype; + + bool operator==(vehicle_data const &Other) const + { + return folder == Other.folder && skin == Other.skin && type == Other.type && load == Other.load && loadtype == Other.loadtype; + } + }; + struct state + { + kind_type kind{kind_type::crossing}; + glm::dvec3 position{0.0}; + // level crossing + float clearance{6.f}; // distance along the road from the point to the places the vehicles stop at + float warning{800.f}; // how far along the rails a train coming closes the crossing + bool stoplines{true}; // lines are painted where the vehicles stop + // point where vehicles appear + float interval{20.f}; // seconds from a vehicle to the next + float variation{0.5f}; // part of the interval which is drawn at random + float velocity{50.f}; // speed the vehicles appear with, and are told to keep, km/h + int copies{2}; // number of each vehicle made ready + std::vector vehicles; + // point where vehicles are taken away + float radius{2.f}; // vehicles on lanes this close to the point are taken + + // brings the content to a usable form + void normalize(); + }; + // place the vehicles of a lane stop at while a crossing is closed + struct stop_data + { + TTrack *track{nullptr}; // the lane it's on + glm::dvec3 position{0.0}; + glm::dvec3 direction{0.0, 0.0, 1.0}; // the way the lane goes there + float width{3.5f}; // of the lane + }; + // constructors + explicit roadpoint_node(scene::node_data const &Nodedata); + // methods + // restores content of the node from provided input stream; reads up to and including the closing statement + void import(cParser &Input, glm::dvec3 const &Offset); + state const &definition() const + { + return m_state; + } + // replaces what the node knows about itself. what it's tied to stays, it's up to the caller to bind it again. + // a spawn point given another set of vehicles makes them anew; the ones it had stay on the road until they're taken away + void define(state const &State); + // scenery keyword for specified kind of point, and the statement closing its entry + static std::string keyword(kind_type const Kind); + static bool is_keyword(std::string const &Type); + // reads vehicles out of a text. each is given the way vehicles are put in a scenery, or, if there's no such entry + // in the text, as " [ ]" on a line of its own + static std::vector parse_vehicles(std::string const &Text); + // ties the point to the lanes and the rails as they are at the moment, or lets go of them + void bind(); + void unbind(); + // makes the vehicles of a spawn point, once. it loads their models, which takes a while + void prepare(); + // to be called with each step of the simulation + void update(double const Deltatime); + // state for display + bool closed() const + { + return m_closed; + } + std::vector const &stops() const + { + return m_stops; + } + std::vector const &lanes() const + { + return m_lanes; + } + std::size_t rails() const + { + return m_rails.size(); + } + // vehicles made for a spawn point, and how many of them wait for their turn + std::size_t vehicles() const + { + return m_pool.size(); + } + std::size_t waiting() const; + // generates geometry of the stop lines + std::vector create_shapes() const; + // puts geometry of the point in the scene, or takes it back + void show(); + void hide(); + bool shown() const + { + return m_shapes.shown(); + } + // members + bool m_editorremoved{false}; // removed in the editor; kept around so the removal can be undone + + private: + // types + struct pooled_vehicle + { + TDynamicObject *vehicle{nullptr}; + double velocity{0.0}; // what its speed was when it was made, to be given back each time it's put on the road + }; + // methods + float radius_() override; + void serialize_(std::ostream &Output) const override; + void deserialize_(std::istream &Input) override; + void export_as_text_(std::ostream &Output) const override; + void bind_crossing(); + void update_crossing(double const Deltatime); + void update_spawn(double const Deltatime); + void update_despawn(); + void close(bool const Closed); + // members + state m_state; + bool m_bound{false}; + // level crossing + std::vector m_stops; + std::vector m_events; // orders for the drivers, one for each stop. these are never freed, as a driver can hold on to one + std::vector m_rails; // rails a train closes the crossing from + std::map m_seen; // rail vehicles near, with how far each was the last time + bool m_closed{false}; + double m_hold{0.0}; // time left for the crossing to stay closed after the last train was seen + double m_scan{0.0}; // time left to the next look at the rails + // spawn and despawn + std::vector m_lanes; // spawn: the lane the vehicles are put on. despawn: lanes the vehicles are taken from + double m_offset{0.0}; // spawn: distance of the point from the start of that lane + std::vector m_pool; + bool m_prepared{false}; + int m_made{0}; // number of vehicles made so far, for their names + double m_timer{0.0}; // time left to the next vehicle + owned_shapes m_shapes; +}; + +// collection of the road points present in the scene +class roadpoint_table : public basic_table +{ + + public: + // legacy style initialization, to be performed when the lanes of the roads are tied together + void InitRoadpoints(); + // lets go of the lanes and the rails, ahead of a change of the roads, and ties all points anew when it's done + void unbind(); + void bind(); + // puts geometry of the points in the scene + void create_geometry(); + // to be called with each step of the simulation + void update(double const Deltatime); + + private: + bool m_geometry{false}; // the scene is ready to take geometry of the points +}; + +//--------------------------------------------------------------------------- From e5c91d8a1a213c12ff996dbfb339b0e40c74830a Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 00:33:44 +0200 Subject: [PATCH 087/430] refactor(editor): shared plan geometry and formatting helpers --- application/editormodeinfra.cpp | 20 +- application/editormodeprofile.cpp | 39 +--- application/editormodetrack.cpp | 344 ++++++++++++------------------ editor/editorAlignment.cpp | 50 ++--- editor/editorFormat.hpp | 26 +++ editor/editorGeometry.hpp | 131 ++++++++++++ editor/editorInfra.cpp | 66 ++---- editor/editorProfile.cpp | 9 +- editor/editorTrack.cpp | 188 +++++----------- editor/editorTrack.hpp | 6 + 10 files changed, 392 insertions(+), 487 deletions(-) create mode 100644 editor/editorFormat.hpp create mode 100644 editor/editorGeometry.hpp diff --git a/application/editormodeinfra.cpp b/application/editormodeinfra.cpp index 0fb987e54..d81dd2f2b 100644 --- a/application/editormodeinfra.cpp +++ b/application/editormodeinfra.cpp @@ -10,6 +10,8 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "application/editormode.h" #include "application/editorprojection.h" +#include "editor/editorFormat.hpp" +#include "editor/editorGeometry.hpp" #include "editor/editorIncludeInfo.hpp" #include "model/AnimModel.h" @@ -40,21 +42,11 @@ http://mozilla.org/MPL/2.0/. namespace { +using geometry::plan_distance; +using geometry::plan_of; + std::string const kBindingMark{"//$b"}; -template -std::string format(char const *Format, Args... Arguments) -{ - char text[256]; - std::snprintf(text, sizeof(text), Format, Arguments...); - return text; -} - -double plan_distance(glm::dvec3 const &A, glm::dvec3 const &B) -{ - return std::hypot(A.x - B.x, A.z - B.z); -} - template bool contains(std::vector const &Items, Type_ const &Item) { @@ -357,7 +349,7 @@ bool beside(infra::station const &Station, glm::dvec3 const &Point, bool const I if (Interior) return true; auto const axis{infra::frame_at(Station)}; - return std::abs(glm::dot(glm::dvec2{Point.x - axis.point.x, Point.z - axis.point.z}, axis.forward)) <= 0.5; + return std::abs(glm::dot(plan_of(Point - axis.point), axis.forward)) <= 0.5; } // nearest point of the tracks, sideways from the axis within the corridor diff --git a/application/editormodeprofile.cpp b/application/editormodeprofile.cpp index 8a6aa1e66..179ce97f9 100644 --- a/application/editormodeprofile.cpp +++ b/application/editormodeprofile.cpp @@ -10,6 +10,8 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "application/editormode.h" #include "application/editorprojection.h" +#include "editor/editorFormat.hpp" +#include "editor/editorGeometry.hpp" #include "world/Track.h" #include "scene/scenelayers.h" @@ -27,6 +29,8 @@ http://mozilla.org/MPL/2.0/. namespace { +using geometry::plan_distance; + ImU32 const kGradeLine{IM_COL32(90, 230, 110, 255)}; ImU32 const kTangents{IM_COL32(255, 210, 60, 130)}; ImU32 const kTrack{IM_COL32(190, 190, 190, 255)}; @@ -37,14 +41,6 @@ ImU32 const kSwitch{IM_COL32(160, 100, 220, 45)}; ImU32 const kError{IM_COL32(255, 80, 70, 255)}; ImU32 const kWarning{IM_COL32(255, 200, 60, 255)}; -template -std::string format(char const *Format, Args... Arguments) -{ - char text[256]; - std::snprintf(text, sizeof(text), Format, Arguments...); - return text; -} - double nice_step(double const Approximate) { auto const power{std::pow(10.0, std::floor(std::log10(std::max(Approximate, 1e-6))))}; @@ -54,18 +50,6 @@ double nice_step(double const Approximate) return power * 10.0; } -glm::dvec3 position_at(std::vector const &Samples, double const Chainage) -{ - auto const next{std::lower_bound(Samples.begin(), Samples.end(), Chainage, [](editor_track::route_sample const &Sample, double const Value) { return Sample.chainage < Value; })}; - if (next == Samples.begin()) - return Samples.front().position; - if (next == Samples.end()) - return Samples.back().position; - auto const &before{*std::prev(next)}; - auto const run{next->chainage - before.chainage}; - return run > 1e-9 ? glm::mix(before.position, next->position, (Chainage - before.chainage) / run) : before.position; -} - double route_speed(editor_track::route const &Route) { double speed{-1.0}; @@ -76,11 +60,6 @@ double route_speed(editor_track::route const &Route) std::string const kProfileMark{"//$p"}; -double plan_distance(glm::dvec3 const &A, glm::dvec3 const &B) -{ - return std::hypot(A.x - B.x, A.z - B.z); -} - profile::line reversed_line(profile::line Line, double const Length) { std::reverse(Line.points.begin(), Line.points.end()); @@ -224,7 +203,7 @@ int editor_mode::profile_find(bool &Reversed) const return -1; auto const start{state.samples.front().position}; auto const end{state.samples.back().position}; - auto const middle{position_at(state.samples, state.route.length * 0.5)}; + auto const middle{editor_track::sampled_position(state.samples, state.route.length * 0.5)}; for (std::size_t i = 0; i < m_profiles.size(); ++i) { auto const &entry{m_profiles[i]}; @@ -274,7 +253,7 @@ void editor_mode::profile_store() entry.length = state.route.length; entry.start = state.samples.front().position; entry.end = state.samples.back().position; - entry.middle = position_at(state.samples, state.route.length * 0.5); + entry.middle = editor_track::sampled_position(state.samples, state.route.length * 0.5); entry.origin = state.origin; entry.line = state.line; auto &points{entry.line.points}; @@ -345,7 +324,7 @@ void editor_mode::profile_open_stored(std::size_t const Index) if (false == editor_track::find_route(from, to, route, error) || std::abs(route.length - entry.length) > 0.5) continue; auto const samples{editor_track::sample_route(route, 1.0)}; - if (samples.empty() || plan_distance(samples.front().position, entry.start) > 0.1 || plan_distance(position_at(samples, route.length * 0.5), entry.middle) > 0.5) + if (samples.empty() || plan_distance(samples.front().position, entry.start) > 0.1 || plan_distance(editor_track::sampled_position(samples, route.length * 0.5), entry.middle) > 0.5) continue; profile_open(from, to); return; @@ -1172,7 +1151,7 @@ void editor_mode::draw_profile_overlay() const auto const &points{state.line.points}; for (int i = 0; i < static_cast(points.size()); ++i) { - auto position{position_at(samples, points[i].chainage)}; + auto position{editor_track::sampled_position(samples, points[i].chainage)}; position.y = profile::elevation(state.line, points[i].chainage); ImVec2 screen; if (false == projection.project(position, screen)) @@ -1183,7 +1162,7 @@ void editor_mode::draw_profile_overlay() const if (state.hover >= 0.0 && state.hover <= state.route.length) { ImVec2 screen; - if (projection.project(position_at(samples, state.hover), screen)) + if (projection.project(editor_track::sampled_position(samples, state.hover), screen)) drawlist->AddCircle(screen, 12.0f, IM_COL32(255, 255, 255, 230), 16, 2.5f); } } diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 29a2ab9b6..ca5f77223 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -12,6 +12,8 @@ http: #include "application/editormode.h" #include "application/editoruilayer.h" #include "application/editorprojection.h" +#include "editor/editorFormat.hpp" +#include "editor/editorGeometry.hpp" #include "utilities/Globals.h" #include "rendering/renderer.h" @@ -32,18 +34,16 @@ http: namespace { -glm::dvec3 path_point(segment_data const &Path, double const T) +using geometry::bezier; +using geometry::cross; +using geometry::grade_of; +using geometry::plan_distance; +using geometry::plan_of; +using geometry::turned; + +std::string describe(editor_track::straight const &Line) { - auto const &p0 = Path.points[segment_data::point::start]; - auto const &p3 = Path.points[segment_data::point::end]; - auto const &cp1 = Path.points[segment_data::point::control1]; - auto const &cp2 = Path.points[segment_data::point::control2]; - if (cp1 == glm::dvec3{} && cp2 == glm::dvec3{}) - return glm::mix(p0, p3, T); - auto const p1 = p0 + cp1; - auto const p2 = p3 + cp2; - double const u = 1.0 - T; - return u * u * u * p0 + 3.0 * u * u * T * p1 + 3.0 * u * T * T * p2 + T * T * T * p3; + return format("L %.2f m az %.4f deg i %.2f per mille %zu paths", Line.length, Line.azimuth, Line.grade * 1000.0, Line.tracks.size()); } char const *point_label(editor_track::point_kind const Kind) @@ -57,11 +57,6 @@ char const *point_label(editor_track::point_kind const Kind) } } -bool is_end(editor_track::point_kind const Kind) -{ - return Kind == editor_track::point_kind::start || Kind == editor_track::point_kind::end; -} - editor_track::point_kind const kPointKinds[] = {editor_track::point_kind::start, editor_track::point_kind::control1, editor_track::point_kind::control2, editor_track::point_kind::end}; float const kHandleRadius{10.0f}; @@ -128,7 +123,7 @@ bool editor_mode::pick_track_handle() continue; float const dx = screen.x - mouse.x; float const dy = screen.y - mouse.y; - float const distance = (dx * dx + dy * dy) * (is_end(kind) ? 0.5f : 1.0f); + float const distance = (dx * dx + dy * dy) * (editor_track::is_end(kind) ? 0.5f : 1.0f); if (distance < best) { best = distance; @@ -156,10 +151,10 @@ void editor_mode::draw_track_overlay() const int constexpr samples{32}; for (auto const &path : track->m_paths) { - auto previous = path_point(path, 0.0); + auto previous = bezier{path}.point(0.0); for (int i = 1; i <= samples; ++i) { - auto const next = path_point(path, static_cast(i) / samples); + auto const next = bezier{path}.point(static_cast(i) / samples); projection.line(drawlist, previous, next, coursecolor, 2.5f); previous = next; } @@ -182,7 +177,7 @@ void editor_mode::draw_track_overlay() const if (false == projection.project(editor_track::point_position(*track, point), screen)) continue; bool const selected = (point == m_track_point); - if (is_end(kind)) + if (editor_track::is_end(kind)) { ImU32 const color = editor_track::is_connected(*track, point) ? IM_COL32(60, 220, 60, 255) : IM_COL32(240, 60, 60, 255); drawlist->AddCircleFilled(screen, 6.0f, color); @@ -247,7 +242,7 @@ void editor_mode::render_track_gizmo() m_track_drag = {track}; m_track_drag_points.clear(); m_track_snap = {}; - if (pointmode && is_end(m_track_point.kind) && m_track_drag_connected) + if (pointmode && editor_track::is_end(m_track_point.kind) && m_track_drag_connected) { for (auto const &connection : editor_track::connected_points(*track, editor_track::point_position(*track, m_track_point))) { @@ -281,7 +276,7 @@ void editor_mode::render_track_gizmo() for (auto const &connection : m_track_drag_points) editor_track::move_point(*connection.first, connection.second, position); m_track_dirty = true; - if (is_end(m_track_point.kind) && m_track_drag_points.empty()) + if (editor_track::is_end(m_track_point.kind) && m_track_drag_points.empty()) { std::vector const exclude(m_track_drag.begin(), m_track_drag.end()); m_track_snap = editor_track::find_snap_target(*track, position, m_track_snap_radius, exclude); @@ -501,9 +496,9 @@ void editor_mode::render_turnout_ui() auto const &main{track->m_paths[0]}; auto const &diverging{track->m_paths[1]}; auto const origin{main.points[segment_data::point::start]}; - glm::dvec2 const axis{glm::normalize(glm::dvec2{main.points[segment_data::point::end].x - origin.x, main.points[segment_data::point::end].z - origin.z})}; + glm::dvec2 const axis{glm::normalize(plan_of(main.points[segment_data::point::end] - origin))}; glm::dvec2 const normal{-axis.y, axis.x}; - auto const length{glm::dot(glm::dvec2{main.points[segment_data::point::end].x - origin.x, main.points[segment_data::point::end].z - origin.z}, axis)}; + auto const length{glm::dot(plan_of(main.points[segment_data::point::end] - origin), axis)}; glm::dvec2 const end{diverging.points[segment_data::point::end].x - origin.x, diverging.points[segment_data::point::end].z - origin.z}; auto const offset{glm::dot(end, normal)}; auto const &control{diverging.points[segment_data::point::control2]}; @@ -559,7 +554,7 @@ void editor_mode::render_turnout_ui() { auto &local{own.local[i]}; local = track->m_paths[i]; - auto const tolocal = [&](glm::dvec3 const &Vector) { return glm::dvec3{glm::dot(glm::dvec2{Vector.x, Vector.z}, normal) * side, Vector.y, glm::dot(glm::dvec2{Vector.x, Vector.z}, axis)}; }; + auto const tolocal = [&](glm::dvec3 const &Vector) { return glm::dvec3{glm::dot(plan_of(Vector), normal) * side, Vector.y, glm::dot(plan_of(Vector), axis)}; }; local.points[segment_data::point::start] = tolocal(track->m_paths[i].points[segment_data::point::start] - origin); local.points[segment_data::point::end] = tolocal(track->m_paths[i].points[segment_data::point::end] - origin); local.points[segment_data::point::control1] = tolocal(track->m_paths[i].points[segment_data::point::control1]); @@ -750,7 +745,7 @@ void editor_mode::render_path_ui() if (kind != editor_track::point_kind::start) ImGui::SameLine(); std::string label = point_label(kind); - if (is_end(kind)) + if (editor_track::is_end(kind)) label += editor_track::is_connected(*track, point) ? " (+)" : " (-)"; if (ImGui::Selectable(label.c_str(), m_track_point == point, 0, ImVec2(90.0f, 0.0f))) m_track_point = (m_track_point == point ? editor_track::point_ref{} : point); @@ -815,14 +810,12 @@ void editor_mode::route_bind_ends() { auto const &chain{m_route.chain}; auto &design{m_route.design}; - auto const plan = [](glm::dvec3 const &Direction) { return glm::normalize(glm::dvec2{Direction.x, Direction.z}); }; - auto const slope = [](glm::dvec3 const &Direction) { return Direction.y / std::max(1e-9, std::hypot(Direction.x, Direction.z)); }; design.start = chain.start; design.end = chain.end; - design.start_direction = plan(chain.start_direction); - design.end_direction = plan(chain.end_direction); - design.start_grade = slope(chain.start_direction); - design.end_grade = slope(chain.end_direction); + design.start_direction = glm::normalize(plan_of(chain.start_direction)); + design.end_direction = glm::normalize(plan_of(chain.end_direction)); + design.start_grade = grade_of(chain.start_direction); + design.end_grade = grade_of(chain.end_direction); design.start_radius = chain.start_radius; design.end_radius = chain.end_radius; design.start_reserve = editor_track::run_reserve(editor_track::straight_beyond(chain, false, m_straights.tolerance)); @@ -865,7 +858,7 @@ void editor_mode::route_reset() } else { - auto const distance{glm::distance(glm::dvec2{design.start.x, design.start.z}, glm::dvec2{design.end.x, design.end.z})}; + auto const distance{plan_distance(design.start, design.end)}; vertex.offset = distance / 3.0; route.design.vertices.push_back(vertex); route.design.vertices.push_back(vertex); @@ -908,7 +901,7 @@ bool editor_mode::route_from_curve(TTrack &Track) } else { - auto const distance{glm::distance(glm::dvec2{design.start.x, design.start.z}, glm::dvec2{design.end.x, design.end.z})}; + auto const distance{plan_distance(design.start, design.end)}; vertex.offset = distance / 3.0; design.vertices = {vertex, vertex}; } @@ -954,9 +947,8 @@ void editor_mode::route_apply() from = editor_track::take_straight(editor_track::straight_beyond(before, false, m_straights.tolerance), from, before.start, route.result.start, states, created); if (endextension > 0.0) to = editor_track::take_straight(editor_track::straight_beyond(before, true, m_straights.tolerance), to, before.end, route.result.end, states, created); - auto const plandistance = [](glm::dvec3 const &A, glm::dvec3 const &B) { return glm::distance(glm::dvec2{A.x, A.z}, glm::dvec2{B.x, B.z}); }; std::string error; - if (false == editor_track::find_chain(from, to, chain, error) || plandistance(chain.start, route.result.start) > 5.0 || plandistance(chain.end, route.result.end) > 5.0) + if (false == editor_track::find_chain(from, to, chain, error) || plan_distance(chain.start, route.result.start) > 5.0 || plan_distance(chain.end, route.result.end) > 5.0) { for (auto *track : created) editor_track::retire(*track); @@ -995,11 +987,7 @@ void editor_mode::route_apply() } route.status = "Re-laid " + std::to_string(chain.tracks.size()) + " paths" + (added > 0 ? ", added " + std::to_string(added) : std::string{}); if (startextension > 0.0 || endextension > 0.0) - { - char text[96]; - std::snprintf(text, sizeof(text), ", the curve took over %.2f / %.2f m of the adjoining straights", startextension, endextension); - route.status += text; - } + route.status += format(", the curve took over %.2f / %.2f m of the adjoining straights", startextension, endextension); WriteLog("Editor: route design - " + route.status, logtype::generic); } @@ -1137,17 +1125,11 @@ void editor_mode::draw_route_overlay() const drawlist->AddCircleFilled(screen, 6.0f, IM_COL32(60, 230, 90, 255), 4); if (i == route.grip) drawlist->AddCircle(screen, 11.0f, IM_COL32(255, 255, 255, 255), 16, 2.5f); - char radius[40]; auto const *report{i < static_cast(result.curves.size()) ? &result.curves[i] : nullptr}; - if (report != nullptr && report->radius2 > 0.0) - std::snprintf(radius, sizeof(radius), "R %.0f / %.0f", report->radius, report->radius2); - else - std::snprintf(radius, sizeof(radius), "R %.0f", report != nullptr ? report->radius : design.vertices[i].radius); - drawlist->AddText(ImVec2(screen.x + 9.0f, screen.y + 4.0f), IM_COL32(60, 230, 90, 255), radius); + auto const radius{report != nullptr && report->radius2 > 0.0 ? format("R %.0f / %.0f", report->radius, report->radius2) : format("R %.0f", report != nullptr ? report->radius : design.vertices[i].radius)}; + drawlist->AddText(ImVec2(screen.x + 9.0f, screen.y + 4.0f), IM_COL32(60, 230, 90, 255), radius.c_str()); } - char label[8]; - std::snprintf(label, sizeof(label), "W%d", i + 1); - drawlist->AddText(ImVec2(screen.x + 9.0f, screen.y - 18.0f), IM_COL32(255, 210, 60, 255), label); + drawlist->AddText(ImVec2(screen.x + 9.0f, screen.y - 18.0f), IM_COL32(255, 210, 60, 255), format("W%d", i + 1).c_str()); } } @@ -1193,7 +1175,7 @@ void editor_mode::render_route_gizmo() { auto &vertex{route.design.vertices[route.grip]}; auto const corner{route_vertex_position(route.grip)}; - auto const distance{glm::distance(glm::dvec2{moved.x, moved.z}, glm::dvec2{corner.x, corner.z})}; + auto const distance{plan_distance(moved, corner)}; for (auto const &curve : route.result.curves) { if (curve.vertex != route.grip || vertex.reverse_turn) @@ -1210,9 +1192,9 @@ void editor_mode::render_route_gizmo() if (count >= 2) { if (route.vertex == 0) - vertex.offset = std::max(0.1, glm::dot(point - glm::dvec2{route.design.start.x, route.design.start.z}, glm::normalize(route.design.start_direction))); + vertex.offset = std::max(0.1, glm::dot(point - plan_of(route.design.start), glm::normalize(route.design.start_direction))); else if (route.vertex == count - 1) - vertex.offset = std::max(0.1, glm::dot(glm::dvec2{route.design.end.x, route.design.end.z} - point, glm::normalize(route.design.end_direction))); + vertex.offset = std::max(0.1, glm::dot(plan_of(route.design.end) - point, glm::normalize(route.design.end_direction))); else vertex.position = point; } @@ -1301,7 +1283,7 @@ void editor_mode::render_route_ui() alignment::vertex vertex; vertex.radius = vertices.empty() ? 1000.0 : vertices.back().radius; route_recommend(vertex); - auto const distance{glm::distance(glm::dvec2{design.start.x, design.start.z}, glm::dvec2{design.end.x, design.end.z})}; + auto const distance{plan_distance(design.start, design.end)}; if (vertices.size() == 1) { vertices.front().offset = distance / 3.0; @@ -1341,9 +1323,7 @@ void editor_mode::render_route_ui() { auto &vertex{vertices[i]}; ImGui::PushID(i); - char header[32]; - std::snprintf(header, sizeof(header), "Vertex W%d", i + 1); - if (ImGui::Selectable(header, route.vertex == i)) + if (ImGui::Selectable(format("Vertex W%d", i + 1).c_str(), route.vertex == i)) route.vertex = (route.vertex == i ? -1 : i); ImGui::Indent(); ImGui::PushItemWidth(110.0f); @@ -1464,9 +1444,9 @@ void editor_mode::draw_straights_overlay() const glm::dvec3 const camera{Global.pCamera.Pos}; auto const nearby = [&](editor_track::straight const &Line) { auto const offset{camera - Line.start}; - auto const along{std::clamp(glm::dot(glm::dvec2{offset.x, offset.z}, Line.direction), 0.0, Line.length)}; + auto const along{std::clamp(glm::dot(plan_of(offset), Line.direction), 0.0, Line.length)}; auto const closest{Line.start + glm::dvec3{Line.direction.x, 0.0, Line.direction.y} * along}; - return glm::distance(glm::dvec2{closest.x, closest.z}, glm::dvec2{camera.x, camera.z}) < 3000.0; + return plan_distance(closest, camera) < 3000.0; }; auto const draw = [&](editor_track::straight const &Line, ImU32 const Color, float const Thickness) { if (Line.tracks.empty()) @@ -1499,7 +1479,7 @@ void editor_mode::draw_straights_overlay() const drawlist->AddCircleFilled(screen, 7.0f, IM_COL32(255, 210, 60, 255)); if (state.tool == 1) { - auto const direction{glm::dvec2{state.tool_handle.x - state.tool_point.x, state.tool_handle.z - state.tool_point.z}}; + auto const direction{plan_of(state.tool_handle - state.tool_point)}; if (glm::length(direction) > 1e-3) { auto const unit{glm::normalize(direction)}; @@ -1510,7 +1490,7 @@ void editor_mode::draw_straights_overlay() const else { glm::dvec2 const normal{-line.direction.y, line.direction.x}; - auto const offset{glm::dvec2{state.tool_handle.x - state.tool_point.x, state.tool_handle.z - state.tool_point.z}}; + auto const offset{plan_of(state.tool_handle - state.tool_point)}; auto const shift{glm::dot(offset, normal)}; auto const length{glm::dot(offset, line.direction)}; auto const shifted{glm::dvec3{normal.x, 0.0, normal.y} * shift}; @@ -1568,9 +1548,8 @@ void editor_mode::draw_straights_overlay() const glm::dvec2 const normal{-line.direction.y, line.direction.x}; for (auto const &other : m_straights.neighbours) { - auto const along = [&](glm::dvec3 const &Point) { return glm::dot(glm::dvec2{Point.x - line.start.x, Point.z - line.start.z}, line.direction); }; - auto const across = [&](glm::dvec3 const &Point) { return glm::dot(glm::dvec2{Point.x - line.start.x, Point.z - line.start.z}, normal); }; - auto const a0{along(other.start)}, a1{along(other.end)}; + auto const across = [&](glm::dvec3 const &Point) { return glm::dot(plan_of(Point - line.start), normal); }; + auto const a0{line.along(other.start)}, a1{line.along(other.end)}; auto const from{std::max(0.0, std::min(a0, a1))}; auto const to{std::min(line.length, std::max(a0, a1))}; if (to <= from) @@ -1585,11 +1564,8 @@ void editor_mode::draw_straights_overlay() const if (projection.project((foot + target) * 0.5, screen)) { auto const angle{glm::degrees(std::abs(std::asin(std::clamp(line.direction.x * other.direction.y - line.direction.y * other.direction.x, -1.0, 1.0))))}; - char label[48]; - if (angle > 0.001) - std::snprintf(label, sizeof(label), "%.3f m %.3f deg", std::abs(lateral), angle); - else - std::snprintf(label, sizeof(label), "%.3f m", std::abs(lateral)); + auto const text{angle > 0.001 ? format("%.3f m %.3f deg", std::abs(lateral), angle) : format("%.3f m", std::abs(lateral))}; + auto const *label{text.c_str()}; auto const size{ImGui::CalcTextSize(label)}; drawlist->AddRectFilled(ImVec2(screen.x - 3.0f, screen.y - 2.0f), ImVec2(screen.x + size.x + 3.0f, screen.y + size.y + 2.0f), IM_COL32(0, 0, 0, 170), 3.0f); drawlist->AddText(screen, IM_COL32(255, 230, 120, 255), label); @@ -1623,8 +1599,8 @@ void editor_mode::find_neighbour_straights() auto const offset{glm::dvec2{(other.start + other.end).x * 0.5 - line.start.x, (other.start + other.end).z * 0.5 - line.start.z}}; if (std::abs(glm::dot(offset, normal)) > 60.0) continue; - auto const a0{glm::dot(glm::dvec2{other.start.x - line.start.x, other.start.z - line.start.z}, line.direction)}; - auto const a1{glm::dot(glm::dvec2{other.end.x - line.start.x, other.end.z - line.start.z}, line.direction)}; + auto const a0{line.along(other.start)}; + auto const a1{line.along(other.end)}; if (std::max(a0, a1) <= 0.0 || std::min(a0, a1) >= line.length) continue; state.neighbours.push_back(std::move(other)); @@ -1643,7 +1619,7 @@ glm::dvec3 editor_mode::snap_straight_offset(editor_track::straight const &Line, { if (std::abs(Line.direction.x * other.direction.y - Line.direction.y * other.direction.x) > std::sin(glm::radians(0.5))) continue; - auto const distance{glm::dot(glm::dvec2{other.start.x - middle.x, other.start.z - middle.z}, normal)}; + auto const distance{glm::dot(plan_of(other.start - middle), normal)}; for (auto const spacing : m_straights.spacings) { auto const error{std::abs(distance) - spacing}; @@ -1694,11 +1670,6 @@ void editor_mode::render_straights_ui() state.listed = -1; state.current_for = nullptr; } - auto const describe = [](editor_track::straight const &Line) { - char text[160]; - std::snprintf(text, sizeof(text), "L %.2f m az %.4f deg i %.2f per mille %zu paths", Line.length, Line.azimuth, Line.grade * 1000.0, Line.tracks.size()); - return std::string{text}; - }; if (false == state.found.empty()) { ImGui::Text("%zu straights", state.found.size()); @@ -1730,11 +1701,6 @@ void editor_mode::render_straight_ui() { auto &state{m_straights}; auto const &line{current_straight()}; - auto const describe = [](editor_track::straight const &Line) { - char text[160]; - std::snprintf(text, sizeof(text), "L %.2f m az %.4f deg i %.2f per mille %zu paths", Line.length, Line.azimuth, Line.grade * 1000.0, Line.tracks.size()); - return std::string{text}; - }; if (line.tracks.empty()) { ImGui::TextDisabled(selected_track() != nullptr ? "The selected path isn't straight" : "No path selected"); @@ -2011,7 +1977,7 @@ void editor_mode::render_straight_gizmo() glm::dvec2 const offset{Point.x - pivot.x, Point.z - pivot.z}; auto const along{glm::dot(offset, axis)}; auto const across{axis.x * offset.y - axis.y * offset.x}; - auto const planar{glm::dvec2{pivot.x, pivot.z} + newaxis * (along * scale) + glm::dvec2{-newaxis.y, newaxis.x} * across}; + auto const planar{plan_of(pivot) + newaxis * (along * scale) + glm::dvec2{-newaxis.y, newaxis.x} * across}; return glm::dvec3{planar.x, Point.y + rise * along / std::max(1e-9, lengthbefore), planar.y}; }; } @@ -2065,7 +2031,7 @@ void editor_mode::straight_reshape(editor_track::straight const &Line, double co }; auto line{Line}; auto const point = [&](double const Along) { - auto const planar{glm::dvec2{line.start.x, line.start.z} + line.direction * Along}; + auto const planar{plan_of(line.start) + line.direction * Along}; return glm::dvec3{planar.x, line.start.y + line.grade * Along, planar.y}; }; std::vector spans; @@ -2074,9 +2040,8 @@ void editor_mode::straight_reshape(editor_track::straight const &Line, double co for (std::size_t i = 0; i < line.tracks.size(); ++i) { auto const &path{line.tracks[i]->m_paths[line.paths[i]]}; - auto const along = [&](glm::dvec3 const &Point) { return glm::dot(glm::dvec2{Point.x - line.start.x, Point.z - line.start.z}, line.direction); }; - auto const a{along(path.points[segment_data::point::start])}; - auto const b{along(path.points[segment_data::point::end])}; + auto const a{line.along(path.points[segment_data::point::start])}; + auto const b{line.along(path.points[segment_data::point::end])}; spans.push_back({line.tracks[i], line.paths[i], std::min(a, b), std::max(a, b), a < b}); } std::sort(spans.begin(), spans.end(), [](span const &A, span const &B) { return A.from < B.from; }); @@ -2278,7 +2243,7 @@ bool editor_mode::place_straight_tool() if (line.tracks.empty()) return false; glm::dvec3 const ground{Global.pCamera.Pos + GfxRenderer->Mouse_Position()}; - auto const along{std::clamp(glm::dot(glm::dvec2{ground.x - line.start.x, ground.z - line.start.z}, line.direction), 0.0, line.length)}; + auto const along{std::clamp(line.along(ground), 0.0, line.length)}; glm::dvec3 const axis{line.direction.x, line.grade, line.direction.y}; state.tool_line = line; state.tool_at = along; @@ -2322,7 +2287,7 @@ void editor_mode::apply_straight_tool() { auto &state{m_straights}; auto const line{state.tool_line}; - auto const offset{glm::dvec2{state.tool_handle.x - state.tool_point.x, state.tool_handle.z - state.tool_point.z}}; + auto const offset{plan_of(state.tool_handle - state.tool_point)}; auto const radius{straight_tool_radius(line)}; if (state.tool == 1) { @@ -2531,7 +2496,7 @@ std::vector editor_mode::extend_pieces() const design.start = tool.point; design.end = target.position; design.start_direction = tool.direction; - design.end_direction = glm::normalize(glm::dvec2{target.direction.x, target.direction.z}); + design.end_direction = glm::normalize(plan_of(target.direction)); auto const speed{editor_track::velocity(*tool.track)}; design.speed = speed > 0.0 ? speed : 100.0; if (false == alignment::collinear(design)) @@ -2547,7 +2512,7 @@ std::vector editor_mode::extend_pieces() const } else { - vertex.offset = glm::distance(glm::dvec2{design.start.x, design.start.z}, glm::dvec2{design.end.x, design.end.z}) / 3.0; + vertex.offset = plan_distance(design.start, design.end) / 3.0; design.vertices = {vertex, vertex}; } } @@ -2576,24 +2541,19 @@ std::vector editor_mode::extend_pieces() const auto const angle{2.0 * std::atan2(std::abs(lateral), along)}; auto const radius{chord / (2.0 * std::sin(angle * 0.5))}; double const side{lateral > 0.0 ? 1.0 : -1.0}; - glm::dvec2 const centre{glm::dvec2{tool.point.x, tool.point.z} + glm::dvec2{-direction.y, direction.x} * (side * radius)}; + glm::dvec2 const centre{plan_of(tool.point) + glm::dvec2{-direction.y, direction.x} * (side * radius)}; auto const count{std::max(1, static_cast(std::ceil(angle / glm::radians(90.0) - 1e-9)))}; auto const step{angle / count}; auto const handle{4.0 / 3.0 * std::tan(step / 4.0) * radius}; - auto const turn = [&](glm::dvec2 const &Vector, double const Angle) { - auto const c{std::cos(Angle)}; - auto const s{std::sin(Angle)}; - return glm::dvec2{Vector.x * c - Vector.y * s, Vector.x * s + Vector.y * c}; - }; - glm::dvec2 const radial{glm::dvec2{tool.point.x, tool.point.z} - centre}; + glm::dvec2 const radial{plan_of(tool.point) - centre}; for (int i = 0; i < count; ++i) { auto const a0{side * step * i}; auto const a1{side * step * (i + 1)}; - auto const p0{centre + turn(radial, a0)}; - auto const p3{centre + turn(radial, a1)}; - auto const d0{turn(direction, a0)}; - auto const d3{turn(direction, a1)}; + auto const p0{centre + turned(radial, a0)}; + auto const p3{centre + turned(radial, a1)}; + auto const d0{turned(direction, a0)}; + auto const d3{turned(direction, a1)}; auto const y0{height(radius * step * i)}; auto const y3{height(radius * step * (i + 1))}; segment_data path; @@ -2704,7 +2664,7 @@ bool editor_mode::start_switch_placement() insert_double_slip(line, ground, tool.templates[tool.armed]); return true; } - tool.along = std::clamp(glm::dot(glm::dvec2{ground.x - line.start.x, ground.z - line.start.z}, line.direction), 0.0, line.length); + tool.along = std::clamp(line.along(ground), 0.0, line.length); tool.point = line.start + glm::dvec3{line.direction.x, line.grade, line.direction.y} * tool.along; tool.mouse = ground; tool.line = line; @@ -2758,13 +2718,12 @@ bool editor_mode::cut_straight(editor_track::straight const &Line, double const double from, to; bool forward; }; - auto const along = [&](glm::dvec3 const &Point) { return glm::dot(glm::dvec2{Point.x - Line.start.x, Point.z - Line.start.z}, Line.direction); }; std::vector spans; for (std::size_t i = 0; i < Line.tracks.size(); ++i) { auto const &path{Line.tracks[i]->m_paths[Line.paths[i]]}; - auto const a{along(path.points[segment_data::point::start])}; - auto const b{along(path.points[segment_data::point::end])}; + auto const a{Line.along(path.points[segment_data::point::start])}; + auto const b{Line.along(path.points[segment_data::point::end])}; spans.push_back({Line.tracks[i], Line.paths[i], std::min(a, b), std::max(a, b), a < b}); } std::sort(spans.begin(), spans.end(), [](span const &A, span const &B) { return A.from < B.from; }); @@ -2842,7 +2801,7 @@ bool editor_mode::place_switch_on_straight(editor_track::straight const &Line, e { auto const &path{Line.tracks[i]->m_paths[Line.paths[i]]}; for (auto const index : {segment_data::point::start, segment_data::point::end}) - joints.push_back(glm::dot(glm::dvec2{path.points[index].x - Line.start.x, path.points[index].z - Line.start.z}, Line.direction)); + joints.push_back(Line.along(path.points[index])); } auto const nearest = [&](double const Value) { double best{Value}; @@ -2881,10 +2840,10 @@ void editor_mode::draw_build_overlay() const screen_projection const projection; ImDrawList *drawlist = ImGui::GetBackgroundDrawList(); auto const drawpath = [&](segment_data const &Path, ImU32 const Color) { - auto previous{path_point(Path, 0.0)}; + auto previous{bezier{Path}.point(0.0)}; for (int i = 1; i <= 24; ++i) { - auto const next{path_point(Path, i / 24.0)}; + auto const next{bezier{Path}.point(i / 24.0)}; projection.line(drawlist, previous, next, Color, 3.0f); previous = next; } @@ -2986,14 +2945,13 @@ std::vector editor_mode::detour_outline() const auto points{state.detour}; if (points.size() < 4) points.push_back(state.detour_mouse); - auto const along = [&](glm::dvec3 const &Point) { return glm::dot(glm::dvec2{Point.x - line.start.x, Point.z - line.start.z}, line.direction); }; - auto const offset{points.size() >= 2 ? glm::dot(glm::dvec2{points[1].x - line.start.x, points[1].z - line.start.z}, normal) : 0.0}; + auto const offset{points.size() >= 2 ? glm::dot(plan_of(points[1] - line.start), normal) : 0.0}; auto const place = [&](double const Along, double const Lateral) { - auto const planar{glm::dvec2{line.start.x, line.start.z} + line.direction * Along + normal * Lateral}; + auto const planar{plan_of(line.start) + line.direction * Along + normal * Lateral}; return glm::dvec3{planar.x, line.start.y + line.grade * Along, planar.y}; }; for (std::size_t i = 0; i < points.size(); ++i) - result.push_back(place(along(points[i]), (i == 1 || i == 2) ? offset : 0.0)); + result.push_back(place(line.along(points[i]), (i == 1 || i == 2) ? offset : 0.0)); return result; } @@ -3022,9 +2980,8 @@ void editor_mode::apply_detour() if (line.tracks.empty()) return; glm::dvec2 const normal{-line.direction.y, line.direction.x}; - auto const along = [&](glm::dvec3 const &Point) { return glm::dot(glm::dvec2{Point.x - line.start.x, Point.z - line.start.z}, line.direction); }; - auto const offset{glm::dot(glm::dvec2{state.detour[1].x - line.start.x, state.detour[1].z - line.start.z}, normal)}; - std::array stations{along(state.detour[0]), along(state.detour[1]), along(state.detour[2]), along(state.detour[3])}; + auto const offset{glm::dot(plan_of(state.detour[1] - line.start), normal)}; + std::array stations{line.along(state.detour[0]), line.along(state.detour[1]), line.along(state.detour[2]), line.along(state.detour[3])}; if (stations[0] > stations[3]) { std::swap(stations[0], stations[3]); @@ -3056,8 +3013,8 @@ void editor_mode::apply_detour() for (std::size_t i = 0; i < line.tracks.size(); ++i) { auto const &path{line.tracks[i]->m_paths[line.paths[i]]}; - auto const a{along(path.points[segment_data::point::start])}; - auto const b{along(path.points[segment_data::point::end])}; + auto const a{line.along(path.points[segment_data::point::start])}; + auto const b{line.along(path.points[segment_data::point::end])}; spans.push_back({line.tracks[i], std::min(a, b), std::max(a, b)}); } std::sort(spans.begin(), spans.end(), [](span const &A, span const &B) { return A.from < B.from; }); @@ -3086,10 +3043,10 @@ void editor_mode::apply_detour() if (m_route.chain.tracks.empty()) return; auto &design{m_route.design}; - auto const startalong{along(design.start)}; - auto const endalong{along(design.end)}; + auto const startalong{line.along(design.start)}; + auto const endalong{line.along(design.end)}; auto const place = [&](double const Along, double const Lateral) { - auto const planar{glm::dvec2{line.start.x, line.start.z} + line.direction * Along + normal * Lateral}; + auto const planar{plan_of(line.start) + line.direction * Along + normal * Lateral}; return planar; }; alignment::vertex vertex; @@ -3151,8 +3108,7 @@ void editor_mode::update_curve_fit(glm::dvec3 const &Start, glm::dvec3 const &En auto &state{m_straights}; auto &design{m_route.design}; glm::dvec2 const point{Start.x, Start.z}; - glm::dvec2 const direction{glm::normalize(glm::dvec2{End.x - Start.x, End.z - Start.z})}; - auto const cross = [](glm::dvec2 const &A, glm::dvec2 const &B) { return A.x * B.y - A.y * B.x; }; + glm::dvec2 const direction{glm::normalize(plan_of(End - Start))}; glm::dvec2 const start{design.start.x, design.start.z}; glm::dvec2 const end{design.end.x, design.end.z}; auto const startdirection{glm::normalize(design.start_direction)}; @@ -3193,20 +3149,18 @@ bool editor_mode::plan_crossover(crossover_plan &Plan) const auto const &own{*tool.track}; auto const &main{own.m_paths[0]}; auto const &diverging{own.m_paths[1]}; - auto const plan = [](glm::dvec3 const &Point) { return glm::dvec2{Point.x, Point.z}; }; - auto const cross = [](glm::dvec2 const &A, glm::dvec2 const &B) { return A.x * B.y - A.y * B.x; }; auto const origin{main.points[segment_data::point::start]}; - auto const axis{glm::normalize(plan(main.points[segment_data::point::end] - origin))}; + auto const axis{glm::normalize(plan_of(main.points[segment_data::point::end] - origin))}; glm::dvec2 const perpendicular{-axis.y, axis.x}; auto const &frog{diverging.points[segment_data::point::end]}; - auto const lateral{glm::dot(plan(frog - origin), perpendicular)}; + auto const lateral{glm::dot(plan_of(frog - origin), perpendicular)}; if (std::abs(lateral) < 0.01) return false; auto const side{lateral > 0.0 ? 1.0 : -1.0}; auto const normal{perpendicular * side}; auto const offset{std::abs(lateral)}; auto const &control{diverging.points[segment_data::point::control2]}; - auto const tangent{glm::normalize(control != glm::dvec3{} ? -plan(control) : plan(frog - origin))}; + auto const tangent{glm::normalize(control != glm::dvec3{} ? -plan_of(control) : plan_of(frog - origin))}; auto const angle{std::atan2(std::abs(cross(axis, tangent)), glm::dot(axis, tangent))}; if (angle < 1e-4) return false; @@ -3224,11 +3178,11 @@ bool editor_mode::plan_crossover(crossover_plan &Plan) const if (track == &own || track->eType != tt_Normal || track->m_editorremoved || false == editor_track::is_straight(*track, m_straights.tolerance)) continue; auto const &path{track->m_paths.front()}; - auto const a{plan(path.points[segment_data::point::start])}; - auto const b{plan(path.points[segment_data::point::end])}; + auto const a{plan_of(path.points[segment_data::point::start])}; + auto const b{plan_of(path.points[segment_data::point::end])}; auto const segment{b - a}; - auto const t{std::clamp(glm::dot(plan(ground) - a, segment) / std::max(1e-9, glm::dot(segment, segment)), 0.0, 1.0)}; - auto const distance{glm::distance(plan(ground), a + segment * t)}; + auto const t{std::clamp(glm::dot(plan_of(ground) - a, segment) / std::max(1e-9, glm::dot(segment, segment)), 0.0, 1.0)}; + auto const distance{glm::distance(plan_of(ground), a + segment * t)}; if (distance < best) { best = distance; @@ -3243,16 +3197,16 @@ bool editor_mode::plan_crossover(crossover_plan &Plan) const auto const &line{Plan.target}; if (line.tracks.empty() || std::abs(cross(line.direction, axis)) > std::sin(glm::radians(1.0))) return false; - auto const distance{glm::dot(plan(line.start) - plan(origin), normal)}; + auto const distance{glm::dot(plan_of(line.start) - plan_of(origin), normal)}; auto const remaining{distance - 2.0 * offset}; if (remaining < 0.01) return false; auto const length{remaining / std::sin(angle)}; glm::dvec2 const crossing{axis * std::cos(angle) + normal * std::sin(angle)}; - auto const alongfrog{glm::dot(plan(frog - origin), axis)}; - auto const otherfrog{plan(frog) + crossing * length}; + auto const alongfrog{glm::dot(plan_of(frog - origin), axis)}; + auto const otherfrog{plan_of(frog) + crossing * length}; auto const otherorigin{otherfrog + axis * alongfrog + normal * offset}; - Plan.along = glm::dot(otherorigin - plan(line.start), line.direction); + Plan.along = glm::dot(otherorigin - plan_of(line.start), line.direction); if (Plan.along < 0.0 || Plan.along > line.length) return false; Plan.direction = glm::dot(-axis, line.direction) > 0.0 ? 1 : -1; @@ -3261,13 +3215,13 @@ bool editor_mode::plan_crossover(crossover_plan &Plan) const editor_track::switch_template shape; shape.source = tool.track; - shape.length = glm::dot(plan(main.points[segment_data::point::end] - origin), axis); + shape.length = glm::dot(plan_of(main.points[segment_data::point::end] - origin), axis); for (int i = 0; i < 2; ++i) { auto const &path{own.m_paths[i]}; auto &local{shape.local[i]}; local = path; - auto const tolocal = [&](glm::dvec3 const &Vector) { return glm::dvec3{glm::dot(plan(Vector), perpendicular) * side, Vector.y, glm::dot(plan(Vector), axis)}; }; + auto const tolocal = [&](glm::dvec3 const &Vector) { return glm::dvec3{glm::dot(plan_of(Vector), perpendicular) * side, Vector.y, glm::dot(plan_of(Vector), axis)}; }; local.points[segment_data::point::start] = tolocal(path.points[segment_data::point::start] - origin); local.points[segment_data::point::end] = tolocal(path.points[segment_data::point::end] - origin); local.points[segment_data::point::control1] = tolocal(path.points[segment_data::point::control1]); @@ -3286,8 +3240,6 @@ bool editor_mode::plan_crossover(crossover_plan &Plan) const std::vector editor_mode::build_double_slip(glm::dvec3 const &PointA, glm::dvec3 const &PointB, glm::dvec3 const &PointC, glm::dvec3 const &PointD, glm::dvec2 const &Crossing, double const Height, glm::dvec2 const &First, glm::dvec2 const &Second, double const Angle, double const Radius, TTrack &Style) { - auto const plan = [](glm::dvec3 const &Vector) { return glm::dvec2{Vector.x, Vector.z}; }; - auto const cross = [](glm::dvec2 const &A, glm::dvec2 const &B) { return A.x * B.y - A.y * B.x; }; auto const at = [](glm::dvec2 const &Planar, double const Y) { return glm::dvec3{Planar.x, Y, Planar.y}; }; auto const straight = [](glm::dvec3 const &Start, glm::dvec3 const &End) { segment_data path; @@ -3297,18 +3249,13 @@ std::vector editor_mode::build_double_slip(glm::dvec3 const &PointA, g }; double const gap{0.25}; auto const side{cross(First, Second) > 0.0 ? 1.0 : -1.0}; - auto const turn = [](glm::dvec2 const &Vector, double const Rotation) { - auto const c{std::cos(Rotation)}; - auto const s{std::sin(Rotation)}; - return glm::dvec2{Vector.x * c - Vector.y * s, Vector.x * s + Vector.y * c}; - }; auto const arc = [&](glm::dvec3 const &Start, glm::dvec2 const &Heading, double const Turn, glm::dvec3 const &Finish, double const From, double const To) { - glm::dvec2 const centre{plan(Start) + glm::dvec2{-Heading.y, Heading.x} * (Turn * Radius)}; - auto const radial{plan(Start) - centre}; - auto const p0{centre + turn(radial, Turn * From)}; - auto const p3{centre + turn(radial, Turn * To)}; - auto const d0{turn(Heading, Turn * From)}; - auto const d3{turn(Heading, Turn * To)}; + glm::dvec2 const centre{plan_of(Start) + glm::dvec2{-Heading.y, Heading.x} * (Turn * Radius)}; + auto const radial{plan_of(Start) - centre}; + auto const p0{centre + turned(radial, Turn * From)}; + auto const p3{centre + turned(radial, Turn * To)}; + auto const d0{turned(Heading, Turn * From)}; + auto const d3{turned(Heading, Turn * To)}; auto const handle{4.0 / 3.0 * std::tan((To - From) / 4.0) * Radius}; auto const y0{Start.y + (Finish.y - Start.y) * From / Angle}; auto const y3{Start.y + (Finish.y - Start.y) * To / Angle}; @@ -3339,7 +3286,7 @@ std::vector editor_mode::build_double_slip(glm::dvec3 const &PointA, g for (int i = 1; base.empty() || simulation::Paths.find(base + "_a") != nullptr; ++i) base = "editor_dks" + std::to_string(i); editor_track::switch_template shape; - shape.length = glm::distance(plan(PointA), Crossing); + shape.length = glm::distance(plan_of(PointA), Crossing); std::vector parts; parts.push_back(editor_track::create_switch(shape, {straight(PointA, centreA), arc(PointA, First, side, PointD, 0.0, middle - split)}, Style, base + "_a")); parts.push_back(editor_track::create_switch(shape, {straight(PointB, centreB), reversed(arc(PointC, Second, -side, PointB, middle + split, Angle))}, Style, base + "_b")); @@ -3357,14 +3304,12 @@ bool editor_mode::insert_double_slip(editor_track::straight const &Line, glm::dv { auto &state{m_straights}; state.status.clear(); - auto const plan = [](glm::dvec3 const &Vector) { return glm::dvec2{Vector.x, Vector.z}; }; - auto const cross = [](glm::dvec2 const &A, glm::dvec2 const &B) { return A.x * B.y - A.y * B.x; }; { auto const sections{simulation::Region->sections(Point, 40.f)}; for (auto *section : sections) for (auto const &cell : section->m_cells) for (auto *track : cell.m_paths) - if (track->eType == tt_Switch && false == track->m_editorremoved && track->DoubleSlip() && glm::distance(plan(track->location()), plan(Point)) < 25.0) + if (track->eType == tt_Switch && false == track->m_editorremoved && track->DoubleSlip() && glm::distance(plan_of(track->location()), plan_of(Point)) < 25.0) return replace_double_slip(*track, Shape); } TTrack *other{nullptr}; @@ -3380,19 +3325,19 @@ bool editor_mode::insert_double_slip(editor_track::straight const &Line, glm::dv if (std::find(Line.tracks.begin(), Line.tracks.end(), track) != Line.tracks.end() || track->eType != tt_Normal || track->m_editorremoved || false == editor_track::is_straight(*track, m_straights.tolerance)) continue; auto const &path{track->m_paths.front()}; - auto const a{plan(path.points[segment_data::point::start])}; - auto const b{plan(path.points[segment_data::point::end])}; + auto const a{plan_of(path.points[segment_data::point::start])}; + auto const b{plan_of(path.points[segment_data::point::end])}; auto const segment{b - a}; auto const determinant{cross(Line.direction, segment)}; if (std::abs(determinant) < 1e-9) continue; - auto const offset{a - plan(Line.start)}; + auto const offset{a - plan_of(Line.start)}; auto const along{cross(offset, segment) / determinant}; auto const fraction{cross(offset, Line.direction) / determinant}; if (fraction < -0.01 || fraction > 1.01 || along < 0.0 || along > Line.length) continue; - auto const position{plan(Line.start) + Line.direction * along}; - auto const distance{glm::distance(position, plan(Point))}; + auto const position{plan_of(Line.start) + Line.direction * along}; + auto const distance{glm::distance(position, plan_of(Point))}; if (distance < best) { best = distance; @@ -3420,8 +3365,8 @@ bool editor_mode::insert_double_slip(editor_track::straight const &Line, glm::dv state.status = "The straights cross at an angle unsuitable for a double slip"; return false; } - auto const alongfirst{glm::dot(crossing - plan(Line.start), Line.direction)}; - auto const alongsecond{glm::dot(crossing - plan(second.start), second.direction)}; + auto const alongfirst{glm::dot(crossing - plan_of(Line.start), Line.direction)}; + auto const alongsecond{glm::dot(crossing - plan_of(second.start), second.direction)}; auto const available{std::min({alongfirst, Line.length - alongfirst, alongsecond, second.length - alongsecond}) - 0.5}; auto radius{Shape.radius}; auto half{radius * std::tan(angle * 0.5)}; @@ -3453,7 +3398,7 @@ bool editor_mode::insert_double_slip(editor_track::straight const &Line, glm::dv if (false == cut_straight(Line, alongfirst - half, alongfirst + half, states, created, removed, &style)) return false; auto const secondline{editor_track::find_straight(*other, m_straights.tolerance)}; - auto const secondalong{glm::dot(crossing - plan(secondline.start), secondline.direction)}; + auto const secondalong{glm::dot(crossing - plan_of(secondline.start), secondline.direction)}; if (secondline.tracks.empty() || false == cut_straight(secondline, secondalong - half, secondalong + half, states, created, removed, nullptr)) { for (auto *track : created) @@ -3482,8 +3427,6 @@ bool editor_mode::insert_double_slip(editor_track::straight const &Line, glm::dv bool editor_mode::replace_double_slip(TTrack &Part, editor_track::switch_template const &Shape) { auto &state{m_straights}; - auto const plan = [](glm::dvec3 const &Vector) { return glm::dvec2{Vector.x, Vector.z}; }; - auto const cross = [](glm::dvec2 const &A, glm::dvec2 const &B) { return A.x * B.y - A.y * B.x; }; auto const base{Part.name().substr(0, Part.name().size() - 2)}; std::array switches{}; for (int i = 0; i < 4; ++i) @@ -3513,7 +3456,7 @@ bool editor_mode::replace_double_slip(TTrack &Part, editor_track::switch_templat if (straight == nullptr) straight = &track->m_paths.front(); auto const start{straight->points[segment_data::point::start]}; - ends.push_back({track, start, glm::normalize(plan(straight->points[segment_data::point::end] - start)), track->SwitchExtension->pPrevs[0]}); + ends.push_back({track, start, glm::normalize(plan_of(straight->points[segment_data::point::end] - start)), track->SwitchExtension->pPrevs[0]}); for (int i = 0; i < 2; ++i) { auto *inner{track->SwitchExtension->pNexts[i]}; @@ -3545,10 +3488,10 @@ bool editor_mode::replace_double_slip(TTrack &Part, editor_track::switch_templat auto const determinant{cross(first, direction)}; if (std::abs(determinant) < 1e-9) return false; - auto const t{cross(plan(c.point) - plan(a.point), direction) / determinant}; - glm::dvec2 const crossing{plan(a.point) + first * t}; + auto const t{cross(plan_of(c.point) - plan_of(a.point), direction) / determinant}; + glm::dvec2 const crossing{plan_of(a.point) + first * t}; auto const angle{std::atan2(std::abs(cross(first, direction)), glm::dot(first, direction))}; - auto const oldhalf{glm::distance(plan(a.point), crossing)}; + auto const oldhalf{glm::distance(plan_of(a.point), crossing)}; auto radius{Shape.radius}; auto half{radius * std::tan(angle * 0.5)}; auto const height{(a.point.y + b.point.y) * 0.5}; @@ -3568,8 +3511,8 @@ bool editor_mode::replace_double_slip(TTrack &Part, editor_track::switch_templat break; } auto const line{editor_track::find_straight(*e->outer, m_straights.tolerance)}; - auto const reach{std::abs(glm::dot(plan(line.end) - crossing, -e->inward))}; - auto const reachstart{std::abs(glm::dot(plan(line.start) - crossing, -e->inward))}; + auto const reach{std::abs(glm::dot(plan_of(line.end) - crossing, -e->inward))}; + auto const reachstart{std::abs(glm::dot(plan_of(line.start) - crossing, -e->inward))}; if (std::max(reach, reachstart) - 0.5 < half) { half = std::min(half, std::max(reach, reachstart) - 0.5); @@ -3603,8 +3546,8 @@ bool editor_mode::replace_double_slip(TTrack &Part, editor_track::switch_templat else if (half > oldhalf + 0.01 && e.outer != nullptr) { auto const line{editor_track::find_straight(*e.outer, m_straights.tolerance)}; - auto const alongold{glm::dot(plan(e.point) - plan(line.start), line.direction)}; - auto const alongnew{glm::dot(target - plan(line.start), line.direction)}; + auto const alongold{glm::dot(plan_of(e.point) - plan_of(line.start), line.direction)}; + auto const alongnew{glm::dot(target - plan_of(line.start), line.direction)}; cut_straight(line, std::min(alongold, alongnew), std::max(alongold, alongnew), states, created, removed, nullptr); } } @@ -3629,36 +3572,20 @@ std::vector editor_mode::sample_chain(editor_track::c { auto const &path{Chain.tracks[i]->m_paths.front()}; auto const forward{Chain.forward[i]}; - auto const p0{path.points[segment_data::point::start]}; - auto const p3{path.points[segment_data::point::end]}; - auto const p1{p0 + path.points[segment_data::point::control1]}; - auto const p2{p3 + path.points[segment_data::point::control2]}; - bool const straight{path.points[segment_data::point::control1] == glm::dvec3{} && path.points[segment_data::point::control2] == glm::dvec3{}}; - auto const length{glm::distance(p0, p3)}; + bezier const curve{path}; + auto const length{glm::distance(curve.p0, curve.p3)}; int const steps{std::max(8, static_cast(std::ceil(length / 0.5)))}; for (int k = (result.empty() ? 0 : 1); k <= steps; ++k) { auto const t{forward ? static_cast(k) / steps : 1.0 - static_cast(k) / steps}; - auto const u{1.0 - t}; - glm::dvec3 position, derivative; - if (straight) - { - position = glm::mix(p0, p3, t); - derivative = p3 - p0; - } - else - { - position = u * u * u * p0 + 3.0 * u * u * t * p1 + 3.0 * u * t * t * p2 + t * t * t * p3; - derivative = 3.0 * u * u * (p1 - p0) + 6.0 * u * t * (p2 - p1) + 3.0 * t * t * (p3 - p2); - } - if (false == forward) - derivative = -derivative; + auto const position{curve.point(t)}; + auto const derivative{forward ? curve.first(t) : -curve.first(t)}; if (false == result.empty()) - station += glm::length(glm::dvec2{position.x - result.back().position.x, position.z - result.back().position.z}); + station += plan_distance(position, result.back().position); curve_sample sample; sample.station = station; sample.position = position; - sample.tangent = glm::normalize(glm::dvec2{derivative.x, derivative.z}); + sample.tangent = glm::normalize(plan_of(derivative)); auto const roll{path.rolls[0] + (path.rolls[1] - path.rolls[0]) * t}; sample.roll = static_cast(forward ? roll : -roll); sample.radius = path.radius; @@ -3698,8 +3625,8 @@ double editor_mode::nearest_station(std::vector const &Frame, glm: glm::dvec2 const a{Frame[i].position.x, Frame[i].position.z}; glm::dvec2 const b{Frame[i + 1].position.x, Frame[i + 1].position.z}; auto const segment{b - a}; - auto const t{std::clamp(glm::dot(glm::dvec2{Point.x, Point.z} - a, segment) / std::max(1e-12, glm::dot(segment, segment)), 0.0, 1.0)}; - auto const distance{glm::distance(glm::dvec2{Point.x, Point.z}, a + segment * t)}; + auto const t{std::clamp(glm::dot(plan_of(Point) - a, segment) / std::max(1e-12, glm::dot(segment, segment)), 0.0, 1.0)}; + auto const distance{glm::distance(plan_of(Point), a + segment * t)}; if (distance < best) { best = distance; @@ -3716,13 +3643,13 @@ std::vector editor_mode::curved_switch_paths(editor_track::switch_ auto const along{sample.tangent * static_cast(Direction)}; glm::dvec2 const across{glm::dvec2{-along.y, along.x} * static_cast(Side)}; Tangent = glm::normalize(along * Localtangent.y + across * Localtangent.x); - auto const planar{glm::dvec2{sample.position.x, sample.position.z} + across * Local.x}; + auto const planar{plan_of(sample.position) + across * Local.x}; auto const cant{glm::radians(static_cast(sample.roll) * Direction)}; auto const cone{-Local.x * Side * std::tan(cant)}; return glm::dvec3{planar.x, sample.position.y + Local.y + cone, planar.y}; }; auto const hermite = [](glm::dvec3 const &Start, glm::dvec2 const &Startdirection, glm::dvec3 const &End, glm::dvec2 const &Enddirection) { - auto const handle{glm::distance(glm::dvec2{Start.x, Start.z}, glm::dvec2{End.x, End.z}) / 3.0}; + auto const handle{plan_distance(Start, End) / 3.0}; segment_data path; path.points[segment_data::point::start] = Start; path.points[segment_data::point::end] = End; @@ -3738,8 +3665,8 @@ std::vector editor_mode::curved_switch_paths(editor_track::switch_ auto const &control1{local.points[segment_data::point::control1]}; auto const &control2{local.points[segment_data::point::control2]}; glm::dvec2 const chord{end.x - start.x, end.z - start.z}; - auto const localstart{glm::normalize(control1 != glm::dvec3{} ? glm::dvec2{control1.x, control1.z} : chord)}; - auto const localend{glm::normalize(control2 != glm::dvec3{} ? -glm::dvec2{control2.x, control2.z} : chord)}; + auto const localstart{glm::normalize(control1 != glm::dvec3{} ? plan_of(control1) : chord)}; + auto const localend{glm::normalize(control2 != glm::dvec3{} ? -plan_of(control2) : chord)}; glm::dvec2 startdirection, enddirection; auto const p0{map(start, startdirection, localstart)}; auto const p3{map(end, enddirection, localend)}; @@ -3769,15 +3696,6 @@ void editor_mode::insert_curved_switch(int const Direction, int const Side) std::vector created; std::vector removed; std::vector candidates{tool.frame_tracks}; - auto const bezier = [](TTrack const &Track, double const T) { - auto const &path{Track.m_paths.front()}; - auto const p0{path.points[segment_data::point::start]}; - auto const p3{path.points[segment_data::point::end]}; - auto const p1{p0 + path.points[segment_data::point::control1]}; - auto const p2{p3 + path.points[segment_data::point::control2]}; - auto const u{1.0 - T}; - return u * u * u * p0 + 3.0 * u * u * T * p1 + 3.0 * u * T * T * p2 + T * T * T * p3; - }; for (auto const cut : {from, to}) { auto const point{sample_at(tool.frame, cut).position}; @@ -3786,8 +3704,8 @@ void editor_mode::insert_curved_switch(int const Direction, int const Side) if (candidate->m_editorremoved || candidate->eType != tt_Normal) continue; auto const t{editor_track::nearest_parameter(*candidate, point)}; - auto const found{bezier(*candidate, t)}; - if (glm::distance(glm::dvec2{found.x, found.z}, glm::dvec2{point.x, point.z}) > 0.05) + auto const found{editor_track::point_at(*candidate, t)}; + if (plan_distance(found, point) > 0.05) continue; if (t > 0.002 && t < 0.998) { @@ -3806,7 +3724,7 @@ void editor_mode::insert_curved_switch(int const Direction, int const Side) { if (candidate->m_editorremoved) continue; - auto const middle{bezier(*candidate, 0.5)}; + auto const middle{editor_track::point_at(*candidate, 0.5)}; auto const where{nearest_station(tool.frame, middle)}; if (where > from + 0.01 && where < to - 0.01) { diff --git a/editor/editorAlignment.cpp b/editor/editorAlignment.cpp index c2940c2e1..bdd06cf34 100644 --- a/editor/editorAlignment.cpp +++ b/editor/editorAlignment.cpp @@ -9,11 +9,12 @@ http: #include "stdafx.h" #include "editor/editorAlignment.hpp" +#include "editor/editorFormat.hpp" +#include "editor/editorGeometry.hpp" #include #include #include -#include #include #include @@ -26,43 +27,20 @@ namespace double const kGravity{9.81}; double const kPi{3.14159265358979323846}; -double cross(glm::dvec2 const &A, glm::dvec2 const &B) -{ - return A.x * B.y - A.y * B.x; -} +using geometry::cross; +using geometry::plan_of; +using geometry::turned; glm::dvec2 perpendicular(glm::dvec2 const &Vector) { return {-Vector.y, Vector.x}; } -glm::dvec2 rotate(glm::dvec2 const &Vector, double const Angle) -{ - auto const c{std::cos(Angle)}; - auto const s{std::sin(Angle)}; - return {Vector.x * c - Vector.y * s, Vector.x * s + Vector.y * c}; -} - -glm::dvec2 plan(glm::dvec3 const &Point) -{ - return {Point.x, Point.z}; -} - double ceil_to(double const Value, double const Step) { return std::ceil(Value / Step - 1e-9) * Step; } -std::string format(char const *Format, ...) -{ - char buffer[512]; - va_list arguments; - va_start(arguments, Format); - std::vsnprintf(buffer, sizeof(buffer), Format, arguments); - va_end(arguments); - return buffer; -} - struct local_point { double x{0.0}; @@ -157,8 +135,8 @@ void element_point(element const &Element, transition_shape const Shape, double case element_kind::arc: { auto const angle{Element.turn * Distance / Element.radius}; - Position = Element.origin + rotate(Element.normal, angle); - Direction = rotate(Element.direction, angle); + Position = Element.origin + turned(Element.normal, angle); + Direction = turned(Element.direction, angle); break; } case element_kind::transition_in: @@ -290,8 +268,8 @@ result fit_between(design const &Design) auto const startreserve{std::max(0.0, Design.start_reserve)}; auto const endreserve{std::max(0.0, Design.end_reserve)}; - auto const start{plan(Design.start)}; - auto const end{plan(Design.end)}; + auto const start{plan_of(Design.start)}; + auto const end{plan_of(Design.end)}; auto const startdirection{glm::normalize(Design.start_direction)}; auto const enddirection{glm::normalize(Design.end_direction)}; auto const count{Design.vertices.size()}; @@ -578,7 +556,7 @@ result fit_between(design const &Design) push(piece); auto const local{spiral_point(segment[0], segment[1], segment[2], segment[2])}; origin += heading * local.x + piece.normal * local.y; - heading = rotate(heading, side * local.angle); + heading = turned(heading, side * local.angle); } vertexchainage[k] = (startchainage + chainage) * 0.5; cursor = origin; @@ -655,7 +633,7 @@ result fit_between(design const &Design) curve.length = radius * std::max(0.0, arcangle); curve.origin = centre; curve.normal = arcstart - centre; - curve.direction = rotate(directionin, side * endin.angle); + curve.direction = turned(directionin, side * endin.angle); vertexchainage[k] = chainage + curve.length * 0.5; if (curve.length > 1e-6) push(curve); @@ -796,8 +774,8 @@ result compute(design const &Design) bool tangent_intersection(design const &Design, glm::dvec2 &Point) { - auto const start{plan(Design.start)}; - auto const offset{plan(Design.end) - start}; + auto const start{plan_of(Design.start)}; + auto const offset{plan_of(Design.end) - start}; auto const startdirection{glm::normalize(Design.start_direction)}; auto const enddirection{glm::normalize(Design.end_direction)}; auto const determinant{cross(startdirection, enddirection)}; @@ -813,7 +791,7 @@ bool tangent_intersection(design const &Design, glm::dvec2 &Point) bool collinear(design const &Design) { - auto const offset{plan(Design.end) - plan(Design.start)}; + auto const offset{plan_of(Design.end) - plan_of(Design.start)}; auto const startdirection{glm::normalize(Design.start_direction)}; auto const enddirection{glm::normalize(Design.end_direction)}; return std::abs(cross(startdirection, offset)) <= 0.01 && glm::dot(startdirection, enddirection) >= std::cos(1e-4) && glm::dot(startdirection, offset) > 0.0; diff --git a/editor/editorFormat.hpp b/editor/editorFormat.hpp new file mode 100644 index 000000000..e22a9745e --- /dev/null +++ b/editor/editorFormat.hpp @@ -0,0 +1,26 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include + +// printf-style formatting into a string, for the messages and the data lines of the editor +template +std::string format(char const *Format, Args... Arguments) +{ + auto const length{std::snprintf(nullptr, 0, Format, Arguments...)}; + if (length <= 0) + return {}; + std::string text(static_cast(length) + 1, '\0'); + std::snprintf(text.data(), text.size(), Format, Arguments...); + text.resize(static_cast(length)); + return text; +} diff --git a/editor/editorGeometry.hpp b/editor/editorGeometry.hpp new file mode 100644 index 000000000..5b1db3e15 --- /dev/null +++ b/editor/editorGeometry.hpp @@ -0,0 +1,131 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include +#include + +#include "world/Segment.h" + +// plan (x, z) geometry and cubic Bezier curves of the paths, shared by the track tools +namespace geometry +{ + +// points of the paths closer than this are taken for the same point +double constexpr same_point{0.05}; + +inline glm::dvec2 plan_of(glm::dvec3 const &Point) +{ + return {Point.x, Point.z}; +} + +inline double plan_distance(glm::dvec3 const &A, glm::dvec3 const &B) +{ + return std::hypot(A.x - B.x, A.z - B.z); +} + +// z component of the 3d cross product; for a unit Direction it's the offset of the Point to its left +inline double cross(glm::dvec2 const &Direction, glm::dvec2 const &Point) +{ + return Direction.x * Point.y - Direction.y * Point.x; +} + +inline glm::dvec2 turned(glm::dvec2 const &Vector, double const Angle) +{ + auto const c{std::cos(Angle)}; + auto const s{std::sin(Angle)}; + return {Vector.x * c - Vector.y * s, Vector.x * s + Vector.y * c}; +} + +inline double signed_angle(glm::dvec2 const &From, glm::dvec2 const &To) +{ + return std::atan2(cross(From, To), glm::dot(From, To)); +} + +// slope of the direction, rise over the run in the plan +inline double grade_of(glm::dvec3 const &Direction) +{ + return Direction.y / std::max(1e-9, std::hypot(Direction.x, Direction.z)); +} + +// path as a cubic Bezier curve; a path without control points is a straight with evenly spread parameter +struct bezier +{ + glm::dvec3 p0, p1, p2, p3; + + explicit bezier(segment_data const &Path) + { + p0 = Path.points[segment_data::point::start]; + p3 = Path.points[segment_data::point::end]; + auto const &control1{Path.points[segment_data::point::control1]}; + auto const &control2{Path.points[segment_data::point::control2]}; + if (control1 == glm::dvec3{} && control2 == glm::dvec3{}) + { + p1 = glm::mix(p0, p3, 1.0 / 3.0); + p2 = glm::mix(p0, p3, 2.0 / 3.0); + } + else + { + p1 = p0 + control1; + p2 = p3 + control2; + } + } + glm::dvec3 point(double const T) const + { + auto const u{1.0 - T}; + return u * u * u * p0 + 3.0 * u * u * T * p1 + 3.0 * u * T * T * p2 + T * T * T * p3; + } + glm::dvec3 first(double const T) const + { + auto const u{1.0 - T}; + return 3.0 * u * u * (p1 - p0) + 6.0 * u * T * (p2 - p1) + 3.0 * T * T * (p3 - p2); + } + glm::dvec3 second(double const T) const + { + return 6.0 * (1.0 - T) * (p2 - 2.0 * p1 + p0) + 6.0 * T * (p3 - 2.0 * p2 + p1); + } + double plan_length(int const Steps = 32) const + { + double length{0.0}; + auto previous{plan_of(p0)}; + for (int i = 1; i <= Steps; ++i) + { + auto const next{plan_of(point(static_cast(i) / Steps))}; + length += glm::distance(previous, next); + previous = next; + } + return length; + } + // parameter at specified plan distance from the start + double parameter(double const Distance, int const Steps = 256) const + { + double length{0.0}; + auto previous{plan_of(p0)}; + for (int i = 1; i <= Steps; ++i) + { + auto const next{plan_of(point(static_cast(i) / Steps))}; + auto const step{glm::distance(previous, next)}; + if (length + step >= Distance) + return (i - 1 + (step > 1e-12 ? (Distance - length) / step : 0.0)) / Steps; + length += step; + previous = next; + } + return 1.0; + } +}; + +// distance between the ends of the path, in the plan +inline double chord_length(segment_data const &Path) +{ + return glm::length(plan_of(Path.points[segment_data::point::end] - Path.points[segment_data::point::start])); +} + +} // namespace geometry diff --git a/editor/editorInfra.cpp b/editor/editorInfra.cpp index 974b5689a..a2fbc9bac 100644 --- a/editor/editorInfra.cpp +++ b/editor/editorInfra.cpp @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "editor/editorInfra.hpp" +#include "editor/editorGeometry.hpp" #include "world/Track.h" #include @@ -23,50 +24,21 @@ namespace infra namespace { +using geometry::bezier; +using geometry::plan_distance; +using geometry::plan_of; + int const kSteps{128}; -struct curve -{ - glm::dvec3 p0, p1, p2, p3; -}; - -curve curve_of(segment_data const &Path) -{ - auto const &start{Path.points[segment_data::point::start]}; - auto const &end{Path.points[segment_data::point::end]}; - auto const &control1{Path.points[segment_data::point::control1]}; - auto const &control2{Path.points[segment_data::point::control2]}; - if (control1 == glm::dvec3{} && control2 == glm::dvec3{}) - return {start, start + (end - start) / 3.0, end + (start - end) / 3.0, end}; - return {start, start + control1, end + control2, end}; -} - -glm::dvec3 point(curve const &Curve, double const T) -{ - auto const u{1.0 - T}; - return Curve.p0 * (u * u * u) + Curve.p1 * (3.0 * u * u * T) + Curve.p2 * (3.0 * u * T * T) + Curve.p3 * (T * T * T); -} - -glm::dvec3 derivative(curve const &Curve, double const T) -{ - auto const u{1.0 - T}; - return (Curve.p1 - Curve.p0) * (3.0 * u * u) + (Curve.p2 - Curve.p1) * (6.0 * u * T) + (Curve.p3 - Curve.p2) * (3.0 * T * T); -} - -double plan(glm::dvec3 const &A, glm::dvec3 const &B) -{ - return std::hypot(A.x - B.x, A.z - B.z); -} - // arc length in the plan at the evenly spread parameters -std::array lengths(curve const &Curve) +std::array lengths(bezier const &Curve) { std::array result{}; auto previous{Curve.p0}; for (int i = 1; i <= kSteps; ++i) { - auto const next{point(Curve, static_cast(i) / kSteps)}; - result[i] = result[i - 1] + plan(previous, next); + auto const next{Curve.point(static_cast(i) / kSteps)}; + result[i] = result[i - 1] + plan_distance(previous, next); previous = next; } return result; @@ -92,9 +64,9 @@ double length_at(std::array const &Lengths, double const T) return Lengths[index] + (Lengths[index + 1] - Lengths[index]) * (position - index); } -glm::dvec2 plan_direction(curve const &Curve, double const T) +glm::dvec2 plan_direction(bezier const &Curve, double const T) { - auto tangent{derivative(Curve, T)}; + auto tangent{Curve.first(T)}; glm::dvec2 result{tangent.x, tangent.z}; if (glm::length(result) < 1e-9) result = {Curve.p3.x - Curve.p0.x, Curve.p3.z - Curve.p0.z}; @@ -144,27 +116,27 @@ std::vector const &categories() double plan_length(segment_data const &Path) { - return lengths(curve_of(Path)).back(); + return lengths(bezier{Path}).back(); } std::vector outline(segment_data const &Path, double const Step) { - auto const shape{curve_of(Path)}; + bezier const shape{Path}; // the speed along the curve doesn't exceed three times the longest leg of the control polygon - auto const leg{std::max({plan(shape.p0, shape.p1), plan(shape.p1, shape.p2), plan(shape.p2, shape.p3)})}; + auto const leg{std::max({plan_distance(shape.p0, shape.p1), plan_distance(shape.p1, shape.p2), plan_distance(shape.p2, shape.p3)})}; auto const count{std::clamp(static_cast(std::ceil(3.0 * leg / std::max(Step, 0.1))), 1, 4096)}; std::vector result; result.reserve(count + 1); for (int i = 0; i <= count; ++i) - result.push_back(point(shape, static_cast(i) / count)); + result.push_back(shape.point(static_cast(i) / count)); return result; } frame frame_at(segment_data const &Path, double const S) { - auto const shape{curve_of(Path)}; + bezier const shape{Path}; auto const t{parameter(lengths(shape), S)}; - return {point(shape, t), plan_direction(shape, t)}; + return {shape.point(t), plan_direction(shape, t)}; } frame frame_at(station const &Station) @@ -176,9 +148,9 @@ frame frame_at(station const &Station) double project(segment_data const &Path, glm::dvec3 const &Point, double &S, bool &Interior) { - auto const shape{curve_of(Path)}; + bezier const shape{Path}; auto const table{lengths(shape)}; - auto const distance = [&](double const T) { return plan(point(shape, T), Point); }; + auto const distance = [&](double const T) { return plan_distance(shape.point(T), Point); }; auto best{0}; auto bestdistance{distance(0.0)}; for (int i = 1; i <= kSteps; ++i) @@ -256,7 +228,7 @@ anchor make_anchor(station const &At, glm::dvec3 const &Point) result.at = At; auto const axis{frame_at(At)}; glm::dvec2 const side{axis.forward.y, -axis.forward.x}; - result.offset = glm::dot(glm::dvec2{Point.x - axis.point.x, Point.z - axis.point.z}, side); + result.offset = glm::dot(plan_of(Point - axis.point), side); result.height = Point.y - axis.point.y; result.foot = axis.point; if (At.track != nullptr && At.path >= 0 && At.path < static_cast(At.track->m_paths.size())) diff --git a/editor/editorProfile.cpp b/editor/editorProfile.cpp index f093dee43..3ea7e13be 100644 --- a/editor/editorProfile.cpp +++ b/editor/editorProfile.cpp @@ -9,6 +9,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "editor/editorProfile.hpp" +#include "editor/editorFormat.hpp" #include #include @@ -21,14 +22,6 @@ namespace profile namespace { -template -std::string format(char const *Format, Args... Arguments) -{ - char text[256]; - std::snprintf(text, sizeof(text), Format, Arguments...); - return text; -} - double polyline(line const &Line, double const Chainage) { auto const &points{Line.points}; diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index f86f012fb..c40c2dcdc 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -9,6 +9,8 @@ http: #include "stdafx.h" #include "editor/editorTrack.hpp" +#include "editor/editorFormat.hpp" +#include "editor/editorGeometry.hpp" #include "world/Track.h" #include "vehicle/DynObj.h" @@ -33,7 +35,14 @@ http: namespace { -double const kSamePoint{0.05}; +using geometry::bezier; +using geometry::chord_length; +using geometry::cross; +using geometry::plan_of; +using geometry::signed_angle; +using geometry::turned; + +double const kSamePoint{geometry::same_point}; segment_data::point point_index(editor_track::point_kind const Kind) { @@ -46,11 +55,6 @@ segment_data::point point_index(editor_track::point_kind const Kind) } } -bool is_end(editor_track::point_kind const Kind) -{ - return Kind == editor_track::point_kind::start || Kind == editor_track::point_kind::end; -} - bool has_switch_paths(TTrack const &Track) { return Track.SwitchExtension != nullptr && (Track.eType == tt_Switch || Track.eType == tt_Cross); @@ -75,17 +79,11 @@ glm::dvec3 path_tangent(segment_data const &Path, bool const Atend) double path_radius(segment_data const &Path, double const T) { - auto const &p0{Path.points[segment_data::point::start]}; - auto const &p3{Path.points[segment_data::point::end]}; - auto const &control1{Path.points[segment_data::point::control1]}; - auto const &control2{Path.points[segment_data::point::control2]}; - if (control1 == glm::dvec3{} && control2 == glm::dvec3{}) + if (Path.points[segment_data::point::control1] == glm::dvec3{} && Path.points[segment_data::point::control2] == glm::dvec3{}) return 0.0; - auto const p1{p0 + control1}; - auto const p2{p3 + control2}; - auto const u{1.0 - T}; - auto const first{3.0 * u * u * (p1 - p0) + 6.0 * u * T * (p2 - p1) + 3.0 * T * T * (p3 - p2)}; - auto const second{6.0 * u * (p2 - 2.0 * p1 + p0) + 6.0 * T * (p3 - 2.0 * p2 + p1)}; + bezier const curve{Path}; + auto const first{curve.first(T)}; + auto const second{curve.second(T)}; auto const speed{std::hypot(first.x, first.z)}; auto const curvature{std::abs(first.x * second.z - first.z * second.x) / (speed * speed * speed)}; return curvature > 1e-7 ? 1.0 / curvature : 0.0; @@ -391,7 +389,7 @@ std::vector> editor_track::connecte bool editor_track::is_connected(TTrack const &Track, point_ref const &Point) { - if (false == is_end(Point.kind)) + if (false == editor_track::is_end(Point.kind)) return false; return false == connected_points(Track, point_position(Track, Point)).empty(); } @@ -454,7 +452,7 @@ editor_track::snap_target editor_track::find_snap_target(TTrack const &Track, gl void editor_track::snap_point(TTrack &Track, point_ref const &Point, snap_target const &Target, bool const Aligntangent) { - if (Target.track == nullptr || false == is_end(Point.kind)) + if (Target.track == nullptr || false == editor_track::is_end(Point.kind)) return; move_point(Track, Point, Target.position); @@ -784,23 +782,6 @@ bool editor_track::find_chain(TTrack *From, TTrack *To, chain &Chain, std::strin namespace { -glm::dvec2 plan_of(glm::dvec3 const &Point) -{ - return {Point.x, Point.z}; -} - -glm::dvec2 turned(glm::dvec2 const &Vector, double const Angle) -{ - auto const c{std::cos(Angle)}; - auto const s{std::sin(Angle)}; - return {Vector.x * c - Vector.y * s, Vector.x * s + Vector.y * c}; -} - -double lateral_of(glm::dvec2 const &Direction, glm::dvec2 const &Offset) -{ - return Direction.x * Offset.y - Direction.y * Offset.x; -} - bool plan_straight(segment_data const &Path, editor_track::straight_tolerance const &Tolerance) { auto const chord{plan_of(Path.points[segment_data::point::end] - Path.points[segment_data::point::start])}; @@ -815,7 +796,7 @@ bool plan_straight(segment_data const &Path, editor_track::straight_tolerance co return true; auto const direction{chord / length}; for (auto const index : {segment_data::point::control1, segment_data::point::control2}) - if (std::abs(lateral_of(direction, plan_of(Path.points[index]))) > Tolerance.offset) + if (std::abs(cross(direction, plan_of(Path.points[index]))) > Tolerance.offset) return false; auto const tangentstart{plan_of(path_tangent(Path, false))}; auto const tangentend{plan_of(path_tangent(Path, true))}; @@ -823,8 +804,8 @@ bool plan_straight(segment_data const &Path, editor_track::straight_tolerance co return false; auto const a{glm::normalize(tangentstart)}; auto const b{glm::normalize(tangentend)}; - auto const turn{std::abs(std::atan2(lateral_of(a, b), glm::dot(a, b)))}; - auto const deviation{std::max(std::abs(lateral_of(direction, a)), std::abs(lateral_of(direction, b)))}; + auto const turn{std::abs(std::atan2(cross(a, b), glm::dot(a, b)))}; + auto const deviation{std::max(std::abs(cross(direction, a)), std::abs(cross(direction, b)))}; return turn * Tolerance.radius <= length && deviation * Tolerance.radius <= length; } @@ -848,11 +829,6 @@ glm::dvec2 direction_at(TTrack const &Track, glm::dvec3 const &Joint, bool const return {0.0, 1.0}; } -double signed_angle(glm::dvec2 const &From, glm::dvec2 const &To) -{ - return std::atan2(lateral_of(From, To), glm::dot(From, To)); -} - TTrack *neighbour_at(TTrack const &Track, int const Path, bool const Atend) { if (has_switch_paths(Track)) @@ -935,7 +911,7 @@ editor_track::straight editor_track::find_straight(TTrack &Track, straight_toler auto const &first{Track.m_paths[firstpath]}; auto const origin{first.points[segment_data::point::start]}; auto const direction{glm::normalize(plan_of(first.points[segment_data::point::end] - origin))}; - auto const lateral = [&](glm::dvec3 const &Point) { return std::abs(lateral_of(direction, plan_of(Point - origin))); }; + auto const lateral = [&](glm::dvec3 const &Point) { return std::abs(cross(direction, plan_of(Point - origin))); }; auto const accepts = [&](TTrack const *Other, glm::dvec3 const &Joint) { if (Other == nullptr || false == is_supported(*Other) || Other->m_editorremoved) return -1; @@ -949,7 +925,7 @@ editor_track::straight editor_track::find_straight(TTrack &Track, straight_toler if (glm::distance(start, Joint) > kSamePoint && glm::distance(end, Joint) > kSamePoint) continue; auto const otherdirection{glm::normalize(plan_of(end - start))}; - if (std::abs(lateral_of(direction, otherdirection)) > Tolerance.angle) + if (std::abs(cross(direction, otherdirection)) > Tolerance.angle) continue; if (lateral(start) > Tolerance.offset || lateral(end) > Tolerance.offset) continue; @@ -1198,11 +1174,6 @@ double split_margin(double const Length) return std::max(0.5, 0.002 * Length); } -double plan_length(segment_data const &Path) -{ - return glm::length(plan_of(Path.points[segment_data::point::end] - Path.points[segment_data::point::start])); -} - } // namespace editor_track::straight_run editor_track::straight_beyond(chain const &Chain, bool const Atend, straight_tolerance const &Tolerance) @@ -1237,13 +1208,13 @@ editor_track::straight_run editor_track::straight_beyond(chain const &Chain, boo if (run.tracks.empty()) { auto const own{glm::normalize(plan_of(far - joint))}; - if (std::abs(lateral_of(direction, own)) > 0.01 || glm::dot(direction, own) <= 0.0) + if (std::abs(cross(direction, own)) > 0.01 || glm::dot(direction, own) <= 0.0) break; direction = own; } auto const offset{plan_of(far) - origin}; auto const along{glm::dot(offset, direction)}; - if (along <= run.length + 1e-3 || std::abs(lateral_of(direction, offset)) > Tolerance.offset) + if (along <= run.length + 1e-3 || std::abs(cross(direction, offset)) > Tolerance.offset) break; run.tracks.push_back(current); run.outward.push_back(outward); @@ -1258,7 +1229,7 @@ double editor_track::run_reserve(straight_run const &Run) { if (Run.tracks.empty()) return 0.0; - return std::max(0.0, Run.length - split_margin(plan_length(Run.tracks.back()->m_paths.front())) - 0.01); + return std::max(0.0, Run.length - split_margin(chord_length(Run.tracks.back()->m_paths.front())) - 0.01); } TTrack *editor_track::take_straight(straight_run const &Run, TTrack *Edge, glm::dvec3 const &Joint, glm::dvec3 const &Cut, std::vector> &States, std::vector &Created) @@ -1271,7 +1242,7 @@ TTrack *editor_track::take_straight(straight_run const &Run, TTrack *Edge, glm:: auto *track{Run.tracks[i]}; auto const outward{Run.outward[i]}; auto const &path{track->m_paths.front()}; - auto const pathlength{plan_length(path)}; + auto const pathlength{chord_length(path)}; auto const margin{split_margin(pathlength)}; auto const remaining{length - covered}; if (remaining <= margin) @@ -1307,71 +1278,6 @@ TTrack *editor_track::take_straight(straight_run const &Run, TTrack *Edge, glm:: namespace { -struct bezier -{ - glm::dvec3 p0, p1, p2, p3; - explicit bezier(segment_data const &Path) - { - p0 = Path.points[segment_data::point::start]; - p3 = Path.points[segment_data::point::end]; - auto const &control1{Path.points[segment_data::point::control1]}; - auto const &control2{Path.points[segment_data::point::control2]}; - if (control1 == glm::dvec3{} && control2 == glm::dvec3{}) - { - p1 = glm::mix(p0, p3, 1.0 / 3.0); - p2 = glm::mix(p0, p3, 2.0 / 3.0); - } - else - { - p1 = p0 + control1; - p2 = p3 + control2; - } - } - glm::dvec3 point(double const T) const - { - auto const u{1.0 - T}; - return u * u * u * p0 + 3.0 * u * u * T * p1 + 3.0 * u * T * T * p2 + T * T * T * p3; - } - glm::dvec3 first(double const T) const - { - auto const u{1.0 - T}; - return 3.0 * u * u * (p1 - p0) + 6.0 * u * T * (p2 - p1) + 3.0 * T * T * (p3 - p2); - } - glm::dvec3 second(double const T) const - { - return 6.0 * (1.0 - T) * (p2 - 2.0 * p1 + p0) + 6.0 * T * (p3 - 2.0 * p2 + p1); - } - double plan_length(int const Steps = 32) const - { - double length{0.0}; - auto previous{plan_of(point(0.0))}; - for (int i = 1; i <= Steps; ++i) - { - auto const next{plan_of(point(static_cast(i) / Steps))}; - length += glm::distance(previous, next); - previous = next; - } - return length; - } - // parameter at specified plan distance from the start - double parameter(double const Distance) const - { - int constexpr steps{256}; - double length{0.0}; - auto previous{plan_of(point(0.0))}; - for (int i = 1; i <= steps; ++i) - { - auto const next{plan_of(point(static_cast(i) / steps))}; - auto const step{glm::distance(previous, next)}; - if (length + step >= Distance) - return (i - 1 + (step > 1e-12 ? (Distance - length) / step : 0.0)) / steps; - length += step; - previous = next; - } - return 1.0; - } -}; - using route_node = std::tuple; std::vector route_next(route_node const &Node) @@ -1524,7 +1430,7 @@ std::vector editor_track::sample_route(route &Route, sample.span = i; if (planar > 1e-9) { - sample.direction = glm::dvec2{derivative.x, derivative.z} / planar; + sample.direction = plan_of(derivative) / planar; sample.grade = derivative.y / planar; sample.curvature = (derivative.x * second.z - derivative.z * second.x) / (planar * planar * planar); } @@ -1540,10 +1446,10 @@ namespace { template -double interpolate(std::vector const &Samples, double const Chainage, Getter const &Get) +auto interpolate(std::vector const &Samples, double const Chainage, Getter const &Get) -> decltype(Get(Samples.front())) { if (Samples.empty()) - return 0.0; + return {}; auto const next{std::lower_bound(Samples.begin(), Samples.end(), Chainage, [](editor_track::route_sample const &Sample, double const Value) { return Sample.chainage < Value; })}; if (next == Samples.begin()) return Get(Samples.front()); @@ -1583,7 +1489,7 @@ void plane_heights(segment_data &Path, glm::dvec3 const &Origin, glm::dvec2 cons control1 = (end - start) / 3.0; control2 = (start - end) / 3.0; } - auto const height = [&](glm::dvec3 const &Point) { return Origin.y + Grade * glm::dot(glm::dvec2{Point.x - Origin.x, Point.z - Origin.z}, Direction); }; + auto const height = [&](glm::dvec3 const &Point) { return Origin.y + Grade * glm::dot(plan_of(Point - Origin), Direction); }; auto const first{start + control1}; auto const second{end + control2}; start.y = height(start); @@ -1614,6 +1520,11 @@ double editor_track::sampled_grade(std::vector const &Samples, dou return interpolate(Samples, Chainage, [](route_sample const &Sample) { return Sample.grade; }); } +glm::dvec3 editor_track::sampled_position(std::vector const &Samples, double const Chainage) +{ + return interpolate(Samples, Chainage, [](route_sample const &Sample) { return Sample.position; }); +} + bool editor_track::adjoining_grade(route const &Route, bool const Atend, double &Grade) { if (Route.spans.empty()) @@ -1815,7 +1726,7 @@ std::vector editor_track::find_switch_templates() local.points[segment_data::point::control1] = tolocal(path.points[segment_data::point::control1]); local.points[segment_data::point::control2] = tolocal(path.points[segment_data::point::control2]); } - if (glm::length(glm::dvec2{entry.local[1].points[segment_data::point::start].x, entry.local[1].points[segment_data::point::start].z}) > kSamePoint) + if (glm::length(plan_of(entry.local[1].points[segment_data::point::start])) > kSamePoint) continue; if (entry.local[1].points[segment_data::point::end].x < 0.0) { @@ -1831,8 +1742,7 @@ std::vector editor_track::find_switch_templates() auto const angle{std::atan2(std::abs(tangent.x), tangent.z)}; entry.ratio = angle > 1e-6 ? 1.0 / std::tan(angle) : 0.0; entry.radius = path_radius(entry.local[1], 0.25); - char key[256]; - std::snprintf(key, sizeof(key), "%.2f|%.2f|%.2f|%s|%s", entry.length, entry.local[1].points[segment_data::point::end].x, entry.local[1].points[segment_data::point::end].z, material_name(track->m_material1).c_str(), material_name(track->m_material2).c_str()); + auto const key{format("%.2f|%.2f|%.2f|%s|%s", entry.length, entry.local[1].points[segment_data::point::end].x, entry.local[1].points[segment_data::point::end].z, material_name(track->m_material1).c_str(), material_name(track->m_material2).c_str())}; auto const found{lookup.find(key)}; if (found != lookup.end()) { @@ -1840,9 +1750,7 @@ std::vector editor_track::find_switch_templates() continue; } entry.count = 1; - char label[256]; - std::snprintf(label, sizeof(label), "L %.2f m 1:%.1f R %.0f m %s", entry.length, entry.ratio, entry.radius, material_name(track->m_material1).c_str()); - entry.label = label; + entry.label = format("L %.2f m 1:%.1f R %.0f m %s", entry.length, entry.ratio, entry.radius, material_name(track->m_material1).c_str()); lookup.emplace(key, result.size()); result.push_back(entry); } @@ -2045,7 +1953,7 @@ void editor_track::move_straight(straight const &Line, glm::dvec3 const &Start, if (newlength < 1e-3) return; auto const newdirection{newplan / newlength}; - auto const angle{std::atan2(lateral_of(direction, newdirection), glm::dot(direction, newdirection))}; + auto const angle{std::atan2(cross(direction, newdirection), glm::dot(direction, newdirection))}; auto const along = [&](glm::dvec3 const &Point) { return glm::dot(plan_of(Point - Line.start), direction); }; struct interval @@ -2085,7 +1993,7 @@ void editor_track::move_straight(straight const &Line, glm::dvec3 const &Start, }; auto const transform = [&](glm::dvec3 const &Point) { auto const a{along(Point)}; - auto const offset{lateral_of(direction, plan_of(Point - Line.start))}; + auto const offset{cross(direction, plan_of(Point - Line.start))}; auto const mapped{remap(a)}; auto const oldheight{Line.start.y + (Line.end.y - Line.start.y) * a / Line.length}; auto const newheight{Start.y + (End.y - Start.y) * mapped / newlength}; @@ -2242,20 +2150,22 @@ TTrack *editor_track::create_path(TTrack const &Style, segment_data const &Path) return track; } -double editor_track::nearest_parameter(TTrack const &Track, glm::dvec3 const &Point) +glm::dvec3 editor_track::point_at(TTrack const &Track, double const T) { - if (Track.m_paths.empty()) - return 0.5; auto const &path{Track.m_paths.front()}; auto const p0{path.points[segment_data::point::start]}; auto const p3{path.points[segment_data::point::end]}; auto const p1{p0 + path.points[segment_data::point::control1]}; auto const p2{p3 + path.points[segment_data::point::control2]}; - auto const at = [&](double const T) { - auto const u{1.0 - T}; - return u * u * u * p0 + 3.0 * u * u * T * p1 + 3.0 * u * T * T * p2 + T * T * T * p3; - }; - auto const distance = [&](double const T) { auto const q{at(T)}; return glm::distance(glm::dvec2{q.x, q.z}, glm::dvec2{Point.x, Point.z}); }; + auto const u{1.0 - T}; + return u * u * u * p0 + 3.0 * u * u * T * p1 + 3.0 * u * T * T * p2 + T * T * T * p3; +} + +double editor_track::nearest_parameter(TTrack const &Track, glm::dvec3 const &Point) +{ + if (Track.m_paths.empty()) + return 0.5; + auto const distance = [&](double const T) { return geometry::plan_distance(point_at(Track, T), Point); }; double best{0.5}; for (int i = 0; i <= 200; ++i) if (distance(i / 200.0) < distance(best)) diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index 34b0a7d8e..cc6d106c9 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -25,6 +25,7 @@ class editor_track { public: enum class point_kind { start, control1, control2, end }; + static bool is_end(point_kind const Kind) { return Kind == point_kind::start || Kind == point_kind::end; } struct point_ref { int path{-1}; @@ -108,6 +109,8 @@ class editor_track double length{0.0}; double grade{0.0}; double azimuth{0.0}; + // distance of the point from the start, measured along the line in the plan + double along(glm::dvec3 const &Point) const { return (Point.x - start.x) * direction.x + (Point.z - start.z) * direction.y; } }; struct straight_tolerance { @@ -177,6 +180,7 @@ class editor_track static std::vector sample_route(route &Route, double const Step); static double sampled_elevation(std::vector const &Samples, double const Chainage); static double sampled_grade(std::vector const &Samples, double const Chainage); + static glm::dvec3 sampled_position(std::vector const &Samples, double const Chainage); // grade of the path which adjoins the end of the route, positive rising along the route static bool adjoining_grade(route const &Route, bool const Atend, double &Grade); // path off the route whose end no longer meets the adjoining path in height @@ -211,6 +215,8 @@ class editor_track static TTrack *create_path(TTrack const &Style, segment_data const &Path); static TTrack *split_path(TTrack &Track, double const T); static double nearest_parameter(TTrack const &Track, glm::dvec3 const &Point); + // point of the first path at the parameter of nearest_parameter() + static glm::dvec3 point_at(TTrack const &Track, double const T); static std::vector place_switch(switch_template const &Template, glm::dvec3 const &Origin, glm::dvec2 const &Direction, int const Side, double const Grade); static TTrack *create_switch(switch_template const &Template, std::vector const &Paths, TTrack const &Style, std::string const &Name = {}); static void move_straights(std::vector const &Lines, std::vector> const &Ends); From 7b8d809078edfa718301e0eefab8f3d7a56a1d5e Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 00:35:40 +0200 Subject: [PATCH 088/430] refactor(editor): drop unused editor state and vertical leftovers of the route design --- application/editormode.h | 2 -- application/editormodeinfra.cpp | 14 ++------------ application/editormodetrack.cpp | 12 +----------- editor/editorAlignment.cpp | 6 ++---- editor/editorAlignment.hpp | 4 ---- editor/editorTrack.cpp | 6 ------ editor/editorTrack.hpp | 1 - 7 files changed, 5 insertions(+), 40 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index 082682e43..32a6adaa6 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -472,7 +472,6 @@ class editor_mode : public application_mode void render_path_parameters(TTrack &Track); void render_straight_ui(); track_tab m_track_tab{track_tab::straights}; - int m_track_tab_request{-1}; void delete_selected_track(); void start_straight_gesture(int const Tool); void finish_straight_gesture(); @@ -575,7 +574,6 @@ class editor_mode : public application_mode std::vector m_bindings; std::vector> m_bindings_unresolved; // lines kept as they are bool m_bindings_loaded{false}; - bool m_bindings_changed{false}; std::vector m_infra_buffer; // states of the objects before the change in progress bool m_infra_suspended{false}; void infra_hooks(); diff --git a/application/editormodeinfra.cpp b/application/editormodeinfra.cpp index d81dd2f2b..e950c5d78 100644 --- a/application/editormodeinfra.cpp +++ b/application/editormodeinfra.cpp @@ -374,11 +374,6 @@ bool nearest_beside(Areas_ const &Areas, glm::dvec3 const &Point, double const C return best >= 0.0; } -bool station_near(std::vector const &Areas, glm::dvec3 const &Point, double const Corridor, infra::station &Station) -{ - return nearest_beside(Areas, Point, Corridor, Station); -} - // paths of the whole scenery by cells of the plan, for the lookups reaching up to kReach from the axis class track_index { @@ -662,7 +657,6 @@ void editor_mode::infra_store() entry.second.insert(entry.second.begin(), "# objects bound to the paths in the track editor, they follow changes of the track; the simulation skips these lines"); scene::Layers.mark(entry.first, kBindingMark, std::move(entry.second)); } - m_bindings_changed = false; } std::vector editor_mode::infra_scope() const @@ -830,8 +824,6 @@ void editor_mode::infra_bind_chosen() candidate.chosen = false; ++count; } - if (count > 0) - m_bindings_changed = true; state.status = format("%d object(s) bound, they follow the changes of the track. The bindings are kept in the scenery files on save", count); } @@ -848,8 +840,6 @@ void editor_mode::infra_unbind(std::vector Indices) candidate.bound = false; m_bindings.erase(m_bindings.begin() + *index); } - if (false == Indices.empty()) - m_bindings_changed = true; } infra::object_state editor_mode::infra_state_of(infra::binding const &Binding) const @@ -973,7 +963,7 @@ void editor_mode::infra_follow(std::vector const &Tracks) // paths which took over may have been committed before the old ones were retired std::optional> everywhere; auto const take_over = [&](glm::dvec3 const &Foot, infra::station &Station) { - if (station_near(areas, Foot, 30.0, Station)) + if (nearest_beside(areas, Foot, 30.0, Station)) return true; if (false == everywhere.has_value()) { @@ -983,7 +973,7 @@ void editor_mode::infra_follow(std::vector const &Tracks) everywhere->push_back(area_of(*track)); } // only a path running where the old one did, not the one alongside - return station_near(*everywhere, Foot, 1.0, Station); + return nearest_beside(*everywhere, Foot, 1.0, Station); }; for (auto &binding : m_bindings) { diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index ca5f77223..8d0a2cdf3 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -93,12 +93,10 @@ void editor_mode::select_track(scene::basic_node *Node) } else if (editor_track::is_straight(*track, m_straights.tolerance)) { - m_track_tab_request = 0; m_track_tab = track_tab::straights; } else if (std::find(m_route.chain.tracks.begin(), m_route.chain.tracks.end(), track) != m_route.chain.tracks.end() || route_from_curve(*track)) { - m_track_tab_request = 1; m_track_tab = track_tab::route; } } @@ -803,7 +801,6 @@ void editor_mode::route_recommend(alignment::vertex &Vertex) const Vertex.cant = recommended.cant; Vertex.transition_in = recommended.transition; Vertex.transition_out = recommended.transition; - Vertex.vertical_radius = 0.0; } void editor_mode::route_bind_ends() @@ -1013,13 +1010,7 @@ glm::dvec3 editor_mode::route_vertex_position(int const Vertex) const else position = design.vertices[Vertex].position; - double height; - if (Vertex < static_cast(result.vertex_elevations.size())) - height = result.vertex_elevations[Vertex]; - else if (false == design.vertices[Vertex].auto_elevation) - height = design.vertices[Vertex].elevation; - else - height = design.start.y + (design.end.y - design.start.y) * (Vertex + 1) / (count + 1.0); + auto const height{Vertex < static_cast(result.vertex_elevations.size()) ? result.vertex_elevations[Vertex] : design.start.y + (design.end.y - design.start.y) * (Vertex + 1) / (count + 1.0)}; return {position.x, height, position.y}; } @@ -2361,7 +2352,6 @@ void editor_mode::toggle_straight_set(TTrack &Track) state.set.push_back(line); m_node = &Track; ui()->set_node(m_node); - m_track_tab_request = 0; m_track_tab = track_tab::straights; } diff --git a/editor/editorAlignment.cpp b/editor/editorAlignment.cpp index bdd06cf34..29a85b012 100644 --- a/editor/editorAlignment.cpp +++ b/editor/editorAlignment.cpp @@ -245,7 +245,6 @@ recommendation recommend(double const Speed, double const Radius, limits const & auto const factor{Limits.gauge / (kGravity * 12.96)}; auto const allowance{Limits.gauge * Limits.unbalanced / kGravity}; result.radius_min = factor * Speed * Speed / (Limits.cant_max + allowance); - result.vertical_radius = std::max(Limits.vertical_min, Limits.vertical_factor * Speed * Speed); if (Radius <= 0.0) return result; result.cant_equilibrium = factor * Speed * Speed / Radius; @@ -712,12 +711,11 @@ result fit_between(design const &Design) r.vertex_chainages = vertexchainage; r.profile.push_back({0.0, Design.start.y, 0.0, 0.0}); + auto const radius{std::max(Design.norms.vertical_min, Design.norms.vertical_factor * Design.speed * Design.speed)}; for (std::size_t k = 0; k < count; ++k) { - auto const &vertex{Design.vertices[k]}; - auto const elevation{vertex.auto_elevation ? Design.start.y + (Design.end.y - Design.start.y) * vertexchainage[k] / std::max(r.length, 1e-6) : vertex.elevation}; + auto const elevation{Design.start.y + (Design.end.y - Design.start.y) * vertexchainage[k] / std::max(r.length, 1e-6)}; r.vertex_elevations.push_back(elevation); - auto const radius{vertex.vertical_radius > 0.0 ? vertex.vertical_radius : std::max(Design.norms.vertical_min, Design.norms.vertical_factor * Design.speed * Design.speed)}; if (vertexchainage[k] <= r.profile.back().chainage + 1e-3) continue; r.profile.push_back({vertexchainage[k], elevation, radius, 0.0}); diff --git a/editor/editorAlignment.hpp b/editor/editorAlignment.hpp index a3e4572f4..fcf6132bc 100644 --- a/editor/editorAlignment.hpp +++ b/editor/editorAlignment.hpp @@ -45,9 +45,6 @@ struct vertex double transition_in{0.0}; double transition_out{0.0}; double cant{0.0}; - bool auto_elevation{true}; - double elevation{0.0}; - double vertical_radius{0.0}; bool reverse_turn{false}; bool compound{false}; double radius2{600.0}; @@ -83,7 +80,6 @@ struct recommendation double cant{0.0}; double radius_min{0.0}; double transition{0.0}; - double vertical_radius{0.0}; }; recommendation recommend(double const Speed, double const Radius, limits const &Limits); double transition_length(double const Speed, double const Radius, double const Cant, limits const &Limits); diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index c40c2dcdc..7d815d669 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -2261,12 +2261,6 @@ void editor_track::retire(TTrack &Track) on_retire(Track); } -void editor_track::revive(TTrack &Track) -{ - Track.m_editorremoved = false; - commit({&Track}); -} - void editor_track::rebuild_geometry(TTrack &Track) { auto §ion{simulation::Region->section(Track.location())}; diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index cc6d106c9..4a80dc955 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -222,7 +222,6 @@ class editor_track static void move_straights(std::vector const &Lines, std::vector> const &Ends); static std::vector relay(chain const &Chain, std::vector const &Pieces); static void retire(TTrack &Track); - static void revive(TTrack &Track); static std::string material_name(material_handle const Material); static material_handle fetch_material(std::string const &Name); From c85a52d5b1aceedaa071c210cc87aef495c24443 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 00:37:26 +0200 Subject: [PATCH 089/430] refactor(editor): track observer instead of the function hooks --- application/editormode.cpp | 7 ++++++- application/editormode.h | 12 +++++++----- application/editormodeinfra.cpp | 19 ++++++++----------- editor/editorTrack.cpp | 21 +++++++++------------ editor/editorTrack.hpp | 19 +++++++++++++------ 5 files changed, 43 insertions(+), 35 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index c4cedb689..08f5103c2 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -344,9 +344,14 @@ editor_mode::editor_mode() { m_orthophoto.ground_source([](glm::dvec2 const &Min, glm::dvec2 const &Max, std::vector &Out) { gather_ground_triangles(Min, Max, true, 50.0f, Out); }); - infra_hooks(); + editor_track::observe(this); } +editor_mode::~editor_mode() +{ + editor_track::observe(nullptr); +} + editor_ui *editor_mode::ui() const { return static_cast(m_userinterface.get()); diff --git a/application/editormode.h b/application/editormode.h index 32a6adaa6..d8529da03 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -34,12 +34,13 @@ http://mozilla.org/MPL/2.0/. class TAnimModel; class TTrack; -class editor_mode : public application_mode +class editor_mode : public application_mode, private editor_track::observer { public: // constructors editor_mode(); + ~editor_mode() override; // methods // initializes internal data structures of the mode. returns: true on success, false otherwise bool init() override; @@ -576,7 +577,6 @@ class editor_mode : public application_mode bool m_bindings_loaded{false}; std::vector m_infra_buffer; // states of the objects before the change in progress bool m_infra_suspended{false}; - void infra_hooks(); void infra_load(); void infra_store(); std::vector infra_scope() const; @@ -587,9 +587,11 @@ class editor_mode : public application_mode infra::object_state infra_state_of(infra::binding const &Binding) const; void infra_restore_state(infra::object_state const &State); void infra_buffer(infra::binding const &Binding, bool const Refresh); - void infra_capture(TTrack const &Track); - void infra_follow(std::vector const &Tracks); - void infra_split(TTrack &Original, TTrack &Created, segment_data const &First); + // editor_track::observer + void track_captured(TTrack const &Track) override; + void tracks_committed(std::vector const &Tracks) override; + void track_retired(TTrack &Track) override; + void track_split(TTrack &Original, TTrack &Created, segment_data const &First) override; void infra_move(infra::binding &Binding); void infra_attach(EditorSnapshot &Snapshot); void render_infra_window(); diff --git a/application/editormodeinfra.cpp b/application/editormodeinfra.cpp index e950c5d78..090bc3ef5 100644 --- a/application/editormodeinfra.cpp +++ b/application/editormodeinfra.cpp @@ -461,14 +461,6 @@ double turn_of(infra::binding const &Binding, double const Yaw) } // namespace -void editor_mode::infra_hooks() -{ - editor_track::on_capture = [this](TTrack const &Track) { infra_capture(Track); }; - editor_track::on_commit = [this](std::vector const &Tracks) { infra_follow(Tracks); }; - editor_track::on_retire = [this](TTrack &) { infra_follow({}); }; - editor_track::on_split = [this](TTrack &Original, TTrack &Created, segment_data const &First) { infra_split(Original, Created, First); }; -} - // format of the lines, coordinates in the space of the file: // { } // the object is the model, the include (position from its parameters), the traction piece (its first point), the memory @@ -908,7 +900,7 @@ void editor_mode::infra_buffer(infra::binding const &Binding, bool const Refresh m_infra_buffer.push_back(infra_state_of(Binding)); } -void editor_mode::infra_capture(TTrack const &Track) +void editor_mode::track_captured(TTrack const &Track) { if (m_infra_suspended || false == m_infra.follow) return; @@ -948,7 +940,7 @@ void editor_mode::infra_capture(TTrack const &Track) } } -void editor_mode::infra_follow(std::vector const &Tracks) +void editor_mode::tracks_committed(std::vector const &Tracks) { if (m_infra_suspended || false == m_infra.follow) return; @@ -1027,7 +1019,12 @@ void editor_mode::infra_follow(std::vector const &Tracks) } } -void editor_mode::infra_split(TTrack &Original, TTrack &Created, segment_data const &First) +void editor_mode::track_retired(TTrack &) +{ + tracks_committed({}); +} + +void editor_mode::track_split(TTrack &Original, TTrack &Created, segment_data const &First) { if (m_infra_suspended || Created.m_paths.empty()) return; diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index 7d815d669..e20fe9767 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -122,15 +122,12 @@ bool adjoining_direction(TTrack const *Neighbour, glm::dvec3 const &Joint, bool } -std::function editor_track::on_capture; -std::function const &)> editor_track::on_commit; -std::function editor_track::on_retire; -std::function editor_track::on_split; +editor_track::observer *editor_track::s_observer{nullptr}; editor_track::state editor_track::capture(TTrack const &Track) { - if (on_capture) - on_capture(Track); + if (s_observer != nullptr) + s_observer->track_captured(Track); state result; result.paths = Track.m_paths; result.velocity = Track.fVelocity; @@ -240,8 +237,8 @@ void editor_track::commit(std::vector const &Tracks) for (auto *track : affected) for (auto *vehicle : track->Dynamics) vehicle->Move(0.000001); - if (on_commit) - on_commit(Tracks); + if (s_observer != nullptr) + s_observer->tracks_committed(Tracks); } void editor_track::commit_parameters(TTrack &Track) @@ -2219,8 +2216,8 @@ TTrack *editor_track::split_path(TTrack &Track, double const T) second.rolls[0] = roll; auto *created{create_path(Track, second)}; Track.m_paths.front() = first; - if (on_split) - on_split(Track, *created, first); + if (s_observer != nullptr) + s_observer->track_split(Track, *created, first); commit({&Track, created}); return created; } @@ -2257,8 +2254,8 @@ void editor_track::retire(TTrack &Track) update_transition(*neighbour); rebuild_geometry(*neighbour); } - if (on_retire) - on_retire(Track); + if (s_observer != nullptr) + s_observer->track_retired(Track); } void editor_track::rebuild_geometry(TTrack &Track) diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index 4a80dc955..742e393d4 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -232,14 +232,21 @@ class editor_track static void velocity(TTrack &Track, double const Velocity); static void damage(TTrack &Track, int const Damage); - // let the objects which belong to the paths follow their changes - static std::function on_capture; - static std::function const &)> on_commit; - static std::function on_retire; - // called before the commit; the first argument keeps the beginning of the path, given in the last one - static std::function on_split; + // told about the changes of the paths, to let the objects which belong to them follow + class observer + { + public: + virtual ~observer() = default; + virtual void track_captured(TTrack const &Track) = 0; + virtual void tracks_committed(std::vector const &Tracks) = 0; + virtual void track_retired(TTrack &Track) = 0; + // called before the commit; Original keeps the beginning of the path, given in First + virtual void track_split(TTrack &Original, TTrack &Created, segment_data const &First) = 0; + }; + static void observe(observer *Observer) { s_observer = Observer; } private: + static observer *s_observer; static void disconnect(TTrack &Track); static void join(TTrack &Track); static void connect(TTrack &Track, bool const Prevside, TTrack *Other, int const Endpointid); From 62f07c8fbb56288cc7562850f5654e9490d498cf Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 00:39:30 +0200 Subject: [PATCH 090/430] refactor(editor): one edit helper for the definitions rewritten on save --- scene/scenelayerssave.cpp | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/scene/scenelayerssave.cpp b/scene/scenelayerssave.cpp index 02029a3a5..bb77fae03 100644 --- a/scene/scenelayerssave.cpp +++ b/scene/scenelayerssave.cpp @@ -781,6 +781,15 @@ save_result node_layers::save(std::vector const &Rootstatements) return fail(state.error); } } + auto const push_edit = [&](layer_handle const Layer, source_span const &Span, std::string Text, basic_node const *Node) { + file_patch::edit edit; + edit.begin = Span.begin; + edit.end = Span.end; + edit.length = Text.size(); + edit.text = std::move(Text); + edit.node = Node; + state.patches[Layer].edits.emplace_back(std::move(edit)); + }; // traction and event launchers are rewritten when the editor moved them along with the track they belong to std::vector patchednodes; auto const patch_node = [&](basic_node *Node, auto const &Patch) { @@ -811,13 +820,7 @@ save_result node_layers::save(std::vector const &Rootstatements) state.error = error + " of \"" + Node->name() + "\" in file \"" + layer(source.layer).name + "\""; return false; } - file_patch::edit edit; - edit.begin = source.span.begin; - edit.end = source.span.end; - edit.length = text.size(); - edit.text = std::move(text); - edit.node = Node; - state.patches[source.layer].edits.emplace_back(std::move(edit)); + push_edit(source.layer, source.span, std::move(text), Node); rewritten.emplace(Node); patchednodes.push_back(Node); return true; @@ -884,21 +887,16 @@ save_result node_layers::save(std::vector const &Rootstatements) { return fail(state.error); } - file_patch::edit edit; - edit.begin = source.span.begin; - edit.end = source.span.end; if (path->m_editorremoved) { + push_edit(source.layer, source.span, {}, nullptr); droppedpaths.push_back(path); } else { - edit.text = path_text(*path, source.context.offset); - edit.length = edit.text.size(); - edit.node = path; + push_edit(source.layer, source.span, path_text(*path, source.context.offset), path); savedpaths.push_back(path); } - state.patches[source.layer].edits.emplace_back(std::move(edit)); rewritten.emplace(path); } for (auto const &erased : m_erased) @@ -919,14 +917,10 @@ save_result node_layers::save(std::vector const &Rootstatements) { for (auto const &line : lookup->second) { - if (line.mark != mark) + if (line.mark == mark) { - continue; + push_edit(markedlayer, line.span, {}, nullptr); } - file_patch::edit edit; - edit.begin = line.span.begin; - edit.end = line.span.end; - state.patches[markedlayer].edits.emplace_back(std::move(edit)); } } auto const target{resolve(markedlayer)}; From 9cd0f0b1a79ddff28bc2ae06e3bcc32f92f70049 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 00:39:30 +0200 Subject: [PATCH 091/430] refactor(editor): shared writers of the path definitions --- editor/editorTrack.cpp | 87 +++++++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 40 deletions(-) diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index e20fe9767..e328cbb39 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -1831,6 +1831,44 @@ std::vector editor_track::standard_switch_templat return result; } +namespace +{ + +// definition of a path in the scenery text, up to its points: type, length, parameters, environment and textures +void write_header(std::ostream &Text, char const *Type, double const Length, double const Sound, TTrack const &Style, material_handle const Second) +{ + char const *environments[] = {"flat", "mountains", "canyon", "tunnel", "bridge", "bank"}; + auto const environment{Style.eEnvironment >= e_flat && Style.eEnvironment <= e_bank ? environments[Style.eEnvironment] : "flat"}; + Text << Type << ' ' << Length << ' ' << Style.fTrackWidth << ' ' << Style.fFriction << ' ' << Sound << ' ' << Style.iQualityFlag << ' ' << 0 << ' ' << environment << ' '; + if (Style.m_visible) + Text << "vis " << editor_track::material_name(Style.m_material1) << ' ' << Style.fTexLength << ' ' << editor_track::material_name(Second) << ' ' << editor_track::texture_height(Style) << ' ' << Style.fTexWidth << ' ' << Style.fTexSlope << ' '; + else + Text << "unvis "; +} + +void write_points(std::ostream &Text, segment_data const &Path) +{ + auto const &start{Path.points[segment_data::point::start]}; + auto const &control1{Path.points[segment_data::point::control1]}; + auto const &control2{Path.points[segment_data::point::control2]}; + auto const &end{Path.points[segment_data::point::end]}; + Text << start.x << ' ' << start.y << ' ' << start.z << ' ' << Path.rolls[0] << ' ' << control1.x << ' ' << control1.y << ' ' << control1.z << ' ' << control2.x << ' ' << control2.y << ' ' << control2.z << ' ' << end.x << ' ' << end.y << ' ' << end.z << ' ' << Path.rolls[1] << ' ' << Path.radius << ' '; +} + +void write_ending(std::ostream &Text, TTrack const &Style) +{ + if ((Style.iCategoryFlag & 15) == 1 && false == Style.m_profile1.first.empty()) + Text << "railprofile " << Style.m_profile1.first << ' '; + Text << "endtrack\n"; +} + +material_handle ballast_of(TTrack const &Style) +{ + return Style.eType == tt_Switch ? (Style.SwitchExtension ? Style.SwitchExtension->m_material3 : null_handle) : Style.m_material2; +} + +} // namespace + TTrack *editor_track::create_switch(switch_template const &Template, std::vector const &Paths, TTrack const &Style, std::string const &Name) { if (Paths.size() < 2) @@ -1842,31 +1880,14 @@ TTrack *editor_track::create_switch(switch_template const &Template, std::vector } else { - char const *environments[] = {"flat", "mountains", "canyon", "tunnel", "bridge", "bank"}; - auto const environment{Style.eEnvironment >= e_flat && Style.eEnvironment <= e_bank ? environments[Style.eEnvironment] : "flat"}; std::ostringstream text; text.precision(std::numeric_limits::digits10); - text << "switch " << Template.length << ' ' << Style.fTrackWidth << ' ' << Style.fFriction << ' ' << 10.0 << ' ' << Style.iQualityFlag << ' ' << 0 << ' ' << environment << ' '; - auto const rails{Style.m_material1}; - auto const trackbed{Style.eType == tt_Switch ? (Style.SwitchExtension ? Style.SwitchExtension->m_material3 : null_handle) : Style.m_material2}; - if (Style.m_visible) - text << "vis " << material_name(rails) << ' ' << Style.fTexLength << ' ' << material_name(rails) << ' ' << texture_height(Style) << ' ' << Style.fTexWidth << ' ' << Style.fTexSlope << ' '; - else - text << "unvis "; - for (int i = 0; i < 2; ++i) - { - auto const &path{Paths[i]}; - auto const &start{path.points[segment_data::point::start]}; - auto const &control1{path.points[segment_data::point::control1]}; - auto const &control2{path.points[segment_data::point::control2]}; - auto const &end{path.points[segment_data::point::end]}; - text << start.x << ' ' << start.y << ' ' << start.z << ' ' << path.rolls[0] << ' ' << control1.x << ' ' << control1.y << ' ' << control1.z << ' ' << control2.x << ' ' << control2.y << ' ' << control2.z << ' ' << end.x << ' ' << end.y << ' ' << end.z << ' ' << path.rolls[1] << ' ' << path.radius << ' '; - } - if (trackbed != null_handle) + write_header(text, "switch", Template.length, 10.0, Style, Style.m_material1); + write_points(text, Paths[0]); + write_points(text, Paths[1]); + if (auto const trackbed{ballast_of(Style)}; trackbed != null_handle) text << "trackbed " << material_name(trackbed) << ' '; - if ((Style.iCategoryFlag & 15) == 1 && false == Style.m_profile1.first.empty()) - text << "railprofile " << Style.m_profile1.first << ' '; - text << "endtrack\n"; + write_ending(text, Style); track = load_path(text.str(), Style, Name); } track->m_paths.assign(Paths.begin(), Paths.begin() + 2); @@ -2120,28 +2141,14 @@ TTrack *editor_track::clone(TTrack const &Template) TTrack *editor_track::create_path(TTrack const &Style, segment_data const &Path) { - char const *environments[] = {"flat", "mountains", "canyon", "tunnel", "bridge", "bank"}; - auto const environment{Style.eEnvironment >= e_flat && Style.eEnvironment <= e_bank ? environments[Style.eEnvironment] : "flat"}; auto const category{Style.iCategoryFlag & 15}; std::ostringstream text; text.precision(std::numeric_limits::digits10); - text << (category == 2 ? "road " : category == 4 ? "river " : "normal ") << glm::distance(Path.points[segment_data::point::start], Path.points[segment_data::point::end]) << ' ' << Style.fTrackWidth << ' ' << Style.fFriction << ' ' << Style.fSoundDistance << ' ' << Style.iQualityFlag << ' ' << 0 << ' ' << environment << ' '; - auto const ballast{Style.eType == tt_Switch ? (Style.SwitchExtension ? Style.SwitchExtension->m_material3 : null_handle) : Style.m_material2}; - if (Style.m_visible) - text << "vis " << material_name(Style.m_material1) << ' ' << Style.fTexLength << ' ' << material_name(ballast) << ' ' << texture_height(Style) << ' ' << Style.fTexWidth << ' ' << Style.fTexSlope << ' '; - else - text << "unvis "; - auto const &start{Path.points[segment_data::point::start]}; - auto const &control1{Path.points[segment_data::point::control1]}; - auto const &control2{Path.points[segment_data::point::control2]}; - auto const &end{Path.points[segment_data::point::end]}; - text << start.x << ' ' << start.y << ' ' << start.z << ' ' << Path.rolls[0] << ' ' << control1.x << ' ' << control1.y << ' ' << control1.z << ' ' << control2.x << ' ' << control2.y << ' ' << control2.z << ' ' << end.x << ' ' << end.y << ' ' << end.z << ' ' << Path.rolls[1] << ' ' << Path.radius << ' '; - auto const speed{velocity(Style)}; - if (speed > 0.0) + write_header(text, category == 2 ? "road" : category == 4 ? "river" : "normal", glm::distance(Path.points[segment_data::point::start], Path.points[segment_data::point::end]), Style.fSoundDistance, Style, ballast_of(Style)); + write_points(text, Path); + if (auto const speed{velocity(Style)}; speed > 0.0) text << "velocity " << speed << ' '; - if (category == 1 && false == Style.m_profile1.first.empty()) - text << "railprofile " << Style.m_profile1.first << ' '; - text << "endtrack\n"; + write_ending(text, Style); auto *track{load_path(text.str(), Style)}; track->m_paths = {Path}; return track; From 20fa5613a78cf2bdcac87ca751b1e634cda44c2d Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 00:42:47 +0200 Subject: [PATCH 092/430] refactor(editor): shared gizmo frame, screen picking and history trimming --- application/editormode.h | 3 +- application/editormodeprofile.cpp | 15 ++-- application/editormodetrack.cpp | 143 +++++++++--------------------- application/editorprojection.h | 39 ++++++++ 4 files changed, 89 insertions(+), 111 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index d8529da03..d099334df 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -289,7 +289,8 @@ class editor_mode : public application_mode, private editor_track::observer void select_track(scene::basic_node *Node); void render_track_gizmo(); void commit_track_drag(bool const Force); - void push_track_snapshot(std::vector> States, std::vector Created = {}); + void push_track_snapshot(std::vector> States, std::vector Created = {}, std::vector Removed = {}); + void trim_history(); void restore_track_snapshot(EditorSnapshot const &Snapshot, std::vector &Opposite, bool const Undo); editor_track::point_ref m_track_point; std::vector m_track_drag; diff --git a/application/editormodeprofile.cpp b/application/editormodeprofile.cpp index 179ce97f9..84eef7935 100644 --- a/application/editormodeprofile.cpp +++ b/application/editormodeprofile.cpp @@ -869,6 +869,11 @@ void editor_mode::render_profile_canvas() } auto const curves{profile::curves(line)}; + auto const mouse_distance2 = [&](double Chainage, double Elevation) { + auto const dx{x_of(Chainage) - mouse.x}; + auto const dy{y_of(Elevation) - mouse.y}; + return dx * dx + dy * dy; + }; auto const hit_point = [&]() { int hit{-1}; float best{64.0f}; @@ -876,11 +881,9 @@ void editor_mode::render_profile_canvas() { if (points[i].joint) continue; - auto const dx{x_of(points[i].chainage) - mouse.x}; - auto const dy{y_of(points[i].elevation) - mouse.y}; - if (dx * dx + dy * dy < best) + if (auto const distance{mouse_distance2(points[i].chainage, points[i].elevation)}; distance < best) { - best = dx * dx + dy * dy; + best = distance; hit = i; } } @@ -892,9 +895,7 @@ void editor_mode::render_profile_canvas() if (points[c.point].joint) continue; auto const chainage{points[c.point].chainage}; - auto const dx{x_of(chainage) - mouse.x}; - auto const dy{y_of(profile::elevation(line, chainage)) - mouse.y}; - if (dx * dx + dy * dy < 64.0f) + if (mouse_distance2(chainage, profile::elevation(line, chainage)) < 64.0f) return static_cast(c.point); } return -1; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 8d0a2cdf3..bfe42d6ff 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -108,7 +108,6 @@ bool editor_mode::pick_track_handle() return false; screen_projection const projection; - ImVec2 const mouse = ImGui::GetIO().MousePos; float best = kHandleRadius * kHandleRadius; editor_track::point_ref hit; for (int i = 0; i < static_cast(track->m_paths.size()); ++i) @@ -116,12 +115,7 @@ bool editor_mode::pick_track_handle() for (auto const kind : kPointKinds) { editor_track::point_ref const point{i, kind}; - ImVec2 screen; - if (false == projection.project(editor_track::point_position(*track, point), screen)) - continue; - float const dx = screen.x - mouse.x; - float const dy = screen.y - mouse.y; - float const distance = (dx * dx + dy * dy) * (editor_track::is_end(kind) ? 0.5f : 1.0f); + float const distance = projection.mouse_distance2(editor_track::point_position(*track, point)) * (editor_track::is_end(kind) ? 0.5f : 1.0f); if (distance < best) { best = distance; @@ -208,28 +202,18 @@ void editor_mode::render_track_gizmo() } bool const pointmode = ui()->mode() == nodebank_panel::TRACK && m_track_point.valid() && m_track_point.path < static_cast(track->m_paths.size()); - ImGuizmo::BeginFrame(); - ImGuizmo::SetOrthographic(Global.EditorOrtho); - ImGuiIO const &io = ImGui::GetIO(); - ImGuizmo::SetRect(0.0f, 0.0f, io.DisplaySize.x, io.DisplaySize.y); - - glm::mat4 const view = GfxRenderer->Camera_View_Matrix(); - glm::dvec3 const camerapos = GfxRenderer->Camera_Position(); - float const aspect = io.DisplaySize.y > 0.0f ? io.DisplaySize.x / io.DisplaySize.y : 1.0f; - glm::mat4 const projection = editor_mode::projection_matrix(aspect); + gizmo_frame const frame; ImGuizmo::OPERATION const operation = (false == pointmode && m_gizmo_op == gizmo_operation::rotate) ? ImGuizmo::ROTATE_Y : ImGuizmo::TRANSLATE; if (false == m_track_gizmo_using) { auto const anchor = pointmode ? editor_track::point_position(*track, m_track_point) : editor_track::pivot(*track); - m_track_gizmo = glm::translate(glm::mat4(1.0f), glm::vec3(anchor - camerapos)); + m_track_gizmo = glm::translate(glm::mat4(1.0f), glm::vec3(anchor - frame.camera)); } - glm::vec3 snapvalue(operation == ImGuizmo::ROTATE_Y ? 5.0f : m_gizmo_snap); - float const *snap = Global.ctrlState && snapvalue.x > 0.0f ? glm::value_ptr(snapvalue) : nullptr; glm::mat4 delta(1.0f); - ImGuizmo::Manipulate(glm::value_ptr(view), glm::value_ptr(projection), operation, ImGuizmo::WORLD, glm::value_ptr(m_track_gizmo), glm::value_ptr(delta), snap); + frame.manipulate(operation, m_track_gizmo, operation == ImGuizmo::ROTATE_Y ? 5.0f : m_gizmo_snap, &delta); if (ImGuizmo::IsUsing()) { @@ -269,7 +253,7 @@ void editor_mode::render_track_gizmo() } else if (pointmode) { - glm::dvec3 const position = camerapos + glm::dvec3(m_track_gizmo[3]); + glm::dvec3 const position = frame.camera + glm::dvec3(m_track_gizmo[3]); editor_track::move_point(*track, m_track_point, position); for (auto const &connection : m_track_drag_points) editor_track::move_point(*connection.first, connection.second, position); @@ -318,15 +302,19 @@ void editor_mode::commit_track_drag(bool const Force) m_track_last_commit = now; } -void editor_mode::push_track_snapshot(std::vector> States, std::vector Created) +void editor_mode::trim_history() { - if (States.empty() && Created.empty()) - return; - if (m_max_history_size >= 0 && (int)m_history.size() >= m_max_history_size) m_history.erase(m_history.begin(), m_history.begin() + ((int)m_history.size() - m_max_history_size + 1)); +} - auto *track = States.empty() ? Created.front() : States.front().first; +void editor_mode::push_track_snapshot(std::vector> States, std::vector Created, std::vector Removed) +{ + if (States.empty() && Created.empty() && Removed.empty()) + return; + + trim_history(); + auto *track = false == States.empty() ? States.front().first : false == Created.empty() ? Created.front() : Removed.front(); EditorSnapshot snap; snap.action = EditorSnapshot::Action::TrackEdit; snap.node_name = track->name(); @@ -336,6 +324,7 @@ void editor_mode::push_track_snapshot(std::vector(m_route.design.vertices.size()); ++i) { - ImVec2 screen; - if (false == projection.project(route_vertex_position(i), screen)) - continue; - float const dx = screen.x - mouse.x; - float const dy = screen.y - mouse.y; - if (dx * dx + dy * dy < best) + if (auto const distance{projection.mouse_distance2(route_vertex_position(i))}; distance < best) { - best = dx * dx + dy * dy; + best = distance; hit = i; } } int griphit{-1}; for (int i = 0; i < static_cast(m_route.result.vertex_chainages.size()) && m_route.result.length > 0.0; ++i) { - ImVec2 screen; - if (false == projection.project(alignment::evaluate(m_route.result, m_route.result.vertex_chainages[i]).position, screen)) - continue; - float const dx = screen.x - mouse.x; - float const dy = screen.y - mouse.y; - if (dx * dx + dy * dy < best) + if (auto const distance{projection.mouse_distance2(alignment::evaluate(m_route.result, m_route.result.vertex_chainages[i]).position)}; distance < best) { - best = dx * dx + dy * dy; + best = distance; griphit = i; hit = -1; } @@ -1135,21 +1113,12 @@ void editor_mode::render_route_gizmo() return; } - ImGuizmo::BeginFrame(); - ImGuizmo::SetOrthographic(Global.EditorOrtho); - ImGuiIO const &io = ImGui::GetIO(); - ImGuizmo::SetRect(0.0f, 0.0f, io.DisplaySize.x, io.DisplaySize.y); - glm::mat4 const view = GfxRenderer->Camera_View_Matrix(); - glm::dvec3 const camerapos = GfxRenderer->Camera_Position(); - float const aspect = io.DisplaySize.y > 0.0f ? io.DisplaySize.x / io.DisplaySize.y : 1.0f; - glm::mat4 const projection = editor_mode::projection_matrix(aspect); + gizmo_frame const frame; auto const position{grip ? alignment::evaluate(route.result, route.result.vertex_chainages[route.grip]).position : route_vertex_position(route.vertex)}; if (false == m_route_gizmo_using) - m_route_gizmo = glm::translate(glm::mat4(1.0f), glm::vec3(position - camerapos)); - glm::vec3 snapvalue(m_gizmo_snap); - float const *snap = Global.ctrlState && snapvalue.x > 0.0f ? glm::value_ptr(snapvalue) : nullptr; - ImGuizmo::Manipulate(glm::value_ptr(view), glm::value_ptr(projection), ImGuizmo::TRANSLATE, ImGuizmo::WORLD, glm::value_ptr(m_route_gizmo), nullptr, snap); + m_route_gizmo = glm::translate(glm::mat4(1.0f), glm::vec3(position - frame.camera)); + frame.manipulate(ImGuizmo::TRANSLATE, m_route_gizmo, m_gizmo_snap); if (false == ImGuizmo::IsUsing()) { @@ -1161,7 +1130,7 @@ void editor_mode::render_route_gizmo() return; } m_route_gizmo_using = true; - glm::dvec3 const moved{camerapos + glm::dvec3(m_route_gizmo[3])}; + glm::dvec3 const moved{frame.camera + glm::dvec3(m_route_gizmo[3])}; if (grip) { auto &vertex{route.design.vertices[route.grip]}; @@ -1812,19 +1781,13 @@ bool editor_mode::pick_straight_handle() auto const &line{current_straight()}; glm::dvec3 const handles[] = {line.start, line.end, (line.start + line.end) * 0.5}; screen_projection const projection; - ImVec2 const mouse = ImGui::GetIO().MousePos; float best = kHandleRadius * kHandleRadius; int hit{-1}; for (int i = 0; i < 3; ++i) { - ImVec2 screen; - if (false == projection.project(handles[i], screen)) - continue; - float const dx = screen.x - mouse.x; - float const dy = screen.y - mouse.y; - if (dx * dx + dy * dy < best) + if (auto const distance{projection.mouse_distance2(handles[i])}; distance < best) { - best = dx * dx + dy * dy; + best = distance; hit = i; } } @@ -1897,22 +1860,13 @@ void editor_mode::render_straight_gizmo() return; } - ImGuizmo::BeginFrame(); - ImGuizmo::SetOrthographic(Global.EditorOrtho); - ImGuiIO const &io = ImGui::GetIO(); - ImGuizmo::SetRect(0.0f, 0.0f, io.DisplaySize.x, io.DisplaySize.y); - glm::mat4 const view = GfxRenderer->Camera_View_Matrix(); - glm::dvec3 const camerapos = GfxRenderer->Camera_Position(); - float const aspect = io.DisplaySize.y > 0.0f ? io.DisplaySize.x / io.DisplaySize.y : 1.0f; - glm::mat4 const projection = editor_mode::projection_matrix(aspect); + gizmo_frame const frame; glm::dvec3 const anchors[] = {line.start, line.end, (line.start + line.end) * 0.5}; auto const anchor{anchors[state.handle]}; if (false == state.dragging) - state.gizmo = glm::translate(glm::mat4(1.0f), glm::vec3(anchor - camerapos)); - glm::vec3 snapvalue(m_gizmo_snap); - float const *snap = Global.ctrlState && snapvalue.x > 0.0f ? glm::value_ptr(snapvalue) : nullptr; - ImGuizmo::Manipulate(glm::value_ptr(view), glm::value_ptr(projection), ImGuizmo::TRANSLATE, ImGuizmo::WORLD, glm::value_ptr(state.gizmo), nullptr, snap); + state.gizmo = glm::translate(glm::mat4(1.0f), glm::vec3(anchor - frame.camera)); + frame.manipulate(ImGuizmo::TRANSLATE, state.gizmo, m_gizmo_snap); if (ImGuizmo::IsUsing()) { @@ -1944,7 +1898,7 @@ void editor_mode::render_straight_gizmo() } } auto const &grabbed{state.drag_line}; - glm::dvec3 moved{camerapos + glm::dvec3(state.gizmo[3])}; + glm::dvec3 moved{frame.camera + glm::dvec3(state.gizmo[3])}; std::function transform; if (state.handle == 2) { @@ -2250,21 +2204,14 @@ bool editor_mode::place_straight_tool() void editor_mode::render_straight_tool_gizmo() { auto &state{m_straights}; - ImGuizmo::BeginFrame(); - ImGuizmo::SetOrthographic(Global.EditorOrtho); - ImGuiIO const &io = ImGui::GetIO(); - ImGuizmo::SetRect(0.0f, 0.0f, io.DisplaySize.x, io.DisplaySize.y); - glm::mat4 const view = GfxRenderer->Camera_View_Matrix(); - glm::dvec3 const camerapos = GfxRenderer->Camera_Position(); - float const aspect = io.DisplaySize.y > 0.0f ? io.DisplaySize.x / io.DisplaySize.y : 1.0f; - glm::mat4 const projection = editor_mode::projection_matrix(aspect); + gizmo_frame const frame; if (false == state.tool_dragging) - state.tool_gizmo = glm::translate(glm::mat4(1.0f), glm::vec3(state.tool_handle - camerapos)); - ImGuizmo::Manipulate(glm::value_ptr(view), glm::value_ptr(projection), ImGuizmo::TRANSLATE, ImGuizmo::WORLD, glm::value_ptr(state.tool_gizmo), nullptr, nullptr); + state.tool_gizmo = glm::translate(glm::mat4(1.0f), glm::vec3(state.tool_handle - frame.camera)); + frame.manipulate(ImGuizmo::TRANSLATE, state.tool_gizmo, 0.0f); if (ImGuizmo::IsUsing()) { state.tool_dragging = true; - auto const moved{camerapos + glm::dvec3(state.tool_gizmo[3])}; + auto const moved{frame.camera + glm::dvec3(state.tool_gizmo[3])}; state.tool_handle = {moved.x, state.tool_handle.y, moved.z}; } else if (state.tool_dragging) @@ -2365,8 +2312,7 @@ void editor_mode::delete_selected_track() snap.node_name = track->name(); snap.position = track->location(); snap.removed = {track}; - if (m_max_history_size >= 0 && (int)m_history.size() >= m_max_history_size) - m_history.erase(m_history.begin(), m_history.begin() + ((int)m_history.size() - m_max_history_size + 1)); + trim_history(); m_history.push_back(std::move(snap)); g_redo.clear(); editor_track::retire(*track); @@ -2422,7 +2368,6 @@ bool editor_mode::start_extend() if (track == nullptr || (track->eType != tt_Normal && track->eType != tt_Switch) || false == editor_track::is_supported(*track)) return false; screen_projection const projection; - ImVec2 const mouse = ImGui::GetIO().MousePos; for (int i = 0; i < static_cast(track->m_paths.size()); ++i) { auto const &path{track->m_paths[i]}; @@ -2432,10 +2377,7 @@ bool editor_mode::start_extend() if (editor_track::is_connected(*track, point)) continue; auto const position{editor_track::point_position(*track, point)}; - ImVec2 screen; - if (false == projection.project(position, screen)) - continue; - if ((screen.x - mouse.x) * (screen.x - mouse.x) + (screen.y - mouse.y) * (screen.y - mouse.y) > kHandleRadius * kHandleRadius * 1.5f) + if (projection.mouse_distance2(position) > kHandleRadius * kHandleRadius * 1.5f) continue; auto const &start{path.points[segment_data::point::start]}; auto const &end{path.points[segment_data::point::end]}; @@ -2576,8 +2518,7 @@ void editor_mode::finish_extend() editor_track::commit({insert}); created.push_back(insert); } - push_track_snapshot(std::move(states), std::move(created)); - m_history.back().removed = std::move(removed); + push_track_snapshot(std::move(states), std::move(created), std::move(removed)); straight_refresh(); return; } @@ -2692,8 +2633,7 @@ void editor_mode::insert_switch(editor_track::straight const &Line, double const std::vector removed; if (false == place_switch_on_straight(Line, m_switch.templates[m_switch.armed], nullptr, Along, Direction, Side, true, states, created, removed)) return; - push_track_snapshot(std::move(states), std::move(created)); - m_history.back().removed = std::move(removed); + push_track_snapshot(std::move(states), std::move(created), std::move(removed)); straight_refresh(); } @@ -3408,8 +3348,7 @@ bool editor_mode::insert_double_slip(editor_track::straight const &Line, glm::dv auto const parts{build_double_slip(pointA, pointB, pointC, pointD, crossing, heightfirst(alongfirst), first, direction, angle, radius, style != nullptr ? *style : *Line.tracks.front())}; editor_track::commit(parts); created.insert(created.end(), parts.begin(), parts.end()); - push_track_snapshot(std::move(states), std::move(created)); - m_history.back().removed = std::move(removed); + push_track_snapshot(std::move(states), std::move(created), std::move(removed)); straight_refresh(); return true; } @@ -3548,8 +3487,7 @@ bool editor_mode::replace_double_slip(TTrack &Part, editor_track::switch_templat commitlist.push_back(track); editor_track::commit(commitlist); created.insert(created.end(), parts2.begin(), parts2.end()); - push_track_snapshot(std::move(states), std::move(created)); - m_history.back().removed = std::move(removed); + push_track_snapshot(std::move(states), std::move(created), std::move(removed)); straight_refresh(); return true; } @@ -3729,7 +3667,6 @@ void editor_mode::insert_curved_switch(int const Direction, int const Side) editor_track::commit({track}); created.push_back(track); } - push_track_snapshot(std::move(states), std::move(created)); - m_history.back().removed = std::move(removed); + push_track_snapshot(std::move(states), std::move(created), std::move(removed)); straight_refresh(); } diff --git a/application/editorprojection.h b/application/editorprojection.h index aa5cd45d0..f867b62d4 100644 --- a/application/editorprojection.h +++ b/application/editorprojection.h @@ -11,7 +11,11 @@ http://mozilla.org/MPL/2.0/. #include "application/editormode.h" #include "rendering/renderer.h" +#include "utilities/Globals.h" #include "imgui/imgui.h" +#include "imgui/ImGuizmo.h" + +#include // world to screen projection of the current camera, for overlays drawn with ImGui class screen_projection @@ -54,6 +58,15 @@ class screen_projection b = glm::mix(b, a, (kNear - b.w) / (a.w - b.w)); Drawlist->AddLine(screen(a), screen(b), Color, Thickness); } + // squared distance on the screen from the mouse cursor to the point, the largest float for points behind the camera + float mouse_distance2(glm::dvec3 const &Point) const + { + ImVec2 position; + if (false == project(Point, position)) + return std::numeric_limits::max(); + auto const &mouse{ImGui::GetIO().MousePos}; + return (position.x - mouse.x) * (position.x - mouse.x) + (position.y - mouse.y) * (position.y - mouse.y); + } private: static constexpr float kNear{0.1f}; @@ -61,3 +74,29 @@ class screen_projection glm::dvec3 m_camera; glm::mat4 m_viewprojection; }; + +// starts a gizmo frame over the whole display, the view and the projection are those of the current camera +struct gizmo_frame +{ + glm::mat4 view; + glm::mat4 projection; + glm::dvec3 camera; + + gizmo_frame() + { + ImGuizmo::BeginFrame(); + ImGuizmo::SetOrthographic(Global.EditorOrtho); + ImGuiIO const &io = ImGui::GetIO(); + ImGuizmo::SetRect(0.0f, 0.0f, io.DisplaySize.x, io.DisplaySize.y); + view = GfxRenderer->Camera_View_Matrix(); + camera = GfxRenderer->Camera_Position(); + projection = editor_mode::projection_matrix(io.DisplaySize.y > 0.0f ? io.DisplaySize.x / io.DisplaySize.y : 1.0f); + } + // moves the gizmo, placed at the point given in world space, with snapping to the step when ctrl is held + bool manipulate(ImGuizmo::OPERATION const Operation, glm::mat4 &Gizmo, float const Snap, glm::mat4 *Delta = nullptr) const + { + glm::vec3 snapvalue(Snap); + float const *snap = Global.ctrlState && Snap > 0.0f ? &snapvalue.x : nullptr; + return ImGuizmo::Manipulate(&view[0][0], &projection[0][0], Operation, ImGuizmo::WORLD, &Gizmo[0][0], Delta != nullptr ? &(*Delta)[0][0] : nullptr, snap); + } +}; From 0879f1528e33821f1b4da8be41be79eeaf61a3c0 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 00:43:41 +0200 Subject: [PATCH 093/430] refactor(editor): named overlay colours --- application/editormodeinfra.cpp | 2 +- application/editormodeprofile.cpp | 16 +++++----- application/editormodetrack.cpp | 52 +++++++++++++++---------------- application/editorprojection.h | 9 ++++++ 4 files changed, 44 insertions(+), 35 deletions(-) diff --git a/application/editormodeinfra.cpp b/application/editormodeinfra.cpp index 090bc3ef5..6630b8d9a 100644 --- a/application/editormodeinfra.cpp +++ b/application/editormodeinfra.cpp @@ -1358,7 +1358,7 @@ void editor_mode::draw_infra_overlay() const drawlist->AddCircleFilled(screen, Size, Colour); }; for (auto const &binding : m_bindings) - draw(binding, binding.lost ? IM_COL32(255, 60, 60, 255) : IM_COL32(90, 230, 110, 220), 3.5f); + draw(binding, binding.lost ? overlay_color::invalid : IM_COL32(90, 230, 110, 220), 3.5f); for (int i = 0; i < static_cast(state.candidates.size()); ++i) { auto const &candidate{state.candidates[i]}; diff --git a/application/editormodeprofile.cpp b/application/editormodeprofile.cpp index 84eef7935..e4dca7626 100644 --- a/application/editormodeprofile.cpp +++ b/application/editormodeprofile.cpp @@ -1060,10 +1060,10 @@ void editor_mode::render_profile_canvas() } auto const chainage{points[c.point].chainage}; ImVec2 const grip{x_of(chainage), y_of(profile::elevation(line, chainage))}; - draw->AddCircleFilled(grip, 4.5f, IM_COL32(60, 230, 90, 255), 4); + draw->AddCircleFilled(grip, 4.5f, overlay_color::grip, 4); if (static_cast(c.point) == state.curve_grip) - draw->AddCircle(grip, 9.0f, IM_COL32(255, 255, 255, 255), 12, 2.0f); - draw->AddText(ImVec2(grip.x + 7.0f, grip.y + 4.0f), IM_COL32(60, 230, 90, 255), format("R %.0f", points[c.point].radius).c_str()); + draw->AddCircle(grip, 9.0f, overlay_color::highlight, 12, 2.0f); + draw->AddText(ImVec2(grip.x + 7.0f, grip.y + 4.0f), overlay_color::grip, format("R %.0f", points[c.point].radius).c_str()); } for (int i = 0; i < static_cast(points.size()); ++i) { @@ -1073,10 +1073,10 @@ void editor_mode::render_profile_canvas() else if (points[i].joint) draw->AddQuadFilled(ImVec2(at.x, at.y - 6.0f), ImVec2(at.x + 6.0f, at.y), ImVec2(at.x, at.y + 6.0f), ImVec2(at.x - 6.0f, at.y), IM_COL32(90, 210, 230, 255)); else - draw->AddCircleFilled(at, 5.5f, IM_COL32(255, 210, 60, 255)); + draw->AddCircleFilled(at, 5.5f, overlay_color::marked); if (i == state.selected) - draw->AddCircle(at, 10.0f, IM_COL32(255, 255, 255, 255), 16, 2.0f); - draw->AddText(ImVec2(at.x + 7.0f, at.y - 18.0f), IM_COL32(255, 210, 60, 255), format("%d %.3f", i + 1, points[i].elevation).c_str()); + draw->AddCircle(at, 10.0f, overlay_color::highlight, 16, 2.0f); + draw->AddText(ImVec2(at.x + 7.0f, at.y - 18.0f), overlay_color::marked, format("%d %.3f", i + 1, points[i].elevation).c_str()); } for (auto const &issue : state.issues) { @@ -1157,8 +1157,8 @@ void editor_mode::draw_profile_overlay() const ImVec2 screen; if (false == projection.project(position, screen)) continue; - drawlist->AddCircleFilled(screen, i == state.selected ? 7.0f : 5.0f, IM_COL32(255, 210, 60, 255)); - drawlist->AddText(ImVec2(screen.x + 8.0f, screen.y - 16.0f), IM_COL32(255, 210, 60, 255), format("%d", i + 1).c_str()); + drawlist->AddCircleFilled(screen, i == state.selected ? 7.0f : 5.0f, overlay_color::marked); + drawlist->AddText(ImVec2(screen.x + 8.0f, screen.y - 16.0f), overlay_color::marked, format("%d", i + 1).c_str()); } if (state.hover >= 0.0 && state.hover <= state.route.length) { diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index bfe42d6ff..1d1be9f58 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -1056,7 +1056,7 @@ void editor_mode::draw_route_overlay() const { for (auto const &e : result.elements) { - ImU32 const color = e.kind == alignment::element_kind::straight ? IM_COL32(255, 255, 255, 230) : e.kind == alignment::element_kind::arc ? IM_COL32(60, 230, 90, 255) : IM_COL32(255, 140, 30, 255); + ImU32 const color = e.kind == alignment::element_kind::straight ? IM_COL32(255, 255, 255, 230) : e.kind == alignment::element_kind::arc ? overlay_color::grip : IM_COL32(255, 140, 30, 255); int const steps = std::clamp(static_cast(e.length / 2.0), 1, 400); auto previous{alignment::evaluate(result, e.chainage).position}; for (int j = 1; j <= steps; ++j) @@ -1067,7 +1067,7 @@ void editor_mode::draw_route_overlay() const } ImVec2 screen; if (projection.project(alignment::evaluate(result, e.chainage).position, screen)) - drawlist->AddCircleFilled(screen, 3.5f, IM_COL32(255, 255, 255, 255)); + drawlist->AddCircleFilled(screen, 3.5f, overlay_color::highlight); } } @@ -1086,19 +1086,19 @@ void editor_mode::draw_route_overlay() const ImVec2 screen; if (false == projection.project(route_vertex_position(i), screen)) continue; - drawlist->AddCircleFilled(screen, 6.0f, IM_COL32(255, 210, 60, 255)); + drawlist->AddCircleFilled(screen, 6.0f, overlay_color::marked); if (i == route.vertex) - drawlist->AddCircle(screen, 11.0f, IM_COL32(255, 255, 255, 255), 16, 2.5f); + drawlist->AddCircle(screen, 11.0f, overlay_color::highlight, 16, 2.5f); if (i < static_cast(result.vertex_chainages.size()) && result.length > 0.0 && projection.project(alignment::evaluate(result, result.vertex_chainages[i]).position, screen)) { - drawlist->AddCircleFilled(screen, 6.0f, IM_COL32(60, 230, 90, 255), 4); + drawlist->AddCircleFilled(screen, 6.0f, overlay_color::grip, 4); if (i == route.grip) - drawlist->AddCircle(screen, 11.0f, IM_COL32(255, 255, 255, 255), 16, 2.5f); + drawlist->AddCircle(screen, 11.0f, overlay_color::highlight, 16, 2.5f); auto const *report{i < static_cast(result.curves.size()) ? &result.curves[i] : nullptr}; auto const radius{report != nullptr && report->radius2 > 0.0 ? format("R %.0f / %.0f", report->radius, report->radius2) : format("R %.0f", report != nullptr ? report->radius : design.vertices[i].radius)}; - drawlist->AddText(ImVec2(screen.x + 9.0f, screen.y + 4.0f), IM_COL32(60, 230, 90, 255), radius.c_str()); + drawlist->AddText(ImVec2(screen.x + 9.0f, screen.y + 4.0f), overlay_color::grip, radius.c_str()); } - drawlist->AddText(ImVec2(screen.x + 9.0f, screen.y - 18.0f), IM_COL32(255, 210, 60, 255), format("W%d", i + 1).c_str()); + drawlist->AddText(ImVec2(screen.x + 9.0f, screen.y - 18.0f), overlay_color::marked, format("W%d", i + 1).c_str()); } } @@ -1423,20 +1423,20 @@ void editor_mode::draw_straights_overlay() const { auto const &line{m_straights.found[i]}; if (nearby(line)) - draw(line, i == m_straights.listed ? IM_COL32(40, 220, 255, 255) : IM_COL32(255, 255, 255, 110), i == m_straights.listed ? 4.0f : 2.0f); + draw(line, i == m_straights.listed ? overlay_color::selected : IM_COL32(255, 255, 255, 110), i == m_straights.listed ? 4.0f : 2.0f); } for (auto const &member : m_straights.set) draw(member, IM_COL32(255, 150, 30, 255), 4.0f); - draw(m_straights.current, IM_COL32(40, 220, 255, 255), 4.0f); + draw(m_straights.current, overlay_color::selected, 4.0f); if (m_straights.tool_placed) { auto const &state{m_straights}; auto const &line{state.tool_line}; ImVec2 screen; if (projection.project(state.tool_point, screen)) - drawlist->AddCircleFilled(screen, 7.0f, IM_COL32(255, 60, 60, 255)); + drawlist->AddCircleFilled(screen, 7.0f, overlay_color::invalid); if (projection.project(state.tool_handle, screen)) - drawlist->AddCircleFilled(screen, 7.0f, IM_COL32(255, 210, 60, 255)); + drawlist->AddCircleFilled(screen, 7.0f, overlay_color::marked); if (state.tool == 1) { auto const direction{plan_of(state.tool_handle - state.tool_point)}; @@ -1444,7 +1444,7 @@ void editor_mode::draw_straights_overlay() const { auto const unit{glm::normalize(direction)}; auto const rest{std::max(0.0, line.length - state.tool_at)}; - projection.line(drawlist, state.tool_point, state.tool_point + glm::dvec3{unit.x, line.grade, unit.y} * rest, IM_COL32(255, 210, 60, 255), 3.0f); + projection.line(drawlist, state.tool_point, state.tool_point + glm::dvec3{unit.x, line.grade, unit.y} * rest, overlay_color::marked, 3.0f); } } else @@ -1456,7 +1456,7 @@ void editor_mode::draw_straights_overlay() const auto const shifted{glm::dvec3{normal.x, 0.0, normal.y} * shift}; auto const along{glm::dvec3{line.direction.x, 0.0, line.direction.y}}; projection.line(drawlist, state.tool_point, state.tool_point + along * length + shifted, IM_COL32(255, 210, 60, 160), 2.0f); - projection.line(drawlist, state.tool_point + along * length + shifted, line.end + shifted, IM_COL32(255, 210, 60, 255), 3.0f); + projection.line(drawlist, state.tool_point + along * length + shifted, line.end + shifted, overlay_color::marked, 3.0f); } } if (m_straights.dragging && m_straights.fitting) @@ -1469,7 +1469,7 @@ void editor_mode::draw_straights_overlay() const for (int i = 1; i <= steps; ++i) { auto const next{alignment::evaluate(result, result.length * i / steps).position}; - projection.line(drawlist, previous, next, result.valid ? IM_COL32(255, 210, 60, 255) : IM_COL32(255, 60, 60, 255), 3.0f); + projection.line(drawlist, previous, next, result.valid ? overlay_color::marked : overlay_color::invalid, 3.0f); previous = next; } } @@ -1481,7 +1481,7 @@ void editor_mode::draw_straights_overlay() const for (auto const *track : member.tracks) { auto const &path{track->m_paths.front()}; - projection.line(drawlist, path.points[segment_data::point::start], path.points[segment_data::point::end], IM_COL32(255, 210, 60, 255), 3.0f); + projection.line(drawlist, path.points[segment_data::point::start], path.points[segment_data::point::end], overlay_color::marked, 3.0f); } } } @@ -1495,11 +1495,11 @@ void editor_mode::draw_straights_overlay() const if (false == projection.project(handles[i], screen)) continue; if (i < 2) - drawlist->AddRectFilled(ImVec2(screen.x - 6.0f, screen.y - 6.0f), ImVec2(screen.x + 6.0f, screen.y + 6.0f), IM_COL32(40, 220, 255, 255)); + drawlist->AddRectFilled(ImVec2(screen.x - 6.0f, screen.y - 6.0f), ImVec2(screen.x + 6.0f, screen.y + 6.0f), overlay_color::selected); else - drawlist->AddCircleFilled(screen, 6.0f, IM_COL32(40, 220, 255, 255), 4); + drawlist->AddCircleFilled(screen, 6.0f, overlay_color::selected, 4); if (i == m_straights.handle) - drawlist->AddCircle(screen, 12.0f, IM_COL32(255, 255, 255, 255), 16, 2.5f); + drawlist->AddCircle(screen, 12.0f, overlay_color::highlight, 16, 2.5f); } } auto const &line{m_straights.current}; @@ -2788,33 +2788,33 @@ void editor_mode::draw_build_overlay() const if (projection.project(target.position, screen)) drawlist->AddCircle(screen, 14.0f, IM_COL32(255, 60, 255, 255), 20, 3.0f); for (auto const &piece : extend_pieces()) - drawpath(piece, IM_COL32(255, 210, 60, 255)); + drawpath(piece, overlay_color::marked); } else if (plan_crossover(plan)) { for (auto const &piece : plan.paths) - drawpath(piece, IM_COL32(255, 210, 60, 255)); - drawpath(plan.insert, IM_COL32(60, 230, 90, 255)); + drawpath(piece, overlay_color::marked); + drawpath(plan.insert, overlay_color::grip); } else { for (auto const &piece : extend_pieces()) - drawpath(piece, IM_COL32(255, 210, 60, 255)); + drawpath(piece, overlay_color::marked); } } if (m_switch.placing) for (auto const &piece : switch_preview()) - drawpath(piece, IM_COL32(255, 210, 60, 255)); + drawpath(piece, overlay_color::marked); if (false == m_straights.detour.empty()) { auto const outline{detour_outline()}; for (std::size_t i = 0; i + 1 < outline.size(); ++i) - projection.line(drawlist, outline[i], outline[i + 1], IM_COL32(255, 210, 60, 255), 3.0f); + projection.line(drawlist, outline[i], outline[i + 1], overlay_color::marked, 3.0f); for (std::size_t i = 0; i < outline.size() && i < m_straights.detour.size(); ++i) { ImVec2 screen; if (projection.project(outline[i], screen)) - drawlist->AddCircleFilled(screen, 6.0f, IM_COL32(255, 60, 60, 255)); + drawlist->AddCircleFilled(screen, 6.0f, overlay_color::invalid); } } auto const *track{selected_track()}; diff --git a/application/editorprojection.h b/application/editorprojection.h index f867b62d4..31825b0b6 100644 --- a/application/editorprojection.h +++ b/application/editorprojection.h @@ -17,6 +17,15 @@ http://mozilla.org/MPL/2.0/. #include +namespace overlay_color +{ +ImU32 constexpr marked{IM_COL32(255, 210, 60, 255)}; +ImU32 constexpr grip{IM_COL32(60, 230, 90, 255)}; +ImU32 constexpr selected{IM_COL32(40, 220, 255, 255)}; +ImU32 constexpr invalid{IM_COL32(255, 60, 60, 255)}; +ImU32 constexpr highlight{IM_COL32(255, 255, 255, 255)}; +} // namespace overlay_color + // world to screen projection of the current camera, for overlays drawn with ImGui class screen_projection { From 1f381bbb48172134729fa7e1759982c9cd9cfd4c Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 00:45:54 +0200 Subject: [PATCH 094/430] refactor(editor): split the profile canvas into navigation, editing and drawing --- application/editormode.h | 6 + application/editormodeprofile.cpp | 317 +++++++++++++++++------------- 2 files changed, 189 insertions(+), 134 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index d099334df..25a2f0a7a 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -543,7 +543,13 @@ class editor_mode : public application_mode, private editor_track::observer void profile_apply(); void profile_fit_view(); void profile_after_undo(); + struct profile_view; void render_profile_canvas(); + void profile_fit_exaggeration(profile_view const &View); + void profile_navigate(profile_view const &View, bool const Hovered); + bool profile_canvas_edit(profile_view const &View, bool const Hovered); + void draw_profile_canvas(profile_view const &View, ImDrawList &Draw) const; + void profile_canvas_tooltip() const; void render_profile_point(); void draw_profile_overlay() const; diff --git a/application/editormodeprofile.cpp b/application/editormodeprofile.cpp index e4dca7626..e094a8866 100644 --- a/application/editormodeprofile.cpp +++ b/application/editormodeprofile.cpp @@ -796,84 +796,130 @@ void editor_mode::render_profile_point() profile_edited(); } +// screen mapping of the profile canvas, chainage across and elevation upwards +struct editor_mode::profile_view +{ + ImVec2 corner; + ImVec2 size; + float strip; + float top; + float height; + double across; + double vertical; + double from; + double centre; + + profile_view(profile_state const &State, ImVec2 const Corner, ImVec2 const Size) : + corner{Corner}, size{Size}, strip{State.show_plan ? 44.0f : 0.0f}, top{18.0f}, height{Size.y - strip - top}, + across{std::max(1.0, State.view_to - State.view_from) / Size.x}, vertical{across / State.exaggeration}, from{State.view_from}, centre{State.view_centre} + { + } + float x_of(double const Chainage) const { return corner.x + static_cast((Chainage - from) / across); } + float y_of(double const Height) const { return corner.y + top + height * 0.5f - static_cast((Height - centre) / vertical); } + double chainage_of(float const X) const { return from + (X - corner.x) * across; } + double height_of(float const Y) const { return centre - (Y - corner.y - top - height * 0.5f) * vertical; } + float plot_top() const { return corner.y + top; } + float plot_bottom() const { return corner.y + top + height; } + ImVec2 bottom_right() const { return {corner.x + size.x, corner.y + size.y}; } + float mouse_distance2(double const Chainage, double const Height) const + { + auto const &mouse{ImGui::GetIO().MousePos}; + auto const dx{x_of(Chainage) - mouse.x}; + auto const dy{y_of(Height) - mouse.y}; + return dx * dx + dy * dy; + } +}; + void editor_mode::render_profile_canvas() { auto &state{m_profile}; - auto &line{state.line}; - auto &points{line.points}; - auto const &samples{state.samples}; - ImGuiIO const &io{ImGui::GetIO()}; - auto const available{ImGui::GetContentRegionAvail()}; ImVec2 const size{std::max(200.0f, available.x), std::max(240.0f, available.y * 0.6f)}; ImVec2 const corner{ImGui::GetCursorScreenPos()}; ImGui::InvisibleButton("##profilecanvas", size); bool const hovered{ImGui::IsItemHovered()}; - ImDrawList *draw{ImGui::GetWindowDrawList()}; - float const strip{state.show_plan ? 44.0f : 0.0f}; - float const top{18.0f}; - float const height{size.y - strip - top}; - auto const width{std::max(1.0, state.view_to - state.view_from)}; - auto const across{width / size.x}; if (state.exaggeration <= 0.0f) - { - double low{std::numeric_limits::max()}, high{std::numeric_limits::lowest()}; - for (auto const &sample : samples) - { - low = std::min(low, sample.position.y); - high = std::max(high, sample.position.y); - } - for (auto const &point : points) - { - low = std::min(low, point.elevation); - high = std::max(high, point.elevation); - } - if (low > high) - low = high = 0.0; - auto const range{std::max(1.0, (high - low) * 1.3)}; - state.exaggeration = static_cast(std::clamp(across / (range / height), 1.0, 500.0)); - state.view_centre = (low + high) * 0.5; - } - auto const vertical{across / state.exaggeration}; - auto const x_of = [&](double const Chainage) { return corner.x + static_cast((Chainage - state.view_from) / across); }; - auto const y_of = [&](double const Height) { return corner.y + top + height * 0.5f - static_cast((Height - state.view_centre) / vertical); }; - auto const chainage_of = [&](float const X) { return state.view_from + (X - corner.x) * across; }; - auto const height_of = [&](float const Y) { return state.view_centre - (Y - corner.y - top - height * 0.5f) * vertical; }; - ImVec2 const mouse{io.MousePos}; + profile_fit_exaggeration(profile_view{state, corner, size}); + profile_navigate(profile_view{state, corner, size}, hovered); + profile_view const view{state, corner, size}; + if (profile_canvas_edit(view, hovered)) + profile_edited(); + state.hover = hovered ? view.chainage_of(ImGui::GetIO().MousePos.x) : -1.0; - if (hovered && io.MouseWheel != 0.0f) + auto *draw{ImGui::GetWindowDrawList()}; + draw->AddRectFilled(corner, view.bottom_right(), IM_COL32(22, 24, 28, 255)); + draw->PushClipRect(corner, view.bottom_right(), true); + draw_profile_canvas(view, *draw); + if (hovered && state.hover >= 0.0 && state.hover <= state.route.length && false == state.samples.empty()) + { + auto const x{view.x_of(state.hover)}; + draw->AddLine(ImVec2(x, view.plot_top()), ImVec2(x, view.bottom_right().y), IM_COL32(255, 255, 255, 90)); + profile_canvas_tooltip(); + } + draw->PopClipRect(); +} + +void editor_mode::profile_fit_exaggeration(profile_view const &View) +{ + auto &state{m_profile}; + double low{std::numeric_limits::max()}, high{std::numeric_limits::lowest()}; + for (auto const &sample : state.samples) + { + low = std::min(low, sample.position.y); + high = std::max(high, sample.position.y); + } + for (auto const &point : state.line.points) + { + low = std::min(low, point.elevation); + high = std::max(high, point.elevation); + } + if (low > high) + low = high = 0.0; + auto const range{std::max(1.0, (high - low) * 1.3)}; + state.exaggeration = static_cast(std::clamp(View.across / (range / View.height), 1.0, 500.0)); + state.view_centre = (low + high) * 0.5; +} + +void editor_mode::profile_navigate(profile_view const &View, bool const Hovered) +{ + auto &state{m_profile}; + ImGuiIO const &io{ImGui::GetIO()}; + if (Hovered && io.MouseWheel != 0.0f) { if (io.KeyCtrl) state.exaggeration = std::clamp(state.exaggeration * std::pow(1.2f, io.MouseWheel), 1.0f, 500.0f); else { - auto const anchor{chainage_of(mouse.x)}; + auto const anchor{View.chainage_of(io.MousePos.x)}; auto const factor{std::pow(0.8, static_cast(io.MouseWheel))}; state.view_from = anchor - (anchor - state.view_from) * factor; state.view_to = anchor + (state.view_to - anchor) * factor; } } - if (hovered && (ImGui::IsMouseClicked(1) || ImGui::IsMouseClicked(2))) + if (Hovered && (ImGui::IsMouseClicked(1) || ImGui::IsMouseClicked(2))) state.panning = true; if (state.panning) { if (ImGui::IsMouseDown(1) || ImGui::IsMouseDown(2)) { - state.view_from -= io.MouseDelta.x * across; - state.view_to -= io.MouseDelta.x * across; - state.view_centre += io.MouseDelta.y * vertical; + state.view_from -= io.MouseDelta.x * View.across; + state.view_to -= io.MouseDelta.x * View.across; + state.view_centre += io.MouseDelta.y * View.vertical; } else state.panning = false; } +} + +bool editor_mode::profile_canvas_edit(profile_view const &View, bool const Hovered) +{ + auto &state{m_profile}; + auto &line{state.line}; + auto &points{line.points}; + ImGuiIO const &io{ImGui::GetIO()}; + ImVec2 const mouse{io.MousePos}; - auto const curves{profile::curves(line)}; - auto const mouse_distance2 = [&](double Chainage, double Elevation) { - auto const dx{x_of(Chainage) - mouse.x}; - auto const dy{y_of(Elevation) - mouse.y}; - return dx * dx + dy * dy; - }; auto const hit_point = [&]() { int hit{-1}; float best{64.0f}; @@ -881,7 +927,7 @@ void editor_mode::render_profile_canvas() { if (points[i].joint) continue; - if (auto const distance{mouse_distance2(points[i].chainage, points[i].elevation)}; distance < best) + if (auto const distance{View.mouse_distance2(points[i].chainage, points[i].elevation)}; distance < best) { best = distance; hit = i; @@ -890,18 +936,18 @@ void editor_mode::render_profile_canvas() return hit; }; auto const hit_grip = [&]() { - for (auto const &c : curves) + for (auto const &c : profile::curves(line)) { if (points[c.point].joint) continue; auto const chainage{points[c.point].chainage}; - if (mouse_distance2(chainage, profile::elevation(line, chainage)) < 64.0f) + if (View.mouse_distance2(chainage, profile::elevation(line, chainage)) < 64.0f) return static_cast(c.point); } return -1; }; bool changed{false}; - if (hovered && ImGui::IsMouseClicked(0)) + if (Hovered && ImGui::IsMouseClicked(0)) { auto const point{hit_point()}; auto const grip{point < 0 ? hit_grip() : -1}; @@ -912,10 +958,10 @@ void editor_mode::render_profile_canvas() else state.selected = -1; } - if (hovered && ImGui::IsMouseDoubleClicked(0) && state.dragging < 0 && state.curve_grip < 0 && points.size() >= 2) + if (Hovered && ImGui::IsMouseDoubleClicked(0) && state.dragging < 0 && state.curve_grip < 0 && points.size() >= 2) { - auto const chainage{chainage_of(mouse.x)}; - if (chainage > points.front().chainage + 0.5 && chainage < points.back().chainage - 0.5 && std::abs(y_of(profile::elevation(line, chainage)) - mouse.y) < 12.0f) + auto const chainage{View.chainage_of(mouse.x)}; + if (chainage > points.front().chainage + 0.5 && chainage < points.back().chainage - 0.5 && std::abs(View.y_of(profile::elevation(line, chainage)) - mouse.y) < 12.0f) { std::size_t index{0}; while (index + 2 < points.size() && points[index + 1].chainage < chainage) @@ -937,13 +983,13 @@ void editor_mode::render_profile_canvas() bool const end{index == 0 || index + 1 == static_cast(points.size())}; auto const incoming{index > 0 ? profile::grade_after(line, index - 1) : 0.0}; if (false == end && false == io.KeyCtrl) - point.chainage = std::clamp(std::round(chainage_of(mouse.x) * 100.0) / 100.0, points[index - 1].chainage + 0.5, points[index + 1].chainage - 0.5); + point.chainage = std::clamp(std::round(View.chainage_of(mouse.x) * 100.0) / 100.0, points[index - 1].chainage + 0.5, points[index + 1].chainage - 0.5); if (end_locked(line, state.context, index)) ; else if (io.KeyShift && index > 0) point.elevation = points[index - 1].elevation + incoming * (point.chainage - points[index - 1].chainage); else - point.elevation = std::round(height_of(mouse.y) * 1000.0) / 1000.0; + point.elevation = std::round(View.height_of(mouse.y) * 1000.0) / 1000.0; changed = true; } else @@ -955,7 +1001,7 @@ void editor_mode::render_profile_canvas() { if (ImGui::IsMouseDown(0)) { - auto const sagitta{height_of(mouse.y) - points[state.curve_grip].elevation}; + auto const sagitta{View.height_of(mouse.y) - points[state.curve_grip].elevation}; points[state.curve_grip].radius = std::max(10.0, std::round(profile::radius_for_sagitta(line, state.curve_grip, sagitta) / 10.0) * 10.0); points[state.curve_grip].automatic = false; changed = true; @@ -965,39 +1011,43 @@ void editor_mode::render_profile_canvas() } else state.curve_grip = -1; - if ((hovered || ImGui::IsWindowFocused()) && state.selected > 0 && state.selected + 1 < static_cast(points.size()) && false == points[state.selected].joint && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Delete))) + if ((Hovered || ImGui::IsWindowFocused()) && state.selected > 0 && state.selected + 1 < static_cast(points.size()) && false == points[state.selected].joint && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Delete))) { points.erase(points.begin() + state.selected); state.selected = -1; changed = true; } - if (changed) - profile_edited(); - state.hover = hovered ? chainage_of(mouse.x) : -1.0; + return changed; +} - ImVec2 const bottomright{corner.x + size.x, corner.y + size.y}; - draw->AddRectFilled(corner, bottomright, IM_COL32(22, 24, 28, 255)); - draw->PushClipRect(corner, bottomright, true); - auto const plotbottom{corner.y + top + height}; +void editor_mode::draw_profile_canvas(profile_view const &View, ImDrawList &Draw) const +{ + auto const &state{m_profile}; + auto const &line{state.line}; + auto const &points{line.points}; + auto const &samples{state.samples}; + auto const bottomright{View.bottom_right()}; + auto const plottop{View.plot_top()}; + auto const plotbottom{View.plot_bottom()}; - auto const step{nice_step(across * 110.0)}; + auto const step{nice_step(View.across * 110.0)}; for (auto s = std::ceil((state.view_from + state.origin) / step) * step - state.origin; s <= state.view_to; s += step) { - auto const x{x_of(s)}; - draw->AddLine(ImVec2(x, corner.y + top), ImVec2(x, plotbottom), kGrid); - draw->AddText(ImVec2(x + 2.0f, corner.y + 2.0f), kLabel, profile::format_chainage(s + state.origin).c_str()); + auto const x{View.x_of(s)}; + Draw.AddLine(ImVec2(x, plottop), ImVec2(x, plotbottom), kGrid); + Draw.AddText(ImVec2(x + 2.0f, View.corner.y + 2.0f), kLabel, profile::format_chainage(s + state.origin).c_str()); } - auto const heightstep{nice_step(vertical * 45.0)}; - for (auto h = std::floor(height_of(plotbottom) / heightstep) * heightstep; h <= height_of(corner.y + top); h += heightstep) + auto const heightstep{nice_step(View.vertical * 45.0)}; + for (auto h = std::floor(View.height_of(plotbottom) / heightstep) * heightstep; h <= View.height_of(plottop); h += heightstep) { - auto const y{y_of(h)}; - draw->AddLine(ImVec2(corner.x, y), ImVec2(bottomright.x, y), kGrid); - draw->AddText(ImVec2(corner.x + 2.0f, y - 14.0f), kLabel, format("%.1f", h).c_str()); + auto const y{View.y_of(h)}; + Draw.AddLine(ImVec2(View.corner.x, y), ImVec2(bottomright.x, y), kGrid); + Draw.AddText(ImVec2(View.corner.x + 2.0f, y - 14.0f), kLabel, format("%.1f", h).c_str()); } for (auto const &zone : state.context.switches) { - draw->AddRectFilled(ImVec2(x_of(zone.from), corner.y + top), ImVec2(std::max(x_of(zone.to), x_of(zone.from) + 2.0f), plotbottom), kSwitch); - draw->AddText(ImVec2(x_of(zone.from) + 2.0f, corner.y + top + 2.0f), IM_COL32(200, 160, 255, 220), zone.name.c_str()); + Draw.AddRectFilled(ImVec2(View.x_of(zone.from), plottop), ImVec2(std::max(View.x_of(zone.to), View.x_of(zone.from) + 2.0f), plotbottom), kSwitch); + Draw.AddText(ImVec2(View.x_of(zone.from) + 2.0f, plottop + 2.0f), IM_COL32(200, 160, 255, 220), zone.name.c_str()); } auto const polyline = [&](auto const &Height, ImU32 const Colour, float const Thickness) { @@ -1006,18 +1056,18 @@ void editor_mode::render_profile_canvas() float lastx{-1e9f}; for (std::size_t i = 0; i < samples.size(); ++i) { - auto const x{x_of(samples[i].chainage)}; + auto const x{View.x_of(samples[i].chainage)}; auto const h{Height(i)}; - if (std::isnan(h) || x < corner.x - 50.0f || x > bottomright.x + 50.0f) + if (std::isnan(h) || x < View.corner.x - 50.0f || x > bottomright.x + 50.0f) { open = false; continue; } if (open && x - lastx < 1.0f && i + 1 < samples.size()) continue; - ImVec2 const next{x, y_of(h)}; + ImVec2 const next{x, View.y_of(h)}; if (open) - draw->AddLine(previous, next, Colour, Thickness); + Draw.AddLine(previous, next, Colour, Thickness); previous = next; lastx = x; open = true; @@ -1029,102 +1079,101 @@ void editor_mode::render_profile_canvas() polyline([&](std::size_t const I) { return samples[I].position.y; }, kTrack, 1.5f); for (std::size_t i = 0; i + 1 < points.size(); ++i) - draw->AddLine(ImVec2(x_of(points[i].chainage), y_of(points[i].elevation)), ImVec2(x_of(points[i + 1].chainage), y_of(points[i + 1].elevation)), kTangents, 1.0f); + Draw.AddLine(ImVec2(View.x_of(points[i].chainage), View.y_of(points[i].elevation)), ImVec2(View.x_of(points[i + 1].chainage), View.y_of(points[i + 1].elevation)), kTangents, 1.0f); { - auto const from{std::max(points.front().chainage, chainage_of(corner.x))}; - auto const to{std::min(points.back().chainage, chainage_of(bottomright.x))}; - ImVec2 previous{x_of(from), y_of(profile::elevation(line, from))}; - for (auto x = previous.x + 2.0f; x <= x_of(to) + 2.0f; x += 2.0f) + auto const from{std::max(points.front().chainage, View.chainage_of(View.corner.x))}; + auto const to{std::min(points.back().chainage, View.chainage_of(bottomright.x))}; + ImVec2 previous{View.x_of(from), View.y_of(profile::elevation(line, from))}; + for (auto x = previous.x + 2.0f; x <= View.x_of(to) + 2.0f; x += 2.0f) { - auto const chainage{std::min(to, chainage_of(x))}; - ImVec2 const next{x_of(chainage), y_of(profile::elevation(line, chainage))}; - draw->AddLine(previous, next, kGradeLine, 2.5f); + auto const chainage{std::min(to, View.chainage_of(x))}; + ImVec2 const next{View.x_of(chainage), View.y_of(profile::elevation(line, chainage))}; + Draw.AddLine(previous, next, kGradeLine, 2.5f); previous = next; } } for (std::size_t i = 0; i + 1 < points.size(); ++i) { auto const middle{(points[i].chainage + points[i + 1].chainage) * 0.5}; - auto const x{x_of(middle)}; - if (x_of(points[i + 1].chainage) - x_of(points[i].chainage) < 70.0f) + auto const x{View.x_of(middle)}; + if (View.x_of(points[i + 1].chainage) - View.x_of(points[i].chainage) < 70.0f) continue; auto const text{format("%+.2f o/oo L %.1f", profile::grade_after(line, i) * 1000.0, points[i + 1].chainage - points[i].chainage)}; - draw->AddText(ImVec2(x - 40.0f, y_of(profile::elevation(line, middle)) - 30.0f), kGradeLine, text.c_str()); + Draw.AddText(ImVec2(x - 40.0f, View.y_of(profile::elevation(line, middle)) - 30.0f), kGradeLine, text.c_str()); } - for (auto const &c : curves) + for (auto const &c : profile::curves(line)) { for (auto const at : {c.start, c.end}) { - auto const y{y_of(profile::elevation(line, at))}; - draw->AddLine(ImVec2(x_of(at), y - 7.0f), ImVec2(x_of(at), y + 7.0f), kGradeLine, 1.5f); + auto const y{View.y_of(profile::elevation(line, at))}; + Draw.AddLine(ImVec2(View.x_of(at), y - 7.0f), ImVec2(View.x_of(at), y + 7.0f), kGradeLine, 1.5f); } auto const chainage{points[c.point].chainage}; - ImVec2 const grip{x_of(chainage), y_of(profile::elevation(line, chainage))}; - draw->AddCircleFilled(grip, 4.5f, overlay_color::grip, 4); + ImVec2 const grip{View.x_of(chainage), View.y_of(profile::elevation(line, chainage))}; + Draw.AddCircleFilled(grip, 4.5f, overlay_color::grip, 4); if (static_cast(c.point) == state.curve_grip) - draw->AddCircle(grip, 9.0f, overlay_color::highlight, 12, 2.0f); - draw->AddText(ImVec2(grip.x + 7.0f, grip.y + 4.0f), overlay_color::grip, format("R %.0f", points[c.point].radius).c_str()); + Draw.AddCircle(grip, 9.0f, overlay_color::highlight, 12, 2.0f); + Draw.AddText(ImVec2(grip.x + 7.0f, grip.y + 4.0f), overlay_color::grip, format("R %.0f", points[c.point].radius).c_str()); } for (int i = 0; i < static_cast(points.size()); ++i) { - ImVec2 const at{x_of(points[i].chainage), y_of(points[i].elevation)}; + ImVec2 const at{View.x_of(points[i].chainage), View.y_of(points[i].elevation)}; if (i == 0 || i + 1 == static_cast(points.size())) - draw->AddRectFilled(ImVec2(at.x - 5.0f, at.y - 5.0f), ImVec2(at.x + 5.0f, at.y + 5.0f), IM_COL32(70, 140, 255, 255)); + Draw.AddRectFilled(ImVec2(at.x - 5.0f, at.y - 5.0f), ImVec2(at.x + 5.0f, at.y + 5.0f), IM_COL32(70, 140, 255, 255)); else if (points[i].joint) - draw->AddQuadFilled(ImVec2(at.x, at.y - 6.0f), ImVec2(at.x + 6.0f, at.y), ImVec2(at.x, at.y + 6.0f), ImVec2(at.x - 6.0f, at.y), IM_COL32(90, 210, 230, 255)); + Draw.AddQuadFilled(ImVec2(at.x, at.y - 6.0f), ImVec2(at.x + 6.0f, at.y), ImVec2(at.x, at.y + 6.0f), ImVec2(at.x - 6.0f, at.y), IM_COL32(90, 210, 230, 255)); else - draw->AddCircleFilled(at, 5.5f, overlay_color::marked); + Draw.AddCircleFilled(at, 5.5f, overlay_color::marked); if (i == state.selected) - draw->AddCircle(at, 10.0f, overlay_color::highlight, 16, 2.0f); - draw->AddText(ImVec2(at.x + 7.0f, at.y - 18.0f), overlay_color::marked, format("%d %.3f", i + 1, points[i].elevation).c_str()); + Draw.AddCircle(at, 10.0f, overlay_color::highlight, 16, 2.0f); + Draw.AddText(ImVec2(at.x + 7.0f, at.y - 18.0f), overlay_color::marked, format("%d %.3f", i + 1, points[i].elevation).c_str()); } for (auto const &issue : state.issues) { - auto const x{x_of(issue.chainage)}; - auto const colour{issue.error ? kError : kWarning}; - draw->AddTriangleFilled(ImVec2(x - 5.0f, corner.y + top), ImVec2(x + 5.0f, corner.y + top), ImVec2(x, corner.y + top + 8.0f), colour); + auto const x{View.x_of(issue.chainage)}; + Draw.AddTriangleFilled(ImVec2(x - 5.0f, plottop), ImVec2(x + 5.0f, plottop), ImVec2(x, plottop + 8.0f), issue.error ? kError : kWarning); } if (state.show_plan && false == samples.empty()) { - auto const middle{plotbottom + strip * 0.5f}; - draw->AddLine(ImVec2(corner.x, plotbottom), ImVec2(bottomright.x, plotbottom), IM_COL32(255, 255, 255, 60)); - draw->AddLine(ImVec2(corner.x, middle), ImVec2(bottomright.x, middle), IM_COL32(255, 255, 255, 40)); + auto const middle{plotbottom + View.strip * 0.5f}; + Draw.AddLine(ImVec2(View.corner.x, plotbottom), ImVec2(bottomright.x, plotbottom), IM_COL32(255, 255, 255, 60)); + Draw.AddLine(ImVec2(View.corner.x, middle), ImVec2(bottomright.x, middle), IM_COL32(255, 255, 255, 40)); ImVec2 previous{}; bool open{false}; float lastx{-1e9f}; for (std::size_t i = 0; i < samples.size(); ++i) { - auto const x{x_of(samples[i].chainage)}; - if (x < corner.x - 50.0f || x > bottomright.x + 50.0f || (open && x - lastx < 1.0f)) + auto const x{View.x_of(samples[i].chainage)}; + if (x < View.corner.x - 50.0f || x > bottomright.x + 50.0f || (open && x - lastx < 1.0f)) continue; - ImVec2 const next{x, middle - std::clamp(static_cast(samples[i].curvature * 300.0 * strip * 0.4), -strip * 0.45f, strip * 0.45f)}; + ImVec2 const next{x, middle - std::clamp(static_cast(samples[i].curvature * 300.0 * View.strip * 0.4), -View.strip * 0.45f, View.strip * 0.45f)}; if (open) - draw->AddLine(previous, next, IM_COL32(120, 190, 255, 255), 1.5f); + Draw.AddLine(previous, next, IM_COL32(120, 190, 255, 255), 1.5f); previous = next; lastx = x; open = true; } - draw->AddText(ImVec2(corner.x + 2.0f, plotbottom + 1.0f), kLabel, "plan: curvature (up: left)"); + Draw.AddText(ImVec2(View.corner.x + 2.0f, plotbottom + 1.0f), kLabel, "plan: curvature (up: left)"); } - if (hovered && state.hover >= 0.0 && state.hover <= state.route.length && false == samples.empty()) - { - auto const x{x_of(state.hover)}; - draw->AddLine(ImVec2(x, corner.y + top), ImVec2(x, bottomright.y), IM_COL32(255, 255, 255, 90)); - auto const designed{profile::elevation(line, state.hover)}; - auto const existing{editor_track::sampled_elevation(samples, state.hover)}; - ImGui::BeginTooltip(); - ImGui::Text("km %s", profile::format_chainage(state.hover + state.origin).c_str()); - ImGui::Text("Grade line %.3f m, %+.2f per mille", designed, profile::grade(line, state.hover) * 1000.0); - ImGui::Text("Track %.3f m (%+.3f), %+.2f per mille", existing, existing - designed, editor_track::sampled_grade(samples, state.hover) * 1000.0); - auto const next{std::lower_bound(samples.begin(), samples.end(), state.hover, [](editor_track::route_sample const &Sample, double const Value) { return Sample.chainage < Value; })}; - auto const index{static_cast(std::distance(samples.begin(), std::min(next, std::prev(samples.end()))))}; - if (index < state.terrain.size() && false == std::isnan(state.terrain[index])) - ImGui::Text("Terrain %.3f m, %s %.2f m", state.terrain[index], designed > state.terrain[index] ? "fill" : "cut", std::abs(designed - state.terrain[index])); - auto const &span{state.route.spans[samples[index].span]}; - ImGui::TextDisabled("%s%s", span.track->name().c_str(), span.track->eType != tt_Normal ? " (switch, tilted as a whole with its branch)" : ""); - ImGui::EndTooltip(); - } - draw->PopClipRect(); +} + +void editor_mode::profile_canvas_tooltip() const +{ + auto const &state{m_profile}; + auto const &samples{state.samples}; + auto const designed{profile::elevation(state.line, state.hover)}; + auto const existing{editor_track::sampled_elevation(samples, state.hover)}; + ImGui::BeginTooltip(); + ImGui::Text("km %s", profile::format_chainage(state.hover + state.origin).c_str()); + ImGui::Text("Grade line %.3f m, %+.2f per mille", designed, profile::grade(state.line, state.hover) * 1000.0); + ImGui::Text("Track %.3f m (%+.3f), %+.2f per mille", existing, existing - designed, editor_track::sampled_grade(samples, state.hover) * 1000.0); + auto const next{std::lower_bound(samples.begin(), samples.end(), state.hover, [](editor_track::route_sample const &Sample, double const Value) { return Sample.chainage < Value; })}; + auto const index{static_cast(std::distance(samples.begin(), std::min(next, std::prev(samples.end()))))}; + if (index < state.terrain.size() && false == std::isnan(state.terrain[index])) + ImGui::Text("Terrain %.3f m, %s %.2f m", state.terrain[index], designed > state.terrain[index] ? "fill" : "cut", std::abs(designed - state.terrain[index])); + auto const &span{state.route.spans[samples[index].span]}; + ImGui::TextDisabled("%s%s", span.track->name().c_str(), span.track->eType != tt_Normal ? " (switch, tilted as a whole with its branch)" : ""); + ImGui::EndTooltip(); } void editor_mode::draw_profile_overlay() const From c95c37408252adb1b31214f7f2eaa177c82bc2fe Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 00:47:00 +0200 Subject: [PATCH 095/430] refactor(editor): split the route design panel --- application/editormode.h | 5 + application/editormodetrack.cpp | 183 +++++++++++++++++++------------- 2 files changed, 114 insertions(+), 74 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index 25a2f0a7a..6a868119c 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -316,6 +316,11 @@ class editor_mode : public application_mode, private editor_track::observer int grip{-1}; }; void render_route_ui(); + void render_route_ends(); + bool render_route_parameters(); + bool render_route_vertices(); + bool render_route_vertex(int const Index); + void render_route_result(); void route_reset(); void route_bind_ends(); bool route_from_curve(TTrack &Track); diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 1d1be9f58..67d78db93 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -1163,12 +1163,34 @@ void editor_mode::render_route_gizmo() void editor_mode::render_route_ui() { - auto &route{m_route}; - auto &design{route.design}; ImGui::TextDisabled("LMB on a curve: loads the whole curve between the adjoining straights.\n" "The ends of the curve and their directions stay fixed.\n" "LMB on a vertex (W1, W2...): moves it with the gizmo Esc: release the vertex"); + render_route_ends(); + auto &route{m_route}; + if (route.chain.tracks.empty()) + return; + + ImGui::Text("Fragment: %zu paths, %.2f m", route.chain.tracks.size(), route.chain.length); + ImGui::SameLine(); + if (ImGui::SmallButton("Reset design")) + { + route_reset(); + return; + } + auto changed{render_route_parameters()}; + changed |= render_route_vertices(); + if (changed) + route_update(); + + ImGui::Separator(); + render_route_result(); +} + +void editor_mode::render_route_ends() +{ + auto &route{m_route}; auto *track = selected_track(); auto const name = [](TTrack const *Track) { return Track == nullptr ? std::string{"-"} : (Track->name().empty() ? std::string{"(noname)"} : Track->name()); }; ImGui::Text("First path: %s", name(route.from).c_str()); @@ -1191,17 +1213,11 @@ void editor_mode::render_route_ui() } if (false == route.error.empty()) ImGui::TextColored(ImVec4(1.0f, 0.35f, 0.3f, 1.0f), "%s", route.error.c_str()); - if (route.chain.tracks.empty()) - return; - - ImGui::Text("Fragment: %zu paths, %.2f m", route.chain.tracks.size(), route.chain.length); - ImGui::SameLine(); - if (ImGui::SmallButton("Reset design")) - { - route_reset(); - return; - } +} +bool editor_mode::render_route_parameters() +{ + auto &design{m_route.design}; bool changed{false}; ImGui::PushItemWidth(120.0f); changed |= ImGui::InputDouble("Design speed (km/h)", &design.speed, 0.0, 0.0, "%.0f"); @@ -1236,7 +1252,14 @@ void editor_mode::render_route_ui() norms.jerk = std::max(0.01, norms.jerk); ImGui::TreePop(); } + return changed; +} +bool editor_mode::render_route_vertices() +{ + auto &route{m_route}; + auto &design{route.design}; + bool changed{false}; auto &vertices{design.vertices}; if (ImGui::Button("Add vertex")) { @@ -1281,70 +1304,83 @@ void editor_mode::render_route_ui() auto const count{static_cast(vertices.size())}; for (int i = 0; i < count; ++i) { - auto &vertex{vertices[i]}; ImGui::PushID(i); - if (ImGui::Selectable(format("Vertex W%d", i + 1).c_str(), route.vertex == i)) - route.vertex = (route.vertex == i ? -1 : i); - ImGui::Indent(); - ImGui::PushItemWidth(110.0f); - if (count == 1) - ImGui::TextDisabled("At the intersection of the end tangents"); - else if (i == 0) - changed |= ImGui::InputDouble("Distance from the start (m)", &vertex.offset, 0.0, 0.0, "%.2f"); - else if (i == count - 1) - changed |= ImGui::InputDouble("Distance from the end (m)", &vertex.offset, 0.0, 0.0, "%.2f"); - else - { - ImGui::PushItemWidth(220.0f); - changed |= ImGui::InputScalarN("Position (x, z)", ImGuiDataType_Double, glm::value_ptr(vertex.position), 2, nullptr, nullptr, "%.2f"); - ImGui::PopItemWidth(); - } - changed |= ImGui::InputDouble(vertex.compound ? "Radius R1 (m)" : "Radius R (m)", &vertex.radius, 0.0, 0.0, "%.1f"); - changed |= ImGui::Checkbox("Compound curve (two radii)", &vertex.compound); - if (vertex.compound) - { - changed |= ImGui::InputDouble("Radius R2 (m)", &vertex.radius2, 0.0, 0.0, "%.1f"); - changed |= ImGui::InputDouble("Transition R1-R2 (m)", &vertex.transition_middle, 0.0, 0.0, "%.1f"); - float split{static_cast(vertex.split)}; - if (ImGui::SliderFloat("Share of R1", &split, 0.0f, 1.0f, "%.2f")) - { - vertex.split = split; - changed = true; - } - vertex.radius2 = std::max(1.0, vertex.radius2); - vertex.transition_middle = std::max(0.0, vertex.transition_middle); - } - changed |= ImGui::InputDouble("Transition in (m)", &vertex.transition_in, 0.0, 0.0, "%.1f"); - changed |= ImGui::InputDouble("Transition out (m)", &vertex.transition_out, 0.0, 0.0, "%.1f"); - changed |= ImGui::InputDouble("Cant (mm)", &vertex.cant, 0.0, 0.0, "%.0f"); - changed |= ImGui::Checkbox("Turn the longer way (over 180 deg)", &vertex.reverse_turn); - ImGui::PopItemWidth(); - vertex.radius = std::max(1.0, vertex.radius); - vertex.transition_in = std::max(0.0, vertex.transition_in); - vertex.transition_out = std::max(0.0, vertex.transition_out); - vertex.cant = std::max(0.0, vertex.cant); - if (ImGui::SmallButton("Apply recommended for V")) - { - route_recommend(vertex); - changed = true; - } - - auto const recommended{alignment::recommend(design.speed, vertex.radius, design.norms)}; - ImGui::TextDisabled("For %.0f km/h: R min %.0f m, cant %.0f mm (equilibrium %.0f, min %.0f), transition %.0f m", design.speed, recommended.radius_min, recommended.cant, recommended.cant_equilibrium, recommended.cant_min, recommended.transition); - for (auto const &curve : route.result.curves) - { - if (curve.vertex != i) - continue; - ImGui::Text("Deflection %.4f deg, tangents %.2f / %.2f m, arc %.2f m", glm::degrees(curve.deflection), curve.tangent_in, curve.tangent_out, curve.arc_length); - ImGui::Text("Unbalanced acc. %.3f m/s2, cant rate %.1f / %.1f mm/s, acc. rate %.3f / %.3f m/s3", curve.unbalanced, curve.cant_rate_in, curve.cant_rate_out, curve.jerk_in, curve.jerk_out); - } - ImGui::Unindent(); + changed |= render_route_vertex(i); ImGui::PopID(); } - if (changed) - route_update(); + return changed; +} - ImGui::Separator(); +bool editor_mode::render_route_vertex(int const Index) +{ + auto &route{m_route}; + auto &design{route.design}; + auto &vertex{design.vertices[Index]}; + auto const count{static_cast(design.vertices.size())}; + bool changed{false}; + if (ImGui::Selectable(format("Vertex W%d", Index + 1).c_str(), route.vertex == Index)) + route.vertex = (route.vertex == Index ? -1 : Index); + ImGui::Indent(); + ImGui::PushItemWidth(110.0f); + if (count == 1) + ImGui::TextDisabled("At the intersection of the end tangents"); + else if (Index == 0) + changed |= ImGui::InputDouble("Distance from the start (m)", &vertex.offset, 0.0, 0.0, "%.2f"); + else if (Index == count - 1) + changed |= ImGui::InputDouble("Distance from the end (m)", &vertex.offset, 0.0, 0.0, "%.2f"); + else + { + ImGui::PushItemWidth(220.0f); + changed |= ImGui::InputScalarN("Position (x, z)", ImGuiDataType_Double, glm::value_ptr(vertex.position), 2, nullptr, nullptr, "%.2f"); + ImGui::PopItemWidth(); + } + changed |= ImGui::InputDouble(vertex.compound ? "Radius R1 (m)" : "Radius R (m)", &vertex.radius, 0.0, 0.0, "%.1f"); + changed |= ImGui::Checkbox("Compound curve (two radii)", &vertex.compound); + if (vertex.compound) + { + changed |= ImGui::InputDouble("Radius R2 (m)", &vertex.radius2, 0.0, 0.0, "%.1f"); + changed |= ImGui::InputDouble("Transition R1-R2 (m)", &vertex.transition_middle, 0.0, 0.0, "%.1f"); + float split{static_cast(vertex.split)}; + if (ImGui::SliderFloat("Share of R1", &split, 0.0f, 1.0f, "%.2f")) + { + vertex.split = split; + changed = true; + } + vertex.radius2 = std::max(1.0, vertex.radius2); + vertex.transition_middle = std::max(0.0, vertex.transition_middle); + } + changed |= ImGui::InputDouble("Transition in (m)", &vertex.transition_in, 0.0, 0.0, "%.1f"); + changed |= ImGui::InputDouble("Transition out (m)", &vertex.transition_out, 0.0, 0.0, "%.1f"); + changed |= ImGui::InputDouble("Cant (mm)", &vertex.cant, 0.0, 0.0, "%.0f"); + changed |= ImGui::Checkbox("Turn the longer way (over 180 deg)", &vertex.reverse_turn); + ImGui::PopItemWidth(); + vertex.radius = std::max(1.0, vertex.radius); + vertex.transition_in = std::max(0.0, vertex.transition_in); + vertex.transition_out = std::max(0.0, vertex.transition_out); + vertex.cant = std::max(0.0, vertex.cant); + if (ImGui::SmallButton("Apply recommended for V")) + { + route_recommend(vertex); + changed = true; + } + + auto const recommended{alignment::recommend(design.speed, vertex.radius, design.norms)}; + ImGui::TextDisabled("For %.0f km/h: R min %.0f m, cant %.0f mm (equilibrium %.0f, min %.0f), transition %.0f m", design.speed, recommended.radius_min, recommended.cant, recommended.cant_equilibrium, recommended.cant_min, recommended.transition); + for (auto const &curve : route.result.curves) + { + if (curve.vertex != Index) + continue; + ImGui::Text("Deflection %.4f deg, tangents %.2f / %.2f m, arc %.2f m", glm::degrees(curve.deflection), curve.tangent_in, curve.tangent_out, curve.arc_length); + ImGui::Text("Unbalanced acc. %.3f m/s2, cant rate %.1f / %.1f mm/s, acc. rate %.3f / %.3f m/s3", curve.unbalanced, curve.cant_rate_in, curve.cant_rate_out, curve.jerk_in, curve.jerk_out); + } + ImGui::Unindent(); + return changed; +} + +void editor_mode::render_route_result() +{ + auto const &route{m_route}; + auto const &design{route.design}; auto const &result{route.result}; if (result.length > 0.0) { @@ -1381,8 +1417,7 @@ void editor_mode::render_route_ui() { ImGui::SameLine(); ImGui::TextUnformatted(route.status.c_str()); - } -} + }} editor_track::straight const &editor_mode::current_straight() { From eb5b2e891914973d0ee686770562cd456d4fce52 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 00:48:00 +0200 Subject: [PATCH 096/430] refactor(editor): split the infrastructure window --- application/editormode.h | 4 ++ application/editormodeinfra.cpp | 99 +++++++++++++++++++-------------- 2 files changed, 62 insertions(+), 41 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index 6a868119c..4207a1178 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -607,6 +607,10 @@ class editor_mode : public application_mode, private editor_track::observer void infra_move(infra::binding &Binding); void infra_attach(EditorSnapshot &Snapshot); void render_infra_window(); + void infra_rebase(); + void render_infra_search(); + void render_infra_candidates(); + void render_infra_bound(); void draw_infra_overlay() const; bool m_route_gizmo_using{false}; diff --git a/application/editormodeinfra.cpp b/application/editormodeinfra.cpp index 6630b8d9a..c099bdb85 100644 --- a/application/editormodeinfra.cpp +++ b/application/editormodeinfra.cpp @@ -1137,31 +1137,7 @@ void editor_mode::render_infra_window() { state.follow = follow; if (follow) - { - // what changed in the meantime becomes the new starting point - for (auto &binding : m_bindings) - { - std::vector points; - std::optional yaw; - if (false == alive(binding) || false == object_points(binding, points, yaw) || points.size() != binding.anchors.size()) - continue; - for (std::size_t i = 0; i < points.size(); ++i) - { - auto &anchor{binding.anchors[i]}; - if (anchor.at.track == nullptr || anchor.at.track->m_editorremoved || anchor.at.path >= static_cast(anchor.at.track->m_paths.size())) - { - binding.lost = true; - continue; - } - double s; - bool interior; - infra::project(anchor.at.track->m_paths[anchor.at.path], points[i], s, interior); - anchor = infra::make_anchor({anchor.at.track, anchor.at.path, s}, points[i]); - } - if (binding.turns && yaw.has_value()) - binding.yaw = turn_of(binding, *yaw); - } - } + infra_rebase(); } if (ImGui::IsItemHovered()) ImGui::SetTooltip("Bound objects keep their chainage along the path, the offset from its axis and the height above the rail top;\n" @@ -1176,6 +1152,46 @@ void editor_mode::render_infra_window() } ImGui::Separator(); + render_infra_search(); + render_infra_candidates(); + render_infra_bound(); + if (false == state.error.empty()) + ImGui::TextColored(ImVec4(1.f, 0.4f, 0.35f, 1.f), "%s", state.error.c_str()); + else if (false == state.status.empty()) + ImGui::TextWrapped("%s", state.status.c_str()); + ImGui::End(); +} + +// what changed while the bindings did not follow the track becomes their new starting point +void editor_mode::infra_rebase() +{ + for (auto &binding : m_bindings) + { + std::vector points; + std::optional yaw; + if (false == alive(binding) || false == object_points(binding, points, yaw) || points.size() != binding.anchors.size()) + continue; + for (std::size_t i = 0; i < points.size(); ++i) + { + auto &anchor{binding.anchors[i]}; + if (anchor.at.track == nullptr || anchor.at.track->m_editorremoved || anchor.at.path >= static_cast(anchor.at.track->m_paths.size())) + { + binding.lost = true; + continue; + } + double s; + bool interior; + infra::project(anchor.at.track->m_paths[anchor.at.path], points[i], s, interior); + anchor = infra::make_anchor({anchor.at.track, anchor.at.path, s}, points[i]); + } + if (binding.turns && yaw.has_value()) + binding.yaw = turn_of(binding, *yaw); + } +} + +void editor_mode::render_infra_search() +{ + auto &state{m_infra}; static char const *const scopes[] = {"Selected path", "Line through the selected path", "Route of the vertical profile", "Whole scenery"}; ImGui::SetNextItemWidth(260.f); ImGui::Combo("Look along", &state.scope, scopes, IM_ARRAYSIZE(scopes)); @@ -1209,7 +1225,17 @@ void editor_mode::render_infra_window() if (ImGui::Button("Find objects")) infra_recognize(); +} + +void editor_mode::render_infra_candidates() +{ + auto &state{m_infra}; auto &candidates{state.candidates}; + auto const choose = [&](std::optional const Group, bool const Chosen) { + for (auto &candidate : candidates) + if (false == Group.has_value() || candidate.binding.group == *Group) + candidate.chosen = Chosen && false == candidate.bound; + }; state.hovered = -1; if (false == candidates.empty()) { @@ -1221,12 +1247,10 @@ void editor_mode::render_infra_window() infra_bind_chosen(); ImGui::SameLine(); if (ImGui::SmallButton("All")) - for (auto &candidate : candidates) - candidate.chosen = (false == candidate.bound); + choose({}, true); ImGui::SameLine(); if (ImGui::SmallButton("None")) - for (auto &candidate : candidates) - candidate.chosen = false; + choose({}, false); ImGui::BeginChild("##infracandidates", ImVec2(0.f, 260.f), true); for (auto const group : infra::categories()) @@ -1239,14 +1263,10 @@ void editor_mode::render_infra_window() ImGui::PopStyleColor(); ImGui::SameLine(); if (ImGui::SmallButton((std::string{"all##g"} + infra::name(group)).c_str())) - for (auto &candidate : candidates) - if (candidate.binding.group == group) - candidate.chosen = (false == candidate.bound); + choose(group, true); ImGui::SameLine(); if (ImGui::SmallButton((std::string{"none##g"} + infra::name(group)).c_str())) - for (auto &candidate : candidates) - if (candidate.binding.group == group) - candidate.chosen = false; + choose(group, false); if (false == open) continue; // the candidates are sorted by the category @@ -1282,7 +1302,10 @@ void editor_mode::render_infra_window() } ImGui::EndChild(); } +} +void editor_mode::render_infra_bound() +{ if (ImGui::TreeNode("Bound objects along the scope")) { auto const scope{infra_scope()}; @@ -1323,12 +1346,6 @@ void editor_mode::render_infra_window() infra_unbind({*unbind}); ImGui::TreePop(); } - - if (false == state.error.empty()) - ImGui::TextColored(ImVec4(1.f, 0.4f, 0.35f, 1.f), "%s", state.error.c_str()); - else if (false == state.status.empty()) - ImGui::TextWrapped("%s", state.status.c_str()); - ImGui::End(); } void editor_mode::draw_infra_overlay() const From 21082c4a5f658d22fa27809b9707166b323ba6f2 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 00:48:42 +0200 Subject: [PATCH 097/430] refactor(editor): split the vertical profile window --- application/editormode.h | 3 ++ application/editormodeprofile.cpp | 84 +++++++++++++++++++------------ 2 files changed, 54 insertions(+), 33 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index 4207a1178..28b56aa96 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -540,6 +540,9 @@ class editor_mode : public application_mode, private editor_track::observer void profile_open_stored(std::size_t const Index); void profile_edited(); void render_profile_window(); + void render_profile_source(); + bool render_profile_parameters(); + void render_profile_issues(); void profile_open(TTrack *From, TTrack *To); void profile_open_run(TTrack &Track); void profile_resample(); diff --git a/application/editormodeprofile.cpp b/application/editormodeprofile.cpp index e094a8866..98f45a964 100644 --- a/application/editormodeprofile.cpp +++ b/application/editormodeprofile.cpp @@ -537,6 +537,48 @@ void editor_mode::render_profile_window() ImGui::End(); return; } + render_profile_source(); + if (state.route.spans.empty()) + { + ImGui::TextDisabled("Select a path in the viewport, then build the route along the line, or set its start and end paths (switches are passed through)"); + if (state.picked_from != nullptr) + ImGui::Text("Start: %s", state.picked_from->name().c_str()); + if (false == state.error.empty()) + ImGui::TextColored(ImVec4(1.0f, 0.4f, 0.3f, 1.0f), "%s", state.error.c_str()); + ImGui::End(); + return; + } + ImGui::Text("Route: %zu paths, %.2f m, %s ... %s", state.route.spans.size(), state.route.length, state.route.spans.front().track->name().c_str(), state.route.spans.back().track->name().c_str()); + { + bool reversed; + auto const stored{profile_find(reversed)}; + if (stored >= 0) + { + ImGui::TextDisabled("Design kept in %s%s", scene::Layers.layer(m_profiles[stored].layer).name.c_str(), state.changed ? ", changes go there on save" : ""); + ImGui::SameLine(); + if (ImGui::SmallButton("Forget the design")) + profile_forget(); + } + else if (state.changed) + ImGui::TextDisabled("The design goes to the scenery file of the route on save"); + } + + if (render_profile_parameters()) + profile_edited(); + + render_profile_canvas(); + + ImGui::Columns(2, "##profilecolumns", true); + render_profile_point(); + ImGui::NextColumn(); + render_profile_issues(); + ImGui::Columns(1); + ImGui::End(); +} + +void editor_mode::render_profile_source() +{ + auto &state{m_profile}; auto *selected{selected_track()}; if (ImGui::Button("Along the line from the selected path") && selected != nullptr) profile_open_run(*selected); @@ -566,31 +608,11 @@ void editor_mode::render_profile_window() } ImGui::TreePop(); } - if (state.route.spans.empty()) - { - ImGui::TextDisabled("Select a path in the viewport, then build the route along the line, or set its start and end paths (switches are passed through)"); - if (state.picked_from != nullptr) - ImGui::Text("Start: %s", state.picked_from->name().c_str()); - if (false == state.error.empty()) - ImGui::TextColored(ImVec4(1.0f, 0.4f, 0.3f, 1.0f), "%s", state.error.c_str()); - ImGui::End(); - return; - } - ImGui::Text("Route: %zu paths, %.2f m, %s ... %s", state.route.spans.size(), state.route.length, state.route.spans.front().track->name().c_str(), state.route.spans.back().track->name().c_str()); - { - bool reversed; - auto const stored{profile_find(reversed)}; - if (stored >= 0) - { - ImGui::TextDisabled("Design kept in %s%s", scene::Layers.layer(m_profiles[stored].layer).name.c_str(), state.changed ? ", changes go there on save" : ""); - ImGui::SameLine(); - if (ImGui::SmallButton("Forget the design")) - profile_forget(); - } - else if (state.changed) - ImGui::TextDisabled("The design goes to the scenery file of the route on save"); - } +} +bool editor_mode::render_profile_parameters() +{ + auto &state{m_profile}; auto &line{state.line}; bool changed{false}; ImGui::PushItemWidth(90.0f); @@ -648,14 +670,12 @@ void editor_mode::render_profile_window() if ((state.context.start_joined || state.context.end_joined) && ImGui::IsItemHovered()) ImGui::SetTooltip("Keeps the elevation of the joint and takes over the grade of the adjoining track,\n" "with a vertical curve which starts right at the joint"); - if (changed) - profile_edited(); + return changed; +} - render_profile_canvas(); - - ImGui::Columns(2, "##profilecolumns", true); - render_profile_point(); - ImGui::NextColumn(); +void editor_mode::render_profile_issues() +{ + auto &state{m_profile}; ImGui::Text("Largest departure from the track: %.3f m", state.departure); ImGui::BeginChild("##profileissues", ImVec2(0.0f, 0.0f), false); if (state.issues.empty()) @@ -681,8 +701,6 @@ void editor_mode::render_profile_window() if (false == state.error.empty()) ImGui::TextColored(ImVec4(1.0f, 0.4f, 0.3f, 1.0f), "%s", state.error.c_str()); ImGui::EndChild(); - ImGui::Columns(1); - ImGui::End(); } void editor_mode::render_profile_point() From 07994a578c32e87f974898ff0bbe47fa0170bd09 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 00:50:08 +0200 Subject: [PATCH 098/430] refactor(editor): stored bindings read apart from their registration, one way to open a profile route --- application/editormode.h | 1 + application/editormodeinfra.cpp | 238 ++++++++++++++++-------------- application/editormodeprofile.cpp | 23 +-- 3 files changed, 137 insertions(+), 125 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index 28b56aa96..c87dbefc5 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -545,6 +545,7 @@ class editor_mode : public application_mode, private editor_track::observer void render_profile_issues(); void profile_open(TTrack *From, TTrack *To); void profile_open_run(TTrack &Track); + void profile_take(editor_track::route Route, TTrack *From, TTrack *To); void profile_resample(); void profile_recognize(); void profile_check(); diff --git a/application/editormodeinfra.cpp b/application/editormodeinfra.cpp index c099bdb85..2e976d9d6 100644 --- a/application/editormodeinfra.cpp +++ b/application/editormodeinfra.cpp @@ -459,12 +459,130 @@ double turn_of(infra::binding const &Binding, double const Yaw) return clamp_circular(Yaw - infra::heading(axis.forward)); } -} // namespace +// the objects which the stored bindings can name, by their locations +struct bindable_objects +{ + point_grid paths; + point_grid models; + point_grid traction; + point_grid logic; + point_grid includes; + + bindable_objects() + { + for (auto *track : simulation::Paths.sequence()) + if (track != nullptr && false == track->m_editorremoved) + for (auto const &path : track->m_paths) + paths.add(path.points[segment_data::point::start], track); + for (auto *model : simulation::Instances.sequence()) + if (model != nullptr && false == model->from_template() && model->Model() != nullptr) + models.add(model->location(), model); + for (auto *piece : simulation::Traction.sequence()) + if (piece != nullptr && false == piece->from_template()) + traction.add(piece->pPoint1, piece); + for (auto *memcell : simulation::Memory.sequence()) + if (memcell != nullptr && false == memcell->from_template()) + logic.add(memcell->location(), memcell); + for (auto *launcher : simulation::Events.launchers()) + if (launcher != nullptr && false == launcher->from_template()) + logic.add(launcher->location(), launcher); + for (scene::instance_handle handle = 1; handle <= scene::Layers.instance_count(); ++handle) + { + include_place place; + if (include_place_of(handle, place)) + includes.add(include_location(place), handle); + } + } +}; // format of the lines, coordinates in the space of the file: // { } // the object is the model, the include (position from its parameters), the traction piece (its first point), the memory // cell or the event launcher found at the location; the anchors name the paths by their ends +std::optional read_binding(std::string const &Text, scene::layer_context const &Context, bindable_objects const &Objects) +{ + double const tolerance{0.05}; + std::istringstream line{Text}; + std::string kindname, key; + int group{0}, turns{0}, count{0}; + glm::dvec3 location; + line >> kindname >> group >> location.x >> location.y >> location.z >> key >> turns >> count; + if (line.fail() || count < 1 || count > 4) + return std::nullopt; + location = Context.to_world(location); + infra::binding binding; + binding.group = static_cast(std::clamp(group, 0, static_cast(infra::category::other))); + binding.turns = (turns != 0); + auto found{false}; + if (kindname == infra::name(infra::kind::model)) + { + binding.type = infra::kind::model; + auto const model{Objects.models.find(location, tolerance, [&](TAnimModel *Model) { return Model->Model()->NameGet() == key; })}; + if ((found = model.has_value())) + binding.node = *model; + } + else if (kindname == infra::name(infra::kind::include)) + { + binding.type = infra::kind::include; + auto const handle{Objects.includes.find(location, tolerance, [&](scene::instance_handle Handle) { return *scene::Layers.instance(Handle).file == key; })}; + if ((found = handle.has_value())) + binding.include = *handle; + } + else if (kindname == infra::name(infra::kind::traction)) + { + binding.type = infra::kind::traction; + auto const piece{Objects.traction.find(location, tolerance, [](TTraction *) { return true; })}; + if ((found = piece.has_value())) + binding.node = *piece; + } + else if (kindname == infra::name(infra::kind::memcell) || kindname == infra::name(infra::kind::launcher)) + { + binding.type = (kindname == infra::name(infra::kind::memcell) ? infra::kind::memcell : infra::kind::launcher); + auto const node{Objects.logic.find(location, tolerance, [&](scene::basic_node *Node) { + auto const ismemcell{dynamic_cast(Node) != nullptr}; + return ismemcell == (binding.type == infra::kind::memcell) && (key == "-" || Node->name() == key); + })}; + if ((found = node.has_value())) + binding.node = *node; + } + std::vector points; + std::optional yaw; + if (false == found || false == object_points(binding, points, yaw)) + return std::nullopt; + for (int i = 0; i < count && found; ++i) + { + int path{0}; + glm::dvec3 start, end; + line >> path >> start.x >> start.y >> start.z >> end.x >> end.y >> end.z; + start = Context.to_world(start); + end = Context.to_world(end); + auto const track{Objects.paths.find(start, tolerance, [&](TTrack *Track) { + return path >= 0 && path < static_cast(Track->m_paths.size()) && + glm::distance(Track->m_paths[path].points[segment_data::point::start], start) <= tolerance && + glm::distance(Track->m_paths[path].points[segment_data::point::end], end) <= tolerance; + })}; + if (line.fail() || false == track.has_value()) + { + found = false; + break; + } + auto const &point{points[std::min(i, points.size() - 1)]}; + double s; + bool interior; + infra::project((*track)->m_paths[path], point, s, interior); + binding.anchors.push_back(infra::make_anchor({*track, path, s}, point)); + } + if (false == found || binding.anchors.size() != points.size()) + return std::nullopt; + binding.turns = binding.turns && yaw.has_value(); + if (binding.turns) + binding.yaw = turn_of(binding, *yaw); + binding.label = object_label(binding); + return binding; +} + +} // namespace + void editor_mode::infra_load() { if (m_bindings_loaded || scene::Layers.empty()) @@ -474,35 +592,7 @@ void editor_mode::infra_load() if (marked.empty()) return; - point_grid paths; - for (auto *track : simulation::Paths.sequence()) - if (track != nullptr && false == track->m_editorremoved) - for (auto const &path : track->m_paths) - paths.add(path.points[segment_data::point::start], track); - point_grid models; - for (auto *model : simulation::Instances.sequence()) - if (model != nullptr && false == model->from_template() && model->Model() != nullptr) - models.add(model->location(), model); - point_grid traction; - for (auto *piece : simulation::Traction.sequence()) - if (piece != nullptr && false == piece->from_template()) - traction.add(piece->pPoint1, piece); - point_grid logic; - for (auto *memcell : simulation::Memory.sequence()) - if (memcell != nullptr && false == memcell->from_template()) - logic.add(memcell->location(), memcell); - for (auto *launcher : simulation::Events.launchers()) - if (launcher != nullptr && false == launcher->from_template()) - logic.add(launcher->location(), launcher); - point_grid includes; - for (scene::instance_handle handle = 1; handle <= scene::Layers.instance_count(); ++handle) - { - include_place place; - if (include_place_of(handle, place)) - includes.add(include_location(place), handle); - } - - double const tolerance{0.05}; + bindable_objects const objects; auto resolved{0}; for (auto const layer : marked) { @@ -511,93 +601,13 @@ void editor_mode::infra_load() { if (text.empty() || text.front() == '#') continue; - std::istringstream line{text}; - std::string kindname, key; - int group{0}, turns{0}, count{0}; - glm::dvec3 location; - line >> kindname >> group >> location.x >> location.y >> location.z >> key >> turns >> count; - auto const keep = [&]() { m_bindings_unresolved.emplace_back(layer, text); }; - if (line.fail() || count < 1 || count > 4) + auto binding{read_binding(text, context, objects)}; + if (false == binding.has_value()) { - keep(); + m_bindings_unresolved.emplace_back(layer, text); continue; } - location = context.to_world(location); - infra::binding binding; - binding.group = static_cast(std::clamp(group, 0, static_cast(infra::category::other))); - binding.turns = (turns != 0); - auto found{false}; - if (kindname == infra::name(infra::kind::model)) - { - binding.type = infra::kind::model; - auto const model{models.find(location, tolerance, [&](TAnimModel *Model) { return Model->Model()->NameGet() == key; })}; - if ((found = model.has_value())) - binding.node = *model; - } - else if (kindname == infra::name(infra::kind::include)) - { - binding.type = infra::kind::include; - auto const handle{includes.find(location, tolerance, [&](scene::instance_handle Handle) { return *scene::Layers.instance(Handle).file == key; })}; - if ((found = handle.has_value())) - binding.include = *handle; - } - else if (kindname == infra::name(infra::kind::traction)) - { - binding.type = infra::kind::traction; - auto const piece{traction.find(location, tolerance, [](TTraction *) { return true; })}; - if ((found = piece.has_value())) - binding.node = *piece; - } - else if (kindname == infra::name(infra::kind::memcell) || kindname == infra::name(infra::kind::launcher)) - { - binding.type = (kindname == infra::name(infra::kind::memcell) ? infra::kind::memcell : infra::kind::launcher); - auto const node{logic.find(location, tolerance, [&](scene::basic_node *Node) { - auto const ismemcell{dynamic_cast(Node) != nullptr}; - return ismemcell == (binding.type == infra::kind::memcell) && (key == "-" || Node->name() == key); - })}; - if ((found = node.has_value())) - binding.node = *node; - } - std::vector points; - std::optional yaw; - if (false == found || false == object_points(binding, points, yaw)) - { - keep(); - continue; - } - for (int i = 0; i < count && found; ++i) - { - int path{0}; - glm::dvec3 start, end; - line >> path >> start.x >> start.y >> start.z >> end.x >> end.y >> end.z; - start = context.to_world(start); - end = context.to_world(end); - auto const track{paths.find(start, tolerance, [&](TTrack *Track) { - return path >= 0 && path < static_cast(Track->m_paths.size()) && - glm::distance(Track->m_paths[path].points[segment_data::point::start], start) <= tolerance && - glm::distance(Track->m_paths[path].points[segment_data::point::end], end) <= tolerance; - })}; - if (line.fail() || false == track.has_value()) - { - found = false; - break; - } - auto const &point{points[std::min(i, points.size() - 1)]}; - double s; - bool interior; - infra::project((*track)->m_paths[path], point, s, interior); - binding.anchors.push_back(infra::make_anchor({*track, path, s}, point)); - } - if (false == found || binding.anchors.size() != points.size()) - { - keep(); - continue; - } - binding.turns = binding.turns && yaw.has_value(); - if (binding.turns) - binding.yaw = turn_of(binding, *yaw); - binding.label = object_label(binding); - m_bindings.push_back(std::move(binding)); + m_bindings.push_back(std::move(*binding)); ++resolved; } } diff --git a/application/editormodeprofile.cpp b/application/editormodeprofile.cpp index 98f45a964..43a57374b 100644 --- a/application/editormodeprofile.cpp +++ b/application/editormodeprofile.cpp @@ -347,14 +347,7 @@ void editor_mode::profile_open(TTrack *From, TTrack *To) editor_track::route route; if (false == editor_track::find_route(From, To, route, state.error)) return; - state.from = state.picked_from = From; - state.to = state.picked_to = To; - state.route = std::move(route); - state.selected = -1; - profile_resample(); - if (false == profile_restore()) - profile_recognize(); - profile_fit_view(); + profile_take(std::move(route), From, To); } void editor_mode::profile_open_run(TTrack &Track) @@ -369,9 +362,17 @@ void editor_mode::profile_open_run(TTrack &Track) state.error = "The path can't carry a profile"; return; } - state.route = std::move(route); - state.from = state.picked_from = state.route.spans.front().track; - state.to = state.picked_to = state.route.spans.back().track; + auto *from{route.spans.front().track}; + auto *to{route.spans.back().track}; + profile_take(std::move(route), from, to); +} + +void editor_mode::profile_take(editor_track::route Route, TTrack *From, TTrack *To) +{ + auto &state{m_profile}; + state.from = state.picked_from = From; + state.to = state.picked_to = To; + state.route = std::move(Route); state.selected = -1; profile_resample(); if (false == profile_restore()) From 7d87fef7a05e8c3659b02a91fad656c90e5ca454 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 00:51:05 +0200 Subject: [PATCH 099/430] refactor(editor): anchor on the nearest place of a path --- application/editormodeinfra.cpp | 15 +++------------ editor/editorInfra.cpp | 8 ++++++++ editor/editorInfra.hpp | 2 ++ 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/application/editormodeinfra.cpp b/application/editormodeinfra.cpp index 2e976d9d6..67cf23334 100644 --- a/application/editormodeinfra.cpp +++ b/application/editormodeinfra.cpp @@ -567,10 +567,7 @@ std::optional read_binding(std::string const &Text, scene::layer break; } auto const &point{points[std::min(i, points.size() - 1)]}; - double s; - bool interior; - infra::project((*track)->m_paths[path], point, s, interior); - binding.anchors.push_back(infra::make_anchor({*track, path, s}, point)); + binding.anchors.push_back(infra::make_anchor(*track, path, point)); } if (false == found || binding.anchors.size() != points.size()) return std::nullopt; @@ -938,10 +935,7 @@ void editor_mode::track_captured(TTrack const &Track) auto placed{anchor}; if (glm::distance(infra::place(placed), points[i]) <= 0.01) continue; - double s; - bool interior; - infra::project(path, points[i], s, interior); - anchor = infra::make_anchor({anchor.at.track, anchor.at.path, s}, points[i]); + anchor = infra::make_anchor(anchor.at.track, anchor.at.path, points[i]); } if (binding.turns && yaw.has_value() && binding.anchors.front().at.track == &Track) binding.yaw = turn_of(binding, *yaw); @@ -1189,10 +1183,7 @@ void editor_mode::infra_rebase() binding.lost = true; continue; } - double s; - bool interior; - infra::project(anchor.at.track->m_paths[anchor.at.path], points[i], s, interior); - anchor = infra::make_anchor({anchor.at.track, anchor.at.path, s}, points[i]); + anchor = infra::make_anchor(anchor.at.track, anchor.at.path, points[i]); } if (binding.turns && yaw.has_value()) binding.yaw = turn_of(binding, *yaw); diff --git a/editor/editorInfra.cpp b/editor/editorInfra.cpp index a2fbc9bac..ba38961f7 100644 --- a/editor/editorInfra.cpp +++ b/editor/editorInfra.cpp @@ -222,6 +222,14 @@ double heading(glm::dvec2 const &Forward) return glm::degrees(std::atan2(Forward.x, Forward.y)); } +anchor make_anchor(TTrack *Track, int const Path, glm::dvec3 const &Point) +{ + double s; + bool interior; + project(Track->m_paths[Path], Point, s, interior); + return make_anchor({Track, Path, s}, Point); +} + anchor make_anchor(station const &At, glm::dvec3 const &Point) { anchor result; diff --git a/editor/editorInfra.hpp b/editor/editorInfra.hpp index afb76d8e8..64d32b250 100644 --- a/editor/editorInfra.hpp +++ b/editor/editorInfra.hpp @@ -83,6 +83,8 @@ struct anchor double length{0.0}; }; anchor make_anchor(station const &At, glm::dvec3 const &Point); +// anchor at the place of the path nearest to the point +anchor make_anchor(TTrack *Track, int const Path, glm::dvec3 const &Point); // location for the current geometry of the path glm::dvec3 place(anchor &Anchor); From fc195880e1730ccb8e079b7efd490508f98df24e Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 00:52:14 +0200 Subject: [PATCH 100/430] refactor(editor): one place for the orthographic projection of the editor view --- rendering/opengl33renderer.cpp | 27 +++++++++++++-------------- rendering/opengl33renderer.h | 1 + 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index 767618a16..682ca59eb 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -1518,6 +1518,17 @@ glm::mat4 opengl33_renderer::ortho_frustumtest_projection(float l, float r, floa return glm::ortho(l, r, b, t, znear, zfar); } +// the main viewport of the editor in the orthographic view replaces the perspective projection +void opengl33_renderer::editor_ortho_projection(viewport_config const &Viewport, float const Zfar, glm::mat4 &Projection, glm::mat4 &Frustum) +{ + if (false == (EditorModeFlag && Global.EditorOrtho && Viewport.main)) + return; + auto const height{Global.EditorOrthoExtent}; + auto const width{height * Global.window_size.x / std::max(1.f, static_cast(Global.window_size.y))}; + Projection = ortho_projection(-width, width, -height, height, -Zfar, Zfar); + Frustum = ortho_frustumtest_projection(-width, width, -height, height, -Zfar, Zfar); +} + void opengl33_renderer::setup_pass(viewport_config &Viewport, renderpass_config &Config, rendermode const Mode, float const Znear, float const Zfar, bool const Ignoredebug) { @@ -1593,13 +1604,7 @@ void opengl33_renderer::setup_pass(viewport_config &Viewport, renderpass_config auto const znear = ( Znear > 1.f ? Znear : Znear > 0.f ? Znear * zfar : 0.1f * Global.ZoomFactor); camera.projection() = perspective_projection(Viewport.projection, znear, zfar, frustumtest_proj); - if (EditorModeFlag && Global.EditorOrtho && Viewport.main) - { - auto const height{Global.EditorOrthoExtent}; - auto const width{height * Global.window_size.x / std::max(1.f, static_cast(Global.window_size.y))}; - camera.projection() = ortho_projection(-width, width, -height, height, -zfar, zfar); - frustumtest_proj = ortho_frustumtest_projection(-width, width, -height, height, -zfar, zfar); - } + editor_ortho_projection(Viewport, zfar, camera.projection(), frustumtest_proj); break; } case rendermode::shadows: @@ -1699,13 +1704,7 @@ void opengl33_renderer::setup_pass(viewport_config &Viewport, renderpass_config } camera.projection() = perspective_projection(proj, znear, zfar, frustumtest_proj); - if (EditorModeFlag && Global.EditorOrtho && Viewport.main) - { - auto const height{Global.EditorOrthoExtent}; - auto const width{height * Global.window_size.x / std::max(1.f, static_cast(Global.window_size.y))}; - camera.projection() = ortho_projection(-width, width, -height, height, -zfar, zfar); - frustumtest_proj = ortho_frustumtest_projection(-width, width, -height, height, -zfar, zfar); - } + editor_ortho_projection(Viewport, zfar, camera.projection(), frustumtest_proj); break; } case rendermode::reflections: diff --git a/rendering/opengl33renderer.h b/rendering/opengl33renderer.h index 43cd24b05..9d9bba8ce 100644 --- a/rendering/opengl33renderer.h +++ b/rendering/opengl33renderer.h @@ -399,6 +399,7 @@ class opengl33_renderer : public gfx_renderer { glm::mat4 perspective_projection(const viewport_proj_config &c, float n, float f, glm::mat4 &frustum); glm::mat4 ortho_projection(float left, float right, float bottom, float top, float z_near, float z_far); glm::mat4 ortho_frustumtest_projection(float left, float right, float bottom, float top, float z_near, float z_far); + void editor_ortho_projection(viewport_config const &Viewport, float const Zfar, glm::mat4 &Projection, glm::mat4 &Frustum); std::vector> m_control_pick_requests; std::vector> m_node_pick_requests; From 17725b65274c8374ac6d40e425a30babb9f26aa4 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 01:01:49 +0200 Subject: [PATCH 101/430] feat(editor): mode bar of the track window, key hints and values of the change at the cursor --- application/editormode.h | 10 ++ application/editormodetrack.cpp | 279 ++++++++++++++++++++++++++++---- 2 files changed, 261 insertions(+), 28 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index c87dbefc5..a6b4f0f81 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -303,6 +303,8 @@ class editor_mode : public application_mode, private editor_track::observer std::chrono::steady_clock::time_point m_track_last_commit; editor_track::state m_track_field_before; std::array, 3> m_track_materials{}; + std::array m_track_material_edited{}; + std::string m_track_mode_notice; struct route_design { TTrack *from{nullptr}; @@ -475,6 +477,7 @@ class editor_mode : public application_mode, private editor_track::observer enum class track_tab { straights, route, path, turnout }; bool m_track_window_open{false}; void render_track_window(); + void render_track_modes(TTrack &Track); void render_turnout_ui(); void render_path_parameters(TTrack &Track); void render_straight_ui(); @@ -483,6 +486,13 @@ class editor_mode : public application_mode, private editor_track::observer void start_straight_gesture(int const Tool); void finish_straight_gesture(); void toggle_straight_set(TTrack &Track); + struct key_hint + { + char const *key; + std::string action; + }; + std::vector track_key_hints() const; + std::string track_readout() const; void draw_track_hints(); bool m_route_tab{true}; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 67d78db93..67b1cf68e 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -39,6 +39,7 @@ using geometry::cross; using geometry::grade_of; using geometry::plan_distance; using geometry::plan_of; +using geometry::signed_angle; using geometry::turned; std::string describe(editor_track::straight const &Line) @@ -81,7 +82,10 @@ void editor_mode::select_track(scene::basic_node *Node) return; if (track != m_node) + { m_track_point = {}; + m_track_mode_notice.clear(); + } m_node = track; ui()->set_node(m_node); if (ui()->mode() != nodebank_panel::TRACK) @@ -99,6 +103,10 @@ void editor_mode::select_track(scene::basic_node *Node) { m_track_tab = track_tab::route; } + else + { + m_track_tab = track_tab::path; + } } bool editor_mode::pick_track_handle() @@ -438,6 +446,7 @@ void editor_mode::render_track_window() ImGui::End(); return; } + render_track_modes(*selected_track()); switch (m_track_tab) { case track_tab::straights: @@ -457,12 +466,7 @@ void editor_mode::render_track_window() render_path_ui(); break; } - if (m_track_tab != track_tab::path) - { - ImGui::Separator(); - if (ImGui::SmallButton("Edit points and parameters of the single path")) - m_track_tab = track_tab::path; - } + ImGui::Separator(); if (ImGui::SmallButton("Vertical profile along this line") && selected_track() != nullptr) profile_open_run(*selected_track()); ImGui::SameLine(); @@ -475,6 +479,54 @@ void editor_mode::render_track_window() ImGui::End(); } +void editor_mode::render_track_modes(TTrack &Track) +{ + bool const isswitch{Track.eType == tt_Switch}; + bool const straight{false == isswitch && editor_track::is_straight(Track, m_straights.tolerance)}; + bool const curve{Track.eType == tt_Normal && false == straight && editor_track::is_supported(Track)}; + struct mode + { + char const *label; + track_tab tab; + bool available; + char const *tooltip; + char const *unavailable; + }; + mode const modes[] = { + {"Path", track_tab::path, true, "Points, control vectors and parameters of the selected path", ""}, + {"Straight", track_tab::straights, straight, "The whole straight through the selected path: drag its ends or the middle, break it, shift it", "The selected path isn't straight"}, + {"Curve", track_tab::route, curve, "The curve between the adjoining straights: radius, transitions, cant", "The selected path isn't a curve"}, + {"Switch", track_tab::turnout, isswitch, "Geometry of the switch from a template, side of the diverging track", "The selected path isn't a switch"}, + }; + for (auto const &entry : modes) + { + if (&entry != &modes[0]) + ImGui::SameLine(); + bool const active{m_track_tab == entry.tab}; + if (active) + ImGui::PushStyleColor(ImGuiCol_Button, ImGui::GetStyleColorVec4(ImGuiCol_ButtonActive)); + if (false == entry.available) + ImGui::PushStyleVar(ImGuiStyleVar_Alpha, ImGui::GetStyle().Alpha * 0.4f); + if (ImGui::Button(entry.label, ImVec2(80.0f, 0.0f)) && entry.available && false == active) + { + m_track_mode_notice.clear(); + if (entry.tab != track_tab::route || std::find(m_route.chain.tracks.begin(), m_route.chain.tracks.end(), &Track) != m_route.chain.tracks.end() || route_from_curve(Track)) + m_track_tab = entry.tab; + else + m_track_mode_notice = "No straights found at both ends of the curve, edit it as a single path"; + } + if (false == entry.available) + ImGui::PopStyleVar(); + if (active) + ImGui::PopStyleColor(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", entry.available ? entry.tooltip : entry.unavailable); + } + if (false == m_track_mode_notice.empty()) + ImGui::TextColored(ImVec4(1.0f, 0.7f, 0.2f, 1.0f), "%s", m_track_mode_notice.c_str()); + ImGui::Separator(); +} + void editor_mode::render_turnout_ui() { auto *track{selected_track()}; @@ -2359,32 +2411,203 @@ void editor_mode::delete_selected_track() straight_refresh(); } +std::vector editor_mode::track_key_hints() const +{ + std::vector hints; + bool gizmo{false}; + if (false == m_straights.detour.empty()) + { + char const *const steps[] = {"leave the axis", "shifted", "start back", "back on the axis"}; + auto const step{std::min(m_straights.detour.size(), 3)}; + hints = {{"Shift+click", format("point %zu of 4: %s", step + 1, steps[step])}, {"Esc", "cancel"}}; + } + else if (m_extend.active) + hints = {{"Drag", "curve through the cursor, along the end: straight"}, {"Ctrl", "straight"}, {"Release", "build"}}; + else if (m_switch.placing) + hints = {{"Drag along", "direction of the switch"}, {"Drag sideways", "side of the diverging track"}}; + else if (m_switch.armed >= 0 && m_track_tab == track_tab::straights) + hints = {{"Press+drag", "on the selected straight where the switch starts"}}; + else if (m_track_tab == track_tab::straights && m_straights.current.tracks.empty()) + hints = {{"LMB", "select a straight or a curve"}}; + else if (m_track_tab == track_tab::straights) + { + hints = {{"Drag", "the ends or the middle"}, {"Ctrl+drag", "break"}, {"Shift+click x4", "shift around"}, {"Alt+click", "add to the set"}, {"Drag red ring", "new path"}, {"Del", "delete"}}; + gizmo = true; + } + else if (m_track_tab == track_tab::turnout) + { + hints = {{"Gizmo", "move the switch"}, {"W", "turn"}, {"Drag red ring", "new path"}, {"Del", "delete"}}; + gizmo = true; + } + else if (m_track_tab == track_tab::route && m_route.chain.tracks.empty()) + hints = {{"LMB", "select a curve"}}; + else if (m_track_tab == track_tab::route) + hints = {{"Drag yellow", "vertex"}, {"Drag green", "radius"}, {"Release", "apply"}, {"Esc", "release the vertex"}}; + else + { + hints = {{"LMB", "select a path or a point handle"}, {"Esc", "release the point"}, {"W", "turn"}, {"Drag red ring", "new path"}}; + gizmo = true; + } + if (gizmo && m_gizmo_snap > 0.0f) + hints.push_back({"Ctrl", format("gizmo snaps by %.2f m", m_gizmo_snap)}); + hints.push_back({"K", "split the path under the cursor"}); + hints.push_back({"O", "top view"}); + hints.push_back({"Ctrl+Z", "undo"}); + return hints; +} + +// values of the change in progress, shown next to the cursor +std::string editor_mode::track_readout() const +{ + auto const name = [](TTrack const *Track) { return Track->name().empty() ? std::string{"(noname)"} : Track->name(); }; + auto const azimuth = [](glm::dvec3 const &From, glm::dvec3 const &To) { + auto const degrees{glm::degrees(std::atan2(To.x - From.x, To.z - From.z))}; + return degrees < 0.0 ? degrees + 360.0 : degrees; + }; + if (m_extend.active) + { + double length{0.0}, radius{0.0}; + for (auto const &piece : extend_pieces()) + { + length += bezier{piece}.plan_length(); + if (piece.radius != 0.0f && (radius == 0.0 || std::abs(piece.radius) < radius)) + radius = std::abs(piece.radius); + } + auto text{radius > 0.0 ? format("L %.2f m R %.0f m", length, radius) : format("L %.2f m straight", length)}; + editor_track::snap_target target; + if (extend_snap(target) && target.track != nullptr) + text += "\njoins " + name(target.track); + return text; + } + auto const &state{m_straights}; + if (state.tool_placed && state.tool_dragging) + { + auto const &line{state.tool_line}; + auto const offset{plan_of(state.tool_handle - state.tool_point)}; + if (state.tool == 1) + { + if (glm::length(offset) < 1e-3) + return {}; + auto const turn{glm::degrees(signed_angle(line.direction, glm::normalize(offset)))}; + return format("turn %+.3f deg", turn) + (state.curve_radius > 0.0 ? format(" R %.0f m", state.curve_radius) : std::string{" R automatic"}); + } + glm::dvec2 const normal{-line.direction.y, line.direction.x}; + return format("shift %+.3f m over %.2f m", glm::dot(offset, normal), glm::dot(offset, line.direction)); + } + if (state.dragging && state.fitting) + { + auto const &result{m_route.result}; + if (false == result.valid) + return result.errors.empty() ? std::string{"no curve fits"} : result.errors.front(); + auto text{format("curve L %.2f m", result.length)}; + for (auto const &curve : result.curves) + text += format(" deflection %.3f deg", glm::degrees(curve.deflection)); + return text; + } + if (state.dragging) + { + auto const &grabbed{state.drag_line}; + if (state.handle == 2) + { + glm::dvec2 const normal{-grabbed.direction.y, grabbed.direction.x}; + return format("shift %+.3f m", glm::dot(plan_of(state.preview_start - grabbed.start), normal)); + } + return format("L %.3f m (%+.3f) azimuth %.4f deg", plan_distance(state.preview_start, state.preview_end), plan_distance(state.preview_start, state.preview_end) - grabbed.length, + azimuth(state.preview_start, state.preview_end)); + } + auto const *track{selected_track()}; + if (m_track_gizmo_using && track != nullptr) + { + if (m_track_point.valid() && m_track_point.path < static_cast(track->m_paths.size())) + { + auto const &path{track->m_paths[m_track_point.path]}; + auto text{format("L %.3f m", bezier{path}.plan_length())}; + if (path.radius != 0.0f) + text += format(" R %.1f m", std::abs(path.radius)); + if (m_track_snap.track != nullptr) + text += "\njoins " + name(m_track_snap.track); + return text; + } + if (m_gizmo_op != gizmo_operation::rotate) + return format("moved %.3f m", glm::distance(editor_track::pivot(*track), m_track_pivot)); + } + return {}; +} + void editor_mode::draw_track_hints() { - std::string hint; - if (false == m_straights.detour.empty()) - hint = "Shift+click: point " + std::to_string(m_straights.detour.size() + 1) + " of 4 (1: leave the axis, 2: shifted, 3: start back, 4: back on the axis) Esc: cancel"; - else if (m_extend.active) - hint = "Drag: curve through the cursor, along the end: straight Ctrl: straight"; - else if (m_switch.placing) - hint = "Drag along the straight to set the direction of the switch, sideways to set its side"; - else if (m_switch.armed >= 0 && m_track_tab == track_tab::straights) - hint = "Press on the selected straight where the switch starts and drag"; - else if (m_track_tab == track_tab::straights) - hint = current_straight().tracks.empty() ? "LMB: select a straight or a curve" : "Drag the ends or the middle Ctrl+drag: break Shift+click x4: shift around Alt+click: add to the set Drag from a red ring: new path Del: delete"; - else if (m_track_tab == track_tab::turnout) - hint = "Gizmo: move the switch (W: turn) Drag from a red ring: new path Del: delete"; - else if (m_track_tab == track_tab::route) - hint = m_route.chain.tracks.empty() ? "LMB: select a curve" : "Drag the vertex (yellow) or the radius grip (green), the change is applied on release Ctrl+Z: undo"; - else - hint = "LMB: select a path or a point handle"; - hint += " K: split the path under the cursor O: top view"; ImGuiIO const &io = ImGui::GetIO(); auto *drawlist{ImGui::GetBackgroundDrawList()}; - ImVec2 const position{12.0f, io.DisplaySize.y - 28.0f}; - auto const size{ImGui::CalcTextSize(hint.c_str())}; - drawlist->AddRectFilled(ImVec2(position.x - 6.0f, position.y - 4.0f), ImVec2(position.x + size.x + 6.0f, position.y + size.y + 4.0f), IM_COL32(0, 0, 0, 150), 4.0f); - drawlist->AddText(position, IM_COL32(255, 255, 255, 230), hint.c_str()); + float const margin{12.0f}; + float const gap{14.0f}; + float const pad{4.0f}; + float const lineheight{ImGui::GetTextLineHeight() + 2.0f * pad + 4.0f}; + auto const chip = [&](ImVec2 const At, char const *Text, ImU32 const Background, ImU32 const Foreground) { + auto const size{ImGui::CalcTextSize(Text)}; + drawlist->AddRectFilled(ImVec2(At.x, At.y - 2.0f), ImVec2(At.x + size.x + 2.0f * pad, At.y + size.y + 2.0f), Background, 3.0f); + drawlist->AddText(ImVec2(At.x + pad, At.y), Foreground, Text); + return size.x + 2.0f * pad; + }; + auto const width_of = [&](key_hint const &Hint) { return ImGui::CalcTextSize(Hint.key).x + 2.0f * pad + 5.0f + ImGui::CalcTextSize(Hint.action.c_str()).x; }; + + char const *const modifiers[] = {"Ctrl", "Shift", "Alt"}; + bool const held[] = {io.KeyCtrl, io.KeyShift, io.KeyAlt}; + float modifierswidth{0.0f}; + for (auto const *modifier : modifiers) + modifierswidth += ImGui::CalcTextSize(modifier).x + 2.0f * pad + 4.0f; + + auto const hints{track_key_hints()}; + auto const available{io.DisplaySize.x - 2.0f * margin - modifierswidth - gap}; + std::vector> lines(1); + float used{0.0f}; + for (auto const &hint : hints) + { + auto const width{width_of(hint)}; + if (false == lines.back().empty() && used + gap + width > available) + { + lines.emplace_back(); + used = 0.0f; + } + used += (lines.back().empty() ? 0.0f : gap) + width; + lines.back().push_back(&hint); + } + auto y{io.DisplaySize.y - margin - lineheight * static_cast(lines.size()) + pad}; + for (std::size_t i = 0; i < lines.size(); ++i, y += lineheight) + { + float width{0.0f}; + for (auto const *hint : lines[i]) + width += (width > 0.0f ? gap : 0.0f) + width_of(*hint); + if (i + 1 == lines.size()) + width += gap + modifierswidth; + drawlist->AddRectFilled(ImVec2(margin - 6.0f, y - pad - 2.0f), ImVec2(margin + width + 6.0f, y + lineheight - pad - 2.0f), IM_COL32(0, 0, 0, 160), 4.0f); + auto x{margin}; + for (auto const *hint : lines[i]) + { + if (x > margin) + x += gap; + x += chip(ImVec2(x, y), hint->key, IM_COL32(255, 210, 60, 220), IM_COL32(20, 20, 20, 255)) + 5.0f; + drawlist->AddText(ImVec2(x, y), IM_COL32(255, 255, 255, 230), hint->action.c_str()); + x += ImGui::CalcTextSize(hint->action.c_str()).x; + } + if (i + 1 == lines.size()) + { + x += gap; + for (int m = 0; m < 3; ++m) + x += chip(ImVec2(x, y), modifiers[m], held[m] ? overlay_color::selected : IM_COL32(255, 255, 255, 40), held[m] ? IM_COL32(20, 20, 20, 255) : IM_COL32(255, 255, 255, 120)) + 4.0f; + } + } + + auto const readout{track_readout()}; + if (readout.empty() || ImGui::GetIO().WantCaptureMouse) + return; + auto *foreground{ImGui::GetForegroundDrawList()}; + auto const size{ImGui::CalcTextSize(readout.c_str())}; + ImVec2 at{io.MousePos.x + 20.0f, io.MousePos.y + 20.0f}; + at.x = std::min(at.x, io.DisplaySize.x - size.x - 10.0f); + at.y = std::min(at.y, io.DisplaySize.y - size.y - 10.0f); + foreground->AddRectFilled(ImVec2(at.x - 6.0f, at.y - 4.0f), ImVec2(at.x + size.x + 6.0f, at.y + size.y + 4.0f), IM_COL32(0, 0, 0, 190), 4.0f); + foreground->AddRect(ImVec2(at.x - 6.0f, at.y - 4.0f), ImVec2(at.x + size.x + 6.0f, at.y + size.y + 4.0f), overlay_color::marked, 4.0f); + foreground->AddText(at, IM_COL32(255, 255, 255, 255), readout.c_str()); } void editor_mode::update_build_tools() From 661c211b2e7f6ff8d1ae6cb2264321880eec7769 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 01:04:41 +0200 Subject: [PATCH 102/430] feat(editor): tooltips of the track fields, textures applied on leaving the field --- application/editormode.h | 2 +- application/editormodetrack.cpp | 64 ++++++++++++++++++++++++++++----- 2 files changed, 57 insertions(+), 9 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index a6b4f0f81..62f79ef4b 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -303,7 +303,7 @@ class editor_mode : public application_mode, private editor_track::observer std::chrono::steady_clock::time_point m_track_last_commit; editor_track::state m_track_field_before; std::array, 3> m_track_materials{}; - std::array m_track_material_edited{}; + std::array m_track_material_edited{}; // path whose texture name is being typed std::string m_track_mode_notice; struct route_design { diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 67b1cf68e..4e3b9a947 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -62,6 +62,12 @@ editor_track::point_kind const kPointKinds[] = {editor_track::point_kind::start, float const kHandleRadius{10.0f}; +void item_tooltip(char const *Text) +{ + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", Text); +} + } TTrack *editor_mode::selected_track() const @@ -547,7 +553,6 @@ void editor_mode::render_turnout_ui() ImGui::Text("Length %.3f m, diverging %s, end offset %.3f m", length, offset > 0.0 ? "left" : "right", std::abs(offset)); if (angle > 1e-6) ImGui::Text("Angle 1:%.2f (%.4f deg), R in the entry %.0f m", 1.0 / std::tan(angle), glm::degrees(angle), diverging.radius); - ImGui::TextDisabled("Gizmo moves the whole switch (W: turn), drag from a red ring at a free end to add a path"); auto &tool{m_switch}; if (false == tool.collected) @@ -583,6 +588,7 @@ void editor_mode::render_turnout_ui() int const side{offset > 0.0 ? 1 : -1}; if (ImGui::Button("Replace the geometry with the template")) replace(tool.templates[m_turnout_template], side); + item_tooltip("Keeps the start and the direction of the switch, takes the shape of the chosen template"); ImGui::SameLine(); if (ImGui::Button("Flip the side")) { @@ -603,6 +609,7 @@ void editor_mode::render_turnout_ui() } replace(own, -side); } + item_tooltip("Mirrors the switch: the diverging track goes to the other side"); ImGui::Separator(); render_path_parameters(*track); } @@ -640,17 +647,22 @@ void editor_mode::render_path_parameters(TTrack &Track) double velocity = editor_track::velocity(*track); if (ImGui::InputDouble("Velocity (km/h, -1: none)", &velocity, 0.0, 0.0, "%.1f")) editor_track::velocity(*track, velocity); + item_tooltip("Speed limit of the path for the AI drivers and the timetable, -1: no limit of its own"); finish_edit(rebuild::none); if (ImGui::InputFloat("Friction", &track->fFriction, 0.0f, 0.0f, "%.3f")) track->fFriction = std::max(0.0f, track->fFriction); + item_tooltip("Friction coefficient of the rails, 0.15 for the dry rails; lower values make the wheels slip"); finish_edit(rebuild::none); ImGui::InputFloat("Sound distance", &track->fSoundDistance, 0.0f, 0.0f, "%.1f"); + item_tooltip("Distance between the rail joints in metres, sets the rhythm of the wheel clatter; -1: the default"); finish_edit(rebuild::none); ImGui::InputInt("Quality", &track->iQualityFlag, 0); + item_tooltip("Quality of the track, 20 is the nominal one; lower values give a rougher ride"); finish_edit(rebuild::none); int damage = track->iDamageFlag; if (ImGui::InputInt("Damage flags", &damage, 0)) editor_track::damage(*track, damage); + item_tooltip("0: track in order; any value adds jolts, 128: the vehicles derail on the path"); finish_edit(rebuild::none); char const *environments[] = {"flat", "mountains", "canyon", "tunnel", "bridge", "bank"}; @@ -660,9 +672,11 @@ void editor_mode::render_path_parameters(TTrack &Track) track->eEnvironment = static_cast(environment); apply_now(rebuild::none); } + item_tooltip("Surroundings of the path, they affect the sound of the passing vehicles"); if (ImGui::InputFloat("Width", &track->fTrackWidth, 0.0f, 0.0f, "%.3f")) track->fTrackWidth = std::max(0.01f, track->fTrackWidth); + item_tooltip("Gauge of the track (1.435 m for the standard gauge), width of the surface for the roads"); finish_edit(rebuild::parameters); ImGui::PopItemWidth(); @@ -676,6 +690,8 @@ void editor_mode::render_path_parameters(TTrack &Track) { for (int i = 0; i < 3; ++i) { + if (m_track_material_edited[i] != nullptr) + continue; auto const name = materials[i] ? editor_track::material_name(*materials[i]) : std::string{}; std::strncpy(m_track_materials[i].data(), name.c_str(), m_track_materials[i].size() - 1); m_track_materials[i].back() = '\0'; @@ -686,26 +702,37 @@ void editor_mode::render_path_parameters(TTrack &Track) if (materials[i] == nullptr || (i == 2 && track->eType != tt_Switch)) continue; ImGui::PushItemWidth(-160.0f); - if (ImGui::InputText(labels[i], m_track_materials[i].data(), m_track_materials[i].size(), ImGuiInputTextFlags_EnterReturnsTrue)) + if (ImGui::InputText(labels[i], m_track_materials[i].data(), m_track_materials[i].size())) + m_track_material_edited[i] = track; + if (ImGui::IsItemDeactivated() && m_track_material_edited[i] != nullptr) { - *materials[i] = editor_track::fetch_material(m_track_materials[i].data()); - apply_now(rebuild::parameters); + auto const *edited{m_track_material_edited[i]}; + m_track_material_edited[i] = nullptr; + if (edited == track && m_track_materials[i].data() != editor_track::material_name(*materials[i])) + { + *materials[i] = editor_track::fetch_material(m_track_materials[i].data()); + apply_now(rebuild::parameters); + } } ImGui::PopItemWidth(); } - ImGui::TextDisabled("Enter applies a texture name, \"none\" removes the texture"); + ImGui::TextDisabled("The texture changes on Enter or leaving the field, \"none\" removes it"); ImGui::PushItemWidth(120.0f); if (ImGui::InputFloat("Texture length", &track->fTexLength, 0.0f, 0.0f, "%.2f")) track->fTexLength = std::max(0.01f, track->fTexLength); + item_tooltip("Length in metres after which the texture of the rails and the trackbed repeats"); finish_edit(rebuild::parameters); float height = editor_track::texture_height(*track); if (ImGui::InputFloat("Trackbed height", &height, 0.0f, 0.0f, "%.3f")) editor_track::texture_height(*track, height); + item_tooltip("Height of the trackbed edge below the rail top, in metres"); finish_edit(rebuild::parameters); ImGui::InputFloat("Trackbed width", &track->fTexWidth, 0.0f, 0.0f, "%.3f"); + item_tooltip("Width of the trackbed outside of the rail, in metres"); finish_edit(rebuild::parameters); ImGui::InputFloat("Trackbed slope", &track->fTexSlope, 0.0f, 0.0f, "%.3f"); + item_tooltip("Horizontal reach of the slope at the outer edge of the trackbed, in metres"); finish_edit(rebuild::parameters); ImGui::PopItemWidth(); } @@ -715,7 +742,6 @@ void editor_mode::render_path_parameters(TTrack &Track) void editor_mode::render_path_ui() { - ImGui::TextDisabled("LMB: select path or point handle Esc: release point\nGizmo moves the selected point, otherwise the whole path (W: turn)"); auto *track = selected_track(); if (track == nullptr) { @@ -767,11 +793,14 @@ void editor_mode::render_path_ui() { ImGui::PushItemWidth(120.0f); ImGui::InputFloat("Snap radius (m)", &m_track_snap_radius, 0.0f, 0.0f, "%.2f"); + item_tooltip("A dragged free end within this distance of another free end joins it on release"); m_track_snap_radius = std::max(0.0f, m_track_snap_radius); ImGui::PopItemWidth(); ImGui::Checkbox("Align with snapped path", &m_track_align_tangent); + item_tooltip("On joining, the end also takes over the direction of the other path, so the joint has no kink"); ImGui::SameLine(); ImGui::Checkbox("Drag connected ends", &m_track_drag_connected); + item_tooltip("Dragging a joined end moves the ends of the neighbouring paths with it"); for (int i = 0; i < static_cast(track->m_paths.size()); ++i) { @@ -802,12 +831,16 @@ void editor_mode::render_path_ui() finish_edit(rebuild::geometry); } ImGui::InputScalarN("Control 1 (relative)", ImGuiDataType_Double, glm::value_ptr(path.points[segment_data::point::control1]), 3, nullptr, nullptr, "%.3f"); + item_tooltip("Control vector of the start, relative to the start point; zero for a straight"); finish_edit(rebuild::geometry); ImGui::InputScalarN("Control 2 (relative)", ImGuiDataType_Double, glm::value_ptr(path.points[segment_data::point::control2]), 3, nullptr, nullptr, "%.3f"); + item_tooltip("Control vector of the end, relative to the end point; zero for a straight"); finish_edit(rebuild::geometry); ImGui::InputFloat2("Roll (deg)", path.rolls.data(), "%.2f"); + item_tooltip("Cant at the start and at the end as the roll angle of the track"); finish_edit(rebuild::geometry); ImGui::InputFloat("Radius", &path.radius, 0.0f, 0.0f, "%.1f"); + item_tooltip("Radius stored with the path in the scenery; the shape itself comes from the control vectors"); finish_edit(rebuild::geometry); ImGui::PopItemWidth(); if (ImGui::Button("Straighten")) @@ -818,6 +851,7 @@ void editor_mode::render_path_ui() path.radius = 0.0f; editor_track::commit({track}); } + item_tooltip("Removes the control vectors and the radius, the path becomes a straight between its ends"); } else { @@ -1273,6 +1307,7 @@ bool editor_mode::render_route_parameters() bool changed{false}; ImGui::PushItemWidth(120.0f); changed |= ImGui::InputDouble("Design speed (km/h)", &design.speed, 0.0, 0.0, "%.0f"); + item_tooltip("Speed the cant, the transitions and the recommended radius are designed for"); design.speed = std::max(1.0, design.speed); int shape = static_cast(design.shape); char const *shapes[] = {"Cubic parabola", "Clothoid"}; @@ -1281,8 +1316,10 @@ bool editor_mode::render_route_parameters() design.shape = static_cast(shape); changed = true; } + item_tooltip("Cubic parabola: the usual one on the Polish lines; clothoid: curvature growing linearly with the length"); if (ImGui::SliderInt("Paths per transition curve", &design.transition_pieces, 1, 4)) route_update(); + item_tooltip("More paths follow the transition curve more closely in the scenery"); if (ImGui::IsItemDeactivatedAfterEdit()) route_apply(); ImGui::PopItemWidth(); @@ -1388,6 +1425,7 @@ bool editor_mode::render_route_vertex(int const Index) } changed |= ImGui::InputDouble(vertex.compound ? "Radius R1 (m)" : "Radius R (m)", &vertex.radius, 0.0, 0.0, "%.1f"); changed |= ImGui::Checkbox("Compound curve (two radii)", &vertex.compound); + item_tooltip("Curve made of two arcs of different radii, joined with a transition"); if (vertex.compound) { changed |= ImGui::InputDouble("Radius R2 (m)", &vertex.radius2, 0.0, 0.0, "%.1f"); @@ -1404,7 +1442,9 @@ bool editor_mode::render_route_vertex(int const Index) changed |= ImGui::InputDouble("Transition in (m)", &vertex.transition_in, 0.0, 0.0, "%.1f"); changed |= ImGui::InputDouble("Transition out (m)", &vertex.transition_out, 0.0, 0.0, "%.1f"); changed |= ImGui::InputDouble("Cant (mm)", &vertex.cant, 0.0, 0.0, "%.0f"); + item_tooltip("Height of the outer rail above the inner one"); changed |= ImGui::Checkbox("Turn the longer way (over 180 deg)", &vertex.reverse_turn); + item_tooltip("For the loops: the curve turns by more than a half circle"); ImGui::PopItemWidth(); vertex.radius = std::max(1.0, vertex.radius); vertex.transition_in = std::max(0.0, vertex.transition_in); @@ -1415,6 +1455,7 @@ bool editor_mode::render_route_vertex(int const Index) route_recommend(vertex); changed = true; } + item_tooltip("Cant and transitions recommended for the design speed and the radius"); auto const recommended{alignment::recommend(design.speed, vertex.radius, design.norms)}; ImGui::TextDisabled("For %.0f km/h: R min %.0f m, cant %.0f mm (equilibrium %.0f, min %.0f), transition %.0f m", design.speed, recommended.radius_min, recommended.cant, recommended.cant_equilibrium, recommended.cant_min, recommended.transition); @@ -1707,9 +1748,13 @@ void editor_mode::render_straights_ui() double angle{glm::degrees(state.tolerance.angle)}; if (ImGui::InputDouble("Angle tolerance (deg)", &angle, 0.0, 0.0, "%.4f")) state.tolerance.angle = glm::radians(std::max(0.0, angle)); + item_tooltip("Largest change of the direction between the paths of one straight"); ImGui::InputDouble("Offset tolerance (m)", &state.tolerance.offset, 0.0, 0.0, "%.3f"); + item_tooltip("Largest distance of the paths from the common axis of the straight"); ImGui::InputDouble("Treat as straight above R (m)", &state.tolerance.radius, 0.0, 0.0, "%.0f"); + item_tooltip("Curves of a larger radius count as straight"); ImGui::InputDouble("Minimum length (m)", &state.minimum_length, 0.0, 0.0, "%.0f"); + item_tooltip("Shorter straights aren't listed"); ImGui::PopItemWidth(); if (ImGui::Button("Recognize straights in the scenery")) { @@ -1829,7 +1874,9 @@ void editor_mode::render_straight_ui() ImGui::TextDisabled(state.tool_placed ? "Drag the handle: sideways sets the shift, along sets its length" : "LMB on the straight: place the start of the shift"); ImGui::PushItemWidth(100.0f); ImGui::InputDouble("Curve R (m, 0: automatic)", &state.curve_radius, 0.0, 0.0, "%.0f"); + item_tooltip("Radius of the curves made by the break and the S-curve; automatic: 1.5 times the minimum radius for the speed of the line"); ImGui::Checkbox("Transitions from the line speed", &state.auto_transitions); + item_tooltip("Lengths of the transition curves from the speed of the paths and the limits of the curve design"); if (false == state.auto_transitions) { ImGui::SameLine(); @@ -2245,7 +2292,7 @@ void editor_mode::straight_reshape(editor_track::straight const &Line, double co std::string error; editor_track::find_chain(m_route.from, m_route.to, m_route.chain, error); straight_refresh(); - state.status = "Done, the curves can be adjusted in the Route design tab"; + state.status = "Done, select a curve to adjust it in the Curve mode"; } double editor_mode::straight_tool_radius(editor_track::straight const &Line) const @@ -2489,7 +2536,7 @@ std::string editor_mode::track_readout() const if (glm::length(offset) < 1e-3) return {}; auto const turn{glm::degrees(signed_angle(line.direction, glm::normalize(offset)))}; - return format("turn %+.3f deg", turn) + (state.curve_radius > 0.0 ? format(" R %.0f m", state.curve_radius) : std::string{" R automatic"}); + return format("turn %+.3f deg R %.0f m", turn, straight_tool_radius(line)); } glm::dvec2 const normal{-line.direction.y, line.direction.x}; return format("shift %+.3f m over %.2f m", glm::dot(offset, normal), glm::dot(offset, line.direction)); @@ -3120,6 +3167,7 @@ void editor_mode::render_switch_ui() tool.collected = false; tool.armed = -1; } + item_tooltip("Looks for the switches of the scenery again, to use their shapes as the templates"); } std::vector editor_mode::detour_outline() const From b0c363b586167bc101e7032b9ef617127ab2fc1d Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 01:27:41 +0200 Subject: [PATCH 103/430] feat: structure gauge along the line of the selected path in the OpenGL view --- CMakeLists.txt | 2 + application/editormode.cpp | 1 + application/editormode.h | 18 ++ application/editormodegauge.cpp | 402 ++++++++++++++++++++++++++++++++ application/editormodetrack.cpp | 1 + editor/editorGauge.cpp | 110 +++++++++ editor/editorGauge.hpp | 55 +++++ editor/editorTrack.cpp | 4 +- editor/editorTrack.hpp | 1 + rendering/editoroverlay.h | 42 ++++ rendering/opengl33renderer.cpp | 57 +++++ rendering/opengl33renderer.h | 4 + 12 files changed, 696 insertions(+), 1 deletion(-) create mode 100644 application/editormodegauge.cpp create mode 100644 editor/editorGauge.cpp create mode 100644 editor/editorGauge.hpp create mode 100644 rendering/editoroverlay.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 94d71aa65..04eb67639 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,12 +173,14 @@ set(SOURCES "editor/editorTrack.cpp" "editor/editorAlignment.cpp" "editor/editorProfile.cpp" +"editor/editorGauge.cpp" "editor/editorInfra.cpp" "editor/editorTerrainStreamer.cpp" "editor/editorOrthophoto.cpp" "application/editormode.cpp" "application/editormodetrack.cpp" "application/editormodeprofile.cpp" +"application/editormodegauge.cpp" "application/editormodeinfra.cpp" "input/editormouseinput.cpp" "application/editoruilayer.cpp" diff --git a/application/editormode.cpp b/application/editormode.cpp index 08f5103c2..f074dc054 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -1035,6 +1035,7 @@ bool editor_mode::update() draw_infra_overlay(); render_infra_window(); } + update_gauge(); // --- area fill: outline overlay while the mode is active (its settings are drawn in the node bank window) --- if (ui()->mode() == nodebank_panel::FILL) diff --git a/application/editormode.h b/application/editormode.h index 62f79ef4b..7bdc8c2c5 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -23,6 +23,7 @@ http://mozilla.org/MPL/2.0/. #include "editor/editorAlignment.hpp" #include "editor/editorProfile.hpp" #include "editor/editorInfra.hpp" +#include "editor/editorGauge.hpp" #include #include @@ -305,6 +306,23 @@ class editor_mode : public application_mode, private editor_track::observer std::array, 3> m_track_materials{}; std::array m_track_material_edited{}; // path whose texture name is being typed std::string m_track_mode_notice; + // structure gauge along the line of the selected path, shown in the 3d view + struct gauge_state + { + bool enabled{false}; + std::vector profiles; + int profile{0}; + double reach{500.0}; // m, each way from the path + TTrack const *track{nullptr}; // scanned + std::size_t history{0}; + bool pending{false}; // rescan once the edit ends + std::size_t models{0}; + std::size_t intrusions{0}; // triangles + } m_gauge; + void gauge_load(); + void update_gauge(); + void scan_gauge(TTrack &Track); + void render_gauge_ui(); struct route_design { TTrack *from{nullptr}; diff --git a/application/editormodegauge.cpp b/application/editormodegauge.cpp new file mode 100644 index 000000000..2fbd9192b --- /dev/null +++ b/application/editormodegauge.cpp @@ -0,0 +1,402 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "application/editormode.h" +#include "application/editoruilayer.h" +#include "editor/editorGauge.hpp" +#include "editor/editorGeometry.hpp" +#include "model/AnimModel.h" +#include "model/Model3d.h" +#include "rendering/editoroverlay.h" +#include "rendering/renderer.h" +#include "simulation/simulation.h" +#include "world/Track.h" +#include "imgui/imgui.h" +#include +#include +#include +#include +#include + +using geometry::plan_of; + +namespace +{ + +char const *const gauge_file{"editor_gauges.txt"}; +std::size_t const gauge_triangle_limit{200000}; + +// samples of the route, found by the position in the plan +class corridor +{ +public: + struct local + { + std::size_t sample; + double lateral; // positive to the left + double height; // above the rail top + }; + + corridor(std::vector const &Samples, double const Margin) : m_samples{Samples}, m_margin{Margin} + { + m_min = m_max = plan_of(Samples.front().position); + for (auto const &sample : Samples) + { + m_min = glm::min(m_min, plan_of(sample.position)); + m_max = glm::max(m_max, plan_of(sample.position)); + } + m_min -= glm::dvec2(Margin + cell); + m_max += glm::dvec2(Margin + cell); + m_columns = static_cast((m_max.x - m_min.x) / cell) + 1; + m_rows = static_cast((m_max.y - m_min.y) / cell) + 1; + m_cells.resize(static_cast(m_columns) * m_rows); + for (std::size_t i = 0; i < Samples.size(); ++i) + m_cells[index(cell_of(plan_of(Samples[i].position)))].push_back(i); + } + + static glm::dvec2 normal(editor_track::route_sample const &Sample) + { + return {-Sample.direction.y, Sample.direction.x}; + } + + // whether the sphere may reach the gauge + bool near(glm::dvec3 const &Center, double const Radius) const + { + auto const center{plan_of(Center)}; + if (center.x + Radius < m_min.x || center.x - Radius > m_max.x || center.y + Radius < m_min.y || center.y - Radius > m_max.y) + return false; + auto const reach{(Radius + m_margin) * (Radius + m_margin)}; + return std::any_of(m_samples.begin(), m_samples.end(), [&](editor_track::route_sample const &Sample) { return glm::length2(plan_of(Sample.position) - center) <= reach; }); + } + + std::optional locate(glm::dvec3 const &Point) const + { + auto const point{plan_of(Point)}; + auto const cell{cell_of(point)}; + std::size_t nearest{m_samples.size()}; + double best{m_margin * m_margin}; + for (int row = std::max(0, cell.y - 1); row <= std::min(m_rows - 1, cell.y + 1); ++row) + for (int column = std::max(0, cell.x - 1); column <= std::min(m_columns - 1, cell.x + 1); ++column) + for (auto const i : m_cells[index({column, row})]) + { + auto const distance{glm::length2(plan_of(m_samples[i].position) - point)}; + if (distance < best) + { + best = distance; + nearest = i; + } + } + if (nearest == m_samples.size()) + return std::nullopt; + auto const &sample{m_samples[nearest]}; + auto const offset{point - plan_of(sample.position)}; + auto const along{glm::dot(offset, sample.direction)}; + if ((nearest == 0 && along < -0.6) || (nearest + 1 == m_samples.size() && along > 0.6)) + return std::nullopt; + return local{nearest, glm::dot(offset, normal(sample)), Point.y - (sample.position.y + sample.grade * along)}; + } + +private: + static constexpr double cell{8.0}; + + glm::ivec2 cell_of(glm::dvec2 const &Point) const + { + return {std::clamp(static_cast((Point.x - m_min.x) / cell), 0, m_columns - 1), std::clamp(static_cast((Point.y - m_min.y) / cell), 0, m_rows - 1)}; + } + std::size_t index(glm::ivec2 const &Cell) const + { + return static_cast(Cell.y) * m_columns + Cell.x; + } + + std::vector const &m_samples; + double m_margin; + glm::dvec2 m_min, m_max; + int m_columns{1}, m_rows{1}; + std::vector> m_cells; +}; + +gauge::section section_of(editor_track::route_sample const &Sample) +{ + gauge::section section; + if (std::abs(Sample.curvature) > 1e-5) + { + section.radius = 1.0 / std::abs(Sample.curvature); + section.inner = Sample.curvature > 0.0 ? 1 : -1; + } + section.cant = Sample.cant; + return section; +} + +glm::dmat4 placement(TAnimModel const &Instance) +{ + auto const angles{Instance.Angles()}; + auto matrix{glm::translate(glm::dmat4(1.0), Instance.location())}; + matrix = glm::rotate(matrix, glm::radians(static_cast(angles.y)), glm::dvec3(0.0, 1.0, 0.0)); + matrix = glm::rotate(matrix, glm::radians(static_cast(angles.x)), glm::dvec3(1.0, 0.0, 0.0)); + matrix = glm::rotate(matrix, glm::radians(static_cast(angles.z)), glm::dvec3(0.0, 0.0, 1.0)); + return glm::scale(matrix, glm::dvec3(Instance.Scale())); +} + +// calls the visitor with the world corners of the visible triangles of the submodel, its siblings and children +template void visit_triangles(TSubModel *Submodel, glm::dmat4 const &Matrix, Visitor const &Visit) +{ + for (auto *submodel = Submodel; submodel != nullptr; submodel = submodel->NextGet()) + { + if (submodel->iVisible == 0) + continue; + auto matrix{Matrix}; + if ((submodel->iFlags & 0xC000) && submodel->GetMatrix() != nullptr) + matrix *= glm::dmat4(glm::make_mat4(submodel->GetMatrix()->readArray())); + if (submodel->eType == GL_TRIANGLES && submodel->m_geometry.handle != null_handle) + { + auto const &vertices{GfxRenderer->Vertices(submodel->m_geometry.handle)}; + auto const &indices{GfxRenderer->Indices(submodel->m_geometry.handle)}; + auto const corner{[&](std::size_t const Index) { return glm::dvec3(matrix * glm::dvec4(glm::dvec3(vertices[Index].position), 1.0)); }}; + auto const count{indices.empty() ? vertices.size() : indices.size()}; + for (std::size_t i = 0; i + 2 < count; i += 3) + { + if (indices.empty()) + Visit(corner(i), corner(i + 1), corner(i + 2)); + else + Visit(corner(indices[i]), corner(indices[i + 1]), corner(indices[i + 2])); + } + } + visit_triangles(submodel->ChildGet(), matrix, Visit); + } +} + +} // namespace + +void editor_mode::gauge_load() +{ + if (m_gauge.profiles.empty()) + m_gauge.profiles = gauge::load_profiles(gauge_file); + m_gauge.profile = std::clamp(m_gauge.profile, 0, static_cast(m_gauge.profiles.size()) - 1); +} + +void editor_mode::update_gauge() +{ + auto *track{m_gauge.enabled && ui()->mode() == nodebank_panel::TRACK ? selected_track() : nullptr}; + if (track == nullptr) + { + if (false == EditorOverlay.batches.empty()) + EditorOverlay.clear(); + m_gauge.track = nullptr; + return; + } + // the geometry is rescanned once the edit ends + if (ImGui::IsMouseDown(0) || m_track_gizmo_using || m_dragging) + { + m_gauge.pending = true; + return; + } + if (track == m_gauge.track && m_history.size() == m_gauge.history && false == m_gauge.pending) + return; + m_gauge.track = track; + m_gauge.history = m_history.size(); + m_gauge.pending = false; + scan_gauge(*track); +} + +void editor_mode::scan_gauge(TTrack &Track) +{ + gauge_load(); + EditorOverlay.clear(); + m_gauge.intrusions = 0; + m_gauge.models = 0; + auto route{editor_track::run_route(Track, m_gauge.reach)}; + auto const samples{editor_track::sample_route(route, 1.0)}; + auto const &profile{m_gauge.profiles[m_gauge.profile]}; + if (samples.size() < 2 || profile.outline.size() < 2) + return; + + double widest{0.0}, top{0.0}; + for (auto const &point : profile.outline) + { + widest = std::max(widest, point.half_width); + top = std::max(top, point.height); + } + corridor const space{samples, widest + gauge::curve_widening(150.0) + gauge::cant_widening(0.2, top) + 0.5}; + auto const origin{samples.front().position}; + EditorOverlay.origin = origin; + auto const relative{[&](glm::dvec3 const &Point) { return glm::vec3(Point - origin); }}; + auto const lift{[](editor_track::route_sample const &Sample, double const Lateral, double const Height) { + auto const normal{corridor::normal(Sample)}; + return Sample.position + glm::dvec3(normal.x * Lateral, Height, normal.y * Lateral); + }}; + + // outline across the track, from the bottom right up and down to the bottom left + auto const ring{[&](editor_track::route_sample const &Sample) { + auto const section{section_of(Sample)}; + std::vector points; + for (int side : {-1, 1}) + for (std::size_t j = 0; j < profile.outline.size(); ++j) + { + auto const &point{profile.outline[side < 0 ? j : profile.outline.size() - 1 - j]}; + auto width{point.half_width + gauge::curve_widening(section.radius)}; + if (side == section.inner) + width += gauge::cant_widening(section.cant, point.height); + points.push_back(relative(lift(Sample, side * width, point.height))); + } + return points; + }}; + + gfx::editor_overlay::batch surface{{0.2f, 0.9f, 0.3f, 0.12f}, GL_TRIANGLES}; + gfx::editor_overlay::batch lines{{0.2f, 1.0f, 0.3f, 0.5f}, GL_LINES}; + gfx::editor_overlay::batch intruding{{1.0f, 0.1f, 0.05f, 0.6f}, GL_TRIANGLES, true}; + std::vector previous; + double lastring{-1e9}; + for (std::size_t i = 0; i < samples.size(); i += 2) + { + auto const current{ring(samples[i])}; + if (false == previous.empty()) + for (std::size_t j = 1; j < current.size(); ++j) + { + surface.points.insert(surface.points.end(), {previous[j - 1], previous[j], current[j], previous[j - 1], current[j], current[j - 1]}); + lines.points.insert(lines.points.end(), {previous[j], current[j]}); + } + if (samples[i].chainage - lastring >= 10.0 || i + 2 >= samples.size()) + { + lastring = samples[i].chainage; + for (std::size_t j = 1; j < current.size(); ++j) + lines.points.insert(lines.points.end(), {current[j - 1], current[j]}); + } + previous = current; + } + + // triangle enters the gauge when any point of a grid spread over it does + auto const inside{[&](glm::dvec3 const &Point) { + auto const local{space.locate(Point)}; + return local && gauge::intrusion(profile, section_of(samples[local->sample]), local->lateral, local->height) > 0.0; + }}; + for (auto *instance : simulation::Instances.sequence()) + { + if (intruding.points.size() >= 3 * gauge_triangle_limit) + break; + if (instance == nullptr || false == instance->visible() || instance->Model() == nullptr || instance->Model()->GetSMRoot() == nullptr) + continue; + if (false == space.near(instance->location(), instance->radius())) + continue; + auto const before{intruding.points.size()}; + visit_triangles(instance->Model()->GetSMRoot(), placement(*instance), [&](glm::dvec3 const &A, glm::dvec3 const &B, glm::dvec3 const &C) { + auto const edge{std::max({glm::distance(A, B), glm::distance(B, C), glm::distance(C, A)})}; + auto const steps{std::clamp(static_cast(std::ceil(edge / 0.5)), 1, 24)}; + for (int u = 0; u <= steps; ++u) + for (int v = 0; u + v <= steps; ++v) + { + auto const a{static_cast(u) / steps}; + auto const b{static_cast(v) / steps}; + if (inside(A + (B - A) * a + (C - A) * b)) + { + intruding.points.insert(intruding.points.end(), {relative(A), relative(B), relative(C)}); + return; + } + } + }); + if (intruding.points.size() > before) + ++m_gauge.models; + } + m_gauge.intrusions = intruding.points.size() / 3; + EditorOverlay.batches = {std::move(surface), std::move(lines), std::move(intruding)}; +} + +void editor_mode::render_gauge_ui() +{ + if (false == ImGui::CollapsingHeader("Structure gauge")) + return; + if (ImGui::Checkbox("Show in the 3D view", &m_gauge.enabled)) + m_gauge.pending = true; + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("Translucent tunnel of the gauge along the line of the selected path,\nwith the triangles of the models which enter it in red. Widened in curves and on the inner side of a cant."); + gauge_load(); + auto const previous{m_gauge.profile}; + for (int i = 0; i < static_cast(m_gauge.profiles.size()); ++i) + { + if (i > 0) + ImGui::SameLine(); + ImGui::RadioButton(m_gauge.profiles[i].name.c_str(), &m_gauge.profile, i); + } + bool changed{previous != m_gauge.profile}; + float reach{static_cast(m_gauge.reach)}; + if (ImGui::SliderFloat("Reach each way (m)", &reach, 50.0f, 2000.0f, "%.0f")) + m_gauge.reach = reach; + changed |= ImGui::IsItemDeactivatedAfterEdit(); + if (m_gauge.enabled) + { + if (m_gauge.models > 0) + ImGui::TextColored(ImVec4(1.0f, 0.35f, 0.3f, 1.0f), "%zu models enter the gauge (%zu triangles)", m_gauge.models, m_gauge.intrusions); + else + ImGui::TextDisabled("The gauge is clear"); + } + + if (ImGui::TreeNode("Outline (right half)")) + { + ImGui::TextDisabled("Approximate starting points, check against PN-69/K-02057.\nMetres from the track axis and above the rail top, bottom up."); + auto &profile{m_gauge.profiles[m_gauge.profile]}; + bool edited{false}; + bool inserted{false}; + int remove{-1}; + ImGui::Columns(3, "gaugeoutline", false); + ImGui::SetColumnWidth(0, 110.0f); + ImGui::SetColumnWidth(1, 110.0f); + ImGui::TextDisabled("Half-width"); + ImGui::NextColumn(); + ImGui::TextDisabled("Height"); + ImGui::NextColumn(); + ImGui::NextColumn(); + for (int i = 0; i < static_cast(profile.outline.size()); ++i) + { + ImGui::PushID(i); + auto &point{profile.outline[i]}; + ImGui::SetNextItemWidth(-1.0f); + ImGui::InputDouble("##width", &point.half_width, 0.0, 0.0, "%.3f"); + edited |= ImGui::IsItemDeactivatedAfterEdit(); + ImGui::NextColumn(); + ImGui::SetNextItemWidth(-1.0f); + ImGui::InputDouble("##height", &point.height, 0.0, 0.0, "%.3f"); + edited |= ImGui::IsItemDeactivatedAfterEdit(); + ImGui::NextColumn(); + if (ImGui::SmallButton("+")) + { + auto const &next{profile.outline[std::min(i + 1, profile.outline.size() - 1)]}; + profile.outline.insert(profile.outline.begin() + i + 1, {0.5 * (point.half_width + next.half_width), 0.5 * (point.height + next.height)}); + inserted = edited = true; + } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("Insert a point after this one"); + ImGui::SameLine(); + if (profile.outline.size() > 2 && ImGui::SmallButton("x")) + remove = i; + ImGui::NextColumn(); + ImGui::PopID(); + if (inserted) + break; + } + ImGui::Columns(1); + if (remove >= 0) + { + profile.outline.erase(profile.outline.begin() + remove); + edited = true; + } + if (ImGui::SmallButton("Restore the starting outlines")) + { + m_gauge.profiles = gauge::default_profiles(); + edited = true; + } + if (edited) + { + gauge::save_profiles(gauge_file, m_gauge.profiles); + changed = true; + } + ImGui::TreePop(); + } + if (changed) + m_gauge.pending = true; +} diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 4e3b9a947..2fb4ace35 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -482,6 +482,7 @@ void editor_mode::render_track_window() m_infra.scope = 1; infra_recognize(); } + render_gauge_ui(); ImGui::End(); } diff --git a/editor/editorGauge.cpp b/editor/editorGauge.cpp new file mode 100644 index 000000000..937feb5bd --- /dev/null +++ b/editor/editorGauge.cpp @@ -0,0 +1,110 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "editor/editorGauge.hpp" + +#include +#include + +namespace gauge +{ + +std::vector default_profiles() +{ + std::vector const lower{{1.645, 0.05}, {1.645, 0.30}, {1.720, 0.30}, {1.720, 1.10}, {2.200, 1.10}, {2.200, 3.85}, {1.900, 4.25}}; + profile plain{"A (bez sieci)", lower}; + plain.outline.insert(plain.outline.end(), {{1.400, 4.85}, {0.0, 4.85}}); + profile electrified{"C (sieć trakcyjna)", lower}; + electrified.outline.insert(electrified.outline.end(), {{1.700, 4.85}, {1.400, 5.60}, {1.000, 6.00}, {0.0, 6.00}}); + return {plain, electrified}; +} + +// one outline per line: the name in quotes, then pairs of half-width and height +std::vector load_profiles(std::string const &File) +{ + std::ifstream input{File}; + std::vector profiles; + std::string line; + while (std::getline(input, line)) + { + std::istringstream stream{line}; + profile profile; + if (false == static_cast(stream >> std::quoted(profile.name))) + continue; + profile::point point; + while (stream >> point.half_width >> point.height) + profile.outline.push_back(point); + if (profile.outline.size() >= 2) + profiles.push_back(std::move(profile)); + } + return profiles.empty() ? default_profiles() : profiles; +} + +void save_profiles(std::string const &File, std::vector const &Profiles) +{ + std::ofstream output{File}; + for (auto const &profile : Profiles) + { + output << std::quoted(profile.name); + for (auto const &point : profile.outline) + output << ' ' << point.half_width << ' ' << point.height; + output << '\n'; + } +} + +double curve_widening(double const Radius) +{ + // smallest radius of the class and its widening in mm; the radius between the classes takes the larger one + static constexpr std::pair table[]{{3500, 10}, {2500, 15}, {1800, 20}, {1500, 25}, {1200, 30}, {1000, 35}, + {900, 40}, {800, 45}, {700, 50}, {600, 60}, {500, 75}, {450, 80}, + {400, 90}, {350, 105}, {300, 120}, {280, 130}, {260, 140}, {250, 145}, + {240, 150}, {220, 165}, {200, 180}, {190, 190}, {180, 200}}; + if (Radius <= 0.0 || Radius >= 4000.0) + return 0.0; + for (auto const &[radius, widening] : table) + if (Radius >= radius) + return widening * 0.001; + return 36.0 / Radius; +} + +double cant_widening(double const Cant, double const Height) +{ + return Height * Cant / 1.5; +} + +double half_width(profile const &Profile, section const &Section, double const Height, int const Side) +{ + double width{-1.0}; + for (std::size_t i = 1; i < Profile.outline.size(); ++i) + { + auto const &a{Profile.outline[i - 1]}; + auto const &b{Profile.outline[i]}; + if (Height < std::min(a.height, b.height) || Height > std::max(a.height, b.height)) + continue; + auto const span{b.height - a.height}; + width = std::max(width, std::abs(span) < 1e-9 ? std::max(a.half_width, b.half_width) : a.half_width + (b.half_width - a.half_width) * (Height - a.height) / span); + } + if (width < 0.0) + return width; + width += curve_widening(Section.radius); + if (Section.inner != 0 && Side == Section.inner) + width += cant_widening(Section.cant, Height); + return width; +} + +double intrusion(profile const &Profile, section const &Section, double const Lateral, double const Height) +{ + auto const width{half_width(Profile, Section, Height, Lateral >= 0.0 ? 1 : -1)}; + if (width < 0.0) + return 0.0; + return width - std::abs(Lateral); +} + +} // namespace gauge diff --git a/editor/editorGauge.hpp b/editor/editorGauge.hpp new file mode 100644 index 000000000..e4d235bc1 --- /dev/null +++ b/editor/editorGauge.hpp @@ -0,0 +1,55 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include + +// structure gauge (skrajnia budowli): the space along the track which has to stay clear of the objects +namespace gauge +{ + +// right half of the outline on a straight track, in metres: half-width from the axis and height above the rail top, +// listed from the bottom up; the left half is the mirror +struct profile +{ + std::string name; + struct point + { + double half_width{0.0}; + double height{0.0}; + }; + std::vector outline; +}; + +// starting points of the outlines, approximations to verify against PN-69/K-02057 +std::vector default_profiles(); +// outlines kept in the file, the defaults when there's none +std::vector load_profiles(std::string const &File); +void save_profiles(std::string const &File, std::vector const &Profiles); + +// widening of both sides in a curve, from the radius (table 1 of the D1 annex 11), metres +double curve_widening(double Radius); +// widening of the inner side of a curve from the tilt of the vehicles on the cant, at the height above the rail top, metres +double cant_widening(double Cant, double Height); + +// place of the gauge across the track +struct section +{ + double radius{0.0}; // 0: straight + int inner{0}; // side of the curve centre, +1 left or -1 right, 0 on a straight + double cant{0.0}; // metres +}; +// half-width of the gauge at the height on the side (+1 left, -1 right), negative above or below the outline +double half_width(profile const &Profile, section const &Section, double Height, int Side); +// depth of the point inside the gauge, metres, not positive outside of it. Lateral positive to the left +double intrusion(profile const &Profile, section const &Section, double Lateral, double Height); + +} // namespace gauge diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index e328cbb39..d43d30438 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -1406,7 +1406,8 @@ std::vector editor_track::sample_route(route &Route, for (std::size_t i = 0; i < Route.spans.size(); ++i) { auto &span{Route.spans[i]}; - bezier const curve{span.track->m_paths[span.path]}; + auto const &path{span.track->m_paths[span.path]}; + bezier const curve{path}; auto const count{std::max(2, static_cast(std::ceil(curve.plan_length(16) / std::max(0.1, Step))))}; span.from = chainage; auto previous{plan_of(curve.point(span.forward ? 0.0 : 1.0))}; @@ -1425,6 +1426,7 @@ std::vector editor_track::sample_route(route &Route, sample.chainage = chainage; sample.position = position; sample.span = i; + sample.cant = 1.5 * std::sin(std::abs(glm::radians(path.rolls[0] + (path.rolls[1] - path.rolls[0]) * t))); if (planar > 1e-9) { sample.direction = plan_of(derivative) / planar; diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index 742e393d4..d45ecf54f 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -175,6 +175,7 @@ class editor_track glm::dvec2 direction{0.0, 1.0}; double grade{0.0}; double curvature{0.0}; // signed, 1/m, positive turning left + double cant{0.0}; // m, raise of the outer rail std::size_t span{0}; }; static std::vector sample_route(route &Route, double const Step); diff --git a/rendering/editoroverlay.h b/rendering/editoroverlay.h new file mode 100644 index 000000000..6a533165c --- /dev/null +++ b/rendering/editoroverlay.h @@ -0,0 +1,42 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include + +#include + +namespace gfx +{ + +// flat coloured geometry the editor shows in the 3d view, drawn with the depth test over the translucent scenery +struct editor_overlay +{ + struct batch + { + glm::vec4 color{1.0f}; + unsigned int type{0}; // GL primitive + bool offset{false}; // pulled towards the camera, to show over the coplanar surfaces + std::vector points; // relative to the origin + }; + glm::dvec3 origin{0.0}; + std::vector batches; + unsigned int revision{0}; // changed with every new content + + void clear() + { + batches.clear(); + ++revision; + } +}; + +} // namespace gfx + +inline gfx::editor_overlay EditorOverlay; diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index 682ca59eb..4c769e8f3 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -21,6 +21,7 @@ http://mozilla.org/MPL/2.0/. #include "model/AnimModel.h" #include "rendering/opengl33geometrybank.h" #include "rendering/screenshot.h" +#include "rendering/editoroverlay.h" #include //#define EU07_DEBUG_OPENGL @@ -933,6 +934,7 @@ void opengl33_renderer::Render_pass(viewport_config &vp, rendermode const Mode) glDebug("render translucent region"); setup_drawing(true); Render_Alpha(simulation::Region); + Render_editor_overlay(); // particles Render_particles(); @@ -4489,6 +4491,61 @@ void opengl33_renderer::Render_Alpha(TTraction *Traction) glLineWidth(1.0f); } +void opengl33_renderer::Render_editor_overlay() +{ + if (false == EditorModeFlag || EditorOverlay.batches.empty()) + return; + glDebug("Render_editor_overlay"); + + if (m_editor_overlay_revision != EditorOverlay.revision) + { + m_editor_overlay_revision = EditorOverlay.revision; + if (m_editor_overlay_bank == null_handle) + m_editor_overlay_bank = Create_Bank(); + auto const &batches{EditorOverlay.batches}; + for (std::size_t i = 0; i < batches.size(); ++i) + { + gfx::vertex_array vertices; + vertices.reserve(batches[i].points.size()); + for (auto const &point : batches[i].points) + vertices.emplace_back(point, glm::vec3(0.f, 1.f, 0.f), glm::vec2()); + gfx::userdata_array userdata; + if (i >= m_editor_overlay_geometry.size()) + m_editor_overlay_geometry.emplace_back(); + auto &geometry{m_editor_overlay_geometry[i]}; + if (geometry != null_handle) + m_geometry.replace(vertices, userdata, geometry); + else if (false == vertices.empty()) + geometry = m_geometry.create_chunk(vertices, userdata, m_editor_overlay_bank, batches[i].type); + } + } + + ::glPushMatrix(); + auto const origin{EditorOverlay.origin - m_renderpass.pass_camera.position()}; + ::glTranslated(origin.x, origin.y, origin.z); + ::glDisable(GL_CULL_FACE); + ::glDepthMask(GL_FALSE); + m_line_shader->bind(); + auto const &batches{EditorOverlay.batches}; + for (std::size_t i = 0; i < batches.size() && i < m_editor_overlay_geometry.size(); ++i) + { + if (batches[i].points.empty() || m_editor_overlay_geometry[i] == null_handle) + continue; + if (batches[i].offset) + { + ::glEnable(GL_POLYGON_OFFSET_FILL); + ::glPolygonOffset(-2.f, -2.f); + } + model_ubs.param[0] = batches[i].color; + draw(m_editor_overlay_geometry[i]); + ::glDisable(GL_POLYGON_OFFSET_FILL); + ++m_renderpass.draw_stats.drawcalls; + } + ::glDepthMask(GL_TRUE); + ::glEnable(GL_CULL_FACE); + ::glPopMatrix(); +} + void opengl33_renderer::Render_Alpha(scene::lines_node const &Lines) { glDebug("Render_Alpha scene::lines_node"); diff --git a/rendering/opengl33renderer.h b/rendering/opengl33renderer.h index 9d9bba8ce..506e92113 100644 --- a/rendering/opengl33renderer.h +++ b/rendering/opengl33renderer.h @@ -306,6 +306,7 @@ class opengl33_renderer : public gfx_renderer { void Render_Alpha(TAnimModel *Instance); void Render_Alpha(TTraction *Traction); void Render_Alpha(scene::lines_node const &Lines); + void Render_editor_overlay(); bool Render_Alpha(TDynamicObject *Dynamic); bool Render_Alpha(TModel3d *Model, material_data const *Material, float const Squaredistance, glm::dvec3 const &Position, glm::vec3 const &Angle); bool Render_Alpha(TModel3d *Model, material_data const *Material, float const Squaredistance); @@ -449,6 +450,9 @@ class opengl33_renderer : public gfx_renderer { std::unordered_map> m_shaders; std::unique_ptr m_line_shader; + gfx::geometrybank_handle m_editor_overlay_bank; + std::vector m_editor_overlay_geometry; + unsigned int m_editor_overlay_revision{0}; std::unique_ptr m_freespot_shader; std::unique_ptr m_billboard_shader; std::unique_ptr m_celestial_shader; From cf8062ea966f0fd84f8053f917a248a2a487315f Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 01:40:25 +0200 Subject: [PATCH 104/430] feat: GPL-1/GPL-2 structure gauges, widening run-in ahead of the curves --- application/editormodegauge.cpp | 46 +++++----- editor/editorGauge.cpp | 147 ++++++++++++++++++++++++++------ editor/editorGauge.hpp | 28 +++--- 3 files changed, 161 insertions(+), 60 deletions(-) diff --git a/application/editormodegauge.cpp b/application/editormodegauge.cpp index 2fbd9192b..731cf6cca 100644 --- a/application/editormodegauge.cpp +++ b/application/editormodegauge.cpp @@ -30,7 +30,7 @@ using geometry::plan_of; namespace { -char const *const gauge_file{"editor_gauges.txt"}; +char const *const gauge_file{"editor_structure_gauges.txt"}; std::size_t const gauge_triangle_limit{200000}; // samples of the route, found by the position in the plan @@ -122,16 +122,16 @@ private: std::vector> m_cells; }; -gauge::section section_of(editor_track::route_sample const &Sample) +std::vector sections_of(std::vector const &Samples) { - gauge::section section; - if (std::abs(Sample.curvature) > 1e-5) + std::vector chainage, curvature, cant; + for (auto const &sample : Samples) { - section.radius = 1.0 / std::abs(Sample.curvature); - section.inner = Sample.curvature > 0.0 ? 1 : -1; + chainage.push_back(sample.chainage); + curvature.push_back(sample.curvature); + cant.push_back(sample.cant); } - section.cant = Sample.cant; - return section; + return gauge::sections(chainage, curvature, cant); } glm::dmat4 placement(TAnimModel const &Instance) @@ -217,13 +217,12 @@ void editor_mode::scan_gauge(TTrack &Track) if (samples.size() < 2 || profile.outline.size() < 2) return; - double widest{0.0}, top{0.0}; + auto const sections{sections_of(samples)}; + double widest{0.0}; for (auto const &point : profile.outline) - { widest = std::max(widest, point.half_width); - top = std::max(top, point.height); - } - corridor const space{samples, widest + gauge::curve_widening(150.0) + gauge::cant_widening(0.2, top) + 0.5}; + // room for the widening in the sharpest curves on the largest cant + corridor const space{samples, widest + 1.2}; auto const origin{samples.front().position}; EditorOverlay.origin = origin; auto const relative{[&](glm::dvec3 const &Point) { return glm::vec3(Point - origin); }}; @@ -233,17 +232,14 @@ void editor_mode::scan_gauge(TTrack &Track) }}; // outline across the track, from the bottom right up and down to the bottom left - auto const ring{[&](editor_track::route_sample const &Sample) { - auto const section{section_of(Sample)}; + auto const ring{[&](std::size_t const Index) { std::vector points; for (int side : {-1, 1}) for (std::size_t j = 0; j < profile.outline.size(); ++j) { auto const &point{profile.outline[side < 0 ? j : profile.outline.size() - 1 - j]}; - auto width{point.half_width + gauge::curve_widening(section.radius)}; - if (side == section.inner) - width += gauge::cant_widening(section.cant, point.height); - points.push_back(relative(lift(Sample, side * width, point.height))); + auto const width{point.half_width + gauge::widening(sections[Index], point.height, side)}; + points.push_back(relative(lift(samples[Index], side * width, point.height))); } return points; }}; @@ -255,7 +251,7 @@ void editor_mode::scan_gauge(TTrack &Track) double lastring{-1e9}; for (std::size_t i = 0; i < samples.size(); i += 2) { - auto const current{ring(samples[i])}; + auto const current{ring(i)}; if (false == previous.empty()) for (std::size_t j = 1; j < current.size(); ++j) { @@ -274,7 +270,7 @@ void editor_mode::scan_gauge(TTrack &Track) // triangle enters the gauge when any point of a grid spread over it does auto const inside{[&](glm::dvec3 const &Point) { auto const local{space.locate(Point)}; - return local && gauge::intrusion(profile, section_of(samples[local->sample]), local->lateral, local->height) > 0.0; + return local && gauge::intrusion(profile, sections[local->sample], local->lateral, local->height) > 0.0; }}; for (auto *instance : simulation::Instances.sequence()) { @@ -314,13 +310,13 @@ void editor_mode::render_gauge_ui() if (ImGui::Checkbox("Show in the 3D view", &m_gauge.enabled)) m_gauge.pending = true; if (ImGui::IsItemHovered()) - ImGui::SetTooltip("Translucent tunnel of the gauge along the line of the selected path,\nwith the triangles of the models which enter it in red. Widened in curves and on the inner side of a cant."); + ImGui::SetTooltip("Translucent tunnel of the gauge along the line of the selected path,\nwith the triangles of the models which enter it in red.\nWidened in the curves under 250 m and tilted on the cant, from 20 m (inner side)\nand 26 m (outer side) ahead of the curve, as in the PKP PLK standard, volume II."); gauge_load(); auto const previous{m_gauge.profile}; for (int i = 0; i < static_cast(m_gauge.profiles.size()); ++i) { - if (i > 0) - ImGui::SameLine(); + if (i % 2 == 1) + ImGui::SameLine(160.0f); ImGui::RadioButton(m_gauge.profiles[i].name.c_str(), &m_gauge.profile, i); } bool changed{previous != m_gauge.profile}; @@ -338,7 +334,7 @@ void editor_mode::render_gauge_ui() if (ImGui::TreeNode("Outline (right half)")) { - ImGui::TextDisabled("Approximate starting points, check against PN-69/K-02057.\nMetres from the track axis and above the rail top, bottom up."); + ImGui::TextDisabled("PKP PLK standard, volume II; below 1170 mm the limit installation gauge.\nMetres from the track axis and above the rail top, bottom up."); auto &profile{m_gauge.profiles[m_gauge.profile]}; bool edited{false}; bool inserted{false}; diff --git a/editor/editorGauge.cpp b/editor/editorGauge.cpp index 937feb5bd..59acae31b 100644 --- a/editor/editorGauge.cpp +++ b/editor/editorGauge.cpp @@ -16,14 +16,94 @@ http://mozilla.org/MPL/2.0/. namespace gauge { +namespace +{ + +// the widening runs up ahead of the change: on the inner side from 20 m before it, on the outer side from 26 m +// to 6 m before it (figures 3 to 5 of the standard) +double constexpr inner_lead{20.0}; +double constexpr outer_lead{26.0}; +double constexpr outer_full{6.0}; + +struct side_widening +{ + double inner{0.0}; + double outer{0.0}; +}; + +// above the lower part the gauge includes the curves of R >= 250 m already +side_widening upper_widening(double const Radius) +{ + if (Radius >= 250.0) + return {}; + return {std::max(0.0, 50.0 / Radius - 0.185), std::max(0.0, 60.0 / Radius - 0.225)}; +} + +side_widening lower_widening(double const Radius) +{ + if (Radius >= 250.0) + return {3.75 / Radius, 3.75 / Radius}; + return upper_widening(Radius); +} + +// values at the points of a route, read as linear between them and continued past the ends +class field +{ +public: + field(std::vector const &Chainage, std::vector Values) : m_chainage{Chainage}, m_values{std::move(Values)}, m_integral(m_values.size(), 0.0) + { + for (std::size_t i = 1; i < m_values.size(); ++i) + m_integral[i] = m_integral[i - 1] + 0.5 * (m_values[i - 1] + m_values[i]) * (m_chainage[i] - m_chainage[i - 1]); + } + + double mean(double const From, double const To) const + { + return (integral(To) - integral(From)) / (To - From); + } + + // larger of the means over the window placed ahead of the point in both directions + double ahead(double const Chainage, double const Near, double const Far) const + { + return std::max(mean(Chainage + Near, Chainage + Far), mean(Chainage - Far, Chainage - Near)); + } + +private: + double integral(double const Chainage) const + { + if (Chainage <= m_chainage.front()) + return m_values.front() * (Chainage - m_chainage.front()); + if (Chainage >= m_chainage.back()) + return m_integral.back() + m_values.back() * (Chainage - m_chainage.back()); + auto const next{static_cast(std::upper_bound(m_chainage.begin(), m_chainage.end(), Chainage) - m_chainage.begin())}; + auto const i{next - 1}; + auto const span{m_chainage[next] - m_chainage[i]}; + auto const offset{Chainage - m_chainage[i]}; + auto const value{span > 0.0 ? m_values[i] + (m_values[next] - m_values[i]) * offset / span : m_values[i]}; + return m_integral[i] + 0.5 * (m_values[i] + value) * offset; + } + + std::vector const &m_chainage; + std::vector m_values; + std::vector m_integral; +}; + +} // namespace + std::vector default_profiles() { - std::vector const lower{{1.645, 0.05}, {1.645, 0.30}, {1.720, 0.30}, {1.720, 1.10}, {2.200, 1.10}, {2.200, 3.85}, {1.900, 4.25}}; - profile plain{"A (bez sieci)", lower}; - plain.outline.insert(plain.outline.end(), {{1.400, 4.85}, {0.0, 4.85}}); - profile electrified{"C (sieć trakcyjna)", lower}; - electrified.outline.insert(electrified.outline.end(), {{1.700, 4.85}, {1.400, 5.60}, {1.000, 6.00}, {0.0, 6.00}}); - return {plain, electrified}; + // limit installation gauge up to 1170 mm, then the outline of the unified gauge + std::vector const lower{{1.211, 0.055}, {1.585, 0.380}, {1.675, 0.380}, {1.675, 1.170}, {2.000, 1.170}}; + std::vector const gpl1{{2.000, 3.050}, {1.900, 3.850}, {1.800, 4.250}, {1.600, 4.500}, {1.450, 4.632}}; + std::vector const gpl2{{2.000, 3.625}, {1.920, 4.900}}; + std::vector const pantograph{{1.450, 6.600}, {1.150, 6.900}, {0.0, 6.900}}; + auto const make{[&](std::string const &Name, std::vector> const &Parts) { + profile result{Name, lower}; + for (auto const &part : Parts) + result.outline.insert(result.outline.end(), part.begin(), part.end()); + return result; + }}; + return {make("GPL-1", {gpl1, {{1.260, 4.800}, {1.180, 4.850}, {0.0, 4.850}}}), make("GPL-1 + pantograf", {gpl1, pantograph}), + make("GPL-2", {gpl2, {{0.0, 4.900}}}), make("GPL-2 + pantograf", {gpl2, {{1.450, 4.900}}, pantograph})}; } // one outline per line: the name in quotes, then pairs of half-width and height @@ -59,24 +139,46 @@ void save_profiles(std::string const &File, std::vector const &Profiles } } -double curve_widening(double const Radius) +std::vector
sections(std::vector const &Chainage, std::vector const &Curvature, std::vector const &Cant) { - // smallest radius of the class and its widening in mm; the radius between the classes takes the larger one - static constexpr std::pair table[]{{3500, 10}, {2500, 15}, {1800, 20}, {1500, 25}, {1200, 30}, {1000, 35}, - {900, 40}, {800, 45}, {700, 50}, {600, 60}, {500, 75}, {450, 80}, - {400, 90}, {350, 105}, {300, 120}, {280, 130}, {260, 140}, {250, 145}, - {240, 150}, {220, 165}, {200, 180}, {190, 190}, {180, 200}}; - if (Radius <= 0.0 || Radius >= 4000.0) - return 0.0; - for (auto const &[radius, widening] : table) - if (Radius >= radius) - return widening * 0.001; - return 36.0 / Radius; + auto const count{Chainage.size()}; + std::vector
result(count); + if (count == 0) + return result; + // per side, the parts when it's the inner side of the curve and when it's the outer one + for (int side = 0; side < 2; ++side) + { + std::vector upperinner(count), upperouter(count), lowerinner(count), lowerouter(count), cantinner(count), cantouter(count); + for (std::size_t i = 0; i < count; ++i) + { + if (std::abs(Curvature[i]) < 1e-6) + continue; + auto const radius{1.0 / std::abs(Curvature[i])}; + bool const inner{(Curvature[i] > 0.0) == (side == 1)}; + auto const upper{upper_widening(radius)}; + auto const lower{lower_widening(radius)}; + (inner ? upperinner : upperouter)[i] = inner ? upper.inner : upper.outer; + (inner ? lowerinner : lowerouter)[i] = inner ? lower.inner : lower.outer; + (inner ? cantinner : cantouter)[i] = Cant[i]; + } + field const fields[]{{Chainage, std::move(upperinner)}, {Chainage, std::move(upperouter)}, {Chainage, std::move(lowerinner)}, + {Chainage, std::move(lowerouter)}, {Chainage, std::move(cantinner)}, {Chainage, std::move(cantouter)}}; + for (std::size_t i = 0; i < count; ++i) + { + auto const inner{[&](field const &Field) { return Field.ahead(Chainage[i], 0.0, inner_lead); }}; + auto const outer{[&](field const &Field) { return Field.ahead(Chainage[i], outer_full, outer_lead); }}; + result[i].upper[side] = inner(fields[0]) + outer(fields[1]); + result[i].lower[side] = inner(fields[2]) + outer(fields[3]); + result[i].cant[side] = inner(fields[4]) - outer(fields[5]); + } + } + return result; } -double cant_widening(double const Cant, double const Height) +double widening(section const &Section, double const Height, int const Side) { - return Height * Cant / 1.5; + auto const i{Side > 0 ? 1 : 0}; + return (Height < lower_part ? Section.lower[i] : Section.upper[i]) + Section.cant[i] * Height / 1.5; } double half_width(profile const &Profile, section const &Section, double const Height, int const Side) @@ -93,10 +195,7 @@ double half_width(profile const &Profile, section const &Section, double const H } if (width < 0.0) return width; - width += curve_widening(Section.radius); - if (Section.inner != 0 && Side == Section.inner) - width += cant_widening(Section.cant, Height); - return width; + return width + widening(Section, Height, Side); } double intrusion(profile const &Profile, section const &Section, double const Lateral, double const Height) diff --git a/editor/editorGauge.hpp b/editor/editorGauge.hpp index e4d235bc1..7ef65bbf0 100644 --- a/editor/editorGauge.hpp +++ b/editor/editorGauge.hpp @@ -9,10 +9,12 @@ http://mozilla.org/MPL/2.0/. #pragma once +#include #include #include -// structure gauge (skrajnia budowli): the space along the track which has to stay clear of the objects +// structure gauge (skrajnia budowli) of the PKP PLK technical standards, volume II: the space along the track +// which has to stay clear of the objects namespace gauge { @@ -29,25 +31,29 @@ struct profile std::vector outline; }; -// starting points of the outlines, approximations to verify against PN-69/K-02057 +// GPL-1 and GPL-2 over the limit installation gauge below 1170 mm, with and without the pantograph gauge std::vector default_profiles(); // outlines kept in the file, the defaults when there's none std::vector load_profiles(std::string const &File); void save_profiles(std::string const &File, std::vector const &Profiles); -// widening of both sides in a curve, from the radius (table 1 of the D1 annex 11), metres -double curve_widening(double Radius); -// widening of the inner side of a curve from the tilt of the vehicles on the cant, at the height above the rail top, metres -double cant_widening(double Cant, double Height); +// below this height the outline is the limit installation gauge, which leaves the room for the platforms +double constexpr lower_part{1.17}; -// place of the gauge across the track +// widening of the sides of the gauge at a place of the track, metres; index 0 is the right side, 1 the left one struct section { - double radius{0.0}; // 0: straight - int inner{0}; // side of the curve centre, +1 left or -1 right, 0 on a straight - double cant{0.0}; // metres + std::array upper{}; // from the radius, above the lower part + std::array lower{}; // from the radius, in the lower part + std::array cant{}; // cant in metres, positive on the inner side of the curve and negative on the outer one }; -// half-width of the gauge at the height on the side (+1 left, -1 right), negative above or below the outline +// sections at the points of a route, from their chainage, curvature (1/m, positive turning left) and cant (m). +// The widening begins and ends ahead of the changes of the curvature and cant, as the vehicles enter a curve +std::vector
sections(std::vector const &Chainage, std::vector const &Curvature, std::vector const &Cant); + +// widening of the side (+1 left, -1 right) at the height +double widening(section const &Section, double Height, int Side); +// half-width of the gauge at the height on the side, negative above or below the outline double half_width(profile const &Profile, section const &Section, double Height, int Side); // depth of the point inside the gauge, metres, not positive outside of it. Lateral positive to the left double intrusion(profile const &Profile, section const &Section, double Lateral, double Height); From f2e727ce9a2357993fa66eb4b8f0bbd0fbee1fe5 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 01:44:04 +0200 Subject: [PATCH 105/430] feat: structure gauge violations on the whole map, camera goes to them --- application/editormode.h | 32 +- application/editormodegauge.cpp | 606 +++++++++++++++++++++----------- 2 files changed, 431 insertions(+), 207 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index 7bdc8c2c5..f6dbe1662 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -39,6 +39,13 @@ class editor_mode : public application_mode, private editor_track::observer { public: + // model entering the structure gauge, at its deepest place + struct gauge_hit + { + std::string model; + glm::dvec3 point{0.0}; + double depth{0.0}; // m + }; // constructors editor_mode(); ~editor_mode() override; @@ -316,13 +323,34 @@ class editor_mode : public application_mode, private editor_track::observer TTrack const *track{nullptr}; // scanned std::size_t history{0}; bool pending{false}; // rescan once the edit ends - std::size_t models{0}; - std::size_t intrusions{0}; // triangles + struct + { + std::vector surface; // triangles of the tunnel + std::vector edges; // lines + std::vector intruding; // triangles of the models + std::vector hits; + } line; // along the selected path + struct + { + bool scanned{false}; + std::size_t history{0}; + std::string profile; + std::vector intruding; + std::vector hits; + } map; // whole scenery + int current{-1}; // hit the camera went to + bool published{false}; // overlay up to date } m_gauge; void gauge_load(); + std::vector const &gauge_hits() const; void update_gauge(); void scan_gauge(TTrack &Track); + void scan_gauge_map(); + void gauge_publish(); + void gauge_focus(int Index); void render_gauge_ui(); + void render_gauge_hits(); + bool render_gauge_outline(); struct route_design { TTrack *from{nullptr}; diff --git a/application/editormodegauge.cpp b/application/editormodegauge.cpp index 731cf6cca..53f2e889b 100644 --- a/application/editormodegauge.cpp +++ b/application/editormodegauge.cpp @@ -17,13 +17,17 @@ http://mozilla.org/MPL/2.0/. #include "rendering/editoroverlay.h" #include "rendering/renderer.h" #include "simulation/simulation.h" +#include "utilities/Logs.h" #include "world/Track.h" #include "imgui/imgui.h" #include #include #include +#include #include -#include +#include +#include +#include using geometry::plan_of; @@ -32,33 +36,76 @@ namespace char const *const gauge_file{"editor_structure_gauges.txt"}; std::size_t const gauge_triangle_limit{200000}; +// past this distance of the camera from the origin of the overlay it's rebuilt, to keep its float precision +double const gauge_origin_range{2000.0}; -// samples of the route, found by the position in the plan +// sampled line of the tracks with the widening of the gauge along it +struct gauge_line +{ + std::vector samples; + std::vector sections; +}; + +gauge_line make_line(editor_track::route &Route) +{ + gauge_line line; + line.samples = editor_track::sample_route(Route, 1.0); + std::vector chainage, curvature, cant; + for (auto const &sample : line.samples) + { + chainage.push_back(sample.chainage); + curvature.push_back(sample.curvature); + cant.push_back(sample.cant); + } + line.sections = gauge::sections(chainage, curvature, cant); + return line; +} + +// lines through all paths of the scenery, each path in one of them at least +std::vector scenery_lines() +{ + std::vector lines; + std::unordered_set visited; + auto const seen{[&](editor_track::route_span const &Span) { return visited.count(Span.track) > 0; }}; + for (auto *track : simulation::Paths.sequence()) + { + if (track == nullptr || visited.count(track) > 0 || false == editor_track::is_supported(*track)) + continue; + auto route{editor_track::run_route(*track, 1e7)}; + // the line may run on over the paths already covered, one of them is enough for the widening ahead of a curve + auto &spans{route.spans}; + while (spans.size() > 2 && seen(spans[0]) && seen(spans[1])) + spans.erase(spans.begin()); + while (spans.size() > 2 && seen(spans[spans.size() - 1]) && seen(spans[spans.size() - 2])) + spans.pop_back(); + for (auto const &span : spans) + visited.insert(span.track); + lines.push_back(make_line(route)); + } + // diverging paths of the switches + for (auto *track : simulation::Paths.sequence()) + if (track != nullptr && track->eType == tt_Switch && editor_track::is_supported(*track)) + { + editor_track::route route; + route.spans.push_back({track, 1, true}); + lines.push_back(make_line(route)); + } + return lines; +} + +// samples of the lines, found by the position in the plan class corridor { public: - struct local + corridor(std::vector const &Lines, double const Margin) : m_lines{Lines}, m_margin{Margin} { - std::size_t sample; - double lateral; // positive to the left - double height; // above the rail top - }; - - corridor(std::vector const &Samples, double const Margin) : m_samples{Samples}, m_margin{Margin} - { - m_min = m_max = plan_of(Samples.front().position); - for (auto const &sample : Samples) - { - m_min = glm::min(m_min, plan_of(sample.position)); - m_max = glm::max(m_max, plan_of(sample.position)); - } - m_min -= glm::dvec2(Margin + cell); - m_max += glm::dvec2(Margin + cell); - m_columns = static_cast((m_max.x - m_min.x) / cell) + 1; - m_rows = static_cast((m_max.y - m_min.y) / cell) + 1; - m_cells.resize(static_cast(m_columns) * m_rows); - for (std::size_t i = 0; i < Samples.size(); ++i) - m_cells[index(cell_of(plan_of(Samples[i].position)))].push_back(i); + for (std::uint32_t line = 0; line < Lines.size(); ++line) + for (std::uint32_t i = 0; i < Lines[line].samples.size(); ++i) + { + auto const point{plan_of(Lines[line].samples[i].position)}; + m_cells[key(point, cell)].push_back({line, i}); + m_regions.insert(key(point, region)); + } } static glm::dvec2 normal(editor_track::route_sample const &Sample) @@ -70,70 +117,90 @@ public: bool near(glm::dvec3 const &Center, double const Radius) const { auto const center{plan_of(Center)}; - if (center.x + Radius < m_min.x || center.x - Radius > m_max.x || center.y + Radius < m_min.y || center.y - Radius > m_max.y) - return false; - auto const reach{(Radius + m_margin) * (Radius + m_margin)}; - return std::any_of(m_samples.begin(), m_samples.end(), [&](editor_track::route_sample const &Sample) { return glm::length2(plan_of(Sample.position) - center) <= reach; }); + auto const reach{Radius + m_margin + region}; + auto const from{index(center - reach, region)}; + auto const to{index(center + reach, region)}; + for (auto x = from.x; x <= to.x; ++x) + for (auto y = from.y; y <= to.y; ++y) + if (m_regions.count(key(x, y)) > 0) + return true; + return false; } - std::optional locate(glm::dvec3 const &Point) const + // deepest intrusion of the point into the gauge of the lines nearby, not positive outside of them + double intrusion(gauge::profile const &Profile, glm::dvec3 const &Point) const { auto const point{plan_of(Point)}; - auto const cell{cell_of(point)}; - std::size_t nearest{m_samples.size()}; - double best{m_margin * m_margin}; - for (int row = std::max(0, cell.y - 1); row <= std::min(m_rows - 1, cell.y + 1); ++row) - for (int column = std::max(0, cell.x - 1); column <= std::min(m_columns - 1, cell.x + 1); ++column) - for (auto const i : m_cells[index({column, row})]) + auto const center{index(point, cell)}; + // nearest sample of every line around + std::vector> nearest; + for (auto x = center.x - 1; x <= center.x + 1; ++x) + for (auto y = center.y - 1; y <= center.y + 1; ++y) + { + auto const found{m_cells.find(key(x, y))}; + if (found == m_cells.end()) + continue; + for (auto const &candidate : found->second) { - auto const distance{glm::length2(plan_of(m_samples[i].position) - point)}; - if (distance < best) - { - best = distance; - nearest = i; - } + auto const distance{glm::length2(plan_of(sample(candidate).position) - point)}; + if (distance > m_margin * m_margin) + continue; + auto const same{std::find_if(nearest.begin(), nearest.end(), [&](auto const &Other) { return Other.first.line == candidate.line; })}; + if (same == nearest.end()) + nearest.push_back({candidate, distance}); + else if (distance < same->second) + *same = {candidate, distance}; } - if (nearest == m_samples.size()) - return std::nullopt; - auto const &sample{m_samples[nearest]}; - auto const offset{point - plan_of(sample.position)}; - auto const along{glm::dot(offset, sample.direction)}; - if ((nearest == 0 && along < -0.6) || (nearest + 1 == m_samples.size() && along > 0.6)) - return std::nullopt; - return local{nearest, glm::dot(offset, normal(sample)), Point.y - (sample.position.y + sample.grade * along)}; + } + double deepest{0.0}; + for (auto const &[found, distance] : nearest) + { + auto const &line{m_lines[found.line]}; + auto const &sample{line.samples[found.index]}; + auto const offset{point - plan_of(sample.position)}; + auto const along{glm::dot(offset, sample.direction)}; + if ((found.index == 0 && along < -0.6) || (found.index + 1 == line.samples.size() && along > 0.6)) + continue; + auto const height{Point.y - (sample.position.y + sample.grade * along)}; + deepest = std::max(deepest, gauge::intrusion(Profile, line.sections[found.index], glm::dot(offset, normal(sample)), height)); + } + return deepest; } private: static constexpr double cell{8.0}; + static constexpr double region{64.0}; - glm::ivec2 cell_of(glm::dvec2 const &Point) const + struct entry { - return {std::clamp(static_cast((Point.x - m_min.x) / cell), 0, m_columns - 1), std::clamp(static_cast((Point.y - m_min.y) / cell), 0, m_rows - 1)}; + std::uint32_t line; + std::uint32_t index; + }; + + static glm::i64vec2 index(glm::dvec2 const &Point, double const Size) + { + return {static_cast(std::floor(Point.x / Size)), static_cast(std::floor(Point.y / Size))}; } - std::size_t index(glm::ivec2 const &Cell) const + static std::uint64_t key(std::int64_t const X, std::int64_t const Y) { - return static_cast(Cell.y) * m_columns + Cell.x; + return (static_cast(X) << 32) ^ static_cast(Y); + } + static std::uint64_t key(glm::dvec2 const &Point, double const Size) + { + auto const cell{index(Point, Size)}; + return key(cell.x, cell.y); + } + editor_track::route_sample const &sample(entry const &Entry) const + { + return m_lines[Entry.line].samples[Entry.index]; } - std::vector const &m_samples; + std::vector const &m_lines; double m_margin; - glm::dvec2 m_min, m_max; - int m_columns{1}, m_rows{1}; - std::vector> m_cells; + std::unordered_map> m_cells; + std::unordered_set m_regions; }; -std::vector sections_of(std::vector const &Samples) -{ - std::vector chainage, curvature, cant; - for (auto const &sample : Samples) - { - chainage.push_back(sample.chainage); - curvature.push_back(sample.curvature); - cant.push_back(sample.cant); - } - return gauge::sections(chainage, curvature, cant); -} - glm::dmat4 placement(TAnimModel const &Instance) { auto const angles{Instance.Angles()}; @@ -172,6 +239,53 @@ template void visit_triangles(TSubModel *Submodel, glm::dmat4 } } +// triangles of the models entering the gauge, and the deepest place of each model, the deepest models first +void scan_models(corridor const &Space, gauge::profile const &Profile, std::vector &Triangles, std::vector &Hits) +{ + for (auto *instance : simulation::Instances.sequence()) + { + if (Triangles.size() >= 3 * gauge_triangle_limit) + break; + if (instance == nullptr || false == instance->visible() || instance->Model() == nullptr || instance->Model()->GetSMRoot() == nullptr) + continue; + if (false == Space.near(instance->location(), instance->radius())) + continue; + editor_mode::gauge_hit hit{instance->name(), instance->location(), 0.0}; + // the triangle enters the gauge when any point of a grid spread over it does + visit_triangles(instance->Model()->GetSMRoot(), placement(*instance), [&](glm::dvec3 const &A, glm::dvec3 const &B, glm::dvec3 const &C) { + auto const edge{std::max({glm::distance(A, B), glm::distance(B, C), glm::distance(C, A)})}; + auto const steps{std::clamp(static_cast(std::ceil(edge / 0.5)), 1, 24)}; + for (int u = 0; u <= steps; ++u) + for (int v = 0; u + v <= steps; ++v) + { + auto const point{A + (B - A) * (static_cast(u) / steps) + (C - A) * (static_cast(v) / steps)}; + auto const depth{Space.intrusion(Profile, point)}; + if (depth <= 0.0) + continue; + Triangles.insert(Triangles.end(), {A, B, C}); + if (depth > hit.depth) + { + hit.depth = depth; + hit.point = point; + } + return; + } + }); + if (hit.depth > 0.0) + Hits.push_back(std::move(hit)); + } + std::sort(Hits.begin(), Hits.end(), [](auto const &Left, auto const &Right) { return Left.depth > Right.depth; }); +} + +double widest(gauge::profile const &Profile) +{ + double result{0.0}; + for (auto const &point : Profile.outline) + result = std::max(result, point.half_width); + // with the room for the widening in the sharpest curves on the largest cant + return result + 1.2; +} + } // namespace void editor_mode::gauge_load() @@ -181,133 +295,172 @@ void editor_mode::gauge_load() m_gauge.profile = std::clamp(m_gauge.profile, 0, static_cast(m_gauge.profiles.size()) - 1); } +std::vector const &editor_mode::gauge_hits() const +{ + return m_gauge.map.scanned ? m_gauge.map.hits : m_gauge.line.hits; +} + void editor_mode::update_gauge() { - auto *track{m_gauge.enabled && ui()->mode() == nodebank_panel::TRACK ? selected_track() : nullptr}; - if (track == nullptr) + if (ui()->mode() != nodebank_panel::TRACK) { if (false == EditorOverlay.batches.empty()) EditorOverlay.clear(); - m_gauge.track = nullptr; + m_gauge.published = false; return; } + auto *track{m_gauge.enabled ? selected_track() : nullptr}; // the geometry is rescanned once the edit ends if (ImGui::IsMouseDown(0) || m_track_gizmo_using || m_dragging) - { m_gauge.pending = true; - return; + else if (track == nullptr) + { + if (m_gauge.track != nullptr) + { + m_gauge.line = {}; + m_gauge.track = nullptr; + m_gauge.published = false; + } } - if (track == m_gauge.track && m_history.size() == m_gauge.history && false == m_gauge.pending) - return; - m_gauge.track = track; - m_gauge.history = m_history.size(); - m_gauge.pending = false; - scan_gauge(*track); + else if (track != m_gauge.track || m_history.size() != m_gauge.history || m_gauge.pending) + { + m_gauge.track = track; + m_gauge.history = m_history.size(); + m_gauge.pending = false; + scan_gauge(*track); + m_gauge.published = false; + } + if (false == m_gauge.published || glm::distance(Camera.Pos, EditorOverlay.origin) > gauge_origin_range) + gauge_publish(); } void editor_mode::scan_gauge(TTrack &Track) { gauge_load(); - EditorOverlay.clear(); - m_gauge.intrusions = 0; - m_gauge.models = 0; - auto route{editor_track::run_route(Track, m_gauge.reach)}; - auto const samples{editor_track::sample_route(route, 1.0)}; + m_gauge.line = {}; auto const &profile{m_gauge.profiles[m_gauge.profile]}; - if (samples.size() < 2 || profile.outline.size() < 2) + auto route{editor_track::run_route(Track, m_gauge.reach)}; + std::vector const lines{make_line(route)}; + auto const &line{lines.front()}; + if (line.samples.size() < 2 || profile.outline.size() < 2) return; + corridor const space{lines, widest(profile)}; - auto const sections{sections_of(samples)}; - double widest{0.0}; - for (auto const &point : profile.outline) - widest = std::max(widest, point.half_width); - // room for the widening in the sharpest curves on the largest cant - corridor const space{samples, widest + 1.2}; - auto const origin{samples.front().position}; - EditorOverlay.origin = origin; - auto const relative{[&](glm::dvec3 const &Point) { return glm::vec3(Point - origin); }}; auto const lift{[](editor_track::route_sample const &Sample, double const Lateral, double const Height) { auto const normal{corridor::normal(Sample)}; return Sample.position + glm::dvec3(normal.x * Lateral, Height, normal.y * Lateral); }}; - // outline across the track, from the bottom right up and down to the bottom left auto const ring{[&](std::size_t const Index) { - std::vector points; + std::vector points; for (int side : {-1, 1}) for (std::size_t j = 0; j < profile.outline.size(); ++j) { auto const &point{profile.outline[side < 0 ? j : profile.outline.size() - 1 - j]}; - auto const width{point.half_width + gauge::widening(sections[Index], point.height, side)}; - points.push_back(relative(lift(samples[Index], side * width, point.height))); + auto const width{point.half_width + gauge::widening(line.sections[Index], point.height, side)}; + points.push_back(lift(line.samples[Index], side * width, point.height)); } return points; }}; - - gfx::editor_overlay::batch surface{{0.2f, 0.9f, 0.3f, 0.12f}, GL_TRIANGLES}; - gfx::editor_overlay::batch lines{{0.2f, 1.0f, 0.3f, 0.5f}, GL_LINES}; - gfx::editor_overlay::batch intruding{{1.0f, 0.1f, 0.05f, 0.6f}, GL_TRIANGLES, true}; - std::vector previous; + auto &surface{m_gauge.line.surface}; + auto &edges{m_gauge.line.edges}; + std::vector previous; double lastring{-1e9}; - for (std::size_t i = 0; i < samples.size(); i += 2) + for (std::size_t i = 0; i < line.samples.size(); i += 2) { auto const current{ring(i)}; if (false == previous.empty()) for (std::size_t j = 1; j < current.size(); ++j) { - surface.points.insert(surface.points.end(), {previous[j - 1], previous[j], current[j], previous[j - 1], current[j], current[j - 1]}); - lines.points.insert(lines.points.end(), {previous[j], current[j]}); + surface.insert(surface.end(), {previous[j - 1], previous[j], current[j], previous[j - 1], current[j], current[j - 1]}); + edges.insert(edges.end(), {previous[j], current[j]}); } - if (samples[i].chainage - lastring >= 10.0 || i + 2 >= samples.size()) + if (line.samples[i].chainage - lastring >= 10.0 || i + 2 >= line.samples.size()) { - lastring = samples[i].chainage; + lastring = line.samples[i].chainage; for (std::size_t j = 1; j < current.size(); ++j) - lines.points.insert(lines.points.end(), {current[j - 1], current[j]}); + edges.insert(edges.end(), {current[j - 1], current[j]}); } previous = current; } + scan_models(space, profile, m_gauge.line.intruding, m_gauge.line.hits); + if (false == m_gauge.map.scanned) + m_gauge.current = -1; +} - // triangle enters the gauge when any point of a grid spread over it does - auto const inside{[&](glm::dvec3 const &Point) { - auto const local{space.locate(Point)}; - return local && gauge::intrusion(profile, sections[local->sample], local->lateral, local->height) > 0.0; +void editor_mode::scan_gauge_map() +{ + gauge_load(); + auto const started{std::chrono::steady_clock::now()}; + m_gauge.map = {}; + auto const &profile{m_gauge.profiles[m_gauge.profile]}; + auto const lines{scenery_lines()}; + corridor const space{lines, widest(profile)}; + scan_models(space, profile, m_gauge.map.intruding, m_gauge.map.hits); + m_gauge.map.scanned = true; + m_gauge.map.history = m_history.size(); + m_gauge.map.profile = profile.name; + m_gauge.current = -1; + m_gauge.published = false; + WriteLog("Structure gauge (" + profile.name + "): " + std::to_string(m_gauge.map.hits.size()) + " models enter it along " + std::to_string(lines.size()) + " lines, scanned in " + + std::to_string(std::chrono::duration_cast(std::chrono::steady_clock::now() - started).count()) + " ms"); + if (false == m_gauge.map.hits.empty()) + gauge_focus(0); +} + +void editor_mode::gauge_publish() +{ + m_gauge.published = true; + EditorOverlay.clear(); + EditorOverlay.origin = Camera.Pos; + auto const batch{[](glm::vec4 const &Color, unsigned int const Type, bool const Offset, std::vector const &Points) { + gfx::editor_overlay::batch result{Color, Type, Offset}; + result.points.reserve(Points.size()); + for (auto const &point : Points) + result.points.emplace_back(point - EditorOverlay.origin); + return result; }}; - for (auto *instance : simulation::Instances.sequence()) + std::vector marker; + auto const &hits{gauge_hits()}; + if (m_gauge.current >= 0 && m_gauge.current < static_cast(hits.size())) { - if (intruding.points.size() >= 3 * gauge_triangle_limit) - break; - if (instance == nullptr || false == instance->visible() || instance->Model() == nullptr || instance->Model()->GetSMRoot() == nullptr) - continue; - if (false == space.near(instance->location(), instance->radius())) - continue; - auto const before{intruding.points.size()}; - visit_triangles(instance->Model()->GetSMRoot(), placement(*instance), [&](glm::dvec3 const &A, glm::dvec3 const &B, glm::dvec3 const &C) { - auto const edge{std::max({glm::distance(A, B), glm::distance(B, C), glm::distance(C, A)})}; - auto const steps{std::clamp(static_cast(std::ceil(edge / 0.5)), 1, 24)}; - for (int u = 0; u <= steps; ++u) - for (int v = 0; u + v <= steps; ++v) - { - auto const a{static_cast(u) / steps}; - auto const b{static_cast(v) / steps}; - if (inside(A + (B - A) * a + (C - A) * b)) - { - intruding.points.insert(intruding.points.end(), {relative(A), relative(B), relative(C)}); - return; - } - } - }); - if (intruding.points.size() > before) - ++m_gauge.models; + auto const point{hits[m_gauge.current].point}; + marker = {point - glm::dvec3(0.0, 3.0, 0.0), point + glm::dvec3(0.0, 3.0, 0.0), point - glm::dvec3(1.0, 0.0, 0.0), point + glm::dvec3(1.0, 0.0, 0.0), + point - glm::dvec3(0.0, 0.0, 1.0), point + glm::dvec3(0.0, 0.0, 1.0)}; } - m_gauge.intrusions = intruding.points.size() / 3; - EditorOverlay.batches = {std::move(surface), std::move(lines), std::move(intruding)}; + EditorOverlay.batches = {batch({0.2f, 0.9f, 0.3f, 0.12f}, GL_TRIANGLES, false, m_gauge.line.surface), + batch({0.2f, 1.0f, 0.3f, 0.5f}, GL_LINES, false, m_gauge.line.edges), + batch({1.0f, 0.1f, 0.05f, 0.6f}, GL_TRIANGLES, true, m_gauge.line.intruding), + batch({1.0f, 0.1f, 0.05f, 0.6f}, GL_TRIANGLES, true, m_gauge.map.intruding), + batch({1.0f, 0.9f, 0.1f, 1.0f}, GL_LINES, false, marker)}; +} + +void editor_mode::gauge_focus(int const Index) +{ + auto const &hits{gauge_hits()}; + if (hits.empty()) + return; + m_gauge.current = (Index % static_cast(hits.size()) + static_cast(hits.size())) % static_cast(hits.size()); + m_gauge.published = false; + auto const target{hits[m_gauge.current].point}; + // from the side the camera looks from, a bit above + glm::dvec3 away{Camera.Pos.x - target.x, 0.0, Camera.Pos.z - target.z}; + away = glm::length(away) > 1e-3 ? glm::normalize(away) : glm::dvec3(1.0, 0.0, 0.0); + m_focus_start_pos = Camera.Pos; + m_focus_start_angle = Camera.Angle; + m_focus_target_pos = target + away * 12.0 + glm::dvec3(0.0, 4.0, 0.0); + auto const look{glm::normalize(target - m_focus_target_pos)}; + m_focus_target_angle = glm::vec3(static_cast(std::asin(std::clamp(look.y, -1.0, 1.0))), static_cast(std::atan2(-look.x, -look.z)), 0.0f); + m_focus_active = true; + m_focus_time = 0.0; + m_focus_duration = 0.6; } void editor_mode::render_gauge_ui() { if (false == ImGui::CollapsingHeader("Structure gauge")) return; - if (ImGui::Checkbox("Show in the 3D view", &m_gauge.enabled)) + if (ImGui::Checkbox("Show along the selected path", &m_gauge.enabled)) m_gauge.pending = true; if (ImGui::IsItemHovered()) ImGui::SetTooltip("Translucent tunnel of the gauge along the line of the selected path,\nwith the triangles of the models which enter it in red.\nWidened in the curves under 250 m and tilted on the cant, from 20 m (inner side)\nand 26 m (outer side) ahead of the curve, as in the PKP PLK standard, volume II."); @@ -324,75 +477,118 @@ void editor_mode::render_gauge_ui() if (ImGui::SliderFloat("Reach each way (m)", &reach, 50.0f, 2000.0f, "%.0f")) m_gauge.reach = reach; changed |= ImGui::IsItemDeactivatedAfterEdit(); - if (m_gauge.enabled) - { - if (m_gauge.models > 0) - ImGui::TextColored(ImVec4(1.0f, 0.35f, 0.3f, 1.0f), "%zu models enter the gauge (%zu triangles)", m_gauge.models, m_gauge.intrusions); - else - ImGui::TextDisabled("The gauge is clear"); - } - if (ImGui::TreeNode("Outline (right half)")) + if (ImGui::Button("Find the violations on the whole map")) + scan_gauge_map(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("Checks the models along all tracks of the scenery against the chosen gauge,\nmarks them in red and lists them, the deepest first"); + if (m_gauge.map.scanned) { - ImGui::TextDisabled("PKP PLK standard, volume II; below 1170 mm the limit installation gauge.\nMetres from the track axis and above the rail top, bottom up."); - auto &profile{m_gauge.profiles[m_gauge.profile]}; - bool edited{false}; - bool inserted{false}; - int remove{-1}; - ImGui::Columns(3, "gaugeoutline", false); - ImGui::SetColumnWidth(0, 110.0f); - ImGui::SetColumnWidth(1, 110.0f); - ImGui::TextDisabled("Half-width"); - ImGui::NextColumn(); - ImGui::TextDisabled("Height"); - ImGui::NextColumn(); - ImGui::NextColumn(); - for (int i = 0; i < static_cast(profile.outline.size()); ++i) + ImGui::SameLine(); + if (ImGui::SmallButton("Clear")) { - ImGui::PushID(i); - auto &point{profile.outline[i]}; - ImGui::SetNextItemWidth(-1.0f); - ImGui::InputDouble("##width", &point.half_width, 0.0, 0.0, "%.3f"); - edited |= ImGui::IsItemDeactivatedAfterEdit(); - ImGui::NextColumn(); - ImGui::SetNextItemWidth(-1.0f); - ImGui::InputDouble("##height", &point.height, 0.0, 0.0, "%.3f"); - edited |= ImGui::IsItemDeactivatedAfterEdit(); - ImGui::NextColumn(); - if (ImGui::SmallButton("+")) - { - auto const &next{profile.outline[std::min(i + 1, profile.outline.size() - 1)]}; - profile.outline.insert(profile.outline.begin() + i + 1, {0.5 * (point.half_width + next.half_width), 0.5 * (point.height + next.height)}); - inserted = edited = true; - } - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("Insert a point after this one"); - ImGui::SameLine(); - if (profile.outline.size() > 2 && ImGui::SmallButton("x")) - remove = i; - ImGui::NextColumn(); - ImGui::PopID(); - if (inserted) - break; + m_gauge.map = {}; + m_gauge.current = -1; + m_gauge.published = false; } - ImGui::Columns(1); - if (remove >= 0) - { - profile.outline.erase(profile.outline.begin() + remove); - edited = true; - } - if (ImGui::SmallButton("Restore the starting outlines")) - { - m_gauge.profiles = gauge::default_profiles(); - edited = true; - } - if (edited) - { - gauge::save_profiles(gauge_file, m_gauge.profiles); - changed = true; - } - ImGui::TreePop(); + else if (m_gauge.map.history != m_history.size()) + ImGui::TextColored(ImVec4(1.0f, 0.75f, 0.3f, 1.0f), "The scenery changed since the scan (%s)", m_gauge.map.profile.c_str()); } + render_gauge_hits(); + changed |= render_gauge_outline(); if (changed) m_gauge.pending = true; } + +void editor_mode::render_gauge_hits() +{ + auto const &hits{gauge_hits()}; + if (false == m_gauge.map.scanned && (false == m_gauge.enabled || m_gauge.track == nullptr)) + return; + if (hits.empty()) + { + ImGui::TextDisabled(m_gauge.map.scanned ? "No model enters the gauge on the map" : "The gauge is clear along this line"); + return; + } + ImGui::TextColored(ImVec4(1.0f, 0.35f, 0.3f, 1.0f), "%zu models enter the gauge%s", hits.size(), m_gauge.map.scanned ? " on the map" : ""); + if (ImGui::ArrowButton("##gaugeprevious", ImGuiDir_Left)) + gauge_focus(m_gauge.current - 1); + ImGui::SameLine(); + if (ImGui::ArrowButton("##gaugenext", ImGuiDir_Right)) + gauge_focus(m_gauge.current + 1); + ImGui::SameLine(); + ImGui::Text("%d / %zu", m_gauge.current + 1, hits.size()); + ImGui::BeginChild("gaugehits", ImVec2(0.0f, std::min(160.0f, ImGui::GetTextLineHeightWithSpacing() * hits.size() + 8.0f)), true); + ImGuiListClipper clipper(static_cast(hits.size())); + while (clipper.Step()) + for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; ++i) + { + auto const &hit{hits[i]}; + auto const label{(hit.model.empty() ? std::string{"(unnamed)"} : hit.model) + " " + std::to_string(static_cast(std::lround(hit.depth * 100.0))) + " cm##" + std::to_string(i)}; + if (ImGui::Selectable(label.c_str(), m_gauge.current == i)) + gauge_focus(i); + } + ImGui::EndChild(); +} + +bool editor_mode::render_gauge_outline() +{ + if (false == ImGui::TreeNode("Outline (right half)")) + return false; + ImGui::TextDisabled("PKP PLK standard, volume II; below 1170 mm the limit installation gauge.\nMetres from the track axis and above the rail top, bottom up."); + auto &profile{m_gauge.profiles[m_gauge.profile]}; + bool edited{false}; + bool inserted{false}; + int remove{-1}; + ImGui::Columns(3, "gaugeoutline", false); + ImGui::SetColumnWidth(0, 110.0f); + ImGui::SetColumnWidth(1, 110.0f); + ImGui::TextDisabled("Half-width"); + ImGui::NextColumn(); + ImGui::TextDisabled("Height"); + ImGui::NextColumn(); + ImGui::NextColumn(); + for (int i = 0; i < static_cast(profile.outline.size()); ++i) + { + ImGui::PushID(i); + auto &point{profile.outline[i]}; + ImGui::SetNextItemWidth(-1.0f); + ImGui::InputDouble("##width", &point.half_width, 0.0, 0.0, "%.3f"); + edited |= ImGui::IsItemDeactivatedAfterEdit(); + ImGui::NextColumn(); + ImGui::SetNextItemWidth(-1.0f); + ImGui::InputDouble("##height", &point.height, 0.0, 0.0, "%.3f"); + edited |= ImGui::IsItemDeactivatedAfterEdit(); + ImGui::NextColumn(); + if (ImGui::SmallButton("+")) + { + auto const &next{profile.outline[std::min(i + 1, profile.outline.size() - 1)]}; + profile.outline.insert(profile.outline.begin() + i + 1, {0.5 * (point.half_width + next.half_width), 0.5 * (point.height + next.height)}); + inserted = edited = true; + } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("Insert a point after this one"); + ImGui::SameLine(); + if (profile.outline.size() > 2 && ImGui::SmallButton("x")) + remove = i; + ImGui::NextColumn(); + ImGui::PopID(); + if (inserted) + break; + } + ImGui::Columns(1); + if (remove >= 0) + { + profile.outline.erase(profile.outline.begin() + remove); + edited = true; + } + if (ImGui::SmallButton("Restore the starting outlines")) + { + m_gauge.profiles = gauge::default_profiles(); + edited = true; + } + if (edited) + gauge::save_profiles(gauge_file, m_gauge.profiles); + ImGui::TreePop(); + return edited; +} From 208ad3400d1b3b0a8a0548f408ddbe92b8b0f3fc Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 01:48:11 +0200 Subject: [PATCH 106/430] fix: structure gauge measured from the rail head, not the rail foot of the scenery points --- application/editormodegauge.cpp | 3 ++- editor/editorGauge.hpp | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/application/editormodegauge.cpp b/application/editormodegauge.cpp index 53f2e889b..f01ddce66 100644 --- a/application/editormodegauge.cpp +++ b/application/editormodegauge.cpp @@ -51,8 +51,9 @@ gauge_line make_line(editor_track::route &Route) gauge_line line; line.samples = editor_track::sample_route(Route, 1.0); std::vector chainage, curvature, cant; - for (auto const &sample : line.samples) + for (auto &sample : line.samples) { + sample.position.y += gauge::rail_height; chainage.push_back(sample.chainage); curvature.push_back(sample.curvature); cant.push_back(sample.cant); diff --git a/editor/editorGauge.hpp b/editor/editorGauge.hpp index 7ef65bbf0..ee9b6be8c 100644 --- a/editor/editorGauge.hpp +++ b/editor/editorGauge.hpp @@ -37,6 +37,9 @@ std::vector default_profiles(); std::vector load_profiles(std::string const &File); void save_profiles(std::string const &File, std::vector const &Profiles); +// the points of the paths in the scenery lie at the rail foot, the gauge is measured from the rail head +double constexpr rail_height{0.18}; + // below this height the outline is the limit installation gauge, which leaves the room for the platforms double constexpr lower_part{1.17}; From d57215877f61259f19ed911415ba500243829ba8 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 01:54:17 +0200 Subject: [PATCH 107/430] feat: structure gauge window in the menu bar, gauge tunnel around the hit, fixed reach --- application/editormode.cpp | 2 + application/editormode.h | 14 ++- application/editormodegauge.cpp | 158 ++++++++++++++++++++------------ application/editormodetrack.cpp | 1 - application/editoruilayer.cpp | 6 ++ application/editoruilayer.h | 6 ++ 6 files changed, 124 insertions(+), 63 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index f074dc054..dc90ca720 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -340,6 +340,7 @@ editor_mode::editor_mode() { ui()->set_gizmo_options([this]() { render_gizmo_options(); }); ui()->set_file_actions([this]() { save(); }, [this]() { export_scenery(); }); ui()->set_track_options([this]() { render_track_ui(); }); + ui()->set_gauge_window(&m_gauge.open); // the orthophoto is fitted onto the same ground as the area fill uses, terrain tile models included m_orthophoto.ground_source([](glm::dvec2 const &Min, glm::dvec2 const &Max, std::vector &Out) { gather_ground_triangles(Min, Max, true, 50.0f, Out); @@ -1036,6 +1037,7 @@ bool editor_mode::update() render_infra_window(); } update_gauge(); + render_gauge_window(); // --- area fill: outline overlay while the mode is active (its settings are drawn in the node bank window) --- if (ui()->mode() == nodebank_panel::FILL) diff --git a/application/editormode.h b/application/editormode.h index f6dbe1662..4bef2f715 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -45,6 +45,8 @@ class editor_mode : public application_mode, private editor_track::observer std::string model; glm::dvec3 point{0.0}; double depth{0.0}; // m + TTrack const *track{nullptr}; // nearest one, may be gone by now + int path{0}; }; // constructors editor_mode(); @@ -316,10 +318,10 @@ class editor_mode : public application_mode, private editor_track::observer // structure gauge along the line of the selected path, shown in the 3d view struct gauge_state { - bool enabled{false}; + bool open{false}; // window + bool enabled{true}; // tunnel along the selected path std::vector profiles; int profile{0}; - double reach{500.0}; // m, each way from the path TTrack const *track{nullptr}; // scanned std::size_t history{0}; bool pending{false}; // rescan once the edit ends @@ -338,6 +340,11 @@ class editor_mode : public application_mode, private editor_track::observer std::vector intruding; std::vector hits; } map; // whole scenery + struct + { + std::vector surface; + std::vector edges; + } spot; // tunnel around the hit the camera went to int current{-1}; // hit the camera went to bool published{false}; // overlay up to date } m_gauge; @@ -348,7 +355,8 @@ class editor_mode : public application_mode, private editor_track::observer void scan_gauge_map(); void gauge_publish(); void gauge_focus(int Index); - void render_gauge_ui(); + void gauge_spot(gauge_hit const &Hit); + void render_gauge_window(); void render_gauge_hits(); bool render_gauge_outline(); struct route_design diff --git a/application/editormodegauge.cpp b/application/editormodegauge.cpp index f01ddce66..2a07a9506 100644 --- a/application/editormodegauge.cpp +++ b/application/editormodegauge.cpp @@ -38,10 +38,14 @@ char const *const gauge_file{"editor_structure_gauges.txt"}; std::size_t const gauge_triangle_limit{200000}; // past this distance of the camera from the origin of the overlay it's rebuilt, to keep its float precision double const gauge_origin_range{2000.0}; +// length of the line shown each way from the selected path, and around a hit +double const gauge_reach{500.0}; +double const gauge_spot_reach{60.0}; // sampled line of the tracks with the widening of the gauge along it struct gauge_line { + editor_track::route route; std::vector samples; std::vector sections; }; @@ -50,6 +54,7 @@ gauge_line make_line(editor_track::route &Route) { gauge_line line; line.samples = editor_track::sample_route(Route, 1.0); + line.route = Route; std::vector chainage, curvature, cant; for (auto &sample : line.samples) { @@ -128,8 +133,13 @@ public: return false; } - // deepest intrusion of the point into the gauge of the lines nearby, not positive outside of them - double intrusion(gauge::profile const &Profile, glm::dvec3 const &Point) const + struct hit + { + double depth{0.0}; // not positive outside of the gauge + editor_track::route_span const *span{nullptr}; // of the line the point enters + }; + // deepest intrusion of the point into the gauge of the lines nearby + hit intrusion(gauge::profile const &Profile, glm::dvec3 const &Point) const { auto const point{plan_of(Point)}; auto const center{index(point, cell)}; @@ -153,7 +163,7 @@ public: *same = {candidate, distance}; } } - double deepest{0.0}; + hit deepest; for (auto const &[found, distance] : nearest) { auto const &line{m_lines[found.line]}; @@ -163,7 +173,9 @@ public: if ((found.index == 0 && along < -0.6) || (found.index + 1 == line.samples.size() && along > 0.6)) continue; auto const height{Point.y - (sample.position.y + sample.grade * along)}; - deepest = std::max(deepest, gauge::intrusion(Profile, line.sections[found.index], glm::dot(offset, normal(sample)), height)); + auto const depth{gauge::intrusion(Profile, line.sections[found.index], glm::dot(offset, normal(sample)), height)}; + if (depth > deepest.depth) + deepest = {depth, &line.route.spans[sample.span]}; } return deepest; } @@ -251,7 +263,7 @@ void scan_models(corridor const &Space, gauge::profile const &Profile, std::vect continue; if (false == Space.near(instance->location(), instance->radius())) continue; - editor_mode::gauge_hit hit{instance->name(), instance->location(), 0.0}; + editor_mode::gauge_hit hit{instance->name(), instance->location()}; // the triangle enters the gauge when any point of a grid spread over it does visit_triangles(instance->Model()->GetSMRoot(), placement(*instance), [&](glm::dvec3 const &A, glm::dvec3 const &B, glm::dvec3 const &C) { auto const edge{std::max({glm::distance(A, B), glm::distance(B, C), glm::distance(C, A)})}; @@ -260,14 +272,16 @@ void scan_models(corridor const &Space, gauge::profile const &Profile, std::vect for (int v = 0; u + v <= steps; ++v) { auto const point{A + (B - A) * (static_cast(u) / steps) + (C - A) * (static_cast(v) / steps)}; - auto const depth{Space.intrusion(Profile, point)}; - if (depth <= 0.0) + auto const found{Space.intrusion(Profile, point)}; + if (found.depth <= 0.0) continue; Triangles.insert(Triangles.end(), {A, B, C}); - if (depth > hit.depth) + if (found.depth > hit.depth) { - hit.depth = depth; + hit.depth = found.depth; hit.point = point; + hit.track = found.span->track; + hit.path = found.span->path; } return; } @@ -278,6 +292,46 @@ void scan_models(corridor const &Space, gauge::profile const &Profile, std::vect std::sort(Hits.begin(), Hits.end(), [](auto const &Left, auto const &Right) { return Left.depth > Right.depth; }); } +// translucent tunnel of the gauge along the line, with the rings every 10 m and the lines along its corners +void build_tunnel(gauge_line const &Line, gauge::profile const &Profile, std::vector &Surface, std::vector &Edges) +{ + auto const lift{[](editor_track::route_sample const &Sample, double const Lateral, double const Height) { + auto const normal{corridor::normal(Sample)}; + return Sample.position + glm::dvec3(normal.x * Lateral, Height, normal.y * Lateral); + }}; + // outline across the track, from the bottom right up and down to the bottom left + auto const ring{[&](std::size_t const Index) { + std::vector points; + for (int side : {-1, 1}) + for (std::size_t j = 0; j < Profile.outline.size(); ++j) + { + auto const &point{Profile.outline[side < 0 ? j : Profile.outline.size() - 1 - j]}; + auto const width{point.half_width + gauge::widening(Line.sections[Index], point.height, side)}; + points.push_back(lift(Line.samples[Index], side * width, point.height)); + } + return points; + }}; + std::vector previous; + double lastring{-1e9}; + for (std::size_t i = 0; i < Line.samples.size(); i += 2) + { + auto const current{ring(i)}; + if (false == previous.empty()) + for (std::size_t j = 1; j < current.size(); ++j) + { + Surface.insert(Surface.end(), {previous[j - 1], previous[j], current[j], previous[j - 1], current[j], current[j - 1]}); + Edges.insert(Edges.end(), {previous[j], current[j]}); + } + if (Line.samples[i].chainage - lastring >= 10.0 || i + 2 >= Line.samples.size()) + { + lastring = Line.samples[i].chainage; + for (std::size_t j = 1; j < current.size(); ++j) + Edges.insert(Edges.end(), {current[j - 1], current[j]}); + } + previous = current; + } +} + double widest(gauge::profile const &Profile) { double result{0.0}; @@ -303,7 +357,7 @@ std::vector const &editor_mode::gauge_hits() const void editor_mode::update_gauge() { - if (ui()->mode() != nodebank_panel::TRACK) + if (false == m_gauge.open) { if (false == EditorOverlay.batches.empty()) EditorOverlay.clear(); @@ -340,50 +394,12 @@ void editor_mode::scan_gauge(TTrack &Track) gauge_load(); m_gauge.line = {}; auto const &profile{m_gauge.profiles[m_gauge.profile]}; - auto route{editor_track::run_route(Track, m_gauge.reach)}; + auto route{editor_track::run_route(Track, gauge_reach)}; std::vector const lines{make_line(route)}; - auto const &line{lines.front()}; - if (line.samples.size() < 2 || profile.outline.size() < 2) + if (lines.front().samples.size() < 2 || profile.outline.size() < 2) return; corridor const space{lines, widest(profile)}; - - auto const lift{[](editor_track::route_sample const &Sample, double const Lateral, double const Height) { - auto const normal{corridor::normal(Sample)}; - return Sample.position + glm::dvec3(normal.x * Lateral, Height, normal.y * Lateral); - }}; - // outline across the track, from the bottom right up and down to the bottom left - auto const ring{[&](std::size_t const Index) { - std::vector points; - for (int side : {-1, 1}) - for (std::size_t j = 0; j < profile.outline.size(); ++j) - { - auto const &point{profile.outline[side < 0 ? j : profile.outline.size() - 1 - j]}; - auto const width{point.half_width + gauge::widening(line.sections[Index], point.height, side)}; - points.push_back(lift(line.samples[Index], side * width, point.height)); - } - return points; - }}; - auto &surface{m_gauge.line.surface}; - auto &edges{m_gauge.line.edges}; - std::vector previous; - double lastring{-1e9}; - for (std::size_t i = 0; i < line.samples.size(); i += 2) - { - auto const current{ring(i)}; - if (false == previous.empty()) - for (std::size_t j = 1; j < current.size(); ++j) - { - surface.insert(surface.end(), {previous[j - 1], previous[j], current[j], previous[j - 1], current[j], current[j - 1]}); - edges.insert(edges.end(), {previous[j], current[j]}); - } - if (line.samples[i].chainage - lastring >= 10.0 || i + 2 >= line.samples.size()) - { - lastring = line.samples[i].chainage; - for (std::size_t j = 1; j < current.size(); ++j) - edges.insert(edges.end(), {current[j - 1], current[j]}); - } - previous = current; - } + build_tunnel(lines.front(), profile, m_gauge.line.surface, m_gauge.line.edges); scan_models(space, profile, m_gauge.line.intruding, m_gauge.line.hits); if (false == m_gauge.map.scanned) m_gauge.current = -1; @@ -433,7 +449,9 @@ void editor_mode::gauge_publish() batch({0.2f, 1.0f, 0.3f, 0.5f}, GL_LINES, false, m_gauge.line.edges), batch({1.0f, 0.1f, 0.05f, 0.6f}, GL_TRIANGLES, true, m_gauge.line.intruding), batch({1.0f, 0.1f, 0.05f, 0.6f}, GL_TRIANGLES, true, m_gauge.map.intruding), - batch({1.0f, 0.9f, 0.1f, 1.0f}, GL_LINES, false, marker)}; + batch({1.0f, 0.9f, 0.1f, 1.0f}, GL_LINES, false, marker), + batch({0.2f, 0.9f, 0.3f, 0.12f}, GL_TRIANGLES, false, m_gauge.spot.surface), + batch({0.2f, 1.0f, 0.3f, 0.5f}, GL_LINES, false, m_gauge.spot.edges)}; } void editor_mode::gauge_focus(int const Index) @@ -443,6 +461,7 @@ void editor_mode::gauge_focus(int const Index) return; m_gauge.current = (Index % static_cast(hits.size()) + static_cast(hits.size())) % static_cast(hits.size()); m_gauge.published = false; + gauge_spot(hits[m_gauge.current]); auto const target{hits[m_gauge.current].point}; // from the side the camera looks from, a bit above glm::dvec3 away{Camera.Pos.x - target.x, 0.0, Camera.Pos.z - target.z}; @@ -457,14 +476,38 @@ void editor_mode::gauge_focus(int const Index) m_focus_duration = 0.6; } -void editor_mode::render_gauge_ui() +void editor_mode::gauge_spot(gauge_hit const &Hit) { - if (false == ImGui::CollapsingHeader("Structure gauge")) + m_gauge.spot = {}; + auto const &paths{simulation::Paths.sequence()}; + // the hit outlives the scan, the path may be gone since + if (Hit.track == nullptr || std::find(paths.begin(), paths.end(), Hit.track) == paths.end()) return; + auto *track{const_cast(Hit.track)}; + editor_track::route route; + if (Hit.path == 0) + route = editor_track::run_route(*track, gauge_spot_reach); + else + route.spans.push_back({track, Hit.path, true}); + auto const line{make_line(route)}; + if (line.samples.size() >= 2) + build_tunnel(line, m_gauge.profiles[m_gauge.profile], m_gauge.spot.surface, m_gauge.spot.edges); +} + +void editor_mode::render_gauge_window() +{ + if (false == m_gauge.open) + return; + ImGui::SetNextWindowSize(ImVec2(380.0f, 420.0f), ImGuiCond_FirstUseEver); + if (false == ImGui::Begin("Structure gauge", &m_gauge.open)) + { + ImGui::End(); + return; + } if (ImGui::Checkbox("Show along the selected path", &m_gauge.enabled)) m_gauge.pending = true; if (ImGui::IsItemHovered()) - ImGui::SetTooltip("Translucent tunnel of the gauge along the line of the selected path,\nwith the triangles of the models which enter it in red.\nWidened in the curves under 250 m and tilted on the cant, from 20 m (inner side)\nand 26 m (outer side) ahead of the curve, as in the PKP PLK standard, volume II."); + ImGui::SetTooltip("Translucent tunnel of the gauge 500 m each way along the line of the selected path,\nwith the triangles of the models which enter it in red.\nWidened in the curves under 250 m and tilted on the cant, from 20 m (inner side)\nand 26 m (outer side) ahead of the curve, as in the PKP PLK standard, volume II."); gauge_load(); auto const previous{m_gauge.profile}; for (int i = 0; i < static_cast(m_gauge.profiles.size()); ++i) @@ -474,10 +517,6 @@ void editor_mode::render_gauge_ui() ImGui::RadioButton(m_gauge.profiles[i].name.c_str(), &m_gauge.profile, i); } bool changed{previous != m_gauge.profile}; - float reach{static_cast(m_gauge.reach)}; - if (ImGui::SliderFloat("Reach each way (m)", &reach, 50.0f, 2000.0f, "%.0f")) - m_gauge.reach = reach; - changed |= ImGui::IsItemDeactivatedAfterEdit(); if (ImGui::Button("Find the violations on the whole map")) scan_gauge_map(); @@ -499,6 +538,7 @@ void editor_mode::render_gauge_ui() changed |= render_gauge_outline(); if (changed) m_gauge.pending = true; + ImGui::End(); } void editor_mode::render_gauge_hits() diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 2fb4ace35..4e3b9a947 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -482,7 +482,6 @@ void editor_mode::render_track_window() m_infra.scope = 1; infra_recognize(); } - render_gauge_ui(); ImGui::End(); } diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index aaef57837..a46104912 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -143,6 +143,12 @@ void editor_ui::render_menu_contents() ImGui::MenuItem(STR_C("Include database"), nullptr, &m_includespanel.is_open); ImGui::EndMenu(); } + if (m_gaugewindow != nullptr) + { + ImGui::MenuItem(STR_C("Structure gauge"), nullptr, m_gaugewindow); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Checks which models enter the structure gauge of the tracks (skrajnia budowli)")); + } } void editor_ui::set_file_actions(std::function Save, std::function Export) diff --git a/application/editoruilayer.h b/application/editoruilayer.h index f4b3c9712..7ae7faa9d 100644 --- a/application/editoruilayer.h +++ b/application/editoruilayer.h @@ -59,6 +59,11 @@ class editor_ui : public ui_layer { m_gizmooptions = std::move(Renderer); } + // switch of the structure gauge window in the menu bar (the window lives in the editor mode) + void set_gauge_window(bool *Open) + { + m_gaugewindow = Open; + } // actions of the file menu, performed by the editor mode void set_file_actions(std::function Save, std::function Export); // shows outcome of an operation in the layers window @@ -84,4 +89,5 @@ class editor_ui : public ui_layer std::function m_trackoptions; std::function m_gizmooptions; scene::basic_node *m_node{nullptr}; // currently bound scene node, if any + bool *m_gaugewindow{nullptr}; }; From 27a94509c451a9b2126d0828e8a6710992899328 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Sun, 4 Oct 2026 01:55:35 +0200 Subject: [PATCH 108/430] feat(roads): right of way and lane turns at junctions, road weights, kerbs, medians and forking roads, banks to the ground, roundabouts, pedestrian crossings, spawn sets by count; fix(editor): model skin export, placement on the ground under the orthophoto --- application/editormode.cpp | 127 ++- application/editormode.h | 21 +- application/editormoderoad.cpp | 456 +++++++++- editor/editorRoad.cpp | 209 ++++- editor/editorRoad.hpp | 9 +- model/AnimModel.cpp | 37 +- model/AnimModel.h | 1 + simulation/simulation.cpp | 3 +- simulation/simulationstateserializer.cpp | 3 +- vehicle/Driver.cpp | 2 +- world/Road.cpp | 1020 ++++++++++++++++++++-- world/Road.h | 121 ++- world/RoadOrder.h | 60 ++ world/RoadPoint.cpp | 318 ++++--- world/RoadPoint.h | 28 +- world/Track.cpp | 23 + world/Track.h | 4 + 17 files changed, 2198 insertions(+), 244 deletions(-) create mode 100644 world/RoadOrder.h diff --git a/application/editormode.cpp b/application/editormode.cpp index d690a1991..32dd37cf5 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -476,7 +476,10 @@ editor_mode::editor_mode() { ui()->set_gizmo_options([this]() { render_gizmo_options(); }); ui()->set_file_actions([this]() { save(); }, [this]() { export_scenery(); }); ui()->set_track_options([this]() { render_track_ui(); }); - ui()->set_menu_options([this]() { render_road_menu(); }); + ui()->set_menu_options([this]() { + render_object_menu(); + render_road_menu(); + }); m_roadtool.settings.normalize(); road_select(nullptr); // the orthophoto is fitted onto the same ground as the area fill uses, terrain tile models included @@ -744,7 +747,7 @@ void editor_mode::handle_brush_mouse_hold(int Action, int Button) std::string name = "editor_"; - TAnimModel *cloned = simulation::State.create_model(*src, name, newPos); + TAnimModel *cloned = simulation::State.create_model(*src, name, placement_on_ground(newPos)); oldPos = newPos; m_brush_has_last = true; if (!cloned) @@ -2010,7 +2013,7 @@ void editor_mode::place_include(std::string const &File, int const RotationMode, ui()->set_status("Template \"" + File + "\" can't be placed: the file of the active layer would receive it with a rotation or a scale in effect. Pick another layer.", true); return; } - glm::dvec3 const location = Camera.Pos + clamp_mouse_offset_to_max(GfxRenderer->Mouse_Position()); + glm::dvec3 const location = placement_on_ground(Camera.Pos + clamp_mouse_offset_to_max(GfxRenderer->Mouse_Position())); std::optional yaw; if (RotationMode == functions_panel::RANDOM) yaw = static_cast(LocalRandom(0.0, 360.0)); @@ -2148,6 +2151,119 @@ void editor_mode::capture_terrain() simulation::State.delete_model(model); } +// the ground under a point the cursor landed on. the orthophoto laid over the ground catches the cursor like any +// other surface, so the point can hang over the ground by as much as the orthophoto is lifted, or lie on the flat sheet +// the orthophoto makes where it's not fitted to the ground. what's put in the scenery is to stand on the ground itself +glm::dvec3 editor_mode::placement_on_ground(glm::dvec3 Location) +{ + double constexpr reach = 2.0; // the ground is asked about this far around the point + double constexpr slack = 0.5; // a surface this far over the point still is what the cursor landed on + double constexpr height_tolerance = 50.0; // with nothing there or lower, how far up the ground is looked for + float constexpr terrain_model_radius = 50.0f; // the same models count as ground as for the area fill and the orthophoto + + glm::dvec2 const bmin{Location.x - reach, Location.z - reach}; + glm::dvec2 const bmax{Location.x + reach, Location.z + reach}; + std::vector triangles; + gather_ground_triangles(bmin, bmax, true, terrain_model_radius, triangles); + triangle_grid const ground(std::move(triangles), bmin, bmax); + auto const terrains = active_terrains(); + for (double const ceiling : {Location.y + slack, Location.y + height_tolerance}) + { + double y = -std::numeric_limits::max(); + bool found = ground.height_at(Location.x, Location.z, ceiling, y); + for (editor_terrain *terrain : terrains) + { + if (!terrain->contains(Location.x, Location.z)) + continue; + double const h = terrain->height_at(Location.x, Location.z); + if (h <= ceiling && (!found || h > y)) + { + y = h; + found = true; + } + } + if (found) + { + Location.y = y; + break; + } + } + // with no ground found the point stays where the cursor landed + return Location; +} + +// puts every instance of the model the selected node shows on the ground under it +void editor_mode::drop_model_instances() +{ + auto *selected = dynamic_cast(m_node); + if (selected == nullptr || selected->Model() == nullptr) + { + ui()->set_status("Select a model in the scene first", true); + return; + } + if (selected->radius() >= 50.0f) + { + // it'd be put on top of itself + ui()->set_status("\"" + selected->Model()->NameGet() + "\" is large enough to count as ground itself, so there's nothing to put it on", true); + return; + } + std::vector instances; + std::vector points; + int locked = 0; + for (auto *instance : simulation::Instances.sequence()) + { + if (instance == nullptr || instance->Model() != selected->Model()) + continue; + if (instance->from_template() || false == scene::Layers.editable(instance)) + { + // placed by a template, or on a layer which is hidden or locked + ++locked; + continue; + } + instances.push_back(instance); + points.push_back(instance->location()); + } + // the ground the road tools use: terrain shapes, large models and the terrain made in the editor, without the roads and the orthophoto. + // a point with nothing under it comes back with the height it has + auto const heights = ground_heights(points, true); + int moved = 0; + for (std::size_t idx = 0; idx < instances.size(); ++idx) + { + if (std::abs(heights[idx] - points[idx].y) < 0.001) + continue; + auto *instance = instances[idx]; + // one step of the history for each instance + push_snapshot(instance, EditorSnapshot::Action::Move); + auto location = points[idx]; + location.y = heights[idx]; + simulation::Region->erase(instance); + instance->location(location); + simulation::Region->insert(instance); + instance->mark_dirty(); + ++moved; + } + std::string status = std::to_string(moved) + " of " + std::to_string(instances.size()) + " instances of \"" + selected->Model()->NameGet() + "\" put on the ground"; + if (moved > 0) + status += "; Ctrl+Z takes them back one at a time"; + if (locked > 0) + status += ". " + std::to_string(locked) + " left alone: placed by a template, or on a layer which can't be edited"; + ui()->set_status(status); +} + +void editor_mode::render_object_menu() +{ + if (ImGui::BeginMenu("Objects")) + { + auto const *selected = dynamic_cast(m_node); + if (ImGui::MenuItem("Put all instances of the selected model on the ground", nullptr, false, selected != nullptr && selected->Model() != nullptr)) + drop_model_instances(); + if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled)) + ImGui::SetTooltip("%s", "Select a model in the scene. Every instance of the same model file is moved straight up or down\n" + "to the ground under it: terrain, large models and terrain made in the editor."); + ImGui::EndMenu(); + } +} + void editor_mode::add_area_fill_point() { // like the other placement tools, the point comes from the depth buffer under the cursor @@ -2156,7 +2272,8 @@ void editor_mode::add_area_fill_point() if (glm::length(offset) < 1e-3) return; // no ground under the cursor (yet) - m_fill_points.push_back(Camera.Pos + offset); + // the outline gives the fill the height to look for the ground at, and the height of what it finds no ground for + m_fill_points.push_back(placement_on_ground(Camera.Pos + offset)); } void editor_mode::undo_last_area_fill() @@ -3227,7 +3344,7 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const std::string name = "editor_"; glm::dvec3 mouseOffset = clamp_mouse_offset_to_max(GfxRenderer->Mouse_Position()); - TAnimModel *cloned = simulation::State.create_model(*src, name, Camera.Pos + mouseOffset); + TAnimModel *cloned = simulation::State.create_model(*src, name, placement_on_ground(Camera.Pos + mouseOffset)); if (!cloned) return; diff --git a/application/editormode.h b/application/editormode.h index 47f218929..104e260a5 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -160,6 +160,11 @@ class editor_mode : public application_mode int m_max_history_size{200}; int m_selected_history_idx{-1}; glm::dvec3 clamp_mouse_offset_to_max(const glm::dvec3 &offset); + // the ground under a point the cursor landed on, for things which are to stand on the ground + glm::dvec3 placement_on_ground(glm::dvec3 Location); + // puts every instance of the model the selected node shows on the ground under it + void drop_model_instances(); + void render_object_menu(); // focus camera smoothly on specified node void start_focus(scene::basic_node *node, double duration = 0.6); @@ -523,9 +528,13 @@ class editor_mode : public application_mode bool follow{true}; // built roads are led over the ground between the clicked points float crossingspeed{30.f}; // speed limit on the junctions being made float heightstep{0.1f}; // how much the selected points are raised or lowered at a time + bool ring{false}; // the build tool makes roundabouts + float ringradius{15.f}; // of the middle of the road going around + std::string island{"none"}; // what the middle of a roundabout is covered with + float bankgrade{1.5f}; // metres a bank led to the ground runs for each metre it drops // level crossings and traffic points - int placekind{0}; // what the place tool puts down: 0: level crossing, 1: spawn point, 2: removal point - roadpoint_node::state placing[3]; // what the next point of each kind is going to be like + int placekind{0}; // what the place tool puts down: 0: level crossing, 1: spawn point, 2: removal point, 3: pedestrian crossing + roadpoint_node::state placing[4]; // what the next point of each kind is going to be like float stopmargin{5.f}; // distance from the outermost track of a new crossing to the places the vehicles stop at roadpoint_node::state target; // the point a click of the place tool would make at the moment bool hastarget{false}; @@ -542,6 +551,10 @@ class editor_mode : public application_mode char surface[128]{}; char sides[2][128]{}; char filter[64]{"asph"}; + char kerbtext[128]{}; + char mediantext[128]{}; + char banktext[128]{}; + char islandtext[128]{"none"}; }; void render_road_menu(); void render_road_window(); @@ -564,6 +577,10 @@ class editor_mode : public application_mode bool road_points_apply(std::vector> const &Changes, std::vector> const &Junctions); // takes the selected points out of their roads bool road_points_delete(); + // puts a roundabout around specified point + void road_roundabout(glm::dvec3 const &Ground); + // leads the banks of the selected piece, or of the whole road, to the ground beside it + void road_bank_to_ground(); // level crossings and traffic points void roadpoint_select(roadpoint_node *Point); // works out the point a click of the place tool would make. Fresh: even if the cursor is where it was the last time diff --git a/application/editormoderoad.cpp b/application/editormoderoad.cpp index 4c38c7988..e588afe6d 100644 --- a/application/editormoderoad.cpp +++ b/application/editormoderoad.cpp @@ -159,15 +159,21 @@ ImU32 const kSnapColor{IM_COL32(255, 60, 255, 255)}; ImU32 const kCrossingColor{IM_COL32(255, 220, 60, 230)}; ImU32 const kSpawnColor{IM_COL32(90, 230, 120, 230)}; ImU32 const kDespawnColor{IM_COL32(255, 110, 110, 230)}; +ImU32 const kCrosswalkColor{IM_COL32(235, 235, 235, 230)}; +double const kBankReach{30.0}; // how far from the road the ground is looked for, for a bank to be led to it +double const kBankStep{0.5}; roadpoint_node::kind_type point_kind(int const Index) { - return Index == 1 ? roadpoint_node::kind_type::spawn : Index == 2 ? roadpoint_node::kind_type::despawn : roadpoint_node::kind_type::crossing; + return Index == 1 ? roadpoint_node::kind_type::spawn : Index == 2 ? roadpoint_node::kind_type::despawn : Index == 3 ? roadpoint_node::kind_type::crosswalk : roadpoint_node::kind_type::crossing; } char const *point_label(roadpoint_node::kind_type const Kind) { - return Kind == roadpoint_node::kind_type::spawn ? "spawn point" : Kind == roadpoint_node::kind_type::despawn ? "removal point" : "level crossing"; + return Kind == roadpoint_node::kind_type::spawn ? "spawn point" : + Kind == roadpoint_node::kind_type::despawn ? "removal point" : + Kind == roadpoint_node::kind_type::crosswalk ? "pedestrian crossing" : + "level crossing"; } // gathers new definitions for the pieces which meet or end at provided points. @@ -267,6 +273,12 @@ void editor_mode::update_road_tool() } if (tool.tool != 1) return; + if (tool.ring) + { + // a click puts a roundabout around the cursor, there's nothing to lead from a point to another + tool.chain = false; + return; + } if (tool.chain) { // what a click would make at the moment, to be drawn over the view @@ -304,6 +316,9 @@ void editor_mode::road_select(road_node *Road) copy_text(tool.surface, sizeof(tool.surface), tool.settings.surface); for (int side = 0; side < 2; ++side) copy_text(tool.sides[side], sizeof(tool.sides[side]), tool.settings.sides[side].material); + copy_text(tool.kerbtext, sizeof(tool.kerbtext), tool.settings.kerbmaterial); + copy_text(tool.mediantext, sizeof(tool.mediantext), tool.settings.median.material); + copy_text(tool.banktext, sizeof(tool.banktext), tool.settings.bankmaterial); } void editor_mode::junction_select(junction_node *Junction) @@ -320,6 +335,7 @@ void editor_mode::junction_select(junction_node *Junction) // the fields for the names of materials are shared with the roads copy_text(tool.surface, sizeof(tool.surface), Junction->definition().surface); copy_text(tool.sides[0], sizeof(tool.sides[0]), Junction->definition().side.material); + copy_text(tool.kerbtext, sizeof(tool.kerbtext), Junction->definition().kerbmaterial); } void editor_mode::roadpoint_select(roadpoint_node *Point) @@ -351,6 +367,21 @@ void editor_mode::roadpoint_aim(bool const Fresh) tool.hastarget = false; tool.targetnote.clear(); tool.targetdirection = glm::dvec3{0.0}; + if (kind == roadpoint_node::kind_type::crosswalk) + { + auto const *road{editor_road::nearest(tool.mouse, kSideMargin)}; + if (road == nullptr) + { + tool.targetnote = "Point at a road"; + return; + } + // the stripes go across the road, whichever part of it the cursor is over + auto const t{editor_road::nearest_parameter(road->definition(), tool.mouse)}; + tool.target.position = road->definition().point(t); + tool.targetdirection = road->definition().tangent(t); + tool.hastarget = true; + return; + } if (kind == roadpoint_node::kind_type::crossing) { auto const *road{editor_road::nearest(tool.mouse, kSideMargin)}; @@ -418,7 +449,7 @@ void editor_mode::roadpoint_place() case roadpoint_node::kind_type::spawn: { tool.status = (state.vehicles.empty() ? std::string{"Spawn point made, with no vehicles: nothing appears there until it's given some (Select, click the point)."} : - "Spawn point made, with " + std::to_string(state.vehicles.size() * state.copies) + " vehicles. They appear while the simulation runs."); + "Spawn point made, with up to " + std::to_string(state.count) + " vehicles on the roads at a time. They appear while the simulation runs."); break; } case roadpoint_node::kind_type::despawn: @@ -426,6 +457,11 @@ void editor_mode::roadpoint_place() tool.status = "Removal point made, it takes vehicles from " + std::to_string(point->lanes().size()) + (point->lanes().size() == 1 ? " lane." : " lanes."); break; } + case roadpoint_node::kind_type::crosswalk: + { + tool.status = "Pedestrian crossing painted."; + break; + } } if (false == tool.targetnote.empty()) tool.status += " " + tool.targetnote + "."; @@ -520,12 +556,13 @@ bool editor_mode::render_roadpoint_layout(roadpoint_node::state &State, roadpoin if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", "The speed the vehicles appear with. From there on the drivers go by the speed limits of the lanes."); ImGui::SetNextItemWidth(120.0f); - if (ImGui::InputInt("Copies of each vehicle", &State.copies, 1, 1, flags)) + if (ImGui::InputInt("Vehicles on the roads at a time", &State.count, 1, 5, flags)) changed = true; if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", "How many of each vehicle of the set are made. A vehicle can't be in two places at once,\n" - "so this is how many of a kind can be on the road together. All of them are loaded along with the scenery,\n" - "and a vehicle taken by a removal point goes back to wait for its next turn."); + ImGui::SetTooltip("%s", "How many vehicles of this point can be on the scenery at once. That many are made along with the scenery,\n" + "drawn from the listed ones in turn; one of those which wait is put on the road each time its turn comes,\n" + "until all of them are out. A vehicle taken by a removal point goes back to wait for its next turn,\n" + "and so does one which stood still for 15 seconds, other than at a closed level crossing, or went backwards."); // the set ImGui::Separator(); ImGui::Text("Vehicles of the set: %d", static_cast(State.vehicles.size())); @@ -590,6 +627,14 @@ bool editor_mode::render_roadpoint_layout(roadpoint_node::state &State, roadpoin "The distance it starts with takes in a single lane."); break; } + case roadpoint_node::kind_type::crosswalk: + { + if (number("Length along the road [m]", State.length, 0.5f, "%.1f")) + changed = true; + ImGui::TextDisabled("Stripes painted from one edge of the road to the other."); + ImGui::TextDisabled("The drivers don't stop for it: there's nobody to cross."); + break; + } } if (changed && Point != nullptr) State.normalize(); @@ -661,6 +706,25 @@ void editor_mode::render_junction_layout(junction_node &Junction) changed = true; } // what the corners between the roads are lined with + if (ImGui::Checkbox("Kerb around the corners", &state.kerbs)) + changed = true; + if (state.kerbs) + { + ImGui::Indent(); + if (number("Kerb width [m]", state.kerbwidth, 0.05f, "%.2f")) + { + state.kerbwidth = std::clamp(state.kerbwidth, 0.05f, 2.0f); + changed = true; + } + if (render_road_material("Kerb material", tool.kerbtext, sizeof(tool.kerbtext), state.kerbmaterial)) + changed = true; + if (state.side.type != road_node::side_type::sidewalk && number("Kerb height [m]", state.kerbheight, 0.01f, "%.2f")) + { + state.kerbheight = std::clamp(state.kerbheight, 0.0f, 1.0f); + changed = true; + } + ImGui::Unindent(); + } char const *sidetypes[]{"none", "shoulder", "sidewalk"}; int type{state.side.type == road_node::side_type::shoulder ? 1 : state.side.type == road_node::side_type::sidewalk ? 2 : 0}; ImGui::SetNextItemWidth(120.0f); @@ -710,7 +774,9 @@ void editor_mode::render_junction_layout(junction_node &Junction) // the roads if (ImGui::CollapsingHeader("Roads of the junction", ImGuiTreeNodeFlags_DefaultOpen)) { - ImGui::TextDisabled("The lanes are taken from the roads: change them on the road, the junction follows"); + ImGui::TextDisabled("The lanes are taken from the roads: change them on the road, the junction follows."); + ImGui::TextDisabled("The roads are numbered in the view. Lanes are counted from the middle of the road;"); + ImGui::TextDisabled("automatic: the inner lane turns left, the outer one right, all go straight."); for (std::size_t arm = 0; arm < state.arms.size(); ++arm) { ImGui::PushID(static_cast(arm)); @@ -719,6 +785,36 @@ void editor_mode::render_junction_layout(junction_node &Junction) ImGui::SameLine(); if (ImGui::Checkbox("Stop line", &data.stopline)) changed = true; + if (data.incoming > 0 && state.arms.size() > 2) + { + ImGui::Indent(); + // the entries are in the order of the stored values + char const *priorities[]{"no sign: gives way to the right", "has the right of way", "gives way", "stops, then gives way"}; + int priority{static_cast(data.priority)}; + ImGui::SetNextItemWidth(220.0f); + if (ImGui::Combo("##priority", &priority, priorities, 4)) + { + data.priority = static_cast(std::clamp(priority, 0, 3)); + changed = true; + } + // ways each lane can be left by + char const *ways[]{"automatic", "left", "straight", "left, straight", "right", "left, right", "straight, right", "any"}; + for (int lane = 0; lane < data.incoming; ++lane) + { + ImGui::PushID(100 + lane); + int turns{static_cast(lane) < data.turns.size() ? data.turns[lane] & 7 : 0}; + auto const label{"lane " + std::to_string(lane + 1) + " goes"}; + ImGui::SetNextItemWidth(140.0f); + if (ImGui::Combo(label.c_str(), &turns, ways, 8)) + { + data.turns.resize(std::max(data.turns.size(), static_cast(lane) + 1), 0); + data.turns[lane] = turns; + changed = true; + } + ImGui::PopID(); + } + ImGui::Unindent(); + } ImGui::PopID(); } } @@ -771,14 +867,15 @@ editor_mode::road_plan editor_mode::road_preview(bool const Fresh) plan.snap = {}; } } - if (plan.snap.junction != nullptr) + if (plan.snap.junction != nullptr || plan.snap.half != 0) { - // the junction has its ways through made for a set of lanes at each arm + // the junction has its ways through made for a set of lanes at each arm; a single roadway of a road takes the lanes it has if (false == evenlanes || arriving != plan.snap.backward || leaving != plan.snap.forward || std::abs(lanewidth - plan.snap.width) > 0.01f) { char width[32]; std::snprintf(width, sizeof(width), "%.2f", plan.snap.width); - plan.error = "This arm of the junction takes a road with " + std::to_string(plan.snap.backward) + " lane(s) leading into it and " + std::to_string(plan.snap.forward) + " out of it, " + width + " m wide each"; + plan.error = std::string{plan.snap.junction != nullptr ? "This arm of the junction" : "This roadway"} + " takes a road with "; + plan.error += std::to_string(plan.snap.backward) + " lane(s) leading to it and " + std::to_string(plan.snap.forward) + " away from it, " + width + " m wide each"; return plan; } } @@ -992,6 +1089,11 @@ void editor_mode::road_click() tool.status = reason; return; } + if (tool.ring) + { + road_roundabout(ground); + return; + } if (false == tool.chain) { // first click sets where the road starts @@ -1015,27 +1117,40 @@ void editor_mode::road_click() tool.hasdirection = true; tool.grade = end.outwards.y / glm::length(outwards); tool.hasgrade = true; - if (end.road != nullptr) + if (end.road != nullptr && end.half == 0) { // carried on from its start the road keeps the direction of its axis, so the lanes stay what they were tool.reversed = (false == end.atend); tool.settings = end.road->definition(); - // and it stays as wide as it is at that end + // and it stays as wide as it is at that end, with its directions as far apart auto const scale{tool.settings.taper[end.atend ? 1 : 0]}; tool.settings.taper = {scale, scale}; + auto const gap{tool.settings.median.width[end.atend ? 1 : 0]}; + tool.settings.median.width = {gap, gap}; + // the banks were made for the ground where they are + tool.settings.banks = {}; tool.status = "Carrying on \"" + end.road->name() + "\" with its layout"; } else { tool.reversed = false; + if (end.road != nullptr) + { + // one of the roadways of a road which keeps its directions apart is carried on as a road of its own, which looks like the road it leaves + tool.settings = end.road->definition(); + tool.settings.sides[end.half > 0 ? 0 : 1] = road_node::side_data{}; + tool.settings.banks = {}; + } tool.settings.forward = end.forward; tool.settings.backward = end.backward; tool.settings.lanewidth = end.width; tool.settings.taper = {1.f, 1.f}; + tool.settings.median.width = {0.f, 0.f}; tool.settings.lanes.clear(); tool.settings.changes.clear(); tool.settings.normalize(); - tool.status = "Leading a road out of \"" + end.junction->name() + "\", with the lanes the junction has there"; + tool.status = (end.junction != nullptr ? "Leading a road out of \"" + end.junction->name() + "\", with the lanes the junction has there" : + "Carrying on one of the roadways of \"" + end.road->name() + "\" as a one-way road"); } road_select(nullptr); } @@ -1178,6 +1293,12 @@ void editor_mode::road_apply() state.axis = road->definition().axis; // how wide the road is at its points is set at these points, for each piece on its own state.taper = road->definition().taper; + if (road != tool.selected) + { + // and so are the banks, and how far apart the two directions are led + state.median.width = road->definition().median.width; + state.banks = road->definition().banks; + } if (road != tool.selected && road->definition().changes.size() == state.changes.size()) { // where the lanes can be changed is set for each piece on its own @@ -1257,6 +1378,122 @@ bool editor_mode::road_delete() return true; } +// puts a roundabout around specified point +void editor_mode::road_roundabout(glm::dvec3 const &Ground) +{ + auto &tool{m_roadtool}; + std::string reason; + if (false == editor_road::available(&reason)) + { + tool.status = reason; + return; + } + auto const states{editor_road::roundabout(Ground + glm::dvec3{0.0, tool.offset, 0.0}, tool.ringradius, tool.settings, tool.island)}; + if (states.empty()) + { + tool.status = "The roundabout is too small for its lanes: give it a larger radius"; + return; + } + for (auto const &state : states) + { + for (auto const t : {0.0, 0.5}) + { + if (editor_road::nearest(state.point(t), 0.0) != nullptr || editor_road::nearest_junction(state.point(t)) != nullptr) + { + tool.status = "There's a road in the way. Make the roundabout next to it, then lead the road into its side"; + return; + } + } + } + auto const created{editor_road::create(states)}; + if (created.empty()) + { + tool.status = "The roundabout wasn't created"; + return; + } + editor_road::record record; + record.roads_created = created; + push_road_snapshot(std::move(record)); + tool.status = "Roundabout made. Untick Roundabout and lead roads out of its side, or into it: the traffic joining it gives way to the traffic going around."; +} + +// leads the banks of the selected piece, or of the whole road, to the ground beside it +void editor_mode::road_bank_to_ground() +{ + auto &tool{m_roadtool}; + if (tool.selected == nullptr) + return; + auto const pieces{tool.whole ? editor_road::chain(*tool.selected) : std::vector{tool.selected}}; + std::string reason; + for (auto const *road : pieces) + { + if (false == editor_road::can_edit(*road, &reason)) + { + tool.status = "\"" + road->name() + "\" can't be changed: " + reason; + return; + } + } + auto const grade{std::clamp(static_cast(tool.bankgrade), 0.25, 10.0)}; + auto const steps{static_cast(kBankReach / kBankStep)}; + std::vector> changes; + for (auto *road : pieces) + { + auto state{road->definition()}; + for (int side = 0; side < 2; ++side) + { + auto const &data{state.sides[side]}; + auto const sided{data.type != road_node::side_type::none && data.width > 0.f}; + for (int end = 0; end < 2; ++end) + { + auto const t{static_cast(end)}; + // where the bank starts: past the roadway, the kerb and whatever lies beside it + auto const tangent{state.tangent(t)}; + glm::dvec3 across{tangent.z, 0.0, -tangent.x}; + if (glm::length(across) < 1e-9) + continue; + across = glm::normalize(across) * (side == 0 ? 1.0 : -1.0); + auto edge{state.point(t) + across * (0.5 * state.span(t) + (state.kerbs[side] ? state.kerbwidth : 0.f) + (sided ? data.width : 0.f))}; + if (sided && data.type == road_node::side_type::sidewalk) + edge.y += state.kerbheight; + // the ground further and further from the road, without the roads themselves + std::vector probes; + for (int step = 1; step <= steps; ++step) + probes.emplace_back(edge + across * (step * kBankStep)); + auto const ground{ground_heights(probes, true)}; + // the bank ends where a slope of the set grade, going down or up, gets to the ground + auto const rising{ground.front() > edge.y}; + auto width{kBankReach}; + auto drop{edge.y - ground.back()}; + for (int step = 1; step <= steps; ++step) + { + auto const reach{step * kBankStep}; + auto const height{ground[step - 1]}; + if (rising ? height <= edge.y + reach / grade : height >= edge.y - reach / grade) + { + width = reach; + drop = edge.y - height; + break; + } + } + state.banks[side].set = true; + state.banks[side].width[end] = static_cast(width); + state.banks[side].drop[end] = static_cast(drop); + } + } + changes.emplace_back(road, state); + } + editor_road::record record; + for (auto const &change : changes) + record.roads.emplace_back(change.first, change.first->definition()); + editor_road::apply(changes); + push_road_snapshot(std::move(record)); + road_select(tool.selected); + tool.status = "Banks of " + std::to_string(changes.size()) + (changes.size() == 1 ? " piece" : " pieces") + " led to the ground."; + auto const &layout{tool.selected->definition()}; + if ((layout.sides[0].type != road_node::side_type::shoulder || layout.sides[1].type != road_node::side_type::shoulder) && (layout.bankmaterial.empty() || layout.bankmaterial == "none")) + tool.status += " Pick a bank material to have them drawn where the road has no shoulder."; +} + // takes the selected points out of their roads bool editor_mode::road_points_delete() { @@ -1628,7 +1865,28 @@ bool editor_mode::render_road_layout(road_node::state &State) } ImGui::PopID(); } - if (State.sides[0].type == road_node::side_type::sidewalk || State.sides[1].type == road_node::side_type::sidewalk) + // kerbs + if (ImGui::Checkbox("Kerb on the left", &State.kerbs[0])) + changed = true; + ImGui::SameLine(); + if (ImGui::Checkbox("on the right", &State.kerbs[1])) + changed = true; + auto const island{State.divided() && State.median.type == road_node::median_type::island}; + if (State.kerbs[0] || State.kerbs[1] || island) + { + ImGui::Indent(); + if (number("Kerb width [m]", State.kerbwidth, 0.05f, "%.2f")) + { + State.kerbwidth = std::clamp(State.kerbwidth, 0.05f, 2.0f); + changed = true; + } + if (material("Kerb material", tool.kerbtext, sizeof(tool.kerbtext), State.kerbmaterial)) + changed = true; + if ((State.kerbs[0] || State.kerbs[1]) && (State.kerbmaterial.empty() || State.kerbmaterial == "none")) + ImGui::TextDisabled("Pick a material to have the kerbs drawn"); + ImGui::Unindent(); + } + if (State.kerbs[0] || State.kerbs[1] || island || State.sides[0].type == road_node::side_type::sidewalk || State.sides[1].type == road_node::side_type::sidewalk) { if (number("Kerb height [m]", State.kerbheight, 0.01f, "%.2f")) { @@ -1643,6 +1901,8 @@ bool editor_mode::render_road_layout(road_node::state &State) State.slope.x = std::clamp(State.slope.x, 0.0f, 20.0f); changed = true; } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "The bank every shoulder of the road is closed with, unless the side has a bank of its own set below."); if (number("Bank drop [m]", State.slope.y, 0.1f, "%.2f")) { State.slope.y = std::clamp(State.slope.y, 0.0f, 20.0f); @@ -1650,6 +1910,105 @@ bool editor_mode::render_road_layout(road_node::state &State) } } + // banks leading to the ground + if (ImGui::CollapsingHeader("Banks to the ground")) + { + ImGui::TextDisabled("A slope from the edge of the road down, or up, to the ground."); + ImGui::TextDisabled("Set for each piece on its own, at its start and at its end."); + char const *banknames[]{"Bank on the left", "Bank on the right"}; + for (int side = 0; side < 2; ++side) + { + ImGui::PushID(100 + side); + auto &bank{State.banks[side]}; + if (ImGui::Checkbox(banknames[side], &bank.set)) + { + if (bank.set && bank.width[0] <= 0.f && bank.width[1] <= 0.f) + { + bank.width = {State.slope.x, State.slope.x}; + bank.drop = {State.slope.y, State.slope.y}; + } + changed = true; + } + if (bank.set) + { + ImGui::Indent(); + if (number("Width at the start [m]", bank.width[0], 0.5f, "%.2f")) + changed = true; + if (number("Drop at the start [m]", bank.drop[0], 0.25f, "%.2f")) + changed = true; + if (number("Width at the end [m]", bank.width[1], 0.5f, "%.2f")) + changed = true; + if (number("Drop at the end [m]", bank.drop[1], 0.25f, "%.2f")) + changed = true; + ImGui::Unindent(); + } + ImGui::PopID(); + } + if (material("Bank material", tool.banktext, sizeof(tool.banktext), State.bankmaterial)) + changed = true; + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "What a bank is covered with next to a sidewalk, a kerb or the bare edge of the road.\nA bank of a shoulder is covered with the material of the shoulder."); + if (tool.selected != nullptr) + { + ImGui::SetNextItemWidth(120.0f); + if (ImGui::InputFloat("Run for a metre of drop [m]", &tool.bankgrade, 0.25f, 0.5f, "%.2f")) + tool.bankgrade = std::clamp(tool.bankgrade, 0.25f, 10.0f); + if (ImGui::Button("Lead the banks to the ground")) + { + road_bank_to_ground(); + // the layout shown was replaced with what the road is like now + return false; + } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "Looks for the ground on both sides of the road, at the start and at the end of each piece,\n" + "and sets the banks to reach it with the slope given above: down where the road is over the ground, up where it's cut into it.\n" + "Done for the selected piece, or for every piece of the road if the changes go to the whole road."); + } + } + + // the two directions kept apart + if (State.forward > 0 && State.backward > 0 && ImGui::CollapsingHeader("Between the directions")) + { + char const *mediantypes[]{"nothing, the ground shows", "surface closed to the traffic", "island"}; + int type{State.median.type == road_node::median_type::gap ? 0 : State.median.type == road_node::median_type::island ? 2 : 1}; + ImGui::SetNextItemWidth(220.0f); + if (ImGui::Combo("##median", &type, mediantypes, 3)) + { + State.median.type = (type == 0 ? road_node::median_type::gap : type == 2 ? road_node::median_type::island : road_node::median_type::painted); + changed = true; + } + if (number("Apart at the start [m]", State.median.width[0], 0.5f, "%.2f")) + changed = true; + if (number("Apart at the end [m]", State.median.width[1], 0.5f, "%.2f")) + changed = true; + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "How far apart the two directions are led at each end of the piece; 0 at one end and more at the other makes them part along it.\n" + "Set for each piece on its own. The pieces next to it follow it where they meet, and so do the junctions.\n" + "A road with its directions apart can be carried on as two one-way roads: start the Build tool\n" + "on the middle of one of its roadways, at an end of the road with nothing attached."); + if (State.median.type == road_node::median_type::island) + { + if (material("Island material", tool.mediantext, sizeof(tool.mediantext), State.median.material)) + changed = true; + ImGui::TextDisabled("The island is as high as the kerbs; with a kerb material set it gets kerbs of its own."); + } + } + + // traffic + if (number("Traffic share, 100: like any other", State.weight, 10.0f, "%.0f")) + { + State.weight = std::clamp(State.weight, 0.0f, 10000.0f); + changed = true; + } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "How willing the drivers are to take this road when they leave a junction, next to the other roads they can take there.\n" + "With 100 for the main road and 20 for a dirt road leaving it, one vehicle in six turns into the dirt road.\n" + "0: nobody takes it, unless there's no other way."); + if (ImGui::Checkbox("Part of a roundabout", &State.roundabout)) + changed = true; + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "A junction made on this road gives the right of way to the traffic going along it,\nand tells the traffic of the road joining it to give way."); + // single lanes, and the rules for changing between them if (ImGui::CollapsingHeader("Lanes and lane changes", ImGuiTreeNodeFlags_DefaultOpen)) { @@ -1737,10 +2096,27 @@ void editor_mode::render_road_window() }; if (tool.tool == 1) { - ImGui::TextDisabled("LMB: start, then each next point. Ctrl: straight ahead. Esc: finish"); - ImGui::TextDisabled("Start or end on a loose end of a road to join it."); - ImGui::TextDisabled("Start or end on the side of a road to make a junction there,"); - ImGui::TextDisabled("or on a junction to give it another road."); + if (ImGui::Checkbox("Roundabout", &tool.ring)) + road_cancel(); + if (tool.ring) + { + ImGui::TextDisabled("LMB: put a roundabout around the cursor. It's a one-way road going around,"); + ImGui::TextDisabled("with the lanes set below as the lanes along the axis."); + ImGui::TextDisabled("Then untick this and lead the roads out of its side, or into it."); + ImGui::SetNextItemWidth(120.0f); + if (ImGui::InputFloat("Radius of the middle of its road [m]", &tool.ringradius, 1.0f, 5.0f, "%.1f")) + tool.ringradius = std::clamp(tool.ringradius, 8.0f, 200.0f); + render_road_material("Island in the middle", tool.islandtext, sizeof(tool.islandtext), tool.island); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "What the middle is covered with; it's raised on a kerb as high as the kerbs of the road.\nnone: the middle is left as it is."); + } + else + { + ImGui::TextDisabled("LMB: start, then each next point. Ctrl: straight ahead. Esc: finish"); + ImGui::TextDisabled("Start or end on a loose end of a road to join it."); + ImGui::TextDisabled("Start or end on the side of a road to make a junction there,"); + ImGui::TextDisabled("or on a junction to give it another road."); + } if (tool.chain) { if (ImGui::Button("Finish (Esc)")) @@ -1769,7 +2145,8 @@ void editor_mode::render_road_window() ImGui::RadioButton("Spawn point", &tool.placekind, 1); ImGui::SameLine(); ImGui::RadioButton("Removal point", &tool.placekind, 2); - tool.placekind = std::clamp(tool.placekind, 0, 2); + ImGui::RadioButton("Pedestrian crossing", &tool.placekind, 3); + tool.placekind = std::clamp(tool.placekind, 0, 3); switch (tool.placekind) { case 0: @@ -1780,6 +2157,9 @@ void editor_mode::render_road_window() ImGui::TextDisabled("LMB on a lane. The vehicles of the set appear there one by one"); ImGui::TextDisabled("and drive on the way the lane goes."); break; + case 3: + ImGui::TextDisabled("LMB on a road: stripes are painted across it there."); + break; default: ImGui::TextDisabled("LMB on a lane. The vehicles which get there are taken off the road;"); ImGui::TextDisabled("put one where the road leaves the scenery."); @@ -1986,7 +2366,7 @@ void editor_mode::draw_road_overlay() const glm::dvec3 across{tangent.z, 0.0, -tangent.x}; if (glm::length(across) > 1e-6) across = glm::normalize(across); - auto const halfwidth{0.5 * State.width() * State.scale(t)}; + auto const halfwidth{0.5 * State.span(t)}; glm::dvec3 const edges[2]{position + across * halfwidth, position - across * halfwidth}; if (i > 0) { @@ -2074,6 +2454,13 @@ void editor_mode::draw_road_overlay() const drawlabel(State.position, Color, "removal"); break; } + case roadpoint_node::kind_type::crosswalk: + { + drawpoint(State.position, Color, 11.0f, false); + if (labelled) + drawlabel(State.position, Color, "pedestrians"); + break; + } } }; for (auto const *point : simulation::Roadpoints.sequence()) @@ -2082,7 +2469,11 @@ void editor_mode::draw_road_overlay() const continue; auto const kind{point->definition().kind}; drawmarker(point->definition(), point, - point == tool.marker ? kSelectedColor : kind == roadpoint_node::kind_type::spawn ? kSpawnColor : kind == roadpoint_node::kind_type::despawn ? kDespawnColor : kCrossingColor); + point == tool.marker ? kSelectedColor : + kind == roadpoint_node::kind_type::spawn ? kSpawnColor : + kind == roadpoint_node::kind_type::despawn ? kDespawnColor : + kind == roadpoint_node::kind_type::crosswalk ? kCrosswalkColor : + kCrossingColor); if (point == tool.marker) drawpoint(point->definition().position, kSelectedColor, 15.0f, false); } @@ -2095,10 +2486,29 @@ void editor_mode::draw_road_overlay() const drawpoint(state.axis.points[segment_data::point::end], kSelectedColor, 6.0f, true); } if (tool.junction != nullptr && false == tool.junction->m_editorremoved) + { drawjunction(tool.junction->definition(), kSelectedColor); + // the roads are numbered the way the window lists them + auto const &arms{tool.junction->definition().arms}; + for (std::size_t arm = 0; arm < arms.size(); ++arm) + drawlabel(arms[arm].position, kSelectedColor, std::to_string(arm + 1).c_str()); + } std::string hint; - if (tool.tool == 1) + if (tool.tool == 1 && tool.ring) + { + // the road going around, as wide as its lanes + auto layout{tool.settings}; + layout.backward = 0; + layout.forward = std::max(1, layout.forward); + layout.lanes.clear(); + layout.normalize(); + auto const centre{tool.mouse + glm::dvec3{0.0, tool.offset, 0.0}}; + drawring(centre, tool.ringradius + 0.5 * layout.width(), kPreviewColor); + drawring(centre, std::max(0.0, tool.ringradius - 0.5 * layout.width()), kPreviewColor); + hint = "LMB: put a roundabout here"; + } + else if (tool.tool == 1) { if (tool.chain) { diff --git a/editor/editorRoad.cpp b/editor/editorRoad.cpp index 339ff00a6..1f483e553 100644 --- a/editor/editorRoad.cpp +++ b/editor/editorRoad.cpp @@ -139,6 +139,36 @@ road_node::state part(road_node::state const &State, double const From, double c auto result{State}; result.axis = subpath(State.axis, From, To); result.taper = {static_cast(State.scale(From)), static_cast(State.scale(To))}; + if (State.divided()) + result.median.width = {static_cast(State.median_width(From)), static_cast(State.median_width(To))}; + for (std::size_t side = 0; side < result.banks.size(); ++side) + { + auto const &bank{State.banks[side]}; + result.banks[side].width = {glm::mix(bank.width[0], bank.width[1], static_cast(From)), glm::mix(bank.width[0], bank.width[1], static_cast(To))}; + result.banks[side].drop = {glm::mix(bank.drop[0], bank.drop[1], static_cast(From)), glm::mix(bank.drop[0], bank.drop[1], static_cast(To))}; + } + return result; +} + +// points of an end of a road something can be joined to: the end of its axis, and where it keeps its two directions apart, +// the middle of each of its roadways +std::vector end_points(road_node::state const &State, bool const Atend) +{ + std::vector result{axis_end(State, Atend)}; + auto const t{Atend ? 1.0 : 0.0}; + auto const gap{State.median_width(t)}; + if (gap <= 0.0) + return result; + auto const tangent{State.tangent(t)}; + glm::dvec3 left{tangent.z, 0.0, -tangent.x}; + if (glm::length(left) < 1e-9) + return result; + left = glm::normalize(left); + auto const halfwidth{0.5 * State.width()}; + auto const divide{State.divide()}; + // lanes going against the axis are on its left + result.emplace_back(result.front() + left * (0.5 * (halfwidth + divide) * State.scale(t) + 0.5 * gap)); + result.emplace_back(result.front() + left * (0.5 * (divide - halfwidth) * State.scale(t) - 0.5 * gap)); return result; } @@ -284,6 +314,7 @@ bool cut_arm(road_cut const &Cut, junction_node::arm_data &Arm) // lanes heading for the cut lead into the junction Arm.incoming = (Cut.keepstart ? state.forward : state.backward); Arm.outgoing = (Cut.keepstart ? state.backward : state.forward); + Arm.median = static_cast(state.median_width(Cut.t)); return editor_road::lane_width(state, Cut.t, Arm.width); } @@ -303,6 +334,9 @@ void dress(junction_node::state &Junction, road_node::state const &Road) // one kind of side goes around the whole junction; the right side of the road is the one facing the corner a road leaves by Junction.side = (Road.sides[1].type != road_node::side_type::none ? Road.sides[1] : Road.sides[0]); Junction.kerbheight = Road.kerbheight; + Junction.kerbs = (Road.kerbs[0] || Road.kerbs[1]); + Junction.kerbwidth = Road.kerbwidth; + Junction.kerbmaterial = Road.kerbmaterial; Junction.slope = Road.slope; Junction.friction = Road.friction; Junction.sounddistance = Road.sounddistance; @@ -374,6 +408,14 @@ road_node::state flipped(road_node::state const &State) change = ((change & road_node::change_toright) != 0 ? road_node::change_toleft : 0) | ((change & road_node::change_toleft) != 0 ? road_node::change_toright : 0); std::swap(result.sides[0], result.sides[1]); std::swap(result.taper[0], result.taper[1]); + std::swap(result.median.width[0], result.median.width[1]); + std::swap(result.kerbs[0], result.kerbs[1]); + std::swap(result.banks[0], result.banks[1]); + for (auto &bank : result.banks) + { + std::swap(bank.width[0], bank.width[1]); + std::swap(bank.drop[0], bank.drop[1]); + } return result; } @@ -516,8 +558,27 @@ std::vector editor_road::neighbours(road_node const &Road) if (Road.m_editorremoved) return result; for (auto const atend : {false, true}) + { for (auto *road : roads_at(axis_end(Road.definition(), atend), &Road)) add_unique(result, road); + // a road which keeps its directions apart can have a road joined to each of its roadways, and be one for the road joined + auto const points{end_points(Road.definition(), atend)}; + for (auto *road : simulation::Roads.sequence()) + { + if (road == nullptr || road == &Road || road->m_editorremoved) + continue; + for (auto const otheratend : {false, true}) + { + auto const otherpoints{end_points(road->definition(), otheratend)}; + if (points.size() == 1 && otherpoints.size() == 1) + continue; + for (auto const &point : points) + for (auto const &otherpoint : otherpoints) + if (glm::distance(point, otherpoint) < kSamePoint) + add_unique(result, road); + } + } + } return result; } @@ -886,7 +947,7 @@ bool editor_road::nearest_lane(glm::dvec3 const &Point, double const Reach, glm: auto const axis{curve_points(state.axis)}; // the axis is no longer than the lines joining its points, which is good enough to tell the road is nowhere near if (glm::distance(road->location(), Point) > - 0.5 * (glm::distance(axis[0], axis[1]) + glm::distance(axis[1], axis[2]) + glm::distance(axis[2], axis[3])) + 0.5 * state.width() * std::max(state.taper[0], state.taper[1]) + Reach + 10.0) + 0.5 * (glm::distance(axis[0], axis[1]) + glm::distance(axis[1], axis[2]) + glm::distance(axis[2], axis[3])) + 0.5 * std::max(state.span(0.0), state.span(1.0)) + Reach + 10.0) continue; for (auto const *lane : road->tracks()) { @@ -1040,6 +1101,23 @@ bool editor_road::dissolve(glm::dvec3 const &Joint, record &Record, std::string merged.axis.points[segment_data::point::control2] = control2; // the road is as wide at its far ends as it was merged.taper[1] = static_cast(after.taper[1] * after.width() / before.width()); + if (after.divided() || before.divided()) + { + if (false == before.divided()) + { + merged.median = after.median; + merged.median.width[0] = 0.f; + } + merged.median.width[1] = (after.divided() ? after.median.width[1] : 0.f); + } + for (std::size_t side = 0; side < merged.banks.size(); ++side) + { + if (merged.banks[side].set && after.banks[side].set) + { + merged.banks[side].width[1] = after.banks[side].width[1]; + merged.banks[side].drop[1] = after.banks[side].drop[1]; + } + } remember(Record, kept.road); remove(std::vector{dropped.road}); Record.roads_removed.emplace_back(dropped.road); @@ -1086,6 +1164,19 @@ road_node *editor_road::split(road_node &Road, double const T) auto const scale{static_cast(Road.definition().scale(T))}; first.taper[1] = scale; second.taper[0] = scale; + // and so is what's between its directions, and what leads from it to the ground + if (Road.definition().divided()) + { + auto const gap{static_cast(Road.definition().median_width(T))}; + first.median.width[1] = gap; + second.median.width[0] = gap; + } + for (std::size_t side = 0; side < first.banks.size(); ++side) + { + auto const &bank{Road.definition().banks[side]}; + first.banks[side].width[1] = second.banks[side].width[0] = glm::mix(bank.width[0], bank.width[1], static_cast(T)); + first.banks[side].drop[1] = second.banks[side].drop[0] = glm::mix(bank.drop[0], bank.drop[1], static_cast(T)); + } apply(std::vector>{{&Road, first}}); auto const created{create(std::vector{second})}; return created.empty() ? nullptr : created.front(); @@ -1121,7 +1212,7 @@ road_node *editor_road::nearest(glm::dvec3 const &Point, double const Margin) if (road == nullptr || road->m_editorremoved) continue; auto const &state{road->definition()}; - auto const reach{0.5 * state.width() * std::max(state.taper[0], state.taper[1]) + std::max(state.sides[0].width, state.sides[1].width) + Margin}; + auto const reach{0.5 * std::max(state.span(0.0), state.span(1.0)) + std::max(state.sides[0].width, state.sides[1].width) + Margin}; // the axis is no longer than the lines joining its points, which is good enough to tell the road is nowhere near auto const points{curve_points(state.axis)}; if (glm::distance(road->location(), Point) > 0.5 * (glm::distance(points[0], points[1]) + glm::distance(points[1], points[2]) + glm::distance(points[2], points[3])) + reach + 10.0) @@ -1184,6 +1275,38 @@ editor_road::loose_end editor_road::find_end(glm::dvec3 const &Point, double con result.position = position; result.outwards = (atend ? state.tangent(1.0) : -state.tangent(0.0)); } + // a road which keeps its two directions apart can be carried on as two roads, one for each of its roadways + for (auto const atend : {false, true}) + { + auto const points{end_points(state, atend)}; + float lanewidth{0.f}; + if (points.size() < 3 || state.median_width(atend ? 1.0 : 0.0) < 0.5 || false == lane_width(state, atend ? 1.0 : 0.0, lanewidth)) + continue; + // the whole end has to be loose + if (false == roads_at(points[0], road).empty() || false == junctions_at(points[0]).empty()) + continue; + for (int half = 1; half <= 2; ++half) + { + auto const &position{points[half]}; + auto const distance{glm::distance(glm::dvec2{position.x, position.z}, glm::dvec2{Point.x, Point.z})}; + if (distance > best || std::abs(position.y - Point.y) > 3.0 || false == roads_at(position, road).empty()) + continue; + best = distance; + result = loose_end{}; + result.road = road; + result.atend = atend; + result.position = position; + result.outwards = (atend ? state.tangent(1.0) : -state.tangent(0.0)); + // the first of the points is the roadway of the lanes going against the axis + result.half = (half == 1 ? -1 : 1); + auto const lanes{half == 1 ? state.backward : state.forward}; + // lanes which leave the road there go along the axis of the road carrying them on, the ones which come to it go against that axis + auto const leaving{(half == 2) == atend}; + result.forward = (leaving ? lanes : 0); + result.backward = (leaving ? 0 : lanes); + result.width = lanewidth; + } + } } if (false == Junctions) return result; @@ -1504,6 +1627,7 @@ void editor_road::settle(road_node &Road, record &Record, std::string &Notes) auto const leaving{atend ? layout.backward : layout.forward}; float lanewidth{0.f}; auto const evenlanes{lane_width(layout, atend ? 1.0 : 0.0, lanewidth)}; + auto const gap{static_cast(layout.median_width(atend ? 1.0 : 0.0))}; char const *unevenlanes{" differ in width, and a junction takes roads with lanes of the same width. "}; std::string reason; @@ -1516,7 +1640,7 @@ void editor_road::settle(road_node &Road, record &Record, std::string &Notes) auto *junction{entry.first}; auto state{junction->definition()}; auto &arm{state.arms[entry.second]}; - if (arm.incoming == arriving && arm.outgoing == leaving && std::abs(arm.width - lanewidth) < 0.001f) + if (arm.incoming == arriving && arm.outgoing == leaving && std::abs(arm.width - lanewidth) < 0.001f && std::abs(arm.median - gap) < 0.001f) continue; if (false == evenlanes) { @@ -1531,6 +1655,7 @@ void editor_road::settle(road_node &Road, record &Record, std::string &Notes) arm.incoming = arriving; arm.outgoing = leaving; arm.width = lanewidth; + arm.median = gap; remember(Record, junction); apply(std::vector>{{junction, state}}); } @@ -1550,7 +1675,8 @@ void editor_road::settle(road_node &Road, record &Record, std::string &Notes) { // the same lanes: the neighbour is made as wide as the piece where they meet, and gets to that width along its length auto const width{layout.width() * layout.taper[atend ? 1 : 0]}; - if (std::abs(width - otherlayout.width() * otherlayout.taper[otheratend ? 1 : 0]) < 0.001) + auto const othergap{static_cast(otherlayout.median_width(otheratend ? 1.0 : 0.0))}; + if (std::abs(width - otherlayout.width() * otherlayout.taper[otheratend ? 1 : 0]) < 0.001 && std::abs(gap - othergap) < 0.001f) continue; if (false == can_edit(*other, &reason)) { @@ -1559,6 +1685,17 @@ void editor_road::settle(road_node &Road, record &Record, std::string &Notes) } auto state{otherlayout}; state.taper[otheratend ? 1 : 0] = std::clamp(static_cast(width / otherlayout.width()), 0.25f, 4.f); + // and it leads its two directions as far apart as the piece has them there + if (std::abs(gap - othergap) >= 0.001f) + { + if (false == otherlayout.divided()) + { + state.median.type = layout.median.type; + state.median.material = layout.median.material; + state.median.width = {0.f, 0.f}; + } + state.median.width[otheratend ? 1 : 0] = gap; + } remember(Record, other); apply(std::vector>{{other, state}}); continue; @@ -1618,6 +1755,7 @@ void editor_road::settle(road_node &Road, record &Record, std::string &Notes) arms[1].incoming = arriving; arms[1].outgoing = leaving; arms[1].width = lanewidth; + arms[1].median = gap; junction.arms.assign(std::begin(arms), std::end(arms)); junction.centre = 0.5 * (arms[0].position + arms[1].position); dress(junction, layout); @@ -1671,7 +1809,7 @@ bool editor_road::branch_from(road_node &Road, double const T, glm::dvec2 const Error = "Lanes of \"" + Road.name() + "\" differ in width, and a junction takes roads with lanes of the same width"; return false; } - auto const halfwidth{0.5 * (layout.forward + layout.backward) * lanewidth}; + auto const halfwidth{0.5 * (layout.forward + layout.backward) * lanewidth + 0.5 * layout.median_width(T)}; auto const branchhalfwidth{0.5 * (Incoming + Outgoing) * Width}; auto const reach{edge_reach(halfwidth, branchhalfwidth, angle) + kCornerRoom}; auto const branchreach{edge_reach(branchhalfwidth, halfwidth, angle) + kCornerRoom}; @@ -1746,6 +1884,13 @@ bool editor_road::branch_from(road_node &Road, double const T, glm::dvec2 const junction.arms.emplace_back(arm); Result.arm = junction.arms.size() - 1; dress(junction, layout); + if (layout.roundabout) + { + // the traffic going around goes ahead of the traffic joining it + for (auto &entry : junction.arms) + entry.priority = junction_node::right_of_way::priority; + junction.arms.back().priority = junction_node::right_of_way::yield; + } junction.normalize(); return true; } @@ -1826,6 +1971,60 @@ junction_node *editor_road::carry_out(branch const &Branch, record &Record) return junctions.front(); } +std::vector editor_road::roundabout(glm::dvec3 const &Centre, double const Radius, road_node::state const &Layout, std::string const &Island) +{ + std::vector pieces; + auto layout{Layout}; + // a single direction, going around with the middle on its left + if (layout.forward < 1) + layout.forward = std::max(1, layout.backward); + layout.backward = 0; + layout.lanes.clear(); + layout.changes.clear(); + layout.taper = {1.f, 1.f}; + layout.median.width = {0.f, 0.f}; + layout.roundabout = true; + layout.normalize(); + auto const halfwidth{0.5 * layout.width()}; + if (Radius - halfwidth < 1.0) + return pieces; + if (false == Island.empty() && Island != "none") + { + // the island takes all that's inside the road + layout.sides[0].type = road_node::side_type::sidewalk; + layout.sides[0].width = static_cast(Radius - halfwidth); + layout.sides[0].material = Island; + } + else + { + layout.sides[0] = road_node::side_data{}; + } + layout.banks[0] = road_node::bank_data{}; + // arcs short enough for a curve of this kind to pass for a circle + int const count{Radius > 40.0 ? 8 : 4}; + auto const angle{6.283185307179586 / count}; + auto const reach{4.0 / 3.0 * std::tan(0.25 * angle) * Radius}; + auto const point = [&](double const Angle) { return Centre + glm::dvec3{std::cos(Angle), 0.0, std::sin(Angle)} * Radius; }; + // the way the road goes at a point, with the angles going down + auto const heading = [](double const Angle) { return glm::dvec3{std::sin(Angle), 0.0, -std::cos(Angle)}; }; + for (int index = 0; index < count; ++index) + { + auto const from{-angle * index}; + auto const to{-angle * (index + 1)}; + auto state{layout}; + state.axis = segment_data{}; + state.axis.points[segment_data::point::start] = point(from); + state.axis.points[segment_data::point::control1] = heading(from) * reach; + state.axis.points[segment_data::point::control2] = -heading(to) * reach; + state.axis.points[segment_data::point::end] = point(to); + state.axis.radius = static_cast(Radius); + pieces.emplace_back(state); + } + // the last piece ends exactly where the first one starts + pieces.back().axis.points[segment_data::point::end] = pieces.front().axis.points[segment_data::point::start]; + return pieces; +} + std::vector const &editor_road::materials() { static std::vector names; diff --git a/editor/editorRoad.hpp b/editor/editorRoad.hpp index a05a05ac1..df71db184 100644 --- a/editor/editorRoad.hpp +++ b/editor/editorRoad.hpp @@ -30,7 +30,10 @@ class editor_road bool atend{false}; // of a road: the end of its axis rather than the start glm::dvec3 position{0.0}; glm::dvec3 outwards{0.0}; // direction a road would continue in - // of a junction arm: lanes of a road leading away from it + // of a road which keeps its two directions apart: the roadway of one of them, 1 for the lanes going along the axis, -1 for the ones going against it. + // 0: the end of the whole road + int half{0}; + // of a junction arm, or of a single roadway: lanes of a road leading away from it int forward{0}; int backward{0}; float width{0.f}; @@ -164,6 +167,10 @@ class editor_road static double planar_length(segment_data const &Path); // slope of the path at its end, in the direction it's laid out static double end_grade(segment_data const &Path); + // lays out the pieces of a roundabout: a one-way road going around specified point, to the left of the traffic. + // Radius: of the axis of that road; Layout: what the road is like. the lanes it has along its axis are the ones the roundabout gets. + // Island: what the middle is covered with, "none" to leave the ground showing + static std::vector roundabout(glm::dvec3 const &Centre, double const Radius, road_node::state const &Layout, std::string const &Island); // names of materials and images present in the texture folder, to pick from static std::vector const &materials(); diff --git a/model/AnimModel.cpp b/model/AnimModel.cpp index cc54a2a24..7cdbc3d73 100644 --- a/model/AnimModel.cpp +++ b/model/AnimModel.cpp @@ -251,6 +251,7 @@ TAnimModel::TAnimModel( scene::node_data const &Nodedata ) : basic_node( Nodedat bool TAnimModel::Init(std::string const &asName, std::string const &asReplacableTexture) { + m_skintoken = asReplacableTexture; if( asReplacableTexture.substr( 0, 1 ) == "*" ) { // od gwiazdki zaczynają się teksty na wyświetlaczach asText = asReplacableTexture.substr( 1, asReplacableTexture.length() - 1 ); // zapamiętanie tekstu @@ -806,13 +807,18 @@ TAnimModel::export_as_text_( std::ostream &Output ) const { } Output << modelfile << ' '; // texture - auto texturefile { ( - m_materialdata.replacable_skins[ 1 ] != null_handle ? - GfxRenderer->Material( m_materialdata.replacable_skins[ 1 ] )->GetName() : - "none" ) }; - if( texturefile.find( paths::textures ) == 0 ) { - // don't include 'textures/' in the path - texturefile.erase( 0, std::string{ paths::textures }.size() ); + // the skin goes out the way it came in. the materials it was turned into can't give it back: they don't tell + // a set of skins from a single one, a text for a display from no skin at all, or what a texture was to be generated from + auto texturefile { m_skintoken }; + if( texturefile.empty() ) { + texturefile = ( + m_materialdata.replacable_skins[ 1 ] != null_handle ? + GfxRenderer->Material( m_materialdata.replacable_skins[ 1 ] )->GetName() : + "none" ); + if( texturefile.find( paths::textures ) == 0 ) { + // don't include 'textures/' in the path + texturefile.erase( 0, std::string{ paths::textures }.size() ); + } } if( contains( texturefile, ' ' ) ) { Output << "\"" << texturefile << "\"" << ' '; @@ -827,6 +833,23 @@ TAnimModel::export_as_text_( std::ostream &Output ) const { Output << lsLights[ lightidx ] << ' '; } } + // colors given to the lights; goes right after the lights, the way it's read + if( std::any_of( std::begin( m_lightcolors ), std::begin( m_lightcolors ) + iNumLights, []( glm::vec3 const &Color ) { return Color.r >= 0.f; } ) ) { + Output << "lightcolors "; + for( int lightidx = 0; lightidx < iNumLights; ++lightidx ) { + auto const &color { m_lightcolors[ lightidx ] }; + if( color.r < 0.f ) { + // the light was left with the color the model gives it + Output << "-1 "; + continue; + } + auto const component = []( float const Value ) { return std::clamp( static_cast( std::lround( Value * 255.f ) ), 0, 255 ); }; + Output + << std::hex << std::setfill( '0' ) << std::setw( 6 ) + << ( component( color.r ) << 16 | component( color.g ) << 8 | component( color.b ) ) + << std::dec << std::setfill( ' ' ) << ' '; + } + } // potential light transition switch if( false == m_transition ) { Output << "notransition" << ' '; diff --git a/model/AnimModel.h b/model/AnimModel.h index 3c4b9f111..8116f1bb0 100644 --- a/model/AnimModel.h +++ b/model/AnimModel.h @@ -201,6 +201,7 @@ public: material_data m_materialdata; std::string asText; // tekst dla wyświetlacza znakowego + std::string m_skintoken; // replacable skin the way the definition of the node gave it, kept for the export // TODO: wrap into a light state struct, remove fixed element count int iNumLights { 0 }; std::array LightsOn {}; // Ra: te wskaźniki powinny być w ramach TModel3d diff --git a/simulation/simulation.cpp b/simulation/simulation.cpp index 18e3c701e..a5d5ad29c 100644 --- a/simulation/simulation.cpp +++ b/simulation/simulation.cpp @@ -119,7 +119,8 @@ state_manager::update( double const Deltatime, int Iterationcount ) { TAnimModel::AnimUpdate( totaltime ); // wykonanie zakolejkowanych animacji simulation::Powergrid.update( totaltime ); - // level crossings and the points road vehicles appear at; ahead of the vehicles, so the drivers act on what these decide + // road junctions, level crossings and the points road vehicles appear at; ahead of the vehicles, so the drivers act on what these decide + simulation::Junctions.update( totaltime ); simulation::Roadpoints.update( totaltime ); simulation::Vehicles.update( Deltatime, Iterationcount ); } diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index 16013c67c..5a6f8ba49 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -734,6 +734,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch { "crossing", scene::layer_item::track }, { "spawn", scene::layer_item::track }, { "despawn", scene::layer_item::track }, + { "crosswalk", scene::layer_item::track }, { "traction", scene::layer_item::traction }, { "tractionpowersource", scene::layer_item::powersource }, { "model", scene::layer_item::model }, @@ -1509,7 +1510,7 @@ std::pair state_serializer::preview_include(std::string const &Directi // statements which take more than a single token, with the tokens ending them static std::unordered_map const nodeends { { "dynamic", "enddynamic" }, { "track", "endtrack" }, { "road", "endroad" }, { "junction", "endjunction" }, { "crossing", "endcrossing" }, { "spawn", "endspawn" }, { "despawn", "enddespawn" }, - { "traction", "endtraction" }, { "tractionpowersource", "end" }, { "model", "endmodel" }, + { "crosswalk", "endcrosswalk" }, { "traction", "endtraction" }, { "tractionpowersource", "end" }, { "model", "endmodel" }, { "triangles", "endtri" }, { "triangle_strip", "endtri" }, { "triangle_fan", "endtri" }, { "lines", "endline" }, { "line_strip", "endline" }, { "line_loop", "endline" }, { "memcell", "endmemcell" }, { "eventlauncher", "end" }, { "sound", "endsound" } }; static std::unordered_map const statementends { diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 9f1b2586c..b6429a186 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -648,7 +648,7 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) routewanted = 1 + std::floor( Random( static_cast( pTrack->RouteCount() ) - 0.001 ) ); } */ - auto const routewanted { 1 + std::floor( Random( static_cast( pTrack->RouteCount() ) - 0.001 ) ) }; + auto const routewanted { pTrack->RouteDraw() }; sSpeedTable[iLast].iFlags |= (pTrack->CrossSegment(fLastDir < 0 ? tLast->iPrevDirection : tLast->iNextDirection, /* diff --git a/world/Road.cpp b/world/Road.cpp index 22c65289b..9a8049332 100644 --- a/world/Road.cpp +++ b/world/Road.cpp @@ -10,7 +10,9 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "world/Road.h" +#include "world/RoadOrder.h" #include "world/Track.h" +#include "vehicle/DynObj.h" #include "simulation/simulation.h" #include "scene/scene.h" #include "rendering/renderer.h" @@ -196,6 +198,9 @@ struct profile_point double height; // above the surface float texture; // texture coordinate across the road double shift{0.0}; // further distance from the axis, which the taper leaves alone + double spread{0.0}; // how much of the gap between the two directions of the road it's moved by: 0.5 for their left edge, -0.5 for the right one + double grow{0.0}; // what the shift changes by along the axis, evenly + double sink{0.0}; // what the height changes by along the axis, evenly }; // how far the taper of a road has got at specified part of its length. it starts and ends level, so the pieces of a road @@ -207,10 +212,13 @@ double taper_progress(double const Fraction) } // stretches provided profile along a part of the axis. the profile points go left to right, each two neighbours make a band of triangles. -// Taper: what the offsets of the profile are multiplied by at the start and at the end of the axis +// Road: the road it's done for, which says how the offsets of the profile change along the axis void loft(std::vector &Output, road_axis const &Axis, std::vector const &Profile, double const From, double const To, double const Step, double const Texturelength, - std::array const &Taper) + road_node::state const &Road) { + auto const &Taper{Road.taper}; + auto const &median{Road.median.width}; + auto const divided{Road.divided()}; if (Profile.size() < 2 || To <= From || Step <= 0.0) { return; @@ -230,10 +238,13 @@ void loft(std::vector &Output, road_axis const &Axis, std::vector< { auto const station{From + (To - From) * section / count}; auto const frame{Axis.at(station)}; - auto const scale{Taper[0] == Taper[1] ? static_cast(Taper[0]) : glm::mix(static_cast(Taper[0]), static_cast(Taper[1]), taper_progress(station / Axis.length()))}; + auto const fraction{Axis.length() > 0.0 ? station / Axis.length() : 0.0}; + auto const scale{Taper[0] == Taper[1] ? static_cast(Taper[0]) : glm::mix(static_cast(Taper[0]), static_cast(Taper[1]), taper_progress(fraction))}; + auto const gap{false == divided ? 0.0 : glm::mix(static_cast(median[0]), static_cast(median[1]), taper_progress(fraction))}; for (std::size_t idx = 0; idx < pointcount; ++idx) { - current[idx] = frame.position + frame.left * (Profile[idx].offset * scale + Profile[idx].shift) + up * Profile[idx].height; + auto const &point{Profile[idx]}; + current[idx] = frame.position + frame.left * (point.offset * scale + point.shift + point.spread * gap + point.grow * fraction) + up * (point.height + point.sink * fraction); } if (section > 0) { @@ -291,6 +302,35 @@ void road_node::state::normalize() forward = 1; } lanewidth = std::max(1.f, lanewidth); + weight = std::clamp(weight, 0.f, 10000.f); + for (auto &width : median.width) + { + width = std::clamp(width, 0.f, 100.f); + } + if (median.material.empty()) + { + median.material = "none"; + } + kerbwidth = std::clamp(kerbwidth, 0.05f, 2.f); + if (kerbmaterial.empty()) + { + kerbmaterial = "none"; + } + if (bankmaterial.empty()) + { + bankmaterial = "none"; + } + for (auto &bank : banks) + { + for (auto &width : bank.width) + { + width = std::clamp(width, 0.f, 100.f); + } + for (auto &drop : bank.drop) + { + drop = std::clamp(drop, -100.f, 100.f); + } + } for (auto &end : taper) { end = std::clamp(end, 0.25f, 4.f); @@ -405,13 +445,44 @@ double road_node::state::scale(double const T) const return glm::mix(static_cast(taper[0]), static_cast(taper[1]), taper_progress(T)); } +// true if the two directions of the road are kept apart anywhere along it +bool road_node::state::divided() const +{ + return forward > 0 && backward > 0 && (median.width[0] > 0.f || median.width[1] > 0.f); +} + +// how far apart the two directions are at specified value of the curve parameter +double road_node::state::median_width(double const T) const +{ + return divided() ? glm::mix(static_cast(median.width[0]), static_cast(median.width[1]), taper_progress(T)) : 0.0; +} + +// distance from the axis of the line the two directions meet at, on a road which doesn't keep them apart +double road_node::state::divide() const +{ + auto offset{0.5 * width()}; + for (std::size_t idx = 0; idx < static_cast(backward) && idx < lanes.size(); ++idx) + { + offset -= lanes[idx].width; + } + return offset; +} + +// width of the whole roadway at specified value of the curve parameter +double road_node::state::span(double const T) const +{ + return width() * scale(T) + median_width(T); +} + // shape of the middle of a lane, laid out in the direction of travel segment_data road_node::state::lane_path(std::size_t const Lane) const { road_axis const centre{axis}; - // on a road which gets wider or narrower the lane moves away from the axis or towards it along the way - auto const beginoffset{lane_offset(Lane) * taper[0]}; - auto const endoffset{lane_offset(Lane) * taper[1]}; + // on a road which gets wider or narrower the lane moves away from the axis or towards it along the way, + // and so it does where the two directions are led apart + auto const side{Lane < static_cast(backward) ? 0.5 : -0.5}; + auto const beginoffset{lane_offset(Lane) * taper[0] + side * median_width(0.0)}; + auto const endoffset{lane_offset(Lane) * taper[1] + side * median_width(1.0)}; auto const begin{centre.frame(0.0)}; auto const end{centre.frame(1.0)}; @@ -608,6 +679,69 @@ void road_node::import(cParser &Input, glm::dvec3 const &Offset) { m_state.environment = Input.getToken(); } + else if (token == "weight") + { + Input.getTokens(); + Input >> m_state.weight; + } + else if (token == "median") + { + // median + auto const type{Input.getToken()}; + m_state.median.type = (type == "gap" ? median_type::gap : type == "island" ? median_type::island : median_type::painted); + if (type != "gap" && type != "island" && type != "painted") + { + ErrorLog("Bad road: unknown kind of median \"" + type + "\" defined for " + label); + } + Input.getTokens(2); + Input >> m_state.median.width[0] >> m_state.median.width[1]; + m_state.median.material = Input.getToken(); + replace_slashes(m_state.median.material); + } + else if (token == "kerbs") + { + // kerbs + auto const where{Input.getToken()}; + m_state.kerbs = {where == "left" || where == "both", where == "right" || where == "both"}; + if (where != "left" && where != "right" && where != "both") + { + ErrorLog("Bad road: unknown side \"" + where + "\" defined for the kerbs of " + label); + } + Input.getTokens(); + Input >> m_state.kerbwidth; + m_state.kerbmaterial = Input.getToken(); + replace_slashes(m_state.kerbmaterial); + } + else if (token == "bank") + { + // bank + auto const where{Input.getToken()}; + bank_data bank; + bank.set = true; + Input.getTokens(4); + Input >> bank.width[0] >> bank.drop[0] >> bank.width[1] >> bank.drop[1]; + if (where == "left" || where == "both") + { + m_state.banks[0] = bank; + } + if (where == "right" || where == "both") + { + m_state.banks[1] = bank; + } + if (where != "left" && where != "right" && where != "both") + { + ErrorLog("Bad road: unknown side \"" + where + "\" defined for a bank of " + label); + } + } + else if (token == "bankmaterial") + { + m_state.bankmaterial = Input.getToken(); + replace_slashes(m_state.bankmaterial); + } + else if (token == "roundabout") + { + m_state.roundabout = true; + } else { ErrorLog("Bad road: unknown property: \"" + token + "\" defined for " + label); @@ -805,49 +939,147 @@ std::vector road_node::create_shapes() const auto const step{axis.step()}; auto const halfwidth{0.5 * road.width()}; double const texturelength{road.texturelength}; + // where the two directions are kept apart there's a roadway for each, moved away from the axis by half of what's between them + auto const divided{road.divided()}; + auto const divide{road.divide()}; + auto const widest{static_cast(std::max(road.median.width[0], road.median.width[1]))}; + auto const height{static_cast(road.kerbheight)}; + auto const usable = [](std::string const &Material) { return false == Material.empty() && Material != "none"; }; // surface. the image is centered on the axis, and repeated if the road is wider if (road.surface != "none") { auto const tile{static_cast(texture_ratio(road.surface)) * texturelength}; - loft(vertices(road.surface, lighting_data{}), axis, {{halfwidth, 0.0, static_cast(0.5 + halfwidth / tile)}, {-halfwidth, 0.0, static_cast(0.5 - halfwidth / tile)}}, 0.0, length, step, texturelength, road.taper); - } - - // sides - for (int side = 0; side < 2; ++side) - { - auto const &data{road.sides[side]}; - if (data.type == side_type::none || data.width <= 0.f || data.material.empty() || data.material == "none") + auto const corner = [&](double const Offset, double const Spread) { return profile_point{Offset, 0.0, static_cast(0.5 + (Offset + Spread * widest) / tile), 0.0, Spread}; }; + auto &surface{vertices(road.surface, lighting_data{})}; + if (false == divided) { - continue; - } - auto const direction{side == 0 ? 1.0 : -1.0}; - // corners of the profile, from the edge of the surface outwards - std::vector profile; - if (data.type == side_type::shoulder) - { - // the image is laid out like the one of the legacy roads: the edge of the surface on its right, the bank on its left half - profile.push_back({direction * halfwidth, 0.0, 1.f}); - profile.push_back({direction * halfwidth, 0.0, 0.5f, direction * data.width}); - if (road.slope.x > 0.f) - { - profile.push_back({direction * halfwidth, -road.slope.y, 0.f, direction * (data.width + road.slope.x)}); - } + loft(surface, axis, {corner(halfwidth, 0.0), corner(-halfwidth, 0.0)}, 0.0, length, step, texturelength, road); } else + { + loft(surface, axis, {corner(halfwidth, 0.5), corner(divide, 0.5)}, 0.0, length, step, texturelength, road); + if (road.median.type == median_type::painted) + { + // the surface carries on between the roadways + loft(surface, axis, {corner(divide, 0.5), corner(divide, -0.5)}, 0.0, length, step, texturelength, road); + } + loft(surface, axis, {corner(divide, -0.5), corner(-halfwidth, -0.5)}, 0.0, length, step, texturelength, road); + } + } + + // an island between the roadways: a kerb facing each of them, and what's between the kerbs + if (divided && road.median.type == median_type::island) + { + auto const kerbed{usable(road.kerbmaterial)}; + auto const covered{usable(road.median.material)}; + double const kerbwidth{kerbed ? road.kerbwidth : 0.0}; + if (kerbed) + { + auto const tile{static_cast(texture_ratio(road.kerbmaterial)) * texturelength}; + auto const foot{0.f}; + auto const top{static_cast(height / tile)}; + auto const inner{static_cast((height + kerbwidth) / tile)}; + auto &kerbs{vertices(road.kerbmaterial, lighting_data{})}; + loft(kerbs, axis, {{divide, 0.0, foot, 0.0, 0.5}, {divide, height, top, 0.0, 0.5}, {divide, height, inner, -kerbwidth, 0.5}}, 0.0, length, step, texturelength, road); + loft(kerbs, axis, {{divide, height, inner, kerbwidth, -0.5}, {divide, height, top, 0.0, -0.5}, {divide, 0.0, foot, 0.0, -0.5}}, 0.0, length, step, texturelength, road); + } + if (covered) + { + auto const tile{static_cast(texture_ratio(road.median.material)) * texturelength}; + std::vector profile; + if (false == kerbed) + { + // without kerbs of their own material the sides of the island are covered with what its top is + profile.push_back({divide, 0.0, 0.f, 0.0, 0.5}); + } + profile.push_back({divide, height, static_cast(height / tile), -kerbwidth, 0.5}); + profile.push_back({divide, height, static_cast((height + widest) / tile), kerbwidth, -0.5}); + if (false == kerbed) + { + profile.push_back({divide, 0.0, static_cast((2.0 * height + widest) / tile), 0.0, -0.5}); + } + loft(vertices(road.median.material, lighting_data{}), axis, profile, 0.0, length, step, texturelength, road); + } + } + + // sides: a kerb, then a shoulder or a sidewalk, then a bank leading to the ground; each of them optional + for (int side = 0; side < 2; ++side) + { + auto const &data{road.sides[side]}; + auto const direction{side == 0 ? 1.0 : -1.0}; + auto const sided{data.type != side_type::none && data.width > 0.f && usable(data.material)}; + auto const kerbed{road.kerbs[side] && usable(road.kerbmaterial)}; + // the profiles are given from the edge of the surface outwards, as distances from that edge + auto const emit = [&](std::string const &Material, std::vector Profile) { + for (auto &point : Profile) + { + point.offset = direction * halfwidth; + point.spread = (divided ? direction * 0.5 : 0.0); + point.shift *= direction; + point.grow *= direction; + } + if (side == 0) + { + // the loft takes the corners left to right + std::reverse(Profile.begin(), Profile.end()); + } + loft(vertices(Material, lighting_data{}), axis, Profile, 0.0, length, step, texturelength, road); + }; + double reach{0.0}; // how far from the edge of the surface the next thing starts + double level{0.0}; // and how high + if (kerbed) + { + auto const tile{static_cast(texture_ratio(road.kerbmaterial)) * texturelength}; + double const width{road.kerbwidth}; + std::vector kerb{{0.0, 0.0, 0.f, 0.0}, {0.0, height, static_cast(height / tile), 0.0}, {0.0, height, static_cast((height + width) / tile), width}}; + if (false == sided || data.type != side_type::sidewalk) + { + // with nothing raised behind it the kerb has a back + kerb.push_back({0.0, 0.0, static_cast((2.0 * height + width) / tile), width}); + } + emit(road.kerbmaterial, kerb); + reach = width; + } + if (sided && data.type == side_type::shoulder) + { + // the image is laid out like the one of the legacy roads: the edge of the surface on its right, the bank on its left half + std::vector profile{{0.0, 0.0, 1.f, reach}, {0.0, 0.0, 0.5f, reach + data.width}}; + reach += data.width; + auto const &bank{road.banks[side]}; + glm::dvec2 const start{bank.set ? bank.width[0] : road.slope.x, bank.set ? bank.drop[0] : road.slope.y}; + glm::dvec2 const end{bank.set ? bank.width[1] : road.slope.x, bank.set ? bank.drop[1] : road.slope.y}; + if (start.x > 0.0 || end.x > 0.0) + { + profile.push_back({0.0, -start.y, 0.f, reach + start.x, 0.0, end.x - start.x, start.y - end.y}); + } + emit(data.material, profile); + } + else if (sided) { // the image starts at the foot of the kerb, and is laid out in its own proportions auto const tile{static_cast(texture_ratio(data.material)) * texturelength}; - profile.push_back({direction * halfwidth, 0.0, 0.f}); - profile.push_back({direction * halfwidth, road.kerbheight, static_cast(road.kerbheight / tile)}); - profile.push_back({direction * halfwidth, road.kerbheight, static_cast((road.kerbheight + data.width) / tile), direction * data.width}); + std::vector profile; + if (false == kerbed) + { + profile.push_back({0.0, 0.0, 0.f, 0.0}); + } + profile.push_back({0.0, height, static_cast(height / tile), reach}); + profile.push_back({0.0, height, static_cast((height + data.width) / tile), reach + data.width}); + emit(data.material, profile); + reach += data.width; + level = height; } - if (side == 0) + // a bank next to something other than a shoulder is covered with a material of its own + auto const &bank{road.banks[side]}; + if ((false == sided || data.type != side_type::shoulder) && bank.set && usable(road.bankmaterial) && (bank.width[0] > 0.f || bank.width[1] > 0.f)) { - // the loft takes the corners left to right - std::reverse(profile.begin(), profile.end()); + auto const tile{static_cast(texture_ratio(road.bankmaterial)) * texturelength}; + profile_point foot{0.0, level - bank.drop[0], static_cast(std::max(bank.width[0], bank.width[1]) / tile), reach + bank.width[0]}; + foot.grow = static_cast(bank.width[1]) - bank.width[0]; + foot.sink = static_cast(bank.drop[0]) - bank.drop[1]; + emit(road.bankmaterial, {{0.0, level, 0.f, reach}, foot}); } - loft(vertices(data.material, lighting_data{}), axis, profile, 0.0, length, step, texturelength, road.taper); } // markings. these are painted with plain colour instead of an image @@ -858,18 +1090,21 @@ std::vector road_node::create_shapes() const paint.ambient = paint.diffuse; auto &lines{vertices("colored", paint)}; - // Offset: where the line runs on a road as wide as its lanes say, Shift: how far from there it's kept whatever the width - auto const solid = [&](double const Offset, double const Shift) { - loft(lines, axis, {{Offset, line_lift, 0.f, Shift + 0.5 * line_width}, {Offset, line_lift, 1.f, Shift - 0.5 * line_width}}, 0.0, length, std::min(step, dash_step), texturelength, road.taper); + // Offset: where the line runs on a road as wide as its lanes say, Shift: how far from there it's kept whatever the width, + // Spread: which of the roadways it goes with, where the road has two + auto const solid = [&](double const Offset, double const Shift, double const Spread) { + std::vector const line{{Offset, line_lift, 0.f, Shift + 0.5 * line_width, Spread}, {Offset, line_lift, 1.f, Shift - 0.5 * line_width, Spread}}; + loft(lines, axis, line, 0.0, length, std::min(step, dash_step), texturelength, road); }; // the dashes are fitted so the gaps at both ends of the road are a half of the regular one, which makes them match the next piece - auto const dashed = [&](double const Offset, double const Shift) { + auto const dashed = [&](double const Offset, double const Shift, double const Spread) { auto const count{std::max(1, static_cast(std::lround(length / dash_period)))}; auto const period{length / count}; + std::vector const line{{Offset, line_lift, 0.f, Shift + 0.5 * line_width, Spread}, {Offset, line_lift, 1.f, Shift - 0.5 * line_width, Spread}}; for (int dash = 0; dash < count; ++dash) { auto const from{(dash + 1.0 / 3.0) * period}; - loft(lines, axis, {{Offset, line_lift, 0.f, Shift + 0.5 * line_width}, {Offset, line_lift, 1.f, Shift - 0.5 * line_width}}, from, from + period / 3.0, dash_step, texturelength, road.taper); + loft(lines, axis, line, from, from + period / 3.0, dash_step, texturelength, road); } }; @@ -877,8 +1112,8 @@ std::vector road_node::create_shapes() const auto const inset{edge_inset + 0.5 * line_width}; if (halfwidth * std::min(road.taper[0], road.taper[1]) - inset > 0.5) { - solid(halfwidth, -inset); - solid(-halfwidth, inset); + solid(halfwidth, -inset, divided ? 0.5 : 0.0); + solid(-halfwidth, inset, divided ? -0.5 : 0.0); } // lines between the lanes. a lane can be left across a dashed line, or across a pair of lines if the dashed one is on its side auto offset{halfwidth}; @@ -887,23 +1122,31 @@ std::vector road_node::create_shapes() const offset -= road.lanes[boundary].width; auto const opposite{road.backward > 0 && boundary + 1 == static_cast(road.backward)}; auto const pair{0.5 * (line_width + line_spacing)}; + if (opposite && divided) + { + // each of the two roadways gets its edge line + solid(offset, inset, 0.5); + solid(offset, -inset, -0.5); + continue; + } + auto const spread{false == divided ? 0.0 : boundary + 1 < static_cast(road.backward) ? 0.5 : -0.5}; switch (road.changes[boundary]) { case change_both: { - dashed(offset, 0.0); + dashed(offset, 0.0, spread); break; } case change_toright: { - dashed(offset, pair); - solid(offset, -pair); + dashed(offset, pair, spread); + solid(offset, -pair, spread); break; } case change_toleft: { - solid(offset, pair); - dashed(offset, -pair); + solid(offset, pair, spread); + dashed(offset, -pair, spread); break; } default: @@ -911,17 +1154,51 @@ std::vector road_node::create_shapes() const if (opposite) { // traffic going opposite ways is kept apart with a double line - solid(offset, pair); - solid(offset, -pair); + solid(offset, pair, spread); + solid(offset, -pair, spread); } else { - solid(offset, 0.0); + solid(offset, 0.0, spread); } break; } } } + if (divided && road.median.type == median_type::painted && length > 0.0) + { + // what's between the roadways is closed to the traffic: slanted stripes are led from one edge line to the other + double const period{3.0}; + double const stripe{0.5}; + glm::vec3 const upwards{0.f, 1.f, 0.f}; + auto const gap_at = [&](double const Station) { return glm::mix(static_cast(road.median.width[0]), static_cast(road.median.width[1]), taper_progress(Station / length)); }; + // point of the edge of one of the roadways, a bit into what's between them. Side: 1 for the left one, -1 for the right one + auto const edge = [&](double const Station, double const Side) { + auto const station{std::clamp(Station, 0.0, length)}; + auto const frame{axis.at(station)}; + auto const scale{glm::mix(static_cast(road.taper[0]), static_cast(road.taper[1]), taper_progress(station / length))}; + return frame.position + frame.left * (divide * scale + Side * std::max(0.0, 0.5 * gap_at(station) - 2.0 * inset)) + up * line_lift; + }; + for (auto station{0.5 * period}; station < length; station += period) + { + auto const gap{gap_at(station)}; + if (gap < 1.0) + { + continue; + } + // a stripe gets as far along the road as it gets across it + auto const leftstart{edge(station, 1.0)}; + auto const leftend{edge(station + stripe, 1.0)}; + auto const rightstart{edge(station + gap, -1.0)}; + auto const rightend{edge(station + gap + stripe, -1.0)}; + lines.push_back({leftstart, upwards, {0.f, 0.f}}); + lines.push_back({rightstart, upwards, {1.f, 0.f}}); + lines.push_back({leftend, upwards, {0.f, 1.f}}); + lines.push_back({rightstart, upwards, {1.f, 0.f}}); + lines.push_back({rightend, upwards, {1.f, 1.f}}); + lines.push_back({leftend, upwards, {0.f, 1.f}}); + } + } } std::vector shapes; @@ -950,6 +1227,13 @@ double const junction_fit{0.05}; // a lane has to end this close to where the ju int const corner_steps{6}; // pieces a rounded corner is made of double const stopline_width{0.5}; double const stopline_inset{0.2}; // distance of a stop line from the end of its road +double const gate_period{0.2}; // seconds between looks at the traffic around a junction +double const gate_reach{120.0}; // how far back along the lanes leading to a junction the vehicles are looked for +double const gate_gap{6.0}; // a vehicle this many seconds from a junction starts to matter to the others, and is told about them +double const gate_zone{15.0}; // and so does one this close, however slow it goes +double const gate_commit{8.0}; // a vehicle let through this close to the junction is on its way, the others wait for it +double const gate_patience{6.0}; // seconds a vehicle let through can stand still before the others stop waiting for it +double const way_clearance{2.2}; // ways through a junction which pass this close to each other can't be taken at the same time // direction on the ground as a vector in space glm::dvec3 flat(glm::dvec2 const &Direction) @@ -1064,10 +1348,24 @@ void junction_node::state::normalize() arm.incoming = std::clamp(arm.incoming, 0, 8); arm.outgoing = std::clamp(arm.outgoing, 0, 8); arm.width = std::max(1.f, arm.width); + arm.median = (arm.incoming > 0 && arm.outgoing > 0 ? std::clamp(arm.median, 0.f, 100.f) : 0.f); arm.direction = (glm::length(arm.direction) > 1e-6 ? glm::normalize(arm.direction) : glm::dvec2{0.0, 1.0}); + if (arm.turns.size() > static_cast(arm.incoming)) + { + arm.turns.resize(static_cast(arm.incoming)); + } + for (auto &turns : arm.turns) + { + turns &= (turn_left | turn_straight | turn_right); + } } side.width = std::max(0.f, side.width); kerbheight = std::max(0.f, kerbheight); + kerbwidth = std::clamp(kerbwidth, 0.05f, 2.f); + if (kerbmaterial.empty()) + { + kerbmaterial = "none"; + } slope = glm::max(slope, glm::vec2{0.f}); if (texturelength < 0.01f) { @@ -1087,7 +1385,7 @@ void junction_node::state::normalize() // width of the road at specified arm double junction_node::state::arm_width(std::size_t const Arm) const { - return Arm < arms.size() ? static_cast(arms[Arm].incoming + arms[Arm].outgoing) * arms[Arm].width : 0.0; + return Arm < arms.size() ? static_cast(arms[Arm].incoming + arms[Arm].outgoing) * arms[Arm].width + arms[Arm].median : 0.0; } // where a lane of an arm meets the junction; the lanes of each kind are counted from the middle of the road, starting with 1 @@ -1096,7 +1394,8 @@ glm::dvec3 junction_node::state::lane_point(std::size_t const Arm, bool const In auto const &arm{arms[Arm]}; // seen from the junction the traffic coming in is on the left side of the road, and the one going out on the right auto const divide{0.5 * arm_width(Arm) - static_cast(arm.incoming) * arm.width}; - auto const offset{Incoming ? divide + (Lane - 0.5) * arm.width : divide - (Lane - 0.5) * arm.width}; + // what keeps the two directions apart lies past the lanes coming in + auto const offset{Incoming ? divide + (Lane - 0.5) * arm.width : divide - arm.median - (Lane - 0.5) * arm.width}; return arm.position + flat(left_of(arm.direction)) * offset; } @@ -1174,6 +1473,16 @@ void junction_node::import(cParser &Input, glm::dvec3 const &Offset) Input >> m_state.centre.x >> m_state.centre.y >> m_state.centre.z; m_state.centre += Offset; std::vector stoplines; + // what's said about the arms may come ahead of them, so it waits until all is read + std::vector> priorities; + std::vector> medians; + struct turn_property + { + int arm; + int lane; + std::string ways; + }; + std::vector turns; auto token{Input.getToken()}; while (false == token.empty() && token != "endjunction") @@ -1231,6 +1540,15 @@ void junction_node::import(cParser &Input, glm::dvec3 const &Offset) Input.getTokens(2); Input >> m_state.slope.x >> m_state.slope.y; } + else if (token == "kerbs") + { + // kerbs + m_state.kerbs = true; + Input.getTokens(); + Input >> m_state.kerbwidth; + m_state.kerbmaterial = Input.getToken(); + replace_slashes(m_state.kerbmaterial); + } else if (token == "stopline") { // stopline ; the arms it's for may come later, so the numbers wait @@ -1239,6 +1557,34 @@ void junction_node::import(cParser &Input, glm::dvec3 const &Offset) Input >> number; stoplines.emplace_back(number); } + else if (token == "priority") + { + // priority + int number{0}; + Input.getTokens(); + Input >> number; + priorities.emplace_back(number, Input.getToken()); + } + else if (token == "armmedian") + { + // armmedian + int number{0}; + float width{0.f}; + Input.getTokens(2); + Input >> number >> width; + medians.emplace_back(number, width); + } + else if (token == "turns") + { + // turns + turn_property property; + property.arm = 0; + property.lane = 0; + Input.getTokens(2); + Input >> property.arm >> property.lane; + property.ways = Input.getToken(); + turns.emplace_back(property); + } else if (token == "velocity") { Input.getTokens(); @@ -1268,6 +1614,41 @@ void junction_node::import(cParser &Input, glm::dvec3 const &Offset) } m_state.arms[number - 1].stopline = true; } + for (auto const &entry : medians) + { + if (entry.first < 1 || entry.first > static_cast(m_state.arms.size())) + { + ErrorLog("Bad junction: " + label + " has no arm " + std::to_string(entry.first) + " to set the median for"); + continue; + } + m_state.arms[entry.first - 1].median = entry.second; + } + for (auto const &entry : priorities) + { + if (entry.first < 1 || entry.first > static_cast(m_state.arms.size())) + { + ErrorLog("Bad junction: " + label + " has no arm " + std::to_string(entry.first) + " to set the right of way for"); + continue; + } + auto &priority{m_state.arms[entry.first - 1].priority}; + priority = (entry.second == "main" ? right_of_way::priority : entry.second == "yield" ? right_of_way::yield : entry.second == "stop" ? right_of_way::stop : right_of_way::none); + if (entry.second != "main" && entry.second != "yield" && entry.second != "stop" && entry.second != "none") + { + ErrorLog("Bad junction: unknown right of way \"" + entry.second + "\" defined for " + label); + } + } + for (auto const &entry : turns) + { + if (entry.arm < 1 || entry.arm > static_cast(m_state.arms.size()) || entry.lane < 1 || entry.lane > m_state.arms[entry.arm - 1].incoming) + { + ErrorLog("Bad junction: " + label + " has no lane " + std::to_string(entry.lane) + " leading in at arm " + std::to_string(entry.arm)); + continue; + } + auto &lanes{m_state.arms[entry.arm - 1].turns}; + lanes.resize(std::max(lanes.size(), static_cast(entry.lane)), 0); + auto const has = [&entry](char const Way) { return entry.ways.find(Way) != std::string::npos; }; + lanes[entry.lane - 1] = (has('l') ? turn_left : 0) | (has('s') ? turn_straight : 0) | (has('r') ? turn_right : 0); + } if (m_state.arms.size() < 2 || m_state.arms.size() > 4) { ErrorLog("Bad junction: " + label + " has " + std::to_string(m_state.arms.size()) + " arms, it takes 2 to 4"); @@ -1298,6 +1679,7 @@ void junction_node::create_links() { std::vector incoming; std::vector outgoing; + float weight{100.f}; // how willing the drivers are to leave by the road }; std::vector lanes(arms.size()); for (std::size_t arm = 0; arm < arms.size(); ++arm) @@ -1317,6 +1699,7 @@ void junction_node::create_links() { continue; } + lanes[arm].weight = layout.weight; // the lanes heading for this end of the road lead into the junction, the others lead out of it for (int lane = 1; lane <= arms[arm].incoming; ++lane) { @@ -1407,11 +1790,14 @@ void junction_node::create_links() { continue; } - // with more lanes than one the inner lane takes the left turns, the outer one the right turns, and all go straight + // with more lanes than one the inner lane takes the left turns, the outer one the right turns, and all go straight; + // unless the scenery says which ways the lane can be left by + auto const turns{static_cast(lane - 1) < arms[arm].turns.size() ? arms[arm].turns[lane - 1] : 0}; std::vector ways; for (auto const &exit : exits) { - auto const allowed{lanecount == 1 || exit.kind == way::straight || (exit.kind == way::left && lane == 1) || (exit.kind == way::right && lane == lanecount)}; + auto const allowed{turns != 0 ? (turns & (exit.kind == way::left ? turn_left : exit.kind == way::right ? turn_right : turn_straight)) != 0 : + lanecount == 1 || exit.kind == way::straight || (exit.kind == way::left && lane == 1) || (exit.kind == way::right && lane == lanecount)}; if (allowed) { ways.emplace_back(exit); @@ -1482,6 +1868,14 @@ void junction_node::create_links() reach += 0.39 * span / ways.size(); } auto const startcontrol{(flat(heading) + up * lane_grade(*entry, true)) * reach}; + gate_data gate; + gate.arm = arm; + gate.lane = lane; + gate.entry = entry; + gate.line = start; + // what a driver calls each way, once they picked it: the number of the path of the crossroads it's on, negative if it's taken against the path + int const codes2[]{1, -2}; + int const codes3[]{1, 5, -4}; for (std::size_t idx = 0; idx < ways.size(); ++idx) { segment_data movement; @@ -1490,6 +1884,13 @@ void junction_node::create_links() movement.points[segment_data::point::control2] = endcontrols[idx]; movement.points[segment_data::point::end] = ends[idx]; m_movements.emplace_back(movement); + way_data route; + route.exit = ways[idx].arm; + route.kind = (ways[idx].kind == way::left ? turn_left : ways[idx].kind == way::right ? turn_right : turn_straight); + route.code = (ways.size() == 3 ? codes3[idx] : ways.size() == 2 ? codes2[idx] : 0); + route.track = ways[idx].track; + route.path = movement; + gate.ways.emplace_back(route); } text.str(""); @@ -1556,6 +1957,16 @@ void junction_node::create_links() link->Switch(0); entry->trNext = link; entry->iNextDirection = 0; + // odds of each way being picked go by how willing the drivers are to take the road it leads to. + // the routes of a crossroads are numbered: left, right, straight ahead + if (ways.size() == 3) + { + link->m_routeweights = {lanes[ways[1].arm].weight, lanes[ways[2].arm].weight, lanes[ways[0].arm].weight}; + } + else + { + link->m_routeweights = {lanes[ways[0].arm].weight, lanes[ways[1].arm].weight, 0.f}; + } // the lanes going out get to know one of the paths leading to them, for whatever goes backwards int const ends2[]{1, 2}; int const ends3[]{1, 3, 2}; @@ -1569,19 +1980,356 @@ void junction_node::create_links() } } m_links.emplace_back(link); + gate.link = link; + m_gates.emplace_back(std::move(gate)); } } + create_gates(); +} + +// sets up what the traffic of each lane leading in is told, once the ways through are made +void junction_node::create_gates() +{ + if (m_state.arms.size() < 3) + { + // where a road only changes its lanes nobody gets in the way of anybody + m_gates.clear(); + return; + } + auto const point = [](segment_data const &Path, double const T) { + auto const &p0{Path.points[segment_data::point::start]}; + auto const &p3{Path.points[segment_data::point::end]}; + auto const p1{p0 + Path.points[segment_data::point::control1]}; + auto const p2{p3 + Path.points[segment_data::point::control2]}; + auto const u{1.0 - T}; + auto const result{u * u * u * p0 + 3.0 * u * u * T * p1 + 3.0 * u * T * T * p2 + T * T * T * p3}; + return glm::dvec2{result.x, result.z}; + }; + int const samples{10}; + for (std::size_t index = 0; index < m_gates.size(); ++index) + { + auto &gate{m_gates[index]}; + // lanes the vehicles heading for the junction are on: the one leading in, and the same lane of the pieces before it + gate.approach.emplace_back(gate.entry); + auto reach{glm::distance(glm::dvec3{gate.entry->CurrentSegment()->FastGetPoint_0()}, glm::dvec3{gate.entry->CurrentSegment()->FastGetPoint_1()})}; + for (auto *lane{gate.entry}; reach < gate_reach && gate.approach.size() < 16;) + { + auto *previous{lane->trPrev}; + if (previous == nullptr || previous->trNext != lane || dynamic_cast(previous->m_road) == nullptr || previous->m_paths.size() != 1) + { + break; + } + gate.approach.emplace_back(previous); + reach += glm::distance(glm::dvec3{previous->CurrentSegment()->FastGetPoint_0()}, glm::dvec3{previous->CurrentSegment()->FastGetPoint_1()}); + lane = previous; + } + // the order, found by the drivers a bit ahead of where the lane ends + if (index >= m_orders.size()) + { + m_orders.emplace_back(new road_order()); + m_orders.back()->m_name = m_name + ":gate" + std::to_string(m_orders.size()); + } + gate.order = m_orders[index]; + gate.order->m_velocity = -1.0; + gate.order->m_location = gate.line; + gate.entry->m_events2.emplace_back(gate.order->m_name, gate.order); + // ways which get in the way of each other: the ones from other roads which cross it, or lead to the same lane + for (std::size_t way = 0; way < gate.ways.size(); ++way) + { + for (std::size_t other = 0; other < m_gates.size(); ++other) + { + if (m_gates[other].arm == gate.arm) + { + continue; + } + for (std::size_t otherway = 0; otherway < m_gates[other].ways.size(); ++otherway) + { + auto const &path{gate.ways[way].path}; + auto const &otherpath{m_gates[other].ways[otherway].path}; + auto nearest{std::numeric_limits::max()}; + for (int first = 0; first <= samples; ++first) + { + for (int second = 0; second <= samples; ++second) + { + nearest = std::min(nearest, glm::distance(point(path, static_cast(first) / samples), point(otherpath, static_cast(second) / samples))); + } + } + if (nearest < way_clearance) + { + gate.ways[way].conflicts.emplace_back(other, otherway); + } + } + } + } + } + m_scan = 0.0; + m_quiet = false; } // gives up the paths leading through the junction std::vector junction_node::release_links() { + // the lanes leading in are let go of. a driver who has one of the orders in sight keeps it; it's not to hold anyone anymore + for (auto const &gate : m_gates) + { + if (gate.entry == nullptr || gate.order == nullptr) + { + continue; + } + auto &events{gate.entry->m_events2}; + auto const *order{static_cast(gate.order)}; + events.erase(std::remove_if(events.begin(), events.end(), [order](std::pair const &Entry) { return Entry.second == order; }), events.end()); + } + for (auto *order : m_orders) + { + order->m_velocity = -1.0; + } + m_gates.clear(); std::vector released; released.swap(m_links); m_movements.clear(); return released; } +// tells the vehicles heading for the junction whether they can drive on +void junction_node::update(double const Deltatime) +{ + if (m_gates.empty()) + { + return; + } + m_scan -= Deltatime; + if (m_scan > 0.0) + { + return; + } + auto const elapsed{gate_period - m_scan}; + m_scan = gate_period; + + // ways a vehicle is going to take, or is on: the one its driver picked, or any of them if the driver didn't pick yet + auto const ways_of = [](gate_data const &Gate, TDynamicObject *Vehicle) { + auto const all{(1u << Gate.ways.size()) - 1u}; + if (Gate.ways.size() < 2) + { + return all; + } + auto const code{Vehicle->RouteWish(Gate.link)}; + for (std::size_t way = 0; way < Gate.ways.size(); ++way) + { + if (Gate.ways[way].code == code) + { + return 1u << way; + } + } + return all; + }; + // who's first in line on each lane leading in, and who's on the ways through + auto traffic{false}; + for (auto &gate : m_gates) + { + TDynamicObject *first{nullptr}; + auto nearest{std::numeric_limits::max()}; + for (auto const *lane : gate.approach) + { + for (auto *vehicle : lane->Dynamics) + { + if (vehicle == nullptr) + { + continue; + } + auto const position{vehicle->GetPosition()}; + auto const distance{glm::distance(glm::dvec2{position.x, position.z}, glm::dvec2{gate.line.x, gate.line.z})}; + if (distance < nearest) + { + nearest = distance; + first = vehicle; + } + } + } + if (first != gate.first) + { + gate.first = first; + gate.committed = false; + gate.stopped = false; + gate.waited = 0.0; + gate.idle = 0.0; + } + gate.inside = 0; + for (auto *vehicle : gate.link->Dynamics) + { + if (vehicle != nullptr) + { + gate.inside |= ways_of(gate, vehicle); + } + } + if (first != nullptr) + { + gate.distance = nearest; + gate.speed = std::abs(first->MoverParameters->V); + gate.halflength = 0.5 * first->MoverParameters->Dim.L; + gate.taken = ways_of(gate, first); + gate.active = gate.distance < std::max(gate_zone, gate.speed * gate_gap) + gate.halflength; + } + else + { + gate.taken = 0; + gate.active = false; + gate.blocked = false; + } + traffic = traffic || first != nullptr || gate.inside != 0; + } + if (false == traffic) + { + if (false == m_quiet) + { + for (auto &gate : m_gates) + { + gate.order->m_velocity = -1.0; + } + m_quiet = true; + } + return; + } + m_quiet = false; + + auto const &arms{m_state.arms}; + auto const rank = [&arms](gate_data const &Gate) { return arms[Gate.arm].priority == right_of_way::priority ? 2 : arms[Gate.arm].priority == right_of_way::none ? 1 : 0; }; + // true if any of the ways marked for one lane gets in the way of any marked for another + auto const clash = [this](std::size_t const Gate, unsigned const Ways, std::size_t const Other, unsigned const Otherways) { + auto const &gate{m_gates[Gate]}; + for (std::size_t way = 0; way < gate.ways.size(); ++way) + { + if ((Ways & (1u << way)) == 0) + { + continue; + } + for (auto const &conflict : gate.ways[way].conflicts) + { + if (conflict.first == Other && (Otherways & (1u << conflict.second)) != 0) + { + return true; + } + } + } + return false; + }; + auto const turns_left = [](gate_data const &Gate) { + if (Gate.taken == 0) + { + return false; + } + for (std::size_t way = 0; way < Gate.ways.size(); ++way) + { + if ((Gate.taken & (1u << way)) != 0 && Gate.ways[way].kind != turn_left) + { + return false; + } + } + return true; + }; + // true if the first vehicle of one lane goes ahead of the first vehicle of another + auto const precedes = [&](gate_data const &Rival, gate_data const &Gate) { + if (rank(Rival) != rank(Gate)) + { + return rank(Rival) > rank(Gate); + } + // neither has the right of way over the other: the one coming from the right goes first, + // and so does the one coming from the opposite side, if its way is turned across + auto const bearing{turn_angle(-arms[Gate.arm].direction, arms[Rival.arm].direction)}; + if (bearing < -glm::radians(20.0) && bearing > -glm::radians(160.0)) + { + return true; + } + return std::abs(bearing) <= glm::radians(20.0) && turns_left(Gate) && false == turns_left(Rival); + }; + // the lanes are gone through from the ones with the right of way, and among these from the one waiting the longest + std::vector order(m_gates.size()); + for (std::size_t index = 0; index < order.size(); ++index) + { + order[index] = index; + } + std::stable_sort(order.begin(), order.end(), [&](std::size_t const Left, std::size_t const Right) { + return rank(m_gates[Left]) != rank(m_gates[Right]) ? rank(m_gates[Left]) > rank(m_gates[Right]) : m_gates[Left].waited > m_gates[Right].waited; + }); + for (auto const index : order) + { + auto &gate{m_gates[index]}; + if (gate.first == nullptr || false == gate.active) + { + // nobody to tell anything, or too far to be bothered + gate.blocked = false; + gate.committed = false; + gate.order->m_velocity = -1.0; + continue; + } + auto blocked{false}; + for (std::size_t other = 0; other < m_gates.size() && false == blocked; ++other) + { + auto const &rival{m_gates[other]}; + if (rival.arm == gate.arm) + { + continue; + } + // the ones driving through the junction, and the ones which were let in + if (rival.inside != 0 && clash(index, gate.taken, other, rival.inside)) + { + blocked = true; + } + if (rival.first == nullptr || false == rival.active || false == clash(index, gate.taken, other, rival.taken)) + { + continue; + } + if (rival.committed) + { + blocked = true; + } + // the ones to give way to. one which stands waiting for somebody else isn't waited for: + // it'll be told to wait for this one in turn, once this one is let in + else if (precedes(rival, gate) && false == (rival.blocked && rival.speed < 0.5)) + { + blocked = true; + } + } + if (arms[gate.arm].priority == right_of_way::stop && false == gate.stopped) + { + // the stop has to be made, whatever the traffic + if (gate.speed < 0.3 && gate.distance < gate.halflength + 6.0) + { + gate.stopped = true; + } + else + { + blocked = true; + } + } + if (blocked) + { + gate.committed = false; + if (gate.speed < 0.5) + { + gate.waited += elapsed; + } + } + else if (gate.committed) + { + // a vehicle which was let in and doesn't go, for whatever reason, isn't waited for forever + gate.idle = (gate.speed < 0.5 ? gate.idle + elapsed : 0.0); + if (gate.idle > gate_patience) + { + gate.committed = false; + gate.idle = 0.0; + } + } + else if (gate.distance < gate.halflength + gate_commit) + { + gate.committed = true; + gate.idle = 0.0; + } + gate.blocked = blocked; + gate.order->m_velocity = (blocked ? 0.0 : -1.0); + } +} + // true if there's a vehicle on any path of the junction bool junction_node::occupied() const { @@ -1628,33 +2376,14 @@ std::vector junction_node::create_shapes() const shapes.emplace_back(std::move(shape)); } } - auto const &side{m_state.side}; - if (side.type != road_node::side_type::none && side.width > 0.f && false == side.material.empty() && side.material != "none") + // the corners are lined the way the edges of a road are, so the kerbs, the shoulders and the sidewalks of the roads carry on around the junction + struct corner_point { - // the corners are lined the way the sides of a road are, so the shoulders and the sidewalks of the roads carry on around the junction - struct corner_point - { - double offset; // distance from the edge of the surface - double height; - float texture; - }; - std::vector profile; - if (side.type == road_node::side_type::shoulder) - { - profile.push_back({0.0, 0.0, 1.f}); - profile.push_back({side.width, 0.0, 0.5f}); - if (m_state.slope.x > 0.f) - { - profile.push_back({static_cast(side.width) + m_state.slope.x, -m_state.slope.y, 0.f}); - } - } - else - { - auto const tile{static_cast(texture_ratio(side.material)) * m_state.texturelength}; - profile.push_back({0.0, 0.0, 0.f}); - profile.push_back({0.0, m_state.kerbheight, static_cast(m_state.kerbheight / tile)}); - profile.push_back({side.width, m_state.kerbheight, static_cast((m_state.kerbheight + side.width) / tile)}); - } + double offset; // distance from the edge of the surface + double height; + float texture; + }; + auto const line_corners = [&](std::string const &Material, std::vector const &Profile) { auto const order{m_state.arm_order()}; std::vector vertices; for (std::size_t idx = 0; idx < corners.size() && idx < order.size(); ++idx) @@ -1665,7 +2394,7 @@ std::vector junction_node::create_shapes() const continue; } // the way out of the surface at each point of the corner. at its ends it's the way across the roads there, - // so the side meets what the roads have along their edges + // so what lines the corner meets what the roads have along their edges std::vector outwards(corner.size()); outwards.front() = flat(left_of(m_state.arms[order[idx]].direction)); outwards.back() = -flat(left_of(m_state.arms[order[(idx + 1) % order.size()]].direction)); @@ -1682,10 +2411,10 @@ std::vector junction_node::create_shapes() const auto const tangent{corner[point + 1] - corner[point]}; auto const texturestart{static_cast(station / m_state.texturelength)}; auto const textureend{static_cast((station + length) / m_state.texturelength)}; - for (std::size_t band = 0; band + 1 < profile.size(); ++band) + for (std::size_t band = 0; band + 1 < Profile.size(); ++band) { - auto const &inner{profile[band]}; - auto const &outer{profile[band + 1]}; + auto const &inner{Profile[band]}; + auto const &outer{Profile[band + 1]}; auto const leftstart{corner[point] + outwards[point] * inner.offset + up * inner.height}; auto const rightstart{corner[point] + outwards[point] * outer.offset + up * outer.height}; auto const leftend{corner[point + 1] + outwards[point + 1] * inner.offset + up * inner.height}; @@ -1705,9 +2434,51 @@ std::vector junction_node::create_shapes() const if (false == vertices.empty()) { scene::shape_node shape; - shape.make_terrain(GfxRenderer->Fetch_Material(side.material), std::move(vertices), glm::dvec3{0.0}); + shape.make_terrain(GfxRenderer->Fetch_Material(Material), std::move(vertices), glm::dvec3{0.0}); shapes.emplace_back(std::move(shape)); } + }; + auto const &side{m_state.side}; + auto const sided{side.type != road_node::side_type::none && side.width > 0.f && false == side.material.empty() && side.material != "none"}; + auto const kerbed{m_state.kerbs && false == m_state.kerbmaterial.empty() && m_state.kerbmaterial != "none"}; + double const height{m_state.kerbheight}; + double reach{0.0}; // how far from the edge of the surface the side starts + if (kerbed) + { + auto const tile{static_cast(texture_ratio(m_state.kerbmaterial)) * m_state.texturelength}; + double const width{m_state.kerbwidth}; + std::vector kerb{{0.0, 0.0, 0.f}, {0.0, height, static_cast(height / tile)}, {width, height, static_cast((height + width) / tile)}}; + if (false == sided || side.type != road_node::side_type::sidewalk) + { + // with nothing raised behind it the kerb has a back + kerb.push_back({width, 0.0, static_cast((2.0 * height + width) / tile)}); + } + line_corners(m_state.kerbmaterial, kerb); + reach = width; + } + if (sided) + { + std::vector profile; + if (side.type == road_node::side_type::shoulder) + { + profile.push_back({reach, 0.0, 1.f}); + profile.push_back({reach + side.width, 0.0, 0.5f}); + if (m_state.slope.x > 0.f) + { + profile.push_back({reach + side.width + m_state.slope.x, -m_state.slope.y, 0.f}); + } + } + else + { + auto const tile{static_cast(texture_ratio(side.material)) * m_state.texturelength}; + if (false == kerbed) + { + profile.push_back({0.0, 0.0, 0.f}); + } + profile.push_back({reach, height, static_cast(height / tile)}); + profile.push_back({reach + side.width, height, static_cast((height + side.width) / tile)}); + } + line_corners(side.material, profile); } if (m_state.markings != road_node::marking_colour::none) { @@ -1883,12 +2654,38 @@ void junction_node::export_as_text_(std::ostream &Output) const Output << "side " << (m_state.side.type == road_node::side_type::shoulder ? "shoulder" : "sidewalk") << ' ' << m_state.side.width << ' ' << (m_state.side.material.empty() ? "none" : m_state.side.material) << ' ' << "kerb " << m_state.kerbheight << ' ' << "slope " << m_state.slope.x << ' ' << m_state.slope.y << ' '; } + if (m_state.kerbs) + { + Output << "kerbs " << m_state.kerbwidth << ' ' << m_state.kerbmaterial << ' '; + if (m_state.side.type == road_node::side_type::none) + { + Output << "kerb " << m_state.kerbheight << ' '; + } + } for (std::size_t arm = 0; arm < m_state.arms.size(); ++arm) { if (m_state.arms[arm].stopline) { Output << "stopline " << arm + 1 << ' '; } + if (m_state.arms[arm].median > 0.f) + { + Output << "armmedian " << arm + 1 << ' ' << m_state.arms[arm].median << ' '; + } + auto const priority{m_state.arms[arm].priority}; + if (priority != right_of_way::none) + { + Output << "priority " << arm + 1 << ' ' << (priority == right_of_way::priority ? "main" : priority == right_of_way::yield ? "yield" : "stop") << ' '; + } + for (std::size_t lane = 0; lane < m_state.arms[arm].turns.size(); ++lane) + { + auto const turns{m_state.arms[arm].turns[lane]}; + if (turns != 0) + { + Output << "turns " << arm + 1 << ' ' << lane + 1 << ' '; + Output << ((turns & turn_left) != 0 ? "l" : "") << ((turns & turn_straight) != 0 ? "s" : "") << ((turns & turn_right) != 0 ? "r" : "") << ' '; + } + } } Output << "velocity " << m_state.velocity << ' ' << "friction " << m_state.friction << ' ' << "environment " << m_state.environment << ' '; Output << "endjunction" @@ -1936,7 +2733,15 @@ TTrack *road_node::create_track(std::string const &Name, segment_data const &Pat // radius() subclass details, calculates node's bounding radius float road_node::radius_() { - return static_cast(0.5 * m_state.length() + 0.5 * m_state.width() * std::max(m_state.taper[0], m_state.taper[1]) + std::max(m_state.sides[0].width, m_state.sides[1].width) + m_state.slope.x); + auto reach{static_cast(m_state.slope.x)}; + for (auto const &bank : m_state.banks) + { + if (bank.set) + { + reach = std::max(reach, static_cast(std::max(bank.width[0], bank.width[1]))); + } + } + return static_cast(0.5 * m_state.length() + 0.5 * std::max(m_state.span(0.0), m_state.span(1.0)) + m_state.kerbwidth + std::max(m_state.sides[0].width, m_state.sides[1].width) + reach); } // serialize() subclass details, sends content of the subclass to provided stream @@ -2008,6 +2813,35 @@ void road_node::export_as_text_(std::ostream &Output) const Output << "kerb " << road.kerbheight << ' ' << "slope " << road.slope.x << ' ' << road.slope.y << ' ' << "markings " << (road.markings == marking_colour::white ? "white" : road.markings == marking_colour::orange ? "orange" : "none") << ' '; // properties passed on to the lanes Output << "friction " << road.friction << ' ' << "environment " << road.environment << ' '; + if (road.weight != 100.f) + { + Output << "weight " << road.weight << ' '; + } + if (road.median.width[0] > 0.f || road.median.width[1] > 0.f) + { + Output << "median " << (road.median.type == median_type::gap ? "gap" : road.median.type == median_type::island ? "island" : "painted") << ' '; + Output << road.median.width[0] << ' ' << road.median.width[1] << ' ' << road.median.material << ' '; + } + if (road.kerbs[0] || road.kerbs[1]) + { + Output << "kerbs " << (road.kerbs[0] && road.kerbs[1] ? "both" : road.kerbs[0] ? "left" : "right") << ' ' << road.kerbwidth << ' ' << road.kerbmaterial << ' '; + } + for (int side = 0; side < 2; ++side) + { + auto const &bank{road.banks[side]}; + if (bank.set) + { + Output << "bank " << sidenames[side] << ' ' << bank.width[0] << ' ' << bank.drop[0] << ' ' << bank.width[1] << ' ' << bank.drop[1] << ' '; + } + } + if (road.bankmaterial != "none") + { + Output << "bankmaterial " << road.bankmaterial << ' '; + } + if (road.roundabout) + { + Output << "roundabout "; + } // footer Output << "endroad" << "\n"; @@ -2067,6 +2901,18 @@ void junction_table::InitJunctions() } } +// to be called with each step of the simulation +void junction_table::update(double const Deltatime) +{ + for (auto *junction : m_items) + { + if (junction != nullptr && false == junction->m_editorremoved) + { + junction->update(Deltatime); + } + } +} + // generates geometry of the junctions and puts it in the scene void junction_table::create_geometry(scene::scratch_data &Scratchpad) { diff --git a/world/Road.h b/world/Road.h index 11465b5b8..99e85fcda 100644 --- a/world/Road.h +++ b/world/Road.h @@ -25,6 +25,7 @@ namespace scene struct scratch_data; class basic_section; } +class road_order; // geometry a node puts in the scene as shapes of its own, apart from the shapes of the scenery, so it can take it back class owned_shapes @@ -54,6 +55,9 @@ class owned_shapes // deal with a road without knowing about it. // scenery entry: // node road [ ]... endroad +// properties, past the ones of the lanes and the look: median , +// kerbs , bank , +// bankmaterial , weight , roundabout class road_node : public scene::basic_node { @@ -90,6 +94,26 @@ class road_node : public scene::basic_node float width{0.f}; std::string material; }; + // what keeps the two directions of a road apart, where they're led away from each other + enum class median_type + { + gap, // nothing: the ground shows between two roadways + painted, // the surface carries on, marked as closed to the traffic + island // raised on a kerb + }; + struct median_data + { + median_type type{median_type::painted}; + std::array width{0.f, 0.f}; // at the start and at the end of the axis + std::string material{"none"}; // what an island is covered with + }; + // slope leading from the edge of the road down, or up, to the ground + struct bank_data + { + bool set{false}; // false: a shoulder gets the bank the road gives to all its shoulders, anything else gets none + std::array width{0.f, 0.f}; // at the start and at the end of the axis + std::array drop{0.f, 0.f}; // how far below the edge of the road it ends; negative if it rises + }; // everything the scenery says about the road. the lanes go left to right when facing along the axis: // the ones going against it, outermost first, then the ones going along it struct state @@ -112,6 +136,14 @@ class road_node : public scene::basic_node float sounddistance{25.f}; int quality{15}; std::string environment{"flat"}; + float weight{100.f}; // how willing the drivers are to take the road when leaving a junction, next to the other roads they can take there + median_data median; + std::array kerbs{false, false}; // left, right: a kerb runs along the edge of the surface, as high as the kerb of a sidewalk + float kerbwidth{0.15f}; + std::string kerbmaterial{"none"}; + std::array banks; // left, right + std::string bankmaterial{"none"}; // what a bank is covered with, other than one of a shoulder, which goes with the shoulder + bool roundabout{false}; // the piece is a part of a roundabout: traffic on it goes ahead of the traffic joining it // brings the content to a usable form: values within their limits, an entry for each lane and for each pair of neighbours void normalize(); @@ -127,6 +159,14 @@ class road_node : public scene::basic_node double width() const; // what the widths of the lanes are multiplied by at specified value of the curve parameter double scale(double const T) const; + // true if the two directions of the road are kept apart anywhere along it + bool divided() const; + // how far apart the two directions are at specified value of the curve parameter + double median_width(double const T) const; + // distance from the axis of the line the two directions meet at, on a road which doesn't keep them apart + double divide() const; + // width of the whole roadway at specified value of the curve parameter: the lanes and what's between the directions + double span(double const T) const; // shape of the middle of a lane, laid out in the direction of travel segment_data lane_path(std::size_t const Lane) const; // length of the axis @@ -211,13 +251,32 @@ class road_node : public scene::basic_node // scenery entry: // node junction arm ... [ ]... endjunction // properties: surface , texlength , markings , side , kerb , -// slope , stopline , velocity , friction , environment -// the arms don't have to be level with each other: the surface is spanned between their ends and the centre +// slope , stopline , velocity , friction , environment , +// priority , turns , +// armmedian , kerbs +// the arms don't have to be level with each other: the surface is spanned between their ends and the centre. +// the junction also tells the vehicles when to wait: the ones which have to give way wait for the ones with the right of way, +// and where neither has it, for the ones coming from their right, or from the opposite side when turning left across their way class junction_node : public scene::basic_node { public: // types + // what the vehicles coming by a road are to do about the ones coming by the other roads + enum class right_of_way + { + none, // the rule of the right hand + priority, // the others give way + yield, // gives way + stop // stops, then gives way + }; + // ways a lane can be left by + enum turn_flags : int + { + turn_left = 1, + turn_straight = 2, + turn_right = 4 + }; struct arm_data { glm::dvec3 position{0.0}; // middle of the end of the road @@ -226,6 +285,46 @@ class junction_node : public scene::basic_node int outgoing{1}; // lanes leading out of it float width{3.5f}; // width of a lane bool stopline{false}; // a line is painted across the lanes leading into the junction + float median{0.f}; // how far apart the two directions of the road are there + right_of_way priority{right_of_way::none}; + // ways each lane leading into the junction can be left by, a sum of turn_flags; the lanes are counted from the middle of the road. + // a lane with no entry, or with 0, gets what the junction works out: the inner lane takes the left turns, the outer one the right turns + std::vector turns; + }; + // a way through the junction from a lane leading into it + struct way_data + { + std::size_t exit{0}; // arm it leaves by + int kind{turn_straight}; // one of turn_flags + int code{0}; // what a driver calls it, once they picked it + TTrack *track{nullptr}; // lane it leads to + segment_data path; + std::vector> conflicts; // ways it can't be taken along with: lane leading in, and a way from that lane + }; + // a lane leading into the junction, with what its traffic is told + struct gate_data + { + std::size_t arm{0}; + int lane{1}; + TTrack *entry{nullptr}; // the lane + TTrack *link{nullptr}; // path, or crossroads of paths, leading on from it + std::vector ways; + std::vector approach; // lanes the vehicles heading for the junction are looked for on, nearest first + glm::dvec3 line{0.0}; // where the lane ends + road_order *order{nullptr}; + // what's going on at the moment + TDynamicObject *first{nullptr}; // vehicle nearest to the junction + double distance{0.0}; // of that vehicle from the end of the lane + double speed{0.0}; + double halflength{0.0}; + unsigned taken{0}; // ways that vehicle may take, a bit for each + unsigned inside{0}; // ways with a vehicle on them + bool active{false}; // the vehicle is near enough to matter + bool blocked{false}; // it's told to wait + bool committed{false}; // it was let through, the others wait for it + bool stopped{false}; // it made its stop at the stop sign + double waited{0.0}; // how long it's been standing there + double idle{0.0}; // how long it's been standing there since it was let through }; struct state { @@ -235,6 +334,9 @@ class junction_node : public scene::basic_node float texturelength{4.f}; road_node::marking_colour markings{road_node::marking_colour::white}; road_node::side_data side; // what the corners between the roads are lined with, the way the sides of a road are + bool kerbs{false}; // a kerb runs around the corners, the way it runs along the edges of a road + float kerbwidth{0.15f}; + std::string kerbmaterial{"none"}; float kerbheight{0.12f}; glm::vec2 slope{1.f, 0.4f}; // width and drop of the bank which closes a shoulder float velocity{30.f}; // speed limit on the way through @@ -280,6 +382,13 @@ class junction_node : public scene::basic_node } // true if there's a vehicle on any path of the junction bool occupied() const; + // tells the vehicles heading for the junction whether they can drive on. to be called with each step of the simulation + void update(double const Deltatime); + // lanes leading into the junction, with what their traffic is told at the moment + std::vector const &gates() const + { + return m_gates; + } // generates geometry of the surface std::vector create_shapes() const; // puts geometry of the junction in the scene as shapes of its own, or takes it back @@ -304,10 +413,16 @@ class junction_node : public scene::basic_node void export_as_text_(std::ostream &Output) const override; // creates a path through the junction from provided definition and registers it with the simulation TTrack *create_track(std::string const &Definition, std::size_t const Index); + // sets up what the traffic of each lane leading in is told, once the ways through are made + void create_gates(); // members state m_state; std::vector m_links; std::vector m_movements; + std::vector m_gates; + std::vector m_orders; // orders for the drivers, used again each time the gates are made. never freed, as a driver can hold on to one + double m_scan{0.0}; // time left to the next look at the traffic + bool m_quiet{false}; // there was no traffic the last time bool m_merged{false}; owned_shapes m_shapes; }; @@ -330,6 +445,8 @@ class junction_table : public basic_table public: // legacy style initialization, to be performed when the tracks are joined, ahead of the roads void InitJunctions(); + // to be called with each step of the simulation + void update(double const Deltatime); // generates geometry of the junctions and puts it in the scene void create_geometry(scene::scratch_data &Scratchpad); }; diff --git a/world/RoadOrder.h b/world/RoadOrder.h new file mode 100644 index 000000000..79bf2d43f --- /dev/null +++ b/world/RoadOrder.h @@ -0,0 +1,60 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include + +#include + +#include "world/Event.h" + +// an order for the drivers of road vehicles heading for a place they may have to wait at: a closed level crossing, +// a junction they have to give way at. to them it's what a signal is to the driver of a train. it doesn't go to +// the event manager and never runs: the drivers find it on the lane they scan, and ask it what speed it allows +class road_order : public basic_event +{ + + public: + road_order() + { + m_passive = true; + } + void init() override {} + std::string input_text() const override + { + return "SetVelocity"; + } + TCommandType input_command() const override + { + return TCommandType::cm_SetVelocity; + } + double input_value(int const Index) const override + { + return m_velocity; + } + glm::dvec3 input_location() const override + { + return m_location; + } + // members + double m_velocity{-1.0}; // 0: stop, -1: no limit + glm::dvec3 m_location{0.0}; + + private: + std::string type() const override + { + return "roadorder"; + } + void deserialize_(cParser &Input, scene::scratch_data &Scratchpad) override {} + void run_() override {} + void export_as_text_(std::ostream &Output) const override {} +}; + +//--------------------------------------------------------------------------- diff --git a/world/RoadPoint.cpp b/world/RoadPoint.cpp index 4946cf81c..3663a7d37 100644 --- a/world/RoadPoint.cpp +++ b/world/RoadPoint.cpp @@ -12,6 +12,7 @@ http://mozilla.org/MPL/2.0/. #include "world/Track.h" #include "world/Event.h" +#include "world/RoadOrder.h" #include "vehicle/DynObj.h" #include "vehicle/Driver.h" #include "vehicle/Train.h" @@ -37,6 +38,11 @@ constexpr double near_zone{30.0}; // a rail vehicle this close to the stop lines constexpr double clear_zone{20.0}; // a vehicle isn't put on the road with another one this close constexpr double retry_period{1.0}; // seconds to the next try, when a vehicle can't be put on the road constexpr double front_room{2.5}; // half the length a vehicle is presumed to have before it's made +constexpr double queue_reach{250.0}; // how far back from a closed crossing the vehicles standing on the lanes are taken to wait for it +constexpr double stuck_time{15.0}; // seconds a vehicle of a spawn point can stand still before it's taken off the road +constexpr double stuck_speed{0.1}; // m/s, slower than this is standing still +constexpr double reverse_speed{0.5}; // m/s, a vehicle going backwards faster than this is taken off the road +constexpr double stripe_width{0.5}; // of a pedestrian crossing; the gaps are as wide // a path as a curve: points along it, and distances along it class path_curve @@ -154,46 +160,34 @@ bool out_of_reach(segment_data const &Path, glm::dvec3 const &Point, double cons return glm::distance(glm::dvec2{start.x, start.z}, glm::dvec2{Point.x, Point.z}) > span + Reach; } -// an order for the drivers heading for a closed crossing; to them it's what a signal showing stop is to the driver of a train. -// it doesn't go to the event manager and never runs: the drivers find it on the lane they scan, and ask it what speed it allows -class stop_event : public basic_event +// an order for the drivers heading for a closed crossing +using stop_event = road_order; + +// the road passing under specified point: the one whose axis is nearest. T: receives the value of the curve parameter of its axis there +road_node const *road_under(glm::dvec3 const &Point, double &T) { - - public: - stop_event() + road_node const *result{nullptr}; + auto best{std::numeric_limits::max()}; + for (auto const *road : simulation::Roads.sequence()) { - m_passive = true; + if (road == nullptr || road->m_editorremoved || out_of_reach(road->definition().axis, Point, 50.0)) + { + continue; + } + auto const &layout{road->definition()}; + path_curve const axis{layout.axis}; + double distance{0.0}; + auto const t{axis.nearest(Point, distance)}; + if (distance > 0.5 * layout.span(t) + 1.0 || std::abs(axis.point(t).y - Point.y) > 3.0 || distance >= best) + { + continue; + } + best = distance; + result = road; + T = t; } - void init() override {} - std::string input_text() const override - { - return "SetVelocity"; - } - TCommandType input_command() const override - { - return TCommandType::cm_SetVelocity; - } - double input_value(int const Index) const override - { - return m_velocity; - } - glm::dvec3 input_location() const override - { - return m_location; - } - // members - double m_velocity{-1.0}; // 0: stop, -1: no limit - glm::dvec3 m_location{0.0}; - - private: - std::string type() const override - { - return "roadstop"; - } - void deserialize_(cParser &Input, scene::scratch_data &Scratchpad) override {} - void run_() override {} - void export_as_text_(std::ostream &Output) const override {} -}; + return result; +} // lane of a road with the point nearest to specified one, within specified distance from it. Station: receives the distance of that point from the start of the lane TTrack *nearest_lane(glm::dvec3 const &Point, double const Reach, double &Station) @@ -242,24 +236,25 @@ void roadpoint_node::state::normalize() interval = std::clamp(interval, 1.f, 3600.f); variation = std::clamp(variation, 0.f, 1.f); velocity = std::clamp(velocity, 5.f, 200.f); - copies = std::clamp(copies, 1, 16); + count = std::clamp(count, 1, 64); radius = std::clamp(radius, 0.5f, 50.f); + length = std::clamp(length, 1.f, 20.f); } roadpoint_node::roadpoint_node(scene::node_data const &Nodedata) : basic_node(Nodedata) { - m_state.kind = (Nodedata.type == "spawn" ? kind_type::spawn : Nodedata.type == "despawn" ? kind_type::despawn : kind_type::crossing); + m_state.kind = (Nodedata.type == "spawn" ? kind_type::spawn : Nodedata.type == "despawn" ? kind_type::despawn : Nodedata.type == "crosswalk" ? kind_type::crosswalk : kind_type::crossing); } // scenery keyword for specified kind of point std::string roadpoint_node::keyword(kind_type const Kind) { - return Kind == kind_type::spawn ? "spawn" : Kind == kind_type::despawn ? "despawn" : "crossing"; + return Kind == kind_type::spawn ? "spawn" : Kind == kind_type::despawn ? "despawn" : Kind == kind_type::crosswalk ? "crosswalk" : "crossing"; } bool roadpoint_node::is_keyword(std::string const &Type) { - return Type == "crossing" || Type == "spawn" || Type == "despawn"; + return Type == "crossing" || Type == "spawn" || Type == "despawn" || Type == "crosswalk"; } // reads vehicles out of a text @@ -341,6 +336,8 @@ void roadpoint_node::import(cParser &Input, glm::dvec3 const &Offset) Input.getTokens(3); Input >> m_state.position.x >> m_state.position.y >> m_state.position.z; m_state.position += Offset; + int copies{0}; // of each vehicle, the way the first sceneries with spawn points gave the size of the set + auto counted{false}; auto token{Input.getToken()}; while (false == token.empty() && token != "end" + type) @@ -374,10 +371,21 @@ void roadpoint_node::import(cParser &Input, glm::dvec3 const &Offset) Input.getTokens(); Input >> m_state.velocity; } + else if (token == "count") + { + Input.getTokens(); + Input >> m_state.count; + counted = true; + } else if (token == "copies") { Input.getTokens(); - Input >> m_state.copies; + Input >> copies; + } + else if (token == "length") + { + Input.getTokens(); + Input >> m_state.length; } else if (token == "radius") { @@ -441,6 +449,10 @@ void roadpoint_node::import(cParser &Input, glm::dvec3 const &Offset) } token = Input.getToken(); } + if (false == counted && copies > 0) + { + m_state.count = copies * static_cast(std::max(1, m_state.vehicles.size())); + } m_state.normalize(); location(m_state.position); } @@ -449,10 +461,10 @@ void roadpoint_node::import(cParser &Input, glm::dvec3 const &Offset) void roadpoint_node::define(state const &State) { auto const vehicles{m_state.vehicles}; - auto const copies{m_state.copies}; + auto const count{m_state.count}; m_state = State; m_state.normalize(); - if (m_prepared && (m_state.vehicles != vehicles || m_state.copies != copies)) + if (m_prepared && (m_state.vehicles != vehicles || m_state.count != count)) { // vehicles can't be unmade, there's too much holding on to them. the old ones are left alone: // those which wait stay where they are, those on the road drive on until something takes them away @@ -492,6 +504,24 @@ void roadpoint_node::bind() } break; } + case kind_type::crosswalk: + { + // the stripes go across the road the point is on + double t{0.0}; + auto const *road{road_under(m_state.position, t)}; + if (road != nullptr) + { + auto const &layout{road->definition()}; + path_curve const axis{layout.axis}; + m_onroad = true; + m_along = axis.direction(t); + m_halfwidth = 0.5 * layout.span(t); + // the point itself may be off the axis, the stripes aren't + auto const centre{axis.point(t)}; + m_state.position = centre; + } + break; + } case kind_type::despawn: { // the vehicles are taken from every lane which passes close enough @@ -525,25 +555,8 @@ void roadpoint_node::bind() void roadpoint_node::bind_crossing() { // the road the crossing is on: the one whose axis passes nearest - road_node const *crossed{nullptr}; - auto best{std::numeric_limits::max()}; - for (auto const *road : simulation::Roads.sequence()) - { - if (road == nullptr || road->m_editorremoved || out_of_reach(road->definition().axis, m_state.position, 50.0)) - { - continue; - } - auto const &layout{road->definition()}; - path_curve const axis{layout.axis}; - double distance{0.0}; - auto const t{axis.nearest(m_state.position, distance)}; - if (distance > 0.5 * layout.width() * layout.scale(t) + 1.0 || std::abs(axis.point(t).y - m_state.position.y) > 3.0 || distance >= best) - { - continue; - } - best = distance; - crossed = road; - } + double where{0.0}; + auto const *crossed{road_under(m_state.position, where)}; if (crossed != nullptr) { auto const &lanes{crossed->tracks()}; @@ -659,6 +672,24 @@ void roadpoint_node::bind_crossing() { m_rails.emplace_back(entry.first); } + // lanes the vehicles wait on while the crossing is closed: the ones with the stops, and what leads to them + for (auto const &stop : m_stops) + { + auto *lane{stop.track}; + double reach{0.0}; + for (int guard = 0; lane != nullptr && guard < 64 && reach < queue_reach; ++guard) + { + if (std::find(m_queue.begin(), m_queue.end(), lane) == m_queue.end()) + { + m_queue.emplace_back(lane); + } + if (false == lane->m_paths.empty()) + { + reach += glm::distance(lane->m_paths.front().points[segment_data::point::start], lane->m_paths.front().points[segment_data::point::end]); + } + lane = lane->trPrev; + } + } close(m_closed); } @@ -683,8 +714,10 @@ void roadpoint_node::unbind() } m_stops.clear(); m_rails.clear(); + m_queue.clear(); m_lanes.clear(); m_seen.clear(); + m_onroad = false; } // makes the vehicles of a spawn point @@ -709,47 +742,48 @@ void roadpoint_node::prepare() // vehicles are known by their names, so a point without one makes something up for them static int nameless{0}; auto const basename{m_name.empty() ? "roadspawn" + std::to_string(++nameless) : m_name}; - for (auto const &definition : m_state.vehicles) + // the listed vehicles are gone through as many times as it takes, from a random one on, so the set gets each kind in turn + auto const kinds{m_state.vehicles.size()}; + auto const start{kinds > 0 ? std::min(kinds - 1, static_cast(LocalRandom(0.0, static_cast(kinds)))) : 0}; + for (int index = 0; index < m_state.count && kinds > 0; ++index) { - for (int copy = 0; copy < m_state.copies; ++copy) + auto const &definition{m_state.vehicles[(start + static_cast(index)) % kinds]}; + // a vehicle like any other of the scenery, made where the point is and driven at the speed of the point... + auto *vehicle{new TDynamicObject()}; + auto const length{vehicle->Init(basename + ":" + std::to_string(++m_made), definition.folder, definition.skin, definition.type, m_lanes.front(), m_offset + front_room, "headdriver", + m_state.velocity, "", static_cast(definition.load), definition.loadtype, false, "")}; + if (length == 0.0) { - // a vehicle like any other of the scenery, made where the point is and driven at the speed of the point... - auto *vehicle{new TDynamicObject()}; - auto const length{vehicle->Init(basename + ":" + std::to_string(++m_made), definition.folder, definition.skin, definition.type, m_lanes.front(), m_offset + front_room, "headdriver", - m_state.velocity, "", static_cast(definition.load), definition.loadtype, false, "")}; - if (length == 0.0) - { - ErrorLog("Bad road point: vehicle \"" + definition.folder + "/" + definition.type + "\" of spawn \"" + m_name + "\" couldn't be made"); - if (vehicle->MyTrack != nullptr) - { - vehicle->MyTrack->RemoveDynamicObject(vehicle); - } - delete vehicle; - continue; - } - if (vehicle->mdModel != nullptr) - { - for (auto const &smokesource : vehicle->mdModel->smoke_sources()) - { - simulation::Particles.insert(smokesource.first, vehicle, smokesource.second); - } - } - if (false == simulation::Vehicles.insert(vehicle)) - { - ErrorLog("Bad road point: vehicle name \"" + vehicle->name() + "\" made for spawn \"" + m_name + "\" is taken already"); - } - pooled_vehicle entry; - entry.vehicle = vehicle; - entry.velocity = vehicle->MoverParameters->V; - m_pool.emplace_back(entry); - // ...which is taken off the road right away, the way the vehicles leaving the scenery are, to wait for its turn + ErrorLog("Bad road point: vehicle \"" + definition.folder + "/" + definition.type + "\" of spawn \"" + m_name + "\" couldn't be made"); if (vehicle->MyTrack != nullptr) { vehicle->MyTrack->RemoveDynamicObject(vehicle); - vehicle->MyTrack = nullptr; } - vehicle->bEnabled = false; + delete vehicle; + continue; } + if (vehicle->mdModel != nullptr) + { + for (auto const &smokesource : vehicle->mdModel->smoke_sources()) + { + simulation::Particles.insert(smokesource.first, vehicle, smokesource.second); + } + } + if (false == simulation::Vehicles.insert(vehicle)) + { + ErrorLog("Bad road point: vehicle name \"" + vehicle->name() + "\" made for spawn \"" + m_name + "\" is taken already"); + } + pooled_vehicle entry; + entry.vehicle = vehicle; + entry.velocity = vehicle->MoverParameters->V; + m_pool.emplace_back(entry); + // ...which is taken off the road right away, the way the vehicles leaving the scenery are, to wait for its turn + if (vehicle->MyTrack != nullptr) + { + vehicle->MyTrack->RemoveDynamicObject(vehicle); + vehicle->MyTrack = nullptr; + } + vehicle->bEnabled = false; } if (m_pool.empty()) { @@ -757,6 +791,12 @@ void roadpoint_node::prepare() } } +// true if specified vehicle stands in the line of vehicles held by the crossing +bool roadpoint_node::holds(TDynamicObject const &Vehicle) const +{ + return m_state.kind == kind_type::crossing && m_closed && false == m_editorremoved && std::find(m_queue.begin(), m_queue.end(), Vehicle.MyTrack) != m_queue.end(); +} + std::size_t roadpoint_node::waiting() const { return static_cast(std::count_if(m_pool.begin(), m_pool.end(), [](pooled_vehicle const &Entry) { return false == Entry.vehicle->bEnabled && Entry.vehicle->MyTrack == nullptr; })); @@ -790,6 +830,11 @@ void roadpoint_node::update(double const Deltatime) update_despawn(); break; } + case kind_type::crosswalk: + { + // paint only + break; + } } } @@ -846,6 +891,36 @@ void roadpoint_node::update_spawn(double const Deltatime) // the point was made in the editor, or the scenery was loaded for editing prepare(); } + // vehicles of the point which got stuck are taken off the road, to wait for their next turn: the ones standing still + // for too long, unless it's a closed level crossing they wait at, and the ones which started to go backwards + for (auto &entry : m_pool) + { + auto *vehicle{entry.vehicle}; + if (false == vehicle->bEnabled || vehicle->MyTrack == nullptr || (simulation::Train != nullptr && simulation::Train->Dynamic() == vehicle)) + { + // not on the road, or taken over by the user + entry.standing = 0.0; + continue; + } + auto const speed{vehicle->MoverParameters->V}; + // forward is the way it went when it was put on the road + auto const backwards{speed * entry.velocity < 0.0 && std::abs(speed) > reverse_speed}; + if (std::abs(speed) > stuck_speed || simulation::Roadpoints.holds(*vehicle)) + { + entry.standing = 0.0; + } + else + { + entry.standing += Deltatime; + } + if (backwards || entry.standing > stuck_time) + { + WriteLog("Road traffic: vehicle \"" + vehicle->name() + "\" taken off the road, " + (backwards ? "it was going backwards" : "it stood still for too long")); + entry.standing = 0.0; + vehicle->bEnabled = false; + TDynamicObject::bDynamicRemove = true; + } + } if (m_pool.empty() || m_lanes.empty()) { return; @@ -933,15 +1008,41 @@ void roadpoint_node::update_despawn() std::vector roadpoint_node::create_shapes() const { std::vector shapes; - if (m_state.kind != kind_type::crossing || false == m_state.stoplines || m_stops.empty()) - { - return shapes; - } std::vector vertices; glm::dvec3 const lift{0.0, line_lift, 0.0}; glm::vec3 const upwards{0.f, 1.f, 0.f}; + if (m_state.kind == kind_type::crosswalk && m_onroad) + { + // stripes laid along the road, side by side from one edge of it to the other + glm::dvec3 across{m_along.z, 0.0, -m_along.x}; + if (glm::length2(across) > 1e-12) + { + across = glm::normalize(across); + auto const reach{m_halfwidth - stopline_inset}; + auto const stripes{std::max(1, static_cast(std::floor((2.0 * reach + stripe_width) / (2.0 * stripe_width))))}; + // the stripes are spread evenly over the width, with one at each edge + auto const first{-0.5 * (stripes * 2 - 1) * stripe_width}; + auto const back{-m_along * static_cast(m_state.length)}; + for (int stripe = 0; stripe < stripes; ++stripe) + { + auto const offset{first + stripe * 2.0 * stripe_width}; + auto const right{m_state.position + across * offset + m_along * (0.5 * m_state.length) + lift}; + auto const left{right + across * stripe_width}; + vertices.push_back({right + back, upwards, {0.f, 0.f}}); + vertices.push_back({right, upwards, {1.f, 0.f}}); + vertices.push_back({left + back, upwards, {0.f, 1.f}}); + vertices.push_back({right, upwards, {1.f, 0.f}}); + vertices.push_back({left, upwards, {1.f, 1.f}}); + vertices.push_back({left + back, upwards, {0.f, 1.f}}); + } + } + } for (auto const &stop : m_stops) { + if (m_state.kind != kind_type::crossing || false == m_state.stoplines) + { + break; + } // a line across the lane, ending where the vehicles are to stop glm::dvec3 across{stop.direction.z, 0.0, -stop.direction.x}; if (glm::length2(across) < 1e-12) @@ -993,7 +1094,7 @@ void roadpoint_node::hide() // radius() subclass details, calculates node's bounding radius float roadpoint_node::radius_() { - return m_state.kind == kind_type::crossing ? m_state.clearance + 5.f : m_state.radius; + return m_state.kind == kind_type::crossing ? m_state.clearance + 5.f : m_state.kind == kind_type::crosswalk ? static_cast(m_halfwidth) + m_state.length : m_state.radius; } // serialize() subclass details, sends content of the subclass to provided stream @@ -1025,7 +1126,7 @@ void roadpoint_node::export_as_text_(std::ostream &Output) const } case kind_type::spawn: { - Output << "interval " << m_state.interval << ' ' << "variation " << m_state.variation << ' ' << "velocity " << m_state.velocity << ' ' << "copies " << m_state.copies << ' '; + Output << "interval " << m_state.interval << ' ' << "variation " << m_state.variation << ' ' << "velocity " << m_state.velocity << ' ' << "count " << m_state.count << ' '; for (auto const &vehicle : m_state.vehicles) { // the way vehicles are put in a scenery. the path and the offset are there to keep that form, the point doesn't use them @@ -1043,6 +1144,11 @@ void roadpoint_node::export_as_text_(std::ostream &Output) const Output << "radius " << m_state.radius << ' '; break; } + case kind_type::crosswalk: + { + Output << "length " << m_state.length << ' '; + break; + } } Output << "end" << type << "\n"; } @@ -1110,6 +1216,12 @@ void roadpoint_table::create_geometry() } } +// true if specified vehicle stands in the line of vehicles held by a closed level crossing +bool roadpoint_table::holds(TDynamicObject const &Vehicle) const +{ + return std::any_of(m_items.begin(), m_items.end(), [&Vehicle](roadpoint_node const *Point) { return Point != nullptr && Point->holds(Vehicle); }); +} + // to be called with each step of the simulation void roadpoint_table::update(double const Deltatime) { diff --git a/world/RoadPoint.h b/world/RoadPoint.h index e4a91d46b..4b390ba61 100644 --- a/world/RoadPoint.h +++ b/world/RoadPoint.h @@ -24,17 +24,20 @@ http://mozilla.org/MPL/2.0/. class TDynamicObject; class basic_event; -// a place on a road where something happens to the traffic. three kinds of it: +// a place on a road where something happens to the traffic, or is painted for it: // - a level crossing: vehicles are stopped ahead of the rails for as long as a train is near, // - a point where vehicles appear, drawn from a set made ready while the scenery is loaded, -// - a point where vehicles are taken away. the ones which came from a point of the previous kind go back to its set. +// - a point where vehicles are taken away. the ones which came from a point of the previous kind go back to its set, +// - a pedestrian crossing: stripes painted across the road. // scenery entries: // node crossing [clearance ] [warning ] [stoplines ] endcrossing -// node spawn [interval ] [variation <0..1>] [velocity ] [copies ] +// node spawn [interval ] [variation <0..1>] [velocity ] [count ] // [node dynamic [] enddynamic]... endspawn // node despawn [radius ] enddespawn +// node crosswalk [length ] endcrosswalk // the vehicles of a spawn point are given the way vehicles are put in a scenery; where they're put and how they're driven -// is up to the point, so the path, the offset, the driver and the velocity of these entries don't matter +// is up to the point, so the path, the offset, the driver and the velocity of these entries don't matter. the listed vehicles +// are what the point draws from to have vehicles of its own on the roads; one which gets stuck is taken off the road class roadpoint_node : public scene::basic_node { @@ -44,7 +47,8 @@ class roadpoint_node : public scene::basic_node { crossing, spawn, - despawn + despawn, + crosswalk }; struct vehicle_data { @@ -71,10 +75,12 @@ class roadpoint_node : public scene::basic_node float interval{20.f}; // seconds from a vehicle to the next float variation{0.5f}; // part of the interval which is drawn at random float velocity{50.f}; // speed the vehicles appear with, and are told to keep, km/h - int copies{2}; // number of each vehicle made ready + int count{6}; // how many vehicles of the point can be on the roads at a time. that many are made ready, drawn from the listed ones std::vector vehicles; // point where vehicles are taken away float radius{2.f}; // vehicles on lanes this close to the point are taken + // pedestrian crossing + float length{4.f}; // how much of the road the stripes take along it // brings the content to a usable form void normalize(); @@ -135,6 +141,8 @@ class roadpoint_node : public scene::basic_node return m_pool.size(); } std::size_t waiting() const; + // true if specified vehicle stands in the line of vehicles held by the crossing, which is closed + bool holds(TDynamicObject const &Vehicle) const; // generates geometry of the stop lines std::vector create_shapes() const; // puts geometry of the point in the scene, or takes it back @@ -153,6 +161,7 @@ class roadpoint_node : public scene::basic_node { TDynamicObject *vehicle{nullptr}; double velocity{0.0}; // what its speed was when it was made, to be given back each time it's put on the road + double standing{0.0}; // how long it's been standing still on the road }; // methods float radius_() override; @@ -171,6 +180,7 @@ class roadpoint_node : public scene::basic_node std::vector m_stops; std::vector m_events; // orders for the drivers, one for each stop. these are never freed, as a driver can hold on to one std::vector m_rails; // rails a train closes the crossing from + std::vector m_queue; // lanes the vehicles held by the crossing wait on std::map m_seen; // rail vehicles near, with how far each was the last time bool m_closed{false}; double m_hold{0.0}; // time left for the crossing to stay closed after the last train was seen @@ -182,6 +192,10 @@ class roadpoint_node : public scene::basic_node bool m_prepared{false}; int m_made{0}; // number of vehicles made so far, for their names double m_timer{0.0}; // time left to the next vehicle + // pedestrian crossing: the road at the point + bool m_onroad{false}; + glm::dvec3 m_along{0.0, 0.0, 1.0}; // the way the road goes + double m_halfwidth{0.0}; // of the road owned_shapes m_shapes; }; @@ -199,6 +213,8 @@ class roadpoint_table : public basic_table void create_geometry(); // to be called with each step of the simulation void update(double const Deltatime); + // true if specified vehicle stands in the line of vehicles held by a closed level crossing + bool holds(TDynamicObject const &Vehicle) const; private: bool m_geometry{false}; // the scene is ready to take geometry of the points diff --git a/world/Track.cpp b/world/Track.cpp index 3df6aa542..aa5445ebe 100644 --- a/world/Track.cpp +++ b/world/Track.cpp @@ -1942,6 +1942,29 @@ bool TTrack::SwitchForced(int i, TDynamicObject *o) return true; }; +// picks one of the routes through a crossroads for a driver heading for it +int TTrack::RouteDraw() const { + + auto const count { std::min( RouteCount(), static_cast( m_routeweights.size() ) ) }; + auto total { 0.0 }; + for( int route = 0; route < count; ++route ) { + total += std::max( 0.f, m_routeweights[ route ] ); + } + if( total <= 0.0 ) { + // even odds, the way it's always been for the crossroads of the scenery + return 1 + static_cast( std::floor( Random( static_cast( RouteCount() ) - 0.001 ) ) ); + } + auto draw { Random( total ) }; + auto last { 1 }; + for( int route = 0; route < count; ++route ) { + if( m_routeweights[ route ] <= 0.f ) { continue; } + last = route + 1; + draw -= m_routeweights[ route ]; + if( draw < 0.0 ) { break; } + } + return last; +} + int TTrack::CrossSegment(int from, int into) { // ustawienie wskaźnika na segement w pożądanym kierunku (into) od strony (from) // zwraca kod segmentu, z kierunkiem jazdy jako znakiem ± diff --git a/world/Track.h b/world/Track.h index b894655db..72a6b7ff4 100644 --- a/world/Track.h +++ b/world/Track.h @@ -12,6 +12,7 @@ http://mozilla.org/MPL/2.0/. #include #include #include +#include #include #include @@ -187,6 +188,7 @@ public: std::vector m_paths; // source data for owned paths bool m_editorremoved { false }; scene::basic_node *m_road { nullptr }; // road or road junction which generated this path. such path is one-way, and isn't saved nor edited on its own + std::array m_routeweights { 0.f, 0.f, 0.f }; // odds of each route through a crossroads being picked by a driver, by the number of the route. all zero: even odds int iterate_stamp = 0; // sleepermodel optional parameter ------------------------------------------------- @@ -280,6 +282,8 @@ public: int RouteCount() const { return SwitchExtension != nullptr ? SwitchExtension->iRoads - 1 : 1; } + // picks one of the routes through a crossroads for a driver heading for it. the routes are numbered from 1 + int RouteDraw() const; void Load(cParser *parser, glm::dvec3 const &pOrigin); void init_segments( bool const Initial ); void update_location(); From e4e3aad853b543eacf732aa76e4805a3f6f53a8a Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 02:00:43 +0200 Subject: [PATCH 109/430] Structure gauge: G1/G2/GA/GB/GC installation gauges, road clearance, Toolset button --- application/editormode.h | 8 +- application/editormodegauge.cpp | 192 ++++++++++++++++++++++---------- application/editoruilayer.cpp | 18 ++- editor/editorGauge.cpp | 52 +++++++-- editor/editorGauge.hpp | 20 +++- 5 files changed, 212 insertions(+), 78 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index 4bef2f715..8114831fd 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -321,7 +321,8 @@ class editor_mode : public application_mode, private editor_track::observer bool open{false}; // window bool enabled{true}; // tunnel along the selected path std::vector profiles; - int profile{0}; + int profile{0}; // railway + int road{-1}; TTrack const *track{nullptr}; // scanned std::size_t history{0}; bool pending{false}; // rescan once the edit ends @@ -349,6 +350,8 @@ class editor_mode : public application_mode, private editor_track::observer bool published{false}; // overlay up to date } m_gauge; void gauge_load(); + // the chosen railway and road outlines, null when there's none of the kind + std::pair gauge_profiles() const; std::vector const &gauge_hits() const; void update_gauge(); void scan_gauge(TTrack &Track); @@ -358,7 +361,8 @@ class editor_mode : public application_mode, private editor_track::observer void gauge_spot(gauge_hit const &Hit); void render_gauge_window(); void render_gauge_hits(); - bool render_gauge_outline(); + bool render_gauge_choice(char const *Label, int &Index, bool Road); + bool render_gauge_outline(int Index); struct route_design { TTrack *from{nullptr}; diff --git a/application/editormodegauge.cpp b/application/editormodegauge.cpp index 2a07a9506..d08b91baf 100644 --- a/application/editormodegauge.cpp +++ b/application/editormodegauge.cpp @@ -45,37 +45,71 @@ double const gauge_spot_reach{60.0}; // sampled line of the tracks with the widening of the gauge along it struct gauge_line { + gauge::profile const *profile{nullptr}; editor_track::route route; std::vector samples; std::vector sections; }; -gauge_line make_line(editor_track::route &Route) +// the outline checked along the track: the railway one or the road one +struct gauge_choice +{ + gauge::profile const *railway{nullptr}; + gauge::profile const *road{nullptr}; + + gauge::profile const *of(TTrack const &Track) const + { + if ((Track.iCategoryFlag & 1) != 0) + return railway; + if ((Track.iCategoryFlag & 2) != 0) + return road; + return nullptr; + } +}; + +// half of the carriageway of a road at the sample, it narrows linearly to the width at the end +double carriageway(editor_track::route_span const &Span, double const Chainage) +{ + auto const &track{*Span.track}; + auto const end{track.fTrackWidth2 > 0.f ? track.fTrackWidth2 : track.fTrackWidth}; + auto t{Span.to > Span.from ? std::clamp((Chainage - Span.from) / (Span.to - Span.from), 0.0, 1.0) : 0.0}; + if (false == Span.forward) + t = 1.0 - t; + return 0.5 * std::abs(track.fTrackWidth + (end - track.fTrackWidth) * t); +} + +gauge_line make_line(editor_track::route &Route, gauge::profile const &Profile) { gauge_line line; + line.profile = &Profile; line.samples = editor_track::sample_route(Route, 1.0); line.route = Route; + bool const road{Profile.kind == gauge::kind::road}; std::vector chainage, curvature, cant; for (auto &sample : line.samples) { - sample.position.y += gauge::rail_height; + if (false == road) + sample.position.y += gauge::rail_height; chainage.push_back(sample.chainage); curvature.push_back(sample.curvature); cant.push_back(sample.cant); } - line.sections = gauge::sections(chainage, curvature, cant); + line.sections = gauge::sections(Profile.kind, chainage, curvature, cant); + if (road) + for (std::size_t i = 0; i < line.samples.size(); ++i) + line.sections[i].base = carriageway(line.route.spans[line.samples[i].span], line.samples[i].chainage); return line; } // lines through all paths of the scenery, each path in one of them at least -std::vector scenery_lines() +std::vector scenery_lines(gauge_choice const &Choice) { std::vector lines; std::unordered_set visited; auto const seen{[&](editor_track::route_span const &Span) { return visited.count(Span.track) > 0; }}; for (auto *track : simulation::Paths.sequence()) { - if (track == nullptr || visited.count(track) > 0 || false == editor_track::is_supported(*track)) + if (track == nullptr || visited.count(track) > 0 || false == editor_track::is_supported(*track) || Choice.of(*track) == nullptr) continue; auto route{editor_track::run_route(*track, 1e7)}; // the line may run on over the paths already covered, one of them is enough for the widening ahead of a curve @@ -86,15 +120,15 @@ std::vector scenery_lines() spans.pop_back(); for (auto const &span : spans) visited.insert(span.track); - lines.push_back(make_line(route)); + lines.push_back(make_line(route, *Choice.of(*track))); } // diverging paths of the switches for (auto *track : simulation::Paths.sequence()) - if (track != nullptr && track->eType == tt_Switch && editor_track::is_supported(*track)) + if (track != nullptr && track->eType == tt_Switch && editor_track::is_supported(*track) && Choice.of(*track) != nullptr) { editor_track::route route; route.spans.push_back({track, 1, true}); - lines.push_back(make_line(route)); + lines.push_back(make_line(route, *Choice.of(*track))); } return lines; } @@ -103,11 +137,12 @@ std::vector scenery_lines() class corridor { public: - corridor(std::vector const &Lines, double const Margin) : m_lines{Lines}, m_margin{Margin} + explicit corridor(std::vector const &Lines) : m_lines{Lines} { for (std::uint32_t line = 0; line < Lines.size(); ++line) for (std::uint32_t i = 0; i < Lines[line].samples.size(); ++i) { + m_margin = std::max(m_margin, reach(*Lines[line].profile) + Lines[line].sections[i].base); auto const point{plan_of(Lines[line].samples[i].position)}; m_cells[key(point, cell)].push_back({line, i}); m_regions.insert(key(point, region)); @@ -139,7 +174,7 @@ public: editor_track::route_span const *span{nullptr}; // of the line the point enters }; // deepest intrusion of the point into the gauge of the lines nearby - hit intrusion(gauge::profile const &Profile, glm::dvec3 const &Point) const + hit intrusion(glm::dvec3 const &Point) const { auto const point{plan_of(Point)}; auto const center{index(point, cell)}; @@ -173,7 +208,7 @@ public: if ((found.index == 0 && along < -0.6) || (found.index + 1 == line.samples.size() && along > 0.6)) continue; auto const height{Point.y - (sample.position.y + sample.grade * along)}; - auto const depth{gauge::intrusion(Profile, line.sections[found.index], glm::dot(offset, normal(sample)), height)}; + auto const depth{gauge::intrusion(*line.profile, line.sections[found.index], glm::dot(offset, normal(sample)), height)}; if (depth > deepest.depth) deepest = {depth, &line.route.spans[sample.span]}; } @@ -208,8 +243,17 @@ private: return m_lines[Entry.line].samples[Entry.index]; } + // half-width of the outline with the room for the widening in the sharpest curves on the largest cant + static double reach(gauge::profile const &Profile) + { + double result{0.0}; + for (auto const &point : Profile.outline) + result = std::max(result, point.half_width); + return result + 1.2; + } + std::vector const &m_lines; - double m_margin; + double m_margin{0.0}; std::unordered_map> m_cells; std::unordered_set m_regions; }; @@ -253,7 +297,7 @@ template void visit_triangles(TSubModel *Submodel, glm::dmat4 } // triangles of the models entering the gauge, and the deepest place of each model, the deepest models first -void scan_models(corridor const &Space, gauge::profile const &Profile, std::vector &Triangles, std::vector &Hits) +void scan_models(corridor const &Space, std::vector &Triangles, std::vector &Hits) { for (auto *instance : simulation::Instances.sequence()) { @@ -272,7 +316,7 @@ void scan_models(corridor const &Space, gauge::profile const &Profile, std::vect for (int v = 0; u + v <= steps; ++v) { auto const point{A + (B - A) * (static_cast(u) / steps) + (C - A) * (static_cast(v) / steps)}; - auto const found{Space.intrusion(Profile, point)}; + auto const found{Space.intrusion(point)}; if (found.depth <= 0.0) continue; Triangles.insert(Triangles.end(), {A, B, C}); @@ -293,8 +337,9 @@ void scan_models(corridor const &Space, gauge::profile const &Profile, std::vect } // translucent tunnel of the gauge along the line, with the rings every 10 m and the lines along its corners -void build_tunnel(gauge_line const &Line, gauge::profile const &Profile, std::vector &Surface, std::vector &Edges) +void build_tunnel(gauge_line const &Line, std::vector &Surface, std::vector &Edges) { + auto const &profile{*Line.profile}; auto const lift{[](editor_track::route_sample const &Sample, double const Lateral, double const Height) { auto const normal{corridor::normal(Sample)}; return Sample.position + glm::dvec3(normal.x * Lateral, Height, normal.y * Lateral); @@ -303,10 +348,10 @@ void build_tunnel(gauge_line const &Line, gauge::profile const &Profile, std::ve auto const ring{[&](std::size_t const Index) { std::vector points; for (int side : {-1, 1}) - for (std::size_t j = 0; j < Profile.outline.size(); ++j) + for (std::size_t j = 0; j < profile.outline.size(); ++j) { - auto const &point{Profile.outline[side < 0 ? j : Profile.outline.size() - 1 - j]}; - auto const width{point.half_width + gauge::widening(Line.sections[Index], point.height, side)}; + auto const &point{profile.outline[side < 0 ? j : profile.outline.size() - 1 - j]}; + auto const width{Line.sections[Index].base + point.half_width + gauge::widening(Line.sections[Index], point.height, side)}; points.push_back(lift(Line.samples[Index], side * width, point.height)); } return points; @@ -332,22 +377,30 @@ void build_tunnel(gauge_line const &Line, gauge::profile const &Profile, std::ve } } -double widest(gauge::profile const &Profile) -{ - double result{0.0}; - for (auto const &point : Profile.outline) - result = std::max(result, point.half_width); - // with the room for the widening in the sharpest curves on the largest cant - return result + 1.2; -} - } // namespace void editor_mode::gauge_load() { if (m_gauge.profiles.empty()) m_gauge.profiles = gauge::load_profiles(gauge_file); - m_gauge.profile = std::clamp(m_gauge.profile, 0, static_cast(m_gauge.profiles.size()) - 1); + // the chosen railway and road outlines, the first ones of the kind when there's none + auto const fits{[&](int const Index, bool const Road) { + return Index >= 0 && Index < static_cast(m_gauge.profiles.size()) && (m_gauge.profiles[Index].kind == gauge::kind::road) == Road; + }}; + for (auto [index, road] : {std::pair{&m_gauge.profile, false}, std::pair{&m_gauge.road, true}}) + if (false == fits(*index, road)) + { + *index = -1; + for (int i = 0; i < static_cast(m_gauge.profiles.size()) && *index < 0; ++i) + if (fits(i, road)) + *index = i; + } +} + +std::pair editor_mode::gauge_profiles() const +{ + auto const pick{[&](int const Index) { return Index >= 0 ? &m_gauge.profiles[Index] : nullptr; }}; + return {pick(m_gauge.profile), pick(m_gauge.road)}; } std::vector const &editor_mode::gauge_hits() const @@ -393,14 +446,17 @@ void editor_mode::scan_gauge(TTrack &Track) { gauge_load(); m_gauge.line = {}; - auto const &profile{m_gauge.profiles[m_gauge.profile]}; - auto route{editor_track::run_route(Track, gauge_reach)}; - std::vector const lines{make_line(route)}; - if (lines.front().samples.size() < 2 || profile.outline.size() < 2) + auto const [railway, road]{gauge_profiles()}; + auto const *profile{gauge_choice{railway, road}.of(Track)}; + if (profile == nullptr || profile->outline.size() < 2) return; - corridor const space{lines, widest(profile)}; - build_tunnel(lines.front(), profile, m_gauge.line.surface, m_gauge.line.edges); - scan_models(space, profile, m_gauge.line.intruding, m_gauge.line.hits); + auto route{editor_track::run_route(Track, gauge_reach)}; + std::vector const lines{make_line(route, *profile)}; + if (lines.front().samples.size() < 2) + return; + corridor const space{lines}; + build_tunnel(lines.front(), m_gauge.line.surface, m_gauge.line.edges); + scan_models(space, m_gauge.line.intruding, m_gauge.line.hits); if (false == m_gauge.map.scanned) m_gauge.current = -1; } @@ -410,16 +466,16 @@ void editor_mode::scan_gauge_map() gauge_load(); auto const started{std::chrono::steady_clock::now()}; m_gauge.map = {}; - auto const &profile{m_gauge.profiles[m_gauge.profile]}; - auto const lines{scenery_lines()}; - corridor const space{lines, widest(profile)}; - scan_models(space, profile, m_gauge.map.intruding, m_gauge.map.hits); + auto const [railway, road]{gauge_profiles()}; + auto const lines{scenery_lines({railway, road})}; + corridor const space{lines}; + scan_models(space, m_gauge.map.intruding, m_gauge.map.hits); m_gauge.map.scanned = true; m_gauge.map.history = m_history.size(); - m_gauge.map.profile = profile.name; + m_gauge.map.profile = (railway ? railway->name : std::string{"-"}) + ", " + (road ? road->name : std::string{"-"}); m_gauge.current = -1; m_gauge.published = false; - WriteLog("Structure gauge (" + profile.name + "): " + std::to_string(m_gauge.map.hits.size()) + " models enter it along " + std::to_string(lines.size()) + " lines, scanned in " + + WriteLog("Structure gauge (" + m_gauge.map.profile + "): " + std::to_string(m_gauge.map.hits.size()) + " models enter it along " + std::to_string(lines.size()) + " lines, scanned in " + std::to_string(std::chrono::duration_cast(std::chrono::steady_clock::now() - started).count()) + " ms"); if (false == m_gauge.map.hits.empty()) gauge_focus(0); @@ -489,9 +545,13 @@ void editor_mode::gauge_spot(gauge_hit const &Hit) route = editor_track::run_route(*track, gauge_spot_reach); else route.spans.push_back({track, Hit.path, true}); - auto const line{make_line(route)}; + auto const [railway, road]{gauge_profiles()}; + auto const *profile{gauge_choice{railway, road}.of(*track)}; + if (profile == nullptr) + return; + auto const line{make_line(route, *profile)}; if (line.samples.size() >= 2) - build_tunnel(line, m_gauge.profiles[m_gauge.profile], m_gauge.spot.surface, m_gauge.spot.edges); + build_tunnel(line, m_gauge.spot.surface, m_gauge.spot.edges); } void editor_mode::render_gauge_window() @@ -509,14 +569,12 @@ void editor_mode::render_gauge_window() if (ImGui::IsItemHovered()) ImGui::SetTooltip("Translucent tunnel of the gauge 500 m each way along the line of the selected path,\nwith the triangles of the models which enter it in red.\nWidened in the curves under 250 m and tilted on the cant, from 20 m (inner side)\nand 26 m (outer side) ahead of the curve, as in the PKP PLK standard, volume II."); gauge_load(); - auto const previous{m_gauge.profile}; - for (int i = 0; i < static_cast(m_gauge.profiles.size()); ++i) - { - if (i % 2 == 1) - ImGui::SameLine(160.0f); - ImGui::RadioButton(m_gauge.profiles[i].name.c_str(), &m_gauge.profile, i); - } - bool changed{previous != m_gauge.profile}; + bool changed{render_gauge_choice("Railway", m_gauge.profile, false)}; + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("GPL: unified structure gauge, widened only in the curves under 250 m.\nG1, G2, GA, GB, GC: limit (GSZ) and nominal (NSZ) installation gauges, widened by 3750/R in all curves."); + changed |= render_gauge_choice("Road", m_gauge.road, true); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("Clearance over the roads, from 0.5 m beyond the edges of the carriageway"); if (ImGui::Button("Find the violations on the whole map")) scan_gauge_map(); @@ -535,7 +593,8 @@ void editor_mode::render_gauge_window() ImGui::TextColored(ImVec4(1.0f, 0.75f, 0.3f, 1.0f), "The scenery changed since the scan (%s)", m_gauge.map.profile.c_str()); } render_gauge_hits(); - changed |= render_gauge_outline(); + changed |= render_gauge_outline(m_gauge.profile); + changed |= render_gauge_outline(m_gauge.road); if (changed) m_gauge.pending = true; ImGui::End(); @@ -572,12 +631,32 @@ void editor_mode::render_gauge_hits() ImGui::EndChild(); } -bool editor_mode::render_gauge_outline() +bool editor_mode::render_gauge_choice(char const *Label, int &Index, bool const Road) { - if (false == ImGui::TreeNode("Outline (right half)")) + bool changed{false}; + ImGui::SetNextItemWidth(-60.0f); + if (ImGui::BeginCombo(Label, Index >= 0 ? m_gauge.profiles[Index].name.c_str() : "none")) + { + for (int i = 0; i < static_cast(m_gauge.profiles.size()); ++i) + if ((m_gauge.profiles[i].kind == gauge::kind::road) == Road && ImGui::Selectable(m_gauge.profiles[i].name.c_str(), i == Index)) + { + changed = i != Index; + Index = i; + } + ImGui::EndCombo(); + } + return changed; +} + +bool editor_mode::render_gauge_outline(int const Index) +{ + if (Index < 0) return false; - ImGui::TextDisabled("PKP PLK standard, volume II; below 1170 mm the limit installation gauge.\nMetres from the track axis and above the rail top, bottom up."); - auto &profile{m_gauge.profiles[m_gauge.profile]}; + auto &profile{m_gauge.profiles[Index]}; + if (false == ImGui::TreeNode(&profile, "Outline of %s (right half)", profile.name.c_str())) + return false; + ImGui::TextDisabled(profile.kind == gauge::kind::road ? "Metres from the edge of the carriageway and above the road, bottom up." + : "PKP PLK standard, volume II; below 1170 mm the limit installation gauge.\nMetres from the track axis and above the rail top, bottom up."); bool edited{false}; bool inserted{false}; int remove{-1}; @@ -626,6 +705,7 @@ bool editor_mode::render_gauge_outline() if (ImGui::SmallButton("Restore the starting outlines")) { m_gauge.profiles = gauge::default_profiles(); + gauge_load(); edited = true; } if (edited) diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index a46104912..a4c10e015 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -96,6 +96,18 @@ void editor_ui::render_mode_options(nodebank_panel::edit_mode const Mode) void editor_ui::render_header_sections() { + if (m_gaugewindow != nullptr) + { + auto const open{*m_gaugewindow}; + if (open) + ImGui::PushStyleColor(ImGuiCol_Button, ImGui::GetStyleColorVec4(ImGuiCol_ButtonActive)); + if (ImGui::Button(STR_C("Structure gauge"), ImVec2(-1.0f, 0.0f))) + *m_gaugewindow = false == *m_gaugewindow; + if (open) + ImGui::PopStyleColor(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Checks which models enter the structure gauge of the tracks and the clearance over the roads (skrajnia budowli)")); + } if (ImGui::CollapsingHeader("Gizmo", ImGuiTreeNodeFlags_DefaultOpen)) { if (m_gizmooptions) @@ -143,12 +155,6 @@ void editor_ui::render_menu_contents() ImGui::MenuItem(STR_C("Include database"), nullptr, &m_includespanel.is_open); ImGui::EndMenu(); } - if (m_gaugewindow != nullptr) - { - ImGui::MenuItem(STR_C("Structure gauge"), nullptr, m_gaugewindow); - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("Checks which models enter the structure gauge of the tracks (skrajnia budowli)")); - } } void editor_ui::set_file_actions(std::function Save, std::function Export) diff --git a/editor/editorGauge.cpp b/editor/editorGauge.cpp index 59acae31b..9ba12e9b7 100644 --- a/editor/editorGauge.cpp +++ b/editor/editorGauge.cpp @@ -87,6 +87,18 @@ private: std::vector m_integral; }; +// names of the kinds in the file +char const *const kind_names[]{"unified", "installation", "road"}; + +// outline from the points listed top down, in millimetres, as in the tables of the standard, over the lower part +profile installation(std::string const &Name, std::vector> const &Points) +{ + profile result{Name, kind::installation, {{1.211, 0.055}, {1.585, 0.380}, {1.675, 0.380}}}; + for (auto point = Points.rbegin(); point != Points.rend(); ++point) + result.outline.push_back({point->second * 0.001, point->first * 0.001}); + return result; +} + } // namespace std::vector default_profiles() @@ -97,16 +109,31 @@ std::vector default_profiles() std::vector const gpl2{{2.000, 3.625}, {1.920, 4.900}}; std::vector const pantograph{{1.450, 6.600}, {1.150, 6.900}, {0.0, 6.900}}; auto const make{[&](std::string const &Name, std::vector> const &Parts) { - profile result{Name, lower}; + profile result{Name, kind::unified, lower}; for (auto const &part : Parts) result.outline.insert(result.outline.end(), part.begin(), part.end()); return result; }}; - return {make("GPL-1", {gpl1, {{1.260, 4.800}, {1.180, 4.850}, {0.0, 4.850}}}), make("GPL-1 + pantograf", {gpl1, pantograph}), - make("GPL-2", {gpl2, {{0.0, 4.900}}}), make("GPL-2 + pantograf", {gpl2, {{1.450, 4.900}}, pantograph})}; + // tables 3, 5, 7, 9 of the type cards and the drawing of GC, above 380 mm + return {make("GPL-1", {gpl1, {{1.260, 4.800}, {1.180, 4.850}, {0.0, 4.850}}}), + make("GPL-1 + pantograf", {gpl1, pantograph}), + make("GPL-2", {gpl2, {{0.0, 4.900}}}), + make("GPL-2 + pantograf", {gpl2, {{1.450, 4.900}}, pantograph}), + installation("G1 graniczna (GSZ)", {{4375, 0}, {4375, 666}, {4010, 1255}, {3700, 1550}, {3250, 1755}, {1170, 1695}, {1170, 1675}}), + installation("G1 nominalna (NSZ)", {{4385, 0}, {4385, 785}, {4010, 1365}, {3700, 1655}, {3250, 1860}, {1170, 1860}, {1170, 1675}}), + installation("G2 graniczna (GSZ)", {{4765, 0}, {4765, 940}, {3835, 1600}, {3530, 1765}, {1170, 1695}, {1170, 1675}}), + installation("G2 nominalna (NSZ)", {{4770, 0}, {4770, 1060}, {3835, 1710}, {3530, 1870}, {1170, 1870}, {1170, 1675}}), + installation("GA graniczna (GSZ)", {{4415, 0}, {4415, 687}, {4080, 1225}, {3808, 1490}, {3250, 1755}, {1170, 1700}, {1170, 1675}}), + installation("GA nominalna (NSZ)", {{4425, 0}, {4425, 805}, {4080, 1340}, {3880, 1600}, {3250, 1860}, {1170, 1860}, {1170, 1675}}), + installation("GB graniczna (GSZ)", {{4415, 0}, {4415, 687}, {4080, 1495}, {3250, 1755}, {1170, 1700}, {1170, 1675}}), + installation("GB nominalna (NSZ)", {{4425, 0}, {4425, 805}, {4110, 1610}, {3250, 1860}, {1170, 1860}, {1170, 1675}}), + installation("GC graniczna (GSZ)", {{4800, 0}, {4800, 1693}, {3550, 1765}, {1170, 1765}, {1170, 1675}}), + installation("GC nominalna (NSZ)", {{4820, 0}, {4820, 1815}, {3550, 1870}, {1170, 1870}, {1170, 1675}}), + {"Droga 4,70 m", kind::road, {{0.5, 0.0}, {0.5, 4.70}}}, + {"Droga 4,50 m", kind::road, {{0.5, 0.0}, {0.5, 4.50}}}}; } -// one outline per line: the name in quotes, then pairs of half-width and height +// one outline per line: the name in quotes, the kind, then pairs of half-width and height std::vector load_profiles(std::string const &File) { std::ifstream input{File}; @@ -116,8 +143,13 @@ std::vector load_profiles(std::string const &File) { std::istringstream stream{line}; profile profile; - if (false == static_cast(stream >> std::quoted(profile.name))) + std::string kind; + if (false == static_cast(stream >> std::quoted(profile.name) >> kind)) continue; + auto const known{std::find(std::begin(kind_names), std::end(kind_names), kind)}; + if (known == std::end(kind_names)) + continue; + profile.kind = static_cast(known - std::begin(kind_names)); profile::point point; while (stream >> point.half_width >> point.height) profile.outline.push_back(point); @@ -132,18 +164,18 @@ void save_profiles(std::string const &File, std::vector const &Profiles std::ofstream output{File}; for (auto const &profile : Profiles) { - output << std::quoted(profile.name); + output << std::quoted(profile.name) << ' ' << kind_names[static_cast(profile.kind)]; for (auto const &point : profile.outline) output << ' ' << point.half_width << ' ' << point.height; output << '\n'; } } -std::vector
sections(std::vector const &Chainage, std::vector const &Curvature, std::vector const &Cant) +std::vector
sections(kind const Kind, std::vector const &Chainage, std::vector const &Curvature, std::vector const &Cant) { auto const count{Chainage.size()}; std::vector
result(count); - if (count == 0) + if (count == 0 || Kind == kind::road) return result; // per side, the parts when it's the inner side of the curve and when it's the outer one for (int side = 0; side < 2; ++side) @@ -155,7 +187,7 @@ std::vector
sections(std::vector const &Chainage, std::vector 0.0) == (side == 1)}; - auto const upper{upper_widening(radius)}; + auto const upper{Kind == kind::unified ? upper_widening(radius) : lower_widening(radius)}; auto const lower{lower_widening(radius)}; (inner ? upperinner : upperouter)[i] = inner ? upper.inner : upper.outer; (inner ? lowerinner : lowerouter)[i] = inner ? lower.inner : lower.outer; @@ -195,7 +227,7 @@ double half_width(profile const &Profile, section const &Section, double const H } if (width < 0.0) return width; - return width + widening(Section, Height, Side); + return Section.base + width + widening(Section, Height, Side); } double intrusion(profile const &Profile, section const &Section, double const Lateral, double const Height) diff --git a/editor/editorGauge.hpp b/editor/editorGauge.hpp index ee9b6be8c..d7e94cf9e 100644 --- a/editor/editorGauge.hpp +++ b/editor/editorGauge.hpp @@ -18,11 +18,21 @@ http://mozilla.org/MPL/2.0/. namespace gauge { -// right half of the outline on a straight track, in metres: half-width from the axis and height above the rail top, -// listed from the bottom up; the left half is the mirror +// how the outline widens along the track +enum class kind +{ + unified, // skrajnia budowli ujednolicona GPL: the curves of R >= 250 m are included above the lower part + installation, // graniczna or nominalna skrajnia zabudowy: widened by 3750/R in all curves + road // skrajnia drogi: measured from the edge of the carriageway, no widening +}; + +// right half of the outline on a straight track, in metres: half-width from the axis (for the roads from the edge +// of the carriageway) and height above the rail top or the road surface, listed from the bottom up; the left half +// is the mirror struct profile { std::string name; + gauge::kind kind{kind::unified}; struct point { double half_width{0.0}; @@ -31,7 +41,8 @@ struct profile std::vector outline; }; -// GPL-1 and GPL-2 over the limit installation gauge below 1170 mm, with and without the pantograph gauge +// GPL-1 and GPL-2 over the limit installation gauge below 1170 mm, with and without the pantograph gauge, the limit +// and nominal installation gauges G1, G2, GA, GB, GC of the PKP PLK technical standards, and the road gauges std::vector default_profiles(); // outlines kept in the file, the defaults when there's none std::vector load_profiles(std::string const &File); @@ -46,13 +57,14 @@ double constexpr lower_part{1.17}; // widening of the sides of the gauge at a place of the track, metres; index 0 is the right side, 1 the left one struct section { + double base{0.0}; // added to the half-width of the outline: half of the carriageway of a road std::array upper{}; // from the radius, above the lower part std::array lower{}; // from the radius, in the lower part std::array cant{}; // cant in metres, positive on the inner side of the curve and negative on the outer one }; // sections at the points of a route, from their chainage, curvature (1/m, positive turning left) and cant (m). // The widening begins and ends ahead of the changes of the curvature and cant, as the vehicles enter a curve -std::vector
sections(std::vector const &Chainage, std::vector const &Curvature, std::vector const &Cant); +std::vector
sections(kind Kind, std::vector const &Chainage, std::vector const &Curvature, std::vector const &Cant); // widening of the side (+1 left, -1 right) at the height double widening(section const &Section, double Height, int Side); From 0b5b69d76e47730210e319c5cf40224067bf1c7b Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 02:05:31 +0200 Subject: [PATCH 110/430] Structure gauge button in the Track tab of the toolset --- application/editoruilayer.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index a4c10e015..b54847246 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -86,6 +86,18 @@ void editor_ui::render_mode_options(nodebank_panel::edit_mode const Mode) m_filloptions(); break; case nodebank_panel::TRACK: + if (m_gaugewindow != nullptr) + { + auto const open{*m_gaugewindow}; + if (open) + ImGui::PushStyleColor(ImGuiCol_Button, ImGui::GetStyleColorVec4(ImGuiCol_ButtonActive)); + if (ImGui::Button(STR_C("Structure gauge"), ImVec2(-1.0f, 0.0f))) + *m_gaugewindow = false == *m_gaugewindow; + if (open) + ImGui::PopStyleColor(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Checks which models enter the structure gauge of the tracks and the clearance over the roads (skrajnia budowli)")); + } if (m_trackoptions) m_trackoptions(); break; @@ -96,18 +108,6 @@ void editor_ui::render_mode_options(nodebank_panel::edit_mode const Mode) void editor_ui::render_header_sections() { - if (m_gaugewindow != nullptr) - { - auto const open{*m_gaugewindow}; - if (open) - ImGui::PushStyleColor(ImGuiCol_Button, ImGui::GetStyleColorVec4(ImGuiCol_ButtonActive)); - if (ImGui::Button(STR_C("Structure gauge"), ImVec2(-1.0f, 0.0f))) - *m_gaugewindow = false == *m_gaugewindow; - if (open) - ImGui::PopStyleColor(); - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("Checks which models enter the structure gauge of the tracks and the clearance over the roads (skrajnia budowli)")); - } if (ImGui::CollapsingHeader("Gizmo", ImGuiTreeNodeFlags_DefaultOpen)) { if (m_gizmooptions) From 7e78ca8714a7c31b5060fef611e953bbb5a9ba07 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 02:12:14 +0200 Subject: [PATCH 111/430] Structure gauge: the lower part turns with the plane of the rail heads on cant --- application/editormodegauge.cpp | 23 +++++++++++++++++++--- editor/editorGauge.cpp | 34 ++++++++++++++++++++++++++++++--- editor/editorGauge.hpp | 12 +++++++++++- 3 files changed, 62 insertions(+), 7 deletions(-) diff --git a/application/editormodegauge.cpp b/application/editormodegauge.cpp index d08b91baf..2d6c7b412 100644 --- a/application/editormodegauge.cpp +++ b/application/editormodegauge.cpp @@ -95,6 +95,24 @@ gauge_line make_line(editor_track::route &Route, gauge::profile const &Profile) cant.push_back(sample.cant); } line.sections = gauge::sections(Profile.kind, chainage, curvature, cant); + if (false == road) + { + // the outer rail is raised: the side from the nearest curve along the line + std::vector sides(curvature.size(), 0.0); + double side{0.0}; + for (std::size_t i = 0; i < curvature.size(); ++i) + sides[i] = side = std::abs(curvature[i]) > 1e-6 ? (curvature[i] > 0.0 ? 1.0 : -1.0) : side; + side = 0.0; + for (std::size_t i = curvature.size(); i-- > 0;) + { + if (std::abs(curvature[i]) > 1e-6) + side = curvature[i] > 0.0 ? 1.0 : -1.0; + else if (sides[i] == 0.0) + sides[i] = side; + } + for (std::size_t i = 0; i < curvature.size(); ++i) + line.sections[i].tilt = -sides[i] * std::min(1.0, cant[i] / 1.5); + } if (road) for (std::size_t i = 0; i < line.samples.size(); ++i) line.sections[i].base = carriageway(line.route.spans[line.samples[i].span], line.samples[i].chainage); @@ -350,9 +368,8 @@ void build_tunnel(gauge_line const &Line, std::vector &Surface, std: for (int side : {-1, 1}) for (std::size_t j = 0; j < profile.outline.size(); ++j) { - auto const &point{profile.outline[side < 0 ? j : profile.outline.size() - 1 - j]}; - auto const width{Line.sections[Index].base + point.half_width + gauge::widening(Line.sections[Index], point.height, side)}; - points.push_back(lift(Line.samples[Index], side * width, point.height)); + auto const point{gauge::outline_point(profile, Line.sections[Index], side < 0 ? j : profile.outline.size() - 1 - j, side)}; + points.push_back(lift(Line.samples[Index], point.lateral, point.height)); } return points; }}; diff --git a/editor/editorGauge.cpp b/editor/editorGauge.cpp index 9ba12e9b7..8674521f7 100644 --- a/editor/editorGauge.cpp +++ b/editor/editorGauge.cpp @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "editor/editorGauge.hpp" +#include #include #include @@ -87,6 +88,18 @@ private: std::vector m_integral; }; +// half of the distance between the heads of the rails +double constexpr rail_spread{0.75}; + +// the point turned by the angle of the sine about the head of the lower rail +place turn(section const &Section, place const &Point, double const Sine) +{ + auto const pivot{Section.tilt > 0.0 ? -rail_spread : rail_spread}; + auto const cosine{std::sqrt(std::max(0.0, 1.0 - Sine * Sine))}; + auto const lateral{Point.lateral - pivot}; + return {pivot + lateral * cosine - Point.height * Sine, lateral * Sine + Point.height * cosine}; +} + // names of the kinds in the file char const *const kind_names[]{"unified", "installation", "road"}; @@ -210,7 +223,18 @@ std::vector
sections(kind const Kind, std::vector const &Chaina double widening(section const &Section, double const Height, int const Side) { auto const i{Side > 0 ? 1 : 0}; - return (Height < lower_part ? Section.lower[i] : Section.upper[i]) + Section.cant[i] * Height / 1.5; + return Height < lower_part ? Section.lower[i] : Section.upper[i] + Section.cant[i] * Height / 1.5; +} + +place outline_point(profile const &Profile, section const &Section, std::size_t const Index, int const Side) +{ + auto const &point{Profile.outline[Index]}; + // the step at the top of the lower part belongs to it from below + bool const lower{point.height < lower_part - 1e-9 || (point.height < lower_part + 1e-9 && Index > 0 && Profile.outline[Index - 1].height < lower_part - 1e-9)}; + auto const i{Side > 0 ? 1 : 0}; + auto const width{Section.base + point.half_width + (lower ? Section.lower[i] : Section.upper[i] + Section.cant[i] * point.height / 1.5)}; + place const result{Side * width, point.height}; + return lower && Section.tilt != 0.0 ? turn(Section, result, Section.tilt) : result; } double half_width(profile const &Profile, section const &Section, double const Height, int const Side) @@ -232,10 +256,14 @@ double half_width(profile const &Profile, section const &Section, double const H double intrusion(profile const &Profile, section const &Section, double const Lateral, double const Height) { - auto const width{half_width(Profile, Section, Height, Lateral >= 0.0 ? 1 : -1)}; + // the point in the plane of the rail heads, for the lower part + auto const local{Section.tilt != 0.0 ? turn(Section, {Lateral, Height}, -Section.tilt) : place{Lateral, Height}}; + auto const lower{local.height < lower_part}; + auto const point{lower ? local : place{Lateral, std::max(Height, lower_part)}}; + auto const width{half_width(Profile, Section, point.height, point.lateral >= 0.0 ? 1 : -1)}; if (width < 0.0) return 0.0; - return width - std::abs(Lateral); + return width - std::abs(point.lateral); } } // namespace gauge diff --git a/editor/editorGauge.hpp b/editor/editorGauge.hpp index d7e94cf9e..609462ff9 100644 --- a/editor/editorGauge.hpp +++ b/editor/editorGauge.hpp @@ -61,13 +61,23 @@ struct section std::array upper{}; // from the radius, above the lower part std::array lower{}; // from the radius, in the lower part std::array cant{}; // cant in metres, positive on the inner side of the curve and negative on the outer one + double tilt{0.0}; // sine of the slope of the plane of the rail heads, positive with the left rail raised +}; +// point of the cross-section, metres: lateral positive to the left, height above the rail top +struct place +{ + double lateral{0.0}; + double height{0.0}; }; // sections at the points of a route, from their chainage, curvature (1/m, positive turning left) and cant (m). // The widening begins and ends ahead of the changes of the curvature and cant, as the vehicles enter a curve std::vector
sections(kind Kind, std::vector const &Chainage, std::vector const &Curvature, std::vector const &Cant); -// widening of the side (+1 left, -1 right) at the height +// widening of the side (+1 left, -1 right) at the height; the cant shifts only the part above the lower one, +// the lower part turns with the plane of the rail heads instead double widening(section const &Section, double Height, int Side); +// point of the outline on the side at the section, with the widening and the turn of the lower part +place outline_point(profile const &Profile, section const &Section, std::size_t Index, int Side); // half-width of the gauge at the height on the side, negative above or below the outline double half_width(profile const &Profile, section const &Section, double Height, int Side); // depth of the point inside the gauge, metres, not positive outside of it. Lateral positive to the left From ae8a046f79cc704e9b3e330f7e37f84fcffd9c06 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 02:17:50 +0200 Subject: [PATCH 112/430] Structure gauge: wheel zone in the common lower part, depth as the distance from the outline --- editor/editorGauge.cpp | 73 +++++++++++++++++++++++------------------- editor/editorGauge.hpp | 11 +++---- 2 files changed, 44 insertions(+), 40 deletions(-) diff --git a/editor/editorGauge.cpp b/editor/editorGauge.cpp index 8674521f7..c23b3149b 100644 --- a/editor/editorGauge.cpp +++ b/editor/editorGauge.cpp @@ -12,6 +12,7 @@ http://mozilla.org/MPL/2.0/. #include #include +#include #include namespace gauge @@ -100,13 +101,25 @@ place turn(section const &Section, place const &Point, double const Sine) return {pivot + lateral * cosine - Point.height * Sine, lateral * Sine + Point.height * cosine}; } +// lower part common to all gauges, from the axis between the rails: the wheel zone at the running edge (717.5 mm +// from the axis) with the flangeway of the dimension "b" 58 mm wide and 38 mm deep, the dimension "a" of 150 mm +// at the rail top outside of it, then the limit installation gauge up to 380 mm +std::vector const common_lower{{0.6595, 0.055}, {0.6595, -0.038}, {0.7175, -0.038}, {0.7175, 0.0}, {0.8675, 0.0}, + {0.8675, 0.055}, {1.211, 0.055}, {1.585, 0.380}, {1.675, 0.380}}; + +// the wheel zone follows the rails, without the widening in the curves +bool wheel_zone(profile::point const &Point) +{ + return Point.height <= 0.055 + 1e-9 && Point.half_width < 1.0; +} + // names of the kinds in the file char const *const kind_names[]{"unified", "installation", "road"}; // outline from the points listed top down, in millimetres, as in the tables of the standard, over the lower part profile installation(std::string const &Name, std::vector> const &Points) { - profile result{Name, kind::installation, {{1.211, 0.055}, {1.585, 0.380}, {1.675, 0.380}}}; + profile result{Name, kind::installation, common_lower}; for (auto point = Points.rbegin(); point != Points.rend(); ++point) result.outline.push_back({point->second * 0.001, point->first * 0.001}); return result; @@ -117,7 +130,8 @@ profile installation(std::string const &Name, std::vector> c std::vector default_profiles() { // limit installation gauge up to 1170 mm, then the outline of the unified gauge - std::vector const lower{{1.211, 0.055}, {1.585, 0.380}, {1.675, 0.380}, {1.675, 1.170}, {2.000, 1.170}}; + auto lower{common_lower}; + lower.insert(lower.end(), {{1.675, 1.170}, {2.000, 1.170}}); std::vector const gpl1{{2.000, 3.050}, {1.900, 3.850}, {1.800, 4.250}, {1.600, 4.500}, {1.450, 4.632}}; std::vector const gpl2{{2.000, 3.625}, {1.920, 4.900}}; std::vector const pantograph{{1.450, 6.600}, {1.150, 6.900}, {0.0, 6.900}}; @@ -220,50 +234,43 @@ std::vector
sections(kind const Kind, std::vector const &Chaina return result; } -double widening(section const &Section, double const Height, int const Side) -{ - auto const i{Side > 0 ? 1 : 0}; - return Height < lower_part ? Section.lower[i] : Section.upper[i] + Section.cant[i] * Height / 1.5; -} - place outline_point(profile const &Profile, section const &Section, std::size_t const Index, int const Side) { auto const &point{Profile.outline[Index]}; // the step at the top of the lower part belongs to it from below bool const lower{point.height < lower_part - 1e-9 || (point.height < lower_part + 1e-9 && Index > 0 && Profile.outline[Index - 1].height < lower_part - 1e-9)}; auto const i{Side > 0 ? 1 : 0}; - auto const width{Section.base + point.half_width + (lower ? Section.lower[i] : Section.upper[i] + Section.cant[i] * point.height / 1.5)}; + auto const widening{wheel_zone(point) ? 0.0 : lower ? Section.lower[i] : Section.upper[i] + Section.cant[i] * point.height / 1.5}; + auto const width{Section.base + point.half_width + widening}; place const result{Side * width, point.height}; return lower && Section.tilt != 0.0 ? turn(Section, result, Section.tilt) : result; } -double half_width(profile const &Profile, section const &Section, double const Height, int const Side) -{ - double width{-1.0}; - for (std::size_t i = 1; i < Profile.outline.size(); ++i) - { - auto const &a{Profile.outline[i - 1]}; - auto const &b{Profile.outline[i]}; - if (Height < std::min(a.height, b.height) || Height > std::max(a.height, b.height)) - continue; - auto const span{b.height - a.height}; - width = std::max(width, std::abs(span) < 1e-9 ? std::max(a.half_width, b.half_width) : a.half_width + (b.half_width - a.half_width) * (Height - a.height) / span); - } - if (width < 0.0) - return width; - return Section.base + width + widening(Section, Height, Side); -} - double intrusion(profile const &Profile, section const &Section, double const Lateral, double const Height) { - // the point in the plane of the rail heads, for the lower part - auto const local{Section.tilt != 0.0 ? turn(Section, {Lateral, Height}, -Section.tilt) : place{Lateral, Height}}; - auto const lower{local.height < lower_part}; - auto const point{lower ? local : place{Lateral, std::max(Height, lower_part)}}; - auto const width{half_width(Profile, Section, point.height, point.lateral >= 0.0 ? 1 : -1)}; - if (width < 0.0) + auto const count{Profile.outline.size()}; + if (count < 2) return 0.0; - return width - std::abs(point.lateral); + // the outline from the bottom right up and down to the bottom left, closed across the bottom + auto const vertex{[&](std::size_t const Index) { + return Index < count ? outline_point(Profile, Section, Index, -1) : outline_point(Profile, Section, 2 * count - 1 - Index, 1); + }}; + bool inside{false}; + auto nearest{std::numeric_limits::max()}; + auto previous{vertex(2 * count - 1)}; + for (std::size_t i = 0; i < 2 * count; ++i) + { + auto const current{vertex(i)}; + auto const lateral{current.lateral - previous.lateral}; + auto const height{current.height - previous.height}; + if ((current.height > Height) != (previous.height > Height) && Lateral < previous.lateral + lateral * (Height - previous.height) / height) + inside = false == inside; + auto const length{lateral * lateral + height * height}; + auto const t{length > 0.0 ? std::clamp(((Lateral - previous.lateral) * lateral + (Height - previous.height) * height) / length, 0.0, 1.0) : 0.0}; + nearest = std::min(nearest, std::hypot(Lateral - previous.lateral - lateral * t, Height - previous.height - height * t)); + previous = current; + } + return inside ? nearest : -nearest; } } // namespace gauge diff --git a/editor/editorGauge.hpp b/editor/editorGauge.hpp index 609462ff9..f551f2480 100644 --- a/editor/editorGauge.hpp +++ b/editor/editorGauge.hpp @@ -73,14 +73,11 @@ struct place // The widening begins and ends ahead of the changes of the curvature and cant, as the vehicles enter a curve std::vector
sections(kind Kind, std::vector const &Chainage, std::vector const &Curvature, std::vector const &Cant); -// widening of the side (+1 left, -1 right) at the height; the cant shifts only the part above the lower one, -// the lower part turns with the plane of the rail heads instead -double widening(section const &Section, double Height, int Side); -// point of the outline on the side at the section, with the widening and the turn of the lower part +// point of the outline on the side (+1 left, -1 right) at the section, with the widening: the cant shifts the part +// above the lower one, the lower part turns with the plane of the rail heads instead place outline_point(profile const &Profile, section const &Section, std::size_t Index, int Side); -// half-width of the gauge at the height on the side, negative above or below the outline -double half_width(profile const &Profile, section const &Section, double Height, int Side); -// depth of the point inside the gauge, metres, not positive outside of it. Lateral positive to the left +// distance of the point from the outline in any direction, metres, positive inside and negative outside. +// Lateral positive to the left double intrusion(profile const &Profile, section const &Section, double Lateral, double Height); } // namespace gauge From ce0c311106a120ca9dd6a7b0ecce9d3c43c26551 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 02:22:57 +0200 Subject: [PATCH 113/430] Structure gauge refactor: outline ring, tilt in the sections, outline choice, shared track line --- application/editormode.h | 4 +- application/editormodegauge.cpp | 217 ++++++++++++++------------------ editor/editorGauge.cpp | 98 +++++++++++---- editor/editorGauge.hpp | 26 ++-- 4 files changed, 184 insertions(+), 161 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index 8114831fd..ae52afd95 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -350,8 +350,8 @@ class editor_mode : public application_mode, private editor_track::observer bool published{false}; // overlay up to date } m_gauge; void gauge_load(); - // the chosen railway and road outlines, null when there's none of the kind - std::pair gauge_profiles() const; + // the chosen railway and road outlines + gauge::choice gauge_choice() const; std::vector const &gauge_hits() const; void update_gauge(); void scan_gauge(TTrack &Track); diff --git a/application/editormodegauge.cpp b/application/editormodegauge.cpp index 2d6c7b412..f43ec42e5 100644 --- a/application/editormodegauge.cpp +++ b/application/editormodegauge.cpp @@ -26,6 +26,7 @@ http://mozilla.org/MPL/2.0/. #include #include #include +#include #include #include @@ -51,22 +52,6 @@ struct gauge_line std::vector sections; }; -// the outline checked along the track: the railway one or the road one -struct gauge_choice -{ - gauge::profile const *railway{nullptr}; - gauge::profile const *road{nullptr}; - - gauge::profile const *of(TTrack const &Track) const - { - if ((Track.iCategoryFlag & 1) != 0) - return railway; - if ((Track.iCategoryFlag & 2) != 0) - return road; - return nullptr; - } -}; - // half of the carriageway of a road at the sample, it narrows linearly to the width at the end double carriageway(editor_track::route_span const &Span, double const Chainage) { @@ -95,39 +80,34 @@ gauge_line make_line(editor_track::route &Route, gauge::profile const &Profile) cant.push_back(sample.cant); } line.sections = gauge::sections(Profile.kind, chainage, curvature, cant); - if (false == road) - { - // the outer rail is raised: the side from the nearest curve along the line - std::vector sides(curvature.size(), 0.0); - double side{0.0}; - for (std::size_t i = 0; i < curvature.size(); ++i) - sides[i] = side = std::abs(curvature[i]) > 1e-6 ? (curvature[i] > 0.0 ? 1.0 : -1.0) : side; - side = 0.0; - for (std::size_t i = curvature.size(); i-- > 0;) - { - if (std::abs(curvature[i]) > 1e-6) - side = curvature[i] > 0.0 ? 1.0 : -1.0; - else if (sides[i] == 0.0) - sides[i] = side; - } - for (std::size_t i = 0; i < curvature.size(); ++i) - line.sections[i].tilt = -sides[i] * std::min(1.0, cant[i] / 1.5); - } if (road) for (std::size_t i = 0; i < line.samples.size(); ++i) line.sections[i].base = carriageway(line.route.spans[line.samples[i].span], line.samples[i].chainage); return line; } +// the line along the route from the path with the outline of its kind, none without the outline or the length +std::optional track_line(gauge::choice const &Choice, TTrack const &Track, editor_track::route &Route) +{ + auto const *profile{Choice.of(Track.iCategoryFlag)}; + if (profile == nullptr || profile->outline.size() < 2) + return std::nullopt; + auto line{make_line(Route, *profile)}; + if (line.samples.size() < 2) + return std::nullopt; + return line; +} + // lines through all paths of the scenery, each path in one of them at least -std::vector scenery_lines(gauge_choice const &Choice) +std::vector scenery_lines(gauge::choice const &Choice) { std::vector lines; std::unordered_set visited; auto const seen{[&](editor_track::route_span const &Span) { return visited.count(Span.track) > 0; }}; + auto const checked{[&](TTrack const *Track) { return Track != nullptr && editor_track::is_supported(*Track) && Choice.of(Track->iCategoryFlag) != nullptr; }}; for (auto *track : simulation::Paths.sequence()) { - if (track == nullptr || visited.count(track) > 0 || false == editor_track::is_supported(*track) || Choice.of(*track) == nullptr) + if (false == checked(track) || visited.count(track) > 0) continue; auto route{editor_track::run_route(*track, 1e7)}; // the line may run on over the paths already covered, one of them is enough for the widening ahead of a curve @@ -138,15 +118,15 @@ std::vector scenery_lines(gauge_choice const &Choice) spans.pop_back(); for (auto const &span : spans) visited.insert(span.track); - lines.push_back(make_line(route, *Choice.of(*track))); + lines.push_back(make_line(route, *Choice.of(track->iCategoryFlag))); } // diverging paths of the switches for (auto *track : simulation::Paths.sequence()) - if (track != nullptr && track->eType == tt_Switch && editor_track::is_supported(*track) && Choice.of(*track) != nullptr) + if (checked(track) && track->eType == tt_Switch) { editor_track::route route; route.spans.push_back({track, 1, true}); - lines.push_back(make_line(route, *Choice.of(*track))); + lines.push_back(make_line(route, *Choice.of(track->iCategoryFlag))); } return lines; } @@ -160,7 +140,8 @@ public: for (std::uint32_t line = 0; line < Lines.size(); ++line) for (std::uint32_t i = 0; i < Lines[line].samples.size(); ++i) { - m_margin = std::max(m_margin, reach(*Lines[line].profile) + Lines[line].sections[i].base); + // with the room for the widening in the sharpest curves on the largest cant + m_margin = std::max(m_margin, gauge::widest(*Lines[line].profile) + Lines[line].sections[i].base + 1.2); auto const point{plan_of(Lines[line].samples[i].position)}; m_cells[key(point, cell)].push_back({line, i}); m_regions.insert(key(point, region)); @@ -225,8 +206,8 @@ public: auto const along{glm::dot(offset, sample.direction)}; if ((found.index == 0 && along < -0.6) || (found.index + 1 == line.samples.size() && along > 0.6)) continue; - auto const height{Point.y - (sample.position.y + sample.grade * along)}; - auto const depth{gauge::intrusion(*line.profile, line.sections[found.index], glm::dot(offset, normal(sample)), height)}; + gauge::ring(*line.profile, line.sections[found.index], m_ring); + auto const depth{gauge::intrusion(m_ring, {glm::dot(offset, normal(sample)), Point.y - (sample.position.y + sample.grade * along)})}; if (depth > deepest.depth) deepest = {depth, &line.route.spans[sample.span]}; } @@ -261,17 +242,9 @@ private: return m_lines[Entry.line].samples[Entry.index]; } - // half-width of the outline with the room for the widening in the sharpest curves on the largest cant - static double reach(gauge::profile const &Profile) - { - double result{0.0}; - for (auto const &point : Profile.outline) - result = std::max(result, point.half_width); - return result + 1.2; - } - std::vector const &m_lines; double m_margin{0.0}; + mutable std::vector m_ring; // reused by the checks std::unordered_map> m_cells; std::unordered_set m_regions; }; @@ -357,20 +330,14 @@ void scan_models(corridor const &Space, std::vector &Triangles, std: // translucent tunnel of the gauge along the line, with the rings every 10 m and the lines along its corners void build_tunnel(gauge_line const &Line, std::vector &Surface, std::vector &Edges) { - auto const &profile{*Line.profile}; - auto const lift{[](editor_track::route_sample const &Sample, double const Lateral, double const Height) { - auto const normal{corridor::normal(Sample)}; - return Sample.position + glm::dvec3(normal.x * Lateral, Height, normal.y * Lateral); - }}; - // outline across the track, from the bottom right up and down to the bottom left + std::vector places; auto const ring{[&](std::size_t const Index) { + gauge::ring(*Line.profile, Line.sections[Index], places); + auto const &sample{Line.samples[Index]}; + auto const normal{corridor::normal(sample)}; std::vector points; - for (int side : {-1, 1}) - for (std::size_t j = 0; j < profile.outline.size(); ++j) - { - auto const point{gauge::outline_point(profile, Line.sections[Index], side < 0 ? j : profile.outline.size() - 1 - j, side)}; - points.push_back(lift(Line.samples[Index], point.lateral, point.height)); - } + for (auto const &place : places) + points.push_back(sample.position + glm::dvec3(normal.x * place.lateral, place.height, normal.y * place.lateral)); return points; }}; std::vector previous; @@ -394,6 +361,57 @@ void build_tunnel(gauge_line const &Line, std::vector &Surface, std: } } +// table of the points of the outline with the inserting and removing of the points, whether it changed +bool edit_points(std::vector &Points) +{ + bool edited{false}; + bool inserted{false}; + int remove{-1}; + ImGui::Columns(3, "gaugeoutline", false); + ImGui::SetColumnWidth(0, 110.0f); + ImGui::SetColumnWidth(1, 110.0f); + ImGui::TextDisabled("Half-width"); + ImGui::NextColumn(); + ImGui::TextDisabled("Height"); + ImGui::NextColumn(); + ImGui::NextColumn(); + for (int i = 0; i < static_cast(Points.size()); ++i) + { + ImGui::PushID(i); + auto &point{Points[i]}; + ImGui::SetNextItemWidth(-1.0f); + ImGui::InputDouble("##width", &point.half_width, 0.0, 0.0, "%.3f"); + edited |= ImGui::IsItemDeactivatedAfterEdit(); + ImGui::NextColumn(); + ImGui::SetNextItemWidth(-1.0f); + ImGui::InputDouble("##height", &point.height, 0.0, 0.0, "%.3f"); + edited |= ImGui::IsItemDeactivatedAfterEdit(); + ImGui::NextColumn(); + if (ImGui::SmallButton("+")) + { + auto const &next{Points[std::min(i + 1, Points.size() - 1)]}; + Points.insert(Points.begin() + i + 1, {0.5 * (point.half_width + next.half_width), 0.5 * (point.height + next.height)}); + inserted = edited = true; + } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("Insert a point after this one"); + ImGui::SameLine(); + if (Points.size() > 2 && ImGui::SmallButton("x")) + remove = i; + ImGui::NextColumn(); + ImGui::PopID(); + if (inserted) + break; + } + ImGui::Columns(1); + if (remove >= 0) + { + Points.erase(Points.begin() + remove); + edited = true; + } + return edited; +} + } // namespace void editor_mode::gauge_load() @@ -414,7 +432,7 @@ void editor_mode::gauge_load() } } -std::pair editor_mode::gauge_profiles() const +gauge::choice editor_mode::gauge_choice() const { auto const pick{[&](int const Index) { return Index >= 0 ? &m_gauge.profiles[Index] : nullptr; }}; return {pick(m_gauge.profile), pick(m_gauge.road)}; @@ -463,14 +481,11 @@ void editor_mode::scan_gauge(TTrack &Track) { gauge_load(); m_gauge.line = {}; - auto const [railway, road]{gauge_profiles()}; - auto const *profile{gauge_choice{railway, road}.of(Track)}; - if (profile == nullptr || profile->outline.size() < 2) - return; auto route{editor_track::run_route(Track, gauge_reach)}; - std::vector const lines{make_line(route, *profile)}; - if (lines.front().samples.size() < 2) + auto line{track_line(gauge_choice(), Track, route)}; + if (false == line.has_value()) return; + std::vector const lines{std::move(*line)}; corridor const space{lines}; build_tunnel(lines.front(), m_gauge.line.surface, m_gauge.line.edges); scan_models(space, m_gauge.line.intruding, m_gauge.line.hits); @@ -483,13 +498,14 @@ void editor_mode::scan_gauge_map() gauge_load(); auto const started{std::chrono::steady_clock::now()}; m_gauge.map = {}; - auto const [railway, road]{gauge_profiles()}; - auto const lines{scenery_lines({railway, road})}; + auto const choice{gauge_choice()}; + auto const lines{scenery_lines(choice)}; corridor const space{lines}; scan_models(space, m_gauge.map.intruding, m_gauge.map.hits); m_gauge.map.scanned = true; m_gauge.map.history = m_history.size(); - m_gauge.map.profile = (railway ? railway->name : std::string{"-"}) + ", " + (road ? road->name : std::string{"-"}); + auto const name{[](gauge::profile const *Profile) { return Profile != nullptr ? Profile->name : std::string{"-"}; }}; + m_gauge.map.profile = name(choice.railway) + ", " + name(choice.road); m_gauge.current = -1; m_gauge.published = false; WriteLog("Structure gauge (" + m_gauge.map.profile + "): " + std::to_string(m_gauge.map.hits.size()) + " models enter it along " + std::to_string(lines.size()) + " lines, scanned in " + @@ -562,13 +578,8 @@ void editor_mode::gauge_spot(gauge_hit const &Hit) route = editor_track::run_route(*track, gauge_spot_reach); else route.spans.push_back({track, Hit.path, true}); - auto const [railway, road]{gauge_profiles()}; - auto const *profile{gauge_choice{railway, road}.of(*track)}; - if (profile == nullptr) - return; - auto const line{make_line(route, *profile)}; - if (line.samples.size() >= 2) - build_tunnel(line, m_gauge.spot.surface, m_gauge.spot.edges); + if (auto const line{track_line(gauge_choice(), *track, route)}) + build_tunnel(*line, m_gauge.spot.surface, m_gauge.spot.edges); } void editor_mode::render_gauge_window() @@ -674,51 +685,7 @@ bool editor_mode::render_gauge_outline(int const Index) return false; ImGui::TextDisabled(profile.kind == gauge::kind::road ? "Metres from the edge of the carriageway and above the road, bottom up." : "PKP PLK standard, volume II; below 1170 mm the limit installation gauge.\nMetres from the track axis and above the rail top, bottom up."); - bool edited{false}; - bool inserted{false}; - int remove{-1}; - ImGui::Columns(3, "gaugeoutline", false); - ImGui::SetColumnWidth(0, 110.0f); - ImGui::SetColumnWidth(1, 110.0f); - ImGui::TextDisabled("Half-width"); - ImGui::NextColumn(); - ImGui::TextDisabled("Height"); - ImGui::NextColumn(); - ImGui::NextColumn(); - for (int i = 0; i < static_cast(profile.outline.size()); ++i) - { - ImGui::PushID(i); - auto &point{profile.outline[i]}; - ImGui::SetNextItemWidth(-1.0f); - ImGui::InputDouble("##width", &point.half_width, 0.0, 0.0, "%.3f"); - edited |= ImGui::IsItemDeactivatedAfterEdit(); - ImGui::NextColumn(); - ImGui::SetNextItemWidth(-1.0f); - ImGui::InputDouble("##height", &point.height, 0.0, 0.0, "%.3f"); - edited |= ImGui::IsItemDeactivatedAfterEdit(); - ImGui::NextColumn(); - if (ImGui::SmallButton("+")) - { - auto const &next{profile.outline[std::min(i + 1, profile.outline.size() - 1)]}; - profile.outline.insert(profile.outline.begin() + i + 1, {0.5 * (point.half_width + next.half_width), 0.5 * (point.height + next.height)}); - inserted = edited = true; - } - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("Insert a point after this one"); - ImGui::SameLine(); - if (profile.outline.size() > 2 && ImGui::SmallButton("x")) - remove = i; - ImGui::NextColumn(); - ImGui::PopID(); - if (inserted) - break; - } - ImGui::Columns(1); - if (remove >= 0) - { - profile.outline.erase(profile.outline.begin() + remove); - edited = true; - } + bool edited{edit_points(profile.outline)}; if (ImGui::SmallButton("Restore the starting outlines")) { m_gauge.profiles = gauge::default_profiles(); diff --git a/editor/editorGauge.cpp b/editor/editorGauge.cpp index c23b3149b..bb78f25aa 100644 --- a/editor/editorGauge.cpp +++ b/editor/editorGauge.cpp @@ -125,8 +125,49 @@ profile installation(std::string const &Name, std::vector> c return result; } +// point of the outline on the side (+1 left, -1 right) at the section +place outline_point(profile const &Profile, section const &Section, std::size_t const Index, int const Side) +{ + auto const &point{Profile.outline[Index]}; + // the step at the top of the lower part belongs to it from below + bool const lower{point.height < lower_part - 1e-9 || (point.height < lower_part + 1e-9 && Index > 0 && Profile.outline[Index - 1].height < lower_part - 1e-9)}; + auto const i{Side > 0 ? 1 : 0}; + auto const widening{wheel_zone(point) ? 0.0 : lower ? Section.lower[i] : Section.upper[i] + Section.cant[i] * point.height / 1.5}; + auto const width{Section.base + point.half_width + widening}; + place const result{Side * width, point.height}; + return lower && Section.tilt != 0.0 ? turn(Section, result, Section.tilt) : result; +} + +// sign of the curvature at the points, from the nearest curve along the line where it's straight +std::vector curve_sides(std::vector const &Curvature) +{ + auto const side{[](double const Curvature) { return std::abs(Curvature) > 1e-6 ? (Curvature > 0.0 ? 1.0 : -1.0) : 0.0; }}; + std::vector sides(Curvature.size(), 0.0); + double last{0.0}; + for (std::size_t i = 0; i < Curvature.size(); ++i) + sides[i] = last = side(Curvature[i]) != 0.0 ? side(Curvature[i]) : last; + last = 0.0; + for (std::size_t i = Curvature.size(); i-- > 0;) + { + if (side(Curvature[i]) != 0.0) + last = side(Curvature[i]); + else if (sides[i] == 0.0) + sides[i] = last; + } + return sides; +} + } // namespace +profile const *choice::of(int const Category) const +{ + if ((Category & 1) != 0) + return railway; + if ((Category & 2) != 0) + return road; + return nullptr; +} + std::vector default_profiles() { // limit installation gauge up to 1170 mm, then the outline of the unified gauge @@ -231,46 +272,49 @@ std::vector
sections(kind const Kind, std::vector const &Chaina result[i].cant[side] = inner(fields[4]) - outer(fields[5]); } } + auto const sides{curve_sides(Curvature)}; + for (std::size_t i = 0; i < count; ++i) + result[i].tilt = -sides[i] * std::min(1.0, Cant[i] / 1.5); return result; } -place outline_point(profile const &Profile, section const &Section, std::size_t const Index, int const Side) -{ - auto const &point{Profile.outline[Index]}; - // the step at the top of the lower part belongs to it from below - bool const lower{point.height < lower_part - 1e-9 || (point.height < lower_part + 1e-9 && Index > 0 && Profile.outline[Index - 1].height < lower_part - 1e-9)}; - auto const i{Side > 0 ? 1 : 0}; - auto const widening{wheel_zone(point) ? 0.0 : lower ? Section.lower[i] : Section.upper[i] + Section.cant[i] * point.height / 1.5}; - auto const width{Section.base + point.half_width + widening}; - place const result{Side * width, point.height}; - return lower && Section.tilt != 0.0 ? turn(Section, result, Section.tilt) : result; -} - -double intrusion(profile const &Profile, section const &Section, double const Lateral, double const Height) +void ring(profile const &Profile, section const &Section, std::vector &Points) { auto const count{Profile.outline.size()}; - if (count < 2) + Points.clear(); + for (std::size_t j = 0; j < count; ++j) + Points.push_back(outline_point(Profile, Section, j, -1)); + for (std::size_t j = count; j-- > 0;) + Points.push_back(outline_point(Profile, Section, j, 1)); +} + +double intrusion(std::vector const &Ring, place const &Point) +{ + if (Ring.size() < 3) return 0.0; - // the outline from the bottom right up and down to the bottom left, closed across the bottom - auto const vertex{[&](std::size_t const Index) { - return Index < count ? outline_point(Profile, Section, Index, -1) : outline_point(Profile, Section, 2 * count - 1 - Index, 1); - }}; bool inside{false}; auto nearest{std::numeric_limits::max()}; - auto previous{vertex(2 * count - 1)}; - for (std::size_t i = 0; i < 2 * count; ++i) + auto const *previous{&Ring.back()}; + for (auto const ¤t : Ring) { - auto const current{vertex(i)}; - auto const lateral{current.lateral - previous.lateral}; - auto const height{current.height - previous.height}; - if ((current.height > Height) != (previous.height > Height) && Lateral < previous.lateral + lateral * (Height - previous.height) / height) + auto const lateral{current.lateral - previous->lateral}; + auto const height{current.height - previous->height}; + if ((current.height > Point.height) != (previous->height > Point.height) && Point.lateral < previous->lateral + lateral * (Point.height - previous->height) / height) inside = false == inside; auto const length{lateral * lateral + height * height}; - auto const t{length > 0.0 ? std::clamp(((Lateral - previous.lateral) * lateral + (Height - previous.height) * height) / length, 0.0, 1.0) : 0.0}; - nearest = std::min(nearest, std::hypot(Lateral - previous.lateral - lateral * t, Height - previous.height - height * t)); - previous = current; + auto const t{length > 0.0 ? std::clamp(((Point.lateral - previous->lateral) * lateral + (Point.height - previous->height) * height) / length, 0.0, 1.0) : 0.0}; + nearest = std::min(nearest, std::hypot(Point.lateral - previous->lateral - lateral * t, Point.height - previous->height - height * t)); + previous = ¤t; } return inside ? nearest : -nearest; } +double widest(profile const &Profile) +{ + double result{0.0}; + for (auto const &point : Profile.outline) + result = std::max(result, point.half_width); + return result; +} + } // namespace gauge diff --git a/editor/editorGauge.hpp b/editor/editorGauge.hpp index f551f2480..caae3a4cc 100644 --- a/editor/editorGauge.hpp +++ b/editor/editorGauge.hpp @@ -41,6 +41,15 @@ struct profile std::vector outline; }; +// the outlines checked along the paths: the railway one on the tracks, the road one on the roads +struct choice +{ + profile const *railway{nullptr}; + profile const *road{nullptr}; + // by the category flags of the path, 1 a track and 2 a road; null when there's no outline for it + profile const *of(int Category) const; +}; + // GPL-1 and GPL-2 over the limit installation gauge below 1170 mm, with and without the pantograph gauge, the limit // and nominal installation gauges G1, G2, GA, GB, GC of the PKP PLK technical standards, and the road gauges std::vector default_profiles(); @@ -70,14 +79,17 @@ struct place double height{0.0}; }; // sections at the points of a route, from their chainage, curvature (1/m, positive turning left) and cant (m). -// The widening begins and ends ahead of the changes of the curvature and cant, as the vehicles enter a curve +// The widening begins and ends ahead of the changes of the curvature and cant, as the vehicles enter a curve; +// the plane of the rail heads tilts with the cant, the outer rail raised std::vector
sections(kind Kind, std::vector const &Chainage, std::vector const &Curvature, std::vector const &Cant); -// point of the outline on the side (+1 left, -1 right) at the section, with the widening: the cant shifts the part -// above the lower one, the lower part turns with the plane of the rail heads instead -place outline_point(profile const &Profile, section const &Section, std::size_t Index, int Side); -// distance of the point from the outline in any direction, metres, positive inside and negative outside. -// Lateral positive to the left -double intrusion(profile const &Profile, section const &Section, double Lateral, double Height); +// the outline across the track at the section, from the bottom right up and down to the bottom left, closed across +// the bottom. With the widening: the cant shifts the part above the lower one, the lower part turns with the plane +// of the rail heads instead +void ring(profile const &Profile, section const &Section, std::vector &Points); +// distance of the point from the ring in any direction, metres, positive inside and negative outside +double intrusion(std::vector const &Ring, place const &Point); +// largest half-width of the outline, metres +double widest(profile const &Profile); } // namespace gauge From 1ab5e1e8c368e3f829ac6a81b219bd60970a9341 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 02:25:12 +0200 Subject: [PATCH 114/430] Structure gauge: camera along the track at the height of the hit, close to it --- application/editormode.h | 1 + application/editormodegauge.cpp | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index ae52afd95..7b32ff0f1 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -47,6 +47,7 @@ class editor_mode : public application_mode, private editor_track::observer double depth{0.0}; // m TTrack const *track{nullptr}; // nearest one, may be gone by now int path{0}; + glm::dvec2 direction{0.0, 1.0}; // of the track there, in the plan }; // constructors editor_mode(); diff --git a/application/editormodegauge.cpp b/application/editormodegauge.cpp index f43ec42e5..7c0ade95e 100644 --- a/application/editormodegauge.cpp +++ b/application/editormodegauge.cpp @@ -42,6 +42,8 @@ double const gauge_origin_range{2000.0}; // length of the line shown each way from the selected path, and around a hit double const gauge_reach{500.0}; double const gauge_spot_reach{60.0}; +// distance of the camera from the place of a hit, along the track +double const gauge_view_distance{4.0}; // sampled line of the tracks with the widening of the gauge along it struct gauge_line @@ -171,6 +173,7 @@ public: { double depth{0.0}; // not positive outside of the gauge editor_track::route_span const *span{nullptr}; // of the line the point enters + glm::dvec2 direction{0.0}; // of the line there, in the plan }; // deepest intrusion of the point into the gauge of the lines nearby hit intrusion(glm::dvec3 const &Point) const @@ -209,7 +212,7 @@ public: gauge::ring(*line.profile, line.sections[found.index], m_ring); auto const depth{gauge::intrusion(m_ring, {glm::dot(offset, normal(sample)), Point.y - (sample.position.y + sample.grade * along)})}; if (depth > deepest.depth) - deepest = {depth, &line.route.spans[sample.span]}; + deepest = {depth, &line.route.spans[sample.span], sample.direction}; } return deepest; } @@ -317,6 +320,7 @@ void scan_models(corridor const &Space, std::vector &Triangles, std: hit.point = point; hit.track = found.span->track; hit.path = found.span->path; + hit.direction = found.direction; } return; } @@ -551,14 +555,15 @@ void editor_mode::gauge_focus(int const Index) m_gauge.current = (Index % static_cast(hits.size()) + static_cast(hits.size())) % static_cast(hits.size()); m_gauge.published = false; gauge_spot(hits[m_gauge.current]); - auto const target{hits[m_gauge.current].point}; - // from the side the camera looks from, a bit above - glm::dvec3 away{Camera.Pos.x - target.x, 0.0, Camera.Pos.z - target.z}; - away = glm::length(away) > 1e-3 ? glm::normalize(away) : glm::dvec3(1.0, 0.0, 0.0); + auto const &hit{hits[m_gauge.current]}; + // along the track, tangent to the gauge at the height of the place, from the end nearer to the camera + glm::dvec3 look{hit.direction.x, 0.0, hit.direction.y}; + look = glm::length(look) > 1e-6 ? glm::normalize(look) : glm::dvec3(0.0, 0.0, 1.0); + if (glm::dot(Camera.Pos - hit.point, look) > 0.0) + look = -look; m_focus_start_pos = Camera.Pos; m_focus_start_angle = Camera.Angle; - m_focus_target_pos = target + away * 12.0 + glm::dvec3(0.0, 4.0, 0.0); - auto const look{glm::normalize(target - m_focus_target_pos)}; + m_focus_target_pos = hit.point - look * gauge_view_distance; m_focus_target_angle = glm::vec3(static_cast(std::asin(std::clamp(look.y, -1.0, 1.0))), static_cast(std::atan2(-look.x, -look.z)), 0.0f); m_focus_active = true; m_focus_time = 0.0; From e69601dfa026b1477062efb101b61b3e021d00a3 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 02:27:52 +0200 Subject: [PATCH 115/430] Structure gauge: no red highlight of the intruding triangles --- application/editormode.h | 2 -- application/editormodegauge.cpp | 32 +++++++++++++------------------- rendering/editoroverlay.h | 1 - rendering/opengl33renderer.cpp | 6 ------ 4 files changed, 13 insertions(+), 28 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index 7b32ff0f1..dd4e48721 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -331,7 +331,6 @@ class editor_mode : public application_mode, private editor_track::observer { std::vector surface; // triangles of the tunnel std::vector edges; // lines - std::vector intruding; // triangles of the models std::vector hits; } line; // along the selected path struct @@ -339,7 +338,6 @@ class editor_mode : public application_mode, private editor_track::observer bool scanned{false}; std::size_t history{0}; std::string profile; - std::vector intruding; std::vector hits; } map; // whole scenery struct diff --git a/application/editormodegauge.cpp b/application/editormodegauge.cpp index 7c0ade95e..0d444efa6 100644 --- a/application/editormodegauge.cpp +++ b/application/editormodegauge.cpp @@ -36,7 +36,6 @@ namespace { char const *const gauge_file{"editor_structure_gauges.txt"}; -std::size_t const gauge_triangle_limit{200000}; // past this distance of the camera from the origin of the overlay it's rebuilt, to keep its float precision double const gauge_origin_range{2000.0}; // length of the line shown each way from the selected path, and around a hit @@ -290,13 +289,11 @@ template void visit_triangles(TSubModel *Submodel, glm::dmat4 } } -// triangles of the models entering the gauge, and the deepest place of each model, the deepest models first -void scan_models(corridor const &Space, std::vector &Triangles, std::vector &Hits) +// the models entering the gauge with the deepest place of each, the deepest models first +void scan_models(corridor const &Space, std::vector &Hits) { for (auto *instance : simulation::Instances.sequence()) { - if (Triangles.size() >= 3 * gauge_triangle_limit) - break; if (instance == nullptr || false == instance->visible() || instance->Model() == nullptr || instance->Model()->GetSMRoot() == nullptr) continue; if (false == Space.near(instance->location(), instance->radius())) @@ -313,7 +310,6 @@ void scan_models(corridor const &Space, std::vector &Triangles, std: auto const found{Space.intrusion(point)}; if (found.depth <= 0.0) continue; - Triangles.insert(Triangles.end(), {A, B, C}); if (found.depth > hit.depth) { hit.depth = found.depth; @@ -492,7 +488,7 @@ void editor_mode::scan_gauge(TTrack &Track) std::vector const lines{std::move(*line)}; corridor const space{lines}; build_tunnel(lines.front(), m_gauge.line.surface, m_gauge.line.edges); - scan_models(space, m_gauge.line.intruding, m_gauge.line.hits); + scan_models(space, m_gauge.line.hits); if (false == m_gauge.map.scanned) m_gauge.current = -1; } @@ -505,7 +501,7 @@ void editor_mode::scan_gauge_map() auto const choice{gauge_choice()}; auto const lines{scenery_lines(choice)}; corridor const space{lines}; - scan_models(space, m_gauge.map.intruding, m_gauge.map.hits); + scan_models(space, m_gauge.map.hits); m_gauge.map.scanned = true; m_gauge.map.history = m_history.size(); auto const name{[](gauge::profile const *Profile) { return Profile != nullptr ? Profile->name : std::string{"-"}; }}; @@ -523,8 +519,8 @@ void editor_mode::gauge_publish() m_gauge.published = true; EditorOverlay.clear(); EditorOverlay.origin = Camera.Pos; - auto const batch{[](glm::vec4 const &Color, unsigned int const Type, bool const Offset, std::vector const &Points) { - gfx::editor_overlay::batch result{Color, Type, Offset}; + auto const batch{[](glm::vec4 const &Color, unsigned int const Type, std::vector const &Points) { + gfx::editor_overlay::batch result{Color, Type}; result.points.reserve(Points.size()); for (auto const &point : Points) result.points.emplace_back(point - EditorOverlay.origin); @@ -538,13 +534,11 @@ void editor_mode::gauge_publish() marker = {point - glm::dvec3(0.0, 3.0, 0.0), point + glm::dvec3(0.0, 3.0, 0.0), point - glm::dvec3(1.0, 0.0, 0.0), point + glm::dvec3(1.0, 0.0, 0.0), point - glm::dvec3(0.0, 0.0, 1.0), point + glm::dvec3(0.0, 0.0, 1.0)}; } - EditorOverlay.batches = {batch({0.2f, 0.9f, 0.3f, 0.12f}, GL_TRIANGLES, false, m_gauge.line.surface), - batch({0.2f, 1.0f, 0.3f, 0.5f}, GL_LINES, false, m_gauge.line.edges), - batch({1.0f, 0.1f, 0.05f, 0.6f}, GL_TRIANGLES, true, m_gauge.line.intruding), - batch({1.0f, 0.1f, 0.05f, 0.6f}, GL_TRIANGLES, true, m_gauge.map.intruding), - batch({1.0f, 0.9f, 0.1f, 1.0f}, GL_LINES, false, marker), - batch({0.2f, 0.9f, 0.3f, 0.12f}, GL_TRIANGLES, false, m_gauge.spot.surface), - batch({0.2f, 1.0f, 0.3f, 0.5f}, GL_LINES, false, m_gauge.spot.edges)}; + EditorOverlay.batches = {batch({0.2f, 0.9f, 0.3f, 0.12f}, GL_TRIANGLES, m_gauge.line.surface), + batch({0.2f, 1.0f, 0.3f, 0.5f}, GL_LINES, m_gauge.line.edges), + batch({1.0f, 0.9f, 0.1f, 1.0f}, GL_LINES, marker), + batch({0.2f, 0.9f, 0.3f, 0.12f}, GL_TRIANGLES, m_gauge.spot.surface), + batch({0.2f, 1.0f, 0.3f, 0.5f}, GL_LINES, m_gauge.spot.edges)}; } void editor_mode::gauge_focus(int const Index) @@ -600,7 +594,7 @@ void editor_mode::render_gauge_window() if (ImGui::Checkbox("Show along the selected path", &m_gauge.enabled)) m_gauge.pending = true; if (ImGui::IsItemHovered()) - ImGui::SetTooltip("Translucent tunnel of the gauge 500 m each way along the line of the selected path,\nwith the triangles of the models which enter it in red.\nWidened in the curves under 250 m and tilted on the cant, from 20 m (inner side)\nand 26 m (outer side) ahead of the curve, as in the PKP PLK standard, volume II."); + ImGui::SetTooltip("Translucent tunnel of the gauge 500 m each way along the line of the selected path.\nWidened in the curves under 250 m and tilted on the cant, from 20 m (inner side)\nand 26 m (outer side) ahead of the curve, as in the PKP PLK standard, volume II."); gauge_load(); bool changed{render_gauge_choice("Railway", m_gauge.profile, false)}; if (ImGui::IsItemHovered()) @@ -612,7 +606,7 @@ void editor_mode::render_gauge_window() if (ImGui::Button("Find the violations on the whole map")) scan_gauge_map(); if (ImGui::IsItemHovered()) - ImGui::SetTooltip("Checks the models along all tracks of the scenery against the chosen gauge,\nmarks them in red and lists them, the deepest first"); + ImGui::SetTooltip("Checks the models along all tracks of the scenery against the chosen gauge\nand lists them, the deepest first"); if (m_gauge.map.scanned) { ImGui::SameLine(); diff --git a/rendering/editoroverlay.h b/rendering/editoroverlay.h index 6a533165c..57442d43c 100644 --- a/rendering/editoroverlay.h +++ b/rendering/editoroverlay.h @@ -23,7 +23,6 @@ struct editor_overlay { glm::vec4 color{1.0f}; unsigned int type{0}; // GL primitive - bool offset{false}; // pulled towards the camera, to show over the coplanar surfaces std::vector points; // relative to the origin }; glm::dvec3 origin{0.0}; diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index 4c769e8f3..b146d5d18 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -4531,14 +4531,8 @@ void opengl33_renderer::Render_editor_overlay() { if (batches[i].points.empty() || m_editor_overlay_geometry[i] == null_handle) continue; - if (batches[i].offset) - { - ::glEnable(GL_POLYGON_OFFSET_FILL); - ::glPolygonOffset(-2.f, -2.f); - } model_ubs.param[0] = batches[i].color; draw(m_editor_overlay_geometry[i]); - ::glDisable(GL_POLYGON_OFFSET_FILL); ++m_renderpass.draw_stats.drawcalls; } ::glDepthMask(GL_TRUE); From 818fc60e21be55fc77c2129011f5ea8e69405e31 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 02:33:11 +0200 Subject: [PATCH 116/430] Structure gauge: no road gauge along the pavements --- application/editormodegauge.cpp | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/application/editormodegauge.cpp b/application/editormodegauge.cpp index 0d444efa6..40699426e 100644 --- a/application/editormodegauge.cpp +++ b/application/editormodegauge.cpp @@ -24,6 +24,7 @@ http://mozilla.org/MPL/2.0/. #include #include #include +#include #include #include #include @@ -87,11 +88,27 @@ gauge_line make_line(editor_track::route &Route, gauge::profile const &Profile) return line; } -// the line along the route from the path with the outline of its kind, none without the outline or the length -std::optional track_line(gauge::choice const &Choice, TTrack const &Track, editor_track::route &Route) +// outline checked along the path, none on the pavements, which are the roads with the pavement texture +gauge::profile const *outline_of(gauge::choice const &Choice, TTrack const &Track) { auto const *profile{Choice.of(Track.iCategoryFlag)}; if (profile == nullptr || profile->outline.size() < 2) + return nullptr; + if (profile == Choice.road) + { + auto name{editor_track::material_name(Track.m_material1)}; + std::transform(name.begin(), name.end(), name.begin(), [](unsigned char const C) { return static_cast(std::tolower(C)); }); + if (name.find("chodnik") != std::string::npos) + return nullptr; + } + return profile; +} + +// the line along the route from the path with the outline of its kind, none without the outline or the length +std::optional track_line(gauge::choice const &Choice, TTrack const &Track, editor_track::route &Route) +{ + auto const *profile{outline_of(Choice, Track)}; + if (profile == nullptr) return std::nullopt; auto line{make_line(Route, *profile)}; if (line.samples.size() < 2) @@ -105,7 +122,7 @@ std::vector scenery_lines(gauge::choice const &Choice) std::vector lines; std::unordered_set visited; auto const seen{[&](editor_track::route_span const &Span) { return visited.count(Span.track) > 0; }}; - auto const checked{[&](TTrack const *Track) { return Track != nullptr && editor_track::is_supported(*Track) && Choice.of(Track->iCategoryFlag) != nullptr; }}; + auto const checked{[&](TTrack const *Track) { return Track != nullptr && editor_track::is_supported(*Track) && outline_of(Choice, *Track) != nullptr; }}; for (auto *track : simulation::Paths.sequence()) { if (false == checked(track) || visited.count(track) > 0) @@ -119,7 +136,7 @@ std::vector scenery_lines(gauge::choice const &Choice) spans.pop_back(); for (auto const &span : spans) visited.insert(span.track); - lines.push_back(make_line(route, *Choice.of(track->iCategoryFlag))); + lines.push_back(make_line(route, *outline_of(Choice, *track))); } // diverging paths of the switches for (auto *track : simulation::Paths.sequence()) @@ -127,7 +144,7 @@ std::vector scenery_lines(gauge::choice const &Choice) { editor_track::route route; route.spans.push_back({track, 1, true}); - lines.push_back(make_line(route, *Choice.of(track->iCategoryFlag))); + lines.push_back(make_line(route, *outline_of(Choice, *track))); } return lines; } From ac82db81787f7c627c8b49301cc3542b0f2edb15 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 02:35:00 +0200 Subject: [PATCH 117/430] Structure gauge: map scan in slices over the frames with progress and cancel, skip the triangles far from the lines --- application/editormode.h | 3 + application/editormodegauge.cpp | 177 +++++++++++++++++++++++--------- 2 files changed, 133 insertions(+), 47 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index dd4e48721..770f6a7ad 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -347,6 +347,7 @@ class editor_mode : public application_mode, private editor_track::observer } spot; // tunnel around the hit the camera went to int current{-1}; // hit the camera went to bool published{false}; // overlay up to date + std::shared_ptr scan; // of the whole scenery, done in slices over the frames } m_gauge; void gauge_load(); // the chosen railway and road outlines @@ -355,6 +356,8 @@ class editor_mode : public application_mode, private editor_track::observer void update_gauge(); void scan_gauge(TTrack &Track); void scan_gauge_map(); + void step_gauge_map(); + void finish_gauge_map(); void gauge_publish(); void gauge_focus(int Index); void gauge_spot(gauge_hit const &Hit); diff --git a/application/editormodegauge.cpp b/application/editormodegauge.cpp index 40699426e..f10d42a4c 100644 --- a/application/editormodegauge.cpp +++ b/application/editormodegauge.cpp @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "application/editormode.h" #include "application/editoruilayer.h" +#include "editor/editorFormat.hpp" #include "editor/editorGauge.hpp" #include "editor/editorGeometry.hpp" #include "model/AnimModel.h" @@ -42,6 +43,8 @@ double const gauge_origin_range{2000.0}; // length of the line shown each way from the selected path, and around a hit double const gauge_reach{500.0}; double const gauge_spot_reach{60.0}; +// time spent on the scan of the whole map in a frame +auto const gauge_slice{std::chrono::milliseconds(8)}; // distance of the camera from the place of a hit, along the track double const gauge_view_distance{4.0}; @@ -171,7 +174,21 @@ public: return {-Sample.direction.y, Sample.direction.x}; } - // whether the sphere may reach the gauge + // whether the sphere may reach the gauge of a line sampled in the cells around it + bool close(glm::dvec3 const &Center, double const Radius) const + { + auto const center{plan_of(Center)}; + auto const reach{Radius + m_margin}; + auto const from{index(center - reach, cell)}; + auto const to{index(center + reach, cell)}; + for (auto x = from.x; x <= to.x; ++x) + for (auto y = from.y; y <= to.y; ++y) + if (m_cells.count(key(x, y)) > 0) + return true; + return false; + } + + // whether the sphere may reach the gauge, roughly bool near(glm::dvec3 const &Center, double const Radius) const { auto const center{plan_of(Center)}; @@ -306,42 +323,55 @@ template void visit_triangles(TSubModel *Submodel, glm::dmat4 } } -// the models entering the gauge with the deepest place of each, the deepest models first +// the deepest place of the model in the gauge, added to the hits when it enters it +void scan_model(corridor const &Space, TAnimModel &Instance, std::vector &Hits) +{ + if (false == Instance.visible() || Instance.Model() == nullptr || Instance.Model()->GetSMRoot() == nullptr) + return; + if (false == Space.near(Instance.location(), Instance.radius())) + return; + editor_mode::gauge_hit hit{Instance.name(), Instance.location()}; + // the triangle enters the gauge when any point of a grid spread over it does + visit_triangles(Instance.Model()->GetSMRoot(), placement(Instance), [&](glm::dvec3 const &A, glm::dvec3 const &B, glm::dvec3 const &C) { + auto const middle{(A + B + C) / 3.0}; + if (false == Space.close(middle, std::max({glm::distance(middle, A), glm::distance(middle, B), glm::distance(middle, C)}))) + return; + auto const edge{std::max({glm::distance(A, B), glm::distance(B, C), glm::distance(C, A)})}; + auto const steps{std::clamp(static_cast(std::ceil(edge / 0.5)), 1, 24)}; + for (int u = 0; u <= steps; ++u) + for (int v = 0; u + v <= steps; ++v) + { + auto const point{A + (B - A) * (static_cast(u) / steps) + (C - A) * (static_cast(v) / steps)}; + auto const found{Space.intrusion(point)}; + if (found.depth <= 0.0) + continue; + if (found.depth > hit.depth) + { + hit.depth = found.depth; + hit.point = point; + hit.track = found.span->track; + hit.path = found.span->path; + hit.direction = found.direction; + } + return; + } + }); + if (hit.depth > 0.0) + Hits.push_back(std::move(hit)); +} + +void sort_hits(std::vector &Hits) +{ + std::sort(Hits.begin(), Hits.end(), [](auto const &Left, auto const &Right) { return Left.depth > Right.depth; }); +} + +// the models entering the gauge, the deepest first void scan_models(corridor const &Space, std::vector &Hits) { for (auto *instance : simulation::Instances.sequence()) - { - if (instance == nullptr || false == instance->visible() || instance->Model() == nullptr || instance->Model()->GetSMRoot() == nullptr) - continue; - if (false == Space.near(instance->location(), instance->radius())) - continue; - editor_mode::gauge_hit hit{instance->name(), instance->location()}; - // the triangle enters the gauge when any point of a grid spread over it does - visit_triangles(instance->Model()->GetSMRoot(), placement(*instance), [&](glm::dvec3 const &A, glm::dvec3 const &B, glm::dvec3 const &C) { - auto const edge{std::max({glm::distance(A, B), glm::distance(B, C), glm::distance(C, A)})}; - auto const steps{std::clamp(static_cast(std::ceil(edge / 0.5)), 1, 24)}; - for (int u = 0; u <= steps; ++u) - for (int v = 0; u + v <= steps; ++v) - { - auto const point{A + (B - A) * (static_cast(u) / steps) + (C - A) * (static_cast(v) / steps)}; - auto const found{Space.intrusion(point)}; - if (found.depth <= 0.0) - continue; - if (found.depth > hit.depth) - { - hit.depth = found.depth; - hit.point = point; - hit.track = found.span->track; - hit.path = found.span->path; - hit.direction = found.direction; - } - return; - } - }); - if (hit.depth > 0.0) - Hits.push_back(std::move(hit)); - } - std::sort(Hits.begin(), Hits.end(), [](auto const &Left, auto const &Right) { return Left.depth > Right.depth; }); + if (instance != nullptr) + scan_model(Space, *instance, Hits); + sort_hits(Hits); } // translucent tunnel of the gauge along the line, with the rings every 10 m and the lines along its corners @@ -431,6 +461,17 @@ bool edit_points(std::vector &Points) } // namespace +struct gauge_scan +{ + std::optional railway; + std::optional road; + std::vector lines; + std::optional space; // of the lines + std::size_t next{0}; // instance to check + float progress{0.f}; + std::chrono::steady_clock::time_point started; +}; + void editor_mode::gauge_load() { if (m_gauge.profiles.empty()) @@ -462,6 +503,8 @@ std::vector const &editor_mode::gauge_hits() const void editor_mode::update_gauge() { + if (m_gauge.scan) + step_gauge_map(); if (false == m_gauge.open) { if (false == EditorOverlay.batches.empty()) @@ -513,21 +556,51 @@ void editor_mode::scan_gauge(TTrack &Track) void editor_mode::scan_gauge_map() { gauge_load(); - auto const started{std::chrono::steady_clock::now()}; + auto scan{std::make_shared()}; + scan->started = std::chrono::steady_clock::now(); + auto const chosen{gauge_choice()}; + // copies, the outlines may be edited while it runs + scan->railway = chosen.railway != nullptr ? std::optional{*chosen.railway} : std::nullopt; + scan->road = chosen.road != nullptr ? std::optional{*chosen.road} : std::nullopt; + scan->lines = scenery_lines({scan->railway ? &*scan->railway : nullptr, scan->road ? &*scan->road : nullptr}); + scan->space.emplace(scan->lines); m_gauge.map = {}; - auto const choice{gauge_choice()}; - auto const lines{scenery_lines(choice)}; - corridor const space{lines}; - scan_models(space, m_gauge.map.hits); m_gauge.map.scanned = true; m_gauge.map.history = m_history.size(); auto const name{[](gauge::profile const *Profile) { return Profile != nullptr ? Profile->name : std::string{"-"}; }}; - m_gauge.map.profile = name(choice.railway) + ", " + name(choice.road); + m_gauge.map.profile = name(chosen.railway) + ", " + name(chosen.road); m_gauge.current = -1; m_gauge.published = false; - WriteLog("Structure gauge (" + m_gauge.map.profile + "): " + std::to_string(m_gauge.map.hits.size()) + " models enter it along " + std::to_string(lines.size()) + " lines, scanned in " + - std::to_string(std::chrono::duration_cast(std::chrono::steady_clock::now() - started).count()) + " ms"); - if (false == m_gauge.map.hits.empty()) + m_gauge.scan = std::move(scan); +} + +void editor_mode::step_gauge_map() +{ + auto &scan{*m_gauge.scan}; + auto const &instances{simulation::Instances.sequence()}; + auto const until{std::chrono::steady_clock::now() + gauge_slice}; + while (scan.next < instances.size() && std::chrono::steady_clock::now() < until) + { + if (auto *instance{instances[scan.next++]}) + scan_model(*scan.space, *instance, m_gauge.map.hits); + } + scan.progress = instances.empty() ? 1.f : static_cast(scan.next) / instances.size(); + if (scan.next >= instances.size()) + finish_gauge_map(); +} + +void editor_mode::finish_gauge_map() +{ + auto const scan{std::move(m_gauge.scan)}; + auto &hits{m_gauge.map.hits}; + // the hit the camera went to stays chosen + auto const chosen{m_gauge.current >= 0 && m_gauge.current < static_cast(hits.size()) ? std::optional{hits[m_gauge.current].point} : std::nullopt}; + sort_hits(hits); + if (chosen) + m_gauge.current = static_cast(std::find_if(hits.begin(), hits.end(), [&](auto const &Hit) { return Hit.point == *chosen; }) - hits.begin()); + WriteLog("Structure gauge (" + m_gauge.map.profile + "): " + std::to_string(hits.size()) + " models enter it along " + std::to_string(scan->lines.size()) + " lines, scanned in " + + std::to_string(std::chrono::duration_cast(std::chrono::steady_clock::now() - scan->started).count()) + " ms"); + if (false == chosen.has_value() && false == hits.empty()) gauge_focus(0); } @@ -620,11 +693,21 @@ void editor_mode::render_gauge_window() if (ImGui::IsItemHovered()) ImGui::SetTooltip("Clearance over the roads, from 0.5 m beyond the edges of the carriageway"); - if (ImGui::Button("Find the violations on the whole map")) + if (m_gauge.scan) + { + auto const label{format("Scanning the map %.0f%%, %zu found", m_gauge.scan->progress * 100.f, m_gauge.map.hits.size())}; + ImGui::ProgressBar(m_gauge.scan->progress, ImVec2(-70.0f, 0.0f), label.c_str()); + ImGui::SameLine(); + if (ImGui::SmallButton("Cancel")) + finish_gauge_map(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("Stops the scan and keeps the models found so far"); + } + else if (ImGui::Button("Find the violations on the whole map")) scan_gauge_map(); - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("Checks the models along all tracks of the scenery against the chosen gauge\nand lists them, the deepest first"); - if (m_gauge.map.scanned) + else if (ImGui::IsItemHovered()) + ImGui::SetTooltip("Checks the models along all tracks of the scenery against the chosen gauge\nand lists them, the deepest first.\nRuns in the background, the list fills up as it goes"); + if (m_gauge.map.scanned && false == static_cast(m_gauge.scan)) { ImGui::SameLine(); if (ImGui::SmallButton("Clear")) From 9bd8226c51439cb6267afea4af86ca9817105887 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 02:49:05 +0200 Subject: [PATCH 118/430] Fix the GCC 13 and MSVC builds: no brace-initialised reference from reference_wrapper, no near/far names --- application/editormodegauge.cpp | 4 ++-- application/editormodeinfra.cpp | 2 +- application/editormodetrack.cpp | 6 +++--- editor/editorTrack.cpp | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/application/editormodegauge.cpp b/application/editormodegauge.cpp index f10d42a4c..64ff2e613 100644 --- a/application/editormodegauge.cpp +++ b/application/editormodegauge.cpp @@ -189,7 +189,7 @@ public: } // whether the sphere may reach the gauge, roughly - bool near(glm::dvec3 const &Center, double const Radius) const + bool nearby(glm::dvec3 const &Center, double const Radius) const { auto const center{plan_of(Center)}; auto const reach{Radius + m_margin + region}; @@ -328,7 +328,7 @@ void scan_model(corridor const &Space, TAnimModel &Instance, std::vectorGetSMRoot() == nullptr) return; - if (false == Space.near(Instance.location(), Instance.radius())) + if (false == Space.nearby(Instance.location(), Instance.radius())) return; editor_mode::gauge_hit hit{Instance.name(), Instance.location()}; // the triangle enters the gauge when any point of a grid spread over it does diff --git a/application/editormodeinfra.cpp b/application/editormodeinfra.cpp index 67cf23334..ba3213ff4 100644 --- a/application/editormodeinfra.cpp +++ b/application/editormodeinfra.cpp @@ -359,7 +359,7 @@ bool nearest_beside(Areas_ const &Areas, glm::dvec3 const &Point, double const C auto best{-1.0}; for (auto const &entry : Areas) { - track_area const &area{entry}; + track_area const &area = entry; if (plan_distance(Point, area.centre) > area.radius + Corridor) continue; infra::station station; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 4e3b9a947..b3b2c8e25 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -3330,9 +3330,9 @@ bool editor_mode::start_curve_fit(editor_track::straight const &Line) return false; if (state.fit_before.reversals != 0 || state.fit_after.reversals != 0) return false; - auto const far = [](editor_track::curve const &Curve, glm::dvec3 const &Joint) { return editor_track::touches(*Curve.from, Joint) ? Curve.to : Curve.from; }; - m_route.from = far(state.fit_before, Line.start); - m_route.to = far(state.fit_after, Line.end); + auto const other_end = [](editor_track::curve const &Curve, glm::dvec3 const &Joint) { return editor_track::touches(*Curve.from, Joint) ? Curve.to : Curve.from; }; + m_route.from = other_end(state.fit_before, Line.start); + m_route.to = other_end(state.fit_after, Line.end); route_reset(); if (m_route.chain.tracks.empty()) return false; diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index d43d30438..c370bf2fe 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -1201,22 +1201,22 @@ editor_track::straight_run editor_track::straight_beyond(chain const &Chain, boo outward = false; else break; - auto const &far{path.points[outward ? segment_data::point::end : segment_data::point::start]}; + auto const &opposite{path.points[outward ? segment_data::point::end : segment_data::point::start]}; if (run.tracks.empty()) { - auto const own{glm::normalize(plan_of(far - joint))}; + auto const own{glm::normalize(plan_of(opposite - joint))}; if (std::abs(cross(direction, own)) > 0.01 || glm::dot(direction, own) <= 0.0) break; direction = own; } - auto const offset{plan_of(far) - origin}; + auto const offset{plan_of(opposite) - origin}; auto const along{glm::dot(offset, direction)}; if (along <= run.length + 1e-3 || std::abs(cross(direction, offset)) > Tolerance.offset) break; run.tracks.push_back(current); run.outward.push_back(outward); run.length = along; - joint = far; + joint = opposite; current = outward ? current->trNext : current->trPrev; } return run; From ceae93eec58a19b78df8e70fae0e23ed91f17a3c Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Sun, 4 Oct 2026 03:25:32 +0200 Subject: [PATCH 119/430] fix(roads): lane transitions drawn as road with an island or a closed zone, end faces and rounded island ends, closed zone stripes on curves, banks applied to the whole road; junction banks to the ground and pedestrian crossings --- application/editormode.h | 5 + application/editormoderoad.cpp | 228 +++++++-- editor/editorRoad.cpp | 9 + world/Road.cpp | 863 +++++++++++++++++++++++++++++---- world/Road.h | 22 +- 5 files changed, 995 insertions(+), 132 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index 104e260a5..50cd81119 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -562,6 +562,11 @@ class editor_mode : public application_mode bool render_road_material(char const *Label, char *Buffer, std::size_t const Size, std::string &Value); void render_junction_layout(junction_node &Junction); void junction_apply(junction_node &Junction, junction_node::state const &State); + // leads the banks of the corners of a junction to the ground beside it + void junction_bank_to_ground(junction_node &Junction); + // how far from specified point, and how far down, a slope of the grade set for the banks gets to the ground. + // Outwards: the way the slope leads, seen from above + std::pair bank_reach(glm::dvec3 const &Edge, glm::dvec3 const &Outwards); void draw_road_overlay() const; void update_road_tool(); void road_click(); diff --git a/application/editormoderoad.cpp b/application/editormoderoad.cpp index e588afe6d..d453b47e4 100644 --- a/application/editormoderoad.cpp +++ b/application/editormoderoad.cpp @@ -336,6 +336,8 @@ void editor_mode::junction_select(junction_node *Junction) copy_text(tool.surface, sizeof(tool.surface), Junction->definition().surface); copy_text(tool.sides[0], sizeof(tool.sides[0]), Junction->definition().side.material); copy_text(tool.kerbtext, sizeof(tool.kerbtext), Junction->definition().kerbmaterial); + copy_text(tool.banktext, sizeof(tool.banktext), Junction->definition().bankmaterial); + copy_text(tool.mediantext, sizeof(tool.mediantext), Junction->definition().medianmaterial); } void editor_mode::roadpoint_select(roadpoint_node *Point) @@ -771,6 +773,59 @@ void editor_mode::render_junction_layout(junction_node &Junction) ImGui::Unindent(); } + // banks leading from the corners to the ground + if (ImGui::CollapsingHeader("Banks to the ground")) + { + if (render_road_material("Bank material", tool.banktext, sizeof(tool.banktext), state.bankmaterial)) + changed = true; + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "What the banks are covered with next to a sidewalk, a kerb or the bare edge.\nA bank of a shoulder is covered with the material of the shoulder."); + ImGui::SetNextItemWidth(120.0f); + if (ImGui::InputFloat("Run for a metre of drop [m]", &tool.bankgrade, 0.25f, 0.5f, "%.2f")) + tool.bankgrade = std::clamp(tool.bankgrade, 0.25f, 10.0f); + if (ImGui::Button("Lead the banks to the ground")) + { + if (changed) + junction_apply(Junction, state); + junction_bank_to_ground(Junction); + return; + } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "Looks for the ground past each corner, at both roads the corner runs between,\n" + "and sets the bank of the corner to reach it. Done for the roads too, the banks meet at the ends of the roads."); + auto banked{false}; + for (auto const &arm : state.arms) + banked = banked || arm.bank.set; + if (banked) + { + ImGui::SameLine(); + if (ImGui::Button("Remove them")) + { + for (auto &arm : state.arms) + arm.bank = road_node::bank_data{}; + changed = true; + } + } + } + if (state.arms.size() == 2) + { + // where a road changes its lanes: what's between its two directions, if the roads keep them apart + ImGui::Separator(); + char const *mediantypes[]{"nothing, the ground shows", "surface closed to the traffic", "island"}; + int median{state.median == road_node::median_type::gap ? 0 : state.median == road_node::median_type::island ? 2 : 1}; + ImGui::SetNextItemWidth(220.0f); + if (ImGui::Combo("Between the directions", &median, mediantypes, 3)) + { + state.median = (median == 0 ? road_node::median_type::gap : median == 2 ? road_node::median_type::island : road_node::median_type::painted); + changed = true; + } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "Shows where a road which keeps its two directions apart meets this stretch:\n" + "what's between the directions is led on to the other road, where it closes or carries on."); + if (state.median == road_node::median_type::island && render_road_material("Island material", tool.mediantext, sizeof(tool.mediantext), state.medianmaterial)) + changed = true; + } + // the roads if (ImGui::CollapsingHeader("Roads of the junction", ImGuiTreeNodeFlags_DefaultOpen)) { @@ -782,9 +837,30 @@ void editor_mode::render_junction_layout(junction_node &Junction) ImGui::PushID(static_cast(arm)); auto &data{state.arms[arm]}; ImGui::Text("%d: %d in, %d out, %.2f m a lane", static_cast(arm) + 1, data.incoming, data.outgoing, data.width); - ImGui::SameLine(); - if (ImGui::Checkbox("Stop line", &data.stopline)) - changed = true; + if (state.arms.size() > 2) + { + ImGui::SameLine(); + if (ImGui::Checkbox("Stop line", &data.stopline)) + changed = true; + // stripes for the pedestrians, across the whole road where it meets the junction + ImGui::SameLine(); + bool zebra{data.crosswalk > 0.f}; + if (ImGui::Checkbox("Pedestrian crossing", &zebra)) + { + data.crosswalk = (zebra ? 4.f : 0.f); + changed = true; + } + if (zebra) + { + ImGui::SameLine(); + ImGui::SetNextItemWidth(90.0f); + if (ImGui::InputFloat("m##crosswalk", &data.crosswalk, 0.5f, 1.0f, "%.1f", ImGuiInputTextFlags_EnterReturnsTrue)) + { + data.crosswalk = std::clamp(data.crosswalk, 1.0f, 20.0f); + changed = true; + } + } + } if (data.incoming > 0 && state.arms.size() > 2) { ImGui::Indent(); @@ -1231,10 +1307,31 @@ void editor_mode::road_click() editor_road::carry_out(plan.end, record); } std::vector states; + // what changes from the start of a piece to its end is spread over the whole stretch being built, + // so the pieces don't each go through all of it + std::vector stations{0.0}; for (auto const &piece : pieces) + stations.emplace_back(stations.back() + editor_road::planar_length(piece)); + auto const along = [&stations](std::size_t const Index) { + auto const fraction{stations.back() > 0.0 ? stations[Index] / stations.back() : 0.0}; + return static_cast(fraction * fraction * (3.0 - 2.0 * fraction)); + }; + for (std::size_t index = 0; index < pieces.size(); ++index) { auto state{tool.settings}; - state.axis = piece; + state.axis = pieces[index]; + auto const from{along(index)}; + auto const to{along(index + 1)}; + auto const &median{tool.settings.median}; + state.median.width = {glm::mix(median.width[0], median.width[1], from), glm::mix(median.width[0], median.width[1], to)}; + // an island is rounded where the stretch starts and ends + state.median.round = {index == 0 ? median.round[0] : 0.f, index + 1 == pieces.size() ? median.round[1] : 0.f}; + for (std::size_t side = 0; side < state.banks.size(); ++side) + { + auto const &bank{tool.settings.banks[side]}; + state.banks[side].width = {glm::mix(bank.width[0], bank.width[1], from), glm::mix(bank.width[0], bank.width[1], to)}; + state.banks[side].drop = {glm::mix(bank.drop[0], bank.drop[1], from), glm::mix(bank.drop[0], bank.drop[1], to)}; + } states.emplace_back(state); } auto const created{editor_road::create(states)}; @@ -1279,6 +1376,8 @@ void editor_mode::road_apply() auto const pieces{tool.whole ? editor_road::chain(*tool.selected) : std::vector{tool.selected}}; editor_road::record record; std::vector> changes; + // the banks are kept for each piece as they are, unless it's the banks which were just changed + auto const banked{tool.settings.banks != tool.selected->definition().banks}; for (auto *road : pieces) { std::string reason; @@ -1295,9 +1394,12 @@ void editor_mode::road_apply() state.taper = road->definition().taper; if (road != tool.selected) { - // and so are the banks, and how far apart the two directions are led + // and so is how far apart the two directions are led, and the rounded ends of what's between them state.median.width = road->definition().median.width; - state.banks = road->definition().banks; + state.median.round = road->definition().median.round; + // banks led to the ground differ from piece to piece, so a change of something else leaves them alone + if (false == banked) + state.banks = road->definition().banks; } if (road != tool.selected && road->definition().changes.size() == state.changes.size()) { @@ -1417,6 +1519,69 @@ void editor_mode::road_roundabout(glm::dvec3 const &Ground) tool.status = "Roundabout made. Untick Roundabout and lead roads out of its side, or into it: the traffic joining it gives way to the traffic going around."; } +// how far from specified point, and how far down, a slope of the grade set for the banks gets to the ground +std::pair editor_mode::bank_reach(glm::dvec3 const &Edge, glm::dvec3 const &Outwards) +{ + auto const grade{std::clamp(static_cast(m_roadtool.bankgrade), 0.25, 10.0)}; + auto const steps{static_cast(kBankReach / kBankStep)}; + // the ground further and further from the edge, without the roads themselves + std::vector probes; + for (int step = 1; step <= steps; ++step) + probes.emplace_back(Edge + Outwards * (step * kBankStep)); + auto const ground{ground_heights(probes, true)}; + // the bank ends where a slope of the set grade, going down or up, gets to the ground + auto const rising{ground.front() > Edge.y}; + auto width{kBankReach}; + auto drop{Edge.y - ground.back()}; + for (int step = 1; step <= steps; ++step) + { + auto const reach{step * kBankStep}; + auto const height{ground[step - 1]}; + if (rising ? height <= Edge.y + reach / grade : height >= Edge.y - reach / grade) + { + width = reach; + drop = Edge.y - height; + break; + } + } + return {static_cast(width), static_cast(drop)}; +} + +// leads the banks of the corners of a junction to the ground beside it +void editor_mode::junction_bank_to_ground(junction_node &Junction) +{ + auto state{Junction.definition()}; + auto const order{state.arm_order()}; + auto const sided{state.side.type != road_node::side_type::none && state.side.width > 0.f}; + // where the banks start: past the kerb and whatever lines the corners + auto const lining{(state.kerbs ? state.kerbwidth : 0.f) + (sided ? state.side.width : 0.f)}; + auto const raised{sided && state.side.type == road_node::side_type::sidewalk ? state.kerbheight : 0.f}; + for (std::size_t idx = 0; idx < order.size(); ++idx) + { + // a corner starts at the left edge of a road, seen from the junction, and ends at the right edge of the next one + auto &arm{state.arms[order[idx]]}; + auto const &next{state.arms[order[(idx + 1) % order.size()]]}; + glm::dvec3 const outwards[2]{glm::dvec3{arm.direction.y, 0.0, -arm.direction.x}, -glm::dvec3{next.direction.y, 0.0, -next.direction.x}}; + glm::dvec3 const edges[2]{arm.position + outwards[0] * (0.5 * state.arm_width(order[idx]) + lining) + glm::dvec3{0.0, raised, 0.0}, + next.position + outwards[1] * (0.5 * state.arm_width(order[(idx + 1) % order.size()]) + lining) + glm::dvec3{0.0, raised, 0.0}}; + arm.bank.set = true; + for (int end = 0; end < 2; ++end) + { + auto const reach{bank_reach(edges[end], outwards[end])}; + arm.bank.width[end] = reach.first; + arm.bank.drop[end] = reach.second; + } + } + junction_apply(Junction, state); + auto &tool{m_roadtool}; + if (tool.status == "Changed") + { + tool.status = "Banks of the junction led to the ground."; + if ((false == sided || state.side.type != road_node::side_type::shoulder) && (state.bankmaterial.empty() || state.bankmaterial == "none")) + tool.status += " Pick a bank material to have them drawn."; + } +} + // leads the banks of the selected piece, or of the whole road, to the ground beside it void editor_mode::road_bank_to_ground() { @@ -1433,8 +1598,6 @@ void editor_mode::road_bank_to_ground() return; } } - auto const grade{std::clamp(static_cast(tool.bankgrade), 0.25, 10.0)}; - auto const steps{static_cast(kBankReach / kBankStep)}; std::vector> changes; for (auto *road : pieces) { @@ -1455,29 +1618,10 @@ void editor_mode::road_bank_to_ground() auto edge{state.point(t) + across * (0.5 * state.span(t) + (state.kerbs[side] ? state.kerbwidth : 0.f) + (sided ? data.width : 0.f))}; if (sided && data.type == road_node::side_type::sidewalk) edge.y += state.kerbheight; - // the ground further and further from the road, without the roads themselves - std::vector probes; - for (int step = 1; step <= steps; ++step) - probes.emplace_back(edge + across * (step * kBankStep)); - auto const ground{ground_heights(probes, true)}; - // the bank ends where a slope of the set grade, going down or up, gets to the ground - auto const rising{ground.front() > edge.y}; - auto width{kBankReach}; - auto drop{edge.y - ground.back()}; - for (int step = 1; step <= steps; ++step) - { - auto const reach{step * kBankStep}; - auto const height{ground[step - 1]}; - if (rising ? height <= edge.y + reach / grade : height >= edge.y - reach / grade) - { - width = reach; - drop = edge.y - height; - break; - } - } + auto const reach{bank_reach(edge, across)}; state.banks[side].set = true; - state.banks[side].width[end] = static_cast(width); - state.banks[side].drop[end] = static_cast(drop); + state.banks[side].width[end] = reach.first; + state.banks[side].drop[end] = reach.second; } } changes.emplace_back(road, state); @@ -1914,7 +2058,8 @@ bool editor_mode::render_road_layout(road_node::state &State) if (ImGui::CollapsingHeader("Banks to the ground")) { ImGui::TextDisabled("A slope from the edge of the road down, or up, to the ground."); - ImGui::TextDisabled("Set for each piece on its own, at its start and at its end."); + ImGui::TextDisabled("Set here it goes to every piece the changes go to; the button below"); + ImGui::TextDisabled("works out each piece on its own."); char const *banknames[]{"Bank on the left", "Bank on the right"}; for (int side = 0; side < 2; ++side) { @@ -1991,6 +2136,13 @@ bool editor_mode::render_road_layout(road_node::state &State) if (material("Island material", tool.mediantext, sizeof(tool.mediantext), State.median.material)) changed = true; ImGui::TextDisabled("The island is as high as the kerbs; with a kerb material set it gets kerbs of its own."); + if (number("Rounded at the start [m]", State.median.round[0], 0.5f, "%.2f")) + changed = true; + if (number("Rounded at the end [m]", State.median.round[1], 0.5f, "%.2f")) + changed = true; + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "Length of the rounded end of the island at that end of the piece; half of the width of the island makes it a half circle.\n" + "0: the island is cut straight, with a face. Use it where the next piece has no island."); } } @@ -2240,9 +2392,17 @@ void editor_mode::render_road_window() else if (tool.junction != nullptr) { auto &junction{*tool.junction}; - ImGui::Text("%s, %d roads, %d ways through", junction.name().c_str(), static_cast(junction.definition().arms.size()), static_cast(junction.movements().size())); - ImGui::TextDisabled("The ways through are made for the roads attached at the moment."); - ImGui::TextDisabled("Build tool, LMB on the junction: lead another road out of it"); + if (junction.definition().arms.size() == 2) + { + ImGui::Text("%s, a stretch where the road changes its lanes", junction.name().c_str()); + ImGui::TextDisabled("It's drawn as a part of the road, and leads the lanes of one side to the lanes of the other."); + } + else + { + ImGui::Text("%s, %d roads, %d ways through", junction.name().c_str(), static_cast(junction.definition().arms.size()), static_cast(junction.movements().size())); + ImGui::TextDisabled("The ways through are made for the roads attached at the moment."); + ImGui::TextDisabled("Build tool, LMB on the junction: lead another road out of it"); + } render_junction_layout(junction); if (ImGui::Button("Delete (Del)")) road_delete(); diff --git a/editor/editorRoad.cpp b/editor/editorRoad.cpp index 1f483e553..3fe9da2c9 100644 --- a/editor/editorRoad.cpp +++ b/editor/editorRoad.cpp @@ -141,6 +141,8 @@ road_node::state part(road_node::state const &State, double const From, double c result.taper = {static_cast(State.scale(From)), static_cast(State.scale(To))}; if (State.divided()) result.median.width = {static_cast(State.median_width(From)), static_cast(State.median_width(To))}; + // an island is rounded at the ends of the piece, not where the piece is cut + result.median.round = {From <= 0.0 ? State.median.round[0] : 0.f, To >= 1.0 ? State.median.round[1] : 0.f}; for (std::size_t side = 0; side < result.banks.size(); ++side) { auto const &bank{State.banks[side]}; @@ -337,6 +339,9 @@ void dress(junction_node::state &Junction, road_node::state const &Road) Junction.kerbs = (Road.kerbs[0] || Road.kerbs[1]); Junction.kerbwidth = Road.kerbwidth; Junction.kerbmaterial = Road.kerbmaterial; + Junction.bankmaterial = Road.bankmaterial; + Junction.median = Road.median.type; + Junction.medianmaterial = Road.median.material; Junction.slope = Road.slope; Junction.friction = Road.friction; Junction.sounddistance = Road.sounddistance; @@ -409,6 +414,7 @@ road_node::state flipped(road_node::state const &State) std::swap(result.sides[0], result.sides[1]); std::swap(result.taper[0], result.taper[1]); std::swap(result.median.width[0], result.median.width[1]); + std::swap(result.median.round[0], result.median.round[1]); std::swap(result.kerbs[0], result.kerbs[1]); std::swap(result.banks[0], result.banks[1]); for (auto &bank : result.banks) @@ -1110,6 +1116,7 @@ bool editor_road::dissolve(glm::dvec3 const &Joint, record &Record, std::string } merged.median.width[1] = (after.divided() ? after.median.width[1] : 0.f); } + merged.median.round[1] = after.median.round[1]; for (std::size_t side = 0; side < merged.banks.size(); ++side) { if (merged.banks[side].set && after.banks[side].set) @@ -1171,6 +1178,8 @@ road_node *editor_road::split(road_node &Road, double const T) first.median.width[1] = gap; second.median.width[0] = gap; } + first.median.round[1] = 0.f; + second.median.round[0] = 0.f; for (std::size_t side = 0; side < first.banks.size(); ++side) { auto const &bank{Road.definition().banks[side]}; diff --git a/world/Road.cpp b/world/Road.cpp index 9a8049332..f0e6193ef 100644 --- a/world/Road.cpp +++ b/world/Road.cpp @@ -273,6 +273,90 @@ void loft(std::vector &Output, road_axis const &Axis, std::vector< } } +// corner of a cross-section which changes along the road +struct section_corner +{ + double offset; // distance from the axis, positive to the left + double height; + float texture; +}; + +// stretches a profile whose corners move from one cross-section to the next along the axis. +// Shape: fills in the corners, left to right, for specified distance from the start of the axis; it has to give the same number of them each time +template +void sweep(std::vector &Output, road_axis const &Axis, std::vector const &Stations, double const Texturelength, Shape_ Shape) +{ + auto const normal = [](glm::dvec3 const &Tangent, glm::dvec3 const &Across) { + auto const result{glm::cross(Tangent, Across)}; + return glm::vec3{glm::length2(result) < 1e-12 ? up : glm::normalize(result)}; + }; + std::vector corners, previouscorners; + std::vector previous, current; + axis_frame previousframe; + double previousstation{0.0}; + for (std::size_t section = 0; section < Stations.size(); ++section) + { + auto const station{Stations[section]}; + auto const frame{Axis.at(station)}; + corners.clear(); + Shape(station, corners); + current.resize(corners.size()); + for (std::size_t idx = 0; idx < corners.size(); ++idx) + { + current[idx] = frame.position + frame.left * corners[idx].offset + up * corners[idx].height; + } + if (section > 0 && previous.size() == current.size()) + { + auto const texturestart{static_cast(previousstation / Texturelength)}; + auto const textureend{static_cast(station / Texturelength)}; + for (std::size_t idx = 0; idx + 1 < current.size(); ++idx) + { + auto const normalstart{normal(previousframe.tangent, previous[idx] - previous[idx + 1])}; + auto const normalend{normal(frame.tangent, current[idx] - current[idx + 1])}; + world_vertex const leftstart{previous[idx], normalstart, {previouscorners[idx].texture, texturestart}}; + world_vertex const rightstart{previous[idx + 1], normalstart, {previouscorners[idx + 1].texture, texturestart}}; + world_vertex const leftend{current[idx], normalend, {corners[idx].texture, textureend}}; + world_vertex const rightend{current[idx + 1], normalend, {corners[idx + 1].texture, textureend}}; + Output.push_back(leftstart); + Output.push_back(rightstart); + Output.push_back(leftend); + + Output.push_back(rightstart); + Output.push_back(rightend); + Output.push_back(leftend); + } + } + previous.swap(current); + previouscorners = corners; + previousframe = frame; + previousstation = station; + } +} + +// closes the end of something raised over the surface with a flat face. +// Corners: outline of the face; Forward: the face looks the way the axis goes rather than back along it +void cap(std::vector &Output, axis_frame const &Frame, std::vector const &Corners, bool const Forward, double const Tile) +{ + if (Corners.size() < 3) + { + return; + } + auto const facing{Forward ? Frame.tangent : -Frame.tangent}; + auto const point = [&Frame](section_corner const &Corner) { return Frame.position + Frame.left * Corner.offset + up * Corner.height; }; + for (std::size_t idx = 1; idx + 1 < Corners.size(); ++idx) + { + std::array order{0, idx, idx + 1}; + if (glm::dot(glm::cross(point(Corners[idx]) - point(Corners[0]), point(Corners[idx + 1]) - point(Corners[0])), facing) < 0.0) + { + std::swap(order[1], order[2]); + } + for (auto const corner : order) + { + Output.push_back({point(Corners[corner]), glm::vec3{facing}, {static_cast(Corners[corner].offset / Tile), static_cast(Corners[corner].height / Tile)}}); + } + } +} + // proportions of the image specified material is painted with float texture_ratio(std::string const &Material) { @@ -311,6 +395,10 @@ void road_node::state::normalize() { median.material = "none"; } + for (auto &round : median.round) + { + round = std::clamp(round, 0.f, 100.f); + } kerbwidth = std::clamp(kerbwidth, 0.05f, 2.f); if (kerbmaterial.empty()) { @@ -698,6 +786,12 @@ void road_node::import(cParser &Input, glm::dvec3 const &Offset) m_state.median.material = Input.getToken(); replace_slashes(m_state.median.material); } + else if (token == "medianround") + { + // medianround + Input.getTokens(2); + Input >> m_state.median.round[0] >> m_state.median.round[1]; + } else if (token == "kerbs") { // kerbs @@ -959,9 +1053,9 @@ std::vector road_node::create_shapes() const else { loft(surface, axis, {corner(halfwidth, 0.5), corner(divide, 0.5)}, 0.0, length, step, texturelength, road); - if (road.median.type == median_type::painted) + if (road.median.type != median_type::gap) { - // the surface carries on between the roadways + // the surface carries on between the roadways; an island stands on it, so there's something under its rounded ends loft(surface, axis, {corner(divide, 0.5), corner(divide, -0.5)}, 0.0, length, step, texturelength, road); } loft(surface, axis, {corner(divide, -0.5), corner(-halfwidth, -0.5)}, 0.0, length, step, texturelength, road); @@ -969,37 +1063,98 @@ std::vector road_node::create_shapes() const } // an island between the roadways: a kerb facing each of them, and what's between the kerbs - if (divided && road.median.type == median_type::island) + if (divided && road.median.type == median_type::island && length > 0.0) { auto const kerbed{usable(road.kerbmaterial)}; auto const covered{usable(road.median.material)}; - double const kerbwidth{kerbed ? road.kerbwidth : 0.0}; + // the ends of the island can be rounded; it gets narrower there along a quarter of an ellipse + std::array const nose{std::min(static_cast(road.median.round[0]), 0.5 * length), std::min(static_cast(road.median.round[1]), 0.5 * length)}; + int const nosesteps{8}; + double const quarter{1.5707963267948966}; + std::vector stations; + for (int idx = 0; idx < nosesteps && nose[0] > 0.0; ++idx) + { + stations.emplace_back(nose[0] * (1.0 - std::cos(quarter * idx / nosesteps))); + } + auto const body{length - nose[0] - nose[1]}; + auto const bodysteps{std::max(1, static_cast(std::ceil(body / step - 0.001)))}; + for (int idx = 0; idx <= bodysteps; ++idx) + { + stations.emplace_back(nose[0] + body * idx / bodysteps); + } + for (int idx = 1; idx <= nosesteps && nose[1] > 0.0; ++idx) + { + stations.emplace_back(length - nose[1] * (1.0 - std::sin(quarter * idx / nosesteps))); + } + // middle of the island and half of its width, for specified distance from the start of the axis + auto const middle = [&](double const Station) { return divide * glm::mix(static_cast(road.taper[0]), static_cast(road.taper[1]), taper_progress(Station / length)); }; + auto const half = [&](double const Station) { + auto result{0.5 * glm::mix(static_cast(road.median.width[0]), static_cast(road.median.width[1]), taper_progress(Station / length))}; + if (Station < nose[0]) + { + auto const along{(nose[0] - Station) / nose[0]}; + result *= std::sqrt(std::max(0.0, 1.0 - along * along)); + } + else if (Station > length - nose[1]) + { + auto const along{(Station - (length - nose[1])) / nose[1]}; + result *= std::sqrt(std::max(0.0, 1.0 - along * along)); + } + return result; + }; if (kerbed) { auto const tile{static_cast(texture_ratio(road.kerbmaterial)) * texturelength}; - auto const foot{0.f}; auto const top{static_cast(height / tile)}; - auto const inner{static_cast((height + kerbwidth) / tile)}; + auto const inner{static_cast((height + road.kerbwidth) / tile)}; auto &kerbs{vertices(road.kerbmaterial, lighting_data{})}; - loft(kerbs, axis, {{divide, 0.0, foot, 0.0, 0.5}, {divide, height, top, 0.0, 0.5}, {divide, height, inner, -kerbwidth, 0.5}}, 0.0, length, step, texturelength, road); - loft(kerbs, axis, {{divide, height, inner, kerbwidth, -0.5}, {divide, height, top, 0.0, -0.5}, {divide, 0.0, foot, 0.0, -0.5}}, 0.0, length, step, texturelength, road); + sweep(kerbs, axis, stations, texturelength, [&](double const Station, std::vector &Corners) { + auto const edge{middle(Station) + half(Station)}; + Corners = {{edge, 0.0, 0.f}, {edge, height, top}, {edge - std::min(static_cast(road.kerbwidth), half(Station)), height, inner}}; + }); + sweep(kerbs, axis, stations, texturelength, [&](double const Station, std::vector &Corners) { + auto const edge{middle(Station) - half(Station)}; + Corners = {{edge + std::min(static_cast(road.kerbwidth), half(Station)), height, inner}, {edge, height, top}, {edge, 0.0, 0.f}}; + }); } if (covered) { auto const tile{static_cast(texture_ratio(road.median.material)) * texturelength}; - std::vector profile; - if (false == kerbed) + sweep(vertices(road.median.material, lighting_data{}), axis, stations, texturelength, [&](double const Station, std::vector &Corners) { + auto const centre{middle(Station)}; + auto const reach{half(Station)}; + auto const inset{kerbed ? std::min(static_cast(road.kerbwidth), reach) : 0.0}; + Corners.clear(); + if (false == kerbed) + { + // without kerbs of their own material the sides of the island are covered with what its top is + Corners.push_back({centre + reach, 0.0, 0.f}); + } + Corners.push_back({centre + reach - inset, height, static_cast(height / tile)}); + Corners.push_back({centre - reach + inset, height, static_cast((height + 2.0 * reach) / tile)}); + if (false == kerbed) + { + Corners.push_back({centre - reach, 0.0, static_cast((2.0 * height + 2.0 * reach) / tile)}); + } + }); + } + // an end which isn't rounded gets a face, so the island isn't hollow where the next piece has none + if (kerbed || covered) + { + auto const &material{covered ? road.median.material : road.kerbmaterial}; + auto const tile{static_cast(texture_ratio(material)) * texturelength}; + for (int end = 0; end < 2; ++end) { - // without kerbs of their own material the sides of the island are covered with what its top is - profile.push_back({divide, 0.0, 0.f, 0.0, 0.5}); + auto const station{end == 0 ? 0.0 : length}; + auto const reach{half(station)}; + if (nose[end] > 0.0 || reach < 0.025) + { + continue; + } + auto const centre{middle(station)}; + std::vector const face{{centre + reach, 0.0, 0.f}, {centre + reach, height, 0.f}, {centre - reach, height, 0.f}, {centre - reach, 0.0, 0.f}}; + cap(vertices(material, lighting_data{}), axis.at(station), face, end == 1, tile); } - profile.push_back({divide, height, static_cast(height / tile), -kerbwidth, 0.5}); - profile.push_back({divide, height, static_cast((height + widest) / tile), kerbwidth, -0.5}); - if (false == kerbed) - { - profile.push_back({divide, 0.0, static_cast((2.0 * height + widest) / tile), 0.0, -0.5}); - } - loft(vertices(road.median.material, lighting_data{}), axis, profile, 0.0, length, step, texturelength, road); } } @@ -1026,12 +1181,24 @@ std::vector road_node::create_shapes() const } loft(vertices(Material, lighting_data{}), axis, Profile, 0.0, length, step, texturelength, road); }; + // faces closing what's raised over the surface at both ends of the piece, so it isn't hollow where the next piece has none. + // From, To: distances from the edge of the surface + auto const close = [&](std::string const &Material, double const From, double const To) { + auto const tile{static_cast(texture_ratio(Material)) * texturelength}; + for (int end = 0; end < 2; ++end) + { + auto const edge{direction * (halfwidth * road.taper[end] + (divided ? 0.5 * road.median.width[end] : 0.0))}; + cap(vertices(Material, lighting_data{}), axis.at(end == 0 ? 0.0 : length), + {{edge + direction * From, 0.0, 0.f}, {edge + direction * From, height, 0.f}, {edge + direction * To, height, 0.f}, {edge + direction * To, 0.0, 0.f}}, end == 1, tile); + } + }; double reach{0.0}; // how far from the edge of the surface the next thing starts double level{0.0}; // and how high if (kerbed) { auto const tile{static_cast(texture_ratio(road.kerbmaterial)) * texturelength}; double const width{road.kerbwidth}; + close(road.kerbmaterial, 0.0, width); std::vector kerb{{0.0, 0.0, 0.f, 0.0}, {0.0, height, static_cast(height / tile), 0.0}, {0.0, height, static_cast((height + width) / tile), width}}; if (false == sided || data.type != side_type::sidewalk) { @@ -1067,6 +1234,7 @@ std::vector road_node::create_shapes() const profile.push_back({0.0, height, static_cast(height / tile), reach}); profile.push_back({0.0, height, static_cast((height + data.width) / tile), reach + data.width}); emit(data.material, profile); + close(data.material, reach, reach + data.width); reach += data.width; level = height; } @@ -1179,18 +1347,24 @@ std::vector road_node::create_shapes() const auto const scale{glm::mix(static_cast(road.taper[0]), static_cast(road.taper[1]), taper_progress(station / length))}; return frame.position + frame.left * (divide * scale + Side * std::max(0.0, 0.5 * gap_at(station) - 2.0 * inset)) + up * line_lift; }; - for (auto station{0.5 * period}; station < length; station += period) + // the stripes are spread evenly over the piece, and none of them reaches past its ends + auto const count{std::max(1, static_cast(std::lround(length / period)))}; + auto const spacing{length / count}; + for (int index = 0; index < count; ++index) { - auto const gap{gap_at(station)}; + auto const centre{(index + 0.5) * spacing}; + auto const gap{gap_at(centre)}; if (gap < 1.0) { continue; } - // a stripe gets as far along the road as it gets across it + // a stripe gets as far along the road as it gets across it, as long as that leaves room for the next one + auto const slant{std::clamp(gap, 0.0, std::max(0.0, spacing - stripe - 0.25))}; + auto const station{centre - 0.5 * (slant + stripe)}; auto const leftstart{edge(station, 1.0)}; auto const leftend{edge(station + stripe, 1.0)}; - auto const rightstart{edge(station + gap, -1.0)}; - auto const rightend{edge(station + gap + stripe, -1.0)}; + auto const rightstart{edge(station + slant, -1.0)}; + auto const rightend{edge(station + slant + stripe, -1.0)}; lines.push_back({leftstart, upwards, {0.f, 0.f}}); lines.push_back({rightstart, upwards, {1.f, 0.f}}); lines.push_back({leftend, upwards, {0.f, 1.f}}); @@ -1235,6 +1409,94 @@ double const gate_commit{8.0}; // a vehicle let through this close to the juncti double const gate_patience{6.0}; // seconds a vehicle let through can stand still before the others stop waiting for it double const way_clearance{2.2}; // ways through a junction which pass this close to each other can't be taken at the same time +double const crosswalk_inset{1.0}; // distance of a pedestrian crossing from the end of its road, which leaves room for a stop line + +// corner of the cross-section of what lines the edge of a junction +struct edge_point +{ + double offset; // distance from the edge of the surface + double height; + float texture; + double grow{0.0}; // what the offset changes by along the edge, evenly + double sink{0.0}; // what the height changes by along the edge, evenly +}; + +// something which lines the edge of a junction: a kerb, a shoulder with its bank, a sidewalk, a bank +struct edge_lining +{ + std::string material; + std::vector profile; +}; + +// what the edge of a junction is lined with, from the edge outwards. Bank: slope leading to the ground from that edge +std::vector edge_linings(junction_node::state const &State, road_node::bank_data const &Bank) +{ + std::vector linings; + auto const usable = [](std::string const &Material) { return false == Material.empty() && Material != "none"; }; + auto const &side{State.side}; + auto const sided{side.type != road_node::side_type::none && side.width > 0.f && usable(side.material)}; + auto const kerbed{State.kerbs && usable(State.kerbmaterial)}; + double const height{State.kerbheight}; + double reach{0.0}; // how far from the edge of the surface the next thing starts + double level{0.0}; // and how high + if (kerbed) + { + auto const tile{static_cast(texture_ratio(State.kerbmaterial)) * State.texturelength}; + double const width{State.kerbwidth}; + edge_lining kerb; + kerb.material = State.kerbmaterial; + kerb.profile = {{0.0, 0.0, 0.f}, {0.0, height, static_cast(height / tile)}, {width, height, static_cast((height + width) / tile)}}; + if (false == sided || side.type != road_node::side_type::sidewalk) + { + // with nothing raised behind it the kerb has a back + kerb.profile.push_back({width, 0.0, static_cast((2.0 * height + width) / tile)}); + } + linings.emplace_back(kerb); + reach = width; + } + if (sided && side.type == road_node::side_type::shoulder) + { + edge_lining shoulder; + shoulder.material = side.material; + shoulder.profile = {{reach, 0.0, 1.f}, {reach + side.width, 0.0, 0.5f}}; + reach += side.width; + glm::dvec2 const start{Bank.set ? Bank.width[0] : State.slope.x, Bank.set ? Bank.drop[0] : State.slope.y}; + glm::dvec2 const end{Bank.set ? Bank.width[1] : State.slope.x, Bank.set ? Bank.drop[1] : State.slope.y}; + if (start.x > 0.0 || end.x > 0.0) + { + shoulder.profile.push_back({reach + start.x, -start.y, 0.f, end.x - start.x, start.y - end.y}); + } + linings.emplace_back(shoulder); + } + else if (sided) + { + auto const tile{static_cast(texture_ratio(side.material)) * State.texturelength}; + edge_lining sidewalk; + sidewalk.material = side.material; + if (false == kerbed) + { + sidewalk.profile.push_back({0.0, 0.0, 0.f}); + } + sidewalk.profile.push_back({reach, height, static_cast(height / tile)}); + sidewalk.profile.push_back({reach + side.width, height, static_cast((height + side.width) / tile)}); + linings.emplace_back(sidewalk); + reach += side.width; + level = height; + } + // a bank next to something other than a shoulder is covered with a material of its own + if ((false == sided || side.type != road_node::side_type::shoulder) && Bank.set && usable(State.bankmaterial) && (Bank.width[0] > 0.f || Bank.width[1] > 0.f)) + { + auto const tile{static_cast(texture_ratio(State.bankmaterial)) * State.texturelength}; + edge_lining bank; + bank.material = State.bankmaterial; + bank.profile = {{reach, level, 0.f}, {reach + Bank.width[0], level - Bank.drop[0], static_cast(std::max(Bank.width[0], Bank.width[1]) / tile)}}; + bank.profile.back().grow = static_cast(Bank.width[1]) - Bank.width[0]; + bank.profile.back().sink = static_cast(Bank.drop[0]) - Bank.drop[1]; + linings.emplace_back(bank); + } + return linings; +} + // direction on the ground as a vector in space glm::dvec3 flat(glm::dvec2 const &Direction) { @@ -1349,6 +1611,12 @@ void junction_node::state::normalize() arm.outgoing = std::clamp(arm.outgoing, 0, 8); arm.width = std::max(1.f, arm.width); arm.median = (arm.incoming > 0 && arm.outgoing > 0 ? std::clamp(arm.median, 0.f, 100.f) : 0.f); + arm.crosswalk = std::clamp(arm.crosswalk, 0.f, 20.f); + for (int end = 0; end < 2; ++end) + { + arm.bank.width[end] = std::clamp(arm.bank.width[end], 0.f, 100.f); + arm.bank.drop[end] = std::clamp(arm.bank.drop[end], -100.f, 100.f); + } arm.direction = (glm::length(arm.direction) > 1e-6 ? glm::normalize(arm.direction) : glm::dvec2{0.0, 1.0}); if (arm.turns.size() > static_cast(arm.incoming)) { @@ -1366,6 +1634,14 @@ void junction_node::state::normalize() { kerbmaterial = "none"; } + if (bankmaterial.empty()) + { + bankmaterial = "none"; + } + if (medianmaterial.empty()) + { + medianmaterial = "none"; + } slope = glm::max(slope, glm::vec2{0.f}); if (texturelength < 0.01f) { @@ -1476,6 +1752,8 @@ void junction_node::import(cParser &Input, glm::dvec3 const &Offset) // what's said about the arms may come ahead of them, so it waits until all is read std::vector> priorities; std::vector> medians; + std::vector> crosswalks; + std::vector> banks; struct turn_property { int arm; @@ -1565,6 +1843,38 @@ void junction_node::import(cParser &Input, glm::dvec3 const &Offset) Input >> number; priorities.emplace_back(number, Input.getToken()); } + else if (token == "crosswalk") + { + // crosswalk + int number{0}; + float length{0.f}; + Input.getTokens(2); + Input >> number >> length; + crosswalks.emplace_back(number, length); + } + else if (token == "cornerbank") + { + // cornerbank + int number{0}; + road_node::bank_data bank; + bank.set = true; + Input.getTokens(5); + Input >> number >> bank.width[0] >> bank.drop[0] >> bank.width[1] >> bank.drop[1]; + banks.emplace_back(number, bank); + } + else if (token == "bankmaterial") + { + m_state.bankmaterial = Input.getToken(); + replace_slashes(m_state.bankmaterial); + } + else if (token == "median") + { + // median + auto const type{Input.getToken()}; + m_state.median = (type == "gap" ? road_node::median_type::gap : type == "island" ? road_node::median_type::island : road_node::median_type::painted); + m_state.medianmaterial = Input.getToken(); + replace_slashes(m_state.medianmaterial); + } else if (token == "armmedian") { // armmedian @@ -1623,6 +1933,24 @@ void junction_node::import(cParser &Input, glm::dvec3 const &Offset) } m_state.arms[entry.first - 1].median = entry.second; } + for (auto const &entry : crosswalks) + { + if (entry.first < 1 || entry.first > static_cast(m_state.arms.size())) + { + ErrorLog("Bad junction: " + label + " has no arm " + std::to_string(entry.first) + " to paint a pedestrian crossing at"); + continue; + } + m_state.arms[entry.first - 1].crosswalk = entry.second; + } + for (auto const &entry : banks) + { + if (entry.first < 1 || entry.first > static_cast(m_state.arms.size())) + { + ErrorLog("Bad junction: " + label + " has no arm " + std::to_string(entry.first) + " to set the bank for"); + continue; + } + m_state.arms[entry.first - 1].bank = entry.second; + } for (auto const &entry : priorities) { if (entry.first < 1 || entry.first > static_cast(m_state.arms.size())) @@ -2336,9 +2664,318 @@ bool junction_node::occupied() const return std::any_of(m_links.begin(), m_links.end(), [](TTrack const *Track) { return Track != nullptr && false == Track->Dynamics.empty(); }); } +// geometry of a junction of two roads: a stretch of road, on which the lanes of one are led to the lanes of the other +std::vector junction_node::create_transition_shapes() const +{ + std::vector shapes; + auto const &arms{m_state.arms}; + auto const &from{arms[0]}; + auto const &to{arms[1]}; + // the way from the first road to the second, which leaves and joins them the way they go + auto const p0{from.position}; + auto const p3{to.position}; + auto const span{glm::distance(p0, p3)}; + if (span < 0.1) + { + return shapes; + } + auto const p1{p0 - flat(from.direction) * (0.39 * span)}; + auto const p2{p3 - flat(to.direction) * (0.39 * span)}; + // edges of the two roadways as distances from that way, positive to the left of it. at the first road the lanes + // leading into the junction go the way the stretch does, at the second one it's the lanes leading out of it + struct edges + { + double right; + double forward; // edge of the roadway going along the way, on the side of the other one + double backward; // edge of the roadway going against it, on the side of the other one + double left; + double lanewidth; + }; + auto const width0{m_state.arm_width(0)}; + auto const width1{m_state.arm_width(1)}; + edges const start{-0.5 * width0, -0.5 * width0 + from.incoming * from.width, 0.5 * width0 - from.outgoing * from.width, 0.5 * width0, from.width}; + edges const end{-0.5 * width1, -0.5 * width1 + to.outgoing * to.width, 0.5 * width1 - to.incoming * to.width, 0.5 * width1, to.width}; + struct section + { + glm::dvec3 position; + glm::dvec3 left; + glm::dvec3 tangent; + double station; + double fraction; + edges offsets; + }; + auto const at = [&](double const T) { + section result; + auto const u{1.0 - T}; + result.position = u * u * u * p0 + 3.0 * u * u * T * p1 + 3.0 * u * T * T * p2 + T * T * T * p3; + auto const direction{3.0 * u * u * (p1 - p0) + 6.0 * u * T * (p2 - p1) + 3.0 * T * T * (p3 - p2)}; + glm::dvec2 const heading{direction.x, direction.z}; + result.tangent = (glm::length2(direction) > 1e-12 ? glm::normalize(direction) : flat(to.direction)); + result.left = flat(left_of(glm::length(heading) > 1e-9 ? glm::normalize(heading) : to.direction)); + // the edges get from where they are at one road to where they are at the other the way the edges of a road which changes its width do + auto const blend{taper_progress(T)}; + result.offsets = {glm::mix(start.right, end.right, blend), glm::mix(start.forward, end.forward, blend), glm::mix(start.backward, end.backward, blend), glm::mix(start.left, end.left, blend), + glm::mix(start.lanewidth, end.lanewidth, blend)}; + result.station = 0.0; + result.fraction = T; + return result; + }; + auto const steps{std::clamp(static_cast(span / 2.0), 8, 32)}; + std::vector
sections; + for (int idx = 0; idx <= steps; ++idx) + { + sections.emplace_back(at(static_cast(idx) / steps)); + if (idx > 0) + { + sections[idx].station = sections[idx - 1].station + glm::distance(sections[idx - 1].position, sections[idx].position); + } + } + auto const length{sections.back().station}; + + // triangles are gathered separately for each look + struct batch + { + std::string material; + lighting_data lighting; + std::vector vertices; + }; + std::vector batches; + auto const vertices = [&batches](std::string const &Material, lighting_data const &Lighting) -> std::vector & { + for (auto &entry : batches) + { + if (entry.material == Material && entry.lighting == Lighting) + { + return entry.vertices; + } + } + batches.emplace_back(); + batches.back().material = Material; + batches.back().lighting = Lighting; + return batches.back().vertices; + }; + auto const usable = [](std::string const &Material) { return false == Material.empty() && Material != "none"; }; + auto const place = [](section const &Section, section_corner const &Corner) { return Section.position + Section.left * Corner.offset + up * Corner.height; }; + // a band of triangles between two lines running along the stretch, from a section to another. + // Left, Right: give the distance from the way, the height and the texture coordinate of each line at a section + auto const strip = [&](std::vector &Output, auto const &Left, auto const &Right, std::size_t const First, std::size_t const Last) { + for (auto idx{First}; idx < Last && idx + 1 < sections.size(); ++idx) + { + auto const &here{sections[idx]}; + auto const &there{sections[idx + 1]}; + section_corner const left0{Left(here)}; + section_corner const right0{Right(here)}; + section_corner const left1{Left(there)}; + section_corner const right1{Right(there)}; + auto const leftstart{place(here, left0)}; + auto const rightstart{place(here, right0)}; + auto const leftend{place(there, left1)}; + auto const rightend{place(there, right1)}; + auto const facing{glm::cross(here.tangent, leftstart - rightstart)}; + glm::vec3 const normal{glm::length2(facing) < 1e-12 ? up : glm::normalize(facing)}; + auto const texturestart{static_cast(here.station / m_state.texturelength)}; + auto const textureend{static_cast(there.station / m_state.texturelength)}; + Output.push_back({leftstart, normal, {left0.texture, texturestart}}); + Output.push_back({rightstart, normal, {right0.texture, texturestart}}); + Output.push_back({leftend, normal, {left1.texture, textureend}}); + Output.push_back({rightstart, normal, {right0.texture, texturestart}}); + Output.push_back({rightend, normal, {right1.texture, textureend}}); + Output.push_back({leftend, normal, {left1.texture, textureend}}); + } + }; + auto const whole{sections.size() - 1}; + // the two directions are apart at either road + auto const apart{from.median > 0.f || to.median > 0.f}; + auto const forth{from.incoming > 0 || to.outgoing > 0}; + auto const back{from.outgoing > 0 || to.incoming > 0}; + double const height{m_state.kerbheight}; + + // surface. the image is centered on the way, like it is on a road + if (m_state.surface != "none") + { + auto const tile{static_cast(texture_ratio(m_state.surface)) * m_state.texturelength}; + auto const along = [tile](double edges::*Edge) { + return [tile, Edge](section const &Section) { return section_corner{Section.offsets.*Edge, 0.0, static_cast(0.5 + Section.offsets.*Edge / tile)}; }; + }; + auto &surface{vertices(m_state.surface, lighting_data{})}; + if (apart && m_state.median == road_node::median_type::gap) + { + // a roadway for each direction, with the ground showing between them + strip(surface, along(&edges::forward), along(&edges::right), 0, whole); + strip(surface, along(&edges::left), along(&edges::backward), 0, whole); + } + else + { + strip(surface, along(&edges::left), along(&edges::right), 0, whole); + } + } + // an island where the two directions part + if (apart && m_state.median == road_node::median_type::island && (usable(m_state.medianmaterial) || (m_state.kerbs && usable(m_state.kerbmaterial)))) + { + auto const &material{usable(m_state.medianmaterial) ? m_state.medianmaterial : m_state.kerbmaterial}; + auto const tile{static_cast(texture_ratio(material)) * m_state.texturelength}; + auto const widest{std::max(from.median, to.median)}; + auto &island{vertices(material, lighting_data{})}; + auto const corner = [](double edges::*Edge, double const Height, float const Texture) { + return [Edge, Height, Texture](section const &Section) { return section_corner{Section.offsets.*Edge, Height, Texture}; }; + }; + auto const top{static_cast(height / tile)}; + auto const across{static_cast((height + widest) / tile)}; + strip(island, corner(&edges::backward, 0.0, 0.f), corner(&edges::backward, height, top), 0, whole); + strip(island, corner(&edges::backward, height, top), corner(&edges::forward, height, across), 0, whole); + strip(island, corner(&edges::forward, height, across), corner(&edges::forward, 0.0, static_cast((2.0 * height + widest) / tile)), 0, whole); + } + // what lines the edges: the same the corners of a junction of more roads get. the right edge is the corner which starts + // at the first road, the left one is the corner which starts at the second road, so it's gone along backwards + for (int side = 0; side < 2; ++side) + { + auto const sign{side == 0 ? -1.0 : 1.0}; + for (auto const &lining : edge_linings(m_state, arms[side].bank)) + { + auto &output{vertices(lining.material, lighting_data{})}; + for (std::size_t band = 0; band + 1 < lining.profile.size(); ++band) + { + auto const corner = [side, sign](edge_point const &Point) { + return [sign, &Point, side](section const &Section) { + auto const fraction{side == 0 ? Section.fraction : 1.0 - Section.fraction}; + auto const edge{side == 0 ? Section.offsets.right : Section.offsets.left}; + return section_corner{edge + sign * (Point.offset + Point.grow * fraction), Point.height + Point.sink * fraction, Point.texture}; + }; + }; + auto const inner{corner(lining.profile[band])}; + auto const outer{corner(lining.profile[band + 1])}; + if (side == 0) + { + strip(output, inner, outer, 0, whole); + } + else + { + strip(output, outer, inner, 0, whole); + } + } + } + } + + // markings + if (m_state.markings != road_node::marking_colour::none) + { + lighting_data paint; + paint.diffuse = (m_state.markings == road_node::marking_colour::white ? glm::vec4{0.92f, 0.92f, 0.92f, 1.f} : glm::vec4{0.95f, 0.5f, 0.08f, 1.f}); + paint.ambient = paint.diffuse; + auto &lines{vertices("colored", paint)}; + // a line running at some distance from one of the edges + auto const line = [&](double edges::*Edge, double const Shift, double const Lanes, std::size_t const First, std::size_t const Last) { + auto const side = [Edge, Shift, Lanes](double const Half, float const Texture) { + return [Edge, Shift, Lanes, Half, Texture](section const &Section) { + return section_corner{Section.offsets.*Edge + Shift + Lanes * Section.offsets.lanewidth + Half, line_lift, Texture}; + }; + }; + strip(lines, side(0.5 * line_width, 0.f), side(-0.5 * line_width, 1.f), First, Last); + }; + auto const inset{edge_inset + 0.5 * line_width}; + line(&edges::right, inset, 0.0, 0, whole); + line(&edges::left, -inset, 0.0, 0, whole); + if (forth && back) + { + if (apart) + { + // each of the two roadways gets its edge line + line(&edges::forward, -inset, 0.0, 0, whole); + line(&edges::backward, inset, 0.0, 0, whole); + } + else + { + // traffic going opposite ways is kept apart with a double line + auto const pair{0.5 * (line_width + line_spacing)}; + line(&edges::forward, pair, 0.0, 0, whole); + line(&edges::forward, -pair, 0.0, 0, whole); + } + } + // lines between the lanes of each direction, dashed. the lanes are counted from the middle of the road, so the ones + // both roads have run all the way; a line of a lane only one of them has starts where the roadway got wide enough for the lane + for (int direction = 0; direction < 2; ++direction) + { + auto const lanes{direction == 0 ? std::max(from.incoming, to.outgoing) : std::max(from.outgoing, to.incoming)}; + for (int lane = 1; lane < lanes; ++lane) + { + for (std::size_t idx = 0; idx < whole; ++idx) + { + if (std::fmod(sections[idx].station, dash_period) >= dash_period / 3.0) + { + continue; + } + auto const room = [&](section const &Section) { + auto const &offsets{Section.offsets}; + return (direction == 0 ? offsets.forward - offsets.right : offsets.left - offsets.backward) >= (lane + 0.5) * offsets.lanewidth; + }; + if (room(sections[idx]) && room(sections[idx + 1])) + { + line(direction == 0 ? &edges::forward : &edges::backward, 0.0, direction == 0 ? -lane : lane, idx, idx + 1); + } + } + } + } + if (apart && m_state.median == road_node::median_type::painted && length > 0.0) + { + // what's between the roadways is closed to the traffic: slanted stripes are led from one edge line to the other + double const period{3.0}; + double const stripe{0.5}; + glm::vec3 const upwards{0.f, 1.f, 0.f}; + // point of the edge of one of the roadways, a bit into what's between them + auto const edge = [&](double const Station, bool const Left) { + auto const where{at(std::clamp(Station / length, 0.0, 1.0))}; + auto const gap{where.offsets.backward - where.offsets.forward}; + auto const margin{std::min(2.0 * inset, 0.5 * gap)}; + return where.position + where.left * (Left ? where.offsets.backward - margin : where.offsets.forward + margin) + up * line_lift; + }; + auto const count{std::max(1, static_cast(std::lround(length / period)))}; + auto const spacing{length / count}; + for (int index = 0; index < count; ++index) + { + auto const centre{(index + 0.5) * spacing}; + auto const middle{at(std::clamp(centre / length, 0.0, 1.0))}; + auto const gap{middle.offsets.backward - middle.offsets.forward}; + if (gap < 1.0) + { + continue; + } + auto const slant{std::clamp(gap, 0.0, std::max(0.0, spacing - stripe - 0.25))}; + auto const station{centre - 0.5 * (slant + stripe)}; + auto const leftstart{edge(station, true)}; + auto const leftend{edge(station + stripe, true)}; + auto const rightstart{edge(station + slant, false)}; + auto const rightend{edge(station + slant + stripe, false)}; + lines.push_back({leftstart, upwards, {0.f, 0.f}}); + lines.push_back({rightstart, upwards, {1.f, 0.f}}); + lines.push_back({leftend, upwards, {0.f, 1.f}}); + lines.push_back({rightstart, upwards, {1.f, 0.f}}); + lines.push_back({rightend, upwards, {1.f, 1.f}}); + lines.push_back({leftend, upwards, {0.f, 1.f}}); + } + } + } + + for (auto &entry : batches) + { + if (entry.vertices.empty()) + { + continue; + } + scene::shape_node shape; + shape.make_terrain(GfxRenderer->Fetch_Material(entry.material), std::move(entry.vertices), glm::dvec3{0.0}); + shape.lighting(entry.lighting); + shapes.emplace_back(std::move(shape)); + } + return shapes; +} + // generates geometry of the surface std::vector junction_node::create_shapes() const { + if (m_state.arms.size() == 2) + { + // where a road changes its lanes it's drawn as a stretch of that road + return create_transition_shapes(); + } std::vector shapes; std::vector> corners; auto const points{m_state.outline(&corners)}; @@ -2376,16 +3013,22 @@ std::vector junction_node::create_shapes() const shapes.emplace_back(std::move(shape)); } } - // the corners are lined the way the edges of a road are, so the kerbs, the shoulders and the sidewalks of the roads carry on around the junction - struct corner_point + // the corners are lined the way the edges of a road are, so the kerbs, the shoulders, the sidewalks and the banks of the roads carry on around the junction { - double offset; // distance from the edge of the surface - double height; - float texture; - }; - auto const line_corners = [&](std::string const &Material, std::vector const &Profile) { auto const order{m_state.arm_order()}; - std::vector vertices; + // triangles are gathered for each material, in the order the materials come up + std::vector>> lined; + auto const batch = [&lined](std::string const &Material) -> std::vector & { + for (auto &entry : lined) + { + if (entry.first == Material) + { + return entry.second; + } + } + lined.emplace_back(Material, std::vector{}); + return lined.back().second; + }; for (std::size_t idx = 0; idx < corners.size() && idx < order.size(); ++idx) { auto const &corner{corners[idx]}; @@ -2404,81 +3047,56 @@ std::vector junction_node::create_shapes() const glm::dvec2 const along{corner[point + 1].x - corner[point - 1].x, corner[point + 1].z - corner[point - 1].z}; outwards[point] = (glm::length(along) > 1e-9 ? -flat(left_of(glm::normalize(along))) : outwards[point - 1]); } - double station{0.0}; + double total{0.0}; for (std::size_t point = 0; point + 1 < corner.size(); ++point) { - auto const length{glm::distance(corner[point], corner[point + 1])}; - auto const tangent{corner[point + 1] - corner[point]}; - auto const texturestart{static_cast(station / m_state.texturelength)}; - auto const textureend{static_cast((station + length) / m_state.texturelength)}; - for (std::size_t band = 0; band + 1 < Profile.size(); ++band) + total += glm::distance(corner[point], corner[point + 1]); + } + // the bank of the corner is the one set for the road the corner starts at + for (auto const &lining : edge_linings(m_state, m_state.arms[order[idx]].bank)) + { + auto &vertices{batch(lining.material)}; + auto const &profile{lining.profile}; + double station{0.0}; + for (std::size_t point = 0; point + 1 < corner.size(); ++point) { - auto const &inner{Profile[band]}; - auto const &outer{Profile[band + 1]}; - auto const leftstart{corner[point] + outwards[point] * inner.offset + up * inner.height}; - auto const rightstart{corner[point] + outwards[point] * outer.offset + up * outer.height}; - auto const leftend{corner[point + 1] + outwards[point + 1] * inner.offset + up * inner.height}; - auto const rightend{corner[point + 1] + outwards[point + 1] * outer.offset + up * outer.height}; - auto facing{glm::cross(tangent, leftstart - rightstart)}; - glm::vec3 const normal{glm::length2(facing) < 1e-12 ? up : glm::normalize(facing)}; - vertices.push_back({leftstart, normal, {inner.texture, texturestart}}); - vertices.push_back({rightstart, normal, {outer.texture, texturestart}}); - vertices.push_back({leftend, normal, {inner.texture, textureend}}); - vertices.push_back({rightstart, normal, {outer.texture, texturestart}}); - vertices.push_back({rightend, normal, {outer.texture, textureend}}); - vertices.push_back({leftend, normal, {inner.texture, textureend}}); + auto const length{glm::distance(corner[point], corner[point + 1])}; + auto const tangent{corner[point + 1] - corner[point]}; + auto const texturestart{static_cast(station / m_state.texturelength)}; + auto const textureend{static_cast((station + length) / m_state.texturelength)}; + auto const fractionstart{total > 0.0 ? station / total : 0.0}; + auto const fractionend{total > 0.0 ? (station + length) / total : 0.0}; + for (std::size_t band = 0; band + 1 < profile.size(); ++band) + { + auto const &inner{profile[band]}; + auto const &outer{profile[band + 1]}; + auto const leftstart{corner[point] + outwards[point] * (inner.offset + inner.grow * fractionstart) + up * (inner.height + inner.sink * fractionstart)}; + auto const rightstart{corner[point] + outwards[point] * (outer.offset + outer.grow * fractionstart) + up * (outer.height + outer.sink * fractionstart)}; + auto const leftend{corner[point + 1] + outwards[point + 1] * (inner.offset + inner.grow * fractionend) + up * (inner.height + inner.sink * fractionend)}; + auto const rightend{corner[point + 1] + outwards[point + 1] * (outer.offset + outer.grow * fractionend) + up * (outer.height + outer.sink * fractionend)}; + auto facing{glm::cross(tangent, leftstart - rightstart)}; + glm::vec3 const normal{glm::length2(facing) < 1e-12 ? up : glm::normalize(facing)}; + vertices.push_back({leftstart, normal, {inner.texture, texturestart}}); + vertices.push_back({rightstart, normal, {outer.texture, texturestart}}); + vertices.push_back({leftend, normal, {inner.texture, textureend}}); + vertices.push_back({rightstart, normal, {outer.texture, texturestart}}); + vertices.push_back({rightend, normal, {outer.texture, textureend}}); + vertices.push_back({leftend, normal, {inner.texture, textureend}}); + } + station += length; } - station += length; } } - if (false == vertices.empty()) + for (auto &entry : lined) { + if (entry.second.empty()) + { + continue; + } scene::shape_node shape; - shape.make_terrain(GfxRenderer->Fetch_Material(Material), std::move(vertices), glm::dvec3{0.0}); + shape.make_terrain(GfxRenderer->Fetch_Material(entry.first), std::move(entry.second), glm::dvec3{0.0}); shapes.emplace_back(std::move(shape)); } - }; - auto const &side{m_state.side}; - auto const sided{side.type != road_node::side_type::none && side.width > 0.f && false == side.material.empty() && side.material != "none"}; - auto const kerbed{m_state.kerbs && false == m_state.kerbmaterial.empty() && m_state.kerbmaterial != "none"}; - double const height{m_state.kerbheight}; - double reach{0.0}; // how far from the edge of the surface the side starts - if (kerbed) - { - auto const tile{static_cast(texture_ratio(m_state.kerbmaterial)) * m_state.texturelength}; - double const width{m_state.kerbwidth}; - std::vector kerb{{0.0, 0.0, 0.f}, {0.0, height, static_cast(height / tile)}, {width, height, static_cast((height + width) / tile)}}; - if (false == sided || side.type != road_node::side_type::sidewalk) - { - // with nothing raised behind it the kerb has a back - kerb.push_back({width, 0.0, static_cast((2.0 * height + width) / tile)}); - } - line_corners(m_state.kerbmaterial, kerb); - reach = width; - } - if (sided) - { - std::vector profile; - if (side.type == road_node::side_type::shoulder) - { - profile.push_back({reach, 0.0, 1.f}); - profile.push_back({reach + side.width, 0.0, 0.5f}); - if (m_state.slope.x > 0.f) - { - profile.push_back({reach + side.width + m_state.slope.x, -m_state.slope.y, 0.f}); - } - } - else - { - auto const tile{static_cast(texture_ratio(side.material)) * m_state.texturelength}; - if (false == kerbed) - { - profile.push_back({0.0, 0.0, 0.f}); - } - profile.push_back({reach, height, static_cast(height / tile)}); - profile.push_back({reach + side.width, height, static_cast((height + side.width) / tile)}); - } - line_corners(side.material, profile); } if (m_state.markings != road_node::marking_colour::none) { @@ -2510,6 +3128,35 @@ std::vector junction_node::create_shapes() const vertices.push_back({rightend, upwards, {1.f, 1.f}}); vertices.push_back({leftend, upwards, {0.f, 1.f}}); } + for (std::size_t arm = 0; arm < arms.size(); ++arm) + { + if (arms[arm].crosswalk <= 0.f) + { + continue; + } + // a pedestrian crossing: stripes laid the way the road goes, side by side across it, past the place for a stop line + auto const across{flat(left_of(arms[arm].direction))}; + auto const inwards{-flat(arms[arm].direction)}; + auto const reach{0.5 * m_state.arm_width(arm) - edge_inset}; + auto const stripes{std::max(1, static_cast(std::floor((2.0 * reach + stopline_width) / (2.0 * stopline_width))))}; + auto const first{-0.5 * (stripes * 2 - 1) * stopline_width}; + for (int stripe = 0; stripe < stripes; ++stripe) + { + auto const offset{first + stripe * 2.0 * stopline_width}; + auto const from{arms[arm].position + across * offset + lift}; + auto const to{arms[arm].position + across * (offset + stopline_width) + lift}; + auto const leftstart{from + inwards * (crosswalk_inset + arms[arm].crosswalk)}; + auto const rightstart{from + inwards * crosswalk_inset}; + auto const leftend{to + inwards * (crosswalk_inset + arms[arm].crosswalk)}; + auto const rightend{to + inwards * crosswalk_inset}; + vertices.push_back({leftstart, upwards, {0.f, 0.f}}); + vertices.push_back({rightstart, upwards, {1.f, 0.f}}); + vertices.push_back({leftend, upwards, {0.f, 1.f}}); + vertices.push_back({rightstart, upwards, {1.f, 0.f}}); + vertices.push_back({rightend, upwards, {1.f, 1.f}}); + vertices.push_back({leftend, upwards, {0.f, 1.f}}); + } + } if (arms.size() == 2 && arms[0].incoming > 0 && arms[0].outgoing > 0 && arms[1].incoming > 0 && arms[1].outgoing > 0) { // a junction of two roads is where a road changes its lanes. the double line keeping the directions apart is led through it @@ -2672,6 +3319,15 @@ void junction_node::export_as_text_(std::ostream &Output) const { Output << "armmedian " << arm + 1 << ' ' << m_state.arms[arm].median << ' '; } + if (m_state.arms[arm].crosswalk > 0.f) + { + Output << "crosswalk " << arm + 1 << ' ' << m_state.arms[arm].crosswalk << ' '; + } + auto const &bank{m_state.arms[arm].bank}; + if (bank.set) + { + Output << "cornerbank " << arm + 1 << ' ' << bank.width[0] << ' ' << bank.drop[0] << ' ' << bank.width[1] << ' ' << bank.drop[1] << ' '; + } auto const priority{m_state.arms[arm].priority}; if (priority != right_of_way::none) { @@ -2687,6 +3343,15 @@ void junction_node::export_as_text_(std::ostream &Output) const } } } + if (m_state.bankmaterial != "none") + { + Output << "bankmaterial " << m_state.bankmaterial << ' '; + } + if (m_state.arms.size() == 2 && (m_state.arms[0].median > 0.f || m_state.arms[1].median > 0.f)) + { + Output << "median " << (m_state.median == road_node::median_type::gap ? "gap" : m_state.median == road_node::median_type::island ? "island" : "painted") << ' '; + Output << m_state.medianmaterial << ' '; + } Output << "velocity " << m_state.velocity << ' ' << "friction " << m_state.friction << ' ' << "environment " << m_state.environment << ' '; Output << "endjunction" << "\n"; @@ -2821,6 +3486,10 @@ void road_node::export_as_text_(std::ostream &Output) const { Output << "median " << (road.median.type == median_type::gap ? "gap" : road.median.type == median_type::island ? "island" : "painted") << ' '; Output << road.median.width[0] << ' ' << road.median.width[1] << ' ' << road.median.material << ' '; + if (road.median.round[0] > 0.f || road.median.round[1] > 0.f) + { + Output << "medianround " << road.median.round[0] << ' ' << road.median.round[1] << ' '; + } } if (road.kerbs[0] || road.kerbs[1]) { diff --git a/world/Road.h b/world/Road.h index 99e85fcda..de83bf4d1 100644 --- a/world/Road.h +++ b/world/Road.h @@ -56,6 +56,7 @@ class owned_shapes // scenery entry: // node road [ ]... endroad // properties, past the ones of the lanes and the look: median , +// medianround , // kerbs , bank , // bankmaterial , weight , roundabout class road_node : public scene::basic_node @@ -106,6 +107,7 @@ class road_node : public scene::basic_node median_type type{median_type::painted}; std::array width{0.f, 0.f}; // at the start and at the end of the axis std::string material{"none"}; // what an island is covered with + std::array round{0.f, 0.f}; // length of the rounded end of an island, at the start and at the end of the axis. 0: the island is cut straight }; // slope leading from the edge of the road down, or up, to the ground struct bank_data @@ -113,6 +115,11 @@ class road_node : public scene::basic_node bool set{false}; // false: a shoulder gets the bank the road gives to all its shoulders, anything else gets none std::array width{0.f, 0.f}; // at the start and at the end of the axis std::array drop{0.f, 0.f}; // how far below the edge of the road it ends; negative if it rises + + bool operator==(bank_data const &Other) const + { + return set == Other.set && width == Other.width && drop == Other.drop; + } }; // everything the scenery says about the road. the lanes go left to right when facing along the axis: // the ones going against it, outermost first, then the ones going along it @@ -253,7 +260,10 @@ class road_node : public scene::basic_node // properties: surface , texlength , markings , side , kerb , // slope , stopline , velocity , friction , environment , // priority , turns , -// armmedian , kerbs +// armmedian , kerbs , +// cornerbank (at that road, then at the next one), bankmaterial , +// crosswalk , median +// a junction of two roads is drawn as a stretch of road, on which the lanes of one are led to the lanes of the other // the arms don't have to be level with each other: the surface is spanned between their ends and the centre. // the junction also tells the vehicles when to wait: the ones which have to give way wait for the ones with the right of way, // and where neither has it, for the ones coming from their right, or from the opposite side when turning left across their way @@ -286,6 +296,10 @@ class junction_node : public scene::basic_node float width{3.5f}; // width of a lane bool stopline{false}; // a line is painted across the lanes leading into the junction float median{0.f}; // how far apart the two directions of the road are there + float crosswalk{0.f}; // length of the pedestrian crossing painted across the road where it meets the junction; 0: none + // slope leading to the ground from the corner which starts at the left edge of this road, seen from the junction, and goes on + // to the next road. it starts at this road and ends at the next one + road_node::bank_data bank; right_of_way priority{right_of_way::none}; // ways each lane leading into the junction can be left by, a sum of turn_flags; the lanes are counted from the middle of the road. // a lane with no entry, or with 0, gets what the junction works out: the inner lane takes the left turns, the outer one the right turns @@ -339,6 +353,10 @@ class junction_node : public scene::basic_node std::string kerbmaterial{"none"}; float kerbheight{0.12f}; glm::vec2 slope{1.f, 0.4f}; // width and drop of the bank which closes a shoulder + std::string bankmaterial{"none"}; // what a bank of a corner is covered with, other than one of a shoulder + // a junction of two roads, where a road changes its lanes: what's between the two directions where they're apart + road_node::median_type median{road_node::median_type::painted}; + std::string medianmaterial{"none"}; // what an island is covered with float velocity{30.f}; // speed limit on the way through float friction{0.85f}; float sounddistance{25.f}; @@ -413,6 +431,8 @@ class junction_node : public scene::basic_node void export_as_text_(std::ostream &Output) const override; // creates a path through the junction from provided definition and registers it with the simulation TTrack *create_track(std::string const &Definition, std::size_t const Index); + // geometry of a junction of two roads + std::vector create_transition_shapes() const; // sets up what the traffic of each lane leading in is told, once the ways through are made void create_gates(); // members From 444e89558bb147ca5e1c7576acc3cdea02c34133 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Sun, 4 Oct 2026 05:00:52 +0200 Subject: [PATCH 120/430] feat(roads): lanes change within a road piece (lanesto), junctions of two roads from earlier sceneries are loaded as such pieces and saved as roads; the editor leads the lanes of neighbouring pieces with them --- application/editormode.h | 1 + application/editormoderoad.cpp | 113 ++- editor/editorRoad.cpp | 177 +++-- editor/editorRoad.hpp | 4 +- simulation/simulationstateserializer.cpp | 30 +- world/Road.cpp | 903 ++++++++++++++++++++--- world/Road.h | 76 +- world/RoadPoint.cpp | 35 +- 8 files changed, 1114 insertions(+), 225 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index 50cd81119..51ff130e0 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -512,6 +512,7 @@ class editor_mode : public application_mode std::vector points; // selected points where the pieces meet or end road_node::state settings; // layout shown in the window: of the selected piece, or of the pieces about to be built bool whole{true}; // layout changes go to every piece of the road the selected one belongs to + bool varied{false}; // the selected piece is shown with lanes of its own for its end bool chain{false}; // the point to build from is set glm::dvec3 point{0.0}; // where the next piece starts glm::dvec2 direction{0.0, 1.0}; // the way it has to leave that point diff --git a/application/editormoderoad.cpp b/application/editormoderoad.cpp index d453b47e4..83429178d 100644 --- a/application/editormoderoad.cpp +++ b/application/editormoderoad.cpp @@ -313,6 +313,12 @@ void editor_mode::road_select(road_node *Road) if (false == editor_road::can_edit(*Road, &reason)) tool.status += ". It can't be changed: " + reason; } + else + { + // the layout stays for the build tool, which makes pieces with the same lanes all the way + tool.settings.missing = {}; + } + tool.varied = tool.settings.changing(); copy_text(tool.surface, sizeof(tool.surface), tool.settings.surface); for (int side = 0; side < 2; ++side) copy_text(tool.sides[side], sizeof(tool.sides[side]), tool.settings.sides[side].material); @@ -392,6 +398,11 @@ void editor_mode::roadpoint_aim(bool const Fresh) tool.targetnote = "Point at the place a road crosses the rails"; return; } + if (road->definition().changing()) + { + tool.targetnote = "The road gains or loses lanes on this piece; a level crossing goes on a piece which keeps its lanes"; + return; + } glm::dvec3 middle{0.0}; double halfspan{0.0}; if (editor_road::rails_across(*road, tool.mouse, kRailReach, middle, halfspan)) @@ -1197,7 +1208,8 @@ void editor_mode::road_click() { // carried on from its start the road keeps the direction of its axis, so the lanes stay what they were tool.reversed = (false == end.atend); - tool.settings = end.road->definition(); + // with the lanes it has at that end + tool.settings = end.road->definition().section(end.atend ? 1 : 0); // and it stays as wide as it is at that end, with its directions as far apart auto const scale{tool.settings.taper[end.atend ? 1 : 0]}; tool.settings.taper = {scale, scale}; @@ -1216,6 +1228,7 @@ void editor_mode::road_click() tool.settings = end.road->definition(); tool.settings.sides[end.half > 0 ? 0 : 1] = road_node::side_data{}; tool.settings.banks = {}; + tool.settings.missing = {}; } tool.settings.forward = end.forward; tool.settings.backward = end.backward; @@ -1320,6 +1333,7 @@ void editor_mode::road_click() { auto state{tool.settings}; state.axis = pieces[index]; + state.missing = {}; auto const from{along(index)}; auto const to{along(index + 1)}; auto const &median{tool.settings.median}; @@ -1373,7 +1387,8 @@ void editor_mode::road_apply() if (tool.selected == nullptr) return; tool.settings.normalize(); - auto const pieces{tool.whole ? editor_road::chain(*tool.selected) : std::vector{tool.selected}}; + // other lanes at the end are something the selected piece has for itself; the rest of the road keeps the lanes it has + auto const pieces{tool.whole && false == tool.settings.changing() ? editor_road::chain(*tool.selected) : std::vector{tool.selected}}; editor_road::record record; std::vector> changes; // the banks are kept for each piece as they are, unless it's the banks which were just changed @@ -1674,6 +1689,11 @@ bool editor_mode::road_split() tool.status = "Can't split: " + reason; return true; } + if (road->definition().changing()) + { + tool.status = "Can't split a piece which gains or loses lanes; give it the same lanes at both ends first"; + return true; + } editor_road::record record; record.roads.emplace_back(road, road->definition()); auto *created{editor_road::split(*road, editor_road::nearest_parameter(road->definition(), tool.mouse))}; @@ -1735,7 +1755,7 @@ void editor_mode::road_point_width(float const Width) { // the pieces on both sides of a point get to that width there, and from there go back to their own along their length auto const changes{point_changes(m_roadtool.points, [Width](road_node::state &State, bool const Atend, std::size_t const) { - auto const width{State.width()}; + auto const width{State.width(Atend ? 1 : 0)}; if (width > 0.0) State.taper[Atend ? 1 : 0] = std::clamp(static_cast(Width / width), 0.25f, 4.f); })}; @@ -1931,19 +1951,52 @@ bool editor_mode::render_road_layout(road_node::state &State) }; auto const material = [this](char const *Label, char *Buffer, std::size_t const Size, std::string &Value) { return render_road_material(Label, Buffer, Size, Value); }; - // lanes - ImGui::SetNextItemWidth(120.0f); - if (ImGui::InputInt("Lanes along the axis", &State.forward)) - changed = true; - ImGui::SetNextItemWidth(120.0f); - if (ImGui::InputInt("Lanes against the axis", &State.backward)) - changed = true; - if (changed) + // lanes. a piece of a road which is there already can end with other lanes than it starts with { - // a different set of lanes starts with the common width and speed limit, and the default rules for changing lanes - State.lanes.clear(); - State.changes.clear(); - State.normalize(); + auto const selecting{tool.tool == 0 && tool.selected != nullptr}; + int counts[2][2]{{State.lanes_at(0, true), State.lanes_at(0, false)}, {State.lanes_at(1, true), State.lanes_at(1, false)}}; + bool relaned{false}; + ImGui::SetNextItemWidth(120.0f); + if (ImGui::InputInt(selecting && tool.varied ? "Lanes along the axis, at the start" : "Lanes along the axis", &counts[0][0])) + relaned = true; + ImGui::SetNextItemWidth(120.0f); + if (ImGui::InputInt(selecting && tool.varied ? "Lanes against the axis, at the start" : "Lanes against the axis", &counts[0][1])) + relaned = true; + if (selecting) + { + // ticked it only shows the lanes of the end to be set; unticked it gives the end the lanes of the start + if (ImGui::Checkbox("Other lanes at the end of the piece", &tool.varied) && false == tool.varied && State.changing()) + relaned = true; + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "The road gains or loses lanes along this piece: it gets wider or narrower, a lane it gains branches off the outermost lane\n" + "of its direction (two at most), a lane it loses joins the outermost one left.\n" + "What's next to the piece is fitted to the lanes the piece has at that end.\n" + "The axis goes the way the lanes drawn in green do: the start of the piece is where these come from.\n" + "Split the piece (K) first to have the lanes change over a part of it."); + if (tool.varied) + { + ImGui::SetNextItemWidth(120.0f); + if (ImGui::InputInt("Lanes along the axis, at the end", &counts[1][0])) + relaned = true; + ImGui::SetNextItemWidth(120.0f); + if (ImGui::InputInt("Lanes against the axis, at the end", &counts[1][1])) + relaned = true; + } + } + // the traffic going along the axis gets on the piece at its start, the one going against it at its end + if (State.lanes_at(1, true) - State.lanes_at(0, true) > 2 || State.lanes_at(0, false) - State.lanes_at(1, false) > 2) + ImGui::TextColored(ImVec4(1.0f, 0.5f, 0.3f, 1.0f), "A lane forks into three at most: lanes past the second one gained can't be got on"); + if (relaned) + { + if (false == selecting || false == tool.varied) + { + counts[1][0] = counts[0][0]; + counts[1][1] = counts[0][1]; + } + // a different set of lanes starts with the common width and speed limit, and the default rules for changing lanes + State.lanes_between(counts[0][0], counts[0][1], counts[1][0], counts[1][1]); + changed = true; + } } if (number("Lane width [m]", State.lanewidth, 0.25f, "%.2f")) { @@ -2342,7 +2395,7 @@ void editor_mode::render_road_window() if (false == ends.empty()) { auto const &layout{ends.front().road->definition()}; - auto width{static_cast(layout.width() * layout.taper[ends.front().atend ? 1 : 0])}; + auto width{static_cast(layout.width(ends.front().atend ? 1 : 0) * layout.taper[ends.front().atend ? 1 : 0])}; if (number("Road width here [m]", width, 0.25f, "%.2f")) road_point_width(std::clamp(width, 1.0f, 100.0f)); if (ImGui::IsItemHovered()) @@ -2410,12 +2463,20 @@ void editor_mode::render_road_window() else if (tool.selected != nullptr) { auto const &road{*tool.selected}; - ImGui::Text("%s, %.1f m, %d + %d lanes", road.name().c_str(), road.definition().length(), road.definition().forward, road.definition().backward); + auto const &layout{road.definition()}; + if (layout.changing()) + ImGui::Text("%s, %.1f m, %d + %d to %d + %d lanes", road.name().c_str(), layout.length(), layout.lanes_at(0, true), layout.lanes_at(0, false), layout.lanes_at(1, true), + layout.lanes_at(1, false)); + else + ImGui::Text("%s, %.1f m, %d + %d lanes", road.name().c_str(), layout.length(), layout.forward, layout.backward); if (ImGui::Button("Delete (Del)")) road_delete(); ImGui::SameLine(); ImGui::TextDisabled("K: split at the cursor"); - ImGui::Checkbox("Changes go to the whole road", &tool.whole); + if (tool.settings.changing()) + ImGui::TextDisabled("This piece has lanes of its own at its end, so it's changed alone"); + else + ImGui::Checkbox("Changes go to the whole road", &tool.whole); if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", "A road is a string of pieces. With this on a change of the layout is made to all of them,\nexcept for the lane change rules, which are always set for the selected piece alone.\nWith this off the selected piece alone is changed, and the road next to it is fitted to it:\nmade wider or narrower towards it, or given a stretch where the lanes change if their number differs.\nSplit a piece (K) to get a piece of the length you need."); ImGui::Separator(); @@ -2474,15 +2535,18 @@ void editor_mode::draw_road_overlay() const if (false == projection.room(drawlist)) break; auto const against{static_cast(road->definition().backward)}; - auto const &tracks{road->tracks()}; - for (std::size_t lane = 0; lane < tracks.size(); ++lane) + // a lane of a piece which gains or loses lanes is a path at each end of the piece; the ways between these are drawn below + auto const lanecount{road->definition().lanes.size()}; + for (std::size_t slot = 0; slot < 2 * lanecount; ++slot) { - if (tracks[lane] == nullptr || tracks[lane]->m_paths.empty()) + auto const lane{slot / 2}; + auto const *track{road->lane_track(lane, static_cast(slot % 2))}; + if (track == nullptr || track->m_paths.empty() || (slot % 2 == 1 && track == road->lane_track(lane, 0))) continue; - auto const &path{tracks[lane]->m_paths.front()}; + auto const &path{track->m_paths.front()}; auto const color{lane >= against ? kForwardColor : kBackwardColor}; drawpath(path, color, 2.0f, is_curved(path) ? pieces(path, road->location()) : 1); - if (range > 300.0) + if (range > 300.0 || road->definition().changing()) continue; auto const middle{path_point(path, 0.5)}; auto direction{path_point(path, 0.52) - middle}; @@ -2499,6 +2563,9 @@ void editor_mode::draw_road_overlay() const if (turn != nullptr && false == turn->m_paths.empty() && range < 300.0) drawpath(turn->m_paths.front(), kTurnColor, 1.5f, 8); } + // ways from the lanes at one end to the lanes at the other + for (auto const &way : road->ways()) + drawpath(way, kWayColor, 1.5f, pieces(way, road->location())); } // ways through the junctions for (auto const *junction : simulation::Junctions.sequence()) diff --git a/editor/editorRoad.cpp b/editor/editorRoad.cpp index 3fe9da2c9..8e2113d17 100644 --- a/editor/editorRoad.cpp +++ b/editor/editorRoad.cpp @@ -143,6 +143,11 @@ road_node::state part(road_node::state const &State, double const From, double c result.median.width = {static_cast(State.median_width(From)), static_cast(State.median_width(To))}; // an island is rounded at the ends of the piece, not where the piece is cut result.median.round = {From <= 0.0 ? State.median.round[0] : 0.f, To >= 1.0 ? State.median.round[1] : 0.f}; + // and it's at its ends a piece is short of lanes + if (From > 0.0) + result.missing[0] = {0, 0}; + if (To < 1.0) + result.missing[1] = {0, 0}; for (std::size_t side = 0; side < result.banks.size(); ++side) { auto const &bank{State.banks[side]}; @@ -166,8 +171,8 @@ std::vector end_points(road_node::state const &State, bool const Ate if (glm::length(left) < 1e-9) return result; left = glm::normalize(left); - auto const halfwidth{0.5 * State.width()}; - auto const divide{State.divide()}; + auto const halfwidth{0.5 * State.width(Atend ? 1 : 0)}; + auto const divide{State.divide(Atend ? 1 : 0)}; // lanes going against the axis are on its left result.emplace_back(result.front() + left * (0.5 * (halfwidth + divide) * State.scale(t) + 0.5 * gap)); result.emplace_back(result.front() + left * (0.5 * (divide - halfwidth) * State.scale(t) - 0.5 * gap)); @@ -275,6 +280,12 @@ bool follow(road_node &Road, double const T, bool const Forward, double const Di Cut.road = piece; Cut.t = (remaining <= 0.0 ? from : parameter_at(lengths, forward ? here + remaining : here - remaining)); Cut.keepstart = (false == forward); + if (state.changing() && Cut.t > 0.001 && Cut.t < 0.999) + { + // partway along such a piece the road has no whole number of lanes to make an arm for + Error = "Too close to a place where the road changes its lanes"; + return false; + } return true; } // the junction takes this piece up to its end, as what would be left of it is too short to be a road @@ -313,9 +324,10 @@ bool cut_arm(road_cut const &Cut, junction_node::arm_data &Arm) Arm.position = state.point(Cut.t); // the way out of the junction is the way the kept part of the piece goes from the cut Arm.direction = planar(state.tangent(Cut.t)) * (Cut.keepstart ? -1.0 : 1.0); - // lanes heading for the cut lead into the junction - Arm.incoming = (Cut.keepstart ? state.forward : state.backward); - Arm.outgoing = (Cut.keepstart ? state.backward : state.forward); + // lanes heading for the cut lead into the junction. a piece which gains or loses lanes is only cut at one of its ends + auto const end{Cut.t > 0.5 ? 1 : 0}; + Arm.incoming = state.lanes_at(end, Cut.keepstart); + Arm.outgoing = state.lanes_at(end, false == Cut.keepstart); Arm.median = static_cast(state.median_width(Cut.t)); return editor_road::lane_width(state, Cut.t, Arm.width); } @@ -406,6 +418,8 @@ road_node::state flipped(road_node::state const &State) std::swap(result.axis.points[segment_data::point::control1], result.axis.points[segment_data::point::control2]); result.axis.rolls = {-State.axis.rolls[1], -State.axis.rolls[0]}; std::swap(result.forward, result.backward); + result.missing[0] = {State.missing[1][1], State.missing[1][0]}; + result.missing[1] = {State.missing[0][1], State.missing[0][0]}; // the lanes are listed left to right for someone facing along the axis, who's now looking the other way std::reverse(result.lanes.begin(), result.lanes.end()); std::reverse(result.changes.begin(), result.changes.end()); @@ -660,6 +674,10 @@ void editor_road::refresh(std::vector const &Roads, std::vectorm_editorremoved) + road->create_links(); for (auto *junction : Junctions) if (false == junction->m_editorremoved) junction->show(); @@ -1071,6 +1089,11 @@ bool editor_road::dissolve(glm::dvec3 const &Joint, record &Record, std::string before = flipped(before); if (dropped.atend) after = flipped(after); + if (before.changing() || after.changing()) + { + Error = "the road changes its lanes next to the point. Give that piece the same lanes at both its ends first"; + return false; + } if (before.forward != after.forward || before.backward != after.backward) { Error = "the road has other lanes on each side of the point. Give both sides the same lanes first"; @@ -1134,7 +1157,8 @@ bool editor_road::dissolve(glm::dvec3 const &Joint, record &Record, std::string road_node *editor_road::split(road_node &Road, double const T) { - if (T <= 0.001 || T >= 0.999) + // partway along a piece which gains or loses lanes the road has no whole number of them + if (T <= 0.001 || T >= 0.999 || Road.definition().changing()) return nullptr; auto first{Road.definition()}; auto second{first}; @@ -1194,13 +1218,16 @@ road_node *editor_road::split(road_node &Road, double const T) std::vector editor_road::chain(road_node &Road) { std::vector result{&Road}; + // a piece which gains or loses lanes is where a road of one layout ends and one of another begins + if (Road.definition().changing()) + return result; for (std::size_t idx = 0; idx < result.size(); ++idx) { for (auto const atend : {false, true}) { // a road goes on only where exactly two pieces meet auto const next{roads_at(axis_end(result[idx]->definition(), atend), result[idx])}; - if (next.size() == 1) + if (next.size() == 1 && false == next.front()->definition().changing()) add_unique(result, next.front()); } } @@ -1308,7 +1335,7 @@ editor_road::loose_end editor_road::find_end(glm::dvec3 const &Point, double con result.outwards = (atend ? state.tangent(1.0) : -state.tangent(0.0)); // the first of the points is the roadway of the lanes going against the axis result.half = (half == 1 ? -1 : 1); - auto const lanes{half == 1 ? state.backward : state.forward}; + auto const lanes{state.lanes_at(atend ? 1 : 0, half != 1)}; // lanes which leave the road there go along the axis of the road carrying them on, the ones which come to it go against that axis auto const leaving{(half == 2) == atend}; result.forward = (leaving ? lanes : 0); @@ -1632,8 +1659,8 @@ void editor_road::settle(road_node &Road, record &Record, std::string &Notes) auto const &layout{Road.definition()}; auto const position{axis_end(layout, atend)}; // lanes heading for this end of the piece, and the ones leading away from it - auto const arriving{atend ? layout.forward : layout.backward}; - auto const leaving{atend ? layout.backward : layout.forward}; + auto const arriving{layout.lanes_at(atend ? 1 : 0, atend)}; + auto const leaving{layout.lanes_at(atend ? 1 : 0, false == atend)}; float lanewidth{0.f}; auto const evenlanes{lane_width(layout, atend ? 1.0 : 0.0, lanewidth)}; auto const gap{static_cast(layout.median_width(atend ? 1.0 : 0.0))}; @@ -1678,14 +1705,15 @@ void editor_road::settle(road_node &Road, record &Record, std::string &Notes) auto const otherlayout{other->definition()}; auto const otheratend{glm::distance(axis_end(otherlayout, true), position) < kSamePoint}; // lanes of the neighbour heading for the place they meet, and the ones leading away from it - auto const otherarriving{otheratend ? otherlayout.forward : otherlayout.backward}; - auto const otherleaving{otheratend ? otherlayout.backward : otherlayout.forward}; + auto const otherarriving{otherlayout.lanes_at(otheratend ? 1 : 0, otheratend)}; + auto const otherleaving{otherlayout.lanes_at(otheratend ? 1 : 0, false == otheratend)}; + auto const othergap{static_cast(otherlayout.median_width(otheratend ? 1.0 : 0.0))}; if (otherarriving == leaving && otherleaving == arriving) { // the same lanes: the neighbour is made as wide as the piece where they meet, and gets to that width along its length - auto const width{layout.width() * layout.taper[atend ? 1 : 0]}; - auto const othergap{static_cast(otherlayout.median_width(otheratend ? 1.0 : 0.0))}; - if (std::abs(width - otherlayout.width() * otherlayout.taper[otheratend ? 1 : 0]) < 0.001 && std::abs(gap - othergap) < 0.001f) + auto const width{layout.width(atend ? 1 : 0) * layout.taper[atend ? 1 : 0]}; + auto const otherwidth{otherlayout.width(otheratend ? 1 : 0)}; + if (std::abs(width - otherwidth * otherlayout.taper[otheratend ? 1 : 0]) < 0.001 && std::abs(gap - othergap) < 0.001f) continue; if (false == can_edit(*other, &reason)) { @@ -1693,7 +1721,7 @@ void editor_road::settle(road_node &Road, record &Record, std::string &Notes) continue; } auto state{otherlayout}; - state.taper[otheratend ? 1 : 0] = std::clamp(static_cast(width / otherlayout.width()), 0.25f, 4.f); + state.taper[otheratend ? 1 : 0] = std::clamp(static_cast(width / otherwidth), 0.25f, 4.f); // and it leads its two directions as far apart as the piece has them there if (std::abs(gap - othergap) >= 0.001f) { @@ -1710,80 +1738,67 @@ void editor_road::settle(road_node &Road, record &Record, std::string &Notes) continue; } - // other lanes: the end of the neighbour is given up for a junction of the two, where the lanes of one are led to the lanes of the other - if (false == evenlanes) + // other lanes: the neighbour is led from the lanes it has to the lanes of the piece. a long one gives up its end for that, + // which is made a piece of its own; a short one, or one which changes its lanes already, does it along its whole length + float otherlanewidth{0.f}; + if (false == evenlanes || false == lane_width(otherlayout, otheratend ? 1.0 : 0.0, otherlanewidth)) { - Notes += "Lanes of \"" + Road.name() + "\"" + unevenlanes; + Notes += "Lanes of \"" + (evenlanes ? other->name() : Road.name()) + "\" differ in width, and a road changes the number of its lanes only if they're all as wide. "; continue; } - road_cut cut; - std::vector consumed; - std::string error; - bool room{false}; - for (auto const length : {kTransitionLength, 0.5 * kTransitionLength}) - { - consumed.clear(); - if (follow(*other, otheratend ? 1.0 : 0.0, false == otheratend, length, cut, consumed, error)) - { - room = true; - break; - } - } - if (false == room) - { - Notes += "There's no room next to \"" + Road.name() + "\" for the lanes to change (" + error + "), so they don't lead on there. "; - continue; - } - if (cut.road == &Road) - { - Notes += "The road is too short for its lanes to change. "; - continue; - } - std::vector removed{consumed}; - if (cut.road != other) - removed.emplace_back(other); - // a cut at the very end the piece is kept from leaves it whole - auto const trimmed{cut.keepstart ? cut.t < 0.999 : cut.t > 0.001}; - bool allowed{false == trimmed || can_edit(*cut.road, &reason)}; - for (auto const *piece : removed) - allowed = allowed && can_edit(*piece, &reason); - junction_node::state junction; - junction_node::arm_data arms[2]; - if (false == allowed) + if (false == can_edit(*other, &reason)) { Notes += "The lanes next to \"" + Road.name() + "\" weren't fitted: " + reason + ". "; continue; } - if (false == cut_arm(cut, arms[0])) + auto *stretch{other}; + if (false == otherlayout.changing() && otherlayout.length() > 1.5 * kTransitionLength) { - Notes += "Lanes of \"" + cut.road->name() + "\"" + unevenlanes; + auto const lengths{stations(otherlayout)}; + auto *rest{split(*other, parameter_at(lengths, otheratend ? lengths.back() - kTransitionLength : kTransitionLength))}; + if (rest == nullptr) + { + Notes += "\"" + other->name() + "\" couldn't be cut for the lanes to change. "; + continue; + } + // the neighbour goes on record the way it was before the cut + if (std::none_of(Record.roads.begin(), Record.roads.end(), [other](std::pair const &Entry) { return Entry.first == other; })) + Record.roads.emplace_back(other, otherlayout); + Record.roads_created.emplace_back(rest); + // the part past the cut is the one at the end of the neighbour + if (otheratend) + stretch = rest; + } + auto state{stretch->definition()}; + // the end the stretch shares with the piece gets the lanes of the piece, the other one keeps what it has + auto const end{otheratend ? 1 : 0}; + int counts[2][2]{{state.lanes_at(0, true), state.lanes_at(0, false)}, {state.lanes_at(1, true), state.lanes_at(1, false)}}; + // the lanes of the piece leading away from where they meet are the ones of the stretch heading for it + counts[end][0] = (otheratend ? leaving : arriving); + counts[end][1] = (otheratend ? arriving : leaving); + if (false == state.lanes.empty()) + state.lanewidth = state.lanes.front().width; + state.lanes_between(counts[0][0], counts[0][1], counts[1][0], counts[1][1]); + if (state.lanes_at(end, true) != counts[end][0] || state.lanes_at(end, false) != counts[end][1]) + { + Notes += "The lanes of \"" + Road.name() + "\" can't be led on to the road next to it. "; continue; } - arms[1].position = position; - arms[1].direction = planar(layout.tangent(atend ? 1.0 : 0.0)) * (atend ? -1.0 : 1.0); - arms[1].incoming = arriving; - arms[1].outgoing = leaving; - arms[1].width = lanewidth; - arms[1].median = gap; - junction.arms.assign(std::begin(arms), std::end(arms)); - junction.centre = 0.5 * (arms[0].position + arms[1].position); - dress(junction, layout); - // it's a stretch of the road, with the speed limit the road has - junction.velocity = std::min(layout.velocity > 0.f ? layout.velocity : std::numeric_limits::max(), otherlayout.velocity > 0.f ? otherlayout.velocity : std::numeric_limits::max()); - if (junction.velocity == std::numeric_limits::max()) - junction.velocity = -1.f; - junction.normalize(); - - // room is made first, so nothing gets joined with what's about to go - remove(removed); - Record.roads_removed.insert(Record.roads_removed.end(), removed.begin(), removed.end()); - if (trimmed) + // and it's as wide there as the piece is, with its directions as far apart + state.taper[end] = std::clamp(lanewidth / state.lanes.front().width, 0.25f, 4.f); + if (std::abs(gap - othergap) >= 0.001f) { - remember(Record, cut.road); - apply(std::vector>{{cut.road, cut.keepstart ? part(cut.road->definition(), 0.0, cut.t) : part(cut.road->definition(), cut.t, 1.0)}}); + if (false == state.divided()) + { + state.median.type = layout.median.type; + state.median.material = layout.median.material; + state.median.width = {0.f, 0.f}; + } + state.median.width[end] = gap; } - auto const created{create(std::vector{junction})}; - Record.junctions_created.insert(Record.junctions_created.end(), created.begin(), created.end()); + if (stretch == other) + remember(Record, other); + apply(std::vector>{{stretch, state}}); } } @@ -1812,6 +1827,11 @@ bool editor_road::branch_from(road_node &Road, double const T, glm::dvec2 const Error = "The road would leave at too sharp an angle"; return false; } + if (layout.changing()) + { + Error = "\"" + Road.name() + "\" changes its lanes along the way, which leaves no place for a junction. Lead the road out of a piece next to it"; + return false; + } float lanewidth{0.f}; if (false == lane_width(layout, T, lanewidth)) { @@ -1988,6 +2008,7 @@ std::vector editor_road::roundabout(glm::dvec3 const &Centre, if (layout.forward < 1) layout.forward = std::max(1, layout.backward); layout.backward = 0; + layout.missing = {}; layout.lanes.clear(); layout.changes.clear(); layout.taper = {1.f, 1.f}; diff --git a/editor/editorRoad.hpp b/editor/editorRoad.hpp index df71db184..20553b013 100644 --- a/editor/editorRoad.hpp +++ b/editor/editorRoad.hpp @@ -134,8 +134,8 @@ class editor_road static std::vector> arms_at(glm::dvec3 const &Point); // brings what's next to the ends of a piece in line with the piece, after its lanes or its width were changed: // a junction gets its arm made for the lanes the piece has now, a neighbouring piece with the same lanes is made as wide - // as the piece where they meet, and one with other lanes gets a transition cut out of its end - a junction of two roads, - // which leads the lanes of one to the lanes of the other. what gets done is added to Record, what couldn't be done to Notes + // as the piece where they meet, and one with other lanes is led to the lanes of the piece: its end, or the whole of it if it's short, + // becomes a piece which gains or loses lanes along the way. what gets done is added to Record, what couldn't be done to Notes static void settle(road_node &Road, record &Record, std::string &Notes); // width shared by all lanes of the road at specified value of the curve parameter of its axis. returns: false if the lanes differ in width static bool lane_width(road_node::state const &State, double const T, float &Width); diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index 5a6f8ba49..7082bfc83 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -401,7 +401,9 @@ state_serializer::deserialize_firstinit( cParser &Input, scene::scratch_data &Sc } simulation::Paths.InitTracks(); - // the junctions tie the lanes of the roads together, what's left loose after that gets closed by the roads + // the roads tie up their own lanes where they gain or lose some, the junctions tie the lanes of the roads together, + // what's left loose after that gets closed by the roads + simulation::Roads.InitLanes(); simulation::Junctions.InitJunctions(); simulation::Roads.InitRoads(); // crossings and traffic points go by the lanes, which are complete at this point @@ -536,11 +538,29 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch ( Scratchpad.location.offset.empty() ? glm::dvec3 { 0.0 } : glm::dvec3 { Scratchpad.location.offset.top() } ) ); - if( false == simulation::Junctions.insert( junction ) ) { - ErrorLog( "Bad scenario: duplicate junction name \"" + junction->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + road_node::state stretch; + if( junction->as_road( stretch ) ) { + // a junction of two roads is where a road changes its lanes, which used to take a junction and is done by a road now. + // it's loaded as the road it would be, and marked as changed so it's written as one when the scenery is saved + delete junction; + nodedata.type = "road"; + auto *road { new road_node( nodedata ) }; + road->define( stretch ); + if( false == simulation::Roads.insert( road ) ) { + ErrorLog( "Bad scenario: duplicate road name \"" + road->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + } + scene::Groups.insert( scene::Groups.handle(), road ); + road->create_lanes(); + road->mark_dirty(); + scene::Layers.track( road, { sourcebegin, Input.TokenEnd() } ); + } + else { + if( false == simulation::Junctions.insert( junction ) ) { + ErrorLog( "Bad scenario: duplicate junction name \"" + junction->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + } + scene::Groups.insert( scene::Groups.handle(), junction ); + scene::Layers.track( junction, { sourcebegin, Input.TokenEnd() } ); } - scene::Groups.insert( scene::Groups.handle(), junction ); - scene::Layers.track( junction, { sourcebegin, Input.TokenEnd() } ); } else if( roadpoint_node::is_keyword( nodedata.type ) ) { // level crossing, or a point where road vehicles appear or are taken away diff --git a/world/Road.cpp b/world/Road.cpp index f0e6193ef..78c008ea5 100644 --- a/world/Road.cpp +++ b/world/Road.cpp @@ -35,6 +35,8 @@ constexpr double dash_step{2.0}; // longest straight piece of a painted line // speed and reach of the paths made to turn the vehicles back at a loose end of the road constexpr float turn_velocity{10.f}; constexpr double turn_reach{6.0}; +// length of the paths left of the lanes at the ends of a piece which gains or loses lanes +constexpr double lane_lead{2.0}; glm::dvec3 const up{0.0, 1.0, 0.0}; @@ -148,6 +150,48 @@ class road_axis { return frame(parameter(Station)); } + // control vector of specified end of a part of the curve, relative to that end + glm::dvec3 control(int const End, double const From, double const To) const + { + if (From <= 0.0 && To >= 1.0) + { + return control(End); + } + // a part of a cubic curve is a cubic curve, with the tangents scaled to the part of the parameter range it takes + return End == 0 ? derivative(From) * ((To - From) / 3.0) : derivative(To) * (-(To - From) / 3.0); + } + // value of the curve parameter at specified distance from the start of the axis + double parameter(double const Station) const + { + if (Station <= 0.0) + { + return 0.0; + } + if (Station >= length()) + { + return 1.0; + } + // first of the sampled distances past the requested one; it's never the very first sample + auto const idx{std::distance(m_stations.begin(), std::upper_bound(m_stations.begin(), m_stations.end(), Station))}; + auto const span{m_stations[idx] - m_stations[idx - 1]}; + auto const fraction{span > 0.0 ? (Station - m_stations[idx - 1]) / span : 0.0}; + return (static_cast(idx - 1) + fraction) / samples; + } + // part of the length of the axis which lies before specified value of the curve parameter + double fraction(double const T) const + { + if (T <= 0.0 || length() <= 0.0) + { + return 0.0; + } + if (T >= 1.0) + { + return 1.0; + } + auto const position{T * samples}; + auto const idx{std::min(samples - 1, static_cast(position))}; + return glm::mix(m_stations[idx], m_stations[idx + 1], position - idx) / length(); + } // length of pieces the road is cut into along the axis; follows the rules the tracks use double step() const { @@ -167,22 +211,6 @@ class road_axis auto const u{1.0 - T}; return 3.0 * u * u * (m_points[1] - m_points[0]) + 6.0 * u * T * (m_points[2] - m_points[1]) + 3.0 * T * T * (m_points[3] - m_points[2]); } - double parameter(double const Station) const - { - if (Station <= 0.0) - { - return 0.0; - } - if (Station >= length()) - { - return 1.0; - } - // first of the sampled distances past the requested one; it's never the very first sample - auto const idx{std::distance(m_stations.begin(), std::upper_bound(m_stations.begin(), m_stations.end(), Station))}; - auto const span{m_stations[idx] - m_stations[idx - 1]}; - auto const fraction{span > 0.0 ? (Station - m_stations[idx - 1]) / span : 0.0}; - return (static_cast(idx - 1) + fraction) / samples; - } std::array m_points; std::array m_rolls{}; @@ -191,6 +219,16 @@ class road_axis std::vector m_stations; }; +// lines of a road a corner of a cross-section can be measured from. on a piece which gains or loses lanes the edges +// and the line the directions meet at move across the axis along the way, each on its own +enum profile_anchor : int +{ + anchor_axis = 0, + anchor_left = 1, // left edge of the lanes + anchor_right = 2, // right edge of the lanes + anchor_middle = 3 // the line the two directions meet at +}; + // corner of the cross-section of something laid along the road struct profile_point { @@ -201,6 +239,8 @@ struct profile_point double spread{0.0}; // how much of the gap between the two directions of the road it's moved by: 0.5 for their left edge, -0.5 for the right one double grow{0.0}; // what the shift changes by along the axis, evenly double sink{0.0}; // what the height changes by along the axis, evenly + int anchor{anchor_axis}; // line of the road the corner is measured from, one of profile_anchor + double tile{0.0}; // if set the image is laid across the road by where the corner is: its coordinate grows by one for each that many metres from the axis }; // how far the taper of a road has got at specified part of its length. it starts and ends level, so the pieces of a road @@ -231,6 +271,8 @@ void loft(std::vector &Output, road_axis const &Axis, std::vector< return glm::vec3{glm::length2(result) < 1e-12 ? up : glm::normalize(result)}; }; std::vector previous(pointcount), current(pointcount); + std::vector previoustexture(pointcount), currenttexture(pointcount); + auto const anchored{std::any_of(Profile.begin(), Profile.end(), [](profile_point const &Point) { return Point.anchor != anchor_axis; })}; axis_frame previousframe; double previousstation{From}; @@ -241,10 +283,19 @@ void loft(std::vector &Output, road_axis const &Axis, std::vector< auto const fraction{Axis.length() > 0.0 ? station / Axis.length() : 0.0}; auto const scale{Taper[0] == Taper[1] ? static_cast(Taper[0]) : glm::mix(static_cast(Taper[0]), static_cast(Taper[1]), taper_progress(fraction))}; auto const gap{false == divided ? 0.0 : glm::mix(static_cast(median[0]), static_cast(median[1]), taper_progress(fraction))}; + // where the lines the corners are measured from are at this section + std::array lead{0.0, 0.0, 0.0, 0.0}; + if (anchored) + { + auto const half{0.5 * Road.breadth(fraction)}; + lead = {0.0, half, -half, Road.middle(fraction)}; + } for (std::size_t idx = 0; idx < pointcount; ++idx) { auto const &point{Profile[idx]}; - current[idx] = frame.position + frame.left * (point.offset * scale + point.shift + point.spread * gap + point.grow * fraction) + up * (point.height + point.sink * fraction); + auto const across{lead[point.anchor] + (point.offset * scale + point.shift + point.spread * gap + point.grow * fraction)}; + current[idx] = frame.position + frame.left * across + up * (point.height + point.sink * fraction); + currenttexture[idx] = (point.tile > 0.0 ? static_cast(point.texture + across / point.tile) : point.texture); } if (section > 0) { @@ -254,10 +305,10 @@ void loft(std::vector &Output, road_axis const &Axis, std::vector< { auto const normalstart{normal(previousframe.tangent, previous[idx] - previous[idx + 1])}; auto const normalend{normal(frame.tangent, current[idx] - current[idx + 1])}; - world_vertex const leftstart{previous[idx], normalstart, {Profile[idx].texture, texturestart}}; - world_vertex const rightstart{previous[idx + 1], normalstart, {Profile[idx + 1].texture, texturestart}}; - world_vertex const leftend{current[idx], normalend, {Profile[idx].texture, textureend}}; - world_vertex const rightend{current[idx + 1], normalend, {Profile[idx + 1].texture, textureend}}; + world_vertex const leftstart{previous[idx], normalstart, {previoustexture[idx], texturestart}}; + world_vertex const rightstart{previous[idx + 1], normalstart, {previoustexture[idx + 1], texturestart}}; + world_vertex const leftend{current[idx], normalend, {currenttexture[idx], textureend}}; + world_vertex const rightend{current[idx + 1], normalend, {currenttexture[idx + 1], textureend}}; Output.push_back(leftstart); Output.push_back(rightstart); Output.push_back(leftend); @@ -268,11 +319,63 @@ void loft(std::vector &Output, road_axis const &Axis, std::vector< } } previous.swap(current); + previoustexture.swap(currenttexture); previousframe = frame; previousstation = station; } } +// shape of a line running beside a part of the axis of a road, from one distance from the axis to another, positive being to the left. +// From, To: values of the curve parameter of the axis. the line is laid out the way the axis goes +segment_data offset_path(segment_data const &Axis, road_axis const &Centre, double const From, double const To, double const Fromoffset, double const Tooffset) +{ + auto const begin{Centre.frame(From)}; + auto const end{Centre.frame(To)}; + + segment_data path; + path.points[segment_data::point::start] = begin.position + begin.left * Fromoffset; + path.points[segment_data::point::end] = end.position + end.left * Tooffset; + if (Centre.curved() || Fromoffset != Tooffset) + { + // a line running beside a bend is shorter or longer than the bend itself, and so are its control vectors. + // the control vectors go along the axis at both ends, which is what makes the lane meet the next piece without a bend + path.points[segment_data::point::control1] = Centre.control(0, From, To) * std::max(0.05, 1.0 - Fromoffset * std::cos(begin.roll) * Centre.curvature(From)); + path.points[segment_data::point::control2] = Centre.control(1, From, To) * std::max(0.05, 1.0 - Tooffset * std::cos(end.roll) * Centre.curvature(To)); + // if the roll changes along the road its sides rise or fall relative to the axis + auto const climb{(Tooffset * std::sin(end.roll) - Fromoffset * std::sin(begin.roll)) / 3.0}; + path.points[segment_data::point::control1].y += climb; + path.points[segment_data::point::control2].y -= climb; + } + path.rolls = {From <= 0.0 ? Axis.rolls[0] : glm::mix(Axis.rolls[0], Axis.rolls[1], static_cast(From)), + To >= 1.0 ? Axis.rolls[1] : glm::mix(Axis.rolls[0], Axis.rolls[1], static_cast(To))}; + if (Axis.radius != 0.f) + { + // the lanes on the inner side of the bend have it tighter + auto const turn{Centre.curvature(0.5 * (From + To)) >= 0.0 ? 1.0 : -1.0}; + path.radius = static_cast(std::max(1.0, std::abs(Axis.radius) - turn * 0.5 * (Fromoffset + Tooffset))); + } + return path; +} + +// turns a line laid out along the axis of a road into the path of a lane. Against: the lane goes against the axis +segment_data lane_shape(segment_data Path, bool const Against) +{ + if (Against) + { + std::swap(Path.points[segment_data::point::start], Path.points[segment_data::point::end]); + std::swap(Path.points[segment_data::point::control1], Path.points[segment_data::point::control2]); + Path.rolls = {-Path.rolls[1], -Path.rolls[0]}; + } + if (Global.bRollFix) + { + // with this setting on a rolled path gets raised when it's set up, by an amount fit for a railway track. + // the surface of the road stays where it is, so the lane is lowered beforehand to make up for it + Path.points[segment_data::point::start].y -= std::abs(std::sin(glm::radians(static_cast(Path.rolls[0])))) * 0.75; + Path.points[segment_data::point::end].y -= std::abs(std::sin(glm::radians(static_cast(Path.rolls[1])))) * 0.75; + } + return Path; +} + // corner of a cross-section which changes along the road struct section_corner { @@ -381,10 +484,31 @@ void road_node::state::normalize() { forward = std::clamp(forward, 0, 8); backward = std::clamp(backward, 0, 8); + for (int direction = 0; direction < 2; ++direction) + { + auto &count{direction == 0 ? forward : backward}; + for (auto &end : missing) + { + end[direction] = std::clamp(end[direction], 0, count); + } + // lanes the piece has at neither of its ends aren't there at all + auto const both{std::min(missing[0][direction], missing[1][direction])}; + count -= both; + missing[0][direction] -= both; + missing[1][direction] -= both; + } if (forward + backward == 0) { forward = 1; } + for (auto &end : missing) + { + // there has to be a lane at each end + if (forward - end[0] + backward - end[1] < 1) + { + (forward > 0 ? end[0] : end[1]) = (forward > 0 ? forward : backward) - 1; + } + } lanewidth = std::max(1.f, lanewidth); weight = std::clamp(weight, 0.f, 10000.f); for (auto &width : median.width) @@ -493,6 +617,69 @@ int road_node::state::lane_index(std::string const &Id) const return Id[0] == 'f' ? backward + number - 1 : backward - number; } +// true if the piece has other lanes at its end than at its start +bool road_node::state::changing() const +{ + return missing[0][0] != 0 || missing[0][1] != 0 || missing[1][0] != 0 || missing[1][1] != 0; +} + +// sets the lanes the piece has at the start and at the end of its axis +void road_node::state::lanes_between(int const Startforward, int const Startbackward, int const Endforward, int const Endbackward) +{ + auto const along{std::clamp(std::max(Startforward, Endforward), 0, 8)}; + auto const against{std::clamp(std::max(Startbackward, Endbackward), 0, 8)}; + if (along != forward || against != backward) + { + // a different set of lanes starts with the common width and speed limit, and the default rules for changing lanes + forward = along; + backward = against; + lanes.clear(); + changes.clear(); + } + missing[0] = {forward - std::max(0, Startforward), backward - std::max(0, Startbackward)}; + missing[1] = {forward - std::max(0, Endforward), backward - std::max(0, Endbackward)}; + normalize(); +} + +// number of lanes at an end of the axis: of the ones going along it, or of the ones going against it +int road_node::state::lanes_at(int const End, bool const Along) const +{ + return Along ? forward - missing[End][0] : backward - missing[End][1]; +} + +// true if the piece has the lane at specified end of the axis +bool road_node::state::lane_at(std::size_t const Lane, int const End) const +{ + // the lanes of each direction are counted outwards from where the directions meet, and it's the outermost ones a piece is short of + auto const against{static_cast(backward)}; + return Lane < against ? Lane >= static_cast(missing[End][1]) : Lane - against < static_cast(forward - missing[End][0]); +} + +// the same road with the lanes it has at specified end of the axis all the way +road_node::state road_node::state::section(int const End) const +{ + auto result{*this}; + result.lanes.clear(); + result.changes.clear(); + for (std::size_t lane = 0; lane < lanes.size(); ++lane) + { + if (false == lane_at(lane, End)) + { + continue; + } + // the lanes a piece has at an end lie side by side, so the one before this one is its neighbour there as well + if (false == result.lanes.empty() && lane - 1 < changes.size()) + { + result.changes.emplace_back(changes[lane - 1]); + } + result.lanes.emplace_back(lanes[lane]); + } + result.forward = lanes_at(End, true); + result.backward = lanes_at(End, false); + result.missing = {}; + return result; +} + // permission to change the lane a pair of neighbouring lanes gets if the scenery doesn't say otherwise int road_node::state::default_change(std::size_t const Boundary) const { @@ -516,6 +703,41 @@ double road_node::state::lane_offset(std::size_t const Lane) const return Lane < lanes.size() ? offset - 0.5 * lanes[Lane].width : offset; } +// the same at an end of the axis, where the road is centred on the axis with the lanes it has there +double road_node::state::lane_offset(std::size_t const Lane, int const End) const +{ + auto const against{static_cast(backward)}; + auto lane{Lane}; + if (Lane < lanes.size() && false == lane_at(Lane, End)) + { + // a lane the road is short of there comes out of the outermost lane its direction has at that end, or goes into it. + // with no such lane it starts, or ends, at the line the directions meet at + if (lanes_at(End, Lane >= against) < 1) + { + return divide(End); + } + lane = (Lane < against ? static_cast(missing[End][1]) : against + static_cast(lanes_at(End, true) - 1)); + } + auto offset{0.5 * width(End)}; + for (std::size_t idx = 0; idx < lane && idx < lanes.size(); ++idx) + { + if (lane_at(idx, End)) + { + offset -= lanes[idx].width; + } + } + return lane < lanes.size() ? offset - 0.5 * lanes[lane].width : offset; +} + +// distance of the middle of a lane from the axis at specified part of the length of the axis, with the taper and what's between the directions counted in +double road_node::state::lane_position(std::size_t const Lane, double const Fraction) const +{ + auto const side{Lane < static_cast(backward) ? 0.5 : -0.5}; + auto const beginoffset{lane_offset(Lane, 0) * taper[0] + side * median_width(0.0)}; + auto const endoffset{lane_offset(Lane, 1) * taper[1] + side * median_width(1.0)}; + return glm::mix(beginoffset, endoffset, taper_progress(Fraction)); +} + // combined width of the lanes, before the taper double road_node::state::width() const { @@ -527,6 +749,26 @@ double road_node::state::width() const return total; } +// the same for the lanes the piece has at an end of the axis +double road_node::state::width(int const End) const +{ + double total{0.0}; + for (std::size_t lane = 0; lane < lanes.size(); ++lane) + { + if (lane_at(lane, End)) + { + total += lanes[lane].width; + } + } + return total; +} + +// combined width of the lanes at specified part of the length of the axis, with the taper counted in +double road_node::state::breadth(double const Fraction) const +{ + return glm::mix(width(0) * taper[0], width(1) * taper[1], taper_progress(Fraction)); +} + // what the widths of the lanes are multiplied by at specified value of the curve parameter double road_node::state::scale(double const T) const { @@ -556,10 +798,30 @@ double road_node::state::divide() const return offset; } +// the same for the lanes the piece has at an end of the axis +double road_node::state::divide(int const End) const +{ + auto offset{0.5 * width(End)}; + for (std::size_t idx = 0; idx < static_cast(backward) && idx < lanes.size(); ++idx) + { + if (lane_at(idx, End)) + { + offset -= lanes[idx].width; + } + } + return offset; +} + +// the same at specified part of the length of the axis, with the taper counted in +double road_node::state::middle(double const Fraction) const +{ + return glm::mix(divide(0) * taper[0], divide(1) * taper[1], taper_progress(Fraction)); +} + // width of the whole roadway at specified value of the curve parameter double road_node::state::span(double const T) const { - return width() * scale(T) + median_width(T); + return (changing() ? breadth(T) : width() * scale(T)) + median_width(T); } // shape of the middle of a lane, laid out in the direction of travel @@ -567,49 +829,30 @@ segment_data road_node::state::lane_path(std::size_t const Lane) const { road_axis const centre{axis}; // on a road which gets wider or narrower the lane moves away from the axis or towards it along the way, - // and so it does where the two directions are led apart + // and so it does where the two directions are led apart, or where the road gains or loses lanes auto const side{Lane < static_cast(backward) ? 0.5 : -0.5}; - auto const beginoffset{lane_offset(Lane) * taper[0] + side * median_width(0.0)}; - auto const endoffset{lane_offset(Lane) * taper[1] + side * median_width(1.0)}; - auto const begin{centre.frame(0.0)}; - auto const end{centre.frame(1.0)}; + auto const beginoffset{lane_offset(Lane, 0) * taper[0] + side * median_width(0.0)}; + auto const endoffset{lane_offset(Lane, 1) * taper[1] + side * median_width(1.0)}; + return lane_shape(offset_path(axis, centre, 0.0, 1.0, beginoffset, endoffset), Lane < static_cast(backward)); +} - segment_data path; - path.points[segment_data::point::start] = begin.position + begin.left * beginoffset; - path.points[segment_data::point::end] = end.position + end.left * endoffset; - if (centre.curved() || beginoffset != endoffset) - { - // a line running beside a bend is shorter or longer than the bend itself, and so are its control vectors. - // the control vectors go along the axis at both ends, which is what makes the lane meet the next piece without a bend - path.points[segment_data::point::control1] = centre.control(0) * std::max(0.05, 1.0 - beginoffset * std::cos(begin.roll) * centre.curvature(0.0)); - path.points[segment_data::point::control2] = centre.control(1) * std::max(0.05, 1.0 - endoffset * std::cos(end.roll) * centre.curvature(1.0)); - // if the roll changes along the road its sides rise or fall relative to the axis - auto const climb{(endoffset * std::sin(end.roll) - beginoffset * std::sin(begin.roll)) / 3.0}; - path.points[segment_data::point::control1].y += climb; - path.points[segment_data::point::control2].y -= climb; - } - path.rolls = axis.rolls; - if (axis.radius != 0.f) - { - // the lanes on the inner side of the bend have it tighter - auto const turn{centre.curvature(0.5) >= 0.0 ? 1.0 : -1.0}; - path.radius = static_cast(std::max(1.0, std::abs(axis.radius) - turn * 0.5 * (beginoffset + endoffset))); - } - if (Lane < static_cast(backward)) - { - // the lane goes against the axis - std::swap(path.points[segment_data::point::start], path.points[segment_data::point::end]); - std::swap(path.points[segment_data::point::control1], path.points[segment_data::point::control2]); - path.rolls = {-axis.rolls[1], -axis.rolls[0]}; - } - if (Global.bRollFix) - { - // with this setting on a rolled path gets raised when it's set up, by an amount fit for a railway track. - // the surface of the road stays where it is, so the lane is lowered beforehand to make up for it - path.points[segment_data::point::start].y -= std::abs(std::sin(glm::radians(static_cast(path.rolls[0])))) * 0.75; - path.points[segment_data::point::end].y -= std::abs(std::sin(glm::radians(static_cast(path.rolls[1])))) * 0.75; - } - return path; +// shape of the way from the middle of a lane to the middle of another over a part of the axis, laid out in the direction of travel +segment_data road_node::state::lane_path(std::size_t const Lane, std::size_t const Tolane, double const From, double const To) const +{ + road_axis const centre{axis}; + auto const against{Lane < static_cast(backward)}; + // the traffic going against the axis gets to the part by its far end + auto const fromoffset{lane_position(against ? Tolane : Lane, centre.fraction(From))}; + auto const tooffset{lane_position(against ? Lane : Tolane, centre.fraction(To))}; + return lane_shape(offset_path(axis, centre, From, To, fromoffset, tooffset), against); +} + +// part of the axis over which a piece which gains or loses lanes leads the lanes it has at one end to the lanes it has at the other +std::array road_node::state::change_range() const +{ + road_axis const centre{axis}; + auto const lead{std::min(lane_lead, 0.2 * centre.length())}; + return {centre.parameter(lead), centre.parameter(centre.length() - lead)}; } // length of the axis @@ -654,6 +897,8 @@ void road_node::import(cParser &Input, glm::dvec3 const &Offset) }; std::vector laneproperties; std::vector changeproperties; + // lanes at the end of the axis, if these are other than the ones at its start + std::array endlanes{-1, -1}; auto token{Input.getToken()}; while (false == token.empty() && token != "endroad") @@ -664,6 +909,12 @@ void road_node::import(cParser &Input, glm::dvec3 const &Offset) Input.getTokens(2); Input >> m_state.forward >> m_state.backward; } + else if (token == "lanesto") + { + // lanesto + Input.getTokens(2); + Input >> endlanes[0] >> endlanes[1]; + } else if (token == "width") { Input.getTokens(); @@ -848,6 +1099,29 @@ void road_node::import(cParser &Input, glm::dvec3 const &Offset) ErrorLog("Bad road: " + label + " has no lanes, a single one is used instead"); } auto const environment{m_state.environment}; + if (endlanes[0] >= 0 || endlanes[1] >= 0) + { + if (std::max(0, endlanes[0]) + std::max(0, endlanes[1]) <= 0) + { + ErrorLog("Bad road: " + label + " has no lanes at its end, a single one is used instead"); + } + m_state.lanes_between(m_state.forward, m_state.backward, endlanes[0], endlanes[1]); + // the traffic going along the axis gets on the piece at its start, the one going against it at its end + int const gains[]{m_state.lanes_at(1, true) - m_state.lanes_at(0, true), m_state.lanes_at(0, false) - m_state.lanes_at(1, false)}; + int const leaving[]{m_state.lanes_at(1, true), m_state.lanes_at(0, false)}; + int const arriving[]{m_state.lanes_at(0, true), m_state.lanes_at(1, false)}; + for (int direction = 0; direction < 2; ++direction) + { + if (arriving[direction] > 0 && gains[direction] > 2) + { + ErrorLog("Bad road: " + label + " gains more than two lanes at once, the ones past the second can't be got on"); + } + if (arriving[direction] > 0 && leaving[direction] == 0) + { + ErrorLog("Bad road: " + label + " has lanes which lead nowhere, as their direction ends within it"); + } + } + } m_state.normalize(); if (environment != m_state.environment) { @@ -924,10 +1198,202 @@ void road_node::define(state const &State) // creates paths of the lanes and hands them over to the simulation void road_node::create_lanes() { - m_tracks.assign(m_state.lanes.size(), nullptr); - for (std::size_t lane = 0; lane < m_state.lanes.size(); ++lane) + auto const count{m_state.lanes.size()}; + m_tracks.clear(); + for (auto &tracks : m_lanetracks) { - m_tracks[lane] = create_track(m_name.empty() ? std::string{} : m_name + ":" + m_state.lane_id(lane), m_state.lane_path(lane), m_state.lanes[lane].width, m_state.lanes[lane].velocity); + tracks.assign(count, nullptr); + } + auto const range{m_state.change_range()}; + for (std::size_t lane = 0; lane < count; ++lane) + { + auto const along{lane >= static_cast(m_state.backward)}; + auto const name{m_name.empty() ? std::string{} : m_name + ":" + m_state.lane_id(lane)}; + auto const &data{m_state.lanes[lane]}; + if (m_state.missing[0][along ? 0 : 1] == 0 && m_state.missing[1][along ? 0 : 1] == 0) + { + // the direction keeps its lanes all the way, and so each of them is a single path + auto *track{create_track(name, m_state.lane_path(lane), data.width, data.velocity)}; + m_lanetracks[0][lane] = track; + m_lanetracks[1][lane] = track; + m_tracks.emplace_back(track); + continue; + } + // the direction gains or loses lanes along the way. a lane gets a short path at each end the piece has it at, which is what + // the neighbours and the junctions join; what leads from the ones at one end to the ones at the other is made by create_links() + for (int end = 0; end < 2; ++end) + { + if (false == m_state.lane_at(lane, end)) + { + continue; + } + // the traffic going along the axis gets on the piece at its start + auto const entry{(end == 0) == along}; + auto *track{create_track(name.empty() || entry ? name : name + ":out", m_state.lane_path(lane, lane, end == 0 ? 0.0 : range[1], end == 0 ? range[0] : 1.0), data.width, data.velocity)}; + m_lanetracks[end][lane] = track; + m_tracks.emplace_back(track); + } + } +} + +// makes the paths which lead the lanes the piece has at one end to the lanes it has at the other, where these differ +void road_node::create_links() +{ + if (false == m_links.empty() || false == m_state.changing() || m_lanetracks[0].size() != m_state.lanes.size()) + { + return; + } + auto const range{m_state.change_range()}; + std::ostringstream text; + text.precision(std::numeric_limits::digits10); + auto const write_point = [&text](glm::dvec3 const &Point) { text << Point.x << ' ' << Point.y << ' ' << Point.z << ' '; }; + for (int direction = 0; direction < 2; ++direction) + { + if (m_state.missing[0][direction] == 0 && m_state.missing[1][direction] == 0) + { + continue; + } + auto const along{direction == 0}; + // ends of the axis the traffic of the direction gets on the piece and leaves it by + auto const entry{along ? 0 : 1}; + auto const exit{1 - entry}; + auto const arriving{m_state.lanes_at(entry, along)}; + auto const leaving{m_state.lanes_at(exit, along)}; + // place of a lane of the direction, counted from where the directions meet, in the left to right order + auto const index = [&](int const Number) { return static_cast(along ? m_state.backward + Number - 1 : m_state.backward - Number); }; + for (int number = 1; number <= arriving && leaving > 0; ++number) + { + auto const lane{index(number)}; + auto *head{m_lanetracks[entry][lane]}; + if (head == nullptr) + { + continue; + } + // a lane leads to itself; one the road loses leads to the outermost lane left, and the outermost lane of a road + // which gains lanes leads to these as well. a path has up to three ways out, so that's two lanes gained at most + std::vector targets{index(std::min(number, leaving))}; + for (int extra = arriving + 1; number == arriving && extra <= leaving && targets.size() < 3; ++extra) + { + targets.emplace_back(index(extra)); + } + std::vector tails; + std::vector ways; + for (auto const target : targets) + { + if (m_lanetracks[exit][target] != nullptr) + { + tails.emplace_back(m_lanetracks[exit][target]); + ways.emplace_back(m_state.lane_path(lane, target, range[0], range[1])); + } + } + if (tails.empty()) + { + continue; + } + m_ways.insert(m_ways.end(), ways.begin(), ways.end()); + auto const name{m_name.empty() ? std::string{} : m_name + ":" + m_state.lane_id(lane) + ":way"}; + auto const &data{m_state.lanes[lane]}; + if (tails.size() == 1) + { + auto *link{create_track(name, ways[0], data.width, data.velocity)}; + // tied by hand: lanes the road loses end where the one they lead to carries on, which is more than joining path ends can express + head->ConnectNextPrev(link, 0); + link->trNext = tails[0]; + link->iNextDirection = 0; + if (tails[0]->trPrev == nullptr) + { + tails[0]->trPrev = link; + tails[0]->iPrevDirection = 1; + } + m_links.emplace_back(link); + continue; + } + // a fork is a crossroads, which is what the drivers know how to pick a way through. the ways leave the lane + // the way it goes, and each joins its lane the way that one goes + // NOTE: a crossroads isn't set up the way a rolled path is, so its points are given as they are and it's level across + auto const raise = [](glm::dvec3 Point, float const Roll) { + if (Global.bRollFix) + { + Point.y += std::abs(std::sin(glm::radians(static_cast(Roll)))) * 0.75; + } + return Point; + }; + auto const start{raise(ways[0].points[segment_data::point::start], ways[0].rolls[0])}; + auto const startcontrol{ways[0].points[segment_data::point::control1]}; + std::vector ends; + std::vector endcontrols; + for (auto const &way : ways) + { + ends.emplace_back(raise(way.points[segment_data::point::end], way.rolls[1])); + endcontrols.emplace_back(way.points[segment_data::point::control2]); + } + text.str(""); + text << "cross " << glm::distance(start, ends[0]) << ' ' << data.width << ' ' << m_state.friction << ' ' << m_state.sounddistance << ' ' << m_state.quality << " 0 " << m_state.environment + << " unvis "; + // first path: from the lane to itself + write_point(start); + text << "0 "; + write_point(startcontrol); + write_point(endcontrols[0]); + write_point(ends[0]); + text << "0 0 "; + if (ways.size() == 2) + { + // second path of a crossroads of three roads starts where the first one does + write_point(start); + text << "0 "; + write_point(startcontrol); + write_point(endcontrols[1]); + write_point(ends[1]); + text << "0 0 "; + } + else + { + // second path of a crossroads of four roads runs between its third and fourth point + write_point(ends[1]); + text << "0 "; + write_point(endcontrols[1]); + write_point(endcontrols[2]); + write_point(ends[2]); + text << "0 0 "; + } + if (data.velocity > 0.f) + { + text << "velocity " << data.velocity << ' '; + } + text << "endtrack"; + auto *link{create_track(name, text.str())}; + if (link->SwitchExtension != nullptr) + { + auto &extension{*link->SwitchExtension}; + // the points of the crossroads are stored as: first, second, fourth, third + extension.pPrevs[0] = head; + extension.iPrevDirection[0] = 1; + extension.pNexts[0] = tails[0]; + extension.iNextDirection[0] = 0; + extension.pPrevs[1] = (tails.size() == 3 ? tails[2] : tails[1]); + extension.iPrevDirection[1] = 0; + extension.pNexts[1] = (tails.size() == 3 ? tails[1] : nullptr); + extension.iNextDirection[1] = 0; + link->Switch(0); + head->trNext = link; + head->iNextDirection = 0; + // the drivers take each of the lanes as readily as any other + link->m_routeweights = {100.f, 100.f, tails.size() == 3 ? 100.f : 0.f}; + // the lanes get to know the path leading to them, for whatever goes backwards and for those who look who's coming + int const ends2[]{1, 2}; + int const ends3[]{1, 3, 2}; + for (std::size_t idx = 0; idx < tails.size(); ++idx) + { + if (tails[idx]->trPrev == nullptr) + { + tails[idx]->trPrev = link; + tails[idx]->iPrevDirection = (tails.size() == 3 ? ends3[idx] : ends2[idx]); + } + } + } + m_links.emplace_back(link); + } } } @@ -935,7 +1401,7 @@ void road_node::create_lanes() void road_node::close_ends() { // NOTE: without the link a vehicle reaching the end would be sent back on the lane it came by, against its direction - if (m_tracks.size() != m_state.lanes.size()) + if (m_lanetracks[0].size() != m_state.lanes.size()) { return; } @@ -944,12 +1410,12 @@ void road_node::close_ends() { // the lanes going along the axis leave the road at its end, the ones going against it leave at its start auto const outwards{end == 1 ? axis.frame(1.0).tangent : -axis.frame(0.0).tangent}; - for (int pair = 1; pair <= std::min(m_state.forward, m_state.backward); ++pair) + for (int pair = 1; pair <= std::min(m_state.lanes_at(end, true), m_state.lanes_at(end, false)); ++pair) { auto const forward{static_cast(m_state.backward + pair - 1)}; auto const backward{static_cast(m_state.backward - pair)}; - auto *exit{m_tracks[end == 1 ? forward : backward]}; - auto *entry{m_tracks[end == 1 ? backward : forward]}; + auto *exit{m_lanetracks[end][end == 1 ? forward : backward]}; + auto *entry{m_lanetracks[end][end == 1 ? backward : forward]}; if (exit == nullptr || entry == nullptr || exit->trNext != nullptr || entry->trPrev != nullptr) { continue; @@ -974,6 +1440,13 @@ std::vector road_node::release_lanes() { std::vector released; released.swap(m_tracks); + released.insert(released.end(), m_links.begin(), m_links.end()); + m_links.clear(); + m_ways.clear(); + for (auto &tracks : m_lanetracks) + { + tracks.clear(); + } released.erase(std::remove(released.begin(), released.end(), nullptr), released.end()); return released; } @@ -989,7 +1462,7 @@ std::vector road_node::release_turns() // true if there's a vehicle on any path of the road bool road_node::occupied() const { - for (auto const *tracks : {&m_tracks, &m_turns}) + for (auto const *tracks : {&m_tracks, &m_links, &m_turns}) { for (auto const *track : *tracks) { @@ -1039,26 +1512,42 @@ std::vector road_node::create_shapes() const auto const widest{static_cast(std::max(road.median.width[0], road.median.width[1]))}; auto const height{static_cast(road.kerbheight)}; auto const usable = [](std::string const &Material) { return false == Material.empty() && Material != "none"; }; + // on a piece which gains or loses lanes the edges and the line the directions meet at move across the axis along the way, + // so what's laid along them is measured from them. elsewhere they keep their distance from the axis, and it's measured from the axis + auto const changing{road.changing()}; + // distance of one of these lines from the axis, on a road as wide as its lanes say + auto const distance = [&](int const Line) { return Line == anchor_left ? halfwidth : Line == anchor_right ? -halfwidth : Line == anchor_middle ? divide : 0.0; }; + // where the line the directions meet at is, for specified distance from the start of the axis + auto const meeting = [&](double const Station) { + return changing ? road.middle(Station / length) : divide * glm::mix(static_cast(road.taper[0]), static_cast(road.taper[1]), taper_progress(Station / length)); + }; // surface. the image is centered on the axis, and repeated if the road is wider if (road.surface != "none") { auto const tile{static_cast(texture_ratio(road.surface)) * texturelength}; - auto const corner = [&](double const Offset, double const Spread) { return profile_point{Offset, 0.0, static_cast(0.5 + (Offset + Spread * widest) / tile), 0.0, Spread}; }; + auto const corner = [&](int const Line, double const Spread) { + if (changing) + { + return profile_point{0.0, 0.0, 0.5f, 0.0, Spread, 0.0, 0.0, Line, tile}; + } + auto const offset{distance(Line)}; + return profile_point{offset, 0.0, static_cast(0.5 + (offset + Spread * widest) / tile), 0.0, Spread}; + }; auto &surface{vertices(road.surface, lighting_data{})}; if (false == divided) { - loft(surface, axis, {corner(halfwidth, 0.0), corner(-halfwidth, 0.0)}, 0.0, length, step, texturelength, road); + loft(surface, axis, {corner(anchor_left, 0.0), corner(anchor_right, 0.0)}, 0.0, length, step, texturelength, road); } else { - loft(surface, axis, {corner(halfwidth, 0.5), corner(divide, 0.5)}, 0.0, length, step, texturelength, road); + loft(surface, axis, {corner(anchor_left, 0.5), corner(anchor_middle, 0.5)}, 0.0, length, step, texturelength, road); if (road.median.type != median_type::gap) { // the surface carries on between the roadways; an island stands on it, so there's something under its rounded ends - loft(surface, axis, {corner(divide, 0.5), corner(divide, -0.5)}, 0.0, length, step, texturelength, road); + loft(surface, axis, {corner(anchor_middle, 0.5), corner(anchor_middle, -0.5)}, 0.0, length, step, texturelength, road); } - loft(surface, axis, {corner(divide, -0.5), corner(-halfwidth, -0.5)}, 0.0, length, step, texturelength, road); + loft(surface, axis, {corner(anchor_middle, -0.5), corner(anchor_right, -0.5)}, 0.0, length, step, texturelength, road); } } @@ -1087,7 +1576,7 @@ std::vector road_node::create_shapes() const stations.emplace_back(length - nose[1] * (1.0 - std::sin(quarter * idx / nosesteps))); } // middle of the island and half of its width, for specified distance from the start of the axis - auto const middle = [&](double const Station) { return divide * glm::mix(static_cast(road.taper[0]), static_cast(road.taper[1]), taper_progress(Station / length)); }; + auto const &middle{meeting}; auto const half = [&](double const Station) { auto result{0.5 * glm::mix(static_cast(road.median.width[0]), static_cast(road.median.width[1]), taper_progress(Station / length))}; if (Station < nose[0]) @@ -1169,7 +1658,8 @@ std::vector road_node::create_shapes() const auto const emit = [&](std::string const &Material, std::vector Profile) { for (auto &point : Profile) { - point.offset = direction * halfwidth; + point.offset = (changing ? 0.0 : direction * halfwidth); + point.anchor = (changing ? (side == 0 ? anchor_left : anchor_right) : anchor_axis); point.spread = (divided ? direction * 0.5 : 0.0); point.shift *= direction; point.grow *= direction; @@ -1187,7 +1677,7 @@ std::vector road_node::create_shapes() const auto const tile{static_cast(texture_ratio(Material)) * texturelength}; for (int end = 0; end < 2; ++end) { - auto const edge{direction * (halfwidth * road.taper[end] + (divided ? 0.5 * road.median.width[end] : 0.0))}; + auto const edge{direction * (0.5 * road.width(end) * road.taper[end] + (divided ? 0.5 * road.median.width[end] : 0.0))}; cap(vertices(Material, lighting_data{}), axis.at(end == 0 ? 0.0 : length), {{edge + direction * From, 0.0, 0.f}, {edge + direction * From, height, 0.f}, {edge + direction * To, height, 0.f}, {edge + direction * To, 0.0, 0.f}}, end == 1, tile); } @@ -1258,30 +1748,79 @@ std::vector road_node::create_shapes() const paint.ambient = paint.diffuse; auto &lines{vertices("colored", paint)}; - // Offset: where the line runs on a road as wide as its lanes say, Shift: how far from there it's kept whatever the width, - // Spread: which of the roadways it goes with, where the road has two - auto const solid = [&](double const Offset, double const Shift, double const Spread) { - std::vector const line{{Offset, line_lift, 0.f, Shift + 0.5 * line_width, Spread}, {Offset, line_lift, 1.f, Shift - 0.5 * line_width, Spread}}; - loft(lines, axis, line, 0.0, length, std::min(step, dash_step), texturelength, road); + // Line, Offset: where the line runs on a road as wide as its lanes say, as a distance from one of the lines of the road, + // Shift: how far from there it's kept whatever the width, Spread: which of the roadways it goes with, where the road has two, + // From, To: part of the piece it's painted on + auto const solid = [&](int const Line, double const Offset, double const Shift, double const Spread, double const From, double const To) { + std::vector const line{{Offset, line_lift, 0.f, Shift + 0.5 * line_width, Spread, 0.0, 0.0, Line}, + {Offset, line_lift, 1.f, Shift - 0.5 * line_width, Spread, 0.0, 0.0, Line}}; + loft(lines, axis, line, From, To, std::min(step, dash_step), texturelength, road); }; // the dashes are fitted so the gaps at both ends of the road are a half of the regular one, which makes them match the next piece - auto const dashed = [&](double const Offset, double const Shift, double const Spread) { + auto const dashed = [&](int const Line, double const Offset, double const Shift, double const Spread, double const From, double const To) { auto const count{std::max(1, static_cast(std::lround(length / dash_period)))}; auto const period{length / count}; - std::vector const line{{Offset, line_lift, 0.f, Shift + 0.5 * line_width, Spread}, {Offset, line_lift, 1.f, Shift - 0.5 * line_width, Spread}}; + std::vector const line{{Offset, line_lift, 0.f, Shift + 0.5 * line_width, Spread, 0.0, 0.0, Line}, + {Offset, line_lift, 1.f, Shift - 0.5 * line_width, Spread, 0.0, 0.0, Line}}; for (int dash = 0; dash < count; ++dash) { auto const from{(dash + 1.0 / 3.0) * period}; + if (from < From || from + period / 3.0 > To) + { + continue; + } loft(lines, axis, line, from, from + period / 3.0, dash_step, texturelength, road); } }; + // part of the piece the line between two lanes is painted on. a lane the road gains or loses along the piece + // gets its line where there's room for a half of it + auto const stretch = [&](std::size_t const Boundary) { + auto const against{static_cast(road.backward)}; + std::pair result{0.0, length}; + if (false == changing || Boundary + 1 == against) + { + return result; + } + // the one of the two which is further from where the directions meet + auto const outer{Boundary + 1 < against ? Boundary : Boundary + 1}; + if (road.lane_at(outer, 0) && road.lane_at(outer, 1)) + { + return result; + } + // what the direction needs to be as wide as for the line, on a road as wide as its lanes say + auto needed{0.5 * road.lanes[outer].width}; + for (auto lane{outer < against ? outer + 1 : against}; lane < (outer < against ? against : outer); ++lane) + { + needed += road.lanes[lane].width; + } + int const samples{64}; + auto const room = [&](int const Sample) { + auto const fraction{static_cast(Sample) / samples}; + auto const half{0.5 * road.breadth(fraction)}; + auto const middle{road.middle(fraction)}; + auto const scale{glm::mix(static_cast(road.taper[0]), static_cast(road.taper[1]), taper_progress(fraction))}; + return (outer < against ? half - middle : half + middle) >= needed * scale; + }; + auto first{0}; + while (first <= samples && false == room(first)) + { + ++first; + } + auto last{samples}; + while (last >= first && false == room(last)) + { + --last; + } + result = {length * first / samples, length * last / samples}; + return result; + }; // edges of the surface auto const inset{edge_inset + 0.5 * line_width}; - if (halfwidth * std::min(road.taper[0], road.taper[1]) - inset > 0.5) + if (0.5 * std::min(road.width(0) * road.taper[0], road.width(1) * road.taper[1]) - inset > 0.5) { - solid(halfwidth, -inset, divided ? 0.5 : 0.0); - solid(-halfwidth, inset, divided ? -0.5 : 0.0); + solid(changing ? anchor_left : anchor_axis, changing ? 0.0 : halfwidth, -inset, divided ? 0.5 : 0.0, 0.0, length); + solid(changing ? anchor_right : anchor_axis, changing ? 0.0 : -halfwidth, inset, divided ? -0.5 : 0.0, 0.0, length); } // lines between the lanes. a lane can be left across a dashed line, or across a pair of lines if the dashed one is on its side auto offset{halfwidth}; @@ -1290,11 +1829,19 @@ std::vector road_node::create_shapes() const offset -= road.lanes[boundary].width; auto const opposite{road.backward > 0 && boundary + 1 == static_cast(road.backward)}; auto const pair{0.5 * (line_width + line_spacing)}; + // the lanes keep their widths, and so the lines between them keep their distance from where the directions meet + auto const from{changing ? anchor_middle : anchor_axis}; + auto const place{changing ? offset - divide : offset}; + auto const range{stretch(boundary)}; + if (changing && range.second - range.first < 1.0) + { + continue; + } if (opposite && divided) { // each of the two roadways gets its edge line - solid(offset, inset, 0.5); - solid(offset, -inset, -0.5); + solid(from, place, inset, 0.5, range.first, range.second); + solid(from, place, -inset, -0.5, range.first, range.second); continue; } auto const spread{false == divided ? 0.0 : boundary + 1 < static_cast(road.backward) ? 0.5 : -0.5}; @@ -1302,19 +1849,19 @@ std::vector road_node::create_shapes() const { case change_both: { - dashed(offset, 0.0, spread); + dashed(from, place, 0.0, spread, range.first, range.second); break; } case change_toright: { - dashed(offset, pair, spread); - solid(offset, -pair, spread); + dashed(from, place, pair, spread, range.first, range.second); + solid(from, place, -pair, spread, range.first, range.second); break; } case change_toleft: { - solid(offset, pair, spread); - dashed(offset, -pair, spread); + solid(from, place, pair, spread, range.first, range.second); + dashed(from, place, -pair, spread, range.first, range.second); break; } default: @@ -1322,12 +1869,12 @@ std::vector road_node::create_shapes() const if (opposite) { // traffic going opposite ways is kept apart with a double line - solid(offset, pair, spread); - solid(offset, -pair, spread); + solid(from, place, pair, spread, range.first, range.second); + solid(from, place, -pair, spread, range.first, range.second); } else { - solid(offset, 0.0, spread); + solid(from, place, 0.0, spread, range.first, range.second); } break; } @@ -1344,8 +1891,7 @@ std::vector road_node::create_shapes() const auto const edge = [&](double const Station, double const Side) { auto const station{std::clamp(Station, 0.0, length)}; auto const frame{axis.at(station)}; - auto const scale{glm::mix(static_cast(road.taper[0]), static_cast(road.taper[1]), taper_progress(station / length))}; - return frame.position + frame.left * (divide * scale + Side * std::max(0.0, 0.5 * gap_at(station) - 2.0 * inset)) + up * line_lift; + return frame.position + frame.left * (meeting(station) + Side * std::max(0.0, 0.5 * gap_at(station) - 2.0 * inset)) + up * line_lift; }; // the stripes are spread evenly over the piece, and none of them reaches past its ends auto const count{std::max(1, static_cast(std::lround(length / period)))}; @@ -1529,6 +2075,27 @@ double lane_grade(TTrack const &Lane, bool const Atend) return run > 1e-6 ? direction.y / run : 0.0; } +// what a driver calls the way of a fork which leads to specified lane: the number of the path of the crossroads it's on, +// negative if it's taken against the path. 0 if the fork doesn't lead to the lane +int fork_code(TTrack const &Fork, TTrack const *Lane) +{ + if (Fork.SwitchExtension == nullptr || Lane == nullptr) + { + return 0; + } + auto const &extension{*Fork.SwitchExtension}; + if (extension.pNexts[0] == Lane) + { + return 1; + } + if (extension.pNexts[1] != nullptr) + { + // three ways out + return extension.pNexts[1] == Lane ? 5 : extension.pPrevs[1] == Lane ? -4 : 0; + } + return extension.pPrevs[1] == Lane ? -2 : 0; +} + } // namespace // puts provided shapes in the section of the scene holding specified point @@ -1997,6 +2564,60 @@ void junction_node::define(state const &State) m_area.radius = -1.f; } +// a junction of two roads is a stretch where a road changes its lanes, which a road can do by itself +bool junction_node::as_road(road_node::state &Road) const +{ + auto const &arms{m_state.arms}; + if (arms.size() != 2) + { + return false; + } + auto const &from{arms[0]}; + auto const &to{arms[1]}; + auto const span{glm::distance(from.position, to.position)}; + if (span < 0.1) + { + return false; + } + road_node::state road; + // the axis is the way from the first road to the second, which leaves and joins them the way they go + road.axis.points[segment_data::point::start] = from.position; + road.axis.points[segment_data::point::control1] = glm::dvec3{0.0} - flat(from.direction) * (0.39 * span); + road.axis.points[segment_data::point::control2] = glm::dvec3{0.0} - flat(to.direction) * (0.39 * span); + road.axis.points[segment_data::point::end] = to.position; + // at the first road the lanes leading into the junction go the way the axis does, at the second one it's the lanes leading out of it + road.lanewidth = from.width; + road.velocity = m_state.velocity; + road.lanes_between(from.incoming, from.outgoing, to.outgoing, to.incoming); + road.taper = {1.f, from.width > 0.f ? to.width / from.width : 1.f}; + road.median.type = m_state.median; + road.median.material = m_state.medianmaterial; + road.median.width = {from.median, to.median}; + road.surface = m_state.surface; + road.texturelength = m_state.texturelength; + road.markings = m_state.markings; + road.sides = {m_state.side, m_state.side}; + road.kerbs = {m_state.kerbs, m_state.kerbs}; + road.kerbwidth = m_state.kerbwidth; + road.kerbmaterial = m_state.kerbmaterial; + road.kerbheight = m_state.kerbheight; + road.slope = m_state.slope; + // the bank of the corner which starts at the first road runs along the right edge. the one which starts at the second road + // runs along the left edge, the other way + road.banks[1] = from.bank; + road.banks[0] = to.bank; + std::swap(road.banks[0].width[0], road.banks[0].width[1]); + std::swap(road.banks[0].drop[0], road.banks[0].drop[1]); + road.bankmaterial = m_state.bankmaterial; + road.friction = m_state.friction; + road.sounddistance = m_state.sounddistance; + road.quality = m_state.quality; + road.environment = m_state.environment; + road.normalize(); + Road = road; + return true; +} + // makes paths leading through the junction, between the lanes of the roads attached to it at the moment void junction_node::create_links() { @@ -2016,7 +2637,7 @@ void junction_node::create_links() lanes[arm].outgoing.assign(static_cast(arms[arm].outgoing), nullptr); for (auto const *road : simulation::Roads.sequence()) { - if (road == nullptr || road->m_editorremoved || road->tracks().size() != road->definition().lanes.size()) + if (road == nullptr || road->m_editorremoved) { continue; } @@ -2031,18 +2652,21 @@ void junction_node::create_links() // the lanes heading for this end of the road lead into the junction, the others lead out of it for (int lane = 1; lane <= arms[arm].incoming; ++lane) { + // the road may have other lanes at its other end; it's the ones it has here which count auto const index{layout.lane_index((atend ? "f" : "b") + std::to_string(lane))}; - if (index >= 0 && road->tracks()[index] != nullptr && glm::distance(glm::dvec3{road->tracks()[index]->CurrentSegment()->FastGetPoint_1()}, m_state.lane_point(arm, true, lane)) < junction_fit) + auto *track{index >= 0 ? road->lane_track(static_cast(index), atend ? 1 : 0) : nullptr}; + if (track != nullptr && glm::distance(glm::dvec3{track->CurrentSegment()->FastGetPoint_1()}, m_state.lane_point(arm, true, lane)) < junction_fit) { - lanes[arm].incoming[lane - 1] = road->tracks()[index]; + lanes[arm].incoming[lane - 1] = track; } } for (int lane = 1; lane <= arms[arm].outgoing; ++lane) { auto const index{layout.lane_index((atend ? "b" : "f") + std::to_string(lane))}; - if (index >= 0 && road->tracks()[index] != nullptr && glm::distance(glm::dvec3{road->tracks()[index]->CurrentSegment()->FastGetPoint_0()}, m_state.lane_point(arm, false, lane)) < junction_fit) + auto *track{index >= 0 ? road->lane_track(static_cast(index), atend ? 1 : 0) : nullptr}; + if (track != nullptr && glm::distance(glm::dvec3{track->CurrentSegment()->FastGetPoint_0()}, m_state.lane_point(arm, false, lane)) < junction_fit) { - lanes[arm].outgoing[lane - 1] = road->tracks()[index]; + lanes[arm].outgoing[lane - 1] = track; } } } @@ -2339,15 +2963,39 @@ void junction_node::create_gates() auto &gate{m_gates[index]}; // lanes the vehicles heading for the junction are on: the one leading in, and the same lane of the pieces before it gate.approach.emplace_back(gate.entry); + gate.wishes.emplace_back(0); auto reach{glm::distance(glm::dvec3{gate.entry->CurrentSegment()->FastGetPoint_0()}, glm::dvec3{gate.entry->CurrentSegment()->FastGetPoint_1()})}; for (auto *lane{gate.entry}; reach < gate_reach && gate.approach.size() < 16;) { auto *previous{lane->trPrev}; - if (previous == nullptr || previous->trNext != lane || dynamic_cast(previous->m_road) == nullptr || previous->m_paths.size() != 1) + // lanes a road loses join the one which is left: the vehicles on the paths leading them here are coming this way too + if (auto const *owner{dynamic_cast(lane->m_road)}; owner != nullptr) + { + for (auto *link : owner->links()) + { + if (link != previous && link->trNext == lane && link->m_paths.size() == 1) + { + gate.approach.emplace_back(link); + gate.wishes.emplace_back(0); + } + } + } + auto wish{0}; + if (previous != nullptr && previous->m_paths.size() > 1 && dynamic_cast(previous->m_road) != nullptr) + { + // a path on which a road forks into more lanes: of the vehicles on it the ones which picked the way leading here count + wish = fork_code(*previous, lane); + if (wish == 0) + { + break; + } + } + else if (previous == nullptr || previous->trNext != lane || dynamic_cast(previous->m_road) == nullptr || previous->m_paths.size() != 1) { break; } gate.approach.emplace_back(previous); + gate.wishes.emplace_back(wish); reach += glm::distance(glm::dvec3{previous->CurrentSegment()->FastGetPoint_0()}, glm::dvec3{previous->CurrentSegment()->FastGetPoint_1()}); lane = previous; } @@ -2457,14 +3105,25 @@ void junction_node::update(double const Deltatime) { TDynamicObject *first{nullptr}; auto nearest{std::numeric_limits::max()}; - for (auto const *lane : gate.approach) + for (std::size_t idx = 0; idx < gate.approach.size(); ++idx) { + auto *lane{gate.approach[idx]}; + auto const wish{idx < gate.wishes.size() ? gate.wishes[idx] : 0}; for (auto *vehicle : lane->Dynamics) { if (vehicle == nullptr) { continue; } + if (wish != 0) + { + // on a fork: the ones which picked another lane aren't coming this way + auto const picked{vehicle->RouteWish(lane)}; + if (picked != 0 && picked != wish) + { + continue; + } + } auto const position{vehicle->GetPosition()}; auto const distance{glm::distance(glm::dvec2{position.x, position.z}, glm::dvec2{gate.line.x, gate.line.z})}; if (distance < nearest) @@ -3375,7 +4034,13 @@ TTrack *road_node::create_track(std::string const &Name, segment_data const &Pat } text << "endtrack"; - cParser parser(text.str(), cParser::buffer_TEXT); + return create_track(Name, text.str()); +} + +// creates a path for the vehicles from its definition and registers it with the simulation +TTrack *road_node::create_track(std::string const &Name, std::string const &Definition) +{ + cParser parser(Definition, cParser::buffer_TEXT); scene::node_data nodedata; nodedata.range_max = -1.0; nodedata.name = Name; @@ -3435,7 +4100,12 @@ void road_node::export_as_text_(std::ostream &Output) const << road.axis.radius << ' '; Output.precision(precision); // lanes - Output << "lanes " << road.forward << ' ' << road.backward << ' ' << "width " << road.lanewidth << ' '; + Output << "lanes " << road.lanes_at(0, true) << ' ' << road.lanes_at(0, false) << ' '; + if (road.changing()) + { + Output << "lanesto " << road.lanes_at(1, true) << ' ' << road.lanes_at(1, false) << ' '; + } + Output << "width " << road.lanewidth << ' '; if (road.taper[0] != 1.f || road.taper[1] != 1.f) { Output << "taper " << road.taper[0] << ' ' << road.taper[1] << ' '; @@ -3517,6 +4187,19 @@ void road_node::export_as_text_(std::ostream &Output) const } // legacy style initialization, to be performed when the tracks are already joined +void road_table::InitLanes() +{ + // the pieces which gain or lose lanes lead the ones they have at one end to the ones they have at the other + for (auto *road : m_items) + { + if (road != nullptr) + { + road->create_links(); + } + } +} + +// legacy style initialization, to be performed when the junctions are done void road_table::InitRoads() { for (auto *road : m_items) diff --git a/world/Road.h b/world/Road.h index de83bf4d1..930f35959 100644 --- a/world/Road.h +++ b/world/Road.h @@ -58,7 +58,8 @@ class owned_shapes // properties, past the ones of the lanes and the look: median , // medianround , // kerbs , bank , -// bankmaterial , weight , roundabout +// bankmaterial , weight , roundabout, +// lanesto : lanes the piece has at the end of its axis, where these aren't the ones it starts with class road_node : public scene::basic_node { @@ -151,9 +152,23 @@ class road_node : public scene::basic_node std::array banks; // left, right std::string bankmaterial{"none"}; // what a bank is covered with, other than one of a shoulder, which goes with the shoulder bool roundabout{false}; // the piece is a part of a roundabout: traffic on it goes ahead of the traffic joining it + // lanes the piece is short of at an end of its axis: [end][0: the ones going along the axis, 1: the ones going against it]. + // these are the outermost lanes of the direction, which the road gains or loses along the piece; + // forward and backward say how many lanes there are where the piece has the most of them + std::array, 2> missing{}; // brings the content to a usable form: values within their limits, an entry for each lane and for each pair of neighbours void normalize(); + // true if the piece has other lanes at its end than at its start + bool changing() const; + // sets the lanes the piece has at the start and at the end of its axis + void lanes_between(int const Startforward, int const Startbackward, int const Endforward, int const Endbackward); + // number of lanes at an end of the axis (0: the start, 1: the end): of the ones going along it, or of the ones going against it + int lanes_at(int const End, bool const Along) const; + // true if the piece has the lane at specified end of the axis + bool lane_at(std::size_t const Lane, int const End) const; + // the same road with the lanes it has at specified end of the axis all the way + state section(int const End) const; // identifier of a lane: f1..fn go along the axis and b1..bn against it, both counted outwards from where the directions meet std::string lane_id(std::size_t const Lane) const; // number of a lane in the left to right order, -1 if there's no lane with such identifier @@ -162,8 +177,17 @@ class road_node : public scene::basic_node int default_change(std::size_t const Boundary) const; // distance of the middle of a lane from the axis, positive to the left when facing along the axis double lane_offset(std::size_t const Lane) const; + // the same at an end of the axis, where the road is centred on the axis with the lanes it has there. + // a lane the road is short of at that end is where the lane it comes out of, or goes into, is + double lane_offset(std::size_t const Lane, int const End) const; + // distance of the middle of a lane from the axis at specified part of the length of the axis, with the taper and what's between the directions counted in + double lane_position(std::size_t const Lane, double const Fraction) const; // combined width of the lanes, before the taper double width() const; + // the same for the lanes the piece has at an end of the axis + double width(int const End) const; + // combined width of the lanes at specified part of the length of the axis, with the taper counted in + double breadth(double const Fraction) const; // what the widths of the lanes are multiplied by at specified value of the curve parameter double scale(double const T) const; // true if the two directions of the road are kept apart anywhere along it @@ -172,10 +196,20 @@ class road_node : public scene::basic_node double median_width(double const T) const; // distance from the axis of the line the two directions meet at, on a road which doesn't keep them apart double divide() const; + // the same for the lanes the piece has at an end of the axis + double divide(int const End) const; + // the same at specified part of the length of the axis, with the taper counted in + double middle(double const Fraction) const; // width of the whole roadway at specified value of the curve parameter: the lanes and what's between the directions double span(double const T) const; // shape of the middle of a lane, laid out in the direction of travel segment_data lane_path(std::size_t const Lane) const; + // shape of the way from the middle of a lane to the middle of another over a part of the axis, laid out in the direction of travel. + // From, To: values of the curve parameter of the axis, in the order of the axis + segment_data lane_path(std::size_t const Lane, std::size_t const Tolane, double const From, double const To) const; + // part of the axis, as values of its curve parameter, over which a piece which gains or loses lanes leads the lanes it has + // at one end to the lanes it has at the other. before it and past it there's a short path for each lane the piece has at that end + std::array change_range() const; // length of the axis double length() const; // position on the axis and direction of the axis, for specified value of the curve parameter @@ -196,17 +230,36 @@ class road_node : public scene::basic_node void define(state const &State); // creates paths of the lanes and hands them over to the simulation void create_lanes(); + // makes the paths which lead the lanes the piece has at one end to the lanes it has at the other, where these differ. + // to be called once the lanes are joined with the lanes of the neighbours + void create_links(); // links lanes of opposite directions at an end of the road which leads nowhere, so the vehicles can turn back void close_ends(); // gives up the paths of the lanes, or the ones made to close the loose ends. the paths belong to the path table, // the caller is expected to take them out of use std::vector release_lanes(); std::vector release_turns(); - // paths of the lanes, in the order of the lanes, and the ones made to close the loose ends + // paths of the lanes, and the ones made to close the loose ends. the former go in the order of the lanes; + // on a piece which gains or loses lanes these are the short paths left of each such lane at the ends of the piece std::vector const &tracks() const { return m_tracks; } + // path of a lane at an end of the axis (0: the start, 1: the end); nullptr if the piece doesn't have the lane there + TTrack *lane_track(std::size_t const Lane, int const End) const + { + return Lane < m_lanetracks[End].size() ? m_lanetracks[End][Lane] : nullptr; + } + // paths leading from the lanes at one end to the lanes at the other, on a piece which gains or loses lanes + std::vector const &links() const + { + return m_links; + } + // shapes of the ways these make, for display + std::vector const &ways() const + { + return m_ways; + } std::vector const &turns() const { return m_turns; @@ -243,9 +296,14 @@ class road_node : public scene::basic_node void export_as_text_(std::ostream &Output) const override; // creates a path for the vehicles and registers it with the simulation TTrack *create_track(std::string const &Name, segment_data const &Path, float const Width, float const Velocity); + // the same for a path put together by the caller, the way the scenery defines one + TTrack *create_track(std::string const &Name, std::string const &Definition); // members state m_state; std::vector m_tracks; + std::array, 2> m_lanetracks; // path of each lane at the start and at the end of the axis + std::vector m_links; + std::vector m_ways; std::vector m_turns; bool m_merged{false}; owned_shapes m_shapes; // geometry put in the scene by show() @@ -263,7 +321,8 @@ class road_node : public scene::basic_node // armmedian , kerbs , // cornerbank (at that road, then at the next one), bankmaterial , // crosswalk , median -// a junction of two roads is drawn as a stretch of road, on which the lanes of one are led to the lanes of the other +// a junction of two roads is drawn as a stretch of road, on which the lanes of one are led to the lanes of the other. +// that's what a road which changed its lanes used to take; such a junction found in a scenery is loaded as a piece of road instead, see as_road() // the arms don't have to be level with each other: the surface is spanned between their ends and the centre. // the junction also tells the vehicles when to wait: the ones which have to give way wait for the ones with the right of way, // and where neither has it, for the ones coming from their right, or from the opposite side when turning left across their way @@ -324,6 +383,9 @@ class junction_node : public scene::basic_node TTrack *link{nullptr}; // path, or crossroads of paths, leading on from it std::vector ways; std::vector approach; // lanes the vehicles heading for the junction are looked for on, nearest first + // for each of these: the way a vehicle on it has to have picked to be heading for the junction; 0 if there's no choice there. + // it's set for a path on which a road forks into more lanes + std::vector wishes; glm::dvec3 line{0.0}; // where the lane ends road_order *order{nullptr}; // what's going on at the moment @@ -385,6 +447,9 @@ class junction_node : public scene::basic_node return m_state; } void define(state const &State); + // a junction of two roads is a stretch where a road changes its lanes, which a road can do by itself. + // Road: receives the piece of road to take the place of the junction. returns: false if the junction isn't of that kind + bool as_road(road_node::state &Road) const; // makes paths leading through the junction, between the lanes of the roads attached to it at the moment void create_links(); // gives up the paths leading through the junction; the caller is expected to take them out of use @@ -452,7 +517,10 @@ class road_table : public basic_table { public: - // legacy style initialization, to be performed when the tracks are already joined + // legacy style initialization, to be performed when the tracks are already joined: ties up the lanes of the pieces + // which gain or lose them. the junctions go by these, so it comes ahead of their initialization + void InitLanes(); + // the same, to be performed once the junctions are done: closes the ends of the roads which lead nowhere void InitRoads(); // generates geometry of the roads and puts it in the scene void create_geometry(scene::scratch_data &Scratchpad); diff --git a/world/RoadPoint.cpp b/world/RoadPoint.cpp index 3663a7d37..bc4cea252 100644 --- a/world/RoadPoint.cpp +++ b/world/RoadPoint.cpp @@ -545,6 +545,29 @@ void roadpoint_node::bind() m_lanes.emplace_back(lane); } } + // and from the paths which lead the lanes of a piece which gains or loses them from one of its ends to the other + for (auto *link : road->links()) + { + if (link == nullptr) + { + continue; + } + for (auto const &way : link->m_paths) + { + if (out_of_reach(way, m_state.position, m_state.radius)) + { + continue; + } + path_curve const curve{way}; + double distance{0.0}; + auto const t{curve.nearest(m_state.position, distance)}; + if (distance <= m_state.radius && std::abs(curve.point(t).y - m_state.position.y) <= 3.0) + { + m_lanes.emplace_back(link); + break; + } + } + } } break; } @@ -559,10 +582,16 @@ void roadpoint_node::bind_crossing() auto const *crossed{road_under(m_state.position, where)}; if (crossed != nullptr) { - auto const &lanes{crossed->tracks()}; - for (std::size_t idx = 0; idx < lanes.size(); ++idx) + auto const &layout{crossed->definition()}; + if (layout.changing()) { - auto *lane{lanes[idx]}; + // NOTE: on such a piece a lane is a string of paths, and may fork; the vehicles are stopped ahead of all that + ErrorLog("Bad road point: crossing \"" + m_name + "\" lies on a piece of road which gains or loses lanes, the vehicles are stopped before that piece"); + } + for (std::size_t idx = 0; idx < layout.lanes.size(); ++idx) + { + // the path the traffic of the lane gets on the piece by; on a piece which keeps its lanes it's the lane itself + auto *lane{crossed->lane_track(idx, idx >= static_cast(layout.backward) ? 0 : 1)}; if (lane == nullptr || lane->m_paths.empty()) { continue; From 79bd0c8e9196a42fbb327b584ecccfaaf2676942 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 4 Oct 2026 20:00:13 +0200 Subject: [PATCH 121/430] fix(sonar): addressing reliability/security issues (#202) --- .github/workflows/build.yml | 6 +- .github/workflows/build_bin.yml | 14 ++-- .github/workflows/sonar.yml | 37 +++++----- McZapkie/MOVER.h | 6 +- McZapkie/Mover.cpp | 34 +++++---- McZapkie/hamulce.cpp | 20 ++---- application/application.cpp | 2 +- application/drivermode.cpp | 2 +- application/scenarioloaderuilayer.cpp | 2 +- application/uitranscripts.cpp | 2 +- audio/audiorenderer.cpp | 15 ++-- launcher/deferred_image.h | 14 ++-- launcher/scenery_list.cpp | 2 +- launcher/vehicle_picker.cpp | 8 +-- launcher/vehicle_picker.h | 2 +- model/AnimModel.cpp | 2 +- model/Model3d.cpp | 13 ++-- model/Texture.cpp | 6 +- model/Texture.h | 4 +- network/message.h | 16 ++--- rendering/frustum.cpp | 30 ++------ rendering/lightarray.h | 2 +- rendering/opengl33renderer.cpp | 30 ++++++-- rendering/openglrenderer.cpp | 2 +- rendering/precipitation.cpp | 2 +- simulation/simulation.cpp | 6 +- simulation/simulationenvironment.cpp | 1 - utilities/Logs.cpp | 35 ++++----- utilities/parser.cpp | 5 +- utilities/parser.h | 2 +- vehicle/Driver.cpp | 100 +++++++++++++------------- vehicle/Driver.h | 21 +++++- vehicle/DynObj.cpp | 4 +- vehicle/Gauge.cpp | 3 +- vehicle/Train.cpp | 48 +++++++------ world/Segment.cpp | 2 +- 36 files changed, 254 insertions(+), 246 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6e4a74ba7..c9ce73bdc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,13 +23,13 @@ jobs: env: BUILD_WRAPPER_OUT_DIR: bw-output steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5.1.0 with: fetch-depth: 0 submodules: recursive - name: Set up Python 3.14 - uses: actions/setup-python@v6 + uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 with: python-version: '3.14' @@ -106,7 +106,7 @@ jobs: -C "$GITHUB_WORKSPACE" . - name: Upload analysis input - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: sonar-input path: /tmp/workspace.tar.gz diff --git a/.github/workflows/build_bin.yml b/.github/workflows/build_bin.yml index f0b1fdec9..ac1fa5625 100644 --- a/.github/workflows/build_bin.yml +++ b/.github/workflows/build_bin.yml @@ -33,14 +33,14 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v6 + uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0 with: fetch-depth: 0 submodules: recursive - name: Setup Python 3.14 id: python - uses: actions/setup-python@v6 + uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 with: python-version: "3.14" architecture: "x64" @@ -104,7 +104,7 @@ jobs: -Force - name: Upload Windows build - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: maszyna-windows-x64-${{ env.CONFIG_WIN }} path: | @@ -113,7 +113,7 @@ jobs: retention-days: 14 - name: Upload Windows debug symbols - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: maszyna-windows-x64-symbols-${{ env.CONFIG_WIN }} path: | @@ -133,14 +133,14 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v6 + uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0 with: fetch-depth: 0 submodules: recursive - name: Setup Python 3.14 id: python - uses: actions/setup-python@v6 + uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 with: python-version: "3.14" @@ -244,7 +244,7 @@ jobs: cp -R shaders/. build/bin/shaders/ - name: Upload Linux build - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: maszyna-linux-x64-${{ env.CONFIG_LINUX }} path: | diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 66213c236..b29511894 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -64,15 +64,13 @@ jobs: if: github.event.action == 'completed' && github.event.workflow_run.conclusion == 'success' runs-on: ubuntu-24.04 permissions: - contents: read # checkout trusted config + contents: read # fetch trusted config actions: read # download artifact from the Build run statuses: write # post the commit status pull-requests: read # verify PR head sha via the API env: BUILD_WRAPPER_OUT_DIR: bw-output - # .trusted/ holds the checkout of master used to restore the scanner config; - # it is not part of the analysed change. - SONAR_EXCLUSIONS: betterRenderer/**,ref/**,imgui/**,stb/**,build/**,bw-output/**,.trusted/** + SONAR_EXCLUSIONS: betterRenderer/**,ref/**,imgui/**,stb/**,build/**,bw-output/** SONAR_SCANNER_JAVA_OPTS: -Xmx5g steps: - name: Post pending status @@ -85,16 +83,23 @@ jobs: -f description="Analysis in progress" \ -f target_url="$RUN_URL" - # Trusted copy of the repo config, used to overwrite anything the PR - # might have tampered with (sonar-project.properties etc). - - name: Checkout trusted config from master - uses: actions/checkout@v5 - with: - ref: master - path: .trusted + # Trusted copy of the scanner config, used to overwrite anything the PR + # might have tampered with. Fetched as a single file through the API rather + # than with actions/checkout: nothing gets checked out in this privileged + # context. Kept outside the workspace, so the archive can't overwrite it. + - name: Fetch trusted config from master + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + set -euo pipefail + url="repos/${{ github.repository }}/contents/sonar-project.properties?ref=master" + if ! gh api -H "Accept: application/vnd.github.raw" "$url" > /tmp/trusted-sonar-project.properties; then + echo "::warning::no sonar-project.properties on master" + rm -f /tmp/trusted-sonar-project.properties + fi - name: Download analysis input - uses: actions/download-artifact@v4 + uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 with: name: sonar-input path: /tmp/sonar-input @@ -104,13 +109,7 @@ jobs: - name: Unpack analysis input run: | set -euo pipefail - # The archive holds the whole PR workspace and is unpacked over this one, - # .trusted/ included. Move the trusted config out of reach first, or a PR - # carrying its own .trusted/sonar-project.properties would have it planted - # here and restored below as if it came from master. - if [ -f "$GITHUB_WORKSPACE/.trusted/sonar-project.properties" ]; then - cp "$GITHUB_WORKSPACE/.trusted/sonar-project.properties" /tmp/trusted-sonar-project.properties - fi + # The archive holds the whole PR workspace and is unpacked over this one. # Nothing may be written outside the workspace: reject absolute members and # any member reaching through a parent directory before unpacking anything. tar -tzf /tmp/sonar-input/workspace.tar.gz > /tmp/archive-members.txt diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index e7bd1d234..accbbbaab 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1732,7 +1732,11 @@ class TMoverParameters // bounds-safe read access to MotorParam TMotorParameters const &motor_param(int const Position) const { - return MotorParam[std::clamp(Position, 0, MotorParametersArraySize)]; + if (Position < 0) + return MotorParam[0]; + if (Position > MotorParametersArraySize) + return MotorParam[MotorParametersArraySize]; + return MotorParam[Position]; } TTransmision Transmision; // record {liczba zebow przekladni} diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 82dd245fd..ff60c27cb 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1752,6 +1752,11 @@ void TMoverParameters::LowVoltagePowerCheck(double const Deltatime) void TMoverParameters::PowerCouplersCheck(double const Deltatime, coupling const Coupling) { + if (Coupling != coupling::highvoltage && Coupling != coupling::power110v && Coupling != coupling::power24v) + { + // only power couplings carry voltage + return; + } auto localvoltage{0.0}; @@ -2403,16 +2408,14 @@ bool TMoverParameters::IncMainCtrl(int CtrlSpeed) if (CtrlSpeed > 1) { OK = IncMainCtrl(1) && IncMainCtrl(CtrlSpeed - 1); // a fail will propagate up the recursion chain. should this be || instead? + break; } - else + ++MainCtrlPos; + OK = true; + if (EIMCtrlType == 0 && ( SpeedCtrlAutoTurnOffFlag & 1 ) == 1 && MainCtrlActualPos != MainCtrlPos) { - ++MainCtrlPos; - OK = true; - if (EIMCtrlType == 0 && ( SpeedCtrlAutoTurnOffFlag & 1 ) == 1 && MainCtrlActualPos != MainCtrlPos) - { - DecScndCtrl(2); - SpeedCtrlUnit.IsActive = false; - } + DecScndCtrl(2); + SpeedCtrlUnit.IsActive = false; } break; } @@ -6392,10 +6395,7 @@ double TMoverParameters::TractionForce(double dt) // PosRatio = 1.0 * (PosRatio * 0 + 1) * PosRatio; // 1 * 1 * PosRatio = PosRatio Hamulec->SetED(0); // (Hamulec as TLSt).SetLBP(LocBrakePress); - if (PosRatio > eimv_pr) - tmp = 4; - else - tmp = 4; // szybkie malenie, powolne wzrastanie + tmp = 4; // szybkie malenie, powolne wzrastanie } dmoment = eimv[eimv_Fful]; // NOTE: the commands to operate the sandbox are likely to conflict with other similar ai decisions @@ -8022,8 +8022,6 @@ double TMoverParameters::dizel_fillcheck(int mcp, double dt) } if (enrot > nreg) // nad predkoscia regulatora zeruj dawke realfill = 0; - if (enrot < nreg) // pod predkoscia regulatora dawka zadana - realfill = realfill; if (enrot < dizel_nreg_min && RList[mcp].R > 0.001) // jesli ponizej biegu jalowego i niezerowa dawka, to dawaj pelna realfill = 1; } @@ -9118,7 +9116,7 @@ bool TMoverParameters::readMPT0(std::string const &line) } if (true == parser.getTokens(1, false)) { - int autoswitch; + int autoswitch{0}; parser >> autoswitch; MotorParam[idx].AutoSwitch = autoswitch == 1; } @@ -9174,7 +9172,7 @@ bool TMoverParameters::readMPTElectricSeries(std::string const &line) parser >> MotorParam[idx].mfi >> MotorParam[idx].mIsat >> MotorParam[idx].fi >> MotorParam[idx].Isat; if (true == parser.getTokens(1, false)) { - int autoswitch; + int autoswitch{0}; parser >> autoswitch; MotorParam[idx].AutoSwitch = autoswitch == 1; } @@ -9223,7 +9221,7 @@ bool TMoverParameters::readMPTDieselEngine(std::string const &line) parser >> MotorParam[idx].mIsat >> MotorParam[idx].fi >> MotorParam[idx].mfi; if (true == parser.getTokens(1, false)) { - int autoswitch; + int autoswitch{0}; parser >> autoswitch; MotorParam[idx].AutoSwitch = autoswitch == 1; } @@ -11048,7 +11046,7 @@ void TMoverParameters::LoadFIZ_DCEMUED(std::string const &line) void TMoverParameters::LoadFIZ_SpringBrake(std::string const &line) { - double vol; + double vol{1.0}; extract_value(vol, "Volume", line, "1"); if (!SpringBrake.Cylinder) SpringBrake.Cylinder = std::make_shared(); diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp index 44e8be4b2..64a7fb85c 100644 --- a/McZapkie/hamulce.cpp +++ b/McZapkie/hamulce.cpp @@ -3516,10 +3516,7 @@ double TMHZ_K5P::GetPF(double i_bcp, double PP, double HP, double dt, double ep) LimCP = std::min(LimCP, HP); // pozycja + czasowy lub zasilanie ActFlowSpeed = 4; - if (LimCP > CP) // podwyzszanie szybkie - CP = CP + 9 * std::min(abs(LimCP - CP), 0.05) * PR(CP, LimCP) * dt; // zbiornik sterujacy; - else - CP = CP + 9 * std::min(abs(LimCP - CP), 0.05) * PR(CP, LimCP) * dt; // zbiornik sterujacy + CP = CP + 9 * std::min(abs(LimCP - CP), 0.05) * PR(CP, LimCP) * dt; // zbiornik sterujacy double uop = UnbrakeOverPressure; // unbrake over pressure in actual state ManualOvrldActive = UniversalFlag & TUniversalBrake::ub_HighPressure; // button is pressed @@ -3546,10 +3543,9 @@ double TMHZ_K5P::GetPF(double i_bcp, double PP, double HP, double dt, double ep) else dpMainValve = PFVd(PP, 0, ActFlowSpeed / LBDelay, dpPipe, 0.4); - if ((EQ(i_bcp, -1) && AutoOvrld) || (i_bcp < 0.5 && UniversalFlag & TUniversalBrake::ub_Overload)) + if (((EQ(i_bcp, -1) && AutoOvrld) || (i_bcp < 0.5 && UniversalFlag & TUniversalBrake::ub_Overload)) && TP < OverloadMaxPressure) { - if (TP < OverloadMaxPressure) - TP = TP + 0.03 * dt; + TP = TP + 0.03 * dt; } if (EQ(i_bcp, 3)) @@ -3699,10 +3695,7 @@ double TMHZ_6P::GetPF(double i_bcp, double PP, double HP, double dt, double ep) LimCP = std::min(LimCP, HP); // pozycja + czasowy lub zasilanie ActFlowSpeed = 4; - if (LimCP > CP) // podwyzszanie szybkie - CP = CP + 9 * std::min(abs(LimCP - CP), 0.05) * PR(CP, LimCP) * dt; // zbiornik sterujacy; - else - CP = CP + 9 * std::min(abs(LimCP - CP), 0.05) * PR(CP, LimCP) * dt; // zbiornik sterujacy + CP = CP + 9 * std::min(abs(LimCP - CP), 0.05) * PR(CP, LimCP) * dt; // zbiornik sterujacy dpPipe = std::min(HP, CP + TP + RedAdj); @@ -3729,10 +3722,9 @@ double TMHZ_6P::GetPF(double i_bcp, double PP, double HP, double dt, double ep) else dpMainValve = PFVd(PP, 0, ActFlowSpeed / LBDelay, dpPipe, 0.4); - if ((EQ(i_bcp, -1) && AutoOvrld) || (i_bcp < 0.5 && UniversalFlag & TUniversalBrake::ub_Overload)) + if (((EQ(i_bcp, -1) && AutoOvrld) || (i_bcp < 0.5 && UniversalFlag & TUniversalBrake::ub_Overload)) && TP < OverloadMaxPressure) { - if (TP < OverloadMaxPressure) - TP = TP + 0.03 * dt; + TP = TP + 0.03 * dt; } if (EQ(i_bcp, 4)) diff --git a/application/application.cpp b/application/application.cpp index ceb5ec6c7..81e96c3d9 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -498,7 +498,7 @@ int eu07_application::run() { command_queue::commands_map commands_to_exec; command_queue::commands_map local_commands = simulation::Commands.pop_intercept_queue(); - double slave_sync; + double slave_sync{0.0}; // if we're the server if (m_network && m_network->servers) diff --git a/application/drivermode.cpp b/application/drivermode.cpp index 80fd3b17d..b5b786348 100644 --- a/application/drivermode.cpp +++ b/application/drivermode.cpp @@ -667,7 +667,7 @@ void driver_mode::update_camera(double const Deltatime) // reset window state, it'll be set again if applicable in a check below Global.CabWindowOpen = false; - if (simulation::Train != nullptr && Camera.m_owner != nullptr && false == DebugCameraFlag) + if (simulation::Train != nullptr && controlled != nullptr && Camera.m_owner != nullptr && false == DebugCameraFlag) { // jeśli jazda w kabinie, przeliczyć trzeba parametry kamery /* diff --git a/application/scenarioloaderuilayer.cpp b/application/scenarioloaderuilayer.cpp index c4e7df3d1..de0d4e643 100644 --- a/application/scenarioloaderuilayer.cpp +++ b/application/scenarioloaderuilayer.cpp @@ -213,7 +213,7 @@ void scenarioloader_ui::render_() const float spacing = 10.0f * scale; // odstęp między ikoną a tekstem // Loading icon - const deferred_image *img = &m_loading_wheel_frames[38]; + deferred_image *img = &m_loading_wheel_frames[38]; const auto loading_tex = img->get(); const auto loading_size = glm::vec2(img->size()) * glm::vec2(scale); diff --git a/application/uitranscripts.cpp b/application/uitranscripts.cpp index 96c9f735c..c9780e101 100644 --- a/application/uitranscripts.cpp +++ b/application/uitranscripts.cpp @@ -42,7 +42,7 @@ TTranscripts::Add( std::string const &txt, bool backgorund ) { cParser parser( asciitext ); while( true == parser.getTokens( 3, false, "[]\n" ) ) { - float begin, end; + float begin{ 0.f }, end{ 0.f }; std::string transcript; parser >> begin diff --git a/audio/audiorenderer.cpp b/audio/audiorenderer.cpp index 81f815703..50a6f7273 100644 --- a/audio/audiorenderer.cpp +++ b/audio/audiorenderer.cpp @@ -563,15 +563,12 @@ openal_renderer::init_caps() { if( ::alcIsExtensionPresent( nullptr, "ALC_ENUMERATION_EXT" ) == AL_TRUE ) { // enumeration supported WriteLog( "available audio devices:" ); - auto const *devices { ::alcGetString( nullptr, ALC_DEVICE_SPECIFIER ) }; - auto const - *device { devices }, - *next { devices + 1 }; - while( device && *device != '\0' && next && *next != '\0' ) { - WriteLog( { device } ); - auto const len { std::strlen( device ) }; - device += len + 1; - next += len + 2; + // device list is a sequence of null-terminated names, ending with an empty name + auto const *device { ::alcGetString( nullptr, ALC_DEVICE_SPECIFIER ) }; + while( device != nullptr && *device != '\0' ) { + std::string const devicename { device }; + WriteLog( devicename ); + device += devicename.size() + 1; } } diff --git a/launcher/deferred_image.h b/launcher/deferred_image.h index fcd25fd6e..855822640 100644 --- a/launcher/deferred_image.h +++ b/launcher/deferred_image.h @@ -1,10 +1,15 @@ #pragma once +#include + #include "model/Texture.h" #include "rendering/renderer.h" class deferred_image { public: + // value returned by get() when the image isn't (yet) available + static constexpr GLuint invalid_id { std::numeric_limits::max() }; + deferred_image() = default; deferred_image(const std::string &p) : path(p) { } deferred_image(const deferred_image&) = delete; @@ -15,7 +20,8 @@ public: return image != null_handle || !path.empty(); } - GLuint get() const + // loads the texture on first use + GLuint get() { if (!path.empty()) { image = GfxRenderer->Fetch_Texture(path, true); @@ -30,7 +36,7 @@ public: return tex.get_id(); } - return -1; + return invalid_id; } glm::ivec2 size() const @@ -43,6 +49,6 @@ public: } private: - mutable std::string path; - mutable texture_handle image = 0; + std::string path; + texture_handle image = 0; }; diff --git a/launcher/scenery_list.cpp b/launcher/scenery_list.cpp index 77f69a350..518669e54 100644 --- a/launcher/scenery_list.cpp +++ b/launcher/scenery_list.cpp @@ -281,7 +281,7 @@ void ui::scenerylist_panel::draw_trainset(trainset_desc &trainset) for (auto &dyn_desc : trainset.vehicles) { deferred_image *mini = nullptr; - if (dyn_desc.skin && dyn_desc.skin->mini.get() != (GLuint)-1) + if (dyn_desc.skin && dyn_desc.skin->mini.get() != deferred_image::invalid_id) mini = &dyn_desc.skin->mini; else mini = &placeholder_mini; diff --git a/launcher/vehicle_picker.cpp b/launcher/vehicle_picker.cpp index f7d3503fc..9fe0a29a0 100644 --- a/launcher/vehicle_picker.cpp +++ b/launcher/vehicle_picker.cpp @@ -37,7 +37,7 @@ void ui::vehiclepicker_panel::render_contents() if (ImGui::RadioButton(STR_C("texture group"), display_by_groups)) display_by_groups = true; - std::vector skinset_list; + std::vector skinset_list; if (display_by_groups) { std::vector model_list; @@ -114,7 +114,7 @@ void ui::vehiclepicker_panel::render_contents() for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; i++) { auto &desc = model_list[i]; - const deferred_image *image = nullptr; + deferred_image *image = nullptr; for (auto const &skinset : desc->matching_skinsets) { if (skinset->mini) { image = &skinset->mini; @@ -256,7 +256,7 @@ bool ui::vehiclepicker_panel::skin_filter(const skin_set *skin, std::vectorget(); - if (tex != (GLuint)-1) { + if (tex != deferred_image::invalid_id) { glm::ivec2 size = image->size(); float width = 30.0f / size.y * size.x; ImGui::SameLine(ImGui::GetContentRegionAvail().x - width); diff --git a/launcher/vehicle_picker.h b/launcher/vehicle_picker.h index ad6e6dc29..ffdfb2a49 100644 --- a/launcher/vehicle_picker.h +++ b/launcher/vehicle_picker.h @@ -14,7 +14,7 @@ class vehiclepicker_panel : public ui_panel void render_contents() override; private: - bool selectable_image(const char *desc, bool selected, const deferred_image *image, const skin_set *pickable = nullptr); + bool selectable_image(const char *desc, bool selected, deferred_image *image, const skin_set *pickable = nullptr); vehicle_type selected_type = vehicle_type::none; std::shared_ptr selected_vehicle; diff --git a/model/AnimModel.cpp b/model/AnimModel.cpp index cc54a2a24..1d8086761 100644 --- a/model/AnimModel.cpp +++ b/model/AnimModel.cpp @@ -598,11 +598,11 @@ void TAnimModel::on_season_update() { void TAnimModel::RaPrepare() { // ustawia światła i animacje we wzorcu modelu przed renderowaniem egzemplarza - bool state; // stan światła if (Global.UpdateMaterials) on_season_update(); for (int i = 0; i < iNumLights; ++i) { + bool state{ false }; // stan światła auto const lightmode { static_cast( std::abs( lsLights[ i ] ) ) }; switch( lightmode ) { case ls_On: diff --git a/model/Model3d.cpp b/model/Model3d.cpp index e1a3a79e6..b67663f93 100644 --- a/model/Model3d.cpp +++ b/model/Model3d.cpp @@ -1529,7 +1529,9 @@ void TSubModel::ParentMatrix(float4x4 *m) const void TSubModel::ReplaceMatrix(const glm::mat4 &mat) { - *fMatrix = float4x4(glm::value_ptr(mat)); + for (int column = 0; column < 4; ++column) + for (int row = 0; row < 4; ++row) + fMatrix->e[column * 4 + row] = mat[column][row]; } void TSubModel::ReplaceMaterial(const std::string &name) @@ -1618,13 +1620,8 @@ TSubModel *TModel3d::GetFromName(std::string const &Name) const { // wyszukanie submodelu po nazwie if (Name.empty()) return Root; // potrzebne do terenu z E3D - if (iFlags & 0x0200) // wczytany z pliku tekstowego, wyszukiwanie rekurencyjne - return Root ? Root->GetFromName(Name) : nullptr; - else // wczytano z pliku binarnego, można wyszukać iteracyjnie - { - // for (int i=0;iGetFromName(Name) : nullptr; - } + // both text and binary models are searched recursively + return Root ? Root->GetFromName(Name) : nullptr; }; // locates particle source submodels and stores them on internal list diff --git a/model/Texture.cpp b/model/Texture.cpp index 5c1d852f4..a4b9def40 100644 --- a/model/Texture.cpp +++ b/model/Texture.cpp @@ -394,12 +394,12 @@ opengl_texture::make_from_memory(size_t width, size_t height, const uint8_t *raw void opengl_texture::update_from_memory(size_t width, size_t height, const uint8_t *raw) { - if (id != (GLuint)-1 && (width != data_width || height != data_height || GL_SRGB8_ALPHA8 != data_format || GL_RGBA != data_components)) + if (id != invalid_id && (width != data_width || height != data_height || GL_SRGB8_ALPHA8 != data_format || GL_RGBA != data_components)) { glDeleteTextures(1, &id); - id = (GLuint)-1; + id = invalid_id; } - if (id == (GLuint)-1) + if (id == invalid_id) { data_width = width; data_height = height; diff --git a/model/Texture.h b/model/Texture.h index 1f5826402..7b285ee3c 100644 --- a/model/Texture.h +++ b/model/Texture.h @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include +#include #include "winheaders.h" #include #include "model/ResourceManager.h" @@ -84,7 +85,8 @@ struct opengl_texture : public ITexture { virtual void update_from_memory(size_t width, size_t height, const uint8_t *data) override; // members - GLuint id{ (GLuint)-1 }; // associated GL resource + static constexpr GLuint invalid_id { std::numeric_limits::max() }; // id value of texture without GL resource + GLuint id{ invalid_id }; // associated GL resource bool has_alpha{ false }; // indicates the texture has alpha channel bool is_ready{ false }; // indicates the texture was processed and is ready for use std::string traits; // requested texture attributes: wrapping modes etc diff --git a/network/message.h b/network/message.h index 871e833f9..5aa07d78e 100644 --- a/network/message.h +++ b/network/message.h @@ -30,17 +30,17 @@ struct client_hello : public message virtual void serialize(std::ostream &stream) const override; virtual void deserialize(std::istream &stream) override; - int32_t version{}; - uint32_t start_packet{}; + int32_t version{0}; + uint32_t start_packet{0}; }; struct server_hello : public message { server_hello() : message(SERVER_HELLO) {} - uint32_t seed{}; - int64_t timestamp{}; - int64_t config{}; + uint32_t seed{0}; + int64_t timestamp{0}; + int64_t config{0}; std::string scenario; virtual void serialize(std::ostream &stream) const override; @@ -62,9 +62,9 @@ struct frame_info : public request_command { frame_info() : request_command(FRAME_INFO) {} - double render_dt{}; - double dt{}; - double sync{}; + double render_dt{0.0}; + double dt{0.0}; + double sync{0.0}; virtual void serialize(std::ostream &stream) const override; virtual void deserialize(std::istream &stream) override; diff --git a/rendering/frustum.cpp b/rendering/frustum.cpp index afe164411..f46770657 100644 --- a/rendering/frustum.cpp +++ b/rendering/frustum.cpp @@ -22,30 +22,14 @@ cFrustum::calculate() { void cFrustum::calculate( glm::mat4 const &Projection, glm::mat4 const &Modelview ) { - float const *proj = glm::value_ptr( Projection ); - float const *modl = glm::value_ptr( Modelview ); + // multiply the matrices to retrieve clipping planes (column-major, same layout as the old float[16] form) + auto const clipmatrix { Projection * Modelview }; float clip[ 16 ]; - - // multiply the matrices to retrieve clipping planes - clip[ 0 ] = modl[ 0 ] * proj[ 0 ] + modl[ 1 ] * proj[ 4 ] + modl[ 2 ] * proj[ 8 ] + modl[ 3 ] * proj[ 12 ]; - clip[ 1 ] = modl[ 0 ] * proj[ 1 ] + modl[ 1 ] * proj[ 5 ] + modl[ 2 ] * proj[ 9 ] + modl[ 3 ] * proj[ 13 ]; - clip[ 2 ] = modl[ 0 ] * proj[ 2 ] + modl[ 1 ] * proj[ 6 ] + modl[ 2 ] * proj[ 10 ] + modl[ 3 ] * proj[ 14 ]; - clip[ 3 ] = modl[ 0 ] * proj[ 3 ] + modl[ 1 ] * proj[ 7 ] + modl[ 2 ] * proj[ 11 ] + modl[ 3 ] * proj[ 15 ]; - - clip[ 4 ] = modl[ 4 ] * proj[ 0 ] + modl[ 5 ] * proj[ 4 ] + modl[ 6 ] * proj[ 8 ] + modl[ 7 ] * proj[ 12 ]; - clip[ 5 ] = modl[ 4 ] * proj[ 1 ] + modl[ 5 ] * proj[ 5 ] + modl[ 6 ] * proj[ 9 ] + modl[ 7 ] * proj[ 13 ]; - clip[ 6 ] = modl[ 4 ] * proj[ 2 ] + modl[ 5 ] * proj[ 6 ] + modl[ 6 ] * proj[ 10 ] + modl[ 7 ] * proj[ 14 ]; - clip[ 7 ] = modl[ 4 ] * proj[ 3 ] + modl[ 5 ] * proj[ 7 ] + modl[ 6 ] * proj[ 11 ] + modl[ 7 ] * proj[ 15 ]; - - clip[ 8 ] = modl[ 8 ] * proj[ 0 ] + modl[ 9 ] * proj[ 4 ] + modl[ 10 ] * proj[ 8 ] + modl[ 11 ] * proj[ 12 ]; - clip[ 9 ] = modl[ 8 ] * proj[ 1 ] + modl[ 9 ] * proj[ 5 ] + modl[ 10 ] * proj[ 9 ] + modl[ 11 ] * proj[ 13 ]; - clip[ 10 ] = modl[ 8 ] * proj[ 2 ] + modl[ 9 ] * proj[ 6 ] + modl[ 10 ] * proj[ 10 ] + modl[ 11 ] * proj[ 14 ]; - clip[ 11 ] = modl[ 8 ] * proj[ 3 ] + modl[ 9 ] * proj[ 7 ] + modl[ 10 ] * proj[ 11 ] + modl[ 11 ] * proj[ 15 ]; - - clip[ 12 ] = modl[ 12 ] * proj[ 0 ] + modl[ 13 ] * proj[ 4 ] + modl[ 14 ] * proj[ 8 ] + modl[ 15 ] * proj[ 12 ]; - clip[ 13 ] = modl[ 12 ] * proj[ 1 ] + modl[ 13 ] * proj[ 5 ] + modl[ 14 ] * proj[ 9 ] + modl[ 15 ] * proj[ 13 ]; - clip[ 14 ] = modl[ 12 ] * proj[ 2 ] + modl[ 13 ] * proj[ 6 ] + modl[ 14 ] * proj[ 10 ] + modl[ 15 ] * proj[ 14 ]; - clip[ 15 ] = modl[ 12 ] * proj[ 3 ] + modl[ 13 ] * proj[ 7 ] + modl[ 14 ] * proj[ 11 ] + modl[ 15 ] * proj[ 15 ]; + for( int column = 0; column < 4; ++column ) { + for( int row = 0; row < 4; ++row ) { + clip[ column * 4 + row ] = clipmatrix[ column ][ row ]; + } + } // get the sides of the frustum. m_frustum[ side_RIGHT ][ plane_A ] = clip[ 3 ] - clip[ 0 ]; diff --git a/rendering/lightarray.h b/rendering/lightarray.h index 670cbea88..d7459fe92 100644 --- a/rendering/lightarray.h +++ b/rendering/lightarray.h @@ -18,7 +18,7 @@ public: int index{ -1 }; // 0: front lights, 1: rear lights glm::dvec3 position; // position of the light in 3d scene glm::vec3 direction; // direction of the light in 3d scene - glm::vec3 color{ 255.0f / 255.0f, 241.0f / 255.0f, 224.0f / 255.0f }; // color of the light, default is halogen light + glm::vec3 color{ 1.0f, 241.0f / 255.0f, 224.0f / 255.0f }; // color of the light, default is halogen light float intensity{ 0.0f }; // (combined) intensity of the light(s) int count{ 0 }; // number (or pattern) of active light(s) glm::vec3 state{ 0.f }; // state of individual lights diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index 2f587033e..fcd90abac 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -28,6 +28,23 @@ http://mozilla.org/MPL/2.0/. int constexpr EU07_PICKBUFFERSIZE{ 1024 }; // size of (square) textures bound with the pick framebuffer int constexpr EU07_REFLECTIONFIDELITYOFFSET { 250 }; // artificial increase of range for reflection pass detail reduction +namespace { + +// returns material assigned to the submodel, resolving replacable skins. null_handle if no skin set is bound +material_handle +submodel_material( TSubModel const *Submodel ) { + + if( Submodel->m_material >= 0 ) { + return Submodel->m_material; + } + return ( + TSubModel::ReplacableSkinId != nullptr ? + TSubModel::ReplacableSkinId[ -Submodel->m_material ] : + null_handle ); +} + +} // namespace + void GLAPIENTRY ErrorCallback( GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, const void* userParam ) { /* @@ -1935,7 +1952,7 @@ bool opengl33_renderer::Render(world_environment *Environment) auto const fogfactor{std::clamp(Global.fFogEnd / 2000.f, 0.f, 1.f)}; // stronger fog reduces opacity of the celestial bodies float const duskfactor = 1.0f - std::clamp(std::abs(Environment->m_sun.getAngle()), 0.0f, 12.0f) / 12.0f; - glm::vec3 suncolor = glm::mix(glm::vec3(255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f), glm::vec3(235.0f / 255.0f, 140.0f / 255.0f, 36.0f / 255.0f), duskfactor); + glm::vec3 suncolor = glm::mix(glm::vec3(1.0f, 242.0f / 255.0f, 231.0f / 255.0f), glm::vec3(235.0f / 255.0f, 140.0f / 255.0f, 36.0f / 255.0f), duskfactor); // sun { @@ -2341,8 +2358,7 @@ opengl_material &opengl33_renderer::Material(material_handle const Material) opengl_material const & opengl33_renderer::Material( TSubModel const * Submodel ) const { - auto const material { Submodel->m_material >= 0 ? Submodel->m_material : Submodel->ReplacableSkinId[ -Submodel->m_material ] }; - return m_materials.material( material ); + return m_materials.material( submodel_material( Submodel ) ); } texture_handle opengl33_renderer::Fetch_Texture(std::string const &Filename, bool const Loadnow, GLint format_hint) @@ -3767,7 +3783,7 @@ void opengl33_renderer::Render(TSubModel *Submodel) // textures... if (Submodel->m_material < 0) { // zmienialne skóry - Bind_Material(Submodel->ReplacableSkinId[-Submodel->m_material], Submodel); + Bind_Material(submodel_material(Submodel), Submodel); } else { @@ -3804,7 +3820,7 @@ void opengl33_renderer::Render(TSubModel *Submodel) if (Submodel->m_material < 0) { // zmienialne skóry - Bind_Material_Shadow(Submodel->ReplacableSkinId[-Submodel->m_material]); + Bind_Material_Shadow(submodel_material(Submodel)); } else { @@ -4689,7 +4705,7 @@ void opengl33_renderer::Render_Alpha(TSubModel *Submodel) // textures... if (Submodel->m_material < 0) { // zmienialne skóry - Bind_Material(Submodel->ReplacableSkinId[-Submodel->m_material], Submodel); + Bind_Material(submodel_material(Submodel), Submodel); } else { @@ -4721,7 +4737,7 @@ void opengl33_renderer::Render_Alpha(TSubModel *Submodel) if (Submodel->m_material < 0) { // zmienialne skóry - Bind_Material_Shadow(Submodel->ReplacableSkinId[-Submodel->m_material]); + Bind_Material_Shadow(submodel_material(Submodel)); } else { diff --git a/rendering/openglrenderer.cpp b/rendering/openglrenderer.cpp index b675c38f6..27c94da86 100644 --- a/rendering/openglrenderer.cpp +++ b/rendering/openglrenderer.cpp @@ -1588,7 +1588,7 @@ opengl_renderer::Render( world_environment *Environment ) { auto const fogfactor { std::clamp( Global.fFogEnd / 2000.f, 0.f, 1.f ) }; // closer/denser fog reduces opacity of the celestial bodies float const duskfactor = 1.0f - std::clamp( std::abs( Environment->m_sun.getAngle() ), 0.0f, 12.0f ) / 12.0f; glm::vec3 suncolor = glm::mix( - glm::vec3( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ), + glm::vec3( 1.0f, 242.0f / 255.0f, 231.0f / 255.0f ), glm::vec3( 235.0f / 255.0f, 140.0f / 255.0f, 36.0f / 255.0f ), duskfactor ); // sun diff --git a/rendering/precipitation.cpp b/rendering/precipitation.cpp index 3f9ecaece..02baaadab 100644 --- a/rendering/precipitation.cpp +++ b/rendering/precipitation.cpp @@ -31,7 +31,7 @@ basic_precipitation::init() { void basic_precipitation::update() { - auto const timedelta { static_cast( ( DebugModeFlag ? Timer::GetDeltaTime() : Timer::GetDeltaTime() ) ) }; + auto const timedelta { static_cast( Timer::GetDeltaTime() ) }; if( timedelta == 0.0 ) { return; } diff --git a/simulation/simulation.cpp b/simulation/simulation.cpp index a1493f630..36edc4c76 100644 --- a/simulation/simulation.cpp +++ b/simulation/simulation.cpp @@ -137,6 +137,11 @@ state_manager::update_scripting_interface() { auto *time{ Memory.find( "__simulation.time" ) }; auto *date{ Memory.find( "__simulation.date" ) }; + if( weather == nullptr || time == nullptr || date == nullptr ) { + // scripting interface cells weren't created, nothing to synchronize + return; + } + if( simulation::is_ready ) { // potentially adjust weather if( weather->Value1() != m_scriptinginterface.weather->Value1() ) { @@ -396,7 +401,6 @@ void state_manager::process_commands() { pantograph.fLenL1 * std::sin( pantograph.fAngleL ) + pantograph.fLenU1 * std::sin( pantograph.fAngleU ) + pantograph.fHeight; - vehicle->MoverParameters->EnginePowerSource.CollectorParameters.CollectorsNo; } vehicle = vehicle->Prev(); diff --git a/simulation/simulationenvironment.cpp b/simulation/simulationenvironment.cpp index b96cea20d..6c4061c40 100644 --- a/simulation/simulationenvironment.cpp +++ b/simulation/simulationenvironment.cpp @@ -78,7 +78,6 @@ world_environment::compute_weather() { Global.Overcast <= 0.70 ? 6 : Global.Overcast <= 0.80 ? 7 : Global.Overcast <= 0.90 ? 8 : - Global.Overcast > 0.90 ? 9 : 9; } diff --git a/utilities/Logs.cpp b/utilities/Logs.cpp index 737d25d74..5b4d1d9aa 100644 --- a/utilities/Logs.cpp +++ b/utilities/Logs.cpp @@ -80,29 +80,20 @@ std::mutex logMutex; void LogService() { - // prevent crash if mutex is not initialized - while (true) - { - try - { - logMutex.lock(); - break; - } - catch (...) {} - } - logMutex.unlock(); - while (!Global.applicationQuitOrder) { { // --- Obsługa InfoStack --- while (!InfoStack.empty()) { - logMutex.lock(); - std::string msg = InfoStack.front().first; - bool isError = InfoStack.front().second; - InfoStack.pop_front(); - logMutex.unlock(); + std::string msg; + bool isError; + { + std::scoped_lock lock(logMutex); + msg = InfoStack.front().first; + isError = InfoStack.front().second; + InfoStack.pop_front(); + } // log to file if (Global.iWriteLogEnabled & 1) @@ -134,10 +125,12 @@ void LogService() // --- Obsługa ErrorStack --- while (!ErrorStack.empty()) { - logMutex.lock(); - std::string msg = ErrorStack.front(); - ErrorStack.pop_front(); - logMutex.unlock(); + std::string msg; + { + std::scoped_lock lock(logMutex); + msg = ErrorStack.front(); + ErrorStack.pop_front(); + } if (!(Global.iWriteLogEnabled & 1)) continue; diff --git a/utilities/parser.cpp b/utilities/parser.cpp index 7209df015..77f91ee35 100644 --- a/utilities/parser.cpp +++ b/utilities/parser.cpp @@ -272,10 +272,9 @@ void cParser::stripFirstTokenBOM(std::string& token, bool ToLower, const char* B } // if first "token" was standalone BOM, read the next real token (avoid recursion) - while (token.empty() && mStream->peek() != EOF) { - readToken(token, ToLower, Break); + if (token.empty() && mStream->peek() != EOF) { // readToken will not re-enter BOM stripping because mFirstToken is now false - break; + readToken(token, ToLower, Break); } } diff --git a/utilities/parser.h b/utilities/parser.h index 0cf51d8cc..131efd8b8 100644 --- a/utilities/parser.h +++ b/utilities/parser.h @@ -39,7 +39,7 @@ class cParser //: public std::stringstream Output_ getToken( bool const ToLower = true, char const *Break = "\n\r\t ;" ) { getTokens( 1, ToLower, Break ); - Output_ output; + Output_ output{}; *this >> output; return output; }; inline diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 9f1b2586c..4437950bc 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -2231,7 +2231,7 @@ void TController::AutoRewident() BrakingInitialLevel = IsHeavyCargoTrain ? 1.25 : IsCargoTrain ? 1.25 : 1.00; - BrakingLevelIncrease = IsHeavyCargoTrain ? 0.25 : IsCargoTrain ? 0.25 : 0.25; + BrakingLevelIncrease = 0.25; if( is_emu() ) { auto ep_factor { ( BrakeSystem == TBrakeSystem::ElectroPneumatic ? 8 : 4 ) }; @@ -2320,7 +2320,8 @@ bool TController::CheckVehicles(TOrders user) p = pVehicle->FirstFind(d); // pojazd na czele składu if (!p) p = pVehicle; - pVehicles[end::front] = p; + auto *const frontvehicle { p }; // stays the consist head for the rest of this check + pVehicles[end::front] = frontvehicle; // liczenie pojazdów w składzie i ustalenie parametrów auto dir = d = 1 - d; // a dalej będziemy zliczać od czoła do tyłu fLength = 0.0; // długość składu do badania wyjechania za ograniczenie @@ -2369,7 +2370,7 @@ bool TController::CheckVehicles(TOrders user) if (iDrivigFlags & movePrimary) { // jeśli jest aktywnie prowadzącym pojazd, może zrobić własny porządek auto pantmask = 1; - p = pVehicles[end::front]; + p = frontvehicle; // establish ownership and vehicle order while (p) { @@ -2384,7 +2385,7 @@ bool TController::CheckVehicles(TOrders user) p = p->Next(); // pojazd podłączony od tyłu (licząc od czoła) } // with the order established the virtual train manager can do their work - p = pVehicles[ end::front ]; + p = frontvehicle; ControlledEnginesCount = p->MoverParameters->Power > 1.0 ? 1 : 0; auto hasheaters { false }; while (p) @@ -2457,7 +2458,7 @@ bool TController::CheckVehicles(TOrders user) } // detect push-pull train configurations and mark them accordingly - if( pVehicles[ end::front ]->is_connected( pVehicles[ end::rear ], coupling::control ) ) { + if( frontvehicle->is_connected( pVehicles[ end::rear ], coupling::control ) ) { // zmiana czoła przez zmianę kabiny iDrivigFlags |= movePushPull; } @@ -2482,7 +2483,7 @@ bool TController::CheckVehicles(TOrders user) } else { // jak dociska - pVehicles[end::front]->RaLightsSet(0, -1); + frontvehicle->RaLightsSet(0, -1); } } // enable door locks @@ -2493,7 +2494,7 @@ bool TController::CheckVehicles(TOrders user) // TODO: replace connection test with connection check between last engine and first car, specifically auto const isheatingcouplingactive { ( ControlledEnginesCount == 1 ? - pVehicles[ end::front ]->is_connected( pVehicles[ end::rear ], coupling::heating ) : + frontvehicle->is_connected( pVehicles[ end::rear ], coupling::heating ) : true ) }; auto const isheatingneeded { (is_emu() || is_dmu() ? true : @@ -4042,7 +4043,7 @@ void TController::SetTimeControllers() } } - if( std::abs( DizelPercentage_Speed - DizelActualPercentage ) > ( DizelPercentage > 1 ? 0 : 0 ) ) { + if( std::abs( DizelPercentage_Speed - DizelActualPercentage ) > 0 ) { if( PosDec > 0 && ( DizelActualPercentage - DizelPercentage_Speed > 50 @@ -4544,7 +4545,7 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N if (NewValue1 > 0.0 ? NewValue1 > fStopTime : false) fStopTime = NewValue1; // Ra: włączenie czekania bez zmiany komendy else - OrderList[OrderPos] = Wait_for_orders; // czekanie na komendę (albo dać OrderPos=0) + OrderCurrentSet( Wait_for_orders ); // czekanie na komendę (albo dać OrderPos=0) return true; } @@ -4986,13 +4987,13 @@ TController::PrepareDirection() { void TController::JumpToNextOrder( bool const Ignoremergedchangedirection ) { // wykonanie kolejnej komendy z tablicy rozkazów - if (OrderList[OrderPos] != Wait_for_orders) + if (auto const currentorder { OrderCurrentGet() }; currentorder != Wait_for_orders) { - if( (OrderList[OrderPos] & Change_direction) != 0 // jeśli zmiana kierunku - && OrderList[OrderPos] != Change_direction && false == Ignoremergedchangedirection ) { // ale nałożona na coś + if( (currentorder & Change_direction) != 0 // jeśli zmiana kierunku + && currentorder != Change_direction && false == Ignoremergedchangedirection ) { // ale nałożona na coś // usunięcie zmiany kierunku z innej komendy - OrderList[OrderPos] = TOrders(OrderList[OrderPos] & ~Change_direction); + OrderCurrentSet( TOrders(currentorder & ~Change_direction) ); OrderCheck(); return; } @@ -5032,37 +5033,43 @@ void TController::OrderCheck() // HACK: ensure consist doors will be closed on departure iDrivigFlags |= moveDoorOpened; } - if (OrderList[OrderPos] & Change_direction) // może być nałożona na inną i wtedy ma priorytet + auto const currentorder { OrderCurrentGet() }; + if (currentorder & Change_direction) // może być nałożona na inną i wtedy ma priorytet iDirectionOrder = -iDirection; // trzeba zmienić jawnie, bo się nie domyśli - else if (OrderList[OrderPos] == Obey_train) + else if (currentorder == Obey_train) iDrivigFlags |= moveStopPoint; // W4 są widziane - else if (OrderList[OrderPos] == Disconnect) + else if (currentorder == Disconnect) iVehicleCount = iVehicleCount < 0 ? 0 : iVehicleCount; // odczepianie lokomotywy - else if (OrderList[OrderPos] == Connect) + else if (currentorder == Connect) iDrivigFlags &= ~moveStopPoint; // podczas jazdy na połączenie nie zwracać uwagi na W4 - else if (OrderList[OrderPos] == Wait_for_orders) + else if (currentorder == Wait_for_orders) OrdersClear(); // czyszczenie rozkazów i przeskok do zerowej pozycji } void TController::OrderNext(TOrders NewOrder) { // ustawienie rozkazu do wykonania jako następny - if (OrderList[OrderPos] == NewOrder) + if (OrderCurrentGet() == NewOrder) return; // jeśli robi to, co trzeba, to koniec if (!OrderPos) OrderPos = 1; // na pozycji zerowej pozostaje czekanie OrderTop = OrderPos; // ale może jest czymś zajęty na razie if (NewOrder >= Shunt) // jeśli ma jechać { // ale może być zajęty chwilowymi operacjami - while (OrderList[OrderTop] != Wait_for_orders && OrderList[OrderTop] < Shunt) // jeśli coś robi + while (OrderTop >= 0 && OrderTop < maxorders - 1 + && OrderList[OrderTop] != Wait_for_orders && OrderList[OrderTop] < Shunt) // jeśli coś robi ++OrderTop; // pomijamy wszystkie tymczasowe prace } else { // jeśli ma ustawioną jazdę, to wyłączamy na rzecz operacji - while (OrderList[OrderTop] ? - OrderList[OrderTop] < Shunt && OrderList[OrderTop] != NewOrder : - false) // jeśli coś robi + while (OrderTop >= 0 && OrderTop < maxorders - 1 + && OrderList[OrderTop] != Wait_for_orders && OrderList[OrderTop] < Shunt && OrderList[OrderTop] != NewOrder) // jeśli coś robi ++OrderTop; // pomijamy wszystkie tymczasowe prace } + if (OrderTop < 0 || OrderTop >= maxorders) + { + ErrorLog("Commands overflow: order \"" + Order2Str(NewOrder) + "\" dropped"); + return; + } OrderList[OrderTop++] = NewOrder; // dodanie rozkazu jako następnego #if LOGORDERS OrdersDump( "OrderNext" ); // normalnie nie ma po co tego wypisywać @@ -5071,15 +5078,17 @@ void TController::OrderNext(TOrders NewOrder) void TController::OrderPush(TOrders NewOrder) { // zapisanie na stosie kolejnego rozkazu do wykonania - if (OrderPos == OrderTop && OrderList[OrderPos] < Shunt) // jeśli miałby być zapis na aktalnej pozycji + if (OrderPos == OrderTop && OrderCurrentGet() < Shunt) // jeśli miałby być zapis na aktalnej pozycji // ale nie jedzie ++OrderTop; // niektóre operacje muszą zostać najpierw dokończone => zapis na kolejnej + if (OrderTop < 0 || OrderTop >= maxorders) + { + ErrorLog("Commands overflow: order \"" + Order2Str(NewOrder) + "\" dropped"); + return; + } if (OrderList[OrderTop] != NewOrder) // jeśli jest to samo, to nie dodajemy OrderList[OrderTop++] = NewOrder; // dodanie rozkazu na stos - // if (OrderTop= maxorders) - ErrorLog("Commands overflow: The program will now crash"); #if LOGORDERS OrdersDump( "OrderPush: [" + Order2Str( NewOrder ) + "]" ); // normalnie nie ma po co tego wypisywać #endif @@ -5395,8 +5404,7 @@ TCommandType TController::BackwardScan( double const Range ) // najpierw sprawdzamy, czy semafor czy inny znak został przejechany auto const sl{e->input_location()}; // położenie komórki pamięci auto const pos{pVehicles[end::rear]->RearPosition()}; // pozycja tyłu - auto const sem{sl - pos}; // wektor do komórki pamięci od końca składu - if (dir.x * sem.x + dir.z * sem.z < 0) + if (auto const sem{sl - pos}; dir.x * sem.x + dir.z * sem.z < 0) // wektor do komórki pamięci od końca składu { // jeśli został minięty // iloczyn skalarny jest ujemny, gdy sygnał stoi z tyłu @@ -5406,13 +5414,10 @@ TCommandType TController::BackwardScan( double const Range ) return TCommandType::cm_Unknown; // nic } scanvel = e->input_value(1); // prędkość przy tym semaforze +#if LOGBACKSCAN // przeliczamy odległość od semafora - potrzebne by były współrzędne początku składu - scandist = glm::length(sem) - 2; // 2m luzu przy manewrach wystarczy - if (scandist < 0) - { - // ujemnych nie ma po co wysyłać - scandist = 0; - } + scandist = std::max(glm::length(sl - pos) - 2.0, 0.0); // 2m luzu przy manewrach wystarczy, ujemnych nie ma po co wysyłać +#endif } auto move{false}; // czy AI w trybie manewerowym ma dociągnąć pod S1 @@ -5425,32 +5430,23 @@ TCommandType TController::BackwardScan( double const Range ) } else { + // jeśli semafor jest daleko, a pojazd jedzie, to informujemy o zmianie prędkości + // jeśli jedzie manewrowo, musi dostać SetVelocity, żeby sie na pociągowy przełączył + // w przeciwnym razie ustawiamy prędkość tylko wtedy, gdy ma ruszyć, stanąć albo ma stać + // ruszać stop trzeba powtarzać, bo inaczej zatrąbi i pojedzie sam +#if LOGBACKSCAN if (scandist > fMinProximityDist && mvOccupied->Vel > EU07_AI_NOMOVEMENT && (OrderCurrentGet() & (Shunt | Loose_shunt)) == 0) { - // jeśli semafor jest daleko, a pojazd jedzie, to informujemy o zmianie prędkości - // jeśli jedzie manewrowo, musi dostać SetVelocity, żeby sie na pociągowy przełączył -#if LOGBACKSCAN - // WriteLog(edir+"SetProximityVelocity "+AnsiString(scandist) + - // AnsiString(scanvel)); WriteLog(edir); -#endif - // SetProximityVelocity(scandist,scanvel,&sl); - return scanvel > 0 ? TCommandType::cm_SetVelocity : TCommandType::cm_Unknown; } else { - // ustawiamy prędkość tylko wtedy, gdy ma ruszyć, stanąć albo ma stać - // if ((MoverParameters->Vel==0.0)||(scanvel==0.0)) //jeśli stoi lub ma stanąć/stać - // semafor na tym torze albo lokomtywa stoi, a ma ruszyć, albo ma stanąć, albo nie - // ruszać stop trzeba powtarzać, bo inaczej zatrąbi i pojedzie sam - // PutCommand("SetVelocity",scanvel,e->Params[9].asMemCell->Value2(),&sl,stopSem); -#if LOGBACKSCAN WriteLog(edir + " - [SetVelocity] [" + to_string(scanvel, 2) + "] [" + to_string(e->input_value(2), 2) + "]"); -#endif - return scanvel > 0 ? TCommandType::cm_SetVelocity : TCommandType::cm_Unknown; } +#endif + return scanvel > 0 ? TCommandType::cm_SetVelocity : TCommandType::cm_Unknown; } } // reakcja AI w trybie manewrowym dodatkowo na sygnały manewrowe @@ -8118,7 +8114,7 @@ TController::check_route_behind( double const Range ) { } iDirectionOrder = -iDirection; // zmiana kierunku jazdy // zmiana kierunku bez psucia kolejnych komend - OrderList[ OrderPos ] = TOrders( OrderCurrentGet() | Change_direction ); + OrderCurrentSet( TOrders( OrderCurrentGet() | Change_direction ) ); } } } diff --git a/vehicle/Driver.h b/vehicle/Driver.h index b76dbf086..644b81220 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -482,6 +482,7 @@ private: void OrderPush( TOrders NewOrder ); void OrderNext( TOrders NewOrder ); inline TOrders OrderCurrentGet() const; + inline void OrderCurrentSet( TOrders const Order ); inline TOrders OrderNextGet() const; void OrderCheck(); void OrdersInit( double fVel ); @@ -542,7 +543,7 @@ private: double fLastVel = 0.0; // prędkość na poprzednio sprawdzonym torze TTrack *tLast = nullptr; // ostatni analizowany tor basic_event *eSignSkip = nullptr; // można pominąć ten SBL po zatrzymaniu - static constexpr std::size_t npos{ std::size_t( -1 ) }; + static constexpr std::size_t npos{ std::numeric_limits::max() }; std::size_t SemNextIndex{ npos }; std::size_t SemNextStopIndex{ npos }; double dMoveLen = 0.0; // odległość przejechana od ostatniego sprawdzenia tabelki @@ -645,9 +646,23 @@ private: }; inline TOrders TController::OrderCurrentGet() const { + if( OrderPos < 0 || OrderPos >= maxorders ) { + return Wait_for_orders; + } return OrderList[ OrderPos ]; } -inline TOrders TController::OrderNextGet() const { - return OrderList[ OrderPos + 1 ]; +inline void TController::OrderCurrentSet( TOrders const Order ) { + if( OrderPos < 0 || OrderPos >= maxorders ) { + return; + } + OrderList[ OrderPos ] = Order; +} + +inline TOrders TController::OrderNextGet() const { + if( OrderPos < 0 || OrderPos >= maxorders ) { + return Wait_for_orders; + } + // the order list wraps around, same as in JumpToNextOrder() + return OrderList[ ( OrderPos + 1 ) % maxorders ]; } diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index 873cc4d32..6af23f070 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -1408,7 +1408,7 @@ TDynamicObject * TDynamicObject::ABuScanNearestObject(glm::vec3 pos, TTrack *Tra TDynamicObject *FoundedObj; FoundedObj = ABuFindNearestObject(pos, Track, this, CouplNr); // zwraca numer sprzęgu znalezionego pojazdu - if (FoundedObj == nullptr) + if (FoundedObj == nullptr && Track != nullptr) { double ActDist; // Przeskanowana odleglosc. double CurrDist = 0; // Aktualna dlugosc toru. @@ -1448,7 +1448,7 @@ TDynamicObject * TDynamicObject::ABuScanNearestObject(glm::vec3 pos, TTrack *Tra ActDist = ScanDist; } else // Jesli nie ma, to wychodzimy. - ActDist = ScanDist; + break; } } // Koniec szukania najblizszego toru z jakims obiektem. return FoundedObj; diff --git a/vehicle/Gauge.cpp b/vehicle/Gauge.cpp index a510b05f0..63c042d39 100644 --- a/vehicle/Gauge.cpp +++ b/vehicle/Gauge.cpp @@ -241,8 +241,7 @@ TGauge::Load_mapping( cParser &Input, TGauge::scratch_data &Scratchpad ) { gaugetype == "return" ? TGaugeType::push : gaugetype == "delayed" ? TGaugeType::push_delayed : gaugetype == "pushtoggle" ? TGaugeType::pushtoggle : - gaugetype == "toggle" ? TGaugeType::toggle : - TGaugeType::toggle; // default + TGaugeType::toggle; // "toggle" and default } else if( key == "soundinc:" ) { m_soundfxincrease.deserialize( Input, sound_type::single ); diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index 8d2117c46..a77c5749c 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -31,6 +31,7 @@ http://mozilla.org/MPL/2.0/. #include "application/application.h" #include "rendering/renderer.h" #include +#include #include #include /* @@ -646,9 +647,8 @@ bool TTrain::Init(TDynamicObject *NewDynamicObject, bool e3d) } DynamicSet(NewDynamicObject); - if (!e3d) - if (DynamicObject->Mechanik == nullptr) - return false; + if (!e3d && DynamicObject->Mechanik == nullptr) + return false; DynamicObject->MechInside = true; @@ -1435,7 +1435,7 @@ void TTrain::OnCommand_secondcontrollerincrease(TTrain *Train, command_data cons // HACK: potentially animate push or pushtoggle control if (Train->ggScndCtrl.is_push()) { - auto const activeposition{Train->ggScndCtrl.is_toggle() ? 1.f : 1.f}; + auto const activeposition{1.f}; auto const neutralposition{Train->ggScndCtrl.is_toggle() ? 0.5f : 0.f}; Train->ggScndCtrl.UpdateValue(Command.action == GLFW_RELEASE ? neutralposition : activeposition, Train->dsbSwitch); } @@ -12398,8 +12398,18 @@ uint16_t TTrain::id() return vid; } -#include -#include +namespace +{ +// updates trains in range [Start, End) +void update_trains(std::deque const &Trains, std::size_t const Start, std::size_t const End, double const Dt) +{ + for (std::size_t j = Start; j < End; ++j) + { + if (Trains[j]) + Trains[j]->Update(Dt); + } +} +} // namespace void train_table::updateAsync(double dt) { @@ -12407,8 +12417,10 @@ void train_table::updateAsync(double dt) const size_t total = m_items.size(); const size_t chunkSize = (total + threads - 1) / threads; - std::vector> futures; - futures.reserve(threads); + std::vector workers; + std::vector> results; // przekazują wyjątki z wątków do głównego wątku + workers.reserve(threads); + results.reserve(threads); for (int i = 0; i < threads; ++i) { @@ -12418,21 +12430,17 @@ void train_table::updateAsync(double dt) if (start >= end) break; // brak więcej danych - futures.emplace_back(std::async(std::launch::async, - [this, start, end, dt]() - { - for (size_t j = start; j < end; ++j) - { - TTrain *train = m_items[j]; - if (train) - train->Update(dt); - } - })); + std::packaged_task task([this, start, end, dt]() { update_trains(m_items, start, end, dt); }); + results.emplace_back(task.get_future()); + workers.emplace_back(std::move(task)); } // Poczekaj aż wszystkie wątki skończą - for (auto &f : futures) - f.get(); + for (auto &worker : workers) + worker.join(); + + for (auto &result : results) + result.get(); // Teraz kasowanie (tylko w głównym wątku) for (TTrain *train : m_items) diff --git a/world/Segment.cpp b/world/Segment.cpp index 2afa264ee..c963922a4 100644 --- a/world/Segment.cpp +++ b/world/Segment.cpp @@ -294,7 +294,7 @@ TSegment::find_nearest_point( glm::dvec3 const &Point ) const { else { // for curves iterate through segment chunks, and find the one which gives us the least distance to the specified point double distance = std::numeric_limits::max(); - double nearest; + double nearest { 0.0 }; // NOTE: we're reusing already created segment chunks, which are created based on splinefidelity setting // this means depending on splinefidelity the results can be potentially slightly different for( int segmentidx = 0; segmentidx < iSegCount; ++segmentidx ) { From 8f050d9c3ed52e1b5faaf6195399a6249091b43b Mon Sep 17 00:00:00 2001 From: maj00r Date: Mon, 5 Oct 2026 01:21:11 +0200 Subject: [PATCH 122/430] feat(tracks): speed check of the paths against the speed their geometry allows: radius and cant, cant ramps, curves without transitions, switch branches --- editor/editorSpeed.cpp | 340 +++++++++++++++++++++++++++++++++++++++++ editor/editorSpeed.hpp | 80 ++++++++++ 2 files changed, 420 insertions(+) create mode 100644 editor/editorSpeed.cpp create mode 100644 editor/editorSpeed.hpp diff --git a/editor/editorSpeed.cpp b/editor/editorSpeed.cpp new file mode 100644 index 000000000..bf98e79e3 --- /dev/null +++ b/editor/editorSpeed.cpp @@ -0,0 +1,340 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "editor/editorSpeed.hpp" +#include "editor/editorFormat.hpp" +#include "editor/editorGeometry.hpp" +#include "editor/editorTrack.hpp" + +#include "world/Track.h" + +#include +#include + +namespace speed_check +{ + +namespace +{ + +double constexpr kGravity{9.81}; + +struct sample +{ + double chainage; + double curvature; // signed, 1/m + double cant; // m, signed as the curvature: raise of the outer rail +}; + +double value_at(std::vector const &Samples, double const Chainage, double sample::*Field) +{ + auto const next{std::lower_bound(Samples.begin(), Samples.end(), Chainage, [](sample const &Sample, double const Value) { return Sample.chainage < Value; })}; + if (next == Samples.begin()) + return (*next).*Field; + if (next == Samples.end()) + return Samples.back().*Field; + auto const &before{*std::prev(next)}; + auto const run{next->chainage - before.chainage}; + return run > 1e-9 ? before.*Field + ((*next).*Field - before.*Field) * (Chainage - before.chainage) / run : before.*Field; +} + +// highest speed up to Top at which the unbalanced acceleration, changing by Curvature and Cant per metre, changes no faster than Jerk +double jerk_limit(double const Curvature, double const Cant, double const Gauge, double const Jerk, double const Top) +{ + auto const rate = [&](double const Speed) { return std::abs(Speed * Speed / 12.96 * Curvature - kGravity * Cant / Gauge) * Speed / 3.6; }; + if (rate(Top) <= Jerk) + return Top; + double low{0.0}; + for (double speed = 10.0; speed <= Top; speed += 10.0) + { + if (rate(speed) > Jerk) + { + double high{speed}; + for (int i = 0; i < 12; ++i) + { + auto const middle{(low + high) * 0.5}; + (rate(middle) > Jerk ? high : low) = middle; + } + return low; + } + low = speed; + } + return Top; +} + +// track the simulation joined to the start or the end of the path +TTrack *linked(TTrack const &Track, int const Path, bool const Atend) +{ + if (Track.SwitchExtension && Path < 2) + return Atend ? Track.SwitchExtension->pNexts[Path] : Track.SwitchExtension->pPrevs[Path]; + return Atend ? Track.trNext : Track.trPrev; +} + +// paths which continue the path through the point, run from or to it. only the joints the trains take count: +// in a double slip the ends of the other diagonal lie a few centimetres away, but aren't joined to this path +std::vector continuations(TTrack &Track, int const Path, bool const Atend, glm::dvec3 const &Direction, bool const Arriving) +{ + std::vector result; + auto *other{linked(Track, Path, Atend)}; + if (other == nullptr || other == &Track || other->m_editorremoved) + return result; + auto const &point{Track.m_paths[Path].points[Atend ? segment_data::point::end : segment_data::point::start]}; + for (int path = 0; path < static_cast(other->m_paths.size()); ++path) + { + auto const &candidate{other->m_paths[path]}; + auto const atstart{glm::distance(candidate.points[segment_data::point::start], point) < geometry::same_point}; + if (false == atstart && glm::distance(candidate.points[segment_data::point::end], point) >= geometry::same_point) + continue; + if (linked(*other, path, false == atstart) != &Track) + continue; + geometry::bezier const curve{candidate}; + // direction of travel through the other path at the point + auto const along{atstart ? curve.first(0.0) : -curve.first(1.0)}; + auto const travel{Arriving ? -along : along}; + if (glm::dot(geometry::plan_of(travel), geometry::plan_of(Direction)) <= 0.0) + continue; + result.push_back({other, path, Arriving ? false == atstart : atstart}); + } + return result; +} + +} // namespace + +char const *describe(cause const Cause) +{ + switch (Cause) + { + case cause::radius: return "radius"; + case cause::cant_rate: return "cant change rate"; + case cause::cant_ramp: return "cant ramp"; + case cause::jerk: return "no transition"; + case cause::branch: return "switch branch"; + default: return "-"; + } +} + +bool verdict::violated(options const &Options) const +{ + if (hard >= Options.top) + return false; + if (set <= 0.0) + return true; + return set > hard + 0.5; +} + +bool verdict::warned(options const &Options) const +{ + if (safe >= Options.top || violated(Options)) + return false; + return set <= 0.0 || set > safe + 0.5; +} + +std::string explain(verdict const &Verdict, options const &Options) +{ + if (Verdict.safe >= Options.top) + return format("The geometry allows any speed up to %.0f km/h", Options.top); + auto const gauge{Options.norms.gauge / 1000.0}; + // the numbers are given at the speed set, or at the safe one when none is set + auto const speed{Verdict.set > 0.0 ? Verdict.set : Verdict.safe}; + auto const radius_text = [](double const Radius) { + return Radius == 0.0 ? std::string{"straight"} : format("R %.0f m%s", std::abs(Radius), Radius < 0.0 ? " the other way" : ""); + }; + auto const unbalanced = [&](double const Radius, double const Cant) { return (Radius != 0.0 ? speed * speed / (12.96 * Radius) : 0.0) - kGravity * Cant / 1000.0 / gauge; }; + std::string text; + if (Verdict.warned(Options)) + text = "Warning only, the limit of a switch branch: "; + if (Verdict.set <= 0.0) + text += format("No speed limit is set, so the trains run at the line speed, while the geometry allows %.0f km/h.\n", Verdict.safe); + else + text += format("The speed set, %.0f km/h, is %s the %.0f km/h the geometry allows.\n", Verdict.set, Verdict.set > Verdict.safe + 0.5 ? "above" : "within", Verdict.safe); + if (Verdict.why == cause::branch) + text += Verdict.hard < Options.top ? format("Without the switch branch limit the geometry allows %.0f km/h (%s).\n", Verdict.hard, describe(Verdict.hard_why)) + : std::string{"Without the switch branch limit the geometry allows any speed.\n"}; + switch (Verdict.why) + { + case cause::radius: + case cause::branch: + { + bool const branch{Verdict.why == cause::branch}; + text += format("%s, %s, cant %.0f mm.\n", branch ? "Diverging track of the switch" : "Curve", radius_text(Verdict.radius).c_str(), Verdict.cant); + text += format("Unbalanced acceleration V^2/(12.96 R) - g h/s at %.0f km/h: %.2f m/s2, the limit is %.2f m/s2%s.\n", speed, unbalanced(Verdict.radius, Verdict.cant), + branch ? Options.branch_unbalanced : Options.norms.unbalanced, branch ? " for the switch branches, which have no cant" : ""); + text += branch ? "A switch of a larger radius would allow more" : "More cant or a larger radius would allow more"; + break; + } + case cause::cant_rate: + text += format("The cant changes from %.0f to %.0f mm over %.0f m, %.2f mm per m.\n", Verdict.cant_from, Verdict.cant_to, Options.reference_length, Verdict.cant_slope); + text += format("A train at %.0f km/h feels it change by %.0f mm/s, the limit is %.0f mm/s.\n", speed, Verdict.cant_slope * speed / 3.6, Options.norms.cant_rate); + text += "A longer cant ramp, along a longer transition curve, would allow more"; + break; + case cause::cant_ramp: + text += format("The cant changes from %.0f to %.0f mm over %.0f m, a ramp of 1:%.0f.\n", Verdict.cant_from, Verdict.cant_to, Options.reference_length, 1000.0 / std::max(1e-6, Verdict.cant_slope)); + text += format("At %.0f km/h the ramp can't be steeper than 1:(k V) = 1:%.0f, k = %.1f.\n", speed, Options.norms.ramp_factor * speed, Options.norms.ramp_factor); + text += "A longer cant ramp would allow more"; + break; + case cause::jerk: + { + auto const from{unbalanced(Verdict.radius_from, Verdict.cant_from)}; + auto const to{unbalanced(Verdict.radius_to, Verdict.cant_to)}; + auto const time{Options.reference_length / std::max(1.0, speed / 3.6)}; + text += format("Within %.0f m the track goes from %s, cant %.0f mm, to %s, cant %.0f mm.\n", Options.reference_length, radius_text(Verdict.radius_from).c_str(), Verdict.cant_from, + radius_text(Verdict.radius_to).c_str(), Verdict.cant_to); + text += format("At %.0f km/h the unbalanced acceleration changes from %.2f to %.2f m/s2 in %.1f s: %.2f m/s3, the limit is %.2f m/s3.\n", speed, from, to, time, std::abs(to - from) / time, + Options.norms.jerk); + text += "The curve lacks a transition, or it is too short"; + break; + } + default: break; + } + return text; +} + +double suggested(double const Safe) +{ + if (Safe >= 40.0) + return std::floor(Safe / 10.0) * 10.0; + return std::max(5.0, std::floor(Safe / 5.0) * 5.0); +} + +double path_velocity(TTrack const &Track, int const Path) +{ + auto const velocity{editor_track::velocity(Track)}; + if (Track.eType == tt_Switch && velocity <= -2.0) + return Path == 0 ? -1.0 : -velocity; + return velocity > 0.0 ? velocity : -1.0; +} + +double switch_velocity(double const Main, double const Diverging) +{ + if (Main <= 0.0) + return Diverging > 0.0 ? -std::max(2.0, Diverging) : -1.0; + return Diverging > 0.0 ? std::min(Main, Diverging) : Main; +} + +verdict check(TTrack &Track, int const Path, options const &Options) +{ + verdict result; + result.track = &Track; + result.path = Path; + result.set = path_velocity(Track, Path); + result.safe = Options.top; + result.hard = Options.top; + if (Path < 0 || Path >= static_cast(Track.m_paths.size())) + return result; + + auto const gauge{Options.norms.gauge / 1000.0}; + bool const branch{Track.eType == tt_Switch && Path == 1}; + auto const &own{Track.m_paths[Path]}; + geometry::bezier const curve{own}; + auto const before{continuations(Track, Path, false, curve.first(0.0), true)}; + auto const after{continuations(Track, Path, true, curve.first(1.0), false)}; + std::vector previous{nullptr}, next{nullptr}; + if (false == before.empty()) + previous.clear(); + for (auto const &span : before) + previous.push_back(&span); + if (false == after.empty()) + next.clear(); + for (auto const &span : after) + next.push_back(&span); + + auto const half{Options.reference_length * 0.5}; + for (auto const *first : previous) + { + for (auto const *last : next) + { + editor_track::route route; + if (first != nullptr) + route.spans.push_back(*first); + route.spans.push_back({&Track, Path, true}); + if (last != nullptr) + route.spans.push_back(*last); + auto const own_span{first != nullptr ? std::size_t{1} : std::size_t{0}}; + auto const sampled{editor_track::sample_route(route, Options.step)}; + std::vector samples; + samples.reserve(sampled.size()); + for (auto const &entry : sampled) + { + auto const sign{entry.curvature < 0.0 ? -1.0 : 1.0}; + samples.push_back({entry.chainage, entry.curvature, entry.cant * sign}); + } + auto const from{route.spans[own_span].from}; + auto const to{route.spans[own_span].to}; + for (std::size_t i = 0; i < sampled.size(); ++i) + { + if (sampled[i].span != own_span) + continue; + auto const &here{samples[i]}; + auto const curvature{std::abs(here.curvature)}; + auto const cant{std::abs(here.cant)}; + double safe{Options.top}; + cause why{cause::none}; + auto const limit = [&](double const Speed, cause const Cause) { + if (Speed < safe) + { + safe = Speed; + why = Cause; + } + if (Cause != cause::branch && Speed < result.hard) + { + result.hard = Speed; + result.hard_why = Cause; + } + }; + if (curvature > 1e-7) + { + auto const allowed{(branch ? Options.branch_unbalanced : Options.norms.unbalanced) + kGravity * cant / gauge}; + limit(3.6 * std::sqrt(std::max(0.0, allowed) / curvature), branch ? cause::branch : cause::radius); + } + auto const start{std::max(0.0, here.chainage - half)}; + auto const end{std::min(route.length, here.chainage + half)}; + auto const run{end - start}; + double cantchange{0.0}; + if (run > Options.step * 0.5) + { + cantchange = (value_at(samples, end, &sample::cant) - value_at(samples, start, &sample::cant)) / run; + auto const curvaturechange{(value_at(samples, end, &sample::curvature) - value_at(samples, start, &sample::curvature)) / run}; + if (std::abs(cantchange) > 1e-7) + { + limit(3.6 * Options.norms.cant_rate / 1000.0 / std::abs(cantchange), cause::cant_rate); + limit(1.0 / (Options.norms.ramp_factor * std::abs(cantchange)), cause::cant_ramp); + } + // switches have no transitions by design, their limits cover it + auto const regular{std::all_of(route.spans.begin(), route.spans.end(), [&](editor_track::route_span const &Span) { return Span.to < start || Span.from > end || Span.track->eType == tt_Normal; })}; + if (regular && (std::abs(curvaturechange) > 1e-9 || std::abs(cantchange) > 1e-9)) + limit(jerk_limit(curvaturechange, cantchange, gauge, Options.norms.jerk, Options.top), cause::jerk); + } + if (safe < result.safe) + { + auto const share{to > from ? (here.chainage - from) / (to - from) : 0.0}; + result.safe = safe; + result.why = why; + result.position = curve.point(std::clamp(curve.parameter(share * curve.plan_length()), 0.0, 1.0)); + result.radius = curvature > 1e-7 ? 1.0 / curvature : 0.0; + result.cant = cant * 1000.0; + // signed as the curvature here, a reverse curve getting the other sign + auto const sign{here.curvature < 0.0 ? -1.0 : 1.0}; + auto const radius_at = [&](double const Chainage) { + auto const value{value_at(samples, Chainage, &sample::curvature) * sign}; + return std::abs(value) > 1e-7 ? 1.0 / value : 0.0; + }; + result.radius_from = radius_at(start); + result.radius_to = radius_at(end); + result.cant_from = value_at(samples, start, &sample::cant) * sign * 1000.0; + result.cant_to = value_at(samples, end, &sample::cant) * sign * 1000.0; + result.cant_slope = std::abs(cantchange) * 1000.0; + } + } + } + } + return result; +} + +} // namespace speed_check diff --git a/editor/editorSpeed.hpp b/editor/editorSpeed.hpp new file mode 100644 index 000000000..bea32fc2a --- /dev/null +++ b/editor/editorSpeed.hpp @@ -0,0 +1,80 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include +#include + +#include "editor/editorAlignment.hpp" + +class TTrack; + +// speed the geometry of the paths allows, set against the speed limits written in them +namespace speed_check +{ + +enum class cause +{ + none, + radius, // unbalanced acceleration in the curve + cant_rate, // cant changes too fast for the passengers + cant_ramp, // the cant ramp is too steep for the wheels + jerk, // the unbalanced acceleration changes too fast, curves without the transitions + branch // diverging track of a switch, without cant +}; +char const *describe(cause const Cause); + +struct options +{ + alignment::limits norms; + double branch_unbalanced{0.65}; // m/s2, for the diverging tracks of the switches + double reference_length{20.0}; // m, over which an abrupt change of the curvature or of the cant is felt + double step{2.0}; // m, between the checked points + double top{300.0}; // km/h, nothing above is looked into +}; + +struct verdict +{ + TTrack *track{nullptr}; + int path{0}; + double set{-1.0}; // km/h, -1: no limit of its own + double safe{0.0}; // km/h, Options.top when the geometry allows any speed + cause why{cause::none}; + glm::dvec3 position{0.0}; // where the geometry is the tightest + double radius{0.0}; // m, there + double cant{0.0}; // mm, there + // over the reference length around the point: the radius and the cant at its ends, 0 m for a straight. + // negative where the curve turns the other way than at the point + double radius_from{0.0}, radius_to{0.0}; + double cant_from{0.0}, cant_to{0.0}; // mm + double cant_slope{0.0}; // mm per m + // km/h, the safe speed without the limit of the switch branches, which is only a warning + double hard{0.0}; + cause hard_why{cause::none}; + // true when the speed set is above the safe one, or isn't set over a tight geometry; the switch branches not counted + bool violated(options const &Options) const; + // true when only the limit of a switch branch is exceeded + bool warned(options const &Options) const; +}; +// what limits the speed, with the numbers which do +std::string explain(verdict const &Verdict, options const &Options); + +verdict check(TTrack &Track, int const Path, options const &Options); +// the safe speed rounded down to the usual steps of the speed limits +double suggested(double const Safe); +// speed limit in force on the path, -1 for none. a switch keeps one for both its tracks: positive applies to both, +// -2 and below only to the diverging one, its main track having no limit then +double path_velocity(TTrack const &Track, int const Path); +// velocity of a switch which keeps its tracks to the limits given, -1 for none. one written value can't hold +// a limit on each track, the main one gets the diverging one's limit too when that's lower +double switch_velocity(double const Main, double const Diverging); + +} // namespace speed_check From b07050fa5283c86778bdf7ec760c8234b334ed54 Mon Sep 17 00:00:00 2001 From: maj00r Date: Mon, 5 Oct 2026 01:21:11 +0200 Subject: [PATCH 123/430] feat(tracks): switches keep their neighbours joined on replacing, flipping and moving; events copied on splitting; circuits, overhead line, sleepers and events of the paths; curve design through the switches of a line; changes in files included more than once or with parameters reported instead of written; split of a straight at the point found, not a share of its length --- editor/editorAlignment.cpp | 65 ++++-- editor/editorAlignment.hpp | 5 +- editor/editorTrack.cpp | 421 +++++++++++++++++++++++++++++++++++-- editor/editorTrack.hpp | 81 ++++++- scene/scenelayerssave.cpp | 35 ++- 5 files changed, 567 insertions(+), 40 deletions(-) diff --git a/editor/editorAlignment.cpp b/editor/editorAlignment.cpp index 29a85b012..5bc319f35 100644 --- a/editor/editorAlignment.cpp +++ b/editor/editorAlignment.cpp @@ -269,6 +269,11 @@ result fit_between(design const &Design) auto const start{plan_of(Design.start)}; auto const end{plan_of(Design.end)}; + if (glm::length(Design.start_direction) < 1e-9 || glm::length(Design.end_direction) < 1e-9) + { + r.errors.emplace_back("The direction of an end of the fragment is undefined, its end path has zero length"); + return r; + } auto const startdirection{glm::normalize(Design.start_direction)}; auto const enddirection{glm::normalize(Design.end_direction)}; auto const count{Design.vertices.size()}; @@ -872,7 +877,8 @@ std::size_t minimum_pieces(result const &Result, design const &Design) return count; } -std::vector pieces(result const &Result, design const &Design, std::size_t const Count) +std::vector pieces(result const &Result, design const &Design, std::size_t const Count, std::vector const &Breaks, std::vector const &Counts, + std::vector *Intervals) { struct span { @@ -920,23 +926,56 @@ std::vector pieces(result const &Result, design const &Design, std } spans.erase(spans.begin() + i); } - while (false == spans.empty() && spans.size() < Count) - { - auto longest = std::max_element(spans.begin(), spans.end(), [&](span const &A, span const &B) { return extent(A) < extent(B); }); - span second{*longest}; - if (longest->generic) + // splits the span at the chainage + auto const split = [&](std::vector::iterator Span, double const Chainage) { + span second{*Span}; + if (Span->generic) { - auto const middle{(longest->start + longest->end) * 0.5}; - second.start = middle; - longest->end = middle; + second.start = Chainage; + Span->end = Chainage; } else { - auto const middle{(longest->from + longest->to) * 0.5}; - second.from = middle; - longest->to = middle; + auto const local{Chainage - Result.elements[Span->element].chainage}; + second.from = local; + Span->to = local; } - spans.insert(std::next(longest), second); + spans.insert(std::next(Span), second); + }; + double constexpr margin{0.01}; + for (auto const chainage : Breaks) + { + auto inside{std::find_if(spans.begin(), spans.end(), [&](span const &Span) { return chainage_from(Span) < chainage - margin && chainage_to(Span) > chainage + margin; })}; + if (inside != spans.end()) + split(inside, chainage); + } + auto const interval = [&](span const &Span) { + return static_cast(std::upper_bound(Breaks.begin(), Breaks.end(), (chainage_from(Span) + chainage_to(Span)) * 0.5) - Breaks.begin()); + }; + for (std::size_t k = 0; k < Counts.size(); ++k) + { + while (true) + { + auto const inside{static_cast(std::count_if(spans.begin(), spans.end(), [&](span const &Span) { return interval(Span) == k; }))}; + if (inside == 0 || inside >= Counts[k]) + break; + auto longest{spans.end()}; + for (auto candidate = spans.begin(); candidate != spans.end(); ++candidate) + if (interval(*candidate) == k && (longest == spans.end() || extent(*candidate) > extent(*longest))) + longest = candidate; + split(longest, (chainage_from(*longest) + chainage_to(*longest)) * 0.5); + } + } + while (false == spans.empty() && spans.size() < Count) + { + auto longest = std::max_element(spans.begin(), spans.end(), [&](span const &A, span const &B) { return extent(A) < extent(B); }); + split(longest, (chainage_from(*longest) + chainage_to(*longest)) * 0.5); + } + if (Intervals != nullptr) + { + Intervals->clear(); + for (auto const &piece : spans) + Intervals->push_back(interval(piece)); } std::vector result; diff --git a/editor/editorAlignment.hpp b/editor/editorAlignment.hpp index fcf6132bc..c57b386f1 100644 --- a/editor/editorAlignment.hpp +++ b/editor/editorAlignment.hpp @@ -173,6 +173,9 @@ double elevation(result const &Result, double const Chainage); double grade(result const &Result, double const Chainage); std::size_t minimum_pieces(result const &Result, design const &Design); -std::vector pieces(result const &Result, design const &Design, std::size_t const Count); +// Breaks: ascending chainages at which pieces have to end. Counts: least number of the pieces between the consecutive breaks, +// one more than the breaks; Intervals receives the number of the interval of each piece +std::vector pieces(result const &Result, design const &Design, std::size_t const Count, std::vector const &Breaks = {}, std::vector const &Counts = {}, + std::vector *Intervals = nullptr); } diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index 562f63916..d4dcb9c40 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -15,6 +15,7 @@ http: #include "world/Track.h" #include "vehicle/DynObj.h" #include "scene/scene.h" +#include "scene/scenelayers.h" #include "simulation/simulation.h" #include "rendering/renderer.h" #include "utilities/Globals.h" @@ -145,9 +146,82 @@ editor_track::state editor_track::capture(TTrack const &Track) result.texheight = texture_height(Track); result.texwidth = Track.fTexWidth; result.texslope = Track.fTexSlope; + for (auto const *isolated : Track.Isolated) + result.isolated.push_back(isolated->asName); + result.overhead = Track.fOverhead; + result.sleepers = Track.m_sleeper_enabled; + result.sleeper_frequency = Track.m_sleeper_frequency; + result.sleeper_model = Track.m_sleeper_model_name; + result.sleeper_skin = Track.m_sleeper_skin_name; + result.sleeper_offset = Track.m_sleeper_offset; + result.sleeper_ballast = Track.m_sleeper_ballast_z; + for (int i = 0; i < 6; ++i) + result.events[i] = events(const_cast(Track), i); return result; } +std::vector> &editor_track::events(TTrack &Track, int const Index) +{ + switch (Index) + { + case 1: return Track.m_events1; + case 2: return Track.m_events2; + case 3: return Track.m_events0all; + case 4: return Track.m_events1all; + case 5: return Track.m_events2all; + default: return Track.m_events0; + } +} + +char const *editor_track::event_keyword(int const Index) +{ + char const *const keywords[] = {"event0", "event1", "event2", "eventall0", "eventall1", "eventall2"}; + return keywords[std::clamp(Index, 0, 5)]; +} + +void editor_track::bind_events(TTrack &Track, std::string &Missing) +{ + Missing.clear(); + Track.m_events = false; + for (int i = 0; i < 6; ++i) + for (auto &event : events(Track, i)) + { + // the ones bound by the name of the path have no name of their own + if (false == event.first.empty()) + event.second = simulation::Events.FindEvent(event.first); + if (event.second != nullptr) + Track.m_events = true; + else + Missing += (Missing.empty() ? "" : ", ") + event.first; + } +} + +void editor_track::isolated(TTrack &Track, std::vector const &Names) +{ + Track.Isolated.clear(); + for (auto const &name : Names) + { + if (name.empty()) + continue; + bool known{false}; + for (auto *existing{TIsolated::Root()}; existing != nullptr && false == known; existing = existing->Next()) + known = (existing->asName == name); + auto *isolated{TIsolated::Find(name)}; + if (false == known) + isolated->AssignEvents(); + Track.Isolated.push_back(isolated); + } +} + +void editor_track::overhead(TTrack &Track, float const Overhead) +{ + Track.fOverhead = Overhead; + if (Overhead > 0.f) + Track.iAction |= 0x40; + else + Track.iAction &= ~0x40; +} + void editor_track::apply(TTrack &Track, state const &State) { Track.m_paths = State.paths; @@ -170,6 +244,19 @@ void editor_track::apply(TTrack &Track, state const &State) texture_height(Track, State.texheight); Track.fTexWidth = State.texwidth; Track.fTexSlope = State.texslope; + isolated(Track, State.isolated); + overhead(Track, State.overhead); + Track.m_sleeper_enabled = State.sleepers; + Track.m_sleeper_frequency = State.sleeper_frequency; + Track.m_sleeper_model_name = State.sleeper_model; + Track.m_sleeper_skin_name = State.sleeper_skin; + Track.m_sleeper_offset = State.sleeper_offset; + Track.m_sleeper_ballast_z = State.sleeper_ballast; + for (int i = 0; i < 6; ++i) + events(Track, i) = State.events[i]; + Track.m_events = std::any_of(State.events.begin(), State.events.end(), [](auto const &Events) { + return std::any_of(Events.begin(), Events.end(), [](auto const &Event) { return Event.second != nullptr; }); + }); } bool editor_track::is_supported(TTrack const &Track) @@ -198,6 +285,12 @@ bool editor_track::can_edit_geometry(TTrack const &Track, std::string &Reason) Reason = "Path geometry can't be rebuilt with the experimental renderer"; return false; } + std::string why; + if (false == scene::Layers.editable(&Track, &why)) + { + Reason = "The path can't be changed: " + why; + return false; + } Reason.clear(); return true; } @@ -387,6 +480,62 @@ std::vector> editor_track::connecte return result; } +namespace +{ + +// direction of the path at the end, into the path +glm::dvec2 end_direction(segment_data const &Path, editor_track::point_kind const Kind) +{ + bool const start{Kind == editor_track::point_kind::start}; + auto const &point{Path.points[start ? segment_data::point::start : segment_data::point::end]}; + auto const &control{Path.points[start ? segment_data::point::control1 : segment_data::point::control2]}; + auto const direction{plan_of(control != glm::dvec3{} ? control : Path.points[start ? segment_data::point::end : segment_data::point::start] - point)}; + return glm::length(direction) > 1e-9 ? glm::normalize(direction) : glm::dvec2{0.0, 1.0}; +} + +} // namespace + +std::vector editor_track::joints(TTrack const &Track) +{ + std::vector result; + for (int i = 0; i < static_cast(Track.m_paths.size()); ++i) + { + for (auto const kind : {point_kind::start, point_kind::end}) + { + point_ref const own{i, kind}; + for (auto const &connection : connected_points(Track, point_position(Track, own))) + { + auto *other{connection.first}; + std::string reason; + if (has_switch_paths(*other) || false == can_edit_geometry(*other, reason)) + continue; + if (std::any_of(result.begin(), result.end(), [&](joint const &Joint) { return Joint.other == other && Joint.theirs == connection.second; })) + continue; + auto const &path{other->m_paths[connection.second.path]}; + bool const start{connection.second.kind == point_kind::start}; + auto control{path.points[start ? segment_data::point::control1 : segment_data::point::control2]}; + if (control == glm::dvec3{}) + control = (path.points[start ? segment_data::point::end : segment_data::point::start] - path.points[start ? segment_data::point::start : segment_data::point::end]) / 3.0; + result.push_back({own, other, connection.second, end_direction(Track.m_paths[i], kind), control}); + } + } + } + return result; +} + +void editor_track::follow(TTrack const &Track, std::vector const &Joints) +{ + for (auto const &joint : Joints) + { + if (joint.own.path >= static_cast(Track.m_paths.size()) || joint.theirs.path >= static_cast(joint.other->m_paths.size())) + continue; + move_point(*joint.other, joint.theirs, point_position(Track, joint.own)); + auto const angle{signed_angle(joint.direction, end_direction(Track.m_paths[joint.own.path], joint.own.kind))}; + auto const moved{turned(plan_of(joint.control), angle)}; + joint.other->m_paths[joint.theirs.path].points[joint.theirs.kind == point_kind::start ? segment_data::point::control1 : segment_data::point::control2] = {moved.x, joint.control.y, moved.y}; + } +} + bool editor_track::is_connected(TTrack const &Track, point_ref const &Point) { if (false == editor_track::is_end(Point.kind)) @@ -395,12 +544,16 @@ bool editor_track::is_connected(TTrack const &Track, point_ref const &Point) } editor_track::snap_target editor_track::find_snap_target(TTrack const &Track, glm::dvec3 const &Position, double const Radius, std::vector const &Exclude) +{ + return find_free_end(&Track, Track.iCategoryFlag & 15, Position, Radius, Exclude); +} + +editor_track::snap_target editor_track::find_free_end(TTrack const *Self, int const Category, glm::dvec3 const &Position, double const Radius, std::vector const &Exclude) { snap_target result; result.distance = std::numeric_limits::max(); auto const excluded = [&](TTrack const *Other) { return std::find(Exclude.begin(), Exclude.end(), Other) != Exclude.end(); }; - auto const category{Track.iCategoryFlag & 15}; auto const sections{simulation::Region->sections(Position, static_cast(Radius))}; for (auto *section : sections) { @@ -408,7 +561,7 @@ editor_track::snap_target editor_track::find_snap_target(TTrack const &Track, gl { for (auto *other : cell.m_directories.paths) { - if (other == &Track || excluded(other) || (other->iCategoryFlag & 15) != category || false == is_supported(*other)) + if (other == Self || excluded(other) || (other->iCategoryFlag & 15) != Category || false == is_supported(*other)) continue; for (int i = 0; i < static_cast(other->m_paths.size()); ++i) { @@ -693,7 +846,7 @@ void editor_track::store_switch_path(TTrack &Switch, int const Path) } } -bool editor_track::find_chain(TTrack *From, TTrack *To, chain &Chain, std::string &Error) +bool editor_track::find_chain(TTrack *From, TTrack *To, chain &Chain, std::string &Error, bool const Switches) { Chain = {}; if (From == nullptr || To == nullptr) @@ -717,10 +870,25 @@ bool editor_track::find_chain(TTrack *From, TTrack *To, chain &Chain, std::strin { Chain.tracks = {From}; Chain.forward = {throughend}; + Chain.switches.clear(); TTrack *previous{From}; TTrack *current{throughend ? From->trNext : From->trPrev}; - while (current != nullptr && current != From && Chain.tracks.size() < 10000 && regular(current)) + while (current != nullptr && current != From && Chain.tracks.size() + Chain.switches.size() < 10000) { + if (Switches && current->eType == tt_Switch && has_switch_paths(*current) && is_supported(*current)) + { + // only along the main track, the way in decides the way out + auto const &extension{*current->SwitchExtension}; + bool const atstart{extension.pPrevs[0] == previous}; + if (atstart == (extension.pNexts[0] == previous)) + break; + Chain.switches.push_back({current, atstart, Chain.tracks.size()}); + previous = current; + current = atstart ? extension.pNexts[0] : extension.pPrevs[0]; + continue; + } + if (false == regular(current)) + break; auto const entersatstart{current->trPrev == previous}; Chain.tracks.push_back(current); Chain.forward.push_back(entersatstart); @@ -738,12 +906,29 @@ bool editor_track::find_chain(TTrack *From, TTrack *To, chain &Chain, std::strin if (false == found) { Chain = {}; - Error = "The selected paths aren't connected by a chain of regular paths (switches end the chain)"; + Error = Switches ? "The selected paths aren't connected along the main tracks of the switches" : "The selected paths aren't connected by a chain of regular paths (switches end the chain)"; return false; } } + for (auto const &passage : Chain.switches) + { + if ((passage.track->iCategoryFlag & 15) != (From->iCategoryFlag & 15)) + { + Error = "The fragment mixes different kinds of paths"; + Chain = {}; + return false; + } + Chain.length += bezier{passage.track->m_paths.front()}.plan_length(); + } - auto const category{From->iCategoryFlag & 15}; + return complete_chain(Chain, Error); +} + +bool editor_track::complete_chain(chain &Chain, std::string &Error) +{ + auto *from{Chain.tracks.front()}; + auto *to{Chain.tracks.back()}; + auto const category{from->iCategoryFlag & 15}; for (auto const *track : Chain.tracks) { if ((track->iCategoryFlag & 15) != category) @@ -761,24 +946,45 @@ bool editor_track::find_chain(TTrack *From, TTrack *To, chain &Chain, std::strin Chain.radius = radius; } - auto const &first{From->m_paths.front()}; + auto const &first{from->m_paths.front()}; auto const firstforward{Chain.forward.front()}; Chain.start = first.points[firstforward ? segment_data::point::start : segment_data::point::end]; Chain.start_direction = firstforward ? path_tangent(first, false) : -path_tangent(first, true); - adjoining_direction(firstforward ? From->trPrev : From->trNext, Chain.start, false, Chain.start_direction, Chain.start_radius); + adjoining_direction(firstforward ? from->trPrev : from->trNext, Chain.start, false, Chain.start_direction, Chain.start_radius); Chain.start_direction = glm::normalize(Chain.start_direction); - auto const &last{To->m_paths.front()}; + auto const &last{to->m_paths.front()}; auto const lastforward{Chain.forward.back()}; Chain.end = last.points[lastforward ? segment_data::point::end : segment_data::point::start]; Chain.end_direction = lastforward ? path_tangent(last, true) : -path_tangent(last, false); - adjoining_direction(lastforward ? To->trNext : To->trPrev, Chain.end, true, Chain.end_direction, Chain.end_radius); + adjoining_direction(lastforward ? to->trNext : to->trPrev, Chain.end, true, Chain.end_direction, Chain.end_radius); Chain.end_direction = glm::normalize(Chain.end_direction); Error.clear(); return true; } +std::vector editor_track::chain_parts(chain const &Chain) +{ + std::vector parts; + std::size_t first{0}; + auto const add = [&](std::size_t const End) { + if (End <= first) + return; + chain part; + part.tracks.assign(Chain.tracks.begin() + first, Chain.tracks.begin() + End); + part.forward.assign(Chain.forward.begin() + first, Chain.forward.begin() + End); + std::string error; + if (complete_chain(part, error)) + parts.push_back(std::move(part)); + first = End; + }; + for (auto const &passage : Chain.switches) + add(passage.before); + add(Chain.tracks.size()); + return parts; +} + namespace { @@ -874,6 +1080,11 @@ void follow_joint(TTrack &Track, glm::dvec3 const &From, glm::dvec3 const &To, d } // namespace +void editor_track::place(TTrack &Track, glm::dvec3 const &From, glm::dvec3 const &To, double const Angle) +{ + rigid_move(Track, From, To, Angle); +} + bool editor_track::is_straight(TTrack const &Track, straight_tolerance const &Tolerance) { if (false == is_supported(Track) || Track.m_editorremoved) @@ -1034,7 +1245,15 @@ bool editor_track::find_curve(TTrack &Track, straight_tolerance const &Tolerance current = entersatstart ? current->trNext : current->trPrev; } } + return analyse_curve({run.begin(), run.end()}, Gauge, Curve); +} +bool editor_track::analyse_curve(std::vector> const &Run, double const Gauge, curve &Curve) +{ + Curve = {}; + if (Run.empty()) + return false; + auto const &run{Run}; std::vector turns; std::vector lengths; std::vector varying; @@ -1165,6 +1384,102 @@ bool editor_track::find_curve(TTrack &Track, straight_tolerance const &Tolerance return true; } +bool editor_track::find_run(TTrack &Track, double const Limit, chain &Chain, std::string &Error) +{ + auto const category{Track.iCategoryFlag & 15}; + auto const regular = [&](TTrack const *Other) { return Other != nullptr && Other->eType == tt_Normal && is_supported(*Other) && false == Other->m_editorremoved && (Other->iCategoryFlag & 15) == category; }; + if (false == regular(&Track)) + { + Error = "A line is made of regular paths, a switch ends it"; + return false; + } + straight_tolerance const tolerance; + TTrack *ends[2]{&Track, &Track}; + std::vector visited{&Track}; + for (int side = 0; side < 2; ++side) + { + TTrack *previous{&Track}; + TTrack *current{side == 0 ? Track.trNext : Track.trPrev}; + double length{0.0}; + // past the limit the line goes on to the next straight, so it doesn't end inside a curve + while (regular(current) && std::find(visited.begin(), visited.end(), current) == visited.end() && (length < Limit || (length < 3.0 * Limit && false == is_straight(*ends[side], tolerance)))) + { + visited.push_back(current); + ends[side] = current; + length += current->Length(); + auto const entersatstart{current->trPrev == previous}; + previous = current; + current = entersatstart ? current->trNext : current->trPrev; + } + } + return find_chain(ends[1], ends[0], Chain, Error); +} + +std::vector editor_track::recognize_line(chain const &Chain, straight_tolerance const &Tolerance, double const Gauge) +{ + std::vector result; + auto const count{Chain.tracks.size()}; + auto const path = [&](std::size_t const Index) -> segment_data const & { return Chain.tracks[Index]->m_paths.front(); }; + auto const tangent_in = [&](std::size_t const Index) { return glm::normalize(plan_of(Chain.forward[Index] ? path_tangent(path(Index), false) : -path_tangent(path(Index), true))); }; + auto const tangent_out = [&](std::size_t const Index) { return glm::normalize(plan_of(Chain.forward[Index] ? path_tangent(path(Index), true) : -path_tangent(path(Index), false))); }; + auto const point_in = [&](std::size_t const Index) { return plan_of(path(Index).points[Chain.forward[Index] ? segment_data::point::start : segment_data::point::end]); }; + auto const point_out = [&](std::size_t const Index) { return plan_of(path(Index).points[Chain.forward[Index] ? segment_data::point::end : segment_data::point::start]); }; + + std::vector straight(count); + std::vector turns(count); + for (std::size_t i = 0; i < count; ++i) + { + straight[i] = is_straight(*Chain.tracks[i], Tolerance); + turns[i] = signed_angle(tangent_in(i), tangent_out(i)); + } + auto const add_curve = [&](std::size_t const First, std::size_t const Last) { + auto const a{point_in(First)}; + auto const b{point_out(Last)}; + auto const directionin{tangent_in(First)}; + auto const directionout{tangent_out(Last)}; + auto const determinant{cross(directionin, directionout)}; + if (std::abs(determinant) < 1e-6) + return; + line_vertex vertex; + vertex.position = a + directionin * (cross(b - a, directionout) / determinant); + std::vector> run; + for (auto i = First; i <= Last; ++i) + run.emplace_back(Chain.tracks[i], Chain.forward[i]); + analyse_curve(run, Gauge, vertex.shape); + result.push_back(vertex); + }; + std::size_t i{0}; + while (i < count) + { + if (straight[i]) + { + if (i + 1 < count && straight[i + 1] && std::abs(signed_angle(tangent_out(i), tangent_in(i + 1))) > 1e-3) + { + line_vertex vertex; + vertex.position = point_out(i); + vertex.kink = true; + result.push_back(vertex); + } + ++i; + continue; + } + auto const first{i}; + int sign{0}; + while (i < count && false == straight[i]) + { + int const current{turns[i] > 1e-9 ? 1 : turns[i] < -1e-9 ? -1 : 0}; + // a reverse curve: the next one starts here + if (current != 0 && sign != 0 && current != sign) + break; + if (current != 0) + sign = current; + ++i; + } + add_curve(first, i - 1); + } + return result; +} + namespace { @@ -1649,25 +1964,39 @@ std::vector editor_track::apply_profile(route &Route, sample_route(Route, 1.0); std::vector gaps; + std::vector raised; for (auto const &joint : joints) { auto const &end{joint.track->m_paths[joint.path].points[joint.atend ? segment_data::point::end : segment_data::point::start]}; double nearest{std::numeric_limits::max()}; double gap{0.0}; - for (auto const &path : joint.neighbour->m_paths) + glm::dvec3 *closest{nullptr}; + for (auto &path : joint.neighbour->m_paths) for (auto const index : {segment_data::point::start, segment_data::point::end}) { - auto const &point{path.points[index]}; + auto &point{path.points[index]}; auto const distance{std::hypot(point.x - end.x, point.z - end.z)}; if (distance < nearest) { nearest = distance; gap = point.y - end.y; + closest = &point; } } - if (nearest <= kSamePoint && std::abs(gap) > 0.001) - gaps.push_back({joint.track, joint.neighbour, gap}); + if (nearest > kSamePoint || std::abs(gap) <= 0.001) + continue; + // a regular path off the route takes the height of the switch at the joint, keeping its other end + std::string reason; + bool const closed{joint.neighbour->eType == tt_Normal && can_edit_geometry(*joint.neighbour, reason)}; + if (closed) + { + remember(joint.neighbour); + closest->y = end.y; + add_unique(raised, joint.neighbour); + } + gaps.push_back({joint.track, joint.neighbour, gap, closed}); } + commit(raised); return gaps; } @@ -1844,7 +2173,7 @@ void write_header(std::ostream &Text, char const *Type, double const Length, dou { char const *environments[] = {"flat", "mountains", "canyon", "tunnel", "bridge", "bank"}; auto const environment{Style.eEnvironment >= e_flat && Style.eEnvironment <= e_bank ? environments[Style.eEnvironment] : "flat"}; - Text << Type << ' ' << Length << ' ' << Style.fTrackWidth << ' ' << Style.fFriction << ' ' << Sound << ' ' << Style.iQualityFlag << ' ' << 0 << ' ' << environment << ' '; + Text << Type << ' ' << Length << ' ' << Style.fTrackWidth << ' ' << Style.fFriction << ' ' << Sound << ' ' << Style.iQualityFlag << ' ' << (Style.iDamageFlag & 127) << ' ' << environment << ' '; if (Style.m_visible) Text << "vis " << editor_track::material_name(Style.m_material1) << ' ' << Style.fTexLength << ' ' << editor_track::material_name(Second) << ' ' << editor_track::texture_height(Style) << ' ' << Style.fTexWidth << ' ' << Style.fTexSlope << ' '; else @@ -1864,6 +2193,13 @@ void write_ending(std::ostream &Text, TTrack const &Style) { if ((Style.iCategoryFlag & 15) == 1 && false == Style.m_profile1.first.empty()) Text << "railprofile " << Style.m_profile1.first << ' '; + // a piece of the track made from another one stays in its track circuit and under the same overhead line + for (auto const *isolated : Style.Isolated) + Text << "isolated " << isolated->asName << ' '; + if (Style.fOverhead != -1.0) + Text << "overhead " << Style.fOverhead << ' '; + if (Style.m_sleeper_enabled && false == Style.m_sleeper_model_name.empty()) + Text << "sleepermodel " << Style.m_sleeper_frequency << ' ' << Style.m_sleeper_model_name << ' ' << (Style.m_sleeper_skin_name.empty() ? std::string{"none"} : Style.m_sleeper_skin_name) << ' ' << Style.m_sleeper_offset.x << ' ' << Style.m_sleeper_offset.y << ' ' << Style.m_sleeper_offset.z << ' ' << Style.m_sleeper_ballast_z << ' '; Text << "endtrack\n"; } @@ -2203,7 +2539,9 @@ TTrack *editor_track::split_path(TTrack &Track, double const T) auto const roll{static_cast(path.rolls[0] + (path.rolls[1] - path.rolls[0]) * T)}; if (path.points[segment_data::point::control1] == glm::dvec3{} && path.points[segment_data::point::control2] == glm::dvec3{}) { - auto const middle{glm::mix(p0, p3, T)}; + // the parameter is the one of the cubic with the controls at the ends, as everywhere else, not a share of the length + auto const u{1.0 - T}; + auto const middle{p0 * (u * u * u + 3.0 * u * u * T) + p3 * (3.0 * u * T * T + T * T * T)}; first.points[segment_data::point::end] = middle; second.points[segment_data::point::start] = middle; } @@ -2228,6 +2566,24 @@ TTrack *editor_track::split_path(TTrack &Track, double const T) second.rolls[0] = roll; auto *created{create_path(Track, second)}; Track.m_paths.front() = first; + // the events stay where the trains run into them: those of the runs towards the end at the start, in the original, + // those of the runs towards the start at the end, in the new piece; those of a stop in both. the ones bound + // by the name of the path stay with it + for (auto const index : {0, 3}) + for (auto const &event : events(Track, index)) + if (false == event.first.empty()) + events(*created, index).push_back(event); + for (auto const index : {1, 4}) + { + auto &own{events(Track, index)}; + for (auto const &event : own) + if (false == event.first.empty()) + events(*created, index).push_back(event); + own.erase(std::remove_if(own.begin(), own.end(), [](auto const &Event) { return false == Event.first.empty(); }), own.end()); + } + std::string missing; + bind_events(Track, missing); + bind_events(*created, missing); if (s_observer != nullptr) s_observer->track_split(Track, *created, first); commit({&Track, created}); @@ -2235,18 +2591,43 @@ TTrack *editor_track::split_path(TTrack &Track, double const T) } TTrack *editor_track::load_path(std::string const &Text, TTrack const &Template, std::string const &Name) +{ + return load_text(Text, &Template, Name); +} + +TTrack *editor_track::create_path(path_style const &Style, segment_data const &Path) +{ + std::ostringstream text; + text.precision(std::numeric_limits::digits10); + auto const length{glm::distance(Path.points[segment_data::point::start], Path.points[segment_data::point::end])}; + text << "normal " << length << " 1.435 0.15 25 20 0 flat vis " << Style.rail << " 6 " << Style.ballast << " 0.2 0.5 1.1 "; + write_points(text, Path); + if (Style.velocity > 0.0) + text << "velocity " << Style.velocity << ' '; + if (false == Style.rail_profile.empty()) + text << "railprofile " << Style.rail_profile << ' '; + text << "endtrack\n"; + auto *track{load_text(text.str(), nullptr, {})}; + track->m_paths = {Path}; + return track; +} + +TTrack *editor_track::load_text(std::string const &Text, TTrack const *Template, std::string const &Name) { cParser parser(Text, cParser::buffer_TEXT); scene::node_data data; data.type = "track"; - auto const base{Template.name().empty() || Template.name() == "none" ? std::string{"editor_track"} : Template.name()}; + auto const base{false == Name.empty() ? Name : Template == nullptr || Template->name().empty() || Template->name() == "none" ? std::string{"editor_track"} : Template->name()}; data.name = Name; - data.layer = Template.layer(); + data.layer = Template != nullptr ? Template->layer() : scene::Layers.active(); for (int i = 1; data.name.empty() || simulation::Paths.find(data.name) != nullptr; ++i) data.name = base + "_" + std::to_string(i); auto *track = new TTrack(data); - track->m_rangesquaredmin = Template.m_rangesquaredmin; - track->m_rangesquaredmax = Template.m_rangesquaredmax; + if (Template != nullptr) + { + track->m_rangesquaredmin = Template->m_rangesquaredmin; + track->m_rangesquaredmax = Template->m_rangesquaredmax; + } track->Load(&parser, glm::dvec3{}); for (auto *events : {&track->m_events0, &track->m_events1, &track->m_events2, &track->m_events0all, &track->m_events1all, &track->m_events2all}) events->clear(); diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index d45ecf54f..6ed9d70bf 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -20,6 +20,7 @@ http: #include "utilities/Classes.h" class TTrack; +class basic_event; class editor_track { @@ -52,10 +53,29 @@ class editor_track float texheight{0.6f}; float texwidth{0.9f}; float texslope{0.9f}; + std::vector isolated; + float overhead{-1.f}; + bool sleepers{false}; + float sleeper_frequency{0.6f}; + std::string sleeper_model; + std::string sleeper_skin; + glm::vec3 sleeper_offset{0.f}; + float sleeper_ballast{0.f}; + std::array>, 6> events; }; static state capture(TTrack const &Track); static void apply(TTrack &Track, state const &State); + // lists of the events of the path, in the order of event_keyword(): event0, event1, event2, eventall0, eventall1, eventall2 + static std::vector> &events(TTrack &Track, int const Index); + static char const *event_keyword(int const Index); + // looks the events up by their names; the names of those which don't exist are given in Missing + static void bind_events(TTrack &Track, std::string &Missing); + // track circuits the path belongs to, made when they don't exist yet + static void isolated(TTrack &Track, std::vector const &Names); + // -1: normal, 0: no current, above 0: speed limit with the pantographs lowered + static void overhead(TTrack &Track, float const Overhead); + static bool can_edit_geometry(TTrack const &Track, std::string &Reason); static bool is_supported(TTrack const &Track); @@ -71,6 +91,19 @@ class editor_track static std::vector neighbours(TTrack const &Track); static std::vector> connected_points(TTrack const &Track, glm::dvec3 const &Position); static bool is_connected(TTrack const &Track, point_ref const &Point); + // end of a regular neighbouring path joined to an end of the track, as it was when taken + struct joint + { + point_ref own; + TTrack *other{nullptr}; + point_ref theirs; + glm::dvec2 direction{0.0, 1.0}; // of the track at its end, into it + glm::dvec3 control{0.0}; // of the neighbour at its end, never zero + }; + // joints the editor can change: switches and paths which can't be edited aren't taken + static std::vector joints(TTrack const &Track); + // moves the joined ends to where the ends of the track are now, turning them as the track turned there + static void follow(TTrack const &Track, std::vector const &Joints); struct snap_target { @@ -81,6 +114,8 @@ class editor_track double distance{0.0}; }; static snap_target find_snap_target(TTrack const &Track, glm::dvec3 const &Position, double const Radius, std::vector const &Exclude); + // nearest end of a path of the category which nothing else joins; Self may be null + static snap_target find_free_end(TTrack const *Self, int const Category, glm::dvec3 const &Position, double const Radius, std::vector const &Exclude); static void snap_point(TTrack &Track, point_ref const &Point, snap_target const &Target, bool const Aligntangent); struct chain @@ -96,8 +131,21 @@ class editor_track double length{0.0}; double velocity{-1.0}; double radius{0.0}; + // switches the chain runs through along their main track, each before the regular path of the index given + struct passage + { + TTrack *track{nullptr}; + bool forward{true}; + std::size_t before{0}; + }; + std::vector switches; }; - static bool find_chain(TTrack *From, TTrack *To, chain &Chain, std::string &Error); + // with Switches the chain may run through the switches along their main tracks; its ends are regular paths + static bool find_chain(TTrack *From, TTrack *To, chain &Chain, std::string &Error, bool const Switches = false); + // the regular parts of a chain between its switches, empty ones skipped + static std::vector chain_parts(chain const &Chain); + // moves the track as a whole, From going to To, turned by Angle in the plan + static void place(TTrack &Track, glm::dvec3 const &From, glm::dvec3 const &To, double const Angle); struct straight { @@ -140,6 +188,18 @@ class editor_track double split{0.5}; }; static bool find_curve(TTrack &Track, straight_tolerance const &Tolerance, double const Gauge, curve &Curve); + // curve made of the given paths, each with the flag of being run from its start + static bool analyse_curve(std::vector> const &Run, double const Gauge, curve &Curve); + // regular paths in line through the track, up to switches, free ends or about Limit metres each way + static bool find_run(TTrack &Track, double const Limit, chain &Chain, std::string &Error); + // the chain read as an alignment: a vertex at the intersection of the tangents of each curve + struct line_vertex + { + glm::dvec2 position{0.0}; + curve shape; + bool kink{false}; // the straights meet with no curve between them + }; + static std::vector recognize_line(chain const &Chain, straight_tolerance const &Tolerance, double const Gauge); // regular straight paths continuing a chain end in line, which the chain can take over struct straight_run { @@ -184,15 +244,17 @@ class editor_track static glm::dvec3 sampled_position(std::vector const &Samples, double const Chainage); // grade of the path which adjoins the end of the route, positive rising along the route static bool adjoining_grade(route const &Route, bool const Atend, double &Grade); - // path off the route whose end no longer meets the adjoining path in height + // path off the route whose end no longer met the adjoining path in height struct height_gap { TTrack *track{nullptr}; TTrack *neighbour{nullptr}; double gap{0.0}; // neighbour - track + bool closed{false}; // the end of the neighbour was brought to the track }; // sets elevations of the paths of the route; regular paths are split at the chainages in Breaks, - // switches are tilted as a whole in the plane of their grade, branches included + // switches are tilted as a whole in the plane of their grade, branches included, and the regular paths + // off the route get their ends joined to the switches brought to the height there static std::vector apply_profile(route &Route, std::function const &Elevation, std::function const &Grade, std::vector const &Breaks, std::vector> &States, std::vector &Created); // carries elevations of the chain over to the new pieces, in proportion of the length static void keep_heights(chain const &Chain, std::vector &Pieces); @@ -214,6 +276,16 @@ class editor_track static std::vector find_switch_templates(); static TTrack *load_path(std::string const &Text, TTrack const &Template, std::string const &Name = {}); static TTrack *create_path(TTrack const &Style, segment_data const &Path); + // parameters of a path laid where there's no other path to copy them from + struct path_style + { + double velocity{100.0}; + std::string rail{"rail_screw_used1"}; + std::string ballast{"1435mm/tpbps-new2"}; + std::string rail_profile; + }; + // the path goes to the layer receiving the items created in the editor + static TTrack *create_path(path_style const &Style, segment_data const &Path); static TTrack *split_path(TTrack &Track, double const T); static double nearest_parameter(TTrack const &Track, glm::dvec3 const &Point); // point of the first path at the parameter of nearest_parameter() @@ -248,6 +320,8 @@ class editor_track private: static observer *s_observer; + // sets the length, the ends and their directions of the chain of the tracks given + static bool complete_chain(chain &Chain, std::string &Error); static void disconnect(TTrack &Track); static void join(TTrack &Track); static void connect(TTrack &Track, bool const Prevside, TTrack *Other, int const Endpointid); @@ -256,5 +330,6 @@ class editor_track static void store_switch_path(TTrack &Switch, int const Path); static void rebuild_geometry(TTrack &Track); static TTrack *clone(TTrack const &Template); + static TTrack *load_text(std::string const &Text, TTrack const *Template, std::string const &Name); static void move_straight(straight const &Line, glm::dvec3 const &Start, glm::dvec3 const &End, std::function const &Member); }; diff --git a/scene/scenelayerssave.cpp b/scene/scenelayerssave.cpp index f92f6a71f..f85f25edd 100644 --- a/scene/scenelayerssave.cpp +++ b/scene/scenelayerssave.cpp @@ -792,6 +792,8 @@ save_result node_layers::save(std::vector const &Rootstatements) edit.node = Node; state.patches[Layer].edits.emplace_back(std::move(edit)); }; + // changes which can't be written, as their definition stands for more than one node + std::vector unwritten; // traction and event launchers are rewritten when the editor moved them along with the track they belong to std::vector patchednodes; auto const patch_node = [&](basic_node *Node, auto const &Patch) { @@ -801,10 +803,15 @@ save_result node_layers::save(std::vector const &Rootstatements) return true; } auto const &source{lookup->second}; - if (false == is_output(resolve(source.layer)) || false == writable(source.layer)) + if (false == is_output(resolve(source.layer))) { return true; } + if (false == writable(source.layer)) + { + unwritten.push_back(Node->name()); + return true; + } if (false == load(source.layer)) { return false; @@ -876,15 +883,22 @@ save_result node_layers::save(std::vector const &Rootstatements) { continue; } - created[nodelayer].emplace_back(path, path_text(*path, layer(nodelayer).context_insert().offset)); + // a file included more than once would get a copy of the new path at every inclusion + auto const target{writable(nodelayer) ? nodelayer : root}; + created[target].emplace_back(path, path_text(*path, layer(target).context_insert().offset)); savedpaths.push_back(path); continue; } auto const &source{lookup->second}; - if ((false == path->m_editorremoved && false == path->dirty()) || false == writable(source.layer)) + if (false == path->m_editorremoved && false == path->dirty()) { continue; } + if (false == writable(source.layer)) + { + unwritten.push_back(path->name().empty() ? std::string{"(noname)"} : path->name()); + continue; + } if (false == load(source.layer)) { return fail(state.error); @@ -1636,6 +1650,21 @@ save_result node_layers::save(std::vector const &Rootstatements) result.message += file + (&file != &result.files.back() ? ", " : ""); } } + if (false == unwritten.empty()) + { + std::string names; + for (std::size_t i = 0; i < std::min(unwritten.size(), 5); ++i) + { + names += (i > 0 ? ", " : "") + unwritten[i]; + } + if (unwritten.size() > 5) + { + names += ", ..."; + } + auto const warning{std::to_string(unwritten.size()) + " changed nodes not saved, their files are included with parameters or more than once: " + names}; + WriteLog("Scenery save: " + warning, logtype::generic); + result.message = result.files.empty() ? warning : result.message + ". " + warning; + } return result; } From 220fd0f37e1bf799f7e4f10dba6e97a03254f2b4 Mon Sep 17 00:00:00 2001 From: maj00r Date: Mon, 5 Oct 2026 01:21:11 +0200 Subject: [PATCH 124/430] feat(editor): Polish translation of the track editor, loaded from lang/editor_.po next to the simulator translation --- lang/editor_pl.po | 1893 +++++++++++++++++++++++++++++++++++++ utilities/translation.cpp | 5 + 2 files changed, 1898 insertions(+) create mode 100644 lang/editor_pl.po diff --git a/lang/editor_pl.po b/lang/editor_pl.po new file mode 100644 index 000000000..b88bdd26d --- /dev/null +++ b/lang/editor_pl.po @@ -0,0 +1,1893 @@ +msgid "" +msgstr "" +"Language: pl_PL\n" +"Content-Type: text/plain; charset=UTF-8\n" + +# scenery editor: track tools + +msgid "Straights in the scenery" +msgstr "Proste w scenerii" + +msgid "Build" +msgstr "Budowa" + +msgid "Select Esc" +msgstr "Wybór Esc" + +msgid "Lay track L" +msgstr "Układaj tor L" + +msgid "Switch T" +msgstr "Rozjazd T" + +msgid "Edit and check (inspector)" +msgstr "Edycja i kontrola (inspektor)" + +msgid "Show the inspector" +msgstr "Pokaż inspektor" + +msgid "The curve can't be read from this path, edit it as a single path" +msgstr "Z tego odcinka nie da się odczytać łuku, edytuj go jako pojedynczy odcinek" + +msgid "Laying track: LMB adds the points" +msgstr "Układanie toru: LPM dodaje punkty" + +msgid "Switch: drag to set its direction and side" +msgstr "Rozjazd: przeciągnij, aby ustawić kierunek i stronę" + +msgid "Switch: press and drag on the selected track" +msgstr "Rozjazd: wciśnij i przeciągnij na wybranym torze" + +msgid "Straight: shift around, Shift+click the points" +msgstr "Prosta: objazd, Shift+klik w punkty" + +msgid "New path from the free end" +msgstr "Nowy odcinek z wolnego końca" + +msgid "Straight: break, LMB on the straight" +msgstr "Prosta: załamanie, LPM na prostej" + +msgid "Straight: S-curve, LMB on the straight" +msgstr "Prosta: przesunięcie (esowanie), LPM na prostej" + +msgid "Straight: drag its ends or the middle" +msgstr "Prosta: przeciągaj końce lub środek" + +msgid "Select: LMB on a path" +msgstr "Wybór: LPM na odcinku" + +msgid "Curve: drag the vertices and the radius grips" +msgstr "Łuk: przeciągaj wierzchołki i uchwyty promienia" + +msgid "Switch: move and turn it with the gizmo" +msgstr "Rozjazd: przesuwaj i obracaj gizmem" + +msgid "Path: drag its points" +msgstr "Odcinek: przeciągaj jego punkty" + +msgid "Vertical profile: edit the grade line in the strip below" +msgstr "Profil podłużny: edytuj niweletę na pasku na dole" + +msgid "Speed check: LMB on a row shows the path" +msgstr "Kontrola prędkości: LPM na wierszu pokazuje odcinek" + +msgid "Infrastructure along the track" +msgstr "Infrastruktura wzdłuż toru" + +msgid "Track" +msgstr "Tor" + +msgid "LMB on a path in the view selects it. L lays new track, T puts a switch into the selected one." +msgstr "LPM na odcinku w widoku wybiera go. L układa nowy tor, T wstawia rozjazd w wybrany." + +msgid "New track" +msgstr "Nowy tor" + +msgid "Click the points the track goes through, the curves go at the inner points. Start or finish at a free end (magenta ring) to join it." +msgstr "Klikaj punkty, przez które ma iść tor, łuki powstaną w punktach pośrednich. Zacznij lub skończ na wolnym końcu (purpurowy pierścień), aby się z nim połączyć." + +msgid "Curve radius (m)" +msgstr "Promień łuku (m)" + +msgid "Speed (km/h)" +msgstr "Prędkość (km/h)" + +msgid "Transition curves and cant" +msgstr "Krzywe przejściowe i przechyłka" + +msgid "Longest path (m)" +msgstr "Najdłuższy odcinek (m)" + +msgid "Parameters of the selected track" +msgstr "Parametry wybranego toru" + +msgid "Switch template" +msgstr "Wzorzec rozjazdu" + +msgid "Press on the selected straight or curve where the switch starts and drag: along sets its direction, sideways its side" +msgstr "Wciśnij na wybranej prostej lub łuku w miejscu początku rozjazdu i przeciągnij: wzdłuż ustala kierunek, w bok stronę" + +msgid "Collect again from the scenery" +msgstr "Zbierz ponownie ze scenerii" + +msgid "Select a path in the view, then build the route along the line, or set its start and end paths (switches are passed through)" +msgstr "Wybierz odcinek w widoku, potem zbuduj trasę wzdłuż linii albo wskaż jej odcinek początkowy i końcowy (rozjazdy są przechodzone)" + +msgid "Start: %s" +msgstr "Początek: %s" + +msgid "Route: %zu paths, %.2f m, %s ... %s" +msgstr "Trasa: %zu odcinków, %.2f m, %s ... %s" + +msgid "Vertical profile" +msgstr "Profil podłużny" + +msgid "Along the line from the selected path" +msgstr "Wzdłuż linii od wybranego odcinka" + +msgid "m each way" +msgstr "m w każdą stronę" + +msgid "Start: selected path" +msgstr "Początek: wybrany odcinek" + +msgid "End: selected path" +msgstr "Koniec: wybrany odcinek" + +msgid "Chainage of the start (m)" +msgstr "Kilometraż początku (m)" + +msgid "Design speed (km/h)" +msgstr "Prędkość projektowa (km/h)" + +msgid "Exaggeration" +msgstr "Przewyższenie" + +msgid "Shown:" +msgstr "Widoczne:" + +msgid "Terrain" +msgstr "Teren" + +msgid "Plan curvature" +msgstr "Krzywizna w planie" + +msgid "Fit the view" +msgstr "Dopasuj widok" + +msgid "Recognize from the track" +msgstr "Rozpoznaj z toru" + +msgid "Apply to the scenery" +msgstr "Zastosuj w scenerii" + +msgid "LMB on a path selects it, the inspector on the right shows what can be done with it" +msgstr "LPM na odcinku wybiera go, inspektor po prawej pokazuje, co można z nim zrobić" + +msgid "Lays new track through the clicked points, on the ground or from a free end of a track" +msgstr "Układa nowy tor przez klikane punkty, na terenie albo od wolnego końca toru" + +msgid "Puts a switch into the selected straight or curve: choose the template, then press and drag on the track" +msgstr "Wstawia rozjazd w wybraną prostą lub łuk: wybierz wzorzec, potem wciśnij i przeciągnij na torze" + +msgid "Keeps the start and the direction of the switch, takes the shape of the chosen template" +msgstr "Zachowuje początek i kierunek rozjazdu, przyjmuje kształt wybranego wzorca" + +msgid "Mirrors the switch: the diverging track goes to the other side" +msgstr "Odbija rozjazd: tor zwrotny przechodzi na drugą stronę" + +msgid "Speed limit of the path for the AI drivers and the timetable, -1: no limit of its own" +msgstr "Ograniczenie prędkości odcinka dla maszynistów AI i rozkładu, -1: bez własnego ograniczenia" + +msgid "Friction coefficient of the rails, 0.15 for the dry rails; lower values make the wheels slip" +msgstr "Współczynnik tarcia szyn, 0.15 dla suchych; mniejsze wartości powodują poślizg kół" + +msgid "Distance between the rail joints in metres, sets the rhythm of the wheel clatter; -1: the default" +msgstr "Odległość między stykami szyn w metrach, ustala rytm stukotu kół; -1: domyślna" + +msgid "Quality of the track, 20 is the nominal one; lower values give a rougher ride" +msgstr "Jakość toru, 20 to nominalna; mniejsze wartości dają mniej spokojną jazdę" + +msgid "0: track in order; any value adds jolts, 128: the vehicles derail on the path" +msgstr "0: tor sprawny; inne wartości dodają szarpnięcia, 128: pojazdy wykolejają się na odcinku" + +msgid "Surroundings of the path, they affect the sound of the passing vehicles" +msgstr "Otoczenie odcinka, wpływa na dźwięk przejeżdżających pojazdów" + +msgid "Gauge of the track (1.435 m for the standard gauge), width of the surface for the roads" +msgstr "Rozstaw toru (1.435 m dla normalnotorowego), szerokość nawierzchni dla dróg" + +msgid "Length in metres after which the texture of the rails and the trackbed repeats" +msgstr "Długość w metrach, po której powtarza się tekstura szyn i podsypki" + +msgid "Height of the trackbed edge below the rail top, in metres" +msgstr "Wysokość krawędzi podsypki poniżej główki szyny, w metrach" + +msgid "Width of the trackbed outside of the rail, in metres" +msgstr "Szerokość podsypki na zewnątrz szyny, w metrach" + +msgid "Horizontal reach of the slope at the outer edge of the trackbed, in metres" +msgstr "Poziomy zasięg skarpy przy zewnętrznej krawędzi podsypki, w metrach" + +msgid "Names of the track circuits (isolated) the path belongs to, separated by spaces.\nA name which doesn't exist yet makes a new circuit. Changes on leaving the field" +msgstr "Nazwy obwodów torowych (isolated), do których należy odcinek, oddzielone spacjami.\nNieistniejąca nazwa tworzy nowy obwód. Zmiana po opuszczeniu pola" + +msgid "State of the overhead line over the path: the trains coast through a section with no current,\nor lower the pantographs and keep to the speed limit given" +msgstr "Stan sieci trakcyjnej nad odcinkiem: pociągi przejeżdżają bez prądu przez odcinek beznapięciowy\nalbo opuszczają pantografy i trzymają się podanego ograniczenia" + +msgid "Repeats a model along the path, the sleepers in place of the drawn trackbed" +msgstr "Powtarza model wzdłuż odcinka, podkłady zamiast rysowanej podsypki" + +msgid "Shift of each model: sideways, along the path, up" +msgstr "Przesunięcie każdego modelu: w bok, wzdłuż odcinka, w górę" + +msgid "event0: a vehicle with a crew stands on the path, event1: runs along it towards its start, event2: towards its end.\neventall0/1/2: the same for any vehicle" +msgstr "event0: pojazd z obsadą stoi na odcinku, event1: jedzie po nim w stronę początku, event2: w stronę końca.\neventall0/1/2: to samo dla dowolnego pojazdu" + +msgid "Name of the event to add to the chosen list. An event which doesn't exist is kept, and reported" +msgstr "Nazwa zdarzenia do dodania do wybranej listy. Nieistniejące zdarzenie zostaje zachowane i zgłoszone" + +msgid "A dragged free end within this distance of another free end joins it on release" +msgstr "Przeciągany wolny koniec w tej odległości od innego wolnego końca łączy się z nim po puszczeniu" + +msgid "On joining, the end also takes over the direction of the other path, so the joint has no kink" +msgstr "Przy łączeniu koniec przejmuje też kierunek drugiego odcinka, żeby styk nie miał załamania" + +msgid "Dragging a joined end, or moving and turning the whole path or switch,\nmoves the ends of the neighbouring paths with it" +msgstr "Przeciąganie połączonego końca albo przesuwanie i obracanie całego odcinka lub rozjazdu\nprzesuwa razem z nim końce sąsiednich odcinków" + +msgid "Control vector of the start, relative to the start point; zero for a straight" +msgstr "Wektor sterujący początku, względem punktu początkowego; zero dla prostej" + +msgid "Control vector of the end, relative to the end point; zero for a straight" +msgstr "Wektor sterujący końca, względem punktu końcowego; zero dla prostej" + +msgid "Cant at the start and at the end as the roll angle of the track" +msgstr "Przechyłka na początku i na końcu jako kąt przechylenia toru" + +msgid "Radius stored with the path in the scenery; the shape itself comes from the control vectors" +msgstr "Promień zapisany z odcinkiem w scenerii; sam kształt wynika z wektorów sterujących" + +msgid "Removes the control vectors and the radius, the path becomes a straight between its ends" +msgstr "Usuwa wektory sterujące i promień, odcinek staje się prostą między swoimi końcami" + +msgid "The line through the selected path, from switch to switch or to a free end:\na vertex for each curve, the straights between them follow the vertices" +msgstr "Linia przez wybrany odcinek, od rozjazdu do rozjazdu lub do wolnego końca:\nwierzchołek dla każdego łuku, proste między nimi podążają za wierzchołkami" + +msgid "Only the curve under the selected path, between the straights adjoining it,\nwhich it takes over or gives back as its radius changes" +msgstr "Tylko łuk pod wybranym odcinkiem, między przylegającymi prostymi,\nktóre przejmuje lub oddaje przy zmianie promienia" + +msgid "Speed the cant, the transitions and the recommended radius are designed for" +msgstr "Prędkość, dla której projektowane są przechyłka, krzywe przejściowe i zalecany promień" + +msgid "Cubic parabola: the usual one on the Polish lines; clothoid: curvature growing linearly with the length" +msgstr "Parabola sześcienna: zwykła na polskich liniach; klotoida: krzywizna rośnie liniowo z długością" + +msgid "Curve made of two arcs of different radii, joined with a transition" +msgstr "Łuk z dwóch łuków o różnych promieniach, połączonych krzywą przejściową" + +msgid "Height of the outer rail above the inner one" +msgstr "Wysokość szyny zewnętrznej ponad wewnętrzną" + +msgid "For the loops: the curve turns by more than a half circle" +msgstr "Dla pętli: łuk skręca o więcej niż pół okręgu" + +msgid "Cant and transitions recommended for the design speed and the radius" +msgstr "Przechyłka i krzywe przejściowe zalecane dla prędkości projektowej i promienia" + +msgid "Largest change of the direction between the paths of one straight" +msgstr "Największa zmiana kierunku między odcinkami jednej prostej" + +msgid "Largest distance of the paths from the common axis of the straight" +msgstr "Największa odległość odcinków od wspólnej osi prostej" + +msgid "Curves of a larger radius count as straight" +msgstr "Łuki o większym promieniu liczą się jako proste" + +msgid "Shorter straights aren't listed" +msgstr "Krótsze proste nie są wypisywane" + +msgid "Radius of the curves made by the break and the S-curve; automatic: 1.5 times the minimum radius for the speed of the line" +msgstr "Promień łuków tworzonych przez załamanie i esowanie; automatyczny: 1.5 raza promień minimalny dla prędkości linii" + +msgid "Lengths of the transition curves from the speed of the paths and the limits of the curve design" +msgstr "Długości krzywych przejściowych z prędkości odcinków i ograniczeń projektowania łuków" + +msgid "Drag to change, Ctrl+click to type the value" +msgstr "Przeciągnij, aby zmienić, Ctrl+klik, aby wpisać wartość" + +msgid "Speed limit of the new paths, and the design speed of the transition curves and of the cant" +msgstr "Ograniczenie prędkości nowych odcinków oraz prędkość projektowa krzywych przejściowych i przechyłki" + +msgid "Lengths and the cant recommended for the speed and the radius; off: plain circular arcs with no cant" +msgstr "Długości i przechyłka zalecane dla prędkości i promienia; wyłączone: zwykłe łuki kołowe bez przechyłki" + +msgid "Takes the textures and the other parameters from the selected track.\nA track started or finished at a free end always takes them from the track it joins" +msgstr "Bierze tekstury i pozostałe parametry z wybranego toru.\nTor zaczęty lub zakończony na wolnym końcu zawsze bierze je z toru, do którego dochodzi" + +msgid "Looks for the switches of the scenery again, to use their shapes as the templates" +msgstr "Ponownie szuka rozjazdów w scenerii, aby użyć ich kształtów jako wzorców" + +msgid "start of the new track, on the ground or at a free end" +msgstr "początek nowego toru, na terenie lub na wolnym końcu" + +msgid "stop laying" +msgstr "zakończ układanie" + +msgid "next point, a curve goes at it" +msgstr "następny punkt, w nim powstanie łuk" + +msgid "join and lay" +msgstr "połącz i ułóż" + +msgid "lay" +msgstr "ułóż" + +msgid "take back the point" +msgstr "cofnij punkt" + +msgid "cancel" +msgstr "anuluj" + +msgid "curve through the cursor, along the end: straight" +msgstr "łuk przez kursor, wzdłuż końca: prosta" + +msgid "straight" +msgstr "prosta" + +msgid "build" +msgstr "zbuduj" + +msgid "direction of the switch" +msgstr "kierunek rozjazdu" + +msgid "side of the diverging track" +msgstr "strona toru zwrotnego" + +msgid "on the selected straight or curve where the switch starts" +msgstr "na wybranej prostej lub łuku, gdzie zaczyna się rozjazd" + +msgid "put the switch away" +msgstr "odłóż rozjazd" + +msgid "select a path" +msgstr "wybierz odcinek" + +msgid "drag the points of the grade line, wheel zooms" +msgstr "przeciągaj punkty niwelety, kółko przybliża" + +msgid "show the path" +msgstr "pokaż odcinek" + +msgid "select a straight or a curve" +msgstr "wybierz prostą lub łuk" + +msgid "the ends or the middle" +msgstr "końce lub środek" + +msgid "break" +msgstr "załamanie" + +msgid "shift around" +msgstr "objazd" + +msgid "add to the set" +msgstr "dodaj do zestawu" + +msgid "new path" +msgstr "nowy odcinek" + +msgid "delete" +msgstr "usuń" + +msgid "move the switch" +msgstr "przesuń rozjazd" + +msgid "turn" +msgstr "obróć" + +msgid "leave the main track" +msgstr "zostaw tor zasadniczy" + +msgid "select a curve" +msgstr "wybierz łuk" + +msgid "vertex" +msgstr "wierzchołek" + +msgid "radius" +msgstr "promień" + +msgid "apply" +msgstr "zastosuj" + +msgid "release the vertex" +msgstr "puść wierzchołek" + +msgid "select a path or a point handle" +msgstr "wybierz odcinek lub uchwyt punktu" + +msgid "release the point" +msgstr "puść punkt" + +msgid "split the path under the cursor" +msgstr "podziel odcinek pod kursorem" + +msgid "top view" +msgstr "widok z góry" + +msgid "undo" +msgstr "cofnij" + +msgid "lay, switch, straight, curve, profile, speed, infra" +msgstr "układanie, rozjazd, prosta, łuk, profil, prędkość, infrastruktura" + +msgid "Straight G" +msgstr "Prosta G" + +msgid "The whole straight through the selected path" +msgstr "Cała prosta przez wybrany odcinek" + +msgid "Curve C" +msgstr "Łuk C" + +msgid "Curves of the line through the selected path: radii, transitions, cant" +msgstr "Łuki linii przez wybrany odcinek: promienie, krzywe przejściowe, przechyłka" + +msgid "Path" +msgstr "Odcinek" + +msgid "Points, control vectors and parameters of the selected path" +msgstr "Punkty, wektory sterujące i parametry wybranego odcinka" + +msgid "Profile P" +msgstr "Profil P" + +msgid "Vertical profile (grade line) along the line" +msgstr "Profil podłużny (niweleta) wzdłuż linii" + +msgid "Speed V" +msgstr "Prędkość V" + +msgid "Speed limits of the paths against what their geometry allows" +msgstr "Ograniczenia prędkości odcinków wobec tego, na co pozwala ich geometria" + +msgid "Infra I" +msgstr "Infra I" + +msgid "Infrastructure bound to the track, which follows its changes" +msgstr "Infrastruktura powiązana z torem, podążająca za jego zmianami" + +msgid "Straight" +msgstr "Prosta" + +msgid "The whole straight through the selected path: drag its ends or the middle, break it, shift it (G)" +msgstr "Cała prosta przez wybrany odcinek: przeciągaj końce lub środek, załamuj, przesuwaj (G)" + +msgid "Curve" +msgstr "Łuk" + +msgid "The line through the path, switch to switch: vertices with the radii, transitions and cant of the curves (C)" +msgstr "Linia przez odcinek, od rozjazdu do rozjazdu: wierzchołki z promieniami, krzywymi przejściowymi i przechyłką łuków (C)" + +msgid "Switch" +msgstr "Rozjazd" + +msgid "Geometry of the switch from a template, side of the diverging track" +msgstr "Geometria rozjazdu ze wzorca, strona toru zwrotnego" + +msgid "Profile" +msgstr "Profil" + +msgid "Vertical profile (grade line) along the line (P)" +msgstr "Profil podłużny (niweleta) wzdłuż linii (P)" + +msgid "Speed" +msgstr "Prędkość" + +msgid "Speed limits of the paths against the speed their geometry allows (V)" +msgstr "Ograniczenia prędkości odcinków wobec prędkości dopuszczalnej przez geometrię (V)" + +msgid "Infra" +msgstr "Infra" + +msgid "Infrastructure along the track, bound to follow its changes (I)" +msgstr "Infrastruktura wzdłuż toru, powiązana tak, by podążała za jego zmianami (I)" + +msgid "Select a path in the view first" +msgstr "Najpierw wybierz odcinek w widoku" + +msgid "The selected path isn't a switch" +msgstr "Wybrany odcinek nie jest rozjazdem" + +msgid "The selected path isn't straight" +msgstr "Wybrany odcinek nie jest prosty" + +msgid "Switches and paths of other kinds aren't a part of a line" +msgstr "Rozjazdy i odcinki innych rodzajów nie są częścią linii" + +msgid "The selected path is straight, the single curve mode needs a curve" +msgstr "Wybrany odcinek jest prosty, tryb pojedynczego łuku wymaga łuku" + +msgid "normal" +msgstr "zwykły" + +msgid "switch" +msgstr "rozjazd" + +msgid "cross" +msgstr "skrzyżowanie" + +msgid "turntable" +msgstr "obrotnica" + +msgid "tributary" +msgstr "dopływ" + +# scenery editor: vertical profile + +msgid "Point" +msgstr "Punkt" + +msgid "Points" +msgstr "Punkty" + +msgid "Remarks" +msgstr "Uwagi" + +msgid "Keeps the elevation of the joint and takes over the grade of the adjoining track,\nwith a vertical curve which starts right at the joint" +msgstr "Zachowuje wysokość styku i przejmuje pochylenie przylegającego toru,\nz łukiem pionowym zaczynającym się zaraz na styku" + +msgid "Join the adjoining track at the start" +msgstr "Dowiąż do przylegającego toru na początku" + +msgid "Join the adjoining track at the end" +msgstr "Dowiąż do przylegającego toru na końcu" + +msgid "Limits" +msgstr "Ograniczenia" + +msgid "Automatic R at all points" +msgstr "Automatyczny R we wszystkich punktach" + +msgid "Required R for %.0f km/h: %.0f m" +msgstr "Wymagany R dla %.0f km/h: %.0f m" + +msgid "%d errors, %d warnings: see the Remarks in the strip" +msgstr "Błędy: %d, ostrzeżenia: %d - zobacz Uwagi na dolnym pasku" + +msgid "%d warnings: see the Remarks in the strip" +msgstr "Ostrzeżenia: %d - zobacz Uwagi na dolnym pasku" + +msgid "The grade line meets the limits" +msgstr "Niweleta spełnia ograniczenia" + +msgid "Largest departure from the track: %.3f m" +msgstr "Największa odchyłka od toru: %.3f m" + +msgid "Sets the points of the grade line from the existing track" +msgstr "Ustawia punkty niwelety na podstawie istniejącego toru" + +msgid "Sets the heights of the track along the route to the grade line, Ctrl+Z takes it back" +msgstr "Ustawia wysokości toru wzdłuż trasy według niwelety, Ctrl+Z cofa" + +msgid "LMB on a remark shows its place" +msgstr "LPM na uwadze pokazuje jej miejsce" + +msgid "sag" +msgstr "wklęsły" + +msgid "crest" +msgstr "wypukły" + +msgid "No point selected. Click a point of the grade line in the plot, or double click the line to add one." +msgstr "Nie wybrano punktu. Kliknij punkt niwelety na wykresie albo kliknij dwukrotnie linię, aby dodać nowy." + +msgid "Point %d: joint with the adjoining track" +msgstr "Punkt %d: styk z przylegającym torem" + +msgid "Grade %+.2f -> %+.2f per mille (%s)" +msgstr "Pochylenie %+.2f -> %+.2f promila (%s)" + +msgid "Placed automatically, moves with the neighbouring point; untick the joining in the inspector to edit the end freely" +msgstr "Ustawiany automatycznie, porusza się z sąsiednim punktem; odznacz dowiązanie w inspektorze, aby swobodnie edytować koniec" + +msgid "Point %d" +msgstr "Punkt %d" + +msgid ", joined to the adjoining track" +msgstr ", dowiązany do przylegającego toru" + +msgid ", end of the route" +msgstr ", koniec trasy" + +msgid "Elevation %.3f m" +msgstr "Wysokość %.3f m" + +msgid "auto" +msgstr "auto" + +msgid "R follows the limits: the required radius where the change of grade needs a curve; 0: no curve" +msgstr "R wynika z ograniczeń: wymagany promień tam, gdzie zmiana pochylenia wymaga łuku; 0: bez łuku" + +msgid "Change of grade %+.2f per mille, %s" +msgstr "Zmiana pochylenia %+.2f promila, %s" + +msgid "Tangent T %.2f m, sagitta f %.3f m" +msgstr "Styczna T %.2f m, strzałka f %.3f m" + +msgid "Add a point after" +msgstr "Dodaj punkt za" + +msgid "Remove Del" +msgstr "Usuń Del" + +msgid " joint" +msgstr " styk" + +msgid "heights x%.0f" +msgstr "wysokości x%.0f" + +msgid "Exaggeration of the heights against the lengths, also Ctrl+wheel over the plot" +msgstr "Przewyższenie wysokości względem długości, także Ctrl+kółko nad wykresem" + +msgid "Fit" +msgstr "Dopasuj" + +msgid "Shows the whole route" +msgstr "Pokazuje całą trasę" + +msgid "before %+.2f per mille" +msgstr "przed %+.2f promila" + +msgid "after %+.2f per mille" +msgstr "za %+.2f promila" + +msgid "plan: curvature (up: left)" +msgstr "plan: krzywizna (w górę: w lewo)" + +msgid "Grade line %.3f m, %+.2f per mille" +msgstr "Niweleta %.3f m, %+.2f promila" + +msgid "Track %.3f m (%+.3f), %+.2f per mille" +msgstr "Tor %.3f m (%+.3f), %+.2f promila" + +msgid "Terrain %.3f m, %s %.2f m" +msgstr "Teren %.3f m, %s %.2f m" + +msgid "fill" +msgstr "nasyp" + +msgid "cut" +msgstr "wykop" + +msgid " (switch, tilted as a whole with its branch)" +msgstr " (rozjazd, pochylany w całości z odgałęzieniem)" + +msgid "Maximum grade (per mille)" +msgstr "Największe pochylenie (promile)" + +msgid "Maximum grade over switches (per mille)" +msgstr "Największe pochylenie na rozjazdach (promile)" + +msgid "Vertical curve R >= k*V^2, k" +msgstr "Łuk pionowy R >= k*V^2, k" + +msgid "Vertical curve R min (m)" +msgstr "Najmniejszy R łuku pionowego (m)" + +msgid "Vertical curve needed above a change of (per mille)" +msgstr "Łuk pionowy potrzebny powyżej zmiany o (promile)" + +msgid "Constant grade between curves at least (m)" +msgstr "Stałe pochylenie między łukami co najmniej (m)" + +msgid "Tolerance at fixed points (m)" +msgstr "Tolerancja w punktach stałych (m)" + +msgid "Chainage (m)" +msgstr "Kilometraż (m)" + +msgid "Elevation (m)" +msgstr "Wysokość (m)" + +msgid "Grade before (per mille)" +msgstr "Pochylenie przed (promile)" + +msgid "Grade after (per mille)" +msgstr "Pochylenie za (promile)" + +msgid "Vertical curve R (m)" +msgstr "R łuku pionowego (m)" + +msgid "Grade line" +msgstr "Niweleta" + +msgid "Tangents" +msgstr "Styczne" + +msgid "Switches" +msgstr "Rozjazdy" + +msgid "wheel: zoom Ctrl+wheel: heights RMB/MMB drag: pan double click on the line: add a point" +msgstr "kółko: przybliżenie Ctrl+kółko: wysokości PPM/ŚPM: przesuwanie dwuklik na linii: nowy punkt" + +msgid "Ctrl: only the height Shift: keep the grade before" +msgstr "Ctrl: tylko wysokość Shift: zachowaj pochylenie przed" + +msgid "drag up or down: radius of the vertical curve" +msgstr "przeciągnij w górę lub w dół: promień łuku pionowego" + +msgid "drag: move the point Ctrl+drag: only the height Shift+drag: keep the grade before Del: remove" +msgstr "przeciągnij: przesuń punkt Ctrl: tylko wysokość Shift: zachowaj pochylenie przed Del: usuń" + +msgid "double click: add a point here" +msgstr "dwuklik: dodaj tu punkt" + +# scenery editor: track modes + +msgid "The selected path isn't straight: C edits it as a curve, Esc goes back to Select" +msgstr "Wybrany odcinek nie jest prosty: C edytuje go jako łuk, Esc wraca do Wyboru" + +msgid "Switches aren't a part of a line: T edits the switch, Esc goes back to Select" +msgstr "Rozjazdy nie są częścią linii: T edytuje rozjazd, Esc wraca do Wyboru" + +msgid "The track tools are in the Track window on the right: choose the mode at its top, or press its key in the view." +msgstr "Narzędzia torów są w oknie Tor po prawej: wybierz tryb u jego góry albo naciśnij jego klawisz w widoku." + +msgid "Show the Track window" +msgstr "Pokaż okno Tor" + +msgid "Tracks" +msgstr "Tory" + +msgid "Track window" +msgstr "Okno Tor" + +msgid "The selected path isn't straight: LMB on a straight" +msgstr "Wybrany odcinek nie jest prosty: LPM na prostej" + +msgid "Switches aren't a part of a line: LMB on a plain path" +msgstr "Rozjazdy nie są częścią linii: LPM na zwykłym odcinku" + +msgid "Select: drag the points of the path" +msgstr "Wybór: przeciągaj punkty odcinka" + +msgid "LMB on a path in the view selects it" +msgstr "LPM na odcinku w widoku wybiera go" + +msgid "Selected switch" +msgstr "Wybrany rozjazd" + +msgid "back to Select" +msgstr "powrót do Wyboru" + +msgid "select the straight or the curve for the switch" +msgstr "wybierz prostą lub łuk dla rozjazdu" + +msgid "move the selected switch" +msgstr "przesuń wybrany rozjazd" + +msgid "on the selected track where the switch starts" +msgstr "na wybranym torze, gdzie zaczyna się rozjazd" + +msgid "select another track" +msgstr "wybierz inny tor" + +msgid "modes: lay, switch, straight, curve, profile, speed, infra" +msgstr "tryby: układanie, rozjazd, prosta, łuk, profil, prędkość, infrastruktura" + +msgid "Select" +msgstr "Wybór" + +msgid "LMB on a path selects it: its points, control vectors and parameters" +msgstr "LPM na odcinku wybiera go: jego punkty, wektory sterujące i parametry" + +msgid "Lay track" +msgstr "Układanie" + +msgid "Puts switches into the selected straight or curve, edits the geometry of the selected switch" +msgstr "Wstawia rozjazdy w wybraną prostą lub łuk, edytuje geometrię wybranego rozjazdu" + +msgid "The whole straight through the selected path: drag its ends or the middle, break it, shift it" +msgstr "Cała prosta przez wybrany odcinek: przeciągaj końce lub środek, załamuj, przesuwaj" + +msgid "The line through the path, switch to switch: vertices with the radii, transitions and cant of the curves" +msgstr "Linia przez odcinek, od rozjazdu do rozjazdu: wierzchołki z promieniami, krzywymi przejściowymi i przechyłką łuków" + +msgid "Speed limits of the paths against the speed their geometry allows" +msgstr "Ograniczenia prędkości odcinków wobec prędkości dopuszczalnej przez geometrię" + +msgid "Infrastructure along the track, bound to follow its changes" +msgstr "Infrastruktura wzdłuż toru, powiązana tak, by podążała za jego zmianami" + +msgid "Track editor" +msgstr "Edytor torów" + +msgid "Structure gauge" +msgstr "Skrajnia" + +msgid "Checks which models enter the structure gauge of the tracks and the clearance over the roads (skrajnia budowli)" +msgstr "Sprawdza, które modele wchodzą w skrajnię budowli torów i w skrajnię nad drogami" + +msgid "Vertical profile: edit the grade line in the profile window" +msgstr "Profil podłużny: edytuj niweletę w oknie profilu" + +msgid "The geometry of this switch is degenerate, it can't be edited here" +msgstr "Geometria tego rozjazdu jest zdegenerowana, nie da się jej tu edytować" + +msgid "Length %.3f m, diverging %s, end offset %.3f m" +msgstr "Długość %.3f m, tor zwrotny %s, odsunięcie końca %.3f m" + +msgid "left" +msgstr "w lewo" + +msgid "right" +msgstr "w prawo" + +msgid "Angle 1:%.2f (%.4f deg), R in the entry %.0f m" +msgstr "Skos 1:%.2f (%.4f°), R na wejściu %.0f m" + +msgid "Too far from the new ends of the switch, left unjoined: " +msgstr "Za daleko od nowych końców rozjazdu, zostawione niepołączone: " + +msgid "Replace the geometry with the template" +msgstr "Zastąp geometrię wzorcem" + +msgid "Flip the side" +msgstr "Odwróć stronę" + +msgid "Velocity (km/h, -1: none)" +msgstr "Prędkość (km/h, -1: brak)" + +msgid "Ride and sound" +msgstr "Jazda i dźwięk" + +msgid "Friction" +msgstr "Tarcie" + +msgid "Sound distance" +msgstr "Odstęp stuków" + +msgid "Quality" +msgstr "Jakość" + +msgid "Damage flags" +msgstr "Flagi uszkodzeń" + +msgid "Width" +msgstr "Szerokość" + +msgid "Textures and trackbed" +msgstr "Tekstury i podsypka" + +msgid "The texture changes on Enter or leaving the field, \"none\" removes it" +msgstr "Tekstura zmienia się po Enter lub wyjściu z pola, \"none\" ją usuwa" + +msgid "Texture length" +msgstr "Długość tekstury" + +msgid "Trackbed height" +msgstr "Wysokość podsypki" + +msgid "Trackbed width" +msgstr "Szerokość podsypki" + +msgid "Trackbed slope" +msgstr "Skarpa podsypki" + +msgid "Track circuit, overhead line, sleepers, events" +msgstr "Odcinek izolowany, sieć, podkłady, zdarzenia" + +msgid "Track circuits" +msgstr "Odcinki izolowane" + +msgid "The track circuits can't change while vehicles stand on the path" +msgstr "Odcinki izolowane nie mogą się zmienić, gdy na odcinku stoją pojazdy" + +msgid "Speed with the pantographs lowered (km/h)" +msgstr "Prędkość z opuszczonymi pantografami (km/h)" + +msgid "Sleeper models" +msgstr "Modele podkładów" + +msgid "Give the sleeper model first" +msgstr "Najpierw podaj model podkładu" + +msgid "Sleeper model" +msgstr "Model podkładu" + +msgid "Path of the .e3d model, as in the scenery file" +msgstr "Ścieżka modelu .e3d, jak w pliku scenerii" + +msgid "Sleeper skin" +msgstr "Skóra podkładu" + +msgid "Replaceable skin of the model, \"none\": the one of the model" +msgstr "Wymienna skóra modelu, \"none\": ta z modelu" + +msgid "Sleeper spacing (m)" +msgstr "Rozstaw podkładów (m)" + +msgid "Distance between the sleepers along the path" +msgstr "Odległość między podkładami wzdłuż odcinka" + +msgid "Sleeper offset (m)" +msgstr "Przesunięcie podkładu (m)" + +msgid "Trackbed shift (m)" +msgstr "Przesunięcie podsypki (m)" + +msgid "Vertical shift of the drawn trackbed under the sleepers, negative lowers it" +msgstr "Pionowe przesunięcie rysowanej podsypki pod podkładami, ujemne ją obniża" + +msgid "Events" +msgstr "Zdarzenia" + +msgid "%s %s (by the name of the path)" +msgstr "%s %s (po nazwie odcinka)" + +msgid "%s %s (no such event)" +msgstr "%s %s (nie ma takiego zdarzenia)" + +msgid "Add" +msgstr "Dodaj" + +msgid "The events can't change while vehicles stand on the path" +msgstr "Zdarzenia nie mogą się zmienić, gdy na odcinku stoją pojazdy" + +msgid "No such events: %s" +msgstr "Nie ma takich zdarzeń: %s" + +msgid "No path selected" +msgstr "Nie zaznaczono odcinka" + +msgid "Editing of this path type isn't supported" +msgstr "Edycja tego typu odcinka nie jest obsługiwana" + +msgid "Geometry locked: %s" +msgstr "Geometria zablokowana: %s" + +msgid "Geometry" +msgstr "Geometria" + +msgid "Path %d" +msgstr "Odcinek %d" + +msgid "(+) joined with another track, (-) a free end" +msgstr "(+) połączony z innym torem, (-) wolny koniec" + +msgid "Start (%.2f, %.2f, %.2f) End (%.2f, %.2f, %.2f)" +msgstr "Początek (%.2f, %.2f, %.2f) Koniec (%.2f, %.2f, %.2f)" + +msgid "Drag to move, Ctrl+click to type the value" +msgstr "Przeciągnij, by zmienić, Ctrl+klik, by wpisać wartość" + +msgid "vector##point" +msgstr "wektor##point" + +msgid "Control vector, relative to its end; zero for a straight" +msgstr "Wektor kontrolny, względem swojego końca; zero dla prostej" + +msgid "Cant and radius" +msgstr "Przechyłka i promień" + +msgid "Roll (deg)" +msgstr "Przechył (°)" + +msgid "Radius" +msgstr "Promień" + +msgid "Straighten" +msgstr "Wyprostuj" + +msgid "Snapping of the ends" +msgstr "Przyciąganie końców" + +msgid "Snap radius (m)" +msgstr "Zasięg przyciągania (m)" + +msgid "Align with snapped path" +msgstr "Dopasuj kierunek do przyciągniętego" + +msgid "Drag connected ends" +msgstr "Ciągnij połączone końce" + +msgid "The fragment runs through %zu switches along their main tracks. They move as a whole with the line, so they have to fall on its straights" +msgstr "Fragment przechodzi przez %zu rozjazdów torem zasadniczym. Przesuwają się w całości z linią, więc muszą wypaść na jej prostych" + +msgid "Curve of " +msgstr "Łuk z " + +msgid " paths, turning " +msgstr " odcinków, kąt zwrotu " + +msgid " deg" +msgstr "°" + +msgid "Line of %zu paths, %.0f m, %zu vertices" +msgstr "Linia z %zu odcinków, %.0f m, %zu wierzchołków" + +msgid "The fragment changed since it was selected, select it again" +msgstr "Fragment zmienił się od zaznaczenia, zaznacz go ponownie" + +msgid "The adjoining straights can't be cut at the ends of the curve" +msgstr "Przyległych prostych nie da się przyciąć na końcach łuku" + +msgid "Re-laid " +msgstr "Ułożono na nowo " + +msgid " paths" +msgstr " odcinków" + +msgid ", added " +msgstr ", dodano " + +msgid "The switch " +msgstr "Rozjazd " + +msgid " doesn't fit on the designed line" +msgstr " nie mieści się na projektowanej linii" + +msgid "The switch %s would leave the designed line by %.2f m at its other end: it lies in a curve of the design. Move the vertices so that the switch falls on a straight" +msgstr "Rozjazd %s odszedłby od projektowanej linii o %.2f m na drugim końcu: leży w łuku projektu. Przesuń wierzchołki tak, by rozjazd wypadł na prostej" + +msgid "The paths between the switches can't be read as a chain" +msgstr "Odcinków między rozjazdami nie da się odczytać jako ciągu" + +msgid "The designed line between the switches is too short for the paths there" +msgstr "Projektowana linia między rozjazdami jest za krótka na tamtejsze odcinki" + +msgid "Whole line" +msgstr "Cała linia" + +msgid "Single curve" +msgstr "Pojedynczy łuk" + +msgid "%zu paths, %.2f m" +msgstr "%zu odcinków, %.2f m" + +msgid "Reset design" +msgstr "Resetuj projekt" + +msgid "Reads the curves of the line from the scenery again, dropping the changes not applied" +msgstr "Odczytuje łuki linii ze scenerii od nowa, porzucając niezastosowane zmiany" + +msgid "Design speed and limits" +msgstr "Prędkość projektowa i normy" + +msgid "First path: %s" +msgstr "Pierwszy odcinek: %s" + +msgid "Use selected##routefrom" +msgstr "Użyj zaznaczonego##routefrom" + +msgid "Last path: %s" +msgstr "Ostatni odcinek: %s" + +msgid "Use selected##routeto" +msgstr "Użyj zaznaczonego##routeto" + +msgid "Rail axes distance (mm)" +msgstr "Rozstaw osi szyn (mm)" + +msgid "Unbalanced acceleration (m/s2)" +msgstr "Przyspieszenie niezrównoważone (m/s2)" + +msgid "Maximum cant (mm)" +msgstr "Największa przechyłka (mm)" + +msgid "Cant change rate (mm/s)" +msgstr "Prędkość zmiany przechyłki (mm/s)" + +msgid "Cant ramp 1:(k*V), k" +msgstr "Rampa przechyłkowa 1:(k*V), k" + +msgid "Unbalanced acc. change rate (m/s3)" +msgstr "Przyrost przysp. niezrównoważonego (m/s3)" + +msgid "Straight between curves (s of travel)" +msgstr "Prosta między łukami (s jazdy)" + +msgid "Add vertex" +msgstr "Dodaj wierzchołek" + +msgid "Remove vertex" +msgstr "Usuń wierzchołek" + +msgid "LMB unfolds the values of the vertex, the same as a click on it in the view" +msgstr "LPM rozwija wartości wierzchołka, tak samo jak kliknięcie go w widoku" + +msgid "At the intersection of the end tangents" +msgstr "Na przecięciu stycznych końców" + +msgid "Distance from the start (m)" +msgstr "Odległość od początku (m)" + +msgid "Distance from the end (m)" +msgstr "Odległość od końca (m)" + +msgid "Position (x, z)" +msgstr "Położenie (x, z)" + +msgid "Radius R1 (m)" +msgstr "Promień R1 (m)" + +msgid "Radius R (m)" +msgstr "Promień R (m)" + +msgid "Compound curve (two radii)" +msgstr "Łuk koszowy (dwa promienie)" + +msgid "Radius R2 (m)" +msgstr "Promień R2 (m)" + +msgid "Transition R1-R2 (m)" +msgstr "Przejściowa R1-R2 (m)" + +msgid "Share of R1" +msgstr "Udział R1" + +msgid "Transition in (m)" +msgstr "Przejściowa na wejściu (m)" + +msgid "Transition out (m)" +msgstr "Przejściowa na wyjściu (m)" + +msgid "Cant (mm)" +msgstr "Przechyłka (mm)" + +msgid "Turn the longer way (over 180 deg)" +msgstr "Skręt dłuższą drogą (ponad 180°)" + +msgid "Apply recommended for V" +msgstr "Zalecane dla V" + +msgid "For %.0f km/h: R min %.0f m, cant %.0f mm (equilibrium %.0f, min %.0f), transition %.0f m" +msgstr "Dla %.0f km/h: R min %.0f m, przechyłka %.0f mm (równowagowa %.0f, min %.0f), przejściowa %.0f m" + +msgid "Deflection %.4f deg, tangents %.2f / %.2f m, arc %.2f m" +msgstr "Kąt zwrotu %.4f°, styczne %.2f / %.2f m, łuk %.2f m" + +msgid "Unbalanced acc. %.3f m/s2, cant rate %.1f / %.1f mm/s, acc. rate %.3f / %.3f m/s3" +msgstr "Przysp. niezrównoważone %.3f m/s2, zmiana przechyłki %.1f / %.1f mm/s, przyrost przysp. %.3f / %.3f m/s3" + +msgid "Length %.2f m (now %.2f m), %zu elements" +msgstr "Długość %.2f m (teraz %.2f m), %zu elementów" + +msgid "Paths: %zu in the fragment, %zu needed%s" +msgstr "Odcinki: %zu we fragmencie, potrzeba %zu%s" + +msgid " (copies of the neighbours will be added)" +msgstr " (zostaną dodane kopie sąsiednich)" + +msgid "Takes over %.2f m of the straight at the start, %.2f m at the end" +msgstr "Zajmuje %.2f m prostej na początku, %.2f m na końcu" + +msgid "Elements" +msgstr "Elementy" + +msgid "Straight available beyond the ends: %.2f / %.2f m" +msgstr "Prosta dostępna za końcami: %.2f / %.2f m" + +msgid "Correct the errors to apply the design" +msgstr "Popraw błędy, by zastosować projekt" + +msgid "Straights recognized from chains of collinear straight paths.\nLMB: select a path to see the straight it belongs to" +msgstr "Proste rozpoznane z ciągów współliniowych prostych odcinków.\nLPM: zaznacz odcinek, by zobaczyć jego prostą" + +msgid "Angle tolerance (deg)" +msgstr "Tolerancja kąta (°)" + +msgid "Offset tolerance (m)" +msgstr "Tolerancja odsunięcia (m)" + +msgid "Treat as straight above R (m)" +msgstr "Traktuj jako prostą powyżej R (m)" + +msgid "Minimum length (m)" +msgstr "Najmniejsza długość (m)" + +msgid "Recognize straights in the scenery" +msgstr "Rozpoznaj proste w scenerii" + +msgid "%zu straights" +msgstr "%zu prostych" + +msgid "path name" +msgstr "nazwa odcinka" + +msgid "Break" +msgstr "Złam" + +msgid "Turns the rest of the straight from a point, a curve goes at the break (Ctrl+drag in the view does the same)" +msgstr "Obraca resztę prostej od punktu, w załomie wstawia łuk (to samo robi Ctrl+przeciągnięcie w widoku)" + +msgid "S-curve" +msgstr "Esownica" + +msgid "Shifts the rest of the straight sideways through two curves" +msgstr "Przesuwa resztę prostej w bok przez dwa łuki" + +msgid "Leave the group" +msgstr "Opuść grupę" + +msgid "Move with others" +msgstr "Przesuwaj z innymi" + +msgid "Straights of a group move together and stay parallel; Alt+click in the view adds another one" +msgstr "Proste z grupy przesuwają się razem i zostają równoległe; Alt+klik w widoku dodaje kolejną" + +msgid "Curve R (m, 0: automatic)" +msgstr "R łuku (m, 0: automatycznie)" + +msgid "Transitions from the line speed" +msgstr "Przejściowe z prędkości linii" + +msgid "Transition (m)" +msgstr "Przejściowa (m)" + +msgid "Group: %zu straights move together" +msgstr "Grupa: %zu prostych przesuwa się razem" + +msgid "Clear" +msgstr "Wyczyść" + +msgid "Exact values" +msgstr "Dokładne wartości" + +msgid "Start (x, y, z)" +msgstr "Początek (x, y, z)" + +msgid "End (x, y, z)" +msgstr "Koniec (x, y, z)" + +msgid "Apply ends" +msgstr "Zastosuj końce" + +msgid "Length (m)" +msgstr "Długość (m)" + +msgid "Set from the start##length" +msgstr "Ustaw od początku##length" + +msgid "Azimuth (deg)" +msgstr "Azymut (°)" + +msgid "Turn around the start" +msgstr "Obróć wokół początku" + +msgid "Placing of the switch cancelled" +msgstr "Wstawianie rozjazdu anulowane" + +msgid "The curve would run through a switch" +msgstr "Łuk przechodziłby przez rozjazd" + +msgid "The curve can't be fitted" +msgstr "Nie da się dopasować łuku" + +msgid "Done, select a curve to adjust it in the Curve mode" +msgstr "Gotowe, zaznacz łuk, by poprawić go w trybie Łuk" + +msgid "The track can't be deleted while vehicles stand on it" +msgstr "Toru nie można usunąć, gdy stoją na nim pojazdy" + +msgid "The switch is replaced by its main track, Shift+Del removes all of it" +msgstr "Rozjazd zastąpiono jego torem zasadniczym, Shift+Del usuwa całość" + +msgid "Continue from the free end" +msgstr "Dalej od wolnego końca" + +msgid "Length (m)##extend" +msgstr "Długość (m)##extend" + +msgid "Length of the next piece, along the curve for the curves" +msgstr "Długość kolejnego odcinka, dla łuków mierzona po łuku" + +msgid "Radius of the curves added" +msgstr "Promień dodawanych łuków" + +msgid "Straight##extend" +msgstr "Prosta##extend" + +msgid "Adds a straight at the free end; the new piece gets selected, so the next click goes on from it" +msgstr "Dokłada prostą na wolnym końcu; nowy odcinek zostaje zaznaczony, więc kolejne kliknięcie idzie dalej od niego" + +msgid "Curve left##extend" +msgstr "Łuk w lewo##extend" + +msgid "Curve right##extend" +msgstr "Łuk w prawo##extend" + +msgid "Freehand" +msgstr "Z ręki" + +msgid "Dragging the red ring of a free end draws a curve through the cursor; off: it draws a straight along the end" +msgstr "Przeciągnięcie czerwonego pierścienia wolnego końca rysuje łuk przez kursor; wyłączone: rysuje prostą wzdłuż końca" + +msgid "Two points lie on one another" +msgstr "Dwa punkty leżą na sobie" + +msgid "The track can't be laid through these points" +msgstr "Nie da się ułożyć toru przez te punkty" + +msgid "Click at least two points" +msgstr "Kliknij co najmniej dwa punkty" + +msgid "Laid %zu paths, %.1f m" +msgstr "Ułożono %zu odcinków, %.1f m" + +msgid "More settings" +msgstr "Więcej ustawień" + +msgid "Texture of the rails" +msgstr "Tekstura szyn" + +msgid "Texture of the ballast" +msgstr "Tekstura podsypki" + +msgid "The scenery isn't opened for editing: new track won't be saved" +msgstr "Sceneria nie jest otwarta do edycji: nowy tor nie zostanie zapisany" + +msgid "A double slip goes only into a straight crossing another one" +msgstr "Rozjazd krzyżowy wstawia się tylko w prostą przecinającą inną" + +msgid "The selected track is neither a recognized straight nor a curve" +msgstr "Zaznaczony tor nie jest ani rozpoznaną prostą, ani łukiem" + +msgid "The curve can't be followed" +msgstr "Nie da się prześledzić łuku" + +msgid "The straight is %.1f m long, too short for the %.1f m switch" +msgstr "Prosta ma %.1f m, za mało na rozjazd %.1f m" + +msgid "The switch would overlap another switch, move it onto plain track" +msgstr "Rozjazd nachodziłby na inny rozjazd, przesuń go na zwykły tor" + +msgid "Switch " +msgstr "Rozjazd " + +msgid " inserted" +msgstr " wstawiony" + +msgid "The switch couldn't be created from this template" +msgstr "Nie udało się utworzyć rozjazdu z tego wzorca" + +msgid "Scenery: " +msgstr "Sceneria: " + +msgid "No straight crossing the selected one near the click" +msgstr "W pobliżu kliknięcia żadna prosta nie przecina zaznaczonej" + +msgid "The straights cross at an angle unsuitable for a double slip" +msgstr "Proste przecinają się pod kątem nieodpowiednim dla rozjazdu krzyżowego" + +msgid "Not enough straight track around the crossing" +msgstr "Za mało prostego toru wokół skrzyżowania" + +msgid "R reduced to " +msgstr "R zmniejszony do " + +msgid " m, the straights end " +msgstr " m, proste kończą się " + +msgid " m from the crossing" +msgstr " m od skrzyżowania" + +msgid "The double slip isn't complete, it can't be replaced" +msgstr "Rozjazd krzyżowy jest niekompletny, nie da się go zastąpić" + +msgid "The double slip geometry isn't recognized" +msgstr "Nie rozpoznano geometrii rozjazdu krzyżowego" + +msgid "R limited to " +msgstr "R ograniczony do " + +msgid " m, a neighbouring path isn't straight" +msgstr " m, sąsiedni odcinek nie jest prosty" + +msgid " m to fit the straights" +msgstr " m, by zmieścić się na prostych" + +msgid "The curve is %.1f m long, too short for the %.1f m switch" +msgstr "Łuk ma %.1f m, za mało na rozjazd %.1f m" + +msgid " inserted into the curve" +msgstr " wstawiony w łuk" + +msgid "flat" +msgstr "płasko" + +msgid "mountains" +msgstr "góry" + +msgid "Texture 1 (rails/surface)" +msgstr "Tekstura 1 (szyny/nawierzchnia)" + +msgid "Texture 2 (trackbed/side)" +msgstr "Tekstura 2 (podsypka/bok)" + +msgid "Rails P1-P2" +msgstr "Szyny P1-P2" + +msgid "Rails P3-P4" +msgstr "Szyny P3-P4" + +msgid "Cubic parabola" +msgstr "Parabola 3. stopnia" + +msgid "Clothoid" +msgstr "Klotoida" + +msgid "transition" +msgstr "przejściowa" + +msgid "LMB" +msgstr "LPM" + +msgid "LMB on a free end" +msgstr "LPM na wolnym końcu" + +msgid "leave the axis" +msgstr "zejście z osi" + +msgid "shifted" +msgstr "przesunięta" + +msgid "Drag" +msgstr "Przeciągnij" + +msgid "Release" +msgstr "Puść" + +msgid "straight along the end, to a free end: a curve joining it" +msgstr "prosta wzdłuż końca, do wolnego końca: łuk łączący" + +msgid "Drag along" +msgstr "Ciągnij wzdłuż" + +msgid "Drag sideways" +msgstr "Ciągnij w bok" + +msgid "LMB on a track" +msgstr "LPM na torze" + +msgid "choose the straight or the curve to put the switch in" +msgstr "wybierz prostą lub łuk, w który wstawić rozjazd" + +msgid "remove the switch, its main track stays" +msgstr "usuwa rozjazd, tor zasadniczy zostaje" + +msgid "1. List below" +msgstr "1. Lista niżej" + +msgid "choose the type of the switch" +msgstr "wybierz typ rozjazdu" + +msgid "2. Press+drag" +msgstr "2. Wciśnij i ciągnij" + +msgid "on the selected track where the switch starts: along sets the direction, sideways the side" +msgstr "na zaznaczonym torze, gdzie zaczyna się rozjazd: wzdłuż ustala kierunek, w bok stronę" + +msgid "LMB elsewhere" +msgstr "LPM gdzie indziej" + +msgid "choose another track" +msgstr "wybiera inny tor" + +msgid "loads the grade line of its line" +msgstr "wczytuje niweletę jego linii" + +msgid "Drag a point" +msgstr "Ciągnij punkt" + +msgid "in the profile window: changes the grade" +msgstr "w oknie profilu: zmienia pochylenie" + +msgid "Double click" +msgstr "Podwójny klik" + +msgid "on the line: adds a point" +msgstr "na linii: dodaje punkt" + +msgid "Apply" +msgstr "Zastosuj" + +msgid "writes the heights into the tracks" +msgstr "zapisuje wysokości w torach" + +msgid "LMB on a row" +msgstr "LPM na wierszu" + +msgid "LMB on the straight" +msgstr "LPM na prostej" + +msgid "where it breaks, then drag the handle to turn the rest" +msgstr "w miejscu załomu, potem ciągnij uchwyt, by obrócić resztę" + +msgid "where the shift starts, then drag the handle: sideways the shift, along its length" +msgstr "gdzie zaczyna się przesunięcie, potem ciągnij uchwyt: w bok przesunięcie, wzdłuż jego długość" + +msgid "LMB on a straight track" +msgstr "LPM na prostym torze" + +msgid "selects the whole straight" +msgstr "zaznacza całą prostą" + +msgid "Drag a square" +msgstr "Ciągnij kwadrat" + +msgid "moves an end, the curves at it follow" +msgstr "przesuwa koniec, łuki przy nim podążają" + +msgid "Drag the diamond" +msgstr "Ciągnij romb" + +msgid "shifts the straight sideways" +msgstr "przesuwa prostą w bok" + +msgid "Ctrl+drag" +msgstr "Ctrl+ciągnij" + +msgid "breaks the straight" +msgstr "łamie prostą" + +msgid "Shift+click x4" +msgstr "Shift+klik x4" + +msgid "shifts a piece around an obstacle" +msgstr "przesuwa kawałek, omijając przeszkodę" + +msgid "Alt+click" +msgstr "Alt+klik" + +msgid "adds another straight to move together" +msgstr "dodaje kolejną prostą do wspólnego przesuwania" + +msgid "loads its line: the curves become vertices W1, W2..." +msgstr "wczytuje jego linię: łuki stają się wierzchołkami W1, W2..." + +msgid "Drag yellow" +msgstr "Ciągnij żółty" + +msgid "moves a vertex, the curve follows" +msgstr "przesuwa wierzchołek, łuk podąża" + +msgid "Drag green" +msgstr "Ciągnij zielony" + +msgid "changes the radius" +msgstr "zmienia promień" + +msgid "writes the design into the tracks" +msgstr "zapisuje projekt w torach" + +msgid "selects it" +msgstr "zaznacza go" + +msgid "lay a new track" +msgstr "ułóż nowy tor" + +msgid "moves the point" +msgstr "przesuwa punkt" + +msgid "releases the point" +msgstr "puszcza punkt" + +msgid "LMB on a handle" +msgstr "LPM na uchwycie" + +msgid "picks a point: an end or a control vector" +msgstr "wybiera punkt: koniec lub wektor kontrolny" + +msgid "moves the whole track, W turns it" +msgstr "przesuwa cały tor, W obraca" + +msgid "Drag the red ring" +msgstr "Ciągnij czerwony pierścień" + +msgid "leads a new track out of a free end, or use Continue below" +msgstr "wyprowadza nowy tor z wolnego końca, albo użyj „Dalej” niżej" + +msgid "deletes the track" +msgstr "usuwa tor" + +msgid "Design read from the scenery file " +msgstr "Projekt odczytany z pliku scenerii " + +msgid ", largest departure from the track %.3f m" +msgstr ", największa odchyłka od toru %.3f m" + +msgid "The scenery wasn't opened for editing, the design can't be kept in its files" +msgstr "Sceneria nie została otwarta do edycji, projektu nie da się zachować w jej plikach" + +msgid "The design will be removed from " +msgstr "Projekt zostanie usunięty z " + +msgid " on save" +msgstr " przy zapisie" + +msgid "The route of the stored design isn't in the scenery any more (paths moved or removed)" +msgstr "Trasy zapisanego projektu nie ma już w scenerii (odcinki przesunięte lub usunięte)" + +msgid "The path can't carry a profile" +msgstr "Ten odcinek nie może mieć profilu" + +msgid "Grade line recognized from the track: %zu points, largest departure %.3f m" +msgstr "Niweleta rozpoznana z toru: %zu punktów, największa odchyłka %.3f m" + +msgid "Correct the errors to apply the grade line" +msgstr "Popraw błędy, by zastosować niweletę" + +msgid "The grade line can't be applied, " +msgstr "Nie da się zastosować niwelety, " + +msgid "Grade line applied: %zu paths changed, %zu added, largest departure %.3f m" +msgstr "Niweleta zastosowana: zmieniono %zu odcinków, dodano %zu, największa odchyłka %.3f m" + +msgid "Design kept in %s%s" +msgstr "Projekt zachowany w %s%s" + +msgid ", changes go there on save" +msgstr ", zmiany trafią tam przy zapisie" + +msgid "Forget the design" +msgstr "Porzuć projekt" + +msgid "The design goes to the scenery file of the route on save" +msgstr "Projekt trafi przy zapisie do pliku scenerii z tą trasą" + +msgid "Designs kept in the scenery (%zu)" +msgstr "Projekty zachowane w scenerii (%zu)" + +msgid "Open" +msgstr "Otwórz" + +msgid "%s %.1f m, %zu points, from (%.1f, %.1f) to (%.1f, %.1f)" +msgstr "%s %.1f m, %zu punktów, od (%.1f, %.1f) do (%.1f, %.1f)" + +msgid " auto" +msgstr " auto" + +msgid "Select a track first" +msgstr "Najpierw zaznacz tor" + +msgid "%zu paths checked, %d with the speed above what the geometry allows, %d switch branch warnings" +msgstr "Sprawdzono %zu odcinków, %d z prędkością ponad dopuszczalną przez geometrię, %d ostrzeżeń dla torów zwrotnych" + +msgid "Nothing changed" +msgstr "Nic się nie zmieniło" + +msgid "Speed limits of %zu paths lowered to the safe ones, Ctrl+Z brings them back" +msgstr "Obniżono ograniczenia %zu odcinków do bezpiecznych, Ctrl+Z je przywraca" + +msgid "Speed limits of the paths against the speed their geometry allows:\nradius and cant, cant ramps, curves without the transitions, switch branches" +msgstr "Ograniczenia prędkości odcinków wobec prędkości dopuszczalnej przez geometrię:\npromień i przechyłka, rampy przechyłkowe, łuki bez przejściowych, tory zwrotne" + +msgid "Line through the selected path" +msgstr "Linia przez zaznaczony odcinek" + +msgid "Whole scenery" +msgstr "Cała sceneria" + +msgid "Checking %zu / %zu" +msgstr "Sprawdzanie %zu / %zu" + +msgid "Cancel" +msgstr "Anuluj" + +msgid "Check" +msgstr "Sprawdź" + +msgid "Switch branches (m/s2)" +msgstr "Tory zwrotne (m/s2)" + +msgid "Unbalanced acceleration allowed on the diverging tracks of the switches, which have no cant.\n0.65 m/s2 gives 40 km/h for R 190 m and 100 km/h for R 1200 m" +msgstr "Dopuszczalne przyspieszenie niezrównoważone na torach zwrotnych rozjazdów, które nie mają przechyłki.\n0,65 m/s2 daje 40 km/h dla R 190 m i 100 km/h dla R 1200 m" + +msgid "Reference length (m)" +msgstr "Długość odniesienia (m)" + +msgid "Length over which an abrupt change of the curvature or the cant is felt,\nabout the length of a car. Shorter: stricter for the curves without the transitions" +msgstr "Długość, na której odczuwa się nagłą zmianę krzywizny lub przechyłki,\nmniej więcej długość wagonu. Krótsza: surowiej dla łuków bez przejściowych" + +msgid "Change the limits, then Check again" +msgstr "Zmień normy i sprawdź ponownie" + +msgid "The scenery changed since the check" +msgstr "Sceneria zmieniła się od sprawdzenia" + +msgid "Paths without a speed limit of their own run at the line speed,\nthose are listed whenever the geometry limits the speed at all" +msgstr "Odcinki bez własnego ograniczenia jadą z prędkością linii,\nsą wypisywane, gdy tylko geometria w ogóle ogranicza prędkość" + +msgid "Within their limits too" +msgstr "Także mieszczące się w ograniczeniu" + +msgid "Set the safe speed on %zu paths" +msgstr "Ustaw bezpieczną prędkość na %zu odcinkach" + +msgid "Lowers the speed limit of each listed path to its safe speed, rounded down to 10 km/h (5 km/h below 40).\nThe limits of the switch branches are only warnings and aren't applied here, the button of a single path does.\nA switch has one velocity for both its tracks: negative limits only the diverging one, the main one keeping no limit.\nWhen the main track needs a limit of its own, the lower of the two applies to both" +msgstr "Obniża ograniczenie każdego wypisanego odcinka do bezpiecznej prędkości, zaokrąglonej w dół do 10 km/h (5 km/h poniżej 40).\nOgraniczenia torów zwrotnych są tylko ostrzeżeniami i nie są tu stosowane, robi to przycisk pojedynczego odcinka.\nRozjazd ma jedną prędkość dla obu torów: ujemna ogranicza tylko zwrotny, zasadniczy zostaje bez ograniczenia.\nGdy tor zasadniczy potrzebuje własnego ograniczenia, niższe z dwóch obowiązuje oba" + +msgid "any" +msgstr "dowolna" + +msgid "Set the safe speed on this path" +msgstr "Ustaw bezpieczną prędkość na tym odcinku" + +msgid "Set" +msgstr "Ustaw" + +msgid "Open the vertical profile of a route first" +msgstr "Najpierw otwórz profil podłużny trasy" + +msgid "The scenery has no paths the editor can handle" +msgstr "Sceneria nie ma odcinków obsługiwanych przez edytor" + +msgid "Select a path first" +msgstr "Najpierw zaznacz odcinek" + +msgid "%d object(s) found along %d path(s)" +msgstr "Znaleziono obiektów: %d wzdłuż odcinków: %d" + +msgid "%d object(s) bound, they follow the changes of the track. The bindings are kept in the scenery files on save" +msgstr "Powiązano obiektów: %d, podążają za zmianami toru. Powiązania są zapisywane w plikach scenerii" + +msgid "Bound objects follow the changes of the track" +msgstr "Powiązane obiekty podążają za zmianami toru" + +msgid "Bound objects keep their chainage along the path, the offset from its axis and the height above the rail top;\nmodels and includes turn with the path and stay upright. The move is a part of the undo step of the change." +msgstr "Powiązane obiekty zachowują kilometraż wzdłuż odcinka, odsunięcie od osi i wysokość nad główką szyny;\nmodele i include obracają się z odcinkiem i zostają pionowo. Przesunięcie jest częścią kroku cofania zmiany." + +msgid "Show in 3D" +msgstr "Pokaż w 3D" + +msgid "Objects bound in the scenery: %d" +msgstr "Obiekty powiązane w scenerii: %d" + +msgid "(%d stored binding(s) not found, kept as they are)" +msgstr "(nie znaleziono zapisanych powiązań: %d, zostają bez zmian)" + +msgid "Reach each way, m" +msgstr "Zasięg w każdą stronę, m" + +msgid "Corridor each side of the axis, m" +msgstr "Pas z każdej strony osi, m" + +msgid "Rules for names of the files" +msgstr "Reguły dla nazw plików" + +msgid "Parts of the names, separated by spaces; the first rule which matches decides" +msgstr "Fragmenty nazw rozdzielone spacjami; decyduje pierwsza pasująca reguła" + +msgid "Default rules" +msgstr "Reguły domyślne" + +msgid "Includes are matched by the template name and its //$e description, models by the file and node name;\ntraction is always the catenary, memory cells and event launchers the logic" +msgstr "Include są dopasowywane po nazwie szablonu i opisie //$e, modele po nazwie pliku i węzła;\ntraction to zawsze sieć, komórki pamięci i wyzwalacze zdarzeń to logika" + +msgid "Find objects" +msgstr "Znajdź obiekty" + +msgid "Bind the chosen (%d)" +msgstr "Powiąż wybrane (%d)" + +msgid "All" +msgstr "Wszystkie" + +msgid "None" +msgstr "Żadne" + +msgid "all##g" +msgstr "wszystkie##g" + +msgid "none##g" +msgstr "żadne##g" + +msgid "[bound]" +msgstr "[powiązany]" + +msgid "%s, %s\n%.2f m %s of the axis, %.2f m above the rail top\n%s" +msgstr "%s, %s\n%.2f m %s od osi, %.2f m nad główką szyny\n%s" + +msgid "Bound objects along the scope" +msgstr "Powiązane obiekty w zasięgu" + +msgid "%d of %d" +msgstr "%d z %d" + +msgid "Unbind all of these" +msgstr "Odwiąż wszystkie te" + +msgid "unbind" +msgstr "odwiąż" + +msgid " (no path to follow)" +msgstr " (brak odcinka do śledzenia)" + +msgid "Selected path" +msgstr "Zaznaczony odcinek" + +msgid "Half-width" +msgstr "Półszerokość" + +msgid "Height" +msgstr "Wysokość" + +msgid "Insert a point after this one" +msgstr "Wstaw punkt po tym" + +msgid "Show along the selected path" +msgstr "Pokaż wzdłuż zaznaczonego odcinka" + +msgid "Translucent tunnel of the gauge 500 m each way along the line of the selected path.\nWidened in the curves under 250 m and tilted on the cant, from 20 m (inner side)\nand 26 m (outer side) ahead of the curve, as in the PKP PLK standard, volume II." +msgstr "Półprzezroczysty tunel skrajni 500 m w każdą stronę wzdłuż linii zaznaczonego odcinka.\nPoszerzony w łukach poniżej 250 m i pochylony na przechyłce, od 20 m (strona wewnętrzna)\ni 26 m (strona zewnętrzna) przed łukiem, jak w standardzie PKP PLK, tom II." + +msgid "GPL: unified structure gauge, widened only in the curves under 250 m.\nG1, G2, GA, GB, GC: limit (GSZ) and nominal (NSZ) installation gauges, widened by 3750/R in all curves." +msgstr "GPL: ujednolicona skrajnia budowli, poszerzana tylko w łukach poniżej 250 m.\nG1, G2, GA, GB, GC: graniczne (GSZ) i nominalne (NSZ) skrajnie instalacyjne, poszerzane o 3750/R we wszystkich łukach." + +msgid "Clearance over the roads, from 0.5 m beyond the edges of the carriageway" +msgstr "Skrajnia nad drogami, od 0,5 m poza krawędziami jezdni" + +msgid "Stops the scan and keeps the models found so far" +msgstr "Przerywa skanowanie i zachowuje znalezione dotąd modele" + +msgid "Find the violations on the whole map" +msgstr "Znajdź naruszenia na całej mapie" + +msgid "Checks the models along all tracks of the scenery against the chosen gauge\nand lists them, the deepest first.\nRuns in the background, the list fills up as it goes" +msgstr "Sprawdza modele wzdłuż wszystkich torów scenerii względem wybranej skrajni\ni wypisuje je, najgłębsze najpierw.\nDziała w tle, lista zapełnia się na bieżąco" + +msgid "The scenery changed since the scan (%s)" +msgstr "Sceneria zmieniła się od skanowania (%s)" + +msgid "No model enters the gauge on the map" +msgstr "Żaden model nie wchodzi w skrajnię na mapie" + +msgid "The gauge is clear along this line" +msgstr "Skrajnia na tej linii jest wolna" + +msgid "%zu models enter the gauge%s" +msgstr "Modeli wchodzących w skrajnię: %zu%s" + +msgid " on the map" +msgstr " na mapie" + +msgid "none" +msgstr "brak" + +msgid "Outline of %s (right half)" +msgstr "Obrys %s (prawa połowa)" + +msgid "Metres from the edge of the carriageway and above the road, bottom up." +msgstr "Metry od krawędzi jezdni i nad drogą, od dołu." + +msgid "Restore the starting outlines" +msgstr "Przywróć obrysy początkowe" + +msgid "Edit" +msgstr "Edycja" + +msgid "Analysis" +msgstr "Analiza" + + +msgid "The adjoining straights can't be cut at the ends of the curve: the start misses by %.1f m, the end by %.1f m" +msgstr "Nie da się przyciąć przyległych prostych na końcach łuku: początek chybia o %.1f m, koniec o %.1f m" + +msgid "No curve here: LMB on a curve" +msgstr "Tu nie ma łuku: LPM na łuku" + +msgid "LMB on a curve" +msgstr "LPM na łuku" + +msgid "loads it with the straights at its ends" +msgstr "wczytuje go razem z prostymi na końcach" + +msgid "Curve %d of the S-curve" +msgstr "Łuk %d esownicy" + +msgid "Details" +msgstr "Szczegóły" + diff --git a/utilities/translation.cpp b/utilities/translation.cpp index 0885ab7c9..b1db12275 100644 --- a/utilities/translation.cpp +++ b/utilities/translation.cpp @@ -30,6 +30,11 @@ void locale::init() while (parse_translation(stream)); + // texts of the scenery editor, kept apart from the translation of the simulator + std::fstream editor("lang/editor_" + Global.asLang + ".po", std::ios_base::in | std::ios_base::binary); + if (editor.is_open()) + while (parse_translation(editor)); + WriteLog("translation: " + std::to_string(lang_mapping.size()) + " strings loaded"); } From 3731520e332162fcc2d7a7308b6db7cbd51afbe3 Mon Sep 17 00:00:00 2001 From: maj00r Date: Mon, 5 Oct 2026 01:21:11 +0200 Subject: [PATCH 125/430] feat(tracks): track editor in one movable Tracks window with exclusive modes, a guide of what can be done in the current step and the rarely used fields folded; vertical profile window with the ground of the scenery triangles; plain pieces added at a free end, freehand only on request; curve mode edits the single curve clicked --- CMakeLists.txt | 2 + application/editormode.cpp | 70 +- application/editormode.h | 131 +- application/editormodegauge.cpp | 43 +- application/editormodeinfra.cpp | 72 +- application/editormodeprofile.cpp | 533 +++++-- application/editormoderoad.cpp | 3 +- application/editormodespeed.cpp | 382 +++++ application/editormodetrack.cpp | 2413 +++++++++++++++++++++-------- application/editoruilayer.cpp | 24 +- application/editoruilayer.h | 14 +- application/editoruipanels.cpp | 5 +- application/editoruipanels.h | 1 + 13 files changed, 2769 insertions(+), 924 deletions(-) create mode 100644 application/editormodespeed.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index e403fd2ec..d66759c73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -175,6 +175,7 @@ set(SOURCES "editor/editorTrack.cpp" "editor/editorRoad.cpp" "editor/editorAlignment.cpp" +"editor/editorSpeed.cpp" "editor/editorProfile.cpp" "editor/editorGauge.cpp" "editor/editorInfra.cpp" @@ -186,6 +187,7 @@ set(SOURCES "application/editormodeprofile.cpp" "application/editormodegauge.cpp" "application/editormodeinfra.cpp" +"application/editormodespeed.cpp" "input/editormouseinput.cpp" "application/editoruilayer.cpp" "application/editoruipanels.cpp" diff --git a/application/editormode.cpp b/application/editormode.cpp index 002afb93e..d25788808 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -475,10 +475,9 @@ editor_mode::editor_mode() { ui()->set_fill_options([this]() { render_area_fill(); }); ui()->set_gizmo_options([this]() { render_gizmo_options(); }); ui()->set_file_actions([this]() { save(); }, [this]() { export_scenery(); }); - ui()->set_track_options([this]() { render_track_ui(); }); - ui()->set_gauge_window(&m_gauge.open); ui()->set_menu_options([this]() { render_object_menu(); + render_track_menu(); render_road_menu(); }); m_roadtool.settings.normalize(); @@ -496,10 +495,12 @@ editor_mode::~editor_mode() editor_track::observe(nullptr); } -std::vector editor_mode::ground_heights(std::vector const &Points, bool const Fresh) +std::vector editor_mode::ground_heights(std::vector const &Points, bool const Fresh, std::vector *Found) { std::vector heights; heights.reserve(Points.size()); + if (Found != nullptr) + Found->assign(Points.size(), 0); for (auto const &point : Points) heights.push_back(point.y); if (Points.empty() || simulation::Region == nullptr) @@ -548,6 +549,8 @@ std::vector editor_mode::ground_heights(std::vector const &P } if (found) heights[i] = y; + if (Found != nullptr) + (*Found)[i] = found ? 1 : 0; } // the tiles left alone the longest go once there are too many while (ground_tiles.size() > ground_tile_limit) @@ -1241,6 +1244,7 @@ bool editor_mode::update() // --- ImGuizmo: in-viewport transform gizmo for the selected node --- render_gizmo(); + render_track_inspector(); if (selected_track()) draw_track_overlay(); if (route_active()) @@ -1251,12 +1255,11 @@ bool editor_mode::update() { update_build_tools(); draw_build_overlay(); + speed_step(); draw_track_hints(); - render_track_window(); draw_profile_overlay(); - render_profile_window(); draw_infra_overlay(); - render_infra_window(); + draw_speed_overlay(); } update_gauge(); render_gauge_window(); @@ -2647,7 +2650,11 @@ void editor_mode::render_gizmo() if (selected_track()) { - render_track_gizmo(); + // in the track modes the whole path is moved only while selecting, or the switch in its mode + if (ui()->mode() != nodebank_panel::TRACK || m_track_tab == track_tab::path || m_track_tab == track_tab::turnout) + render_track_gizmo(); + else + m_track_gizmo_using = false; return; } @@ -3010,6 +3017,8 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in if (!anyModifier && is_press(Action) && m_input.mouse.button(GLFW_MOUSE_BUTTON_RIGHT) != GLFW_PRESS) { + if (ui()->mode() == nodebank_panel::TRACK && false == m_track_gizmo_using && false == m_straights.dragging && false == m_switch.placing && track_shortcut(Key)) + return; bool handled = true; switch (Key) { @@ -3039,7 +3048,9 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in if (Action == GLFW_RELEASE) return; - // shortcuts: undo/redo + // shortcuts: undo/redo. not in the middle of a drag, it would go on from the state which was undone + if (Global.ctrlState && (Key == GLFW_KEY_Z || Key == GLFW_KEY_Y) && is_press(Action) && (m_track_gizmo_using || m_straights.dragging || m_extend.active || m_switch.placing)) + return; if (Global.ctrlState && Key == GLFW_KEY_Z && is_press(Action)) { undo_last(); @@ -3127,14 +3138,18 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in { road_cancel(); } + // the first Esc drops what is going on in the track mode, the next one goes back to the selection if (is_press(Action) && ui()->mode() == nodebank_panel::TRACK) { - m_track_point = {}; - m_route.vertex = -1; - m_straights.handle = -1; - m_route.grip = -1; - m_straights.tool_placed = false; - m_straights.detour.clear(); + if (m_lay.active && false == m_lay.points.empty()) + lay_cancel(); + else if (track_busy()) + { + cancel_track_tools(); + m_straights.tool = 0; + } + else + show_track_tab(track_tab::path); } break; @@ -3142,6 +3157,18 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in // area fill: remove the last outline point if (is_press(Action) && ui()->mode() == nodebank_panel::FILL && !m_fill_points.empty()) m_fill_points.pop_back(); + if (is_press(Action) && ui()->mode() == nodebank_panel::TRACK && m_lay.active && !m_lay.points.empty()) + { + m_lay.points.pop_back(); + if (m_lay.points.empty()) + m_lay.start = {}; + } + break; + + case GLFW_KEY_ENTER: + case GLFW_KEY_KP_ENTER: + if (is_press(Action) && ui()->mode() == nodebank_panel::TRACK && m_lay.active) + lay_finish({}); break; case GLFW_KEY_K: @@ -3221,8 +3248,8 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const return; } - // with the road window open the left button works its tools, whichever edit mode is on - if (m_roadtool.window && Button == GLFW_MOUSE_BUTTON_LEFT) + // with the road window open the left button works its tools, whichever edit mode is on but the track one + if (m_roadtool.window && Button == GLFW_MOUSE_BUTTON_LEFT && ui()->mode() != nodebank_panel::TRACK) { if (is_press(Action)) { @@ -3261,12 +3288,21 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const if (mode == nodebank_panel::TRACK) { + if (m_lay.active) + { + GfxRenderer->Pick_Node_Callback([this](scene::basic_node * /*node*/) { + if (viewport_click()) + lay_click(); + }); + m_input.mouse.button(Button, Action); + return; + } if (start_extend() || start_switch_placement()) { m_input.mouse.button(Button, Action); return; } - if ((Mods & GLFW_MOD_ALT) != 0) + if ((Mods & GLFW_MOD_ALT) != 0 && m_track_tab == track_tab::straights) { GfxRenderer->Pick_Node_Callback([this](scene::basic_node *node) { if (viewport_click() && dynamic_cast(node) != nullptr) diff --git a/application/editormode.h b/application/editormode.h index 141ef58bc..f7c5c11f5 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -21,6 +21,7 @@ http://mozilla.org/MPL/2.0/. #include "editor/editorOrthophoto.hpp" #include "editor/editorTrack.hpp" #include "editor/editorAlignment.hpp" +#include "editor/editorSpeed.hpp" #include "editor/editorRoad.hpp" #include "editor/editorProfile.hpp" #include "editor/editorInfra.hpp" @@ -103,6 +104,7 @@ class editor_mode : public application_mode, private editor_track::observer bool picking; }; + struct stored_profile; struct EditorSnapshot { enum class Action { Move, Rotate, Scale, Add, Delete, TrackEdit, Other, RoadEdit }; @@ -123,6 +125,8 @@ class editor_mode : public application_mode, private editor_track::observer std::vector removed; editor_road::record roads; // what a change of the roads comes to std::vector infra; // objects which followed the paths + bool profiles{false}; // the stored grade line designs changed too, these were the ones before + std::vector profile_library; }; void push_snapshot(scene::basic_node *node, EditorSnapshot::Action Action = EditorSnapshot::Action::Move, std::string const &Serialized = std::string()); @@ -300,19 +304,22 @@ class editor_mode : public application_mode, private editor_track::observer float m_gizmo_snap{1.0f}; // translation snap step (metres) applied while Ctrl is held TTrack *selected_track() const; - void render_track_ui(); void render_path_ui(); void draw_track_overlay() const; bool pick_track_handle(); void select_track(scene::basic_node *Node); void render_track_gizmo(); void commit_track_drag(bool const Force); + void cancel_track_tools(); void push_track_snapshot(std::vector> States, std::vector Created = {}, std::vector Removed = {}); + // false, with the reason, when one of the paths can't be changed, its file not taking the changes back + static bool tracks_editable(std::vector const &Tracks, std::string &Reason); void trim_history(); void restore_track_snapshot(EditorSnapshot const &Snapshot, std::vector &Opposite, bool const Undo); editor_track::point_ref m_track_point; std::vector m_track_drag; std::vector> m_track_drag_points; + std::vector m_track_joints; // of the neighbours, following the whole track dragged editor_track::snap_target m_track_snap; glm::dvec3 m_track_pivot{0.0}; glm::mat4 m_track_gizmo{1.0f}; @@ -322,6 +329,15 @@ class editor_mode : public application_mode, private editor_track::observer editor_track::state m_track_field_before; std::array, 3> m_track_materials{}; std::array m_track_material_edited{}; // path whose texture name is being typed + // typed names of the track circuits, the sleeper model and its skin, and the event to add, for the path + TTrack const *m_track_names_for{nullptr}; + std::array m_track_isolated{}; + std::array m_track_sleeper_model{}; + std::array m_track_sleeper_skin{}; + std::array m_track_event{}; + int m_track_event_list{0}; + std::string m_track_events_missing; + void render_path_circuits(TTrack &Track); std::string m_track_mode_notice; // structure gauge along the line of the selected path, shown in the 3d view struct gauge_state @@ -383,9 +399,9 @@ class editor_mode : public application_mode, private editor_track::observer alignment::result result; int vertex{-1}; int grip{-1}; + bool single{true}; // one curve between its straights, instead of the whole line }; void render_route_ui(); - void render_route_ends(); bool render_route_parameters(); bool render_route_vertices(); bool render_route_vertex(int const Index); @@ -393,8 +409,12 @@ class editor_mode : public application_mode, private editor_track::observer void route_reset(); void route_bind_ends(); bool route_from_curve(TTrack &Track); + bool route_from_line(TTrack &Track); + alignment::vertex route_vertex_of(editor_track::curve const &Curve) const; + bool route_load(TTrack &Track) { return m_route.single ? route_from_curve(Track) : route_from_line(Track); } void route_update() { m_route.result = alignment::compute(m_route.design); } void route_apply(); + bool route_relay_through_switches(editor_track::chain const &Chain, std::vector> &States, std::vector &Created); void route_recommend(alignment::vertex &Vertex) const; void draw_route_overlay() const; bool pick_route_vertex(); @@ -489,11 +509,13 @@ class editor_mode : public application_mode, private editor_track::observer std::vector templates; bool collected{false}; int armed{-1}; + int last{0}; // template armed the last time bool placing{false}; double along{0.0}; glm::dvec3 point{0.0}; glm::dvec3 mouse{0.0}; editor_track::straight line; + std::string status; }; switch_tool m_switch; int m_turnout_template{0}; @@ -509,6 +531,31 @@ class editor_mode : public application_mode, private editor_track::observer bool atend{true}; }; extend_tool m_extend; + // lays new track through the clicked points, with no path needed to start from + struct lay_tool + { + bool active{false}; + std::vector points; + editor_track::snap_target start; // free end the track starts from, if any + glm::dvec3 mouse{0.0}; + editor_track::snap_target mouse_snap; + std::vector preview; + std::string preview_error; + double preview_length{0.0}; + double radius{500.0}; + bool transitions{true}; + double piece_length{100.0}; + bool copy_selected{false}; + editor_track::path_style style; + std::string status; + }; + lay_tool m_lay; + void render_lay_ui(); + void render_lay_status(); + void lay_click(); + void lay_finish(editor_track::snap_target const &End); + void lay_cancel(); + std::vector lay_pieces(std::vector const &Points, editor_track::snap_target const &End, double &Length, std::string &Error) const; void render_switch_ui(); bool start_switch_placement(); void finish_switch_placement(); @@ -538,17 +585,44 @@ class editor_mode : public application_mode, private editor_track::observer bool start_extend(); void finish_extend(); std::vector extend_pieces() const; + // the free end of the path as the start of a new track; false if it isn't free or has no direction + static bool free_end(TTrack &Track, int const Path, bool const Atend, extend_tool &Tool); + // the free end new pieces are added at: the selected point if it's one, else the end, else the start + bool chosen_free_end(extend_tool &Tool); + // adds a straight (Side 0) or a curve to the left (1) or the right (-1) at the free end of the selected track + void extend_add(int const Side); + void render_extend_ui(); + bool m_extend_freehand{false}; // dragging the ring of a free end draws a curve through the cursor, not a straight + double m_extend_length{25.0}; + double m_extend_radius{300.0}; bool extend_snap(editor_track::snap_target &Target) const; void update_build_tools(); void draw_build_overlay() const; - enum class track_tab { straights, route, path, turnout }; + // modes of the track editor, one at a time: path is the plain selection + enum class track_tab { straights, route, path, turnout, profile, speed, infra, lay }; + struct track_mode + { + char const *label; + char const *key; + track_tab tab; + char const *tooltip; + }; + static std::array const &track_modes(); + void render_track_menu(); + void arm_switch(); bool m_track_window_open{false}; - void render_track_window(); - void render_track_modes(TTrack &Track); + // the inspector is pinned to the right edge of the screen, the profile strip to the bottom one, both resized from the inner edge + void render_track_inspector(); + void render_track_modes(TTrack *Track); + void show_track_tab(track_tab const Tab); + bool track_analysis_tab() const { return m_track_tab == track_tab::profile || m_track_tab == track_tab::speed || m_track_tab == track_tab::infra; } + bool track_shortcut(int const Key); + bool track_busy() const; // something going on in the mode, which Esc drops before it leaves the mode + std::string track_mode_name() const; void render_turnout_ui(); void render_path_parameters(TTrack &Track); void render_straight_ui(); - track_tab m_track_tab{track_tab::straights}; + track_tab m_track_tab{track_tab::path}; void delete_selected_track(); void start_straight_gesture(int const Tool); void finish_straight_gesture(); @@ -558,7 +632,8 @@ class editor_mode : public application_mode, private editor_track::observer char const *key; std::string action; }; - std::vector track_key_hints() const; + std::vector track_key_hints(bool const All) const; + void render_track_guide(); std::string track_readout() const; void draw_track_hints(); bool m_route_tab{true}; @@ -593,6 +668,11 @@ class editor_mode : public application_mode, private editor_track::observer bool panning{false}; bool changed{false}; double hover{-1.0}; + // under the cursor in the strip + int hover_point{-1}; + int hover_grip{-1}; + bool hover_line{false}; + int shown{-2}; // point in the side panel std::string status; std::string error; }; @@ -616,7 +696,10 @@ class editor_mode : public application_mode, private editor_track::observer void profile_forget(); void profile_open_stored(std::size_t const Index); void profile_edited(); - void render_profile_window(); + void render_profile_body(); + void render_profile_strip(); + void render_profile_toolbar(); + void render_profile_points(); void render_profile_source(); bool render_profile_parameters(); void render_profile_issues(); @@ -630,7 +713,7 @@ class editor_mode : public application_mode, private editor_track::observer void profile_fit_view(); void profile_after_undo(); struct profile_view; - void render_profile_canvas(); + void render_profile_canvas(float const Height); void profile_fit_exaggeration(profile_view const &View); void profile_navigate(profile_view const &View, bool const Hovered); bool profile_canvas_edit(profile_view const &View, bool const Hovered); @@ -687,7 +770,32 @@ class editor_mode : public application_mode, private editor_track::observer void track_split(TTrack &Original, TTrack &Created, segment_data const &First) override; void infra_move(infra::binding &Binding); void infra_attach(EditorSnapshot &Snapshot); - void render_infra_window(); + void render_infra_body(); + + // speed limits of the paths checked against what their geometry allows + struct speed_state + { + bool open{false}; + int scope{0}; // 0: the line through the selected path, 1: the whole scenery + speed_check::options options; + std::vector> queue; + std::size_t next{0}; + std::vector results; + bool show_all{false}; + int limits{0}; // 0: all the paths, 1: only those with a speed limit set, 2: only those without + int selected{-1}; + std::size_t history{0}; // size of the undo history at the check + std::string status; + }; + speed_state m_speed; + void render_speed_body(); + void speed_start(); + void speed_step(); + void speed_focus(int const Index); + // with Branches the limits of the switch branches count too, otherwise they're only warnings + void speed_apply(std::vector const &Indices, bool const Branches); + std::vector speed_listed() const; + void draw_speed_overlay() const; void infra_rebase(); void render_infra_search(); void render_infra_candidates(); @@ -811,7 +919,8 @@ class editor_mode : public application_mode, private editor_track::observer // Firstgrade, Lastgrade: slopes the road has to start and end with, nullptr for none void road_profile(std::vector &Pieces, double const *Firstgrade, double const *Lastgrade, bool const Fresh); // height of the ground under each of the points, with the roads not taken for the ground. a point with nothing under it keeps its height - std::vector ground_heights(std::vector const &Points, bool const Fresh); + // Found: set for the points which have the ground under them + std::vector ground_heights(std::vector const &Points, bool const Fresh, std::vector *Found = nullptr); void push_road_snapshot(editor_road::record Record); void restore_road_snapshot(EditorSnapshot const &Snapshot, std::vector &Opposite, bool const Undo); road_tool m_roadtool; diff --git a/application/editormodegauge.cpp b/application/editormodegauge.cpp index 64ff2e613..16cc864bb 100644 --- a/application/editormodegauge.cpp +++ b/application/editormodegauge.cpp @@ -21,6 +21,7 @@ http://mozilla.org/MPL/2.0/. #include "utilities/Logs.h" #include "world/Track.h" #include "imgui/imgui.h" +#include "utilities/translation.h" #include #include #include @@ -414,12 +415,12 @@ bool edit_points(std::vector &Points) bool edited{false}; bool inserted{false}; int remove{-1}; - ImGui::Columns(3, "gaugeoutline", false); + ImGui::Columns(3, STR_C("gaugeoutline"), false); ImGui::SetColumnWidth(0, 110.0f); ImGui::SetColumnWidth(1, 110.0f); - ImGui::TextDisabled("Half-width"); + ImGui::TextDisabled(STR_C("Half-width")); ImGui::NextColumn(); - ImGui::TextDisabled("Height"); + ImGui::TextDisabled(STR_C("Height")); ImGui::NextColumn(); ImGui::NextColumn(); for (int i = 0; i < static_cast(Points.size()); ++i) @@ -441,7 +442,7 @@ bool edit_points(std::vector &Points) inserted = edited = true; } if (ImGui::IsItemHovered()) - ImGui::SetTooltip("Insert a point after this one"); + ImGui::SetTooltip(STR_C("Insert a point after this one")); ImGui::SameLine(); if (Points.size() > 2 && ImGui::SmallButton("x")) remove = i; @@ -676,48 +677,48 @@ void editor_mode::render_gauge_window() if (false == m_gauge.open) return; ImGui::SetNextWindowSize(ImVec2(380.0f, 420.0f), ImGuiCond_FirstUseEver); - if (false == ImGui::Begin("Structure gauge", &m_gauge.open)) + if (false == ImGui::Begin(STR_C("Structure gauge"), &m_gauge.open)) { ImGui::End(); return; } - if (ImGui::Checkbox("Show along the selected path", &m_gauge.enabled)) + if (ImGui::Checkbox(STR_C("Show along the selected path"), &m_gauge.enabled)) m_gauge.pending = true; if (ImGui::IsItemHovered()) - ImGui::SetTooltip("Translucent tunnel of the gauge 500 m each way along the line of the selected path.\nWidened in the curves under 250 m and tilted on the cant, from 20 m (inner side)\nand 26 m (outer side) ahead of the curve, as in the PKP PLK standard, volume II."); + ImGui::SetTooltip(STR_C("Translucent tunnel of the gauge 500 m each way along the line of the selected path.\nWidened in the curves under 250 m and tilted on the cant, from 20 m (inner side)\nand 26 m (outer side) ahead of the curve, as in the PKP PLK standard, volume II.")); gauge_load(); bool changed{render_gauge_choice("Railway", m_gauge.profile, false)}; if (ImGui::IsItemHovered()) - ImGui::SetTooltip("GPL: unified structure gauge, widened only in the curves under 250 m.\nG1, G2, GA, GB, GC: limit (GSZ) and nominal (NSZ) installation gauges, widened by 3750/R in all curves."); + ImGui::SetTooltip(STR_C("GPL: unified structure gauge, widened only in the curves under 250 m.\nG1, G2, GA, GB, GC: limit (GSZ) and nominal (NSZ) installation gauges, widened by 3750/R in all curves.")); changed |= render_gauge_choice("Road", m_gauge.road, true); if (ImGui::IsItemHovered()) - ImGui::SetTooltip("Clearance over the roads, from 0.5 m beyond the edges of the carriageway"); + ImGui::SetTooltip(STR_C("Clearance over the roads, from 0.5 m beyond the edges of the carriageway")); if (m_gauge.scan) { auto const label{format("Scanning the map %.0f%%, %zu found", m_gauge.scan->progress * 100.f, m_gauge.map.hits.size())}; ImGui::ProgressBar(m_gauge.scan->progress, ImVec2(-70.0f, 0.0f), label.c_str()); ImGui::SameLine(); - if (ImGui::SmallButton("Cancel")) + if (ImGui::SmallButton(STR_C("Cancel"))) finish_gauge_map(); if (ImGui::IsItemHovered()) - ImGui::SetTooltip("Stops the scan and keeps the models found so far"); + ImGui::SetTooltip(STR_C("Stops the scan and keeps the models found so far")); } - else if (ImGui::Button("Find the violations on the whole map")) + else if (ImGui::Button(STR_C("Find the violations on the whole map"))) scan_gauge_map(); else if (ImGui::IsItemHovered()) - ImGui::SetTooltip("Checks the models along all tracks of the scenery against the chosen gauge\nand lists them, the deepest first.\nRuns in the background, the list fills up as it goes"); + ImGui::SetTooltip(STR_C("Checks the models along all tracks of the scenery against the chosen gauge\nand lists them, the deepest first.\nRuns in the background, the list fills up as it goes")); if (m_gauge.map.scanned && false == static_cast(m_gauge.scan)) { ImGui::SameLine(); - if (ImGui::SmallButton("Clear")) + if (ImGui::SmallButton(STR_C("Clear"))) { m_gauge.map = {}; m_gauge.current = -1; m_gauge.published = false; } else if (m_gauge.map.history != m_history.size()) - ImGui::TextColored(ImVec4(1.0f, 0.75f, 0.3f, 1.0f), "The scenery changed since the scan (%s)", m_gauge.map.profile.c_str()); + ImGui::TextColored(ImVec4(1.0f, 0.75f, 0.3f, 1.0f), STR_C("The scenery changed since the scan (%s)"), m_gauge.map.profile.c_str()); } render_gauge_hits(); changed |= render_gauge_outline(m_gauge.profile); @@ -734,10 +735,10 @@ void editor_mode::render_gauge_hits() return; if (hits.empty()) { - ImGui::TextDisabled(m_gauge.map.scanned ? "No model enters the gauge on the map" : "The gauge is clear along this line"); + ImGui::TextDisabled(m_gauge.map.scanned ? STR_C("No model enters the gauge on the map") : STR_C("The gauge is clear along this line")); return; } - ImGui::TextColored(ImVec4(1.0f, 0.35f, 0.3f, 1.0f), "%zu models enter the gauge%s", hits.size(), m_gauge.map.scanned ? " on the map" : ""); + ImGui::TextColored(ImVec4(1.0f, 0.35f, 0.3f, 1.0f), STR_C("%zu models enter the gauge%s"), hits.size(), m_gauge.map.scanned ? STR_C(" on the map") : ""); if (ImGui::ArrowButton("##gaugeprevious", ImGuiDir_Left)) gauge_focus(m_gauge.current - 1); ImGui::SameLine(); @@ -762,7 +763,7 @@ bool editor_mode::render_gauge_choice(char const *Label, int &Index, bool const { bool changed{false}; ImGui::SetNextItemWidth(-60.0f); - if (ImGui::BeginCombo(Label, Index >= 0 ? m_gauge.profiles[Index].name.c_str() : "none")) + if (ImGui::BeginCombo(Label, Index >= 0 ? m_gauge.profiles[Index].name.c_str() : STR_C("none"))) { for (int i = 0; i < static_cast(m_gauge.profiles.size()); ++i) if ((m_gauge.profiles[i].kind == gauge::kind::road) == Road && ImGui::Selectable(m_gauge.profiles[i].name.c_str(), i == Index)) @@ -780,12 +781,12 @@ bool editor_mode::render_gauge_outline(int const Index) if (Index < 0) return false; auto &profile{m_gauge.profiles[Index]}; - if (false == ImGui::TreeNode(&profile, "Outline of %s (right half)", profile.name.c_str())) + if (false == ImGui::TreeNode(&profile, STR_C("Outline of %s (right half)"), profile.name.c_str())) return false; - ImGui::TextDisabled(profile.kind == gauge::kind::road ? "Metres from the edge of the carriageway and above the road, bottom up." + ImGui::TextDisabled(profile.kind == gauge::kind::road ? STR_C("Metres from the edge of the carriageway and above the road, bottom up.") : "PKP PLK standard, volume II; below 1170 mm the limit installation gauge.\nMetres from the track axis and above the rail top, bottom up."); bool edited{edit_points(profile.outline)}; - if (ImGui::SmallButton("Restore the starting outlines")) + if (ImGui::SmallButton(STR_C("Restore the starting outlines"))) { m_gauge.profiles = gauge::default_profiles(); gauge_load(); diff --git a/application/editormodeinfra.cpp b/application/editormodeinfra.cpp index ba3213ff4..00e6a60a5 100644 --- a/application/editormodeinfra.cpp +++ b/application/editormodeinfra.cpp @@ -27,6 +27,7 @@ http://mozilla.org/MPL/2.0/. #include "world/Traction.h" #include "imgui/imgui.h" +#include "utilities/translation.h" #include #include #include @@ -707,7 +708,7 @@ void editor_mode::infra_recognize() state.tracks = infra_scope(); if (state.tracks.empty()) { - state.error = (state.scope == 2 ? "Open the vertical profile of a route first" : state.scope == 3 ? "The scenery has no paths the editor can handle" : "Select a path first"); + state.error = (state.scope == 2 ? STR_C("Open the vertical profile of a route first") : state.scope == 3 ? STR_C("The scenery has no paths the editor can handle") : STR_C("Select a path first")); return; } track_index index; @@ -803,7 +804,7 @@ void editor_mode::infra_recognize() add(binding, "nearby", corridor); } std::stable_sort(state.candidates.begin(), state.candidates.end(), [](infra_candidate const &A, infra_candidate const &B) { return A.binding.group < B.binding.group; }); - state.status = format("%d object(s) found along %d path(s)", static_cast(state.candidates.size()), static_cast(state.tracks.size())); + state.status = format(STR_C("%d object(s) found along %d path(s)"), static_cast(state.candidates.size()), static_cast(state.tracks.size())); } void editor_mode::infra_bind_chosen() @@ -823,7 +824,7 @@ void editor_mode::infra_bind_chosen() candidate.chosen = false; ++count; } - state.status = format("%d object(s) bound, they follow the changes of the track. The bindings are kept in the scenery files on save", count); + state.status = format(STR_C("%d object(s) bound, they follow the changes of the track. The bindings are kept in the scenery files on save"), count); } void editor_mode::infra_unbind(std::vector Indices) @@ -1108,7 +1109,7 @@ void editor_mode::infra_attach(EditorSnapshot &Snapshot) return true; for (auto const &anchor : State.saved.anchors) { - if (contains(Snapshot.created, anchor.at.track)) + if (contains(Snapshot.created, anchor.at.track) || contains(Snapshot.removed, anchor.at.track)) return true; for (auto const &entry : Snapshot.tracks) if (entry.first == anchor.at.track) @@ -1122,37 +1123,29 @@ void editor_mode::infra_attach(EditorSnapshot &Snapshot) m_infra_buffer.clear(); } -void editor_mode::render_infra_window() +void editor_mode::render_infra_body() { auto &state{m_infra}; - if (false == state.open) - return; - ImGui::SetNextWindowSize(ImVec2(560, 620), ImGuiCond_FirstUseEver); - if (false == ImGui::Begin("Infrastructure along the track###trackinfra", &state.open)) - { - ImGui::End(); - return; - } infra_load(); Live.refresh(); auto follow{state.follow}; - if (ImGui::Checkbox("Bound objects follow the changes of the track", &follow)) + if (ImGui::Checkbox(STR_C("Bound objects follow the changes of the track"), &follow)) { state.follow = follow; if (follow) infra_rebase(); } if (ImGui::IsItemHovered()) - ImGui::SetTooltip("Bound objects keep their chainage along the path, the offset from its axis and the height above the rail top;\n" - "models and includes turn with the path and stay upright. The move is a part of the undo step of the change."); + ImGui::SetTooltip(STR_C("Bound objects keep their chainage along the path, the offset from its axis and the height above the rail top;\n" + "models and includes turn with the path and stay upright. The move is a part of the undo step of the change.")); ImGui::SameLine(); - ImGui::Checkbox("Show in 3D", &state.show); - ImGui::Text("Objects bound in the scenery: %d", static_cast(m_bindings.size())); + ImGui::Checkbox(STR_C("Show in 3D"), &state.show); + ImGui::Text(STR_C("Objects bound in the scenery: %d"), static_cast(m_bindings.size())); if (false == m_bindings_unresolved.empty()) { ImGui::SameLine(); - ImGui::TextColored(ImVec4(1.f, 0.8f, 0.3f, 1.f), "(%d stored binding(s) not found, kept as they are)", static_cast(m_bindings_unresolved.size())); + ImGui::TextColored(ImVec4(1.f, 0.8f, 0.3f, 1.f), STR_C("(%d stored binding(s) not found, kept as they are)"), static_cast(m_bindings_unresolved.size())); } ImGui::Separator(); @@ -1163,7 +1156,6 @@ void editor_mode::render_infra_window() ImGui::TextColored(ImVec4(1.f, 0.4f, 0.35f, 1.f), "%s", state.error.c_str()); else if (false == state.status.empty()) ImGui::TextWrapped("%s", state.status.c_str()); - ImGui::End(); } // what changed while the bindings did not follow the track becomes their new starting point @@ -1199,15 +1191,15 @@ void editor_mode::render_infra_search() if (state.scope == 1) { ImGui::SetNextItemWidth(120.f); - ImGui::InputFloat("Reach each way, m", &state.reach, 100.f, 500.f, "%.0f"); + ImGui::InputFloat(STR_C("Reach each way, m"), &state.reach, 100.f, 500.f, "%.0f"); state.reach = std::clamp(state.reach, 10.f, 20000.f); } ImGui::SetNextItemWidth(120.f); - ImGui::InputFloat("Corridor each side of the axis, m", &state.corridor, 0.5f, 2.f, "%.1f"); + ImGui::InputFloat(STR_C("Corridor each side of the axis, m"), &state.corridor, 0.5f, 2.f, "%.1f"); state.corridor = std::clamp(state.corridor, 0.5f, 50.f); - if (ImGui::TreeNode("Rules for names of the files")) + if (ImGui::TreeNode(STR_C("Rules for names of the files"))) { - ImGui::TextDisabled("Parts of the names, separated by spaces; the first rule which matches decides"); + ImGui::TextDisabled(STR_C("Parts of the names, separated by spaces; the first rule which matches decides")); for (std::size_t i = 0; i < state.rules.size(); ++i) { auto &rule{state.rules[i]}; @@ -1217,13 +1209,13 @@ void editor_mode::render_infra_search() if (ImGui::InputText((std::string{infra::name(rule.group)} + "##rule" + std::to_string(i)).c_str(), buffer, sizeof(buffer))) rule.keywords = buffer; } - if (ImGui::SmallButton("Default rules")) + if (ImGui::SmallButton(STR_C("Default rules"))) state.rules = infra::default_rules(); - ImGui::TextDisabled("Includes are matched by the template name and its //$e description, models by the file and node name;\n" - "traction is always the catenary, memory cells and event launchers the logic"); + ImGui::TextDisabled(STR_C("Includes are matched by the template name and its //$e description, models by the file and node name;\n" + "traction is always the catenary, memory cells and event launchers the logic")); ImGui::TreePop(); } - if (ImGui::Button("Find objects")) + if (ImGui::Button(STR_C("Find objects"))) infra_recognize(); } @@ -1244,13 +1236,13 @@ void editor_mode::render_infra_candidates() for (auto const &candidate : candidates) chosen += candidate.chosen ? 1 : 0; ImGui::SameLine(); - if (ImGui::Button(format("Bind the chosen (%d)", chosen).c_str())) + if (ImGui::Button(format(STR_C("Bind the chosen (%d)"), chosen).c_str())) infra_bind_chosen(); ImGui::SameLine(); - if (ImGui::SmallButton("All")) + if (ImGui::SmallButton(STR_C("All"))) choose({}, true); ImGui::SameLine(); - if (ImGui::SmallButton("None")) + if (ImGui::SmallButton(STR_C("None"))) choose({}, false); ImGui::BeginChild("##infracandidates", ImVec2(0.f, 260.f), true); @@ -1263,10 +1255,10 @@ void editor_mode::render_infra_candidates() auto const open{ImGui::TreeNodeEx(format("%s (%d)", infra::name(group), static_cast(count)).c_str(), group == infra::category::other ? 0 : ImGuiTreeNodeFlags_DefaultOpen)}; ImGui::PopStyleColor(); ImGui::SameLine(); - if (ImGui::SmallButton((std::string{"all##g"} + infra::name(group)).c_str())) + if (ImGui::SmallButton((std::string{STR_C("all##g")} + infra::name(group)).c_str())) choose(group, true); ImGui::SameLine(); - if (ImGui::SmallButton((std::string{"none##g"} + infra::name(group)).c_str())) + if (ImGui::SmallButton((std::string{STR_C("none##g")} + infra::name(group)).c_str())) choose(group, false); if (false == open) continue; @@ -1281,7 +1273,7 @@ void editor_mode::render_infra_candidates() ImGui::PushID(static_cast(i)); if (candidate.bound) { - ImGui::TextDisabled("[bound]"); + ImGui::TextDisabled(STR_C("[bound]")); } else { @@ -1292,7 +1284,7 @@ void editor_mode::render_infra_candidates() if (ImGui::IsItemHovered()) { state.hovered = static_cast(i); - ImGui::SetTooltip("%s, %s\n%.2f m %s of the axis, %.2f m above the rail top\n%s", infra::name(candidate.binding.type), candidate.binding.anchors.front().at.track->name().c_str(), + ImGui::SetTooltip(STR_C("%s, %s\n%.2f m %s of the axis, %.2f m above the rail top\n%s"), infra::name(candidate.binding.type), candidate.binding.anchors.front().at.track->name().c_str(), std::abs(candidate.offset), candidate.offset >= 0.0 ? "right" : "left", candidate.binding.anchors.front().height, candidate.reason.c_str()); } ImGui::SameLine(); @@ -1307,7 +1299,7 @@ void editor_mode::render_infra_candidates() void editor_mode::render_infra_bound() { - if (ImGui::TreeNode("Bound objects along the scope")) + if (ImGui::TreeNode(STR_C("Bound objects along the scope"))) { auto const scope{infra_scope()}; std::unordered_set const tracks(scope.begin(), scope.end()); @@ -1315,11 +1307,11 @@ void editor_mode::render_infra_bound() for (std::size_t i = 0; i < m_bindings.size(); ++i) if (std::any_of(m_bindings[i].anchors.begin(), m_bindings[i].anchors.end(), [&](infra::anchor const &Anchor) { return tracks.count(Anchor.at.track) > 0; })) along.push_back(i); - ImGui::Text("%d of %d", static_cast(along.size()), static_cast(m_bindings.size())); + ImGui::Text(STR_C("%d of %d"), static_cast(along.size()), static_cast(m_bindings.size())); if (false == along.empty()) { ImGui::SameLine(); - if (ImGui::SmallButton("Unbind all of these")) + if (ImGui::SmallButton(STR_C("Unbind all of these"))) { infra_unbind(along); along.clear(); @@ -1334,11 +1326,11 @@ void editor_mode::render_infra_bound() auto const index{along[row]}; auto const &binding{m_bindings[index]}; ImGui::PushID(static_cast(index)); - if (ImGui::SmallButton("unbind")) + if (ImGui::SmallButton(STR_C("unbind"))) unbind = index; ImGui::SameLine(); ImGui::PushStyleColor(ImGuiCol_Text, ImGui::ColorConvertU32ToFloat4(binding.lost ? IM_COL32(255, 80, 70, 255) : colour(binding.group))); - ImGui::Text("%s%s", binding.label.c_str(), binding.lost ? " (no path to follow)" : ""); + ImGui::Text("%s%s", binding.label.c_str(), binding.lost ? STR_C(" (no path to follow)") : ""); ImGui::PopStyleColor(); ImGui::PopID(); } diff --git a/application/editormodeprofile.cpp b/application/editormodeprofile.cpp index 43a57374b..f65130dc9 100644 --- a/application/editormodeprofile.cpp +++ b/application/editormodeprofile.cpp @@ -17,6 +17,7 @@ http://mozilla.org/MPL/2.0/. #include "scene/scenelayers.h" #include "simulation/simulation.h" #include "utilities/Logs.h" +#include "utilities/translation.h" #include "imgui/imgui.h" #include @@ -40,6 +41,17 @@ ImU32 const kLabel{IM_COL32(200, 200, 200, 200)}; ImU32 const kSwitch{IM_COL32(160, 100, 220, 45)}; ImU32 const kError{IM_COL32(255, 80, 70, 255)}; ImU32 const kWarning{IM_COL32(255, 200, 60, 255)}; +ImU32 const kPlan{IM_COL32(120, 190, 255, 255)}; +ImU32 const kSwitchLabel{IM_COL32(200, 160, 255, 220)}; +ImU32 const kChip{IM_COL32(14, 15, 19, 210)}; + +// text on a dark plate, readable over the lines of the plot +void plot_label(ImDrawList &Draw, ImVec2 const At, ImU32 const Colour, std::string const &Text) +{ + auto const size{ImGui::CalcTextSize(Text.c_str())}; + Draw.AddRectFilled(ImVec2(At.x - 3.0f, At.y - 1.0f), ImVec2(At.x + size.x + 3.0f, At.y + size.y + 1.0f), kChip, 3.0f); + Draw.AddText(At, Colour, Text.c_str()); +} double nice_step(double const Approximate) { @@ -234,7 +246,7 @@ bool editor_mode::profile_restore() state.selected = -1; state.changed = false; profile_check(); - state.status = "Design read from the scenery file " + scene::Layers.layer(entry.layer).name + format(", largest departure from the track %.3f m", state.departure); + state.status = STR_C("Design read from the scenery file ") + scene::Layers.layer(entry.layer).name + format(STR_C(", largest departure from the track %.3f m"), state.departure); return true; } @@ -245,7 +257,7 @@ void editor_mode::profile_store() return; if (scene::Layers.empty()) { - state.error = "The scenery wasn't opened for editing, the design can't be kept in its files"; + state.error = STR_C("The scenery wasn't opened for editing, the design can't be kept in its files"); return; } profile_library_load(); @@ -291,7 +303,7 @@ void editor_mode::profile_forget() auto const layer{m_profiles[index].layer}; m_profiles.erase(m_profiles.begin() + index); profile_library_mark({layer}); - state.status = "The design will be removed from " + scene::Layers.layer(layer).name + " on save"; + state.status = STR_C("The design will be removed from ") + scene::Layers.layer(layer).name + STR_C(" on save"); } void editor_mode::profile_open_stored(std::size_t const Index) @@ -330,7 +342,7 @@ void editor_mode::profile_open_stored(std::size_t const Index) return; } state.open = true; - state.error = "The route of the stored design isn't in the scenery any more (paths moved or removed)"; + state.error = STR_C("The route of the stored design isn't in the scenery any more (paths moved or removed)"); } void editor_mode::profile_edited() @@ -359,7 +371,7 @@ void editor_mode::profile_open_run(TTrack &Track) auto route{editor_track::run_route(Track, state.run_length)}; if (route.spans.empty()) { - state.error = "The path can't carry a profile"; + state.error = STR_C("The path can't carry a profile"); return; } auto *from{route.spans.front().track}; @@ -386,13 +398,15 @@ void editor_mode::profile_resample() state.samples = editor_track::sample_route(state.route, 1.0); auto const &samples{state.samples}; state.terrain.assign(samples.size(), std::numeric_limits::quiet_NaN()); + std::vector points; + points.reserve(samples.size()); + for (auto const &sample : samples) + points.push_back(sample.position); + std::vector found; + auto const heights{ground_heights(points, true, &found)}; for (std::size_t i = 0; i < samples.size(); ++i) - { - auto const &position{samples[i].position}; - auto *patch{terrain_at(position.x, position.z)}; - if (patch != nullptr && patch->contains(position.x, position.z)) - state.terrain[i] = patch->height_at(position.x, position.z); - } + if (found[i] != 0) + state.terrain[i] = heights[i]; auto &context{state.context}; context = {}; @@ -425,7 +439,7 @@ void editor_mode::profile_recognize() state.line.speed = route_speed(state.route); state.selected = -1; profile_check(); - state.status = format("Grade line recognized from the track: %zu points, largest departure %.3f m", state.line.points.size(), state.departure); + state.status = format(STR_C("Grade line recognized from the track: %zu points, largest departure %.3f m"), state.line.points.size(), state.departure); } void editor_mode::profile_check() @@ -480,7 +494,15 @@ void editor_mode::profile_apply() return; if (has_errors(state.issues)) { - state.error = "Correct the errors to apply the grade line"; + state.error = STR_C("Correct the errors to apply the grade line"); + return; + } + std::vector tracks; + for (auto const &span : state.route.spans) + tracks.push_back(span.track); + if (false == tracks_editable(tracks, state.error)) + { + state.error = STR_C("The grade line can't be applied, ") + state.error; return; } auto const line{state.line}; @@ -490,18 +512,35 @@ void editor_mode::profile_apply() state.route, [&](double const Chainage) { return profile::elevation(line, Chainage); }, [&](double const Chainage) { return profile::grade(line, Chainage); }, profile::breaks(line), states, created)}; auto const changed{states.size()}; auto const added{created.size()}; + // the stored design changes with the paths, an undo takes both back + profile_library_load(); + auto library{m_profiles}; + bool const pushed{false == states.empty() || false == created.empty()}; push_track_snapshot(std::move(states), std::move(created)); + if (pushed) + { + m_history.back().profiles = true; + m_history.back().profile_library = std::move(library); + } state.from = state.route.spans.front().track; state.to = state.route.spans.back().track; profile_resample(); profile_store(); - state.status = format("Grade line applied: %zu paths changed, %zu added, largest departure %.3f m", changed, added, state.departure); + state.status = format(STR_C("Grade line applied: %zu paths changed, %zu added, largest departure %.3f m"), changed, added, state.departure); if (false == scene::Layers.empty()) state.status += "\nThe paths and the design (//$p lines) go to the scenery files on save"; - if (false == gaps.empty()) - state.status += "\nSwitch ends off the adjoining paths, to be corrected:"; + auto const name = [](TTrack const *Track) { return Track->name().empty() ? std::string{"(noname)"} : Track->name(); }; + auto const closed{std::count_if(gaps.begin(), gaps.end(), [](auto const &Gap) { return Gap.closed; })}; + if (closed > 0) + state.status += "\nPaths off the route brought to the height of the switches:"; for (auto const &gap : gaps) - state.status += format("\n %s -> %s: %+.3f m", gap.track->name().c_str(), gap.neighbour->name().c_str(), gap.gap); + if (gap.closed) + state.status += format("\n %s at %s: %+.3f m", name(gap.neighbour).c_str(), name(gap.track).c_str(), -gap.gap); + if (closed < static_cast(gaps.size())) + state.status += "\nSwitch ends off the adjoining paths, which can't be changed here:"; + for (auto const &gap : gaps) + if (false == gap.closed) + state.status += format("\n %s -> %s: %+.3f m", name(gap.track).c_str(), name(gap.neighbour).c_str(), gap.gap); WriteLog("Editor: vertical profile - " + state.status, logtype::generic); } @@ -527,53 +566,87 @@ void editor_mode::profile_after_undo() profile_resample(); } -void editor_mode::render_profile_window() +void editor_mode::render_profile_body() { auto &state{m_profile}; - if (false == state.open) - return; - ImGui::SetNextWindowSize(ImVec2(960.0f, 640.0f), ImGuiCond_FirstUseEver); - if (false == ImGui::Begin("Vertical profile###trackprofile", &state.open)) - { - ImGui::End(); - return; - } render_profile_source(); if (state.route.spans.empty()) { - ImGui::TextDisabled("Select a path in the viewport, then build the route along the line, or set its start and end paths (switches are passed through)"); + ImGui::TextWrapped("%s", STR_C("Select a path in the view, then build the route along the line, or set its start and end paths (switches are passed through)")); if (state.picked_from != nullptr) - ImGui::Text("Start: %s", state.picked_from->name().c_str()); + ImGui::Text(STR_C("Start: %s"), state.picked_from->name().c_str()); if (false == state.error.empty()) ImGui::TextColored(ImVec4(1.0f, 0.4f, 0.3f, 1.0f), "%s", state.error.c_str()); - ImGui::End(); return; } - ImGui::Text("Route: %zu paths, %.2f m, %s ... %s", state.route.spans.size(), state.route.length, state.route.spans.front().track->name().c_str(), state.route.spans.back().track->name().c_str()); + ImGui::Separator(); + ImGui::TextWrapped(STR_C("Route: %zu paths, %.2f m, %s ... %s"), state.route.spans.size(), state.route.length, state.route.spans.front().track->name().c_str(), state.route.spans.back().track->name().c_str()); { bool reversed; auto const stored{profile_find(reversed)}; if (stored >= 0) { - ImGui::TextDisabled("Design kept in %s%s", scene::Layers.layer(m_profiles[stored].layer).name.c_str(), state.changed ? ", changes go there on save" : ""); + ImGui::TextDisabled(STR_C("Design kept in %s%s"), scene::Layers.layer(m_profiles[stored].layer).name.c_str(), state.changed ? STR_C(", changes go there on save") : ""); ImGui::SameLine(); - if (ImGui::SmallButton("Forget the design")) + if (ImGui::SmallButton(STR_C("Forget the design"))) profile_forget(); } else if (state.changed) - ImGui::TextDisabled("The design goes to the scenery file of the route on save"); + ImGui::TextDisabled(STR_C("The design goes to the scenery file of the route on save")); } if (render_profile_parameters()) profile_edited(); +} - render_profile_canvas(); - - ImGui::Columns(2, "##profilecolumns", true); - render_profile_point(); - ImGui::NextColumn(); - render_profile_issues(); - ImGui::Columns(1); +void editor_mode::render_profile_strip() +{ + auto &state{m_profile}; + auto const &io{ImGui::GetIO()}; + ImGui::SetNextWindowPos(ImVec2(8.0f, io.DisplaySize.y - 360.0f), ImGuiCond_FirstUseEver); + ImGui::SetNextWindowSize(ImVec2(std::max(600.0f, io.DisplaySize.x - 500.0f), 320.0f), ImGuiCond_FirstUseEver); + auto const title{std::string{STR_C("Vertical profile")} + format(" %.2f m###profilestrip", state.route.length)}; + if (ImGui::Begin(title.c_str(), nullptr, ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse)) + { + auto const side{std::clamp(ImGui::GetContentRegionAvail().x * 0.28f, 280.0f, 420.0f)}; + ImGui::BeginChild("##profileplot", ImVec2(-side, 0.0f), false, ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse); + render_profile_toolbar(); + render_profile_canvas(ImGui::GetContentRegionAvail().y); + ImGui::EndChild(); + ImGui::SameLine(); + ImGui::BeginChild("##profileside", ImVec2(0.0f, 0.0f), false); + if (ImGui::BeginTabBar("##profiletabs")) + { + // a click on a point in the plot brings its tab forward + bool const picked{state.selected >= 0 && state.selected != state.shown}; + state.shown = state.selected; + if (ImGui::BeginTabItem(STR_C("Point"), nullptr, picked ? ImGuiTabItemFlags_SetSelected : 0)) + { + render_profile_point(); + ImGui::EndTabItem(); + } + if (ImGui::BeginTabItem(format("%s (%zu)###profilepoints", STR_C("Points"), state.line.points.size()).c_str())) + { + ImGui::BeginChild("##profilepointlist"); + render_profile_points(); + ImGui::EndChild(); + ImGui::EndTabItem(); + } + bool const errors{has_errors(state.issues)}; + if (false == state.issues.empty()) + ImGui::PushStyleColor(ImGuiCol_Text, errors ? ImVec4(1.0f, 0.45f, 0.4f, 1.0f) : ImVec4(1.0f, 0.8f, 0.3f, 1.0f)); + bool const remarks{ImGui::BeginTabItem(format("%s (%zu)###profileremarks", STR_C("Remarks"), state.issues.size()).c_str())}; + if (false == state.issues.empty()) + ImGui::PopStyleColor(); + if (remarks) + { + render_profile_issues(); + ImGui::EndTabItem(); + } + ImGui::EndTabBar(); + } + ImGui::EndChild(); + } ImGui::End(); } @@ -581,30 +654,29 @@ void editor_mode::render_profile_source() { auto &state{m_profile}; auto *selected{selected_track()}; - if (ImGui::Button("Along the line from the selected path") && selected != nullptr) + if (ImGui::Button(STR_C("Along the line from the selected path")) && selected != nullptr) profile_open_run(*selected); ImGui::SameLine(); ImGui::PushItemWidth(70.0f); - ImGui::InputDouble("m each way##profilerun", &state.run_length, 0.0, 0.0, "%.0f"); + ImGui::DragScalar(STR_C("m each way"), ImGuiDataType_Double, &state.run_length, 10.0f, nullptr, nullptr, "%.0f"); ImGui::PopItemWidth(); state.run_length = std::clamp(state.run_length, 10.0, 50000.0); - ImGui::SameLine(); - if (ImGui::Button("Start: selected path") && selected != nullptr) + if (ImGui::Button(STR_C("Start: selected path")) && selected != nullptr) state.picked_from = selected; ImGui::SameLine(); - if (ImGui::Button("End: selected path") && selected != nullptr && state.picked_from != nullptr) + if (ImGui::Button(STR_C("End: selected path")) && selected != nullptr && state.picked_from != nullptr) profile_open(state.picked_from, selected); profile_library_load(); - if (false == m_profiles.empty() && ImGui::TreeNode("##profilestored", "Designs kept in the scenery (%zu)", m_profiles.size())) + if (false == m_profiles.empty() && ImGui::TreeNode("##profilestored", STR_C("Designs kept in the scenery (%zu)"), m_profiles.size())) { for (std::size_t i = 0; i < m_profiles.size(); ++i) { auto const &entry{m_profiles[i]}; ImGui::PushID(static_cast(i)); - if (ImGui::SmallButton("Open")) + if (ImGui::SmallButton(STR_C("Open"))) profile_open_stored(i); ImGui::SameLine(); - ImGui::Text("%s %.1f m, %zu points, from (%.1f, %.1f) to (%.1f, %.1f)", scene::Layers.layer(entry.layer).name.c_str(), entry.length, entry.line.points.size(), entry.start.x, entry.start.z, entry.end.x, entry.end.z); + ImGui::Text(STR_C("%s %.1f m, %zu points, from (%.1f, %.1f) to (%.1f, %.1f)"), scene::Layers.layer(entry.layer).name.c_str(), entry.length, entry.line.points.size(), entry.start.x, entry.start.z, entry.end.x, entry.end.z); ImGui::PopID(); } ImGui::TreePop(); @@ -616,77 +688,91 @@ bool editor_mode::render_profile_parameters() auto &state{m_profile}; auto &line{state.line}; bool changed{false}; - ImGui::PushItemWidth(90.0f); - ImGui::InputDouble("Chainage of the start (m)", &state.origin, 0.0, 0.0, "%.2f"); - ImGui::SameLine(); - changed |= ImGui::InputDouble("Design speed (km/h)", &line.speed, 0.0, 0.0, "%.0f"); - ImGui::SameLine(); - ImGui::SliderFloat("Exaggeration##profile", &state.exaggeration, 1.0f, 500.0f, "1:%.0f", 2.0f); + auto const drag = [](char const *Label, double &Value, float const Speed, char const *Format) { return ImGui::DragScalar(STR_C(Label), ImGuiDataType_Double, &Value, Speed, nullptr, nullptr, Format); }; + ImGui::PushItemWidth(120.0f); + drag("Chainage of the start (m)", state.origin, 1.0f, "%.2f"); + changed |= drag("Design speed (km/h)", line.speed, 1.0f, "%.0f"); ImGui::PopItemWidth(); line.speed = std::max(1.0, line.speed); - ImGui::Checkbox("Track", &state.show_track); - ImGui::SameLine(); - ImGui::Checkbox("Terrain", &state.show_terrain); - ImGui::SameLine(); - ImGui::Checkbox("Plan curvature", &state.show_plan); - ImGui::SameLine(); - if (ImGui::Button("Fit the view")) - profile_fit_view(); - ImGui::SameLine(); - if (ImGui::Button("Recognize from the track")) + auto const join_tooltip = [] { + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Keeps the elevation of the joint and takes over the grade of the adjoining track,\nwith a vertical curve which starts right at the joint")); + }; + if (state.context.start_joined) { - profile_recognize(); - state.changed = true; + changed |= ImGui::Checkbox(STR_C("Join the adjoining track at the start"), &line.join_start); + join_tooltip(); } - ImGui::SameLine(); - if (ImGui::Button("Apply to the scenery")) - profile_apply(); - if (ImGui::TreeNode("Limits##profile")) + if (state.context.end_joined) + { + changed |= ImGui::Checkbox(STR_C("Join the adjoining track at the end"), &line.join_end); + join_tooltip(); + } + if (ImGui::TreeNode(STR_C("Limits"))) { auto &norms{line.norms}; ImGui::PushItemWidth(90.0f); - changed |= ImGui::InputDouble("Maximum grade (per mille)", &norms.grade_max, 0.0, 0.0, "%.2f"); - changed |= ImGui::InputDouble("Maximum grade over switches (per mille)", &norms.grade_switch_max, 0.0, 0.0, "%.2f"); - changed |= ImGui::InputDouble("Vertical curve R >= k*V^2, k", &norms.radius_factor, 0.0, 0.0, "%.2f"); - changed |= ImGui::InputDouble("Vertical curve R min (m)", &norms.radius_min, 0.0, 0.0, "%.0f"); - changed |= ImGui::InputDouble("Vertical curve needed above a change of (per mille)", &norms.curve_threshold, 0.0, 0.0, "%.2f"); - changed |= ImGui::InputDouble("Constant grade between curves at least (m)", &norms.element_min, 0.0, 0.0, "%.0f"); - changed |= ImGui::InputDouble("Tolerance at fixed points (m)", &norms.fixed_tolerance, 0.0, 0.0, "%.3f"); + changed |= drag("Maximum grade (per mille)", norms.grade_max, 0.1f, "%.2f"); + changed |= drag("Maximum grade over switches (per mille)", norms.grade_switch_max, 0.1f, "%.2f"); + changed |= drag("Vertical curve R >= k*V^2, k", norms.radius_factor, 0.01f, "%.2f"); + changed |= drag("Vertical curve R min (m)", norms.radius_min, 10.0f, "%.0f"); + changed |= drag("Vertical curve needed above a change of (per mille)", norms.curve_threshold, 0.1f, "%.2f"); + changed |= drag("Constant grade between curves at least (m)", norms.element_min, 1.0f, "%.0f"); + changed |= drag("Tolerance at fixed points (m)", norms.fixed_tolerance, 0.001f, "%.3f"); ImGui::PopItemWidth(); - if (ImGui::SmallButton("Automatic R at all points")) + if (ImGui::SmallButton(STR_C("Automatic R at all points"))) { for (auto &point : line.points) point.automatic = true; changed = true; } - ImGui::TextDisabled("Required R for %.0f km/h: %.0f m", line.speed, profile::required_radius(line)); + ImGui::TextDisabled(STR_C("Required R for %.0f km/h: %.0f m"), line.speed, profile::required_radius(line)); ImGui::TreePop(); } - if (state.context.start_joined) - changed |= ImGui::Checkbox("Join the adjoining track at the start", &line.join_start); - if (state.context.start_joined && state.context.end_joined) - ImGui::SameLine(); - if (state.context.end_joined) - changed |= ImGui::Checkbox("Join the adjoining track at the end", &line.join_end); - if ((state.context.start_joined || state.context.end_joined) && ImGui::IsItemHovered()) - ImGui::SetTooltip("Keeps the elevation of the joint and takes over the grade of the adjoining track,\n" - "with a vertical curve which starts right at the joint"); + + ImGui::Separator(); + auto const errors{std::count_if(state.issues.begin(), state.issues.end(), [](profile::issue const &Issue) { return Issue.error; })}; + auto const warnings{static_cast(state.issues.size()) - errors}; + if (errors > 0) + ImGui::TextColored(ImVec4(1.0f, 0.4f, 0.3f, 1.0f), STR_C("%d errors, %d warnings: see the Remarks in the strip"), static_cast(errors), static_cast(warnings)); + else if (warnings > 0) + ImGui::TextColored(ImVec4(1.0f, 0.8f, 0.3f, 1.0f), STR_C("%d warnings: see the Remarks in the strip"), static_cast(warnings)); + else + ImGui::TextColored(ImVec4(0.4f, 0.9f, 0.4f, 1.0f), "%s", STR_C("The grade line meets the limits")); + ImGui::TextDisabled(STR_C("Largest departure from the track: %.3f m"), state.departure); + if (ImGui::Button(STR_C("Recognize from the track"))) + { + profile_recognize(); + state.changed = true; + } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Sets the points of the grade line from the existing track")); + ImGui::SameLine(); + ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.2f, 0.55f, 0.25f, 1.0f)); + ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0.25f, 0.68f, 0.3f, 1.0f)); + if (ImGui::Button(STR_C("Apply to the scenery"), ImVec2(-1.0f, 0.0f))) + profile_apply(); + ImGui::PopStyleColor(2); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Sets the heights of the track along the route to the grade line, Ctrl+Z takes it back")); return changed; } void editor_mode::render_profile_issues() { auto &state{m_profile}; - ImGui::Text("Largest departure from the track: %.3f m", state.departure); ImGui::BeginChild("##profileissues", ImVec2(0.0f, 0.0f), false); if (state.issues.empty()) - ImGui::TextColored(ImVec4(0.4f, 0.9f, 0.4f, 1.0f), "The grade line meets the limits"); + ImGui::TextColored(ImVec4(0.4f, 0.9f, 0.4f, 1.0f), "%s", STR_C("The grade line meets the limits")); + else + ImGui::TextDisabled("%s", STR_C("LMB on a remark shows its place")); for (std::size_t i = 0; i < state.issues.size(); ++i) { auto const &issue{state.issues[i]}; ImGui::PushID(static_cast(i)); ImGui::PushStyleColor(ImGuiCol_Text, issue.error ? ImVec4(1.0f, 0.4f, 0.3f, 1.0f) : ImVec4(1.0f, 0.8f, 0.3f, 1.0f)); - if (ImGui::Selectable(issue.text.c_str())) + auto const text{format("%s km %s %s", issue.error ? "x" : "!", profile::format_chainage(issue.chainage + state.origin).c_str(), issue.text.c_str())}; + if (ImGui::Selectable(text.c_str())) { if (issue.point >= 0) state.selected = issue.point; @@ -712,21 +798,21 @@ void editor_mode::render_profile_point() auto const count{static_cast(points.size())}; if (state.selected >= count) state.selected = -1; + auto const drag = [](char const *Label, double &Value, float const Speed, char const *Format) { return ImGui::DragScalar(STR_C(Label), ImGuiDataType_Double, &Value, Speed, nullptr, nullptr, Format); }; + auto const kind_of = [](double const Change) { return Change > 0.0 ? STR_C("sag") : STR_C("crest"); }; if (state.selected < 0) { - ImGui::TextDisabled("LMB: select and drag a point (Ctrl: height only, Shift: keep the grade before)\n" - "Green grip on a curve: drag to set R Double click on the line: insert a point\n" - "Del: remove the point Wheel: zoom Ctrl+wheel: exaggeration RMB/MMB: pan"); + ImGui::TextWrapped("%s", STR_C("No point selected. Click a point of the grade line in the plot, or double click the line to add one.")); } else if (points[state.selected].joint) { auto const index{state.selected}; auto const &point{points[index]}; auto const change{(profile::grade_after(state.line, index) - profile::grade_after(state.line, index - 1)) * 1000.0}; - ImGui::Text("Point %d: joint with the adjoining track (placed automatically)", index + 1); - ImGui::Text("km %s H %.3f R %.0f", profile::format_chainage(point.chainage + state.origin).c_str(), point.elevation, point.radius); - ImGui::Text("Grade %+.3f -> %+.3f per mille (%s)", profile::grade_after(state.line, index - 1) * 1000.0, profile::grade_after(state.line, index) * 1000.0, change > 0.0 ? "sag" : "crest"); - ImGui::TextDisabled("Moves with the neighbouring point; untick the joining to edit the end freely"); + ImGui::Text(STR_C("Point %d: joint with the adjoining track"), index + 1); + ImGui::Text(STR_C("km %s H %.3f m R %.0f m"), profile::format_chainage(point.chainage + state.origin).c_str(), point.elevation, point.radius); + ImGui::Text(STR_C("Grade %+.2f -> %+.2f per mille (%s)"), profile::grade_after(state.line, index - 1) * 1000.0, profile::grade_after(state.line, index) * 1000.0, kind_of(change)); + ImGui::TextWrapped("%s", STR_C("Placed automatically, moves with the neighbouring point; untick the joining in the inspector to edit the end freely")); } else { @@ -734,21 +820,24 @@ void editor_mode::render_profile_point() auto &point{points[index]}; bool const end{index == 0 || index == count - 1}; bool const locked{end_locked(state.line, state.context, index)}; - ImGui::Text("Point %d%s", index + 1, locked ? " (end, joined to the adjoining track)" : end ? " (end of the route)" : ""); - ImGui::PushItemWidth(110.0f); + ImGui::Text(STR_C("Point %d"), index + 1); + ImGui::SameLine(); + ImGui::TextDisabled(STR_C("km %s%s"), profile::format_chainage(point.chainage + state.origin).c_str(), locked ? STR_C(", joined to the adjoining track") : end ? STR_C(", end of the route") : ""); + ImGui::PushItemWidth(std::max(90.0f, ImGui::GetContentRegionAvail().x * 0.4f)); auto chainage{point.chainage + state.origin}; - if (ImGui::InputDouble("Chainage (m)", &chainage, 0.0, 0.0, "%.2f") && false == end) + if (false == end && drag("Chainage (m)", chainage, 0.5f, "%.2f")) { point.chainage = std::clamp(chainage - state.origin, points[index - 1].chainage + 0.5, points[index + 1].chainage - 0.5); changed = true; } - ImGui::SameLine(); - ImGui::TextDisabled("km %s", profile::format_chainage(point.chainage + state.origin).c_str()); - changed |= ImGui::InputDouble("Elevation (m)", &point.elevation, 0.0, 0.0, "%.3f", locked ? ImGuiInputTextFlags_ReadOnly : 0); + if (locked) + ImGui::Text(STR_C("Elevation %.3f m"), point.elevation); + else + changed |= drag("Elevation (m)", point.elevation, 0.01f, "%.3f"); if (index > 0 && false == locked) { auto grade{profile::grade_after(state.line, index - 1) * 1000.0}; - if (ImGui::InputDouble("Grade from the previous (per mille)", &grade, 0.0, 0.0, "%.3f")) + if (drag("Grade before (per mille)", grade, 0.05f, "%+.2f")) { point.elevation = points[index - 1].elevation + grade / 1000.0 * (point.chainage - points[index - 1].chainage); changed = true; @@ -757,7 +846,7 @@ void editor_mode::render_profile_point() if (index + 1 < count) { auto grade{profile::grade_after(state.line, index) * 1000.0}; - if (ImGui::InputDouble("Grade to the next (per mille)", &grade, 0.0, 0.0, "%.3f")) + if (drag("Grade after (per mille)", grade, 0.05f, "%+.2f")) { points[index + 1].elevation = point.elevation + grade / 1000.0 * (points[index + 1].chainage - point.chainage); changed = true; @@ -765,24 +854,24 @@ void editor_mode::render_profile_point() } if (false == end) { - if (ImGui::InputDouble("Vertical curve R (m, 0: none)", &point.radius, 0.0, 0.0, "%.0f")) + if (drag("Vertical curve R (m)", point.radius, 10.0f, "%.0f")) { point.automatic = false; changed = true; } point.radius = std::max(0.0, point.radius); ImGui::SameLine(); - changed |= ImGui::Checkbox("Auto", &point.automatic); + changed |= ImGui::Checkbox(STR_C("auto"), &point.automatic); if (ImGui::IsItemHovered()) - ImGui::SetTooltip("R follows the limits: the required radius where the change of grade needs a curve"); + ImGui::SetTooltip("%s", STR_C("R follows the limits: the required radius where the change of grade needs a curve; 0: no curve")); auto const change{(profile::grade_after(state.line, index) - profile::grade_after(state.line, index - 1)) * 1000.0}; auto const tangent{point.radius * std::abs(change) / 2000.0}; - ImGui::Text("Change of grade %+.3f per mille, %s", change, change > 0.0 ? "sag" : "crest"); + ImGui::TextDisabled(STR_C("Change of grade %+.2f per mille, %s"), change, kind_of(change)); if (point.radius > 0.0) - ImGui::Text("Tangent T %.2f m, sagitta f %.3f m", tangent, tangent * tangent / (2.0 * point.radius)); + ImGui::TextDisabled(STR_C("Tangent T %.2f m, sagitta f %.3f m"), tangent, tangent * tangent / (2.0 * point.radius)); } ImGui::PopItemWidth(); - if (index + 1 < count && ImGui::SmallButton("Insert a point halfway to the next")) + if (index + 1 < count && ImGui::Button(STR_C("Add a point after"))) { profile::pvi inserted; inserted.chainage = (point.chainage + points[index + 1].chainage) * 0.5; @@ -794,7 +883,7 @@ void editor_mode::render_profile_point() if (false == end) { ImGui::SameLine(); - if (ImGui::SmallButton("Remove the point")) + if (ImGui::Button(STR_C("Remove Del"))) { points.erase(points.begin() + index); state.selected = -1; @@ -802,17 +891,46 @@ void editor_mode::render_profile_point() } } } - ImGui::BeginChild("##profilepoints", ImVec2(0.0f, 0.0f), true); + if (changed) + profile_edited(); +} + +void editor_mode::render_profile_points() +{ + auto &state{m_profile}; + auto const &points{state.line.points}; + ImGui::Columns(4, "##profilepointcolumns", false); + for (auto const *header : {"#", "km", "H (m)", "R (m)"}) + { + ImGui::TextDisabled("%s", header); + ImGui::NextColumn(); + } + ImGui::Separator(); for (int i = 0; i < static_cast(points.size()); ++i) { auto const &point{points[i]}; - auto const label{format("%2d km %s H %.3f %s##point%d", i + 1, profile::format_chainage(point.chainage + state.origin).c_str(), point.elevation, point.radius > 0.0 ? format("R %.0f%s", point.radius, point.joint ? " joint" : point.automatic ? " auto" : "").c_str() : "", i)}; - if (ImGui::Selectable(label.c_str(), state.selected == i)) - state.selected = (state.selected == i ? -1 : i); + if (ImGui::Selectable(format("%d##point%d", i + 1, i).c_str(), state.selected == i, ImGuiSelectableFlags_SpanAllColumns)) + { + state.selected = i; + auto const half{(state.view_to - state.view_from) * 0.5}; + if (point.chainage < state.view_from || point.chainage > state.view_to) + { + state.view_from = point.chainage - half; + state.view_to = point.chainage + half; + } + } + ImGui::NextColumn(); + ImGui::TextUnformatted(profile::format_chainage(point.chainage + state.origin).c_str()); + ImGui::NextColumn(); + ImGui::Text("%.3f", point.elevation); + ImGui::NextColumn(); + if (point.radius > 0.0) + ImGui::Text("%.0f%s", point.radius, point.joint ? STR_C(" joint") : point.automatic ? STR_C(" auto") : ""); + else + ImGui::TextDisabled("-"); + ImGui::NextColumn(); } - ImGui::EndChild(); - if (changed) - profile_edited(); + ImGui::Columns(1); } // screen mapping of the profile canvas, chainage across and elevation upwards @@ -849,11 +967,50 @@ struct editor_mode::profile_view } }; -void editor_mode::render_profile_canvas() +void editor_mode::render_profile_toolbar() +{ + auto &state{m_profile}; + auto *draw{ImGui::GetWindowDrawList()}; + auto const swatch = [&](ImU32 const Colour) { + auto const at{ImGui::GetCursorScreenPos()}; + auto const height{ImGui::GetFrameHeight()}; + draw->AddLine(ImVec2(at.x, at.y + height * 0.5f), ImVec2(at.x + 16.0f, at.y + height * 0.5f), Colour, 3.0f); + ImGui::Dummy(ImVec2(16.0f, height)); + ImGui::SameLine(0.0f, 4.0f); + }; + auto const legend = [&](ImU32 const Colour, char const *Label) { + swatch(Colour); + ImGui::AlignTextToFramePadding(); + ImGui::TextUnformatted(STR_C(Label)); + ImGui::SameLine(0.0f, 14.0f); + }; + auto const toggle = [&](ImU32 const Colour, char const *Label, bool &Value) { + swatch(Colour); + ImGui::Checkbox(STR_C(Label), &Value); + ImGui::SameLine(0.0f, 14.0f); + }; + legend(kGradeLine, "Grade line"); + legend(kTangents, "Tangents"); + toggle(kTrack, STR_C("Track"), state.show_track); + toggle(kTerrain, STR_C("Terrain"), state.show_terrain); + toggle(kPlan, STR_C("Plan curvature"), state.show_plan); + legend(kSwitchLabel, "Switches"); + ImGui::SetNextItemWidth(130.0f); + ImGui::SliderFloat("##exaggeration", &state.exaggeration, 1.0f, 500.0f, STR_C("heights x%.0f"), 2.0f); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Exaggeration of the heights against the lengths, also Ctrl+wheel over the plot")); + ImGui::SameLine(); + if (ImGui::Button(STR_C("Fit"))) + profile_fit_view(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Shows the whole route")); +} + +void editor_mode::render_profile_canvas(float const Height) { auto &state{m_profile}; auto const available{ImGui::GetContentRegionAvail()}; - ImVec2 const size{std::max(200.0f, available.x), std::max(240.0f, available.y * 0.6f)}; + ImVec2 const size{std::max(200.0f, available.x), std::max(100.0f, Height)}; ImVec2 const corner{ImGui::GetCursorScreenPos()}; ImGui::InvisibleButton("##profilecanvas", size); bool const hovered{ImGui::IsItemHovered()}; @@ -874,9 +1031,47 @@ void editor_mode::render_profile_canvas() { auto const x{view.x_of(state.hover)}; draw->AddLine(ImVec2(x, view.plot_top()), ImVec2(x, view.bottom_right().y), IM_COL32(255, 255, 255, 90)); - profile_canvas_tooltip(); + if (state.hover_point < 0 && state.hover_grip < 0 && state.curve_grip < 0) + profile_canvas_tooltip(); + } + + // what the mouse does over the thing under it + char const *hint{"wheel: zoom Ctrl+wheel: heights RMB/MMB drag: pan double click on the line: add a point"}; + if (state.dragging >= 0) + hint = "Ctrl: only the height Shift: keep the grade before"; + else if (state.curve_grip >= 0 || state.hover_grip >= 0) + hint = "drag up or down: radius of the vertical curve"; + else if (state.hover_point >= 0) + hint = "drag: move the point Ctrl+drag: only the height Shift+drag: keep the grade before Del: remove"; + else if (state.hover_line) + hint = "double click: add a point here"; + if (hovered || state.dragging >= 0 || state.curve_grip >= 0) + { + auto const text{std::string{STR_C(hint)}}; + auto const size{ImGui::CalcTextSize(text.c_str())}; + plot_label(*draw, ImVec2(view.bottom_right().x - size.x - 8.0f, view.plot_bottom() - size.y - 6.0f), IM_COL32(255, 255, 255, 230), text); } draw->PopClipRect(); + + auto const &points{state.line.points}; + if (state.dragging >= 0 && state.dragging < static_cast(points.size())) + { + auto const index{state.dragging}; + ImGui::BeginTooltip(); + ImGui::Text(STR_C("Point %d"), index + 1); + ImGui::Text(STR_C("km %s H %.3f m"), profile::format_chainage(points[index].chainage + state.origin).c_str(), points[index].elevation); + if (index > 0) + ImGui::Text(STR_C("before %+.2f per mille"), profile::grade_after(state.line, index - 1) * 1000.0); + if (index + 1 < static_cast(points.size())) + ImGui::Text(STR_C("after %+.2f per mille"), profile::grade_after(state.line, index) * 1000.0); + ImGui::EndTooltip(); + } + else if (state.curve_grip > 0 && state.curve_grip < static_cast(points.size())) + { + ImGui::BeginTooltip(); + ImGui::Text("R %.0f m", points[state.curve_grip].radius); + ImGui::EndTooltip(); + } } void editor_mode::profile_fit_exaggeration(profile_view const &View) @@ -966,6 +1161,21 @@ bool editor_mode::profile_canvas_edit(profile_view const &View, bool const Hover return -1; }; bool changed{false}; + bool const busy{state.dragging >= 0 || state.curve_grip >= 0 || state.panning}; + state.hover_point = Hovered && false == busy ? hit_point() : -1; + state.hover_grip = Hovered && false == busy && state.hover_point < 0 ? hit_grip() : -1; + state.hover_line = false; + if (Hovered && false == busy && state.hover_point < 0 && state.hover_grip < 0 && points.size() >= 2) + { + auto const chainage{View.chainage_of(mouse.x)}; + state.hover_line = chainage > points.front().chainage && chainage < points.back().chainage && std::abs(View.y_of(profile::elevation(line, chainage)) - mouse.y) < 12.0f; + } + if (state.dragging >= 0 || state.panning) + ImGui::SetMouseCursor(ImGuiMouseCursor_ResizeAll); + else if (state.curve_grip >= 0 || state.hover_grip >= 0) + ImGui::SetMouseCursor(ImGuiMouseCursor_ResizeNS); + else if (state.hover_point >= 0 || state.hover_line) + ImGui::SetMouseCursor(ImGuiMouseCursor_Hand); if (Hovered && ImGui::IsMouseClicked(0)) { auto const point{hit_point()}; @@ -1054,19 +1264,19 @@ void editor_mode::draw_profile_canvas(profile_view const &View, ImDrawList &Draw { auto const x{View.x_of(s)}; Draw.AddLine(ImVec2(x, plottop), ImVec2(x, plotbottom), kGrid); - Draw.AddText(ImVec2(x + 2.0f, View.corner.y + 2.0f), kLabel, profile::format_chainage(s + state.origin).c_str()); + Draw.AddText(ImVec2(x + 3.0f, View.corner.y + 2.0f), kLabel, profile::format_chainage(s + state.origin).c_str()); } auto const heightstep{nice_step(View.vertical * 45.0)}; for (auto h = std::floor(View.height_of(plotbottom) / heightstep) * heightstep; h <= View.height_of(plottop); h += heightstep) { auto const y{View.y_of(h)}; Draw.AddLine(ImVec2(View.corner.x, y), ImVec2(bottomright.x, y), kGrid); - Draw.AddText(ImVec2(View.corner.x + 2.0f, y - 14.0f), kLabel, format("%.1f", h).c_str()); } for (auto const &zone : state.context.switches) { Draw.AddRectFilled(ImVec2(View.x_of(zone.from), plottop), ImVec2(std::max(View.x_of(zone.to), View.x_of(zone.from) + 2.0f), plotbottom), kSwitch); - Draw.AddText(ImVec2(View.x_of(zone.from) + 2.0f, plottop + 2.0f), IM_COL32(200, 160, 255, 220), zone.name.c_str()); + if (View.x_of(zone.to) - View.x_of(zone.from) > 20.0f || View.across < 0.5) + Draw.AddText(ImVec2(View.x_of(zone.from) + 2.0f, plotbottom - 16.0f), kSwitchLabel, zone.name.c_str()); } auto const polyline = [&](auto const &Height, ImU32 const Colour, float const Thickness) { @@ -1093,7 +1303,31 @@ void editor_mode::draw_profile_canvas(profile_view const &View, ImDrawList &Draw } }; if (state.show_terrain) + { + auto const fill{(kTerrain & 0x00FFFFFFu) | 0x30000000u}; + float lastx{-1e9f}; + ImVec2 previous{}; + bool open{false}; + for (std::size_t i = 0; i < samples.size(); ++i) + { + auto const x{View.x_of(samples[i].chainage)}; + auto const h{state.terrain[i]}; + if (std::isnan(h) || x < View.corner.x - 50.0f || x > bottomright.x + 50.0f) + { + open = false; + continue; + } + if (open && x - lastx < 2.0f && i + 1 < samples.size()) + continue; + ImVec2 const next{x, std::min(View.y_of(h), plotbottom)}; + if (open) + Draw.AddQuadFilled(previous, next, ImVec2(next.x, plotbottom), ImVec2(previous.x, plotbottom), fill); + previous = next; + lastx = x; + open = true; + } polyline([&](std::size_t const I) { return state.terrain[I]; }, kTerrain, 1.5f); + } if (state.show_track) polyline([&](std::size_t const I) { return samples[I].position.y; }, kTrack, 1.5f); @@ -1117,8 +1351,11 @@ void editor_mode::draw_profile_canvas(profile_view const &View, ImDrawList &Draw auto const x{View.x_of(middle)}; if (View.x_of(points[i + 1].chainage) - View.x_of(points[i].chainage) < 70.0f) continue; - auto const text{format("%+.2f o/oo L %.1f", profile::grade_after(line, i) * 1000.0, points[i + 1].chainage - points[i].chainage)}; - Draw.AddText(ImVec2(x - 40.0f, View.y_of(profile::elevation(line, middle)) - 30.0f), kGradeLine, text.c_str()); + auto const text{format("%+.2f o/oo L %.0f m", profile::grade_after(line, i) * 1000.0, points[i + 1].chainage - points[i].chainage)}; + auto const size{ImGui::CalcTextSize(text.c_str())}; + if (View.x_of(points[i + 1].chainage) - View.x_of(points[i].chainage) < size.x + 30.0f) + continue; + plot_label(Draw, ImVec2(x - size.x * 0.5f, View.y_of(profile::elevation(line, middle)) - size.y - 10.0f), kGradeLine, text); } for (auto const &c : profile::curves(line)) { @@ -1129,24 +1366,34 @@ void editor_mode::draw_profile_canvas(profile_view const &View, ImDrawList &Draw } auto const chainage{points[c.point].chainage}; ImVec2 const grip{View.x_of(chainage), View.y_of(profile::elevation(line, chainage))}; - Draw.AddCircleFilled(grip, 4.5f, overlay_color::grip, 4); - if (static_cast(c.point) == state.curve_grip) - Draw.AddCircle(grip, 9.0f, overlay_color::highlight, 12, 2.0f); - Draw.AddText(ImVec2(grip.x + 7.0f, grip.y + 4.0f), overlay_color::grip, format("R %.0f", points[c.point].radius).c_str()); + bool const lit{static_cast(c.point) == state.curve_grip || static_cast(c.point) == state.hover_grip}; + Draw.AddCircleFilled(grip, lit ? 6.5f : 4.5f, overlay_color::grip, 4); + if (lit) + Draw.AddCircle(grip, 10.0f, overlay_color::highlight, 12, 2.0f); + plot_label(Draw, ImVec2(grip.x + 8.0f, grip.y + 6.0f), overlay_color::grip, format("R %.0f", points[c.point].radius)); } for (int i = 0; i < static_cast(points.size()); ++i) { ImVec2 const at{View.x_of(points[i].chainage), View.y_of(points[i].elevation)}; + bool const lit{i == state.hover_point || i == state.dragging}; + auto const radius{lit ? 7.0f : 5.5f}; if (i == 0 || i + 1 == static_cast(points.size())) - Draw.AddRectFilled(ImVec2(at.x - 5.0f, at.y - 5.0f), ImVec2(at.x + 5.0f, at.y + 5.0f), IM_COL32(70, 140, 255, 255)); + Draw.AddRectFilled(ImVec2(at.x - radius, at.y - radius), ImVec2(at.x + radius, at.y + radius), IM_COL32(70, 140, 255, 255)); else if (points[i].joint) - Draw.AddQuadFilled(ImVec2(at.x, at.y - 6.0f), ImVec2(at.x + 6.0f, at.y), ImVec2(at.x, at.y + 6.0f), ImVec2(at.x - 6.0f, at.y), IM_COL32(90, 210, 230, 255)); + Draw.AddQuadFilled(ImVec2(at.x, at.y - radius), ImVec2(at.x + radius, at.y), ImVec2(at.x, at.y + radius), ImVec2(at.x - radius, at.y), IM_COL32(90, 210, 230, 255)); else - Draw.AddCircleFilled(at, 5.5f, overlay_color::marked); + Draw.AddCircleFilled(at, radius, overlay_color::marked); if (i == state.selected) - Draw.AddCircle(at, 10.0f, overlay_color::highlight, 16, 2.0f); - Draw.AddText(ImVec2(at.x + 7.0f, at.y - 18.0f), overlay_color::marked, format("%d %.3f", i + 1, points[i].elevation).c_str()); + Draw.AddCircle(at, 11.0f, overlay_color::highlight, 16, 2.5f); + else if (lit) + Draw.AddCircle(at, 11.0f, IM_COL32(255, 255, 255, 160), 16, 1.5f); + // the heights only where they're asked for, the numbers of the points always + auto const text{i == state.selected || lit ? format("%d H %.3f", i + 1, points[i].elevation) : std::to_string(i + 1)}; + plot_label(Draw, ImVec2(at.x + 8.0f, at.y - 22.0f), overlay_color::marked, text); } + // heights along the left edge, over everything else + for (auto h = std::floor(View.height_of(plotbottom) / heightstep) * heightstep; h <= View.height_of(plottop); h += heightstep) + plot_label(Draw, ImVec2(View.corner.x + 4.0f, View.y_of(h) - 8.0f), kLabel, format("%.1f", h)); for (auto const &issue : state.issues) { auto const x{View.x_of(issue.chainage)}; @@ -1172,7 +1419,7 @@ void editor_mode::draw_profile_canvas(profile_view const &View, ImDrawList &Draw lastx = x; open = true; } - Draw.AddText(ImVec2(View.corner.x + 2.0f, plotbottom + 1.0f), kLabel, "plan: curvature (up: left)"); + Draw.AddText(ImVec2(View.corner.x + 4.0f, plotbottom + 1.0f), kLabel, STR_C("plan: curvature (up: left)")); } } @@ -1183,15 +1430,15 @@ void editor_mode::profile_canvas_tooltip() const auto const designed{profile::elevation(state.line, state.hover)}; auto const existing{editor_track::sampled_elevation(samples, state.hover)}; ImGui::BeginTooltip(); - ImGui::Text("km %s", profile::format_chainage(state.hover + state.origin).c_str()); - ImGui::Text("Grade line %.3f m, %+.2f per mille", designed, profile::grade(state.line, state.hover) * 1000.0); - ImGui::Text("Track %.3f m (%+.3f), %+.2f per mille", existing, existing - designed, editor_track::sampled_grade(samples, state.hover) * 1000.0); + ImGui::Text(STR_C("km %s"), profile::format_chainage(state.hover + state.origin).c_str()); + ImGui::TextColored(ImGui::ColorConvertU32ToFloat4(kGradeLine), STR_C("Grade line %.3f m, %+.2f per mille"), designed, profile::grade(state.line, state.hover) * 1000.0); + ImGui::TextColored(ImGui::ColorConvertU32ToFloat4(kTrack), STR_C("Track %.3f m (%+.3f), %+.2f per mille"), existing, existing - designed, editor_track::sampled_grade(samples, state.hover) * 1000.0); auto const next{std::lower_bound(samples.begin(), samples.end(), state.hover, [](editor_track::route_sample const &Sample, double const Value) { return Sample.chainage < Value; })}; auto const index{static_cast(std::distance(samples.begin(), std::min(next, std::prev(samples.end()))))}; if (index < state.terrain.size() && false == std::isnan(state.terrain[index])) - ImGui::Text("Terrain %.3f m, %s %.2f m", state.terrain[index], designed > state.terrain[index] ? "fill" : "cut", std::abs(designed - state.terrain[index])); + ImGui::TextColored(ImGui::ColorConvertU32ToFloat4(kTerrain), STR_C("Terrain %.3f m, %s %.2f m"), state.terrain[index], designed > state.terrain[index] ? STR_C("fill") : STR_C("cut"), std::abs(designed - state.terrain[index])); auto const &span{state.route.spans[samples[index].span]}; - ImGui::TextDisabled("%s%s", span.track->name().c_str(), span.track->eType != tt_Normal ? " (switch, tilted as a whole with its branch)" : ""); + ImGui::TextDisabled("%s%s", span.track->name().c_str(), span.track->eType != tt_Normal ? STR_C(" (switch, tilted as a whole with its branch)") : ""); ImGui::EndTooltip(); } diff --git a/application/editormoderoad.cpp b/application/editormoderoad.cpp index 83429178d..b19bc2f77 100644 --- a/application/editormoderoad.cpp +++ b/application/editormoderoad.cpp @@ -220,7 +220,8 @@ void editor_mode::render_road_menu() { if (ImGui::BeginMenu("Roads")) { - ImGui::MenuItem("Road editor", nullptr, &m_roadtool.window); + if (ImGui::MenuItem("Road editor", nullptr, &m_roadtool.window) && m_roadtool.window) + m_track_window_open = false; ImGui::MenuItem("Show lanes", nullptr, &m_roadtool.lanes); ImGui::EndMenu(); } diff --git a/application/editormodespeed.cpp b/application/editormodespeed.cpp new file mode 100644 index 000000000..5c3818055 --- /dev/null +++ b/application/editormodespeed.cpp @@ -0,0 +1,382 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "application/editormode.h" +#include "application/editoruilayer.h" +#include "application/editorprojection.h" +#include "editor/editorFormat.hpp" +#include "editor/editorGeometry.hpp" + +#include "scene/scenelayers.h" +#include "simulation/simulation.h" +#include "utilities/Logs.h" +#include "world/Track.h" + +#include "imgui/imgui.h" +#include "utilities/translation.h" +#include +#include +#include + +namespace +{ + +double const kSpeedLineReach{5000.0}; // m each way, for the line through the selected path +double const kSpeedViewDistance{25.0}; +double const kSpeedOverlayRange{3000.0}; + +bool rail(TTrack const &Track) +{ + return (Track.iCategoryFlag & 15) == 1 && false == Track.m_editorremoved && Track.m_road == nullptr && editor_track::is_supported(Track); +} + +std::string speed_text(double const Speed) +{ + return Speed > 0.0 ? format("%.0f", Speed) : std::string{"none"}; +} + +} // namespace + +void editor_mode::speed_start() +{ + auto &state{m_speed}; + state.queue.clear(); + state.next = 0; + state.results.clear(); + state.selected = -1; + state.status.clear(); + state.options.norms = m_route.design.norms; + auto const add = [&](TTrack *Track) { + for (int i = 0; i < static_cast(Track->m_paths.size()); ++i) + state.queue.emplace_back(Track, i); + }; + if (state.scope == 0) + { + auto *track{selected_track()}; + if (track == nullptr || false == rail(*track)) + { + state.status = STR_C("Select a track first"); + return; + } + editor_track::chain line; + std::string error; + if (track->eType == tt_Normal && editor_track::find_run(*track, kSpeedLineReach, line, error)) + { + for (auto *member : line.tracks) + add(member); + // the switches at the ends of the line too + for (auto *end : {line.tracks.front(), line.tracks.back()}) + for (auto *neighbour : editor_track::neighbours(*end)) + if (neighbour->eType == tt_Switch && rail(*neighbour) && std::none_of(state.queue.begin(), state.queue.end(), [&](auto const &Entry) { return Entry.first == neighbour; })) + add(neighbour); + } + else + { + add(track); + } + } + else + { + for (auto *track : simulation::Paths.sequence()) + if (track != nullptr && rail(*track)) + add(track); + } + state.history = m_history.size(); +} + +void editor_mode::speed_step() +{ + auto &state{m_speed}; + if (state.next >= state.queue.size()) + return; + auto const deadline{std::chrono::steady_clock::now() + std::chrono::milliseconds(15)}; + while (state.next < state.queue.size() && std::chrono::steady_clock::now() < deadline) + { + auto const &entry{state.queue[state.next++]}; + if (entry.first->m_editorremoved) + continue; + state.results.push_back(speed_check::check(*entry.first, entry.second, state.options)); + } + if (state.next < state.queue.size()) + return; + // the worst first: the violations, then the warnings, each by the largest excess of the speed set over the safe one + auto const excess = [&](speed_check::verdict const &Verdict) { return Verdict.set > 0.0 ? Verdict.set - Verdict.safe : state.options.top - Verdict.safe; }; + auto const rank = [&](speed_check::verdict const &Verdict) { return Verdict.violated(state.options) ? 0 : Verdict.warned(state.options) ? 1 : 2; }; + std::stable_sort(state.results.begin(), state.results.end(), [&](auto const &A, auto const &B) { + auto const a{rank(A)}; + auto const b{rank(B)}; + if (a != b) + return a < b; + return a < 2 ? excess(A) > excess(B) : A.safe < B.safe; + }); + auto const count{std::count_if(state.results.begin(), state.results.end(), [&](auto const &Verdict) { return Verdict.violated(state.options); })}; + auto const warnings{std::count_if(state.results.begin(), state.results.end(), [&](auto const &Verdict) { return Verdict.warned(state.options); })}; + state.status = format(STR_C("%zu paths checked, %d with the speed above what the geometry allows, %d switch branch warnings"), state.results.size(), static_cast(count), static_cast(warnings)); + WriteLog("Editor: speed check - " + state.status, logtype::generic); +} + +std::vector editor_mode::speed_listed() const +{ + std::vector listed; + for (int i = 0; i < static_cast(m_speed.results.size()); ++i) + { + auto const &verdict{m_speed.results[i]}; + if ((m_speed.limits == 1 && verdict.set <= 0.0) || (m_speed.limits == 2 && verdict.set > 0.0)) + continue; + if (m_speed.show_all || verdict.violated(m_speed.options) || verdict.warned(m_speed.options)) + listed.push_back(i); + } + return listed; +} + +void editor_mode::speed_focus(int const Index) +{ + auto &state{m_speed}; + if (Index < 0 || Index >= static_cast(state.results.size())) + return; + state.selected = Index; + auto const &verdict{state.results[Index]}; + auto const &paths{simulation::Paths.sequence()}; + if (std::find(paths.begin(), paths.end(), verdict.track) == paths.end() || verdict.track->m_editorremoved) + return; + m_node = verdict.track; + ui()->set_node(m_node); + auto const &path{verdict.track->m_paths[std::min(verdict.path, verdict.track->m_paths.size() - 1)]}; + geometry::bezier const curve{path}; + glm::dvec3 look{curve.first(0.5)}; + look.y = 0.0; + look = glm::length(look) > 1e-6 ? glm::normalize(look) : glm::dvec3(0.0, 0.0, 1.0); + if (glm::dot(Camera.Pos - verdict.position, look) > 0.0) + look = -look; + look = glm::normalize(look - glm::dvec3(0.0, 0.25, 0.0)); + m_focus_start_pos = Camera.Pos; + m_focus_start_angle = Camera.Angle; + m_focus_target_pos = verdict.position - look * kSpeedViewDistance; + m_focus_target_angle = glm::vec3(static_cast(std::asin(std::clamp(look.y, -1.0, 1.0))), static_cast(std::atan2(-look.x, -look.z)), 0.0f); + m_focus_active = true; + m_focus_time = 0.0; + m_focus_duration = 0.6; +} + +void editor_mode::speed_apply(std::vector const &Indices, bool const Branches) +{ + auto &state{m_speed}; + struct change + { + TTrack *track; + double limits[2]; // km/h for the path, and the diverging track of a switch, -1: none + }; + std::vector> states; + std::vector changes; + std::size_t locked{0}; + for (auto const index : Indices) + { + auto const &verdict{state.results[index]}; + auto const safe{Branches ? verdict.safe : verdict.hard}; + if (safe >= state.options.top || verdict.track->m_editorremoved) + continue; + if (false == scene::Layers.editable(verdict.track)) + { + ++locked; + continue; + } + auto existing{std::find_if(changes.begin(), changes.end(), [&](change const &Change) { return Change.track == verdict.track; })}; + if (existing == changes.end()) + { + changes.push_back({verdict.track, {speed_check::path_velocity(*verdict.track, 0), speed_check::path_velocity(*verdict.track, 1)}}); + states.emplace_back(verdict.track, editor_track::capture(*verdict.track)); + existing = std::prev(changes.end()); + } + auto &limit{existing->limits[verdict.track->eType == tt_Switch ? std::clamp(verdict.path, 0, 1) : 0]}; + auto const speed{speed_check::suggested(safe)}; + limit = limit > 0.0 ? std::min(limit, speed) : speed; + } + auto const skipped{locked > 0 ? format(", %zu in the files which can't be changed are left as they are", locked) : std::string{}}; + if (changes.empty()) + { + if (locked > 0) + state.status = STR_C("Nothing changed") + skipped; + return; + } + push_track_snapshot(std::move(states)); + for (auto const &entry : changes) + { + auto const velocity{entry.track->eType == tt_Switch ? speed_check::switch_velocity(entry.limits[0], entry.limits[1]) : entry.limits[0]}; + editor_track::velocity(*entry.track, velocity); + entry.track->mark_dirty(); + } + for (auto &verdict : state.results) + verdict.set = speed_check::path_velocity(*verdict.track, verdict.path); + state.history = m_history.size(); + state.status = format(STR_C("Speed limits of %zu paths lowered to the safe ones, Ctrl+Z brings them back"), changes.size()) + skipped; + WriteLog("Editor: speed check - " + state.status, logtype::generic); +} + +void editor_mode::render_speed_body() +{ + auto &state{m_speed}; + ImGui::TextDisabled(STR_C("Speed limits of the paths against the speed their geometry allows:\nradius and cant, cant ramps, curves without the transitions, switch branches")); + ImGui::RadioButton(STR_C("Line through the selected path"), &state.scope, 0); + ImGui::SameLine(); + ImGui::RadioButton(STR_C("Whole scenery"), &state.scope, 1); + bool const running{state.next < state.queue.size()}; + if (running) + { + auto const progress{static_cast(state.next) / static_cast(state.queue.size())}; + ImGui::ProgressBar(progress, ImVec2(-70.0f, 0.0f), format(STR_C("Checking %zu / %zu"), state.next, state.queue.size()).c_str()); + ImGui::SameLine(); + if (ImGui::SmallButton(STR_C("Cancel"))) + state.queue.resize(state.next); + } + else if (ImGui::Button(STR_C("Check"))) + { + speed_start(); + } + if (ImGui::TreeNode(STR_C("Limits"))) + { + auto &options{state.options}; + ImGui::PushItemWidth(100.0f); + ImGui::InputDouble(STR_C("Unbalanced acceleration (m/s2)"), &options.norms.unbalanced, 0.0, 0.0, "%.2f"); + ImGui::InputDouble(STR_C("Switch branches (m/s2)"), &options.branch_unbalanced, 0.0, 0.0, "%.2f"); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip(STR_C("Unbalanced acceleration allowed on the diverging tracks of the switches, which have no cant.\n0.65 m/s2 gives 40 km/h for R 190 m and 100 km/h for R 1200 m")); + ImGui::InputDouble(STR_C("Cant change rate (mm/s)"), &options.norms.cant_rate, 0.0, 0.0, "%.0f"); + ImGui::InputDouble(STR_C("Cant ramp 1:(k*V), k"), &options.norms.ramp_factor, 0.0, 0.0, "%.1f"); + ImGui::InputDouble(STR_C("Unbalanced acc. change rate (m/s3)"), &options.norms.jerk, 0.0, 0.0, "%.2f"); + ImGui::InputDouble(STR_C("Reference length (m)"), &options.reference_length, 0.0, 0.0, "%.0f"); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip(STR_C("Length over which an abrupt change of the curvature or the cant is felt,\nabout the length of a car. Shorter: stricter for the curves without the transitions")); + ImGui::PopItemWidth(); + options.norms.unbalanced = std::max(0.05, options.norms.unbalanced); + options.branch_unbalanced = std::max(0.05, options.branch_unbalanced); + options.norms.cant_rate = std::max(1.0, options.norms.cant_rate); + options.norms.ramp_factor = std::max(1.0, options.norms.ramp_factor); + options.norms.jerk = std::max(0.01, options.norms.jerk); + options.reference_length = std::clamp(options.reference_length, 2.0, 200.0); + ImGui::TextDisabled(STR_C("Change the limits, then Check again")); + ImGui::TreePop(); + } + if (false == state.status.empty()) + ImGui::TextWrapped("%s", state.status.c_str()); + if (state.results.empty()) + return; + if (state.history != m_history.size()) + ImGui::TextColored(ImVec4(1.0f, 0.75f, 0.3f, 1.0f), STR_C("The scenery changed since the check")); + ImGui::SetNextItemWidth(190.0f); + ImGui::Combo("##speedlimits", &state.limits, "All the paths\0With a speed limit set\0Without a speed limit\0"); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip(STR_C("Paths without a speed limit of their own run at the line speed,\nthose are listed whenever the geometry limits the speed at all")); + ImGui::SameLine(); + ImGui::Checkbox(STR_C("Within their limits too"), &state.show_all); + auto const listed{speed_listed()}; + std::vector violated; + for (auto const index : listed) + if (state.results[index].violated(state.options)) + violated.push_back(index); + if (false == violated.empty()) + { + ImGui::SameLine(); + if (ImGui::Button(format(STR_C("Set the safe speed on %zu paths"), violated.size()).c_str())) + speed_apply(violated, false); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip(STR_C("Lowers the speed limit of each listed path to its safe speed, rounded down to 10 km/h (5 km/h below 40).\n" + "The limits of the switch branches are only warnings and aren't applied here, the button of a single path does.\n" + "A switch has one velocity for both its tracks: negative limits only the diverging one, the main one keeping no limit.\n" + "When the main track needs a limit of its own, the lower of the two applies to both")); + } + auto const namewidth{std::max(120.0f, ImGui::GetContentRegionAvail().x * 0.3f)}; + ImGui::Columns(6, STR_C("speedcolumns"), false); + ImGui::SetColumnWidth(0, namewidth + 8.0f); + for (auto const *header : {"Path", "Set", "Safe", "Suggested", "Cause", "R / cant"}) + { + ImGui::TextDisabled("%s", header); + ImGui::NextColumn(); + } + ImGui::Columns(1); + bool const chosen{state.selected >= 0 && state.selected < static_cast(state.results.size())}; + auto const details{chosen ? ImGui::GetFrameHeightWithSpacing() + ImGui::GetTextLineHeightWithSpacing() * 5.0f : 0.0f}; + ImGui::BeginChild("speedresults", ImVec2(0.0f, -details), true); + ImGui::Columns(6, STR_C("speedrows"), false); + ImGui::SetColumnWidth(0, namewidth); + ImGuiListClipper clipper(static_cast(listed.size())); + while (clipper.Step()) + for (int row = clipper.DisplayStart; row < clipper.DisplayEnd; ++row) + { + auto const index{listed[row]}; + auto const &verdict{state.results[index]}; + bool const violated{verdict.violated(state.options)}; + bool const bad{violated || verdict.warned(state.options)}; + auto const colour{violated ? ImVec4(1.0f, 0.45f, 0.4f, 1.0f) : ImVec4(1.0f, 0.75f, 0.3f, 1.0f)}; + auto name{verdict.track->name().empty() ? std::string{"(noname)"} : verdict.track->name()}; + if (verdict.track->eType == tt_Switch) + name += verdict.path == 0 ? " (main)" : " (branch)"; + if (bad) + ImGui::PushStyleColor(ImGuiCol_Text, colour); + if (ImGui::Selectable((name + "##speed" + std::to_string(index)).c_str(), state.selected == index, ImGuiSelectableFlags_SpanAllColumns)) + speed_focus(index); + if (ImGui::IsItemHovered()) + { + if (bad) + ImGui::PopStyleColor(); + ImGui::SetTooltip("%s", speed_check::explain(verdict, state.options).c_str()); + if (bad) + ImGui::PushStyleColor(ImGuiCol_Text, colour); + } + ImGui::NextColumn(); + ImGui::TextUnformatted(speed_text(verdict.set).c_str()); + ImGui::NextColumn(); + ImGui::TextUnformatted(verdict.safe >= state.options.top ? STR_C("any") : format("%.0f", verdict.safe).c_str()); + ImGui::NextColumn(); + ImGui::TextUnformatted(verdict.safe >= state.options.top ? "-" : format("%.0f", speed_check::suggested(verdict.safe)).c_str()); + ImGui::NextColumn(); + ImGui::TextUnformatted(speed_check::describe(verdict.why)); + ImGui::NextColumn(); + if (verdict.radius > 0.0) + ImGui::Text(STR_C("%.0f m / %.0f mm"), verdict.radius, verdict.cant); + else + ImGui::TextUnformatted("-"); + ImGui::NextColumn(); + if (bad) + ImGui::PopStyleColor(); + } + ImGui::Columns(1); + ImGui::EndChild(); + if (chosen) + { + auto const &verdict{state.results[state.selected]}; + ImGui::TextWrapped("%s", speed_check::explain(verdict, state.options).c_str()); + if ((verdict.violated(state.options) || verdict.warned(state.options)) && ImGui::Button(STR_C("Set the safe speed on this path"))) + speed_apply({state.selected}, true); + } +} + +void editor_mode::draw_speed_overlay() const +{ + auto const &state{m_speed}; + if (false == state.open || state.results.empty()) + return; + screen_projection const projection; + auto *drawlist{ImGui::GetBackgroundDrawList()}; + glm::dvec3 const camera{Global.pCamera.Pos}; + for (int i = 0; i < static_cast(state.results.size()); ++i) + { + auto const &verdict{state.results[i]}; + bool const violated{verdict.violated(state.options)}; + if ((false == violated && false == verdict.warned(state.options)) || glm::distance(verdict.position, camera) > kSpeedOverlayRange) + continue; + ImVec2 screen; + if (false == projection.project(verdict.position, screen)) + continue; + auto const colour{i == state.selected ? IM_COL32(255, 255, 80, 255) : violated ? IM_COL32(255, 70, 60, 230) : IM_COL32(255, 180, 60, 200)}; + drawlist->AddCircle(screen, 12.0f, colour, 16, 2.5f); + auto const text{format("%s > %.0f", speed_text(verdict.set).c_str(), verdict.safe)}; + drawlist->AddText(ImVec2(screen.x + 14.0f, screen.y - 7.0f), colour, text.c_str()); + } +} diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index b3b2c8e25..eec9f2aee 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -19,8 +19,10 @@ http: #include "rendering/renderer.h" #include "world/Track.h" #include "scene/scene.h" +#include "scene/scenelayers.h" #include "simulation/simulation.h" #include "utilities/Logs.h" +#include "utilities/translation.h" #include "imgui/imgui.h" #include "imgui/ImGuizmo.h" @@ -61,13 +63,51 @@ char const *point_label(editor_track::point_kind const Kind) editor_track::point_kind const kPointKinds[] = {editor_track::point_kind::start, editor_track::point_kind::control1, editor_track::point_kind::control2, editor_track::point_kind::end}; float const kHandleRadius{10.0f}; +double const kLaySnapRadius{5.0}; +double const kSwitchReach{6.0}; // a press farther from the selected track selects another one instead of placing the switch +double const kLineReach{2000.0}; // how far each way the Curve tab follows the line +double const kJointRange{400.0}; // the ends of the paths are drawn for the tracks this close to the camera +ImU32 const kJointColor{IM_COL32(255, 255, 255, 200)}; +int const kRailCategory{1}; void item_tooltip(char const *Text) { if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", Text); + ImGui::SetTooltip("%s", STR_C(Text)); } +// circular curve from a point along a direction, cut into pieces of 90 degrees at most. Side: 1 to the left, -1 to the right +std::vector arc_pieces(glm::dvec3 const &Point, glm::dvec2 const &Direction, double const Grade, double const Radius, double const Angle, int const Side) +{ + std::vector result; + double const side{static_cast(Side)}; + glm::dvec2 const centre{plan_of(Point) + glm::dvec2{-Direction.y, Direction.x} * (side * Radius)}; + auto const count{std::max(1, static_cast(std::ceil(Angle / glm::radians(90.0) - 1e-9)))}; + auto const step{Angle / count}; + auto const handle{4.0 / 3.0 * std::tan(step / 4.0) * Radius}; + glm::dvec2 const radial{plan_of(Point) - centre}; + for (int i = 0; i < count; ++i) + { + auto const a0{side * step * i}; + auto const a1{side * step * (i + 1)}; + auto const p0{centre + turned(radial, a0)}; + auto const p3{centre + turned(radial, a1)}; + auto const d0{turned(Direction, a0)}; + auto const d3{turned(Direction, a1)}; + auto const y0{Point.y + Grade * Radius * step * i}; + auto const y3{Point.y + Grade * Radius * step * (i + 1)}; + segment_data path; + path.points[segment_data::point::start] = {p0.x, y0, p0.y}; + path.points[segment_data::point::end] = {p3.x, y3, p3.y}; + path.points[segment_data::point::control1] = {d0.x * handle, Grade * handle, d0.y * handle}; + path.points[segment_data::point::control2] = {-d3.x * handle, -Grade * handle, -d3.y * handle}; + path.radius = static_cast(Radius); + result.push_back(path); + } + return result; +} + + } TTrack *editor_mode::selected_track() const @@ -97,21 +137,24 @@ void editor_mode::select_track(scene::basic_node *Node) if (ui()->mode() != nodebank_panel::TRACK) return; m_track_window_open = true; - if (track->eType == tt_Switch) + m_track_mode_notice.clear(); + // the mode stays as it is, the path is taken up by it if it can be + switch (m_track_tab) { - m_track_tab = track_tab::turnout; - } - else if (editor_track::is_straight(*track, m_straights.tolerance)) - { - m_track_tab = track_tab::straights; - } - else if (std::find(m_route.chain.tracks.begin(), m_route.chain.tracks.end(), track) != m_route.chain.tracks.end() || route_from_curve(*track)) - { - m_track_tab = track_tab::route; - } - else - { - m_track_tab = track_tab::path; + case track_tab::straights: + if (track->eType == tt_Switch || false == editor_track::is_straight(*track, m_straights.tolerance)) + m_track_mode_notice = STR_C("The selected path isn't straight: C edits it as a curve, Esc goes back to Select"); + break; + case track_tab::route: + if (std::find(m_route.chain.tracks.begin(), m_route.chain.tracks.end(), track) != m_route.chain.tracks.end()) + break; + if (track->eType != tt_Normal || false == editor_track::is_supported(*track)) + m_track_mode_notice = STR_C("Switches aren't a part of a line: T edits the switch, Esc goes back to Select"); + else if (false == route_load(*track)) + m_track_mode_notice = m_route.error.empty() ? std::string{STR_C("The curve can't be read from this path, edit it as a single path")} : m_route.error; + break; + default: + break; } } @@ -237,7 +280,15 @@ void editor_mode::render_track_gizmo() m_track_pivot = editor_track::pivot(*track); m_track_drag = {track}; m_track_drag_points.clear(); + m_track_joints.clear(); m_track_snap = {}; + if (false == pointmode && m_track_drag_connected) + { + m_track_joints = editor_track::joints(*track); + for (auto const &joint : m_track_joints) + if (std::find(m_track_drag.begin(), m_track_drag.end(), joint.other) == m_track_drag.end()) + m_track_drag.emplace_back(joint.other); + } if (pointmode && editor_track::is_end(m_track_point.kind) && m_track_drag_connected) { for (auto const &connection : editor_track::connected_points(*track, editor_track::point_position(*track, m_track_point))) @@ -262,6 +313,7 @@ void editor_mode::render_track_gizmo() if (std::abs(angle) > 1e-9) { editor_track::rotate_y(*track, m_track_pivot, angle); + editor_track::follow(*track, m_track_joints); m_track_dirty = true; } } @@ -284,6 +336,7 @@ void editor_mode::render_track_gizmo() if (glm::length(offset) > 1e-9) { editor_track::translate(*track, offset); + editor_track::follow(*track, m_track_joints); m_track_dirty = true; } } @@ -301,6 +354,7 @@ void editor_mode::render_track_gizmo() m_track_gizmo_using = false; m_track_drag.clear(); m_track_drag_points.clear(); + m_track_joints.clear(); } } @@ -337,12 +391,27 @@ void editor_mode::push_track_snapshot(std::vectoruuid; snap.tracks = std::move(States); snap.created = std::move(Created); - infra_attach(snap); snap.removed = std::move(Removed); + infra_attach(snap); m_history.push_back(std::move(snap)); g_redo.clear(); } +bool editor_mode::tracks_editable(std::vector const &Tracks, std::string &Reason) +{ + for (auto const *track : Tracks) + { + std::string reason; + if (track != nullptr && false == editor_track::can_edit_geometry(*track, reason)) + { + Reason = (track->name().empty() ? std::string{"(noname)"} : track->name()) + ": " + reason; + return false; + } + } + Reason.clear(); + return true; +} + void editor_mode::restore_track_snapshot(EditorSnapshot const &Snapshot, std::vector &Opposite, bool const Undo) { if (Snapshot.tracks.empty() && Snapshot.created.empty() && Snapshot.removed.empty()) @@ -363,6 +432,16 @@ void editor_mode::restore_track_snapshot(EditorSnapshot const &Snapshot, std::ve for (auto const &entry : Snapshot.infra) if (auto const *binding{infra_find(entry.saved)}) current.infra.push_back(infra_state_of(*binding)); + if (Snapshot.profiles) + { + std::vector layers; + for (auto const *library : {&std::as_const(m_profiles), &Snapshot.profile_library}) + for (auto const &entry : *library) + layers.push_back(entry.layer); + current.profile_library = std::move(m_profiles); + m_profiles = Snapshot.profile_library; + profile_library_mark(std::move(layers)); + } Opposite.push_back(std::move(current)); if (Undo) @@ -392,7 +471,7 @@ void editor_mode::restore_track_snapshot(EditorSnapshot const &Snapshot, std::ve if (false == m_route.chain.tracks.empty()) { std::string error; - if (m_route.from->m_editorremoved || m_route.to->m_editorremoved || false == editor_track::find_chain(m_route.from, m_route.to, m_route.chain, error)) + if (m_route.from->m_editorremoved || m_route.to->m_editorremoved || false == editor_track::find_chain(m_route.from, m_route.to, m_route.chain, error, true)) { m_route.chain = {}; m_route.result = {}; @@ -412,125 +491,294 @@ void editor_mode::restore_track_snapshot(EditorSnapshot const &Snapshot, std::ve ui()->set_node(m_node); straight_refresh(); profile_after_undo(); + if (Snapshot.profiles && false == m_profile.route.spans.empty()) + profile_restore(); } -void editor_mode::render_track_ui() +std::array const &editor_mode::track_modes() { - ImGui::TextDisabled("LMB on a path opens its editor: straight, curve or switch"); - if (ImGui::Button("Open the editor window")) - m_track_window_open = true; - ImGui::SameLine(); - if (ImGui::Button("Vertical profile (grade line)")) - { - if (auto *track{selected_track()}; track != nullptr && m_profile.route.spans.empty()) - profile_open_run(*track); - m_profile.open = true; - } - ImGui::SameLine(); - if (ImGui::Button("Infrastructure")) - m_infra.open = true; - if (ImGui::CollapsingHeader("Straights in the scenery")) - render_straights_ui(); - render_switch_ui(); + static std::array const modes{{ + {"Select", "Esc", track_tab::path, "LMB on a path selects it: its points, control vectors and parameters"}, + {"Lay track", "L", track_tab::lay, "Lays new track through the clicked points, on the ground or from a free end of a track"}, + {"Switch", "T", track_tab::turnout, "Puts switches into the selected straight or curve, edits the geometry of the selected switch"}, + {"Straight", "G", track_tab::straights, "The whole straight through the selected path: drag its ends or the middle, break it, shift it"}, + {"Curve", "C", track_tab::route, "The line through the path, switch to switch: vertices with the radii, transitions and cant of the curves"}, + {"Profile", "P", track_tab::profile, "Vertical profile (grade line) along the line"}, + {"Speed", "V", track_tab::speed, "Speed limits of the paths against the speed their geometry allows"}, + {"Infra", "I", track_tab::infra, "Infrastructure along the track, bound to follow its changes"}, + }}; + return modes; } -void editor_mode::render_track_window() +void editor_mode::render_track_menu() { - if (false == m_track_window_open || selected_track() == nullptr) + if (false == ImGui::BeginMenu(STR_C("Tracks"))) return; - char const *title{"Path###trackeditor"}; - switch (m_track_tab) + if (ImGui::MenuItem(STR_C("Track editor"), nullptr, m_track_window_open)) { - case track_tab::straights: title = "Straight###trackeditor"; break; - case track_tab::route: title = "Curve###trackeditor"; break; - case track_tab::turnout: title = "Switch###trackeditor"; break; - default: break; - } - ImGui::SetNextWindowSize(ImVec2(460.0f, 520.0f), ImGuiCond_FirstUseEver); - if (false == ImGui::Begin(title, &m_track_window_open)) - { - ImGui::End(); - return; - } - render_track_modes(*selected_track()); - switch (m_track_tab) - { - case track_tab::straights: - m_route_tab = true; - render_straight_ui(); - break; - case track_tab::route: - m_route_tab = true; - render_route_ui(); - break; - case track_tab::turnout: - m_route_tab = true; - render_turnout_ui(); - break; - default: - m_route_tab = false; - render_path_ui(); - break; + if (m_track_window_open) + m_track_window_open = false; + else + show_track_tab(m_track_tab); } ImGui::Separator(); - if (ImGui::SmallButton("Vertical profile along this line") && selected_track() != nullptr) - profile_open_run(*selected_track()); - ImGui::SameLine(); - if (ImGui::SmallButton("Infrastructure along this line")) + for (auto const &mode : track_modes()) { - m_infra.open = true; - m_infra.scope = 1; - infra_recognize(); + if (ImGui::MenuItem(STR_C(mode.label), mode.key, m_track_window_open && m_track_tab == mode.tab)) + show_track_tab(mode.tab); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C(mode.tooltip)); } - ImGui::End(); + ImGui::Separator(); + ImGui::MenuItem(STR_C("Structure gauge"), nullptr, &m_gauge.open); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Checks which models enter the structure gauge of the tracks and the clearance over the roads (skrajnia budowli)")); + ImGui::EndMenu(); } -void editor_mode::render_track_modes(TTrack &Track) +void editor_mode::show_track_tab(track_tab const Tab) { - bool const isswitch{Track.eType == tt_Switch}; - bool const straight{false == isswitch && editor_track::is_straight(Track, m_straights.tolerance)}; - bool const curve{Track.eType == tt_Normal && false == straight && editor_track::is_supported(Track)}; - struct mode + m_track_window_open = true; + m_roadtool.window = false; + if (Tab == m_track_tab) + return; + m_track_mode_notice.clear(); + // what was going on in the mode left stays behind + cancel_track_tools(); + m_straights.tool = 0; + m_lay.points.clear(); + m_lay.start = {}; + m_lay.preview.clear(); + m_lay.status.clear(); + m_lay.active = Tab == track_tab::lay; + m_switch.armed = -1; + m_track_tab = Tab; + auto *track{selected_track()}; + switch (Tab) { - char const *label; - track_tab tab; - bool available; - char const *tooltip; - char const *unavailable; - }; - mode const modes[] = { - {"Path", track_tab::path, true, "Points, control vectors and parameters of the selected path", ""}, - {"Straight", track_tab::straights, straight, "The whole straight through the selected path: drag its ends or the middle, break it, shift it", "The selected path isn't straight"}, - {"Curve", track_tab::route, curve, "The curve between the adjoining straights: radius, transitions, cant", "The selected path isn't a curve"}, - {"Switch", track_tab::turnout, isswitch, "Geometry of the switch from a template, side of the diverging track", "The selected path isn't a switch"}, - }; - for (auto const &entry : modes) - { - if (&entry != &modes[0]) - ImGui::SameLine(); - bool const active{m_track_tab == entry.tab}; - if (active) - ImGui::PushStyleColor(ImGuiCol_Button, ImGui::GetStyleColorVec4(ImGuiCol_ButtonActive)); - if (false == entry.available) - ImGui::PushStyleVar(ImGuiStyleVar_Alpha, ImGui::GetStyle().Alpha * 0.4f); - if (ImGui::Button(entry.label, ImVec2(80.0f, 0.0f)) && entry.available && false == active) + case track_tab::turnout: + arm_switch(); + break; + case track_tab::straights: + if (track != nullptr && (track->eType == tt_Switch || false == editor_track::is_straight(*track, m_straights.tolerance))) + m_track_mode_notice = STR_C("The selected path isn't straight: LMB on a straight"); + break; + case track_tab::route: + if (track != nullptr && std::find(m_route.chain.tracks.begin(), m_route.chain.tracks.end(), track) == m_route.chain.tracks.end()) { - m_track_mode_notice.clear(); - if (entry.tab != track_tab::route || std::find(m_route.chain.tracks.begin(), m_route.chain.tracks.end(), &Track) != m_route.chain.tracks.end() || route_from_curve(Track)) - m_track_tab = entry.tab; - else - m_track_mode_notice = "No straights found at both ends of the curve, edit it as a single path"; + if (track->eType != tt_Normal || false == editor_track::is_supported(*track)) + m_track_mode_notice = STR_C("Switches aren't a part of a line: LMB on a plain path"); + else if (false == route_load(*track)) + m_track_mode_notice = m_route.error.empty() ? std::string{STR_C("The curve can't be read from this path, edit it as a single path")} : m_route.error; } - if (false == entry.available) - ImGui::PopStyleVar(); - if (active) - ImGui::PopStyleColor(); - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", entry.available ? entry.tooltip : entry.unavailable); + break; + case track_tab::profile: + if (track != nullptr && m_profile.route.spans.empty()) + profile_open_run(*track); + break; + default: + break; + } +} + +void editor_mode::arm_switch() +{ + auto &tool{m_switch}; + if (false == tool.collected) + { + tool.templates = editor_track::standard_switch_templates(); + auto const found{editor_track::find_switch_templates()}; + tool.templates.insert(tool.templates.end(), found.begin(), found.end()); + tool.collected = true; + } + tool.status.clear(); + tool.armed = tool.templates.empty() ? -1 : std::clamp(tool.last, 0, static_cast(tool.templates.size()) - 1); +} + +bool editor_mode::track_shortcut(int const Key) +{ + for (auto const &mode : track_modes()) + { + if (mode.key[1] != '\0' || Key != GLFW_KEY_A + (mode.key[0] - 'A')) + continue; + // the key of the mode on leaves it + show_track_tab(m_track_window_open && m_track_tab == mode.tab ? track_tab::path : mode.tab); + return true; + } + return false; +} + +bool editor_mode::track_busy() const +{ + auto const &straights{m_straights}; + return (m_lay.active && false == m_lay.points.empty()) || straights.dragging || m_extend.active || m_switch.placing || m_track_point.valid() || m_route.vertex >= 0 || m_route.grip >= 0 || false == straights.detour.empty() || straights.tool != 0 || straights.handle >= 0; +} + +std::string editor_mode::track_mode_name() const +{ + if (false == m_track_window_open) + return STR_C("Select: LMB on a path"); + switch (m_track_tab) + { + case track_tab::lay: return STR_C("Laying track: LMB adds the points"); + case track_tab::turnout: + if (m_switch.placing) + return STR_C("Switch: drag to set its direction and side"); + return STR_C("Switch: press and drag on the selected track"); + case track_tab::straights: + if (false == m_straights.detour.empty()) + return STR_C("Straight: shift around, Shift+click the points"); + if (m_straights.tool == 1) + return STR_C("Straight: break, LMB on the straight"); + if (m_straights.tool == 2) + return STR_C("Straight: S-curve, LMB on the straight"); + return STR_C("Straight: drag its ends or the middle"); + case track_tab::route: return STR_C("Curve: drag the vertices and the radius grips"); + case track_tab::profile: return STR_C("Vertical profile: edit the grade line in the profile window"); + case track_tab::speed: return STR_C("Speed check: LMB on a row shows the path"); + case track_tab::infra: return STR_C("Infrastructure along the track"); + default: return m_extend.active ? STR_C("New path from the free end") : selected_track() != nullptr ? STR_C("Select: drag the points of the path") : STR_C("Select: LMB on a path"); + } +} + +void editor_mode::render_track_inspector() +{ + auto const &io{ImGui::GetIO()}; + m_profile.open = m_track_window_open && m_track_tab == track_tab::profile; + m_speed.open = m_track_window_open && m_track_tab == track_tab::speed; + m_infra.open = m_track_window_open && m_track_tab == track_tab::infra; + ui()->set_track(m_track_window_open); + if (false == m_track_window_open) + { + // a closed window takes its mode with it + if (m_track_tab != track_tab::path) + show_track_tab(track_tab::path); + m_track_window_open = false; + return; + } + + auto *track{selected_track()}; + m_route_tab = m_track_tab != track_tab::path; + + ImGui::SetNextWindowPos(ImVec2(io.DisplaySize.x - 460.0f, ImGui::GetFrameHeight() + 8.0f), ImGuiCond_FirstUseEver); + ImGui::SetNextWindowSize(ImVec2(440.0f, std::min(720.0f, io.DisplaySize.y - 80.0f)), ImGuiCond_FirstUseEver); + std::string title{STR_C("Tracks")}; + if (track != nullptr && m_track_tab != track_tab::lay && false == track_analysis_tab()) + title += ": " + (track->name().empty() ? std::string{"(noname)"} : track->name()); + title += "###trackinspector"; + if (ImGui::Begin(title.c_str(), &m_track_window_open, ImGuiWindowFlags_NoCollapse)) + { + render_track_modes(track); + ImGui::BeginChild("##trackmode"); + switch (m_track_tab) + { + case track_tab::lay: + render_lay_ui(); + break; + case track_tab::turnout: + if (track != nullptr && track->eType == tt_Switch) + render_turnout_ui(); + else + render_switch_ui(); + break; + case track_tab::straights: + render_straight_ui(); + if (ImGui::CollapsingHeader(STR_C("Straights in the scenery"))) + render_straights_ui(); + break; + case track_tab::route: + render_route_ui(); + break; + case track_tab::profile: render_profile_body(); break; + case track_tab::speed: render_speed_body(); break; + case track_tab::infra: render_infra_body(); break; + default: + if (track != nullptr) + render_path_ui(); + else + ImGui::TextDisabled("%s", STR_C("LMB on a path in the view selects it")); + break; + } + ImGui::EndChild(); + } + ImGui::End(); + if (false == m_track_window_open) + ui()->set_track(false); + + if (m_track_tab == track_tab::profile && m_track_window_open && false == m_profile.route.spans.empty()) + render_profile_strip(); +} + +void editor_mode::render_track_modes(TTrack *Track) +{ + auto const &modes{track_modes()}; + auto const row = [&](char const *Label, int const From, int const To) { + ImGui::AlignTextToFramePadding(); + ImGui::TextDisabled("%s", STR_C(Label)); + for (int i = From; i < To; ++i) + { + auto const &mode{modes[i]}; + ImGui::SameLine(i == From ? 72.0f : 0.0f); + auto const label{std::string{STR_C(mode.label)} + "###trackmode" + std::to_string(i)}; + if (ImGui::RadioButton(label.c_str(), m_track_tab == mode.tab)) + show_track_tab(mode.tab); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s [%s]", STR_C(mode.tooltip), mode.key); + } + }; + row("Edit", 0, 5); + row("Analysis", 5, static_cast(modes.size())); + ImGui::Spacing(); + render_track_guide(); + if (Track != nullptr && m_track_tab != track_tab::lay && false == track_analysis_tab()) + { + char const *type = Track->eType == tt_Normal ? "normal" : Track->eType == tt_Switch ? "switch" : Track->eType == tt_Cross ? "cross" : Track->eType == tt_Table ? "turntable" : Track->eType == tt_Tributary ? "tributary" : "unknown"; + ImGui::TextDisabled("%s, %.2f m", STR_C(type), Track->Length()); + } +} + +void editor_mode::render_track_guide() +{ + auto const hints{track_key_hints(false)}; + auto *drawlist{ImGui::GetWindowDrawList()}; + auto const &style{ImGui::GetStyle()}; + drawlist->ChannelsSplit(2); + drawlist->ChannelsSetCurrent(1); + auto const origin{ImGui::GetCursorScreenPos()}; + ImGui::SetCursorScreenPos(ImVec2(origin.x + 8.0f, origin.y + 6.0f)); + ImGui::BeginGroup(); + auto const mode{track_mode_name()}; + ImGui::TextColored(ImVec4(0.55f, 0.8f, 1.0f, 1.0f), "%s", mode.c_str()); + ImGui::SameLine(ImGui::GetWindowContentRegionMax().x - ImGui::CalcTextSize("(?)").x - 8.0f); + ImGui::TextDisabled("(?)"); + if (ImGui::IsItemHovered()) + { + std::string text; + for (auto const &hint : track_key_hints(true)) + text += std::string{hint.key} + " " + hint.action + "\n"; + ImGui::SetTooltip("%s", text.c_str()); + } + float keywidth{0.0f}; + for (auto const &hint : hints) + keywidth = std::max(keywidth, ImGui::CalcTextSize(hint.key).x); + auto const left{ImGui::GetCursorPosX()}; + for (auto const &hint : hints) + { + ImGui::TextColored(ImVec4(1.0f, 0.82f, 0.25f, 1.0f), "%s", hint.key); + ImGui::SameLine(left + keywidth + 12.0f); + ImGui::PushTextWrapPos(ImGui::GetWindowContentRegionMax().x - 8.0f); + ImGui::TextUnformatted(hint.action.c_str()); + ImGui::PopTextWrapPos(); } if (false == m_track_mode_notice.empty()) ImGui::TextColored(ImVec4(1.0f, 0.7f, 0.2f, 1.0f), "%s", m_track_mode_notice.c_str()); - ImGui::Separator(); + ImGui::EndGroup(); + auto const bottom{ImGui::GetItemRectMax().y + 6.0f}; + drawlist->ChannelsSetCurrent(0); + drawlist->AddRectFilled(origin, ImVec2(ImGui::GetWindowPos().x + ImGui::GetWindowContentRegionMax().x, bottom), IM_COL32(40, 70, 110, 110), style.FrameRounding + 3.0f); + drawlist->ChannelsMerge(); + ImGui::SetCursorScreenPos(ImVec2(origin.x, bottom + style.ItemSpacing.y)); + ImGui::Dummy(ImVec2(0.0f, 0.0f)); } void editor_mode::render_turnout_ui() @@ -541,18 +789,24 @@ void editor_mode::render_turnout_ui() auto const &main{track->m_paths[0]}; auto const &diverging{track->m_paths[1]}; auto const origin{main.points[segment_data::point::start]}; - glm::dvec2 const axis{glm::normalize(plan_of(main.points[segment_data::point::end] - origin))}; + auto const chord{plan_of(main.points[segment_data::point::end] - origin)}; + auto const &control2{diverging.points[segment_data::point::control2]}; + auto const control{glm::length(plan_of(control2)) > 1e-6 ? control2 : diverging.points[segment_data::point::start] - diverging.points[segment_data::point::end]}; + if (glm::length(chord) < 1e-3 || glm::length(plan_of(control)) < 1e-6) + { + ImGui::TextColored(ImVec4(1.0f, 0.4f, 0.3f, 1.0f), STR_C("The geometry of this switch is degenerate, it can't be edited here")); + return; + } + glm::dvec2 const axis{glm::normalize(chord)}; glm::dvec2 const normal{-axis.y, axis.x}; - auto const length{glm::dot(plan_of(main.points[segment_data::point::end] - origin), axis)}; + auto const length{glm::dot(chord, axis)}; glm::dvec2 const end{diverging.points[segment_data::point::end].x - origin.x, diverging.points[segment_data::point::end].z - origin.z}; auto const offset{glm::dot(end, normal)}; - auto const &control{diverging.points[segment_data::point::control2]}; glm::dvec2 const tangent{glm::normalize(glm::dvec2{-control.x, -control.z})}; auto const angle{std::atan2(std::abs(tangent.x * axis.y - tangent.y * axis.x), glm::dot(tangent, axis))}; - ImGui::Text("%s", track->name().empty() ? "(noname)" : track->name().c_str()); - ImGui::Text("Length %.3f m, diverging %s, end offset %.3f m", length, offset > 0.0 ? "left" : "right", std::abs(offset)); + ImGui::Text(STR_C("Length %.3f m, diverging %s, end offset %.3f m"), length, offset > 0.0 ? STR_C("left") : STR_C("right"), std::abs(offset)); if (angle > 1e-6) - ImGui::Text("Angle 1:%.2f (%.4f deg), R in the entry %.0f m", 1.0 / std::tan(angle), glm::degrees(angle), diverging.radius); + ImGui::Text(STR_C("Angle 1:%.2f (%.4f deg), R in the entry %.0f m"), 1.0 / std::tan(angle), glm::degrees(angle), diverging.radius); auto &tool{m_switch}; if (false == tool.collected) @@ -565,12 +819,21 @@ void editor_mode::render_turnout_ui() if (tool.templates.empty()) return; m_turnout_template = std::clamp(m_turnout_template, 0, static_cast(tool.templates.size()) - 1); + if (tool.templates[m_turnout_template].double_slip) + { + auto const ordinary{std::find_if(tool.templates.begin(), tool.templates.end(), [](auto const &Template) { return false == Template.double_slip; })}; + if (ordinary == tool.templates.end()) + return; + m_turnout_template = static_cast(ordinary - tool.templates.begin()); + } ImGui::Separator(); ImGui::PushItemWidth(-1.0f); if (ImGui::BeginCombo("##turnouttemplate", tool.templates[m_turnout_template].label.c_str())) { for (int i = 0; i < static_cast(tool.templates.size()); ++i) { + if (tool.templates[i].double_slip) + continue; auto const label{(tool.templates[i].source != nullptr ? "Scenery: " : "PLK: ") + tool.templates[i].label}; if (ImGui::Selectable(label.c_str(), i == m_turnout_template)) m_turnout_template = i; @@ -580,17 +843,47 @@ void editor_mode::render_turnout_ui() ImGui::PopItemWidth(); auto const replace = [&](editor_track::switch_template const &Template, int const Side) { auto const grade{length > 0.0 ? (main.points[segment_data::point::end].y - origin.y) / length : 0.0}; - auto const paths{editor_track::place_switch(Template, origin, axis, Side, grade)}; - push_track_snapshot({{track, editor_track::capture(*track)}}); + auto paths{editor_track::place_switch(Template, origin, axis, Side, grade)}; + if (paths.size() < 2) + return; + for (int i = 0; i < 2; ++i) + if (paths[i].rolls[0] == 0.f && paths[i].rolls[1] == 0.f) + paths[i].rolls = track->m_paths[i].rolls; + auto const joints{editor_track::joints(*track)}; + std::vector> states{{track, editor_track::capture(*track)}}; track->m_paths.assign(paths.begin(), paths.begin() + 2); - editor_track::commit({track}); + // the neighbours follow the ends which moved a little, those which went far are left loose + std::vector following; + std::vector changed{track}; + std::string loose; + for (auto const &joint : joints) + { + auto const &theirs{joint.other->m_paths[joint.theirs.path]}; + auto const shift{glm::distance(editor_track::point_position(*track, joint.own), editor_track::point_position(*joint.other, joint.theirs))}; + if (shift > 0.3 * bezier{theirs}.plan_length()) + { + loose += (loose.empty() ? "" : ", ") + (joint.other->name().empty() ? std::string{"(noname)"} : joint.other->name()); + continue; + } + following.push_back(joint); + if (std::find(changed.begin(), changed.end(), joint.other) == changed.end()) + { + changed.push_back(joint.other); + states.emplace_back(joint.other, editor_track::capture(*joint.other)); + } + } + push_track_snapshot(std::move(states)); + editor_track::follow(*track, following); + editor_track::commit(changed); + if (false == loose.empty()) + ui()->set_status(STR_C("Too far from the new ends of the switch, left unjoined: ") + loose, true); }; int const side{offset > 0.0 ? 1 : -1}; - if (ImGui::Button("Replace the geometry with the template")) + if (ImGui::Button(STR_C("Replace the geometry with the template"))) replace(tool.templates[m_turnout_template], side); item_tooltip("Keeps the start and the direction of the switch, takes the shape of the chosen template"); ImGui::SameLine(); - if (ImGui::Button("Flip the side")) + if (ImGui::Button(STR_C("Flip the side"))) { auto const current{editor_track::find_switch_templates()}; editor_track::switch_template own; @@ -641,103 +934,305 @@ void editor_mode::render_path_parameters(TTrack &Track) track->mark_dirty(); }; - if (ImGui::CollapsingHeader("Path parameters", ImGuiTreeNodeFlags_DefaultOpen)) + ImGui::PushItemWidth(120.0f); + double velocity = editor_track::velocity(*track); + if (ImGui::InputDouble(STR_C("Velocity (km/h, -1: none)"), &velocity, 0.0, 0.0, "%.1f")) + editor_track::velocity(*track, velocity); + item_tooltip("Speed limit of the path for the AI drivers and the timetable, -1: no limit of its own"); + finish_edit(rebuild::none); + char const *environments[] = {"flat", "mountains", "canyon", "tunnel", "bridge", "bank"}; + int environment = std::clamp(static_cast(track->eEnvironment), 0, 5); + if (ImGui::Combo("Environment", &environment, environments, IM_ARRAYSIZE(environments))) + { + track->eEnvironment = static_cast(environment); + apply_now(rebuild::none); + } + item_tooltip("Surroundings of the path, they affect the sound of the passing vehicles"); + + ImGui::PopItemWidth(); + + if (ImGui::CollapsingHeader(STR_C("Ride and sound"))) { ImGui::PushItemWidth(120.0f); - double velocity = editor_track::velocity(*track); - if (ImGui::InputDouble("Velocity (km/h, -1: none)", &velocity, 0.0, 0.0, "%.1f")) - editor_track::velocity(*track, velocity); - item_tooltip("Speed limit of the path for the AI drivers and the timetable, -1: no limit of its own"); - finish_edit(rebuild::none); - if (ImGui::InputFloat("Friction", &track->fFriction, 0.0f, 0.0f, "%.3f")) + if (ImGui::InputFloat(STR_C("Friction"), &track->fFriction, 0.0f, 0.0f, "%.3f")) track->fFriction = std::max(0.0f, track->fFriction); item_tooltip("Friction coefficient of the rails, 0.15 for the dry rails; lower values make the wheels slip"); finish_edit(rebuild::none); - ImGui::InputFloat("Sound distance", &track->fSoundDistance, 0.0f, 0.0f, "%.1f"); + ImGui::InputFloat(STR_C("Sound distance"), &track->fSoundDistance, 0.0f, 0.0f, "%.1f"); item_tooltip("Distance between the rail joints in metres, sets the rhythm of the wheel clatter; -1: the default"); finish_edit(rebuild::none); - ImGui::InputInt("Quality", &track->iQualityFlag, 0); + ImGui::InputInt(STR_C("Quality"), &track->iQualityFlag, 0); item_tooltip("Quality of the track, 20 is the nominal one; lower values give a rougher ride"); finish_edit(rebuild::none); int damage = track->iDamageFlag; - if (ImGui::InputInt("Damage flags", &damage, 0)) + if (ImGui::InputInt(STR_C("Damage flags"), &damage, 0)) editor_track::damage(*track, damage); item_tooltip("0: track in order; any value adds jolts, 128: the vehicles derail on the path"); finish_edit(rebuild::none); - char const *environments[] = {"flat", "mountains", "canyon", "tunnel", "bridge", "bank"}; - int environment = std::clamp(static_cast(track->eEnvironment), 0, 5); - if (ImGui::Combo("Environment", &environment, environments, IM_ARRAYSIZE(environments))) - { - track->eEnvironment = static_cast(environment); - apply_now(rebuild::none); - } - item_tooltip("Surroundings of the path, they affect the sound of the passing vehicles"); - - if (ImGui::InputFloat("Width", &track->fTrackWidth, 0.0f, 0.0f, "%.3f")) + if (ImGui::InputFloat(STR_C("Width"), &track->fTrackWidth, 0.0f, 0.0f, "%.3f")) track->fTrackWidth = std::max(0.01f, track->fTrackWidth); item_tooltip("Gauge of the track (1.435 m for the standard gauge), width of the surface for the roads"); finish_edit(rebuild::parameters); ImGui::PopItemWidth(); - - if (track->m_visible) + } + if (track->m_visible && ImGui::CollapsingHeader(STR_C("Textures and trackbed"))) + { + material_handle *materials[] = {&track->m_material1, &track->m_material2, track->SwitchExtension ? &track->SwitchExtension->m_material3 : nullptr}; + char const *pathlabels[] = {"Texture 1 (rails/surface)", "Texture 2 (trackbed/side)", "Trackbed (switch)"}; + char const *switchlabels[] = {"Rails P1-P2", "Rails P3-P4", "Trackbed"}; + auto const &labels{track->eType == tt_Switch ? switchlabels : pathlabels}; + if (false == ImGui::IsAnyItemActive()) { - material_handle *materials[] = {&track->m_material1, &track->m_material2, track->SwitchExtension ? &track->SwitchExtension->m_material3 : nullptr}; - char const *pathlabels[] = {"Texture 1 (rails/surface)", "Texture 2 (trackbed/side)", "Trackbed (switch)"}; - char const *switchlabels[] = {"Rails P1-P2", "Rails P3-P4", "Trackbed"}; - auto const &labels{track->eType == tt_Switch ? switchlabels : pathlabels}; - if (false == ImGui::IsAnyItemActive()) - { - for (int i = 0; i < 3; ++i) - { - if (m_track_material_edited[i] != nullptr) - continue; - auto const name = materials[i] ? editor_track::material_name(*materials[i]) : std::string{}; - std::strncpy(m_track_materials[i].data(), name.c_str(), m_track_materials[i].size() - 1); - m_track_materials[i].back() = '\0'; - } - } for (int i = 0; i < 3; ++i) { - if (materials[i] == nullptr || (i == 2 && track->eType != tt_Switch)) + if (m_track_material_edited[i] != nullptr) continue; - ImGui::PushItemWidth(-160.0f); - if (ImGui::InputText(labels[i], m_track_materials[i].data(), m_track_materials[i].size())) - m_track_material_edited[i] = track; - if (ImGui::IsItemDeactivated() && m_track_material_edited[i] != nullptr) - { - auto const *edited{m_track_material_edited[i]}; - m_track_material_edited[i] = nullptr; - if (edited == track && m_track_materials[i].data() != editor_track::material_name(*materials[i])) - { - *materials[i] = editor_track::fetch_material(m_track_materials[i].data()); - apply_now(rebuild::parameters); - } - } - ImGui::PopItemWidth(); + auto const name = materials[i] ? editor_track::material_name(*materials[i]) : std::string{}; + std::strncpy(m_track_materials[i].data(), name.c_str(), m_track_materials[i].size() - 1); + m_track_materials[i].back() = '\0'; + } + } + for (int i = 0; i < 3; ++i) + { + if (materials[i] == nullptr || (i == 2 && track->eType != tt_Switch)) + continue; + ImGui::PushItemWidth(-160.0f); + if (ImGui::InputText(labels[i], m_track_materials[i].data(), m_track_materials[i].size())) + m_track_material_edited[i] = track; + if (ImGui::IsItemDeactivated() && m_track_material_edited[i] != nullptr) + { + auto const *edited{m_track_material_edited[i]}; + m_track_material_edited[i] = nullptr; + if (edited == track && m_track_materials[i].data() != editor_track::material_name(*materials[i])) + { + *materials[i] = editor_track::fetch_material(m_track_materials[i].data()); + apply_now(rebuild::parameters); + } } - ImGui::TextDisabled("The texture changes on Enter or leaving the field, \"none\" removes it"); - - ImGui::PushItemWidth(120.0f); - if (ImGui::InputFloat("Texture length", &track->fTexLength, 0.0f, 0.0f, "%.2f")) - track->fTexLength = std::max(0.01f, track->fTexLength); - item_tooltip("Length in metres after which the texture of the rails and the trackbed repeats"); - finish_edit(rebuild::parameters); - float height = editor_track::texture_height(*track); - if (ImGui::InputFloat("Trackbed height", &height, 0.0f, 0.0f, "%.3f")) - editor_track::texture_height(*track, height); - item_tooltip("Height of the trackbed edge below the rail top, in metres"); - finish_edit(rebuild::parameters); - ImGui::InputFloat("Trackbed width", &track->fTexWidth, 0.0f, 0.0f, "%.3f"); - item_tooltip("Width of the trackbed outside of the rail, in metres"); - finish_edit(rebuild::parameters); - ImGui::InputFloat("Trackbed slope", &track->fTexSlope, 0.0f, 0.0f, "%.3f"); - item_tooltip("Horizontal reach of the slope at the outer edge of the trackbed, in metres"); - finish_edit(rebuild::parameters); ImGui::PopItemWidth(); } + ImGui::TextDisabled(STR_C("The texture changes on Enter or leaving the field, \"none\" removes it")); + + ImGui::PushItemWidth(120.0f); + if (ImGui::InputFloat(STR_C("Texture length"), &track->fTexLength, 0.0f, 0.0f, "%.2f")) + track->fTexLength = std::max(0.01f, track->fTexLength); + item_tooltip("Length in metres after which the texture of the rails and the trackbed repeats"); + finish_edit(rebuild::parameters); + float height = editor_track::texture_height(*track); + if (ImGui::InputFloat(STR_C("Trackbed height"), &height, 0.0f, 0.0f, "%.3f")) + editor_track::texture_height(*track, height); + item_tooltip("Height of the trackbed edge below the rail top, in metres"); + finish_edit(rebuild::parameters); + ImGui::InputFloat(STR_C("Trackbed width"), &track->fTexWidth, 0.0f, 0.0f, "%.3f"); + item_tooltip("Width of the trackbed outside of the rail, in metres"); + finish_edit(rebuild::parameters); + ImGui::InputFloat(STR_C("Trackbed slope"), &track->fTexSlope, 0.0f, 0.0f, "%.3f"); + item_tooltip("Horizontal reach of the slope at the outer edge of the trackbed, in metres"); + finish_edit(rebuild::parameters); + ImGui::PopItemWidth(); + } + render_path_circuits(*track); +} + +void editor_mode::render_path_circuits(TTrack &Track) +{ + auto *track{&Track}; + auto const copy = [](std::array &Buffer, std::string const &Text) { + std::strncpy(Buffer.data(), Text.c_str(), Buffer.size() - 1); + Buffer.back() = '\0'; + }; + auto const isolated_text = [&]() { + std::string text; + for (auto const *isolated : track->Isolated) + text += (text.empty() ? "" : " ") + isolated->asName; + return text; + }; + if (m_track_names_for != track && false == ImGui::IsAnyItemActive()) + { + m_track_names_for = track; + copy(m_track_isolated, isolated_text()); + copy(m_track_sleeper_model, track->m_sleeper_model_name); + copy(m_track_sleeper_skin, track->m_sleeper_skin_name.empty() ? std::string{"none"} : track->m_sleeper_skin_name); + m_track_event[0] = '\0'; + m_track_events_missing.clear(); + } + // one undo step for the change made by the widget just used + auto const changed = [&](editor_track::state const &Before, bool const Geometry) { + push_track_snapshot({{track, Before}}); + if (Geometry) + editor_track::commit_parameters(*track); + else + track->mark_dirty(); + }; + + if (false == ImGui::CollapsingHeader(STR_C("Track circuit, overhead line, sleepers, events"))) + return; + auto const before{editor_track::capture(*track)}; + + ImGui::PushItemWidth(-160.0f); + ImGui::InputText(STR_C("Track circuits"), m_track_isolated.data(), m_track_isolated.size()); + item_tooltip("Names of the track circuits (isolated) the path belongs to, separated by spaces.\n" + "A name which doesn't exist yet makes a new circuit. Changes on leaving the field"); + if (ImGui::IsItemDeactivated() && m_track_isolated.data() != isolated_text()) + { + if (false == track->Dynamics.empty()) + { + ui()->set_status(STR_C("The track circuits can't change while vehicles stand on the path"), true); + copy(m_track_isolated, isolated_text()); + } + else + { + std::istringstream names{m_track_isolated.data()}; + std::vector list; + for (std::string name; names >> name;) + list.push_back(name); + editor_track::isolated(*track, list); + changed(before, false); + copy(m_track_isolated, isolated_text()); + } + } + ImGui::PopItemWidth(); + + int overheadmode{track->fOverhead < 0.f ? 0 : track->fOverhead == 0.f ? 1 : 2}; + ImGui::PushItemWidth(220.0f); + if (ImGui::Combo("Overhead line", &overheadmode, "Normal\0No current, coasting\0Pantographs lowered, speed limit\0")) + { + editor_track::overhead(*track, overheadmode == 0 ? -1.f : overheadmode == 1 ? 0.f : std::max(1.f, track->fOverhead > 0.f ? track->fOverhead : 40.f)); + changed(before, false); + } + ImGui::PopItemWidth(); + item_tooltip("State of the overhead line over the path: the trains coast through a section with no current,\nor lower the pantographs and keep to the speed limit given"); + if (track->fOverhead > 0.f) + { + ImGui::PushItemWidth(120.0f); + float limit{track->fOverhead}; + if (ImGui::InputFloat(STR_C("Speed with the pantographs lowered (km/h)"), &limit, 0.0f, 0.0f, "%.0f")) + editor_track::overhead(*track, std::max(1.f, limit)); + if (ImGui::IsItemActivated()) + m_track_field_before = before; + if (ImGui::IsItemDeactivatedAfterEdit()) + changed(m_track_field_before, false); + ImGui::PopItemWidth(); } + ImGui::Separator(); + bool sleepers{track->m_sleeper_enabled}; + if (ImGui::Checkbox(STR_C("Sleeper models"), &sleepers)) + { + if (sleepers && m_track_sleeper_model[0] == '\0') + { + ui()->set_status(STR_C("Give the sleeper model first"), true); + } + else + { + track->m_sleeper_enabled = sleepers; + track->m_sleeper_model_name = m_track_sleeper_model.data(); + changed(before, true); + } + } + item_tooltip("Repeats a model along the path, the sleepers in place of the drawn trackbed"); + ImGui::PushItemWidth(-160.0f); + auto const name_field = [&](char const *Label, std::array &Buffer, std::string &Value, char const *Tooltip) { + ImGui::InputText(Label, Buffer.data(), Buffer.size()); + item_tooltip(Tooltip); + std::string typed{Buffer.data()}; + if (&Value == &track->m_sleeper_skin_name && typed == "none") + typed.clear(); + if (ImGui::IsItemDeactivated() && typed != Value) + { + Value = typed; + changed(before, track->m_sleeper_enabled); + } + }; + name_field(STR_C("Sleeper model"), m_track_sleeper_model, track->m_sleeper_model_name, STR_C("Path of the .e3d model, as in the scenery file")); + name_field(STR_C("Sleeper skin"), m_track_sleeper_skin, track->m_sleeper_skin_name, STR_C("Replaceable skin of the model, \"none\": the one of the model")); + ImGui::PopItemWidth(); + ImGui::PushItemWidth(120.0f); + auto const number_field = [&](char const *Label, float &Value, char const *Format, char const *Tooltip) { + ImGui::InputFloat(Label, &Value, 0.0f, 0.0f, Format); + item_tooltip(Tooltip); + if (ImGui::IsItemActivated()) + m_track_field_before = before; + if (ImGui::IsItemDeactivatedAfterEdit()) + { + track->m_sleeper_frequency = std::max(0.1f, track->m_sleeper_frequency); + changed(m_track_field_before, track->m_sleeper_enabled); + } + }; + number_field(STR_C("Sleeper spacing (m)"), track->m_sleeper_frequency, "%.3f", STR_C("Distance between the sleepers along the path")); + ImGui::PopItemWidth(); + ImGui::PushItemWidth(200.0f); + ImGui::InputFloat3(STR_C("Sleeper offset (m)"), &track->m_sleeper_offset.x, "%.3f"); + item_tooltip("Shift of each model: sideways, along the path, up"); + if (ImGui::IsItemActivated()) + m_track_field_before = before; + if (ImGui::IsItemDeactivatedAfterEdit()) + changed(m_track_field_before, track->m_sleeper_enabled); + ImGui::PopItemWidth(); + ImGui::PushItemWidth(120.0f); + number_field(STR_C("Trackbed shift (m)"), track->m_sleeper_ballast_z, "%.3f", STR_C("Vertical shift of the drawn trackbed under the sleepers, negative lowers it")); + ImGui::PopItemWidth(); + + ImGui::Separator(); + ImGui::TextUnformatted(STR_C("Events")); + item_tooltip("event0: a vehicle with a crew stands on the path, event1: runs along it towards its start, event2: towards its end.\n" + "eventall0/1/2: the same for any vehicle"); + auto const editable_events{track->Dynamics.empty()}; + for (int list = 0; list < 6; ++list) + { + auto &events{editor_track::events(*track, list)}; + for (std::size_t i = 0; i < events.size(); ++i) + { + auto const &event{events[i]}; + // bound by the name of the path, not written in the file + if (event.first.empty()) + { + ImGui::TextDisabled(STR_C("%s %s (by the name of the path)"), editor_track::event_keyword(list), event.second != nullptr ? STR_C("auto") : "?"); + continue; + } + ImGui::PushID(list * 1000 + static_cast(i)); + if (ImGui::SmallButton("x") && editable_events) + { + events.erase(events.begin() + i); + editor_track::bind_events(*track, m_track_events_missing); + changed(before, false); + ImGui::PopID(); + break; + } + ImGui::SameLine(); + if (event.second == nullptr) + ImGui::TextColored(ImVec4(1.0f, 0.5f, 0.3f, 1.0f), STR_C("%s %s (no such event)"), editor_track::event_keyword(list), event.first.c_str()); + else + ImGui::Text("%s %s", editor_track::event_keyword(list), event.first.c_str()); + ImGui::PopID(); + } + } + ImGui::PushItemWidth(100.0f); + ImGui::Combo("##eventlist", &m_track_event_list, "event0\0event1\0event2\0eventall0\0eventall1\0eventall2\0"); + ImGui::PopItemWidth(); + ImGui::SameLine(); + ImGui::PushItemWidth(-60.0f); + auto const entered{ImGui::InputText("##eventname", m_track_event.data(), m_track_event.size(), ImGuiInputTextFlags_EnterReturnsTrue)}; + ImGui::PopItemWidth(); + ImGui::SameLine(); + if ((ImGui::Button(STR_C("Add")) || entered) && m_track_event[0] != '\0') + { + if (false == editable_events) + { + ui()->set_status(STR_C("The events can't change while vehicles stand on the path"), true); + } + else + { + editor_track::events(*track, m_track_event_list).emplace_back(m_track_event.data(), nullptr); + editor_track::bind_events(*track, m_track_events_missing); + changed(before, false); + m_track_event[0] = '\0'; + } + } + item_tooltip("Name of the event to add to the chosen list. An event which doesn't exist is kept, and reported"); + if (false == m_track_events_missing.empty()) + ImGui::TextColored(ImVec4(1.0f, 0.5f, 0.3f, 1.0f), STR_C("No such events: %s"), m_track_events_missing.c_str()); } void editor_mode::render_path_ui() @@ -745,23 +1240,19 @@ void editor_mode::render_path_ui() auto *track = selected_track(); if (track == nullptr) { - ImGui::TextDisabled("No path selected"); + ImGui::TextDisabled(STR_C("No path selected")); return; } - char const *type = track->eType == tt_Normal ? "normal" : track->eType == tt_Switch ? "switch" : track->eType == tt_Cross ? "cross" : track->eType == tt_Table ? "turntable" : track->eType == tt_Tributary ? "tributary" : "unknown"; - char const *category = (track->iCategoryFlag & 1) ? "rail" : (track->iCategoryFlag & 2) ? "road" : (track->iCategoryFlag & 4) ? "river" : "other"; - ImGui::Text("%s (%s %s, %.2f m)", track->name().empty() ? "(noname)" : track->name().c_str(), category, type, track->Length()); - if (false == editor_track::is_supported(*track)) { - ImGui::TextDisabled("Editing of this path type isn't supported"); + ImGui::TextDisabled(STR_C("Editing of this path type isn't supported")); return; } std::string reason; bool const geometry = editor_track::can_edit_geometry(*track, reason); if (false == geometry) - ImGui::TextColored(ImVec4(1.0f, 0.6f, 0.2f, 1.0f), "Geometry locked: %s", reason.c_str()); + ImGui::TextColored(ImVec4(1.0f, 0.6f, 0.2f, 1.0f), STR_C("Geometry locked: %s"), reason.c_str()); auto const before = editor_track::capture(*track); enum class rebuild { none, parameters, geometry }; @@ -779,34 +1270,16 @@ void editor_mode::render_path_ui() } } }; - auto const apply_now = [&](rebuild const Rebuild) { - push_track_snapshot({{track, before}}); - if (Rebuild == rebuild::parameters) - editor_track::commit_parameters(*track); - else - track->mark_dirty(); - }; - render_path_parameters(*track); - - if (ImGui::CollapsingHeader("Path geometry", ImGuiTreeNodeFlags_DefaultOpen)) + if (geometry) + render_extend_ui(); + if (ImGui::CollapsingHeader(STR_C("Geometry"), ImGuiTreeNodeFlags_DefaultOpen)) { - ImGui::PushItemWidth(120.0f); - ImGui::InputFloat("Snap radius (m)", &m_track_snap_radius, 0.0f, 0.0f, "%.2f"); - item_tooltip("A dragged free end within this distance of another free end joins it on release"); - m_track_snap_radius = std::max(0.0f, m_track_snap_radius); - ImGui::PopItemWidth(); - ImGui::Checkbox("Align with snapped path", &m_track_align_tangent); - item_tooltip("On joining, the end also takes over the direction of the other path, so the joint has no kink"); - ImGui::SameLine(); - ImGui::Checkbox("Drag connected ends", &m_track_drag_connected); - item_tooltip("Dragging a joined end moves the ends of the neighbouring paths with it"); - for (int i = 0; i < static_cast(track->m_paths.size()); ++i) { ImGui::PushID(i); if (track->m_paths.size() > 1) - ImGui::Text("Path %d", i + 1); + ImGui::TextDisabled(STR_C("Path %d"), i + 1); for (auto const kind : kPointKinds) { editor_track::point_ref const point{i, kind}; @@ -818,32 +1291,46 @@ void editor_mode::render_path_ui() if (ImGui::Selectable(label.c_str(), m_track_point == point, 0, ImVec2(90.0f, 0.0f))) m_track_point = (m_track_point == point ? editor_track::point_ref{} : point); } + item_tooltip("(+) joined with another track, (-) a free end"); auto &path = track->m_paths[i]; - if (geometry) + if (false == geometry) { - ImGui::PushItemWidth(-160.0f); - for (auto const kind : {editor_track::point_kind::start, editor_track::point_kind::end}) + auto const &start = path.points[segment_data::point::start]; + auto const &end = path.points[segment_data::point::end]; + ImGui::TextDisabled(STR_C("Start (%.2f, %.2f, %.2f) End (%.2f, %.2f, %.2f)"), start.x, start.y, start.z, end.x, end.y, end.z); + ImGui::PopID(); + continue; + } + ImGui::PushItemWidth(-110.0f); + if (m_track_point.valid() && m_track_point.path == i) + { + auto const kind{m_track_point.kind}; + if (editor_track::is_end(kind)) { auto position = path.points[kind == editor_track::point_kind::start ? segment_data::point::start : segment_data::point::end]; - if (ImGui::InputScalarN(point_label(kind), ImGuiDataType_Double, glm::value_ptr(position), 3, nullptr, nullptr, "%.3f")) - editor_track::move_point(*track, {i, kind}, position); + if (ImGui::DragScalarN("x, y, z##point", ImGuiDataType_Double, glm::value_ptr(position), 3, 0.01f, nullptr, nullptr, "%.3f")) + editor_track::move_point(*track, m_track_point, position); + item_tooltip("Drag to move, Ctrl+click to type the value"); finish_edit(rebuild::geometry); } - ImGui::InputScalarN("Control 1 (relative)", ImGuiDataType_Double, glm::value_ptr(path.points[segment_data::point::control1]), 3, nullptr, nullptr, "%.3f"); - item_tooltip("Control vector of the start, relative to the start point; zero for a straight"); - finish_edit(rebuild::geometry); - ImGui::InputScalarN("Control 2 (relative)", ImGuiDataType_Double, glm::value_ptr(path.points[segment_data::point::control2]), 3, nullptr, nullptr, "%.3f"); - item_tooltip("Control vector of the end, relative to the end point; zero for a straight"); - finish_edit(rebuild::geometry); - ImGui::InputFloat2("Roll (deg)", path.rolls.data(), "%.2f"); + else + { + auto &vector{path.points[kind == editor_track::point_kind::control1 ? segment_data::point::control1 : segment_data::point::control2]}; + ImGui::DragScalarN(STR_C("vector##point"), ImGuiDataType_Double, glm::value_ptr(vector), 3, 0.01f, nullptr, nullptr, "%.3f"); + item_tooltip("Control vector, relative to its end; zero for a straight"); + finish_edit(rebuild::geometry); + } + } + if (ImGui::TreeNode(STR_C("Cant and radius"))) + { + ImGui::DragFloat2(STR_C("Roll (deg)"), path.rolls.data(), 0.01f, -15.0f, 15.0f, "%.2f"); item_tooltip("Cant at the start and at the end as the roll angle of the track"); finish_edit(rebuild::geometry); - ImGui::InputFloat("Radius", &path.radius, 0.0f, 0.0f, "%.1f"); + ImGui::InputFloat(STR_C("Radius"), &path.radius, 0.0f, 0.0f, "%.1f"); item_tooltip("Radius stored with the path in the scenery; the shape itself comes from the control vectors"); finish_edit(rebuild::geometry); - ImGui::PopItemWidth(); - if (ImGui::Button("Straighten")) + if (ImGui::Button(STR_C("Straighten"))) { push_track_snapshot({{track, before}}); path.points[segment_data::point::control1] = glm::dvec3{}; @@ -852,16 +1339,25 @@ void editor_mode::render_path_ui() editor_track::commit({track}); } item_tooltip("Removes the control vectors and the radius, the path becomes a straight between its ends"); + ImGui::TreePop(); } - else - { - auto const &start = path.points[segment_data::point::start]; - auto const &end = path.points[segment_data::point::end]; - ImGui::TextDisabled("Start (%.2f, %.2f, %.2f) End (%.2f, %.2f, %.2f)", start.x, start.y, start.z, end.x, end.y, end.z); - } + ImGui::PopItemWidth(); ImGui::PopID(); } + if (geometry && ImGui::TreeNode(STR_C("Snapping of the ends"))) + { + ImGui::PushItemWidth(120.0f); + ImGui::DragFloat(STR_C("Snap radius (m)"), &m_track_snap_radius, 0.05f, 0.0f, 50.0f, "%.2f"); + item_tooltip("A dragged free end within this distance of another free end joins it on release"); + ImGui::PopItemWidth(); + ImGui::Checkbox(STR_C("Align with snapped path"), &m_track_align_tangent); + item_tooltip("On joining, the end also takes over the direction of the other path, so the joint has no kink"); + ImGui::Checkbox(STR_C("Drag connected ends"), &m_track_drag_connected); + item_tooltip("Dragging a joined end, or moving and turning the whole path or switch,\nmoves the ends of the neighbouring paths with it"); + ImGui::TreePop(); + } } + render_path_parameters(*track); } @@ -905,8 +1401,12 @@ void editor_mode::route_reset() route.result = {}; if (route.from == nullptr || route.to == nullptr) return; - if (false == editor_track::find_chain(route.from, route.to, route.chain, route.error)) + if (false == editor_track::find_chain(route.from, route.to, route.chain, route.error, true)) return; + if (false == route.chain.switches.empty()) + route.status = format(STR_C("The fragment runs through %zu switches along their main tracks. They move as a whole with the line, " + "so they have to fall on its straights"), + route.chain.switches.size()); auto const &chain{route.chain}; alignment::design design; @@ -943,42 +1443,98 @@ bool editor_mode::route_from_curve(TTrack &Track) { editor_track::curve curve; if (false == editor_track::find_curve(Track, m_straights.tolerance, m_route.design.norms.gauge, curve)) + { + m_route.chain = {}; + m_route.result = {}; + m_route.vertex = m_route.grip = -1; + m_route.error = STR_C("No curve here: LMB on a curve"); return false; + } m_route.from = curve.from; m_route.to = curve.to; route_reset(); if (m_route.chain.tracks.empty()) return false; auto &design{m_route.design}; - alignment::vertex vertex; - vertex.radius = curve.radius > 0.0 ? std::max(10.0, std::round(curve.radius)) : 1000.0; - route_recommend(vertex); - if (curve.transition_in > 0.0) - vertex.transition_in = std::round(curve.transition_in); - if (curve.transition_out > 0.0) - vertex.transition_out = std::round(curve.transition_out); - if (curve.cant > 0.0) - vertex.cant = std::round(curve.cant); + auto vertex{route_vertex_of(curve)}; if (curve.reversals == 0) { - vertex.reverse_turn = std::abs(curve.turn) > glm::pi(); - if (curve.compound) - { - vertex.compound = true; - vertex.radius2 = std::round(curve.radius2); - vertex.transition_middle = std::round(curve.transition_middle); - vertex.split = curve.split; - } design.vertices = {vertex}; } else { auto const distance{plan_distance(design.start, design.end)}; vertex.offset = distance / 3.0; + vertex.compound = false; + vertex.reverse_turn = false; design.vertices = {vertex, vertex}; } route_update(); - m_route.status = "Curve of " + std::to_string(m_route.chain.tracks.size()) + " paths, turning " + std::to_string(static_cast(std::round(glm::degrees(curve.turn)))) + " deg"; + m_route.status = STR_C("Curve of ") + std::to_string(m_route.chain.tracks.size()) + STR_C(" paths, turning ") + std::to_string(static_cast(std::round(glm::degrees(curve.turn)))) + STR_C(" deg"); + return true; +} + +alignment::vertex editor_mode::route_vertex_of(editor_track::curve const &Curve) const +{ + alignment::vertex vertex; + vertex.radius = Curve.radius > 0.0 ? std::max(10.0, std::round(Curve.radius)) : 1000.0; + route_recommend(vertex); + if (Curve.transition_in > 0.0) + vertex.transition_in = std::round(Curve.transition_in); + if (Curve.transition_out > 0.0) + vertex.transition_out = std::round(Curve.transition_out); + if (Curve.cant > 0.0) + vertex.cant = std::round(Curve.cant); + vertex.reverse_turn = std::abs(Curve.turn) > glm::pi(); + if (Curve.compound) + { + vertex.compound = true; + vertex.radius2 = std::round(Curve.radius2); + vertex.transition_middle = std::round(Curve.transition_middle); + vertex.split = Curve.split; + } + return vertex; +} + +bool editor_mode::route_from_line(TTrack &Track) +{ + auto &route{m_route}; + editor_track::chain run; + if (false == editor_track::find_run(Track, kLineReach, run, route.error)) + return false; + route.from = run.tracks.front(); + route.to = run.tracks.back(); + route_reset(); + if (route.chain.tracks.empty()) + return false; + auto &design{route.design}; + auto const found{editor_track::recognize_line(route.chain, m_straights.tolerance, design.norms.gauge)}; + if (false == found.empty()) + { + design.vertices.clear(); + for (auto const &entry : found) + { + alignment::vertex vertex; + if (entry.kink) + { + vertex.radius = std::max(10.0, std::round(alignment::recommend(design.speed, 1000.0, design.norms).radius_min / 10.0) * 10.0); + vertex.transition_in = vertex.transition_out = vertex.cant = 0.0; + } + else + { + vertex = route_vertex_of(entry.shape); + } + vertex.position = entry.position; + design.vertices.push_back(vertex); + } + if (design.vertices.size() >= 2) + { + design.vertices.front().offset = std::max(0.0, glm::dot(design.vertices.front().position - plan_of(design.start), design.start_direction)); + design.vertices.back().offset = std::max(0.0, glm::dot(plan_of(design.end) - design.vertices.back().position, design.end_direction)); + } + route_update(); + } + route.status = format(STR_C("Line of %zu paths, %.0f m, %zu vertices"), route.chain.tracks.size(), route.chain.length, design.vertices.size()); return true; } @@ -989,25 +1545,31 @@ void editor_mode::route_apply() if (false == route.result.valid || route.chain.tracks.empty()) return; editor_track::chain chain; - if (false == editor_track::find_chain(route.from, route.to, chain, route.error)) + if (false == editor_track::find_chain(route.from, route.to, chain, route.error, true)) return; if (glm::distance(chain.start, route.chain.start) > 1e-3 || glm::distance(chain.end, route.chain.end) > 1e-3) { - route.error = "The fragment changed since it was selected, select it again"; + route.error = STR_C("The fragment changed since it was selected, select it again"); return; } - for (auto *track : chain.tracks) - { - std::string reason; - if (false == editor_track::can_edit_geometry(*track, reason)) - { - route.error = track->name() + ": " + reason; - return; - } - } + auto involved{chain.tracks}; + for (auto const &passage : chain.switches) + involved.push_back(passage.track); + if (false == tracks_editable(involved, route.error)) + return; std::vector> states; std::vector created; + // takes back what was done before the paths were re-laid + auto const undo = [&]() { + for (auto *track : created) + editor_track::retire(*track); + for (auto entry = states.rbegin(); entry != states.rend(); ++entry) + { + editor_track::apply(*entry->first, entry->second); + editor_track::commit({entry->first}); + } + }; auto *from{route.from}; auto *to{route.to}; auto const startextension{route.result.start_extension}; @@ -1020,32 +1582,48 @@ void editor_mode::route_apply() if (endextension > 0.0) to = editor_track::take_straight(editor_track::straight_beyond(before, true, m_straights.tolerance), to, before.end, route.result.end, states, created); std::string error; - if (false == editor_track::find_chain(from, to, chain, error) || plan_distance(chain.start, route.result.start) > 5.0 || plan_distance(chain.end, route.result.end) > 5.0) + auto const found{editor_track::find_chain(from, to, chain, error, true)}; + auto const startoff{found ? plan_distance(chain.start, route.result.start) : 0.0}; + auto const endoff{found ? plan_distance(chain.end, route.result.end) : 0.0}; + if (false == found || startoff > 5.0 || endoff > 5.0) { - for (auto *track : created) - editor_track::retire(*track); - for (auto entry = states.rbegin(); entry != states.rend(); ++entry) - { - editor_track::apply(*entry->first, entry->second); - editor_track::commit({entry->first}); - } - route.error = error.empty() ? "The adjoining straights can't be cut at the ends of the curve" : error; + auto const startrun{editor_track::straight_beyond(before, false, m_straights.tolerance)}; + auto const endrun{editor_track::straight_beyond(before, true, m_straights.tolerance)}; + WriteLog(format("editor: cutting the straights failed: found %d, start %.2f m off (extension %.2f, run %zu paths %.2f m), end %.2f m off (extension %.2f, run %zu paths %.2f m), chain %zu paths, from %s, to %s, error '%s'", found ? 1 : 0, startoff, + startextension, startrun.tracks.size(), startrun.length, endoff, endextension, endrun.tracks.size(), endrun.length, chain.tracks.size(), from != nullptr ? from->name().c_str() : "-", to != nullptr ? to->name().c_str() : "-", error.c_str())); + undo(); + route.error = error.empty() ? format(STR_C("The adjoining straights can't be cut at the ends of the curve: the start misses by %.1f m, the end by %.1f m"), startoff, endoff) : error; + return; + } + if (false == tracks_editable(chain.tracks, route.error)) + { + undo(); return; } } for (auto *track : chain.tracks) if (std::none_of(states.begin(), states.end(), [&](auto const &Entry) { return Entry.first == track; })) states.emplace_back(track, editor_track::capture(*track)); - auto pieces{alignment::pieces(route.result, route.design, chain.tracks.size())}; - editor_track::keep_heights(chain, pieces); - auto relaid{editor_track::relay(chain, pieces)}; + std::vector relaid; + if (chain.switches.empty()) + { + auto pieces{alignment::pieces(route.result, route.design, chain.tracks.size())}; + editor_track::keep_heights(chain, pieces); + relaid = editor_track::relay(chain, pieces); + } + else if (false == route_relay_through_switches(chain, states, relaid)) + { + undo(); + return; + } + // the straights were cut along their own direction, the curve ends where the design says: the ends are brought together auto const added{relaid.size()}; created.insert(created.end(), relaid.begin(), relaid.end()); push_track_snapshot(std::move(states), std::move(created)); route.from = from; route.to = to; - editor_track::find_chain(route.from, route.to, route.chain, route.error); + editor_track::find_chain(route.from, route.to, route.chain, route.error, true); if (startextension > 0.0 || endextension > 0.0) { route_bind_ends(); @@ -1057,12 +1635,141 @@ void editor_mode::route_apply() } route_update(); } - route.status = "Re-laid " + std::to_string(chain.tracks.size()) + " paths" + (added > 0 ? ", added " + std::to_string(added) : std::string{}); + route.status = STR_C("Re-laid ") + std::to_string(chain.tracks.size()) + STR_C(" paths") + (added > 0 ? STR_C(", added ") + std::to_string(added) : std::string{}); if (startextension > 0.0 || endextension > 0.0) route.status += format(", the curve took over %.2f / %.2f m of the adjoining straights", startextension, endextension); WriteLog("Editor: route design - " + route.status, logtype::generic); } +// the switches of the chain are moved as a whole onto the designed line, the regular paths between them re-laid +bool editor_mode::route_relay_through_switches(editor_track::chain const &Chain, std::vector> &States, std::vector &Created) +{ + auto &route{m_route}; + auto const &result{route.result}; + auto const name = [](TTrack const *Track) { return Track->name().empty() ? std::string{"(noname)"} : Track->name(); }; + auto const plan = [](glm::dvec3 const &Vector) { return glm::normalize(plan_of(Vector)); }; + struct placement + { + TTrack *track; + double from, length; // chainage along the new line + glm::dvec3 entry; // of the main track, where the chain comes in + double angle; + }; + // chainages along the old line, the switches keep their distance from the nearer end of the chain + double before{0.0}; + std::vector starts; + std::size_t next{0}; + for (std::size_t i = 0; i <= Chain.tracks.size(); ++i) + { + for (; next < Chain.switches.size() && Chain.switches[next].before == i; ++next) + { + starts.push_back(before); + before += bezier{Chain.switches[next].track->m_paths.front()}.plan_length(); + } + if (i < Chain.tracks.size()) + before += bezier{Chain.tracks[i]->m_paths.front()}.plan_length(); + } + auto const oldlength{before}; + std::vector placements; + std::vector breaks; + for (std::size_t k = 0; k < Chain.switches.size(); ++k) + { + auto const &passage{Chain.switches[k]}; + auto const &main{passage.track->m_paths.front()}; + auto const length{bezier{main}.plan_length()}; + auto const from{starts[k] + length * 0.5 < oldlength * 0.5 ? starts[k] : result.length - (oldlength - starts[k])}; + if (from < 0.0 || from + length > result.length || (false == breaks.empty() && from < breaks.back() - 0.01)) + { + route.error = STR_C("The switch ") + name(passage.track) + STR_C(" doesn't fit on the designed line"); + return false; + } + auto const entry{main.points[passage.forward ? segment_data::point::start : segment_data::point::end]}; + auto const exit{main.points[passage.forward ? segment_data::point::end : segment_data::point::start]}; + bezier const curve{main}; + auto const direction{passage.forward ? plan(curve.first(0.0)) : -plan(curve.first(1.0))}; + auto const first{alignment::evaluate(result, from)}; + auto const last{alignment::evaluate(result, from + length)}; + auto const angle{signed_angle(direction, plan(first.direction))}; + // where the other end of the main track goes, set against the line + auto const moved{plan_of(first.position) + turned(plan_of(exit - entry), angle)}; + auto const departure{glm::distance(moved, plan_of(last.position))}; + if (departure > 0.02) + { + route.error = format(STR_C("The switch %s would leave the designed line by %.2f m at its other end: it lies in a curve of the design. " + "Move the vertices so that the switch falls on a straight"), + name(passage.track).c_str(), departure); + return false; + } + placements.push_back({passage.track, from, length, entry, angle}); + breaks.push_back(from); + breaks.push_back(from + length); + } + // the regular parts between the switches, one interval each, the switches taking the ones between + auto const parts{editor_track::chain_parts(Chain)}; + std::vector counts; + std::vector partof; + std::size_t part{0}; + for (std::size_t k = 0; k <= Chain.switches.size(); ++k) + { + auto const first{k == 0 ? std::size_t{0} : Chain.switches[k - 1].before}; + auto const last{k == Chain.switches.size() ? Chain.tracks.size() : Chain.switches[k].before}; + counts.push_back(last - first); + partof.push_back(last > first ? static_cast(part++) : -1); + if (k < Chain.switches.size()) + counts.push_back(1); + } + if (part != parts.size()) + { + route.error = STR_C("The paths between the switches can't be read as a chain"); + return false; + } + std::vector intervals; + auto const pieces{alignment::pieces(result, route.design, 0, breaks, counts, &intervals)}; + std::vector> groups(parts.size()); + for (std::size_t i = 0; i < pieces.size(); ++i) + if (intervals[i] % 2 == 0 && partof[intervals[i] / 2] >= 0) + groups[partof[intervals[i] / 2]].push_back(pieces[i]); + for (std::size_t i = 0; i < parts.size(); ++i) + if (groups[i].size() < parts[i].tracks.size()) + { + route.error = STR_C("The designed line between the switches is too short for the paths there"); + return false; + } + + // all checked, the changes go in + auto const remember = [&](TTrack *Track) { + if (std::none_of(States.begin(), States.end(), [&](auto const &Entry) { return Entry.first == Track; })) + States.emplace_back(Track, editor_track::capture(*Track)); + }; + for (auto const &place : placements) + { + auto joints{editor_track::joints(*place.track)}; + joints.erase(std::remove_if(joints.begin(), joints.end(), [&](editor_track::joint const &Joint) { return std::find(Chain.tracks.begin(), Chain.tracks.end(), Joint.other) != Chain.tracks.end(); }), joints.end()); + remember(place.track); + std::vector changed{place.track}; + for (auto const &joint : joints) + { + remember(joint.other); + if (std::find(changed.begin(), changed.end(), joint.other) == changed.end()) + changed.push_back(joint.other); + } + // the heights stay, the paths between the switches keep theirs too + auto target{alignment::evaluate(result, place.from).position}; + target.y = place.entry.y; + editor_track::place(*place.track, place.entry, target, place.angle); + editor_track::follow(*place.track, joints); + editor_track::commit(changed); + } + for (std::size_t i = 0; i < parts.size(); ++i) + { + auto group{groups[i]}; + editor_track::keep_heights(parts[i], group); + auto const added{editor_track::relay(parts[i], group)}; + Created.insert(Created.end(), added.begin(), added.end()); + } + return true; +} + glm::dvec3 editor_mode::route_vertex_position(int const Vertex) const { auto const &design{m_route.design}; @@ -1249,24 +1956,24 @@ void editor_mode::render_route_gizmo() void editor_mode::render_route_ui() { - ImGui::TextDisabled("LMB on a curve: loads the whole curve between the adjoining straights.\n" - "The ends of the curve and their directions stay fixed.\n" - "LMB on a vertex (W1, W2...): moves it with the gizmo Esc: release the vertex"); - - render_route_ends(); auto &route{m_route}; + if (false == route.error.empty()) + ImGui::TextColored(ImVec4(1.0f, 0.35f, 0.3f, 1.0f), "%s", route.error.c_str()); if (route.chain.tracks.empty()) return; - ImGui::Text("Fragment: %zu paths, %.2f m", route.chain.tracks.size(), route.chain.length); + ImGui::TextDisabled(STR_C("%zu paths, %.2f m"), route.chain.tracks.size(), route.chain.length); ImGui::SameLine(); - if (ImGui::SmallButton("Reset design")) + if (ImGui::SmallButton(STR_C("Reset design"))) { - route_reset(); + auto *track{route.chain.tracks[route.chain.tracks.size() / 2]}; + route_load(*track); return; } - auto changed{render_route_parameters()}; - changed |= render_route_vertices(); + item_tooltip("Reads the curves of the line from the scenery again, dropping the changes not applied"); + auto changed{render_route_vertices()}; + if (ImGui::CollapsingHeader(STR_C("Design speed and limits"))) + changed |= render_route_parameters(); if (changed) route_update(); @@ -1274,39 +1981,12 @@ void editor_mode::render_route_ui() render_route_result(); } -void editor_mode::render_route_ends() -{ - auto &route{m_route}; - auto *track = selected_track(); - auto const name = [](TTrack const *Track) { return Track == nullptr ? std::string{"-"} : (Track->name().empty() ? std::string{"(noname)"} : Track->name()); }; - ImGui::Text("First path: %s", name(route.from).c_str()); - ImGui::SameLine(ImGui::GetWindowContentRegionWidth() - 110.0f); - if (ImGui::Button("Use selected##routefrom", ImVec2(110.0f, 0.0f)) && track != nullptr) - { - route.from = track; - if (route.to == nullptr) - route.to = track; - route_reset(); - } - ImGui::Text("Last path: %s", name(route.to).c_str()); - ImGui::SameLine(ImGui::GetWindowContentRegionWidth() - 110.0f); - if (ImGui::Button("Use selected##routeto", ImVec2(110.0f, 0.0f)) && track != nullptr) - { - route.to = track; - if (route.from == nullptr) - route.from = track; - route_reset(); - } - if (false == route.error.empty()) - ImGui::TextColored(ImVec4(1.0f, 0.35f, 0.3f, 1.0f), "%s", route.error.c_str()); -} - bool editor_mode::render_route_parameters() { auto &design{m_route.design}; bool changed{false}; ImGui::PushItemWidth(120.0f); - changed |= ImGui::InputDouble("Design speed (km/h)", &design.speed, 0.0, 0.0, "%.0f"); + changed |= ImGui::InputDouble(STR_C("Design speed (km/h)"), &design.speed, 0.0, 0.0, "%.0f"); item_tooltip("Speed the cant, the transitions and the recommended radius are designed for"); design.speed = std::max(1.0, design.speed); int shape = static_cast(design.shape); @@ -1317,24 +1997,19 @@ bool editor_mode::render_route_parameters() changed = true; } item_tooltip("Cubic parabola: the usual one on the Polish lines; clothoid: curvature growing linearly with the length"); - if (ImGui::SliderInt("Paths per transition curve", &design.transition_pieces, 1, 4)) - route_update(); - item_tooltip("More paths follow the transition curve more closely in the scenery"); - if (ImGui::IsItemDeactivatedAfterEdit()) - route_apply(); ImGui::PopItemWidth(); - if (ImGui::TreeNode("Limits")) + if (ImGui::TreeNode(STR_C("Limits"))) { auto &norms{design.norms}; ImGui::PushItemWidth(100.0f); - changed |= ImGui::InputDouble("Rail axes distance (mm)", &norms.gauge, 0.0, 0.0, "%.0f"); - changed |= ImGui::InputDouble("Unbalanced acceleration (m/s2)", &norms.unbalanced, 0.0, 0.0, "%.2f"); - changed |= ImGui::InputDouble("Maximum cant (mm)", &norms.cant_max, 0.0, 0.0, "%.0f"); - changed |= ImGui::InputDouble("Cant change rate (mm/s)", &norms.cant_rate, 0.0, 0.0, "%.0f"); - changed |= ImGui::InputDouble("Cant ramp 1:(k*V), k", &norms.ramp_factor, 0.0, 0.0, "%.1f"); - changed |= ImGui::InputDouble("Unbalanced acc. change rate (m/s3)", &norms.jerk, 0.0, 0.0, "%.2f"); - changed |= ImGui::InputDouble("Straight between curves (s of travel)", &norms.tangent_min_time, 0.0, 0.0, "%.1f"); + changed |= ImGui::InputDouble(STR_C("Rail axes distance (mm)"), &norms.gauge, 0.0, 0.0, "%.0f"); + changed |= ImGui::InputDouble(STR_C("Unbalanced acceleration (m/s2)"), &norms.unbalanced, 0.0, 0.0, "%.2f"); + changed |= ImGui::InputDouble(STR_C("Maximum cant (mm)"), &norms.cant_max, 0.0, 0.0, "%.0f"); + changed |= ImGui::InputDouble(STR_C("Cant change rate (mm/s)"), &norms.cant_rate, 0.0, 0.0, "%.0f"); + changed |= ImGui::InputDouble(STR_C("Cant ramp 1:(k*V), k"), &norms.ramp_factor, 0.0, 0.0, "%.1f"); + changed |= ImGui::InputDouble(STR_C("Unbalanced acc. change rate (m/s3)"), &norms.jerk, 0.0, 0.0, "%.2f"); + changed |= ImGui::InputDouble(STR_C("Straight between curves (s of travel)"), &norms.tangent_min_time, 0.0, 0.0, "%.1f"); ImGui::PopItemWidth(); norms.gauge = std::max(100.0, norms.gauge); norms.cant_rate = std::max(1.0, norms.cant_rate); @@ -1346,51 +2021,8 @@ bool editor_mode::render_route_parameters() bool editor_mode::render_route_vertices() { - auto &route{m_route}; - auto &design{route.design}; bool changed{false}; - auto &vertices{design.vertices}; - if (ImGui::Button("Add vertex")) - { - alignment::vertex vertex; - vertex.radius = vertices.empty() ? 1000.0 : vertices.back().radius; - route_recommend(vertex); - auto const distance{plan_distance(design.start, design.end)}; - if (vertices.size() == 1) - { - vertices.front().offset = distance / 3.0; - vertex.offset = distance / 3.0; - vertices.push_back(vertex); - } - else if (vertices.empty()) - { - vertices.push_back(vertex); - } - else - { - auto const index{std::clamp(route.vertex, 0, static_cast(vertices.size()) - 2)}; - auto const a{route_vertex_position(index)}; - auto const b{route_vertex_position(index + 1)}; - vertex.position = glm::dvec2{(a.x + b.x) * 0.5, (a.z + b.z) * 0.5}; - for (int i = 0; i < static_cast(vertices.size()); ++i) - { - auto const p{route_vertex_position(i)}; - vertices[i].position = {p.x, p.z}; - } - vertices.insert(vertices.begin() + index + 1, vertex); - } - changed = true; - } - ImGui::SameLine(); - if (ImGui::Button("Remove vertex") && false == vertices.empty()) - { - auto const index{route.vertex >= 0 && route.vertex < static_cast(vertices.size()) ? route.vertex : static_cast(vertices.size()) - 1}; - vertices.erase(vertices.begin() + index); - route.vertex = -1; - changed = true; - } - - auto const count{static_cast(vertices.size())}; + auto const count{static_cast(m_route.design.vertices.size())}; for (int i = 0; i < count; ++i) { ImGui::PushID(i); @@ -1407,31 +2039,18 @@ bool editor_mode::render_route_vertex(int const Index) auto &vertex{design.vertices[Index]}; auto const count{static_cast(design.vertices.size())}; bool changed{false}; - if (ImGui::Selectable(format("Vertex W%d", Index + 1).c_str(), route.vertex == Index)) - route.vertex = (route.vertex == Index ? -1 : Index); - ImGui::Indent(); + if (count > 1) + ImGui::TextDisabled(STR_C("Curve %d of the S-curve"), Index + 1); ImGui::PushItemWidth(110.0f); - if (count == 1) - ImGui::TextDisabled("At the intersection of the end tangents"); - else if (Index == 0) - changed |= ImGui::InputDouble("Distance from the start (m)", &vertex.offset, 0.0, 0.0, "%.2f"); - else if (Index == count - 1) - changed |= ImGui::InputDouble("Distance from the end (m)", &vertex.offset, 0.0, 0.0, "%.2f"); - else - { - ImGui::PushItemWidth(220.0f); - changed |= ImGui::InputScalarN("Position (x, z)", ImGuiDataType_Double, glm::value_ptr(vertex.position), 2, nullptr, nullptr, "%.2f"); - ImGui::PopItemWidth(); - } - changed |= ImGui::InputDouble(vertex.compound ? "Radius R1 (m)" : "Radius R (m)", &vertex.radius, 0.0, 0.0, "%.1f"); - changed |= ImGui::Checkbox("Compound curve (two radii)", &vertex.compound); + changed |= ImGui::DragScalar(vertex.compound ? STR_C("Radius R1 (m)") : STR_C("Radius R (m)"), ImGuiDataType_Double, &vertex.radius, 5.0f, nullptr, nullptr, "%.0f"); + changed |= ImGui::Checkbox(STR_C("Compound curve (two radii)"), &vertex.compound); item_tooltip("Curve made of two arcs of different radii, joined with a transition"); if (vertex.compound) { - changed |= ImGui::InputDouble("Radius R2 (m)", &vertex.radius2, 0.0, 0.0, "%.1f"); - changed |= ImGui::InputDouble("Transition R1-R2 (m)", &vertex.transition_middle, 0.0, 0.0, "%.1f"); + changed |= ImGui::InputDouble(STR_C("Radius R2 (m)"), &vertex.radius2, 0.0, 0.0, "%.1f"); + changed |= ImGui::InputDouble(STR_C("Transition R1-R2 (m)"), &vertex.transition_middle, 0.0, 0.0, "%.1f"); float split{static_cast(vertex.split)}; - if (ImGui::SliderFloat("Share of R1", &split, 0.0f, 1.0f, "%.2f")) + if (ImGui::SliderFloat(STR_C("Share of R1"), &split, 0.0f, 1.0f, "%.2f")) { vertex.split = split; changed = true; @@ -1439,18 +2058,16 @@ bool editor_mode::render_route_vertex(int const Index) vertex.radius2 = std::max(1.0, vertex.radius2); vertex.transition_middle = std::max(0.0, vertex.transition_middle); } - changed |= ImGui::InputDouble("Transition in (m)", &vertex.transition_in, 0.0, 0.0, "%.1f"); - changed |= ImGui::InputDouble("Transition out (m)", &vertex.transition_out, 0.0, 0.0, "%.1f"); - changed |= ImGui::InputDouble("Cant (mm)", &vertex.cant, 0.0, 0.0, "%.0f"); + changed |= ImGui::DragScalar(STR_C("Transition in (m)"), ImGuiDataType_Double, &vertex.transition_in, 1.0f, nullptr, nullptr, "%.0f"); + changed |= ImGui::DragScalar(STR_C("Transition out (m)"), ImGuiDataType_Double, &vertex.transition_out, 1.0f, nullptr, nullptr, "%.0f"); + changed |= ImGui::DragScalar(STR_C("Cant (mm)"), ImGuiDataType_Double, &vertex.cant, 1.0f, nullptr, nullptr, "%.0f"); item_tooltip("Height of the outer rail above the inner one"); - changed |= ImGui::Checkbox("Turn the longer way (over 180 deg)", &vertex.reverse_turn); - item_tooltip("For the loops: the curve turns by more than a half circle"); ImGui::PopItemWidth(); vertex.radius = std::max(1.0, vertex.radius); vertex.transition_in = std::max(0.0, vertex.transition_in); vertex.transition_out = std::max(0.0, vertex.transition_out); vertex.cant = std::max(0.0, vertex.cant); - if (ImGui::SmallButton("Apply recommended for V")) + if (ImGui::SmallButton(STR_C("Apply recommended for V"))) { route_recommend(vertex); changed = true; @@ -1458,15 +2075,20 @@ bool editor_mode::render_route_vertex(int const Index) item_tooltip("Cant and transitions recommended for the design speed and the radius"); auto const recommended{alignment::recommend(design.speed, vertex.radius, design.norms)}; - ImGui::TextDisabled("For %.0f km/h: R min %.0f m, cant %.0f mm (equilibrium %.0f, min %.0f), transition %.0f m", design.speed, recommended.radius_min, recommended.cant, recommended.cant_equilibrium, recommended.cant_min, recommended.transition); - for (auto const &curve : route.result.curves) + ImGui::TextDisabled(STR_C("For %.0f km/h: R min %.0f m, cant %.0f mm (equilibrium %.0f, min %.0f), transition %.0f m"), design.speed, recommended.radius_min, recommended.cant, recommended.cant_equilibrium, recommended.cant_min, recommended.transition); + if (ImGui::TreeNode(STR_C("Details"))) { - if (curve.vertex != Index) - continue; - ImGui::Text("Deflection %.4f deg, tangents %.2f / %.2f m, arc %.2f m", glm::degrees(curve.deflection), curve.tangent_in, curve.tangent_out, curve.arc_length); - ImGui::Text("Unbalanced acc. %.3f m/s2, cant rate %.1f / %.1f mm/s, acc. rate %.3f / %.3f m/s3", curve.unbalanced, curve.cant_rate_in, curve.cant_rate_out, curve.jerk_in, curve.jerk_out); + for (auto const &curve : route.result.curves) + { + if (curve.vertex != Index) + continue; + ImGui::Text(STR_C("Deflection %.4f deg, tangents %.2f / %.2f m, arc %.2f m"), glm::degrees(curve.deflection), curve.tangent_in, curve.tangent_out, curve.arc_length); + ImGui::Text(STR_C("Unbalanced acc. %.3f m/s2, cant rate %.1f / %.1f mm/s, acc. rate %.3f / %.3f m/s3"), curve.unbalanced, curve.cant_rate_in, curve.cant_rate_out, curve.jerk_in, curve.jerk_out); + } + changed |= ImGui::Checkbox(STR_C("Turn the longer way (over 180 deg)"), &vertex.reverse_turn); + item_tooltip("For the loops: the curve turns by more than a half circle"); + ImGui::TreePop(); } - ImGui::Unindent(); return changed; } @@ -1478,19 +2100,19 @@ void editor_mode::render_route_result() if (result.length > 0.0) { auto const pieces{alignment::minimum_pieces(result, design)}; - ImGui::Text("Length %.2f m (now %.2f m), %zu elements", result.length, route.chain.length, result.elements.size()); - ImGui::TextDisabled("Paths: %zu in the fragment, %zu needed%s", route.chain.tracks.size(), pieces, pieces > route.chain.tracks.size() ? " (copies of the neighbours will be added)" : ""); + ImGui::Text(STR_C("Length %.2f m (now %.2f m), %zu elements"), result.length, route.chain.length, result.elements.size()); + ImGui::TextDisabled(STR_C("Paths: %zu in the fragment, %zu needed%s"), route.chain.tracks.size(), pieces, pieces > route.chain.tracks.size() ? STR_C(" (copies of the neighbours will be added)") : ""); if (result.start_extension > 0.0 || result.end_extension > 0.0) - ImGui::Text("Takes over %.2f m of the straight at the start, %.2f m at the end", result.start_extension, result.end_extension); + ImGui::Text(STR_C("Takes over %.2f m of the straight at the start, %.2f m at the end"), result.start_extension, result.end_extension); } - ImGui::TextDisabled("Straight available beyond the ends: %.2f / %.2f m", design.start_reserve, design.end_reserve); for (auto const &error : result.errors) ImGui::TextColored(ImVec4(1.0f, 0.35f, 0.3f, 1.0f), "%s", error.c_str()); for (auto const &warning : result.warnings) ImGui::TextColored(ImVec4(1.0f, 0.7f, 0.2f, 1.0f), "%s", warning.c_str()); - if (ImGui::TreeNode("Elements")) + if (ImGui::TreeNode(STR_C("Elements"))) { + ImGui::TextDisabled(STR_C("Straight available beyond the ends: %.2f / %.2f m"), design.start_reserve, design.end_reserve); char const *kinds[] = {"straight", "transition", "curve", "transition"}; for (auto const &e : result.elements) ImGui::Text("%8.2f m %-10s L %8.2f m%s", e.chainage, kinds[static_cast(e.kind)], e.length, e.kind == alignment::element_kind::straight ? "" : (" R " + std::to_string(static_cast(std::round(e.radius))) + " m").c_str()); @@ -1499,18 +2121,19 @@ void editor_mode::render_route_result() if (result.valid) { - if (ImGui::Button("Apply to the scenery")) + ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.2f, 0.55f, 0.25f, 1.0f)); + ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0.25f, 0.65f, 0.3f, 1.0f)); + if (ImGui::Button(STR_C("Apply to the scenery"), ImVec2(-1.0f, 28.0f))) route_apply(); + ImGui::PopStyleColor(2); } else { - ImGui::TextDisabled("Correct the errors to apply the design"); + ImGui::TextDisabled(STR_C("Correct the errors to apply the design")); } if (false == route.status.empty()) - { - ImGui::SameLine(); ImGui::TextUnformatted(route.status.c_str()); - }} +} editor_track::straight const &editor_mode::current_straight() { @@ -1742,21 +2365,21 @@ glm::dvec3 editor_mode::snap_straight_direction(glm::dvec3 const &Pivot, glm::dv void editor_mode::render_straights_ui() { auto &state{m_straights}; - ImGui::TextDisabled("Straights recognized from chains of collinear straight paths.\nLMB: select a path to see the straight it belongs to"); + ImGui::TextDisabled(STR_C("Straights recognized from chains of collinear straight paths.\nLMB: select a path to see the straight it belongs to")); ImGui::PushItemWidth(100.0f); double angle{glm::degrees(state.tolerance.angle)}; - if (ImGui::InputDouble("Angle tolerance (deg)", &angle, 0.0, 0.0, "%.4f")) + if (ImGui::InputDouble(STR_C("Angle tolerance (deg)"), &angle, 0.0, 0.0, "%.4f")) state.tolerance.angle = glm::radians(std::max(0.0, angle)); item_tooltip("Largest change of the direction between the paths of one straight"); - ImGui::InputDouble("Offset tolerance (m)", &state.tolerance.offset, 0.0, 0.0, "%.3f"); + ImGui::InputDouble(STR_C("Offset tolerance (m)"), &state.tolerance.offset, 0.0, 0.0, "%.3f"); item_tooltip("Largest distance of the paths from the common axis of the straight"); - ImGui::InputDouble("Treat as straight above R (m)", &state.tolerance.radius, 0.0, 0.0, "%.0f"); + ImGui::InputDouble(STR_C("Treat as straight above R (m)"), &state.tolerance.radius, 0.0, 0.0, "%.0f"); item_tooltip("Curves of a larger radius count as straight"); - ImGui::InputDouble("Minimum length (m)", &state.minimum_length, 0.0, 0.0, "%.0f"); + ImGui::InputDouble(STR_C("Minimum length (m)"), &state.minimum_length, 0.0, 0.0, "%.0f"); item_tooltip("Shorter straights aren't listed"); ImGui::PopItemWidth(); - if (ImGui::Button("Recognize straights in the scenery")) + if (ImGui::Button(STR_C("Recognize straights in the scenery"))) { state.found = editor_track::find_straights(state.minimum_length, state.tolerance); state.listed = -1; @@ -1764,10 +2387,10 @@ void editor_mode::render_straights_ui() } if (false == state.found.empty()) { - ImGui::Text("%zu straights", state.found.size()); + ImGui::Text(STR_C("%zu straights"), state.found.size()); ImGui::SameLine(); ImGui::PushItemWidth(150.0f); - ImGui::InputTextWithHint("##straightfilter", "path name", state.filter, sizeof(state.filter)); + ImGui::InputTextWithHint("##straightfilter", STR_C("path name"), state.filter, sizeof(state.filter)); ImGui::PopItemWidth(); ImGui::BeginChild("##straights", ImVec2(0.0f, 160.0f), true); for (int i = 0; i < static_cast(state.found.size()); ++i) @@ -1795,52 +2418,89 @@ void editor_mode::render_straight_ui() auto const &line{current_straight()}; if (line.tracks.empty()) { - ImGui::TextDisabled(selected_track() != nullptr ? "The selected path isn't straight" : "No path selected"); + if (false == state.status.empty()) + ImGui::TextColored(ImVec4(1.0f, 0.7f, 0.2f, 1.0f), "%s", state.status.c_str()); + return; } - else - { - ImGui::Text("Straight of the selected path"); - ImGui::Indent(); - ImGui::TextUnformatted(describe(line).c_str()); - ImGui::Text("From (%.3f, %.3f, %.3f)", line.start.x, line.start.y, line.start.z); - ImGui::Text("To (%.3f, %.3f, %.3f)", line.end.x, line.end.y, line.end.z); - ImGui::Text("Paths: %s ... %s", line.tracks.front()->name().c_str(), line.tracks.back()->name().c_str()); - ImGui::Unindent(); - if (in_straight_set(line)) - { - if (ImGui::Button("Remove from the set")) - state.set.erase(std::remove_if(state.set.begin(), state.set.end(), [&](editor_track::straight const &Member) { return std::any_of(line.tracks.begin(), line.tracks.end(), [&](TTrack const *Track) { return std::find(Member.tracks.begin(), Member.tracks.end(), Track) != Member.tracks.end(); }); }), state.set.end()); - } - else if (ImGui::Button("Add to the set")) - { - state.set.push_back(line); - } + ImGui::TextUnformatted(describe(line).c_str()); - if (false == ImGui::IsAnyItemActive()) + auto const toolbutton = [&](char const *Label, int const Tool, char const *Tooltip) { + bool const active{state.tool == Tool}; + if (active) + ImGui::PushStyleColor(ImGuiCol_Button, ImGui::GetStyleColorVec4(ImGuiCol_ButtonActive)); + if (ImGui::Button(Label)) { - state.edit_start = line.start; - state.edit_end = line.end; - state.edit_length = line.length; - state.edit_azimuth = line.azimuth; + state.tool = active ? 0 : Tool; + state.tool_placed = false; + state.handle = -1; + } + if (active) + ImGui::PopStyleColor(); + item_tooltip(Tooltip); + }; + toolbutton(STR_C("Break"), 1, STR_C("Turns the rest of the straight from a point, a curve goes at the break (Ctrl+drag in the view does the same)")); + ImGui::SameLine(); + toolbutton(STR_C("S-curve"), 2, STR_C("Shifts the rest of the straight sideways through two curves")); + ImGui::SameLine(); + bool const member{in_straight_set(line)}; + if (ImGui::Button(member ? STR_C("Leave the group") : STR_C("Move with others"))) + { + if (member) + state.set.erase(std::remove_if(state.set.begin(), state.set.end(), [&](editor_track::straight const &Member) { return std::any_of(line.tracks.begin(), line.tracks.end(), [&](TTrack const *Track) { return std::find(Member.tracks.begin(), Member.tracks.end(), Track) != Member.tracks.end(); }); }), state.set.end()); + else + state.set.push_back(line); + } + item_tooltip("Straights of a group move together and stay parallel; Alt+click in the view adds another one"); + if (state.tool != 0) + { + ImGui::PushItemWidth(100.0f); + ImGui::InputDouble(STR_C("Curve R (m, 0: automatic)"), &state.curve_radius, 0.0, 0.0, "%.0f"); + item_tooltip("Radius of the curves made by the break and the S-curve; automatic: 1.5 times the minimum radius for the speed of the line"); + ImGui::Checkbox(STR_C("Transitions from the line speed"), &state.auto_transitions); + item_tooltip("Lengths of the transition curves from the speed of the paths and the limits of the curve design"); + if (false == state.auto_transitions) + { + ImGui::SameLine(); + ImGui::InputDouble(STR_C("Transition (m)"), &state.transition, 0.0, 0.0, "%.1f"); } - ImGui::TextDisabled("Drag the ends or the middle of the straight with the gizmo, or enter the values"); - ImGui::PushItemWidth(260.0f); - ImGui::InputScalarN("Start (x, y, z)", ImGuiDataType_Double, glm::value_ptr(state.edit_start), 3, nullptr, nullptr, "%.3f"); - ImGui::InputScalarN("End (x, y, z)", ImGuiDataType_Double, glm::value_ptr(state.edit_end), 3, nullptr, nullptr, "%.3f"); ImGui::PopItemWidth(); - if (ImGui::Button("Apply ends")) + } + if (false == state.status.empty()) + ImGui::TextColored(ImVec4(1.0f, 0.7f, 0.2f, 1.0f), "%s", state.status.c_str()); + if (false == state.set.empty()) + { + ImGui::TextColored(ImVec4(1.0f, 0.6f, 0.15f, 1.0f), STR_C("Group: %zu straights move together"), state.set.size()); + ImGui::SameLine(); + if (ImGui::SmallButton(STR_C("Clear"))) + state.set.clear(); + } + + if (false == ImGui::IsAnyItemActive()) + { + state.edit_start = line.start; + state.edit_end = line.end; + state.edit_length = line.length; + state.edit_azimuth = line.azimuth; + } + if (ImGui::CollapsingHeader(STR_C("Exact values"))) + { + ImGui::PushItemWidth(-110.0f); + ImGui::InputScalarN(STR_C("Start (x, y, z)"), ImGuiDataType_Double, glm::value_ptr(state.edit_start), 3, nullptr, nullptr, "%.3f"); + ImGui::InputScalarN(STR_C("End (x, y, z)"), ImGuiDataType_Double, glm::value_ptr(state.edit_end), 3, nullptr, nullptr, "%.3f"); + ImGui::PopItemWidth(); + if (ImGui::Button(STR_C("Apply ends"))) straight_apply(line, state.edit_start, state.edit_end); ImGui::PushItemWidth(120.0f); - ImGui::InputDouble("Length (m)", &state.edit_length, 0.0, 0.0, "%.3f"); + ImGui::InputDouble(STR_C("Length (m)"), &state.edit_length, 0.0, 0.0, "%.3f"); ImGui::SameLine(); - if (ImGui::Button("Set length from the start")) + if (ImGui::Button(STR_C("Set from the start##length"))) { glm::dvec3 const direction{line.direction.x, line.grade, line.direction.y}; straight_apply(line, line.start, line.start + direction * std::max(0.1, state.edit_length)); } - ImGui::InputDouble("Azimuth (deg)", &state.edit_azimuth, 0.0, 0.0, "%.5f"); + ImGui::InputDouble(STR_C("Azimuth (deg)"), &state.edit_azimuth, 0.0, 0.0, "%.5f"); ImGui::SameLine(); - if (ImGui::Button("Turn around the start")) + if (ImGui::Button(STR_C("Turn around the start"))) { auto const azimuth{glm::radians(state.edit_azimuth)}; glm::dvec3 const direction{std::sin(azimuth), line.grade, std::cos(azimuth)}; @@ -1848,59 +2508,6 @@ void editor_mode::render_straight_ui() } ImGui::PopItemWidth(); } - if (false == line.tracks.empty()) - { - ImGui::Separator(); - ImGui::Text("Mouse tools"); - auto const toolbutton = [&](char const *Label, int const Tool) { - bool const active{state.tool == Tool}; - if (active) - ImGui::PushStyleColor(ImGuiCol_Button, ImGui::GetStyleColorVec4(ImGuiCol_ButtonActive)); - if (ImGui::Button(Label)) - { - state.tool = active ? 0 : Tool; - state.tool_placed = false; - state.handle = -1; - } - if (active) - ImGui::PopStyleColor(); - }; - toolbutton("Break", 1); - ImGui::SameLine(); - toolbutton("S-curve", 2); - if (state.tool == 1) - ImGui::TextDisabled(state.tool_placed ? "Drag the handle to turn the rest of the straight, release to fit the curve" : "LMB on the straight: place the break point"); - else if (state.tool == 2) - ImGui::TextDisabled(state.tool_placed ? "Drag the handle: sideways sets the shift, along sets its length" : "LMB on the straight: place the start of the shift"); - ImGui::PushItemWidth(100.0f); - ImGui::InputDouble("Curve R (m, 0: automatic)", &state.curve_radius, 0.0, 0.0, "%.0f"); - item_tooltip("Radius of the curves made by the break and the S-curve; automatic: 1.5 times the minimum radius for the speed of the line"); - ImGui::Checkbox("Transitions from the line speed", &state.auto_transitions); - item_tooltip("Lengths of the transition curves from the speed of the paths and the limits of the curve design"); - if (false == state.auto_transitions) - { - ImGui::SameLine(); - ImGui::InputDouble("Transition (m)", &state.transition, 0.0, 0.0, "%.1f"); - } - ImGui::PopItemWidth(); - } - if (false == state.status.empty()) - ImGui::TextColored(ImVec4(1.0f, 0.7f, 0.2f, 1.0f), "%s", state.status.c_str()); - - if (false == state.set.empty()) - { - ImGui::Text("Set: %zu straights, dragging any of them moves the whole set, keeping it parallel", state.set.size()); - ImGui::SameLine(); - if (ImGui::SmallButton("Clear the set")) - state.set.clear(); - } - - if (false == state.neighbours.empty()) - { - ImGui::Separator(); - ImGui::Text("Neighbouring straights: %zu (distances shown in the view)", state.neighbours.size()); - ImGui::TextDisabled("Dragging the middle snaps the distance to: 3.5, 4.0, 4.5, 4.75, 5.0, 5.5, 6.0 m; dragging an end snaps parallel"); - } } bool editor_mode::straights_active() @@ -1964,6 +2571,8 @@ void editor_mode::straights_apply(std::vector const &Lin auto &state{m_straights}; state.status.clear(); auto const tracks{editor_track::straight_affected(Lines)}; + if (false == tracks_editable(tracks, state.status)) + return; std::vector> states; for (auto *track : tracks) states.emplace_back(track, editor_track::capture(*track)); @@ -2019,6 +2628,11 @@ void editor_mode::render_straight_gizmo() } state.fitting = lines.size() == 1 && start_curve_fit(line); auto const tracks{state.fitting ? std::vector{} : editor_track::straight_affected(lines)}; + if (false == tracks_editable(tracks, state.status)) + { + state.fitting = false; + return; + } state.dragging = true; state.drag_line = line; state.drag_lines = lines; @@ -2097,6 +2711,45 @@ void editor_mode::render_straight_gizmo() } } +void editor_mode::cancel_track_tools() +{ + auto &state{m_straights}; + if (state.dragging) + { + // the geometry goes back to what it was before the drag + if (false == state.fitting) + { + for (auto const &entry : state.drag_states) + editor_track::apply(*entry.first, entry.second); + m_track_dirty = true; + commit_track_drag(true); + m_track_drag.clear(); + } + state.dragging = false; + state.fitting = false; + state.drag_states.clear(); + state.drag_lines.clear(); + straight_refresh(); + } + m_extend.active = false; + if (m_switch.placing) + { + m_switch.placing = false; + m_switch.status = STR_C("Placing of the switch cancelled"); + } + else if (m_switch.armed >= 0) + { + m_switch.armed = -1; + m_switch.status.clear(); + } + m_track_point = {}; + m_route.vertex = -1; + m_route.grip = -1; + state.handle = -1; + state.tool_placed = false; + state.detour.clear(); +} + void editor_mode::straight_reshape(editor_track::straight const &Line, double const From, double const To, std::function const &Tail, double const Radius) { auto &state{m_straights}; @@ -2236,6 +2889,11 @@ void editor_mode::straight_reshape(editor_track::straight const &Line, double co for (auto *track : chainpaths) if (std::find(tracks.begin(), tracks.end(), track) == tracks.end()) tracks.push_back(track); + if (false == tracks_editable(tracks, m_straights.status)) + { + undo_split(); + return; + } std::vector> states; for (auto *track : tracks) states.emplace_back(track, editor_track::capture(*track)); @@ -2245,8 +2903,10 @@ void editor_mode::straight_reshape(editor_track::straight const &Line, double co m_route.from = spans[first].track; m_route.to = spans[last].track; route_reset(); - if (m_route.chain.tracks.empty()) + if (m_route.chain.tracks.empty() || false == m_route.chain.switches.empty()) { + if (false == m_route.chain.switches.empty()) + m_route.error = STR_C("The curve would run through a switch"); for (auto const &entry : states) editor_track::apply(*entry.first, entry.second); editor_track::commit(tracks); @@ -2272,7 +2932,7 @@ void editor_mode::straight_reshape(editor_track::straight const &Line, double co editor_track::apply(*entry.first, entry.second); editor_track::commit(tracks); undo_split(); - state.status = m_route.result.errors.empty() ? "The curve can't be fitted" : m_route.result.errors.front(); + state.status = m_route.result.errors.empty() ? STR_C("The curve can't be fitted") : m_route.result.errors.front(); return; } auto pieces{alignment::pieces(m_route.result, m_route.design, m_route.chain.tracks.size())}; @@ -2290,9 +2950,9 @@ void editor_mode::straight_reshape(editor_track::straight const &Line, double co created.insert(created.begin(), splitcreated.begin(), splitcreated.end()); push_track_snapshot(std::move(states), std::move(created)); std::string error; - editor_track::find_chain(m_route.from, m_route.to, m_route.chain, error); + editor_track::find_chain(m_route.from, m_route.to, m_route.chain, error, true); straight_refresh(); - state.status = "Done, select a curve to adjust it in the Curve mode"; + state.status = STR_C("Done, select a curve to adjust it in the Curve mode"); } double editor_mode::straight_tool_radius(editor_track::straight const &Line) const @@ -2439,17 +3099,26 @@ void editor_mode::toggle_straight_set(TTrack &Track) void editor_mode::delete_selected_track() { auto *track{selected_track()}; - if (track == nullptr || false == track->Dynamics.empty()) + if (track == nullptr) return; - EditorSnapshot snap; - snap.action = EditorSnapshot::Action::TrackEdit; - snap.node_name = track->name(); - snap.position = track->location(); - snap.removed = {track}; - trim_history(); - m_history.push_back(std::move(snap)); - g_redo.clear(); + if (false == track->Dynamics.empty()) + { + ui()->set_status(STR_C("The track can't be deleted while vehicles stand on it"), true); + return; + } + // retired first, so the infrastructure it carried and moves elsewhere is in the same undo step editor_track::retire(*track); + // a switch leaves its main track behind, so the line isn't broken, unless Shift asks for all of it + std::vector created; + if (track->eType == tt_Switch && false == track->m_paths.empty() && false == Global.shiftState) + { + auto *main{editor_track::create_path(*track, track->m_paths.front())}; + editor_track::velocity(*main, speed_check::path_velocity(*track, 0)); + editor_track::commit({main}); + created.push_back(main); + ui()->set_status(STR_C("The switch is replaced by its main track, Shift+Del removes all of it"), false); + } + push_track_snapshot({}, created, {track}); if (std::find(m_route.chain.tracks.begin(), m_route.chain.tracks.end(), track) != m_route.chain.tracks.end()) m_route = {}; m_node = nullptr; @@ -2458,48 +3127,93 @@ void editor_mode::delete_selected_track() straight_refresh(); } -std::vector editor_mode::track_key_hints() const +std::vector editor_mode::track_key_hints(bool const All) const { std::vector hints; bool gizmo{false}; - if (false == m_straights.detour.empty()) + auto const *selected{selected_track()}; + if (m_lay.active) + { + if (m_lay.points.empty()) + hints = {{"LMB", "start of the new track, on the ground or at a free end"}, {"Esc", "stop laying"}}; + else + hints = {{"LMB", "next point, a curve goes at it"}, {"LMB on a free end", "join and lay"}, {"Enter", "lay"}, {"Backspace", "take back the point"}, {"Esc", "cancel"}}; + } + else if (false == m_straights.detour.empty()) { char const *const steps[] = {"leave the axis", "shifted", "start back", "back on the axis"}; auto const step{std::min(m_straights.detour.size(), 3)}; hints = {{"Shift+click", format("point %zu of 4: %s", step + 1, steps[step])}, {"Esc", "cancel"}}; } + else if (m_extend.active && m_extend_freehand) + hints = {{"Drag", "curve through the cursor, along the end: straight"}, {"Ctrl", "straight"}, {"Release", "build"}, {"Esc", "cancel"}}; else if (m_extend.active) - hints = {{"Drag", "curve through the cursor, along the end: straight"}, {"Ctrl", "straight"}, {"Release", "build"}}; + hints = {{"Drag", "straight along the end, to a free end: a curve joining it"}, {"Release", "build"}, {"Esc", "cancel"}}; else if (m_switch.placing) - hints = {{"Drag along", "direction of the switch"}, {"Drag sideways", "side of the diverging track"}}; - else if (m_switch.armed >= 0 && m_track_tab == track_tab::straights) - hints = {{"Press+drag", "on the selected straight where the switch starts"}}; - else if (m_track_tab == track_tab::straights && m_straights.current.tracks.empty()) - hints = {{"LMB", "select a straight or a curve"}}; - else if (m_track_tab == track_tab::straights) + hints = {{"Drag along", "direction of the switch"}, {"Drag sideways", "side of the diverging track"}, {"Esc", "cancel"}}; + else if (m_track_tab == track_tab::lay) + hints = {{"LMB", "start of the new track, on the ground or at a free end"}, {"Esc", "back to Select"}}; + else if (m_track_tab == track_tab::turnout && (selected_track() == nullptr || selected_track()->eType == tt_Switch)) { - hints = {{"Drag", "the ends or the middle"}, {"Ctrl+drag", "break"}, {"Shift+click x4", "shift around"}, {"Alt+click", "add to the set"}, {"Drag red ring", "new path"}, {"Del", "delete"}}; - gizmo = true; + hints = {{"LMB on a track", "choose the straight or the curve to put the switch in"}}; + if (selected != nullptr) + { + hints.push_back({"Gizmo", "move the selected switch"}); + hints.push_back({"Del", "remove the switch, its main track stays"}); + gizmo = true; + } } else if (m_track_tab == track_tab::turnout) + hints = {{"1. List below", "choose the type of the switch"}, {"2. Press+drag", "on the selected track where the switch starts: along sets the direction, sideways the side"}, {"LMB elsewhere", "choose another track"}}; + else if (m_track_tab == track_tab::profile && m_profile.route.spans.empty()) + hints = {{"LMB on a track", "loads the grade line of its line"}}; + else if (m_track_tab == track_tab::profile) + hints = {{"Drag a point", "in the profile window: changes the grade"}, {"Double click", "on the line: adds a point"}, {"Apply", "writes the heights into the tracks"}}; + else if (m_track_window_open && m_track_tab == track_tab::speed) + hints = {{"LMB on a row", "show the path"}}; + else if (m_track_window_open && m_track_tab == track_tab::infra) + hints = {{"LMB", "select a path"}}; + else if (m_track_tab == track_tab::straights && m_straights.tool == 1) + hints = {{"LMB on the straight", "where it breaks, then drag the handle to turn the rest"}, {"Esc", "cancel"}}; + else if (m_track_tab == track_tab::straights && m_straights.tool == 2) + hints = {{"LMB on the straight", "where the shift starts, then drag the handle: sideways the shift, along its length"}, {"Esc", "cancel"}}; + else if (m_track_tab == track_tab::straights && m_straights.current.tracks.empty()) + hints = {{"LMB on a straight track", "selects the whole straight"}}; + else if (m_track_tab == track_tab::straights) { - hints = {{"Gizmo", "move the switch"}, {"W", "turn"}, {"Drag red ring", "new path"}, {"Del", "delete"}}; + hints = {{"Drag a square", "moves an end, the curves at it follow"}, {"Drag the diamond", "shifts the straight sideways"}, {"Ctrl+drag", "breaks the straight"}, {"Shift+click x4", "shifts a piece around an obstacle"}, {"Alt+click", "adds another straight to move together"}}; gizmo = true; } else if (m_track_tab == track_tab::route && m_route.chain.tracks.empty()) - hints = {{"LMB", "select a curve"}}; + hints = {{"LMB on a curve", "loads it with the straights at its ends"}}; else if (m_track_tab == track_tab::route) - hints = {{"Drag yellow", "vertex"}, {"Drag green", "radius"}, {"Release", "apply"}, {"Esc", "release the vertex"}}; - else + hints = {{"Drag yellow", "moves a vertex, the curve follows"}, {"Drag green", "changes the radius"}, {"Apply", "writes the design into the tracks"}, {"Esc", "release the vertex"}}; + else if (selected == nullptr) + hints = {{"LMB on a track", "selects it"}, {"L", "lay a new track"}}; + else if (m_track_point.valid()) { - hints = {{"LMB", "select a path or a point handle"}, {"Esc", "release the point"}, {"W", "turn"}, {"Drag red ring", "new path"}}; + hints = {{"Gizmo", "moves the point"}, {"Esc", "releases the point"}}; gizmo = true; } - if (gizmo && m_gizmo_snap > 0.0f) - hints.push_back({"Ctrl", format("gizmo snaps by %.2f m", m_gizmo_snap)}); - hints.push_back({"K", "split the path under the cursor"}); - hints.push_back({"O", "top view"}); - hints.push_back({"Ctrl+Z", "undo"}); + else + { + hints = {{"LMB on a handle", "picks a point: an end or a control vector"}, {"Gizmo", "moves the whole track, W turns it"}, {"Drag the red ring", "leads a new track out of a free end, or use Continue below"}, {"Del", "deletes the track"}}; + gizmo = true; + } + if (All) + { + if (gizmo && m_gizmo_snap > 0.0f) + hints.push_back({"Ctrl", format("gizmo snaps by %.2f m", m_gizmo_snap)}); + hints.push_back({"K", "split the path under the cursor"}); + hints.push_back({"O", "top view"}); + hints.push_back({"Ctrl+Z", "undo"}); + hints.push_back({"L T G C P V I", "modes: lay, switch, straight, curve, profile, speed, infra"}); + } + for (auto &hint : hints) + { + hint.key = STR_C(hint.key); + hint.action = STR(hint.action); + } return hints; } @@ -2514,18 +3228,36 @@ std::string editor_mode::track_readout() const if (m_extend.active) { double length{0.0}, radius{0.0}; - for (auto const &piece : extend_pieces()) + auto const pieces{extend_pieces()}; + for (auto const &piece : pieces) { length += bezier{piece}.plan_length(); if (piece.radius != 0.0f && (radius == 0.0 || std::abs(piece.radius) < radius)) radius = std::abs(piece.radius); } - auto text{radius > 0.0 ? format("L %.2f m R %.0f m", length, radius) : format("L %.2f m straight", length)}; editor_track::snap_target target; - if (extend_snap(target) && target.track != nullptr) + auto const snapped{extend_snap(target) && target.track != nullptr}; + if (snapped && pieces.empty()) + return "no track fits to the end of " + name(target.track); + auto text{radius > 0.0 ? format("L %.2f m R %.0f m", length, radius) : format("L %.2f m straight", length)}; + if (snapped) text += "\njoins " + name(target.track); return text; } + if (m_lay.active) + { + auto const &lay{m_lay}; + std::string text; + if (lay.points.empty()) + text = lay.mouse_snap.track != nullptr ? "starts at the end of " + name(lay.mouse_snap.track) : "start"; + else if (false == lay.preview.empty()) + text = format("L %.1f m R %.0f m %zu paths", lay.preview_length, lay.radius, lay.preview.size()); + if (false == lay.points.empty() && lay.mouse_snap.track != nullptr) + text += "\njoins " + name(lay.mouse_snap.track); + if (false == lay.preview_error.empty()) + text += "\n" + lay.preview_error; + return text; + } auto const &state{m_straights}; if (state.tool_placed && state.tool_dragging) { @@ -2597,16 +3329,14 @@ void editor_mode::draw_track_hints() }; auto const width_of = [&](key_hint const &Hint) { return ImGui::CalcTextSize(Hint.key).x + 2.0f * pad + 5.0f + ImGui::CalcTextSize(Hint.action.c_str()).x; }; - char const *const modifiers[] = {"Ctrl", "Shift", "Alt"}; - bool const held[] = {io.KeyCtrl, io.KeyShift, io.KeyAlt}; - float modifierswidth{0.0f}; - for (auto const *modifier : modifiers) - modifierswidth += ImGui::CalcTextSize(modifier).x + 2.0f * pad + 4.0f; - - auto const hints{track_key_hints()}; - auto const available{io.DisplaySize.x - 2.0f * margin - modifierswidth - gap}; + auto hints{track_key_hints(false)}; + if (hints.size() > 4) + hints.resize(4); + auto const bottom{io.DisplaySize.y}; + auto const available{io.DisplaySize.x * 0.6f - 2.0f * margin}; + auto const mode{track_mode_name()}; std::vector> lines(1); - float used{0.0f}; + float used{ImGui::CalcTextSize(mode.c_str()).x + 2.0f * pad + gap}; for (auto const &hint : hints) { auto const width{width_of(hint)}; @@ -2618,16 +3348,16 @@ void editor_mode::draw_track_hints() used += (lines.back().empty() ? 0.0f : gap) + width; lines.back().push_back(&hint); } - auto y{io.DisplaySize.y - margin - lineheight * static_cast(lines.size()) + pad}; + auto y{bottom - margin - lineheight * static_cast(lines.size()) + pad}; for (std::size_t i = 0; i < lines.size(); ++i, y += lineheight) { - float width{0.0f}; + float width{i == 0 ? ImGui::CalcTextSize(mode.c_str()).x + 2.0f * pad : 0.0f}; for (auto const *hint : lines[i]) width += (width > 0.0f ? gap : 0.0f) + width_of(*hint); - if (i + 1 == lines.size()) - width += gap + modifierswidth; drawlist->AddRectFilled(ImVec2(margin - 6.0f, y - pad - 2.0f), ImVec2(margin + width + 6.0f, y + lineheight - pad - 2.0f), IM_COL32(0, 0, 0, 160), 4.0f); auto x{margin}; + if (i == 0) + x += chip(ImVec2(x, y), mode.c_str(), IM_COL32(60, 140, 230, 235), IM_COL32(255, 255, 255, 255)); for (auto const *hint : lines[i]) { if (x > margin) @@ -2636,12 +3366,6 @@ void editor_mode::draw_track_hints() drawlist->AddText(ImVec2(x, y), IM_COL32(255, 255, 255, 230), hint->action.c_str()); x += ImGui::CalcTextSize(hint->action.c_str()).x; } - if (i + 1 == lines.size()) - { - x += gap; - for (int m = 0; m < 3; ++m) - x += chip(ImVec2(x, y), modifiers[m], held[m] ? overlay_color::selected : IM_COL32(255, 255, 255, 40), held[m] ? IM_COL32(20, 20, 20, 255) : IM_COL32(255, 255, 255, 120)) + 4.0f; - } } auto const readout{track_readout()}; @@ -2665,45 +3389,91 @@ void editor_mode::update_build_tools() m_extend.mouse = ground; if (m_switch.placing) m_switch.mouse = ground; + auto &lay{m_lay}; + lay.preview.clear(); + lay.preview_error.clear(); + lay.preview_length = 0.0; + if (false == lay.active) + return; + lay.mouse = ground; + lay.mouse_snap = editor_track::find_free_end(nullptr, kRailCategory, ground, kLaySnapRadius, {}); + if (lay.points.empty()) + return; + auto points{lay.points}; + auto end{lay.mouse_snap}; + if (end.track != nullptr && glm::distance(end.position, points.front()) > 1.0) + points.push_back(end.position); + else + { + end = {}; + if (plan_distance(ground, points.back()) > 1.0) + points.push_back(ground); + } + lay.preview = lay_pieces(points, end, lay.preview_length, lay.preview_error); +} + +bool editor_mode::free_end(TTrack &Track, int const Path, bool const Atend, extend_tool &Tool) +{ + editor_track::point_ref const point{Path, Atend ? editor_track::point_kind::end : editor_track::point_kind::start}; + if (Path < 0 || Path >= static_cast(Track.m_paths.size()) || editor_track::is_connected(Track, point)) + return false; + auto const &path{Track.m_paths[Path]}; + auto const &start{path.points[segment_data::point::start]}; + auto const &end{path.points[segment_data::point::end]}; + auto const &control1{path.points[segment_data::point::control1]}; + auto const &control2{path.points[segment_data::point::control2]}; + glm::dvec3 tangent; + if (Atend) + tangent = control2 != glm::dvec3{} ? -control2 : end - (start + control1); + else + tangent = -(control1 != glm::dvec3{} ? control1 : (end + control2) - start); + glm::dvec2 const planar{tangent.x, tangent.z}; + if (glm::length(planar) < 1e-6) + return false; + Tool.path = Path; + Tool.atend = Atend; + Tool.track = &Track; + Tool.point = editor_track::point_position(Track, point); + Tool.direction = glm::normalize(planar); + Tool.grade = tangent.y / glm::length(planar); + Tool.mouse = Tool.point; + return true; +} + +bool editor_mode::chosen_free_end(extend_tool &Tool) +{ + auto *track{selected_track()}; + if (track == nullptr || (track->eType != tt_Normal && track->eType != tt_Switch) || false == editor_track::is_supported(*track)) + return false; + if (m_track_point.valid() && editor_track::is_end(m_track_point.kind) && free_end(*track, m_track_point.path, m_track_point.kind == editor_track::point_kind::end, Tool)) + return true; + for (int i = 0; i < static_cast(track->m_paths.size()); ++i) + for (auto const atend : {true, false}) + if (free_end(*track, i, atend, Tool)) + return true; + return false; } bool editor_mode::start_extend() { auto *track{selected_track()}; + if (m_track_tab != track_tab::path && m_track_tab != track_tab::straights && m_track_tab != track_tab::turnout) + return false; if (track == nullptr || (track->eType != tt_Normal && track->eType != tt_Switch) || false == editor_track::is_supported(*track)) return false; screen_projection const projection; for (int i = 0; i < static_cast(track->m_paths.size()); ++i) { - auto const &path{track->m_paths[i]}; for (auto const atend : {false, true}) { editor_track::point_ref const point{i, atend ? editor_track::point_kind::end : editor_track::point_kind::start}; - if (editor_track::is_connected(*track, point)) + if (editor_track::is_connected(*track, point) || projection.mouse_distance2(editor_track::point_position(*track, point)) > kHandleRadius * kHandleRadius * 1.5f) continue; - auto const position{editor_track::point_position(*track, point)}; - if (projection.mouse_distance2(position) > kHandleRadius * kHandleRadius * 1.5f) - continue; - auto const &start{path.points[segment_data::point::start]}; - auto const &end{path.points[segment_data::point::end]}; - auto const &control1{path.points[segment_data::point::control1]}; - auto const &control2{path.points[segment_data::point::control2]}; - glm::dvec3 tangent; - if (atend) - tangent = control2 != glm::dvec3{} ? -control2 : end - (start + control1); - else - tangent = -(control1 != glm::dvec3{} ? control1 : (end + control2) - start); - glm::dvec2 const planar{tangent.x, tangent.z}; - if (glm::length(planar) < 1e-6) + extend_tool tool; + if (false == free_end(*track, i, atend, tool)) return false; + m_extend = tool; m_extend.active = true; - m_extend.path = i; - m_extend.atend = atend; - m_extend.track = track; - m_extend.point = position; - m_extend.direction = glm::normalize(planar); - m_extend.grade = tangent.y / glm::length(planar); - m_extend.mouse = position; return true; } } @@ -2734,6 +3504,8 @@ std::vector editor_mode::extend_pieces() const design.end = target.position; design.start_direction = tool.direction; design.end_direction = glm::normalize(plan_of(target.direction)); + design.start_grade = tool.grade; + design.end_grade = grade_of(target.direction); auto const speed{editor_track::velocity(*tool.track)}; design.speed = speed > 0.0 ? speed : 100.0; if (false == alignment::collinear(design)) @@ -2753,9 +3525,9 @@ std::vector editor_mode::extend_pieces() const design.vertices = {vertex, vertex}; } } + // a track which doesn't fit to the free end isn't built towards the cursor instead, it'd miss the end auto const shape{alignment::compute(design)}; - if (shape.valid) - return alignment::pieces(shape, design, 0); + return shape.valid ? alignment::pieces(shape, design, 0) : result; } glm::dvec2 const offset{tool.mouse.x - tool.point.x, tool.mouse.z - tool.point.z}; auto const chord{glm::length(offset)}; @@ -2765,7 +3537,7 @@ std::vector editor_mode::extend_pieces() const auto const along{glm::dot(offset, direction)}; auto const lateral{direction.x * offset.y - direction.y * offset.x}; auto const height = [&](double const Distance) { return tool.point.y + tool.grade * Distance; }; - if (ImGui::GetIO().KeyCtrl || std::abs(lateral) < 0.005 * chord + 0.05) + if (false == m_extend_freehand || ImGui::GetIO().KeyCtrl || std::abs(lateral) < 0.005 * chord + 0.05) { if (along < 0.5) return result; @@ -2776,32 +3548,7 @@ std::vector editor_mode::extend_pieces() const return result; } auto const angle{2.0 * std::atan2(std::abs(lateral), along)}; - auto const radius{chord / (2.0 * std::sin(angle * 0.5))}; - double const side{lateral > 0.0 ? 1.0 : -1.0}; - glm::dvec2 const centre{plan_of(tool.point) + glm::dvec2{-direction.y, direction.x} * (side * radius)}; - auto const count{std::max(1, static_cast(std::ceil(angle / glm::radians(90.0) - 1e-9)))}; - auto const step{angle / count}; - auto const handle{4.0 / 3.0 * std::tan(step / 4.0) * radius}; - glm::dvec2 const radial{plan_of(tool.point) - centre}; - for (int i = 0; i < count; ++i) - { - auto const a0{side * step * i}; - auto const a1{side * step * (i + 1)}; - auto const p0{centre + turned(radial, a0)}; - auto const p3{centre + turned(radial, a1)}; - auto const d0{turned(direction, a0)}; - auto const d3{turned(direction, a1)}; - auto const y0{height(radius * step * i)}; - auto const y3{height(radius * step * (i + 1))}; - segment_data path; - path.points[segment_data::point::start] = {p0.x, y0, p0.y}; - path.points[segment_data::point::end] = {p3.x, y3, p3.y}; - path.points[segment_data::point::control1] = {d0.x * handle, tool.grade * handle, d0.y * handle}; - path.points[segment_data::point::control2] = {-d3.x * handle, -tool.grade * handle, -d3.y * handle}; - path.radius = static_cast(radius); - result.push_back(path); - } - return result; + return arc_pieces(tool.point, direction, tool.grade, chord / (2.0 * std::sin(angle * 0.5)), angle, lateral > 0.0 ? 1 : -1); } void editor_mode::finish_extend() @@ -2842,6 +3589,255 @@ void editor_mode::finish_extend() straight_refresh(); } +void editor_mode::extend_add(int const Side) +{ + extend_tool tool; + if (false == chosen_free_end(tool)) + return; + auto const length{std::max(0.5, m_extend_length)}; + std::vector pieces; + if (Side == 0) + { + segment_data path; + path.points[segment_data::point::start] = tool.point; + path.points[segment_data::point::end] = {tool.point.x + tool.direction.x * length, tool.point.y + tool.grade * length, tool.point.z + tool.direction.y * length}; + pieces.push_back(path); + } + else + { + auto const radius{std::max(10.0, m_extend_radius)}; + pieces = arc_pieces(tool.point, tool.direction, tool.grade, radius, std::min(length / radius, glm::radians(180.0)), Side); + } + std::vector created; + for (auto const &piece : pieces) + created.push_back(editor_track::create_path(*tool.track, piece)); + editor_track::commit(created); + push_track_snapshot({}, created); + m_node = created.back(); + ui()->set_node(m_node); + m_track_point = {}; + straight_refresh(); +} + +void editor_mode::render_extend_ui() +{ + extend_tool tool; + if (false == chosen_free_end(tool)) + return; + if (false == ImGui::CollapsingHeader(STR_C("Continue from the free end"), ImGuiTreeNodeFlags_DefaultOpen)) + return; + ImGui::PushItemWidth(100.0f); + ImGui::DragScalar(STR_C("Length (m)##extend"), ImGuiDataType_Double, &m_extend_length, 0.5f, nullptr, nullptr, "%.1f"); + item_tooltip("Length of the next piece, along the curve for the curves"); + ImGui::SameLine(); + ImGui::DragScalar("R (m)##extend", ImGuiDataType_Double, &m_extend_radius, 5.0f, nullptr, nullptr, "%.0f"); + item_tooltip("Radius of the curves added"); + ImGui::PopItemWidth(); + m_extend_length = std::clamp(m_extend_length, 0.5, 5000.0); + m_extend_radius = std::clamp(m_extend_radius, 10.0, 100000.0); + if (ImGui::Button(STR_C("Straight##extend"), ImVec2(100.0f, 0.0f))) + extend_add(0); + item_tooltip("Adds a straight at the free end; the new piece gets selected, so the next click goes on from it"); + ImGui::SameLine(); + if (ImGui::Button(STR_C("Curve left##extend"), ImVec2(100.0f, 0.0f))) + extend_add(1); + ImGui::SameLine(); + if (ImGui::Button(STR_C("Curve right##extend"), ImVec2(100.0f, 0.0f))) + extend_add(-1); + ImGui::Checkbox(STR_C("Freehand"), &m_extend_freehand); + item_tooltip("Dragging the red ring of a free end draws a curve through the cursor; off: it draws a straight along the end"); +} + +std::vector editor_mode::lay_pieces(std::vector const &Points, editor_track::snap_target const &End, double &Length, std::string &Error) const +{ + auto const &tool{m_lay}; + Length = 0.0; + if (Points.size() < 2) + return {}; + alignment::design design; + design.norms = m_route.design.norms; + design.shape = m_route.design.shape; + design.speed = tool.style.velocity > 0.0 ? tool.style.velocity : 100.0; + design.start = Points.front(); + design.end = Points.back(); + auto const startdirection{tool.start.track != nullptr ? -plan_of(tool.start.direction) : plan_of(Points[1] - Points[0])}; + auto const enddirection{End.track != nullptr ? plan_of(End.direction) : plan_of(Points.back() - Points[Points.size() - 2])}; + if (glm::length(startdirection) < 1e-3 || glm::length(enddirection) < 1e-3) + { + Error = STR_C("Two points lie on one another"); + return {}; + } + design.start_direction = glm::normalize(startdirection); + design.end_direction = glm::normalize(enddirection); + + alignment::vertex corner; + corner.radius = std::max(1.0, tool.radius); + if (tool.transitions) + { + auto const recommended{alignment::recommend(design.speed, corner.radius, design.norms)}; + corner.cant = recommended.cant; + corner.transition_in = corner.transition_out = recommended.transition; + } + if (Points.size() == 2) + { + if (false == alignment::collinear(design)) + { + glm::dvec2 intersection; + if (alignment::tangent_intersection(design, intersection)) + { + design.vertices.push_back(corner); + } + else + { + corner.offset = plan_distance(design.start, design.end) / 3.0; + design.vertices = {corner, corner}; + } + } + } + else + { + for (std::size_t i = 1; i + 1 < Points.size(); ++i) + { + corner.position = plan_of(Points[i]); + design.vertices.push_back(corner); + } + if (design.vertices.size() >= 2) + { + design.vertices.front().offset = std::max(1.0, glm::dot(plan_of(Points[1] - Points.front()), design.start_direction)); + design.vertices.back().offset = std::max(1.0, glm::dot(plan_of(Points.back() - Points[Points.size() - 2]), design.end_direction)); + } + } + auto const shape{alignment::compute(design)}; + if (false == shape.valid) + { + Error = shape.errors.empty() ? std::string{STR_C("The track can't be laid through these points")} : shape.errors.front(); + return {}; + } + Error = shape.warnings.empty() ? std::string{} : shape.warnings.front(); + Length = shape.length; + auto const count{std::max(alignment::minimum_pieces(shape, design), static_cast(std::ceil(shape.length / std::max(5.0, tool.piece_length))))}; + return alignment::pieces(shape, design, count); +} + +void editor_mode::lay_click() +{ + auto &tool{m_lay}; + tool.status.clear(); + auto const snap{editor_track::find_free_end(nullptr, kRailCategory, tool.mouse, kLaySnapRadius, {})}; + if (snap.track != nullptr && false == tool.points.empty() && glm::distance(snap.position, tool.points.front()) > 1.0) + { + // reaching a free end finishes the track there, in line with the path it joins + tool.points.push_back(snap.position); + lay_finish(snap); + return; + } + if (tool.points.empty()) + { + tool.start = snap; + tool.points.push_back(snap.track != nullptr ? snap.position : placement_on_ground(tool.mouse)); + return; + } + auto const point{placement_on_ground(tool.mouse)}; + if (plan_distance(point, tool.points.back()) < 1.0) + return; + tool.points.push_back(point); +} + +void editor_mode::lay_finish(editor_track::snap_target const &End) +{ + auto &tool{m_lay}; + double length; + std::string error; + auto const pieces{lay_pieces(tool.points, End, length, error)}; + if (pieces.empty()) + { + tool.status = error.empty() ? std::string{STR_C("Click at least two points")} : error; + if (End.track != nullptr && false == tool.points.empty()) + tool.points.pop_back(); + return; + } + auto const *style{tool.start.track != nullptr ? tool.start.track : End.track}; + if (style == nullptr && tool.copy_selected) + style = selected_track(); + std::vector created; + for (auto const &piece : pieces) + created.push_back(style != nullptr ? editor_track::create_path(*style, piece) : editor_track::create_path(tool.style, piece)); + editor_track::commit(created); + push_track_snapshot({}, created); + tool.status = format(STR_C("Laid %zu paths, %.1f m"), created.size(), length); + if (false == error.empty()) + tool.status += "\n" + error; + if (scene::Layers.active() == null_handle && style == nullptr) + tool.status += "\nThe scenery isn't opened for editing, the new track won't be saved"; + WriteLog("Editor: " + tool.status, logtype::generic); + tool.points.clear(); + tool.start = {}; + m_node = created.back(); + ui()->set_node(m_node); + straight_refresh(); +} + +void editor_mode::lay_cancel() +{ + auto &tool{m_lay}; + tool.points.clear(); + tool.start = {}; + tool.preview.clear(); +} + +void editor_mode::render_lay_ui() +{ + auto &tool{m_lay}; + ImGui::PushItemWidth(120.0f); + ImGui::DragScalar(STR_C("Curve radius (m)"), ImGuiDataType_Double, &tool.radius, 5.0f, nullptr, nullptr, "%.0f"); + item_tooltip("Drag to change, Ctrl+click to type the value"); + tool.radius = std::max(10.0, tool.radius); + ImGui::DragScalar(STR_C("Speed (km/h)"), ImGuiDataType_Double, &tool.style.velocity, 1.0f, nullptr, nullptr, "%.0f"); + tool.style.velocity = std::clamp(tool.style.velocity, 0.0, 400.0); + item_tooltip("Speed limit of the new paths, and the design speed of the transition curves and of the cant"); + ImGui::PopItemWidth(); + if (false == ImGui::TreeNode(STR_C("More settings"))) + { + render_lay_status(); + return; + } + ImGui::PushItemWidth(120.0f); + ImGui::Checkbox(STR_C("Transition curves and cant"), &tool.transitions); + item_tooltip("Lengths and the cant recommended for the speed and the radius; off: plain circular arcs with no cant"); + ImGui::DragScalar(STR_C("Longest path (m)"), ImGuiDataType_Double, &tool.piece_length, 1.0f, nullptr, nullptr, "%.0f"); + tool.piece_length = std::clamp(tool.piece_length, 5.0, 1000.0); + ImGui::PopItemWidth(); + ImGui::Checkbox(STR_C("Parameters of the selected track"), &tool.copy_selected); + item_tooltip("Takes the textures and the other parameters from the selected track.\nA track started or finished at a free end always takes them from the track it joins"); + if (false == tool.copy_selected) + { + auto const text_field = [](char const *Label, std::string &Value, char const *Tooltip) { + char buffer[256]; + std::snprintf(buffer, sizeof(buffer), "%s", Value.c_str()); + if (ImGui::InputText(Label, buffer, sizeof(buffer))) + Value = buffer; + item_tooltip(Tooltip); + }; + ImGui::PushItemWidth(-1.0f); + text_field("##layrail", tool.style.rail, STR_C("Texture of the rails")); + text_field("##layballast", tool.style.ballast, STR_C("Texture of the ballast")); + ImGui::PopItemWidth(); + } + ImGui::TreePop(); + render_lay_status(); +} + +void editor_mode::render_lay_status() +{ + auto const &tool{m_lay}; + if (scene::Layers.active() == null_handle) + ImGui::TextColored(ImVec4(1.0f, 0.7f, 0.2f, 1.0f), STR_C("The scenery isn't opened for editing: new track won't be saved")); + if (tool.active && false == tool.preview_error.empty()) + ImGui::TextColored(ImVec4(1.0f, 0.4f, 0.3f, 1.0f), "%s", tool.preview_error.c_str()); + if (false == tool.status.empty()) + ImGui::TextWrapped("%s", tool.status.c_str()); +} + std::vector editor_mode::switch_preview() const { auto const &tool{m_switch}; @@ -2867,20 +3863,36 @@ std::vector editor_mode::switch_preview() const bool editor_mode::start_switch_placement() { auto &tool{m_switch}; - if (tool.armed < 0 || (m_track_tab != track_tab::straights && m_track_tab != track_tab::route)) + if (tool.armed < 0 || m_track_tab != track_tab::turnout) + return false; + // with no plain track selected, or a press away from it, the click selects + auto *selected{selected_track()}; + if (selected == nullptr || selected->eType != tt_Normal) return false; glm::dvec3 const ground{Global.pCamera.Pos + GfxRenderer->Mouse_Position()}; tool.curved = false; - if (m_track_tab == track_tab::route || current_straight().tracks.empty()) + tool.status.clear(); + if (current_straight().tracks.empty()) { - auto *track{selected_track()}; - if (track == nullptr || track->eType != tt_Normal || tool.templates[tool.armed].double_slip) + auto *track{selected}; + if (tool.templates[tool.armed].double_slip) + { + tool.status = STR_C("A double slip goes only into a straight crossing another one"); return false; + } editor_track::curve curve; editor_track::chain chain; std::string error; - if (false == editor_track::find_curve(*track, m_straights.tolerance, m_route.design.norms.gauge, curve) || false == editor_track::find_chain(curve.from, curve.to, chain, error)) + if (false == editor_track::find_curve(*track, m_straights.tolerance, m_route.design.norms.gauge, curve)) + { + tool.status = STR_C("The selected track is neither a recognized straight nor a curve"); return false; + } + if (false == editor_track::find_chain(curve.from, curve.to, chain, error)) + { + tool.status = error.empty() ? std::string{STR_C("The curve can't be followed")} : error; + return false; + } tool.frame = sample_chain(chain); tool.frame_tracks = chain.tracks; if (tool.frame.size() < 2) @@ -2888,20 +3900,24 @@ bool editor_mode::start_switch_placement() tool.curved = true; tool.along = nearest_station(tool.frame, ground); tool.point = sample_at(tool.frame, tool.along).position; + if (plan_distance(tool.point, ground) > kSwitchReach) + return false; tool.mouse = ground; tool.placing = true; return true; } auto const &line{current_straight()}; - if (line.tracks.empty()) + auto const along{std::clamp(line.along(ground), 0.0, line.length)}; + auto const point{line.start + glm::dvec3{line.direction.x, line.grade, line.direction.y} * along}; + if (plan_distance(point, ground) > kSwitchReach) return false; if (tool.templates[tool.armed].double_slip) { insert_double_slip(line, ground, tool.templates[tool.armed]); return true; } - tool.along = std::clamp(line.along(ground), 0.0, line.length); - tool.point = line.start + glm::dvec3{line.direction.x, line.grade, line.direction.y} * tool.along; + tool.along = along; + tool.point = point; tool.mouse = ground; tool.line = line; tool.placing = true; @@ -2946,6 +3962,13 @@ bool editor_mode::cut_straight(editor_track::straight const &Line, double const { auto const from{From}; auto const to{To}; + std::string reason; + if (false == tracks_editable(Line.tracks, reason)) + { + m_switch.status = reason; + ui()->set_status(reason, true); + return false; + } struct span { TTrack *track; @@ -3027,7 +4050,10 @@ bool editor_mode::place_switch_on_straight(editor_track::straight const &Line, e { auto const &shape{Shape}; if (shape.length > Line.length - 0.02) + { + m_switch.status = format(STR_C("The straight is %.1f m long, too short for the %.1f m switch"), Line.length, shape.length); return false; + } auto from{std::clamp(Direction > 0 ? Along : Along - shape.length, 0.0, Line.length - shape.length)}; if (Snap) { @@ -3057,7 +4083,10 @@ bool editor_mode::place_switch_on_straight(editor_track::straight const &Line, e auto const origin{Direction > 0 ? from : to}; TTrack *first{nullptr}; if (false == cut_straight(Line, from, to, States, Created, Removed, &first)) + { + m_switch.status = STR_C("The switch would overlap another switch, move it onto plain track"); return false; + } auto const point = [&](double const Distance) { return Line.start + glm::dvec3{Line.direction.x, Line.grade, Line.direction.y} * Distance; }; glm::dvec2 const direction{Line.direction * static_cast(Direction)}; auto const paths{editor_track::place_switch(shape, point(origin), direction, Side, Line.grade * Direction)}; @@ -3066,7 +4095,10 @@ bool editor_mode::place_switch_on_straight(editor_track::straight const &Line, e { editor_track::commit({track}); Created.push_back(track); + m_switch.status = STR_C("Switch ") + track->name() + STR_C(" inserted"); } + else + m_switch.status = STR_C("The switch couldn't be created from this template"); return true; } @@ -3083,6 +4115,23 @@ void editor_mode::draw_build_overlay() const previous = next; } }; + glm::dvec3 const camera{Global.pCamera.Pos}; + auto const &display{ImGui::GetIO().DisplaySize}; + for (auto const *track : simulation::Paths.sequence()) + { + if (track == nullptr || track->m_editorremoved || track->m_paths.empty()) + continue; + auto const &first{track->m_paths.front().points}; + if (glm::distance(first[segment_data::point::start], camera) > kJointRange && glm::distance(first[segment_data::point::end], camera) > kJointRange) + continue; + for (auto const &path : track->m_paths) + for (auto const point : {segment_data::point::start, segment_data::point::end}) + { + ImVec2 screen; + if (projection.project(path.points[point], screen) && screen.x >= 0.0f && screen.y >= 0.0f && screen.x <= display.x && screen.y <= display.y) + drawlist->AddCircleFilled(screen, 3.5f, kJointColor); + } + } if (m_extend.active) { crossover_plan plan; @@ -3110,6 +4159,43 @@ void editor_mode::draw_build_overlay() const if (m_switch.placing) for (auto const &piece : switch_preview()) drawpath(piece, overlay_color::marked); + if (m_lay.active) + { + auto const &lay{m_lay}; + for (auto const &piece : lay.preview) + drawpath(piece, lay.preview_error.empty() ? overlay_color::marked : overlay_color::grip); + for (std::size_t i = 0; i + 1 < lay.points.size(); ++i) + projection.line(drawlist, lay.points[i], lay.points[i + 1], IM_COL32(255, 255, 255, 90), 1.0f); + for (auto const &point : lay.points) + { + ImVec2 screen; + if (projection.project(point, screen)) + drawlist->AddCircleFilled(screen, 5.0f, overlay_color::grip); + } + ImVec2 screen; + if (lay.mouse_snap.track != nullptr && projection.project(lay.mouse_snap.position, screen)) + drawlist->AddCircle(screen, 14.0f, IM_COL32(255, 60, 255, 255), 20, 3.0f); + if (lay.start.track != nullptr && projection.project(lay.start.position, screen)) + drawlist->AddCircle(screen, 10.0f, IM_COL32(255, 60, 255, 255), 20, 2.0f); + if (lay.points.empty()) + { + // free ends nearby, which the new track can start from + for (auto *section : simulation::Region->sections(lay.mouse, 300.f)) + for (auto const &cell : section->m_cells) + for (auto *path : cell.m_directories.paths) + { + if ((path->iCategoryFlag & 15) != kRailCategory || false == editor_track::is_supported(*path)) + continue; + for (int i = 0; i < static_cast(path->m_paths.size()); ++i) + for (auto const kind : {editor_track::point_kind::start, editor_track::point_kind::end}) + { + editor_track::point_ref const point{i, kind}; + if (false == editor_track::is_connected(*path, point) && projection.project(editor_track::point_position(*path, point), screen)) + drawlist->AddCircle(screen, 7.0f, IM_COL32(255, 60, 255, 160), 12, 1.5f); + } + } + } + } if (false == m_straights.detour.empty()) { auto const outline{detour_outline()}; @@ -3142,30 +4228,23 @@ void editor_mode::draw_build_overlay() const void editor_mode::render_switch_ui() { auto &tool{m_switch}; - if (false == ImGui::CollapsingHeader("Switches", ImGuiTreeNodeFlags_DefaultOpen)) - return; - if (false == tool.collected) - { - tool.templates = editor_track::standard_switch_templates(); - auto const found{editor_track::find_switch_templates()}; - tool.templates.insert(tool.templates.end(), found.begin(), found.end()); - tool.collected = true; - } - ImGui::TextDisabled(tool.armed >= 0 ? "Press on the straight where the switch starts and drag: along sets its direction, sideways its side" : "Click a template, then drag on the selected straight"); - ImGui::BeginChild("##switchtemplates", ImVec2(0.0f, 150.0f), true); + ImGui::TextDisabled("%s", STR_C("Switch template")); + ImGui::BeginChild("##switchtemplates", ImVec2(0.0f, 240.0f), true); for (int i = 0; i < static_cast(tool.templates.size()); ++i) { auto const &entry{tool.templates[i]}; - auto label{entry.source != nullptr ? "Scenery: " + entry.label + " (" + std::to_string(entry.count) + "x)" : "PLK: " + entry.label}; + auto label{entry.source != nullptr ? STR("Scenery: ") + entry.label + " (" + std::to_string(entry.count) + "x)" : "PLK: " + entry.label}; label += "##switch" + std::to_string(i); if (ImGui::Selectable(label.c_str(), tool.armed == i)) - tool.armed = (tool.armed == i ? -1 : i); + tool.armed = tool.last = i; } ImGui::EndChild(); - if (ImGui::SmallButton("Collect again from the scenery")) + if (false == tool.status.empty()) + ImGui::TextColored(ImVec4(1.0f, 0.7f, 0.2f, 1.0f), "%s", tool.status.c_str()); + if (ImGui::SmallButton(STR_C("Collect again from the scenery"))) { tool.collected = false; - tool.armed = -1; + arm_switch(); } item_tooltip("Looks for the switches of the scenery again, to use their shapes as the templates"); } @@ -3483,7 +4562,9 @@ std::vector editor_mode::build_double_slip(glm::dvec3 const &PointA, g path.points[segment_data::point::end] = End; return path; }; - double const gap{0.25}; + // the ends of the two diagonals at the crossing are kept apart further than the simulation joins the ends, 2 cm + auto const halfsine{std::sqrt(std::max(1e-6, (1.0 - glm::dot(First, Second)) * 0.5))}; + auto const gap{std::max(0.25, 0.06 / halfsine)}; auto const side{cross(First, Second) > 0.0 ? 1.0 : -1.0}; auto const arc = [&](glm::dvec3 const &Start, glm::dvec2 const &Heading, double const Turn, glm::dvec3 const &Finish, double const From, double const To) { glm::dvec2 const centre{plan_of(Start) + glm::dvec2{-Heading.y, Heading.x} * (Turn * Radius)}; @@ -3585,7 +4666,7 @@ bool editor_mode::insert_double_slip(editor_track::straight const &Line, glm::dv } if (other == nullptr) { - state.status = "No straight crossing the selected one near the click"; + state.status = STR_C("No straight crossing the selected one near the click"); return false; } auto const second{editor_track::find_straight(*other, m_straights.tolerance)}; @@ -3598,7 +4679,7 @@ bool editor_mode::insert_double_slip(editor_track::straight const &Line, glm::dv auto const angle{std::atan2(std::abs(cross(first, direction)), glm::dot(first, direction))}; if (angle < glm::radians(0.5) || angle > glm::radians(30.0)) { - state.status = "The straights cross at an angle unsuitable for a double slip"; + state.status = STR_C("The straights cross at an angle unsuitable for a double slip"); return false; } auto const alongfirst{glm::dot(crossing - plan_of(Line.start), Line.direction)}; @@ -3612,10 +4693,10 @@ bool editor_mode::insert_double_slip(editor_track::straight const &Line, glm::dv radius = half / std::tan(angle * 0.5); if (radius < 50.0) { - state.status = "Not enough straight track around the crossing"; + state.status = STR_C("Not enough straight track around the crossing"); return false; } - state.status = "R reduced to " + std::to_string(static_cast(radius)) + " m, the straights end " + std::to_string(static_cast(available)) + " m from the crossing"; + state.status = STR_C("R reduced to ") + std::to_string(static_cast(radius)) + STR_C(" m, the straights end ") + std::to_string(static_cast(available)) + STR_C(" m from the crossing"); } auto const heightfirst = [&](double const Along) { return Line.start.y + Line.grade * Along; }; @@ -3669,7 +4750,7 @@ bool editor_mode::replace_double_slip(TTrack &Part, editor_track::switch_templat switches[i] = simulation::Paths.find(base + "_" + static_cast('a' + i)); if (switches[i] == nullptr || switches[i]->m_editorremoved || switches[i]->eType != tt_Switch || switches[i]->m_paths.size() < 2) { - state.status = "The double slip isn't complete, it can't be replaced"; + state.status = STR_C("The double slip isn't complete, it can't be replaced"); return false; } } @@ -3705,7 +4786,7 @@ bool editor_mode::replace_double_slip(TTrack &Part, editor_track::switch_templat partner = i; if (partner < 0) { - state.status = "The double slip geometry isn't recognized"; + state.status = STR_C("The double slip geometry isn't recognized"); return false; } auto const &a{ends[0]}; @@ -3742,7 +4823,7 @@ bool editor_mode::replace_double_slip(TTrack &Part, editor_track::switch_templat { half = oldhalf; radius = half / std::tan(angle * 0.5); - state.status = "R limited to " + std::to_string(static_cast(radius)) + " m, a neighbouring path isn't straight"; + state.status = STR_C("R limited to ") + std::to_string(static_cast(radius)) + STR_C(" m, a neighbouring path isn't straight"); break; } auto const line{editor_track::find_straight(*e->outer, m_straights.tolerance)}; @@ -3752,7 +4833,7 @@ bool editor_mode::replace_double_slip(TTrack &Part, editor_track::switch_templat { half = std::min(half, std::max(reach, reachstart) - 0.5); radius = half / std::tan(angle * 0.5); - state.status = "R reduced to " + std::to_string(static_cast(radius)) + " m to fit the straights"; + state.status = STR_C("R reduced to ") + std::to_string(static_cast(radius)) + STR_C(" m to fit the straights"); } } } @@ -3921,9 +5002,12 @@ void editor_mode::insert_curved_switch(int const Direction, int const Side) auto &tool{m_switch}; auto const &shape{tool.templates[tool.armed]}; auto const total{tool.frame.back().station}; - auto station{std::clamp(tool.along, Direction > 0 ? 0.0 : shape.length, Direction > 0 ? total - shape.length : total)}; if (shape.length > total - 0.02) + { + tool.status = format(STR_C("The curve is %.1f m long, too short for the %.1f m switch"), total, shape.length); return; + } + auto const station{std::clamp(tool.along, Direction > 0 ? 0.0 : shape.length, Direction > 0 ? total - shape.length : total)}; auto const from{Direction > 0 ? station : station - shape.length}; auto const to{from + shape.length}; std::vector> states; @@ -3972,7 +5056,10 @@ void editor_mode::insert_curved_switch(int const Direction, int const Side) { editor_track::commit({track}); created.push_back(track); + tool.status = STR_C("Switch ") + track->name() + STR_C(" inserted into the curve"); } + else + tool.status = STR_C("The switch couldn't be created from this template"); push_track_snapshot(std::move(states), std::move(created), std::move(removed)); straight_refresh(); } diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index 9dbc39abf..8015499f1 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -85,22 +85,6 @@ void editor_ui::render_mode_options(nodebank_panel::edit_mode const Mode) if (m_filloptions) m_filloptions(); break; - case nodebank_panel::TRACK: - if (m_gaugewindow != nullptr) - { - auto const open{*m_gaugewindow}; - if (open) - ImGui::PushStyleColor(ImGuiCol_Button, ImGui::GetStyleColorVec4(ImGuiCol_ButtonActive)); - if (ImGui::Button(STR_C("Structure gauge"), ImVec2(-1.0f, 0.0f))) - *m_gaugewindow = false == *m_gaugewindow; - if (open) - ImGui::PopStyleColor(); - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("Checks which models enter the structure gauge of the tracks and the clearance over the roads (skrajnia budowli)")); - } - if (m_trackoptions) - m_trackoptions(); - break; default: break; } @@ -218,7 +202,13 @@ std::string const *editor_ui::get_active_node_template(bool bypassRandom) nodebank_panel::edit_mode editor_ui::mode() { - return m_nodebankpanel.mode; + return m_track ? nodebank_panel::TRACK : m_nodebankpanel.mode; +} +void editor_ui::set_mode(nodebank_panel::edit_mode const Mode) +{ + m_nodebankpanel.requested_mode = Mode; + m_nodebankpanel.mode = Mode; + m_nodebankpanel.is_open = true; } float editor_ui::getSpacing() { diff --git a/application/editoruilayer.h b/application/editoruilayer.h index 0bd8d0742..f4e9679a8 100644 --- a/application/editoruilayer.h +++ b/application/editoruilayer.h @@ -37,6 +37,7 @@ class editor_ui : public ui_layer functions_panel::rotation_mode rot_mode(); const std::string *get_active_node_template(bool bypassRandom = false); nodebank_panel::edit_mode mode(); + void set_mode(nodebank_panel::edit_mode const Mode); float getSpacing(); // node bank and model set access (set selection widgets, set contents) nodebank_panel &nodebank() @@ -50,9 +51,10 @@ class editor_ui : public ui_layer { m_filloptions = std::move(Renderer); } - void set_track_options(std::function Renderer) + // the open track window takes the mouse over, whichever toolset tab is chosen + void set_track(bool const Track) { - m_trackoptions = std::move(Renderer); + m_track = Track; } // draws menus of the editor mode in the menu bar, past the ones of the user interface void set_menu_options(std::function Renderer) @@ -64,11 +66,6 @@ class editor_ui : public ui_layer { m_gizmooptions = std::move(Renderer); } - // switch of the structure gauge window in the menu bar (the window lives in the editor mode) - void set_gauge_window(bool *Open) - { - m_gaugewindow = Open; - } // actions of the file menu, performed by the editor mode void set_file_actions(std::function Save, std::function Export); // shows outcome of an operation in the layers window @@ -91,9 +88,8 @@ class editor_ui : public ui_layer bool m_insertrandom{false}; // insert mode picks a random template from m_insertset model_set_ref m_insertset; std::function m_filloptions; - std::function m_trackoptions; std::function m_menuoptions; std::function m_gizmooptions; scene::basic_node *m_node{nullptr}; // currently bound scene node, if any - bool *m_gaugewindow{nullptr}; + bool m_track{false}; }; diff --git a/application/editoruipanels.cpp b/application/editoruipanels.cpp index 09bfa683b..0ca125bd0 100644 --- a/application/editoruipanels.cpp +++ b/application/editoruipanels.cpp @@ -542,12 +542,12 @@ void nodebank_panel::render() } // edit modes as tabs, each with its own settings - std::pair const modes[] = {{"Select", MODIFY}, {"Track", TRACK}, {"Insert", ADD}, {"Brush", BRUSH}, {"Area fill", FILL}, {"Copy to bank", COPY}}; + std::pair const modes[] = {{"Select", MODIFY}, {"Insert", ADD}, {"Brush", BRUSH}, {"Area fill", FILL}, {"Copy to bank", COPY}}; if (ImGui::BeginTabBar("##editmodes", ImGuiTabBarFlags_FittingPolicyResizeDown)) { for (auto const &tab : modes) { - if (false == ImGui::BeginTabItem(tab.first)) + if (false == ImGui::BeginTabItem(tab.first, nullptr, requested_mode == tab.second ? ImGuiTabItemFlags_SetSelected : 0)) { continue; } @@ -559,6 +559,7 @@ void nodebank_panel::render() ImGui::EndTabItem(); } ImGui::EndTabBar(); + requested_mode = -1; } ImGui::Separator(); diff --git a/application/editoruipanels.h b/application/editoruipanels.h index d86ec06e8..b558a069f 100644 --- a/application/editoruipanels.h +++ b/application/editoruipanels.h @@ -126,6 +126,7 @@ class nodebank_panel : public ui_panel TRACK }; edit_mode mode = MODIFY; + int requested_mode{-1}; // tab brought forward on the next frame nodebank_panel(std::string const &Name, bool const Isopen); void nodebank_reload(); From a13a5548df88e46a86af30669b872d4929150779 Mon Sep 17 00:00:00 2001 From: maj00r Date: Mon, 5 Oct 2026 02:21:55 +0200 Subject: [PATCH 126/430] feat(terrain): grade line fitted to the ground under the route within the limits; editor terrain shaped to the grade line with a formation and rounded slopes, with one step back; scenery ground triangles of chosen materials converted to editor terrain and taken out of the files on save, with a dated backup of each file; crack-free simplified terrain mesh, terrain streamed as far as the scenery is drawn, the nearest chunks first; smoothing brush --- application/editormode.cpp | 284 ++++++++++++++++++++++- application/editormode.h | 31 +++ application/editormodeprofile.cpp | 273 ++++++++++++++++++++++ editor/editorProfile.cpp | 249 ++++++++++++++++++++ editor/editorProfile.hpp | 9 + editor/editorTerrain.cpp | 131 ++++++++++- editor/editorTerrain.hpp | 16 +- editor/editorTerrainStreamer.cpp | 28 ++- editor/editorTerrainStreamer.hpp | 4 + lang/editor_pl.po | 132 +++++++++++ scene/scenelayers.cpp | 34 +++ scene/scenelayers.h | 21 ++ scene/scenelayerssave.cpp | 36 +++ simulation/simulationstateserializer.cpp | 35 ++- 14 files changed, 1253 insertions(+), 30 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index d25788808..d684b13ff 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -16,6 +16,8 @@ http://mozilla.org/MPL/2.0/. #include "editor/editorModelSets.hpp" #include "editor/editorIncludeInfo.hpp" #include "editor/editorGroundMesh.hpp" +#include "editor/editorFormat.hpp" +#include "utilities/translation.h" #include "utilities/Globals.h" #include "simulation/simulation.h" #include "simulation/simulationtime.h" @@ -1308,7 +1310,9 @@ void editor_mode::render_settings() ImGui::Checkbox("Transform gizmo (ImGuizmo)", &m_gizmo_enabled); ImGui::EndTabItem(); } - if (ImGui::BeginTabItem("Terrain")) + bool const terrainwanted = m_terrain_tab_wanted; + m_terrain_tab_wanted = false; + if (ImGui::BeginTabItem("Terrain", nullptr, terrainwanted ? ImGuiTabItemFlags_SetSelected : 0)) { render_terrain_ui(); ImGui::EndTabItem(); @@ -1439,9 +1443,16 @@ void editor_mode::render_terrain_ui() if (!terrains.empty()) { ImGui::Separator(); - if (ImGui::Checkbox("Sculpt mode (LMB raise / Shift = lower)", &m_terrain_sculpt)) + if (ImGui::Checkbox((std::string(m_terrain_brush_smooth ? STR_C("Sculpt mode (LMB smooth)") : STR_C("Sculpt mode (LMB raise / Shift = lower)")) + "###sculptmode").c_str(), &m_terrain_sculpt)) if (m_terrain_sculpt) m_chunk_edit = false; // mutually exclusive with chunk editing + int brush = m_terrain_brush_smooth ? 1 : 0; + ImGui::RadioButton(STR_C("Raise / lower"), &brush, 0); + ImGui::SameLine(); + ImGui::RadioButton(STR_C("Smooth"), &brush, 1); + m_terrain_brush_smooth = (brush == 1); + if (m_terrain_brush_smooth && ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Evens out the ground under the brush: bumps and sharp edges go, the shape stays.\nThe strength sets how fast")); ImGui::SetNextItemWidth(120.0f); ImGui::InputFloat("Brush radius", &m_terrain_brush_radius); if (m_terrain_brush_radius < 0.5f) @@ -1737,6 +1748,235 @@ void editor_mode::add_grid_chunk(int Cx, int Cz) m_grid_chunks[key] = std::move(terrain); } +namespace +{ + std::uint64_t geometry_key(gfx::geometry_handle const &Geometry) + { + return (static_cast(Geometry.bank) << 32) | Geometry.chunk; + } + + // the shapes of the scenery which can be ground: the ones the editor makes itself (its terrain, roads, imagery) left out + template void visit_scenery_shapes(std::set const &Own, Visitor const &Visit) + { + auto const scenery = [&](scene::shape_node const &Shape) { + auto const &data = Shape.data(); + return Own.count(geometry_key(data.geometry)) == 0 && false == editor_orthophoto::owns(data.geometry) && false == owned_shapes::owns(data.geometry); + }; + for (std::size_t i = 0; i < sq(scene::EU07_REGIONSIDESECTIONCOUNT); ++i) + { + auto *section = simulation::Region->get_section(i); + if (section == nullptr) + continue; + for (auto &shape : section->m_shapes) + if (scenery(shape)) + Visit(shape); + for (auto &cell : section->m_cells) + for (auto &shape : cell.m_shapesopaque) + if (scenery(shape)) + Visit(shape); + } + } + + // takes the shapes of specified materials out of the scene + std::size_t drop_scenery_shapes(std::set const &Own, std::set const &Materials) + { + std::size_t dropped = 0; + auto const dropping = [&](scene::shape_node const &Shape) { + auto const &data = Shape.data(); + bool const drop = Materials.count(data.material) != 0 && Own.count(geometry_key(data.geometry)) == 0 && false == editor_orthophoto::owns(data.geometry) && + false == owned_shapes::owns(data.geometry); + dropped += drop ? 1 : 0; + return drop; + }; + for (std::size_t i = 0; i < sq(scene::EU07_REGIONSIDESECTIONCOUNT); ++i) + { + auto *section = simulation::Region->get_section(i); + if (section == nullptr) + continue; + section->m_shapes.erase(std::remove_if(section->m_shapes.begin(), section->m_shapes.end(), dropping), section->m_shapes.end()); + for (auto &cell : section->m_cells) + cell.m_shapesopaque.erase(std::remove_if(cell.m_shapesopaque.begin(), cell.m_shapesopaque.end(), dropping), cell.m_shapesopaque.end()); + } + return dropped; + } +} // namespace + +std::map editor_mode::ground_materials() +{ + std::map result; + if (simulation::Region == nullptr) + return result; + std::set own; + for (auto *terrain : active_terrains()) + own.insert(geometry_key(terrain->geometry())); + glm::dvec2 const everywhere{std::numeric_limits::max() * 0.5}; + visit_scenery_shapes(own, [&](scene::shape_node const &Shape) { + std::vector triangles; + gather_shape_triangles(Shape, -everywhere, everywhere, triangles, true); + if (false == triangles.empty()) + result[Shape.data().material] += triangles.size(); + }); + return result; +} + +std::string editor_mode::convert_ground(std::set const &Materials) +{ + if (simulation::Region == nullptr || Materials.empty()) + return {}; + bool const streaming = m_streamer.active(); + double const size = streaming ? m_streamer.cells() * m_streamer.cellsize() : chunk_grid_size(); + int const cells = streaming ? m_streamer.cells() : std::clamp(m_terrain_cells, 1, 256); + double const cellsize = size / cells; + if (size <= 0.0) + return {}; + + std::set own; + for (auto *terrain : active_terrains()) + own.insert(geometry_key(terrain->geometry())); + std::vector triangles; + std::vector materials; + glm::dvec2 const everywhere{std::numeric_limits::max() * 0.5}; + visit_scenery_shapes(own, [&](scene::shape_node const &Shape) { + if (Materials.count(Shape.data().material) == 0) + return; + gather_shape_triangles(Shape, -everywhere, everywhere, triangles, true); + materials.resize(triangles.size(), Shape.data().material); + }); + if (triangles.empty()) + return STR_C("The chosen materials have no triangles"); + + // the triangles reaching each chunk + std::map, std::vector> buckets; + for (std::uint32_t i = 0; i < triangles.size(); ++i) + { + auto const &t = triangles[i]; + int const x0 = static_cast(std::floor(std::min({t[0].x, t[1].x, t[2].x}) / size)); + int const x1 = static_cast(std::floor(std::max({t[0].x, t[1].x, t[2].x}) / size)); + int const z0 = static_cast(std::floor(std::min({t[0].z, t[1].z, t[2].z}) / size)); + int const z1 = static_cast(std::floor(std::max({t[0].z, t[1].z, t[2].z}) / size)); + for (int x = x0; x <= x1; ++x) + for (int z = z0; z <= z1; ++z) + buckets[{x, z}].push_back(i); + } + + // the terrain of the editor has a single texture, saved with it: the material which covers the most + std::map coverage; + for (std::size_t i = 0; i < triangles.size(); ++i) + { + auto const &t = triangles[i]; + coverage[materials[i]] += 0.5 * std::abs((t[1].x - t[0].x) * (t[2].z - t[0].z) - (t[2].x - t[0].x) * (t[1].z - t[0].z)); + } + auto const dominant = std::max_element(coverage.begin(), coverage.end(), [](auto const &A, auto const &B) { return A.second < B.second; })->first; + if (auto const *material = GfxRenderer->Material(dominant)) + { + auto const name = material->GetName(); + std::snprintf(m_terrain_texture, sizeof(m_terrain_texture), "%s", name.c_str()); + } + std::string const texture(m_terrain_texture); + // a whole scenery of the full grid would be a lot to draw + m_terrain_auto_optimize = true; + if (streaming) + { + m_streamer.simplify(true, m_terrain_simplify_error); + m_streamer.configure(m_streamer.cells(), m_streamer.cellsize(), m_streamer.radius(), m_terrain_baseheight, texture); + } + + // the old ground goes first, so what's made in its place isn't taken for it + auto const dropped = drop_scenery_shapes(own, Materials); + std::size_t made = 0, skipped = 0; + std::size_t const side = static_cast(cells) + 1; + for (auto const &bucket : buckets) + { + auto const &key = bucket.first; + glm::dvec2 const low{key.first * size, key.second * size}; + glm::dvec2 const middle{low + glm::dvec2{size * 0.5}}; + if (streaming ? m_streamer.terrain_at(middle.x, middle.y) != nullptr : m_grid_chunks.count(key) > 0) + { + ++skipped; + continue; + } + std::vector local; + for (auto const i : bucket.second) + local.push_back(triangles[i]); + triangle_grid const ground(std::move(local), low - glm::dvec2{1.0}, low + glm::dvec2{size + 1.0}); + std::vector heights(side * side, 0.0); + std::vector found(side * side, 0); + std::vector known; + for (std::size_t iz = 0; iz < side; ++iz) + for (std::size_t ix = 0; ix < side; ++ix) + { + auto const index = iz * side + ix; + if (ground.height_at(low.x + ix * cellsize, low.y + iz * cellsize, std::numeric_limits::max(), heights[index])) + { + found[index] = 1; + known.push_back(index); + } + } + if (known.empty()) + continue; + // at the edge of the ground the chunk is carried on level with the nearest point of it + if (known.size() < heights.size()) + for (std::size_t index = 0; index < heights.size(); ++index) + { + if (found[index] != 0) + continue; + double best = std::numeric_limits::max(); + for (auto const other : known) + { + double const dx = static_cast(index % side) - static_cast(other % side); + double const dz = static_cast(index / side) - static_cast(other / side); + if (dx * dx + dz * dz < best) + { + best = dx * dx + dz * dz; + heights[index] = heights[other]; + } + } + } + auto const sampler = [&](double X, double Z, double &OutY) { + auto const ix = static_cast(std::clamp(std::lround((X - low.x) / cellsize), 0, cells)); + auto const iz = static_cast(std::clamp(std::lround((Z - low.y) / cellsize), 0, cells)); + OutY = heights[iz * side + ix]; + return true; + }; + if (streaming) + { + m_streamer.add_chunk(key.first, key.second); + if (auto *terrain = m_streamer.terrain_at(middle.x, middle.y)) + { + terrain->reshape([&](double X, double Z, float &Height) { + double y; + sampler(X, Z, y); + Height = static_cast(y); + return true; + }); + ++made; + } + } + else + { + auto chunk = std::make_unique(); + if (chunk->create(glm::dvec3{middle.x, m_terrain_baseheight, middle.y}, cells, static_cast(cellsize), texture, sampler)) + { + // the full grid everywhere would be a lot to draw; the simplified one keeps it exact where it matters + chunk->optimize(m_terrain_simplify_error); + m_grid_chunks[key] = std::move(chunk); + ++made; + } + } + } + ground_tiles.clear(); + forget_ground_shapes(); + + auto const erased = scene::Layers.erase_shapes(Materials); + auto summary = format(STR_C("Ground converted: %zu chunks of editor terrain made, %zu shapes taken out of the scene, %zu triangle nodes go from the scenery files on save"), made, dropped, erased.first); + if (skipped > 0) + summary += format(STR_C(", %zu chunks kept as there was editor terrain already"), skipped); + if (erased.second > 0) + summary += format(STR_C(", %zu nodes stay as their files can't be rewritten"), erased.second); + WriteLog("Editor: " + summary, logtype::generic); + return summary; +} + void editor_mode::remove_grid_chunk(int Cx, int Cz) { auto const it = m_grid_chunks.find({Cx, Cz}); @@ -1875,12 +2115,14 @@ void editor_mode::save() std::vector rootstatements; if (m_streamer.active() || false == m_grid_chunks.empty()) { + // the chunks go over to the streamer, what was kept to take back the shaping refers to the ones which are gone + m_profile.earthworks.undo.clear(); commit_terrain(); if (false == scene::Layers.terrain_directive()) { rootstatements.emplace_back( "editorterrain " + m_streamer.directory() + ' ' + std::to_string(m_streamer.cells()) + ' ' + to_string(m_streamer.cellsize(), 3) + ' ' - + std::to_string(m_streamer.radius()) + " endeditorterrain"); + + std::to_string(m_streamer.radius()) + (m_streamer.texture().empty() ? "" : ' ' + m_streamer.texture()) + " endeditorterrain"); } } @@ -2087,11 +2329,37 @@ void editor_mode::handle_terrain_sculpt(double Deltatime) return; double const rate = m_terrain_brush_strength * Deltatime; // metres applied this frame - double const signedrate = Global.shiftState ? -rate : rate; - // apply to every chunk the brush touches; each patch clips to its own bounds, so a stroke - // crossing a chunk boundary edits both and shared-edge vertices stay in sync - for (editor_terrain *terrain : active_terrains()) - terrain->sculpt(world.x, world.z, m_terrain_brush_radius, signedrate); + if (m_terrain_brush_smooth) + { + // every patch the brush touches is smoothed from the same ground, so the edges they share stay together + auto const terrains = active_terrains(); + double const reach = m_terrain_brush_radius + 2.0 * m_terrain_cellsize + 1.0; + std::vector>> before; + for (editor_terrain *terrain : terrains) + { + auto const centre = terrain->centre(); + double const half = terrain->extent() * 0.5; + if (std::abs(centre.x - world.x) <= half + reach && std::abs(centre.z - world.z) <= half + reach) + before.emplace_back(terrain, terrain->heights()); + } + auto const ground = [&](double X, double Z, double Fallback) { + for (auto const &entry : before) + if (entry.first->contains(X, Z)) + return entry.first->height_in(entry.second, X, Z); + return Fallback; + }; + double const amount = std::min(1.0, rate * 0.5); + for (auto const &entry : before) + entry.first->smooth(world.x, world.z, m_terrain_brush_radius, amount, ground); + } + else + { + double const signedrate = Global.shiftState ? -rate : rate; + // apply to every chunk the brush touches; each patch clips to its own bounds, so a stroke + // crossing a chunk boundary edits both and shared-edge vertices stay in sync + for (editor_terrain *terrain : active_terrains()) + terrain->sculpt(world.x, world.z, m_terrain_brush_radius, signedrate); + } // what the road tools know about the ground is no longer true ground_tiles.clear(); forget_ground_shapes(); diff --git a/application/editormode.h b/application/editormode.h index f7c5c11f5..fb44b830d 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -198,6 +198,19 @@ class editor_mode : public application_mode, private editor_track::observer float chunk_grid_size() const { return m_terrain_cells * m_terrain_cellsize; } void add_grid_chunk(int Cx, int Cz); void remove_grid_chunk(int Cx, int Cz); + // the scenery ground: triangles of each material, the ones the editor makes itself left out + std::map ground_materials(); + // replaces the triangles of specified materials with chunks of editor terrain of their shape; the scenery files lose them on save. + // returns: summary for the user + std::string convert_ground(std::set const &Materials); + struct ground_conversion + { + bool open{false}; + std::map materials; + std::set chosen; + std::string status; + } m_ground_conversion; + void render_ground_conversion(); // handles a click in chunk-edit mode (add a neighbour, or Shift = delete the clicked chunk) void handle_chunk_edit_click(bool DeleteMode); // commits authored terrain to disk, enables streaming, and exports the scenery @@ -234,6 +247,8 @@ class editor_mode : public application_mode, private editor_track::observer // grid-aligned manual chunks, keyed by (cx,cz) on the global chunk grid std::map, std::unique_ptr> m_grid_chunks; bool m_terrain_sculpt{false}; // when true, LMB sculpts terrain instead of picking + bool m_terrain_brush_smooth{false}; // the brush evens the ground out instead of raising or lowering it + bool m_terrain_tab_wanted{false}; // the settings window brings the terrain tab forward the next time it's drawn bool m_chunk_edit{false}; // when true, LMB adds/removes whole chunks int m_terrain_cells{32}; // grid resolution (quads per side) int m_terrain_chunks{4}; // chunks per side for a chunked terrain @@ -655,6 +670,18 @@ class editor_mode : public application_mode, private editor_track::observer std::vector issues; double origin{0.0}; // chainage of the start of the route double departure{0.0}; // largest difference between the grade line and the track + profile::ground_fit fit; + // the editor terrain led to the grade line: formation under the track, slopes down or up to the ground + struct earthworks + { + double depth{0.7}; // m, formation below the top of the rail + double half_width{3.5}; // m, from the axis of the route to the edge of the formation + double slope{1.5}; // horizontal run of the slopes per metre of height + double reach{60.0}; // m, from the edge of the formation, where the slopes end even if they don't get to the ground + double rounding{1.5}; // m, over which the slopes bend into the formation and into the ground + // heights of the terrain before the last shaping + std::vector>> undo; + } earthworks; double view_from{0.0}; double view_to{100.0}; double view_centre{0.0}; @@ -708,6 +735,10 @@ class editor_mode : public application_mode, private editor_track::observer void profile_take(editor_track::route Route, TTrack *From, TTrack *To); void profile_resample(); void profile_recognize(); + void profile_fit_ground(); + void profile_shape_ground(); + void profile_restore_ground(); + void render_profile_earthworks(); void profile_check(); void profile_apply(); void profile_fit_view(); diff --git a/application/editormodeprofile.cpp b/application/editormodeprofile.cpp index f65130dc9..db2bc6841 100644 --- a/application/editormodeprofile.cpp +++ b/application/editormodeprofile.cpp @@ -24,6 +24,7 @@ http://mozilla.org/MPL/2.0/. #include #include #include +#include #include #include @@ -442,6 +443,262 @@ void editor_mode::profile_recognize() state.status = format(STR_C("Grade line recognized from the track: %zu points, largest departure %.3f m"), state.line.points.size(), state.departure); } +void editor_mode::profile_fit_ground() +{ + auto &state{m_profile}; + std::vector chainages; + for (auto const &sample : state.samples) + chainages.push_back(sample.chainage); + if (std::none_of(state.terrain.begin(), state.terrain.end(), [](double const Height) { return std::isfinite(Height); })) + { + state.error = STR_C("There's no ground under the route"); + return; + } + auto settings{state.line}; + settings.speed = route_speed(state.route); + auto line{profile::fit_ground(chainages, state.terrain, state.context, settings, state.fit)}; + if (line.points.size() < 2) + return; + state.line = std::move(line); + state.selected = -1; + state.error.clear(); + profile_check(); + double fill{0.0}, cut{0.0}; + for (std::size_t i = 0; i < state.samples.size(); ++i) + { + if (false == std::isfinite(state.terrain[i])) + continue; + auto const difference{profile::elevation(state.line, state.samples[i].chainage) - state.terrain[i]}; + fill = std::max(fill, difference); + cut = std::max(cut, -difference); + } + state.status = format(STR_C("Grade line fitted to the ground: %zu points, embankment up to %.2f m, cutting up to %.2f m"), state.line.points.size(), fill, cut); +} + +void editor_mode::profile_shape_ground() +{ + auto &state{m_profile}; + auto &works{state.earthworks}; + auto const &samples{state.samples}; + if (samples.size() < 2 || state.line.points.size() < 2) + return; + auto const slope{std::max(0.1, works.slope)}; + auto const reach{works.half_width + works.reach}; + auto const terrains{active_terrains()}; + if (terrains.empty()) + { + state.error = STR_C("There's no editor terrain to shape: convert the scenery ground first"); + return; + } + + // the pieces of the axis of the route, found by the cell of a grid over the plan + double constexpr cell{16.0}; + auto const key = [&](double const X, double const Z) { return std::make_pair(static_cast(std::floor(X / cell)), static_cast(std::floor(Z / cell))); }; + std::map, std::vector> grid; + glm::dvec2 low{std::numeric_limits::max()}, high{-std::numeric_limits::max()}; + for (std::size_t i = 0; i + 1 < samples.size(); ++i) + { + auto const &a{samples[i].position}; + auto const &b{samples[i + 1].position}; + auto const from{key(std::min(a.x, b.x), std::min(a.z, b.z))}; + auto const to{key(std::max(a.x, b.x), std::max(a.z, b.z))}; + for (auto x = from.first; x <= to.first; ++x) + for (auto z = from.second; z <= to.second; ++z) + grid[{x, z}].push_back(i); + low = glm::min(low, glm::dvec2{std::min(a.x, b.x), std::min(a.z, b.z)}); + high = glm::max(high, glm::dvec2{std::max(a.x, b.x), std::max(a.z, b.z)}); + } + + works.undo.clear(); + std::size_t moved{0}; + double fill{0.0}, cut{0.0}; + for (auto *terrain : terrains) + { + auto const before{terrain->heights()}; + auto const shaped{terrain->reshape([&](double const X, double const Z, float &Height) { + if (X < low.x - reach || X > high.x + reach || Z < low.y - reach || Z > high.y + reach) + return false; + double distance{reach}; + double chainage{-1.0}; + auto const from{key(X - reach, Z - reach)}; + auto const to{key(X + reach, Z + reach)}; + for (auto x = from.first; x <= to.first; ++x) + for (auto z = from.second; z <= to.second; ++z) + { + auto const found{grid.find({x, z})}; + if (found == grid.end()) + continue; + for (auto const i : found->second) + { + glm::dvec2 const a{samples[i].position.x, samples[i].position.z}; + glm::dvec2 const b{samples[i + 1].position.x, samples[i + 1].position.z}; + auto const run{b - a}; + auto const length{glm::dot(run, run)}; + auto const t{length > 1e-12 ? std::clamp(glm::dot(glm::dvec2{X, Z} - a, run) / length, 0.0, 1.0) : 0.0}; + auto const offset{glm::length(glm::dvec2{X, Z} - (a + run * t))}; + if (offset < distance) + { + distance = offset; + chainage = samples[i].chainage + (samples[i + 1].chainage - samples[i].chainage) * t; + } + } + } + if (chainage < 0.0) + return false; + auto const formation{profile::elevation(state.line, chainage) - works.depth}; + auto const ground{static_cast(Height)}; + // the bends at the edge of the formation and at the foot of the slope are rounded off over the given length + auto const rounding{std::max(0.0, works.rounding)}; + auto const soft_max = [](double const A, double const B, double const K) { + if (K <= 1e-6) + return std::max(A, B); + auto const h{std::max(K - std::abs(A - B), 0.0) / K}; + return std::max(A, B) + h * h * K * 0.25; + }; + auto const beyond{soft_max(0.0, distance - works.half_width, rounding)}; + auto const bend{rounding / slope}; + auto const target{ground > formation ? -soft_max(-ground, -(formation + beyond / slope), bend) : soft_max(ground, formation - beyond / slope, bend)}; + if (std::abs(target - ground) < 0.005) + return false; + fill = std::max(fill, target - ground); + cut = std::max(cut, ground - target); + Height = static_cast(target); + ++moved; + return true; + })}; + if (shaped) + works.undo.emplace_back(terrain, before); + } + if (moved == 0) + { + state.status = STR_C("The editor terrain doesn't reach the route, or it's shaped already"); + return; + } + state.error.clear(); + profile_resample(); + state.status = format(STR_C("Terrain shaped at %zu points: embankment up to %.2f m, cutting up to %.2f m"), moved, fill, cut); + WriteLog("Editor: vertical profile - " + state.status, logtype::generic); +} + +void editor_mode::profile_restore_ground() +{ + auto &state{m_profile}; + auto const terrains{active_terrains()}; + std::size_t restored{0}; + for (auto const &entry : state.earthworks.undo) + if (std::find(terrains.begin(), terrains.end(), entry.first) != terrains.end()) + { + entry.first->restore(entry.second); + ++restored; + } + state.earthworks.undo.clear(); + profile_resample(); + state.status = restored > 0 ? STR_C("The terrain is back as it was before the shaping") : STR_C("The shaped terrain isn't loaded any more"); +} + +void editor_mode::render_ground_conversion() +{ + auto &conversion{m_ground_conversion}; + if (false == conversion.open) + { + if (ImGui::Button(STR_C("Convert the scenery ground to editor terrain..."))) + { + conversion.open = true; + conversion.materials = ground_materials(); + conversion.chosen.clear(); + // the material with the most triangles is the ground, most likely + auto const most{std::max_element(conversion.materials.begin(), conversion.materials.end(), [](auto const &A, auto const &B) { return A.second < B.second; })}; + if (most != conversion.materials.end()) + conversion.chosen.insert(most->first); + } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Replaces the triangles of the chosen materials with editor terrain of the same shape,\nwhich can be shaped and sculpted; the scenery files lose these triangles on save")); + if (false == conversion.status.empty()) + ImGui::TextWrapped("%s", conversion.status.c_str()); + return; + } + ImGui::TextWrapped("%s", STR_C("Materials of the scenery triangles: tick the ones which are the ground")); + if (conversion.materials.empty()) + ImGui::TextDisabled("%s", STR_C("The scenery has no triangles")); + for (auto const &entry : conversion.materials) + { + auto const *material{GfxRenderer->Material(entry.first)}; + auto const name{material != nullptr ? material->GetName() : std::string{"?"}}; + bool chosen{conversion.chosen.count(entry.first) != 0}; + ImGui::PushID(static_cast(entry.first)); + if (ImGui::Checkbox(format(STR_C("%s (%zu triangles)"), name.c_str(), entry.second).c_str(), &chosen)) + { + if (chosen) + conversion.chosen.insert(entry.first); + else + conversion.chosen.erase(entry.first); + } + ImGui::PopID(); + } + ImGui::TextWrapped("%s", STR_C("The terrain gets a single texture: that of the material which covers the most. Until saved, loading the scenery again takes it all back.")); + if (conversion.chosen.empty()) + ImGui::TextDisabled("%s", STR_C("Tick at least one material")); + else if (ImGui::Button(STR_C("Convert"))) + { + conversion.status = convert_ground(conversion.chosen); + conversion.open = false; + profile_resample(); + } + ImGui::SameLine(); + if (ImGui::Button(STR_C("Cancel"))) + conversion.open = false; +} + +void editor_mode::render_profile_earthworks() +{ + auto &state{m_profile}; + auto &works{state.earthworks}; + if (false == ImGui::TreeNode(STR_C("Shape the terrain to the grade line"))) + return; + ImGui::TextWrapped("%s", STR_C("Only the editor terrain changes: a formation under the track and slopes to the ground; the triangles and models of the scenery stay as they are.")); + render_ground_conversion(); + auto const drag = [](char const *Label, double &Value, float const Speed, char const *Format) { return ImGui::DragScalar(STR_C(Label), ImGuiDataType_Double, &Value, Speed, nullptr, nullptr, Format); }; + ImGui::PushItemWidth(90.0f); + drag("Formation below the rail top (m)", works.depth, 0.01f, "%.2f"); + drag("Half width of the formation (m)", works.half_width, 0.05f, "%.2f"); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("From the axis of the route to the edge of the formation;\nfor two tracks add the distance between them")); + drag("Slopes 1 : n, n", works.slope, 0.05f, "%.2f"); + drag("Slopes reach at most (m)", works.reach, 1.0f, "%.0f"); + drag("Rounding of the edges (m)", works.rounding, 0.1f, "%.1f"); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Length over which the slope bends into the formation and into the ground; 0: sharp edges")); + ImGui::PopItemWidth(); + works.rounding = std::clamp(works.rounding, 0.0, 20.0); + works.depth = std::clamp(works.depth, 0.0, 5.0); + works.half_width = std::clamp(works.half_width, 0.5, 30.0); + works.slope = std::clamp(works.slope, 0.1, 10.0); + works.reach = std::clamp(works.reach, 1.0, 200.0); + if (has_errors(state.issues)) + ImGui::TextDisabled("%s", STR_C("Correct the errors of the grade line first")); + else if (ImGui::Button(STR_C("Shape the terrain"))) + profile_shape_ground(); + if (false == works.undo.empty()) + { + ImGui::SameLine(); + if (ImGui::Button(STR_C("Restore the terrain"))) + profile_restore_ground(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Puts back the terrain as it was before the last shaping")); + } + if (false == active_terrains().empty()) + { + if (ImGui::Button(STR_C("Sculpting..."))) + { + set_settings_open(true); + m_terrain_tab_wanted = true; + } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Opens the terrain tab of the editor settings: raising, lowering and smoothing with a brush")); + } + ImGui::TreePop(); +} + void editor_mode::profile_check() { auto &state{m_profile}; @@ -748,6 +1005,20 @@ bool editor_mode::render_profile_parameters() if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", STR_C("Sets the points of the grade line from the existing track")); ImGui::SameLine(); + if (ImGui::Button(STR_C("Fit to the ground"))) + { + profile_fit_ground(); + state.changed = true; + } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Places the breaks of the grade line along the ground under the route,\nwithin the limits and with the least earthworks; the ground itself stays as it is")); + ImGui::PushItemWidth(70.0f); + ImGui::DragScalar(STR_C("m off the ground##fittolerance"), ImGuiDataType_Double, &state.fit.tolerance, 0.05f, nullptr, nullptr, "%.2f"); + ImGui::PopItemWidth(); + state.fit.tolerance = std::clamp(state.fit.tolerance, 0.05, 50.0); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("How far the grade line may depart from the ground before it breaks;\nmore gives fewer breaks and higher embankments and deeper cuttings")); + ImGui::SameLine(); ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.2f, 0.55f, 0.25f, 1.0f)); ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0.25f, 0.68f, 0.3f, 1.0f)); if (ImGui::Button(STR_C("Apply to the scenery"), ImVec2(-1.0f, 0.0f))) @@ -755,6 +1026,8 @@ bool editor_mode::render_profile_parameters() ImGui::PopStyleColor(2); if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", STR_C("Sets the heights of the track along the route to the grade line, Ctrl+Z takes it back")); + ImGui::Separator(); + render_profile_earthworks(); return changed; } diff --git a/editor/editorProfile.cpp b/editor/editorProfile.cpp index 3ea7e13be..b4d889b16 100644 --- a/editor/editorProfile.cpp +++ b/editor/editorProfile.cpp @@ -385,6 +385,255 @@ line recognize(std::vector const &Chainages, std::vector const & return result; } +line fit_ground(std::vector const &Chainages, std::vector const &Ground, context const &Context, line const &Settings, ground_fit const &Options) +{ + line result; + result.speed = Settings.speed; + result.norms = Settings.norms; + result.join_start = Settings.join_start; + result.join_end = Settings.join_end; + auto const count{std::min(Chainages.size(), Ground.size())}; + if (count < 2) + return result; + + // gaps in the ground bridged straight, past the outermost samples it stays level + std::vector ground(Ground.begin(), Ground.begin() + count); + std::vector known; + for (std::size_t i = 0; i < count; ++i) + if (std::isfinite(ground[i])) + known.push_back(i); + if (known.empty()) + return result; + for (std::size_t i = 0, k = 0; i < count; ++i) + { + if (std::isfinite(ground[i])) + continue; + while (k + 1 < known.size() && known[k + 1] < i) + ++k; + if (i < known.front()) + ground[i] = Ground[known.front()]; + else if (k + 1 >= known.size()) + ground[i] = Ground[known.back()]; + else + { + auto const a{known[k]}, b{known[k + 1]}; + ground[i] = Ground[a] + (Ground[b] - Ground[a]) * (Chainages[i] - Chainages[a]) / std::max(1e-9, Chainages[b] - Chainages[a]); + } + } + if (Options.smoothing > 1.0) + { + std::vector sums(count + 1, 0.0); + for (std::size_t i = 0; i < count; ++i) + sums[i + 1] = sums[i] + ground[i]; + std::vector smooth(count); + std::size_t low{0}, high{0}; + for (std::size_t i = 0; i < count; ++i) + { + while (Chainages[i] - Chainages[low] > Options.smoothing * 0.5) + ++low; + while (high + 1 < count && Chainages[high + 1] - Chainages[i] <= Options.smoothing * 0.5) + ++high; + high = std::max(high, i); + smooth[i] = (sums[high + 1] - sums[low]) / static_cast(high - low + 1); + } + ground.swap(smooth); + } + + bool const start_fixed{Settings.join_start && Context.start_joined}; + bool const end_fixed{Settings.join_end && Context.end_joined}; + + // first guess of the points: the ground simplified to within the tolerance + std::vector knots{0, count - 1}; + { + std::vector keep(count, 0); + keep.front() = keep.back() = 1; + std::vector> stack{{0, count - 1}}; + while (false == stack.empty()) + { + auto const [a, b]{stack.back()}; + stack.pop_back(); + if (b <= a + 1) + continue; + auto const run{std::max(1e-9, Chainages[b] - Chainages[a])}; + double worst{0.0}; + std::size_t index{a}; + for (auto i = a + 1; i < b; ++i) + { + auto const chord{ground[a] + (ground[b] - ground[a]) * (Chainages[i] - Chainages[a]) / run}; + auto const departure{std::abs(ground[i] - chord)}; + if (departure > worst) + { + worst = departure; + index = i; + } + } + if (worst > Options.tolerance) + { + keep[index] = 1; + stack.push_back({a, index}); + stack.push_back({index, b}); + } + } + knots.clear(); + for (std::size_t i = 0; i < count; ++i) + if (keep[i] != 0) + knots.push_back(i); + } + + auto const segment_limit = [&](double const From, double const To) { + auto limit{result.norms.grade_max}; + for (auto const &zone : Context.switches) + if (overlaps(From, To, zone)) + limit = std::min(limit, result.norms.grade_switch_max); + return limit / 1000.0; + }; + // elevations of the points with the least squares of the departures from the ground + auto const solve = [&](std::vector const &Knots) { + auto const n{Knots.size()}; + std::vector lower(n, 0.0), diagonal(n, 1e-9), upper(n, 0.0), right(n, 0.0); + auto const add = [&](std::size_t const Interval, double const T, double const Value, double const Weight) { + diagonal[Interval] += Weight * (1.0 - T) * (1.0 - T); + diagonal[Interval + 1] += Weight * T * T; + upper[Interval] += Weight * (1.0 - T) * T; + lower[Interval + 1] += Weight * (1.0 - T) * T; + right[Interval] += Weight * (1.0 - T) * Value; + right[Interval + 1] += Weight * T * Value; + }; + auto const interval_of = [&](double const Chainage) { + std::size_t k{0}; + while (k + 2 < n && Chainage >= Chainages[Knots[k + 1]]) + ++k; + return k; + }; + for (std::size_t k = 0; k + 1 < n; ++k) + { + auto const from{Chainages[Knots[k]]}; + auto const run{std::max(1e-9, Chainages[Knots[k + 1]] - from)}; + auto const last{k + 2 == n ? Knots[k + 1] : Knots[k + 1] - 1}; + for (auto i = Knots[k]; i <= last; ++i) + add(k, (Chainages[i] - from) / run, ground[i], 1.0); + } + for (auto const &fixed : Context.fixed) + { + auto const k{interval_of(fixed.first)}; + auto const from{Chainages[Knots[k]]}; + auto const t{std::clamp((fixed.first - from) / std::max(1e-9, Chainages[Knots[k + 1]] - from), 0.0, 1.0)}; + add(k, t, fixed.second, 1e6); + } + auto const pin = [&](std::size_t const Index, double const Value) { + lower[Index] = upper[Index] = 0.0; + diagonal[Index] = 1.0; + right[Index] = Value; + }; + if (start_fixed) + pin(0, Context.start_elevation); + if (end_fixed) + pin(n - 1, Context.end_elevation); + for (std::size_t k = 1; k < n; ++k) + { + auto const factor{lower[k] / diagonal[k - 1]}; + diagonal[k] -= factor * upper[k - 1]; + right[k] -= factor * right[k - 1]; + } + std::vector z(n); + z[n - 1] = right[n - 1] / diagonal[n - 1]; + for (auto k = n - 1; k-- > 0;) + z[k] = (right[k] - upper[k] * z[k + 1]) / diagonal[k]; + + // grades kept within the limits, the fixed ends don't move + for (int pass = 0; pass < 4; ++pass) + { + for (std::size_t k = 0; k + 1 < n; ++k) + { + if (k + 2 == n && end_fixed) + continue; + auto const run{Chainages[Knots[k + 1]] - Chainages[Knots[k]]}; + auto const step{segment_limit(Chainages[Knots[k]], Chainages[Knots[k + 1]]) * run}; + z[k + 1] = std::clamp(z[k + 1], z[k] - step, z[k] + step); + } + for (auto k = n - 1; k-- > 0;) + { + if (k == 0 && start_fixed) + continue; + auto const run{Chainages[Knots[k + 1]] - Chainages[Knots[k]]}; + auto const step{segment_limit(Chainages[Knots[k]], Chainages[Knots[k + 1]]) * run}; + z[k] = std::clamp(z[k], z[k + 1] - step, z[k + 1] + step); + } + } + return z; + }; + + auto const radius{std::ceil(required_radius(result) / 10.0) * 10.0}; + auto const threshold{result.norms.curve_threshold / 1000.0}; + std::vector z; + for (int iteration = 0; iteration < 1000; ++iteration) + { + z = solve(knots); + auto const n{knots.size()}; + if (n <= 2) + break; + auto const chainage = [&](std::size_t const K) { return Chainages[knots[K]]; }; + auto const slope = [&](std::size_t const K) { return (z[K + 1] - z[K]) / std::max(1e-9, chainage(K + 1) - chainage(K)); }; + std::vector change(n, 0.0), tangent(n, 0.0); + for (std::size_t k = 1; k + 1 < n; ++k) + { + change[k] = std::abs(slope(k) - slope(k - 1)); + tangent[k] = change[k] > threshold + 1e-9 ? radius * change[k] * 0.5 : 0.0; + } + // the curve of a joint starts at the end of the route and takes its whole length + if (start_fixed) + { + change[0] = std::abs(slope(0) - Context.start_grade); + tangent[0] = change[0] > threshold + 1e-9 ? radius * change[0] : 0.0; + } + if (end_fixed) + { + change[n - 1] = std::abs(slope(n - 2) - Context.end_grade); + tangent[n - 1] = change[n - 1] > threshold + 1e-9 ? radius * change[n - 1] : 0.0; + } + + std::size_t removed{0}; + for (std::size_t k = 1; k + 1 < n && removed == 0; ++k) + for (auto const &zone : Context.switches) + if (overlaps(chainage(k) - tangent[k] - 1.0, chainage(k) + tangent[k] + 1.0, zone)) + { + removed = k; + break; + } + if (removed == 0) + { + double worst{0.0}; + for (std::size_t k = 0; k + 1 < n; ++k) + { + bool const inner{(k > 0 || tangent[0] > 0.0) && (k + 2 < n || tangent[n - 1] > 0.0)}; + auto const needed{tangent[k] + tangent[k + 1] + (inner ? result.norms.element_min : 0.0)}; + auto const shortage{needed - (chainage(k + 1) - chainage(k))}; + if (shortage <= 1e-6 || shortage <= worst) + continue; + worst = shortage; + if (k == 0) + removed = 1; + else if (k + 2 == n) + removed = n - 2; + else + removed = change[k] <= change[k + 1] ? k : k + 1; + } + } + if (removed == 0) + break; + knots.erase(knots.begin() + removed); + } + + for (std::size_t k = 0; k < knots.size(); ++k) + { + pvi point; + point.chainage = Chainages[knots[k]]; + point.elevation = z[k]; + result.points.push_back(point); + } + return result; +} + std::vector breaks(line const &Line) { std::vector result; diff --git a/editor/editorProfile.hpp b/editor/editorProfile.hpp index ebc1ca0b9..9e0712c86 100644 --- a/editor/editorProfile.hpp +++ b/editor/editorProfile.hpp @@ -111,6 +111,15 @@ struct recognition // grade line of existing track, from its elevations and grades sampled along the chainage line recognize(std::vector const &Chainages, std::vector const &Elevations, std::vector const &Grades, recognition const &Options); +struct ground_fit +{ + double tolerance{1.0}; // m, departure from the ground which doesn't yet need a change of grade + double smoothing{20.0}; // m, length over which the ground is averaged +}; +// grade line which follows the ground within the limits of Settings, with the least earthworks. +// Ground is NaN where there's none; the joined ends of the route keep the elevation of the adjoining track +line fit_ground(std::vector const &Chainages, std::vector const &Ground, context const &Context, line const &Settings, ground_fit const &Options); + // chainages where the paths have to end so that each of them carries a single grade or a single curve std::vector breaks(line const &Line); diff --git a/editor/editorTerrain.cpp b/editor/editorTerrain.cpp index 55e71b5c2..76e320268 100644 --- a/editor/editorTerrain.cpp +++ b/editor/editorTerrain.cpp @@ -154,28 +154,72 @@ bool editor_terrain::block_flat(int X0, int Z0, int X1, int Z1, float Error) con return true; } -// adaptive quadtree: collapse flat blocks into a single quad, otherwise split into four -void editor_terrain::emit_block(int X0, int Z0, int X1, int Z1, float Error, std::vector &Out) const +// adaptive quadtree: flat blocks stay whole, the others are split into four +void editor_terrain::collect_blocks(int X0, int Z0, int X1, int Z1, float Error, std::vector> &Out) const { bool const splitx = (X1 - X0) > 1; bool const splitz = (Z1 - Z0) > 1; if ((!splitx && !splitz) || block_flat(X0, Z0, X1, Z1, Error)) { - emit_quad(X0, Z0, X1, Z1, Out); + Out.push_back({X0, Z0, X1, Z1}); return; } int const xm = splitx ? (X0 + X1) / 2 : X1; int const zm = splitz ? (Z0 + Z1) / 2 : Z1; - emit_block(X0, Z0, xm, zm, Error, Out); + collect_blocks(X0, Z0, xm, zm, Error, Out); if (splitx) - emit_block(xm, Z0, X1, zm, Error, Out); + collect_blocks(xm, Z0, X1, zm, Error, Out); if (splitz) - emit_block(X0, zm, xm, Z1, Error, Out); + collect_blocks(X0, zm, xm, Z1, Error, Out); if (splitx && splitz) - emit_block(xm, zm, X1, Z1, Error, Out); + collect_blocks(xm, zm, X1, Z1, Error, Out); +} + +void editor_terrain::emit_block(std::array const &Block, std::vector const &Marked, std::vector &Out) const +{ + int const x0 = Block[0], z0 = Block[1], x1 = Block[2], z1 = Block[3]; + // the edges walked the way the quads wind + std::vector> ring; + for (int z = z0; z < z1; ++z) + if (z == z0 || Marked[index(x0, z)] != 0) + ring.push_back({x0, z}); + for (int x = x0; x < x1; ++x) + if (x == x0 || Marked[index(x, z1)] != 0) + ring.push_back({x, z1}); + for (int z = z1; z > z0; --z) + if (z == z1 || Marked[index(x1, z)] != 0) + ring.push_back({x1, z}); + for (int x = x1; x > x0; --x) + if (x == x1 || Marked[index(x, z0)] != 0) + ring.push_back({x, z0}); + if (ring.size() <= 4) + { + emit_quad(x0, z0, x1, z1, Out); + return; + } + + world_vertex centre; + if ((x1 - x0) % 2 == 0 && (z1 - z0) % 2 == 0) + centre = make_vertex((x0 + x1) / 2, (z0 + z1) / 2); + else + { + auto const a = make_vertex(x0, z0), b = make_vertex(x1, z0), c = make_vertex(x0, z1), d = make_vertex(x1, z1); + centre = a; + centre.position = (a.position + b.position + c.position + d.position) * 0.25; + centre.normal = glm::normalize(a.normal + b.normal + c.normal + d.normal); + centre.texture = (a.texture + b.texture + c.texture + d.texture) * 0.25f; + } + for (std::size_t i = 0; i < ring.size(); ++i) + { + auto const &from = ring[i]; + auto const &to = ring[(i + 1) % ring.size()]; + Out.push_back(centre); + Out.push_back(make_vertex(from.first, from.second)); + Out.push_back(make_vertex(to.first, to.second)); + } } void editor_terrain::build_vertices(std::vector &Out, bool Simplify) const @@ -185,7 +229,16 @@ void editor_terrain::build_vertices(std::vector &Out, bool Simplif if (Simplify) { - emit_block(0, 0, m_cells, m_cells, m_simplify_error, Out); + std::vector> blocks; + collect_blocks(0, 0, m_cells, m_cells, m_simplify_error, blocks); + // the corners of the blocks, and the whole edge of the patch which the neighbouring patch meets in its own way + std::vector marked(static_cast(m_cells + 1) * (m_cells + 1), 0); + for (int i = 0; i <= m_cells; ++i) + marked[index(i, 0)] = marked[index(i, m_cells)] = marked[index(0, i)] = marked[index(m_cells, i)] = 1; + for (auto const &block : blocks) + marked[index(block[0], block[1])] = marked[index(block[2], block[1])] = marked[index(block[0], block[3])] = marked[index(block[2], block[3])] = 1; + for (auto const &block : blocks) + emit_block(block, marked, Out); return; } @@ -278,6 +331,12 @@ bool editor_terrain::contains(double X, double Z) const double editor_terrain::height_at(double X, double Z) const { + return height_in(m_heights, X, Z); +} + +double editor_terrain::height_in(std::vector const &Heights, double X, double Z) const +{ + auto const &m_heights = Heights; double const fx = (X - m_x0) / m_cellsize; double const fz = (Z - m_z0) / m_cellsize; int ix = static_cast(std::floor(fx)); @@ -330,6 +389,62 @@ bool editor_terrain::sculpt(double X, double Z, double Radius, double Strength) return changed; } +bool editor_terrain::smooth(double X, double Z, double Radius, double Amount, std::function const &Ground) +{ + if (!valid() || Radius <= 0.0 || Amount <= 0.0) + return false; + double const reach = Radius + m_cellsize; + if (X + reach < m_x0 || X - reach > m_x0 + m_cells * m_cellsize || Z + reach < m_z0 || Z - reach > m_z0 + m_cells * m_cellsize) + return false; + + double const step = m_cellsize; + return reshape([&](double const Vx, double const Vz, float &Height) { + double const d = std::sqrt((Vx - X) * (Vx - X) + (Vz - Z) * (Vz - Z)); + if (d > Radius) + return false; + double const own = Height; + // the neighbours a cell away, read from the ground as it was before the stroke, whichever patch holds them + double const average = (Ground(Vx - step, Vz, own) + Ground(Vx + step, Vz, own) + Ground(Vx, Vz - step, own) + Ground(Vx, Vz + step, own) + own * 4.0) / 8.0; + double const falloff = 0.5 * (std::cos(kPi * d / Radius) + 1.0); + double const smoothed = own + (average - own) * std::min(1.0, Amount * falloff); + if (std::abs(smoothed - own) < 1e-5) + return false; + Height = static_cast(smoothed); + return true; + }); +} + +bool editor_terrain::reshape(std::function const &Shaper) +{ + if (!valid()) + return false; + + bool changed = false; + for (int iz = 0; iz <= m_cells; ++iz) + for (int ix = 0; ix <= m_cells; ++ix) + changed |= Shaper(m_x0 + static_cast(ix) * m_cellsize, m_z0 + static_cast(iz) * m_cellsize, m_heights[index(ix, iz)]); + + if (changed) + { + m_simplify = false; + m_dirty = true; + m_modified = true; + regenerate(false); + } + return changed; +} + +void editor_terrain::restore(std::vector const &Heights) +{ + if (!valid() || Heights.size() != m_heights.size()) + return; + m_heights = Heights; + m_simplify = false; + m_dirty = true; + m_modified = true; + regenerate(false); +} + glm::dvec3 editor_terrain::centre() const { double const c = 0.5 * static_cast(m_cells) * m_cellsize; diff --git a/editor/editorTerrain.hpp b/editor/editorTerrain.hpp index 044366855..709cc1ee8 100644 --- a/editor/editorTerrain.hpp +++ b/editor/editorTerrain.hpp @@ -9,6 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once +#include #include #include #include @@ -44,10 +45,20 @@ class editor_terrain bool contains(double X, double Z) const; // surface height at (X,Z) (bilinear over the covering quad); only valid when contains() is true double height_at(double X, double Z) const; + // the same, from heights taken from heights() earlier + double height_in(std::vector const &Heights, double X, double Z) const; // raises/lowers vertices within Radius of (X,Z) by Strength (metres, signed), with a smooth // falloff; regenerates the rendered geometry (full resolution). returns true if anything changed. bool sculpt(double X, double Z, double Radius, double Strength); + // gives every grid vertex to Shaper, with its world position and height; Shaper returns true if it changed the height. + // regenerates the rendered geometry (full resolution). returns true if anything changed. + bool reshape(std::function const &Shaper); + // pulls the vertices within Radius of (X,Z) towards the average of their neighbours, Amount (0..1) of the way at the centre, + // with a smooth falloff. Ground gives the height before the stroke at a world point, Fallback where there's no terrain + bool smooth(double X, double Z, double Radius, double Amount, std::function const &Ground); + // puts back heights taken from heights() earlier + void restore(std::vector const &Heights); // rebuilds the rendered mesh, collapsing regions flatter than ErrorMetres into larger quads // (adaptive quadtree). the editable heightmap is untouched, so sculpting/raycast stay exact. @@ -63,6 +74,7 @@ class editor_terrain glm::dvec3 centre() const; float extent() const { return m_cells * m_cellsize; } bool valid() const { return m_cells > 0; } + gfx::geometry_handle geometry() const { return m_geometry; } bool optimized() const { return m_simplify; } // set by sculpt() when the mesh changed and is currently full-resolution; cleared by optimize(). // used to auto-simplify only the chunks that were actually edited, once a stroke finishes. @@ -88,7 +100,9 @@ class editor_terrain void build_vertices(std::vector &Out, bool Simplify) const; // adaptive quadtree helpers (used when Simplify is on) bool block_flat(int X0, int Z0, int X1, int Z1, float Error) const; - void emit_block(int X0, int Z0, int X1, int Z1, float Error, std::vector &Out) const; + void collect_blocks(int X0, int Z0, int X1, int Z1, float Error, std::vector> &Out) const; + // a block as a fan through the marked grid vertices of its edges, so it meets its smaller neighbours without cracks + void emit_block(std::array const &Block, std::vector const &Marked, std::vector &Out) const; void emit_quad(int X0, int Z0, int X1, int Z1, std::vector &Out) const; // rebuilds and re-uploads the rendered geometry (Replace when the count is unchanged, otherwise // a fresh chunk whose handle is swapped into the shape) diff --git a/editor/editorTerrainStreamer.cpp b/editor/editorTerrainStreamer.cpp index 6d45ef34d..a932367f2 100644 --- a/editor/editorTerrainStreamer.cpp +++ b/editor/editorTerrainStreamer.cpp @@ -10,7 +10,10 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "editor/editorTerrainStreamer.hpp" +#include "utilities/Globals.h" + #include +#include #include #include #include @@ -133,13 +136,25 @@ void terrain_streamer::update(glm::dvec3 const &CameraPos) return; chunk_key const camera = key_at(CameraPos.x, CameraPos.z); + // the terrain reaches as far as the rest of the scenery is drawn + int const radius = std::max(m_radius, std::min(48, static_cast(std::ceil(Global.BaseDrawRange / std::max(1.0f, chunk_world_size()))))); - // load any missing chunk inside the radius (one build per frame keeps the hitch small) - bool built = false; - for (int dz = -m_radius; dz <= m_radius && !built; ++dz) - for (int dx = -m_radius; dx <= m_radius && !built; ++dx) + // missing chunks inside the radius, the nearest first, as many as fit in a few milliseconds of the frame + if (m_ring_radius != radius) + { + m_ring.clear(); + for (int dz = -radius; dz <= radius; ++dz) + for (int dx = -radius; dx <= radius; ++dx) + m_ring.push_back({dx, dz}); + std::sort(m_ring.begin(), m_ring.end(), [](chunk_key const &A, chunk_key const &B) { return A.first * A.first + A.second * A.second < B.first * B.first + B.second * B.second; }); + m_ring_radius = radius; + } + auto const started = std::chrono::steady_clock::now(); + for (auto const &offset : m_ring) { - chunk_key const key{camera.first + dx, camera.second + dz}; + if (std::chrono::steady_clock::now() - started > std::chrono::milliseconds(4)) + break; + chunk_key const key{camera.first + offset.first, camera.second + offset.second}; if (m_chunks.count(key)) continue; @@ -169,7 +184,6 @@ void terrain_streamer::update(glm::dvec3 const &CameraPos) if (m_auto_optimize) terrain->optimize(m_simplify_error); m_chunks.emplace(key, std::move(terrain)); - built = true; // amortise: at most one new chunk per frame } } @@ -178,7 +192,7 @@ void terrain_streamer::update(glm::dvec3 const &CameraPos) { int const dx = it->first.first - camera.first; int const dz = it->first.second - camera.second; - if (std::abs(dx) > m_radius || std::abs(dz) > m_radius) + if (std::abs(dx) > radius || std::abs(dz) > radius) { if (it->second) { diff --git a/editor/editorTerrainStreamer.hpp b/editor/editorTerrainStreamer.hpp index ead4a3e19..a8857d688 100644 --- a/editor/editorTerrainStreamer.hpp +++ b/editor/editorTerrainStreamer.hpp @@ -77,6 +77,7 @@ class terrain_streamer int cells() const { return m_cells; } float cellsize() const { return m_cellsize; } int radius() const { return m_radius; } + std::string const &texture() const { return m_texture; } // writes every resident, edited chunk to disk (without unloading) - used on save void flush(); @@ -108,6 +109,9 @@ class terrain_streamer std::map> m_chunks; std::map m_known; // cached per-chunk flag bits + // offsets of the chunks around the camera, the nearest first, for the radius in effect + std::vector m_ring; + int m_ring_radius{-1}; }; // single, simulation-level streamer instance shared by the editor (authoring) and the scenery diff --git a/lang/editor_pl.po b/lang/editor_pl.po index b88bdd26d..fc7b7c140 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -1891,3 +1891,135 @@ msgstr "Łuk %d esownicy" msgid "Details" msgstr "Szczegóły" + +msgid "There's no ground under the route" +msgstr "Pod trasą nie ma terenu" + +msgid "Grade line fitted to the ground: %zu points, embankment up to %.2f m, cutting up to %.2f m" +msgstr "Niweleta dopasowana do terenu: %zu punktów, nasyp do %.2f m, wykop do %.2f m" + +msgid "Fit to the ground" +msgstr "Dopasuj do terenu" + +msgid "Places the breaks of the grade line along the ground under the route,\nwithin the limits and with the least earthworks; the ground itself stays as it is" +msgstr "Rozmieszcza załamania niwelety wzdłuż terenu pod trasą,\nw granicach norm i z najmniejszymi robotami ziemnymi; sam teren się nie zmienia" + +msgid "m off the ground##fittolerance" +msgstr "m od terenu##fittolerance" + +msgid "How far the grade line may depart from the ground before it breaks;\nmore gives fewer breaks and higher embankments and deeper cuttings" +msgstr "Jak daleko niweleta może odejść od terenu, zanim się załamie;\nwięcej to mniej załamań, ale wyższe nasypy i głębsze wykopy" + +msgid "There's no editor terrain to shape" +msgstr "Nie ma terenu edytora do przekształcenia" + +msgid "The editor terrain doesn't reach the route, or it's shaped already" +msgstr "Teren edytora nie sięga trasy albo jest już przekształcony" + +msgid "Terrain shaped at %zu points: embankment up to %.2f m, cutting up to %.2f m" +msgstr "Teren przekształcony w %zu punktach: nasyp do %.2f m, wykop do %.2f m" + +msgid "The terrain is back as it was before the shaping" +msgstr "Teren przywrócony do stanu sprzed przekształcenia" + +msgid "The shaped terrain isn't loaded any more" +msgstr "Przekształcony teren nie jest już wczytany" + +msgid "Shape the terrain to the grade line" +msgstr "Przekształć teren pod niweletę" + +msgid "Only the editor terrain changes: a formation under the track and slopes to the ground; the triangles and models of the scenery stay as they are." +msgstr "Zmienia się tylko teren edytora: korona podtorza pod torem i skarpy do terenu; trójkąty i modele scenerii zostają bez zmian." + +msgid "Formation below the rail top (m)" +msgstr "Korona podtorza pod główką szyny (m)" + +msgid "Half width of the formation (m)" +msgstr "Połowa szerokości korony (m)" + +msgid "From the axis of the route to the edge of the formation;\nfor two tracks add the distance between them" +msgstr "Od osi trasy do krawędzi korony;\ndla dwóch torów dodaj rozstaw między nimi" + +msgid "Slopes 1 : n, n" +msgstr "Skarpy 1 : n, n" + +msgid "Slopes reach at most (m)" +msgstr "Skarpy sięgają najwyżej (m)" + +msgid "Correct the errors of the grade line first" +msgstr "Najpierw popraw błędy niwelety" + +msgid "Shape the terrain" +msgstr "Przekształć teren" + +msgid "Restore the terrain" +msgstr "Przywróć teren" + +msgid "Puts back the terrain as it was before the last shaping" +msgstr "Przywraca teren sprzed ostatniego przekształcenia" + +msgid "There's no editor terrain to shape: convert the scenery ground first" +msgstr "Nie ma terenu edytora do przekształcenia: najpierw zamień grunt scenerii" + +msgid "The chosen materials have no triangles" +msgstr "Wybrane materiały nie mają trójkątów" + +msgid "Ground converted: %zu chunks of editor terrain made, %zu shapes taken out of the scene, %zu triangle nodes go from the scenery files on save" +msgstr "Grunt zamieniony: %zu chunków terenu edytora, %zu brył zdjętych ze sceny, %zu węzłów trójkątów zniknie z plików scenerii przy zapisie" + +msgid ", %zu chunks kept as there was editor terrain already" +msgstr ", %zu chunków pominiętych, bo był tam już teren edytora" + +msgid ", %zu nodes stay as their files can't be rewritten" +msgstr ", %zu węzłów zostaje, bo ich plików nie da się zapisać" + +msgid "Convert the scenery ground to editor terrain..." +msgstr "Zamień grunt scenerii na teren edytora..." + +msgid "Replaces the triangles of the chosen materials with editor terrain of the same shape,\nwhich can be shaped and sculpted; the scenery files lose these triangles on save" +msgstr "Zastępuje trójkąty wybranych materiałów terenem edytora o tym samym kształcie,\nktóry można przekształcać i rzeźbić; pliki scenerii tracą te trójkąty przy zapisie" + +msgid "Materials of the scenery triangles: tick the ones which are the ground" +msgstr "Materiały trójkątów scenerii: zaznacz te, które są gruntem" + +msgid "The scenery has no triangles" +msgstr "Sceneria nie ma trójkątów" + +msgid "%s (%zu triangles)" +msgstr "%s (%zu trójkątów)" + +msgid "The terrain gets a single texture: that of the material which covers the most. Until saved, loading the scenery again takes it all back." +msgstr "Teren dostaje jedną teksturę: materiału, który pokrywa najwięcej. Do zapisu ponowne wczytanie scenerii cofa wszystko." + +msgid "Tick at least one material" +msgstr "Zaznacz co najmniej jeden materiał" + +msgid "Convert" +msgstr "Zamień" + +msgid "Sculpt mode (LMB smooth)" +msgstr "Rzeźbienie (LPM wygładza)" + +msgid "Sculpt mode (LMB raise / Shift = lower)" +msgstr "Rzeźbienie (LPM podnosi / Shift obniża)" + +msgid "Raise / lower" +msgstr "Podnoś / obniżaj" + +msgid "Smooth" +msgstr "Wygładzaj" + +msgid "Evens out the ground under the brush: bumps and sharp edges go, the shape stays.\nThe strength sets how fast" +msgstr "Wyrównuje teren pod pędzlem: znikają nierówności i ostre krawędzie, kształt zostaje.\nSiła ustala, jak szybko" + +msgid "Rounding of the edges (m)" +msgstr "Zaokrąglenie krawędzi (m)" + +msgid "Length over which the slope bends into the formation and into the ground; 0: sharp edges" +msgstr "Długość, na której skarpa przechodzi w koronę i w teren; 0: ostre krawędzie" + +msgid "Sculpting..." +msgstr "Rzeźbienie..." + +msgid "Opens the terrain tab of the editor settings: raising, lowering and smoothing with a brush" +msgstr "Otwiera zakładkę terenu w ustawieniach edytora: podnoszenie, obniżanie i wygładzanie pędzlem" diff --git a/scene/scenelayers.cpp b/scene/scenelayers.cpp index 2b8436e12..097704443 100644 --- a/scene/scenelayers.cpp +++ b/scene/scenelayers.cpp @@ -129,6 +129,8 @@ void node_layers::clear() m_context = layer_context(); m_sources.clear(); m_erased.clear(); + m_shapes.clear(); + m_shapeserased = false; m_templates.clear(); m_instances.clear(); m_instance = 0; @@ -475,6 +477,38 @@ void node_layers::forget(basic_node const *Node) m_sources.erase(lookup); } +void node_layers::shape(material_handle const Material, source_span const &Span) +{ + auto const current{handle()}; + if (false == valid(current) || false == Span.valid() || m_instance != 0) + { + return; + } + m_shapes.push_back({current, Span, Material, false}); +} + +std::pair node_layers::erase_shapes(std::set const &Materials) +{ + std::pair result{0, 0}; + for (auto &shape : m_shapes) + { + if (shape.erased || Materials.count(shape.material) == 0) + { + continue; + } + if (false == writable(shape.layer)) + { + ++result.second; + continue; + } + shape.erased = true; + m_erased.emplace_back(shape.layer, shape.span); + m_shapeserased = true; + ++result.first; + } + return result; +} + bool node_layers::is_descendant(layer_handle Layer, layer_handle const Ancestor) const { // NOTE: content of a merged layer, includes of other files among it, belongs to the layer it was merged into diff --git a/scene/scenelayers.h b/scene/scenelayers.h index 28517c163..5a6f249cf 100644 --- a/scene/scenelayers.h +++ b/scene/scenelayers.h @@ -135,10 +135,20 @@ struct node_source glm::vec3 scale{1.f}; }; +// definition of a shape (triangles) in a scenery layer file +struct shape_source +{ + layer_handle layer{null_handle}; + source_span span; + material_handle material{null_handle}; + bool erased{false}; // the definition goes from the file on save +}; + struct save_result { bool success{false}; std::vector files; // names of saved files + std::vector backups; // copies of the files made before they lost their ground std::string message; // summary, or cause of the failure }; @@ -249,6 +259,15 @@ class node_layers void track(basic_node const *Node, source_span const &Span, glm::vec3 const &Angles = glm::vec3{0.f}, glm::vec3 const &Scale = glm::vec3{1.f}); // indicates specified node was removed from the scene void forget(basic_node const *Node); + // stores location of a shape defined directly in the layer file being loaded + void shape(material_handle const Material, source_span const &Span); + std::vector const &shapes() const + { + return m_shapes; + } + // drops the definitions of the shapes of specified materials from the writable layer files on save. + // returns: amount of the shapes to drop, and of the ones which stay as their files can't be rewritten + std::pair erase_shapes(std::set const &Materials); // indicates the scenario initialization (FirstInit) is being performed. Span: location of the directive. // Infile: the directive comes straight from the layer file being loaded void initialization(source_span const &Span, bool Infile); @@ -354,6 +373,8 @@ class node_layers layer_context m_context; // placement in effect at the current point of scenery load std::unordered_map m_sources; // origins of nodes which can be rewritten on save std::vector> m_erased; // definitions of nodes deleted since the load or the last save + std::vector m_shapes; + bool m_shapeserased{false}; // the binary terrain file holds shapes which the save drops std::set m_templates; // *.inc templates used by the scenery std::vector m_instances; // includes of the templates; instance handle is index in the vector + 1 instance_handle m_instance{0}; // helper, include whose template is being loaded diff --git a/scene/scenelayerssave.cpp b/scene/scenelayerssave.cpp index f85f25edd..21d8a2bec 100644 --- a/scene/scenelayerssave.cpp +++ b/scene/scenelayerssave.cpp @@ -1451,6 +1451,34 @@ save_result node_layers::save(std::vector const &Rootstatements) } written.emplace_back(output); } + // a file which loses its ground to the terrain of the editor keeps a copy of itself each time, whatever was saved before. + // without the copy nothing is replaced + { + auto const now{std::time(nullptr)}; + char stamp[32]; + std::strftime(stamp, sizeof(stamp), "%Y%m%d-%H%M%S", std::localtime(&now)); + for (auto const output : written) + { + auto const filepath{path(output)}; + bool const losesground{std::any_of(std::begin(m_shapes), std::end(m_shapes), [&](shape_source const &Shape) { return Shape.erased && Shape.layer == output; })}; + if (false == losesground || false == std::filesystem::exists(filepath, error)) + { + continue; + } + auto const backup{filepath + ".bak-" + stamp + "-przed-terenem-edytora"}; + std::error_code copyerror; + if (false == std::filesystem::copy_file(filepath, backup, std::filesystem::copy_options::overwrite_existing, copyerror)) + { + for (auto const leftover : written) + { + std::filesystem::remove(path(leftover) + ".tmp", error); + } + return fail("can't make a backup of file \"" + layer(output).name + "\": " + copyerror.message()); + } + WriteLog("Scenery save: the triangles of the ground go from \"" + layer(output).name + "\", its previous content is kept in \"" + backup + "\""); + result.backups.emplace_back(backup); + } + } std::vector replaced; for (auto const output : written) { @@ -1586,6 +1614,8 @@ save_result node_layers::save(std::vector const &Rootstatements) included.dead = included.dead || included.removed; } m_erased.clear(); + // the shapes of the rewritten files are somewhere else in them now + m_shapes.erase(std::remove_if(std::begin(m_shapes), std::end(m_shapes), [&](shape_source const &Shape) { return std::find(std::begin(composed), std::end(composed), Shape.layer) != std::end(composed); }), std::end(m_shapes)); for (auto *path : savedpaths) { path->m_dirty = false; @@ -1622,6 +1652,8 @@ save_result node_layers::save(std::vector const &Rootstatements) { m_sources.erase(point); } + removedterrain |= m_shapeserased; + m_shapeserased = false; if (removedterrain) { // binary terrain file still holds geometry of the dropped layer, have it rebuilt on the next load @@ -1649,6 +1681,10 @@ save_result node_layers::save(std::vector const &Rootstatements) { result.message += file + (&file != &result.files.back() ? ", " : ""); } + for (auto const &backup : result.backups) + { + result.message += ". Backup before the ground was taken out: " + std::filesystem::path(backup).filename().string(); + } } if (false == unwritten.empty()) { diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index 223d7f0f9..8eb187984 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -678,17 +678,32 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch && Input.Name().starts_with("scenery/zwr") && Input.Name().ends_with(".inc") ) }; + material_handle material { null_handle }; if( false == skip ) { + auto shape { scene::shape_node().import( Input, nodedata ) }; + material = shape.data().material; simulation::Region->insert( - scene::shape_node().import( - Input, nodedata ), + std::move( shape ), Scratchpad, true ); } else { + if( nodedata.layer != null_handle && Input.InLayerFile() ) { + // the editor wants to know the material even of the shapes which come from the binary terrain + auto token { Input.getToken() }; + if( token == "material" ) { + skip_until( Input, "endmaterial" ); + token = Input.getToken(); + } + replace_slashes( token ); + material = GfxRenderer->Fetch_Material( token ); + } skip_until( Input, "endtri" ); } + if( nodedata.layer != null_handle && Input.InLayerFile() ) { + scene::Layers.shape( material, { sourcebegin, Input.TokenEnd() } ); + } } else if( nodedata.type == "lines" || nodedata.type == "line_strip" @@ -968,7 +983,7 @@ void state_serializer::deserialize_editorterrain(cParser &Input, scene::scratch_data &Scratchpad) { // editor-authored streaming terrain. format: - // editorterrain endeditorterrain + // editorterrain [texture] endeditorterrain // the global streamer loads its 16-bit chunk files around the camera in every mode std::string folder; int cells = 32; @@ -976,13 +991,19 @@ state_serializer::deserialize_editorterrain(cParser &Input, scene::scratch_data int radius = 4; Input.getTokens(4); Input >> folder >> cells >> cellsize >> radius; - skip_until(Input, "endeditorterrain"); + std::string texture { Input.getToken() }; + if( texture == "endeditorterrain" ) { + texture.clear(); + } + else { + skip_until(Input, "endeditorterrain"); + } scene::Layers.terrain_directive(true); if (!folder.empty() && cells > 0 && cellsize > 0.0f) { EditorTerrain.directory(folder); - EditorTerrain.configure(cells, cellsize, radius < 0 ? 0 : radius, 0.0f, std::string()); + EditorTerrain.configure(cells, cellsize, radius < 0 ? 0 : radius, 0.0f, texture); EditorTerrain.active(true); WriteLog("Editor terrain stream enabled: " + folder + " (cells " + std::to_string(cells) + ", cellsize " + std::to_string(cellsize) + ", radius " + std::to_string(radius) + ")", @@ -1418,7 +1439,9 @@ state_serializer::export_as_text(std::string const &Scenariofile) const { << EditorTerrain.directory() << ' ' << EditorTerrain.cells() << ' ' << EditorTerrain.cellsize() << ' ' - << EditorTerrain.radius() << " endeditorterrain\n"; + << EditorTerrain.radius() + << ( EditorTerrain.texture().empty() ? "" : " " + EditorTerrain.texture() ) + << " endeditorterrain\n"; } scmfile << "// modified objects\ninclude " << filename << "_export_dirty.scm\n"; From 0ae0aecde8afe4af32482834e801320845bfdd6d Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Mon, 5 Oct 2026 23:51:01 +0200 Subject: [PATCH 127/430] fix(scenery): binary terrain files named by terrain directives loaded once and only as a complete set, with fallback on the default SBT or the text files; default SBT no longer ignored and rewritten on every load --- scene/scene.h | 8 +- simulation/simulationstateserializer.cpp | 101 +++++++++++++++++++++-- utilities/Globals.h | 1 + utilities/parser.cpp | 1 + 4 files changed, 102 insertions(+), 9 deletions(-) diff --git a/scene/scene.h b/scene/scene.h index 23c912d72..9e07982a0 100644 --- a/scene/scene.h +++ b/scene/scene.h @@ -39,8 +39,12 @@ struct scratch_data { struct binary_data { - bool terrain{ false }; - bool terrain_included{false}; + bool terrain{ false }; // static geometry comes from binary terrain, its text definitions are skipped + bool terrain_included{false}; // binary terrain comes from the files named by terrain directives instead of the default one + bool terrain_default{ false }; // the scenario has usable binary terrain file of its own + std::vector terrain_files; // files named by terrain directives; each one is loaded once + std::size_t geometry_imported{ 0 }; // pieces of static geometry read from the text definitions so far + std::size_t geometry_skipped{ 0 }; // pieces of static geometry left out so far, as provided by binary terrain } binary; struct location_data { diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index 8eb187984..ff2ef26a1 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -62,7 +62,9 @@ state_serializer::deserialize_begin( std::string const &Scenariofile ) { // compilation to binary file isn't supported for rainsted-created overrides // NOTE: we postpone actual loading of the scene until we process time, season and weather data state->scratchpad.binary.terrain = Region->is_scene( Scenariofile ) ; + state->scratchpad.binary.terrain_default = state->scratchpad.binary.terrain; } + Global.file_binary_terrain_skipped = 0; if (false != state->scratchpad.binary.terrain) { @@ -397,6 +399,15 @@ state_serializer::deserialize_firstinit( cParser &Input, scene::scratch_data &Sc { Region->deserialize(Scratchpad.name); } + else + { + // files named by terrain directives are loaded here rather than on the spot, as by this point + // it's known whether all of them can be used. the list holds each file once + for (auto const &terrainfile : Scratchpad.binary.terrain_files) + { + Region->deserialize(terrainfile); + } + } } @@ -609,6 +620,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch // 3d terrain if( false == Scratchpad.binary.terrain ) { // if we're loading data from text .scn file convert and import + ++Scratchpad.binary.geometry_imported; auto *instance = deserialize_model( Input, Scratchpad, nodedata ); // model import can potentially fail if( instance == nullptr ) { return; } @@ -635,6 +647,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch } else { // if binary terrain file was present, we already have this data + ++Scratchpad.binary.geometry_skipped; skip_until( Input, "endmodel" ); } } @@ -681,6 +694,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch material_handle material { null_handle }; if( false == skip ) { + ++Scratchpad.binary.geometry_imported; auto shape { scene::shape_node().import( Input, nodedata ) }; material = shape.data().material; simulation::Region->insert( @@ -689,6 +703,9 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch true ); } else { + if( true == Scratchpad.binary.terrain ) { + ++Scratchpad.binary.geometry_skipped; + } if( nodedata.layer != null_handle && Input.InLayerFile() ) { // the editor wants to know the material even of the shapes which come from the binary terrain auto token { Input.getToken() }; @@ -711,6 +728,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch if( false == Scratchpad.binary.terrain ) { + ++Scratchpad.binary.geometry_imported; simulation::Region->insert( scene::lines_node().import( Input, nodedata ), @@ -718,6 +736,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch } else { // all lines were already loaded from the binary version of the file + ++Scratchpad.binary.geometry_skipped; skip_until( Input, "endline" ); } } @@ -958,6 +977,80 @@ state_serializer::deserialize_trainset( cParser &Input, scene::scratch_data &Scr >> Scratchpad.trainset.velocity; } +namespace { + +// processes binary terrain file named by a terrain directive. +// a binary terrain file holds all static geometry of the scenery it was written for, and while one is in use +// the text definitions of that geometry are skipped, wherever they are. the two can't be mixed without some +// of the geometry showing up twice or not at all. thus the named files are used only if nothing was read from +// the text yet and every one of them is usable, each is loaded once, and if that can't be done the scenery +// falls back on the default binary file of the scenario, or on the text. +void +include_binary_terrain( std::string File, scene::scratch_data &Scratchpad ) { + + auto &binary { Scratchpad.binary }; + + replace_slashes( File ); + if( std::find( binary.terrain_files.begin(), binary.terrain_files.end(), File ) != binary.terrain_files.end() ) { + WriteLog( "Included SBT file: " + File + " is already in use, ignored" ); + return; + } + + if( false == simulation::Region->is_scene( File ) ) { + // the file is missing, or of a type or version we can't read + if( true == binary.terrain_files.empty() ) { + // nothing changes: the default file if there's one, or the text otherwise, remains the source of the geometry + WriteLog( "Included SBT file: " + File + " can't be used, ignored" ); + } + else if( true == Scratchpad.initialized ) { + // the other named files are loaded already, it's too late to give up on them + ErrorLog( "Bad scenario: included SBT file \"" + File + "\" can't be used, the geometry it should provide will be missing" ); + } + else if( true == binary.terrain_default ) { + // the default file was made out of the complete text of this scenario, so it can stand in for the incomplete set + binary.terrain_files.clear(); + binary.terrain_included = false; + WriteLog( "Included SBT file: " + File + " can't be used, falling back on the default SBT" ); + } + else if( ( binary.geometry_skipped == 0 ) && ( Global.file_binary_terrain_skipped == 0 ) ) { + // none of the text definitions was skipped so far, so the whole scenery can still be read from the text + binary.terrain_files.clear(); + binary.terrain_included = false; + binary.terrain = false; + Global.file_binary_terrain_state = false; + WriteLog( "Included SBT file: " + File + " can't be used, the scenery will be loaded from the text files" ); + } + else { + ErrorLog( "Bad scenario: included SBT file \"" + File + "\" can't be used, the geometry it should provide will be missing" ); + } + return; + } + + if( binary.geometry_imported > 0 ) { + // part of the geometry was read from the text already, and the binary file would bring it in for the second time + WriteLog( "Included SBT file: " + File + " ignored, the scenery geometry is already being loaded from the text files" ); + return; + } + if( ( true == Scratchpad.initialized ) && ( true == binary.terrain ) && ( false == binary.terrain_included ) ) { + // likewise if the default file was loaded by now + WriteLog( "Included SBT file: " + File + " ignored, the scenery geometry is already loaded from the default SBT" ); + return; + } + + binary.terrain_files.emplace_back( File ); + binary.terrain_included = true; + binary.terrain = true; + Global.file_binary_terrain_state = true; + Scratchpad.terrain_name = File; + WriteLog( "Included SBT file: " + File ); + if( true == Scratchpad.initialized ) { + // past the initialization there's nothing to wait for + simulation::Region->deserialize( File ); + } +} + +} // namespace + void state_serializer::deserialize_terrain(cParser &Input, scene::scratch_data &Scratchpad) { @@ -966,13 +1059,7 @@ state_serializer::deserialize_terrain(cParser &Input, scene::scratch_data &Scrat Input >> line; if (Global.file_binary_terrain && line.ends_with(".sbt")) { - Scratchpad.binary.terrain = Region->is_scene(line); - Global.file_binary_terrain_state = true; - Scratchpad.binary.terrain_included = true; - Scratchpad.terrain_name = line; - WriteLog("Included SBT file: " + line); - Region->deserialize(Scratchpad.terrain_name); - + include_binary_terrain(line, Scratchpad); } skip_until(Input, "endterrain"); diff --git a/utilities/Globals.h b/utilities/Globals.h index b7c20f690..632a2a5d1 100644 --- a/utilities/Globals.h +++ b/utilities/Globals.h @@ -89,6 +89,7 @@ struct global_settings { int iConvertIndexRange{ 1000 }; // range of duplicate vertex scan bool file_binary_terrain{ true }; // enable binary terrain (de)serialization bool file_binary_terrain_state{true}; + int file_binary_terrain_skipped{0}; // number of terrain includes left out by the parser during the current scenery load // logs bool priorityLoadText3D{false}; // ladowanie T3D priorytetowo int iWriteLogEnabled{ 3 }; // maska bitowa: 1-zapis do pliku, 2-okienko, 4-nazwy torów diff --git a/utilities/parser.cpp b/utilities/parser.cpp index 293f5156b..cb88a989f 100644 --- a/utilities/parser.cpp +++ b/utilities/parser.cpp @@ -356,6 +356,7 @@ void cParser::startIncludeFromParser(cParser& srcParser, bool ToLower, std::stri if (isTerrain && true == Global.file_binary_terrain_state) { WriteLog("SBT found, ignoring: " + includefile); readParameters(srcParser); // preserve original side-effect: still consume parameters + ++Global.file_binary_terrain_skipped; if (sceneryLayers) { // the file is still a part of the scenery, even though its content comes from the binary terrain file From f7aea3c0a8986d4a366faacdf2d90aaba4473060 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Mon, 5 Oct 2026 23:51:11 +0200 Subject: [PATCH 128/430] perf(parser): tokens read from a memory buffer instead of a stream, plain numbers converted with from_chars, token queue without per-item allocations; stream state reported by eof() and ok() kept as it was --- utilities/parser.cpp | 269 +++++++++++++++++++++++++++++++++---------- utilities/parser.h | 105 +++++++++++++++-- 2 files changed, 305 insertions(+), 69 deletions(-) diff --git a/utilities/parser.cpp b/utilities/parser.cpp index cb88a989f..ff10c0b42 100644 --- a/utilities/parser.cpp +++ b/utilities/parser.cpp @@ -25,24 +25,14 @@ http://mozilla.org/MPL/2.0/. namespace { -inline std::array makeBreakTable(const char *brk) -{ - std::array arr{}; - for (unsigned char c : std::string_view(brk ? brk : "")) - { - arr[c] = true; - } - return arr; -} - inline char toLowerChar(char c) { // Only fold ASCII letters. Bytes >= 0x80 belong to multibyte UTF-8 // sequences and must be passed through untouched, otherwise a non-"C" // global locale could remap them and corrupt UTF-8 encoded text. - const unsigned char uc = static_cast(c); - if (uc < 0x80) - return static_cast(std::tolower(uc)); + // The remaining ASCII characters have no lower case form, and don't need the call. + if (c >= 'A' && c <= 'Z') + return static_cast(std::tolower(static_cast(c))); return c; } @@ -70,7 +60,28 @@ cParser::cParser(std::string const &Stream, buffertype const Type, std::string P case buffer_FILE: { Path.append(Stream); - mStream = std::make_shared(Path, std::ios_base::binary); + // the file is read in one go, tokens are then extracted straight from the memory + std::ifstream file(Path, std::ios_base::binary); + if (file.fail()) + { + mFailBit = true; + } + else + { + auto const size{file.rdbuf()->pubseekoff(0, std::ios_base::end)}; + file.rdbuf()->pubseekoff(0, std::ios_base::beg); + if (size > 0 && static_cast(size) < mBuffer.max_size()) + { + mBuffer.resize(static_cast(size)); + file.read(mBuffer.data(), static_cast(mBuffer.size())); + mBuffer.resize(static_cast(std::max(0, file.gcount()))); + } + else if (size != 0) + { + // not a file which can be read, e.g. a directory, which some systems allow to open + mFailBit = true; + } + } // content of *.inc files is potentially grouped together if (Stream.size() >= 4 && ToLower(Stream.substr(Stream.size() - 4)) == ".inc") { @@ -81,7 +92,7 @@ cParser::cParser(std::string const &Stream, buffertype const Type, std::string P } case buffer_TEXT: { - mStream = std::make_shared(Stream); + mBuffer = Stream; break; } default: @@ -90,18 +101,14 @@ cParser::cParser(std::string const &Stream, buffertype const Type, std::string P } } // calculate stream size - if (mStream) + if (true == mFailBit) { - if (true == mStream->fail()) - { - ErrorLog("Failed to open file \"" + Path + "\""); - } - else - { - mSize = mStream->rdbuf()->pubseekoff(0, std::ios_base::end); - mStream->rdbuf()->pubseekoff(0, std::ios_base::beg); - mLine = 1; - } + ErrorLog("Failed to open file \"" + Path + "\""); + } + else + { + mSize = static_cast(mBuffer.size()); + mLine = 1; } // set parameter set if one was provided if (false == Parameters.empty()) @@ -147,7 +154,7 @@ template <> cParser &cParser::operator>>(std::string &Right) return *this; } - Right = this->tokens.front(); + Right = std::move(this->tokens.front()); this->tokens.pop_front(); return *this; @@ -167,6 +174,25 @@ template <> cParser &cParser::operator>>(bool &Right) return *this; } +template <> std::string cParser::getToken(bool const ToLower, const char *Break) +{ + // does what the generic version would, minus the trip of the token through the queue + if (true == m_autoclear) + { + tokens.clear(); + } + std::string token; + if (false == tokens.empty()) + { + *this >> token; + } + else + { + readToken(token, ToLower, Break); + } + return token; +} + template <> bool cParser::getToken(bool const ToLower, const char *Break) { @@ -234,31 +260,141 @@ bool cParser::getTokens(unsigned int Count, bool ToLower, const char *Break) return true; } -std::string cParser::readTokenFromStream(bool ToLower, const char *Break) +// mimics std::istream::peek() != EOF of the stream the parser used to read from +bool cParser::hasChar() { - std::string token; - token.reserve(64); + if (mEofBit || mFailBit) + { + // an attempt to read from a stream which isn't in good state marks it as failed + mFailBit = true; + return false; + } + if (static_cast(mPosition) >= mBuffer.size()) + { + mEofBit = true; + return false; + } + return true; +} - const auto breakTable = makeBreakTable(Break); +// mimics std::istream::get(char&). NOTE: doesn't advance the read position, the caller does +bool cParser::getChar(char &Char) +{ + if (mEofBit || mFailBit) + { + mFailBit = true; + return false; + } + if (static_cast(mPosition) >= mBuffer.size()) + { + // failed extraction at the end of data sets both flags + mEofBit = true; + mFailBit = true; + return false; + } + Char = mBuffer[static_cast(mPosition)]; + return true; +} + +// prepares character lookup for specified set of token separators +void cParser::updateCharClasses(char const *Break) +{ + if (Break == nullptr) + { + Break = ""; + } + if (mCharClassesValid && std::strcmp(mCharClassesBreak.c_str(), Break) == 0) + { + // the set of separators rarely changes from one token to another + return; + } + mCharClassesBreak = Break; + mCharClasses.fill(0); + for (unsigned char const c : mCharClassesBreak) + { + mCharClasses[c] |= char_break; + } + // characters which need more than being added to the token: + // line ends are counted, + mCharClasses[static_cast('\n')] |= char_special; + // quotes glue the text they enclose into a single token, + mCharClasses[static_cast('\"')] |= char_special; + // and a comment can start only once the last character of its opening mark arrives + for (auto const &comment : mComments) + { + for (auto character{0}; character < 256; ++character) + { + // NOTE: the mark is compared with the token, which can hold the character converted to lower case + if (comment.first.empty() || comment.first.back() == static_cast(character) || comment.first.back() == toLowerChar(static_cast(character))) + { + mCharClasses[character] |= char_special; + } + } + } + mCharClassesValid = true; +} + +void cParser::readTokenFromStream(std::string &token, bool ToLower, const char *Break) +{ + token.clear(); + + updateCharClasses(Break); char c = 0; bool separated = false; // the token was ended by a separator, which isn't a part of it - while (token.empty() && mStream->peek() != EOF) { - while (mStream->peek() != EOF) { // idk why but with mStream->get(c) not all cars are loaded - c = static_cast(mStream->get()); + while (token.empty() && hasChar()) { + while (hasChar()) { + auto const *const data{mBuffer.data()}; + auto const size{mBuffer.size()}; + auto const begin{static_cast(mPosition)}; + if (mCharClasses[static_cast(data[begin])] == 0) + { + // run of regular characters, which only need to be added to the token + auto end{begin + 1}; + while (end < size && mCharClasses[static_cast(data[end])] == 0) + { + ++end; + } + if (token.empty()) + { + mTokenBegin = mPosition; + } + auto const converted{token.size()}; + token.append(data + begin, end - begin); + if (ToLower) + { + for (auto index{converted}; index < token.size(); ++index) + { + token[index] = toLowerChar(token[index]); + } + } + mPosition = static_cast(end); + continue; + } + + c = data[begin]; ++mPosition; if (c == '\n') { ++mLine; } const unsigned char uc = static_cast(c); - if (breakTable[uc]) { + if (mCharClasses[uc] & char_break) { // separator ends token (or continues skipping if token empty) if (!token.empty()) { separated = true; break; } + // the rest of a run of separators is skipped right away + auto next{begin + 1}; + while (next < size && (mCharClasses[static_cast(data[next])] & char_break)) { + if (data[next] == '\n') { + ++mLine; + } + ++next; + } + mPosition = static_cast(next); continue; } @@ -278,8 +414,6 @@ std::string cParser::readTokenFromStream(bool ToLower, const char *Break) } // NOTE: comment glued to the end of a token is counted as a part of it mTokenEnd = separated ? mPosition - 1 : mPosition; - - return token; } void cParser::stripFirstTokenBOM(std::string& token, bool ToLower, const char* Break) { @@ -292,7 +426,7 @@ void cParser::stripFirstTokenBOM(std::string& token, bool ToLower, const char* B } // if first "token" was standalone BOM, read the next real token (avoid recursion) - while (token.empty() && mStream->peek() != EOF) { + while (token.empty() && hasChar()) { readToken(token, ToLower, Break); // readToken will not re-enter BOM stripping because mFirstToken is now false break; @@ -467,19 +601,30 @@ void cParser::readToken(std::string &out, bool ToLower, const char *Break) if (out.empty()) { mIncludeParser = nullptr; - out = readTokenFromStream(ToLower, Break); + readTokenFromStream(out, ToLower, Break); } } else { - out = readTokenFromStream(ToLower, Break); + readTokenFromStream(out, ToLower, Break); } - stripFirstTokenBOM(out, ToLower, Break); + // NOTE: the checks repeat what the called methods test first, to skip the calls for vast majority of the tokens + if (mFirstToken) + { + stripFirstTokenBOM(out, ToLower, Break); + } - substituteParameters(out, ToLower); + if (false == parameters.empty()) + { + substituteParameters(out, ToLower); + } - handleIncludeIfPresent(out, ToLower, Break); + if (out.size() >= 7 && out[0] == 'i') + { + // nothing else can be an include directive + handleIncludeIfPresent(out, ToLower, Break); + } } std::vector cParser::readParameters(cParser &Input) @@ -501,7 +646,7 @@ std::string cParser::readQuotes(char const Quote) std::string token; char c{0}; bool escaped = false; - while (mStream->get(c)) + while (getChar(c)) { // get all chars until the quote mark ++mPosition; if (escaped) @@ -529,25 +674,23 @@ std::string cParser::readQuotes(char const Quote) void cParser::skipComment(std::string const &Endmark) { // pobieranie znaków aż do znalezienia znacznika końca - std::string input; char c{0}; - auto const endmarksize = Endmark.size(); - while (mStream->get(c)) + if (false == getChar(c)) { - ++mPosition; - if (c == '\n') - { - // update line counter - ++mLine; - } - input += c; - if (input == Endmark) // szukanie znacznika końca - break; - if (input.size() >= endmarksize) - { - // keep the read text short, to avoid pointless string re-allocations on longer comments - input = input.substr(1); - } + return; + } + auto const begin{static_cast(mPosition)}; + // szukanie znacznika końca + // NOTE: with nothing to look for the comment runs until the end of data + auto const found{Endmark.empty() ? std::string::npos : mBuffer.find(Endmark, begin)}; + auto const end{found != std::string::npos ? found + Endmark.size() : mBuffer.size()}; + // update line counter + mLine += static_cast(std::count(mBuffer.data() + begin, mBuffer.data() + end, '\n')); + mPosition = static_cast(end); + if (found == std::string::npos) + { + // the data ended before the comment did; record the attempt to read past the end + getChar(c); } return; } @@ -600,7 +743,7 @@ void cParser::injectString(const std::string &str) int cParser::getProgress() const { - return static_cast(mStream->rdbuf()->pubseekoff(0, std::ios_base::cur) * 100 / mSize); + return (mSize > 0 ? static_cast(mPosition * 100 / mSize) : 100); } int cParser::getFullProgress() const @@ -638,6 +781,8 @@ void cParser::addCommentStyle(std::string const &Commentstart, std::string const { mComments.insert(commentmap::value_type(Commentstart, Commentend)); + // the character lookup depends on the comment marks + mCharClassesValid = false; } // returns name of currently open file, or empty string for text type stream diff --git a/utilities/parser.h b/utilities/parser.h index bafcdff9b..23ae0ef34 100644 --- a/utilities/parser.h +++ b/utilities/parser.h @@ -14,6 +14,9 @@ http://mozilla.org/MPL/2.0/. #include #include #include +#include +#include +#include namespace scene { @@ -61,11 +64,11 @@ class cParser //: public std::stringstream inline bool eof() { - return mStream->eof(); }; + return mEofBit; }; inline bool ok() { - return !mStream->fail(); }; + return !mFailBit; }; cParser & autoclear( bool const Autoclear ); inline @@ -74,7 +77,7 @@ class cParser //: public std::stringstream return m_autoclear; } bool getTokens( unsigned int Count = 1, bool ToLower = true, char const *Break = "\n\r\t ;" ); - std::string readTokenFromStream(bool ToLower, const char *Break); + void readTokenFromStream(std::string &token, bool ToLower, const char *Break); void stripFirstTokenBOM(std::string &token, bool ToLower, const char *Break); void substituteParameters(std::string &token, bool ToLower); void skipIncludeBlock(); @@ -110,6 +113,35 @@ class cParser //: public std::stringstream bool sceneryLayers = false; // included scenery files are registered as scenery layers (scenery opened for editing) private: + // types: + // retrieved tokens waiting for pick up. a vector with moving head instead of a deque, + // as the latter can allocate memory for each stored item + struct token_queue { + std::vector items; + std::size_t head { 0 }; + + bool empty() const { + return head == items.size(); } + std::size_t size() const { + return items.size() - head; } + std::string & front() { + return items[ head ]; } + std::string const & front() const { + return items[ head ]; } + void emplace_back( std::string &&Token ) { + items.emplace_back( std::move( Token ) ); } + void pop_front() { + ++head; + if( head == items.size() ) { + clear(); } + else if( head >= 64 && head * 2 >= items.size() ) { + // keep the queue from growing without end if it never gets fully emptied + items.erase( items.begin(), items.begin() + static_cast( head ) ); + head = 0; } } + void clear() { + items.clear(); + head = 0; } + }; void startIncludeFromParser(cParser &srcParser, bool ToLower, std::string includefile); scene::include_site include_site() const; bool handleIncludeIfPresent(std::string &token, bool ToLower, const char *Break); @@ -121,10 +153,26 @@ class cParser //: public std::stringstream bool findQuotes( std::string &String ); bool trimComments( std::string &String ); std::size_t count(); + // input access. these mimic peek() and get() of the stream the parser used to read from, + // including their effect on the state reported by eof() and ok() + bool hasChar(); + bool getChar( char &Char ); + void updateCharClasses( char const *Break ); + // converts text holding a plain number without involving a stream. returns: true on success, false if the text needs regular treatment + template + static bool parseNumber( std::string const &Token, Type_ &Output ); // members: bool m_autoclear { true }; // unretrieved tokens are discarded when another read command is issued (legacy behaviour) bool LoadTraction { true }; // load traction? - std::shared_ptr mStream; // relevant kind of buffer is attached on creation. + std::string mBuffer; // content of the open file or the provided text, loaded on creation. + bool mEofBit { false }; // input state, maintained the way a stream would do it + bool mFailBit { false }; + enum charclass : unsigned char { + char_break = 1, // separates tokens + char_special = 2 }; // can't be simply added to the token: line end, quote, or potential end of a comment mark + std::array mCharClasses {}; // lookup built for the most recently used set of token separators + std::string mCharClassesBreak; // set of separators the lookup was built for + bool mCharClassesValid { false }; std::string mFile; // name of the open file, if any std::string mPath; // path to open stream, for relative path lookups. std::streamoff mSize { 0 }; // size of open stream, for progress report. @@ -143,7 +191,7 @@ class cParser //: public std::stringstream commentmap::value_type( "//", "\n" ) }; std::shared_ptr mIncludeParser; // child class to handle include directives. std::vector parameters; // parameter list for included file. - std::deque tokens; + token_queue tokens; }; @@ -152,14 +200,53 @@ glm::vec3 cParser::getToken( bool const ToLower, const char *Break ); +template +bool +cParser::parseNumber( std::string const &Token, Type_ &Output ) { + + using type = std::remove_cv_t; + if constexpr( +#ifdef __cpp_lib_to_chars + std::is_floating_point_v || +#endif + ( std::is_integral_v + && false == std::is_same_v + && false == std::is_same_v + && false == std::is_same_v + && false == std::is_same_v + && false == std::is_same_v + && false == std::is_same_v + && false == std::is_same_v + && false == std::is_same_v ) ) { + + auto const *first { Token.data() }; + auto const *last { first + Token.size() }; + // only text which is a number from start to end is converted here. anything else, including forms + // the stream extraction doesn't recognize (inf, nan), is left for the stream to make sense of + auto const *digits { ( first != last && *first == '-' ) ? first + 1 : first }; + if( digits == last ) { return false; } + if( ( *digits < '0' || *digits > '9' ) && *digits != '.' ) { return false; } + type value {}; + auto const result { std::from_chars( first, last, value ) }; + if( result.ec != std::errc() || result.ptr != last ) { return false; } + Output = value; + return true; + } + else { + return false; + } +} + template cParser& cParser::operator>>( Type_ &Right ) { if( true == this->tokens.empty() ) { return *this; } - std::stringstream converter( this->tokens.front() ); - converter >> Right; + if( false == parseNumber( this->tokens.front(), Right ) ) { + std::stringstream converter( this->tokens.front() ); + converter >> Right; + } this->tokens.pop_front(); return *this; @@ -176,3 +263,7 @@ cParser::operator>>( bool &Right ); template<> bool cParser::getToken( bool const ToLower, const char *Break ); + +template<> +std::string +cParser::getToken( bool const ToLower, const char *Break ); From e1b91c430be2a97c231978e86f6e0657a52d7d69 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Tue, 6 Oct 2026 01:55:29 +0200 Subject: [PATCH 129/430] fix(scenery): triangles node cut short by the end of data no longer hangs the loader --- scene/scenenode.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scene/scenenode.cpp b/scene/scenenode.cpp index 9f07a0036..18f9e0476 100644 --- a/scene/scenenode.cpp +++ b/scene/scenenode.cpp @@ -309,7 +309,8 @@ shape_node::import( cParser &Input, scene::node_data const &Nodedata ) { } token = Input.getToken(); - } while( token != "endtri" ); + } while( token != "endtri" + && false == token.empty() ); // data which ends without closing the node would otherwise keep the loop going forever return *this; } From 2e631dcbd6993327a03812aa3b66ca3d3a62eca1 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Tue, 6 Oct 2026 01:55:38 +0200 Subject: [PATCH 130/430] feat(terrain): binary terrain files (.btf) made out of text terrain files (.txtf) named by terrain directives, checked against length and checksum of the text and loaded section by section when needed; -btf command line conversion; SBT files no longer generated, only loaded --- CMakeLists.txt | 2 + EU07.cpp | 23 + application/editormode.cpp | 6 + export_btf_standalone.cpp | 41 ++ scene/scene.cpp | 29 + scene/scene.h | 19 + scene/scenenode.h | 1 + scene/sceneterrain.cpp | 858 +++++++++++++++++++++++ scene/sceneterrain.h | 57 ++ simulation/simulationstateserializer.cpp | 115 ++- 10 files changed, 1138 insertions(+), 13 deletions(-) create mode 100644 export_btf_standalone.cpp create mode 100644 scene/sceneterrain.cpp create mode 100644 scene/sceneterrain.h diff --git a/CMakeLists.txt b/CMakeLists.txt index d66759c73..30f6396cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,6 +110,7 @@ set(SOURCES "vehicle/DynObj.cpp" "EU07.cpp" "export_e3d_standalone.cpp" +"export_btf_standalone.cpp" "world/Event.cpp" "world/EvLaunch.cpp" "utilities/Float3d.cpp" @@ -196,6 +197,7 @@ set(SOURCES "scene/scenenodegroups.cpp" "scene/scenelayers.cpp" "scene/scenelayerssave.cpp" +"scene/sceneterrain.cpp" "simulation/simulationenvironment.cpp" "simulation/simulationstateserializer.cpp" "rendering/precipitation.cpp" diff --git a/EU07.cpp b/EU07.cpp index e1be85847..4fd8b8b1f 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -33,6 +33,7 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #endif void export_e3d_standalone(std::string in, std::string out, int flags, bool dynamic); +int export_btf_standalone(std::string in, std::string out); #include #include @@ -98,6 +99,28 @@ int main(int argc, char *argv[]) int dynamic = std::stoi(std::string(argv[5])); export_e3d_standalone(in, out, flags, dynamic); } + // standalone conversion of text terrain file to binary format: -btf -s [-o ] + else if (argc >= 4 && std::string(argv[1]) == "-btf") + { + std::string in; + std::string out; + for (int i = 2; i + 1 < argc; i += 2) + { + std::string const option(argv[i]); + if (option == "-s") + { + in = argv[i + 1]; + } + else if (option == "-o") + { + out = argv[i + 1]; + } + } + auto const result{export_btf_standalone(in, out)}; + fflush(stdout); + fflush(stderr); + std::_Exit(result); + } else { try diff --git a/application/editormode.cpp b/application/editormode.cpp index d684b13ff..ef991c64f 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -3202,6 +3202,12 @@ void editor_mode::enter() { m_statebackup = {Global.pCamera, FreeFlyModeFlag, Global.ControlPicking}; + if (simulation::Region != nullptr) + { + // the editor works with geometry of the whole scenery, including the parts of binary terrain which weren't needed so far + simulation::Region->load_terrain(); + } + Camera = Global.pCamera; if (!FreeFlyModeFlag) diff --git a/export_btf_standalone.cpp b/export_btf_standalone.cpp new file mode 100644 index 000000000..6d6592427 --- /dev/null +++ b/export_btf_standalone.cpp @@ -0,0 +1,41 @@ +#include "stdafx.h" + +#include "scene/sceneterrain.h" +#include "utilities/Globals.h" +#include "utilities/utilities.h" + +// converts text terrain file to binary format. returns: 0 on success, 1 otherwise +int export_btf_standalone(std::string in, std::string out) +{ + if (in.empty()) + { + std::printf("usage: -btf -s [-o ]\n"); + return 1; + } + replace_slashes(in); + replace_slashes(out); + if (false == FileExists(in) && FileExists(Global.asCurrentSceneryPath + in)) + { + // the file can be given the way the sceneries refer to it + in = Global.asCurrentSceneryPath + in; + } + if (out.empty()) + { + // by default the binary file goes where the sceneries expect to find it, next to the text + out = in; + erase_extension(out); + out += ".btf"; + } + std::string message; + auto const result{scene::terrain_file::convert(in, out, &message)}; + // NOTE: the log service doesn't run in this mode, the outcome is reported directly + if (result) + { + std::printf("%s -> %s: %s\n", in.c_str(), out.c_str(), message.c_str()); + } + else + { + std::printf("%s: conversion failed, %s\n", in.c_str(), message.c_str()); + } + return (result ? 0 : 1); +} diff --git a/scene/scene.cpp b/scene/scene.cpp index d876a7ba1..2667c7300 100644 --- a/scene/scene.cpp +++ b/scene/scene.cpp @@ -19,6 +19,7 @@ http://mozilla.org/MPL/2.0/. #include "utilities/Timer.h" #include "utilities/Logs.h" #include "scene/sn_utils.h" +#include "scene/sceneterrain.h" #include "rendering/renderer.h" #include "widgets/map_objects.h" @@ -1007,6 +1008,12 @@ basic_section::center( glm::dvec3 Center ) { void basic_section::create_geometry() { + if( false == m_terrain.empty() ) { + // this is the first thing done with a section about to be drawn or modified, which makes it + // the moment for the geometry kept in binary terrain files to arrive + load_terrain(); + } + if( true == m_geometrycreated ) { return; } else { // mark it done for future checks @@ -1026,6 +1033,18 @@ basic_section::create_geometry() { } } +// loads geometry of the section kept in binary terrain files, if any is waiting +void +basic_section::load_terrain() { + + // the list is emptied first, as loading can lead back here + auto const blocks { std::move( m_terrain ) }; + m_terrain.clear(); + for( auto const &block : blocks ) { + terrain_file::load( *this, block ); + } +} + void basic_section::create_map_geometry(const gfx::geometrybank_handle handle) { std::vector lines; @@ -1777,6 +1796,16 @@ void basic_region::create_map_geometry() } } +// loads all geometry kept in binary terrain files which wasn't needed so far +void basic_region::load_terrain() +{ + for( auto *section : m_sections ) { + if( section != nullptr ) { + section->load_terrain(); + } + } +} + void basic_region::update_poi_geometry() { std::vector vertices; diff --git a/scene/scene.h b/scene/scene.h index 9e07982a0..74b3ba4cf 100644 --- a/scene/scene.h +++ b/scene/scene.h @@ -45,6 +45,8 @@ struct scratch_data { std::vector terrain_files; // files named by terrain directives; each one is loaded once std::size_t geometry_imported{ 0 }; // pieces of static geometry read from the text definitions so far std::size_t geometry_skipped{ 0 }; // pieces of static geometry left out so far, as provided by binary terrain + std::vector terrain_textfiles; // terrain files (.txtf with binary .btf version) named by terrain directives so far + std::vector terrain_binaryfiles; // binary versions of these, to be put to use once the scenery is initialized } binary; struct location_data { @@ -78,6 +80,16 @@ struct scratch_data { bool time_initialized { false }; }; +struct terrain_source; + +// piece of a binary terrain file holding geometry of a single section, waiting to be loaded +struct terrain_block { + + std::shared_ptr source; // the file and data shared by its pieces + std::uint64_t offset { 0 }; // location of the piece in the file + std::uint32_t size { 0 }; +}; + // basic element of rudimentary partitioning scheme for the section. fixed size, no further subdivision // TBD, TODO: replace with quadtree scheme? class basic_cell { @@ -346,6 +358,9 @@ public: // generates renderable version of held non-instanced geometry void create_geometry(); + // loads geometry of the section kept in binary terrain files, if any is waiting + void + load_terrain(); void create_map_geometry(const gfx::geometrybank_handle handle); void @@ -374,6 +389,7 @@ public: // content cell_array m_cells; // partitioning scheme shapenode_sequence m_shapes; // large pieces of opaque geometry and (legacy) terrain + std::vector m_terrain; // geometry in binary terrain files, loaded when the section comes into use // TODO: implement dedicated, higher fidelity, fixed resolution terrain mesh item // gfx renderer data gfx::geometrybank_handle m_geometrybank; @@ -481,6 +497,9 @@ public: create_map_geometry(); void update_poi_geometry(); + // loads all geometry kept in binary terrain files which wasn't needed so far + void + load_terrain(); basic_section* get_section(size_t section) { return m_sections[section]; } gfx::geometrybank_handle diff --git a/scene/scenenode.h b/scene/scenenode.h index 7d1db4243..dd844a656 100644 --- a/scene/scenenode.h +++ b/scene/scenenode.h @@ -79,6 +79,7 @@ class shape_node { friend class basic_region; // region might want to modify node content when it's being inserted + friend class terrain_file; // binary terrain files hold complete content of the nodes public: // types diff --git a/scene/sceneterrain.cpp b/scene/sceneterrain.cpp new file mode 100644 index 000000000..afee3edaa --- /dev/null +++ b/scene/sceneterrain.cpp @@ -0,0 +1,858 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "scene/sceneterrain.h" + +#include "scene/scene.h" +#include "rendering/renderer.h" +#include "rendering/nullrenderer.h" +#include "utilities/Globals.h" +#include "utilities/Logs.h" +#include "utilities/parser.h" +#include "utilities/utilities.h" + +#include +#include +#include +#include +#include +#include + +/* +binary terrain file layout, all values little endian: + + uint32 file id ('EU07') + uint32 format id ('BTF1') + uint64 length of the source text file + uint32 checksum (crc-32) of the source text file + uint32 section size, uint32 cell size, uint32 number of sections along the side of the region + uint32 material count + uint32 section count + uint64 vertex count + material names, null-terminated + section directory, per section: + uint32 section index, uint64 offset of the section data in the file, uint32 size of the section data, float32 bounding radius of the section + section data, per section: + uint32 block id ('BTFS') + uint32 section index + uint32 shape count + per shape: + uint32 material index + uint32 index of the section cell the shape is located in + float64 squared minimum and maximum visibility range + float32 x12 diffuse, ambient and specular colours + float64 x3 centre, float32 bounding radius + uint32 vertex count + per vertex: float32 x3 position relative to the centre of the section, float32 x3 normal, float32 x2 texture coordinates + +the shapes are the ones the scenery loader would put in the section cells for the same text. where the loader would merge them +further into section-wide pieces depends on the materials, which are known only at run time, so that part is left for loading. +*/ + +namespace scene +{ + +// defined along with the scenery loader code which filters out legacy switch trackbeds +extern std::vector switchtrackbedtextures; + +// data shared by the pieces of a binary terrain file put to use +struct terrain_source +{ + struct material + { + material_handle handle{null_handle}; + bool translucent{false}; + bool clamps{false}; // texture coordinates are kept off the edges of the texture + bool clampt{false}; + bool skip{false}; // geometry using the material isn't loaded + }; + std::string file; + std::vector materials; +}; + +namespace +{ + +std::uint32_t const EU07_FILEHEADER{MAKE_ID4('E', 'U', '0', '7')}; +std::uint32_t const EU07_FILEVERSION_TERRAIN{MAKE_ID4('B', 'T', 'F', '1')}; +std::uint32_t const EU07_TERRAINBLOCK{MAKE_ID4('B', 'T', 'F', 'S')}; +std::size_t const EU07_TERRAINVERTEXSIZE{8 * sizeof(float)}; + +struct file_header +{ + std::uint64_t sourcesize{0}; + std::uint32_t sourcechecksum{0}; + std::uint32_t materialcount{0}; + std::uint32_t sectioncount{0}; + std::uint64_t vertexcount{0}; +}; + +// adds value to the data in the byte order of the file +template void put(std::string &Output, Type_ Value) +{ + char bytes[sizeof(Type_)]; + std::memcpy(bytes, &Value, sizeof(Type_)); + if (std::endian::native != std::endian::little) + { + std::reverse(std::begin(bytes), std::end(bytes)); + } + Output.append(bytes, sizeof(Type_)); +} + +// extracts values in the byte order of the file from a block of data, keeping track of its bounds +class data_reader +{ + public: + data_reader(char const *Data, std::size_t const Size) : m_data(Data), m_size(Size) {} + template Type_ get() + { + Type_ value{}; + if (false == has(sizeof(Type_))) + { + m_good = false; + m_position = m_size; + return value; + } + char bytes[sizeof(Type_)]; + std::memcpy(bytes, m_data + m_position, sizeof(Type_)); + if (std::endian::native != std::endian::little) + { + std::reverse(std::begin(bytes), std::end(bytes)); + } + std::memcpy(&value, bytes, sizeof(Type_)); + m_position += sizeof(Type_); + return value; + } + std::string get_string() + { + std::string text; + while (has(1) && m_data[m_position] != 0) + { + text += m_data[m_position++]; + } + if (false == has(1)) + { + m_good = false; + return text; + } + ++m_position; // terminator + return text; + } + // extracts a series of values at once. NOTE: the caller is expected to check the data is there + void get(float *Values, std::size_t const Count) + { + if (false == has(Count * sizeof(float))) + { + m_good = false; + m_position = m_size; + return; + } + if (std::endian::native == std::endian::little) + { + std::memcpy(Values, m_data + m_position, Count * sizeof(float)); + m_position += Count * sizeof(float); + } + else + { + for (std::size_t index{0}; index < Count; ++index) + { + Values[index] = get(); + } + } + } + void skip(std::size_t const Size) + { + if (false == has(Size)) + { + m_good = false; + m_position = m_size; + return; + } + m_position += Size; + } + bool has(std::size_t const Size) const + { + return Size <= m_size - m_position; + } + bool good() const + { + return m_good; + } + + private: + char const *m_data; + std::size_t m_size; + std::size_t m_position{0}; + bool m_good{true}; +}; + +// loads content of specified file into provided string. returns: true on success, false otherwise +bool read_file(std::string const &Filename, std::string &Data) +{ + std::ifstream input{Filename, std::ios::binary}; + if (input.fail()) + { + return false; + } + auto const size{input.rdbuf()->pubseekoff(0, std::ios_base::end)}; + input.rdbuf()->pubseekoff(0, std::ios_base::beg); + if (size < 0 || static_cast(size) >= Data.max_size()) + { + return false; + } + Data.resize(static_cast(size)); + input.read(Data.data(), static_cast(Data.size())); + return static_cast(std::max(0, input.gcount())) == Data.size(); +} + +// loads the fixed part of binary terrain file header. returns: true if the file can be used, false otherwise +bool read_header(std::istream &Input, file_header &Header) +{ + char bytes[48]; + Input.read(bytes, sizeof(bytes)); + if (Input.gcount() != static_cast(sizeof(bytes))) + { + return false; + } + data_reader data{bytes, sizeof(bytes)}; + if (data.get() != EU07_FILEHEADER || data.get() != EU07_FILEVERSION_TERRAIN) + { + // wrong file type + return false; + } + Header.sourcesize = data.get(); + Header.sourcechecksum = data.get(); + // the content is arranged for specific layout of the scene, and can't be used with any other + if (data.get() != static_cast(EU07_SECTIONSIZE) || data.get() != static_cast(EU07_CELLSIZE) || + data.get() != static_cast(EU07_REGIONSIDESECTIONCOUNT)) + { + return false; + } + Header.materialcount = data.get(); + Header.sectioncount = data.get(); + Header.vertexcount = data.get(); + return data.good(); +} + +bool read_header(std::string const &Filename, file_header &Header) +{ + std::ifstream input{Filename, std::ios::binary}; + return (false == input.fail()) && read_header(input, Header); +} + +// stand-in for the renderer used during conversion of text terrain. the conversion doesn't need +// anything of the materials but a way to tell them apart, so it goes by their names alone +class conversion_renderer : public null_renderer +{ + public: + material_handle Fetch_Material(std::string const &Filename, bool const Loadnow = true) override + { + // the names are brought to the form the material manager would look them up by + auto name{Filename}; + if (name.find("make:") != 0 && name.find("internal_src:") != 0) + { + if (contains(name, '|')) + { + name.erase(name.find('|')); + } + erase_extension(name); + replace_slashes(name); + erase_leading_slashes(name); + } + auto const lookup{m_lookup.find(name)}; + if (lookup != m_lookup.end()) + { + return lookup->second; + } + m_materials.emplace_back(std::make_unique()); + m_materials.back()->name = name; + m_names.emplace_back(name); + m_lookup.emplace(name, static_cast(m_materials.size())); + return static_cast(m_materials.size()); + } + IMaterial const *Material(material_handle const Material) const override + { + return (Material > 0 && static_cast(Material) <= m_materials.size() ? m_materials[Material - 1].get() : IMaterial::null_material()); + } + // names of the materials, in the order of their handles, starting with handle 1 + std::vector const &names() const + { + return m_names; + } + + private: + std::vector> m_materials; + std::vector m_names; + std::unordered_map m_lookup; +}; + +// puts the stand-in renderer in place of the real one for as long as the object lives. +// the conversion is done by the code which loads scenery geometry from text, and that code asks the global renderer for the materials +class conversion_scope +{ + public: + conversion_scope() : m_trackbeds(Global.CreateSwitchTrackbeds) + { + auto renderer{std::make_unique()}; + m_materials = renderer.get(); + m_renderer = std::move(renderer); + std::swap(GfxRenderer, m_renderer); + // the binary file holds everything the text does. geometry of legacy switch trackbeds is filtered out on load, as that depends on the settings + Global.CreateSwitchTrackbeds = false; + } + ~conversion_scope() + { + std::swap(GfxRenderer, m_renderer); + Global.CreateSwitchTrackbeds = m_trackbeds; + } + conversion_scope(conversion_scope const &) = delete; + conversion_scope &operator=(conversion_scope const &) = delete; + std::vector const &materials() const + { + return m_materials->names(); + } + + private: + std::unique_ptr m_renderer; + conversion_renderer *m_materials{nullptr}; + bool m_trackbeds; +}; + +// collects what the loader needs to know about the material with specified name +terrain_source::material fetch_material(std::string const &Name) +{ + terrain_source::material material; + material.handle = GfxRenderer->Fetch_Material(Name); + // the appearance is determined from the assigned diffuse texture, the same way it's done for the geometry loaded from text + auto const texturehandle = material.handle != null_handle ? GfxRenderer->Material(material.handle)->GetTexture(0) : null_handle; + auto const &texture = texturehandle ? GfxRenderer->Texture(texturehandle) : *ITexture::null_texture(); + material.clamps = texturehandle ? contains(texture.get_traits(), 's') : false; + material.clampt = texturehandle ? contains(texture.get_traits(), 't') : false; + material.translucent = (texturehandle != null_handle) && contains(texture.get_name(), '@') && (true == texture.get_has_alpha()); + if (Global.CreateSwitchTrackbeds) + { + // geometry with blacklisted texture, part of old switch trackbed + auto const materialname{GfxRenderer->Material(material.handle)->GetName()}; + material.skip = + std::any_of(std::begin(switchtrackbedtextures), std::end(switchtrackbedtextures), [&](std::string const &Texture) { return contains(materialname, Texture); }); + } + return material; +} + +} // namespace + +// calculates checksum (crc-32) of provided data +std::uint32_t terrain_file::checksum(char const *Data, std::size_t Size) +{ + // lookup for 8 bytes of input at a time + static auto const tables{[]() { + std::array, 8> lookup{}; + for (std::uint32_t index{0}; index < 256; ++index) + { + auto value{index}; + for (auto bit{0}; bit < 8; ++bit) + { + value = (value & 1 ? 0xEDB88320u ^ (value >> 1) : value >> 1); + } + lookup[0][index] = value; + } + for (std::uint32_t index{0}; index < 256; ++index) + { + for (std::size_t table{1}; table < lookup.size(); ++table) + { + lookup[table][index] = (lookup[table - 1][index] >> 8) ^ lookup[0][lookup[table - 1][index] & 0xFF]; + } + } + return lookup; + }()}; + + auto const *data{reinterpret_cast(Data)}; + std::uint32_t crc{0xFFFFFFFFu}; + while (Size >= 8) + { + auto const low{crc ^ (static_cast(data[0]) | (static_cast(data[1]) << 8) | (static_cast(data[2]) << 16) | (static_cast(data[3]) << 24))}; + crc = tables[7][low & 0xFF] ^ tables[6][(low >> 8) & 0xFF] ^ tables[5][(low >> 16) & 0xFF] ^ tables[4][low >> 24] ^ tables[3][data[4]] ^ tables[2][data[5]] ^ tables[1][data[6]] ^ tables[0][data[7]]; + data += 8; + Size -= 8; + } + while (Size-- > 0) + { + crc = tables[0][(crc ^ *data++) & 0xFF] ^ (crc >> 8); + } + return crc ^ 0xFFFFFFFFu; +} + +// converts provided content of a text terrain file to binary format and stores it in specified file. returns: true on success, false otherwise +bool terrain_file::write(std::string const &Text, std::string const &Binaryfile, std::string &Message) +{ + conversion_scope scope; + auto region{std::make_unique()}; + scratch_data scratchpad{}; + + { + cParser input{Text, cParser::buffer_TEXT}; + // content of the files the text would include isn't covered by its checksum, so there can't be any + input.expandIncludes = false; + auto token{input.getToken()}; + while (false == token.empty()) + { + if (token == "node") + { + node_data nodedata; + input.getTokens(4); + input >> nodedata.range_max >> nodedata.range_min >> nodedata.name >> nodedata.type; + if (nodedata.type != "triangles" && nodedata.type != "triangle_strip" && nodedata.type != "triangle_fan") + { + Message = "node of type \"" + nodedata.type + "\" (line " + std::to_string(input.Line()) + ") can't be a part of binary terrain"; + return false; + } + auto shape{shape_node().import(input, nodedata)}; + // the shapes are all sent to the section cells, which groups them the way it'd be done for translucent geometry. + // whether they can be merged into section-wide pieces instead is decided when the file is loaded, see the layout notes + shape.m_data.translucent = true; + region->insert(shape, scratchpad, true); + } + else if (token == "origin") + { + glm::dvec3 offset; + input.getTokens(3); + input >> offset.x >> offset.y >> offset.z; + scratchpad.location.offset.emplace(offset + (scratchpad.location.offset.empty() ? glm::dvec3() : scratchpad.location.offset.top())); + } + else if (token == "endorigin") + { + if (false == scratchpad.location.offset.empty()) + { + scratchpad.location.offset.pop(); + } + } + else if (token == "rotate") + { + input.getTokens(3); + input >> scratchpad.location.rotation.x >> scratchpad.location.rotation.y >> scratchpad.location.rotation.z; + } + else + { + Message = "\"" + token + "\" (line " + std::to_string(input.Line()) + ") can't be a part of binary terrain"; + return false; + } + token = input.getToken(); + } + } + + // sections holding any geometry + std::vector sections; + for (std::size_t index{0}; index < region->m_sections.size(); ++index) + { + auto const *section{region->m_sections[index]}; + if (section == nullptr) + { + continue; + } + if (std::any_of(std::begin(section->m_cells), std::end(section->m_cells), [](basic_cell const &Cell) { return false == Cell.m_shapestranslucent.empty(); })) + { + sections.emplace_back(static_cast(index)); + } + } + + auto const temporaryfile{Binaryfile + ".tmp"}; + std::uint64_t shapecount{0}; + std::uint64_t vertexcount{0}; + { + std::ofstream output{temporaryfile, std::ios::binary | std::ios::trunc}; + if (output.fail()) + { + Message = "can't write to file \"" + temporaryfile + "\""; + return false; + } + + std::string data; + put(data, EU07_FILEHEADER); + put(data, EU07_FILEVERSION_TERRAIN); + put(data, static_cast(Text.size())); + put(data, terrain_file::checksum(Text.data(), Text.size())); + put(data, static_cast(EU07_SECTIONSIZE)); + put(data, static_cast(EU07_CELLSIZE)); + put(data, static_cast(EU07_REGIONSIDESECTIONCOUNT)); + put(data, static_cast(scope.materials().size())); + put(data, static_cast(sections.size())); + auto const vertexcountposition{data.size()}; + put(data, vertexcount); // filled in when the count is known + for (auto const &material : scope.materials()) + { + data.append(material.c_str(), material.size() + 1); + } + auto const directoryposition{data.size()}; + // the directory is written once the section data is in place and its location known + std::size_t const directoryentrysize{sizeof(std::uint32_t) + sizeof(std::uint64_t) + sizeof(std::uint32_t) + sizeof(float)}; + data.append(sections.size() * directoryentrysize, '\0'); + output.write(data.data(), static_cast(data.size())); + std::uint64_t offset{data.size()}; + + std::string directory; + for (auto const sectionindex : sections) + { + auto *section{region->m_sections[sectionindex]}; + data.clear(); + put(data, EU07_TERRAINBLOCK); + put(data, sectionindex); + std::uint32_t sectionshapecount{0}; + for (auto const &cell : section->m_cells) + { + sectionshapecount += static_cast(cell.m_shapestranslucent.size()); + } + put(data, sectionshapecount); + for (std::size_t cellindex{0}; cellindex < section->m_cells.size(); ++cellindex) + { + for (auto &shape : section->m_cells[cellindex].m_shapestranslucent) + { + auto const radius{shape.radius()}; + auto const &shapedata{shape.data()}; + put(data, static_cast(shapedata.material - 1)); + put(data, static_cast(cellindex)); + put(data, shapedata.rangesquared_min); + put(data, shapedata.rangesquared_max); + for (auto const &colour : {shapedata.lighting.diffuse, shapedata.lighting.ambient, shapedata.lighting.specular}) + { + put(data, colour.r); + put(data, colour.g); + put(data, colour.b); + put(data, colour.a); + } + put(data, shapedata.area.center.x); + put(data, shapedata.area.center.y); + put(data, shapedata.area.center.z); + put(data, radius); + put(data, static_cast(shapedata.vertices.size())); + for (auto const &vertex : shapedata.vertices) + { + glm::vec3 const position{vertex.position - section->m_area.center}; + put(data, position.x); + put(data, position.y); + put(data, position.z); + put(data, vertex.normal.x); + put(data, vertex.normal.y); + put(data, vertex.normal.z); + put(data, vertex.texture.x); + put(data, vertex.texture.y); + } + ++shapecount; + vertexcount += shapedata.vertices.size(); + } + } + if (data.size() > std::numeric_limits::max()) + { + Message = "too much geometry in a single section of the scene"; + output.close(); + std::error_code error; + std::filesystem::remove(temporaryfile, error); + return false; + } + output.write(data.data(), static_cast(data.size())); + put(directory, sectionindex); + put(directory, offset); + put(directory, static_cast(data.size())); + put(directory, section->m_area.radius); + offset += data.size(); + } + // fill in the parts left for later + output.seekp(static_cast(directoryposition)); + output.write(directory.data(), static_cast(directory.size())); + data.clear(); + put(data, vertexcount); + output.seekp(static_cast(vertexcountposition)); + output.write(data.data(), static_cast(data.size())); + output.flush(); + if (output.fail()) + { + Message = "can't write to file \"" + temporaryfile + "\""; + output.close(); + std::error_code error; + std::filesystem::remove(temporaryfile, error); + return false; + } + } + // the finished file replaces the previous version in one go, so an interrupted conversion doesn't leave a broken one behind + std::error_code error; + std::filesystem::rename(temporaryfile, Binaryfile, error); + if (error) + { + Message = "can't write to file \"" + Binaryfile + "\""; + std::filesystem::remove(temporaryfile, error); + return false; + } + + Message = std::to_string(sections.size()) + " section(s), " + std::to_string(shapecount) + " shape(s), " + std::to_string(vertexcount / 3) + " triangle(s)"; + return true; +} + +// converts specified text terrain file to binary format. returns: true on success, false otherwise +bool terrain_file::convert(std::string const &Textfile, std::string const &Binaryfile, std::string *Message) +{ + std::string message; + std::string text; + auto result{false}; + if (read_file(Textfile, text)) + { + result = write(text, Binaryfile, message); + } + else + { + message = "can't read the file"; + } + if (Message != nullptr) + { + *Message = message; + } + return result; +} + +// makes sure binary version of specified text terrain file is in place and matches the text +terrain_file::state terrain_file::prepare(std::string const &Textfile, std::string const &Binaryfile) +{ + file_header header; + auto const binarypresent{read_header(Binaryfile, header)}; + + std::error_code error; + auto const textsize{std::filesystem::file_size(Textfile, error)}; + if (error) + { + // with no text to check the binary file against it's taken as it is + return (binarypresent ? state::binary : state::missing); + } + + std::string text; + auto textloaded{false}; + if (binarypresent && (header.sourcesize == textsize)) + { + // the length is the same; the checksum tells whether the content is, too + textloaded = read_file(Textfile, text); + if (textloaded && (text.size() == header.sourcesize) && (checksum(text.data(), text.size()) == header.sourcechecksum)) + { + return state::binary; + } + } + if (false == textloaded && false == read_file(Textfile, text)) + { + ErrorLog("Bad file: can't read terrain file \"" + Textfile + "\""); + // NOTE: binary file which doesn't match the text isn't used, the scenery is expected to show what its files say + return state::missing; + } + + WriteLog("Terrain file \"" + Textfile + "\": " + (binarypresent ? "binary version doesn't match the text" : "no usable binary version found") + ", converting..."); + std::string message; + if (write(text, Binaryfile, message)) + { + WriteLog("Terrain file \"" + Textfile + "\": conversion done, " + message); + return state::binary; + } + ErrorLog("Bad file: terrain file \"" + Textfile + "\" wasn't converted to binary format, " + message + ". The file will be loaded as text"); + if (binarypresent) + { + // the binary file left behind is of no use, and would be taken for the real thing if the text went missing + std::filesystem::remove(Binaryfile, error); + } + return state::text; +} + +// makes content of specified binary terrain file a part of provided region +bool terrain_file::attach(std::string const &Binaryfile, basic_region &Region, bool Deferred) +{ + std::ifstream input{Binaryfile, std::ios::binary}; + file_header header; + if (input.fail() || false == read_header(input, header)) + { + ErrorLog("Bad file: \"" + Binaryfile + "\" is of either unrecognized type or version"); + return false; + } + auto source{std::make_shared()}; + source->file = Binaryfile; + source->materials.reserve(header.materialcount); + for (std::uint32_t index{0}; index < header.materialcount; ++index) + { + std::string name; + if (false == static_cast(std::getline(input, name, '\0'))) + { + break; + } + source->materials.emplace_back(fetch_material(name)); + } + + std::string data(header.sectioncount * (sizeof(std::uint32_t) + sizeof(std::uint64_t) + sizeof(std::uint32_t) + sizeof(float)), '\0'); + input.read(data.data(), static_cast(data.size())); + data_reader reader{data.data(), static_cast(std::max(0, input.gcount()))}; + + std::uint32_t sectioncount{0}; + for (std::uint32_t index{0}; index < header.sectioncount && reader.good(); ++index) + { + auto const sectionindex{reader.get()}; + terrain_block block; + block.source = source; + block.offset = reader.get(); + block.size = reader.get(); + auto const radius{reader.get()}; + if (false == reader.good() || sectionindex >= Region.m_sections.size()) + { + break; + } + // location of the section follows from its index, see basic_region::section() + auto const column{static_cast(sectionindex % EU07_REGIONSIDESECTIONCOUNT)}; + auto const row{static_cast(sectionindex / EU07_REGIONSIDESECTIONCOUNT)}; + auto const centeroffset{-(EU07_REGIONSIDESECTIONCOUNT / 2 * EU07_SECTIONSIZE) + EU07_SECTIONSIZE / 2}; + auto §ion{Region.section(glm::dvec3{static_cast(centeroffset + column * EU07_SECTIONSIZE), 0.0, static_cast(centeroffset + row * EU07_SECTIONSIZE)})}; + // the section has to be seen as reaching as far as its geometry does, before that geometry is loaded + section.m_area.radius = std::max(section.m_area.radius, radius); + section.m_terrain.emplace_back(block); + if (false == Deferred) + { + section.load_terrain(); + } + ++sectioncount; + } + if (false == reader.good() || sectioncount != header.sectioncount || source->materials.size() != header.materialcount) + { + ErrorLog("Bad file: \"" + Binaryfile + "\" is damaged, part of its content may be missing"); + } + WriteLog("Terrain file \"" + Binaryfile + "\": " + std::to_string(sectioncount) + " section(s), " + std::to_string(header.vertexcount / 3) + " triangle(s)" + + (Deferred ? ", loaded when needed" : "")); + return true; +} + +// loads specified piece of a binary terrain file into provided section +void terrain_file::load(basic_section &Section, terrain_block const &Block) +{ + if (Block.source == nullptr) + { + return; + } + auto const &source{*Block.source}; + + std::string data(Block.size, '\0'); + { + std::ifstream input{source.file, std::ios::binary}; + input.seekg(static_cast(Block.offset)); + input.read(data.data(), static_cast(data.size())); + if (input.fail() || static_cast(std::max(0, input.gcount())) != data.size()) + { + ErrorLog("Bad file: failed to load terrain section from \"" + source.file + "\""); + return; + } + } + data_reader reader{data.data(), data.size()}; + if (reader.get() != EU07_TERRAINBLOCK) + { + // the file isn't what it was when its directory was read + ErrorLog("Bad file: failed to load terrain section from \"" + source.file + "\", the file was changed"); + return; + } + reader.get(); // section index + auto shapecount{reader.get()}; + + // large pieces of opaque geometry are held by the section itself, merged by their appearance. see basic_section::insert() + std::vector sectionshapes; + auto const place = [&](shape_node &Shape, std::vector &Shapes, glm::dvec3 const &Origin) { + Shape.origin(Origin); + if (true == Section.m_geometrycreated) + { + // the section was put to use already, it won't prepare the geometry on its own + Shape.create_geometry(Section.m_geometrybank); + } + Shapes.emplace_back(std::move(Shape)); + }; + + while (shapecount-- > 0 && reader.good()) + { + auto const materialindex{reader.get()}; + auto const cellindex{reader.get()}; + shape_node shape; + auto &shapedata{shape.m_data}; + shapedata.rangesquared_min = reader.get(); + shapedata.rangesquared_max = reader.get(); + for (auto *colour : {&shapedata.lighting.diffuse, &shapedata.lighting.ambient, &shapedata.lighting.specular}) + { + colour->r = reader.get(); + colour->g = reader.get(); + colour->b = reader.get(); + colour->a = reader.get(); + } + shapedata.area.center.x = reader.get(); + shapedata.area.center.y = reader.get(); + shapedata.area.center.z = reader.get(); + shapedata.area.radius = reader.get(); + auto const vertexcount{reader.get()}; + if (false == reader.good() || false == reader.has(static_cast(vertexcount) * EU07_TERRAINVERTEXSIZE) || materialindex >= source.materials.size() || + cellindex >= Section.m_cells.size()) + { + ErrorLog("Bad file: terrain section data in \"" + source.file + "\" is damaged"); + break; + } + auto const &material{source.materials[materialindex]}; + if (true == material.skip) + { + reader.skip(static_cast(vertexcount) * EU07_TERRAINVERTEXSIZE); + continue; + } + shapedata.material = material.handle; + shapedata.translucent = material.translucent; + shapedata.vertices.resize(vertexcount); + for (auto &vertex : shapedata.vertices) + { + float values[8]; + reader.get(values, 8); + vertex.position = Section.m_area.center + glm::dvec3{values[0], values[1], values[2]}; + vertex.normal = glm::vec3{values[3], values[4], values[5]}; + vertex.texture = glm::vec2{values[6], values[7]}; + // clamp texture coordinates if texture wrapping is off + // NOTE: for the text this is done before a large triangle gets divided along the section borders, here it comes after. + // the coordinates of the vertices added by the division can thus differ, by the clamp margin for a texture mapped the way clamping expects + if (true == material.clamps) + { + vertex.texture.s = std::clamp(vertex.texture.s, 0.001f, 0.999f); + } + if (true == material.clampt) + { + vertex.texture.t = std::clamp(vertex.texture.t, 0.001f, 0.999f); + } + } + + if (true == shapedata.translucent || shapedata.rangesquared_max <= 90000.0 || shapedata.rangesquared_min > 0.0) + { + // small, translucent or not always visible shapes are placed in the sub-cells + auto &cell{Section.m_cells[cellindex]}; + cell.m_active = true; + cell.m_area.radius = std::max(cell.m_area.radius, static_cast(glm::length(cell.m_area.center - shapedata.area.center) + shapedata.area.radius)); + place(shape, (shapedata.translucent ? cell.m_shapestranslucent : cell.m_shapesopaque), cell.m_area.center); + } + else + { + auto merged{false}; + for (auto &target : sectionshapes) + { + if (true == target.merge(shape)) + { + merged = true; + break; + } + } + if (false == merged) + { + sectionshapes.emplace_back(std::move(shape)); + } + } + } + for (auto &shape : sectionshapes) + { + place(shape, Section.m_shapes, Section.m_area.center); + } +} + +} // namespace scene + +//--------------------------------------------------------------------------- diff --git a/scene/sceneterrain.h b/scene/sceneterrain.h new file mode 100644 index 000000000..773cb821f --- /dev/null +++ b/scene/sceneterrain.h @@ -0,0 +1,57 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include + +namespace scene +{ + +class basic_region; +class basic_section; +struct terrain_block; + +// binary terrain file (.btf): static geometry of a text terrain file (.txtf), arranged by the sections +// of the scene so each can be loaded on its own, when it comes into use. +// the binary file records length and checksum of the text it was made from, and is made anew when these don't match +class terrain_file +{ + public: + // types + // what a scenery is left with for a terrain file it refers to + enum class state + { + binary, // binary file is in place and up to date + text, // binary file can't be had, the text file has to be loaded the way any other scenery file is + missing // there's nothing to load + }; + // methods + // calculates checksum (crc-32) of provided data + static std::uint32_t checksum(char const *Data, std::size_t Size); + // converts specified text terrain file to binary format. returns: true on success, false otherwise. + // description of the result or of the failure is stored in Message, if provided + static bool convert(std::string const &Textfile, std::string const &Binaryfile, std::string *Message = nullptr); + // makes sure binary version of specified text terrain file is in place and matches the text + static state prepare(std::string const &Textfile, std::string const &Binaryfile); + // makes content of specified binary terrain file a part of provided region. the geometry is loaded right away, + // or left for the sections of the region to load when they're about to be used. returns: true on success, false otherwise + static bool attach(std::string const &Binaryfile, basic_region &Region, bool Deferred); + // loads specified piece of a binary terrain file into provided section + static void load(basic_section &Section, terrain_block const &Block); + + private: + // converts provided content of a text terrain file to binary format and stores it in specified file. returns: true on success, false otherwise + static bool write(std::string const &Text, std::string const &Binaryfile, std::string &Message); +}; + +} // namespace scene + +//--------------------------------------------------------------------------- diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index ff2ef26a1..f6eb96667 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -17,6 +17,7 @@ http://mozilla.org/MPL/2.0/. #include "simulation/simulationenvironment.h" #include "scene/scenenodegroups.h" #include "scene/scenelayers.h" +#include "scene/sceneterrain.h" #include "rendering/particles.h" #include "world/Event.h" #include "world/MemCell.h" @@ -173,16 +174,10 @@ state_serializer::deserialize_continue(std::shared_ptr state scene::Groups.update_map(); Region->create_map_geometry(); - if( true == Global.file_binary_terrain - && false == state->scratchpad.binary.terrain - && state->scenariofile != "$.scn" ) { - // if we didn't find usable binary version of the scenario files, create them now for future use - // as long as the scenario file wasn't rainsted-created base file override - Region->serialize( state->scenariofile ); - } + // NOTE: legacy binary terrain files (.sbt) are no longer generated, only loaded if the scenery comes with them. + // binary terrain is made out of terrain files named by terrain directives instead, see scene::terrain_file - // geometry of the roads is generated on each load instead of being kept in the binary terrain file, - // so it's inserted in the region only after that file had its chance to be written + // geometry of the roads is generated on each load simulation::Roads.create_geometry( Scratchpad ); simulation::Junctions.create_geometry( Scratchpad ); simulation::Roadpoints.create_geometry(); @@ -410,6 +405,12 @@ state_serializer::deserialize_firstinit( cParser &Input, scene::scratch_data &Sc } } + // binary versions of terrain files only announce what they hold at this point, the sections of the scene load it when they need it. + // scenery opened for editing gets it all at once, the editor works with complete geometry + for( auto const &terrainfile : Scratchpad.binary.terrain_binaryfiles ) { + scene::terrain_file::attach( terrainfile, *Region, false == Global.editor_session ); + } + Scratchpad.binary.terrain_binaryfiles.clear(); simulation::Paths.InitTracks(); // the roads tie up their own lanes where they gain or lose some, the junctions tie the lanes of the roads together, @@ -991,6 +992,11 @@ include_binary_terrain( std::string File, scene::scratch_data &Scratchpad ) { auto &binary { Scratchpad.binary }; replace_slashes( File ); + if( false == binary.terrain_textfiles.empty() ) { + // the scenery keeps its terrain in files of the current format, which don't mix with a file holding all of its geometry + WriteLog( "Included SBT file: " + File + " ignored, the scenery uses terrain files" ); + return; + } if( std::find( binary.terrain_files.begin(), binary.terrain_files.end(), File ) != binary.terrain_files.end() ) { WriteLog( "Included SBT file: " + File + " is already in use, ignored" ); return; @@ -1049,6 +1055,85 @@ include_binary_terrain( std::string File, scene::scratch_data &Scratchpad ) { } } +// processes terrain file named by a terrain directive: static geometry kept as text (.txtf), with binary version (.btf) +// made out of it and loaded in its place. unlike the legacy binary terrain above, the binary file stands in +// only for the text file of the same name, and has no bearing on how the rest of the scenery is loaded +void +include_terrain_file( std::string File, cParser &Input, scene::scratch_data &Scratchpad ) { + + auto &binary { Scratchpad.binary }; + + replace_slashes( File ); + erase_extension( File ); + if( std::find( binary.terrain_textfiles.begin(), binary.terrain_textfiles.end(), File ) != binary.terrain_textfiles.end() ) { + WriteLog( "Terrain file: " + File + " is already in use, ignored" ); + return; + } + binary.terrain_textfiles.emplace_back( File ); + + auto const textfile { Global.asCurrentSceneryPath + File + ".txtf" }; + auto const binaryfile { Global.asCurrentSceneryPath + File + ".btf" }; + auto const textpresent { FileExists( textfile ) }; + // binary file holds the geometry where the text alone puts it, it can't stand in for a file placed with an offset or rotation + auto const relocated { + ( false == Scratchpad.location.offset.empty() && Scratchpad.location.offset.top() != glm::dvec3( 0.0 ) ) + || ( Scratchpad.location.rotation != glm::vec3( 0.f ) ) }; + + auto state { scene::terrain_file::state::text }; + if( true == relocated ) { + if( false == textpresent ) { + ErrorLog( "Bad scenario: terrain file \"" + File + "\" placed with an offset or rotation can be loaded only from the text, which is missing" ); + return; + } + } + else if( ( false == textpresent ) + || ( ( false == Global.editor_session ) && ( true == Global.file_binary_terrain ) ) ) { + // NOTE: scenery opened for editing works on its text files, the text is left as is also if binary terrain is turned off. + // a binary file which is all there is gets loaded regardless + state = scene::terrain_file::prepare( textfile, binaryfile ); + } + + switch( state ) { + case scene::terrain_file::state::binary: { + if( true == binary.terrain ) { + // legacy binary terrain file is in use, expected to hold all static geometry of the scenery, this terrain likely included + if( ( false == Scratchpad.initialized ) + && ( binary.geometry_skipped == 0 ) + && ( Global.file_binary_terrain_skipped == 0 ) ) { + // nothing was left out on account of that file yet, so the scenery can still do without it + binary.terrain = false; + binary.terrain_included = false; + binary.terrain_default = false; + binary.terrain_files.clear(); + Global.file_binary_terrain_state = false; + WriteLog( "Terrain file: " + File + " in use, SBT of the scenery is ignored" ); + } + else { + ErrorLog( "Bad scenario: terrain file \"" + File + "\" ignored, the scenery geometry already comes from an SBT file. Remove the SBT file to have the terrain file used" ); + return; + } + } + if( true == Scratchpad.initialized ) { + scene::terrain_file::attach( binaryfile, *simulation::Region, false == Global.editor_session ); + } + else { + binary.terrain_binaryfiles.emplace_back( binaryfile ); + } + break; + } + case scene::terrain_file::state::text: { + // read the way any other scenery file is + WriteLog( "Terrain file: " + File + " loaded as text" ); + Input.injectString( "include \"" + textfile + "\" end" ); + break; + } + default: { + ErrorLog( "Bad scenario: terrain file \"" + File + "\" not found" ); + break; + } + } +} + } // namespace void @@ -1057,13 +1142,17 @@ state_serializer::deserialize_terrain(cParser &Input, scene::scratch_data &Scrat std::string line; Input.getTokens(1); Input >> line; - if (Global.file_binary_terrain && line.ends_with(".sbt")) + // NOTE: the directive is read to its end first, as processing of a terrain file can leave content for the parser to go through next + skip_until(Input, "endterrain"); + + if (line.ends_with(".txtf") || line.ends_with(".btf")) + { + include_terrain_file(line, Input, Scratchpad); + } + else if (Global.file_binary_terrain && line.ends_with(".sbt")) { include_binary_terrain(line, Scratchpad); } - - skip_until(Input, "endterrain"); - } void From 7dd500557414f0b004f27ef18b8a47246dd0e4b5 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Tue, 6 Oct 2026 02:36:04 +0200 Subject: [PATCH 131/430] feat(scenery): SBT generated again for the sceneries which name no terrain files (.txtf, .btf); a scenery naming any gets no SBT --- simulation/simulationstateserializer.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index f6eb96667..8fc18b21e 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -174,10 +174,19 @@ state_serializer::deserialize_continue(std::shared_ptr state scene::Groups.update_map(); Region->create_map_geometry(); - // NOTE: legacy binary terrain files (.sbt) are no longer generated, only loaded if the scenery comes with them. - // binary terrain is made out of terrain files named by terrain directives instead, see scene::terrain_file + if( true == Global.file_binary_terrain + && false == state->scratchpad.binary.terrain + && true == state->scratchpad.binary.terrain_textfiles.empty() + && state->scenariofile != "$.scn" ) { + // if we didn't find usable binary version of the scenario files, create them now for future use + // as long as the scenario file wasn't rainsted-created base file override. + // NOTE: this is done only for the sceneries which don't refer to terrain files (.txtf, .btf). these get binary + // versions of their terrain files instead, and a file holding all geometry of the scenery would only get in their way + Region->serialize( state->scenariofile ); + } - // geometry of the roads is generated on each load + // geometry of the roads is generated on each load instead of being kept in the binary terrain file, + // so it's inserted in the region only after that file had its chance to be written simulation::Roads.create_geometry( Scratchpad ); simulation::Junctions.create_geometry( Scratchpad ); simulation::Roadpoints.create_geometry(); From 4eb14a941995dc1b00bcd875b584c789beedea71 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Tue, 6 Oct 2026 03:34:19 +0200 Subject: [PATCH 132/430] perf(scenery): node or event added to a group without searching the whole group for a duplicate, unless it already was a member of it --- scene/scenenodegroups.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scene/scenenodegroups.cpp b/scene/scenenodegroups.cpp index 20ac524b7..2e786a798 100644 --- a/scene/scenenodegroups.cpp +++ b/scene/scenenodegroups.cpp @@ -239,12 +239,16 @@ void node_groups::insert( scene::group_handle const Group, scene::basic_node *Node ) { // TBD, TODO: automatically unregister the node from its current group? + auto const previousgroup { Node->group() }; Node->group( Group ); if( Group == null_handle ) { return; } auto &nodesequence { m_groupmap[ Group ].nodes }; - if( std::find( std::begin( nodesequence ), std::end( nodesequence ), Node ) == std::end( nodesequence ) ) { + // a node which wasn't a member of the group can't be on its list, which saves the search through the list. + // it matters as a group can be large, the root group of a scenery holds nearly all its nodes + if( previousgroup != Group + || std::find( std::begin( nodesequence ), std::end( nodesequence ), Node ) == std::end( nodesequence ) ) { // don't add the same node twice nodesequence.emplace_back( Node ); } @@ -255,12 +259,15 @@ void node_groups::insert( scene::group_handle const Group, basic_event *Event ) { // TBD, TODO: automatically unregister the event from its current group? + auto const previousgroup { Event->group() }; Event->group( Group ); if( Group == null_handle ) { return; } auto &eventsequence { m_groupmap[ Group ].events }; - if( std::find( std::begin( eventsequence ), std::end( eventsequence ), Event ) == std::end( eventsequence ) ) { + // same as with the nodes, the list is searched only for an event which already was a member of the group + if( previousgroup != Group + || std::find( std::begin( eventsequence ), std::end( eventsequence ), Event ) == std::end( eventsequence ) ) { // don't add the same node twice eventsequence.emplace_back( Event ); } From 3a05d0d64983735c0a740f93855d51dfdedda81c Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Tue, 6 Oct 2026 03:35:00 +0200 Subject: [PATCH 133/430] perf(models): replacable skins of scenery models located once for a skin name; light and season variant submodels located once for a model instead of for each instance --- model/AnimModel.cpp | 43 ++++++++++++++++++++++--------------------- model/Model3d.cpp | 17 +++++++++++++++++ model/Model3d.h | 11 +++++++++++ 3 files changed, 50 insertions(+), 21 deletions(-) diff --git a/model/AnimModel.cpp b/model/AnimModel.cpp index 7cdbc3d73..52917a664 100644 --- a/model/AnimModel.cpp +++ b/model/AnimModel.cpp @@ -257,7 +257,20 @@ bool TAnimModel::Init(std::string const &asName, std::string const &asReplacable asText = asReplacableTexture.substr( 1, asReplacableTexture.length() - 1 ); // zapamiętanie tekstu } else if( asReplacableTexture != "none" ) { - m_materialdata.assign( asReplacableTexture ); + // the same skin is typically shared by lots of instances, and locating its files takes a couple dozen disk lookups. + // NOTE: only located skins are kept, so a missing one is still searched for each time, the way it used to be + static std::unordered_map skins; + auto const skinkey { Global.asCurrentTexturePath + '|' + asReplacableTexture }; + auto const lookup { skins.find( skinkey ) }; + if( lookup != skins.end() ) { + m_materialdata = lookup->second; + } + else { + m_materialdata.assign( asReplacableTexture ); + if( m_materialdata.replacable_skins[ 1 ] != null_handle ) { + skins.emplace( skinkey, m_materialdata ); + } + } } // TODO: redo the random timer initialization @@ -304,26 +317,14 @@ bool TAnimModel::Load(cParser *parser, bool ter) } else { // wiązanie świateł, o ile model wczytany - LightsOn[0] = pModel->GetFromName("Light_On00"); - LightsOn[1] = pModel->GetFromName("Light_On01"); - LightsOn[2] = pModel->GetFromName("Light_On02"); - LightsOn[3] = pModel->GetFromName("Light_On03"); - LightsOn[4] = pModel->GetFromName("Light_On04"); - LightsOn[5] = pModel->GetFromName("Light_On05"); - LightsOn[6] = pModel->GetFromName("Light_On06"); - LightsOn[7] = pModel->GetFromName("Light_On07"); - LightsOff[0] = pModel->GetFromName("Light_Off00"); - LightsOff[1] = pModel->GetFromName("Light_Off01"); - LightsOff[2] = pModel->GetFromName("Light_Off02"); - LightsOff[3] = pModel->GetFromName("Light_Off03"); - LightsOff[4] = pModel->GetFromName("Light_Off04"); - LightsOff[5] = pModel->GetFromName("Light_Off05"); - LightsOff[6] = pModel->GetFromName("Light_Off06"); - LightsOff[7] = pModel->GetFromName("Light_Off07"); - sm_winter_variant = pModel->GetFromName("winter_variant"); - sm_spring_variant = pModel->GetFromName("spring_variant"); - sm_summer_variant = pModel->GetFromName("summer_variant"); - sm_autumn_variant = pModel->GetFromName("autumn_variant"); + // the submodels are located once for the model and shared by its instances + auto const &submodels { pModel->instance_parts() }; + LightsOn = submodels.lights_on; + LightsOff = submodels.lights_off; + sm_winter_variant = submodels.variants[ 0 ]; + sm_spring_variant = submodels.variants[ 1 ]; + sm_summer_variant = submodels.variants[ 2 ]; + sm_autumn_variant = submodels.variants[ 3 ]; } for (int i = 0; i < iMaxNumLights; ++i) if (LightsOn[i] || LightsOff[i]) // Ra: zlikwidowałem wymóg istnienia obu diff --git a/model/Model3d.cpp b/model/Model3d.cpp index fba07446f..cb9c07939 100644 --- a/model/Model3d.cpp +++ b/model/Model3d.cpp @@ -1567,6 +1567,23 @@ TSubModel *TModel3d::GetFromName(std::string const &Name) const } }; +// returns submodels which scenery instances of the model refer to by name, locating them on first use +TModel3d::instance_submodels const &TModel3d::instance_parts() +{ + if (false == m_instancesubmodelslocated) + { + for (std::size_t idx = 0; idx < m_instancesubmodels.lights_on.size(); ++idx) + { + auto const index{(idx < 10 ? "0" : "") + std::to_string(idx)}; + m_instancesubmodels.lights_on[idx] = GetFromName("Light_On" + index); + m_instancesubmodels.lights_off[idx] = GetFromName("Light_Off" + index); + } + m_instancesubmodels.variants = {GetFromName("winter_variant"), GetFromName("spring_variant"), GetFromName("summer_variant"), GetFromName("autumn_variant")}; + m_instancesubmodelslocated = true; + } + return m_instancesubmodels; +} + // locates particle source submodels and stores them on internal list nameoffset_sequence const &TModel3d::find_smoke_sources() { diff --git a/model/Model3d.h b/model/Model3d.h index 0e053609e..c8c2fc9af 100644 --- a/model/Model3d.h +++ b/model/Model3d.h @@ -267,6 +267,12 @@ class TModel3d friend opengl33_renderer; public: + // submodels which scenery instances of the model refer to by name + struct instance_submodels { + std::array lights_on {}; // Light_On00 - Light_On07 + std::array lights_off {}; // Light_Off00 - Light_Off07 + std::array variants {}; // winter_variant, spring_variant, summer_variant, autumn_variant + }; TSubModel *Root { nullptr }; // drzewo submodeli uint32_t iFlags { 0 }; // Ra: czy submodele mają przezroczyste tekstury public: // Ra: tymczasowo @@ -281,6 +287,8 @@ private: std::string asBinary; // nazwa pod którą zapisać model binarny std::string m_filename; nameoffset_sequence m_smokesources; // list of particle sources defined in the model + instance_submodels m_instancesubmodels; // filled on first use, see instance_parts() + bool m_instancesubmodelslocated { false }; public: TModel3d() = default; @@ -289,6 +297,9 @@ public: return Root ? Root->m_boundingradius : 0.f; } inline TSubModel * GetSMRoot() { return Root; }; TSubModel * GetFromName(std::string const &Name) const; + // returns submodels which scenery instances of the model refer to by name. the search for a name goes through the whole + // submodel tree, so it's done once for the model instead of once for each of its instances + instance_submodels const & instance_parts(); TSubModel * AddToNamed(const char *Name, TSubModel *SubModel); nameoffset_sequence const & find_smoke_sources(); void AddTo(TSubModel *tmp, TSubModel *SubModel); From e8c00b8a2d0fd0974054610b85d584e44adfba16 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Tue, 6 Oct 2026 03:35:06 +0200 Subject: [PATCH 134/430] perf(uuid): text form of an uuid made without a string stream, same output --- utilities/uuid.hpp | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/utilities/uuid.hpp b/utilities/uuid.hpp index 5eeb89f44..f68ad49bb 100644 --- a/utilities/uuid.hpp +++ b/utilities/uuid.hpp @@ -28,23 +28,17 @@ public: } std::string to_string() const { - std::ostringstream os; - os << std::hex << std::setfill('0'); - auto put = [&](int i){ - os << std::setw(2) << static_cast(bytes[i]); - }; - // format 8-4-4-4-12 - for (int i = 0; i < 4; ++i) put(i); - for (int i = 4; i < 6; ++i) put(i); - os << '-'; - for (int i = 6; i < 8; ++i) put(i); - os << '-'; - for (int i = 8; i < 10; ++i) put(i); - os << '-'; - for (int i = 10; i < 12; ++i) put(i); - os << '-'; - for (int i = 12; i < 16; ++i) put(i); - return os.str(); + // NOTE: done by hand as the text is made for each model instance of a scenery, and a string stream took a few microseconds each + static constexpr char digits[] = "0123456789abcdef"; + std::string text; + text.reserve(36); + // format 12-4-4-4-8, the one node names in scenery files were written with + for (int i = 0; i < 16; ++i) { + if (i == 6 || i == 8 || i == 10 || i == 12) text += '-'; + text += digits[bytes[i] >> 4]; + text += digits[bytes[i] & 0x0F]; + } + return text; } static UID from_string(const std::string& str) { From 4e4cbdd05236ee70b02dff1088656b7107e59715 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Tue, 6 Oct 2026 18:53:27 +0200 Subject: [PATCH 135/430] feat(terrain): terrain directive can name any number of terrain files, each processed the way a single one was --- simulation/simulationstateserializer.cpp | 40 +++++++++++++++--------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index 8fc18b21e..048af99ef 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -1066,9 +1066,10 @@ include_binary_terrain( std::string File, scene::scratch_data &Scratchpad ) { // processes terrain file named by a terrain directive: static geometry kept as text (.txtf), with binary version (.btf) // made out of it and loaded in its place. unlike the legacy binary terrain above, the binary file stands in -// only for the text file of the same name, and has no bearing on how the rest of the scenery is loaded +// only for the text file of the same name, and has no bearing on how the rest of the scenery is loaded. +// a file which is to be read as text is added to Includes, for the caller to pass to the parser void -include_terrain_file( std::string File, cParser &Input, scene::scratch_data &Scratchpad ) { +include_terrain_file( std::string File, std::string &Includes, scene::scratch_data &Scratchpad ) { auto &binary { Scratchpad.binary }; @@ -1133,7 +1134,7 @@ include_terrain_file( std::string File, cParser &Input, scene::scratch_data &Scr case scene::terrain_file::state::text: { // read the way any other scenery file is WriteLog( "Terrain file: " + File + " loaded as text" ); - Input.injectString( "include \"" + textfile + "\" end" ); + Includes += "include \"" + textfile + "\" end "; break; } default: { @@ -1148,20 +1149,31 @@ include_terrain_file( std::string File, cParser &Input, scene::scratch_data &Scr void state_serializer::deserialize_terrain(cParser &Input, scene::scratch_data &Scratchpad) { - std::string line; - Input.getTokens(1); - Input >> line; + // the directive names a terrain file, or a number of them // NOTE: the directive is read to its end first, as processing of a terrain file can leave content for the parser to go through next - skip_until(Input, "endterrain"); - - if (line.ends_with(".txtf") || line.ends_with(".btf")) + std::vector files; + std::string token; + while (false == (token = Input.getToken()).empty() && token != "endterrain") { - include_terrain_file(line, Input, Scratchpad); + files.emplace_back(token); + } + + std::string includes; // terrain files to be read as text, in the order the directive names them + for (auto const &file : files) + { + if (file.ends_with(".txtf") || file.ends_with(".btf")) + { + include_terrain_file(file, includes, Scratchpad); + } + else if (Global.file_binary_terrain && file.ends_with(".sbt")) + { + include_binary_terrain(file, Scratchpad); + } + } + if (false == includes.empty()) + { + Input.injectString(includes); } - else if (Global.file_binary_terrain && line.ends_with(".sbt")) - { - include_binary_terrain(line, Scratchpad); - } } void From 96cd3e32efd3b78df1511ad902ffa549894f2aef Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Tue, 6 Oct 2026 19:11:48 +0200 Subject: [PATCH 136/430] feat(terrain): file.binary.terrain.checksum setting for the check of binary terrain files against their text: full (length and checksum), simple (length, the default), off --- scene/sceneterrain.cpp | 12 +++++++++++- scene/sceneterrain.h | 2 +- utilities/Globals.cpp | 10 ++++++++++ utilities/Globals.h | 1 + 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/scene/sceneterrain.cpp b/scene/sceneterrain.cpp index afee3edaa..39f0f02d8 100644 --- a/scene/sceneterrain.cpp +++ b/scene/sceneterrain.cpp @@ -614,7 +614,7 @@ bool terrain_file::convert(std::string const &Textfile, std::string const &Binar return result; } -// makes sure binary version of specified text terrain file is in place and matches the text +// makes sure binary version of specified text terrain file is in place and matches the text, as far as the settings ask for it terrain_file::state terrain_file::prepare(std::string const &Textfile, std::string const &Binaryfile) { file_header header; @@ -628,10 +628,20 @@ terrain_file::state terrain_file::prepare(std::string const &Textfile, std::stri return (binarypresent ? state::binary : state::missing); } + // how far the check goes is up to the settings (file.binary.terrain.checksum): none at all, length of the text, or its length and checksum + if (binarypresent && Global.file_binary_terrain_checksum <= 0) + { + return state::binary; + } std::string text; auto textloaded{false}; if (binarypresent && (header.sourcesize == textsize)) { + if (Global.file_binary_terrain_checksum == 1) + { + // NOTE: this takes a text changed without a change of its length for the one the binary file was made from + return state::binary; + } // the length is the same; the checksum tells whether the content is, too textloaded = read_file(Textfile, text); if (textloaded && (text.size() == header.sourcesize) && (checksum(text.data(), text.size()) == header.sourcechecksum)) diff --git a/scene/sceneterrain.h b/scene/sceneterrain.h index 773cb821f..b719604b4 100644 --- a/scene/sceneterrain.h +++ b/scene/sceneterrain.h @@ -39,7 +39,7 @@ class terrain_file // converts specified text terrain file to binary format. returns: true on success, false otherwise. // description of the result or of the failure is stored in Message, if provided static bool convert(std::string const &Textfile, std::string const &Binaryfile, std::string *Message = nullptr); - // makes sure binary version of specified text terrain file is in place and matches the text + // makes sure binary version of specified text terrain file is in place and matches the text, as far as the settings ask for it static state prepare(std::string const &Textfile, std::string const &Binaryfile); // makes content of specified binary terrain file a part of provided region. the geometry is loaded right away, // or left for the sections of the region to load when they're about to be used. returns: true on success, false otherwise diff --git a/utilities/Globals.cpp b/utilities/Globals.cpp index 47b04d18b..7ce2446aa 100644 --- a/utilities/Globals.cpp +++ b/utilities/Globals.cpp @@ -630,6 +630,15 @@ bool global_settings::ConfigParseSimulation(cParser& Parser, const std::string& return true; } + if (token == "file.binary.terrain.checksum") + { + // off, simple or full; anything else leaves the setting as it was + std::string mode; + ParseOne(Parser, mode, 1, true); + file_binary_terrain_checksum = (mode == "off" ? 0 : mode == "simple" ? 1 : mode == "full" ? 2 : file_binary_terrain_checksum); + return true; + } + if (token == "inactivepause") { ParseOne(Parser, bInactivePause); @@ -1582,6 +1591,7 @@ global_settings::export_as_text( std::ostream &Output ) const { export_as_text( Output, "latitude", fLatitudeDeg ); export_as_text( Output, "convertmodels", iConvertModels ); export_as_text( Output, "file.binary.terrain", file_binary_terrain ); + export_as_text( Output, "file.binary.terrain.checksum", std::string( file_binary_terrain_checksum == 0 ? "off" : file_binary_terrain_checksum == 1 ? "simple" : "full" ) ); export_as_text( Output, "inactivepause", bInactivePause ); export_as_text( Output, "slowmotion", iSlowMotionMask ); export_as_text( Output, "hideconsole", bHideConsole ); diff --git a/utilities/Globals.h b/utilities/Globals.h index 632a2a5d1..acf0c00f3 100644 --- a/utilities/Globals.h +++ b/utilities/Globals.h @@ -88,6 +88,7 @@ struct global_settings { int iConvertModels{ 0 }; // tworzenie plików binarnych int iConvertIndexRange{ 1000 }; // range of duplicate vertex scan bool file_binary_terrain{ true }; // enable binary terrain (de)serialization + int file_binary_terrain_checksum{ 1 }; // check of a binary terrain file (.btf) against its text: 0 = none, 1 = length of the text, 2 = length and checksum bool file_binary_terrain_state{true}; int file_binary_terrain_skipped{0}; // number of terrain includes left out by the parser during the current scenery load // logs From 90c5420396fda3610197b7f758ec3e990c28e17d Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Tue, 6 Oct 2026 21:58:49 +0200 Subject: [PATCH 137/430] perf(scenery): runs of model instances read straight from the text by a reader made for them, shared between threads; anything the reader doesn't cover left to the parser; model and skin located once for a run of instances; lookup of nodes by uuid filled on load only for a scenery opened for editing --- CMakeLists.txt | 1 + model/AnimModel.cpp | 58 +++- model/AnimModel.h | 7 + scene/scenemodelentries.cpp | 401 +++++++++++++++++++++++ scene/scenemodelentries.h | 81 +++++ simulation/simulationstateserializer.cpp | 116 +++++-- simulation/simulationstateserializer.h | 4 + utilities/parser.cpp | 41 +++ utilities/parser.h | 16 +- 9 files changed, 696 insertions(+), 29 deletions(-) create mode 100644 scene/scenemodelentries.cpp create mode 100644 scene/scenemodelentries.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 30f6396cf..37f5c4ae6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -198,6 +198,7 @@ set(SOURCES "scene/scenelayers.cpp" "scene/scenelayerssave.cpp" "scene/sceneterrain.cpp" +"scene/scenemodelentries.cpp" "simulation/simulationenvironment.cpp" "simulation/simulationstateserializer.cpp" "rendering/precipitation.cpp" diff --git a/model/AnimModel.cpp b/model/AnimModel.cpp index 52917a664..cf6df321c 100644 --- a/model/AnimModel.cpp +++ b/model/AnimModel.cpp @@ -291,12 +291,9 @@ TAnimModel::is_keyword( std::string const &Token ) const { || Token == "notransition"; } -bool TAnimModel::Load(cParser *parser, bool ter) -{ // rozpoznanie wpisu modelu i ustawienie świateł - std::string name = parser->getToken(); - std::string texture = parser->getToken(false); - replace_slashes( name ); - replace_slashes( texture ); +// assigns the model and the replacable skin to the instance, and binds light and variant submodels of the model +void TAnimModel::assign_model( std::string &name, std::string const &texture, bool const ter ) +{ if (!Init( name, texture )) { if (name != "notload") @@ -329,6 +326,15 @@ bool TAnimModel::Load(cParser *parser, bool ter) for (int i = 0; i < iMaxNumLights; ++i) if (LightsOn[i] || LightsOff[i]) // Ra: zlikwidowałem wymóg istnienia obu iNumLights = i + 1; +} + +bool TAnimModel::Load(cParser *parser, bool ter) +{ // rozpoznanie wpisu modelu i ustawienie świateł + std::string name = parser->getToken(); + std::string texture = parser->getToken(false); + replace_slashes( name ); + replace_slashes( texture ); + assign_model( name, texture, ter ); std::string token; do { @@ -400,6 +406,46 @@ bool TAnimModel::Load(cParser *parser, bool ter) return true; } +// sets up the instance from the values of a definition which was already taken apart, the way Load() does it from the text +void TAnimModel::Load( std::string const &Name, std::string const &Texture, TAnimModel const *Twin, glm::vec3 const *Angles, glm::vec3 const *Scale, bool const Transition ) +{ + if( Twin != nullptr + && Twin->pModel != nullptr + && ( Twin->m_materialdata.replacable_skins[ 1 ] != null_handle || Texture == "none" ) ) { + // the same model with the same skin was located for the twin already. + // NOTE: a model or a skin which couldn't be located is searched for and reported for each instance, like it always was + m_skintoken = Twin->m_skintoken; + m_materialdata = Twin->m_materialdata; + pModel = Twin->pModel; + LightsOn = Twin->LightsOn; + LightsOff = Twin->LightsOff; + sm_winter_variant = Twin->sm_winter_variant; + sm_spring_variant = Twin->sm_spring_variant; + sm_summer_variant = Twin->sm_summer_variant; + sm_autumn_variant = Twin->sm_autumn_variant; + iNumLights = Twin->iNumLights; + } + else { + auto name { Name }; + assign_model( name, Texture, false ); + } + // the optional blocks, each with the effect it has in Load() + if( Angles != nullptr ) { + vAngle = *Angles; + } + if( Scale != nullptr + && Scale->x > 0.0f && Scale->y > 0.0f && Scale->z > 0.0f ) { + m_scale.x *= Scale->x; + m_scale.y *= Scale->y; + m_scale.z *= Scale->z; + } + if( false == Transition ) { + m_transition = false; + } + + update_instanceable_flag(); +} + namespace { // returns true if this animation type mutates per-instance state on the shared // TSubModel tree, which would make batched rendering unsafe. Most animations diff --git a/model/AnimModel.h b/model/AnimModel.h index 8116f1bb0..61b1ccb73 100644 --- a/model/AnimModel.h +++ b/model/AnimModel.h @@ -118,6 +118,11 @@ public: static void AnimUpdate( double dt ); bool Init(std::string const &asName, std::string const &asReplacableTexture); bool Load(cParser *parser, bool ter = false); + // sets up the instance from the values of a definition which was already taken apart, the way Load(cParser *) does it + // from the text. Name, Texture: as that method gets them ready, lower case model name and forward slashes in both. + // Twin: instance set up for the same model and texture, to take them after instead of locating them again; can be nullptr. + // Angles, Scale: content of the optional blocks of the definition, nullptr for a block which isn't there + void Load( std::string const &Name, std::string const &Texture, TAnimModel const *Twin, glm::vec3 const *Angles, glm::vec3 const *Scale, bool const Transition ); std::shared_ptr AddContainer(std::string const &Name); std::shared_ptr GetContainer(std::string const &Name = ""); void LightSet( int const n, float const v ); @@ -226,6 +231,8 @@ public: bool m_instanceable { false }; // helper: evaluates current state and updates m_instanceable accordingly. void update_instanceable_flag(); + // helper: assigns the model and the replacable skin to the instance, and binds light and variant submodels of the model + void assign_model( std::string &name, std::string const &texture, bool const ter ); // diagnostic counters (process-wide). Updated inside update_instanceable_flag() // so the renderer can surface load-time classification stats in the debug overlay. diff --git a/scene/scenemodelentries.cpp b/scene/scenemodelentries.cpp new file mode 100644 index 000000000..d11255e3d --- /dev/null +++ b/scene/scenemodelentries.cpp @@ -0,0 +1,401 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "scene/scenemodelentries.h" + +#include "utilities/parser.h" + +#include +#include +#include +#include +#include +#include + +namespace scene +{ + +namespace +{ + +enum char_kind : unsigned char +{ + char_regular, + char_separator, // one of the separators the scenery parser splits the text on + char_special // can make the parser treat the token in a way of its own: a quote, or a part of a comment mark +}; + +constexpr std::array make_char_kinds() +{ + std::array kinds{}; + kinds['\n'] = char_separator; + kinds['\r'] = char_separator; + kinds['\t'] = char_separator; + kinds[' '] = char_separator; + kinds[';'] = char_separator; + kinds['"'] = char_special; + kinds['/'] = char_special; + return kinds; +} + +constexpr std::array char_kinds{make_char_kinds()}; + +char to_lower(char const Character) +{ + // only the ascii letters, like the parser does it + return (Character >= 'A' && Character <= 'Z') ? static_cast(Character - 'A' + 'a') : Character; +} + +// compares a token with a lower case keyword the way a token converted by the parser would compare +bool equals(std::string_view const Token, std::string_view const Keyword) +{ + if (Token.size() != Keyword.size()) + { + return false; + } + for (std::size_t idx = 0; idx < Token.size(); ++idx) + { + if (to_lower(Token[idx]) != Keyword[idx]) + { + return false; + } + } + return true; +} + +// reads the definitions held by one piece of a text +class entry_reader +{ + public: + explicit entry_reader(std::string_view const Text) : m_text(Text) {} + // reads definitions from specified place in the text, until the end of one reaches Limit or something else turns up. + // NOTE: line breaks are counted from the place the reading starts at + void read(std::size_t Begin, std::size_t Limit, bool Keywordread); + // members + model_entry_block block; + std::size_t cursor{0}; // end of the last definition read, or the place the reading started at + std::size_t linebreaks{0}; // line breaks ahead of the cursor + bool complete{false}; // the reading got as far as the limit + + private: + // moves past the separators and the line comments. returns: false at a block comment + bool skip(std::size_t &Position, std::size_t &Linebreaks) const; + // takes the token at specified place, which has to be past the separators. returns: false if the parser wouldn't take + // the token the way it's written: there's a quote in it, or a comment starts in its middle + bool token(std::size_t &Position, std::string_view &Token) const; + // takes the next token. returns: false if there isn't one which can be used as it's written + bool next(std::size_t &Position, std::size_t &Linebreaks, std::string_view &Token) const + { + return skip(Position, Linebreaks) && token(Position, Token) && false == Token.empty(); + } + // takes the next token as a number. returns: false unless the parser would convert the token without a stream + template bool number(std::size_t &Position, std::size_t &Linebreaks, Type_ &Value) const + { + std::string_view text; + return next(Position, Linebreaks, text) && cParser::parseNumber(text, Value); + } + // takes a complete definition. returns: false if what's there isn't one, or isn't one the reader covers + bool entry(std::size_t &Position, std::size_t &Linebreaks, bool Keywordread, model_entry &Entry); + std::uint32_t appearance(std::string_view Model, std::string_view Texture); + // members + std::string_view m_text; + std::unordered_map m_appearances; // by the part of the text which names the model and the texture + std::string_view m_recentkey; + std::uint32_t m_recentappearance{0}; +}; + +bool entry_reader::skip(std::size_t &Position, std::size_t &Linebreaks) const +{ + auto const *const data{m_text.data()}; + auto const size{m_text.size()}; + while (Position < size) + { + auto const character{data[Position]}; + if (char_kinds[static_cast(character)] == char_separator) + { + if (character == '\n') + { + ++Linebreaks; + } + ++Position; + continue; + } + if (character == '/' && Position + 1 < size) + { + if (data[Position + 1] == '/') + { + // the comment takes the rest of the line, along with the line break + auto const end{m_text.find('\n', Position + 2)}; + if (end == std::string_view::npos) + { + Position = size; + } + else + { + Position = end + 1; + ++Linebreaks; + } + continue; + } + if (data[Position + 1] == '*') + { + return false; + } + } + break; + } + return true; +} + +bool entry_reader::token(std::size_t &Position, std::string_view &Token) const +{ + auto const *const data{m_text.data()}; + auto const size{m_text.size()}; + auto const begin{Position}; + while (Position < size) + { + auto const kind{char_kinds[static_cast(data[Position])]}; + if (kind == char_separator) + { + break; + } + if (kind == char_special) + { + if (data[Position] == '"') + { + return false; + } + if (Position + 1 < size && (data[Position + 1] == '/' || data[Position + 1] == '*')) + { + return false; + } + } + ++Position; + } + Token = m_text.substr(begin, Position - begin); + return true; +} + +bool entry_reader::entry(std::size_t &Position, std::size_t &Linebreaks, bool const Keywordread, model_entry &Entry) +{ + std::string_view word; + if (false == Keywordread) + { + if (false == next(Position, Linebreaks, word) || false == equals(word, "node")) + { + return false; + } + Entry.begin = Position - word.size(); + // the parser takes a token along with the separator which ends it, and the loader notes the line right after + Entry.line = Linebreaks + ((Position < m_text.size() && m_text[Position] == '\n') ? 1 : 0); + } + // NOTE: negative minimal range marks the model as terrain, which is processed in a way of its own + if (false == number(Position, Linebreaks, Entry.range_max) || false == number(Position, Linebreaks, Entry.range_min) || Entry.range_min < 0.0) + { + return false; + } + // NOTE: the parser takes include for a directive wherever it shows up + if (false == next(Position, Linebreaks, Entry.name) || equals(Entry.name, "include")) + { + return false; + } + if (false == next(Position, Linebreaks, word) || false == equals(word, "model")) + { + return false; + } + if (false == number(Position, Linebreaks, Entry.location.x) || false == number(Position, Linebreaks, Entry.location.y) || false == number(Position, Linebreaks, Entry.location.z) || + false == number(Position, Linebreaks, Entry.angle)) + { + return false; + } + std::string_view model; + std::string_view texture; + if (false == next(Position, Linebreaks, model) || equals(model, "include") || false == next(Position, Linebreaks, texture) || equals(texture, "include")) + { + return false; + } + while (true) + { + if (false == next(Position, Linebreaks, word)) + { + return false; + } + if (equals(word, "endmodel")) + { + break; + } + if (equals(word, "angles")) + { + // NOTE: a block which shows up again is left to the parser, along with the question of what it means + if (Entry.has_angles || false == number(Position, Linebreaks, Entry.angles.x) || false == number(Position, Linebreaks, Entry.angles.y) || false == number(Position, Linebreaks, Entry.angles.z)) + { + return false; + } + Entry.has_angles = true; + } + else if (equals(word, "scale")) + { + if (Entry.has_scale || false == number(Position, Linebreaks, Entry.scale.x) || false == number(Position, Linebreaks, Entry.scale.y) || false == number(Position, Linebreaks, Entry.scale.z)) + { + return false; + } + Entry.has_scale = true; + } + else if (equals(word, "notransition")) + { + Entry.notransition = true; + } + else + { + return false; + } + } + Entry.end = Position; + Entry.appearance = appearance(model, texture); + return true; +} + +std::uint32_t entry_reader::appearance(std::string_view const Model, std::string_view const Texture) +{ + // the two tokens along with whatever is between them. the same pair written in another way gets an entry of its own + std::string_view const key{Model.data(), static_cast((Texture.data() + Texture.size()) - Model.data())}; + if (key == m_recentkey) + { + return m_recentappearance; + } + auto lookup{m_appearances.find(key)}; + if (lookup == m_appearances.end()) + { + model_appearance appearance; + appearance.model.assign(Model); + std::transform(std::begin(appearance.model), std::end(appearance.model), std::begin(appearance.model), [](char const Character) { return Character == '\\' ? '/' : to_lower(Character); }); + appearance.texture.assign(Texture); + std::replace(std::begin(appearance.texture), std::end(appearance.texture), '\\', '/'); + block.appearances.emplace_back(std::move(appearance)); + lookup = m_appearances.emplace(key, static_cast(block.appearances.size() - 1)).first; + } + m_recentkey = key; + m_recentappearance = lookup->second; + return lookup->second; +} + +void entry_reader::read(std::size_t const Begin, std::size_t const Limit, bool Keywordread) +{ + cursor = Begin; + linebreaks = 0; + while (cursor < Limit) + { + auto position{cursor}; + auto breaks{linebreaks}; + model_entry definition; + if (false == entry(position, breaks, Keywordread, definition)) + { + break; + } + Keywordread = false; + block.entries.emplace_back(definition); + cursor = position; + linebreaks = breaks; + } + complete = (cursor >= Limit); +} + +} // namespace + +model_entry_run read_model_entries(std::string_view const Text, bool const Keywordread, model_reader_setup const &Setup) +{ + model_entry_run run; + + entry_reader lead{Text}; + lead.read(0, std::min(Text.size(), Setup.lead), Keywordread); + if (lead.block.entries.empty()) + { + return run; + } + auto cursor{lead.cursor}; + auto linebreaks{lead.linebreaks}; + run.blocks.emplace_back(std::move(lead.block)); + + if (lead.complete && cursor < Text.size()) + { + // the run goes on: the next part of the text is divided between the threads. a thread needs a place to start at, + // which is found by looking for the keyword ending a definition. whether the place really is an end of a definition + // is known only when the thread reading the part ahead of it gets there, so the pieces are put together as long as + // each one ended right where the next one began. if that's not the case, e.g. the place found was inside a comment, + // the pieces past it are dropped and their text is read again by the next call, starting from a place which is certain + auto const limit{cursor + std::min(Text.size() - cursor, std::max(Setup.window, 1))}; + auto const threads{std::clamp(Setup.threads != 0 ? Setup.threads : std::thread::hardware_concurrency(), 1, 16)}; + auto const count{std::clamp((limit - cursor) / std::max(Setup.share, 1), 1, threads)}; + std::string_view const endmark{"endmodel"}; + std::vector bounds{cursor}; + for (std::size_t idx = 1; idx < count; ++idx) + { + auto const mark{Text.find(endmark, cursor + (limit - cursor) / count * idx)}; + if (mark == std::string_view::npos || mark + endmark.size() >= limit) + { + break; + } + if (mark + endmark.size() > bounds.back()) + { + bounds.emplace_back(mark + endmark.size()); + } + } + bounds.emplace_back(limit); + + std::vector readers(bounds.size() - 1, entry_reader{Text}); + { + std::vector> tasks; + for (std::size_t idx = 1; idx < readers.size(); ++idx) + { + auto const work{[&readers, &bounds, idx]() { readers[idx].read(bounds[idx], bounds[idx + 1], false); }}; + try + { + tasks.emplace_back(std::async(std::launch::async, work)); + } + catch (std::system_error const &) + { + // no thread to be had, the piece is read right here + work(); + } + } + readers.front().read(bounds[0], bounds[1], false); + for (auto &task : tasks) + { + task.get(); + } + } + for (std::size_t idx = 0; idx < readers.size(); ++idx) + { + auto &reader{readers[idx]}; + for (auto &definition : reader.block.entries) + { + definition.line += linebreaks; + } + cursor = reader.cursor; + linebreaks += reader.linebreaks; + if (false == reader.block.entries.empty()) + { + run.blocks.emplace_back(std::move(reader.block)); + } + if (reader.cursor != bounds[idx + 1]) + { + break; + } + } + } + run.length = cursor; + run.linebreaks = linebreaks; + + return run; +} + +} // namespace scene + +//--------------------------------------------------------------------------- diff --git a/scene/scenemodelentries.h b/scene/scenemodelentries.h new file mode 100644 index 000000000..98b171ee0 --- /dev/null +++ b/scene/scenemodelentries.h @@ -0,0 +1,81 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include +#include +#include +#include + +namespace scene +{ + +// model file and replacable skin of a model instance, in the form TAnimModel::Load() gives the tokens which name them +struct model_appearance +{ + std::string model; // lower case, forward slashes + std::string texture; // forward slashes +}; + +// definition of a model instance read from scenery text: +// node model [angles ] [scale ] [notransition] endmodel +struct model_entry +{ + double range_max{0.0}; + double range_min{0.0}; + std::string_view name; // the way the text spells it. NOTE: refers to the text + glm::dvec3 location{0.0}; + float angle{0.f}; // rotation around the vertical axis + glm::vec3 angles{0.f}; // content of the angles block, if there's one + glm::vec3 scale{1.f}; // content of the scale block, if there's one + bool has_angles{false}; + bool has_scale{false}; + bool notransition{false}; + std::uint32_t appearance{0}; // model and texture of the instance, index into the appearances of the block holding the entry + std::size_t begin{0}; // location of the definition in the text: from the start of its node keyword... + std::size_t end{0}; // ...to the end of its closing keyword + std::size_t line{0}; // line breaks in the text ahead of the definition, counted the way the parser counts them for a node +}; + +// definitions read from one piece of the text +struct model_entry_block +{ + std::vector entries; + std::vector appearances; +}; + +// run of definitions a text starts with +struct model_entry_run +{ + std::vector blocks; // in the order of the text; no block is empty + std::size_t length{0}; // amount of the text taken by the definitions + std::size_t linebreaks{0}; // number of line breaks in that part of the text +}; + +// how the text is divided between the threads +struct model_reader_setup +{ + std::size_t lead{64 * 1024}; // amount of the text read before the threads get involved; most runs of definitions are short + std::size_t window{8 * 1024 * 1024}; // most of the text a single call goes through past the lead + std::size_t share{256 * 1024}; // least amount of the text worth a thread of its own + unsigned int threads{0}; // most threads put to work; 0: as many as the hardware runs at a time +}; + +// reads the definitions of model instances provided text starts with. the reading ends where the text holds something else +// than a definition the reader knows inside out: another kind of node or directive, a block comment, a definition of +// terrain, one with lights or anything else not listed above, with quoted text, an include or a comment glued to a token. +// that part is left for the scenery parser, so the outcome is the same as if the parser went through all of the text. +// Keywordread: the node keyword of the first definition was already taken off the text; begin and line of that entry aren't set +model_entry_run read_model_entries(std::string_view Text, bool Keywordread, model_reader_setup const &Setup = model_reader_setup()); + +} // namespace scene + +//--------------------------------------------------------------------------- diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index 048af99ef..8736e56de 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -18,6 +18,7 @@ http://mozilla.org/MPL/2.0/. #include "scene/scenenodegroups.h" #include "scene/scenelayers.h" #include "scene/sceneterrain.h" +#include "scene/scenemodelentries.h" #include "rendering/particles.h" #include "world/Event.h" #include "world/MemCell.h" @@ -484,6 +485,8 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch // defined by a template, or by something else which isn't a scenery layer file nodedata.instance = ( scene::Layers.instance() != 0 ? scene::Layers.instance() : scene::untracked_instance ); } + // a run of plain model instances is taken straight from the text, instead of token by token + if( true == deserialize_models( Input, Scratchpad, nodedata, inputline, sourcebegin ) ) { return; } // common data and node type indicator Input.getTokens( 4 ); Input @@ -667,25 +670,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch // model import can potentially fail if( instance == nullptr ) { return; } - if( instance->Model() != nullptr ) { - for( auto const &smokesource : instance->Model()->smoke_sources() ) { - Particles.insert( - smokesource.first, - instance, - smokesource.second ); - } - } - - if( false == simulation::Instances.insert( instance ) ) { - ErrorLog( "Bad scenario: duplicate 3d model instance name \"" + instance->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); - } - scene::Groups.insert( scene::Groups.handle(), instance ); - simulation::Region->insert( instance ); - scene::Layers.track( instance, { sourcebegin, Input.TokenEnd() }, instance->Angles(), instance->Scale() ); - scene::basic_node *hierarchy_node = instance; - if (hierarchy_node) - { scene::Hierarchy[hierarchy_node->uuid.to_string()] = hierarchy_node; - } + insert_model( instance, Input, inputline, { sourcebegin, Input.TokenEnd() } ); } } else if( nodedata.type == "triangles" @@ -825,6 +810,99 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch } } +// makes model instance defined by a scenery file a part of the simulation +void +state_serializer::insert_model( TAnimModel *Instance, cParser const &Input, std::size_t const Line, scene::source_span const &Span ) { + + if( Instance->Model() != nullptr ) { + for( auto const &smokesource : Instance->Model()->smoke_sources() ) { + Particles.insert( + smokesource.first, + Instance, + smokesource.second ); + } + } + + if( false == simulation::Instances.insert( Instance ) ) { + ErrorLog( "Bad scenario: duplicate 3d model instance name \"" + Instance->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( Line ) + ")" ); + } + scene::Groups.insert( scene::Groups.handle(), Instance ); + simulation::Region->insert( Instance ); + scene::Layers.track( Instance, Span, Instance->Angles(), Instance->Scale() ); + // the lookup by uuid serves the scenery editor. it's filled only for a scenery opened for editing, as with a lot + // of instances it takes more time than everything else done for an instance put together + if( true == Global.editor_session ) { + scene::Hierarchy[ Instance->uuid.to_string() ] = Instance; + } +} + +// loads a run of model instances straight from the text of the scenery file, starting with the instance whose node keyword +// was just read. the text is taken apart by a reader made for these definitions, with a few threads sharing the work; the +// instances are then created here one by one, in the order of the text. returns: true if any instances were loaded, false +// if the definition at hand has to go through the parser +bool +state_serializer::deserialize_models( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data &Nodedata, std::size_t const Line, std::streamoff const Sourcebegin ) { + + auto const text { Input.remainingText() }; + if( true == text.empty() ) { return false; } + + auto const run { scene::read_model_entries( text, true ) }; + if( true == run.blocks.empty() ) { return false; } + // NOTE: the parser moves on but the text stays where it is, the definitions refer to it + Input.skipText( run.length, run.linebreaks, std::string_view { "endmodel" }.size() ); + auto const textbegin { Input.TokenEnd() - static_cast( run.length ) }; + + Nodedata.type = "model"; + auto loaded { 0 }; + for( auto const &block : run.blocks ) { + // instances of the same model with the same skin are set up after the first one of them + std::vector twins( block.appearances.size(), nullptr ); + for( auto const &entry : block.entries ) { + + Nodedata.range_max = entry.range_max; + Nodedata.range_min = entry.range_min; + // the parser supplies the names in lower case, which goes only for the ascii letters + Nodedata.name.assign( entry.name ); + for( auto &character : Nodedata.name ) { + if( character >= 'A' && character <= 'Z' ) { + character = static_cast( character - 'A' + 'a' ); + } + } + if( Nodedata.name == "none" ) { Nodedata.name.clear(); } + + // what follows is what deserialize_model() does + auto *instance = new TAnimModel( Nodedata ); + instance->Angles( Scratchpad.location.rotation + glm::vec3 { 0.f, entry.angle, 0.f } ); + if( false == Scratchpad.location.scale.empty() ) { + instance->Scale( Scratchpad.location.scale.top() ); + } + auto const &appearance { block.appearances[ entry.appearance ] }; + auto &twin { twins[ entry.appearance ] }; + instance->Load( + appearance.model, appearance.texture, twin, + ( entry.has_angles ? &entry.angles : nullptr ), + ( entry.has_scale ? &entry.scale : nullptr ), + false == entry.notransition ); + if( twin == nullptr ) { twin = instance; } + instance->location( transform( entry.location, Scratchpad ) ); + + // location of the first definition is known from its node keyword, which went through the parser + auto const first { loaded == 0 }; + insert_model( + instance, Input, + ( first ? Line : Line + entry.line ), + { ( first ? Sourcebegin : textbegin + static_cast( entry.begin ) ), textbegin + static_cast( entry.end ) } ); + ++loaded; + } + } + if( Nodedata.layer != null_handle ) { + // scenery opened for editing: keep count of what the scenery file contains + scene::Layers.count( Nodedata.layer, scene::layer_item::model, loaded ); + } + + return true; +} + namespace { // passes the placement in effect to the layer bookkeeping of scenery opened for editing diff --git a/simulation/simulationstateserializer.h b/simulation/simulationstateserializer.h index 2a39c9347..001f6ad3f 100644 --- a/simulation/simulationstateserializer.h +++ b/simulation/simulationstateserializer.h @@ -86,6 +86,10 @@ private: TMemCell * deserialize_memorycell( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); TEventLauncher * deserialize_eventlauncher( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); TAnimModel * deserialize_model( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); + // loads a run of model instances straight from the text. returns: true if any were loaded, false if the definition at hand is left to the parser + bool deserialize_models( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data &Nodedata, std::size_t Line, std::streamoff Sourcebegin ); + // makes model instance defined by a scenery file a part of the simulation + void insert_model( TAnimModel *Instance, cParser const &Input, std::size_t Line, scene::source_span const &Span ); TDynamicObject * deserialize_dynamic( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); sound_source * deserialize_sound( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); void init_time(); diff --git a/utilities/parser.cpp b/utilities/parser.cpp index ff10c0b42..c8410e37d 100644 --- a/utilities/parser.cpp +++ b/utilities/parser.cpp @@ -832,3 +832,44 @@ bool cParser::InLayerFile() const { return mIncludeParser ? mIncludeParser->InLayerFile() : (false == mFile.empty() && false == mIncFile); } + +std::string_view cParser::remainingText() const +{ + if (false == tokens.empty()) + { + return {}; + } + // each parser on the way gets to change the tokens of the file being read + auto const *source{this}; + while (true) + { + if (false == source->parameters.empty() || false == source->skipComments || source->mComments.size() != 2) + { + return {}; + } + if (source->mIncludeParser == nullptr) + { + break; + } + source = source->mIncludeParser.get(); + } + // NOTE: the first token of a file is left to the regular code, which deals with the byte order mark + if (source->mFirstToken || source->mEofBit || source->mFailBit || static_cast(source->mPosition) >= source->mBuffer.size()) + { + return {}; + } + return std::string_view{source->mBuffer}.substr(static_cast(source->mPosition)); +} + +void cParser::skipText(std::size_t const Count, std::size_t const Lines, std::size_t const Tokenlength) +{ + if (mIncludeParser) + { + mIncludeParser->skipText(Count, Lines, Tokenlength); + return; + } + mPosition = static_cast(std::min(static_cast(mPosition) + Count, mBuffer.size())); + mLine += Lines; + mTokenEnd = mPosition; + mTokenBegin = mPosition - static_cast(std::min(Tokenlength, static_cast(mPosition))); +} diff --git a/utilities/parser.h b/utilities/parser.h index 23ae0ef34..5c1efed47 100644 --- a/utilities/parser.h +++ b/utilities/parser.h @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include +#include #include #include #include @@ -107,6 +108,16 @@ class cParser //: public std::stringstream std::streamoff TokenEnd() const; // true if the most recently read token came straight from a scenery file which isn't an *.inc node template bool InLayerFile() const; + // text which follows the most recently read token, for the readers which take entries of a known kind straight from + // the text instead of token by token. empty if the tokens can't be taken that way: some wait to be picked up, there + // are parameters of an include to put in them, or comment marks other than the standard ones are in use + std::string_view remainingText() const; + // moves past specified amount of the text returned by remainingText(): Lines is the number of line breaks in it, + // Tokenlength the length of the token it ends with + void skipText(std::size_t Count, std::size_t Lines, std::size_t Tokenlength); + // converts text holding a plain number without involving a stream. returns: true on success, false if the text needs regular treatment + template + static bool parseNumber( std::string_view Token, Type_ &Output ); bool expandIncludes = true; bool allowRandomIncludes = false; bool skipComments = true; @@ -158,9 +169,6 @@ class cParser //: public std::stringstream bool hasChar(); bool getChar( char &Char ); void updateCharClasses( char const *Break ); - // converts text holding a plain number without involving a stream. returns: true on success, false if the text needs regular treatment - template - static bool parseNumber( std::string const &Token, Type_ &Output ); // members: bool m_autoclear { true }; // unretrieved tokens are discarded when another read command is issued (legacy behaviour) bool LoadTraction { true }; // load traction? @@ -202,7 +210,7 @@ cParser::getToken( bool const ToLower, const char *Break ); template bool -cParser::parseNumber( std::string const &Token, Type_ &Output ) { +cParser::parseNumber( std::string_view const Token, Type_ &Output ) { using type = std::remove_cv_t; if constexpr( From c4a22eabd5442db60b5aaecbfa7e72836ff69754 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Tue, 6 Oct 2026 21:58:57 +0200 Subject: [PATCH 138/430] feat(editor): nodes placed with the brush and the area fill go without names; name of a model instance set in the node properties and written to its definition on save; redo of a deletion finds nodes which have no name --- application/editormode.cpp | 19 ++++---- application/editoruipanels.cpp | 82 ++++++++++++++++++++++++++++++++++ application/editoruipanels.h | 6 +++ scene/scenelayers.cpp | 12 +++++ scene/scenelayers.h | 3 ++ scene/scenelayerssave.cpp | 13 +++++- simulation/simulation.cpp | 9 ++++ simulation/simulation.h | 3 ++ utilities/Names.h | 30 ++++++++++++- 9 files changed, 166 insertions(+), 11 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index ef991c64f..f5b6d716e 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -757,17 +757,14 @@ void editor_mode::handle_brush_mouse_hold(int Action, int Button) if (!src || src->starts_with(editor_includes::directive_mark)) // scenery templates are placed one at a time return; - std::string name = "editor_"; - - TAnimModel *cloned = simulation::State.create_model(*src, name, placement_on_ground(newPos)); + // NOTE: no name for what the brush puts in, as with thousands of nodes the names take their share of the time + // the scenery needs to load. a node which needs one, to be referred to by an event, gets it in the node properties + TAnimModel *cloned = simulation::State.create_model(*src, std::string{}, placement_on_ground(newPos)); oldPos = newPos; m_brush_has_last = true; if (!cloned) return; - std::string new_name = "editor_" + cloned->uuid.to_string(); - - cloned->m_name = new_name; apply_rotation_for_new_node(cloned, rotation_mode, fixed_rotation_value); std::string as_text; @@ -924,6 +921,7 @@ void editor_mode::undo_last() redoSnap.serialized = snap.serialized; redoSnap.position = snap.position; redoSnap.node_ptr = nullptr; + redoSnap.uuid = snap.uuid; redoSnap.layer = snap.layer; g_redo.push_back(std::move(redoSnap)); @@ -936,6 +934,8 @@ void editor_mode::undo_last() m_node = created; m_node->uuid = snap.uuid; // restore original UUID for better tracking (not strictly necessary) add_to_hierarchy(created); + // a node without a name can be found for the redo only this way + g_redo.back().node_ptr = created; ui()->set_node(m_node); } return; @@ -1028,7 +1028,8 @@ void editor_mode::redo_last() hist.layer = snap.layer; m_history.push_back(std::move(hist)); - scene::basic_node *target = simulation::Instances.find(snap.node_name); + // NOTE: located the way other steps do it, as the name alone doesn't lead to a node which has none + scene::basic_node *target = find_node_by_any(snap.node_ptr, snap.uuid.to_string(), snap.node_name); if (target) { if (auto *model = dynamic_cast(target)) @@ -2722,10 +2723,10 @@ void editor_mode::run_area_fill() continue; auto const &src = package[package.size() > 1 ? std::min(package.size() - 1, static_cast(LocalRandom(0.0, static_cast(package.size())))) : 0]; - TAnimModel *cloned = simulation::State.create_model(src, "editor_", location); + // NOTE: no names here either, same as with the brush + TAnimModel *cloned = simulation::State.create_model(src, std::string{}, location); if (!cloned) continue; - cloned->m_name = "editor_" + cloned->uuid.to_string(); apply_rotation_for_new_node(cloned, rotation_mode, fixed_rotation_value); if (scalemin != 1.0f || scalemax != 1.0f) cloned->Scale(static_cast(LocalRandom(scalemin, scalemax))); diff --git a/application/editoruipanels.cpp b/application/editoruipanels.cpp index 0ca125bd0..9aa6f1456 100644 --- a/application/editoruipanels.cpp +++ b/application/editoruipanels.cpp @@ -20,10 +20,29 @@ http://mozilla.org/MPL/2.0/. #include "world/MemCell.h" #include "application/editoruilayer.h" #include "rendering/renderer.h" +#include "simulation/simulation.h" #include "editor/editorModelSets.hpp" namespace { +// tells why provided text can't be the name of a node, empty text if it can. the scenery parser has to get it back as a single token +std::string node_name_issue(std::string const &Name) +{ + if (Name.find_first_of(" \t\r\n;\"") != std::string::npos) + { + return "a name can't hold spaces, semicolons or quotes"; + } + if (Name.find("//") != std::string::npos || Name.find("/*") != std::string::npos) + { + return "a name can't hold a comment mark"; + } + if (Name == "include") + { + return "this word has a meaning of its own in scenery files"; + } + return {}; +} + // list entry; the selected one is drawn with the accent colour, like selections in the starter bool list_item(char const *Label, bool const Selected) { @@ -322,12 +341,75 @@ void itemproperties_panel::render_body() { ImGui::TextColored(ImVec4(line.color.r, line.color.g, line.color.b, line.color.a), line.data.c_str()); } + // name of the node — TAnimModel only + render_name_editor(); // transform editor (position/rotation/scale) — TAnimModel only render_transform_editor(); // group section render_group(); } +// Name of a picked TAnimModel. The editor places decorations without names, as each name takes its share of the time +// the scenery needs to load; this is where an instance gets one, for the events to refer to it. +void itemproperties_panel::render_name_editor() +{ + if (m_node == nullptr) { return; } + if (typeid(*m_node) != typeid(TAnimModel)) { return; } + auto *picked = static_cast(m_node); + // the name of an instance defined by a template, or by a file which can't be rewritten, wouldn't make it to the scenery files + if (false == scene::Layers.editable(picked)) { return; } + + if (m_namednode != m_node || false == m_nameactive) + { + // the field shows the name of the node unless it's being typed in + if (m_namednode != m_node) + { + m_nameissue.clear(); + } + m_namednode = m_node; + std::snprintf(m_namebuffer, sizeof(m_namebuffer), "%s", picked->name().c_str()); + } + auto const entered{ImGui::InputTextWithHint("name", "(none)", m_namebuffer, IM_ARRAYSIZE(m_namebuffer), ImGuiInputTextFlags_EnterReturnsTrue)}; + m_nameactive = ImGui::IsItemActive(); + if (ImGui::IsItemHovered()) + { + ImGui::SetTooltip("Name the events can refer to the node by.\nNodes without a name load quicker, leave it empty unless something needs it"); + } + if (entered || ImGui::IsItemDeactivatedAfterEdit()) + { + // names are lower case, like everything else the scenery parser hands over + std::string name{m_namebuffer}; + for (auto &character : name) + { + if (character >= 'A' && character <= 'Z') + { + character = static_cast(character - 'A' + 'a'); + } + } + if (name == "none") + { + name.clear(); + } + if (name != picked->name()) + { + m_nameissue = node_name_issue(name); + if (m_nameissue.empty() && false == simulation::State.rename_model(picked, name)) + { + m_nameissue = "another model instance goes by this name"; + } + } + else + { + m_nameissue.clear(); + } + m_nameactive = false; + } + if (false == m_nameissue.empty()) + { + ImGui::TextColored(ImVec4(1.0f, 0.35f, 0.3f, 1.0f), "%s", m_nameissue.c_str()); + } +} + // In-place editor for position (double precision), rotation (degrees, 0-360), // and uniform scale (per-axis float, 1.000) of a picked TAnimModel. // Other node subclasses don't expose these knobs through the same API, so the diff --git a/application/editoruipanels.h b/application/editoruipanels.h index b558a069f..7da838700 100644 --- a/application/editoruipanels.h +++ b/application/editoruipanels.h @@ -69,11 +69,17 @@ class itemproperties_panel : public ui_panel // renders DragFloat3/DragScalarN widgets for position, rotation and scale // of the currently bound TAnimModel; no-op for other node subclasses. void render_transform_editor(); + // renders the field with the name of the currently bound TAnimModel, which gives the instance another name; no-op for other node subclasses + void render_name_editor(); // renders widgets for the parameters of the bound include void render_include(); // members scene::basic_node *m_node{nullptr}; // scene node bound to the panel + scene::basic_node *m_namednode{nullptr}; // scene node whose name is held by the edit buffer + char m_namebuffer[128]{}; // name of the node, as shown and typed in + bool m_nameactive{false}; // the name is being typed in + std::string m_nameissue; // why the name typed in wasn't taken include_selection *m_include{nullptr}; // include of a scenery template bound to the panel scene::group_handle m_grouphandle{null_handle}; // scene group bound to the panel std::string m_groupprefix; diff --git a/scene/scenelayers.cpp b/scene/scenelayers.cpp index 097704443..7cfd8b145 100644 --- a/scene/scenelayers.cpp +++ b/scene/scenelayers.cpp @@ -129,6 +129,7 @@ void node_layers::clear() m_context = layer_context(); m_sources.clear(); m_erased.clear(); + m_renamed.clear(); m_shapes.clear(); m_shapeserased = false; m_templates.clear(); @@ -475,6 +476,17 @@ void node_layers::forget(basic_node const *Node) } m_erased.emplace_back(lookup->second.layer, lookup->second.span); m_sources.erase(lookup); + m_renamed.erase(Node); +} + +// indicates specified node was given another name in the editor +void node_layers::renamed(basic_node const *Node) +{ + // NOTE: a node which isn't defined by a scenery file yet is written whole on save, along with its name + if (m_sources.find(Node) != m_sources.end()) + { + m_renamed.emplace(Node); + } } void node_layers::shape(material_handle const Material, source_span const &Span) diff --git a/scene/scenelayers.h b/scene/scenelayers.h index 5a6f249cf..f59a37e0d 100644 --- a/scene/scenelayers.h +++ b/scene/scenelayers.h @@ -259,6 +259,8 @@ class node_layers void track(basic_node const *Node, source_span const &Span, glm::vec3 const &Angles = glm::vec3{0.f}, glm::vec3 const &Scale = glm::vec3{1.f}); // indicates specified node was removed from the scene void forget(basic_node const *Node); + // indicates specified node was given another name in the editor, for its definition to get it on save + void renamed(basic_node const *Node); // stores location of a shape defined directly in the layer file being loaded void shape(material_handle const Material, source_span const &Span); std::vector const &shapes() const @@ -373,6 +375,7 @@ class node_layers layer_context m_context; // placement in effect at the current point of scenery load std::unordered_map m_sources; // origins of nodes which can be rewritten on save std::vector> m_erased; // definitions of nodes deleted since the load or the last save + std::unordered_set m_renamed; // nodes given another name since the load or the last save std::vector m_shapes; bool m_shapeserased{false}; // the binary terrain file holds shapes which the save drops std::set m_templates; // *.inc templates used by the scenery diff --git a/scene/scenelayerssave.cpp b/scene/scenelayerssave.cpp index 21d8a2bec..98da1f12a 100644 --- a/scene/scenelayerssave.cpp +++ b/scene/scenelayerssave.cpp @@ -134,6 +134,7 @@ struct model_placement std::optional angles; // complete rotation of the instance glm::vec3 rotation{0.f}; // rotation the loader adds to the angle specified in the definition std::optional scale; // scale factor to put in the definition + std::optional name; // name of the node }; bool about_equal(float const Left, float const Right) @@ -166,6 +167,10 @@ bool patch_model(std::string &Text, model_placement const &Placement, std::strin }; std::string additions; // blocks to insert ahead of the closing keyword + if (Placement.name) + { + replace(3, *Placement.name); + } if (Placement.location) { replace(5, number(Placement.location->x)); @@ -693,7 +698,8 @@ save_result node_layers::save(std::vector const &Rootstatements) auto const moved{glm::distance(location, source.location) > 1e-4}; auto const rotated{false == glm::all(glm::epsilonEqual(angles, source.angles, 1e-3f))}; auto const scaled{false == glm::all(glm::epsilonEqual(scale, source.scale, 1e-4f))}; - if (false == (moved || rotated || scaled)) + auto const renamed{Model != nullptr && m_renamed.find(Node) != m_renamed.end()}; + if (false == (moved || rotated || scaled || renamed)) { return true; } @@ -725,6 +731,10 @@ save_result node_layers::save(std::vector const &Rootstatements) { placement.scale = scale / source.context.scale; } + if (renamed) + { + placement.name = (Node->name().empty() ? "none" : Node->name()); + } patched = patch_model(text, placement, error); } else @@ -1614,6 +1624,7 @@ save_result node_layers::save(std::vector const &Rootstatements) included.dead = included.dead || included.removed; } m_erased.clear(); + m_renamed.clear(); // the shapes of the rewritten files are somewhere else in them now m_shapes.erase(std::remove_if(std::begin(m_shapes), std::end(m_shapes), [&](shape_source const &Shape) { return std::find(std::begin(composed), std::end(composed), Shape.layer) != std::end(composed); }), std::end(m_shapes)); for (auto *path : savedpaths) diff --git a/simulation/simulation.cpp b/simulation/simulation.cpp index a5d5ad29c..035a4f377 100644 --- a/simulation/simulation.cpp +++ b/simulation/simulation.cpp @@ -557,6 +557,15 @@ void state_manager::delete_model(TAnimModel *model) { Instances.purge(model); } +bool state_manager::rename_model(TAnimModel *model, std::string const &name) { + if (model == nullptr || false == Instances.rename(model, name)) { + return false; + } + model->m_name = (name == "none" ? std::string{} : name); + scene::Layers.renamed(model); + return true; +} + void state_manager::delete_eventlauncher(TEventLauncher *launcher) { launcher->dRadius = 0.0f; // disable it } diff --git a/simulation/simulation.h b/simulation/simulation.h index b36d70a02..89337583e 100644 --- a/simulation/simulation.h +++ b/simulation/simulation.h @@ -54,6 +54,9 @@ public: // delete TAnimModel instance void delete_model(TAnimModel *model); + // gives TAnimModel instance another name; empty text leaves it without one. returns: false if another instance uses the name + bool + rename_model(TAnimModel *model, std::string const &name); // delete TEventLauncher instance void delete_eventlauncher(TEventLauncher *launcher); diff --git a/utilities/Names.h b/utilities/Names.h index 0533c6960..52d438f6b 100644 --- a/utilities/Names.h +++ b/utilities/Names.h @@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/. #include #include +#include template class basic_table { @@ -31,7 +32,7 @@ public: } auto const itemhandle { m_items.size() - 1 }; // add item name to the map - auto mapping = m_itemmap.emplace( itemname, itemhandle ); + auto mapping = m_itemmap.emplace( std::move( itemname ), itemhandle ); if( true == mapping.second ) { return true; } @@ -42,6 +43,33 @@ public: { return insert(Item, Item->name()); } + // changes the name specified item is found by; empty text or "none" leaves the item without one. + // NOTE: the name held by the item itself is for the caller to change afterwards. + // returns: false if the name is in use by another item or the item isn't in the collection, true otherwise + bool + rename( Type_ const *Item, std::string const &Name ) { + auto const named { false == Name.empty() && Name != "none" }; + if( named ) { + auto const taken { m_itemmap.find( Name ) }; + if( taken != m_itemmap.end() + && m_items[ taken->second ] != nullptr + && m_items[ taken->second ] != Item ) { + return false; } } + // the current name leads to the item unless the item has none, or shares it with an item added later + auto itemhandle { m_items.size() }; + auto const current { m_itemmap.find( Item->name() ) }; + if( current != m_itemmap.end() + && m_items[ current->second ] == Item ) { + itemhandle = current->second; + m_itemmap.erase( current ); } + else { + auto const lookup { std::find( m_items.begin(), m_items.end(), Item ) }; + if( lookup == m_items.end() ) { + return false; } + itemhandle = static_cast( std::distance( m_items.begin(), lookup ) ); } + if( named ) { + m_itemmap[ Name ] = itemhandle; } + return true; } void purge (std::string const &Name) { auto lookup = m_itemmap.find( Name ); From f5d328c3a5bd1d847b21cc8b660dbf6417ef680c Mon Sep 17 00:00:00 2001 From: maj00r Date: Tue, 6 Oct 2026 22:19:12 +0200 Subject: [PATCH 139/430] ci: translations of lang/ packaged with the builds; each push of a branch publishes its Windows and Linux builds as the rolling pre-release build-, downloadable without a GitHub account and removed along with the branch --- .github/workflows/build_bin.yml | 95 ++++++++++++++++++++++++++++- .github/workflows/build_cleanup.yml | 21 +++++++ 2 files changed, 113 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/build_cleanup.yml diff --git a/.github/workflows/build_bin.yml b/.github/workflows/build_bin.yml index f0b1fdec9..255c89a6b 100644 --- a/.github/workflows/build_bin.yml +++ b/.github/workflows/build_bin.yml @@ -87,7 +87,7 @@ jobs: --config $env:CONFIG_WIN ` --parallel - - name: Copy shaders + - name: Copy shaders and translations shell: pwsh run: | $output = "build/bin/$env:CONFIG_WIN" @@ -103,6 +103,17 @@ jobs: -Recurse ` -Force + New-Item ` + -ItemType Directory ` + -Force ` + -Path "$output/lang" | Out-Null + + Copy-Item ` + -Path "lang/*" ` + -Destination "$output/lang" ` + -Recurse ` + -Force + - name: Upload Windows build uses: actions/upload-artifact@v4 with: @@ -238,10 +249,11 @@ jobs: "$PYTHON_HOME/bin/python" -c "from PIL import Image; print('Pillow:', Image.__version__)" - - name: Copy shaders + - name: Copy shaders and translations run: | - mkdir -p build/bin/shaders + mkdir -p build/bin/shaders build/bin/lang cp -R shaders/. build/bin/shaders/ + cp -R lang/. build/bin/lang/ - name: Upload Linux build uses: actions/upload-artifact@v4 @@ -251,3 +263,80 @@ jobs: build/bin/ if-no-files-found: error retention-days: 14 + + + # ============================================================ + # Public download: release assets need no GitHub account + # ============================================================ + + publish: + name: Publish public download + needs: [windows, linux] + if: github.event_name != 'pull_request' + runs-on: ubuntu-24.04 + permissions: + contents: write + concurrency: + group: publish-${{ github.ref }} + cancel-in-progress: false + + steps: + - name: Download Windows build + uses: actions/download-artifact@v4 + with: + name: maszyna-windows-x64-${{ env.CONFIG_WIN }} + path: dist/maszyna-windows-x64 + + - name: Download Linux build + uses: actions/download-artifact@v4 + with: + name: maszyna-linux-x64-${{ env.CONFIG_LINUX }} + path: dist/maszyna-linux-x64 + + - name: Pack + run: | + cd dist + + find maszyna-linux-x64 -type f -exec sh -c 'file -b "$1" | grep -q "^ELF" && chmod +x "$1"' _ {} \; + if [ -d maszyna-linux-x64/linuxpython64/bin ]; then + chmod +x maszyna-linux-x64/linuxpython64/bin/* + fi + + (cd maszyna-windows-x64 && zip -qr9 ../maszyna-windows-x64.zip .) + tar -czf maszyna-linux-x64.tar.gz -C maszyna-linux-x64 . + ls -la + + - name: Publish rolling release of the branch + env: + GH_TOKEN: ${{ github.token }} + GH_REPO: ${{ github.repository }} + BRANCH: ${{ github.ref_name }} + SHA: ${{ github.sha }} + RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} + run: | + slug="$(printf '%s' "$BRANCH" | tr '/ ' '--' | tr -cd '[:alnum:]._-')" + tag="build-$slug" + base="${{ github.server_url }}/${{ github.repository }}/releases/download/$tag" + + notes="$(printf '%s\n' \ + "Automatic build of branch \`$BRANCH\`, commit $SHA, replaced by every push to the branch." \ + "" \ + "Download without a GitHub account:" \ + "- Windows: $base/maszyna-windows-x64.zip" \ + "- Linux: $base/maszyna-linux-x64.tar.gz" \ + "" \ + "Unpack over a MaSzyna installation (the game data isn't included). Build log: $RUN_URL")" + + gh release delete "$tag" --yes --cleanup-tag || true + gh release create "$tag" \ + dist/maszyna-windows-x64.zip \ + dist/maszyna-linux-x64.tar.gz \ + --target "$SHA" \ + --prerelease \ + --latest=false \ + --title "Build: $BRANCH" \ + --notes "$notes" + + echo "### Public download" >> "$GITHUB_STEP_SUMMARY" + echo "- Windows: $base/maszyna-windows-x64.zip" >> "$GITHUB_STEP_SUMMARY" + echo "- Linux: $base/maszyna-linux-x64.tar.gz" >> "$GITHUB_STEP_SUMMARY" diff --git a/.github/workflows/build_cleanup.yml b/.github/workflows/build_cleanup.yml new file mode 100644 index 000000000..8b20be0da --- /dev/null +++ b/.github/workflows/build_cleanup.yml @@ -0,0 +1,21 @@ +name: Remove public build of a deleted branch + +on: + delete: + +permissions: + contents: write + +jobs: + cleanup: + if: github.event.ref_type == 'branch' + runs-on: ubuntu-24.04 + steps: + - name: Delete the rolling release of the branch + env: + GH_TOKEN: ${{ github.token }} + GH_REPO: ${{ github.repository }} + BRANCH: ${{ github.event.ref }} + run: | + slug="$(printf '%s' "$BRANCH" | tr '/ ' '--' | tr -cd '[:alnum:]._-')" + gh release delete "build-$slug" --yes --cleanup-tag || true From 084a705452ff2dd8f9a95d343ad96d1142677174 Mon Sep 17 00:00:00 2001 From: maj00r Date: Tue, 6 Oct 2026 22:19:12 +0200 Subject: [PATCH 140/430] fix(vehicles): vehicle placed with a switch as its first path no longer reads the direction of a previous path it doesn't have; vehicle put back on the track keeps the direction of its axles --- vehicle/DynObj.cpp | 4 ++-- world/TrkFoll.cpp | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index 0bf8815ba..a6c57f564 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -1917,11 +1917,11 @@ void TDynamicObject::place_on_track(TTrack *Track, double fDist, bool Reversed) switch (iNumAxles) { // Ra: pojazdy wstawiane są na tor początkowy, a potem przesuwane case 2: // ustawianie osi na torze - Axle0.Init(Track, this, iDirection ? 1 : -1); Axle0.Reset(); + Axle0.Init(Track, this, iDirection ? 1 : -1); Axle0.Move((iDirection ? fDist : -fDist) + fAxleDistHalf, false); - Axle1.Init(Track, this, iDirection ? 1 : -1); Axle1.Reset(); + Axle1.Init(Track, this, iDirection ? 1 : -1); Axle1.Move((iDirection ? fDist : -fDist) - fAxleDistHalf, false); // false, żeby nie generować eventów break; } diff --git a/world/TrkFoll.cpp b/world/TrkFoll.cpp index b18848965..c437553da 100644 --- a/world/TrkFoll.cpp +++ b/world/TrkFoll.cpp @@ -51,6 +51,9 @@ TTrack * TTrackFollower::SetCurrentTrack(TTrack *pTrack, int end) { case tt_Switch: // jeśli zwrotnica, to przekładamy ją, aby uzyskać dobry segment { + if( pCurrentTrack == nullptr ) { + break; + } int i = end ? pCurrentTrack->iNextDirection : pCurrentTrack->iPrevDirection; if (i > 0) // jeżeli wjazd z ostrza pTrack->SwitchForced(i >> 1, Owner); // to przełożenie zwrotnicy - rozprucie! From 978b99b7e5ae74d4f8d5f495f538c8d84314217f Mon Sep 17 00:00:00 2001 From: maj00r Date: Tue, 6 Oct 2026 22:19:32 +0200 Subject: [PATCH 141/430] feat(scenery): models laid along curves (sweep nodes), bent to follow the paths or repeated along them, loaded and saved with the scenery; trainsets put on a path while the simulation runs; trainset turned around by reversed after its header: the first vehicle stays at the offset and leads towards point 1, the rest stands behind it; launcher keeps reversed trainsets and can turn one around; memory cells saved with the new name of the path they name; events tell their targets and the events of a multiple event; renderer tells whether the cursor is over a surface; vehicle placed in the editor entered when the driving goes on --- CMakeLists.txt | 1 + application/drivermode.cpp | 13 + launcher/scenery_list.cpp | 6 +- launcher/scenery_scanner.cpp | 4 + launcher/scenery_scanner.h | 1 + rendering/opengl33renderer.cpp | 1 + rendering/opengl33renderer.h | 3 + rendering/renderer.h | 1 + scene/scene.h | 2 + scene/scenelayerssave.cpp | 95 ++- scene/scenenode.h | 8 + simulation/simulation.cpp | 6 + simulation/simulation.h | 4 + simulation/simulationstateserializer.cpp | 103 ++- simulation/simulationstateserializer.h | 3 + utilities/Classes.h | 2 + utilities/Globals.h | 1 + world/Event.cpp | 20 + world/Event.h | 5 + world/Sweep.cpp | 907 +++++++++++++++++++++++ world/Sweep.h | 158 ++++ 21 files changed, 1329 insertions(+), 15 deletions(-) create mode 100644 world/Sweep.cpp create mode 100644 world/Sweep.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 37f5c4ae6..e2fa3abde 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,6 +96,7 @@ set(SOURCES "utilities/Timer.cpp" "world/Track.cpp" "world/Road.cpp" +"world/Sweep.cpp" "world/RoadPoint.cpp" "world/Traction.cpp" "world/TractionPower.cpp" diff --git a/application/drivermode.cpp b/application/drivermode.cpp index dbe3e1762..a79c31b03 100644 --- a/application/drivermode.cpp +++ b/application/drivermode.cpp @@ -255,6 +255,19 @@ bool driver_mode::update() // variable step simulation time routines + if (false == Global.editor_enter_vehicle.empty()) + { + auto const name{std::move(Global.editor_enter_vehicle)}; + Global.editor_enter_vehicle.clear(); + if (auto *dynamic{simulation::Vehicles.find(name)}) + { + if (false == FreeFlyModeFlag) + InOutKey(); + m_relay.post(user_command::entervehicle, 0.0, simulation::Train ? simulation::Train->id() : 0, GLFW_PRESS, 0, dynamic->GetPosition(), &dynamic->name()); + change_train = dynamic->name(); + } + } + if (!change_train.empty()) { TTrain *train = simulation::Trains.find(change_train); diff --git a/launcher/scenery_list.cpp b/launcher/scenery_list.cpp index 77f69a350..a24d3cf99 100644 --- a/launcher/scenery_list.cpp +++ b/launcher/scenery_list.cpp @@ -119,6 +119,10 @@ void ui::scenerylist_panel::draw_launch_box() ImGui::TextWrapped(selected_trainset->description.c_str()); + ImGui::Checkbox(STR_C("Trainset turned around"), &selected_trainset->reversed); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("The first vehicle stays where the trainset starts and leads the other way,\nthe rest of the trainset stands behind it")); + if (ImGui::Button(STR_C("Launch"), ImVec2(-1, 0))) { if (!launch_simulation()) ImGui::OpenPopup("missing_driver"); @@ -163,7 +167,7 @@ void ui::scenerylist_panel::add_replace_entry(const trainset_desc &trainset) set += trainset.name + " "; set += trainset.track + " "; set += std::to_string(trainset.offset) + " "; - set += std::to_string(trainset.velocity) + "\n"; + set += std::to_string(trainset.velocity) + (trainset.reversed ? " reversed\n" : "\n"); for (const auto &veh : trainset.vehicles) { if (!veh.skin) { ErrorLog("trainset contains invalid vehicle " + veh.name); diff --git a/launcher/scenery_scanner.cpp b/launcher/scenery_scanner.cpp index 7bfa8a07c..bcd18ac90 100644 --- a/launcher/scenery_scanner.cpp +++ b/launcher/scenery_scanner.cpp @@ -95,6 +95,10 @@ void scenery_scanner::parse_trainset(cParser &parser) parser >> trainset.name >> trainset.track >> trainset.offset >> trainset.velocity; parser.getTokens(); + if (parser.peek() == "reversed") { + trainset.reversed = true; + parser.getTokens(); + } while (parser.peek() == "node") { trainset.vehicles.emplace_back(); dynamic_desc &dyn = trainset.vehicles.back(); diff --git a/launcher/scenery_scanner.h b/launcher/scenery_scanner.h index 44854438d..fcda27da4 100644 --- a/launcher/scenery_scanner.h +++ b/launcher/scenery_scanner.h @@ -30,6 +30,7 @@ struct trainset_desc { float offset { 0.f }; float velocity { 0.f }; + bool reversed { false }; std::vector vehicles; }; diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index b146d5d18..ff0e9951c 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -5154,6 +5154,7 @@ glm::dvec3 opengl33_renderer::Update_Mouse_Position() if (pointdepth != std::numeric_limits::max()) { + m_mousehit = (GLAD_GL_ARB_clip_control || GLAD_GL_EXT_clip_control) ? pointdepth > 0.0f : pointdepth < 1.0f; if (GLAD_GL_ARB_clip_control || GLAD_GL_EXT_clip_control) { if (pointdepth > 0.0f) m_worldmousecoordinates = glm::unProjectZO(glm::vec3(bufferpos, pointdepth), glm::mat4(glm::mat3(m_colorpass.pass_camera.modelview())), m_colorpass.pass_camera.projection(), diff --git a/rendering/opengl33renderer.h b/rendering/opengl33renderer.h index 506e92113..36c8417cb 100644 --- a/rendering/opengl33renderer.h +++ b/rendering/opengl33renderer.h @@ -105,6 +105,8 @@ class opengl33_renderer : public gfx_renderer { Pick_Node() const override { return m_picksceneryitem; } glm::dvec3 Mouse_Position() const override { return m_worldmousecoordinates; } + bool + Mouse_Hit() const override { return m_mousehit; } glm::mat4 Camera_View_Matrix() const override { return glm::mat4( glm::mat3( m_colorpass.pass_camera.modelview() ) ); } glm::mat4 @@ -387,6 +389,7 @@ class opengl33_renderer : public gfx_renderer { std::vector m_picksceneryitems; scene::basic_node *m_picksceneryitem{nullptr}; glm::vec3 m_worldmousecoordinates { 0.f }; + bool m_mousehit { false }; #ifdef EU07_USE_DEBUG_CAMERA renderpass_config m_worldcamera; // debug item #endif diff --git a/rendering/renderer.h b/rendering/renderer.h index f7b6d7626..225e26c08 100644 --- a/rendering/renderer.h +++ b/rendering/renderer.h @@ -73,6 +73,7 @@ public: virtual auto Pick_Node() const -> scene::basic_node const * = 0; virtual auto Mouse_Position() const -> glm::dvec3 = 0; + virtual auto Mouse_Hit() const -> bool { return true; } // editor helpers: matrices/position of the most recent color pass camera. // the view matrix is camera-relative (rotation only, camera at origin), matching the // camera-relative rendering used by the engine; build object matrices relative to Camera_Position(). diff --git a/scene/scene.h b/scene/scene.h index 74b3ba4cf..6b1ba1754 100644 --- a/scene/scene.h +++ b/scene/scene.h @@ -69,7 +69,9 @@ struct scratch_data { std::vector vehicles; std::vector couplings; TDynamicObject * driver { nullptr }; + TTrack * path { nullptr }; // given directly, for a trainset placed in the editor on a path which may have no name bool is_open { false }; + bool reversed { false }; std::unordered_map assignment; } trainset; diff --git a/scene/scenelayerssave.cpp b/scene/scenelayerssave.cpp index 98da1f12a..7751a860a 100644 --- a/scene/scenelayerssave.cpp +++ b/scene/scenelayerssave.cpp @@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/. #include "scene/scenelayers.h" #include "world/Track.h" #include "world/Road.h" +#include "world/Sweep.h" #include "world/RoadPoint.h" #include "simulation/simulation.h" @@ -231,7 +232,7 @@ bool patch_model(std::string &Text, model_placement const &Placement, std::strin } // definition layout: node memcell endmemcell -bool patch_memcell(std::string &Text, glm::dvec3 const &Location, std::string &Error) +bool patch_memcell(std::string &Text, std::optional const &Location, std::string const &Track, std::string &Error) { auto const tokens{tokenize(Text)}; if (tokens.size() < 13 || tokens[0].text != "node" || tokens[4].text != "memcell" || tokens.back().text != "endmemcell") @@ -239,7 +240,13 @@ bool patch_memcell(std::string &Text, glm::dvec3 const &Location, std::string &E Error = "unexpected layout of memory cell definition"; return false; } - apply(Text, {{tokens[5].begin, tokens[5].end, number(Location.x)}, {tokens[6].begin, tokens[6].end, number(Location.y)}, {tokens[7].begin, tokens[7].end, number(Location.z)}}); + std::vector changes; + if (Location) + changes.insert(changes.end(), {{tokens[5].begin, tokens[5].end, number(Location->x)}, {tokens[6].begin, tokens[6].end, number(Location->y)}, {tokens[7].begin, tokens[7].end, number(Location->z)}}); + auto const &track{tokens[tokens.size() - 2]}; + if (false == Track.empty() && track.text != Track) + changes.push_back({track.begin, track.end, Track}); + apply(Text, changes); return true; } @@ -699,7 +706,9 @@ save_result node_layers::save(std::vector const &Rootstatements) auto const rotated{false == glm::all(glm::epsilonEqual(angles, source.angles, 1e-3f))}; auto const scaled{false == glm::all(glm::epsilonEqual(scale, source.scale, 1e-4f))}; auto const renamed{Model != nullptr && m_renamed.find(Node) != m_renamed.end()}; - if (false == (moved || rotated || scaled || renamed)) + auto const *cell{Model == nullptr ? static_cast(Node) : nullptr}; + auto const track{cell != nullptr && cell->Track != nullptr ? cell->Track->name() : std::string{}}; + if (false == (moved || rotated || scaled || renamed || (false == track.empty() && Node->dirty()))) { return true; } @@ -739,13 +748,17 @@ save_result node_layers::save(std::vector const &Rootstatements) } else { - patched = patch_memcell(text, source.context.to_local(location), error); + patched = patch_memcell(text, moved ? std::optional{source.context.to_local(location)} : std::nullopt, track, error); } if (false == patched) { state.error = error + " of \"" + Node->name() + "\" in file \"" + layer(source.layer).name + "\""; return false; } + if (text.size() == static_cast(source.span.end - source.span.begin) && content.compare(static_cast(source.span.begin), text.size(), text) == 0) + { + return true; + } file_patch::edit edit; edit.begin = source.span.begin; edit.end = source.span.end; @@ -988,6 +1001,72 @@ save_result node_layers::save(std::vector const &Rootstatements) state.patches[source.layer].edits.emplace_back(std::move(edit)); rewritten.emplace(road); } + // models laid along curves, likewise + std::vector savedsweeps; + std::vector droppedsweeps; + auto const sweep_text = [](sweep_node &Sweep, glm::dvec3 const &Offset) { + auto const definition{Sweep.definition()}; + auto local{definition}; + for (auto &piece : local.pieces) + { + piece.points[segment_data::point::start] -= Offset; + piece.points[segment_data::point::end] -= Offset; + } + Sweep.define(local); + std::string text; + Sweep.export_as_text(text); + Sweep.define(definition); + text.erase(text.find_last_not_of(" \t\r\n") + 1); + return text; + }; + for (auto *sweep : simulation::Sweeps.sequence()) + { + if (sweep == nullptr || sweep->from_template()) + { + continue; + } + auto const nodelayer{resolve(sweep->layer())}; + if (false == is_output(nodelayer)) + { + continue; + } + auto const lookup{m_sources.find(sweep)}; + if (lookup == m_sources.end()) + { + if (sweep->m_editorremoved || false == sweep->dirty()) + { + continue; + } + created[nodelayer].emplace_back(sweep, sweep_text(*sweep, layer(nodelayer).context_insert().offset)); + savedsweeps.push_back(sweep); + continue; + } + auto const &source{lookup->second}; + if ((false == sweep->m_editorremoved && false == sweep->dirty()) || false == writable(source.layer)) + { + continue; + } + if (false == load(source.layer)) + { + return fail(state.error); + } + file_patch::edit edit; + edit.begin = source.span.begin; + edit.end = source.span.end; + if (sweep->m_editorremoved) + { + droppedsweeps.push_back(sweep); + } + else + { + edit.text = sweep_text(*sweep, source.context.offset); + edit.length = edit.text.size(); + edit.node = sweep; + savedsweeps.push_back(sweep); + } + state.patches[source.layer].edits.emplace_back(std::move(edit)); + rewritten.emplace(sweep); + } // road junctions, likewise std::vector savedjunctions; std::vector droppedjunctions; @@ -1647,6 +1726,14 @@ save_result node_layers::save(std::vector const &Rootstatements) { m_sources.erase(road); } + for (auto *sweep : savedsweeps) + { + sweep->m_dirty = false; + } + for (auto const *sweep : droppedsweeps) + { + m_sources.erase(sweep); + } for (auto *junction : savedjunctions) { junction->m_dirty = false; diff --git a/scene/scenenode.h b/scene/scenenode.h index dd844a656..b7fa9fdaf 100644 --- a/scene/scenenode.h +++ b/scene/scenenode.h @@ -149,6 +149,9 @@ public: // set lighting (used by generated geometry painted with plain colour) void lighting( lighting_data const &Lighting ); + // sets whether the shape is drawn with the translucent geometry (used by generated geometry) + void + translucent( bool const Translucent ); // data access shapenode_data const & data() const; @@ -186,6 +189,11 @@ void shape_node::lighting( lighting_data const &Lighting ) { m_data.lighting = Lighting; } +inline +void +shape_node::translucent( bool const Translucent ) { + m_data.translucent = Translucent; +} // data access inline shape_node::shapenode_data const & diff --git a/simulation/simulation.cpp b/simulation/simulation.cpp index 035a4f377..3cbe6c692 100644 --- a/simulation/simulation.cpp +++ b/simulation/simulation.cpp @@ -17,6 +17,7 @@ http://mozilla.org/MPL/2.0/. #include "world/MemCell.h" #include "world/Track.h" #include "world/Road.h" +#include "world/Sweep.h" #include "world/RoadPoint.h" #include "world/Traction.h" #include "world/TractionPower.h" @@ -39,6 +40,7 @@ event_manager Events; memory_table Memory; path_table Paths; road_table Roads; +sweep_table Sweeps; junction_table Junctions; roadpoint_table Roadpoints; traction_table Traction; @@ -497,6 +499,10 @@ TAnimModel * state_manager::create_model(const std::string &src, const std::stri return m_serializer.create_model(src, name, position); } +std::vector state_manager::insert_trainset(std::string const &Name, TTrack *Path, double const Offset, std::string const &Vehicles, bool const Reversed) { + return m_serializer.insert_trainset(Name, Path, Offset, Vehicles, Reversed); +} + TEventLauncher * state_manager::create_eventlauncher(const std::string &src, const std::string &name, const glm::dvec3 &position) { return m_serializer.create_eventlauncher(src, name, position); } diff --git a/simulation/simulation.h b/simulation/simulation.h index 89337583e..0e96da68b 100644 --- a/simulation/simulation.h +++ b/simulation/simulation.h @@ -40,6 +40,9 @@ public: // create model from node string TAnimModel * create_model(const std::string &src, const std::string &name, const glm::dvec3 &position); + // places the vehicles, given as their node statements, as a trainset on the path. returns: the vehicles made + std::vector + insert_trainset(std::string const &Name, TTrack *Path, double const Offset, std::string const &Vehicles, bool const Reversed = false); // create eventlauncher from node string TEventLauncher * create_eventlauncher(const std::string &src, const std::string &name, const glm::dvec3 &position); @@ -86,6 +89,7 @@ extern event_manager Events; extern memory_table Memory; extern path_table Paths; extern road_table Roads; +extern sweep_table Sweeps; extern junction_table Junctions; extern roadpoint_table Roadpoints; extern traction_table Traction; diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index 8736e56de..fe5486e83 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -28,6 +28,7 @@ http://mozilla.org/MPL/2.0/. #include "rendering/lightarray.h" #include "world/TractionPower.h" #include "world/Road.h" +#include "world/Sweep.h" #include "world/RoadPoint.h" #include "application/application.h" #include "rendering/renderer.h" @@ -35,8 +36,19 @@ http://mozilla.org/MPL/2.0/. #include "utilities/utilities.h" #include "editor/editorTerrainStreamer.hpp" + namespace simulation { +namespace { + +double vehicle_length( std::string const &Folder, std::string const &Type ) { + + TMoverParameters probe( 0.0, Type, Type, 0 ); + return probe.LoadFIZ( paths::dynamic + Folder + "/" ) ? probe.Dim.L : 0.0; +} + +} // namespace + std::shared_ptr state_serializer::deserialize_begin( std::string const &Scenariofile ) { @@ -123,7 +135,8 @@ state_serializer::deserialize_begin( std::string const &Scenariofile ) { { "trainset", &state_serializer::deserialize_trainset }, { "terrain", &state_serializer::deserialize_terrain }, { "editorterrain", &state_serializer::deserialize_editorterrain }, - { "endtrainset", &state_serializer::deserialize_endtrainset } }; + { "endtrainset", &state_serializer::deserialize_endtrainset }, + { "reversed", &state_serializer::deserialize_reversed } }; for( auto &function : functionlist ) { state->functionmap.emplace( function.first, std::bind( function.second, this, std::ref( state->input ), std::ref( state->scratchpad ) ) ); @@ -191,6 +204,7 @@ state_serializer::deserialize_continue(std::shared_ptr state simulation::Roads.create_geometry( Scratchpad ); simulation::Junctions.create_geometry( Scratchpad ); simulation::Roadpoints.create_geometry(); + simulation::Sweeps.create_geometry( Scratchpad ); return false; } @@ -554,6 +568,20 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch road->create_lanes(); scene::Layers.track( road, { sourcebegin, Input.TokenEnd() } ); } + else if( nodedata.type == "sweep" ) { + + auto *sweep { new sweep_node( nodedata ) }; + sweep->import( + Input, + ( Scratchpad.location.offset.empty() ? + glm::dvec3 { 0.0 } : + glm::dvec3 { Scratchpad.location.offset.top() } ) ); + if( false == simulation::Sweeps.insert( sweep ) ) { + ErrorLog( "Bad scenario: duplicate sweep name \"" + sweep->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + } + scene::Groups.insert( scene::Groups.handle(), sweep ); + scene::Layers.track( sweep, { sourcebegin, Input.TokenEnd() } ); + } else if( nodedata.type == "junction" ) { auto *junction { new junction_node( nodedata ) }; @@ -1224,6 +1252,17 @@ include_terrain_file( std::string File, std::string &Includes, scene::scratch_da } // namespace +void +state_serializer::deserialize_reversed( cParser &Input, scene::scratch_data &Scratchpad ) { + + if( false == Scratchpad.trainset.is_open + || false == Scratchpad.trainset.vehicles.empty() ) { + ErrorLog( "Bad trainset: \"reversed\" has to follow the trainset header, ahead of its vehicles, in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() - 1 ) + ")" ); + return; + } + Scratchpad.trainset.reversed = true; +} + void state_serializer::deserialize_terrain(cParser &Input, scene::scratch_data &Scratchpad) { @@ -1312,9 +1351,16 @@ state_serializer::deserialize_endtrainset( cParser &Input, scene::scratch_data & } if( vehicleindex > 0 ) { // from second vehicle on couple it with the previous one - Scratchpad.trainset.vehicles[ vehicleindex - 1 ]->AttachNext( - vehicle, - Scratchpad.trainset.couplings[ vehicleindex - 1 ] ); + if( Scratchpad.trainset.reversed ) { + vehicle->AttachNext( + Scratchpad.trainset.vehicles[ vehicleindex - 1 ], + Scratchpad.trainset.couplings[ vehicleindex - 1 ] ); + } + else { + Scratchpad.trainset.vehicles[ vehicleindex - 1 ]->AttachNext( + vehicle, + Scratchpad.trainset.couplings[ vehicleindex - 1 ] ); + } } ++vehicleindex; } @@ -1494,7 +1540,7 @@ state_serializer::deserialize_dynamic( cParser &Input, scene::scratch_data &Scra loadtype = ""; } - auto *path = simulation::Paths.find( pathname ); + auto *path = Scratchpad.trainset.path != nullptr ? Scratchpad.trainset.path : simulation::Paths.find( pathname ); if( path == nullptr ) { ErrorLog( "Bad scenario: vehicle \"" + Nodedata.name + "\" placed on nonexistent path \"" + pathname + "\" in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); @@ -1502,7 +1548,9 @@ state_serializer::deserialize_dynamic( cParser &Input, scene::scratch_data &Scra return nullptr; } - if( true == Scratchpad.trainset.vehicles.empty() // jeśli pierwszy pojazd, + auto const reversedset { Scratchpad.trainset.is_open && Scratchpad.trainset.reversed }; + if( false == reversedset + && true == Scratchpad.trainset.vehicles.empty() // jeśli pierwszy pojazd, && false == path->m_events0.empty() // tor ma Event0 && std::abs(velocity) <= 1.f // a skład stoi && Scratchpad.trainset.offset >= 0.0 // ale może nie sięgać na owy tor @@ -1512,23 +1560,34 @@ state_serializer::deserialize_dynamic( cParser &Input, scene::scratch_data &Scra } auto *vehicle = new TDynamicObject(); - + + auto const gap { offset == -1.0 ? 0.0 : offset }; + auto const turned { ( offset == -1.0 ) != reversedset }; + auto const expected { reversedset ? vehicle_length( datafolder, mmdfile ) : 0.0 }; auto const length = vehicle->Init( Nodedata.name, datafolder, skinfile, mmdfile, path, - offset == -1.0 ? Scratchpad.trainset.offset : Scratchpad.trainset.offset - offset, + reversedset ? Scratchpad.trainset.offset + gap + expected : Scratchpad.trainset.offset - gap, drivertype, velocity, Scratchpad.trainset.name, loadcount, loadtype, - offset == -1.0, + turned, params ); + if( length != 0.0 && reversedset ) { + if( std::abs( length - expected ) > 0.01 ) { + vehicle->place_on_track( path, Scratchpad.trainset.offset + gap + length, turned ); + } + Scratchpad.trainset.offset += length; + } if( length != 0.0 ) { // zero oznacza błąd // przesunięcie dla kolejnego, minus bo idziemy w stronę punktu 1 - Scratchpad.trainset.offset -= length; + if( false == reversedset ) { + Scratchpad.trainset.offset -= length; + } // automatically establish permanent connections for couplers which specify them in their definitions if( coupling != 0 && vehicle->MoverParameters->Couplers[(offset == -1.0 ? end::front : end::rear)].AllowedFlag & coupling::permanent ) { @@ -1774,6 +1833,11 @@ state_serializer::export_nodes_to_stream(std::ostream &scmfile, bool Dirty) cons point->export_as_text( scmfile ); } } + for( auto const *sweep : Sweeps.sequence() ) { + if( sweep != nullptr && false == sweep->m_editorremoved && sweep->dirty() == Dirty && sweep->group() == null_handle ) { + sweep->export_as_text( scmfile ); + } + } // traction scmfile << "// traction\n"; for( auto const *traction : Traction.sequence() ) { @@ -1826,6 +1890,25 @@ TAnimModel *state_serializer::create_model(const std::string &src, const std::st return cloned; } +std::vector state_serializer::insert_trainset(std::string const &Name, TTrack *Path, double const Offset, std::string const &Vehicles, bool const Reversed) { + scene::scratch_data scratch; + scratch.trainset.is_open = true; + scratch.trainset.name = Name; + scratch.trainset.track = Path != nullptr ? Path->name() : std::string{}; + scratch.trainset.path = Path; + scratch.trainset.offset = static_cast(Offset); + scratch.trainset.reversed = Reversed; + cParser parser(Vehicles, cParser::buffer_TEXT, Global.asCurrentSceneryPath, Global.bLoadTraction); + auto token { parser.getToken() }; + while (false == token.empty()) { + if (token == "node") { deserialize_node(parser, scratch); } + token = parser.getToken(); + } + auto const vehicles { scratch.trainset.vehicles }; + if (false == vehicles.empty()) { deserialize_endtrainset(parser, scratch); } + return vehicles; +} + std::pair state_serializer::preview_include(std::string const &Directive, scene::layer_context const &Context, scene::layer_handle Layer, scene::instance_handle Instance) { // statements which take more than a single token, with the tokens ending them static std::unordered_map const nodeends { diff --git a/simulation/simulationstateserializer.h b/simulation/simulationstateserializer.h index 001f6ad3f..a5cbc32fa 100644 --- a/simulation/simulationstateserializer.h +++ b/simulation/simulationstateserializer.h @@ -44,6 +44,8 @@ public: export_as_text( std::string const &Scenariofile ) const; // create new model from node stirng TAnimModel * create_model(std::string const &src, std::string const &name, const glm::dvec3 &position); + // places the vehicles, given as their node statements, as a trainset on the path, while the simulation runs. returns: the vehicles made + std::vector insert_trainset(std::string const &Name, TTrack *Path, double const Offset, std::string const &Vehicles, bool const Reversed = false); // create new eventlauncher from node stirng TEventLauncher * create_eventlauncher(std::string const &src, std::string const &name, const glm::dvec3 &position); // creates model instances defined by an include directive placed or changed in the scenery editor, to show the outcome. @@ -80,6 +82,7 @@ private: void deserialize_terrain( cParser &Input, scene::scratch_data &Scratchpad ); void deserialize_editorterrain( cParser &Input, scene::scratch_data &Scratchpad ); void deserialize_endtrainset( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_reversed( cParser &Input, scene::scratch_data &Scratchpad ); TTrack * deserialize_path( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); TTraction * deserialize_traction( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); TTractionPowerSource * deserialize_tractionpowersource( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); diff --git a/utilities/Classes.h b/utilities/Classes.h index ec60965c2..6a5ca167e 100644 --- a/utilities/Classes.h +++ b/utilities/Classes.h @@ -45,6 +45,8 @@ struct light_array; class particle_manager; class road_node; // kawałek drogi, z którego powstają pasy ruchu class road_table; +class sweep_node; // model ułożony wzdłuż krzywej: wygięty albo powtarzany +class sweep_table; class junction_node; class junction_table; class roadpoint_node; // przejazd kolejowy albo miejsce, w którym pojazdy drogowe się pojawiają lub znikają diff --git a/utilities/Globals.h b/utilities/Globals.h index acf0c00f3..36574ab1c 100644 --- a/utilities/Globals.h +++ b/utilities/Globals.h @@ -84,6 +84,7 @@ struct global_settings { std::string szDefaultExt{ szTexturesDDS }; std::string SceneryFile; std::string local_start_vehicle{ "EU07-424" }; + std::string editor_enter_vehicle; // vehicle placed in the editor, to be entered when the driving goes on bool editor_session{ false }; // scenery was opened for editing (-edit): loader keeps track of scenery layers and hands over to the editor int iConvertModels{ 0 }; // tworzenie plików binarnych int iConvertIndexRange{ 1000 }; // range of duplicate vertex scan diff --git a/world/Event.cpp b/world/Event.cpp index 4e042b29d..fa752078b 100644 --- a/world/Event.cpp +++ b/world/Event.cpp @@ -1243,6 +1243,26 @@ multi_event::init() { } } +std::vector multi_event::children() const { + std::vector result; + for (auto const &childevent : m_children) { + if (std::get(childevent) != nullptr) { + result.push_back(std::get(childevent)); + } + } + return result; +} + +std::vector basic_event::target_nodes() const { + std::vector result; + for (auto const &target : m_targets) { + if (std::get(target) != nullptr) { + result.push_back(std::get(target)); + } + } + return result; +} + std::vector multi_event::dump_children_names() const { std::vector result; for (auto const &childevent : m_children) { diff --git a/world/Event.h b/world/Event.h index 9b8f32d84..69d66e3ca 100644 --- a/world/Event.h +++ b/world/Event.h @@ -47,6 +47,7 @@ public: // destructor virtual ~basic_event(); // methods + std::vector target_nodes() const; // restores event data from provided stream virtual void @@ -334,6 +335,7 @@ public: void init() override; std::vector dump_children_names() const; + std::vector children() const; private: // types @@ -699,6 +701,9 @@ public: // returns all eventlaunchers in radius ignoring height std::vector find_eventlaunchers(glm::vec2 center, float radius) const; + std::deque const & + sequence() const { + return m_events; } // all event launchers, global ones included std::vector launchers() const { diff --git a/world/Sweep.cpp b/world/Sweep.cpp new file mode 100644 index 000000000..ef3af81b5 --- /dev/null +++ b/world/Sweep.cpp @@ -0,0 +1,907 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "world/Sweep.h" +#include "editor/editorGauge.hpp" + +#include "model/MdlMngr.h" +#include "model/Model3d.h" +#include "rendering/renderer.h" +#include "scene/scene.h" +#include "simulation/simulation.h" +#include "utilities/Globals.h" +#include "utilities/Logs.h" +#include "utilities/parser.h" +#include "vehicle/DynObj.h" + +#include +#include + +#include +#include +#include +#include + +namespace +{ + +double const sample_spacing{0.5}; // m along the curve between the samples +std::size_t const vertex_limit{4000000}; // copies beyond this many vertices are left out +double const slice_width{1.0}; // m of the model, the faces of a bent copy are cut into +double const edge_band{0.3}; // m from the side facing the curve, where the top of the edge is looked for + +struct cubic +{ + glm::dvec3 p0, p1, p2, p3; + + explicit cubic(segment_data const &Piece) + { + p0 = Piece.points[segment_data::point::start]; + p3 = Piece.points[segment_data::point::end]; + auto const &control1{Piece.points[segment_data::point::control1]}; + auto const &control2{Piece.points[segment_data::point::control2]}; + if (control1 == glm::dvec3{} && control2 == glm::dvec3{}) + { + p1 = glm::mix(p0, p3, 1.0 / 3.0); + p2 = glm::mix(p0, p3, 2.0 / 3.0); + } + else + { + p1 = p0 + control1; + p2 = p3 + control2; + } + } + glm::dvec3 point(double const T) const + { + auto const u{1.0 - T}; + return u * u * u * p0 + 3.0 * u * u * T * p1 + 3.0 * u * T * T * p2 + T * T * T * p3; + } + glm::dvec3 first(double const T) const + { + auto const u{1.0 - T}; + return 3.0 * u * u * (p1 - p0) + 6.0 * u * T * (p2 - p1) + 3.0 * T * T * (p3 - p2); + } +}; + +double plan_distance(glm::dvec3 const &A, glm::dvec3 const &B) +{ + return glm::length(glm::dvec2{B.x - A.x, B.z - A.z}); +} + +// triangles of the model which share the look, in the space of the model +struct model_part +{ + material_handle material{null_handle}; + lighting_data lighting; + bool translucent{false}; + std::vector vertices; +}; + +void gather_parts(TSubModel *Submodel, glm::dmat4 const &Transform, material_data const &Skins, std::vector &Parts) +{ + for (auto *submodel = Submodel; submodel != nullptr; submodel = submodel->Next) + { + auto transform{Transform}; + if ((submodel->iFlags & 0xC000) != 0 && submodel->GetMatrix() != nullptr) + { + transform = Transform * glm::dmat4(glm::make_mat4(submodel->GetMatrix()->readArray())); + } + // the nearest level of detail only, the others would be drawn over it + if (submodel->eType == GL_TRIANGLES && submodel->fSquareMinDist <= 0.f && (submodel->m_geometry.handle.bank != 0 || submodel->m_geometry.handle.chunk != 0)) + { + auto material{submodel->m_material}; + if (material < 0) + { + material = Skins.replacable_skins[std::clamp(-material, 1, 4)]; + } + model_part part; + part.material = material; + part.lighting.ambient = submodel->f4Ambient; + part.lighting.diffuse = submodel->f4Diffuse; + part.lighting.specular = submodel->f4Specular; + part.translucent = material != null_handle && GfxRenderer->Material(material)->get_or_guess_opacity() == 0.0f; + auto const normals{glm::dmat3(transform)}; + auto const &vertices{GfxRenderer->Vertices(submodel->m_geometry.handle)}; + auto const &indices{GfxRenderer->Indices(submodel->m_geometry.handle)}; + auto const take = [&](gfx::basic_vertex const &Vertex) { + auto vertex{Vertex.to_world()}; + vertex.position = glm::dvec3(transform * glm::dvec4(vertex.position, 1.0)); + auto const normal{normals * glm::dvec3(vertex.normal)}; + vertex.normal = glm::length(normal) > 1e-9 ? glm::vec3(glm::normalize(normal)) : vertex.normal; + part.vertices.push_back(vertex); + }; + if (false == indices.empty()) + { + for (std::size_t i = 0; i + 2 < indices.size(); i += 3) + { + take(vertices[indices[i]]); + take(vertices[indices[i + 1]]); + take(vertices[indices[i + 2]]); + } + } + else + { + for (std::size_t i = 0; i + 2 < vertices.size(); i += 3) + { + take(vertices[i]); + take(vertices[i + 1]); + take(vertices[i + 2]); + } + } + if (false == part.vertices.empty()) + { + Parts.push_back(std::move(part)); + } + } + if (submodel->Child != nullptr) + { + gather_parts(submodel->Child, transform, Skins, Parts); + } + } +} + +world_vertex blend(world_vertex const &A, world_vertex const &B, double const T) +{ + world_vertex result; + result.position = glm::mix(A.position, B.position, T); + auto const normal{glm::mix(A.normal, B.normal, static_cast(T))}; + result.normal = glm::length(normal) > 1e-6f ? glm::normalize(normal) : A.normal; + result.texture = glm::mix(A.texture, B.texture, static_cast(T)); + return result; +} + +// the part of the polygon on one side of the plane Along = Cut: Side 1 keeps what's beyond it, -1 what's before it +std::vector clip(std::vector const &Polygon, std::function const &Along, double const Cut, double const Side) +{ + std::vector result; + for (std::size_t i = 0; i < Polygon.size(); ++i) + { + auto const ¤t{Polygon[i]}; + auto const &next{Polygon[(i + 1) % Polygon.size()]}; + auto const a{Side * (Along(current.position) - Cut)}; + auto const b{Side * (Along(next.position) - Cut)}; + if (a >= 0.0) + result.push_back(current); + if ((a >= 0.0) != (b >= 0.0)) + result.push_back(blend(current, next, a / (a - b))); + } + return result; +} + +// triangles cut across the axis of the model into slices, so a long face bends with the curve instead of spanning it straight +std::vector slices(std::vector const &Vertices, std::function const &Along, double const Low, double const Width) +{ + std::vector result; + result.reserve(Vertices.size()); + for (std::size_t i = 0; i + 2 < Vertices.size(); i += 3) + { + auto const a0{Along(Vertices[i].position)}; + auto const a1{Along(Vertices[i + 1].position)}; + auto const a2{Along(Vertices[i + 2].position)}; + auto const first{static_cast(std::floor((std::min({a0, a1, a2}) - Low) / Width))}; + auto const last{static_cast(std::ceil((std::max({a0, a1, a2}) - Low) / Width)) - 1}; + if (last <= first) + { + result.insert(result.end(), Vertices.begin() + i, Vertices.begin() + i + 3); + continue; + } + std::vector const triangle{Vertices[i], Vertices[i + 1], Vertices[i + 2]}; + for (int slice = first; slice <= last; ++slice) + { + auto const polygon{clip(clip(triangle, Along, Low + slice * Width, 1.0), Along, Low + (slice + 1) * Width, -1.0)}; + for (std::size_t k = 1; k + 1 < polygon.size(); ++k) + { + result.push_back(polygon[0]); + result.push_back(polygon[k]); + result.push_back(polygon[k + 1]); + } + } + } + return result; +} + +} // namespace + +// height of the head of the rail on the side of the offset over the points of the track, less the height of the rail; 0 for no side +double sweep_node::rail_head(double const Roll, double const Lateral) +{ + auto const roll{glm::radians(Roll)}; + auto const raise{Global.bRollFix ? 0.75 * std::abs(std::sin(roll)) : 0.0}; + if (Lateral == 0.0) + return raise; + return raise - (Lateral > 0.0 ? 1.0 : -1.0) * 0.75 * std::sin(roll); +} + +bool sweep_node::state::operator==(state const &Other) const +{ + if (model != Other.model || skin != Other.skin || bend != Other.bend || step != Other.step || from != Other.from || to != Other.to || lateral != Other.lateral || height != Other.height || along_x != Other.along_x || + flip != Other.flip || mirror != Other.mirror || tilt != Other.tilt || face != Other.face || widen != Other.widen || parameters != Other.parameters || side_anchor != Other.side_anchor || height_anchor != Other.height_anchor || pieces.size() != Other.pieces.size()) + { + return false; + } + for (std::size_t i = 0; i < pieces.size(); ++i) + { + if (pieces[i].points != Other.pieces[i].points || pieces[i].rolls != Other.pieces[i].rolls) + { + return false; + } + } + return true; +} + +sweep_node::sweep_node(scene::node_data const &Nodedata) : basic_node(Nodedata) {} + +void sweep_node::import(cParser &Input, glm::dvec3 const &Offset) +{ + m_state = state{}; + m_state.model = Input.getToken(); + m_state.skin = Input.getToken(); + auto token{Input.getToken()}; + while (false == token.empty() && token != "endsweep") + { + if (token == "mode") + { + m_state.bend = Input.getToken() != "repeat"; + } + else if (token == "step") + { + Input.getTokens(); + Input >> m_state.step; + } + else if (token == "range") + { + Input.getTokens(2); + Input >> m_state.from >> m_state.to; + } + else if (token == "offset") + { + Input.getTokens(2); + Input >> m_state.lateral >> m_state.height; + } + else if (token == "axis") + { + m_state.along_x = Input.getToken() == "x"; + } + else if (token == "flip") + { + m_state.flip = true; + } + else if (token == "mirror") + { + m_state.mirror = true; + } + else if (token == "tilt") + { + m_state.tilt = true; + } + else if (token == "widen") + { + m_state.widen = true; + } + else if (token == "noface") + { + m_state.face = false; + } + else if (token == "parameters") + { + int count{0}; + Input.getTokens(); + Input >> count; + m_state.parameters.clear(); + for (int i = 0; i < count; ++i) + m_state.parameters.push_back(Input.getToken(false)); + } + else if (token == "anchor") + { + auto const side{Input.getToken()}; + auto const height{Input.getToken()}; + m_state.side_anchor = side == "near" ? 1 : side == "far" ? 2 : side == "centre" ? 3 : 0; + m_state.height_anchor = height == "bottom" ? 1 : height == "top" ? 2 : height == "edge" ? 3 : 0; + } + else if (token == "piece") + { + segment_data piece; + piece.deserialize(Input, Offset); + m_state.pieces.push_back(piece); + } + else + { + ErrorLog("Bad sweep: unknown property \"" + token + "\" of \"" + m_name + "\" in file \"" + Input.Name() + "\""); + } + token = Input.getToken(); + } + rebuild_samples(); +} + +void sweep_node::define(state const &State) +{ + auto const shown{m_shapes.shown()}; + if (shown) + { + hide(); + } + m_state = State; + rebuild_samples(); + if (shown) + { + show(); + } +} + +void sweep_node::rebuild_samples() +{ + m_samples.clear(); + double station{0.0}; + for (auto const &piece : m_state.pieces) + { + cubic const curve{piece}; + auto const count{std::clamp(static_cast(plan_distance(curve.p0, curve.p3) / sample_spacing), 4, 4000)}; + for (int k = m_samples.empty() ? 0 : 1; k <= count; ++k) + { + auto const t{static_cast(k) / count}; + auto const position{curve.point(t)}; + if (false == m_samples.empty()) + { + station += plan_distance(m_samples.back().position, position); + } + auto tangent{curve.first(t)}; + tangent = glm::length(tangent) > 1e-9 ? glm::normalize(tangent) : glm::dvec3{0.0, 0.0, 1.0}; + m_samples.push_back({station, position, tangent, piece.rolls[0] + (piece.rolls[1] - piece.rolls[0]) * t, {}, {}}); + } + } + if (m_samples.size() > 2) + { + // the structure gauge widens ahead of the curves and of the cant, the same way the gauge check of the editor has it + std::vector chainage, curvature, cant; + for (std::size_t i = 0; i < m_samples.size(); ++i) + { + auto const &before{m_samples[i == 0 ? 0 : i - 1]}; + auto const &after{m_samples[std::min(i + 1, m_samples.size() - 1)]}; + glm::dvec2 const a{before.tangent.x, before.tangent.z}; + glm::dvec2 const b{after.tangent.x, after.tangent.z}; + auto const span{after.station - before.station}; + auto const turn{glm::length(a) > 1e-9 && glm::length(b) > 1e-9 ? std::atan2(a.x * b.y - a.y * b.x, glm::dot(a, b)) : 0.0}; + chainage.push_back(m_samples[i].station); + curvature.push_back(span > 1e-9 ? turn / span : 0.0); + cant.push_back(1.5 * std::abs(std::sin(glm::radians(m_samples[i].roll)))); + } + auto const sections{gauge::sections(gauge::kind::unified, chainage, curvature, cant)}; + for (std::size_t i = 0; i < m_samples.size() && i < sections.size(); ++i) + { + m_samples[i].widening = sections[i].lower; + m_samples[i].cant = sections[i].cant; + } + } + if (false == m_samples.empty()) + { + location(frame_at(0.5 * length()).position); + } + m_area.radius = -1.f; +} + +double sweep_node::length() const +{ + return m_samples.empty() ? 0.0 : m_samples.back().station; +} + +double sweep_node::start() const +{ + return std::clamp(m_state.from, 0.0, length()); +} + +double sweep_node::end() const +{ + return m_state.to < 0.0 ? length() : std::clamp(m_state.to, start(), length()); +} + +sweep_node::frame sweep_node::frame_at(double const Station) const +{ + frame result; + if (m_samples.empty()) + { + return result; + } + auto const found{std::upper_bound(m_samples.begin(), m_samples.end(), Station, [](double const Value, sample const &Sample) { return Value < Sample.station; })}; + auto const after{found == m_samples.end() ? std::prev(found) : found}; + auto const before{after == m_samples.begin() ? after : std::prev(after)}; + auto const span{after->station - before->station}; + auto const f{span > 1e-9 ? std::clamp((Station - before->station) / span, 0.0, 1.0) : 0.0}; + result.position = glm::mix(before->position, after->position, f); + // beyond the ends the curve goes on straight + if (Station < m_samples.front().station) + { + result.position = m_samples.front().position + m_samples.front().tangent * (Station - m_samples.front().station); + } + else if (Station > m_samples.back().station) + { + result.position = m_samples.back().position + m_samples.back().tangent * (Station - m_samples.back().station); + } + auto forward{glm::mix(before->tangent, after->tangent, f)}; + forward = glm::length(forward) > 1e-9 ? glm::normalize(forward) : glm::dvec3{0.0, 0.0, 1.0}; + glm::dvec3 left{-forward.z, 0.0, forward.x}; + left = glm::length(left) > 1e-9 ? glm::normalize(left) : glm::dvec3{-1.0, 0.0, 0.0}; + glm::dvec3 up{glm::normalize(glm::cross(left, forward))}; + result.roll = before->roll + (after->roll - before->roll) * f; + for (int side = 0; side < 2; ++side) + { + result.widening[side] = before->widening[side] + (after->widening[side] - before->widening[side]) * f; + result.cant[side] = before->cant[side] + (after->cant[side] - before->cant[side]) * f; + } + if (m_state.tilt) + { + auto const roll{glm::radians(result.roll)}; + auto const turnedleft{left * std::cos(roll) - up * std::sin(roll)}; + up = up * std::cos(roll) + left * std::sin(roll); + left = turnedleft; + } + result.forward = forward; + result.left = left; + result.up = up; + return result; +} + +// models a template is made of, with their placement in the space of the template +std::vector sweep_node::items() const +{ + std::vector result; + auto const &definition{m_state}; + auto const ends = [](std::string const &Name, std::string const &Extension) { return Name.size() >= Extension.size() && Name.compare(Name.size() - Extension.size(), Extension.size(), Extension) == 0; }; + auto name{definition.model}; + std::transform(name.begin(), name.end(), name.begin(), [](unsigned char const Character) { return static_cast(std::tolower(Character)); }); + if (false == ends(name, ".inc")) + { + item single; + single.model = TModelsManager::GetModel(definition.model, false, false); + if (false == definition.skin.empty() && definition.skin != "none") + single.skins.assign(definition.skin); + if (single.model != nullptr) + result.push_back(single); + return result; + } + cParser parser(definition.model, cParser::buffer_FILE, Global.asCurrentSceneryPath, Global.bLoadTraction, definition.parameters); + std::vector offsets{glm::dvec3{0.0}}; + glm::dvec3 rotation{0.0}; + auto token{parser.getToken()}; + while (false == token.empty()) + { + if (token == "origin") + { + glm::dvec3 offset; + parser.getTokens(3); + parser >> offset.x >> offset.y >> offset.z; + offsets.push_back(offsets.back() + offset); + } + else if (token == "endorigin") + { + if (offsets.size() > 1) + offsets.pop_back(); + } + else if (token == "rotate") + { + parser.getTokens(3); + parser >> rotation.x >> rotation.y >> rotation.z; + } + else if (token == "node") + { + double rangemax, rangemin; + std::string nodename, type; + parser.getTokens(4); + parser >> rangemax >> rangemin >> nodename >> type; + if (type == "model") + { + glm::dvec3 location; + double yaw; + parser.getTokens(4); + parser >> location.x >> location.y >> location.z >> yaw; + auto const model{parser.getToken()}; + auto const skin{parser.getToken()}; + auto rest{parser.getToken()}; + while (false == rest.empty() && rest != "endmodel") + rest = parser.getToken(); + item entry; + entry.model = TModelsManager::GetModel(model, false, false); + if (skin != "none" && false == skin.empty() && skin.front() != '*') + entry.skins.assign(skin); + // placed the way the scenery places a model in an origin turned by a rotate statement + auto const place{glm::rotateY(location, glm::radians(rotation.y)) + offsets.back()}; + glm::dmat4 transform{glm::translate(glm::dmat4(1.0), place)}; + transform = glm::rotate(transform, glm::radians(rotation.y + yaw), glm::dvec3{0.0, 1.0, 0.0}); + transform = glm::rotate(transform, glm::radians(rotation.x), glm::dvec3{1.0, 0.0, 0.0}); + transform = glm::rotate(transform, glm::radians(rotation.z), glm::dvec3{0.0, 0.0, 1.0}); + entry.transform = transform; + if (entry.model != nullptr && rangemin >= 0.0) + result.push_back(entry); + } + else + { + // whatever else the template defines isn't laid along the curve + auto rest{parser.getToken()}; + while (false == rest.empty() && rest != "end" + type && rest != "end" && rest != "endtri" && rest != "endline") + rest = parser.getToken(); + } + } + token = parser.getToken(); + } + return result; +} + +double sweep_node::project(glm::dvec3 const &Point, double &Lateral) const +{ + double best{std::numeric_limits::max()}; + double station{0.0}; + Lateral = 0.0; + glm::dvec2 const point{Point.x, Point.z}; + for (std::size_t i = 1; i < m_samples.size(); ++i) + { + glm::dvec2 const a{m_samples[i - 1].position.x, m_samples[i - 1].position.z}; + glm::dvec2 const b{m_samples[i].position.x, m_samples[i].position.z}; + auto const ab{b - a}; + auto const length2{glm::dot(ab, ab)}; + if (length2 < 1e-12) + continue; + auto const t{std::clamp(glm::dot(point - a, ab) / length2, 0.0, 1.0)}; + auto const distance{glm::length(point - (a + ab * t))}; + if (distance < best) + { + best = distance; + station = m_samples[i - 1].station + (m_samples[i].station - m_samples[i - 1].station) * t; + auto const side{ab.x * (point - a).y - ab.y * (point - a).x}; + Lateral = side >= 0.0 ? distance : -distance; + } + } + return station; +} + +double sweep_node::model_length() const +{ + auto const pieces{items()}; + double low{std::numeric_limits::max()}, high{-std::numeric_limits::max()}; + for (auto const &entry : pieces) + { + std::vector parts; + gather_parts(entry.model->Root, entry.transform, entry.skins, parts); + for (auto const &part : parts) + for (auto const &vertex : part.vertices) + { + auto const along{m_state.along_x ? vertex.position.x : vertex.position.z}; + low = std::min(low, along); + high = std::max(high, along); + } + } + return high > low ? high - low : 0.0; +} + +std::vector sweep_node::create_shapes() const +{ + std::vector shapes; + auto const &definition{m_state}; + if (m_samples.size() < 2) + return shapes; + // the parts of each model of the template, and where the model stands in the template + struct piece + { + std::vector parts; + glm::dvec3 origin{0.0}; + glm::dvec3 low{std::numeric_limits::max()}; + glm::dvec3 high{-std::numeric_limits::max()}; + bool bent{false}; + }; + std::vector pieces; + for (auto const &entry : items()) + { + piece model; + gather_parts(entry.model->Root, entry.transform, entry.skins, model.parts); + model.origin = glm::dvec3(entry.transform[3]); + if (false == model.parts.empty()) + pieces.push_back(std::move(model)); + } + if (pieces.empty()) + return shapes; + // the side of the model facing the curve is the one its lateral axis points away from: -x, or -z for a model laid along x + auto const needsflip{definition.along_x ? definition.lateral < 0.0 : definition.lateral > 0.0}; + auto const flip{definition.flip != (definition.face && needsflip)}; + // the model's own axes: along the curve, sideways (+ to the right of it), and up + auto const axes = [&](glm::dvec3 const &Vector) { + glm::dvec3 result{definition.along_x ? Vector.x : Vector.z, definition.along_x ? Vector.z : -Vector.x, Vector.y}; + if (flip) + { + result.x = -result.x; + result.y = -result.y; + } + if (definition.mirror) + { + result.y = -result.y; + } + return result; + }; + glm::dvec3 low{std::numeric_limits::max()}, high{-std::numeric_limits::max()}; + for (auto &model : pieces) + { + for (auto const &part : model.parts) + for (auto const &vertex : part.vertices) + { + auto const local{axes(vertex.position)}; + model.low = glm::min(model.low, local); + model.high = glm::max(model.high, local); + } + low = glm::min(low, model.low); + high = glm::max(high, model.high); + } + // the long models of a template follow the curve, the others stand at their places along it + for (auto &model : pieces) + model.bent = definition.bend && (pieces.size() == 1 || model.high.x - model.low.x >= 0.5 * (high.x - low.x)); + // what's bent sets the length of a copy, its sides and its top; the rest only goes along with it + if (std::any_of(pieces.begin(), pieces.end(), [](piece const &Model) { return Model.bent; })) + { + low = glm::dvec3{std::numeric_limits::max()}; + high = glm::dvec3{-std::numeric_limits::max()}; + for (auto const &model : pieces) + if (model.bent) + { + low = glm::min(low, model.low); + high = glm::max(high, model.high); + } + } + auto const own{high.x - low.x}; + // the point of the model the offset puts at its place, sideways and up + auto const nearside{definition.lateral >= 0.0 ? low.y : high.y}; + auto const farside{definition.lateral >= 0.0 ? high.y : low.y}; + double edgetop{-std::numeric_limits::max()}; + for (auto const &model : pieces) + if (model.bent || false == definition.bend) + for (auto const &part : model.parts) + for (auto const &vertex : part.vertices) + { + auto const local{axes(vertex.position)}; + if (std::abs(local.y - nearside) <= edge_band) + edgetop = std::max(edgetop, local.z); + } + if (edgetop == -std::numeric_limits::max()) + edgetop = high.z; + glm::dvec3 const anchor_shift{0.0, + definition.side_anchor == 1 ? -nearside : definition.side_anchor == 2 ? -farside : definition.side_anchor == 3 ? -0.5 * (low.y + high.y) : 0.0, + definition.height_anchor == 1 ? -low.z : definition.height_anchor == 2 ? -high.z : definition.height_anchor == 3 ? -edgetop : 0.0}; + auto const from{start()}; + auto const to{end()}; + auto const stretch{to - from}; + if (own < 1e-3 || stretch < 1e-3) + return shapes; + if (definition.bend) + { + auto const along = [&](glm::dvec3 const &Position) { return axes(Position).x; }; + for (auto &model : pieces) + if (model.bent) + for (auto &part : model.parts) + part.vertices = slices(part.vertices, along, low.x, slice_width); + } + auto const copy_length{definition.step > 0.01 ? definition.step : own}; + // copies end to end fill the stretch exactly, each one squeezed or stretched a bit; repeated ones go at even steps + auto const copies{definition.bend ? std::max(1, static_cast(std::round(stretch / copy_length))) : static_cast(std::floor(stretch / copy_length + 1e-6)) + 1}; + auto const spacing{definition.bend ? stretch / copies : copy_length}; + auto const scale{definition.bend ? spacing / own : 1.0}; + std::size_t percopy{0}; + for (auto const &model : pieces) + for (auto const &part : model.parts) + percopy += part.vertices.size(); + auto const limit{std::max(1, vertex_limit / std::max(1, percopy))}; + if (static_cast(copies) > limit) + ErrorLog("Bad sweep: \"" + m_name + "\" would make " + std::to_string(copies) + " copies of \"" + definition.model + "\", only " + std::to_string(limit) + " are made"); + auto const count{std::min(copies, limit)}; + struct batch + { + material_handle material; + lighting_data lighting; + bool translucent; + std::vector vertices; + }; + std::vector batches; + auto const target = [&](model_part const &Part) -> std::vector & { + for (auto &entry : batches) + if (entry.material == Part.material && entry.lighting == Part.lighting && entry.translucent == Part.translucent) + return entry.vertices; + batches.push_back({Part.material, Part.lighting, Part.translucent, {}}); + return batches.back().vertices; + }; + // set back by the widening of the gauge: from the radius, and on the inner side of a canted curve by the lean of the cars + // at the height of the edge + auto const side{definition.lateral >= 0.0 ? 1 : 0}; + auto const edgeheight{std::max(0.0, definition.height - gauge::rail_height)}; + auto const setback = [&](frame const &At) { + if (false == definition.widen) + return 0.0; + auto const widening{At.widening[side] + std::max(0.0, At.cant[side]) * edgeheight / 1.5}; + return definition.lateral >= 0.0 ? widening : -widening; + }; + // heights are given from the head of the rail on the side of the copies. the cant turns the track about its inner rail when the + // simulation raises it for the cant, about the axis otherwise; a copy which leans with the cant goes up with the axis + auto const cone = [&](frame const &At) { return rail_head(At.roll, definition.tilt ? 0.0 : definition.lateral); }; + auto const upright = [](frame At) { + glm::dvec3 forward{At.forward.x, 0.0, At.forward.z}; + forward = glm::length(forward) > 1e-9 ? glm::normalize(forward) : glm::dvec3{0.0, 0.0, 1.0}; + At.forward = forward; + At.left = glm::dvec3{-forward.z, 0.0, forward.x}; + At.up = glm::dvec3{0.0, 1.0, 0.0}; + return At; + }; + glm::dvec3 const offset{0.0, definition.height, 0.0}; + for (std::size_t copy = 0; copy < count; ++copy) + { + auto const base{from + spacing * static_cast(copy)}; + for (auto const &model : pieces) + { + // a model which doesn't bend stands upright at its point: the place of its origin along the curve + auto const anchor{axes(model.origin) + anchor_shift}; + auto const stand{upright(frame_at(definition.bend ? base + (anchor.x - low.x) * scale : base))}; + for (auto const &part : model.parts) + { + auto &vertices{target(part)}; + auto const first{vertices.size()}; + for (auto const &vertex : part.vertices) + { + auto const local{axes(vertex.position) + anchor_shift}; + auto const direction{axes(glm::dvec3(vertex.normal))}; + world_vertex placed{vertex}; + if (model.bent) + { + auto const at{frame_at(base + (local.x - low.x) * scale)}; + placed.position = at.position + at.left * (local.y + definition.lateral + setback(at)) + at.up * local.z + offset + glm::dvec3{0.0, cone(at), 0.0}; + placed.normal = glm::vec3(glm::normalize(at.forward * direction.x + at.left * direction.y + at.up * direction.z)); + } + else + { + auto const along{definition.bend ? local.x - anchor.x : local.x}; + placed.position = stand.position + stand.forward * along + stand.left * (local.y + definition.lateral + setback(stand)) + stand.up * local.z + offset + glm::dvec3{0.0, cone(stand), 0.0}; + placed.normal = glm::vec3(glm::normalize(stand.forward * direction.x + stand.left * direction.y + stand.up * direction.z)); + } + vertices.push_back(placed); + } + if (definition.mirror) + { + // a mirror image turns the triangles inside out + for (auto i = first; i + 2 < vertices.size(); i += 3) + std::swap(vertices[i + 1], vertices[i + 2]); + } + } + } + } + for (auto &entry : batches) + { + if (entry.vertices.empty()) + continue; + scene::shape_node shape; + shape.make_terrain(entry.material, std::move(entry.vertices), glm::dvec3{0.0}); + shape.lighting(entry.lighting); + shape.translucent(entry.translucent); + shapes.emplace_back(std::move(shape)); + } + return shapes; +} + +void sweep_node::show() +{ + if (m_merged || m_shapes.shown() || m_editorremoved) + { + return; + } + m_shapes.show(create_shapes(), location()); +} + +void sweep_node::hide() +{ + m_shapes.hide(); +} + +float sweep_node::radius_() +{ + return static_cast(0.5 * length() + std::abs(m_state.lateral) + 25.0); +} + +void sweep_node::serialize_(std::ostream &Output) const +{ + // TODO: implement +} + +void sweep_node::deserialize_(std::istream &Input) +{ + // TODO: implement +} + +void sweep_node::export_as_text_(std::ostream &Output) const +{ + auto const &sweep{m_state}; + Output << "sweep " << sweep.model << ' ' << (sweep.skin.empty() ? std::string{"none"} : sweep.skin) << ' '; + Output << "mode " << (sweep.bend ? "bend" : "repeat") << ' '; + if (sweep.step > 0.0) + { + Output << "step " << sweep.step << ' '; + } + if (sweep.from > 0.0 || sweep.to >= 0.0) + { + Output << "range " << sweep.from << ' ' << sweep.to << ' '; + } + if (sweep.lateral != 0.0 || sweep.height != 0.0) + { + Output << "offset " << sweep.lateral << ' ' << sweep.height << ' '; + } + if (sweep.along_x) + { + Output << "axis x "; + } + if (sweep.flip) + { + Output << "flip "; + } + if (sweep.mirror) + { + Output << "mirror "; + } + if (sweep.tilt) + { + Output << "tilt "; + } + if (false == sweep.face) + { + Output << "noface "; + } + if (sweep.widen) + { + Output << "widen "; + } + if (false == sweep.parameters.empty()) + { + Output << "parameters " << sweep.parameters.size() << ' '; + for (auto const ¶meter : sweep.parameters) + Output << (parameter.empty() ? std::string{"none"} : parameter) << ' '; + } + if (sweep.side_anchor != 0 || sweep.height_anchor != 0) + { + char const *sides[] = {"origin", "near", "far", "centre"}; + char const *heights[] = {"origin", "bottom", "top", "edge"}; + Output << "anchor " << sides[std::clamp(sweep.side_anchor, 0, 3)] << ' ' << heights[std::clamp(sweep.height_anchor, 0, 3)] << ' '; + } + auto const precision{Output.precision(std::numeric_limits::digits10)}; + for (auto const &piece : sweep.pieces) + { + auto const &start{piece.points[segment_data::point::start]}; + auto const &control1{piece.points[segment_data::point::control1]}; + auto const &control2{piece.points[segment_data::point::control2]}; + auto const &end{piece.points[segment_data::point::end]}; + Output << "\npiece " << start.x << ' ' << start.y << ' ' << start.z << ' ' << piece.rolls[0] << ' ' << control1.x << ' ' << control1.y << ' ' << control1.z << ' ' << control2.x << ' ' << control2.y << ' ' << control2.z << ' ' + << end.x << ' ' << end.y << ' ' << end.z << ' ' << piece.rolls[1] << ' ' << piece.radius; + } + Output.precision(precision); + Output << "\nendsweep\n"; +} + +void sweep_table::create_geometry(scene::scratch_data &Scratchpad) +{ + if (simulation::Region == nullptr) + { + return; + } + for (auto *sweep : m_items) + { + if (sweep == nullptr) + { + continue; + } + if (Global.editor_session && false == Global.NvRenderer) + { + // scenery opened for editing: the copies are kept apart, so they can be changed later + sweep->show(); + continue; + } + for (auto &shape : sweep->create_shapes()) + { + simulation::Region->insert(shape, Scratchpad, false); + } + sweep->merged(true); + } +} diff --git a/world/Sweep.h b/world/Sweep.h new file mode 100644 index 000000000..7da708d78 --- /dev/null +++ b/world/Sweep.h @@ -0,0 +1,158 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include +#include + +#include + +#include "utilities/Classes.h" +#include "utilities/Names.h" +#include "scene/scenenode.h" +#include "world/Road.h" +#include "world/Segment.h" +#include "vehicle/DynObj.h" + +namespace scene +{ +struct scratch_data; +} + +// a model laid along a curve: copies of it bent to follow the curve end to end, or set along it at even steps. +// the node isn't drawn itself, it makes ordinary shapes of the copies, so the renderers deal with it as with the rest +// of the scenery. animations, lights and other submodels which aren't plain triangles are left out of the copies. +// scenery entry: +// node sweep [ ]... piece ... endsweep +// properties: mode , step , +// range (m along the curve, to below 0: up to its end), offset , +// anchor (what of the model the offset puts there: sideways its origin, its side +// facing the curve, the other side or its middle; up its origin, its bottom or its top), +// axis (axis of the model laid along the curve), flip (the model goes the other way), mirror (its sides swapped), +// widen (the offset grows by the widening of the structure gauge in the curves, the way the platforms are set back), +// noface (the model isn't turned to have its -x side, or -z for one laid along x, facing the curve), +// parameters ... (of a template: the model can be an *.inc file, its long models are bent, the others stand +// upright at their places along the curve), +// anchor sides: origin, near, far, centre; heights: origin, bottom, top, edge (the top of the side facing the curve), +// tilt (bent copies lean with the cant of the curve; otherwise they stay upright, as the platforms and the walls by a track do, +// at the height the plane of the cant has at their sideways offset) +class sweep_node : public scene::basic_node +{ + + public: + struct state + { + std::string model; + std::string skin{"none"}; + bool bend{true}; + double step{0.0}; + double from{0.0}; + double to{-1.0}; + double lateral{0.0}; + double height{0.0}; + bool along_x{false}; + bool flip{false}; + bool mirror{false}; + bool tilt{false}; + bool face{true}; // the model is turned so its -x side (-z for a model laid along x) faces the curve + bool widen{false}; // moved away from the curve by the widening of the structure gauge in the curves + std::vector parameters; // of a template (*.inc) laid along the curve + int side_anchor{0}; // 0: origin, 1: the side facing the curve, 2: the far side, 3: the middle + int height_anchor{0}; // 0: origin, 1: bottom, 2: top, 3: top of the side facing the curve + std::vector pieces; + + bool operator==(state const &Other) const; + }; + // point of the curve, with the directions the copies are laid out by + struct frame + { + glm::dvec3 position{0.0}; + glm::dvec3 forward{0.0, 0.0, 1.0}; + glm::dvec3 left{-1.0, 0.0, 0.0}; + glm::dvec3 up{0.0, 1.0, 0.0}; + double roll{0.0}; // degrees, of the curve there + std::array widening{}; // of the structure gauge, below the platforms: right and left side, metres + std::array cant{}; // metres, positive on the inner side of the curve + }; + + explicit sweep_node(scene::node_data const &Nodedata); + + void import(cParser &Input, glm::dvec3 const &Offset); + void define(state const &State); + state const &definition() const + { + return m_state; + } + // length of the curve, in the plan + double length() const; + frame frame_at(double const Station) const; + // station of the point of the curve nearest to the point in the plan, and how far to the right of the curve it is + double project(glm::dvec3 const &Point, double &Lateral) const; + // stretch of the curve the copies take + double start() const; + double end() const; + // length of a copy along the curve, as the model has it + double model_length() const; + std::vector create_shapes() const; + // a model of what's laid along the curve, placed in its space + struct item + { + TModel3d *model{nullptr}; + material_data skins; + glm::dmat4 transform{1.0}; + }; + std::vector items() const; + // height of the head of the rail on the side of the offset over the points of the track, less the height of the rail + static double rail_head(double const Roll, double const Lateral); + // puts the copies in the scene as shapes of their own, which can be taken back + void show(); + void hide(); + void merged(bool const Merged) + { + m_merged = Merged; + } + bool merged() const + { + return m_merged; + } + + bool m_editorremoved{false}; + + private: + void rebuild_samples(); + float radius_() override; + void serialize_(std::ostream &Output) const override; + void deserialize_(std::istream &Input) override; + void export_as_text_(std::ostream &Output) const override; + + struct sample + { + double station; + glm::dvec3 position; + glm::dvec3 tangent; + double roll; // degrees + std::array widening; + std::array cant; + }; + state m_state; + std::vector m_samples; + bool m_merged{false}; + owned_shapes m_shapes; +}; + +// collection of the models laid along curves present in the scene +class sweep_table : public basic_table +{ + + public: + // generates geometry of the copies and puts it in the scene + void create_geometry(scene::scratch_data &Scratchpad); +}; From 0a3cd55e59210f7e58f2e7b80be2cb30398ec712 Mon Sep 17 00:00:00 2001 From: maj00r Date: Tue, 6 Oct 2026 22:19:40 +0200 Subject: [PATCH 142/430] feat(launcher): -edit without a scenery opens the wizard of a new scenery: file name, title and centre, picked on the OpenStreetMap map of geoportal.gov.pl in PUWG 1992 or given in degrees; the scenery is written with the centre as its //$g reference and opened in the editor; a bare -edit no longer loads the scenery of eu07.ini --- CMakeLists.txt | 1 + application/application.cpp | 16 +- editor/editorOrthophoto.cpp | 11 + editor/editorOrthophoto.hpp | 2 + launcher/launcheruilayer.cpp | 7 +- launcher/launcheruilayer.h | 2 + launcher/scenery_wizard.cpp | 382 +++++++++++++++++++++++++++++++++++ launcher/scenery_wizard.h | 70 +++++++ 8 files changed, 486 insertions(+), 5 deletions(-) create mode 100644 launcher/scenery_wizard.cpp create mode 100644 launcher/scenery_wizard.h diff --git a/CMakeLists.txt b/CMakeLists.txt index e2fa3abde..090e6050b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -259,6 +259,7 @@ set(SOURCES "launcher/keymapper.cpp" "launcher/textures_scanner.cpp" "launcher/scenery_scanner.cpp" +"launcher/scenery_wizard.cpp" "vr/vr_interface.cpp" ) diff --git a/application/application.cpp b/application/application.cpp index db77c976f..13fa86204 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -1126,6 +1126,8 @@ int eu07_application::init_settings(int Argc, char *Argv[]) } // process command line arguments + bool sceneryfromcommandline{false}; + bool editwithoutscenery{false}; for (int i = 1; i < Argc; ++i) { @@ -1136,6 +1138,7 @@ int eu07_application::init_settings(int Argc, char *Argv[]) if (i + 1 < Argc) { Global.SceneryFile = ToLower(Argv[++i]); + sceneryfromcommandline = true; } } else if (token == "-v") @@ -1148,12 +1151,15 @@ int eu07_application::init_settings(int Argc, char *Argv[]) else if (token == "-edit") { // edit session: the scenery is loaded without player vehicle, straight into the editor - if (i + 1 < Argc) + Global.editor_session = true; + Global.local_start_vehicle = "ghostview"; + if (i + 1 < Argc && Argv[i + 1][0] != '-') { Global.SceneryFile = ToLower(Argv[++i]); - Global.local_start_vehicle = "ghostview"; - Global.editor_session = true; + sceneryfromcommandline = true; } + else + editwithoutscenery = true; } else if (token == "-seed") { @@ -1169,11 +1175,13 @@ int eu07_application::init_settings(int Argc, char *Argv[]) { std::cout << "usage: " << std::string(Argv[0]) << " [-s sceneryfilepath]" << " [-v vehiclename]" - << " [-edit sceneryfilepath]" + << " [-edit [sceneryfilepath]]" << " [-seed number|word]" << std::endl; return -1; } } + if (editwithoutscenery && false == sceneryfromcommandline) + Global.SceneryFile.clear(); return 0; } diff --git a/editor/editorOrthophoto.cpp b/editor/editorOrthophoto.cpp index 935fd825c..26bbb6463 100644 --- a/editor/editorOrthophoto.cpp +++ b/editor/editorOrthophoto.cpp @@ -256,6 +256,17 @@ bool http_client::get(std::string const &, std::vector &Out, std:: #endif +} // namespace + +bool editor_http_get(std::string const &Url, std::vector &Out, std::string &Error) +{ + thread_local http_client client; + return client.get(Url, Out, Error, []() { return false; }); +} + +namespace +{ + // --------------------------------------------------------------------------------------------- // geoportal requests and the disk cache diff --git a/editor/editorOrthophoto.hpp b/editor/editorOrthophoto.hpp index cfaf925a6..a2e5b761d 100644 --- a/editor/editorOrthophoto.hpp +++ b/editor/editorOrthophoto.hpp @@ -27,6 +27,8 @@ http://mozilla.org/MPL/2.0/. #include "utilities/Classes.h" // material_handle #include "rendering/geometrybank.h" // gfx::geometry_handle +bool editor_http_get(std::string const &Url, std::vector &Out, std::string &Error); + namespace scene { class basic_region; diff --git a/launcher/launcheruilayer.cpp b/launcher/launcheruilayer.cpp index 91974bbc7..45baccb04 100644 --- a/launcher/launcheruilayer.cpp +++ b/launcher/launcheruilayer.cpp @@ -11,8 +11,9 @@ launcher_ui::launcher_ui() : m_scenery_scanner(m_vehicles_bank), m_scenerylist_p add_external_panel(&m_scenerylist_panel); add_external_panel(&m_keymapper_panel); add_external_panel(&m_vehiclepicker_panel); + add_external_panel(&m_scenerywizard_panel); - open_panel(&m_scenerylist_panel); + open_panel(Global.editor_session ? static_cast(&m_scenerywizard_panel) : &m_scenerylist_panel); m_suppress_menu = true; } @@ -50,6 +51,9 @@ void launcher_ui::render_() if (ImGui::Button(STR_C("Keymapper"), topbar_button_size)) open_panel(&m_keymapper_panel); ImGui::SameLine(); + if (ImGui::Button(STR_C("New scenery"), topbar_button_size)) + open_panel(&m_scenerywizard_panel); + ImGui::SameLine(); if (ImGui::Button(STR_C("Quit"), topbar_button_size)) Application.queue_quit(false); } @@ -61,6 +65,7 @@ void launcher_ui::close_panels() m_scenerylist_panel.is_open = false; m_vehiclepicker_panel.is_open = false; m_keymapper_panel.is_open = false; + m_scenerywizard_panel.is_open = false; } void launcher_ui::open_panel(ui_panel* panel) diff --git a/launcher/launcheruilayer.h b/launcher/launcheruilayer.h index 91e36bbd6..6c9cb9376 100644 --- a/launcher/launcheruilayer.h +++ b/launcher/launcheruilayer.h @@ -15,6 +15,7 @@ http://mozilla.org/MPL/2.0/. #include "launcher/vehicle_picker.h" #include "launcher/textures_scanner.h" #include "launcher/scenery_scanner.h" +#include "launcher/scenery_wizard.h" class launcher_ui : public ui_layer { public: @@ -33,6 +34,7 @@ private: ui::scenerylist_panel m_scenerylist_panel; ui::keymapper_panel m_keymapper_panel; ui::vehiclepicker_panel m_vehiclepicker_panel; + ui::scenerywizard_panel m_scenerywizard_panel; ui_panel *m_current_panel; }; diff --git a/launcher/scenery_wizard.cpp b/launcher/scenery_wizard.cpp new file mode 100644 index 000000000..a6c96520f --- /dev/null +++ b/launcher/scenery_wizard.cpp @@ -0,0 +1,382 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "launcher/scenery_wizard.h" +#include "application/application.h" +#include "editor/editorFormat.hpp" +#include "editor/editorOrthophoto.hpp" +#include "utilities/Globals.h" +#include "utilities/Logs.h" +#include "utilities/translation.h" + +#include "stb/stb_image.h" +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +namespace +{ + +double constexpr kSemiMajor{6378137.0}; +double constexpr kFlattening{1.0 / 298.257222101}; +double constexpr kScale{0.9993}; +double constexpr kFalseEasting{500000.0}; +double constexpr kFalseNorthing{-5300000.0}; +double constexpr kCentralMeridian{19.0}; +glm::dvec2 const kPolandLow{140000.0, 120000.0}; +glm::dvec2 const kPolandHigh{890000.0, 800000.0}; +std::string const kMapService{"https://mapy.geoportal.gov.pl/wss/ext/OSM/BaseMap/service"}; + +double seconds() +{ + return std::chrono::duration(std::chrono::steady_clock::now().time_since_epoch()).count(); +} + +glm::dvec2 to_puwg(double const Latitude, double const Longitude) +{ + auto const e2{2.0 * kFlattening - kFlattening * kFlattening}; + auto const ep2{e2 / (1.0 - e2)}; + auto const phi{glm::radians(Latitude)}; + auto const sine{std::sin(phi)}; + auto const cosine{std::cos(phi)}; + auto const n{kSemiMajor / std::sqrt(1.0 - e2 * sine * sine)}; + auto const t{std::tan(phi) * std::tan(phi)}; + auto const c{ep2 * cosine * cosine}; + auto const a{glm::radians(Longitude - kCentralMeridian) * cosine}; + auto const m{kSemiMajor * ((1.0 - e2 / 4.0 - 3.0 * e2 * e2 / 64.0 - 5.0 * e2 * e2 * e2 / 256.0) * phi - (3.0 * e2 / 8.0 + 3.0 * e2 * e2 / 32.0 + 45.0 * e2 * e2 * e2 / 1024.0) * std::sin(2.0 * phi) + + (15.0 * e2 * e2 / 256.0 + 45.0 * e2 * e2 * e2 / 1024.0) * std::sin(4.0 * phi) - (35.0 * e2 * e2 * e2 / 3072.0) * std::sin(6.0 * phi))}; + auto const x{kScale * n * (a + (1.0 - t + c) * std::pow(a, 3) / 6.0 + (5.0 - 18.0 * t + t * t + 72.0 * c - 58.0 * ep2) * std::pow(a, 5) / 120.0)}; + auto const y{kScale * (m + n * std::tan(phi) * (a * a / 2.0 + (5.0 - t + 9.0 * c + 4.0 * c * c) * std::pow(a, 4) / 24.0 + (61.0 - 58.0 * t + t * t + 600.0 * c - 330.0 * ep2) * std::pow(a, 6) / 720.0))}; + return {kFalseEasting + x, y + kFalseNorthing}; +} + +glm::dvec2 to_degrees(glm::dvec2 const &Point) +{ + auto const e2{2.0 * kFlattening - kFlattening * kFlattening}; + auto const ep2{e2 / (1.0 - e2)}; + auto const x{Point.x - kFalseEasting}; + auto const m{(Point.y - kFalseNorthing) / kScale}; + auto const mu{m / (kSemiMajor * (1.0 - e2 / 4.0 - 3.0 * e2 * e2 / 64.0 - 5.0 * e2 * e2 * e2 / 256.0))}; + auto const e1{(1.0 - std::sqrt(1.0 - e2)) / (1.0 + std::sqrt(1.0 - e2))}; + auto const phi1{mu + (3.0 * e1 / 2.0 - 27.0 * std::pow(e1, 3) / 32.0) * std::sin(2.0 * mu) + (21.0 * e1 * e1 / 16.0 - 55.0 * std::pow(e1, 4) / 32.0) * std::sin(4.0 * mu) + + (151.0 * std::pow(e1, 3) / 96.0) * std::sin(6.0 * mu) + (1097.0 * std::pow(e1, 4) / 512.0) * std::sin(8.0 * mu)}; + auto const sine{std::sin(phi1)}; + auto const c1{ep2 * std::cos(phi1) * std::cos(phi1)}; + auto const t1{std::tan(phi1) * std::tan(phi1)}; + auto const n1{kSemiMajor / std::sqrt(1.0 - e2 * sine * sine)}; + auto const r1{kSemiMajor * (1.0 - e2) / std::pow(1.0 - e2 * sine * sine, 1.5)}; + auto const d{x / (n1 * kScale)}; + auto const phi{phi1 - (n1 * std::tan(phi1) / r1) * (d * d / 2.0 - (5.0 + 3.0 * t1 + 10.0 * c1 - 4.0 * c1 * c1 - 9.0 * ep2) * std::pow(d, 4) / 24.0 + + (61.0 + 90.0 * t1 + 298.0 * c1 + 45.0 * t1 * t1 - 252.0 * ep2 - 3.0 * c1 * c1) * std::pow(d, 6) / 720.0)}; + auto const lambda{(d - (1.0 + 2.0 * t1 + c1) * std::pow(d, 3) / 6.0 + (5.0 - 2.0 * c1 + 28.0 * t1 - 3.0 * c1 * c1 + 8.0 * ep2 + 24.0 * t1 * t1) * std::pow(d, 5) / 120.0) / std::cos(phi1)}; + return {glm::degrees(phi), kCentralMeridian + glm::degrees(lambda)}; +} + +bool valid_name(std::string const &Name) +{ + return false == Name.empty() && std::all_of(Name.begin(), Name.end(), [](char const Character) { return (Character >= 'a' && Character <= 'z') || (Character >= '0' && Character <= '9') || Character == '_' || Character == '-'; }); +} + +} // namespace + +ui::scenerywizard_panel::scenerywizard_panel() : ui_panel(STR("New scenery"), false) {} + +ui::scenerywizard_panel::~scenerywizard_panel() +{ + if (m_request.valid()) + m_request.wait(); + if (m_texture != 0) + glDeleteTextures(1, &m_texture); +} + +void ui::scenerywizard_panel::render_contents() +{ + upload_map(); + auto const available{ImGui::GetContentRegionAvail()}; + auto const form{360.f * Global.ui_scale}; + glm::vec2 const map{std::max(200.f, available.x - form - ImGui::GetStyle().ItemSpacing.x), std::max(200.f, available.y)}; + ImGui::BeginChild("##wizardmap", ImVec2(map.x, map.y), true, ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse); + render_map(map - glm::vec2{16.f}); + ImGui::EndChild(); + ImGui::SameLine(); + ImGui::BeginChild("##wizardform", ImVec2(0.f, map.y), true); + render_form(); + ImGui::EndChild(); +} + +void ui::scenerywizard_panel::render_map(glm::vec2 const &Size) +{ + auto const origin{ImGui::GetCursorScreenPos()}; + if (false == m_fitted) + { + m_fitted = true; + m_centre = (kPolandLow + kPolandHigh) * 0.5; + m_scale = std::max((kPolandHigh.x - kPolandLow.x) / Size.x, (kPolandHigh.y - kPolandLow.y) / Size.y); + } + ImGui::InvisibleButton("##map", ImVec2(Size.x, Size.y)); + auto const hovered{ImGui::IsItemHovered()}; + auto const active{ImGui::IsItemActive()}; + auto const &io{ImGui::GetIO()}; + glm::vec2 const mouse{io.MousePos.x, io.MousePos.y}; + glm::vec2 const middle{origin.x + Size.x * 0.5f, origin.y + Size.y * 0.5f}; + auto const to_world = [&](glm::vec2 const &Screen) { return glm::dvec2{m_centre.x + (Screen.x - middle.x) * m_scale, m_centre.y - (Screen.y - middle.y) * m_scale}; }; + auto const to_screen = [&](glm::dvec2 const &World) { return ImVec2(middle.x + static_cast((World.x - m_centre.x) / m_scale), middle.y - static_cast((World.y - m_centre.y) / m_scale)); }; + + if (hovered && io.MouseWheel != 0.f) + { + auto const under{to_world(mouse)}; + m_scale = std::clamp(m_scale * std::pow(0.8, static_cast(io.MouseWheel)), 0.25, 2000.0); + m_centre = {under.x - (mouse.x - middle.x) * m_scale, under.y + (mouse.y - middle.y) * m_scale}; + m_dirty = true; + m_changed = seconds(); + } + if (ImGui::IsItemActivated()) + { + m_pressed = mouse; + m_dragging = false; + } + if (active) + { + if (glm::length(mouse - m_pressed) > 4.f) + m_dragging = true; + if (m_dragging && (io.MouseDelta.x != 0.f || io.MouseDelta.y != 0.f)) + { + m_centre.x -= io.MouseDelta.x * m_scale; + m_centre.y += io.MouseDelta.y * m_scale; + m_dirty = true; + m_changed = seconds(); + } + } + if (ImGui::IsItemDeactivated() && false == m_dragging) + pick(to_world(mouse)); + + if (m_dirty && seconds() - m_changed > 0.25 && false == m_request.valid()) + request_map(Size); + + auto *drawlist{ImGui::GetWindowDrawList()}; + drawlist->PushClipRect(origin, ImVec2(origin.x + Size.x, origin.y + Size.y), true); + drawlist->AddRectFilled(origin, ImVec2(origin.x + Size.x, origin.y + Size.y), IM_COL32(200, 214, 222, 255)); + if (m_texture != 0) + drawlist->AddImage(reinterpret_cast(static_cast(m_texture)), to_screen({m_image_low.x, m_image_high.y}), to_screen({m_image_high.x, m_image_low.y})); + if (m_picked) + { + auto const at{to_screen(m_point)}; + auto const colour{IM_COL32(220, 30, 30, 255)}; + drawlist->AddCircle(at, 10.f, colour, 24, 2.5f); + drawlist->AddLine(ImVec2(at.x - 16.f, at.y), ImVec2(at.x + 16.f, at.y), colour, 2.f); + drawlist->AddLine(ImVec2(at.x, at.y - 16.f), ImVec2(at.x, at.y + 16.f), colour, 2.f); + } + std::string info; + if (hovered) + { + auto const world{to_world(mouse)}; + auto const degrees{to_degrees(world)}; + info = format(STR_C("E %.3f km, N %.3f km (%.5f N, %.5f E)"), world.x / 1000.0, world.y / 1000.0, degrees.x, degrees.y); + } + if (m_request.valid()) + info += (info.empty() ? "" : " ") + std::string{STR_C("loading the map...")}; + else if (false == m_map_error.empty()) + info += (info.empty() ? "" : " ") + m_map_error; + if (false == info.empty()) + { + auto const size{ImGui::CalcTextSize(info.c_str())}; + drawlist->AddRectFilled(ImVec2(origin.x + 4.f, origin.y + 4.f), ImVec2(origin.x + 12.f + size.x, origin.y + 8.f + size.y), IM_COL32(0, 0, 0, 170), 4.f); + drawlist->AddText(ImVec2(origin.x + 8.f, origin.y + 6.f), IM_COL32(255, 255, 255, 240), info.c_str()); + } + drawlist->PopClipRect(); +} + +void ui::scenerywizard_panel::request_map(glm::vec2 const &Size) +{ + m_dirty = false; + auto const width{std::clamp(static_cast(Size.x), 64, 2048)}; + auto const height{std::clamp(static_cast(Size.y), 64, 2048)}; + glm::dvec2 const half{width * 0.5 * m_scale, height * 0.5 * m_scale}; + auto const low{m_centre - half}; + auto const high{m_centre + half}; + char bbox[160]; + std::snprintf(bbox, sizeof(bbox), "%.1f,%.1f,%.1f,%.1f", low.x, low.y, high.x, high.y); + auto const url{kMapService + "?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=osm&STYLES=&SRS=EPSG:2180&BBOX=" + bbox + "&WIDTH=" + std::to_string(width) + "&HEIGHT=" + std::to_string(height) + "&FORMAT=image/png"}; + m_request = std::async(std::launch::async, [url, low, high, width, height]() { + map_result result; + result.low = low; + result.high = high; + std::vector data; + if (false == editor_http_get(url, data, result.error)) + return result; + int w{0}, h{0}, components{0}; + auto *pixels{stbi_load_from_memory(data.data(), static_cast(data.size()), &w, &h, &components, 4)}; + if (pixels == nullptr) + { + result.error = STR("The map service sent no image"); + return result; + } + result.width = w; + result.height = h; + result.pixels.assign(pixels, pixels + static_cast(w) * h * 4); + stbi_image_free(pixels); + return result; + }); +} + +void ui::scenerywizard_panel::upload_map() +{ + if (false == m_request.valid() || m_request.wait_for(std::chrono::seconds(0)) != std::future_status::ready) + return; + auto result{m_request.get()}; + if (false == result.error.empty() || result.pixels.empty()) + { + m_map_error = result.error.empty() ? std::string{STR("The map service sent no image")} : STR("No map: ") + result.error; + return; + } + m_map_error.clear(); + if (m_texture == 0) + glGenTextures(1, &m_texture); + glBindTexture(GL_TEXTURE_2D, m_texture); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + glPixelStorei(GL_UNPACK_ALIGNMENT, 1); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, result.width, result.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, result.pixels.data()); + glBindTexture(GL_TEXTURE_2D, 0); + m_image_low = result.low; + m_image_high = result.high; +} + +void ui::scenerywizard_panel::pick(glm::dvec2 const &Point) +{ + m_point = Point; + m_picked = true; + auto const degrees{to_degrees(Point)}; + std::snprintf(m_latlon, sizeof(m_latlon), "%.6f, %.6f", degrees.x, degrees.y); +} + +void ui::scenerywizard_panel::render_form() +{ + ImGui::TextUnformatted(STR_C("New scenery")); + ImGui::Separator(); + ImGui::TextWrapped("%s", STR_C("Find the place on the map: the wheel zooms, dragging moves the map. A click sets the centre of the scenery, its point 0 0 0.")); + ImGui::Spacing(); + + ImGui::SetNextItemWidth(-1.f); + ImGui::InputTextWithHint("##name", STR_C("file name, e.g. my_line"), m_name, sizeof(m_name), ImGuiInputTextFlags_CharsNoBlank); + std::string name{m_name}; + std::transform(name.begin(), name.end(), name.begin(), [](unsigned char const Character) { return static_cast(std::tolower(Character)); }); + auto const path{Global.asCurrentSceneryPath + name + ".scn"}; + auto const named{valid_name(name)}; + auto const exists{named && std::filesystem::exists(path)}; + if (name.empty()) + ImGui::TextDisabled("%s", STR_C("scenery/.scn")); + else if (false == named) + ImGui::TextColored(ImVec4(1.f, 0.45f, 0.35f, 1.f), "%s", STR_C("Lower case letters, digits, _ and - only")); + else if (exists) + ImGui::TextColored(ImVec4(1.f, 0.45f, 0.35f, 1.f), STR_C("%s exists already"), path.c_str()); + else + ImGui::TextDisabled("%s", path.c_str()); + + ImGui::SetNextItemWidth(-1.f); + ImGui::InputTextWithHint("##title", STR_C("title, written in the file"), m_title, sizeof(m_title)); + ImGui::Spacing(); + + ImGui::TextUnformatted(STR_C("Centre of the scenery, PUWG 1992")); + double east{m_point.x / 1000.0}; + double north{m_point.y / 1000.0}; + ImGui::SetNextItemWidth(130.f); + auto changed{ImGui::InputDouble(STR_C("E, km##east"), &east, 0.0, 0.0, "%.3f", ImGuiInputTextFlags_EnterReturnsTrue)}; + ImGui::SetNextItemWidth(130.f); + changed |= ImGui::InputDouble(STR_C("N, km##north"), &north, 0.0, 0.0, "%.3f", ImGuiInputTextFlags_EnterReturnsTrue); + if (changed) + { + pick({east * 1000.0, north * 1000.0}); + m_centre = m_point; + m_dirty = true; + } + ImGui::SetNextItemWidth(-90.f); + auto const entered{ImGui::InputTextWithHint("##latlon", STR_C("latitude, longitude"), m_latlon, sizeof(m_latlon), ImGuiInputTextFlags_EnterReturnsTrue)}; + ImGui::SameLine(); + if (ImGui::Button(STR_C("Show")) || entered) + { + std::string text{m_latlon}; + std::replace(text.begin(), text.end(), ',', ' '); + std::istringstream words(text); + double latitude{0.0}, longitude{0.0}; + if (words >> latitude >> longitude && latitude > 45.0 && latitude < 58.0 && longitude > 10.0 && longitude < 28.0) + { + pick(to_puwg(latitude, longitude)); + m_centre = m_point; + m_scale = std::min(m_scale, 4.0); + m_dirty = true; + m_status.clear(); + } + else + m_status = STR("Give the latitude and the longitude in degrees, e.g. 52.2297, 21.0122"); + } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Degrees, as given by the online maps; the map moves there")); + if (m_picked) + { + auto const degrees{to_degrees(m_point)}; + ImGui::TextDisabled(STR_C("%.5f N, %.5f E"), degrees.x, degrees.y); + } + ImGui::Spacing(); + ImGui::TextWrapped("%s", STR_C("The scenery keeps the centre as its geographic reference (//$g PUWG1992): the orthophoto of the editor lies under it, in place.")); + ImGui::Spacing(); + + auto const ready{named && false == exists && m_picked}; + if (false == ready) + ImGui::TextDisabled("%s", m_picked ? STR_C("Give the file a name") : STR_C("Click the centre on the map")); + if (ImGui::Button(STR_C("Create and open in the editor"), ImVec2(-1.f, 0.f)) && ready) + create_scenery(); + if (false == m_status.empty()) + ImGui::TextWrapped("%s", m_status.c_str()); + ImGui::Spacing(); + ImGui::TextDisabled("%s", STR_C("Map: (c) OpenStreetMap contributors, served by geoportal.gov.pl")); +} + +bool ui::scenerywizard_panel::create_scenery() +{ + std::string name{m_name}; + std::transform(name.begin(), name.end(), name.begin(), [](unsigned char const Character) { return static_cast(std::tolower(Character)); }); + auto const file{name + ".scn"}; + std::ofstream output(Global.asCurrentSceneryPath + file, std::ios::binary); + if (false == output.is_open()) + { + m_status = STR("The file can't be written"); + return false; + } + auto const now{std::time(nullptr)}; + char date[32]; + std::strftime(date, sizeof(date), "%Y-%m-%d", std::localtime(&now)); + char reference[96]; + std::snprintf(reference, sizeof(reference), "//$g PUWG1992 %.3f %.3f", m_point.x / 1000.0, m_point.y / 1000.0); + output << reference << "\r\n"; + if (m_title[0] != '\0') + output << "// " << m_title << "\r\n"; + output << "// created in the editor " << date << "\r\n\r\n"; + output << "atmo 0.423 0.702 1.0 1700 2000 0.70 0.80 0.9 endatmo\r\n\r\n"; + output << "FirstInit\r\n"; + output.close(); + WriteLog("Scenery wizard: created " + file + " at " + reference); + + Global.SceneryFile = file; + Global.local_start_vehicle = "ghostview"; + Global.editor_session = true; + Application.pop_mode(); + Application.push_mode(eu07_application::mode::scenarioloader); + return true; +} diff --git a/launcher/scenery_wizard.h b/launcher/scenery_wizard.h new file mode 100644 index 000000000..d47362d05 --- /dev/null +++ b/launcher/scenery_wizard.h @@ -0,0 +1,70 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "application/uilayer.h" + +#include +#include +#include +#include + +namespace ui +{ + +class scenerywizard_panel : public ui_panel +{ + public: + scenerywizard_panel(); + ~scenerywizard_panel() override; + + void render_contents() override; + + private: + struct map_result + { + glm::dvec2 low{0.0}; + glm::dvec2 high{0.0}; + int width{0}; + int height{0}; + std::vector pixels; + std::string error; + }; + + void render_map(glm::vec2 const &Size); + void render_form(); + void request_map(glm::vec2 const &Size); + void upload_map(); + void pick(glm::dvec2 const &Point); + bool create_scenery(); + + glm::dvec2 m_centre{515000.0, 460000.0}; + double m_scale{1000.0}; + bool m_fitted{false}; + double m_changed{0.0}; + bool m_dirty{true}; + glm::vec2 m_pressed{0.f}; + bool m_dragging{false}; + + std::future m_request; + unsigned int m_texture{0}; + glm::dvec2 m_image_low{0.0}; + glm::dvec2 m_image_high{0.0}; + std::string m_map_error; + + bool m_picked{false}; + glm::dvec2 m_point{0.0}; + char m_name[64]{}; + char m_title[128]{}; + char m_latlon[64]{}; + std::string m_status; +}; + +} // namespace ui From 24923dd472a8f5479d1fe968fa593ced3b746a57 Mon Sep 17 00:00:00 2001 From: maj00r Date: Tue, 6 Oct 2026 22:19:54 +0200 Subject: [PATCH 143/430] feat(editor): track editor driven by what the cursor is over: the outline and a label show what a click or a drag does, snapping to free ends on the screen, handles and ends dragged directly, no rotation gizmo; laying from a free end the same in every mode, straight with Shift, the curve of a switch going on past its diverging end; height 0 where there's no terrain; placed switch leaves the switch mode, double slips listed apart, a drive of the switch placed with it by the //$e switch description of its template; compound curves of any number of radii; dragged end of a straight fits the curve beside it; name of a path, followed by the memory cells and the includes taking it; turntable placed from a template described as one, tracks led out of it and the tracks around fitted to it, its positions written to the include; infrastructure bound to the path whose events read its memory cell; terrain made where the route has none and shaped to the formation under the ballast; models along the track over the selected path and on along the joined ones while dragged, rarely used settings folded; vehicles and trainsets placed on any path, switches included, facing the way the arrow shows; joined paths spread into the selection; New scenery in the File menu starts the editor again with the wizard; ortho zoom towards the cursor; scripted self tests; Polish translation --- CMakeLists.txt | 8 + application/editormode.cpp | 384 +++++-- application/editormode.h | 630 +++++++++++- application/editormodeinfra.cpp | 459 +++++++-- application/editormodejoints.cpp | 521 ++++++++++ application/editormodelineside.cpp | 983 ++++++++++++++++++ application/editormodeparallel.cpp | 234 +++++ application/editormodeprofile.cpp | 188 +++- application/editormodeselftest.cpp | 385 +++++++ application/editormodespeed.cpp | 17 +- application/editormodesweep.cpp | 955 ++++++++++++++++++ application/editormodetrack.cpp | 1128 ++++++++++++++++----- application/editormodetrackux.cpp | 1359 +++++++++++++++++++++++++ application/editormodeturntable.cpp | 1025 +++++++++++++++++++ application/editormodevehicle.cpp | 315 ++++++ application/editorprojection.h | 29 + application/editoruilayer.cpp | 4 + application/editoruilayer.h | 2 + editor/editorAlignment.cpp | 71 +- editor/editorAlignment.hpp | 14 +- editor/editorGeometry.hpp | 31 + editor/editorIncludeInfo.cpp | 17 +- editor/editorIncludeInfo.hpp | 7 +- editor/editorTrack.cpp | 227 ++++- editor/editorTrack.hpp | 25 +- lang/editor_pl.po | 1441 ++++++++++++++++++++++++++- 26 files changed, 9991 insertions(+), 468 deletions(-) create mode 100644 application/editormodejoints.cpp create mode 100644 application/editormodelineside.cpp create mode 100644 application/editormodeparallel.cpp create mode 100644 application/editormodeselftest.cpp create mode 100644 application/editormodesweep.cpp create mode 100644 application/editormodetrackux.cpp create mode 100644 application/editormodeturntable.cpp create mode 100644 application/editormodevehicle.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 090e6050b..116f032db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -185,11 +185,19 @@ set(SOURCES "editor/editorOrthophoto.cpp" "application/editormode.cpp" "application/editormodetrack.cpp" +"application/editormodetrackux.cpp" "application/editormoderoad.cpp" "application/editormodeprofile.cpp" "application/editormodegauge.cpp" "application/editormodeinfra.cpp" "application/editormodespeed.cpp" +"application/editormodejoints.cpp" +"application/editormodeparallel.cpp" +"application/editormodelineside.cpp" +"application/editormodevehicle.cpp" +"application/editormodesweep.cpp" +"application/editormodeturntable.cpp" +"application/editormodeselftest.cpp" "input/editormouseinput.cpp" "application/editoruilayer.cpp" "application/editoruipanels.cpp" diff --git a/application/editormode.cpp b/application/editormode.cpp index f5b6d716e..93b9bf4c1 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -10,6 +10,12 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "application/editormode.h" #include "application/editoruilayer.h" +#ifndef _WIN32 +#include +#include +extern char **environ; +#endif +#include "application/editorprojection.h" #include "application/application.h" #include "editor/editorSettings.hpp" @@ -477,10 +483,12 @@ editor_mode::editor_mode() { ui()->set_fill_options([this]() { render_area_fill(); }); ui()->set_gizmo_options([this]() { render_gizmo_options(); }); ui()->set_file_actions([this]() { save(); }, [this]() { export_scenery(); }); + ui()->set_new_scenery([this]() { m_newscenery_asked = true; }); ui()->set_menu_options([this]() { render_object_menu(); render_track_menu(); render_road_menu(); + render_map_menu(); }); m_roadtool.settings.normalize(); road_select(nullptr); @@ -893,6 +901,20 @@ void editor_mode::undo_last() EditorSnapshot snap = m_history.back(); m_history.pop_back(); + if (false == snap.sweeps.empty() || false == snap.sweeps_toggled.empty()) + { + restore_sweeps(snap); + g_redo.push_back(std::move(snap)); + return; + } + + if (false == snap.instances.empty() || false == snap.directives.empty()) + { + restore_includes(snap); + g_redo.push_back(std::move(snap)); + return; + } + if (snap.instance != 0) { restore_include(snap); @@ -997,6 +1019,20 @@ void editor_mode::redo_last() EditorSnapshot snap = g_redo.back(); g_redo.pop_back(); + if (false == snap.sweeps.empty() || false == snap.sweeps_toggled.empty()) + { + restore_sweeps(snap); + m_history.push_back(std::move(snap)); + return; + } + + if (false == snap.instances.empty() || false == snap.directives.empty()) + { + restore_includes(snap); + m_history.push_back(std::move(snap)); + return; + } + if (snap.instance != 0) { restore_include(snap); @@ -1100,6 +1136,14 @@ void editor_mode::redo_last() bool editor_mode::update() { + selftest_step(); + if (m_vehicle.leave) + { + m_vehicle.leave = false; + Application.pop_mode(); + return true; + } + Timer::UpdateTimers(true); simulation::State.update_clocks(); @@ -1256,13 +1300,36 @@ bool editor_mode::update() draw_straights_overlay(); if (ui()->mode() == nodebank_panel::TRACK) { + if (m_track_box.active && false == ImGui::GetIO().MouseDown[0]) + finish_track_box(); + update_track_hover(); + point_drag_update(); + if (m_track_tab == track_tab::turntable) + draw_turntable_overlay(); + if (m_track_tab == track_tab::lineside) + { + draw_parallel_preview(); + draw_hekto_overlay(); + draw_fouling_overlay(); + draw_vehicle_marker(); + sweep_drag(); + draw_sweep_overlay(); + } + render_track_context(); update_build_tools(); + update_track_intent(); + draw_track_hover(); + draw_track_set(); + draw_track_spread(); draw_build_overlay(); + draw_track_intent(); speed_step(); + joints_step(); draw_track_hints(); draw_profile_overlay(); draw_infra_overlay(); draw_speed_overlay(); + draw_joints_overlay(); } update_gauge(); render_gauge_window(); @@ -1276,6 +1343,9 @@ bool editor_mode::update() if (ui()->mode() == nodebank_panel::FILL) draw_area_fill_outline(); + render_orthophoto_window(); + render_new_scenery_popup(); + // --- ImGui: Editor Settings & History windows --- if(m_settings_open) render_settings(); @@ -1318,11 +1388,6 @@ void editor_mode::render_settings() render_terrain_ui(); ImGui::EndTabItem(); } - if (ImGui::BeginTabItem("Orthophoto")) - { - render_orthophoto_ui(); - ImGui::EndTabItem(); - } ImGui::EndTabBar(); } @@ -1517,7 +1582,13 @@ void editor_mode::load_orthophoto_settings() config.in_scene = stored.in_scene; config.north = 0.0; config.east = 0.0; - EditorSettings.orthophoto_origin(scenery, config.north, config.east); + m_georeference_read = false; + read_georeference(); + if (false == std::as_const(EditorSettings).orthophoto_origin(scenery, config.north, config.east) && m_georeference) + { + config.north = m_georeference_origin.x; + config.east = m_georeference_origin.y; + } m_orthophoto.settings(config); m_orthophoto_origin_edit = {config.north, config.east}; } @@ -1567,6 +1638,21 @@ void editor_mode::render_orthophoto_ui() config.east = m_orthophoto_origin_edit.y; changed = persist = true; } + if (m_georeference) + { + ImGui::TextDisabled("%s", m_georeference_line.c_str()); + ImGui::TextDisabled(STR_C("in the scenery file: Y (easting) %.0f m, X (northing) %.0f m"), m_georeference_origin.y, m_georeference_origin.x); + if (config.north != m_georeference_origin.x || config.east != m_georeference_origin.y) + { + ImGui::SameLine(); + if (ImGui::SmallButton(STR_C("Use it"))) + { + config.north = m_orthophoto_origin_edit.x = m_georeference_origin.x; + config.east = m_orthophoto_origin_edit.y = m_georeference_origin.y; + changed = persist = true; + } + } + } if (config.north == 0.0 && config.east == 0.0) ImGui::TextColored(ImVec4(1.0f, 0.75f, 0.2f, 1.0f), "Enter the origin of this scenery first"); else @@ -2103,13 +2189,13 @@ void editor_mode::commit_terrain() m_streamer.flush(); // save resident edited chunks to disk } -void editor_mode::save() +bool editor_mode::save() { if (scene::Layers.empty()) { // without the sources tracked during the load there's no telling where the changes belong ui()->set_status("The scenery wasn't opened for editing. Start the simulator with: -edit ", true); - return; + return false; } // terrain made in the editor is kept in files of its own, the scenery only needs the directive which loads it @@ -2137,6 +2223,7 @@ void editor_mode::save() } ui()->set_status(result.message, false == result.success); WriteLog("Editor: " + result.message, logtype::generic); + return result.success; } void editor_mode::toggle_include(scene::instance_handle const Instance) @@ -2175,6 +2262,33 @@ void editor_mode::restore_include(EditorSnapshot &Snapshot) select_include(scene::Layers.removable(Snapshot.instance) ? Snapshot.instance : 0); } +void editor_mode::restore_includes(EditorSnapshot &Snapshot) +{ + std::size_t gone{0}; + for (auto const instance : Snapshot.instances) + { + if (false == scene::Layers.tracked(instance) || scene::Layers.instance(instance).dead) + { + ++gone; + continue; + } + scene::Layers.removed(instance, false == scene::Layers.instance(instance).removed); + } + for (auto &entry : Snapshot.directives) + { + auto current = scene::Layers.directive(entry.first); + if (current.empty() || scene::Layers.instance(entry.first).dead) + { + ++gone; + continue; + } + set_include_directive(entry.first, entry.second); + entry.second = std::move(current); + } + select_include(0); + ui()->set_status(gone > 0 ? std::to_string(gone) + " of the includes are gone from the saved scenery, they can't be taken back." : std::to_string(Snapshot.instances.size() + Snapshot.directives.size()) + " includes restored.", gone > 0); +} + void editor_mode::select_include(scene::instance_handle const Instance) { m_instance = (scene::Layers.tracked(Instance) ? Instance : 0); @@ -2541,6 +2655,146 @@ void editor_mode::drop_model_instances() ui()->set_status(status); } +void editor_mode::read_georeference() +{ + if (m_georeference_read) + return; + m_georeference_read = true; + m_georeference = false; + m_georeference_line.clear(); + // the name of the scenery is kept in lower case, the file may have capitals in its name + std::filesystem::path file{Global.asCurrentSceneryPath + Global.SceneryFile}; + std::error_code error; + if (false == std::filesystem::exists(file, error)) + { + for (auto const &entry : std::filesystem::directory_iterator(Global.asCurrentSceneryPath, error)) + { + auto name{entry.path().filename().string()}; + std::transform(name.begin(), name.end(), name.begin(), [](unsigned char const Character) { return static_cast(std::tolower(Character)); }); + if (name == Global.SceneryFile) + { + file = entry.path(); + break; + } + } + } + std::ifstream stream(file); + std::string line; + for (int count = 0; count < 200 && std::getline(stream, line); ++count) + { + auto const mark = line.find("//$g"); + if (mark == std::string::npos) + continue; + // Rainsted writes the origin of the scenery as: //$g , in kilometres + std::istringstream words(line.substr(mark + 4)); + std::string system; + double east{0.0}, north{0.0}; + if (false == static_cast(words >> system >> east >> north) || system.find("1992") == std::string::npos) + continue; + auto const scale = (east < 10000.0 && north < 10000.0) ? 1000.0 : 1.0; + m_georeference_origin = {north * scale, east * scale}; + m_georeference_line = line.substr(mark); + if (false == m_georeference_line.empty() && m_georeference_line.back() == '\r') + m_georeference_line.pop_back(); + m_georeference = true; + break; + } +} + +void editor_mode::render_map_menu() +{ + if (false == ImGui::BeginMenu(STR_C("Map"))) + return; + bool enabled = m_orthophoto.enabled(); + if (ImGui::MenuItem(STR_C("Orthophoto"), nullptr, enabled)) + m_orthophoto.enabled(false == enabled); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Aerial imagery of geoportal.gov.pl under the scenery, laid out by the origin of the scenery")); + ImGui::MenuItem(STR_C("Orthophoto settings..."), nullptr, &m_orthophoto_window); + ImGui::EndMenu(); +} + +void editor_mode::render_new_scenery_popup() +{ + if (m_newscenery_asked) + { + ImGui::OpenPopup(STR_C("New scenery##restart")); + m_newscenery_asked = false; + } + if (false == ImGui::BeginPopupModal(STR_C("New scenery##restart"), nullptr, ImGuiWindowFlags_AlwaysAutoResize)) + return; + ImGui::TextUnformatted(STR_C("The editor starts again, with the wizard of a new scenery.")); + auto const editsession{false == scene::Layers.empty()}; + if (false == m_history.empty()) + ImGui::TextColored(ImVec4(1.0f, 0.7f, 0.3f, 1.0f), "%s", STR_C("What isn't saved of this scenery is lost.")); + if (editsession && ImGui::Button(STR_C("Save and start the wizard"))) + { + if (save() && false == restart_for_new_scenery()) + ui()->set_status(STR_C("The editor couldn't be started again"), true); + ImGui::CloseCurrentPopup(); + } + if (editsession) + ImGui::SameLine(); + if (ImGui::Button(STR_C("Start the wizard"))) + { + if (false == restart_for_new_scenery()) + ui()->set_status(STR_C("The editor couldn't be started again"), true); + ImGui::CloseCurrentPopup(); + } + ImGui::SameLine(); + if (ImGui::Button(STR_C("Cancel"))) + ImGui::CloseCurrentPopup(); + ImGui::EndPopup(); +} + +bool editor_mode::restart_for_new_scenery() +{ +#ifdef _WIN32 + _putenv("EU07_EDITOR_SELFTEST="); + wchar_t path[MAX_PATH]; + if (GetModuleFileNameW(nullptr, path, MAX_PATH) == 0) + return false; + std::wstring command{L"\"" + std::wstring{path} + L"\" -edit"}; + STARTUPINFOW startup{}; + startup.cb = sizeof(startup); + PROCESS_INFORMATION process{}; + if (false == CreateProcessW(nullptr, command.data(), nullptr, nullptr, FALSE, 0, nullptr, nullptr, &startup, &process)) + return false; + CloseHandle(process.hThread); + CloseHandle(process.hProcess); +#else + unsetenv("EU07_EDITOR_SELFTEST"); + char path[4096]; + auto const size{readlink("/proc/self/exe", path, sizeof(path) - 1)}; + if (size <= 0) + return false; + path[size] = '\0'; + char edit[]{"-edit"}; + char *arguments[]{path, edit, nullptr}; + posix_spawnattr_t attributes; + posix_spawnattr_init(&attributes); + posix_spawnattr_setflags(&attributes, POSIX_SPAWN_SETSID); + pid_t child; + auto const result{posix_spawn(&child, path, nullptr, &attributes, arguments, environ)}; + posix_spawnattr_destroy(&attributes); + if (result != 0) + return false; +#endif + WriteLog("Editor: started again for a new scenery"); + Application.queue_quit(true); + return true; +} + +void editor_mode::render_orthophoto_window() +{ + if (false == m_orthophoto_window) + return; + ImGui::SetNextWindowSize(ImVec2(430.0f, 0.0f), ImGuiCond_FirstUseEver); + if (ImGui::Begin(STR_C("Orthophoto##window"), &m_orthophoto_window, ImGuiWindowFlags_AlwaysAutoResize)) + render_orthophoto_ui(); + ImGui::End(); +} + void editor_mode::render_object_menu() { if (ImGui::BeginMenu("Objects")) @@ -2899,6 +3153,12 @@ void editor_mode::render_gizmo() return; } + if (ui()->mode() == nodebank_panel::TRACK && m_track_tab == track_tab::path && m_track_set.size() >= 2) + { + render_track_set_gizmo(); + return; + } + if (straights_active()) { render_straight_gizmo(); @@ -2920,7 +3180,7 @@ void editor_mode::render_gizmo() if (selected_track()) { // in the track modes the whole path is moved only while selecting, or the switch in its mode - if (ui()->mode() != nodebank_panel::TRACK || m_track_tab == track_tab::path || m_track_tab == track_tab::turnout) + if (ui()->mode() != nodebank_panel::TRACK || (m_track_tab == track_tab::path && false == m_point_drag.active) || (m_track_tab == track_tab::turnout && selected_track()->eType == tt_Switch)) render_track_gizmo(); else m_track_gizmo_using = false; @@ -3153,7 +3413,16 @@ void editor_mode::on_scroll(double const Xoffset, double const Yoffset) { if (false == Global.EditorOrtho || ImGui::GetIO().WantCaptureMouse) return; - Global.EditorOrthoExtent = std::clamp(Global.EditorOrthoExtent * static_cast(std::pow(0.85, Yoffset)), 5.0f, 5000.0f); + auto const before{Global.EditorOrthoExtent}; + auto const after{std::clamp(before * static_cast(std::pow(0.85, Yoffset)), 5.0f, 5000.0f)}; + screen_projection const projection; + glm::dvec3 origin, direction; + projection.ray(ImGui::GetIO().MousePos, origin, direction); + auto const scale{static_cast(after) / static_cast(before)}; + Camera.Pos.x = origin.x + (Camera.Pos.x - origin.x) * scale; + Camera.Pos.z = origin.z + (Camera.Pos.z - origin.z) * scale; + Global.EditorOrthoExtent = after; + Global.pCamera = Camera; } void editor_mode::update_camera(double const Deltatime) @@ -3286,6 +3555,9 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in if (!anyModifier && m_userinterface->on_key(Key, Action)) return; + if (ui()->mode() == nodebank_panel::TRACK && is_press(Action) && (Mods & (GLFW_MOD_CONTROL | GLFW_MOD_ALT)) == 0 && typed_key(Key)) + return; + // gizmo transform shortcuts (Q/W/E/R) — only when the camera isn't being flown (RMB up). // handled before the camera keyboard step because Q/W/E are also the fly-mode movement keys, // which would otherwise consume them. @@ -3316,6 +3588,16 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in return; } + if (Global.ctrlState && false == Global.shiftState && Key == GLFW_KEY_F && ui()->mode() == nodebank_panel::TRACK) + { + if (is_press(Action)) + { + show_track_tab(m_track_tab); + m_track_search.focus = true; + } + return; + } + // then internal input handling if (m_input.keyboard.key(Key, Action)) return; @@ -3324,7 +3606,7 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in return; // shortcuts: undo/redo. not in the middle of a drag, it would go on from the state which was undone - if (Global.ctrlState && (Key == GLFW_KEY_Z || Key == GLFW_KEY_Y) && is_press(Action) && (m_track_gizmo_using || m_straights.dragging || m_extend.active || m_switch.placing)) + if (Global.ctrlState && (Key == GLFW_KEY_Z || Key == GLFW_KEY_Y) && is_press(Action) && (m_track_gizmo_using || m_track_set_using || m_straights.dragging || m_extend.active || m_switch.placing || m_point_drag.active || m_handle_drag.active)) return; if (Global.ctrlState && Key == GLFW_KEY_Z && is_press(Action)) { @@ -3401,6 +3683,10 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in ui()->set_node(nullptr); simulation::State.delete_model(model); } + else if (ui()->mode() == nodebank_panel::TRACK && m_track_tab == track_tab::path && m_track_set.size() >= 2) + { + track_set_delete(); + } else if (selected_track() != nullptr) { delete_selected_track(); @@ -3423,8 +3709,16 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in cancel_track_tools(); m_straights.tool = 0; } - else + else if (m_track_tab == track_tab::path && false == m_track_set.empty()) + m_track_set.clear(); + else if (m_track_tab != track_tab::path) show_track_tab(track_tab::path); + else if (selected_track() != nullptr) + { + m_node = nullptr; + m_track_point = {}; + ui()->set_node(nullptr); + } } break; @@ -3443,7 +3737,7 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in case GLFW_KEY_ENTER: case GLFW_KEY_KP_ENTER: if (is_press(Action) && ui()->mode() == nodebank_panel::TRACK && m_lay.active) - lay_finish({}); + lay_enter(); break; case GLFW_KEY_K: @@ -3452,16 +3746,7 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in break; } if (is_press(Action) && ui()->mode() == nodebank_panel::TRACK && selected_track() != nullptr) - { - auto *track{selected_track()}; - auto const parameter{editor_track::nearest_parameter(*track, Global.pCamera.Pos + GfxRenderer->Mouse_Position())}; - auto const before{editor_track::capture(*track)}; - if (auto *created{editor_track::split_path(*track, parameter)}) - { - push_track_snapshot({{track, before}}, {created}); - straight_refresh(); - } - } + split_track_at(*selected_track(), Global.pCamera.Pos + GfxRenderer->Mouse_Position()); break; case GLFW_KEY_F: @@ -3563,45 +3848,7 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const if (mode == nodebank_panel::TRACK) { - if (m_lay.active) - { - GfxRenderer->Pick_Node_Callback([this](scene::basic_node * /*node*/) { - if (viewport_click()) - lay_click(); - }); - m_input.mouse.button(Button, Action); - return; - } - if (start_extend() || start_switch_placement()) - { - m_input.mouse.button(Button, Action); - return; - } - if ((Mods & GLFW_MOD_ALT) != 0 && m_track_tab == track_tab::straights) - { - GfxRenderer->Pick_Node_Callback([this](scene::basic_node *node) { - if (viewport_click() && dynamic_cast(node) != nullptr) - toggle_straight_set(*dynamic_cast(node)); - }); - m_input.mouse.button(Button, Action); - return; - } - if ((Mods & (GLFW_MOD_CONTROL | GLFW_MOD_SHIFT)) != 0 && m_track_tab == track_tab::straights && false == current_straight().tracks.empty()) - { - if ((Mods & GLFW_MOD_CONTROL) != 0) - start_straight_gesture(1); - else - add_detour_point(); - m_input.mouse.button(Button, Action); - return; - } - if (false == ImGuizmo::IsOver() && false == pick_route_vertex() && false == place_straight_tool() && false == pick_straight_handle() && false == pick_track_handle()) - { - GfxRenderer->Pick_Node_Callback([this](scene::basic_node *node) { - if (viewport_click()) - select_track(node); - }); - } + track_press(track_intent_at(Mods)); m_input.mouse.button(Button, Action); return; } @@ -3700,12 +3947,18 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const if (is_release(Action)) { mouseHold = false; + finish_track_box(); + point_drag_finish(); + m_handle_drag = {}; + sweep_release(); if (m_straights.tool_mouse) finish_straight_gesture(); if (m_extend.active) finish_extend(); if (m_switch.placing) finish_switch_placement(); + if (m_turntable.placing) + turntable_finish_placement(); } m_dragging = false; @@ -3713,6 +3966,13 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const } else if (Button == GLFW_MOUSE_BUTTON_RIGHT) { + if (ui()->mode() == nodebank_panel::TRACK) + { + if (is_press(Action)) + track_context_press(); + else if (is_release(Action)) + track_context_release(); + } // game-engine style look: hide & grab the cursor while flying, restore it on release Application.set_cursor(is_press(Action) ? GLFW_CURSOR_DISABLED : GLFW_CURSOR_NORMAL); } diff --git a/application/editormode.h b/application/editormode.h index fb44b830d..fdec7ae84 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -26,6 +26,7 @@ http://mozilla.org/MPL/2.0/. #include "editor/editorProfile.hpp" #include "editor/editorInfra.hpp" #include "editor/editorGauge.hpp" +#include "world/Sweep.h" #include #include @@ -36,6 +37,12 @@ http://mozilla.org/MPL/2.0/. class TAnimModel; class TTrack; +namespace ui +{ +class vehicles_bank; +struct vehicle_desc; +struct skin_set; +} class editor_mode : public application_mode, private editor_track::observer { @@ -51,6 +58,19 @@ class editor_mode : public application_mode, private editor_track::observer int path{0}; glm::dvec2 direction{0.0, 1.0}; // of the track there, in the plan }; + // joint of the paths found wrong by the joints check + struct joint_issue + { + enum class kind { gap, step, kink, cant, grade, open }; + kind type{kind::gap}; + TTrack *track{nullptr}; + editor_track::point_ref point; + TTrack *other{nullptr}; + editor_track::point_ref theirs; + glm::dvec3 position{0.0}; + double value{0.0}; // m, deg, mm, per mille + bool fixed{false}; + }; // constructors editor_mode(); ~editor_mode() override; @@ -120,6 +140,10 @@ class editor_mode : public application_mode, private editor_track::observer UID uuid; // node UUID for reference, used as fallback lookup for deleted/recreated nodes scene::layer_handle layer{null_handle}; // scenery layer of the node, so a recreated node returns to it scene::instance_handle instance{0}; // include of a scenery template which was placed or removed, instead of a node + std::vector instances; // includes placed or removed together + std::vector> directives; // includes changed together, with the directives to go back to + std::vector> sweeps; // models along curves changed, with the definitions to go back to + std::vector sweeps_toggled; // models along curves made or removed: undo flips whether they're there std::vector> tracks; std::vector created; std::vector removed; @@ -218,7 +242,7 @@ class editor_mode : public application_mode, private editor_track::observer // commits authored terrain to disk and enables streaming void commit_terrain(); // writes the changes to the files of scenery opened for editing (Ctrl+S) - void save(); + bool save(); // places include of specified scenery template at the cursor, in the active layer void place_include(std::string const &File, int RotationMode, float FixedRotation); // undo and redo of placing or removing an include: brings removed include back, or removes it @@ -231,6 +255,8 @@ class editor_mode : public application_mode, private editor_track::observer void set_include_directive(scene::instance_handle Instance, std::string const &Directive); // undo and redo of an include snapshot void restore_include(EditorSnapshot &Snapshot); + // undo and redo of the includes placed, removed or changed together + void restore_includes(EditorSnapshot &Snapshot); // gizmo for the selected include, limited to what the parameters of its template can express void render_include_gizmo(glm::mat4 const &View, glm::mat4 const &Projection, glm::dvec3 const &Camerapos); // exports the scenery in legacy (text) format, with layers hidden in the editor left out of the picture @@ -269,6 +295,18 @@ class editor_mode : public application_mode, private editor_track::observer // geoportal orthophoto layer drawn under the other viewport overlays void render_orthophoto_ui(); + void render_map_menu(); + void render_orthophoto_window(); + bool m_newscenery_asked{false}; + void render_new_scenery_popup(); + bool restart_for_new_scenery(); + bool m_orthophoto_window{false}; + // origin of the scenery in PUWG 1992 the scenery file gives in its //$g line, if it does + bool m_georeference_read{false}; + bool m_georeference{false}; + glm::dvec2 m_georeference_origin{0.0}; // northing, easting + std::string m_georeference_line; + void read_georeference(); void draw_orthophoto(); // picks up the stored settings and the origin of the current scenery void load_orthophoto_settings(); @@ -321,7 +359,7 @@ class editor_mode : public application_mode, private editor_track::observer TTrack *selected_track() const; void render_path_ui(); void draw_track_overlay() const; - bool pick_track_handle(); + editor_track::point_ref track_handle_hit() const; void select_track(scene::basic_node *Node); void render_track_gizmo(); void commit_track_drag(bool const Force); @@ -432,7 +470,6 @@ class editor_mode : public application_mode, private editor_track::observer bool route_relay_through_switches(editor_track::chain const &Chain, std::vector> &States, std::vector &Created); void route_recommend(alignment::vertex &Vertex) const; void draw_route_overlay() const; - bool pick_route_vertex(); void render_route_gizmo(); glm::dvec3 route_vertex_position(int const Vertex) const; bool route_active() const; @@ -457,6 +494,8 @@ class editor_mode : public application_mode, private editor_track::observer bool fitting{false}; editor_track::curve fit_before; editor_track::curve fit_after; + bool fit_has_before{false}; + bool fit_has_after{false}; std::vector> drag_states; glm::dvec3 preview_start{0.0}; glm::dvec3 preview_end{0.0}; @@ -487,7 +526,6 @@ class editor_mode : public application_mode, private editor_track::observer void draw_straights_overlay() const; editor_track::straight const ¤t_straight(); bool straights_active(); - bool pick_straight_handle(); void render_straight_gizmo(); void straight_apply(editor_track::straight const &Line, glm::dvec3 const &Start, glm::dvec3 const &End); void straights_apply(std::vector const &Lines, std::vector> const &Ends); @@ -498,7 +536,7 @@ class editor_mode : public application_mode, private editor_track::observer double straight_tool_radius(editor_track::straight const &Line) const; void straight_reshape(editor_track::straight const &Line, double const From, double const To, std::function const &Tail, double const Radius); void straight_refresh(); - bool start_curve_fit(editor_track::straight const &Line); + bool start_curve_fit(editor_track::straight const &Line, int const Handle); void update_curve_fit(glm::dvec3 const &Start, glm::dvec3 const &End); void add_detour_point(); void apply_detour(); @@ -531,9 +569,89 @@ class editor_mode : public application_mode, private editor_track::observer glm::dvec3 mouse{0.0}; editor_track::straight line; std::string status; + char name[64]{}; + struct drive_family + { + std::string name; + std::array files; + }; + std::vector drives; + bool drives_scanned{false}; + int drive{-1}; + int drive_side{0}; }; switch_tool m_switch; + void scan_switch_drives(); + std::string switch_name_for_new() const; + bool place_switch_drive(TTrack &Switch); + bool render_switch_drive_choice(); int m_turnout_template{0}; + struct turntable_template + { + std::string file; + std::string name; + double length{0.0}; + int angles{0}; + int positions{0}; + int track{0}; + int yaw{0}; + std::vector fixed; + }; + struct turntable_fit + { + editor_track::snap_target end; + double heading{0.0}; + double radius{0.0}; + double length{0.0}; + std::vector pieces; + std::string issue; + bool chosen{true}; + TTrack *replaces{nullptr}; + }; + struct turntable_tool + { + std::vector templates; + bool scanned{false}; + int chosen{-1}; + char name[64]{}; + bool placing{false}; + glm::dvec3 centre{0.0}; + double yaw{0.0}; + glm::vec2 pressed{0.f}; + editor_track::snap_target snap; + TTrack *table{nullptr}; + scene::instance_handle include{0}; + int kind{-1}; + double length{0.0}; + double table_yaw{0.0}; + std::vector exits; + float reach{80.f}; + float radius{150.f}; + float stub{25.f}; + float step{0.f}; + std::vector fits; + int hovered{-1}; + double heading{0.0}; + double exit_length{0.0}; + std::string status; + std::string error; + }; + turntable_tool m_turntable; + void scan_turntables(); + std::string turntable_name_for_new() const; + bool turntable_read(TTrack *Table); + glm::dvec3 turntable_centre() const; + std::vector turntable_lines() const; + double turntable_snap(double const Heading) const; + void turntable_finish_placement(); + void turntable_place(glm::dvec3 const &Centre, double const Yaw); + bool turntable_fit_end(editor_track::snap_target const &End, turntable_fit &Fit) const; + void turntable_find_fits(); + void turntable_build(std::vector const &Fits); + bool turntable_exit_at(glm::dvec3 const &Ground, double &Heading, double &Length) const; + void turntable_store_exits(); + void render_turntable_ui(); + void draw_turntable_overlay() const; struct extend_tool { bool active{false}; @@ -544,6 +662,9 @@ class editor_mode : public application_mode, private editor_track::observer glm::dvec3 mouse{0.0}; int path{0}; bool atend{true}; + editor_track::snap_target origin; + editor_track::snap_target snap; + glm::vec2 pressed{0.f}; }; extend_tool m_extend; // lays new track through the clicked points, with no path needed to start from @@ -570,18 +691,21 @@ class editor_mode : public application_mode, private editor_track::observer void lay_click(); void lay_finish(editor_track::snap_target const &End); void lay_cancel(); + void lay_enter(); + bool lay_heading(glm::dvec2 &Heading) const; std::vector lay_pieces(std::vector const &Points, editor_track::snap_target const &End, double &Length, std::string &Error) const; void render_switch_ui(); bool start_switch_placement(); void finish_switch_placement(); std::vector switch_preview() const; void insert_switch(editor_track::straight const &Line, double const Along, int const Direction, int const Side); + void switch_placed(std::vector const &Created); static std::vector sample_chain(editor_track::chain const &Chain); static curve_sample sample_at(std::vector const &Frame, double const Station); static double nearest_station(std::vector const &Frame, glm::dvec3 const &Point); static std::vector curved_switch_paths(editor_track::switch_template const &Shape, std::vector const &Frame, double const Station, int const Direction, int const Side); void insert_curved_switch(int const Direction, int const Side); - bool place_switch_on_straight(editor_track::straight const &Line, editor_track::switch_template const &Shape, TTrack const *Style, double const Along, int const Direction, int const Side, bool const Snap, std::vector> &States, std::vector &Created, std::vector &Removed); + bool place_switch_on_straight(editor_track::straight const &Line, editor_track::switch_template const &Shape, TTrack const *Style, double const Along, int const Direction, int const Side, bool const Snap, std::vector> &States, std::vector &Created, std::vector &Removed, std::string const &Name = {}); struct crossover_plan { editor_track::straight target; @@ -597,7 +721,7 @@ class editor_mode : public application_mode, private editor_track::observer bool insert_double_slip(editor_track::straight const &Line, glm::dvec3 const &Point, editor_track::switch_template const &Shape); bool replace_double_slip(TTrack &Part, editor_track::switch_template const &Shape); std::vector build_double_slip(glm::dvec3 const &PointA, glm::dvec3 const &PointB, glm::dvec3 const &PointC, glm::dvec3 const &PointD, glm::dvec2 const &Crossing, double const Height, glm::dvec2 const &First, glm::dvec2 const &Second, double const Angle, double const Radius, TTrack &Style); - bool start_extend(); + bool start_extend(editor_track::snap_target const &End); void finish_extend(); std::vector extend_pieces() const; // the free end of the path as the start of a new track; false if it isn't free or has no direction @@ -614,7 +738,7 @@ class editor_mode : public application_mode, private editor_track::observer void update_build_tools(); void draw_build_overlay() const; // modes of the track editor, one at a time: path is the plain selection - enum class track_tab { straights, route, path, turnout, profile, speed, infra, lay }; + enum class track_tab { straights, route, path, turnout, profile, speed, joints, infra, lay, lineside, turntable }; struct track_mode { char const *label; @@ -622,7 +746,10 @@ class editor_mode : public application_mode, private editor_track::observer track_tab tab; char const *tooltip; }; - static std::array const &track_modes(); + static std::array const &track_modes(); + // the objects along the track: a tab for each tool + int m_lineside_tab{0}; + void render_lineside_ui(); void render_track_menu(); void arm_switch(); bool m_track_window_open{false}; @@ -630,11 +757,21 @@ class editor_mode : public application_mode, private editor_track::observer void render_track_inspector(); void render_track_modes(TTrack *Track); void show_track_tab(track_tab const Tab); - bool track_analysis_tab() const { return m_track_tab == track_tab::profile || m_track_tab == track_tab::speed || m_track_tab == track_tab::infra; } + bool track_analysis_tab() const { return m_track_tab == track_tab::profile || m_track_tab == track_tab::speed || m_track_tab == track_tab::joints || m_track_tab == track_tab::infra; } bool track_shortcut(int const Key); bool track_busy() const; // something going on in the mode, which Esc drops before it leaves the mode std::string track_mode_name() const; void render_turnout_ui(); + struct track_name_edit + { + TTrack const *track{nullptr}; + std::string synced; + char text[128]{}; + editor_track::name_uses uses; + std::string status; + }; + track_name_edit m_track_name; + void render_track_name(TTrack &Track); void render_path_parameters(TTrack &Track); void render_straight_ui(); track_tab m_track_tab{track_tab::path}; @@ -651,6 +788,431 @@ class editor_mode : public application_mode, private editor_track::observer void render_track_guide(); std::string track_readout() const; void draw_track_hints(); + // path under the cursor, outlined before a click so it's known which one the click takes + struct track_hover + { + TTrack *track{nullptr}; + int path{0}; + glm::dvec3 point{0.0}; + double since{0.0}; + }; + track_hover m_hover; + track_hover track_under_cursor() const; + void update_track_hover(); + void draw_track_hover() const; + struct track_intent + { + enum class kind { none, gizmo, select, point, box, straight_set, straight_break, detour, straight_tool, straight_handle, route_vertex, route_grip, switch_at, lay, lay_end, sweep, turntable_place, turntable_exit, turntable_fit, spread, extend_end }; + kind what{kind::none}; + TTrack *track{nullptr}; + int path{0}; + editor_track::point_ref point; + int index{-1}; + glm::dvec3 position{0.0}; + editor_track::snap_target snap; + std::string action; + }; + track_intent m_intent; + track_intent track_intent_at(int const Mods); + bool track_gesture_on() const; + void update_track_intent(); + void track_press(track_intent const &Intent); + void turntable_press(track_intent const &Intent); + track_intent turntable_intent(glm::dvec3 const &Ground, bool const Shift); + void draw_track_intent() const; + editor_track::snap_target snap_free_end(glm::dvec3 const &Near, glm::vec2 const &Screen, TTrack const *Self, int const Category, std::vector const &Exclude) const; + void draw_free_ends(TTrack const *Self, int const Category, std::vector const &Exclude) const; + struct point_drag + { + bool active{false}; + bool moved{false}; + glm::vec2 from{0.f}; + double height{0.0}; + }; + point_drag m_point_drag; + struct handle_drag + { + bool active{false}; + bool moved{false}; + glm::vec2 from{0.f}; + double height{0.0}; + glm::dvec3 offset{0.0}; + glm::dvec3 position{0.0}; + }; + handle_drag m_handle_drag; + void handle_drag_start(glm::dvec3 const &Anchor); + bool handle_drag_step(glm::dvec3 &Position); + void point_drag_start(editor_track::point_ref const &Point); + void point_drag_update(); + void point_drag_finish(); + bool route_hit(int &Vertex, int &Grip) const; + int straight_handle_hit(); + bool switch_reach(glm::dvec3 const &Ground, glm::dvec3 &Point); + glm::dvec3 cursor_ground() const; + glm::dvec3 cursor_level(double const Height) const; + bool sweep_grabs(glm::dvec3 const &Point); + // menu of the path a click of the right mouse button lands on + struct track_context + { + track_hover target; + std::chrono::steady_clock::time_point pressed; + glm::vec3 angle{0.f}; + glm::vec2 mouse{0.f}; + bool armed{false}; + bool pending{false}; + }; + track_context m_track_context; + void track_context_press(); + void track_context_release(); + void render_track_context(); + void split_track_at(TTrack &Track, glm::dvec3 const &Point); + void focus_track(TTrack &Track, int const Path, glm::dvec3 const &Point); + // paths found by their names + struct track_search + { + char text[64]{}; + std::string searched; + std::vector found; + std::size_t total{0}; + bool focus{false}; + }; + track_search m_track_search; + void render_track_search(); + // paths selected together: Shift+LMB adds or takes one out, Shift+drag adds those in the box + std::vector m_track_set; + struct track_box + { + bool active{false}; + glm::vec2 from{0.f}; + glm::vec2 to{0.f}; + TTrack *hovered{nullptr}; + }; + track_box m_track_box; + struct track_set_fields + { + double velocity{100.0}; + char rail[128]{}; + char trackbed[128]{}; + char circuits[256]{}; + int environment{0}; + }; + track_set_fields m_track_set_fields; + glm::mat4 m_track_set_gizmo{1.0f}; + bool m_track_set_using{false}; + glm::dvec3 m_track_set_pivot{0.0}; + std::vector>> m_track_set_joints; + bool in_track_set(TTrack const *Track) const; + void track_set_toggle(TTrack &Track); + void track_set_prune(); + void start_track_box(); + void finish_track_box(); + void draw_track_set() const; + void render_track_set_ui(); + void render_track_set_gizmo(); + void track_set_delete(); + struct track_spread + { + int stop{0}; + bool same_rails{false}; + bool same_bed{false}; + bool same_speed{false}; + float reach{0.f}; + TTrack const *from{nullptr}; + int signature{-1}; + std::vector preview; + double length{0.0}; + }; + mutable track_spread m_spread; + std::vector track_spread_from(TTrack &Start) const; + std::vector const &track_spread_preview(TTrack &Start) const; + void track_spread_apply(TTrack &Start); + void track_set_grow(); + void render_track_spread_ui(); + void draw_track_spread() const; + // changes each path of the set which can be changed; false from Change: the path stays as it was + void track_set_apply(std::function const &Change, bool const Rebuild, char const *What); + // second track alongside the selected path or the line through it, at a spacing, curves included + struct parallel_tool + { + bool open{false}; + bool expand{false}; + double spacing{4.0}; + int side{1}; // 1: to the right, -1: to the left, of the direction of the line + int scope{1}; // 0: the selected path, 1: the line through it, up to the switches + TTrack *built_for{nullptr}; + double built_spacing{0.0}; + int built_side{0}; + int built_scope{-1}; + std::size_t built_history{0}; + std::vector pieces; + std::vector styles; + double length{0.0}; + std::string error; + std::string status; + }; + parallel_tool m_parallel; + void parallel_update(); + void render_parallel_ui(); + void parallel_build(); + void draw_parallel_preview() const; + + // scenery templates standing by the track, placed and checked by the editor + struct template_item + { + std::string file; + glm::dvec3 location{0.0}; // world space + double yaw{0.0}; + std::vector rest; // parameters after the rotation + bool described{false}; + std::string track; + }; + struct standing_template + { + scene::instance_handle instance{0}; + std::string file; // lower case, forward slashes + glm::dvec3 location{0.0}; + double yaw{0.0}; + std::vector values; + }; + // includes of the templates whose file names the test accepts, with the location in p2..p4 and the rotation in p5 + std::vector standing_templates(std::function const &Accept) const; + // places them in the active layer, as one step of the undo. returns: how many were placed + std::size_t place_templates(std::vector const &Items, std::string &Error); + // moves them, as one step of the undo + std::size_t move_templates(std::vector> const &Moves); + // takes them out, as one step of the undo + std::size_t remove_templates(std::vector const &Instances); + + // hectometre posts along the line, at every 100 m of the kilometrage + struct hekto_post + { + int hectometres{0}; + double chainage{0.0}; + glm::dvec3 position{0.0}; + double yaw{0.0}; + int standing{-1}; // post already there with this number + }; + struct hekto_found + { + standing_template post; + int hectometres{0}; + double chainage{0.0}; // where it stands along the line + double expected{0.0}; // where its number belongs + double error{0.0}; // m along the line + double distance{0.0}; // m from where it belongs, in the plan + bool wrong{false}; + bool duplicate{false}; // another post with the same number stands nearer to its place + bool outside{false}; // its number belongs past the ends of the line + }; + struct hekto_tool + { + bool open{false}; + bool expand{false}; + TTrack *track{nullptr}; // the line runs through it + glm::dvec3 point{0.0}; // where the kilometrage is given + double km{0.0}; + bool km_read{false}; // the kilometrage was read from the posts already standing + int growth{1}; // 1: grows along the line, -1: against + int side{1}; // 1: to the right of the growing kilometrage, -1: to the left, 0: alternately + double offset{3.0}; // m from the axis + int style{0}; // nowy, stary, zgnity, mixed + int turn{0}; // degrees added to the rotation + double reach{10000.0}; // m each way + double tolerance{5.0}; // m along the line, for the posts standing + bool dirty{true}; + std::size_t history{0}; + editor_track::route route; + std::vector samples; + double origin{0.0}; // chainage of the point + std::vector posts; + std::vector found; + std::string status; + std::string error; + }; + hekto_tool m_hekto; + void hekto_start(TTrack &Track, glm::dvec3 const &Point); + void hekto_update(); + void hekto_read_kilometrage(); + void hekto_place(); + void hekto_fix(); + void hekto_remove_duplicates(); + void render_hekto_ui(); + void draw_hekto_overlay() const; + + // fouling point markers (W17) where the tracks meeting at a switch are the spacing apart + struct fouling_point + { + TTrack *track{nullptr}; // the switch + glm::dvec3 position{0.0}; + double yaw{0.0}; + int standing{-1}; // marker already there + }; + struct fouling_found + { + standing_template marker; + int point{-1}; // the fouling point it belongs to + double error{0.0}; // m from where it belongs + double height_error{0.0}; // m over where it belongs + bool wrong{false}; + }; + struct fouling_tool + { + bool open{false}; + bool expand{false}; + int scope{0}; // 0: the selected switch, 1: around the camera, 2: the whole scenery + double reach{1500.0}; + double spacing{3.5}; // m between the axes + double tolerance{2.0}; // m, a marker farther than this from its point is wrong + int height_mode{1}; // 0: on the ground, 1: at the height given over the rail heads + double height{0.0}; // m over the rail heads + double height_tolerance{0.03}; // m, a marker standing higher or lower than this is wrong + int model{0}; // w17, w17_new, w17_old, w17_dwuteo + int turn{0}; + bool dirty{true}; + std::size_t history{0}; + TTrack *selected{nullptr}; + std::vector points; + std::vector found; + std::string status; + std::string error; + }; + fouling_tool m_fouling; + void fouling_update(); + void fouling_place(); + void fouling_fix(); + void render_fouling_ui(); + void draw_fouling_overlay() const; + + // a vehicle put on the selected path, to be driven: it isn't written to the scenery files + struct vehicle_tool + { + bool open{false}; + bool expand{false}; + std::shared_ptr bank; + char search[64]{}; + bool controllable_only{true}; + std::shared_ptr vehicle; + std::shared_ptr skin; + int driver{0}; // 0: a driver, to be driven; 1: nobody, parked + TTrack *track{nullptr}; + glm::dvec3 point{0.0}; + std::string placed; + std::string status; + bool leave{false}; // the editor gives way to the driving at the start of the next frame + struct consist_vehicle + { + std::shared_ptr vehicle; + std::shared_ptr skin; + bool turned{false}; + }; + std::vector consist; + int facing{1}; + }; + vehicle_tool m_vehicle; + void vehicle_start(TTrack &Track, glm::dvec3 const &Point); + bool vehicle_place(); + void render_vehicle_ui(); + void draw_vehicle_marker() const; + + // a model laid along the track: bent to follow it, or repeated along it + struct sweep_tool + { + bool open{false}; + bool expand{false}; + char model[256]{}; + char skin[128]{"none"}; + char search[64]{}; + std::vector models; + bool scanned{false}; + // parameters of a template laid along the track, with their names + std::string parameters_for; + std::vector> parameters; + std::vector parameter_labels; + std::vector parameter_placement; // filled in with zeros: the template is placed in its own space + std::vector> parameter_choices; // variants of the textures a parameter is a part of the name of + int length_mode{0}; // 0: one copy as long as the original, 1: the length given, 2: the whole stretch of the line + double length{200.0}; + sweep_node::state settings; + int axis{0}; // 0: the longer one of the model, 1: z, 2: x + double model_length{0.0}; + std::string measured; // model the length is of + // the curve: the axis of the track + TTrack *curve_for{nullptr}; + std::size_t curve_history{0}; + struct piece + { + TTrack *track{nullptr}; + int path{0}; + bool forward{true}; + }; + std::vector curve_pieces; + std::vector curve; + double curve_length{0.0}; + std::vector outline; // of the curve, for the preview + std::vector stations; + // marking the stretch in the view: press where it starts, the distance from the track sets the offset, drag to the end + bool marking{false}; + bool dragging{false}; + double anchor{0.0}; // station the drag started at + sweep_node *edited{nullptr}; + std::string status; + }; + sweep_tool m_sweep; + // paths the models along curves were laid on, so they follow the changes of the paths + struct sweep_link + { + sweep_node *sweep{nullptr}; + std::size_t piece{0}; + TTrack *track{nullptr}; + int path{0}; + bool reversed{false}; + }; + std::vector m_sweep_links; + void sweep_curve(); + void sweep_outline(); + bool sweep_extend(bool const Atend, glm::dvec3 const &Cursor); + double sweep_station(glm::dvec3 const &Point, double &Lateral) const; + void sweep_scan_models(); + void sweep_measure(); + sweep_node::state sweep_definition() const; + void sweep_create(); + void sweep_apply(); + void sweep_delete(sweep_node &Sweep); + void sweep_edit(sweep_node &Sweep); + std::vector sweeps_near(TTrack const &Track) const; + bool sweep_press(); + void sweep_drag(); + void sweep_release(); + // the same at a point of the world: Anywhere takes the press however far from the track it is + bool sweep_press_at(glm::dvec3 const &Point, bool const Anywhere); + void sweep_drag_at(glm::dvec3 const &Point); + void render_sweep_ui(); + void draw_sweep_overlay() const; + void restore_sweeps(EditorSnapshot &Snapshot); + void sweeps_captured(TTrack const &Track); + void sweeps_committed(std::vector const &Tracks); + void sweeps_split(TTrack &Original, TTrack &Created); + + // script of editor actions given in the EU07_EDITOR_SELFTEST file, run a step at a time, for testing without a person + struct selftest + { + bool loaded{false}; + std::vector lines; + std::size_t next{0}; + int wait{0}; + bool quitting{false}; + }; + selftest m_selftest; + void selftest_step(); + // a value typed during a gesture, taken instead of the one the cursor gives + std::string m_typed; + // what the typed value sets in the gesture under way, nullptr when the gesture takes none + char const *typed_meaning() const; + std::vector typed_values() const; + bool typed_key(int const Key); + void typed_extend(); + glm::dvec3 typed_lay(glm::dvec3 const &Mouse) const; + void typed_turn(); bool m_route_tab{true}; // vertical profile (grade line) along a route @@ -674,6 +1236,7 @@ class editor_mode : public application_mode, private editor_track::observer // the editor terrain led to the grade line: formation under the track, slopes down or up to the ground struct earthworks { + bool from_ballast{true}; double depth{0.7}; // m, formation below the top of the rail double half_width{3.5}; // m, from the axis of the route to the edge of the formation double slope{1.5}; // horizontal run of the slopes per metre of height @@ -681,6 +1244,9 @@ class editor_mode : public application_mode, private editor_track::observer double rounding{1.5}; // m, over which the slopes bend into the formation and into the ground // heights of the terrain before the last shaping std::vector>> undo; + bool generate{true}; + std::vector> generated; + bool generated_streaming{false}; } earthworks; double view_from{0.0}; double view_to{100.0}; @@ -736,7 +1302,9 @@ class editor_mode : public application_mode, private editor_track::observer void profile_resample(); void profile_recognize(); void profile_fit_ground(); + static std::pair profile_ballast(TTrack const &Track); void profile_shape_ground(); + std::pair profile_generate_ground(std::vector> const &Beds, double const Reach); void profile_restore_ground(); void render_profile_earthworks(); void profile_check(); @@ -762,6 +1330,13 @@ class editor_mode : public application_mode, private editor_track::observer std::string reason; bool chosen{false}; bool bound{false}; + TTrack *reader{nullptr}; + std::string event; // of that path + std::string cell; + bool loose{false}; + TTrack *nearer{nullptr}; + glm::dvec3 nearer_foot{0.0}; + bool unread{false}; }; struct infra_window { @@ -774,6 +1349,11 @@ class editor_mode : public application_mode, private editor_track::observer std::vector rules{infra::default_rules()}; std::vector tracks; // of the scope std::vector candidates; + int filter{0}; + int read{0}; + int overruled{0}; + int unread{0}; + int elsewhere{0}; int hovered{-1}; std::string status; std::string error; @@ -827,6 +1407,36 @@ class editor_mode : public application_mode, private editor_track::observer void speed_apply(std::vector const &Indices, bool const Branches); std::vector speed_listed() const; void draw_speed_overlay() const; + + // joints of the paths: ends which almost meet, steps, kinks, jumps of the cant and of the grade + struct joints_state + { + bool open{false}; + int scope{0}; // 0: around the camera, 1: the whole scenery + double reach{2000.0}; + double gap{1.0}; // m, free ends closer than this to another end + double step{0.005}; // m + double angle{0.2}; // deg + double cant{5.0}; // mm + double grade{10.0}; // per mille + bool free_ends{false}; + std::vector queue; + std::size_t next{0}; + std::vector issues; + int filter{-1}; + int selected{-1}; + std::size_t history{0}; + std::string status; + }; + joints_state m_joints; + void joints_start(); + void joints_step(); + void joints_check(TTrack &Track); + void joints_focus(int const Index); + bool joint_fix(joint_issue &Issue, std::vector> &States, std::vector &Changed); + void joints_fix(std::vector const &Indices); + void render_joints_body(); + void draw_joints_overlay() const; void infra_rebase(); void render_infra_search(); void render_infra_candidates(); diff --git a/application/editormodeinfra.cpp b/application/editormodeinfra.cpp index 00e6a60a5..056b6b00e 100644 --- a/application/editormodeinfra.cpp +++ b/application/editormodeinfra.cpp @@ -43,6 +43,7 @@ http://mozilla.org/MPL/2.0/. namespace { +using geometry::bezier; using geometry::plan_distance; using geometry::plan_of; @@ -419,6 +420,159 @@ class track_index std::map> m_cells; }; +struct cell_reader +{ + TTrack *track{nullptr}; + std::string event; + std::string cell; + bool loose{false}; +}; + +class event_links +{ + public: + event_links() + { + std::unordered_map named; + for (auto *track : simulation::Paths.sequence()) + if (track != nullptr && false == track->m_editorremoved && false == track->name().empty() && track->name() != "none") + named.emplace(track->name(), track); + for (auto *track : simulation::Paths.sequence()) + { + if (track == nullptr || track->m_editorremoved) + continue; + for (auto const *sequence : {&track->m_events0, &track->m_events1, &track->m_events2, &track->m_events0all, &track->m_events1all, &track->m_events2all}) + for (auto const &entry : *sequence) + read(track, entry.second != nullptr ? entry.second : simulation::Events.FindEvent(entry.first), entry.first.empty()); + } + static std::set const kinds{"event0", "event1", "event2", "eventall0", "eventall1", "eventall2"}; + std::unordered_set models(simulation::Instances.sequence().begin(), simulation::Instances.sequence().end()); + std::unordered_set cells(simulation::Memory.sequence().begin(), simulation::Memory.sequence().end()); + for (auto *event : simulation::Events.sequence()) + { + if (event == nullptr) + continue; + auto const &name{event->name()}; + auto const colon{name.rfind(':')}; + if (colon != std::string::npos && colon > 0 && kinds.count(name.substr(colon + 1)) > 0) + { + auto const track{named.find(name.substr(0, colon))}; + if (track != named.end()) + read(track->second, event, true); + } + auto const *multi{dynamic_cast(event)}; + if (multi == nullptr) + continue; + std::vector shown; + std::vector set; + for (auto *child : multi->children()) + { + auto const setter{dynamic_cast(child) != nullptr || dynamic_cast(child) != nullptr}; + for (auto *target : child->target_nodes()) + { + if (models.count(target) > 0 && false == contains(shown, static_cast(target))) + shown.push_back(target); + else if (setter && cells.count(target) > 0 && false == contains(set, static_cast(target))) + set.push_back(static_cast(target)); + } + } + if (shown.size() > 4 || set.size() > 4) + continue; + for (auto const *model : shown) + for (auto *cell : set) + if (plan_distance(model->location(), cell->location()) <= kCellReach && false == contains(m_cells[model], cell)) + m_cells[model].push_back(cell); + } + for (auto *cell : simulation::Memory.sequence()) + { + if (cell == nullptr) + continue; + if (cell->m_instance != 0) + m_included[cell->m_instance].push_back(cell); + if (false == cell->name().empty() && cell->name() != "none") + m_named.emplace_back(cell->name(), cell); + } + std::sort(m_named.begin(), m_named.end(), [](auto const &A, auto const &B) { return A.first < B.first; }); + } + std::vector cells_of(infra::binding const &Binding) const + { + std::vector result; + switch (Binding.type) + { + case infra::kind::memcell: result.push_back(static_cast(Binding.node)); break; + case infra::kind::include: + { + auto const found{m_included.find(Binding.include)}; + if (found != m_included.end()) + result = found->second; + break; + } + case infra::kind::model: + { + auto const found{m_cells.find(Binding.node)}; + if (found != m_cells.end()) + result = found->second; + auto const &name{Binding.node->name()}; + if (result.empty() && name.size() >= 3 && name != "none") + for (auto entry{std::lower_bound(m_named.begin(), m_named.end(), name, [](auto const &Entry, std::string const &Name) { return Entry.first < Name; })}; + entry != m_named.end() && entry->first.compare(0, name.size(), name) == 0; ++entry) + if (plan_distance(entry->second->location(), Binding.node->location()) <= kCellReach) + result.push_back(entry->second); + break; + } + default: break; + } + return result; + } + std::vector readers_of(std::vector const &Cells) const + { + std::vector result; + for (auto const *cell : Cells) + { + auto const found{m_readers.find(cell)}; + if (found == m_readers.end()) + continue; + for (auto const &reader : found->second) + if (std::none_of(result.begin(), result.end(), [&](cell_reader const &Reader) { return Reader.track == reader.track; })) + result.push_back(reader); + } + return result; + } + + private: + static constexpr double kCellReach{60.0}; + void read(TTrack *Track, basic_event *Event, bool const Loose) + { + std::vector pending{Event}; + std::unordered_set seen; + while (false == pending.empty()) + { + auto *event{pending.back()}; + pending.pop_back(); + if (event == nullptr || false == seen.insert(event).second) + continue; + if (auto const *multi{dynamic_cast(event)}) + { + auto const children{multi->children()}; + pending.insert(pending.end(), children.begin(), children.end()); + continue; + } + if (dynamic_cast(event) == nullptr) + continue; + auto const targets{event->target_nodes()}; + if (targets.empty()) + continue; + auto &list{m_readers[targets.front()]}; + if (std::none_of(list.begin(), list.end(), [&](cell_reader const &Reader) { return Reader.track == Track; })) + list.push_back({Track, Event->name(), targets.front()->name(), Loose}); + } + } + std::unordered_map> m_readers; + std::unordered_map> m_cells; + std::unordered_map> m_included; + std::vector> m_named; +}; + // lookup of points by a grid of 1 m cells in the plan template class point_grid @@ -711,8 +865,10 @@ void editor_mode::infra_recognize() state.error = (state.scope == 2 ? STR_C("Open the vertical profile of a route first") : state.scope == 3 ? STR_C("The scenery has no paths the editor can handle") : STR_C("Select a path first")); return; } + state.read = state.overruled = state.unread = state.elsewhere = 0; track_index index; std::unordered_set names; + std::unordered_set const scope(state.tracks.begin(), state.tracks.end()); for (auto *track : state.tracks) { index.add(*track); @@ -720,6 +876,18 @@ void editor_mode::infra_recognize() names.insert(track->name()); } Live.refresh(); + event_links const links; + std::unordered_map> threads; + auto const thread_of = [&](TTrack *Reader) -> std::vector const & { + auto found{threads.find(Reader)}; + if (found != threads.end()) + return found->second; + std::vector areas; + for (auto const &span : editor_track::run_route(*Reader, 250.0).spans) + if (scope.count(span.track) > 0 && std::none_of(areas.begin(), areas.end(), [&](track_area const &Area) { return Area.track == span.track; })) + areas.push_back(area_of(*span.track)); + return threads.emplace(Reader, std::move(areas)).first->second; + }; auto const corridor{static_cast(state.corridor)}; auto const add = [&](infra::binding Binding, std::string const &Reason, double const Reach) { @@ -727,12 +895,57 @@ void editor_mode::infra_recognize() std::optional yaw; if (false == object_points(Binding, points, yaw)) return; - for (auto const &point : points) + infra_candidate candidate; + auto const cells{points.size() == 1 ? links.cells_of(Binding) : std::vector{}}; + auto const readers{links.readers_of(cells)}; + infra::station geometric; + auto const near{index.nearest(points.front(), Reach, geometric)}; + if (false == readers.empty()) { + auto best{-1.0}; infra::station station; - if (false == index.nearest(point, Reach, station)) + for (auto const &reader : readers) + { + infra::station at; + auto const &thread{thread_of(reader.track)}; + if (false == nearest_beside(thread, points.front(), std::max(Reach, 25.0), at)) + continue; + auto const distance{plan_distance(infra::frame_at(at).point, points.front())}; + if (best < 0.0 || distance < best) + { + best = distance; + station = at; + candidate.reader = reader.track; + candidate.event = reader.event; + candidate.cell = reader.cell; + candidate.loose = reader.loose; + } + } + if (candidate.reader == nullptr) + { + state.elsewhere += near ? 1 : 0; return; - Binding.anchors.push_back(infra::make_anchor(station, point)); + } + auto const &thread{thread_of(candidate.reader)}; + if (near && geometric.track != station.track && std::none_of(thread.begin(), thread.end(), [&](track_area const &Area) { return Area.track == geometric.track; })) + { + candidate.nearer = geometric.track; + candidate.nearer_foot = infra::frame_at(geometric).point; + } + Binding.anchors.push_back(infra::make_anchor(station, points.front())); + if (Binding.group == infra::category::other && Binding.type != infra::kind::memcell) + Binding.group = infra::category::signal; + } + else + { + for (auto const &point : points) + { + infra::station station; + if (false == index.nearest(point, Reach, station)) + return; + Binding.anchors.push_back(infra::make_anchor(station, point)); + } + candidate.unread = (false == cells.empty() && Binding.type != infra::kind::memcell && Binding.group == infra::category::signal); } if (std::abs(Binding.anchors.front().height) > 40.0) return; @@ -740,12 +953,14 @@ void editor_mode::infra_recognize() if (Binding.turns) Binding.yaw = turn_of(Binding, *yaw); Binding.label = object_label(Binding); - infra_candidate candidate; candidate.offset = Binding.anchors.front().offset; candidate.reason = Reason; candidate.bound = (infra_find(Binding) != nullptr); candidate.chosen = (false == candidate.bound && Binding.group != infra::category::other); candidate.binding = std::move(Binding); + state.read += candidate.reader != nullptr ? 1 : 0; + state.overruled += candidate.nearer != nullptr ? 1 : 0; + state.unread += candidate.unread ? 1 : 0; state.candidates.push_back(std::move(candidate)); }; auto const rule_reason = [](infra::category const Group, char const *What) { return Group == infra::category::other ? std::string{"nearby, no rule matches the "} + What : std::string{"the "} + What + " matches a rule"; }; @@ -805,6 +1020,8 @@ void editor_mode::infra_recognize() } std::stable_sort(state.candidates.begin(), state.candidates.end(), [](infra_candidate const &A, infra_candidate const &B) { return A.binding.group < B.binding.group; }); state.status = format(STR_C("%d object(s) found along %d path(s)"), static_cast(state.candidates.size()), static_cast(state.tracks.size())); + if (state.elsewhere > 0) + state.status += format(STR_C("; %d left out: they stand by the scope, but the paths which read them are elsewhere"), state.elsewhere); } void editor_mode::infra_bind_chosen() @@ -910,6 +1127,7 @@ void editor_mode::infra_buffer(infra::binding const &Binding, bool const Refresh void editor_mode::track_captured(TTrack const &Track) { + sweeps_captured(Track); if (m_infra_suspended || false == m_infra.follow) return; infra_load(); @@ -947,6 +1165,7 @@ void editor_mode::track_captured(TTrack const &Track) void editor_mode::tracks_committed(std::vector const &Tracks) { + sweeps_committed(Tracks); if (m_infra_suspended || false == m_infra.follow) return; infra_load(); @@ -1031,6 +1250,7 @@ void editor_mode::track_retired(TTrack &) void editor_mode::track_split(TTrack &Original, TTrack &Created, segment_data const &First) { + sweeps_split(Original, Created); if (m_infra_suspended || Created.m_paths.empty()) return; auto const length{infra::plan_length(First)}; @@ -1185,9 +1405,9 @@ void editor_mode::infra_rebase() void editor_mode::render_infra_search() { auto &state{m_infra}; - static char const *const scopes[] = {"Selected path", "Line through the selected path", "Route of the vertical profile", "Whole scenery"}; + char const *const scopes[] = {STR_C("Selected path"), STR_C("Line through the selected path"), STR_C("Route of the vertical profile"), STR_C("Whole scenery")}; ImGui::SetNextItemWidth(260.f); - ImGui::Combo("Look along", &state.scope, scopes, IM_ARRAYSIZE(scopes)); + ImGui::Combo(STR_C("Look along"), &state.scope, scopes, IM_ARRAYSIZE(scopes)); if (state.scope == 1) { ImGui::SetNextItemWidth(120.f); @@ -1224,77 +1444,140 @@ void editor_mode::render_infra_candidates() { auto &state{m_infra}; auto &candidates{state.candidates}; + ImVec4 const readcolour{0.45f, 0.85f, 1.f, 1.f}; + ImVec4 const warncolour{1.f, 0.75f, 0.3f, 1.f}; + auto const shown = [&](infra_candidate const &Candidate) { + switch (state.filter) + { + case 1: return Candidate.reader != nullptr; + case 2: return Candidate.nearer != nullptr; + case 3: return Candidate.unread; + default: return true; + } + }; auto const choose = [&](std::optional const Group, bool const Chosen) { for (auto &candidate : candidates) - if (false == Group.has_value() || candidate.binding.group == *Group) + if ((false == Group.has_value() || candidate.binding.group == *Group) && shown(candidate)) candidate.chosen = Chosen && false == candidate.bound; }; state.hovered = -1; - if (false == candidates.empty()) - { - int chosen{0}; - for (auto const &candidate : candidates) - chosen += candidate.chosen ? 1 : 0; - ImGui::SameLine(); - if (ImGui::Button(format(STR_C("Bind the chosen (%d)"), chosen).c_str())) - infra_bind_chosen(); - ImGui::SameLine(); - if (ImGui::SmallButton(STR_C("All"))) - choose({}, true); - ImGui::SameLine(); - if (ImGui::SmallButton(STR_C("None"))) - choose({}, false); + if (candidates.empty()) + return; + int chosen{0}; + for (auto const &candidate : candidates) + chosen += candidate.chosen ? 1 : 0; + ImGui::SameLine(); + if (ImGui::Button(format(STR_C("Bind the chosen (%d)"), chosen).c_str())) + infra_bind_chosen(); + ImGui::SameLine(); + if (ImGui::SmallButton(STR_C("All"))) + choose({}, true); + ImGui::SameLine(); + if (ImGui::SmallButton(STR_C("None"))) + choose({}, false); - ImGui::BeginChild("##infracandidates", ImVec2(0.f, 260.f), true); - for (auto const group : infra::categories()) + if (state.read > 0 || state.unread > 0) + { + ImGui::TextColored(readcolour, STR_C("%d read by the paths"), state.read); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip(STR_C("The memory cell of the object is read by a getvalues event of a path, listed by the path, inside a multiple\n" + "event or written loose as :event. The object is bound to the thread of that path, not to the nearest one")); + if (state.overruled > 0) { - auto const count{std::count_if(candidates.begin(), candidates.end(), [&](infra_candidate const &Candidate) { return Candidate.binding.group == group; })}; - if (count == 0) - continue; - ImGui::PushStyleColor(ImGuiCol_Text, ImGui::ColorConvertU32ToFloat4(colour(group))); - auto const open{ImGui::TreeNodeEx(format("%s (%d)", infra::name(group), static_cast(count)).c_str(), group == infra::category::other ? 0 : ImGuiTreeNodeFlags_DefaultOpen)}; - ImGui::PopStyleColor(); ImGui::SameLine(); - if (ImGui::SmallButton((std::string{STR_C("all##g")} + infra::name(group)).c_str())) - choose(group, true); - ImGui::SameLine(); - if (ImGui::SmallButton((std::string{STR_C("none##g")} + infra::name(group)).c_str())) - choose(group, false); - if (false == open) - continue; - // the candidates are sorted by the category - auto const first{static_cast(std::distance(candidates.begin(), std::find_if(candidates.begin(), candidates.end(), [&](infra_candidate const &Candidate) { return Candidate.binding.group == group; })))}; - ImGuiListClipper clipper(static_cast(count)); - while (clipper.Step()) - for (int row = clipper.DisplayStart; row < clipper.DisplayEnd; ++row) - { - auto const i{static_cast(first + row)}; - auto &candidate{candidates[i]}; - ImGui::PushID(static_cast(i)); - if (candidate.bound) - { - ImGui::TextDisabled(STR_C("[bound]")); - } - else - { - ImGui::Checkbox("##chosen", &candidate.chosen); - } - ImGui::SameLine(); - ImGui::Text("%s", candidate.binding.label.c_str()); - if (ImGui::IsItemHovered()) - { - state.hovered = static_cast(i); - ImGui::SetTooltip(STR_C("%s, %s\n%.2f m %s of the axis, %.2f m above the rail top\n%s"), infra::name(candidate.binding.type), candidate.binding.anchors.front().at.track->name().c_str(), - std::abs(candidate.offset), candidate.offset >= 0.0 ? "right" : "left", candidate.binding.anchors.front().height, candidate.reason.c_str()); - } - ImGui::SameLine(); - ImGui::TextDisabled("%s %+.1f m", infra::name(candidate.binding.type), candidate.offset); - ImGui::PopID(); - } - ImGui::TreePop(); + ImGui::TextColored(warncolour, STR_C("%d of them nearer to another path"), state.overruled); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip(STR_C("By the distance alone these would go to the wrong thread. Check them in 3D: the dashed line goes to the nearer path")); + } + if (state.unread > 0) + { + ImGui::SameLine(); + ImGui::TextColored(warncolour, STR_C("%d signal(s) not read by any path"), state.unread); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip(STR_C("The signal has a memory cell, but no event of a path reads it: the vehicles won't see it.\nBound to the nearest path")); + } + static char const *const filters[] = {"All", "Read by a path", "Nearer to another path", "Not read"}; + for (int i = 0; i < IM_ARRAYSIZE(filters); ++i) + { + if (i > 0) + ImGui::SameLine(); + ImGui::RadioButton(STR_C(filters[i]), &state.filter, i); } - ImGui::EndChild(); } + + ImGui::BeginChild("##infracandidates", ImVec2(0.f, 260.f), true); + std::vector rows; + for (auto const group : infra::categories()) + { + rows.clear(); + for (int i = 0; i < static_cast(candidates.size()); ++i) + if (candidates[i].binding.group == group && shown(candidates[i])) + rows.push_back(i); + if (rows.empty()) + continue; + ImGui::PushStyleColor(ImGuiCol_Text, ImGui::ColorConvertU32ToFloat4(colour(group))); + auto const open{ImGui::TreeNodeEx(format("%s (%d)", infra::name(group), static_cast(rows.size())).c_str(), group == infra::category::other ? 0 : ImGuiTreeNodeFlags_DefaultOpen)}; + ImGui::PopStyleColor(); + ImGui::SameLine(); + if (ImGui::SmallButton((std::string{STR_C("all##g")} + infra::name(group)).c_str())) + choose(group, true); + ImGui::SameLine(); + if (ImGui::SmallButton((std::string{STR_C("none##g")} + infra::name(group)).c_str())) + choose(group, false); + if (false == open) + continue; + ImGuiListClipper clipper(static_cast(rows.size())); + while (clipper.Step()) + for (int row = clipper.DisplayStart; row < clipper.DisplayEnd; ++row) + { + auto const i{rows[row]}; + auto &candidate{candidates[i]}; + auto const &anchor{candidate.binding.anchors.front()}; + ImGui::PushID(i); + if (candidate.bound) + ImGui::TextDisabled(STR_C("[bound]")); + else + ImGui::Checkbox("##chosen", &candidate.chosen); + ImGui::SameLine(); + if (ImGui::Selectable(candidate.binding.label.c_str(), false, ImGuiSelectableFlags_None, ImVec2(ImGui::CalcTextSize(candidate.binding.label.c_str()).x, 0.f)) && anchor.at.track != nullptr) + focus_track(*anchor.at.track, anchor.at.path, anchor.foot); + if (ImGui::IsItemHovered()) + { + state.hovered = i; + std::string text{format(STR_C("%s, %s\n%.2f m %s of the axis, %.2f m above the rail top\n%s"), infra::name(candidate.binding.type), anchor.at.track->name().c_str(), std::abs(candidate.offset), + candidate.offset >= 0.0 ? "right" : "left", anchor.height, candidate.reason.c_str())}; + if (candidate.reader != nullptr) + text += format(STR_C("\nRead by the path %s: event %s, getvalues of the memory cell %s"), candidate.reader->name().c_str(), candidate.event.c_str(), candidate.cell.c_str()) + + (candidate.loose ? STR(" (written loose, the path takes it by the name)") : std::string{}); + if (candidate.nearer != nullptr) + text += format(STR_C("\nThe path %s is nearer, but it doesn't read the object"), candidate.nearer->name().c_str()); + if (candidate.unread) + text += STR("\nNo path reads the memory cell of the signal"); + text += STR("\nClick to look at it"); + ImGui::SetTooltip("%s", text.c_str()); + } + ImGui::SameLine(); + ImGui::TextDisabled("%s %+.1f m", infra::name(candidate.binding.type), candidate.offset); + if (candidate.reader != nullptr) + { + ImGui::SameLine(); + ImGui::TextColored(readcolour, STR_C("read by %s"), candidate.reader->name().c_str()); + } + if (candidate.nearer != nullptr) + { + ImGui::SameLine(); + ImGui::TextColored(warncolour, STR_C("(nearer: %s)"), candidate.nearer->name().c_str()); + } + if (candidate.unread) + { + ImGui::SameLine(); + ImGui::TextColored(warncolour, "%s", STR_C("not read")); + } + ImGui::PopID(); + } + ImGui::TreePop(); + } + ImGui::EndChild(); } void editor_mode::render_infra_bound() @@ -1369,11 +1652,53 @@ void editor_mode::draw_infra_overlay() const }; for (auto const &binding : m_bindings) draw(binding, binding.lost ? overlay_color::invalid : IM_COL32(90, 230, 110, 220), 3.5f); + auto const object = [&](infra_candidate const &Candidate) { + std::vector points; + std::optional yaw; + return object_points(Candidate.binding, points, yaw) ? points.front() : Candidate.binding.anchors.front().foot; + }; + auto const dashed = [&](glm::dvec3 const &From, glm::dvec3 const &To, ImU32 const Colour) { + auto const steps{std::clamp(static_cast(glm::distance(From, To) / 0.5), 2, 40)}; + for (int k = 0; k < steps; k += 2) + projection.line(drawlist, glm::mix(From, To, static_cast(k) / steps), glm::mix(From, To, static_cast(k + 1) / steps), Colour, 2.f); + }; for (int i = 0; i < static_cast(state.candidates.size()); ++i) { auto const &candidate{state.candidates[i]}; + if (candidate.nearer != nullptr && alive(candidate.binding) && glm::distance(candidate.nearer_foot, camera) <= 2000.0) + { + auto const point{object(candidate)}; + ImVec2 screen; + if (projection.project(point, screen)) + drawlist->AddCircle(screen, i == state.hovered ? 13.f : 8.f, IM_COL32(255, 190, 70, 230), 16, 2.f); + if (i == state.hovered) + dashed(point, candidate.nearer_foot, IM_COL32(255, 190, 70, 230)); + } if (candidate.bound) continue; draw(candidate.binding, colour(candidate.binding.group, candidate.chosen ? 255 : 110), i == state.hovered ? 9.f : (candidate.chosen ? 5.f : 3.f)); } + if (state.hovered >= 0 && state.hovered < static_cast(state.candidates.size())) + { + auto const &candidate{state.candidates[state.hovered]}; + auto const outline = [&](TTrack const *Track, ImU32 const Colour, float const Width) { + if (Track == nullptr || Track->m_editorremoved) + return; + for (auto const &path : Track->m_paths) + { + bezier const curve{path}; + auto const count{std::clamp(static_cast(curve.plan_length() / 3.0), 6, 64)}; + auto previous{curve.point(0.0)}; + for (int k = 1; k <= count; ++k) + { + auto const next{curve.point(static_cast(k) / count)}; + projection.line(drawlist, previous, next, Colour, Width); + previous = next; + } + } + }; + outline(candidate.binding.anchors.front().at.track, IM_COL32(255, 255, 255, 200), 3.f); + if (candidate.reader != candidate.binding.anchors.front().at.track) + outline(candidate.reader, IM_COL32(110, 215, 255, 220), 3.f); + } } diff --git a/application/editormodejoints.cpp b/application/editormodejoints.cpp new file mode 100644 index 000000000..71ea8976e --- /dev/null +++ b/application/editormodejoints.cpp @@ -0,0 +1,521 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "application/editormode.h" +#include "application/editoruilayer.h" +#include "application/editorprojection.h" +#include "editor/editorFormat.hpp" +#include "editor/editorGeometry.hpp" + +#include "scene/scene.h" +#include "scene/scenelayers.h" +#include "simulation/simulation.h" +#include "utilities/Logs.h" +#include "world/Track.h" + +#include "imgui/imgui.h" +#include "utilities/translation.h" +#include +#include +#include +#include +#include + +namespace +{ + +using geometry::grade_of; +using geometry::plan_of; + +double const kLinked{0.02}; // m, ends this close are joined by the simulation +double const kOverlayRange{3000.0}; +double const kGauge{1.5}; // m between the rails, for the cant +int const kRailCategory{1}; + +using kind = editor_mode::joint_issue::kind; + +bool rail(TTrack const &Track) +{ + return (Track.iCategoryFlag & 15) == kRailCategory && false == Track.m_editorremoved && editor_track::is_supported(Track); +} + +bool at_start(editor_track::point_ref const &Point) +{ + return Point.kind == editor_track::point_kind::start; +} + +// direction of the path at its end, into the path +glm::dvec3 into(TTrack const &Track, editor_track::point_ref const &Point) +{ + auto const &path{Track.m_paths[Point.path]}; + bool const start{at_start(Point)}; + auto const &point{path.points[start ? segment_data::point::start : segment_data::point::end]}; + auto const &control{path.points[start ? segment_data::point::control1 : segment_data::point::control2]}; + glm::dvec3 const direction{control != glm::dvec3{} ? control : path.points[start ? segment_data::point::end : segment_data::point::start] - point}; + return glm::length(direction) > 1e-9 ? glm::normalize(direction) : glm::dvec3{0.0, 0.0, 1.0}; +} + +// roll of the path at its end, for the travel into the path, in degrees +double roll_into(TTrack const &Track, editor_track::point_ref const &Point) +{ + auto const &path{Track.m_paths[Point.path]}; + return at_start(Point) ? path.rolls[0] : -path.rolls[1]; +} + +double plan_angle(glm::dvec3 const &A, glm::dvec3 const &B) +{ + auto const a{plan_of(A)}; + auto const b{plan_of(B)}; + if (glm::length(a) < 1e-9 || glm::length(b) < 1e-9) + return 0.0; + return glm::degrees(std::acos(std::clamp(glm::dot(glm::normalize(a), glm::normalize(b)), -1.0, 1.0))); +} + +using end_key = std::tuple; + +end_key key_of(TTrack const *Track, editor_track::point_ref const &Point) +{ + return {Track, Point.path, static_cast(Point.kind)}; +} + +// pairs of the ends already looked at in the check under way +std::set> reported; + +char const *kind_name(kind const Kind) +{ + switch (Kind) + { + case kind::gap: return "gap"; + case kind::step: return "step"; + case kind::kink: return "kink"; + case kind::cant: return "cant jump"; + case kind::grade: return "grade break"; + default: return "free end"; + } +} + +std::string value_text(editor_mode::joint_issue const &Issue) +{ + switch (Issue.type) + { + case kind::gap: return format("%.3f m", Issue.value); + case kind::step: return format("%.1f mm", Issue.value * 1000.0); + case kind::kink: return format("%.3f deg", Issue.value); + case kind::cant: return format("%.1f mm", Issue.value); + case kind::grade: return format("%.1f %%o", Issue.value); + default: return "-"; + } +} + +ImU32 kind_colour(kind const Kind) +{ + switch (Kind) + { + case kind::gap: return IM_COL32(255, 70, 60, 235); + case kind::step: return IM_COL32(255, 140, 50, 230); + case kind::kink: return IM_COL32(255, 190, 60, 225); + case kind::cant: return IM_COL32(200, 120, 255, 225); + case kind::grade: return IM_COL32(90, 200, 255, 220); + default: return IM_COL32(200, 200, 200, 200); + } +} + +std::string name_of(TTrack const *Track) +{ + if (Track == nullptr) + return "-"; + return Track->name().empty() ? std::string{"(noname)"} : Track->name(); +} + +} // namespace + +void editor_mode::joints_start() +{ + auto &state{m_joints}; + state.queue.clear(); + state.next = 0; + state.issues.clear(); + state.selected = -1; + state.status.clear(); + reported.clear(); + glm::dvec3 const camera{Global.pCamera.Pos}; + for (auto *track : simulation::Paths.sequence()) + { + if (track == nullptr || false == rail(*track)) + continue; + if (state.scope == 0 && glm::distance(track->location(), camera) > state.reach) + continue; + state.queue.push_back(track); + } + state.history = m_history.size(); +} + +void editor_mode::joints_check(TTrack &Track) +{ + auto &state{m_joints}; + auto const once = [&](end_key const &A, end_key const &B) { return reported.insert(A < B ? std::make_pair(A, B) : std::make_pair(B, A)).second; }; + for (int i = 0; i < static_cast(Track.m_paths.size()); ++i) + { + for (auto const kind_of_end : {editor_track::point_kind::start, editor_track::point_kind::end}) + { + editor_track::point_ref const point{i, kind_of_end}; + auto const position{editor_track::point_position(Track, point)}; + auto const connections{editor_track::connected_points(Track, position)}; + if (connections.empty()) + { + joint_issue nearest; + nearest.value = std::numeric_limits::max(); + for (auto *section : simulation::Region->sections(position, static_cast(state.gap))) + for (auto const &cell : section->m_cells) + for (auto *other : cell.m_directories.paths) + { + if (other == nullptr || other == &Track || false == rail(*other)) + continue; + for (int k = 0; k < static_cast(other->m_paths.size()); ++k) + for (auto const theirkind : {editor_track::point_kind::start, editor_track::point_kind::end}) + { + editor_track::point_ref const theirs{k, theirkind}; + auto const distance{glm::distance(position, editor_track::point_position(*other, theirs))}; + if (distance > state.gap || distance >= nearest.value) + continue; + nearest.track = &Track; + nearest.point = point; + nearest.other = other; + nearest.theirs = theirs; + nearest.value = distance; + } + } + if (nearest.other != nullptr) + { + if (once(key_of(&Track, point), key_of(nearest.other, nearest.theirs))) + { + nearest.type = kind::gap; + nearest.position = position; + state.issues.push_back(nearest); + } + } + else if (state.free_ends) + { + joint_issue open; + open.type = kind::open; + open.track = &Track; + open.point = point; + open.position = position; + state.issues.push_back(open); + } + continue; + } + for (auto const &connection : connections) + { + auto *other{connection.first}; + auto const &theirs{connection.second}; + if (false == rail(*other) || false == once(key_of(&Track, point), key_of(other, theirs))) + continue; + joint_issue issue; + issue.track = &Track; + issue.point = point; + issue.other = other; + issue.theirs = theirs; + issue.position = position; + auto const step{glm::distance(position, editor_track::point_position(*other, theirs))}; + auto const ours{into(Track, point)}; + auto const their{into(*other, theirs)}; + auto const angle{plan_angle(ours, -their)}; + auto const cant{kGauge * 1000.0 * std::abs(std::sin(glm::radians(roll_into(Track, point) + roll_into(*other, theirs))))}; + auto const grade{std::abs(grade_of(ours) + grade_of(their)) * 1000.0}; + auto const add = [&](kind const Kind, double const Value) { + issue.type = Kind; + issue.value = Value; + state.issues.push_back(issue); + }; + if (step > state.step) + add(kind::step, step); + if (angle > state.angle) + add(kind::kink, angle); + if (cant > state.cant) + add(kind::cant, cant); + if (grade > state.grade) + add(kind::grade, grade); + } + } + } +} + +void editor_mode::joints_step() +{ + auto &state{m_joints}; + if (state.next >= state.queue.size()) + return; + auto const deadline{std::chrono::steady_clock::now() + std::chrono::milliseconds(15)}; + while (state.next < state.queue.size() && std::chrono::steady_clock::now() < deadline) + { + auto *track{state.queue[state.next++]}; + if (track->m_editorremoved) + continue; + joints_check(*track); + } + if (state.next < state.queue.size()) + return; + std::stable_sort(state.issues.begin(), state.issues.end(), [](joint_issue const &A, joint_issue const &B) { + if (A.type != B.type) + return A.type < B.type; + return A.value > B.value; + }); + std::array counts{}; + for (auto const &issue : state.issues) + ++counts[static_cast(issue.type)]; + state.status = format(STR_C("%zu paths checked: %d gaps, %d steps, %d kinks, %d cant jumps, %d grade breaks"), state.queue.size(), counts[0], counts[1], counts[2], counts[3], counts[4]); + if (state.free_ends) + state.status += format(STR_C(", %d free ends"), counts[5]); + WriteLog("Editor: joints check - " + state.status, logtype::generic); +} + +void editor_mode::joints_focus(int const Index) +{ + auto &state{m_joints}; + if (Index < 0 || Index >= static_cast(state.issues.size())) + return; + state.selected = Index; + auto const &issue{state.issues[Index]}; + auto const &paths{simulation::Paths.sequence()}; + if (std::find(paths.begin(), paths.end(), issue.track) == paths.end() || issue.track->m_editorremoved) + return; + m_node = issue.track; + m_track_point = {}; + ui()->set_node(m_node); + focus_track(*issue.track, issue.point.path, issue.position); +} + +bool editor_mode::joint_fix(joint_issue &Issue, std::vector> &States, std::vector &Changed) +{ + if (Issue.fixed || Issue.type == kind::open || Issue.track == nullptr || Issue.other == nullptr || Issue.track->m_editorremoved || Issue.other->m_editorremoved) + return false; + auto const movable = [](TTrack const *Track) { + std::string reason; + return Track->eType == tt_Normal && editor_track::can_edit_geometry(*Track, reason) && scene::Layers.editable(Track); + }; + TTrack *mover{nullptr}; + editor_track::point_ref moved; + TTrack *fixed{nullptr}; + editor_track::point_ref held; + if (movable(Issue.track)) + { + mover = Issue.track; + moved = Issue.point; + fixed = Issue.other; + held = Issue.theirs; + } + else if (movable(Issue.other) && (Issue.type != kind::gap || false == editor_track::is_connected(*Issue.other, Issue.theirs))) + { + mover = Issue.other; + moved = Issue.theirs; + fixed = Issue.track; + held = Issue.point; + } + if (mover == nullptr) + return false; + if (std::none_of(States.begin(), States.end(), [&](auto const &Entry) { return Entry.first == mover; })) + States.emplace_back(mover, editor_track::capture(*mover)); + if (std::find(Changed.begin(), Changed.end(), mover) == Changed.end()) + Changed.push_back(mover); + editor_track::snap_target target; + target.track = fixed; + target.point = held; + target.position = editor_track::point_position(*fixed, held); + target.direction = into(*fixed, held); + switch (Issue.type) + { + case kind::gap: + case kind::kink: + case kind::grade: + editor_track::snap_point(*mover, moved, target, true); + break; + case kind::step: + editor_track::snap_point(*mover, moved, target, false); + break; + case kind::cant: + { + auto &path{mover->m_paths[moved.path]}; + auto const roll{static_cast(roll_into(*fixed, held))}; + if (at_start(moved)) + path.rolls[0] = -roll; + else + path.rolls[1] = roll; + break; + } + default: + break; + } + Issue.fixed = true; + return true; +} + +void editor_mode::joints_fix(std::vector const &Indices) +{ + auto &state{m_joints}; + std::vector> states; + std::vector changed; + std::vector chosen; + for (auto const index : Indices) + if (index >= 0 && index < static_cast(state.issues.size())) + chosen.push_back(&state.issues[index]); + std::size_t count{0}; + for (auto *issue : chosen) + if (joint_fix(*issue, states, changed)) + ++count; + if (count == 0) + { + state.status = STR_C("Nothing could be fixed: the paths are switches or in the files which can't be changed"); + return; + } + push_track_snapshot(std::move(states)); + editor_track::commit(changed); + for (auto *track : changed) + track->mark_dirty(); + state.history = m_history.size(); + state.status = format(STR_C("%zu joints fixed, Ctrl+Z takes them back"), count); + WriteLog("Editor: joints check - " + state.status, logtype::generic); +} + +void editor_mode::render_joints_body() +{ + auto &state{m_joints}; + ImGui::TextDisabled("%s", STR_C("Ends of the paths which almost meet, steps, kinks,\njumps of the cant and of the grade at the joints")); + ImGui::RadioButton(STR_C("Around the camera"), &state.scope, 0); + ImGui::SameLine(); + ImGui::RadioButton(STR_C("Whole scenery"), &state.scope, 1); + bool const running{state.next < state.queue.size()}; + if (running) + { + auto const progress{static_cast(state.next) / static_cast(state.queue.size())}; + ImGui::ProgressBar(progress, ImVec2(-70.0f, 0.0f), format(STR_C("Checking %zu / %zu"), state.next, state.queue.size()).c_str()); + ImGui::SameLine(); + if (ImGui::SmallButton(STR_C("Cancel"))) + state.queue.resize(state.next); + } + else if (ImGui::Button(STR_C("Check"))) + { + joints_start(); + } + if (ImGui::TreeNode(STR_C("Limits"))) + { + ImGui::PushItemWidth(100.0f); + if (state.scope == 0) + ImGui::InputDouble(STR_C("Around the camera (m)"), &state.reach, 0.0, 0.0, "%.0f"); + ImGui::InputDouble(STR_C("Gap up to (m)"), &state.gap, 0.0, 0.0, "%.2f"); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("A free end closer than this to the end of another path is a gap: the trains don't go across it.\nThe simulation joins the ends no more than 2 cm apart")); + ImGui::InputDouble(STR_C("Step (m)"), &state.step, 0.0, 0.0, "%.3f"); + ImGui::InputDouble(STR_C("Kink (deg)"), &state.angle, 0.0, 0.0, "%.2f"); + ImGui::InputDouble(STR_C("Cant jump (mm)"), &state.cant, 0.0, 0.0, "%.1f"); + ImGui::InputDouble(STR_C("Grade break (per mille)"), &state.grade, 0.0, 0.0, "%.1f"); + ImGui::Checkbox(STR_C("Free ends too"), &state.free_ends); + ImGui::PopItemWidth(); + state.reach = std::clamp(state.reach, 50.0, 50000.0); + state.gap = std::clamp(state.gap, 0.03, 20.0); + state.step = std::max(0.001, state.step); + state.angle = std::max(0.01, state.angle); + state.cant = std::max(0.5, state.cant); + state.grade = std::max(0.5, state.grade); + ImGui::TextDisabled("%s", STR_C("Change the limits, then Check again")); + ImGui::TreePop(); + } + if (false == state.status.empty()) + ImGui::TextWrapped("%s", state.status.c_str()); + if (state.issues.empty()) + return; + if (state.history != m_history.size()) + ImGui::TextColored(ImVec4(1.0f, 0.75f, 0.3f, 1.0f), "%s", STR_C("The scenery changed since the check")); + int filter{state.filter + 1}; + ImGui::SetNextItemWidth(150.0f); + auto const filters{std::string{STR_C("All")} + '\0' + STR_C("gap") + '\0' + STR_C("step") + '\0' + STR_C("kink") + '\0' + STR_C("cant jump") + '\0' + STR_C("grade break") + '\0' + STR_C("free end") + '\0' + '\0'}; + if (ImGui::Combo("##jointfilter", &filter, filters.c_str())) + state.filter = filter - 1; + std::vector listed; + std::vector fixable; + for (int i = 0; i < static_cast(state.issues.size()); ++i) + { + auto const &issue{state.issues[i]}; + if (state.filter >= 0 && static_cast(issue.type) != state.filter) + continue; + listed.push_back(i); + if (false == issue.fixed && issue.type != kind::open) + fixable.push_back(i); + } + if (false == fixable.empty()) + { + ImGui::SameLine(); + if (ImGui::Button(format(STR_C("Fix %zu listed"), fixable.size()).c_str())) + joints_fix(fixable); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Gaps: the free end goes to the other end, along it. Steps: the end goes to the other one.\n" + "Kinks and grade breaks: the end is turned in line with the other path. Cant: the cant of the other path.\n" + "The plain path moves, a switch stays as it is. One Ctrl+Z takes it all back")); + } + auto const namewidth{std::max(110.0f, ImGui::GetContentRegionAvail().x * 0.32f)}; + bool const chosen{state.selected >= 0 && state.selected < static_cast(state.issues.size())}; + auto const details{chosen ? ImGui::GetFrameHeightWithSpacing() + ImGui::GetTextLineHeightWithSpacing() * 2.0f : 0.0f}; + ImGui::BeginChild("jointresults", ImVec2(0.0f, -details), true); + ImGui::Columns(4, "jointrows", false); + ImGui::SetColumnWidth(0, 90.0f); + ImGui::SetColumnWidth(1, 80.0f); + ImGui::SetColumnWidth(2, namewidth); + ImGuiListClipper clipper(static_cast(listed.size())); + while (clipper.Step()) + for (int row = clipper.DisplayStart; row < clipper.DisplayEnd; ++row) + { + auto const index{listed[row]}; + auto const &issue{state.issues[index]}; + auto const colour{ImGui::ColorConvertU32ToFloat4(kind_colour(issue.type))}; + ImGui::PushStyleColor(ImGuiCol_Text, issue.fixed ? ImVec4(0.5f, 0.8f, 0.5f, 1.0f) : colour); + if (ImGui::Selectable(format("%s##joint%d", STR_C(kind_name(issue.type)), index).c_str(), state.selected == index, ImGuiSelectableFlags_SpanAllColumns)) + joints_focus(index); + ImGui::PopStyleColor(); + ImGui::NextColumn(); + ImGui::TextUnformatted(issue.fixed ? STR_C("fixed") : value_text(issue).c_str()); + ImGui::NextColumn(); + ImGui::TextUnformatted(name_of(issue.track).c_str()); + ImGui::NextColumn(); + ImGui::TextUnformatted(name_of(issue.other).c_str()); + ImGui::NextColumn(); + } + ImGui::Columns(1); + ImGui::EndChild(); + if (chosen) + { + auto &issue{state.issues[state.selected]}; + ImGui::Text("%s %s: %s / %s", STR_C(kind_name(issue.type)), value_text(issue).c_str(), name_of(issue.track).c_str(), name_of(issue.other).c_str()); + if (false == issue.fixed && issue.type != kind::open && ImGui::Button(STR_C("Fix this one"))) + joints_fix({state.selected}); + } +} + +void editor_mode::draw_joints_overlay() const +{ + auto const &state{m_joints}; + if (false == state.open || state.issues.empty()) + return; + screen_projection const projection; + auto *drawlist{ImGui::GetBackgroundDrawList()}; + glm::dvec3 const camera{Global.pCamera.Pos}; + for (int i = 0; i < static_cast(state.issues.size()); ++i) + { + auto const &issue{state.issues[i]}; + if (issue.fixed || (state.filter >= 0 && static_cast(issue.type) != state.filter) || glm::distance(issue.position, camera) > kOverlayRange) + continue; + ImVec2 screen; + if (false == projection.project(issue.position, screen)) + continue; + auto const colour{i == state.selected ? IM_COL32(255, 255, 80, 255) : kind_colour(issue.type)}; + drawlist->AddCircle(screen, 11.0f, colour, 16, 2.5f); + auto const text{std::string{STR_C(kind_name(issue.type))} + " " + value_text(issue)}; + drawlist->AddText(ImVec2(screen.x + 13.0f, screen.y - 7.0f), colour, text.c_str()); + } +} diff --git a/application/editormodelineside.cpp b/application/editormodelineside.cpp new file mode 100644 index 000000000..3fdb71314 --- /dev/null +++ b/application/editormodelineside.cpp @@ -0,0 +1,983 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "application/editormode.h" +#include "application/editoruilayer.h" +#include "application/editorprojection.h" +#include "editor/editorFormat.hpp" +#include "editor/editorGeometry.hpp" +#include "editor/editorIncludeInfo.hpp" + +#include "scene/scene.h" +#include "scene/scenelayers.h" +#include "simulation/simulation.h" +#include "utilities/Logs.h" +#include "utilities/utilities.h" +#include "world/Track.h" + +#include "imgui/imgui.h" +#include "utilities/translation.h" +#include +#include +#include + +namespace +{ + +using geometry::bezier; +using geometry::plan_distance; +using geometry::plan_of; + +double const kSampleStep{2.0}; // m between the samples of the line +double const kLineCorridor{15.0}; // m from the axis, posts farther away belong to another line +double const kOverlayRange{3000.0}; +double const kFoulingTrace{250.0}; // m from the start of a switch the tracks are followed for +double const kRailHeight{0.18}; // m from the points of a track to the heads of its rails +int const kRailCategory{1}; +char const *const kHektoStyles[] = {"nowy", "stary", "zgnity"}; +char const *const kFoulingModels[] = {"ip/pkp/w17.inc", "ip/pkp/w17_new.inc", "ip/pkp/w17_old.inc", "ip/pkp/w17_dwuteo.inc"}; + +std::string normalized(std::string Text) +{ + std::transform(Text.begin(), Text.end(), Text.begin(), [](unsigned char const Character) { return static_cast(Character == '\\' ? '/' : std::tolower(Character)); }); + return Text; +} + +bool numeric(std::string const &Text, double &Value) +{ + char *end{nullptr}; + Value = std::strtod(Text.c_str(), &end); + return false == Text.empty() && *end == '\0'; +} + +std::string number(double const Value, int const Decimals) +{ + auto text{format("%.*f", Decimals, Value)}; + if (text == "-0" || text.find_first_not_of("-0.") == std::string::npos) + text.erase(0, text.front() == '-' ? 1 : 0); + return text; +} + +double heading_of(glm::dvec2 const &Direction) +{ + auto const degrees{glm::degrees(std::atan2(Direction.x, Direction.y))}; + return degrees < 0.0 ? degrees + 360.0 : degrees; +} + +// index of the sample at or before the chainage +std::size_t sample_index(std::vector const &Samples, double const Chainage) +{ + auto const found{std::upper_bound(Samples.begin(), Samples.end(), Chainage, [](double const Value, editor_track::route_sample const &Sample) { return Value < Sample.chainage; })}; + return found == Samples.begin() ? 0 : std::min(std::distance(Samples.begin(), found) - 1, Samples.size() - 2); +} + +glm::dvec2 sampled_direction(std::vector const &Samples, double const Chainage) +{ + auto const index{sample_index(Samples, Chainage)}; + auto const &a{Samples[index]}; + auto const &b{Samples[index + 1]}; + auto const span{b.chainage - a.chainage}; + auto const f{span > 1e-9 ? std::clamp((Chainage - a.chainage) / span, 0.0, 1.0) : 0.0}; + auto const direction{a.direction * (1.0 - f) + b.direction * f}; + return glm::length(direction) > 1e-9 ? glm::normalize(direction) : glm::dvec2{0.0, 1.0}; +} + +// chainage of the point of the line nearest to the point, and how far from the line it is +double project(std::vector const &Samples, glm::dvec3 const &Point, double &Distance) +{ + Distance = std::numeric_limits::max(); + double chainage{0.0}; + auto const point{plan_of(Point)}; + for (std::size_t i = 1; i < Samples.size(); ++i) + { + auto const a{plan_of(Samples[i - 1].position)}; + auto const b{plan_of(Samples[i].position)}; + auto const ab{b - a}; + auto const length2{glm::dot(ab, ab)}; + auto const t{length2 > 1e-12 ? std::clamp(glm::dot(point - a, ab) / length2, 0.0, 1.0) : 0.0}; + auto const distance{glm::length(point - (a + ab * t))}; + if (distance < Distance) + { + Distance = distance; + chainage = Samples[i - 1].chainage + (Samples[i].chainage - Samples[i - 1].chainage) * t; + } + } + return chainage; +} + +// the digits after the rotation make the number of the post, the last one the hectometre +bool hectometres_of(std::vector const &Values, int &Hectometres) +{ + if (Values.size() < 6) + return false; + Hectometres = 0; + for (std::size_t i = 5; i < Values.size(); ++i) + { + double digit; + if (false == numeric(Values[i], digit) || digit < 0.0 || digit > 9.0) + return false; + Hectometres = Hectometres * 10 + static_cast(digit); + } + return true; +} + +std::string hekto_file(int const Hectometres, int const Style) +{ + auto style{Style}; + if (style > 2) + { + auto const pick{LocalRandom(0.0, 1.0)}; + style = pick < 0.6 ? 0 : pick < 0.9 ? 1 : 2; + } + auto const size{Hectometres < 100 ? "1" : Hectometres < 1000 ? "10" : "100"}; + return std::string{"przytorowe/slupek_hekto_"} + kHektoStyles[style] + "_" + size + ".inc"; +} + +std::vector hekto_digits(int const Hectometres) +{ + return {std::to_string((Hectometres / 1000) % 10), std::to_string((Hectometres / 100) % 10), std::to_string((Hectometres / 10) % 10), std::to_string(Hectometres % 10)}; +} + +std::string km_text(int const Hectometres) +{ + return format("%d.%d", Hectometres / 10, Hectometres % 10); +} + +// points along the track from the end of a path on, the way a train goes: through a switch along its main track +std::vector trace(TTrack &Track, int const Path, bool const Forward, double const Limit) +{ + std::vector points; + auto *track{&Track}; + auto path{Path}; + auto forward{Forward}; + double length{0.0}; + for (int guard = 0; guard < 64 && track != nullptr && length < Limit; ++guard) + { + bezier const curve{track->m_paths[path]}; + auto const count{std::clamp(static_cast(curve.plan_length() / 1.0), 4, 400)}; + for (int k = points.empty() ? 0 : 1; k <= count; ++k) + { + auto const point{curve.point(forward ? static_cast(k) / count : 1.0 - static_cast(k) / count)}; + if (false == points.empty()) + length += plan_distance(points.back(), point); + points.push_back(point); + } + auto const exit{points.back()}; + TTrack *next{nullptr}; + int nextpath{0}; + bool nextforward{true}; + for (auto const &connection : editor_track::connected_points(*track, exit)) + { + auto *other{connection.first}; + if (other == track || (other->iCategoryFlag & 15) != kRailCategory) + continue; + bool const start{connection.second.kind == editor_track::point_kind::start}; + // entering a switch at its start the train takes the main track + if (next == nullptr || (other == next && start && connection.second.path == 0)) + { + next = other; + nextpath = connection.second.path; + nextforward = start; + } + } + track = next; + path = nextpath; + forward = nextforward; + } + return points; +} + +// nearest point of the polyline +glm::dvec3 nearest_on(std::vector const &Line, glm::dvec3 const &Point, double &Distance) +{ + Distance = std::numeric_limits::max(); + glm::dvec3 result{Point}; + auto const point{plan_of(Point)}; + for (std::size_t i = 1; i < Line.size(); ++i) + { + auto const a{plan_of(Line[i - 1])}; + auto const ab{plan_of(Line[i]) - a}; + auto const length2{glm::dot(ab, ab)}; + auto const t{length2 > 1e-12 ? std::clamp(glm::dot(point - a, ab) / length2, 0.0, 1.0) : 0.0}; + auto const distance{glm::length(point - (a + ab * t))}; + if (distance < Distance) + { + Distance = distance; + result = glm::mix(Line[i - 1], Line[i], t); + } + } + return result; +} + +void draw_label(ImDrawList *Draw, ImVec2 const At, ImU32 const Colour, std::string const &Text) +{ + auto const size{ImGui::CalcTextSize(Text.c_str())}; + Draw->AddRectFilled(ImVec2(At.x + 8.0f, At.y - 8.0f), ImVec2(At.x + 14.0f + size.x, At.y - 6.0f + size.y), IM_COL32(0, 0, 0, 150), 3.0f); + Draw->AddText(ImVec2(At.x + 11.0f, At.y - 7.0f), Colour, Text.c_str()); +} + +} // namespace + +std::vector editor_mode::standing_templates(std::function const &Accept) const +{ + std::vector result; + for (scene::instance_handle handle = 1; handle <= scene::Layers.instance_count(); ++handle) + { + if (false == scene::Layers.tracked(handle)) + continue; + auto const &included{scene::Layers.instance(handle)}; + if (included.removed || included.dead || included.file == nullptr) + continue; + auto const file{normalized(*included.file)}; + if (false == Accept(file) || included.context.rotation != glm::vec3{0.f} || included.context.scale != glm::vec3{1.f}) + continue; + std::string target; + std::vector values; + if (false == editor_includes::parse_directive(scene::Layers.directive(handle), target, values) || values.size() < 5) + continue; + glm::dvec3 location; + double yaw; + if (false == numeric(values[1], location.x) || false == numeric(values[2], location.y) || false == numeric(values[3], location.z) || false == numeric(values[4], yaw)) + continue; + standing_template standing; + standing.instance = handle; + standing.file = file; + standing.location = included.context.offset + location; + standing.yaw = yaw; + standing.values = std::move(values); + result.push_back(std::move(standing)); + } + return result; +} + +std::size_t editor_mode::place_templates(std::vector const &Items, std::string &Error) +{ + if (Items.empty()) + return 0; + if (scene::Layers.empty()) + { + Error = STR_C("Templates can be placed only in a scenery opened for editing (-edit)"); + return 0; + } + auto const layer{scene::Layers.resolve(scene::Layers.active())}; + if (std::string reason; false == scene::Layers.accepts(layer, &reason)) + { + Error = STR_C("The active layer can't take them: ") + (reason.empty() ? std::string{STR_C("there's no active layer")} : reason); + return 0; + } + auto const context{scene::Layers.layer(layer).context_insert()}; + if (context.rotation != glm::vec3{0.f} || context.scale != glm::vec3{1.f}) + { + Error = STR_C("The file of the active layer would receive them with a rotation or a scale in effect, pick another layer"); + return 0; + } + EditorSnapshot snap; + for (auto const &item : Items) + { + auto const local{context.to_local(item.location)}; + std::string directive; + if (item.described) + { + include_info info; + if (false == editor_includes::load(item.file, info, Error)) + continue; + directive = editor_includes::directive(item.file, info, editor_includes::parameter_count(item.file), local, static_cast(item.yaw), item.track); + } + else + { + std::vector values{"none", number(local.x, 3), number(local.y, 3), number(local.z, 3), number(item.yaw, 2)}; + values.insert(values.end(), item.rest.begin(), item.rest.end()); + directive = editor_includes::compose_directive(item.file, values); + } + auto const instance{scene::Layers.place(layer, item.file, directive)}; + if (instance == 0) + continue; + simulation::State.preview_include(directive, context, layer, instance); + snap.instances.push_back(instance); + } + if (snap.instances.empty()) + { + Error = STR_C("The active layer can't take them"); + return 0; + } + auto const count{snap.instances.size()}; + snap.node_name = Items.front().file; + trim_history(); + m_history.push_back(std::move(snap)); + g_redo.clear(); + return count; +} + +std::size_t editor_mode::move_templates(std::vector> const &Moves) +{ + EditorSnapshot snap; + for (auto const &[standing, item] : Moves) + { + if (false == scene::Layers.tracked(standing.instance) || false == scene::Layers.removable(standing.instance)) + continue; + auto const &included{scene::Layers.instance(standing.instance)}; + auto values{standing.values}; + auto const local{item.location - included.context.offset}; + values[1] = number(local.x, 3); + values[2] = number(local.y, 3); + values[3] = number(local.z, 3); + values[4] = number(item.yaw, 2); + auto before{scene::Layers.directive(standing.instance)}; + set_include_directive(standing.instance, editor_includes::compose_directive(*included.file, values)); + snap.directives.emplace_back(standing.instance, std::move(before)); + } + if (snap.directives.empty()) + return 0; + auto const count{snap.directives.size()}; + snap.node_name = Moves.front().first.file; + trim_history(); + m_history.push_back(std::move(snap)); + g_redo.clear(); + return count; +} + +std::size_t editor_mode::remove_templates(std::vector const &Instances) +{ + EditorSnapshot snap; + for (auto const instance : Instances) + { + if (false == scene::Layers.tracked(instance) || false == scene::Layers.removable(instance)) + continue; + scene::Layers.removed(instance, true); + snap.instances.push_back(instance); + } + if (snap.instances.empty()) + return 0; + auto const count{snap.instances.size()}; + trim_history(); + m_history.push_back(std::move(snap)); + g_redo.clear(); + select_include(0); + return count; +} + +void editor_mode::hekto_start(TTrack &Track, glm::dvec3 const &Point) +{ + auto &tool{m_hekto}; + tool.track = &Track; + tool.point = Point; + tool.km_read = false; + tool.dirty = true; + tool.expand = true; + tool.status.clear(); +} + +void editor_mode::hekto_read_kilometrage() +{ + auto &tool{m_hekto}; + auto const &found{tool.found}; + if (found.empty()) + return; + if (found.size() == 1) + { + // one post doesn't tell the way the kilometrage grows: it's taken to grow along the longer part of the line past the post + auto const length{tool.samples.empty() ? 0.0 : tool.samples.back().chainage}; + tool.growth = found.front().chainage > 0.5 * length ? -1 : 1; + tool.km = found.front().hectometres / 10.0 + tool.growth * (tool.origin - found.front().chainage) / 1000.0; + tool.status = format(STR_C("Kilometrage read from the post %s, check which way it grows"), km_text(found.front().hectometres).c_str()); + return; + } + // a straight line through the numbers of the posts against where they stand + double sc{0.0}, sk{0.0}, scc{0.0}, sck{0.0}; + for (auto const &post : found) + { + auto const km{post.hectometres / 10.0}; + sc += post.chainage; + sk += km; + scc += post.chainage * post.chainage; + sck += post.chainage * km; + } + auto const n{static_cast(found.size())}; + auto const denominator{n * scc - sc * sc}; + if (std::abs(denominator) < 1e-9) + return; + auto const slope{(n * sck - sc * sk) / denominator}; + auto const intercept{(sk - slope * sc) / n}; + if (std::abs(std::abs(slope) * 1000.0 - 1.0) > 0.2) + { + tool.status = format(STR_C("The numbers of the %zu posts along the line don't go by 100 m, the kilometrage wasn't read from them"), found.size()); + return; + } + tool.growth = slope > 0.0 ? 1 : -1; + tool.km = std::round((intercept + slope * tool.origin) * 1000.0) / 1000.0; + tool.status = format(STR_C("Kilometrage read from %zu posts standing along the line"), found.size()); +} + +void editor_mode::hekto_update() +{ + auto &tool{m_hekto}; + if (false == tool.dirty && tool.history == m_history.size()) + return; + tool.dirty = false; + tool.history = m_history.size(); + tool.posts.clear(); + tool.found.clear(); + tool.error.clear(); + tool.samples.clear(); + if (tool.track == nullptr || tool.track->m_editorremoved) + { + tool.track = nullptr; + return; + } + tool.route = editor_track::run_route(*tool.track, tool.reach); + if (tool.route.spans.empty()) + { + tool.error = STR_C("No line through this path"); + return; + } + tool.samples = editor_track::sample_route(tool.route, kSampleStep); + if (tool.samples.size() < 2) + { + tool.error = STR_C("No line through this path"); + return; + } + double distance; + tool.origin = project(tool.samples, tool.point, distance); + auto const length{tool.samples.back().chainage}; + for (auto const &standing : standing_templates([](std::string const &File) { return File.find("hekto") != std::string::npos; })) + { + hekto_found post; + post.post = standing; + if (false == hectometres_of(standing.values, post.hectometres)) + continue; + post.chainage = project(tool.samples, standing.location, distance); + if (distance > kLineCorridor || post.chainage <= 0.0 || post.chainage >= length) + continue; + tool.found.push_back(post); + } + if (false == tool.km_read) + { + tool.km_read = true; + hekto_read_kilometrage(); + } + auto const chainage_of = [&](int const Hectometres) { return tool.origin + tool.growth * (Hectometres / 10.0 - tool.km) * 1000.0; }; + for (auto &post : tool.found) + { + post.expected = chainage_of(post.hectometres); + post.error = post.chainage - post.expected; + post.outside = true; + } + auto const km_at = [&](double const Chainage) { return tool.km + tool.growth * (Chainage - tool.origin) / 1000.0; }; + auto const low{std::max(0, static_cast(std::ceil(std::min(km_at(0.0), km_at(length)) * 10.0 - 1e-6)))}; + auto const high{static_cast(std::floor(std::max(km_at(0.0), km_at(length)) * 10.0 + 1e-6))}; + for (int hectometres = low; hectometres <= high && tool.posts.size() < 5000; ++hectometres) + { + hekto_post post; + post.hectometres = hectometres; + post.chainage = chainage_of(hectometres); + if (post.chainage < 0.0 || post.chainage > length) + continue; + auto const axis{editor_track::sampled_position(tool.samples, post.chainage)}; + auto const growing{sampled_direction(tool.samples, post.chainage) * static_cast(tool.growth)}; + glm::dvec2 const left{-growing.y, growing.x}; + // alternately: the even hectometres on the right, the odd ones on the left of the growing kilometrage + auto const side{tool.side != 0 ? tool.side : (hectometres % 2 == 0 ? 1 : -1)}; + auto const planar{plan_of(axis) + left * (side * tool.offset)}; + post.position = placement_on_ground({planar.x, axis.y, planar.y}); + post.yaw = std::fmod(heading_of(growing) + tool.turn, 360.0); + // of the posts with this number the one nearest to the place stands for it, the others are duplicates. it stands wrong + // when it's farther from the place than allowed: along the line, across it, or on the other side + auto best{std::numeric_limits::max()}; + for (int i = 0; i < static_cast(tool.found.size()); ++i) + { + auto &found{tool.found[i]}; + if (found.hectometres != hectometres) + continue; + found.outside = false; + found.distance = plan_distance(found.post.location, post.position); + if (found.distance < best) + { + best = found.distance; + post.standing = i; + } + } + for (int i = 0; i < static_cast(tool.found.size()); ++i) + { + auto &found{tool.found[i]}; + if (found.hectometres != hectometres) + continue; + found.duplicate = i != post.standing; + found.wrong = false == found.duplicate && found.distance > tool.tolerance; + } + tool.posts.push_back(post); + } +} + +void editor_mode::hekto_remove_duplicates() +{ + auto &tool{m_hekto}; + hekto_update(); + std::vector instances; + for (auto const &found : tool.found) + if (found.duplicate) + instances.push_back(found.post.instance); + auto const removed{remove_templates(instances)}; + tool.status = format(STR_C("%zu duplicate hectometre posts removed, Ctrl+Z brings them back"), removed); + WriteLog("Editor: " + tool.status); + tool.dirty = true; +} + +void editor_mode::hekto_place() +{ + auto &tool{m_hekto}; + hekto_update(); + std::vector items; + for (auto const &post : tool.posts) + { + if (post.standing >= 0) + continue; + template_item item; + item.file = hekto_file(post.hectometres, tool.style); + item.location = post.position; + item.yaw = post.yaw; + item.rest = hekto_digits(post.hectometres); + items.push_back(std::move(item)); + } + std::string error; + auto const placed{place_templates(items, error)}; + tool.status = placed > 0 ? format(STR_C("%zu hectometre posts placed, Ctrl+Z takes them back"), placed) : error; + WriteLog("Editor: " + tool.status, logtype::generic); + tool.dirty = true; +} + +void editor_mode::hekto_fix() +{ + auto &tool{m_hekto}; + hekto_update(); + std::vector> moves; + for (auto const &post : tool.posts) + { + if (post.standing < 0 || false == tool.found[post.standing].wrong) + continue; + template_item item; + item.location = post.position; + item.yaw = post.yaw; + moves.emplace_back(tool.found[post.standing].post, item); + } + auto const moved{move_templates(moves)}; + tool.status = format(STR_C("%zu hectometre posts moved to their places, Ctrl+Z takes it back"), moved); + WriteLog("Editor: " + tool.status, logtype::generic); + tool.dirty = true; +} + +void editor_mode::render_hekto_ui() +{ + auto &tool{m_hekto}; + auto *selected{selected_track()}; + if (tool.track == nullptr || (selected != nullptr && selected != tool.track && ImGui::SmallButton(STR_C("Along the line of the selected path")))) + { + if (selected == nullptr) + { + ImGui::TextDisabled("%s", STR_C("Select a path of the line, or RMB on it: Hectometre posts")); + return; + } + hekto_start(*selected, bezier{selected->m_paths.front()}.point(0.0)); + } + auto const changed = [&](bool const Changed) { + if (Changed) + tool.dirty = true; + }; + ImGui::PushItemWidth(110.0f); + changed(ImGui::InputDouble(STR_C("Kilometre at the point (km)"), &tool.km, 0.0, 0.0, "%.3f")); + ImGui::SameLine(); + if (ImGui::SmallButton(STR_C("Read from the posts"))) + { + tool.km_read = false; + tool.dirty = true; + } + ImGui::TextDisabled("%s", STR_C("The kilometrage grows")); + ImGui::SameLine(); + changed(ImGui::RadioButton(STR_C("along the line"), &tool.growth, 1)); + ImGui::SameLine(); + changed(ImGui::RadioButton(STR_C("against it"), &tool.growth, -1)); + ImGui::TextDisabled("%s", STR_C("Side, looking where it grows")); + ImGui::SameLine(); + changed(ImGui::RadioButton(STR_C("right"), &tool.side, 1)); + ImGui::SameLine(); + changed(ImGui::RadioButton(STR_C("left"), &tool.side, -1)); + ImGui::SameLine(); + changed(ImGui::RadioButton(STR_C("alternately"), &tool.side, 0)); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("The even hectometres on the right, the odd ones on the left")); + changed(ImGui::InputDouble(STR_C("From the axis (m)"), &tool.offset, 0.0, 0.0, "%.2f")); + tool.offset = std::clamp(tool.offset, 1.5, 30.0); + char const *styles[] = {"nowy", "stary", "zgnity", "mixed"}; + ImGui::Combo(STR_C("Posts"), &tool.style, styles, IM_ARRAYSIZE(styles)); + char const *turns[] = {"0", "90", "180", "270"}; + int turn{tool.turn / 90}; + if (ImGui::Combo(STR_C("Turned by (deg)"), &turn, turns, IM_ARRAYSIZE(turns))) + { + tool.turn = turn * 90; + tool.dirty = true; + } + changed(ImGui::InputDouble(STR_C("Along the line each way (m)"), &tool.reach, 0.0, 0.0, "%.0f")); + tool.reach = std::clamp(tool.reach, 100.0, 100000.0); + changed(ImGui::InputDouble(STR_C("A post standing off by more (m) is wrong"), &tool.tolerance, 0.0, 0.0, "%.1f")); + tool.tolerance = std::clamp(tool.tolerance, 0.5, 50.0); + ImGui::PopItemWidth(); + hekto_update(); + if (false == tool.error.empty()) + { + ImGui::TextColored(ImVec4(1.0f, 0.5f, 0.3f, 1.0f), "%s", tool.error.c_str()); + return; + } + auto const missing{std::count_if(tool.posts.begin(), tool.posts.end(), [](hekto_post const &Post) { return Post.standing < 0; })}; + auto const wrong{std::count_if(tool.found.begin(), tool.found.end(), [](hekto_found const &Post) { return Post.wrong; })}; + auto const duplicates{std::count_if(tool.found.begin(), tool.found.end(), [](hekto_found const &Post) { return Post.duplicate; })}; + ImGui::Text(STR_C("Line %.0f m, km %s - %s: %d posts to place, %zu standing, %d of them wrong"), tool.samples.empty() ? 0.0 : tool.samples.back().chainage, tool.posts.empty() ? "-" : km_text(std::min(tool.posts.front().hectometres, tool.posts.back().hectometres)).c_str(), + tool.posts.empty() ? "-" : km_text(std::max(tool.posts.front().hectometres, tool.posts.back().hectometres)).c_str(), static_cast(missing), tool.found.size(), static_cast(wrong)); + if (missing > 0 && ImGui::Button(format(STR_C("Place %d posts"), static_cast(missing)).c_str())) + hekto_place(); + if (duplicates > 0) + { + if (missing > 0) + ImGui::SameLine(); + if (ImGui::Button(format(STR_C("Remove %d duplicate posts"), static_cast(duplicates)).c_str())) + hekto_remove_duplicates(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Posts with a number another post nearer to its place already has")); + } + if (wrong > 0 || duplicates > 0) + { + if (wrong > 0) + { + if (missing > 0 || duplicates > 0) + ImGui::SameLine(); + if (ImGui::Button(format(STR_C("Move %d wrong posts to their places"), static_cast(wrong)).c_str())) + hekto_fix(); + } + ImGui::BeginChild("##hektowrong", ImVec2(0.0f, std::min(6, static_cast(wrong + duplicates)) * ImGui::GetTextLineHeightWithSpacing() + 6.0f), true); + for (auto const &post : tool.found) + { + if (false == post.wrong && false == post.duplicate) + continue; + auto const label{post.duplicate ? format(STR_C("km %s duplicate##%u"), km_text(post.hectometres).c_str(), post.post.instance) : format(STR_C("km %s stands %.1f m from its place##%u"), km_text(post.hectometres).c_str(), post.distance, post.post.instance)}; + if (ImGui::Selectable(label.c_str())) + { + glm::dvec3 const look{glm::normalize(glm::dvec3{-1.0, -0.8, -1.0})}; + m_focus_start_pos = Camera.Pos; + m_focus_start_angle = Camera.Angle; + m_focus_target_pos = post.post.location - look * 20.0; + m_focus_target_angle = glm::vec3(static_cast(std::asin(look.y)), static_cast(std::atan2(-look.x, -look.z)), 0.0f); + m_focus_active = true; + m_focus_time = 0.0; + m_focus_duration = 0.6; + } + } + ImGui::EndChild(); + } + if (false == tool.status.empty()) + ImGui::TextWrapped("%s", tool.status.c_str()); +} + +void editor_mode::draw_hekto_overlay() const +{ + auto const &tool{m_hekto}; + if (false == tool.open || tool.track == nullptr) + return; + screen_projection const projection; + auto *drawlist{ImGui::GetBackgroundDrawList()}; + glm::dvec3 const camera{Global.pCamera.Pos}; + for (auto const &post : tool.posts) + { + if (glm::distance(post.position, camera) > kOverlayRange) + continue; + ImVec2 screen; + if (false == projection.project(post.position, screen)) + continue; + bool const standing{post.standing >= 0 && false == tool.found[post.standing].wrong}; + auto const colour{standing ? IM_COL32(180, 180, 180, 200) : IM_COL32(90, 255, 120, 235)}; + drawlist->AddCircleFilled(screen, 4.0f, colour); + draw_label(drawlist, screen, colour, km_text(post.hectometres)); + } + for (auto const &post : tool.found) + { + if ((false == post.wrong && false == post.duplicate) || glm::distance(post.post.location, camera) > kOverlayRange) + continue; + ImVec2 screen; + if (false == projection.project(post.post.location, screen)) + continue; + auto const colour{post.duplicate ? IM_COL32(255, 160, 40, 235) : IM_COL32(255, 70, 60, 235)}; + drawlist->AddCircle(screen, 9.0f, colour, 16, 2.5f); + draw_label(drawlist, screen, colour, post.duplicate ? format(STR_C("km %s duplicate"), km_text(post.hectometres).c_str()) : format(STR_C("km %s, %.1f m from its place"), km_text(post.hectometres).c_str(), post.distance)); + if (post.duplicate) + continue; + for (auto const &target : tool.posts) + if (target.hectometres == post.hectometres) + projection.line(drawlist, post.post.location, target.position, IM_COL32(255, 70, 60, 160), 1.5f); + } + ImVec2 screen; + if (projection.project(tool.point, screen)) + { + drawlist->AddCircle(screen, 7.0f, IM_COL32(90, 200, 255, 235), 16, 2.5f); + draw_label(drawlist, screen, IM_COL32(90, 200, 255, 235), format("km %.3f", tool.km)); + } +} + +void editor_mode::fouling_update() +{ + auto &tool{m_fouling}; + auto *selected{selected_track()}; + if (tool.scope == 0 && selected != tool.selected) + tool.dirty = true; + if (false == tool.dirty && tool.history == m_history.size()) + return; + tool.dirty = false; + tool.history = m_history.size(); + tool.selected = selected; + tool.points.clear(); + tool.found.clear(); + tool.error.clear(); + std::vector switches; + glm::dvec3 const camera{Global.pCamera.Pos}; + if (tool.scope == 0) + { + if (selected == nullptr || selected->eType != tt_Switch) + { + tool.error = STR_C("Select a switch, or check around the camera"); + return; + } + switches.push_back(selected); + } + else + { + for (auto *track : simulation::Paths.sequence()) + if (track != nullptr && track->eType == tt_Switch && false == track->m_editorremoved && (track->iCategoryFlag & 15) == kRailCategory && track->m_paths.size() >= 2 && + (tool.scope == 2 || glm::distance(track->location(), camera) <= tool.reach)) + switches.push_back(track); + } + for (auto *track : switches) + { + if (track->m_paths.size() < 2 || false == editor_track::is_supported(*track)) + continue; + auto const main{trace(*track, 0, true, kFoulingTrace)}; + auto const branch{trace(*track, 1, true, kFoulingTrace)}; + if (main.size() < 2 || branch.size() < 2) + continue; + glm::dvec3 previous{branch.front()}; + double previousdistance{0.0}; + for (std::size_t i = 1; i < branch.size(); ++i) + { + double distance; + nearest_on(main, branch[i], distance); + if (distance < tool.spacing) + { + previous = branch[i]; + previousdistance = distance; + continue; + } + auto const f{distance - previousdistance > 1e-9 ? (tool.spacing - previousdistance) / (distance - previousdistance) : 1.0}; + auto const onbranch{glm::mix(previous, branch[i], std::clamp(f, 0.0, 1.0))}; + double unused; + auto const onmain{nearest_on(main, onbranch, unused)}; + fouling_point point; + point.track = track; + auto const middle{(onbranch + onmain) * 0.5}; + // the points of the paths are at the rail foot, the heads of the rails are the height of the rail over them + point.position = tool.height_mode == 1 ? glm::dvec3{middle.x, 0.5 * (onbranch.y + onmain.y) + kRailHeight + tool.height, middle.z} : placement_on_ground({middle.x, std::max(onbranch.y, onmain.y), middle.z}); + auto const back{plan_of(previous - branch[i])}; + point.yaw = std::fmod(heading_of(glm::length(back) > 1e-9 ? glm::normalize(back) : glm::dvec2{0.0, 1.0}) + tool.turn, 360.0); + tool.points.push_back(point); + break; + } + } + // markers standing: each goes to the nearest fouling point, the others are left alone + auto const markers{standing_templates([](std::string const &File) { return File.find("w17") != std::string::npos || File.find("ukres") != std::string::npos; })}; + for (auto const &marker : markers) + { + int nearest{-1}; + double best{std::numeric_limits::max()}; + for (int i = 0; i < static_cast(tool.points.size()); ++i) + { + auto const distance{plan_distance(marker.location, tool.points[i].position)}; + if (distance < best) + { + best = distance; + nearest = i; + } + } + if (nearest < 0 || best > 40.0) + continue; + auto &point{tool.points[nearest]}; + if (point.standing >= 0 && tool.found[point.standing].error <= best) + continue; + fouling_found found; + found.marker = marker; + found.point = nearest; + found.error = best; + found.height_error = marker.location.y - point.position.y; + found.wrong = best > tool.tolerance || (tool.height_mode == 1 && std::abs(found.height_error) > tool.height_tolerance); + if (point.standing >= 0) + tool.found[point.standing] = found; + else + { + point.standing = static_cast(tool.found.size()); + tool.found.push_back(found); + } + } + auto const missing{std::count_if(tool.points.begin(), tool.points.end(), [](fouling_point const &Point) { return Point.standing < 0; })}; + auto const wrong{std::count_if(tool.found.begin(), tool.found.end(), [](fouling_found const &Found) { return Found.wrong; })}; + tool.status = format(STR_C("%zu switches, %zu fouling points: %d without a marker, %d markers standing wrong"), switches.size(), tool.points.size(), static_cast(missing), static_cast(wrong)); +} + +void editor_mode::fouling_place() +{ + auto &tool{m_fouling}; + fouling_update(); + std::vector items; + for (auto const &point : tool.points) + { + if (point.standing >= 0) + continue; + template_item item; + item.file = kFoulingModels[std::clamp(tool.model, 0, 3)]; + item.location = point.position; + item.yaw = point.yaw; + if (tool.model != 2) + item.rest = {"0"}; + items.push_back(std::move(item)); + } + std::string error; + auto const placed{place_templates(items, error)}; + tool.status = placed > 0 ? format(STR_C("%zu fouling point markers placed, Ctrl+Z takes them back"), placed) : error; + WriteLog("Editor: " + tool.status, logtype::generic); + tool.dirty = true; +} + +void editor_mode::fouling_fix() +{ + auto &tool{m_fouling}; + fouling_update(); + std::vector> moves; + for (auto const &found : tool.found) + { + if (false == found.wrong) + continue; + template_item item; + auto const &point{tool.points[found.point]}; + if (found.error <= tool.tolerance) + { + // in its place, only too high or too low + item.location = {found.marker.location.x, point.position.y, found.marker.location.z}; + item.yaw = found.marker.yaw; + } + else + { + item.location = point.position; + item.yaw = point.yaw; + } + moves.emplace_back(found.marker, item); + } + auto const moved{move_templates(moves)}; + tool.status = format(STR_C("%zu fouling point markers moved to their places, Ctrl+Z takes it back"), moved); + WriteLog("Editor: " + tool.status, logtype::generic); + tool.dirty = true; +} + +void editor_mode::render_fouling_ui() +{ + auto &tool{m_fouling}; + ImGui::TextDisabled("%s", STR_C("W17 where the axes of the tracks meeting at a switch are the spacing apart,\nhalf way between them")); + auto const changed = [&](bool const Changed) { + if (Changed) + tool.dirty = true; + }; + changed(ImGui::RadioButton(STR_C("The selected switch"), &tool.scope, 0)); + ImGui::SameLine(); + changed(ImGui::RadioButton(STR_C("Around the camera"), &tool.scope, 1)); + ImGui::SameLine(); + changed(ImGui::RadioButton(STR_C("Whole scenery"), &tool.scope, 2)); + ImGui::PushItemWidth(110.0f); + if (tool.scope == 1) + changed(ImGui::InputDouble(STR_C("Around the camera (m)"), &tool.reach, 0.0, 0.0, "%.0f")); + changed(ImGui::InputDouble(STR_C("Spacing of the axes (m)"), &tool.spacing, 0.0, 0.0, "%.2f")); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("3.5 m on the straight track; more on the curves, where the cars lean out")); + changed(ImGui::InputDouble(STR_C("A marker off by more (m) is wrong"), &tool.tolerance, 0.0, 0.0, "%.1f")); + changed(ImGui::RadioButton(STR_C("On the ground"), &tool.height_mode, 0)); + ImGui::SameLine(); + changed(ImGui::RadioButton(STR_C("Over the rail heads"), &tool.height_mode, 1)); + if (tool.height_mode == 1) + { + ImGui::SameLine(); + changed(ImGui::InputDouble(STR_C("by (m)"), &tool.height, 0.0, 0.0, "%.3f")); + changed(ImGui::InputDouble(STR_C("A marker higher or lower by more (m) is wrong"), &tool.height_tolerance, 0.0, 0.0, "%.3f")); + tool.height_tolerance = std::clamp(tool.height_tolerance, 0.005, 1.0); + } + char const *models[] = {"w17", "w17_new", "w17_old", "w17_dwuteo"}; + ImGui::Combo(STR_C("Marker"), &tool.model, models, IM_ARRAYSIZE(models)); + char const *turns[] = {"0", "90", "180", "270"}; + int turn{tool.turn / 90}; + if (ImGui::Combo(STR_C("Turned by (deg)"), &turn, turns, IM_ARRAYSIZE(turns))) + { + tool.turn = turn * 90; + tool.dirty = true; + } + ImGui::PopItemWidth(); + tool.reach = std::clamp(tool.reach, 50.0, 50000.0); + tool.spacing = std::clamp(tool.spacing, 2.0, 10.0); + tool.tolerance = std::clamp(tool.tolerance, 0.2, 20.0); + fouling_update(); + if (false == tool.error.empty()) + { + ImGui::TextColored(ImVec4(1.0f, 0.5f, 0.3f, 1.0f), "%s", tool.error.c_str()); + return; + } + ImGui::TextWrapped("%s", tool.status.c_str()); + auto const missing{std::count_if(tool.points.begin(), tool.points.end(), [](fouling_point const &Point) { return Point.standing < 0; })}; + auto const wrong{std::count_if(tool.found.begin(), tool.found.end(), [](fouling_found const &Found) { return Found.wrong; })}; + if (missing > 0 && ImGui::Button(format(STR_C("Place %d markers"), static_cast(missing)).c_str())) + fouling_place(); + if (wrong > 0) + { + if (missing > 0) + ImGui::SameLine(); + if (ImGui::Button(format(STR_C("Move %d wrong markers to their places"), static_cast(wrong)).c_str())) + fouling_fix(); + } +} + +void editor_mode::draw_fouling_overlay() const +{ + auto const &tool{m_fouling}; + if (false == tool.open) + return; + screen_projection const projection; + auto *drawlist{ImGui::GetBackgroundDrawList()}; + glm::dvec3 const camera{Global.pCamera.Pos}; + for (auto const &point : tool.points) + { + if (glm::distance(point.position, camera) > kOverlayRange) + continue; + ImVec2 screen; + if (false == projection.project(point.position, screen)) + continue; + bool const standing{point.standing >= 0 && false == tool.found[point.standing].wrong}; + auto const colour{standing ? IM_COL32(180, 180, 180, 200) : IM_COL32(90, 255, 120, 235)}; + drawlist->AddCircleFilled(screen, 4.0f, colour); + draw_label(drawlist, screen, colour, "W17"); + } + for (auto const &found : tool.found) + { + if (false == found.wrong || glm::distance(found.marker.location, camera) > kOverlayRange) + continue; + ImVec2 screen; + if (false == projection.project(found.marker.location, screen)) + continue; + drawlist->AddCircle(screen, 9.0f, IM_COL32(255, 70, 60, 235), 16, 2.5f); + draw_label(drawlist, screen, IM_COL32(255, 70, 60, 235), format(STR_C("W17 %.1f m off, %+.2f m high"), found.error, found.height_error)); + projection.line(drawlist, found.marker.location, tool.points[found.point].position, IM_COL32(255, 70, 60, 160), 1.5f); + } +} diff --git a/application/editormodeparallel.cpp b/application/editormodeparallel.cpp new file mode 100644 index 000000000..7eaa92f43 --- /dev/null +++ b/application/editormodeparallel.cpp @@ -0,0 +1,234 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "application/editormode.h" +#include "application/editoruilayer.h" +#include "application/editorprojection.h" +#include "editor/editorFormat.hpp" +#include "editor/editorGeometry.hpp" + +#include "scene/scenelayers.h" +#include "simulation/simulation.h" +#include "utilities/Logs.h" +#include "world/Track.h" + +#include "imgui/imgui.h" +#include "utilities/translation.h" +#include +#include + +namespace +{ + +using geometry::bezier; +using geometry::cross; +using geometry::plan_of; + +double const kParallelReach{5000.0}; // m each way along the line +double const kSpacings[] = {3.5, 4.0, 4.5, 4.75, 5.0, 6.0}; + +segment_data reversed(segment_data const &Path) +{ + segment_data result{Path}; + result.points[segment_data::point::start] = Path.points[segment_data::point::end]; + result.points[segment_data::point::end] = Path.points[segment_data::point::start]; + result.points[segment_data::point::control1] = Path.points[segment_data::point::control2]; + result.points[segment_data::point::control2] = Path.points[segment_data::point::control1]; + result.rolls = {-Path.rolls[1], -Path.rolls[0]}; + return result; +} + +// the control vectors as they're drawn, also for a straight given without them +std::pair controls(segment_data const &Path) +{ + auto const &start{Path.points[segment_data::point::start]}; + auto const &end{Path.points[segment_data::point::end]}; + auto const &control1{Path.points[segment_data::point::control1]}; + auto const &control2{Path.points[segment_data::point::control2]}; + if (control1 == glm::dvec3{} && control2 == glm::dvec3{}) + return {(end - start) / 3.0, (start - end) / 3.0}; + return {control1, control2}; +} + +// curvature in the plan at the start (false) or the end (true) of the path, 1/m, positive turning left +double curvature(segment_data const &Path, bool const Atend) +{ + auto const [control1, control2] = controls(Path); + auto const p0{plan_of(Path.points[segment_data::point::start])}; + auto const p3{plan_of(Path.points[segment_data::point::end])}; + auto const p1{p0 + plan_of(control1)}; + auto const p2{p3 + plan_of(control2)}; + auto const first{Atend ? 3.0 * (p3 - p2) : 3.0 * (p1 - p0)}; + auto const second{Atend ? 6.0 * (p1 - 2.0 * p2 + p3) : 6.0 * (p0 - 2.0 * p1 + p2)}; + auto const speed{glm::length(first)}; + return speed > 1e-9 ? cross(first, second) / (speed * speed * speed) : 0.0; +} + +glm::dvec2 direction(segment_data const &Path, bool const Atend) +{ + auto const [control1, control2] = controls(Path); + auto const along{Atend ? -plan_of(control2) : plan_of(control1)}; + return glm::length(along) > 1e-9 ? glm::normalize(along) : glm::dvec2{0.0, 1.0}; +} + +} // namespace + +void editor_mode::parallel_update() +{ + auto &tool{m_parallel}; + auto *track{selected_track()}; + if (track == tool.built_for && tool.spacing == tool.built_spacing && tool.side == tool.built_side && tool.scope == tool.built_scope && m_history.size() == tool.built_history) + return; + tool.built_for = track; + tool.built_spacing = tool.spacing; + tool.built_side = tool.side; + tool.built_scope = tool.scope; + tool.built_history = m_history.size(); + tool.pieces.clear(); + tool.styles.clear(); + tool.length = 0.0; + tool.error.clear(); + if (track == nullptr) + return; + if (track->eType != tt_Normal || false == editor_track::is_supported(*track)) + { + tool.error = STR_C("A switch has no line of its own: select a plain path"); + return; + } + std::vector> sources; + if (tool.scope == 1) + { + editor_track::chain run; + std::string error; + if (editor_track::find_run(*track, kParallelReach, run, error)) + for (std::size_t i = 0; i < run.tracks.size(); ++i) + sources.emplace_back(run.tracks[i], run.forward[i] ? run.tracks[i]->m_paths.front() : reversed(run.tracks[i]->m_paths.front())); + } + if (sources.empty()) + sources.emplace_back(track, track->m_paths.front()); + auto const offset{tool.spacing * tool.side}; + // the joints are moved once, along the mean direction of the paths meeting there, so the new paths meet too + std::vector joints; + for (std::size_t k = 0; k <= sources.size(); ++k) + { + bool const first{k == 0}; + bool const last{k == sources.size()}; + auto const &before{sources[last ? k - 1 : (first ? 0 : k - 1)].second}; + auto const &after{sources[last ? k - 1 : k].second}; + auto const point{first ? after.points[segment_data::point::start] : before.points[segment_data::point::end]}; + glm::dvec2 heading{first ? direction(after, false) : last ? direction(before, true) : direction(before, true) + direction(after, false)}; + heading = glm::length(heading) > 1e-9 ? glm::normalize(heading) : glm::dvec2{0.0, 1.0}; + auto const roll{first ? after.rolls[0] : last ? before.rolls[1] : 0.5f * (before.rolls[1] + after.rolls[0])}; + glm::dvec2 const left{-heading.y, heading.x}; + auto const planar{plan_of(point) + left * offset}; + joints.emplace_back(planar.x, point.y - offset * std::tan(glm::radians(static_cast(roll))), planar.y); + } + for (std::size_t i = 0; i < sources.size(); ++i) + { + auto const &source{sources[i].second}; + auto const [control1, control2] = controls(source); + auto const startscale{1.0 - curvature(source, false) * offset}; + auto const endscale{1.0 - curvature(source, true) * offset}; + if (startscale < 0.05 || endscale < 0.05) + { + tool.pieces.clear(); + tool.styles.clear(); + tool.error = format(STR_C("The spacing is larger than the radius of %s"), sources[i].first->name().c_str()); + return; + } + segment_data piece; + piece.points[segment_data::point::start] = joints[i]; + piece.points[segment_data::point::end] = joints[i + 1]; + piece.points[segment_data::point::control1] = control1 * startscale; + piece.points[segment_data::point::control2] = control2 * endscale; + piece.rolls = source.rolls; + auto const middle{0.5 * (curvature(source, false) + curvature(source, true))}; + if (source.radius != 0.0f && std::abs(middle) > 1e-7) + piece.radius = static_cast(std::copysign(std::abs((1.0 - middle * offset) / middle), static_cast(source.radius))); + tool.length += bezier{piece}.plan_length(); + tool.pieces.push_back(piece); + tool.styles.push_back(sources[i].first); + } +} + +void editor_mode::parallel_build() +{ + auto &tool{m_parallel}; + parallel_update(); + if (tool.pieces.empty()) + return; + std::vector created; + for (std::size_t i = 0; i < tool.pieces.size(); ++i) + created.push_back(editor_track::create_path(*tool.styles[i], tool.pieces[i])); + editor_track::commit(created); + push_track_snapshot({}, created); + tool.status = format(STR_C("Parallel track of %zu paths, %.1f m, %.2f m away; Ctrl+Z takes it back"), created.size(), tool.length, tool.spacing); + if (scene::Layers.active() == null_handle) + tool.status += "\n" + std::string{STR_C("The scenery isn't opened for editing, the new track won't be saved")}; + WriteLog("Editor: " + tool.status, logtype::generic); + tool.built_for = nullptr; +} + +void editor_mode::render_parallel_ui() +{ + auto &tool{m_parallel}; + ImGui::TextDisabled("%s", STR_C("Second track alongside, curves included: radius R minus or plus the spacing,\nthe same transitions and cant, heights on the plane of the cant")); + ImGui::RadioButton(STR_C("This path"), &tool.scope, 0); + ImGui::SameLine(); + ImGui::RadioButton(STR_C("The line, up to the switches"), &tool.scope, 1); + ImGui::RadioButton(STR_C("Left"), &tool.side, -1); + ImGui::SameLine(); + ImGui::RadioButton(STR_C("Right"), &tool.side, 1); + ImGui::SameLine(); + ImGui::TextDisabled("%s", STR_C("(of the direction of the line, see the preview)")); + ImGui::SetNextItemWidth(90.0f); + ImGui::InputDouble(STR_C("Spacing (m)"), &tool.spacing, 0.0, 0.0, "%.2f"); + tool.spacing = std::clamp(tool.spacing, 1.5, 100.0); + for (auto const spacing : kSpacings) + { + ImGui::SameLine(); + if (ImGui::SmallButton(format("%.2f", spacing).c_str())) + tool.spacing = spacing; + } + parallel_update(); + if (false == tool.error.empty()) + ImGui::TextColored(ImVec4(1.0f, 0.5f, 0.3f, 1.0f), "%s", tool.error.c_str()); + else if (false == tool.pieces.empty()) + { + if (ImGui::Button(format(STR_C("Build %zu paths, %.1f m"), tool.pieces.size(), tool.length).c_str())) + parallel_build(); + } + if (false == tool.status.empty()) + ImGui::TextWrapped("%s", tool.status.c_str()); +} + +void editor_mode::draw_parallel_preview() const +{ + auto const &tool{m_parallel}; + if (false == tool.open || tool.pieces.empty() || selected_track() != tool.built_for) + return; + screen_projection const projection; + auto *drawlist{ImGui::GetBackgroundDrawList()}; + for (auto const &piece : tool.pieces) + { + bezier const curve{piece}; + auto const count{std::clamp(static_cast(curve.plan_length() / 2.0), 4, 128)}; + auto previous{curve.point(0.0)}; + for (int k = 1; k <= count; ++k) + { + auto const next{curve.point(static_cast(k) / count)}; + projection.line(drawlist, previous, next, k % 2 ? IM_COL32(90, 255, 120, 230) : IM_COL32(90, 255, 120, 90), 3.0f); + previous = next; + } + } + ImVec2 screen; + if (projection.project(tool.pieces.front().points[segment_data::point::start], screen)) + drawlist->AddCircleFilled(screen, 5.0f, IM_COL32(90, 255, 120, 230)); +} diff --git a/application/editormodeprofile.cpp b/application/editormodeprofile.cpp index db2bc6841..45643a288 100644 --- a/application/editormodeprofile.cpp +++ b/application/editormodeprofile.cpp @@ -26,6 +26,7 @@ http://mozilla.org/MPL/2.0/. #include #include #include +#include #include namespace @@ -475,6 +476,122 @@ void editor_mode::profile_fit_ground() state.status = format(STR_C("Grade line fitted to the ground: %zu points, embankment up to %.2f m, cutting up to %.2f m"), state.line.points.size(), fill, cut); } +std::pair editor_mode::profile_ballast(TTrack const &Track) +{ + auto const depth{std::max(0.0, static_cast(Track.fTexHeight1 - Track.fTexHeightOffset))}; + auto const foot{0.5 * std::abs(Track.fTrackWidth) + std::abs(Track.fTexWidth) + std::abs(Track.fTexSlope)}; + return {depth, std::max(0.5, foot)}; +} + +std::pair editor_mode::profile_generate_ground(std::vector> const &Beds, double const Reach) +{ + auto &state{m_profile}; + auto &works{state.earthworks}; + auto const &samples{state.samples}; + bool const streaming{m_streamer.active()}; + double const size{streaming ? m_streamer.cells() * m_streamer.cellsize() : chunk_grid_size()}; + int const cells{streaming ? m_streamer.cells() : std::clamp(m_terrain_cells, 1, 256)}; + if (size <= 0.0 || cells <= 0 || samples.empty()) + return {0, 0}; + double const cellsize{size / cells}; + std::set> keys; + for (auto const &sample : samples) + { + auto const &p{sample.position}; + for (auto x = static_cast(std::floor((p.x - Reach) / size)); x <= static_cast(std::floor((p.x + Reach) / size)); ++x) + for (auto z = static_cast(std::floor((p.z - Reach) / size)); z <= static_cast(std::floor((p.z + Reach) / size)); ++z) + keys.insert({x, z}); + } + auto const terrains{active_terrains()}; + std::string const texture{m_terrain_texture}; + int made{0}, skipped{0}; + std::size_t const side{static_cast(cells) + 1}; + for (auto const &key : keys) + { + glm::dvec2 const low{key.first * size, key.second * size}; + glm::dvec2 const middle{low + glm::dvec2{size * 0.5}}; + if (streaming ? m_streamer.terrain_at(middle.x, middle.y) != nullptr : m_grid_chunks.count(key) > 0) + continue; + std::vector near; + for (std::size_t i = 0; i < samples.size(); ++i) + if (std::abs(samples[i].position.x - middle.x) <= size * 0.5 + Reach && std::abs(samples[i].position.z - middle.y) <= size * 0.5 + Reach) + near.push_back(i); + if (near.empty()) + continue; + std::vector points; + std::vector nearest; + points.reserve(side * side); + nearest.reserve(side * side); + for (std::size_t iz = 0; iz < side; ++iz) + for (std::size_t ix = 0; ix < side; ++ix) + { + glm::dvec3 point{low.x + ix * cellsize, 0.0, low.y + iz * cellsize}; + auto best{near.front()}; + auto distance{std::numeric_limits::max()}; + for (auto const i : near) + { + auto const d{plan_distance(point, samples[i].position)}; + if (d < distance) + { + distance = d; + best = i; + } + } + point.y = profile::elevation(state.line, samples[best].chainage); + points.push_back(point); + nearest.push_back(best); + } + std::vector found; + auto heights{ground_heights(points, true, &found)}; + std::size_t own{0}; + for (std::size_t i = 0; i < points.size(); ++i) + if (found[i] != 0 && std::none_of(terrains.begin(), terrains.end(), [&](editor_terrain const *Terrain) { return Terrain->contains(points[i].x, points[i].z); })) + ++own; + if (own * 20 > points.size()) + { + ++skipped; + continue; + } + for (std::size_t i = 0; i < points.size(); ++i) + { + if (found[i] != 0) + continue; + auto const sample{nearest[i]}; + heights[i] = sample < state.terrain.size() && std::isfinite(state.terrain[sample]) ? state.terrain[sample] : profile::elevation(state.line, samples[sample].chainage) - Beds[sample].first; + } + auto const sampler = [&](double const X, double const Z, double &Height) { + auto const ix{static_cast(std::clamp(std::lround((X - low.x) / cellsize), 0, cells))}; + auto const iz{static_cast(std::clamp(std::lround((Z - low.y) / cellsize), 0, cells))}; + Height = heights[iz * side + ix]; + return true; + }; + if (streaming) + { + m_streamer.add_chunk(key.first, key.second); + auto *terrain{m_streamer.terrain_at(middle.x, middle.y)}; + if (terrain == nullptr) + continue; + terrain->reshape([&](double const X, double const Z, float &Height) { + double height; + sampler(X, Z, height); + Height = static_cast(height); + return true; + }); + } + else + { + auto chunk{std::make_unique()}; + if (false == chunk->create(glm::dvec3{middle.x, m_terrain_baseheight, middle.y}, cells, static_cast(cellsize), texture, sampler)) + continue; + m_grid_chunks[key] = std::move(chunk); + } + works.generated.push_back(key); + works.generated_streaming = streaming; + ++made; + } + return {made, skipped}; +} + void editor_mode::profile_shape_ground() { auto &state{m_profile}; @@ -483,11 +600,23 @@ void editor_mode::profile_shape_ground() if (samples.size() < 2 || state.line.points.size() < 2) return; auto const slope{std::max(0.1, works.slope)}; - auto const reach{works.half_width + works.reach}; + std::vector> beds(samples.size(), {works.depth, works.half_width}); + if (works.from_ballast) + for (std::size_t i = 0; i < samples.size(); ++i) + if (samples[i].span < state.route.spans.size()) + if (auto const *track{state.route.spans[samples[i].span].track}; track != nullptr) + beds[i] = profile_ballast(*track); + double widest{0.0}; + for (auto const &bed : beds) + widest = std::max(widest, bed.second); + auto const reach{widest + works.reach}; + works.undo.clear(); + works.generated.clear(); + auto const generated{works.generate ? profile_generate_ground(beds, reach) : std::pair{0, 0}}; auto const terrains{active_terrains()}; if (terrains.empty()) { - state.error = STR_C("There's no editor terrain to shape: convert the scenery ground first"); + state.error = generated.second > 0 ? STR_C("The scenery has its own ground under the route: convert it to editor terrain first") : STR_C("There's no editor terrain to shape: convert the scenery ground first"); return; } @@ -509,7 +638,6 @@ void editor_mode::profile_shape_ground() high = glm::max(high, glm::dvec2{std::max(a.x, b.x), std::max(a.z, b.z)}); } - works.undo.clear(); std::size_t moved{0}; double fill{0.0}, cut{0.0}; for (auto *terrain : terrains) @@ -520,6 +648,7 @@ void editor_mode::profile_shape_ground() return false; double distance{reach}; double chainage{-1.0}; + std::size_t nearest{0}; auto const from{key(X - reach, Z - reach)}; auto const to{key(X + reach, Z + reach)}; for (auto x = from.first; x <= to.first; ++x) @@ -540,12 +669,14 @@ void editor_mode::profile_shape_ground() { distance = offset; chainage = samples[i].chainage + (samples[i + 1].chainage - samples[i].chainage) * t; + nearest = t < 0.5 ? i : i + 1; } } } if (chainage < 0.0) return false; - auto const formation{profile::elevation(state.line, chainage) - works.depth}; + auto const &bed{beds[nearest]}; + auto const formation{profile::elevation(state.line, chainage) - bed.first}; auto const ground{static_cast(Height)}; // the bends at the edge of the formation and at the foot of the slope are rounded off over the given length auto const rounding{std::max(0.0, works.rounding)}; @@ -555,7 +686,7 @@ void editor_mode::profile_shape_ground() auto const h{std::max(K - std::abs(A - B), 0.0) / K}; return std::max(A, B) + h * h * K * 0.25; }; - auto const beyond{soft_max(0.0, distance - works.half_width, rounding)}; + auto const beyond{soft_max(0.0, distance - bed.second, rounding)}; auto const bend{rounding / slope}; auto const target{ground > formation ? -soft_max(-ground, -(formation + beyond / slope), bend) : soft_max(ground, formation - beyond / slope, bend)}; if (std::abs(target - ground) < 0.005) @@ -569,14 +700,21 @@ void editor_mode::profile_shape_ground() if (shaped) works.undo.emplace_back(terrain, before); } + auto const chunks = [&](std::string Text) { + if (generated.first > 0) + Text += format(STR_C("; %d chunk(s) of terrain made under the route"), generated.first); + if (generated.second > 0) + Text += format(STR_C("; %d chunk(s) left out: the scenery has its own ground there, convert it to shape it"), generated.second); + return Text; + }; if (moved == 0) { - state.status = STR_C("The editor terrain doesn't reach the route, or it's shaped already"); + state.status = chunks(STR_C("The editor terrain doesn't reach the route, or it's shaped already")); return; } state.error.clear(); profile_resample(); - state.status = format(STR_C("Terrain shaped at %zu points: embankment up to %.2f m, cutting up to %.2f m"), moved, fill, cut); + state.status = chunks(format(STR_C("Terrain shaped at %zu points: embankment up to %.2f m, cutting up to %.2f m"), moved, fill, cut)); WriteLog("Editor: vertical profile - " + state.status, logtype::generic); } @@ -592,6 +730,15 @@ void editor_mode::profile_restore_ground() ++restored; } state.earthworks.undo.clear(); + for (auto const &key : state.earthworks.generated) + { + if (state.earthworks.generated_streaming) + m_streamer.remove_chunk(key.first, key.second); + else + remove_grid_chunk(key.first, key.second); + ++restored; + } + state.earthworks.generated.clear(); profile_resample(); state.status = restored > 0 ? STR_C("The terrain is back as it was before the shaping") : STR_C("The shaped terrain isn't loaded any more"); } @@ -659,10 +806,27 @@ void editor_mode::render_profile_earthworks() render_ground_conversion(); auto const drag = [](char const *Label, double &Value, float const Speed, char const *Format) { return ImGui::DragScalar(STR_C(Label), ImGuiDataType_Double, &Value, Speed, nullptr, nullptr, Format); }; ImGui::PushItemWidth(90.0f); - drag("Formation below the rail top (m)", works.depth, 0.01f, "%.2f"); - drag("Half width of the formation (m)", works.half_width, 0.05f, "%.2f"); + ImGui::Checkbox(STR_C("Make terrain where the route has none"), &works.generate); if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("From the axis of the route to the edge of the formation;\nfor two tracks add the distance between them")); + ImGui::SetTooltip("%s", STR_C("Chunks of editor terrain are made along the route where there's none, from the ground around,\nthen shaped. Where the scenery has its own ground triangles the chunk is left out: convert them instead")); + ImGui::Checkbox(STR_C("Formation under the ballast of the track"), &works.from_ballast); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("The terrain goes as deep under the track as its ballast reaches and as wide as its foot,\nread from each path of the route; off: the values given below")); + if (works.from_ballast) + { + if (false == state.route.spans.empty() && state.route.spans.front().track != nullptr) + { + auto const bed{profile_ballast(*state.route.spans.front().track)}; + ImGui::TextDisabled(STR_C("Ballast %.2f m deep, its foot %.2f m from the axis"), bed.first, bed.second); + } + } + else + { + drag("Formation below the track (m)", works.depth, 0.01f, "%.2f"); + drag("Half width of the formation (m)", works.half_width, 0.05f, "%.2f"); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("From the axis of the route to the edge of the formation;\nfor two tracks add the distance between them")); + } drag("Slopes 1 : n, n", works.slope, 0.05f, "%.2f"); drag("Slopes reach at most (m)", works.reach, 1.0f, "%.0f"); drag("Rounding of the edges (m)", works.rounding, 0.1f, "%.1f"); @@ -678,13 +842,13 @@ void editor_mode::render_profile_earthworks() ImGui::TextDisabled("%s", STR_C("Correct the errors of the grade line first")); else if (ImGui::Button(STR_C("Shape the terrain"))) profile_shape_ground(); - if (false == works.undo.empty()) + if (false == works.undo.empty() || false == works.generated.empty()) { ImGui::SameLine(); if (ImGui::Button(STR_C("Restore the terrain"))) profile_restore_ground(); if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("Puts back the terrain as it was before the last shaping")); + ImGui::SetTooltip("%s", STR_C("Puts back the terrain as it was before the last shaping, and takes away the terrain it made")); } if (false == active_terrains().empty()) { diff --git a/application/editormodeselftest.cpp b/application/editormodeselftest.cpp new file mode 100644 index 000000000..8142eef94 --- /dev/null +++ b/application/editormodeselftest.cpp @@ -0,0 +1,385 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "application/editormode.h" +#include "application/application.h" +#include "application/editoruilayer.h" +#include "application/editorprojection.h" + +#include "simulation/simulation.h" +#include "utilities/Globals.h" +#include "utilities/Logs.h" +#include "world/Track.h" +#include "vehicle/DynObj.h" +#include "editor/editorFormat.hpp" + +#include +#include +#include +#include + +// the script is a text file, one action a line: +// wait +// camera from the first point, looking at the second +// select +// sweep =... model, params (separated by commas), lateral, height, side (origin, near, far, +// centre), top (origin, bottom, top, edge), mode (bend, repeat), step, +// length (original, all, or metres), from, to, widen (0, 1), face (0, 1), tilt (0, 1) +// spread logs the paths the spread from the track takes +// newscenery the editor starts again with the wizard of a new scenery +// vehicles logs each vehicle: its head, facing, and what its couplers hold +// screenshot +// save +// log +// quit +void editor_mode::selftest_step() +{ + auto &test{m_selftest}; + if (false == test.loaded) + { + test.loaded = true; + auto const *file{std::getenv("EU07_EDITOR_SELFTEST")}; + if (file == nullptr) + return; + std::ifstream stream(file); + std::string line; + while (std::getline(stream, line)) + if (false == line.empty() && line.front() != '#') + test.lines.push_back(line); + WriteLog("SELFTEST: " + std::to_string(test.lines.size()) + " steps from " + file); + } + if (test.wait > 0) + { + --test.wait; + return; + } + while (test.next < test.lines.size()) + { + std::istringstream words(test.lines[test.next++]); + std::string command; + words >> command; + if (command == "wait") + { + words >> test.wait; + return; + } + if (command == "camera") + { + glm::dvec3 from, to; + words >> from.x >> from.y >> from.z >> to.x >> to.y >> to.z; + auto const look{glm::normalize(to - from)}; + Camera.Pos = from; + Camera.Angle = glm::vec3(static_cast(std::asin(std::clamp(look.y, -1.0, 1.0))), static_cast(std::atan2(-look.x, -look.z)), 0.0f); + Global.pCamera = Camera; + m_focus_active = false; + } + else if (command == "select") + { + std::string name; + words >> name; + m_node = simulation::Paths.find(name); + m_track_point = {}; + ui()->set_node(m_node); + WriteLog("SELFTEST select " + name + (m_node != nullptr ? "" : ": no such track")); + } + else if (command == "sweep") + { + std::map values; + std::string pair; + while (words >> pair) + { + auto const equals{pair.find('=')}; + if (equals != std::string::npos) + values[pair.substr(0, equals)] = pair.substr(equals + 1); + } + auto &tool{m_sweep}; + auto const get = [&](char const *Key, std::string const &Default) { auto const found{values.find(Key)}; return found != values.end() ? found->second : Default; }; + tool.edited = nullptr; + tool.curve_for = nullptr; + std::snprintf(tool.model, sizeof(tool.model), "%s", get("model", "").c_str()); + tool.parameters.clear(); + std::stringstream parameters(get("params", "")); + std::string parameter; + while (std::getline(parameters, parameter, ',')) + { + tool.parameters.emplace_back(); + std::snprintf(tool.parameters.back().data(), tool.parameters.back().size(), "%s", parameter.c_str()); + } + tool.parameters_for = tool.model; + auto &settings{tool.settings}; + settings.lateral = std::stod(get("lateral", "0")); + settings.height = std::stod(get("height", "0")); + auto const side{get("side", "origin")}; + settings.side_anchor = side == "near" ? 1 : side == "far" ? 2 : side == "centre" ? 3 : 0; + auto const top{get("top", "origin")}; + settings.height_anchor = top == "bottom" ? 1 : top == "top" ? 2 : top == "edge" ? 3 : 0; + settings.bend = get("mode", "bend") != "repeat"; + settings.step = std::stod(get("step", "0")); + settings.widen = get("widen", "0") == "1"; + settings.face = get("face", "1") == "1"; + settings.tilt = get("tilt", "0") == "1"; + settings.from = std::stod(get("from", "0")); + settings.to = std::stod(get("to", "-1")); + auto const length{get("length", "all")}; + tool.length_mode = length == "original" ? 0 : length == "all" ? 2 : 1; + if (tool.length_mode == 1) + tool.length = std::stod(length); + tool.measured.clear(); + tool.open = true; + sweep_curve(); + sweep_measure(); + if (get("create", "1") == "1") + { + sweep_create(); + WriteLog("SELFTEST sweep: " + tool.status); + } + } + else if (command == "drag") + { + glm::dvec3 from{0.0}, to{0.0}; + words >> from.x >> from.z >> to.x >> to.z; + m_sweep.open = true; + if (false == sweep_press_at(from, false)) + { + WriteLog("SELFTEST drag: the press wasn't taken"); + continue; + } + sweep_drag_at(to); + sweep_release(); + WriteLog("SELFTEST drag: " + m_sweep.status); + } + else if (command == "probe") + { + // edge of the last laid model as it was made: its distance from the axis and the height of its top over the rail head + std::string name; + words >> name; + auto *sweep{name.empty() ? m_sweep.edited : simulation::Sweeps.find(name)}; + if (sweep == nullptr) + { + WriteLog("SELFTEST probe: nothing laid"); + continue; + } + auto const &definition{sweep->definition()}; + double const sign{definition.lateral >= 0.0 ? 1.0 : -1.0}; + struct bin + { + double edge{std::numeric_limits::max()}; + std::vector> points; // lateral, height over the axis + }; + std::map bins; + for (auto const &shape : sweep->create_shapes()) + for (auto const &vertex : shape.data().vertices) + { + double lateral; + auto const station{sweep->project(vertex.position, lateral)}; + if (lateral * sign <= 0.0) + continue; + auto const axis{sweep->frame_at(station)}; + auto &entry{bins[static_cast(station / 20.0)]}; + entry.edge = std::min(entry.edge, std::abs(lateral)); + entry.points.emplace_back(std::abs(lateral), vertex.position.y - axis.position.y); + } + WriteLog(format("SELFTEST probe %s: %zu stretches with the model, %.1f - %.1f m of %.1f m", sweep->name().c_str(), bins.size(), sweep->start(), sweep->end(), sweep->length())); + for (auto const &[index, entry] : bins) + { + auto const station{index * 20.0 + 10.0}; + if (station < sweep->start() || station > sweep->end()) + continue; + double top{-1000.0}; + for (auto const &point : entry.points) + if (point.first < entry.edge + 0.15) + top = std::max(top, point.second); + auto const at{sweep->frame_at(station)}; + auto const head{0.18 + sweep_node::rail_head(at.roll, definition.lateral)}; + WriteLog(format("SELFTEST probe %s at %.0f m: edge %.3f m from the axis, its top %.3f m over the rail head (cant %.1f deg, gauge widening %.3f m, cant part %.3f m)", sweep->name().c_str(), station, entry.edge, top - head, at.roll, + at.widening[definition.lateral >= 0.0 ? 1 : 0], std::max(0.0, at.cant[definition.lateral >= 0.0 ? 1 : 0]))); + } + } + else if (command == "fouling") + { + std::map values; + std::string pair; + while (words >> pair) + { + auto const equals{pair.find('=')}; + if (equals != std::string::npos) + values[pair.substr(0, equals)] = pair.substr(equals + 1); + } + auto &tool{m_fouling}; + tool.scope = std::stoi(values.count("scope") ? values["scope"] : "2"); + tool.height_mode = values["mode"] == "ground" ? 0 : 1; + tool.height = std::stod(values.count("height") ? values["height"] : "0"); + tool.dirty = true; + fouling_update(); + WriteLog("SELFTEST fouling: " + tool.status); + int shown{0}; + for (auto const &found : tool.found) + if (found.wrong && shown++ < 5) + WriteLog(format("SELFTEST fouling: %s %.2f m off, %+.3f m high", found.marker.file.c_str(), found.error, found.height_error)); + if (values["place"] == "1") + { + fouling_place(); + tool.dirty = true; + fouling_update(); + WriteLog("SELFTEST fouling after placing: " + tool.status); + } + if (values["fix"] == "1") + { + fouling_fix(); + tool.dirty = true; + fouling_update(); + WriteLog("SELFTEST fouling after the fix: " + tool.status); + } + } + else if (command == "hekto") + { + std::map values; + std::string pair; + while (words >> pair) + { + auto const equals{pair.find('=')}; + if (equals != std::string::npos) + values[pair.substr(0, equals)] = pair.substr(equals + 1); + } + auto *track{simulation::Paths.find(values["track"])}; + if (track == nullptr) + { + WriteLog("SELFTEST hekto: no such track"); + continue; + } + hekto_start(*track, track->m_paths.front().points[segment_data::point::start]); + auto &tool{m_hekto}; + tool.dirty = true; + hekto_update(); + if (values.count("km")) + { + tool.km = std::stod(values["km"]); + tool.growth = values["growth"] == "-1" ? -1 : 1; + } + tool.side = values["side"] == "alt" ? 0 : values["side"] == "left" ? -1 : 1; + tool.dirty = true; + hekto_update(); + auto const missing{std::count_if(tool.posts.begin(), tool.posts.end(), [](hekto_post const &Post) { return Post.standing < 0; })}; + WriteLog(format("SELFTEST hekto: km %.3f growth %d, %zu posts along %.0f m, %d to place, %zu standing. %s", tool.km, tool.growth, tool.posts.size(), tool.samples.empty() ? 0.0 : tool.samples.back().chainage, static_cast(missing), tool.found.size(), tool.status.c_str())); + for (std::size_t i = 0; i < tool.posts.size() && i < 4; ++i) + { + auto const &post{tool.posts[i]}; + double lateral; + glm::dvec3 const axis{editor_track::sampled_position(tool.samples, post.chainage)}; + auto const direction{editor_track::sampled_position(tool.samples, post.chainage + 1.0) - axis}; + glm::dvec2 const offset{post.position.x - axis.x, post.position.z - axis.z}; + lateral = glm::length(offset); + auto const right{(direction.x * offset.y - direction.z * offset.x) * tool.growth >= 0.0}; + WriteLog(format("SELFTEST hekto post %d.%d at %.1f m, %.2f m from the axis, %s of the growing kilometrage, at %.1f %.1f %.1f", post.hectometres / 10, post.hectometres % 10, post.chainage, lateral, right ? "right" : "left", post.position.x, post.position.y, + post.position.z)); + } + if (values["place"] == "1") + { + hekto_place(); + WriteLog("SELFTEST hekto: " + tool.status); + } + } + else if (command == "tracks") + { + int tab{0}; + words >> tab; + show_track_tab(track_tab::lineside); + m_sweep.expand = tab == 0; + m_hekto.expand = tab == 1; + m_fouling.expand = tab == 2; + m_parallel.expand = tab == 3; + m_vehicle.expand = tab == 4; + } + else if (command == "curve") + { + sweep_curve(); + for (auto const &piece : m_sweep.curve) + { + auto const &a{piece.points[segment_data::point::start]}; + auto const &b{piece.points[segment_data::point::end]}; + WriteLog(format("SELFTEST curve piece %.1f %.1f -> %.1f %.1f", a.x, a.z, b.x, b.z)); + } + if (false == m_sweep.outline.empty()) + WriteLog(format("SELFTEST curve outline %zu points, %.1f %.1f -> %.1f %.1f, %.1f m", m_sweep.outline.size(), m_sweep.outline.front().x, m_sweep.outline.front().z, m_sweep.outline.back().x, m_sweep.outline.back().z, m_sweep.curve_length)); + } + else if (command == "projtest") + { + screen_projection const projection; + for (std::size_t i = 0; i < m_sweep.outline.size() && i < 45; i += 4) + { + ImVec2 screen; + auto const shown{projection.project(m_sweep.outline[i], screen)}; + auto const clip{projection.clip(m_sweep.outline[i])}; + WriteLog(format("SELFTEST proj %zu: %.1f %.1f %.1f -> %d %.0f %.0f w %.2f", i, m_sweep.outline[i].x, m_sweep.outline[i].y, m_sweep.outline[i].z, shown ? 1 : 0, screen.x, screen.y, clip.w)); + } + } + else if (command == "spread") + { + std::string name; + words >> name >> m_spread.stop >> m_spread.reach; + if (auto *track{simulation::Paths.find(name)}) + { + std::string names; + for (auto const *other : track_spread_from(*track)) + names += ' ' + other->name(); + WriteLog("SELFTEST spread " + name + ":" + names + " | prev " + (track->trPrev ? track->trPrev->name() : std::string{"-"}) + " next " + (track->trNext ? track->trNext->name() : std::string{"-"})); + } + } + else if (command == "newscenery") + { + WriteLog(restart_for_new_scenery() ? "SELFTEST newscenery: started" : "SELFTEST newscenery: failed"); + return; + } + else if (command == "vehicles") + { + for (auto *vehicle : simulation::Vehicles.sequence()) + { + if (vehicle == nullptr) + continue; + auto const head{vehicle->HeadPosition()}; + auto const front{vehicle->VectorFront()}; + auto const coupler = [&](int const End) { + auto const &coupler{vehicle->MoverParameters->Couplers[End]}; + return coupler.Connected != nullptr ? coupler.Connected->Name + "/" + std::to_string(coupler.CouplingFlag) : std::string{"-"}; + }; + WriteLog(format("SELFTEST vehicle %s head %.2f %.2f front %.2f %.2f dir %d coupler0 %s coupler1 %s", vehicle->name().c_str(), head.x, head.z, front.x, front.z, vehicle->iDirection, coupler(0).c_str(), coupler(1).c_str())); + } + } + else if (command == "screenshot") + { + Application.queue_screenshot(); + test.wait = 3; + return; + } + else if (command == "save") + { + save(); + } + else if (command == "log") + { + std::string text; + std::getline(words, text); + WriteLog("SELFTEST" + text); + } + else if (command == "quit") + { + if (false == test.quitting) + { + WriteLog("SELFTEST done"); + test.quitting = true; + test.wait = 30; + --test.next; + return; + } + Application.queue_quit(true); + return; + } + } +} diff --git a/application/editormodespeed.cpp b/application/editormodespeed.cpp index 5c3818055..f1c55666f 100644 --- a/application/editormodespeed.cpp +++ b/application/editormodespeed.cpp @@ -29,7 +29,6 @@ namespace { double const kSpeedLineReach{5000.0}; // m each way, for the line through the selected path -double const kSpeedViewDistance{25.0}; double const kSpeedOverlayRange{3000.0}; bool rail(TTrack const &Track) @@ -148,21 +147,7 @@ void editor_mode::speed_focus(int const Index) return; m_node = verdict.track; ui()->set_node(m_node); - auto const &path{verdict.track->m_paths[std::min(verdict.path, verdict.track->m_paths.size() - 1)]}; - geometry::bezier const curve{path}; - glm::dvec3 look{curve.first(0.5)}; - look.y = 0.0; - look = glm::length(look) > 1e-6 ? glm::normalize(look) : glm::dvec3(0.0, 0.0, 1.0); - if (glm::dot(Camera.Pos - verdict.position, look) > 0.0) - look = -look; - look = glm::normalize(look - glm::dvec3(0.0, 0.25, 0.0)); - m_focus_start_pos = Camera.Pos; - m_focus_start_angle = Camera.Angle; - m_focus_target_pos = verdict.position - look * kSpeedViewDistance; - m_focus_target_angle = glm::vec3(static_cast(std::asin(std::clamp(look.y, -1.0, 1.0))), static_cast(std::atan2(-look.x, -look.z)), 0.0f); - m_focus_active = true; - m_focus_time = 0.0; - m_focus_duration = 0.6; + focus_track(*verdict.track, verdict.path, verdict.position); } void editor_mode::speed_apply(std::vector const &Indices, bool const Branches) diff --git a/application/editormodesweep.cpp b/application/editormodesweep.cpp new file mode 100644 index 000000000..38c78dac1 --- /dev/null +++ b/application/editormodesweep.cpp @@ -0,0 +1,955 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "application/editormode.h" +#include "application/editoruilayer.h" +#include "application/editorprojection.h" +#include "editor/editorFormat.hpp" +#include "editor/editorGeometry.hpp" +#include "editor/editorIncludeInfo.hpp" + +#include "rendering/renderer.h" +#include "scene/scenelayers.h" +#include "simulation/simulation.h" +#include "utilities/Globals.h" +#include "utilities/Logs.h" +#include "world/Sweep.h" +#include "world/Track.h" + +#include "imgui/imgui.h" +#include "utilities/translation.h" +#include +#include +#include +#include +#include +#include +#include +#include + +namespace +{ + +using geometry::bezier; +using geometry::plan_distance; +using geometry::plan_of; + +double const kSweepRouteReach{2000.0}; // m each way through the switches +double const kSweepOutlineStep{1.0}; +double const kSweepNear{4.0}; // m, a model along a curve this close to the selected path belongs to its line +double const kSweepGrab{25.0}; // m from the track, a press this close marks the stretch of the model +std::size_t const kSweepModelList{400}; +double const kRailTop{0.18}; // m from the points of a track to the top of its rails + +segment_data reversed(segment_data const &Path) +{ + segment_data result{Path}; + result.points[segment_data::point::start] = Path.points[segment_data::point::end]; + result.points[segment_data::point::end] = Path.points[segment_data::point::start]; + result.points[segment_data::point::control1] = Path.points[segment_data::point::control2]; + result.points[segment_data::point::control2] = Path.points[segment_data::point::control1]; + result.rolls = {-Path.rolls[1], -Path.rolls[0]}; + return result; +} + +bool same_piece(segment_data const &A, segment_data const &B) +{ + for (int i = 0; i < 4; ++i) + if (glm::distance(A.points[i], B.points[i]) > 1e-3) + return false; + return std::abs(A.rolls[0] - B.rolls[0]) < 1e-3f && std::abs(A.rolls[1] - B.rolls[1]) < 1e-3f; +} + +std::string lower(std::string Text) +{ + std::transform(Text.begin(), Text.end(), Text.begin(), [](unsigned char const Character) { return static_cast(std::tolower(Character)); }); + return Text; +} + +} // namespace + +void editor_mode::sweep_scan_models() +{ + auto &tool{m_sweep}; + if (tool.scanned) + return; + tool.scanned = true; + std::error_code error; + std::set found; + for (auto const &entry : std::filesystem::recursive_directory_iterator("models", std::filesystem::directory_options::skip_permission_denied, error)) + { + if (false == entry.is_regular_file(error)) + continue; + auto const extension{lower(entry.path().extension().string())}; + if (extension != ".e3d" && extension != ".t3d") + continue; + auto name{std::filesystem::relative(entry.path(), "models", error).generic_string()}; + name.erase(name.size() - extension.size()); + found.insert(name); + } + for (auto const &entry : std::filesystem::recursive_directory_iterator("scenery", std::filesystem::directory_options::skip_permission_denied, error)) + { + if (entry.is_regular_file(error) && lower(entry.path().extension().string()) == ".inc") + found.insert(std::filesystem::relative(entry.path(), "scenery", error).generic_string()); + } + tool.models.assign(found.begin(), found.end()); +} + + +void editor_mode::sweep_curve() +{ + auto &tool{m_sweep}; + auto *track{selected_track()}; + if (track == tool.curve_for && tool.curve_history == m_history.size()) + return; + tool.curve_for = track; + tool.curve_history = m_history.size(); + tool.curve.clear(); + tool.curve_pieces.clear(); + if (track != nullptr && false == track->m_paths.empty() && editor_track::is_supported(*track)) + { + tool.curve.push_back(track->m_paths.front()); + tool.curve_pieces.push_back({track, 0, true}); + } + sweep_outline(); +} + +void editor_mode::sweep_outline() +{ + auto &tool{m_sweep}; + tool.outline.clear(); + tool.stations.clear(); + tool.curve_length = 0.0; + for (auto const &piece : tool.curve) + { + bezier const curve{piece}; + auto const count{std::clamp(static_cast(curve.plan_length() / kSweepOutlineStep), 2, 2000)}; + for (int k = tool.outline.empty() ? 0 : 1; k <= count; ++k) + { + auto const point{curve.point(static_cast(k) / count)}; + if (false == tool.outline.empty()) + tool.curve_length += plan_distance(tool.outline.back(), point); + tool.outline.push_back(point); + tool.stations.push_back(tool.curve_length); + } + } +} + +bool editor_mode::sweep_extend(bool const Atend, glm::dvec3 const &Cursor) +{ + auto &tool{m_sweep}; + if (tool.curve_pieces.empty() || tool.curve_length > kSweepRouteReach) + return false; + auto const &edge{Atend ? tool.curve_pieces.back() : tool.curve_pieces.front()}; + auto const &edgepiece{Atend ? tool.curve.back() : tool.curve.front()}; + auto const point{Atend ? edgepiece.points[segment_data::point::end] : edgepiece.points[segment_data::point::start]}; + std::optional best; + segment_data bestpiece; + auto bestdistance{std::numeric_limits::max()}; + for (auto const &[other, end] : editor_track::connected_points(*edge.track, point)) + { + if (other == nullptr || other->m_editorremoved || other->eType == tt_Table || false == editor_track::is_supported(*other) || end.path >= static_cast(other->m_paths.size())) + continue; + if (std::any_of(tool.curve_pieces.begin(), tool.curve_pieces.end(), [&](sweep_tool::piece const &Piece) { return Piece.track == other && Piece.path == end.path; })) + continue; + auto const startshere{end.kind == editor_track::point_kind::start}; + auto const forward{Atend ? startshere : false == startshere}; + auto const piece{forward ? other->m_paths[end.path] : reversed(other->m_paths[end.path])}; + bezier const curve{piece}; + auto distance{std::numeric_limits::max()}; + for (int k = 0; k <= 32; ++k) + distance = std::min(distance, plan_distance(curve.point(k / 32.0), Cursor)); + if (distance < bestdistance) + { + bestdistance = distance; + best = sweep_tool::piece{other, end.path, forward}; + bestpiece = piece; + } + } + if (false == best.has_value()) + return false; + if (Atend) + { + tool.curve_pieces.push_back(*best); + tool.curve.push_back(bestpiece); + sweep_outline(); + } + else + { + auto const before{tool.curve_length}; + tool.curve_pieces.insert(tool.curve_pieces.begin(), *best); + tool.curve.insert(tool.curve.begin(), bestpiece); + sweep_outline(); + tool.anchor += tool.curve_length - before; + } + return true; +} + +double editor_mode::sweep_station(glm::dvec3 const &Point, double &Lateral) const +{ + auto const &tool{m_sweep}; + double best{std::numeric_limits::max()}; + double station{0.0}; + Lateral = 0.0; + auto const point{plan_of(Point)}; + for (std::size_t i = 1; i < tool.outline.size(); ++i) + { + auto const a{plan_of(tool.outline[i - 1])}; + auto const ab{plan_of(tool.outline[i]) - a}; + auto const length2{glm::dot(ab, ab)}; + if (length2 < 1e-12) + continue; + auto const t{std::clamp(glm::dot(point - a, ab) / length2, 0.0, 1.0)}; + auto const distance{glm::length(point - (a + ab * t))}; + if (distance < best) + { + best = distance; + station = tool.stations[i - 1] + (tool.stations[i] - tool.stations[i - 1]) * t; + Lateral = geometry::cross(glm::normalize(ab), point - a) >= 0.0 ? distance : -distance; + } + } + return station; +} + +void editor_mode::sweep_measure() +{ + auto &tool{m_sweep}; + std::string const model{tool.model}; + if (model == tool.measured) + return; + tool.measured = model; + tool.model_length = 0.0; + if (model.empty()) + return; + scene::node_data data; + sweep_node probe{data}; + auto state{sweep_definition()}; + state.pieces.clear(); + state.along_x = false; + probe.define(state); + auto const alongz{probe.model_length()}; + state.along_x = true; + probe.define(state); + auto const alongx{probe.model_length()}; + tool.settings.along_x = tool.axis == 2 || (tool.axis == 0 && alongx > alongz); + tool.model_length = tool.settings.along_x ? alongx : alongz; +} + +sweep_node::state editor_mode::sweep_definition() const +{ + auto const &tool{m_sweep}; + auto state{tool.settings}; + state.model = tool.model; + state.skin = tool.skin[0] != '\0' ? tool.skin : "none"; + state.pieces = tool.curve; + state.height = tool.settings.height + kRailTop; + if (tool.length_mode == 0 && tool.model_length > 0.0) + state.to = state.from + tool.model_length; + else if (tool.length_mode == 1) + state.to = state.from + std::max(0.5, tool.length); + state.parameters.clear(); + for (auto const &value : tool.parameters) + state.parameters.emplace_back(value[0] != '\0' ? value.data() : "none"); + return state; +} + +void editor_mode::sweep_create() +{ + auto &tool{m_sweep}; + sweep_curve(); + if (tool.curve.empty() || tool.model[0] == '\0') + return; + static int counter{0}; + scene::node_data data; + data.type = "sweep"; + data.range_max = -1.0; + data.layer = scene::Layers.active(); + do + { + data.name = "sweep_" + std::to_string(++counter); + } while (simulation::Sweeps.find(data.name) != nullptr); + auto *sweep{new sweep_node(data)}; + sweep->define(sweep_definition()); + sweep->mark_dirty(); + simulation::Sweeps.insert(sweep); + scene::Layers.count(sweep->layer(), scene::layer_item::model); + sweep->show(); + // the pieces are the paths of the line, so the model follows them when they change + for (auto const &piece : tool.curve_pieces) + if (piece.track != nullptr && false == piece.track->m_editorremoved) + sweeps_captured(*piece.track); + EditorSnapshot snap; + snap.action = EditorSnapshot::Action::Other; + snap.node_name = sweep->name(); + snap.sweeps_toggled.push_back(sweep); + trim_history(); + m_history.push_back(std::move(snap)); + g_redo.clear(); + tool.edited = sweep; + tool.status = format(STR_C("%s laid along %.1f m, Ctrl+Z takes it back"), tool.model, sweep->end() - sweep->start()); + if (scene::Layers.active() == null_handle) + tool.status += "\n" + std::string{STR_C("The scenery isn't opened for editing, it won't be saved")}; + WriteLog("Editor: " + tool.status, logtype::generic); +} + +void editor_mode::sweep_apply() +{ + auto &tool{m_sweep}; + auto *sweep{tool.edited}; + if (sweep == nullptr || sweep->m_editorremoved) + return; + auto state{sweep_definition()}; + state.pieces = sweep->definition().pieces; + if (state == sweep->definition()) + return; + EditorSnapshot snap; + snap.action = EditorSnapshot::Action::Other; + snap.node_name = sweep->name(); + snap.sweeps.emplace_back(sweep, sweep->definition()); + trim_history(); + m_history.push_back(std::move(snap)); + g_redo.clear(); + sweep->define(state); + sweep->mark_dirty(); +} + +void editor_mode::sweep_delete(sweep_node &Sweep) +{ + Sweep.m_editorremoved = true; + Sweep.hide(); + Sweep.mark_dirty(); + EditorSnapshot snap; + snap.action = EditorSnapshot::Action::Other; + snap.node_name = Sweep.name(); + snap.sweeps_toggled.push_back(&Sweep); + trim_history(); + m_history.push_back(std::move(snap)); + g_redo.clear(); + if (m_sweep.edited == &Sweep) + m_sweep.edited = nullptr; +} + +void editor_mode::sweep_edit(sweep_node &Sweep) +{ + auto &tool{m_sweep}; + tool.edited = &Sweep; + auto const &state{Sweep.definition()}; + tool.settings = state; + tool.settings.height = state.height - kRailTop; + tool.settings.pieces.clear(); + std::snprintf(tool.model, sizeof(tool.model), "%s", state.model.c_str()); + std::snprintf(tool.skin, sizeof(tool.skin), "%s", state.skin.c_str()); + tool.axis = state.along_x ? 2 : 1; + tool.measured.clear(); + tool.parameters_for.clear(); + tool.parameters.clear(); + for (auto const &value : state.parameters) + { + tool.parameters.emplace_back(); + std::snprintf(tool.parameters.back().data(), tool.parameters.back().size(), "%s", value.c_str()); + } + tool.parameters_for = state.model; +} + +void editor_mode::restore_sweeps(EditorSnapshot &Snapshot) +{ + for (auto &entry : Snapshot.sweeps) + { + auto current{entry.first->definition()}; + entry.first->define(entry.second); + entry.first->mark_dirty(); + entry.second = std::move(current); + } + for (auto *sweep : Snapshot.sweeps_toggled) + { + sweep->m_editorremoved = false == sweep->m_editorremoved; + if (sweep->m_editorremoved) + sweep->hide(); + else + sweep->show(); + sweep->mark_dirty(); + if (m_sweep.edited == sweep && sweep->m_editorremoved) + m_sweep.edited = nullptr; + } +} + +std::vector editor_mode::sweeps_near(TTrack const &Track) const +{ + std::vector result; + std::vector points; + for (auto const &path : Track.m_paths) + { + bezier const curve{path}; + for (int k = 0; k <= 8; ++k) + points.push_back(curve.point(k / 8.0)); + } + for (auto *sweep : simulation::Sweeps.sequence()) + { + if (sweep == nullptr || sweep->m_editorremoved) + continue; + auto const &definition{sweep->definition()}; + bool near{false}; + for (auto const &piece : definition.pieces) + { + bezier const curve{piece}; + for (int k = 0; k <= 8 && false == near; ++k) + { + auto const point{curve.point(k / 8.0)}; + near = std::any_of(points.begin(), points.end(), [&](glm::dvec3 const &Other) { return plan_distance(point, Other) < kSweepNear; }); + } + if (near) + break; + } + if (near) + result.push_back(sweep); + } + return result; +} + +bool editor_mode::sweep_press() +{ + return sweep_press_at(Global.pCamera.Pos + GfxRenderer->Mouse_Position(), false); +} + +bool editor_mode::sweep_grabs(glm::dvec3 const &Point) +{ + auto &tool{m_sweep}; + if (false == tool.open || tool.model[0] == '\0') + return false; + sweep_curve(); + if (tool.outline.size() < 2) + return false; + sweep_measure(); + if (tool.model_length <= 0.0) + return false; + double lateral; + sweep_station(Point, lateral); + return std::abs(lateral) <= kSweepGrab; +} + +bool editor_mode::sweep_press_at(glm::dvec3 const &Point, bool const Anywhere) +{ + auto &tool{m_sweep}; + sweep_curve(); + if (false == tool.open || tool.outline.size() < 2 || tool.model[0] == '\0') + return false; + sweep_measure(); + if (tool.model_length <= 0.0) + return false; + auto *track{selected_track()}; + if (track != nullptr && track->eType == tt_Switch && track->m_paths.size() > 1 && tool.curve_pieces.size() == 1) + { + auto nearest{0}; + auto best{std::numeric_limits::max()}; + for (int i = 0; i < static_cast(track->m_paths.size()); ++i) + { + bezier const curve{track->m_paths[i]}; + for (int k = 0; k <= 32; ++k) + if (auto const distance{plan_distance(curve.point(k / 32.0), Point)}; distance < best) + { + best = distance; + nearest = i; + } + } + tool.curve = {track->m_paths[nearest]}; + tool.curve_pieces = {{track, nearest, true}}; + sweep_outline(); + } + double lateral; + auto const station{sweep_station(Point, lateral)}; + // a press away from the track is left to the selection of the tracks + if (false == Anywhere && std::abs(lateral) > kSweepGrab) + return false; + // the press tells the side, the distance from the track is the one set + auto const distance{std::abs(tool.settings.lateral) > 1e-6 ? std::abs(tool.settings.lateral) : std::round(std::abs(lateral) / 0.05) * 0.05}; + tool.settings.lateral = lateral >= 0.0 ? distance : -distance; + if (tool.settings.side_anchor == 0) + tool.settings.side_anchor = 1; + tool.anchor = std::round(station * 10.0) / 10.0; + tool.settings.from = tool.settings.to = tool.anchor; + tool.dragging = true; + return true; +} + +void editor_mode::sweep_drag() +{ + if (m_sweep.dragging) + sweep_drag_at(Global.pCamera.Pos + GfxRenderer->Mouse_Position()); +} + +void editor_mode::sweep_drag_at(glm::dvec3 const &Point) +{ + auto &tool{m_sweep}; + if (false == tool.dragging) + return; + double lateral; + for (int i = 0; i < 4; ++i) + { + auto const raw{sweep_station(Point, lateral)}; + if (raw >= tool.curve_length - 0.5 && sweep_extend(true, Point)) + continue; + if (raw <= 0.5 && sweep_extend(false, Point)) + continue; + break; + } + auto const station{std::round(sweep_station(Point, lateral) * 10.0) / 10.0}; + tool.settings.from = std::min(tool.anchor, station); + tool.settings.to = std::max(tool.anchor, station); +} + +void editor_mode::sweep_release() +{ + auto &tool{m_sweep}; + if (false == tool.dragging) + return; + tool.dragging = false; + // a click lays one copy as long as the original from the place clicked, a drag the stretch dragged over + if (tool.settings.to - tool.settings.from < 1.0) + { + tool.length_mode = 0; + tool.settings.from = tool.anchor; + } + else + { + tool.length_mode = 1; + tool.length = tool.settings.to - tool.settings.from; + } + if (tool.edited == nullptr) + { + sweep_create(); + return; + } + // the model being edited is laid again along the line, over the stretch marked + auto state{sweep_definition()}; + EditorSnapshot snap; + snap.action = EditorSnapshot::Action::Other; + snap.node_name = tool.edited->name(); + snap.sweeps.emplace_back(tool.edited, tool.edited->definition()); + trim_history(); + m_history.push_back(std::move(snap)); + g_redo.clear(); + tool.edited->define(state); + tool.edited->mark_dirty(); + if (auto *track{selected_track()}) + sweeps_captured(*track); + tool.status = format(STR_C("%s laid along %.1f m, Ctrl+Z takes it back"), tool.model, tool.edited->end() - tool.edited->start()); +} + +void editor_mode::sweeps_captured(TTrack const &Track) +{ + for (auto *sweep : simulation::Sweeps.sequence()) + { + if (sweep == nullptr || sweep->m_editorremoved) + continue; + auto const &pieces{sweep->definition().pieces}; + for (std::size_t i = 0; i < pieces.size(); ++i) + for (int path = 0; path < static_cast(Track.m_paths.size()); ++path) + { + bool const along{same_piece(pieces[i], Track.m_paths[path])}; + bool const against{false == along && same_piece(pieces[i], reversed(Track.m_paths[path]))}; + if (false == along && false == against) + continue; + if (std::none_of(m_sweep_links.begin(), m_sweep_links.end(), [&](sweep_link const &Link) { return Link.sweep == sweep && Link.piece == i; })) + m_sweep_links.push_back({sweep, i, const_cast(&Track), path, against}); + } + } +} + +void editor_mode::sweeps_committed(std::vector const &Tracks) +{ + std::vector changed; + std::vector> states; + for (auto const &link : m_sweep_links) + { + if (link.track == nullptr || link.track->m_editorremoved || link.sweep->m_editorremoved || std::find(Tracks.begin(), Tracks.end(), link.track) == Tracks.end() || + link.path >= static_cast(link.track->m_paths.size())) + continue; + auto entry{std::find_if(states.begin(), states.end(), [&](auto const &State) { return State.first == link.sweep; })}; + if (entry == states.end()) + { + states.emplace_back(link.sweep, link.sweep->definition()); + entry = std::prev(states.end()); + } + if (link.piece >= entry->second.pieces.size()) + continue; + auto const &path{link.track->m_paths[link.path]}; + entry->second.pieces[link.piece] = link.reversed ? reversed(path) : path; + } + for (auto &entry : states) + { + if (entry.second == entry.first->definition()) + continue; + entry.first->define(entry.second); + entry.first->mark_dirty(); + } +} + +void editor_mode::sweeps_split(TTrack &Original, TTrack &Created) +{ + if (Created.m_paths.empty()) + return; + std::vector added; + for (auto &link : m_sweep_links) + { + if (link.track != &Original || link.path != 0) + continue; + auto state{link.sweep->definition()}; + if (link.piece >= state.pieces.size()) + continue; + // the second part goes after the first one along the curve, or ahead of it on a curve laid against the path + auto const at{link.piece + (link.reversed ? 0 : 1)}; + state.pieces.insert(state.pieces.begin() + at, link.reversed ? reversed(Created.m_paths.front()) : Created.m_paths.front()); + for (auto &other : m_sweep_links) + if (other.sweep == link.sweep && other.piece >= at && &other != &link) + ++other.piece; + if (link.reversed) + ++link.piece; + added.push_back({link.sweep, at, &Created, 0, link.reversed}); + link.sweep->define(state); + } + m_sweep_links.insert(m_sweep_links.end(), added.begin(), added.end()); +} + +void editor_mode::render_sweep_ui() +{ + auto &tool{m_sweep}; + auto *track{selected_track()}; + sweep_curve(); + sweep_scan_models(); + ImGui::TextDisabled("%s", STR_C("A model bent to follow the track, or repeated along it: platforms, walls, fences, barriers, lamps")); + + // models along curves by this line + if (track != nullptr) + { + auto const near{sweeps_near(*track)}; + if (false == near.empty()) + { + ImGui::TextDisabled("%s", STR_C("By this track:")); + for (auto *sweep : near) + { + ImGui::PushID(sweep); + auto const &definition{sweep->definition()}; + if (ImGui::Selectable(format("%s %s, %.0f m", sweep->name().c_str(), definition.model.c_str(), sweep->end() - sweep->start()).c_str(), tool.edited == sweep, 0, ImVec2(ImGui::GetContentRegionAvail().x - 60.0f, 0.0f))) + sweep_edit(*sweep); + ImGui::SameLine(); + if (ImGui::SmallButton(STR_C("Delete"))) + sweep_delete(*sweep); + ImGui::PopID(); + } + if (tool.edited != nullptr && ImGui::SmallButton(STR_C("New one"))) + tool.edited = nullptr; + ImGui::Separator(); + } + } + bool changed{false}; + auto const edited = [&](bool const Changed) { changed |= Changed; }; + + ImGui::SetNextItemWidth(-1.0f); + if (ImGui::InputTextWithHint("##sweepmodel", STR_C("model, e.g. peronowe/1k96w200m"), tool.model, sizeof(tool.model))) + changed = true; + ImGui::SetNextItemWidth(-1.0f); + ImGui::InputTextWithHint("##sweepsearch", STR_C("search the models"), tool.search, sizeof(tool.search)); + std::string const text{lower(tool.search)}; + if (false == text.empty()) + { + ImGui::BeginChild("##sweepmodels", ImVec2(0.0f, ImGui::GetTextLineHeightWithSpacing() * 7.0f + 6.0f), true); + std::size_t listed{0}; + for (auto const &model : tool.models) + { + if (lower(model).find(text) == std::string::npos) + continue; + if (++listed > kSweepModelList) + break; + if (ImGui::Selectable(model.c_str(), model == tool.model)) + { + std::snprintf(tool.model, sizeof(tool.model), "%s", model.c_str()); + changed = true; + } + } + ImGui::EndChild(); + } + // a template takes its parameters, the ones which place it are zeros: it's laid out in its own space + std::string const model{tool.model}; + bool const istemplate{model.size() > 4 && lower(model.substr(model.size() - 4)) == ".inc"}; + if (istemplate && model != tool.parameters_for) + { + tool.parameters_for = model; + include_info info; + std::string error; + editor_includes::load(model, info, error); + editor_includes::suggest(model, info); + auto const count{editor_includes::parameter_count(model)}; + tool.parameters.assign(static_cast(count), {}); + tool.parameter_labels.assign(static_cast(count), {}); + tool.parameter_placement.assign(static_cast(count), false); + tool.parameter_choices.assign(static_cast(count), {}); + // a parameter which makes a part of the name of a texture gets the variants of that texture to choose from + { + std::ifstream file(Global.asCurrentSceneryPath + model); + std::stringstream content; + content << file.rdbuf(); + std::string word; + while (content >> word) + { + auto const open{word.find("(p")}; + auto const close{open != std::string::npos ? word.find(')', open) : std::string::npos}; + if (close == std::string::npos || word.find('/') == std::string::npos || word.find('/') > open) + continue; + auto const id{std::atoi(word.substr(open + 2, close - open - 2).c_str())}; + if (id < 1 || id > count || false == tool.parameter_choices[id - 1].empty()) + continue; + auto const prefix{lower(word.substr(0, open))}; + auto suffix{word.substr(close + 1)}; + suffix = suffix.substr(0, suffix.find(':')); + auto const slash{prefix.rfind('/')}; + auto const folder{std::string{"textures/"} + prefix.substr(0, slash)}; + auto const start{prefix.substr(slash + 1)}; + std::set variants; + std::error_code error; + for (auto const &entry : std::filesystem::directory_iterator(folder, error)) + { + auto const stem{lower(entry.path().stem().string())}; + if (stem.size() > start.size() + suffix.size() && stem.compare(0, start.size(), start) == 0 && (suffix.empty() || stem.compare(stem.size() - suffix.size(), suffix.size(), lower(suffix)) == 0)) + variants.insert(stem.substr(start.size(), stem.size() - start.size() - suffix.size())); + } + tool.parameter_choices[id - 1].assign(variants.begin(), variants.end()); + } + } + for (int id = 1; id <= count; ++id) + { + auto const ¶meter{info.parameter(id)}; + auto const placement{parameter.role.rfind("pos.", 0) == 0 || parameter.role.rfind("rot.", 0) == 0}; + auto const value{placement ? std::string{"0"} : parameter.value.empty() ? std::string{"none"} : parameter.value}; + std::snprintf(tool.parameters[id - 1].data(), tool.parameters[id - 1].size(), "%s", value.c_str()); + tool.parameter_labels[id - 1] = parameter.label.empty() ? "p" + std::to_string(id) + (parameter.role != "free" ? " (" + parameter.role + ")" : std::string{}) : parameter.label; + tool.parameter_placement[id - 1] = placement; + } + tool.measured.clear(); + changed = true; + } + else if (false == istemplate && false == tool.parameters.empty()) + { + tool.parameters.clear(); + tool.parameters_for.clear(); + } + if (false == tool.parameters.empty() && ImGui::TreeNodeEx(STR_C("Parameters of the template"), ImGuiTreeNodeFlags_DefaultOpen)) + { + for (std::size_t i = 0; i < tool.parameters.size(); ++i) + { + ImGui::PushID(static_cast(i)); + ImGui::SetNextItemWidth(160.0f); + auto const label{i < tool.parameter_labels.size() ? tool.parameter_labels[i] : "p" + std::to_string(i + 1)}; + auto const *choices{i < tool.parameter_choices.size() && false == tool.parameter_choices[i].empty() ? &tool.parameter_choices[i] : nullptr}; + if (choices != nullptr && ImGui::BeginCombo(label.c_str(), tool.parameters[i].data())) + { + for (auto const &choice : *choices) + if (ImGui::Selectable(choice.c_str(), choice == tool.parameters[i].data())) + { + std::snprintf(tool.parameters[i].data(), tool.parameters[i].size(), "%s", choice.c_str()); + tool.measured.clear(); + changed = true; + } + ImGui::EndCombo(); + } + else if (choices == nullptr) + { + ImGui::InputText(label.c_str(), tool.parameters[i].data(), tool.parameters[i].size()); + if (ImGui::IsItemDeactivatedAfterEdit()) + { + tool.measured.clear(); + changed = true; + } + } + ImGui::PopID(); + } + ImGui::TextDisabled("%s", STR_C("The location and the rotation are zeros, the template is laid out along the track")); + ImGui::TreePop(); + } + sweep_measure(); + if (tool.model_length > 0.0) + ImGui::TextDisabled(STR_C("The model is %.2f m long along the track"), tool.model_length); + else if (tool.model[0] != '\0') + ImGui::TextColored(ImVec4(1.0f, 0.5f, 0.3f, 1.0f), "%s", STR_C("The model has no triangles to lay, or it can't be loaded")); + + auto &settings{tool.settings}; + int mode{settings.bend ? 0 : 1}; + edited(ImGui::RadioButton(STR_C("Bent along the track"), &mode, 0)); + ImGui::SameLine(); + edited(ImGui::RadioButton(STR_C("Repeated"), &mode, 1)); + settings.bend = mode == 0; + if (false == settings.bend) + { + ImGui::SameLine(); + ImGui::SetNextItemWidth(80.0f); + edited(ImGui::InputDouble(STR_C("every (m, 0: its length)"), &settings.step, 0.0, 0.0, "%.2f")); + settings.step = std::max(0.0, settings.step); + } + ImGui::TextDisabled("%s", STR_C("Platform edge:")); + for (auto const height : {0.55, 0.76, 0.96}) + { + ImGui::SameLine(); + if (ImGui::SmallButton(format("%.2f m##platform", height).c_str())) + { + settings.lateral = std::copysign(1.725, settings.lateral == 0.0 ? 1.0 : settings.lateral); + settings.side_anchor = 1; + settings.height = height; + settings.height_anchor = 3; + settings.face = true; + settings.widen = true; + changed = true; + } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("The edge of the platform 1.725 m from the axis of the track, its top this high over the rail top")); + } + ImGui::TextDisabled(STR_C("%.2f m %s of the axis, %.2f m over the rail top"), std::abs(settings.lateral), settings.lateral >= 0.0 ? STR_C("right") : STR_C("left"), settings.height); + ImGui::TextWrapped("%s", STR_C("Press beside the track where the model begins and drag along to where it ends; the side of the press is the side of the model. " + "Past the end of the path it goes on along the joined ones. A click lays one copy.")); + + if (tool.edited != nullptr && changed) + sweep_apply(); + if (tool.edited == nullptr && false == tool.curve.empty() && tool.model_length > 0.0 && ImGui::Button(STR_C("Lay it along the selected path"))) + { + tool.length_mode = 2; + settings.from = 0.0; + settings.to = -1.0; + sweep_create(); + } + if (tool.edited != nullptr && false == tool.curve.empty() && ImGui::Button(STR_C("Lay it again along the selected line"))) + { + auto state{sweep_definition()}; + EditorSnapshot snap; + snap.action = EditorSnapshot::Action::Other; + snap.node_name = tool.edited->name(); + snap.sweeps.emplace_back(tool.edited, tool.edited->definition()); + trim_history(); + m_history.push_back(std::move(snap)); + g_redo.clear(); + tool.edited->define(state); + tool.edited->mark_dirty(); + if (track != nullptr) + sweeps_captured(*track); + } + + changed = false; + if (ImGui::CollapsingHeader(STR_C("More settings"))) + { + ImGui::SetNextItemWidth(200.0f); + edited(ImGui::InputText(STR_C("Skin"), tool.skin, sizeof(tool.skin), ImGuiInputTextFlags_EnterReturnsTrue)); + edited(ImGui::IsItemDeactivatedAfterEdit()); + ImGui::PushItemWidth(90.0f); + edited(ImGui::InputDouble(STR_C("Sideways (m, + right)"), &settings.lateral, 0.0, 0.0, "%.3f")); + ImGui::SameLine(); + ImGui::SetNextItemWidth(150.0f); + char const *sides[] = {STR_C("model origin"), STR_C("side facing the track"), STR_C("far side"), STR_C("middle")}; + edited(ImGui::Combo("##sweepsideanchor", &settings.side_anchor, sides, IM_ARRAYSIZE(sides))); + edited(ImGui::InputDouble(STR_C("Up (m, from the rail top)"), &settings.height, 0.0, 0.0, "%.3f")); + ImGui::SameLine(); + ImGui::SetNextItemWidth(150.0f); + char const *heights[] = {STR_C("model origin"), STR_C("bottom"), STR_C("top"), STR_C("top of the edge by the track")}; + edited(ImGui::Combo("##sweepheightanchor", &settings.height_anchor, heights, IM_ARRAYSIZE(heights))); + if (settings.bend) + { + edited(ImGui::InputDouble(STR_C("Copy length (m, 0: the model's)"), &settings.step, 0.0, 0.0, "%.2f")); + settings.step = std::max(0.0, settings.step); + } + ImGui::PopItemWidth(); + char const *axes[] = {"auto", "z", "x"}; + ImGui::SetNextItemWidth(70.0f); + if (ImGui::Combo(STR_C("Axis of the model along the track"), &tool.axis, axes, IM_ARRAYSIZE(axes))) + { + tool.measured.clear(); + changed = true; + } + edited(ImGui::Checkbox(STR_C("Edge to the track"), &settings.face)); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("The model is turned so its -x side faces the track, the way the platforms and the walls of the scenery are made")); + ImGui::SameLine(); + edited(ImGui::Checkbox(STR_C("Turned around"), &settings.flip)); + ImGui::SameLine(); + edited(ImGui::Checkbox(STR_C("Mirrored"), &settings.mirror)); + ImGui::SameLine(); + edited(ImGui::Checkbox(STR_C("Leans with the cant"), &settings.tilt)); + edited(ImGui::Checkbox(STR_C("Set back by the widening of the structure gauge in the curves"), &settings.widen)); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("The offset grows by the widening of the gauge below the platforms: 3.75/R in the curves of R >= 250 m,\n" + "more in the sharper ones, and on the inner side of a canted curve by the cant times the height of the edge / 1.5;\n" + "it begins 20 m (inner side) and 26 m (outer side) ahead of the curve, as in the gauge check")); + ImGui::TextDisabled("%s", STR_C("Length")); + ImGui::SameLine(); + edited(ImGui::RadioButton(STR_C("as the original"), &tool.length_mode, 0)); + ImGui::SameLine(); + edited(ImGui::RadioButton(STR_C("given"), &tool.length_mode, 1)); + ImGui::SameLine(); + edited(ImGui::RadioButton(STR_C("the whole stretch"), &tool.length_mode, 2)); + ImGui::PushItemWidth(90.0f); + edited(ImGui::InputDouble(STR_C("From (m)"), &settings.from, 0.0, 0.0, "%.1f")); + ImGui::SameLine(); + if (tool.length_mode == 1) + edited(ImGui::InputDouble(STR_C("Length (m)"), &tool.length, 0.0, 0.0, "%.1f")); + else if (tool.length_mode == 2) + edited(ImGui::InputDouble(STR_C("To (m, -1: the end)"), &settings.to, 0.0, 0.0, "%.1f")); + ImGui::PopItemWidth(); + settings.from = std::max(0.0, settings.from); + if (tool.model_length > 0.0) + { + auto const state{sweep_definition()}; + auto const end{state.to < 0.0 ? tool.curve_length : std::min(state.to, tool.curve_length)}; + auto const stretch{std::max(0.0, end - state.from)}; + auto const own{settings.step > 0.01 ? settings.step : tool.model_length}; + auto const copies{settings.bend ? std::max(1, static_cast(std::round(stretch / own))) : static_cast(std::floor(stretch / own + 1e-6)) + 1}; + if (settings.bend) + ImGui::TextDisabled(STR_C("%.1f m: %d copies of %.2f m (the original %.2f m)"), stretch, copies, stretch / copies, tool.model_length); + else + ImGui::TextDisabled(STR_C("%.1f m: %d copies every %.2f m"), stretch, copies, own); + } + if (tool.edited != nullptr && changed) + sweep_apply(); + } + if (false == tool.status.empty()) + ImGui::TextWrapped("%s", tool.status.c_str()); +} + +void editor_mode::draw_sweep_overlay() const +{ + auto const &tool{m_sweep}; + if (false == tool.open || tool.outline.size() < 2) + return; + screen_projection const projection; + auto *drawlist{ImGui::GetBackgroundDrawList()}; + auto const &settings{tool.settings}; + auto const from{std::max(0.0, settings.from)}; + auto const to{settings.to < 0.0 ? tool.curve_length : std::min(settings.to, tool.curve_length)}; + glm::dvec3 previous{0.0}; + bool started{false}; + for (std::size_t i = 1; i < tool.outline.size(); ++i) + { + if (tool.stations[i] < from || tool.stations[i - 1] > to) + continue; + auto const direction{plan_of(tool.outline[i] - tool.outline[i - 1])}; + if (glm::length(direction) < 1e-9) + continue; + auto const unit{glm::normalize(direction)}; + glm::dvec3 const left{-unit.y, 0.0, unit.x}; + auto const point{tool.outline[i] + left * settings.lateral + glm::dvec3{0.0, settings.height + kRailTop, 0.0}}; + if (started) + projection.line(drawlist, previous, point, IM_COL32(255, 160, 40, 230), 3.0f); + else + { + ImVec2 screen; + if (projection.project(point, screen)) + drawlist->AddCircleFilled(screen, 5.0f, IM_COL32(255, 160, 40, 230)); + } + previous = point; + started = true; + } + ImVec2 screen; + if (started && projection.project(previous, screen)) + drawlist->AddCircle(screen, 6.0f, IM_COL32(255, 160, 40, 230), 12, 2.0f); +} diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index eec9f2aee..2e78c5ecf 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -14,6 +14,7 @@ http: #include "application/editorprojection.h" #include "editor/editorFormat.hpp" #include "editor/editorGeometry.hpp" +#include "editor/editorIncludeInfo.hpp" #include "utilities/Globals.h" #include "rendering/renderer.h" @@ -29,6 +30,7 @@ http: #include #include #include +#include #include #include #include @@ -43,6 +45,7 @@ using geometry::plan_distance; using geometry::plan_of; using geometry::signed_angle; using geometry::turned; +using geometry::arc_pieces; std::string describe(editor_track::straight const &Line) { @@ -64,6 +67,8 @@ editor_track::point_kind const kPointKinds[] = {editor_track::point_kind::start, float const kHandleRadius{10.0f}; double const kLaySnapRadius{5.0}; +float const kSnapPixels{16.0f}; +float const kDragPixels{5.0f}; double const kSwitchReach{6.0}; // a press farther from the selected track selects another one instead of placing the switch double const kLineReach{2000.0}; // how far each way the Curve tab follows the line double const kJointRange{400.0}; // the ends of the paths are drawn for the tracks this close to the camera @@ -77,37 +82,18 @@ void item_tooltip(char const *Text) } // circular curve from a point along a direction, cut into pieces of 90 degrees at most. Side: 1 to the left, -1 to the right -std::vector arc_pieces(glm::dvec3 const &Point, glm::dvec2 const &Direction, double const Grade, double const Radius, double const Angle, int const Side) +void compound_from(editor_track::curve const &Curve, alignment::vertex &Vertex) { - std::vector result; - double const side{static_cast(Side)}; - glm::dvec2 const centre{plan_of(Point) + glm::dvec2{-Direction.y, Direction.x} * (side * Radius)}; - auto const count{std::max(1, static_cast(std::ceil(Angle / glm::radians(90.0) - 1e-9)))}; - auto const step{Angle / count}; - auto const handle{4.0 / 3.0 * std::tan(step / 4.0) * Radius}; - glm::dvec2 const radial{plan_of(Point) - centre}; - for (int i = 0; i < count; ++i) - { - auto const a0{side * step * i}; - auto const a1{side * step * (i + 1)}; - auto const p0{centre + turned(radial, a0)}; - auto const p3{centre + turned(radial, a1)}; - auto const d0{turned(Direction, a0)}; - auto const d3{turned(Direction, a1)}; - auto const y0{Point.y + Grade * Radius * step * i}; - auto const y3{Point.y + Grade * Radius * step * (i + 1)}; - segment_data path; - path.points[segment_data::point::start] = {p0.x, y0, p0.y}; - path.points[segment_data::point::end] = {p3.x, y3, p3.y}; - path.points[segment_data::point::control1] = {d0.x * handle, Grade * handle, d0.y * handle}; - path.points[segment_data::point::control2] = {-d3.x * handle, -Grade * handle, -d3.y * handle}; - path.radius = static_cast(Radius); - result.push_back(path); - } - return result; + if (false == Curve.compound || Curve.arcs.size() < 2) + return; + Vertex.compound = true; + Vertex.radius = std::round(Curve.arcs.front().radius); + Vertex.share = Curve.arcs.front().turn; + Vertex.arcs.clear(); + for (std::size_t i = 1; i < Curve.arcs.size(); ++i) + Vertex.arcs.push_back({std::round(Curve.arcs[i].radius), std::round(Curve.arcs[i].transition), Curve.arcs[i].turn}); } - } TTrack *editor_mode::selected_track() const @@ -158,11 +144,11 @@ void editor_mode::select_track(scene::basic_node *Node) } } -bool editor_mode::pick_track_handle() +editor_track::point_ref editor_mode::track_handle_hit() const { auto *track = selected_track(); - if (track == nullptr || false == editor_track::is_supported(*track) || m_route_tab) - return false; + if (track == nullptr || false == editor_track::is_supported(*track) || m_track_tab != track_tab::path) + return {}; screen_projection const projection; float best = kHandleRadius * kHandleRadius; @@ -180,10 +166,7 @@ bool editor_mode::pick_track_handle() } } } - if (false == hit.valid()) - return false; - m_track_point = hit; - return true; + return hit; } void editor_mode::draw_track_overlay() const @@ -261,8 +244,6 @@ void editor_mode::render_track_gizmo() gizmo_frame const frame; - ImGuizmo::OPERATION const operation = (false == pointmode && m_gizmo_op == gizmo_operation::rotate) ? ImGuizmo::ROTATE_Y : ImGuizmo::TRANSLATE; - if (false == m_track_gizmo_using) { auto const anchor = pointmode ? editor_track::point_position(*track, m_track_point) : editor_track::pivot(*track); @@ -270,7 +251,7 @@ void editor_mode::render_track_gizmo() } glm::mat4 delta(1.0f); - frame.manipulate(operation, m_track_gizmo, operation == ImGuizmo::ROTATE_Y ? 5.0f : m_gizmo_snap, &delta); + frame.manipulate(ImGuizmo::TRANSLATE, m_track_gizmo, m_gizmo_snap, &delta); if (ImGuizmo::IsUsing()) { @@ -307,17 +288,7 @@ void editor_mode::render_track_gizmo() push_track_snapshot(std::move(states)); } - if (operation == ImGuizmo::ROTATE_Y) - { - double const angle = std::atan2(delta[2][0], delta[0][0]); - if (std::abs(angle) > 1e-9) - { - editor_track::rotate_y(*track, m_track_pivot, angle); - editor_track::follow(*track, m_track_joints); - m_track_dirty = true; - } - } - else if (pointmode) + if (pointmode) { glm::dvec3 const position = frame.camera + glm::dvec3(m_track_gizmo[3]); editor_track::move_point(*track, m_track_point, position); @@ -327,7 +298,9 @@ void editor_mode::render_track_gizmo() if (editor_track::is_end(m_track_point.kind) && m_track_drag_points.empty()) { std::vector const exclude(m_track_drag.begin(), m_track_drag.end()); - m_track_snap = editor_track::find_snap_target(*track, position, m_track_snap_radius, exclude); + screen_projection const projection; + ImVec2 screen; + m_track_snap = projection.project(position, screen) ? snap_free_end(position, {screen.x, screen.y}, track, track->iCategoryFlag & 15, exclude) : editor_track::snap_target{}; } } else @@ -495,16 +468,19 @@ void editor_mode::restore_track_snapshot(EditorSnapshot const &Snapshot, std::ve profile_restore(); } -std::array const &editor_mode::track_modes() +std::array const &editor_mode::track_modes() { - static std::array const modes{{ + static std::array const modes{{ {"Select", "Esc", track_tab::path, "LMB on a path selects it: its points, control vectors and parameters"}, {"Lay track", "L", track_tab::lay, "Lays new track through the clicked points, on the ground or from a free end of a track"}, {"Switch", "T", track_tab::turnout, "Puts switches into the selected straight or curve, edits the geometry of the selected switch"}, + {"Turntable", "U", track_tab::turntable, "Places a turntable, leads tracks out of it and fits the tracks around to it"}, {"Straight", "G", track_tab::straights, "The whole straight through the selected path: drag its ends or the middle, break it, shift it"}, {"Curve", "C", track_tab::route, "The line through the path, switch to switch: vertices with the radii, transitions and cant of the curves"}, + {"Objects", "B", track_tab::lineside, "Along the track: platforms and other models, hectometre posts, fouling point markers, a parallel track, a vehicle to drive"}, {"Profile", "P", track_tab::profile, "Vertical profile (grade line) along the line"}, {"Speed", "V", track_tab::speed, "Speed limits of the paths against the speed their geometry allows"}, + {"Joints", "J", track_tab::joints, "Ends of the paths which almost meet, steps, kinks, jumps of the cant and of the grade at the joints"}, {"Infra", "I", track_tab::infra, "Infrastructure along the track, bound to follow its changes"}, }}; return modes; @@ -512,28 +488,15 @@ std::array const &editor_mode::track_modes() void editor_mode::render_track_menu() { - if (false == ImGui::BeginMenu(STR_C("Tracks"))) - return; - if (ImGui::MenuItem(STR_C("Track editor"), nullptr, m_track_window_open)) + if (ImGui::MenuItem(STR_C("Tracks"), nullptr, m_track_window_open)) { if (m_track_window_open) m_track_window_open = false; else show_track_tab(m_track_tab); } - ImGui::Separator(); - for (auto const &mode : track_modes()) - { - if (ImGui::MenuItem(STR_C(mode.label), mode.key, m_track_window_open && m_track_tab == mode.tab)) - show_track_tab(mode.tab); - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C(mode.tooltip)); - } - ImGui::Separator(); - ImGui::MenuItem(STR_C("Structure gauge"), nullptr, &m_gauge.open); if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("Checks which models enter the structure gauge of the tracks and the clearance over the roads (skrajnia budowli)")); - ImGui::EndMenu(); + ImGui::SetTooltip("%s", STR_C("Track editor: the window with its modes opens or closes")); } void editor_mode::show_track_tab(track_tab const Tab) @@ -576,6 +539,10 @@ void editor_mode::show_track_tab(track_tab const Tab) if (track != nullptr && m_profile.route.spans.empty()) profile_open_run(*track); break; + case track_tab::turntable: + scan_turntables(); + turntable_read(track); + break; default: break; } @@ -593,6 +560,11 @@ void editor_mode::arm_switch() } tool.status.clear(); tool.armed = tool.templates.empty() ? -1 : std::clamp(tool.last, 0, static_cast(tool.templates.size()) - 1); + if (tool.armed >= 0 && tool.templates[tool.armed].double_slip) + { + auto const ordinary{std::find_if(tool.templates.begin(), tool.templates.end(), [](editor_track::switch_template const &Template) { return false == Template.double_slip; })}; + tool.armed = ordinary != tool.templates.end() ? static_cast(ordinary - tool.templates.begin()) : -1; + } } bool editor_mode::track_shortcut(int const Key) @@ -611,7 +583,7 @@ bool editor_mode::track_shortcut(int const Key) bool editor_mode::track_busy() const { auto const &straights{m_straights}; - return (m_lay.active && false == m_lay.points.empty()) || straights.dragging || m_extend.active || m_switch.placing || m_track_point.valid() || m_route.vertex >= 0 || m_route.grip >= 0 || false == straights.detour.empty() || straights.tool != 0 || straights.handle >= 0; + return (m_lay.active && false == m_lay.points.empty()) || m_turntable.placing || straights.dragging || m_extend.active || m_point_drag.active || m_handle_drag.active || m_switch.placing || m_track_point.valid() || m_route.vertex >= 0 || m_route.grip >= 0 || false == straights.detour.empty() || straights.tool != 0 || straights.handle >= 0; } std::string editor_mode::track_mode_name() const @@ -620,10 +592,12 @@ std::string editor_mode::track_mode_name() const return STR_C("Select: LMB on a path"); switch (m_track_tab) { - case track_tab::lay: return STR_C("Laying track: LMB adds the points"); + case track_tab::lay: return m_extend.active ? STR_C("Laying track: new path from the free end") : STR_C("Laying track: LMB adds the points"); case track_tab::turnout: if (m_switch.placing) return STR_C("Switch: drag to set its direction and side"); + if (m_switch.armed < 0) + return selected_track() != nullptr && selected_track()->eType == tt_Switch ? STR_C("Switch: the selected one. Another: LMB on a track, then its type") : STR_C("Switch: choose its type from the list"); return STR_C("Switch: press and drag on the selected track"); case track_tab::straights: if (false == m_straights.detour.empty()) @@ -636,8 +610,17 @@ std::string editor_mode::track_mode_name() const case track_tab::route: return STR_C("Curve: drag the vertices and the radius grips"); case track_tab::profile: return STR_C("Vertical profile: edit the grade line in the profile window"); case track_tab::speed: return STR_C("Speed check: LMB on a row shows the path"); + case track_tab::joints: return STR_C("Joints: LMB on a row shows the place"); + case track_tab::lineside: + if (m_lineside_tab == 0) + return m_sweep.dragging ? STR_C("Model along the track: release where it ends") : STR_C("Model along the track: LMB by the track where it starts, drag to the end"); + return STR_C("Objects along the track"); case track_tab::infra: return STR_C("Infrastructure along the track"); - default: return m_extend.active ? STR_C("New path from the free end") : selected_track() != nullptr ? STR_C("Select: drag the points of the path") : STR_C("Select: LMB on a path"); + case track_tab::turntable: + if (m_turntable.placing) + return STR_C("Turntable: drag to turn the bridge, release to place it"); + return m_turntable.table != nullptr ? STR_C("Turntable: LMB around it leads a track out, on a free end fits that track") : STR_C("Turntable: LMB places a new one"); + default: return m_point_drag.moved ? STR_C("Select: moving the point") : selected_track() != nullptr ? STR_C("Select: drag the points of the path") : STR_C("Select: LMB on a path"); } } @@ -647,6 +630,9 @@ void editor_mode::render_track_inspector() m_profile.open = m_track_window_open && m_track_tab == track_tab::profile; m_speed.open = m_track_window_open && m_track_tab == track_tab::speed; m_infra.open = m_track_window_open && m_track_tab == track_tab::infra; + m_joints.open = m_track_window_open && m_track_tab == track_tab::joints; + if (false == m_track_window_open || m_track_tab != track_tab::lineside) + m_sweep.open = m_hekto.open = m_fouling.open = m_parallel.open = m_vehicle.open = false; ui()->set_track(m_track_window_open); if (false == m_track_window_open) { @@ -691,8 +677,13 @@ void editor_mode::render_track_inspector() break; case track_tab::profile: render_profile_body(); break; case track_tab::speed: render_speed_body(); break; + case track_tab::joints: render_joints_body(); break; + case track_tab::lineside: render_lineside_ui(); break; case track_tab::infra: render_infra_body(); break; + case track_tab::turntable: render_turntable_ui(); break; default: + render_track_set_ui(); + render_track_spread_ui(); if (track != nullptr) render_path_ui(); else @@ -718,16 +709,28 @@ void editor_mode::render_track_modes(TTrack *Track) for (int i = From; i < To; ++i) { auto const &mode{modes[i]}; - ImGui::SameLine(i == From ? 72.0f : 0.0f); auto const label{std::string{STR_C(mode.label)} + "###trackmode" + std::to_string(i)}; + // the buttons which don't fit go on to the next line, under the first one + auto const width{ImGui::GetFrameHeight() + ImGui::GetStyle().ItemInnerSpacing.x + ImGui::CalcTextSize(STR_C(mode.label)).x}; + if (i == From) + ImGui::SameLine(72.0f); + else if (ImGui::GetItemRectMax().x + ImGui::GetStyle().ItemSpacing.x + width > ImGui::GetWindowPos().x + ImGui::GetWindowContentRegionMax().x) + ImGui::SetCursorPosX(72.0f); + else + ImGui::SameLine(); if (ImGui::RadioButton(label.c_str(), m_track_tab == mode.tab)) show_track_tab(mode.tab); if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s [%s]", STR_C(mode.tooltip), mode.key); } }; - row("Edit", 0, 5); - row("Analysis", 5, static_cast(modes.size())); + row("Edit", 0, 6); + row("Analysis", 6, static_cast(modes.size())); + ImGui::SameLine(); + ImGui::Checkbox(STR_C("Structure gauge"), &m_gauge.open); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Checks which models enter the structure gauge of the tracks and the clearance over the roads (skrajnia budowli)")); + render_track_search(); ImGui::Spacing(); render_track_guide(); if (Track != nullptr && m_track_tab != track_tab::lay && false == track_analysis_tab()) @@ -781,6 +784,105 @@ void editor_mode::render_track_guide() ImGui::Dummy(ImVec2(0.0f, 0.0f)); } +void editor_mode::render_track_name(TTrack &Track) +{ + auto &edit{m_track_name}; + auto const current{Track.name() == "none" ? std::string{} : Track.name()}; + auto const sync = [&]() { + edit.track = &Track; + edit.synced = current; + std::snprintf(edit.text, sizeof(edit.text), "%s", current.c_str()); + edit.uses = editor_track::uses_of_name(Track); + }; + if (edit.track != &Track) + { + sync(); + edit.status.clear(); + } + else if (edit.synced != current && edit.synced == edit.text) + sync(); + + std::string why; + if (false == scene::Layers.editable(&Track, &why)) + { + ImGui::Text(STR_C("Name: %s"), current.empty() ? STR_C("(no name)") : current.c_str()); + ImGui::SameLine(); + ImGui::TextDisabled(STR_C("(can't be changed: %s)"), why.c_str()); + return; + } + auto const apply = [&]() { + std::string name{edit.text}; + std::string reason; + if (false == editor_track::name_valid(Track, name, reason)) + return; + auto const before{editor_track::capture(Track)}; + editor_track::rename(Track, name); + push_track_snapshot({{&Track, before}}); + edit.status = format(STR_C("Renamed from %s"), current.empty() ? STR_C("(no name)") : current.c_str()); + sync(); + }; + ImGui::SetNextItemWidth(220.f); + if (ImGui::InputTextWithHint(STR_C("Name##trackname"), STR_C("(no name)"), edit.text, sizeof(edit.text), ImGuiInputTextFlags_EnterReturnsTrue | ImGuiInputTextFlags_CharsNoBlank)) + apply(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Enter renames the path, Esc while typing takes the text back.\nThe events, memory cells and the map of the game find the path by its name")); + std::string typed{edit.text}; + if (typed == edit.synced) + { + if (false == edit.status.empty()) + { + ImGui::SameLine(); + ImGui::TextColored(ImVec4(0.5f, 0.9f, 0.5f, 1.f), "%s", edit.status.c_str()); + } + return; + } + std::string reason; + TTrack *owner{nullptr}; + auto const valid{editor_track::name_valid(Track, typed, reason, &owner)}; + ImGui::SameLine(); + if (valid) + { + auto const warned{false == edit.uses.events.empty() || false == edit.uses.loose.empty()}; + if (ImGui::SmallButton(warned ? STR_C("Rename anyway") : STR_C("Rename"))) + apply(); + } + ImGui::SameLine(); + if (ImGui::SmallButton(STR_C("Keep the old"))) + { + std::snprintf(edit.text, sizeof(edit.text), "%s", edit.synced.c_str()); + return; + } + if (false == valid) + { + ImGui::TextColored(ImVec4(1.f, 0.45f, 0.35f, 1.f), "%s", STR_C(reason.c_str())); + if (owner != nullptr) + { + ImGui::SameLine(); + if (ImGui::SmallButton(STR_C("Look at it"))) + focus_track(*owner, 0, owner->location()); + } + return; + } + if (typed != edit.text) + ImGui::TextDisabled(STR_C("Saved as %s: the scenery keeps the names in lower case"), typed.c_str()); + if (edit.uses.cells > 0 || edit.uses.includes > 0) + ImGui::TextDisabled(STR_C("The new name goes to %d memory cell(s) and %d include(s), the drives of a switch among them"), edit.uses.cells, edit.uses.includes); + auto const listed = [](std::vector const &Names) { + std::string result; + for (std::size_t i = 0; i < Names.size() && i < 4; ++i) + result += (i > 0 ? ", " : "") + Names[i]; + if (Names.size() > 4) + result += format(" (+%d)", static_cast(Names.size() - 4)); + return result; + }; + if (false == edit.uses.events.empty()) + ImGui::TextColored(ImVec4(1.f, 0.75f, 0.3f, 1.f), STR_C("These events aim at the path by the old name and the editor doesn't write them: %s"), listed(edit.uses.events).c_str()); + if (false == edit.uses.loose.empty()) + ImGui::TextColored(ImVec4(1.f, 0.75f, 0.3f, 1.f), STR_C("These events belong to the path by the old name: %s"), listed(edit.uses.loose).c_str()); + if (false == edit.uses.events.empty() || false == edit.uses.loose.empty()) + ImGui::TextDisabled("%s", STR_C("They work until the scenery is loaded again; then they need the new name in their files")); +} + void editor_mode::render_turnout_ui() { auto *track{selected_track()}; @@ -805,6 +907,18 @@ void editor_mode::render_turnout_ui() glm::dvec2 const tangent{glm::normalize(glm::dvec2{-control.x, -control.z})}; auto const angle{std::atan2(std::abs(tangent.x * axis.y - tangent.y * axis.x), glm::dot(tangent, axis))}; ImGui::Text(STR_C("Length %.3f m, diverging %s, end offset %.3f m"), length, offset > 0.0 ? STR_C("left") : STR_C("right"), std::abs(offset)); + render_track_name(*track); + if ((simulation::Events.FindEvent(track->name() + "+") != nullptr && simulation::Events.FindEvent(track->name() + "-") != nullptr) || (m_track_name.track == track && m_track_name.uses.includes > 0)) + ImGui::TextDisabled(STR_C("Drive: events %s+ and %s- switch it, also in the map"), track->name().c_str(), track->name().c_str()); + else + { + ImGui::TextColored(ImVec4(1.0f, 0.7f, 0.2f, 1.0f), "%s", STR_C("No drive: the switch can't be switched during the game")); + render_switch_drive_choice(); + if (m_switch.drive >= 0 && ImGui::Button(STR_C("Put the drive by the switch"))) + place_switch_drive(*track); + } + if (false == m_switch.status.empty()) + ImGui::TextWrapped("%s", m_switch.status.c_str()); if (angle > 1e-6) ImGui::Text(STR_C("Angle 1:%.2f (%.4f deg), R in the entry %.0f m"), 1.0 / std::tan(angle), glm::degrees(angle), diverging.radius); @@ -1249,6 +1363,7 @@ void editor_mode::render_path_ui() ImGui::TextDisabled(STR_C("Editing of this path type isn't supported")); return; } + render_track_name(*track); std::string reason; bool const geometry = editor_track::can_edit_geometry(*track, reason); if (false == geometry) @@ -1271,8 +1386,6 @@ void editor_mode::render_path_ui() } }; - if (geometry) - render_extend_ui(); if (ImGui::CollapsingHeader(STR_C("Geometry"), ImGuiTreeNodeFlags_DefaultOpen)) { for (int i = 0; i < static_cast(track->m_paths.size()); ++i) @@ -1486,13 +1599,7 @@ alignment::vertex editor_mode::route_vertex_of(editor_track::curve const &Curve) if (Curve.cant > 0.0) vertex.cant = std::round(Curve.cant); vertex.reverse_turn = std::abs(Curve.turn) > glm::pi(); - if (Curve.compound) - { - vertex.compound = true; - vertex.radius2 = std::round(Curve.radius2); - vertex.transition_middle = std::round(Curve.transition_middle); - vertex.split = Curve.split; - } + compound_from(Curve, vertex); return vertex; } @@ -1796,7 +1903,7 @@ glm::dvec3 editor_mode::route_vertex_position(int const Vertex) const return {position.x, height, position.y}; } -bool editor_mode::pick_route_vertex() +bool editor_mode::route_hit(int &Vertex, int &Grip) const { if (false == route_active()) return false; @@ -1821,11 +1928,9 @@ bool editor_mode::pick_route_vertex() hit = -1; } } - if (hit < 0 && griphit < 0) - return false; - m_route.vertex = hit; - m_route.grip = griphit; - return true; + Vertex = hit; + Grip = griphit; + return hit >= 0 || griphit >= 0; } void editor_mode::draw_route_overlay() const @@ -1888,7 +1993,13 @@ void editor_mode::draw_route_overlay() const if (i == route.grip) drawlist->AddCircle(screen, 11.0f, overlay_color::highlight, 16, 2.5f); auto const *report{i < static_cast(result.curves.size()) ? &result.curves[i] : nullptr}; - auto const radius{report != nullptr && report->radius2 > 0.0 ? format("R %.0f / %.0f", report->radius, report->radius2) : format("R %.0f", report != nullptr ? report->radius : design.vertices[i].radius)}; + auto radius{format("R %.0f", report != nullptr ? report->radius : design.vertices[i].radius)}; + if (report != nullptr && report->radii.size() >= 2) + { + radius = "R"; + for (std::size_t k = 0; k < report->radii.size(); ++k) + radius += format(k == 0 ? " %.0f" : " / %.0f", report->radii[k]); + } drawlist->AddText(ImVec2(screen.x + 9.0f, screen.y + 4.0f), overlay_color::grip, radius.c_str()); } drawlist->AddText(ImVec2(screen.x + 9.0f, screen.y - 18.0f), overlay_color::marked, format("W%d", i + 1).c_str()); @@ -1909,11 +2020,24 @@ void editor_mode::render_route_gizmo() gizmo_frame const frame; auto const position{grip ? alignment::evaluate(route.result, route.result.vertex_chainages[route.grip]).position : route_vertex_position(route.vertex)}; - if (false == m_route_gizmo_using) - m_route_gizmo = glm::translate(glm::mat4(1.0f), glm::vec3(position - frame.camera)); - frame.manipulate(ImGuizmo::TRANSLATE, m_route_gizmo, m_gizmo_snap); + glm::dvec3 moved{position}; + bool held{false}; + if (m_handle_drag.active) + { + held = handle_drag_step(moved); + if (false == held && false == m_route_gizmo_using) + return; + } + else + { + if (false == m_route_gizmo_using) + m_route_gizmo = glm::translate(glm::mat4(1.0f), glm::vec3(position - frame.camera)); + frame.manipulate(ImGuizmo::TRANSLATE, m_route_gizmo, m_gizmo_snap); + held = ImGuizmo::IsUsing(); + moved = frame.camera + glm::dvec3(m_route_gizmo[3]); + } - if (false == ImGuizmo::IsUsing()) + if (false == held) { if (m_route_gizmo_using) { @@ -1923,7 +2047,6 @@ void editor_mode::render_route_gizmo() return; } m_route_gizmo_using = true; - glm::dvec3 const moved{frame.camera + glm::dvec3(m_route_gizmo[3])}; if (grip) { auto &vertex{route.design.vertices[route.grip]}; @@ -2043,20 +2166,58 @@ bool editor_mode::render_route_vertex(int const Index) ImGui::TextDisabled(STR_C("Curve %d of the S-curve"), Index + 1); ImGui::PushItemWidth(110.0f); changed |= ImGui::DragScalar(vertex.compound ? STR_C("Radius R1 (m)") : STR_C("Radius R (m)"), ImGuiDataType_Double, &vertex.radius, 5.0f, nullptr, nullptr, "%.0f"); - changed |= ImGui::Checkbox(STR_C("Compound curve (two radii)"), &vertex.compound); - item_tooltip("Curve made of two arcs of different radii, joined with a transition"); + if (ImGui::Checkbox(STR_C("Compound curve (several radii)"), &vertex.compound)) + { + changed = true; + if (vertex.compound && vertex.arcs.empty()) + vertex.arcs.push_back({std::max(10.0, std::round(vertex.radius * 0.6 / 10.0) * 10.0), 0.0, 1.0}); + } + item_tooltip("Curve made of arcs of different radii, each one its own path, joined with transitions"); if (vertex.compound) { - changed |= ImGui::InputDouble(STR_C("Radius R2 (m)"), &vertex.radius2, 0.0, 0.0, "%.1f"); - changed |= ImGui::InputDouble(STR_C("Transition R1-R2 (m)"), &vertex.transition_middle, 0.0, 0.0, "%.1f"); - float split{static_cast(vertex.split)}; - if (ImGui::SliderFloat(STR_C("Share of R1"), &split, 0.0f, 1.0f, "%.2f")) + auto total{std::max(0.0, vertex.share)}; + for (auto const &arc : vertex.arcs) + total += std::max(0.0, arc.share); + auto const percent = [&](double const Share) { return total > 0.0 ? 100.0 * std::max(0.0, Share) / total : 0.0; }; + changed |= ImGui::DragScalar(format(STR_C("Share of R%d"), 1).c_str(), ImGuiDataType_Double, &vertex.share, 0.01f, nullptr, nullptr, "%.2f"); + ImGui::SameLine(); + ImGui::TextDisabled("%.0f%%", percent(vertex.share)); + int removed{-1}; + for (int k = 0; k < static_cast(vertex.arcs.size()); ++k) { - vertex.split = split; + auto &arc{vertex.arcs[k]}; + ImGui::PushID(k); + ImGui::Separator(); + changed |= ImGui::DragScalar(format(STR_C("Radius R%d (m)"), k + 2).c_str(), ImGuiDataType_Double, &arc.radius, 5.0f, nullptr, nullptr, "%.0f"); + ImGui::SameLine(); + if (ImGui::SmallButton("x")) + removed = k; + item_tooltip("Takes this radius out of the curve"); + changed |= ImGui::DragScalar(format(STR_C("Transition R%d-R%d (m)"), k + 1, k + 2).c_str(), ImGuiDataType_Double, &arc.transition, 1.0f, nullptr, nullptr, "%.0f"); + changed |= ImGui::DragScalar(format(STR_C("Share of R%d"), k + 2).c_str(), ImGuiDataType_Double, &arc.share, 0.01f, nullptr, nullptr, "%.2f"); + ImGui::SameLine(); + ImGui::TextDisabled("%.0f%%", percent(arc.share)); + arc.radius = std::max(1.0, arc.radius); + arc.transition = std::max(0.0, arc.transition); + arc.share = std::max(0.0, arc.share); + ImGui::PopID(); + } + vertex.share = std::max(0.0, vertex.share); + if (removed >= 0) + { + vertex.arcs.erase(vertex.arcs.begin() + removed); + if (vertex.arcs.empty()) + vertex.compound = false; changed = true; } - vertex.radius2 = std::max(1.0, vertex.radius2); - vertex.transition_middle = std::max(0.0, vertex.transition_middle); + if (ImGui::SmallButton(STR_C("Add a radius"))) + { + auto const last{vertex.arcs.empty() ? vertex.radius : vertex.arcs.back().radius}; + vertex.arcs.push_back({std::max(10.0, std::round(last * 0.8 / 10.0) * 10.0), 0.0, 1.0}); + changed = true; + } + item_tooltip("Another arc after the last one, the angle of the curve is shared out by the shares"); + ImGui::Separator(); } changed |= ImGui::DragScalar(STR_C("Transition in (m)"), ImGuiDataType_Double, &vertex.transition_in, 1.0f, nullptr, nullptr, "%.0f"); changed |= ImGui::DragScalar(STR_C("Transition out (m)"), ImGuiDataType_Double, &vertex.transition_out, 1.0f, nullptr, nullptr, "%.0f"); @@ -2515,10 +2676,10 @@ bool editor_mode::straights_active() return ui()->mode() == nodebank_panel::TRACK && m_track_tab == track_tab::straights && false == current_straight().tracks.empty(); } -bool editor_mode::pick_straight_handle() +int editor_mode::straight_handle_hit() { if (false == straights_active()) - return false; + return -1; auto const &line{current_straight()}; glm::dvec3 const handles[] = {line.start, line.end, (line.start + line.end) * 0.5}; screen_projection const projection; @@ -2532,10 +2693,7 @@ bool editor_mode::pick_straight_handle() hit = i; } } - if (hit < 0) - return false; - m_straights.handle = hit; - return true; + return hit; } void editor_mode::straight_refresh() @@ -2587,8 +2745,9 @@ void editor_mode::render_straight_gizmo() auto &state{m_straights}; if (state.tool_mouse) { - glm::dvec3 const ground{Global.pCamera.Pos + GfxRenderer->Mouse_Position()}; + glm::dvec3 const ground{cursor_ground()}; state.tool_handle = {ground.x, state.tool_handle.y, ground.z}; + typed_turn(); return; } if (state.tool_placed && m_gizmo_enabled) @@ -2607,11 +2766,24 @@ void editor_mode::render_straight_gizmo() glm::dvec3 const anchors[] = {line.start, line.end, (line.start + line.end) * 0.5}; auto const anchor{anchors[state.handle]}; - if (false == state.dragging) - state.gizmo = glm::translate(glm::mat4(1.0f), glm::vec3(anchor - frame.camera)); - frame.manipulate(ImGuizmo::TRANSLATE, state.gizmo, m_gizmo_snap); + glm::dvec3 handled{anchor}; + bool held{false}; + if (m_handle_drag.active) + { + held = handle_drag_step(handled); + if (false == held && false == state.dragging) + return; + } + else + { + if (false == state.dragging) + state.gizmo = glm::translate(glm::mat4(1.0f), glm::vec3(anchor - frame.camera)); + frame.manipulate(ImGuizmo::TRANSLATE, state.gizmo, m_gizmo_snap); + held = ImGuizmo::IsUsing(); + handled = frame.camera + glm::dvec3(state.gizmo[3]); + } - if (ImGuizmo::IsUsing()) + if (held) { if (false == state.dragging) { @@ -2626,7 +2798,7 @@ void editor_mode::render_straight_gizmo() { lines.push_back(line); } - state.fitting = lines.size() == 1 && start_curve_fit(line); + state.fitting = lines.size() == 1 && start_curve_fit(line, state.handle); auto const tracks{state.fitting ? std::vector{} : editor_track::straight_affected(lines)}; if (false == tracks_editable(tracks, state.status)) { @@ -2646,11 +2818,13 @@ void editor_mode::render_straight_gizmo() } } auto const &grabbed{state.drag_line}; - glm::dvec3 moved{frame.camera + glm::dvec3(state.gizmo[3])}; + glm::dvec3 moved{handled}; std::function transform; if (state.handle == 2) { - auto const offset{snap_straight_offset(grabbed, moved - (grabbed.start + grabbed.end) * 0.5)}; + auto offset{snap_straight_offset(grabbed, moved - (grabbed.start + grabbed.end) * 0.5)}; + if (auto const values{typed_values()}; false == values.empty()) + offset = glm::dvec3{-grabbed.direction.y, 0.0, grabbed.direction.x} * values[0]; transform = [offset](glm::dvec3 const &Point) { return Point + offset; }; } else @@ -2658,6 +2832,15 @@ void editor_mode::render_straight_gizmo() auto const pivot{state.handle == 0 ? grabbed.end : grabbed.start}; auto const original{state.handle == 0 ? grabbed.start : grabbed.end}; moved = snap_straight_direction(pivot, moved); + if (auto const values{typed_values()}; false == values.empty() && values[0] > 0.1) + { + glm::dvec2 heading{moved.x - pivot.x, moved.z - pivot.z}; + if (glm::length(heading) < 1e-6) + heading = {original.x - pivot.x, original.z - pivot.z}; + heading = glm::normalize(heading) * values[0]; + moved.x = pivot.x + heading.x; + moved.z = pivot.z + heading.y; + } glm::dvec2 const before{original.x - pivot.x, original.z - pivot.z}; glm::dvec2 const after{moved.x - pivot.x, moved.z - pivot.z}; auto const lengthbefore{glm::length(before)}; @@ -2732,6 +2915,13 @@ void editor_mode::cancel_track_tools() straight_refresh(); } m_extend.active = false; + m_turntable.placing = false; + m_handle_drag = {}; + if (m_point_drag.active) + { + m_track_snap = {}; + point_drag_finish(); + } if (m_switch.placing) { m_switch.placing = false; @@ -2981,7 +3171,7 @@ bool editor_mode::place_straight_tool() auto const &line{current_straight()}; if (line.tracks.empty()) return false; - glm::dvec3 const ground{Global.pCamera.Pos + GfxRenderer->Mouse_Position()}; + glm::dvec3 const ground{cursor_ground()}; auto const along{std::clamp(line.along(ground), 0.0, line.length)}; glm::dvec3 const axis{line.direction.x, line.grade, line.direction.y}; state.tool_line = line; @@ -3007,6 +3197,7 @@ void editor_mode::render_straight_tool_gizmo() state.tool_dragging = true; auto const moved{frame.camera + glm::dvec3(state.tool_gizmo[3])}; state.tool_handle = {moved.x, state.tool_handle.y, moved.z}; + typed_turn(); } else if (state.tool_dragging) { @@ -3135,9 +3326,13 @@ std::vector editor_mode::track_key_hints(bool const All) if (m_lay.active) { if (m_lay.points.empty()) - hints = {{"LMB", "start of the new track, on the ground or at a free end"}, {"Esc", "stop laying"}}; + hints = {{"LMB", "start of the new track, on the ground or at a free end"}, {"Drag from a free end", "straight along it, to another free end: a curve joining them"}, {"Esc", "stop laying"}}; else - hints = {{"LMB", "next point, a curve goes at it"}, {"LMB on a free end", "join and lay"}, {"Enter", "lay"}, {"Backspace", "take back the point"}, {"Esc", "cancel"}}; + { + hints = {{"LMB", "next point, a curve goes at it"}, {"LMB on a free end", "join and lay"}, {"Enter", "lay up to the cursor"}, {"Backspace", "take back the point"}, {"Esc", "cancel"}}; + if (glm::dvec2 heading; lay_heading(heading)) + hints.insert(hints.begin() + 1, {"Shift", "straight on in the direction of the track"}); + } } else if (false == m_straights.detour.empty()) { @@ -3148,7 +3343,7 @@ std::vector editor_mode::track_key_hints(bool const All) else if (m_extend.active && m_extend_freehand) hints = {{"Drag", "curve through the cursor, along the end: straight"}, {"Ctrl", "straight"}, {"Release", "build"}, {"Esc", "cancel"}}; else if (m_extend.active) - hints = {{"Drag", "straight along the end, to a free end: a curve joining it"}, {"Release", "build"}, {"Esc", "cancel"}}; + hints = {{"Drag", "straight along the end, to a free end: a curve joining it"}, {"Shift", "straight, joins nothing"}, {"Release", "build"}, {"Esc", "cancel"}}; else if (m_switch.placing) hints = {{"Drag along", "direction of the switch"}, {"Drag sideways", "side of the diverging track"}, {"Esc", "cancel"}}; else if (m_track_tab == track_tab::lay) @@ -3163,6 +3358,8 @@ std::vector editor_mode::track_key_hints(bool const All) gizmo = true; } } + else if (m_track_tab == track_tab::turnout && m_switch.armed < 0) + hints = {{"List below", "choose the type of the switch to put in"}, {"LMB on a track", "choose the straight or the curve"}, {"Esc", "back to Select"}}; else if (m_track_tab == track_tab::turnout) hints = {{"1. List below", "choose the type of the switch"}, {"2. Press+drag", "on the selected track where the switch starts: along sets the direction, sideways the side"}, {"LMB elsewhere", "choose another track"}}; else if (m_track_tab == track_tab::profile && m_profile.route.spans.empty()) @@ -3171,6 +3368,12 @@ std::vector editor_mode::track_key_hints(bool const All) hints = {{"Drag a point", "in the profile window: changes the grade"}, {"Double click", "on the line: adds a point"}, {"Apply", "writes the heights into the tracks"}}; else if (m_track_window_open && m_track_tab == track_tab::speed) hints = {{"LMB on a row", "show the path"}}; + else if (m_track_window_open && m_track_tab == track_tab::lineside && m_lineside_tab == 0) + hints = {{"LMB by the track", "where it starts, the side of the track it goes on"}, {"Drag", "to where it ends, a click: one as long as the original"}, {"Release", "lays it"}, {"LMB away from the track", "selects another track"}}; + else if (m_track_window_open && m_track_tab == track_tab::lineside) + hints = {{"LMB on a track", "the line the objects go along"}}; + else if (m_track_window_open && m_track_tab == track_tab::joints) + hints = {{"LMB on a row", "show the place"}, {"Fix", "joins the ends, aligns them"}}; else if (m_track_window_open && m_track_tab == track_tab::infra) hints = {{"LMB", "select a path"}}; else if (m_track_tab == track_tab::straights && m_straights.tool == 1) @@ -3189,17 +3392,21 @@ std::vector editor_mode::track_key_hints(bool const All) else if (m_track_tab == track_tab::route) hints = {{"Drag yellow", "moves a vertex, the curve follows"}, {"Drag green", "changes the radius"}, {"Apply", "writes the design into the tracks"}, {"Esc", "release the vertex"}}; else if (selected == nullptr) - hints = {{"LMB on a track", "selects it"}, {"L", "lay a new track"}}; + hints = {{"LMB on a track", "selects it"}, {"Shift+LMB", "adds a track to the selection, drag: a box"}, {"RMB on a track", "what can be done with it"}, {"L", "lay a new track"}}; + else if (m_point_drag.moved) + hints = {{"Drag", "moves the point, level"}, {"Over a free end", "the end joins it"}, {"Release", "done"}, {"Esc", "done"}}; else if (m_track_point.valid()) { - hints = {{"Gizmo", "moves the point"}, {"Esc", "releases the point"}}; + hints = {{"Drag a point", "moves it, an end dropped on a free end joins it"}, {"Gizmo", "moves the point along the axes"}, {"Esc", "releases the point"}}; gizmo = true; } else { - hints = {{"LMB on a handle", "picks a point: an end or a control vector"}, {"Gizmo", "moves the whole track, W turns it"}, {"Drag the red ring", "leads a new track out of a free end, or use Continue below"}, {"Del", "deletes the track"}}; + hints = {{"Drag a point", "moves it, an end dropped on a free end joins it"}, {"Gizmo", "moves the whole track"}, {"Shift+LMB", "adds a track to the selection, drag: a box"}, {"L", "new track, also from a free end"}, {"Esc", "deselects"}, {"Del", "deletes the track"}}; gizmo = true; } + if (auto const *meaning{typed_meaning()}; meaning != nullptr) + hints.insert(hints.begin() + std::min(1, hints.size()), {"0-9", meaning}); if (All) { if (gizmo && m_gizmo_snap > 0.0f) @@ -3207,7 +3414,8 @@ std::vector editor_mode::track_key_hints(bool const All) hints.push_back({"K", "split the path under the cursor"}); hints.push_back({"O", "top view"}); hints.push_back({"Ctrl+Z", "undo"}); - hints.push_back({"L T G C P V I", "modes: lay, switch, straight, curve, profile, speed, infra"}); + hints.push_back({"Ctrl+Y", "redo"}); + hints.push_back({"L T G C B P V J I", "modes: lay, switch, straight, curve, objects, profile, speed, joints, infra"}); } for (auto &hint : hints) { @@ -3307,8 +3515,7 @@ std::string editor_mode::track_readout() const text += "\njoins " + name(m_track_snap.track); return text; } - if (m_gizmo_op != gizmo_operation::rotate) - return format("moved %.3f m", glm::distance(editor_track::pivot(*track), m_track_pivot)); + return format("moved %.3f m", glm::distance(editor_track::pivot(*track), m_track_pivot)); } return {}; } @@ -3368,7 +3575,9 @@ void editor_mode::draw_track_hints() } } - auto const readout{track_readout()}; + auto readout{track_readout()}; + if (auto const *meaning{typed_meaning()}; meaning != nullptr && false == m_typed.empty()) + readout += (readout.empty() ? "" : "\n") + std::string{"= "} + m_typed + "_ " + STR(meaning); if (readout.empty() || ImGui::GetIO().WantCaptureMouse) return; auto *foreground{ImGui::GetForegroundDrawList()}; @@ -3383,20 +3592,37 @@ void editor_mode::draw_track_hints() void editor_mode::update_build_tools() { - glm::dvec3 const ground{Global.pCamera.Pos + GfxRenderer->Mouse_Position()}; + glm::dvec3 const ground{cursor_ground()}; + auto const &io{ImGui::GetIO()}; + glm::vec2 const cursor{io.MousePos.x, io.MousePos.y}; m_straights.detour_mouse = ground; if (m_extend.active) - m_extend.mouse = ground; + { + screen_projection const projection; + glm::dvec3 level; + m_extend.mouse = projection.on_level(io.MousePos, m_extend.point.y, level) && plan_distance(level, m_extend.point) < static_cast(kMaxPlacementDistance) ? level : ground; + typed_extend(); + m_extend.snap = m_typed.empty() && false == io.KeyShift && m_extend.track != nullptr ? snap_free_end(m_extend.mouse, cursor, m_extend.track, m_extend.track->iCategoryFlag & 15, {m_extend.track}) : editor_track::snap_target{}; + } if (m_switch.placing) - m_switch.mouse = ground; + m_switch.mouse = cursor_level(m_switch.point.y); auto &lay{m_lay}; lay.preview.clear(); lay.preview_error.clear(); lay.preview_length = 0.0; if (false == lay.active) return; - lay.mouse = ground; - lay.mouse_snap = editor_track::find_free_end(nullptr, kRailCategory, ground, kLaySnapRadius, {}); + auto mouse{ground}; + glm::dvec2 heading; + bool const straight{io.KeyShift && lay_heading(heading)}; + if (straight) + { + auto const &last{lay.points.back()}; + auto const along{std::max(0.0, glm::dot(glm::dvec2{ground.x - last.x, ground.z - last.z}, heading))}; + mouse = {last.x + heading.x * along, ground.y, last.z + heading.y * along}; + } + lay.mouse = typed_lay(mouse); + lay.mouse_snap = straight ? editor_track::snap_target{} : m_typed.empty() ? snap_free_end(lay.mouse, cursor, nullptr, kRailCategory, {}) : editor_track::find_free_end(nullptr, kRailCategory, lay.mouse, kLaySnapRadius, {}); if (lay.points.empty()) return; auto points{lay.points}; @@ -3406,8 +3632,8 @@ void editor_mode::update_build_tools() else { end = {}; - if (plan_distance(ground, points.back()) > 1.0) - points.push_back(ground); + if (plan_distance(lay.mouse, points.back()) > 1.0) + points.push_back(lay.mouse); } lay.preview = lay_pieces(points, end, lay.preview_length, lay.preview_error); } @@ -3454,30 +3680,20 @@ bool editor_mode::chosen_free_end(extend_tool &Tool) return false; } -bool editor_mode::start_extend() +bool editor_mode::start_extend(editor_track::snap_target const &End) { - auto *track{selected_track()}; - if (m_track_tab != track_tab::path && m_track_tab != track_tab::straights && m_track_tab != track_tab::turnout) - return false; + auto *track{End.track}; if (track == nullptr || (track->eType != tt_Normal && track->eType != tt_Switch) || false == editor_track::is_supported(*track)) return false; - screen_projection const projection; - for (int i = 0; i < static_cast(track->m_paths.size()); ++i) - { - for (auto const atend : {false, true}) - { - editor_track::point_ref const point{i, atend ? editor_track::point_kind::end : editor_track::point_kind::start}; - if (editor_track::is_connected(*track, point) || projection.mouse_distance2(editor_track::point_position(*track, point)) > kHandleRadius * kHandleRadius * 1.5f) - continue; - extend_tool tool; - if (false == free_end(*track, i, atend, tool)) - return false; - m_extend = tool; - m_extend.active = true; - return true; - } - } - return false; + extend_tool tool; + if (false == free_end(*track, End.point.path, End.point.kind == editor_track::point_kind::end, tool)) + return false; + auto const &io{ImGui::GetIO()}; + m_extend = tool; + m_extend.origin = End; + m_extend.pressed = {io.MousePos.x, io.MousePos.y}; + m_extend.active = true; + return true; } bool editor_mode::extend_snap(editor_track::snap_target &Target) const @@ -3485,10 +3701,225 @@ bool editor_mode::extend_snap(editor_track::snap_target &Target) const auto const &tool{m_extend}; if (false == tool.active || tool.track == nullptr) return false; - Target = editor_track::find_snap_target(*tool.track, tool.mouse, 5.0, {tool.track}); + Target = tool.snap; return Target.track != nullptr && glm::distance(Target.position, tool.point) > 0.5; } +glm::dvec3 editor_mode::cursor_ground() const +{ + glm::dvec3 const ground{Global.pCamera.Pos + GfxRenderer->Mouse_Position()}; + if (GfxRenderer->Mouse_Hit()) + return ground; + screen_projection const projection; + glm::dvec3 level; + if (projection.on_level(ImGui::GetIO().MousePos, 0.0, level)) + return level; + return {ground.x, 0.0, ground.z}; +} + +glm::dvec3 editor_mode::cursor_level(double const Height) const +{ + glm::dvec3 const ground{cursor_ground()}; + screen_projection const projection; + glm::dvec3 level; + if (false == projection.on_level(ImGui::GetIO().MousePos, Height, level) || glm::distance(level, glm::dvec3{Global.pCamera.Pos}) > static_cast(kMaxPlacementDistance)) + return ground; + return level; +} + +editor_track::snap_target editor_mode::snap_free_end(glm::dvec3 const &Near, glm::vec2 const &Screen, TTrack const *Self, int const Category, std::vector const &Exclude) const +{ + screen_projection const projection; + auto const reach{Global.EditorOrtho ? std::max(kJointRange, static_cast(Global.EditorOrthoExtent) * 2.0) : kJointRange}; + editor_track::snap_target result; + auto best{kSnapPixels * kSnapPixels}; + for (auto const &candidate : editor_track::free_ends(Self, Category, glm::dvec3{Global.pCamera.Pos}, reach, Exclude)) + { + ImVec2 screen; + if (false == projection.project(candidate.position, screen)) + continue; + auto const distance{(screen.x - Screen.x) * (screen.x - Screen.x) + (screen.y - Screen.y) * (screen.y - Screen.y)}; + if (distance < best) + { + best = distance; + result = candidate; + } + } + if (result.track == nullptr && m_track_snap_radius > 0.0f) + result = editor_track::find_free_end(Self, Category, Near, m_track_snap_radius, Exclude); + return result; +} + +void editor_mode::draw_free_ends(TTrack const *Self, int const Category, std::vector const &Exclude) const +{ + screen_projection const projection; + auto *drawlist{ImGui::GetBackgroundDrawList()}; + auto const &display{ImGui::GetIO().DisplaySize}; + auto const reach{Global.EditorOrtho ? std::max(kJointRange, static_cast(Global.EditorOrthoExtent) * 2.0) : kJointRange}; + for (auto const &candidate : editor_track::free_ends(Self, Category, glm::dvec3{Global.pCamera.Pos}, reach, Exclude)) + { + ImVec2 screen; + if (projection.project(candidate.position, screen) && screen.x >= 0.0f && screen.y >= 0.0f && screen.x <= display.x && screen.y <= display.y) + drawlist->AddCircle(screen, 7.0f, IM_COL32(255, 60, 255, 170), 12, 1.5f); + } +} + +bool editor_mode::switch_reach(glm::dvec3 const &Ground, glm::dvec3 &Point) +{ + auto *selected{selected_track()}; + if (m_track_tab != track_tab::turnout || m_switch.armed < 0 || selected == nullptr || selected->eType != tt_Normal || selected->m_paths.empty()) + return false; + auto const &line{current_straight()}; + if (false == line.tracks.empty()) + { + auto const along{std::clamp(line.along(Ground), 0.0, line.length)}; + Point = line.start + glm::dvec3{line.direction.x, line.grade, line.direction.y} * along; + } + else + { + Point = editor_track::point_at(*selected, editor_track::nearest_parameter(*selected, Ground)); + } + return plan_distance(Point, Ground) <= kSwitchReach; +} + +void editor_mode::handle_drag_start(glm::dvec3 const &Anchor) +{ + auto const &io{ImGui::GetIO()}; + m_handle_drag = {}; + m_handle_drag.active = true; + m_handle_drag.from = {io.MousePos.x, io.MousePos.y}; + m_handle_drag.height = Anchor.y; + m_handle_drag.position = Anchor; + screen_projection const projection; + glm::dvec3 level; + if (projection.on_level(io.MousePos, Anchor.y, level)) + m_handle_drag.offset = {Anchor.x - level.x, 0.0, Anchor.z - level.z}; +} + +bool editor_mode::handle_drag_step(glm::dvec3 &Position) +{ + auto &drag{m_handle_drag}; + auto const &io{ImGui::GetIO()}; + if (false == drag.active) + return false; + if (false == io.MouseDown[0]) + { + drag = {}; + return false; + } + glm::vec2 const mouse{io.MousePos.x, io.MousePos.y}; + if (false == drag.moved && glm::length(mouse - drag.from) < kDragPixels) + return false; + drag.moved = true; + screen_projection const projection; + glm::dvec3 level; + if (projection.on_level(io.MousePos, drag.height, level) && glm::distance(level, glm::dvec3{Global.pCamera.Pos}) <= static_cast(kMaxPlacementDistance)) + drag.position = level + drag.offset; + Position = drag.position; + return true; +} + +void editor_mode::point_drag_start(editor_track::point_ref const &Point) +{ + auto *track{selected_track()}; + m_track_point = Point; + m_point_drag = {}; + if (track == nullptr || false == Point.valid() || Point.path >= static_cast(track->m_paths.size())) + return; + auto const &io{ImGui::GetIO()}; + m_point_drag.active = true; + m_point_drag.from = {io.MousePos.x, io.MousePos.y}; + m_point_drag.height = editor_track::point_position(*track, Point).y; +} + +void editor_mode::point_drag_update() +{ + auto &drag{m_point_drag}; + if (false == drag.active) + return; + auto const &io{ImGui::GetIO()}; + if (false == io.MouseDown[0]) + { + point_drag_finish(); + return; + } + auto *track{selected_track()}; + if (track == nullptr || false == m_track_point.valid() || m_track_point.path >= static_cast(track->m_paths.size())) + { + drag = {}; + return; + } + glm::vec2 const mouse{io.MousePos.x, io.MousePos.y}; + if (false == drag.moved) + { + if (glm::length(mouse - drag.from) < kDragPixels) + return; + std::string reason; + if (false == editor_track::can_edit_geometry(*track, reason)) + { + ui()->set_status(reason, true); + drag = {}; + return; + } + drag.moved = true; + m_track_drag = {track}; + m_track_drag_points.clear(); + m_track_joints.clear(); + m_track_snap = {}; + if (editor_track::is_end(m_track_point.kind) && m_track_drag_connected) + { + for (auto const &connection : editor_track::connected_points(*track, editor_track::point_position(*track, m_track_point))) + { + std::string neighbourreason; + if (false == editor_track::can_edit_geometry(*connection.first, neighbourreason)) + continue; + m_track_drag_points.emplace_back(connection); + if (std::find(m_track_drag.begin(), m_track_drag.end(), connection.first) == m_track_drag.end()) + m_track_drag.emplace_back(connection.first); + } + } + std::vector> states; + for (auto *dragged : m_track_drag) + states.emplace_back(dragged, editor_track::capture(*dragged)); + push_track_snapshot(std::move(states)); + } + screen_projection const projection; + glm::dvec3 position; + if (false == projection.on_level(io.MousePos, drag.height, position) || glm::distance(position, glm::dvec3{Global.pCamera.Pos}) > static_cast(kMaxPlacementDistance)) + return; + m_track_snap = {}; + if (editor_track::is_end(m_track_point.kind) && m_track_drag_points.empty()) + { + std::vector const exclude(m_track_drag.begin(), m_track_drag.end()); + m_track_snap = snap_free_end(position, mouse, track, track->iCategoryFlag & 15, exclude); + if (m_track_snap.track != nullptr) + position = m_track_snap.position; + } + editor_track::move_point(*track, m_track_point, position); + for (auto const &connection : m_track_drag_points) + editor_track::move_point(*connection.first, connection.second, position); + m_track_dirty = true; + commit_track_drag(false); +} + +void editor_mode::point_drag_finish() +{ + auto const drag{m_point_drag}; + m_point_drag = {}; + if (false == drag.active || false == drag.moved) + return; + if (auto *track{selected_track()}; track != nullptr && m_track_snap.track != nullptr && m_track_point.valid()) + { + editor_track::snap_point(*track, m_track_point, m_track_snap, m_track_align_tangent); + m_track_dirty = true; + } + m_track_snap = {}; + commit_track_drag(true); + m_track_drag.clear(); + m_track_drag_points.clear(); + m_track_joints.clear(); +} + std::vector editor_mode::extend_pieces() const { std::vector result; @@ -3529,6 +3960,25 @@ std::vector editor_mode::extend_pieces() const auto const shape{alignment::compute(design)}; return shape.valid ? alignment::pieces(shape, design, 0) : result; } + if (false == ImGui::GetIO().KeyShift && tool.track != nullptr && tool.track->eType == tt_Switch && tool.track->m_paths.size() > 1 && tool.path == 1 && tool.atend) + { + auto const &diverging{tool.track->m_paths[1]}; + bezier const curve{diverging}; + auto const begin{plan_of(curve.first(0.0))}; + auto const finish{plan_of(curve.first(1.0))}; + auto const turn{glm::length(begin) > 1e-9 && glm::length(finish) > 1e-9 ? geometry::signed_angle(begin, finish) : 0.0}; + if (std::abs(turn) > 1e-4) + { + int const side{turn > 0.0 ? 1 : -1}; + auto const radius{std::abs(diverging.radius) > 1.0f ? static_cast(std::abs(diverging.radius)) : curve.plan_length() / std::abs(turn)}; + auto const &direction{tool.direction}; + auto const centre{plan_of(tool.point) + glm::dvec2{-direction.y, direction.x} * (side * radius)}; + auto const angle{geometry::signed_angle(plan_of(tool.point) - centre, plan_of(tool.mouse) - centre) * side}; + if (angle * radius < 0.5) + return result; + return arc_pieces(tool.point, direction, tool.grade, radius, std::min(angle, glm::pi()), side); + } + } glm::dvec2 const offset{tool.mouse.x - tool.point.x, tool.mouse.z - tool.point.z}; auto const chord{glm::length(offset)}; if (chord < 0.5) @@ -3537,7 +3987,7 @@ std::vector editor_mode::extend_pieces() const auto const along{glm::dot(offset, direction)}; auto const lateral{direction.x * offset.y - direction.y * offset.x}; auto const height = [&](double const Distance) { return tool.point.y + tool.grade * Distance; }; - if (false == m_extend_freehand || ImGui::GetIO().KeyCtrl || std::abs(lateral) < 0.005 * chord + 0.05) + if (false == m_extend_freehand || ImGui::GetIO().KeyCtrl || ImGui::GetIO().KeyShift || std::abs(lateral) < 0.005 * chord + 0.05) { if (along < 0.5) return result; @@ -3553,6 +4003,20 @@ std::vector editor_mode::extend_pieces() const void editor_mode::finish_extend() { + auto const &io{ImGui::GetIO()}; + if (glm::length(glm::vec2{io.MousePos.x, io.MousePos.y} - m_extend.pressed) < kDragPixels && m_typed.empty()) + { + m_extend.active = false; + if (m_lay.active && m_lay.points.empty() && m_extend.origin.track != nullptr) + { + m_lay.status.clear(); + m_lay.start = m_extend.origin; + m_lay.points.push_back(m_extend.origin.position); + } + else if (false == m_lay.active && m_extend.origin.track != nullptr && m_extend.origin.track == selected_track()) + m_track_point = m_extend.origin.point; + return; + } crossover_plan plan; editor_track::snap_target target; if (false == extend_snap(target) && plan_crossover(plan)) @@ -3645,7 +4109,7 @@ void editor_mode::render_extend_ui() if (ImGui::Button(STR_C("Curve right##extend"), ImVec2(100.0f, 0.0f))) extend_add(-1); ImGui::Checkbox(STR_C("Freehand"), &m_extend_freehand); - item_tooltip("Dragging the red ring of a free end draws a curve through the cursor; off: it draws a straight along the end"); + item_tooltip("Dragging from a free end draws a curve through the cursor; off: it draws a straight along the end"); } std::vector editor_mode::lay_pieces(std::vector const &Points, editor_track::snap_target const &End, double &Length, std::string &Error) const @@ -3723,7 +4187,7 @@ void editor_mode::lay_click() { auto &tool{m_lay}; tool.status.clear(); - auto const snap{editor_track::find_free_end(nullptr, kRailCategory, tool.mouse, kLaySnapRadius, {})}; + auto const snap{tool.mouse_snap}; if (snap.track != nullptr && false == tool.points.empty() && glm::distance(snap.position, tool.points.front()) > 1.0) { // reaching a free end finishes the track there, in line with the path it joins @@ -3741,6 +4205,7 @@ void editor_mode::lay_click() if (plan_distance(point, tool.points.back()) < 1.0) return; tool.points.push_back(point); + m_typed.clear(); } void editor_mode::lay_finish(editor_track::snap_target const &End) @@ -3777,6 +4242,47 @@ void editor_mode::lay_finish(editor_track::snap_target const &End) straight_refresh(); } +bool editor_mode::lay_heading(glm::dvec2 &Heading) const +{ + auto const &tool{m_lay}; + glm::dvec2 direction{0.0}; + if (tool.points.size() >= 2) + direction = plan_of(tool.points.back() - tool.points[tool.points.size() - 2]); + else if (tool.points.size() == 1 && tool.start.track != nullptr) + direction = -plan_of(tool.start.direction); + if (glm::length(direction) < 1e-6) + return false; + Heading = glm::normalize(direction); + return true; +} + +void editor_mode::lay_enter() +{ + auto &tool{m_lay}; + if (false == m_typed.empty()) + { + lay_click(); + return; + } + if (tool.points.empty()) + return; + auto const end{tool.mouse_snap}; + if (end.track != nullptr && glm::distance(end.position, tool.points.front()) > 1.0) + { + tool.points.push_back(end.position); + lay_finish(end); + return; + } + auto const point{placement_on_ground(tool.mouse)}; + bool const appended{plan_distance(point, tool.points.back()) > 1.0}; + if (appended) + tool.points.push_back(point); + auto const count{tool.points.size()}; + lay_finish({}); + if (appended && tool.points.size() == count) + tool.points.pop_back(); +} + void editor_mode::lay_cancel() { auto &tool{m_lay}; @@ -3788,6 +4294,12 @@ void editor_mode::lay_cancel() void editor_mode::render_lay_ui() { auto &tool{m_lay}; + if (auto *track{selected_track()}; track != nullptr) + { + std::string reason; + if (editor_track::can_edit_geometry(*track, reason)) + render_extend_ui(); + } ImGui::PushItemWidth(120.0f); ImGui::DragScalar(STR_C("Curve radius (m)"), ImGuiDataType_Double, &tool.radius, 5.0f, nullptr, nullptr, "%.0f"); item_tooltip("Drag to change, Ctrl+click to type the value"); @@ -3867,9 +4379,9 @@ bool editor_mode::start_switch_placement() return false; // with no plain track selected, or a press away from it, the click selects auto *selected{selected_track()}; - if (selected == nullptr || selected->eType != tt_Normal) + if (selected == nullptr || selected->eType != tt_Normal || selected->m_paths.empty()) return false; - glm::dvec3 const ground{Global.pCamera.Pos + GfxRenderer->Mouse_Position()}; + glm::dvec3 const ground{cursor_level(selected->m_paths.front().points[segment_data::point::start].y)}; tool.curved = false; tool.status.clear(); if (current_straight().tracks.empty()) @@ -3952,10 +4464,158 @@ void editor_mode::insert_switch(editor_track::straight const &Line, double const std::vector> states; std::vector created; std::vector removed; - if (false == place_switch_on_straight(Line, m_switch.templates[m_switch.armed], nullptr, Along, Direction, Side, true, states, created, removed)) + if (false == place_switch_on_straight(Line, m_switch.templates[m_switch.armed], nullptr, Along, Direction, Side, true, states, created, removed, switch_name_for_new())) return; + auto const placed{created}; push_track_snapshot(std::move(states), std::move(created), std::move(removed)); straight_refresh(); + switch_placed(placed); +} + +void editor_mode::switch_placed(std::vector const &Created) +{ + auto const found{std::find_if(Created.begin(), Created.end(), [](TTrack const *Track) { return Track != nullptr && Track->eType == tt_Switch; })}; + if (found == Created.end()) + return; + auto const slip{std::count_if(Created.begin(), Created.end(), [](TTrack const *Track) { return Track != nullptr && Track->eType == tt_Switch; }) > 1}; + m_switch.armed = -1; + m_switch.placing = false; + m_track_point = {}; + m_node = *found; + ui()->set_node(m_node); + if (slip) + return; + if (m_switch.drive >= 0) + place_switch_drive(**found); + std::string name{m_switch.name}; + auto digits{name.size()}; + while (digits > 0 && std::isdigit(static_cast(name[digits - 1]))) + --digits; + if (digits < name.size() && name.size() - digits < 9) + name = name.substr(0, digits) + std::to_string(std::stoi(name.substr(digits)) + 1); + else + name.clear(); + std::snprintf(m_switch.name, sizeof(m_switch.name), "%s", name.c_str()); +} + +void editor_mode::scan_switch_drives() +{ + auto &tool{m_switch}; + if (tool.drives_scanned) + return; + tool.drives_scanned = true; + tool.drives.clear(); + if (false == EditorIncludes.scanned()) + EditorIncludes.scan(); + for (auto const &entry : EditorIncludes.entries()) + { + if (entry.category != "switch drive") + continue; + include_info info; + std::string error; + if (false == editor_includes::load(entry.file, info, error) || editor_includes::parameter_with_role(info, "track") == 0) + continue; + auto const side = [](std::string const &Side) { return Side == "left" ? 0 : Side == "right" ? 1 : -1; }; + auto const hand{side(info.switch_hand)}; + auto const drive{side(info.switch_drive)}; + if (hand < 0 || drive < 0) + continue; + auto const name{info.name.empty() ? entry.file : info.name}; + auto family{std::find_if(tool.drives.begin(), tool.drives.end(), [&](switch_tool::drive_family const &Family) { return Family.name == name; })}; + if (family == tool.drives.end()) + { + tool.drives.push_back({name, {}}); + family = std::prev(tool.drives.end()); + } + family->files[hand * 2 + drive] = entry.file; + } + std::sort(tool.drives.begin(), tool.drives.end(), [](switch_tool::drive_family const &A, switch_tool::drive_family const &B) { return A.name < B.name; }); + tool.drive = tool.drives.empty() ? -1 : 0; +} + +std::string editor_mode::switch_name_for_new() const +{ + if (m_switch.name[0] != '\0') + return m_switch.name; + for (int i = 1;; ++i) + { + auto const name{"z" + std::to_string(i)}; + if (simulation::Paths.find(name) == nullptr && simulation::Events.FindEvent(name + "+") == nullptr) + return name; + } +} + +bool editor_mode::place_switch_drive(TTrack &Switch) +{ + auto &tool{m_switch}; + if (tool.drive < 0 || tool.drive >= static_cast(tool.drives.size()) || Switch.eType != tt_Switch || Switch.m_paths.size() < 2) + return false; + auto const &main{Switch.m_paths[0]}; + auto const &diverging{Switch.m_paths[1]}; + auto const start{main.points[segment_data::point::start]}; + auto const &control{main.points[segment_data::point::control1]}; + auto heading{plan_of(control != glm::dvec3{} ? control : main.points[segment_data::point::end] - start)}; + if (glm::length(heading) < 1e-9) + return false; + heading = glm::normalize(heading); + glm::dvec2 const right{-heading.y, heading.x}; + bool const rightswitch{glm::dot(plan_of(diverging.points[segment_data::point::end] - start), right) > 0.0}; + bool const driveright{(tool.drive_side == 0) == rightswitch}; + auto const &family{tool.drives[tool.drive]}; + template_item item; + item.file = family.files[(rightswitch ? 2 : 0) + (driveright ? 1 : 0)]; + if (item.file.empty()) + { + tool.status = format(STR_C("The drive %s has no variant for a %s switch with the drive on the %s"), family.name.c_str(), rightswitch ? STR_C("right") : STR_C("left"), driveright ? STR_C("right") : STR_C("left")); + return false; + } + item.location = start; + auto yaw{glm::degrees(std::atan2(heading.x, heading.y))}; + item.yaw = yaw < 0.0 ? yaw + 360.0 : yaw; + item.described = true; + item.track = Switch.name(); + std::string error; + if (place_templates({item}, error) == 0) + { + tool.status = STR_C("The drive couldn't be placed: ") + error; + return false; + } + tool.status = format(STR_C("Switch %s with the drive %s: events %s+ and %s- switch it, also in the map"), Switch.name().c_str(), item.file.c_str(), Switch.name().c_str(), Switch.name().c_str()); + return true; +} + +bool editor_mode::render_switch_drive_choice() +{ + auto &tool{m_switch}; + scan_switch_drives(); + if (tool.drives.empty()) + { + ImGui::TextDisabled("%s", STR_C("No switch drives: no template is described with category: switch drive")); + return false; + } + auto const label = [&](int const Index) { return Index < 0 ? std::string{STR_C("no drive")} : tool.drives[Index].name; }; + ImGui::PushItemWidth(200.0f); + bool changed{false}; + if (ImGui::BeginCombo(STR_C("Drive"), label(tool.drive).c_str())) + { + for (int i = -1; i < static_cast(tool.drives.size()); ++i) + if (ImGui::Selectable(label(i).c_str(), tool.drive == i)) + { + tool.drive = i; + changed = true; + } + ImGui::EndCombo(); + } + ImGui::PopItemWidth(); + item_tooltip("Templates described with category: switch drive, the side of the switch and of the drive, and a parameter with the role track for the name of the switch.\nIts events + and - switch it with the keys by the switch and in the map during the game"); + if (tool.drive >= 0) + { + ImGui::SameLine(); + changed |= ImGui::RadioButton(STR_C("diverging side"), &tool.drive_side, 0); + ImGui::SameLine(); + changed |= ImGui::RadioButton(STR_C("other side"), &tool.drive_side, 1); + } + return changed; } bool editor_mode::cut_straight(editor_track::straight const &Line, double const From, double const To, std::vector> &States, std::vector &Created, std::vector &Removed, TTrack **Style) @@ -4046,7 +4706,7 @@ bool editor_mode::cut_straight(editor_track::straight const &Line, double const return true; } -bool editor_mode::place_switch_on_straight(editor_track::straight const &Line, editor_track::switch_template const &Shape, TTrack const *Style, double const Along, int const Direction, int const Side, bool const Snap, std::vector> &States, std::vector &Created, std::vector &Removed) +bool editor_mode::place_switch_on_straight(editor_track::straight const &Line, editor_track::switch_template const &Shape, TTrack const *Style, double const Along, int const Direction, int const Side, bool const Snap, std::vector> &States, std::vector &Created, std::vector &Removed, std::string const &Name) { auto const &shape{Shape}; if (shape.length > Line.length - 0.02) @@ -4090,7 +4750,7 @@ bool editor_mode::place_switch_on_straight(editor_track::straight const &Line, e auto const point = [&](double const Distance) { return Line.start + glm::dvec3{Line.direction.x, Line.grade, Line.direction.y} * Distance; }; glm::dvec2 const direction{Line.direction * static_cast(Direction)}; auto const paths{editor_track::place_switch(shape, point(origin), direction, Side, Line.grade * Direction)}; - auto *track{editor_track::create_switch(shape, paths, Style != nullptr ? *Style : *first)}; + auto *track{editor_track::create_switch(shape, paths, Style != nullptr ? *Style : *first, Name)}; if (track != nullptr) { editor_track::commit({track}); @@ -4134,6 +4794,8 @@ void editor_mode::draw_build_overlay() const } if (m_extend.active) { + if (m_extend.track != nullptr) + draw_free_ends(m_extend.track, m_extend.track->iCategoryFlag & 15, {m_extend.track}); crossover_plan plan; editor_track::snap_target target; if (extend_snap(target)) @@ -4177,24 +4839,8 @@ void editor_mode::draw_build_overlay() const drawlist->AddCircle(screen, 14.0f, IM_COL32(255, 60, 255, 255), 20, 3.0f); if (lay.start.track != nullptr && projection.project(lay.start.position, screen)) drawlist->AddCircle(screen, 10.0f, IM_COL32(255, 60, 255, 255), 20, 2.0f); - if (lay.points.empty()) - { - // free ends nearby, which the new track can start from - for (auto *section : simulation::Region->sections(lay.mouse, 300.f)) - for (auto const &cell : section->m_cells) - for (auto *path : cell.m_directories.paths) - { - if ((path->iCategoryFlag & 15) != kRailCategory || false == editor_track::is_supported(*path)) - continue; - for (int i = 0; i < static_cast(path->m_paths.size()); ++i) - for (auto const kind : {editor_track::point_kind::start, editor_track::point_kind::end}) - { - editor_track::point_ref const point{i, kind}; - if (false == editor_track::is_connected(*path, point) && projection.project(editor_track::point_position(*path, point), screen)) - drawlist->AddCircle(screen, 7.0f, IM_COL32(255, 60, 255, 160), 12, 1.5f); - } - } - } + if (false == m_extend.active) + draw_free_ends(nullptr, kRailCategory, {}); } if (false == m_straights.detour.empty()) { @@ -4208,37 +4854,45 @@ void editor_mode::draw_build_overlay() const drawlist->AddCircleFilled(screen, 6.0f, overlay_color::invalid); } } - auto const *track{selected_track()}; - if (track == nullptr || (track->eType != tt_Normal && track->eType != tt_Switch) || m_extend.active) - return; - for (int i = 0; i < static_cast(track->m_paths.size()); ++i) - { - for (auto const atend : {false, true}) - { - editor_track::point_ref const point{i, atend ? editor_track::point_kind::end : editor_track::point_kind::start}; - if (editor_track::is_connected(*track, point)) - continue; - ImVec2 screen; - if (projection.project(editor_track::point_position(*track, point), screen)) - drawlist->AddCircle(screen, 10.0f, IM_COL32(240, 60, 60, 255), 16, 3.0f); - } - } + if ((m_point_drag.moved || (m_track_gizmo_using && m_track_point.valid())) && editor_track::is_end(m_track_point.kind) && m_track_drag_points.empty()) + if (auto const *track{selected_track()}; track != nullptr) + draw_free_ends(track, track->iCategoryFlag & 15, std::vector(m_track_drag.begin(), m_track_drag.end())); } void editor_mode::render_switch_ui() { auto &tool{m_switch}; + auto const list = [&](bool const Slips) { + for (int i = 0; i < static_cast(tool.templates.size()); ++i) + { + auto const &entry{tool.templates[i]}; + if (entry.double_slip != Slips) + continue; + auto label{entry.source != nullptr ? STR("Scenery: ") + entry.label + " (" + std::to_string(entry.count) + "x)" : "PLK: " + entry.label}; + label += "##switch" + std::to_string(i); + if (ImGui::Selectable(label.c_str(), tool.armed == i)) + tool.armed = tool.last = i; + } + }; ImGui::TextDisabled("%s", STR_C("Switch template")); ImGui::BeginChild("##switchtemplates", ImVec2(0.0f, 240.0f), true); - for (int i = 0; i < static_cast(tool.templates.size()); ++i) - { - auto const &entry{tool.templates[i]}; - auto label{entry.source != nullptr ? STR("Scenery: ") + entry.label + " (" + std::to_string(entry.count) + "x)" : "PLK: " + entry.label}; - label += "##switch" + std::to_string(i); - if (ImGui::Selectable(label.c_str(), tool.armed == i)) - tool.armed = tool.last = i; - } + list(false); ImGui::EndChild(); + if (std::any_of(tool.templates.begin(), tool.templates.end(), [](editor_track::switch_template const &Template) { return Template.double_slip; })) + { + if (tool.armed >= 0 && tool.armed < static_cast(tool.templates.size()) && tool.templates[tool.armed].double_slip) + ImGui::SetNextItemOpen(true); + if (ImGui::CollapsingHeader(STR_C("Double slip switches"))) + { + ImGui::TextDisabled("%s", STR_C("Only at a crossing of two straights")); + list(true); + } + } + ImGui::PushItemWidth(120.0f); + ImGui::InputTextWithHint(STR_C("Name##switchname"), switch_name_for_new().c_str(), tool.name, sizeof(tool.name)); + ImGui::PopItemWidth(); + item_tooltip("Name of the next switch, its drive events are named after it; empty: the next free z1, z2...; a number at the end goes up with each switch"); + render_switch_drive_choice(); if (false == tool.status.empty()) ImGui::TextColored(ImVec4(1.0f, 0.7f, 0.2f, 1.0f), "%s", tool.status.c_str()); if (ImGui::SmallButton(STR_C("Collect again from the scenery"))) @@ -4280,7 +4934,7 @@ void editor_mode::add_detour_point() return; state.detour_line = line; } - state.detour.push_back(Global.pCamera.Pos + GfxRenderer->Mouse_Position()); + state.detour.push_back(cursor_ground()); if (state.detour.size() >= 4) { apply_detour(); @@ -4398,20 +5052,31 @@ void editor_mode::apply_detour() straight_refresh(); } -bool editor_mode::start_curve_fit(editor_track::straight const &Line) +bool editor_mode::start_curve_fit(editor_track::straight const &Line, int const Handle) { auto &state{m_straights}; auto *before{editor_track::outside_neighbour(Line, false)}; auto *after{editor_track::outside_neighbour(Line, true)}; - if (before == nullptr || after == nullptr) + auto const curve_at = [&](TTrack *Neighbour, editor_track::curve &Curve) { + Curve = {}; + return Neighbour != nullptr && Neighbour->eType == tt_Normal && editor_track::find_curve(*Neighbour, state.tolerance, m_route.design.norms.gauge, Curve) && Curve.reversals == 0 && std::abs(Curve.turn) > 1e-4; + }; + state.fit_has_before = curve_at(before, state.fit_before); + state.fit_has_after = curve_at(after, state.fit_after); + if (false == state.fit_has_before && false == state.fit_has_after) return false; - if (false == editor_track::find_curve(*before, state.tolerance, m_route.design.norms.gauge, state.fit_before) || false == editor_track::find_curve(*after, state.tolerance, m_route.design.norms.gauge, state.fit_after)) - return false; - if (state.fit_before.reversals != 0 || state.fit_after.reversals != 0) + auto const side_follows = [&](bool const Curve, TTrack const *Neighbour, bool const Pivot) { return Curve || Neighbour == nullptr || Pivot; }; + if (false == side_follows(state.fit_has_before, before, Handle == 1) || false == side_follows(state.fit_has_after, after, Handle == 0)) return false; + auto const own_end = [&](glm::dvec3 const &Point) -> TTrack * { + for (auto *track : Line.tracks) + if (editor_track::touches(*track, Point)) + return track; + return Line.tracks.empty() ? nullptr : Line.tracks.front(); + }; auto const other_end = [](editor_track::curve const &Curve, glm::dvec3 const &Joint) { return editor_track::touches(*Curve.from, Joint) ? Curve.to : Curve.from; }; - m_route.from = other_end(state.fit_before, Line.start); - m_route.to = other_end(state.fit_after, Line.end); + m_route.from = state.fit_has_before ? other_end(state.fit_before, Line.start) : own_end(Line.start); + m_route.to = state.fit_has_after ? other_end(state.fit_after, Line.end) : own_end(Line.end); route_reset(); if (m_route.chain.tracks.empty()) return false; @@ -4440,26 +5105,34 @@ void editor_mode::update_curve_fit(glm::dvec3 const &Start, glm::dvec3 const &En vertex.transition_out = std::round(Curve.transition_out); if (Curve.cant > 0.0) vertex.cant = std::round(Curve.cant); - if (Curve.compound) - { - vertex.compound = true; - vertex.radius2 = std::round(Curve.radius2); - vertex.transition_middle = std::round(Curve.transition_middle); - vertex.split = Curve.split; - } + compound_from(Curve, vertex); vertex.offset = std::max(0.1, Offset); return vertex; }; - auto before{make(state.fit_before, first)}; - auto after{make(state.fit_after, last)}; - design.vertices = {before, after}; + design.vertices.clear(); + if (state.fit_has_before) + design.vertices.push_back(make(state.fit_before, first)); + else + { + design.start = Start; + design.start_direction = direction; + design.start_reserve = 0.0; + } + if (state.fit_has_after) + design.vertices.push_back(make(state.fit_after, last)); + else + { + design.end = End; + design.end_direction = direction; + design.end_reserve = 0.0; + } route_update(); } bool editor_mode::plan_crossover(crossover_plan &Plan) const { auto const &tool{m_extend}; - if (false == tool.active || tool.track == nullptr || tool.track->eType != tt_Switch || tool.track->m_paths.size() < 2 || tool.path != 1 || false == tool.atend) + if (false == tool.active || tool.track == nullptr || tool.track->eType != tt_Switch || tool.track->m_paths.size() < 2 || tool.path != 1 || false == tool.atend || ImGui::GetIO().KeyShift) return false; auto const &own{*tool.track}; auto const &main{own.m_paths[0]}; @@ -4737,6 +5410,7 @@ bool editor_mode::insert_double_slip(editor_track::straight const &Line, glm::dv created.insert(created.end(), parts.begin(), parts.end()); push_track_snapshot(std::move(states), std::move(created), std::move(removed)); straight_refresh(); + switch_placed(parts); return true; } @@ -5051,7 +5725,7 @@ void editor_mode::insert_curved_switch(int const Direction, int const Side) } } auto const paths{curved_switch_paths(shape, tool.frame, station, Direction, Side)}; - auto *track{editor_track::create_switch(shape, paths, *tool.frame_tracks.front())}; + auto *track{editor_track::create_switch(shape, paths, *tool.frame_tracks.front(), switch_name_for_new())}; if (track != nullptr) { editor_track::commit({track}); @@ -5060,6 +5734,8 @@ void editor_mode::insert_curved_switch(int const Direction, int const Side) } else tool.status = STR_C("The switch couldn't be created from this template"); + auto const placed{created}; push_track_snapshot(std::move(states), std::move(created), std::move(removed)); straight_refresh(); + switch_placed(placed); } diff --git a/application/editormodetrackux.cpp b/application/editormodetrackux.cpp new file mode 100644 index 000000000..d7472c61e --- /dev/null +++ b/application/editormodetrackux.cpp @@ -0,0 +1,1359 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "application/editormode.h" +#include "application/editoruilayer.h" +#include "application/editorprojection.h" +#include "editor/editorFormat.hpp" +#include "editor/editorGeometry.hpp" + +#include "utilities/Globals.h" +#include "rendering/renderer.h" +#include "world/Track.h" +#include "scene/scene.h" +#include "scene/scenelayers.h" +#include "simulation/simulation.h" +#include "utilities/translation.h" + +#include "imgui/imgui.h" +#include "imgui/ImGuizmo.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace +{ + +using geometry::bezier; + +float const kHoverPixels{12.0f}; +double const kHoverReachMin{15.0}; +double const kHoverReachMax{250.0}; +double const kHoverLabelDelay{0.35}; // s the cursor rests on a path before its data shows up +double const kFocusDistance{25.0}; +auto const kContextClick{std::chrono::milliseconds(350)}; +float const kContextTurn{0.02f}; // rad the camera may turn during a click of the right button +std::size_t const kSearchLimit{200}; +int const kRailCategory{1}; + +bool viewport_click() +{ + return false == ImGui::GetIO().MouseDownOwned[0]; +} + +bool rail(TTrack const &Track) +{ + return (Track.iCategoryFlag & 15) == kRailCategory && false == Track.m_editorremoved && Track.visible(); +} + +std::string name_of(TTrack const &Track) +{ + return Track.name().empty() ? std::string{"(noname)"} : Track.name(); +} + +std::string lower(std::string Text) +{ + std::transform(Text.begin(), Text.end(), Text.begin(), [](unsigned char const Character) { return static_cast(std::tolower(Character)); }); + return Text; +} + +char const *type_of(TTrack const &Track) +{ + switch (Track.eType) + { + case tt_Normal: return "normal"; + case tt_Switch: return "switch"; + case tt_Cross: return "cross"; + case tt_Table: return "turntable"; + case tt_Tributary: return "tributary"; + default: return "unknown"; + } +} + +double segment_distance2(glm::vec2 const &Point, glm::vec2 const &A, glm::vec2 const &B, double &T) +{ + auto const ab{B - A}; + auto const length2{glm::dot(ab, ab)}; + T = length2 > 1e-6f ? std::clamp(static_cast(glm::dot(Point - A, ab) / length2), 0.0, 1.0) : 0.0; + auto const closest{A + ab * static_cast(T)}; + return glm::dot(Point - closest, Point - closest); +} + +} // namespace + +editor_mode::track_hover editor_mode::track_under_cursor() const +{ + track_hover result; + auto const &io{ImGui::GetIO()}; + glm::dvec3 const camera{Global.pCamera.Pos}; + glm::dvec3 const ground{cursor_ground()}; + auto const reach{std::clamp(glm::distance(camera, ground) * 0.1, kHoverReachMin, kHoverReachMax)}; + screen_projection const projection; + glm::vec2 const mouse{io.MousePos.x, io.MousePos.y}; + double best{kHoverPixels * kHoverPixels}; + for (auto *section : simulation::Region->sections(ground, static_cast(reach))) + { + for (auto const &cell : section->m_cells) + { + for (auto *track : cell.m_directories.paths) + { + if (track == nullptr || false == rail(*track)) + continue; + for (int i = 0; i < static_cast(track->m_paths.size()); ++i) + { + bezier const curve{track->m_paths[i]}; + auto const count{std::clamp(static_cast(curve.plan_length() / 3.0), 6, 64)}; + auto previous{curve.point(0.0)}; + ImVec2 from; + bool visible{projection.project(previous, from)}; + for (int k = 1; k <= count; ++k) + { + auto const next{curve.point(static_cast(k) / count)}; + ImVec2 to; + bool const shown{projection.project(next, to)}; + if (visible && shown) + { + double t; + auto const distance{segment_distance2(mouse, {from.x, from.y}, {to.x, to.y}, t)}; + auto const point{glm::mix(previous, next, t)}; + if (distance < best && glm::distance(point, camera) <= static_cast(kMaxPlacementDistance)) + { + best = distance; + result.track = track; + result.path = i; + result.point = point; + } + } + previous = next; + from = to; + visible = shown; + } + } + } + } + } + return result; +} + +void editor_mode::update_track_hover() +{ + if (typed_meaning() == nullptr) + m_typed.clear(); + bool const blocked{ImGui::GetIO().WantCaptureMouse || mouseHold || m_track_set_using || m_track_box.active || m_input.mouse.button(GLFW_MOUSE_BUTTON_RIGHT) == GLFW_PRESS || m_track_gizmo_using || m_route_gizmo_using || m_extend.active || m_switch.placing || + m_straights.dragging || m_lay.active}; + if (blocked) + { + m_hover = {}; + return; + } + auto found{track_under_cursor()}; + found.since = found.track == m_hover.track ? m_hover.since : ImGui::GetTime(); + m_hover = found; +} + +void editor_mode::draw_track_hover() const +{ + using kind = track_intent::kind; + auto const *track{m_hover.track}; + if (track == nullptr || (m_intent.what != kind::select && m_intent.what != kind::box && m_intent.what != kind::straight_set) || m_intent.track != track) + return; + screen_projection const projection; + if (track != selected_track()) + { + auto *drawlist{ImGui::GetBackgroundDrawList()}; + for (int i = 0; i < static_cast(track->m_paths.size()); ++i) + { + bezier const curve{track->m_paths[i]}; + auto const count{std::clamp(static_cast(curve.plan_length() / 3.0), 6, 64)}; + auto const colour{i == m_hover.path ? IM_COL32(255, 255, 255, 200) : IM_COL32(255, 255, 255, 110)}; + auto previous{curve.point(0.0)}; + for (int k = 1; k <= count; ++k) + { + auto const next{curve.point(static_cast(k) / count)}; + projection.line(drawlist, previous, next, colour, i == m_hover.path ? 3.5f : 2.0f); + previous = next; + } + } + } +} + +bool editor_mode::track_gesture_on() const +{ + return mouseHold || m_track_set_using || m_track_box.active || m_input.mouse.button(GLFW_MOUSE_BUTTON_RIGHT) == GLFW_PRESS || m_track_gizmo_using || m_route_gizmo_using || m_extend.active || m_switch.placing || m_straights.dragging || m_straights.tool_mouse || + m_point_drag.active || m_handle_drag.active || m_sweep.dragging || m_turntable.placing || ImGuizmo::IsUsing(); +} + +editor_mode::track_intent editor_mode::track_intent_at(int const Mods) +{ + using kind = track_intent::kind; + track_intent intent; + if (ImGui::GetIO().WantCaptureMouse) + return intent; + glm::dvec3 const ground{cursor_ground()}; + intent.position = ground; + bool const shift{(Mods & GLFW_MOD_SHIFT) != 0}; + bool const control{(Mods & GLFW_MOD_CONTROL) != 0}; + bool const alt{(Mods & GLFW_MOD_ALT) != 0}; + auto const make = [&](kind const What, char const *Action) { + intent.what = What; + intent.action = Action != nullptr ? STR(Action) : std::string{}; + return intent; + }; + auto *selected{selected_track()}; + + if (m_lay.active) + { + auto const &lay{m_lay}; + if (lay.mouse_snap.track != nullptr && (lay.points.empty() || glm::distance(lay.mouse_snap.position, lay.points.front()) > 1.0)) + { + intent.snap = lay.mouse_snap; + intent.track = lay.mouse_snap.track; + intent.position = lay.mouse_snap.position; + auto const diverging{lay.mouse_snap.track->eType == tt_Switch && lay.mouse_snap.point == editor_track::point_ref{1, editor_track::point_kind::end}}; + if (lay.points.empty() && diverging) + return make(kind::lay_end, "Click: start from this free end, drag: the curve of the switch goes on, Shift: straight"); + return make(kind::lay_end, lay.points.empty() ? "Click: start from this free end, drag: lead a track out of it" : "Click: join this end and lay"); + } + intent.position = lay.mouse; + return make(kind::lay, lay.points.empty() ? "Click: start of the new track" : "Click: next point"); + } + if (m_track_tab == track_tab::turntable) + return turntable_intent(ground, shift); + if (m_track_tab == track_tab::lineside && sweep_grabs(ground)) + return make(kind::sweep, "Press: where the model starts, drag to its end"); + if (m_track_tab == track_tab::path) + { + if (shift && control && m_hover.track != nullptr && rail(*m_hover.track)) + { + intent.track = m_hover.track; + intent.position = m_hover.point; + auto const &preview{track_spread_preview(*m_hover.track)}; + intent.action = format(in_track_set(m_hover.track) ? STR_C("Click: take out the %zu joined paths, %.0f m") : STR_C("Click: add the %zu joined paths, %.0f m"), preview.size(), m_spread.length); + intent.what = kind::spread; + return intent; + } + if (shift && false == gizmo_frame::over()) + { + intent.track = m_hover.track; + return make(kind::box, m_hover.track == nullptr ? "Drag: the tracks in a box join the selection" : in_track_set(m_hover.track) ? "Click: take out of the selection, drag: a box" : "Click: add to the selection, drag: a box"); + } + if (auto const hit{track_handle_hit()}; hit.valid() && selected != nullptr) + { + std::string reason; + if (editor_track::can_edit_geometry(*selected, reason)) + { + intent.track = selected; + intent.point = hit; + intent.position = editor_track::point_position(*selected, hit); + if (false == editor_track::is_end(hit.kind)) + return make(kind::point, "Drag: the control vector, the curve follows"); + if (editor_track::is_connected(*selected, hit)) + return make(kind::point, "Drag: the joint, the neighbours follow"); + if (control) + return make(kind::point, "Drag: the end, dropped on a free end it joins it"); + intent.snap.track = selected; + intent.snap.point = hit; + intent.snap.position = intent.position; + auto const diverging{selected->eType == tt_Switch && hit == editor_track::point_ref{1, editor_track::point_kind::end}}; + return make(kind::extend_end, diverging ? "Drag: the curve of the switch goes on, Shift: straight; Ctrl+drag: move the end" : "Drag: a new track out of this end, as in laying; Ctrl+drag: move the end"); + } + } + } + if (m_track_tab == track_tab::straights) + { + auto const &line{current_straight()}; + if (alt) + { + intent.track = m_hover.track; + return m_hover.track != nullptr ? make(kind::straight_set, "Click: move this straight together with the others") : intent; + } + if (control && false == line.tracks.empty()) + return make(kind::straight_break, "Press: break the straight here, drag to turn the rest"); + if (shift && false == line.tracks.empty()) + return make(kind::detour, "Click: next point of the shift around an obstacle"); + } + if (m_track_tab == track_tab::straights && m_straights.tool == 0) + { + if (auto const hit{straight_handle_hit()}; hit >= 0) + { + auto const &line{current_straight()}; + glm::dvec3 const handles[] = {line.start, line.end, (line.start + line.end) * 0.5}; + intent.index = hit; + intent.position = handles[hit]; + return make(kind::straight_handle, hit == 2 ? "Drag: shift the straight sideways" : "Drag: move this end, the curves at it follow"); + } + } + if (int vertex, grip; route_hit(vertex, grip)) + { + intent.index = vertex >= 0 ? vertex : grip; + intent.position = vertex >= 0 ? route_vertex_position(vertex) : alignment::evaluate(m_route.result, m_route.result.vertex_chainages[grip]).position; + return make(vertex >= 0 ? kind::route_vertex : kind::route_grip, vertex >= 0 ? "Drag: move this vertex, the curve follows" : "Drag: the radius of this curve"); + } + if (gizmo_frame::over()) + return make(kind::gizmo, nullptr); + if (m_track_tab == track_tab::straights) + { + auto const &line{current_straight()}; + if (m_straights.tool != 0 && false == line.tracks.empty()) + { + intent.position = line.start + glm::dvec3{line.direction.x, line.grade, line.direction.y} * std::clamp(line.along(ground), 0.0, line.length); + return make(kind::straight_tool, m_straights.tool == 1 ? "Click: break the straight here" : "Click: start of the shift"); + } + } + if (selected != nullptr && false == selected->m_paths.empty()) + { + glm::dvec3 point; + if (switch_reach(cursor_level(selected->m_paths.front().points[segment_data::point::start].y), point)) + { + intent.track = selected; + intent.position = point; + return make(kind::switch_at, "Press and drag: a switch here, along sets its direction, sideways its side"); + } + } + if (m_hover.track != nullptr) + { + intent.track = m_hover.track; + intent.path = m_hover.path; + intent.position = m_hover.point; + switch (m_track_tab) + { + case track_tab::straights: return make(kind::select, "Click: the whole straight through this track"); + case track_tab::route: return make(kind::select, "Click: the curve of this track with its straights"); + case track_tab::turnout: return make(kind::select, m_hover.track->eType == tt_Switch ? "Click: edit this switch" : m_switch.armed < 0 ? "Click: choose this track, then the type of the switch" : "Click: put a switch into this track"); + case track_tab::profile: return make(kind::select, "Click: the grade line through this track"); + case track_tab::lineside: return make(kind::select, "Click: the line the objects go along"); + default: return make(kind::select, "Click: select"); + } + } + return intent; +} + +void editor_mode::update_track_intent() +{ + using kind = track_intent::kind; + if (track_gesture_on()) + { + m_intent = {}; + return; + } + auto const &io{ImGui::GetIO()}; + m_intent = track_intent_at((io.KeyShift ? GLFW_MOD_SHIFT : 0) | (io.KeyCtrl ? GLFW_MOD_CONTROL : 0) | (io.KeyAlt ? GLFW_MOD_ALT : 0)); + switch (m_intent.what) + { + case kind::none: + case kind::gizmo: break; + case kind::point: + case kind::straight_handle: + case kind::route_vertex: + case kind::route_grip: ImGui::SetMouseCursor(ImGuiMouseCursor_ResizeAll); break; + default: ImGui::SetMouseCursor(ImGuiMouseCursor_Hand); break; + } +} + +void editor_mode::track_press(track_intent const &Intent) +{ + using kind = track_intent::kind; + switch (Intent.what) + { + case kind::lay_end: + if (m_lay.points.empty() && start_extend(Intent.snap)) + return; + [[fallthrough]]; + case kind::lay: + GfxRenderer->Pick_Node_Callback([this](scene::basic_node * /*node*/) { + if (viewport_click()) + lay_click(); + }); + return; + case kind::sweep: sweep_press(); return; + case kind::box: start_track_box(); return; + case kind::spread: + if (Intent.track != nullptr) + track_spread_apply(*Intent.track); + return; + case kind::point: point_drag_start(Intent.point); return; + case kind::gizmo: return; + case kind::straight_set: + { + auto *hovered{Intent.track}; + GfxRenderer->Pick_Node_Callback([this, hovered](scene::basic_node *node) { + auto *track{hovered != nullptr ? hovered : dynamic_cast(node)}; + if (viewport_click() && track != nullptr) + toggle_straight_set(*track); + }); + return; + } + case kind::straight_break: start_straight_gesture(1); return; + case kind::detour: add_detour_point(); return; + case kind::straight_tool: place_straight_tool(); return; + case kind::straight_handle: + m_straights.handle = Intent.index; + handle_drag_start(Intent.position); + return; + case kind::route_vertex: + m_route.vertex = Intent.index; + m_route.grip = -1; + handle_drag_start(Intent.position); + return; + case kind::route_grip: + m_route.vertex = -1; + m_route.grip = Intent.index; + handle_drag_start(Intent.position); + return; + case kind::switch_at: start_switch_placement(); return; + case kind::extend_end: + if (false == start_extend(Intent.snap)) + point_drag_start(Intent.snap.point); + return; + case kind::turntable_place: + case kind::turntable_exit: + case kind::turntable_fit: turntable_press(Intent); return; + case kind::select: + case kind::none: + { + auto *hovered{Intent.track}; + GfxRenderer->Pick_Node_Callback([this, hovered](scene::basic_node *node) { + if (false == viewport_click()) + return; + auto *track{hovered != nullptr ? hovered : dynamic_cast(node)}; + if (m_track_tab == track_tab::path) + { + m_track_set.clear(); + if (track == nullptr) + { + m_node = nullptr; + m_track_point = {}; + ui()->set_node(nullptr); + return; + } + } + select_track(track != nullptr ? track : node); + }); + return; + } + } +} + +void editor_mode::draw_track_intent() const +{ + using kind = track_intent::kind; + auto const &intent{m_intent}; + auto const &io{ImGui::GetIO()}; + if (intent.what == kind::none || intent.what == kind::gizmo || io.WantCaptureMouse) + return; + screen_projection const projection; + auto *drawlist{ImGui::GetBackgroundDrawList()}; + ImVec2 at; + if (projection.project(intent.position, at)) + { + switch (intent.what) + { + case kind::point: + case kind::straight_handle: + case kind::route_vertex: + case kind::route_grip: drawlist->AddCircle(at, 13.0f, overlay_color::marked, 24, 2.5f); break; + case kind::switch_at: + case kind::straight_tool: + drawlist->AddCircleFilled(at, 4.0f, overlay_color::grip); + drawlist->AddCircle(at, 11.0f, overlay_color::grip, 20, 2.0f); + break; + case kind::lay_end: + case kind::extend_end: + case kind::turntable_fit: drawlist->AddCircleFilled(at, 5.0f, IM_COL32(255, 60, 255, 255)); break; + case kind::turntable_exit: drawlist->AddCircle(at, 11.0f, overlay_color::grip, 20, 2.0f); break; + case kind::lay: drawlist->AddCircle(at, 6.0f, IM_COL32(255, 255, 255, 200), 12, 1.5f); break; + default: break; + } + } + if (intent.action.empty() || false == track_readout().empty()) + return; + std::string details; + auto const *track{m_hover.track}; + if (intent.what == kind::select && track != nullptr && track == intent.track && ImGui::GetTime() - m_hover.since >= kHoverLabelDelay) + { + auto const &path{track->m_paths[std::min(m_hover.path, track->m_paths.size() - 1)]}; + details = name_of(*track); + details += "\n" + std::string{STR_C(type_of(*track))}; + if (track->eType == tt_Switch) + details += m_hover.path == 0 ? STR(" (main)") : STR(" (branch)"); + details += format(" L %.1f m", bezier{path}.plan_length()); + details += path.radius != 0.0f ? format(" R %.0f m", std::abs(path.radius)) : std::string{" "} + STR_C("straight"); + auto const velocity{editor_track::velocity(*track)}; + details += velocity > 0.0 ? format(" V %.0f km/h", velocity) : std::string{}; + } + auto *foreground{ImGui::GetForegroundDrawList()}; + auto const actionsize{ImGui::CalcTextSize(intent.action.c_str())}; + auto const detailsize{details.empty() ? ImVec2(0.0f, 0.0f) : ImGui::CalcTextSize(details.c_str())}; + ImVec2 const size{std::max(actionsize.x, detailsize.x), actionsize.y + (details.empty() ? 0.0f : detailsize.y + 4.0f)}; + ImVec2 position{io.MousePos.x + 18.0f, io.MousePos.y + 18.0f}; + position.x = std::min(position.x, io.DisplaySize.x - size.x - 10.0f); + position.y = std::min(position.y, io.DisplaySize.y - size.y - 10.0f); + foreground->AddRectFilled(ImVec2(position.x - 6.0f, position.y - 4.0f), ImVec2(position.x + size.x + 6.0f, position.y + size.y + 4.0f), IM_COL32(0, 0, 0, 170), 4.0f); + foreground->AddText(position, overlay_color::marked, intent.action.c_str()); + if (false == details.empty()) + foreground->AddText(ImVec2(position.x, position.y + actionsize.y + 4.0f), IM_COL32(255, 255, 255, 235), details.c_str()); +} + +void editor_mode::track_context_press() +{ + auto &context{m_track_context}; + auto const &io{ImGui::GetIO()}; + context.armed = m_hover.track != nullptr; + context.target = m_hover; + context.pressed = std::chrono::steady_clock::now(); + context.angle = Camera.Angle; + context.mouse = {io.MousePos.x, io.MousePos.y}; +} + +void editor_mode::track_context_release() +{ + auto &context{m_track_context}; + if (false == context.armed) + return; + context.armed = false; + if (std::chrono::steady_clock::now() - context.pressed < kContextClick && glm::length(Camera.Angle - context.angle) < kContextTurn) + context.pending = true; +} + +void editor_mode::split_track_at(TTrack &Track, glm::dvec3 const &Point) +{ + auto const parameter{editor_track::nearest_parameter(Track, Point)}; + auto const before{editor_track::capture(Track)}; + if (auto *created{editor_track::split_path(Track, parameter)}) + { + push_track_snapshot({{&Track, before}}, {created}); + straight_refresh(); + } +} + +void editor_mode::focus_track(TTrack &Track, int const Path, glm::dvec3 const &Point) +{ + auto const &path{Track.m_paths[std::min(std::max(Path, 0), Track.m_paths.size() - 1)]}; + bezier const curve{path}; + glm::dvec3 look{curve.first(std::clamp(editor_track::nearest_parameter(Track, Point), 0.0, 1.0))}; + look.y = 0.0; + look = glm::length(look) > 1e-6 ? glm::normalize(look) : glm::dvec3(0.0, 0.0, 1.0); + if (glm::dot(Camera.Pos - Point, look) > 0.0) + look = -look; + look = glm::normalize(look - glm::dvec3(0.0, 0.25, 0.0)); + m_focus_start_pos = Camera.Pos; + m_focus_start_angle = Camera.Angle; + m_focus_target_pos = Point - look * kFocusDistance; + m_focus_target_angle = glm::vec3(static_cast(std::asin(std::clamp(look.y, -1.0, 1.0))), static_cast(std::atan2(-look.x, -look.z)), 0.0f); + m_focus_active = true; + m_focus_time = 0.0; + m_focus_duration = 0.6; +} + +void editor_mode::render_track_context() +{ + auto &context{m_track_context}; + auto *track{context.target.track}; + if (context.pending) + { + context.pending = false; + if (track != nullptr && false == track->m_editorremoved) + { + select_track(track); + ImGui::OpenPopup("##trackcontext"); + ImGui::SetNextWindowPos(ImVec2(context.mouse.x, context.mouse.y)); + } + } + if (false == ImGui::BeginPopup("##trackcontext")) + return; + if (track == nullptr || track->m_editorremoved) + { + ImGui::CloseCurrentPopup(); + ImGui::EndPopup(); + return; + } + auto const point{context.target.point}; + bool const normal{track->eType == tt_Normal && editor_track::is_supported(*track)}; + ImGui::TextDisabled("%s (%s, %.1f m)", name_of(*track).c_str(), STR_C(type_of(*track)), track->Length()); + ImGui::Separator(); + if (ImGui::MenuItem(STR_C("Split here"), "K", false, normal)) + split_track_at(*track, point); + ImGui::Separator(); + if (ImGui::MenuItem(STR_C("Switch"), "T", false, normal || track->eType == tt_Switch)) + show_track_tab(track_tab::turnout); + if (ImGui::MenuItem(STR_C("Whole straight"), "G", false, normal && editor_track::is_straight(*track, m_straights.tolerance))) + show_track_tab(track_tab::straights); + if (ImGui::MenuItem(STR_C("Curve"), "C", false, normal)) + show_track_tab(track_tab::route); + if (ImGui::MenuItem(STR_C("Parallel track"), nullptr, false, normal)) + { + show_track_tab(track_tab::lineside); + m_parallel.expand = true; + } + if (ImGui::MenuItem(STR_C("Model along the track"))) + { + show_track_tab(track_tab::lineside); + m_sweep.expand = true; + } + if (ImGui::MenuItem(STR_C("Place a vehicle here"))) + { + show_track_tab(track_tab::lineside); + vehicle_start(*track, point); + } + if (ImGui::MenuItem(STR_C("Hectometre posts from here"))) + { + show_track_tab(track_tab::lineside); + hekto_start(*track, point); + } + if (ImGui::MenuItem(STR_C("Fouling point markers"), nullptr, false, track->eType == tt_Switch)) + { + show_track_tab(track_tab::lineside); + m_fouling.scope = 0; + m_fouling.dirty = true; + m_fouling.expand = true; + } + if (ImGui::MenuItem(STR_C("Vertical profile of the line"), "P")) + { + show_track_tab(track_tab::profile); + profile_open_run(*track); + } + if (ImGui::MenuItem(STR_C("Speed check of the line"), "V")) + { + m_speed.scope = 0; + show_track_tab(track_tab::speed); + speed_start(); + } + ImGui::Separator(); + if (ImGui::MenuItem(in_track_set(track) ? STR_C("Take out of the selection") : STR_C("Add to the selection"), "Shift+LMB")) + track_set_toggle(*track); + if (ImGui::MenuItem(STR_C("Look at it"))) + focus_track(*track, context.target.path, point); + if (ImGui::MenuItem(STR_C("Copy the name"), nullptr, false, false == track->name().empty())) + ImGui::SetClipboardText(track->name().c_str()); + ImGui::Separator(); + if (ImGui::MenuItem(STR_C("Delete"), "Del")) + delete_selected_track(); + ImGui::EndPopup(); +} + +void editor_mode::render_track_search() +{ + auto &search{m_track_search}; + if (search.focus) + { + ImGui::SetKeyboardFocusHere(); + search.focus = false; + } + ImGui::SetNextItemWidth(-1.0f); + ImGui::InputTextWithHint("##findtrack", STR_C("Find a track by its name (Ctrl+F)"), search.text, sizeof(search.text)); + std::string const text{lower(search.text)}; + if (text.empty()) + { + search.searched.clear(); + search.found.clear(); + return; + } + if (text != search.searched) + { + search.searched = text; + search.found.clear(); + search.total = 0; + for (auto *track : simulation::Paths.sequence()) + { + if (track == nullptr || false == rail(*track) || lower(track->name()).find(text) == std::string::npos) + continue; + ++search.total; + if (search.found.size() < kSearchLimit) + search.found.push_back(track); + } + } + if (search.found.empty()) + { + ImGui::TextDisabled("%s", STR_C("No track of that name")); + return; + } + if (search.total > search.found.size()) + ImGui::TextDisabled(STR_C("%zu found, the first %zu listed"), search.total, search.found.size()); + auto const rows{std::min(search.found.size(), 8)}; + ImGui::BeginChild("##foundtracks", ImVec2(0.0f, ImGui::GetTextLineHeightWithSpacing() * static_cast(rows) + 6.0f), true); + for (std::size_t i = 0; i < search.found.size(); ++i) + { + auto *track{search.found[i]}; + if (track->m_editorremoved) + continue; + auto const label{format("%s##found%zu", name_of(*track).c_str(), i)}; + if (ImGui::Selectable(label.c_str(), track == selected_track())) + { + m_node = track; + m_track_point = {}; + ui()->set_node(m_node); + focus_track(*track, 0, bezier{track->m_paths.front()}.point(0.5)); + } + ImGui::SameLine(ImGui::GetWindowContentRegionMax().x * 0.6f); + ImGui::TextDisabled("%s, %.1f m", STR_C(type_of(*track)), track->Length()); + } + ImGui::EndChild(); +} + +char const *editor_mode::typed_meaning() const +{ + auto const &straights{m_straights}; + if (m_extend.active) + return m_extend_freehand && false == ImGui::GetIO().KeyCtrl ? "type the radius, a space, the length" : "type the length"; + if (straights.dragging) + return straights.handle == 2 ? "type the shift, + to the right" : "type the length"; + if (straights.tool == 1 && (straights.tool_mouse || straights.tool_dragging)) + return "type the turn in degrees, + to the right"; + if (m_lay.active && false == m_lay.points.empty()) + return "type the length of the next leg, Enter adds the point"; + return nullptr; +} + +std::vector editor_mode::typed_values() const +{ + std::vector values; + std::string text{m_typed}; + std::replace(text.begin(), text.end(), ',', '.'); + std::size_t at{0}; + while (at < text.size()) + { + auto const end{text.find(' ', at)}; + auto const word{text.substr(at, end == std::string::npos ? std::string::npos : end - at)}; + if (false == word.empty() && word != "-" && word != ".") + values.push_back(std::strtod(word.c_str(), nullptr)); + if (end == std::string::npos) + break; + at = end + 1; + } + return values; +} + +bool editor_mode::typed_key(int const Key) +{ + if (typed_meaning() == nullptr) + { + m_typed.clear(); + return false; + } + char character{'\0'}; + if (Key >= GLFW_KEY_0 && Key <= GLFW_KEY_9) + character = static_cast('0' + (Key - GLFW_KEY_0)); + else if (Key >= GLFW_KEY_KP_0 && Key <= GLFW_KEY_KP_9) + character = static_cast('0' + (Key - GLFW_KEY_KP_0)); + else if (Key == GLFW_KEY_PERIOD || Key == GLFW_KEY_COMMA || Key == GLFW_KEY_KP_DECIMAL) + character = '.'; + else if (Key == GLFW_KEY_MINUS || Key == GLFW_KEY_KP_SUBTRACT) + character = '-'; + else if (Key == GLFW_KEY_SPACE) + character = ' '; + else if (Key == GLFW_KEY_BACKSPACE && false == m_typed.empty()) + { + m_typed.pop_back(); + return true; + } + else + return false; + auto const start{m_typed.empty() || m_typed.back() == ' '}; + if ((character == '-' && false == start) || (character == ' ' && start) || (character == '.' && m_typed.substr(m_typed.rfind(' ') == std::string::npos ? 0 : m_typed.rfind(' ')).find('.') != std::string::npos)) + return true; + if (m_typed.size() < 24) + m_typed += character; + return true; +} + +void editor_mode::typed_extend() +{ + auto const values{typed_values()}; + if (values.empty()) + return; + auto &tool{m_extend}; + auto const &direction{tool.direction}; + if (false == m_extend_freehand || ImGui::GetIO().KeyCtrl) + { + auto const length{std::max(0.0, values[0])}; + tool.mouse = {tool.point.x + direction.x * length, tool.mouse.y, tool.point.z + direction.y * length}; + return; + } + auto const radius{std::abs(values[0])}; + if (radius < 1.0) + return; + glm::dvec2 const offset{tool.mouse.x - tool.point.x, tool.mouse.z - tool.point.z}; + double const side{geometry::cross(direction, offset) >= 0.0 ? 1.0 : -1.0}; + glm::dvec2 const point{tool.point.x, tool.point.z}; + glm::dvec2 const centre{point + glm::dvec2{-direction.y, direction.x} * (side * radius)}; + auto const radial{point - centre}; + auto angle{values.size() > 1 ? std::abs(values[1]) / radius : side * geometry::signed_angle(radial, glm::dvec2{tool.mouse.x, tool.mouse.z} - centre)}; + if (angle < 0.0) + angle += 2.0 * glm::pi(); + angle = std::clamp(angle, 1e-3, 2.0 * glm::pi() - 0.1); + auto const end{centre + geometry::turned(radial, side * angle)}; + tool.mouse = {end.x, tool.mouse.y, end.y}; +} + +glm::dvec3 editor_mode::typed_lay(glm::dvec3 const &Mouse) const +{ + auto const values{typed_values()}; + if (values.empty() || m_lay.points.empty() || values[0] <= 0.0) + return Mouse; + auto const &last{m_lay.points.back()}; + glm::dvec2 heading{Mouse.x - last.x, Mouse.z - last.z}; + if (glm::length(heading) < 1e-6) + return Mouse; + heading = glm::normalize(heading) * values[0]; + return {last.x + heading.x, Mouse.y, last.z + heading.y}; +} + +void editor_mode::typed_turn() +{ + auto &state{m_straights}; + auto const values{typed_values()}; + if (values.empty() || state.tool != 1) + return; + auto const reach{std::max(1.0, glm::length(glm::dvec2{state.tool_handle.x - state.tool_point.x, state.tool_handle.z - state.tool_point.z}))}; + auto const heading{geometry::turned(state.tool_line.direction, glm::radians(values[0])) * reach}; + state.tool_handle = {state.tool_point.x + heading.x, state.tool_handle.y, state.tool_point.z + heading.y}; +} + +bool editor_mode::in_track_set(TTrack const *Track) const +{ + return std::find(m_track_set.begin(), m_track_set.end(), Track) != m_track_set.end(); +} + +void editor_mode::track_set_prune() +{ + m_track_set.erase(std::remove_if(m_track_set.begin(), m_track_set.end(), [](TTrack const *Track) { return Track == nullptr || Track->m_editorremoved; }), m_track_set.end()); +} + +void editor_mode::track_set_toggle(TTrack &Track) +{ + track_set_prune(); + if (m_track_set.empty()) + if (auto *selected{selected_track()}; selected != nullptr && selected != &Track) + m_track_set.push_back(selected); + if (auto const found{std::find(m_track_set.begin(), m_track_set.end(), &Track)}; found != m_track_set.end()) + m_track_set.erase(found); + else + m_track_set.push_back(&Track); + m_node = m_track_set.empty() ? nullptr : m_track_set.back(); + m_track_point = {}; + ui()->set_node(m_node); +} + +void editor_mode::start_track_box() +{ + auto const &io{ImGui::GetIO()}; + m_track_box.active = true; + m_track_box.from = m_track_box.to = {io.MousePos.x, io.MousePos.y}; + m_track_box.hovered = m_hover.track; +} + +void editor_mode::finish_track_box() +{ + auto &box{m_track_box}; + if (false == box.active) + return; + box.active = false; + auto const &io{ImGui::GetIO()}; + box.to = {io.MousePos.x, io.MousePos.y}; + if (glm::length(box.to - box.from) < 6.0f) + { + if (box.hovered != nullptr && false == box.hovered->m_editorremoved) + track_set_toggle(*box.hovered); + return; + } + glm::vec2 const low{std::min(box.from.x, box.to.x), std::min(box.from.y, box.to.y)}; + glm::vec2 const high{std::max(box.from.x, box.to.x), std::max(box.from.y, box.to.y)}; + screen_projection const projection; + glm::dvec3 const camera{Global.pCamera.Pos}; + track_set_prune(); + if (m_track_set.empty()) + if (auto *selected{selected_track()}; selected != nullptr) + m_track_set.push_back(selected); + for (auto *track : simulation::Paths.sequence()) + { + if (track == nullptr || false == rail(*track) || in_track_set(track) || glm::distance(track->location(), camera) > static_cast(Global.BaseDrawRange)) + continue; + bool inside{false}; + for (auto const &path : track->m_paths) + { + bezier const curve{path}; + for (int k = 0; k <= 8 && false == inside; ++k) + { + ImVec2 screen; + if (projection.project(curve.point(k / 8.0), screen)) + inside = screen.x >= low.x && screen.x <= high.x && screen.y >= low.y && screen.y <= high.y; + } + if (inside) + break; + } + if (inside) + m_track_set.push_back(track); + } + if (false == m_track_set.empty()) + { + m_node = m_track_set.back(); + m_track_point = {}; + ui()->set_node(m_node); + } +} + +std::vector editor_mode::track_spread_from(TTrack &Start) const +{ + auto const &rules{m_spread}; + auto const bed = [](TTrack const &Track) { return Track.eType == tt_Switch ? (Track.SwitchExtension ? Track.SwitchExtension->m_material3 : null_handle) : Track.m_material2; }; + auto const startspeed{editor_track::velocity(Start)}; + auto const alike = [&](TTrack const &Track) { + if (rules.same_rails && Track.m_material1 != Start.m_material1) + return false; + if (rules.same_bed && bed(Track) != bed(Start)) + return false; + if (rules.same_speed && std::abs(editor_track::velocity(Track) - startspeed) > 0.5) + return false; + return true; + }; + auto const exits = [&](TTrack const &Track) { + std::vector result; + if (Track.m_paths.empty()) + return result; + auto const &main{Track.m_paths.front()}; + result = {main.points[segment_data::point::start], main.points[segment_data::point::end]}; + if (Track.eType == tt_Switch && rules.stop == 2) + for (std::size_t i = 1; i < Track.m_paths.size(); ++i) + result.push_back(Track.m_paths[i].points[segment_data::point::end]); + return result; + }; + std::size_t constexpr limit{20000}; + std::vector result; + std::unordered_map reached{{&Start, 0.0}}; + std::unordered_set done; + using entry = std::pair; + std::priority_queue, std::greater> queue; + queue.push({0.0, &Start}); + while (false == queue.empty() && result.size() < limit) + { + auto const [distance, track] = queue.top(); + queue.pop(); + if (false == done.insert(track).second) + continue; + result.push_back(track); + auto const further{distance + track->Length()}; + if (rules.reach > 0.f && further > static_cast(rules.reach)) + continue; + for (auto const &end : exits(*track)) + for (auto const &[other, point] : editor_track::connected_points(*track, end)) + { + if (other == nullptr || done.count(other) > 0 || false == rail(*other) || other->eType == tt_Table || false == alike(*other)) + continue; + if (other->eType == tt_Switch && (rules.stop == 0 || (rules.stop == 1 && point.path != 0))) + continue; + auto const known{reached.find(other)}; + if (known != reached.end() && known->second <= further) + continue; + reached[other] = further; + queue.push({further, other}); + } + } + return result; +} + +std::vector const &editor_mode::track_spread_preview(TTrack &Start) const +{ + auto &spread{m_spread}; + auto const signature{spread.stop | (spread.same_rails ? 4 : 0) | (spread.same_bed ? 8 : 0) | (spread.same_speed ? 16 : 0) | (static_cast(spread.reach) << 5)}; + if (spread.from != &Start || spread.signature != signature) + { + spread.from = &Start; + spread.signature = signature; + spread.preview = track_spread_from(Start); + spread.length = 0.0; + for (auto const *track : spread.preview) + spread.length += track->Length(); + } + return spread.preview; +} + +void editor_mode::track_spread_apply(TTrack &Start) +{ + track_set_prune(); + if (m_track_set.empty()) + if (auto *selected{selected_track()}; selected != nullptr && selected != &Start) + m_track_set.push_back(selected); + auto const taken{track_spread_from(Start)}; + if (in_track_set(&Start)) + { + std::unordered_set const out(taken.begin(), taken.end()); + m_track_set.erase(std::remove_if(m_track_set.begin(), m_track_set.end(), [&](TTrack const *Track) { return out.count(Track) > 0; }), m_track_set.end()); + } + else + for (auto *track : taken) + if (false == in_track_set(track)) + m_track_set.push_back(track); + m_spread.from = nullptr; + m_node = m_track_set.empty() ? nullptr : m_track_set.back(); + m_track_point = {}; + ui()->set_node(m_node); +} + +void editor_mode::track_set_grow() +{ + track_set_prune(); + auto const reach{m_spread.reach}; + std::vector added; + for (auto *track : m_track_set) + { + m_spread.reach = std::max(0.01f, static_cast(track->Length()) - 0.01f); + for (auto *other : track_spread_from(*track)) + if (false == in_track_set(other) && std::find(added.begin(), added.end(), other) == added.end()) + added.push_back(other); + } + m_spread.reach = reach; + m_spread.from = nullptr; + m_track_set.insert(m_track_set.end(), added.begin(), added.end()); +} + +void editor_mode::render_track_spread_ui() +{ + auto &spread{m_spread}; + if (false == ImGui::CollapsingHeader(STR_C("Spread along the joins: Ctrl+Shift+LMB on a path"))) + return; + char const *const stops[] = {STR_C("Stop before the switches"), STR_C("Through the switches, along their main track"), STR_C("Through everything joined")}; + for (int i = 0; i < IM_ARRAYSIZE(stops); ++i) + ImGui::RadioButton(stops[i], &spread.stop, i); + ImGui::TextUnformatted(STR_C("Only to the paths like the clicked one:")); + ImGui::SameLine(); + ImGui::Checkbox(STR_C("rails"), &spread.same_rails); + ImGui::SameLine(); + ImGui::Checkbox(STR_C("trackbed"), &spread.same_bed); + ImGui::SameLine(); + ImGui::Checkbox(STR_C("speed"), &spread.same_speed); + ImGui::SetNextItemWidth(110.f); + ImGui::InputFloat(STR_C("Reach along the track, m (0: no limit)"), &spread.reach, 50.f, 500.f, "%.0f"); + spread.reach = std::clamp(spread.reach, 0.f, 100000.f); + ImGui::TextDisabled("%s", STR_C("Holding Ctrl+Shift shows what the click takes; on a path of the set it takes them out")); +} + +void editor_mode::draw_track_spread() const +{ + if (m_intent.what != track_intent::kind::spread || m_spread.from == nullptr) + return; + screen_projection const projection; + auto *drawlist{ImGui::GetBackgroundDrawList()}; + auto const removing{in_track_set(m_spread.from)}; + auto const colour{removing ? IM_COL32(255, 90, 70, 220) : IM_COL32(90, 220, 255, 220)}; + for (auto const *track : m_spread.preview) + { + if (track->m_editorremoved) + continue; + for (auto const &path : track->m_paths) + { + bezier const curve{path}; + auto const count{std::clamp(static_cast(curve.plan_length() / 4.0), 4, 48)}; + auto previous{curve.point(0.0)}; + for (int k = 1; k <= count; ++k) + { + auto const next{curve.point(static_cast(k) / count)}; + projection.line(drawlist, previous, next, colour, 2.5f); + previous = next; + } + } + } +} + +void editor_mode::draw_track_set() const +{ + screen_projection const projection; + auto *drawlist{ImGui::GetBackgroundDrawList()}; + if (m_track_box.active) + { + auto const &io{ImGui::GetIO()}; + ImVec2 const from{m_track_box.from.x, m_track_box.from.y}; + drawlist->AddRectFilled(from, io.MousePos, IM_COL32(255, 160, 40, 40)); + drawlist->AddRect(from, io.MousePos, IM_COL32(255, 160, 40, 220), 0.0f, 0, 1.5f); + } + if (m_track_set.size() < 2) + return; + for (auto const *track : m_track_set) + { + if (track->m_editorremoved) + continue; + for (auto const &path : track->m_paths) + { + bezier const curve{path}; + auto const count{std::clamp(static_cast(curve.plan_length() / 3.0), 6, 64)}; + auto previous{curve.point(0.0)}; + for (int k = 1; k <= count; ++k) + { + auto const next{curve.point(static_cast(k) / count)}; + projection.line(drawlist, previous, next, IM_COL32(255, 160, 40, 230), 3.0f); + previous = next; + } + } + } +} + +void editor_mode::track_set_apply(std::function const &Change, bool const Rebuild, char const *What) +{ + track_set_prune(); + std::vector> states; + std::vector changed; + std::size_t locked{0}; + for (auto *track : m_track_set) + { + if (false == scene::Layers.editable(track)) + { + ++locked; + continue; + } + auto const before{editor_track::capture(*track)}; + if (false == Change(*track)) + continue; + states.emplace_back(track, before); + changed.push_back(track); + } + if (changed.empty()) + return; + push_track_snapshot(std::move(states)); + for (auto *track : changed) + { + if (Rebuild) + editor_track::commit_parameters(*track); + else + track->mark_dirty(); + } + auto status{format(STR_C("%s set on %zu paths, Ctrl+Z takes it back"), STR_C(What), changed.size())}; + if (locked > 0) + status += format(STR_C(", %zu in the files which can't be changed are left as they are"), locked); + ui()->set_status(status, false); +} + +void editor_mode::track_set_delete() +{ + track_set_prune(); + std::vector removed; + std::size_t kept{0}; + for (auto *track : m_track_set) + { + if (false == track->Dynamics.empty() || false == scene::Layers.editable(track)) + { + ++kept; + continue; + } + editor_track::retire(*track); + removed.push_back(track); + if (std::find(m_route.chain.tracks.begin(), m_route.chain.tracks.end(), track) != m_route.chain.tracks.end()) + m_route = {}; + } + push_track_snapshot({}, {}, removed); + m_track_set.clear(); + m_node = nullptr; + ui()->set_node(nullptr); + m_track_point = {}; + straight_refresh(); + auto status{format(STR_C("%zu paths deleted, Ctrl+Z brings them back"), removed.size())}; + if (kept > 0) + status += format(STR_C(", %zu with vehicles on them or in the files which can't be changed are left"), kept); + ui()->set_status(status, false); +} + +void editor_mode::render_track_set_ui() +{ + track_set_prune(); + if (m_track_set.size() < 2) + return; + auto &fields{m_track_set_fields}; + double length{0.0}; + for (auto const *track : m_track_set) + length += track->Length(); + ImGui::TextColored(ImVec4(1.0f, 0.65f, 0.2f, 1.0f), STR_C("%zu paths selected, %.1f m"), m_track_set.size(), length); + ImGui::SameLine(); + if (ImGui::SmallButton(STR_C("Clear"))) + { + m_track_set.clear(); + return; + } + ImGui::TextDisabled("%s", STR_C("The gizmo moves them together; Shift+LMB adds or takes out a path")); + if (ImGui::SmallButton(STR_C("Grow by the neighbours"))) + track_set_grow(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Adds the paths joined to the set, by the rules of the spread")); + auto const button_width{90.0f}; + ImGui::PushItemWidth(-button_width - ImGui::GetStyle().ItemSpacing.x); + ImGui::InputDouble("##setvelocity", &fields.velocity, 0.0, 0.0, "%.0f"); + ImGui::SameLine(); + if (ImGui::Button(format("%s##setv", STR_C("Velocity")).c_str(), ImVec2(button_width, 0.0f))) + { + auto const velocity{fields.velocity}; + track_set_apply([velocity](TTrack &Track) { editor_track::velocity(Track, velocity); return true; }, false, "Velocity"); + } + ImGui::InputTextWithHint("##setrail", STR_C("texture of the rails"), fields.rail, sizeof(fields.rail)); + ImGui::SameLine(); + if (ImGui::Button(format("%s##setr", STR_C("Rails")).c_str(), ImVec2(button_width, 0.0f)) && fields.rail[0] != '\0') + { + auto const material{editor_track::fetch_material(fields.rail)}; + track_set_apply([material](TTrack &Track) { + Track.m_material1 = material; + if (Track.eType == tt_Switch) + Track.m_material2 = material; + return true; + }, true, "Rails"); + } + ImGui::InputTextWithHint("##settrackbed", STR_C("texture of the trackbed"), fields.trackbed, sizeof(fields.trackbed)); + ImGui::SameLine(); + if (ImGui::Button(format("%s##setb", STR_C("Trackbed")).c_str(), ImVec2(button_width, 0.0f)) && fields.trackbed[0] != '\0') + { + auto const material{editor_track::fetch_material(fields.trackbed)}; + track_set_apply([material](TTrack &Track) { + if (Track.eType == tt_Switch) + { + if (Track.SwitchExtension == nullptr) + return false; + Track.SwitchExtension->m_material3 = material; + } + else + Track.m_material2 = material; + return true; + }, true, "Trackbed"); + } + ImGui::InputTextWithHint("##setcircuits", STR_C("track circuits, separated by spaces"), fields.circuits, sizeof(fields.circuits)); + ImGui::SameLine(); + if (ImGui::Button(format("%s##setc", STR_C("Circuits")).c_str(), ImVec2(button_width, 0.0f))) + { + std::vector names; + std::string const text{fields.circuits}; + std::size_t at{0}; + while (at < text.size()) + { + auto const end{text.find(' ', at)}; + auto const word{text.substr(at, end == std::string::npos ? std::string::npos : end - at)}; + if (false == word.empty()) + names.push_back(word); + if (end == std::string::npos) + break; + at = end + 1; + } + track_set_apply([names](TTrack &Track) { editor_track::isolated(Track, names); return true; }, false, "Circuits"); + } + char const *environments[] = {"flat", "mountains", "canyon", "tunnel", "bridge", "bank"}; + ImGui::Combo("##setenvironment", &fields.environment, environments, IM_ARRAYSIZE(environments)); + ImGui::SameLine(); + if (ImGui::Button(format("%s##sete", STR_C("Environment")).c_str(), ImVec2(button_width, 0.0f))) + { + auto const environment{static_cast(fields.environment)}; + track_set_apply([environment](TTrack &Track) { Track.eEnvironment = environment; return true; }, false, "Environment"); + } + ImGui::PopItemWidth(); + if (ImGui::Button(format(STR_C("Delete %zu paths"), m_track_set.size()).c_str())) + track_set_delete(); + ImGui::Separator(); +} + +void editor_mode::render_track_set_gizmo() +{ + track_set_prune(); + if (m_track_set.size() < 2) + { + m_track_set_using = false; + return; + } + gizmo_frame const frame; + if (false == m_track_set_using) + { + glm::dvec3 centre{0.0}; + for (auto const *track : m_track_set) + centre += editor_track::pivot(*track); + m_track_set_pivot = centre / static_cast(m_track_set.size()); + m_track_set_gizmo = glm::translate(glm::mat4(1.0f), glm::vec3(m_track_set_pivot - frame.camera)); + } + glm::mat4 delta(1.0f); + frame.manipulate(ImGuizmo::TRANSLATE, m_track_set_gizmo, m_gizmo_snap, &delta); + if (ImGuizmo::IsUsing()) + { + if (false == m_track_set_using) + { + std::string reason; + if (false == tracks_editable(m_track_set, reason)) + { + ui()->set_status(reason, true); + return; + } + m_track_set_using = true; + m_track_drag = m_track_set; + m_track_set_joints.clear(); + for (auto *track : m_track_set) + { + auto joints{editor_track::joints(*track)}; + joints.erase(std::remove_if(joints.begin(), joints.end(), [&](editor_track::joint const &Joint) { return in_track_set(Joint.other); }), joints.end()); + for (auto const &joint : joints) + if (std::find(m_track_drag.begin(), m_track_drag.end(), joint.other) == m_track_drag.end()) + m_track_drag.push_back(joint.other); + m_track_set_joints.emplace_back(track, std::move(joints)); + } + std::vector> states; + for (auto *track : m_track_drag) + states.emplace_back(track, editor_track::capture(*track)); + push_track_snapshot(std::move(states)); + } + glm::dvec3 const offset{delta[3]}; + if (glm::length(offset) > 1e-9) + { + for (auto &entry : m_track_set_joints) + { + editor_track::translate(*entry.first, offset); + editor_track::follow(*entry.first, entry.second); + } + m_track_dirty = true; + } + commit_track_drag(false); + } + else if (m_track_set_using) + { + commit_track_drag(true); + m_track_set_using = false; + m_track_drag.clear(); + m_track_set_joints.clear(); + straight_refresh(); + } +} + +void editor_mode::render_lineside_ui() +{ + struct tab + { + char const *label; + bool *open; + bool *expand; + std::function render; + }; + std::array const tabs{{ + {"Platforms and models", &m_sweep.open, &m_sweep.expand, [this]() { render_sweep_ui(); }}, + {"Hectometre posts", &m_hekto.open, &m_hekto.expand, [this]() { render_hekto_ui(); }}, + {"Fouling points", &m_fouling.open, &m_fouling.expand, [this]() { render_fouling_ui(); }}, + {"Parallel track", &m_parallel.open, &m_parallel.expand, [this]() { render_parallel_ui(); }}, + {"Vehicle", &m_vehicle.open, &m_vehicle.expand, [this]() { render_vehicle_ui(); }}, + }}; + if (selected_track() == nullptr) + ImGui::TextColored(ImVec4(1.0f, 0.8f, 0.3f, 1.0f), "%s", STR_C("LMB on a track: the line the objects go along")); + if (false == ImGui::BeginTabBar("##lineside")) + return; + for (int i = 0; i < static_cast(tabs.size()); ++i) + { + auto const &entry{tabs[i]}; + auto const wanted{*entry.expand}; + *entry.expand = false; + *entry.open = ImGui::BeginTabItem(STR_C(entry.label), nullptr, wanted ? ImGuiTabItemFlags_SetSelected : 0); + if (false == *entry.open) + continue; + m_lineside_tab = i; + entry.render(); + ImGui::EndTabItem(); + } + ImGui::EndTabBar(); +} diff --git a/application/editormodeturntable.cpp b/application/editormodeturntable.cpp new file mode 100644 index 000000000..f9a64c294 --- /dev/null +++ b/application/editormodeturntable.cpp @@ -0,0 +1,1025 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "application/editormode.h" +#include "application/editorprojection.h" +#include "application/editoruilayer.h" +#include "editor/editorFormat.hpp" +#include "editor/editorGeometry.hpp" +#include "editor/editorIncludeInfo.hpp" +#include "model/AnimModel.h" +#include "scene/scene.h" +#include "scene/scenelayers.h" +#include "simulation/simulation.h" +#include "utilities/Globals.h" +#include "utilities/translation.h" +#include "utilities/utilities.h" +#include "world/Track.h" + +#include "imgui/imgui.h" +#include +#include +#include +#include +#include +#include +#include + +namespace +{ + +using geometry::arc_pieces; +using geometry::plan_distance; +using geometry::plan_of; +using geometry::signed_angle; + +double constexpr kRimTolerance{0.05}; +double constexpr kMinimumRadius{80.0}; +float constexpr kDragPixels{5.0f}; + +glm::dvec2 heading_vector(double const Heading) +{ + return {std::sin(glm::radians(Heading)), std::cos(glm::radians(Heading))}; +} + +double heading_of(glm::dvec2 const &Direction) +{ + return glm::degrees(std::atan2(Direction.x, Direction.y)); +} + +double circular(double Angle) +{ + Angle = std::fmod(Angle, 360.0); + if (Angle <= -180.0) + Angle += 360.0; + if (Angle > 180.0) + Angle -= 360.0; + return Angle; +} + +double line_angle(double const Angle) +{ + auto result{circular(Angle)}; + if (result >= 90.0) + result -= 180.0; + if (result < -90.0) + result += 180.0; + return result; +} + +bool numeric(std::string const &Text, double &Value) +{ + char *end{nullptr}; + Value = std::strtod(Text.c_str(), &end); + return false == Text.empty() && *end == '\0'; +} + +std::string normalized(std::string File) +{ + std::replace(File.begin(), File.end(), '\\', '/'); + return ToLower(File); +} + +std::vector fixed_angles(std::string const &File) +{ + std::vector result; + std::ifstream input{Global.asCurrentSceneryPath + File, std::ios_base::binary}; + if (false == input.is_open()) + return result; + std::string const content{std::istreambuf_iterator(input), std::istreambuf_iterator()}; + static std::regex const pattern{R"(event\s+\S*tor(\d+)rot\s+animation\s+\S+\s+\S+\s+rotate\s+\S+\s+\S+\s+\S+\s+(\S+))", std::regex::icase}; + for (auto match{std::sregex_iterator(content.begin(), content.end(), pattern)}; match != std::sregex_iterator(); ++match) + { + double angle; + if (numeric((*match)[2].str(), angle) && std::none_of(result.begin(), result.end(), [&](double const Angle) { return std::abs(line_angle(Angle - angle)) < 0.01; })) + result.push_back(angle); + } + return result; +} + +glm::dvec3 centre_of(TTrack const &Table) +{ + auto const &path{Table.m_paths.front()}; + return glm::mix(path.points[segment_data::point::start], path.points[segment_data::point::end], 0.5); +} + +double length_of(TTrack const &Table) +{ + auto const &path{Table.m_paths.front()}; + return plan_distance(path.points[segment_data::point::start], path.points[segment_data::point::end]); +} + +struct rim_end +{ + double heading{0.0}; + TTrack *track{nullptr}; +}; + +std::vector rim_ends(TTrack const *Table, glm::dvec3 const &Centre, double const Rim) +{ + std::vector result; + for (auto *section : simulation::Region->sections(Centre, static_cast(Rim + 10.0))) + for (auto const &cell : section->m_cells) + for (auto *other : cell.m_directories.paths) + { + if (other == Table || other->m_editorremoved || (other->iCategoryFlag & 15) != 1 || other->eType == tt_Table) + continue; + for (auto const &path : other->m_paths) + for (auto const &point : {path.points[segment_data::point::start], path.points[segment_data::point::end]}) + { + if (std::abs(plan_distance(point, Centre) - Rim) > kRimTolerance || std::abs(point.y - Centre.y) > 0.5) + continue; + auto const heading{heading_of(plan_of(point - Centre))}; + if (std::none_of(result.begin(), result.end(), [&](rim_end const &End) { return End.track == other && std::abs(circular(End.heading - heading)) < 0.01; })) + result.push_back({heading, other}); + } + } + return result; +} + +void draw_circle(screen_projection const &Projection, ImDrawList *Drawlist, glm::dvec3 const &Centre, double const Radius, ImU32 const Colour, float const Thickness) +{ + int const count{48}; + glm::dvec3 previous{Centre.x, Centre.y, Centre.z + Radius}; + for (int i = 1; i <= count; ++i) + { + auto const angle{glm::two_pi() * i / count}; + glm::dvec3 const next{Centre.x + Radius * std::sin(angle), Centre.y, Centre.z + Radius * std::cos(angle)}; + Projection.line(Drawlist, previous, next, Colour, Thickness); + previous = next; + } +} + +void draw_pieces(screen_projection const &Projection, ImDrawList *Drawlist, std::vector const &Pieces, ImU32 const Colour, float const Thickness) +{ + for (auto const &piece : Pieces) + { + geometry::bezier const curve{piece}; + auto const count{std::clamp(static_cast(curve.plan_length() / 2.0), 2, 48)}; + auto previous{curve.point(0.0)}; + for (int k = 1; k <= count; ++k) + { + auto const next{curve.point(static_cast(k) / count)}; + Projection.line(Drawlist, previous, next, Colour, Thickness); + previous = next; + } + } +} + +void label(screen_projection const &Projection, glm::dvec3 const &Point, std::string const &Text) +{ + ImVec2 at; + if (false == Projection.project(Point, at)) + return; + auto *drawlist{ImGui::GetForegroundDrawList()}; + auto const size{ImGui::CalcTextSize(Text.c_str())}; + drawlist->AddRectFilled(ImVec2(at.x + 8.f, at.y - 4.f), ImVec2(at.x + 16.f + size.x, at.y + size.y + 4.f), IM_COL32(0, 0, 0, 170), 4.f); + drawlist->AddText(ImVec2(at.x + 12.f, at.y), IM_COL32(255, 255, 255, 235), Text.c_str()); +} + +} // namespace + +void editor_mode::scan_turntables() +{ + auto &tool{m_turntable}; + if (tool.scanned) + return; + tool.scanned = true; + tool.templates.clear(); + if (false == EditorIncludes.scanned()) + EditorIncludes.scan(); + for (auto const &entry : EditorIncludes.entries()) + { + if (entry.category != "turntable") + continue; + include_info info; + std::string error; + if (false == editor_includes::load(entry.file, info, error) || info.turntable_length <= 0.0) + continue; + turntable_template item; + item.file = entry.file; + item.name = info.name.empty() ? entry.file : info.name; + item.length = info.turntable_length; + item.track = editor_includes::parameter_with_role(info, "track"); + item.yaw = editor_includes::parameter_with_role(info, "rot.y"); + if (info.turntable_angles > 0 && info.turntable_positions > 0) + { + item.angles = info.turntable_angles; + item.positions = info.turntable_positions; + } + else + item.fixed = fixed_angles(entry.file); + if (item.track == 0 || item.yaw == 0 || (item.angles == 0 && item.fixed.empty())) + continue; + tool.templates.push_back(std::move(item)); + } + std::stable_sort(tool.templates.begin(), tool.templates.end(), [](turntable_template const &A, turntable_template const &B) { return (A.angles > 0) != (B.angles > 0) ? A.angles > 0 : A.name < B.name; }); + tool.chosen = tool.templates.empty() ? -1 : 0; +} + +std::string editor_mode::turntable_name_for_new() const +{ + if (m_turntable.name[0] != '\0') + return ToLower(m_turntable.name); + for (int i = 1;; ++i) + { + auto const name{"obr" + std::to_string(i)}; + if (simulation::Paths.find(name) == nullptr && simulation::Instances.find(name) == nullptr) + return name; + } +} + +bool editor_mode::turntable_read(TTrack *Table) +{ + auto &tool{m_turntable}; + if (Table == nullptr || Table->eType != tt_Table || Table->m_editorremoved || Table->m_paths.empty()) + { + tool.table = nullptr; + tool.include = 0; + tool.kind = -1; + tool.exits.clear(); + tool.fits.clear(); + return false; + } + if (tool.table != Table) + { + tool.fits.clear(); + tool.hovered = -1; + tool.status.clear(); + tool.error.clear(); + } + scan_turntables(); + tool.table = Table; + tool.length = length_of(*Table); + auto const &path{Table->m_paths.front()}; + tool.table_yaw = heading_of(plan_of(path.points[segment_data::point::start] - centre_of(*Table))); + tool.include = 0; + tool.kind = -1; + tool.exits.clear(); + for (scene::instance_handle handle = 1; handle <= scene::Layers.instance_count() && tool.include == 0; ++handle) + { + if (false == scene::Layers.tracked(handle)) + continue; + auto const &included{scene::Layers.instance(handle)}; + if (included.removed || included.dead || included.file == nullptr) + continue; + auto const file{normalized(*included.file)}; + auto const kind{std::find_if(tool.templates.begin(), tool.templates.end(), [&](turntable_template const &Template) { return normalized(Template.file) == file; })}; + if (kind == tool.templates.end()) + continue; + std::string target; + std::vector values; + if (false == editor_includes::parse_directive(scene::Layers.directive(handle), target, values) || kind->track > static_cast(values.size()) || ToLower(values[kind->track - 1]) != Table->name()) + continue; + tool.include = handle; + tool.kind = static_cast(kind - tool.templates.begin()); + if (double yaw; kind->yaw <= static_cast(values.size()) && numeric(values[kind->yaw - 1], yaw)) + tool.table_yaw = yaw; + if (kind->angles > 0) + { + for (int i = 0; i < kind->positions && kind->angles - 1 + i < static_cast(values.size()); ++i) + if (double angle; numeric(values[kind->angles - 1 + i], angle) && std::none_of(tool.exits.begin(), tool.exits.end(), [&](double const Exit) { return std::abs(line_angle(Exit - angle)) < 0.01; })) + tool.exits.push_back(angle); + } + else + tool.exits = kind->fixed; + } + return true; +} + +glm::dvec3 editor_mode::turntable_centre() const +{ + return m_turntable.table != nullptr ? centre_of(*m_turntable.table) : glm::dvec3{0.0}; +} + +std::vector editor_mode::turntable_lines() const +{ + std::vector result; + for (auto const angle : m_turntable.exits) + result.push_back(m_turntable.table_yaw + angle); + return result; +} + +double editor_mode::turntable_snap(double const Heading) const +{ + auto const &tool{m_turntable}; + auto const fixed{tool.kind >= 0 && tool.templates[tool.kind].angles == 0}; + std::optional nearest; + for (auto const line : turntable_lines()) + for (auto const heading : {line, line + 180.0}) + if (false == nearest.has_value() || std::abs(circular(heading - Heading)) < std::abs(circular(*nearest - Heading))) + nearest = heading; + if (nearest.has_value() && (fixed || std::abs(circular(*nearest - Heading)) < 1.0)) + return circular(*nearest); + auto const step{tool.step > 0.f ? static_cast(tool.step) : 0.1}; + return circular(tool.table_yaw + std::round(circular(Heading - tool.table_yaw) / step) * step); +} + +bool editor_mode::turntable_exit_at(glm::dvec3 const &Ground, double &Heading, double &Length) const +{ + auto const &tool{m_turntable}; + if (tool.table == nullptr) + return false; + auto const centre{turntable_centre()}; + auto const rim{tool.length * 0.5}; + auto const distance{plan_distance(Ground, centre)}; + if (distance < rim + 1.0 || distance > rim + tool.reach) + return false; + Heading = turntable_snap(heading_of(plan_of(Ground - centre))); + Length = std::max(5.0, std::round((distance - rim) * 2.0) * 0.5); + for (auto const &end : rim_ends(tool.table, centre, rim)) + if (std::abs(circular(end.heading - Heading)) < 0.05) + return false; + return true; +} + +bool editor_mode::turntable_fit_end(editor_track::snap_target const &End, turntable_fit &Fit) const +{ + auto const &tool{m_turntable}; + Fit = {}; + Fit.end = End; + auto const centre{turntable_centre()}; + auto const rim{tool.length * 0.5}; + glm::dvec2 const c{plan_of(centre)}; + auto const into{plan_of(End.direction)}; + if (tool.table == nullptr || glm::length(into) < 1e-6) + return false; + glm::dvec2 const t{glm::normalize(into)}; + auto target{End.position}; + glm::dvec2 e{plan_of(target)}; + struct shape + { + glm::dvec2 radial{0.0}; + double radius{0.0}; + double first{0.0}; + double turn{0.0}; + double second{0.0}; + }; + auto const connect = [&](glm::dvec2 const &Radial, double const Radius) -> std::optional { + auto const rimpoint{c + Radial * rim}; + auto const delta{signed_angle(Radial, t)}; + auto const offset{e - rimpoint}; + if (std::abs(delta) < 1e-5) + { + auto const along{glm::dot(offset, Radial)}; + if (along < 0.5 || std::abs(geometry::cross(Radial, offset)) > 0.02) + return std::nullopt; + return shape{Radial, 0.0, along, 0.0, 0.0}; + } + if (std::abs(delta) > glm::radians(90.0)) + return std::nullopt; + auto const a{geometry::cross(t, offset) / geometry::cross(t, Radial)}; + auto const s{geometry::cross(Radial, offset) / geometry::cross(Radial, t)}; + auto const tangent{Radius * std::tan(std::abs(delta) * 0.5)}; + if (a - tangent < -1e-3 || s - tangent < -1e-3) + return std::nullopt; + return shape{Radial, Radius, std::max(0.0, a - tangent), delta, std::max(0.0, s - tangent)}; + }; + std::optional best; + std::string issue; + auto const better = [&](shape const &Candidate) { + if (false == best.has_value()) + return true; + auto const straight = [](shape const &Shape) { return Shape.radius == 0.0; }; + if (straight(Candidate) != straight(*best)) + return straight(Candidate); + return Candidate.radius > best->radius + 1e-6; + }; + auto const solve = [&]() { + auto const fixed{tool.kind >= 0 && tool.templates[tool.kind].angles == 0}; + if (fixed) + { + for (auto const line : turntable_lines()) + for (auto const heading : {line, line + 180.0}) + { + auto const radial{heading_vector(heading)}; + for (auto radius{static_cast(tool.radius)}; radius >= kMinimumRadius; radius *= 0.9) + if (auto const candidate{connect(radial, radius)}) + { + if (better(*candidate)) + best = candidate; + break; + } + } + if (false == best.has_value()) + issue = STR("It doesn't line up with any position of the turntable"); + } + else if (std::abs(geometry::cross(t, c - e)) < 0.02 && glm::dot(t, e - c) > rim + 0.5) + { + best = connect(t, 0.0); + } + else + { + for (auto radius{static_cast(tool.radius)}; radius >= kMinimumRadius && false == best.has_value(); radius *= 0.9) + { + auto const gap = [&](double const S) { + auto const vertex{e - t * S}; + auto const radial{vertex - c}; + if (glm::length(radial) < 1e-6) + return -1.0; + auto const delta{signed_angle(glm::normalize(radial), t)}; + return S - radius * std::tan(std::abs(delta) * 0.5); + }; + auto const limit{plan_distance(End.position, centre) + 400.0}; + double low{0.0}; + std::optional high; + for (double s = 0.25; s <= limit; s += 0.25) + { + if (gap(s) >= 0.0) + { + high = s; + break; + } + low = s; + } + if (false == high.has_value()) + continue; + auto upper{*high}; + for (int i = 0; i < 50; ++i) + { + auto const middle{(low + upper) * 0.5}; + (gap(middle) >= 0.0 ? upper : low) = middle; + } + auto const vertex{e - t * upper}; + if (glm::length(vertex - c) <= rim) + continue; + best = connect(glm::normalize(vertex - c), radius); + } + if (false == best.has_value()) + issue = format(STR_C("Too close to the turntable for a curve of %.0f m or more"), kMinimumRadius); + } + }; + solve(); + auto *own{End.track}; + if (false == best.has_value() && own != nullptr && own->eType == tt_Normal && own->m_paths.size() == 1 && own->Dynamics.empty()) + { + auto const &path{own->m_paths.front()}; + auto const far{End.point.kind == editor_track::point_kind::start ? path.points[segment_data::point::end] : path.points[segment_data::point::start]}; + auto const straight{std::abs(geometry::cross(t, plan_of(far - End.position))) < 0.01 && glm::dot(t, plan_of(far - End.position)) > 1.0}; + std::string reason; + if (straight && editor_track::can_edit_geometry(*own, reason)) + { + auto const first{issue}; + target = far; + e = plan_of(target); + solve(); + if (best.has_value()) + Fit.replaces = own; + else + { + target = End.position; + e = plan_of(target); + issue = first; + } + } + } + if (false == best.has_value()) + { + Fit.issue = issue.empty() ? STR("It points away from the turntable") : issue; + return false; + } + auto const &shape{*best}; + Fit.heading = heading_of(shape.radial); + Fit.radius = shape.radius; + Fit.length = shape.first + shape.radius * std::abs(shape.turn) + shape.second; + auto const grade{Fit.length > 1e-6 ? (target.y - centre.y) / Fit.length : 0.0}; + glm::dvec3 point{c.x + shape.radial.x * rim, centre.y, c.y + shape.radial.y * rim}; + auto const straight = [&](glm::dvec2 const &Direction, double const Length) { + segment_data piece; + piece.points[segment_data::point::start] = point; + point = {point.x + Direction.x * Length, point.y + grade * Length, point.z + Direction.y * Length}; + piece.points[segment_data::point::end] = point; + Fit.pieces.push_back(piece); + }; + if (shape.first > 0.05) + straight(shape.radial, shape.first); + if (shape.radius > 0.0) + { + auto const arc{arc_pieces(point, shape.radial, grade, shape.radius, std::abs(shape.turn), shape.turn > 0.0 ? 1 : -1)}; + Fit.pieces.insert(Fit.pieces.end(), arc.begin(), arc.end()); + point = arc.back().points[segment_data::point::end]; + } + if (shape.second > 0.05) + straight(t, shape.second); + if (false == Fit.pieces.empty()) + Fit.pieces.back().points[segment_data::point::end] = target; + return false == Fit.pieces.empty(); +} + +void editor_mode::turntable_find_fits() +{ + auto &tool{m_turntable}; + tool.fits.clear(); + tool.hovered = -1; + tool.error.clear(); + if (tool.table == nullptr) + return; + auto const centre{turntable_centre()}; + auto const rim{tool.length * 0.5}; + for (auto const &end : editor_track::free_ends(nullptr, 1, centre, rim + tool.reach, {tool.table})) + { + if (std::abs(plan_distance(end.position, centre) - rim) <= kRimTolerance) + continue; + turntable_fit fit; + turntable_fit_end(end, fit); + fit.chosen = fit.issue.empty(); + tool.fits.push_back(std::move(fit)); + } + std::sort(tool.fits.begin(), tool.fits.end(), [](turntable_fit const &A, turntable_fit const &B) { return A.end.distance < B.end.distance; }); + tool.status = tool.fits.empty() ? format(STR_C("No free ends within %.0f m of the rim"), tool.reach) : std::string{}; +} + +void editor_mode::turntable_build(std::vector const &Fits) +{ + auto &tool{m_turntable}; + if (tool.table == nullptr || Fits.empty()) + return; + std::vector created; + std::vector removed; + for (auto const *fit : Fits) + { + if (false == fit->issue.empty() || fit->end.track == nullptr || fit->end.track->m_editorremoved) + continue; + for (auto const &piece : fit->pieces) + created.push_back(editor_track::create_path(*fit->end.track, piece)); + if (fit->replaces != nullptr && false == fit->replaces->m_editorremoved) + { + editor_track::retire(*fit->replaces); + removed.push_back(fit->replaces); + } + } + if (created.empty()) + return; + editor_track::commit(created); + push_track_snapshot({}, created, removed); + turntable_store_exits(); + tool.status = format(STR_C("%d track(s) led to the turntable"), static_cast(Fits.size())); +} + +void editor_mode::turntable_store_exits() +{ + auto &tool{m_turntable}; + if (tool.table == nullptr || tool.include == 0 || tool.kind < 0) + { + turntable_read(tool.table); + return; + } + auto const &kind{tool.templates[tool.kind]}; + if (kind.angles == 0) + { + turntable_read(tool.table); + return; + } + std::vector lines; + for (auto const &end : rim_ends(tool.table, turntable_centre(), tool.length * 0.5)) + { + auto const angle{line_angle(end.heading - tool.table_yaw)}; + if (std::none_of(lines.begin(), lines.end(), [&](double const Line) { return std::abs(line_angle(Line - angle)) < 0.01; })) + lines.push_back(angle); + } + std::sort(lines.begin(), lines.end()); + if (static_cast(lines.size()) > kind.positions) + tool.error = format(STR_C("The turntable has %d positions, %d track lines lead to it: the rest won't be reached"), kind.positions, static_cast(lines.size())); + std::string target; + std::vector values; + if (false == editor_includes::parse_directive(scene::Layers.directive(tool.include), target, values)) + return; + for (int i = 0; i < kind.positions && kind.angles - 1 + i < static_cast(values.size()); ++i) + values[kind.angles - 1 + i] = editor_includes::number(i < static_cast(lines.size()) ? lines[i] : lines.empty() ? 0.0 : lines.front()); + auto const directive{editor_includes::compose_directive(target, values)}; + auto before{scene::Layers.directive(tool.include)}; + if (directive != before) + { + EditorSnapshot snap; + snap.node_name = target; + snap.directives.emplace_back(tool.include, std::move(before)); + set_include_directive(tool.include, directive); + trim_history(); + m_history.push_back(std::move(snap)); + g_redo.clear(); + } + turntable_read(tool.table); +} + +void editor_mode::turntable_place(glm::dvec3 const &Centre, double const Yaw) +{ + auto &tool{m_turntable}; + scan_turntables(); + tool.error.clear(); + if (tool.chosen < 0 || tool.chosen >= static_cast(tool.templates.size())) + return; + auto const &kind{tool.templates[tool.chosen]}; + auto const name{turntable_name_for_new()}; + if (simulation::Paths.find(name) != nullptr) + { + tool.error = format(STR_C("The name %s is taken by another path"), name.c_str()); + return; + } + auto const rim{kind.length * 0.5}; + auto const direction{heading_vector(Yaw)}; + segment_data path; + path.points[segment_data::point::start] = {Centre.x + direction.x * rim, Centre.y, Centre.z + direction.y * rim}; + path.points[segment_data::point::end] = {Centre.x - direction.x * rim, Centre.y, Centre.z - direction.y * rim}; + auto *table{editor_track::create_turntable(path, tool.snap.track, name)}; + editor_track::commit({table}); + push_track_snapshot({}, {table}); + template_item item; + item.file = kind.file; + item.location = Centre; + item.yaw = Yaw; + item.described = true; + item.track = table->name(); + std::string error; + if (place_templates({item}, error) == 0) + tool.error = error; + tool.name[0] = '\0'; + m_node = table; + m_track_point = {}; + ui()->set_node(m_node); + turntable_read(table); + tool.status = format(STR_C("Turntable %s: click around it for the tracks out of it, or fit the tracks around. It turns after the scenery is saved and loaded again"), table->name().c_str()); +} + +void editor_mode::turntable_press(track_intent const &Intent) +{ + using kind = track_intent::kind; + auto &tool{m_turntable}; + auto const &io{ImGui::GetIO()}; + switch (Intent.what) + { + case kind::turntable_place: + tool.placing = true; + tool.pressed = {io.MousePos.x, io.MousePos.y}; + tool.snap = Intent.snap; + tool.centre = Intent.position; + return; + case kind::turntable_exit: + { + if (tool.table == nullptr) + return; + auto const centre{turntable_centre()}; + auto const rim{tool.length * 0.5}; + auto const direction{heading_vector(tool.heading)}; + segment_data piece; + piece.points[segment_data::point::start] = {centre.x + direction.x * rim, centre.y, centre.z + direction.y * rim}; + piece.points[segment_data::point::end] = {centre.x + direction.x * (rim + tool.exit_length), centre.y, centre.z + direction.y * (rim + tool.exit_length)}; + auto const ends{rim_ends(tool.table, centre, rim)}; + auto *track{ends.empty() ? editor_track::create_path(m_lay.style, piece) : editor_track::create_path(*ends.front().track, piece)}; + editor_track::commit({track}); + push_track_snapshot({}, {track}); + turntable_store_exits(); + tool.status = format(STR_C("Track out of the turntable at %.1f deg, %.1f m"), circular(tool.heading - tool.table_yaw), tool.exit_length); + return; + } + case kind::turntable_fit: + { + turntable_fit fit; + if (turntable_fit_end(Intent.snap, fit)) + turntable_build({&fit}); + else + tool.error = fit.issue; + return; + } + default: return; + } +} + +void editor_mode::turntable_finish_placement() +{ + auto &tool{m_turntable}; + if (false == tool.placing) + return; + tool.placing = false; + scan_turntables(); + if (tool.chosen < 0) + return; + auto const rim{tool.templates[tool.chosen].length * 0.5}; + auto const &io{ImGui::GetIO()}; + auto const dragged{glm::length(glm::vec2{io.MousePos.x, io.MousePos.y} - tool.pressed) >= kDragPixels}; + if (tool.snap.track != nullptr && false == dragged) + { + auto const into{glm::normalize(plan_of(tool.snap.direction))}; + glm::dvec3 const centre{tool.snap.position.x - into.x * rim, tool.snap.position.y, tool.snap.position.z - into.y * rim}; + tool.yaw = heading_of(into); + turntable_place(centre, tool.yaw); + return; + } + tool.snap = {}; + if (dragged) + { + auto const cursor{cursor_level(tool.centre.y)}; + if (plan_distance(cursor, tool.centre) > 0.5) + tool.yaw = std::round(heading_of(plan_of(cursor - tool.centre)) * 10.0) / 10.0; + } + turntable_place(tool.centre, tool.yaw); +} + +editor_mode::track_intent editor_mode::turntable_intent(glm::dvec3 const &Ground, bool const Shift) +{ + using kind = track_intent::kind; + auto &tool{m_turntable}; + track_intent intent; + intent.position = Ground; + auto const make = [&](kind const What, std::string const &Action) { + intent.what = What; + intent.action = Action; + return intent; + }; + auto const &io{ImGui::GetIO()}; + glm::vec2 const mouse{io.MousePos.x, io.MousePos.y}; + if (tool.table != selected_track()) + turntable_read(selected_track()); + if (tool.table != nullptr) + { + auto const centre{turntable_centre()}; + auto const rim{tool.length * 0.5}; + auto const end{snap_free_end(Ground, mouse, nullptr, 1, {tool.table})}; + if (end.track != nullptr && std::abs(plan_distance(end.position, centre) - rim) > kRimTolerance && plan_distance(end.position, centre) <= rim + tool.reach) + { + intent.snap = end; + intent.track = end.track; + intent.position = end.position; + return make(kind::turntable_fit, STR("Click: lead this track to the turntable")); + } + double heading, length; + if (turntable_exit_at(cursor_level(centre.y), heading, length)) + { + tool.heading = heading; + tool.exit_length = length; + auto const direction{heading_vector(heading)}; + intent.position = {centre.x + direction.x * rim, centre.y, centre.z + direction.y * rim}; + return make(kind::turntable_exit, format(STR_C("Click: a track out of the turntable, %.1f deg, %.1f m"), circular(heading - tool.table_yaw), length)); + } + } + for (auto *track : simulation::Paths.sequence()) + { + if (track == nullptr || track->eType != tt_Table || track->m_editorremoved || track->m_paths.empty()) + continue; + if (plan_distance(centre_of(*track), Ground) <= length_of(*track) * 0.5) + { + intent.track = track; + return make(kind::select, track == tool.table ? std::string{} : STR("Click: this turntable")); + } + } + scan_turntables(); + if (tool.chosen < 0) + return intent; + if (false == Shift) + { + auto const end{snap_free_end(Ground, mouse, nullptr, 1, {})}; + if (end.track != nullptr) + { + intent.snap = end; + intent.position = end.position; + return make(kind::turntable_place, STR("Click: a turntable at the end of this track")); + } + } + return make(kind::turntable_place, STR("Press: the centre of a new turntable, drag: the direction of its bridge")); +} + +void editor_mode::render_turntable_ui() +{ + auto &tool{m_turntable}; + scan_turntables(); + auto *selected{selected_track()}; + if (tool.table != selected) + turntable_read(selected); + ImVec4 const warncolour{1.f, 0.75f, 0.3f, 1.f}; + + if (tool.table != nullptr) + { + auto &table{*tool.table}; + ImGui::Text(STR_C("Turntable %s, bridge %.1f m"), table.name().c_str(), tool.length); + if (tool.kind >= 0) + { + auto const &kind{tool.templates[tool.kind]}; + ImGui::TextDisabled("%s", kind.name.c_str()); + ImGui::SameLine(); + ImGui::TextDisabled(kind.angles > 0 ? STR_C("(positions set by the tracks around, up to %d)") : STR_C("(%d positions fixed by the template)"), kind.angles > 0 ? kind.positions : static_cast(kind.fixed.size())); + } + else + ImGui::TextColored(warncolour, "%s", STR_C("No turntable template takes this path as its track: the positions aren't known")); + render_track_name(table); + + auto const centre{turntable_centre()}; + auto const ends{rim_ends(&table, centre, tool.length * 0.5)}; + if (false == tool.exits.empty() && ImGui::TreeNodeEx(format(STR_C("Positions (%d)"), static_cast(tool.exits.size())).c_str(), ImGuiTreeNodeFlags_DefaultOpen)) + { + for (std::size_t i = 0; i < tool.exits.size(); ++i) + { + auto const heading{tool.table_yaw + tool.exits[i]}; + auto const occupied = [&](double const Heading) { return std::any_of(ends.begin(), ends.end(), [&](rim_end const &End) { return std::abs(circular(End.heading - Heading)) < 0.05; }); }; + auto const front{occupied(heading)}; + auto const back{occupied(heading + 180.0)}; + ImGui::Text("%2d %7.2f deg", static_cast(i + 1), tool.exits[i]); + ImGui::SameLine(); + if (front || back) + ImGui::TextColored(ImVec4(0.5f, 0.9f, 0.5f, 1.f), "%s%s%s", front ? STR_C("track") : "", front && back ? " + " : "", back ? STR_C("track on the other end") : ""); + else + ImGui::TextDisabled("%s", STR_C("no track")); + } + ImGui::TreePop(); + } + + ImGui::Separator(); + ImGui::TextUnformatted(STR_C("Tracks around")); + ImGui::PushItemWidth(110.f); + ImGui::InputFloat(STR_C("Reach from the rim, m"), &tool.reach, 10.f, 50.f, "%.0f"); + tool.reach = std::clamp(tool.reach, 5.f, 500.f); + ImGui::InputFloat(STR_C("Radius of the curves, m"), &tool.radius, 10.f, 50.f, "%.0f"); + tool.radius = std::clamp(tool.radius, static_cast(kMinimumRadius), 2000.f); + if (tool.kind < 0 || tool.templates[tool.kind].angles > 0) + { + ImGui::InputFloat(STR_C("Angle step of a new track, deg (0: free)"), &tool.step, 0.5f, 2.5f, "%.2f"); + tool.step = std::clamp(tool.step, 0.f, 45.f); + } + ImGui::PopItemWidth(); + ImGui::TextDisabled("%s", STR_C("Click around the turntable: a track out of it, as long as the cursor is far.\nClick a free end near it: that track is led to the rim, straight or with a curve")); + if (ImGui::Button(STR_C("Find the free ends around"))) + turntable_find_fits(); + if (false == tool.fits.empty()) + { + int chosen{0}; + for (auto const &fit : tool.fits) + chosen += fit.chosen && fit.issue.empty() ? 1 : 0; + ImGui::SameLine(); + if (ImGui::Button(format(STR_C("Lead the chosen to the turntable (%d)"), chosen).c_str())) + { + std::vector fits; + for (auto const &fit : tool.fits) + if (fit.chosen && fit.issue.empty()) + fits.push_back(&fit); + turntable_build(fits); + turntable_find_fits(); + } + tool.hovered = -1; + ImGui::BeginChild("##turntablefits", ImVec2(0.f, 180.f), true); + for (int i = 0; i < static_cast(tool.fits.size()); ++i) + { + auto &fit{tool.fits[i]}; + ImGui::PushID(i); + if (fit.issue.empty()) + ImGui::Checkbox("##chosen", &fit.chosen); + else + ImGui::TextDisabled(" - "); + ImGui::SameLine(); + auto const name{fit.end.track->name().empty() ? std::string{"(noname)"} : fit.end.track->name()}; + if (ImGui::Selectable(name.c_str(), false, ImGuiSelectableFlags_None, ImVec2(ImGui::CalcTextSize(name.c_str()).x, 0.f))) + focus_track(*fit.end.track, fit.end.point.path, fit.end.position); + if (ImGui::IsItemHovered()) + tool.hovered = i; + ImGui::SameLine(); + if (false == fit.issue.empty()) + ImGui::TextColored(warncolour, "%s", fit.issue.c_str()); + else if (fit.radius > 0.0) + ImGui::TextDisabled(STR_C("%.1f deg, curve R %.0f m, %.1f m"), circular(fit.heading - tool.table_yaw), fit.radius, fit.length); + else + ImGui::TextDisabled(STR_C("%.1f deg, straight %.1f m"), circular(fit.heading - tool.table_yaw), fit.length); + if (fit.replaces != nullptr) + { + ImGui::SameLine(); + ImGui::TextDisabled(STR_C("in place of its last straight %s"), fit.replaces->name().c_str()); + } + ImGui::PopID(); + } + ImGui::EndChild(); + } + } + else + { + if (selected != nullptr && selected->eType == tt_Table) + ImGui::TextColored(warncolour, "%s", STR_C("This turntable can't be read")); + ImGui::TextUnformatted(STR_C("New turntable")); + if (tool.templates.empty()) + ImGui::TextColored(warncolour, "%s", STR_C("No turntables: no template is described with category: turntable and its turntable: {length}")); + for (int i = 0; i < static_cast(tool.templates.size()); ++i) + { + auto const &kind{tool.templates[i]}; + auto const text{kind.angles > 0 ? format(STR_C("%s %.0f m, up to %d positions set by the tracks"), kind.name.c_str(), kind.length, kind.positions) + : format(STR_C("%s %.0f m, %d fixed positions"), kind.name.c_str(), kind.length, static_cast(kind.fixed.size()))}; + if (ImGui::Selectable((text + "##turntable" + std::to_string(i)).c_str(), tool.chosen == i)) + tool.chosen = i; + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", kind.file.c_str()); + } + ImGui::SetNextItemWidth(160.f); + ImGui::InputTextWithHint(STR_C("Name##turntablename"), turntable_name_for_new().c_str(), tool.name, sizeof(tool.name), ImGuiInputTextFlags_CharsNoBlank); + ImGui::TextDisabled("%s", STR_C("Press where the centre goes and drag to turn the bridge.\nClick a free end of a track: the turntable lines up with it, at its end. Shift: no lining up")); + } + if (false == tool.error.empty()) + ImGui::TextColored(ImVec4(1.f, 0.45f, 0.35f, 1.f), "%s", tool.error.c_str()); + else if (false == tool.status.empty()) + ImGui::TextWrapped("%s", tool.status.c_str()); +} + +void editor_mode::draw_turntable_overlay() const +{ + using kind = track_intent::kind; + auto const &tool{m_turntable}; + screen_projection const projection; + auto *drawlist{ImGui::GetBackgroundDrawList()}; + auto const camera{glm::dvec3{Global.pCamera.Pos}}; + for (auto *track : simulation::Paths.sequence()) + { + if (track == nullptr || track->eType != tt_Table || track->m_editorremoved || track->m_paths.empty() || track == tool.table) + continue; + auto const centre{centre_of(*track)}; + if (glm::distance(centre, camera) < 1500.0) + draw_circle(projection, drawlist, centre, length_of(*track) * 0.5, IM_COL32(255, 255, 255, 90), 1.5f); + } + if (tool.table != nullptr) + { + auto const centre{turntable_centre()}; + auto const rim{tool.length * 0.5}; + draw_circle(projection, drawlist, centre, rim, overlay_color::selected, 2.5f); + auto const ends{rim_ends(tool.table, centre, rim)}; + for (auto const line : turntable_lines()) + for (auto const heading : {line, line + 180.0}) + { + auto const direction{heading_vector(heading)}; + auto const occupied{std::any_of(ends.begin(), ends.end(), [&](rim_end const &End) { return std::abs(circular(End.heading - heading)) < 0.05; })}; + glm::dvec3 const from{centre.x + direction.x * rim, centre.y, centre.z + direction.y * rim}; + glm::dvec3 const to{centre.x + direction.x * (rim + 6.0), centre.y, centre.z + direction.y * (rim + 6.0)}; + projection.line(drawlist, from, to, occupied ? IM_COL32(90, 230, 110, 230) : IM_COL32(255, 255, 255, 150), occupied ? 2.5f : 1.5f); + } + for (int i = 0; i < static_cast(tool.fits.size()); ++i) + { + auto const &fit{tool.fits[i]}; + auto const colour{false == fit.issue.empty() ? IM_COL32(255, 150, 60, 200) : fit.chosen ? IM_COL32(90, 230, 110, 230) : IM_COL32(200, 200, 200, 140)}; + draw_pieces(projection, drawlist, fit.pieces, colour, i == tool.hovered ? 4.f : 2.f); + ImVec2 at; + if (projection.project(fit.end.position, at)) + drawlist->AddCircle(at, i == tool.hovered ? 10.f : 6.f, colour, 16, 2.f); + } + } + auto const &intent{m_intent}; + switch (intent.what) + { + case kind::turntable_exit: + { + auto const centre{turntable_centre()}; + auto const direction{heading_vector(tool.heading)}; + auto const rim{tool.length * 0.5}; + glm::dvec3 const to{centre.x + direction.x * (rim + tool.exit_length), centre.y, centre.z + direction.y * (rim + tool.exit_length)}; + projection.line(drawlist, intent.position, to, overlay_color::grip, 3.f); + break; + } + case kind::turntable_fit: + { + turntable_fit fit; + auto const fits{turntable_fit_end(intent.snap, fit)}; + draw_pieces(projection, drawlist, fit.pieces, fits ? overlay_color::grip : overlay_color::invalid, 3.f); + if (false == fits) + label(projection, intent.position, fit.issue); + break; + } + case kind::turntable_place: + { + if (tool.chosen < 0 || tool.chosen >= static_cast(tool.templates.size())) + break; + auto const rim{tool.templates[tool.chosen].length * 0.5}; + auto centre{intent.position}; + auto yaw{tool.yaw}; + if (intent.snap.track != nullptr) + { + auto const into{glm::normalize(plan_of(intent.snap.direction))}; + centre = {intent.snap.position.x - into.x * rim, intent.snap.position.y, intent.snap.position.z - into.y * rim}; + yaw = heading_of(into); + } + auto const direction{heading_vector(yaw)}; + draw_circle(projection, drawlist, centre, rim, IM_COL32(255, 255, 255, 170), 1.5f); + projection.line(drawlist, {centre.x + direction.x * rim, centre.y, centre.z + direction.y * rim}, {centre.x - direction.x * rim, centre.y, centre.z - direction.y * rim}, IM_COL32(255, 255, 255, 170), 2.f); + break; + } + default: break; + } + if (tool.placing && tool.chosen >= 0 && tool.chosen < static_cast(tool.templates.size())) + { + auto const rim{tool.templates[tool.chosen].length * 0.5}; + auto const cursor{cursor_level(tool.centre.y)}; + auto const &io{ImGui::GetIO()}; + auto const dragged{glm::length(glm::vec2{io.MousePos.x, io.MousePos.y} - tool.pressed) >= kDragPixels}; + auto centre{tool.centre}; + auto yaw{tool.yaw}; + if (tool.snap.track != nullptr && false == dragged) + { + auto const into{glm::normalize(plan_of(tool.snap.direction))}; + centre = {tool.snap.position.x - into.x * rim, tool.snap.position.y, tool.snap.position.z - into.y * rim}; + yaw = heading_of(into); + } + else if (dragged && plan_distance(cursor, centre) > 0.5) + yaw = std::round(heading_of(plan_of(cursor - centre)) * 10.0) / 10.0; + auto const direction{heading_vector(yaw)}; + draw_circle(projection, drawlist, centre, rim, overlay_color::marked, 2.5f); + projection.line(drawlist, {centre.x + direction.x * rim, centre.y, centre.z + direction.y * rim}, {centre.x - direction.x * rim, centre.y, centre.z - direction.y * rim}, overlay_color::marked, 3.f); + if (dragged) + label(projection, cursor, format("%.1f deg", yaw)); + } +} diff --git a/application/editormodevehicle.cpp b/application/editormodevehicle.cpp new file mode 100644 index 000000000..f2c39b1fb --- /dev/null +++ b/application/editormodevehicle.cpp @@ -0,0 +1,315 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "application/editormode.h" +#include "application/editoruilayer.h" +#include "application/editorprojection.h" +#include "application/application.h" +#include "editor/editorFormat.hpp" +#include "editor/editorGeometry.hpp" +#include "launcher/textures_scanner.h" + +#include "simulation/simulation.h" +#include "utilities/Globals.h" +#include "utilities/Logs.h" +#include "vehicle/DynObj.h" +#include "world/Track.h" + +#include "imgui/imgui.h" +#include "utilities/translation.h" +#include +#include +#include +#include + +namespace +{ + +using geometry::bezier; + +std::size_t const kVehicleList{300}; +double const kHalfVehicle{8.0}; // m, the vehicle is placed about centred on the point + +std::string lower(std::string Text) +{ + std::transform(Text.begin(), Text.end(), Text.begin(), [](unsigned char const Character) { return static_cast(std::tolower(Character)); }); + return Text; +} + +std::string skin_label(ui::vehicle_desc const &Vehicle, ui::skin_set const &Skin) +{ + auto label{Skin.meta != nullptr && false == Skin.meta->name.empty() ? Skin.meta->name : Skin.skin}; + return label + " (" + Vehicle.path.generic_string() + ")"; +} + +int path_under(TTrack const &Track, glm::dvec3 const &Point) +{ + int result{0}; + auto best{std::numeric_limits::max()}; + for (int i = 0; i < static_cast(Track.m_paths.size()); ++i) + { + bezier const curve{Track.m_paths[i]}; + for (int k = 0; k <= 64; ++k) + { + auto const distance{geometry::plan_distance(curve.point(k / 64.0), Point)}; + if (distance < best) + { + best = distance; + result = i; + } + } + } + return result; +} + +double nearest_on(TTrack const &Track, int const Path, glm::dvec3 const &Point) +{ + bezier const curve{Track.m_paths[Path]}; + auto parameter{0.0}; + auto best{std::numeric_limits::max()}; + for (int k = 0; k <= 256; ++k) + { + auto const distance{geometry::plan_distance(curve.point(k / 256.0), Point)}; + if (distance < best) + { + best = distance; + parameter = k / 256.0; + } + } + return parameter; +} + +glm::dvec2 heading_at(TTrack const &Track, int const Path, glm::dvec3 const &Point) +{ + auto const tangent{bezier{Track.m_paths[Path]}.first(nearest_on(Track, Path, Point))}; + glm::dvec2 const planar{tangent.x, tangent.z}; + return glm::length(planar) > 1e-9 ? glm::normalize(planar) : glm::dvec2{0.0, 1.0}; +} + +// distance along the path of the track from its start to the point nearest to the one given +double distance_along(TTrack const &Track, int const Path, glm::dvec3 const &Point) +{ + bezier const curve{Track.m_paths[Path]}; + auto const parameter{nearest_on(Track, Path, Point)}; + int const count{64}; + double length{0.0}, total{0.0}; + auto previous{curve.point(0.0)}; + for (int k = 1; k <= count; ++k) + { + auto const t{static_cast(k) / count}; + auto const next{curve.point(t)}; + auto const step{glm::distance(previous, next)}; + total += step; + if (t <= parameter) + length += step; + else if (t - 1.0 / count < parameter) + length += step * (parameter - (t - 1.0 / count)) * count; + previous = next; + } + return std::clamp(length * Track.Length() / std::max(total, 1e-6), 0.0, Track.Length()); +} + +} // namespace + +void editor_mode::vehicle_start(TTrack &Track, glm::dvec3 const &Point) +{ + m_vehicle.track = &Track; + m_vehicle.point = Point; + m_vehicle.expand = true; + m_vehicle.status.clear(); + auto const heading{heading_at(Track, Track.eType == tt_Switch ? path_under(Track, Point) : 0, Point)}; + glm::dvec2 const away{Point.x - Global.pCamera.Pos.x, Point.z - Global.pCamera.Pos.z}; + m_vehicle.facing = glm::dot(heading, away) >= 0.0 ? 1 : -1; +} + +bool editor_mode::vehicle_place() +{ + auto &tool{m_vehicle}; + if (tool.track == nullptr || tool.track->m_editorremoved) + return false; + auto train{tool.consist}; + if (train.empty()) + { + if (tool.vehicle == nullptr || tool.skin == nullptr) + return false; + train.push_back({tool.vehicle, tool.skin, false}); + } + auto const path{tool.track->eType == tt_Switch ? path_under(*tool.track, tool.point) : 0}; + if (tool.track->eType == tt_Switch && tool.track->GetSwitchState() != path) + tool.track->Switch(path); + auto const along{distance_along(*tool.track, path, tool.point)}; + auto const against{tool.facing < 0}; + std::vector names; + std::string nodes; + std::string head; + for (std::size_t i = 0; i < train.size(); ++i) + { + auto const &item{train[i]}; + auto const stem{item.vehicle->path.stem().generic_string()}; + std::string name; + for (int index = 1; index < 10000; ++index) + { + name = lower("editor_" + stem + "_" + std::to_string(index)); + if (simulation::Vehicles.find(name) == nullptr && std::find(names.begin(), names.end(), name) == names.end()) + break; + } + names.push_back(name); + auto const leads{i == 0}; + if (leads) + head = name; + nodes += "node -1 0 " + name + " dynamic " + item.vehicle->path.parent_path().generic_string() + " " + item.skin->skin + " " + stem + " " + (item.turned ? "-1" : "0") + " " + (leads && tool.driver == 0 ? "headdriver" : "nobody") + " 3 0 enddynamic\n"; + } + auto const offset{against ? along - kHalfVehicle : along + kHalfVehicle}; + auto const vehicles{simulation::State.insert_trainset(head, tool.track, offset, nodes, against)}; + if (vehicles.empty()) + { + tool.status = STR_C("The vehicle couldn't be placed, the log says why"); + return false; + } + tool.placed = head; + tool.status = format(STR_C("%s and %d vehicle(s) behind it stand on %s. It isn't saved with the scenery"), head.c_str(), static_cast(vehicles.size()) - 1, tool.track->name().empty() ? "(noname)" : tool.track->name().c_str()); + WriteLog("Editor: " + tool.status, logtype::generic); + return true; +} + +void editor_mode::render_vehicle_ui() +{ + auto &tool{m_vehicle}; + auto *selected{selected_track()}; + if (selected != nullptr && selected != tool.track) + vehicle_start(*selected, bezier{selected->m_paths.front()}.point(0.5)); + if (tool.track == nullptr) + return; + if (tool.bank == nullptr) + { + tool.bank = std::make_shared(); + tool.bank->scan_textures(); + } + ImGui::TextDisabled("%s", STR_C("A vehicle to drive, placed where RMB on the track was clicked, or in the middle of the path.\nIt isn't written to the scenery files")); + ImGui::SetNextItemWidth(-1.0f); + ImGui::InputTextWithHint("##vehiclesearch", STR_C("search: name, series, skin"), tool.search, sizeof(tool.search)); + ImGui::Checkbox(STR_C("Only the ones with a cab"), &tool.controllable_only); + std::string const text{lower(tool.search)}; + std::vector, std::shared_ptr>> listed; + std::size_t total{0}; + for (auto const &[path, vehicle] : tool.bank->vehicles) + { + if (vehicle == nullptr || (tool.controllable_only && false == vehicle->controllable)) + continue; + for (auto const &skin : vehicle->matching_skinsets) + { + if (skin == nullptr) + continue; + if (false == text.empty() && lower(skin_label(*vehicle, *skin)).find(text) == std::string::npos && (skin->meta == nullptr || skin->meta->search_lowered.find(text) == std::string::npos)) + continue; + ++total; + if (listed.size() < kVehicleList) + listed.emplace_back(vehicle, skin); + } + } + ImGui::BeginChild("##vehicles", ImVec2(0.0f, ImGui::GetTextLineHeightWithSpacing() * 8.0f + 6.0f), true); + for (std::size_t i = 0; i < listed.size(); ++i) + { + auto const &[vehicle, skin] = listed[i]; + if (ImGui::Selectable(format("%s##vehicle%zu", skin_label(*vehicle, *skin).c_str(), i).c_str(), tool.skin == skin)) + { + tool.vehicle = vehicle; + tool.skin = skin; + } + } + ImGui::EndChild(); + if (total > listed.size()) + ImGui::TextDisabled(STR_C("%zu found, the first %zu listed"), total, listed.size()); + if (tool.vehicle != nullptr && tool.skin != nullptr && ImGui::Button(STR_C("Add to the train"))) + tool.consist.push_back({tool.vehicle, tool.skin, false}); + if (false == tool.consist.empty()) + { + ImGui::SameLine(); + ImGui::TextDisabled(STR_C("Train: %d vehicle(s), the first one leads"), static_cast(tool.consist.size())); + std::optional remove; + std::optional raise; + for (std::size_t i = 0; i < tool.consist.size(); ++i) + { + auto &item{tool.consist[i]}; + auto const vehicle{item.skin->vehicle.lock()}; + ImGui::PushID(static_cast(i)); + ImGui::Checkbox("##turned", &item.turned); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Turned around in the train")); + ImGui::SameLine(); + ImGui::Text("%2d. %s", static_cast(i + 1), vehicle != nullptr ? skin_label(*vehicle, *item.skin).c_str() : item.skin->skin.c_str()); + ImGui::SameLine(); + if (i > 0 && ImGui::SmallButton(STR_C("up"))) + raise = i; + ImGui::SameLine(); + if (ImGui::SmallButton("x")) + remove = i; + ImGui::PopID(); + } + if (raise) + std::swap(tool.consist[*raise], tool.consist[*raise - 1]); + if (remove) + tool.consist.erase(tool.consist.begin() + static_cast(*remove)); + if (ImGui::SmallButton(STR_C("Empty the train"))) + tool.consist.clear(); + } + if (ImGui::Button(STR_C("Turn the train around"))) + tool.facing = -tool.facing; + ImGui::SameLine(); + ImGui::TextDisabled("%s", STR_C("the head goes where the arrow at the marker points")); + ImGui::RadioButton(STR_C("With a driver, to drive"), &tool.driver, 0); + ImGui::SameLine(); + ImGui::RadioButton(STR_C("Nobody, parked"), &tool.driver, 1); + if (tool.consist.empty() && (tool.vehicle == nullptr || tool.skin == nullptr)) + ImGui::TextDisabled("%s", STR_C("Pick a vehicle from the list")); + else + { + if (ImGui::Button(STR_C("Place"))) + vehicle_place(); + ImGui::SameLine(); + if (ImGui::Button(STR_C("Place and drive")) && vehicle_place()) + { + Global.editor_enter_vehicle = tool.placed; + tool.leave = true; + } + } + if (false == tool.status.empty()) + ImGui::TextWrapped("%s", tool.status.c_str()); +} + +void editor_mode::draw_vehicle_marker() const +{ + auto const &tool{m_vehicle}; + if (false == tool.open || tool.track == nullptr) + return; + screen_projection const projection; + ImVec2 screen; + if (false == projection.project(tool.point, screen)) + return; + auto *drawlist{ImGui::GetBackgroundDrawList()}; + auto const colour{IM_COL32(255, 220, 60, 235)}; + drawlist->AddCircle(screen, 9.0f, colour, 16, 2.5f); + if (tool.track->m_editorremoved || tool.track->m_paths.empty()) + return; + auto const heading{heading_at(*tool.track, tool.track->eType == tt_Switch ? path_under(*tool.track, tool.point) : 0, tool.point) * static_cast(tool.facing)}; + glm::dvec3 const tip{tool.point.x + heading.x * 8.0, tool.point.y, tool.point.z + heading.y * 8.0}; + ImVec2 end; + if (false == projection.project(tip, end)) + return; + drawlist->AddLine(screen, end, colour, 3.0f); + auto const dx{end.x - screen.x}; + auto const dy{end.y - screen.y}; + auto const size{std::sqrt(dx * dx + dy * dy)}; + if (size < 1.0f) + return; + ImVec2 const unit{dx / size, dy / size}; + ImVec2 const side{-unit.y, unit.x}; + drawlist->AddTriangleFilled(ImVec2(end.x + unit.x * 10.0f, end.y + unit.y * 10.0f), ImVec2(end.x + side.x * 7.0f, end.y + side.y * 7.0f), ImVec2(end.x - side.x * 7.0f, end.y - side.y * 7.0f), colour); +} diff --git a/application/editorprojection.h b/application/editorprojection.h index 31825b0b6..75aa20ea1 100644 --- a/application/editorprojection.h +++ b/application/editorprojection.h @@ -76,6 +76,31 @@ class screen_projection auto const &mouse{ImGui::GetIO().MousePos}; return (position.x - mouse.x) * (position.x - mouse.x) + (position.y - mouse.y) * (position.y - mouse.y); } + // world space ray through the point of the screen + void ray(ImVec2 const &Screen, glm::dvec3 &Origin, glm::dvec3 &Direction) const + { + auto const inverse{glm::inverse(m_viewprojection)}; + glm::vec2 const ndc{m_size.x > 0.0f ? Screen.x / m_size.x * 2.0f - 1.0f : 0.0f, m_size.y > 0.0f ? 1.0f - Screen.y / m_size.y * 2.0f : 0.0f}; + auto nearpoint{inverse * glm::vec4(ndc, -1.0f, 1.0f)}; + auto farpoint{inverse * glm::vec4(ndc, 1.0f, 1.0f)}; + nearpoint /= nearpoint.w; + farpoint /= farpoint.w; + Origin = m_camera + glm::dvec3(glm::vec3(nearpoint)); + Direction = glm::normalize(glm::dvec3(glm::vec3(farpoint - nearpoint))); + } + // where the ray through the point of the screen crosses the level of the height; false if it runs along it or away + bool on_level(ImVec2 const &Screen, double const Height, glm::dvec3 &Point) const + { + glm::dvec3 origin, direction; + ray(Screen, origin, direction); + if (std::abs(direction.y) < 1e-6) + return false; + auto const distance{(Height - origin.y) / direction.y}; + if (distance < 0.0) + return false; + Point = origin + direction * distance; + return true; + } private: static constexpr float kNear{0.1f}; @@ -87,6 +112,9 @@ class screen_projection // starts a gizmo frame over the whole display, the view and the projection are those of the current camera struct gizmo_frame { + static inline int drawn{-1}; + // the cursor is over a gizmo shown in this frame, ImGuizmo alone tells it of the last one shown even when it's gone + static bool over() { return ImGui::GetFrameCount() - drawn <= 1 && ImGuizmo::IsOver(); } glm::mat4 view; glm::mat4 projection; glm::dvec3 camera; @@ -106,6 +134,7 @@ struct gizmo_frame { glm::vec3 snapvalue(Snap); float const *snap = Global.ctrlState && Snap > 0.0f ? &snapvalue.x : nullptr; + drawn = ImGui::GetFrameCount(); return ImGuizmo::Manipulate(&view[0][0], &projection[0][0], Operation, ImGuizmo::WORLD, &Gizmo[0][0], Delta != nullptr ? &(*Delta)[0][0] : nullptr, snap); } }; diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index 8015499f1..d757c35cd 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -109,6 +109,10 @@ void editor_ui::render_menu_contents() { if (ImGui::BeginMenu(STR_C("File"))) { + if (ImGui::MenuItem(STR_C("New scenery...")) && m_newscenery) + m_newscenery(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("The editor starts again with the wizard of a new scenery: its name and its centre on the map")); // changes go to the scenery files only if the scenery was loaded with its sources tracked auto const editsession{false == scene::Layers.empty()}; if (ImGui::MenuItem(STR_C("Save"), "Ctrl+S", false, editsession) && m_save) diff --git a/application/editoruilayer.h b/application/editoruilayer.h index f4e9679a8..6e37e4e3d 100644 --- a/application/editoruilayer.h +++ b/application/editoruilayer.h @@ -68,6 +68,7 @@ class editor_ui : public ui_layer } // actions of the file menu, performed by the editor mode void set_file_actions(std::function Save, std::function Export); + void set_new_scenery(std::function New) { m_newscenery = std::move(New); } // shows outcome of an operation in the layers window void set_status(std::string const &Status, bool const Error = false); @@ -84,6 +85,7 @@ class editor_ui : public ui_layer includes_panel m_includespanel{"Include database", false}; std::function m_save; std::function m_export; + std::function m_newscenery; brush_object_list m_brushobjects; bool m_insertrandom{false}; // insert mode picks a random template from m_insertset model_set_ref m_insertset; diff --git a/editor/editorAlignment.cpp b/editor/editorAlignment.cpp index 5bc319f35..cf894d636 100644 --- a/editor/editorAlignment.cpp +++ b/editor/editorAlignment.cpp @@ -97,18 +97,34 @@ struct compound_curve double shortened{1.0}; }; -compound_curve build_compound(double const Deflection, double const Radius1, double const Radius2, double const Lengthin, double const Lengthmiddle, double const Lengthout, double const Split) +compound_curve build_compound(double const Deflection, std::vector const &Arcs, double const Lengthin, double const Lengthout) { compound_curve result; - auto const k1{1.0 / Radius1}; - auto const k2{1.0 / Radius2}; - auto const transitions{(k1 * Lengthin + (k1 + k2) * Lengthmiddle + k2 * Lengthout) * 0.5}; + if (Arcs.empty()) + return result; + std::vector curvatures; + for (auto const &arc : Arcs) + curvatures.push_back(1.0 / std::max(1.0, arc.radius)); + auto transitions{curvatures.front() * Lengthin + curvatures.back() * Lengthout}; + for (std::size_t i = 1; i < Arcs.size(); ++i) + transitions += (curvatures[i - 1] + curvatures[i]) * std::max(0.0, Arcs[i].transition); + transitions *= 0.5; if (transitions > Deflection) result.shortened = Deflection / transitions * (1.0 - 1e-9); auto const f{result.shortened}; auto const arcs{std::max(0.0, Deflection - transitions * f)}; - auto const split{std::clamp(Split, 0.0, 1.0)}; - std::array const segments[] = {{0.0, k1, Lengthin * f}, {k1, k1, split * arcs / k1}, {k1, k2, Lengthmiddle * f}, {k2, k2, (1.0 - split) * arcs / k2}, {k2, 0.0, Lengthout * f}}; + double total{0.0}; + for (auto const &arc : Arcs) + total += std::max(0.0, arc.share); + std::vector> segments{{0.0, curvatures.front(), Lengthin * f}}; + for (std::size_t i = 0; i < Arcs.size(); ++i) + { + if (i > 0) + segments.push_back({curvatures[i - 1], curvatures[i], std::max(0.0, Arcs[i].transition) * f}); + auto const share{total > 0.0 ? std::max(0.0, Arcs[i].share) / total : 1.0 / static_cast(Arcs.size())}; + segments.push_back({curvatures[i], curvatures[i], share * arcs / curvatures[i]}); + } + segments.push_back({curvatures.back(), 0.0, Lengthout * f}); double x{0.0}, y{0.0}, heading{0.0}; for (auto const &segment : segments) { @@ -209,8 +225,11 @@ std::size_t element_pieces(element const &Element, transition_shape const Shape, case element_kind::spiral: { auto const turn{(Element.curvature_start + Element.curvature_end) * 0.5 * Element.length}; - auto const count{static_cast(std::max({1.0, std::ceil(turn / (Arcangle * kPi / 180.0) - 1e-9), std::ceil(Element.length / 20.0 - 1e-9)}))}; - return Element.curvature_start != Element.curvature_end ? std::max(count, std::max(1, Transitions)) : count; + auto const arcs{std::max(1.0, std::ceil(turn / (Arcangle * kPi / 180.0) - 1e-9))}; + if (Element.curvature_start == Element.curvature_end) + return static_cast(arcs); + auto const count{static_cast(std::max(arcs, std::ceil(Element.length / 20.0 - 1e-9)))}; + return std::max(count, std::max(1, Transitions)); } default: return 1; @@ -360,10 +379,17 @@ result fit_between(design const &Design) double tangent_out{0.0}; double deflection{0.0}; bool compound{false}; - double radius2{0.0}; - double transition_middle{0.0}; + std::vector arcs; std::function tangents; }; + auto const scaled = [](std::vector Arcs, double const Scale) { + for (auto &arc : Arcs) + { + arc.radius *= Scale; + arc.transition *= Scale; + } + return Arcs; + }; std::vector fits(count); for (std::size_t k = 0; k < count; ++k) { @@ -386,16 +412,17 @@ result fit_between(design const &Design) r.errors.emplace_back(format("Vertex %zu: a turn of about 180 or 360 degrees needs one more vertex", k + 1)); return r; } - if (vertex.compound) + if (vertex.compound && false == vertex.arcs.empty()) { fit.compound = true; - fit.radius2 = std::max(1.0, vertex.radius2); - fit.transition_middle = std::max(0.0, vertex.transition_middle); + fit.arcs = {{fit.radius, 0.0, vertex.share}}; + for (auto const &arc : vertex.arcs) + fit.arcs.push_back({std::max(1.0, arc.radius), std::max(0.0, arc.transition), arc.share}); fit.deflection = deflection; - fit.tangents = [&, k, directionin, directionout, side](double const Radius, double &Tangentin, double &Tangentout) { + fit.tangents = [&, k, directionin, directionout, side, scaled](double const Radius, double &Tangentin, double &Tangentout) { auto const &own{fits[k]}; auto const scale{Radius / own.radius}; - auto const shape{build_compound(own.deflection, Radius, own.radius2 * scale, own.transition_in * scale, own.transition_middle * scale, own.transition_out * scale, Design.vertices[k].split)}; + auto const shape{build_compound(own.deflection, scaled(own.arcs, scale), own.transition_in * scale, own.transition_out * scale)}; auto const normalin{perpendicular(directionin) * static_cast(side)}; auto const end{directionin * shape.end.x + normalin * shape.end.y}; auto const along{cross(directionout, end) / cross(directionout, directionin)}; @@ -485,9 +512,8 @@ result fit_between(design const &Design) else { fit.radius *= scales[k]; - fit.radius2 *= scales[k]; + fit.arcs = scaled(fit.arcs, scales[k]); fit.transition_in *= scales[k]; - fit.transition_middle *= scales[k]; fit.transition_out *= scales[k]; } r.warnings.emplace_back(format("Vertex %zu: R reduced from %.1f to %.1f m, transitions to %.1f / %.1f m, to fit between the ends", k + 1, Design.vertices[k].radius, fit.radius, fit.transition_in, fit.transition_out)); @@ -525,7 +551,7 @@ result fit_between(design const &Design) } if (fit.compound) { - auto const shape{build_compound(deflection, fit.radius, fit.radius2, fit.transition_in, fit.transition_middle, fit.transition_out, vertex.split)}; + auto const shape{build_compound(deflection, fit.arcs, fit.transition_in, fit.transition_out)}; if (shape.shortened < 1.0) r.warnings.emplace_back(format("Vertex %zu: transition curves shortened to fit the deflection angle", k + 1)); auto const normalin{perpendicular(directionin) * static_cast(side)}; @@ -541,7 +567,10 @@ result fit_between(design const &Design) auto const startchainage{chainage}; glm::dvec2 origin{curvestart}; glm::dvec2 heading{directionin}; - auto const peak{std::max(1.0 / fit.radius, 1.0 / fit.radius2)}; + auto sharpest{fit.radius}; + for (auto const &arc : fit.arcs) + sharpest = std::min(sharpest, arc.radius); + auto const peak{1.0 / sharpest}; for (auto const &segment : shape.segments) { element piece; @@ -568,14 +597,14 @@ result fit_between(design const &Design) curve_report report; report.vertex = static_cast(k); report.radius = fit.radius; - report.radius2 = fit.radius2; + for (auto const &arc : fit.arcs) + report.radii.push_back(arc.radius); report.transition_in = fit.transition_in * shape.shortened; report.transition_out = fit.transition_out * shape.shortened; report.deflection = deflection; report.arc_length = chainage - startchainage; report.tangent_in = glm::distance(position, curvestart); report.tangent_out = glm::distance(position, cursor); - auto const sharpest{std::min(fit.radius, fit.radius2)}; report.unbalanced = unbalanced_acceleration(Design.speed, sharpest, std::max(0.0, vertex.cant), Design.norms); report.recommended = recommend(Design.speed, sharpest, Design.norms); r.curves.push_back(report); diff --git a/editor/editorAlignment.hpp b/editor/editorAlignment.hpp index c57b386f1..732bd4545 100644 --- a/editor/editorAlignment.hpp +++ b/editor/editorAlignment.hpp @@ -37,6 +37,13 @@ struct limits double tangent_min_time{0.0}; }; +struct compound_arc +{ + double radius{600.0}; + double transition{0.0}; + double share{1.0}; +}; + struct vertex { glm::dvec2 position{0.0}; @@ -47,9 +54,8 @@ struct vertex double cant{0.0}; bool reverse_turn{false}; bool compound{false}; - double radius2{600.0}; - double transition_middle{0.0}; - double split{0.5}; + double share{1.0}; + std::vector arcs; }; struct design @@ -116,7 +122,7 @@ struct curve_report { int vertex{-1}; double radius{0.0}; - double radius2{0.0}; + std::vector radii; double transition_in{0.0}; double transition_out{0.0}; double deflection{0.0}; diff --git a/editor/editorGeometry.hpp b/editor/editorGeometry.hpp index 5b1db3e15..2253f43f9 100644 --- a/editor/editorGeometry.hpp +++ b/editor/editorGeometry.hpp @@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/. #include #include +#include #include #include "world/Segment.h" @@ -56,6 +57,36 @@ inline double grade_of(glm::dvec3 const &Direction) return Direction.y / std::max(1e-9, std::hypot(Direction.x, Direction.z)); } +inline std::vector arc_pieces(glm::dvec3 const &Point, glm::dvec2 const &Direction, double const Grade, double const Radius, double const Angle, int const Side) +{ + std::vector result; + double const side{static_cast(Side)}; + glm::dvec2 const centre{plan_of(Point) + glm::dvec2{-Direction.y, Direction.x} * (side * Radius)}; + auto const count{std::max(1, static_cast(std::ceil(Angle / glm::radians(90.0) - 1e-9)))}; + auto const step{Angle / count}; + auto const handle{4.0 / 3.0 * std::tan(step / 4.0) * Radius}; + glm::dvec2 const radial{plan_of(Point) - centre}; + for (int i = 0; i < count; ++i) + { + auto const a0{side * step * i}; + auto const a1{side * step * (i + 1)}; + auto const p0{centre + turned(radial, a0)}; + auto const p3{centre + turned(radial, a1)}; + auto const d0{turned(Direction, a0)}; + auto const d3{turned(Direction, a1)}; + auto const y0{Point.y + Grade * Radius * step * i}; + auto const y3{Point.y + Grade * Radius * step * (i + 1)}; + segment_data path; + path.points[segment_data::point::start] = {p0.x, y0, p0.y}; + path.points[segment_data::point::end] = {p3.x, y3, p3.y}; + path.points[segment_data::point::control1] = {d0.x * handle, Grade * handle, d0.y * handle}; + path.points[segment_data::point::control2] = {-d3.x * handle, -Grade * handle, -d3.y * handle}; + path.radius = static_cast(Radius); + result.push_back(path); + } + return result; +} + // path as a cubic Bezier curve; a path without control points is a straight with evenly spread parameter struct bezier { diff --git a/editor/editorIncludeInfo.cpp b/editor/editorIncludeInfo.cpp index 46116f9e8..8f7fe0053 100644 --- a/editor/editorIncludeInfo.cpp +++ b/editor/editorIncludeInfo.cpp @@ -246,6 +246,17 @@ bool parse(template_text const &Text, include_info &Info, std::string &Error) Info.name = document["name"].as(""); Info.category = document["category"].as(""); Info.description = document["description"].as(""); + if (auto const drive{document["switch"]}; drive.IsDefined() && drive.IsMap()) + { + Info.switch_hand = drive["hand"].as(""); + Info.switch_drive = drive["drive"].as(""); + } + if (auto const table{document["turntable"]}; table.IsDefined() && table.IsMap()) + { + Info.turntable_length = table["length"].as(0.0); + Info.turntable_angles = table["angles"].as(0); + Info.turntable_positions = table["positions"].as(0); + } if (auto const parameters{document["params"]}; parameters.IsDefined() && parameters.IsSequence()) { for (auto const &entry : parameters) @@ -633,7 +644,7 @@ std::string compose_directive(std::string const &File, std::vector return text + " end"; } -std::string directive(std::string const &File, include_info const &Info, int const Parameters, glm::dvec3 const &Location, std::optional Yaw) +std::string directive(std::string const &File, include_info const &Info, int const Parameters, glm::dvec3 const &Location, std::optional Yaw, std::string const &Track) { std::vector values; for (auto id = 1; id <= Parameters; ++id) @@ -661,6 +672,10 @@ std::string directive(std::string const &File, include_info const &Info, int con { value = "0"; } + else if (role == "track" && false == Track.empty()) + { + value = Track; + } else if (role == "name") { // names have to be unique in the scenery. the default value, or the name of the template, makes them recognizable diff --git a/editor/editorIncludeInfo.hpp b/editor/editorIncludeInfo.hpp index 90241406f..9f8ef370c 100644 --- a/editor/editorIncludeInfo.hpp +++ b/editor/editorIncludeInfo.hpp @@ -34,6 +34,11 @@ struct include_info std::string name; std::string category; std::string description; + std::string switch_hand; // a switch drive: side of the diverging track, left or right, looking from the start of the switch + std::string switch_drive; // and the side the drive stands on + double turntable_length{0.0}; + int turntable_angles{0}; + int turntable_positions{0}; std::vector parameters; // description of specified parameter, created if there's none @@ -66,7 +71,7 @@ bool complete(include_info const &Info, int Parameters, std::string *Issue = nul // builds include directive which places specified template. Location and Yaw are the placement to pass through // the parameters with matching roles, in the coordinates of the place the directive goes to; without Yaw the // rotation parameters receive their default values -std::string directive(std::string const &File, include_info const &Info, int Parameters, glm::dvec3 const &Location, std::optional Yaw); +std::string directive(std::string const &File, include_info const &Info, int Parameters, glm::dvec3 const &Location, std::optional Yaw, std::string const &Track = {}); // splits include directive into the name of the included file and the values of the parameters, both as they're // written. returns: false if the text isn't a complete include directive diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index d4dcb9c40..a3d4854ce 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -17,6 +17,9 @@ http: #include "scene/scene.h" #include "scene/scenelayers.h" #include "simulation/simulation.h" +#include "editor/editorIncludeInfo.hpp" +#include "world/Event.h" +#include "world/MemCell.h" #include "rendering/renderer.h" #include "utilities/Globals.h" #include "utilities/utilities.h" @@ -157,6 +160,7 @@ editor_track::state editor_track::capture(TTrack const &Track) result.sleeper_ballast = Track.m_sleeper_ballast_z; for (int i = 0; i < 6; ++i) result.events[i] = events(const_cast(Track), i); + result.name = Track.name(); return result; } @@ -257,6 +261,131 @@ void editor_track::apply(TTrack &Track, state const &State) Track.m_events = std::any_of(State.events.begin(), State.events.end(), [](auto const &Events) { return std::any_of(Events.begin(), Events.end(), [](auto const &Event) { return Event.second != nullptr; }); }); + if (State.name != Track.name()) + rename(Track, State.name); +} + +namespace +{ + +std::string lower_name(std::string Name) +{ + for (auto &character : Name) + if (character >= 'A' && character <= 'Z') + character = static_cast(character - 'A' + 'a'); + return Name; +} + +int track_parameter(scene::instance_handle const Instance, std::string &File, std::vector &Values) +{ + if (false == scene::Layers.tracked(Instance)) + return -1; + auto const &included{scene::Layers.instance(Instance)}; + if (included.removed || included.dead || included.file == nullptr) + return -1; + static std::map descriptions; + auto found{descriptions.find(*included.file)}; + if (found == descriptions.end()) + { + include_info info; + std::string error; + editor_includes::load(*included.file, info, error); + found = descriptions.emplace(*included.file, std::move(info)).first; + } + auto const index{editor_includes::parameter_with_role(found->second, "track") - 1}; + if (index < 0 || false == editor_includes::parse_directive(scene::Layers.directive(Instance), File, Values) || index >= static_cast(Values.size())) + return -1; + return index; +} + +} // namespace + +bool editor_track::name_valid(TTrack const &Track, std::string &Name, std::string &Reason, TTrack **Owner) +{ + Name = lower_name(Name); + if (Name.empty() || Name == "none") + { + Reason = "The path needs a name"; + return false; + } + if (Name.find_first_of(" \t\r\n\"';") != std::string::npos || Name.find("//") != std::string::npos) + { + Reason = "The name can't hold blanks, quotes, semicolons or //"; + return false; + } + auto *owner{simulation::Paths.find(Name)}; + if (owner != nullptr && owner != &Track && false == owner->m_editorremoved) + { + if (Owner != nullptr) + *Owner = owner; + Reason = "Another path has this name"; + return false; + } + Reason.clear(); + return true; +} + +editor_track::name_uses editor_track::uses_of_name(TTrack const &Track) +{ + name_uses result; + auto const &name{Track.name()}; + if (name.empty() || name == "none") + return result; + for (auto const *cell : simulation::Memory.sequence()) + result.cells += (cell != nullptr && cell->Track == &Track) ? 1 : 0; + for (scene::instance_handle handle = 1; handle <= scene::Layers.instance_count(); ++handle) + { + std::string file; + std::vector values; + auto const index{track_parameter(handle, file, values)}; + result.includes += (index >= 0 && lower_name(values[index]) == name) ? 1 : 0; + } + static std::array const kinds{"event0", "event1", "event2", "eventall0", "eventall1", "eventall2"}; + for (auto const *event : simulation::Events.sequence()) + { + if (event == nullptr) + continue; + auto const &eventname{event->name()}; + if (std::any_of(kinds.begin(), kinds.end(), [&](char const *Kind) { return eventname == name + ':' + Kind; })) + { + result.loose.push_back(eventname); + continue; + } + if (result.includes > 0 && eventname.compare(0, name.size(), name) == 0) + continue; + auto const targets{event->target_nodes()}; + if (std::find(targets.begin(), targets.end(), &Track) != targets.end()) + result.events.push_back(eventname); + } + return result; +} + +void editor_track::rename(TTrack &Track, std::string const &Name) +{ + auto const old{Track.name()}; + if (old == Name) + return; + simulation::Paths.rename(&Track, Name); + Track.m_name = Name; + Track.mark_dirty(); + for (auto *cell : simulation::Memory.sequence()) + if (cell != nullptr && cell->Track == &Track) + { + cell->asTrackName = Name; + cell->mark_dirty(); + } + if (old.empty() || old == "none") + return; + for (scene::instance_handle handle = 1; handle <= scene::Layers.instance_count(); ++handle) + { + std::string file; + std::vector values; + auto const index{track_parameter(handle, file, values)}; + if (index < 0 || lower_name(values[index]) != old) + continue; + values[index] = Name; + scene::Layers.modify(handle, editor_includes::compose_directive(file, values)); + } } bool editor_track::is_supported(TTrack const &Track) @@ -550,9 +679,13 @@ editor_track::snap_target editor_track::find_snap_target(TTrack const &Track, gl editor_track::snap_target editor_track::find_free_end(TTrack const *Self, int const Category, glm::dvec3 const &Position, double const Radius, std::vector const &Exclude) { - snap_target result; - result.distance = std::numeric_limits::max(); + auto const found{free_ends(Self, Category, Position, Radius, Exclude)}; + return found.empty() ? snap_target{} : found.front(); +} +std::vector editor_track::free_ends(TTrack const *Self, int const Category, glm::dvec3 const &Position, double const Radius, std::vector const &Exclude) +{ + std::vector result; auto const excluded = [&](TTrack const *Other) { return std::find(Exclude.begin(), Exclude.end(), Other) != Exclude.end(); }; auto const sections{simulation::Region->sections(Position, static_cast(Radius))}; for (auto *section : sections) @@ -561,7 +694,7 @@ editor_track::snap_target editor_track::find_free_end(TTrack const *Self, int co { for (auto *other : cell.m_directories.paths) { - if (other == Self || excluded(other) || (other->iCategoryFlag & 15) != Category || false == is_supported(*other)) + if (other == Self || excluded(other) || other->m_editorremoved || (other->iCategoryFlag & 15) != Category || false == is_supported(*other)) continue; for (int i = 0; i < static_cast(other->m_paths.size()); ++i) { @@ -570,7 +703,9 @@ editor_track::snap_target editor_track::find_free_end(TTrack const *Self, int co { auto const &point{path.points[point_index(kind)]}; auto const distance{glm::distance(point, Position)}; - if (distance > Radius || distance >= result.distance) + if (distance > Radius) + continue; + if (std::any_of(result.begin(), result.end(), [&](snap_target const &Found) { return Found.track == other && Found.point == point_ref{i, kind}; })) continue; auto const connections{connected_points(*other, point)}; if (std::any_of(connections.begin(), connections.end(), [&](auto const &Connection) { return false == excluded(Connection.first); })) @@ -590,16 +725,19 @@ editor_track::snap_target editor_track::find_free_end(TTrack const *Self, int co if (glm::length(direction) < 1e-6) continue; - result.track = other; - result.point = point_ref{i, kind}; - result.position = point; - result.direction = glm::normalize(direction); - result.distance = distance; + snap_target target; + target.track = other; + target.point = point_ref{i, kind}; + target.position = point; + target.direction = glm::normalize(direction); + target.distance = distance; + result.push_back(target); } } } } } + std::sort(result.begin(), result.end(), [](snap_target const &A, snap_target const &B) { return A.distance < B.distance; }); return result; } @@ -1341,42 +1479,31 @@ bool editor_track::analyse_curve(std::vector> const &R if (Curve.transition_in + Curve.transition_out >= std::accumulate(lengths.begin(), lengths.end(), 0.0)) Curve.transition_in = Curve.transition_out = 0.0; Curve.radius = smallest; - std::vector> arcs; + std::vector arcs; + double between{0.0}; for (std::size_t i = 0; i < run.size(); ++i) { if (varying[i] || curvatures[i] <= 0.0) + { + if (false == arcs.empty()) + between += lengths[i]; continue; + } auto const radius{1.0 / curvatures[i]}; - if (false == arcs.empty() && std::abs(arcs.back().first - radius) < 0.05 * radius) - arcs.back().second += lengths[i]; + if (false == arcs.empty() && std::abs(arcs.back().radius - radius) < 0.05 * radius) + arcs.back().turn += (lengths[i] + between) / radius; else - arcs.emplace_back(radius, lengths[i]); + arcs.push_back({radius, lengths[i] / radius, arcs.empty() ? 0.0 : between}); + between = 0.0; } if (arcs.size() >= 2 && Curve.reversals == 0) { - auto const &first{arcs.front()}; - auto const &last{arcs.back()}; - if (std::abs(first.first - last.first) > 0.1 * std::min(first.first, last.first)) + auto const [low, high]{std::minmax_element(arcs.begin(), arcs.end(), [](curve::arc_part const &A, curve::arc_part const &B) { return A.radius < B.radius; })}; + if (high->radius - low->radius > 0.1 * low->radius) { Curve.compound = true; - Curve.radius = first.first; - Curve.radius2 = last.first; - auto const turnfirst{first.second / first.first}; - auto const turnlast{last.second / last.first}; - Curve.split = turnfirst / std::max(1e-9, turnfirst + turnlast); - double middle{0.0}; - bool inside{false}; - for (std::size_t i = 0; i < run.size(); ++i) - { - if (false == varying[i]) - { - inside = true; - continue; - } - if (inside && i + 1 < run.size() && std::any_of(varying.begin() + i + 1, varying.end(), [](bool const Varying) { return false == Varying; })) - middle += lengths[i]; - } - Curve.transition_middle = middle; + Curve.radius = arcs.front().radius; + Curve.arcs = arcs; } } Curve.from = run.front().first; @@ -2131,14 +2258,6 @@ std::vector editor_track::standard_switch_templat {"Rz 1:26,5 R2500", 2500.0, 26.5, 0.0, 0.0}, }; std::vector result; - for (auto const &definition : {std::pair{190.0, "1:9"}, {300.0, "1:9"}, {500.0, "1:12"}}) - { - switch_template slip; - slip.double_slip = true; - slip.radius = definition.first; - slip.label = std::string{"Rkpd "} + definition.second + " R" + std::to_string(static_cast(definition.first)) + " double slip (click at a crossing of two straights)"; - result.push_back(slip); - } for (auto const &definition : definitions) { auto const angle{std::atan(1.0 / definition.ratio)}; @@ -2162,6 +2281,14 @@ std::vector editor_track::standard_switch_templat entry.label = std::string{definition.name} + " a " + std::to_string(a).substr(0, std::to_string(a).find('.') + 4) + " b " + std::to_string(b).substr(0, std::to_string(b).find('.') + 4) + (estimated ? " (b est.)" : ""); result.push_back(entry); } + for (auto const &slipping : {std::pair{190.0, "1:9"}, {300.0, "1:9"}, {500.0, "1:12"}}) + { + switch_template slip; + slip.double_slip = true; + slip.radius = slipping.first; + slip.label = std::string{"Rkpd "} + slipping.second + " R" + std::to_string(static_cast(slipping.first)) + " double slip (click at a crossing of two straights)"; + result.push_back(slip); + } return result; } @@ -2210,6 +2337,22 @@ material_handle ballast_of(TTrack const &Style) } // namespace +TTrack *editor_track::create_turntable(segment_data const &Path, TTrack const *Style, std::string const &Name) +{ + std::ostringstream text; + text.precision(std::numeric_limits::digits10); + auto const length{glm::distance(Path.points[segment_data::point::start], Path.points[segment_data::point::end])}; + if (Style != nullptr && (Style->iCategoryFlag & 15) == 1 && Style->m_visible) + write_header(text, "turn", length, Style->fSoundDistance, *Style, null_handle); + else + text << "turn " << length << " 1.435 0.15 25 20 0 flat vis rail_screw_used1 4 none 0.2 0.5 1.3 "; + write_points(text, Path); + text << "endtrack\n"; + auto *track{load_text(text.str(), Style, Name)}; + track->m_paths = {Path}; + return track; +} + TTrack *editor_track::create_switch(switch_template const &Template, std::vector const &Paths, TTrack const &Style, std::string const &Name) { if (Paths.size() < 2) diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index 6ed9d70bf..43d42762d 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -62,10 +62,22 @@ class editor_track glm::vec3 sleeper_offset{0.f}; float sleeper_ballast{0.f}; std::array>, 6> events; + std::string name; }; static state capture(TTrack const &Track); static void apply(TTrack &Track, state const &State); + static bool name_valid(TTrack const &Track, std::string &Name, std::string &Reason, TTrack **Owner = nullptr); + struct name_uses + { + int cells{0}; + int includes{0}; + std::vector events; + std::vector loose; + }; + static name_uses uses_of_name(TTrack const &Track); + static void rename(TTrack &Track, std::string const &Name); + // lists of the events of the path, in the order of event_keyword(): event0, event1, event2, eventall0, eventall1, eventall2 static std::vector> &events(TTrack &Track, int const Index); static char const *event_keyword(int const Index); @@ -116,6 +128,8 @@ class editor_track static snap_target find_snap_target(TTrack const &Track, glm::dvec3 const &Position, double const Radius, std::vector const &Exclude); // nearest end of a path of the category which nothing else joins; Self may be null static snap_target find_free_end(TTrack const *Self, int const Category, glm::dvec3 const &Position, double const Radius, std::vector const &Exclude); + // all of them within the radius, nearest first + static std::vector free_ends(TTrack const *Self, int const Category, glm::dvec3 const &Position, double const Radius, std::vector const &Exclude); static void snap_point(TTrack &Track, point_ref const &Point, snap_target const &Target, bool const Aligntangent); struct chain @@ -183,9 +197,13 @@ class editor_track double transition_out{0.0}; double cant{0.0}; bool compound{false}; - double radius2{0.0}; - double transition_middle{0.0}; - double split{0.5}; + struct arc_part + { + double radius{0.0}; + double turn{0.0}; + double transition{0.0}; + }; + std::vector arcs; }; static bool find_curve(TTrack &Track, straight_tolerance const &Tolerance, double const Gauge, curve &Curve); // curve made of the given paths, each with the flag of being run from its start @@ -292,6 +310,7 @@ class editor_track static glm::dvec3 point_at(TTrack const &Track, double const T); static std::vector place_switch(switch_template const &Template, glm::dvec3 const &Origin, glm::dvec2 const &Direction, int const Side, double const Grade); static TTrack *create_switch(switch_template const &Template, std::vector const &Paths, TTrack const &Style, std::string const &Name = {}); + static TTrack *create_turntable(segment_data const &Path, TTrack const *Style, std::string const &Name); static void move_straights(std::vector const &Lines, std::vector> const &Ends); static std::vector relay(chain const &Chain, std::vector const &Pieces); static void retire(TTrack &Track); diff --git a/lang/editor_pl.po b/lang/editor_pl.po index fc7b7c140..6f4ad28bc 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -419,6 +419,9 @@ msgstr "widok z góry" msgid "undo" msgstr "cofnij" +msgid "redo" +msgstr "ponów" + msgid "lay, switch, straight, curve, profile, speed, infra" msgstr "układanie, rozjazd, prosta, łuk, profil, prędkość, infrastruktura" @@ -1854,9 +1857,6 @@ msgstr "Modeli wchodzących w skrajnię: %zu%s" msgid " on the map" msgstr " na mapie" -msgid "none" -msgstr "brak" - msgid "Outline of %s (right half)" msgstr "Obrys %s (prawa połowa)" @@ -2023,3 +2023,1438 @@ msgstr "Rzeźbienie..." msgid "Opens the terrain tab of the editor settings: raising, lowering and smoothing with a brush" msgstr "Otwiera zakładkę terenu w ustawieniach edytora: podnoszenie, obniżanie i wygładzanie pędzlem" + +# scenery editor: track editor, selection, joints, parallel track, hectometre posts, fouling points + +msgid " (branch)" +msgstr " (zwrotny)" + +msgid " (main)" +msgstr " (zasadniczy)" + +msgid "%s set on %zu paths, Ctrl+Z takes it back" +msgstr "%s ustawiono na %zu odcinkach, Ctrl+Z cofa" + +msgid "%zu fouling point markers moved to their places, Ctrl+Z takes it back" +msgstr "Przestawiono %zu wskaźników ukresu na ich miejsca, Ctrl+Z cofa" + +msgid "%zu fouling point markers placed, Ctrl+Z takes them back" +msgstr "Postawiono %zu wskaźników ukresu, Ctrl+Z je usuwa" + +msgid "%zu found, the first %zu listed" +msgstr "Znaleziono %zu, pokazano pierwsze %zu" + +msgid "%zu hectometre posts moved to their places, Ctrl+Z takes it back" +msgstr "Przestawiono %zu słupków hektometrowych na ich miejsca, Ctrl+Z cofa" + +msgid "%zu hectometre posts placed, Ctrl+Z takes them back" +msgstr "Postawiono %zu słupków hektometrowych, Ctrl+Z je usuwa" + +msgid "%zu joints fixed, Ctrl+Z takes them back" +msgstr "Naprawiono %zu styków, Ctrl+Z cofa" + +msgid "%zu paths checked: %d gaps, %d steps, %d kinks, %d cant jumps, %d grade breaks" +msgstr "Sprawdzono %zu odcinków: %d szczelin, %d uskoków, %d załamań, %d skoków przechyłki, %d załamań pochylenia" + +msgid "%zu paths deleted, Ctrl+Z brings them back" +msgstr "Usunięto %zu odcinków, Ctrl+Z je przywraca" + +msgid "%zu paths selected, %.1f m" +msgstr "Zaznaczono %zu odcinków, %.1f m" + +msgid "%zu switches, %zu fouling points: %d without a marker, %d markers standing wrong" +msgstr "%zu rozjazdów, %zu ukresów: %d bez wskaźnika, %d wskaźników stoi źle" + +msgid "(of the direction of the line, see the preview)" +msgstr "(względem kierunku linii, patrz podgląd)" + +msgid ", %d free ends" +msgstr ", %d wolnych końców" + +msgid ", %zu in the files which can't be changed are left as they are" +msgstr ", %zu w plikach, których nie można zmieniać, zostaje bez zmian" + +msgid ", %zu with vehicles on them or in the files which can't be changed are left" +msgstr ", %zu z pojazdami albo w plikach, których nie można zmieniać, zostaje" + +msgid "3.5 m on the straight track; more on the curves, where the cars lean out" +msgstr "3,5 m na prostej; na łukach więcej, bo wagony się wychylają" + +msgid "A free end closer than this to the end of another path is a gap: the trains don't go across it.\nThe simulation joins the ends no more than 2 cm apart" +msgstr "Wolny koniec bliżej niż tyle od końca innego odcinka to szczelina: pociągi przez nią nie przejadą.\nSymulacja łączy końce oddalone najwyżej o 2 cm" + +msgid "A marker off by more (m) is wrong" +msgstr "Wskaźnik dalej niż tyle (m) stoi źle" + +msgid "A post standing off by more (m) is wrong" +msgstr "Słupek przesunięty o więcej (m) stoi źle" + +msgid "A switch has no line of its own: select a plain path" +msgstr "Rozjazd nie ma własnej linii: zaznacz zwykły odcinek" + +msgid "Add to the selection" +msgstr "Dodaj do zaznaczenia" + +msgid "Along the line each way (m)" +msgstr "Wzdłuż linii w każdą stronę (m)" + +msgid "Along the line of the selected path" +msgstr "Wzdłuż linii zaznaczonego odcinka" + +msgid "Around the camera" +msgstr "Wokół kamery" + +msgid "Around the camera (m)" +msgstr "Wokół kamery (m)" + +msgid "Build %zu paths, %.1f m" +msgstr "Zbuduj %zu odcinków, %.1f m" + +msgid "Cant jump (mm)" +msgstr "Skok przechyłki (mm)" + +msgid "Circuits" +msgstr "Obwody" + +msgid "Copy the name" +msgstr "Kopiuj nazwę" + +msgid "Delete" +msgstr "Usuń" + +msgid "Delete %zu paths" +msgstr "Usuń %zu odcinków" + +msgid "Ends of the paths which almost meet, steps, kinks, jumps of the cant and of the grade at the joints" +msgstr "Końce odcinków, które prawie się stykają, uskoki, załamania, skoki przechyłki i pochylenia na stykach" + +msgid "Ends of the paths which almost meet, steps, kinks,\njumps of the cant and of the grade at the joints" +msgstr "Końce odcinków, które prawie się stykają, uskoki, załamania,\nskoki przechyłki i pochylenia na stykach" + +msgid "Environment" +msgstr "Otoczenie" + +msgid "Find a track by its name (Ctrl+F)" +msgstr "Znajdź tor po nazwie (Ctrl+F)" + +msgid "Fix" +msgstr "Napraw" + +msgid "Fix %zu listed" +msgstr "Napraw %zu z listy" + +msgid "Fix this one" +msgstr "Napraw ten" + +msgid "Fouling point markers" +msgstr "Wskaźniki ukresu (W17)" + +msgid "Free ends too" +msgstr "Także wolne końce" + +msgid "From the axis (m)" +msgstr "Od osi toru (m)" + +msgid "Gap up to (m)" +msgstr "Szczelina do (m)" + +msgid "Gaps: the free end goes to the other end, along it. Steps: the end goes to the other one.\nKinks and grade breaks: the end is turned in line with the other path. Cant: the cant of the other path.\nThe plain path moves, a switch stays as it is. One Ctrl+Z takes it all back" +msgstr "Szczeliny: wolny koniec idzie do drugiego końca, w jego kierunku. Uskoki: koniec idzie do drugiego.\nZałamania kierunku i pochylenia: koniec obraca się w linię z drugim odcinkiem. Przechyłka: taka jak na drugim odcinku.\nRusza się zwykły odcinek, rozjazd zostaje. Jedno Ctrl+Z cofa wszystko" + +msgid "Grade break (per mille)" +msgstr "Załamanie pochylenia (‰)" + +msgid "Hectometre posts" +msgstr "Słupki hektometrowe" + +msgid "Hectometre posts from here" +msgstr "Słupki hektometrowe od tego miejsca" + +msgid "Joints" +msgstr "Styki" + +msgid "Joints: LMB on a row shows the place" +msgstr "Styki: LPM na wierszu pokazuje miejsce" + +msgid "Kilometrage read from %zu posts standing along the line" +msgstr "Kilometraż odczytany z %zu słupków stojących przy linii" + +msgid "Kilometrage read from the post %s, check which way it grows" +msgstr "Kilometraż odczytany ze słupka %s, sprawdź, w którą stronę rośnie" + +msgid "Kilometre at the point (km)" +msgstr "Kilometr w tym miejscu (km)" + +msgid "Kink (deg)" +msgstr "Załamanie (st.)" + +msgid "Left" +msgstr "Lewa" + +msgid "Line %.0f m, km %s - %s: %d posts to place, %zu standing, %d of them wrong" +msgstr "Linia %.0f m, km %s - %s: %d słupków do postawienia, %zu stoi, %d z nich źle" + +msgid "Look at it" +msgstr "Pokaż" + +msgid "Marker" +msgstr "Wskaźnik" + +msgid "Move %d wrong markers to their places" +msgstr "Przestaw %d źle stojących wskaźników" + +msgid "Move %d wrong posts to their places" +msgstr "Przestaw %d źle stojących słupków" + +msgid "No line through this path" +msgstr "Przez ten odcinek nie biegnie żadna linia" + +msgid "No track of that name" +msgstr "Nie ma toru o takiej nazwie" + +msgid "Nothing could be fixed: the paths are switches or in the files which can't be changed" +msgstr "Nic nie dało się naprawić: to rozjazdy albo odcinki w plikach, których nie można zmieniać" + +msgid "Parallel track" +msgstr "Tor równoległy" + +msgid "Parallel track of %zu paths, %.1f m, %.2f m away; Ctrl+Z takes it back" +msgstr "Tor równoległy z %zu odcinków, %.1f m, w rozstawie %.2f m; Ctrl+Z cofa" + +msgid "Place %d markers" +msgstr "Postaw %d wskaźników" + +msgid "Place %d posts" +msgstr "Postaw %d słupków" + +msgid "Posts" +msgstr "Słupki" + +msgid "RMB on a track" +msgstr "PPM na torze" + +msgid "Rails" +msgstr "Szyny" + +msgid "Read from the posts" +msgstr "Odczytaj ze słupków" + +msgid "Right" +msgstr "Prawa" + +msgid "Second track alongside, curves included: radius R minus or plus the spacing,\nthe same transitions and cant, heights on the plane of the cant" +msgstr "Drugi tor obok, także na łukach: promień R minus albo plus rozstaw,\nte same krzywe przejściowe i przechyłka, wysokości na płaszczyźnie przechyłki" + +msgid "Select a path of the line, or RMB on it: Hectometre posts" +msgstr "Zaznacz odcinek linii albo PPM na nim: Słupki hektometrowe" + +msgid "Select a switch, or check around the camera" +msgstr "Zaznacz rozjazd albo sprawdź wokół kamery" + +msgid "Shift+LMB" +msgstr "Shift+LPM" + +msgid "Side, looking where it grows" +msgstr "Strona, patrząc w kierunku wzrostu" + +msgid "Spacing (m)" +msgstr "Rozstaw (m)" + +msgid "Spacing of the axes (m)" +msgstr "Odległość osi torów (m)" + +msgid "Speed check of the line" +msgstr "Sprawdź prędkość linii" + +msgid "Split here" +msgstr "Podziel tutaj" + +msgid "Step (m)" +msgstr "Uskok (m)" + +msgid "Take out of the selection" +msgstr "Usuń z zaznaczenia" + +msgid "Templates can be placed only in a scenery opened for editing (-edit)" +msgstr "Szablony można stawiać tylko w scenerii otwartej do edycji (-edit)" + +msgid "The active layer can't take them" +msgstr "Aktywna warstwa ich nie przyjmie" + +msgid "The active layer can't take them: " +msgstr "Aktywna warstwa ich nie przyjmie: " + +msgid "The file of the active layer would receive them with a rotation or a scale in effect, pick another layer" +msgstr "Plik aktywnej warstwy dostałby je z obrotem albo skalą, wybierz inną warstwę" + +msgid "The gizmo moves them together, W turns them; Shift+LMB adds or takes out a path" +msgstr "Gizmo przesuwa je razem, W obraca; Shift+LPM dodaje albo usuwa odcinek" + +msgid "The kilometrage grows" +msgstr "Kilometraż rośnie" + +msgid "The line, up to the switches" +msgstr "Linia, do rozjazdów" + +msgid "The numbers of the %zu posts along the line don't go by 100 m, the kilometrage wasn't read from them" +msgstr "Numery %zu słupków przy linii nie idą co 100 m, kilometrażu z nich nie odczytano" + +msgid "The scenery isn't opened for editing, the new track won't be saved" +msgstr "Sceneria nie jest otwarta do edycji, nowy tor nie zostanie zapisany" + +msgid "The selected switch" +msgstr "Zaznaczony rozjazd" + +msgid "The spacing is larger than the radius of %s" +msgstr "Rozstaw jest większy niż promień odcinka %s" + +msgid "This path" +msgstr "Ten odcinek" + +msgid "Trackbed" +msgstr "Podsypka" + +msgid "Turned by (deg)" +msgstr "Obrót (st.)" + +msgid "Velocity" +msgstr "Prędkość" + +msgid "Vertical profile of the line" +msgstr "Profil podłużny linii" + +msgid "W17 %.1f m off" +msgstr "W17 o %.1f m za daleko" + +msgid "W17 where the axes of the tracks meeting at a switch are the spacing apart,\nhalf way between them" +msgstr "W17 tam, gdzie osie torów zbiegających się na rozjeździe są o rozstaw od siebie,\nw połowie międzytorza" + +msgid "Whole straight" +msgstr "Cała prosta" + +msgid "adds a track to the selection, drag: a box" +msgstr "dodaje tor do zaznaczenia, przeciągnięcie: prostokąt" + +msgid "against it" +msgstr "przeciwnie" + +msgid "along the line" +msgstr "zgodnie z linią" + +msgid "cant jump" +msgstr "skok przechyłki" + +msgid "fixed" +msgstr "naprawiono" + +msgid "free end" +msgstr "wolny koniec" + +msgid "gap" +msgstr "szczelina" + +msgid "grade break" +msgstr "załamanie pochylenia" + +msgid "joins the ends, aligns them" +msgstr "łączy końce, wyrównuje je" + +msgid "kink" +msgstr "załamanie" + +msgid "km %s stands %+.1f m off##%u" +msgstr "km %s stoi %+.1f m od miejsca##%u" + +msgid "km %s, %+.1f m off" +msgstr "km %s, %+.1f m od miejsca" + +msgid "modes: lay, switch, straight, curve, profile, speed, joints, infra" +msgstr "tryby: układanie, rozjazd, prosta, łuk, profil, prędkość, styki, infrastruktura" + +msgid "show the place" +msgstr "pokazuje miejsce" + +msgid "step" +msgstr "uskok" + +msgid "texture of the rails" +msgstr "tekstura szyn" + +msgid "texture of the trackbed" +msgstr "tekstura podsypki" + +msgid "there's no active layer" +msgstr "nie ma aktywnej warstwy" + +msgid "track circuits, separated by spaces" +msgstr "obwody torowe, oddzielone spacjami" + +msgid "type the length" +msgstr "wpisz długość" + +msgid "type the length of the next leg, Enter adds the point" +msgstr "wpisz długość następnego odcinka, Enter dodaje punkt" + +msgid "type the radius, a space, the length" +msgstr "wpisz promień, spację, długość" + +msgid "type the shift, + to the left" +msgstr "wpisz przesunięcie, + w lewo" + +msgid "type the turn in degrees, + to the left" +msgstr "wpisz obrót w stopniach, + w lewo" + +msgid "what can be done with it" +msgstr "co można z nim zrobić" + +msgid "Vehicle on the track" +msgstr "Pojazd na torze" + +msgid "A vehicle to drive, placed where RMB on the track was clicked, or in the middle of the path.\nIt isn't written to the scenery files" +msgstr "Pojazd do jazdy, stawiany tam, gdzie kliknięto PPM na torze, albo w połowie odcinka.\nNie jest zapisywany do plików scenerii" + +msgid "search: name, series, skin" +msgstr "szukaj: nazwa, seria, malowanie" + +msgid "Only the ones with a cab" +msgstr "Tylko z kabiną" + +msgid "With a driver, to drive" +msgstr "Z maszynistą, do jazdy" + +msgid "Nobody, parked" +msgstr "Bez obsady, odstawiony" + +msgid "Pick a vehicle from the list" +msgstr "Wybierz pojazd z listy" + +msgid "Place" +msgstr "Postaw" + +msgid "Place and drive" +msgstr "Postaw i jedź" + +msgid "The vehicle couldn't be placed, the log says why" +msgstr "Nie udało się postawić pojazdu, przyczyna jest w logu" + +msgid "%s stands on %s. It isn't saved with the scenery" +msgstr "%s stoi na %s. Nie zapisuje się razem ze scenerią" + +msgid "Place a vehicle here" +msgstr "Postaw tu pojazd" + +msgid "Map" +msgstr "Mapa" + +msgid "Orthophoto" +msgstr "Ortofotomapa" + +msgid "Orthophoto settings..." +msgstr "Ustawienia ortofotomapy..." + +msgid "Orthophoto##window" +msgstr "Ortofotomapa##window" + +msgid "Aerial imagery of geoportal.gov.pl under the scenery, laid out by the origin of the scenery" +msgstr "Zdjęcia lotnicze z geoportal.gov.pl pod scenerią, ułożone według punktu odniesienia scenerii" + +msgid "in the scenery file: Y (easting) %.0f m, X (northing) %.0f m" +msgstr "w pliku scenerii: Y (wschód) %.0f m, X (północ) %.0f m" + +msgid "Use it" +msgstr "Użyj" + +msgid "Model along the track" +msgstr "Model wzdłuż toru" + +msgid "A model bent to follow the track, or repeated along it: platforms, walls, fences, barriers, lamps" +msgstr "Model wygięty wzdłuż toru albo powtarzany przy nim: perony, mury, płoty, bariery, latarnie" + +msgid "By this track:" +msgstr "Przy tym torze:" + +msgid "New one" +msgstr "Nowy" + +msgid "model, e.g. peronowe/1k96w200m" +msgstr "model, np. peronowe/1k96w200m" + +msgid "search the models" +msgstr "szukaj modeli" + +msgid "Skin" +msgstr "Skóra" + +msgid "The model is %.2f m long along the track" +msgstr "Model ma %.2f m długości wzdłuż toru" + +msgid "The model has no triangles to lay, or it can't be loaded" +msgstr "Model nie ma trójkątów do ułożenia albo nie da się go wczytać" + +msgid "Bent along the track" +msgstr "Wygięty wzdłuż toru" + +msgid "Repeated" +msgstr "Powtarzany" + +msgid "Copy length (m, 0: the model's)" +msgstr "Długość kopii (m, 0: jak model)" + +msgid "Step (m, 0: the model's length)" +msgstr "Krok (m, 0: długość modelu)" + +msgid "Sideways (m, + left)" +msgstr "W bok (m, + w lewo)" + +msgid "Up (m)" +msgstr "W górę (m)" + +msgid "Axis of the model along the track" +msgstr "Oś modelu wzdłuż toru" + +msgid "Turned around" +msgstr "Odwrócony" + +msgid "Mirrored" +msgstr "Lustrzany" + +msgid "Leans with the cant" +msgstr "Przechyla się z przechyłką" + +msgid "Along" +msgstr "Wzdłuż" + +msgid "this path" +msgstr "tego odcinka" + +msgid "the line to the switches" +msgstr "linii do rozjazdów" + +msgid "through the switches" +msgstr "przez rozjazdy" + +msgid "From (m)" +msgstr "Od (m)" + +msgid "To (m, -1: the end)" +msgstr "Do (m, -1: koniec)" + +msgid "LMB where it starts, the distance from the track sets the offset; drag to where it ends" +msgstr "LPM tam, gdzie się zaczyna (odległość od toru ustawia przesunięcie), przeciągnij do końca" + +msgid "Mark it in the view" +msgstr "Zaznacz w widoku" + +msgid "line %.0f m" +msgstr "linia %.0f m" + +msgid "Lay it" +msgstr "Ułóż" + +msgid "Lay it again along the selected line" +msgstr "Ułóż ponownie wzdłuż zaznaczonej linii" + +msgid "%s laid along %.1f m, Ctrl+Z takes it back" +msgstr "%s ułożony na %.1f m, Ctrl+Z cofa" + +msgid "The scenery isn't opened for editing, it won't be saved" +msgstr "Sceneria nie jest otwarta do edycji, to nie zostanie zapisane" + +msgid "type the shift, + to the right" +msgstr "wpisz przesunięcie, + w prawo" + +msgid "type the turn in degrees, + to the right" +msgstr "wpisz obrót w stopniach, + w prawo" + +msgid "Sideways (m, + right)" +msgstr "W bok (m, + w prawo)" + +msgid "model origin" +msgstr "początek modelu" + +msgid "side facing the track" +msgstr "strona od toru" + +msgid "far side" +msgstr "dalsza strona" + +msgid "middle" +msgstr "środek" + +msgid "Up (m, from the rail top)" +msgstr "W górę (m, od główki szyny)" + +msgid "bottom" +msgstr "spód" + +msgid "top" +msgstr "wierzch" + +msgid "Platform edge:" +msgstr "Krawędź peronu:" + +msgid "The edge of the platform 1.725 m from the axis of the track, its top this high over the rail top" +msgstr "Krawędź peronu 1,725 m od osi toru, wierzch tyle nad główką szyny" + +msgid "Parameters of the template" +msgstr "Parametry szablonu" + +msgid "The location and the rotation are zeros, the template is laid out along the track" +msgstr "Położenie i obrót są zerami, szablon układa się wzdłuż toru" + +msgid "top of the edge by the track" +msgstr "wierzch krawędzi od toru" + +msgid "Edge to the track" +msgstr "Krawędź do toru" + +msgid "The model is turned so its -x side faces the track, the way the platforms and the walls of the scenery are made" +msgstr "Model jest obrócony stroną -x do toru, tak jak są zrobione perony i mury w scenerii" + +msgid "Length" +msgstr "Długość" + +msgid "as the original" +msgstr "jak oryginał" + +msgid "given" +msgstr "podana" + +msgid "the whole stretch" +msgstr "cały zakres" + +msgid "%.1f m: %d copies of %.2f m (the original %.2f m)" +msgstr "%.1f m: %d kopii po %.2f m (oryginał %.2f m)" + +msgid "%.1f m: %d copies every %.2f m" +msgstr "%.1f m: %d kopii co %.2f m" + +msgid "The line ends before that, it's cut there" +msgstr "Linia kończy się wcześniej, tam zostanie ucięte" + +msgid "Set back by the widening of the structure gauge in the curves" +msgstr "Odsunięty o poszerzenie skrajni na łukach" + +msgid "The offset grows by the widening of the gauge below the platforms: 3.75/R in the curves of R >= 250 m,\nmore in the sharper ones, and on the inner side of a canted curve by the cant times the height of the edge / 1.5;\nit begins 20 m (inner side) and 26 m (outer side) ahead of the curve, as in the gauge check" +msgstr "Przesunięcie rośnie o poszerzenie skrajni poniżej peronów: 3,75/R na łukach R >= 250 m,\nwięcej na ciaśniejszych, a po wewnętrznej stronie łuku z przechyłką o przechyłkę razy wysokość krawędzi / 1,5;\nzaczyna się 20 m (strona wewnętrzna) i 26 m (zewnętrzna) przed łukiem, jak w sprawdzaniu skrajni" + +msgid "On the ground" +msgstr "Na gruncie" + +msgid "Over the rail heads" +msgstr "Nad główką szyny" + +msgid "by (m)" +msgstr "o (m)" + +msgid "A marker higher or lower by more (m) is wrong" +msgstr "Wskaźnik wyżej lub niżej o więcej (m) stoi źle" + +msgid "W17 %.1f m off, %+.2f m high" +msgstr "W17 %.1f m od miejsca, %+.2f m wysokości" + +msgid "alternately" +msgstr "naprzemiennie" + +msgid "The even hectometres on the right, the odd ones on the left" +msgstr "Parzyste hektometry po prawej, nieparzyste po lewej" + +msgid "Objects" +msgstr "Obiekty" + +msgid "Along the track: platforms and other models, hectometre posts, fouling point markers, a parallel track, a vehicle to drive" +msgstr "Przy torze: perony i inne modele, słupki hektometrowe, wskaźniki ukresu, tor równoległy, pojazd do jazdy" + +msgid "Model along the track: release where it ends" +msgstr "Model wzdłuż toru: puść tam, gdzie się kończy" + +msgid "Model along the track: LMB by the track where it starts, drag to the end" +msgstr "Model wzdłuż toru: LPM przy torze tam, gdzie się zaczyna, przeciągnij do końca" + +msgid "Objects along the track" +msgstr "Obiekty przy torze" + +msgid "LMB by the track" +msgstr "LPM przy torze" + +msgid "where it starts, the side of the track it goes on" +msgstr "tam, gdzie się zaczyna, po tej stronie toru" + +msgid "to where it ends, a click: one as long as the original" +msgstr "do końca; samo kliknięcie: jeden jak oryginał" + +msgid "lays it" +msgstr "układa" + +msgid "LMB away from the track" +msgstr "LPM z dala od toru" + +msgid "selects another track" +msgstr "zaznacza inny tor" + +msgid "the line the objects go along" +msgstr "linia, wzdłuż której idą obiekty" + +msgid "modes: lay, switch, straight, curve, objects, profile, speed, joints, infra" +msgstr "tryby: układanie, rozjazd, prosta, łuk, obiekty, profil, prędkość, styki, infrastruktura" + +msgid "Platforms and models" +msgstr "Perony i modele" + +msgid "Fouling points" +msgstr "Ukresy W17" + +msgid "Vehicle" +msgstr "Pojazd" + +msgid "LMB on a track: the line the objects go along" +msgstr "LPM na torze: linia, wzdłuż której idą obiekty" + +msgid "%zu duplicate hectometre posts removed, Ctrl+Z brings them back" +msgstr "Usunięto %zu zdublowanych słupków hektometrowych, Ctrl+Z je przywraca" + +msgid "Remove %d duplicate posts" +msgstr "Usuń %d zdublowanych słupków" + +msgid "Posts with a number another post nearer to its place already has" +msgstr "Słupki z numerem, który ma już inny słupek stojący bliżej swojego miejsca" + +msgid "km %s duplicate##%u" +msgstr "km %s zdublowany##%u" + +msgid "km %s stands %.1f m from its place##%u" +msgstr "km %s stoi %.1f m od swojego miejsca##%u" + +msgid "km %s duplicate" +msgstr "km %s zdublowany" + +msgid "km %s, %.1f m from its place" +msgstr "km %s, %.1f m od swojego miejsca" + +# scenery editor: what a click does + +msgid "Click: start from this free end, drag: lead a track out of it" +msgstr "Klik: zacznij od tego wolnego końca, przeciągnij: wyprowadź z niego tor" + +msgid "Click: join this end and lay" +msgstr "Klik: dołącz do tego końca i ułóż" + +msgid "Click: start of the new track" +msgstr "Klik: początek nowego toru" + +msgid "Click: next point" +msgstr "Klik: następny punkt" + +msgid "Press: where the model starts, drag to its end" +msgstr "Wciśnij: początek modelu, przeciągnij do jego końca" + +msgid "Drag: the tracks in a box join the selection" +msgstr "Przeciągnij: tory w ramce dołączą do zaznaczenia" + +msgid "Click: take out of the selection, drag: a box" +msgstr "Klik: usuń z zaznaczenia, przeciągnij: ramka" + +msgid "Click: add to the selection, drag: a box" +msgstr "Klik: dodaj do zaznaczenia, przeciągnij: ramka" + +msgid "Drag: the control vector, the curve follows" +msgstr "Przeciągnij: wektor kontrolny, krzywa podąża" + +msgid "Drag: the joint, the neighbours follow" +msgstr "Przeciągnij: styk, sąsiednie tory podążają" + +msgid "Drag: the end, dropped on a free end it joins it" +msgstr "Przeciągnij: koniec, upuszczony na wolny koniec łączy się z nim" + +msgid "Click: move this straight together with the others" +msgstr "Klik: przesuwaj tę prostą razem z pozostałymi" + +msgid "Press: break the straight here, drag to turn the rest" +msgstr "Wciśnij: załam prostą tutaj, przeciągnij, by obrócić resztę" + +msgid "Click: next point of the shift around an obstacle" +msgstr "Klik: następny punkt objazdu przeszkody" + +msgid "Click: break the straight here" +msgstr "Klik: załam prostą tutaj" + +msgid "Click: start of the shift" +msgstr "Klik: początek przesunięcia" + +msgid "Click: shift the straight sideways" +msgstr "Klik: przesuń prostą w bok" + +msgid "Click: move this end of the straight" +msgstr "Klik: przesuń ten koniec prostej" + +msgid "Click: move this vertex" +msgstr "Klik: przesuń ten wierzchołek" + +msgid "Click: change the radius of this curve" +msgstr "Klik: zmień promień tego łuku" + +msgid "Press and drag: a switch here, along sets its direction, sideways its side" +msgstr "Wciśnij i przeciągnij: rozjazd tutaj, wzdłuż ustala kierunek, w bok stronę" + +msgid "Click: the whole straight through this track" +msgstr "Klik: cała prosta przez ten tor" + +msgid "Click: the curve of this track with its straights" +msgstr "Klik: łuk tego toru z prostymi" + +msgid "Click: edit this switch" +msgstr "Klik: edytuj ten rozjazd" + +msgid "Click: choose this track, then the type of the switch" +msgstr "Klik: wybierz ten tor, potem typ rozjazdu" + +msgid "Click: put a switch into this track" +msgstr "Klik: wstaw rozjazd w ten tor" + +msgid "Click: the grade line through this track" +msgstr "Klik: niweleta przez ten tor" + +msgid "Click: the line the objects go along" +msgstr "Klik: linia, wzdłuż której idą obiekty" + +msgid "Click: select" +msgstr "Klik: zaznacz" + +msgid "Laying track: new path from the free end" +msgstr "Układanie toru: nowy odcinek z wolnego końca" + +msgid "Select: moving the point" +msgstr "Wybór: przesuwanie punktu" + +msgid "Switch: the selected one. Another: LMB on a track, then its type" +msgstr "Rozjazd: zaznaczony. Kolejny: LPM na torze, potem typ" + +msgid "Switch: choose its type from the list" +msgstr "Rozjazd: wybierz typ z listy" + +msgid "Drag from a free end" +msgstr "Przeciągnij z wolnego końca" + +msgid "straight along it, to another free end: a curve joining them" +msgstr "prosta wzdłuż niego, do innego wolnego końca: łuk łączący" + +msgid "moves the point, level" +msgstr "przesuwa punkt w poziomie" + +msgid "Over a free end" +msgstr "Nad wolnym końcem" + +msgid "the end joins it" +msgstr "koniec się z nim łączy" + +msgid "done" +msgstr "gotowe" + +msgid "moves it, an end dropped on a free end joins it" +msgstr "przesuwa go, koniec upuszczony na wolny koniec łączy się" + +msgid "Gizmo" +msgstr "Gizmo" + +msgid "moves the point along the axes" +msgstr "przesuwa punkt wzdłuż osi" + +msgid "L" +msgstr "L" + +msgid "new track, also from a free end" +msgstr "nowy tor, także z wolnego końca" + +msgid "Esc" +msgstr "Esc" + +msgid "deselects" +msgstr "odznacza" + +msgid "List below" +msgstr "Lista poniżej" + +msgid "choose the type of the switch to put in" +msgstr "wybierz typ rozjazdu do wstawienia" + +msgid "choose the straight or the curve" +msgstr "wybierz prostą albo łuk" + +msgid "Dragging from a free end draws a curve through the cursor; off: it draws a straight along the end" +msgstr "Przeciąganie z wolnego końca rysuje łuk przez kursor; wyłączone: prostą wzdłuż końca" + +msgid "Enter" +msgstr "Enter" + +msgid "lay up to the cursor" +msgstr "ułóż do kursora" + +msgid "Shift" +msgstr "Shift" + +msgid "straight on in the direction of the track" +msgstr "prosto w kierunku toru" + +msgid "straight, joins nothing" +msgstr "prosto, bez łączenia" + +msgid "moves the whole track" +msgstr "przesuwa cały tor" + +msgid "The gizmo moves them together; Shift+LMB adds or takes out a path" +msgstr "Gizmo przesuwa je razem; Shift+LPM dodaje albo usuwa odcinek" + +msgid "Double slip switches" +msgstr "Rozjazdy krzyżowe podwójne" + +msgid "Only at a crossing of two straights" +msgstr "Tylko na skrzyżowaniu dwóch prostych" + +msgid "Drag: shift the straight sideways" +msgstr "Przeciągnij: przesuń prostą w bok" + +msgid "Drag: move this end, the curves at it follow" +msgstr "Przeciągnij: przesuń ten koniec, łuki przy nim podążają" + +msgid "Drag: move this vertex, the curve follows" +msgstr "Przeciągnij: przesuń wierzchołek, łuk podąża" + +msgid "Drag: the radius of this curve" +msgstr "Przeciągnij: promień tego łuku" + +msgid "Compound curve (several radii)" +msgstr "Łuk koszowy (kilka promieni)" + +msgid "Curve made of arcs of different radii, each one its own path, joined with transitions" +msgstr "Łuk z kilku łuków o różnych promieniach, każdy osobnym odcinkiem, połączonych krzywymi przejściowymi" + +msgid "Share of R%d" +msgstr "Udział R%d" + +msgid "Radius R%d (m)" +msgstr "Promień R%d (m)" + +msgid "Transition R%d-R%d (m)" +msgstr "Przejściowa R%d-R%d (m)" + +msgid "Takes this radius out of the curve" +msgstr "Usuwa ten promień z łuku" + +msgid "Add a radius" +msgstr "Dodaj promień" + +msgid "Another arc after the last one, the angle of the curve is shared out by the shares" +msgstr "Kolejny łuk za ostatnim; kąt zwrotu dzielony według udziałów" + +msgid "Formation under the ballast of the track" +msgstr "Korona pod podsypką toru" + +msgid "The terrain goes as deep under the track as its ballast reaches and as wide as its foot,\nread from each path of the route; off: the values given below" +msgstr "Teren schodzi pod torem tak głęboko, jak sięga jego podsypka, i tak szeroko, jak jej podstawa,\nodczytane z każdego odcinka trasy; wyłączone: wartości podane niżej" + +msgid "Ballast %.2f m deep, its foot %.2f m from the axis" +msgstr "Podsypka %.2f m, jej podstawa %.2f m od osi" + +msgid "Formation below the track (m)" +msgstr "Korona poniżej toru (m)" + +msgid "Name##switchname" +msgstr "Nazwa##switchname" + +msgid "Name of the next switch, its drive events are named after it; empty: the next free z1, z2...; a number at the end goes up with each switch" +msgstr "Nazwa następnej zwrotnicy, od niej nazywają się zdarzenia napędu; puste: kolejna wolna z1, z2...; liczba na końcu rośnie z każdą zwrotnicą" + +msgid "No switch drives in scenery/tory/napedy" +msgstr "Brak napędów zwrotnicowych w scenery/tory/napedy" + +msgid "Drive" +msgstr "Napęd" + +msgid "Drive of the switch from scenery/tory/napedy: its events + and - switch it with the keys by the switch and in the map during the game; none: the switch can't be switched" +msgstr "Napęd zwrotnicy ze scenery/tory/napedy: jego zdarzenia + i - przestawiają ją klawiszami przy zwrotnicy i w podglądzie mapy podczas gry; brak: zwrotnicy nie da się przestawić" + +msgid "diverging side" +msgstr "od toru zwrotnego" + +msgid "other side" +msgstr "z drugiej strony" + +msgid "The drive couldn't be placed: " +msgstr "Nie udało się wstawić napędu: " + +msgid "Switch %s with the drive %s: events %s+ and %s- switch it, also in the map" +msgstr "Zwrotnica %s z napędem %s: zdarzenia %s+ i %s- ją przestawiają, także w mapie" + +msgid "Drive: events %s+ and %s- switch it, also in the map" +msgstr "Napęd: zdarzenia %s+ i %s- ją przestawiają, także w mapie" + +msgid "No drive: the switch can't be switched during the game" +msgstr "Brak napędu: zwrotnicy nie da się przestawić podczas gry" + +msgid "Put the drive by the switch" +msgstr "Postaw napęd przy zwrotnicy" + +msgid "no drive" +msgstr "bez napędu" + +msgid "The drive %s has no variant for a %s switch with the drive on the %s" +msgstr "Napęd %s nie ma wariantu dla rozjazdu %s z napędem z %s" + +msgid "No switch drives: no template is described with category: switch drive" +msgstr "Brak napędów: żaden wzorzec nie ma opisu z category: switch drive" + +msgid "Templates described with category: switch drive, the side of the switch and of the drive, and a parameter with the role track for the name of the switch.\nIts events + and - switch it with the keys by the switch and in the map during the game" +msgstr "Wzorce opisane jako category: switch drive, ze stroną rozjazdu i napędu oraz parametrem o roli track na nazwę zwrotnicy.\nIch zdarzenia + i - przestawiają zwrotnicę klawiszami przy niej i w podglądzie mapy podczas gry" + +msgid "Track editor: the window with its modes opens or closes" +msgstr "Edytor torów: otwiera albo zamyka okno z jego trybami" + +msgid "Look along" +msgstr "Szukaj wzdłuż" + +msgid "Route of the vertical profile" +msgstr "Trasa profilu podłużnego" + +msgid "%d read by the paths" +msgstr "%d odczytywanych przez tory" + +msgid "The memory cell of the object is read by a getvalues event of a path, listed by the path, inside a multiple\nevent or written loose as :event. The object is bound to the thread of that path, not to the nearest one" +msgstr "Komórkę pamięci obiektu odczytuje zdarzenie getvalues toru: wpisane w torze, wewnątrz zdarzenia multiple\nalbo dopisane luzem jako :event. Obiekt zostaje przypisany do nitki tego toru, nie do najbliższej" + +msgid "%d of them nearer to another path" +msgstr "w tym %d bliżej innego toru" + +msgid "By the distance alone these would go to the wrong thread. Check them in 3D: the dashed line goes to the nearer path" +msgstr "Po samej odległości trafiłyby do złej nitki. Sprawdź je w 3D: przerywana linia prowadzi do bliższego toru" + +msgid "%d signal(s) not read by any path" +msgstr "%d sygnalizator(ów) bez odczytu przez tor" + +msgid "The signal has a memory cell, but no event of a path reads it: the vehicles won't see it.\nBound to the nearest path" +msgstr "Sygnalizator ma komórkę pamięci, ale żadne zdarzenie toru jej nie odczytuje: pojazdy go nie zobaczą.\nPrzypisany do najbliższego toru" + +msgid "Read by a path" +msgstr "Odczytywane przez tor" + +msgid "Nearer to another path" +msgstr "Bliżej innego toru" + +msgid "Not read" +msgstr "Bez odczytu" + +msgid "\nRead by the path %s: event %s, getvalues of the memory cell %s" +msgstr "\nOdczytywany przez tor %s: zdarzenie %s, getvalues komórki pamięci %s" + +msgid " (written loose, the path takes it by the name)" +msgstr " (dopisane luzem, tor bierze je po nazwie)" + +msgid "\nThe path %s is nearer, but it doesn't read the object" +msgstr "\nTor %s jest bliżej, ale nie odczytuje obiektu" + +msgid "\nNo path reads the memory cell of the signal" +msgstr "\nŻaden tor nie odczytuje komórki pamięci sygnalizatora" + +msgid "\nClick to look at it" +msgstr "\nKliknij, żeby go obejrzeć" + +msgid "read by %s" +msgstr "odczyt: %s" + +msgid "(nearer: %s)" +msgstr "(bliżej: %s)" + +msgid "not read" +msgstr "bez odczytu" + +msgid "; %d left out: they stand by the scope, but the paths which read them are elsewhere" +msgstr "; pominięto %d: stoją przy zakresie, ale tory, które je odczytują, są gdzie indziej" + +msgid "Name: %s" +msgstr "Nazwa: %s" + +msgid "(can't be changed: %s)" +msgstr "(nie można zmienić: %s)" + +msgid "Renamed from %s" +msgstr "Zmieniono z %s" + +msgid "Name##trackname" +msgstr "Nazwa##trackname" + +msgid "Enter renames the path, Esc while typing takes the text back.\nThe events, memory cells and the map of the game find the path by its name" +msgstr "Enter zmienia nazwę toru, Esc w trakcie pisania przywraca tekst.\nZdarzenia, komórki pamięci i mapa w grze znajdują tor po nazwie" + +msgid "Rename anyway" +msgstr "Zmień mimo to" + +msgid "Rename" +msgstr "Zmień nazwę" + +msgid "Keep the old" +msgstr "Zostaw starą" + +msgid "The path needs a name" +msgstr "Tor musi mieć nazwę" + +msgid "The name can't hold blanks, quotes, semicolons or //" +msgstr "Nazwa nie może zawierać spacji, cudzysłowów, średników ani //" + +msgid "Another path has this name" +msgstr "Inny tor ma już tę nazwę" + +msgid "Saved as %s: the scenery keeps the names in lower case" +msgstr "Zapisana jako %s: sceneria trzyma nazwy małymi literami" + +msgid "The new name goes to %d memory cell(s) and %d include(s), the drives of a switch among them" +msgstr "Nowa nazwa trafi do %d komórek pamięci i %d includów, w tym napędów zwrotnicy" + +msgid "These events aim at the path by the old name and the editor doesn't write them: %s" +msgstr "Te zdarzenia wskazują tor starą nazwą, a edytor ich nie zapisuje: %s" + +msgid "These events belong to the path by the old name: %s" +msgstr "Te zdarzenia należą do toru przez starą nazwę: %s" + +msgid "They work until the scenery is loaded again; then they need the new name in their files" +msgstr "Działają do ponownego wczytania scenerii; potem trzeba im wpisać nową nazwę w plikach" + +msgid "(no name)" +msgstr "(bez nazwy)" + +msgid "Turntable" +msgstr "Obrotnica" + +msgid "Places a turntable, leads tracks out of it and fits the tracks around to it" +msgstr "Stawia obrotnicę, wyprowadza z niej tory i dopasowuje do niej tory dookoła" + +msgid "Turntable: drag to turn the bridge, release to place it" +msgstr "Obrotnica: przeciągnij, żeby obrócić most, puść, żeby postawić" + +msgid "Turntable: LMB around it leads a track out, on a free end fits that track" +msgstr "Obrotnica: LPM dookoła wyprowadza tor, na wolnym końcu dopasowuje ten tor" + +msgid "Turntable: LMB places a new one" +msgstr "Obrotnica: LPM stawia nową" + +msgid "It doesn't line up with any position of the turntable" +msgstr "Nie trafia w żadne położenie obrotnicy" + +msgid "Too close to the turntable for a curve of %.0f m or more" +msgstr "Za blisko obrotnicy na łuk o promieniu %.0f m lub większym" + +msgid "It points away from the turntable" +msgstr "Jest skierowany od obrotnicy" + +msgid "No free ends within %.0f m of the rim" +msgstr "Brak wolnych końców w promieniu %.0f m od krawędzi" + +msgid "%d track(s) led to the turntable" +msgstr "Doprowadzono %d tor(ów) do obrotnicy" + +msgid "The turntable has %d positions, %d track lines lead to it: the rest won't be reached" +msgstr "Obrotnica ma %d położeń, a dochodzi do niej %d linii torów: do reszty nie dojedzie" + +msgid "The name %s is taken by another path" +msgstr "Nazwę %s ma już inny tor" + +msgid "Turntable %s: click around it for the tracks out of it, or fit the tracks around. It turns after the scenery is saved and loaded again" +msgstr "Obrotnica %s: klikaj dookoła, żeby wyprowadzić tory, albo dopasuj tory wokół. Obraca się po zapisaniu i ponownym wczytaniu scenerii" + +msgid "Track out of the turntable at %.1f deg, %.1f m" +msgstr "Tor z obrotnicy pod kątem %.1f st., %.1f m" + +msgid "Click: lead this track to the turntable" +msgstr "Kliknij: doprowadź ten tor do obrotnicy" + +msgid "Click: a track out of the turntable, %.1f deg, %.1f m" +msgstr "Kliknij: tor z obrotnicy, %.1f st., %.1f m" + +msgid "Click: this turntable" +msgstr "Kliknij: ta obrotnica" + +msgid "Click: a turntable at the end of this track" +msgstr "Kliknij: obrotnica na końcu tego toru" + +msgid "Press: the centre of a new turntable, drag: the direction of its bridge" +msgstr "Wciśnij: środek nowej obrotnicy, przeciągnij: kierunek jej mostu" + +msgid "Turntable %s, bridge %.1f m" +msgstr "Obrotnica %s, most %.1f m" + +msgid "(positions set by the tracks around, up to %d)" +msgstr "(położenia według torów dookoła, do %d)" + +msgid "(%d positions fixed by the template)" +msgstr "(%d położeń ustalonych we wzorcu)" + +msgid "No turntable template takes this path as its track: the positions aren't known" +msgstr "Żaden wzorzec obrotnicy nie bierze tego toru: położenia nie są znane" + +msgid "Positions (%d)" +msgstr "Położenia (%d)" + +msgid "track" +msgstr "tor" + +msgid "track on the other end" +msgstr "tor na drugim końcu" + +msgid "no track" +msgstr "brak toru" + +msgid "Tracks around" +msgstr "Tory dookoła" + +msgid "Reach from the rim, m" +msgstr "Zasięg od krawędzi, m" + +msgid "Radius of the curves, m" +msgstr "Promień łuków, m" + +msgid "Angle step of a new track, deg (0: free)" +msgstr "Krok kąta nowego toru, st. (0: dowolny)" + +msgid "Click around the turntable: a track out of it, as long as the cursor is far.\nClick a free end near it: that track is led to the rim, straight or with a curve" +msgstr "Kliknij dookoła obrotnicy: tor z niej, tak długi, jak daleko jest kursor.\nKliknij wolny koniec w pobliżu: ten tor zostanie doprowadzony do krawędzi, prosto albo łukiem" + +msgid "Find the free ends around" +msgstr "Znajdź wolne końce dookoła" + +msgid "Lead the chosen to the turntable (%d)" +msgstr "Doprowadź wybrane do obrotnicy (%d)" + +msgid "%.1f deg, curve R %.0f m, %.1f m" +msgstr "%.1f st., łuk R %.0f m, %.1f m" + +msgid "%.1f deg, straight %.1f m" +msgstr "%.1f st., prosta %.1f m" + +msgid "in place of its last straight %s" +msgstr "w miejsce jego ostatniej prostej %s" + +msgid "This turntable can't be read" +msgstr "Nie da się odczytać tej obrotnicy" + +msgid "New turntable" +msgstr "Nowa obrotnica" + +msgid "No turntables: no template is described with category: turntable and its turntable: {length}" +msgstr "Brak obrotnic: żaden wzorzec nie ma opisu category: turntable z turntable: {length}" + +msgid "%s %.0f m, up to %d positions set by the tracks" +msgstr "%s %.0f m, do %d położeń według torów" + +msgid "%s %.0f m, %d fixed positions" +msgstr "%s %.0f m, %d stałych położeń" + +msgid "Name##turntablename" +msgstr "Nazwa##turntablename" + +msgid "Press where the centre goes and drag to turn the bridge.\nClick a free end of a track: the turntable lines up with it, at its end. Shift: no lining up" +msgstr "Wciśnij w miejscu środka i przeciągnij, żeby obrócić most.\nKliknij wolny koniec toru: obrotnica ustawi się w jego osi, na jego końcu. Shift: bez dopasowania" + +msgid "The scenery has its own ground under the route: convert it to editor terrain first" +msgstr "Sceneria ma pod trasą własny teren: najpierw zamień go na teren edytora" + +msgid "; %d chunk(s) of terrain made under the route" +msgstr "; utworzono %d kawałków terenu pod trasą" + +msgid "; %d chunk(s) left out: the scenery has its own ground there, convert it to shape it" +msgstr "; pominięto %d kawałków: sceneria ma tam własny teren, zamień go, żeby go kształtować" + +msgid "Make terrain where the route has none" +msgstr "Utwórz teren tam, gdzie trasa go nie ma" + +msgid "Chunks of editor terrain are made along the route where there's none, from the ground around,\nthen shaped. Where the scenery has its own ground triangles the chunk is left out: convert them instead" +msgstr "Wzdłuż trasy, tam gdzie go brak, powstają kawałki terenu edytora z wysokości otoczenia,\npotem są kształtowane. Tam, gdzie sceneria ma własne trójkąty terenu, kawałek jest pomijany: zamień je zamiast tego" + +msgid "Puts back the terrain as it was before the last shaping, and takes away the terrain it made" +msgstr "Przywraca teren sprzed ostatniego kształtowania i usuwa teren, który przy tym powstał" + +msgid "Click: start from this free end, drag: the curve of the switch goes on, Shift: straight" +msgstr "Kliknij: zacznij od tego wolnego końca, przeciągnij: łuk rozjazdu biegnie dalej, Shift: prosta" + +msgid "%s and %d vehicle(s) behind it stand on %s. It isn't saved with the scenery" +msgstr "%s i %d pojazd(ów) za nim stoją na %s. Nie zapisuje się ze scenerią" + +msgid "Add to the train" +msgstr "Dodaj do składu" + +msgid "Train: %d vehicle(s), the first one leads" +msgstr "Skład: %d pojazd(ów), pierwszy prowadzi" + +msgid "Turned around in the train" +msgstr "Obrócony w składzie" + +msgid "up" +msgstr "w górę" + +msgid "Empty the train" +msgstr "Wyczyść skład" + +msgid "Turn the train around" +msgstr "Obróć skład" + +msgid "the head goes where the arrow at the marker points" +msgstr "czoło jedzie tam, gdzie wskazuje strzałka przy znaczniku" + +msgid "Trainset turned around" +msgstr "Skład odwrócony" + +msgid "The first vehicle stays where the trainset starts and leads the other way,\nthe rest of the trainset stands behind it" +msgstr "Pierwszy pojazd zostaje w miejscu początku składu i prowadzi w drugą stronę,\nreszta składu stoi za nim" + +msgid "Click: take out the %zu joined paths, %.0f m" +msgstr "Kliknij: wyjmij %zu połączonych torów, %.0f m" + +msgid "Click: add the %zu joined paths, %.0f m" +msgstr "Kliknij: dodaj %zu połączonych torów, %.0f m" + +msgid "Spread along the joins: Ctrl+Shift+LMB on a path" +msgstr "Rozlewanie po połączeniach: Ctrl+Shift+LPM na torze" + +msgid "Stop before the switches" +msgstr "Zatrzymaj przed rozjazdami" + +msgid "Through the switches, along their main track" +msgstr "Przez rozjazdy, po ich torze zasadniczym" + +msgid "Through everything joined" +msgstr "Przez wszystko, co połączone" + +msgid "Only to the paths like the clicked one:" +msgstr "Tylko do torów takich jak kliknięty:" + +msgid "rails" +msgstr "szyny" + +msgid "trackbed" +msgstr "podsypka" + +msgid "speed" +msgstr "prędkość" + +msgid "Reach along the track, m (0: no limit)" +msgstr "Zasięg wzdłuż toru, m (0: bez limitu)" + +msgid "Holding Ctrl+Shift shows what the click takes; on a path of the set it takes them out" +msgstr "Trzymając Ctrl+Shift widać, co kliknięcie zabierze; na torze ze zbioru je wyjmuje" + +msgid "Grow by the neighbours" +msgstr "Poszerz o sąsiadów" + +msgid "Adds the paths joined to the set, by the rules of the spread" +msgstr "Dodaje tory połączone ze zbiorem, według zasad rozlewania" + +msgid "New scenery" +msgstr "Nowa sceneria" + +msgid "E %.3f km, N %.3f km (%.5f N, %.5f E)" +msgstr "E %.3f km, N %.3f km (%.5f N, %.5f E)" + +msgid "loading the map..." +msgstr "wczytywanie mapy..." + +msgid "The map service sent no image" +msgstr "Serwis mapy nie odesłał obrazu" + +msgid "No map: " +msgstr "Brak mapy: " + +msgid "Find the place on the map: the wheel zooms, dragging moves the map. A click sets the centre of the scenery, its point 0 0 0." +msgstr "Znajdź miejsce na mapie: kółko przybliża, przeciąganie przesuwa mapę. Kliknięcie ustala środek scenerii, jej punkt 0 0 0." + +msgid "file name, e.g. my_line" +msgstr "nazwa pliku, np. moja_linia" + +msgid "scenery/.scn" +msgstr "scenery/.scn" + +msgid "Lower case letters, digits, _ and - only" +msgstr "Tylko małe litery, cyfry, _ i -" + +msgid "%s exists already" +msgstr "%s już istnieje" + +msgid "title, written in the file" +msgstr "tytuł, wpisany do pliku" + +msgid "Centre of the scenery, PUWG 1992" +msgstr "Środek scenerii, PUWG 1992" + +msgid "E, km##east" +msgstr "E, km##east" + +msgid "N, km##north" +msgstr "N, km##north" + +msgid "latitude, longitude" +msgstr "szerokość, długość geograficzna" + +msgid "Show" +msgstr "Pokaż" + +msgid "Give the latitude and the longitude in degrees, e.g. 52.2297, 21.0122" +msgstr "Podaj szerokość i długość geograficzną w stopniach, np. 52.2297, 21.0122" + +msgid "Degrees, as given by the online maps; the map moves there" +msgstr "Stopnie, jak podają mapy internetowe; mapa się tam przesunie" + +msgid "%.5f N, %.5f E" +msgstr "%.5f N, %.5f E" + +msgid "The scenery keeps the centre as its geographic reference (//$g PUWG1992): the orthophoto of the editor lies under it, in place." +msgstr "Sceneria zapamiętuje środek jako odniesienie geograficzne (//$g PUWG1992): ortofotomapa edytora leży pod nią na swoim miejscu." + +msgid "Give the file a name" +msgstr "Nadaj plikowi nazwę" + +msgid "Click the centre on the map" +msgstr "Kliknij środek na mapie" + +msgid "Create and open in the editor" +msgstr "Utwórz i otwórz w edytorze" + +msgid "The file can't be written" +msgstr "Nie da się zapisać pliku" + +msgid "Map: (c) OpenStreetMap contributors, served by geoportal.gov.pl" +msgstr "Mapa: (c) współtwórcy OpenStreetMap, udostępniana przez geoportal.gov.pl" + +msgid "Along the selected path; dragged past its end the model goes on along the joined paths, at a switch along the branch nearer the cursor" +msgstr "Wzdłuż zaznaczonego toru; przeciągnięty za jego koniec model idzie dalej po połączonych torach, na rozjeździe gałęzią bliższą kursorowi" + +msgid "every (m, 0: its length)" +msgstr "co (m, 0: jego długość)" + +msgid "%.2f m %s of the axis, %.2f m over the rail top" +msgstr "%.2f m %s od osi, %.2f m nad główką szyny" + +msgid "Press beside the track where the model begins and drag along to where it ends; the side of the press is the side of the model. Past the end of the path it goes on along the joined ones. A click lays one copy." +msgstr "Wciśnij obok toru tam, gdzie model się zaczyna, i przeciągnij wzdłuż do jego końca; strona wciśnięcia to strona modelu. Za końcem toru idzie dalej po połączonych. Kliknięcie kładzie jedną kopię." + +msgid "Lay it along the selected path" +msgstr "Połóż wzdłuż zaznaczonego toru" + +msgid "New scenery..." +msgstr "Nowa sceneria..." + +msgid "The editor starts again with the wizard of a new scenery: its name and its centre on the map" +msgstr "Edytor uruchamia się od nowa z kreatorem nowej scenerii: jej nazwa i środek na mapie" + +msgid "New scenery##restart" +msgstr "Nowa sceneria##restart" + +msgid "The editor starts again, with the wizard of a new scenery." +msgstr "Edytor uruchomi się od nowa, z kreatorem nowej scenerii." + +msgid "What isn't saved of this scenery is lost." +msgstr "To, co nie jest zapisane w tej scenerii, przepadnie." + +msgid "Save and start the wizard" +msgstr "Zapisz i otwórz kreator" + +msgid "Start the wizard" +msgstr "Otwórz kreator" + +msgid "The editor couldn't be started again" +msgstr "Nie udało się ponownie uruchomić edytora" From d4271ea7c5fcfed21f4053dcc5af77cf04efc1a6 Mon Sep 17 00:00:00 2001 From: maj00r Date: Tue, 6 Oct 2026 22:37:00 +0200 Subject: [PATCH 144/430] fix(editor): no variables named near or far, the Windows headers define them away --- application/editormodeinfra.cpp | 6 +++--- application/editormodeprofile.cpp | 10 +++++----- application/editormodesweep.cpp | 16 ++++++++-------- application/editormodeturntable.cpp | 6 +++--- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/application/editormodeinfra.cpp b/application/editormodeinfra.cpp index 056b6b00e..6c85f4b75 100644 --- a/application/editormodeinfra.cpp +++ b/application/editormodeinfra.cpp @@ -899,7 +899,7 @@ void editor_mode::infra_recognize() auto const cells{points.size() == 1 ? links.cells_of(Binding) : std::vector{}}; auto const readers{links.readers_of(cells)}; infra::station geometric; - auto const near{index.nearest(points.front(), Reach, geometric)}; + auto const nearby{index.nearest(points.front(), Reach, geometric)}; if (false == readers.empty()) { auto best{-1.0}; @@ -923,11 +923,11 @@ void editor_mode::infra_recognize() } if (candidate.reader == nullptr) { - state.elsewhere += near ? 1 : 0; + state.elsewhere += nearby ? 1 : 0; return; } auto const &thread{thread_of(candidate.reader)}; - if (near && geometric.track != station.track && std::none_of(thread.begin(), thread.end(), [&](track_area const &Area) { return Area.track == geometric.track; })) + if (nearby && geometric.track != station.track && std::none_of(thread.begin(), thread.end(), [&](track_area const &Area) { return Area.track == geometric.track; })) { candidate.nearer = geometric.track; candidate.nearer_foot = infra::frame_at(geometric).point; diff --git a/application/editormodeprofile.cpp b/application/editormodeprofile.cpp index 45643a288..15b42441c 100644 --- a/application/editormodeprofile.cpp +++ b/application/editormodeprofile.cpp @@ -512,11 +512,11 @@ std::pair editor_mode::profile_generate_ground(std::vector 0) continue; - std::vector near; + std::vector around; for (std::size_t i = 0; i < samples.size(); ++i) if (std::abs(samples[i].position.x - middle.x) <= size * 0.5 + Reach && std::abs(samples[i].position.z - middle.y) <= size * 0.5 + Reach) - near.push_back(i); - if (near.empty()) + around.push_back(i); + if (around.empty()) continue; std::vector points; std::vector nearest; @@ -526,9 +526,9 @@ std::pair editor_mode::profile_generate_ground(std::vector::max()}; - for (auto const i : near) + for (auto const i : around) { auto const d{plan_distance(point, samples[i].position)}; if (d < distance) diff --git a/application/editormodesweep.cpp b/application/editormodesweep.cpp index 38c78dac1..a52369a40 100644 --- a/application/editormodesweep.cpp +++ b/application/editormodesweep.cpp @@ -395,19 +395,19 @@ std::vector editor_mode::sweeps_near(TTrack const &Track) const if (sweep == nullptr || sweep->m_editorremoved) continue; auto const &definition{sweep->definition()}; - bool near{false}; + bool close{false}; for (auto const &piece : definition.pieces) { bezier const curve{piece}; - for (int k = 0; k <= 8 && false == near; ++k) + for (int k = 0; k <= 8 && false == close; ++k) { auto const point{curve.point(k / 8.0)}; - near = std::any_of(points.begin(), points.end(), [&](glm::dvec3 const &Other) { return plan_distance(point, Other) < kSweepNear; }); + close = std::any_of(points.begin(), points.end(), [&](glm::dvec3 const &Other) { return plan_distance(point, Other) < kSweepNear; }); } - if (near) + if (close) break; } - if (near) + if (close) result.push_back(sweep); } return result; @@ -628,11 +628,11 @@ void editor_mode::render_sweep_ui() // models along curves by this line if (track != nullptr) { - auto const near{sweeps_near(*track)}; - if (false == near.empty()) + auto const alongside{sweeps_near(*track)}; + if (false == alongside.empty()) { ImGui::TextDisabled("%s", STR_C("By this track:")); - for (auto *sweep : near) + for (auto *sweep : alongside) { ImGui::PushID(sweep); auto const &definition{sweep->definition()}; diff --git a/application/editormodeturntable.cpp b/application/editormodeturntable.cpp index f9a64c294..25cfb9875 100644 --- a/application/editormodeturntable.cpp +++ b/application/editormodeturntable.cpp @@ -461,13 +461,13 @@ bool editor_mode::turntable_fit_end(editor_track::snap_target const &End, turnta if (false == best.has_value() && own != nullptr && own->eType == tt_Normal && own->m_paths.size() == 1 && own->Dynamics.empty()) { auto const &path{own->m_paths.front()}; - auto const far{End.point.kind == editor_track::point_kind::start ? path.points[segment_data::point::end] : path.points[segment_data::point::start]}; - auto const straight{std::abs(geometry::cross(t, plan_of(far - End.position))) < 0.01 && glm::dot(t, plan_of(far - End.position)) > 1.0}; + auto const opposite{End.point.kind == editor_track::point_kind::start ? path.points[segment_data::point::end] : path.points[segment_data::point::start]}; + auto const straight{std::abs(geometry::cross(t, plan_of(opposite - End.position))) < 0.01 && glm::dot(t, plan_of(opposite - End.position)) > 1.0}; std::string reason; if (straight && editor_track::can_edit_geometry(*own, reason)) { auto const first{issue}; - target = far; + target = opposite; e = plan_of(target); solve(); if (best.has_value()) From 8dd666d4d87024adbadd8dd60f0df93ee6c9c938 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Tue, 6 Oct 2026 22:52:42 +0200 Subject: [PATCH 145/430] feat(editor): array of the selected model in the toolset, after the array modifier of Blender: fixed count or fit length, relative and constant offset along the axes of the model, turn per copy, copies following the ground; the array follows its settings until something else is selected or changed, and is a single step of the undo history --- application/editormode.cpp | 382 +++++++++++++++++++++++++++++++++- application/editormode.h | 64 +++++- application/editoruilayer.cpp | 5 + application/editoruilayer.h | 6 + 4 files changed, 455 insertions(+), 2 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index f5b6d716e..6894ba1e9 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -476,6 +476,7 @@ editor_mode::editor_mode() { // the area fill settings live in the node bank window, in the tab of the fill mode ui()->set_fill_options([this]() { render_area_fill(); }); ui()->set_gizmo_options([this]() { render_gizmo_options(); }); + ui()->set_array_options([this]() { render_array(); }); ui()->set_file_actions([this]() { save(); }, [this]() { export_scenery(); }); ui()->set_menu_options([this]() { render_object_menu(); @@ -873,6 +874,11 @@ void editor_mode::nullify_history_pointers(scene::basic_node *node) { if (s.node_ptr == node) s.node_ptr = nullptr; + for (auto © : s.copies) + { + if (copy.model == node) + copy.model = nullptr; + } } for (auto &s : g_redo) @@ -883,6 +889,10 @@ void editor_mode::nullify_history_pointers(scene::basic_node *node) // deleted nodes also drop out of the "undo last fill" set m_fill_last.erase(std::remove(m_fill_last.begin(), m_fill_last.end(), node), m_fill_last.end()); + + // an array no longer follows its settings once the model it was made of is gone + if (m_array.base == node) + m_array.base = nullptr; } void editor_mode::undo_last() @@ -912,6 +922,12 @@ void editor_mode::undo_last() return; } + if (snap.action == EditorSnapshot::Action::Array) + { + restore_array_snapshot(std::move(snap), g_redo, true); + return; + } + if (snap.action == EditorSnapshot::Action::Delete) { // undo delete -> recreate model @@ -1016,6 +1032,12 @@ void editor_mode::redo_last() return; } + if (snap.action == EditorSnapshot::Action::Array) + { + restore_array_snapshot(std::move(snap), m_history, false); + return; + } + // handle delete redo (re-delete) separately if (snap.action == EditorSnapshot::Action::Delete) { @@ -1272,6 +1294,9 @@ bool editor_mode::update() draw_road_overlay(); render_road_window(); + // --- array: the one made last is kept in line with its settings --- + update_array(); + // --- area fill: outline overlay while the mode is active (its settings are drawn in the node bank window) --- if (ui()->mode() == nodebank_panel::FILL) draw_area_fill_outline(); @@ -2841,6 +2866,360 @@ void editor_mode::render_area_fill() ImGui::TextUnformatted(m_fill_status.c_str()); } +glm::vec3 editor_mode::array_size(TAnimModel const &Base) +{ + auto *model = Base.Model(); + if (model == nullptr) + return glm::vec3{0.0f}; + if (m_array.sized == model) + return m_array.size; + // the triangles the other tools take for the ground, left where the model has them + std::vector triangles; + gather_submodel_triangles(model->Root, glm::dmat4{1.0}, triangles); + if (triangles.empty()) + return glm::vec3{0.0f}; // not loaded yet, or nothing to it; it's asked about again the next time + glm::dvec3 low{std::numeric_limits::max()}; + glm::dvec3 high{-std::numeric_limits::max()}; + for (auto const &triangle : triangles) + { + for (auto const &vertex : triangle) + { + low = glm::min(low, vertex); + high = glm::max(high, vertex); + } + } + m_array.sized = model; + m_array.size = glm::vec3{high - low}; + return m_array.size; +} + +glm::dvec3 editor_mode::array_offset(TAnimModel const &Base) +{ + auto const &settings = m_array.settings; + glm::dvec3 offset{0.0}; + if (settings.relative) + offset += glm::dvec3{settings.relative_offset * array_size(Base) * Base.Scale()}; + if (settings.constant) + offset += glm::dvec3{settings.constant_offset}; + return offset; +} + +int editor_mode::array_count(double const Step) const +{ + auto const &settings = m_array.settings; + if (settings.fit == 0) + return std::clamp(settings.count, 1, array_tool::limit); + if (Step < array_tool::minimal_step) + return 1; + // the model, and a copy for each whole offset the length takes + return static_cast(std::min(array_tool::limit, std::floor(std::max(0.0f, settings.length) / Step + 1e-6) + 1.0)); +} + +std::vector> editor_mode::array_placements(TAnimModel &Base) +{ + // a model this large counts as ground itself, and would be put on top of its own copies + float constexpr terrain_model_radius = 50.0f; + + std::vector> places; + auto const &settings = m_array.settings; + auto const offset = array_offset(Base); + auto const count = array_count(glm::length(offset)); + if (count < 2 || glm::length(offset) < array_tool::minimal_step) + return places; + + // the offset goes along the axes of the model, which is turned the way the renderer does it: around y, then x, then z + auto angles = Base.Angles(); + glm::dmat4 turned{1.0}; + turned = glm::rotate(turned, glm::radians(static_cast(angles.y)), glm::dvec3{0.0, 1.0, 0.0}); + turned = glm::rotate(turned, glm::radians(static_cast(angles.x)), glm::dvec3{1.0, 0.0, 0.0}); + turned = glm::rotate(turned, glm::radians(static_cast(angles.z)), glm::dvec3{0.0, 0.0, 1.0}); + auto step = glm::dvec3{turned * glm::dvec4{offset, 0.0}}; + auto location = Base.location(); + places.reserve(count - 1); + for (int idx = 1; idx < count; ++idx) + { + // each copy is turned against the one before it, and leads to the next one the way it faces + location += step; + if (false == simulation::Region->point_inside(location)) + break; // the row ends at the edge of the region, nodes past it are left out of the scene + if (settings.turn != 0.0f) + { + step = glm::rotateY(step, glm::radians(static_cast(settings.turn))); + angles.y = clamp_circular(angles.y + settings.turn, 360.0f); + } + places.emplace_back(location, angles); + } + + if (settings.ground && Base.radius() < terrain_model_radius) + { + // the ground the road tools use. a copy with nothing under it stays at the height the offset gave it + std::vector points; + points.reserve(places.size() + 1); + points.push_back(Base.location()); + for (auto const &place : places) + points.push_back(place.first); + std::vector found; + auto const heights = ground_heights(points, true, &found); + if (found[0]) + { + auto const clearance = points[0].y - heights[0]; + for (std::size_t idx = 0; idx < places.size(); ++idx) + { + if (found[idx + 1]) + places[idx].first.y = heights[idx + 1] + clearance; + } + } + } + return places; +} + +bool editor_mode::array_live() const +{ + // the model the array was made of is still selected, and the array is the last thing done + return m_array.base != nullptr && m_array.base == m_node && false == m_history.empty() && m_history.size() == m_array.step && + m_history.back().action == EditorSnapshot::Action::Array; +} + +void editor_mode::make_array() +{ + auto *base = dynamic_cast(m_node); + if (base == nullptr || false == scene::Layers.editable(base)) + return; + auto const step = glm::length(array_offset(*base)); + if (step < array_tool::minimal_step) + { + m_array.status = "The offsets come to nothing, the copies would sit in the model"; + return; + } + if (array_count(step) < 2) + { + m_array.status = (m_array.settings.fit == 0 ? "An array of one is the model itself, nothing to make" : "The length takes no copy, nothing to make"); + return; + } + + // a single undo step for the whole array, whatever is done to it while it follows the settings + trim_history(); + EditorSnapshot snap; + snap.action = EditorSnapshot::Action::Array; + snap.node_name = base->name(); + snap.position = base->location(); + snap.layer = base->layer(); + m_history.push_back(std::move(snap)); + g_redo.clear(); + m_array.base = base; + m_array.step = m_history.size(); + shape_array(); +} + +void editor_mode::shape_array() +{ + auto *base = m_array.base; + auto &copies = m_history.back().copies; + auto const places = array_placements(*base); + + // the copies there's no place for anymore go + while (copies.size() > places.size()) + { + auto *model = copies.back().model; + copies.pop_back(); + if (model == nullptr) + continue; + nullify_history_pointers(model); + remove_from_hierarchy(model); + simulation::State.delete_model(model); + } + + std::string definition; + for (std::size_t idx = 0; idx < places.size(); ++idx) + { + TAnimModel *model = nullptr; + if (idx < copies.size()) + { + model = copies[idx].model; + m_editor.translate(model, places[idx].first, true); // true: the height is set as well + } + else + { + if (definition.empty()) + base->export_as_text(definition); + // NOTE: no names for the copies, same as with the brush + model = simulation::State.create_model(definition, std::string{}, places[idx].first); + if (model == nullptr) + break; + // the copies go where the model is, rather than to the active layer + scene::Layers.move(model, base->layer()); + EditorSnapshot::array_copy copy; + copy.model = model; + copy.uuid = model->uuid; + copies.push_back(std::move(copy)); + } + model->Angles(places[idx].second); + model->Scale(base->Scale()); + } + + m_array.applied = m_array.settings; + m_array.location = base->location(); + m_array.angles = base->Angles(); + m_array.scale = base->Scale(); + if (copies.size() < places.size()) + m_array.status = "Only " + std::to_string(copies.size()) + " of " + std::to_string(places.size()) + " copies could be made"; + else if (copies.empty()) + m_array.status = "No copies with these settings"; + else + m_array.status = "The model and " + std::to_string(copies.size()) + (copies.size() == 1 ? " copy" : " copies") + "; Ctrl+Z takes the array back"; +} + +void editor_mode::update_array() +{ + if (m_array.base == nullptr) + return; + if (false == array_live()) + { + // once left, the copies are models like any other + m_array.base = nullptr; + return; + } + auto const *base = m_array.base; + if (m_array.settings == m_array.applied && base->location() == m_array.location && base->Angles() == m_array.angles && base->Scale() == m_array.scale) + return; + shape_array(); +} + +void editor_mode::restore_array_snapshot(EditorSnapshot Snapshot, std::vector &Opposite, bool const Undo) +{ + // either way the array is done with following the settings + m_array.base = nullptr; + for (auto © : Snapshot.copies) + { + if (Undo) + { + // NOTE: a copy which was deleted and brought back is another model by now, found by its uuid + auto *model = dynamic_cast(find_node_by_any(copy.model, copy.uuid.to_string(), std::string{})); + copy.model = nullptr; + copy.serialized.clear(); + if (model == nullptr) + continue; // deleted since, and stays that way + // the copy is brought back the way it is now, with whatever was done to it since the array was made + model->export_as_text(copy.serialized); + copy.name = model->name(); + copy.position = model->location(); + copy.rotation = model->Angles(); + copy.scale = model->Scale(); + if (m_node == model) + { + m_node = nullptr; + m_dragging = false; + ui()->set_node(nullptr); + } + nullify_history_pointers(model); + remove_from_hierarchy(model); + simulation::State.delete_model(model); + } + else + { + if (copy.serialized.empty()) + continue; + auto *model = simulation::State.create_model(copy.serialized, copy.name, copy.position); + if (model == nullptr) + continue; + scene::Layers.move(model, Snapshot.layer); + model->Angles(copy.rotation); + model->Scale(copy.scale); + model->uuid = copy.uuid; + add_to_hierarchy(model); + copy.model = model; + } + } + Opposite.push_back(std::move(Snapshot)); +} + +void editor_mode::render_array() +{ + auto &settings = m_array.settings; + auto *selected = dynamic_cast(m_node); + if (selected != nullptr && false == scene::Layers.editable(selected)) + selected = nullptr; + + ImGui::PushID("array"); + ImGui::TextDisabled("Copies of the selected model, set out in a row"); + ImGui::RadioButton("Fixed count", &settings.fit, 0); + ImGui::SameLine(); + ImGui::RadioButton("Fit length", &settings.fit, 1); + ImGui::SetNextItemWidth(120.0f); + if (settings.fit == 0) + { + ImGui::InputInt("Count", &settings.count); + settings.count = std::clamp(settings.count, 1, array_tool::limit); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "Number of the models in the array, the selected one included"); + } + else + { + ImGui::InputFloat("Length (m)", &settings.length, 1.0f, 10.0f, "%.2f"); + settings.length = std::max(0.0f, settings.length); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "As many copies are made as fit in this length, measured along the row"); + } + + ImGui::Checkbox("Relative offset", &settings.relative); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "Distance between the copies as a part of the size of the model, along its axes: x, y (up), z.\n" + "1 along an axis puts the copies end to end"); + if (settings.relative) + { + ImGui::SetNextItemWidth(200.0f); + ImGui::DragFloat3("x size", &settings.relative_offset.x, 0.01f, 0.0f, 0.0f, "%.3f"); + } + ImGui::Checkbox("Constant offset", &settings.constant); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "Distance between the copies in metres, along the axes of the model: x, y (up), z.\n" + "With both offsets on the copies are set apart by their sum"); + if (settings.constant) + { + ImGui::SetNextItemWidth(200.0f); + ImGui::DragFloat3("m", &settings.constant_offset.x, 0.05f, 0.0f, 0.0f, "%.3f"); + } + ImGui::SetNextItemWidth(120.0f); + ImGui::DragFloat("Turn per copy (deg)", &settings.turn, 0.1f, -180.0f, 180.0f, "%.2f"); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "Each copy is turned by this much around the vertical axis against the one before it,\n" + "and the row bends with them into an arc"); + ImGui::Checkbox("Follow the ground", &settings.ground); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "The copies are put as high over the ground as the model is, instead of level with it.\n" + "Not for the models large enough to count as ground themselves"); + + if (selected != nullptr) + { + auto const size = array_size(*selected) * selected->Scale(); + auto const step = glm::length(array_offset(*selected)); + ImGui::TextDisabled("Model %.2f x %.2f x %.2f m, %d in the array, %.2f m apart", size.x, size.y, size.z, array_count(step), step); + } + + if (array_live()) + { + // NOTE: kept away from the place of the other button, a click too many on which would make the array twice + ImGui::TextDisabled("The array follows the settings"); + ImGui::SameLine(); + if (ImGui::Button("Done")) + m_array.base = nullptr; + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "The copies stay the way they are. Selecting or changing anything else does the same"); + } + else if (selected != nullptr) + { + if (ImGui::Button("Make array")) + make_array(); + } + else + { + ImGui::TextDisabled("Select a model to make an array of"); + } + if (false == m_array.status.empty()) + ImGui::TextUnformatted(m_array.status.c_str()); + ImGui::PopID(); +} + void editor_mode::render_gizmo_options() { if (ImGui::Button(Global.EditorOrtho ? "3D view (O)" : "Top view, orthographic (O)")) @@ -3760,7 +4139,8 @@ void editor_mode::render_change_history(){ s.action == EditorSnapshot::Action::Rotate ? "ROT" : s.action == EditorSnapshot::Action::Scale ? "SCA" : s.action == EditorSnapshot::Action::TrackEdit ? "TRK" : - s.action == EditorSnapshot::Action::RoadEdit ? "ROAD" : "OTH", + s.action == EditorSnapshot::Action::RoadEdit ? "ROAD" : + s.action == EditorSnapshot::Action::Array ? "ARR" : "OTH", s.node_name.empty() ? "(noname)" : s.node_name.c_str(), s.position.x, s.position.y, s.position.z); diff --git a/application/editormode.h b/application/editormode.h index fb44b830d..9c5bc3177 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -107,7 +107,19 @@ class editor_mode : public application_mode, private editor_track::observer struct stored_profile; struct EditorSnapshot { - enum class Action { Move, Rotate, Scale, Add, Delete, TrackEdit, Other, RoadEdit }; + enum class Action { Move, Rotate, Scale, Add, Delete, TrackEdit, Other, RoadEdit, Array }; + // copy of a model an array made + struct array_copy + { + TAnimModel *model{nullptr}; // nullptr while the copy is out of the scene + UID uuid; + // what it takes to make the copy again, filled in when it's taken out of the scene + std::string serialized; + std::string name; + glm::dvec3 position{0.0}; + glm::vec3 rotation{0.0f}; + glm::vec3 scale{1.0f}; + }; Action action{Action::Other}; std::string node_name; // node identifier (basic_node::name()) @@ -127,6 +139,7 @@ class editor_mode : public application_mode, private editor_track::observer std::vector infra; // objects which followed the paths bool profiles{false}; // the stored grade line designs changed too, these were the ones before std::vector profile_library; + std::vector copies; // models an array added to the one it was made of }; void push_snapshot(scene::basic_node *node, EditorSnapshot::Action Action = EditorSnapshot::Action::Move, std::string const &Serialized = std::string()); @@ -307,6 +320,55 @@ class editor_mode : public application_mode, private editor_track::observer bool m_fill_models_as_ground{true}; // large model instances (terrain tiles) count as ground std::string m_fill_status; // result of the last fill, shown in the panel + // array: copies of the selected model set out in a row, after the array modifier of Blender + struct array_settings + { + int fit{0}; // 0: fixed count, 1: as many as the length takes + int count{2}; // the model itself included + float length{10.0f}; // m + bool relative{true}; + glm::vec3 relative_offset{1.0f, 0.0f, 0.0f}; // of the size of the model, along its axes + bool constant{false}; + glm::vec3 constant_offset{1.0f, 0.0f, 0.0f}; // m, along the axes of the model + float turn{0.0f}; // degrees around the vertical axis, each copy against the one before it + bool ground{false}; // the copies are put as high over the ground as the model is + bool operator==(array_settings const &) const = default; + }; + struct array_tool + { + static constexpr int limit = 1000; // models in an array, so a slip of the finger doesn't freeze the editor + static constexpr double minimal_step = 0.001; // m, copies any closer would sit in one another + array_settings settings; + // the array made last, which follows the settings until something else is selected or changed + TAnimModel *base{nullptr}; // model it was made of, nullptr if there's none + std::size_t step{0}; // size of the undo history with the array at its top + array_settings applied; // what the copies were set out with + glm::dvec3 location{0.0}; // of the model then + glm::vec3 angles{0.0f}; + glm::vec3 scale{1.0f}; + // size of the model asked about last + TModel3d const *sized{nullptr}; + glm::vec3 size{0.0f}; + std::string status; // outcome of the last operation, shown in the panel + }; + array_tool m_array; + void render_array(); + // size of the model of specified instance along its axes, the scale of the instance left out + glm::vec3 array_size(TAnimModel const &Base); + // offset of each copy from the one before it, along the axes of the model + glm::dvec3 array_offset(TAnimModel const &Base); + // number of the models in the array, the one it's made of included. Step: length of the offset + int array_count(double const Step) const; + // location and angles of each copy in turn + std::vector> array_placements(TAnimModel &Base); + // true while the array made last follows the settings + bool array_live() const; + void make_array(); + // brings the copies of the array made last to what the settings ask for + void shape_array(); + void update_array(); + void restore_array_snapshot(EditorSnapshot Snapshot, std::vector &Opposite, bool const Undo); + // ImGuizmo-based transform gizmo for the selected node enum class gizmo_operation { translate, rotate, scale }; void render_gizmo(); diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index 8015499f1..3fee3e3e6 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -103,6 +103,11 @@ void editor_ui::render_header_sections() m_itempropertiespanel.render_body(); ImGui::Unindent(); } + if (ImGui::CollapsingHeader("Array")) + { + if (m_arrayoptions) + m_arrayoptions(); + } } void editor_ui::render_menu_contents() diff --git a/application/editoruilayer.h b/application/editoruilayer.h index f4e9679a8..b38c26853 100644 --- a/application/editoruilayer.h +++ b/application/editoruilayer.h @@ -66,6 +66,11 @@ class editor_ui : public ui_layer { m_gizmooptions = std::move(Renderer); } + // draws the array settings in the toolset window (the array state lives in the editor mode) + void set_array_options(std::function Renderer) + { + m_arrayoptions = std::move(Renderer); + } // actions of the file menu, performed by the editor mode void set_file_actions(std::function Save, std::function Export); // shows outcome of an operation in the layers window @@ -90,6 +95,7 @@ class editor_ui : public ui_layer std::function m_filloptions; std::function m_menuoptions; std::function m_gizmooptions; + std::function m_arrayoptions; scene::basic_node *m_node{nullptr}; // currently bound scene node, if any bool m_track{false}; }; From 7b15b9a01741a90d1a221db322064ca96a049a49 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Wed, 7 Oct 2026 16:10:38 +0200 Subject: [PATCH 146/430] perf(scenery): minimap semaphores matched against the named models of a group collected once, instead of a search through all nodes of the scenery for each semaphore --- scene/scenenodegroups.cpp | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/scene/scenenodegroups.cpp b/scene/scenenodegroups.cpp index 2e786a798..3ed357f33 100644 --- a/scene/scenenodegroups.cpp +++ b/scene/scenenodegroups.cpp @@ -107,6 +107,11 @@ node_groups::update_map() for (auto const &pair : m_groupmap) { auto const &group = pair.second; + // named models of the group, collected once the group turns out to hold a semaphore. + // nested groups are flattened, so a group can hold millions of nodes, most of them nameless scenery; + // going through all of them for each semaphore took minutes + std::vector namedmodels; + bool namedmodelscollected = false; for (basic_node *node : group.nodes) { std::string postfix { "_sem_mem" }; @@ -128,10 +133,17 @@ node_groups::update_map() } } - for (basic_node *node : group.nodes) - if (auto *model = dynamic_cast(node)) - if (model->name().starts_with(sem_name)) - sem_info->models.push_back(model); + if (false == namedmodelscollected) { + for (basic_node *groupnode : group.nodes) + if (false == groupnode->name().empty()) + if (auto *model = dynamic_cast(groupnode)) + namedmodels.push_back(model); + namedmodelscollected = true; + } + + for (auto *model : namedmodels) + if (model->name().starts_with(sem_name)) + sem_info->models.push_back(model); } if (Global.map_manualswitchcontrol) { From bc99b80191fd533378c734b4692ceebfb5a12f5b Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Wed, 7 Oct 2026 16:17:13 +0200 Subject: [PATCH 147/430] perf(reflections): environment map drawn one face per frame from the place the update began at, the first update in one go; cells beyond the range of reflected instances left out; time of the reflection pass in the renderer statistics; tracks skipped in shadow passes no longer counted as drawn --- rendering/opengl33renderer.cpp | 57 ++++++++++++++++++++++++++-------- rendering/opengl33renderer.h | 2 ++ 2 files changed, 46 insertions(+), 13 deletions(-) diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index ff0e9951c..354dc963f 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -635,12 +635,16 @@ void opengl33_renderer::SwapBuffers() m_debugtimestext.clear(); m_debugtimestext = - "cpu frame total: " + to_string( Timer::subsystem.gfx_color.average() + Timer::subsystem.gfx_shadows.average() + Timer::subsystem.gfx_swap.average(), 2 ) + " ms\n" + "cpu frame total: " + to_string( Timer::subsystem.gfx_color.average() + Timer::subsystem.gfx_shadows.average() + ( Global.gfx_envmap_enabled ? Timer::subsystem.gfx_reflections.average() : 0.f ) + Timer::subsystem.gfx_swap.average(), 2 ) + " ms\n" + " color: " + to_string( Timer::subsystem.gfx_color.average(), 2 ) + " ms (" + std::to_string( m_cellqueue.size() ) + " sectors)\n"; if( Global.gfx_shadowmap_enabled ) { m_debugtimestext += " shadows: " + to_string( Timer::subsystem.gfx_shadows.average(), 2 ) + " ms\n"; } + if( Global.gfx_envmap_enabled ) { + m_debugtimestext += + " reflections: " + to_string( Timer::subsystem.gfx_reflections.average(), 2 ) + " ms\n"; + } m_debugtimestext += " swap: " + to_string( Timer::subsystem.gfx_swap.average(), 2 ) + " ms\n"; if( !Global.gfx_usegles ) { if (m_gllasttime) @@ -825,8 +829,10 @@ void opengl33_renderer::Render_pass(viewport_config &vp, rendermode const Mode) { // potentially update environmental cube map m_renderpass.draw_stats = {}; + Timer::subsystem.gfx_reflections.start(); if (Render_reflections(vp)) m_renderpass = m_colorpass; // restore color pass settings + Timer::subsystem.gfx_reflections.stop(); setup_env_map(m_env_tex.get()); } @@ -1385,23 +1391,36 @@ bool opengl33_renderer::Render_reflections(viewport_config &vp) { if( Global.reflectiontune.update_interval == 0 ) { return false; } - auto const timestamp{ Timer::GetRenderTime() }; - if( ( timestamp - m_environmentupdatetime < Global.reflectiontune.update_interval ) - && ( glm::length2( m_renderpass.pass_camera.position() - m_environmentupdatelocation ) < sq(1000.0)) ) // length2 is better than length for comparing because it does not require sqrt function - { - // run update every 5+ mins of simulation time, or at least 1km from the last location - return false; + if( m_environmentupdateface >= 6 ) { + // no update in progress, check whether it's time for another one + auto const timestamp{ Timer::GetRenderTime() }; + if( ( timestamp - m_environmentupdatetime < Global.reflectiontune.update_interval ) + && ( glm::length2( m_renderpass.pass_camera.position() - m_environmentupdatelocation ) < sq(1000.0)) ) // length2 is better than length for comparing because it does not require sqrt function + { + // run update every 5+ mins of simulation time, or at least 1km from the last location + return false; + } + m_environmentupdatetime = timestamp; + m_environmentupdatelocation = m_renderpass.pass_camera.position(); + m_environmentupdateface = 0; } - m_environmentupdatetime = timestamp; - m_environmentupdatelocation = m_renderpass.pass_camera.position(); + // an update draws the scene six times, which is too much for a single frame. its cost is spread + // by drawing one face of the map per frame, all of them as seen from the place the update began at. + // the first update is done in one go, as there's nothing to show in the meantime + auto const lastface{ m_environmentready ? m_environmentupdateface : 5 }; glViewport(0, 0, gl::ENVMAP_SIZE, gl::ENVMAP_SIZE); - for (m_environmentcubetextureface = 0; m_environmentcubetextureface < 6; ++m_environmentcubetextureface) + for (; m_environmentupdateface <= lastface; ++m_environmentupdateface) { + m_environmentcubetextureface = m_environmentupdateface; m_env_fb->attach(*m_env_tex, m_environmentcubetextureface, GL_COLOR_ATTACHMENT0); if (m_env_fb->is_complete()) Render_pass(vp, rendermode::reflections); } - m_env_tex->generate_mipmaps(); + if (m_environmentupdateface >= 6) + { + m_env_tex->generate_mipmaps(); + m_environmentready = true; + } m_env_fb->detach(GL_COLOR_ATTACHMENT0); return true; @@ -1712,7 +1731,9 @@ void opengl33_renderer::setup_pass(viewport_config &Viewport, renderpass_config case rendermode::reflections: { // modelview - camera.position() = (((true == DebugCameraFlag) && (false == Ignoredebug)) ? Global.pDebugCamera.Pos : Global.pCamera.Pos); + // the faces of the map are drawn over a few frames. each is drawn from the place the camera was at + // when the update began, so they fit together along the edges when the camera moves in the meantime + camera.position() = m_environmentupdatelocation; glm::dvec3 const cubefacetargetvectors[6] = {{1.0, 0.0, 0.0}, {-1.0, 0.0, 0.0}, {0.0, 1.0, 0.0}, {0.0, -1.0, 0.0}, {0.0, 0.0, 1.0}, {0.0, 0.0, -1.0}}; glm::dvec3 const cubefaceupvectors[6] = {{0.0, -1.0, 0.0}, {0.0, -1.0, 0.0}, {0.0, 0.0, 1.0}, {0.0, 0.0, -1.0}, {0.0, -1.0, 0.0}, {0.0, -1.0, 0.0}}; auto const cubefaceindex = m_environmentcubetextureface; @@ -2768,7 +2789,13 @@ void opengl33_renderer::Render(cell_sequence::iterator First, cell_sequence::ite } case rendermode::reflections: { - if( Global.reflectiontune.fidelity >= 1 ) { + // a cell lying whole beyond the range the reflections draw model instances at is left out, as each + // of its instances would fail the range test done for it in Render_Instanced() and Render( TAnimModel * ). + // like the cull of the regular passes above, the test goes by the nearest point of the bounding sphere + // of the cell, which holds the locations of all its instances + auto const cellnearestdistance { std::max( 0.0, glm::length( cell->m_area.center - m_renderpass.pass_camera.position() ) - cell->m_area.radius ) }; + if( ( Global.reflectiontune.fidelity >= 1 ) + && ( cellnearestdistance <= Global.reflectiontune.range_instances ) ) { // opaque parts of instanced models -- accumulate into the // frame-level map; flushed once per unique model after the loop. for( auto const &bucket : cell->m_instancebuckets_opaque ) { @@ -4001,10 +4028,14 @@ void opengl33_renderer::Render(scene::basic_cell::path_sequence::const_iterator if ((std::abs(track->fTexHeight1) < 0.35f) || (track->iCategoryFlag != 2)) { // shadows are only calculated for high enough roads, typically meaning track platforms + --m_renderpass.draw_stats.paths; + --m_renderpass.draw_stats.drawcalls; continue; } if( Material( track->m_material1 ).shadow_rank > Global.gfx_shadow_rank_cutoff ) { // skip if the shadow caster rank is too low for currently set threshold + --m_renderpass.draw_stats.paths; + --m_renderpass.draw_stats.drawcalls; continue; } Bind_Material_Shadow(track->m_material1); diff --git a/rendering/opengl33renderer.h b/rendering/opengl33renderer.h index 36c8417cb..3cc46aa85 100644 --- a/rendering/opengl33renderer.h +++ b/rendering/opengl33renderer.h @@ -346,6 +346,8 @@ class opengl33_renderer : public gfx_renderer { glm::mat4 m_shadowtexturematrix; // conversion from camera-centric world space to light-centric clip space int m_environmentcubetextureface{0}; // helper, currently processed cube map face + int m_environmentupdateface{6}; // cube map face the environment map update in progress draws next; 6: no update in progress + bool m_environmentready{false}; // the environment map was drawn whole at least once double m_environmentupdatetime{0}; // time of the most recent environment map update glm::dvec3 m_environmentupdatelocation; // coordinates of most recent environment map update opengl33_skydome m_skydomerenderer; From 398fdac6a1bb39f14ae0f396e312edf47d3fada7 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Wed, 7 Oct 2026 16:29:15 +0200 Subject: [PATCH 148/430] perf(instancing): instances of scene cells culled by copies of their bounds kept with the buckets, before the instances themselves are fetched; instances past the range of the lod stages of their model left out; identity of the instance buffer restored once per bucket instead of after each batch --- rendering/opengl33renderer.cpp | 110 ++++++++++++++++++++++++++++----- rendering/opengl33renderer.h | 8 +++ scene/scene.cpp | 14 +++-- scene/scene.h | 17 ++++- 4 files changed, 128 insertions(+), 21 deletions(-) diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index 354dc963f..d207b204e 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -577,6 +577,10 @@ bool opengl33_renderer::Render() } // generate new frame opengl_texture::reset_unit_cache(); + if( EditorModeFlag ) { + // the editor moves and resizes model instances in place, which leaves the copies of their bounds out of date + ++m_instanceboundsversion; + } m_renderpass.draw_mode = rendermode::none; // force setup anew m_renderpass.draw_stats = debug_stats(); @@ -2765,10 +2769,7 @@ void opengl33_renderer::Render(cell_sequence::iterator First, cell_sequence::ite / ( static_cast( Global.ZoomFactor ) * static_cast( Global.ZoomFactor ) ) / static_cast( Global.fDistanceFactor ) }; if( cellnearestdistancesquared <= sq( static_cast( m_renderpass.draw_range ) + 250.0 ) ) { - for( auto const &bucket : cell->m_instancebuckets_opaque ) { - auto &dest = m_frame_instance_buckets[ bucket.first ]; - dest.insert( dest.end(), bucket.second.begin(), bucket.second.end() ); - } + Queue_Instances( cell ); } } // remaining (non-instanceable) opaque instance nodes go through the per-node path @@ -2798,10 +2799,7 @@ void opengl33_renderer::Render(cell_sequence::iterator First, cell_sequence::ite && ( cellnearestdistance <= Global.reflectiontune.range_instances ) ) { // opaque parts of instanced models -- accumulate into the // frame-level map; flushed once per unique model after the loop. - for( auto const &bucket : cell->m_instancebuckets_opaque ) { - auto &dest = m_frame_instance_buckets[ bucket.first ]; - dest.insert( dest.end(), bucket.second.begin(), bucket.second.end() ); - } + Queue_Instances( cell ); for( auto *instance : cell->m_instancesopaque ) { if( instance->m_instanceable ) { continue; } Render( instance ); @@ -3054,6 +3052,88 @@ void opengl33_renderer::Render(TAnimModel *Instance) } } +// adds the bucketed instances of a scene cell to the frame-level buckets, for Render_Instanced() to draw. +// Render_Instanced() culls each instance it's given. the tests it makes are repeated here on the copies of instance +// bounds kept by the buckets, with some slack for the single precision of the copies, and the instances which fail are +// left out: the instances themselves are fetched only when there's a chance for them to be drawn +void opengl33_renderer::Queue_Instances( scene::basic_cell const *Cell ) +{ + // the editor moves and resizes the instances in place, the copies can't be relied on while it's active + auto const usebounds { false == EditorModeFlag }; + auto const reflections { m_renderpass.draw_mode == rendermode::reflections }; + // same choices as in Render_Instanced(): shadows measure the distance from the real camera, reflections + // ignore zoom and distance factor, test the plain distance against their own range and add the fidelity offset + auto const &distancecamera { m_renderpass.draw_mode == rendermode::shadows ? m_renderpass.viewport_camera : m_renderpass.pass_camera }; + glm::dvec3 const cameraposition { distancecamera.position() }; + auto const distancescale { reflections ? 1.0 : 1.0 / ( static_cast( Global.ZoomFactor ) * static_cast( Global.ZoomFactor ) * static_cast( Global.fDistanceFactor ) ) }; + auto const distanceoffset { reflections ? sq( static_cast( EU07_REFLECTIONFIDELITYOFFSET ) ) : 0.0 }; + auto const slack { 1.001 }; + auto const distancelimit { slack * ( reflections ? sq( static_cast( Global.reflectiontune.range_instances ) ) : sq( static_cast( m_renderpass.draw_range ) + 250.0 ) ) }; + // up close the rounding of the copies is too large a part of the distance for the slack to cover it + auto const distancetested { sq( 64.0 ) }; + + for( auto const &bucket : Cell->m_instancebuckets_opaque ) { + auto const &instances { bucket.second.instances }; + if( false == usebounds ) { + auto &dest { m_frame_instance_buckets[ bucket.first ] }; + dest.insert( dest.end(), instances.begin(), instances.end() ); + continue; + } + if( ( bucket.second.boundsversion != m_instanceboundsversion ) + || ( bucket.second.bounds.size() != instances.size() ) ) { + Update_Instance_Bounds( bucket.first.pModel, bucket.second ); + } + auto const &bounds { bucket.second.bounds }; + std::vector *dest { nullptr }; // looked up when there's something to put in it + for( std::size_t idx = 0; idx < bounds.size(); ++idx ) { + auto const &instancebounds { bounds[ idx ] }; + auto const center { glm::dvec3{ instancebounds.center } }; + auto const distancesquared { glm::length2( center - cameraposition ) }; + if( distancesquared > distancetested ) { + auto const scaleddistancesquared { distancesquared * distancescale }; + if( scaleddistancesquared > distancelimit ) { continue; } + if( scaleddistancesquared + distanceoffset >= slack * instancebounds.rangesquaredmax ) { continue; } + } + if( false == m_renderpass.pass_camera.visible( scene::bounding_area{ center, instancebounds.radius } ) ) { continue; } + if( dest == nullptr ) { + dest = &m_frame_instance_buckets[ bucket.first ]; + } + dest->emplace_back( instances[ idx ] ); + } + } +} + +// makes the copies of the bounds of the instances held by a bucket of a scene cell +void opengl33_renderer::Update_Instance_Bounds( TModel3d const *Model, scene::basic_cell::instance_bucket const &Bucket ) +{ + // a submodel is drawn only closer than its fSquareMaxDist, see Render( TSubModel * ). past the largest of these + // there's nothing of the model left to draw, which makes it another limit of the range of its instances + auto lodrangesquared { ( Model != nullptr && Model->Root != nullptr ) ? 0.f : std::numeric_limits::max() }; + m_instance_lodpending.clear(); + m_instance_lodpending.push_back( Model != nullptr ? Model->Root : nullptr ); + while( false == m_instance_lodpending.empty() ) { + auto const *submodel = m_instance_lodpending.back(); + m_instance_lodpending.pop_back(); + if( submodel == nullptr ) { continue; } + lodrangesquared = std::max( lodrangesquared, submodel->fSquareMaxDist ); + m_instance_lodpending.push_back( submodel->Child ); + m_instance_lodpending.push_back( submodel->Next ); + } + + Bucket.bounds.clear(); + Bucket.bounds.reserve( Bucket.instances.size() ); + for( auto const *instance : Bucket.instances ) { + scene::basic_cell::instance_bounds instancebounds; + if( instance != nullptr ) { + instancebounds.center = glm::vec3{ instance->m_area.center }; + instancebounds.radius = instance->m_area.radius; + instancebounds.rangesquaredmax = std::min( lodrangesquared, static_cast( std::min( instance->m_rangesquaredmax, static_cast( std::numeric_limits::max() ) ) ) ); + } + Bucket.bounds.emplace_back( instancebounds ); + } + Bucket.boundsversion = m_instanceboundsversion; +} + // True GPU-instanced render path for a group of TAnimModel instances sharing the same // TModel3d. The submodel tree is walked ONCE per batch; at every submodel that draws // geometry we issue a single glDrawElementsInstancedBaseVertex(N) covering all visible @@ -3239,17 +3319,17 @@ void opengl33_renderer::Render_Instanced( TModel3d *Model, std::vectorupdate( reinterpret_cast( &identity ), 0, sizeof( identity ) ); - } - offset_idx += this_batch; ++m_renderpass.draw_stats.instanced_drawcalls; } } + // 3. Restore instance_modelview[0] to identity so subsequent + // non-instanced draws continue to compute identity * modelview. + // done once the last batch is out, as everything drawn up to that point is instanced + { + glm::mat4 const identity( 1.0f ); + instance_ubo->update( reinterpret_cast( &identity ), 0, sizeof( identity ) ); + } m_renderpass.draw_stats.instances += static_cast( m_instance_survivors.size() ); m_renderpass.draw_stats.models += static_cast( m_instance_survivors.size() ); diff --git a/rendering/opengl33renderer.h b/rendering/opengl33renderer.h index 3cc46aa85..d3b177f50 100644 --- a/rendering/opengl33renderer.h +++ b/rendering/opengl33renderer.h @@ -284,6 +284,11 @@ class opengl33_renderer : public gfx_renderer { // instanced_drawcall in draw_stats and contributes Instances.size() to the // instances counter. Instances are still individually frustum/distance culled. void Render_Instanced( TModel3d *Model, std::vector const &Instances ); + // adds the bucketed instances of a scene cell to the frame-level buckets drawn by Render_Instanced(), + // less the ones the copies of their bounds show to be out of sight in the current render pass + void Queue_Instances( scene::basic_cell const *Cell ); + // makes the copies of the bounds of the instances held by a bucket of a scene cell + void Update_Instance_Bounds( TModel3d const *Model, scene::basic_cell::instance_bucket const &Bucket ); bool Render(TDynamicObject *Dynamic); bool Render(TModel3d *Model, material_data const *Material, float const Squaredistance, glm::dvec3 const &Position, glm::vec3 const &Angle); bool Render(TModel3d *Model, material_data const *Material, float const Squaredistance); @@ -383,6 +388,9 @@ class opengl33_renderer : public gfx_renderer { // of once per cell -- collapsing many tiny instanced draws into a few large // batches. Reused every pass; the vectors are emptied (not freed) at the top of Render(scene::basic_region*). scene::basic_cell::instance_bucket_map m_frame_instance_buckets; + // copies of instance bounds kept by the buckets of scene cells are good as long as they carry this number. + // it changes with each frame drawn with the scenery editor active, as the editor moves and resizes instances in place + unsigned int m_instanceboundsversion { 1 }; renderpass_config m_colorpass; // parametrs of most recent color pass std::array m_shadowpass; // parametrs of most recent shadowmap pass for each of csm stages std::vector m_pickcontrolsitems; diff --git a/scene/scene.cpp b/scene/scene.cpp index 2667c7300..7b0e29940 100644 --- a/scene/scene.cpp +++ b/scene/scene.cpp @@ -379,7 +379,9 @@ basic_cell::insert( TAnimModel *Instance ) { if( mat != nullptr ) { for( int i = 0; i < 5; ++i ) { key.skins[i] = mat->replacable_skins[i]; } } - m_instancebuckets_opaque[ key ].emplace_back( Instance ); + auto &bucket { m_instancebuckets_opaque[ key ] }; + bucket.instances.emplace_back( Instance ); + bucket.bounds.clear(); } } // re-calculate cell bounding area, in case model extends outside the cell's boundaries @@ -478,10 +480,12 @@ basic_cell::erase( TAnimModel *Instance ) { // NOTE: searched by pointer rather than by key: the instance may have lost its instanceable // status or changed its skins since it was inserted, which would leave a dangling pointer behind for( auto bucket = m_instancebuckets_opaque.begin(); bucket != m_instancebuckets_opaque.end(); ) { - bucket->second.erase( - std::remove( std::begin( bucket->second ), std::end( bucket->second ), Instance ), - std::end( bucket->second ) ); - if( bucket->second.empty() ) { + auto &instances { bucket->second.instances }; + instances.erase( + std::remove( std::begin( instances ), std::end( instances ), Instance ), + std::end( instances ) ); + bucket->second.bounds.clear(); + if( instances.empty() ) { bucket = m_instancebuckets_opaque.erase( bucket ); } else { diff --git a/scene/scene.h b/scene/scene.h index 6b1ba1754..086e2e830 100644 --- a/scene/scene.h +++ b/scene/scene.h @@ -239,6 +239,21 @@ public: } }; using instance_bucket_map = std::unordered_map< instance_bucket_key, std::vector, instance_bucket_key_hash >; + // what it takes to tell that an instance is out of sight, copied from the instance. + // a cell can hold thousands of instances, each of them large and placed wherever the memory was free, and a render + // pass rejects most of them. the renderer makes the copies and goes by them, to fetch only the instances it may draw + struct instance_bounds { + glm::vec3 center { 0.f }; // location of the instance, in the precision the frustum test takes it + float radius { 0.f }; + float rangesquaredmax { 0.f }; // past it the instance isn't drawn: by its own range, or the lod stages of its model + }; + struct instance_bucket { + std::vector instances; + // caches owned by the renderer; emptied whenever the content of the bucket changes + mutable std::vector bounds; // copies for the instances, in the same order + mutable unsigned int boundsversion { 0 }; + }; + using instance_bucketdata_map = std::unordered_map< instance_bucket_key, instance_bucket, instance_bucket_key_hash >; using sound_sequence = std::vector; using eventlauncher_sequence = std::vector; using memorycell_sequence = std::vector; @@ -259,7 +274,7 @@ public: // batched instance buckets keyed by shared TModel3d*; populated alongside // m_instancesopaque for nodes whose TAnimModel::m_instanceable == true. // The renderer uses these to amortise per-model state setup across many instances. - instance_bucket_map m_instancebuckets_opaque; + instance_bucketdata_map m_instancebuckets_opaque; traction_sequence m_traction; sound_sequence m_sounds; eventlauncher_sequence m_eventlaunchers; From e335b89fcb22d95f3239b608ab0628f22b876a08 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Wed, 7 Oct 2026 17:13:32 +0200 Subject: [PATCH 149/430] perf(tracks): geometry of neighbouring tracks of a cell which share the material drawn together, with one material bind and one upload of model data; chunks of the same geometry bank sent to the gpu in a single multi draw call --- rendering/geometrybank.cpp | 33 +++++++++++++ rendering/geometrybank.h | 9 ++++ rendering/opengl33geometrybank.cpp | 60 ++++++++++++++++++++++++ rendering/opengl33geometrybank.h | 3 ++ rendering/opengl33renderer.cpp | 74 +++++++++++++++++++++++------- rendering/opengl33renderer.h | 2 + 6 files changed, 165 insertions(+), 16 deletions(-) diff --git a/rendering/geometrybank.cpp b/rendering/geometrybank.cpp index e853f4dc7..f2db8b8bf 100644 --- a/rendering/geometrybank.cpp +++ b/rendering/geometrybank.cpp @@ -332,6 +332,13 @@ geometry_bank::draw_instanced( gfx::geometry_handle const &Geometry, gfx::stream return draw_instanced_( Geometry, Units, InstanceCount, Streams ); } +// draws geometry stored in supplied sequence of chunks of the bank +std::size_t +geometry_bank::draw_batch( gfx::geometry_handle const *First, gfx::geometry_handle const *Last, gfx::stream_units const &Units, unsigned int const Streams ) { + // template method implementation + return draw_batch_( First, Last, Units, Streams ); +} + // frees subclass-specific resources associated with the bank, typically called when the bank wasn't in use for a period of time void geometry_bank::release() { @@ -436,6 +443,32 @@ geometrybank_manager::draw_instanced( gfx::geometry_handle const &Geometry, std: m_primitivecount += bankrecord.first->draw_instanced( Geometry, m_units, InstanceCount, Streams ); } +// draws geometry stored in supplied sequence of chunks +void +geometrybank_manager::draw_batch( gfx::geometry_handle const *First, gfx::geometry_handle const *Last, unsigned int const Streams ) { + + while( First != Last ) { + + if( *First == null_handle ) { + ++First; + continue; + } + // neighbouring chunks stored in the same bank go to the bank together + auto const *last { First + 1 }; + while( ( last != Last ) + && ( last->bank == First->bank ) ) { + ++last; + } + + auto &bankrecord = bank( *First ); + + bankrecord.second = m_garbagecollector.timestamp(); + m_primitivecount += bankrecord.first->draw_batch( First, last, m_units, Streams ); + + First = last; + } +} + // provides direct access to index data of specfied chunk gfx::index_array const & geometrybank_manager::indices( gfx::geometry_handle const &Geometry ) const { diff --git a/rendering/geometrybank.h b/rendering/geometrybank.h index 39735e004..20baf4ed2 100644 --- a/rendering/geometrybank.h +++ b/rendering/geometrybank.h @@ -121,6 +121,8 @@ public: auto draw( gfx::geometry_handle const &Geometry, gfx::stream_units const &Units, unsigned int const Streams = basic_streams ) -> std::size_t; // draws geometry stored in specified chunk N times via glDrawElementsInstanced* auto draw_instanced( gfx::geometry_handle const &Geometry, gfx::stream_units const &Units, std::size_t const InstanceCount, unsigned int const Streams = basic_streams ) -> std::size_t; + // draws geometry stored in supplied sequence of chunks of the bank, in their order. the bank is free to combine them into fewer draw calls + auto draw_batch( gfx::geometry_handle const *First, gfx::geometry_handle const *Last, gfx::stream_units const &Units, unsigned int const Streams = basic_streams ) -> std::size_t; // draws geometry stored in supplied list of chunks template auto draw( Iterator_ First, Iterator_ Last, gfx::stream_units const &Units, unsigned int const Streams = basic_streams ) ->std::size_t { @@ -187,6 +189,11 @@ private: std::size_t count { 0 }; for( std::size_t i = 0; i < InstanceCount; ++i ) { count += draw_( Geometry, Units, Streams ); } return count; } + // draw_batch() subclass details. Default implementation falls back to regular draw of each chunk. + virtual auto draw_batch_( gfx::geometry_handle const *First, gfx::geometry_handle const *Last, gfx::stream_units const &Units, unsigned int const Streams ) -> std::size_t { + std::size_t count { 0 }; + for( ; First != Last; ++First ) { count += draw_( *First, Units, Streams ); } + return count; } // resource release subclass details virtual void release_() = 0; }; @@ -218,6 +225,8 @@ public: // draws geometry stored in specified chunk InstanceCount times via GPU instancing. // The shader reads per-instance modelview matrices from instance_ubo[gl_InstanceID]. void draw_instanced( gfx::geometry_handle const &Geometry, std::size_t const InstanceCount, unsigned int const Streams = basic_streams ); + // draws geometry stored in supplied sequence of chunks, in their order. neighbouring chunks of the same bank are passed to it together + void draw_batch( gfx::geometry_handle const *First, gfx::geometry_handle const *Last, unsigned int const Streams = basic_streams ); template void draw( Iterator_ First, Iterator_ Last, unsigned int const Streams = basic_streams ) { while( First != Last ) { diff --git a/rendering/opengl33geometrybank.cpp b/rendering/opengl33geometrybank.cpp index 506d22f1e..4713ec69b 100644 --- a/rendering/opengl33geometrybank.cpp +++ b/rendering/opengl33geometrybank.cpp @@ -259,6 +259,66 @@ opengl33_vaogeometrybank::draw_instanced_( gfx::geometry_handle const &Geometry, return prims * InstanceCount; } +// draw_batch() subclass details — neighbouring non-indexed chunks of the same type are sent with a single GL call. +// The chunks are drawn in the supplied order, same as with a draw_() call for each of them. +std::size_t +opengl33_vaogeometrybank::draw_batch_( gfx::geometry_handle const *First, gfx::geometry_handle const *Last, gfx::stream_units const &Units, unsigned int const Streams ) +{ + std::size_t count { 0 }; + + if( !glMultiDrawArrays ) { + // GLES context doesn't provide the call + for( ; First != Last; ++First ) { count += draw_( *First, Units, Streams ); } + return count; + } + + setup_buffer(); + + std::array offsets; + std::array sizes; + GLsizei pending { 0 }; + unsigned int pendingtype { 0 }; + + auto const flush = [ & ]() { + if( pending == 0 ) { return; } + m_vao->bind(); + if( pending == 1 ) { ::glDrawArrays( pendingtype, offsets[ 0 ], sizes[ 0 ] ); } + else { ::glMultiDrawArrays( pendingtype, offsets.data(), sizes.data(), pending ); } + pending = 0; + }; + + for( ; First != Last; ++First ) { + + auto const &chunkrecord = m_chunkrecords.at( First->chunk - 1 ); + if( ( false == chunkrecord.is_good ) + || ( chunkrecord.index_count > 0 ) ) { + // chunks which wait for upload of their data and indexed chunks take the regular route + flush(); + count += draw_( *First, Units, Streams ); + continue; + } + + auto const type { gfx::geometry_bank::chunk( *First ).type }; + if( ( pending == static_cast( offsets.size() ) ) + || ( ( pending > 0 ) && ( type != pendingtype ) ) ) { + flush(); + } + pendingtype = type; + offsets[ pending ] = static_cast( chunkrecord.vertex_offset ); + sizes[ pending ] = static_cast( chunkrecord.vertex_count ); + ++pending; + + switch( type ) { + case GL_TRIANGLES: { count += chunkrecord.vertex_count / 3; break; } + case GL_TRIANGLE_STRIP: { count += ( chunkrecord.vertex_count > 2 ? chunkrecord.vertex_count - 2 : 0 ); break; } + default: { break; } + } + } + flush(); + + return count; +} + // release () subclass details void opengl33_vaogeometrybank::release_() { diff --git a/rendering/opengl33geometrybank.h b/rendering/opengl33geometrybank.h index f5cd7e373..79526f103 100644 --- a/rendering/opengl33geometrybank.h +++ b/rendering/opengl33geometrybank.h @@ -56,6 +56,9 @@ private: // draw_instanced() subclass details — issues glDrawElementsInstancedBaseVertex auto draw_instanced_( gfx::geometry_handle const &Geometry, gfx::stream_units const &Units, std::size_t const InstanceCount, unsigned int const Streams ) -> std::size_t override; + // draw_batch() subclass details — issues glMultiDrawArrays for runs of non-indexed chunks of the same type + auto + draw_batch_( gfx::geometry_handle const *First, gfx::geometry_handle const *Last, gfx::stream_units const &Units, unsigned int const Streams ) -> std::size_t override; // release() subclass details void release_() override; diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index d207b204e..752ba842e 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -2854,7 +2854,13 @@ void opengl33_renderer::Render(cell_sequence::iterator First, cell_sequence::ite void opengl33_renderer::Draw_Geometry(std::vector::iterator begin, std::vector::iterator end) { - m_geometry.draw(begin, end); + if (begin == end) + { + return; + } + // the handles are handed over as a whole, so chunks kept in the same bank can be drawn with fewer calls + auto const *first{&(*begin)}; + m_geometry.draw_batch(first, first + std::distance(begin, end)); } void opengl33_renderer::Draw_Geometry(const gfx::geometrybank_handle &handle) @@ -4066,6 +4072,31 @@ void opengl33_renderer::Render(scene::basic_cell::path_sequence::const_iterator } } + // geometry of neighbouring tracks which share the material is gathered and drawn together. + // only neighbours are combined, the tracks are still drawn in their order in the cell + material_handle batchmaterial{null_handle}; + auto const flush_batch = [&]() + { + if (false == m_pathbatch.empty()) + { + draw(std::begin(m_pathbatch), std::end(m_pathbatch)); + m_pathbatch.clear(); + } + batchmaterial = null_handle; + }; + // returns: true if the material starts a new batch, false if it continues the current one + auto const begin_batch = [&](material_handle const Material) + { + if (Material == batchmaterial) + { + return false; + } + flush_batch(); + Bind_Material(Material); + batchmaterial = Material; + return true; + }; + // TODO: render auto generated trackbeds together with regular trackbeds in pass 1, and all rails in pass 2 // first pass, material 1 for (auto first{First}; first != Last; ++first) @@ -4092,15 +4123,21 @@ void opengl33_renderer::Render(scene::basic_cell::path_sequence::const_iterator { if (track->eEnvironment != e_flat) { + // track with light level of its own is drawn on its own + flush_batch(); setup_environment_light(track->eEnvironment); - } - Bind_Material(track->m_material1); - draw(std::begin(track->Geometry1), std::end(track->Geometry1)); - if (track->eEnvironment != e_flat) - { + Bind_Material(track->m_material1); + draw(std::begin(track->Geometry1), std::end(track->Geometry1)); // restore default lighting setup_environment_light(); + break; } + if (false == begin_batch(track->m_material1)) + { + // the track is drawn with the call of its predecessor + --m_renderpass.draw_stats.drawcalls; + } + m_pathbatch.insert(std::end(m_pathbatch), std::begin(track->Geometry1), std::end(track->Geometry1)); break; } case rendermode::shadows: @@ -4130,6 +4167,7 @@ void opengl33_renderer::Render(scene::basic_cell::path_sequence::const_iterator } } } + flush_batch(); // second pass, material 2 for (auto first{First}; first != Last; ++first) { @@ -4151,15 +4189,16 @@ void opengl33_renderer::Render(scene::basic_cell::path_sequence::const_iterator { if (track->eEnvironment != e_flat) { + flush_batch(); setup_environment_light(track->eEnvironment); - } - Bind_Material(track->m_material2); - draw(std::begin(track->Geometry2), std::end(track->Geometry2)); - if (track->eEnvironment != e_flat) - { + Bind_Material(track->m_material2); + draw(std::begin(track->Geometry2), std::end(track->Geometry2)); // restore default lighting setup_environment_light(); + break; } + begin_batch(track->m_material2); + m_pathbatch.insert(std::end(m_pathbatch), std::begin(track->Geometry2), std::end(track->Geometry2)); break; } case rendermode::shadows: @@ -4185,6 +4224,7 @@ void opengl33_renderer::Render(scene::basic_cell::path_sequence::const_iterator } } } + flush_batch(); // third pass, material 3 for (auto first{First}; first != Last; ++first) @@ -4212,15 +4252,16 @@ void opengl33_renderer::Render(scene::basic_cell::path_sequence::const_iterator { if (track->eEnvironment != e_flat) { + flush_batch(); setup_environment_light(track->eEnvironment); - } - Bind_Material(track->SwitchExtension->m_material3); - draw(track->SwitchExtension->Geometry3); - if (track->eEnvironment != e_flat) - { + Bind_Material(track->SwitchExtension->m_material3); + draw(track->SwitchExtension->Geometry3); // restore default lighting setup_environment_light(); + break; } + begin_batch(track->SwitchExtension->m_material3); + m_pathbatch.emplace_back(track->SwitchExtension->Geometry3); break; } case rendermode::shadows: @@ -4246,6 +4287,7 @@ void opengl33_renderer::Render(scene::basic_cell::path_sequence::const_iterator } } } + flush_batch(); // fourth pass: per-track sleeper models (sleepermodel optional directive). // drawn after rails/trackbeds so depth pre-pass culling is favourable, and only in passes diff --git a/rendering/opengl33renderer.h b/rendering/opengl33renderer.h index d3b177f50..b028f929c 100644 --- a/rendering/opengl33renderer.h +++ b/rendering/opengl33renderer.h @@ -388,6 +388,8 @@ class opengl33_renderer : public gfx_renderer { // of once per cell -- collapsing many tiny instanced draws into a few large // batches. Reused every pass; the vectors are emptied (not freed) at the top of Render(scene::basic_region*). scene::basic_cell::instance_bucket_map m_frame_instance_buckets; + // geometry of neighbouring tracks of a cell which share the material, gathered to be drawn together. reused by each Render(path_sequence) + std::vector m_pathbatch; // copies of instance bounds kept by the buckets of scene cells are good as long as they carry this number. // it changes with each frame drawn with the scenery editor active, as the editor moves and resizes instances in place unsigned int m_instanceboundsversion { 1 }; From 4e406fdd8630b0e15133ddbe682c2107f37f525b Mon Sep 17 00:00:00 2001 From: maj00r Date: Wed, 7 Oct 2026 18:17:59 +0200 Subject: [PATCH 150/430] fix(ai): end brake charging on control reservoir overcharge, charge on blocked departures - end the charging position when the control reservoir of any vehicle, the locomotive included, rises 0.05 bar above the nominal pipe pressure - standing and unable to depart for 10 s: allow the charging position regardless of the equivalent pipe pressure and the train type --- vehicle/Driver.cpp | 34 ++++++++++++++++++++++++++++++++-- vehicle/Driver.h | 3 +++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index be326dc55..05e71e8f4 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -156,7 +156,9 @@ const double HeavyCargoTrainAcceleration = 0.10; const double PrepareTime = 2.0; //[s] przebłyski świadomości przy odpalaniu const double FSOverchargePipePress = 5.2; const double FSOverchargeTime = 2.0; +const double FSOverchargeCRP = 0.05; const double FSMaxTime = 10.0; +const double DepartBlockedFSDelay = 10.0; bool WriteLogFlag = false; double const deltalog = 0.05; // przyrost czasu @@ -6016,6 +6018,17 @@ TController::determine_consist_state() { && fReady < 0.8 ) { // delikatniejszy warunek, obejmuje wszystkie wagony Ready = true; //żeby uznać za odhamowany } + auto const departblocked { + AIControllFlag + && mvOccupied->Vel < EU07_AI_NOMOVEMENT + && VelDesired > 0.0 + && ( false == Ready || fReady > 0.4 ) }; + if( false == departblocked ) { + DepartBlockedStart = -1.0; + } + else if( DepartBlockedStart < 0.0 ) { + DepartBlockedStart = ElapsedTime; + } // second pass, for diesel engines verify the (live) engines are fully started // TODO: cache presence of diesel engines in the consist, to skip this test if there isn't any p = pVehicles[ end::front ]; // pojazd na czole składu @@ -8021,8 +8034,9 @@ void TController::control_main_pipe() { || mvOccupied->BrakeHandle == TBrakeHandle::MHZ_K8P || mvOccupied->BrakeHandle == TBrakeHandle::M394 ) { - if( (iDrivigFlags & moveOerlikons || true == IsCargoTrain) && BrakeCtrlPosition == gbh_RP && AbsAccS < 0.03 && AccDesired > -0.03 && VelDesired - mvOccupied->Vel > 2.0 && fReady > 0.35 && - mvOccupied->EqvtPipePress < 4.5 // don't charge with a risk of overcharging the main pipe + auto const departblocked { is_departure_blocked( DepartBlockedFSDelay ) }; + if( (iDrivigFlags & moveOerlikons || true == IsCargoTrain || departblocked) && BrakeCtrlPosition == gbh_RP && AbsAccS < 0.03 && AccDesired > -0.03 && VelDesired - mvOccupied->Vel > 2.0 && fReady > 0.35 && + ( mvOccupied->EqvtPipePress < 4.5 || departblocked ) // don't charge with a risk of overcharging the main pipe && mvOccupied->Compressor >= 7.5 // don't charge without sufficient pressure in the tank && BrakeChargingCooldown >= 0.0 // don't charge while cooldown is active && (ActualProximityDist > 100.0 // don't charge if we're about to be braking soon @@ -8066,12 +8080,28 @@ void TController::update_brake_charging() { } } +bool TController::is_departure_blocked( double const Delay ) const { + + return DepartBlockedStart >= 0.0 + && ElapsedTime - DepartBlockedStart > Delay; +} + +double TController::consist_max_crp() const { + + auto result { 0.0 }; + for( auto const *vehicle { pVehicles[ end::front ] }; vehicle != nullptr; vehicle = vehicle->Next() ) { + result = std::max( result, vehicle->MoverParameters->Hamulec->GetCRP() ); + } + return result; +} + bool TController::is_brake_charging_done() const { if( BrakeChargingStart < 0.0 ) { return false; } return ElapsedTime - BrakeChargingStart > FSMaxTime + || consist_max_crp() > mvOccupied->HighPipePress + FSOverchargeCRP || std::ranges::any_of( BrakeChargingPipeOverchargeStart, [this]( auto const &Vehicle ) { return ElapsedTime - Vehicle.second > FSOverchargeTime; } ); diff --git a/vehicle/Driver.h b/vehicle/Driver.h index 02ad63857..77acf9c44 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -350,6 +350,8 @@ private: void control_main_pipe(); void update_brake_charging(); bool is_brake_charging_done() const; + double consist_max_crp() const; + bool is_departure_blocked( double const Delay ) const; void control_relays(); void control_motor_connectors(); void control_tractive_force(); @@ -454,6 +456,7 @@ private: double BrakeChargingCooldown{}; // prevents the ai from trying to charge the train brake too frequently double BrakeChargingStart = -1.0; std::unordered_map BrakeChargingPipeOverchargeStart; + double DepartBlockedStart = -1.0; TBrakeSystem BrakeSystem = TBrakeSystem::Individual; //type of main brake bool ForcePNBrake = false; //is it necessary to use PN brake instead of EP brake int DynamicBrakeTest = 0; //is it necessary to make brake test while driving From a52e92bd9a24d5f9183ef94cfadbee6cbd674908 Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 8 Oct 2026 00:51:29 +0200 Subject: [PATCH 151/430] fix(models): animation container derived from enable_shared_from_this publicly, so shared_from_this can reach it --- model/AnimModel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/AnimModel.h b/model/AnimModel.h index 61b1ccb73..0087418df 100644 --- a/model/AnimModel.h +++ b/model/AnimModel.h @@ -46,7 +46,7 @@ class TAnimVocaloidFrame class basic_event; -class TAnimContainer : std::enable_shared_from_this +class TAnimContainer : public std::enable_shared_from_this { // opakowanie submodelu, określające animację egzemplarza - obsługiwane jako lista friend TAnimModel; From 110c99a155dd568bba4751d3c193a7c11d387df1 Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 8 Oct 2026 00:51:29 +0200 Subject: [PATCH 152/430] fix(launcher): map credits of the wizard of a new scenery wrapped to the width of its panel --- launcher/scenery_wizard.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/launcher/scenery_wizard.cpp b/launcher/scenery_wizard.cpp index a6c96520f..e4c301383 100644 --- a/launcher/scenery_wizard.cpp +++ b/launcher/scenery_wizard.cpp @@ -345,7 +345,9 @@ void ui::scenerywizard_panel::render_form() if (false == m_status.empty()) ImGui::TextWrapped("%s", m_status.c_str()); ImGui::Spacing(); - ImGui::TextDisabled("%s", STR_C("Map: (c) OpenStreetMap contributors, served by geoportal.gov.pl")); + ImGui::PushStyleColor(ImGuiCol_Text, ImGui::GetStyleColorVec4(ImGuiCol_TextDisabled)); + ImGui::TextWrapped("%s", STR_C("Map: (c) OpenStreetMap contributors, served by geoportal.gov.pl")); + ImGui::PopStyleColor(); } bool ui::scenerywizard_panel::create_scenery() From ca208b3ed1e40ff9c8a3c6f376e424923601ad43 Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 8 Oct 2026 00:51:29 +0200 Subject: [PATCH 153/430] fix(editor): a long arc of a larger radius kept as a part of a compound curve, only short arcs of growing radius taken for the transition curve of an old scenery --- editor/editorTrack.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index a3d4854ce..11a6a1cf3 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -1453,9 +1453,19 @@ bool editor_track::analyse_curve(std::vector> const &R Curve.cant = std::max(Curve.cant, Gauge * std::sin(std::abs(glm::radians(static_cast(roll))))); } auto const peak{*std::max_element(curvatures.begin(), curvatures.end())}; - for (std::size_t i = 0; i < run.size(); ++i) - if (curvatures[i] < 0.9 * peak) - varying[i] = true; + // old sceneries make a transition of short arcs of growing radius, a longer arc of a larger radius is a part of a compound curve + constexpr double kShortestCompoundArc{30.0}; + for (std::size_t first = 0; first < run.size();) + { + auto last{first + 1}; + while (last < run.size() && false == varying[first] && false == varying[last] && std::abs(curvatures[last] - curvatures[first]) <= 0.05 * curvatures[first]) + ++last; + auto const length{std::accumulate(lengths.begin() + first, lengths.begin() + last, 0.0)}; + if (curvatures[first] < 0.9 * peak && (varying[first] || length < kShortestCompoundArc || curvatures[first] < 0.1 * peak)) + for (auto i = first; i < last; ++i) + varying[i] = true; + first = last; + } double smallest{0.0}; for (std::size_t i = 0; i < run.size(); ++i) if (false == varying[i] && curvatures[i] > 0.0 && (smallest == 0.0 || 1.0 / curvatures[i] < smallest)) From b451f80c6d517bcba5ad83fe8defb440260a3fa4 Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 8 Oct 2026 00:51:29 +0200 Subject: [PATCH 154/430] feat(terrain): binary terrain (BTF2) keeps the sweeps and the //$ lines of its text file and loads them with the terrain; a sweep in the text file no longer stops the conversion; binary files of the version before made again from the text --- scene/sceneterrain.cpp | 71 +++++++++++++++++++++++- scene/sceneterrain.h | 1 + simulation/simulationstateserializer.cpp | 1 + 3 files changed, 71 insertions(+), 2 deletions(-) diff --git a/scene/sceneterrain.cpp b/scene/sceneterrain.cpp index 39f0f02d8..db0135d3c 100644 --- a/scene/sceneterrain.cpp +++ b/scene/sceneterrain.cpp @@ -81,7 +81,7 @@ namespace { std::uint32_t const EU07_FILEHEADER{MAKE_ID4('E', 'U', '0', '7')}; -std::uint32_t const EU07_FILEVERSION_TERRAIN{MAKE_ID4('B', 'T', 'F', '1')}; +std::uint32_t const EU07_FILEVERSION_TERRAIN{MAKE_ID4('B', 'T', 'F', '2')}; std::uint32_t const EU07_TERRAINBLOCK{MAKE_ID4('B', 'T', 'F', 'S')}; std::size_t const EU07_TERRAINVERTEXSIZE{8 * sizeof(float)}; @@ -92,6 +92,8 @@ struct file_header std::uint32_t materialcount{0}; std::uint32_t sectioncount{0}; std::uint64_t vertexcount{0}; + std::uint64_t extraoffset{0}; + std::uint32_t extrasize{0}; }; // adds value to the data in the byte order of the file @@ -215,7 +217,7 @@ bool read_file(std::string const &Filename, std::string &Data) // loads the fixed part of binary terrain file header. returns: true if the file can be used, false otherwise bool read_header(std::istream &Input, file_header &Header) { - char bytes[48]; + char bytes[60]; Input.read(bytes, sizeof(bytes)); if (Input.gcount() != static_cast(sizeof(bytes))) { @@ -238,6 +240,8 @@ bool read_header(std::istream &Input, file_header &Header) Header.materialcount = data.get(); Header.sectioncount = data.get(); Header.vertexcount = data.get(); + Header.extraoffset = data.get(); + Header.extrasize = data.get(); return data.good(); } @@ -395,6 +399,24 @@ bool terrain_file::write(std::string const &Text, std::string const &Binaryfile, conversion_scope scope; auto region{std::make_unique()}; scratch_data scratchpad{}; + std::string extra; + { + std::size_t begin{0}; + while (begin < Text.size()) + { + auto end{Text.find('\n', begin)}; + end = (end == std::string::npos ? Text.size() : end + 1); + auto const first{Text.find_first_not_of(" \t", begin)}; + if (first < end && Text.compare(first, 3, "//$") == 0) + { + auto line{Text.substr(first, end - first)}; + while (false == line.empty() && (line.back() == '\n' || line.back() == '\r')) + line.pop_back(); + extra += line + "\n"; + } + begin = end; + } + } { cParser input{Text, cParser::buffer_TEXT}; @@ -405,9 +427,26 @@ bool terrain_file::write(std::string const &Text, std::string const &Binaryfile, { if (token == "node") { + auto const begin{static_cast(input.TokenBegin())}; node_data nodedata; input.getTokens(4); input >> nodedata.range_max >> nodedata.range_min >> nodedata.name >> nodedata.type; + if (nodedata.type == "sweep") + { + auto rest{input.getToken()}; + while (false == rest.empty() && rest != "endsweep") + rest = input.getToken(); + auto const end{static_cast(input.TokenEnd())}; + auto const offset{scratchpad.location.offset.empty() ? glm::dvec3{0.0} : scratchpad.location.offset.top()}; + auto const placed{offset != glm::dvec3{0.0}}; + if (placed) + extra += "origin " + std::to_string(offset.x) + ' ' + std::to_string(offset.y) + ' ' + std::to_string(offset.z) + "\n"; + extra += Text.substr(begin, end - begin) + "\n"; + if (placed) + extra += "endorigin\n"; + token = input.getToken(); + continue; + } if (nodedata.type != "triangles" && nodedata.type != "triangle_strip" && nodedata.type != "triangle_fan") { Message = "node of type \"" + nodedata.type + "\" (line " + std::to_string(input.Line()) + ") can't be a part of binary terrain"; @@ -485,6 +524,9 @@ bool terrain_file::write(std::string const &Text, std::string const &Binaryfile, put(data, static_cast(sections.size())); auto const vertexcountposition{data.size()}; put(data, vertexcount); // filled in when the count is known + auto const extraposition{data.size()}; + put(data, std::uint64_t{0}); + put(data, std::uint32_t{0}); for (auto const &material : scope.materials()) { data.append(material.c_str(), material.size() + 1); @@ -562,6 +604,12 @@ bool terrain_file::write(std::string const &Text, std::string const &Binaryfile, put(directory, section->m_area.radius); offset += data.size(); } + output.write(extra.data(), static_cast(extra.size())); + data.clear(); + put(data, static_cast(offset)); + put(data, static_cast(extra.size())); + output.seekp(static_cast(extraposition)); + output.write(data.data(), static_cast(data.size())); // fill in the parts left for later output.seekp(static_cast(directoryposition)); output.write(directory.data(), static_cast(directory.size())); @@ -672,6 +720,25 @@ terrain_file::state terrain_file::prepare(std::string const &Textfile, std::stri return state::text; } +std::string terrain_file::extra(std::string const &Binaryfile) +{ + std::ifstream input{Binaryfile, std::ios::binary}; + file_header header; + if (input.fail() || false == read_header(input, header) || header.extrasize == 0) + { + return {}; + } + std::string text(header.extrasize, '\0'); + input.seekg(static_cast(header.extraoffset)); + input.read(text.data(), static_cast(text.size())); + if (static_cast(std::max(0, input.gcount())) != text.size()) + { + ErrorLog("Bad file: \"" + Binaryfile + "\" is damaged, the editor data it holds can't be read"); + return {}; + } + return text; +} + // makes content of specified binary terrain file a part of provided region bool terrain_file::attach(std::string const &Binaryfile, basic_region &Region, bool Deferred) { diff --git a/scene/sceneterrain.h b/scene/sceneterrain.h index b719604b4..07359fbd4 100644 --- a/scene/sceneterrain.h +++ b/scene/sceneterrain.h @@ -46,6 +46,7 @@ class terrain_file static bool attach(std::string const &Binaryfile, basic_region &Region, bool Deferred); // loads specified piece of a binary terrain file into provided section static void load(basic_section &Section, terrain_block const &Block); + static std::string extra(std::string const &Binaryfile); private: // converts provided content of a text terrain file to binary format and stores it in specified file. returns: true on success, false otherwise diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index fe5486e83..f73f913c6 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -1235,6 +1235,7 @@ include_terrain_file( std::string File, std::string &Includes, scene::scratch_da else { binary.terrain_binaryfiles.emplace_back( binaryfile ); } + Includes += scene::terrain_file::extra( binaryfile ) + ' '; break; } case scene::terrain_file::state::text: { From d4791f6a29de3eee7fa5c0fba769ea1fe0327ab6 Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 8 Oct 2026 00:51:40 +0200 Subject: [PATCH 155/430] feat(editor): a model or an include standing by a track bent along it (B, or the Bend along the track section of the toolset): it stays where it stood and follows the track, through the joined tracks as far as it reaches; reference point at its start, origin, middle, end or a point picked on the model, across at its origin, the side facing the track, the far side or its middle, up at its origin, bottom, top or the top of its edge by the track; the blue cross of a bent model dragged for its offset, with Shift for its height and with Ctrl along the track, the values shown at the cursor; a bent model clicked to edit; one step of the undo history; scale of the model kept, parts lit only at night left out; edges of platforms told by the name of the model and by the overhang of their edge over the foot: put 1.725 m from the axis at the height the name gives, turned with the edge to the track when they stood the other way; platforms stand on the plane of the rail heads carried on to their edge (PKP PLK ST-T2), the gauge widening led in from the tracks beyond the ends and from the other path of a switch; gaps between the pieces of a sweep filled with the paths which join them; Platforms and models tab left out of the track editor; laid track eased into the curvature of the one it joins with a transition curve; File > Open scenery... starts the editor again with the scenery picked from a list; the camera saved with the scenery; T and Shift+T turn each turntable to its next and previous position by event launchers written on each save; a turntable track deleted with its template; a scenery with no trainset gets a WMB10 on its first track; vehicle placed where the track is clicked; gauge check takes in the bent models; Polish translation of the editor --- application/editormode.cpp | 523 ++++++++---- application/editormode.h | 77 +- application/editormodegauge.cpp | 91 +- application/editormodeselftest.cpp | 429 ++++++++++ application/editormodesweep.cpp | 1197 +++++++++++++++++++++++++-- application/editormodetrack.cpp | 211 ++++- application/editormodetrackux.cpp | 10 +- application/editormodeturntable.cpp | 141 ++++ application/editormodevehicle.cpp | 9 +- application/editoruilayer.cpp | 42 +- application/editoruilayer.h | 12 + application/editoruipanels.cpp | 229 ++--- lang/editor_pl.po | 937 ++++++++++++++++++++- scene/scenelayers.cpp | 27 +- scene/scenelayers.h | 3 +- scene/scenelayerssave.cpp | 12 +- world/Sweep.cpp | 751 +++++++++++++---- world/Sweep.h | 31 +- 18 files changed, 4180 insertions(+), 552 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 24916f38a..7958465c2 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -8,6 +8,10 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" +#include +#include +#include +#include #include "application/editormode.h" #include "application/editoruilayer.h" #ifndef _WIN32 @@ -23,6 +27,7 @@ extern char **environ; #include "editor/editorIncludeInfo.hpp" #include "editor/editorGroundMesh.hpp" #include "editor/editorFormat.hpp" +#include "editor/editorGeometry.hpp" #include "utilities/translation.h" #include "utilities/Globals.h" #include "simulation/simulation.h" @@ -483,8 +488,10 @@ editor_mode::editor_mode() { ui()->set_fill_options([this]() { render_area_fill(); }); ui()->set_gizmo_options([this]() { render_gizmo_options(); }); ui()->set_array_options([this]() { render_array(); }); + ui()->set_bend_options([this]() { render_bend(); }); ui()->set_file_actions([this]() { save(); }, [this]() { export_scenery(); }); ui()->set_new_scenery([this]() { m_newscenery_asked = true; }); + ui()->set_open_scenery([this]() { m_openscenery_asked = true; }); ui()->set_menu_options([this]() { render_object_menu(); render_track_menu(); @@ -911,6 +918,13 @@ void editor_mode::undo_last() EditorSnapshot snap = m_history.back(); m_history.pop_back(); + if (snap.action == EditorSnapshot::Action::Bend) + { + restore_bend(snap, true); + g_redo.push_back(std::move(snap)); + return; + } + if (false == snap.sweeps.empty() || false == snap.sweeps_toggled.empty()) { restore_sweeps(snap); @@ -921,8 +935,11 @@ void editor_mode::undo_last() if (false == snap.instances.empty() || false == snap.directives.empty()) { restore_includes(snap); - g_redo.push_back(std::move(snap)); - return; + if (snap.action != EditorSnapshot::Action::TrackEdit) + { + g_redo.push_back(std::move(snap)); + return; + } } if (snap.instance != 0) @@ -1035,6 +1052,13 @@ void editor_mode::redo_last() EditorSnapshot snap = g_redo.back(); g_redo.pop_back(); + if (snap.action == EditorSnapshot::Action::Bend) + { + restore_bend(snap, false); + m_history.push_back(std::move(snap)); + return; + } + if (false == snap.sweeps.empty() || false == snap.sweeps_toggled.empty()) { restore_sweeps(snap); @@ -1045,8 +1069,11 @@ void editor_mode::redo_last() if (false == snap.instances.empty() || false == snap.directives.empty()) { restore_includes(snap); - m_history.push_back(std::move(snap)); - return; + if (snap.action != EditorSnapshot::Action::TrackEdit) + { + m_history.push_back(std::move(snap)); + return; + } } if (snap.instance != 0) @@ -1334,8 +1361,6 @@ bool editor_mode::update() draw_hekto_overlay(); draw_fouling_overlay(); draw_vehicle_marker(); - sweep_drag(); - draw_sweep_overlay(); } render_track_context(); update_build_tools(); @@ -1353,6 +1378,13 @@ bool editor_mode::update() draw_speed_overlay(); draw_joints_overlay(); } + else + { + draw_sweep_overlay(); + m_sweep.open = false; + bend_drag_update(); + draw_bend_overlay(); + } update_gauge(); render_gauge_window(); @@ -1370,6 +1402,7 @@ bool editor_mode::update() render_orthophoto_window(); render_new_scenery_popup(); + render_open_scenery_popup(); // --- ImGui: Editor Settings & History windows --- if(m_settings_open) @@ -1384,15 +1417,15 @@ bool editor_mode::update() void editor_mode::render_settings() { - ImGui::Begin("Editor Settings", &m_settings_open, ImGuiWindowFlags_AlwaysAutoResize); + ImGui::Begin(STR_C("Editor Settings"), &m_settings_open, ImGuiWindowFlags_AlwaysAutoResize); if (ImGui::BeginTabBar("##editorsettings")) { - if (ImGui::BeginTabItem("General")) + if (ImGui::BeginTabItem(STR_C("General"))) { - ImGui::TextUnformatted("Camera movement"); + ImGui::TextUnformatted(STR_C("Camera movement")); - const char *schemes[] = {"WSAD (new)", "Arrows (legacy)"}; + const char *schemes[] = {STR_C("WSAD (new)"), STR_C("Arrows (legacy)")}; int current = EditorSettings.movement() == editorSettings::movement_scheme::legacy ? 1 : 0; if (ImGui::Combo("##movement_scheme", ¤t, schemes, IM_ARRAYSIZE(schemes))) { @@ -1403,12 +1436,12 @@ void editor_mode::render_settings() } ImGui::Separator(); - ImGui::Checkbox("Transform gizmo (ImGuizmo)", &m_gizmo_enabled); + ImGui::Checkbox(STR_C("Transform gizmo (ImGuizmo)"), &m_gizmo_enabled); ImGui::EndTabItem(); } bool const terrainwanted = m_terrain_tab_wanted; m_terrain_tab_wanted = false; - if (ImGui::BeginTabItem("Terrain", nullptr, terrainwanted ? ImGuiTabItemFlags_SetSelected : 0)) + if (ImGui::BeginTabItem(STR_C("Terrain"), nullptr, terrainwanted ? ImGuiTabItemFlags_SetSelected : 0)) { render_terrain_ui(); ImGui::EndTabItem(); @@ -1422,18 +1455,18 @@ void editor_mode::render_settings() void editor_mode::render_terrain_ui() { ImGui::SetNextItemWidth(120.0f); - ImGui::InputInt("Grid cells", &m_terrain_cells); + ImGui::InputInt(STR_C("Grid cells"), &m_terrain_cells); m_terrain_cells = std::clamp(m_terrain_cells, 1, 512); ImGui::SetNextItemWidth(120.0f); - ImGui::InputFloat("Cell size (m)", &m_terrain_cellsize); + ImGui::InputFloat(STR_C("Cell size (m)"), &m_terrain_cellsize); if (m_terrain_cellsize < 0.1f) m_terrain_cellsize = 0.1f; ImGui::SetNextItemWidth(120.0f); - ImGui::InputFloat("Base height (m)", &m_terrain_baseheight); + ImGui::InputFloat(STR_C("Base height (m)"), &m_terrain_baseheight); ImGui::SetNextItemWidth(200.0f); - ImGui::InputText("Texture (optional)", m_terrain_texture, IM_ARRAYSIZE(m_terrain_texture)); + ImGui::InputText(STR_C("Texture (optional)"), m_terrain_texture, IM_ARRAYSIZE(m_terrain_texture)); - if (ImGui::Button("Create flat terrain")) + if (ImGui::Button(STR_C("Create flat terrain"))) { // centre the new patch horizontally on the camera, flat at the requested base height glm::dvec3 const center(Camera.Pos.x, static_cast(m_terrain_baseheight), Camera.Pos.z); @@ -1449,29 +1482,29 @@ void editor_mode::render_terrain_ui() } ImGui::SetNextItemWidth(120.0f); - ImGui::InputInt("Chunks / side", &m_terrain_chunks); + ImGui::InputInt(STR_C("Chunks / side"), &m_terrain_chunks); m_terrain_chunks = std::clamp(m_terrain_chunks, 1, 32); ImGui::SameLine(); - if (ImGui::Button("Create chunked terrain")) + if (ImGui::Button(STR_C("Create chunked terrain"))) create_chunked_terrain(); - ImGui::TextDisabled("total %d x %d m, %d chunks", + ImGui::TextDisabled(STR_C("total %d x %d m, %d chunks"), static_cast(m_terrain_chunks * m_terrain_cells * m_terrain_cellsize), static_cast(m_terrain_chunks * m_terrain_cells * m_terrain_cellsize), m_terrain_chunks * m_terrain_chunks); - if (ImGui::Checkbox("Chunk edit mode (LMB add neighbour / Shift = delete)", &m_chunk_edit)) + if (ImGui::Checkbox(STR_C("Chunk edit mode (LMB add neighbour / Shift = delete)"), &m_chunk_edit)) if (m_chunk_edit) m_terrain_sculpt = false; // mutually exclusive with sculpting - ImGui::Text("Grid chunks: %zu", m_grid_chunks.size()); + ImGui::Text(STR_C("Grid chunks: %zu"), m_grid_chunks.size()); ImGui::Separator(); - ImGui::TextUnformatted("Streaming (open world, follows camera)"); + ImGui::TextUnformatted(STR_C("Streaming (open world, follows camera)")); ImGui::SetNextItemWidth(120.0f); - ImGui::InputInt("Stream radius", &m_stream_radius); + ImGui::InputInt(STR_C("Stream radius"), &m_stream_radius); m_stream_radius = std::clamp(m_stream_radius, 0, 16); - ImGui::Checkbox("Persist edits to disk (16-bit)", &m_stream_persist); + ImGui::Checkbox(STR_C("Persist edits to disk (16-bit)"), &m_stream_persist); bool streaming = m_streamer.active(); - if (ImGui::Checkbox("Stream terrain", &streaming)) + if (ImGui::Checkbox(STR_C("Stream terrain"), &streaming)) { if (streaming) { @@ -1514,20 +1547,20 @@ void editor_mode::render_terrain_ui() m_streamer.radius(m_stream_radius); m_streamer.simplify(m_terrain_auto_optimize, m_terrain_simplify_error); m_streamer.persist(m_stream_persist); - ImGui::Text("Resident chunks: %zu (dir: %s)", m_streamer.resident(), m_streamer.directory().c_str()); + ImGui::Text(STR_C("Resident chunks: %zu (dir: %s)"), m_streamer.resident(), m_streamer.directory().c_str()); } - ImGui::Text("Patches: %zu", m_terrains.size()); + ImGui::Text(STR_C("Patches: %zu"), m_terrains.size()); // capture: sample the selected model's geometry into an editable patch and remove the original if (dynamic_cast(m_node) != nullptr) { - if (ImGui::Button("Capture selected model as terrain")) + if (ImGui::Button(STR_C("Capture selected model as terrain"))) capture_terrain(); } else { - ImGui::TextDisabled("Capture: select a model instance first"); + ImGui::TextDisabled(STR_C("Capture: select a model instance first")); } std::vector const terrains = active_terrains(); @@ -1545,36 +1578,36 @@ void editor_mode::render_terrain_ui() if (m_terrain_brush_smooth && ImGui::IsItemHovered()) ImGui::SetTooltip("%s", STR_C("Evens out the ground under the brush: bumps and sharp edges go, the shape stays.\nThe strength sets how fast")); ImGui::SetNextItemWidth(120.0f); - ImGui::InputFloat("Brush radius", &m_terrain_brush_radius); + ImGui::InputFloat(STR_C("Brush radius"), &m_terrain_brush_radius); if (m_terrain_brush_radius < 0.5f) m_terrain_brush_radius = 0.5f; ImGui::SetNextItemWidth(120.0f); - ImGui::InputFloat("Brush strength", &m_terrain_brush_strength); + ImGui::InputFloat(STR_C("Brush strength"), &m_terrain_brush_strength); // one-shot nudge of the most recent manual patch at its centre, handy for a quick test if (!m_terrains.empty()) { auto &terrain = m_terrains.back(); glm::dvec3 const c = terrain->centre(); - if (ImGui::Button("Raise centre")) + if (ImGui::Button(STR_C("Raise centre"))) terrain->sculpt(c.x, c.z, m_terrain_brush_radius, m_terrain_brush_strength); ImGui::SameLine(); - if (ImGui::Button("Lower centre")) + if (ImGui::Button(STR_C("Lower centre"))) terrain->sculpt(c.x, c.z, m_terrain_brush_radius, -m_terrain_brush_strength); } ImGui::Separator(); - ImGui::TextUnformatted("Optimize (mesh simplification, all patches)"); + ImGui::TextUnformatted(STR_C("Optimize (mesh simplification, all patches)")); ImGui::SetNextItemWidth(120.0f); - ImGui::InputFloat("Flatness tol (m)", &m_terrain_simplify_error); + ImGui::InputFloat(STR_C("Flatness tol (m)"), &m_terrain_simplify_error); if (m_terrain_simplify_error < 0.01f) m_terrain_simplify_error = 0.01f; - ImGui::Checkbox("Auto-optimize after sculpt", &m_terrain_auto_optimize); - if (ImGui::Button("Optimize all")) + ImGui::Checkbox(STR_C("Auto-optimize after sculpt"), &m_terrain_auto_optimize); + if (ImGui::Button(STR_C("Optimize all"))) for (editor_terrain *t : terrains) t->optimize(m_terrain_simplify_error); ImGui::SameLine(); - if (ImGui::Button("Full-res all")) + if (ImGui::Button(STR_C("Full-res all"))) for (editor_terrain *t : terrains) t->unoptimize(); @@ -1584,7 +1617,7 @@ void editor_mode::render_terrain_ui() tris += t->triangles(); full += t->full_triangles(); } - ImGui::Text("Triangles: %zu / %zu", tris, full); + ImGui::Text(STR_C("Triangles: %zu / %zu"), tris, full); } } @@ -1644,18 +1677,18 @@ void editor_mode::render_orthophoto_ui() bool persist = false; // and store in the editor settings bool enabled = m_orthophoto.enabled(); - if (ImGui::Checkbox("Show orthophoto (geoportal.gov.pl)", &enabled)) + if (ImGui::Checkbox(STR_C("Show orthophoto (geoportal.gov.pl)"), &enabled)) m_orthophoto.enabled(enabled); ImGui::Separator(); - ImGui::TextUnformatted("Scenery origin (0,0,0) in PUWG 1992 / EPSG:2180"); + ImGui::TextUnformatted(STR_C("Scenery origin (0,0,0) in PUWG 1992 / EPSG:2180")); // geodetic convention, as displayed by geoportal.gov.pl: X grows north, Y grows east. // applied once editing ends, so half-typed numbers don't trigger downloads ImGui::SetNextItemWidth(160.0f); - ImGui::InputDouble("X (northing, m)", &m_orthophoto_origin_edit.x, 0.0, 0.0, "%.2f"); + ImGui::InputDouble(STR_C("X (northing, m)"), &m_orthophoto_origin_edit.x, 0.0, 0.0, "%.2f"); bool const northedited = ImGui::IsItemDeactivatedAfterEdit(); ImGui::SetNextItemWidth(160.0f); - ImGui::InputDouble("Y (easting, m)", &m_orthophoto_origin_edit.y, 0.0, 0.0, "%.2f"); + ImGui::InputDouble(STR_C("Y (easting, m)"), &m_orthophoto_origin_edit.y, 0.0, 0.0, "%.2f"); bool const eastedited = ImGui::IsItemDeactivatedAfterEdit(); if (northedited || eastedited) { @@ -1679,13 +1712,13 @@ void editor_mode::render_orthophoto_ui() } } if (config.north == 0.0 && config.east == 0.0) - ImGui::TextColored(ImVec4(1.0f, 0.75f, 0.2f, 1.0f), "Enter the origin of this scenery first"); + ImGui::TextColored(ImVec4(1.0f, 0.75f, 0.2f, 1.0f), STR_C("Enter the origin of this scenery first")); else - ImGui::TextDisabled("Camera at X %.1f Y %.1f", config.north + Camera.Pos.z, config.east - Camera.Pos.x); + ImGui::TextDisabled(STR_C("Camera at X %.1f Y %.1f"), config.north + Camera.Pos.z, config.east - Camera.Pos.x); ImGui::Separator(); ImGui::SetNextItemWidth(160.0f); - changed |= ImGui::SliderInt("Distance (tiles)", &config.radius, 0, editor_orthophoto::max_radius); + changed |= ImGui::SliderInt(STR_C("Distance (tiles)"), &config.radius, 0, editor_orthophoto::max_radius); persist |= ImGui::IsItemDeactivatedAfterEdit(); ImGui::SameLine(); int const span = static_cast((2 * config.radius + 1) * editor_orthophoto::tile_size); @@ -1705,15 +1738,15 @@ void editor_mode::render_orthophoto_ui() ImGui::PopItemFlag(); }; - if (ImGui::Checkbox("Fit to terrain", &config.drape)) + if (ImGui::Checkbox(STR_C("Fit to terrain"), &config.drape)) changed = persist = true; if (ImGui::IsItemHovered()) - ImGui::SetTooltip("Lays the imagery onto the ground geometry (terrain shapes, terrain tile models, editor terrain).\n" - "Places without any ground use the height below."); + ImGui::SetTooltip(STR_C("Lays the imagery onto the ground geometry (terrain shapes, terrain tile models, editor terrain).\n" + "Places without any ground use the height below.")); if (config.drape) { ImGui::SameLine(); - if (ImGui::Button("Refit")) + if (ImGui::Button(STR_C("Refit"))) { // the ground was edited: what's kept of it has to go as well ground_tiles.clear(); @@ -1721,46 +1754,46 @@ void editor_mode::render_orthophoto_ui() m_orthophoto.refit(); } if (ImGui::IsItemHovered()) - ImGui::SetTooltip("Samples the ground again, after it was edited"); + ImGui::SetTooltip(STR_C("Samples the ground again, after it was edited")); } begin_disabled(!config.drape); ImGui::SetNextItemWidth(160.0f); - changed |= ImGui::DragFloat("Lift above ground (m)", &config.lift, 0.01f, 0.0f, 50.0f, "%.2f"); + changed |= ImGui::DragFloat(STR_C("Lift above ground (m)"), &config.lift, 0.01f, 0.0f, 50.0f, "%.2f"); persist |= ImGui::IsItemDeactivatedAfterEdit(); end_disabled(!config.drape); if (ImGui::IsItemHovered()) - ImGui::SetTooltip("Raises the fitted imagery above the ground. Keep it below the objects you want to see:\n" - "in the scene everything lower than this ends up under the imagery."); + ImGui::SetTooltip(STR_C("Raises the fitted imagery above the ground. Keep it below the objects you want to see:\n" + "in the scene everything lower than this ends up under the imagery.")); begin_disabled(config.drape); ImGui::SetNextItemWidth(160.0f); - changed |= ImGui::DragFloat("Height (m)", &config.height, 0.1f, -1000.0f, 3000.0f, "%.2f"); + changed |= ImGui::DragFloat(STR_C("Height (m)"), &config.height, 0.1f, -1000.0f, 3000.0f, "%.2f"); persist |= ImGui::IsItemDeactivatedAfterEdit(); end_disabled(config.drape); - if (ImGui::Checkbox("Covered by objects and terrain", &config.in_scene)) + if (ImGui::Checkbox(STR_C("Covered by objects and terrain"), &config.in_scene)) changed = persist = true; if (ImGui::IsItemHovered()) - ImGui::SetTooltip("Draws the imagery as part of the scene, so tracks, models and terrain in front of it hide it.\n" + ImGui::SetTooltip(STR_C("Draws the imagery as part of the scene, so tracks, models and terrain in front of it hide it.\n" "It is lit like the scene. Fully opaque, mouse placement lands on it as on any surface;\n" "translucent, it doesn't catch the mouse.\n" - "Not available with the Better Renderer, which doesn't pick up geometry added in the editor."); + "Not available with the Better Renderer, which doesn't pick up geometry added in the editor.")); ImGui::SetNextItemWidth(160.0f); - changed |= ImGui::SliderFloat("Opacity", &config.opacity, 0.0f, 1.0f, "%.2f"); + changed |= ImGui::SliderFloat(STR_C("Opacity"), &config.opacity, 0.0f, 1.0f, "%.2f"); persist |= ImGui::IsItemDeactivatedAfterEdit(); if (config.in_scene && ImGui::IsItemHovered()) - ImGui::SetTooltip("In the scene the opacity is part of the textures: the tiles are read again from the cache\n" - "shortly after the slider stops, which takes a moment."); + ImGui::SetTooltip(STR_C("In the scene the opacity is part of the textures: the tiles are read again from the cache\n" + "shortly after the slider stops, which takes a moment.")); // newest imagery, or the newest imagery taken up to the end of the selected year int const thisyear = static_cast(std::chrono::year_month_day{std::chrono::floor(std::chrono::system_clock::now())}.year()); - std::string const yearlabel = config.year ? std::to_string(config.year) : std::string("Newest"); + std::string const yearlabel = config.year ? std::to_string(config.year) : std::string(STR_C("Newest")); ImGui::SetNextItemWidth(160.0f); if (ImGui::BeginCombo("Photo year", yearlabel.c_str())) { - if (ImGui::Selectable("Newest", config.year == 0)) + if (ImGui::Selectable(STR_C("Newest"), config.year == 0)) { config.year = 0; changed = persist = true; @@ -1776,11 +1809,11 @@ void editor_mode::render_orthophoto_ui() ImGui::EndCombo(); } - if (ImGui::Checkbox("4K tiles where available", &config.hires)) + if (ImGui::Checkbox(STR_C("4K tiles where available"), &config.hires)) changed = persist = true; if (ImGui::IsItemHovered()) - ImGui::SetTooltip("4096 px tiles (~6 cm/px) from the high-resolution orthophoto, for the tiles around the camera.\n" - "Areas it doesn't cover use the standard imagery. Each 4K tile takes ~85 MB of video memory."); + ImGui::SetTooltip(STR_C("4096 px tiles (~6 cm/px) from the high-resolution orthophoto, for the tiles around the camera.\n" + "Areas it doesn't cover use the standard imagery. Each 4K tile takes ~85 MB of video memory.")); if (changed) m_orthophoto.settings(config); @@ -1789,17 +1822,17 @@ void editor_mode::render_orthophoto_ui() ImGui::Separator(); auto const stats = m_orthophoto.stats(); - ImGui::Text("Tiles: %d shown, %d loading, %d failed", stats.resident, stats.loading, stats.failed); + ImGui::Text(STR_C("Tiles: %d shown, %d loading, %d failed"), stats.resident, stats.loading, stats.failed); if (stats.failed > 0) { ImGui::SameLine(); - if (ImGui::Button("Retry")) + if (ImGui::Button(STR_C("Retry"))) m_orthophoto.retry_failed(); } if (!editor_orthophoto::can_download()) - ImGui::TextDisabled("This build has no HTTP client, only cached tiles are shown"); - ImGui::TextDisabled("Cache: %s", editor_orthophoto::cache_directory().c_str()); - ImGui::TextDisabled("Imagery: GUGiK, geoportal.gov.pl"); + ImGui::TextDisabled(STR_C("This build has no HTTP client, only cached tiles are shown")); + ImGui::TextDisabled(STR_C("Cache: %s"), editor_orthophoto::cache_directory().c_str()); + ImGui::TextDisabled(STR_C("Imagery: GUGiK, geoportal.gov.pl")); } void editor_mode::draw_orthophoto() @@ -2219,7 +2252,7 @@ bool editor_mode::save() if (scene::Layers.empty()) { // without the sources tracked during the load there's no telling where the changes belong - ui()->set_status("The scenery wasn't opened for editing. Start the simulator with: -edit ", true); + ui()->set_status(STR("The scenery wasn't opened for editing. Start the simulator with: -edit "), true); return false; } @@ -2241,8 +2274,28 @@ bool editor_mode::save() if (m_profile.changed) profile_store(); infra_store(); - auto const result = scene::Layers.save(rootstatements); - if (result.success && false == rootstatements.empty()) + if (false == m_saved_camera.has_value() || glm::distance(m_saved_camera->first, glm::dvec3{Camera.Pos}) > 0.5 || glm::distance(m_saved_camera->second, glm::vec3{Camera.Angle}) > 0.01f) + { + m_saved_camera = std::make_pair(glm::dvec3{Camera.Pos}, glm::vec3{Camera.Angle}); + scene::Layers.mark(scene::layer_handle{1}, "//$c", {format("%.3f %.3f %.3f %.5f %.5f", Camera.Pos.x, Camera.Pos.y, Camera.Pos.z, Camera.Angle.x, Camera.Angle.y)}); + } + auto const terrainadded{false == rootstatements.empty()}; + auto const controls{turntable_controls(rootstatements)}; + std::vector trailing; + starter_trainset(trailing); + auto const result = scene::Layers.save(rootstatements, trailing); + if (result.success && controls) + m_turntable_included = true; + if (result.success && trailing.size() == 3) + { + std::istringstream header{trailing.front()}; + std::string keyword, timetable, track; + double offset{0.0}; + header >> keyword >> timetable >> track >> offset; + if (auto *path{simulation::Paths.find(track)}; path != nullptr && simulation::Vehicles.find("wmb10-6457") == nullptr) + simulation::State.insert_trainset("wmb10-6457", path, offset, trailing[1] + "\n"); + } + if (result.success && terrainadded) { scene::Layers.terrain_directive(true); } @@ -2628,7 +2681,7 @@ void editor_mode::drop_model_instances() auto *selected = dynamic_cast(m_node); if (selected == nullptr || selected->Model() == nullptr) { - ui()->set_status("Select a model in the scene first", true); + ui()->set_status(STR("Select a model in the scene first"), true); return; } if (selected->radius() >= 50.0f) @@ -2773,6 +2826,11 @@ void editor_mode::render_new_scenery_popup() } bool editor_mode::restart_for_new_scenery() +{ + return restart_editor(std::string{}); +} + +bool editor_mode::restart_editor(std::string const &Scenery) { #ifdef _WIN32 _putenv("EU07_EDITOR_SELFTEST="); @@ -2780,6 +2838,8 @@ bool editor_mode::restart_for_new_scenery() if (GetModuleFileNameW(nullptr, path, MAX_PATH) == 0) return false; std::wstring command{L"\"" + std::wstring{path} + L"\" -edit"}; + if (false == Scenery.empty()) + command += L" \"" + std::filesystem::path(Scenery).wstring() + L"\""; STARTUPINFOW startup{}; startup.cb = sizeof(startup); PROCESS_INFORMATION process{}; @@ -2795,7 +2855,8 @@ bool editor_mode::restart_for_new_scenery() return false; path[size] = '\0'; char edit[]{"-edit"}; - char *arguments[]{path, edit, nullptr}; + std::string scenery{Scenery}; + char *arguments[]{path, edit, scenery.empty() ? nullptr : scenery.data(), nullptr}; posix_spawnattr_t attributes; posix_spawnattr_init(&attributes); posix_spawnattr_setflags(&attributes, POSIX_SPAWN_SETSID); @@ -2805,11 +2866,78 @@ bool editor_mode::restart_for_new_scenery() if (result != 0) return false; #endif - WriteLog("Editor: started again for a new scenery"); + WriteLog(Scenery.empty() ? std::string{"Editor: started again for a new scenery"} : "Editor: started again with scenery " + Scenery); Application.queue_quit(true); return true; } +void editor_mode::render_open_scenery_popup() +{ + auto const lower = [](std::string Text) { + std::transform(Text.begin(), Text.end(), Text.begin(), [](unsigned char const Character) { return static_cast(std::tolower(Character)); }); + return Text; + }; + if (m_openscenery_asked) + { + m_openscenery_asked = false; + m_openscenery_list.clear(); + m_openscenery_choice.clear(); + std::error_code error; + for (auto const &entry : std::filesystem::directory_iterator(Global.asCurrentSceneryPath, error)) + { + auto const name{entry.path().filename().string()}; + if (entry.is_regular_file(error) && name.size() > 4 && lower(name.substr(name.size() - 4)) == ".scn" && name.front() != '$') + m_openscenery_list.emplace_back(name); + } + std::sort(m_openscenery_list.begin(), m_openscenery_list.end(), [&](std::string const &A, std::string const &B) { return lower(A) < lower(B); }); + ImGui::OpenPopup(STR_C("Open scenery##restart")); + } + if (false == ImGui::BeginPopupModal(STR_C("Open scenery##restart"), nullptr, ImGuiWindowFlags_AlwaysAutoResize)) + return; + ImGui::TextUnformatted(STR_C("The editor starts again with the scenery chosen below.")); + ImGui::SetNextItemWidth(360.0f); + if (ImGui::IsWindowAppearing()) + ImGui::SetKeyboardFocusHere(); + ImGui::InputTextWithHint("##opensearch", STR_C("search"), m_openscenery_search, sizeof(m_openscenery_search)); + std::string const text{lower(m_openscenery_search)}; + ImGui::BeginChild("##openlist", ImVec2(360.0f, ImGui::GetTextLineHeightWithSpacing() * 14.0f), true); + for (auto const &name : m_openscenery_list) + { + if (false == text.empty() && lower(name).find(text) == std::string::npos) + continue; + if (ImGui::Selectable(name.c_str(), name == m_openscenery_choice, ImGuiSelectableFlags_AllowDoubleClick)) + { + m_openscenery_choice = name; + if (ImGui::IsMouseDoubleClicked(0) && false == restart_editor(name)) + ui()->set_status(STR_C("The editor couldn't be started again"), true); + } + } + ImGui::EndChild(); + auto const editsession{false == scene::Layers.empty()}; + if (false == m_history.empty()) + ImGui::TextColored(ImVec4(1.0f, 0.7f, 0.3f, 1.0f), "%s", STR_C("What isn't saved of this scenery is lost.")); + auto const chosen{false == m_openscenery_choice.empty()}; + if (chosen && editsession && ImGui::Button(STR_C("Save and open"))) + { + if (save() && false == restart_editor(m_openscenery_choice)) + ui()->set_status(STR_C("The editor couldn't be started again"), true); + ImGui::CloseCurrentPopup(); + } + if (chosen && editsession) + ImGui::SameLine(); + if (chosen && ImGui::Button(STR_C("Open"))) + { + if (false == restart_editor(m_openscenery_choice)) + ui()->set_status(STR_C("The editor couldn't be started again"), true); + ImGui::CloseCurrentPopup(); + } + if (chosen) + ImGui::SameLine(); + if (ImGui::Button(STR_C("Cancel"))) + ImGui::CloseCurrentPopup(); + ImGui::EndPopup(); +} + void editor_mode::render_orthophoto_window() { if (false == m_orthophoto_window) @@ -2822,14 +2950,14 @@ void editor_mode::render_orthophoto_window() void editor_mode::render_object_menu() { - if (ImGui::BeginMenu("Objects")) + if (ImGui::BeginMenu(STR_C("Objects"))) { auto const *selected = dynamic_cast(m_node); - if (ImGui::MenuItem("Put all instances of the selected model on the ground", nullptr, false, selected != nullptr && selected->Model() != nullptr)) + if (ImGui::MenuItem(STR_C("Put all instances of the selected model on the ground"), nullptr, false, selected != nullptr && selected->Model() != nullptr)) drop_model_instances(); if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled)) - ImGui::SetTooltip("%s", "Select a model in the scene. Every instance of the same model file is moved straight up or down\n" - "to the ground under it: terrain, large models and terrain made in the editor."); + ImGui::SetTooltip("%s", STR_C("Select a model in the scene. Every instance of the same model file is moved straight up or down\n" + "to the ground under it: terrain, large models and terrain made in the editor.")); ImGui::EndMenu(); } } @@ -2865,7 +2993,7 @@ void editor_mode::undo_last_area_fill() remove_from_hierarchy(model); simulation::State.delete_model(model); } - m_fill_status = "Removed " + std::to_string(created.size()) + " objects of the last fill"; + m_fill_status = format(STR_C("Removed %zu objects of the last fill"), created.size()); } void editor_mode::run_area_fill() @@ -2880,7 +3008,7 @@ void editor_mode::run_area_fill() if (m_fill_points.size() < 3) { - m_fill_status = "Outline needs at least 3 points"; + m_fill_status = STR("Outline needs at least 3 points"); return; } @@ -2894,7 +3022,7 @@ void editor_mode::run_area_fill() package.erase(std::remove_if(package.begin(), package.end(), [](std::string const &Template) { return Template.empty(); }), package.end()); if (package.empty()) { - m_fill_status = "Selected model package is empty"; + m_fill_status = STR("Selected model package is empty"); return; } @@ -2910,7 +3038,7 @@ void editor_mode::run_area_fill() auto const target = static_cast(std::min(std::round(area / 10000.0 * std::max(0.0f, m_fill_density)), max_objects)); if (target == 0) { - m_fill_status = "Density too low for this area, nothing to place"; + m_fill_status = STR("Density too low for this area, nothing to place"); return; } @@ -3015,7 +3143,7 @@ void editor_mode::run_area_fill() // a new fill replaces the "last fill" undo set; the previous objects stay in the scene m_fill_last = std::move(created); - m_fill_status = "Placed " + std::to_string(m_fill_last.size()) + " of " + std::to_string(target) + " objects"; + m_fill_status = format(STR_C("Placed %zu of %zu objects"), m_fill_last.size(), static_cast(target)); if (points.size() < target) m_fill_status += " (limited by min. spacing)"; if (unsupported > 0) @@ -3073,46 +3201,46 @@ void editor_mode::draw_area_fill_outline() const void editor_mode::render_area_fill() { - ImGui::TextDisabled("LMB: add outline point Backspace: remove last point"); + ImGui::TextDisabled(STR_C("LMB: add outline point Backspace: remove last point")); double const area = polygon_area_xz(m_fill_points); - ImGui::Text("Points: %zu Area: %.0f m2 (%.2f ha)", m_fill_points.size(), area, area / 10000.0); - if (ImGui::Button("Remove last point") && !m_fill_points.empty()) + ImGui::Text(STR_C("Points: %zu Area: %.0f m2 (%.2f ha)"), m_fill_points.size(), area, area / 10000.0); + if (ImGui::Button(STR_C("Remove last point")) && !m_fill_points.empty()) m_fill_points.pop_back(); ImGui::SameLine(); - if (ImGui::Button("Clear outline")) + if (ImGui::Button(STR_C("Clear outline"))) m_fill_points.clear(); ImGui::Separator(); // model package: a hand-assembled list, a user-defined set or a node bank group auto &bank = ui()->nodebank(); - bank.set_combo("Model set", m_fill_source, "Custom list"); + bank.set_combo(STR_C("Model set"), m_fill_source, STR_C("Custom list")); if (m_fill_source.kind == model_set_ref::source::manual) bank.manual_list("fillset", m_fill_custom, m_fill_custom_idx); else - ImGui::TextDisabled("%zu templates in set", bank.set_entries(m_fill_source).size()); + ImGui::TextDisabled(STR_C("%zu templates in set"), bank.set_entries(m_fill_source).size()); ImGui::Separator(); ImGui::SetNextItemWidth(120.0f); - ImGui::InputFloat("Density (objects/ha)", &m_fill_density, 10.0f, 100.0f, "%.1f"); + ImGui::InputFloat(STR_C("Density (objects/ha)"), &m_fill_density, 10.0f, 100.0f, "%.1f"); m_fill_density = std::max(0.0f, m_fill_density); ImGui::SetNextItemWidth(120.0f); - ImGui::InputFloat("Min. spacing (m)", &m_fill_min_spacing, 0.5f, 2.0f, "%.1f"); + ImGui::InputFloat(STR_C("Min. spacing (m)"), &m_fill_min_spacing, 0.5f, 2.0f, "%.1f"); m_fill_min_spacing = std::max(0.0f, m_fill_min_spacing); ImGui::SetNextItemWidth(200.0f); ImGui::DragFloatRange2("Scale", &m_fill_scale_min, &m_fill_scale_max, 0.01f, 0.1f, 5.0f, "min %.2f", "max %.2f"); - ImGui::Checkbox("Random rotation", &m_fill_random_rotation); + ImGui::Checkbox(STR_C("Random rotation"), &m_fill_random_rotation); if (!m_fill_random_rotation) ui()->render_rotation_controls(); - ImGui::Checkbox("Large models count as ground (terrain tiles)", &m_fill_models_as_ground); + ImGui::Checkbox(STR_C("Large models count as ground (terrain tiles)"), &m_fill_models_as_ground); - ImGui::Text("Estimated objects: %.0f", std::round(area / 10000.0 * m_fill_density)); + ImGui::Text(STR_C("Estimated objects: %.0f"), std::round(area / 10000.0 * m_fill_density)); - if (ImGui::Button("Fill area")) + if (ImGui::Button(STR_C("Fill area"))) run_area_fill(); ImGui::SameLine(); - std::string const undolabel = "Undo last fill (" + std::to_string(m_fill_last.size()) + ")"; + std::string const undolabel = format(STR_C("Undo last fill (%zu)"), m_fill_last.size()); if (ImGui::Button(undolabel.c_str()) && !m_fill_last.empty()) undo_last_area_fill(); @@ -3242,12 +3370,12 @@ void editor_mode::make_array() auto const step = glm::length(array_offset(*base)); if (step < array_tool::minimal_step) { - m_array.status = "The offsets come to nothing, the copies would sit in the model"; + m_array.status = STR("The offsets come to nothing, the copies would sit in the model"); return; } if (array_count(step) < 2) { - m_array.status = (m_array.settings.fit == 0 ? "An array of one is the model itself, nothing to make" : "The length takes no copy, nothing to make"); + m_array.status = (m_array.settings.fit == 0 ? STR("An array of one is the model itself, nothing to make") : STR("The length takes no copy, nothing to make")); return; } @@ -3316,11 +3444,11 @@ void editor_mode::shape_array() m_array.angles = base->Angles(); m_array.scale = base->Scale(); if (copies.size() < places.size()) - m_array.status = "Only " + std::to_string(copies.size()) + " of " + std::to_string(places.size()) + " copies could be made"; + m_array.status = format(STR_C("Only %zu of %zu copies could be made"), copies.size(), places.size()); else if (copies.empty()) - m_array.status = "No copies with these settings"; + m_array.status = STR("No copies with these settings"); else - m_array.status = "The model and " + std::to_string(copies.size()) + (copies.size() == 1 ? " copy" : " copies") + "; Ctrl+Z takes the array back"; + m_array.status = format(STR_C("The model and %zu copies; Ctrl+Z takes the array back"), copies.size()); } void editor_mode::update_array() @@ -3395,79 +3523,79 @@ void editor_mode::render_array() selected = nullptr; ImGui::PushID("array"); - ImGui::TextDisabled("Copies of the selected model, set out in a row"); - ImGui::RadioButton("Fixed count", &settings.fit, 0); + ImGui::TextDisabled(STR_C("Copies of the selected model, set out in a row")); + ImGui::RadioButton(STR_C("Fixed count"), &settings.fit, 0); ImGui::SameLine(); - ImGui::RadioButton("Fit length", &settings.fit, 1); + ImGui::RadioButton(STR_C("Fit length"), &settings.fit, 1); ImGui::SetNextItemWidth(120.0f); if (settings.fit == 0) { - ImGui::InputInt("Count", &settings.count); + ImGui::InputInt(STR_C("Count"), &settings.count); settings.count = std::clamp(settings.count, 1, array_tool::limit); if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", "Number of the models in the array, the selected one included"); + ImGui::SetTooltip("%s", STR_C("Number of the models in the array, the selected one included")); } else { - ImGui::InputFloat("Length (m)", &settings.length, 1.0f, 10.0f, "%.2f"); + ImGui::InputFloat(STR_C("Length (m)"), &settings.length, 1.0f, 10.0f, "%.2f"); settings.length = std::max(0.0f, settings.length); if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", "As many copies are made as fit in this length, measured along the row"); + ImGui::SetTooltip("%s", STR_C("As many copies are made as fit in this length, measured along the row")); } - ImGui::Checkbox("Relative offset", &settings.relative); + ImGui::Checkbox(STR_C("Relative offset"), &settings.relative); if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", "Distance between the copies as a part of the size of the model, along its axes: x, y (up), z.\n" - "1 along an axis puts the copies end to end"); + ImGui::SetTooltip("%s", STR_C("Distance between the copies as a part of the size of the model, along its axes: x, y (up), z.\n" + "1 along an axis puts the copies end to end")); if (settings.relative) { ImGui::SetNextItemWidth(200.0f); - ImGui::DragFloat3("x size", &settings.relative_offset.x, 0.01f, 0.0f, 0.0f, "%.3f"); + ImGui::DragFloat3(STR_C("x size"), &settings.relative_offset.x, 0.01f, 0.0f, 0.0f, "%.3f"); } - ImGui::Checkbox("Constant offset", &settings.constant); + ImGui::Checkbox(STR_C("Constant offset"), &settings.constant); if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", "Distance between the copies in metres, along the axes of the model: x, y (up), z.\n" - "With both offsets on the copies are set apart by their sum"); + ImGui::SetTooltip("%s", STR_C("Distance between the copies in metres, along the axes of the model: x, y (up), z.\n" + "With both offsets on the copies are set apart by their sum")); if (settings.constant) { ImGui::SetNextItemWidth(200.0f); ImGui::DragFloat3("m", &settings.constant_offset.x, 0.05f, 0.0f, 0.0f, "%.3f"); } ImGui::SetNextItemWidth(120.0f); - ImGui::DragFloat("Turn per copy (deg)", &settings.turn, 0.1f, -180.0f, 180.0f, "%.2f"); + ImGui::DragFloat(STR_C("Turn per copy (deg)"), &settings.turn, 0.1f, -180.0f, 180.0f, "%.2f"); if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", "Each copy is turned by this much around the vertical axis against the one before it,\n" - "and the row bends with them into an arc"); - ImGui::Checkbox("Follow the ground", &settings.ground); + ImGui::SetTooltip("%s", STR_C("Each copy is turned by this much around the vertical axis against the one before it,\n" + "and the row bends with them into an arc")); + ImGui::Checkbox(STR_C("Follow the ground"), &settings.ground); if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", "The copies are put as high over the ground as the model is, instead of level with it.\n" - "Not for the models large enough to count as ground themselves"); + ImGui::SetTooltip("%s", STR_C("The copies are put as high over the ground as the model is, instead of level with it.\n" + "Not for the models large enough to count as ground themselves")); if (selected != nullptr) { auto const size = array_size(*selected) * selected->Scale(); auto const step = glm::length(array_offset(*selected)); - ImGui::TextDisabled("Model %.2f x %.2f x %.2f m, %d in the array, %.2f m apart", size.x, size.y, size.z, array_count(step), step); + ImGui::TextDisabled(STR_C("Model %.2f x %.2f x %.2f m, %d in the array, %.2f m apart"), size.x, size.y, size.z, array_count(step), step); } if (array_live()) { // NOTE: kept away from the place of the other button, a click too many on which would make the array twice - ImGui::TextDisabled("The array follows the settings"); + ImGui::TextDisabled(STR_C("The array follows the settings")); ImGui::SameLine(); - if (ImGui::Button("Done")) + if (ImGui::Button(STR_C("Done"))) m_array.base = nullptr; if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", "The copies stay the way they are. Selecting or changing anything else does the same"); + ImGui::SetTooltip("%s", STR_C("The copies stay the way they are. Selecting or changing anything else does the same")); } else if (selected != nullptr) { - if (ImGui::Button("Make array")) + if (ImGui::Button(STR_C("Make array"))) make_array(); } else { - ImGui::TextDisabled("Select a model to make an array of"); + ImGui::TextDisabled(STR_C("Select a model to make an array of")); } if (false == m_array.status.empty()) ImGui::TextUnformatted(m_array.status.c_str()); @@ -3482,32 +3610,32 @@ void editor_mode::render_gizmo_options() { ImGui::SameLine(); ImGui::SetNextItemWidth(120.0f); - ImGui::SliderFloat("Extent (m), wheel", &Global.EditorOrthoExtent, 5.0f, 5000.0f, "%.0f", 3.0f); + ImGui::SliderFloat(STR_C("Extent (m), wheel"), &Global.EditorOrthoExtent, 5.0f, 5000.0f, "%.0f", 3.0f); } - ImGui::Checkbox("Enabled", &m_gizmo_enabled); + ImGui::Checkbox(STR_C("Enabled"), &m_gizmo_enabled); if (!m_gizmo_enabled) return; if (m_terrain_sculpt || m_chunk_edit) { - ImGui::TextDisabled("Suspended while editing terrain"); + ImGui::TextDisabled(STR_C("Suspended while editing terrain")); return; } // lets the user pick the transform mode without keyboard shortcuts int op = static_cast(m_gizmo_op); - ImGui::RadioButton("Translate (Q)", &op, static_cast(gizmo_operation::translate)); + ImGui::RadioButton(STR_C("Translate (Q)"), &op, static_cast(gizmo_operation::translate)); ImGui::SameLine(); - ImGui::RadioButton("Rotate (W)", &op, static_cast(gizmo_operation::rotate)); + ImGui::RadioButton(STR_C("Rotate (W)"), &op, static_cast(gizmo_operation::rotate)); ImGui::SameLine(); - ImGui::RadioButton("Scale (E)", &op, static_cast(gizmo_operation::scale)); + ImGui::RadioButton(STR_C("Scale (E)"), &op, static_cast(gizmo_operation::scale)); m_gizmo_op = static_cast(op); if (m_gizmo_op != gizmo_operation::scale) // ImGuizmo always scales in local space - ImGui::Checkbox("Local space (R)", &m_gizmo_local); + ImGui::Checkbox(STR_C("Local space (R)"), &m_gizmo_local); if (m_gizmo_op == gizmo_operation::translate) { ImGui::SetNextItemWidth(120.0f); - ImGui::InputFloat("Snap (hold Ctrl)", &m_gizmo_snap); + ImGui::InputFloat(STR_C("Snap (hold Ctrl)"), &m_gizmo_snap); if (m_gizmo_snap < 0.0f) m_gizmo_snap = 0.0f; } @@ -3516,11 +3644,11 @@ void editor_mode::render_gizmo_options() auto const located = editor_includes::parameter_with_role(m_include.info, "pos.x") != 0 || editor_includes::parameter_with_role(m_include.info, "pos.y") != 0 || editor_includes::parameter_with_role(m_include.info, "pos.z") != 0; ImGui::TextDisabled("%s", false == located ? "Include selected, no position parameters described" : - false == m_include.placement ? "Include selected, no gizmo under rotate or scale" : - "Include selected, axes as its template allows"); + false == m_include.placement ? STR_C("Include selected, no gizmo under rotate or scale") : + STR_C("Include selected, axes as its template allows")); } else if (!m_node) - ImGui::TextDisabled("No node selected"); + ImGui::TextDisabled(STR_C("No node selected")); } void editor_mode::render_gizmo() @@ -3874,6 +4002,48 @@ void editor_mode::enter() } } + if (Global.editor_session && false == m_opened_at_track) + { + m_opened_at_track = true; + auto const saved{scene::Layers.empty() ? std::vector{} : scene::Layers.marked(scene::layer_handle{1}, "//$c")}; + if (false == saved.empty()) + { + std::istringstream values(saved.front()); + glm::dvec3 position{0.0}; + glm::vec3 angle{0.0f}; + if (values >> position.x >> position.y >> position.z >> angle.x >> angle.y) + { + Camera.Pos = position; + Camera.Angle = angle; + Camera.m_owner = nullptr; + FreeFlyModeFlag = true; + Global.pCamera = Camera; + m_saved_camera = {position, angle}; + WriteLog("Editor: camera where it was at the last save"); + } + } + for (auto *track : simulation::Paths.sequence()) + { + if (m_saved_camera.has_value() || track == nullptr || track->m_editorremoved || track->m_paths.empty()) + continue; + auto const &path{track->m_paths.front()}; + auto const start{path.points[segment_data::point::start]}; + auto const end{path.points[segment_data::point::end]}; + auto const centre{0.5 * (start + end)}; + glm::dvec3 along{end.x - start.x, 0.0, end.z - start.z}; + along = glm::length(along) > 1e-6 ? glm::normalize(along) : glm::dvec3{0.0, 0.0, 1.0}; + glm::dvec3 const side{-along.z, 0.0, along.x}; + Camera.Pos = centre - along * 30.0 + side * 15.0 + glm::dvec3{0.0, 20.0, 0.0}; + auto const look{glm::normalize(centre - Camera.Pos)}; + Camera.Angle = glm::vec3(static_cast(std::asin(std::clamp(look.y, -1.0, 1.0))), static_cast(std::atan2(-look.x, -look.z)), 0.0f); + Camera.m_owner = nullptr; + FreeFlyModeFlag = true; + Global.pCamera = Camera; + WriteLog("Editor: camera at the first track, " + track->name()); + break; + } + } + Global.ControlPicking = true; EditorModeFlag = true; @@ -3930,6 +4100,17 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in #endif bool anyModifier = Mods & (GLFW_MOD_SHIFT | GLFW_MOD_CONTROL | GLFW_MOD_ALT); + if (Action == GLFW_RELEASE && Key >= 0 && Key <= GLFW_KEY_LAST) + { + input::keys[Key] = GLFW_RELEASE; + if (Key == GLFW_KEY_LEFT_SHIFT || Key == GLFW_KEY_RIGHT_SHIFT) + input::key_shift = false; + if (Key == GLFW_KEY_LEFT_CONTROL || Key == GLFW_KEY_RIGHT_CONTROL) + input::key_ctrl = false; + if (Key == GLFW_KEY_LEFT_ALT || Key == GLFW_KEY_RIGHT_ALT) + input::key_alt = false; + } + // first give UI a chance to handle the key if (!anyModifier && m_userinterface->on_key(Key, Action)) return; @@ -3953,6 +4134,7 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in case GLFW_KEY_W: m_gizmo_op = gizmo_operation::rotate; break; case GLFW_KEY_E: m_gizmo_op = gizmo_operation::scale; break; case GLFW_KEY_R: m_gizmo_local = !m_gizmo_local; break; + case GLFW_KEY_B: handled = ui()->mode() != nodebank_panel::TRACK && bend_shortcut(); break; default: handled = false; break; } if (handled) @@ -4202,6 +4384,20 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const return; } + if (Button == GLFW_MOUSE_BUTTON_LEFT && is_press(Action) && false == m_bend.picking && ui()->mode() != nodebank_panel::TRACK && (bend_drag_start(Mods) || bend_click())) + { + m_input.mouse.button(Button, Action); + return; + } + + if (m_bend.picking && Button == GLFW_MOUSE_BUTTON_LEFT && ui()->mode() != nodebank_panel::TRACK) + { + if (is_press(Action)) + bend_pick(Global.pCamera.Pos + GfxRenderer->Mouse_Position()); + m_input.mouse.button(Button, Action); + return; + } + if (Button == GLFW_MOUSE_BUTTON_LEFT) { @@ -4362,9 +4558,9 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const void editor_mode::render_change_history(){ - ImGui::Begin("Editor History", &m_change_history, ImGuiWindowFlags_AlwaysAutoResize); + ImGui::Begin(STR_C("Editor History"), &m_change_history, ImGuiWindowFlags_AlwaysAutoResize); int maxsize = m_max_history_size; - if (ImGui::InputInt("Max history size", &maxsize)) + if (ImGui::InputInt(STR_C("Max history size"), &maxsize)) { m_max_history_size = std::max(0, maxsize); if ((int)m_history.size() > m_max_history_size && m_max_history_size >= 0) @@ -4379,14 +4575,14 @@ void editor_mode::render_change_history(){ } float dist = kMaxPlacementDistance; - if (ImGui::InputFloat("Max placement distance", &dist)) + if (ImGui::InputFloat(STR_C("Max placement distance"), &dist)) { kMaxPlacementDistance = std::max(0.0f, dist); } ImGui::Separator(); - ImGui::Text("History (newest at end): %zu entries", m_history.size()); + ImGui::Text(STR_C("History (newest at end): %zu entries"), m_history.size()); ImGui::BeginChild("history_list", ImVec2(400, 200), true); for (int i = 0; i < (int)m_history.size(); ++i) { @@ -4410,7 +4606,7 @@ void editor_mode::render_change_history(){ ImGui::EndChild(); ImGui::Separator(); - if (ImGui::Button("Clear History")) + if (ImGui::Button(STR_C("Clear History"))) { m_history.clear(); g_redo.clear(); @@ -4419,7 +4615,7 @@ void editor_mode::render_change_history(){ ImGui::SameLine(); ImGui::SameLine(); - if (ImGui::Button("Undo Selected")) + if (ImGui::Button(STR_C("Undo Selected"))) { if (m_selected_history_idx >= 0 && m_selected_history_idx < (int)m_history.size()) { @@ -4467,3 +4663,34 @@ void editor_mode::set_focus_active(bool isActive) { m_focus_active = isActive; } + +void editor_mode::starter_trainset(std::vector &Trailing) +{ + static std::regex const trainset{R"((^|\n)[ \t]*trainset[ \t])", std::regex::icase}; + for (std::size_t handle = 1; handle <= scene::Layers.size(); ++handle) + { + auto const &layer{scene::Layers.layer(static_cast(handle))}; + if (layer.created) + continue; + std::ifstream input{Global.asCurrentSceneryPath + layer.name, std::ios_base::binary}; + std::string const content{std::istreambuf_iterator(input), std::istreambuf_iterator()}; + if (std::regex_search(content, trainset)) + return; + } + std::error_code error; + if (false == std::filesystem::exists("dynamic/pkp/wmb10_v1/wmb10.mmd", error)) + return; + for (auto const *track : simulation::Paths.sequence()) + { + if (track == nullptr || track->m_editorremoved || track->eType != tt_Normal || (track->iCategoryFlag & 1) == 0 || track->name().empty() || track->m_paths.empty()) + continue; + auto const length{geometry::bezier{track->m_paths.front()}.plan_length()}; + if (length < 15.0) + continue; + Trailing.push_back("trainset none " + track->name() + " " + to_string(std::min(length, 0.5 * length + 5.0), 2) + " 0"); + Trailing.push_back("node -1 0 wmb10-6457 dynamic pkp/wmb10_v1 wmb10-6457 wmb10 0 headdriver 0 0 enddynamic"); + Trailing.push_back("endtrainset"); + WriteLog("Editor: the scenery has no trainset, a WMB10 is put on " + track->name() + " to drive"); + return; + } +} diff --git a/application/editormode.h b/application/editormode.h index 47f3a28f3..ee0fade62 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -32,6 +32,7 @@ http://mozilla.org/MPL/2.0/. #include #include #include +#include #include #include @@ -127,7 +128,7 @@ class editor_mode : public application_mode, private editor_track::observer struct stored_profile; struct EditorSnapshot { - enum class Action { Move, Rotate, Scale, Add, Delete, TrackEdit, Other, RoadEdit, Array }; + enum class Action { Move, Rotate, Scale, Add, Delete, TrackEdit, Other, RoadEdit, Array, Bend }; // copy of a model an array made struct array_copy { @@ -313,6 +314,17 @@ class editor_mode : public application_mode, private editor_track::observer bool m_newscenery_asked{false}; void render_new_scenery_popup(); bool restart_for_new_scenery(); + bool restart_editor(std::string const &Scenery); + bool m_openscenery_asked{false}; + bool m_opened_at_track{false}; + bool m_turntable_included{false}; + bool turntable_controls(std::vector &Rootstatements); + void starter_trainset(std::vector &Trailing); + std::optional> m_saved_camera; + char m_openscenery_search[64]{}; + std::vector m_openscenery_list; + std::string m_openscenery_choice; + void render_open_scenery_popup(); bool m_orthophoto_window{false}; // origin of the scenery in PUWG 1992 the scenery file gives in its //$g line, if it does bool m_georeference_read{false}; @@ -702,6 +714,7 @@ class editor_mode : public application_mode, private editor_track::observer void scan_turntables(); std::string turntable_name_for_new() const; bool turntable_read(TTrack *Table); + std::vector turntable_includes(TTrack const &Table); glm::dvec3 turntable_centre() const; std::vector turntable_lines() const; double turntable_snap(double const Heading) const; @@ -756,6 +769,7 @@ class editor_mode : public application_mode, private editor_track::observer void lay_enter(); bool lay_heading(glm::dvec2 &Heading) const; std::vector lay_pieces(std::vector const &Points, editor_track::snap_target const &End, double &Length, std::string &Error) const; + alignment::result lay_shape(std::vector const &Points, glm::dvec2 const &Startdirection, glm::dvec2 const &Enddirection, alignment::design &Design) const; void render_switch_ui(); bool start_switch_placement(); void finish_switch_placement(); @@ -1192,7 +1206,7 @@ class editor_mode : public application_mode, private editor_track::observer std::vector parameter_labels; std::vector parameter_placement; // filled in with zeros: the template is placed in its own space std::vector> parameter_choices; // variants of the textures a parameter is a part of the name of - int length_mode{0}; // 0: one copy as long as the original, 1: the length given, 2: the whole stretch of the line + int length_mode{2}; // 0: one copy as long as the original, 1: the length given, 2: the whole stretch of the line double length{200.0}; sweep_node::state settings; int axis{0}; // 0: the longer one of the model, 1: z, 2: x @@ -1255,6 +1269,65 @@ class editor_mode : public application_mode, private editor_track::observer void sweeps_committed(std::vector const &Tracks); void sweeps_split(TTrack &Original, TTrack &Created); + struct bend_source + { + TAnimModel *model{nullptr}; + scene::instance_handle instance{0}; + std::string file; + std::string skin{"none"}; + std::vector parameters; + glm::dmat4 transform{1.0}; + glm::dvec3 scale{1.0}; + scene::layer_handle layer{null_handle}; + }; + struct bend_tool + { + int axis{0}; + bool turned{false}; + int along_anchor{1}; + int side_anchor{0}; + int height_anchor{0}; + glm::dvec3 point{0.0}; + bool picking{false}; + void const *tracks_for{nullptr}; + glm::dvec3 tracks_at{0.0}; + std::vector> tracks; + int track{0}; + sweep_node *edited{nullptr}; + std::string signature; + bool marker_valid{false}; + glm::dvec3 marker{0.0}; + std::string status; + int dragging{0}; + sweep_node::state drag_state; + glm::dvec3 drag_anchor{0.0}; + double drag_station{0.0}; + std::string drag_label; + sweep_node *hover{nullptr}; + bool over_marker{false}; + std::string label; + std::string details; + }; + bend_tool m_bend; + bool bend_drag_start(int const Mods); + void bend_drag_update(); + sweep_node *sweep_under(glm::dvec3 const &Point) const; + bool bend_click(); + bool bend_shortcut(); + bool bend_source_of_selection(bend_source &Source) const; + void bend_find_tracks(glm::dvec3 const &Point, void const *Key); + bool bend_definition(bend_source const &Source, TTrack &Track, sweep_node::state &State, std::vector &Tracks); + void bend_selection(); + void bend_edit(sweep_node::state const &State); + void bend_reanchor(sweep_node::state &State, int const Side, int const Height, glm::dvec3 const &Point) const; + double bend_fixed(sweep_node const &Sweep, glm::dvec3 const &Point) const; + void bend_stretch(sweep_node const &Sweep, double const Fixed, double const Length, glm::dvec3 const &Point, sweep_node::state &State) const; + void bend_pick(glm::dvec3 const &Point); + glm::dvec3 bend_marker(sweep_node const &Sweep) const; + void restore_bend(EditorSnapshot &Snapshot, bool const Undo); + void render_bend(); + void draw_bend_overlay() const; + // script of editor actions given in the EU07_EDITOR_SELFTEST file, run a step at a time, for testing without a person struct selftest { diff --git a/application/editormodegauge.cpp b/application/editormodegauge.cpp index 16cc864bb..da941b4ce 100644 --- a/application/editormodegauge.cpp +++ b/application/editormodegauge.cpp @@ -19,6 +19,7 @@ http://mozilla.org/MPL/2.0/. #include "rendering/renderer.h" #include "simulation/simulation.h" #include "utilities/Logs.h" +#include "world/Sweep.h" #include "world/Track.h" #include "imgui/imgui.h" #include "utilities/translation.h" @@ -324,6 +325,33 @@ template void visit_triangles(TSubModel *Submodel, glm::dmat4 } } +// the triangle enters the gauge when any point of a grid spread over it does; the deepest such point goes to the hit +void scan_triangle(corridor const &Space, glm::dvec3 const &A, glm::dvec3 const &B, glm::dvec3 const &C, editor_mode::gauge_hit &Hit) +{ + auto const middle{(A + B + C) / 3.0}; + if (false == Space.close(middle, std::max({glm::distance(middle, A), glm::distance(middle, B), glm::distance(middle, C)}))) + return; + auto const edge{std::max({glm::distance(A, B), glm::distance(B, C), glm::distance(C, A)})}; + auto const steps{std::clamp(static_cast(std::ceil(edge / 0.5)), 1, 24)}; + for (int u = 0; u <= steps; ++u) + for (int v = 0; u + v <= steps; ++v) + { + auto const point{A + (B - A) * (static_cast(u) / steps) + (C - A) * (static_cast(v) / steps)}; + auto const found{Space.intrusion(point)}; + if (found.depth <= 0.0) + continue; + if (found.depth > Hit.depth) + { + Hit.depth = found.depth; + Hit.point = point; + Hit.track = found.span->track; + Hit.path = found.span->path; + Hit.direction = found.direction; + } + return; + } +} + // the deepest place of the model in the gauge, added to the hits when it enters it void scan_model(corridor const &Space, TAnimModel &Instance, std::vector &Hits) { @@ -332,31 +360,23 @@ void scan_model(corridor const &Space, TAnimModel &Instance, std::vectorGetSMRoot(), placement(Instance), [&](glm::dvec3 const &A, glm::dvec3 const &B, glm::dvec3 const &C) { - auto const middle{(A + B + C) / 3.0}; - if (false == Space.close(middle, std::max({glm::distance(middle, A), glm::distance(middle, B), glm::distance(middle, C)}))) - return; - auto const edge{std::max({glm::distance(A, B), glm::distance(B, C), glm::distance(C, A)})}; - auto const steps{std::clamp(static_cast(std::ceil(edge / 0.5)), 1, 24)}; - for (int u = 0; u <= steps; ++u) - for (int v = 0; u + v <= steps; ++v) - { - auto const point{A + (B - A) * (static_cast(u) / steps) + (C - A) * (static_cast(v) / steps)}; - auto const found{Space.intrusion(point)}; - if (found.depth <= 0.0) - continue; - if (found.depth > hit.depth) - { - hit.depth = found.depth; - hit.point = point; - hit.track = found.span->track; - hit.path = found.span->path; - hit.direction = found.direction; - } - return; - } - }); + visit_triangles(Instance.Model()->GetSMRoot(), placement(Instance), [&](glm::dvec3 const &A, glm::dvec3 const &B, glm::dvec3 const &C) { scan_triangle(Space, A, B, C, hit); }); + if (hit.depth > 0.0) + Hits.push_back(std::move(hit)); +} + +// the same for the copies of a model laid along a curve +void scan_sweep(corridor const &Space, sweep_node &Sweep, std::vector &Hits) +{ + if (Sweep.m_editorremoved || false == Space.nearby(Sweep.location(), Sweep.radius())) + return; + editor_mode::gauge_hit hit{Sweep.name(), Sweep.location()}; + for (auto const &shape : Sweep.create_shapes()) + { + auto const &vertices{shape.data().vertices}; + for (std::size_t i = 0; i + 2 < vertices.size(); i += 3) + scan_triangle(Space, vertices[i].position, vertices[i + 1].position, vertices[i + 2].position, hit); + } if (hit.depth > 0.0) Hits.push_back(std::move(hit)); } @@ -372,6 +392,9 @@ void scan_models(corridor const &Space, std::vector &Hit for (auto *instance : simulation::Instances.sequence()) if (instance != nullptr) scan_model(Space, *instance, Hits); + for (auto *sweep : simulation::Sweeps.sequence()) + if (sweep != nullptr) + scan_sweep(Space, *sweep, Hits); sort_hits(Hits); } @@ -579,14 +602,22 @@ void editor_mode::step_gauge_map() { auto &scan{*m_gauge.scan}; auto const &instances{simulation::Instances.sequence()}; + auto const &sweeps{simulation::Sweeps.sequence()}; + auto const total{instances.size() + sweeps.size()}; auto const until{std::chrono::steady_clock::now() + gauge_slice}; - while (scan.next < instances.size() && std::chrono::steady_clock::now() < until) + while (scan.next < total && std::chrono::steady_clock::now() < until) { - if (auto *instance{instances[scan.next++]}) - scan_model(*scan.space, *instance, m_gauge.map.hits); + auto const next{scan.next++}; + if (next < instances.size()) + { + if (auto *instance{instances[next]}) + scan_model(*scan.space, *instance, m_gauge.map.hits); + } + else if (auto *sweep{sweeps[next - instances.size()]}) + scan_sweep(*scan.space, *sweep, m_gauge.map.hits); } - scan.progress = instances.empty() ? 1.f : static_cast(scan.next) / instances.size(); - if (scan.next >= instances.size()) + scan.progress = total == 0 ? 1.f : static_cast(scan.next) / total; + if (scan.next >= total) finish_gauge_map(); } diff --git a/application/editormodeselftest.cpp b/application/editormodeselftest.cpp index 8142eef94..ca07b7184 100644 --- a/application/editormodeselftest.cpp +++ b/application/editormodeselftest.cpp @@ -14,12 +14,24 @@ http://mozilla.org/MPL/2.0/. #include "application/editorprojection.h" #include "simulation/simulation.h" +#include "scene/scenelayers.h" #include "utilities/Globals.h" #include "utilities/Logs.h" #include "world/Track.h" +#include "world/MemCell.h" +#include "world/Event.h" #include "vehicle/DynObj.h" +#include "model/AnimModel.h" +#include "model/Model3d.h" +#include "rendering/renderer.h" +#include "world/Sweep.h" +#include "input/keyboardinput.h" +#include +#include +#include #include "editor/editorFormat.hpp" +#include #include #include #include @@ -32,6 +44,23 @@ http://mozilla.org/MPL/2.0/. // sweep =... model, params (separated by commas), lateral, height, side (origin, near, far, // centre), top (origin, bottom, top, edge), mode (bend, repeat), step, // length (original, all, or metres), from, to, widen (0, 1), face (0, 1), tilt (0, 1) +// selectmodel the model instance nearest the point +// bend =... the selected model bent along a track: track (index on the list), axis (auto, z, x), +// turned (0, 1), along (start, origin, middle, end, point), side (origin, near, far, +// middle, point), height (origin, bottom, top, edge, point), point=,,, +// pick=,, (a point of the scene picked as the reference point), go (0, 1) +// selectinclude the include placed nearest the point +// bendset =... the bent model being edited: length, lateral, height, along, side, height +// bendprobe logs the bent model being edited +// undo, redo +// key [ctrl] a key or right button event, as the window gives it +// lineside the tab of the objects along the track in the track window +// event queues the event +// memcell logs the memory cell +// bendpanel unfolds the bend section of the toolset +// openscenerypopup the window of File / Open scenery, its list searched for zz_ +// openscenery the editor starts again with the scenery +// checkspans logs whether the text the scenery files hold at each node's place starts and ends it // spread logs the paths the spread from the track takes // newscenery the editor starts again with the wizard of a new scenery // vehicles logs each vehicle: its head, facing, and what its couplers hold @@ -123,6 +152,7 @@ void editor_mode::selftest_step() settings.bend = get("mode", "bend") != "repeat"; settings.step = std::stod(get("step", "0")); settings.widen = get("widen", "0") == "1"; + settings.platform = get("platform", "0") == "1"; settings.face = get("face", "1") == "1"; settings.tilt = get("tilt", "0") == "1"; settings.from = std::stod(get("from", "0")); @@ -135,6 +165,10 @@ void editor_mode::selftest_step() tool.open = true; sweep_curve(); sweep_measure(); + if (values.count("widen")) + settings.widen = get("widen", "0") == "1"; + if (values.count("platform")) + settings.platform = get("platform", "0") == "1"; if (get("create", "1") == "1") { sweep_create(); @@ -202,6 +236,37 @@ void editor_mode::selftest_step() at.widening[definition.lateral >= 0.0 ? 1 : 0], std::max(0.0, at.cant[definition.lateral >= 0.0 ? 1 : 0]))); } } + else if (command == "profile") + { + std::string name; + double station{0.0}; + words >> name >> station; + auto *sweep{simulation::Sweeps.find(name)}; + if (sweep == nullptr) + { + WriteLog("SELFTEST profile: no such sweep"); + continue; + } + auto const &definition{sweep->definition()}; + std::map> columns; + for (auto const &shape : sweep->create_shapes()) + for (auto const &vertex : shape.data().vertices) + { + double lateral; + auto const at{sweep->project(vertex.position, lateral)}; + if (std::abs(at - station) > 1.0) + continue; + auto const axis{sweep->frame_at(at)}; + auto const height{vertex.position.y - axis.position.y - 0.18 - sweep_node::rail_head(axis.roll, definition.lateral)}; + auto &column{columns.try_emplace(static_cast(std::floor(lateral / 0.1)), std::numeric_limits::max(), -std::numeric_limits::max()).first->second}; + column.first = std::min(column.first, height); + column.second = std::max(column.second, height); + } + std::string text; + for (auto const &[index, column] : columns) + text += format(" [%.1f %.2f..%.2f]", index * 0.1, column.first, column.second); + WriteLog(format("SELFTEST profile %s at %.0f m:", name.c_str(), station) + text); + } else if (command == "fouling") { std::map values; @@ -309,6 +374,46 @@ void editor_mode::selftest_step() if (false == m_sweep.outline.empty()) WriteLog(format("SELFTEST curve outline %zu points, %.1f %.1f -> %.1f %.1f, %.1f m", m_sweep.outline.size(), m_sweep.outline.front().x, m_sweep.outline.front().z, m_sweep.outline.back().x, m_sweep.outline.back().z, m_sweep.curve_length)); } + else if (command == "lay") + { + std::string name, side; + words >> name >> side; + auto *track{simulation::Paths.find(name)}; + if (track == nullptr || track->m_paths.empty()) + { + WriteLog("SELFTEST lay: no track " + name); + return; + } + auto const &path{track->m_paths.front()}; + auto const atend{side == "end"}; + editor_track::snap_target start; + start.track = track; + start.point = {0, atend ? editor_track::point_kind::end : editor_track::point_kind::start}; + start.position = path.points[atend ? segment_data::point::end : segment_data::point::start]; + auto const &control{path.points[atend ? segment_data::point::control2 : segment_data::point::control1]}; + start.direction = glm::normalize(control != glm::dvec3{} ? control : path.points[atend ? segment_data::point::start : segment_data::point::end] - start.position); + m_lay.points = {start.position}; + m_lay.start = start; + for (glm::dvec3 point{0.0, start.position.y, 0.0}; words >> point.x >> point.z;) + m_lay.points.push_back(point); + lay_finish({}); + WriteLog("SELFTEST lay: " + m_lay.status); + } + else if (command == "analyse") + { + std::string name; + words >> name; + editor_track::curve curve; + if (auto *track{simulation::Paths.find(name)}; track != nullptr && editor_track::find_curve(*track, m_straights.tolerance, m_route.design.norms.gauge, curve)) + { + std::string arcs; + for (auto const &arc : curve.arcs) + arcs += format(" R%.0f/%.1fdeg/after %.1fm", arc.radius, glm::degrees(arc.turn), arc.transition); + WriteLog(format("SELFTEST analyse %s: R %.0f, compound %d, in %.1f m, out %.1f m, turn %.1f deg,", name.c_str(), curve.radius, curve.compound ? 1 : 0, curve.transition_in, curve.transition_out, glm::degrees(curve.turn)) + arcs); + } + else + WriteLog("SELFTEST analyse " + name + ": no curve"); + } else if (command == "projtest") { screen_projection const projection; @@ -362,6 +467,330 @@ void editor_mode::selftest_step() { save(); } + else if (command == "turntable") + { + glm::dvec3 centre{0.0}; + double yaw{0.0}; + words >> centre.x >> centre.y >> centre.z >> yaw; + turntable_place(centre, yaw); + for (double angle; words >> angle;) + { + m_turntable.heading = m_turntable.table_yaw + angle; + m_turntable.exit_length = 10.0; + track_intent intent; + intent.what = track_intent::kind::turntable_exit; + turntable_press(intent); + } + WriteLog("SELFTEST turntable: " + (m_turntable.error.empty() ? m_turntable.status : m_turntable.error)); + } + else if (command == "selectmodel") + { + glm::dvec3 point{0.0}; + words >> point.x >> point.z; + TAnimModel *nearest{nullptr}; + auto best{50.0}; + for (auto *model : simulation::Instances.sequence()) + { + if (model == nullptr) + continue; + auto const distance{glm::length(glm::dvec2{model->location().x - point.x, model->location().z - point.z})}; + if (distance < best) + { + best = distance; + nearest = model; + } + } + m_node = nearest; + select_include(0); + ui()->set_node(m_node); + WriteLog("SELFTEST selectmodel: " + (nearest != nullptr ? format("%s at %.2f %.2f %.2f", nearest->name().c_str(), nearest->location().x, nearest->location().y, nearest->location().z) : std::string{"none"})); + } + else if (command == "selectinclude") + { + glm::dvec3 point{0.0}; + words >> point.x >> point.z; + scene::instance_handle nearest{0}; + auto best{50.0}; + m_node = nullptr; + for (scene::instance_handle instance = 1; instance <= scene::Layers.instance_count(); ++instance) + { + if (false == scene::Layers.removable(instance)) + continue; + select_include(instance); + bend_source source; + if (false == bend_source_of_selection(source)) + continue; + auto const at{glm::dvec3(source.transform[3])}; + auto const distance{glm::length(glm::dvec2{at.x - point.x, at.z - point.z})}; + if (distance < best) + { + best = distance; + nearest = instance; + } + } + select_include(nearest); + WriteLog("SELFTEST selectinclude: " + (nearest != 0 ? *scene::Layers.instance(nearest).file : std::string{"none"})); + } + else if (command == "bend" || command == "bendset") + { + std::map values; + std::string pair; + while (words >> pair) + { + auto const equals{pair.find('=')}; + if (equals != std::string::npos) + values[pair.substr(0, equals)] = pair.substr(equals + 1); + } + auto const vector = [](std::string Text) { + std::replace(Text.begin(), Text.end(), ',', ' '); + std::istringstream numbers(Text); + glm::dvec3 result{0.0}; + numbers >> result.x >> result.y >> result.z; + return result; + }; + auto const index = [](std::string const &Text, std::vector const &Names) { + return static_cast(std::find(Names.begin(), Names.end(), Text) - Names.begin()); + }; + auto &tool{m_bend}; + auto const along{values.count("along") ? index(values["along"], {"start", "origin", "middle", "end", "point"}) : tool.along_anchor}; + auto const side{values.count("side") ? index(values["side"], {"origin", "near", "far", "middle", "point"}) : tool.side_anchor}; + auto const height{values.count("height") ? index(values["height"], {"origin", "bottom", "top", "edge", "point"}) : tool.height_anchor}; + auto const point{values.count("point") ? vector(values["point"]) : tool.point}; + if (command == "bend") + { + tool.edited = nullptr; + tool.along_anchor = along; + tool.side_anchor = side; + tool.height_anchor = height; + tool.point = point; + tool.axis = values.count("axis") ? index(values["axis"], {"auto", "z", "x"}) : 0; + tool.turned = values["turned"] == "1"; + bend_source source; + if (false == bend_source_of_selection(source)) + { + std::string reason; + auto const editable{m_node != nullptr && scene::Layers.editable(m_node, &reason)}; + WriteLog(format("SELFTEST bend: nothing to bend (node %p template %d editable %d %s, instance %d)", static_cast(m_node), m_node != nullptr && m_node->from_template() ? 1 : 0, editable ? 1 : 0, reason.c_str(), static_cast(m_instance))); + continue; + } + tool.tracks_for = nullptr; + bend_find_tracks(glm::dvec3(source.transform[3]), source.model != nullptr ? static_cast(source.model) : reinterpret_cast(static_cast(source.instance))); + tool.track = values.count("track") ? std::stoi(values["track"]) : 0; + if (values.count("pick")) + bend_pick(vector(values["pick"])); + if (tool.tracks.empty()) + { + WriteLog("SELFTEST bend: no track nearby"); + continue; + } + sweep_node::state state; + std::vector tracks; + bend_definition(source, *tool.tracks[tool.track].first, state, tracks); + WriteLog(format("SELFTEST bend: track %s, %zu paths, anchor before %.3f %.3f %.3f, lateral %.3f height %.3f from %.3f to %.3f, axis %s flip %d; %s", tool.tracks[tool.track].first->name().c_str(), tracks.size(), + tool.marker.x, tool.marker.y, tool.marker.z, state.lateral, state.height, state.from, state.to, state.along_x ? "x" : "z", state.flip ? 1 : 0, tool.status.c_str())); + if (values["go"] == "1") + { + bend_selection(); + WriteLog("SELFTEST bend: " + tool.status); + } + } + else if (auto *sweep{tool.edited}) + { + auto state{sweep->definition()}; + tool.along_anchor = along; + if (side != tool.side_anchor || height != tool.height_anchor || point != tool.point) + { + tool.side_anchor = side; + tool.height_anchor = height; + tool.point = point; + bend_reanchor(state, side, height, point); + } + if (values.count("lateral")) + state.lateral = std::stod(values["lateral"]); + if (values.count("up")) + state.height = std::stod(values["up"]); + if (values.count("widen")) + state.widen = values["widen"] == "1"; + if (values.count("pick")) + { + bend_pick(vector(values["pick"])); + state = sweep->definition(); + } + if (values.count("length")) + { + bend_stretch(*sweep, bend_fixed(*sweep, state.point), std::stod(values["length"]), state.point, state); + } + bend_edit(state); + WriteLog("SELFTEST bendset done"); + } + } + else if (command == "bendprobe") + { + auto *sweep{m_bend.edited}; + if (sweep == nullptr) + { + WriteLog("SELFTEST bendprobe: nothing bent"); + continue; + } + glm::dvec3 low, high, shift; + sweep->bounds(low, high, shift); + auto const &state{sweep->definition()}; + auto const marker{bend_marker(*sweep)}; + glm::dvec3 boxlow{std::numeric_limits::max()}, boxhigh{-std::numeric_limits::max()}; + std::size_t vertices{0}; + for (auto const &shape : sweep->create_shapes()) + for (auto const &vertex : shape.data().vertices) + { + boxlow = glm::min(boxlow, vertex.position); + boxhigh = glm::max(boxhigh, vertex.position); + ++vertices; + } + WriteLog(format("SELFTEST bendprobe %s: stations %.3f - %.3f, along the reference line %.3f m, model %.3f m, lateral %.3f height %.3f anchors %d/%d point %.3f %.3f %.3f, marker %.3f %.3f %.3f, box %.2f %.2f %.2f - %.2f %.2f %.2f, %zu vertices, removed %d", + sweep->name().c_str(), sweep->start(), sweep->end(), sweep->distance_at(sweep->end()) - sweep->distance_at(sweep->start()), high.x - low.x, state.lateral, state.height, state.side_anchor, state.height_anchor, state.point.x, + state.point.y, state.point.z, marker.x, marker.y, marker.z, boxlow.x, boxlow.y, boxlow.z, boxhigh.x, boxhigh.y, boxhigh.z, vertices, sweep->m_editorremoved ? 1 : 0)); + } + else if (command == "modelbox") + { + auto *model{dynamic_cast(m_node)}; + bend_source source; + if (model == nullptr || false == bend_source_of_selection(source)) + { + WriteLog("SELFTEST modelbox: no model selected"); + continue; + } + scene::node_data data; + sweep_node probe{data}; + sweep_node::state state; + state.model = source.file; + state.skin = source.skin; + state.scale = source.scale; + probe.define(state); + glm::dvec3 boxlow{std::numeric_limits::max()}, boxhigh{-std::numeric_limits::max()}; + for (auto const &item : probe.items()) + { + auto const transform{source.transform * glm::scale(glm::dmat4(1.0), source.scale) * item.transform}; + std::vector pending{item.model->GetSMRoot()}; + while (false == pending.empty()) + { + auto *submodel{pending.back()}; + pending.pop_back(); + for (; submodel != nullptr; submodel = submodel->Next) + { + if (submodel->Child != nullptr) + pending.push_back(submodel->Child); + if (submodel->eType != GL_TRIANGLES || submodel->fSquareMinDist > 0.f || (submodel->m_geometry.handle.bank == 0 && submodel->m_geometry.handle.chunk == 0)) + continue; + glm::dmat4 local{1.0}; + for (auto *parent = submodel; parent != nullptr; parent = parent->Parent) + if ((parent->iFlags & 0xC000) != 0 && parent->GetMatrix() != nullptr) + local = glm::dmat4(glm::make_mat4(parent->GetMatrix()->readArray())) * local; + for (auto const &vertex : GfxRenderer->Vertices(submodel->m_geometry.handle)) + { + auto const world{glm::dvec3(transform * local * glm::dvec4(glm::dvec3(vertex.position), 1.0))}; + boxlow = glm::min(boxlow, world); + boxhigh = glm::max(boxhigh, world); + } + } + } + } + WriteLog(format("SELFTEST modelbox: %.2f %.2f %.2f - %.2f %.2f %.2f", boxlow.x, boxlow.y, boxlow.z, boxhigh.x, boxhigh.y, boxhigh.z)); + } + else if (command == "key") + { + std::string key, action, mods; + words >> key >> action >> mods; + if (key == "RMB") + m_input.mouse.button(GLFW_MOUSE_BUTTON_RIGHT, action == "press" ? GLFW_PRESS : GLFW_RELEASE); + else + { + auto const code{key == "S" ? GLFW_KEY_S : key == "W" ? GLFW_KEY_W : key == "CTRL" ? GLFW_KEY_LEFT_CONTROL : 0}; + on_key(code, 0, action == "press" ? GLFW_PRESS : GLFW_RELEASE, mods == "ctrl" ? GLFW_MOD_CONTROL : 0); + } + WriteLog(format("SELFTEST key %s %s %s: camera %.2f %.2f %.2f, key S %d, right button %d", key.c_str(), action.c_str(), mods.c_str(), Camera.Pos.x, Camera.Pos.y, Camera.Pos.z, static_cast(input::keys[GLFW_KEY_S]), m_input.mouse.button(GLFW_MOUSE_BUTTON_RIGHT))); + } + else if (command == "lineside") + { + std::string tab; + words >> tab; + show_track_tab(track_tab::lineside); + (tab == "vehicle" ? m_vehicle.expand : tab == "hekto" ? m_hekto.expand : tab == "fouling" ? m_fouling.expand : m_parallel.expand) = true; + } + else if (command == "event") + { + std::string name; + words >> name; + auto *event{simulation::Events.FindEvent(name)}; + if (event != nullptr) + simulation::Events.AddToQuery(event, nullptr); + WriteLog("SELFTEST event " + name + (event != nullptr ? " queued" : ": no such event")); + } + else if (command == "memcell") + { + std::string name; + words >> name; + auto *cell{simulation::Memory.find(name)}; + WriteLog("SELFTEST memcell " + name + (cell != nullptr ? format(": %s %.1f %.1f", cell->Text().c_str(), cell->Value1(), cell->Value2()) : std::string{": none"})); + } + else if (command == "bendpanel") + { + ui()->expand_bend(); + } + else if (command == "newscenerypopup") + { + m_newscenery_asked = true; + } + else if (command == "openscenerypopup") + { + m_openscenery_asked = true; + std::snprintf(m_openscenery_search, sizeof(m_openscenery_search), "%s", "zz_"); + } + else if (command == "openscenery") + { + std::string name; + words >> name; + WriteLog(restart_editor(name) ? "SELFTEST openscenery: started " + name : "SELFTEST openscenery: failed"); + } + else if (command == "gauge") + { + std::string name; + words >> name; + if (auto *track{simulation::Paths.find(name)}) + { + scan_gauge(*track); + WriteLog(format("SELFTEST gauge %s: %d hits", name.c_str(), static_cast(m_gauge.line.hits.size()))); + for (auto const &hit : m_gauge.line.hits) + WriteLog(format("SELFTEST gauge hit %s depth %.3f at %.2f %.2f %.2f", hit.model.c_str(), hit.depth, hit.point.x, hit.point.y, hit.point.z)); + } + else + WriteLog("SELFTEST gauge " + name + ": no such track"); + } + else if (command == "deletetrack") + { + delete_selected_track(); + WriteLog("SELFTEST deletetrack"); + } + else if (command == "ttincludes") + { + std::string name; + words >> name; + auto const *track{simulation::Paths.find(name)}; + WriteLog(format("SELFTEST ttincludes %s: track %s, includes %d", name.c_str(), track == nullptr ? "none" : track->m_editorremoved ? "removed" : "present", + track != nullptr ? static_cast(turntable_includes(*track).size()) : -1)); + } + else if (command == "undo") + { + undo_last(); + WriteLog("SELFTEST undo"); + } + else if (command == "redo") + { + redo_last(); + WriteLog("SELFTEST redo"); + } + else if (command == "checkspans") + { + WriteLog("SELFTEST spans: " + scene::Layers.check_sources()); + } else if (command == "log") { std::string text; diff --git a/application/editormodesweep.cpp b/application/editormodesweep.cpp index a52369a40..c7f589e37 100644 --- a/application/editormodesweep.cpp +++ b/application/editormodesweep.cpp @@ -21,12 +21,17 @@ http://mozilla.org/MPL/2.0/. #include "utilities/Globals.h" #include "utilities/Logs.h" #include "world/Sweep.h" +#include "model/AnimModel.h" #include "world/Track.h" #include "imgui/imgui.h" #include "utilities/translation.h" +#include #include +#include +#include #include +#include #include #include #include @@ -48,6 +53,49 @@ double const kSweepGrab{25.0}; // m from the track, a press this close marks the std::size_t const kSweepModelList{400}; double const kRailTop{0.18}; // m from the points of a track to the top of its rails +glm::dvec3 flat(glm::dvec3 Vector) +{ + Vector.y = 0.0; + return glm::length(Vector) > 1e-9 ? glm::normalize(Vector) : glm::dvec3{0.0, 0.0, 1.0}; +} + +// the edges of the platforms in peronowe/ are named by the count of the edges and the height: 1k96w200m, 2k30w..., 1kraw200m55cm, +// old_1k76w..., old2_peron1k30w..., old_peron1k_prosty_h70...; the rest there are the benches, the lamps and such. their side facing the track is the edge +double platform_height(std::string File) +{ + std::transform(File.begin(), File.end(), File.begin(), [](unsigned char const Character) { return static_cast(std::tolower(Character)); }); + std::replace(File.begin(), File.end(), '\\', '/'); + auto const slash{File.rfind('/')}; + if (slash == std::string::npos || File.substr(0, slash).find("peron") == std::string::npos) + return 0.0; + static std::regex const pattern{R"(^(?:old2?_)?(?:(?:peron)?\dk(\d\d)|\dkraw\d+m(\d\d)cm|peron.*_h(\d\d))(?:[^\d]|$))"}; + std::smatch match; + auto const name{File.substr(slash + 1)}; + if (false == std::regex_search(name, match, pattern)) + return 0.0; + for (std::size_t i = 1; i < match.size(); ++i) + if (match[i].matched) + return std::stoi(match[i].str()) / 100.0; + return 0.0; +} + +bool platform_model(std::string const &File) +{ + return platform_height(File) > 0.0; +} + +// the edge of the platform 1.725 m from the axis on the side it stands, set back further by the widening of the gauge +void platform_edge(sweep_node::state &State, std::string const &Model, double const Base) +{ + State.lateral = std::copysign(1.725, State.lateral == 0.0 ? 1.0 : State.lateral); + State.side_anchor = 1; + State.height_anchor = 3; + if (auto const height{platform_height(Model)}; height > 0.0) + State.height = Base + height; + State.widen = true; + State.platform = true; +} + segment_data reversed(segment_data const &Path) { segment_data result{Path}; @@ -225,6 +273,13 @@ void editor_mode::sweep_measure() if (model == tool.measured) return; tool.measured = model; + if (tool.edited == nullptr || tool.edited->definition().model != model) + { + if (platform_model(model)) + platform_edge(tool.settings, model, 0.0); + else + tool.settings.platform = tool.settings.widen = false; + } tool.model_length = 0.0; if (model.empty()) return; @@ -266,6 +321,13 @@ void editor_mode::sweep_create() sweep_curve(); if (tool.curve.empty() || tool.model[0] == '\0') return; + for (auto wanted{sweep_definition().to}; wanted > tool.curve_length && tool.outline.size() > 1;) + { + auto const end{tool.outline.back()}; + auto const ahead{end + flat(end - tool.outline[tool.outline.size() - 2]) * (wanted - tool.curve_length)}; + if (false == sweep_extend(true, ahead)) + break; + } static int counter{0}; scene::node_data data; data.type = "sweep"; @@ -293,6 +355,7 @@ void editor_mode::sweep_create() m_history.push_back(std::move(snap)); g_redo.clear(); tool.edited = sweep; + m_bend.edited = sweep; tool.status = format(STR_C("%s laid along %.1f m, Ctrl+Z takes it back"), tool.model, sweep->end() - sweep->start()); if (scene::Layers.active() == null_handle) tool.status += "\n" + std::string{STR_C("The scenery isn't opened for editing, it won't be saved")}; @@ -589,6 +652,27 @@ void editor_mode::sweeps_committed(std::vector const &Tracks) entry.first->define(entry.second); entry.first->mark_dirty(); } + for (auto &entry : states) + { + auto *sweep{entry.first}; + if (false == sweep->bridge()) + continue; + sweep->mark_dirty(); + m_sweep_links.erase(std::remove_if(m_sweep_links.begin(), m_sweep_links.end(), [&](sweep_link const &Link) { return Link.sweep == sweep; }), m_sweep_links.end()); + auto const &pieces{sweep->definition().pieces}; + for (auto *track : simulation::Paths.sequence()) + { + if (track == nullptr || track->m_editorremoved) + continue; + for (std::size_t i = 0; i < pieces.size(); ++i) + for (int path = 0; path < static_cast(track->m_paths.size()); ++path) + { + auto const along{same_piece(pieces[i], track->m_paths[path])}; + if (along || same_piece(pieces[i], reversed(track->m_paths[path]))) + m_sweep_links.push_back({sweep, i, track, path, false == along}); + } + } + } } void editor_mode::sweeps_split(TTrack &Original, TTrack &Created) @@ -620,34 +704,10 @@ void editor_mode::sweeps_split(TTrack &Original, TTrack &Created) void editor_mode::render_sweep_ui() { auto &tool{m_sweep}; - auto *track{selected_track()}; sweep_curve(); sweep_scan_models(); ImGui::TextDisabled("%s", STR_C("A model bent to follow the track, or repeated along it: platforms, walls, fences, barriers, lamps")); - // models along curves by this line - if (track != nullptr) - { - auto const alongside{sweeps_near(*track)}; - if (false == alongside.empty()) - { - ImGui::TextDisabled("%s", STR_C("By this track:")); - for (auto *sweep : alongside) - { - ImGui::PushID(sweep); - auto const &definition{sweep->definition()}; - if (ImGui::Selectable(format("%s %s, %.0f m", sweep->name().c_str(), definition.model.c_str(), sweep->end() - sweep->start()).c_str(), tool.edited == sweep, 0, ImVec2(ImGui::GetContentRegionAvail().x - 60.0f, 0.0f))) - sweep_edit(*sweep); - ImGui::SameLine(); - if (ImGui::SmallButton(STR_C("Delete"))) - sweep_delete(*sweep); - ImGui::PopID(); - } - if (tool.edited != nullptr && ImGui::SmallButton(STR_C("New one"))) - tool.edited = nullptr; - ImGui::Separator(); - } - } bool changed{false}; auto const edited = [&](bool const Changed) { changed |= Changed; }; @@ -726,7 +786,8 @@ void editor_mode::render_sweep_ui() { auto const ¶meter{info.parameter(id)}; auto const placement{parameter.role.rfind("pos.", 0) == 0 || parameter.role.rfind("rot.", 0) == 0}; - auto const value{placement ? std::string{"0"} : parameter.value.empty() ? std::string{"none"} : parameter.value}; + auto const &choices{tool.parameter_choices[id - 1]}; + auto const value{placement ? std::string{"0"} : false == parameter.value.empty() ? parameter.value : choices.empty() ? std::string{"none"} : choices.front()}; std::snprintf(tool.parameters[id - 1].data(), tool.parameters[id - 1].size(), "%s", value.c_str()); tool.parameter_labels[id - 1] = parameter.label.empty() ? "p" + std::to_string(id) + (parameter.role != "free" ? " (" + parameter.role + ")" : std::string{}) : parameter.label; tool.parameter_placement[id - 1] = placement; @@ -797,45 +858,17 @@ void editor_mode::render_sweep_ui() ImGui::SameLine(); if (ImGui::SmallButton(format("%.2f m##platform", height).c_str())) { - settings.lateral = std::copysign(1.725, settings.lateral == 0.0 ? 1.0 : settings.lateral); - settings.side_anchor = 1; + platform_edge(settings, tool.model, 0.0); settings.height = height; - settings.height_anchor = 3; settings.face = true; - settings.widen = true; changed = true; } if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", STR_C("The edge of the platform 1.725 m from the axis of the track, its top this high over the rail top")); } ImGui::TextDisabled(STR_C("%.2f m %s of the axis, %.2f m over the rail top"), std::abs(settings.lateral), settings.lateral >= 0.0 ? STR_C("right") : STR_C("left"), settings.height); - ImGui::TextWrapped("%s", STR_C("Press beside the track where the model begins and drag along to where it ends; the side of the press is the side of the model. " - "Past the end of the path it goes on along the joined ones. A click lays one copy.")); - - if (tool.edited != nullptr && changed) - sweep_apply(); - if (tool.edited == nullptr && false == tool.curve.empty() && tool.model_length > 0.0 && ImGui::Button(STR_C("Lay it along the selected path"))) - { - tool.length_mode = 2; - settings.from = 0.0; - settings.to = -1.0; + if (false == tool.curve.empty() && tool.model_length > 0.0 && ImGui::Button(STR_C("Lay it along the selected path"))) sweep_create(); - } - if (tool.edited != nullptr && false == tool.curve.empty() && ImGui::Button(STR_C("Lay it again along the selected line"))) - { - auto state{sweep_definition()}; - EditorSnapshot snap; - snap.action = EditorSnapshot::Action::Other; - snap.node_name = tool.edited->name(); - snap.sweeps.emplace_back(tool.edited, tool.edited->definition()); - trim_history(); - m_history.push_back(std::move(snap)); - g_redo.clear(); - tool.edited->define(state); - tool.edited->mark_dirty(); - if (track != nullptr) - sweeps_captured(*track); - } changed = false; if (ImGui::CollapsingHeader(STR_C("More settings"))) @@ -881,6 +914,16 @@ void editor_mode::render_sweep_ui() ImGui::SetTooltip("%s", STR_C("The offset grows by the widening of the gauge below the platforms: 3.75/R in the curves of R >= 250 m,\n" "more in the sharper ones, and on the inner side of a canted curve by the cant times the height of the edge / 1.5;\n" "it begins 20 m (inner side) and 26 m (outer side) ahead of the curve, as in the gauge check")); + if (ImGui::Checkbox(STR_C("Platform"), &settings.platform)) + { + if (settings.platform) + platform_edge(settings, tool.model, 0.0); + changed = true; + } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Puts the edge facing the track 1.725 m from its axis, set back by the widening of the gauge in the curves.\n" + "Stands on the plane of the rail heads carried on to its edge: lower on the inner side of a canted curve,\n" + "higher on the outer one; on the inner side also set back by the cant times the height of the edge / 1.5")); ImGui::TextDisabled("%s", STR_C("Length")); ImGui::SameLine(); edited(ImGui::RadioButton(STR_C("as the original"), &tool.length_mode, 0)); @@ -909,8 +952,6 @@ void editor_mode::render_sweep_ui() else ImGui::TextDisabled(STR_C("%.1f m: %d copies every %.2f m"), stretch, copies, own); } - if (tool.edited != nullptr && changed) - sweep_apply(); } if (false == tool.status.empty()) ImGui::TextWrapped("%s", tool.status.c_str()); @@ -953,3 +994,1045 @@ void editor_mode::draw_sweep_overlay() const if (started && projection.project(previous, screen)) drawlist->AddCircle(screen, 6.0f, IM_COL32(255, 160, 40, 230), 12, 2.0f); } + +namespace +{ + +double const kBendReach{60.0}; +double const kBendMargin{1.0}; + +glm::dmat3 axes_matrix(sweep_node const &Sweep) +{ + return glm::dmat3(Sweep.axes({1.0, 0.0, 0.0}), Sweep.axes({0.0, 1.0, 0.0}), Sweep.axes({0.0, 0.0, 1.0})); +} + +double along_anchor(sweep_node const &Sweep, int const Anchor, glm::dvec3 const &Low, glm::dvec3 const &High, glm::dvec3 const &Point) +{ + auto const &state{Sweep.definition()}; + switch (Anchor) + { + case 0: return Low.x; + case 2: return 0.5 * (Low.x + High.x); + case 3: return High.x; + case 4: return Sweep.axes(state.scale * Point).x; + default: return 0.0; + } +} + +int copies_of(sweep_node const &Sweep, double const Own) +{ + auto const &state{Sweep.definition()}; + auto const stretch{Sweep.distance_at(Sweep.end()) - Sweep.distance_at(Sweep.start())}; + auto const length{state.step > 0.01 ? state.step : Own}; + if (length < 1e-3) + return 1; + return state.bend ? std::max(1, static_cast(std::round(stretch / length))) : static_cast(std::floor(stretch / length + 1e-6)) + 1; +} + +} // namespace + +bool editor_mode::bend_source_of_selection(bend_source &Source) const +{ + Source = bend_source{}; + if (auto *model = dynamic_cast(m_node)) + { + if (model->from_template() || false == scene::Layers.editable(model)) + return false; + std::string text; + model->export_as_text(text); + std::istringstream words(text); + std::string token; + double number; + while (words >> token && token != "model") + ; + words >> number >> number >> number >> number >> Source.file; + words >> std::ws; + if (words.peek() == '"') + { + words.get(); + std::getline(words, Source.skin, '"'); + } + else + words >> Source.skin; + if (Source.file.empty() || Source.file == "none") + return false; + auto const angles{glm::dvec3(model->Angles())}; + Source.transform = glm::translate(glm::dmat4(1.0), model->location()); + Source.transform = glm::rotate(Source.transform, glm::radians(angles.y), glm::dvec3{0.0, 1.0, 0.0}); + Source.transform = glm::rotate(Source.transform, glm::radians(angles.x), glm::dvec3{1.0, 0.0, 0.0}); + Source.transform = glm::rotate(Source.transform, glm::radians(angles.z), glm::dvec3{0.0, 0.0, 1.0}); + Source.scale = glm::dvec3(model->Scale()); + Source.layer = model->layer(); + Source.model = model; + return true; + } + if (m_instance == 0 || false == m_include.placement || false == m_include.issue.empty() || false == scene::Layers.removable(m_instance)) + return false; + auto info{m_include.info}; + editor_includes::suggest(m_include.target, info); + glm::dvec3 position{0.0}, rotation{0.0}; + Source.parameters = m_include.values; + for (std::size_t i = 0; i < Source.parameters.size(); ++i) + { + auto const &role{info.parameter(static_cast(i) + 1).role}; + if (role.rfind("pos.", 0) != 0 && role.rfind("rot.", 0) != 0) + continue; + auto const value{std::atof(Source.parameters[i].c_str())}; + auto const axis{role.back() == 'x' ? 0 : role.back() == 'y' ? 1 : 2}; + (role[0] == 'p' ? position : rotation)[axis] = value; + Source.parameters[i] = "0"; + } + auto const &included{scene::Layers.instance(m_instance)}; + Source.file = m_include.target; + Source.transform = glm::translate(glm::dmat4(1.0), included.context.offset + position); + Source.transform = glm::rotate(Source.transform, glm::radians(rotation.y), glm::dvec3{0.0, 1.0, 0.0}); + Source.transform = glm::rotate(Source.transform, glm::radians(rotation.x), glm::dvec3{1.0, 0.0, 0.0}); + Source.transform = glm::rotate(Source.transform, glm::radians(rotation.z), glm::dvec3{0.0, 0.0, 1.0}); + Source.layer = included.layer; + Source.instance = m_instance; + return true; +} + +void editor_mode::bend_find_tracks(glm::dvec3 const &Point, void const *Key) +{ + auto &tool{m_bend}; + if (Key == tool.tracks_for && glm::distance(Point, tool.tracks_at) < 1.0) + return; + tool.tracks_for = Key; + tool.tracks_at = Point; + tool.tracks.clear(); + tool.track = 0; + for (auto *track : simulation::Paths.sequence()) + { + if (track == nullptr || track->m_editorremoved || track->eType == tt_Table || track->m_paths.empty()) + continue; + auto best{std::numeric_limits::max()}; + for (auto const &path : track->m_paths) + { + if (plan_distance(path.points[segment_data::point::start], Point) > 2000.0 + kBendReach) + continue; + bezier const curve{path}; + auto const count{std::clamp(static_cast(curve.plan_length() / 2.0), 8, 400)}; + for (int k = 0; k <= count; ++k) + best = std::min(best, plan_distance(curve.point(static_cast(k) / count), Point)); + } + if (best <= kBendReach) + tool.tracks.emplace_back(track, best); + } + std::sort(tool.tracks.begin(), tool.tracks.end(), [](auto const &A, auto const &B) { return A.second < B.second; }); + if (tool.tracks.size() > 12) + tool.tracks.resize(12); +} + +bool editor_mode::bend_definition(bend_source const &Source, TTrack &Track, sweep_node::state &State, std::vector &Tracks) +{ + auto &tool{m_bend}; + State = sweep_node::state{}; + State.model = Source.file; + State.skin = Source.skin.empty() ? "none" : Source.skin; + State.parameters = Source.parameters; + State.scale = Source.scale; + State.face = false; + State.platform = State.widen = platform_model(Source.file); + State.side_anchor = tool.side_anchor; + State.height_anchor = tool.height_anchor; + State.point = tool.point; + auto const origin{glm::dvec3(Source.transform[3])}; + int path{0}; + { + auto best{std::numeric_limits::max()}; + for (int i = 0; i < static_cast(Track.m_paths.size()); ++i) + { + bezier const curve{Track.m_paths[i]}; + for (int k = 0; k <= 64; ++k) + if (auto const distance{plan_distance(curve.point(k / 64.0), origin)}; distance < best) + { + best = distance; + path = i; + } + } + } + std::vector records{{&Track, path, true}}; + State.pieces = {Track.m_paths[path]}; + scene::node_data data; + sweep_node probe{data}; + auto const define = [&]() { probe.define(State); }; + define(); + double lateral; + auto const forward{flat(probe.frame_at(probe.project(origin, lateral)).forward)}; + glm::dmat3 const rotation{Source.transform}; + auto const ex{flat(rotation * glm::dvec3{1.0, 0.0, 0.0})}; + auto const ez{flat(rotation * glm::dvec3{0.0, 0.0, 1.0})}; + State.along_x = tool.axis == 2 || (tool.axis == 0 && std::abs(glm::dot(ex, forward)) > std::abs(glm::dot(ez, forward))); + auto const direction{State.along_x ? ex : ez}; + State.flip = (glm::dot(direction, forward) < 0.0) != tool.turned; + State.lateral = lateral != 0.0 ? lateral : 1e-3; + define(); + glm::dvec3 low, high, shift; + if (false == probe.bounds(low, high, shift)) + { + tool.status = STR("The model has no triangles to bend, or it can't be loaded"); + return false; + } + if (State.platform && probe.edge_far()) + { + State.flip = false == State.flip; + define(); + probe.bounds(low, high, shift); + } + auto const inverse{glm::inverse(axes_matrix(probe))}; + auto const world = [&](glm::dvec3 const &Local) { return glm::dvec3(Source.transform * glm::dvec4(inverse * Local, 1.0)); }; + auto const ends{std::array{world({low.x, 0.0, 0.0}), world({high.x, 0.0, 0.0})}}; + auto const beyond = [&](glm::dvec3 const &Point, bool const Atend) { + auto const at{probe.frame_at(Atend ? probe.length() : 0.0)}; + auto const along{glm::dot(glm::dvec3{Point.x - at.position.x, 0.0, Point.z - at.position.z}, flat(at.forward))}; + return Atend ? along > -kBendMargin : along < kBendMargin; + }; + auto const extend = [&](bool const Atend, glm::dvec3 const &Target) { + auto const &edge{Atend ? records.back() : records.front()}; + auto const &edgepiece{Atend ? State.pieces.back() : State.pieces.front()}; + auto const point{Atend ? edgepiece.points[segment_data::point::end] : edgepiece.points[segment_data::point::start]}; + std::optional best; + segment_data bestpiece; + auto bestdistance{std::numeric_limits::max()}; + for (auto const &[other, end] : editor_track::connected_points(*edge.track, point)) + { + if (other == nullptr || other->m_editorremoved || other->eType == tt_Table || false == editor_track::is_supported(*other) || end.path >= static_cast(other->m_paths.size())) + continue; + if (std::any_of(records.begin(), records.end(), [&](sweep_tool::piece const &Piece) { return Piece.track == other && Piece.path == end.path; })) + continue; + auto const startshere{end.kind == editor_track::point_kind::start}; + auto const forward{Atend ? startshere : false == startshere}; + auto const piece{forward ? other->m_paths[end.path] : reversed(other->m_paths[end.path])}; + bezier const curve{piece}; + auto distance{std::numeric_limits::max()}; + for (int k = 0; k <= 32; ++k) + distance = std::min(distance, plan_distance(curve.point(k / 32.0), Target)); + if (distance < bestdistance) + { + bestdistance = distance; + best = sweep_tool::piece{other, end.path, forward}; + bestpiece = piece; + } + } + if (false == best.has_value()) + return false; + if (Atend) + { + records.push_back(*best); + State.pieces.push_back(bestpiece); + } + else + { + records.insert(records.begin(), *best); + State.pieces.insert(State.pieces.begin(), bestpiece); + } + define(); + return true; + }; + for (int i = 0; i < 40 && probe.length() < kSweepRouteReach; ++i) + { + auto grown{false}; + for (auto const &point : ends) + { + if (beyond(point, false) && extend(false, point)) + grown = true; + else if (beyond(point, true) && extend(true, point)) + grown = true; + } + if (false == grown) + break; + } + glm::dvec3 anchor{0.0}; + double station{0.0}; + auto const place = [&]() { + for (int pass = 0; pass < 3; ++pass) + { + define(); + probe.bounds(low, high, shift); + auto const a{along_anchor(probe, tool.along_anchor, low, high, State.point)}; + anchor = world({a, -shift.y, -shift.z}); + double side; + station = probe.project(anchor, side); + for (int k = 0; k < 2; ++k) + { + auto const at{probe.frame_at(station)}; + station += glm::dot(glm::dvec3{anchor.x - at.position.x, 0.0, anchor.z - at.position.z}, flat(at.forward)); + } + auto const at{probe.frame_at(station)}; + side = glm::dot(glm::dvec3{anchor.x - at.position.x, 0.0, anchor.z - at.position.z}, flat(at.left)); + auto const flipped{(side >= 0.0) != (State.lateral >= 0.0)}; + State.lateral = side != 0.0 ? side : 1e-3; + State.height = anchor.y - at.position.y - probe.rise(at); + if (false == flipped) + break; + } + define(); + probe.bounds(low, high, shift); + auto const a{along_anchor(probe, tool.along_anchor, low, high, State.point)}; + auto const first{probe.distance_at(station) - (a - low.x)}; + State.from = probe.station_at(first); + State.to = probe.station_at(first + high.x - low.x); + }; + place(); + // the straight model leaves the track where it curves on, short of the length it takes bent along it + for (int i = 0; i < 40 && probe.length() < kSweepRouteReach; ++i) + { + auto const ahead = [&](bool const Atend) { + auto const at{probe.frame_at(Atend ? probe.length() : 0.0)}; + auto const reach{Atend ? State.to - probe.length() : State.from}; + return at.position + flat(at.forward) * reach; + }; + if ((State.to > probe.length() + 0.01 && extend(true, ahead(true))) || (State.from < -0.01 && extend(false, ahead(false)))) + place(); + else + break; + } + if (State.platform) + { + platform_edge(State, Source.file, kRailTop); + define(); + anchor = bend_marker(probe); + } + if (State.to <= 0.0) + { + tool.status = STR("The model lies before the start of the track"); + return false; + } + tool.marker = anchor; + tool.marker_valid = true; + Tracks.clear(); + for (auto const &record : records) + Tracks.push_back(record.track); + auto const residual{glm::degrees(std::acos(std::clamp(std::abs(glm::dot(direction, forward)), 0.0, 1.0)))}; + tool.status = residual > 1.0 ? format(STR_C("The model stands %.1f deg off the track, bent it'll follow the track"), residual) : std::string{}; + return true; +} + +void editor_mode::bend_selection() +{ + auto &tool{m_bend}; + bend_source source; + if (false == bend_source_of_selection(source) || tool.tracks.empty()) + return; + auto *track{tool.tracks[std::clamp(tool.track, 0, static_cast(tool.tracks.size()) - 1)].first}; + sweep_node::state state; + std::vector tracks; + if (false == bend_definition(source, *track, state, tracks)) + return; + static int counter{0}; + scene::node_data data; + data.type = "sweep"; + data.range_max = -1.0; + data.layer = scene::Layers.accepts(source.layer) ? source.layer : scene::Layers.active(); + do + { + data.name = "sweep_" + std::to_string(++counter); + } while (simulation::Sweeps.find(data.name) != nullptr); + auto *sweep{new sweep_node(data)}; + sweep->define(state); + sweep->mark_dirty(); + simulation::Sweeps.insert(sweep); + scene::Layers.count(sweep->layer(), scene::layer_item::model); + sweep->show(); + for (auto *path : tracks) + if (path != nullptr && false == path->m_editorremoved) + sweeps_captured(*path); + EditorSnapshot snap; + snap.action = EditorSnapshot::Action::Bend; + snap.sweeps_toggled.push_back(sweep); + snap.layer = source.layer; + if (source.model != nullptr) + { + auto *model{source.model}; + model->export_as_text(snap.serialized); + snap.node_name = model->name(); + snap.position = model->location(); + snap.rotation = model->Angles(); + snap.scale = model->Scale(); + snap.uuid = model->uuid; + nullify_history_pointers(model); + remove_from_hierarchy(model); + m_node = nullptr; + m_dragging = false; + ui()->set_node(nullptr); + simulation::State.delete_model(model); + } + else + { + snap.instance = source.instance; + snap.node_name = source.file; + scene::Layers.removed(source.instance, true); + select_include(0); + } + trim_history(); + m_history.push_back(std::move(snap)); + g_redo.clear(); + tool.edited = sweep; + tool.signature.clear(); + tool.status = format(STR_C("%s bent along %.1f m of the track, Ctrl+Z takes it back"), source.file.c_str(), sweep->distance_at(sweep->end()) - sweep->distance_at(sweep->start())); + WriteLog("Editor: " + tool.status, logtype::generic); +} + +void editor_mode::restore_bend(EditorSnapshot &Snapshot, bool const Undo) +{ + if (Snapshot.sweeps_toggled.empty()) + return; + auto *sweep{Snapshot.sweeps_toggled.front()}; + sweep->m_editorremoved = Undo; + if (Undo) + sweep->hide(); + else + sweep->show(); + sweep->mark_dirty(); + if (Snapshot.instance != 0) + { + if (scene::Layers.tracked(Snapshot.instance) && false == scene::Layers.instance(Snapshot.instance).dead) + scene::Layers.removed(Snapshot.instance, false == Undo); + select_include(0); + } + else if (Undo) + { + auto *created{simulation::State.create_model(Snapshot.serialized, Snapshot.node_name, Snapshot.position)}; + if (created != nullptr) + { + scene::Layers.move(created, Snapshot.layer); + created->location(Snapshot.position); + created->Angles(Snapshot.rotation); + created->Scale(Snapshot.scale); + created->uuid = Snapshot.uuid; + add_to_hierarchy(created); + Snapshot.node_ptr = created; + m_node = created; + ui()->set_node(m_node); + } + } + else if (auto *model{dynamic_cast(find_node_by_any(Snapshot.node_ptr, Snapshot.uuid.to_string(), Snapshot.node_name))}) + { + nullify_history_pointers(model); + remove_from_hierarchy(model); + simulation::State.delete_model(model); + Snapshot.node_ptr = nullptr; + m_node = nullptr; + ui()->set_node(nullptr); + } + m_bend.edited = Undo ? nullptr : sweep; + m_bend.signature.clear(); +} + +void editor_mode::bend_edit(sweep_node::state const &State) +{ + auto *sweep{m_bend.edited}; + if (sweep == nullptr || sweep->m_editorremoved || State == sweep->definition()) + return; + EditorSnapshot snap; + snap.action = EditorSnapshot::Action::Other; + snap.node_name = sweep->name(); + snap.sweeps.emplace_back(sweep, sweep->definition()); + trim_history(); + m_history.push_back(std::move(snap)); + g_redo.clear(); + sweep->define(State); + sweep->mark_dirty(); +} + +double editor_mode::bend_fixed(sweep_node const &Sweep, glm::dvec3 const &Point) const +{ + auto const from{Sweep.distance_at(Sweep.start())}; + auto const stretch{Sweep.distance_at(Sweep.end()) - from}; + glm::dvec3 low, high, shift; + if (false == Sweep.bounds(low, high, shift)) + return from; + switch (m_bend.along_anchor) + { + case 0: return from; + case 2: return from + 0.5 * stretch; + case 3: return from + stretch; + default: break; + } + auto const own{high.x - low.x}; + auto const scale{Sweep.definition().bend && own > 1e-3 ? stretch / copies_of(Sweep, own) / own : 1.0}; + return from + (along_anchor(Sweep, m_bend.along_anchor, low, high, Point) - low.x) * scale; +} + +void editor_mode::bend_stretch(sweep_node const &Sweep, double const Fixed, double const Length, glm::dvec3 const &Point, sweep_node::state &State) const +{ + glm::dvec3 low, high, shift; + auto first{Fixed}; + switch (m_bend.along_anchor) + { + case 0: break; + case 2: first = Fixed - 0.5 * Length; break; + case 3: first = Fixed - Length; break; + default: + if (Sweep.bounds(low, high, shift)) + { + auto const own{high.x - low.x}; + auto const step{State.step > 0.01 ? State.step : own}; + auto const copies{State.bend && step > 1e-3 ? std::max(1, static_cast(std::round(Length / step))) : 1}; + auto const scale{State.bend && own > 1e-3 ? Length / copies / own : 1.0}; + first = Fixed - (along_anchor(Sweep, m_bend.along_anchor, low, high, Point) - low.x) * scale; + } + break; + } + State.from = Sweep.station_at(first); + State.to = Sweep.station_at(first + Length); +} + +void editor_mode::bend_reanchor(sweep_node::state &State, int const Side, int const Height, glm::dvec3 const &Point) const +{ + scene::node_data data; + sweep_node probe{data}; + probe.define(State); + glm::dvec3 low, high, before; + if (false == probe.bounds(low, high, before)) + return; + auto const stretch{probe.distance_at(probe.end()) - probe.distance_at(probe.start())}; + auto const fixed{probe.station_at(bend_fixed(probe, Point))}; + auto next{State}; + next.side_anchor = Side; + next.height_anchor = Height; + next.point = Point; + probe.define(next); + glm::dvec3 after; + if (false == probe.bounds(low, high, after)) + return; + next.lateral = State.lateral + before.y - after.y; + next.height = State.height + before.z - after.z; + probe.define(next); + auto const whole{State.to < 0.0 && State.from == 0.0}; + bend_stretch(probe, probe.distance_at(fixed), stretch, Point, next); + if (whole) + { + next.from = 0.0; + next.to = -1.0; + } + State = next; +} + +glm::dvec3 editor_mode::bend_marker(sweep_node const &Sweep) const +{ + glm::dvec3 low, high, shift; + if (false == Sweep.bounds(low, high, shift)) + return glm::dvec3{0.0}; + auto const &state{Sweep.definition()}; + auto const from{Sweep.distance_at(Sweep.start())}; + auto const stretch{Sweep.distance_at(Sweep.end()) - from}; + auto const own{high.x - low.x}; + auto const copies{copies_of(Sweep, own)}; + auto const scale{state.bend && own > 1e-3 ? stretch / copies / own : 1.0}; + auto const at{Sweep.frame_at(Sweep.station_at(bend_fixed(Sweep, state.point)))}; + return at.position + at.left * (state.lateral + Sweep.setback(at)) + glm::dvec3{0.0, state.height + Sweep.rise(at), 0.0}; +} + +void editor_mode::bend_pick(glm::dvec3 const &Point) +{ + auto &tool{m_bend}; + tool.picking = false; + if (auto *sweep{tool.edited}; sweep != nullptr && false == sweep->m_editorremoved) + { + glm::dvec3 low, high, shift; + if (false == sweep->bounds(low, high, shift)) + return; + auto const &state{sweep->definition()}; + double lateral; + auto const station{sweep->project(Point, lateral)}; + auto const at{sweep->frame_at(station)}; + auto const from{sweep->distance_at(sweep->start())}; + auto const stretch{sweep->distance_at(sweep->end()) - from}; + auto const own{high.x - low.x}; + auto const copies{copies_of(*sweep, own)}; + auto const copy{stretch / copies}; + auto const scale{state.bend && own > 1e-3 ? copy / own : 1.0}; + auto const along{std::fmod(std::max(0.0, sweep->distance_at(station) - from), copy)}; + glm::dvec3 const local{low.x + along / scale, lateral - state.lateral - sweep->setback(at) - shift.y, + Point.y - at.position.y - state.height - sweep->rise(at) - shift.z}; + auto const raw{glm::inverse(axes_matrix(*sweep)) * local / state.scale}; + tool.point = raw; + tool.along_anchor = tool.side_anchor = tool.height_anchor = 4; + auto next{state}; + bend_reanchor(next, 4, 4, raw); + bend_edit(next); + } + else + { + bend_source source; + if (false == bend_source_of_selection(source)) + return; + auto const local{glm::dvec3(glm::inverse(source.transform) * glm::dvec4(Point, 1.0))}; + tool.point = local / source.scale; + tool.along_anchor = tool.side_anchor = tool.height_anchor = 4; + tool.signature.clear(); + } + tool.status = format(STR_C("Reference point %.2f %.2f %.2f in the model"), tool.point.x, tool.point.y, tool.point.z); +} + +void editor_mode::render_bend() +{ + auto &tool{m_bend}; + if (tool.edited != nullptr && tool.edited->m_editorremoved) + tool.edited = nullptr; + ImGui::PushID("bend"); + char const *alongs[] = {STR_C("start"), STR_C("model origin"), STR_C("middle"), STR_C("end"), STR_C("picked point")}; + char const *sides[] = {STR_C("model origin"), STR_C("side facing the track"), STR_C("far side"), STR_C("middle"), STR_C("picked point")}; + char const *heights[] = {STR_C("model origin"), STR_C("bottom"), STR_C("top"), STR_C("top of the edge by the track"), STR_C("picked point")}; + auto anchors = [&](bool &Changed) { + ImGui::SetNextItemWidth(170.0f); + Changed |= ImGui::Combo(STR_C("along the track"), &tool.along_anchor, alongs, IM_ARRAYSIZE(alongs)); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Reference point: the model bends about it, the line through it keeps its length, the offsets are its place")); + ImGui::SetNextItemWidth(170.0f); + Changed |= ImGui::Combo(STR_C("across"), &tool.side_anchor, sides, IM_ARRAYSIZE(sides)); + ImGui::SetNextItemWidth(170.0f); + Changed |= ImGui::Combo(STR_C("up"), &tool.height_anchor, heights, IM_ARRAYSIZE(heights)); + if (tool.along_anchor == 4 || tool.side_anchor == 4 || tool.height_anchor == 4) + { + ImGui::SetNextItemWidth(220.0f); + glm::vec3 point{tool.point}; + if (ImGui::DragFloat3(STR_C("point (x, y, z of the model)"), &point.x, 0.01f, 0.0f, 0.0f, "%.3f")) + { + tool.point = glm::dvec3(point); + Changed = true; + } + } + if (ImGui::Button(tool.picking ? STR_C("Click the point on the model...") : STR_C("Pick the point on the model"))) + tool.picking = false == tool.picking; + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("The next click in the view sets the reference point where it lands on the model")); + }; + + if (auto *sweep{tool.edited}) + { + auto state{sweep->definition()}; + glm::dvec3 low, high, shift; + auto const measured{sweep->bounds(low, high, shift)}; + auto const own{measured ? high.x - low.x : 0.0}; + auto const from{sweep->distance_at(sweep->start())}; + auto const stretch{sweep->distance_at(sweep->end()) - from}; + ImGui::Text("%s %s", sweep->name().c_str(), state.model.c_str()); + if (own > 0.0) + ImGui::TextDisabled(STR_C("%.2f m along the reference line, %d copies (the model is %.2f m)"), stretch, copies_of(*sweep, own), own); + bool changed{false}; + tool.side_anchor = state.side_anchor; + tool.height_anchor = state.height_anchor; + tool.point = state.point; + auto const side{tool.side_anchor}, height{tool.height_anchor}; + auto const point{tool.point}; + bool anchored{false}; + anchors(anchored); + if (anchored && (side != tool.side_anchor || height != tool.height_anchor || point != tool.point)) + { + bend_reanchor(state, tool.side_anchor, tool.height_anchor, tool.point); + changed = true; + } + ImGui::PushItemWidth(110.0f); + changed |= ImGui::InputDouble(STR_C("from the track axis (m, + right)"), &state.lateral, 0.05, 0.5, "%.3f"); + double overhead{state.height - kRailTop}; + if (ImGui::InputDouble(STR_C("over the rail head (m)"), &overhead, 0.01, 0.1, "%.3f")) + { + state.height = overhead + kRailTop; + changed = true; + } + double length{stretch}; + if (ImGui::InputDouble(STR_C("length (m)"), &length, 0.5, 5.0, "%.2f") && length > 0.1) + { + bend_stretch(*sweep, bend_fixed(*sweep, state.point), length, state.point, state); + changed = true; + } + ImGui::PopItemWidth(); + if (own > 0.0 && ImGui::SmallButton(STR_C("As long as the model"))) + { + bend_stretch(*sweep, bend_fixed(*sweep, state.point), own, state.point, state); + changed = true; + } + ImGui::SameLine(); + if (ImGui::SmallButton(STR_C("Along the whole track"))) + { + state.from = 0.0; + state.to = -1.0; + changed = true; + } + int mode{state.bend ? 0 : 1}; + changed |= ImGui::RadioButton(STR_C("Bent"), &mode, 0); + ImGui::SameLine(); + changed |= ImGui::RadioButton(STR_C("Repeated"), &mode, 1); + state.bend = mode == 0; + ImGui::SameLine(); + ImGui::SetNextItemWidth(80.0f); + changed |= ImGui::InputDouble(STR_C("copy every (m, 0: its length)"), &state.step, 0.0, 0.0, "%.2f"); + state.step = std::max(0.0, state.step); + changed |= ImGui::Checkbox(STR_C("Turned around"), &state.flip); + ImGui::SameLine(); + changed |= ImGui::Checkbox(STR_C("Mirrored"), &state.mirror); + ImGui::SameLine(); + changed |= ImGui::Checkbox(STR_C("Leans with the cant"), &state.tilt); + changed |= ImGui::Checkbox(STR_C("Set back by the widening of the structure gauge in the curves"), &state.widen); + if (ImGui::Checkbox(STR_C("Platform"), &state.platform)) + { + if (state.platform) + { + bend_reanchor(state, 1, 3, state.point); + platform_edge(state, state.model, kRailTop); + } + changed = true; + } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Puts the edge facing the track 1.725 m from its axis, set back by the widening of the gauge in the curves.\n" + "Stands on the plane of the rail heads carried on to its edge: lower on the inner side of a canted curve,\n" + "higher on the outer one; on the inner side also set back by the cant times the height of the edge / 1.5")); + if (changed) + bend_edit(state); + if (ImGui::Button(STR_C("Done"))) + tool.edited = nullptr; + ImGui::SameLine(); + if (ImGui::Button(STR_C("Delete"))) + { + sweep_delete(*sweep); + tool.edited = nullptr; + } + } + else + { + bend_source source; + if (bend_source_of_selection(source)) + { + void const *key{source.model != nullptr ? static_cast(source.model) : reinterpret_cast(static_cast(source.instance))}; + bend_find_tracks(glm::dvec3(source.transform[3]), key); + ImGui::Text("%s", source.file.c_str()); + if (tool.tracks.empty()) + ImGui::TextColored(ImVec4(1.0f, 0.6f, 0.3f, 1.0f), STR_C("No track within %.0f m of the model"), kBendReach); + else + { + tool.track = std::clamp(tool.track, 0, static_cast(tool.tracks.size()) - 1); + auto const label = [](std::pair const &Entry) { return format("%s (%.1f m)", Entry.first->name().empty() ? "(unnamed)" : Entry.first->name().c_str(), Entry.second); }; + ImGui::SetNextItemWidth(220.0f); + if (ImGui::BeginCombo(STR_C("track"), label(tool.tracks[tool.track]).c_str())) + { + for (int i = 0; i < static_cast(tool.tracks.size()); ++i) + if (ImGui::Selectable(label(tool.tracks[i]).c_str(), i == tool.track)) + tool.track = i; + ImGui::EndCombo(); + } + char const *axes[] = {STR_C("the one nearest the track"), "z", "x"}; + ImGui::SetNextItemWidth(170.0f); + ImGui::Combo(STR_C("axis of the model along the track"), &tool.axis, axes, IM_ARRAYSIZE(axes)); + ImGui::Checkbox(STR_C("Turned around"), &tool.turned); + bool anchored{false}; + anchors(anchored); + auto const signature{format("%p %d %d %d %d %d %d %.4f %.4f %.4f", key, tool.track, tool.axis, tool.turned ? 1 : 0, tool.along_anchor, tool.side_anchor, tool.height_anchor, tool.point.x, tool.point.y, tool.point.z)}; + if (signature != tool.signature) + { + tool.signature = signature; + tool.marker_valid = false; + sweep_node::state state; + std::vector tracks; + bend_definition(source, *tool.tracks[tool.track].first, state, tracks); + } + if (ImGui::Button(STR_C("Bend it along the track (B)"))) + bend_selection(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("The model stays where it stands and bends with the track; Ctrl+Z gives it back")); + } + } + else + { + tool.marker_valid = false; + tool.picking = false; + ImGui::TextDisabled("%s", STR_C("Select a model by a track, or click a bent one")); + } + auto *track{selected_track()}; + auto const nearby{track != nullptr ? sweeps_near(*track) : std::vector{}}; + std::vector> listed; + if (track != nullptr) + for (auto *sweep : nearby) + listed.emplace_back(sweep, 0.0); + else + for (auto *sweep : simulation::Sweeps.sequence()) + if (sweep != nullptr && false == sweep->m_editorremoved) + { + auto const distance{glm::distance(sweep->location(), glm::dvec3{Global.pCamera.Pos})}; + if (distance < 0.5 * (sweep->end() - sweep->start()) + 300.0) + listed.emplace_back(sweep, distance); + } + if (false == listed.empty()) + { + ImGui::Separator(); + ImGui::TextDisabled("%s", track != nullptr ? STR_C("Bent models by this track:") : STR_C("Bent models nearby:")); + for (auto const &entry : listed) + { + auto *sweep{entry.first}; + ImGui::PushID(sweep); + if (ImGui::Selectable(format("%s %s, %.0f m", sweep->name().c_str(), sweep->definition().model.c_str(), sweep->end() - sweep->start()).c_str(), false)) + { + tool.edited = sweep; + tool.picking = false; + } + ImGui::PopID(); + } + } + if (track != nullptr && ImGui::TreeNodeEx(STR_C("New model along the selected track"))) + { + m_sweep.open = true; + render_sweep_ui(); + ImGui::TreePop(); + } + else + m_sweep.open = false; + } + if (false == tool.status.empty()) + ImGui::TextWrapped("%s", tool.status.c_str()); + ImGui::PopID(); +} + +void editor_mode::draw_bend_overlay() const +{ + auto const &tool{m_bend}; + if (false == tool.label.empty()) + { + auto const &io{ImGui::GetIO()}; + auto *foreground{ImGui::GetForegroundDrawList()}; + auto const labelsize{ImGui::CalcTextSize(tool.label.c_str())}; + auto const detailsize{tool.details.empty() ? ImVec2(0.0f, 0.0f) : ImGui::CalcTextSize(tool.details.c_str())}; + ImVec2 const size{std::max(labelsize.x, detailsize.x), labelsize.y + (tool.details.empty() ? 0.0f : detailsize.y + 4.0f)}; + ImVec2 position{io.MousePos.x + 18.0f, io.MousePos.y + 18.0f}; + position.x = std::min(position.x, io.DisplaySize.x - size.x - 10.0f); + position.y = std::min(position.y, io.DisplaySize.y - size.y - 10.0f); + foreground->AddRectFilled(ImVec2(position.x - 6.0f, position.y - 4.0f), ImVec2(position.x + size.x + 6.0f, position.y + size.y + 4.0f), IM_COL32(0, 0, 0, 170), 4.0f); + foreground->AddText(position, IM_COL32(40, 220, 255, 255), tool.label.c_str()); + if (false == tool.details.empty()) + foreground->AddText(ImVec2(position.x, position.y + labelsize.y + 4.0f), IM_COL32(255, 255, 255, 235), tool.details.c_str()); + } + if (auto const *model{dynamic_cast(m_node)}; model != nullptr && tool.edited == nullptr && false == tool.tracks.empty() && tool.tracks_for == static_cast(model)) + { + screen_projection const projection; + ImVec2 at; + if (projection.project(model->location(), at)) + { + auto const text{format(STR_C("B: bend along %s"), tool.tracks.front().first->name().c_str())}; + auto *foreground{ImGui::GetForegroundDrawList()}; + auto const size{ImGui::CalcTextSize(text.c_str())}; + foreground->AddRectFilled(ImVec2(at.x + 10.0f, at.y - size.y - 14.0f), ImVec2(at.x + size.x + 22.0f, at.y - 6.0f), IM_COL32(0, 0, 0, 150), 4.0f); + foreground->AddText(ImVec2(at.x + 16.0f, at.y - size.y - 10.0f), IM_COL32(40, 220, 255, 255), text.c_str()); + } + } + glm::dvec3 marker; + if (tool.edited != nullptr && false == tool.edited->m_editorremoved) + marker = bend_marker(*tool.edited); + else if (tool.marker_valid) + marker = tool.marker; + else + return; + screen_projection const projection; + ImVec2 screen; + if (false == projection.project(marker, screen)) + return; + auto *drawlist{ImGui::GetBackgroundDrawList()}; + if (tool.over_marker || tool.dragging != 0) + drawlist->AddCircleFilled(screen, 9.0f, IM_COL32(40, 220, 255, 120), 16); + drawlist->AddCircle(screen, 9.0f, IM_COL32(40, 220, 255, 255), 16, 2.5f); + drawlist->AddLine(ImVec2(screen.x - 14.0f, screen.y), ImVec2(screen.x + 14.0f, screen.y), IM_COL32(40, 220, 255, 255), 2.0f); + drawlist->AddLine(ImVec2(screen.x, screen.y - 14.0f), ImVec2(screen.x, screen.y + 14.0f), IM_COL32(40, 220, 255, 255), 2.0f); +} + +bool editor_mode::bend_drag_start(int const Mods) +{ + auto &tool{m_bend}; + auto *sweep{tool.edited}; + if (sweep == nullptr || sweep->m_editorremoved || ImGui::GetIO().WantCaptureMouse) + return false; + auto const marker{bend_marker(*sweep)}; + screen_projection const projection; + ImVec2 screen; + if (false == projection.project(marker, screen)) + return false; + auto const &mouse{ImGui::GetIO().MousePos}; + if ((mouse.x - screen.x) * (mouse.x - screen.x) + (mouse.y - screen.y) * (mouse.y - screen.y) > 14.0f * 14.0f) + return false; + tool.dragging = (Mods & GLFW_MOD_SHIFT) != 0 ? 2 : (Mods & GLFW_MOD_CONTROL) != 0 ? 3 : 1; + tool.drag_state = sweep->definition(); + tool.drag_anchor = marker; + double lateral; + tool.drag_station = sweep->project(marker, lateral); + tool.drag_label.clear(); + return true; +} + +void editor_mode::bend_drag_update() +{ + auto &tool{m_bend}; + tool.label.clear(); + tool.details.clear(); + tool.hover = nullptr; + tool.over_marker = false; + auto const &io{ImGui::GetIO()}; + if (auto *model{dynamic_cast(m_node)}; model != nullptr && tool.edited == nullptr && false == model->from_template() && scene::Layers.editable(model)) + bend_find_tracks(model->location(), model); + if (tool.dragging == 0 && false == io.WantCaptureMouse) + { + if (tool.picking) + tool.label = STR("Click: the reference point, where it lands on the model"); + else + { + if (auto *sweep{tool.edited}; sweep != nullptr && false == sweep->m_editorremoved) + { + screen_projection const projection; + ImVec2 screen; + if (projection.project(bend_marker(*sweep), screen)) + tool.over_marker = (io.MousePos.x - screen.x) * (io.MousePos.x - screen.x) + (io.MousePos.y - screen.y) * (io.MousePos.y - screen.y) < 14.0f * 14.0f; + } + if (tool.over_marker) + { + tool.label = STR("Drag: offset from the track"); + tool.details = STR("Shift: height Ctrl: along the track"); + } + else if (ui()->mode() == nodebank_panel::MODIFY && m_input.mouse.button(GLFW_MOUSE_BUTTON_RIGHT) != GLFW_PRESS) + { + tool.hover = sweep_under(Global.pCamera.Pos + GfxRenderer->Mouse_Position()); + if (tool.hover != nullptr && tool.hover != tool.edited) + { + tool.label = STR("Click: edit the bent model"); + tool.details = format("%s %s, %.1f m", tool.hover->name().c_str(), tool.hover->definition().model.c_str(), tool.hover->distance_at(tool.hover->end()) - tool.hover->distance_at(tool.hover->start())); + } + } + } + } + if (tool.dragging == 0) + return; + if (false == tool.drag_label.empty()) + tool.label = tool.drag_label; + auto *sweep{tool.edited}; + if (sweep == nullptr || sweep->m_editorremoved) + { + tool.dragging = 0; + return; + } + if (false == ImGui::GetIO().MouseDown[0]) + { + tool.dragging = 0; + tool.drag_label.clear(); + if (sweep->definition() == tool.drag_state) + return; + EditorSnapshot snap; + snap.action = EditorSnapshot::Action::Other; + snap.node_name = sweep->name(); + snap.sweeps.emplace_back(sweep, tool.drag_state); + trim_history(); + m_history.push_back(std::move(snap)); + g_redo.clear(); + sweep->mark_dirty(); + return; + } + screen_projection const projection; + auto const &mouse{ImGui::GetIO().MousePos}; + auto const step{0.01}; + auto const snap = [&](double const Value) { return std::round(Value / step) * step; }; + auto state{tool.drag_state}; + if (tool.dragging == 2) + { + glm::dvec3 origin, direction; + projection.ray(mouse, origin, direction); + glm::dvec3 normal{Global.pCamera.Pos.x - tool.drag_anchor.x, 0.0, Global.pCamera.Pos.z - tool.drag_anchor.z}; + if (glm::length(normal) < 1e-6) + return; + normal = glm::normalize(normal); + auto const facing{glm::dot(direction, normal)}; + if (std::abs(facing) < 1e-6) + return; + auto const hit{origin + direction * (glm::dot(tool.drag_anchor - origin, normal) / facing)}; + state.height = kRailTop + snap(tool.drag_state.height - kRailTop + hit.y - tool.drag_anchor.y); + tool.drag_label = format(STR_C("%.2f m over the rail head"), state.height - kRailTop); + } + else + { + glm::dvec3 point; + if (false == projection.on_level(mouse, tool.drag_anchor.y, point)) + return; + double lateral; + auto const station{sweep->project(point, lateral)}; + if (tool.dragging == 1) + { + auto const at{sweep->frame_at(station)}; + state.lateral = snap(lateral - sweep->setback(at)); + if (std::abs(state.lateral) < step) + state.lateral = std::copysign(step, tool.drag_state.lateral); + tool.drag_label = format(STR_C("%.2f m from the track axis"), std::abs(state.lateral)); + } + else + { + auto const shift{snap(station - tool.drag_station)}; + state.from = tool.drag_state.from + shift; + if (tool.drag_state.to >= 0.0) + state.to = tool.drag_state.to + shift; + tool.drag_label = format(STR_C("%+.2f m along the track"), shift); + } + } + if (false == (state == sweep->definition())) + sweep->define(state); +} + +sweep_node *editor_mode::sweep_under(glm::dvec3 const &Point) const +{ + sweep_node *best{nullptr}; + auto bestdistance{std::numeric_limits::max()}; + for (auto *sweep : simulation::Sweeps.sequence()) + { + if (sweep == nullptr || sweep->m_editorremoved) + continue; + auto const &state{sweep->definition()}; + if (plan_distance(Point, sweep->location()) > 0.5 * sweep->length() + std::abs(state.lateral) + 30.0) + continue; + double lateral; + auto const station{sweep->project(Point, lateral)}; + if (station < sweep->start() - 0.5 || station > sweep->end() + 0.5) + continue; + glm::dvec3 low, high, shift; + if (false == sweep->bounds(low, high, shift)) + continue; + auto const at{sweep->frame_at(station)}; + auto const across{lateral - state.lateral - sweep->setback(at) - shift.y}; + auto const up{Point.y - at.position.y - state.height - sweep->rise(at) - shift.z}; + if (across < low.y - 0.3 || across > high.y + 0.3 || up < low.z - 0.3 || up > high.z + 0.3) + continue; + auto const distance{std::abs(across - 0.5 * (low.y + high.y))}; + if (distance < bestdistance) + { + bestdistance = distance; + best = sweep; + } + } + return best; +} + +bool editor_mode::bend_click() +{ + auto &tool{m_bend}; + if (tool.hover == nullptr || tool.hover == tool.edited || tool.over_marker) + return false; + tool.edited = tool.hover; + tool.picking = false; + tool.signature.clear(); + m_node = nullptr; + m_dragging = false; + select_include(0); + ui()->set_node(nullptr); + ui()->expand_bend(); + return true; +} + +bool editor_mode::bend_shortcut() +{ + auto &tool{m_bend}; + bend_source source; + if (false == bend_source_of_selection(source)) + return false; + void const *key{source.model != nullptr ? static_cast(source.model) : reinterpret_cast(static_cast(source.instance))}; + bend_find_tracks(glm::dvec3(source.transform[3]), key); + if (tool.tracks.empty()) + { + ui()->set_status(format(STR_C("No track within %.0f m of the model"), kBendReach), true); + return true; + } + bend_selection(); + ui()->expand_bend(); + return true; +} diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 2e78c5ecf..fe4db564d 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -81,6 +81,99 @@ void item_tooltip(char const *Text) ImGui::SetTooltip("%s", STR_C(Text)); } +// the curve a track ends with at Joint, as it goes on beyond the joint, and a transition curve leading out of it to the straight +struct easing +{ + double curvature{0.0}; // positive turning from x towards z + double length{0.0}; + glm::dvec3 end{0.0}; + glm::dvec2 direction{0.0}; + std::vector pieces; +}; + +easing ease_out_of(TTrack const &Neighbour, glm::dvec3 const &Joint, double const Grade, double const Speed, alignment::limits const &Limits) +{ + easing result; + for (auto const &path : Neighbour.m_paths) + for (auto const atend : {false, true}) + { + if (glm::distance(path.points[atend ? segment_data::point::end : segment_data::point::start], Joint) > 0.05) + continue; + if (path.points[segment_data::point::control1] == glm::dvec3{} && path.points[segment_data::point::control2] == glm::dvec3{}) + return result; + bezier const curve{path}; + auto const first{curve.first(atend ? 1.0 : 0.0)}; + auto const second{curve.second(atend ? 1.0 : 0.0)}; + auto const speed{std::hypot(first.x, first.z)}; + if (speed < 1e-9) + return result; + auto curvature{(first.x * second.z - first.z * second.x) / (speed * speed * speed)}; + glm::dvec2 direction{first.x / speed, first.z / speed}; + double roll{path.rolls[1]}; + if (false == atend) + { + curvature = -curvature; + direction = -direction; + roll = -path.rolls[0]; + } + result.curvature = curvature; + if (std::abs(curvature) < 1e-4) + return result; + result.length = std::max(20.0, alignment::recommend(Speed, 1.0 / std::abs(curvature), Limits).transition); + auto const count{static_cast(std::ceil(result.length / 10.0))}; + auto const piece{result.length / count}; + glm::dvec3 point{Joint}; + for (int i = 0; i < count; ++i) + { + segment_data part; + part.points[segment_data::point::start] = point; + auto const from{direction}; + int const steps{static_cast(std::ceil(piece / 0.05))}; + auto const step{piece / steps}; + for (int j = 0; j < steps; ++j) + { + auto const along{i * piece + (j + 0.5) * step}; + auto const angle{curvature * (1.0 - along / result.length) * step}; + auto const half{turned(direction, angle * 0.5)}; + point += glm::dvec3{half.x * step, Grade * step, half.y * step}; + direction = turned(direction, angle); + } + part.points[segment_data::point::end] = point; + part.points[segment_data::point::control1] = glm::dvec3{from.x, Grade, from.y} * (piece / 3.0); + part.points[segment_data::point::control2] = -glm::dvec3{direction.x, Grade, direction.y} * (piece / 3.0); + part.rolls = {static_cast(roll * (1.0 - i * piece / result.length)), static_cast(roll * (1.0 - (i + 1) * piece / result.length))}; + result.pieces.push_back(part); + } + result.end = point; + result.direction = direction; + return result; + } + return result; +} + +segment_data turned_around(segment_data const &Path) +{ + segment_data result{Path}; + result.points[segment_data::point::start] = Path.points[segment_data::point::end]; + result.points[segment_data::point::end] = Path.points[segment_data::point::start]; + result.points[segment_data::point::control1] = Path.points[segment_data::point::control2]; + result.points[segment_data::point::control2] = Path.points[segment_data::point::control1]; + result.rolls = {-Path.rolls[1], -Path.rolls[0]}; + return result; +} + +// curvature of the shape at Chainage, positive turning from x towards z +double curvature_at(alignment::result const &Shape, double const Chainage) +{ + auto const a{std::clamp(Chainage - 0.5, 0.0, Shape.length)}; + auto const b{std::clamp(Chainage + 0.5, 0.0, Shape.length)}; + if (b - a < 1e-3) + return 0.0; + auto const from{plan_of(alignment::evaluate(Shape, a).direction)}; + auto const to{plan_of(alignment::evaluate(Shape, b).direction)}; + return signed_angle(glm::normalize(from), glm::normalize(to)) / (b - a); +} + // circular curve from a point along a direction, cut into pieces of 90 degrees at most. Side: 1 to the left, -1 to the right void compound_from(editor_track::curve const &Curve, alignment::vertex &Vertex) { @@ -477,7 +570,7 @@ std::array const &editor_mode::track_modes() {"Turntable", "U", track_tab::turntable, "Places a turntable, leads tracks out of it and fits the tracks around to it"}, {"Straight", "G", track_tab::straights, "The whole straight through the selected path: drag its ends or the middle, break it, shift it"}, {"Curve", "C", track_tab::route, "The line through the path, switch to switch: vertices with the radii, transitions and cant of the curves"}, - {"Objects", "B", track_tab::lineside, "Along the track: platforms and other models, hectometre posts, fouling point markers, a parallel track, a vehicle to drive"}, + {"Objects", "B", track_tab::lineside, "Along the track: hectometre posts, fouling point markers, a parallel track, a vehicle to drive"}, {"Profile", "P", track_tab::profile, "Vertical profile (grade line) along the line"}, {"Speed", "V", track_tab::speed, "Speed limits of the paths against the speed their geometry allows"}, {"Joints", "J", track_tab::joints, "Ends of the paths which almost meet, steps, kinks, jumps of the cant and of the grade at the joints"}, @@ -612,8 +705,6 @@ std::string editor_mode::track_mode_name() const case track_tab::speed: return STR_C("Speed check: LMB on a row shows the path"); case track_tab::joints: return STR_C("Joints: LMB on a row shows the place"); case track_tab::lineside: - if (m_lineside_tab == 0) - return m_sweep.dragging ? STR_C("Model along the track: release where it ends") : STR_C("Model along the track: LMB by the track where it starts, drag to the end"); return STR_C("Objects along the track"); case track_tab::infra: return STR_C("Infrastructure along the track"); case track_tab::turntable: @@ -3310,6 +3401,13 @@ void editor_mode::delete_selected_track() ui()->set_status(STR_C("The switch is replaced by its main track, Shift+Del removes all of it"), false); } push_track_snapshot({}, created, {track}); + // the model and the events of a turntable can't stay without its track + if (track->eType == tt_Table) + for (auto const instance : turntable_includes(*track)) + { + scene::Layers.removed(instance, true); + m_history.back().instances.push_back(instance); + } if (std::find(m_route.chain.tracks.begin(), m_route.chain.tracks.end(), track) != m_route.chain.tracks.end()) m_route = {}; m_node = nullptr; @@ -3368,8 +3466,6 @@ std::vector editor_mode::track_key_hints(bool const All) hints = {{"Drag a point", "in the profile window: changes the grade"}, {"Double click", "on the line: adds a point"}, {"Apply", "writes the heights into the tracks"}}; else if (m_track_window_open && m_track_tab == track_tab::speed) hints = {{"LMB on a row", "show the path"}}; - else if (m_track_window_open && m_track_tab == track_tab::lineside && m_lineside_tab == 0) - hints = {{"LMB by the track", "where it starts, the side of the track it goes on"}, {"Drag", "to where it ends, a click: one as long as the original"}, {"Release", "lays it"}, {"LMB away from the track", "selects another track"}}; else if (m_track_window_open && m_track_tab == track_tab::lineside) hints = {{"LMB on a track", "the line the objects go along"}}; else if (m_track_window_open && m_track_tab == track_tab::joints) @@ -4118,12 +4214,6 @@ std::vector editor_mode::lay_pieces(std::vector const Length = 0.0; if (Points.size() < 2) return {}; - alignment::design design; - design.norms = m_route.design.norms; - design.shape = m_route.design.shape; - design.speed = tool.style.velocity > 0.0 ? tool.style.velocity : 100.0; - design.start = Points.front(); - design.end = Points.back(); auto const startdirection{tool.start.track != nullptr ? -plan_of(tool.start.direction) : plan_of(Points[1] - Points[0])}; auto const enddirection{End.track != nullptr ? plan_of(End.direction) : plan_of(Points.back() - Points[Points.size() - 2])}; if (glm::length(startdirection) < 1e-3 || glm::length(enddirection) < 1e-3) @@ -4131,8 +4221,75 @@ std::vector editor_mode::lay_pieces(std::vector const Error = STR_C("Two points lie on one another"); return {}; } - design.start_direction = glm::normalize(startdirection); - design.end_direction = glm::normalize(enddirection); + alignment::design design; + auto const shape{lay_shape(Points, glm::normalize(startdirection), glm::normalize(enddirection), design)}; + if (false == shape.valid) + { + Error = shape.errors.empty() ? std::string{STR_C("The track can't be laid through these points")} : shape.errors.front(); + return {}; + } + Error = shape.warnings.empty() ? std::string{} : shape.warnings.front(); + auto const count = [&](alignment::result const &Shape, alignment::design const &Design) { + return std::max(alignment::minimum_pieces(Shape, Design), static_cast(std::ceil(Shape.length / std::max(5.0, tool.piece_length)))); + }; + // the curvature of the track laid has to go on from the one of the track it joins, a jump gets a transition curve between them + auto const grade{(Points.back().y - Points.front().y) / std::max(1.0, plan_distance(Points.front(), Points.back()))}; + auto const eased = [&](editor_track::snap_target const &Joint, double const Chainage, double const Sign) { + if (Joint.track == nullptr || Joint.track->eType != tt_Normal) + return easing{}; + auto result{ease_out_of(*Joint.track, Joint.position, grade * Sign, design.speed, design.norms)}; + auto const own{Sign * curvature_at(shape, Chainage)}; + if (std::abs(own - result.curvature) <= 0.05 * std::abs(result.curvature)) + result.pieces.clear(); + return result; + }; + auto const in{eased(tool.start, 0.0, 1.0)}; + auto const out{eased(End, shape.length, -1.0)}; + if (false == in.pieces.empty() || false == out.pieces.empty()) + { + auto points{Points}; + auto starting{design.start_direction}; + auto ending{design.end_direction}; + if (false == in.pieces.empty()) + { + points.front() = in.end; + starting = in.direction; + } + if (false == out.pieces.empty()) + { + points.back() = out.end; + ending = -out.direction; + } + alignment::design easeddesign; + auto const easedshape{lay_shape(points, starting, ending, easeddesign)}; + if (easedshape.valid) + { + auto result{in.pieces}; + auto const middle{alignment::pieces(easedshape, easeddesign, count(easedshape, easeddesign))}; + result.insert(result.end(), middle.begin(), middle.end()); + for (auto piece{out.pieces.rbegin()}; piece != out.pieces.rend(); ++piece) + result.push_back(turned_around(*piece)); + Length = easedshape.length + (in.pieces.empty() ? 0.0 : in.length) + (out.pieces.empty() ? 0.0 : out.length); + Error = easedshape.warnings.empty() ? std::string{} : easedshape.warnings.front(); + return result; + } + Error = STR("The curvature changes abruptly where the track joins, there's no room for a transition curve") + (easedshape.errors.empty() ? std::string{} : ": " + easedshape.errors.front()); + } + Length = shape.length; + return alignment::pieces(shape, design, count(shape, design)); +} + +alignment::result editor_mode::lay_shape(std::vector const &Points, glm::dvec2 const &Startdirection, glm::dvec2 const &Enddirection, alignment::design &design) const +{ + auto const &tool{m_lay}; + design = {}; + design.norms = m_route.design.norms; + design.shape = m_route.design.shape; + design.speed = tool.style.velocity > 0.0 ? tool.style.velocity : 100.0; + design.start = Points.front(); + design.end = Points.back(); + design.start_direction = Startdirection; + design.end_direction = Enddirection; alignment::vertex corner; corner.radius = std::max(1.0, tool.radius); @@ -4171,16 +4328,7 @@ std::vector editor_mode::lay_pieces(std::vector const design.vertices.back().offset = std::max(1.0, glm::dot(plan_of(Points.back() - Points[Points.size() - 2]), design.end_direction)); } } - auto const shape{alignment::compute(design)}; - if (false == shape.valid) - { - Error = shape.errors.empty() ? std::string{STR_C("The track can't be laid through these points")} : shape.errors.front(); - return {}; - } - Error = shape.warnings.empty() ? std::string{} : shape.warnings.front(); - Length = shape.length; - auto const count{std::max(alignment::minimum_pieces(shape, design), static_cast(std::ceil(shape.length / std::max(5.0, tool.piece_length))))}; - return alignment::pieces(shape, design, count); + return alignment::compute(design); } void editor_mode::lay_click() @@ -4232,6 +4380,23 @@ void editor_mode::lay_finish(editor_track::snap_target const &End) tool.status = format(STR_C("Laid %zu paths, %.1f m"), created.size(), length); if (false == error.empty()) tool.status += "\n" + error; + { + std::vector> run; + if (tool.start.track != nullptr && tool.start.track->eType == tt_Normal) + run.emplace_back(tool.start.track, tool.start.point.kind == editor_track::point_kind::end); + for (auto *track : created) + run.emplace_back(track, true); + if (End.track != nullptr && End.track->eType == tt_Normal) + run.emplace_back(End.track, End.point.kind == editor_track::point_kind::start); + editor_track::curve curve; + if (run.size() > created.size() && editor_track::analyse_curve(run, m_route.design.norms.gauge, curve) && curve.compound) + for (std::size_t i = 1; i < curve.arcs.size(); ++i) + if (curve.arcs[i].transition < 1.0) + { + tool.status += "\n" + format(STR_C("Compound curve: R %.0f m meets R %.0f m with no transition curve between them"), curve.arcs[i - 1].radius, curve.arcs[i].radius); + break; + } + } if (scene::Layers.active() == null_handle && style == nullptr) tool.status += "\nThe scenery isn't opened for editing, the new track won't be saved"; WriteLog("Editor: " + tool.status, logtype::generic); diff --git a/application/editormodetrackux.cpp b/application/editormodetrackux.cpp index d7472c61e..22140d33d 100644 --- a/application/editormodetrackux.cpp +++ b/application/editormodetrackux.cpp @@ -232,8 +232,6 @@ editor_mode::track_intent editor_mode::track_intent_at(int const Mods) } if (m_track_tab == track_tab::turntable) return turntable_intent(ground, shift); - if (m_track_tab == track_tab::lineside && sweep_grabs(ground)) - return make(kind::sweep, "Press: where the model starts, drag to its end"); if (m_track_tab == track_tab::path) { if (shift && control && m_hover.track != nullptr && rail(*m_hover.track)) @@ -598,11 +596,6 @@ void editor_mode::render_track_context() show_track_tab(track_tab::lineside); m_parallel.expand = true; } - if (ImGui::MenuItem(STR_C("Model along the track"))) - { - show_track_tab(track_tab::lineside); - m_sweep.expand = true; - } if (ImGui::MenuItem(STR_C("Place a vehicle here"))) { show_track_tab(track_tab::lineside); @@ -1332,8 +1325,7 @@ void editor_mode::render_lineside_ui() bool *expand; std::function render; }; - std::array const tabs{{ - {"Platforms and models", &m_sweep.open, &m_sweep.expand, [this]() { render_sweep_ui(); }}, + std::array const tabs{{ {"Hectometre posts", &m_hekto.open, &m_hekto.expand, [this]() { render_hekto_ui(); }}, {"Fouling points", &m_fouling.open, &m_fouling.expand, [this]() { render_fouling_ui(); }}, {"Parallel track", &m_parallel.open, &m_parallel.expand, [this]() { render_parallel_ui(); }}, diff --git a/application/editormodeturntable.cpp b/application/editormodeturntable.cpp index 25cfb9875..f92b1b15d 100644 --- a/application/editormodeturntable.cpp +++ b/application/editormodeturntable.cpp @@ -27,7 +27,9 @@ http://mozilla.org/MPL/2.0/. #include #include #include +#include #include +#include #include #include #include @@ -536,6 +538,26 @@ void editor_mode::turntable_find_fits() tool.status = tool.fits.empty() ? format(STR_C("No free ends within %.0f m of the rim"), tool.reach) : std::string{}; } +std::vector editor_mode::turntable_includes(TTrack const &Table) +{ + scan_turntables(); + std::vector result; + for (scene::instance_handle handle = 1; handle <= scene::Layers.instance_count(); ++handle) + { + if (false == scene::Layers.tracked(handle)) + continue; + auto const &included{scene::Layers.instance(handle)}; + if (included.removed || included.dead || included.file == nullptr) + continue; + auto const kind{std::find_if(m_turntable.templates.begin(), m_turntable.templates.end(), [&](turntable_template const &Template) { return normalized(Template.file) == normalized(*included.file); })}; + std::string target; + std::vector values; + if (kind != m_turntable.templates.end() && editor_includes::parse_directive(scene::Layers.directive(handle), target, values) && kind->track <= static_cast(values.size()) && ToLower(values[kind->track - 1]) == Table.name()) + result.push_back(handle); + } + return result; +} + void editor_mode::turntable_build(std::vector const &Fits) { auto &tool{m_turntable}; @@ -1023,3 +1045,122 @@ void editor_mode::draw_turntable_overlay() const label(projection, cursor, format("%.1f deg", yaw)); } } + +bool editor_mode::turntable_controls(std::vector &Rootstatements) +{ + if (scene::Layers.empty()) + return false; + std::string root{scene::Layers.layer(scene::layer_handle{1}).name}; + if (auto const slash{root.find_last_of("/\\")}; slash != std::string::npos) + root.erase(0, slash + 1); + if (auto const dot{root.rfind('.')}; dot != std::string::npos) + root.erase(dot); + if (root.empty()) + return false; + auto const file{root + "_obrotnice.scm"}; + std::ostringstream text; + auto tables{0}; + for (auto const *table : simulation::Paths.sequence()) + { + if (table == nullptr || table->eType != tt_Table || table->m_editorremoved || table->m_paths.empty() || table->name().empty()) + continue; + auto const &name{table->name()}; + std::vector slots; + std::string events; + scan_turntables(); + for (scene::instance_handle handle = 1; handle <= scene::Layers.instance_count() && slots.empty(); ++handle) + { + if (false == scene::Layers.tracked(handle)) + continue; + auto const &included{scene::Layers.instance(handle)}; + if (included.removed || included.dead || included.file == nullptr) + continue; + auto const kind{std::find_if(m_turntable.templates.begin(), m_turntable.templates.end(), [&](turntable_template const &Template) { return normalized(Template.file) == normalized(*included.file); })}; + if (kind == m_turntable.templates.end() || kind->angles == 0) + continue; + std::string target; + std::vector values; + if (false == editor_includes::parse_directive(scene::Layers.directive(handle), target, values) || kind->track > static_cast(values.size()) || ToLower(values[kind->track - 1]) != name) + continue; + { + std::ifstream input{Global.asCurrentSceneryPath + kind->file, std::ios_base::binary}; + events.assign(std::istreambuf_iterator(input), std::istreambuf_iterator()); + events = ToLower(events); + std::replace_if(events.begin(), events.end(), [](char const Character) { return Character == '\t' || Character == '\r' || Character == '\n'; }, ' '); + auto const parameter{"(p" + std::to_string(kind->track) + ")"}; + for (auto at{events.find(parameter)}; at != std::string::npos; at = events.find(parameter, at + name.size())) + events.replace(at, parameter.size(), name); + } + std::vector seen; + for (int i = 0; i < kind->positions && kind->angles - 1 + i < static_cast(values.size()); ++i) + if (double angle; numeric(values[kind->angles - 1 + i], angle) && std::none_of(seen.begin(), seen.end(), [&](double const Other) { return std::abs(circular(Other - angle)) < 0.01; })) + { + seen.push_back(angle); + slots.push_back(i + 1); + } + } + if (slots.empty()) + for (int position = 1; position <= 64; ++position) + slots.push_back(position); + std::vector positions; + for (auto const position : slots) + { + // the events of a turntable placed in this session get loaded only with the scenery loaded again + auto const event{name + "_tor" + std::to_string(position)}; + if (events.find(" " + event + " ") != std::string::npos || simulation::Events.FindEvent(event) != nullptr) + positions.push_back(position); + } + if (positions.size() < 2) + continue; + ++tables; + auto const count{positions.size()}; + auto const centre{centre_of(*table)}; + auto const at{format("%.3f %.3f %.3f", centre.x, centre.y, centre.z)}; + text << "node -1 0 " << name << "_keylock memcell " << at << " none 0 0 none endmemcell\r\n"; + text << "event " << name << "_lock updatevalues 0 " << name << "_keylock * 1 * endevent\r\n"; + text << "event " << name << "_unlock updatevalues 1.5 " << name << "_keylock * 0 * endevent\r\n"; + for (auto const forward : {true, false}) + { + auto const step{std::string{forward ? "_next" : "_prev"}}; + text << "event " << name << step << " multiple 0 " << name << "_keylock " << name << "_lock " << name << "_unlock " << name << step << '0'; + for (auto const position : positions) + text << ' ' << name << step << position; + text << " condition memcompare * 0 * endevent\r\n"; + // the turntable starts with no position set, the first step takes it to the first one + text << "event " << name << step << "0 multiple 0 " << name << ' ' << name << "_tor" << positions.front() << " condition memcompare * 0 * endevent\r\n"; + for (std::size_t i = 0; i < count; ++i) + { + auto const target{positions[forward ? (i + 1) % count : (i + count - 1) % count]}; + text << "event " << name << step << positions[i] << " multiple 0 " << name << ' ' << name << "_tor" << target << " condition memcompare * " << positions[i] << " * endevent\r\n"; + } + } + text << "node -1 0 " << name << "_key eventlauncher " << at << " 150 t 0 " << name << "_next " << name << "_prev end\r\n"; + } + auto const path{Global.asCurrentSceneryPath + file}; + std::error_code error; + auto const exists{std::filesystem::exists(path, error)}; + if (tables == 0 && false == exists) + return false; + auto const content{"// made by the scenery editor on each save: T turns each turntable to its next position, Shift+T to the previous one\r\n" + text.str()}; + std::string current; + { + std::ifstream input{path, std::ios_base::binary}; + current.assign(std::istreambuf_iterator(input), std::istreambuf_iterator()); + } + if (current != content) + { + std::ofstream output{path, std::ios_base::binary | std::ios_base::trunc}; + output << content; + } + auto included{m_turntable_included}; + for (std::size_t handle = 1; handle <= scene::Layers.size() && false == included; ++handle) + { + auto name{scene::Layers.layer(static_cast(handle)).name}; + std::replace(name.begin(), name.end(), '\\', '/'); + included = ToLower(name) == ToLower(file) || ToLower(name).ends_with("/" + ToLower(file)); + } + if (included) + return false; + Rootstatements.push_back("include " + file + " end"); + return true; +} diff --git a/application/editormodevehicle.cpp b/application/editormodevehicle.cpp index f2c39b1fb..4abc7ce2f 100644 --- a/application/editormodevehicle.cpp +++ b/application/editormodevehicle.cpp @@ -183,10 +183,15 @@ void editor_mode::render_vehicle_ui() { auto &tool{m_vehicle}; auto *selected{selected_track()}; - if (selected != nullptr && selected != tool.track) - vehicle_start(*selected, bezier{selected->m_paths.front()}.point(0.5)); + if (selected != nullptr && selected == tool.track && m_hover.track == selected && ImGui::IsMouseClicked(0) && false == ImGui::GetIO().WantCaptureMouse) + vehicle_start(*selected, m_hover.point); + else if (selected != nullptr && selected != tool.track) + vehicle_start(*selected, m_hover.track == selected ? m_hover.point : bezier{selected->m_paths.front()}.point(0.5)); if (tool.track == nullptr) + { + ImGui::TextColored(ImVec4(1.0f, 0.8f, 0.3f, 1.0f), "%s", STR_C("LMB on a track: where the vehicle stands")); return; + } if (tool.bank == nullptr) { tool.bank = std::make_shared(); diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index d744b9945..4f7ede62c 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -54,30 +54,30 @@ void editor_ui::render_mode_options(nodebank_panel::edit_mode const Mode) switch (Mode) { case nodebank_panel::MODIFY: - ImGui::TextDisabled("LMB: select node F: focus End: drop to ground Del: delete"); + ImGui::TextDisabled(STR_C("LMB: select node F: focus End: drop to ground Del: delete")); break; case nodebank_panel::COPY: - ImGui::TextDisabled("LMB: copy the clicked model to the node bank"); + ImGui::TextDisabled(STR_C("LMB: copy the clicked model to the node bank")); break; case nodebank_panel::ADD: { - ImGui::TextDisabled("LMB: insert a model at the cursor"); - ImGui::Checkbox("Random model from set", &m_insertrandom); + ImGui::TextDisabled(STR_C("LMB: insert a model at the cursor")); + ImGui::Checkbox(STR_C("Random model from set"), &m_insertrandom); if (m_insertrandom) { - m_nodebankpanel.set_combo("Set##insert", m_insertset, nullptr); + m_nodebankpanel.set_combo(STR_C("Set##insert"), m_insertset, nullptr); auto const count{m_nodebankpanel.set_entries(m_insertset).size()}; - ImGui::TextDisabled("%zu templates in set%s", count, count == 0 ? ", the node bank selection is used" : ""); + ImGui::TextDisabled(STR_C("%zu templates in set%s"), count, count == 0 ? ", the node bank selection is used" : ""); } else { - ImGui::TextDisabled("Inserts the template selected in the node bank"); + ImGui::TextDisabled(STR_C("Inserts the template selected in the node bank")); } m_functionspanel.render_controls(); break; } case nodebank_panel::BRUSH: - ImGui::TextDisabled("Hold LMB: paint models along the cursor path"); + ImGui::TextDisabled(STR_C("Hold LMB: paint models along the cursor path")); m_brushobjects.render_options(m_nodebankpanel); m_functionspanel.render_controls(); break; @@ -92,22 +92,32 @@ void editor_ui::render_mode_options(nodebank_panel::edit_mode const Mode) void editor_ui::render_header_sections() { - if (ImGui::CollapsingHeader("Gizmo", ImGuiTreeNodeFlags_DefaultOpen)) + if (ImGui::CollapsingHeader(STR_C("Gizmo"), ImGuiTreeNodeFlags_DefaultOpen)) { if (m_gizmooptions) m_gizmooptions(); } - if (ImGui::CollapsingHeader("Node properties", ImGuiTreeNodeFlags_DefaultOpen)) + if (ImGui::CollapsingHeader(STR_C("Node properties"), ImGuiTreeNodeFlags_DefaultOpen)) { ImGui::Indent(); m_itempropertiespanel.render_body(); ImGui::Unindent(); } - if (ImGui::CollapsingHeader("Array")) + if (ImGui::CollapsingHeader(STR_C("Array"))) { if (m_arrayoptions) m_arrayoptions(); } + if (m_bendexpand) + { + ImGui::SetNextItemOpen(true); + m_bendexpand = false; + } + if (ImGui::CollapsingHeader(STR_C("Bend along the track"))) + { + if (m_bendoptions) + m_bendoptions(); + } } void editor_ui::render_menu_contents() @@ -118,9 +128,13 @@ void editor_ui::render_menu_contents() m_newscenery(); if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", STR_C("The editor starts again with the wizard of a new scenery: its name and its centre on the map")); + if (ImGui::MenuItem(STR_C("Open scenery...")) && m_openscenery) + m_openscenery(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("The editor starts again with another scenery of the scenery folder")); // changes go to the scenery files only if the scenery was loaded with its sources tracked auto const editsession{false == scene::Layers.empty()}; - if (ImGui::MenuItem(STR_C("Save"), "Ctrl+S", false, editsession) && m_save) + if (ImGui::MenuItem(STR_C("Save"), STR_C("Ctrl+S"), false, editsession) && m_save) { m_save(); } @@ -128,7 +142,7 @@ void editor_ui::render_menu_contents() { ImGui::SetTooltip("%s", STR_C("Start the simulator with -edit to save changes to the scenery files")); } - if (ImGui::MenuItem(STR_C("Export scenery dump"), "Ctrl+Shift+F11") && m_export) + if (ImGui::MenuItem(STR_C("Export scenery dump"), STR_C("Ctrl+Shift+F11")) && m_export) { m_export(); } @@ -174,6 +188,8 @@ void editor_ui::render_rotation_controls() void editor_ui::set_node(scene::basic_node *Node) { m_node = Node; + m_itempropertiespanel.update(m_node); + m_functionspanel.update(m_node); } void editor_ui::set_include(include_selection *Include) diff --git a/application/editoruilayer.h b/application/editoruilayer.h index 9c0bcdf77..f390d9324 100644 --- a/application/editoruilayer.h +++ b/application/editoruilayer.h @@ -71,9 +71,18 @@ class editor_ui : public ui_layer { m_arrayoptions = std::move(Renderer); } + void set_bend_options(std::function Renderer) + { + m_bendoptions = std::move(Renderer); + } + void expand_bend() + { + m_bendexpand = true; + } // actions of the file menu, performed by the editor mode void set_file_actions(std::function Save, std::function Export); void set_new_scenery(std::function New) { m_newscenery = std::move(New); } + void set_open_scenery(std::function Open) { m_openscenery = std::move(Open); } // shows outcome of an operation in the layers window void set_status(std::string const &Status, bool const Error = false); @@ -91,6 +100,7 @@ class editor_ui : public ui_layer std::function m_save; std::function m_export; std::function m_newscenery; + std::function m_openscenery; brush_object_list m_brushobjects; bool m_insertrandom{false}; // insert mode picks a random template from m_insertset model_set_ref m_insertset; @@ -98,6 +108,8 @@ class editor_ui : public ui_layer std::function m_menuoptions; std::function m_gizmooptions; std::function m_arrayoptions; + std::function m_bendoptions; + bool m_bendexpand{false}; scene::basic_node *m_node{nullptr}; // currently bound scene node, if any bool m_track{false}; }; diff --git a/application/editoruipanels.cpp b/application/editoruipanels.cpp index 9aa6f1456..adc289803 100644 --- a/application/editoruipanels.cpp +++ b/application/editoruipanels.cpp @@ -22,6 +22,7 @@ http://mozilla.org/MPL/2.0/. #include "rendering/renderer.h" #include "simulation/simulation.h" #include "editor/editorModelSets.hpp" +#include "editor/editorFormat.hpp" namespace { @@ -369,11 +370,11 @@ void itemproperties_panel::render_name_editor() m_namednode = m_node; std::snprintf(m_namebuffer, sizeof(m_namebuffer), "%s", picked->name().c_str()); } - auto const entered{ImGui::InputTextWithHint("name", "(none)", m_namebuffer, IM_ARRAYSIZE(m_namebuffer), ImGuiInputTextFlags_EnterReturnsTrue)}; + auto const entered{ImGui::InputTextWithHint(STR_C("name"), STR_C("(none)"), m_namebuffer, IM_ARRAYSIZE(m_namebuffer), ImGuiInputTextFlags_EnterReturnsTrue)}; m_nameactive = ImGui::IsItemActive(); if (ImGui::IsItemHovered()) { - ImGui::SetTooltip("Name the events can refer to the node by.\nNodes without a name load quicker, leave it empty unless something needs it"); + ImGui::SetTooltip(STR_C("Name the events can refer to the node by.\nNodes without a name load quicker, leave it empty unless something needs it")); } if (entered || ImGui::IsItemDeactivatedAfterEdit()) { @@ -420,7 +421,7 @@ void itemproperties_panel::render_transform_editor() if (typeid(*m_node) != typeid(TAnimModel)) { return; } auto *picked = static_cast(m_node); - if (false == ImGui::CollapsingHeader("Transform", ImGuiTreeNodeFlags_DefaultOpen)) + if (false == ImGui::CollapsingHeader(STR_C("Transform"), ImGuiTreeNodeFlags_DefaultOpen)) { return; } @@ -442,7 +443,7 @@ void itemproperties_panel::render_transform_editor() clamp_circular(picked->Angles().x), clamp_circular(picked->Angles().y), clamp_circular(picked->Angles().z)}; - if (ImGui::DragFloat3("rotation (deg)", &angles.x, 0.5f, 0.0f, 360.0f, "%.3f")) + if (ImGui::DragFloat3(STR_C("rotation (deg)"), &angles.x, 0.5f, 0.0f, 360.0f, "%.3f")) { picked->Angles(angles); } @@ -451,15 +452,15 @@ void itemproperties_panel::render_transform_editor() // Scale — per-axis float, 1.000 display. Clamped to a reasonable positive range. { glm::vec3 scale = picked->Scale(); - if (ImGui::DragFloat3("scale (x,y,z)", &scale.x, 0.01f, 0.001f, 100.0f, "%.3f")) + if (ImGui::DragFloat3(STR_C("scale (x,y,z)"), &scale.x, 0.01f, 0.001f, 100.0f, "%.3f")) { picked->Scale(scale); } } - if (ImGui::Button("reset rotation")) { picked->Angles(glm::vec3(0.0f)); } + if (ImGui::Button(STR_C("reset rotation"))) { picked->Angles(glm::vec3(0.0f)); } ImGui::SameLine(); - if (ImGui::Button("reset scale")) { picked->Scale(glm::vec3(1.0f)); } + if (ImGui::Button(STR_C("reset scale"))) { picked->Scale(glm::vec3(1.0f)); } } bool itemproperties_panel::render_group() @@ -474,7 +475,7 @@ bool itemproperties_panel::render_group() return false; } - if (false == ImGui::CollapsingHeader("Parent Group")) + if (false == ImGui::CollapsingHeader(STR_C("Parent Group"))) { return false; } @@ -501,14 +502,14 @@ std::string *brush_object_list::GetRandomObject() void brush_object_list::render_options(nodebank_panel &Bank) { - ImGui::SliderFloat("Spacing", &spacing, 0.1f, 20.0f, "%.1f m"); - ImGui::Checkbox("Random model from set", &useRandom); + ImGui::SliderFloat(STR_C("Spacing"), &spacing, 0.1f, 20.0f, "%.1f m"); + ImGui::Checkbox(STR_C("Random model from set"), &useRandom); if (false == useRandom) { - ImGui::TextDisabled("Paints the template selected in the node bank"); + ImGui::TextDisabled(STR_C("Paints the template selected in the node bank")); return; } - Bank.set_combo("Preset", source, "Manual list"); + Bank.set_combo(STR_C("Preset"), source, STR_C("Manual list")); if (source.kind == model_set_ref::source::manual) { Bank.manual_list("brushset", Objects, idx); @@ -516,7 +517,7 @@ void brush_object_list::render_options(nodebank_panel &Bank) else { auto const count{Bank.set_entries(source).size()}; - ImGui::TextDisabled("%zu templates in set%s", count, count == 0 ? ", the node bank selection is used" : ""); + ImGui::TextDisabled(STR_C("%zu templates in set%s"), count, count == 0 ? ", the node bank selection is used" : ""); } } @@ -608,7 +609,7 @@ void nodebank_panel::render() if (true == ImGui::Begin(panelname.c_str(), nullptr, flags)) { - if (ImGui::Button("Reload node bank")) + if (ImGui::Button(STR_C("Reload node bank"))) { nodebank_reload(); } @@ -624,7 +625,7 @@ void nodebank_panel::render() } // edit modes as tabs, each with its own settings - std::pair const modes[] = {{"Select", MODIFY}, {"Insert", ADD}, {"Brush", BRUSH}, {"Area fill", FILL}, {"Copy to bank", COPY}}; + std::pair const modes[] = {{STR_C("Select"), MODIFY}, {STR_C("Insert"), ADD}, {STR_C("Brush"), BRUSH}, {STR_C("Area fill"), FILL}, {STR_C("Copy to bank"), COPY}}; if (ImGui::BeginTabBar("##editmodes", ImGuiTabBarFlags_FittingPolicyResizeDown)) { for (auto const &tab : modes) @@ -646,7 +647,7 @@ void nodebank_panel::render() ImGui::Separator(); ImGui::PushItemWidth(-1); - ImGui::InputTextWithHint("Search", "Search node bank", m_nodesearch, IM_ARRAYSIZE(m_nodesearch)); + ImGui::InputTextWithHint(STR_C("Search"), STR_C("Search node bank"), m_nodesearch, IM_ARRAYSIZE(m_nodesearch)); // the list takes the rest of the window, but keeps a usable height when the sections above are expanded (the window scrolls then) auto const listheight{std::max(ImGui::GetContentRegionAvail().y, ImGui::GetTextLineHeightWithSpacing() * 10.0f)}; if (ImGui::ListBoxHeader("##nodebank", ImVec2(-1, listheight))) @@ -678,7 +679,7 @@ void nodebank_panel::render() } } // scenery templates. placing one adds an include directive to a scenery file, so they take scenery opened for editing - if (Global.editor_session && ImGui::CollapsingHeader("Scenery templates (.inc)")) + if (Global.editor_session && ImGui::CollapsingHeader(STR_C("Scenery templates (.inc)"))) { if (false == EditorIncludes.scanned()) { @@ -738,11 +739,11 @@ bool nodebank_panel::set_combo(char const *Label, model_set_ref &Ref, char const changed = true; } } - ImGui::TextDisabled("User sets"); + ImGui::TextDisabled(STR_C("User sets")); auto const &sets{EditorModelSets.sets()}; if (sets.empty()) { - ImGui::TextDisabled(" (none yet, see Model sets...)"); + ImGui::TextDisabled(STR_C(" (none yet, see Model sets...)")); } for (auto const &set : sets) { @@ -753,7 +754,7 @@ bool nodebank_panel::set_combo(char const *Label, model_set_ref &Ref, char const changed = true; } } - ImGui::TextDisabled("Node bank groups"); + ImGui::TextDisabled(STR_C("Node bank groups")); auto const groups{group_names()}; for (int idx = 0; idx < static_cast(groups.size()); ++idx) { @@ -781,33 +782,33 @@ void nodebank_panel::manual_list(char const *Id, std::vector &List, } if (List.empty()) { - ImGui::TextDisabled("(empty)"); + ImGui::TextDisabled(STR_C("(empty)")); } ImGui::ListBoxFooter(); } - if (ImGui::Button("Add selected")) + if (ImGui::Button(STR_C("Add selected"))) { if (node_selected()) List.push_back(*m_selectedtemplate); } if (ImGui::IsItemHovered()) { - ImGui::SetTooltip("Adds the template selected in the node bank list"); + ImGui::SetTooltip(STR_C("Adds the template selected in the node bank list")); } ImGui::SameLine(); - if (ImGui::Button("Remove") && Selected >= 0 && Selected < static_cast(List.size())) + if (ImGui::Button(STR_C("Remove")) && Selected >= 0 && Selected < static_cast(List.size())) { List.erase(List.begin() + Selected); Selected = -1; } ImGui::SameLine(); - if (ImGui::Button("Clear")) + if (ImGui::Button(STR_C("Clear"))) { List.clear(); Selected = -1; } ImGui::SameLine(); - if (ImGui::Button("Save as set") && false == List.empty()) + if (ImGui::Button(STR_C("Save as set")) && false == List.empty()) { open_sets_window(EditorModelSets.create("New set", List)); } @@ -891,7 +892,7 @@ void nodebank_panel::open_sets_window(int const Setid) void nodebank_panel::render_sets_window() { ImGui::SetNextWindowSize(ImVec2S(600, 380), ImGuiCond_FirstUseEver); - if (false == ImGui::Begin("Model sets", &m_setsopen, ImGuiWindowFlags_NoCollapse)) + if (false == ImGui::Begin(STR_C("Model sets"), &m_setsopen, ImGuiWindowFlags_NoCollapse)) { ImGui::End(); return; @@ -919,10 +920,10 @@ void nodebank_panel::render_sets_window() } if (sets.empty()) { - ImGui::TextDisabled("No sets yet"); + ImGui::TextDisabled(STR_C("No sets yet")); } ImGui::EndChild(); - if (ImGui::Button("New")) + if (ImGui::Button(STR_C("New"))) { open_sets_window(EditorModelSets.create("New set")); } @@ -930,27 +931,27 @@ void nodebank_panel::render_sets_window() if (edited != nullptr) { ImGui::SameLine(); - if (ImGui::Button("Duplicate")) + if (ImGui::Button(STR_C("Duplicate"))) { open_sets_window(EditorModelSets.create(edited->name + " copy", edited->templates)); edited = EditorModelSets.find(m_setsselected); } ImGui::SameLine(); - if (ImGui::Button("Delete")) + if (ImGui::Button(STR_C("Delete"))) { ImGui::OpenPopup("##deleteset"); } if (ImGui::BeginPopup("##deleteset")) { - ImGui::Text("Delete set \"%s\"?", edited->name.c_str()); - if (ImGui::Button("Delete##confirm")) + ImGui::Text(STR_C("Delete set \"%s\"?"), edited->name.c_str()); + if (ImGui::Button(STR_C("Delete##confirm"))) { EditorModelSets.remove(edited->id); edited = nullptr; ImGui::CloseCurrentPopup(); } ImGui::SameLine(); - if (ImGui::Button("Cancel")) + if (ImGui::Button(STR_C("Cancel"))) { ImGui::CloseCurrentPopup(); } @@ -965,8 +966,8 @@ void nodebank_panel::render_sets_window() ImGui::BeginGroup(); if (edited == nullptr) { - ImGui::TextDisabled("Create a set with \"New\", or use \"Save as set\" on a brush or area fill list."); - ImGui::TextDisabled("Sets can be chosen in Insert (random model), Brush and Area fill."); + ImGui::TextDisabled(STR_C("Create a set with \"New\", or use \"Save as set\" on a brush or area fill list.")); + ImGui::TextDisabled(STR_C("Sets can be chosen in Insert (random model), Brush and Area fill.")); } else { @@ -980,7 +981,7 @@ void nodebank_panel::render_sets_window() auto const entered{ImGui::InputText("##setname", m_setsname, IM_ARRAYSIZE(m_setsname), ImGuiInputTextFlags_EnterReturnsTrue)}; ImGui::PopItemWidth(); ImGui::SameLine(); - if (ImGui::Button("Rename") || entered) + if (ImGui::Button(STR_C("Rename")) || entered) { EditorModelSets.rename(edited->id, m_setsname); m_setsnameid = 0; // reload, the name could have been adjusted to stay unique @@ -995,42 +996,42 @@ void nodebank_panel::render_sets_window() } if (edited->templates.empty()) { - ImGui::TextDisabled("(empty) select a template in the node bank and press \"Add selected\""); + ImGui::TextDisabled(STR_C("(empty) select a template in the node bank and press \"Add selected\"")); } ImGui::EndChild(); auto const setid{edited->id}; - if (ImGui::Button("Add selected")) + if (ImGui::Button(STR_C("Add selected"))) { if (node_selected()) EditorModelSets.add(setid, {*m_selectedtemplate}); } if (ImGui::IsItemHovered()) { - ImGui::SetTooltip("Adds the template selected in the node bank list"); + ImGui::SetTooltip(STR_C("Adds the template selected in the node bank list")); } ImGui::SameLine(); - if (ImGui::Button("Remove") && m_setsentry >= 0) + if (ImGui::Button(STR_C("Remove")) && m_setsentry >= 0) { EditorModelSets.erase(setid, static_cast(m_setsentry)); m_setsentry = -1; } ImGui::SameLine(); - if (ImGui::Button("Clear")) + if (ImGui::Button(STR_C("Clear"))) { ImGui::OpenPopup("##clearset"); } if (ImGui::BeginPopup("##clearset")) { - ImGui::TextUnformatted("Remove all templates from this set?"); - if (ImGui::Button("Clear##confirm")) + ImGui::TextUnformatted(STR_C("Remove all templates from this set?")); + if (ImGui::Button(STR_C("Clear##confirm"))) { EditorModelSets.clear(setid); m_setsentry = -1; ImGui::CloseCurrentPopup(); } ImGui::SameLine(); - if (ImGui::Button("Cancel")) + if (ImGui::Button(STR_C("Cancel"))) { ImGui::CloseCurrentPopup(); } @@ -1053,7 +1054,7 @@ void nodebank_panel::render_sets_window() } ImGui::PopItemWidth(); ImGui::SameLine(); - if (ImGui::Button("Add group")) + if (ImGui::Button(STR_C("Add group"))) { std::vector templates; for (auto const *entry : set_entries(m_setsgroup)) @@ -1191,16 +1192,16 @@ void functions_panel::render() void functions_panel::render_controls() { // order matches rotation_mode - char const *const modes[] = {"Random", "Fixed", "Default (from template)"}; + char const *const modes[] = {STR_C("Random"), STR_C("Fixed"), STR_C("Default (from template)")}; auto current{static_cast(rot_mode)}; - if (ImGui::Combo("Rotation", ¤t, modes, IM_ARRAYSIZE(modes))) + if (ImGui::Combo(STR_C("Rotation"), ¤t, modes, IM_ARRAYSIZE(modes))) { rot_mode = static_cast(current); } if (rot_mode == FIXED) { - // ImGui::Checkbox("Get rotation from last object", &rot_from_last); - ImGui::SliderFloat("Rotation value", &rot_value, 0.0f, 360.0f, "%.1f deg"); + // ImGui::Checkbox(STR_C("Get rotation from last object"), &rot_from_last); + ImGui::SliderFloat(STR_C("Rotation value"), &rot_value, 0.0f, 360.0f, STR_C("%.1f deg")); } } @@ -1280,7 +1281,7 @@ void itemproperties_panel::render_include() auto &include{*m_include}; include.active = false; - ImGui::Text("include: %s", Bezogonkow(include.target).c_str()); + ImGui::Text(STR_C("include: %s"), Bezogonkow(include.target).c_str()); if (false == include.info.name.empty()) { ImGui::TextDisabled("%s", include.info.name.c_str()); @@ -1294,7 +1295,7 @@ void itemproperties_panel::render_include() } if (include.values.empty()) { - ImGui::TextDisabled("The template takes no parameters."); + ImGui::TextDisabled(STR_C("The template takes no parameters.")); return; } @@ -1339,7 +1340,7 @@ void itemproperties_panel::render_include() ImGui::PopItemWidth(); ImGui::PushStyleColor(ImGuiCol_Text, ImGui::GetStyleColorVec4(ImGuiCol_TextDisabled)); - ImGui::TextWrapped("Models of the template follow the changes at once, the rest of it once the scenery is saved and loaded again."); + ImGui::TextWrapped(STR_C("Models of the template follow the changes at once, the rest of it once the scenery is saved and loaded again.")); ImGui::PopStyleColor(); } @@ -1365,7 +1366,7 @@ void layers_panel::render() if (scene::Layers.empty()) { // layers are established only when the scenery is loaded for editing, regular load skips the bookkeeping - ImGui::TextDisabled("Scenery layers are available in an edit session.\nStart the simulator with: -edit "); + ImGui::TextDisabled(STR_C("Scenery layers are available in an edit session.\nStart the simulator with: -edit ")); } else { @@ -1375,32 +1376,32 @@ void layers_panel::render() } auto const selected{m_selected != null_handle}; auto const removed{selected && scene::Layers.layer(m_selected).removed}; - std::string reason{"Select a layer first"}; + std::string reason{STR("Select a layer first")}; - if (ImGui::Button("New...")) + if (ImGui::Button(STR_C("New..."))) { m_newname[0] = '\0'; m_newparent = (selected && false == removed && false == scene::Layers.layer(m_selected).binary ? m_selected : scene::layer_handle{1}); m_popuperror.clear(); - ImGui::OpenPopup("New layer"); + ImGui::OpenPopup(STR_C("New layer")); } ImGui::SameLine(); if (removed) { - if (ImGui::Button("Restore")) + if (ImGui::Button(STR_C("Restore"))) { scene::Layers.restore(m_selected); - report("Layer \"" + layer_name(m_selected) + "\" restored"); + report(format(STR_C("Layer \"%s\" restored"), layer_name(m_selected).c_str())); } } - else if (action_button("Remove...", selected && scene::Layers.can_remove(m_selected, reason), reason)) + else if (action_button(STR_C("Remove..."), selected && scene::Layers.can_remove(m_selected, reason), reason)) { - ImGui::OpenPopup("Remove layer"); + ImGui::OpenPopup(STR_C("Remove layer")); } ImGui::SameLine(); // the scenario file is what holds the scenery together, it stays where it is auto const mergeable{selected && false == removed && (scene::Layers.layer(m_selected).created || false == scene::Layers.layer(m_selected).sites.empty())}; - if (action_button("Merge into...", mergeable, selected && false == removed ? "The scenario file can't be merged into another layer" : "Select a layer first")) + if (action_button(STR_C("Merge into..."), mergeable, selected && false == removed ? STR("The scenario file can't be merged into another layer") : STR("Select a layer first"))) { // the layer which includes the selected one is the most likely target m_mergetarget = scene::Layers.resolve(scene::Layers.layer(m_selected).parent); @@ -1408,16 +1409,16 @@ void layers_panel::render() { m_mergetarget = null_handle; } - ImGui::OpenPopup("Merge layer"); + ImGui::OpenPopup(STR_C("Merge layer")); } ImGui::SameLine(); - if (ImGui::Button("Save") && save) + if (ImGui::Button(STR_C("Save")) && save) { save(); } if (ImGui::IsItemHovered()) { - ImGui::SetTooltip("Writes changed nodes and layers to the scenery files (Ctrl+S)"); + ImGui::SetTooltip(STR_C("Writes changed nodes and layers to the scenery files (Ctrl+S)")); } ImGui::Separator(); @@ -1447,7 +1448,7 @@ void layers_panel::render_list() { // the list takes the window except for the room left for the status ImGui::BeginChild("##layers", ImVec2(0.0f, -ImGui::GetTextLineHeightWithSpacing() * 2.5f)); - ImGui::TextDisabled("visible, locked, active, layer file"); + ImGui::TextDisabled(STR_C("visible, locked, active, layer file")); for (auto const handle : scene::Layers.tree()) { @@ -1489,7 +1490,7 @@ void layers_panel::render_list() { if (std::string reason; false == scene::Layers.accepts(handle, &reason)) { - report("Layer \"" + layer_name(handle) + "\" can't take new nodes" + (reason.empty() ? "" : ": " + reason), true); + report(format(STR_C("Layer \"%s\" can't take new nodes"), layer_name(handle).c_str()) + (reason.empty() ? "" : ": " + reason), true); } else { @@ -1498,7 +1499,7 @@ void layers_panel::render_list() } if (ImGui::IsItemHovered()) { - ImGui::SetTooltip("Active layer: nodes created in the editor are placed in it"); + ImGui::SetTooltip(STR_C("Active layer: nodes created in the editor are placed in it")); } ImGui::SameLine(); auto label{std::string(2 * scene::Layers.depth(handle), ' ') + layer_name(handle) + " (" + (layer.binary ? "binary terrain" : std::to_string(layer.item_count())) + ")"}; @@ -1524,7 +1525,7 @@ void layers_panel::render_list() } if (ImGui::IsItemHovered()) { - std::string content{layer.created ? "New layer, its file is created on save" : isremoved ? "Dropped from the scenery on save" : "Scenery file"}; + std::string content{layer.created ? STR("New layer, its file is created on save") : isremoved ? STR("Dropped from the scenery on save") : STR("Scenery file")}; if (scene::Layers.valid(layer.parent)) { content += "\nincluded by: " + layer_name(scene::Layers.resolve(layer.parent)); @@ -1554,10 +1555,10 @@ void layers_panel::render_list() void layers_panel::render_popups() { - if (ImGui::BeginPopupModal("New layer", nullptr, ImGuiWindowFlags_AlwaysAutoResize)) + if (ImGui::BeginPopupModal(STR_C("New layer"), nullptr, ImGuiWindowFlags_AlwaysAutoResize)) { - ImGui::TextUnformatted("File of the new layer, in the scenery directory:"); - ImGui::InputTextWithHint("##name", "name.scm", m_newname, IM_ARRAYSIZE(m_newname)); + ImGui::TextUnformatted(STR_C("File of the new layer, in the scenery directory:")); + ImGui::InputTextWithHint("##name", STR_C("name.scm"), m_newname, IM_ARRAYSIZE(m_newname)); if (ImGui::BeginCombo("Included by", layer_name(m_newparent).c_str())) { for (std::size_t idx = 1; idx <= scene::Layers.size(); ++idx) @@ -1578,25 +1579,25 @@ void layers_panel::render_popups() { ImGui::TextColored(status_errorcolor, "%s", m_popuperror.c_str()); } - if (ImGui::Button("Create")) + if (ImGui::Button(STR_C("Create"))) { auto const created{scene::Layers.create(m_newname, m_newparent, m_popuperror)}; if (created != null_handle) { m_selected = created; - report("Layer \"" + layer_name(created) + "\" created and made active. Its file is written on save."); + report(format(STR_C("Layer \"%s\" created and made active. Its file is written on save."), layer_name(created).c_str())); ImGui::CloseCurrentPopup(); } } ImGui::SameLine(); - if (ImGui::Button("Cancel")) + if (ImGui::Button(STR_C("Cancel"))) { ImGui::CloseCurrentPopup(); } ImGui::EndPopup(); } - if (ImGui::BeginPopupModal("Remove layer", nullptr, ImGuiWindowFlags_AlwaysAutoResize)) + if (ImGui::BeginPopupModal(STR_C("Remove layer"), nullptr, ImGuiWindowFlags_AlwaysAutoResize)) { if (false == scene::Layers.listed(m_selected)) { @@ -1614,30 +1615,30 @@ void layers_panel::render_popups() ++included; } } - ImGui::Text("Remove layer \"%s\" from the scenery?", layer_name(m_selected).c_str()); + ImGui::Text(STR_C("Remove layer \"%s\" from the scenery?"), layer_name(m_selected).c_str()); ImGui::TextUnformatted(layer.created ? "The layer wasn't saved yet, so it leaves no file behind." : "Its include directive is erased on save. The file itself stays on the disk."); if (included > 0) { - ImGui::Text("%d layer(s) it includes are removed with it.", included); + ImGui::Text(STR_C("%d layer(s) it includes are removed with it."), included); } if (auto const items{layer_content(layer)}; false == items.empty()) { ImGui::Separator(); - ImGui::TextUnformatted("The layer holds:"); + ImGui::TextUnformatted(STR_C("The layer holds:")); ImGui::TextUnformatted(items.c_str()); - ImGui::TextDisabled("Make sure the rest of the scenery doesn't refer to its tracks, events or memory cells."); + ImGui::TextDisabled(STR_C("Make sure the rest of the scenery doesn't refer to its tracks, events or memory cells.")); } - if (ImGui::Button("Remove")) + if (ImGui::Button(STR_C("Remove"))) { auto const name{layer_name(m_selected)}; if (scene::Layers.remove(m_selected)) { - report("Layer \"" + name + "\" removed. It can be restored until the scenery is saved."); + report(format(STR_C("Layer \"%s\" removed. It can be restored until the scenery is saved."), name.c_str())); } ImGui::CloseCurrentPopup(); } ImGui::SameLine(); - if (ImGui::Button("Cancel")) + if (ImGui::Button(STR_C("Cancel"))) { ImGui::CloseCurrentPopup(); } @@ -1645,7 +1646,7 @@ void layers_panel::render_popups() ImGui::EndPopup(); } - if (ImGui::BeginPopupModal("Merge layer", nullptr, ImGuiWindowFlags_AlwaysAutoResize)) + if (ImGui::BeginPopupModal(STR_C("Merge layer"), nullptr, ImGuiWindowFlags_AlwaysAutoResize)) { if (false == scene::Layers.listed(m_selected)) { @@ -1653,7 +1654,7 @@ void layers_panel::render_popups() } else { - ImGui::Text("Move content of layer \"%s\" to:", layer_name(m_selected).c_str()); + ImGui::Text(STR_C("Move content of layer \"%s\" to:"), layer_name(m_selected).c_str()); std::string reason; auto targets{0}; if (ImGui::BeginCombo("##target", layer_name(m_mergetarget).c_str())) @@ -1673,27 +1674,27 @@ void layers_panel::render_popups() } if (targets == 0) { - ImGui::TextDisabled("no layer can take it"); + ImGui::TextDisabled(STR_C("no layer can take it")); } ImGui::EndCombo(); } - ImGui::TextDisabled("The text of the file is moved on save, the emptied file stays on the disk.\n" + ImGui::TextDisabled(STR_C("The text of the file is moved on save, the emptied file stays on the disk.\n" "Merged into the layer which includes it, the content stays where the include was.\n" - "Merged into any other layer it's placed at its end, which changes the load order."); + "Merged into any other layer it's placed at its end, which changes the load order.")); auto const possible{m_mergetarget != null_handle && scene::Layers.can_merge(m_selected, m_mergetarget, reason)}; - if (action_button("Merge", possible, m_mergetarget != null_handle ? reason : "Pick the target layer")) + if (action_button(STR_C("Merge"), possible, m_mergetarget != null_handle ? reason : STR("Pick the target layer"))) { auto const name{layer_name(m_selected)}; auto const target{m_mergetarget}; if (scene::Layers.merge(m_selected, target)) { - report("Layer \"" + name + "\" merged into \"" + layer_name(target) + "\". The files are changed on save."); + report(format(STR_C("Layer \"%s\" merged into \"%s\". The files are changed on save."), name.c_str(), layer_name(target).c_str())); m_selected = target; } ImGui::CloseCurrentPopup(); } ImGui::SameLine(); - if (ImGui::Button("Cancel")) + if (ImGui::Button(STR_C("Cancel"))) { ImGui::CloseCurrentPopup(); } @@ -1740,24 +1741,24 @@ void includes_panel::render_list() auto const &entries{EditorIncludes.entries()}; ImGui::PushItemWidth(ImGui::GetFontSize() * 12.0f); - auto changed{ImGui::InputTextWithHint("##filter", "Search templates", m_filter, IM_ARRAYSIZE(m_filter))}; + auto changed{ImGui::InputTextWithHint("##filter", STR_C("Search templates"), m_filter, IM_ARRAYSIZE(m_filter))}; ImGui::PopItemWidth(); ImGui::SameLine(); - changed |= ImGui::Checkbox("Described", &m_describedonly); + changed |= ImGui::Checkbox(STR_C("Described"), &m_describedonly); if (false == scene::Layers.templates().empty()) { // known only for scenery opened for editing ImGui::SameLine(); - changed |= ImGui::Checkbox("Used by the scenery", &m_usedonly); + changed |= ImGui::Checkbox(STR_C("Used by the scenery"), &m_usedonly); } ImGui::SameLine(); - if (ImGui::Button("Rescan")) + if (ImGui::Button(STR_C("Rescan"))) { EditorIncludes.scan(); } if (ImGui::IsItemHovered()) { - ImGui::SetTooltip("Looks through the scenery directory again, for the templates added or changed outside of the editor"); + ImGui::SetTooltip(STR_C("Looks through the scenery directory again, for the templates added or changed outside of the editor")); } if (changed || m_listrevision != EditorIncludes.revision()) @@ -1782,7 +1783,7 @@ void includes_panel::render_list() m_listed.emplace_back(idx); } } - ImGui::TextDisabled("%d template(s) in the scenery directory, %d described, %d ready for the node bank", static_cast(entries.size()), m_described, + ImGui::TextDisabled(STR_C("%d template(s) in the scenery directory, %d described, %d ready for the node bank"), static_cast(entries.size()), m_described, static_cast(EditorIncludes.ready().size())); ImGui::BeginChild("##templates", ImVec2(0.0f, ImGui::GetTextLineHeightWithSpacing() * 9.0f), true); @@ -1805,7 +1806,7 @@ void includes_panel::render_list() } if (false == entry.complete && false == entry.issue.empty() && ImGui::IsItemHovered()) { - ImGui::SetTooltip("Not in the node bank: %s", Bezogonkow(entry.issue).c_str()); + ImGui::SetTooltip(STR_C("Not in the node bank: %s"), Bezogonkow(entry.issue).c_str()); } if (clicked) { @@ -1831,13 +1832,13 @@ void includes_panel::render_description() ImGui::Columns(4, "##parameters", false); ImGui::SetColumnWidth(0, ImGui::CalcTextSize("(p000) ").x); ImGui::SetColumnWidth(1, ImGui::CalcTextSize("texture ").x + ImGui::GetFrameHeight() * 2.0f); - ImGui::TextDisabled("param"); + ImGui::TextDisabled(STR_C("param")); ImGui::NextColumn(); - ImGui::TextDisabled("role"); + ImGui::TextDisabled(STR_C("role")); ImGui::NextColumn(); - ImGui::TextDisabled("label"); + ImGui::TextDisabled(STR_C("label")); ImGui::NextColumn(); - ImGui::TextDisabled("default"); + ImGui::TextDisabled(STR_C("default")); ImGui::NextColumn(); for (auto ¶meter : m_info.parameters) { @@ -1883,35 +1884,35 @@ void includes_panel::render_description() ImGui::PushTextWrapPos(0.0f); if (std::string issue; editor_includes::complete(m_info, m_parameters, &issue)) { - ImGui::TextUnformatted("Complete: once saved, the template is offered by the node bank (Insert tab, Scenery templates)."); + ImGui::TextUnformatted(STR_C("Complete: once saved, the template is offered by the node bank (Insert tab, Scenery templates).")); } else { - ImGui::TextColored(status_errorcolor, "Not for the node bank yet: %s.", issue.c_str()); + ImGui::TextColored(status_errorcolor, STR_C("Not for the node bank yet: %s."), issue.c_str()); } ImGui::PopTextWrapPos(); if (ImGui::IsItemHovered()) { - ImGui::SetTooltip("A template placed from the node bank gets the cursor location in the pos.* parameters, the rotation set in the\n" + ImGui::SetTooltip(STR_C("A template placed from the node bank gets the cursor location in the pos.* parameters, the rotation set in the\n" "Insert tab in rot.y, and a unique name (the default value followed by a random suffix) in the name parameter.\n" - "The other parameters receive their default values."); + "The other parameters receive their default values.")); } - if (ImGui::Button("Suggest roles")) + if (ImGui::Button(STR_C("Suggest roles"))) { editor_includes::suggest(m_file, m_info); } if (ImGui::IsItemHovered()) { - ImGui::SetTooltip("Sets roles of the parameters still marked as free, where the way the template uses them tells what they are"); + ImGui::SetTooltip(STR_C("Sets roles of the parameters still marked as free, where the way the template uses them tells what they are")); } ImGui::SameLine(); - if (ImGui::Button("Add parameter")) + if (ImGui::Button(STR_C("Add parameter"))) { m_info.parameter(m_info.parameters.empty() ? 1 : m_info.parameters.back().id + 1); } ImGui::SameLine(); - if (ImGui::Button("Save to file")) + if (ImGui::Button(STR_C("Save to file"))) { std::string error; m_statuserror = false == editor_includes::save(m_file, m_info, error); @@ -1922,7 +1923,7 @@ void includes_panel::render_description() } } ImGui::SameLine(); - if (ImGui::Button("Reload")) + if (ImGui::Button(STR_C("Reload"))) { open(m_file); } @@ -1944,11 +1945,11 @@ void includes_panel::render() if (ImGui::Begin(panelname.c_str(), &is_open, ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoCollapse)) { ImGui::PushStyleColor(ImGuiCol_Text, ImGui::GetStyleColorVec4(ImGuiCol_TextDisabled)); - ImGui::TextWrapped("The .inc templates of the scenery directory. Describe a template and its parameters to add it to the node bank; " - "the description is stored in the template file, as //$e comment lines."); + ImGui::TextWrapped(STR_C("The .inc templates of the scenery directory. Describe a template and its parameters to add it to the node bank; " + "the description is stored in the template file, as //$e comment lines.")); if (false == Global.editor_session) { - ImGui::TextWrapped("The node bank offers the templates in a scenery opened for editing (-edit)."); + ImGui::TextWrapped(STR_C("The node bank offers the templates in a scenery opened for editing (-edit).")); } ImGui::PopStyleColor(); diff --git a/lang/editor_pl.po b/lang/editor_pl.po index 6f4ad28bc..1fb3fa0b3 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -1320,6 +1320,12 @@ msgstr "Kliknij co najmniej dwa punkty" msgid "Laid %zu paths, %.1f m" msgstr "Ułożono %zu odcinków, %.1f m" +msgid "The curvature changes abruptly where the track joins, there's no room for a transition curve" +msgstr "Na styku z torem krzywizna zmienia się skokowo, nie ma miejsca na krzywą przejściową" + +msgid "Compound curve: R %.0f m meets R %.0f m with no transition curve between them" +msgstr "Łuk koszowy: R %.0f m styka się z R %.0f m bez krzywej przejściowej między nimi" + msgid "More settings" msgstr "Więcej ustawień" @@ -2662,8 +2668,8 @@ msgstr "Parzyste hektometry po prawej, nieparzyste po lewej" msgid "Objects" msgstr "Obiekty" -msgid "Along the track: platforms and other models, hectometre posts, fouling point markers, a parallel track, a vehicle to drive" -msgstr "Przy torze: perony i inne modele, słupki hektometrowe, wskaźniki ukresu, tor równoległy, pojazd do jazdy" +msgid "Along the track: hectometre posts, fouling point markers, a parallel track, a vehicle to drive" +msgstr "Przy torze: słupki hektometrowe, wskaźniki ukresu, tor równoległy, pojazd do jazdy" msgid "Model along the track: release where it ends" msgstr "Model wzdłuż toru: puść tam, gdzie się kończy" @@ -3458,3 +3464,930 @@ msgstr "Otwórz kreator" msgid "The editor couldn't be started again" msgstr "Nie udało się ponownie uruchomić edytora" + +# scenery editor: models bent along the track, opening another scenery + +msgid "Bend along the track" +msgstr "Gięcie wzdłuż toru" + +msgid "Bend it along the track" +msgstr "Wygnij wzdłuż toru" + +msgid "Select a model or an include standing by a track" +msgstr "Zaznacz model albo include stojący przy torze" + +msgid "No track within %.0f m of the model" +msgstr "Brak toru w promieniu %.0f m od modelu" + +msgid "axis of the model along the track" +msgstr "oś modelu wzdłuż toru" + +msgid "the one nearest the track" +msgstr "najbliższa kierunkowi toru" + +msgid "Reference point: the model bends about it, the line through it keeps its length, the offsets are its place" +msgstr "Punkt odniesienia: wokół niego model się wygina, linia przez niego zachowuje długość, odsunięcia podają jego położenie" + +msgid "along the track" +msgstr "wzdłuż toru" + +msgid "across" +msgstr "w poprzek" + +msgid "start" +msgstr "początek" + +msgid "end" +msgstr "koniec" + +msgid "picked point" +msgstr "wskazany punkt" + +msgid "point (x, y, z of the model)" +msgstr "punkt (x, y, z modelu)" + +msgid "Pick the point on the model" +msgstr "Wskaż punkt na modelu" + +msgid "Click the point on the model..." +msgstr "Kliknij punkt na modelu..." + +msgid "The next click in the view sets the reference point where it lands on the model" +msgstr "Następne kliknięcie w widoku ustawia punkt odniesienia tam, gdzie trafi w model" + +msgid "Reference point %.2f %.2f %.2f in the model" +msgstr "Punkt odniesienia %.2f %.2f %.2f w modelu" + +msgid "The model stays where it stands and bends with the track; Ctrl+Z gives it back" +msgstr "Model zostaje tam, gdzie stoi, i wygina się z torem; Ctrl+Z go przywraca" + +msgid "The model stands %.1f deg off the track, bent it'll follow the track" +msgstr "Model stoi %.1f° w stosunku do toru, po wygięciu pójdzie wzdłuż toru" + +msgid "The model has no triangles to bend, or it can't be loaded" +msgstr "Model nie ma trójkątów do wygięcia albo nie da się go wczytać" + +msgid "The model lies before the start of the track" +msgstr "Model leży przed początkiem toru" + +msgid "%s bent along %.1f m of the track, Ctrl+Z takes it back" +msgstr "%s wygięty na %.1f m toru, Ctrl+Z cofa" + +msgid "%.2f m along the reference line, %d copies (the model is %.2f m)" +msgstr "%.2f m wzdłuż linii odniesienia, kopii: %d (model ma %.2f m)" + +msgid "from the track axis (m, + right)" +msgstr "od osi toru (m, + w prawo)" + +msgid "over the rail head (m)" +msgstr "nad główką szyny (m)" + +msgid "length (m)" +msgstr "długość (m)" + +msgid "As long as the model" +msgstr "Długość modelu" + +msgid "Along the whole track" +msgstr "Na całym torze" + +msgid "Bent" +msgstr "Wygięty" + +msgid "copy every (m, 0: its length)" +msgstr "kopia co (m, 0: jej długość)" + +msgid "Done" +msgstr "Gotowe" + +msgid "Bent models by this track:" +msgstr "Wygięte modele przy tym torze:" + +msgid "Bent models nearby:" +msgstr "Wygięte modele w pobliżu:" + +msgid "New model along the selected track" +msgstr "Nowy model wzdłuż zaznaczonego toru" + +msgid "Open scenery..." +msgstr "Otwórz scenerię..." + +msgid "The editor starts again with another scenery of the scenery folder" +msgstr "Edytor uruchamia się ponownie z inną scenerią z folderu scenery" + +msgid "Open scenery##restart" +msgstr "Otwórz scenerię##restart" + +msgid "The editor starts again with the scenery chosen below." +msgstr "Edytor uruchomi się ponownie ze scenerią wybraną poniżej." + +msgid "search" +msgstr "szukaj" + +msgid "Save and open" +msgstr "Zapisz i otwórz" + +msgid "In the view: drag the blue cross sideways to set the offset, with Shift up and down, with Ctrl along the track" +msgstr "W widoku: przeciągnij niebieski celownik w bok, żeby ustawić odsunięcie, z Shift w górę i w dół, z Ctrl wzdłuż toru" + +msgid "Drag: offset from the track; Shift: height; Ctrl: along the track" +msgstr "Przeciągnij: odsunięcie od toru; Shift: wysokość; Ctrl: wzdłuż toru" + +msgid "%.2f m over the rail head" +msgstr "%.2f m nad główką szyny" + +msgid "%.2f m from the track axis" +msgstr "%.2f m od osi toru" + +msgid "%+.2f m along the track" +msgstr "%+.2f m wzdłuż toru" + +# scenery editor: general mode, toolset, layers, settings + +msgid "LMB: select node F: focus End: drop to ground Del: delete" +msgstr "LPM: zaznacz węzeł F: pokaż End: opuść na ziemię Del: usuń" + +msgid "LMB: copy the clicked model to the node bank" +msgstr "LPM: skopiuj kliknięty model do banku węzłów" + +msgid "LMB: insert a model at the cursor" +msgstr "LPM: wstaw model w miejscu kursora" + +msgid "Random model from set" +msgstr "Losowy model z zestawu" + +msgid "%zu templates in set%s" +msgstr "%zu szablonów w zestawie%s" + +msgid "Inserts the template selected in the node bank" +msgstr "Wstawia szablon zaznaczony w banku węzłów" + +msgid "Hold LMB: paint models along the cursor path" +msgstr "Przytrzymaj LPM: maluj modele wzdłuż drogi kursora" + +msgid "Node properties" +msgstr "Właściwości węzła" + +msgid "Array" +msgstr "Tablica" + +msgid "Ctrl+S" +msgstr "Ctrl+S" + +msgid "Ctrl+Shift+F11" +msgstr "Ctrl+Shift+F11" + +msgid "name" +msgstr "nazwa" + +msgid "(none)" +msgstr "(brak)" + +msgid "Name the events can refer to the node by.\nNodes without a name load quicker, leave it empty unless something needs it" +msgstr "Nazwa, po której zdarzenia mogą odwołać się do węzła.\nWęzły bez nazwy wczytują się szybciej, zostaw puste, jeśli nic jej nie potrzebuje" + +msgid "Transform" +msgstr "Przekształcenie" + +msgid "rotation (deg)" +msgstr "obrót (°)" + +msgid "scale (x,y,z)" +msgstr "skala (x,y,z)" + +msgid "reset rotation" +msgstr "zeruj obrót" + +msgid "reset scale" +msgstr "zeruj skalę" + +msgid "Parent Group" +msgstr "Grupa nadrzędna" + +msgid "Spacing" +msgstr "Odstęp" + +msgid "Paints the template selected in the node bank" +msgstr "Maluje szablonem zaznaczonym w banku węzłów" + +msgid "Reload node bank" +msgstr "Wczytaj bank węzłów ponownie" + +msgid "Search" +msgstr "Szukaj" + +msgid "Search node bank" +msgstr "Szukaj w banku węzłów" + +msgid "Scenery templates (.inc)" +msgstr "Szablony scenerii (.inc)" + +msgid "User sets" +msgstr "Zestawy użytkownika" + +msgid " (none yet, see Model sets...)" +msgstr " (jeszcze żadnych, zobacz Zestawy modeli...)" + +msgid "Node bank groups" +msgstr "Grupy banku węzłów" + +msgid "(empty)" +msgstr "(pusto)" + +msgid "Add selected" +msgstr "Dodaj zaznaczony" + +msgid "Adds the template selected in the node bank list" +msgstr "Dodaje szablon zaznaczony na liście banku węzłów" + +msgid "Remove" +msgstr "Usuń" + +msgid "Save as set" +msgstr "Zapisz jako zestaw" + +msgid "Model sets" +msgstr "Zestawy modeli" + +msgid "No sets yet" +msgstr "Brak zestawów" + +msgid "New" +msgstr "Nowy" + +msgid "Duplicate" +msgstr "Powiel" + +msgid "Delete set \"%s\"?" +msgstr "Usunąć zestaw \"%s\"?" + +msgid "Delete##confirm" +msgstr "Usuń##confirm" + +msgid "Create a set with \"New\", or use \"Save as set\" on a brush or area fill list." +msgstr "Utwórz zestaw przyciskiem \"Nowy\" albo użyj \"Zapisz jako zestaw\" na liście pędzla lub wypełniania obszaru." + +msgid "Sets can be chosen in Insert (random model), Brush and Area fill." +msgstr "Zestawy można wybrać we Wstawianiu (losowy model), Pędzlu i Wypełnianiu obszaru." + +msgid "(empty) select a template in the node bank and press \"Add selected\"" +msgstr "(pusto) zaznacz szablon w banku węzłów i naciśnij \"Dodaj zaznaczony\"" + +msgid "Remove all templates from this set?" +msgstr "Usunąć wszystkie szablony z tego zestawu?" + +msgid "Clear##confirm" +msgstr "Wyczyść##confirm" + +msgid "Add group" +msgstr "Dodaj grupę" + +msgid "Rotation" +msgstr "Obrót" + +msgid "Get rotation from last object" +msgstr "Obrót z ostatniego obiektu" + +msgid "Rotation value" +msgstr "Wartość obrotu" + +msgid "%.1f deg" +msgstr "%.1f°" + +msgid "include: %s" +msgstr "include: %s" + +msgid "The template takes no parameters." +msgstr "Szablon nie ma parametrów." + +msgid "Models of the template follow the changes at once, the rest of it once the scenery is saved and loaded again." +msgstr "Modele szablonu od razu idą za zmianami, reszta po zapisaniu i ponownym wczytaniu scenerii." + +msgid "Scenery layers are available in an edit session.\nStart the simulator with: -edit " +msgstr "Warstwy scenerii są dostępne w sesji edycji.\nUruchom symulator z: -edit " + +msgid "New..." +msgstr "Nowa..." + +msgid "New layer" +msgstr "Nowa warstwa" + +msgid "Restore" +msgstr "Przywróć" + +msgid "Remove layer" +msgstr "Usuń warstwę" + +msgid "Merge layer" +msgstr "Scal warstwę" + +msgid "Save" +msgstr "Zapisz" + +msgid "Writes changed nodes and layers to the scenery files (Ctrl+S)" +msgstr "Zapisuje zmienione węzły i warstwy do plików scenerii (Ctrl+S)" + +msgid "visible, locked, active, layer file" +msgstr "widoczna, zablokowana, aktywna, plik warstwy" + +msgid "Active layer: nodes created in the editor are placed in it" +msgstr "Aktywna warstwa: tu trafiają węzły tworzone w edytorze" + +msgid "File of the new layer, in the scenery directory:" +msgstr "Plik nowej warstwy, w katalogu scenerii:" + +msgid "name.scm" +msgstr "nazwa.scm" + +msgid "Create" +msgstr "Utwórz" + +msgid "Remove layer \"%s\" from the scenery?" +msgstr "Usunąć warstwę \"%s\" ze scenerii?" + +msgid "%d layer(s) it includes are removed with it." +msgstr "Razem z nią zostaną usunięte warstwy, które dołącza: %d." + +msgid "The layer holds:" +msgstr "Warstwa zawiera:" + +msgid "Make sure the rest of the scenery doesn't refer to its tracks, events or memory cells." +msgstr "Upewnij się, że reszta scenerii nie odwołuje się do jej torów, zdarzeń ani komórek pamięci." + +msgid "Move content of layer \"%s\" to:" +msgstr "Przenieś zawartość warstwy \"%s\" do:" + +msgid "no layer can take it" +msgstr "żadna warstwa nie może jej przyjąć" + +msgid "The text of the file is moved on save, the emptied file stays on the disk.\nMerged into the layer which includes it, the content stays where the include was.\nMerged into any other layer it's placed at its end, which changes the load order." +msgstr "Tekst pliku zostanie przeniesiony przy zapisie, opróżniony plik zostaje na dysku.\nScalona z warstwą, która ją dołącza, zawartość zostaje tam, gdzie był include.\nScalona z inną warstwą trafia na jej koniec, co zmienia kolejność wczytywania." + +msgid "Search templates" +msgstr "Szukaj szablonów" + +msgid "Described" +msgstr "Opisane" + +msgid "Used by the scenery" +msgstr "Użyte w scenerii" + +msgid "Rescan" +msgstr "Przeszukaj ponownie" + +msgid "Looks through the scenery directory again, for the templates added or changed outside of the editor" +msgstr "Przegląda katalog scenerii jeszcze raz, w poszukiwaniu szablonów dodanych lub zmienionych poza edytorem" + +msgid "%d template(s) in the scenery directory, %d described, %d ready for the node bank" +msgstr "Szablonów w katalogu scenerii: %d, opisanych: %d, gotowych do banku węzłów: %d" + +msgid "Not in the node bank: %s" +msgstr "Nie ma w banku węzłów: %s" + +msgid "param" +msgstr "param." + +msgid "role" +msgstr "rola" + +msgid "label" +msgstr "etykieta" + +msgid "default" +msgstr "domyślna" + +msgid "Complete: once saved, the template is offered by the node bank (Insert tab, Scenery templates)." +msgstr "Kompletny: po zapisaniu szablon pojawi się w banku węzłów (zakładka Wstaw, Szablony scenerii)." + +msgid "Not for the node bank yet: %s." +msgstr "Jeszcze nie do banku węzłów: %s." + +msgid "A template placed from the node bank gets the cursor location in the pos.* parameters, the rotation set in the\nInsert tab in rot.y, and a unique name (the default value followed by a random suffix) in the name parameter.\nThe other parameters receive their default values." +msgstr "Szablon wstawiony z banku węzłów dostaje położenie kursora w parametrach pos.*, obrót ustawiony w zakładce\nWstaw w rot.y, a w parametrze name niepowtarzalną nazwę (wartość domyślna z losowym przyrostkiem).\nPozostałe parametry dostają wartości domyślne." + +msgid "Suggest roles" +msgstr "Podpowiedz role" + +msgid "Sets roles of the parameters still marked as free, where the way the template uses them tells what they are" +msgstr "Ustawia role parametrów nadal oznaczonych jako wolne, gdy sposób ich użycia w szablonie mówi, czym są" + +msgid "Add parameter" +msgstr "Dodaj parametr" + +msgid "Save to file" +msgstr "Zapisz do pliku" + +msgid "Reload" +msgstr "Wczytaj ponownie" + +msgid "The .inc templates of the scenery directory. Describe a template and its parameters to add it to the node bank; the description is stored in the template file, as //$e comment lines." +msgstr "Szablony .inc z katalogu scenerii. Opisz szablon i jego parametry, żeby dodać go do banku węzłów; opis jest zapisywany w pliku szablonu jako linie komentarza //$e." + +msgid "The node bank offers the templates in a scenery opened for editing (-edit)." +msgstr "Bank węzłów oferuje szablony w scenerii otwartej do edycji (-edit)." + +msgid "Editor Settings" +msgstr "Ustawienia edytora" + +msgid "General" +msgstr "Ogólne" + +msgid "Camera movement" +msgstr "Ruch kamery" + +msgid "Transform gizmo (ImGuizmo)" +msgstr "Gizmo przekształceń (ImGuizmo)" + +msgid "Grid cells" +msgstr "Komórki siatki" + +msgid "Cell size (m)" +msgstr "Rozmiar komórki (m)" + +msgid "Base height (m)" +msgstr "Wysokość bazowa (m)" + +msgid "Texture (optional)" +msgstr "Tekstura (opcjonalnie)" + +msgid "Create flat terrain" +msgstr "Utwórz płaski teren" + +msgid "Chunks / side" +msgstr "Fragmenty / bok" + +msgid "Create chunked terrain" +msgstr "Utwórz teren z fragmentów" + +msgid "total %d x %d m, %d chunks" +msgstr "razem %d x %d m, fragmentów: %d" + +msgid "Chunk edit mode (LMB add neighbour / Shift = delete)" +msgstr "Tryb edycji fragmentów (LPM dodaje sąsiedni / Shift = usuń)" + +msgid "Grid chunks: %zu" +msgstr "Fragmenty siatki: %zu" + +msgid "Streaming (open world, follows camera)" +msgstr "Strumieniowanie (otwarty świat, za kamerą)" + +msgid "Stream radius" +msgstr "Promień strumieniowania" + +msgid "Persist edits to disk (16-bit)" +msgstr "Zapisuj zmiany na dysku (16-bit)" + +msgid "Stream terrain" +msgstr "Strumieniuj teren" + +msgid "Resident chunks: %zu (dir: %s)" +msgstr "Wczytane fragmenty: %zu (katalog: %s)" + +msgid "Patches: %zu" +msgstr "Łaty: %zu" + +msgid "Capture selected model as terrain" +msgstr "Zamień zaznaczony model na teren" + +msgid "Capture: select a model instance first" +msgstr "Zamiana: najpierw zaznacz instancję modelu" + +msgid "Brush radius" +msgstr "Promień pędzla" + +msgid "Brush strength" +msgstr "Siła pędzla" + +msgid "Raise centre" +msgstr "Podnieś środek" + +msgid "Lower centre" +msgstr "Obniż środek" + +msgid "Optimize (mesh simplification, all patches)" +msgstr "Optymalizacja (upraszczanie siatki, wszystkie łaty)" + +msgid "Flatness tol (m)" +msgstr "Tolerancja płaskości (m)" + +msgid "Auto-optimize after sculpt" +msgstr "Optymalizuj po rzeźbieniu" + +msgid "Optimize all" +msgstr "Optymalizuj wszystko" + +msgid "Full-res all" +msgstr "Pełna rozdzielczość wszędzie" + +msgid "Triangles: %zu / %zu" +msgstr "Trójkąty: %zu / %zu" + +msgid "Show orthophoto (geoportal.gov.pl)" +msgstr "Pokaż ortofotomapę (geoportal.gov.pl)" + +msgid "Scenery origin (0,0,0) in PUWG 1992 / EPSG:2180" +msgstr "Środek scenerii (0,0,0) w PUWG 1992 / EPSG:2180" + +msgid "X (northing, m)" +msgstr "X (northing, m)" + +msgid "Y (easting, m)" +msgstr "Y (easting, m)" + +msgid "Enter the origin of this scenery first" +msgstr "Najpierw podaj środek tej scenerii" + +msgid "Camera at X %.1f Y %.1f" +msgstr "Kamera w X %.1f Y %.1f" + +msgid "Distance (tiles)" +msgstr "Zasięg (kafle)" + +msgid "Fit to terrain" +msgstr "Dopasuj do terenu" + +msgid "Lays the imagery onto the ground geometry (terrain shapes, terrain tile models, editor terrain).\nPlaces without any ground use the height below." +msgstr "Kładzie zdjęcia na geometrii gruntu (kształty terenu, modele kafli terenu, teren edytora).\nMiejsca bez gruntu dostają wysokość podaną niżej." + +msgid "Refit" +msgstr "Dopasuj ponownie" + +msgid "Samples the ground again, after it was edited" +msgstr "Ponownie próbkuje grunt, po jego edycji" + +msgid "Lift above ground (m)" +msgstr "Uniesienie nad grunt (m)" + +msgid "Raises the fitted imagery above the ground. Keep it below the objects you want to see:\nin the scene everything lower than this ends up under the imagery." +msgstr "Unosi dopasowane zdjęcia nad grunt. Trzymaj je poniżej obiektów, które chcesz widzieć:\nw scenie wszystko, co jest niżej, znajdzie się pod zdjęciami." + +msgid "Height (m)" +msgstr "Wysokość (m)" + +msgid "Covered by objects and terrain" +msgstr "Zasłaniane przez obiekty i teren" + +msgid "Draws the imagery as part of the scene, so tracks, models and terrain in front of it hide it.\nIt is lit like the scene. Fully opaque, mouse placement lands on it as on any surface;\ntranslucent, it doesn't catch the mouse.\nNot available with the Better Renderer, which doesn't pick up geometry added in the editor." +msgstr "Rysuje zdjęcia jako część sceny, więc tory, modele i teren przed nimi je zasłaniają.\nJest oświetlone jak scena. W pełni kryjące łapie mysz przy wstawianiu jak każda powierzchnia;\nprzezroczyste nie łapie myszy.\nNiedostępne z Better Renderer, który nie widzi geometrii dodanej w edytorze." + +msgid "Opacity" +msgstr "Krycie" + +msgid "In the scene the opacity is part of the textures: the tiles are read again from the cache\nshortly after the slider stops, which takes a moment." +msgstr "W scenie krycie jest częścią tekstur: kafle są ponownie wczytywane z pamięci podręcznej\nchwilę po puszczeniu suwaka, co trwa moment." + +msgid "Newest" +msgstr "Najnowsze" + +msgid "4K tiles where available" +msgstr "Kafle 4K, gdzie są dostępne" + +msgid "4096 px tiles (~6 cm/px) from the high-resolution orthophoto, for the tiles around the camera.\nAreas it doesn't cover use the standard imagery. Each 4K tile takes ~85 MB of video memory." +msgstr "Kafle 4096 px (~6 cm/px) z ortofotomapy wysokiej rozdzielczości, dla kafli wokół kamery.\nTam, gdzie jej nie ma, zwykłe zdjęcia. Każdy kafel 4K zajmuje ~85 MB pamięci karty." + +msgid "Tiles: %d shown, %d loading, %d failed" +msgstr "Kafle: wyświetlane %d, wczytywane %d, nieudane %d" + +msgid "Retry" +msgstr "Ponów" + +msgid "This build has no HTTP client, only cached tiles are shown" +msgstr "Ten build nie ma klienta HTTP, widać tylko kafle z pamięci podręcznej" + +msgid "Cache: %s" +msgstr "Pamięć podręczna: %s" + +msgid "Imagery: GUGiK, geoportal.gov.pl" +msgstr "Zdjęcia: GUGiK, geoportal.gov.pl" + +msgid "Put all instances of the selected model on the ground" +msgstr "Postaw wszystkie instancje zaznaczonego modelu na ziemi" + +msgid "Select a model in the scene. Every instance of the same model file is moved straight up or down\nto the ground under it: terrain, large models and terrain made in the editor." +msgstr "Zaznacz model w scenie. Każda instancja tego samego pliku modelu zostanie przesunięta pionowo\nna grunt pod nią: teren, duże modele i teren zrobiony w edytorze." + +msgid "LMB: add outline point Backspace: remove last point" +msgstr "LPM: dodaj punkt obrysu Backspace: usuń ostatni punkt" + +msgid "Points: %zu Area: %.0f m2 (%.2f ha)" +msgstr "Punkty: %zu Powierzchnia: %.0f m2 (%.2f ha)" + +msgid "Remove last point" +msgstr "Usuń ostatni punkt" + +msgid "Clear outline" +msgstr "Wyczyść obrys" + +msgid "%zu templates in set" +msgstr "%zu szablonów w zestawie" + +msgid "Density (objects/ha)" +msgstr "Gęstość (obiektów/ha)" + +msgid "Min. spacing (m)" +msgstr "Min. odstęp (m)" + +msgid "Random rotation" +msgstr "Losowy obrót" + +msgid "Large models count as ground (terrain tiles)" +msgstr "Duże modele liczą się jako grunt (kafle terenu)" + +msgid "Estimated objects: %.0f" +msgstr "Szacowana liczba obiektów: %.0f" + +msgid "Fill area" +msgstr "Wypełnij obszar" + +msgid "Copies of the selected model, set out in a row" +msgstr "Kopie zaznaczonego modelu, ustawione w rzędzie" + +msgid "Fixed count" +msgstr "Stała liczba" + +msgid "Fit length" +msgstr "Dopasuj do długości" + +msgid "Count" +msgstr "Liczba" + +msgid "Number of the models in the array, the selected one included" +msgstr "Liczba modeli w tablicy, łącznie z zaznaczonym" + +msgid "As many copies are made as fit in this length, measured along the row" +msgstr "Powstaje tyle kopii, ile mieści się w tej długości, mierzonej wzdłuż rzędu" + +msgid "Relative offset" +msgstr "Odsunięcie względne" + +msgid "Distance between the copies as a part of the size of the model, along its axes: x, y (up), z.\n1 along an axis puts the copies end to end" +msgstr "Odległość między kopiami jako część rozmiaru modelu, wzdłuż jego osi: x, y (w górę), z.\n1 wzdłuż osi ustawia kopie jedna za drugą" + +msgid "x size" +msgstr "x rozmiaru" + +msgid "Constant offset" +msgstr "Odsunięcie stałe" + +msgid "Distance between the copies in metres, along the axes of the model: x, y (up), z.\nWith both offsets on the copies are set apart by their sum" +msgstr "Odległość między kopiami w metrach, wzdłuż osi modelu: x, y (w górę), z.\nPrzy obu odsunięciach kopie dzieli ich suma" + +msgid "Turn per copy (deg)" +msgstr "Obrót na kopię (°)" + +msgid "Each copy is turned by this much around the vertical axis against the one before it,\nand the row bends with them into an arc" +msgstr "Każda kopia jest obrócona o tyle wokół osi pionowej względem poprzedniej,\na rząd wygina się razem z nimi w łuk" + +msgid "Follow the ground" +msgstr "Za gruntem" + +msgid "The copies are put as high over the ground as the model is, instead of level with it.\nNot for the models large enough to count as ground themselves" +msgstr "Kopie stoją tak wysoko nad gruntem jak model, zamiast na jego poziomie.\nNie dla modeli tak dużych, że same liczą się jako grunt" + +msgid "Model %.2f x %.2f x %.2f m, %d in the array, %.2f m apart" +msgstr "Model %.2f x %.2f x %.2f m, w tablicy %d, co %.2f m" + +msgid "The array follows the settings" +msgstr "Tablica idzie za ustawieniami" + +msgid "The copies stay the way they are. Selecting or changing anything else does the same" +msgstr "Kopie zostają tak, jak są. To samo daje zaznaczenie lub zmiana czegokolwiek innego" + +msgid "Make array" +msgstr "Utwórz tablicę" + +msgid "Select a model to make an array of" +msgstr "Zaznacz model, z którego ma powstać tablica" + +msgid "Extent (m), wheel" +msgstr "Zasięg (m), kółko" + +msgid "Enabled" +msgstr "Włączone" + +msgid "Suspended while editing terrain" +msgstr "Wstrzymane podczas edycji terenu" + +msgid "Translate (Q)" +msgstr "Przesuń (Q)" + +msgid "Rotate (W)" +msgstr "Obróć (W)" + +msgid "Scale (E)" +msgstr "Skaluj (E)" + +msgid "Local space (R)" +msgstr "Układ lokalny (R)" + +msgid "Snap (hold Ctrl)" +msgstr "Krok (przytrzymaj Ctrl)" + +msgid "No node selected" +msgstr "Nic nie zaznaczono" + +msgid "Editor History" +msgstr "Historia edytora" + +msgid "Max history size" +msgstr "Maks. rozmiar historii" + +msgid "Max placement distance" +msgstr "Maks. odległość wstawiania" + +msgid "History (newest at end): %zu entries" +msgstr "Historia (najnowsze na końcu): %zu wpisów" + +msgid "Clear History" +msgstr "Wyczyść historię" + +msgid "Undo Selected" +msgstr "Cofnij zaznaczone" + +# scenery editor: modes, layers and messages + +msgid "Set##insert" +msgstr "Zestaw##insert" + +msgid "File" +msgstr "Plik" + +msgid "Start the simulator with -edit to save changes to the scenery files" +msgstr "Uruchom symulator z -edit , żeby zapisywać zmiany do plików scenerii" + +msgid "Export scenery dump" +msgstr "Eksportuj zrzut scenerii" + +msgid "Writes the whole scene to _export files next to the scenario, the scenery files are left as they are" +msgstr "Zapisuje całą scenę do plików _export obok scenariusza, pliki scenerii zostają bez zmian" + +msgid "Mode windows" +msgstr "Okna trybów" + +msgid "Toolset" +msgstr "Przybornik" + +msgid "Layers" +msgstr "Warstwy" + +msgid "Include database" +msgstr "Baza include'ów" + +msgid "Preset" +msgstr "Gotowy zestaw" + +msgid "Manual list" +msgstr "Lista ręczna" + +msgid "Insert" +msgstr "Wstaw" + +msgid "Brush" +msgstr "Pędzel" + +msgid "Area fill" +msgstr "Wypełnianie obszaru" + +msgid "Copy to bank" +msgstr "Kopiuj do banku" + +msgid "Random" +msgstr "Losowy" + +msgid "Fixed" +msgstr "Stały" + +msgid "Default (from template)" +msgstr "Domyślny (z szablonu)" + +msgid "Select a layer first" +msgstr "Najpierw zaznacz warstwę" + +msgid "Layer \"%s\" restored" +msgstr "Warstwa \"%s\" przywrócona" + +msgid "Remove..." +msgstr "Usuń..." + +msgid "Merge into..." +msgstr "Scal z..." + +msgid "The scenario file can't be merged into another layer" +msgstr "Pliku scenariusza nie da się scalić z inną warstwą" + +msgid "Layer \"%s\" can't take new nodes" +msgstr "Warstwa \"%s\" nie może przyjąć nowych węzłów" + +msgid "New layer, its file is created on save" +msgstr "Nowa warstwa, jej plik powstanie przy zapisie" + +msgid "Dropped from the scenery on save" +msgstr "Wypada ze scenerii przy zapisie" + +msgid "Scenery file" +msgstr "Plik scenerii" + +msgid "Layer \"%s\" created and made active. Its file is written on save." +msgstr "Warstwa \"%s\" utworzona i ustawiona jako aktywna. Jej plik zostanie zapisany przy zapisie." + +msgid "Layer \"%s\" removed. It can be restored until the scenery is saved." +msgstr "Warstwa \"%s\" usunięta. Można ją przywrócić, dopóki sceneria nie zostanie zapisana." + +msgid "Merge" +msgstr "Scal" + +msgid "Pick the target layer" +msgstr "Wybierz warstwę docelową" + +msgid "Layer \"%s\" merged into \"%s\". The files are changed on save." +msgstr "Warstwa \"%s\" scalona z \"%s\". Pliki zmienią się przy zapisie." + +msgid "WSAD (new)" +msgstr "WSAD (nowy)" + +msgid "Arrows (legacy)" +msgstr "Strzałki (stary)" + +msgid "The scenery wasn't opened for editing. Start the simulator with: -edit " +msgstr "Sceneria nie jest otwarta do edycji. Uruchom symulator z: -edit " + +msgid "Select a model in the scene first" +msgstr "Najpierw zaznacz model w scenie" + +msgid "Removed %zu objects of the last fill" +msgstr "Usunięto obiekty ostatniego wypełnienia: %zu" + +msgid "Outline needs at least 3 points" +msgstr "Obrys potrzebuje co najmniej 3 punktów" + +msgid "Selected model package is empty" +msgstr "Wybrany zestaw modeli jest pusty" + +msgid "Density too low for this area, nothing to place" +msgstr "Za mała gęstość na ten obszar, nie ma czego wstawić" + +msgid "Placed %zu of %zu objects" +msgstr "Wstawiono %zu z %zu obiektów" + +msgid "Model set" +msgstr "Zestaw modeli" + +msgid "Custom list" +msgstr "Własna lista" + +msgid "Undo last fill (%zu)" +msgstr "Cofnij ostatnie wypełnienie (%zu)" + +msgid "The offsets come to nothing, the copies would sit in the model" +msgstr "Odsunięcia dają zero, kopie siedziałyby w modelu" + +msgid "An array of one is the model itself, nothing to make" +msgstr "Tablica z jednego to sam model, nie ma czego tworzyć" + +msgid "The length takes no copy, nothing to make" +msgstr "Ta długość nie mieści żadnej kopii, nie ma czego tworzyć" + +msgid "Only %zu of %zu copies could be made" +msgstr "Udało się zrobić tylko %zu z %zu kopii" + +msgid "No copies with these settings" +msgstr "Przy tych ustawieniach nie ma kopii" + +msgid "The model and %zu copies; Ctrl+Z takes the array back" +msgstr "Model i kopie: %zu; Ctrl+Z cofa tablicę" + +msgid "Include selected, no gizmo under rotate or scale" +msgstr "Zaznaczony include, bez gizma przy obrocie lub skali" + +msgid "Include selected, axes as its template allows" +msgstr "Zaznaczony include, osie na tyle, na ile pozwala szablon" + +msgid "B: bend along %s" +msgstr "B: wygnij wzdłuż %s" + +msgid "Click: the reference point, where it lands on the model" +msgstr "Klik: punkt odniesienia tam, gdzie trafi w model" + +msgid "Drag: offset from the track" +msgstr "Przeciągnij: odsunięcie od toru" + +msgid "Shift: height Ctrl: along the track" +msgstr "Shift: wysokość Ctrl: wzdłuż toru" + +msgid "Click: edit the bent model" +msgstr "Klik: edytuj wygięty model" + +msgid "Bend it along the track (B)" +msgstr "Wygnij wzdłuż toru (B)" + +msgid "Select a model by a track, or click a bent one" +msgstr "Zaznacz model przy torze albo kliknij wygięty" + +msgid "LMB on a track: where the vehicle stands" +msgstr "LPM na torze: tam stanie pojazd" + +msgid "Platform" +msgstr "Peron" + +msgid "Puts the edge facing the track 1.725 m from its axis, set back by the widening of the gauge in the curves.\nStands on the plane of the rail heads carried on to its edge: lower on the inner side of a canted curve,\nhigher on the outer one; on the inner side also set back by the cant times the height of the edge / 1.5" +msgstr "Ustawia krawędź od strony toru 1,725 m od jego osi, odsuniętą o poszerzenie skrajni na łukach.\nStoi na płaszczyźnie główek szyn przedłużonej do krawędzi: niżej po wewnętrznej stronie łuku z przechyłką,\nwyżej po zewnętrznej; po wewnętrznej dodatkowo odsunięty o przechyłkę razy wysokość krawędzi / 1,5" diff --git a/scene/scenelayers.cpp b/scene/scenelayers.cpp index 7cfd8b145..e78f9bf17 100644 --- a/scene/scenelayers.cpp +++ b/scene/scenelayers.cpp @@ -837,7 +837,7 @@ bool node_layers::pending() const namespace { // marks of the lines the editor keeps track of -std::array const editormarks{"//$p", "//$b"}; +std::array const editormarks{"//$p", "//$b", "//$c"}; } // namespace void node_layers::scan(layer_handle const Layer) @@ -1104,3 +1104,28 @@ void node_layers::rebuilt(instance_handle const Instance) } // namespace scene //--------------------------------------------------------------------------- + +std::string scene::node_layers::check_sources() const +{ + std::map files; + std::size_t good{0}, bad{0}; + std::string report; + for (auto const &[node, source] : m_sources) + { + auto &text{files[source.layer]}; + if (text.empty()) + { + std::ifstream file(path(source.layer), std::ios::binary); + text.assign(std::istreambuf_iterator(file), std::istreambuf_iterator()); + } + auto const ok{source.span.valid() && static_cast(source.span.end) <= text.size()}; + std::string piece{ok ? text.substr(source.span.begin, source.span.end - source.span.begin) : std::string{}}; + auto const model{dynamic_cast(node) != nullptr}; + auto const fine{ok && piece.rfind("node", 0) == 0 && (false == model || (piece.size() >= 8 && piece.compare(piece.size() - 8, 8, "endmodel") == 0))}; + if (fine) + ++good; + else if (++bad <= 5) + report += " [" + node->name() + " " + std::to_string(source.span.begin) + "-" + std::to_string(source.span.end) + ": " + piece.substr(0, 60) + " ... " + (piece.size() > 30 ? piece.substr(piece.size() - 30) : std::string{}) + "]"; + } + return std::to_string(good) + " good, " + std::to_string(bad) + " bad" + report; +} diff --git a/scene/scenelayers.h b/scene/scenelayers.h index f59a37e0d..fc5ec082d 100644 --- a/scene/scenelayers.h +++ b/scene/scenelayers.h @@ -349,7 +349,8 @@ class node_layers // writes changes made in the editor to the scenery files: changed, created and deleted model instances and // memory cells, and layer changes. the files are left intact unless the whole operation can be performed. // Rootstatements: additional statements to place at the end of the scenario file - save_result save(std::vector const &Rootstatements = {}); + save_result save(std::vector const &Rootstatements = {}, std::vector const &Trailingstatements = {}); + std::string check_sources() const; private: // types diff --git a/scene/scenelayerssave.cpp b/scene/scenelayerssave.cpp index 7751a860a..b6b4ae17b 100644 --- a/scene/scenelayerssave.cpp +++ b/scene/scenelayerssave.cpp @@ -630,7 +630,7 @@ bool node_layers::compose(save_state &State, layer_handle const Layer, compositi } // writes changes made in the editor to the scenery files -save_result node_layers::save(std::vector const &Rootstatements) +save_result node_layers::save(std::vector const &Rootstatements, std::vector const &Trailingstatements) { save_result result; if (m_layers.empty()) @@ -1369,7 +1369,7 @@ save_result node_layers::save(std::vector const &Rootstatements) continue; } if (layer(candidate).created || state.patches.count(candidate) != 0 || appended.count(candidate) != 0 || created.count(candidate) != 0 || placed.count(candidate) != 0 || - markedtext.count(candidate) != 0 || (candidate == root && false == Rootstatements.empty())) + markedtext.count(candidate) != 0 || (candidate == root && (false == Rootstatements.empty() || false == Trailingstatements.empty()))) { outputs.emplace_back(candidate); } @@ -1479,6 +1479,14 @@ save_result node_layers::save(std::vector const &Rootstatements) added.text += statement + eol; } } + if (output == root && false == Trailingstatements.empty()) + { + composition trailing; + for (auto const &statement : Trailingstatements) + trailing.text += statement + eol; + ensure_newline(text.text, eol); + text.append(trailing); + } if (added.text.empty()) { continue; diff --git a/world/Sweep.cpp b/world/Sweep.cpp index ef3af81b5..422f03aab 100644 --- a/world/Sweep.cpp +++ b/world/Sweep.cpp @@ -20,6 +20,7 @@ http://mozilla.org/MPL/2.0/. #include "utilities/Logs.h" #include "utilities/parser.h" #include "vehicle/DynObj.h" +#include "world/Track.h" #include #include @@ -28,6 +29,7 @@ http://mozilla.org/MPL/2.0/. #include #include #include +#include namespace { @@ -36,6 +38,9 @@ double const sample_spacing{0.5}; // m along the curve between the samples std::size_t const vertex_limit{4000000}; // copies beyond this many vertices are left out double const slice_width{1.0}; // m of the model, the faces of a bent copy are cut into double const edge_band{0.3}; // m from the side facing the curve, where the top of the edge is looked for +double const outer_reach{30.0}; +double const overhang_band{0.15}; +double const overhang_depth{0.05}; struct cubic { @@ -75,6 +80,75 @@ double plan_distance(glm::dvec3 const &A, glm::dvec3 const &B) return glm::length(glm::dvec2{B.x - A.x, B.z - A.z}); } +// the gauge changes from 26 m ahead of a curve or of a cant ramp (PKP PLK ST-T2), so the tracks beyond the ends are looked at this far +double const lead_reach{26.0}; + +segment_data turned_piece(segment_data const &Path) +{ + segment_data result{Path}; + result.points[segment_data::point::start] = Path.points[segment_data::point::end]; + result.points[segment_data::point::end] = Path.points[segment_data::point::start]; + result.points[segment_data::point::control1] = Path.points[segment_data::point::control2]; + result.points[segment_data::point::control2] = Path.points[segment_data::point::control1]; + result.rolls = {-Path.rolls[1], -Path.rolls[0]}; + return result; +} + +bool same_points(segment_data const &A, segment_data const &B) +{ + for (int i = 0; i < 4; ++i) + if (glm::distance(A.points[i], B.points[i]) > 1e-3) + return false; + return true; +} + +glm::dvec3 plan_heading(segment_data const &Piece, double const T) +{ + auto const direction{cubic{Piece}.first(T)}; + glm::dvec3 const plan{direction.x, 0.0, direction.z}; + return glm::length(plan) > 1e-9 ? glm::normalize(plan) : glm::dvec3{0.0, 0.0, 1.0}; +} + +// paths going on from the end of the last of the pieces, each turned to lead away from it, up to the lead reach +std::vector paths_beyond(segment_data Last, std::vector const &Own) +{ + std::vector result; + double length{0.0}; + while (length < lead_reach && result.size() < 16) + { + auto const at{Last.points[segment_data::point::end]}; + if (simulation::Region == nullptr || false == simulation::Region->point_inside(at)) + break; + auto const &paths{simulation::Region->section(at).cell(at).m_directories.paths}; + std::optional next; + for (auto *track : paths) + { + if (track == nullptr || track->m_editorremoved || (track->iCategoryFlag & 1) == 0) + continue; + for (auto const &path : track->m_paths) + for (auto const forward : {true, false}) + { + auto const candidate{forward ? path : turned_piece(path)}; + if (next.has_value() || glm::distance(candidate.points[segment_data::point::start], at) > 0.01 || + glm::dot(plan_heading(Last, 1.0), plan_heading(candidate, 0.0)) < 0.9) + continue; + auto const known = [&](segment_data const &Piece) { return same_points(Piece, candidate) || same_points(turned_piece(Piece), candidate); }; + if (std::any_of(Own.begin(), Own.end(), known) || std::any_of(result.begin(), result.end(), known)) + continue; + next = candidate; + } + } + if (false == next.has_value()) + break; + cubic const curve{*next}; + for (int k = 1; k <= 8; ++k) + length += plan_distance(curve.point((k - 1) / 8.0), curve.point(k / 8.0)); + result.push_back(*next); + Last = *next; + } + return result; +} + // triangles of the model which share the look, in the space of the model struct model_part { @@ -84,10 +158,13 @@ struct model_part std::vector vertices; }; -void gather_parts(TSubModel *Submodel, glm::dmat4 const &Transform, material_data const &Skins, std::vector &Parts) +// without the parts lit at night (the glow, the pool of light on the ground), which the instances show only with the lights on +void gather_parts(TSubModel *Submodel, glm::dmat4 const &Transform, material_data const &Skins, std::array const &Lit, std::vector &Parts) { for (auto *submodel = Submodel; submodel != nullptr; submodel = submodel->Next) { + if (std::find(Lit.begin(), Lit.end(), submodel) != Lit.end()) + continue; auto transform{Transform}; if ((submodel->iFlags & 0xC000) != 0 && submodel->GetMatrix() != nullptr) { @@ -107,7 +184,7 @@ void gather_parts(TSubModel *Submodel, glm::dmat4 const &Transform, material_dat part.lighting.diffuse = submodel->f4Diffuse; part.lighting.specular = submodel->f4Specular; part.translucent = material != null_handle && GfxRenderer->Material(material)->get_or_guess_opacity() == 0.0f; - auto const normals{glm::dmat3(transform)}; + auto const normals{glm::transpose(glm::inverse(glm::dmat3(transform)))}; auto const &vertices{GfxRenderer->Vertices(submodel->m_geometry.handle)}; auto const &indices{GfxRenderer->Indices(submodel->m_geometry.handle)}; auto const take = [&](gfx::basic_vertex const &Vertex) { @@ -142,7 +219,7 @@ void gather_parts(TSubModel *Submodel, glm::dmat4 const &Transform, material_dat } if (submodel->Child != nullptr) { - gather_parts(submodel->Child, transform, Skins, Parts); + gather_parts(submodel->Child, transform, Skins, Lit, Parts); } } } @@ -207,6 +284,93 @@ std::vector slices(std::vector const &Vertices, std: return result; } +struct laid_model +{ + std::vector parts; + glm::dvec3 origin{0.0}; + glm::dvec3 low{std::numeric_limits::max()}; + glm::dvec3 high{-std::numeric_limits::max()}; + bool bent{false}; +}; + +struct layout +{ + std::vector models; + glm::dvec3 low{std::numeric_limits::max()}; + glm::dvec3 high{-std::numeric_limits::max()}; + glm::dvec3 shift{0.0}; + bool edge_far{false}; +}; + +bool lay_out(sweep_node const &Sweep, layout &Layout) +{ + auto const &definition{Sweep.definition()}; + auto const scaling{glm::scale(glm::dmat4(1.0), definition.scale)}; + for (auto const &entry : Sweep.items()) + { + laid_model model; + auto const transform{scaling * entry.transform}; + gather_parts(entry.model->Root, transform, entry.skins, entry.model->instance_parts().lights_on, model.parts); + model.origin = glm::dvec3(transform[3]); + if (false == model.parts.empty()) + Layout.models.push_back(std::move(model)); + } + if (Layout.models.empty()) + return false; + auto &low{Layout.low}; + auto &high{Layout.high}; + for (auto &model : Layout.models) + { + for (auto const &part : model.parts) + for (auto const &vertex : part.vertices) + { + auto const local{Sweep.axes(vertex.position)}; + model.low = glm::min(model.low, local); + model.high = glm::max(model.high, local); + } + low = glm::min(low, model.low); + high = glm::max(high, model.high); + } + for (auto &model : Layout.models) + model.bent = definition.bend && (Layout.models.size() == 1 || model.high.x - model.low.x >= 0.5 * (high.x - low.x)); + if (std::any_of(Layout.models.begin(), Layout.models.end(), [](laid_model const &Model) { return Model.bent; })) + { + low = glm::dvec3{std::numeric_limits::max()}; + high = glm::dvec3{-std::numeric_limits::max()}; + for (auto const &model : Layout.models) + if (model.bent) + { + low = glm::min(low, model.low); + high = glm::max(high, model.high); + } + } + auto const nearside{definition.lateral >= 0.0 ? low.y : high.y}; + auto const farside{definition.lateral >= 0.0 ? high.y : low.y}; + double edgetop{-std::numeric_limits::max()}; + double nearbottom{std::numeric_limits::max()}, farbottom{std::numeric_limits::max()}; + for (auto const &model : Layout.models) + if (model.bent || false == definition.bend) + for (auto const &part : model.parts) + for (auto const &vertex : part.vertices) + { + auto const local{Sweep.axes(vertex.position)}; + if (std::abs(local.y - nearside) <= edge_band) + edgetop = std::max(edgetop, local.z); + if (std::abs(local.y - nearside) <= overhang_band) + nearbottom = std::min(nearbottom, local.z); + if (std::abs(local.y - farside) <= overhang_band) + farbottom = std::min(farbottom, local.z); + } + if (edgetop == -std::numeric_limits::max()) + edgetop = high.z; + Layout.edge_far = farbottom > nearbottom + overhang_depth; + auto const point{Sweep.axes(definition.scale * definition.point)}; + double const sides[]{0.0, -nearside, -farside, -0.5 * (low.y + high.y), -point.y}; + double const heights[]{0.0, -low.z, -high.z, -edgetop, -point.z}; + Layout.shift = glm::dvec3{0.0, sides[std::clamp(definition.side_anchor, 0, 4)], heights[std::clamp(definition.height_anchor, 0, 4)]}; + return true; +} + } // namespace // height of the head of the rail on the side of the offset over the points of the track, less the height of the rail; 0 for no side @@ -222,7 +386,7 @@ double sweep_node::rail_head(double const Roll, double const Lateral) bool sweep_node::state::operator==(state const &Other) const { if (model != Other.model || skin != Other.skin || bend != Other.bend || step != Other.step || from != Other.from || to != Other.to || lateral != Other.lateral || height != Other.height || along_x != Other.along_x || - flip != Other.flip || mirror != Other.mirror || tilt != Other.tilt || face != Other.face || widen != Other.widen || parameters != Other.parameters || side_anchor != Other.side_anchor || height_anchor != Other.height_anchor || pieces.size() != Other.pieces.size()) + flip != Other.flip || mirror != Other.mirror || tilt != Other.tilt || face != Other.face || widen != Other.widen || platform != Other.platform || parameters != Other.parameters || side_anchor != Other.side_anchor || height_anchor != Other.height_anchor || point != Other.point || scale != Other.scale || pieces.size() != Other.pieces.size()) { return false; } @@ -285,6 +449,10 @@ void sweep_node::import(cParser &Input, glm::dvec3 const &Offset) { m_state.widen = true; } + else if (token == "platform") + { + m_state.platform = true; + } else if (token == "noface") { m_state.face = false; @@ -302,8 +470,18 @@ void sweep_node::import(cParser &Input, glm::dvec3 const &Offset) { auto const side{Input.getToken()}; auto const height{Input.getToken()}; - m_state.side_anchor = side == "near" ? 1 : side == "far" ? 2 : side == "centre" ? 3 : 0; - m_state.height_anchor = height == "bottom" ? 1 : height == "top" ? 2 : height == "edge" ? 3 : 0; + m_state.side_anchor = side == "near" ? 1 : side == "far" ? 2 : side == "centre" ? 3 : side == "point" ? 4 : 0; + m_state.height_anchor = height == "bottom" ? 1 : height == "top" ? 2 : height == "edge" ? 3 : height == "point" ? 4 : 0; + } + else if (token == "point") + { + Input.getTokens(3); + Input >> m_state.point.x >> m_state.point.y >> m_state.point.z; + } + else if (token == "scale") + { + Input.getTokens(3); + Input >> m_state.scale.x >> m_state.scale.y >> m_state.scale.z; } else if (token == "piece") { @@ -335,49 +513,295 @@ void sweep_node::define(state const &State) } } -void sweep_node::rebuild_samples() +void sweep_node::sample_piece(segment_data const &Piece, std::vector &Samples, double &Station) { - m_samples.clear(); - double station{0.0}; - for (auto const &piece : m_state.pieces) + cubic const curve{Piece}; + auto const count{std::clamp(static_cast(plan_distance(curve.p0, curve.p3) / sample_spacing), 4, 4000)}; + for (int k = Samples.empty() ? 0 : 1; k <= count; ++k) { - cubic const curve{piece}; - auto const count{std::clamp(static_cast(plan_distance(curve.p0, curve.p3) / sample_spacing), 4, 4000)}; - for (int k = m_samples.empty() ? 0 : 1; k <= count; ++k) + auto const t{static_cast(k) / count}; + auto const position{curve.point(t)}; + if (false == Samples.empty()) { - auto const t{static_cast(k) / count}; - auto const position{curve.point(t)}; - if (false == m_samples.empty()) + Station += plan_distance(Samples.back().position, position); + } + auto tangent{curve.first(t)}; + tangent = glm::length(tangent) > 1e-9 ? glm::normalize(tangent) : glm::dvec3{0.0, 0.0, 1.0}; + Samples.push_back({Station, position, tangent, Piece.rolls[0] + (Piece.rolls[1] - Piece.rolls[0]) * t, {}, {}}); + } +} + +// the structure gauge widens ahead of the curves and of the cant, the same way the gauge check of the editor has it +void sweep_node::gauge_along(std::vector &Samples) +{ + if (Samples.size() < 3) + return; + std::vector chainage, curvature, cant; + for (std::size_t i = 0; i < Samples.size(); ++i) + { + auto const &before{Samples[i == 0 ? 0 : i - 1]}; + auto const &after{Samples[std::min(i + 1, Samples.size() - 1)]}; + glm::dvec2 const a{before.tangent.x, before.tangent.z}; + glm::dvec2 const b{after.tangent.x, after.tangent.z}; + auto const span{after.station - before.station}; + auto const turn{glm::length(a) > 1e-9 && glm::length(b) > 1e-9 ? std::atan2(a.x * b.y - a.y * b.x, glm::dot(a, b)) : 0.0}; + chainage.push_back(Samples[i].station); + curvature.push_back(span > 1e-9 ? turn / span : 0.0); + cant.push_back(1.5 * std::abs(std::sin(glm::radians(Samples[i].roll)))); + } + auto const sections{gauge::sections(gauge::kind::unified, chainage, curvature, cant)}; + for (std::size_t i = 0; i < Samples.size() && i < sections.size(); ++i) + { + Samples[i].widening = sections[i].lower; + Samples[i].cant = sections[i].cant; + } +} + +void sweep_node::beside_switches(std::vector> const &Spans) +{ + auto const side{m_state.lateral >= 0.0 ? 1 : 0}; + auto const sign{m_state.lateral >= 0.0 ? 1.0 : -1.0}; + auto const edgeheight{std::max(0.0, m_state.height - gauge::rail_height)}; + auto const total = [&](sample const &Sample) { return Sample.widening[side] + std::max(0.0, Sample.cant[side]) * edgeheight / 1.5; }; + auto const matches = [](segment_data const &A, segment_data const &B) { + for (int i = 0; i < 4; ++i) + if (glm::distance(A.points[i], B.points[i]) > 1e-3) + return false; + return true; + }; + auto const turned = [](segment_data const &Path) { + segment_data result{Path}; + result.points[segment_data::point::start] = Path.points[segment_data::point::end]; + result.points[segment_data::point::end] = Path.points[segment_data::point::start]; + result.points[segment_data::point::control1] = Path.points[segment_data::point::control2]; + result.points[segment_data::point::control2] = Path.points[segment_data::point::control1]; + result.rolls = {-Path.rolls[1], -Path.rolls[0]}; + return result; + }; + for (std::size_t piece = 0; piece < m_state.pieces.size() && piece < Spans.size(); ++piece) + { + auto const &own{m_state.pieces[piece]}; + for (auto *track : simulation::Paths.sequence()) + { + if (track == nullptr || track->eType != tt_Switch || track->m_paths.size() < 2 || + plan_distance(track->m_paths.front().points[segment_data::point::start], own.points[segment_data::point::start]) > 300.0) + continue; + for (std::size_t path = 0; path < track->m_paths.size(); ++path) { - station += plan_distance(m_samples.back().position, position); + auto const forward{matches(own, track->m_paths[path])}; + if (false == forward && false == matches(own, turned(track->m_paths[path]))) + continue; + for (std::size_t other = 0; other < track->m_paths.size(); ++other) + { + if (other == path) + continue; + std::vector chain; + double station{0.0}; + if (forward) + { + for (auto const &sample : m_samples) + if (sample.station >= Spans[piece].first - outer_reach && sample.station < Spans[piece].first) + { + station = sample.station; + chain.push_back(sample); + } + sample_piece(track->m_paths[other], chain, station); + } + else + { + sample_piece(turned(track->m_paths[other]), chain, station); + auto const shift{station - Spans[piece].second}; + for (auto const &sample : m_samples) + if (sample.station > Spans[piece].second && sample.station <= Spans[piece].second + outer_reach) + { + chain.push_back(sample); + chain.back().station += shift; + } + } + gauge_along(chain); + for (auto &here : m_samples) + { + if (here.station < Spans[piece].first - outer_reach || here.station > Spans[piece].second + outer_reach) + continue; + glm::dvec3 const left{-here.tangent.z, 0.0, here.tangent.x}; + sample const *nearest{nullptr}; + auto best{std::numeric_limits::max()}; + for (auto const &point : chain) + { + auto const along{std::abs(glm::dot(glm::dvec3{point.position.x - here.position.x, 0.0, point.position.z - here.position.z}, here.tangent))}; + if (along < best) + { + best = along; + nearest = &point; + } + } + if (nearest == nullptr || best > sample_spacing) + continue; + auto const offset{sign * glm::dot(glm::dvec3{nearest->position.x - here.position.x, 0.0, nearest->position.z - here.position.z}, glm::length(left) > 1e-9 ? glm::normalize(left) : left)}; + if (offset > 0.05) + continue; + auto const needed{offset + total(*nearest)}; + if (needed > total(here)) + { + here.widening[side] = needed; + here.cant[side] = 0.0; + } + } + } } - auto tangent{curve.first(t)}; - tangent = glm::length(tangent) > 1e-9 ? glm::normalize(tangent) : glm::dvec3{0.0, 0.0, 1.0}; - m_samples.push_back({station, position, tangent, piece.rolls[0] + (piece.rolls[1] - piece.rolls[0]) * t, {}, {}}); } } - if (m_samples.size() > 2) +} + +bool sweep_node::bridge() +{ + auto const turned = [](segment_data const &Path) { + segment_data result{Path}; + result.points[segment_data::point::start] = Path.points[segment_data::point::end]; + result.points[segment_data::point::end] = Path.points[segment_data::point::start]; + result.points[segment_data::point::control1] = Path.points[segment_data::point::control2]; + result.points[segment_data::point::control2] = Path.points[segment_data::point::control1]; + result.rolls = {-Path.rolls[1], -Path.rolls[0]}; + return result; + }; + auto const same = [](segment_data const &A, segment_data const &B) { + for (int i = 0; i < 4; ++i) + if (glm::distance(A.points[i], B.points[i]) > 1e-3) + return false; + return true; + }; + auto const length = [](segment_data const &Piece) { + std::vector samples; + double station{0.0}; + sample_piece(Piece, samples, station); + return station; + }; + auto const heading = [](segment_data const &Piece, double const T) { + auto const direction{cubic{Piece}.first(T)}; + glm::dvec3 const plan{direction.x, 0.0, direction.z}; + return glm::length(plan) > 1e-9 ? glm::normalize(plan) : glm::dvec3{0.0, 0.0, 1.0}; + }; + auto state{m_state}; + auto changed{false}; + double station{0.0}; + for (std::size_t i = 0; i + 1 < state.pieces.size(); ++i) { - // the structure gauge widens ahead of the curves and of the cant, the same way the gauge check of the editor has it - std::vector chainage, curvature, cant; - for (std::size_t i = 0; i < m_samples.size(); ++i) + station += length(state.pieces[i]); + auto const target{state.pieces[i + 1].points[segment_data::point::start]}; + auto at{state.pieces[i].points[segment_data::point::end]}; + if (glm::distance(at, target) < 0.01) + continue; + auto const chord{plan_distance(at, target)}; + std::vector fill; + auto previous{state.pieces[i]}; + auto reached{false}; + for (int step = 0; step < 20 && false == reached; ++step) { - auto const &before{m_samples[i == 0 ? 0 : i - 1]}; - auto const &after{m_samples[std::min(i + 1, m_samples.size() - 1)]}; - glm::dvec2 const a{before.tangent.x, before.tangent.z}; - glm::dvec2 const b{after.tangent.x, after.tangent.z}; - auto const span{after.station - before.station}; - auto const turn{glm::length(a) > 1e-9 && glm::length(b) > 1e-9 ? std::atan2(a.x * b.y - a.y * b.x, glm::dot(a, b)) : 0.0}; - chainage.push_back(m_samples[i].station); - curvature.push_back(span > 1e-9 ? turn / span : 0.0); - cant.push_back(1.5 * std::abs(std::sin(glm::radians(m_samples[i].roll)))); - } - auto const sections{gauge::sections(gauge::kind::unified, chainage, curvature, cant)}; - for (std::size_t i = 0; i < m_samples.size() && i < sections.size(); ++i) - { - m_samples[i].widening = sections[i].lower; - m_samples[i].cant = sections[i].cant; + std::optional best; + auto bestdistance{std::numeric_limits::max()}; + for (auto *track : simulation::Paths.sequence()) + { + if (track == nullptr || track->m_editorremoved) + continue; + for (auto const &path : track->m_paths) + for (auto const forward : {true, false}) + { + auto const candidate{forward ? path : turned(path)}; + if (glm::distance(candidate.points[segment_data::point::start], at) > 0.01 || same(candidate, previous) || same(turned(candidate), previous)) + continue; + if (glm::dot(heading(previous, 1.0), heading(candidate, 0.0)) < 0.5) + continue; + auto const distance{glm::distance(candidate.points[segment_data::point::end], target)}; + if (distance < bestdistance) + { + bestdistance = distance; + best = candidate; + } + } + } + if (false == best.has_value()) + break; + fill.push_back(*best); + previous = *best; + at = best->points[segment_data::point::end]; + reached = glm::distance(at, target) < 0.01; } + if (false == reached) + continue; + double added{0.0}; + for (auto const &piece : fill) + added += length(piece); + auto const shift{added - chord}; + if (state.from >= station) + state.from += shift; + if (state.to >= station) + state.to += shift; + state.pieces.insert(state.pieces.begin() + i + 1, fill.begin(), fill.end()); + station += added; + i += fill.size(); + changed = true; + } + if (changed) + { + WriteLog("Sweep \"" + m_name + "\": the gaps between its pieces filled with the paths which join them"); + define(state); + } + return changed; +} + +void sweep_node::refresh() +{ + auto const current{m_state}; + define(current); +} + +void sweep_node::rebuild_samples() +{ + m_boundsvalid = false; + m_samples.clear(); + std::vector> spans; + std::vector before, after; + if ((m_state.widen || m_state.platform) && false == m_state.pieces.empty()) + { + before = paths_beyond(turned_piece(m_state.pieces.front()), m_state.pieces); + after = paths_beyond(m_state.pieces.back(), m_state.pieces); + } + double station{0.0}; + for (auto piece = before.rbegin(); piece != before.rend(); ++piece) + sample_piece(turned_piece(*piece), m_samples, station); + auto const head{station}; + auto const first{m_samples.empty() ? std::size_t{0} : m_samples.size() - 1}; + for (auto const &piece : m_state.pieces) + { + auto const begin{station}; + sample_piece(piece, m_samples, station); + spans.emplace_back(begin - head, station - head); + } + auto const last{m_samples.size()}; + for (auto const &piece : after) + sample_piece(piece, m_samples, station); + gauge_along(m_samples); + // the paths beyond the ends only lead the gauge in, the copies stay on the pieces + m_samples.erase(m_samples.begin() + last, m_samples.end()); + m_samples.erase(m_samples.begin(), m_samples.begin() + first); + for (auto &sample : m_samples) + sample.station -= head; + if ((m_state.widen || m_state.platform) && m_samples.size() > 2) + { + beside_switches(spans); + } + m_distances.clear(); + glm::dvec3 previous{0.0}; + for (auto const &sample : m_samples) + { + frame at; + at.widening = sample.widening; + at.cant = sample.cant; + glm::dvec3 left{-sample.tangent.z, 0.0, sample.tangent.x}; + left = glm::length(left) > 1e-9 ? glm::normalize(left) : glm::dvec3{-1.0, 0.0, 0.0}; + auto const point{sample.position + left * (m_state.lateral + setback(at))}; + m_distances.push_back(m_distances.empty() ? 0.0 : m_distances.back() + std::max(1e-6, plan_distance(previous, point))); + previous = point; } if (false == m_samples.empty()) { @@ -393,12 +817,114 @@ double sweep_node::length() const double sweep_node::start() const { - return std::clamp(m_state.from, 0.0, length()); + return m_state.from; } double sweep_node::end() const { - return m_state.to < 0.0 ? length() : std::clamp(m_state.to, start(), length()); + return m_state.to < 0.0 ? length() : std::max(m_state.to, start()); +} + +double sweep_node::distance_at(double const Station) const +{ + if (m_samples.size() < 2) + return Station; + if (Station <= m_samples.front().station) + return m_distances.front() + Station - m_samples.front().station; + if (Station >= m_samples.back().station) + return m_distances.back() + Station - m_samples.back().station; + auto const after{static_cast(std::upper_bound(m_samples.begin(), m_samples.end(), Station, [](double const Value, sample const &Sample) { return Value < Sample.station; }) - m_samples.begin())}; + auto const before{after - 1}; + auto const span{m_samples[after].station - m_samples[before].station}; + auto const f{span > 1e-9 ? (Station - m_samples[before].station) / span : 0.0}; + return m_distances[before] + (m_distances[after] - m_distances[before]) * f; +} + +double sweep_node::station_at(double const Distance) const +{ + if (m_samples.size() < 2) + return Distance; + if (Distance <= m_distances.front()) + return m_samples.front().station + Distance - m_distances.front(); + if (Distance >= m_distances.back()) + return m_samples.back().station + Distance - m_distances.back(); + auto const after{static_cast(std::upper_bound(m_distances.begin(), m_distances.end(), Distance) - m_distances.begin())}; + auto const before{after - 1}; + auto const span{m_distances[after] - m_distances[before]}; + auto const f{span > 1e-12 ? (Distance - m_distances[before]) / span : 0.0}; + return m_samples[before].station + (m_samples[after].station - m_samples[before].station) * f; +} + +double sweep_node::setback(frame const &At) const +{ + if (false == m_state.widen && false == m_state.platform) + return 0.0; + auto const side{m_state.lateral >= 0.0 ? 1 : 0}; + auto const edgeheight{std::max(0.0, m_state.height - gauge::rail_height)}; + auto const widening{At.widening[side] + std::max(0.0, At.cant[side]) * edgeheight / 1.5}; + return m_state.lateral >= 0.0 ? widening : -widening; +} + +double sweep_node::rise(frame const &At) const +{ + if (m_state.tilt) + return rail_head(At.roll, 0.0); + if (false == m_state.platform) + return rail_head(At.roll, m_state.lateral); + // PKP PLK ST-T2 table 3: H = Hi + D/2 -+ D (XB + dbS) / 1500 over the lower rail, with the cant D of the gauge, which + // changes from 20 m (inner side) and 26 m (outer side) ahead of the cant ramp, as the platform has to. taken as the + // turn of the edge with the plane of the rail heads, as the table has it only to the first order, and on the outer + // side, where the edge stays at XB + dbS instead of XB + dbS - dbD, the plane is higher by dbD D / 1500 there + auto const side{m_state.lateral >= 0.0 ? 1 : 0}; + auto const cant{At.cant[side]}; + auto const lower{rail_head(At.roll, 0.0) - 0.75 * std::abs(std::sin(glm::radians(At.roll)))}; + auto const edgeheight{std::max(0.0, m_state.height - gauge::rail_height)}; + auto const slope{std::clamp(cant / 1.5, -0.5, 0.5)}; + auto const level{std::sqrt(1.0 - slope * slope)}; + auto const across{std::abs(m_state.lateral) + std::abs(setback(At))}; + return lower + 0.5 * std::abs(cant) - (across - edgeheight * slope) * slope / level + edgeheight * (level - 1.0); +} + +glm::dvec3 sweep_node::axes(glm::dvec3 const &Vector) const +{ + auto const &definition{m_state}; + auto const needsflip{definition.along_x ? definition.lateral < 0.0 : definition.lateral > 0.0}; + auto const flip{definition.flip != (definition.face && needsflip)}; + glm::dvec3 result{definition.along_x ? Vector.x : Vector.z, definition.along_x ? Vector.z : -Vector.x, Vector.y}; + if (flip) + { + result.x = -result.x; + result.y = -result.y; + } + if (definition.mirror) + { + result.y = -result.y; + } + return result; +} + +bool sweep_node::bounds(glm::dvec3 &Low, glm::dvec3 &High, glm::dvec3 &Shift) const +{ + if (false == m_boundsvalid) + { + layout laid; + m_boundsfound = lay_out(*this, laid); + m_low = laid.low; + m_high = laid.high; + m_shift = laid.shift; + m_edgefar = laid.edge_far; + m_boundsvalid = true; + } + Low = m_low; + High = m_high; + Shift = m_shift; + return m_boundsfound; +} + +bool sweep_node::edge_far() const +{ + glm::dvec3 low, high, shift; + return bounds(low, high, shift) && m_edgefar; } sweep_node::frame sweep_node::frame_at(double const Station) const @@ -562,11 +1088,12 @@ double sweep_node::project(glm::dvec3 const &Point, double &Lateral) const double sweep_node::model_length() const { auto const pieces{items()}; + auto const scaling{glm::scale(glm::dmat4(1.0), m_state.scale)}; double low{std::numeric_limits::max()}, high{-std::numeric_limits::max()}; for (auto const &entry : pieces) { std::vector parts; - gather_parts(entry.model->Root, entry.transform, entry.skins, parts); + gather_parts(entry.model->Root, scaling * entry.transform, entry.skins, entry.model->instance_parts().lights_on, parts); for (auto const &part : parts) for (auto const &vertex : part.vertices) { @@ -584,93 +1111,16 @@ std::vector sweep_node::create_shapes() const auto const &definition{m_state}; if (m_samples.size() < 2) return shapes; - // the parts of each model of the template, and where the model stands in the template - struct piece - { - std::vector parts; - glm::dvec3 origin{0.0}; - glm::dvec3 low{std::numeric_limits::max()}; - glm::dvec3 high{-std::numeric_limits::max()}; - bool bent{false}; - }; - std::vector pieces; - for (auto const &entry : items()) - { - piece model; - gather_parts(entry.model->Root, entry.transform, entry.skins, model.parts); - model.origin = glm::dvec3(entry.transform[3]); - if (false == model.parts.empty()) - pieces.push_back(std::move(model)); - } - if (pieces.empty()) + layout laid; + if (false == lay_out(*this, laid)) return shapes; - // the side of the model facing the curve is the one its lateral axis points away from: -x, or -z for a model laid along x - auto const needsflip{definition.along_x ? definition.lateral < 0.0 : definition.lateral > 0.0}; - auto const flip{definition.flip != (definition.face && needsflip)}; - // the model's own axes: along the curve, sideways (+ to the right of it), and up - auto const axes = [&](glm::dvec3 const &Vector) { - glm::dvec3 result{definition.along_x ? Vector.x : Vector.z, definition.along_x ? Vector.z : -Vector.x, Vector.y}; - if (flip) - { - result.x = -result.x; - result.y = -result.y; - } - if (definition.mirror) - { - result.y = -result.y; - } - return result; - }; - glm::dvec3 low{std::numeric_limits::max()}, high{-std::numeric_limits::max()}; - for (auto &model : pieces) - { - for (auto const &part : model.parts) - for (auto const &vertex : part.vertices) - { - auto const local{axes(vertex.position)}; - model.low = glm::min(model.low, local); - model.high = glm::max(model.high, local); - } - low = glm::min(low, model.low); - high = glm::max(high, model.high); - } - // the long models of a template follow the curve, the others stand at their places along it - for (auto &model : pieces) - model.bent = definition.bend && (pieces.size() == 1 || model.high.x - model.low.x >= 0.5 * (high.x - low.x)); - // what's bent sets the length of a copy, its sides and its top; the rest only goes along with it - if (std::any_of(pieces.begin(), pieces.end(), [](piece const &Model) { return Model.bent; })) - { - low = glm::dvec3{std::numeric_limits::max()}; - high = glm::dvec3{-std::numeric_limits::max()}; - for (auto const &model : pieces) - if (model.bent) - { - low = glm::min(low, model.low); - high = glm::max(high, model.high); - } - } + auto &pieces{laid.models}; + auto const low{laid.low}; + auto const high{laid.high}; + auto const anchor_shift{laid.shift}; auto const own{high.x - low.x}; - // the point of the model the offset puts at its place, sideways and up - auto const nearside{definition.lateral >= 0.0 ? low.y : high.y}; - auto const farside{definition.lateral >= 0.0 ? high.y : low.y}; - double edgetop{-std::numeric_limits::max()}; - for (auto const &model : pieces) - if (model.bent || false == definition.bend) - for (auto const &part : model.parts) - for (auto const &vertex : part.vertices) - { - auto const local{axes(vertex.position)}; - if (std::abs(local.y - nearside) <= edge_band) - edgetop = std::max(edgetop, local.z); - } - if (edgetop == -std::numeric_limits::max()) - edgetop = high.z; - glm::dvec3 const anchor_shift{0.0, - definition.side_anchor == 1 ? -nearside : definition.side_anchor == 2 ? -farside : definition.side_anchor == 3 ? -0.5 * (low.y + high.y) : 0.0, - definition.height_anchor == 1 ? -low.z : definition.height_anchor == 2 ? -high.z : definition.height_anchor == 3 ? -edgetop : 0.0}; - auto const from{start()}; - auto const to{end()}; - auto const stretch{to - from}; + auto const first{distance_at(start())}; + auto const stretch{distance_at(end()) - first}; if (own < 1e-3 || stretch < 1e-3) return shapes; if (definition.bend) @@ -709,19 +1159,9 @@ std::vector sweep_node::create_shapes() const batches.push_back({Part.material, Part.lighting, Part.translucent, {}}); return batches.back().vertices; }; - // set back by the widening of the gauge: from the radius, and on the inner side of a canted curve by the lean of the cars - // at the height of the edge - auto const side{definition.lateral >= 0.0 ? 1 : 0}; - auto const edgeheight{std::max(0.0, definition.height - gauge::rail_height)}; - auto const setback = [&](frame const &At) { - if (false == definition.widen) - return 0.0; - auto const widening{At.widening[side] + std::max(0.0, At.cant[side]) * edgeheight / 1.5}; - return definition.lateral >= 0.0 ? widening : -widening; - }; // heights are given from the head of the rail on the side of the copies. the cant turns the track about its inner rail when the // simulation raises it for the cant, about the axis otherwise; a copy which leans with the cant goes up with the axis - auto const cone = [&](frame const &At) { return rail_head(At.roll, definition.tilt ? 0.0 : definition.lateral); }; + auto const cone = [&](frame const &At) { return rise(At); }; auto const upright = [](frame At) { glm::dvec3 forward{At.forward.x, 0.0, At.forward.z}; forward = glm::length(forward) > 1e-9 ? glm::normalize(forward) : glm::dvec3{0.0, 0.0, 1.0}; @@ -733,12 +1173,12 @@ std::vector sweep_node::create_shapes() const glm::dvec3 const offset{0.0, definition.height, 0.0}; for (std::size_t copy = 0; copy < count; ++copy) { - auto const base{from + spacing * static_cast(copy)}; + auto const base{first + spacing * static_cast(copy)}; for (auto const &model : pieces) { // a model which doesn't bend stands upright at its point: the place of its origin along the curve auto const anchor{axes(model.origin) + anchor_shift}; - auto const stand{upright(frame_at(definition.bend ? base + (anchor.x - low.x) * scale : base))}; + auto const stand{upright(frame_at(station_at(definition.bend ? base + (anchor.x - low.x) * scale : base)))}; for (auto const &part : model.parts) { auto &vertices{target(part)}; @@ -750,7 +1190,7 @@ std::vector sweep_node::create_shapes() const world_vertex placed{vertex}; if (model.bent) { - auto const at{frame_at(base + (local.x - low.x) * scale)}; + auto const at{frame_at(station_at(base + (local.x - low.x) * scale))}; placed.position = at.position + at.left * (local.y + definition.lateral + setback(at)) + at.up * local.z + offset + glm::dvec3{0.0, cone(at), 0.0}; placed.normal = glm::vec3(glm::normalize(at.forward * direction.x + at.left * direction.y + at.up * direction.z)); } @@ -822,7 +1262,7 @@ void sweep_node::export_as_text_(std::ostream &Output) const { Output << "step " << sweep.step << ' '; } - if (sweep.from > 0.0 || sweep.to >= 0.0) + if (sweep.from != 0.0 || sweep.to >= 0.0) { Output << "range " << sweep.from << ' ' << sweep.to << ' '; } @@ -854,6 +1294,10 @@ void sweep_node::export_as_text_(std::ostream &Output) const { Output << "widen "; } + if (sweep.platform) + { + Output << "platform "; + } if (false == sweep.parameters.empty()) { Output << "parameters " << sweep.parameters.size() << ' '; @@ -862,9 +1306,17 @@ void sweep_node::export_as_text_(std::ostream &Output) const } if (sweep.side_anchor != 0 || sweep.height_anchor != 0) { - char const *sides[] = {"origin", "near", "far", "centre"}; - char const *heights[] = {"origin", "bottom", "top", "edge"}; - Output << "anchor " << sides[std::clamp(sweep.side_anchor, 0, 3)] << ' ' << heights[std::clamp(sweep.height_anchor, 0, 3)] << ' '; + char const *sides[] = {"origin", "near", "far", "centre", "point"}; + char const *heights[] = {"origin", "bottom", "top", "edge", "point"}; + Output << "anchor " << sides[std::clamp(sweep.side_anchor, 0, 4)] << ' ' << heights[std::clamp(sweep.height_anchor, 0, 4)] << ' '; + } + if (sweep.side_anchor == 4 || sweep.height_anchor == 4) + { + Output << "point " << sweep.point.x << ' ' << sweep.point.y << ' ' << sweep.point.z << ' '; + } + if (sweep.scale != glm::dvec3{1.0}) + { + Output << "scale " << sweep.scale.x << ' ' << sweep.scale.y << ' ' << sweep.scale.z << ' '; } auto const precision{Output.precision(std::numeric_limits::digits10)}; for (auto const &piece : sweep.pieces) @@ -892,6 +1344,15 @@ void sweep_table::create_geometry(scene::scratch_data &Scratchpad) { continue; } + if (sweep->bridge()) + { + if (Global.editor_session) + sweep->mark_dirty(); + } + else if (sweep->definition().widen || sweep->definition().platform) + { + sweep->refresh(); + } if (Global.editor_session && false == Global.NvRenderer) { // scenery opened for editing: the copies are kept apart, so they can be changed later diff --git a/world/Sweep.h b/world/Sweep.h index 7da708d78..2a8a11f68 100644 --- a/world/Sweep.h +++ b/world/Sweep.h @@ -38,10 +38,13 @@ struct scratch_data; // facing the curve, the other side or its middle; up its origin, its bottom or its top), // axis (axis of the model laid along the curve), flip (the model goes the other way), mirror (its sides swapped), // widen (the offset grows by the widening of the structure gauge in the curves, the way the platforms are set back), +// platform (as widen, and the copies stand on the plane of the rail heads carried on to the edge: lowered on the inner +// side of a canted curve, raised on the outer one), // noface (the model isn't turned to have its -x side, or -z for one laid along x, facing the curve), // parameters ... (of a template: the model can be an *.inc file, its long models are bent, the others stand // upright at their places along the curve), -// anchor sides: origin, near, far, centre; heights: origin, bottom, top, edge (the top of the side facing the curve), +// scale (of the model, along its own axes), point (a point of the model, in its own space, taken by the anchor point), +// anchor sides: origin, near, far, centre, point; heights: origin, bottom, top, edge (the top of the side facing the curve), point, // tilt (bent copies lean with the cant of the curve; otherwise they stay upright, as the platforms and the walls by a track do, // at the height the plane of the cant has at their sideways offset) class sweep_node : public scene::basic_node @@ -64,9 +67,12 @@ class sweep_node : public scene::basic_node bool tilt{false}; bool face{true}; // the model is turned so its -x side (-z for a model laid along x) faces the curve bool widen{false}; // moved away from the curve by the widening of the structure gauge in the curves + bool platform{false}; // set back as widen does, and its height taken from the plane of the rail heads at its edge std::vector parameters; // of a template (*.inc) laid along the curve - int side_anchor{0}; // 0: origin, 1: the side facing the curve, 2: the far side, 3: the middle - int height_anchor{0}; // 0: origin, 1: bottom, 2: top, 3: top of the side facing the curve + int side_anchor{0}; // 0: origin, 1: the side facing the curve, 2: the far side, 3: the middle, 4: the point + int height_anchor{0}; // 0: origin, 1: bottom, 2: top, 3: top of the side facing the curve, 4: the point + glm::dvec3 point{0.0}; + glm::dvec3 scale{1.0}; std::vector pieces; bool operator==(state const &Other) const; @@ -101,6 +107,15 @@ class sweep_node : public scene::basic_node double end() const; // length of a copy along the curve, as the model has it double model_length() const; + bool bounds(glm::dvec3 &Low, glm::dvec3 &High, glm::dvec3 &Shift) const; + bool edge_far() const; + glm::dvec3 axes(glm::dvec3 const &Vector) const; + double distance_at(double const Station) const; + double station_at(double const Distance) const; + double setback(frame const &At) const; + // height the copies stand at over the points of the curve, less the height of the rail: the head of the rail on their side, + // for a platform the plane of the rail heads carried on to its edge, lower on the inner side of a canted curve + double rise(frame const &At) const; std::vector create_shapes() const; // a model of what's laid along the curve, placed in its space struct item @@ -115,6 +130,8 @@ class sweep_node : public scene::basic_node // puts the copies in the scene as shapes of their own, which can be taken back void show(); void hide(); + void refresh(); + bool bridge(); void merged(bool const Merged) { m_merged = Merged; @@ -142,8 +159,16 @@ class sweep_node : public scene::basic_node std::array widening; std::array cant; }; + static void sample_piece(segment_data const &Piece, std::vector &Samples, double &Station); + static void gauge_along(std::vector &Samples); + void beside_switches(std::vector> const &Spans); state m_state; std::vector m_samples; + std::vector m_distances; + mutable bool m_boundsvalid{false}; + mutable bool m_boundsfound{false}; + mutable bool m_edgefar{false}; + mutable glm::dvec3 m_low{0.0}, m_high{0.0}, m_shift{0.0}; bool m_merged{false}; owned_shapes m_shapes; }; From ee3833fdba0830fafebce11ce05c1adfc1976f80 Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 8 Oct 2026 01:12:30 +0200 Subject: [PATCH 156/430] feat(editor): platform edge put 1.725, 1.675 or 1.650 m from the axis of the track as chosen, kept in the editor settings; models along a track set back by the gauge of the other path of each switch whose points their line passes, also when they stand by the plain track ahead of the switch or by its straight path, the widening led in from the tracks beyond the diverging path; the line beyond the ends of a sweep goes on along the straightest path --- application/editormodeselftest.cpp | 12 +- application/editormodesweep.cpp | 40 ++++++- editor/editorSettings.cpp | 3 + editor/editorSettings.hpp | 4 + lang/editor_pl.po | 20 +++- world/Sweep.cpp | 184 +++++++++++++++-------------- world/Sweep.h | 2 +- 7 files changed, 163 insertions(+), 102 deletions(-) diff --git a/application/editormodeselftest.cpp b/application/editormodeselftest.cpp index ca07b7184..fa2f6b736 100644 --- a/application/editormodeselftest.cpp +++ b/application/editormodeselftest.cpp @@ -9,6 +9,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "application/editormode.h" +#include "editor/editorSettings.hpp" #include "application/application.h" #include "application/editoruilayer.h" #include "application/editorprojection.h" @@ -161,6 +162,8 @@ void editor_mode::selftest_step() tool.length_mode = length == "original" ? 0 : length == "all" ? 2 : 1; if (tool.length_mode == 1) tool.length = std::stod(length); + if (values.count("edge")) + EditorSettings.platform_edge(std::stod(values["edge"])); tool.measured.clear(); tool.open = true; sweep_curve(); @@ -193,7 +196,10 @@ void editor_mode::selftest_step() { // edge of the last laid model as it was made: its distance from the axis and the height of its top over the rail head std::string name; - words >> name; + double step{20.0}; + words >> name >> step; + if (name == "-") + name.clear(); auto *sweep{name.empty() ? m_sweep.edited : simulation::Sweeps.find(name)}; if (sweep == nullptr) { @@ -216,14 +222,14 @@ void editor_mode::selftest_step() if (lateral * sign <= 0.0) continue; auto const axis{sweep->frame_at(station)}; - auto &entry{bins[static_cast(station / 20.0)]}; + auto &entry{bins[static_cast(std::floor(station / step))]}; entry.edge = std::min(entry.edge, std::abs(lateral)); entry.points.emplace_back(std::abs(lateral), vertex.position.y - axis.position.y); } WriteLog(format("SELFTEST probe %s: %zu stretches with the model, %.1f - %.1f m of %.1f m", sweep->name().c_str(), bins.size(), sweep->start(), sweep->end(), sweep->length())); for (auto const &[index, entry] : bins) { - auto const station{index * 20.0 + 10.0}; + auto const station{(index + 0.5) * step}; if (station < sweep->start() || station > sweep->end()) continue; double top{-1000.0}; diff --git a/application/editormodesweep.cpp b/application/editormodesweep.cpp index c7f589e37..ed5e10dcb 100644 --- a/application/editormodesweep.cpp +++ b/application/editormodesweep.cpp @@ -14,6 +14,7 @@ http://mozilla.org/MPL/2.0/. #include "editor/editorFormat.hpp" #include "editor/editorGeometry.hpp" #include "editor/editorIncludeInfo.hpp" +#include "editor/editorSettings.hpp" #include "rendering/renderer.h" #include "scene/scenelayers.h" @@ -87,7 +88,7 @@ bool platform_model(std::string const &File) // the edge of the platform 1.725 m from the axis on the side it stands, set back further by the widening of the gauge void platform_edge(sweep_node::state &State, std::string const &Model, double const Base) { - State.lateral = std::copysign(1.725, State.lateral == 0.0 ? 1.0 : State.lateral); + State.lateral = std::copysign(EditorSettings.platform_edge(), State.lateral == 0.0 ? 1.0 : State.lateral); State.side_anchor = 1; State.height_anchor = 3; if (auto const height{platform_height(Model)}; height > 0.0) @@ -96,6 +97,23 @@ void platform_edge(sweep_node::state &State, std::string const &Model, double co State.platform = true; } +bool platform_distance() +{ + double const distances[]{1.725, 1.675, 1.650}; + char const *labels[]{STR_C("1.725 m: lines of out-of-gauge loads, older platforms"), STR_C("1.675 m: nominal by the 0.55 and 0.76 m platforms"), STR_C("1.650 m: the least allowed in service")}; + auto const current{EditorSettings.platform_edge()}; + int chosen{0}; + for (int i = 0; i < IM_ARRAYSIZE(distances); ++i) + if (std::abs(current - distances[i]) < std::abs(current - distances[chosen])) + chosen = i; + ImGui::SetNextItemWidth(300.0f); + if (false == ImGui::Combo(STR_C("edge of the platform from the axis"), &chosen, labels, IM_ARRAYSIZE(labels))) + return false; + EditorSettings.platform_edge(distances[chosen]); + EditorSettings.save(); + return true; +} + segment_data reversed(segment_data const &Path) { segment_data result{Path}; @@ -864,7 +882,12 @@ void editor_mode::render_sweep_ui() changed = true; } if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("The edge of the platform 1.725 m from the axis of the track, its top this high over the rail top")); + ImGui::SetTooltip(STR_C("The edge of the platform %.3f m from the axis of the track, its top this high over the rail top"), EditorSettings.platform_edge()); + } + if (platform_distance() && settings.platform) + { + settings.lateral = std::copysign(EditorSettings.platform_edge(), settings.lateral == 0.0 ? 1.0 : settings.lateral); + changed = true; } ImGui::TextDisabled(STR_C("%.2f m %s of the axis, %.2f m over the rail top"), std::abs(settings.lateral), settings.lateral >= 0.0 ? STR_C("right") : STR_C("left"), settings.height); if (false == tool.curve.empty() && tool.model_length > 0.0 && ImGui::Button(STR_C("Lay it along the selected path"))) @@ -921,7 +944,7 @@ void editor_mode::render_sweep_ui() changed = true; } if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("Puts the edge facing the track 1.725 m from its axis, set back by the widening of the gauge in the curves.\n" + ImGui::SetTooltip("%s", STR_C("Puts the edge facing the track at the distance chosen from its axis, set back by the widening of the gauge in the curves.\n" "Stands on the plane of the rail heads carried on to its edge: lower on the inner side of a canted curve,\n" "higher on the outer one; on the inner side also set back by the cant times the height of the edge / 1.5")); ImGui::TextDisabled("%s", STR_C("Length")); @@ -1676,8 +1699,13 @@ void editor_mode::render_bend() } changed = true; } + if (state.platform && platform_distance()) + { + state.lateral = std::copysign(EditorSettings.platform_edge(), state.lateral); + changed = true; + } if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("Puts the edge facing the track 1.725 m from its axis, set back by the widening of the gauge in the curves.\n" + ImGui::SetTooltip("%s", STR_C("Puts the edge facing the track at the distance chosen from its axis, set back by the widening of the gauge in the curves.\n" "Stands on the plane of the rail heads carried on to its edge: lower on the inner side of a canted curve,\n" "higher on the outer one; on the inner side also set back by the cant times the height of the edge / 1.5")); if (changed) @@ -1717,9 +1745,11 @@ void editor_mode::render_bend() ImGui::SetNextItemWidth(170.0f); ImGui::Combo(STR_C("axis of the model along the track"), &tool.axis, axes, IM_ARRAYSIZE(axes)); ImGui::Checkbox(STR_C("Turned around"), &tool.turned); + if (platform_model(source.file)) + platform_distance(); bool anchored{false}; anchors(anchored); - auto const signature{format("%p %d %d %d %d %d %d %.4f %.4f %.4f", key, tool.track, tool.axis, tool.turned ? 1 : 0, tool.along_anchor, tool.side_anchor, tool.height_anchor, tool.point.x, tool.point.y, tool.point.z)}; + auto const signature{format("%p %d %d %d %d %d %d %.4f %.4f %.4f %.3f", key, tool.track, tool.axis, tool.turned ? 1 : 0, tool.along_anchor, tool.side_anchor, tool.height_anchor, tool.point.x, tool.point.y, tool.point.z, EditorSettings.platform_edge())}; if (signature != tool.signature) { tool.signature = signature; diff --git a/editor/editorSettings.cpp b/editor/editorSettings.cpp index f97258184..b4c5fb31e 100644 --- a/editor/editorSettings.cpp +++ b/editor/editorSettings.cpp @@ -92,6 +92,8 @@ bool editorSettings::load() parse(value, m_orthophoto.lift); else if (key == "ortho_in_scene") m_orthophoto.in_scene = (value == "1"); + else if (key == "platform_edge") + parse(value, m_platform_edge); else if (key.rfind(origin_prefix, 0) == 0) { // northing;easting @@ -130,6 +132,7 @@ bool editorSettings::save() stream << "ortho_drape " << (m_orthophoto.drape ? 1 : 0) << "\n"; stream << "ortho_lift " << m_orthophoto.lift << "\n"; stream << "ortho_in_scene " << (m_orthophoto.in_scene ? 1 : 0) << "\n"; + stream << "platform_edge " << m_platform_edge << "\n"; stream << std::fixed << std::setprecision(3); for (auto const &origin : m_orthophoto_origins) stream << origin.first << " " << origin.second.first << ";" << origin.second.second << "\n"; diff --git a/editor/editorSettings.hpp b/editor/editorSettings.hpp index b43410fc3..6e39cfa08 100644 --- a/editor/editorSettings.hpp +++ b/editor/editorSettings.hpp @@ -39,10 +39,14 @@ public: bool orthophoto_origin(std::string const &Scenery, double &North, double &East) const; void orthophoto_origin(std::string const &Scenery, double North, double East); + double platform_edge() const { return m_platform_edge; } + void platform_edge(double Distance) { m_platform_edge = Distance; } + private: movement_scheme m_movement{movement_scheme::wsad}; orthophoto_settings m_orthophoto; std::map> m_orthophoto_origins; + double m_platform_edge{1.725}; }; // global editor settings instance diff --git a/lang/editor_pl.po b/lang/editor_pl.po index 1fb3fa0b3..cd6f4948d 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -2599,8 +2599,8 @@ msgstr "wierzch" msgid "Platform edge:" msgstr "Krawędź peronu:" -msgid "The edge of the platform 1.725 m from the axis of the track, its top this high over the rail top" -msgstr "Krawędź peronu 1,725 m od osi toru, wierzch tyle nad główką szyny" +msgid "The edge of the platform %.3f m from the axis of the track, its top this high over the rail top" +msgstr "Krawędź peronu %.3f m od osi toru, wierzch tyle nad główką szyny" msgid "Parameters of the template" msgstr "Parametry szablonu" @@ -4389,5 +4389,17 @@ msgstr "LPM na torze: tam stanie pojazd" msgid "Platform" msgstr "Peron" -msgid "Puts the edge facing the track 1.725 m from its axis, set back by the widening of the gauge in the curves.\nStands on the plane of the rail heads carried on to its edge: lower on the inner side of a canted curve,\nhigher on the outer one; on the inner side also set back by the cant times the height of the edge / 1.5" -msgstr "Ustawia krawędź od strony toru 1,725 m od jego osi, odsuniętą o poszerzenie skrajni na łukach.\nStoi na płaszczyźnie główek szyn przedłużonej do krawędzi: niżej po wewnętrznej stronie łuku z przechyłką,\nwyżej po zewnętrznej; po wewnętrznej dodatkowo odsunięty o przechyłkę razy wysokość krawędzi / 1,5" +msgid "Puts the edge facing the track at the distance chosen from its axis, set back by the widening of the gauge in the curves.\nStands on the plane of the rail heads carried on to its edge: lower on the inner side of a canted curve,\nhigher on the outer one; on the inner side also set back by the cant times the height of the edge / 1.5" +msgstr "Ustawia krawędź od strony toru w wybranej odległości od jego osi, odsuniętą o poszerzenie skrajni na łukach.\nStoi na płaszczyźnie główek szyn przedłużonej do krawędzi: niżej po wewnętrznej stronie łuku z przechyłką,\nwyżej po zewnętrznej; po wewnętrznej dodatkowo odsunięty o przechyłkę razy wysokość krawędzi / 1,5" + +msgid "1.725 m: lines of out-of-gauge loads, older platforms" +msgstr "1,725 m: linie przesyłek z przekroczoną skrajnią, starsze perony" + +msgid "1.675 m: nominal by the 0.55 and 0.76 m platforms" +msgstr "1,675 m: nominalnie przy peronach 0,55 i 0,76 m" + +msgid "1.650 m: the least allowed in service" +msgstr "1,650 m: najmniej dopuszczalne w eksploatacji" + +msgid "edge of the platform from the axis" +msgstr "krawędź peronu od osi toru" diff --git a/world/Sweep.cpp b/world/Sweep.cpp index 422f03aab..8e4f76cbd 100644 --- a/world/Sweep.cpp +++ b/world/Sweep.cpp @@ -129,12 +129,14 @@ std::vector paths_beyond(segment_data Last, std::vector 0.01 || - glm::dot(plan_heading(Last, 1.0), plan_heading(candidate, 0.0)) < 0.9) + if (glm::distance(candidate.points[segment_data::point::start], at) > 0.01 || glm::dot(plan_heading(Last, 1.0), plan_heading(candidate, 0.0)) < 0.9) continue; auto const known = [&](segment_data const &Piece) { return same_points(Piece, candidate) || same_points(turned_piece(Piece), candidate); }; if (std::any_of(Own.begin(), Own.end(), known) || std::any_of(result.begin(), result.end(), known)) continue; + auto const straight{glm::dot(plan_heading(candidate, 0.0), plan_heading(candidate, 1.0))}; + if (next.has_value() && straight <= glm::dot(plan_heading(*next, 0.0), plan_heading(*next, 1.0))) + continue; next = candidate; } } @@ -557,97 +559,108 @@ void sweep_node::gauge_along(std::vector &Samples) } } -void sweep_node::beside_switches(std::vector> const &Spans) +void sweep_node::beside_switches(std::vector &Samples) { + if (Samples.size() < 3) + return; auto const side{m_state.lateral >= 0.0 ? 1 : 0}; auto const sign{m_state.lateral >= 0.0 ? 1.0 : -1.0}; auto const edgeheight{std::max(0.0, m_state.height - gauge::rail_height)}; auto const total = [&](sample const &Sample) { return Sample.widening[side] + std::max(0.0, Sample.cant[side]) * edgeheight / 1.5; }; - auto const matches = [](segment_data const &A, segment_data const &B) { - for (int i = 0; i < 4; ++i) - if (glm::distance(A.points[i], B.points[i]) > 1e-3) - return false; - return true; + auto const plan = [](glm::dvec3 const &Vector) { + glm::dvec3 const flat{Vector.x, 0.0, Vector.z}; + return glm::length(flat) > 1e-9 ? glm::normalize(flat) : glm::dvec3{0.0, 0.0, 1.0}; }; - auto const turned = [](segment_data const &Path) { - segment_data result{Path}; - result.points[segment_data::point::start] = Path.points[segment_data::point::end]; - result.points[segment_data::point::end] = Path.points[segment_data::point::start]; - result.points[segment_data::point::control1] = Path.points[segment_data::point::control2]; - result.points[segment_data::point::control2] = Path.points[segment_data::point::control1]; - result.rolls = {-Path.rolls[1], -Path.rolls[0]}; - return result; - }; - for (std::size_t piece = 0; piece < m_state.pieces.size() && piece < Spans.size(); ++piece) + glm::dvec3 low{std::numeric_limits::max()}, high{-std::numeric_limits::max()}; + for (auto const &sample : Samples) { - auto const &own{m_state.pieces[piece]}; - for (auto *track : simulation::Paths.sequence()) - { - if (track == nullptr || track->eType != tt_Switch || track->m_paths.size() < 2 || - plan_distance(track->m_paths.front().points[segment_data::point::start], own.points[segment_data::point::start]) > 300.0) - continue; - for (std::size_t path = 0; path < track->m_paths.size(); ++path) + low = glm::min(low, sample.position); + high = glm::max(high, sample.position); + } + for (auto *track : simulation::Paths.sequence()) + { + if (track == nullptr || track->m_editorremoved || track->eType != tt_Switch || track->m_paths.size() < 2) + continue; + auto const points{track->m_paths.front().points[segment_data::point::start]}; + if (points.x < low.x - 1.0 || points.x > high.x + 1.0 || points.z < low.z - 1.0 || points.z > high.z + 1.0) + continue; + std::size_t at{0}; + auto best{std::numeric_limits::max()}; + for (std::size_t i = 0; i < Samples.size(); ++i) + if (auto const distance{plan_distance(Samples[i].position, points)}; distance < best) { - auto const forward{matches(own, track->m_paths[path])}; - if (false == forward && false == matches(own, turned(track->m_paths[path]))) + best = distance; + at = i; + } + if (best > sample_spacing) + continue; + auto const &near{Samples[at]}; + auto const along{plan(near.tangent)}; + glm::dvec3 const toward{points.x - near.position.x, 0.0, points.z - near.position.z}; + if (std::abs(glm::dot(toward, glm::dvec3{-along.z, 0.0, along.x})) > 0.05) + continue; + auto const s0{near.station + glm::dot(toward, along)}; + for (auto const &path : track->m_paths) + { + auto const heading{glm::dot(plan_heading(path, 0.0), along)}; + if (std::abs(heading) < 0.9) + continue; + auto const beyond{paths_beyond(path, {path})}; + std::vector chain; + double station{0.0}; + if (heading > 0.0) + { + for (auto const &sample : Samples) + if (sample.station >= s0 - outer_reach && sample.station < s0 - 1e-3) + { + station = sample.station; + chain.push_back(sample); + } + sample_piece(path, chain, station); + for (auto const &piece : beyond) + sample_piece(piece, chain, station); + } + else + { + for (auto piece = beyond.rbegin(); piece != beyond.rend(); ++piece) + sample_piece(turned_piece(*piece), chain, station); + sample_piece(turned_piece(path), chain, station); + auto const shift{station - s0}; + for (auto const &sample : Samples) + if (sample.station > s0 + 1e-3 && sample.station <= s0 + outer_reach) + { + chain.push_back(sample); + chain.back().station += shift; + } + } + gauge_along(chain); + for (auto &here : Samples) + { + if (plan_distance(here.position, points) > outer_reach + 2.0 * lead_reach + 100.0) continue; - for (std::size_t other = 0; other < track->m_paths.size(); ++other) + auto const forward{plan(here.tangent)}; + sample const *nearest{nullptr}; + auto closest{std::numeric_limits::max()}; + for (auto const &point : chain) { - if (other == path) - continue; - std::vector chain; - double station{0.0}; - if (forward) + auto const gap{std::abs(glm::dot(glm::dvec3{point.position.x - here.position.x, 0.0, point.position.z - here.position.z}, forward))}; + if (gap < closest) { - for (auto const &sample : m_samples) - if (sample.station >= Spans[piece].first - outer_reach && sample.station < Spans[piece].first) - { - station = sample.station; - chain.push_back(sample); - } - sample_piece(track->m_paths[other], chain, station); - } - else - { - sample_piece(turned(track->m_paths[other]), chain, station); - auto const shift{station - Spans[piece].second}; - for (auto const &sample : m_samples) - if (sample.station > Spans[piece].second && sample.station <= Spans[piece].second + outer_reach) - { - chain.push_back(sample); - chain.back().station += shift; - } - } - gauge_along(chain); - for (auto &here : m_samples) - { - if (here.station < Spans[piece].first - outer_reach || here.station > Spans[piece].second + outer_reach) - continue; - glm::dvec3 const left{-here.tangent.z, 0.0, here.tangent.x}; - sample const *nearest{nullptr}; - auto best{std::numeric_limits::max()}; - for (auto const &point : chain) - { - auto const along{std::abs(glm::dot(glm::dvec3{point.position.x - here.position.x, 0.0, point.position.z - here.position.z}, here.tangent))}; - if (along < best) - { - best = along; - nearest = &point; - } - } - if (nearest == nullptr || best > sample_spacing) - continue; - auto const offset{sign * glm::dot(glm::dvec3{nearest->position.x - here.position.x, 0.0, nearest->position.z - here.position.z}, glm::length(left) > 1e-9 ? glm::normalize(left) : left)}; - if (offset > 0.05) - continue; - auto const needed{offset + total(*nearest)}; - if (needed > total(here)) - { - here.widening[side] = needed; - here.cant[side] = 0.0; - } + closest = gap; + nearest = &point; } } + if (nearest == nullptr || closest > sample_spacing) + continue; + auto const offset{sign * glm::dot(glm::dvec3{nearest->position.x - here.position.x, 0.0, nearest->position.z - here.position.z}, glm::dvec3{-forward.z, 0.0, forward.x})}; + if (offset > 0.05) + continue; + auto const needed{offset + total(*nearest)}; + if (needed > total(here)) + { + here.widening[side] = needed; + here.cant[side] = 0.0; + } } } } @@ -759,7 +772,6 @@ void sweep_node::rebuild_samples() { m_boundsvalid = false; m_samples.clear(); - std::vector> spans; std::vector before, after; if ((m_state.widen || m_state.platform) && false == m_state.pieces.empty()) { @@ -772,24 +784,18 @@ void sweep_node::rebuild_samples() auto const head{station}; auto const first{m_samples.empty() ? std::size_t{0} : m_samples.size() - 1}; for (auto const &piece : m_state.pieces) - { - auto const begin{station}; sample_piece(piece, m_samples, station); - spans.emplace_back(begin - head, station - head); - } auto const last{m_samples.size()}; for (auto const &piece : after) sample_piece(piece, m_samples, station); gauge_along(m_samples); + if (m_state.widen || m_state.platform) + beside_switches(m_samples); // the paths beyond the ends only lead the gauge in, the copies stay on the pieces m_samples.erase(m_samples.begin() + last, m_samples.end()); m_samples.erase(m_samples.begin(), m_samples.begin() + first); for (auto &sample : m_samples) sample.station -= head; - if ((m_state.widen || m_state.platform) && m_samples.size() > 2) - { - beside_switches(spans); - } m_distances.clear(); glm::dvec3 previous{0.0}; for (auto const &sample : m_samples) diff --git a/world/Sweep.h b/world/Sweep.h index 2a8a11f68..c1a595810 100644 --- a/world/Sweep.h +++ b/world/Sweep.h @@ -161,7 +161,7 @@ class sweep_node : public scene::basic_node }; static void sample_piece(segment_data const &Piece, std::vector &Samples, double &Station); static void gauge_along(std::vector &Samples); - void beside_switches(std::vector> const &Spans); + void beside_switches(std::vector &Samples); state m_state; std::vector m_samples; std::vector m_distances; From a5ade3258ff8be00a9a781e58b08f2688ce4eb64 Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 8 Oct 2026 01:39:35 +0200 Subject: [PATCH 157/430] fix(editor): a curve with a switch in it read as one curve through the main track of the switch, the switch placed into a curve on the part around the click; the diverging path of a switch placed into a canted curve lies on the conical surface of the cant along its whole length, not only at its ends; platforms by a switch keep the cant of the track for their height, the gauge of the other path only sets them back --- application/editormode.h | 1 + application/editormodeselftest.cpp | 62 ++++++++++++++++++++++++++++++ application/editormodetrack.cpp | 24 +++++++++++- editor/editorTrack.cpp | 24 +++++++++++- world/Sweep.cpp | 5 +-- 5 files changed, 109 insertions(+), 7 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index ee0fade62..7bc24ab07 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -926,6 +926,7 @@ class editor_mode : public application_mode, private editor_track::observer bool switch_reach(glm::dvec3 const &Ground, glm::dvec3 &Point); glm::dvec3 cursor_ground() const; glm::dvec3 cursor_level(double const Height) const; + std::optional m_cursor_override; bool sweep_grabs(glm::dvec3 const &Point); // menu of the path a click of the right mouse button lands on struct track_context diff --git a/application/editormodeselftest.cpp b/application/editormodeselftest.cpp index fa2f6b736..c25d6726d 100644 --- a/application/editormodeselftest.cpp +++ b/application/editormodeselftest.cpp @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "application/editormode.h" #include "editor/editorSettings.hpp" +#include "editor/editorGeometry.hpp" #include "application/application.h" #include "application/editoruilayer.h" #include "application/editorprojection.h" @@ -273,6 +274,67 @@ void editor_mode::selftest_step() text += format(" [%.1f %.2f..%.2f]", index * 0.1, column.first, column.second); WriteLog(format("SELFTEST profile %s at %.0f m:", name.c_str(), station) + text); } + else if (command == "curvedswitch") + { + std::string name, label; + glm::dvec3 at{0.0}, toward{0.0}; + words >> name >> at.x >> at.z >> toward.x >> toward.z >> label; + m_node = simulation::Paths.find(name); + ui()->set_node(m_node); + show_track_tab(track_tab::turnout); + arm_switch(); + auto &tool{m_switch}; + for (int i = 0; i < static_cast(tool.templates.size()); ++i) + if (false == label.empty() && tool.templates[i].label.find(label) != std::string::npos) + { + tool.armed = i; + break; + } + m_cursor_override = at; + auto const started{start_switch_placement()}; + m_cursor_override.reset(); + if (false == started) + { + WriteLog("SELFTEST curvedswitch: not started, " + tool.status); + continue; + } + tool.mouse = glm::dvec3{toward.x, tool.point.y, toward.z}; + finish_switch_placement(); + WriteLog("SELFTEST curvedswitch " + (tool.armed >= 0 ? tool.templates[tool.armed].label : std::string{}) + ": " + tool.status); + } + else if (command == "conecheck") + { + std::string name; + words >> name; + auto *track{simulation::Paths.find(name)}; + if (track == nullptr || track->m_paths.size() < 2) + { + WriteLog("SELFTEST conecheck: no switch " + name); + continue; + } + geometry::bezier const main{track->m_paths[0]}; + geometry::bezier const other{track->m_paths[1]}; + std::string text; + for (double t = 0.125; t < 1.01; t += 0.125) + { + auto const point{other.point(t)}; + double best{std::numeric_limits::max()}, along{0.0}; + for (int k = 0; k <= 2000; ++k) + if (auto const distance{geometry::plan_distance(main.point(k / 2000.0), point)}; distance < best) + { + best = distance; + along = k / 2000.0; + } + auto const base{main.point(along)}; + auto const direction{glm::normalize(geometry::plan_of(main.first(along)))}; + auto const lateral{(point.x - base.x) * -direction.y + (point.z - base.z) * direction.x}; + auto const &path{track->m_paths[0]}; + auto const roll{glm::radians(path.rolls[0] + (path.rolls[1] - path.rolls[0]) * along)}; + auto const cone{base.y - lateral * std::tan(roll)}; + text += format(" [t %.3f off %.3f dy %.4f]", t, lateral, point.y - cone); + } + WriteLog("SELFTEST conecheck " + name + ":" + text); + } else if (command == "fouling") { std::map values; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index fe4db564d..d0fb05932 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -3815,6 +3815,8 @@ glm::dvec3 editor_mode::cursor_ground() const glm::dvec3 editor_mode::cursor_level(double const Height) const { + if (m_cursor_override.has_value()) + return glm::dvec3{m_cursor_override->x, Height, m_cursor_override->z}; glm::dvec3 const ground{cursor_ground()}; screen_projection const projection; glm::dvec3 level; @@ -4565,11 +4567,17 @@ bool editor_mode::start_switch_placement() tool.status = STR_C("The selected track is neither a recognized straight nor a curve"); return false; } - if (false == editor_track::find_chain(curve.from, curve.to, chain, error)) + if (false == editor_track::find_chain(curve.from, curve.to, chain, error, true)) { tool.status = error.empty() ? std::string{STR_C("The curve can't be followed")} : error; return false; } + for (auto const &part : editor_track::chain_parts(chain)) + if (std::find(part.tracks.begin(), part.tracks.end(), track) != part.tracks.end()) + { + chain = part; + break; + } tool.frame = sample_chain(chain); tool.frame_tracks = chain.tracks; if (tool.frame.size() < 2) @@ -5825,6 +5833,20 @@ std::vector editor_mode::curved_switch_paths(editor_track::switch_ auto const p0{map(start, startdirection, localstart)}; auto const p3{map(end, enddirection, localend)}; auto path{hermite(p0, startdirection, p3, enddirection)}; + { + auto const cone = [&](double const T) { + auto const point{bezier{path}.point(T)}; + auto const sample{sample_at(Frame, nearest_station(Frame, point))}; + auto const lateral{glm::dot(plan_of(point) - plan_of(sample.position), glm::dvec2{-sample.tangent.y, sample.tangent.x})}; + return sample.position.y - lateral * std::tan(glm::radians(static_cast(sample.roll))); + }; + auto const h1{cone(1.0 / 3.0)}; + auto const h2{cone(2.0 / 3.0)}; + auto const y1{3.0 * h1 - 1.5 * h2 - 5.0 / 6.0 * p0.y + p3.y / 3.0}; + auto const y2{3.0 * h2 - 1.5 * h1 + p0.y / 3.0 - 5.0 / 6.0 * p3.y}; + path.points[segment_data::point::control1].y = y1 - p0.y; + path.points[segment_data::point::control2].y = y2 - p3.y; + } auto const rollstart{sample_at(Frame, Station + Direction * start.z).roll * Direction}; auto const rollend{sample_at(Frame, Station + Direction * end.z).roll * Direction}; path.rolls = {static_cast(rollstart), static_cast(rollend)}; diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index 11a6a1cf3..f661e5188 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -1368,12 +1368,32 @@ bool editor_track::find_curve(TTrack &Track, straight_tolerance const &Tolerance return false; std::deque> run{{&Track, true}}; + auto const known = [&](TTrack const *Other) { return std::any_of(run.begin(), run.end(), [&](auto const &Member) { return Member.first == Other; }); }; for (auto const throughend : {true, false}) { TTrack *previous{&Track}; TTrack *current{throughend ? Track.trNext : Track.trPrev}; - while (curved(current) && std::none_of(run.begin(), run.end(), [&](auto const &Member) { return Member.first == current; })) + while (current != nullptr && false == known(current)) { + if (current->eType == tt_Switch && has_switch_paths(*current) && is_supported(*current) && false == current->m_editorremoved) + { + auto const &extension{*current->SwitchExtension}; + bool const atstart{extension.pPrevs[0] == previous}; + if (atstart == (extension.pNexts[0] == previous)) + break; + auto *beyond{atstart ? extension.pNexts[0] : extension.pPrevs[0]}; + if (false == curved(beyond) || known(beyond)) + break; + if (throughend) + run.emplace_back(current, atstart); + else + run.emplace_front(current, false == atstart); + previous = current; + current = beyond; + continue; + } + if (false == curved(current)) + break; auto const entersatstart{current->trPrev == previous}; if (throughend) run.emplace_back(current, entersatstart); @@ -1433,7 +1453,7 @@ bool editor_track::analyse_curve(std::vector> const &R for (std::size_t i = 0; i < run.size(); ++i) { auto const &path{run[i].first->m_paths.front()}; - auto const length{run[i].first->Length()}; + auto const length{run[i].first->eType == tt_Switch ? bezier{path}.plan_length() : run[i].first->Length()}; auto const internal{signed_angle(incoming(i), outgoing(i))}; turns.push_back(internal + kinks[i] * 0.5 + kinks[i + 1] * 0.5); lengths.push_back(length); diff --git a/world/Sweep.cpp b/world/Sweep.cpp index 8e4f76cbd..42dd07c0b 100644 --- a/world/Sweep.cpp +++ b/world/Sweep.cpp @@ -657,10 +657,7 @@ void sweep_node::beside_switches(std::vector &Samples) continue; auto const needed{offset + total(*nearest)}; if (needed > total(here)) - { - here.widening[side] = needed; - here.cant[side] = 0.0; - } + here.widening[side] = needed - std::max(0.0, here.cant[side]) * edgeheight / 1.5; } } } From 2626c8c86b73ee381b36be6065f9027969078455 Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 8 Oct 2026 01:48:41 +0200 Subject: [PATCH 158/430] fix(editor): platform edge by the points of a switch keeps the setback of the diverging path, the sample at the points counted with the line leading into the switch --- application/editormodeselftest.cpp | 15 +++++++++++++++ world/Sweep.cpp | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/application/editormodeselftest.cpp b/application/editormodeselftest.cpp index c25d6726d..b84287c2d 100644 --- a/application/editormodeselftest.cpp +++ b/application/editormodeselftest.cpp @@ -335,6 +335,21 @@ void editor_mode::selftest_step() } WriteLog("SELFTEST conecheck " + name + ":" + text); } + else if (command == "frames") + { + std::string name; + double from{0.0}, to{0.0}, step{0.1}; + words >> name >> from >> to >> step; + auto *sweep{simulation::Sweeps.find(name)}; + if (sweep == nullptr) + continue; + auto const side{sweep->definition().lateral >= 0.0 ? 1 : 0}; + for (double station = from; station <= to + 1e-9; station += step) + { + auto const at{sweep->frame_at(station)}; + WriteLog(format("SELFTEST frame %s %.2f: %.3f %.3f %.3f widening %.4f cant %.4f setback %.4f", name.c_str(), station, at.position.x, at.position.y, at.position.z, at.widening[side], at.cant[side], sweep->setback(at))); + } + } else if (command == "fouling") { std::map values; diff --git a/world/Sweep.cpp b/world/Sweep.cpp index 42dd07c0b..cac360361 100644 --- a/world/Sweep.cpp +++ b/world/Sweep.cpp @@ -611,7 +611,7 @@ void sweep_node::beside_switches(std::vector &Samples) if (heading > 0.0) { for (auto const &sample : Samples) - if (sample.station >= s0 - outer_reach && sample.station < s0 - 1e-3) + if (sample.station >= s0 - outer_reach && sample.station <= s0 + 1e-3) { station = sample.station; chain.push_back(sample); @@ -650,7 +650,7 @@ void sweep_node::beside_switches(std::vector &Samples) nearest = &point; } } - if (nearest == nullptr || closest > sample_spacing) + if (nearest == nullptr || closest > 1.5 * sample_spacing) continue; auto const offset{sign * glm::dot(glm::dvec3{nearest->position.x - here.position.x, 0.0, nearest->position.z - here.position.z}, glm::dvec3{-forward.z, 0.0, forward.x})}; if (offset > 0.05) From 095dae91b67e805fccfb56c17c551a8f49e0a216 Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 8 Oct 2026 01:50:00 +0200 Subject: [PATCH 159/430] fix(editor): track laid on past the diverging end of a switch goes on with the radius of the real diverging path, a switch placed into a curve stores the radius its diverging path really has instead of the one of the template --- application/editormodetrack.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index d0fb05932..9ea3a14eb 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -4068,7 +4068,7 @@ std::vector editor_mode::extend_pieces() const if (std::abs(turn) > 1e-4) { int const side{turn > 0.0 ? 1 : -1}; - auto const radius{std::abs(diverging.radius) > 1.0f ? static_cast(std::abs(diverging.radius)) : curve.plan_length() / std::abs(turn)}; + auto const radius{curve.plan_length() / std::abs(turn)}; auto const &direction{tool.direction}; auto const centre{plan_of(tool.point) + glm::dvec2{-direction.y, direction.x} * (side * radius)}; auto const angle{geometry::signed_angle(plan_of(tool.point) - centre, plan_of(tool.mouse) - centre) * side}; @@ -5851,6 +5851,14 @@ std::vector editor_mode::curved_switch_paths(editor_track::switch_ auto const rollend{sample_at(Frame, Station + Direction * end.z).roll * Direction}; path.rolls = {static_cast(rollstart), static_cast(rollend)}; path.radius = local.radius; + { + bezier const curve{path}; + auto const begin{plan_of(curve.first(0.0))}; + auto const finish{plan_of(curve.first(1.0))}; + auto const turn{glm::length(begin) > 1e-9 && glm::length(finish) > 1e-9 ? geometry::signed_angle(begin, finish) : 0.0}; + if (local.radius != 0.f && std::abs(turn) > 1e-6) + path.radius = static_cast(std::copysign(curve.plan_length() / std::abs(turn), static_cast(local.radius))); + } result.push_back(path); } if (false == result.empty()) From 898b4fcaf7829565612a9fbce5f1cb0690a3d01c Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 8 Oct 2026 01:53:34 +0200 Subject: [PATCH 160/430] feat(editor): switch drive placed with a switch leans with the grade and the cant of the track at the points, raised as the simulation raises a canted track --- application/editormode.h | 1 + application/editormodelineside.cpp | 2 +- application/editormodeselftest.cpp | 32 ++++++++++++++++++++++++++++++ application/editormodetrack.cpp | 8 ++++++++ editor/editorIncludeInfo.cpp | 10 +++++++++- editor/editorIncludeInfo.hpp | 2 +- 6 files changed, 52 insertions(+), 3 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index 7bc24ab07..b911e0e14 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -1042,6 +1042,7 @@ class editor_mode : public application_mode, private editor_track::observer std::vector rest; // parameters after the rotation bool described{false}; std::string track; + glm::dvec2 tilt{0.0}; // rot.x and rot.z of a described template, degrees }; struct standing_template { diff --git a/application/editormodelineside.cpp b/application/editormodelineside.cpp index 3fdb71314..ea6869004 100644 --- a/application/editormodelineside.cpp +++ b/application/editormodelineside.cpp @@ -288,7 +288,7 @@ std::size_t editor_mode::place_templates(std::vector const &Items include_info info; if (false == editor_includes::load(item.file, info, Error)) continue; - directive = editor_includes::directive(item.file, info, editor_includes::parameter_count(item.file), local, static_cast(item.yaw), item.track); + directive = editor_includes::directive(item.file, info, editor_includes::parameter_count(item.file), local, static_cast(item.yaw), item.track, item.tilt); } else { diff --git a/application/editormodeselftest.cpp b/application/editormodeselftest.cpp index b84287c2d..bf281bf1c 100644 --- a/application/editormodeselftest.cpp +++ b/application/editormodeselftest.cpp @@ -350,6 +350,38 @@ void editor_mode::selftest_step() WriteLog(format("SELFTEST frame %s %.2f: %.3f %.3f %.3f widening %.4f cant %.4f setback %.4f", name.c_str(), station, at.position.x, at.position.y, at.position.z, at.widening[side], at.cant[side], sweep->setback(at))); } } + else if (command == "switchdrive") + { + int index{-1}, side{0}; + words >> index >> side; + scan_switch_drives(); + m_switch.drive = index; + m_switch.drive_side = side; + WriteLog("SELFTEST switchdrive: " + (index >= 0 && index < static_cast(m_switch.drives.size()) ? m_switch.drives[index].name : std::string{"none"})); + } + else if (command == "drivetilt") + { + std::string name; + words >> name; + auto *model{simulation::Instances.find(name)}; + auto *track{simulation::Paths.find(name.substr(0, name.find('_')))}; + if (model == nullptr || track == nullptr) + { + WriteLog("SELFTEST drivetilt: no " + name); + continue; + } + auto const &path{track->m_paths[0]}; + auto const transform{glm::dmat3(model->rotation_scale())}; + auto const across{transform * glm::dvec3{1.0, 0.0, 0.0}}; + auto const forward{transform * glm::dvec3{0.0, 0.0, 1.0}}; + auto const direction{glm::normalize(glm::dvec2{forward.x, forward.z})}; + auto const lateral{across.x * -direction.y + across.z * direction.x}; + auto const cone{-lateral * std::tan(glm::radians(static_cast(path.rolls[0])))}; + auto const control{path.points[segment_data::point::control1]}; + auto const grade{control.y / std::hypot(control.x, control.z)}; + WriteLog(format("SELFTEST drivetilt %s: angles %.3f %.3f %.3f, +x rises %.4f (cone %.4f), +z rises %.4f (grade %.4f), origin %.3f %.3f %.3f, points %.3f", name.c_str(), model->Angles().x, model->Angles().y, model->Angles().z, across.y, cone, forward.y, grade, + model->location().x, model->location().y, model->location().z, path.points[segment_data::point::start].y)); + } else if (command == "fouling") { std::map values; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 9ea3a14eb..5cd4fdcc0 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -4747,6 +4747,14 @@ bool editor_mode::place_switch_drive(TTrack &Switch) item.yaw = yaw < 0.0 ? yaw + 360.0 : yaw; item.described = true; item.track = Switch.name(); + { + auto const along{control != glm::dvec3{} ? control : main.points[segment_data::point::end] - start}; + auto const run{glm::length(plan_of(along))}; + auto const roll{static_cast(main.rolls[0])}; + item.tilt = {run > 1e-9 ? -glm::degrees(std::atan(along.y / run)) : 0.0, roll}; + if (Global.bRollFix) + item.location.y += 0.75 * std::abs(std::sin(glm::radians(roll))); + } std::string error; if (place_templates({item}, error) == 0) { diff --git a/editor/editorIncludeInfo.cpp b/editor/editorIncludeInfo.cpp index 8f7fe0053..d57da2573 100644 --- a/editor/editorIncludeInfo.cpp +++ b/editor/editorIncludeInfo.cpp @@ -644,7 +644,7 @@ std::string compose_directive(std::string const &File, std::vector return text + " end"; } -std::string directive(std::string const &File, include_info const &Info, int const Parameters, glm::dvec3 const &Location, std::optional Yaw, std::string const &Track) +std::string directive(std::string const &File, include_info const &Info, int const Parameters, glm::dvec3 const &Location, std::optional Yaw, std::string const &Track, glm::dvec2 const &Tilt) { std::vector values; for (auto id = 1; id <= Parameters; ++id) @@ -668,6 +668,14 @@ std::string directive(std::string const &File, include_info const &Info, int con { value = number(*Yaw); } + else if (role == "rot.x" && Tilt.x != 0.0) + { + value = number(Tilt.x); + } + else if (role == "rot.z" && Tilt.y != 0.0) + { + value = number(Tilt.y); + } else if (role.starts_with("rot.") && value.empty()) { value = "0"; diff --git a/editor/editorIncludeInfo.hpp b/editor/editorIncludeInfo.hpp index 9f8ef370c..d22a96068 100644 --- a/editor/editorIncludeInfo.hpp +++ b/editor/editorIncludeInfo.hpp @@ -71,7 +71,7 @@ bool complete(include_info const &Info, int Parameters, std::string *Issue = nul // builds include directive which places specified template. Location and Yaw are the placement to pass through // the parameters with matching roles, in the coordinates of the place the directive goes to; without Yaw the // rotation parameters receive their default values -std::string directive(std::string const &File, include_info const &Info, int Parameters, glm::dvec3 const &Location, std::optional Yaw, std::string const &Track = {}); +std::string directive(std::string const &File, include_info const &Info, int Parameters, glm::dvec3 const &Location, std::optional Yaw, std::string const &Track = {}, glm::dvec2 const &Tilt = glm::dvec2{0.0}); // splits include directive into the name of the included file and the values of the parameters, both as they're // written. returns: false if the text isn't a complete include directive From 01949425acae9dd49bb33f2ee0e36f878b61259f Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 8 Oct 2026 01:54:29 +0200 Subject: [PATCH 161/430] feat(editor): track laid on past the diverging end of a switch keeps the cant of its end along with its radius and grade --- application/editormodetrack.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 5cd4fdcc0..e3e6bafe4 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -4074,7 +4074,10 @@ std::vector editor_mode::extend_pieces() const auto const angle{geometry::signed_angle(plan_of(tool.point) - centre, plan_of(tool.mouse) - centre) * side}; if (angle * radius < 0.5) return result; - return arc_pieces(tool.point, direction, tool.grade, radius, std::min(angle, glm::pi()), side); + auto pieces{arc_pieces(tool.point, direction, tool.grade, radius, std::min(angle, glm::pi()), side)}; + for (auto &piece : pieces) + piece.rolls = {diverging.rolls[1], diverging.rolls[1]}; + return pieces; } } glm::dvec2 const offset{tool.mouse.x - tool.point.x, tool.mouse.z - tool.point.z}; From 4a7d839e5d817cf072af4ba0dc3c71915b98bc6b Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 8 Oct 2026 02:17:06 +0200 Subject: [PATCH 162/430] feat(launcher): new scenery made by the wizard starts at noon with no fog and no clouds --- application/editormodeselftest.cpp | 6 ++++++ launcher/scenery_wizard.cpp | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/application/editormodeselftest.cpp b/application/editormodeselftest.cpp index bf281bf1c..a731d2d03 100644 --- a/application/editormodeselftest.cpp +++ b/application/editormodeselftest.cpp @@ -16,6 +16,7 @@ http://mozilla.org/MPL/2.0/. #include "application/editorprojection.h" #include "simulation/simulation.h" +#include "simulation/simulationtime.h" #include "scene/scenelayers.h" #include "utilities/Globals.h" #include "utilities/Logs.h" @@ -382,6 +383,11 @@ void editor_mode::selftest_step() WriteLog(format("SELFTEST drivetilt %s: angles %.3f %.3f %.3f, +x rises %.4f (cone %.4f), +z rises %.4f (grade %.4f), origin %.3f %.3f %.3f, points %.3f", name.c_str(), model->Angles().x, model->Angles().y, model->Angles().z, across.y, cone, forward.y, grade, model->location().x, model->location().y, model->location().z, path.points[segment_data::point::start].y)); } + else if (command == "weather") + { + auto const &time{simulation::Time.data()}; + WriteLog(format("SELFTEST weather: %02d:%02d, fog end %.0f m, overcast %.2f", time.wHour, time.wMinute, Global.fFogEnd, Global.Overcast)); + } else if (command == "fouling") { std::map values; diff --git a/launcher/scenery_wizard.cpp b/launcher/scenery_wizard.cpp index e4c301383..19a2d07f4 100644 --- a/launcher/scenery_wizard.cpp +++ b/launcher/scenery_wizard.cpp @@ -370,7 +370,8 @@ bool ui::scenerywizard_panel::create_scenery() if (m_title[0] != '\0') output << "// " << m_title << "\r\n"; output << "// created in the editor " << date << "\r\n\r\n"; - output << "atmo 0.423 0.702 1.0 1700 2000 0.70 0.80 0.9 endatmo\r\n\r\n"; + output << "atmo 0.423 0.702 1.0 25000 25000 0.70 0.80 0.9 0 endatmo\r\n"; + output << "time 12:00 5:00 20:00 endtime\r\n\r\n"; output << "FirstInit\r\n"; output.close(); WriteLog("Scenery wizard: created " + file + " at " + reference); From b02fe0ac2b3bde04f8daf0acc35c6c6652fc2c2a Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 8 Oct 2026 03:12:16 +0200 Subject: [PATCH 163/430] feat(editor): Signals mode of the Tracks window (H): semaphores, block, warning, shunting, stop, substitute signals and repeaters placed by the track from the templates of the scenery, described by //$e signal: (kind, mount, lamps, lean, the event the train reads them by) which tools/editor/signal_headers.py writes into them; a click by a track puts the signal on that side 2.25 m from the axis at the rail heads, facing the trains which have it on their right, a drag along turns it to the trains going the way of the drag; its (p1)_sem_info goes to event1 or event2 of the path, warning signals and repeaters, which the train doesn't read, get none; a head leaning away from the track swapped for its counterpart; the plate named like the signal; signals dragged along the track with their event, removed with it, renamed in the node properties with it, each a single step of the undo history; Polish translation --- CMakeLists.txt | 1 + application/editormode.cpp | 27 + application/editormode.h | 95 ++- application/editormodelineside.cpp | 2 +- application/editormodeselftest.cpp | 146 ++++ application/editormodesignal.cpp | 1018 ++++++++++++++++++++++++++++ application/editormodetrack.cpp | 32 +- application/editormodetrackux.cpp | 38 +- editor/editorIncludeInfo.cpp | 40 +- editor/editorIncludeInfo.hpp | 9 +- editor/editorSettings.cpp | 3 + editor/editorSettings.hpp | 3 + lang/editor_pl.po | 190 ++++++ tools/editor/signal_headers.py | 237 +++++++ 14 files changed, 1828 insertions(+), 13 deletions(-) create mode 100644 application/editormodesignal.cpp create mode 100644 tools/editor/signal_headers.py diff --git a/CMakeLists.txt b/CMakeLists.txt index 116f032db..1613f0a70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -195,6 +195,7 @@ set(SOURCES "application/editormodeparallel.cpp" "application/editormodelineside.cpp" "application/editormodevehicle.cpp" +"application/editormodesignal.cpp" "application/editormodesweep.cpp" "application/editormodeturntable.cpp" "application/editormodeselftest.cpp" diff --git a/application/editormode.cpp b/application/editormode.cpp index 7958465c2..0ee3d1dbc 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -1355,6 +1355,12 @@ bool editor_mode::update() point_drag_update(); if (m_track_tab == track_tab::turntable) draw_turntable_overlay(); + if (m_track_tab == track_tab::signals) + { + signal_refresh(); + signal_move_update(); + draw_signal_overlay(); + } if (m_track_tab == track_tab::lineside) { draw_parallel_preview(); @@ -2423,6 +2429,17 @@ void editor_mode::apply_include() auto const directive = editor_includes::compose_directive(m_include.target, m_include.values); if (directive == before) return; + std::string read_before, read_after; + if (false == m_include.info.signal_read.empty()) + { + std::string file; + std::vector previous; + if (editor_includes::parse_directive(before, file, previous)) + { + read_before = editor_includes::substitute(m_include.info.signal_read, previous); + read_after = editor_includes::substitute(m_include.info.signal_read, m_include.values); + } + } if (false == m_include_gesture) { // a single undo step for the whole drag @@ -2430,10 +2447,14 @@ void editor_mode::apply_include() snap.instance = m_instance; snap.node_name = *scene::Layers.instance(m_instance).file; snap.serialized = std::move(before); + if (read_before != read_after) + signal_renamed(read_before, read_after, snap); m_history.push_back(std::move(snap)); g_redo.clear(); m_include_gesture = true; } + else if (read_before != read_after && false == m_history.empty()) + signal_renamed(read_before, read_after, m_history.back()); set_include_directive(m_instance, directive); } @@ -4209,6 +4230,10 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in { break; } + if (is_press(Action) && m_instance != 0 && signal_delete(m_instance)) + { + break; + } if (is_press(Action) && m_instance != 0) { // include of a scenery template. what it shows goes out of sight, the directive is erased on save @@ -4534,6 +4559,8 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const finish_switch_placement(); if (m_turntable.placing) turntable_finish_placement(); + if (m_signal.placing || m_signal.moving) + signal_release(); } m_dragging = false; diff --git a/application/editormode.h b/application/editormode.h index b911e0e14..95e9bc8fc 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -29,6 +29,7 @@ http://mozilla.org/MPL/2.0/. #include "world/Sweep.h" #include +#include #include #include #include @@ -814,7 +815,7 @@ class editor_mode : public application_mode, private editor_track::observer void update_build_tools(); void draw_build_overlay() const; // modes of the track editor, one at a time: path is the plain selection - enum class track_tab { straights, route, path, turnout, profile, speed, joints, infra, lay, lineside, turntable }; + enum class track_tab { straights, route, path, turnout, profile, speed, joints, infra, lay, lineside, turntable, signals }; struct track_mode { char const *label; @@ -822,7 +823,7 @@ class editor_mode : public application_mode, private editor_track::observer track_tab tab; char const *tooltip; }; - static std::array const &track_modes(); + static std::array const &track_modes(); // the objects along the track: a tab for each tool int m_lineside_tab{0}; void render_lineside_ui(); @@ -878,7 +879,7 @@ class editor_mode : public application_mode, private editor_track::observer void draw_track_hover() const; struct track_intent { - enum class kind { none, gizmo, select, point, box, straight_set, straight_break, detour, straight_tool, straight_handle, route_vertex, route_grip, switch_at, lay, lay_end, sweep, turntable_place, turntable_exit, turntable_fit, spread, extend_end }; + enum class kind { none, gizmo, select, point, box, straight_set, straight_break, detour, straight_tool, straight_handle, route_vertex, route_grip, switch_at, lay, lay_end, sweep, turntable_place, turntable_exit, turntable_fit, spread, extend_end, signal_place, signal_move }; kind what{kind::none}; TTrack *track{nullptr}; int path{0}; @@ -1043,6 +1044,7 @@ class editor_mode : public application_mode, private editor_track::observer bool described{false}; std::string track; glm::dvec2 tilt{0.0}; // rot.x and rot.z of a described template, degrees + std::map values; }; struct standing_template { @@ -1192,6 +1194,93 @@ class editor_mode : public application_mode, private editor_track::observer void render_vehicle_ui(); void draw_vehicle_marker() const; + struct signal_template + { + std::string file; + std::string name; + std::string description; + std::string kind; + std::string mount; + std::string lamps; + std::string lean; + std::string read; + int parameters{0}; + bool plate{false}; + bool linked{false}; + }; + struct signal_spot + { + TTrack *track{nullptr}; + int path{0}; + glm::dvec3 axis{0.0}; + glm::dvec2 travel{0.0, 1.0}; + int side{1}; + int list{2}; + double offset{0.0}; + glm::dvec3 position{0.0}; + double yaw{0.0}; + }; + struct signal_standing + { + standing_template include; + int kind{-1}; + std::string name; + std::string read; + TTrack *track{nullptr}; + int list{0}; + signal_spot spot; + bool on_track{false}; + }; + struct signal_tool + { + std::vector templates; + int revision{-1}; + int kind{0}; + std::array chosen{-1, -1, -1, -1, -1, -1, -1}; + char filter[64]{}; + char name[64]{"A"}; + char plate[64]{}; + char linked[64]{"none"}; + float height{0.0f}; + bool placing{false}; + signal_spot press; + glm::vec2 pressed{0.f}; + int facing{0}; + std::vector standing; + std::size_t standing_history{static_cast(-1)}; + std::size_t standing_redo{static_cast(-1)}; + double standing_time{-1.0}; + int hover{-1}; + scene::instance_handle selected{0}; + bool moving{false}; + signal_spot moved; + bool moved_valid{false}; + std::string status; + }; + signal_tool m_signal; + void signal_scan(); + signal_template const *signal_armed() const; + signal_template const *signal_template_of(std::string const &File) const; + bool signal_spot_at(TTrack &Track, int const Path, glm::dvec3 const &Point, glm::dvec3 const &Cursor, int const Facing, int const Side, signal_template const &Template, signal_spot &Spot) const; + void signal_refresh(bool const Force = false); + int signal_hit() const; + void signal_press(track_intent const &Intent); + void signal_release(); + bool signal_place(signal_spot const &Spot, signal_template const &Template); + void signal_move_update(); + void signal_move_finish(); + bool signal_delete(scene::instance_handle const Instance); + void signal_detach_events(std::string const &Read, std::vector> &States); + void signal_renamed(std::string const &Before, std::string const &After, EditorSnapshot &Snapshot); + void signal_select(scene::instance_handle const Instance); + std::string signal_next_name(std::string const &Name) const; + void render_signal_ui(); + void render_signal_palette(); + void render_signal_selected(); + void draw_signal_overlay() const; + std::string signal_intent_label(signal_template const &Template, signal_spot const &Spot) const; + std::string signal_variant(signal_template const &Template, signal_spot const &Spot) const; + // a model laid along the track: bent to follow it, or repeated along it struct sweep_tool { diff --git a/application/editormodelineside.cpp b/application/editormodelineside.cpp index ea6869004..37d793d31 100644 --- a/application/editormodelineside.cpp +++ b/application/editormodelineside.cpp @@ -288,7 +288,7 @@ std::size_t editor_mode::place_templates(std::vector const &Items include_info info; if (false == editor_includes::load(item.file, info, Error)) continue; - directive = editor_includes::directive(item.file, info, editor_includes::parameter_count(item.file), local, static_cast(item.yaw), item.track, item.tilt); + directive = editor_includes::directive(item.file, info, editor_includes::parameter_count(item.file), local, static_cast(item.yaw), item.track, item.tilt, item.values); } else { diff --git a/application/editormodeselftest.cpp b/application/editormodeselftest.cpp index a731d2d03..8bb4f2a51 100644 --- a/application/editormodeselftest.cpp +++ b/application/editormodeselftest.cpp @@ -918,6 +918,152 @@ void editor_mode::selftest_step() std::getline(words, text); WriteLog("SELFTEST" + text); } + else if (command == "signal" || command == "signalmove" || command == "signaldelete" || command == "signalrename" || command == "signalprobe") + { + std::map values; + std::string pair; + while (words >> pair) + { + auto const equals{pair.find('=')}; + if (equals != std::string::npos) + values[pair.substr(0, equals)] = pair.substr(equals + 1); + } + show_track_tab(track_tab::signals); + signal_refresh(true); + auto &tool{m_signal}; + auto const standing_named = [&](std::string const &Name) -> signal_standing const * { + auto const found{std::find_if(tool.standing.begin(), tool.standing.end(), [&](signal_standing const &Standing) { return Standing.name == Name; })}; + return found != tool.standing.end() ? &*found : nullptr; + }; + auto const spot_on = [&](signal_template const &Template, int const Facing, int const Side, signal_spot &Spot) { + auto *track{simulation::Paths.find(values["track"])}; + if (track == nullptr) + return false; + auto const path{values.count("path") ? std::stoi(values["path"]) : 0}; + auto const at{values.count("at") ? std::stod(values["at"]) : 0.5}; + geometry::bezier const curve{track->m_paths[std::clamp(path, 0, static_cast(track->m_paths.size()) - 1)]}; + return signal_spot_at(*track, path, curve.point(at), curve.point(at), Facing, Side, Template, Spot); + }; + if (command == "signal") + { + auto const *item{signal_template_of(values["file"])}; + if (item == nullptr) + { + WriteLog("SELFTEST signal: no signal template " + values["file"]); + continue; + } + for (int k = 0; k < static_cast(tool.templates.size()); ++k) + if (&tool.templates[k] == item) + { + static char const *const kinds[] = {"main", "block", "warning", "shunt", "stop", "substitute", "repeater"}; + for (int i = 0; i < 7; ++i) + if (item->kind == kinds[i]) + { + tool.kind = i; + tool.chosen[i] = k; + } + } + if (values.count("name")) + std::snprintf(tool.name, sizeof(tool.name), "%s", values["name"].c_str()); + if (values.count("plate")) + std::snprintf(tool.plate, sizeof(tool.plate), "%s", values["plate"].c_str()); + auto const side{values["side"] == "left" ? -1 : 1}; + auto const facing{values["facing"] == "along" ? 1 : values["facing"] == "against" ? -1 : 0}; + signal_spot spot; + if (false == spot_on(*signal_armed(), facing, side, spot)) + { + WriteLog("SELFTEST signal: no such track " + values["track"]); + continue; + } + auto const placed{signal_place(spot, *signal_armed())}; + WriteLog(format("SELFTEST signal %s: %s", placed ? "placed" : "failed", tool.status.c_str())); + } + else if (command == "signalmove") + { + auto const *standing{standing_named(values["name"])}; + auto const *item{standing != nullptr ? signal_template_of(standing->include.file) : nullptr}; + if (item == nullptr) + { + WriteLog("SELFTEST signalmove: no signal " + values["name"]); + continue; + } + auto const yaw{glm::radians(standing->include.yaw + 180.0)}; + glm::dvec2 const travel{std::sin(yaw), std::cos(yaw)}; + signal_spot probe; + if (false == spot_on(*item, 1, 1, probe)) + { + WriteLog("SELFTEST signalmove: no such track " + values["track"]); + continue; + } + auto const facing{glm::dot(probe.travel, travel) >= 0.0 ? 1 : -1}; + auto const sideoftravel{glm::dot(geometry::plan_of(standing->include.location) - geometry::plan_of(standing->spot.axis), glm::dvec2{-travel.y, travel.x}) >= 0.0 ? 1 : -1}; + signal_select(standing->include.instance); + tool.moving = true; + tool.moved_valid = spot_on(*item, facing, sideoftravel * facing, tool.moved); + tool.pressed = {-1000.f, -1000.f}; + signal_release(); + WriteLog("SELFTEST signalmove: " + tool.status); + } + else if (command == "signaldelete") + { + auto const *standing{standing_named(values["name"])}; + auto const deleted{standing != nullptr && signal_delete(standing->include.instance)}; + WriteLog(std::string{"SELFTEST signaldelete "} + values["name"] + (deleted ? ": removed with its event" : ": not removed by the signal tool")); + } + else if (command == "signalrename") + { + auto const *standing{standing_named(values["name"])}; + if (standing == nullptr) + { + WriteLog("SELFTEST signalrename: no signal " + values["name"]); + continue; + } + select_include(standing->include.instance); + m_include.values[0] = values["to"]; + apply_include(); + m_include_gesture = false; + WriteLog("SELFTEST signalrename " + values["name"] + " -> " + values["to"]); + } + else + { + signal_refresh(true); + WriteLog(format("SELFTEST signalprobe: %zu signals", tool.standing.size())); + for (auto const &standing : tool.standing) + { + std::string where{"not read"}; + if (standing.track != nullptr) + { + auto const &curve{standing.track->m_paths.front()}; + geometry::bezier const bez{curve}; + auto best{std::numeric_limits::max()}; + double parameter{0.0}; + for (int k = 0; k <= 1024; ++k) + { + auto const d{geometry::plan_distance(bez.point(k / 1024.0), standing.include.location)}; + if (d < best) + { + best = d; + parameter = k / 1024.0; + } + } + auto const axis{bez.point(parameter)}; + auto tangent{bez.first(parameter)}; + glm::dvec2 travel{tangent.x, tangent.z}; + travel = glm::normalize(travel) * (standing.list == 1 ? -1.0 : 1.0); + glm::dvec2 const offset{standing.include.location.x - axis.x, standing.include.location.z - axis.z}; + auto const cross{travel.x * offset.y - travel.y * offset.x}; + auto heading{glm::degrees(std::atan2(travel.x, travel.y))}; + auto turn{std::fmod(standing.include.yaw - heading + 720.0, 360.0)}; + auto const &list{editor_track::events(*standing.track, standing.list)}; + auto const bound{std::any_of(list.begin(), list.end(), [&](auto const &Event) { return Event.second != nullptr && ToLower(Event.first) == ToLower(standing.read); })}; + where = std::string{bound ? "bound, " : "unbound, "} + format("%s of %s, %.3f m from the axis, %s of the trains, %.3f m over the axis, model turned %.1f deg from the travel", editor_track::event_keyword(standing.list), standing.track->name().c_str(), glm::length(offset), cross > 0.0 ? "right" : "left", + standing.include.location.y - axis.y, turn); + } + WriteLog(format("SELFTEST signalprobe %s %s at %.3f %.3f %.3f yaw %.2f read %s: %s", standing.name.c_str(), standing.include.file.c_str(), standing.include.location.x, standing.include.location.y, standing.include.location.z, standing.include.yaw, + standing.read.empty() ? "-" : standing.read.c_str(), where.c_str())); + } + } + } else if (command == "quit") { if (false == test.quitting) diff --git a/application/editormodesignal.cpp b/application/editormodesignal.cpp new file mode 100644 index 000000000..d071f942f --- /dev/null +++ b/application/editormodesignal.cpp @@ -0,0 +1,1018 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "application/editormode.h" +#include "application/editoruilayer.h" +#include "application/editorprojection.h" +#include "editor/editorFormat.hpp" +#include "editor/editorGeometry.hpp" +#include "editor/editorIncludeInfo.hpp" +#include "editor/editorSettings.hpp" + +#include "rendering/renderer.h" +#include "scene/scenelayers.h" +#include "simulation/simulation.h" +#include "utilities/Globals.h" +#include "utilities/utilities.h" +#include "world/Track.h" + +#include "imgui/imgui.h" +#include "utilities/translation.h" +#include +#include +#include +#include +#include + +namespace +{ + +using geometry::bezier; +using geometry::plan_of; + +double const kRailTop{0.18}; +double const kSignalRange{1500.0}; +double const kSignalHead{4.0}; +float const kSignalPick{12.0f}; +float const kDragStart{6.0f}; +double const kDragTravel{1.0}; +double const kRefreshPeriod{2.0}; + +char const *const kKinds[] = {"main", "block", "warning", "shunt", "stop", "substitute", "repeater"}; +char const *const kKindLabels[] = {"Semaphore", "Automatic block", "Warning signal", "Shunting signal", "Stop signal", "Substitute signal", "Repeater"}; +int const kKindCount{7}; + +int kind_index(std::string const &Kind) +{ + for (int i = 0; i < kKindCount; ++i) + if (Kind == kKinds[i]) + return i; + return -1; +} + +std::string lower(std::string Text) +{ + std::transform(Text.begin(), Text.end(), Text.begin(), [](unsigned char const Character) { return static_cast(std::tolower(Character)); }); + return Text; +} + +double nearest_on(TTrack const &Track, int const Path, glm::dvec3 const &Point) +{ + bezier const curve{Track.m_paths[Path]}; + auto parameter{0.0}; + auto best{std::numeric_limits::max()}; + for (int k = 0; k <= 256; ++k) + { + auto const distance{geometry::plan_distance(curve.point(k / 256.0), Point)}; + if (distance < best) + { + best = distance; + parameter = k / 256.0; + } + } + return parameter; +} + +glm::dvec2 forward_at(TTrack const &Track, int const Path, double const Parameter) +{ + auto const tangent{bezier{Track.m_paths[Path]}.first(Parameter)}; + glm::dvec2 const planar{tangent.x, tangent.z}; + return glm::length(planar) > 1e-9 ? glm::normalize(planar) : glm::dvec2{0.0, 1.0}; +} + +glm::dvec2 right_of(glm::dvec2 const &Direction) +{ + return {-Direction.y, Direction.x}; +} + +double heading_of(glm::dvec2 const &Direction) +{ + auto const degrees{glm::degrees(std::atan2(Direction.x, Direction.y))}; + return degrees < 0.0 ? degrees + 360.0 : degrees; +} + +int lean_wanted(int const Side) +{ + return Side > 0 ? 1 : 2; +} + +int lean_of(std::string const &Lean) +{ + return Lean == "left" ? 1 : Lean == "right" ? 2 : 0; +} + +std::size_t edit_distance(std::string const &A, std::string const &B) +{ + std::vector row(B.size() + 1); + for (std::size_t j = 0; j <= B.size(); ++j) + row[j] = j; + for (std::size_t i = 1; i <= A.size(); ++i) + { + auto diagonal{row[0]}; + row[0] = i; + for (std::size_t j = 1; j <= B.size(); ++j) + { + auto const above{row[j]}; + row[j] = std::min({row[j] + 1, row[j - 1] + 1, diagonal + (A[i - 1] == B[j - 1] ? 0 : 1)}); + diagonal = above; + } + } + return row[B.size()]; +} + +ImU32 lamp_colour(char const Lamp) +{ + switch (Lamp) + { + case 'z': return IM_COL32(40, 210, 80, 255); + case 'c': return IM_COL32(230, 40, 40, 255); + case 'p': return IM_COL32(255, 160, 30, 255); + case 'b': return IM_COL32(235, 235, 235, 255); + case 'n': return IM_COL32(60, 110, 255, 255); + default: return IM_COL32(70, 70, 70, 255); + } +} + +std::string group_of(std::string const &Mount, std::string const &Lamps) +{ + return Mount + "|" + Lamps; +} + +std::vector const &plate_textures() +{ + static std::vector plates; + static bool scanned{false}; + if (scanned) + return plates; + scanned = true; + std::error_code error; + for (std::filesystem::directory_iterator file{"textures/tabl", error}, end; file != end; file.increment(error)) + { + auto const stem{lower(file->path().stem().string())}; + if (std::find(plates.begin(), plates.end(), stem) == plates.end()) + plates.push_back(stem); + } + std::sort(plates.begin(), plates.end()); + return plates; +} + +std::string plate_for(std::string const &Plate, std::string const &Name) +{ + if (false == Plate.empty()) + return Plate; + auto const &plates{plate_textures()}; + auto const name{lower(Name)}; + return std::binary_search(plates.begin(), plates.end(), name) ? name : std::string{"0_nothing"}; +} + +void draw_signal_icon(ImDrawList *Draw, ImVec2 const Origin, ImVec2 const Size, std::string const &Mount, std::string const &Lamps, ImU32 const Frame) +{ + auto const lamps{std::max(1, static_cast(Lamps.size()))}; + auto const centre{Origin.x + Size.x * 0.5f}; + auto const bottom{Origin.y + Size.y - 4.0f}; + auto const lamp{std::min(7.0f, (Size.y - 26.0f) / (lamps * 2.2f))}; + auto const headwidth{lamp * 2.0f + 6.0f}; + auto const headheight{lamps * lamp * 2.2f + 4.0f}; + ImU32 const pole{IM_COL32(150, 150, 150, 255)}; + float headtop; + if (Mount == "dwarf") + { + headtop = bottom - headheight; + Draw->AddRectFilled(ImVec2(centre - headwidth * 0.7f, bottom - 3.0f), ImVec2(centre + headwidth * 0.7f, bottom), pole); + } + else if (Mount == "gantry") + { + headtop = Origin.y + 10.0f; + Draw->AddLine(ImVec2(Origin.x + 4.0f, Origin.y + 6.0f), ImVec2(Origin.x + Size.x - 4.0f, Origin.y + 6.0f), pole, 3.0f); + Draw->AddLine(ImVec2(centre, Origin.y + 6.0f), ImVec2(centre, headtop), pole, 2.0f); + } + else + { + headtop = Origin.y + 6.0f; + Draw->AddLine(ImVec2(centre, headtop + headheight), ImVec2(centre, bottom), pole, 3.0f); + Draw->AddLine(ImVec2(centre - 6.0f, bottom), ImVec2(centre + 6.0f, bottom), pole, 2.0f); + } + if (Lamps.empty()) + { + Draw->AddLine(ImVec2(centre, headtop), ImVec2(centre, headtop + headheight), pole, 3.0f); + Draw->AddLine(ImVec2(centre, headtop + 6.0f), ImVec2(centre + 14.0f, headtop - 2.0f), IM_COL32(230, 60, 60, 255), 4.0f); + return; + } + Draw->AddRectFilled(ImVec2(centre - headwidth * 0.5f, headtop), ImVec2(centre + headwidth * 0.5f, headtop + headheight), IM_COL32(25, 25, 25, 255), 3.0f); + Draw->AddRect(ImVec2(centre - headwidth * 0.5f, headtop), ImVec2(centre + headwidth * 0.5f, headtop + headheight), Frame, 3.0f); + for (int i = 0; i < static_cast(Lamps.size()); ++i) + Draw->AddCircleFilled(ImVec2(centre, headtop + 2.0f + lamp * 1.1f + i * lamp * 2.2f), lamp, lamp_colour(Lamps[i])); +} + +} // namespace + +void editor_mode::signal_scan() +{ + auto &tool{m_signal}; + if (false == EditorIncludes.scanned()) + EditorIncludes.scan(); + if (tool.revision == EditorIncludes.revision()) + return; + tool.revision = EditorIncludes.revision(); + std::string chosen[kKindCount]; + for (int i = 0; i < kKindCount; ++i) + if (tool.chosen[i] >= 0 && tool.chosen[i] < static_cast(tool.templates.size())) + chosen[i] = tool.templates[tool.chosen[i]].file; + tool.templates.clear(); + for (auto const &entry : EditorIncludes.entries()) + { + if (entry.category != "signal" || false == entry.complete) + continue; + include_info info; + std::string error; + if (false == editor_includes::load(entry.file, info, error) || kind_index(info.signal_kind) < 0) + continue; + signal_template item; + item.file = entry.file; + item.name = info.name.empty() ? entry.file : info.name; + item.description = info.description; + item.kind = info.signal_kind; + item.mount = info.signal_mount.empty() ? std::string{"mast"} : info.signal_mount; + item.lamps = info.signal_lamps; + item.lean = info.signal_lean; + item.read = info.signal_read; + for (auto const ¶meter : info.parameters) + { + item.parameters = std::max(item.parameters, parameter.id); + if (parameter.id == 6 && parameter.role == "texture") + item.plate = true; + if (parameter.id == 7) + item.linked = true; + } + tool.templates.push_back(std::move(item)); + } + std::sort(tool.templates.begin(), tool.templates.end(), [](signal_template const &A, signal_template const &B) { + return std::make_tuple(kind_index(A.kind), A.lamps.empty(), A.mount != "mast", A.lamps.size(), A.lamps, A.name.size(), A.name) < std::make_tuple(kind_index(B.kind), B.lamps.empty(), B.mount != "mast", B.lamps.size(), B.lamps, B.name.size(), B.name); + }); + for (int i = 0; i < kKindCount; ++i) + { + tool.chosen[i] = -1; + std::unordered_map sizes; + for (auto const &item : tool.templates) + if (item.kind == kKinds[i]) + ++sizes[group_of(item.mount, item.lamps)]; + auto best{-1}; + for (int k = 0; k < static_cast(tool.templates.size()); ++k) + { + auto const &item{tool.templates[k]}; + if (item.kind != kKinds[i]) + continue; + if (item.file == chosen[i]) + { + best = k; + break; + } + if (best < 0 || sizes[group_of(item.mount, item.lamps)] > sizes[group_of(tool.templates[best].mount, tool.templates[best].lamps)]) + best = k; + } + tool.chosen[i] = best; + } +} + +editor_mode::signal_template const *editor_mode::signal_armed() const +{ + auto const &tool{m_signal}; + if (tool.kind < 0 || tool.kind >= kKindCount) + return nullptr; + auto const index{tool.chosen[tool.kind]}; + return index >= 0 && index < static_cast(tool.templates.size()) ? &tool.templates[index] : nullptr; +} + +editor_mode::signal_template const *editor_mode::signal_template_of(std::string const &File) const +{ + auto const file{lower(File)}; + for (auto const &item : m_signal.templates) + if (item.file == file) + return &item; + return nullptr; +} + +bool editor_mode::signal_spot_at(TTrack &Track, int const Path, glm::dvec3 const &Point, glm::dvec3 const &Cursor, int const Facing, int const Side, signal_template const &Template, signal_spot &Spot) const +{ + if (Track.m_paths.empty() || Track.m_editorremoved) + return false; + auto const path{std::clamp(Path, 0, static_cast(Track.m_paths.size()) - 1)}; + auto const parameter{nearest_on(Track, path, Point)}; + auto const axis{bezier{Track.m_paths[path]}.point(parameter)}; + auto const forward{forward_at(Track, path, parameter)}; + auto const right{right_of(forward)}; + auto side{Side}; + if (side == 0) + side = glm::dot(plan_of(Cursor) - plan_of(axis), right) >= 0.0 ? 1 : -1; + auto facing{Facing}; + if (facing == 0) + facing = side; + Spot.track = &Track; + Spot.path = path; + Spot.axis = axis; + Spot.travel = forward * static_cast(facing); + Spot.side = side; + Spot.list = facing > 0 ? 2 : 1; + Spot.offset = Template.mount == "gantry" ? 0.0 : EditorSettings.signal_offset(); + auto const across{right * static_cast(side) * Spot.offset}; + Spot.position = {axis.x + across.x, axis.y + kRailTop + (Template.mount == "gantry" ? static_cast(m_signal.height) : 0.0), axis.z + across.y}; + auto const yaw{heading_of(Spot.travel) + 180.0}; + Spot.yaw = yaw >= 360.0 ? yaw - 360.0 : yaw; + return true; +} + +std::string editor_mode::signal_intent_label(signal_template const &Template, signal_spot const &Spot) const +{ + auto const name{m_signal.name[0] != '\0' ? std::string{m_signal.name} : std::string{"?"}}; + auto const right{glm::dot(right_of(Spot.travel), plan_of(Spot.position) - plan_of(Spot.axis)) >= 0.0}; + auto const where{right ? STR(" on the right of the trains") : STR(" on the left of the trains")}; + auto variant{signal_variant(Template, Spot)}; + variant = variant.substr(0, variant.rfind('.')); + if (Template.read.empty()) + return format(STR_C("Click: %s %s (%s)%s, the train doesn't read it"), STR(kKindLabels[kind_index(Template.kind)]).c_str(), name.c_str(), variant.c_str(), where.c_str()) + "\n" + STR("Drag along: the trains it faces run the way of the drag"); + auto const event{editor_includes::substitute(Template.read, {name})}; + auto const path{Spot.track->name().empty() ? std::string{"(noname)"} : Spot.track->name()}; + return format(STR_C("Click: %s %s (%s)%s, read by %s %s of %s"), STR(kKindLabels[kind_index(Template.kind)]).c_str(), name.c_str(), variant.c_str(), where.c_str(), editor_track::event_keyword(Spot.list), event.c_str(), path.c_str()) + "\n" + STR("Drag along: the trains it faces run the way of the drag"); +} + +void editor_mode::signal_refresh(bool const Force) +{ + auto &tool{m_signal}; + signal_scan(); + auto const now{ImGui::GetTime()}; + if (false == Force && tool.standing_history == m_history.size() && tool.standing_redo == g_redo.size() && now - tool.standing_time < kRefreshPeriod) + return; + tool.standing_history = m_history.size(); + tool.standing_redo = g_redo.size(); + tool.standing_time = now; + tool.standing.clear(); + if (scene::Layers.empty()) + return; + auto const found{standing_templates([this](std::string const &File) { return signal_template_of(File) != nullptr; })}; + std::unordered_map> readers; + for (auto *track : simulation::Paths.sequence()) + { + if (track == nullptr || track->m_editorremoved) + continue; + for (int list = 0; list < 6; ++list) + for (auto const &event : editor_track::events(*track, list)) + if (false == event.first.empty()) + readers.emplace(lower(event.first), std::make_pair(track, list)); + } + for (auto const &include : found) + { + auto const *item{signal_template_of(include.file)}; + signal_standing standing; + standing.include = include; + standing.kind = kind_index(item->kind); + standing.name = include.values.empty() ? std::string{} : include.values.front(); + if (false == item->read.empty()) + { + standing.read = editor_includes::substitute(item->read, include.values); + if (auto const reader{readers.find(lower(standing.read))}; reader != readers.end()) + { + standing.track = reader->second.first; + standing.list = reader->second.second; + } + } + tool.standing.push_back(std::move(standing)); + } + if (tool.selected != 0 && std::none_of(tool.standing.begin(), tool.standing.end(), [&](signal_standing const &Standing) { return Standing.include.instance == tool.selected; })) + tool.selected = 0; +} + +int editor_mode::signal_hit() const +{ + screen_projection const projection; + auto const &mouse{ImGui::GetIO().MousePos}; + auto best{kSignalPick * kSignalPick}; + int result{-1}; + glm::dvec3 const camera{Global.pCamera.Pos}; + for (int i = 0; i < static_cast(m_signal.standing.size()); ++i) + { + auto const &location{m_signal.standing[i].include.location}; + if (glm::distance(location, camera) > kSignalRange) + continue; + ImVec2 foot, head; + if (false == projection.project(location, foot) || false == projection.project(location + glm::dvec3{0.0, kSignalHead, 0.0}, head)) + continue; + ImVec2 const span{head.x - foot.x, head.y - foot.y}; + auto const length2{span.x * span.x + span.y * span.y}; + auto const t{length2 > 1e-6f ? std::clamp(((mouse.x - foot.x) * span.x + (mouse.y - foot.y) * span.y) / length2, 0.0f, 1.0f) : 0.0f}; + auto const dx{foot.x + span.x * t - mouse.x}; + auto const dy{foot.y + span.y * t - mouse.y}; + auto const distance2{dx * dx + dy * dy}; + if (distance2 < best) + { + best = distance2; + result = i; + } + } + return result; +} + +void editor_mode::signal_press(track_intent const &Intent) +{ + auto &tool{m_signal}; + auto const &mouse{ImGui::GetIO().MousePos}; + tool.pressed = {mouse.x, mouse.y}; + tool.facing = 0; + tool.status.clear(); + if (Intent.what == track_intent::kind::signal_move) + { + if (Intent.index < 0 || Intent.index >= static_cast(tool.standing.size())) + return; + signal_select(tool.standing[Intent.index].include.instance); + tool.moving = true; + tool.moved_valid = false; + return; + } + auto const *armed{signal_armed()}; + if (armed == nullptr || Intent.track == nullptr) + return; + if (false == signal_spot_at(*Intent.track, Intent.path, m_hover.point, cursor_level(m_hover.point.y), 0, 0, *armed, tool.press)) + return; + tool.placing = true; +} + +void editor_mode::signal_move_update() +{ + auto &tool{m_signal}; + auto const &mouse{ImGui::GetIO().MousePos}; + auto const dragged{glm::length(glm::vec2{mouse.x, mouse.y} - tool.pressed) > kDragStart}; + if (tool.placing) + { + auto const *armed{signal_armed()}; + if (armed == nullptr || tool.press.track == nullptr || tool.press.track->m_editorremoved) + { + tool.placing = false; + return; + } + if (false == dragged) + return; + auto const cursor{cursor_level(tool.press.axis.y)}; + auto const forward{tool.press.travel * static_cast(tool.press.list == 2 ? 1 : -1)}; + auto const along{glm::dot(plan_of(cursor) - plan_of(tool.press.axis), forward)}; + if (std::abs(along) < kDragTravel) + return; + tool.facing = along > 0.0 ? 1 : -1; + signal_spot spot; + if (signal_spot_at(*tool.press.track, tool.press.path, tool.press.axis, cursor, tool.facing, tool.press.side, *armed, spot)) + tool.press = spot; + return; + } + if (false == tool.moving) + return; + if (false == dragged) + return; + auto const found{std::find_if(tool.standing.begin(), tool.standing.end(), [&](signal_standing const &Standing) { return Standing.include.instance == tool.selected; })}; + if (found == tool.standing.end() || m_hover.track == nullptr) + { + tool.moved_valid = false; + return; + } + auto const *item{signal_template_of(found->include.file)}; + if (item == nullptr) + return; + auto const yaw{glm::radians(found->include.yaw + 180.0)}; + glm::dvec2 const travel{std::sin(yaw), std::cos(yaw)}; + auto const parameter{nearest_on(*m_hover.track, std::clamp(m_hover.path, 0, static_cast(m_hover.track->m_paths.size()) - 1), m_hover.point)}; + auto const forward{forward_at(*m_hover.track, std::clamp(m_hover.path, 0, static_cast(m_hover.track->m_paths.size()) - 1), parameter)}; + auto const facing{glm::dot(forward, travel) >= 0.0 ? 1 : -1}; + auto const sideoftravel{glm::dot(plan_of(found->include.location) - plan_of(m_hover.point), right_of(travel)) >= 0.0 ? 1 : -1}; + tool.moved_valid = signal_spot_at(*m_hover.track, m_hover.path, m_hover.point, m_hover.point, facing, sideoftravel * facing, *item, tool.moved); +} + +void editor_mode::signal_release() +{ + auto &tool{m_signal}; + if (tool.placing) + { + tool.placing = false; + if (auto const *armed{signal_armed()}; armed != nullptr && tool.press.track != nullptr && false == tool.press.track->m_editorremoved) + signal_place(tool.press, *armed); + return; + } + if (false == tool.moving) + return; + tool.moving = false; + auto const &mouse{ImGui::GetIO().MousePos}; + if (false == tool.moved_valid || glm::length(glm::vec2{mouse.x, mouse.y} - tool.pressed) <= kDragStart) + return; + tool.moved_valid = false; + auto const found{std::find_if(tool.standing.begin(), tool.standing.end(), [&](signal_standing const &Standing) { return Standing.include.instance == tool.selected; })}; + if (found == tool.standing.end() || false == scene::Layers.tracked(found->include.instance) || false == scene::Layers.removable(found->include.instance)) + return; + auto const &spot{tool.moved}; + auto const &included{scene::Layers.instance(found->include.instance)}; + auto values{found->include.values}; + auto const local{spot.position - included.context.offset}; + values[1] = editor_includes::number(local.x); + values[2] = editor_includes::number(local.y); + values[3] = editor_includes::number(local.z); + values[4] = editor_includes::number(spot.yaw); + auto before{scene::Layers.directive(found->include.instance)}; + std::vector> states; + if (false == found->read.empty() && spot.track->Dynamics.empty()) + { + signal_detach_events(found->read, states); + if (std::none_of(states.begin(), states.end(), [&](auto const &State) { return State.first == spot.track; })) + states.emplace_back(spot.track, editor_track::capture(*spot.track)); + editor_track::events(*spot.track, spot.list).emplace_back(lower(found->read), nullptr); + std::string missing; + editor_track::bind_events(*spot.track, missing); + spot.track->mark_dirty(); + } + set_include_directive(found->include.instance, editor_includes::compose_directive(*included.file, values)); + if (states.empty()) + { + EditorSnapshot snap; + snap.directives.emplace_back(found->include.instance, std::move(before)); + snap.node_name = found->include.file; + trim_history(); + m_history.push_back(std::move(snap)); + g_redo.clear(); + } + else + { + push_track_snapshot(std::move(states)); + m_history.back().directives.emplace_back(found->include.instance, std::move(before)); + } + tool.status = found->read.empty() ? format(STR_C("Signal %s moved"), found->name.c_str()) : format(STR_C("Signal %s moved, read by %s %s of %s"), found->name.c_str(), editor_track::event_keyword(spot.list), found->read.c_str(), spot.track->name().empty() ? "(noname)" : spot.track->name().c_str()); + signal_refresh(true); + signal_select(found->include.instance); +} + +std::string editor_mode::signal_variant(signal_template const &Template, signal_spot const &Spot) const +{ + auto file{Template.file}; + auto const wanted{lean_wanted(glm::dot(right_of(Spot.travel), plan_of(Spot.position) - plan_of(Spot.axis)) >= 0.0 ? 1 : -1)}; + if (lean_of(Template.lean) == 0 || lean_of(Template.lean) == wanted) + return file; + auto const group{group_of(Template.mount, Template.lamps)}; + auto best{std::numeric_limits::max()}; + for (auto const &other : m_signal.templates) + { + if (other.kind != Template.kind || group_of(other.mount, other.lamps) != group || lean_of(other.lean) != wanted) + continue; + auto const distance{edit_distance(other.name, Template.name)}; + if (distance < best) + { + best = distance; + file = other.file; + } + } + return file; +} + +std::string editor_mode::signal_next_name(std::string const &Name) const +{ + if (Name.empty()) + return Name; + auto digits{Name.size()}; + while (digits > 0 && std::isdigit(static_cast(Name[digits - 1]))) + --digits; + if (digits < Name.size() && Name.size() - digits < 9) + return Name.substr(0, digits) + std::to_string(std::stoi(Name.substr(digits)) + 1); + auto const last{static_cast(Name.back())}; + if (std::isalpha(last) && last != 'z' && last != 'Z') + return Name.substr(0, Name.size() - 1) + static_cast(last + 1); + return Name + "2"; +} + +bool editor_mode::signal_place(signal_spot const &Spot, signal_template const &Template) +{ + auto &tool{m_signal}; + std::string name{tool.name}; + if (name.empty() || name.find_first_of(" \t\";") != std::string::npos) + { + tool.status = STR_C("Give the signal a name without spaces first"); + return false; + } + signal_refresh(true); + auto const taken = [&](std::string const &Name) { + return std::any_of(tool.standing.begin(), tool.standing.end(), [&](signal_standing const &Standing) { return lower(Standing.name) == lower(Name); }); + }; + for (int guard = 0; taken(name) && guard < 1000; ++guard) + name = signal_next_name(name); + auto const file{signal_variant(Template, Spot)}; + template_item item; + item.file = file; + item.location = Spot.position; + item.yaw = Spot.yaw; + item.described = true; + item.values["name"] = name; + if (Template.plate) + item.values["#6"] = plate_for(tool.plate, name); + if (Template.linked) + item.values["#7"] = tool.linked[0] != '\0' ? std::string{tool.linked} : std::string{"none"}; + std::string error; + if (place_templates({item}, error) == 0) + { + tool.status = STR_C("The signal couldn't be placed: ") + error; + return false; + } + auto const instance{m_history.back().instances.front()}; + auto const *placed{signal_template_of(file)}; + auto const read{placed != nullptr && false == placed->read.empty() ? editor_includes::substitute(placed->read, {name}) : std::string{}}; + auto const path{Spot.track->name().empty() ? std::string{"(noname)"} : Spot.track->name()}; + std::string reason; + if (read.empty()) + tool.status = format(STR_C("Signal %s placed (%s), the train doesn't read it"), name.c_str(), file.c_str()); + else if (false == Spot.track->Dynamics.empty()) + tool.status = format(STR_C("Signal %s placed (%s), but vehicles stand on the path: add %s to its %s by hand"), name.c_str(), file.c_str(), read.c_str(), editor_track::event_keyword(Spot.list)); + else if (false == scene::Layers.editable(Spot.track, &reason)) + tool.status = format(STR_C("Signal %s placed (%s), but the path can't take its event: %s"), name.c_str(), file.c_str(), reason.c_str()); + else + { + auto snap{std::move(m_history.back())}; + m_history.pop_back(); + auto const before{editor_track::capture(*Spot.track)}; + editor_track::events(*Spot.track, Spot.list).emplace_back(lower(read), nullptr); + std::string missing; + editor_track::bind_events(*Spot.track, missing); + Spot.track->mark_dirty(); + push_track_snapshot({{Spot.track, before}}); + m_history.back().instances = std::move(snap.instances); + tool.status = format(STR_C("Signal %s placed (%s), read by %s %s of %s. Its logic works after the scenery is saved and opened again"), name.c_str(), file.c_str(), editor_track::event_keyword(Spot.list), read.c_str(), path.c_str()); + } + std::snprintf(tool.name, sizeof(tool.name), "%s", signal_next_name(name).c_str()); + signal_refresh(true); + signal_select(instance); + return true; +} + +void editor_mode::signal_detach_events(std::string const &Read, std::vector> &States) +{ + auto const name{lower(Read)}; + for (auto *track : simulation::Paths.sequence()) + { + if (track == nullptr || track->m_editorremoved) + continue; + bool carries{false}; + for (int list = 0; list < 6 && false == carries; ++list) + for (auto const &event : editor_track::events(*track, list)) + carries = carries || lower(event.first) == name; + if (false == carries) + continue; + if (std::none_of(States.begin(), States.end(), [&](auto const &State) { return State.first == track; })) + States.emplace_back(track, editor_track::capture(*track)); + for (int list = 0; list < 6; ++list) + { + auto &events{editor_track::events(*track, list)}; + events.erase(std::remove_if(events.begin(), events.end(), [&](auto const &Event) { return lower(Event.first) == name; }), events.end()); + } + std::string missing; + editor_track::bind_events(*track, missing); + track->mark_dirty(); + } +} + +bool editor_mode::signal_delete(scene::instance_handle const Instance) +{ + if (false == scene::Layers.tracked(Instance) || false == scene::Layers.removable(Instance)) + return false; + signal_scan(); + auto const &included{scene::Layers.instance(Instance)}; + auto const *item{signal_template_of(*included.file)}; + if (item == nullptr || item->read.empty()) + return false; + std::string file; + std::vector values; + if (false == editor_includes::parse_directive(scene::Layers.directive(Instance), file, values)) + return false; + auto const read{editor_includes::substitute(item->read, values)}; + std::vector> states; + signal_detach_events(read, states); + if (states.empty()) + return false; + scene::Layers.removed(Instance, true); + push_track_snapshot(std::move(states)); + m_history.back().instances.push_back(Instance); + ui()->set_status(format(STR_C("Signal %s removed with its event %s, Ctrl+Z brings both back"), values.empty() ? "" : values.front().c_str(), read.c_str())); + select_include(0); + m_signal.selected = 0; + signal_refresh(true); + return true; +} + +void editor_mode::signal_renamed(std::string const &Before, std::string const &After, EditorSnapshot &Snapshot) +{ + auto const name{lower(Before)}; + for (auto *track : simulation::Paths.sequence()) + { + if (track == nullptr || track->m_editorremoved) + continue; + bool carries{false}; + for (int list = 0; list < 6 && false == carries; ++list) + for (auto const &event : editor_track::events(*track, list)) + carries = carries || lower(event.first) == name; + if (false == carries) + continue; + if (std::none_of(Snapshot.tracks.begin(), Snapshot.tracks.end(), [&](auto const &State) { return State.first == track; })) + Snapshot.tracks.emplace_back(track, editor_track::capture(*track)); + for (int list = 0; list < 6; ++list) + for (auto &event : editor_track::events(*track, list)) + if (lower(event.first) == name) + event = {lower(After), nullptr}; + std::string missing; + editor_track::bind_events(*track, missing); + track->mark_dirty(); + } + if (Snapshot.tracks.empty() || Snapshot.instance == 0) + return; + Snapshot.directives.emplace_back(Snapshot.instance, std::move(Snapshot.serialized)); + Snapshot.instance = 0; + Snapshot.serialized.clear(); + Snapshot.action = EditorSnapshot::Action::TrackEdit; + Snapshot.node_ptr = Snapshot.tracks.front().first; + Snapshot.node_name = Snapshot.tracks.front().first->name(); +} + +void editor_mode::signal_select(scene::instance_handle const Instance) +{ + m_signal.selected = Instance; + if (Instance != 0) + select_include(Instance); +} + +void editor_mode::render_signal_palette() +{ + auto &tool{m_signal}; + ImGui::SetNextItemWidth(-1.0f); + ImGui::InputTextWithHint("##signalfilter", STR_C("filter: name, w24, sbl..."), tool.filter, sizeof(tool.filter)); + auto const filter{lower(tool.filter)}; + auto const *armed{signal_armed()}; + std::vector> groups; + std::vector keys; + for (int i = 0; i < static_cast(tool.templates.size()); ++i) + { + auto const &item{tool.templates[i]}; + if (item.kind != kKinds[tool.kind]) + continue; + if (false == filter.empty() && item.name.find(filter) == std::string::npos && lower(item.description).find(filter) == std::string::npos) + continue; + auto const key{group_of(item.mount, item.lamps)}; + auto const found{std::find(keys.begin(), keys.end(), key)}; + if (found == keys.end()) + { + keys.push_back(key); + groups.push_back({i}); + } + else + groups[found - keys.begin()].push_back(i); + } + if (groups.empty()) + { + ImGui::TextDisabled("%s", STR_C("No template of this kind matches the filter")); + return; + } + ImVec2 const tile{52.0f, 86.0f}; + auto const spacing{ImGui::GetStyle().ItemSpacing.x}; + ImGui::BeginChild("##signaltiles", ImVec2(0.0f, std::min(2.0f * (tile.y + 8.0f) + 20.0f, ImGui::GetContentRegionAvail().y * 0.45f)), true); + auto const columns{std::max(1, static_cast((ImGui::GetContentRegionAvail().x + spacing) / (tile.x + spacing)))}; + auto *draw{ImGui::GetWindowDrawList()}; + for (int g = 0; g < static_cast(groups.size()); ++g) + { + auto const &group{groups[g]}; + auto const &first{tool.templates[group.front()]}; + auto const chosen{armed != nullptr && group_of(armed->mount, armed->lamps) == keys[g] && armed->kind == first.kind}; + if (g % columns != 0) + ImGui::SameLine(); + ImGui::PushID(g); + auto const origin{ImGui::GetCursorScreenPos()}; + if (ImGui::InvisibleButton("##tile", tile)) + { + auto pick{group.front()}; + if (armed != nullptr && chosen) + pick = tool.chosen[tool.kind]; + tool.chosen[tool.kind] = pick; + } + auto const hovered{ImGui::IsItemHovered()}; + draw->AddRectFilled(origin, ImVec2(origin.x + tile.x, origin.y + tile.y), chosen ? IM_COL32(60, 90, 140, 255) : hovered ? IM_COL32(60, 60, 60, 255) : IM_COL32(40, 40, 40, 255), 4.0f); + draw_signal_icon(draw, origin, ImVec2(tile.x, tile.y - 14.0f), first.mount, first.lamps, chosen ? overlay_color::selected : IM_COL32(120, 120, 120, 255)); + auto const caption{first.lamps.empty() ? first.name : first.lamps}; + auto const captionsize{ImGui::CalcTextSize(caption.c_str())}; + draw->AddText(ImVec2(origin.x + std::max(2.0f, (tile.x - captionsize.x) * 0.5f), origin.y + tile.y - 15.0f), IM_COL32(220, 220, 220, 255), caption.c_str()); + if (group.size() > 1) + draw->AddText(ImVec2(origin.x + 3.0f, origin.y + 2.0f), IM_COL32(170, 170, 170, 255), std::to_string(group.size()).c_str()); + if (hovered) + { + ImGui::BeginTooltip(); + ImGui::TextUnformatted(first.description.empty() ? first.name.c_str() : first.description.c_str()); + ImGui::TextDisabled(STR_C("%zu variants, e.g. %s"), group.size(), first.file.c_str()); + ImGui::TextDisabled("%s", first.read.empty() ? STR_C("The train doesn't read it") : STR_C("The train reads it by an event of the path")); + ImGui::EndTooltip(); + } + ImGui::PopID(); + } + ImGui::EndChild(); + if (armed == nullptr) + return; + auto const key{group_of(armed->mount, armed->lamps)}; + ImGui::SetNextItemWidth(-1.0f); + if (ImGui::BeginCombo("##signalvariant", armed->name.c_str())) + { + for (int i = 0; i < static_cast(tool.templates.size()); ++i) + { + auto const &item{tool.templates[i]}; + if (item.kind != armed->kind || group_of(item.mount, item.lamps) != key) + continue; + auto const label{item.name + (item.lean == "left" ? std::string{" \xE2\x86\x96"} : item.lean == "right" ? std::string{" \xE2\x86\x97"} : std::string{}) + "##" + item.file}; + if (ImGui::Selectable(label.c_str(), &item == armed)) + tool.chosen[tool.kind] = i; + if (ImGui::IsItemHovered() && false == item.description.empty()) + ImGui::SetTooltip("%s\n%s", item.description.c_str(), item.file.c_str()); + } + ImGui::EndCombo(); + } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Variant of the chosen type. A head leaning to one side is swapped for its counterpart leaning towards the track on the other side")); + if (false == armed->description.empty()) + ImGui::TextWrapped("%s", armed->description.c_str()); + ImGui::TextDisabled("%s", armed->read.empty() ? (armed->kind == "warning" || armed->kind == "repeater" ? STR_C("The train doesn't read it: it repeats what the signal ahead of it shows") : STR_C("The train doesn't read it")) : format(STR_C("The train reads it by %s on the path it stands by"), editor_includes::substitute(armed->read, {tool.name[0] != '\0' ? std::string{tool.name} : std::string{"?"}}).c_str()).c_str()); +} + +void editor_mode::render_signal_selected() +{ + auto &tool{m_signal}; + auto const found{std::find_if(tool.standing.begin(), tool.standing.end(), [&](signal_standing const &Standing) { return Standing.include.instance == tool.selected; })}; + if (found == tool.standing.end()) + return; + ImGui::Separator(); + ImGui::TextUnformatted(format(STR_C("Selected: %s (%s)"), found->name.c_str(), found->include.file.c_str()).c_str()); + if (found->read.empty()) + ImGui::TextDisabled("%s", STR_C("The train doesn't read it")); + else if (found->track != nullptr) + ImGui::TextDisabled(STR_C("Read by %s %s of %s"), editor_track::event_keyword(found->list), found->read.c_str(), found->track->name().empty() ? "(noname)" : found->track->name().c_str()); + else + ImGui::TextColored(ImVec4(1.0f, 0.5f, 0.3f, 1.0f), STR_C("No path has %s among its events: the train doesn't see it"), found->read.c_str()); + ImGui::TextDisabled("%s", STR_C("Name, plate and the linked signal: in the node properties. Del removes it with its event")); +} + +void editor_mode::render_signal_ui() +{ + auto &tool{m_signal}; + signal_scan(); + if (tool.templates.empty()) + { + ImGui::TextWrapped("%s", STR_C("No signal templates: no template of the scenery directory is described with category: signal. tools/editor/signal_headers.py writes the descriptions into the signal templates.")); + return; + } + if (ImGui::BeginTabBar("##signalkinds")) + { + for (int k = 0; k < kKindCount; ++k) + { + if (std::none_of(tool.templates.begin(), tool.templates.end(), [&](signal_template const &Item) { return Item.kind == kKinds[k]; })) + continue; + if (ImGui::BeginTabItem(STR(kKindLabels[k]).c_str())) + { + tool.kind = k; + ImGui::EndTabItem(); + } + } + ImGui::EndTabBar(); + } + render_signal_palette(); + auto const *armed{signal_armed()}; + ImGui::Separator(); + ImGui::PushItemWidth(140.0f); + ImGui::InputText(STR_C("Name"), tool.name, sizeof(tool.name)); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Name of the next signal; it counts up after each one placed. Its events and memory cell are named after it")); + if (armed != nullptr && armed->plate) + { + auto const automatic{format(STR_C("auto: %s"), plate_for({}, tool.name).c_str())}; + ImGui::InputTextWithHint(STR_C("Plate"), automatic.c_str(), tool.plate, sizeof(tool.plate)); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Texture of the plate from textures/tabl, e.g. a-12 or tob. Left empty: the one named like the signal, if there is one")); + auto const &plates{plate_textures()}; + auto const typed{lower(tool.plate)}; + auto const exists{typed.empty() || std::binary_search(plates.begin(), plates.end(), typed)}; + if (false == exists) + { + ImGui::SameLine(); + ImGui::TextColored(ImVec4(1.0f, 0.5f, 0.3f, 1.0f), "%s", STR_C("no such texture")); + } + if (ImGui::IsItemActive() || (false == exists && false == typed.empty())) + { + int shown{0}; + for (auto const &plate : plates) + { + if (typed.empty() || plate.compare(0, typed.size(), typed) != 0 || plate == typed) + continue; + if (shown % 6 != 0) + ImGui::SameLine(); + if (ImGui::SmallButton(plate.c_str())) + std::snprintf(tool.plate, sizeof(tool.plate), "%s", plate.c_str()); + if (++shown >= 18) + break; + } + } + } + if (armed != nullptr && armed->linked && ImGui::TreeNode(STR_C("Linked signal"))) + { + ImGui::InputText("##linked", tool.linked, sizeof(tool.linked)); + ImGui::TextDisabled("%s", STR_C("(p7) of the template: the warning signal a semaphore drives, the previous block signal, \"none\" for no link")); + ImGui::TreePop(); + } + auto offset{static_cast(EditorSettings.signal_offset())}; + if (ImGui::InputFloat(STR_C("From the axis (m)"), &offset, 0.05f, 0.25f, "%.2f")) + { + EditorSettings.signal_offset(std::clamp(static_cast(offset), 0.0, 10.0)); + EditorSettings.save(); + } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Distance of the mast from the axis of the track. 2.25 m is what the signals of the sceneries stand at")); + if (armed != nullptr && armed->mount == "gantry") + { + ImGui::InputFloat(STR_C("Over the rails (m)"), &tool.height, 0.1f, 0.5f, "%.2f"); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("A head for a gantry hangs over the axis of the track this high over the rail heads")); + } + ImGui::PopItemWidth(); + if (false == tool.status.empty()) + ImGui::TextWrapped("%s", tool.status.c_str()); + render_signal_selected(); +} + +void editor_mode::draw_signal_overlay() const +{ + auto const &tool{m_signal}; + screen_projection const projection; + auto *drawlist{ImGui::GetBackgroundDrawList()}; + glm::dvec3 const camera{Global.pCamera.Pos}; + auto const arrow = [&](glm::dvec3 const &From, glm::dvec2 const &Direction, ImU32 const Colour) { + glm::dvec3 const tip{From.x + Direction.x * 6.0, From.y, From.z + Direction.y * 6.0}; + ImVec2 a, b; + if (false == projection.project(From, a) || false == projection.project(tip, b)) + return; + drawlist->AddLine(a, b, Colour, 2.5f); + auto const dx{b.x - a.x}; + auto const dy{b.y - a.y}; + auto const size{std::sqrt(dx * dx + dy * dy)}; + if (size < 1.0f) + return; + ImVec2 const unit{dx / size, dy / size}; + ImVec2 const side{-unit.y, unit.x}; + drawlist->AddTriangleFilled(ImVec2(b.x + unit.x * 9.0f, b.y + unit.y * 9.0f), ImVec2(b.x + side.x * 6.0f, b.y + side.y * 6.0f), ImVec2(b.x - side.x * 6.0f, b.y - side.y * 6.0f), Colour); + }; + auto const mast = [&](glm::dvec3 const &Foot, ImU32 const Colour, float const Width) { projection.line(drawlist, Foot, Foot + glm::dvec3{0.0, kSignalHead, 0.0}, Colour, Width); }; + for (int i = 0; i < static_cast(tool.standing.size()); ++i) + { + auto const &standing{tool.standing[i]}; + auto const &location{standing.include.location}; + if (glm::distance(location, camera) > kSignalRange) + continue; + auto const selected{standing.include.instance == tool.selected}; + auto const hovered{m_intent.what == track_intent::kind::signal_move && m_intent.index == i}; + auto const unread{false == standing.read.empty() && standing.track == nullptr}; + auto const colour{selected ? overlay_color::selected : hovered ? overlay_color::highlight : unread ? overlay_color::invalid : IM_COL32(255, 210, 60, 160)}; + mast(location, colour, selected || hovered ? 3.0f : 1.5f); + ImVec2 head; + if ((selected || hovered || unread) && projection.project(location + glm::dvec3{0.0, kSignalHead, 0.0}, head)) + { + auto const label{standing.name + (unread ? std::string{" "} + STR(" not read") : std::string{})}; + drawlist->AddText(ImVec2(head.x + 6.0f, head.y - 6.0f), colour, label.c_str()); + } + if (selected || hovered) + { + auto const yaw{glm::radians(standing.include.yaw + 180.0)}; + arrow(location, glm::dvec2{std::sin(yaw), std::cos(yaw)}, colour); + } + } + auto const preview = [&](signal_spot const &Spot, ImU32 const Colour) { + projection.line(drawlist, Spot.axis + glm::dvec3{0.0, kRailTop, 0.0}, Spot.position, Colour, 2.0f); + mast(Spot.position, Colour, 3.0f); + arrow(Spot.axis + glm::dvec3{0.0, kRailTop, 0.0}, Spot.travel, Colour); + ImVec2 head; + auto const *armed{signal_armed()}; + if (armed != nullptr && false == armed->lamps.empty() && projection.project(Spot.position + glm::dvec3{0.0, kSignalHead, 0.0}, head)) + { + auto const lamps{static_cast(armed->lamps.size())}; + drawlist->AddRectFilled(ImVec2(head.x - 6.0f, head.y - 4.0f), ImVec2(head.x + 6.0f, head.y + lamps * 10.0f), IM_COL32(20, 20, 20, 220), 3.0f); + for (int i = 0; i < lamps; ++i) + drawlist->AddCircleFilled(ImVec2(head.x, head.y + 1.0f + i * 10.0f), 4.0f, lamp_colour(armed->lamps[i])); + } + }; + if (tool.placing) + preview(tool.press, overlay_color::grip); + else if (tool.moving && tool.moved_valid) + preview(tool.moved, overlay_color::selected); + else if (m_intent.what == track_intent::kind::signal_place && m_hover.track != nullptr) + { + if (auto const *armed{signal_armed()}; armed != nullptr) + { + signal_spot spot; + if (signal_spot_at(*m_hover.track, m_hover.path, m_hover.point, cursor_level(m_hover.point.y), 0, 0, *armed, spot)) + preview(spot, overlay_color::marked); + } + } +} diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index e3e6bafe4..ee91503e7 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -561,15 +561,16 @@ void editor_mode::restore_track_snapshot(EditorSnapshot const &Snapshot, std::ve profile_restore(); } -std::array const &editor_mode::track_modes() +std::array const &editor_mode::track_modes() { - static std::array const modes{{ + static std::array const modes{{ {"Select", "Esc", track_tab::path, "LMB on a path selects it: its points, control vectors and parameters"}, {"Lay track", "L", track_tab::lay, "Lays new track through the clicked points, on the ground or from a free end of a track"}, {"Switch", "T", track_tab::turnout, "Puts switches into the selected straight or curve, edits the geometry of the selected switch"}, {"Turntable", "U", track_tab::turntable, "Places a turntable, leads tracks out of it and fits the tracks around to it"}, {"Straight", "G", track_tab::straights, "The whole straight through the selected path: drag its ends or the middle, break it, shift it"}, {"Curve", "C", track_tab::route, "The line through the path, switch to switch: vertices with the radii, transitions and cant of the curves"}, + {"Signals", "H", track_tab::signals, "Signals by the track, from the templates of the scenery, with the event the train reads them by"}, {"Objects", "B", track_tab::lineside, "Along the track: hectometre posts, fouling point markers, a parallel track, a vehicle to drive"}, {"Profile", "P", track_tab::profile, "Vertical profile (grade line) along the line"}, {"Speed", "V", track_tab::speed, "Speed limits of the paths against the speed their geometry allows"}, @@ -636,6 +637,10 @@ void editor_mode::show_track_tab(track_tab const Tab) scan_turntables(); turntable_read(track); break; + case track_tab::signals: + signal_scan(); + signal_refresh(true); + break; default: break; } @@ -676,7 +681,7 @@ bool editor_mode::track_shortcut(int const Key) bool editor_mode::track_busy() const { auto const &straights{m_straights}; - return (m_lay.active && false == m_lay.points.empty()) || m_turntable.placing || straights.dragging || m_extend.active || m_point_drag.active || m_handle_drag.active || m_switch.placing || m_track_point.valid() || m_route.vertex >= 0 || m_route.grip >= 0 || false == straights.detour.empty() || straights.tool != 0 || straights.handle >= 0; + return (m_lay.active && false == m_lay.points.empty()) || m_turntable.placing || m_signal.placing || m_signal.moving || straights.dragging || m_extend.active || m_point_drag.active || m_handle_drag.active || m_switch.placing || m_track_point.valid() || m_route.vertex >= 0 || m_route.grip >= 0 || false == straights.detour.empty() || straights.tool != 0 || straights.handle >= 0; } std::string editor_mode::track_mode_name() const @@ -707,6 +712,12 @@ std::string editor_mode::track_mode_name() const case track_tab::lineside: return STR_C("Objects along the track"); case track_tab::infra: return STR_C("Infrastructure along the track"); + case track_tab::signals: + if (m_signal.moving) + return STR_C("Signal: drag along the track, release to put it there"); + if (m_signal.placing) + return STR_C("Signal: drag along the track sets the direction of the trains, release to place it"); + return signal_armed() != nullptr ? STR_C("Signal: LMB by the track places it on that side") : STR_C("Signal: choose its type below"); case track_tab::turntable: if (m_turntable.placing) return STR_C("Turntable: drag to turn the bridge, release to place it"); @@ -770,6 +781,7 @@ void editor_mode::render_track_inspector() case track_tab::speed: render_speed_body(); break; case track_tab::joints: render_joints_body(); break; case track_tab::lineside: render_lineside_ui(); break; + case track_tab::signals: render_signal_ui(); break; case track_tab::infra: render_infra_body(); break; case track_tab::turntable: render_turntable_ui(); break; default: @@ -815,8 +827,8 @@ void editor_mode::render_track_modes(TTrack *Track) ImGui::SetTooltip("%s [%s]", STR_C(mode.tooltip), mode.key); } }; - row("Edit", 0, 6); - row("Analysis", 6, static_cast(modes.size())); + row("Edit", 0, 7); + row("Analysis", 7, static_cast(modes.size())); ImGui::SameLine(); ImGui::Checkbox(STR_C("Structure gauge"), &m_gauge.open); if (ImGui::IsItemHovered()) @@ -3007,6 +3019,8 @@ void editor_mode::cancel_track_tools() } m_extend.active = false; m_turntable.placing = false; + m_signal.placing = false; + m_signal.moving = false; m_handle_drag = {}; if (m_point_drag.active) { @@ -3468,6 +3482,14 @@ std::vector editor_mode::track_key_hints(bool const All) hints = {{"LMB on a row", "show the path"}}; else if (m_track_window_open && m_track_tab == track_tab::lineside) hints = {{"LMB on a track", "the line the objects go along"}}; + else if (m_track_window_open && m_track_tab == track_tab::signals && (m_signal.placing || m_signal.moving)) + hints = {{"Drag along", m_signal.moving ? "moves the signal along the track" : "the trains it faces run that way"}, {"Release", "done"}, {"Esc", "cancel"}}; + else if (m_track_window_open && m_track_tab == track_tab::signals) + { + hints = {{"LMB by a track", "places the signal on that side, facing the trains which have it on their right"}, {"Press+drag along", "the trains it faces run the way of the drag"}, {"LMB on a signal", "selects it"}, {"Drag a signal", "moves it along the track"}}; + if (m_signal.selected != 0) + hints.push_back({"Del", "removes the selected signal with its event"}); + } else if (m_track_window_open && m_track_tab == track_tab::joints) hints = {{"LMB on a row", "show the place"}, {"Fix", "joins the ends, aligns them"}}; else if (m_track_window_open && m_track_tab == track_tab::infra) diff --git a/application/editormodetrackux.cpp b/application/editormodetrackux.cpp index 22140d33d..0de31ee49 100644 --- a/application/editormodetrackux.cpp +++ b/application/editormodetrackux.cpp @@ -193,7 +193,7 @@ void editor_mode::draw_track_hover() const bool editor_mode::track_gesture_on() const { return mouseHold || m_track_set_using || m_track_box.active || m_input.mouse.button(GLFW_MOUSE_BUTTON_RIGHT) == GLFW_PRESS || m_track_gizmo_using || m_route_gizmo_using || m_extend.active || m_switch.placing || m_straights.dragging || m_straights.tool_mouse || - m_point_drag.active || m_handle_drag.active || m_sweep.dragging || m_turntable.placing || ImGuizmo::IsUsing(); + m_point_drag.active || m_handle_drag.active || m_sweep.dragging || m_turntable.placing || m_signal.placing || m_signal.moving || ImGuizmo::IsUsing(); } editor_mode::track_intent editor_mode::track_intent_at(int const Mods) @@ -232,6 +232,40 @@ editor_mode::track_intent editor_mode::track_intent_at(int const Mods) } if (m_track_tab == track_tab::turntable) return turntable_intent(ground, shift); + if (m_track_tab == track_tab::signals) + { + if (auto const hit{signal_hit()}; hit >= 0) + { + auto const &standing{m_signal.standing[hit]}; + intent.index = hit; + intent.position = standing.include.location; + intent.action = format(STR_C("Click: select the signal %s, drag: move it along the track"), standing.name.c_str()); + intent.what = kind::signal_move; + return intent; + } + auto const *armed{signal_armed()}; + if (m_hover.track != nullptr && armed != nullptr) + { + signal_spot spot; + if (signal_spot_at(*m_hover.track, m_hover.path, m_hover.point, cursor_level(m_hover.point.y), 0, 0, *armed, spot)) + { + intent.track = m_hover.track; + intent.path = m_hover.path; + intent.position = spot.position; + intent.action = signal_intent_label(*armed, spot); + intent.what = kind::signal_place; + return intent; + } + } + if (m_hover.track != nullptr) + { + intent.track = m_hover.track; + intent.path = m_hover.path; + intent.position = m_hover.point; + return make(kind::select, "Choose the type of the signal in the Tracks window first"); + } + return intent; + } if (m_track_tab == track_tab::path) { if (shift && control && m_hover.track != nullptr && rail(*m_hover.track)) @@ -419,6 +453,8 @@ void editor_mode::track_press(track_intent const &Intent) case kind::turntable_place: case kind::turntable_exit: case kind::turntable_fit: turntable_press(Intent); return; + case kind::signal_place: + case kind::signal_move: signal_press(Intent); return; case kind::select: case kind::none: { diff --git a/editor/editorIncludeInfo.cpp b/editor/editorIncludeInfo.cpp index d57da2573..d5d9ccae0 100644 --- a/editor/editorIncludeInfo.cpp +++ b/editor/editorIncludeInfo.cpp @@ -251,6 +251,14 @@ bool parse(template_text const &Text, include_info &Info, std::string &Error) Info.switch_hand = drive["hand"].as(""); Info.switch_drive = drive["drive"].as(""); } + if (auto const signal{document["signal"]}; signal.IsDefined() && signal.IsMap()) + { + Info.signal_kind = signal["kind"].as(""); + Info.signal_mount = signal["mount"].as(""); + Info.signal_lamps = signal["lamps"].as(""); + Info.signal_lean = signal["lean"].as(""); + Info.signal_read = signal["read"].as(""); + } if (auto const table{document["turntable"]}; table.IsDefined() && table.IsMap()) { Info.turntable_length = table["length"].as(0.0); @@ -644,7 +652,27 @@ std::string compose_directive(std::string const &File, std::vector return text + " end"; } -std::string directive(std::string const &File, include_info const &Info, int const Parameters, glm::dvec3 const &Location, std::optional Yaw, std::string const &Track, glm::dvec2 const &Tilt) +std::string substitute(std::string const &Text, std::vector const &Values) +{ + std::string result; + std::size_t length{0}; + for (std::size_t idx = 0; idx < Text.size();) + { + auto const id{placeholder(Text, idx, length)}; + if (id > 0 && id <= static_cast(Values.size())) + { + result += Values[id - 1]; + idx += length; + } + else + { + result += Text[idx++]; + } + } + return result; +} + +std::string directive(std::string const &File, include_info const &Info, int const Parameters, glm::dvec3 const &Location, std::optional Yaw, std::string const &Track, glm::dvec2 const &Tilt, std::map const &Values) { std::vector values; for (auto id = 1; id <= Parameters; ++id) @@ -652,7 +680,15 @@ std::string directive(std::string const &File, include_info const &Info, int con auto const lookup{std::find_if(std::begin(Info.parameters), std::end(Info.parameters), [=](include_parameter const &Parameter) { return Parameter.id == id; })}; auto const role{lookup != std::end(Info.parameters) ? lookup->role : std::string{"free"}}; auto value{lookup != std::end(Info.parameters) ? lookup->value : std::string{}}; - if (role == "pos.x") + if (auto const given{Values.find("#" + std::to_string(id))}; given != Values.end()) + { + value = given->second; + } + else if (auto const given{Values.find(role)}; given != Values.end()) + { + value = given->second; + } + else if (role == "pos.x") { value = number(Location.x); } diff --git a/editor/editorIncludeInfo.hpp b/editor/editorIncludeInfo.hpp index d22a96068..d2565a2fb 100644 --- a/editor/editorIncludeInfo.hpp +++ b/editor/editorIncludeInfo.hpp @@ -9,6 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once +#include #include #include #include @@ -39,6 +40,11 @@ struct include_info double turntable_length{0.0}; int turntable_angles{0}; int turntable_positions{0}; + std::string signal_kind; + std::string signal_mount; + std::string signal_lamps; + std::string signal_lean; + std::string signal_read; std::vector parameters; // description of specified parameter, created if there's none @@ -71,7 +77,8 @@ bool complete(include_info const &Info, int Parameters, std::string *Issue = nul // builds include directive which places specified template. Location and Yaw are the placement to pass through // the parameters with matching roles, in the coordinates of the place the directive goes to; without Yaw the // rotation parameters receive their default values -std::string directive(std::string const &File, include_info const &Info, int Parameters, glm::dvec3 const &Location, std::optional Yaw, std::string const &Track = {}, glm::dvec2 const &Tilt = glm::dvec2{0.0}); +std::string directive(std::string const &File, include_info const &Info, int Parameters, glm::dvec3 const &Location, std::optional Yaw, std::string const &Track = {}, glm::dvec2 const &Tilt = glm::dvec2{0.0}, std::map const &Values = {}); +std::string substitute(std::string const &Text, std::vector const &Values); // splits include directive into the name of the included file and the values of the parameters, both as they're // written. returns: false if the text isn't a complete include directive diff --git a/editor/editorSettings.cpp b/editor/editorSettings.cpp index b4c5fb31e..99d6a4607 100644 --- a/editor/editorSettings.cpp +++ b/editor/editorSettings.cpp @@ -94,6 +94,8 @@ bool editorSettings::load() m_orthophoto.in_scene = (value == "1"); else if (key == "platform_edge") parse(value, m_platform_edge); + else if (key == "signal_offset") + parse(value, m_signal_offset); else if (key.rfind(origin_prefix, 0) == 0) { // northing;easting @@ -133,6 +135,7 @@ bool editorSettings::save() stream << "ortho_lift " << m_orthophoto.lift << "\n"; stream << "ortho_in_scene " << (m_orthophoto.in_scene ? 1 : 0) << "\n"; stream << "platform_edge " << m_platform_edge << "\n"; + stream << "signal_offset " << m_signal_offset << "\n"; stream << std::fixed << std::setprecision(3); for (auto const &origin : m_orthophoto_origins) stream << origin.first << " " << origin.second.first << ";" << origin.second.second << "\n"; diff --git a/editor/editorSettings.hpp b/editor/editorSettings.hpp index 6e39cfa08..87be836f3 100644 --- a/editor/editorSettings.hpp +++ b/editor/editorSettings.hpp @@ -41,12 +41,15 @@ public: double platform_edge() const { return m_platform_edge; } void platform_edge(double Distance) { m_platform_edge = Distance; } + double signal_offset() const { return m_signal_offset; } + void signal_offset(double Distance) { m_signal_offset = Distance; } private: movement_scheme m_movement{movement_scheme::wsad}; orthophoto_settings m_orthophoto; std::map> m_orthophoto_origins; double m_platform_edge{1.725}; + double m_signal_offset{2.25}; }; // global editor settings instance diff --git a/lang/editor_pl.po b/lang/editor_pl.po index cd6f4948d..03c7c4b6a 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -4403,3 +4403,193 @@ msgstr "1,650 m: najmniej dopuszczalne w eksploatacji" msgid "edge of the platform from the axis" msgstr "krawędź peronu od osi toru" + +# scenery editor: signals +msgid "Signals" +msgstr "Sygnalizatory" + +msgid "Signals by the track, from the templates of the scenery, with the event the train reads them by" +msgstr "Sygnalizatory przy torze, z szablonów scenerii, z eventem, którym pociąg je odczytuje" + +msgid "Signal: drag along the track, release to put it there" +msgstr "Sygnalizator: przeciągnij wzdłuż toru, puść, żeby go tam postawić" + +msgid "Signal: drag along the track sets the direction of the trains, release to place it" +msgstr "Sygnalizator: przeciąganie wzdłuż toru ustawia kierunek pociągów, puść, żeby go postawić" + +msgid "Signal: LMB by the track places it on that side" +msgstr "Sygnalizator: LPM przy torze stawia go po tej stronie" + +msgid "Signal: choose its type below" +msgstr "Sygnalizator: wybierz jego typ poniżej" + +msgid "moves the signal along the track" +msgstr "przesuwa sygnalizator wzdłuż toru" + +msgid "the trains it faces run that way" +msgstr "pociągi, do których jest zwrócony, jadą w tę stronę" + +msgid "LMB by a track" +msgstr "LPM przy torze" + +msgid "places the signal on that side, facing the trains which have it on their right" +msgstr "stawia sygnalizator po tej stronie, zwrócony do pociągów, które mają go po prawej" + +msgid "Press+drag along" +msgstr "Wciśnij i przeciągnij wzdłuż" + +msgid "the trains it faces run the way of the drag" +msgstr "pociągi, do których jest zwrócony, jadą w stronę przeciągnięcia" + +msgid "LMB on a signal" +msgstr "LPM na sygnalizatorze" + +msgid "Drag a signal" +msgstr "Przeciągnij sygnalizator" + +msgid "moves it along the track" +msgstr "przesuwa go wzdłuż toru" + +msgid "removes the selected signal with its event" +msgstr "usuwa zaznaczony sygnalizator razem z jego eventem" + +msgid "Click: select the signal %s, drag: move it along the track" +msgstr "Klik: zaznacz sygnalizator %s, przeciągnij: przesuń go wzdłuż toru" + +msgid "Choose the type of the signal in the Tracks window first" +msgstr "Najpierw wybierz typ sygnalizatora w oknie Tory" + +msgid "Semaphore" +msgstr "Semafor" + +msgid "Automatic block" +msgstr "SBL" + +msgid "Warning signal" +msgstr "Tarcza ostrzegawcza" + +msgid "Shunting signal" +msgstr "Tarcza manewrowa" + +msgid "Stop signal" +msgstr "Zaporowy" + +msgid "Substitute signal" +msgstr "Sygnał zastępczy" + +msgid "Repeater" +msgstr "Powtarzacz" + +msgid " on the right of the trains" +msgstr " po prawej pociągów" + +msgid " on the left of the trains" +msgstr " po lewej pociągów" + +msgid "Click: %s %s (%s)%s, the train doesn't read it" +msgstr "Klik: %s %s (%s)%s, pociąg go nie odczytuje" + +msgid "Drag along: the trains it faces run the way of the drag" +msgstr "Przeciągnij wzdłuż: pociągi, do których jest zwrócony, jadą w stronę przeciągnięcia" + +msgid "Click: %s %s (%s)%s, read by %s %s of %s" +msgstr "Klik: %s %s (%s)%s, pociąg odczytuje go przez %s %s toru %s" + +msgid "Signal %s moved" +msgstr "Sygnalizator %s przesunięty" + +msgid "Signal %s moved, read by %s %s of %s" +msgstr "Sygnalizator %s przesunięty, pociąg odczytuje go przez %s %s toru %s" + +msgid "Give the signal a name without spaces first" +msgstr "Najpierw nadaj sygnalizatorowi nazwę bez spacji" + +msgid "The signal couldn't be placed: " +msgstr "Nie udało się postawić sygnalizatora: " + +msgid "Signal %s placed (%s), the train doesn't read it" +msgstr "Sygnalizator %s postawiony (%s), pociąg go nie odczytuje" + +msgid "Signal %s placed (%s), but vehicles stand on the path: add %s to its %s by hand" +msgstr "Sygnalizator %s postawiony (%s), ale na torze stoją pojazdy: dopisz %s do jego %s ręcznie" + +msgid "Signal %s placed (%s), but the path can't take its event: %s" +msgstr "Sygnalizator %s postawiony (%s), ale tor nie przyjmie jego eventu: %s" + +msgid "Signal %s placed (%s), read by %s %s of %s. Its logic works after the scenery is saved and opened again" +msgstr "Sygnalizator %s postawiony (%s), pociąg odczytuje go przez %s %s toru %s. Jego logika zadziała po zapisaniu i ponownym otwarciu scenerii" + +msgid "Signal %s removed with its event %s, Ctrl+Z brings both back" +msgstr "Sygnalizator %s usunięty razem z eventem %s, Ctrl+Z przywraca oba" + +msgid "filter: name, w24, sbl..." +msgstr "filtr: nazwa, w24, sbl..." + +msgid "No template of this kind matches the filter" +msgstr "Żaden szablon tego rodzaju nie pasuje do filtra" + +msgid "%zu variants, e.g. %s" +msgstr "wariantów: %zu, np. %s" + +msgid "The train doesn't read it" +msgstr "Pociąg go nie odczytuje" + +msgid "The train reads it by an event of the path" +msgstr "Pociąg odczytuje go przez event toru" + +msgid "Variant of the chosen type. A head leaning to one side is swapped for its counterpart leaning towards the track on the other side" +msgstr "Wariant wybranego typu. Głowica odchylona w jedną stronę zostaje zamieniona na odpowiednik odchylony w stronę toru, gdy sygnalizator stanie po drugiej stronie" + +msgid "The train doesn't read it: it repeats what the signal ahead of it shows" +msgstr "Pociąg go nie odczytuje: powtarza to, co pokazuje sygnalizator przed nim" + +msgid "The train reads it by %s on the path it stands by" +msgstr "Pociąg odczytuje go przez %s na torze, przy którym stoi" + +msgid "Selected: %s (%s)" +msgstr "Zaznaczony: %s (%s)" + +msgid "Read by %s %s of %s" +msgstr "Odczytywany przez %s %s toru %s" + +msgid "No path has %s among its events: the train doesn't see it" +msgstr "Żaden tor nie ma %s wśród swoich eventów: pociąg go nie widzi" + +msgid "Name, plate and the linked signal: in the node properties. Del removes it with its event" +msgstr "Nazwa, tablica i powiązany sygnalizator: we właściwościach węzła. Del usuwa go razem z eventem" + +msgid "No signal templates: no template of the scenery directory is described with category: signal. tools/editor/signal_headers.py writes the descriptions into the signal templates." +msgstr "Brak szablonów sygnalizatorów: żaden szablon katalogu scenerii nie ma opisu z category: signal. tools/editor/signal_headers.py dopisuje opisy do szablonów sygnalizatorów." + +msgid "Name of the next signal; it counts up after each one placed. Its events and memory cell are named after it" +msgstr "Nazwa następnego sygnalizatora; po każdym postawionym rośnie o jeden. Od niej biorą nazwy jego eventy i komórka pamięci" + +msgid "auto: %s" +msgstr "auto: %s" + +msgid "Plate" +msgstr "Tablica" + +msgid "Texture of the plate from textures/tabl, e.g. a-12 or tob. Left empty: the one named like the signal, if there is one" +msgstr "Tekstura tablicy z textures/tabl, np. a-12 albo tob. Puste: ta nazwana tak jak sygnalizator, jeśli istnieje" + +msgid "no such texture" +msgstr "nie ma takiej tekstury" + +msgid "Linked signal" +msgstr "Powiązany sygnalizator" + +msgid "(p7) of the template: the warning signal a semaphore drives, the previous block signal, \"none\" for no link" +msgstr "(p7) szablonu: tarcza ostrzegawcza, którą steruje semafor, poprzedni semafor SBL, \"none\": bez powiązania" + +msgid "Distance of the mast from the axis of the track. 2.25 m is what the signals of the sceneries stand at" +msgstr "Odległość masztu od osi toru. Na 2,25 m stoją sygnalizatory w sceneriach" + +msgid "Over the rails (m)" +msgstr "Nad szynami (m)" + +msgid "A head for a gantry hangs over the axis of the track this high over the rail heads" +msgstr "Głowica na bramkę wisi nad osią toru tak wysoko nad główkami szyn" + +msgid " not read" +msgstr " nieodczytywany" diff --git a/tools/editor/signal_headers.py b/tools/editor/signal_headers.py new file mode 100644 index 000000000..c208406d1 --- /dev/null +++ b/tools/editor/signal_headers.py @@ -0,0 +1,237 @@ +#!/usr/bin/env python3 +"""Writes //$e descriptions into the signal templates of the scenery directory, so the editor can place them. + +usage: signal_headers.py [--write] +without --write it only reports what it would write +""" + +import os +import re +import sys +import tarfile +import time + +FAMILIES = [ + (re.compile(r'^ss[dow]?\d'), 'main'), + (re.compile(r'^sk(\d|-un)'), 'main'), + (re.compile(r'^sbl\d'), 'block'), + (re.compile(r'^(ts\d|tk\d|top|tsosp)'), 'warning'), + (re.compile(r'^(ps\d|sp3)'), 'repeater'), + (re.compile(r'^(ms\d|zs2nb)'), 'shunt'), + (re.compile(r'^(zs1c|zs2cb|tzm|z1)'), 'stop'), + (re.compile(r'^sz(i|k|y|yn|-ksztalt\d?)\.inc$'), 'substitute'), +] + +COLOURS = [('zielon', 'z'), ('czerwon', 'c'), ('pomara', 'p'), ('żółt', 'p'), ('biał', 'b'), ('mleczn', 'b'), ('niebiesk', 'n'), ('ślep', 'x'), ('brak', 'x')] + +LINEMARK = '//$e' + + +def tokens(text): + text = re.sub(r'//[^\n]*', ' ', text) + text = re.sub(r'/\*.*?\*/', ' ', text, flags=re.S) + return re.split(r'[\s;]+', text.lower()) + + +def statements(words, keyword): + out = [] + idx = 0 + while idx < len(words): + if words[idx] == keyword: + if keyword == 'event': + stop = idx + while stop < len(words) and words[stop] != 'endevent': + stop += 1 + else: + stop = idx + 10 + out.append(words[idx:stop]) + idx += 1 + return out + + +def examine(path, file): + raw = open(path, 'rb').read() + try: + text = raw.decode('utf-8') + encoding = 'utf-8' + except UnicodeDecodeError: + text = raw.decode('cp1250') + encoding = 'cp1250' + lines = [line for line in text.splitlines() if not line.startswith(LINEMARK)] + body = '\n'.join(lines) + words = tokens(body) + count = max([int(m) for m in re.findall(r'\(p(\d+)\)', body)] or [0]) + + if 'origin' not in words or words[words.index('origin') + 1:words.index('origin') + 4] != ['(p2)', '(p3)', '(p4)']: + return None, 'no origin (p2) (p3) (p4)' + if 'rotate' not in words or words[words.index('rotate') + 1:words.index('rotate') + 4] != ['0', '(p5)', '0']: + return None, 'no rotate 0 (p5) 0' + if count < 5: + return None, 'fewer than 5 parameters' + + models = [n for n in statements(words, 'node') if len(n) > 9 and n[4] == 'model'] + head = next((n for n in models if n[3].startswith('(p1)')), None) + if head is None: + return None, 'no model named after (p1)' + model = head[9] + + cells = {} + for n in statements(words, 'node'): + if len(n) > 8 and n[4] == 'memcell': + cells[n[3]] = n[8] + read = '' + for e in statements(words, 'event'): + velocity = (len(e) > 4 and e[2] == 'getvalues' and cells.get(e[4]) in ('setvelocity', 'shuntvelocity')) or (len(e) > 8 and e[2] == 'putvalues' and e[8] in ('setvelocity', 'shuntvelocity')) + if velocity and e[1].startswith('(p1)'): + if not read or e[1].endswith('_sem_info'): + read = e[1] + + kind = next((k for pattern, k in FAMILIES if pattern.search(file)), None) + if kind is None: + return None, 'not a signal family' + if kind == 'repeater' and cells: + return None, 'repeater with a memory cell' + if kind in ('main', 'block', 'shunt', 'stop', 'substitute') and not read and cells: + return None, 'memory cell which no event reads for the train' + if kind in ('warning', 'repeater'): + read = '' + + models_used = [n[9] for n in models] + lamps = '' + lean = '' + m = re.match(r'sem/(?:[a-z]+)_(\d)_([lpyk])_([a-z]+)[_.]', model) + if m: + lamps = m.group(3) + lean = {'l': 'left', 'y': 'right', 'p': '', 'k': ''}[m.group(2)] + else: + m = re.match(r'sem/karzelki/k(?:[a-z]*?\d|tm|to|s)([zcpbnx]+)[.+]', model) or re.match(r'sem/glowice/(?:s|to)\d(?:i|y[lp])([zcpbnx]+)_dd\.', model) + if m: + lamps = m.group(1) + if not lamps: + for line in lines: + if line.lower().lstrip('/ ').startswith('komory:'): + for word in line.split(':', 1)[1].split(','): + word = word.strip().lower() + lamps += next((c for prefix, c in COLOURS if word.startswith(prefix)), '') + break + + if 'karzelki/' in model or re.search(r'k(w\d+)?(\+.*)?\.inc$', file) or 'pod_betonowa' in body: + mount = 'dwarf' + elif '_drb_' in model and not any(('slupy/' in m or 'post' in m or 'drabinki/' in m) for m in models_used): + mount = 'gantry' + else: + mount = 'mast' + + description = '' + for line in lines: + stripped = line.strip() + if stripped.startswith('//'): + stripped = stripped.lstrip('/').strip() + if stripped.lower().startswith('typ:'): + stripped = stripped[4:].strip() + if stripped: + description = stripped + break + elif stripped: + break + + said = description.lower() + if 'w lewo' in said: + lean = 'left' + elif 'w prawo' in said: + lean = 'right' + elif 'prost' in said: + lean = '' + + params = [ + "{id: 1, role: name, label: Name, default: A}", + "{id: 2, role: pos.x}", + "{id: 3, role: pos.y}", + "{id: 4, role: pos.z}", + "{id: 5, role: rot.y}", + ] + if count >= 6: + params.append("{id: 6, role: texture, label: Plate, default: 0_nothing}" if 'tabl/(p6)' in body.lower() else "{id: 6, role: text, label: Symbol, default: none}") + for id in range(7, count + 1): + label = 'Linked signal' if id == 7 else 'Parameter %d' % id + params.append("{id: %d, role: text, label: %s, default: none}" % (id, label)) + + signal = ['kind: ' + kind, 'mount: ' + mount] + if lamps: + signal.append('lamps: ' + lamps) + if lean: + signal.append('lean: ' + lean) + if read: + signal.append('read: "' + read + '"') + header = [ + 'version: 1', + 'name: ' + file[:-4], + 'category: signal', + ] + if description: + header.append('description: "' + description.replace('\\', '\\\\').replace('"', '\\"') + '"') + header.append('signal: {' + ', '.join(signal) + '}') + header.append('params:') + header += [' - ' + p for p in params] + return {'raw': raw, 'text': text, 'encoding': encoding, 'header': header, 'kind': kind, 'model': model, 'read': read, 'lamps': lamps, 'mount': mount, 'lean': lean, 'count': count}, '' + + +def rewrite(info): + text = info['text'] + eol = '\r\n' if '\r\n' in text else '\n' + bom = text.startswith('') + if bom: + text = text[1:] + kept = [line for line in text.split(eol) if not line.startswith(LINEMARK)] + block = [LINEMARK + ' ' + line for line in info['header']] + out = eol.join(block + kept) + return (('' if bom else '') + out).encode(info['encoding']) + + +def main(): + if len(sys.argv) < 2: + print(__doc__) + return 1 + root = os.path.join(sys.argv[1], 'scenery') + write = '--write' in sys.argv + files = sorted(f for f in os.listdir(root) if f.endswith('.inc')) + files += ['pkp/semafory/' + f for f in sorted(os.listdir(os.path.join(root, 'pkp', 'semafory'))) if f.endswith('.inc')] + done = [] + skipped = [] + for file in files: + name = os.path.basename(file).lower() + if not any(pattern.search(name) for pattern, _ in FAMILIES): + continue + info, reason = examine(os.path.join(root, file), name) + if info is None: + skipped.append((file, reason)) + continue + done.append((file, info)) + + for file, info in done: + print('%-34s %-10s %-6s %-6s %-6s p%d %-22s %s' % (file, info['kind'], info['mount'], info['lean'] or '-', info['lamps'] or '-', info['count'], info['read'] or '-', info['model'])) + for file, reason in skipped: + print('SKIP %-34s %s' % (file, reason)) + kinds = {} + for _, info in done: + kinds[info['kind']] = kinds.get(info['kind'], 0) + 1 + print('described: %d %s, skipped: %d' % (len(done), kinds, len(skipped))) + + if write: + backup = os.path.join(sys.argv[1], 'editor_backup') + os.makedirs(backup, exist_ok=True) + archive = os.path.join(backup, time.strftime('signals_%Y%m%d_%H%M%S.tar')) + with tarfile.open(archive, 'w') as tar: + for file, _ in done: + tar.add(os.path.join(root, file), arcname='scenery/' + file) + for file, info in done: + content = rewrite(info) + if content != info['raw']: + with open(os.path.join(root, file), 'wb') as out: + out.write(content) + print('written, originals in', archive) + return 0 + + +if __name__ == '__main__': + sys.exit(main()) From 35a59c7cf2fc5ad1e11d9f84055a7c32c0ccadba Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 8 Oct 2026 08:51:06 +0200 Subject: [PATCH 164/430] fix(sweep): local named near renamed, MSVC takes near for the empty macro of windows.h and fails on the syntax --- world/Sweep.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/world/Sweep.cpp b/world/Sweep.cpp index cac360361..f036015db 100644 --- a/world/Sweep.cpp +++ b/world/Sweep.cpp @@ -594,12 +594,12 @@ void sweep_node::beside_switches(std::vector &Samples) } if (best > sample_spacing) continue; - auto const &near{Samples[at]}; - auto const along{plan(near.tangent)}; - glm::dvec3 const toward{points.x - near.position.x, 0.0, points.z - near.position.z}; + auto const &closest_sample{Samples[at]}; + auto const along{plan(closest_sample.tangent)}; + glm::dvec3 const toward{points.x - closest_sample.position.x, 0.0, points.z - closest_sample.position.z}; if (std::abs(glm::dot(toward, glm::dvec3{-along.z, 0.0, along.x})) > 0.05) continue; - auto const s0{near.station + glm::dot(toward, along)}; + auto const s0{closest_sample.station + glm::dot(toward, along)}; for (auto const &path : track->m_paths) { auto const heading{glm::dot(plan_heading(path, 0.0), along)}; From 516aa19cb5cf8b57dac4bcd024275a440f42adaa Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Thu, 8 Oct 2026 16:17:37 +0200 Subject: [PATCH 165/430] perf(models): e3d file read whole in one go and parsed from memory, vertices and indices taken straight from the buffer instead of value by value from the file stream --- model/Model3d.cpp | 235 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 232 insertions(+), 3 deletions(-) diff --git a/model/Model3d.cpp b/model/Model3d.cpp index cb9c07939..91860cdf2 100644 --- a/model/Model3d.cpp +++ b/model/Model3d.cpp @@ -1938,8 +1938,121 @@ void TSubModel::deserialize(std::istream &s) m_rotation_init_done = true; } +namespace +{ +// read only stream buffer over the content of a whole e3d file kept in memory. +// reading the geometry of a model value by value from a file stream costs several times more than the read of the file itself +class e3d_memorybuffer : public std::streambuf +{ + public: + e3d_memorybuffer(char *Begin, char *End) + { + setg(Begin, Begin, End); + } + // data from the current read position on + unsigned char const *cursor() const + { + return reinterpret_cast(gptr()); + } + std::size_t available() const + { + return static_cast(egptr() - gptr()); + } + + protected: + pos_type seekoff(off_type Offset, std::ios_base::seekdir Direction, std::ios_base::openmode) override + { + off_type const size{egptr() - eback()}; + off_type const origin{Direction == std::ios_base::beg ? 0 : Direction == std::ios_base::cur ? (gptr() - eback()) + m_beyondend : size}; + off_type const position{origin + Offset}; + if (position < 0) + { + return pos_type(off_type(-1)); + } + // like a file stream it can be placed past the end of the data, where nothing more can be read + m_beyondend = std::max(position - size, 0); + setg(eback(), eback() + std::min(position, size), egptr()); + return pos_type(position); + } + pos_type seekpos(pos_type Position, std::ios_base::openmode Mode) override + { + return seekoff(off_type(Position), std::ios_base::beg, Mode); + } + + private: + off_type m_beyondend{0}; +}; + +// little endian values taken from memory the same way the sn_utils functions read them from a stream +std::uint16_t e3d_uint16(unsigned char const *&Data) +{ + std::uint16_t const value = static_cast(Data[1] << 8 | Data[0]); + Data += 2; + return value; +} +std::uint32_t e3d_uint32(unsigned char const *&Data) +{ + std::uint32_t const value = std::uint32_t{Data[3]} << 24 | std::uint32_t{Data[2]} << 16 | std::uint32_t{Data[1]} << 8 | std::uint32_t{Data[0]}; + Data += 4; + return value; +} +std::uint64_t e3d_uint64(unsigned char const *&Data) +{ + std::uint64_t const low{e3d_uint32(Data)}; + std::uint64_t const high{e3d_uint32(Data)}; + return high << 32 | low; +} +float e3d_float32(unsigned char const *&Data) +{ + return std::bit_cast(e3d_uint32(Data)); +} +glm::vec3 e3d_vec3(unsigned char const *&Data) +{ + glm::vec3 value; + value.x = e3d_float32(Data); + value.y = e3d_float32(Data); + value.z = e3d_float32(Data); + return value; +} +glm::vec4 e3d_vec4(unsigned char const *&Data) +{ + glm::vec4 value; + value.x = e3d_float32(Data); + value.y = e3d_float32(Data); + value.z = e3d_float32(Data); + value.w = e3d_float32(Data); + return value; +} +// counterparts of basic_vertex::deserialize() and basic_vertex::deserialize_packed() +void e3d_vertex(unsigned char const *&Data, gfx::basic_vertex &Vertex, bool const Tangent) +{ + Vertex.position = e3d_vec3(Data); + Vertex.normal = e3d_vec3(Data); + Vertex.texture.x = e3d_float32(Data); + Vertex.texture.y = e3d_float32(Data); + if (Tangent) + { + Vertex.tangent = e3d_vec4(Data); + } +} +void e3d_vertex_packed(unsigned char const *&Data, gfx::basic_vertex &Vertex, bool const Tangent) +{ + Vertex.position = glm::unpackHalf4x16(e3d_uint64(Data)); + Vertex.normal = glm::unpackSnorm3x10_1x2(e3d_uint32(Data)); + Vertex.texture.x = glm::unpackHalf1x16(e3d_uint16(Data)); + Vertex.texture.y = glm::unpackHalf1x16(e3d_uint16(Data)); + if (Tangent) + { + Vertex.tangent = glm::unpackSnorm3x10_1x2(e3d_uint32(Data)); + } +} +} // namespace + void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) { + // a model loaded by LoadFromBinFile() comes from memory, its geometry is taken straight from there + auto *const memory{dynamic_cast(s.rdbuf())}; + Root = nullptr; if (m_geometrybank == null_handle) { @@ -2026,6 +2139,67 @@ void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) if (hasuserdata) submodel.Userdata.resize(submodelgeometry.vertex_count); m_vertexcount += submodelgeometry.vertex_count; + if (memory != nullptr) + { + // geometry past the end of the file is left as it was made + auto const datasize{vertex_size * sizeof(float)}; + auto const vertexcount{std::min(submodel.Vertices.size(), (datasize > 0 ? memory->available() / datasize : 0))}; + if ((datasize > 0) && (vertexcount < submodel.Vertices.size())) + { + ErrorLog("Bad model: vertex data of sub-model " + std::to_string(submodeloffset.second) + " lies past the end of the file", logtype::model); + } + auto *data{memory->cursor()}; + switch (vertextype & 3) + { + case 0: + { + // legacy vnt0 format + for (std::size_t i = 0; i < vertexcount; ++i) + { + e3d_vertex(data, submodel.Vertices[i], hastangents); + if (hasuserdata) + submodel.Userdata[i].data = e3d_vec4(data); + if (submodel.eType < TP_ROTATOR) + { + // normal vectors debug routine + if (false == submodel.m_normalizenormals && std::abs(glm::length2(submodel.Vertices[i].normal) - 1.0f) > 0.01f) + { + submodel.m_normalizenormals = TSubModel::normalize; // we don't know if uniform scaling would suffice + WriteLog("Bad model: non-unit normal vector(s) encountered during sub-model geometry deserialization", logtype::model); + } + } + } + break; + } + case 1: + { + // expanded chunk formats + for (std::size_t i = 0; i < vertexcount; ++i) + { + e3d_vertex_packed(data, submodel.Vertices[i], hastangents); + if (hasuserdata) + submodel.Userdata[i].data = glm::unpackHalf4x16(e3d_uint64(data)); + } + break; + } + case 2: + { + // expanded chunk formats + for (std::size_t i = 0; i < vertexcount; ++i) + { + e3d_vertex(data, submodel.Vertices[i], hastangents); + if (hasuserdata) + submodel.Userdata[i].data = e3d_vec4(data); + } + break; + } + default: + { + break; + } + } + continue; + } switch (vertextype & 3) { case 0: @@ -2106,6 +2280,48 @@ void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) auto const &submodelgeometry{submodel.m_geometry}; submodel.Indices.resize(submodelgeometry.index_count); m_indexcount += submodelgeometry.index_count; + if (memory != nullptr) + { + // indices past the end of the file are left as zeroes + auto const indexcount{std::min(submodel.Indices.size(), (indexsize > 0 ? memory->available() / indexsize : 0))}; + if ((indexsize > 0) && (indexcount < submodel.Indices.size())) + { + ErrorLog("Bad model: index data of sub-model " + std::to_string(submodeloffset.second) + " lies past the end of the file", logtype::model); + } + auto *data{memory->cursor()}; + switch (indexsize) + { + case 1: + { + for (std::size_t i = 0; i < indexcount; ++i) + { + submodel.Indices[i] = *data++; + } + break; + } + case 2: + { + for (std::size_t i = 0; i < indexcount; ++i) + { + submodel.Indices[i] = e3d_uint16(data); + } + break; + } + case 4: + { + for (std::size_t i = 0; i < indexcount; ++i) + { + submodel.Indices[i] = e3d_uint32(data); + } + break; + } + default: + { + break; + } + } + continue; + } switch (indexsize) { case 1: @@ -2377,7 +2593,22 @@ void TModel3d::LoadFromBinFile(std::string const &FileName, bool dynamic) { // wczytanie modelu z pliku binarnego WriteLog("Loading binary format 3d model data from \"" + FileName + "\"...", logtype::model); - std::ifstream file(FileName, std::ios::binary); + // the file is read whole in one go and parsed from memory + std::unique_ptr filedata; + std::size_t filesize{0}; + { + std::ifstream input(FileName, std::ios::binary | std::ios::ate); + auto const length{input.tellg()}; + if (length > 0) + { + filedata.reset(new char[static_cast(length)]); + input.seekg(0); + input.read(filedata.get(), length); + filesize = static_cast(input.gcount()); + } + } + e3d_memorybuffer buffer(filedata.get(), filedata.get() + filesize); + std::istream file(&buffer); uint32_t type = sn_utils::ld_uint32(file); uint32_t size = sn_utils::ld_uint32(file) - 8; @@ -2385,7 +2616,6 @@ void TModel3d::LoadFromBinFile(std::string const &FileName, bool dynamic) if (type == MAKE_ID4('E', '3', 'D', '0')) { deserialize(file, size, dynamic); - file.close(); WriteLog("Finished loading 3d model data from \"" + FileName + "\"", logtype::model); } @@ -2393,7 +2623,6 @@ void TModel3d::LoadFromBinFile(std::string const &FileName, bool dynamic) { // throw std::runtime_error("e3d: unknown main chunk"); ErrorLog("Bad model: unknown main chunk in file \"" + FileName + "\"", logtype::model); - file.close(); } }; From 28b4e57133c563629afafd029c60de9317e1efca Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Thu, 8 Oct 2026 16:17:46 +0200 Subject: [PATCH 166/430] feat(loading): optional background loading: sound files decoded by worker threads (sound.asyncload), data of dds textures read by worker threads (gfx.textures.streaming), gl textures of vehicles farther than a multiple of the draw range released (gfx.textures.releasedistance); all off by default --- application/scenarioloadermode.cpp | 3 + audio/audio.cpp | 242 +++++++++++++++++++++++--- audio/audio.h | 14 +- audio/audiorenderer.cpp | 10 ++ audio/audiorenderer.h | 2 + model/ResourceManager.h | 4 + model/Texture.cpp | 264 ++++++++++++++++++++++++++++- model/Texture.h | 19 +++ rendering/opengl33renderer.cpp | 118 +++++++++++++ rendering/opengl33renderer.h | 6 + utilities/Globals.cpp | 21 +++ utilities/Globals.h | 3 + 12 files changed, 683 insertions(+), 23 deletions(-) diff --git a/application/scenarioloadermode.cpp b/application/scenarioloadermode.cpp index a2293fe5f..dbdce6068 100644 --- a/application/scenarioloadermode.cpp +++ b/application/scenarioloadermode.cpp @@ -19,6 +19,7 @@ http://mozilla.org/MPL/2.0/. #include "rendering/renderer.h" #include "utilities/Logs.h" #include "utilities/translation.h" +#include "audio/audiorenderer.h" scenarioloader_mode::scenarioloader_mode() { m_userinterface = std::make_shared(); @@ -58,6 +59,8 @@ bool scenarioloader_mode::update() { // the loading state holds the scenario file open, which on some systems keeps the file from being replaced // when the scenery is saved in the editor. it'd also get in the way of another load state.reset(); + // sound files decoded in the background are all ready before the simulation starts + audio::renderer.complete_buffers(); WriteLog( "Scenario loading time: " + std::to_string( std::chrono::duration_cast( std::chrono::system_clock::now() - timestart ).count() ) + " seconds" ); // TODO: implement and use next mode cue diff --git a/audio/audio.cpp b/audio/audio.cpp index 1c72d1bc1..3be2810d1 100644 --- a/audio/audio.cpp +++ b/audio/audio.cpp @@ -19,35 +19,42 @@ http://mozilla.org/MPL/2.0/. namespace audio { -openal_buffer::openal_buffer( std::string const &Filename ) : - name( Filename ) { +namespace { + +// content of a sound file, mixed down to 16 bit mono +struct decoded_sound { + std::vector samples; + unsigned int rate { 0 }; + bool mixed { false }; // the file had more than one channel +}; + +// reads and decodes whole sound file. throws std::runtime_error on failure +// NOTE: uses no simulator state, it's also run by the background decoder threads +decoded_sound decode_sound( std::string const &File ) { SF_INFO si; si.format = 0; - std::string file = Filename; - - WriteLog("sound: loading file: " + file); - - SNDFILE *sf = sf_open(file.c_str(), SFM_READ, &si); + SNDFILE *sf = sf_open(File.c_str(), SFM_READ, &si); if (sf == nullptr) throw std::runtime_error("sound: sf_open failed"); sf_command(sf, SFC_SET_NORM_FLOAT, nullptr, SF_TRUE); - float *fbuf = new float[si.frames * si.channels]; - if (sf_readf_float(sf, fbuf, si.frames) != si.frames) + std::unique_ptr fbuf { new float[si.frames * si.channels] }; + if (sf_readf_float(sf, fbuf.get(), si.frames) != si.frames) { + sf_close(sf); throw std::runtime_error("sound: incomplete file"); + } sf_close(sf); - rate = si.samplerate; + decoded_sound sound; + sound.rate = si.samplerate; + sound.mixed = ( si.channels != 1 ); + sound.samples.resize( si.frames ); - if (si.channels != 1) - WriteLog("sound: warning: mixing multichannel file to mono"); - - int16_t *buf = new int16_t[si.frames]; for (size_t i = 0; i < si.frames; i++) { float accum = 0; @@ -59,26 +66,149 @@ openal_buffer::openal_buffer( std::string const &Filename ) : val = 32767; if (val < -32767) val = -32767; - buf[i] = val; + sound.samples[i] = val; } + return sound; +} + +// creates AL buffer holding provided sound. returns: id of the buffer, or null_resource on failure +ALuint upload_sound( decoded_sound const &Sound ) { + + ALuint id { null_resource }; alGenBuffers(1, &id); if (id != null_resource && alIsBuffer(id)) { alGetError(); - alBufferData(id, AL_FORMAT_MONO16, buf, si.frames * 2, rate); + alBufferData(id, AL_FORMAT_MONO16, Sound.samples.data(), static_cast(Sound.samples.size() * 2), Sound.rate); } else { id = null_resource; const char *str = alGetString(alGetError()); ErrorLog("sound: failed to create AL buffer: " + (str != nullptr ? std::string(str) : "")); } + return id; +} - delete[] buf; - delete[] fbuf; +} // namespace + +openal_buffer::openal_buffer( std::string const &Filename ) : + name( Filename ) { + + WriteLog("sound: loading file: " + Filename); + + auto const sound { decode_sound( Filename ) }; + + rate = sound.rate; + + if (sound.mixed) + WriteLog("sound: warning: mixing multichannel file to mono"); + + id = upload_sound( sound ); fetch_caption(); } +// sound files decoded by worker threads. AL buffers for them are made on the main thread +struct buffer_manager::decoder { + + struct job { + audio::buffer_handle handle; + std::string file; + decoded_sound sound; // written by the thread decoding the file + std::string error; + bool done { false }; // guarded by the mutex + }; + + std::mutex mutex; + std::condition_variable queued; // wakes workers when files are added + std::condition_variable decoded; // wakes the main thread waiting for a file + std::deque> queue; // files no worker has taken yet + std::vector> pending; // files without AL buffer yet, in order of request. main thread only + bool stop { false }; + std::vector workers; + + decoder() { + auto const count { std::clamp( std::thread::hardware_concurrency(), 2, 9 ) - 1 }; + for( unsigned int idx = 0; idx < count; ++idx ) { + workers.emplace_back( [ this ]() { work(); } ); + } + } + ~decoder() { + { + std::lock_guard lock( mutex ); + stop = true; + } + queued.notify_all(); + for( auto &worker : workers ) { + worker.join(); + } + } + + static void decode( job &Item ) { + try { + Item.sound = decode_sound( Item.file ); + } + catch( std::exception const &Error ) { + Item.error = Error.what(); + } + } + + void work() { + std::unique_lock lock( mutex ); + while( true ) { + queued.wait( lock, [ this ]() { return stop || ( false == queue.empty() ); } ); + if( stop ) { + return; + } + auto item { queue.front() }; + queue.pop_front(); + lock.unlock(); + decode( *item ); + lock.lock(); + item->done = true; + decoded.notify_all(); + } + } + + // waits until the specified file is decoded. a file no worker has taken yet is decoded right away + void wait( std::shared_ptr const &Item ) { + std::unique_lock lock( mutex ); + if( Item->done ) { + return; + } + auto const lookup { std::find( std::begin( queue ), std::end( queue ), Item ) }; + if( lookup != std::end( queue ) ) { + queue.erase( lookup ); + lock.unlock(); + decode( *Item ); + lock.lock(); + Item->done = true; + return; + } + decoded.wait( lock, [ &Item ]() { return Item->done; } ); + } + + bool is_done( job const &Item ) { + std::lock_guard lock( mutex ); + return Item.done; + } + + // makes the AL buffer out of the decoded file + static void finish( job &Item, openal_buffer &Buffer ) { + if( false == Item.error.empty() ) { + ErrorLog( "Bad file: failed to load audio file \"" + Item.file + "\" (" + Item.error + ")", logtype::file ); + return; + } + Buffer.rate = Item.sound.rate; + if( Item.sound.mixed ) { + WriteLog( "sound: warning: mixing multichannel file \"" + Item.file + "\" to mono" ); + } + Buffer.id = upload_sound( Item.sound ); + Item.sound = {}; + Buffer.fetch_caption(); + } +}; + // retrieves sound caption in currently set language void openal_buffer::fetch_caption() { @@ -93,8 +223,16 @@ openal_buffer::fetch_caption() { } } +buffer_manager::buffer_manager() { + + m_buffers.emplace_back( openal_buffer() ); // empty bindings for null buffer +} + buffer_manager::~buffer_manager() { + // workers are stopped before the buffers go + m_decoder.reset(); + for( auto &buffer : m_buffers ) { if( buffer.id != null_resource ) { ::alDeleteBuffers( 1, &buffer.id ); @@ -152,15 +290,81 @@ buffer_manager::create( std::string const &Filename ) { audio::openal_buffer const & buffer_manager::buffer( audio::buffer_handle const Buffer ) const { + if( ( m_decoder != nullptr ) + && ( false == m_decoder->pending.empty() ) + && ( m_buffers[ Buffer ].id == null_resource ) ) { + complete( Buffer ); + } return m_buffers[ Buffer ]; } +// creates AL buffers for files decoded in the background so far, or for all of them if requested +void +buffer_manager::update( bool const Wait ) { + + if( ( m_decoder == nullptr ) + || ( m_decoder->pending.empty() ) ) { + return; + } + std::vector> undone; + for( auto &item : m_decoder->pending ) { + if( Wait ) { + m_decoder->wait( item ); + } + else if( false == m_decoder->is_done( *item ) ) { + undone.emplace_back( item ); + continue; + } + decoder::finish( *item, m_buffers[ item->handle ] ); + } + m_decoder->pending.swap( undone ); +} + +// creates AL buffer for a file decoded in the background, waiting for the decoder if needed +void +buffer_manager::complete( audio::buffer_handle const Buffer ) const { + + auto &pending { m_decoder->pending }; + auto const lookup { + std::find_if( + std::begin( pending ), std::end( pending ), + [ Buffer ]( std::shared_ptr const &Item ) { return Item->handle == Buffer; } ) }; + if( lookup == std::end( pending ) ) { + return; + } + auto const item { *lookup }; + pending.erase( lookup ); + m_decoder->wait( item ); + decoder::finish( *item, m_buffers[ Buffer ] ); +} + // places in the bank a buffer containing data stored in specified file. returns: handle to the buffer audio::buffer_handle buffer_manager::emplace( std::string Filename ) { buffer_handle const handle { m_buffers.size() }; - m_buffers.emplace_back( Filename ); + if( true == Global.AudioAsyncLoad ) { + // the file is decoded in the background, the AL buffer is made once the data is ready or when the buffer is needed + WriteLog( "sound: loading file: " + Filename ); + openal_buffer buffer; + buffer.name = Filename; + m_buffers.emplace_back( std::move( buffer ) ); + if( m_decoder == nullptr ) { + m_decoder = std::make_unique(); + } + auto item { std::make_shared() }; + item->handle = handle; + item->file = Filename; + m_decoder->pending.emplace_back( item ); + { + std::lock_guard lock( m_decoder->mutex ); + m_decoder->queue.emplace_back( item ); + } + m_decoder->queued.notify_one(); + } + else { + m_buffers.emplace_back( Filename ); + } // NOTE: we store mapping without file type extension, to simplify lookups erase_extension( Filename ); diff --git a/audio/audio.h b/audio/audio.h index 5e306d251..391bf1eb9 100644 --- a/audio/audio.h +++ b/audio/audio.h @@ -47,21 +47,25 @@ class buffer_manager { public: // constructors - buffer_manager() { m_buffers.emplace_back( openal_buffer() ); } // empty bindings for null buffer + buffer_manager(); // makes empty bindings for null buffer // destructor ~buffer_manager(); // methods // creates buffer object out of data stored in specified file. returns: handle to the buffer or null_handle if creation failed buffer_handle create( std::string const &Filename ); - // provides direct access to a specified buffer + // provides direct access to a specified buffer. a buffer still decoded in the background is completed first audio::openal_buffer const & buffer( audio::buffer_handle const Buffer ) const; + // creates AL buffers for files decoded in the background so far, or for all of them if requested + void + update( bool const Wait = false ); private: // types using buffer_sequence = std::vector; using index_map = std::unordered_map; + struct decoder; // background decoding of sound files, used with sound.asyncload // methods // places in the bank a buffer containing data stored in specified file. returns: handle to the buffer buffer_handle @@ -72,9 +76,13 @@ private: // checks whether specified file exists. returns: name of the located file, or empty string. std::string find_file( std::string const &Filename ) const; + // creates AL buffer for a file decoded in the background, waiting for the decoder if needed + void + complete( audio::buffer_handle const Buffer ) const; // members - buffer_sequence m_buffers; + mutable buffer_sequence m_buffers; // buffers decoded in the background are completed on first access index_map m_buffermappings; + mutable std::unique_ptr m_decoder; }; } // audio diff --git a/audio/audiorenderer.cpp b/audio/audiorenderer.cpp index 81f815703..d0e1ce551 100644 --- a/audio/audiorenderer.cpp +++ b/audio/audiorenderer.cpp @@ -305,6 +305,13 @@ openal_renderer::buffer( audio::buffer_handle const Buffer ) const { return m_buffers.buffer( Buffer ); } +// makes buffers of all sound files still decoded in the background, waiting for them +void +openal_renderer::complete_buffers() { + + m_buffers.update( true ); +} + // initializes the service bool openal_renderer::init() { @@ -350,6 +357,9 @@ openal_renderer::erase( sound_source const *Controller ) { void openal_renderer::update( double const Deltatime ) { + // buffers of sound files decoded in the background since the last update + m_buffers.update(); + ALenum err = alGetError(); if (err != AL_NO_ERROR) { diff --git a/audio/audiorenderer.h b/audio/audiorenderer.h index ec26ec82f..3f462eb49 100644 --- a/audio/audiorenderer.h +++ b/audio/audiorenderer.h @@ -109,6 +109,8 @@ public: audio::buffer_handle fetch_buffer( std::string const &Filename ); audio::openal_buffer const &buffer( audio::buffer_handle const Buffer ) const; + // makes buffers of all sound files still decoded in the background (sound.asyncload), waiting for them + void complete_buffers(); bool init(); diff --git a/model/ResourceManager.h b/model/ResourceManager.h index c9f3cb0b6..c9a1036d1 100644 --- a/model/ResourceManager.h +++ b/model/ResourceManager.h @@ -67,6 +67,10 @@ public: std::chrono::steady_clock::time_point timestamp() const { return m_resourcetimestamp; } + // updates the time given to resources marked as used, without a sweep + void + refresh() { + m_resourcetimestamp = std::chrono::steady_clock::now(); } private: // members: diff --git a/model/Texture.cpp b/model/Texture.cpp index 5c1d852f4..a3508168c 100644 --- a/model/Texture.cpp +++ b/model/Texture.cpp @@ -30,6 +30,134 @@ http://mozilla.org/MPL/2.0/. #define EU07_DEFERRED_TEXTURE_UPLOAD +// texture data read by a worker thread. the texture itself is only touched by the main thread, +// which takes the data over when the texture is created on the gl side +struct texture_request { + std::string file; + std::size_t offset { 0 }; // start of the texture data in the file + std::size_t size { 0 }; // size of the texture data + // dds data with top-left origin is flipped by the worker + bool flip { false }; + std::uint32_t fourcc { 0 }; + int width { 0 }; + int height { 0 }; + int mapcount { 0 }; + int blocksize { 0 }; + // results, written by the thread reading the data + std::vector data; + bool failed { false }; + bool done { false }; // guarded by the mutex of the loader +}; + +namespace { + +// worker threads reading texture data from disk +class texture_loader { + +public: + static texture_loader &instance() { + static texture_loader loader; + return loader; } + + void submit( std::shared_ptr Request ) { + { + std::lock_guard lock( m_mutex ); + if( m_workers.empty() ) { + // reading the data is mostly waiting for the disk, a few threads are enough + auto const count { std::clamp( std::thread::hardware_concurrency(), 2, 5 ) - 1 }; + for( unsigned int idx = 0; idx < count; ++idx ) { + m_workers.emplace_back( [ this ]() { work(); } ); + } + } + m_queue.emplace_back( std::move( Request ) ); + } + m_queued.notify_one(); } + + // waits until data of the specified request is read. a request no worker has taken yet is carried out right away + void wait( std::shared_ptr const &Request ) { + std::unique_lock lock( m_mutex ); + if( Request->done ) { + return; + } + auto const lookup { std::find( std::begin( m_queue ), std::end( m_queue ), Request ) }; + if( lookup != std::end( m_queue ) ) { + m_queue.erase( lookup ); + lock.unlock(); + read( *Request ); + lock.lock(); + Request->done = true; + return; + } + m_read.wait( lock, [ &Request ]() { return Request->done; } ); } + + ~texture_loader() { + { + std::lock_guard lock( m_mutex ); + m_stop = true; + } + m_queued.notify_all(); + for( auto &worker : m_workers ) { + worker.join(); + } } + +private: + void work() { + std::unique_lock lock( m_mutex ); + while( true ) { + m_queued.wait( lock, [ this ]() { return m_stop || ( false == m_queue.empty() ); } ); + if( m_stop ) { + return; + } + auto request { m_queue.front() }; + m_queue.pop_front(); + lock.unlock(); + read( *request ); + lock.lock(); + request->done = true; + m_read.notify_all(); + } } + + // same as the reading part of opengl_texture::load_DDS() + static void read( texture_request &Request ) { + std::ifstream file( Request.file, std::ios::binary ); + if( false == file.is_open() ) { + Request.failed = true; + return; + } + file.seekg( Request.offset ); + Request.data.resize( Request.size ); + file.read( reinterpret_cast( Request.data.data() ), Request.size ); + + if( Request.flip ) { + char *mipmap = (char *)&Request.data[ 0 ]; + int mapcount = Request.mapcount, + width = Request.width, + height = Request.height; + while( mapcount ) { + if( Request.fourcc == FOURCC_DXT1 ) + flip_s3tc::flip_dxt1_image( mipmap, width, height ); + else if( Request.fourcc == FOURCC_DXT3 ) + flip_s3tc::flip_dxt23_image( mipmap, width, height ); + else if( Request.fourcc == FOURCC_DXT5 ) + flip_s3tc::flip_dxt45_image( mipmap, width, height ); + + mipmap += ( width + 3 ) / 4 * ( ( height + 3 ) / 4 ) * Request.blocksize; + width = std::max( width / 2, 4 ); + height = std::max( height / 2, 4 ); + --mapcount; + } + } } + + std::mutex m_mutex; + std::condition_variable m_queued; // wakes workers when requests are added + std::condition_variable m_read; // wakes the main thread waiting for a request + std::deque> m_queue; + std::vector m_workers; + bool m_stop { false }; +}; + +} // namespace + std::array opengl_texture::units = { 0 }; GLint opengl_texture::m_activeunit = -1; @@ -261,7 +389,9 @@ opengl_texture::load() { } // data state will be set by called loader, so we're all done here - if( data_state == resource_state::good ) { + // (a streamed texture has its description ready while the data is still being read) + if( ( data_state == resource_state::good ) + || ( ( data_state == resource_state::loading ) && ( request != nullptr ) ) ) { // verify texture size if( clamp_power_of_two(data_width) != data_width || clamp_power_of_two(data_height) != data_height ) { @@ -579,6 +709,28 @@ opengl_texture::load_DDS() { data_state = resource_state::failed; return; } + if( true == Global.gfx_texture_streaming ) { + // the data is read by a worker thread, everything else about the texture is known already + request = std::make_shared(); + request->file = name + type; + request->offset = static_cast( file.tellg() ) + offset; + request->size = datasize; + request->flip = Global.dds_upper_origin; + request->fourcc = ddsd.ddpfPixelFormat.dwFourCC; + request->width = data_width; + request->height = data_height; + request->mapcount = data_mapcount; + request->blocksize = blockSize; + texture_loader::instance().submit( request ); + + data_components = + ddsd.ddpfPixelFormat.dwFourCC == FOURCC_DXT1 ? GL_RGB : GL_RGBA; + + data_state = resource_state::loading; + + return; + } + // reserve space and load texture data data.resize( datasize ); @@ -930,6 +1082,17 @@ opengl_texture::unbind(size_t unit) bool opengl_texture::create( bool const Static ) { + if( ( data_state == resource_state::none ) + && ( true == reload_on_use ) ) { + // the data was dropped along with the gl texture when the texture was far away + reload_on_use = false; + load(); + } + if( ( data_state == resource_state::loading ) + && ( request != nullptr ) ) { + complete_data(); + } + if( data_state != resource_state::good && !is_rendertarget ) { // don't bother until we have useful texture data // and it isn't rendertarget texture without loaded data @@ -1087,6 +1250,27 @@ opengl_texture::create( bool const Static ) { return true; } +// takes over the data read by a worker thread, waiting for it if needed +void +opengl_texture::complete_data() { + + if( request == nullptr ) { return; } + + texture_loader::instance().wait( request ); + auto const completed { std::move( request ) }; + + if( true == completed->failed ) { + data_state = resource_state::failed; + ErrorLog( "Bad texture: failed to load texture \"" + name + "\"" ); + // NOTE: temporary workaround for texture assignment errors, same as in load() + id = 0; + return; + } + data.swap( completed->data ); + data_state = resource_state::good; + size = data.size() / 1024; +} + // releases resources allocated on the opengl end, storing local copy if requested void opengl_texture::release() { @@ -1397,6 +1581,84 @@ texture_manager::delete_textures() { } } +// starts a scan for gl textures used only by vehicles far away +void +texture_manager::begin_release_scan() { + + m_releasescantime = std::chrono::steady_clock::now(); + // textures bound from now on are stamped with the time of this scan, the sweep may not be running + m_garbagecollector.refresh(); + if( m_neededtimes.size() < m_textures.size() ) { + m_neededtimes.resize( m_textures.size() ); + } +} + +// marks texture of a vehicle as needed if the vehicle is near, otherwise only as one used by vehicles +void +texture_manager::mark_as_needed( texture_handle const Texture, bool const Near ) { + + if( ( Texture <= 0 ) + || ( Texture >= static_cast( m_neededtimes.size() ) ) ) { + return; + } + auto &needed { m_neededtimes[ Texture ] }; + if( true == Near ) { + needed = m_releasescantime; + auto &texture { *m_textures[ Texture ].first }; + if( ( true == texture.reload_on_use ) + && ( texture.data_state == resource_state::none ) ) { + // the vehicle came back, the texture is read again before it's drawn (in the background with gfx.textures.streaming) + texture.reload_on_use = false; + texture.load(); + } + } + else if( needed == resource_timestamp() ) { + // from now on the texture can be released, if no vehicle near enough needs it for a while + needed = m_releasescantime; + } +} + +// releases gl textures of vehicles not needed nor drawn for a while +void +texture_manager::release_unneeded() { + + // the delay keeps textures of a vehicle moving back and forth around the release distance from going in and out + auto const delay { std::chrono::seconds{ 10 } }; + + auto releasecount { 0 }; + for( std::size_t index = 1; index < m_neededtimes.size(); ++index ) { + auto const needed { m_neededtimes[ index ] }; + if( ( needed == resource_timestamp() ) + || ( m_releasescantime - needed < delay ) ) { + continue; + } + auto &record { m_textures[ index ] }; + auto &texture { *record.first }; + if( ( texture.id == static_cast( -1 ) ) + || ( texture.id == 0 ) + || ( true == texture.is_static ) + || ( true == texture.is_rendertarget ) + || ( texture.type == "make:" ) + || ( texture.type == "internalsrc:" ) ) { + continue; + } + if( m_releasescantime - record.second < delay ) { + // drawn lately, the texture is also used by something else than far vehicles + continue; + } + texture.release(); + // without the resource sweep the data isn't kept after upload, it'll have to be read again + texture.reload_on_use = ( texture.data_state == resource_state::none ); + ++releasecount; + } + if( releasecount > 0 ) { + // released gl names can be given to new textures, the unit cache can't trust them + for( auto &unit : opengl_texture::units ) { + unit = -1; + } + } +} + // performs a resource sweep void texture_manager::update() { diff --git a/model/Texture.h b/model/Texture.h index 1f5826402..3df04fefb 100644 --- a/model/Texture.h +++ b/model/Texture.h @@ -16,6 +16,8 @@ http://mozilla.org/MPL/2.0/. #include "gl/ubo.h" #include "interfaces/ITexture.h" +struct texture_request; // texture data read by a worker thread, with gfx.textures.streaming + struct opengl_texture : public ITexture { static DDSURFACEDESC2 deserialize_ddsd(std::istream&); static DDCOLORKEY deserialize_ddck(std::istream&); @@ -111,7 +113,12 @@ public: void flip_vertical(); void gles_match_internalformat(GLuint format); + // takes over the data read by a worker thread, waiting for it if needed + void complete_data(); + // members + std::shared_ptr request; // data being read by a worker thread + bool reload_on_use = false; // the data was dropped along with the gl texture of a far texture, it's read again when the texture is needed bool is_static = false; // is excluded from garbage collection bool is_rendertarget = false; // is used as postfx rendertarget, without loaded data int samples = 1; @@ -159,6 +166,16 @@ public: // performs a resource sweep void update(); + // release of gl textures used only far away (gfx.textures.releasedistance). a scan is made of + // begin_release_scan(), mark_as_needed() for textures of each vehicle and release_unneeded() + void + begin_release_scan(); + // marks texture of a vehicle as needed if the vehicle is near, otherwise only as one used by vehicles + void + mark_as_needed( texture_handle const Texture, bool const Near ); + // releases gl textures of vehicles not needed nor drawn for a while + void + release_unneeded(); // debug performance string std::string info() const; @@ -191,6 +208,8 @@ private: texture_handle const npos { 0 }; // should be -1, but the rest of the code uses -1 for something else texturetimepointpair_sequence m_textures; index_map m_texturemappings; + std::vector m_neededtimes; // last time a vehicle near enough needed the texture, blank for textures not used by vehicles + resource_timestamp m_releasescantime; // time of the current release scan garbage_collector m_garbagecollector { m_textures, 600, 60, "texture" }; }; diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index 752ba842e..392404a10 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -3351,6 +3351,119 @@ void opengl33_renderer::Render_Instanced( TModel3d *Model, std::vector(Global.gfx_texture_releasedistance) * m_colorpass.draw_range}; + auto const camera{m_colorpass.pass_camera.position()}; + + m_textures.begin_release_scan(); + for (auto *vehicle : simulation::Vehicles.sequence()) + { + if (vehicle == nullptr) + { + continue; + } + bool const isnear{glm::length(vehicle->vPosition - camera) - vehicle->radius() <= range}; + auto const mark_model = [&](TModel3d *Model) { + if (Model == nullptr) + { + return; + } + for (auto const texture : Model_Textures(Model)) + { + m_textures.mark_as_needed(texture, isnear); + } + }; + mark_model(vehicle->mdModel); + mark_model(vehicle->mdLowPolyInt); + mark_model(vehicle->mdLoad); + for (auto *attachment : vehicle->mdAttachments) + { + mark_model(attachment); + } + for (auto const skin : vehicle->m_materialdata.replacable_skins) + { + if (skin <= 0) + { + continue; + } + auto const &material{m_materials.material(skin)}; + for (auto const texture : material.textures) + { + m_textures.mark_as_needed(texture, isnear); + } + for (auto const &variant : material.texture_variants) + { + for (auto const texture : variant) + { + m_textures.mark_as_needed(texture, isnear); + } + } + } + } + m_textures.release_unneeded(); +} + +// textures used by materials of the sub-models of specified model, replaceable skins excluded +std::vector const &opengl33_renderer::Model_Textures(TModel3d *Model) +{ + auto const lookup{m_modeltextures.find(Model)}; + if (lookup != m_modeltextures.end()) + { + return lookup->second; + } + auto &textures{m_modeltextures[Model]}; + std::vector submodels; + if (Model->GetSMRoot() != nullptr) + { + submodels.emplace_back(Model->GetSMRoot()); + } + while (false == submodels.empty()) + { + auto *submodel{submodels.back()}; + submodels.pop_back(); + if (submodel->NextGet() != nullptr) + { + submodels.emplace_back(submodel->NextGet()); + } + if (submodel->ChildGet() != nullptr) + { + submodels.emplace_back(submodel->ChildGet()); + } + // negative material is one of replaceable skins of the vehicle, these are handled with the vehicle + if (submodel->GetMaterial() <= 0) + { + continue; + } + auto const &material{m_materials.material(submodel->GetMaterial())}; + for (auto const texture : material.textures) + { + if (texture > 0) + { + textures.emplace_back(texture); + } + } + for (auto const &variant : material.texture_variants) + { + for (auto const texture : variant) + { + if (texture > 0) + { + textures.emplace_back(texture); + } + } + } + } + std::sort(std::begin(textures), std::end(textures)); + textures.erase(std::unique(std::begin(textures), std::end(textures)), std::end(textures)); + return textures; +} + void opengl33_renderer::Render_Sleepers( TTrack *Track ) { if( Track == nullptr ) { return; } @@ -5379,6 +5492,11 @@ void opengl33_renderer::Update(double const Deltatime) m_textures.update(); } + if ((Global.gfx_texture_releasedistance > 0.f) && (true == simulation::is_ready)) + { + Update_Texture_Release(); + } + if ((true == Global.ControlPicking) && (false == FreeFlyModeFlag)) Pick_Control_Callback([](const TSubModel *, const glm::vec2) {}); // temporary conditions for testing. eventually will be coupled with editor mode diff --git a/rendering/opengl33renderer.h b/rendering/opengl33renderer.h index b028f929c..1820abe42 100644 --- a/rendering/opengl33renderer.h +++ b/rendering/opengl33renderer.h @@ -304,6 +304,10 @@ class opengl33_renderer : public gfx_renderer { bool Render_interior( bool const Alpha = false ); bool Render_lowpoly( TDynamicObject *Dynamic, float const Squaredistance, bool const Setup, bool const Alpha = false ); bool Render_coupler_adapter( TDynamicObject *Dynamic, float const Squaredistance, int const End, bool const Alpha = false ); + // releases gl textures used only by vehicles farther than gfx.textures.releasedistance times the draw range + void Update_Texture_Release(); + // textures used by materials of the sub-models of specified model, replaceable skins excluded + std::vector const &Model_Textures( TModel3d *Model ); void Render(TMemCell *Memcell); void Render_particles(); void Render_precipitation(); @@ -388,6 +392,8 @@ class opengl33_renderer : public gfx_renderer { // of once per cell -- collapsing many tiny instanced draws into a few large // batches. Reused every pass; the vectors are emptied (not freed) at the top of Render(scene::basic_region*). scene::basic_cell::instance_bucket_map m_frame_instance_buckets; + // textures used by vehicle models, for the release of far textures + std::unordered_map> m_modeltextures; // geometry of neighbouring tracks of a cell which share the material, gathered to be drawn together. reused by each Render(path_sequence) std::vector m_pathbatch; // copies of instance bounds kept by the buckets of scene cells are good as long as they carry this number. diff --git a/utilities/Globals.cpp b/utilities/Globals.cpp index 7ce2446aa..2cf5235c5 100644 --- a/utilities/Globals.cpp +++ b/utilities/Globals.cpp @@ -187,6 +187,12 @@ bool global_settings::ConfigParseAudio(cParser& Parser, const std::string& token return true; } + if (token == "sound.asyncload") + { + ParseOne(Parser, AudioAsyncLoad); + return true; + } + if (token == "sound.volume.vehicle") { ParseOneClamped(Parser, VehicleVolume, 0.f, 1.f); @@ -1347,6 +1353,18 @@ global_settings::ConfigParse_gfx( cParser &Parser, std::string_view const Token Parser.getTokens(); Parser >> ResourceMove; } + else if (Token == "gfx.textures.streaming") + { + Parser.getTokens(); + Parser >> gfx_texture_streaming; + } + else if (Token == "gfx.textures.releasedistance") + { + // multiplier of the draw range, 0 turns the release off. textures within the draw range are never released + Parser.getTokens(); + Parser >> gfx_texture_releasedistance; + gfx_texture_releasedistance = (gfx_texture_releasedistance > 0.f ? std::max(gfx_texture_releasedistance, 1.f) : 0.f); + } else if (Token == "gfx.reflections.framerate") { auto const updatespersecond{std::abs(Parser.getToken())}; @@ -1530,6 +1548,7 @@ global_settings::export_as_text( std::ostream &Output ) const { export_as_text( Output, "sound.volume.vehicle", VehicleVolume ); export_as_text( Output, "sound.volume.positional", EnvironmentPositionalVolume ); export_as_text( Output, "sound.volume.ambient", EnvironmentAmbientVolume ); + export_as_text( Output, "sound.asyncload", AudioAsyncLoad ); export_as_text( Output, "physicslog", WriteLogFlag ); export_as_text( Output, "fullphysics", FullPhysics ); export_as_text( Output, "debuglog", iWriteLogEnabled ); @@ -1584,6 +1603,8 @@ global_settings::export_as_text( std::ostream &Output ) const { export_as_text( Output, "createswitchtrackbeds", CreateSwitchTrackbeds ); export_as_text( Output, "gfx.resource.sweep", ResourceSweep ); export_as_text( Output, "gfx.resource.move", ResourceMove ); + export_as_text( Output, "gfx.textures.streaming", gfx_texture_streaming ); + export_as_text( Output, "gfx.textures.releasedistance", gfx_texture_releasedistance ); export_as_text( Output, "gfx.reflections.framerate", 1.0 / reflectiontune.update_interval ); export_as_text( Output, "gfx.reflections.fidelity", reflectiontune.fidelity ); export_as_text( Output, "timespeed", fTimeSpeed ); diff --git a/utilities/Globals.h b/utilities/Globals.h index 36574ab1c..f65fbc2cc 100644 --- a/utilities/Globals.h +++ b/utilities/Globals.h @@ -182,6 +182,8 @@ struct global_settings { float SmokeFidelity{ 1.f }; // determines amount of generated smoke particles bool ResourceSweep{ true }; // gfx resource garbage collection bool ResourceMove{ false }; // gfx resources are moved between cpu and gpu side instead of sending a copy + bool gfx_texture_streaming{ false }; // data of dds textures is read by worker threads, the rest of the loading doesn't wait for it + float gfx_texture_releasedistance{ 0.f }; // gl textures of vehicles farther than this many draw ranges are released. 0 = off bool compress_tex{ true }; // all textures are compressed on gpu side std::string asSky{ "1" }; float fFpsAverage{ 0.f }; // oczekiwana wartosć FPS @@ -197,6 +199,7 @@ struct global_settings { float EnvironmentAmbientVolume{ 1.0f }; int audio_max_sources = 30; std::string AudioRenderer; + bool AudioAsyncLoad{ false }; // sound files are decoded by worker threads // input float fMouseXScale{ 1.5f }; float fMouseYScale{ 0.2f }; From e661b9f1c73ca02326e13142c476c2d362739b5e Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Thu, 8 Oct 2026 18:52:51 +0200 Subject: [PATCH 167/430] feat(editor): -generate-nodebank-previews mode: png previews of the node bank models, or of the entries given with -entries, drawn offscreen and without a window by the full renderer: square, -resolution 1024 by default, the model in perspective from the front, side and above, fitted to the image less -margin pixels (64 by default) on white background, lit, with materials and with self shadows unless -no-shadows; saved in textures/previews/nodebank under the path of the model with the skin; software rendering of mesa when the graphics driver gives no gl 3.3 or with -software --- CMakeLists.txt | 1 + EU07.cpp | 9 + nodebank_previews_standalone.cpp | 452 +++++++++++++++++++++++++++++++ rendering/opengl33renderer.cpp | 412 +++++++++++++++++++++++++++- rendering/opengl33renderer.h | 24 ++ rendering/renderer.h | 4 + 6 files changed, 900 insertions(+), 2 deletions(-) create mode 100644 nodebank_previews_standalone.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 1613f0a70..f5fe1dec2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,6 +112,7 @@ set(SOURCES "EU07.cpp" "export_e3d_standalone.cpp" "export_btf_standalone.cpp" +"nodebank_previews_standalone.cpp" "world/Event.cpp" "world/EvLaunch.cpp" "utilities/Float3d.cpp" diff --git a/EU07.cpp b/EU07.cpp index 4fd8b8b1f..e03618297 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -34,6 +34,7 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others void export_e3d_standalone(std::string in, std::string out, int flags, bool dynamic); int export_btf_standalone(std::string in, std::string out); +int generate_nodebank_previews(int Argc, char *Argv[]); #include #include @@ -99,6 +100,14 @@ int main(int argc, char *argv[]) int dynamic = std::stoi(std::string(argv[5])); export_e3d_standalone(in, out, flags, dynamic); } + // standalone generation of preview images of the node bank models: -generate-nodebank-previews [options] + else if (argc >= 2 && std::string(argv[1]) == "-generate-nodebank-previews") + { + auto const result{generate_nodebank_previews(argc, argv)}; + fflush(stdout); + fflush(stderr); + std::_Exit(result); + } // standalone conversion of text terrain file to binary format: -btf -s [-o ] else if (argc >= 4 && std::string(argv[1]) == "-btf") { diff --git a/nodebank_previews_standalone.cpp b/nodebank_previews_standalone.cpp new file mode 100644 index 000000000..8a1716897 --- /dev/null +++ b/nodebank_previews_standalone.cpp @@ -0,0 +1,452 @@ +#include "stdafx.h" + +#include "model/AnimModel.h" +#include "rendering/renderer.h" +#include "scene/scenenode.h" +#include "utilities/Globals.h" +#include "utilities/Logs.h" +#include "utilities/parser.h" +#include "utilities/utilities.h" +#include +#include + +// standalone generation of preview images of the models of the node bank of the scenery editor: +// -generate-nodebank-previews [-entries "node ... endmodel" ...] [-resolution ] [-margin ] [-no-shadows] [-software] +// each image is a square png on white background, saved in textures/previews/nodebank under the path of the model + +namespace +{ + +std::string const preview_folder{"textures/previews/nodebank/"}; + +struct preview_settings +{ + std::vector entries; // node definitions to draw. the whole node bank if empty + int resolution{1024}; + int margin{64}; + bool shadows{true}; + bool software{false}; +}; + +// prints a line on the console the generator was started from, and puts it in the log +void report(std::string const &Text, bool const Error = false) +{ + std::fprintf((Error ? stderr : stdout), "%s\n", Text.c_str()); + std::fflush(Error ? stderr : stdout); + if (Error) + { + // goes to the log as well + ErrorLog(Text); + } + else + { + WriteLog(Text); + } +} + +bool parse_number(char const *Text, int &Value) +{ + try + { + std::size_t used{0}; + auto const value{std::stoi(Text, &used)}; + if (Text[used] != '\0') + { + return false; + } + Value = value; + return true; + } + catch (std::exception const &) + { + return false; + } +} + +bool parse_arguments(int const Argc, char *Argv[], preview_settings &Settings) +{ + for (int i = 2; i < Argc; ++i) + { + std::string const token{Argv[i]}; + if (token == "-entries") + { + while ((i + 1 < Argc) && (Argv[i + 1][0] != '-')) + { + Settings.entries.emplace_back(Argv[++i]); + } + } + else if (token == "-resolution") + { + if ((i + 1 >= Argc) || (false == parse_number(Argv[++i], Settings.resolution)) || (Settings.resolution < 16)) + { + report("-resolution needs a number of pixels, 16 or more", true); + return false; + } + } + else if (token == "-margin") + { + if ((i + 1 >= Argc) || (false == parse_number(Argv[++i], Settings.margin)) || (Settings.margin < 0)) + { + report("-margin needs a number of pixels, 0 or more", true); + return false; + } + } + else if (token == "-no-shadows") + { + Settings.shadows = false; + } + else if (token == "-software") + { + Settings.software = true; + } + else + { + report("unknown option " + token, true); + return false; + } + } + if (Settings.margin * 2 >= Settings.resolution) + { + report("the margin leaves no room for the model at this resolution", true); + return false; + } + return true; +} + +// node definitions of the node bank, read the way the node bank panel of the editor reads them +std::vector nodebank_entries() +{ + std::vector entries; + std::ifstream file("nodebank.txt", std::ios_base::in | std::ios_base::binary); + std::string line; + while (std::getline(file, line)) + { + if (line.size() < 4) + { + continue; + } + auto const nodestart{line.find("node")}; + if (nodestart == std::string::npos) + { + // group header + continue; + } + auto entry{line.substr(nodestart)}; + while ((false == entry.empty()) && ((entry.back() == '\r') || (entry.back() == '\n'))) + { + entry.pop_back(); + } + entries.emplace_back(entry); + } + return entries; +} + +// creates the hidden window with the gl context for the renderer. on a computer without a graphics driver able to provide +// gl 3.3 the software rasterizer of mesa can take over: on linux mesa picks it by itself, on windows its opengl32.dll +// (with the libraries it needs) is looked for in the mesa folder +GLFWwindow *create_context(bool const Software) +{ + if (Software) + { +#ifdef _WIN32 + auto const folder{std::filesystem::absolute("mesa")}; + ::SetDllDirectoryW(folder.wstring().c_str()); +#else + ::setenv("LIBGL_ALWAYS_SOFTWARE", "1", 1); +#endif + } + if (glfwInit() == GLFW_FALSE) + { + return nullptr; + } + glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE); + glfwWindowHint(GLFW_CLIENT_API, GLFW_OPENGL_API); + glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); + glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GLFW_TRUE); + glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); + glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3); + if (Global.gfx_gldebug) + glfwWindowHint(GLFW_OPENGL_DEBUG_CONTEXT, GLFW_TRUE); + auto *window{glfwCreateWindow(64, 64, "eu07 previews", nullptr, nullptr)}; + if (window == nullptr) + { + glfwTerminate(); + return nullptr; + } + glfwMakeContextCurrent(window); + if (!gladLoadGLLoader((GLADloadproc)glfwGetProcAddress)) + { + glfwDestroyWindow(window); + glfwTerminate(); + return nullptr; + } + return window; +} + +// characters which can be safely used in a file name +std::string file_name_part(std::string Text) +{ + for (auto &character : Text) + { + auto const c{static_cast(character)}; + if ((false == std::isalnum(c)) && (c != '_') && (c != '-') && (c != '.') && (c != '+') && (c != '(') && (c != ')')) + { + character = '_'; + } + } + if ((Text.empty()) || (Text == ".") || (Text == "..")) + { + Text = "_"; + } + return Text; +} + +// path of the image of the node with specified model and skin: the path of the model in the preview folder, the skin added to the name +std::string preview_path(std::string Model, std::string const &Skin) +{ + replace_slashes(Model); + erase_extension(Model); + std::string path; + std::size_t start{0}; + while (start <= Model.size()) + { + auto end{Model.find('/', start)}; + if (end == std::string::npos) + { + end = Model.size(); + } + if (end > start) + { + if (false == path.empty()) + { + path += '/'; + } + path += file_name_part(Model.substr(start, end - start)); + } + start = end + 1; + } + if ((false == Skin.empty()) && (Skin != "none")) + { + auto skin{Skin}; + replace_slashes(skin); + erase_extension(skin); + std::replace(skin.begin(), skin.end(), '/', '_'); + path += '@' + file_name_part(skin); + } + return preview_folder + path; +} + +bool save_png(std::string const &Path, std::vector const &Image, int const Size) +{ + std::error_code error; + std::filesystem::create_directories(std::filesystem::path(Path).parent_path(), error); + png_image png; + std::memset(&png, 0, sizeof(png_image)); + png.version = PNG_IMAGE_VERSION; + png.width = Size; + png.height = Size; + png.format = PNG_FORMAT_RGB; + return (png_image_write_to_file(&png, Path.c_str(), 0, Image.data(), Size * 3, nullptr) != 0); +} + +// draws the preview of a single node bank entry. returns: true on success +bool generate_preview(std::string const &Definition, preview_settings const &Settings, std::set &Saved, std::string &Outcome) +{ + // a line of the node bank can be given as it is, with the label in front of the definition + auto const nodestart{Definition.find("node")}; + if (nodestart == std::string::npos) + { + Outcome = "not a node definition"; + return false; + } + auto const entry{Definition.substr(nodestart)}; + cParser parser(entry, cParser::buffer_TEXT); + parser.getTokens(); // node + scene::node_data nodedata; + parser.getTokens(4); + parser >> nodedata.range_max >> nodedata.range_min >> nodedata.name >> nodedata.type; + if (nodedata.name == "none") + { + nodedata.name.clear(); + } + if (nodedata.type != "model") + { + Outcome = "skipped, node of type " + nodedata.type + " isn't a model"; + return false; + } + // placement in the scenery is of no use here, the rotation however is a part of the look of the node + glm::dvec3 location; + glm::vec3 rotation{0.f}; + parser.getTokens(4); + parser >> location.x >> location.y >> location.z >> rotation.y; + // NOTE: instances are kept, as the rest of the simulator assumes scenery nodes live until the exit + auto *instance = new TAnimModel(nodedata); + instance->Angles(rotation); + instance->Load(&parser, false); + if (instance->pModel == nullptr) + { + Outcome = "model not found"; + return false; + } + instance->location(glm::dvec3{0.0}); + + // the model and skin, which give the name of the image, are the first two tokens after the rotation + cParser names(entry, cParser::buffer_TEXT); + names.getTokens(9, false); + auto const model{names.getToken()}; + auto const skin{names.getToken(false)}; + auto path{preview_path(model, skin)}; + if (Saved.contains(path)) + { + // another entry with the same model and skin, but other lights or angles + auto variant{2}; + while (Saved.contains(path + "~" + std::to_string(variant))) + { + ++variant; + } + path += "~" + std::to_string(variant); + } + path += ".png"; + + std::vector image; + if (false == GfxRenderer->Render_Preview(instance, Settings.resolution, Settings.margin, Settings.shadows, image)) + { + Outcome = "nothing to draw"; + return false; + } + if (false == save_png(path, image, Settings.resolution)) + { + Outcome = "failed to save " + path; + return false; + } + Saved.emplace(path.substr(0, path.size() - 4)); + Outcome = path; + return true; +} + +} // namespace + +int generate_nodebank_previews(int Argc, char *Argv[]) +{ +#ifdef _WIN32 + // the simulator is a windows application, so the console it was started from has to be joined to report progress + if (::AttachConsole(ATTACH_PARENT_PROCESS)) + { + FILE *stream{nullptr}; + freopen_s(&stream, "CONOUT$", "w", stdout); + freopen_s(&stream, "CONOUT$", "w", stderr); + } +#endif + // settings of the simulator, for the paths and the graphics options which aren't set for the previews below + auto const inipath{user_config_path("eu07.ini")}; + if (false == inipath.empty() && std::filesystem::exists(inipath)) + { + Global.LoadIniFile(inipath.string()); + } + else + { + Global.LoadIniFile("eu07.ini"); + } + // the progress goes to the console, the log keeps the details + Global.iWriteLogEnabled &= ~2; + std::thread logservice(LogService); + + auto const finish = [&](int const Result) { + // give the log service time to write out what's left + std::this_thread::sleep_for(std::chrono::milliseconds(200)); + Global.applicationQuitOrder = true; + logservice.join(); + return Result; + }; + + preview_settings settings; + if (false == parse_arguments(Argc, Argv, settings)) + { + report("usage: " + std::string(Argv[0]) + " -generate-nodebank-previews [-entries \"node ... endmodel\" ...] [-resolution ] [-margin ] [-no-shadows] [-software]", true); + return finish(1); + } + + // the full renderer, drawing offscreen + Global.GfxRenderer = "default"; + Global.LegacyRenderer = false; + Global.NvRenderer = false; + Global.BasicRenderer = false; + Global.gfx_usegles = false; + Global.gfx_skippipeline = false; + Global.gfx_postfx_motionblur_enabled = false; + Global.gfx_postfx_chromaticaberration_enabled = false; + Global.gfx_postfx_ssao_enabled = false; + Global.gfx_envmap_enabled = false; + Global.gfx_shadowmap_enabled = settings.shadows; + Global.shadowtune.map_size = std::max(Global.shadowtune.map_size, 2048u); + Global.iMultisampling = 0; + Global.vr = false; + Global.extra_viewports.clear(); + Global.VSync = false; + Global.fb_size = {64, 64}; + Global.window_size = {64, 64}; + Global.gfx_framebuffer_width = 64; + Global.gfx_framebuffer_height = 64; + Global.gfx_texture_streaming = false; + Global.gfx_texture_releasedistance = 0.f; + // summer daylight, which picks the seasonal variants of models and materials and keeps the lamps off + Global.Season = "summer:"; + Global.Overcast = 0.f; + Global.fLuminance = 1.0; + + auto *window{create_context(settings.software)}; + if ((window == nullptr) && (false == settings.software)) + { + report("no gl 3.3 context from the graphics driver, trying the software renderer"); + settings.software = true; + window = create_context(true); + } + if (window == nullptr) + { +#ifdef _WIN32 + report("failed to create gl 3.3 context. for computers without a capable graphics driver put opengl32.dll of mesa (with the libraries it comes with) in the mesa folder", true); +#else + report("failed to create gl 3.3 context. without a display run it through xvfb-run", true); +#endif + return finish(1); + } + GfxRenderer = gfx_renderer_factory::get_instance()->create("modern"); + if ((!GfxRenderer) || (false == GfxRenderer->Init(window))) + { + report("failed to initialize the renderer", true); + return finish(1); + } + report(std::string("renderer: ") + reinterpret_cast(glGetString(GL_RENDERER))); + + auto const entries{settings.entries.empty() ? nodebank_entries() : settings.entries}; + if (entries.empty()) + { + report("no entries to draw, nodebank.txt is missing or empty", true); + return finish(1); + } + + std::set saved; + auto failures{0}; + for (std::size_t idx = 0; idx < entries.size(); ++idx) + { + std::string outcome; + auto success{false}; + try + { + success = generate_preview(entries[idx], settings, saved, outcome); + } + catch (std::exception const &Error) + { + // a broken entry shouldn't stop the others + outcome = Error.what(); + } + if (false == success) + { + ++failures; + } + report("[" + std::to_string(idx + 1) + "/" + std::to_string(entries.size()) + "] " + entries[idx] + (success ? " -> " : ": ") + outcome, (false == success)); + } + report(std::to_string(saved.size()) + " previews saved in " + preview_folder + (failures > 0 ? ", " + std::to_string(failures) + " entries failed" : "")); + + return finish(failures > 0 ? 1 : 0); +} diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index 36bf45728..7b9c434c3 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -3982,7 +3982,7 @@ void opengl33_renderer::Render(TSubModel *Submodel) { glDebug("Render TSubModel"); - if ((Submodel->iVisible) && (TSubModel::fSquareDist >= Submodel->fSquareMinDist) && (TSubModel::fSquareDist < Submodel->fSquareMaxDist)) + if ((Submodel->iVisible) && (TSubModel::fSquareDist >= Submodel->fSquareMinDist) && (TSubModel::fSquareDist < Submodel->fSquareMaxDist) && (false == m_previewing || Submodel->fVisible > 0.f)) { glm::mat4 future_stack = model_ubs.future; @@ -4998,7 +4998,7 @@ void opengl33_renderer::Render_Alpha_text(TSubModel *Submodel) void opengl33_renderer::Render_Alpha(TSubModel *Submodel) { // renderowanie przezroczystych przez DL - if ((Submodel->iVisible) && (TSubModel::fSquareDist >= Submodel->fSquareMinDist) && (TSubModel::fSquareDist < Submodel->fSquareMaxDist)) + if ((Submodel->iVisible) && (TSubModel::fSquareDist >= Submodel->fSquareMinDist) && (TSubModel::fSquareDist < Submodel->fSquareMaxDist) && (false == m_previewing || Submodel->fVisible > 0.f)) { glm::mat4 future_stack = model_ubs.future; @@ -5549,6 +5549,414 @@ void opengl33_renderer::MakeScreenshot() screenshot_manager::make_screenshot(); } +// model previews + +namespace +{ +// direction from the previewed model to the camera. models are made facing -z (the front view of 3ds max), +// so the camera looks at their front, right side and top +glm::dvec3 const preview_viewdirection{-0.6123724, 0.5, -0.6123724}; +// vertical field of view of the preview camera, in degrees +float const preview_fieldofview{30.f}; +// brightness of the hdr background, past the white point of the tonemapping, so translucent parts blend with white +float const preview_background{16.f}; +} // namespace + +void opengl33_renderer::Preview_Bounds(TSubModel const *Submodel, glm::dmat4 const &Transform, glm::dvec3 &Min, glm::dvec3 &Max) const +{ + // same walk as the one of Render(TSubModel *) bar the range checks, which leave out parts only for the bounds to be smaller + for (auto const *submodel{Submodel}; submodel != nullptr; submodel = submodel->Next) + { + if ((submodel->iVisible == 0) || (submodel->fVisible <= 0.f)) + { + continue; + } + auto transform{Transform}; + if ((submodel->iFlags & 0xC000) && (submodel->fMatrix != nullptr)) + { + transform *= glm::dmat4{glm::make_mat4(submodel->fMatrix->readArray())}; + } + if ((submodel->eType < TP_ROTATOR) && (submodel->m_geometry.handle != null_handle)) + { + for (auto const &vertex : m_geometry.vertices(submodel->m_geometry.handle)) + { + auto const point{glm::dvec3{transform * glm::dvec4{glm::dvec3{vertex.position}, 1.0}}}; + Min = glm::min(Min, point); + Max = glm::max(Max, point); + } + } + Preview_Bounds(submodel->Child, transform, Min, Max); + } +} + +bool opengl33_renderer::Preview_Targets(int const Size) +{ + if (m_preview.size == Size) + { + return true; + } + m_preview = preview_targets(); + + m_preview.hdr_tex = std::make_unique(); + m_preview.hdr_tex->alloc_rendertarget(GL_RGBA16F, GL_RGBA, Size, Size, 1, 1, GL_CLAMP_TO_EDGE); + m_preview.hdr_rbds = std::make_unique(); + m_preview.hdr_rbds->alloc(GL_DEPTH32F_STENCIL8, Size, Size); + m_preview.hdr_fb = std::make_unique(); + m_preview.hdr_fb->attach(*m_preview.hdr_tex, GL_COLOR_ATTACHMENT0); + m_preview.hdr_fb->attach(*m_preview.hdr_rbds, GL_DEPTH_STENCIL_ATTACHMENT); + m_preview.hdr_fb->setup_drawing(1); + if (false == m_preview.hdr_fb->is_complete()) + { + ErrorLog("preview framebuffer setup failed"); + m_preview = preview_targets(); + return false; + } + // the tonemapping writes srgb values, either by itself or through the srgb target + m_preview.ldr_tex = std::make_unique(); + m_preview.ldr_tex->alloc_rendertarget((Global.gfx_shadergamma ? GL_RGBA8 : GL_SRGB8_ALPHA8), GL_RGBA, Size, Size, 1, 1, GL_CLAMP_TO_EDGE); + m_preview.ldr_fb = std::make_unique(); + m_preview.ldr_fb->attach(*m_preview.ldr_tex, GL_COLOR_ATTACHMENT0); + m_preview.ldr_fb->setup_drawing(1); + if (false == m_preview.ldr_fb->is_complete()) + { + ErrorLog("preview framebuffer setup failed"); + m_preview = preview_targets(); + return false; + } + gl::framebuffer::unbind(); + + m_preview.size = Size; + return true; +} + +void opengl33_renderer::Preview_Model(TAnimModel *Instance, float const Squaredistance, bool const Alpha) +{ + // the placement of Render(TAnimModel *), without its range and visibility tests + ::glPushMatrix(); + auto const position{Instance->location() - m_renderpass.pass_camera.position()}; + ::glTranslated(position.x, position.y, position.z); + auto const &angle{Instance->vAngle}; + if (angle.y != 0.0) + ::glRotated(angle.y, 0.f, 1.f, 0.f); + if (angle.x != 0.0) + ::glRotated(angle.x, 1.f, 0.f, 0.f); + if (angle.z != 0.0) + ::glRotated(angle.z, 0.f, 0.f, 1.f); + auto const &scale{Instance->Scale()}; + ::glScalef(scale.x, scale.y, scale.z); + if (Alpha) + Render_Alpha(Instance->pModel, Instance->Material(), Squaredistance); + else + Render(Instance->pModel, Instance->Material(), Squaredistance); + ::glPopMatrix(); +} + +void opengl33_renderer::Preview_Color(TAnimModel *Instance, float const Squaredistance, int const Size, glm::dvec3 const &Eye, glm::mat4 const &View, glm::mat4 const &Projection, bool const Shadows) +{ + m_renderpass.draw_mode = rendermode::color; + m_renderpass.pass_camera.position() = Eye; + m_renderpass.pass_camera.modelview() = View; + m_renderpass.pass_camera.projection() = Projection; + m_renderpass.viewport_camera.position() = Eye; + setup_matrices(); + + scene_ubs.projection = OpenGLMatrices.data(GL_PROJECTION); + scene_ubs.inv_view = glm::inverse(glm::mat4{glm::mat3{View}}); + scene_ubs.time = 0.f; + for (auto idx = 0; idx < m_shadowpass.size(); ++idx) + { + // everything is in the first cascade + scene_ubs.cascade_end[idx] = std::numeric_limits::max(); + } + scene_ubo->update(scene_ubs); + scene_ubo->bind_uniform(); + // the sun is the only light, and there's no fog + auto const &modelview{OpenGLMatrices.data(GL_MODELVIEW)}; + light_ubs.ambient = m_sunlight.ambient; + light_ubs.fog_color = glm::vec3{1.f}; + light_ubs.lights_count = 1; + light_ubs.lights[0].type = gl::light_element_ubs::DIR; + light_ubs.lights[0].dir = modelview * glm::vec4(m_sunlight.direction, 0.0f); + light_ubs.lights[0].color = m_sunlight.diffuse; + light_ubs.lights[0].ambient = 0.0f; + light_ubs.lights[0].intensity = 1.0f; + light_ubo->update(light_ubs); + model_ubs.fog_density = 0.f; + model_ubs.future = glm::mat4(); + model_ubs.emission = 0.f; + if (Shadows) + { + setup_shadow_bind_map(); + setup_shadow_color(colors::shadow); + } + else + { + setup_shadow_unbind_map(); + setup_shadow_color(colors::white); + } + setup_env_map(nullptr); + + m_preview.hdr_fb->bind(); + glViewport(0, 0, Size, Size); + glClearColor(preview_background, preview_background, preview_background, 1.f); + glClearStencil(0); + glStencilMask(0xFF); + m_preview.hdr_fb->clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); + if (!Global.gfx_usegles) + glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); + glEnable(GL_DEPTH_TEST); + // every fragment which made it past the alpha test marks the pixel as covered, translucent ones included + glEnable(GL_STENCIL_TEST); + glStencilFunc(GL_ALWAYS, 1, 0xFF); + glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE); + + setup_drawing(false); + Preview_Model(Instance, Squaredistance, false); + setup_drawing(true); + Preview_Model(Instance, Squaredistance, true); + setup_drawing(false); + + glDisable(GL_STENCIL_TEST); + setup_shadow_unbind_map(); +} + +bool opengl33_renderer::Render_Preview(TAnimModel *Instance, int const Size, int const Margin, bool const Shadows, std::vector &Image) +{ + if ((Instance == nullptr) || (Instance->pModel == nullptr) || (Size <= 0) || (Margin < 0) || (Margin * 2 >= Size)) + { + return false; + } + // the image is drawn at double size and scaled down, for antialiased edges which blend with the white background + GLint maxtexturesize{0}, maxrenderbuffersize{0}; + GLint maxviewport[2]{0, 0}; + glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxtexturesize); + glGetIntegerv(GL_MAX_RENDERBUFFER_SIZE, &maxrenderbuffersize); + glGetIntegerv(GL_MAX_VIEWPORT_DIMS, maxviewport); + auto const maxsize{std::min({maxtexturesize, maxrenderbuffersize, maxviewport[0], maxviewport[1]})}; + if (Size > maxsize) + { + ErrorLog("preview size " + std::to_string(Size) + " exceeds the limit of the graphics driver, " + std::to_string(maxsize)); + return false; + } + auto const supersampling{(Size * 2 <= maxsize ? 2 : 1)}; + auto const targetsize{Size * supersampling}; + if (false == Preview_Targets(targetsize)) + { + return false; + } + + glfwMakeContextCurrent(m_window); + opengl_texture::reset_unit_cache(); + gfx::opengl33_vaogeometrybank::reset(); + m_previewing = true; + // lights and visibility of the submodels, for this instance + Instance->RaAnimate(m_framestamp); + Instance->RaPrepare(); + + // bounding sphere of the model, which the camera is placed to fit in its view + glm::dvec3 boundsmin{std::numeric_limits::max()}; + glm::dvec3 boundsmax{std::numeric_limits::lowest()}; + Preview_Bounds(Instance->pModel->Root, glm::translate(glm::dmat4{1.0}, Instance->location()) * glm::dmat4{Instance->rotation_scale()}, boundsmin, boundsmax); + if (boundsmin.x > boundsmax.x) + { + m_previewing = false; + return false; + } + auto const centre{(boundsmin + boundsmax) * 0.5}; + auto const radius{std::max(0.01, glm::length(boundsmax - boundsmin) * 0.5)}; + auto const fieldofview{glm::radians(preview_fieldofview)}; + auto const distance{radius / std::sin(fieldofview * 0.5)}; + auto const eye{centre + glm::normalize(preview_viewdirection) * distance}; + glm::mat4 const view{glm::lookAt(eye, centre, glm::dvec3{0.0, 1.0, 0.0})}; + // the sphere is given some slack for parts which aren't where their vertices are, like billboards turning to the camera + auto const znear{static_cast(std::max(distance - radius * 1.5, distance * 0.05))}; + auto const zfar{static_cast(distance + radius * 1.5)}; + auto const projection{perspective_projection_raw(fieldofview, 1.f, znear, zfar)}; + // level of detail as seen from the camera, like in Render(TAnimModel *) + auto const squaredistance{static_cast(glm::length2(Instance->location() - eye) / Global.fDistanceFactor)}; + + // key light from above the left shoulder of the viewer, so the visible sides of the model differ in tone + auto const forward{glm::normalize(centre - eye)}; + auto const right{glm::normalize(glm::cross(forward, glm::dvec3{0.0, 1.0, 0.0}))}; + auto const tosun{glm::normalize(-forward * 0.4 + glm::dvec3{0.0, 1.0, 0.0} - right * 0.9)}; + m_sunlight.direction = glm::vec3{-tosun}; + m_sunlight.diffuse = glm::vec4{1.0f, 0.9686275f, 0.9411765f, 1.f}; + m_sunlight.ambient = glm::vec4{0.65f, 0.66f, 0.68f, 1.f}; + m_sunlight.factor = 1.f; + + auto const shadows{Shadows && Global.gfx_shadowmap_enabled && (m_shadow_fb != nullptr)}; + if (shadows) + { + // one map covering the whole model, seen from the sun + m_renderpass.draw_mode = rendermode::shadows; + m_renderpass.pass_camera.position() = centre; + m_renderpass.pass_camera.modelview() = glm::mat4{glm::lookAt(centre, centre + glm::dvec3{m_sunlight.direction}, glm::dvec3{0.0, 1.0, 0.0})}; + auto const extent{static_cast(radius * 1.5)}; + m_renderpass.pass_camera.projection() = ortho_projection(-extent, extent, -extent, extent, -extent, extent); + m_renderpass.viewport_camera.position() = eye; + setup_matrices(); + scene_ubs.projection = OpenGLMatrices.data(GL_PROJECTION); + scene_ubo->update(scene_ubs); + + glViewport(0, 0, m_shadowbuffersize, m_shadowbuffersize); + m_shadow_fb->attach(*m_shadow_tex, GL_DEPTH_ATTACHMENT, 0); + m_shadow_fb->clear(GL_DEPTH_BUFFER_BIT); + glEnable(GL_DEPTH_TEST); + setup_drawing(false); + Preview_Model(Instance, squaredistance, false); + m_shadow_fb->unbind(); + for (auto &pass : m_shadowpass) + { + pass = m_renderpass; + } + } + + // the view is cropped to the part of the image the model covers: a look from a bit further first, to find it, + // then a closer one at the full size, as thin parts can show up only there, to refine the crop to a pixel. + // the crop maps the area to the image less the margins + std::vector coverage; + auto const fitsize{targetsize}; + auto const area{1.0 - 2.0 * Margin / Size}; // half of the extent of the area for the model, in normalized device coordinates + glm::dvec2 cropcentre{0.0}; + auto cropscale{0.75}; + auto tight{false}; // whether the crop was fitted to the model + auto const cropped = [&]() { + return glm::mat4{glm::scale(glm::dmat4{1.0}, glm::dvec3{cropscale, cropscale, 1.0}) * glm::translate(glm::dmat4{1.0}, glm::dvec3{-cropcentre, 0.0})} * projection; + }; + for (auto attempt = 0; attempt < 6; ++attempt) + { + auto const passsize{(tight ? fitsize : std::min(fitsize, 512))}; + Preview_Color(Instance, squaredistance, passsize, eye, view, cropped(), shadows); + coverage.resize(static_cast(passsize) * passsize); + m_preview.hdr_fb->bind(); + glReadPixels(0, 0, passsize, passsize, GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, coverage.data()); + + glm::ivec2 pixelmin{passsize, passsize}, pixelmax{-1, -1}; + for (auto y = 0; y < passsize; ++y) + { + auto const *row{coverage.data() + static_cast(y) * passsize}; + for (auto x = 0; x < passsize; ++x) + { + if (row[x] != 0) + { + pixelmin = glm::min(pixelmin, glm::ivec2{x, y}); + pixelmax = glm::max(pixelmax, glm::ivec2{x, y}); + } + } + } + if (pixelmax.x < 0) + { + if (attempt == 0) + { + // nothing to see + m_previewing = false; + m_renderpass.draw_mode = rendermode::none; + gl::framebuffer::unbind(); + return false; + } + // the crop missed the model, start over with the plain view + cropcentre = glm::dvec2{0.0}; + cropscale = 0.5; + tight = false; + continue; + } + // covered area in normalized device coordinates of the uncropped view + auto const tondc = [&](glm::ivec2 const &Pixel) { return (glm::dvec2{-1.0} + 2.0 * glm::dvec2{Pixel} / static_cast(passsize)) / cropscale + cropcentre; }; + auto const ndcmin{tondc(pixelmin)}; + auto const ndcmax{tondc(pixelmax + 1)}; + cropcentre = (ndcmin + ndcmax) * 0.5; + // a model fitted to the area keeps clear of the image edges, unless the margin is too thin to tell + auto const clipped{(pixelmin.x == 0) || (pixelmin.y == 0) || (pixelmax.x == passsize - 1) || (pixelmax.y == passsize - 1)}; + if (clipped && ((false == tight) || (Margin * passsize / Size >= 2))) + { + // part of the model is out of the view, look again from further away + cropscale *= 0.5; + tight = false; + continue; + } + cropscale = 2.0 * area / std::max(ndcmax.x - ndcmin.x, ndcmax.y - ndcmin.y); + if (tight) + { + // measured through a fitted crop, which makes it accurate to a pixel of the fitting pass + break; + } + tight = true; + } + + // the image itself + Preview_Color(Instance, squaredistance, targetsize, eye, view, cropped(), shadows); + glViewport(0, 0, targetsize, targetsize); + if (!Global.gfx_usegles && !Global.gfx_shadergamma) + glEnable(GL_FRAMEBUFFER_SRGB); + m_pfx_tonemapping->apply(*m_preview.hdr_tex, m_preview.ldr_fb.get()); + if (!Global.gfx_usegles && !Global.gfx_shadergamma) + glDisable(GL_FRAMEBUFFER_SRGB); + opengl_texture::reset_unit_cache(); + // the post processing binds its own vertex array, which the geometry banks don't know about + gfx::opengl33_vaogeometrybank::reset(); + + auto const targetpixels{static_cast(targetsize) * targetsize}; + std::vector colors(targetpixels * 4); + m_preview.ldr_fb->bind(); + glReadPixels(0, 0, targetsize, targetsize, GL_RGBA, GL_UNSIGNED_BYTE, colors.data()); + coverage.resize(targetpixels); + m_preview.hdr_fb->bind(); + glReadPixels(0, 0, targetsize, targetsize, GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, coverage.data()); + gl::framebuffer::unbind(); + glDepthMask(GL_TRUE); + + m_previewing = false; + m_renderpass.draw_mode = rendermode::none; + + // uncovered pixels are white, the samples are averaged in linear space and the rows flipped to go from the top + static auto const tolinear{[]() { + std::array table; + for (auto idx = 0; idx < 256; ++idx) + { + auto const value{idx / 255.f}; + table[idx] = (value <= 0.04045f ? value / 12.92f : std::pow((value + 0.055f) / 1.055f, 2.4f)); + } + return table; + }()}; + auto const tosrgb = [](float const Value) { + auto const value{std::clamp(Value, 0.f, 1.f)}; + auto const encoded{(value <= 0.0031308f ? value * 12.92f : 1.055f * std::pow(value, 1.f / 2.4f) - 0.055f)}; + return static_cast(std::lround(encoded * 255.f)); + }; + auto const samplecount{static_cast(supersampling * supersampling)}; + Image.resize(static_cast(Size) * Size * 3); + for (auto y = 0; y < Size; ++y) + { + auto *output{Image.data() + static_cast(y) * Size * 3}; + auto const sourcey{(Size - 1 - y) * supersampling}; + for (auto x = 0; x < Size; ++x) + { + glm::vec3 color{0.f}; + for (auto sy = 0; sy < supersampling; ++sy) + { + for (auto sx = 0; sx < supersampling; ++sx) + { + auto const sample{static_cast(sourcey + sy) * targetsize + x * supersampling + sx}; + if (coverage[sample] != 0) + { + auto const *rgba{colors.data() + sample * 4}; + color += glm::vec3{tolinear[rgba[0]], tolinear[rgba[1]], tolinear[rgba[2]]}; + } + else + { + color += glm::vec3{1.f}; + } + } + } + color /= samplecount; + output[x * 3 + 0] = tosrgb(color.r); + output[x * 3 + 1] = tosrgb(color.g); + output[x * 3 + 2] = tosrgb(color.b); + } + } + return true; +} + void opengl33_renderer::Update_Lights(light_array &Lights) { glDebug("Update_Lights"); diff --git a/rendering/opengl33renderer.h b/rendering/opengl33renderer.h index 90142cd19..78684ae49 100644 --- a/rendering/opengl33renderer.h +++ b/rendering/opengl33renderer.h @@ -130,6 +130,7 @@ class opengl33_renderer : public gfx_renderer { std::string const & info_stats() const override; void MakeScreenshot() override; + bool Render_Preview( TAnimModel *Instance, int const Size, int const Margin, bool const Shadows, std::vector &Image ) override; @@ -334,6 +335,16 @@ class opengl33_renderer : public gfx_renderer { void draw_debug_ui(); + // model previews + // extends provided bounds with the geometry of the submodel and its siblings and children visible in a preview + void Preview_Bounds( TSubModel const *Submodel, glm::dmat4 const &Transform, glm::dvec3 &Min, glm::dvec3 &Max ) const; + // prepares the offscreen targets of model previews for square images of specified size + bool Preview_Targets( int const Size ); + // draws the instance on its own with the current render pass settings + void Preview_Model( TAnimModel *Instance, float const Squaredistance, bool const Alpha ); + // draws the lit instance into the hdr preview target, marking in its stencil the pixels covered by the model + void Preview_Color( TAnimModel *Instance, float const Squaredistance, int const Size, glm::dvec3 const &Eye, glm::mat4 const &View, glm::mat4 const &Projection, bool const Shadows ); + // members GLFWwindow *m_window{nullptr}; // main window gfx::geometrybank_manager m_geometry; @@ -547,6 +558,19 @@ class opengl33_renderer : public gfx_renderer { std::unique_ptr vr; bool debug_ui_active = false; + // offscreen targets of model previews + struct preview_targets + { + int size { 0 }; + std::unique_ptr hdr_tex; + std::unique_ptr hdr_rbds; // depth and stencil, the stencil marks pixels covered by the model + std::unique_ptr hdr_fb; + std::unique_ptr ldr_tex; + std::unique_ptr ldr_fb; + } m_preview; + // set while a preview is drawn: submodels faded out entirely are skipped, instead of being drawn invisible over the stencil + bool m_previewing { false }; + static bool renderer_register; class opengl33_imgui_renderer : public imgui_renderer diff --git a/rendering/renderer.h b/rendering/renderer.h index 225e26c08..e02959ff4 100644 --- a/rendering/renderer.h +++ b/rendering/renderer.h @@ -93,6 +93,10 @@ public: // imgui renderer virtual class imgui_renderer *GetImguiRenderer() = 0; virtual void MakeScreenshot() = 0; + // draws the model of a scenery instance on its own into a square image of Size pixels on white background, the model + // seen in perspective from the front, side and above and filling the image less Margin pixels at each edge. + // Image receives rgb rows, top row first. returns false if the backend can't make previews or there's nothing to draw + virtual auto Render_Preview( TAnimModel *Instance, int const Size, int const Margin, bool const Shadows, std::vector &Image ) -> bool { return false; } }; class gfx_renderer_factory From 14e916e81fed66c7a110f32404427133602df9b9 Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 8 Oct 2026 19:35:28 +0200 Subject: [PATCH 168/430] prevent collecting all switches from scenery at start of tool --- application/editormodetrack.cpp | 14 ++++++-------- lang/editor_pl.po | 8 ++++---- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index ee91503e7..74e7d8f08 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -652,8 +652,6 @@ void editor_mode::arm_switch() if (false == tool.collected) { tool.templates = editor_track::standard_switch_templates(); - auto const found{editor_track::find_switch_templates()}; - tool.templates.insert(tool.templates.end(), found.begin(), found.end()); tool.collected = true; } tool.status.clear(); @@ -1029,8 +1027,6 @@ void editor_mode::render_turnout_ui() if (false == tool.collected) { tool.templates = editor_track::standard_switch_templates(); - auto const found{editor_track::find_switch_templates()}; - tool.templates.insert(tool.templates.end(), found.begin(), found.end()); tool.collected = true; } if (tool.templates.empty()) @@ -1102,7 +1098,6 @@ void editor_mode::render_turnout_ui() ImGui::SameLine(); if (ImGui::Button(STR_C("Flip the side"))) { - auto const current{editor_track::find_switch_templates()}; editor_track::switch_template own; own.source = track; for (int i = 0; i < 2; ++i) @@ -5101,12 +5096,15 @@ void editor_mode::render_switch_ui() render_switch_drive_choice(); if (false == tool.status.empty()) ImGui::TextColored(ImVec4(1.0f, 0.7f, 0.2f, 1.0f), "%s", tool.status.c_str()); - if (ImGui::SmallButton(STR_C("Collect again from the scenery"))) + if (ImGui::SmallButton(STR_C("Collect from the scenery"))) { - tool.collected = false; + tool.templates = editor_track::standard_switch_templates(); + auto const found{editor_track::find_switch_templates()}; + tool.templates.insert(tool.templates.end(), found.begin(), found.end()); + tool.collected = true; arm_switch(); } - item_tooltip("Looks for the switches of the scenery again, to use their shapes as the templates"); + item_tooltip("Looks for the switches of the scenery, to use their shapes as the templates"); } std::vector editor_mode::detour_outline() const diff --git a/lang/editor_pl.po b/lang/editor_pl.po index 03c7c4b6a..31b79ba50 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -107,8 +107,8 @@ msgstr "Wzorzec rozjazdu" msgid "Press on the selected straight or curve where the switch starts and drag: along sets its direction, sideways its side" msgstr "Wciśnij na wybranej prostej lub łuku w miejscu początku rozjazdu i przeciągnij: wzdłuż ustala kierunek, w bok stronę" -msgid "Collect again from the scenery" -msgstr "Zbierz ponownie ze scenerii" +msgid "Collect from the scenery" +msgstr "Zbierz ze scenerii" msgid "Select a path in the view, then build the route along the line, or set its start and end paths (switches are passed through)" msgstr "Wybierz odcinek w widoku, potem zbuduj trasę wzdłuż linii albo wskaż jej odcinek początkowy i końcowy (rozjazdy są przechodzone)" @@ -305,8 +305,8 @@ msgstr "Długości i przechyłka zalecane dla prędkości i promienia; wyłączo msgid "Takes the textures and the other parameters from the selected track.\nA track started or finished at a free end always takes them from the track it joins" msgstr "Bierze tekstury i pozostałe parametry z wybranego toru.\nTor zaczęty lub zakończony na wolnym końcu zawsze bierze je z toru, do którego dochodzi" -msgid "Looks for the switches of the scenery again, to use their shapes as the templates" -msgstr "Ponownie szuka rozjazdów w scenerii, aby użyć ich kształtów jako wzorców" +msgid "Looks for the switches of the scenery, to use their shapes as the templates" +msgstr "Szuka rozjazdów w scenerii, aby użyć ich kształtów jako wzorców" msgid "start of the new track, on the ground or at a free end" msgstr "początek nowego toru, na terenie lub na wolnym końcu" From c11480ce2ed39942938dda5fae0dde99e57ef57b Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 8 Oct 2026 20:20:12 +0200 Subject: [PATCH 169/430] fix flipped ortophot + clear cache --- application/editormode.cpp | 4 ++++ editor/editorOrthophoto.cpp | 18 ++++++++++++++++++ editor/editorOrthophoto.hpp | 2 ++ lang/editor_pl.po | 6 ++++++ 4 files changed, 30 insertions(+) diff --git a/application/editormode.cpp b/application/editormode.cpp index 0ee3d1dbc..98dfd14b5 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -1838,6 +1838,10 @@ void editor_mode::render_orthophoto_ui() if (!editor_orthophoto::can_download()) ImGui::TextDisabled(STR_C("This build has no HTTP client, only cached tiles are shown")); ImGui::TextDisabled(STR_C("Cache: %s"), editor_orthophoto::cache_directory().c_str()); + if (ImGui::Button(STR_C("Clear cache"))) + m_orthophoto.clear_cache(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip(STR_C("Deletes downloaded tiles from disk. They are fetched again around the camera.")); ImGui::TextDisabled(STR_C("Imagery: GUGiK, geoportal.gov.pl")); } diff --git a/editor/editorOrthophoto.cpp b/editor/editorOrthophoto.cpp index 26bbb6463..7a33b1271 100644 --- a/editor/editorOrthophoto.cpp +++ b/editor/editorOrthophoto.cpp @@ -417,6 +417,9 @@ bool fetch(http_client &Client, std::string const &Url, fs::path const &Path, st bool decode(std::vector const &Data, image &Out, std::string &Error) { int width{0}, height{0}, components{0}; + // WMS GetMap is north-up. the texture loader sets a process-wide stb flip for OpenGL; + // pin this thread to no flip immediately before load so the first row stays north + stbi_set_flip_vertically_on_load_thread(0); stbi_uc *pixels = stbi_load_from_memory(Data.data(), static_cast(Data.size()), &width, &height, &components, 4); if (pixels == nullptr) { @@ -738,6 +741,21 @@ void editor_orthophoto::cancel_pending() entry.second.requested = 0; } +void editor_orthophoto::clear_cache() +{ + cancel_pending(); + for (auto &entry : m_tiles) + release_tile(entry.second); + m_tiles.clear(); + ++m_generation; + { + std::lock_guard lock(m_mutex); + m_done.clear(); + } + std::error_code ec; + fs::remove_all(cache_root(), ec); +} + void editor_orthophoto::retry_failed() { for (auto &entry : m_tiles) diff --git a/editor/editorOrthophoto.hpp b/editor/editorOrthophoto.hpp index a2e5b761d..dd0810215 100644 --- a/editor/editorOrthophoto.hpp +++ b/editor/editorOrthophoto.hpp @@ -107,6 +107,8 @@ class editor_orthophoto void draw(glm::mat4 const &ViewProjection, glm::dvec3 const &CameraPos, float ScreenWidth, float ScreenHeight) const; // forgets pending (not yet started) downloads, e.g. when the editor is left void cancel_pending(); + // drops resident tiles and deletes the on-disk cache; enabled tiles are fetched again + void clear_cache(); // clears failure state so failed tiles are attempted again void retry_failed(); diff --git a/lang/editor_pl.po b/lang/editor_pl.po index 31b79ba50..510d5c9b1 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -4057,6 +4057,12 @@ msgstr "Ten build nie ma klienta HTTP, widać tylko kafle z pamięci podręcznej msgid "Cache: %s" msgstr "Pamięć podręczna: %s" +msgid "Clear cache" +msgstr "Wyczyść cache" + +msgid "Deletes downloaded tiles from disk. They are fetched again around the camera." +msgstr "Usuwa pobrane kafle z dysku. Zostaną ponownie pobrane wokół kamery." + msgid "Imagery: GUGiK, geoportal.gov.pl" msgstr "Zdjęcia: GUGiK, geoportal.gov.pl" From 344034ec705a94b64a6819a80cd1ae9d04508cf0 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Thu, 8 Oct 2026 20:38:13 +0200 Subject: [PATCH 170/430] feat(ui): imgui 1.91.9b-docking in place of 1.73: local changes of the backends carried over (glad as the gl loader, srgb and gamma of the ui, gles glsl string), BufferingBar/Spinner kept, imgui_tables in cmake; cursor position, cursor enter and focus of the main window passed to the glfw backend, which works with events now; code adapted to the api: ImGuiListClipper::Begin, BeginListBox, ImTextureID as an integer, ImageButton with an id, ImGuiKey without GetKeyIndex, logarithmic sliders in place of the removed power argument; ImGuizmo with the math operators defined before imgui.h and SetNextFrameWantCaptureMouse --- CMakeLists.txt | 3 +- application/application.cpp | 8 + application/driveruilayer.cpp | 2 +- application/editormode.cpp | 2 +- application/editormodegauge.cpp | 3 +- application/editormodeinfra.cpp | 6 +- application/editormodejoints.cpp | 3 +- application/editormodeprofile.cpp | 4 +- application/editormoderoad.cpp | 3 +- application/editormodespeed.cpp | 3 +- application/editoruipanels.cpp | 11 +- application/uilayer.cpp | 27 +- application/uilayer.h | 4 + editor/editorOrthophoto.cpp | 2 +- imgui/ImGuizmo.cpp | 15 +- imgui/LICENSE.txt | 2 +- imgui/imconfig.h | 126 +- imgui/imgui.cpp | 23495 +++++++++++++++++++++------- imgui/imgui.h | 3615 +++-- imgui/imgui_demo.cpp | 10565 ++++++++++--- imgui/imgui_draw.cpp | 3339 ++-- imgui/imgui_impl_glfw.cpp | 1500 +- imgui/imgui_impl_glfw.h | 62 +- imgui/imgui_impl_opengl2.cpp | 226 +- imgui/imgui_impl_opengl2.h | 24 +- imgui/imgui_impl_opengl3.cpp | 790 +- imgui/imgui_impl_opengl3.h | 79 +- imgui/imgui_internal.h | 4340 +++-- imgui/imgui_tables.cpp | 4525 ++++++ imgui/imgui_widgets.cpp | 8608 ++++++---- imgui/imstb_rectpack.h | 94 +- imgui/imstb_textedit.h | 448 +- imgui/imstb_truetype.h | 892 +- launcher/keymapper.cpp | 2 +- launcher/scenery_list.cpp | 7 +- launcher/scenery_wizard.cpp | 2 +- launcher/vehicle_picker.cpp | 9 +- rendering/opengl33renderer.cpp | 4 +- widgets/map.cpp | 7 +- widgets/vehicleparams.cpp | 4 +- 40 files changed, 48540 insertions(+), 14321 deletions(-) create mode 100644 imgui/imgui_tables.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index f5fe1dec2..7f90db3ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -257,6 +257,7 @@ set(SOURCES "imgui/imgui_demo.cpp" "imgui/imgui_draw.cpp" "imgui/imgui_widgets.cpp" +"imgui/imgui_tables.cpp" "imgui/imgui_impl_glfw.cpp" "imgui/ImGuizmo.cpp" @@ -485,7 +486,7 @@ if(NOT ${CMAKE_VERSION} VERSION_LESS "3.16.0") if (USE_PCH) target_precompile_headers(${PROJECT_NAME} PRIVATE "$<$:${CMAKE_CURRENT_SOURCE_DIR}/stdafx.h>") set_source_files_properties("/glad/src/glad.c" "ref/dds-ktx/src/dds-ktx.c" "stb/stb_image.c" - "imgui/imgui.cpp" "imgui/imgui_demo.cpp" "imgui/imgui_draw.cpp" "imgui/imgui_widgets.cpp" "imgui/imgui_impl_glfw.cpp" "imgui/ImGuizmo.cpp" + "imgui/imgui.cpp" "imgui/imgui_demo.cpp" "imgui/imgui_draw.cpp" "imgui/imgui_widgets.cpp" "imgui/imgui_tables.cpp" "imgui/imgui_impl_glfw.cpp" "imgui/ImGuizmo.cpp" PROPERTIES SKIP_PRECOMPILE_HEADERS TRUE) endif() endif() diff --git a/application/application.cpp b/application/application.cpp index 8dc2d0b3a..dec1292d9 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -74,9 +74,15 @@ extern WNDPROC BaseWindowProc; void focus_callback(GLFWwindow *window, int focus) { + ui_layer::focus_callback(focus); Application.on_focus_change(focus != 0); } +void cursor_enter_callback(GLFWwindow *window, int entered) +{ + ui_layer::cursor_enter_callback(entered); +} + void framebuffer_resize_callback(GLFWwindow *, int w, int h) { Global.fb_size = glm::ivec2(w, h); @@ -90,6 +96,7 @@ void window_resize_callback(GLFWwindow *, int w, int h) void cursor_pos_callback(GLFWwindow *window, double x, double y) { + ui_layer::cursor_pos_callback(x, y); Global.cursor_pos = glm::ivec2(x, y); Application.on_cursor_pos(x, y); } @@ -1351,6 +1358,7 @@ void eu07_application::init_callbacks() glfwSetScrollCallback(window, scroll_callback); glfwSetCharCallback(window, char_callback); glfwSetWindowFocusCallback(window, focus_callback); + glfwSetCursorEnterCallback(window, cursor_enter_callback); } int eu07_application::init_ogl() diff --git a/application/driveruilayer.cpp b/application/driveruilayer.cpp index 0b8463f8c..569ade337 100644 --- a/application/driveruilayer.cpp +++ b/application/driveruilayer.cpp @@ -252,7 +252,7 @@ void driver_ui::render_() ImGui::SetNextWindowSize(ImVec2(-1, -1)); if (ImGui::BeginPopupModal(popupheader, nullptr, 0)) { - if (ImGui::Button(STR_C("Resume"), ImVec2(150, 0)) || ImGui::IsKeyReleased(ImGui::GetKeyIndex(ImGuiKey_Escape))) + if (ImGui::Button(STR_C("Resume"), ImVec2(150, 0)) || ImGui::IsKeyReleased(ImGuiKey_Escape)) { m_relay.post(user_command::pausetoggle, 0.0, 0.0, GLFW_RELEASE, 0); } diff --git a/application/editormode.cpp b/application/editormode.cpp index 0ee3d1dbc..cc7a1bee0 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -3631,7 +3631,7 @@ void editor_mode::render_gizmo_options() { ImGui::SameLine(); ImGui::SetNextItemWidth(120.0f); - ImGui::SliderFloat(STR_C("Extent (m), wheel"), &Global.EditorOrthoExtent, 5.0f, 5000.0f, "%.0f", 3.0f); + ImGui::SliderFloat(STR_C("Extent (m), wheel"), &Global.EditorOrthoExtent, 5.0f, 5000.0f, "%.0f", ImGuiSliderFlags_Logarithmic); } ImGui::Checkbox(STR_C("Enabled"), &m_gizmo_enabled); if (!m_gizmo_enabled) diff --git a/application/editormodegauge.cpp b/application/editormodegauge.cpp index da941b4ce..2f64fb42d 100644 --- a/application/editormodegauge.cpp +++ b/application/editormodegauge.cpp @@ -778,7 +778,8 @@ void editor_mode::render_gauge_hits() ImGui::SameLine(); ImGui::Text("%d / %zu", m_gauge.current + 1, hits.size()); ImGui::BeginChild("gaugehits", ImVec2(0.0f, std::min(160.0f, ImGui::GetTextLineHeightWithSpacing() * hits.size() + 8.0f)), true); - ImGuiListClipper clipper(static_cast(hits.size())); + ImGuiListClipper clipper; + clipper.Begin(static_cast(hits.size())); while (clipper.Step()) for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; ++i) { diff --git a/application/editormodeinfra.cpp b/application/editormodeinfra.cpp index 6c85f4b75..86ae5389f 100644 --- a/application/editormodeinfra.cpp +++ b/application/editormodeinfra.cpp @@ -1526,7 +1526,8 @@ void editor_mode::render_infra_candidates() choose(group, false); if (false == open) continue; - ImGuiListClipper clipper(static_cast(rows.size())); + ImGuiListClipper clipper; + clipper.Begin(static_cast(rows.size())); while (clipper.Step()) for (int row = clipper.DisplayStart; row < clipper.DisplayEnd; ++row) { @@ -1602,7 +1603,8 @@ void editor_mode::render_infra_bound() } std::optional unbind; ImGui::BeginChild("##infrabound", ImVec2(0.f, 160.f), true); - ImGuiListClipper clipper(static_cast(along.size())); + ImGuiListClipper clipper; + clipper.Begin(static_cast(along.size())); while (clipper.Step()) for (int row = clipper.DisplayStart; row < clipper.DisplayEnd; ++row) { diff --git a/application/editormodejoints.cpp b/application/editormodejoints.cpp index 71ea8976e..acb9e8f2e 100644 --- a/application/editormodejoints.cpp +++ b/application/editormodejoints.cpp @@ -467,7 +467,8 @@ void editor_mode::render_joints_body() ImGui::SetColumnWidth(0, 90.0f); ImGui::SetColumnWidth(1, 80.0f); ImGui::SetColumnWidth(2, namewidth); - ImGuiListClipper clipper(static_cast(listed.size())); + ImGuiListClipper clipper; + clipper.Begin(static_cast(listed.size())); while (clipper.Step()) for (int row = clipper.DisplayStart; row < clipper.DisplayEnd; ++row) { diff --git a/application/editormodeprofile.cpp b/application/editormodeprofile.cpp index 15b42441c..e1976b2d6 100644 --- a/application/editormodeprofile.cpp +++ b/application/editormodeprofile.cpp @@ -1433,7 +1433,7 @@ void editor_mode::render_profile_toolbar() toggle(kPlan, STR_C("Plan curvature"), state.show_plan); legend(kSwitchLabel, "Switches"); ImGui::SetNextItemWidth(130.0f); - ImGui::SliderFloat("##exaggeration", &state.exaggeration, 1.0f, 500.0f, STR_C("heights x%.0f"), 2.0f); + ImGui::SliderFloat("##exaggeration", &state.exaggeration, 1.0f, 500.0f, STR_C("heights x%.0f"), ImGuiSliderFlags_Logarithmic); if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", STR_C("Exaggeration of the heights against the lengths, also Ctrl+wheel over the plot")); ImGui::SameLine(); @@ -1677,7 +1677,7 @@ bool editor_mode::profile_canvas_edit(profile_view const &View, bool const Hover } else state.curve_grip = -1; - if ((Hovered || ImGui::IsWindowFocused()) && state.selected > 0 && state.selected + 1 < static_cast(points.size()) && false == points[state.selected].joint && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Delete))) + if ((Hovered || ImGui::IsWindowFocused()) && state.selected > 0 && state.selected + 1 < static_cast(points.size()) && false == points[state.selected].joint && ImGui::IsKeyPressed(ImGuiKey_Delete)) { points.erase(points.begin() + state.selected); state.selected = -1; diff --git a/application/editormoderoad.cpp b/application/editormoderoad.cpp index b19bc2f77..e9e134956 100644 --- a/application/editormoderoad.cpp +++ b/application/editormoderoad.cpp @@ -1919,7 +1919,8 @@ bool editor_mode::render_road_material(char const *Label, char *Buffer, std::siz if (filter.empty() || name.find(filter) != std::string::npos) listed.emplace_back(&name); ImGui::BeginChild("list", ImVec2(340.0f, 280.0f), true); - ImGuiListClipper clipper(static_cast(listed.size())); + ImGuiListClipper clipper; + clipper.Begin(static_cast(listed.size())); while (clipper.Step()) { for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; ++i) diff --git a/application/editormodespeed.cpp b/application/editormodespeed.cpp index f1c55666f..52b39f46b 100644 --- a/application/editormodespeed.cpp +++ b/application/editormodespeed.cpp @@ -290,7 +290,8 @@ void editor_mode::render_speed_body() ImGui::BeginChild("speedresults", ImVec2(0.0f, -details), true); ImGui::Columns(6, STR_C("speedrows"), false); ImGui::SetColumnWidth(0, namewidth); - ImGuiListClipper clipper(static_cast(listed.size())); + ImGuiListClipper clipper; + clipper.Begin(static_cast(listed.size())); while (clipper.Step()) for (int row = clipper.DisplayStart; row < clipper.DisplayEnd; ++row) { diff --git a/application/editoruipanels.cpp b/application/editoruipanels.cpp index adc289803..6eae78db1 100644 --- a/application/editoruipanels.cpp +++ b/application/editoruipanels.cpp @@ -650,7 +650,7 @@ void nodebank_panel::render() ImGui::InputTextWithHint(STR_C("Search"), STR_C("Search node bank"), m_nodesearch, IM_ARRAYSIZE(m_nodesearch)); // the list takes the rest of the window, but keeps a usable height when the sections above are expanded (the window scrolls then) auto const listheight{std::max(ImGui::GetContentRegionAvail().y, ImGui::GetTextLineHeightWithSpacing() * 10.0f)}; - if (ImGui::ListBoxHeader("##nodebank", ImVec2(-1, listheight))) + if (ImGui::BeginListBox("##nodebank", ImVec2(-1, listheight))) { auto idx{0}; auto isvisible{false}; @@ -710,7 +710,7 @@ void nodebank_panel::render() ImGui::TextDisabled(EditorIncludes.ready().empty() ? " (none yet, describe the templates in the Include database window)" : " (no match)"); } } - ImGui::ListBoxFooter(); + ImGui::EndListBox(); } ImGui::PopItemWidth(); } @@ -772,7 +772,7 @@ bool nodebank_panel::set_combo(char const *Label, model_set_ref &Ref, char const void nodebank_panel::manual_list(char const *Id, std::vector &List, int &Selected) { ImGui::PushID(Id); - if (ImGui::ListBoxHeader("##list", ImVec2(-1, ImGui::GetTextLineHeightWithSpacing() * 6.5f))) + if (ImGui::BeginListBox("##list", ImVec2(-1, ImGui::GetTextLineHeightWithSpacing() * 6.5f))) { for (int idx = 0; idx < static_cast(List.size()); ++idx) { @@ -784,7 +784,7 @@ void nodebank_panel::manual_list(char const *Id, std::vector &List, { ImGui::TextDisabled(STR_C("(empty)")); } - ImGui::ListBoxFooter(); + ImGui::EndListBox(); } if (ImGui::Button(STR_C("Add selected"))) { @@ -1787,7 +1787,8 @@ void includes_panel::render_list() static_cast(EditorIncludes.ready().size())); ImGui::BeginChild("##templates", ImVec2(0.0f, ImGui::GetTextLineHeightWithSpacing() * 9.0f), true); - ImGuiListClipper clipper(static_cast(m_listed.size())); + ImGuiListClipper clipper; + clipper.Begin(static_cast(m_listed.size())); while (clipper.Step()) { for (auto row = clipper.DisplayStart; row < clipper.DisplayEnd; ++row) diff --git a/application/uilayer.cpp b/application/uilayer.cpp index 19f32302b..621ece2e0 100644 --- a/application/uilayer.cpp +++ b/application/uilayer.cpp @@ -130,6 +130,28 @@ bool ui_layer::mouse_button_callback(int button, int action, int mods) return m_imguiio->WantCaptureMouse; } +// the glfw backend of imgui works with events since 1.87: position, hover and focus of the window are passed to it as they come +void ui_layer::cursor_pos_callback(double x, double y) +{ + if (ImGui::GetCurrentContext() == nullptr) + return; + ImGui_ImplGlfw_CursorPosCallback(m_window, x, y); +} + +void ui_layer::cursor_enter_callback(int entered) +{ + if (ImGui::GetCurrentContext() == nullptr) + return; + ImGui_ImplGlfw_CursorEnterCallback(m_window, entered); +} + +void ui_layer::focus_callback(int focused) +{ + if (ImGui::GetCurrentContext() == nullptr) + return; + ImGui_ImplGlfw_WindowFocusCallback(m_window, focused); +} + void ui_layer::imgui_style() { // palette shared with the MaSzyna starter: flat dark panels, thin borders, green accents @@ -186,6 +208,9 @@ void ui_layer::imgui_style() colors[ImGuiCol_TabActive] = rgb(accent); // also the line under the tab bar colors[ImGuiCol_TabUnfocused] = rgb(header); colors[ImGuiCol_TabUnfocusedActive] = rgb(accentdim); + // imgui 1.90+ marks the selected tab with a line over it as well, in the same colours + colors[ImGuiCol_TabSelectedOverline] = rgb(accent); + colors[ImGuiCol_TabDimmedSelectedOverline] = rgb(accentdim); colors[ImGuiCol_PlotLines] = ImVec4(0.61f, 0.61f, 0.61f, 1.00f); colors[ImGuiCol_PlotLinesHovered] = ImVec4(1.00f, 0.43f, 0.35f, 1.00f); colors[ImGuiCol_PlotHistogram] = ImVec4(0.90f, 0.70f, 0.00f, 1.00f); @@ -645,5 +670,5 @@ void ui_layer::render_background() ImVec2 end_position(start_position.x + image_size.x, start_position.y + image_size.y); // obrazek jest odwrócony w pionie – odwracamy UV - ImGui::GetBackgroundDrawList()->AddImage(reinterpret_cast(tex.get_id()), start_position, end_position, ImVec2(0, 1), ImVec2(1, 0)); + ImGui::GetBackgroundDrawList()->AddImage((ImTextureID)(intptr_t)(tex.get_id()), start_position, end_position, ImVec2(0, 1), ImVec2(1, 0)); } diff --git a/application/uilayer.h b/application/uilayer.h index 6d4019c63..139664c92 100644 --- a/application/uilayer.h +++ b/application/uilayer.h @@ -118,6 +118,10 @@ public: static bool char_callback(unsigned int c); static bool scroll_callback(double xoffset, double yoffset); static bool mouse_button_callback(int button, int action, int mods); + // state updates only, nothing to consume + static void cursor_pos_callback(double x, double y); + static void cursor_enter_callback(int entered); + static void focus_callback(int focused); static ImFont *font_default; static ImFont *font_mono; diff --git a/editor/editorOrthophoto.cpp b/editor/editorOrthophoto.cpp index 26bbb6463..cee41d42b 100644 --- a/editor/editorOrthophoto.cpp +++ b/editor/editorOrthophoto.cpp @@ -1399,7 +1399,7 @@ void editor_orthophoto::draw(glm::mat4 const &ViewProjection, glm::dvec3 const & float const segmentsize = 1.0f / static_cast(segments); auto const height_at = [&](float U, float V) { return draped ? sample_heights(t.heights, U, V) + lift : flat; }; - drawlist->PushTextureID(reinterpret_cast(textureid)); + drawlist->PushTextureID((ImTextureID)(intptr_t)(textureid)); for (int j = 0; j < segments; ++j) for (int i = 0; i < segments; ++i) { diff --git a/imgui/ImGuizmo.cpp b/imgui/ImGuizmo.cpp index 41caa41a4..15e714998 100644 --- a/imgui/ImGuizmo.cpp +++ b/imgui/ImGuizmo.cpp @@ -24,10 +24,11 @@ // SOFTWARE. // -#include "imgui.h" +// imgui 1.86+ wants the operators requested before the first include of imgui.h #ifndef IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS #endif +#include "imgui.h" #include "imgui_internal.h" #include "ImGuizmo.h" @@ -1883,7 +1884,7 @@ namespace ImGuizmo // move if (gContext.mbUsing && (gContext.mActualID == -1 || gContext.mActualID == gContext.mEditingID) && IsTranslateType(gContext.mCurrentOperation)) { - ImGui::CaptureMouseFromApp(); + ImGui::SetNextFrameWantCaptureMouse(true); const float len = fabsf(IntersectRayPlane(gContext.mRayOrigin, gContext.mRayVector, gContext.mTranslationPlan)); // near plan vec_t newPos = gContext.mRayOrigin + gContext.mRayVector * len; @@ -1953,7 +1954,7 @@ namespace ImGuizmo type = GetMoveType(op, &gizmoHitProportion); if (type != MT_NONE) { - ImGui::CaptureMouseFromApp(); + ImGui::SetNextFrameWantCaptureMouse(true); } if (CanActivate() && type != MT_NONE) { @@ -1998,7 +1999,7 @@ namespace ImGuizmo type = GetScaleType(op); if (type != MT_NONE) { - ImGui::CaptureMouseFromApp(); + ImGui::SetNextFrameWantCaptureMouse(true); } if (CanActivate() && type != MT_NONE) { @@ -2021,7 +2022,7 @@ namespace ImGuizmo // scale if (gContext.mbUsing && (gContext.mActualID == -1 || gContext.mActualID == gContext.mEditingID) && IsScaleType(gContext.mCurrentOperation)) { - ImGui::CaptureMouseFromApp(); + ImGui::SetNextFrameWantCaptureMouse(true); const float len = IntersectRayPlane(gContext.mRayOrigin, gContext.mRayVector, gContext.mTranslationPlan); vec_t newPos = gContext.mRayOrigin + gContext.mRayVector * len; vec_t newOrigin = newPos - gContext.mRelativeOrigin * gContext.mScreenFactor; @@ -2112,7 +2113,7 @@ namespace ImGuizmo if (type != MT_NONE) { - ImGui::CaptureMouseFromApp(); + ImGui::SetNextFrameWantCaptureMouse(true); } if (type == MT_ROTATE_SCREEN) @@ -2146,7 +2147,7 @@ namespace ImGuizmo // rotation if (gContext.mbUsing && (gContext.mActualID == -1 || gContext.mActualID == gContext.mEditingID) && IsRotateType(gContext.mCurrentOperation)) { - ImGui::CaptureMouseFromApp(); + ImGui::SetNextFrameWantCaptureMouse(true); gContext.mRotationAngle = ComputeAngleOnPlan(); if (snap) { diff --git a/imgui/LICENSE.txt b/imgui/LICENSE.txt index 3b439aa49..00ae473ab 100644 --- a/imgui/LICENSE.txt +++ b/imgui/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014-2019 Omar Cornut +Copyright (c) 2014-2025 Omar Cornut Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/imgui/imconfig.h b/imgui/imconfig.h index 4962ce4e5..a29296e7b 100644 --- a/imgui/imconfig.h +++ b/imgui/imconfig.h @@ -1,96 +1,144 @@ //----------------------------------------------------------------------------- -// COMPILE-TIME OPTIONS FOR DEAR IMGUI +// DEAR IMGUI COMPILE-TIME OPTIONS // Runtime options (clipboard callbacks, enabling various features, etc.) can generally be set via the ImGuiIO structure. // You can use ImGui::SetAllocatorFunctions() before calling ImGui::CreateContext() to rewire memory allocation functions. //----------------------------------------------------------------------------- -// A) You may edit imconfig.h (and not overwrite it when updating Dear ImGui, or maintain a patch/branch with your modifications to imconfig.h) -// B) or add configuration directives in your own file and compile with #define IMGUI_USER_CONFIG "myfilename.h" -// If you do so you need to make sure that configuration settings are defined consistently _everywhere_ Dear ImGui is used, which include -// the imgui*.cpp files but also _any_ of your code that uses Dear ImGui. This is because some compile-time options have an affect on data structures. +// A) You may edit imconfig.h (and not overwrite it when updating Dear ImGui, or maintain a patch/rebased branch with your modifications to it) +// B) or '#define IMGUI_USER_CONFIG "my_imgui_config.h"' in your project and then add directives in your own file without touching this template. +//----------------------------------------------------------------------------- +// You need to make sure that configuration settings are defined consistently _everywhere_ Dear ImGui is used, which include the imgui*.cpp +// files but also _any_ of your code that uses Dear ImGui. This is because some compile-time options have an affect on data structures. // Defining those options in imconfig.h will ensure every compilation unit gets to see the same data structure layouts. -// Call IMGUI_CHECKVERSION() from your .cpp files to verify that the data structures your files are using are matching the ones imgui.cpp is using. +// Call IMGUI_CHECKVERSION() from your .cpp file to verify that the data structures your files are using are matching the ones imgui.cpp is using. //----------------------------------------------------------------------------- #pragma once //---- Define assertion handler. Defaults to calling assert(). +// If your macro uses multiple statements, make sure is enclosed in a 'do { .. } while (0)' block so it can be used as a single statement. //#define IM_ASSERT(_EXPR) MyAssert(_EXPR) //#define IM_ASSERT(_EXPR) ((void)(_EXPR)) // Disable asserts //---- Define attributes of all API symbols declarations, e.g. for DLL under Windows -// Using dear imgui via a shared library is not recommended, because of function call overhead and because we don't guarantee backward nor forward ABI compatibility. -//#define IMGUI_API __declspec( dllexport ) -//#define IMGUI_API __declspec( dllimport ) +// Using Dear ImGui via a shared library is not recommended, because of function call overhead and because we don't guarantee backward nor forward ABI compatibility. +// - Windows DLL users: heaps and globals are not shared across DLL boundaries! You will need to call SetCurrentContext() + SetAllocatorFunctions() +// for each static/DLL boundary you are calling from. Read "Context and Memory Allocators" section of imgui.cpp for more details. +//#define IMGUI_API __declspec(dllexport) // MSVC Windows: DLL export +//#define IMGUI_API __declspec(dllimport) // MSVC Windows: DLL import +//#define IMGUI_API __attribute__((visibility("default"))) // GCC/Clang: override visibility when set is hidden -//---- Don't define obsolete functions/enums names. Consider enabling from time to time after updating to avoid using soon-to-be obsolete function/names. +//---- Don't define obsolete functions/enums/behaviors. Consider enabling from time to time after updating to clean your code of obsolete function/names. //#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS -//---- Don't implement demo windows functionality (ShowDemoWindow()/ShowStyleEditor()/ShowUserGuide() methods will be empty) -// It is very strongly recommended to NOT disable the demo windows during development. Please read the comments in imgui_demo.cpp. -//#define IMGUI_DISABLE_DEMO_WINDOWS -//#define IMGUI_DISABLE_METRICS_WINDOW +//---- Disable all of Dear ImGui or don't implement standard windows/tools. +// It is very strongly recommended to NOT disable the demo windows and debug tool during development. They are extremely useful in day to day work. Please read comments in imgui_demo.cpp. +//#define IMGUI_DISABLE // Disable everything: all headers and source files will be empty. +//#define IMGUI_DISABLE_DEMO_WINDOWS // Disable demo windows: ShowDemoWindow()/ShowStyleEditor() will be empty. +//#define IMGUI_DISABLE_DEBUG_TOOLS // Disable metrics/debugger and other debug tools: ShowMetricsWindow(), ShowDebugLogWindow() and ShowIDStackToolWindow() will be empty. //---- Don't implement some functions to reduce linkage requirements. -//#define IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS // [Win32] Don't implement default clipboard handler. Won't use and link with OpenClipboard/GetClipboardData/CloseClipboard etc. -//#define IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS // [Win32] Don't implement default IME handler. Won't use and link with ImmGetContext/ImmSetCompositionWindow. -//#define IMGUI_DISABLE_WIN32_FUNCTIONS // [Win32] Won't use and link with any Win32 function (clipboard, ime). -//#define IMGUI_ENABLE_OSX_DEFAULT_CLIPBOARD_FUNCTIONS // [OSX] Implement default OSX clipboard handler (need to link with '-framework ApplicationServices'). -//#define IMGUI_DISABLE_FORMAT_STRING_FUNCTIONS // Don't implement ImFormatString/ImFormatStringV so you can implement them yourself if you don't want to link with vsnprintf. -//#define IMGUI_DISABLE_MATH_FUNCTIONS // Don't implement ImFabs/ImSqrt/ImPow/ImFmod/ImCos/ImSin/ImAcos/ImAtan2 wrapper so you can implement them yourself. Declare your prototypes in imconfig.h. +//#define IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS // [Win32] Don't implement default clipboard handler. Won't use and link with OpenClipboard/GetClipboardData/CloseClipboard etc. (user32.lib/.a, kernel32.lib/.a) +//#define IMGUI_ENABLE_WIN32_DEFAULT_IME_FUNCTIONS // [Win32] [Default with Visual Studio] Implement default IME handler (require imm32.lib/.a, auto-link for Visual Studio, -limm32 on command-line for MinGW) +//#define IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS // [Win32] [Default with non-Visual Studio compilers] Don't implement default IME handler (won't require imm32.lib/.a) +//#define IMGUI_DISABLE_WIN32_FUNCTIONS // [Win32] Won't use and link with any Win32 function (clipboard, IME). +//#define IMGUI_ENABLE_OSX_DEFAULT_CLIPBOARD_FUNCTIONS // [OSX] Implement default OSX clipboard handler (need to link with '-framework ApplicationServices', this is why this is not the default). +//#define IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS // Don't implement default platform_io.Platform_OpenInShellFn() handler (Win32: ShellExecute(), require shell32.lib/.a, Mac/Linux: use system("")). +//#define IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS // Don't implement ImFormatString/ImFormatStringV so you can implement them yourself (e.g. if you don't want to link with vsnprintf) +//#define IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS // Don't implement ImFabs/ImSqrt/ImPow/ImFmod/ImCos/ImSin/ImAcos/ImAtan2 so you can implement them yourself. +//#define IMGUI_DISABLE_FILE_FUNCTIONS // Don't implement ImFileOpen/ImFileClose/ImFileRead/ImFileWrite and ImFileHandle at all (replace them with dummies) +//#define IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS // Don't implement ImFileOpen/ImFileClose/ImFileRead/ImFileWrite and ImFileHandle so you can implement them yourself if you don't want to link with fopen/fclose/fread/fwrite. This will also disable the LogToTTY() function. //#define IMGUI_DISABLE_DEFAULT_ALLOCATORS // Don't implement default allocators calling malloc()/free() to avoid linking with them. You will need to call ImGui::SetAllocatorFunctions(). +//#define IMGUI_DISABLE_DEFAULT_FONT // Disable default embedded font (ProggyClean.ttf), remove ~9.5 KB from output binary. AddFontDefault() will assert. +//#define IMGUI_DISABLE_SSE // Disable use of SSE intrinsics even if available + +//---- Enable Test Engine / Automation features. +//#define IMGUI_ENABLE_TEST_ENGINE // Enable imgui_test_engine hooks. Generally set automatically by include "imgui_te_config.h", see Test Engine for details. //---- Include imgui_user.h at the end of imgui.h as a convenience +// May be convenient for some users to only explicitly include vanilla imgui.h and have extra stuff included. //#define IMGUI_INCLUDE_IMGUI_USER_H +//#define IMGUI_USER_H_FILENAME "my_folder/my_imgui_user.h" -//---- Pack colors to BGRA8 instead of RGBA8 (to avoid converting from one to another) +//---- Pack vertex colors as BGRA8 instead of RGBA8 (to avoid converting from one to another). Need dedicated backend support. //#define IMGUI_USE_BGRA_PACKED_COLOR +//---- Use legacy CRC32-adler tables (used before 1.91.6), in order to preserve old .ini data that you cannot afford to invalidate. +//#define IMGUI_USE_LEGACY_CRC32_ADLER + +//---- Use 32-bit for ImWchar (default is 16-bit) to support Unicode planes 1-16. (e.g. point beyond 0xFFFF like emoticons, dingbats, symbols, shapes, ancient languages, etc...) +//#define IMGUI_USE_WCHAR32 + //---- Avoid multiple STB libraries implementations, or redefine path/filenames to prioritize another version -// By default the embedded implementations are declared static and not available outside of imgui cpp files. +// By default the embedded implementations are declared static and not available outside of Dear ImGui sources files. //#define IMGUI_STB_TRUETYPE_FILENAME "my_folder/stb_truetype.h" //#define IMGUI_STB_RECT_PACK_FILENAME "my_folder/stb_rect_pack.h" +//#define IMGUI_STB_SPRINTF_FILENAME "my_folder/stb_sprintf.h" // only used if IMGUI_USE_STB_SPRINTF is defined. //#define IMGUI_DISABLE_STB_TRUETYPE_IMPLEMENTATION //#define IMGUI_DISABLE_STB_RECT_PACK_IMPLEMENTATION +//#define IMGUI_DISABLE_STB_SPRINTF_IMPLEMENTATION // only disabled if IMGUI_USE_STB_SPRINTF is defined. + +//---- Use stb_sprintf.h for a faster implementation of vsnprintf instead of the one from libc (unless IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS is defined) +// Compatibility checks of arguments and formats done by clang and GCC will be disabled in order to support the extra formats provided by stb_sprintf.h. +//#define IMGUI_USE_STB_SPRINTF + +//---- Use FreeType to build and rasterize the font atlas (instead of stb_truetype which is embedded by default in Dear ImGui) +// Requires FreeType headers to be available in the include path. Requires program to be compiled with 'misc/freetype/imgui_freetype.cpp' (in this repository) + the FreeType library (not provided). +// On Windows you may use vcpkg with 'vcpkg install freetype --triplet=x64-windows' + 'vcpkg integrate install'. +//#define IMGUI_ENABLE_FREETYPE + +//---- Use FreeType + plutosvg or lunasvg to render OpenType SVG fonts (SVGinOT) +// Only works in combination with IMGUI_ENABLE_FREETYPE. +// - plutosvg is currently easier to install, as e.g. it is part of vcpkg. It will support more fonts and may load them faster. See misc/freetype/README for instructions. +// - Both require headers to be available in the include path + program to be linked with the library code (not provided). +// - (note: lunasvg implementation is based on Freetype's rsvg-port.c which is licensed under CeCILL-C Free Software License Agreement) +//#define IMGUI_ENABLE_FREETYPE_PLUTOSVG +//#define IMGUI_ENABLE_FREETYPE_LUNASVG + +//---- Use stb_truetype to build and rasterize the font atlas (default) +// The only purpose of this define is if you want force compilation of the stb_truetype backend ALONG with the FreeType backend. +//#define IMGUI_ENABLE_STB_TRUETYPE //---- Define constructor and implicit cast operators to convert back<>forth between your math types and ImVec2/ImVec4. // This will be inlined as part of ImVec2 and ImVec4 class declarations. /* -#define IM_VEC2_CLASS_EXTRA \ - ImVec2(const MyVec2& f) { x = f.x; y = f.y; } \ +#define IM_VEC2_CLASS_EXTRA \ + constexpr ImVec2(const MyVec2& f) : x(f.x), y(f.y) {} \ operator MyVec2() const { return MyVec2(x,y); } -#define IM_VEC4_CLASS_EXTRA \ - ImVec4(const MyVec4& f) { x = f.x; y = f.y; z = f.z; w = f.w; } \ +#define IM_VEC4_CLASS_EXTRA \ + constexpr ImVec4(const MyVec4& f) : x(f.x), y(f.y), z(f.z), w(f.w) {} \ operator MyVec4() const { return MyVec4(x,y,z,w); } */ +//---- ...Or use Dear ImGui's own very basic math operators. +//#define IMGUI_DEFINE_MATH_OPERATORS -//---- Using 32-bits vertex indices (default is 16-bits) is one way to allow large meshes with more than 64K vertices. -// Your renderer back-end will need to support it (most example renderer back-ends support both 16/32-bits indices). -// Another way to allow large meshes while keeping 16-bits indices is to handle ImDrawCmd::VtxOffset in your renderer. +//---- Use 32-bit vertex indices (default is 16-bit) is one way to allow large meshes with more than 64K vertices. +// Your renderer backend will need to support it (most example renderer backends support both 16/32-bit indices). +// Another way to allow large meshes while keeping 16-bit indices is to handle ImDrawCmd::VtxOffset in your renderer. // Read about ImGuiBackendFlags_RendererHasVtxOffset for details. //#define ImDrawIdx unsigned int -//---- Override ImDrawCallback signature (will need to modify renderer back-ends accordingly) +//---- Override ImDrawCallback signature (will need to modify renderer backends accordingly) //struct ImDrawList; //struct ImDrawCmd; //typedef void (*MyImDrawCallback)(const ImDrawList* draw_list, const ImDrawCmd* cmd, void* my_renderer_user_data); //#define ImDrawCallback MyImDrawCallback -//---- Debug Tools -// Use 'Metrics->Tools->Item Picker' to pick widgets with the mouse and break into them for easy debugging. +//---- Debug Tools: Macro to break in Debugger (we provide a default implementation of this in the codebase) +// (use 'Metrics->Tools->Item Picker' to pick widgets with the mouse and break into them for easy debugging.) //#define IM_DEBUG_BREAK IM_ASSERT(0) //#define IM_DEBUG_BREAK __debugbreak() -// Have the Item Picker break in the ItemAdd() function instead of ItemHoverable() - which is earlier in the code, will catch a few extra items, allow picking items other than Hovered one. -// This adds a small runtime cost which is why it is not enabled by default. -//#define IMGUI_DEBUG_TOOL_ITEM_PICKER_EX -//---- Tip: You can add extra functions within the ImGui:: namespace, here or in your own headers files. +//---- Debug Tools: Enable slower asserts +//#define IMGUI_DEBUG_PARANOID + +//---- Tip: You can add extra functions within the ImGui:: namespace from anywhere (e.g. your own sources/header files) /* namespace ImGui { - void MyFunction(const char* name, const MyMatrix44& v); + void MyFunction(const char* name, MyMatrix44* mtx); } */ -#define IMGUI_IMPL_OPENGL_LOADER_GLAD -//#define IMGUI_IMPL_OPENGL_ES3 +// MaSzyna: the opengl3 backend uses glad, loaded by the simulator, instead of its own gl3w loader +#define IMGUI_IMPL_OPENGL_LOADER_CUSTOM diff --git a/imgui/imgui.cpp b/imgui/imgui.cpp index 93b15ddb9..573efe244 100644 --- a/imgui/imgui.cpp +++ b/imgui/imgui.cpp @@ -1,18 +1,37 @@ -// dear imgui, v1.73 +// dear imgui, v1.91.9b // (main code and documentation) -// Call and read ImGui::ShowDemoWindow() in imgui_demo.cpp for demo code. -// Newcomers, read 'Programmer guide' below for notes on how to setup Dear ImGui in your codebase. -// Get latest version at https://github.com/ocornut/imgui -// Releases change-log at https://github.com/ocornut/imgui/releases -// Technical Support for Getting Started https://discourse.dearimgui.org/c/getting-started -// Gallery (please post your screenshots/video there!): https://github.com/ocornut/imgui/issues/2529 +// Help: +// - See links below. +// - Call and read ImGui::ShowDemoWindow() in imgui_demo.cpp. All applications in examples/ are doing that. +// - Read top of imgui.cpp for more details, links and comments. +// Resources: +// - FAQ ........................ https://dearimgui.com/faq (in repository as docs/FAQ.md) +// - Homepage ................... https://github.com/ocornut/imgui +// - Releases & changelog ....... https://github.com/ocornut/imgui/releases +// - Gallery .................... https://github.com/ocornut/imgui/issues?q=label%3Agallery (please post your screenshots/video there!) +// - Wiki ....................... https://github.com/ocornut/imgui/wiki (lots of good stuff there) +// - Getting Started https://github.com/ocornut/imgui/wiki/Getting-Started (how to integrate in an existing app by adding ~25 lines of code) +// - Third-party Extensions https://github.com/ocornut/imgui/wiki/Useful-Extensions (ImPlot & many more) +// - Bindings/Backends https://github.com/ocornut/imgui/wiki/Bindings (language bindings, backends for various tech/engines) +// - Glossary https://github.com/ocornut/imgui/wiki/Glossary +// - Debug Tools https://github.com/ocornut/imgui/wiki/Debug-Tools +// - Software using Dear ImGui https://github.com/ocornut/imgui/wiki/Software-using-dear-imgui +// - Issues & support ........... https://github.com/ocornut/imgui/issues +// - Test Engine & Automation ... https://github.com/ocornut/imgui_test_engine (test suite, test engine to automate your apps) + +// For first-time users having issues compiling/linking/running/loading fonts: +// please post in https://github.com/ocornut/imgui/discussions if you cannot find a solution in resources above. +// Everything else should be asked in 'Issues'! We are building a database of cross-linked knowledge there. + +// Copyright (c) 2014-2025 Omar Cornut // Developed by Omar Cornut and every direct or indirect contributors to the GitHub. // See LICENSE.txt for copyright and licensing details (standard MIT License). -// This library is free but I need your support to sustain development and maintenance. -// Businesses: you can support continued maintenance and development via support contracts or sponsoring, see docs/README. -// Individuals: you can support continued maintenance and development via donations or Patreon https://www.patreon.com/imgui. +// This library is free but needs your support to sustain development and maintenance. +// Businesses: you can support continued development via B2B invoiced technical support, maintenance and sponsoring contracts. +// PLEASE reach out at omar AT dearimgui DOT com. See https://github.com/ocornut/imgui/wiki/Funding +// Businesses: you can also purchase licenses for the Dear ImGui Automation/Test Engine. // It is recommended that you don't modify imgui.cpp! It will become difficult for you to update the library. // Note that 'ImGui::' being a namespace, you can add functions into the namespace from your own source files, without @@ -27,60 +46,57 @@ Index of this file: DOCUMENTATION - MISSION STATEMENT -- END-USER GUIDE -- PROGRAMMER GUIDE (read me!) - - Read first. - - How to update to a newer version of Dear ImGui. - - Getting started with integrating Dear ImGui in your code/engine. - - This is how a simple application may look like (2 variations). - - This is how a simple rendering function may look like. - - Using gamepad/keyboard navigation controls. +- CONTROLS GUIDE +- PROGRAMMER GUIDE + - READ FIRST + - HOW TO UPDATE TO A NEWER VERSION OF DEAR IMGUI + - GETTING STARTED WITH INTEGRATING DEAR IMGUI IN YOUR CODE/ENGINE + - HOW A SIMPLE APPLICATION MAY LOOK LIKE + - HOW A SIMPLE RENDERING FUNCTION MAY LOOK LIKE - API BREAKING CHANGES (read me when you update!) -- FREQUENTLY ASKED QUESTIONS (FAQ), TIPS - - Where is the documentation? - - Which version should I get? - - Who uses Dear ImGui? - - Why the odd dual naming, "Dear ImGui" vs "ImGui"? - - How can I tell whether to dispatch mouse/keyboard to imgui or to my application? - - How can I display an image? What is ImTextureID, how does it works? - - Why are multiple widgets reacting when I interact with a single one? How can I have - multiple widgets with the same label or with an empty label? A primer on labels and the ID Stack... - - How can I use my own math types instead of ImVec2/ImVec4? - - How can I load a different font than the default? - - How can I easily use icons in my application? - - How can I load multiple fonts? - - How can I display and input non-latin characters such as Chinese, Japanese, Korean, Cyrillic? - - How can I interact with standard C++ types (such as std::string and std::vector)? - - How can I use the drawing facilities without a Dear ImGui window? (using ImDrawList API) - - How can I use Dear ImGui on a platform that doesn't have a mouse or a keyboard? (input share, remoting, gamepad) - - I integrated Dear ImGui in my engine and the text or lines are blurry.. - - I integrated Dear ImGui in my engine and some elements are clipping or disappearing when I move windows around.. - - How can I help? +- FREQUENTLY ASKED QUESTIONS (FAQ) + - Read all answers online: https://www.dearimgui.com/faq, or in docs/FAQ.md (with a Markdown viewer) CODE (search for "[SECTION]" in the code to find them) +// [SECTION] INCLUDES // [SECTION] FORWARD DECLARATIONS // [SECTION] CONTEXT AND MEMORY ALLOCATORS -// [SECTION] MAIN USER FACING STRUCTURES (ImGuiStyle, ImGuiIO) -// [SECTION] MISC HELPERS/UTILITIES (Maths, String, Format, Hash, File functions) +// [SECTION] USER FACING STRUCTURES (ImGuiStyle, ImGuiIO, ImGuiPlatformIO) +// [SECTION] MISC HELPERS/UTILITIES (Geometry functions) +// [SECTION] MISC HELPERS/UTILITIES (String, Format, Hash functions) +// [SECTION] MISC HELPERS/UTILITIES (File functions) // [SECTION] MISC HELPERS/UTILITIES (ImText* functions) // [SECTION] MISC HELPERS/UTILITIES (Color functions) // [SECTION] ImGuiStorage // [SECTION] ImGuiTextFilter -// [SECTION] ImGuiTextBuffer +// [SECTION] ImGuiTextBuffer, ImGuiTextIndex // [SECTION] ImGuiListClipper +// [SECTION] STYLING // [SECTION] RENDER HELPERS +// [SECTION] INITIALIZATION, SHUTDOWN // [SECTION] MAIN CODE (most of the code! lots of stuff, needs tidying up!) +// [SECTION] ID STACK +// [SECTION] INPUTS +// [SECTION] ERROR CHECKING, STATE RECOVERY +// [SECTION] ITEM SUBMISSION +// [SECTION] LAYOUT // [SECTION] SCROLLING // [SECTION] TOOLTIPS // [SECTION] POPUPS +// [SECTION] WINDOW FOCUS // [SECTION] KEYBOARD/GAMEPAD NAVIGATION // [SECTION] DRAG AND DROP // [SECTION] LOGGING/CAPTURING // [SECTION] SETTINGS +// [SECTION] LOCALIZATION +// [SECTION] VIEWPORTS, PLATFORM WINDOWS +// [SECTION] DOCKING // [SECTION] PLATFORM DEPENDENT HELPERS -// [SECTION] METRICS/DEBUG WINDOW +// [SECTION] METRICS/DEBUGGER WINDOW +// [SECTION] DEBUG LOG WINDOW +// [SECTION] OTHER DEBUG TOOLS (ITEM PICKER, ID STACK TOOL) */ @@ -96,92 +112,169 @@ CODE - Easy to use to create code-driven and data-driven tools. - Easy to use to create ad hoc short-lived tools and long-lived, more elaborate tools. - Easy to hack and improve. - - Minimize screen real-estate usage. - Minimize setup and maintenance. - Minimize state storage on user side. + - Minimize state synchronization. - Portable, minimize dependencies, run on target (consoles, phones, etc.). - - Efficient runtime and memory consumption (NB- we do allocate when "growing" content e.g. creating a window,. - opening a tree node for the first time, etc. but a typical frame should not allocate anything). + - Efficient runtime and memory consumption. - Designed for developers and content-creators, not the typical end-user! Some of the weaknesses includes: - - Doesn't look fancy, doesn't animate. + Designed primarily for developers and content-creators, not the typical end-user! + Some of the current weaknesses (which we aim to address in the future) includes: + + - Doesn't look fancy. - Limited layout features, intricate layouts are typically crafted in code. - END-USER GUIDE + CONTROLS GUIDE ============== - - Double-click on title bar to collapse window. - - Click upper right corner to close a window, available when 'bool* p_open' is passed to ImGui::Begin(). - - Click and drag on lower right corner to resize window (double-click to auto fit window to its contents). - - Click and drag on any empty space to move window. - - TAB/SHIFT+TAB to cycle through keyboard editable fields. - - CTRL+Click on a slider or drag box to input value as text. - - Use mouse wheel to scroll. - - Text editor: - - Hold SHIFT or use mouse to select text. - - CTRL+Left/Right to word jump. - - CTRL+Shift+Left/Right to select words. - - CTRL+A our Double-Click to select all. - - CTRL+X,CTRL+C,CTRL+V to use OS clipboard/ - - CTRL+Z,CTRL+Y to undo/redo. - - ESCAPE to revert text to its original value. - - You can apply arithmetic operators +,*,/ on numerical values. Use +- to subtract (because - would set a negative value!) - - Controls are automatically adjusted for OSX to match standard OSX text editing operations. - - General Keyboard controls: enable with ImGuiConfigFlags_NavEnableKeyboard. - - General Gamepad controls: enable with ImGuiConfigFlags_NavEnableGamepad. See suggested mappings in imgui.h ImGuiNavInput_ + download PNG/PSD at http://goo.gl/9LgVZW + - MOUSE CONTROLS + - Mouse wheel: Scroll vertically. + - SHIFT+Mouse wheel: Scroll horizontally. + - Click [X]: Close a window, available when 'bool* p_open' is passed to ImGui::Begin(). + - Click ^, Double-Click title: Collapse window. + - Drag on corner/border: Resize window (double-click to auto fit window to its contents). + - Drag on any empty space: Move window (unless io.ConfigWindowsMoveFromTitleBarOnly = true). + - Left-click outside popup: Close popup stack (right-click over underlying popup: Partially close popup stack). + + - TEXT EDITOR + - Hold SHIFT or Drag Mouse: Select text. + - CTRL+Left/Right: Word jump. + - CTRL+Shift+Left/Right: Select words. + - CTRL+A or Double-Click: Select All. + - CTRL+X, CTRL+C, CTRL+V: Use OS clipboard. + - CTRL+Z Undo. + - CTRL+Y or CTRL+Shift+Z: Redo. + - ESCAPE: Revert text to its original value. + - On OSX, controls are automatically adjusted to match standard OSX text editing 2ts and behaviors. + + - KEYBOARD CONTROLS + - Basic: + - Tab, SHIFT+Tab Cycle through text editable fields. + - CTRL+Tab, CTRL+Shift+Tab Cycle through windows. + - CTRL+Click Input text into a Slider or Drag widget. + - Extended features with `io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard`: + - Tab, SHIFT+Tab: Cycle through every items. + - Arrow keys Move through items using directional navigation. Tweak value. + - Arrow keys + Alt, Shift Tweak slower, tweak faster (when using arrow keys). + - Enter Activate item (prefer text input when possible). + - Space Activate item (prefer tweaking with arrows when possible). + - Escape Deactivate item, leave child window, close popup. + - Page Up, Page Down Previous page, next page. + - Home, End Scroll to top, scroll to bottom. + - Alt Toggle between scrolling layer and menu layer. + - CTRL+Tab then Ctrl+Arrows Move window. Hold SHIFT to resize instead of moving. + - Output when ImGuiConfigFlags_NavEnableKeyboard set, + - io.WantCaptureKeyboard flag is set when keyboard is claimed. + - io.NavActive: true when a window is focused and it doesn't have the ImGuiWindowFlags_NoNavInputs flag set. + - io.NavVisible: true when the navigation cursor is visible (usually goes to back false when mouse is used). + + - GAMEPAD CONTROLS + - Enable with 'io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad'. + - Particularly useful to use Dear ImGui on a console system (e.g. PlayStation, Switch, Xbox) without a mouse! + - Download controller mapping PNG/PSD at http://dearimgui.com/controls_sheets + - Backend support: backend needs to: + - Set 'io.BackendFlags |= ImGuiBackendFlags_HasGamepad' + call io.AddKeyEvent/AddKeyAnalogEvent() with ImGuiKey_Gamepad_XXX keys. + - For analog values (0.0f to 1.0f), backend is responsible to handling a dead-zone and rescaling inputs accordingly. + Backend code will probably need to transform your raw inputs (such as e.g. remapping your 0.2..0.9 raw input range to 0.0..1.0 imgui range, etc.). + - If you need to share inputs between your game and the Dear ImGui interface, the easiest approach is to go all-or-nothing, + with a buttons combo to toggle the target. Please reach out if you think the game vs navigation input sharing could be improved. + + - REMOTE INPUTS SHARING & MOUSE EMULATION + - PS4/PS5 users: Consider emulating a mouse cursor with DualShock touch pad or a spare analog stick as a mouse-emulation fallback. + - Consoles/Tablet/Phone users: Consider using a Synergy 1.x server (on your PC) + run examples/libs/synergy/uSynergy.c (on your console/tablet/phone app) + in order to share your PC mouse/keyboard. + - See https://github.com/ocornut/imgui/wiki/Useful-Extensions#remoting for other remoting solutions. + - On a TV/console system where readability may be lower or mouse inputs may be awkward, you may want to set the io.ConfigNavMoveSetMousePos flag. + Enabling io.ConfigNavMoveSetMousePos + ImGuiBackendFlags_HasSetMousePos instructs Dear ImGui to move your mouse cursor along with navigation movements. + When enabled, the NewFrame() function may alter 'io.MousePos' and set 'io.WantSetMousePos' to notify you that it wants the mouse cursor to be moved. + When that happens your backend NEEDS to move the OS or underlying mouse cursor on the next frame. Some of the backends in examples/ do that. + (If you set the NavEnableSetMousePos flag but don't honor 'io.WantSetMousePos' properly, Dear ImGui will misbehave as it will see your mouse moving back & forth!) + (In a setup when you may not have easy control over the mouse cursor, e.g. uSynergy.c doesn't expose moving remote mouse cursor, you may want + to set a boolean to ignore your other external mouse positions until the external source is moved again.) PROGRAMMER GUIDE ================ - READ FIRST: - - - Read the FAQ below this section! - - Your code creates the UI, if your code doesn't run the UI is gone! The UI can be highly dynamic, there are no construction - or destruction steps, less superfluous data retention on your side, less state duplication, less state synchronization, less bugs. + READ FIRST + ---------- + - Remember to check the wonderful Wiki (https://github.com/ocornut/imgui/wiki) + - Your code creates the UI every frame of your application loop, if your code doesn't run the UI is gone! + The UI can be highly dynamic, there are no construction or destruction steps, less superfluous + data retention on your side, less state duplication, less state synchronization, fewer bugs. - Call and read ImGui::ShowDemoWindow() for demo code demonstrating most features. + Or browse https://pthom.github.io/imgui_manual_online/manual/imgui_manual.html for interactive web version. - The library is designed to be built from sources. Avoid pre-compiled binaries and packaged versions. See imconfig.h to configure your build. - Dear ImGui is an implementation of the IMGUI paradigm (immediate-mode graphical user interface, a term coined by Casey Muratori). - You can learn about IMGUI principles at http://www.johno.se/book/imgui.html, http://mollyrocket.com/861 & more links docs/README.md. + You can learn about IMGUI principles at http://www.johno.se/book/imgui.html, http://mollyrocket.com/861 & more links in Wiki. - Dear ImGui is a "single pass" rasterizing implementation of the IMGUI paradigm, aimed at ease of use and high-performances. - For every application frame your UI code will be called only once. This is in contrast to e.g. Unity's own implementation of an IMGUI, + For every application frame, your UI code will be called only once. This is in contrast to e.g. Unity's implementation of an IMGUI, where the UI code is called multiple times ("multiple passes") from a single entry point. There are pros and cons to both approaches. - - Our origin are on the top-left. In axis aligned bounding boxes, Min = top-left, Max = bottom-right. - - This codebase is also optimized to yield decent performances with typical "Debug" builds settings. + - Our origin is on the top-left. In axis aligned bounding boxes, Min = top-left, Max = bottom-right. - Please make sure you have asserts enabled (IM_ASSERT redirects to assert() by default, but can be redirected). If you get an assert, read the messages and comments around the assert. - - C++: this is a very C-ish codebase: we don't rely on C++11, we don't include any C++ headers, and ImGui:: is a namespace. - - C++: ImVec2/ImVec4 do not expose math operators by default, because it is expected that you use your own math types. - See FAQ "How can I use my own math types instead of ImVec2/ImVec4?" for details about setting up imconfig.h for that. - However, imgui_internal.h can optionally export math operators for ImVec2/ImVec4, which we use in this codebase. - - C++: pay attention that ImVector<> manipulates plain-old-data and does not honor construction/destruction (avoid using it in your code!). + - This codebase aims to be highly optimized: + - A typical idle frame should never call malloc/free. + - We rely on a maximum of constant-time or O(N) algorithms. Limiting searches/scans as much as possible. + - We put particular energy in making sure performances are decent with typical "Debug" build settings as well. + Which mean we tend to avoid over-relying on "zero-cost abstraction" as they aren't zero-cost at all. + - This codebase aims to be both highly opinionated and highly flexible: + - This code works because of the things it choose to solve or not solve. + - C++: this is a pragmatic C-ish codebase: we don't use fancy C++ features, we don't include C++ headers, + and ImGui:: is a namespace. We rarely use member functions (and when we did, I am mostly regretting it now). + This is to increase compatibility, increase maintainability and facilitate use from other languages. + - C++: ImVec2/ImVec4 do not expose math operators by default, because it is expected that you use your own math types. + See FAQ "How can I use my own math types instead of ImVec2/ImVec4?" for details about setting up imconfig.h for that. + We can can optionally export math operators for ImVec2/ImVec4 using IMGUI_DEFINE_MATH_OPERATORS, which we use internally. + - C++: pay attention that ImVector<> manipulates plain-old-data and does not honor construction/destruction + (so don't use ImVector in your code or at our own risk!). + - Building: We don't use nor mandate a build system for the main library. + This is in an effort to ensure that it works in the real world aka with any esoteric build setup. + This is also because providing a build system for the main library would be of little-value. + The build problems are almost never coming from the main library but from specific backends. - HOW TO UPDATE TO A NEWER VERSION OF DEAR IMGUI: - - Overwrite all the sources files except for imconfig.h (if you have made modification to your copy of imconfig.h) - - Or maintain your own branch where you have imconfig.h modified. + HOW TO UPDATE TO A NEWER VERSION OF DEAR IMGUI + ---------------------------------------------- + - Update submodule or copy/overwrite every file. + - About imconfig.h: + - You may modify your copy of imconfig.h, in this case don't overwrite it. + - or you may locally branch to modify imconfig.h and merge/rebase latest. + - or you may '#define IMGUI_USER_CONFIG "my_config_file.h"' globally from your build system to + specify a custom path for your imconfig.h file and instead not have to modify the default one. + + - Overwrite all the sources files except for imconfig.h (if you have modified your copy of imconfig.h) + - Or maintain your own branch where you have imconfig.h modified as a top-most commit which you can regularly rebase over "master". + - You can also use '#define IMGUI_USER_CONFIG "my_config_file.h" to redirect configuration to your own file. - Read the "API BREAKING CHANGES" section (below). This is where we list occasional API breaking changes. If a function/type has been renamed / or marked obsolete, try to fix the name in your code before it is permanently removed from the public API. If you have a problem with a missing function/symbols, search for its name in the code, there will likely be a comment about it. Please report any issue to the GitHub page! - - Try to keep your copy of dear imgui reasonably up to date. + - To find out usage of old API, you can add '#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS' in your configuration file. + - Try to keep your copy of Dear ImGui reasonably up to date! - GETTING STARTED WITH INTEGRATING DEAR IMGUI IN YOUR CODE/ENGINE: + GETTING STARTED WITH INTEGRATING DEAR IMGUI IN YOUR CODE/ENGINE + --------------------------------------------------------------- + - See https://github.com/ocornut/imgui/wiki/Getting-Started. - Run and study the examples and demo in imgui_demo.cpp to get acquainted with the library. - - Add the Dear ImGui source files to your projects or using your preferred build system. - It is recommended you build and statically link the .cpp files as part of your project and not as shared library (DLL). + - In the majority of cases you should be able to use unmodified backends files available in the backends/ folder. + - Add the Dear ImGui source files + selected backend source files to your projects or using your preferred build system. + It is recommended you build and statically link the .cpp files as part of your project and NOT as a shared library (DLL). - You can later customize the imconfig.h file to tweak some compile-time behavior, such as integrating Dear ImGui types with your own maths types. - When using Dear ImGui, your programming IDE is your friend: follow the declaration of variables, functions and types to find comments about them. - Dear ImGui never touches or knows about your GPU state. The only function that knows about GPU is the draw function that you provide. Effectively it means you can create widgets at any time in your code, regardless of considerations of being in "update" vs "render" - phases of your own application. All rendering information are stored into command-lists that you will retrieve after calling ImGui::Render(). - - Refer to the bindings and demo applications in the examples/ folder for instruction on how to setup your code. + phases of your own application. All rendering information is stored into command-lists that you will retrieve after calling ImGui::Render(). + - Refer to the backends and demo applications in the examples/ folder for instruction on how to setup your code. - If you are running over a standard OS with a common graphics API, you should be able to use unmodified imgui_impl_*** files from the examples/ folder. - HOW A SIMPLE APPLICATION MAY LOOK LIKE: - EXHIBIT 1: USING THE EXAMPLE BINDINGS (imgui_impl_XXX.cpp files from the examples/ folder). + + HOW A SIMPLE APPLICATION MAY LOOK LIKE + -------------------------------------- + EXHIBIT 1: USING THE EXAMPLE BACKENDS (= imgui_impl_XXX.cpp files from the backends/ folder). + The sub-folders in examples/ contain examples applications following this structure. // Application init: create a dear imgui context, setup some options, load fonts ImGui::CreateContext(); @@ -190,7 +283,7 @@ CODE // TODO: Fill optional fields of the io structure later. // TODO: Load TTF/OTF fonts if you don't want to use the default font. - // Initialize helper Platform and Renderer bindings (here we are using imgui_impl_win32 and imgui_impl_dx11) + // Initialize helper Platform and Renderer backends (here we are using imgui_impl_win32.cpp and imgui_impl_dx11.cpp) ImGui_ImplWin32_Init(hwnd); ImGui_ImplDX11_Init(g_pd3dDevice, g_pd3dDeviceContext); @@ -216,8 +309,7 @@ CODE ImGui_ImplWin32_Shutdown(); ImGui::DestroyContext(); - HOW A SIMPLE APPLICATION MAY LOOK LIKE: - EXHIBIT 2: IMPLEMENTING CUSTOM BINDING / CUSTOM ENGINE. + EXHIBIT 2: IMPLEMENTING CUSTOM BACKEND / CUSTOM ENGINE // Application init: create a dear imgui context, setup some options, load fonts ImGui::CreateContext(); @@ -229,29 +321,29 @@ CODE // Build and load the texture atlas into a texture // (In the examples/ app this is usually done within the ImGui_ImplXXX_Init() function from one of the demo Renderer) int width, height; - unsigned char* pixels = NULL; + unsigned char* pixels = nullptr; io.Fonts->GetTexDataAsRGBA32(&pixels, &width, &height); - // At this point you've got the texture data and you need to upload that your your graphic system: + // At this point you've got the texture data and you need to upload that to your graphic system: // After we have created the texture, store its pointer/identifier (_in whichever format your engine uses_) in 'io.Fonts->TexID'. - // This will be passed back to your via the renderer. Basically ImTextureID == void*. Read FAQ below for details about ImTextureID. + // This will be passed back to your via the renderer. Basically ImTextureID == void*. Read FAQ for details about ImTextureID. MyTexture* texture = MyEngine::CreateTextureFromMemoryPixels(pixels, width, height, TEXTURE_TYPE_RGBA32) - io.Fonts->TexID = (void*)texture; + io.Fonts->SetTexID((void*)texture); // Application main loop while (true) { // Setup low-level inputs, e.g. on Win32: calling GetKeyboardState(), or write to those fields from your Windows message handlers, etc. - // (In the examples/ app this is usually done within the ImGui_ImplXXX_NewFrame() function from one of the demo Platform bindings) + // (In the examples/ app this is usually done within the ImGui_ImplXXX_NewFrame() function from one of the demo Platform Backends) io.DeltaTime = 1.0f/60.0f; // set the time elapsed since the previous frame (in seconds) io.DisplaySize.x = 1920.0f; // set the current display width io.DisplaySize.y = 1280.0f; // set the current display height here - io.MousePos = my_mouse_pos; // set the mouse position - io.MouseDown[0] = my_mouse_buttons[0]; // set the mouse button states - io.MouseDown[1] = my_mouse_buttons[1]; + io.AddMousePosEvent(mouse_x, mouse_y); // update mouse position + io.AddMouseButtonEvent(0, mouse_b[0]); // update mouse button states + io.AddMouseButtonEvent(1, mouse_b[1]); // update mouse button states // Call NewFrame(), after this point you can use ImGui::* functions anytime - // (So you want to try calling NewFrame() as early as you can in your mainloop to be able to use Dear ImGui everywhere) + // (So you want to try calling NewFrame() as early as you can in your main loop to be able to use Dear ImGui everywhere) ImGui::NewFrame(); // Most of your application code here @@ -271,14 +363,23 @@ CODE // Shutdown ImGui::DestroyContext(); - HOW A SIMPLE RENDERING FUNCTION MAY LOOK LIKE: + To decide whether to dispatch mouse/keyboard inputs to Dear ImGui to the rest of your application, + you should read the 'io.WantCaptureMouse', 'io.WantCaptureKeyboard' and 'io.WantTextInput' flags! + Please read the FAQ entry "How can I tell whether to dispatch mouse/keyboard to Dear ImGui or my application?" about this. - void void MyImGuiRenderFunction(ImDrawData* draw_data) + + HOW A SIMPLE RENDERING FUNCTION MAY LOOK LIKE + --------------------------------------------- + The backends in impl_impl_XXX.cpp files contain many working implementations of a rendering function. + + void MyImGuiRenderFunction(ImDrawData* draw_data) { // TODO: Setup render state: alpha-blending enabled, no face culling, no depth testing, scissor enabled + // TODO: Setup texture sampling state: sample with bilinear filtering (NOT point/nearest filtering). Use 'io.Fonts->Flags |= ImFontAtlasFlags_NoBakedLines;' to allow point/nearest filtering. // TODO: Setup viewport covering draw_data->DisplayPos to draw_data->DisplayPos + draw_data->DisplaySize // TODO: Setup orthographic projection matrix cover draw_data->DisplayPos to draw_data->DisplayPos + draw_data->DisplaySize // TODO: Setup shader: vertex { float2 pos, float2 uv, u32 color }, fragment shader sample color from 1 texture, multiply by vertex color. + ImVec2 clip_off = draw_data->DisplayPos; for (int n = 0; n < draw_data->CmdListsCount; n++) { const ImDrawList* cmd_list = draw_data->CmdLists[n]; @@ -293,85 +394,406 @@ CODE } else { - // The texture for the draw call is specified by pcmd->TextureId. - // The vast majority of draw calls will use the Dear ImGui texture atlas, which value you have set yourself during initialization. - MyEngineBindTexture((MyTexture*)pcmd->TextureId); + // Project scissor/clipping rectangles into framebuffer space + ImVec2 clip_min(pcmd->ClipRect.x - clip_off.x, pcmd->ClipRect.y - clip_off.y); + ImVec2 clip_max(pcmd->ClipRect.z - clip_off.x, pcmd->ClipRect.w - clip_off.y); + if (clip_max.x <= clip_min.x || clip_max.y <= clip_min.y) + continue; - // We are using scissoring to clip some objects. All low-level graphics API should supports it. + // We are using scissoring to clip some objects. All low-level graphics API should support it. // - If your engine doesn't support scissoring yet, you may ignore this at first. You will get some small glitches // (some elements visible outside their bounds) but you can fix that once everything else works! - // - Clipping coordinates are provided in imgui coordinates space (from draw_data->DisplayPos to draw_data->DisplayPos + draw_data->DisplaySize) - // In a single viewport application, draw_data->DisplayPos will always be (0,0) and draw_data->DisplaySize will always be == io.DisplaySize. - // However, in the interest of supporting multi-viewport applications in the future (see 'viewport' branch on github), - // always subtract draw_data->DisplayPos from clipping bounds to convert them to your viewport space. + // - Clipping coordinates are provided in imgui coordinates space: + // - For a given viewport, draw_data->DisplayPos == viewport->Pos and draw_data->DisplaySize == viewport->Size + // - In a single viewport application, draw_data->DisplayPos == (0,0) and draw_data->DisplaySize == io.DisplaySize, but always use GetMainViewport()->Pos/Size instead of hardcoding those values. + // - In the interest of supporting multi-viewport applications (see 'docking' branch on github), + // always subtract draw_data->DisplayPos from clipping bounds to convert them to your viewport space. // - Note that pcmd->ClipRect contains Min+Max bounds. Some graphics API may use Min+Max, other may use Min+Size (size being Max-Min) - ImVec2 pos = draw_data->DisplayPos; - MyEngineScissor((int)(pcmd->ClipRect.x - pos.x), (int)(pcmd->ClipRect.y - pos.y), (int)(pcmd->ClipRect.z - pos.x), (int)(pcmd->ClipRect.w - pos.y)); + MyEngineSetScissor(clip_min.x, clip_min.y, clip_max.x, clip_max.y); + + // The texture for the draw call is specified by pcmd->GetTexID(). + // The vast majority of draw calls will use the Dear ImGui texture atlas, which value you have set yourself during initialization. + MyEngineBindTexture((MyTexture*)pcmd->GetTexID()); // Render 'pcmd->ElemCount/3' indexed triangles. - // By default the indices ImDrawIdx are 16-bits, you can change them to 32-bits in imconfig.h if your engine doesn't support 16-bits indices. - MyEngineDrawIndexedTriangles(pcmd->ElemCount, sizeof(ImDrawIdx) == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, idx_buffer, vtx_buffer); + // By default the indices ImDrawIdx are 16-bit, you can change them to 32-bit in imconfig.h if your engine doesn't support 16-bit indices. + MyEngineDrawIndexedTriangles(pcmd->ElemCount, sizeof(ImDrawIdx) == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, idx_buffer + pcmd->IdxOffset, vtx_buffer, pcmd->VtxOffset); } - idx_buffer += pcmd->ElemCount; } } } - - The examples/ folders contains many actual implementation of the pseudo-codes above. - - When calling NewFrame(), the 'io.WantCaptureMouse', 'io.WantCaptureKeyboard' and 'io.WantTextInput' flags are updated. - They tell you if Dear ImGui intends to use your inputs. When a flag is set you want to hide the corresponding inputs from the - rest of your application. In every cases you need to pass on the inputs to Dear ImGui. Refer to the FAQ for more information. - - Please read the FAQ below!. Amusingly, it is called a FAQ because people frequently run into the same issues! - - USING GAMEPAD/KEYBOARD NAVIGATION CONTROLS - - - The gamepad/keyboard navigation is fairly functional and keeps being improved. - - Gamepad support is particularly useful to use dear imgui on a console system (e.g. PS4, Switch, XB1) without a mouse! - - You can ask questions and report issues at https://github.com/ocornut/imgui/issues/787 - - The initial focus was to support game controllers, but keyboard is becoming increasingly and decently usable. - - Gamepad: - - Set io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad to enable. - - Backend: Set io.BackendFlags |= ImGuiBackendFlags_HasGamepad + fill the io.NavInputs[] fields before calling NewFrame(). - Note that io.NavInputs[] is cleared by EndFrame(). - - See 'enum ImGuiNavInput_' in imgui.h for a description of inputs. For each entry of io.NavInputs[], set the following values: - 0.0f= not held. 1.0f= fully held. Pass intermediate 0.0f..1.0f values for analog triggers/sticks. - - We uses a simple >0.0f test for activation testing, and won't attempt to test for a dead-zone. - Your code will probably need to transform your raw inputs (such as e.g. remapping your 0.2..0.9 raw input range to 0.0..1.0 imgui range, etc.). - - You can download PNG/PSD files depicting the gamepad controls for common controllers at: http://goo.gl/9LgVZW. - - If you need to share inputs between your game and the imgui parts, the easiest approach is to go all-or-nothing, with a buttons combo - to toggle the target. Please reach out if you think the game vs navigation input sharing could be improved. - - Keyboard: - - Set io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard to enable. - NewFrame() will automatically fill io.NavInputs[] based on your io.KeysDown[] + io.KeyMap[] arrays. - - When keyboard navigation is active (io.NavActive + ImGuiConfigFlags_NavEnableKeyboard), the io.WantCaptureKeyboard flag - will be set. For more advanced uses, you may want to read from: - - io.NavActive: true when a window is focused and it doesn't have the ImGuiWindowFlags_NoNavInputs flag set. - - io.NavVisible: true when the navigation cursor is visible (and usually goes false when mouse is used). - - or query focus information with e.g. IsWindowFocused(ImGuiFocusedFlags_AnyWindow), IsItemFocused() etc. functions. - Please reach out if you think the game vs navigation input sharing could be improved. - - Mouse: - - PS4 users: Consider emulating a mouse cursor with DualShock4 touch pad or a spare analog stick as a mouse-emulation fallback. - - Consoles/Tablet/Phone users: Consider using a Synergy 1.x server (on your PC) + uSynergy.c (on your console/tablet/phone app) to share your PC mouse/keyboard. - - On a TV/console system where readability may be lower or mouse inputs may be awkward, you may want to set the ImGuiConfigFlags_NavEnableSetMousePos flag. - Enabling ImGuiConfigFlags_NavEnableSetMousePos + ImGuiBackendFlags_HasSetMousePos instructs dear imgui to move your mouse cursor along with navigation movements. - When enabled, the NewFrame() function may alter 'io.MousePos' and set 'io.WantSetMousePos' to notify you that it wants the mouse cursor to be moved. - When that happens your back-end NEEDS to move the OS or underlying mouse cursor on the next frame. Some of the binding in examples/ do that. - (If you set the NavEnableSetMousePos flag but don't honor 'io.WantSetMousePos' properly, imgui will misbehave as it will see your mouse as moving back and forth!) - (In a setup when you may not have easy control over the mouse cursor, e.g. uSynergy.c doesn't expose moving remote mouse cursor, you may want - to set a boolean to ignore your other external mouse positions until the external source is moved again.) - API BREAKING CHANGES ==================== Occasionally introducing changes that are breaking the API. We try to make the breakage minor and easy to fix. Below is a change-log of API breaking changes only. If you are using one of the functions listed, expect to have to fix some code. - When you are not sure about a old symbol or function name, try using the Search/Find function of your IDE to look for comments or references in all imgui files. + When you are not sure about an old symbol or function name, try using the Search/Find function of your IDE to look for comments or references in all imgui files. You can read releases logs https://github.com/ocornut/imgui/releases for more details. +(Docking/Viewport Branch) + - 2025/XX/XX (1.XXXX) - when multi-viewports are enabled, all positions will be in your natural OS coordinates space. It means that: + - reference to hard-coded positions such as in SetNextWindowPos(ImVec2(0,0)) are probably not what you want anymore. + you may use GetMainViewport()->Pos to offset hard-coded positions, e.g. SetNextWindowPos(GetMainViewport()->Pos) + - likewise io.MousePos and GetMousePos() will use OS coordinates. + If you query mouse positions to interact with non-imgui coordinates you will need to offset them, e.g. subtract GetWindowViewport()->Pos. + + - 2025/03/05 (1.91.9) - BeginMenu(): Internals: reworked mangling of menu windows to use "###Menu_00" etc. instead of "##Menu_00", allowing them to also store the menu name before it. This shouldn't affect code unless directly accessing menu window from their mangled name. + - 2025/02/27 (1.91.9) - Image(): removed 'tint_col' and 'border_col' parameter from Image() function. Added ImageWithBg() replacement. (#8131, #8238) + - old: void Image (ImTextureID tex_id, ImVec2 image_size, ImVec2 uv0 = (0,0), ImVec2 uv1 = (1,1), ImVec4 tint_col = (1,1,1,1), ImVec4 border_col = (0,0,0,0)); + - new: void Image (ImTextureID tex_id, ImVec2 image_size, ImVec2 uv0 = (0,0), ImVec2 uv1 = (1,1)); + - new: void ImageWithBg(ImTextureID tex_id, ImVec2 image_size, ImVec2 uv0 = (0,0), ImVec2 uv1 = (1,1), ImVec4 bg_col = (0,0,0,0), ImVec4 tint_col = (1,1,1,1)); + - TL;DR: 'border_col' had misleading side-effect on layout, 'bg_col' was missing, parameter order couldn't be consistent with ImageButton(). + - new behavior always use ImGuiCol_Border color + style.ImageBorderSize / ImGuiStyleVar_ImageBorderSize. + - old behavior altered border size (and therefore layout) based on border color's alpha, which caused variety of problems + old behavior a fixed 1.0f for border size which was not tweakable. + - kept legacy signature (will obsolete), which mimics the old behavior, but uses Max(1.0f, style.ImageBorderSize) when border_col is specified. + - added ImageWithBg() function which has both 'bg_col' (which was missing) and 'tint_col'. It was impossible to add 'bg_col' to Image() with a parameter order consistent with other functions, so we decided to remove 'tint_col' and introduce ImageWithBg(). + - 2025/02/25 (1.91.9) - internals: fonts: ImFontAtlas::ConfigData[] has been renamed to ImFontAtlas::Sources[]. ImFont::ConfigData[], ConfigDataCount has been renamed to Sources[], SourcesCount. + - 2025/02/06 (1.91.9) - renamed ImFontConfig::GlyphExtraSpacing.x to ImFontConfig::GlyphExtraAdvanceX. + - 2025/01/22 (1.91.8) - removed ImGuiColorEditFlags_AlphaPreview (made value 0): it is now the default behavior. + prior to 1.91.8: alpha was made opaque in the preview by default _unless_ using ImGuiColorEditFlags_AlphaPreview. We now display the preview as transparent by default. You can use ImGuiColorEditFlags_AlphaOpaque to use old behavior. + the new flags (ImGuiColorEditFlags_AlphaOpaque, ImGuiColorEditFlags_AlphaNoBg + existing ImGuiColorEditFlags_AlphaPreviewHalf) may be combined better and allow finer controls: + - 2025/01/14 (1.91.7) - renamed ImGuiTreeNodeFlags_SpanTextWidth to ImGuiTreeNodeFlags_SpanLabelWidth for consistency with other names. Kept redirection enum (will obsolete). (#6937) + - 2024/11/27 (1.91.6) - changed CRC32 table from CRC32-adler to CRC32c polynomial in order to be compatible with the result of SSE 4.2 instructions. + As a result, old .ini data may be partially lost (docking and tables information particularly). + Because some users have crafted and storing .ini data as a way to workaround limitations of the docking API, we are providing a '#define IMGUI_USE_LEGACY_CRC32_ADLER' compile-time option to keep using old CRC32 tables if you cannot afford invalidating old .ini data. + - 2024/11/06 (1.91.5) - commented/obsoleted out pre-1.87 IO system (equivalent to using IMGUI_DISABLE_OBSOLETE_KEYIO or IMGUI_DISABLE_OBSOLETE_FUNCTIONS before) + - io.KeyMap[] and io.KeysDown[] are removed (obsoleted February 2022). + - io.NavInputs[] and ImGuiNavInput are removed (obsoleted July 2022). + - pre-1.87 backends are not supported: + - backends need to call io.AddKeyEvent(), io.AddMouseEvent() instead of writing to io.KeysDown[], io.MouseDown[] fields. + - backends need to call io.AddKeyAnalogEvent() for gamepad values instead of writing to io.NavInputs[] fields. + - for more reference: + - read 1.87 and 1.88 part of this section or read Changelog for 1.87 and 1.88. + - read https://github.com/ocornut/imgui/issues/4921 + - if you have trouble updating a very old codebase using legacy backend-specific key codes: consider updating to 1.91.4 first, then #define IMGUI_DISABLE_OBSOLETE_KEYIO, then update to latest. + - obsoleted ImGuiKey_COUNT (it is unusually error-prone/misleading since valid keys don't start at 0). probably use ImGuiKey_NamedKey_BEGIN/ImGuiKey_NamedKey_END? + - fonts: removed const qualifiers from most font functions in prevision for upcoming font improvements. + - 2024/10/18 (1.91.4) - renamed ImGuiCol_NavHighlight to ImGuiCol_NavCursor (for consistency with newly exposed and reworked features). Kept inline redirection enum (will obsolete). + - 2024/10/14 (1.91.4) - moved ImGuiConfigFlags_NavEnableSetMousePos to standalone io.ConfigNavMoveSetMousePos bool. + moved ImGuiConfigFlags_NavNoCaptureKeyboard to standalone io.ConfigNavCaptureKeyboard bool (note the inverted value!). + kept legacy names (will obsolete) + code that copies settings once the first time. Dynamically changing the old value won't work. Switch to using the new value! + - 2024/10/10 (1.91.4) - the typedef for ImTextureID now defaults to ImU64 instead of void*. (#1641) + this removes the requirement to redefine it for backends which are e.g. storing descriptor sets or other 64-bits structures when building on 32-bits archs. It therefore simplify various building scripts/helpers. + you may have compile-time issues if you were casting to 'void*' instead of 'ImTextureID' when passing your types to functions taking ImTextureID values, e.g. ImGui::Image(). + in doubt it is almost always better to do an intermediate intptr_t cast, since it allows casting any pointer/integer type without warning: + - May warn: ImGui::Image((void*)MyTextureData, ...); + - May warn: ImGui::Image((void*)(intptr_t)MyTextureData, ...); + - Won't warn: ImGui::Image((ImTextureID)(intptr_t)MyTextureData), ...); + - note that you can always define ImTextureID to be your own high-level structures (with dedicated constructors) if you like. + - 2024/10/03 (1.91.3) - drags: treat v_min==v_max as a valid clamping range when != 0.0f. Zero is a still special value due to legacy reasons, unless using ImGuiSliderFlags_ClampZeroRange. (#7968, #3361, #76) + - drags: extended behavior of ImGuiSliderFlags_AlwaysClamp to include _ClampZeroRange. It considers v_min==v_max==0.0f as a valid clamping range (aka edits not allowed). + although unlikely, it you wish to only clamp on text input but want v_min==v_max==0.0f to mean unclamped drags, you can use _ClampOnInput instead of _AlwaysClamp. (#7968, #3361, #76) + - 2024/09/10 (1.91.2) - internals: using multiple overlayed ButtonBehavior() with same ID will now have io.ConfigDebugHighlightIdConflicts=true feature emit a warning. (#8030) + it was one of the rare case where using same ID is legal. workarounds: (1) use single ButtonBehavior() call with multiple _MouseButton flags, or (2) surround the calls with PushItemFlag(ImGuiItemFlags_AllowDuplicateId, true); ... PopItemFlag() + - 2024/08/23 (1.91.1) - renamed ImGuiChildFlags_Border to ImGuiChildFlags_Borders for consistency. kept inline redirection flag. + - 2024/08/22 (1.91.1) - moved some functions from ImGuiIO to ImGuiPlatformIO structure: + - io.GetClipboardTextFn -> platform_io.Platform_GetClipboardTextFn + changed 'void* user_data' to 'ImGuiContext* ctx'. Pull your user data from platform_io.ClipboardUserData. + - io.SetClipboardTextFn -> platform_io.Platform_SetClipboardTextFn + same as above line. + - io.PlatformOpenInShellFn -> platform_io.Platform_OpenInShellFn (#7660) + - io.PlatformSetImeDataFn -> platform_io.Platform_SetImeDataFn + - io.PlatformLocaleDecimalPoint -> platform_io.Platform_LocaleDecimalPoint (#7389, #6719, #2278) + - access those via GetPlatformIO() instead of GetIO(). + some were introduced very recently and often automatically setup by core library and backends, so for those we are exceptionally not maintaining a legacy redirection symbol. + - commented the old ImageButton() signature obsoleted in 1.89 (~August 2022). As a reminder: + - old ImageButton() before 1.89 used ImTextureId as item id (created issue with e.g. multiple buttons in same scope, transient texture id values, opaque computation of ID) + - new ImageButton() since 1.89 requires an explicit 'const char* str_id' + - old ImageButton() before 1.89 had frame_padding' override argument. + - new ImageButton() since 1.89 always use style.FramePadding, which you can freely override with PushStyleVar()/PopStyleVar(). + - 2024/07/25 (1.91.0) - obsoleted GetContentRegionMax(), GetWindowContentRegionMin() and GetWindowContentRegionMax(). (see #7838 on GitHub for more info) + you should never need those functions. you can do everything with GetCursorScreenPos() and GetContentRegionAvail() in a more simple way. + - instead of: GetWindowContentRegionMax().x - GetCursorPos().x + - you can use: GetContentRegionAvail().x + - instead of: GetWindowContentRegionMax().x + GetWindowPos().x + - you can use: GetCursorScreenPos().x + GetContentRegionAvail().x // when called from left edge of window + - instead of: GetContentRegionMax() + - you can use: GetContentRegionAvail() + GetCursorScreenPos() - GetWindowPos() // right edge in local coordinates + - instead of: GetWindowContentRegionMax().x - GetWindowContentRegionMin().x + - you can use: GetContentRegionAvail() // when called from left edge of window + - 2024/07/15 (1.91.0) - renamed ImGuiSelectableFlags_DontClosePopups to ImGuiSelectableFlags_NoAutoClosePopups. (#1379, #1468, #2200, #4936, #5216, #7302, #7573) + (internals: also renamed ImGuiItemFlags_SelectableDontClosePopup into ImGuiItemFlags_AutoClosePopups with inverted behaviors) + - 2024/07/15 (1.91.0) - obsoleted PushButtonRepeat()/PopButtonRepeat() in favor of using new PushItemFlag(ImGuiItemFlags_ButtonRepeat, ...)/PopItemFlag(). + - 2024/07/02 (1.91.0) - commented out obsolete ImGuiModFlags (renamed to ImGuiKeyChord in 1.89). (#4921, #456) + - commented out obsolete ImGuiModFlags_XXX values (renamed to ImGuiMod_XXX in 1.89). (#4921, #456) + - ImGuiModFlags_Ctrl -> ImGuiMod_Ctrl, ImGuiModFlags_Shift -> ImGuiMod_Shift etc. + - 2024/07/02 (1.91.0) - IO, IME: renamed platform IME hook and added explicit context for consistency and future-proofness. + - old: io.SetPlatformImeDataFn(ImGuiViewport* viewport, ImGuiPlatformImeData* data); + - new: io.PlatformSetImeDataFn(ImGuiContext* ctx, ImGuiViewport* viewport, ImGuiPlatformImeData* data); + - 2024/06/21 (1.90.9) - BeginChild: added ImGuiChildFlags_NavFlattened as a replacement for the window flag ImGuiWindowFlags_NavFlattened: the feature only ever made sense for BeginChild() anyhow. + - old: BeginChild("Name", size, 0, ImGuiWindowFlags_NavFlattened); + - new: BeginChild("Name", size, ImGuiChildFlags_NavFlattened, 0); + - 2024/06/21 (1.90.9) - io: ClearInputKeys() (first exposed in 1.89.8) doesn't clear mouse data, newly added ClearInputMouse() does. + - 2024/06/20 (1.90.9) - renamed ImGuiDragDropFlags_SourceAutoExpirePayload to ImGuiDragDropFlags_PayloadAutoExpire. + - 2024/06/18 (1.90.9) - style: renamed ImGuiCol_TabActive -> ImGuiCol_TabSelected, ImGuiCol_TabUnfocused -> ImGuiCol_TabDimmed, ImGuiCol_TabUnfocusedActive -> ImGuiCol_TabDimmedSelected. + - 2024/06/10 (1.90.9) - removed old nested structure: renaming ImGuiStorage::ImGuiStoragePair type to ImGuiStoragePair (simpler for many languages). + - 2024/06/06 (1.90.8) - reordered ImGuiInputTextFlags values. This should not be breaking unless you are using generated headers that have values not matching the main library. + - 2024/06/06 (1.90.8) - removed 'ImGuiButtonFlags_MouseButtonDefault_ = ImGuiButtonFlags_MouseButtonLeft', was mostly unused and misleading. + - 2024/05/27 (1.90.7) - commented out obsolete symbols marked obsolete in 1.88 (May 2022): + - old: CaptureKeyboardFromApp(bool) + - new: SetNextFrameWantCaptureKeyboard(bool) + - old: CaptureMouseFromApp(bool) + - new: SetNextFrameWantCaptureMouse(bool) + - 2024/05/22 (1.90.7) - inputs (internals): renamed ImGuiKeyOwner_None to ImGuiKeyOwner_NoOwner, to make use more explicit and reduce confusion with the default it is a non-zero value and cannot be the default value (never made public, but disclosing as I expect a few users caught on owner-aware inputs). + - inputs (internals): renamed ImGuiInputFlags_RouteGlobalLow -> ImGuiInputFlags_RouteGlobal, ImGuiInputFlags_RouteGlobal -> ImGuiInputFlags_RouteGlobalOverFocused, ImGuiInputFlags_RouteGlobalHigh -> ImGuiInputFlags_RouteGlobalHighest. + - inputs (internals): Shortcut(), SetShortcutRouting(): swapped last two parameters order in function signatures: + - old: Shortcut(ImGuiKeyChord key_chord, ImGuiID owner_id = 0, ImGuiInputFlags flags = 0); + - new: Shortcut(ImGuiKeyChord key_chord, ImGuiInputFlags flags = 0, ImGuiID owner_id = 0); + - inputs (internals): owner-aware versions of IsKeyPressed(), IsKeyChordPressed(), IsMouseClicked(): swapped last two parameters order in function signatures. + - old: IsKeyPressed(ImGuiKey key, ImGuiID owner_id, ImGuiInputFlags flags = 0); + - new: IsKeyPressed(ImGuiKey key, ImGuiInputFlags flags, ImGuiID owner_id = 0); + - old: IsMouseClicked(ImGuiMouseButton button, ImGuiID owner_id, ImGuiInputFlags flags = 0); + - new: IsMouseClicked(ImGuiMouseButton button, ImGuiInputFlags flags, ImGuiID owner_id = 0); + for various reasons those changes makes sense. They are being made because making some of those API public. + only past users of imgui_internal.h with the extra parameters will be affected. Added asserts for valid flags in various functions to detect _some_ misuses, BUT NOT ALL. + - 2024/05/21 (1.90.7) - docking: changed signature of DockSpaceOverViewport() to add explicit dockspace id if desired. pass 0 to use old behavior. (#7611) + - old: DockSpaceOverViewport(const ImGuiViewport* viewport = NULL, ImGuiDockNodeFlags flags = 0, ...); + - new: DockSpaceOverViewport(ImGuiID dockspace_id = 0, const ImGuiViewport* viewport = NULL, ImGuiDockNodeFlags flags = 0, ...); + - 2024/05/16 (1.90.7) - inputs: on macOS X, Cmd and Ctrl keys are now automatically swapped by io.AddKeyEvent() as this naturally align with how macOS X uses those keys. + - it shouldn't really affect you unless you had custom shortcut swapping in place for macOS X apps. + - removed ImGuiMod_Shortcut which was previously dynamically remapping to Ctrl or Cmd/Super. It is now unnecessary to specific cross-platform idiomatic shortcuts. (#2343, #4084, #5923, #456) + - 2024/05/14 (1.90.7) - backends: SDL_Renderer2 and SDL_Renderer3 backend now take a SDL_Renderer* in their RenderDrawData() functions. + - 2024/04/18 (1.90.6) - TreeNode: Fixed a layout inconsistency when using an empty/hidden label followed by a SameLine() call. (#7505, #282) + - old: TreeNode("##Hidden"); SameLine(); Text("Hello"); // <-- This was actually incorrect! BUT appeared to look ok with the default style where ItemSpacing.x == FramePadding.x * 2 (it didn't look aligned otherwise). + - new: TreeNode("##Hidden"); SameLine(0, 0); Text("Hello"); // <-- This is correct for all styles values. + with the fix, IF you were successfully using TreeNode("")+SameLine(); you will now have extra spacing between your TreeNode and the following item. + You'll need to change the SameLine() call to SameLine(0,0) to remove this extraneous spacing. This seemed like the more sensible fix that's not making things less consistent. + (Note: when using this idiom you are likely to also use ImGuiTreeNodeFlags_SpanAvailWidth). + - 2024/03/18 (1.90.5) - merged the radius_x/radius_y parameters in ImDrawList::AddEllipse(), AddEllipseFilled() and PathEllipticalArcTo() into a single ImVec2 parameter. Exceptionally, because those functions were added in 1.90, we are not adding inline redirection functions. The transition is easy and should affect few users. (#2743, #7417) + - 2024/03/08 (1.90.5) - inputs: more formally obsoleted GetKeyIndex() when IMGUI_DISABLE_OBSOLETE_FUNCTIONS is set. It has been unnecessary and a no-op since 1.87 (it returns the same value as passed when used with a 1.87+ backend using io.AddKeyEvent() function). (#4921) + - IsKeyPressed(GetKeyIndex(ImGuiKey_XXX)) -> use IsKeyPressed(ImGuiKey_XXX) + - 2024/01/15 (1.90.2) - commented out obsolete ImGuiIO::ImeWindowHandle marked obsolete in 1.87, favor of writing to 'void* ImGuiViewport::PlatformHandleRaw'. + - 2023/12/19 (1.90.1) - commented out obsolete ImGuiKey_KeyPadEnter redirection to ImGuiKey_KeypadEnter. + - 2023/11/06 (1.90.1) - removed CalcListClipping() marked obsolete in 1.86. Prefer using ImGuiListClipper which can return non-contiguous ranges. + - 2023/11/05 (1.90.1) - imgui_freetype: commented out ImGuiFreeType::BuildFontAtlas() obsoleted in 1.81. prefer using #define IMGUI_ENABLE_FREETYPE or see commented code for manual calls. + - 2023/11/05 (1.90.1) - internals,columns: commented out legacy ImGuiColumnsFlags_XXX symbols redirecting to ImGuiOldColumnsFlags_XXX, obsoleted from imgui_internal.h in 1.80. + - 2023/11/09 (1.90.0) - removed IM_OFFSETOF() macro in favor of using offsetof() available in C++11. Kept redirection define (will obsolete). + - 2023/11/07 (1.90.0) - removed BeginChildFrame()/EndChildFrame() in favor of using BeginChild() with the ImGuiChildFlags_FrameStyle flag. kept inline redirection function (will obsolete). + those functions were merely PushStyle/PopStyle helpers, the removal isn't so much motivated by needing to add the feature in BeginChild(), but by the necessity to avoid BeginChildFrame() signature mismatching BeginChild() signature and features. + - 2023/11/02 (1.90.0) - BeginChild: upgraded 'bool border = true' parameter to 'ImGuiChildFlags flags' type, added ImGuiChildFlags_Border equivalent. As with our prior "bool-to-flags" API updates, the ImGuiChildFlags_Border value is guaranteed to be == true forever to ensure a smoother transition, meaning all existing calls will still work. + - old: BeginChild("Name", size, true) + - new: BeginChild("Name", size, ImGuiChildFlags_Border) + - old: BeginChild("Name", size, false) + - new: BeginChild("Name", size) or BeginChild("Name", 0) or BeginChild("Name", size, ImGuiChildFlags_None) + **AMEND FROM THE FUTURE: from 1.91.1, 'ImGuiChildFlags_Border' is called 'ImGuiChildFlags_Borders'** + - 2023/11/02 (1.90.0) - BeginChild: added child-flag ImGuiChildFlags_AlwaysUseWindowPadding as a replacement for the window-flag ImGuiWindowFlags_AlwaysUseWindowPadding: the feature only ever made sense for BeginChild() anyhow. + - old: BeginChild("Name", size, 0, ImGuiWindowFlags_AlwaysUseWindowPadding); + - new: BeginChild("Name", size, ImGuiChildFlags_AlwaysUseWindowPadding, 0); + - 2023/09/27 (1.90.0) - io: removed io.MetricsActiveAllocations introduced in 1.63. Same as 'g.DebugMemAllocCount - g.DebugMemFreeCount' (still displayed in Metrics, unlikely to be accessed by end-user). + - 2023/09/26 (1.90.0) - debug tools: Renamed ShowStackToolWindow() ("Stack Tool") to ShowIDStackToolWindow() ("ID Stack Tool"), as earlier name was misleading. Kept inline redirection function. (#4631) + - 2023/09/15 (1.90.0) - ListBox, Combo: changed signature of "name getter" callback in old one-liner ListBox()/Combo() apis. kept inline redirection function (will obsolete). + - old: bool Combo(const char* label, int* current_item, bool (*getter)(void* user_data, int idx, const char** out_text), ...) + - new: bool Combo(const char* label, int* current_item, const char* (*getter)(void* user_data, int idx), ...); + - old: bool ListBox(const char* label, int* current_item, bool (*getting)(void* user_data, int idx, const char** out_text), ...); + - new: bool ListBox(const char* label, int* current_item, const char* (*getter)(void* user_data, int idx), ...); + - 2023/09/08 (1.90.0) - commented out obsolete redirecting functions: + - GetWindowContentRegionWidth() -> use GetWindowContentRegionMax().x - GetWindowContentRegionMin().x. Consider that generally 'GetContentRegionAvail().x' is more useful. + - ImDrawCornerFlags_XXX -> use ImDrawFlags_RoundCornersXXX flags. Read 1.82 Changelog for details + grep commented names in sources. + - commented out runtime support for hardcoded ~0 or 0x01..0x0F rounding flags values for AddRect()/AddRectFilled()/PathRect()/AddImageRounded() -> use ImDrawFlags_RoundCornersXXX flags. Read 1.82 Changelog for details + - 2023/08/25 (1.89.9) - clipper: Renamed IncludeRangeByIndices() (also called ForceDisplayRangeByIndices() before 1.89.6) to IncludeItemsByIndex(). Kept inline redirection function. Sorry! + - 2023/07/12 (1.89.8) - ImDrawData: CmdLists now owned, changed from ImDrawList** to ImVector. Majority of users shouldn't be affected, but you cannot compare to NULL nor reassign manually anymore. Instead use AddDrawList(). (#6406, #4879, #1878) + - 2023/06/28 (1.89.7) - overlapping items: obsoleted 'SetItemAllowOverlap()' (called after item) in favor of calling 'SetNextItemAllowOverlap()' (called before item). 'SetItemAllowOverlap()' didn't and couldn't work reliably since 1.89 (2022-11-15). + - 2023/06/28 (1.89.7) - overlapping items: renamed 'ImGuiTreeNodeFlags_AllowItemOverlap' to 'ImGuiTreeNodeFlags_AllowOverlap', 'ImGuiSelectableFlags_AllowItemOverlap' to 'ImGuiSelectableFlags_AllowOverlap'. Kept redirecting enums (will obsolete). + - 2023/06/28 (1.89.7) - overlapping items: IsItemHovered() now by default return false when querying an item using AllowOverlap mode which is being overlapped. Use ImGuiHoveredFlags_AllowWhenOverlappedByItem to revert to old behavior. + - 2023/06/28 (1.89.7) - overlapping items: Selectable and TreeNode don't allow overlap when active so overlapping widgets won't appear as hovered. While this fixes a common small visual issue, it also means that calling IsItemHovered() after a non-reactive elements - e.g. Text() - overlapping an active one may fail if you don't use IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByActiveItem). (#6610) + - 2023/06/20 (1.89.7) - moved io.HoverDelayShort/io.HoverDelayNormal to style.HoverDelayShort/style.HoverDelayNormal. As the fields were added in 1.89 and expected to be left unchanged by most users, or only tweaked once during app initialization, we are exceptionally accepting the breakage. + - 2023/05/30 (1.89.6) - backends: renamed "imgui_impl_sdlrenderer.cpp" to "imgui_impl_sdlrenderer2.cpp" and "imgui_impl_sdlrenderer.h" to "imgui_impl_sdlrenderer2.h". This is in prevision for the future release of SDL3. + - 2023/05/22 (1.89.6) - listbox: commented out obsolete/redirecting functions that were marked obsolete more than two years ago: + - ListBoxHeader() -> use BeginListBox() (note how two variants of ListBoxHeader() existed. Check commented versions in imgui.h for reference) + - ListBoxFooter() -> use EndListBox() + - 2023/05/15 (1.89.6) - clipper: commented out obsolete redirection constructor 'ImGuiListClipper(int items_count, float items_height = -1.0f)' that was marked obsolete in 1.79. Use default constructor + clipper.Begin(). + - 2023/05/15 (1.89.6) - clipper: renamed ImGuiListClipper::ForceDisplayRangeByIndices() to ImGuiListClipper::IncludeRangeByIndices(). + - 2023/03/14 (1.89.4) - commented out redirecting enums/functions names that were marked obsolete two years ago: + - ImGuiSliderFlags_ClampOnInput -> use ImGuiSliderFlags_AlwaysClamp + - ImGuiInputTextFlags_AlwaysInsertMode -> use ImGuiInputTextFlags_AlwaysOverwrite + - ImDrawList::AddBezierCurve() -> use ImDrawList::AddBezierCubic() + - ImDrawList::PathBezierCurveTo() -> use ImDrawList::PathBezierCubicCurveTo() + - 2023/03/09 (1.89.4) - renamed PushAllowKeyboardFocus()/PopAllowKeyboardFocus() to PushTabStop()/PopTabStop(). Kept inline redirection functions (will obsolete). + - 2023/03/09 (1.89.4) - tooltips: Added 'bool' return value to BeginTooltip() for API consistency. Please only submit contents and call EndTooltip() if BeginTooltip() returns true. In reality the function will _currently_ always return true, but further changes down the line may change this, best to clarify API sooner. + - 2023/02/15 (1.89.4) - moved the optional "courtesy maths operators" implementation from imgui_internal.h in imgui.h. + Even though we encourage using your own maths types and operators by setting up IM_VEC2_CLASS_EXTRA, + it has been frequently requested by people to use our own. We had an opt-in define which was + previously fulfilled in imgui_internal.h. It is now fulfilled in imgui.h. (#6164) + - OK: #define IMGUI_DEFINE_MATH_OPERATORS / #include "imgui.h" / #include "imgui_internal.h" + - Error: #include "imgui.h" / #define IMGUI_DEFINE_MATH_OPERATORS / #include "imgui_internal.h" + - 2023/02/07 (1.89.3) - backends: renamed "imgui_impl_sdl.cpp" to "imgui_impl_sdl2.cpp" and "imgui_impl_sdl.h" to "imgui_impl_sdl2.h". (#6146) This is in prevision for the future release of SDL3. + - 2022/10/26 (1.89) - commented out redirecting OpenPopupContextItem() which was briefly the name of OpenPopupOnItemClick() from 1.77 to 1.79. + - 2022/10/12 (1.89) - removed runtime patching of invalid "%f"/"%0.f" format strings for DragInt()/SliderInt(). This was obsoleted in 1.61 (May 2018). See 1.61 changelog for details. + - 2022/09/26 (1.89) - renamed and merged keyboard modifiers key enums and flags into a same set. Kept inline redirection enums (will obsolete). + - ImGuiKey_ModCtrl and ImGuiModFlags_Ctrl -> ImGuiMod_Ctrl + - ImGuiKey_ModShift and ImGuiModFlags_Shift -> ImGuiMod_Shift + - ImGuiKey_ModAlt and ImGuiModFlags_Alt -> ImGuiMod_Alt + - ImGuiKey_ModSuper and ImGuiModFlags_Super -> ImGuiMod_Super + the ImGuiKey_ModXXX were introduced in 1.87 and mostly used by backends. + the ImGuiModFlags_XXX have been exposed in imgui.h but not really used by any public api only by third-party extensions. + exceptionally commenting out the older ImGuiKeyModFlags_XXX names ahead of obsolescence schedule to reduce confusion and because they were not meant to be used anyway. + - 2022/09/20 (1.89) - ImGuiKey is now a typed enum, allowing ImGuiKey_XXX symbols to be named in debuggers. + this will require uses of legacy backend-dependent indices to be casted, e.g. + - with imgui_impl_glfw: IsKeyPressed(GLFW_KEY_A) -> IsKeyPressed((ImGuiKey)GLFW_KEY_A); + - with imgui_impl_win32: IsKeyPressed('A') -> IsKeyPressed((ImGuiKey)'A') + - etc. However if you are upgrading code you might well use the better, backend-agnostic IsKeyPressed(ImGuiKey_A) now! + - 2022/09/12 (1.89) - removed the bizarre legacy default argument for 'TreePush(const void* ptr = NULL)', always pass a pointer value explicitly. NULL/nullptr is ok but require cast, e.g. TreePush((void*)nullptr); + - 2022/09/05 (1.89) - commented out redirecting functions/enums names that were marked obsolete in 1.77 and 1.78 (June 2020): + - DragScalar(), DragScalarN(), DragFloat(), DragFloat2(), DragFloat3(), DragFloat4(): For old signatures ending with (..., const char* format, float power = 1.0f) -> use (..., format ImGuiSliderFlags_Logarithmic) if power != 1.0f. + - SliderScalar(), SliderScalarN(), SliderFloat(), SliderFloat2(), SliderFloat3(), SliderFloat4(): For old signatures ending with (..., const char* format, float power = 1.0f) -> use (..., format ImGuiSliderFlags_Logarithmic) if power != 1.0f. + - BeginPopupContextWindow(const char*, ImGuiMouseButton, bool) -> use BeginPopupContextWindow(const char*, ImGuiPopupFlags) + - 2022/09/02 (1.89) - obsoleted using SetCursorPos()/SetCursorScreenPos() to extend parent window/cell boundaries. + this relates to when moving the cursor position beyond current boundaries WITHOUT submitting an item. + - previously this would make the window content size ~200x200: + Begin(...) + SetCursorScreenPos(GetCursorScreenPos() + ImVec2(200,200)) + End(); + - instead, please submit an item: + Begin(...) + SetCursorScreenPos(GetCursorScreenPos() + ImVec2(200,200)) + Dummy(ImVec2(0,0)) + End(); + - alternative: + Begin(...) + Dummy(ImVec2(200,200)) + End(); + - content size is now only extended when submitting an item! + - with '#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS' this will now be detected and assert. + - without '#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS' this will silently be fixed until we obsolete it. + - 2022/08/03 (1.89) - changed signature of ImageButton() function. Kept redirection function (will obsolete). + - added 'const char* str_id' parameter + removed 'int frame_padding = -1' parameter. + - old signature: bool ImageButton(ImTextureID tex_id, ImVec2 size, ImVec2 uv0 = ImVec2(0,0), ImVec2 uv1 = ImVec2(1,1), int frame_padding = -1, ImVec4 bg_col = ImVec4(0,0,0,0), ImVec4 tint_col = ImVec4(1,1,1,1)); + - used the ImTextureID value to create an ID. This was inconsistent with other functions, led to ID conflicts, and caused problems with engines using transient ImTextureID values. + - had a FramePadding override which was inconsistent with other functions and made the already-long signature even longer. + - new signature: bool ImageButton(const char* str_id, ImTextureID tex_id, ImVec2 size, ImVec2 uv0 = ImVec2(0,0), ImVec2 uv1 = ImVec2(1,1), ImVec4 bg_col = ImVec4(0,0,0,0), ImVec4 tint_col = ImVec4(1,1,1,1)); + - requires an explicit identifier. You may still use e.g. PushID() calls and then pass an empty identifier. + - always uses style.FramePadding for padding, to be consistent with other buttons. You may use PushStyleVar() to alter this. + - 2022/07/08 (1.89) - inputs: removed io.NavInputs[] and ImGuiNavInput enum (following 1.87 changes). + - Official backends from 1.87+ -> no issue. + - Official backends from 1.60 to 1.86 -> will build and convert gamepad inputs, unless IMGUI_DISABLE_OBSOLETE_KEYIO is defined. Need updating! + - Custom backends not writing to io.NavInputs[] -> no issue. + - Custom backends writing to io.NavInputs[] -> will build and convert gamepad inputs, unless IMGUI_DISABLE_OBSOLETE_KEYIO is defined. Need fixing! + - TL;DR: Backends should call io.AddKeyEvent()/io.AddKeyAnalogEvent() with ImGuiKey_GamepadXXX values instead of filling io.NavInput[]. + - 2022/06/15 (1.88) - renamed IMGUI_DISABLE_METRICS_WINDOW to IMGUI_DISABLE_DEBUG_TOOLS for correctness. kept support for old define (will obsolete). + - 2022/05/03 (1.88) - backends: osx: removed ImGui_ImplOSX_HandleEvent() from backend API in favor of backend automatically handling event capture. All ImGui_ImplOSX_HandleEvent() calls should be removed as they are now unnecessary. + - 2022/04/05 (1.88) - inputs: renamed ImGuiKeyModFlags to ImGuiModFlags. Kept inline redirection enums (will obsolete). This was never used in public API functions but technically present in imgui.h and ImGuiIO. + - 2022/01/20 (1.87) - inputs: reworded gamepad IO. + - Backend writing to io.NavInputs[] -> backend should call io.AddKeyEvent()/io.AddKeyAnalogEvent() with ImGuiKey_GamepadXXX values. + - 2022/01/19 (1.87) - sliders, drags: removed support for legacy arithmetic operators (+,+-,*,/) when inputting text. This doesn't break any api/code but a feature that used to be accessible by end-users (which seemingly no one used). + - 2022/01/17 (1.87) - inputs: reworked mouse IO. + - Backend writing to io.MousePos -> backend should call io.AddMousePosEvent() + - Backend writing to io.MouseDown[] -> backend should call io.AddMouseButtonEvent() + - Backend writing to io.MouseWheel -> backend should call io.AddMouseWheelEvent() + - Backend writing to io.MouseHoveredViewport -> backend should call io.AddMouseViewportEvent() [Docking branch w/ multi-viewports only] + note: for all calls to IO new functions, the Dear ImGui context should be bound/current. + read https://github.com/ocornut/imgui/issues/4921 for details. + - 2022/01/10 (1.87) - inputs: reworked keyboard IO. Removed io.KeyMap[], io.KeysDown[] in favor of calling io.AddKeyEvent(), ImGui::IsKeyDown(). Removed GetKeyIndex(), now unnecessary. All IsKeyXXX() functions now take ImGuiKey values. All features are still functional until IMGUI_DISABLE_OBSOLETE_KEYIO is defined. Read Changelog and Release Notes for details. + - IsKeyPressed(MY_NATIVE_KEY_XXX) -> use IsKeyPressed(ImGuiKey_XXX) + - IsKeyPressed(GetKeyIndex(ImGuiKey_XXX)) -> use IsKeyPressed(ImGuiKey_XXX) + - Backend writing to io.KeyMap[],io.KeysDown[] -> backend should call io.AddKeyEvent() (+ call io.SetKeyEventNativeData() if you want legacy user code to stil function with legacy key codes). + - Backend writing to io.KeyCtrl, io.KeyShift.. -> backend should call io.AddKeyEvent() with ImGuiMod_XXX values. *IF YOU PULLED CODE BETWEEN 2021/01/10 and 2021/01/27: We used to have a io.AddKeyModsEvent() function which was now replaced by io.AddKeyEvent() with ImGuiMod_XXX values.* + - one case won't work with backward compatibility: if your custom backend used ImGuiKey as mock native indices (e.g. "io.KeyMap[ImGuiKey_A] = ImGuiKey_A") because those values are now larger than the legacy KeyDown[] array. Will assert. + - inputs: added ImGuiKey_ModCtrl/ImGuiKey_ModShift/ImGuiKey_ModAlt/ImGuiKey_ModSuper values to submit keyboard modifiers using io.AddKeyEvent(), instead of writing directly to io.KeyCtrl, io.KeyShift, io.KeyAlt, io.KeySuper. + - 2022/01/05 (1.87) - inputs: renamed ImGuiKey_KeyPadEnter to ImGuiKey_KeypadEnter to align with new symbols. Kept redirection enum. + - 2022/01/05 (1.87) - removed io.ImeSetInputScreenPosFn() in favor of more flexible io.SetPlatformImeDataFn(). Removed 'void* io.ImeWindowHandle' in favor of writing to 'void* ImGuiViewport::PlatformHandleRaw'. + - 2022/01/01 (1.87) - commented out redirecting functions/enums names that were marked obsolete in 1.69, 1.70, 1.71, 1.72 (March-July 2019) + - ImGui::SetNextTreeNodeOpen() -> use ImGui::SetNextItemOpen() + - ImGui::GetContentRegionAvailWidth() -> use ImGui::GetContentRegionAvail().x + - ImGui::TreeAdvanceToLabelPos() -> use ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetTreeNodeToLabelSpacing()); + - ImFontAtlas::CustomRect -> use ImFontAtlasCustomRect + - ImGuiColorEditFlags_RGB/HSV/HEX -> use ImGuiColorEditFlags_DisplayRGB/HSV/Hex + - 2021/12/20 (1.86) - backends: removed obsolete Marmalade backend (imgui_impl_marmalade.cpp) + example. Find last supported version at https://github.com/ocornut/imgui/wiki/Bindings + - 2021/11/04 (1.86) - removed CalcListClipping() function. Prefer using ImGuiListClipper which can return non-contiguous ranges. Please open an issue if you think you really need this function. + - 2021/08/23 (1.85) - removed GetWindowContentRegionWidth() function. keep inline redirection helper. can use 'GetWindowContentRegionMax().x - GetWindowContentRegionMin().x' instead for generally 'GetContentRegionAvail().x' is more useful. + - 2021/07/26 (1.84) - commented out redirecting functions/enums names that were marked obsolete in 1.67 and 1.69 (March 2019): + - ImGui::GetOverlayDrawList() -> use ImGui::GetForegroundDrawList() + - ImFont::GlyphRangesBuilder -> use ImFontGlyphRangesBuilder + - 2021/05/19 (1.83) - backends: obsoleted direct access to ImDrawCmd::TextureId in favor of calling ImDrawCmd::GetTexID(). + - if you are using official backends from the source tree: you have nothing to do. + - if you have copied old backend code or using your own: change access to draw_cmd->TextureId to draw_cmd->GetTexID(). + - 2021/03/12 (1.82) - upgraded ImDrawList::AddRect(), AddRectFilled(), PathRect() to use ImDrawFlags instead of ImDrawCornersFlags. + - ImDrawCornerFlags_TopLeft -> use ImDrawFlags_RoundCornersTopLeft + - ImDrawCornerFlags_BotRight -> use ImDrawFlags_RoundCornersBottomRight + - ImDrawCornerFlags_None -> use ImDrawFlags_RoundCornersNone etc. + flags now sanely defaults to 0 instead of 0x0F, consistent with all other flags in the API. + breaking: the default with rounding > 0.0f is now "round all corners" vs old implicit "round no corners": + - rounding == 0.0f + flags == 0 --> meant no rounding --> unchanged (common use) + - rounding > 0.0f + flags != 0 --> meant rounding --> unchanged (common use) + - rounding == 0.0f + flags != 0 --> meant no rounding --> unchanged (unlikely use) + - rounding > 0.0f + flags == 0 --> meant no rounding --> BREAKING (unlikely use): will now round all corners --> use ImDrawFlags_RoundCornersNone or rounding == 0.0f. + this ONLY matters for hard coded use of 0 + rounding > 0.0f. Use of named ImDrawFlags_RoundCornersNone (new) or ImDrawCornerFlags_None (old) are ok. + the old ImDrawCornersFlags used awkward default values of ~0 or 0xF (4 lower bits set) to signify "round all corners" and we sometimes encouraged using them as shortcuts. + legacy path still support use of hard coded ~0 or any value from 0x1 or 0xF. They will behave the same with legacy paths enabled (will assert otherwise). + - 2021/03/11 (1.82) - removed redirecting functions/enums names that were marked obsolete in 1.66 (September 2018): + - ImGui::SetScrollHere() -> use ImGui::SetScrollHereY() + - 2021/03/11 (1.82) - clarified that ImDrawList::PathArcTo(), ImDrawList::PathArcToFast() won't render with radius < 0.0f. Previously it sorts of accidentally worked but would generally lead to counter-clockwise paths and have an effect on anti-aliasing. + - 2021/03/10 (1.82) - upgraded ImDrawList::AddPolyline() and PathStroke() "bool closed" parameter to "ImDrawFlags flags". The matching ImDrawFlags_Closed value is guaranteed to always stay == 1 in the future. + - 2021/02/22 (1.82) - (*undone in 1.84*) win32+mingw: Re-enabled IME functions by default even under MinGW. In July 2016, issue #738 had me incorrectly disable those default functions for MinGW. MinGW users should: either link with -limm32, either set their imconfig file with '#define IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS'. + - 2021/02/17 (1.82) - renamed rarely used style.CircleSegmentMaxError (old default = 1.60f) to style.CircleTessellationMaxError (new default = 0.30f) as the meaning of the value changed. + - 2021/02/03 (1.81) - renamed ListBoxHeader(const char* label, ImVec2 size) to BeginListBox(). Kept inline redirection function (will obsolete). + - removed ListBoxHeader(const char* label, int items_count, int height_in_items = -1) in favor of specifying size. Kept inline redirection function (will obsolete). + - renamed ListBoxFooter() to EndListBox(). Kept inline redirection function (will obsolete). + - 2021/01/26 (1.81) - removed ImGuiFreeType::BuildFontAtlas(). Kept inline redirection function. Prefer using '#define IMGUI_ENABLE_FREETYPE', but there's a runtime selection path available too. The shared extra flags parameters (very rarely used) are now stored in ImFontAtlas::FontBuilderFlags. + - renamed ImFontConfig::RasterizerFlags (used by FreeType) to ImFontConfig::FontBuilderFlags. + - renamed ImGuiFreeType::XXX flags to ImGuiFreeTypeBuilderFlags_XXX for consistency with other API. + - 2020/10/12 (1.80) - removed redirecting functions/enums that were marked obsolete in 1.63 (August 2018): + - ImGui::IsItemDeactivatedAfterChange() -> use ImGui::IsItemDeactivatedAfterEdit(). + - ImGuiCol_ModalWindowDarkening -> use ImGuiCol_ModalWindowDimBg + - ImGuiInputTextCallback -> use ImGuiTextEditCallback + - ImGuiInputTextCallbackData -> use ImGuiTextEditCallbackData + - 2020/12/21 (1.80) - renamed ImDrawList::AddBezierCurve() to AddBezierCubic(), and PathBezierCurveTo() to PathBezierCubicCurveTo(). Kept inline redirection function (will obsolete). + - 2020/12/04 (1.80) - added imgui_tables.cpp file! Manually constructed project files will need the new file added! + - 2020/11/18 (1.80) - renamed undocumented/internals ImGuiColumnsFlags_* to ImGuiOldColumnFlags_* in prevision of incoming Tables API. + - 2020/11/03 (1.80) - renamed io.ConfigWindowsMemoryCompactTimer to io.ConfigMemoryCompactTimer as the feature will apply to other data structures + - 2020/10/14 (1.80) - backends: moved all backends files (imgui_impl_XXXX.cpp, imgui_impl_XXXX.h) from examples/ to backends/. + - 2020/10/12 (1.80) - removed redirecting functions/enums that were marked obsolete in 1.60 (April 2018): + - io.RenderDrawListsFn pointer -> use ImGui::GetDrawData() value and call the render function of your backend + - ImGui::IsAnyWindowFocused() -> use ImGui::IsWindowFocused(ImGuiFocusedFlags_AnyWindow) + - ImGui::IsAnyWindowHovered() -> use ImGui::IsWindowHovered(ImGuiHoveredFlags_AnyWindow) + - ImGuiStyleVar_Count_ -> use ImGuiStyleVar_COUNT + - ImGuiMouseCursor_Count_ -> use ImGuiMouseCursor_COUNT + - removed redirecting functions names that were marked obsolete in 1.61 (May 2018): + - InputFloat (... int decimal_precision ...) -> use InputFloat (... const char* format ...) with format = "%.Xf" where X is your value for decimal_precision. + - same for InputFloat2()/InputFloat3()/InputFloat4() variants taking a `int decimal_precision` parameter. + - 2020/10/05 (1.79) - removed ImGuiListClipper: Renamed constructor parameters which created an ambiguous alternative to using the ImGuiListClipper::Begin() function, with misleading edge cases (note: imgui_memory_editor <0.40 from imgui_club/ used this old clipper API. Update your copy if needed). + - 2020/09/25 (1.79) - renamed ImGuiSliderFlags_ClampOnInput to ImGuiSliderFlags_AlwaysClamp. Kept redirection enum (will obsolete sooner because previous name was added recently). + - 2020/09/25 (1.79) - renamed style.TabMinWidthForUnselectedCloseButton to style.TabMinWidthForCloseButton. + - 2020/09/21 (1.79) - renamed OpenPopupContextItem() back to OpenPopupOnItemClick(), reverting the change from 1.77. For varieties of reason this is more self-explanatory. + - 2020/09/21 (1.79) - removed return value from OpenPopupOnItemClick() - returned true on mouse release on an item - because it is inconsistent with other popup APIs and makes others misleading. It's also and unnecessary: you can use IsWindowAppearing() after BeginPopup() for a similar result. + - 2020/09/17 (1.79) - removed ImFont::DisplayOffset in favor of ImFontConfig::GlyphOffset. DisplayOffset was applied after scaling and not very meaningful/useful outside of being needed by the default ProggyClean font. If you scaled this value after calling AddFontDefault(), this is now done automatically. It was also getting in the way of better font scaling, so let's get rid of it now! + - 2020/08/17 (1.78) - obsoleted use of the trailing 'float power=1.0f' parameter for DragFloat(), DragFloat2(), DragFloat3(), DragFloat4(), DragFloatRange2(), DragScalar(), DragScalarN(), SliderFloat(), SliderFloat2(), SliderFloat3(), SliderFloat4(), SliderScalar(), SliderScalarN(), VSliderFloat() and VSliderScalar(). + replaced the 'float power=1.0f' argument with integer-based flags defaulting to 0 (as with all our flags). + worked out a backward-compatibility scheme so hopefully most C++ codebase should not be affected. in short, when calling those functions: + - if you omitted the 'power' parameter (likely!), you are not affected. + - if you set the 'power' parameter to 1.0f (same as previous default value): 1/ your compiler may warn on float>int conversion, 2/ everything else will work. 3/ you can replace the 1.0f value with 0 to fix the warning, and be technically correct. + - if you set the 'power' parameter to >1.0f (to enable non-linear editing): 1/ your compiler may warn on float>int conversion, 2/ code will assert at runtime, 3/ in case asserts are disabled, the code will not crash and enable the _Logarithmic flag. 4/ you can replace the >1.0f value with ImGuiSliderFlags_Logarithmic to fix the warning/assert and get a _similar_ effect as previous uses of power >1.0f. + see https://github.com/ocornut/imgui/issues/3361 for all details. + kept inline redirection functions (will obsolete) apart for: DragFloatRange2(), VSliderFloat(), VSliderScalar(). For those three the 'float power=1.0f' version was removed directly as they were most unlikely ever used. + for shared code, you can version check at compile-time with `#if IMGUI_VERSION_NUM >= 17704`. + - obsoleted use of v_min > v_max in DragInt, DragFloat, DragScalar to lock edits (introduced in 1.73, was not demoed nor documented very), will be replaced by a more generic ReadOnly feature. You may use the ImGuiSliderFlags_ReadOnly internal flag in the meantime. + - 2020/06/23 (1.77) - removed BeginPopupContextWindow(const char*, int mouse_button, bool also_over_items) in favor of BeginPopupContextWindow(const char*, ImGuiPopupFlags flags) with ImGuiPopupFlags_NoOverItems. + - 2020/06/15 (1.77) - renamed OpenPopupOnItemClick() to OpenPopupContextItem(). Kept inline redirection function (will obsolete). [NOTE: THIS WAS REVERTED IN 1.79] + - 2020/06/15 (1.77) - removed CalcItemRectClosestPoint() entry point which was made obsolete and asserting in December 2017. + - 2020/04/23 (1.77) - removed unnecessary ID (first arg) of ImFontAtlas::AddCustomRectRegular(). + - 2020/01/22 (1.75) - ImDrawList::AddCircle()/AddCircleFilled() functions don't accept negative radius any more. + - 2019/12/17 (1.75) - [undid this change in 1.76] made Columns() limited to 64 columns by asserting above that limit. While the current code technically supports it, future code may not so we're putting the restriction ahead. + - 2019/12/13 (1.75) - [imgui_internal.h] changed ImRect() default constructor initializes all fields to 0.0f instead of (FLT_MAX,FLT_MAX,-FLT_MAX,-FLT_MAX). If you used ImRect::Add() to create bounding boxes by adding multiple points into it, you may need to fix your initial value. + - 2019/12/08 (1.75) - removed redirecting functions/enums that were marked obsolete in 1.53 (December 2017): + - ShowTestWindow() -> use ShowDemoWindow() + - IsRootWindowFocused() -> use IsWindowFocused(ImGuiFocusedFlags_RootWindow) + - IsRootWindowOrAnyChildFocused() -> use IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows) + - SetNextWindowContentWidth(w) -> use SetNextWindowContentSize(ImVec2(w, 0.0f) + - GetItemsLineHeightWithSpacing() -> use GetFrameHeightWithSpacing() + - ImGuiCol_ChildWindowBg -> use ImGuiCol_ChildBg + - ImGuiStyleVar_ChildWindowRounding -> use ImGuiStyleVar_ChildRounding + - ImGuiTreeNodeFlags_AllowOverlapMode -> use ImGuiTreeNodeFlags_AllowItemOverlap + - IMGUI_DISABLE_TEST_WINDOWS -> use IMGUI_DISABLE_DEMO_WINDOWS + - 2019/12/08 (1.75) - obsoleted calling ImDrawList::PrimReserve() with a negative count (which was vaguely documented and rarely if ever used). Instead, we added an explicit PrimUnreserve() API. + - 2019/12/06 (1.75) - removed implicit default parameter to IsMouseDragging(int button = 0) to be consistent with other mouse functions (none of the other functions have it). + - 2019/11/21 (1.74) - ImFontAtlas::AddCustomRectRegular() now requires an ID larger than 0x110000 (instead of 0x10000) to conform with supporting Unicode planes 1-16 in a future update. ID below 0x110000 will now assert. + - 2019/11/19 (1.74) - renamed IMGUI_DISABLE_FORMAT_STRING_FUNCTIONS to IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS for consistency. + - 2019/11/19 (1.74) - renamed IMGUI_DISABLE_MATH_FUNCTIONS to IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS for consistency. + - 2019/10/22 (1.74) - removed redirecting functions/enums that were marked obsolete in 1.52 (October 2017): + - Begin() [old 5 args version] -> use Begin() [3 args], use SetNextWindowSize() SetNextWindowBgAlpha() if needed + - IsRootWindowOrAnyChildHovered() -> use IsWindowHovered(ImGuiHoveredFlags_RootAndChildWindows) + - AlignFirstTextHeightToWidgets() -> use AlignTextToFramePadding() + - SetNextWindowPosCenter() -> use SetNextWindowPos() with a pivot of (0.5f, 0.5f) + - ImFont::Glyph -> use ImFontGlyph + - 2019/10/14 (1.74) - inputs: Fixed a miscalculation in the keyboard/mouse "typematic" repeat delay/rate calculation, used by keys and e.g. repeating mouse buttons as well as the GetKeyPressedAmount() function. + if you were using a non-default value for io.KeyRepeatRate (previous default was 0.250), you can add +io.KeyRepeatDelay to it to compensate for the fix. + The function was triggering on: 0.0 and (delay+rate*N) where (N>=1). Fixed formula responds to (N>=0). Effectively it made io.KeyRepeatRate behave like it was set to (io.KeyRepeatRate + io.KeyRepeatDelay). + If you never altered io.KeyRepeatRate nor used GetKeyPressedAmount() this won't affect you. - 2019/07/15 (1.72) - removed TreeAdvanceToLabelPos() which is rarely used and only does SetCursorPosX(GetCursorPosX() + GetTreeNodeToLabelSpacing()). Kept redirection function (will obsolete). - 2019/07/12 (1.72) - renamed ImFontAtlas::CustomRect to ImFontAtlasCustomRect. Kept redirection typedef (will obsolete). - - 2019/06/14 (1.72) - removed redirecting functions/enums names that were marked obsolete in 1.51 (June 2017): ImGuiCol_Column*, ImGuiSetCond_*, IsItemHoveredRect(), IsPosHoveringAnyWindow(), IsMouseHoveringAnyWindow(), IsMouseHoveringWindow(), IMGUI_ONCE_UPON_A_FRAME. Grep this log for details and new names. + - 2019/06/14 (1.72) - removed redirecting functions/enums names that were marked obsolete in 1.51 (June 2017): ImGuiCol_Column*, ImGuiSetCond_*, IsItemHoveredRect(), IsPosHoveringAnyWindow(), IsMouseHoveringAnyWindow(), IsMouseHoveringWindow(), IMGUI_ONCE_UPON_A_FRAME. Grep this log for details and new names, or see how they were implemented until 1.71. - 2019/06/07 (1.71) - rendering of child window outer decorations (bg color, border, scrollbars) is now performed as part of the parent window. If you have overlapping child windows in a same parent, and relied on their relative z-order to be mapped to their submission order, this will affect your rendering. This optimization is disabled if the parent window has no visual output, because it appears to be the most common situation leading to the creation of overlapping child windows. @@ -382,7 +804,7 @@ CODE - 2019/04/29 (1.70) - removed GetContentRegionAvailWidth(), use GetContentRegionAvail().x instead. Kept inline redirection function (will obsolete). - 2019/03/04 (1.69) - renamed GetOverlayDrawList() to GetForegroundDrawList(). Kept redirection function (will obsolete). - 2019/02/26 (1.69) - renamed ImGuiColorEditFlags_RGB/ImGuiColorEditFlags_HSV/ImGuiColorEditFlags_HEX to ImGuiColorEditFlags_DisplayRGB/ImGuiColorEditFlags_DisplayHSV/ImGuiColorEditFlags_DisplayHex. Kept redirection enums (will obsolete). - - 2019/02/14 (1.68) - made it illegal/assert when io.DisplayTime == 0.0f (with an exception for the first frame). If for some reason your time step calculation gives you a zero value, replace it with a dummy small value! + - 2019/02/14 (1.68) - made it illegal/assert when io.DisplayTime == 0.0f (with an exception for the first frame). If for some reason your time step calculation gives you a zero value, replace it with an arbitrarily small value! - 2019/02/01 (1.68) - removed io.DisplayVisibleMin/DisplayVisibleMax (which were marked obsolete and removed from viewport/docking branch already). - 2019/01/06 (1.67) - renamed io.InputCharacters[], marked internal as was always intended. Please don't access directly, and use AddInputCharacter() instead! - 2019/01/06 (1.67) - renamed ImFontAtlas::GlyphRangesBuilder to ImFontGlyphRangesBuilder. Kept redirection typedef (will obsolete). @@ -403,10 +825,10 @@ CODE - 2018/08/01 (1.63) - renamed io.OptCursorBlink to io.ConfigCursorBlink [-> io.ConfigInputTextCursorBlink in 1.65], io.OptMacOSXBehaviors to ConfigMacOSXBehaviors for consistency. - 2018/07/22 (1.63) - changed ImGui::GetTime() return value from float to double to avoid accumulating floating point imprecisions over time. - 2018/07/08 (1.63) - style: renamed ImGuiCol_ModalWindowDarkening to ImGuiCol_ModalWindowDimBg for consistency with other features. Kept redirection enum (will obsolete). - - 2018/06/08 (1.62) - examples: the imgui_impl_xxx files have been split to separate platform (Win32, Glfw, SDL2, etc.) from renderer (DX11, OpenGL, Vulkan, etc.). - old bindings will still work as is, however prefer using the separated bindings as they will be updated to support multi-viewports. - when adopting new bindings follow the main.cpp code of your preferred examples/ folder to know which functions to call. - in particular, note that old bindings called ImGui::NewFrame() at the end of their ImGui_ImplXXXX_NewFrame() function. + - 2018/06/08 (1.62) - examples: the imgui_impl_XXX files have been split to separate platform (Win32, GLFW, SDL2, etc.) from renderer (DX11, OpenGL, Vulkan, etc.). + old backends will still work as is, however prefer using the separated backends as they will be updated to support multi-viewports. + when adopting new backends follow the main.cpp code of your preferred examples/ folder to know which functions to call. + in particular, note that old backends called ImGui::NewFrame() at the end of their ImGui_ImplXXXX_NewFrame() function. - 2018/06/06 (1.62) - renamed GetGlyphRangesChinese() to GetGlyphRangesChineseFull() to distinguish other variants and discourage using the full set. - 2018/06/06 (1.62) - TreeNodeEx()/TreeNodeBehavior(): the ImGuiTreeNodeFlags_CollapsingHeader helper now include the ImGuiTreeNodeFlags_NoTreePushOnOpen flag. See Changelog for details. - 2018/05/03 (1.61) - DragInt(): the default compile-time format string has been changed from "%.0f" to "%d", as we are not using integers internally any more. @@ -416,7 +838,7 @@ CODE - 2018/04/28 (1.61) - obsoleted InputFloat() functions taking an optional "int decimal_precision" in favor of an equivalent and more flexible "const char* format", consistent with other functions. Kept redirection functions (will obsolete). - 2018/04/09 (1.61) - IM_DELETE() helper function added in 1.60 doesn't clear the input _pointer_ reference, more consistent with expectation and allows passing r-value. - - 2018/03/20 (1.60) - renamed io.WantMoveMouse to io.WantSetMousePos for consistency and ease of understanding (was added in 1.52, _not_ used by core and only honored by some binding ahead of merging the Nav branch). + - 2018/03/20 (1.60) - renamed io.WantMoveMouse to io.WantSetMousePos for consistency and ease of understanding (was added in 1.52, _not_ used by core and only honored by some backend ahead of merging the Nav branch). - 2018/03/12 (1.60) - removed ImGuiCol_CloseButton, ImGuiCol_CloseButtonActive, ImGuiCol_CloseButtonHovered as the closing cross uses regular button colors now. - 2018/03/08 (1.60) - changed ImFont::DisplayOffset.y to default to 0 instead of +1. Fixed rounding of Ascent/Descent to match TrueType renderer. If you were adding or subtracting to ImFont::DisplayOffset check if your fonts are correctly aligned vertically. - 2018/03/03 (1.60) - renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT and ImGuiMouseCursor_Count_ to ImGuiMouseCursor_COUNT for consistency with other public enums. @@ -460,7 +882,7 @@ CODE - 2017/10/11 (1.52) - renamed AlignFirstTextHeightToWidgets() to AlignTextToFramePadding(). Kept inline redirection function (will obsolete). - 2017/09/26 (1.52) - renamed ImFont::Glyph to ImFontGlyph. Kept redirection typedef (will obsolete). - 2017/09/25 (1.52) - removed SetNextWindowPosCenter() because SetNextWindowPos() now has the optional pivot information to do the same and more. Kept redirection function (will obsolete). - - 2017/08/25 (1.52) - io.MousePos needs to be set to ImVec2(-FLT_MAX,-FLT_MAX) when mouse is unavailable/missing. Previously ImVec2(-1,-1) was enough but we now accept negative mouse coordinates. In your binding if you need to support unavailable mouse, make sure to replace "io.MousePos = ImVec2(-1,-1)" with "io.MousePos = ImVec2(-FLT_MAX,-FLT_MAX)". + - 2017/08/25 (1.52) - io.MousePos needs to be set to ImVec2(-FLT_MAX,-FLT_MAX) when mouse is unavailable/missing. Previously ImVec2(-1,-1) was enough but we now accept negative mouse coordinates. In your backend if you need to support unavailable mouse, make sure to replace "io.MousePos = ImVec2(-1,-1)" with "io.MousePos = ImVec2(-FLT_MAX,-FLT_MAX)". - 2017/08/22 (1.51) - renamed IsItemHoveredRect() to IsItemRectHovered(). Kept inline redirection function (will obsolete). -> (1.52) use IsItemHovered(ImGuiHoveredFlags_RectOnly)! - renamed IsMouseHoveringAnyWindow() to IsAnyWindowHovered() for consistency. Kept inline redirection function (will obsolete). - renamed IsMouseHoveringWindow() to IsWindowRectHovered() for consistency. Kept inline redirection function (will obsolete). @@ -473,29 +895,24 @@ CODE - 2017/08/09 (1.51) - removed ValueColor() helpers, they are equivalent to calling Text(label) + SameLine() + ColorButton(). - 2017/08/08 (1.51) - removed ColorEditMode() and ImGuiColorEditMode in favor of ImGuiColorEditFlags and parameters to the various Color*() functions. The SetColorEditOptions() allows to initialize default but the user can still change them with right-click context menu. - changed prototype of 'ColorEdit4(const char* label, float col[4], bool show_alpha = true)' to 'ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flags = 0)', where passing flags = 0x01 is a safe no-op (hello dodgy backward compatibility!). - check and run the demo window, under "Color/Picker Widgets", to understand the various new options. - - changed prototype of rarely used 'ColorButton(ImVec4 col, bool small_height = false, bool outline_border = true)' to 'ColorButton(const char* desc_id, ImVec4 col, ImGuiColorEditFlags flags = 0, ImVec2 size = ImVec2(0,0))' + - changed prototype of rarely used 'ColorButton(ImVec4 col, bool small_height = false, bool outline_border = true)' to 'ColorButton(const char* desc_id, ImVec4 col, ImGuiColorEditFlags flags = 0, ImVec2 size = ImVec2(0, 0))' - 2017/07/20 (1.51) - removed IsPosHoveringAnyWindow(ImVec2), which was partly broken and misleading. ASSERT + redirect user to io.WantCaptureMouse - 2017/05/26 (1.50) - removed ImFontConfig::MergeGlyphCenterV in favor of a more multipurpose ImFontConfig::GlyphOffset. - 2017/05/01 (1.50) - renamed ImDrawList::PathFill() (rarely used directly) to ImDrawList::PathFillConvex() for clarity. - - 2016/11/06 (1.50) - BeginChild(const char*) now applies the stack id to the provided label, consistently with other functions as it should always have been. It shouldn't affect you unless (extremely unlikely) you were appending multiple times to a same child from different locations of the stack id. If that's the case, generate an id with GetId() and use it instead of passing string to BeginChild(). + - 2016/11/06 (1.50) - BeginChild(const char*) now applies the stack id to the provided label, consistently with other functions as it should always have been. It shouldn't affect you unless (extremely unlikely) you were appending multiple times to a same child from different locations of the stack id. If that's the case, generate an id with GetID() and use it instead of passing string to BeginChild(). - 2016/10/15 (1.50) - avoid 'void* user_data' parameter to io.SetClipboardTextFn/io.GetClipboardTextFn pointers. We pass io.ClipboardUserData to it. - 2016/09/25 (1.50) - style.WindowTitleAlign is now a ImVec2 (ImGuiAlign enum was removed). set to (0.5f,0.5f) for horizontal+vertical centering, (0.0f,0.0f) for upper-left, etc. - - 2016/07/30 (1.50) - SameLine(x) with x>0.0f is now relative to left of column/group if any, and not always to left of window. This was sort of always the intent and hopefully breakage should be minimal. + - 2016/07/30 (1.50) - SameLine(x) with x>0.0f is now relative to left of column/group if any, and not always to left of window. This was sort of always the intent and hopefully, breakage should be minimal. - 2016/05/12 (1.49) - title bar (using ImGuiCol_TitleBg/ImGuiCol_TitleBgActive colors) isn't rendered over a window background (ImGuiCol_WindowBg color) anymore. - If your TitleBg/TitleBgActive alpha was 1.0f or you are using the default theme it will not affect you. - If your TitleBg/TitleBgActive alpha was <1.0f you need to tweak your custom theme to readjust for the fact that we don't draw a WindowBg background behind the title bar. - This helper function will convert an old TitleBg/TitleBgActive color into a new one with the same visual output, given the OLD color and the OLD WindowBg color. - ImVec4 ConvertTitleBgCol(const ImVec4& win_bg_col, const ImVec4& title_bg_col) - { - float new_a = 1.0f - ((1.0f - win_bg_col.w) * (1.0f - title_bg_col.w)), k = title_bg_col.w / new_a; - return ImVec4((win_bg_col.x * win_bg_col.w + title_bg_col.x) * k, (win_bg_col.y * win_bg_col.w + title_bg_col.y) * k, (win_bg_col.z * win_bg_col.w + title_bg_col.z) * k, new_a); - } + If your TitleBg/TitleBgActive alpha was 1.0f or you are using the default theme it will not affect you, otherwise if <1.0f you need to tweak your custom theme to readjust for the fact that we don't draw a WindowBg background behind the title bar. + This helper function will convert an old TitleBg/TitleBgActive color into a new one with the same visual output, given the OLD color and the OLD WindowBg color: + ImVec4 ConvertTitleBgCol(const ImVec4& win_bg_col, const ImVec4& title_bg_col) { float new_a = 1.0f - ((1.0f - win_bg_col.w) * (1.0f - title_bg_col.w)), k = title_bg_col.w / new_a; return ImVec4((win_bg_col.x * win_bg_col.w + title_bg_col.x) * k, (win_bg_col.y * win_bg_col.w + title_bg_col.y) * k, (win_bg_col.z * win_bg_col.w + title_bg_col.z) * k, new_a); } If this is confusing, pick the RGB value from title bar from an old screenshot and apply this as TitleBg/TitleBgActive. Or you may just create TitleBgActive from a tweaked TitleBg color. - 2016/05/07 (1.49) - removed confusing set of GetInternalState(), GetInternalStateSize(), SetInternalState() functions. Now using CreateContext(), DestroyContext(), GetCurrentContext(), SetCurrentContext(). - 2016/05/02 (1.49) - renamed SetNextTreeNodeOpened() to SetNextTreeNodeOpen(), no redirection. - 2016/05/01 (1.49) - obsoleted old signature of CollapsingHeader(const char* label, const char* str_id = NULL, bool display_frame = true, bool default_open = false) as extra parameters were badly designed and rarely used. You can replace the "default_open = true" flag in new API with CollapsingHeader(label, ImGuiTreeNodeFlags_DefaultOpen). - 2016/04/26 (1.49) - changed ImDrawList::PushClipRect(ImVec4 rect) to ImDrawList::PushClipRect(Imvec2 min,ImVec2 max,bool intersect_with_current_clip_rect=false). Note that higher-level ImGui::PushClipRect() is preferable because it will clip at logic/widget level, whereas ImDrawList::PushClipRect() only affect your renderer. - - 2016/04/03 (1.48) - removed style.WindowFillAlphaDefault setting which was redundant. Bake default BG alpha inside style.Colors[ImGuiCol_WindowBg] and all other Bg color values. (ref github issue #337). + - 2016/04/03 (1.48) - removed style.WindowFillAlphaDefault setting which was redundant. Bake default BG alpha inside style.Colors[ImGuiCol_WindowBg] and all other Bg color values. (ref GitHub issue #337). - 2016/04/03 (1.48) - renamed ImGuiCol_TooltipBg to ImGuiCol_PopupBg, used by popups/menus and tooltips. popups/menus were previously using ImGuiCol_WindowBg. (ref github issue #337) - 2016/03/21 (1.48) - renamed GetWindowFont() to GetFont(), GetWindowFontSize() to GetFontSize(). Kept inline redirection function (will obsolete). - 2016/03/02 (1.48) - InputText() completion/history/always callbacks: if you modify the text buffer manually (without using DeleteChars()/InsertChars() helper) you need to maintain the BufTextLen field. added an assert. @@ -512,7 +929,7 @@ CODE you need to render your textured triangles with bilinear filtering to benefit from sub-pixel positioning of text. - 2015/07/08 (1.43) - switched rendering data to use indexed rendering. this is saving a fair amount of CPU/GPU and enables us to get anti-aliasing for a marginal cost. this necessary change will break your rendering function! the fix should be very easy. sorry for that :( - - if you are using a vanilla copy of one of the imgui_impl_XXXX.cpp provided in the example, you just need to update your copy and you can ignore the rest. + - if you are using a vanilla copy of one of the imgui_impl_XXX.cpp provided in the example, you just need to update your copy and you can ignore the rest. - the signature of the io.RenderDrawListsFn handler has changed! old: ImGui_XXXX_RenderDrawLists(ImDrawList** const cmd_lists, int cmd_lists_count) new: ImGui_XXXX_RenderDrawLists(ImDrawData* draw_data). @@ -526,7 +943,7 @@ CODE - 2015/07/02 (1.42) - renamed SetScrollPosHere() to SetScrollFromCursorPos(). Kept inline redirection function (will obsolete). - 2015/07/02 (1.42) - renamed GetScrollPosY() to GetScrollY(). Necessary to reduce confusion along with other scrolling functions, because positions (e.g. cursor position) are not equivalent to scrolling amount. - 2015/06/14 (1.41) - changed ImageButton() default bg_col parameter from (0,0,0,1) (black) to (0,0,0,0) (transparent) - makes a difference when texture have transparence - - 2015/06/14 (1.41) - changed Selectable() API from (label, selected, size) to (label, selected, flags, size). Size override should have been rarely be used. Sorry! + - 2015/06/14 (1.41) - changed Selectable() API from (label, selected, size) to (label, selected, flags, size). Size override should have been rarely used. Sorry! - 2015/05/31 (1.40) - renamed GetWindowCollapsed() to IsWindowCollapsed() for consistency. Kept inline redirection function (will obsolete). - 2015/05/31 (1.40) - renamed IsRectClipped() to IsRectVisible() for consistency. Note that return value is opposite! Kept inline redirection function (will obsolete). - 2015/05/27 (1.40) - removed the third 'repeat_if_held' parameter from Button() - sorry! it was rarely used and inconsistent. Use PushButtonRepeat(true) / PopButtonRepeat() to enable repeat on desired buttons. @@ -548,14 +965,13 @@ CODE - 2015/02/01 (1.31) - removed IO.MemReallocFn (unused) - 2015/01/19 (1.30) - renamed ImGuiStorage::GetIntPtr()/GetFloatPtr() to GetIntRef()/GetIntRef() because Ptr was conflicting with actual pointer storage functions. - 2015/01/11 (1.30) - big font/image API change! now loads TTF file. allow for multiple fonts. no need for a PNG loader. - (1.30) - removed GetDefaultFontData(). uses io.Fonts->GetTextureData*() API to retrieve uncompressed pixels. - font init: { const void* png_data; unsigned int png_size; ImGui::GetDefaultFontData(NULL, NULL, &png_data, &png_size); <..Upload texture to GPU..>; } - became: { unsigned char* pixels; int width, height; io.Fonts->GetTexDataAsRGBA32(&pixels, &width, &height); <..Upload texture to GPU>; io.Fonts->TexId = YourTextureIdentifier; } - you now have more flexibility to load multiple TTF fonts and manage the texture buffer for internal needs. - it is now recommended that you sample the font texture with bilinear interpolation. - (1.30) - added texture identifier in ImDrawCmd passed to your render function (we can now render images). make sure to set io.Fonts->TexID. - (1.30) - removed IO.PixelCenterOffset (unnecessary, can be handled in user projection matrix) - (1.30) - removed ImGui::IsItemFocused() in favor of ImGui::IsItemActive() which handles all widgets + - 2015/01/11 (1.30) - removed GetDefaultFontData(). uses io.Fonts->GetTextureData*() API to retrieve uncompressed pixels. + - old: const void* png_data; unsigned int png_size; ImGui::GetDefaultFontData(NULL, NULL, &png_data, &png_size); [..Upload texture to GPU..]; + - new: unsigned char* pixels; int width, height; io.Fonts->GetTexDataAsRGBA32(&pixels, &width, &height); [..Upload texture to GPU..]; io.Fonts->SetTexID(YourTexIdentifier); + you now have more flexibility to load multiple TTF fonts and manage the texture buffer for internal needs. It is now recommended that you sample the font texture with bilinear interpolation. + - 2015/01/11 (1.30) - added texture identifier in ImDrawCmd passed to your render function (we can now render images). make sure to call io.Fonts->SetTexID() + - 2015/01/11 (1.30) - removed IO.PixelCenterOffset (unnecessary, can be handled in user projection matrix) + - 2015/01/11 (1.30) - removed ImGui::IsItemFocused() in favor of ImGui::IsItemActive() which handles all widgets - 2014/12/10 (1.18) - removed SetNewWindowDefaultPos() in favor of new generic API SetNextWindowPos(pos, ImGuiSetCondition_FirstUseEver) - 2014/11/28 (1.17) - moved IO.Font*** options to inside the IO.Font-> structure (FontYOffset, FontTexUvForWhite, FontBaseScale, FontFallbackGlyph) - 2014/11/26 (1.17) - reworked syntax of IMGUI_ONCE_UPON_A_FRAME helper macro to increase compiler compatibility @@ -569,518 +985,319 @@ CODE - 2014/08/28 (1.09) - changed the behavior of IO.PixelCenterOffset following various rendering fixes - FREQUENTLY ASKED QUESTIONS (FAQ), TIPS - ====================================== + FREQUENTLY ASKED QUESTIONS (FAQ) + ================================ + + Read all answers online: + https://www.dearimgui.com/faq or https://github.com/ocornut/imgui/blob/master/docs/FAQ.md (same url) + Read all answers locally (with a text editor or ideally a Markdown viewer): + docs/FAQ.md + Some answers are copied down here to facilitate searching in code. + + Q&A: Basics + =========== Q: Where is the documentation? - A: This library is poorly documented at the moment and expects of the user to be acquainted with C/C++. - - Run the examples/ and explore them. + A: This library is poorly documented at the moment and expects the user to be acquainted with C/C++. + - Run the examples/ applications and explore them. + - Read Getting Started (https://github.com/ocornut/imgui/wiki/Getting-Started) guide. - See demo code in imgui_demo.cpp and particularly the ImGui::ShowDemoWindow() function. - The demo covers most features of Dear ImGui, so you can read the code and see its output. - See documentation and comments at the top of imgui.cpp + effectively imgui.h. - - Dozens of standalone example applications using e.g. OpenGL/DirectX are provided in the examples/ - folder to explain how to integrate Dear ImGui with your own engine/application. + - 20+ standalone example applications using e.g. OpenGL/DirectX are provided in the + examples/ folder to explain how to integrate Dear ImGui with your own engine/application. + - The Wiki (https://github.com/ocornut/imgui/wiki) has many resources and links. + - The Glossary (https://github.com/ocornut/imgui/wiki/Glossary) page also may be useful. - Your programming IDE is your friend, find the type or function declaration to find comments - associated to it. + associated with it. + Q: What is this library called? Q: Which version should I get? - A: I occasionally tag Releases (https://github.com/ocornut/imgui/releases) but it is generally safe - and recommended to sync to master/latest. The library is fairly stable and regressions tend to be - fixed fast when reported. You may also peak at the 'docking' branch which includes: - - Docking/Merging features (https://github.com/ocornut/imgui/issues/2109) - - Multi-viewport features (https://github.com/ocornut/imgui/issues/1542) - Many projects are using this branch and it is kept in sync with master regularly. + >> This library is called "Dear ImGui", please don't call it "ImGui" :) + >> See https://www.dearimgui.com/faq for details. + + Q&A: Integration + ================ + + Q: How to get started? + A: Read https://github.com/ocornut/imgui/wiki/Getting-Started. Read 'PROGRAMMER GUIDE' above. Read examples/README.txt. + + Q: How can I tell whether to dispatch mouse/keyboard to Dear ImGui or my application? + A: You should read the 'io.WantCaptureMouse', 'io.WantCaptureKeyboard' and 'io.WantTextInput' flags! + >> See https://www.dearimgui.com/faq for a fully detailed answer. You really want to read this. + + Q. How can I enable keyboard or gamepad controls? + Q: How can I use this on a machine without mouse, keyboard or screen? (input share, remote display) + Q: I integrated Dear ImGui in my engine and little squares are showing instead of text... + Q: I integrated Dear ImGui in my engine and some elements are clipping or disappearing when I move windows around... + Q: I integrated Dear ImGui in my engine and some elements are displaying outside their expected windows boundaries... + >> See https://www.dearimgui.com/faq + + Q&A: Usage + ---------- + + Q: About the ID Stack system.. + - Why is my widget not reacting when I click on it? + - How can I have widgets with an empty label? + - How can I have multiple widgets with the same label? + - How can I have multiple windows with the same label? + Q: How can I display an image? What is ImTextureID, how does it work? + Q: How can I use my own math types instead of ImVec2? + Q: How can I interact with standard C++ types (such as std::string and std::vector)? + Q: How can I display custom shapes? (using low-level ImDrawList API) + >> See https://www.dearimgui.com/faq + + Q&A: Fonts, Text + ================ + + Q: How should I handle DPI in my application? + Q: How can I load a different font than the default? + Q: How can I easily use icons in my application? + Q: How can I load multiple fonts? + Q: How can I display and input non-Latin characters such as Chinese, Japanese, Korean, Cyrillic? + >> See https://www.dearimgui.com/faq and https://github.com/ocornut/imgui/blob/master/docs/FONTS.md + + Q&A: Concerns + ============= Q: Who uses Dear ImGui? - A: See "Quotes" (https://github.com/ocornut/imgui/wiki/Quotes) and - "Software using Dear ImGui" (https://github.com/ocornut/imgui/wiki/Software-using-dear-imgui) Wiki pages - for a list of games/software which are publicly known to use dear imgui. Please add yours if you can! + Q: Can you create elaborate/serious tools with Dear ImGui? + Q: Can you reskin the look of Dear ImGui? + Q: Why using C++ (as opposed to C)? + >> See https://www.dearimgui.com/faq - Q: Why the odd dual naming, "Dear ImGui" vs "ImGui"? - A: The library started its life as "ImGui" due to the fact that I didn't give it a proper name when - when I released 1.0, and had no particular expectation that it would take off. However, the term IMGUI - (immediate-mode graphical user interface) was coined before and is being used in variety of other - situations (e.g. Unity uses it own implementation of the IMGUI paradigm). - To reduce the ambiguity without affecting existing code bases, I have decided on an alternate, - longer name "Dear ImGui" that people can use to refer to this specific library. - Please try to refer to this library as "Dear ImGui". - - Q: How can I tell whether to dispatch mouse/keyboard to Dear ImGui or to my application? - A: You can read the 'io.WantCaptureMouse', 'io.WantCaptureKeyboard' and 'io.WantTextInput' flags from the ImGuiIO structure (e.g. if (ImGui::GetIO().WantCaptureMouse) { ... } ) - - When 'io.WantCaptureMouse' is set, imgui wants to use your mouse state, and you may want to discard/hide the inputs from the rest of your application. - - When 'io.WantCaptureKeyboard' is set, imgui wants to use your keyboard state, and you may want to discard/hide the inputs from the rest of your application. - - When 'io.WantTextInput' is set to may want to notify your OS to popup an on-screen keyboard, if available (e.g. on a mobile phone, or console OS). - Note: you should always pass your mouse/keyboard inputs to imgui, even when the io.WantCaptureXXX flag are set false. - This is because imgui needs to detect that you clicked in the void to unfocus its own windows. - Note: The 'io.WantCaptureMouse' is more accurate that any attempt to "check if the mouse is hovering a window" (don't do that!). - It handle mouse dragging correctly (both dragging that started over your application or over an imgui window) and handle e.g. modal windows blocking inputs. - Those flags are updated by ImGui::NewFrame(). Preferably read the flags after calling NewFrame() if you can afford it, but reading them before is also - perfectly fine, as the bool toggle fairly rarely. If you have on a touch device, you might find use for an early call to UpdateHoveredWindowAndCaptureFlags(). - Note: Text input widget releases focus on "Return KeyDown", so the subsequent "Return KeyUp" event that your application receive will typically - have 'io.WantCaptureKeyboard=false'. Depending on your application logic it may or not be inconvenient. You might want to track which key-downs - were targeted for Dear ImGui, e.g. with an array of bool, and filter out the corresponding key-ups.) - - Q: How can I display an image? What is ImTextureID, how does it works? - A: Short explanation: - - Please read Wiki entry for examples: https://github.com/ocornut/imgui/wiki/Image-Loading-and-Displaying-Examples - - You may use functions such as ImGui::Image(), ImGui::ImageButton() or lower-level ImDrawList::AddImage() to emit draw calls that will use your own textures. - - Actual textures are identified in a way that is up to the user/engine. Those identifiers are stored and passed as ImTextureID (void*) value. - - Loading image files from the disk and turning them into a texture is not within the scope of Dear ImGui (for a good reason). - Please read documentations or tutorials on your graphics API to understand how to display textures on the screen before moving onward. - - Long explanation: - - Dear ImGui's job is to create "meshes", defined in a renderer-agnostic format made of draw commands and vertices. - At the end of the frame those meshes (ImDrawList) will be displayed by your rendering function. They are made up of textured polygons and the code - to render them is generally fairly short (a few dozen lines). In the examples/ folder we provide functions for popular graphics API (OpenGL, DirectX, etc.). - - Each rendering function decides on a data type to represent "textures". The concept of what is a "texture" is entirely tied to your underlying engine/graphics API. - We carry the information to identify a "texture" in the ImTextureID type. - ImTextureID is nothing more that a void*, aka 4/8 bytes worth of data: just enough to store 1 pointer or 1 integer of your choice. - Dear ImGui doesn't know or understand what you are storing in ImTextureID, it merely pass ImTextureID values until they reach your rendering function. - - In the examples/ bindings, for each graphics API binding we decided on a type that is likely to be a good representation for specifying - an image from the end-user perspective. This is what the _examples_ rendering functions are using: - - OpenGL: ImTextureID = GLuint (see ImGui_ImplOpenGL3_RenderDrawData() function in imgui_impl_opengl3.cpp) - DirectX9: ImTextureID = LPDIRECT3DTEXTURE9 (see ImGui_ImplDX9_RenderDrawData() function in imgui_impl_dx9.cpp) - DirectX11: ImTextureID = ID3D11ShaderResourceView* (see ImGui_ImplDX11_RenderDrawData() function in imgui_impl_dx11.cpp) - DirectX12: ImTextureID = D3D12_GPU_DESCRIPTOR_HANDLE (see ImGui_ImplDX12_RenderDrawData() function in imgui_impl_dx12.cpp) - - For example, in the OpenGL example binding we store raw OpenGL texture identifier (GLuint) inside ImTextureID. - Whereas in the DirectX11 example binding we store a pointer to ID3D11ShaderResourceView inside ImTextureID, which is a higher-level structure - tying together both the texture and information about its format and how to read it. - - If you have a custom engine built over e.g. OpenGL, instead of passing GLuint around you may decide to use a high-level data type to carry information about - the texture as well as how to display it (shaders, etc.). The decision of what to use as ImTextureID can always be made better knowing how your codebase - is designed. If your engine has high-level data types for "textures" and "material" then you may want to use them. - If you are starting with OpenGL or DirectX or Vulkan and haven't built much of a rendering engine over them, keeping the default ImTextureID - representation suggested by the example bindings is probably the best choice. - (Advanced users may also decide to keep a low-level type in ImTextureID, and use ImDrawList callback and pass information to their renderer) - - User code may do: - - // Cast our texture type to ImTextureID / void* - MyTexture* texture = g_CoffeeTableTexture; - ImGui::Image((void*)texture, ImVec2(texture->Width, texture->Height)); - - The renderer function called after ImGui::Render() will receive that same value that the user code passed: - - // Cast ImTextureID / void* stored in the draw command as our texture type - MyTexture* texture = (MyTexture*)pcmd->TextureId; - MyEngineBindTexture2D(texture); - - Once you understand this design you will understand that loading image files and turning them into displayable textures is not within the scope of Dear ImGui. - This is by design and is actually a good thing, because it means your code has full control over your data types and how you display them. - If you want to display an image file (e.g. PNG file) into the screen, please refer to documentation and tutorials for the graphics API you are using. - - Refer to the Wiki to find simplified examples for loading textures with OpenGL, DirectX9 and DirectX11: - - https://github.com/ocornut/imgui/wiki/Image-Loading-and-Displaying-Examples - - C/C++ tip: a void* is pointer-sized storage. You may safely store any pointer or integer into it by casting your value to ImTextureID / void*, and vice-versa. - Because both end-points (user code and rendering function) are under your control, you know exactly what is stored inside the ImTextureID / void*. - Examples: - - GLuint my_tex = XXX; - void* my_void_ptr; - my_void_ptr = (void*)(intptr_t)my_tex; // cast a GLuint into a void* (we don't take its address! we literally store the value inside the pointer) - my_tex = (GLuint)(intptr_t)my_void_ptr; // cast a void* into a GLuint - - ID3D11ShaderResourceView* my_dx11_srv = XXX; - void* my_void_ptr; - my_void_ptr = (void*)my_dx11_srv; // cast a ID3D11ShaderResourceView* into an opaque void* - my_dx11_srv = (ID3D11ShaderResourceView*)my_void_ptr; // cast a void* into a ID3D11ShaderResourceView* - - Finally, you may call ImGui::ShowMetricsWindow() to explore/visualize/understand how the ImDrawList are generated. - - Q: Why are multiple widgets reacting when I interact with a single one? - Q: How can I have multiple widgets with the same label or with an empty label? - A: A primer on labels and the ID Stack... - - Dear ImGui internally need to uniquely identify UI elements. - Elements that are typically not clickable (such as calls to the Text functions) don't need an ID. - Interactive widgets (such as calls to Button buttons) need a unique ID. - Unique ID are used internally to track active widgets and occasionally associate state to widgets. - Unique ID are implicitly built from the hash of multiple elements that identify the "path" to the UI element. - - - Unique ID are often derived from a string label: - - Button("OK"); // Label = "OK", ID = hash of (..., "OK") - Button("Cancel"); // Label = "Cancel", ID = hash of (..., "Cancel") - - - ID are uniquely scoped within windows, tree nodes, etc. which all pushes to the ID stack. Having - two buttons labeled "OK" in different windows or different tree locations is fine. - We used "..." above to signify whatever was already pushed to the ID stack previously: - - Begin("MyWindow"); - Button("OK"); // Label = "OK", ID = hash of ("MyWindow", "OK") - End(); - Begin("MyOtherWindow"); - Button("OK"); // Label = "OK", ID = hash of ("MyOtherWindow", "OK") - End(); - - - If you have a same ID twice in the same location, you'll have a conflict: - - Button("OK"); - Button("OK"); // ID collision! Interacting with either button will trigger the first one. - - Fear not! this is easy to solve and there are many ways to solve it! - - - Solving ID conflict in a simple/local context: - When passing a label you can optionally specify extra ID information within string itself. - Use "##" to pass a complement to the ID that won't be visible to the end-user. - This helps solving the simple collision cases when you know e.g. at compilation time which items - are going to be created: - - Begin("MyWindow"); - Button("Play"); // Label = "Play", ID = hash of ("MyWindow", "Play") - Button("Play##foo1"); // Label = "Play", ID = hash of ("MyWindow", "Play##foo1") // Different from above - Button("Play##foo2"); // Label = "Play", ID = hash of ("MyWindow", "Play##foo2") // Different from above - End(); - - - If you want to completely hide the label, but still need an ID: - - Checkbox("##On", &b); // Label = "", ID = hash of (..., "##On") // No visible label, just a checkbox! - - - Occasionally/rarely you might want change a label while preserving a constant ID. This allows - you to animate labels. For example you may want to include varying information in a window title bar, - but windows are uniquely identified by their ID. Use "###" to pass a label that isn't part of ID: - - Button("Hello###ID"); // Label = "Hello", ID = hash of (..., "###ID") - Button("World###ID"); // Label = "World", ID = hash of (..., "###ID") // Same as above, even though the label looks different - - sprintf(buf, "My game (%f FPS)###MyGame", fps); - Begin(buf); // Variable title, ID = hash of "MyGame" - - - Solving ID conflict in a more general manner: - Use PushID() / PopID() to create scopes and manipulate the ID stack, as to avoid ID conflicts - within the same window. This is the most convenient way of distinguishing ID when iterating and - creating many UI elements programmatically. - You can push a pointer, a string or an integer value into the ID stack. - Remember that ID are formed from the concatenation of _everything_ pushed into the ID stack. - At each level of the stack we store the seed used for items at this level of the ID stack. - - Begin("Window"); - for (int i = 0; i < 100; i++) - { - PushID(i); // Push i to the id tack - Button("Click"); // Label = "Click", ID = hash of ("Window", i, "Click") - PopID(); - } - for (int i = 0; i < 100; i++) - { - MyObject* obj = Objects[i]; - PushID(obj); - Button("Click"); // Label = "Click", ID = hash of ("Window", obj pointer, "Click") - PopID(); - } - for (int i = 0; i < 100; i++) - { - MyObject* obj = Objects[i]; - PushID(obj->Name); - Button("Click"); // Label = "Click", ID = hash of ("Window", obj->Name, "Click") - PopID(); - } - End(); - - - You can stack multiple prefixes into the ID stack: - - Button("Click"); // Label = "Click", ID = hash of (..., "Click") - PushID("node"); - Button("Click"); // Label = "Click", ID = hash of (..., "node", "Click") - PushID(my_ptr); - Button("Click"); // Label = "Click", ID = hash of (..., "node", my_ptr, "Click") - PopID(); - PopID(); - - - Tree nodes implicitly creates a scope for you by calling PushID(). - - Button("Click"); // Label = "Click", ID = hash of (..., "Click") - if (TreeNode("node")) // <-- this function call will do a PushID() for you (unless instructed not to, with a special flag) - { - Button("Click"); // Label = "Click", ID = hash of (..., "node", "Click") - TreePop(); - } - - - When working with trees, ID are used to preserve the open/close state of each tree node. - Depending on your use cases you may want to use strings, indices or pointers as ID. - e.g. when following a single pointer that may change over time, using a static string as ID - will preserve your node open/closed state when the targeted object change. - e.g. when displaying a list of objects, using indices or pointers as ID will preserve the - node open/closed state differently. See what makes more sense in your situation! - - Q: How can I use my own math types instead of ImVec2/ImVec4? - A: You can edit imconfig.h and setup the IM_VEC2_CLASS_EXTRA/IM_VEC4_CLASS_EXTRA macros to add implicit type conversions. - This way you'll be able to use your own types everywhere, e.g. passing glm::vec2 to ImGui functions instead of ImVec2. - - Q: How can I load a different font than the default? - A: Use the font atlas to load the TTF/OTF file you want: - ImGuiIO& io = ImGui::GetIO(); - io.Fonts->AddFontFromFileTTF("myfontfile.ttf", size_in_pixels); - io.Fonts->GetTexDataAsRGBA32() or GetTexDataAsAlpha8() - Default is ProggyClean.ttf, monospace, rendered at size 13, embedded in dear imgui's source code. - (Tip: monospace fonts are convenient because they allow to facilitate horizontal alignment directly at the string level.) - (Read the 'misc/fonts/README.txt' file for more details about font loading.) - - New programmers: remember that in C/C++ and most programming languages if you want to use a - backslash \ within a string literal, you need to write it double backslash "\\": - io.Fonts->AddFontFromFileTTF("MyDataFolder\MyFontFile.ttf", size_in_pixels); // WRONG (you are escape the M here!) - io.Fonts->AddFontFromFileTTF("MyDataFolder\\MyFontFile.ttf", size_in_pixels); // CORRECT - io.Fonts->AddFontFromFileTTF("MyDataFolder/MyFontFile.ttf", size_in_pixels); // ALSO CORRECT - - Q: How can I easily use icons in my application? - A: The most convenient and practical way is to merge an icon font such as FontAwesome inside you - main font. Then you can refer to icons within your strings. - You may want to see ImFontConfig::GlyphMinAdvanceX to make your icon look monospace to facilitate alignment. - (Read the 'misc/fonts/README.txt' file for more details about icons font loading.) - With some extra effort, you may use colorful icon by registering custom rectangle space inside the font atlas, - and copying your own graphics data into it. See misc/fonts/README.txt about using the AddCustomRectFontGlyph API. - - Q: How can I load multiple fonts? - A: Use the font atlas to pack them into a single texture: - (Read the 'misc/fonts/README.txt' file and the code in ImFontAtlas for more details.) - - ImGuiIO& io = ImGui::GetIO(); - ImFont* font0 = io.Fonts->AddFontDefault(); - ImFont* font1 = io.Fonts->AddFontFromFileTTF("myfontfile.ttf", size_in_pixels); - ImFont* font2 = io.Fonts->AddFontFromFileTTF("myfontfile2.ttf", size_in_pixels); - io.Fonts->GetTexDataAsRGBA32() or GetTexDataAsAlpha8() - // the first loaded font gets used by default - // use ImGui::PushFont()/ImGui::PopFont() to change the font at runtime - - // Options - ImFontConfig config; - config.OversampleH = 2; - config.OversampleV = 1; - config.GlyphOffset.y -= 1.0f; // Move everything by 1 pixels up - config.GlyphExtraSpacing.x = 1.0f; // Increase spacing between characters - io.Fonts->AddFontFromFileTTF("myfontfile.ttf", size_pixels, &config); - - // Combine multiple fonts into one (e.g. for icon fonts) - static ImWchar ranges[] = { 0xf000, 0xf3ff, 0 }; - ImFontConfig config; - config.MergeMode = true; - io.Fonts->AddFontDefault(); - io.Fonts->AddFontFromFileTTF("fontawesome-webfont.ttf", 16.0f, &config, ranges); // Merge icon font - io.Fonts->AddFontFromFileTTF("myfontfile.ttf", size_pixels, NULL, &config, io.Fonts->GetGlyphRangesJapanese()); // Merge japanese glyphs - - Q: How can I display and input non-Latin characters such as Chinese, Japanese, Korean, Cyrillic? - A: When loading a font, pass custom Unicode ranges to specify the glyphs to load. - - // Add default Japanese ranges - io.Fonts->AddFontFromFileTTF("myfontfile.ttf", size_in_pixels, NULL, io.Fonts->GetGlyphRangesJapanese()); - - // Or create your own custom ranges (e.g. for a game you can feed your entire game script and only build the characters the game need) - ImVector ranges; - ImFontGlyphRangesBuilder builder; - builder.AddText("Hello world"); // Add a string (here "Hello world" contains 7 unique characters) - builder.AddChar(0x7262); // Add a specific character - builder.AddRanges(io.Fonts->GetGlyphRangesJapanese()); // Add one of the default ranges - builder.BuildRanges(&ranges); // Build the final result (ordered ranges with all the unique characters submitted) - io.Fonts->AddFontFromFileTTF("myfontfile.ttf", size_in_pixels, NULL, ranges.Data); - - All your strings needs to use UTF-8 encoding. In C++11 you can encode a string literal in UTF-8 - by using the u8"hello" syntax. Specifying literal in your source code using a local code page - (such as CP-923 for Japanese or CP-1251 for Cyrillic) will NOT work! - Otherwise you can convert yourself to UTF-8 or load text data from file already saved as UTF-8. - - Text input: it is up to your application to pass the right character code by calling io.AddInputCharacter(). - The applications in examples/ are doing that. - Windows: you can use the WM_CHAR or WM_UNICHAR or WM_IME_CHAR message (depending if your app is built using Unicode or MultiByte mode). - You may also use MultiByteToWideChar() or ToUnicode() to retrieve Unicode codepoints from MultiByte characters or keyboard state. - Windows: if your language is relying on an Input Method Editor (IME), you copy the HWND of your window to io.ImeWindowHandle in order for - the default implementation of io.ImeSetInputScreenPosFn() to set your Microsoft IME position correctly. - - Q: How can I interact with standard C++ types (such as std::string and std::vector)? - A: - Being highly portable (bindings for several languages, frameworks, programming style, obscure or older platforms/compilers), - and aiming for compatibility & performance suitable for every modern real-time game engines, dear imgui does not use - any of std C++ types. We use raw types (e.g. char* instead of std::string) because they adapt to more use cases. - - To use ImGui::InputText() with a std::string or any resizable string class, see misc/cpp/imgui_stdlib.h. - - To use combo boxes and list boxes with std::vector or any other data structure: the BeginCombo()/EndCombo() API - lets you iterate and submit items yourself, so does the ListBoxHeader()/ListBoxFooter() API. - Prefer using them over the old and awkward Combo()/ListBox() api. - - Generally for most high-level types you should be able to access the underlying data type. - You may write your own one-liner wrappers to facilitate user code (tip: add new functions in ImGui:: namespace from your code). - - Dear ImGui applications often need to make intensive use of strings. It is expected that many of the strings you will pass - to the API are raw literals (free in C/C++) or allocated in a manner that won't incur a large cost on your application. - Please bear in mind that using std::string on applications with large amount of UI may incur unsatisfactory performances. - Modern implementations of std::string often include small-string optimization (which is often a local buffer) but those - are not configurable and not the same across implementations. - - If you are finding your UI traversal cost to be too large, make sure your string usage is not leading to excessive amount - of heap allocations. Consider using literals, statically sized buffers and your own helper functions. A common pattern - is that you will need to build lots of strings on the fly, and their maximum length can be easily be scoped ahead. - One possible implementation of a helper to facilitate printf-style building of strings: https://github.com/ocornut/Str - This is a small helper where you can instance strings with configurable local buffers length. Many game engines will - provide similar or better string helpers. - - Q: How can I use the drawing facilities without an ImGui window? (using ImDrawList API) - A: - You can create a dummy window. Call Begin() with the NoBackground | NoDecoration | NoSavedSettings | NoInputs flags. - (The ImGuiWindowFlags_NoDecoration flag itself is a shortcut for NoTitleBar | NoResize | NoScrollbar | NoCollapse) - Then you can retrieve the ImDrawList* via GetWindowDrawList() and draw to it in any way you like. - - You can call ImGui::GetBackgroundDrawList() or ImGui::GetForegroundDrawList() and use those draw list to display - contents behind or over every other imgui windows (one bg/fg drawlist per viewport). - - You can create your own ImDrawList instance. You'll need to initialize them ImGui::GetDrawListSharedData(), or create - your own ImDrawListSharedData, and then call your rendered code with your own ImDrawList or ImDrawData data. - - Q: How can I use this without a mouse, without a keyboard or without a screen? (gamepad, input share, remote display) - A: - You can control Dear ImGui with a gamepad. Read about navigation in "Using gamepad/keyboard navigation controls". - (short version: map gamepad inputs into the io.NavInputs[] array + set io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad) - - You can share your computer mouse seamlessly with your console/tablet/phone using Synergy (https://symless.com/synergy) - This is the preferred solution for developer productivity. - In particular, the "micro-synergy-client" repository (https://github.com/symless/micro-synergy-client) has simple - and portable source code (uSynergy.c/.h) for a small embeddable client that you can use on any platform to connect - to your host computer, based on the Synergy 1.x protocol. Make sure you download the Synergy 1 server on your computer. - Console SDK also sometimes provide equivalent tooling or wrapper for Synergy-like protocols. - - You may also use a third party solution such as Remote ImGui (https://github.com/JordiRos/remoteimgui) which sends - the vertices to render over the local network, allowing you to use Dear ImGui even on a screen-less machine. - - For touch inputs, you can increase the hit box of widgets (via the style.TouchPadding setting) to accommodate - for the lack of precision of touch inputs, but it is recommended you use a mouse or gamepad to allow optimizing - for screen real-estate and precision. - - Q: I integrated Dear ImGui in my engine and the text or lines are blurry.. - A: In your Render function, try translating your projection matrix by (0.5f,0.5f) or (0.375f,0.375f). - Also make sure your orthographic projection matrix and io.DisplaySize matches your actual framebuffer dimension. - - Q: I integrated Dear ImGui in my engine and some elements are clipping or disappearing when I move windows around.. - A: You are probably mishandling the clipping rectangles in your render function. - Rectangles provided by ImGui are defined as (x1=left,y1=top,x2=right,y2=bottom) and NOT as (x1,y1,width,height). + Q&A: Community + ============== Q: How can I help? - A: - If you are experienced with Dear ImGui and C++, look at the github issues, look at the Wiki, read docs/TODO.txt - and see how you want to help and can help! - - Businesses: convince your company to fund development via support contracts/sponsoring! This is among the most useful thing you can do for dear imgui. - - Individuals: you can also become a Patron (http://www.patreon.com/imgui) or donate on PayPal! See README. - - Disclose your usage of dear imgui via a dev blog post, a tweet, a screenshot, a mention somewhere etc. - You may post screenshot or links in the gallery threads (github.com/ocornut/imgui/issues/1902). Visuals are ideal as they inspire other programmers. - But even without visuals, disclosing your use of dear imgui help the library grow credibility, and help other teams and programmers with taking decisions. - - If you have issues or if you need to hack into the library, even if you don't expect any support it is useful that you share your issues (on github or privately). - - - tip: you can call Begin() multiple times with the same name during the same frame, it will keep appending to the same window. - this is also useful to set yourself in the context of another window (to get/set other settings) - - tip: you can create widgets without a Begin()/End() block, they will go in an implicit window called "Debug". - - tip: the ImGuiOnceUponAFrame helper will allow run the block of code only once a frame. You can use it to quickly add custom UI in the middle - of a deep nested inner loop in your code. - - tip: you can call Render() multiple times (e.g for VR renders). - - tip: call and read the ShowDemoWindow() code in imgui_demo.cpp for more example of how to use ImGui! + A: - Businesses: please reach out to "omar AT dearimgui DOT com" if you work in a place using Dear ImGui! + We can discuss ways for your company to fund development via invoiced technical support, maintenance or sponsoring contacts. + This is among the most useful thing you can do for Dear ImGui. With increased funding, we sustain and grow work on this project. + >>> See https://github.com/ocornut/imgui/wiki/Funding + - Businesses: you can also purchase licenses for the Dear ImGui Automation/Test Engine. + - If you are experienced with Dear ImGui and C++, look at the GitHub issues, look at the Wiki, and see how you want to help and can help! + - Disclose your usage of Dear ImGui via a dev blog post, a tweet, a screenshot, a mention somewhere etc. + You may post screenshot or links in the gallery threads. Visuals are ideal as they inspire other programmers. + But even without visuals, disclosing your use of dear imgui helps the library grow credibility, and help other teams and programmers with taking decisions. + - If you have issues or if you need to hack into the library, even if you don't expect any support it is useful that you share your issues (on GitHub or privately). */ +//------------------------------------------------------------------------- +// [SECTION] INCLUDES +//------------------------------------------------------------------------- + #if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS) #define _CRT_SECURE_NO_WARNINGS #endif -#include "imgui.h" #ifndef IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS #endif + +#include "imgui.h" +#ifndef IMGUI_DISABLE #include "imgui_internal.h" -#include // toupper +// System includes #include // vsnprintf, sscanf, printf -#if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier -#include // intptr_t -#else #include // intptr_t + +// [Windows] On non-Visual Studio compilers, we default to IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS unless explicitly enabled +#if defined(_WIN32) && !defined(_MSC_VER) && !defined(IMGUI_ENABLE_WIN32_DEFAULT_IME_FUNCTIONS) && !defined(IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS) +#define IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS #endif -// Debug options -#define IMGUI_DEBUG_NAV_SCORING 0 // Display navigation scoring preview when hovering items. Display last moving direction matches when holding CTRL -#define IMGUI_DEBUG_NAV_RECTS 0 // Display the reference navigation rectangle for each window -#define IMGUI_DEBUG_INI_SETTINGS 0 // Save additional comments in .ini file +// [Windows] OS specific includes (optional) +#if defined(_WIN32) && defined(IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS) && defined(IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS) && defined(IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS) && defined(IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS) && !defined(IMGUI_DISABLE_WIN32_FUNCTIONS) +#define IMGUI_DISABLE_WIN32_FUNCTIONS +#endif +#if defined(_WIN32) && !defined(IMGUI_DISABLE_WIN32_FUNCTIONS) +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif +#ifndef NOMINMAX +#define NOMINMAX +#endif +#ifndef __MINGW32__ +#include // _wfopen, OpenClipboard +#else +#include +#endif +#if defined(WINAPI_FAMILY) && ((defined(WINAPI_FAMILY_APP) && WINAPI_FAMILY == WINAPI_FAMILY_APP) || (defined(WINAPI_FAMILY_GAMES) && WINAPI_FAMILY == WINAPI_FAMILY_GAMES)) +// The UWP and GDK Win32 API subsets don't support clipboard nor IME functions +#define IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS +#define IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS +#define IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS +#endif +#endif + +// [Apple] OS specific includes +#if defined(__APPLE__) +#include +#endif // Visual Studio warnings #ifdef _MSC_VER -#pragma warning (disable: 4127) // condition expression is constant -#pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen +#pragma warning (disable: 4127) // condition expression is constant +#pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen +#if defined(_MSC_VER) && _MSC_VER >= 1922 // MSVC 2019 16.2 or later +#pragma warning (disable: 5054) // operator '|': deprecated between enumerations of different types +#endif +#pragma warning (disable: 26451) // [Static Analyzer] Arithmetic overflow : Using operator 'xxx' on a 4 byte value and then casting the result to an 8 byte value. Cast the value to the wider type before calling operator 'xxx' to avoid overflow(io.2). +#pragma warning (disable: 26495) // [Static Analyzer] Variable 'XXX' is uninitialized. Always initialize a member variable (type.6). +#pragma warning (disable: 26812) // [Static Analyzer] The enum type 'xxx' is unscoped. Prefer 'enum class' over 'enum' (Enum.3). #endif // Clang/GCC warnings with -Weverything #if defined(__clang__) -#pragma clang diagnostic ignored "-Wunknown-pragmas" // warning : unknown warning group '-Wformat-pedantic *' // not all warnings are known by all clang versions.. so ignoring warnings triggers new warnings on some configuration. great! -#pragma clang diagnostic ignored "-Wold-style-cast" // warning : use of old-style cast // yes, they are more terse. -#pragma clang diagnostic ignored "-Wfloat-equal" // warning : comparing floating point with == or != is unsafe // storing and comparing against same constants (typically 0.0f) is ok. -#pragma clang diagnostic ignored "-Wformat-nonliteral" // warning : format string is not a string literal // passing non-literal to vsnformat(). yes, user passing incorrect format strings can crash the code. -#pragma clang diagnostic ignored "-Wexit-time-destructors" // warning : declaration requires an exit-time destructor // exit-time destruction order is undefined. if MemFree() leads to users code that has been disabled before exit it might cause problems. ImGui coding style welcomes static/globals. -#pragma clang diagnostic ignored "-Wglobal-constructors" // warning : declaration requires a global destructor // similar to above, not sure what the exact difference is. -#pragma clang diagnostic ignored "-Wsign-conversion" // warning : implicit conversion changes signedness // -#pragma clang diagnostic ignored "-Wformat-pedantic" // warning : format specifies type 'void *' but the argument has type 'xxxx *' // unreasonable, would lead to casting every %p arg to void*. probably enabled by -pedantic. -#pragma clang diagnostic ignored "-Wint-to-void-pointer-cast" // warning : cast to 'void *' from smaller integer type 'int' -#if __has_warning("-Wzero-as-null-pointer-constant") -#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" // warning : zero as null pointer constant // some standard header variations use #define NULL 0 -#endif -#if __has_warning("-Wdouble-promotion") -#pragma clang diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function // using printf() is a misery with this as C++ va_arg ellipsis changes float to double. +#if __has_warning("-Wunknown-warning-option") +#pragma clang diagnostic ignored "-Wunknown-warning-option" // warning: unknown warning group 'xxx' // not all warnings are known by all Clang versions and they tend to be rename-happy.. so ignoring warnings triggers new warnings on some configuration. Great! #endif +#pragma clang diagnostic ignored "-Wunknown-pragmas" // warning: unknown warning group 'xxx' +#pragma clang diagnostic ignored "-Wold-style-cast" // warning: use of old-style cast // yes, they are more terse. +#pragma clang diagnostic ignored "-Wfloat-equal" // warning: comparing floating point with == or != is unsafe // storing and comparing against same constants (typically 0.0f) is ok. +#pragma clang diagnostic ignored "-Wformat" // warning: format specifies type 'int' but the argument has type 'unsigned int' +#pragma clang diagnostic ignored "-Wformat-nonliteral" // warning: format string is not a string literal // passing non-literal to vsnformat(). yes, user passing incorrect format strings can crash the code. +#pragma clang diagnostic ignored "-Wformat-pedantic" // warning: format specifies type 'void *' but the argument has type 'xxxx *' // unreasonable, would lead to casting every %p arg to void*. probably enabled by -pedantic. +#pragma clang diagnostic ignored "-Wexit-time-destructors" // warning: declaration requires an exit-time destructor // exit-time destruction order is undefined. if MemFree() leads to users code that has been disabled before exit it might cause problems. ImGui coding style welcomes static/globals. +#pragma clang diagnostic ignored "-Wglobal-constructors" // warning: declaration requires a global destructor // similar to above, not sure what the exact difference is. +#pragma clang diagnostic ignored "-Wsign-conversion" // warning: implicit conversion changes signedness +#pragma clang diagnostic ignored "-Wint-to-void-pointer-cast" // warning: cast to 'void *' from smaller integer type 'int' +#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" // warning: zero as null pointer constant // some standard header variations use #define NULL 0 +#pragma clang diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function // using printf() is a misery with this as C++ va_arg ellipsis changes float to double. +#pragma clang diagnostic ignored "-Wimplicit-int-float-conversion" // warning: implicit conversion from 'xxx' to 'float' may lose precision +#pragma clang diagnostic ignored "-Wunsafe-buffer-usage" // warning: 'xxx' is an unsafe pointer used for buffer access +#pragma clang diagnostic ignored "-Wnontrivial-memaccess" // warning: first argument in call to 'memset' is a pointer to non-trivially copyable type +#pragma clang diagnostic ignored "-Wswitch-default" // warning: 'switch' missing 'default' label #elif defined(__GNUC__) -// We disable -Wpragmas because GCC doesn't provide an has_warning equivalent and some forks/patches may not following the warning/version association. -#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind -#pragma GCC diagnostic ignored "-Wunused-function" // warning: 'xxxx' defined but not used -#pragma GCC diagnostic ignored "-Wint-to-pointer-cast" // warning: cast to pointer from integer of different size -#pragma GCC diagnostic ignored "-Wformat" // warning: format '%p' expects argument of type 'void*', but argument 6 has type 'ImGuiWindow*' -#pragma GCC diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function -#pragma GCC diagnostic ignored "-Wconversion" // warning: conversion to 'xxxx' from 'xxxx' may alter its value -#pragma GCC diagnostic ignored "-Wformat-nonliteral" // warning: format not a string literal, format string not checked -#pragma GCC diagnostic ignored "-Wstrict-overflow" // warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false -#pragma GCC diagnostic ignored "-Wclass-memaccess" // [__GNUC__ >= 8] warning: 'memset/memcpy' clearing/writing an object of type 'xxxx' with no trivial copy-assignment; use assignment or value-initialization instead +// We disable -Wpragmas because GCC doesn't provide a has_warning equivalent and some forks/patches may not follow the warning/version association. +#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind +#pragma GCC diagnostic ignored "-Wunused-function" // warning: 'xxxx' defined but not used +#pragma GCC diagnostic ignored "-Wint-to-pointer-cast" // warning: cast to pointer from integer of different size +#pragma GCC diagnostic ignored "-Wfloat-equal" // warning: comparing floating-point with '==' or '!=' is unsafe +#pragma GCC diagnostic ignored "-Wformat" // warning: format '%p' expects argument of type 'int'/'void*', but argument X has type 'unsigned int'/'ImGuiWindow*' +#pragma GCC diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function +#pragma GCC diagnostic ignored "-Wconversion" // warning: conversion to 'xxxx' from 'xxxx' may alter its value +#pragma GCC diagnostic ignored "-Wformat-nonliteral" // warning: format not a string literal, format string not checked +#pragma GCC diagnostic ignored "-Wstrict-overflow" // warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false +#pragma GCC diagnostic ignored "-Wclass-memaccess" // [__GNUC__ >= 8] warning: 'memset/memcpy' clearing/writing an object of type 'xxxx' with no trivial copy-assignment; use assignment or value-initialization instead +#pragma GCC diagnostic ignored "-Wcast-qual" // warning: cast from type 'const xxxx *' to type 'xxxx *' casts away qualifiers #endif +// Debug options +#define IMGUI_DEBUG_NAV_SCORING 0 // Display navigation scoring preview when hovering items. Hold CTRL to display for all candidates. CTRL+Arrow to change last direction. +#define IMGUI_DEBUG_NAV_RECTS 0 // Display the reference navigation rectangle for each window + // When using CTRL+TAB (or Gamepad Square+L/R) we delay the visual a little in order to reduce visual noise doing a fast switch. static const float NAV_WINDOWING_HIGHLIGHT_DELAY = 0.20f; // Time before the highlight and screen dimming starts fading in static const float NAV_WINDOWING_LIST_APPEAR_DELAY = 0.15f; // Time before the window list starts to appear - -// Window resizing from edges (when io.ConfigWindowsResizeFromEdges = true and ImGuiBackendFlags_HasMouseCursors is set in io.BackendFlags by back-end) -static const float WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS = 4.0f; // Extend outside and inside windows. Affect FindHoveredWindow(). +static const float NAV_ACTIVATE_HIGHLIGHT_TIMER = 0.10f; // Time to highlight an item activated by a shortcut. static const float WINDOWS_RESIZE_FROM_EDGES_FEEDBACK_TIMER = 0.04f; // Reduce visual noise by only highlighting the border after a certain time. -static const float WINDOWS_MOUSE_WHEEL_SCROLL_LOCK_TIMER = 2.00f; // Lock scrolled window (so it doesn't pick child windows that are scrolling through) for a certaint time, unless mouse moved. +static const float WINDOWS_MOUSE_WHEEL_SCROLL_LOCK_TIMER = 0.70f; // Lock scrolled window (so it doesn't pick child windows that are scrolling through) for a certain time, unless mouse moved. + +// Tooltip offset +static const ImVec2 TOOLTIP_DEFAULT_OFFSET_MOUSE = ImVec2(16, 10); // Multiplied by g.Style.MouseCursorScale +static const ImVec2 TOOLTIP_DEFAULT_OFFSET_TOUCH = ImVec2(0, -20); // Multiplied by g.Style.MouseCursorScale +static const ImVec2 TOOLTIP_DEFAULT_PIVOT_TOUCH = ImVec2(0.5f, 1.0f); // Multiplied by g.Style.MouseCursorScale + +// Docking +static const float DOCKING_TRANSPARENT_PAYLOAD_ALPHA = 0.50f; // For use with io.ConfigDockingTransparentPayload. Apply to Viewport _or_ WindowBg in host viewport. //------------------------------------------------------------------------- // [SECTION] FORWARD DECLARATIONS //------------------------------------------------------------------------- static void SetCurrentWindow(ImGuiWindow* window); -static void FindHoveredWindow(); -static ImGuiWindow* CreateNewWindow(const char* name, ImVec2 size, ImGuiWindowFlags flags); -static void CheckStacksSize(ImGuiWindow* window, bool write); -static ImVec2 CalcNextScrollFromScrollTargetAndClamp(ImGuiWindow* window, bool snap_on_edges); +static ImGuiWindow* CreateNewWindow(const char* name, ImGuiWindowFlags flags); +static ImVec2 CalcNextScrollFromScrollTargetAndClamp(ImGuiWindow* window); -static void AddDrawListToDrawData(ImVector* out_list, ImDrawList* draw_list); static void AddWindowToSortBuffer(ImVector* out_sorted_windows, ImGuiWindow* window); -static ImRect GetViewportRect(); - // Settings -static void* SettingsHandlerWindow_ReadOpen(ImGuiContext*, ImGuiSettingsHandler*, const char* name); -static void SettingsHandlerWindow_ReadLine(ImGuiContext*, ImGuiSettingsHandler*, void* entry, const char* line); -static void SettingsHandlerWindow_WriteAll(ImGuiContext* imgui_ctx, ImGuiSettingsHandler* handler, ImGuiTextBuffer* buf); +static void WindowSettingsHandler_ClearAll(ImGuiContext*, ImGuiSettingsHandler*); +static void* WindowSettingsHandler_ReadOpen(ImGuiContext*, ImGuiSettingsHandler*, const char* name); +static void WindowSettingsHandler_ReadLine(ImGuiContext*, ImGuiSettingsHandler*, void* entry, const char* line); +static void WindowSettingsHandler_ApplyAll(ImGuiContext*, ImGuiSettingsHandler*); +static void WindowSettingsHandler_WriteAll(ImGuiContext*, ImGuiSettingsHandler*, ImGuiTextBuffer* buf); -// Platform Dependents default implementation for IO functions -static const char* GetClipboardTextFn_DefaultImpl(void* user_data); -static void SetClipboardTextFn_DefaultImpl(void* user_data, const char* text); -static void ImeSetInputScreenPosFn_DefaultImpl(int x, int y); +// Platform Dependents default implementation for ImGuiPlatformIO functions +static const char* Platform_GetClipboardTextFn_DefaultImpl(ImGuiContext* ctx); +static void Platform_SetClipboardTextFn_DefaultImpl(ImGuiContext* ctx, const char* text); +static void Platform_SetImeDataFn_DefaultImpl(ImGuiContext* ctx, ImGuiViewport* viewport, ImGuiPlatformImeData* data); +static bool Platform_OpenInShellFn_DefaultImpl(ImGuiContext* ctx, const char* path); namespace ImGui { -static bool BeginChildEx(const char* name, ImGuiID id, const ImVec2& size_arg, bool border, ImGuiWindowFlags flags); +// Item +static void ItemHandleShortcut(ImGuiID id); + +// Window Focus +static int FindWindowFocusIndex(ImGuiWindow* window); +static void UpdateWindowInFocusOrderList(ImGuiWindow* window, bool just_created, ImGuiWindowFlags new_flags); // Navigation static void NavUpdate(); static void NavUpdateWindowing(); +static void NavUpdateWindowingApplyFocus(ImGuiWindow* window); static void NavUpdateWindowingOverlay(); -static void NavUpdateMoveResult(); -static float NavUpdatePageUpPageDown(int allowed_dir_flags); +static void NavUpdateCancelRequest(); +static void NavUpdateCreateMoveRequest(); +static void NavUpdateCreateTabbingRequest(); +static float NavUpdatePageUpPageDown(); static inline void NavUpdateAnyRequestFlag(); -static bool NavScoreItem(ImGuiNavMoveResult* result, ImRect cand); -static void NavProcessItem(ImGuiWindow* window, const ImRect& nav_bb, ImGuiID id); +static void NavUpdateCreateWrappingRequest(); +static void NavEndFrame(); +static bool NavScoreItem(ImGuiNavItemData* result); +static void NavApplyItemToResult(ImGuiNavItemData* result); +static void NavProcessItem(); +static void NavProcessItemForTabbingRequest(ImGuiID id, ImGuiItemFlags item_flags, ImGuiNavMoveFlags move_flags); +static ImGuiInputSource NavCalcPreferredRefPosSource(); static ImVec2 NavCalcPreferredRefPos(); static void NavSaveLastChildNavWindowIntoParent(ImGuiWindow* nav_window); static ImGuiWindow* NavRestoreLastChildNavWindow(ImGuiWindow* window); -static int FindWindowFocusIndex(ImGuiWindow* window); +static void NavRestoreLayer(ImGuiNavLayer layer); -// Misc +// Error Checking and Debug Tools +static void ErrorCheckNewFrameSanityChecks(); +static void ErrorCheckEndFrameSanityChecks(); +#ifndef IMGUI_DISABLE_DEBUG_TOOLS +static void UpdateDebugToolItemPicker(); +static void UpdateDebugToolStackQueries(); +static void UpdateDebugToolFlashStyleColor(); +#endif + +// Inputs +static void UpdateKeyboardInputs(); static void UpdateMouseInputs(); static void UpdateMouseWheel(); -static bool UpdateManualResize(ImGuiWindow* window, const ImVec2& size_auto_fit, int* border_held, int resize_grip_count, ImU32 resize_grip_col[4]); -static void UpdateDebugToolItemPicker(); +static void UpdateKeyRoutingTable(ImGuiKeyRoutingTable* rt); + +// Misc +static void UpdateSettings(); +static int UpdateWindowManualResize(ImGuiWindow* window, const ImVec2& size_auto_fit, int* border_hovered, int* border_held, int resize_grip_count, ImU32 resize_grip_col[4], const ImRect& visibility_rect); static void RenderWindowOuterBorders(ImGuiWindow* window); -static void RenderWindowDecorations(ImGuiWindow* window, const ImRect& title_bar_rect, bool title_bar_is_highlight, int resize_grip_count, const ImU32 resize_grip_col[4], float resize_grip_draw_size); +static void RenderWindowDecorations(ImGuiWindow* window, const ImRect& title_bar_rect, bool title_bar_is_highlight, bool handle_borders_and_resize_grips, int resize_grip_count, const ImU32 resize_grip_col[4], float resize_grip_draw_size); static void RenderWindowTitleBarContents(ImGuiWindow* window, const ImRect& title_bar_rect, const char* name, bool* p_open); +static void RenderDimmedBackgroundBehindWindow(ImGuiWindow* window, ImU32 col); +static void RenderDimmedBackgrounds(); +static void SetLastItemDataForWindow(ImGuiWindow* window, const ImRect& rect); +static void SetLastItemDataForChildWindowItem(ImGuiWindow* window, const ImRect& rect); + +// Viewports +const ImGuiID IMGUI_VIEWPORT_DEFAULT_ID = 0x11111111; // Using an arbitrary constant instead of e.g. ImHashStr("ViewportDefault", 0); so it's easier to spot in the debugger. The exact value doesn't matter. +static ImGuiViewportP* AddUpdateViewport(ImGuiWindow* window, ImGuiID id, const ImVec2& platform_pos, const ImVec2& size, ImGuiViewportFlags flags); +static void DestroyViewport(ImGuiViewportP* viewport); +static void UpdateViewportsNewFrame(); +static void UpdateViewportsEndFrame(); +static void WindowSelectViewport(ImGuiWindow* window); +static void WindowSyncOwnedViewport(ImGuiWindow* window, ImGuiWindow* parent_window_in_stack); +static bool UpdateTryMergeWindowIntoHostViewport(ImGuiWindow* window, ImGuiViewportP* host_viewport); +static bool UpdateTryMergeWindowIntoHostViewports(ImGuiWindow* window); +static bool GetWindowAlwaysWantOwnViewport(ImGuiWindow* window); +static int FindPlatformMonitorForPos(const ImVec2& pos); +static int FindPlatformMonitorForRect(const ImRect& r); +static void UpdateViewportPlatformMonitor(ImGuiViewportP* viewport); } @@ -1088,27 +1305,33 @@ static void RenderWindowTitleBarContents(ImGuiWindow* window, const // [SECTION] CONTEXT AND MEMORY ALLOCATORS //----------------------------------------------------------------------------- +// DLL users: +// - Heaps and globals are not shared across DLL boundaries! +// - You will need to call SetCurrentContext() + SetAllocatorFunctions() for each static/DLL boundary you are calling from. +// - Same applies for hot-reloading mechanisms that are reliant on reloading DLL (note that many hot-reloading mechanisms work without DLL). +// - Using Dear ImGui via a shared library is not recommended, because of function call overhead and because we don't guarantee backward nor forward ABI compatibility. +// - Confused? In a debugger: add GImGui to your watch window and notice how its value changes depending on your current location (which DLL boundary you are in). + // Current context pointer. Implicitly used by all Dear ImGui functions. Always assumed to be != NULL. -// ImGui::CreateContext() will automatically set this pointer if it is NULL. Change to a different context by calling ImGui::SetCurrentContext(). -// 1) Important: globals are not shared across DLL boundaries! If you use DLLs or any form of hot-reloading: you will need to call -// SetCurrentContext() (with the pointer you got from CreateContext) from each unique static/DLL boundary, and after each hot-reloading. -// In your debugger, add GImGui to your watch window and notice how its value changes depending on which location you are currently stepping into. -// 2) Important: Dear ImGui functions are not thread-safe because of this pointer. -// If you want thread-safety to allow N threads to access N different contexts, you can: -// - Change this variable to use thread local storage so each thread can refer to a different context, in imconfig.h: -// struct ImGuiContext; -// extern thread_local ImGuiContext* MyImGuiTLS; -// #define GImGui MyImGuiTLS -// And then define MyImGuiTLS in one of your cpp file. Note that thread_local is a C++11 keyword, earlier C++ uses compiler-specific keyword. -// - Future development aim to make this context pointer explicit to all calls. Also read https://github.com/ocornut/imgui/issues/586 -// - If you need a finite number of contexts, you may compile and use multiple instances of the ImGui code from different namespace. +// - ImGui::CreateContext() will automatically set this pointer if it is NULL. +// Change to a different context by calling ImGui::SetCurrentContext(). +// - Important: Dear ImGui functions are not thread-safe because of this pointer. +// If you want thread-safety to allow N threads to access N different contexts: +// - Change this variable to use thread local storage so each thread can refer to a different context, in your imconfig.h: +// struct ImGuiContext; +// extern thread_local ImGuiContext* MyImGuiTLS; +// #define GImGui MyImGuiTLS +// And then define MyImGuiTLS in one of your cpp files. Note that thread_local is a C++11 keyword, earlier C++ uses compiler-specific keyword. +// - Future development aims to make this context pointer explicit to all calls. Also read https://github.com/ocornut/imgui/issues/586 +// - If you need a finite number of contexts, you may compile and use multiple instances of the ImGui code from a different namespace. +// - DLL users: read comments above. #ifndef GImGui ImGuiContext* GImGui = NULL; #endif // Memory Allocator functions. Use SetAllocatorFunctions() to change them. -// If you use DLL hotreloading you might need to call SetAllocatorFunctions() after reloading code from this file. -// Otherwise, you probably don't want to modify them mid-program, and if you use global/static e.g. ImVector<> instances you may need to keep them accessible during program destruction. +// - You probably don't want to modify that mid-program, and if you use global/static e.g. ImVector<> instances you may need to keep them accessible during program destruction. +// - DLL users: read comments above. #ifndef IMGUI_DISABLE_DEFAULT_ALLOCATORS static void* MallocWrapper(size_t size, void* user_data) { IM_UNUSED(user_data); return malloc(size); } static void FreeWrapper(void* ptr, void* user_data) { IM_UNUSED(user_data); free(ptr); } @@ -1116,51 +1339,74 @@ static void FreeWrapper(void* ptr, void* user_data) { IM_UNUSED(user_d static void* MallocWrapper(size_t size, void* user_data) { IM_UNUSED(user_data); IM_UNUSED(size); IM_ASSERT(0); return NULL; } static void FreeWrapper(void* ptr, void* user_data) { IM_UNUSED(user_data); IM_UNUSED(ptr); IM_ASSERT(0); } #endif - -static void* (*GImAllocatorAllocFunc)(size_t size, void* user_data) = MallocWrapper; -static void (*GImAllocatorFreeFunc)(void* ptr, void* user_data) = FreeWrapper; -static void* GImAllocatorUserData = NULL; +static ImGuiMemAllocFunc GImAllocatorAllocFunc = MallocWrapper; +static ImGuiMemFreeFunc GImAllocatorFreeFunc = FreeWrapper; +static void* GImAllocatorUserData = NULL; //----------------------------------------------------------------------------- -// [SECTION] MAIN USER FACING STRUCTURES (ImGuiStyle, ImGuiIO) +// [SECTION] USER FACING STRUCTURES (ImGuiStyle, ImGuiIO, ImGuiPlatformIO) //----------------------------------------------------------------------------- ImGuiStyle::ImGuiStyle() { - Alpha = 1.0f; // Global alpha applies to everything in ImGui - WindowPadding = ImVec2(8,8); // Padding within a window - WindowRounding = 7.0f; // Radius of window corners rounding. Set to 0.0f to have rectangular windows - WindowBorderSize = 1.0f; // Thickness of border around windows. Generally set to 0.0f or 1.0f. Other values not well tested. - WindowMinSize = ImVec2(32,32); // Minimum window size - WindowTitleAlign = ImVec2(0.0f,0.5f);// Alignment for title bar text - WindowMenuButtonPosition= ImGuiDir_Left; // Position of the collapsing/docking button in the title bar (left/right). Defaults to ImGuiDir_Left. - ChildRounding = 0.0f; // Radius of child window corners rounding. Set to 0.0f to have rectangular child windows - ChildBorderSize = 1.0f; // Thickness of border around child windows. Generally set to 0.0f or 1.0f. Other values not well tested. - PopupRounding = 0.0f; // Radius of popup window corners rounding. Set to 0.0f to have rectangular child windows - PopupBorderSize = 1.0f; // Thickness of border around popup or tooltip windows. Generally set to 0.0f or 1.0f. Other values not well tested. - FramePadding = ImVec2(4,3); // Padding within a framed rectangle (used by most widgets) - FrameRounding = 0.0f; // Radius of frame corners rounding. Set to 0.0f to have rectangular frames (used by most widgets). - FrameBorderSize = 0.0f; // Thickness of border around frames. Generally set to 0.0f or 1.0f. Other values not well tested. - ItemSpacing = ImVec2(8,4); // Horizontal and vertical spacing between widgets/lines - ItemInnerSpacing = ImVec2(4,4); // Horizontal and vertical spacing between within elements of a composed widget (e.g. a slider and its label) - TouchExtraPadding = ImVec2(0,0); // Expand reactive bounding box for touch-based system where touch position is not accurate enough. Unfortunately we don't sort widgets so priority on overlap will always be given to the first widget. So don't grow this too much! - IndentSpacing = 21.0f; // Horizontal spacing when e.g. entering a tree node. Generally == (FontSize + FramePadding.x*2). - ColumnsMinSpacing = 6.0f; // Minimum horizontal spacing between two columns. Preferably > (FramePadding.x + 1). - ScrollbarSize = 14.0f; // Width of the vertical scrollbar, Height of the horizontal scrollbar - ScrollbarRounding = 9.0f; // Radius of grab corners rounding for scrollbar - GrabMinSize = 10.0f; // Minimum width/height of a grab box for slider/scrollbar - GrabRounding = 0.0f; // Radius of grabs corners rounding. Set to 0.0f to have rectangular slider grabs. - TabRounding = 4.0f; // Radius of upper corners of a tab. Set to 0.0f to have rectangular tabs. - TabBorderSize = 0.0f; // Thickness of border around tabs. - ColorButtonPosition = ImGuiDir_Right; // Side of the color button in the ColorEdit4 widget (left/right). Defaults to ImGuiDir_Right. - ButtonTextAlign = ImVec2(0.5f,0.5f);// Alignment of button text when button is larger than text. - SelectableTextAlign = ImVec2(0.0f,0.0f);// Alignment of selectable text when button is larger than text. - DisplayWindowPadding = ImVec2(19,19); // Window position are clamped to be visible within the display area by at least this amount. Only applies to regular windows. - DisplaySafeAreaPadding = ImVec2(3,3); // If you cannot see the edge of your screen (e.g. on a TV) increase the safe area padding. Covers popups/tooltips as well regular windows. - MouseCursorScale = 1.0f; // Scale software rendered mouse cursor (when io.MouseDrawCursor is enabled). May be removed later. - AntiAliasedLines = true; // Enable anti-aliasing on lines/borders. Disable if you are really short on CPU/GPU. - AntiAliasedFill = true; // Enable anti-aliasing on filled shapes (rounded rectangles, circles, etc.) - CurveTessellationTol = 1.25f; // Tessellation tolerance when using PathBezierCurveTo() without a specific number of segments. Decrease for highly tessellated curves (higher quality, more polygons), increase to reduce quality. + Alpha = 1.0f; // Global alpha applies to everything in Dear ImGui. + DisabledAlpha = 0.60f; // Additional alpha multiplier applied by BeginDisabled(). Multiply over current value of Alpha. + WindowPadding = ImVec2(8,8); // Padding within a window + WindowRounding = 0.0f; // Radius of window corners rounding. Set to 0.0f to have rectangular windows. Large values tend to lead to variety of artifacts and are not recommended. + WindowBorderSize = 1.0f; // Thickness of border around windows. Generally set to 0.0f or 1.0f. Other values not well tested. + WindowBorderHoverPadding = 4.0f; // Hit-testing extent outside/inside resizing border. Also extend determination of hovered window. Generally meaningfully larger than WindowBorderSize to make it easy to reach borders. + WindowMinSize = ImVec2(32,32); // Minimum window size + WindowTitleAlign = ImVec2(0.0f,0.5f);// Alignment for title bar text + WindowMenuButtonPosition = ImGuiDir_Left; // Position of the collapsing/docking button in the title bar (left/right). Defaults to ImGuiDir_Left. + ChildRounding = 0.0f; // Radius of child window corners rounding. Set to 0.0f to have rectangular child windows + ChildBorderSize = 1.0f; // Thickness of border around child windows. Generally set to 0.0f or 1.0f. Other values not well tested. + PopupRounding = 0.0f; // Radius of popup window corners rounding. Set to 0.0f to have rectangular child windows + PopupBorderSize = 1.0f; // Thickness of border around popup or tooltip windows. Generally set to 0.0f or 1.0f. Other values not well tested. + FramePadding = ImVec2(4,3); // Padding within a framed rectangle (used by most widgets) + FrameRounding = 0.0f; // Radius of frame corners rounding. Set to 0.0f to have rectangular frames (used by most widgets). + FrameBorderSize = 0.0f; // Thickness of border around frames. Generally set to 0.0f or 1.0f. Other values not well tested. + ItemSpacing = ImVec2(8,4); // Horizontal and vertical spacing between widgets/lines + ItemInnerSpacing = ImVec2(4,4); // Horizontal and vertical spacing between within elements of a composed widget (e.g. a slider and its label) + CellPadding = ImVec2(4,2); // Padding within a table cell. Cellpadding.x is locked for entire table. CellPadding.y may be altered between different rows. + TouchExtraPadding = ImVec2(0,0); // Expand reactive bounding box for touch-based system where touch position is not accurate enough. Unfortunately we don't sort widgets so priority on overlap will always be given to the first widget. So don't grow this too much! + IndentSpacing = 21.0f; // Horizontal spacing when e.g. entering a tree node. Generally == (FontSize + FramePadding.x*2). + ColumnsMinSpacing = 6.0f; // Minimum horizontal spacing between two columns. Preferably > (FramePadding.x + 1). + ScrollbarSize = 14.0f; // Width of the vertical scrollbar, Height of the horizontal scrollbar + ScrollbarRounding = 9.0f; // Radius of grab corners rounding for scrollbar + GrabMinSize = 12.0f; // Minimum width/height of a grab box for slider/scrollbar + GrabRounding = 0.0f; // Radius of grabs corners rounding. Set to 0.0f to have rectangular slider grabs. + LogSliderDeadzone = 4.0f; // The size in pixels of the dead-zone around zero on logarithmic sliders that cross zero. + ImageBorderSize = 0.0f; // Thickness of border around tabs. + TabRounding = 5.0f; // Radius of upper corners of a tab. Set to 0.0f to have rectangular tabs. + TabBorderSize = 0.0f; // Thickness of border around tabs. + TabCloseButtonMinWidthSelected = -1.0f; // -1: always visible. 0.0f: visible when hovered. >0.0f: visible when hovered if minimum width. + TabCloseButtonMinWidthUnselected = 0.0f; // -1: always visible. 0.0f: visible when hovered. >0.0f: visible when hovered if minimum width. FLT_MAX: never show close button when unselected. + TabBarBorderSize = 1.0f; // Thickness of tab-bar separator, which takes on the tab active color to denote focus. + TabBarOverlineSize = 1.0f; // Thickness of tab-bar overline, which highlights the selected tab-bar. + TableAngledHeadersAngle = 35.0f * (IM_PI / 180.0f); // Angle of angled headers (supported values range from -50 degrees to +50 degrees). + TableAngledHeadersTextAlign = ImVec2(0.5f,0.0f);// Alignment of angled headers within the cell + ColorButtonPosition = ImGuiDir_Right; // Side of the color button in the ColorEdit4 widget (left/right). Defaults to ImGuiDir_Right. + ButtonTextAlign = ImVec2(0.5f,0.5f);// Alignment of button text when button is larger than text. + SelectableTextAlign = ImVec2(0.0f,0.0f);// Alignment of selectable text. Defaults to (0.0f, 0.0f) (top-left aligned). It's generally important to keep this left-aligned if you want to lay multiple items on a same line. + SeparatorTextBorderSize = 3.0f; // Thickness of border in SeparatorText() + SeparatorTextAlign = ImVec2(0.0f,0.5f);// Alignment of text within the separator. Defaults to (0.0f, 0.5f) (left aligned, center). + SeparatorTextPadding = ImVec2(20.0f,3.f);// Horizontal offset of text from each edge of the separator + spacing on other axis. Generally small values. .y is recommended to be == FramePadding.y. + DisplayWindowPadding = ImVec2(19,19); // Window position are clamped to be visible within the display area or monitors by at least this amount. Only applies to regular windows. + DisplaySafeAreaPadding = ImVec2(3,3); // If you cannot see the edge of your screen (e.g. on a TV) increase the safe area padding. Covers popups/tooltips as well regular windows. + DockingSeparatorSize = 2.0f; // Thickness of resizing border between docked windows + MouseCursorScale = 1.0f; // Scale software rendered mouse cursor (when io.MouseDrawCursor is enabled). May be removed later. + AntiAliasedLines = true; // Enable anti-aliased lines/borders. Disable if you are really tight on CPU/GPU. + AntiAliasedLinesUseTex = true; // Enable anti-aliased lines/borders using textures where possible. Require backend to render with bilinear filtering (NOT point/nearest filtering). + AntiAliasedFill = true; // Enable anti-aliased filled shapes (rounded rectangles, circles, etc.). + CurveTessellationTol = 1.25f; // Tessellation tolerance when using PathBezierCurveTo() without a specific number of segments. Decrease for highly tessellated curves (higher quality, more polygons), increase to reduce quality. + CircleTessellationMaxError = 0.30f; // Maximum error (in pixels) allowed when using AddCircle()/AddCircleFilled() or drawing rounded corner rectangles with no explicit segment count specified. Decrease for higher quality but more geometry. + + // Behaviors + HoverStationaryDelay = 0.15f; // Delay for IsItemHovered(ImGuiHoveredFlags_Stationary). Time required to consider mouse stationary. + HoverDelayShort = 0.15f; // Delay for IsItemHovered(ImGuiHoveredFlags_DelayShort). Usually used along with HoverStationaryDelay. + HoverDelayNormal = 0.40f; // Delay for IsItemHovered(ImGuiHoveredFlags_DelayNormal). " + HoverFlagsForTooltipMouse = ImGuiHoveredFlags_Stationary | ImGuiHoveredFlags_DelayShort | ImGuiHoveredFlags_AllowWhenDisabled; // Default flags when using IsItemHovered(ImGuiHoveredFlags_ForTooltip) or BeginItemTooltip()/SetItemTooltip() while using mouse. + HoverFlagsForTooltipNav = ImGuiHoveredFlags_NoSharedDelay | ImGuiHoveredFlags_DelayNormal | ImGuiHoveredFlags_AllowWhenDisabled; // Default flags when using IsItemHovered(ImGuiHoveredFlags_ForTooltip) or BeginItemTooltip()/SetItemTooltip() while using keyboard/gamepad. // Default theme ImGui::StyleColorsDark(this); @@ -1170,47 +1416,51 @@ ImGuiStyle::ImGuiStyle() // Important: This operation is lossy because we round all sizes to integer. If you need to change your scale multiples, call this over a freshly initialized ImGuiStyle structure rather than scaling multiple times. void ImGuiStyle::ScaleAllSizes(float scale_factor) { - WindowPadding = ImFloor(WindowPadding * scale_factor); - WindowRounding = ImFloor(WindowRounding * scale_factor); - WindowMinSize = ImFloor(WindowMinSize * scale_factor); - ChildRounding = ImFloor(ChildRounding * scale_factor); - PopupRounding = ImFloor(PopupRounding * scale_factor); - FramePadding = ImFloor(FramePadding * scale_factor); - FrameRounding = ImFloor(FrameRounding * scale_factor); - ItemSpacing = ImFloor(ItemSpacing * scale_factor); - ItemInnerSpacing = ImFloor(ItemInnerSpacing * scale_factor); - TouchExtraPadding = ImFloor(TouchExtraPadding * scale_factor); - IndentSpacing = ImFloor(IndentSpacing * scale_factor); - ColumnsMinSpacing = ImFloor(ColumnsMinSpacing * scale_factor); - ScrollbarSize = ImFloor(ScrollbarSize * scale_factor); - ScrollbarRounding = ImFloor(ScrollbarRounding * scale_factor); - GrabMinSize = ImFloor(GrabMinSize * scale_factor); - GrabRounding = ImFloor(GrabRounding * scale_factor); - TabRounding = ImFloor(TabRounding * scale_factor); - DisplayWindowPadding = ImFloor(DisplayWindowPadding * scale_factor); - DisplaySafeAreaPadding = ImFloor(DisplaySafeAreaPadding * scale_factor); - MouseCursorScale = ImFloor(MouseCursorScale * scale_factor); + WindowPadding = ImTrunc(WindowPadding * scale_factor); + WindowRounding = ImTrunc(WindowRounding * scale_factor); + WindowMinSize = ImTrunc(WindowMinSize * scale_factor); + WindowBorderHoverPadding = ImTrunc(WindowBorderHoverPadding * scale_factor); + ChildRounding = ImTrunc(ChildRounding * scale_factor); + PopupRounding = ImTrunc(PopupRounding * scale_factor); + FramePadding = ImTrunc(FramePadding * scale_factor); + FrameRounding = ImTrunc(FrameRounding * scale_factor); + ItemSpacing = ImTrunc(ItemSpacing * scale_factor); + ItemInnerSpacing = ImTrunc(ItemInnerSpacing * scale_factor); + CellPadding = ImTrunc(CellPadding * scale_factor); + TouchExtraPadding = ImTrunc(TouchExtraPadding * scale_factor); + IndentSpacing = ImTrunc(IndentSpacing * scale_factor); + ColumnsMinSpacing = ImTrunc(ColumnsMinSpacing * scale_factor); + ScrollbarSize = ImTrunc(ScrollbarSize * scale_factor); + ScrollbarRounding = ImTrunc(ScrollbarRounding * scale_factor); + GrabMinSize = ImTrunc(GrabMinSize * scale_factor); + GrabRounding = ImTrunc(GrabRounding * scale_factor); + LogSliderDeadzone = ImTrunc(LogSliderDeadzone * scale_factor); + ImageBorderSize = ImTrunc(ImageBorderSize * scale_factor); + TabRounding = ImTrunc(TabRounding * scale_factor); + TabCloseButtonMinWidthSelected = (TabCloseButtonMinWidthSelected > 0.0f && TabCloseButtonMinWidthSelected != FLT_MAX) ? ImTrunc(TabCloseButtonMinWidthSelected * scale_factor) : TabCloseButtonMinWidthSelected; + TabCloseButtonMinWidthUnselected = (TabCloseButtonMinWidthUnselected > 0.0f && TabCloseButtonMinWidthUnselected != FLT_MAX) ? ImTrunc(TabCloseButtonMinWidthUnselected * scale_factor) : TabCloseButtonMinWidthUnselected; + TabBarOverlineSize = ImTrunc(TabBarOverlineSize * scale_factor); + SeparatorTextPadding = ImTrunc(SeparatorTextPadding * scale_factor); + DockingSeparatorSize = ImTrunc(DockingSeparatorSize * scale_factor); + DisplayWindowPadding = ImTrunc(DisplayWindowPadding * scale_factor); + DisplaySafeAreaPadding = ImTrunc(DisplaySafeAreaPadding * scale_factor); + MouseCursorScale = ImTrunc(MouseCursorScale * scale_factor); } ImGuiIO::ImGuiIO() { // Most fields are initialized with zero memset(this, 0, sizeof(*this)); + IM_STATIC_ASSERT(IM_ARRAYSIZE(ImGuiIO::MouseDown) == ImGuiMouseButton_COUNT && IM_ARRAYSIZE(ImGuiIO::MouseClicked) == ImGuiMouseButton_COUNT); // Settings ConfigFlags = ImGuiConfigFlags_None; BackendFlags = ImGuiBackendFlags_None; DisplaySize = ImVec2(-1.0f, -1.0f); - DeltaTime = 1.0f/60.0f; + DeltaTime = 1.0f / 60.0f; IniSavingRate = 5.0f; - IniFilename = "imgui.ini"; + IniFilename = "imgui.ini"; // Important: "imgui.ini" is relative to current working dir, most apps will want to lock this to an absolute path (e.g. same path as executables). LogFilename = "imgui_log.txt"; - MouseDoubleClickTime = 0.30f; - MouseDoubleClickMaxDist = 6.0f; - for (int i = 0; i < ImGuiKey_COUNT; i++) - KeyMap[i] = -1; - KeyRepeatDelay = 0.250f; - KeyRepeatRate = 0.050f; UserData = NULL; Fonts = NULL; @@ -1219,6 +1469,27 @@ ImGuiIO::ImGuiIO() FontAllowUserScaling = false; DisplayFramebufferScale = ImVec2(1.0f, 1.0f); + // Keyboard/Gamepad Navigation options + ConfigNavSwapGamepadButtons = false; + ConfigNavMoveSetMousePos = false; + ConfigNavCaptureKeyboard = true; + ConfigNavEscapeClearFocusItem = true; + ConfigNavEscapeClearFocusWindow = false; + ConfigNavCursorVisibleAuto = true; + ConfigNavCursorVisibleAlways = false; + + // Docking options (when ImGuiConfigFlags_DockingEnable is set) + ConfigDockingNoSplit = false; + ConfigDockingWithShift = false; + ConfigDockingAlwaysTabBar = false; + ConfigDockingTransparentPayload = false; + + // Viewport options (when ImGuiConfigFlags_ViewportsEnable is set) + ConfigViewportsNoAutoMerge = false; + ConfigViewportsNoTaskBarIcon = false; + ConfigViewportsNoDecoration = true; + ConfigViewportsNoDefaultParent = false; + // Miscellaneous options MouseDrawCursor = false; #ifdef __APPLE__ @@ -1226,62 +1497,480 @@ ImGuiIO::ImGuiIO() #else ConfigMacOSXBehaviors = false; #endif + ConfigInputTrickleEventQueue = true; ConfigInputTextCursorBlink = true; + ConfigInputTextEnterKeepActive = false; + ConfigDragClickToInputText = false; ConfigWindowsResizeFromEdges = true; ConfigWindowsMoveFromTitleBarOnly = false; - ConfigWindowsMemoryCompactTimer = 60.0f; + ConfigWindowsCopyContentsWithCtrlC = false; + ConfigScrollbarScrollByPage = true; + ConfigMemoryCompactTimer = 60.0f; + ConfigDebugIsDebuggerPresent = false; + ConfigDebugHighlightIdConflicts = true; + ConfigDebugHighlightIdConflictsShowItemPicker = true; + ConfigDebugBeginReturnValueOnce = false; + ConfigDebugBeginReturnValueLoop = false; + + ConfigErrorRecovery = true; + ConfigErrorRecoveryEnableAssert = true; + ConfigErrorRecoveryEnableDebugLog = true; + ConfigErrorRecoveryEnableTooltip = true; + + // Inputs Behaviors + MouseDoubleClickTime = 0.30f; + MouseDoubleClickMaxDist = 6.0f; + MouseDragThreshold = 6.0f; + KeyRepeatDelay = 0.275f; + KeyRepeatRate = 0.050f; // Platform Functions + // Note: Initialize() will setup default clipboard/ime handlers. BackendPlatformName = BackendRendererName = NULL; BackendPlatformUserData = BackendRendererUserData = BackendLanguageUserData = NULL; - GetClipboardTextFn = GetClipboardTextFn_DefaultImpl; // Platform dependent default implementations - SetClipboardTextFn = SetClipboardTextFn_DefaultImpl; - ClipboardUserData = NULL; - ImeSetInputScreenPosFn = ImeSetInputScreenPosFn_DefaultImpl; - ImeWindowHandle = NULL; - -#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS - RenderDrawListsFn = NULL; -#endif // Input (NB: we already have memset zero the entire structure!) MousePos = ImVec2(-FLT_MAX, -FLT_MAX); MousePosPrev = ImVec2(-FLT_MAX, -FLT_MAX); - MouseDragThreshold = 6.0f; + MouseSource = ImGuiMouseSource_Mouse; for (int i = 0; i < IM_ARRAYSIZE(MouseDownDuration); i++) MouseDownDuration[i] = MouseDownDurationPrev[i] = -1.0f; - for (int i = 0; i < IM_ARRAYSIZE(KeysDownDuration); i++) KeysDownDuration[i] = KeysDownDurationPrev[i] = -1.0f; - for (int i = 0; i < IM_ARRAYSIZE(NavInputsDownDuration); i++) NavInputsDownDuration[i] = -1.0f; + for (int i = 0; i < IM_ARRAYSIZE(KeysData); i++) { KeysData[i].DownDuration = KeysData[i].DownDurationPrev = -1.0f; } + AppAcceptingEvents = true; } // Pass in translated ASCII characters for text input. // - with glfw you can get those from the callback set in glfwSetCharCallback() // - on Windows you can get those using ToAscii+keyboard state, or via the WM_CHAR message +// FIXME: Should in theory be called "AddCharacterEvent()" to be consistent with new API void ImGuiIO::AddInputCharacter(unsigned int c) { - if (c > 0 && c < 0x10000) - InputQueueCharacters.push_back((ImWchar)c); + IM_ASSERT(Ctx != NULL); + ImGuiContext& g = *Ctx; + if (c == 0 || !AppAcceptingEvents) + return; + + ImGuiInputEvent e; + e.Type = ImGuiInputEventType_Text; + e.Source = ImGuiInputSource_Keyboard; + e.EventId = g.InputEventsNextEventId++; + e.Text.Char = c; + g.InputEventsQueue.push_back(e); +} + +// UTF16 strings use surrogate pairs to encode codepoints >= 0x10000, so +// we should save the high surrogate. +void ImGuiIO::AddInputCharacterUTF16(ImWchar16 c) +{ + if ((c == 0 && InputQueueSurrogate == 0) || !AppAcceptingEvents) + return; + + if ((c & 0xFC00) == 0xD800) // High surrogate, must save + { + if (InputQueueSurrogate != 0) + AddInputCharacter(IM_UNICODE_CODEPOINT_INVALID); + InputQueueSurrogate = c; + return; + } + + ImWchar cp = c; + if (InputQueueSurrogate != 0) + { + if ((c & 0xFC00) != 0xDC00) // Invalid low surrogate + { + AddInputCharacter(IM_UNICODE_CODEPOINT_INVALID); + } + else + { +#if IM_UNICODE_CODEPOINT_MAX == 0xFFFF + cp = IM_UNICODE_CODEPOINT_INVALID; // Codepoint will not fit in ImWchar +#else + cp = (ImWchar)(((InputQueueSurrogate - 0xD800) << 10) + (c - 0xDC00) + 0x10000); +#endif + } + + InputQueueSurrogate = 0; + } + AddInputCharacter((unsigned)cp); } void ImGuiIO::AddInputCharactersUTF8(const char* utf8_chars) { + if (!AppAcceptingEvents) + return; while (*utf8_chars != 0) { unsigned int c = 0; utf8_chars += ImTextCharFromUtf8(&c, utf8_chars, NULL); - if (c > 0 && c < 0x10000) - InputQueueCharacters.push_back((ImWchar)c); + AddInputCharacter(c); } } +// Clear all incoming events. +void ImGuiIO::ClearEventsQueue() +{ + IM_ASSERT(Ctx != NULL); + ImGuiContext& g = *Ctx; + g.InputEventsQueue.clear(); +} + +// Clear current keyboard/gamepad state + current frame text input buffer. Equivalent to releasing all keys/buttons. +void ImGuiIO::ClearInputKeys() +{ + ImGuiContext& g = *Ctx; + for (int key = ImGuiKey_NamedKey_BEGIN; key < ImGuiKey_NamedKey_END; key++) + { + if (ImGui::IsMouseKey((ImGuiKey)key)) + continue; + ImGuiKeyData* key_data = &g.IO.KeysData[key - ImGuiKey_NamedKey_BEGIN]; + key_data->Down = false; + key_data->DownDuration = -1.0f; + key_data->DownDurationPrev = -1.0f; + } + KeyCtrl = KeyShift = KeyAlt = KeySuper = false; + KeyMods = ImGuiMod_None; + InputQueueCharacters.resize(0); // Behavior of old ClearInputCharacters(). +} + +void ImGuiIO::ClearInputMouse() +{ + for (ImGuiKey key = ImGuiKey_Mouse_BEGIN; key < ImGuiKey_Mouse_END; key = (ImGuiKey)(key + 1)) + { + ImGuiKeyData* key_data = &KeysData[key - ImGuiKey_NamedKey_BEGIN]; + key_data->Down = false; + key_data->DownDuration = -1.0f; + key_data->DownDurationPrev = -1.0f; + } + MousePos = ImVec2(-FLT_MAX, -FLT_MAX); + for (int n = 0; n < IM_ARRAYSIZE(MouseDown); n++) + { + MouseDown[n] = false; + MouseDownDuration[n] = MouseDownDurationPrev[n] = -1.0f; + } + MouseWheel = MouseWheelH = 0.0f; +} + +// Removed this as it is ambiguous/misleading and generally incorrect to use with the existence of a higher-level input queue. +// Current frame character buffer is now also cleared by ClearInputKeys(). +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS void ImGuiIO::ClearInputCharacters() { InputQueueCharacters.resize(0); } +#endif + +static ImGuiInputEvent* FindLatestInputEvent(ImGuiContext* ctx, ImGuiInputEventType type, int arg = -1) +{ + ImGuiContext& g = *ctx; + for (int n = g.InputEventsQueue.Size - 1; n >= 0; n--) + { + ImGuiInputEvent* e = &g.InputEventsQueue[n]; + if (e->Type != type) + continue; + if (type == ImGuiInputEventType_Key && e->Key.Key != arg) + continue; + if (type == ImGuiInputEventType_MouseButton && e->MouseButton.Button != arg) + continue; + return e; + } + return NULL; +} + +// Queue a new key down/up event. +// - ImGuiKey key: Translated key (as in, generally ImGuiKey_A matches the key end-user would use to emit an 'A' character) +// - bool down: Is the key down? use false to signify a key release. +// - float analog_value: 0.0f..1.0f +// IMPORTANT: THIS FUNCTION AND OTHER "ADD" GRABS THE CONTEXT FROM OUR INSTANCE. +// WE NEED TO ENSURE THAT ALL FUNCTION CALLS ARE FULFILLING THIS, WHICH IS WHY GetKeyData() HAS AN EXPLICIT CONTEXT. +void ImGuiIO::AddKeyAnalogEvent(ImGuiKey key, bool down, float analog_value) +{ + //if (e->Down) { IMGUI_DEBUG_LOG_IO("AddKeyEvent() Key='%s' %d, NativeKeycode = %d, NativeScancode = %d\n", ImGui::GetKeyName(e->Key), e->Down, e->NativeKeycode, e->NativeScancode); } + IM_ASSERT(Ctx != NULL); + if (key == ImGuiKey_None || !AppAcceptingEvents) + return; + ImGuiContext& g = *Ctx; + IM_ASSERT(ImGui::IsNamedKeyOrMod(key)); // Backend needs to pass a valid ImGuiKey_ constant. 0..511 values are legacy native key codes which are not accepted by this API. + IM_ASSERT(ImGui::IsAliasKey(key) == false); // Backend cannot submit ImGuiKey_MouseXXX values they are automatically inferred from AddMouseXXX() events. + + // MacOS: swap Cmd(Super) and Ctrl + if (g.IO.ConfigMacOSXBehaviors) + { + if (key == ImGuiMod_Super) { key = ImGuiMod_Ctrl; } + else if (key == ImGuiMod_Ctrl) { key = ImGuiMod_Super; } + else if (key == ImGuiKey_LeftSuper) { key = ImGuiKey_LeftCtrl; } + else if (key == ImGuiKey_RightSuper){ key = ImGuiKey_RightCtrl; } + else if (key == ImGuiKey_LeftCtrl) { key = ImGuiKey_LeftSuper; } + else if (key == ImGuiKey_RightCtrl) { key = ImGuiKey_RightSuper; } + } + + // Filter duplicate (in particular: key mods and gamepad analog values are commonly spammed) + const ImGuiInputEvent* latest_event = FindLatestInputEvent(&g, ImGuiInputEventType_Key, (int)key); + const ImGuiKeyData* key_data = ImGui::GetKeyData(&g, key); + const bool latest_key_down = latest_event ? latest_event->Key.Down : key_data->Down; + const float latest_key_analog = latest_event ? latest_event->Key.AnalogValue : key_data->AnalogValue; + if (latest_key_down == down && latest_key_analog == analog_value) + return; + + // Add event + ImGuiInputEvent e; + e.Type = ImGuiInputEventType_Key; + e.Source = ImGui::IsGamepadKey(key) ? ImGuiInputSource_Gamepad : ImGuiInputSource_Keyboard; + e.EventId = g.InputEventsNextEventId++; + e.Key.Key = key; + e.Key.Down = down; + e.Key.AnalogValue = analog_value; + g.InputEventsQueue.push_back(e); +} + +void ImGuiIO::AddKeyEvent(ImGuiKey key, bool down) +{ + if (!AppAcceptingEvents) + return; + AddKeyAnalogEvent(key, down, down ? 1.0f : 0.0f); +} + +// [Optional] Call after AddKeyEvent(). +// Specify native keycode, scancode + Specify index for legacy <1.87 IsKeyXXX() functions with native indices. +// If you are writing a backend in 2022 or don't use IsKeyXXX() with native values that are not ImGuiKey values, you can avoid calling this. +void ImGuiIO::SetKeyEventNativeData(ImGuiKey key, int native_keycode, int native_scancode, int native_legacy_index) +{ + if (key == ImGuiKey_None) + return; + IM_ASSERT(ImGui::IsNamedKey(key)); // >= 512 + IM_ASSERT(native_legacy_index == -1 || ImGui::IsLegacyKey((ImGuiKey)native_legacy_index)); // >= 0 && <= 511 + IM_UNUSED(key); // Yet unused + IM_UNUSED(native_keycode); // Yet unused + IM_UNUSED(native_scancode); // Yet unused + IM_UNUSED(native_legacy_index); // Yet unused +} + +// Set master flag for accepting key/mouse/text events (default to true). Useful if you have native dialog boxes that are interrupting your application loop/refresh, and you want to disable events being queued while your app is frozen. +void ImGuiIO::SetAppAcceptingEvents(bool accepting_events) +{ + AppAcceptingEvents = accepting_events; +} + +// Queue a mouse move event +void ImGuiIO::AddMousePosEvent(float x, float y) +{ + IM_ASSERT(Ctx != NULL); + ImGuiContext& g = *Ctx; + if (!AppAcceptingEvents) + return; + + // Apply same flooring as UpdateMouseInputs() + ImVec2 pos((x > -FLT_MAX) ? ImFloor(x) : x, (y > -FLT_MAX) ? ImFloor(y) : y); + + // Filter duplicate + const ImGuiInputEvent* latest_event = FindLatestInputEvent(&g, ImGuiInputEventType_MousePos); + const ImVec2 latest_pos = latest_event ? ImVec2(latest_event->MousePos.PosX, latest_event->MousePos.PosY) : g.IO.MousePos; + if (latest_pos.x == pos.x && latest_pos.y == pos.y) + return; + + ImGuiInputEvent e; + e.Type = ImGuiInputEventType_MousePos; + e.Source = ImGuiInputSource_Mouse; + e.EventId = g.InputEventsNextEventId++; + e.MousePos.PosX = pos.x; + e.MousePos.PosY = pos.y; + e.MousePos.MouseSource = g.InputEventsNextMouseSource; + g.InputEventsQueue.push_back(e); +} + +void ImGuiIO::AddMouseButtonEvent(int mouse_button, bool down) +{ + IM_ASSERT(Ctx != NULL); + ImGuiContext& g = *Ctx; + IM_ASSERT(mouse_button >= 0 && mouse_button < ImGuiMouseButton_COUNT); + if (!AppAcceptingEvents) + return; + + // On MacOS X: Convert Ctrl(Super)+Left click into Right-click: handle held button. + if (ConfigMacOSXBehaviors && mouse_button == 0 && MouseCtrlLeftAsRightClick) + { + // Order of both statements matterns: this event will still release mouse button 1 + mouse_button = 1; + if (!down) + MouseCtrlLeftAsRightClick = false; + } + + // Filter duplicate + const ImGuiInputEvent* latest_event = FindLatestInputEvent(&g, ImGuiInputEventType_MouseButton, (int)mouse_button); + const bool latest_button_down = latest_event ? latest_event->MouseButton.Down : g.IO.MouseDown[mouse_button]; + if (latest_button_down == down) + return; + + // On MacOS X: Convert Ctrl(Super)+Left click into Right-click. + // - Note that this is actual physical Ctrl which is ImGuiMod_Super for us. + // - At this point we want from !down to down, so this is handling the initial press. + if (ConfigMacOSXBehaviors && mouse_button == 0 && down) + { + const ImGuiInputEvent* latest_super_event = FindLatestInputEvent(&g, ImGuiInputEventType_Key, (int)ImGuiMod_Super); + if (latest_super_event ? latest_super_event->Key.Down : g.IO.KeySuper) + { + IMGUI_DEBUG_LOG_IO("[io] Super+Left Click aliased into Right Click\n"); + MouseCtrlLeftAsRightClick = true; + AddMouseButtonEvent(1, true); // This is just quicker to write that passing through, as we need to filter duplicate again. + return; + } + } + + ImGuiInputEvent e; + e.Type = ImGuiInputEventType_MouseButton; + e.Source = ImGuiInputSource_Mouse; + e.EventId = g.InputEventsNextEventId++; + e.MouseButton.Button = mouse_button; + e.MouseButton.Down = down; + e.MouseButton.MouseSource = g.InputEventsNextMouseSource; + g.InputEventsQueue.push_back(e); +} + +// Queue a mouse wheel event (some mouse/API may only have a Y component) +void ImGuiIO::AddMouseWheelEvent(float wheel_x, float wheel_y) +{ + IM_ASSERT(Ctx != NULL); + ImGuiContext& g = *Ctx; + + // Filter duplicate (unlike most events, wheel values are relative and easy to filter) + if (!AppAcceptingEvents || (wheel_x == 0.0f && wheel_y == 0.0f)) + return; + + ImGuiInputEvent e; + e.Type = ImGuiInputEventType_MouseWheel; + e.Source = ImGuiInputSource_Mouse; + e.EventId = g.InputEventsNextEventId++; + e.MouseWheel.WheelX = wheel_x; + e.MouseWheel.WheelY = wheel_y; + e.MouseWheel.MouseSource = g.InputEventsNextMouseSource; + g.InputEventsQueue.push_back(e); +} + +// This is not a real event, the data is latched in order to be stored in actual Mouse events. +// This is so that duplicate events (e.g. Windows sending extraneous WM_MOUSEMOVE) gets filtered and are not leading to actual source changes. +void ImGuiIO::AddMouseSourceEvent(ImGuiMouseSource source) +{ + IM_ASSERT(Ctx != NULL); + ImGuiContext& g = *Ctx; + g.InputEventsNextMouseSource = source; +} + +void ImGuiIO::AddMouseViewportEvent(ImGuiID viewport_id) +{ + IM_ASSERT(Ctx != NULL); + ImGuiContext& g = *Ctx; + //IM_ASSERT(g.IO.BackendFlags & ImGuiBackendFlags_HasMouseHoveredViewport); + if (!AppAcceptingEvents) + return; + + // Filter duplicate + const ImGuiInputEvent* latest_event = FindLatestInputEvent(&g, ImGuiInputEventType_MouseViewport); + const ImGuiID latest_viewport_id = latest_event ? latest_event->MouseViewport.HoveredViewportID : g.IO.MouseHoveredViewport; + if (latest_viewport_id == viewport_id) + return; + + ImGuiInputEvent e; + e.Type = ImGuiInputEventType_MouseViewport; + e.Source = ImGuiInputSource_Mouse; + e.MouseViewport.HoveredViewportID = viewport_id; + g.InputEventsQueue.push_back(e); +} + +void ImGuiIO::AddFocusEvent(bool focused) +{ + IM_ASSERT(Ctx != NULL); + ImGuiContext& g = *Ctx; + + // Filter duplicate + const ImGuiInputEvent* latest_event = FindLatestInputEvent(&g, ImGuiInputEventType_Focus); + const bool latest_focused = latest_event ? latest_event->AppFocused.Focused : !g.IO.AppFocusLost; + if (latest_focused == focused || (ConfigDebugIgnoreFocusLoss && !focused)) + return; + + ImGuiInputEvent e; + e.Type = ImGuiInputEventType_Focus; + e.EventId = g.InputEventsNextEventId++; + e.AppFocused.Focused = focused; + g.InputEventsQueue.push_back(e); +} + +ImGuiPlatformIO::ImGuiPlatformIO() +{ + // Most fields are initialized with zero + memset(this, 0, sizeof(*this)); + Platform_LocaleDecimalPoint = '.'; +} //----------------------------------------------------------------------------- -// [SECTION] MISC HELPERS/UTILITIES (Maths, String, Format, Hash, File functions) +// [SECTION] MISC HELPERS/UTILITIES (Geometry functions) //----------------------------------------------------------------------------- +ImVec2 ImBezierCubicClosestPoint(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, const ImVec2& p, int num_segments) +{ + IM_ASSERT(num_segments > 0); // Use ImBezierCubicClosestPointCasteljau() + ImVec2 p_last = p1; + ImVec2 p_closest; + float p_closest_dist2 = FLT_MAX; + float t_step = 1.0f / (float)num_segments; + for (int i_step = 1; i_step <= num_segments; i_step++) + { + ImVec2 p_current = ImBezierCubicCalc(p1, p2, p3, p4, t_step * i_step); + ImVec2 p_line = ImLineClosestPoint(p_last, p_current, p); + float dist2 = ImLengthSqr(p - p_line); + if (dist2 < p_closest_dist2) + { + p_closest = p_line; + p_closest_dist2 = dist2; + } + p_last = p_current; + } + return p_closest; +} + +// Closely mimics PathBezierToCasteljau() in imgui_draw.cpp +static void ImBezierCubicClosestPointCasteljauStep(const ImVec2& p, ImVec2& p_closest, ImVec2& p_last, float& p_closest_dist2, float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4, float tess_tol, int level) +{ + float dx = x4 - x1; + float dy = y4 - y1; + float d2 = ((x2 - x4) * dy - (y2 - y4) * dx); + float d3 = ((x3 - x4) * dy - (y3 - y4) * dx); + d2 = (d2 >= 0) ? d2 : -d2; + d3 = (d3 >= 0) ? d3 : -d3; + if ((d2 + d3) * (d2 + d3) < tess_tol * (dx * dx + dy * dy)) + { + ImVec2 p_current(x4, y4); + ImVec2 p_line = ImLineClosestPoint(p_last, p_current, p); + float dist2 = ImLengthSqr(p - p_line); + if (dist2 < p_closest_dist2) + { + p_closest = p_line; + p_closest_dist2 = dist2; + } + p_last = p_current; + } + else if (level < 10) + { + float x12 = (x1 + x2)*0.5f, y12 = (y1 + y2)*0.5f; + float x23 = (x2 + x3)*0.5f, y23 = (y2 + y3)*0.5f; + float x34 = (x3 + x4)*0.5f, y34 = (y3 + y4)*0.5f; + float x123 = (x12 + x23)*0.5f, y123 = (y12 + y23)*0.5f; + float x234 = (x23 + x34)*0.5f, y234 = (y23 + y34)*0.5f; + float x1234 = (x123 + x234)*0.5f, y1234 = (y123 + y234)*0.5f; + ImBezierCubicClosestPointCasteljauStep(p, p_closest, p_last, p_closest_dist2, x1, y1, x12, y12, x123, y123, x1234, y1234, tess_tol, level + 1); + ImBezierCubicClosestPointCasteljauStep(p, p_closest, p_last, p_closest_dist2, x1234, y1234, x234, y234, x34, y34, x4, y4, tess_tol, level + 1); + } +} + +// tess_tol is generally the same value you would find in ImGui::GetStyle().CurveTessellationTol +// Because those ImXXX functions are lower-level than ImGui:: we cannot access this value automatically. +ImVec2 ImBezierCubicClosestPointCasteljau(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, const ImVec2& p, float tess_tol) +{ + IM_ASSERT(tess_tol > 0.0f); + ImVec2 p_last = p1; + ImVec2 p_closest; + float p_closest_dist2 = FLT_MAX; + ImBezierCubicClosestPointCasteljauStep(p, p_closest, p_last, p_closest_dist2, p1.x, p1.y, p2.x, p2.y, p3.x, p3.y, p4.x, p4.y, tess_tol, 0); + return p_closest; +} + ImVec2 ImLineClosestPoint(const ImVec2& a, const ImVec2& b, const ImVec2& p) { ImVec2 ap = p - a; @@ -1330,18 +2019,22 @@ ImVec2 ImTriangleClosestPoint(const ImVec2& a, const ImVec2& b, const ImVec2& c, return proj_ca; } +//----------------------------------------------------------------------------- +// [SECTION] MISC HELPERS/UTILITIES (String, Format, Hash functions) +//----------------------------------------------------------------------------- + // Consider using _stricmp/_strnicmp under Windows or strcasecmp/strncasecmp. We don't actually use either ImStricmp/ImStrnicmp in the codebase any more. int ImStricmp(const char* str1, const char* str2) { int d; - while ((d = toupper(*str2) - toupper(*str1)) == 0 && *str1) { str1++; str2++; } + while ((d = ImToUpper(*str2) - ImToUpper(*str1)) == 0 && *str1) { str1++; str2++; } return d; } int ImStrnicmp(const char* str1, const char* str2, size_t count) { int d = 0; - while (count > 0 && (d = toupper(*str2) - toupper(*str1)) == 0 && *str1) { str1++; str2++; count--; } + while (count > 0 && (d = ImToUpper(*str2) - ImToUpper(*str1)) == 0 && *str1) { str1++; str2++; count--; } return d; } @@ -1356,15 +2049,15 @@ void ImStrncpy(char* dst, const char* src, size_t count) char* ImStrdup(const char* str) { - size_t len = strlen(str); + size_t len = ImStrlen(str); void* buf = IM_ALLOC(len + 1); return (char*)memcpy(buf, (const void*)str, len + 1); } char* ImStrdupcpy(char* dst, size_t* p_dst_size, const char* src) { - size_t dst_buf_size = p_dst_size ? *p_dst_size : strlen(dst) + 1; - size_t src_size = strlen(src) + 1; + size_t dst_buf_size = p_dst_size ? *p_dst_size : ImStrlen(dst) + 1; + size_t src_size = ImStrlen(src) + 1; if (dst_buf_size < src_size) { IM_FREE(dst); @@ -1377,13 +2070,13 @@ char* ImStrdupcpy(char* dst, size_t* p_dst_size, const char* src) const char* ImStrchrRange(const char* str, const char* str_end, char c) { - const char* p = (const char*)memchr(str, (int)c, str_end - str); + const char* p = (const char*)ImMemchr(str, (int)c, str_end - str); return p; } int ImStrlenW(const ImWchar* str) { - //return (int)wcslen((const wchar_t*)str); // FIXME-OPT: Could use this when wchar_t are 16-bits + //return (int)wcslen((const wchar_t*)str); // FIXME-OPT: Could use this when wchar_t are 16-bit int n = 0; while (*str++) n++; return n; @@ -1392,12 +2085,13 @@ int ImStrlenW(const ImWchar* str) // Find end-of-line. Return pointer will point to either first \n, either str_end. const char* ImStreolRange(const char* str, const char* str_end) { - const char* p = (const char*)memchr(str, '\n', str_end - str); + const char* p = (const char*)ImMemchr(str, '\n', str_end - str); return p ? p : str_end; } -const ImWchar* ImStrbolW(const ImWchar* buf_mid_line, const ImWchar* buf_begin) // find beginning-of-line +const char* ImStrbol(const char* buf_mid_line, const char* buf_begin) // find beginning-of-line { + IM_ASSERT_PARANOID(buf_mid_line >= buf_begin && buf_mid_line <= buf_begin + ImStrlen(buf_begin)); while (buf_mid_line > buf_begin && buf_mid_line[-1] != '\n') buf_mid_line--; return buf_mid_line; @@ -1406,16 +2100,16 @@ const ImWchar* ImStrbolW(const ImWchar* buf_mid_line, const ImWchar* buf_begin) const char* ImStristr(const char* haystack, const char* haystack_end, const char* needle, const char* needle_end) { if (!needle_end) - needle_end = needle + strlen(needle); + needle_end = needle + ImStrlen(needle); - const char un0 = (char)toupper(*needle); + const char un0 = (char)ImToUpper(*needle); while ((!haystack_end && *haystack) || (haystack_end && haystack < haystack_end)) { - if (toupper(*haystack) == un0) + if (ImToUpper(*haystack) == un0) { const char* b = needle + 1; for (const char* a = haystack + 1; b < needle_end; a++, b++) - if (toupper(*a) != toupper(*b)) + if (ImToUpper(*a) != ImToUpper(*b)) break; if (b == needle_end) return haystack; @@ -1441,16 +2135,32 @@ void ImStrTrimBlanks(char* buf) buf[p - p_start] = 0; // Zero terminate } +const char* ImStrSkipBlank(const char* str) +{ + while (str[0] == ' ' || str[0] == '\t') + str++; + return str; +} + // A) MSVC version appears to return -1 on overflow, whereas glibc appears to return total count (which may be >= buf_size). // Ideally we would test for only one of those limits at runtime depending on the behavior the vsnprintf(), but trying to deduct it at compile time sounds like a pandora can of worm. // B) When buf==NULL vsnprintf() will return the output size. -#ifndef IMGUI_DISABLE_FORMAT_STRING_FUNCTIONS +#ifndef IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS -//#define IMGUI_USE_STB_SPRINTF +// We support stb_sprintf which is much faster (see: https://github.com/nothings/stb/blob/master/stb_sprintf.h) +// You may set IMGUI_USE_STB_SPRINTF to use our default wrapper, or set IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS +// and setup the wrapper yourself. (FIXME-OPT: Some of our high-level operations such as ImGuiTextBuffer::appendfv() are +// designed using two-passes worst case, which probably could be improved using the stbsp_vsprintfcb() function.) #ifdef IMGUI_USE_STB_SPRINTF +#ifndef IMGUI_DISABLE_STB_SPRINTF_IMPLEMENTATION #define STB_SPRINTF_IMPLEMENTATION -#include "imstb_sprintf.h" #endif +#ifdef IMGUI_STB_SPRINTF_FILENAME +#include IMGUI_STB_SPRINTF_FILENAME +#else +#include "stb_sprintf.h" +#endif +#endif // #ifdef IMGUI_USE_STB_SPRINTF #if defined(_MSC_VER) && !defined(vsnprintf) #define vsnprintf _vsnprintf @@ -1488,13 +2198,59 @@ int ImFormatStringV(char* buf, size_t buf_size, const char* fmt, va_list args) buf[w] = 0; return w; } -#endif // #ifdef IMGUI_DISABLE_FORMAT_STRING_FUNCTIONS +#endif // #ifdef IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS +void ImFormatStringToTempBuffer(const char** out_buf, const char** out_buf_end, const char* fmt, ...) +{ + va_list args; + va_start(args, fmt); + ImFormatStringToTempBufferV(out_buf, out_buf_end, fmt, args); + va_end(args); +} + +// FIXME: Should rework API toward allowing multiple in-flight temp buffers (easier and safer for caller) +// by making the caller acquire a temp buffer token, with either explicit or destructor release, e.g. +// ImGuiTempBufferToken token; +// ImFormatStringToTempBuffer(token, ...); +void ImFormatStringToTempBufferV(const char** out_buf, const char** out_buf_end, const char* fmt, va_list args) +{ + ImGuiContext& g = *GImGui; + if (fmt[0] == '%' && fmt[1] == 's' && fmt[2] == 0) + { + const char* buf = va_arg(args, const char*); // Skip formatting when using "%s" + if (buf == NULL) + buf = "(null)"; + *out_buf = buf; + if (out_buf_end) { *out_buf_end = buf + ImStrlen(buf); } + } + else if (fmt[0] == '%' && fmt[1] == '.' && fmt[2] == '*' && fmt[3] == 's' && fmt[4] == 0) + { + int buf_len = va_arg(args, int); // Skip formatting when using "%.*s" + const char* buf = va_arg(args, const char*); + if (buf == NULL) + { + buf = "(null)"; + buf_len = ImMin(buf_len, 6); + } + *out_buf = buf; + *out_buf_end = buf + buf_len; // Disallow not passing 'out_buf_end' here. User is expected to use it. + } + else + { + int buf_len = ImFormatStringV(g.TempBuffer.Data, g.TempBuffer.Size, fmt, args); + *out_buf = g.TempBuffer.Data; + if (out_buf_end) { *out_buf_end = g.TempBuffer.Data + buf_len; } + } +} + +#ifndef IMGUI_ENABLE_SSE4_2_CRC // CRC32 needs a 1KB lookup table (not cache friendly) // Although the code to generate the table is simple and shorter than the table itself, using a const table allows us to easily: // - avoid an unnecessary branch/memory tap, - keep the ImHashXXX functions usable by static constructors, - make it thread-safe. static const ImU32 GCrc32LookupTable[256] = { +#ifdef IMGUI_USE_LEGACY_CRC32_ADLER + // Legacy CRC32-adler table used pre 1.91.6 (before 2024/11/27). Only use if you cannot afford invalidating old .ini data. 0x00000000,0x77073096,0xEE0E612C,0x990951BA,0x076DC419,0x706AF48F,0xE963A535,0x9E6495A3,0x0EDB8832,0x79DCB8A4,0xE0D5E91E,0x97D2D988,0x09B64C2B,0x7EB17CBD,0xE7B82D07,0x90BF1D91, 0x1DB71064,0x6AB020F2,0xF3B97148,0x84BE41DE,0x1ADAD47D,0x6DDDE4EB,0xF4D4B551,0x83D385C7,0x136C9856,0x646BA8C0,0xFD62F97A,0x8A65C9EC,0x14015C4F,0x63066CD9,0xFA0F3D63,0x8D080DF5, 0x3B6E20C8,0x4C69105E,0xD56041E4,0xA2677172,0x3C03E4D1,0x4B04D447,0xD20D85FD,0xA50AB56B,0x35B5A8FA,0x42B2986C,0xDBBBC9D6,0xACBCF940,0x32D86CE3,0x45DF5C75,0xDCD60DCF,0xABD13D59, @@ -1511,19 +2267,51 @@ static const ImU32 GCrc32LookupTable[256] = 0x86D3D2D4,0xF1D4E242,0x68DDB3F8,0x1FDA836E,0x81BE16CD,0xF6B9265B,0x6FB077E1,0x18B74777,0x88085AE6,0xFF0F6A70,0x66063BCA,0x11010B5C,0x8F659EFF,0xF862AE69,0x616BFFD3,0x166CCF45, 0xA00AE278,0xD70DD2EE,0x4E048354,0x3903B3C2,0xA7672661,0xD06016F7,0x4969474D,0x3E6E77DB,0xAED16A4A,0xD9D65ADC,0x40DF0B66,0x37D83BF0,0xA9BCAE53,0xDEBB9EC5,0x47B2CF7F,0x30B5FFE9, 0xBDBDF21C,0xCABAC28A,0x53B39330,0x24B4A3A6,0xBAD03605,0xCDD70693,0x54DE5729,0x23D967BF,0xB3667A2E,0xC4614AB8,0x5D681B02,0x2A6F2B94,0xB40BBE37,0xC30C8EA1,0x5A05DF1B,0x2D02EF8D, +#else + // CRC32c table compatible with SSE 4.2 instructions + 0x00000000,0xF26B8303,0xE13B70F7,0x1350F3F4,0xC79A971F,0x35F1141C,0x26A1E7E8,0xD4CA64EB,0x8AD958CF,0x78B2DBCC,0x6BE22838,0x9989AB3B,0x4D43CFD0,0xBF284CD3,0xAC78BF27,0x5E133C24, + 0x105EC76F,0xE235446C,0xF165B798,0x030E349B,0xD7C45070,0x25AFD373,0x36FF2087,0xC494A384,0x9A879FA0,0x68EC1CA3,0x7BBCEF57,0x89D76C54,0x5D1D08BF,0xAF768BBC,0xBC267848,0x4E4DFB4B, + 0x20BD8EDE,0xD2D60DDD,0xC186FE29,0x33ED7D2A,0xE72719C1,0x154C9AC2,0x061C6936,0xF477EA35,0xAA64D611,0x580F5512,0x4B5FA6E6,0xB93425E5,0x6DFE410E,0x9F95C20D,0x8CC531F9,0x7EAEB2FA, + 0x30E349B1,0xC288CAB2,0xD1D83946,0x23B3BA45,0xF779DEAE,0x05125DAD,0x1642AE59,0xE4292D5A,0xBA3A117E,0x4851927D,0x5B016189,0xA96AE28A,0x7DA08661,0x8FCB0562,0x9C9BF696,0x6EF07595, + 0x417B1DBC,0xB3109EBF,0xA0406D4B,0x522BEE48,0x86E18AA3,0x748A09A0,0x67DAFA54,0x95B17957,0xCBA24573,0x39C9C670,0x2A993584,0xD8F2B687,0x0C38D26C,0xFE53516F,0xED03A29B,0x1F682198, + 0x5125DAD3,0xA34E59D0,0xB01EAA24,0x42752927,0x96BF4DCC,0x64D4CECF,0x77843D3B,0x85EFBE38,0xDBFC821C,0x2997011F,0x3AC7F2EB,0xC8AC71E8,0x1C661503,0xEE0D9600,0xFD5D65F4,0x0F36E6F7, + 0x61C69362,0x93AD1061,0x80FDE395,0x72966096,0xA65C047D,0x5437877E,0x4767748A,0xB50CF789,0xEB1FCBAD,0x197448AE,0x0A24BB5A,0xF84F3859,0x2C855CB2,0xDEEEDFB1,0xCDBE2C45,0x3FD5AF46, + 0x7198540D,0x83F3D70E,0x90A324FA,0x62C8A7F9,0xB602C312,0x44694011,0x5739B3E5,0xA55230E6,0xFB410CC2,0x092A8FC1,0x1A7A7C35,0xE811FF36,0x3CDB9BDD,0xCEB018DE,0xDDE0EB2A,0x2F8B6829, + 0x82F63B78,0x709DB87B,0x63CD4B8F,0x91A6C88C,0x456CAC67,0xB7072F64,0xA457DC90,0x563C5F93,0x082F63B7,0xFA44E0B4,0xE9141340,0x1B7F9043,0xCFB5F4A8,0x3DDE77AB,0x2E8E845F,0xDCE5075C, + 0x92A8FC17,0x60C37F14,0x73938CE0,0x81F80FE3,0x55326B08,0xA759E80B,0xB4091BFF,0x466298FC,0x1871A4D8,0xEA1A27DB,0xF94AD42F,0x0B21572C,0xDFEB33C7,0x2D80B0C4,0x3ED04330,0xCCBBC033, + 0xA24BB5A6,0x502036A5,0x4370C551,0xB11B4652,0x65D122B9,0x97BAA1BA,0x84EA524E,0x7681D14D,0x2892ED69,0xDAF96E6A,0xC9A99D9E,0x3BC21E9D,0xEF087A76,0x1D63F975,0x0E330A81,0xFC588982, + 0xB21572C9,0x407EF1CA,0x532E023E,0xA145813D,0x758FE5D6,0x87E466D5,0x94B49521,0x66DF1622,0x38CC2A06,0xCAA7A905,0xD9F75AF1,0x2B9CD9F2,0xFF56BD19,0x0D3D3E1A,0x1E6DCDEE,0xEC064EED, + 0xC38D26C4,0x31E6A5C7,0x22B65633,0xD0DDD530,0x0417B1DB,0xF67C32D8,0xE52CC12C,0x1747422F,0x49547E0B,0xBB3FFD08,0xA86F0EFC,0x5A048DFF,0x8ECEE914,0x7CA56A17,0x6FF599E3,0x9D9E1AE0, + 0xD3D3E1AB,0x21B862A8,0x32E8915C,0xC083125F,0x144976B4,0xE622F5B7,0xF5720643,0x07198540,0x590AB964,0xAB613A67,0xB831C993,0x4A5A4A90,0x9E902E7B,0x6CFBAD78,0x7FAB5E8C,0x8DC0DD8F, + 0xE330A81A,0x115B2B19,0x020BD8ED,0xF0605BEE,0x24AA3F05,0xD6C1BC06,0xC5914FF2,0x37FACCF1,0x69E9F0D5,0x9B8273D6,0x88D28022,0x7AB90321,0xAE7367CA,0x5C18E4C9,0x4F48173D,0xBD23943E, + 0xF36E6F75,0x0105EC76,0x12551F82,0xE03E9C81,0x34F4F86A,0xC69F7B69,0xD5CF889D,0x27A40B9E,0x79B737BA,0x8BDCB4B9,0x988C474D,0x6AE7C44E,0xBE2DA0A5,0x4C4623A6,0x5F16D052,0xAD7D5351 +#endif }; +#endif // Known size hash // It is ok to call ImHashData on a string with known length but the ### operator won't be supported. // FIXME-OPT: Replace with e.g. FNV1a hash? CRC32 pretty much randomly access 1KB. Need to do proper measurements. -ImU32 ImHashData(const void* data_p, size_t data_size, ImU32 seed) +ImGuiID ImHashData(const void* data_p, size_t data_size, ImGuiID seed) { ImU32 crc = ~seed; const unsigned char* data = (const unsigned char*)data_p; + const unsigned char *data_end = (const unsigned char*)data_p + data_size; +#ifndef IMGUI_ENABLE_SSE4_2_CRC const ImU32* crc32_lut = GCrc32LookupTable; - while (data_size-- != 0) + while (data < data_end) crc = (crc >> 8) ^ crc32_lut[(crc & 0xFF) ^ *data++]; return ~crc; +#else + while (data + 4 <= data_end) + { + crc = _mm_crc32_u32(crc, *(ImU32*)data); + data += 4; + } + while (data < data_end) + crc = _mm_crc32_u8(crc, *data++); + return ~crc; +#endif } // Zero-terminated string hash, with support for ### to reset back to seed value @@ -1532,12 +2320,14 @@ ImU32 ImHashData(const void* data_p, size_t data_size, ImU32 seed) // - If we reach ### in the string we discard the hash so far and reset to the seed. // - We don't do 'current += 2; continue;' after handling ### to keep the code smaller/faster (measured ~10% diff in Debug build) // FIXME-OPT: Replace with e.g. FNV1a hash? CRC32 pretty much randomly access 1KB. Need to do proper measurements. -ImU32 ImHashStr(const char* data_p, size_t data_size, ImU32 seed) +ImGuiID ImHashStr(const char* data_p, size_t data_size, ImGuiID seed) { seed = ~seed; ImU32 crc = seed; const unsigned char* data = (const unsigned char*)data_p; +#ifndef IMGUI_ENABLE_SSE4_2_CRC const ImU32* crc32_lut = GCrc32LookupTable; +#endif if (data_size != 0) { while (data_size-- != 0) @@ -1545,7 +2335,11 @@ ImU32 ImHashStr(const char* data_p, size_t data_size, ImU32 seed) unsigned char c = *data++; if (c == '#' && data_size >= 2 && data[0] == '#' && data[1] == '#') crc = seed; +#ifndef IMGUI_ENABLE_SSE4_2_CRC crc = (crc >> 8) ^ crc32_lut[(crc & 0xFF) ^ c]; +#else + crc = _mm_crc32_u8(crc, c); +#endif } } else @@ -1554,64 +2348,90 @@ ImU32 ImHashStr(const char* data_p, size_t data_size, ImU32 seed) { if (c == '#' && data[0] == '#' && data[1] == '#') crc = seed; +#ifndef IMGUI_ENABLE_SSE4_2_CRC crc = (crc >> 8) ^ crc32_lut[(crc & 0xFF) ^ c]; +#else + crc = _mm_crc32_u8(crc, c); +#endif } } return ~crc; } -FILE* ImFileOpen(const char* filename, const char* mode) +//----------------------------------------------------------------------------- +// [SECTION] MISC HELPERS/UTILITIES (File functions) +//----------------------------------------------------------------------------- + +// Default file functions +#ifndef IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS + +ImFileHandle ImFileOpen(const char* filename, const char* mode) { -#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__GNUC__) - // We need a fopen() wrapper because MSVC/Windows fopen doesn't handle UTF-8 filenames. Converting both strings from UTF-8 to wchar format (using a single allocation, because we can) - const int filename_wsize = ImTextCountCharsFromUtf8(filename, NULL) + 1; - const int mode_wsize = ImTextCountCharsFromUtf8(mode, NULL) + 1; - ImVector buf; - buf.resize(filename_wsize + mode_wsize); - ImTextStrFromUtf8(&buf[0], filename_wsize, filename, NULL); - ImTextStrFromUtf8(&buf[filename_wsize], mode_wsize, mode, NULL); - return _wfopen((wchar_t*)&buf[0], (wchar_t*)&buf[filename_wsize]); +#if defined(_WIN32) && !defined(IMGUI_DISABLE_WIN32_FUNCTIONS) && (defined(__MINGW32__) || (!defined(__CYGWIN__) && !defined(__GNUC__))) + // We need a fopen() wrapper because MSVC/Windows fopen doesn't handle UTF-8 filenames. + // Previously we used ImTextCountCharsFromUtf8/ImTextStrFromUtf8 here but we now need to support ImWchar16 and ImWchar32! + const int filename_wsize = ::MultiByteToWideChar(CP_UTF8, 0, filename, -1, NULL, 0); + const int mode_wsize = ::MultiByteToWideChar(CP_UTF8, 0, mode, -1, NULL, 0); + + // Use stack buffer if possible, otherwise heap buffer. Sizes include zero terminator. + // We don't rely on current ImGuiContext as this is implied to be a helper function which doesn't depend on it (see #7314). + wchar_t local_temp_stack[FILENAME_MAX]; + ImVector local_temp_heap; + if (filename_wsize + mode_wsize > IM_ARRAYSIZE(local_temp_stack)) + local_temp_heap.resize(filename_wsize + mode_wsize); + wchar_t* filename_wbuf = local_temp_heap.Data ? local_temp_heap.Data : local_temp_stack; + wchar_t* mode_wbuf = filename_wbuf + filename_wsize; + ::MultiByteToWideChar(CP_UTF8, 0, filename, -1, filename_wbuf, filename_wsize); + ::MultiByteToWideChar(CP_UTF8, 0, mode, -1, mode_wbuf, mode_wsize); + return ::_wfopen(filename_wbuf, mode_wbuf); #else return fopen(filename, mode); #endif } -// Load file content into memory +// We should in theory be using fseeko()/ftello() with off_t and _fseeki64()/_ftelli64() with __int64, waiting for the PR that does that in a very portable pre-C++11 zero-warnings way. +bool ImFileClose(ImFileHandle f) { return fclose(f) == 0; } +ImU64 ImFileGetSize(ImFileHandle f) { long off = 0, sz = 0; return ((off = ftell(f)) != -1 && !fseek(f, 0, SEEK_END) && (sz = ftell(f)) != -1 && !fseek(f, off, SEEK_SET)) ? (ImU64)sz : (ImU64)-1; } +ImU64 ImFileRead(void* data, ImU64 sz, ImU64 count, ImFileHandle f) { return fread(data, (size_t)sz, (size_t)count, f); } +ImU64 ImFileWrite(const void* data, ImU64 sz, ImU64 count, ImFileHandle f) { return fwrite(data, (size_t)sz, (size_t)count, f); } +#endif // #ifndef IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS + +// Helper: Load file content into memory // Memory allocated with IM_ALLOC(), must be freed by user using IM_FREE() == ImGui::MemFree() -void* ImFileLoadToMemory(const char* filename, const char* file_open_mode, size_t* out_file_size, int padding_bytes) +// This can't really be used with "rt" because fseek size won't match read size. +void* ImFileLoadToMemory(const char* filename, const char* mode, size_t* out_file_size, int padding_bytes) { - IM_ASSERT(filename && file_open_mode); + IM_ASSERT(filename && mode); if (out_file_size) *out_file_size = 0; - FILE* f; - if ((f = ImFileOpen(filename, file_open_mode)) == NULL) + ImFileHandle f; + if ((f = ImFileOpen(filename, mode)) == NULL) return NULL; - long file_size_signed; - if (fseek(f, 0, SEEK_END) || (file_size_signed = ftell(f)) == -1 || fseek(f, 0, SEEK_SET)) + size_t file_size = (size_t)ImFileGetSize(f); + if (file_size == (size_t)-1) { - fclose(f); + ImFileClose(f); return NULL; } - size_t file_size = (size_t)file_size_signed; void* file_data = IM_ALLOC(file_size + padding_bytes); if (file_data == NULL) { - fclose(f); + ImFileClose(f); return NULL; } - if (fread(file_data, 1, file_size, f) != file_size) + if (ImFileRead(file_data, 1, file_size, f) != file_size) { - fclose(f); + ImFileClose(f); IM_FREE(file_data); return NULL; } if (padding_bytes > 0) memset((void*)(((char*)file_data) + file_size), 0, (size_t)padding_bytes); - fclose(f); + ImFileClose(f); if (out_file_size) *out_file_size = file_size; @@ -1622,79 +2442,72 @@ void* ImFileLoadToMemory(const char* filename, const char* file_open_mode, size_ // [SECTION] MISC HELPERS/UTILITIES (ImText* functions) //----------------------------------------------------------------------------- -// Convert UTF-8 to 32-bits character, process single character input. -// Based on stb_from_utf8() from github.com/nothings/stb/ +IM_MSVC_RUNTIME_CHECKS_OFF + +// Convert UTF-8 to 32-bit character, process single character input. +// A nearly-branchless UTF-8 decoder, based on work of Christopher Wellons (https://github.com/skeeto/branchless-utf8). // We handle UTF-8 decoding error by skipping forward. int ImTextCharFromUtf8(unsigned int* out_char, const char* in_text, const char* in_text_end) { - unsigned int c = (unsigned int)-1; - const unsigned char* str = (const unsigned char*)in_text; - if (!(*str & 0x80)) + static const char lengths[32] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 3, 3, 4, 0 }; + static const int masks[] = { 0x00, 0x7f, 0x1f, 0x0f, 0x07 }; + static const uint32_t mins[] = { 0x400000, 0, 0x80, 0x800, 0x10000 }; + static const int shiftc[] = { 0, 18, 12, 6, 0 }; + static const int shifte[] = { 0, 6, 4, 2, 0 }; + int len = lengths[*(const unsigned char*)in_text >> 3]; + int wanted = len + (len ? 0 : 1); + + if (in_text_end == NULL) + in_text_end = in_text + wanted; // Max length, nulls will be taken into account. + + // Copy at most 'len' bytes, stop copying at 0 or past in_text_end. Branch predictor does a good job here, + // so it is fast even with excessive branching. + unsigned char s[4]; + s[0] = in_text + 0 < in_text_end ? in_text[0] : 0; + s[1] = in_text + 1 < in_text_end ? in_text[1] : 0; + s[2] = in_text + 2 < in_text_end ? in_text[2] : 0; + s[3] = in_text + 3 < in_text_end ? in_text[3] : 0; + + // Assume a four-byte character and load four bytes. Unused bits are shifted out. + *out_char = (uint32_t)(s[0] & masks[len]) << 18; + *out_char |= (uint32_t)(s[1] & 0x3f) << 12; + *out_char |= (uint32_t)(s[2] & 0x3f) << 6; + *out_char |= (uint32_t)(s[3] & 0x3f) << 0; + *out_char >>= shiftc[len]; + + // Accumulate the various error conditions. + int e = 0; + e = (*out_char < mins[len]) << 6; // non-canonical encoding + e |= ((*out_char >> 11) == 0x1b) << 7; // surrogate half? + e |= (*out_char > IM_UNICODE_CODEPOINT_MAX) << 8; // out of range we can store in ImWchar (FIXME: May evolve) + e |= (s[1] & 0xc0) >> 2; + e |= (s[2] & 0xc0) >> 4; + e |= (s[3] ) >> 6; + e ^= 0x2a; // top two bits of each tail byte correct? + e >>= shifte[len]; + + if (e) { - c = (unsigned int)(*str++); - *out_char = c; - return 1; + // No bytes are consumed when *in_text == 0 || in_text == in_text_end. + // One byte is consumed in case of invalid first byte of in_text. + // All available bytes (at most `len` bytes) are consumed on incomplete/invalid second to last bytes. + // Invalid or incomplete input may consume less bytes than wanted, therefore every byte has to be inspected in s. + wanted = ImMin(wanted, !!s[0] + !!s[1] + !!s[2] + !!s[3]); + *out_char = IM_UNICODE_CODEPOINT_INVALID; } - if ((*str & 0xe0) == 0xc0) - { - *out_char = 0xFFFD; // will be invalid but not end of string - if (in_text_end && in_text_end - (const char*)str < 2) return 1; - if (*str < 0xc2) return 2; - c = (unsigned int)((*str++ & 0x1f) << 6); - if ((*str & 0xc0) != 0x80) return 2; - c += (*str++ & 0x3f); - *out_char = c; - return 2; - } - if ((*str & 0xf0) == 0xe0) - { - *out_char = 0xFFFD; // will be invalid but not end of string - if (in_text_end && in_text_end - (const char*)str < 3) return 1; - if (*str == 0xe0 && (str[1] < 0xa0 || str[1] > 0xbf)) return 3; - if (*str == 0xed && str[1] > 0x9f) return 3; // str[1] < 0x80 is checked below - c = (unsigned int)((*str++ & 0x0f) << 12); - if ((*str & 0xc0) != 0x80) return 3; - c += (unsigned int)((*str++ & 0x3f) << 6); - if ((*str & 0xc0) != 0x80) return 3; - c += (*str++ & 0x3f); - *out_char = c; - return 3; - } - if ((*str & 0xf8) == 0xf0) - { - *out_char = 0xFFFD; // will be invalid but not end of string - if (in_text_end && in_text_end - (const char*)str < 4) return 1; - if (*str > 0xf4) return 4; - if (*str == 0xf0 && (str[1] < 0x90 || str[1] > 0xbf)) return 4; - if (*str == 0xf4 && str[1] > 0x8f) return 4; // str[1] < 0x80 is checked below - c = (unsigned int)((*str++ & 0x07) << 18); - if ((*str & 0xc0) != 0x80) return 4; - c += (unsigned int)((*str++ & 0x3f) << 12); - if ((*str & 0xc0) != 0x80) return 4; - c += (unsigned int)((*str++ & 0x3f) << 6); - if ((*str & 0xc0) != 0x80) return 4; - c += (*str++ & 0x3f); - // utf-8 encodings of values used in surrogate pairs are invalid - if ((c & 0xFFFFF800) == 0xD800) return 4; - *out_char = c; - return 4; - } - *out_char = 0; - return 0; + + return wanted; } int ImTextStrFromUtf8(ImWchar* buf, int buf_size, const char* in_text, const char* in_text_end, const char** in_text_remaining) { ImWchar* buf_out = buf; ImWchar* buf_end = buf + buf_size; - while (buf_out < buf_end-1 && (!in_text_end || in_text < in_text_end) && *in_text) + while (buf_out < buf_end - 1 && (!in_text_end || in_text < in_text_end) && *in_text) { unsigned int c; in_text += ImTextCharFromUtf8(&c, in_text, in_text_end); - if (c == 0) - break; - if (c < 0x10000) // FIXME: Losing characters that don't fit in 2 bytes - *buf_out++ = (ImWchar)c; + *buf_out++ = (ImWchar)c; } *buf_out = 0; if (in_text_remaining) @@ -1709,16 +2522,13 @@ int ImTextCountCharsFromUtf8(const char* in_text, const char* in_text_end) { unsigned int c; in_text += ImTextCharFromUtf8(&c, in_text, in_text_end); - if (c == 0) - break; - if (c < 0x10000) - char_count++; + char_count++; } return char_count; } // Based on stb_to_utf8() from github.com/nothings/stb/ -static inline int ImTextCharToUtf8(char* buf, int buf_size, unsigned int c) +static inline int ImTextCharToUtf8_inline(char* buf, int buf_size, unsigned int c) { if (c < 0x80) { @@ -1732,11 +2542,15 @@ static inline int ImTextCharToUtf8(char* buf, int buf_size, unsigned int c) buf[1] = (char)(0x80 + (c & 0x3f)); return 2; } - if (c >= 0xdc00 && c < 0xe000) + if (c < 0x10000) { - return 0; + if (buf_size < 3) return 0; + buf[0] = (char)(0xe0 + (c >> 12)); + buf[1] = (char)(0x80 + ((c >> 6) & 0x3f)); + buf[2] = (char)(0x80 + ((c ) & 0x3f)); + return 3; } - if (c >= 0xd800 && c < 0xdc00) + if (c <= 0x10FFFF) { if (buf_size < 4) return 0; buf[0] = (char)(0xf0 + (c >> 18)); @@ -1745,46 +2559,47 @@ static inline int ImTextCharToUtf8(char* buf, int buf_size, unsigned int c) buf[3] = (char)(0x80 + ((c ) & 0x3f)); return 4; } - //else if (c < 0x10000) - { - if (buf_size < 3) return 0; - buf[0] = (char)(0xe0 + (c >> 12)); - buf[1] = (char)(0x80 + ((c>> 6) & 0x3f)); - buf[2] = (char)(0x80 + ((c ) & 0x3f)); - return 3; - } + // Invalid code point, the max unicode is 0x10FFFF + return 0; +} + +const char* ImTextCharToUtf8(char out_buf[5], unsigned int c) +{ + int count = ImTextCharToUtf8_inline(out_buf, 5, c); + out_buf[count] = 0; + return out_buf; } // Not optimal but we very rarely use this function. int ImTextCountUtf8BytesFromChar(const char* in_text, const char* in_text_end) { - unsigned int dummy = 0; - return ImTextCharFromUtf8(&dummy, in_text, in_text_end); + unsigned int unused = 0; + return ImTextCharFromUtf8(&unused, in_text, in_text_end); } static inline int ImTextCountUtf8BytesFromChar(unsigned int c) { if (c < 0x80) return 1; if (c < 0x800) return 2; - if (c >= 0xdc00 && c < 0xe000) return 0; - if (c >= 0xd800 && c < 0xdc00) return 4; + if (c < 0x10000) return 3; + if (c <= 0x10FFFF) return 4; return 3; } -int ImTextStrToUtf8(char* buf, int buf_size, const ImWchar* in_text, const ImWchar* in_text_end) +int ImTextStrToUtf8(char* out_buf, int out_buf_size, const ImWchar* in_text, const ImWchar* in_text_end) { - char* buf_out = buf; - const char* buf_end = buf + buf_size; - while (buf_out < buf_end-1 && (!in_text_end || in_text < in_text_end) && *in_text) + char* buf_p = out_buf; + const char* buf_end = out_buf + out_buf_size; + while (buf_p < buf_end - 1 && (!in_text_end || in_text < in_text_end) && *in_text) { unsigned int c = (unsigned int)(*in_text++); if (c < 0x80) - *buf_out++ = (char)c; + *buf_p++ = (char)c; else - buf_out += ImTextCharToUtf8(buf_out, (int)(buf_end-buf_out-1), c); + buf_p += ImTextCharToUtf8_inline(buf_p, (int)(buf_end - buf_p - 1), c); } - *buf_out = 0; - return (int)(buf_out - buf); + *buf_p = 0; + return (int)(buf_p - out_buf); } int ImTextCountUtf8BytesFromStr(const ImWchar* in_text, const ImWchar* in_text_end) @@ -1801,14 +2616,50 @@ int ImTextCountUtf8BytesFromStr(const ImWchar* in_text, const ImWchar* in_text_e return bytes_count; } +const char* ImTextFindPreviousUtf8Codepoint(const char* in_text_start, const char* in_text_curr) +{ + while (in_text_curr > in_text_start) + { + in_text_curr--; + if ((*in_text_curr & 0xC0) != 0x80) + return in_text_curr; + } + return in_text_start; +} + +int ImTextCountLines(const char* in_text, const char* in_text_end) +{ + if (in_text_end == NULL) + in_text_end = in_text + ImStrlen(in_text); // FIXME-OPT: Not optimal approach, discourage use for now. + int count = 0; + while (in_text < in_text_end) + { + const char* line_end = (const char*)ImMemchr(in_text, '\n', in_text_end - in_text); + in_text = line_end ? line_end + 1 : in_text_end; + count++; + } + return count; +} + +IM_MSVC_RUNTIME_CHECKS_RESTORE + //----------------------------------------------------------------------------- -// [SECTION] MISC HELPERS/UTILTIES (Color functions) +// [SECTION] MISC HELPERS/UTILITIES (Color functions) // Note: The Convert functions are early design which are not consistent with other API. //----------------------------------------------------------------------------- +IMGUI_API ImU32 ImAlphaBlendColors(ImU32 col_a, ImU32 col_b) +{ + float t = ((col_b >> IM_COL32_A_SHIFT) & 0xFF) / 255.f; + int r = ImLerp((int)(col_a >> IM_COL32_R_SHIFT) & 0xFF, (int)(col_b >> IM_COL32_R_SHIFT) & 0xFF, t); + int g = ImLerp((int)(col_a >> IM_COL32_G_SHIFT) & 0xFF, (int)(col_b >> IM_COL32_G_SHIFT) & 0xFF, t); + int b = ImLerp((int)(col_a >> IM_COL32_B_SHIFT) & 0xFF, (int)(col_b >> IM_COL32_B_SHIFT) & 0xFF, t); + return IM_COL32(r, g, b, 0xFF); +} + ImVec4 ImGui::ColorConvertU32ToFloat4(ImU32 in) { - float s = 1.0f/255.0f; + float s = 1.0f / 255.0f; return ImVec4( ((in >> IM_COL32_R_SHIFT) & 0xFF) * s, ((in >> IM_COL32_G_SHIFT) & 0xFF) * s, @@ -1859,7 +2710,7 @@ void ImGui::ColorConvertHSVtoRGB(float h, float s, float v, float& out_r, float& return; } - h = ImFmod(h, 1.0f) / (60.0f/360.0f); + h = ImFmod(h, 1.0f) / (60.0f / 360.0f); int i = (int)h; float f = h - (float)i; float p = v * (1.0f - s); @@ -1877,56 +2728,22 @@ void ImGui::ColorConvertHSVtoRGB(float h, float s, float v, float& out_r, float& } } -ImU32 ImGui::GetColorU32(ImGuiCol idx, float alpha_mul) -{ - ImGuiStyle& style = GImGui->Style; - ImVec4 c = style.Colors[idx]; - c.w *= style.Alpha * alpha_mul; - return ColorConvertFloat4ToU32(c); -} - -ImU32 ImGui::GetColorU32(const ImVec4& col) -{ - ImGuiStyle& style = GImGui->Style; - ImVec4 c = col; - c.w *= style.Alpha; - return ColorConvertFloat4ToU32(c); -} - -const ImVec4& ImGui::GetStyleColorVec4(ImGuiCol idx) -{ - ImGuiStyle& style = GImGui->Style; - return style.Colors[idx]; -} - -ImU32 ImGui::GetColorU32(ImU32 col) -{ - float style_alpha = GImGui->Style.Alpha; - if (style_alpha >= 1.0f) - return col; - ImU32 a = (col & IM_COL32_A_MASK) >> IM_COL32_A_SHIFT; - a = (ImU32)(a * style_alpha); // We don't need to clamp 0..255 because Style.Alpha is in 0..1 range. - return (col & ~IM_COL32_A_MASK) | (a << IM_COL32_A_SHIFT); -} - //----------------------------------------------------------------------------- // [SECTION] ImGuiStorage // Helper: Key->value storage //----------------------------------------------------------------------------- // std::lower_bound but without the bullshit -static ImGuiStorage::ImGuiStoragePair* LowerBound(ImVector& data, ImGuiID key) +ImGuiStoragePair* ImLowerBound(ImGuiStoragePair* in_begin, ImGuiStoragePair* in_end, ImGuiID key) { - ImGuiStorage::ImGuiStoragePair* first = data.Data; - ImGuiStorage::ImGuiStoragePair* last = data.Data + data.Size; - size_t count = (size_t)(last - first); - while (count > 0) + ImGuiStoragePair* in_p = in_begin; + for (size_t count = (size_t)(in_end - in_p); count > 0; ) { size_t count2 = count >> 1; - ImGuiStorage::ImGuiStoragePair* mid = first + count2; + ImGuiStoragePair* mid = in_p + count2; if (mid->key < key) { - first = ++mid; + in_p = ++mid; count -= count2 + 1; } else @@ -1934,30 +2751,28 @@ static ImGuiStorage::ImGuiStoragePair* LowerBound(ImVectorkey; + ImGuiID rhs_v = ((const ImGuiStoragePair*)rhs)->key; + return (lhs_v > rhs_v ? +1 : lhs_v < rhs_v ? -1 : 0); } // For quicker full rebuild of a storage (instead of an incremental one), you may add all your contents and then sort once. void ImGuiStorage::BuildSortByKey() { - struct StaticFunc - { - static int IMGUI_CDECL PairCompareByID(const void* lhs, const void* rhs) - { - // We can't just do a subtraction because qsort uses signed integers and subtracting our ID doesn't play well with that. - if (((const ImGuiStoragePair*)lhs)->key > ((const ImGuiStoragePair*)rhs)->key) return +1; - if (((const ImGuiStoragePair*)lhs)->key < ((const ImGuiStoragePair*)rhs)->key) return -1; - return 0; - } - }; - if (Data.Size > 1) - ImQsort(Data.Data, (size_t)Data.Size, sizeof(ImGuiStoragePair), StaticFunc::PairCompareByID); + ImQsort(Data.Data, (size_t)Data.Size, sizeof(ImGuiStoragePair), PairComparerByID); } int ImGuiStorage::GetInt(ImGuiID key, int default_val) const { - ImGuiStoragePair* it = LowerBound(const_cast&>(Data), key); - if (it == Data.end() || it->key != key) + ImGuiStoragePair* it = ImLowerBound(const_cast(Data.Data), const_cast(Data.Data + Data.Size), key); + if (it == Data.Data + Data.Size || it->key != key) return default_val; return it->val_i; } @@ -1969,16 +2784,16 @@ bool ImGuiStorage::GetBool(ImGuiID key, bool default_val) const float ImGuiStorage::GetFloat(ImGuiID key, float default_val) const { - ImGuiStoragePair* it = LowerBound(const_cast&>(Data), key); - if (it == Data.end() || it->key != key) + ImGuiStoragePair* it = ImLowerBound(const_cast(Data.Data), const_cast(Data.Data + Data.Size), key); + if (it == Data.Data + Data.Size || it->key != key) return default_val; return it->val_f; } void* ImGuiStorage::GetVoidPtr(ImGuiID key) const { - ImGuiStoragePair* it = LowerBound(const_cast&>(Data), key); - if (it == Data.end() || it->key != key) + ImGuiStoragePair* it = ImLowerBound(const_cast(Data.Data), const_cast(Data.Data + Data.Size), key); + if (it == Data.Data + Data.Size || it->key != key) return NULL; return it->val_p; } @@ -1986,8 +2801,8 @@ void* ImGuiStorage::GetVoidPtr(ImGuiID key) const // References are only valid until a new value is added to the storage. Calling a Set***() function or a Get***Ref() function invalidates the pointer. int* ImGuiStorage::GetIntRef(ImGuiID key, int default_val) { - ImGuiStoragePair* it = LowerBound(Data, key); - if (it == Data.end() || it->key != key) + ImGuiStoragePair* it = ImLowerBound(Data.Data, Data.Data + Data.Size, key); + if (it == Data.Data + Data.Size || it->key != key) it = Data.insert(it, ImGuiStoragePair(key, default_val)); return &it->val_i; } @@ -1999,16 +2814,16 @@ bool* ImGuiStorage::GetBoolRef(ImGuiID key, bool default_val) float* ImGuiStorage::GetFloatRef(ImGuiID key, float default_val) { - ImGuiStoragePair* it = LowerBound(Data, key); - if (it == Data.end() || it->key != key) + ImGuiStoragePair* it = ImLowerBound(Data.Data, Data.Data + Data.Size, key); + if (it == Data.Data + Data.Size || it->key != key) it = Data.insert(it, ImGuiStoragePair(key, default_val)); return &it->val_f; } void** ImGuiStorage::GetVoidPtrRef(ImGuiID key, void* default_val) { - ImGuiStoragePair* it = LowerBound(Data, key); - if (it == Data.end() || it->key != key) + ImGuiStoragePair* it = ImLowerBound(Data.Data, Data.Data + Data.Size, key); + if (it == Data.Data + Data.Size || it->key != key) it = Data.insert(it, ImGuiStoragePair(key, default_val)); return &it->val_p; } @@ -2016,13 +2831,11 @@ void** ImGuiStorage::GetVoidPtrRef(ImGuiID key, void* default_val) // FIXME-OPT: Need a way to reuse the result of lower_bound when doing GetInt()/SetInt() - not too bad because it only happens on explicit interaction (maximum one a frame) void ImGuiStorage::SetInt(ImGuiID key, int val) { - ImGuiStoragePair* it = LowerBound(Data, key); - if (it == Data.end() || it->key != key) - { + ImGuiStoragePair* it = ImLowerBound(Data.Data, Data.Data + Data.Size, key); + if (it == Data.Data + Data.Size || it->key != key) Data.insert(it, ImGuiStoragePair(key, val)); - return; - } - it->val_i = val; + else + it->val_i = val; } void ImGuiStorage::SetBool(ImGuiID key, bool val) @@ -2032,24 +2845,20 @@ void ImGuiStorage::SetBool(ImGuiID key, bool val) void ImGuiStorage::SetFloat(ImGuiID key, float val) { - ImGuiStoragePair* it = LowerBound(Data, key); - if (it == Data.end() || it->key != key) - { + ImGuiStoragePair* it = ImLowerBound(Data.Data, Data.Data + Data.Size, key); + if (it == Data.Data + Data.Size || it->key != key) Data.insert(it, ImGuiStoragePair(key, val)); - return; - } - it->val_f = val; + else + it->val_f = val; } void ImGuiStorage::SetVoidPtr(ImGuiID key, void* val) { - ImGuiStoragePair* it = LowerBound(Data, key); - if (it == Data.end() || it->key != key) - { + ImGuiStoragePair* it = ImLowerBound(Data.Data, Data.Data + Data.Size, key); + if (it == Data.Data + Data.Size || it->key != key) Data.insert(it, ImGuiStoragePair(key, val)); - return; - } - it->val_p = val; + else + it->val_p = val; } void ImGuiStorage::SetAllInt(int v) @@ -2057,24 +2866,22 @@ void ImGuiStorage::SetAllInt(int v) for (int i = 0; i < Data.Size; i++) Data[i].val_i = v; } +IM_MSVC_RUNTIME_CHECKS_RESTORE //----------------------------------------------------------------------------- // [SECTION] ImGuiTextFilter //----------------------------------------------------------------------------- // Helper: Parse and apply text filters. In format "aaaaa[,bbbb][,ccccc]" -ImGuiTextFilter::ImGuiTextFilter(const char* default_filter) +ImGuiTextFilter::ImGuiTextFilter(const char* default_filter) //-V1077 { + InputBuf[0] = 0; + CountGrep = 0; if (default_filter) { ImStrncpy(InputBuf, default_filter, IM_ARRAYSIZE(InputBuf)); Build(); } - else - { - InputBuf[0] = 0; - CountGrep = 0; - } } bool ImGuiTextFilter::Draw(const char* label, float width) @@ -2108,36 +2915,34 @@ void ImGuiTextFilter::ImGuiTextRange::split(char separator, ImVector f.b && ImCharIsBlankA(f.e[-1])) f.e--; if (f.empty()) continue; - if (Filters[i].b[0] != '-') + if (f.b[0] != '-') CountGrep += 1; } } bool ImGuiTextFilter::PassFilter(const char* text, const char* text_end) const { - if (Filters.empty()) + if (Filters.Size == 0) return true; if (text == NULL) - text = ""; + text = text_end = ""; - for (int i = 0; i != Filters.Size; i++) + for (const ImGuiTextRange& f : Filters) { - const ImGuiTextRange& f = Filters[i]; - if (f.empty()) + if (f.b == f.e) continue; if (f.b[0] == '-') { @@ -2161,7 +2966,7 @@ bool ImGuiTextFilter::PassFilter(const char* text, const char* text_end) const } //----------------------------------------------------------------------------- -// [SECTION] ImGuiTextBuffer +// [SECTION] ImGuiTextBuffer, ImGuiTextIndex //----------------------------------------------------------------------------- // On some platform vsnprintf() takes va_list by reference and modifies it. @@ -2178,7 +2983,7 @@ char ImGuiTextBuffer::EmptyString[1] = { 0 }; void ImGuiTextBuffer::append(const char* str, const char* str_end) { - int len = str_end ? (int)(str_end - str) : (int)strlen(str); + int len = str_end ? (int)(str_end - str) : (int)ImStrlen(str); // Add zero-terminator the first time const int write_off = (Buf.Size != 0) ? Buf.Size : 1; @@ -2229,145 +3034,617 @@ void ImGuiTextBuffer::appendfv(const char* fmt, va_list args) va_end(args_copy); } -//----------------------------------------------------------------------------- -// [SECTION] ImGuiListClipper -// This is currently not as flexible/powerful as it should be and really confusing/spaghetti, mostly because we changed -// the API mid-way through development and support two ways to using the clipper, needs some rework (see TODO) -//----------------------------------------------------------------------------- - -// Helper to calculate coarse clipping of large list of evenly sized items. -// NB: Prefer using the ImGuiListClipper higher-level helper if you can! Read comments and instructions there on how those use this sort of pattern. -// NB: 'items_count' is only used to clamp the result, if you don't know your count you can use INT_MAX -void ImGui::CalcListClipping(int items_count, float items_height, int* out_items_display_start, int* out_items_display_end) +void ImGuiTextIndex::append(const char* base, int old_size, int new_size) { - ImGuiContext& g = *GImGui; - ImGuiWindow* window = g.CurrentWindow; - if (g.LogEnabled) - { - // If logging is active, do not perform any clipping - *out_items_display_start = 0; - *out_items_display_end = items_count; + IM_ASSERT(old_size >= 0 && new_size >= old_size && new_size >= EndOffset); + if (old_size == new_size) return; - } - if (window->SkipItems) - { - *out_items_display_start = *out_items_display_end = 0; - return; - } - - // We create the union of the ClipRect and the NavScoringRect which at worst should be 1 page away from ClipRect - ImRect unclipped_rect = window->ClipRect; - if (g.NavMoveRequest) - unclipped_rect.Add(g.NavScoringRectScreen); - - const ImVec2 pos = window->DC.CursorPos; - int start = (int)((unclipped_rect.Min.y - pos.y) / items_height); - int end = (int)((unclipped_rect.Max.y - pos.y) / items_height); - - // When performing a navigation request, ensure we have one item extra in the direction we are moving to - if (g.NavMoveRequest && g.NavMoveClipDir == ImGuiDir_Up) - start--; - if (g.NavMoveRequest && g.NavMoveClipDir == ImGuiDir_Down) - end++; - - start = ImClamp(start, 0, items_count); - end = ImClamp(end + 1, start, items_count); - *out_items_display_start = start; - *out_items_display_end = end; + if (EndOffset == 0 || base[EndOffset - 1] == '\n') + LineOffsets.push_back(EndOffset); + const char* base_end = base + new_size; + for (const char* p = base + old_size; (p = (const char*)ImMemchr(p, '\n', base_end - p)) != 0; ) + if (++p < base_end) // Don't push a trailing offset on last \n + LineOffsets.push_back((int)(intptr_t)(p - base)); + EndOffset = ImMax(EndOffset, new_size); } -static void SetCursorPosYAndSetupDummyPrevLine(float pos_y, float line_height) +//----------------------------------------------------------------------------- +// [SECTION] ImGuiListClipper +//----------------------------------------------------------------------------- + +// FIXME-TABLE: This prevents us from using ImGuiListClipper _inside_ a table cell. +// The problem we have is that without a Begin/End scheme for rows using the clipper is ambiguous. +static bool GetSkipItemForListClipping() +{ + ImGuiContext& g = *GImGui; + return (g.CurrentTable ? g.CurrentTable->HostSkipItems : g.CurrentWindow->SkipItems); +} + +static void ImGuiListClipper_SortAndFuseRanges(ImVector& ranges, int offset = 0) +{ + if (ranges.Size - offset <= 1) + return; + + // Helper to order ranges and fuse them together if possible (bubble sort is fine as we are only sorting 2-3 entries) + for (int sort_end = ranges.Size - offset - 1; sort_end > 0; --sort_end) + for (int i = offset; i < sort_end + offset; ++i) + if (ranges[i].Min > ranges[i + 1].Min) + ImSwap(ranges[i], ranges[i + 1]); + + // Now fuse ranges together as much as possible. + for (int i = 1 + offset; i < ranges.Size; i++) + { + IM_ASSERT(!ranges[i].PosToIndexConvert && !ranges[i - 1].PosToIndexConvert); + if (ranges[i - 1].Max < ranges[i].Min) + continue; + ranges[i - 1].Min = ImMin(ranges[i - 1].Min, ranges[i].Min); + ranges[i - 1].Max = ImMax(ranges[i - 1].Max, ranges[i].Max); + ranges.erase(ranges.Data + i); + i--; + } +} + +static void ImGuiListClipper_SeekCursorAndSetupPrevLine(float pos_y, float line_height) { // Set cursor position and a few other things so that SetScrollHereY() and Columns() can work when seeking cursor. // FIXME: It is problematic that we have to do that here, because custom/equivalent end-user code would stumble on the same issue. - // The clipper should probably have a 4th step to display the last item in a regular manner. + // The clipper should probably have a final step to display the last item in a regular manner, maybe with an opt-out flag for data sets which may have costly seek? ImGuiContext& g = *GImGui; ImGuiWindow* window = g.CurrentWindow; + float off_y = pos_y - window->DC.CursorPos.y; window->DC.CursorPos.y = pos_y; - window->DC.CursorMaxPos.y = ImMax(window->DC.CursorMaxPos.y, pos_y); + window->DC.CursorMaxPos.y = ImMax(window->DC.CursorMaxPos.y, pos_y - g.Style.ItemSpacing.y); window->DC.CursorPosPrevLine.y = window->DC.CursorPos.y - line_height; // Setting those fields so that SetScrollHereY() can properly function after the end of our clipper usage. window->DC.PrevLineSize.y = (line_height - g.Style.ItemSpacing.y); // If we end up needing more accurate data (to e.g. use SameLine) we may as well make the clipper have a fourth step to let user process and display the last item in their list. - if (ImGuiColumns* columns = window->DC.CurrentColumns) + if (ImGuiOldColumns* columns = window->DC.CurrentColumns) columns->LineMinY = window->DC.CursorPos.y; // Setting this so that cell Y position are set properly + if (ImGuiTable* table = g.CurrentTable) + { + if (table->IsInsideRow) + ImGui::TableEndRow(table); + table->RowPosY2 = window->DC.CursorPos.y; + const int row_increase = (int)((off_y / line_height) + 0.5f); + //table->CurrentRow += row_increase; // Can't do without fixing TableEndRow() + table->RowBgColorCounter += row_increase; + } } -// Use case A: Begin() called from constructor with items_height<0, then called again from Sync() in StepNo 1 -// Use case B: Begin() called from constructor with items_height>0 -// FIXME-LEGACY: Ideally we should remove the Begin/End functions but they are part of the legacy API we still support. This is why some of the code in Step() calling Begin() and reassign some fields, spaghetti style. -void ImGuiListClipper::Begin(int count, float items_height) +ImGuiListClipper::ImGuiListClipper() { - ImGuiContext& g = *GImGui; + memset(this, 0, sizeof(*this)); +} + +ImGuiListClipper::~ImGuiListClipper() +{ + End(); +} + +void ImGuiListClipper::Begin(int items_count, float items_height) +{ + if (Ctx == NULL) + Ctx = ImGui::GetCurrentContext(); + + ImGuiContext& g = *Ctx; ImGuiWindow* window = g.CurrentWindow; + IMGUI_DEBUG_LOG_CLIPPER("Clipper: Begin(%d,%.2f) in '%s'\n", items_count, items_height, window->Name); + + if (ImGuiTable* table = g.CurrentTable) + if (table->IsInsideRow) + ImGui::TableEndRow(table); StartPosY = window->DC.CursorPos.y; ItemsHeight = items_height; - ItemsCount = count; - StepNo = 0; - DisplayEnd = DisplayStart = -1; - if (ItemsHeight > 0.0f) - { - ImGui::CalcListClipping(ItemsCount, ItemsHeight, &DisplayStart, &DisplayEnd); // calculate how many to clip/display - if (DisplayStart > 0) - SetCursorPosYAndSetupDummyPrevLine(StartPosY + DisplayStart * ItemsHeight, ItemsHeight); // advance cursor - StepNo = 2; - } + ItemsCount = items_count; + DisplayStart = -1; + DisplayEnd = 0; + + // Acquire temporary buffer + if (++g.ClipperTempDataStacked > g.ClipperTempData.Size) + g.ClipperTempData.resize(g.ClipperTempDataStacked, ImGuiListClipperData()); + ImGuiListClipperData* data = &g.ClipperTempData[g.ClipperTempDataStacked - 1]; + data->Reset(this); + data->LossynessOffset = window->DC.CursorStartPosLossyness.y; + TempData = data; + StartSeekOffsetY = data->LossynessOffset; } void ImGuiListClipper::End() { - if (ItemsCount < 0) - return; - // In theory here we should assert that ImGui::GetCursorPosY() == StartPosY + DisplayEnd * ItemsHeight, but it feels saner to just seek at the end and not assert/crash the user. - if (ItemsCount < INT_MAX) - SetCursorPosYAndSetupDummyPrevLine(StartPosY + ItemsCount * ItemsHeight, ItemsHeight); // advance cursor + if (ImGuiListClipperData* data = (ImGuiListClipperData*)TempData) + { + // In theory here we should assert that we are already at the right position, but it seems saner to just seek at the end and not assert/crash the user. + ImGuiContext& g = *Ctx; + IMGUI_DEBUG_LOG_CLIPPER("Clipper: End() in '%s'\n", g.CurrentWindow->Name); + if (ItemsCount >= 0 && ItemsCount < INT_MAX && DisplayStart >= 0) + SeekCursorForItem(ItemsCount); + + // Restore temporary buffer and fix back pointers which may be invalidated when nesting + IM_ASSERT(data->ListClipper == this); + data->StepNo = data->Ranges.Size; + if (--g.ClipperTempDataStacked > 0) + { + data = &g.ClipperTempData[g.ClipperTempDataStacked - 1]; + data->ListClipper->TempData = data; + } + TempData = NULL; + } ItemsCount = -1; - StepNo = 3; +} + +void ImGuiListClipper::IncludeItemsByIndex(int item_begin, int item_end) +{ + ImGuiListClipperData* data = (ImGuiListClipperData*)TempData; + IM_ASSERT(DisplayStart < 0); // Only allowed after Begin() and if there has not been a specified range yet. + IM_ASSERT(item_begin <= item_end); + if (item_begin < item_end) + data->Ranges.push_back(ImGuiListClipperRange::FromIndices(item_begin, item_end)); +} + +// This is already called while stepping. +// The ONLY reason you may want to call this is if you passed INT_MAX to ImGuiListClipper::Begin() because you couldn't step item count beforehand. +void ImGuiListClipper::SeekCursorForItem(int item_n) +{ + // - Perform the add and multiply with double to allow seeking through larger ranges. + // - StartPosY starts from ItemsFrozen, by adding SeekOffsetY we generally cancel that out (SeekOffsetY == LossynessOffset - ItemsFrozen * ItemsHeight). + // - The reason we store SeekOffsetY instead of inferring it, is because we want to allow user to perform Seek after the last step, where ImGuiListClipperData is already done. + float pos_y = (float)((double)StartPosY + StartSeekOffsetY + (double)item_n * ItemsHeight); + ImGuiListClipper_SeekCursorAndSetupPrevLine(pos_y, ItemsHeight); +} + +static bool ImGuiListClipper_StepInternal(ImGuiListClipper* clipper) +{ + ImGuiContext& g = *clipper->Ctx; + ImGuiWindow* window = g.CurrentWindow; + ImGuiListClipperData* data = (ImGuiListClipperData*)clipper->TempData; + IM_ASSERT(data != NULL && "Called ImGuiListClipper::Step() too many times, or before ImGuiListClipper::Begin() ?"); + + ImGuiTable* table = g.CurrentTable; + if (table && table->IsInsideRow) + ImGui::TableEndRow(table); + + // No items + if (clipper->ItemsCount == 0 || GetSkipItemForListClipping()) + return false; + + // While we are in frozen row state, keep displaying items one by one, unclipped + // FIXME: Could be stored as a table-agnostic state. + if (data->StepNo == 0 && table != NULL && !table->IsUnfrozenRows) + { + clipper->DisplayStart = data->ItemsFrozen; + clipper->DisplayEnd = ImMin(data->ItemsFrozen + 1, clipper->ItemsCount); + if (clipper->DisplayStart < clipper->DisplayEnd) + data->ItemsFrozen++; + return true; + } + + // Step 0: Let you process the first element (regardless of it being visible or not, so we can measure the element height) + bool calc_clipping = false; + if (data->StepNo == 0) + { + clipper->StartPosY = window->DC.CursorPos.y; + if (clipper->ItemsHeight <= 0.0f) + { + // Submit the first item (or range) so we can measure its height (generally the first range is 0..1) + data->Ranges.push_front(ImGuiListClipperRange::FromIndices(data->ItemsFrozen, data->ItemsFrozen + 1)); + clipper->DisplayStart = ImMax(data->Ranges[0].Min, data->ItemsFrozen); + clipper->DisplayEnd = ImMin(data->Ranges[0].Max, clipper->ItemsCount); + data->StepNo = 1; + return true; + } + calc_clipping = true; // If on the first step with known item height, calculate clipping. + } + + // Step 1: Let the clipper infer height from first range + if (clipper->ItemsHeight <= 0.0f) + { + IM_ASSERT(data->StepNo == 1); + if (table) + IM_ASSERT(table->RowPosY1 == clipper->StartPosY && table->RowPosY2 == window->DC.CursorPos.y); + + clipper->ItemsHeight = (window->DC.CursorPos.y - clipper->StartPosY) / (float)(clipper->DisplayEnd - clipper->DisplayStart); + bool affected_by_floating_point_precision = ImIsFloatAboveGuaranteedIntegerPrecision(clipper->StartPosY) || ImIsFloatAboveGuaranteedIntegerPrecision(window->DC.CursorPos.y); + if (affected_by_floating_point_precision) + clipper->ItemsHeight = window->DC.PrevLineSize.y + g.Style.ItemSpacing.y; // FIXME: Technically wouldn't allow multi-line entries. + if (clipper->ItemsHeight == 0.0f && clipper->ItemsCount == INT_MAX) // Accept that no item have been submitted if in indeterminate mode. + return false; + IM_ASSERT(clipper->ItemsHeight > 0.0f && "Unable to calculate item height! First item hasn't moved the cursor vertically!"); + calc_clipping = true; // If item height had to be calculated, calculate clipping afterwards. + } + + // Step 0 or 1: Calculate the actual ranges of visible elements. + const int already_submitted = clipper->DisplayEnd; + if (calc_clipping) + { + // Record seek offset, this is so ImGuiListClipper::Seek() can be called after ImGuiListClipperData is done + clipper->StartSeekOffsetY = (double)data->LossynessOffset - data->ItemsFrozen * (double)clipper->ItemsHeight; + + if (g.LogEnabled) + { + // If logging is active, do not perform any clipping + data->Ranges.push_back(ImGuiListClipperRange::FromIndices(0, clipper->ItemsCount)); + } + else + { + // Add range selected to be included for navigation + const bool is_nav_request = (g.NavMoveScoringItems && g.NavWindow && g.NavWindow->RootWindowForNav == window->RootWindowForNav); + if (is_nav_request) + data->Ranges.push_back(ImGuiListClipperRange::FromPositions(g.NavScoringNoClipRect.Min.y, g.NavScoringNoClipRect.Max.y, 0, 0)); + if (is_nav_request && (g.NavMoveFlags & ImGuiNavMoveFlags_IsTabbing) && g.NavTabbingDir == -1) + data->Ranges.push_back(ImGuiListClipperRange::FromIndices(clipper->ItemsCount - 1, clipper->ItemsCount)); + + // Add focused/active item + ImRect nav_rect_abs = ImGui::WindowRectRelToAbs(window, window->NavRectRel[0]); + if (g.NavId != 0 && window->NavLastIds[0] == g.NavId) + data->Ranges.push_back(ImGuiListClipperRange::FromPositions(nav_rect_abs.Min.y, nav_rect_abs.Max.y, 0, 0)); + + // Add visible range + float min_y = window->ClipRect.Min.y; + float max_y = window->ClipRect.Max.y; + + // Add box selection range + ImGuiBoxSelectState* bs = &g.BoxSelectState; + if (bs->IsActive && bs->Window == window) + { + // FIXME: Selectable() use of half-ItemSpacing isn't consistent in matter of layout, as ItemAdd(bb) stray above ItemSize()'s CursorPos. + // RangeSelect's BoxSelect relies on comparing overlap of previous and current rectangle and is sensitive to that. + // As a workaround we currently half ItemSpacing worth on each side. + min_y -= g.Style.ItemSpacing.y; + max_y += g.Style.ItemSpacing.y; + + // Box-select on 2D area requires different clipping. + if (bs->UnclipMode) + data->Ranges.push_back(ImGuiListClipperRange::FromPositions(bs->UnclipRect.Min.y, bs->UnclipRect.Max.y, 0, 0)); + } + + const int off_min = (is_nav_request && g.NavMoveClipDir == ImGuiDir_Up) ? -1 : 0; + const int off_max = (is_nav_request && g.NavMoveClipDir == ImGuiDir_Down) ? 1 : 0; + data->Ranges.push_back(ImGuiListClipperRange::FromPositions(min_y, max_y, off_min, off_max)); + } + + // Convert position ranges to item index ranges + // - Very important: when a starting position is after our maximum item, we set Min to (ItemsCount - 1). This allows us to handle most forms of wrapping. + // - Due to how Selectable extra padding they tend to be "unaligned" with exact unit in the item list, + // which with the flooring/ceiling tend to lead to 2 items instead of one being submitted. + for (ImGuiListClipperRange& range : data->Ranges) + if (range.PosToIndexConvert) + { + int m1 = (int)(((double)range.Min - window->DC.CursorPos.y - data->LossynessOffset) / clipper->ItemsHeight); + int m2 = (int)((((double)range.Max - window->DC.CursorPos.y - data->LossynessOffset) / clipper->ItemsHeight) + 0.999999f); + range.Min = ImClamp(already_submitted + m1 + range.PosToIndexOffsetMin, already_submitted, clipper->ItemsCount - 1); + range.Max = ImClamp(already_submitted + m2 + range.PosToIndexOffsetMax, range.Min + 1, clipper->ItemsCount); + range.PosToIndexConvert = false; + } + ImGuiListClipper_SortAndFuseRanges(data->Ranges, data->StepNo); + } + + // Step 0+ (if item height is given in advance) or 1+: Display the next range in line. + while (data->StepNo < data->Ranges.Size) + { + clipper->DisplayStart = ImMax(data->Ranges[data->StepNo].Min, already_submitted); + clipper->DisplayEnd = ImMin(data->Ranges[data->StepNo].Max, clipper->ItemsCount); + data->StepNo++; + if (clipper->DisplayStart >= clipper->DisplayEnd) + continue; + if (clipper->DisplayStart > already_submitted) + clipper->SeekCursorForItem(clipper->DisplayStart); + return true; + } + + // After the last step: Let the clipper validate that we have reached the expected Y position (corresponding to element DisplayEnd), + // Advance the cursor to the end of the list and then returns 'false' to end the loop. + if (clipper->ItemsCount < INT_MAX) + clipper->SeekCursorForItem(clipper->ItemsCount); + + return false; } bool ImGuiListClipper::Step() { - ImGuiContext& g = *GImGui; - ImGuiWindow* window = g.CurrentWindow; - - if (ItemsCount == 0 || window->SkipItems) + ImGuiContext& g = *Ctx; + bool need_items_height = (ItemsHeight <= 0.0f); + bool ret = ImGuiListClipper_StepInternal(this); + if (ret && (DisplayStart >= DisplayEnd)) + ret = false; + if (g.CurrentTable && g.CurrentTable->IsUnfrozenRows == false) + IMGUI_DEBUG_LOG_CLIPPER("Clipper: Step(): inside frozen table row.\n"); + if (need_items_height && ItemsHeight > 0.0f) + IMGUI_DEBUG_LOG_CLIPPER("Clipper: Step(): computed ItemsHeight: %.2f.\n", ItemsHeight); + if (ret) { - ItemsCount = -1; - return false; + IMGUI_DEBUG_LOG_CLIPPER("Clipper: Step(): display %d to %d.\n", DisplayStart, DisplayEnd); } - if (StepNo == 0) // Step 0: the clipper let you process the first element, regardless of it being visible or not, so we can measure the element height. + else { - DisplayStart = 0; - DisplayEnd = 1; - StartPosY = window->DC.CursorPos.y; - StepNo = 1; - return true; - } - if (StepNo == 1) // Step 1: the clipper infer height from first element, calculate the actual range of elements to display, and position the cursor before the first element. - { - if (ItemsCount == 1) { ItemsCount = -1; return false; } - float items_height = window->DC.CursorPos.y - StartPosY; - IM_ASSERT(items_height > 0.0f); // If this triggers, it means Item 0 hasn't moved the cursor vertically - Begin(ItemsCount - 1, items_height); - DisplayStart++; - DisplayEnd++; - StepNo = 3; - return true; - } - if (StepNo == 2) // Step 2: dummy step only required if an explicit items_height was passed to constructor or Begin() and user still call Step(). Does nothing and switch to Step 3. - { - IM_ASSERT(DisplayStart >= 0 && DisplayEnd >= 0); - StepNo = 3; - return true; - } - if (StepNo == 3) // Step 3: the clipper validate that we have reached the expected Y position (corresponding to element DisplayEnd), advance the cursor to the end of the list and then returns 'false' to end the loop. + IMGUI_DEBUG_LOG_CLIPPER("Clipper: Step(): End.\n"); End(); - return false; + } + return ret; +} + +//----------------------------------------------------------------------------- +// [SECTION] STYLING +//----------------------------------------------------------------------------- + +ImGuiStyle& ImGui::GetStyle() +{ + IM_ASSERT(GImGui != NULL && "No current context. Did you call ImGui::CreateContext() and ImGui::SetCurrentContext() ?"); + return GImGui->Style; +} + +ImU32 ImGui::GetColorU32(ImGuiCol idx, float alpha_mul) +{ + ImGuiStyle& style = GImGui->Style; + ImVec4 c = style.Colors[idx]; + c.w *= style.Alpha * alpha_mul; + return ColorConvertFloat4ToU32(c); +} + +ImU32 ImGui::GetColorU32(const ImVec4& col) +{ + ImGuiStyle& style = GImGui->Style; + ImVec4 c = col; + c.w *= style.Alpha; + return ColorConvertFloat4ToU32(c); +} + +const ImVec4& ImGui::GetStyleColorVec4(ImGuiCol idx) +{ + ImGuiStyle& style = GImGui->Style; + return style.Colors[idx]; +} + +ImU32 ImGui::GetColorU32(ImU32 col, float alpha_mul) +{ + ImGuiStyle& style = GImGui->Style; + alpha_mul *= style.Alpha; + if (alpha_mul >= 1.0f) + return col; + ImU32 a = (col & IM_COL32_A_MASK) >> IM_COL32_A_SHIFT; + a = (ImU32)(a * alpha_mul); // We don't need to clamp 0..255 because alpha is in 0..1 range. + return (col & ~IM_COL32_A_MASK) | (a << IM_COL32_A_SHIFT); +} + +// FIXME: This may incur a round-trip (if the end user got their data from a float4) but eventually we aim to store the in-flight colors as ImU32 +void ImGui::PushStyleColor(ImGuiCol idx, ImU32 col) +{ + ImGuiContext& g = *GImGui; + ImGuiColorMod backup; + backup.Col = idx; + backup.BackupValue = g.Style.Colors[idx]; + g.ColorStack.push_back(backup); + if (g.DebugFlashStyleColorIdx != idx) + g.Style.Colors[idx] = ColorConvertU32ToFloat4(col); +} + +void ImGui::PushStyleColor(ImGuiCol idx, const ImVec4& col) +{ + ImGuiContext& g = *GImGui; + ImGuiColorMod backup; + backup.Col = idx; + backup.BackupValue = g.Style.Colors[idx]; + g.ColorStack.push_back(backup); + if (g.DebugFlashStyleColorIdx != idx) + g.Style.Colors[idx] = col; +} + +void ImGui::PopStyleColor(int count) +{ + ImGuiContext& g = *GImGui; + if (g.ColorStack.Size < count) + { + IM_ASSERT_USER_ERROR(0, "Calling PopStyleColor() too many times!"); + count = g.ColorStack.Size; + } + while (count > 0) + { + ImGuiColorMod& backup = g.ColorStack.back(); + g.Style.Colors[backup.Col] = backup.BackupValue; + g.ColorStack.pop_back(); + count--; + } +} + +static const ImGuiCol GWindowDockStyleColors[ImGuiWindowDockStyleCol_COUNT] = +{ + ImGuiCol_Text, ImGuiCol_TabHovered, ImGuiCol_Tab, ImGuiCol_TabSelected, ImGuiCol_TabSelectedOverline, ImGuiCol_TabDimmed, ImGuiCol_TabDimmedSelected, ImGuiCol_TabDimmedSelectedOverline, +}; + +static const ImGuiStyleVarInfo GStyleVarsInfo[] = +{ + { 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, Alpha) }, // ImGuiStyleVar_Alpha + { 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, DisabledAlpha) }, // ImGuiStyleVar_DisabledAlpha + { 2, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, WindowPadding) }, // ImGuiStyleVar_WindowPadding + { 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, WindowRounding) }, // ImGuiStyleVar_WindowRounding + { 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, WindowBorderSize) }, // ImGuiStyleVar_WindowBorderSize + { 2, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, WindowMinSize) }, // ImGuiStyleVar_WindowMinSize + { 2, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, WindowTitleAlign) }, // ImGuiStyleVar_WindowTitleAlign + { 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, ChildRounding) }, // ImGuiStyleVar_ChildRounding + { 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, ChildBorderSize) }, // ImGuiStyleVar_ChildBorderSize + { 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, PopupRounding) }, // ImGuiStyleVar_PopupRounding + { 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, PopupBorderSize) }, // ImGuiStyleVar_PopupBorderSize + { 2, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, FramePadding) }, // ImGuiStyleVar_FramePadding + { 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, FrameRounding) }, // ImGuiStyleVar_FrameRounding + { 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, FrameBorderSize) }, // ImGuiStyleVar_FrameBorderSize + { 2, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, ItemSpacing) }, // ImGuiStyleVar_ItemSpacing + { 2, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, ItemInnerSpacing) }, // ImGuiStyleVar_ItemInnerSpacing + { 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, IndentSpacing) }, // ImGuiStyleVar_IndentSpacing + { 2, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, CellPadding) }, // ImGuiStyleVar_CellPadding + { 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, ScrollbarSize) }, // ImGuiStyleVar_ScrollbarSize + { 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, ScrollbarRounding) }, // ImGuiStyleVar_ScrollbarRounding + { 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, GrabMinSize) }, // ImGuiStyleVar_GrabMinSize + { 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, GrabRounding) }, // ImGuiStyleVar_GrabRounding + { 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, ImageBorderSize) }, // ImGuiStyleVar_ImageBorderSize + { 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, TabRounding) }, // ImGuiStyleVar_TabRounding + { 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, TabBorderSize) }, // ImGuiStyleVar_TabBorderSize + { 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, TabBarBorderSize) }, // ImGuiStyleVar_TabBarBorderSize + { 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, TabBarOverlineSize) }, // ImGuiStyleVar_TabBarOverlineSize + { 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, TableAngledHeadersAngle)}, // ImGuiStyleVar_TableAngledHeadersAngle + { 2, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, TableAngledHeadersTextAlign)},// ImGuiStyleVar_TableAngledHeadersTextAlign + { 2, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, ButtonTextAlign) }, // ImGuiStyleVar_ButtonTextAlign + { 2, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, SelectableTextAlign) }, // ImGuiStyleVar_SelectableTextAlign + { 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, SeparatorTextBorderSize)}, // ImGuiStyleVar_SeparatorTextBorderSize + { 2, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, SeparatorTextAlign) }, // ImGuiStyleVar_SeparatorTextAlign + { 2, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, SeparatorTextPadding) }, // ImGuiStyleVar_SeparatorTextPadding + { 1, ImGuiDataType_Float, (ImU32)offsetof(ImGuiStyle, DockingSeparatorSize) }, // ImGuiStyleVar_DockingSeparatorSize +}; + +const ImGuiStyleVarInfo* ImGui::GetStyleVarInfo(ImGuiStyleVar idx) +{ + IM_ASSERT(idx >= 0 && idx < ImGuiStyleVar_COUNT); + IM_STATIC_ASSERT(IM_ARRAYSIZE(GStyleVarsInfo) == ImGuiStyleVar_COUNT); + return &GStyleVarsInfo[idx]; +} + +void ImGui::PushStyleVar(ImGuiStyleVar idx, float val) +{ + ImGuiContext& g = *GImGui; + const ImGuiStyleVarInfo* var_info = GetStyleVarInfo(idx); + if (var_info->DataType != ImGuiDataType_Float || var_info->Count != 1) + { + IM_ASSERT_USER_ERROR(0, "Calling PushStyleVar() variant with wrong type!"); + return; + } + float* pvar = (float*)var_info->GetVarPtr(&g.Style); + g.StyleVarStack.push_back(ImGuiStyleMod(idx, *pvar)); + *pvar = val; +} + +void ImGui::PushStyleVarX(ImGuiStyleVar idx, float val_x) +{ + ImGuiContext& g = *GImGui; + const ImGuiStyleVarInfo* var_info = GetStyleVarInfo(idx); + if (var_info->DataType != ImGuiDataType_Float || var_info->Count != 2) + { + IM_ASSERT_USER_ERROR(0, "Calling PushStyleVar() variant with wrong type!"); + return; + } + ImVec2* pvar = (ImVec2*)var_info->GetVarPtr(&g.Style); + g.StyleVarStack.push_back(ImGuiStyleMod(idx, *pvar)); + pvar->x = val_x; +} + +void ImGui::PushStyleVarY(ImGuiStyleVar idx, float val_y) +{ + ImGuiContext& g = *GImGui; + const ImGuiStyleVarInfo* var_info = GetStyleVarInfo(idx); + if (var_info->DataType != ImGuiDataType_Float || var_info->Count != 2) + { + IM_ASSERT_USER_ERROR(0, "Calling PushStyleVar() variant with wrong type!"); + return; + } + ImVec2* pvar = (ImVec2*)var_info->GetVarPtr(&g.Style); + g.StyleVarStack.push_back(ImGuiStyleMod(idx, *pvar)); + pvar->y = val_y; +} + +void ImGui::PushStyleVar(ImGuiStyleVar idx, const ImVec2& val) +{ + ImGuiContext& g = *GImGui; + const ImGuiStyleVarInfo* var_info = GetStyleVarInfo(idx); + if (var_info->DataType != ImGuiDataType_Float || var_info->Count != 2) + { + IM_ASSERT_USER_ERROR(0, "Calling PushStyleVar() variant with wrong type!"); + return; + } + ImVec2* pvar = (ImVec2*)var_info->GetVarPtr(&g.Style); + g.StyleVarStack.push_back(ImGuiStyleMod(idx, *pvar)); + *pvar = val; +} + +void ImGui::PopStyleVar(int count) +{ + ImGuiContext& g = *GImGui; + if (g.StyleVarStack.Size < count) + { + IM_ASSERT_USER_ERROR(0, "Calling PopStyleVar() too many times!"); + count = g.StyleVarStack.Size; + } + while (count > 0) + { + // We avoid a generic memcpy(data, &backup.Backup.., GDataTypeSize[info->Type] * info->Count), the overhead in Debug is not worth it. + ImGuiStyleMod& backup = g.StyleVarStack.back(); + const ImGuiStyleVarInfo* var_info = GetStyleVarInfo(backup.VarIdx); + void* data = var_info->GetVarPtr(&g.Style); + if (var_info->DataType == ImGuiDataType_Float && var_info->Count == 1) { ((float*)data)[0] = backup.BackupFloat[0]; } + else if (var_info->DataType == ImGuiDataType_Float && var_info->Count == 2) { ((float*)data)[0] = backup.BackupFloat[0]; ((float*)data)[1] = backup.BackupFloat[1]; } + g.StyleVarStack.pop_back(); + count--; + } +} + +const char* ImGui::GetStyleColorName(ImGuiCol idx) +{ + // Create switch-case from enum with regexp: ImGuiCol_{.*}, --> case ImGuiCol_\1: return "\1"; + switch (idx) + { + case ImGuiCol_Text: return "Text"; + case ImGuiCol_TextDisabled: return "TextDisabled"; + case ImGuiCol_WindowBg: return "WindowBg"; + case ImGuiCol_ChildBg: return "ChildBg"; + case ImGuiCol_PopupBg: return "PopupBg"; + case ImGuiCol_Border: return "Border"; + case ImGuiCol_BorderShadow: return "BorderShadow"; + case ImGuiCol_FrameBg: return "FrameBg"; + case ImGuiCol_FrameBgHovered: return "FrameBgHovered"; + case ImGuiCol_FrameBgActive: return "FrameBgActive"; + case ImGuiCol_TitleBg: return "TitleBg"; + case ImGuiCol_TitleBgActive: return "TitleBgActive"; + case ImGuiCol_TitleBgCollapsed: return "TitleBgCollapsed"; + case ImGuiCol_MenuBarBg: return "MenuBarBg"; + case ImGuiCol_ScrollbarBg: return "ScrollbarBg"; + case ImGuiCol_ScrollbarGrab: return "ScrollbarGrab"; + case ImGuiCol_ScrollbarGrabHovered: return "ScrollbarGrabHovered"; + case ImGuiCol_ScrollbarGrabActive: return "ScrollbarGrabActive"; + case ImGuiCol_CheckMark: return "CheckMark"; + case ImGuiCol_SliderGrab: return "SliderGrab"; + case ImGuiCol_SliderGrabActive: return "SliderGrabActive"; + case ImGuiCol_Button: return "Button"; + case ImGuiCol_ButtonHovered: return "ButtonHovered"; + case ImGuiCol_ButtonActive: return "ButtonActive"; + case ImGuiCol_Header: return "Header"; + case ImGuiCol_HeaderHovered: return "HeaderHovered"; + case ImGuiCol_HeaderActive: return "HeaderActive"; + case ImGuiCol_Separator: return "Separator"; + case ImGuiCol_SeparatorHovered: return "SeparatorHovered"; + case ImGuiCol_SeparatorActive: return "SeparatorActive"; + case ImGuiCol_ResizeGrip: return "ResizeGrip"; + case ImGuiCol_ResizeGripHovered: return "ResizeGripHovered"; + case ImGuiCol_ResizeGripActive: return "ResizeGripActive"; + case ImGuiCol_TabHovered: return "TabHovered"; + case ImGuiCol_Tab: return "Tab"; + case ImGuiCol_TabSelected: return "TabSelected"; + case ImGuiCol_TabSelectedOverline: return "TabSelectedOverline"; + case ImGuiCol_TabDimmed: return "TabDimmed"; + case ImGuiCol_TabDimmedSelected: return "TabDimmedSelected"; + case ImGuiCol_TabDimmedSelectedOverline: return "TabDimmedSelectedOverline"; + case ImGuiCol_DockingPreview: return "DockingPreview"; + case ImGuiCol_DockingEmptyBg: return "DockingEmptyBg"; + case ImGuiCol_PlotLines: return "PlotLines"; + case ImGuiCol_PlotLinesHovered: return "PlotLinesHovered"; + case ImGuiCol_PlotHistogram: return "PlotHistogram"; + case ImGuiCol_PlotHistogramHovered: return "PlotHistogramHovered"; + case ImGuiCol_TableHeaderBg: return "TableHeaderBg"; + case ImGuiCol_TableBorderStrong: return "TableBorderStrong"; + case ImGuiCol_TableBorderLight: return "TableBorderLight"; + case ImGuiCol_TableRowBg: return "TableRowBg"; + case ImGuiCol_TableRowBgAlt: return "TableRowBgAlt"; + case ImGuiCol_TextLink: return "TextLink"; + case ImGuiCol_TextSelectedBg: return "TextSelectedBg"; + case ImGuiCol_DragDropTarget: return "DragDropTarget"; + case ImGuiCol_NavCursor: return "NavCursor"; + case ImGuiCol_NavWindowingHighlight: return "NavWindowingHighlight"; + case ImGuiCol_NavWindowingDimBg: return "NavWindowingDimBg"; + case ImGuiCol_ModalWindowDimBg: return "ModalWindowDimBg"; + } + IM_ASSERT(0); + return "Unknown"; } //----------------------------------------------------------------------------- // [SECTION] RENDER HELPERS -// Those (internal) functions are currently quite a legacy mess - their signature and behavior will change. -// Also see imgui_draw.cpp for some more which have been reworked to not rely on ImGui:: state. +// Some of those (internal) functions are currently quite a legacy mess - their signature and behavior will change, +// we need a nicer separation between low-level functions and high-level functions relying on the ImGui context. +// Also see imgui_draw.cpp for some more which have been reworked to not rely on ImGui:: context. //----------------------------------------------------------------------------- const char* ImGui::FindRenderedTextEnd(const char* text, const char* text_end) @@ -2397,7 +3674,7 @@ void ImGui::RenderText(ImVec2 pos, const char* text, const char* text_end, bool else { if (!text_end) - text_end = text + strlen(text); // FIXME-OPT + text_end = text + ImStrlen(text); // FIXME-OPT text_display_end = text_end; } @@ -2415,7 +3692,7 @@ void ImGui::RenderTextWrapped(ImVec2 pos, const char* text, const char* text_end ImGuiWindow* window = g.CurrentWindow; if (!text_end) - text_end = text + strlen(text); // FIXME-OPT + text_end = text + ImStrlen(text); // FIXME-OPT if (text != text_end) { @@ -2427,6 +3704,9 @@ void ImGui::RenderTextWrapped(ImVec2 pos, const char* text, const char* text_end // Default clip_rect uses (pos_min,pos_max) // Handle clipping on CPU immediately (vs typically let the GPU clip the triangles that are overlapping the clipping rectangle edges) +// FIXME-OPT: Since we have or calculate text_size we could coarse clip whole block immediately, especally for text above draw_list->DrawList. +// Effectively as this is called from widget doing their own coarse clipping it's not very valuable presently. Next time function will take +// better advantage of the render function taking size into account for coarse clipping. void ImGui::RenderTextClippedEx(ImDrawList* draw_list, const ImVec2& pos_min, const ImVec2& pos_max, const char* text, const char* text_display_end, const ImVec2* text_size_if_known, const ImVec2& align, const ImRect* clip_rect) { // Perform CPU side clipping for single clipped element to avoid using scissor state @@ -2470,7 +3750,6 @@ void ImGui::RenderTextClipped(const ImVec2& pos_min, const ImVec2& pos_max, cons LogRenderedText(&pos_min, text, text_display_end); } - // Another overly complex function until we reorganize everything into a nice all-in-one helper. // This is made more complex because we have dissociated the layout rectangle (pos_min..pos_max) which define _where_ the ellipsis is, from actual clipping of text and limit of the ellipsis display. // This is because in the context of tabs we selectively hide part of the text when the Close Button appears, but we don't want the ellipsis to move. @@ -2492,32 +3771,14 @@ void ImGui::RenderTextEllipsis(ImDrawList* draw_list, const ImVec2& pos_min, con // min max ellipsis_max // <-> this is generally some padding value - const ImFont* font = draw_list->_Data->Font; + ImFont* font = draw_list->_Data->Font; const float font_size = draw_list->_Data->FontSize; + const float font_scale = draw_list->_Data->FontScale; const char* text_end_ellipsis = NULL; + const float ellipsis_width = font->EllipsisWidth * font_scale; - ImWchar ellipsis_char = font->EllipsisChar; - int ellipsis_char_count = 1; - if (ellipsis_char == (ImWchar)-1) - { - ellipsis_char = (ImWchar)'.'; - ellipsis_char_count = 3; - } - const ImFontGlyph* glyph = font->FindGlyph(ellipsis_char); - - float ellipsis_glyph_width = glyph->X1; // Width of the glyph with no padding on either side - float ellipsis_total_width = ellipsis_glyph_width; // Full width of entire ellipsis - - if (ellipsis_char_count > 1) - { - // Full ellipsis size without free spacing after it. - const float spacing_between_dots = 1.0f * (draw_list->_Data->FontSize / font->FontSize); - ellipsis_glyph_width = glyph->X1 - glyph->X0 + spacing_between_dots; - ellipsis_total_width = ellipsis_glyph_width * (float)ellipsis_char_count - spacing_between_dots; - } - // We can now claim the space between pos_max.x and ellipsis_max.x - const float text_avail_width = ImMax((ImMax(pos_max.x, ellipsis_max_x) - ellipsis_total_width) - pos_min.x, 1.0f); + const float text_avail_width = ImMax((ImMax(pos_max.x, ellipsis_max_x) - ellipsis_width) - pos_min.x, 1.0f); float text_size_clipped_x = font->CalcTextSizeA(font_size, text_avail_width, 0.0f, text, text_end_full, &text_end_ellipsis).x; if (text == text_end_ellipsis && text_end_ellipsis < text_end_full) { @@ -2534,13 +3795,10 @@ void ImGui::RenderTextEllipsis(ImDrawList* draw_list, const ImVec2& pos_min, con // Render text, render ellipsis RenderTextClippedEx(draw_list, pos_min, ImVec2(clip_max_x, pos_max.y), text, text_end_ellipsis, &text_size, ImVec2(0.0f, 0.0f)); - float ellipsis_x = pos_min.x + text_size_clipped_x; - if (ellipsis_x + ellipsis_total_width <= ellipsis_max_x) - for (int i = 0; i < ellipsis_char_count; i++) - { - font->RenderChar(draw_list, font_size, ImVec2(ellipsis_x, pos_min.y), GetColorU32(ImGuiCol_Text), ellipsis_char); - ellipsis_x += ellipsis_glyph_width; - } + ImVec2 ellipsis_pos = ImTrunc(ImVec2(pos_min.x + text_size_clipped_x, pos_min.y)); + if (ellipsis_pos.x + ellipsis_width <= ellipsis_max_x) + for (int i = 0; i < font->EllipsisCharCount; i++, ellipsis_pos.x += font->EllipsisCharStep * font_scale) + font->RenderChar(draw_list, font_size, ellipsis_pos, GetColorU32(ImGuiCol_Text), font->EllipsisChar); } else { @@ -2552,16 +3810,16 @@ void ImGui::RenderTextEllipsis(ImDrawList* draw_list, const ImVec2& pos_min, con } // Render a rectangle shaped with optional rounding and borders -void ImGui::RenderFrame(ImVec2 p_min, ImVec2 p_max, ImU32 fill_col, bool border, float rounding) +void ImGui::RenderFrame(ImVec2 p_min, ImVec2 p_max, ImU32 fill_col, bool borders, float rounding) { ImGuiContext& g = *GImGui; ImGuiWindow* window = g.CurrentWindow; window->DrawList->AddRectFilled(p_min, p_max, fill_col, rounding); const float border_size = g.Style.FrameBorderSize; - if (border && border_size > 0.0f) + if (borders && border_size > 0.0f) { - window->DrawList->AddRect(p_min+ImVec2(1,1), p_max+ImVec2(1,1), GetColorU32(ImGuiCol_BorderShadow), rounding, ImDrawCornerFlags_All, border_size); - window->DrawList->AddRect(p_min, p_max, GetColorU32(ImGuiCol_Border), rounding, ImDrawCornerFlags_All, border_size); + window->DrawList->AddRect(p_min + ImVec2(1, 1), p_max + ImVec2(1, 1), GetColorU32(ImGuiCol_BorderShadow), rounding, 0, border_size); + window->DrawList->AddRect(p_min, p_max, GetColorU32(ImGuiCol_Border), rounding, 0, border_size); } } @@ -2572,669 +3830,83 @@ void ImGui::RenderFrameBorder(ImVec2 p_min, ImVec2 p_max, float rounding) const float border_size = g.Style.FrameBorderSize; if (border_size > 0.0f) { - window->DrawList->AddRect(p_min+ImVec2(1,1), p_max+ImVec2(1,1), GetColorU32(ImGuiCol_BorderShadow), rounding, ImDrawCornerFlags_All, border_size); - window->DrawList->AddRect(p_min, p_max, GetColorU32(ImGuiCol_Border), rounding, ImDrawCornerFlags_All, border_size); + window->DrawList->AddRect(p_min + ImVec2(1, 1), p_max + ImVec2(1, 1), GetColorU32(ImGuiCol_BorderShadow), rounding, 0, border_size); + window->DrawList->AddRect(p_min, p_max, GetColorU32(ImGuiCol_Border), rounding, 0, border_size); } } -// Render an arrow aimed to be aligned with text (p_min is a position in the same space text would be positioned). To e.g. denote expanded/collapsed state -void ImGui::RenderArrow(ImDrawList* draw_list, ImVec2 pos, ImU32 col, ImGuiDir dir, float scale) -{ - const float h = draw_list->_Data->FontSize * 1.00f; - float r = h * 0.40f * scale; - ImVec2 center = pos + ImVec2(h * 0.50f, h * 0.50f * scale); - - ImVec2 a, b, c; - switch (dir) - { - case ImGuiDir_Up: - case ImGuiDir_Down: - if (dir == ImGuiDir_Up) r = -r; - a = ImVec2(+0.000f,+0.750f) * r; - b = ImVec2(-0.866f,-0.750f) * r; - c = ImVec2(+0.866f,-0.750f) * r; - break; - case ImGuiDir_Left: - case ImGuiDir_Right: - if (dir == ImGuiDir_Left) r = -r; - a = ImVec2(+0.750f,+0.000f) * r; - b = ImVec2(-0.750f,+0.866f) * r; - c = ImVec2(-0.750f,-0.866f) * r; - break; - case ImGuiDir_None: - case ImGuiDir_COUNT: - IM_ASSERT(0); - break; - } - draw_list->AddTriangleFilled(center + a, center + b, center + c, col); -} - -void ImGui::RenderBullet(ImDrawList* draw_list, ImVec2 pos, ImU32 col) -{ - draw_list->AddCircleFilled(pos, draw_list->_Data->FontSize * 0.20f, col, 8); -} - -void ImGui::RenderCheckMark(ImVec2 pos, ImU32 col, float sz) -{ - ImGuiContext& g = *GImGui; - ImGuiWindow* window = g.CurrentWindow; - - float thickness = ImMax(sz / 5.0f, 1.0f); - sz -= thickness*0.5f; - pos += ImVec2(thickness*0.25f, thickness*0.25f); - - float third = sz / 3.0f; - float bx = pos.x + third; - float by = pos.y + sz - third*0.5f; - window->DrawList->PathLineTo(ImVec2(bx - third, by - third)); - window->DrawList->PathLineTo(ImVec2(bx, by)); - window->DrawList->PathLineTo(ImVec2(bx + third*2, by - third*2)); - window->DrawList->PathStroke(col, false, thickness); -} - -void ImGui::RenderNavHighlight(const ImRect& bb, ImGuiID id, ImGuiNavHighlightFlags flags) +void ImGui::RenderNavCursor(const ImRect& bb, ImGuiID id, ImGuiNavRenderCursorFlags flags) { ImGuiContext& g = *GImGui; if (id != g.NavId) return; - if (g.NavDisableHighlight && !(flags & ImGuiNavHighlightFlags_AlwaysDraw)) + if (!g.NavCursorVisible && !(flags & ImGuiNavRenderCursorFlags_AlwaysDraw)) + return; + if (id == g.LastItemData.ID && (g.LastItemData.ItemFlags & ImGuiItemFlags_NoNav)) return; ImGuiWindow* window = g.CurrentWindow; if (window->DC.NavHideHighlightOneFrame) return; - float rounding = (flags & ImGuiNavHighlightFlags_NoRounding) ? 0.0f : g.Style.FrameRounding; + float rounding = (flags & ImGuiNavRenderCursorFlags_NoRounding) ? 0.0f : g.Style.FrameRounding; ImRect display_rect = bb; display_rect.ClipWith(window->ClipRect); - if (flags & ImGuiNavHighlightFlags_TypeDefault) + const float thickness = 2.0f; + if (flags & ImGuiNavRenderCursorFlags_Compact) { - const float THICKNESS = 2.0f; - const float DISTANCE = 3.0f + THICKNESS * 0.5f; - display_rect.Expand(ImVec2(DISTANCE,DISTANCE)); + window->DrawList->AddRect(display_rect.Min, display_rect.Max, GetColorU32(ImGuiCol_NavCursor), rounding, 0, thickness); + } + else + { + const float distance = 3.0f + thickness * 0.5f; + display_rect.Expand(ImVec2(distance, distance)); bool fully_visible = window->ClipRect.Contains(display_rect); if (!fully_visible) window->DrawList->PushClipRect(display_rect.Min, display_rect.Max); - window->DrawList->AddRect(display_rect.Min + ImVec2(THICKNESS*0.5f,THICKNESS*0.5f), display_rect.Max - ImVec2(THICKNESS*0.5f,THICKNESS*0.5f), GetColorU32(ImGuiCol_NavHighlight), rounding, ImDrawCornerFlags_All, THICKNESS); + window->DrawList->AddRect(display_rect.Min, display_rect.Max, GetColorU32(ImGuiCol_NavCursor), rounding, 0, thickness); if (!fully_visible) window->DrawList->PopClipRect(); } - if (flags & ImGuiNavHighlightFlags_TypeThin) +} + +void ImGui::RenderMouseCursor(ImVec2 base_pos, float base_scale, ImGuiMouseCursor mouse_cursor, ImU32 col_fill, ImU32 col_border, ImU32 col_shadow) +{ + ImGuiContext& g = *GImGui; + if (mouse_cursor <= ImGuiMouseCursor_None || mouse_cursor >= ImGuiMouseCursor_COUNT) // We intentionally accept out of bound values. + mouse_cursor = ImGuiMouseCursor_Arrow; + ImFontAtlas* font_atlas = g.DrawListSharedData.Font->ContainerAtlas; + for (ImGuiViewportP* viewport : g.Viewports) { - window->DrawList->AddRect(display_rect.Min, display_rect.Max, GetColorU32(ImGuiCol_NavHighlight), rounding, ~0, 1.0f); + // We scale cursor with current viewport/monitor, however Windows 10 for its own hardware cursor seems to be using a different scale factor. + ImVec2 offset, size, uv[4]; + if (!ImFontAtlasGetMouseCursorTexData(font_atlas, mouse_cursor, &offset, &size, &uv[0], &uv[2])) + continue; + const ImVec2 pos = base_pos - offset; + const float scale = base_scale * viewport->DpiScale; + if (!viewport->GetMainRect().Overlaps(ImRect(pos, pos + ImVec2(size.x + 2, size.y + 2) * scale))) + continue; + ImDrawList* draw_list = GetForegroundDrawList(viewport); + ImTextureID tex_id = font_atlas->TexID; + draw_list->PushTextureID(tex_id); + draw_list->AddImage(tex_id, pos + ImVec2(1, 0) * scale, pos + (ImVec2(1, 0) + size) * scale, uv[2], uv[3], col_shadow); + draw_list->AddImage(tex_id, pos + ImVec2(2, 0) * scale, pos + (ImVec2(2, 0) + size) * scale, uv[2], uv[3], col_shadow); + draw_list->AddImage(tex_id, pos, pos + size * scale, uv[2], uv[3], col_border); + draw_list->AddImage(tex_id, pos, pos + size * scale, uv[0], uv[1], col_fill); + if (mouse_cursor == ImGuiMouseCursor_Wait || mouse_cursor == ImGuiMouseCursor_Progress) + { + float a_min = ImFmod((float)g.Time * 5.0f, 2.0f * IM_PI); + float a_max = a_min + IM_PI * 1.65f; + draw_list->PathArcTo(pos + ImVec2(14, -1) * scale, 6.0f * scale, a_min, a_max); + draw_list->PathStroke(col_fill, ImDrawFlags_None, 3.0f * scale); + } + draw_list->PopTextureID(); } } //----------------------------------------------------------------------------- -// [SECTION] MAIN CODE (most of the code! lots of stuff, needs tidying up!) +// [SECTION] INITIALIZATION, SHUTDOWN //----------------------------------------------------------------------------- -// ImGuiWindow is mostly a dumb struct. It merely has a constructor and a few helper methods -ImGuiWindow::ImGuiWindow(ImGuiContext* context, const char* name) - : DrawListInst(&context->DrawListSharedData) -{ - Name = ImStrdup(name); - ID = ImHashStr(name); - IDStack.push_back(ID); - Flags = ImGuiWindowFlags_None; - Pos = ImVec2(0.0f, 0.0f); - Size = SizeFull = ImVec2(0.0f, 0.0f); - ContentSize = ContentSizeExplicit = ImVec2(0.0f, 0.0f); - WindowPadding = ImVec2(0.0f, 0.0f); - WindowRounding = 0.0f; - WindowBorderSize = 0.0f; - NameBufLen = (int)strlen(name) + 1; - MoveId = GetID("#MOVE"); - ChildId = 0; - Scroll = ImVec2(0.0f, 0.0f); - ScrollTarget = ImVec2(FLT_MAX, FLT_MAX); - ScrollTargetCenterRatio = ImVec2(0.5f, 0.5f); - ScrollbarSizes = ImVec2(0.0f, 0.0f); - ScrollbarX = ScrollbarY = false; - Active = WasActive = false; - WriteAccessed = false; - Collapsed = false; - WantCollapseToggle = false; - SkipItems = false; - Appearing = false; - Hidden = false; - HasCloseButton = false; - ResizeBorderHeld = -1; - BeginCount = 0; - BeginOrderWithinParent = -1; - BeginOrderWithinContext = -1; - PopupId = 0; - AutoFitFramesX = AutoFitFramesY = -1; - AutoFitChildAxises = 0x00; - AutoFitOnlyGrows = false; - AutoPosLastDirection = ImGuiDir_None; - HiddenFramesCanSkipItems = HiddenFramesCannotSkipItems = 0; - SetWindowPosAllowFlags = SetWindowSizeAllowFlags = SetWindowCollapsedAllowFlags = ImGuiCond_Always | ImGuiCond_Once | ImGuiCond_FirstUseEver | ImGuiCond_Appearing; - SetWindowPosVal = SetWindowPosPivot = ImVec2(FLT_MAX, FLT_MAX); - - LastFrameActive = -1; - LastTimeActive = -1.0f; - ItemWidthDefault = 0.0f; - FontWindowScale = 1.0f; - SettingsIdx = -1; - - DrawList = &DrawListInst; - DrawList->_OwnerName = Name; - ParentWindow = NULL; - RootWindow = NULL; - RootWindowForTitleBarHighlight = NULL; - RootWindowForNav = NULL; - - NavLastIds[0] = NavLastIds[1] = 0; - NavRectRel[0] = NavRectRel[1] = ImRect(); - NavLastChildNavWindow = NULL; - - MemoryCompacted = false; - MemoryDrawListIdxCapacity = MemoryDrawListVtxCapacity = 0; -} - -ImGuiWindow::~ImGuiWindow() -{ - IM_ASSERT(DrawList == &DrawListInst); - IM_DELETE(Name); - for (int i = 0; i != ColumnsStorage.Size; i++) - ColumnsStorage[i].~ImGuiColumns(); -} - -ImGuiID ImGuiWindow::GetID(const char* str, const char* str_end) -{ - ImGuiID seed = IDStack.back(); - ImGuiID id = ImHashStr(str, str_end ? (str_end - str) : 0, seed); - ImGui::KeepAliveID(id); - return id; -} - -ImGuiID ImGuiWindow::GetID(const void* ptr) -{ - ImGuiID seed = IDStack.back(); - ImGuiID id = ImHashData(&ptr, sizeof(void*), seed); - ImGui::KeepAliveID(id); - return id; -} - -ImGuiID ImGuiWindow::GetID(int n) -{ - ImGuiID seed = IDStack.back(); - ImGuiID id = ImHashData(&n, sizeof(n), seed); - ImGui::KeepAliveID(id); - return id; -} - -ImGuiID ImGuiWindow::GetIDNoKeepAlive(const char* str, const char* str_end) -{ - ImGuiID seed = IDStack.back(); - return ImHashStr(str, str_end ? (str_end - str) : 0, seed); -} - -ImGuiID ImGuiWindow::GetIDNoKeepAlive(const void* ptr) -{ - ImGuiID seed = IDStack.back(); - return ImHashData(&ptr, sizeof(void*), seed); -} - -ImGuiID ImGuiWindow::GetIDNoKeepAlive(int n) -{ - ImGuiID seed = IDStack.back(); - return ImHashData(&n, sizeof(n), seed); -} - -// This is only used in rare/specific situations to manufacture an ID out of nowhere. -ImGuiID ImGuiWindow::GetIDFromRectangle(const ImRect& r_abs) -{ - ImGuiID seed = IDStack.back(); - const int r_rel[4] = { (int)(r_abs.Min.x - Pos.x), (int)(r_abs.Min.y - Pos.y), (int)(r_abs.Max.x - Pos.x), (int)(r_abs.Max.y - Pos.y) }; - ImGuiID id = ImHashData(&r_rel, sizeof(r_rel), seed); - ImGui::KeepAliveID(id); - return id; -} - -static void SetCurrentWindow(ImGuiWindow* window) -{ - ImGuiContext& g = *GImGui; - g.CurrentWindow = window; - if (window) - g.FontSize = g.DrawListSharedData.FontSize = window->CalcFontSize(); -} - -// Free up/compact internal window buffers, we can use this when a window becomes unused. -// This is currently unused by the library, but you may call this yourself for easy GC. -// Not freed: -// - ImGuiWindow, ImGuiWindowSettings, Name -// - StateStorage, ColumnsStorage (may hold useful data) -// This should have no noticeable visual effect. When the window reappear however, expect new allocation/buffer growth/copy cost. -void ImGui::GcCompactTransientWindowBuffers(ImGuiWindow* window) -{ - window->MemoryCompacted = true; - window->MemoryDrawListIdxCapacity = window->DrawList->IdxBuffer.Capacity; - window->MemoryDrawListVtxCapacity = window->DrawList->VtxBuffer.Capacity; - window->IDStack.clear(); - window->DrawList->ClearFreeMemory(); - window->DC.ChildWindows.clear(); - window->DC.ItemFlagsStack.clear(); - window->DC.ItemWidthStack.clear(); - window->DC.TextWrapPosStack.clear(); - window->DC.GroupStack.clear(); -} - -void ImGui::GcAwakeTransientWindowBuffers(ImGuiWindow* window) -{ - // We stored capacity of the ImDrawList buffer to reduce growth-caused allocation/copy when awakening. - // The other buffers tends to amortize much faster. - window->MemoryCompacted = false; - window->DrawList->IdxBuffer.reserve(window->MemoryDrawListIdxCapacity); - window->DrawList->VtxBuffer.reserve(window->MemoryDrawListVtxCapacity); - window->MemoryDrawListIdxCapacity = window->MemoryDrawListVtxCapacity = 0; -} - -void ImGui::SetNavID(ImGuiID id, int nav_layer) -{ - ImGuiContext& g = *GImGui; - IM_ASSERT(g.NavWindow); - IM_ASSERT(nav_layer == 0 || nav_layer == 1); - g.NavId = id; - g.NavWindow->NavLastIds[nav_layer] = id; -} - -void ImGui::SetNavIDWithRectRel(ImGuiID id, int nav_layer, const ImRect& rect_rel) -{ - ImGuiContext& g = *GImGui; - SetNavID(id, nav_layer); - g.NavWindow->NavRectRel[nav_layer] = rect_rel; - g.NavMousePosDirty = true; - g.NavDisableHighlight = false; - g.NavDisableMouseHover = true; -} - -void ImGui::SetActiveID(ImGuiID id, ImGuiWindow* window) -{ - ImGuiContext& g = *GImGui; - g.ActiveIdIsJustActivated = (g.ActiveId != id); - if (g.ActiveIdIsJustActivated) - { - g.ActiveIdTimer = 0.0f; - g.ActiveIdHasBeenPressedBefore = false; - g.ActiveIdHasBeenEditedBefore = false; - if (id != 0) - { - g.LastActiveId = id; - g.LastActiveIdTimer = 0.0f; - } - } - g.ActiveId = id; - g.ActiveIdAllowNavDirFlags = 0; - g.ActiveIdBlockNavInputFlags = 0; - g.ActiveIdAllowOverlap = false; - g.ActiveIdWindow = window; - g.ActiveIdHasBeenEditedThisFrame = false; - if (id) - { - g.ActiveIdIsAlive = id; - g.ActiveIdSource = (g.NavActivateId == id || g.NavInputId == id || g.NavJustTabbedId == id || g.NavJustMovedToId == id) ? ImGuiInputSource_Nav : ImGuiInputSource_Mouse; - } -} - -// FIXME-NAV: The existence of SetNavID/SetNavIDWithRectRel/SetFocusID is incredibly messy and confusing and needs some explanation or refactoring. -void ImGui::SetFocusID(ImGuiID id, ImGuiWindow* window) -{ - ImGuiContext& g = *GImGui; - IM_ASSERT(id != 0); - - // Assume that SetFocusID() is called in the context where its NavLayer is the current layer, which is the case everywhere we call it. - const ImGuiNavLayer nav_layer = window->DC.NavLayerCurrent; - if (g.NavWindow != window) - g.NavInitRequest = false; - g.NavId = id; - g.NavWindow = window; - g.NavLayer = nav_layer; - window->NavLastIds[nav_layer] = id; - if (window->DC.LastItemId == id) - window->NavRectRel[nav_layer] = ImRect(window->DC.LastItemRect.Min - window->Pos, window->DC.LastItemRect.Max - window->Pos); - - if (g.ActiveIdSource == ImGuiInputSource_Nav) - g.NavDisableMouseHover = true; - else - g.NavDisableHighlight = true; -} - -void ImGui::ClearActiveID() -{ - SetActiveID(0, NULL); -} - -void ImGui::SetHoveredID(ImGuiID id) -{ - ImGuiContext& g = *GImGui; - g.HoveredId = id; - g.HoveredIdAllowOverlap = false; - if (id != 0 && g.HoveredIdPreviousFrame != id) - g.HoveredIdTimer = g.HoveredIdNotActiveTimer = 0.0f; -} - -ImGuiID ImGui::GetHoveredID() -{ - ImGuiContext& g = *GImGui; - return g.HoveredId ? g.HoveredId : g.HoveredIdPreviousFrame; -} - -void ImGui::KeepAliveID(ImGuiID id) -{ - ImGuiContext& g = *GImGui; - if (g.ActiveId == id) - g.ActiveIdIsAlive = id; - if (g.ActiveIdPreviousFrame == id) - g.ActiveIdPreviousFrameIsAlive = true; -} - -void ImGui::MarkItemEdited(ImGuiID id) -{ - // This marking is solely to be able to provide info for IsItemDeactivatedAfterEdit(). - // ActiveId might have been released by the time we call this (as in the typical press/release button behavior) but still need need to fill the data. - ImGuiContext& g = *GImGui; - IM_ASSERT(g.ActiveId == id || g.ActiveId == 0 || g.DragDropActive); - IM_UNUSED(id); // Avoid unused variable warnings when asserts are compiled out. - //IM_ASSERT(g.CurrentWindow->DC.LastItemId == id); - g.ActiveIdHasBeenEditedThisFrame = true; - g.ActiveIdHasBeenEditedBefore = true; - g.CurrentWindow->DC.LastItemStatusFlags |= ImGuiItemStatusFlags_Edited; -} - -static inline bool IsWindowContentHoverable(ImGuiWindow* window, ImGuiHoveredFlags flags) -{ - // An active popup disable hovering on other windows (apart from its own children) - // FIXME-OPT: This could be cached/stored within the window. - ImGuiContext& g = *GImGui; - if (g.NavWindow) - if (ImGuiWindow* focused_root_window = g.NavWindow->RootWindow) - if (focused_root_window->WasActive && focused_root_window != window->RootWindow) - { - // For the purpose of those flags we differentiate "standard popup" from "modal popup" - // NB: The order of those two tests is important because Modal windows are also Popups. - if (focused_root_window->Flags & ImGuiWindowFlags_Modal) - return false; - if ((focused_root_window->Flags & ImGuiWindowFlags_Popup) && !(flags & ImGuiHoveredFlags_AllowWhenBlockedByPopup)) - return false; - } - - return true; -} - -// Advance cursor given item size for layout. -void ImGui::ItemSize(const ImVec2& size, float text_offset_y) -{ - ImGuiContext& g = *GImGui; - ImGuiWindow* window = g.CurrentWindow; - if (window->SkipItems) - return; - - // Always align ourselves on pixel boundaries - const float line_height = ImMax(window->DC.CurrLineSize.y, size.y); - const float text_base_offset = ImMax(window->DC.CurrLineTextBaseOffset, text_offset_y); - //if (g.IO.KeyAlt) window->DrawList->AddRect(window->DC.CursorPos, window->DC.CursorPos + ImVec2(size.x, line_height), IM_COL32(255,0,0,200)); // [DEBUG] - window->DC.CursorPosPrevLine.x = window->DC.CursorPos.x + size.x; - window->DC.CursorPosPrevLine.y = window->DC.CursorPos.y; - window->DC.CursorPos.x = (float)(int)(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x); - window->DC.CursorPos.y = (float)(int)(window->DC.CursorPos.y + line_height + g.Style.ItemSpacing.y); - window->DC.CursorMaxPos.x = ImMax(window->DC.CursorMaxPos.x, window->DC.CursorPosPrevLine.x); - window->DC.CursorMaxPos.y = ImMax(window->DC.CursorMaxPos.y, window->DC.CursorPos.y - g.Style.ItemSpacing.y); - //if (g.IO.KeyAlt) window->DrawList->AddCircle(window->DC.CursorMaxPos, 3.0f, IM_COL32(255,0,0,255), 4); // [DEBUG] - - window->DC.PrevLineSize.y = line_height; - window->DC.PrevLineTextBaseOffset = text_base_offset; - window->DC.CurrLineSize.y = window->DC.CurrLineTextBaseOffset = 0.0f; - - // Horizontal layout mode - if (window->DC.LayoutType == ImGuiLayoutType_Horizontal) - SameLine(); -} - -void ImGui::ItemSize(const ImRect& bb, float text_offset_y) -{ - ItemSize(bb.GetSize(), text_offset_y); -} - -// Declare item bounding box for clipping and interaction. -// Note that the size can be different than the one provided to ItemSize(). Typically, widgets that spread over available surface -// declare their minimum size requirement to ItemSize() and then use a larger region for drawing/interaction, which is passed to ItemAdd(). -bool ImGui::ItemAdd(const ImRect& bb, ImGuiID id, const ImRect* nav_bb_arg) -{ - ImGuiContext& g = *GImGui; - ImGuiWindow* window = g.CurrentWindow; - - if (id != 0) - { - // Navigation processing runs prior to clipping early-out - // (a) So that NavInitRequest can be honored, for newly opened windows to select a default widget - // (b) So that we can scroll up/down past clipped items. This adds a small O(N) cost to regular navigation requests - // unfortunately, but it is still limited to one window. It may not scale very well for windows with ten of - // thousands of item, but at least NavMoveRequest is only set on user interaction, aka maximum once a frame. - // We could early out with "if (is_clipped && !g.NavInitRequest) return false;" but when we wouldn't be able - // to reach unclipped widgets. This would work if user had explicit scrolling control (e.g. mapped on a stick). - // We intentionally don't check if g.NavWindow != NULL because g.NavAnyRequest should only be set when it is non null. - // If we crash on a NULL g.NavWindow we need to fix the bug elsewhere. - window->DC.NavLayerActiveMaskNext |= window->DC.NavLayerCurrentMask; - if (g.NavId == id || g.NavAnyRequest) - if (g.NavWindow->RootWindowForNav == window->RootWindowForNav) - if (window == g.NavWindow || ((window->Flags | g.NavWindow->Flags) & ImGuiWindowFlags_NavFlattened)) - NavProcessItem(window, nav_bb_arg ? *nav_bb_arg : bb, id); - - // [DEBUG] Item Picker tool, when enabling the "extended" version we perform the check in ItemAdd() -#ifdef IMGUI_DEBUG_TOOL_ITEM_PICKER_EX - if (id == g.DebugItemPickerBreakID) - { - IM_DEBUG_BREAK(); - g.DebugItemPickerBreakID = 0; - } -#endif - } - - window->DC.LastItemId = id; - window->DC.LastItemRect = bb; - window->DC.LastItemStatusFlags = ImGuiItemStatusFlags_None; - g.NextItemData.Flags = ImGuiNextItemDataFlags_None; - -#ifdef IMGUI_ENABLE_TEST_ENGINE - if (id != 0) - IMGUI_TEST_ENGINE_ITEM_ADD(nav_bb_arg ? *nav_bb_arg : bb, id); -#endif - - // Clipping test - const bool is_clipped = IsClippedEx(bb, id, false); - if (is_clipped) - return false; - //if (g.IO.KeyAlt) window->DrawList->AddRect(bb.Min, bb.Max, IM_COL32(255,255,0,120)); // [DEBUG] - - // We need to calculate this now to take account of the current clipping rectangle (as items like Selectable may change them) - if (IsMouseHoveringRect(bb.Min, bb.Max)) - window->DC.LastItemStatusFlags |= ImGuiItemStatusFlags_HoveredRect; - return true; -} - -// This is roughly matching the behavior of internal-facing ItemHoverable() -// - we allow hovering to be true when ActiveId==window->MoveID, so that clicking on non-interactive items such as a Text() item still returns true with IsItemHovered() -// - this should work even for non-interactive items that have no ID, so we cannot use LastItemId -bool ImGui::IsItemHovered(ImGuiHoveredFlags flags) -{ - ImGuiContext& g = *GImGui; - ImGuiWindow* window = g.CurrentWindow; - if (g.NavDisableMouseHover && !g.NavDisableHighlight) - return IsItemFocused(); - - // Test for bounding box overlap, as updated as ItemAdd() - if (!(window->DC.LastItemStatusFlags & ImGuiItemStatusFlags_HoveredRect)) - return false; - IM_ASSERT((flags & (ImGuiHoveredFlags_RootWindow | ImGuiHoveredFlags_ChildWindows)) == 0); // Flags not supported by this function - - // Test if we are hovering the right window (our window could be behind another window) - // [2017/10/16] Reverted commit 344d48be3 and testing RootWindow instead. I believe it is correct to NOT test for RootWindow but this leaves us unable to use IsItemHovered() after EndChild() itself. - // Until a solution is found I believe reverting to the test from 2017/09/27 is safe since this was the test that has been running for a long while. - //if (g.HoveredWindow != window) - // return false; - if (g.HoveredRootWindow != window->RootWindow && !(flags & ImGuiHoveredFlags_AllowWhenOverlapped)) - return false; - - // Test if another item is active (e.g. being dragged) - if (!(flags & ImGuiHoveredFlags_AllowWhenBlockedByActiveItem)) - if (g.ActiveId != 0 && g.ActiveId != window->DC.LastItemId && !g.ActiveIdAllowOverlap && g.ActiveId != window->MoveId) - return false; - - // Test if interactions on this window are blocked by an active popup or modal. - // The ImGuiHoveredFlags_AllowWhenBlockedByPopup flag will be tested here. - if (!IsWindowContentHoverable(window, flags)) - return false; - - // Test if the item is disabled - if ((window->DC.ItemFlags & ImGuiItemFlags_Disabled) && !(flags & ImGuiHoveredFlags_AllowWhenDisabled)) - return false; - - // Special handling for the dummy item after Begin() which represent the title bar or tab. - // When the window is collapsed (SkipItems==true) that last item will never be overwritten so we need to detect the case. - if (window->DC.LastItemId == window->MoveId && window->WriteAccessed) - return false; - return true; -} - -// Internal facing ItemHoverable() used when submitting widgets. Differs slightly from IsItemHovered(). -bool ImGui::ItemHoverable(const ImRect& bb, ImGuiID id) -{ - ImGuiContext& g = *GImGui; - if (g.HoveredId != 0 && g.HoveredId != id && !g.HoveredIdAllowOverlap) - return false; - - ImGuiWindow* window = g.CurrentWindow; - if (g.HoveredWindow != window) - return false; - if (g.ActiveId != 0 && g.ActiveId != id && !g.ActiveIdAllowOverlap) - return false; - if (!IsMouseHoveringRect(bb.Min, bb.Max)) - return false; - if (g.NavDisableMouseHover || !IsWindowContentHoverable(window, ImGuiHoveredFlags_None)) - return false; - if (window->DC.ItemFlags & ImGuiItemFlags_Disabled) - return false; - - SetHoveredID(id); - - // [DEBUG] Item Picker tool! - // We perform the check here because SetHoveredID() is not frequently called (1~ time a frame), making - // the cost of this tool near-zero. We can get slightly better call-stack and support picking non-hovered - // items if we perform the test in ItemAdd(), but that would incur a small runtime cost. - // #define IMGUI_DEBUG_TOOL_ITEM_PICKER_EX in imconfig.h if you want this check to also be performed in ItemAdd(). - if (g.DebugItemPickerActive && g.HoveredIdPreviousFrame == id) - GetForegroundDrawList()->AddRect(bb.Min, bb.Max, IM_COL32(255, 255, 0, 255)); - if (g.DebugItemPickerBreakID == id) - IM_DEBUG_BREAK(); - - return true; -} - -bool ImGui::IsClippedEx(const ImRect& bb, ImGuiID id, bool clip_even_when_logged) -{ - ImGuiContext& g = *GImGui; - ImGuiWindow* window = g.CurrentWindow; - if (!bb.Overlaps(window->ClipRect)) - if (id == 0 || id != g.ActiveId) - if (clip_even_when_logged || !g.LogEnabled) - return true; - return false; -} - -// Process TAB/Shift+TAB. Be mindful that this function may _clear_ the ActiveID when tabbing out. -bool ImGui::FocusableItemRegister(ImGuiWindow* window, ImGuiID id) -{ - ImGuiContext& g = *GImGui; - - // Increment counters - const bool is_tab_stop = (window->DC.ItemFlags & (ImGuiItemFlags_NoTabStop | ImGuiItemFlags_Disabled)) == 0; - window->DC.FocusCounterAll++; - if (is_tab_stop) - window->DC.FocusCounterTab++; - - // Process TAB/Shift-TAB to tab *OUT* of the currently focused item. - // (Note that we can always TAB out of a widget that doesn't allow tabbing in) - if (g.ActiveId == id && g.FocusTabPressed && !(g.ActiveIdBlockNavInputFlags & (1 << ImGuiNavInput_KeyTab_)) && g.FocusRequestNextWindow == NULL) - { - g.FocusRequestNextWindow = window; - g.FocusRequestNextCounterTab = window->DC.FocusCounterTab + (g.IO.KeyShift ? (is_tab_stop ? -1 : 0) : +1); // Modulo on index will be applied at the end of frame once we've got the total counter of items. - } - - // Handle focus requests - if (g.FocusRequestCurrWindow == window) - { - if (window->DC.FocusCounterAll == g.FocusRequestCurrCounterAll) - return true; - if (is_tab_stop && window->DC.FocusCounterTab == g.FocusRequestCurrCounterTab) - { - g.NavJustTabbedId = id; - return true; - } - - // If another item is about to be focused, we clear our own active id - if (g.ActiveId == id) - ClearActiveID(); - } - - return false; -} - -void ImGui::FocusableItemUnregister(ImGuiWindow* window) -{ - window->DC.FocusCounterAll--; - window->DC.FocusCounterTab--; -} - -float ImGui::CalcWrapWidthForPos(const ImVec2& pos, float wrap_pos_x) -{ - if (wrap_pos_x < 0.0f) - return 0.0f; - - ImGuiWindow* window = GImGui->CurrentWindow; - if (wrap_pos_x == 0.0f) - wrap_pos_x = window->WorkRect.Max.x; - else if (wrap_pos_x > 0.0f) - wrap_pos_x += window->Pos.x - window->Scroll.x; // wrap_pos_x is provided is window local space - - return ImMax(wrap_pos_x - pos.x, 1.0f); -} - -// IM_ALLOC() == ImGui::MemAlloc() -void* ImGui::MemAlloc(size_t size) -{ - if (ImGuiContext* ctx = GImGui) - ctx->IO.MetricsActiveAllocations++; - return GImAllocatorAllocFunc(size, GImAllocatorUserData); -} - -// IM_FREE() == ImGui::MemFree() -void ImGui::MemFree(void* ptr) -{ - if (ptr) - if (ImGuiContext* ctx = GImGui) - ctx->IO.MetricsActiveAllocations--; - return GImAllocatorFreeFunc(ptr, GImAllocatorUserData); -} - -const char* ImGui::GetClipboardText() -{ - ImGuiContext& g = *GImGui; - return g.IO.GetClipboardTextFn ? g.IO.GetClipboardTextFn(g.IO.ClipboardUserData) : ""; -} - -void ImGui::SetClipboardText(const char* text) -{ - ImGuiContext& g = *GImGui; - if (g.IO.SetClipboardTextFn) - g.IO.SetClipboardTextFn(g.IO.ClipboardUserData, text); -} - -const char* ImGui::GetVersion() -{ - return IMGUI_VERSION; -} - // Internal state access - if you want to share Dear ImGui state between modules (e.g. DLL) or allocate it yourself // Note that we still point to some static data and members (such as GFontAtlas), so the state instance you end up using will point to the static data within its module ImGuiContext* ImGui::GetCurrentContext() @@ -3251,67 +3923,1064 @@ void ImGui::SetCurrentContext(ImGuiContext* ctx) #endif } -// Helper function to verify ABI compatibility between caller code and compiled version of Dear ImGui. -// Verify that the type sizes are matching between the calling file's compilation unit and imgui.cpp's compilation unit -// If the user has inconsistent compilation settings, imgui configuration #define, packing pragma, etc. your user code -// may see different structures than what imgui.cpp sees, which is problematic. -// We usually require settings to be in imconfig.h to make sure that they are accessible to all compilation units involved with Dear ImGui. -bool ImGui::DebugCheckVersionAndDataLayout(const char* version, size_t sz_io, size_t sz_style, size_t sz_vec2, size_t sz_vec4, size_t sz_vert, size_t sz_idx) -{ - bool error = false; - if (strcmp(version, IMGUI_VERSION)!=0) { error = true; IM_ASSERT(strcmp(version,IMGUI_VERSION)==0 && "Mismatched version string!"); } - if (sz_io != sizeof(ImGuiIO)) { error = true; IM_ASSERT(sz_io == sizeof(ImGuiIO) && "Mismatched struct layout!"); } - if (sz_style != sizeof(ImGuiStyle)) { error = true; IM_ASSERT(sz_style == sizeof(ImGuiStyle) && "Mismatched struct layout!"); } - if (sz_vec2 != sizeof(ImVec2)) { error = true; IM_ASSERT(sz_vec2 == sizeof(ImVec2) && "Mismatched struct layout!"); } - if (sz_vec4 != sizeof(ImVec4)) { error = true; IM_ASSERT(sz_vec4 == sizeof(ImVec4) && "Mismatched struct layout!"); } - if (sz_vert != sizeof(ImDrawVert)) { error = true; IM_ASSERT(sz_vert == sizeof(ImDrawVert) && "Mismatched struct layout!"); } - if (sz_idx != sizeof(ImDrawIdx)) { error = true; IM_ASSERT(sz_idx == sizeof(ImDrawIdx) && "Mismatched struct layout!"); } - return !error; -} - -void ImGui::SetAllocatorFunctions(void* (*alloc_func)(size_t sz, void* user_data), void (*free_func)(void* ptr, void* user_data), void* user_data) +void ImGui::SetAllocatorFunctions(ImGuiMemAllocFunc alloc_func, ImGuiMemFreeFunc free_func, void* user_data) { GImAllocatorAllocFunc = alloc_func; GImAllocatorFreeFunc = free_func; GImAllocatorUserData = user_data; } +// This is provided to facilitate copying allocators from one static/DLL boundary to another (e.g. retrieve default allocator of your executable address space) +void ImGui::GetAllocatorFunctions(ImGuiMemAllocFunc* p_alloc_func, ImGuiMemFreeFunc* p_free_func, void** p_user_data) +{ + *p_alloc_func = GImAllocatorAllocFunc; + *p_free_func = GImAllocatorFreeFunc; + *p_user_data = GImAllocatorUserData; +} + ImGuiContext* ImGui::CreateContext(ImFontAtlas* shared_font_atlas) { + ImGuiContext* prev_ctx = GetCurrentContext(); ImGuiContext* ctx = IM_NEW(ImGuiContext)(shared_font_atlas); - if (GImGui == NULL) - SetCurrentContext(ctx); - Initialize(ctx); + SetCurrentContext(ctx); + Initialize(); + if (prev_ctx != NULL) + SetCurrentContext(prev_ctx); // Restore previous context if any, else keep new one. return ctx; } void ImGui::DestroyContext(ImGuiContext* ctx) { - if (ctx == NULL) - ctx = GImGui; - Shutdown(ctx); - if (GImGui == ctx) - SetCurrentContext(NULL); + ImGuiContext* prev_ctx = GetCurrentContext(); + if (ctx == NULL) //-V1051 + ctx = prev_ctx; + SetCurrentContext(ctx); + Shutdown(); + SetCurrentContext((prev_ctx != ctx) ? prev_ctx : NULL); IM_DELETE(ctx); } +// IMPORTANT: interactive elements requires a fixed ###xxx suffix, it must be same in ALL languages to allow for automation. +static const ImGuiLocEntry GLocalizationEntriesEnUS[] = +{ + { ImGuiLocKey_VersionStr, "Dear ImGui " IMGUI_VERSION " (" IM_STRINGIFY(IMGUI_VERSION_NUM) ")" }, + { ImGuiLocKey_TableSizeOne, "Size column to fit###SizeOne" }, + { ImGuiLocKey_TableSizeAllFit, "Size all columns to fit###SizeAll" }, + { ImGuiLocKey_TableSizeAllDefault, "Size all columns to default###SizeAll" }, + { ImGuiLocKey_TableResetOrder, "Reset order###ResetOrder" }, + { ImGuiLocKey_WindowingMainMenuBar, "(Main menu bar)" }, + { ImGuiLocKey_WindowingPopup, "(Popup)" }, + { ImGuiLocKey_WindowingUntitled, "(Untitled)" }, + { ImGuiLocKey_OpenLink_s, "Open '%s'" }, + { ImGuiLocKey_CopyLink, "Copy Link###CopyLink" }, + { ImGuiLocKey_DockingHideTabBar, "Hide tab bar###HideTabBar" }, + { ImGuiLocKey_DockingHoldShiftToDock, "Hold SHIFT to enable Docking window." }, + { ImGuiLocKey_DockingDragToUndockOrMoveNode,"Click and drag to move or undock whole node." }, +}; + +ImGuiContext::ImGuiContext(ImFontAtlas* shared_font_atlas) +{ + IO.Ctx = this; + InputTextState.Ctx = this; + + Initialized = false; + ConfigFlagsCurrFrame = ConfigFlagsLastFrame = ImGuiConfigFlags_None; + FontAtlasOwnedByContext = shared_font_atlas ? false : true; + Font = NULL; + FontSize = FontBaseSize = FontScale = CurrentDpiScale = 0.0f; + IO.Fonts = shared_font_atlas ? shared_font_atlas : IM_NEW(ImFontAtlas)(); + Time = 0.0f; + FrameCount = 0; + FrameCountEnded = FrameCountPlatformEnded = FrameCountRendered = -1; + WithinEndChildID = 0; + WithinFrameScope = WithinFrameScopeWithImplicitWindow = false; + GcCompactAll = false; + TestEngineHookItems = false; + TestEngine = NULL; + memset(ContextName, 0, sizeof(ContextName)); + + InputEventsNextMouseSource = ImGuiMouseSource_Mouse; + InputEventsNextEventId = 1; + + WindowsActiveCount = 0; + WindowsBorderHoverPadding = 0.0f; + CurrentWindow = NULL; + HoveredWindow = NULL; + HoveredWindowUnderMovingWindow = NULL; + HoveredWindowBeforeClear = NULL; + MovingWindow = NULL; + WheelingWindow = NULL; + WheelingWindowStartFrame = WheelingWindowScrolledFrame = -1; + WheelingWindowReleaseTimer = 0.0f; + + DebugDrawIdConflicts = 0; + DebugHookIdInfo = 0; + HoveredId = HoveredIdPreviousFrame = 0; + HoveredIdPreviousFrameItemCount = 0; + HoveredIdAllowOverlap = false; + HoveredIdIsDisabled = false; + HoveredIdTimer = HoveredIdNotActiveTimer = 0.0f; + ItemUnclipByLog = false; + ActiveId = 0; + ActiveIdIsAlive = 0; + ActiveIdTimer = 0.0f; + ActiveIdIsJustActivated = false; + ActiveIdAllowOverlap = false; + ActiveIdNoClearOnFocusLoss = false; + ActiveIdHasBeenPressedBefore = false; + ActiveIdHasBeenEditedBefore = false; + ActiveIdHasBeenEditedThisFrame = false; + ActiveIdFromShortcut = false; + ActiveIdClickOffset = ImVec2(-1, -1); + ActiveIdWindow = NULL; + ActiveIdSource = ImGuiInputSource_None; + ActiveIdMouseButton = -1; + ActiveIdPreviousFrame = 0; + memset(&DeactivatedItemData, 0, sizeof(DeactivatedItemData)); + memset(&ActiveIdValueOnActivation, 0, sizeof(ActiveIdValueOnActivation)); + LastActiveId = 0; + LastActiveIdTimer = 0.0f; + + LastKeyboardKeyPressTime = LastKeyModsChangeTime = LastKeyModsChangeFromNoneTime = -1.0; + + ActiveIdUsingNavDirMask = 0x00; + ActiveIdUsingAllKeyboardKeys = false; + + CurrentFocusScopeId = 0; + CurrentItemFlags = ImGuiItemFlags_None; + DebugShowGroupRects = false; + + CurrentViewport = NULL; + MouseViewport = MouseLastHoveredViewport = NULL; + PlatformLastFocusedViewportId = 0; + ViewportCreatedCount = PlatformWindowsCreatedCount = 0; + ViewportFocusedStampCount = 0; + + NavCursorVisible = false; + NavHighlightItemUnderNav = false; + NavMousePosDirty = false; + NavIdIsAlive = false; + NavId = 0; + NavWindow = NULL; + NavFocusScopeId = NavActivateId = NavActivateDownId = NavActivatePressedId = 0; + NavLayer = ImGuiNavLayer_Main; + NavNextActivateId = 0; + NavActivateFlags = NavNextActivateFlags = ImGuiActivateFlags_None; + NavHighlightActivatedId = 0; + NavHighlightActivatedTimer = 0.0f; + NavInputSource = ImGuiInputSource_Keyboard; + NavLastValidSelectionUserData = ImGuiSelectionUserData_Invalid; + NavCursorHideFrames = 0; + + NavAnyRequest = false; + NavInitRequest = false; + NavInitRequestFromMove = false; + NavMoveSubmitted = false; + NavMoveScoringItems = false; + NavMoveForwardToNextFrame = false; + NavMoveFlags = ImGuiNavMoveFlags_None; + NavMoveScrollFlags = ImGuiScrollFlags_None; + NavMoveKeyMods = ImGuiMod_None; + NavMoveDir = NavMoveDirForDebug = NavMoveClipDir = ImGuiDir_None; + NavScoringDebugCount = 0; + NavTabbingDir = 0; + NavTabbingCounter = 0; + + NavJustMovedFromFocusScopeId = NavJustMovedToId = NavJustMovedToFocusScopeId = 0; + NavJustMovedToKeyMods = ImGuiMod_None; + NavJustMovedToIsTabbing = false; + NavJustMovedToHasSelectionData = false; + + // All platforms use Ctrl+Tab but Ctrl<>Super are swapped on Mac... + // FIXME: Because this value is stored, it annoyingly interfere with toggling io.ConfigMacOSXBehaviors updating this.. + ConfigNavWindowingKeyNext = IO.ConfigMacOSXBehaviors ? (ImGuiMod_Super | ImGuiKey_Tab) : (ImGuiMod_Ctrl | ImGuiKey_Tab); + ConfigNavWindowingKeyPrev = IO.ConfigMacOSXBehaviors ? (ImGuiMod_Super | ImGuiMod_Shift | ImGuiKey_Tab) : (ImGuiMod_Ctrl | ImGuiMod_Shift | ImGuiKey_Tab); + NavWindowingTarget = NavWindowingTargetAnim = NavWindowingListWindow = NULL; + NavWindowingTimer = NavWindowingHighlightAlpha = 0.0f; + NavWindowingToggleLayer = false; + NavWindowingToggleKey = ImGuiKey_None; + + DimBgRatio = 0.0f; + + DragDropActive = DragDropWithinSource = DragDropWithinTarget = false; + DragDropSourceFlags = ImGuiDragDropFlags_None; + DragDropSourceFrameCount = -1; + DragDropMouseButton = -1; + DragDropTargetId = 0; + DragDropAcceptFlags = ImGuiDragDropFlags_None; + DragDropAcceptIdCurrRectSurface = 0.0f; + DragDropAcceptIdPrev = DragDropAcceptIdCurr = 0; + DragDropAcceptFrameCount = -1; + DragDropHoldJustPressedId = 0; + memset(DragDropPayloadBufLocal, 0, sizeof(DragDropPayloadBufLocal)); + + ClipperTempDataStacked = 0; + + CurrentTable = NULL; + TablesTempDataStacked = 0; + CurrentTabBar = NULL; + CurrentMultiSelect = NULL; + MultiSelectTempDataStacked = 0; + + HoverItemDelayId = HoverItemDelayIdPreviousFrame = HoverItemUnlockedStationaryId = HoverWindowUnlockedStationaryId = 0; + HoverItemDelayTimer = HoverItemDelayClearTimer = 0.0f; + + MouseCursor = ImGuiMouseCursor_Arrow; + MouseStationaryTimer = 0.0f; + + TempInputId = 0; + memset(&DataTypeZeroValue, 0, sizeof(DataTypeZeroValue)); + BeginMenuDepth = BeginComboDepth = 0; + ColorEditOptions = ImGuiColorEditFlags_DefaultOptions_; + ColorEditCurrentID = ColorEditSavedID = 0; + ColorEditSavedHue = ColorEditSavedSat = 0.0f; + ColorEditSavedColor = 0; + WindowResizeRelativeMode = false; + ScrollbarSeekMode = 0; + ScrollbarClickDeltaToGrabCenter = 0.0f; + SliderGrabClickOffset = 0.0f; + SliderCurrentAccum = 0.0f; + SliderCurrentAccumDirty = false; + DragCurrentAccumDirty = false; + DragCurrentAccum = 0.0f; + DragSpeedDefaultRatio = 1.0f / 100.0f; + DisabledAlphaBackup = 0.0f; + DisabledStackSize = 0; + TooltipOverrideCount = 0; + TooltipPreviousWindow = NULL; + + PlatformImeData.InputPos = ImVec2(0.0f, 0.0f); + PlatformImeDataPrev.InputPos = ImVec2(-1.0f, -1.0f); // Different to ensure initial submission + PlatformImeViewport = 0; + + DockNodeWindowMenuHandler = NULL; + + SettingsLoaded = false; + SettingsDirtyTimer = 0.0f; + HookIdNext = 0; + + memset(LocalizationTable, 0, sizeof(LocalizationTable)); + + LogEnabled = false; + LogFlags = ImGuiLogFlags_None; + LogWindow = NULL; + LogNextPrefix = LogNextSuffix = NULL; + LogFile = NULL; + LogLinePosY = FLT_MAX; + LogLineFirstItem = false; + LogDepthRef = 0; + LogDepthToExpand = LogDepthToExpandDefault = 2; + + ErrorCallback = NULL; + ErrorCallbackUserData = NULL; + ErrorFirst = true; + ErrorCountCurrentFrame = 0; + StackSizesInBeginForCurrentWindow = NULL; + + DebugDrawIdConflictsCount = 0; + DebugLogFlags = ImGuiDebugLogFlags_EventError | ImGuiDebugLogFlags_OutputToTTY; + DebugLocateId = 0; + DebugLogSkippedErrors = 0; + DebugLogAutoDisableFlags = ImGuiDebugLogFlags_None; + DebugLogAutoDisableFrames = 0; + DebugLocateFrames = 0; + DebugBeginReturnValueCullDepth = -1; + DebugItemPickerActive = false; + DebugItemPickerMouseButton = ImGuiMouseButton_Left; + DebugItemPickerBreakId = 0; + DebugFlashStyleColorTime = 0.0f; + DebugFlashStyleColorIdx = ImGuiCol_COUNT; + DebugHoveredDockNode = NULL; + + // Same as DebugBreakClearData(). Those fields are scattered in their respective subsystem to stay in hot-data locations + DebugBreakInWindow = 0; + DebugBreakInTable = 0; + DebugBreakInLocateId = false; + DebugBreakKeyChord = ImGuiKey_Pause; + DebugBreakInShortcutRouting = ImGuiKey_None; + + memset(FramerateSecPerFrame, 0, sizeof(FramerateSecPerFrame)); + FramerateSecPerFrameIdx = FramerateSecPerFrameCount = 0; + FramerateSecPerFrameAccum = 0.0f; + WantCaptureMouseNextFrame = WantCaptureKeyboardNextFrame = WantTextInputNextFrame = -1; + memset(TempKeychordName, 0, sizeof(TempKeychordName)); +} + +void ImGui::Initialize() +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(!g.Initialized && !g.SettingsLoaded); + + // Add .ini handle for ImGuiWindow and ImGuiTable types + { + ImGuiSettingsHandler ini_handler; + ini_handler.TypeName = "Window"; + ini_handler.TypeHash = ImHashStr("Window"); + ini_handler.ClearAllFn = WindowSettingsHandler_ClearAll; + ini_handler.ReadOpenFn = WindowSettingsHandler_ReadOpen; + ini_handler.ReadLineFn = WindowSettingsHandler_ReadLine; + ini_handler.ApplyAllFn = WindowSettingsHandler_ApplyAll; + ini_handler.WriteAllFn = WindowSettingsHandler_WriteAll; + AddSettingsHandler(&ini_handler); + } + TableSettingsAddSettingsHandler(); + + // Setup default localization table + LocalizeRegisterEntries(GLocalizationEntriesEnUS, IM_ARRAYSIZE(GLocalizationEntriesEnUS)); + + // Setup default ImGuiPlatformIO clipboard/IME handlers. + g.PlatformIO.Platform_GetClipboardTextFn = Platform_GetClipboardTextFn_DefaultImpl; // Platform dependent default implementations + g.PlatformIO.Platform_SetClipboardTextFn = Platform_SetClipboardTextFn_DefaultImpl; + g.PlatformIO.Platform_OpenInShellFn = Platform_OpenInShellFn_DefaultImpl; + g.PlatformIO.Platform_SetImeDataFn = Platform_SetImeDataFn_DefaultImpl; + + // Create default viewport + ImGuiViewportP* viewport = IM_NEW(ImGuiViewportP)(); + viewport->ID = IMGUI_VIEWPORT_DEFAULT_ID; + viewport->Idx = 0; + viewport->PlatformWindowCreated = true; + viewport->Flags = ImGuiViewportFlags_OwnedByApp; + g.Viewports.push_back(viewport); + g.TempBuffer.resize(1024 * 3 + 1, 0); + g.ViewportCreatedCount++; + g.PlatformIO.Viewports.push_back(g.Viewports[0]); + + // Build KeysMayBeCharInput[] lookup table (1 bool per named key) + for (ImGuiKey key = ImGuiKey_NamedKey_BEGIN; key < ImGuiKey_NamedKey_END; key = (ImGuiKey)(key + 1)) + if ((key >= ImGuiKey_0 && key <= ImGuiKey_9) || (key >= ImGuiKey_A && key <= ImGuiKey_Z) || (key >= ImGuiKey_Keypad0 && key <= ImGuiKey_Keypad9) + || key == ImGuiKey_Tab || key == ImGuiKey_Space || key == ImGuiKey_Apostrophe || key == ImGuiKey_Comma || key == ImGuiKey_Minus || key == ImGuiKey_Period + || key == ImGuiKey_Slash || key == ImGuiKey_Semicolon || key == ImGuiKey_Equal || key == ImGuiKey_LeftBracket || key == ImGuiKey_RightBracket || key == ImGuiKey_GraveAccent + || key == ImGuiKey_KeypadDecimal || key == ImGuiKey_KeypadDivide || key == ImGuiKey_KeypadMultiply || key == ImGuiKey_KeypadSubtract || key == ImGuiKey_KeypadAdd || key == ImGuiKey_KeypadEqual) + g.KeysMayBeCharInput.SetBit(key); + +#ifdef IMGUI_HAS_DOCK + // Initialize Docking + DockContextInitialize(&g); +#endif + + g.Initialized = true; +} + +// This function is merely here to free heap allocations. +void ImGui::Shutdown() +{ + ImGuiContext& g = *GImGui; + IM_ASSERT_USER_ERROR(g.IO.BackendPlatformUserData == NULL, "Forgot to shutdown Platform backend?"); + IM_ASSERT_USER_ERROR(g.IO.BackendRendererUserData == NULL, "Forgot to shutdown Renderer backend?"); + + // The fonts atlas can be used prior to calling NewFrame(), so we clear it even if g.Initialized is FALSE (which would happen if we never called NewFrame) + if (g.IO.Fonts && g.FontAtlasOwnedByContext) + { + g.IO.Fonts->Locked = false; + IM_DELETE(g.IO.Fonts); + } + g.IO.Fonts = NULL; + g.DrawListSharedData.TempBuffer.clear(); + + // Cleanup of other data are conditional on actually having initialized Dear ImGui. + if (!g.Initialized) + return; + + // Save settings (unless we haven't attempted to load them: CreateContext/DestroyContext without a call to NewFrame shouldn't save an empty file) + if (g.SettingsLoaded && g.IO.IniFilename != NULL) + SaveIniSettingsToDisk(g.IO.IniFilename); + + // Destroy platform windows + DestroyPlatformWindows(); + + // Shutdown extensions + DockContextShutdown(&g); + + CallContextHooks(&g, ImGuiContextHookType_Shutdown); + + // Clear everything else + g.Windows.clear_delete(); + g.WindowsFocusOrder.clear(); + g.WindowsTempSortBuffer.clear(); + g.CurrentWindow = NULL; + g.CurrentWindowStack.clear(); + g.WindowsById.Clear(); + g.NavWindow = NULL; + g.HoveredWindow = g.HoveredWindowUnderMovingWindow = NULL; + g.ActiveIdWindow = NULL; + g.MovingWindow = NULL; + + g.KeysRoutingTable.Clear(); + + g.ColorStack.clear(); + g.StyleVarStack.clear(); + g.FontStack.clear(); + g.OpenPopupStack.clear(); + g.BeginPopupStack.clear(); + g.TreeNodeStack.clear(); + + g.CurrentViewport = g.MouseViewport = g.MouseLastHoveredViewport = NULL; + g.Viewports.clear_delete(); + + g.TabBars.Clear(); + g.CurrentTabBarStack.clear(); + g.ShrinkWidthBuffer.clear(); + + g.ClipperTempData.clear_destruct(); + + g.Tables.Clear(); + g.TablesTempData.clear_destruct(); + g.DrawChannelsTempMergeBuffer.clear(); + + g.MultiSelectStorage.Clear(); + g.MultiSelectTempData.clear_destruct(); + + g.ClipboardHandlerData.clear(); + g.MenusIdSubmittedThisFrame.clear(); + g.InputTextState.ClearFreeMemory(); + g.InputTextDeactivatedState.ClearFreeMemory(); + + g.SettingsWindows.clear(); + g.SettingsHandlers.clear(); + + if (g.LogFile) + { +#ifndef IMGUI_DISABLE_TTY_FUNCTIONS + if (g.LogFile != stdout) +#endif + ImFileClose(g.LogFile); + g.LogFile = NULL; + } + g.LogBuffer.clear(); + g.DebugLogBuf.clear(); + g.DebugLogIndex.clear(); + + g.Initialized = false; +} + +// No specific ordering/dependency support, will see as needed +ImGuiID ImGui::AddContextHook(ImGuiContext* ctx, const ImGuiContextHook* hook) +{ + ImGuiContext& g = *ctx; + IM_ASSERT(hook->Callback != NULL && hook->HookId == 0 && hook->Type != ImGuiContextHookType_PendingRemoval_); + g.Hooks.push_back(*hook); + g.Hooks.back().HookId = ++g.HookIdNext; + return g.HookIdNext; +} + +// Deferred removal, avoiding issue with changing vector while iterating it +void ImGui::RemoveContextHook(ImGuiContext* ctx, ImGuiID hook_id) +{ + ImGuiContext& g = *ctx; + IM_ASSERT(hook_id != 0); + for (ImGuiContextHook& hook : g.Hooks) + if (hook.HookId == hook_id) + hook.Type = ImGuiContextHookType_PendingRemoval_; +} + +// Call context hooks (used by e.g. test engine) +// We assume a small number of hooks so all stored in same array +void ImGui::CallContextHooks(ImGuiContext* ctx, ImGuiContextHookType hook_type) +{ + ImGuiContext& g = *ctx; + for (ImGuiContextHook& hook : g.Hooks) + if (hook.Type == hook_type) + hook.Callback(&g, &hook); +} + +//----------------------------------------------------------------------------- +// [SECTION] MAIN CODE (most of the code! lots of stuff, needs tidying up!) +//----------------------------------------------------------------------------- + +// ImGuiWindow is mostly a dumb struct. It merely has a constructor and a few helper methods +ImGuiWindow::ImGuiWindow(ImGuiContext* ctx, const char* name) : DrawListInst(NULL) +{ + memset(this, 0, sizeof(*this)); + Ctx = ctx; + Name = ImStrdup(name); + NameBufLen = (int)ImStrlen(name) + 1; + ID = ImHashStr(name); + IDStack.push_back(ID); + ViewportAllowPlatformMonitorExtend = -1; + ViewportPos = ImVec2(FLT_MAX, FLT_MAX); + MoveId = GetID("#MOVE"); + TabId = GetID("#TAB"); + ScrollTarget = ImVec2(FLT_MAX, FLT_MAX); + ScrollTargetCenterRatio = ImVec2(0.5f, 0.5f); + AutoFitFramesX = AutoFitFramesY = -1; + AutoPosLastDirection = ImGuiDir_None; + SetWindowPosAllowFlags = SetWindowSizeAllowFlags = SetWindowCollapsedAllowFlags = SetWindowDockAllowFlags = 0; + SetWindowPosVal = SetWindowPosPivot = ImVec2(FLT_MAX, FLT_MAX); + LastFrameActive = -1; + LastFrameJustFocused = -1; + LastTimeActive = -1.0f; + FontRefSize = 0.0f; + FontWindowScale = FontWindowScaleParents = FontDpiScale = 1.0f; + SettingsOffset = -1; + DockOrder = -1; + DrawList = &DrawListInst; + DrawList->_OwnerName = Name; + DrawList->_Data = &Ctx->DrawListSharedData; + NavPreferredScoringPosRel[0] = NavPreferredScoringPosRel[1] = ImVec2(FLT_MAX, FLT_MAX); + IM_PLACEMENT_NEW(&WindowClass) ImGuiWindowClass(); +} + +ImGuiWindow::~ImGuiWindow() +{ + IM_ASSERT(DrawList == &DrawListInst); + IM_DELETE(Name); + ColumnsStorage.clear_destruct(); +} + +static void SetCurrentWindow(ImGuiWindow* window) +{ + ImGuiContext& g = *GImGui; + g.CurrentWindow = window; + g.StackSizesInBeginForCurrentWindow = g.CurrentWindow ? &g.CurrentWindowStack.back().StackSizesInBegin : NULL; + g.CurrentTable = window && window->DC.CurrentTableIdx != -1 ? g.Tables.GetByIndex(window->DC.CurrentTableIdx) : NULL; + if (window) + { + g.FontSize = g.DrawListSharedData.FontSize = window->CalcFontSize(); + g.FontScale = g.DrawListSharedData.FontScale = g.FontSize / g.Font->FontSize; + ImGui::NavUpdateCurrentWindowIsScrollPushableX(); + } +} + +void ImGui::GcCompactTransientMiscBuffers() +{ + ImGuiContext& g = *GImGui; + g.ItemFlagsStack.clear(); + g.GroupStack.clear(); + g.MultiSelectTempDataStacked = 0; + g.MultiSelectTempData.clear_destruct(); + TableGcCompactSettings(); +} + +// Free up/compact internal window buffers, we can use this when a window becomes unused. +// Not freed: +// - ImGuiWindow, ImGuiWindowSettings, Name, StateStorage, ColumnsStorage (may hold useful data) +// This should have no noticeable visual effect. When the window reappear however, expect new allocation/buffer growth/copy cost. +void ImGui::GcCompactTransientWindowBuffers(ImGuiWindow* window) +{ + window->MemoryCompacted = true; + window->MemoryDrawListIdxCapacity = window->DrawList->IdxBuffer.Capacity; + window->MemoryDrawListVtxCapacity = window->DrawList->VtxBuffer.Capacity; + window->IDStack.clear(); + window->DrawList->_ClearFreeMemory(); + window->DC.ChildWindows.clear(); + window->DC.ItemWidthStack.clear(); + window->DC.TextWrapPosStack.clear(); +} + +void ImGui::GcAwakeTransientWindowBuffers(ImGuiWindow* window) +{ + // We stored capacity of the ImDrawList buffer to reduce growth-caused allocation/copy when awakening. + // The other buffers tends to amortize much faster. + window->MemoryCompacted = false; + window->DrawList->IdxBuffer.reserve(window->MemoryDrawListIdxCapacity); + window->DrawList->VtxBuffer.reserve(window->MemoryDrawListVtxCapacity); + window->MemoryDrawListIdxCapacity = window->MemoryDrawListVtxCapacity = 0; +} + +void ImGui::SetActiveID(ImGuiID id, ImGuiWindow* window) +{ + ImGuiContext& g = *GImGui; + + // Clear previous active id + if (g.ActiveId != 0) + { + // While most behaved code would make an effort to not steal active id during window move/drag operations, + // we at least need to be resilient to it. Canceling the move is rather aggressive and users of 'master' branch + // may prefer the weird ill-defined half working situation ('docking' did assert), so may need to rework that. + if (g.MovingWindow != NULL && g.ActiveId == g.MovingWindow->MoveId) + { + IMGUI_DEBUG_LOG_ACTIVEID("SetActiveID() cancel MovingWindow\n"); + g.MovingWindow = NULL; + } + + // Store deactivate data + ImGuiDeactivatedItemData* deactivated_data = &g.DeactivatedItemData; + deactivated_data->ID = g.ActiveId; + deactivated_data->ElapseFrame = (g.LastItemData.ID == g.ActiveId) ? g.FrameCount : g.FrameCount + 1; // FIXME: OK to use LastItemData? + deactivated_data->HasBeenEditedBefore = g.ActiveIdHasBeenEditedBefore; + deactivated_data->IsAlive = (g.ActiveIdIsAlive == g.ActiveId); + + // This could be written in a more general way (e.g associate a hook to ActiveId), + // but since this is currently quite an exception we'll leave it as is. + // One common scenario leading to this is: pressing Key ->NavMoveRequestApplyResult() -> ClearActiveID() + if (g.InputTextState.ID == g.ActiveId) + InputTextDeactivateHook(g.ActiveId); + } + + // Set active id + g.ActiveIdIsJustActivated = (g.ActiveId != id); + if (g.ActiveIdIsJustActivated) + { + IMGUI_DEBUG_LOG_ACTIVEID("SetActiveID() old:0x%08X (window \"%s\") -> new:0x%08X (window \"%s\")\n", g.ActiveId, g.ActiveIdWindow ? g.ActiveIdWindow->Name : "", id, window ? window->Name : ""); + g.ActiveIdTimer = 0.0f; + g.ActiveIdHasBeenPressedBefore = false; + g.ActiveIdHasBeenEditedBefore = false; + g.ActiveIdMouseButton = -1; + if (id != 0) + { + g.LastActiveId = id; + g.LastActiveIdTimer = 0.0f; + } + } + g.ActiveId = id; + g.ActiveIdAllowOverlap = false; + g.ActiveIdNoClearOnFocusLoss = false; + g.ActiveIdWindow = window; + g.ActiveIdHasBeenEditedThisFrame = false; + g.ActiveIdFromShortcut = false; + if (id) + { + g.ActiveIdIsAlive = id; + g.ActiveIdSource = (g.NavActivateId == id || g.NavJustMovedToId == id) ? g.NavInputSource : ImGuiInputSource_Mouse; + IM_ASSERT(g.ActiveIdSource != ImGuiInputSource_None); + } + + // Clear declaration of inputs claimed by the widget + // (Please note that this is WIP and not all keys/inputs are thoroughly declared by all widgets yet) + g.ActiveIdUsingNavDirMask = 0x00; + g.ActiveIdUsingAllKeyboardKeys = false; +} + +void ImGui::ClearActiveID() +{ + SetActiveID(0, NULL); // g.ActiveId = 0; +} + +void ImGui::SetHoveredID(ImGuiID id) +{ + ImGuiContext& g = *GImGui; + g.HoveredId = id; + g.HoveredIdAllowOverlap = false; + if (id != 0 && g.HoveredIdPreviousFrame != id) + g.HoveredIdTimer = g.HoveredIdNotActiveTimer = 0.0f; +} + +ImGuiID ImGui::GetHoveredID() +{ + ImGuiContext& g = *GImGui; + return g.HoveredId ? g.HoveredId : g.HoveredIdPreviousFrame; +} + +void ImGui::MarkItemEdited(ImGuiID id) +{ + // This marking is to be able to provide info for IsItemDeactivatedAfterEdit(). + // ActiveId might have been released by the time we call this (as in the typical press/release button behavior) but still need to fill the data. + ImGuiContext& g = *GImGui; + if (g.LastItemData.ItemFlags & ImGuiItemFlags_NoMarkEdited) + return; + if (g.ActiveId == id || g.ActiveId == 0) + { + // FIXME: Can't we fully rely on LastItemData yet? + g.ActiveIdHasBeenEditedThisFrame = true; + g.ActiveIdHasBeenEditedBefore = true; + if (g.DeactivatedItemData.ID == id) + g.DeactivatedItemData.HasBeenEditedBefore = true; + } + + // We accept a MarkItemEdited() on drag and drop targets (see https://github.com/ocornut/imgui/issues/1875#issuecomment-978243343) + // We accept 'ActiveIdPreviousFrame == id' for InputText() returning an edit after it has been taken ActiveId away (#4714) + IM_ASSERT(g.DragDropActive || g.ActiveId == id || g.ActiveId == 0 || g.ActiveIdPreviousFrame == id || (g.CurrentMultiSelect != NULL && g.BoxSelectState.IsActive)); + + //IM_ASSERT(g.CurrentWindow->DC.LastItemId == id); + g.LastItemData.StatusFlags |= ImGuiItemStatusFlags_Edited; +} + +bool ImGui::IsWindowContentHoverable(ImGuiWindow* window, ImGuiHoveredFlags flags) +{ + // An active popup disable hovering on other windows (apart from its own children) + // FIXME-OPT: This could be cached/stored within the window. + ImGuiContext& g = *GImGui; + if (g.NavWindow) + if (ImGuiWindow* focused_root_window = g.NavWindow->RootWindowDockTree) + if (focused_root_window->WasActive && focused_root_window != window->RootWindowDockTree) + { + // For the purpose of those flags we differentiate "standard popup" from "modal popup" + // NB: The 'else' is important because Modal windows are also Popups. + bool want_inhibit = false; + if (focused_root_window->Flags & ImGuiWindowFlags_Modal) + want_inhibit = true; + else if ((focused_root_window->Flags & ImGuiWindowFlags_Popup) && !(flags & ImGuiHoveredFlags_AllowWhenBlockedByPopup)) + want_inhibit = true; + + // Inhibit hover unless the window is within the stack of our modal/popup + if (want_inhibit) + if (!IsWindowWithinBeginStackOf(window->RootWindow, focused_root_window)) + return false; + } + + // Filter by viewport + if (window->Viewport != g.MouseViewport) + if (g.MovingWindow == NULL || window->RootWindowDockTree != g.MovingWindow->RootWindowDockTree) + return false; + + return true; +} + +static inline float CalcDelayFromHoveredFlags(ImGuiHoveredFlags flags) +{ + ImGuiContext& g = *GImGui; + if (flags & ImGuiHoveredFlags_DelayNormal) + return g.Style.HoverDelayNormal; + if (flags & ImGuiHoveredFlags_DelayShort) + return g.Style.HoverDelayShort; + return 0.0f; +} + +static ImGuiHoveredFlags ApplyHoverFlagsForTooltip(ImGuiHoveredFlags user_flags, ImGuiHoveredFlags shared_flags) +{ + // Allow instance flags to override shared flags + if (user_flags & (ImGuiHoveredFlags_DelayNone | ImGuiHoveredFlags_DelayShort | ImGuiHoveredFlags_DelayNormal)) + shared_flags &= ~(ImGuiHoveredFlags_DelayNone | ImGuiHoveredFlags_DelayShort | ImGuiHoveredFlags_DelayNormal); + return user_flags | shared_flags; +} + +// This is roughly matching the behavior of internal-facing ItemHoverable() +// - we allow hovering to be true when ActiveId==window->MoveID, so that clicking on non-interactive items such as a Text() item still returns true with IsItemHovered() +// - this should work even for non-interactive items that have no ID, so we cannot use LastItemId +bool ImGui::IsItemHovered(ImGuiHoveredFlags flags) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + IM_ASSERT_USER_ERROR((flags & ~ImGuiHoveredFlags_AllowedMaskForIsItemHovered) == 0, "Invalid flags for IsItemHovered()!"); + + if (g.NavHighlightItemUnderNav && g.NavCursorVisible && !(flags & ImGuiHoveredFlags_NoNavOverride)) + { + if (!IsItemFocused()) + return false; + if ((g.LastItemData.ItemFlags & ImGuiItemFlags_Disabled) && !(flags & ImGuiHoveredFlags_AllowWhenDisabled)) + return false; + + if (flags & ImGuiHoveredFlags_ForTooltip) + flags = ApplyHoverFlagsForTooltip(flags, g.Style.HoverFlagsForTooltipNav); + } + else + { + // Test for bounding box overlap, as updated as ItemAdd() + ImGuiItemStatusFlags status_flags = g.LastItemData.StatusFlags; + if (!(status_flags & ImGuiItemStatusFlags_HoveredRect)) + return false; + + if (flags & ImGuiHoveredFlags_ForTooltip) + flags = ApplyHoverFlagsForTooltip(flags, g.Style.HoverFlagsForTooltipMouse); + + // Done with rectangle culling so we can perform heavier checks now + // Test if we are hovering the right window (our window could be behind another window) + // [2021/03/02] Reworked / reverted the revert, finally. Note we want e.g. BeginGroup/ItemAdd/EndGroup to work as well. (#3851) + // [2017/10/16] Reverted commit 344d48be3 and testing RootWindow instead. I believe it is correct to NOT test for RootWindow but this leaves us unable + // to use IsItemHovered() after EndChild() itself. Until a solution is found I believe reverting to the test from 2017/09/27 is safe since this was + // the test that has been running for a long while. + if (g.HoveredWindow != window && (status_flags & ImGuiItemStatusFlags_HoveredWindow) == 0) + if ((flags & ImGuiHoveredFlags_AllowWhenOverlappedByWindow) == 0) + return false; + + // Test if another item is active (e.g. being dragged) + const ImGuiID id = g.LastItemData.ID; + if ((flags & ImGuiHoveredFlags_AllowWhenBlockedByActiveItem) == 0) + if (g.ActiveId != 0 && g.ActiveId != id && !g.ActiveIdAllowOverlap) + if (g.ActiveId != window->MoveId && g.ActiveId != window->TabId) + return false; + + // Test if interactions on this window are blocked by an active popup or modal. + // The ImGuiHoveredFlags_AllowWhenBlockedByPopup flag will be tested here. + if (!IsWindowContentHoverable(window, flags) && !(g.LastItemData.ItemFlags & ImGuiItemFlags_NoWindowHoverableCheck)) + return false; + + // Test if the item is disabled + if ((g.LastItemData.ItemFlags & ImGuiItemFlags_Disabled) && !(flags & ImGuiHoveredFlags_AllowWhenDisabled)) + return false; + + // Special handling for calling after Begin() which represent the title bar or tab. + // When the window is skipped/collapsed (SkipItems==true) that last item (always ->MoveId submitted by Begin) + // will never be overwritten so we need to detect the case. + if (id == window->MoveId && window->WriteAccessed) + return false; + + // Test if using AllowOverlap and overlapped + if ((g.LastItemData.ItemFlags & ImGuiItemFlags_AllowOverlap) && id != 0) + if ((flags & ImGuiHoveredFlags_AllowWhenOverlappedByItem) == 0) + if (g.HoveredIdPreviousFrame != g.LastItemData.ID) + return false; + } + + // Handle hover delay + // (some ideas: https://www.nngroup.com/articles/timing-exposing-content) + const float delay = CalcDelayFromHoveredFlags(flags); + if (delay > 0.0f || (flags & ImGuiHoveredFlags_Stationary)) + { + ImGuiID hover_delay_id = (g.LastItemData.ID != 0) ? g.LastItemData.ID : window->GetIDFromPos(g.LastItemData.Rect.Min); + if ((flags & ImGuiHoveredFlags_NoSharedDelay) && (g.HoverItemDelayIdPreviousFrame != hover_delay_id)) + g.HoverItemDelayTimer = 0.0f; + g.HoverItemDelayId = hover_delay_id; + + // When changing hovered item we requires a bit of stationary delay before activating hover timer, + // but once unlocked on a given item we also moving. + //if (g.HoverDelayTimer >= delay && (g.HoverDelayTimer - g.IO.DeltaTime < delay || g.MouseStationaryTimer - g.IO.DeltaTime < g.Style.HoverStationaryDelay)) { IMGUI_DEBUG_LOG("HoverDelayTimer = %f/%f, MouseStationaryTimer = %f\n", g.HoverDelayTimer, delay, g.MouseStationaryTimer); } + if ((flags & ImGuiHoveredFlags_Stationary) != 0 && g.HoverItemUnlockedStationaryId != hover_delay_id) + return false; + + if (g.HoverItemDelayTimer < delay) + return false; + } + + return true; +} + +// Internal facing ItemHoverable() used when submitting widgets. Differs slightly from IsItemHovered(). +// (this does not rely on LastItemData it can be called from a ButtonBehavior() call not following an ItemAdd() call) +// FIXME-LEGACY: the 'ImGuiItemFlags item_flags' parameter was added on 2023-06-28. +// If you used this in your legacy/custom widgets code: +// - Commonly: if your ItemHoverable() call comes after an ItemAdd() call: pass 'item_flags = g.LastItemData.ItemFlags'. +// - Rare: otherwise you may pass 'item_flags = 0' (ImGuiItemFlags_None) unless you want to benefit from special behavior handled by ItemHoverable. +bool ImGui::ItemHoverable(const ImRect& bb, ImGuiID id, ImGuiItemFlags item_flags) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + + // Detect ID conflicts +#ifndef IMGUI_DISABLE_DEBUG_TOOLS + if (id != 0 && g.HoveredIdPreviousFrame == id && (item_flags & ImGuiItemFlags_AllowDuplicateId) == 0) + { + g.HoveredIdPreviousFrameItemCount++; + if (g.DebugDrawIdConflicts == id) + window->DrawList->AddRect(bb.Min - ImVec2(1,1), bb.Max + ImVec2(1,1), IM_COL32(255, 0, 0, 255), 0.0f, ImDrawFlags_None, 2.0f); + } +#endif + + if (g.HoveredWindow != window) + return false; + if (!IsMouseHoveringRect(bb.Min, bb.Max)) + return false; + + if (g.HoveredId != 0 && g.HoveredId != id && !g.HoveredIdAllowOverlap) + return false; + if (g.ActiveId != 0 && g.ActiveId != id && !g.ActiveIdAllowOverlap) + if (!g.ActiveIdFromShortcut) + return false; + + // Done with rectangle culling so we can perform heavier checks now. + if (!(item_flags & ImGuiItemFlags_NoWindowHoverableCheck) && !IsWindowContentHoverable(window, ImGuiHoveredFlags_None)) + { + g.HoveredIdIsDisabled = true; + return false; + } + + // We exceptionally allow this function to be called with id==0 to allow using it for easy high-level + // hover test in widgets code. We could also decide to split this function is two. + if (id != 0) + { + // Drag source doesn't report as hovered + if (g.DragDropActive && g.DragDropPayload.SourceId == id && !(g.DragDropSourceFlags & ImGuiDragDropFlags_SourceNoDisableHover)) + return false; + + SetHoveredID(id); + + // AllowOverlap mode (rarely used) requires previous frame HoveredId to be null or to match. + // This allows using patterns where a later submitted widget overlaps a previous one. Generally perceived as a front-to-back hit-test. + if (item_flags & ImGuiItemFlags_AllowOverlap) + { + g.HoveredIdAllowOverlap = true; + if (g.HoveredIdPreviousFrame != id) + return false; + } + + // Display shortcut (only works with mouse) + // (ImGuiItemStatusFlags_HasShortcut in LastItemData denotes we want a tooltip) + if (id == g.LastItemData.ID && (g.LastItemData.StatusFlags & ImGuiItemStatusFlags_HasShortcut) && g.ActiveId != id) + if (IsItemHovered(ImGuiHoveredFlags_ForTooltip | ImGuiHoveredFlags_DelayNormal)) + SetTooltip("%s", GetKeyChordName(g.LastItemData.Shortcut)); + } + + // When disabled we'll return false but still set HoveredId + if (item_flags & ImGuiItemFlags_Disabled) + { + // Release active id if turning disabled + if (g.ActiveId == id && id != 0) + ClearActiveID(); + g.HoveredIdIsDisabled = true; + return false; + } + +#ifndef IMGUI_DISABLE_DEBUG_TOOLS + if (id != 0) + { + // [DEBUG] Item Picker tool! + // We perform the check here because reaching is path is rare (1~ time a frame), + // making the cost of this tool near-zero! We could get better call-stack and support picking non-hovered + // items if we performed the test in ItemAdd(), but that would incur a bigger runtime cost. + if (g.DebugItemPickerActive && g.HoveredIdPreviousFrame == id) + GetForegroundDrawList()->AddRect(bb.Min, bb.Max, IM_COL32(255, 255, 0, 255)); + if (g.DebugItemPickerBreakId == id) + IM_DEBUG_BREAK(); + } +#endif + + if (g.NavHighlightItemUnderNav && (item_flags & ImGuiItemFlags_NoNavDisableMouseHover) == 0) + return false; + + return true; +} + +// FIXME: This is inlined/duplicated in ItemAdd() +// FIXME: The id != 0 path is not used by our codebase, may get rid of it? +bool ImGui::IsClippedEx(const ImRect& bb, ImGuiID id) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + if (!bb.Overlaps(window->ClipRect)) + if (id == 0 || (id != g.ActiveId && id != g.ActiveIdPreviousFrame && id != g.NavId && id != g.NavActivateId)) + if (!g.ItemUnclipByLog) + return true; + return false; +} + +// This is also inlined in ItemAdd() +// Note: if ImGuiItemStatusFlags_HasDisplayRect is set, user needs to set g.LastItemData.DisplayRect. +void ImGui::SetLastItemData(ImGuiID item_id, ImGuiItemFlags item_flags, ImGuiItemStatusFlags status_flags, const ImRect& item_rect) +{ + ImGuiContext& g = *GImGui; + g.LastItemData.ID = item_id; + g.LastItemData.ItemFlags = item_flags; + g.LastItemData.StatusFlags = status_flags; + g.LastItemData.Rect = g.LastItemData.NavRect = item_rect; +} + +static void ImGui::SetLastItemDataForWindow(ImGuiWindow* window, const ImRect& rect) +{ + ImGuiContext& g = *GImGui; + if (window->DockIsActive) + SetLastItemData(window->MoveId, g.CurrentItemFlags, window->DC.DockTabItemStatusFlags, window->DC.DockTabItemRect); + else + SetLastItemData(window->MoveId, g.CurrentItemFlags, window->DC.WindowItemStatusFlags, rect); +} + +static void ImGui::SetLastItemDataForChildWindowItem(ImGuiWindow* window, const ImRect& rect) +{ + ImGuiContext& g = *GImGui; + SetLastItemData(window->ChildId, g.CurrentItemFlags, window->DC.ChildItemStatusFlags, rect); +} + +float ImGui::CalcWrapWidthForPos(const ImVec2& pos, float wrap_pos_x) +{ + if (wrap_pos_x < 0.0f) + return 0.0f; + + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + if (wrap_pos_x == 0.0f) + { + // We could decide to setup a default wrapping max point for auto-resizing windows, + // or have auto-wrap (with unspecified wrapping pos) behave as a ContentSize extending function? + //if (window->Hidden && (window->Flags & ImGuiWindowFlags_AlwaysAutoResize)) + // wrap_pos_x = ImMax(window->WorkRect.Min.x + g.FontSize * 10.0f, window->WorkRect.Max.x); + //else + wrap_pos_x = window->WorkRect.Max.x; + } + else if (wrap_pos_x > 0.0f) + { + wrap_pos_x += window->Pos.x - window->Scroll.x; // wrap_pos_x is provided is window local space + } + + return ImMax(wrap_pos_x - pos.x, 1.0f); +} + +// IM_ALLOC() == ImGui::MemAlloc() +void* ImGui::MemAlloc(size_t size) +{ + void* ptr = (*GImAllocatorAllocFunc)(size, GImAllocatorUserData); +#ifndef IMGUI_DISABLE_DEBUG_TOOLS + if (ImGuiContext* ctx = GImGui) + DebugAllocHook(&ctx->DebugAllocInfo, ctx->FrameCount, ptr, size); +#endif + return ptr; +} + +// IM_FREE() == ImGui::MemFree() +void ImGui::MemFree(void* ptr) +{ +#ifndef IMGUI_DISABLE_DEBUG_TOOLS + if (ptr != NULL) + if (ImGuiContext* ctx = GImGui) + DebugAllocHook(&ctx->DebugAllocInfo, ctx->FrameCount, ptr, (size_t)-1); +#endif + return (*GImAllocatorFreeFunc)(ptr, GImAllocatorUserData); +} + +// We record the number of allocation in recent frames, as a way to audit/sanitize our guiding principles of "no allocations on idle/repeating frames" +void ImGui::DebugAllocHook(ImGuiDebugAllocInfo* info, int frame_count, void* ptr, size_t size) +{ + ImGuiDebugAllocEntry* entry = &info->LastEntriesBuf[info->LastEntriesIdx]; + IM_UNUSED(ptr); + if (entry->FrameCount != frame_count) + { + info->LastEntriesIdx = (info->LastEntriesIdx + 1) % IM_ARRAYSIZE(info->LastEntriesBuf); + entry = &info->LastEntriesBuf[info->LastEntriesIdx]; + entry->FrameCount = frame_count; + entry->AllocCount = entry->FreeCount = 0; + } + if (size != (size_t)-1) + { + //printf("[%05d] MemAlloc(%d) -> 0x%p\n", frame_count, (int)size, ptr); + entry->AllocCount++; + info->TotalAllocCount++; + } + else + { + //printf("[%05d] MemFree(0x%p)\n", frame_count, ptr); + entry->FreeCount++; + info->TotalFreeCount++; + } +} + +const char* ImGui::GetClipboardText() +{ + ImGuiContext& g = *GImGui; + return g.PlatformIO.Platform_GetClipboardTextFn ? g.PlatformIO.Platform_GetClipboardTextFn(&g) : ""; +} + +void ImGui::SetClipboardText(const char* text) +{ + ImGuiContext& g = *GImGui; + if (g.PlatformIO.Platform_SetClipboardTextFn != NULL) + g.PlatformIO.Platform_SetClipboardTextFn(&g, text); +} + +const char* ImGui::GetVersion() +{ + return IMGUI_VERSION; +} + ImGuiIO& ImGui::GetIO() { IM_ASSERT(GImGui != NULL && "No current context. Did you call ImGui::CreateContext() and ImGui::SetCurrentContext() ?"); return GImGui->IO; } -ImGuiStyle& ImGui::GetStyle() +// This variant exists to facilitate backends experimenting with multi-threaded parallel context. (#8069, #6293, #5856) +ImGuiIO& ImGui::GetIO(ImGuiContext* ctx) { - IM_ASSERT(GImGui != NULL && "No current context. Did you call ImGui::CreateContext() and ImGui::SetCurrentContext() ?"); - return GImGui->Style; + IM_ASSERT(ctx != NULL); + return ctx->IO; } -// Same value as passed to the old io.RenderDrawListsFn function. Valid after Render() and until the next call to NewFrame() +ImGuiPlatformIO& ImGui::GetPlatformIO() +{ + IM_ASSERT(GImGui != NULL && "No current context. Did you call ImGui::CreateContext() and ImGui::SetCurrentContext()?"); + return GImGui->PlatformIO; +} + +// This variant exists to facilitate backends experimenting with multi-threaded parallel context. (#8069, #6293, #5856) +ImGuiPlatformIO& ImGui::GetPlatformIO(ImGuiContext* ctx) +{ + IM_ASSERT(ctx != NULL); + return ctx->PlatformIO; +} + +// Pass this to your backend rendering function! Valid after Render() and until the next call to NewFrame() ImDrawData* ImGui::GetDrawData() { ImGuiContext& g = *GImGui; - return g.DrawData.Valid ? &g.DrawData : NULL; + ImGuiViewportP* viewport = g.Viewports[0]; + return viewport->DrawDataP.Valid ? &viewport->DrawDataP : NULL; } double ImGui::GetTime() @@ -3324,14 +4993,42 @@ int ImGui::GetFrameCount() return GImGui->FrameCount; } -ImDrawList* ImGui::GetBackgroundDrawList() +static ImDrawList* GetViewportBgFgDrawList(ImGuiViewportP* viewport, size_t drawlist_no, const char* drawlist_name) { - return &GImGui->BackgroundDrawList; + // Create the draw list on demand, because they are not frequently used for all viewports + ImGuiContext& g = *GImGui; + IM_ASSERT(drawlist_no < IM_ARRAYSIZE(viewport->BgFgDrawLists)); + ImDrawList* draw_list = viewport->BgFgDrawLists[drawlist_no]; + if (draw_list == NULL) + { + draw_list = IM_NEW(ImDrawList)(&g.DrawListSharedData); + draw_list->_OwnerName = drawlist_name; + viewport->BgFgDrawLists[drawlist_no] = draw_list; + } + + // Our ImDrawList system requires that there is always a command + if (viewport->BgFgDrawListsLastFrame[drawlist_no] != g.FrameCount) + { + draw_list->_ResetForNewFrame(); + draw_list->PushTextureID(g.IO.Fonts->TexID); + draw_list->PushClipRect(viewport->Pos, viewport->Pos + viewport->Size, false); + viewport->BgFgDrawListsLastFrame[drawlist_no] = g.FrameCount; + } + return draw_list; } -ImDrawList* ImGui::GetForegroundDrawList() +ImDrawList* ImGui::GetBackgroundDrawList(ImGuiViewport* viewport) { - return &GImGui->ForegroundDrawList; + if (viewport == NULL) + viewport = GImGui->CurrentWindow->Viewport; + return GetViewportBgFgDrawList((ImGuiViewportP*)viewport, 0, "##Background"); +} + +ImDrawList* ImGui::GetForegroundDrawList(ImGuiViewport* viewport) +{ + if (viewport == NULL) + viewport = GImGui->CurrentWindow->Viewport; + return GetViewportBgFgDrawList((ImGuiViewportP*)viewport, 1, "##Foreground"); } ImDrawListSharedData* ImGui::GetDrawListSharedData() @@ -3347,18 +5044,50 @@ void ImGui::StartMouseMovingWindow(ImGuiWindow* window) ImGuiContext& g = *GImGui; FocusWindow(window); SetActiveID(window->MoveId, window); - g.NavDisableHighlight = true; - g.ActiveIdClickOffset = g.IO.MousePos - window->RootWindow->Pos; + if (g.IO.ConfigNavCursorVisibleAuto) + g.NavCursorVisible = false; + g.ActiveIdClickOffset = g.IO.MouseClickedPos[0] - window->RootWindowDockTree->Pos; + g.ActiveIdNoClearOnFocusLoss = true; + SetActiveIdUsingAllKeyboardKeys(); bool can_move_window = true; - if ((window->Flags & ImGuiWindowFlags_NoMove) || (window->RootWindow->Flags & ImGuiWindowFlags_NoMove)) + if ((window->Flags & ImGuiWindowFlags_NoMove) || (window->RootWindowDockTree->Flags & ImGuiWindowFlags_NoMove)) can_move_window = false; + if (ImGuiDockNode* node = window->DockNodeAsHost) + if (node->VisibleWindow && (node->VisibleWindow->Flags & ImGuiWindowFlags_NoMove)) + can_move_window = false; if (can_move_window) g.MovingWindow = window; } +// We use 'undock == false' when dragging from title bar to allow moving groups of floating nodes without undocking them. +void ImGui::StartMouseMovingWindowOrNode(ImGuiWindow* window, ImGuiDockNode* node, bool undock) +{ + ImGuiContext& g = *GImGui; + bool can_undock_node = false; + if (undock && node != NULL && node->VisibleWindow && (node->VisibleWindow->Flags & ImGuiWindowFlags_NoMove) == 0 && (node->MergedFlags & ImGuiDockNodeFlags_NoUndocking) == 0) + { + // Can undock if: + // - part of a hierarchy with more than one visible node (if only one is visible, we'll just move the root window) + // - part of a dockspace node hierarchy: so we can undock the last single visible node too. Undocking from a fixed/central node will create a new node and copy windows. + ImGuiDockNode* root_node = DockNodeGetRootNode(node); + if (root_node->OnlyNodeWithWindows != node || root_node->CentralNode != NULL) // -V1051 PVS-Studio thinks node should be root_node and is wrong about that. + can_undock_node = true; + } + + const bool clicked = IsMouseClicked(0); + const bool dragging = IsMouseDragging(0); + if (can_undock_node && dragging) + DockContextQueueUndockNode(&g, node); // Will lead to DockNodeStartMouseMovingWindow() -> StartMouseMovingWindow() being called next frame + else if (!can_undock_node && (clicked || dragging) && g.MovingWindow != window) + StartMouseMovingWindow(window); +} + // Handle mouse moving window // Note: moving window with the navigation keys (Square + d-pad / CTRL+TAB + Arrows) are processed in NavUpdateWindowing() +// FIXME: We don't have strong guarantee that g.MovingWindow stay synced with g.ActiveId == g.MovingWindow->MoveId. +// This is currently enforced by the fact that BeginDragDropSource() is setting all g.ActiveIdUsingXXXX flags to inhibit navigation inputs, +// but if we should more thoroughly test cases where g.ActiveId or g.MovingWindow gets changed and not the other. void ImGui::UpdateMouseMovingWindowNewFrame() { ImGuiContext& g = *GImGui; @@ -3367,22 +5096,45 @@ void ImGui::UpdateMouseMovingWindowNewFrame() // We actually want to move the root window. g.MovingWindow == window we clicked on (could be a child window). // We track it to preserve Focus and so that generally ActiveIdWindow == MovingWindow and ActiveId == MovingWindow->MoveId for consistency. KeepAliveID(g.ActiveId); - IM_ASSERT(g.MovingWindow && g.MovingWindow->RootWindow); - ImGuiWindow* moving_window = g.MovingWindow->RootWindow; - if (g.IO.MouseDown[0] && IsMousePosValid(&g.IO.MousePos)) + IM_ASSERT(g.MovingWindow && g.MovingWindow->RootWindowDockTree); + ImGuiWindow* moving_window = g.MovingWindow->RootWindowDockTree; + + // When a window stop being submitted while being dragged, it may will its viewport until next Begin() + const bool window_disappared = (!moving_window->WasActive && !moving_window->Active); + if (g.IO.MouseDown[0] && IsMousePosValid(&g.IO.MousePos) && !window_disappared) { ImVec2 pos = g.IO.MousePos - g.ActiveIdClickOffset; if (moving_window->Pos.x != pos.x || moving_window->Pos.y != pos.y) { - MarkIniSettingsDirty(moving_window); SetWindowPos(moving_window, pos, ImGuiCond_Always); + if (moving_window->Viewport && moving_window->ViewportOwned) // Synchronize viewport immediately because some overlays may relies on clipping rectangle before we Begin() into the window. + { + moving_window->Viewport->Pos = pos; + moving_window->Viewport->UpdateWorkRect(); + } } FocusWindow(g.MovingWindow); } else { - ClearActiveID(); + if (!window_disappared) + { + // Try to merge the window back into the main viewport. + // This works because MouseViewport should be != MovingWindow->Viewport on release (as per code in UpdateViewports) + if (g.ConfigFlagsCurrFrame & ImGuiConfigFlags_ViewportsEnable) + UpdateTryMergeWindowIntoHostViewport(moving_window, g.MouseViewport); + + // Restore the mouse viewport so that we don't hover the viewport _under_ the moved window during the frame we released the mouse button. + if (moving_window->Viewport && !IsDragDropPayloadBeingAccepted()) + g.MouseViewport = moving_window->Viewport; + + // Clear the NoInput window flag set by the Viewport system + if (moving_window->Viewport) + moving_window->Viewport->Flags &= ~ImGuiViewportFlags_NoInputs; + } + g.MovingWindow = NULL; + ClearActiveID(); } } else @@ -3397,291 +5149,198 @@ void ImGui::UpdateMouseMovingWindowNewFrame() } } -// Initiate moving window, handle left-click and right-click focus +// Initiate focusing and moving window when clicking on empty space or title bar. +// Initiate focusing window when clicking on a disabled item. +// Handle left-click and right-click focus. void ImGui::UpdateMouseMovingWindowEndFrame() { - // Initiate moving window ImGuiContext& g = *GImGui; - if (g.ActiveId != 0 || g.HoveredId != 0) + if (g.ActiveId != 0 || (g.HoveredId != 0 && !g.HoveredIdIsDisabled)) return; // Unless we just made a window/popup appear if (g.NavWindow && g.NavWindow->Appearing) return; - // Click to focus window and start moving (after we're done with all our widgets) + // Click on empty space to focus window and start moving + // (after we're done with all our widgets, so e.g. clicking on docking tab-bar which have set HoveredId already and not get us here!) if (g.IO.MouseClicked[0]) { - if (g.HoveredRootWindow != NULL) + // Handle the edge case of a popup being closed while clicking in its empty space. + // If we try to focus it, FocusWindow() > ClosePopupsOverWindow() will accidentally close any parent popups because they are not linked together any more. + ImGuiWindow* root_window = g.HoveredWindow ? g.HoveredWindow->RootWindow : NULL; + const bool is_closed_popup = root_window && (root_window->Flags & ImGuiWindowFlags_Popup) && !IsPopupOpen(root_window->PopupId, ImGuiPopupFlags_AnyPopupLevel); + + if (root_window != NULL && !is_closed_popup) { - StartMouseMovingWindow(g.HoveredWindow); - if (g.IO.ConfigWindowsMoveFromTitleBarOnly && !(g.HoveredRootWindow->Flags & ImGuiWindowFlags_NoTitleBar)) - if (!g.HoveredRootWindow->TitleBarRect().Contains(g.IO.MouseClickedPos[0])) - g.MovingWindow = NULL; + StartMouseMovingWindow(g.HoveredWindow); //-V595 + + // Cancel moving if clicked outside of title bar + if (g.IO.ConfigWindowsMoveFromTitleBarOnly) + if (!(root_window->Flags & ImGuiWindowFlags_NoTitleBar) || root_window->DockIsActive) + if (!root_window->TitleBarRect().Contains(g.IO.MouseClickedPos[0])) + g.MovingWindow = NULL; + + // Cancel moving if clicked over an item which was disabled or inhibited by popups + // (when g.HoveredIdIsDisabled == true && g.HoveredId == 0 we are inhibited by popups, when g.HoveredIdIsDisabled == true && g.HoveredId != 0 we are over a disabled item)0 already) + if (g.HoveredIdIsDisabled) + g.MovingWindow = NULL; } - else if (g.NavWindow != NULL && GetTopMostPopupModal() == NULL) + else if (root_window == NULL && g.NavWindow != NULL) { // Clicking on void disable focus - FocusWindow(NULL); + FocusWindow(NULL, ImGuiFocusRequestFlags_UnlessBelowModal); } } // With right mouse button we close popups without changing focus based on where the mouse is aimed // Instead, focus will be restored to the window under the bottom-most closed popup. // (The left mouse button path calls FocusWindow on the hovered window, which will lead NewFrame->ClosePopupsOverWindow to trigger) - if (g.IO.MouseClicked[1]) + if (g.IO.MouseClicked[1] && g.HoveredId == 0) { // Find the top-most window between HoveredWindow and the top-most Modal Window. // This is where we can trim the popup stack. ImGuiWindow* modal = GetTopMostPopupModal(); - bool hovered_window_above_modal = false; - if (modal == NULL) - hovered_window_above_modal = true; - for (int i = g.Windows.Size - 1; i >= 0 && hovered_window_above_modal == false; i--) - { - ImGuiWindow* window = g.Windows[i]; - if (window == modal) - break; - if (window == g.HoveredWindow) - hovered_window_above_modal = true; - } + bool hovered_window_above_modal = g.HoveredWindow && (modal == NULL || IsWindowAbove(g.HoveredWindow, modal)); ClosePopupsOverWindow(hovered_window_above_modal ? g.HoveredWindow : modal, true); } } +// This is called during NewFrame()->UpdateViewportsNewFrame() only. +// Need to keep in sync with SetWindowPos() +static void TranslateWindow(ImGuiWindow* window, const ImVec2& delta) +{ + window->Pos += delta; + window->ClipRect.Translate(delta); + window->OuterRectClipped.Translate(delta); + window->InnerRect.Translate(delta); + window->DC.CursorPos += delta; + window->DC.CursorStartPos += delta; + window->DC.CursorMaxPos += delta; + window->DC.IdealMaxPos += delta; +} + +static void ScaleWindow(ImGuiWindow* window, float scale) +{ + ImVec2 origin = window->Viewport->Pos; + window->Pos = ImFloor((window->Pos - origin) * scale + origin); + window->Size = ImTrunc(window->Size * scale); + window->SizeFull = ImTrunc(window->SizeFull * scale); + window->ContentSize = ImTrunc(window->ContentSize * scale); +} + static bool IsWindowActiveAndVisible(ImGuiWindow* window) { return (window->Active) && (!window->Hidden); } -static void ImGui::UpdateMouseInputs() -{ - ImGuiContext& g = *GImGui; - - // Round mouse position to avoid spreading non-rounded position (e.g. UpdateManualResize doesn't support them well) - if (IsMousePosValid(&g.IO.MousePos)) - g.IO.MousePos = g.LastValidMousePos = ImFloor(g.IO.MousePos); - - // If mouse just appeared or disappeared (usually denoted by -FLT_MAX components) we cancel out movement in MouseDelta - if (IsMousePosValid(&g.IO.MousePos) && IsMousePosValid(&g.IO.MousePosPrev)) - g.IO.MouseDelta = g.IO.MousePos - g.IO.MousePosPrev; - else - g.IO.MouseDelta = ImVec2(0.0f, 0.0f); - if (g.IO.MouseDelta.x != 0.0f || g.IO.MouseDelta.y != 0.0f) - g.NavDisableMouseHover = false; - - g.IO.MousePosPrev = g.IO.MousePos; - for (int i = 0; i < IM_ARRAYSIZE(g.IO.MouseDown); i++) - { - g.IO.MouseClicked[i] = g.IO.MouseDown[i] && g.IO.MouseDownDuration[i] < 0.0f; - g.IO.MouseReleased[i] = !g.IO.MouseDown[i] && g.IO.MouseDownDuration[i] >= 0.0f; - g.IO.MouseDownDurationPrev[i] = g.IO.MouseDownDuration[i]; - g.IO.MouseDownDuration[i] = g.IO.MouseDown[i] ? (g.IO.MouseDownDuration[i] < 0.0f ? 0.0f : g.IO.MouseDownDuration[i] + g.IO.DeltaTime) : -1.0f; - g.IO.MouseDoubleClicked[i] = false; - if (g.IO.MouseClicked[i]) - { - if ((float)(g.Time - g.IO.MouseClickedTime[i]) < g.IO.MouseDoubleClickTime) - { - ImVec2 delta_from_click_pos = IsMousePosValid(&g.IO.MousePos) ? (g.IO.MousePos - g.IO.MouseClickedPos[i]) : ImVec2(0.0f, 0.0f); - if (ImLengthSqr(delta_from_click_pos) < g.IO.MouseDoubleClickMaxDist * g.IO.MouseDoubleClickMaxDist) - g.IO.MouseDoubleClicked[i] = true; - g.IO.MouseClickedTime[i] = -FLT_MAX; // so the third click isn't turned into a double-click - } - else - { - g.IO.MouseClickedTime[i] = g.Time; - } - g.IO.MouseClickedPos[i] = g.IO.MousePos; - g.IO.MouseDownWasDoubleClick[i] = g.IO.MouseDoubleClicked[i]; - g.IO.MouseDragMaxDistanceAbs[i] = ImVec2(0.0f, 0.0f); - g.IO.MouseDragMaxDistanceSqr[i] = 0.0f; - } - else if (g.IO.MouseDown[i]) - { - // Maintain the maximum distance we reaching from the initial click position, which is used with dragging threshold - ImVec2 delta_from_click_pos = IsMousePosValid(&g.IO.MousePos) ? (g.IO.MousePos - g.IO.MouseClickedPos[i]) : ImVec2(0.0f, 0.0f); - g.IO.MouseDragMaxDistanceSqr[i] = ImMax(g.IO.MouseDragMaxDistanceSqr[i], ImLengthSqr(delta_from_click_pos)); - g.IO.MouseDragMaxDistanceAbs[i].x = ImMax(g.IO.MouseDragMaxDistanceAbs[i].x, delta_from_click_pos.x < 0.0f ? -delta_from_click_pos.x : delta_from_click_pos.x); - g.IO.MouseDragMaxDistanceAbs[i].y = ImMax(g.IO.MouseDragMaxDistanceAbs[i].y, delta_from_click_pos.y < 0.0f ? -delta_from_click_pos.y : delta_from_click_pos.y); - } - if (!g.IO.MouseDown[i] && !g.IO.MouseReleased[i]) - g.IO.MouseDownWasDoubleClick[i] = false; - if (g.IO.MouseClicked[i]) // Clicking any mouse button reactivate mouse hovering which may have been deactivated by gamepad/keyboard navigation - g.NavDisableMouseHover = false; - } -} - -static void StartLockWheelingWindow(ImGuiWindow* window) -{ - ImGuiContext& g = *GImGui; - if (g.WheelingWindow == window) - return; - g.WheelingWindow = window; - g.WheelingWindowRefMousePos = g.IO.MousePos; - g.WheelingWindowTimer = WINDOWS_MOUSE_WHEEL_SCROLL_LOCK_TIMER; -} - -void ImGui::UpdateMouseWheel() -{ - ImGuiContext& g = *GImGui; - - // Reset the locked window if we move the mouse or after the timer elapses - if (g.WheelingWindow != NULL) - { - g.WheelingWindowTimer -= g.IO.DeltaTime; - if (IsMousePosValid() && ImLengthSqr(g.IO.MousePos - g.WheelingWindowRefMousePos) > g.IO.MouseDragThreshold * g.IO.MouseDragThreshold) - g.WheelingWindowTimer = 0.0f; - if (g.WheelingWindowTimer <= 0.0f) - { - g.WheelingWindow = NULL; - g.WheelingWindowTimer = 0.0f; - } - } - - if (g.IO.MouseWheel == 0.0f && g.IO.MouseWheelH == 0.0f) - return; - - ImGuiWindow* window = g.WheelingWindow ? g.WheelingWindow : g.HoveredWindow; - if (!window || window->Collapsed) - return; - - // Zoom / Scale window - // FIXME-OBSOLETE: This is an old feature, it still works but pretty much nobody is using it and may be best redesigned. - if (g.IO.MouseWheel != 0.0f && g.IO.KeyCtrl && g.IO.FontAllowUserScaling) - { - StartLockWheelingWindow(window); - const float new_font_scale = ImClamp(window->FontWindowScale + g.IO.MouseWheel * 0.10f, 0.50f, 2.50f); - const float scale = new_font_scale / window->FontWindowScale; - window->FontWindowScale = new_font_scale; - if (!(window->Flags & ImGuiWindowFlags_ChildWindow)) - { - const ImVec2 offset = window->Size * (1.0f - scale) * (g.IO.MousePos - window->Pos) / window->Size; - SetWindowPos(window, window->Pos + offset, 0); - window->Size = ImFloor(window->Size * scale); - window->SizeFull = ImFloor(window->SizeFull * scale); - } - return; - } - - // Mouse wheel scrolling - // If a child window has the ImGuiWindowFlags_NoScrollWithMouse flag, we give a chance to scroll its parent - - // Vertical Mouse Wheel scrolling - const float wheel_y = (g.IO.MouseWheel != 0.0f && !g.IO.KeyShift) ? g.IO.MouseWheel : 0.0f; - if (wheel_y != 0.0f && !g.IO.KeyCtrl) - { - StartLockWheelingWindow(window); - while ((window->Flags & ImGuiWindowFlags_ChildWindow) && ((window->ScrollMax.y == 0.0f) || ((window->Flags & ImGuiWindowFlags_NoScrollWithMouse) && !(window->Flags & ImGuiWindowFlags_NoMouseInputs)))) - window = window->ParentWindow; - if (!(window->Flags & ImGuiWindowFlags_NoScrollWithMouse) && !(window->Flags & ImGuiWindowFlags_NoMouseInputs)) - { - float max_step = window->InnerRect.GetHeight() * 0.67f; - float scroll_step = ImFloor(ImMin(5 * window->CalcFontSize(), max_step)); - SetScrollY(window, window->Scroll.y - wheel_y * scroll_step); - } - } - - // Horizontal Mouse Wheel scrolling, or Vertical Mouse Wheel w/ Shift held - const float wheel_x = (g.IO.MouseWheelH != 0.0f && !g.IO.KeyShift) ? g.IO.MouseWheelH : (g.IO.MouseWheel != 0.0f && g.IO.KeyShift) ? g.IO.MouseWheel : 0.0f; - if (wheel_x != 0.0f && !g.IO.KeyCtrl) - { - StartLockWheelingWindow(window); - while ((window->Flags & ImGuiWindowFlags_ChildWindow) && ((window->ScrollMax.x == 0.0f) || ((window->Flags & ImGuiWindowFlags_NoScrollWithMouse) && !(window->Flags & ImGuiWindowFlags_NoMouseInputs)))) - window = window->ParentWindow; - if (!(window->Flags & ImGuiWindowFlags_NoScrollWithMouse) && !(window->Flags & ImGuiWindowFlags_NoMouseInputs)) - { - float max_step = window->InnerRect.GetWidth() * 0.67f; - float scroll_step = ImFloor(ImMin(2 * window->CalcFontSize(), max_step)); - SetScrollX(window, window->Scroll.x - wheel_x * scroll_step); - } - } -} - // The reason this is exposed in imgui_internal.h is: on touch-based system that don't have hovering, we want to dispatch inputs to the right target (imgui vs imgui+app) void ImGui::UpdateHoveredWindowAndCaptureFlags() { ImGuiContext& g = *GImGui; + ImGuiIO& io = g.IO; + + // FIXME-DPI: This storage was added on 2021/03/31 for test engine, but if we want to multiply WINDOWS_HOVER_PADDING + // by DpiScale, we need to make this window-agnostic anyhow, maybe need storing inside ImGuiWindow. + g.WindowsBorderHoverPadding = ImMax(ImMax(g.Style.TouchExtraPadding.x, g.Style.TouchExtraPadding.y), g.Style.WindowBorderHoverPadding); // Find the window hovered by mouse: // - Child windows can extend beyond the limit of their parent so we need to derive HoveredRootWindow from HoveredWindow. // - When moving a window we can skip the search, which also conveniently bypasses the fact that window->WindowRectClipped is lagging as this point of the frame. // - We also support the moved window toggling the NoInputs flag after moving has started in order to be able to detect windows below it, which is useful for e.g. docking mechanisms. - FindHoveredWindow(); + bool clear_hovered_windows = false; + FindHoveredWindowEx(g.IO.MousePos, false, &g.HoveredWindow, &g.HoveredWindowUnderMovingWindow); + IM_ASSERT(g.HoveredWindow == NULL || g.HoveredWindow == g.MovingWindow || g.HoveredWindow->Viewport == g.MouseViewport); + g.HoveredWindowBeforeClear = g.HoveredWindow; - // Modal windows prevents cursor from hovering behind them. + // Modal windows prevents mouse from hovering behind them. ImGuiWindow* modal_window = GetTopMostPopupModal(); - if (modal_window) - if (g.HoveredRootWindow && !IsWindowChildOf(g.HoveredRootWindow, modal_window)) - g.HoveredRootWindow = g.HoveredWindow = NULL; + if (modal_window && g.HoveredWindow && !IsWindowWithinBeginStackOf(g.HoveredWindow->RootWindow, modal_window)) // FIXME-MERGE: RootWindowDockTree ? + clear_hovered_windows = true; - // Disabled mouse? - if (g.IO.ConfigFlags & ImGuiConfigFlags_NoMouse) - g.HoveredWindow = g.HoveredRootWindow = NULL; + // Disabled mouse hovering (we don't currently clear MousePos, we could) + if (io.ConfigFlags & ImGuiConfigFlags_NoMouse) + clear_hovered_windows = true; - // We track click ownership. When clicked outside of a window the click is owned by the application and won't report hovering nor request capture even while dragging over our windows afterward. - int mouse_earliest_button_down = -1; + // We track click ownership. When clicked outside of a window the click is owned by the application and + // won't report hovering nor request capture even while dragging over our windows afterward. + const bool has_open_popup = (g.OpenPopupStack.Size > 0); + const bool has_open_modal = (modal_window != NULL); + int mouse_earliest_down = -1; bool mouse_any_down = false; - for (int i = 0; i < IM_ARRAYSIZE(g.IO.MouseDown); i++) + for (int i = 0; i < IM_ARRAYSIZE(io.MouseDown); i++) { - if (g.IO.MouseClicked[i]) - g.IO.MouseDownOwned[i] = (g.HoveredWindow != NULL) || (!g.OpenPopupStack.empty()); - mouse_any_down |= g.IO.MouseDown[i]; - if (g.IO.MouseDown[i]) - if (mouse_earliest_button_down == -1 || g.IO.MouseClickedTime[i] < g.IO.MouseClickedTime[mouse_earliest_button_down]) - mouse_earliest_button_down = i; + if (io.MouseClicked[i]) + { + io.MouseDownOwned[i] = (g.HoveredWindow != NULL) || has_open_popup; + io.MouseDownOwnedUnlessPopupClose[i] = (g.HoveredWindow != NULL) || has_open_modal; + } + mouse_any_down |= io.MouseDown[i]; + if (io.MouseDown[i] || io.MouseReleased[i]) // Increase release frame for our evaluation of earliest button (#1392) + if (mouse_earliest_down == -1 || io.MouseClickedTime[i] < io.MouseClickedTime[mouse_earliest_down]) + mouse_earliest_down = i; } - const bool mouse_avail_to_imgui = (mouse_earliest_button_down == -1) || g.IO.MouseDownOwned[mouse_earliest_button_down]; + const bool mouse_avail = (mouse_earliest_down == -1) || io.MouseDownOwned[mouse_earliest_down]; + const bool mouse_avail_unless_popup_close = (mouse_earliest_down == -1) || io.MouseDownOwnedUnlessPopupClose[mouse_earliest_down]; // If mouse was first clicked outside of ImGui bounds we also cancel out hovering. // FIXME: For patterns of drag and drop across OS windows, we may need to rework/remove this test (first committed 311c0ca9 on 2015/02) const bool mouse_dragging_extern_payload = g.DragDropActive && (g.DragDropSourceFlags & ImGuiDragDropFlags_SourceExtern) != 0; - if (!mouse_avail_to_imgui && !mouse_dragging_extern_payload) - g.HoveredWindow = g.HoveredRootWindow = NULL; + if (!mouse_avail && !mouse_dragging_extern_payload) + clear_hovered_windows = true; - // Update io.WantCaptureMouse for the user application (true = dispatch mouse info to imgui, false = dispatch mouse info to Dear ImGui + app) + if (clear_hovered_windows) + g.HoveredWindow = g.HoveredWindowUnderMovingWindow = NULL; + + // Update io.WantCaptureMouse for the user application (true = dispatch mouse info to Dear ImGui only, false = dispatch mouse to Dear ImGui + underlying app) + // Update io.WantCaptureMouseAllowPopupClose (experimental) to give a chance for app to react to popup closure with a drag if (g.WantCaptureMouseNextFrame != -1) - g.IO.WantCaptureMouse = (g.WantCaptureMouseNextFrame != 0); + { + io.WantCaptureMouse = io.WantCaptureMouseUnlessPopupClose = (g.WantCaptureMouseNextFrame != 0); + } else - g.IO.WantCaptureMouse = (mouse_avail_to_imgui && (g.HoveredWindow != NULL || mouse_any_down)) || (!g.OpenPopupStack.empty()); + { + io.WantCaptureMouse = (mouse_avail && (g.HoveredWindow != NULL || mouse_any_down)) || has_open_popup; + io.WantCaptureMouseUnlessPopupClose = (mouse_avail_unless_popup_close && (g.HoveredWindow != NULL || mouse_any_down)) || has_open_modal; + } - // Update io.WantCaptureKeyboard for the user application (true = dispatch keyboard info to imgui, false = dispatch keyboard info to Dear ImGui + app) - if (g.WantCaptureKeyboardNextFrame != -1) - g.IO.WantCaptureKeyboard = (g.WantCaptureKeyboardNextFrame != 0); - else - g.IO.WantCaptureKeyboard = (g.ActiveId != 0) || (modal_window != NULL); - if (g.IO.NavActive && (g.IO.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard) && !(g.IO.ConfigFlags & ImGuiConfigFlags_NavNoCaptureKeyboard)) - g.IO.WantCaptureKeyboard = true; + // Update io.WantCaptureKeyboard for the user application (true = dispatch keyboard info to Dear ImGui only, false = dispatch keyboard info to Dear ImGui + underlying app) + io.WantCaptureKeyboard = false; + if ((io.ConfigFlags & ImGuiConfigFlags_NoKeyboard) == 0) + { + if ((g.ActiveId != 0) || (modal_window != NULL)) + io.WantCaptureKeyboard = true; + else if (io.NavActive && (io.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard) && io.ConfigNavCaptureKeyboard) + io.WantCaptureKeyboard = true; + } + if (g.WantCaptureKeyboardNextFrame != -1) // Manual override + io.WantCaptureKeyboard = (g.WantCaptureKeyboardNextFrame != 0); // Update io.WantTextInput flag, this is to allow systems without a keyboard (e.g. mobile, hand-held) to show a software keyboard if possible - g.IO.WantTextInput = (g.WantTextInputNextFrame != -1) ? (g.WantTextInputNextFrame != 0) : false; + io.WantTextInput = (g.WantTextInputNextFrame != -1) ? (g.WantTextInputNextFrame != 0) : false; } -static void NewFrameSanityChecks() +// Called once a frame. Followed by SetCurrentFont() which sets up the remaining data. +// FIXME-VIEWPORT: the concept of a single ClipRectFullscreen is not ideal! +static void SetupDrawListSharedData() { ImGuiContext& g = *GImGui; - - // Check user data - // (We pass an error message in the assert expression to make it visible to programmers who are not using a debugger, as most assert handlers display their argument) - IM_ASSERT(g.Initialized); - IM_ASSERT((g.IO.DeltaTime > 0.0f || g.FrameCount == 0) && "Need a positive DeltaTime!"); - IM_ASSERT((g.FrameCount == 0 || g.FrameCountEnded == g.FrameCount) && "Forgot to call Render() or EndFrame() at the end of the previous frame?"); - IM_ASSERT(g.IO.DisplaySize.x >= 0.0f && g.IO.DisplaySize.y >= 0.0f && "Invalid DisplaySize value!"); - IM_ASSERT(g.IO.Fonts->Fonts.Size > 0 && "Font Atlas not built. Did you call io.Fonts->GetTexDataAsRGBA32() / GetTexDataAsAlpha8() ?"); - IM_ASSERT(g.IO.Fonts->Fonts[0]->IsLoaded() && "Font Atlas not built. Did you call io.Fonts->GetTexDataAsRGBA32() / GetTexDataAsAlpha8() ?"); - IM_ASSERT(g.Style.CurveTessellationTol > 0.0f && "Invalid style setting!"); - IM_ASSERT(g.Style.Alpha >= 0.0f && g.Style.Alpha <= 1.0f && "Invalid style setting. Alpha cannot be negative (allows us to avoid a few clamps in color computations)!"); - IM_ASSERT(g.Style.WindowMinSize.x >= 1.0f && g.Style.WindowMinSize.y >= 1.0f && "Invalid style setting."); - IM_ASSERT(g.Style.WindowMenuButtonPosition == ImGuiDir_None || g.Style.WindowMenuButtonPosition == ImGuiDir_Left || g.Style.WindowMenuButtonPosition == ImGuiDir_Right); - for (int n = 0; n < ImGuiKey_COUNT; n++) - IM_ASSERT(g.IO.KeyMap[n] >= -1 && g.IO.KeyMap[n] < IM_ARRAYSIZE(g.IO.KeysDown) && "io.KeyMap[] contains an out of bound value (need to be 0..512, or -1 for unmapped key)"); - - // Perform simple check: required key mapping (we intentionally do NOT check all keys to not pressure user into setting up everything, but Space is required and was only recently added in 1.60 WIP) - if (g.IO.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard) - IM_ASSERT(g.IO.KeyMap[ImGuiKey_Space] != -1 && "ImGuiKey_Space is not mapped, required for keyboard navigation."); - - // Perform simple check: the beta io.ConfigWindowsResizeFromEdges option requires back-end to honor mouse cursor changes and set the ImGuiBackendFlags_HasMouseCursors flag accordingly. - if (g.IO.ConfigWindowsResizeFromEdges && !(g.IO.BackendFlags & ImGuiBackendFlags_HasMouseCursors)) - g.IO.ConfigWindowsResizeFromEdges = false; + ImRect virtual_space(FLT_MAX, FLT_MAX, -FLT_MAX, -FLT_MAX); + for (ImGuiViewportP* viewport : g.Viewports) + virtual_space.Add(viewport->GetMainRect()); + g.DrawListSharedData.ClipRectFullscreen = virtual_space.ToVec4(); + g.DrawListSharedData.CurveTessellationTol = g.Style.CurveTessellationTol; + g.DrawListSharedData.SetCircleTessellationMaxError(g.Style.CircleTessellationMaxError); + g.DrawListSharedData.InitialFlags = ImDrawListFlags_None; + if (g.Style.AntiAliasedLines) + g.DrawListSharedData.InitialFlags |= ImDrawListFlags_AntiAliasedLines; + if (g.Style.AntiAliasedLinesUseTex && !(g.IO.Fonts->Flags & ImFontAtlasFlags_NoBakedLines)) + g.DrawListSharedData.InitialFlags |= ImDrawListFlags_AntiAliasedLinesUseTex; + if (g.Style.AntiAliasedFill) + g.DrawListSharedData.InitialFlags |= ImDrawListFlags_AntiAliasedFill; + if (g.IO.BackendFlags & ImGuiBackendFlags_RendererHasVtxOffset) + g.DrawListSharedData.InitialFlags |= ImDrawListFlags_AllowVtxOffset; + g.DrawListSharedData.InitialFringeScale = 1.0f; // FIXME-DPI: Change this for some DPI scaling experiments. } void ImGui::NewFrame() @@ -3689,72 +5348,68 @@ void ImGui::NewFrame() IM_ASSERT(GImGui != NULL && "No current context. Did you call ImGui::CreateContext() and ImGui::SetCurrentContext() ?"); ImGuiContext& g = *GImGui; -#ifdef IMGUI_ENABLE_TEST_ENGINE - ImGuiTestEngineHook_PreNewFrame(&g); -#endif + // Remove pending delete hooks before frame start. + // This deferred removal avoid issues of removal while iterating the hook vector + for (int n = g.Hooks.Size - 1; n >= 0; n--) + if (g.Hooks[n].Type == ImGuiContextHookType_PendingRemoval_) + g.Hooks.erase(&g.Hooks[n]); + + CallContextHooks(&g, ImGuiContextHookType_NewFramePre); // Check and assert for various common IO and Configuration mistakes - NewFrameSanityChecks(); + g.ConfigFlagsLastFrame = g.ConfigFlagsCurrFrame; + ErrorCheckNewFrameSanityChecks(); + g.ConfigFlagsCurrFrame = g.IO.ConfigFlags; - // Load settings on first frame (if not explicitly loaded manually before) - if (!g.SettingsLoaded) - { - IM_ASSERT(g.SettingsWindows.empty()); - if (g.IO.IniFilename) - LoadIniSettingsFromDisk(g.IO.IniFilename); - g.SettingsLoaded = true; - } - - // Save settings (with a delay after the last modification, so we don't spam disk too much) - if (g.SettingsDirtyTimer > 0.0f) - { - g.SettingsDirtyTimer -= g.IO.DeltaTime; - if (g.SettingsDirtyTimer <= 0.0f) - { - if (g.IO.IniFilename != NULL) - SaveIniSettingsToDisk(g.IO.IniFilename); - else - g.IO.WantSaveIniSettings = true; // Let user know they can call SaveIniSettingsToMemory(). user will need to clear io.WantSaveIniSettings themselves. - g.SettingsDirtyTimer = 0.0f; - } - } + // Load settings on first frame, save settings when modified (after a delay) + UpdateSettings(); g.Time += g.IO.DeltaTime; - g.FrameScopeActive = true; + g.WithinFrameScope = true; g.FrameCount += 1; g.TooltipOverrideCount = 0; g.WindowsActiveCount = 0; + g.MenusIdSubmittedThisFrame.resize(0); + + // Calculate frame-rate for the user, as a purely luxurious feature + g.FramerateSecPerFrameAccum += g.IO.DeltaTime - g.FramerateSecPerFrame[g.FramerateSecPerFrameIdx]; + g.FramerateSecPerFrame[g.FramerateSecPerFrameIdx] = g.IO.DeltaTime; + g.FramerateSecPerFrameIdx = (g.FramerateSecPerFrameIdx + 1) % IM_ARRAYSIZE(g.FramerateSecPerFrame); + g.FramerateSecPerFrameCount = ImMin(g.FramerateSecPerFrameCount + 1, IM_ARRAYSIZE(g.FramerateSecPerFrame)); + g.IO.Framerate = (g.FramerateSecPerFrameAccum > 0.0f) ? (1.0f / (g.FramerateSecPerFrameAccum / (float)g.FramerateSecPerFrameCount)) : FLT_MAX; + + // Process input queue (trickle as many events as possible), turn events into writes to IO structure + g.InputEventsTrail.resize(0); + UpdateInputEvents(g.IO.ConfigInputTrickleEventQueue); + + // Update viewports (after processing input queue, so io.MouseHoveredViewport is set) + UpdateViewportsNewFrame(); // Setup current font and draw list shared data + // FIXME-VIEWPORT: the concept of a single ClipRectFullscreen is not ideal! g.IO.Fonts->Locked = true; + SetupDrawListSharedData(); SetCurrentFont(GetDefaultFont()); IM_ASSERT(g.Font->IsLoaded()); - g.DrawListSharedData.ClipRectFullscreen = ImVec4(0.0f, 0.0f, g.IO.DisplaySize.x, g.IO.DisplaySize.y); - g.DrawListSharedData.CurveTessellationTol = g.Style.CurveTessellationTol; - g.DrawListSharedData.InitialFlags = ImDrawListFlags_None; - if (g.Style.AntiAliasedLines) - g.DrawListSharedData.InitialFlags |= ImDrawListFlags_AntiAliasedLines; - if (g.Style.AntiAliasedFill) - g.DrawListSharedData.InitialFlags |= ImDrawListFlags_AntiAliasedFill; - if (g.IO.BackendFlags & ImGuiBackendFlags_RendererHasVtxOffset) - g.DrawListSharedData.InitialFlags |= ImDrawListFlags_AllowVtxOffset; - - g.BackgroundDrawList.Clear(); - g.BackgroundDrawList.PushTextureID(g.IO.Fonts->TexID); - g.BackgroundDrawList.PushClipRectFullScreen(); - - g.ForegroundDrawList.Clear(); - g.ForegroundDrawList.PushTextureID(g.IO.Fonts->TexID); - g.ForegroundDrawList.PushClipRectFullScreen(); // Mark rendering data as invalid to prevent user who may have a handle on it to use it. - g.DrawData.Clear(); + for (ImGuiViewportP* viewport : g.Viewports) + { + viewport->DrawData = NULL; + viewport->DrawDataP.Valid = false; + } // Drag and drop keep the source ID alive so even if the source disappear our state is consistent if (g.DragDropActive && g.DragDropPayload.SourceId == g.ActiveId) KeepAliveID(g.DragDropPayload.SourceId); - // Clear reference to active widget if the widget isn't alive anymore + // [DEBUG] + if (!g.IO.ConfigDebugHighlightIdConflicts || !g.IO.KeyCtrl) // Count is locked while holding CTRL + g.DebugDrawIdConflicts = 0; + if (g.IO.ConfigDebugHighlightIdConflicts && g.HoveredIdPreviousFrameItemCount > 1) + g.DebugDrawIdConflicts = g.HoveredIdPreviousFrame; + + // Update HoveredId data if (!g.HoveredIdPreviousFrame) g.HoveredIdTimer = 0.0f; if (!g.HoveredIdPreviousFrame || (g.HoveredId && g.ActiveId == g.HoveredId)) @@ -3764,48 +5419,118 @@ void ImGui::NewFrame() if (g.HoveredId && g.ActiveId != g.HoveredId) g.HoveredIdNotActiveTimer += g.IO.DeltaTime; g.HoveredIdPreviousFrame = g.HoveredId; + g.HoveredIdPreviousFrameItemCount = 0; g.HoveredId = 0; g.HoveredIdAllowOverlap = false; - if (g.ActiveIdIsAlive != g.ActiveId && g.ActiveIdPreviousFrame == g.ActiveId && g.ActiveId != 0) + g.HoveredIdIsDisabled = false; + + // Clear ActiveID if the item is not alive anymore. + // In 1.87, the common most call to KeepAliveID() was moved from GetID() to ItemAdd(). + // As a result, custom widget using ButtonBehavior() _without_ ItemAdd() need to call KeepAliveID() themselves. + if (g.ActiveId != 0 && g.ActiveIdIsAlive != g.ActiveId && g.ActiveIdPreviousFrame == g.ActiveId) + { + IMGUI_DEBUG_LOG_ACTIVEID("NewFrame(): ClearActiveID() because it isn't marked alive anymore!\n"); ClearActiveID(); + } + + // Update ActiveId data (clear reference to active widget if the widget isn't alive anymore) if (g.ActiveId) g.ActiveIdTimer += g.IO.DeltaTime; g.LastActiveIdTimer += g.IO.DeltaTime; g.ActiveIdPreviousFrame = g.ActiveId; - g.ActiveIdPreviousFrameWindow = g.ActiveIdWindow; - g.ActiveIdPreviousFrameHasBeenEditedBefore = g.ActiveIdHasBeenEditedBefore; g.ActiveIdIsAlive = 0; g.ActiveIdHasBeenEditedThisFrame = false; - g.ActiveIdPreviousFrameIsAlive = false; g.ActiveIdIsJustActivated = false; - if (g.TempInputTextId != 0 && g.ActiveId != g.TempInputTextId) - g.TempInputTextId = 0; + if (g.TempInputId != 0 && g.ActiveId != g.TempInputId) + g.TempInputId = 0; + if (g.ActiveId == 0) + { + g.ActiveIdUsingNavDirMask = 0x00; + g.ActiveIdUsingAllKeyboardKeys = false; + } + if (g.DeactivatedItemData.ElapseFrame < g.FrameCount) + g.DeactivatedItemData.ID = 0; + g.DeactivatedItemData.IsAlive = false; + + // Record when we have been stationary as this state is preserved while over same item. + // FIXME: The way this is expressed means user cannot alter HoverStationaryDelay during the frame to use varying values. + // To allow this we should store HoverItemMaxStationaryTime+ID and perform the >= check in IsItemHovered() function. + if (g.HoverItemDelayId != 0 && g.MouseStationaryTimer >= g.Style.HoverStationaryDelay) + g.HoverItemUnlockedStationaryId = g.HoverItemDelayId; + else if (g.HoverItemDelayId == 0) + g.HoverItemUnlockedStationaryId = 0; + if (g.HoveredWindow != NULL && g.MouseStationaryTimer >= g.Style.HoverStationaryDelay) + g.HoverWindowUnlockedStationaryId = g.HoveredWindow->ID; + else if (g.HoveredWindow == NULL) + g.HoverWindowUnlockedStationaryId = 0; + + // Update hover delay for IsItemHovered() with delays and tooltips + g.HoverItemDelayIdPreviousFrame = g.HoverItemDelayId; + if (g.HoverItemDelayId != 0) + { + g.HoverItemDelayTimer += g.IO.DeltaTime; + g.HoverItemDelayClearTimer = 0.0f; + g.HoverItemDelayId = 0; + } + else if (g.HoverItemDelayTimer > 0.0f) + { + // This gives a little bit of leeway before clearing the hover timer, allowing mouse to cross gaps + // We could expose 0.25f as style.HoverClearDelay but I am not sure of the logic yet, this is particularly subtle. + g.HoverItemDelayClearTimer += g.IO.DeltaTime; + if (g.HoverItemDelayClearTimer >= ImMax(0.25f, g.IO.DeltaTime * 2.0f)) // ~7 frames at 30 Hz + allow for low framerate + g.HoverItemDelayTimer = g.HoverItemDelayClearTimer = 0.0f; // May want a decaying timer, in which case need to clamp at max first, based on max of caller last requested timer. + } // Drag and drop g.DragDropAcceptIdPrev = g.DragDropAcceptIdCurr; g.DragDropAcceptIdCurr = 0; g.DragDropAcceptIdCurrRectSurface = FLT_MAX; - g.DragDropWithinSourceOrTarget = false; + g.DragDropWithinSource = false; + g.DragDropWithinTarget = false; + g.DragDropHoldJustPressedId = 0; + g.TooltipPreviousWindow = NULL; + + // Close popups on focus lost (currently wip/opt-in) + //if (g.IO.AppFocusLost) + // ClosePopupsExceptModals(); // Update keyboard input state - memcpy(g.IO.KeysDownDurationPrev, g.IO.KeysDownDuration, sizeof(g.IO.KeysDownDuration)); - for (int i = 0; i < IM_ARRAYSIZE(g.IO.KeysDown); i++) - g.IO.KeysDownDuration[i] = g.IO.KeysDown[i] ? (g.IO.KeysDownDuration[i] < 0.0f ? 0.0f : g.IO.KeysDownDuration[i] + g.IO.DeltaTime) : -1.0f; + UpdateKeyboardInputs(); - // Update gamepad/keyboard directional navigation + //IM_ASSERT(g.IO.KeyCtrl == IsKeyDown(ImGuiKey_LeftCtrl) || IsKeyDown(ImGuiKey_RightCtrl)); + //IM_ASSERT(g.IO.KeyShift == IsKeyDown(ImGuiKey_LeftShift) || IsKeyDown(ImGuiKey_RightShift)); + //IM_ASSERT(g.IO.KeyAlt == IsKeyDown(ImGuiKey_LeftAlt) || IsKeyDown(ImGuiKey_RightAlt)); + //IM_ASSERT(g.IO.KeySuper == IsKeyDown(ImGuiKey_LeftSuper) || IsKeyDown(ImGuiKey_RightSuper)); + + // Update keyboard/gamepad navigation NavUpdate(); // Update mouse input state UpdateMouseInputs(); - // Calculate frame-rate for the user, as a purely luxurious feature - g.FramerateSecPerFrameAccum += g.IO.DeltaTime - g.FramerateSecPerFrame[g.FramerateSecPerFrameIdx]; - g.FramerateSecPerFrame[g.FramerateSecPerFrameIdx] = g.IO.DeltaTime; - g.FramerateSecPerFrameIdx = (g.FramerateSecPerFrameIdx + 1) % IM_ARRAYSIZE(g.FramerateSecPerFrame); - g.IO.Framerate = (g.FramerateSecPerFrameAccum > 0.0f) ? (1.0f / (g.FramerateSecPerFrameAccum / (float)IM_ARRAYSIZE(g.FramerateSecPerFrame))) : FLT_MAX; + // Undocking + // (needs to be before UpdateMouseMovingWindowNewFrame so the window is already offset and following the mouse on the detaching frame) + DockContextNewFrameUpdateUndocking(&g); + + // Mark all windows as not visible and compact unused memory. + IM_ASSERT(g.WindowsFocusOrder.Size <= g.Windows.Size); + const float memory_compact_start_time = (g.GcCompactAll || g.IO.ConfigMemoryCompactTimer < 0.0f) ? FLT_MAX : (float)g.Time - g.IO.ConfigMemoryCompactTimer; + for (ImGuiWindow* window : g.Windows) + { + window->WasActive = window->Active; + window->Active = false; + window->WriteAccessed = false; + window->BeginCountPreviousFrame = window->BeginCount; + window->BeginCount = 0; + + // Garbage collect transient buffers of recently unused windows + if (!window->WasActive && !window->MemoryCompacted && window->LastTimeActive < memory_compact_start_time) + GcCompactTransientWindowBuffers(window); + } // Find hovered window // (needs to be before UpdateMouseMovingWindowNewFrame so we fill g.HoveredWindowUnderMovingWindow on the mouse release frame) + // (currently needs to be done after the WasActive=Active loop and FindHoveredWindowEx uses ->Active) UpdateHoveredWindowAndCaptureFlags(); // Handle user moving window with mouse (at the beginning of the frame to avoid input lag or sheering) @@ -3819,192 +5544,81 @@ void ImGui::NewFrame() g.MouseCursor = ImGuiMouseCursor_Arrow; g.WantCaptureMouseNextFrame = g.WantCaptureKeyboardNextFrame = g.WantTextInputNextFrame = -1; - g.PlatformImePos = ImVec2(1.0f, 1.0f); // OS Input Method Editor showing on top-left of our window by default + + // Platform IME data: reset for the frame + g.PlatformImeDataPrev = g.PlatformImeData; + g.PlatformImeData.WantVisible = false; // Mouse wheel scrolling, scale UpdateMouseWheel(); - // Pressing TAB activate widget focus - g.FocusTabPressed = (g.NavWindow && g.NavWindow->Active && !(g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs) && !g.IO.KeyCtrl && IsKeyPressedMap(ImGuiKey_Tab)); - if (g.ActiveId == 0 && g.FocusTabPressed) - { - // Note that SetKeyboardFocusHere() sets the Next fields mid-frame. To be consistent we also - // manipulate the Next fields even, even though they will be turned into Curr fields by the code below. - g.FocusRequestNextWindow = g.NavWindow; - g.FocusRequestNextCounterAll = INT_MAX; - if (g.NavId != 0 && g.NavIdTabCounter != INT_MAX) - g.FocusRequestNextCounterTab = g.NavIdTabCounter + 1 + (g.IO.KeyShift ? -1 : 1); - else - g.FocusRequestNextCounterTab = g.IO.KeyShift ? -1 : 0; - } - - // Turn queued focus request into current one - g.FocusRequestCurrWindow = NULL; - g.FocusRequestCurrCounterAll = g.FocusRequestCurrCounterTab = INT_MAX; - if (g.FocusRequestNextWindow != NULL) - { - ImGuiWindow* window = g.FocusRequestNextWindow; - g.FocusRequestCurrWindow = window; - if (g.FocusRequestNextCounterAll != INT_MAX && window->DC.FocusCounterAll != -1) - g.FocusRequestCurrCounterAll = ImModPositive(g.FocusRequestNextCounterAll, window->DC.FocusCounterAll + 1); - if (g.FocusRequestNextCounterTab != INT_MAX && window->DC.FocusCounterTab != -1) - g.FocusRequestCurrCounterTab = ImModPositive(g.FocusRequestNextCounterTab, window->DC.FocusCounterTab + 1); - g.FocusRequestNextWindow = NULL; - g.FocusRequestNextCounterAll = g.FocusRequestNextCounterTab = INT_MAX; - } - - g.NavIdTabCounter = INT_MAX; - - // Mark all windows as not visible and compact unused memory. - IM_ASSERT(g.WindowsFocusOrder.Size == g.Windows.Size); - const float memory_compact_start_time = (g.IO.ConfigWindowsMemoryCompactTimer >= 0.0f) ? (float)g.Time - g.IO.ConfigWindowsMemoryCompactTimer : FLT_MAX; - for (int i = 0; i != g.Windows.Size; i++) - { - ImGuiWindow* window = g.Windows[i]; - window->WasActive = window->Active; - window->BeginCount = 0; - window->Active = false; - window->WriteAccessed = false; - - // Garbage collect (this is totally functional but we may need decide if the side-effects are desirable) - if (!window->WasActive && !window->MemoryCompacted && window->LastTimeActive < memory_compact_start_time) - GcCompactTransientWindowBuffers(window); - } + // Garbage collect transient buffers of recently unused tables + for (int i = 0; i < g.TablesLastTimeActive.Size; i++) + if (g.TablesLastTimeActive[i] >= 0.0f && g.TablesLastTimeActive[i] < memory_compact_start_time) + TableGcCompactTransientBuffers(g.Tables.GetByIndex(i)); + for (ImGuiTableTempData& table_temp_data : g.TablesTempData) + if (table_temp_data.LastTimeActive >= 0.0f && table_temp_data.LastTimeActive < memory_compact_start_time) + TableGcCompactTransientBuffers(&table_temp_data); + if (g.GcCompactAll) + GcCompactTransientMiscBuffers(); + g.GcCompactAll = false; // Closing the focused window restore focus to the first active root window in descending z-order if (g.NavWindow && !g.NavWindow->WasActive) - FocusTopMostWindowUnderOne(NULL, NULL); + FocusTopMostWindowUnderOne(NULL, NULL, NULL, ImGuiFocusRequestFlags_RestoreFocusedChild); // No window should be open at the beginning of the frame. // But in order to allow the user to call NewFrame() multiple times without calling Render(), we are doing an explicit clear. g.CurrentWindowStack.resize(0); g.BeginPopupStack.resize(0); - ClosePopupsOverWindow(g.NavWindow, false); + g.ItemFlagsStack.resize(0); + g.ItemFlagsStack.push_back(ImGuiItemFlags_AutoClosePopups); // Default flags + g.CurrentItemFlags = g.ItemFlagsStack.back(); + g.GroupStack.resize(0); - // [DEBUG] Item picker tool - start with DebugStartItemPicker() - useful to visually select an item and break into its call-stack. + // Docking + DockContextNewFrameUpdateDocking(&g); + + // [DEBUG] Update debug features +#ifndef IMGUI_DISABLE_DEBUG_TOOLS UpdateDebugToolItemPicker(); + UpdateDebugToolStackQueries(); + UpdateDebugToolFlashStyleColor(); + if (g.DebugLocateFrames > 0 && --g.DebugLocateFrames == 0) + { + g.DebugLocateId = 0; + g.DebugBreakInLocateId = false; + } + if (g.DebugLogAutoDisableFrames > 0 && --g.DebugLogAutoDisableFrames == 0) + { + DebugLog("(Debug Log: Auto-disabled some ImGuiDebugLogFlags after 2 frames)\n"); + g.DebugLogFlags &= ~g.DebugLogAutoDisableFlags; + g.DebugLogAutoDisableFlags = ImGuiDebugLogFlags_None; + } +#endif // Create implicit/fallback window - which we will only render it if the user has added something to it. // We don't use "Debug" to avoid colliding with user trying to create a "Debug" window with custom flags. - // This fallback is particularly important as it avoid ImGui:: calls from crashing. - SetNextWindowSize(ImVec2(400,400), ImGuiCond_FirstUseEver); + // This fallback is particularly important as it prevents ImGui:: calls from crashing. + g.WithinFrameScopeWithImplicitWindow = true; + SetNextWindowSize(ImVec2(400, 400), ImGuiCond_FirstUseEver); Begin("Debug##Default"); - g.FrameScopePushedImplicitWindow = true; + IM_ASSERT(g.CurrentWindow->IsFallbackWindow == true); -#ifdef IMGUI_ENABLE_TEST_ENGINE - ImGuiTestEngineHook_PostNewFrame(&g); + // Store stack sizes + g.ErrorCountCurrentFrame = 0; + ErrorRecoveryStoreState(&g.StackSizesInNewFrame); + + // [DEBUG] When io.ConfigDebugBeginReturnValue is set, we make Begin()/BeginChild() return false at different level of the window-stack, + // allowing to validate correct Begin/End behavior in user code. +#ifndef IMGUI_DISABLE_DEBUG_TOOLS + if (g.IO.ConfigDebugBeginReturnValueLoop) + g.DebugBeginReturnValueCullDepth = (g.DebugBeginReturnValueCullDepth == -1) ? 0 : ((g.DebugBeginReturnValueCullDepth + ((g.FrameCount % 4) == 0 ? 1 : 0)) % 10); + else + g.DebugBeginReturnValueCullDepth = -1; #endif -} -// [DEBUG] Item picker tool - start with DebugStartItemPicker() - useful to visually select an item and break into its call-stack. -void ImGui::UpdateDebugToolItemPicker() -{ - ImGuiContext& g = *GImGui; - g.DebugItemPickerBreakID = 0; - if (g.DebugItemPickerActive) - { - const ImGuiID hovered_id = g.HoveredIdPreviousFrame; - ImGui::SetMouseCursor(ImGuiMouseCursor_Hand); - if (ImGui::IsKeyPressedMap(ImGuiKey_Escape)) - g.DebugItemPickerActive = false; - if (ImGui::IsMouseClicked(0) && hovered_id) - { - g.DebugItemPickerBreakID = hovered_id; - g.DebugItemPickerActive = false; - } - ImGui::SetNextWindowBgAlpha(0.60f); - ImGui::BeginTooltip(); - ImGui::Text("HoveredId: 0x%08X", hovered_id); - ImGui::Text("Press ESC to abort picking."); - ImGui::TextColored(GetStyleColorVec4(hovered_id ? ImGuiCol_Text : ImGuiCol_TextDisabled), "Click to break in debugger!"); - ImGui::EndTooltip(); - } -} - -void ImGui::Initialize(ImGuiContext* context) -{ - ImGuiContext& g = *context; - IM_ASSERT(!g.Initialized && !g.SettingsLoaded); - - // Add .ini handle for ImGuiWindow type - ImGuiSettingsHandler ini_handler; - ini_handler.TypeName = "Window"; - ini_handler.TypeHash = ImHashStr("Window"); - ini_handler.ReadOpenFn = SettingsHandlerWindow_ReadOpen; - ini_handler.ReadLineFn = SettingsHandlerWindow_ReadLine; - ini_handler.WriteAllFn = SettingsHandlerWindow_WriteAll; - g.SettingsHandlers.push_back(ini_handler); - - g.Initialized = true; -} - -// This function is merely here to free heap allocations. -void ImGui::Shutdown(ImGuiContext* context) -{ - // The fonts atlas can be used prior to calling NewFrame(), so we clear it even if g.Initialized is FALSE (which would happen if we never called NewFrame) - ImGuiContext& g = *context; - if (g.IO.Fonts && g.FontAtlasOwnedByContext) - { - g.IO.Fonts->Locked = false; - IM_DELETE(g.IO.Fonts); - } - g.IO.Fonts = NULL; - - // Cleanup of other data are conditional on actually having initialized Dear ImGui. - if (!g.Initialized) - return; - - // Save settings (unless we haven't attempted to load them: CreateContext/DestroyContext without a call to NewFrame shouldn't save an empty file) - if (g.SettingsLoaded && g.IO.IniFilename != NULL) - { - ImGuiContext* backup_context = GImGui; - SetCurrentContext(context); - SaveIniSettingsToDisk(g.IO.IniFilename); - SetCurrentContext(backup_context); - } - - // Clear everything else - for (int i = 0; i < g.Windows.Size; i++) - IM_DELETE(g.Windows[i]); - g.Windows.clear(); - g.WindowsFocusOrder.clear(); - g.WindowsSortBuffer.clear(); - g.CurrentWindow = NULL; - g.CurrentWindowStack.clear(); - g.WindowsById.Clear(); - g.NavWindow = NULL; - g.HoveredWindow = g.HoveredRootWindow = NULL; - g.ActiveIdWindow = g.ActiveIdPreviousFrameWindow = NULL; - g.MovingWindow = NULL; - g.ColorModifiers.clear(); - g.StyleModifiers.clear(); - g.FontStack.clear(); - g.OpenPopupStack.clear(); - g.BeginPopupStack.clear(); - g.DrawDataBuilder.ClearFreeMemory(); - g.BackgroundDrawList.ClearFreeMemory(); - g.ForegroundDrawList.ClearFreeMemory(); - - g.TabBars.Clear(); - g.CurrentTabBarStack.clear(); - g.ShrinkWidthBuffer.clear(); - - g.PrivateClipboard.clear(); - g.InputTextState.ClearFreeMemory(); - - for (int i = 0; i < g.SettingsWindows.Size; i++) - IM_DELETE(g.SettingsWindows[i].Name); - g.SettingsWindows.clear(); - g.SettingsHandlers.clear(); - - if (g.LogFile && g.LogFile != stdout) - { - fclose(g.LogFile); - g.LogFile = NULL; - } - g.LogBuffer.clear(); - - g.Initialized = false; + CallContextHooks(&g, ImGuiContextHookType_NewFramePost); } // FIXME: Add a more explicit sort order in the window structure. @@ -4025,8 +5639,7 @@ static void AddWindowToSortBuffer(ImVector* out_sorted_windows, Im if (window->Active) { int count = window->DC.ChildWindows.Size; - if (count > 1) - ImQsort(window->DC.ChildWindows.Data, (size_t)count, sizeof(ImGuiWindow*), ChildWindowComparer); + ImQsort(window->DC.ChildWindows.Data, (size_t)count, sizeof(ImGuiWindow*), ChildWindowComparer); for (int i = 0; i < count; i++) { ImGuiWindow* child = window->DC.ChildWindows[i]; @@ -4036,107 +5649,84 @@ static void AddWindowToSortBuffer(ImVector* out_sorted_windows, Im } } -static void AddDrawListToDrawData(ImVector* out_list, ImDrawList* draw_list) -{ - if (draw_list->CmdBuffer.empty()) - return; - - // Remove trailing command if unused - ImDrawCmd& last_cmd = draw_list->CmdBuffer.back(); - if (last_cmd.ElemCount == 0 && last_cmd.UserCallback == NULL) - { - draw_list->CmdBuffer.pop_back(); - if (draw_list->CmdBuffer.empty()) - return; - } - - // Draw list sanity check. Detect mismatch between PrimReserve() calls and incrementing _VtxCurrentIdx, _VtxWritePtr etc. - // May trigger for you if you are using PrimXXX functions incorrectly. - IM_ASSERT(draw_list->VtxBuffer.Size == 0 || draw_list->_VtxWritePtr == draw_list->VtxBuffer.Data + draw_list->VtxBuffer.Size); - IM_ASSERT(draw_list->IdxBuffer.Size == 0 || draw_list->_IdxWritePtr == draw_list->IdxBuffer.Data + draw_list->IdxBuffer.Size); - if (!(draw_list->Flags & ImDrawListFlags_AllowVtxOffset)) - IM_ASSERT((int)draw_list->_VtxCurrentIdx == draw_list->VtxBuffer.Size); - - // Check that draw_list doesn't use more vertices than indexable (default ImDrawIdx = unsigned short = 2 bytes = 64K vertices per ImDrawList = per window) - // If this assert triggers because you are drawing lots of stuff manually: - // - First, make sure you are coarse clipping yourself and not trying to draw many things outside visible bounds. - // Be mindful that the ImDrawList API doesn't filter vertices. Use the Metrics window to inspect draw list contents. - // - If you want large meshes with more than 64K vertices, you can either: - // (A) Handle the ImDrawCmd::VtxOffset value in your renderer back-end, and set 'io.BackendFlags |= ImGuiBackendFlags_RendererHasVtxOffset'. - // Most example back-ends already support this from 1.71. Pre-1.71 back-ends won't. - // Some graphics API such as GL ES 1/2 don't have a way to offset the starting vertex so it is not supported for them. - // (B) Or handle 32-bits indices in your renderer back-end, and uncomment '#define ImDrawIdx unsigned int' line in imconfig.h. - // Most example back-ends already support this. For example, the OpenGL example code detect index size at compile-time: - // glDrawElements(GL_TRIANGLES, (GLsizei)pcmd->ElemCount, sizeof(ImDrawIdx) == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, idx_buffer_offset); - // Your own engine or render API may use different parameters or function calls to specify index sizes. - // 2 and 4 bytes indices are generally supported by most graphics API. - // - If for some reason neither of those solutions works for you, a workaround is to call BeginChild()/EndChild() before reaching - // the 64K limit to split your draw commands in multiple draw lists. - if (sizeof(ImDrawIdx) == 2) - IM_ASSERT(draw_list->_VtxCurrentIdx < (1 << 16) && "Too many vertices in ImDrawList using 16-bit indices. Read comment above"); - - out_list->push_back(draw_list); -} - -static void AddWindowToDrawData(ImVector* out_render_list, ImGuiWindow* window) +static void AddWindowToDrawData(ImGuiWindow* window, int layer) { ImGuiContext& g = *GImGui; + ImGuiViewportP* viewport = window->Viewport; + IM_ASSERT(viewport != NULL); g.IO.MetricsRenderWindows++; - AddDrawListToDrawData(out_render_list, window->DrawList); - for (int i = 0; i < window->DC.ChildWindows.Size; i++) - { - ImGuiWindow* child = window->DC.ChildWindows[i]; - if (IsWindowActiveAndVisible(child)) // clipped children may have been marked not active - AddWindowToDrawData(out_render_list, child); - } + if (window->DrawList->_Splitter._Count > 1) + window->DrawList->ChannelsMerge(); // Merge if user forgot to merge back. Also required in Docking branch for ImGuiWindowFlags_DockNodeHost windows. + ImGui::AddDrawListToDrawDataEx(&viewport->DrawDataP, viewport->DrawDataBuilder.Layers[layer], window->DrawList); + for (ImGuiWindow* child : window->DC.ChildWindows) + if (IsWindowActiveAndVisible(child)) // Clipped children may have been marked not active + AddWindowToDrawData(child, layer); +} + +static inline int GetWindowDisplayLayer(ImGuiWindow* window) +{ + return (window->Flags & ImGuiWindowFlags_Tooltip) ? 1 : 0; } // Layer is locked for the root window, however child windows may use a different viewport (e.g. extruding menu) -static void AddRootWindowToDrawData(ImGuiWindow* window) +static inline void AddRootWindowToDrawData(ImGuiWindow* window) { - ImGuiContext& g = *GImGui; - if (window->Flags & ImGuiWindowFlags_Tooltip) - AddWindowToDrawData(&g.DrawDataBuilder.Layers[1], window); - else - AddWindowToDrawData(&g.DrawDataBuilder.Layers[0], window); + AddWindowToDrawData(window, GetWindowDisplayLayer(window)); } -void ImDrawDataBuilder::FlattenIntoSingleLayer() +static void FlattenDrawDataIntoSingleLayer(ImDrawDataBuilder* builder) { - int n = Layers[0].Size; - int size = n; - for (int i = 1; i < IM_ARRAYSIZE(Layers); i++) - size += Layers[i].Size; - Layers[0].resize(size); - for (int layer_n = 1; layer_n < IM_ARRAYSIZE(Layers); layer_n++) + int n = builder->Layers[0]->Size; + int full_size = n; + for (int i = 1; i < IM_ARRAYSIZE(builder->Layers); i++) + full_size += builder->Layers[i]->Size; + builder->Layers[0]->resize(full_size); + for (int layer_n = 1; layer_n < IM_ARRAYSIZE(builder->Layers); layer_n++) { - ImVector& layer = Layers[layer_n]; - if (layer.empty()) + ImVector* layer = builder->Layers[layer_n]; + if (layer->empty()) continue; - memcpy(&Layers[0][n], &layer[0], layer.Size * sizeof(ImDrawList*)); - n += layer.Size; - layer.resize(0); + memcpy(builder->Layers[0]->Data + n, layer->Data, layer->Size * sizeof(ImDrawList*)); + n += layer->Size; + layer->resize(0); } } -static void SetupDrawData(ImVector* draw_lists, ImDrawData* draw_data) +static void InitViewportDrawData(ImGuiViewportP* viewport) { ImGuiIO& io = ImGui::GetIO(); + ImDrawData* draw_data = &viewport->DrawDataP; + + viewport->DrawData = draw_data; // Make publicly accessible + viewport->DrawDataBuilder.Layers[0] = &draw_data->CmdLists; + viewport->DrawDataBuilder.Layers[1] = &viewport->DrawDataBuilder.LayerData1; + viewport->DrawDataBuilder.Layers[0]->resize(0); + viewport->DrawDataBuilder.Layers[1]->resize(0); + + // When minimized, we report draw_data->DisplaySize as zero to be consistent with non-viewport mode, + // and to allow applications/backends to easily skip rendering. + // FIXME: Note that we however do NOT attempt to report "zero drawlist / vertices" into the ImDrawData structure. + // This is because the work has been done already, and its wasted! We should fix that and add optimizations for + // it earlier in the pipeline, rather than pretend to hide the data at the end of the pipeline. + const bool is_minimized = (viewport->Flags & ImGuiViewportFlags_IsMinimized) != 0; + draw_data->Valid = true; - draw_data->CmdLists = (draw_lists->Size > 0) ? draw_lists->Data : NULL; - draw_data->CmdListsCount = draw_lists->Size; + draw_data->CmdListsCount = 0; draw_data->TotalVtxCount = draw_data->TotalIdxCount = 0; - draw_data->DisplayPos = ImVec2(0.0f, 0.0f); - draw_data->DisplaySize = io.DisplaySize; - draw_data->FramebufferScale = io.DisplayFramebufferScale; - for (int n = 0; n < draw_lists->Size; n++) - { - draw_data->TotalVtxCount += draw_lists->Data[n]->VtxBuffer.Size; - draw_data->TotalIdxCount += draw_lists->Data[n]->IdxBuffer.Size; - } + draw_data->DisplayPos = viewport->Pos; + draw_data->DisplaySize = is_minimized ? ImVec2(0.0f, 0.0f) : viewport->Size; + draw_data->FramebufferScale = io.DisplayFramebufferScale; // FIXME-VIEWPORT: This may vary on a per-monitor/viewport basis? + draw_data->OwnerViewport = viewport; } -// When using this function it is sane to ensure that float are perfectly rounded to integer values, to that e.g. (int)(max.x-min.x) in user's render produce correct result. +// Push a clipping rectangle for both ImGui logic (hit-testing etc.) and low-level ImDrawList rendering. +// - When using this function it is sane to ensure that float are perfectly rounded to integer values, +// so that e.g. (int)(max.x-min.x) in user's render produce correct result. +// - If the code here changes, may need to update code of functions like NextColumn() and PushColumnClipRect(): +// some frequently called functions which to modify both channels and clipping simultaneously tend to use the +// more specialized SetWindowClipRectBeforeSetChannel() to avoid extraneous updates of underlying ImDrawCmds. +// - This is analoguous to PushFont()/PopFont() in the sense that are a mixing a global stack and a window stack, +// which in the case of ClipRect is not so problematic but tends to be more restrictive for fonts. void ImGui::PushClipRect(const ImVec2& clip_rect_min, const ImVec2& clip_rect_max, bool intersect_with_current_clip_rect) { ImGuiWindow* window = GetCurrentWindow(); @@ -4151,98 +5741,235 @@ void ImGui::PopClipRect() window->ClipRect = window->DrawList->_ClipRectStack.back(); } +static ImGuiWindow* FindFrontMostVisibleChildWindow(ImGuiWindow* window) +{ + for (int n = window->DC.ChildWindows.Size - 1; n >= 0; n--) + if (IsWindowActiveAndVisible(window->DC.ChildWindows[n])) + return FindFrontMostVisibleChildWindow(window->DC.ChildWindows[n]); + return window; +} + +static void ImGui::RenderDimmedBackgroundBehindWindow(ImGuiWindow* window, ImU32 col) +{ + if ((col & IM_COL32_A_MASK) == 0) + return; + + ImGuiViewportP* viewport = window->Viewport; + ImRect viewport_rect = viewport->GetMainRect(); + + // Draw behind window by moving the draw command at the FRONT of the draw list + { + // Draw list have been trimmed already, hence the explicit recreation of a draw command if missing. + // FIXME: This is creating complication, might be simpler if we could inject a drawlist in drawdata at a given position and not attempt to manipulate ImDrawCmd order. + ImDrawList* draw_list = window->RootWindowDockTree->DrawList; + draw_list->ChannelsMerge(); + if (draw_list->CmdBuffer.Size == 0) + draw_list->AddDrawCmd(); + draw_list->PushClipRect(viewport_rect.Min - ImVec2(1, 1), viewport_rect.Max + ImVec2(1, 1), false); // FIXME: Need to stricty ensure ImDrawCmd are not merged (ElemCount==6 checks below will verify that) + draw_list->AddRectFilled(viewport_rect.Min, viewport_rect.Max, col); + ImDrawCmd cmd = draw_list->CmdBuffer.back(); + IM_ASSERT(cmd.ElemCount == 6); + draw_list->CmdBuffer.pop_back(); + draw_list->CmdBuffer.push_front(cmd); + draw_list->AddDrawCmd(); // We need to create a command as CmdBuffer.back().IdxOffset won't be correct if we append to same command. + draw_list->PopClipRect(); + } + + // Draw over sibling docking nodes in a same docking tree + if (window->RootWindow->DockIsActive) + { + ImDrawList* draw_list = FindFrontMostVisibleChildWindow(window->RootWindowDockTree)->DrawList; + draw_list->ChannelsMerge(); + if (draw_list->CmdBuffer.Size == 0) + draw_list->AddDrawCmd(); + draw_list->PushClipRect(viewport_rect.Min, viewport_rect.Max, false); + RenderRectFilledWithHole(draw_list, window->RootWindowDockTree->Rect(), window->RootWindow->Rect(), col, 0.0f);// window->RootWindowDockTree->WindowRounding); + draw_list->PopClipRect(); + } +} + +ImGuiWindow* ImGui::FindBottomMostVisibleWindowWithinBeginStack(ImGuiWindow* parent_window) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* bottom_most_visible_window = parent_window; + for (int i = FindWindowDisplayIndex(parent_window); i >= 0; i--) + { + ImGuiWindow* window = g.Windows[i]; + if (window->Flags & ImGuiWindowFlags_ChildWindow) + continue; + if (!IsWindowWithinBeginStackOf(window, parent_window)) + break; + if (IsWindowActiveAndVisible(window) && GetWindowDisplayLayer(window) <= GetWindowDisplayLayer(parent_window)) + bottom_most_visible_window = window; + } + return bottom_most_visible_window; +} + +// Important: AddWindowToDrawData() has not been called yet, meaning DockNodeHost windows needs a DrawList->ChannelsMerge() before usage. +// We call ChannelsMerge() lazily here at it is faster that doing a full iteration of g.Windows[] prior to calling RenderDimmedBackgrounds(). +static void ImGui::RenderDimmedBackgrounds() +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* modal_window = GetTopMostAndVisiblePopupModal(); + if (g.DimBgRatio <= 0.0f && g.NavWindowingHighlightAlpha <= 0.0f) + return; + const bool dim_bg_for_modal = (modal_window != NULL); + const bool dim_bg_for_window_list = (g.NavWindowingTargetAnim != NULL && g.NavWindowingTargetAnim->Active); + if (!dim_bg_for_modal && !dim_bg_for_window_list) + return; + + ImGuiViewport* viewports_already_dimmed[2] = { NULL, NULL }; + if (dim_bg_for_modal) + { + // Draw dimming behind modal or a begin stack child, whichever comes first in draw order. + ImGuiWindow* dim_behind_window = FindBottomMostVisibleWindowWithinBeginStack(modal_window); + RenderDimmedBackgroundBehindWindow(dim_behind_window, GetColorU32(modal_window->DC.ModalDimBgColor, g.DimBgRatio)); + viewports_already_dimmed[0] = modal_window->Viewport; + } + else if (dim_bg_for_window_list) + { + // Draw dimming behind CTRL+Tab target window and behind CTRL+Tab UI window + RenderDimmedBackgroundBehindWindow(g.NavWindowingTargetAnim, GetColorU32(ImGuiCol_NavWindowingDimBg, g.DimBgRatio)); + if (g.NavWindowingListWindow != NULL && g.NavWindowingListWindow->Viewport && g.NavWindowingListWindow->Viewport != g.NavWindowingTargetAnim->Viewport) + RenderDimmedBackgroundBehindWindow(g.NavWindowingListWindow, GetColorU32(ImGuiCol_NavWindowingDimBg, g.DimBgRatio)); + viewports_already_dimmed[0] = g.NavWindowingTargetAnim->Viewport; + viewports_already_dimmed[1] = g.NavWindowingListWindow ? g.NavWindowingListWindow->Viewport : NULL; + + // Draw border around CTRL+Tab target window + ImGuiWindow* window = g.NavWindowingTargetAnim; + ImGuiViewport* viewport = window->Viewport; + float distance = g.FontSize; + ImRect bb = window->Rect(); + bb.Expand(distance); + if (bb.GetWidth() >= viewport->Size.x && bb.GetHeight() >= viewport->Size.y) + bb.Expand(-distance - 1.0f); // If a window fits the entire viewport, adjust its highlight inward + window->DrawList->ChannelsMerge(); + if (window->DrawList->CmdBuffer.Size == 0) + window->DrawList->AddDrawCmd(); + window->DrawList->PushClipRect(viewport->Pos, viewport->Pos + viewport->Size); + window->DrawList->AddRect(bb.Min, bb.Max, GetColorU32(ImGuiCol_NavWindowingHighlight, g.NavWindowingHighlightAlpha), window->WindowRounding, 0, 3.0f); + window->DrawList->PopClipRect(); + } + + // Draw dimming background on _other_ viewports than the ones our windows are in + for (ImGuiViewportP* viewport : g.Viewports) + { + if (viewport == viewports_already_dimmed[0] || viewport == viewports_already_dimmed[1]) + continue; + if (modal_window && viewport->Window && IsWindowAbove(viewport->Window, modal_window)) + continue; + ImDrawList* draw_list = GetForegroundDrawList(viewport); + const ImU32 dim_bg_col = GetColorU32(dim_bg_for_modal ? ImGuiCol_ModalWindowDimBg : ImGuiCol_NavWindowingDimBg, g.DimBgRatio); + draw_list->AddRectFilled(viewport->Pos, viewport->Pos + viewport->Size, dim_bg_col); + } +} + // This is normally called by Render(). You may want to call it directly if you want to avoid calling Render() but the gain will be very minimal. void ImGui::EndFrame() { ImGuiContext& g = *GImGui; IM_ASSERT(g.Initialized); - if (g.FrameCountEnded == g.FrameCount) // Don't process EndFrame() multiple times. + + // Don't process EndFrame() multiple times. + if (g.FrameCountEnded == g.FrameCount) return; - IM_ASSERT(g.FrameScopeActive && "Forgot to call ImGui::NewFrame()?"); + IM_ASSERT(g.WithinFrameScope && "Forgot to call ImGui::NewFrame()?"); - // Notify OS when our Input Method Editor cursor has moved (e.g. CJK inputs using Microsoft IME) - if (g.IO.ImeSetInputScreenPosFn && (g.PlatformImeLastPos.x == FLT_MAX || ImLengthSqr(g.PlatformImeLastPos - g.PlatformImePos) > 0.0001f)) - { - g.IO.ImeSetInputScreenPosFn((int)g.PlatformImePos.x, (int)g.PlatformImePos.y); - g.PlatformImeLastPos = g.PlatformImePos; - } + CallContextHooks(&g, ImGuiContextHookType_EndFramePre); - // Report when there is a mismatch of Begin/BeginChild vs End/EndChild calls. Important: Remember that the Begin/BeginChild API requires you - // to always call End/EndChild even if Begin/BeginChild returns false! (this is unfortunately inconsistent with most other Begin* API). - if (g.CurrentWindowStack.Size != 1) + // [EXPERIMENTAL] Recover from errors + if (g.IO.ConfigErrorRecovery) + ErrorRecoveryTryToRecoverState(&g.StackSizesInNewFrame); + ErrorCheckEndFrameSanityChecks(); + ErrorCheckEndFrameFinalizeErrorTooltip(); + + // Notify Platform/OS when our Input Method Editor cursor has moved (e.g. CJK inputs using Microsoft IME) + ImGuiPlatformImeData* ime_data = &g.PlatformImeData; + if (g.PlatformIO.Platform_SetImeDataFn != NULL && memcmp(ime_data, &g.PlatformImeDataPrev, sizeof(ImGuiPlatformImeData)) != 0) { - if (g.CurrentWindowStack.Size > 1) - { - IM_ASSERT(g.CurrentWindowStack.Size == 1 && "Mismatched Begin/BeginChild vs End/EndChild calls: did you forget to call End/EndChild?"); - while (g.CurrentWindowStack.Size > 1) // FIXME-ERRORHANDLING - End(); - } - else - { - IM_ASSERT(g.CurrentWindowStack.Size == 1 && "Mismatched Begin/BeginChild vs End/EndChild calls: did you call End/EndChild too much?"); - } + ImGuiViewport* viewport = FindViewportByID(g.PlatformImeViewport); + IMGUI_DEBUG_LOG_IO("[io] Calling Platform_SetImeDataFn(): WantVisible: %d, InputPos (%.2f,%.2f)\n", ime_data->WantVisible, ime_data->InputPos.x, ime_data->InputPos.y); + if (viewport == NULL) + viewport = GetMainViewport(); + g.PlatformIO.Platform_SetImeDataFn(&g, viewport, ime_data); } // Hide implicit/fallback "Debug" window if it hasn't been used - g.FrameScopePushedImplicitWindow = false; + g.WithinFrameScopeWithImplicitWindow = false; if (g.CurrentWindow && !g.CurrentWindow->WriteAccessed) g.CurrentWindow->Active = false; End(); - // Show CTRL+TAB list window - if (g.NavWindowingTarget != NULL) - NavUpdateWindowingOverlay(); + // Update navigation: CTRL+Tab, wrap-around requests + NavEndFrame(); + + // Update docking + DockContextEndFrame(&g); + + SetCurrentViewport(NULL, NULL); // Drag and Drop: Elapse payload (if delivered, or if source stops being submitted) if (g.DragDropActive) { bool is_delivered = g.DragDropPayload.Delivery; - bool is_elapsed = (g.DragDropPayload.DataFrameCount + 1 < g.FrameCount) && ((g.DragDropSourceFlags & ImGuiDragDropFlags_SourceAutoExpirePayload) || !IsMouseDown(g.DragDropMouseButton)); + bool is_elapsed = (g.DragDropSourceFrameCount + 1 < g.FrameCount) && ((g.DragDropSourceFlags & ImGuiDragDropFlags_PayloadAutoExpire) || g.DragDropMouseButton == -1 || !IsMouseDown(g.DragDropMouseButton)); if (is_delivered || is_elapsed) ClearDragDrop(); } - // Drag and Drop: Fallback for source tooltip. This is not ideal but better than nothing. - if (g.DragDropActive && g.DragDropSourceFrameCount < g.FrameCount) + // Drag and Drop: Fallback for missing source tooltip. This is not ideal but better than nothing. + // If you want to handle source item disappearing: instead of submitting your description tooltip + // in the BeginDragDropSource() block of the dragged item, you can submit them from a safe single spot + // (e.g. end of your item loop, or before EndFrame) by reading payload data. + // In the typical case, the contents of drag tooltip should be possible to infer solely from payload data. + if (g.DragDropActive && g.DragDropSourceFrameCount + 1 < g.FrameCount && !(g.DragDropSourceFlags & ImGuiDragDropFlags_SourceNoPreviewTooltip)) { - g.DragDropWithinSourceOrTarget = true; + g.DragDropWithinSource = true; SetTooltip("..."); - g.DragDropWithinSourceOrTarget = false; + g.DragDropWithinSource = false; } // End frame - g.FrameScopeActive = false; + g.WithinFrameScope = false; g.FrameCountEnded = g.FrameCount; // Initiate moving window + handle left-click and right-click focus UpdateMouseMovingWindowEndFrame(); + // Update user-facing viewport list (g.Viewports -> g.PlatformIO.Viewports after filtering out some) + UpdateViewportsEndFrame(); + // Sort the window list so that all child windows are after their parent - // We cannot do that on FocusWindow() because childs may not exist yet - g.WindowsSortBuffer.resize(0); - g.WindowsSortBuffer.reserve(g.Windows.Size); - for (int i = 0; i != g.Windows.Size; i++) + // We cannot do that on FocusWindow() because children may not exist yet + g.WindowsTempSortBuffer.resize(0); + g.WindowsTempSortBuffer.reserve(g.Windows.Size); + for (ImGuiWindow* window : g.Windows) { - ImGuiWindow* window = g.Windows[i]; if (window->Active && (window->Flags & ImGuiWindowFlags_ChildWindow)) // if a child is active its parent will add it continue; - AddWindowToSortBuffer(&g.WindowsSortBuffer, window); + AddWindowToSortBuffer(&g.WindowsTempSortBuffer, window); } // This usually assert if there is a mismatch between the ImGuiWindowFlags_ChildWindow / ParentWindow values and DC.ChildWindows[] in parents, aka we've done something wrong. - IM_ASSERT(g.Windows.Size == g.WindowsSortBuffer.Size); - g.Windows.swap(g.WindowsSortBuffer); + IM_ASSERT(g.Windows.Size == g.WindowsTempSortBuffer.Size); + g.Windows.swap(g.WindowsTempSortBuffer); g.IO.MetricsActiveWindows = g.WindowsActiveCount; // Unlock font atlas g.IO.Fonts->Locked = false; // Clear Input data for next frame + g.IO.MousePosPrev = g.IO.MousePos; + g.IO.AppFocusLost = false; g.IO.MouseWheel = g.IO.MouseWheelH = 0.0f; g.IO.InputQueueCharacters.resize(0); - memset(g.IO.NavInputs, 0, sizeof(g.IO.NavInputs)); + + CallContextHooks(&g, ImGuiContextHookType_EndFramePost); } +// Prepare the data for rendering so you can call GetDrawData() +// (As with anything within the ImGui:: namspace this doesn't touch your GPU or graphics API at all: +// it is the role of the ImGui_ImplXXXX_RenderDrawData() function provided by the renderer backend) void ImGui::Render() { ImGuiContext& g = *GImGui; @@ -4250,49 +5977,67 @@ void ImGui::Render() if (g.FrameCountEnded != g.FrameCount) EndFrame(); + if (g.FrameCountRendered == g.FrameCount) + return; g.FrameCountRendered = g.FrameCount; - // Gather ImDrawList to render (for each active window) - g.IO.MetricsRenderVertices = g.IO.MetricsRenderIndices = g.IO.MetricsRenderWindows = 0; - g.DrawDataBuilder.Clear(); - if (!g.BackgroundDrawList.VtxBuffer.empty()) - AddDrawListToDrawData(&g.DrawDataBuilder.Layers[0], &g.BackgroundDrawList); + g.IO.MetricsRenderWindows = 0; + CallContextHooks(&g, ImGuiContextHookType_RenderPre); - ImGuiWindow* windows_to_render_top_most[2]; - windows_to_render_top_most[0] = (g.NavWindowingTarget && !(g.NavWindowingTarget->Flags & ImGuiWindowFlags_NoBringToFrontOnFocus)) ? g.NavWindowingTarget->RootWindow : NULL; - windows_to_render_top_most[1] = g.NavWindowingTarget ? g.NavWindowingList : NULL; - for (int n = 0; n != g.Windows.Size; n++) + // Add background ImDrawList (for each active viewport) + for (ImGuiViewportP* viewport : g.Viewports) { - ImGuiWindow* window = g.Windows[n]; + InitViewportDrawData(viewport); + if (viewport->BgFgDrawLists[0] != NULL) + AddDrawListToDrawDataEx(&viewport->DrawDataP, viewport->DrawDataBuilder.Layers[0], GetBackgroundDrawList(viewport)); + } + + // Draw modal/window whitening backgrounds + RenderDimmedBackgrounds(); + + // Add ImDrawList to render + ImGuiWindow* windows_to_render_top_most[2]; + windows_to_render_top_most[0] = (g.NavWindowingTarget && !(g.NavWindowingTarget->Flags & ImGuiWindowFlags_NoBringToFrontOnFocus)) ? g.NavWindowingTarget->RootWindowDockTree : NULL; + windows_to_render_top_most[1] = (g.NavWindowingTarget ? g.NavWindowingListWindow : NULL); + for (ImGuiWindow* window : g.Windows) + { + IM_MSVC_WARNING_SUPPRESS(6011); // Static Analysis false positive "warning C6011: Dereferencing NULL pointer 'window'" if (IsWindowActiveAndVisible(window) && (window->Flags & ImGuiWindowFlags_ChildWindow) == 0 && window != windows_to_render_top_most[0] && window != windows_to_render_top_most[1]) AddRootWindowToDrawData(window); } for (int n = 0; n < IM_ARRAYSIZE(windows_to_render_top_most); n++) if (windows_to_render_top_most[n] && IsWindowActiveAndVisible(windows_to_render_top_most[n])) // NavWindowingTarget is always temporarily displayed as the top-most window AddRootWindowToDrawData(windows_to_render_top_most[n]); - g.DrawDataBuilder.FlattenIntoSingleLayer(); - // Draw software mouse cursor if requested - if (g.IO.MouseDrawCursor) - RenderMouseCursor(&g.ForegroundDrawList, g.IO.MousePos, g.Style.MouseCursorScale, g.MouseCursor, IM_COL32_WHITE, IM_COL32_BLACK, IM_COL32(0, 0, 0, 48)); + // Draw software mouse cursor if requested by io.MouseDrawCursor flag + if (g.IO.MouseDrawCursor && g.MouseCursor != ImGuiMouseCursor_None) + RenderMouseCursor(g.IO.MousePos, g.Style.MouseCursorScale, g.MouseCursor, IM_COL32_WHITE, IM_COL32_BLACK, IM_COL32(0, 0, 0, 48)); - if (!g.ForegroundDrawList.VtxBuffer.empty()) - AddDrawListToDrawData(&g.DrawDataBuilder.Layers[0], &g.ForegroundDrawList); + // Setup ImDrawData structures for end-user + g.IO.MetricsRenderVertices = g.IO.MetricsRenderIndices = 0; + for (ImGuiViewportP* viewport : g.Viewports) + { + FlattenDrawDataIntoSingleLayer(&viewport->DrawDataBuilder); - // Setup ImDrawData structure for end-user - SetupDrawData(&g.DrawDataBuilder.Layers[0], &g.DrawData); - g.IO.MetricsRenderVertices = g.DrawData.TotalVtxCount; - g.IO.MetricsRenderIndices = g.DrawData.TotalIdxCount; + // Add foreground ImDrawList (for each active viewport) + if (viewport->BgFgDrawLists[1] != NULL) + AddDrawListToDrawDataEx(&viewport->DrawDataP, viewport->DrawDataBuilder.Layers[0], GetForegroundDrawList(viewport)); - // (Legacy) Call the Render callback function. The current prefer way is to let the user retrieve GetDrawData() and call the render function themselves. -#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS - if (g.DrawData.CmdListsCount > 0 && g.IO.RenderDrawListsFn != NULL) - g.IO.RenderDrawListsFn(&g.DrawData); -#endif + // We call _PopUnusedDrawCmd() last thing, as RenderDimmedBackgrounds() rely on a valid command being there (especially in docking branch). + ImDrawData* draw_data = &viewport->DrawDataP; + IM_ASSERT(draw_data->CmdLists.Size == draw_data->CmdListsCount); + for (ImDrawList* draw_list : draw_data->CmdLists) + draw_list->_PopUnusedDrawCmd(); + + g.IO.MetricsRenderVertices += draw_data->TotalVtxCount; + g.IO.MetricsRenderIndices += draw_data->TotalIdxCount; + } + + CallContextHooks(&g, ImGuiContextHookType_RenderPost); } // Calculate text size. Text can be multi-line. Optionally ignore text after a ## marker. -// CalcTextSize("") should return ImVec2(0.0f, GImGui->FontSize) +// CalcTextSize("") should return ImVec2(0.0f, g.FontSize) ImVec2 ImGui::CalcTextSize(const char* text, const char* text_end, bool hide_text_after_double_hash, float wrap_width) { ImGuiContext& g = *GImGui; @@ -4310,277 +6055,95 @@ ImVec2 ImGui::CalcTextSize(const char* text, const char* text_end, bool hide_tex ImVec2 text_size = font->CalcTextSizeA(font_size, FLT_MAX, wrap_width, text, text_display_end, NULL); // Round - text_size.x = (float)(int)(text_size.x + 0.95f); + // FIXME: This has been here since Dec 2015 (7b0bf230) but down the line we want this out. + // FIXME: Investigate using ceilf or e.g. + // - https://git.musl-libc.org/cgit/musl/tree/src/math/ceilf.c + // - https://embarkstudios.github.io/rust-gpu/api/src/libm/math/ceilf.rs.html + text_size.x = IM_TRUNC(text_size.x + 0.99999f); return text_size; } // Find window given position, search front-to-back -// FIXME: Note that we have an inconsequential lag here: OuterRectClipped is updated in Begin(), so windows moved programatically -// with SetWindowPos() and not SetNextWindowPos() will have that rectangle lagging by a frame at the time FindHoveredWindow() is -// called, aka before the next Begin(). Moving window isn't affected. -static void FindHoveredWindow() +// - Typically write output back to g.HoveredWindow and g.HoveredWindowUnderMovingWindow. +// - FIXME: Note that we have an inconsequential lag here: OuterRectClipped is updated in Begin(), so windows moved programmatically +// with SetWindowPos() and not SetNextWindowPos() will have that rectangle lagging by a frame at the time FindHoveredWindow() is +// called, aka before the next Begin(). Moving window isn't affected. +// - The 'find_first_and_in_any_viewport = true' mode is only used by TestEngine. It is simpler to maintain here. +void ImGui::FindHoveredWindowEx(const ImVec2& pos, bool find_first_and_in_any_viewport, ImGuiWindow** out_hovered_window, ImGuiWindow** out_hovered_window_under_moving_window) { ImGuiContext& g = *GImGui; - ImGuiWindow* hovered_window = NULL; - if (g.MovingWindow && !(g.MovingWindow->Flags & ImGuiWindowFlags_NoMouseInputs)) - hovered_window = g.MovingWindow; + ImGuiWindow* hovered_window_under_moving_window = NULL; + + // Special handling for the window being moved: Ignore the mouse viewport check (because it may reset/lose its viewport during the undocking frame) + ImGuiViewportP* backup_moving_window_viewport = NULL; + if (find_first_and_in_any_viewport == false && g.MovingWindow) + { + backup_moving_window_viewport = g.MovingWindow->Viewport; + g.MovingWindow->Viewport = g.MouseViewport; + if (!(g.MovingWindow->Flags & ImGuiWindowFlags_NoMouseInputs)) + hovered_window = g.MovingWindow; + } ImVec2 padding_regular = g.Style.TouchExtraPadding; - ImVec2 padding_for_resize_from_edges = g.IO.ConfigWindowsResizeFromEdges ? ImMax(g.Style.TouchExtraPadding, ImVec2(WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS, WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS)) : padding_regular; + ImVec2 padding_for_resize = ImMax(g.Style.TouchExtraPadding, ImVec2(g.Style.WindowBorderHoverPadding, g.Style.WindowBorderHoverPadding)); for (int i = g.Windows.Size - 1; i >= 0; i--) { ImGuiWindow* window = g.Windows[i]; - if (!window->Active || window->Hidden) + IM_MSVC_WARNING_SUPPRESS(28182); // [Static Analyzer] Dereferencing NULL pointer. + if (!window->WasActive || window->Hidden) continue; if (window->Flags & ImGuiWindowFlags_NoMouseInputs) continue; - - // Using the clipped AABB, a child window will typically be clipped by its parent (not always) - ImRect bb(window->OuterRectClipped); - if (window->Flags & (ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_AlwaysAutoResize)) - bb.Expand(padding_regular); - else - bb.Expand(padding_for_resize_from_edges); - if (!bb.Contains(g.IO.MousePos)) + IM_ASSERT(window->Viewport); + if (window->Viewport != g.MouseViewport) continue; - // Those seemingly unnecessary extra tests are because the code here is a little different in viewport/docking branches. - if (hovered_window == NULL) + // Using the clipped AABB, a child window will typically be clipped by its parent (not always) + ImVec2 hit_padding = (window->Flags & (ImGuiWindowFlags_NoResize | ImGuiWindowFlags_AlwaysAutoResize)) ? padding_regular : padding_for_resize; + if (!window->OuterRectClipped.ContainsWithPad(pos, hit_padding)) + continue; + + // Support for one rectangular hole in any given window + // FIXME: Consider generalizing hit-testing override (with more generic data, callback, etc.) (#1512) + if (window->HitTestHoleSize.x != 0) + { + ImVec2 hole_pos(window->Pos.x + (float)window->HitTestHoleOffset.x, window->Pos.y + (float)window->HitTestHoleOffset.y); + ImVec2 hole_size((float)window->HitTestHoleSize.x, (float)window->HitTestHoleSize.y); + if (ImRect(hole_pos, hole_pos + hole_size).Contains(pos)) + continue; + } + + if (find_first_and_in_any_viewport) + { hovered_window = window; - if (hovered_window) break; + } + else + { + if (hovered_window == NULL) + hovered_window = window; + IM_MSVC_WARNING_SUPPRESS(28182); // [Static Analyzer] Dereferencing NULL pointer. + if (hovered_window_under_moving_window == NULL && (!g.MovingWindow || window->RootWindowDockTree != g.MovingWindow->RootWindowDockTree)) + hovered_window_under_moving_window = window; + if (hovered_window && hovered_window_under_moving_window) + break; + } } - g.HoveredWindow = hovered_window; - g.HoveredRootWindow = g.HoveredWindow ? g.HoveredWindow->RootWindow : NULL; - -} - -// Test if mouse cursor is hovering given rectangle -// NB- Rectangle is clipped by our current clip setting -// NB- Expand the rectangle to be generous on imprecise inputs systems (g.Style.TouchExtraPadding) -bool ImGui::IsMouseHoveringRect(const ImVec2& r_min, const ImVec2& r_max, bool clip) -{ - ImGuiContext& g = *GImGui; - - // Clip - ImRect rect_clipped(r_min, r_max); - if (clip) - rect_clipped.ClipWith(g.CurrentWindow->ClipRect); - - // Expand for touch input - const ImRect rect_for_touch(rect_clipped.Min - g.Style.TouchExtraPadding, rect_clipped.Max + g.Style.TouchExtraPadding); - if (!rect_for_touch.Contains(g.IO.MousePos)) - return false; - return true; -} - -int ImGui::GetKeyIndex(ImGuiKey imgui_key) -{ - IM_ASSERT(imgui_key >= 0 && imgui_key < ImGuiKey_COUNT); - ImGuiContext& g = *GImGui; - return g.IO.KeyMap[imgui_key]; -} - -// Note that imgui doesn't know the semantic of each entry of io.KeysDown[]. Use your own indices/enums according to how your back-end/engine stored them into io.KeysDown[]! -bool ImGui::IsKeyDown(int user_key_index) -{ - if (user_key_index < 0) - return false; - ImGuiContext& g = *GImGui; - IM_ASSERT(user_key_index >= 0 && user_key_index < IM_ARRAYSIZE(g.IO.KeysDown)); - return g.IO.KeysDown[user_key_index]; -} - -int ImGui::CalcTypematicPressedRepeatAmount(float t, float t_prev, float repeat_delay, float repeat_rate) -{ - if (t == 0.0f) - return 1; - if (t <= repeat_delay || repeat_rate <= 0.0f) - return 0; - const int count = (int)((t - repeat_delay) / repeat_rate) - (int)((t_prev - repeat_delay) / repeat_rate); - return (count > 0) ? count : 0; -} - -int ImGui::GetKeyPressedAmount(int key_index, float repeat_delay, float repeat_rate) -{ - ImGuiContext& g = *GImGui; - if (key_index < 0) - return 0; - IM_ASSERT(key_index >= 0 && key_index < IM_ARRAYSIZE(g.IO.KeysDown)); - const float t = g.IO.KeysDownDuration[key_index]; - return CalcTypematicPressedRepeatAmount(t, t - g.IO.DeltaTime, repeat_delay, repeat_rate); -} - -bool ImGui::IsKeyPressed(int user_key_index, bool repeat) -{ - ImGuiContext& g = *GImGui; - if (user_key_index < 0) - return false; - IM_ASSERT(user_key_index >= 0 && user_key_index < IM_ARRAYSIZE(g.IO.KeysDown)); - const float t = g.IO.KeysDownDuration[user_key_index]; - if (t == 0.0f) - return true; - if (repeat && t > g.IO.KeyRepeatDelay) - return GetKeyPressedAmount(user_key_index, g.IO.KeyRepeatDelay, g.IO.KeyRepeatRate) > 0; - return false; -} - -bool ImGui::IsKeyReleased(int user_key_index) -{ - ImGuiContext& g = *GImGui; - if (user_key_index < 0) return false; - IM_ASSERT(user_key_index >= 0 && user_key_index < IM_ARRAYSIZE(g.IO.KeysDown)); - return g.IO.KeysDownDurationPrev[user_key_index] >= 0.0f && !g.IO.KeysDown[user_key_index]; -} - -bool ImGui::IsMouseDown(int button) -{ - ImGuiContext& g = *GImGui; - IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown)); - return g.IO.MouseDown[button]; -} - -bool ImGui::IsAnyMouseDown() -{ - ImGuiContext& g = *GImGui; - for (int n = 0; n < IM_ARRAYSIZE(g.IO.MouseDown); n++) - if (g.IO.MouseDown[n]) - return true; - return false; -} - -bool ImGui::IsMouseClicked(int button, bool repeat) -{ - ImGuiContext& g = *GImGui; - IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown)); - const float t = g.IO.MouseDownDuration[button]; - if (t == 0.0f) - return true; - - if (repeat && t > g.IO.KeyRepeatDelay) - { - // FIXME: 2019/05/03: Our old repeat code was wrong here and led to doubling the repeat rate, which made it an ok rate for repeat on mouse hold. - int amount = CalcTypematicPressedRepeatAmount(t, t - g.IO.DeltaTime, g.IO.KeyRepeatDelay, g.IO.KeyRepeatRate * 0.5f); - if (amount > 0) - return true; - } - - return false; -} - -bool ImGui::IsMouseReleased(int button) -{ - ImGuiContext& g = *GImGui; - IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown)); - return g.IO.MouseReleased[button]; -} - -bool ImGui::IsMouseDoubleClicked(int button) -{ - ImGuiContext& g = *GImGui; - IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown)); - return g.IO.MouseDoubleClicked[button]; -} - -// [Internal] This doesn't test if the button is pressed -bool ImGui::IsMouseDragPastThreshold(int button, float lock_threshold) -{ - ImGuiContext& g = *GImGui; - IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown)); - if (lock_threshold < 0.0f) - lock_threshold = g.IO.MouseDragThreshold; - return g.IO.MouseDragMaxDistanceSqr[button] >= lock_threshold * lock_threshold; -} - -bool ImGui::IsMouseDragging(int button, float lock_threshold) -{ - ImGuiContext& g = *GImGui; - IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown)); - if (!g.IO.MouseDown[button]) - return false; - return IsMouseDragPastThreshold(button, lock_threshold); -} - -ImVec2 ImGui::GetMousePos() -{ - return GImGui->IO.MousePos; -} - -// NB: prefer to call right after BeginPopup(). At the time Selectable/MenuItem is activated, the popup is already closed! -ImVec2 ImGui::GetMousePosOnOpeningCurrentPopup() -{ - ImGuiContext& g = *GImGui; - if (g.BeginPopupStack.Size > 0) - return g.OpenPopupStack[g.BeginPopupStack.Size-1].OpenMousePos; - return g.IO.MousePos; -} - -// We typically use ImVec2(-FLT_MAX,-FLT_MAX) to denote an invalid mouse position. -bool ImGui::IsMousePosValid(const ImVec2* mouse_pos) -{ - // The assert is only to silence a false-positive in XCode Static Analysis. - // Because GImGui is not dereferenced in every code path, the static analyzer assume that it may be NULL (which it doesn't for other functions). - IM_ASSERT(GImGui != NULL); - const float MOUSE_INVALID = -256000.0f; - ImVec2 p = mouse_pos ? *mouse_pos : GImGui->IO.MousePos; - return p.x >= MOUSE_INVALID && p.y >= MOUSE_INVALID; -} - -// Return the delta from the initial clicking position while the mouse button is clicked or was just released. -// This is locked and return 0.0f until the mouse moves past a distance threshold at least once. -// NB: This is only valid if IsMousePosValid(). Back-ends in theory should always keep mouse position valid when dragging even outside the client window. -ImVec2 ImGui::GetMouseDragDelta(int button, float lock_threshold) -{ - ImGuiContext& g = *GImGui; - IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown)); - if (lock_threshold < 0.0f) - lock_threshold = g.IO.MouseDragThreshold; - if (g.IO.MouseDown[button] || g.IO.MouseReleased[button]) - if (g.IO.MouseDragMaxDistanceSqr[button] >= lock_threshold * lock_threshold) - if (IsMousePosValid(&g.IO.MousePos) && IsMousePosValid(&g.IO.MouseClickedPos[button])) - return g.IO.MousePos - g.IO.MouseClickedPos[button]; - return ImVec2(0.0f, 0.0f); -} - -void ImGui::ResetMouseDragDelta(int button) -{ - ImGuiContext& g = *GImGui; - IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown)); - // NB: We don't need to reset g.IO.MouseDragMaxDistanceSqr - g.IO.MouseClickedPos[button] = g.IO.MousePos; -} - -ImGuiMouseCursor ImGui::GetMouseCursor() -{ - return GImGui->MouseCursor; -} - -void ImGui::SetMouseCursor(ImGuiMouseCursor cursor_type) -{ - GImGui->MouseCursor = cursor_type; -} - -void ImGui::CaptureKeyboardFromApp(bool capture) -{ - GImGui->WantCaptureKeyboardNextFrame = capture ? 1 : 0; -} - -void ImGui::CaptureMouseFromApp(bool capture) -{ - GImGui->WantCaptureMouseNextFrame = capture ? 1 : 0; + *out_hovered_window = hovered_window; + if (out_hovered_window_under_moving_window != NULL) + *out_hovered_window_under_moving_window = hovered_window_under_moving_window; + if (find_first_and_in_any_viewport == false && g.MovingWindow) + g.MovingWindow->Viewport = backup_moving_window_viewport; } bool ImGui::IsItemActive() { ImGuiContext& g = *GImGui; if (g.ActiveId) - { - ImGuiWindow* window = g.CurrentWindow; - return g.ActiveId == window->DC.LastItemId; - } + return g.ActiveId == g.LastItemData.ID; return false; } @@ -4588,50 +6151,69 @@ bool ImGui::IsItemActivated() { ImGuiContext& g = *GImGui; if (g.ActiveId) - { - ImGuiWindow* window = g.CurrentWindow; - if (g.ActiveId == window->DC.LastItemId && g.ActiveIdPreviousFrame != window->DC.LastItemId) + if (g.ActiveId == g.LastItemData.ID && g.ActiveIdPreviousFrame != g.LastItemData.ID) return true; - } return false; } bool ImGui::IsItemDeactivated() { ImGuiContext& g = *GImGui; - ImGuiWindow* window = g.CurrentWindow; - if (window->DC.LastItemStatusFlags & ImGuiItemStatusFlags_HasDeactivated) - return (window->DC.LastItemStatusFlags & ImGuiItemStatusFlags_Deactivated) != 0; - return (g.ActiveIdPreviousFrame == window->DC.LastItemId && g.ActiveIdPreviousFrame != 0 && g.ActiveId != window->DC.LastItemId); + if (g.LastItemData.StatusFlags & ImGuiItemStatusFlags_HasDeactivated) + return (g.LastItemData.StatusFlags & ImGuiItemStatusFlags_Deactivated) != 0; + return (g.DeactivatedItemData.ID == g.LastItemData.ID && g.LastItemData.ID != 0 && g.DeactivatedItemData.ElapseFrame >= g.FrameCount); } bool ImGui::IsItemDeactivatedAfterEdit() { ImGuiContext& g = *GImGui; - return IsItemDeactivated() && (g.ActiveIdPreviousFrameHasBeenEditedBefore || (g.ActiveId == 0 && g.ActiveIdHasBeenEditedBefore)); + return IsItemDeactivated() && g.DeactivatedItemData.HasBeenEditedBefore; } +// == (GetItemID() == GetFocusID() && GetFocusID() != 0) bool ImGui::IsItemFocused() { ImGuiContext& g = *GImGui; - ImGuiWindow* window = g.CurrentWindow; - - if (g.NavId == 0 || g.NavDisableHighlight || g.NavId != window->DC.LastItemId) + if (g.NavId != g.LastItemData.ID || g.NavId == 0) return false; + + // Special handling for the dummy item after Begin() which represent the title bar or tab. + // When the window is collapsed (SkipItems==true) that last item will never be overwritten so we need to detect the case. + ImGuiWindow* window = g.CurrentWindow; + if (g.LastItemData.ID == window->ID && window->WriteAccessed) + return false; + return true; } -bool ImGui::IsItemClicked(int mouse_button) +// Important: this can be useful but it is NOT equivalent to the behavior of e.g.Button()! +// Most widgets have specific reactions based on mouse-up/down state, mouse position etc. +bool ImGui::IsItemClicked(ImGuiMouseButton mouse_button) { return IsMouseClicked(mouse_button) && IsItemHovered(ImGuiHoveredFlags_None); } +bool ImGui::IsItemToggledOpen() +{ + ImGuiContext& g = *GImGui; + return (g.LastItemData.StatusFlags & ImGuiItemStatusFlags_ToggledOpen) ? true : false; +} + +// Call after a Selectable() or TreeNode() involved in multi-selection. +// Useful if you need the per-item information before reaching EndMultiSelect(), e.g. for rendering purpose. +// This is only meant to be called inside a BeginMultiSelect()/EndMultiSelect() block. +// (Outside of multi-select, it would be misleading/ambiguous to report this signal, as widgets +// return e.g. a pressed event and user code is in charge of altering selection in ways we cannot predict.) bool ImGui::IsItemToggledSelection() { ImGuiContext& g = *GImGui; - return (g.CurrentWindow->DC.LastItemStatusFlags & ImGuiItemStatusFlags_ToggledSelection) ? true : false; + IM_ASSERT(g.CurrentMultiSelect != NULL); // Can only be used inside a BeginMultiSelect()/EndMultiSelect() + return (g.LastItemData.StatusFlags & ImGuiItemStatusFlags_ToggledSelection) ? true : false; } +// IMPORTANT: If you are trying to check whether your mouse should be dispatched to Dear ImGui or to your underlying app, +// you should not use this function! Use the 'io.WantCaptureMouse' boolean for that! +// Refer to FAQ entry "How can I tell whether to dispatch mouse/keyboard to Dear ImGui or my application?" for details. bool ImGui::IsAnyItemHovered() { ImGuiContext& g = *GImGui; @@ -4647,89 +6229,200 @@ bool ImGui::IsAnyItemActive() bool ImGui::IsAnyItemFocused() { ImGuiContext& g = *GImGui; - return g.NavId != 0 && !g.NavDisableHighlight; + return g.NavId != 0 && g.NavCursorVisible; } bool ImGui::IsItemVisible() { - ImGuiWindow* window = GetCurrentWindowRead(); - return window->ClipRect.Overlaps(window->DC.LastItemRect); + ImGuiContext& g = *GImGui; + return (g.LastItemData.StatusFlags & ImGuiItemStatusFlags_Visible) != 0; } bool ImGui::IsItemEdited() { - ImGuiWindow* window = GetCurrentWindowRead(); - return (window->DC.LastItemStatusFlags & ImGuiItemStatusFlags_Edited) != 0; + ImGuiContext& g = *GImGui; + return (g.LastItemData.StatusFlags & ImGuiItemStatusFlags_Edited) != 0; } +// Allow next item to be overlapped by subsequent items. +// This works by requiring HoveredId to match for two subsequent frames, +// so if a following items overwrite it our interactions will naturally be disabled. +void ImGui::SetNextItemAllowOverlap() +{ + ImGuiContext& g = *GImGui; + g.NextItemData.ItemFlags |= ImGuiItemFlags_AllowOverlap; +} + +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS // Allow last item to be overlapped by a subsequent item. Both may be activated during the same frame before the later one takes priority. +// FIXME-LEGACY: Use SetNextItemAllowOverlap() *before* your item instead. void ImGui::SetItemAllowOverlap() { ImGuiContext& g = *GImGui; - if (g.HoveredId == g.CurrentWindow->DC.LastItemId) + ImGuiID id = g.LastItemData.ID; + if (g.HoveredId == id) g.HoveredIdAllowOverlap = true; - if (g.ActiveId == g.CurrentWindow->DC.LastItemId) + if (g.ActiveId == id) // Before we made this obsolete, most calls to SetItemAllowOverlap() used to avoid this path by testing g.ActiveId != id. g.ActiveIdAllowOverlap = true; } +#endif + +// This is a shortcut for not taking ownership of 100+ keys, frequently used by drag operations. +// FIXME: It might be undesirable that this will likely disable KeyOwner-aware shortcuts systems. Consider a more fine-tuned version if needed? +void ImGui::SetActiveIdUsingAllKeyboardKeys() +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(g.ActiveId != 0); + g.ActiveIdUsingNavDirMask = (1 << ImGuiDir_COUNT) - 1; + g.ActiveIdUsingAllKeyboardKeys = true; + NavMoveRequestCancel(); +} + +ImGuiID ImGui::GetItemID() +{ + ImGuiContext& g = *GImGui; + return g.LastItemData.ID; +} ImVec2 ImGui::GetItemRectMin() { - ImGuiWindow* window = GetCurrentWindowRead(); - return window->DC.LastItemRect.Min; + ImGuiContext& g = *GImGui; + return g.LastItemData.Rect.Min; } ImVec2 ImGui::GetItemRectMax() { - ImGuiWindow* window = GetCurrentWindowRead(); - return window->DC.LastItemRect.Max; + ImGuiContext& g = *GImGui; + return g.LastItemData.Rect.Max; } ImVec2 ImGui::GetItemRectSize() -{ - ImGuiWindow* window = GetCurrentWindowRead(); - return window->DC.LastItemRect.GetSize(); -} - -static ImRect GetViewportRect() { ImGuiContext& g = *GImGui; - return ImRect(0.0f, 0.0f, g.IO.DisplaySize.x, g.IO.DisplaySize.y); + return g.LastItemData.Rect.GetSize(); } -static bool ImGui::BeginChildEx(const char* name, ImGuiID id, const ImVec2& size_arg, bool border, ImGuiWindowFlags flags) +// Prior to v1.90 2023/10/16, the BeginChild() function took a 'bool border = false' parameter instead of 'ImGuiChildFlags child_flags = 0'. +// ImGuiChildFlags_Borders is defined as always == 1 in order to allow old code passing 'true'. Read comments in imgui.h for details! +bool ImGui::BeginChild(const char* str_id, const ImVec2& size_arg, ImGuiChildFlags child_flags, ImGuiWindowFlags window_flags) +{ + ImGuiID id = GetCurrentWindow()->GetID(str_id); + return BeginChildEx(str_id, id, size_arg, child_flags, window_flags); +} + +bool ImGui::BeginChild(ImGuiID id, const ImVec2& size_arg, ImGuiChildFlags child_flags, ImGuiWindowFlags window_flags) +{ + return BeginChildEx(NULL, id, size_arg, child_flags, window_flags); +} + +bool ImGui::BeginChildEx(const char* name, ImGuiID id, const ImVec2& size_arg, ImGuiChildFlags child_flags, ImGuiWindowFlags window_flags) { ImGuiContext& g = *GImGui; ImGuiWindow* parent_window = g.CurrentWindow; + IM_ASSERT(id != 0); - flags |= ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoSavedSettings|ImGuiWindowFlags_ChildWindow; - flags |= (parent_window->Flags & ImGuiWindowFlags_NoMove); // Inherit the NoMove flag + // Sanity check as it is likely that some user will accidentally pass ImGuiWindowFlags into the ImGuiChildFlags argument. + const ImGuiChildFlags ImGuiChildFlags_SupportedMask_ = ImGuiChildFlags_Borders | ImGuiChildFlags_AlwaysUseWindowPadding | ImGuiChildFlags_ResizeX | ImGuiChildFlags_ResizeY | ImGuiChildFlags_AutoResizeX | ImGuiChildFlags_AutoResizeY | ImGuiChildFlags_AlwaysAutoResize | ImGuiChildFlags_FrameStyle | ImGuiChildFlags_NavFlattened; + IM_UNUSED(ImGuiChildFlags_SupportedMask_); + IM_ASSERT((child_flags & ~ImGuiChildFlags_SupportedMask_) == 0 && "Illegal ImGuiChildFlags value. Did you pass ImGuiWindowFlags values instead of ImGuiChildFlags?"); + IM_ASSERT((window_flags & ImGuiWindowFlags_AlwaysAutoResize) == 0 && "Cannot specify ImGuiWindowFlags_AlwaysAutoResize for BeginChild(). Use ImGuiChildFlags_AlwaysAutoResize!"); + if (child_flags & ImGuiChildFlags_AlwaysAutoResize) + { + IM_ASSERT((child_flags & (ImGuiChildFlags_ResizeX | ImGuiChildFlags_ResizeY)) == 0 && "Cannot use ImGuiChildFlags_ResizeX or ImGuiChildFlags_ResizeY with ImGuiChildFlags_AlwaysAutoResize!"); + IM_ASSERT((child_flags & (ImGuiChildFlags_AutoResizeX | ImGuiChildFlags_AutoResizeY)) != 0 && "Must use ImGuiChildFlags_AutoResizeX or ImGuiChildFlags_AutoResizeY with ImGuiChildFlags_AlwaysAutoResize!"); + } +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + if (window_flags & ImGuiWindowFlags_AlwaysUseWindowPadding) + child_flags |= ImGuiChildFlags_AlwaysUseWindowPadding; + if (window_flags & ImGuiWindowFlags_NavFlattened) + child_flags |= ImGuiChildFlags_NavFlattened; +#endif + if (child_flags & ImGuiChildFlags_AutoResizeX) + child_flags &= ~ImGuiChildFlags_ResizeX; + if (child_flags & ImGuiChildFlags_AutoResizeY) + child_flags &= ~ImGuiChildFlags_ResizeY; - // Size - const ImVec2 content_avail = GetContentRegionAvail(); - ImVec2 size = ImFloor(size_arg); - const int auto_fit_axises = ((size.x == 0.0f) ? (1 << ImGuiAxis_X) : 0x00) | ((size.y == 0.0f) ? (1 << ImGuiAxis_Y) : 0x00); - if (size.x <= 0.0f) - size.x = ImMax(content_avail.x + size.x, 4.0f); // Arbitrary minimum child size (0.0f causing too much issues) - if (size.y <= 0.0f) - size.y = ImMax(content_avail.y + size.y, 4.0f); + // Set window flags + window_flags |= ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoDocking; + window_flags |= (parent_window->Flags & ImGuiWindowFlags_NoMove); // Inherit the NoMove flag + if (child_flags & (ImGuiChildFlags_AutoResizeX | ImGuiChildFlags_AutoResizeY | ImGuiChildFlags_AlwaysAutoResize)) + window_flags |= ImGuiWindowFlags_AlwaysAutoResize; + if ((child_flags & (ImGuiChildFlags_ResizeX | ImGuiChildFlags_ResizeY)) == 0) + window_flags |= ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoSavedSettings; + + // Special framed style + if (child_flags & ImGuiChildFlags_FrameStyle) + { + PushStyleColor(ImGuiCol_ChildBg, g.Style.Colors[ImGuiCol_FrameBg]); + PushStyleVar(ImGuiStyleVar_ChildRounding, g.Style.FrameRounding); + PushStyleVar(ImGuiStyleVar_ChildBorderSize, g.Style.FrameBorderSize); + PushStyleVar(ImGuiStyleVar_WindowPadding, g.Style.FramePadding); + child_flags |= ImGuiChildFlags_Borders | ImGuiChildFlags_AlwaysUseWindowPadding; + window_flags |= ImGuiWindowFlags_NoMove; + } + + // Forward size + // Important: Begin() has special processing to switch condition to ImGuiCond_FirstUseEver for a given axis when ImGuiChildFlags_ResizeXXX is set. + // (the alternative would to store conditional flags per axis, which is possible but more code) + const ImVec2 size_avail = GetContentRegionAvail(); + const ImVec2 size_default((child_flags & ImGuiChildFlags_AutoResizeX) ? 0.0f : size_avail.x, (child_flags & ImGuiChildFlags_AutoResizeY) ? 0.0f : size_avail.y); + ImVec2 size = CalcItemSize(size_arg, size_default.x, size_default.y); + + // A SetNextWindowSize() call always has priority (#8020) + // (since the code in Begin() never supported SizeVal==0.0f aka auto-resize via SetNextWindowSize() call, we don't support it here for now) + // FIXME: We only support ImGuiCond_Always in this path. Supporting other paths would requires to obtain window pointer. + if ((g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasSize) != 0 && (g.NextWindowData.SizeCond & ImGuiCond_Always) != 0) + { + if (g.NextWindowData.SizeVal.x > 0.0f) + { + size.x = g.NextWindowData.SizeVal.x; + child_flags &= ~ImGuiChildFlags_ResizeX; + } + if (g.NextWindowData.SizeVal.y > 0.0f) + { + size.y = g.NextWindowData.SizeVal.y; + child_flags &= ~ImGuiChildFlags_ResizeY; + } + } SetNextWindowSize(size); - // Build up name. If you need to append to a same child from multiple location in the ID stack, use BeginChild(ImGuiID id) with a stable value. - char title[256]; - if (name) - ImFormatString(title, IM_ARRAYSIZE(title), "%s/%s_%08X", parent_window->Name, name, id); + // Forward child flags (we allow prior settings to merge but it'll only work for adding flags) + if (g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasChildFlags) + g.NextWindowData.ChildFlags |= child_flags; else - ImFormatString(title, IM_ARRAYSIZE(title), "%s/%08X", parent_window->Name, id); + g.NextWindowData.ChildFlags = child_flags; + g.NextWindowData.HasFlags |= ImGuiNextWindowDataFlags_HasChildFlags; + // Build up name. If you need to append to a same child from multiple location in the ID stack, use BeginChild(ImGuiID id) with a stable value. + // FIXME: 2023/11/14: commented out shorted version. We had an issue with multiple ### in child window path names, which the trailing hash helped workaround. + // e.g. "ParentName###ParentIdentifier/ChildName###ChildIdentifier" would get hashed incorrectly by ImHashStr(), trailing _%08X somehow fixes it. + const char* temp_window_name; + /*if (name && parent_window->IDStack.back() == parent_window->ID) + ImFormatStringToTempBuffer(&temp_window_name, NULL, "%s/%s", parent_window->Name, name); // May omit ID if in root of ID stack + else*/ + if (name) + ImFormatStringToTempBuffer(&temp_window_name, NULL, "%s/%s_%08X", parent_window->Name, name, id); + else + ImFormatStringToTempBuffer(&temp_window_name, NULL, "%s/%08X", parent_window->Name, id); + + // Set style const float backup_border_size = g.Style.ChildBorderSize; - if (!border) + if ((child_flags & ImGuiChildFlags_Borders) == 0) g.Style.ChildBorderSize = 0.0f; - bool ret = Begin(title, NULL, flags); + + // Begin into window + const bool ret = Begin(temp_window_name, NULL, window_flags); + + // Restore style g.Style.ChildBorderSize = backup_border_size; + if (child_flags & ImGuiChildFlags_FrameStyle) + { + PopStyleVar(3); + PopStyleColor(); + } ImGuiWindow* child_window = g.CurrentWindow; child_window->ChildId = id; - child_window->AutoFitChildAxises = (ImS8)auto_fit_axises; // Set the cursor to handle case where the user called SetNextWindowPos()+BeginChild() manually. // While this is not really documented/defined, it seems that the expected thing to do. @@ -4737,101 +6430,69 @@ static bool ImGui::BeginChildEx(const char* name, ImGuiID id, const ImVec2& size parent_window->DC.CursorPos = child_window->Pos; // Process navigation-in immediately so NavInit can run on first frame - if (g.NavActivateId == id && !(flags & ImGuiWindowFlags_NavFlattened) && (child_window->DC.NavLayerActiveMask != 0 || child_window->DC.NavHasScroll)) + // Can enter a child if (A) it has navigable items or (B) it can be scrolled. + const ImGuiID temp_id_for_activation = ImHashStr("##Child", 0, id); + if (g.ActiveId == temp_id_for_activation) + ClearActiveID(); + if (g.NavActivateId == id && !(child_flags & ImGuiChildFlags_NavFlattened) && (child_window->DC.NavLayersActiveMask != 0 || child_window->DC.NavWindowHasScrollY)) { FocusWindow(child_window); NavInitWindow(child_window, false); - SetActiveID(id+1, child_window); // Steal ActiveId with a dummy id so that key-press won't activate child item - g.ActiveIdSource = ImGuiInputSource_Nav; + SetActiveID(temp_id_for_activation, child_window); // Steal ActiveId with another arbitrary id so that key-press won't activate child item + g.ActiveIdSource = g.NavInputSource; } return ret; } -bool ImGui::BeginChild(const char* str_id, const ImVec2& size_arg, bool border, ImGuiWindowFlags extra_flags) -{ - ImGuiWindow* window = GetCurrentWindow(); - return BeginChildEx(str_id, window->GetID(str_id), size_arg, border, extra_flags); -} - -bool ImGui::BeginChild(ImGuiID id, const ImVec2& size_arg, bool border, ImGuiWindowFlags extra_flags) -{ - IM_ASSERT(id != 0); - return BeginChildEx(NULL, id, size_arg, border, extra_flags); -} - void ImGui::EndChild() { ImGuiContext& g = *GImGui; - ImGuiWindow* window = g.CurrentWindow; + ImGuiWindow* child_window = g.CurrentWindow; - IM_ASSERT(window->Flags & ImGuiWindowFlags_ChildWindow); // Mismatched BeginChild()/EndChild() callss - if (window->BeginCount > 1) - { - End(); - } - else - { - ImVec2 sz = window->Size; - if (window->AutoFitChildAxises & (1 << ImGuiAxis_X)) // Arbitrary minimum zero-ish child size of 4.0f causes less trouble than a 0.0f - sz.x = ImMax(4.0f, sz.x); - if (window->AutoFitChildAxises & (1 << ImGuiAxis_Y)) - sz.y = ImMax(4.0f, sz.y); - End(); + const ImGuiID backup_within_end_child_id = g.WithinEndChildID; + IM_ASSERT(child_window->Flags & ImGuiWindowFlags_ChildWindow); // Mismatched BeginChild()/EndChild() calls + g.WithinEndChildID = child_window->ID; + ImVec2 child_size = child_window->Size; + End(); + if (child_window->BeginCount == 1) + { ImGuiWindow* parent_window = g.CurrentWindow; - ImRect bb(parent_window->DC.CursorPos, parent_window->DC.CursorPos + sz); - ItemSize(sz); - if ((window->DC.NavLayerActiveMask != 0 || window->DC.NavHasScroll) && !(window->Flags & ImGuiWindowFlags_NavFlattened)) + ImRect bb(parent_window->DC.CursorPos, parent_window->DC.CursorPos + child_size); + ItemSize(child_size); + const bool nav_flattened = (child_window->ChildFlags & ImGuiChildFlags_NavFlattened) != 0; + if ((child_window->DC.NavLayersActiveMask != 0 || child_window->DC.NavWindowHasScrollY) && !nav_flattened) { - ItemAdd(bb, window->ChildId); - RenderNavHighlight(bb, window->ChildId); + ItemAdd(bb, child_window->ChildId); + RenderNavCursor(bb, child_window->ChildId); - // When browsing a window that has no activable items (scroll only) we keep a highlight on the child - if (window->DC.NavLayerActiveMask == 0 && window == g.NavWindow) - RenderNavHighlight(ImRect(bb.Min - ImVec2(2,2), bb.Max + ImVec2(2,2)), g.NavId, ImGuiNavHighlightFlags_TypeThin); + // When browsing a window that has no activable items (scroll only) we keep a highlight on the child (pass g.NavId to trick into always displaying) + if (child_window->DC.NavLayersActiveMask == 0 && child_window == g.NavWindow) + RenderNavCursor(ImRect(bb.Min - ImVec2(2, 2), bb.Max + ImVec2(2, 2)), g.NavId, ImGuiNavRenderCursorFlags_Compact); } else { // Not navigable into - ItemAdd(bb, 0); + // - This is a bit of a fringe use case, mostly useful for undecorated, non-scrolling contents childs, or empty childs. + // - We could later decide to not apply this path if ImGuiChildFlags_FrameStyle or ImGuiChildFlags_Borders is set. + ItemAdd(bb, child_window->ChildId, NULL, ImGuiItemFlags_NoNav); + + // But when flattened we directly reach items, adjust active layer mask accordingly + if (nav_flattened) + parent_window->DC.NavLayersActiveMaskNext |= child_window->DC.NavLayersActiveMaskNext; } + if (g.HoveredWindow == child_window) + g.LastItemData.StatusFlags |= ImGuiItemStatusFlags_HoveredWindow; + child_window->DC.ChildItemStatusFlags = g.LastItemData.StatusFlags; + //SetLastItemDataForChildWindowItem(child_window, child_window->Rect()); // Not needed, effectively done by ItemAdd() + } + else + { + SetLastItemDataForChildWindowItem(child_window, child_window->Rect()); } -} -// Helper to create a child window / scrolling region that looks like a normal widget frame. -bool ImGui::BeginChildFrame(ImGuiID id, const ImVec2& size, ImGuiWindowFlags extra_flags) -{ - ImGuiContext& g = *GImGui; - const ImGuiStyle& style = g.Style; - PushStyleColor(ImGuiCol_ChildBg, style.Colors[ImGuiCol_FrameBg]); - PushStyleVar(ImGuiStyleVar_ChildRounding, style.FrameRounding); - PushStyleVar(ImGuiStyleVar_ChildBorderSize, style.FrameBorderSize); - PushStyleVar(ImGuiStyleVar_WindowPadding, style.FramePadding); - bool ret = BeginChild(id, size, true, ImGuiWindowFlags_NoMove | ImGuiWindowFlags_AlwaysUseWindowPadding | extra_flags); - PopStyleVar(3); - PopStyleColor(); - return ret; -} - -void ImGui::EndChildFrame() -{ - EndChild(); -} - -// Save and compare stack sizes on Begin()/End() to detect usage errors -static void CheckStacksSize(ImGuiWindow* window, bool write) -{ - // NOT checking: DC.ItemWidth, DC.AllowKeyboardFocus, DC.ButtonRepeat, DC.TextWrapPos (per window) to allow user to conveniently push once and not pop (they are cleared on Begin) - ImGuiContext& g = *GImGui; - short* p_backup = &window->DC.StackSizesBackup[0]; - { int current = window->IDStack.Size; if (write) *p_backup = (short)current; else IM_ASSERT(*p_backup == current && "PushID/PopID or TreeNode/TreePop Mismatch!"); p_backup++; } // Too few or too many PopID()/TreePop() - { int current = window->DC.GroupStack.Size; if (write) *p_backup = (short)current; else IM_ASSERT(*p_backup == current && "BeginGroup/EndGroup Mismatch!"); p_backup++; } // Too few or too many EndGroup() - { int current = g.BeginPopupStack.Size; if (write) *p_backup = (short)current; else IM_ASSERT(*p_backup == current && "BeginMenu/EndMenu or BeginPopup/EndPopup Mismatch"); p_backup++;}// Too few or too many EndMenu()/EndPopup() - // For color, style and font stacks there is an incentive to use Push/Begin/Pop/.../End patterns, so we relax our checks a little to allow them. - { int current = g.ColorModifiers.Size; if (write) *p_backup = (short)current; else IM_ASSERT(*p_backup >= current && "PushStyleColor/PopStyleColor Mismatch!"); p_backup++; } // Too few or too many PopStyleColor() - { int current = g.StyleModifiers.Size; if (write) *p_backup = (short)current; else IM_ASSERT(*p_backup >= current && "PushStyleVar/PopStyleVar Mismatch!"); p_backup++; } // Too few or too many PopStyleVar() - { int current = g.FontStack.Size; if (write) *p_backup = (short)current; else IM_ASSERT(*p_backup >= current && "PushFont/PopFont Mismatch!"); p_backup++; } // Too few or too many PopFont() - IM_ASSERT(p_backup == window->DC.StackSizesBackup + IM_ARRAYSIZE(window->DC.StackSizesBackup)); + g.WithinEndChildID = backup_within_end_child_id; + g.LogLinePosY = -FLT_MAX; // To enforce a carriage return } static void SetWindowConditionAllowFlags(ImGuiWindow* window, ImGuiCond flags, bool enabled) @@ -4839,6 +6500,7 @@ static void SetWindowConditionAllowFlags(ImGuiWindow* window, ImGuiCond flags, b window->SetWindowPosAllowFlags = enabled ? (window->SetWindowPosAllowFlags | flags) : (window->SetWindowPosAllowFlags & ~flags); window->SetWindowSizeAllowFlags = enabled ? (window->SetWindowSizeAllowFlags | flags) : (window->SetWindowSizeAllowFlags & ~flags); window->SetWindowCollapsedAllowFlags = enabled ? (window->SetWindowCollapsedAllowFlags | flags) : (window->SetWindowCollapsedAllowFlags & ~flags); + window->SetWindowDockAllowFlags = enabled ? (window->SetWindowDockAllowFlags | flags) : (window->SetWindowDockAllowFlags & ~flags); } ImGuiWindow* ImGui::FindWindowByID(ImGuiID id) @@ -4853,35 +6515,41 @@ ImGuiWindow* ImGui::FindWindowByName(const char* name) return FindWindowByID(id); } -static ImGuiWindow* CreateNewWindow(const char* name, ImVec2 size, ImGuiWindowFlags flags) +static void ApplyWindowSettings(ImGuiWindow* window, ImGuiWindowSettings* settings) { - ImGuiContext& g = *GImGui; - //IMGUI_DEBUG_LOG("CreateNewWindow '%s', flags = 0x%08X\n", name, flags); + const ImGuiViewport* main_viewport = ImGui::GetMainViewport(); + window->ViewportPos = main_viewport->Pos; + if (settings->ViewportId) + { + window->ViewportId = settings->ViewportId; + window->ViewportPos = ImVec2(settings->ViewportPos.x, settings->ViewportPos.y); + } + window->Pos = ImTrunc(ImVec2(settings->Pos.x + window->ViewportPos.x, settings->Pos.y + window->ViewportPos.y)); + if (settings->Size.x > 0 && settings->Size.y > 0) + window->Size = window->SizeFull = ImTrunc(ImVec2(settings->Size.x, settings->Size.y)); + window->Collapsed = settings->Collapsed; + window->DockId = settings->DockId; + window->DockOrder = settings->DockOrder; +} - // Create window the first time - ImGuiWindow* window = IM_NEW(ImGuiWindow)(&g, name); - window->Flags = flags; - g.WindowsById.SetVoidPtr(window->ID, window); +static void InitOrLoadWindowSettings(ImGuiWindow* window, ImGuiWindowSettings* settings) +{ + // Initial window state with e.g. default/arbitrary window position + // Use SetNextWindowPos() with the appropriate condition flag to change the initial position of a window. + const ImGuiViewport* main_viewport = ImGui::GetMainViewport(); + window->Pos = main_viewport->Pos + ImVec2(60, 60); + window->Size = window->SizeFull = ImVec2(0, 0); + window->ViewportPos = main_viewport->Pos; + window->SetWindowPosAllowFlags = window->SetWindowSizeAllowFlags = window->SetWindowCollapsedAllowFlags = window->SetWindowDockAllowFlags = ImGuiCond_Always | ImGuiCond_Once | ImGuiCond_FirstUseEver | ImGuiCond_Appearing; - // Default/arbitrary window position. Use SetNextWindowPos() with the appropriate condition flag to change the initial position of a window. - window->Pos = ImVec2(60, 60); + if (settings != NULL) + { + SetWindowConditionAllowFlags(window, ImGuiCond_FirstUseEver, false); + ApplyWindowSettings(window, settings); + } + window->DC.CursorStartPos = window->DC.CursorMaxPos = window->DC.IdealMaxPos = window->Pos; // So first call to CalcWindowContentSizes() doesn't return crazy values - // User can disable loading and saving of settings. Tooltip and child windows also don't store settings. - if (!(flags & ImGuiWindowFlags_NoSavedSettings)) - if (ImGuiWindowSettings* settings = ImGui::FindWindowSettings(window->ID)) - { - // Retrieve settings from .ini file - window->SettingsIdx = g.SettingsWindows.index_from_ptr(settings); - SetWindowConditionAllowFlags(window, ImGuiCond_FirstUseEver, false); - window->Pos = ImVec2(settings->Pos.x, settings->Pos.y); - window->Collapsed = settings->Collapsed; - if (settings->Size.x > 0 && settings->Size.y > 0) - size = ImVec2(settings->Size.x, settings->Size.y); - } - window->Size = window->SizeFull = ImFloor(size); - window->DC.CursorStartPos = window->DC.CursorMaxPos = window->Pos; // So first call to CalcContentSize() doesn't return crazy values - - if ((flags & ImGuiWindowFlags_AlwaysAutoResize) != 0) + if ((window->Flags & ImGuiWindowFlags_AlwaysAutoResize) != 0) { window->AutoFitFramesX = window->AutoFitFramesY = 2; window->AutoFitOnlyGrows = false; @@ -4894,21 +6562,73 @@ static ImGuiWindow* CreateNewWindow(const char* name, ImVec2 size, ImGuiWindowFl window->AutoFitFramesY = 2; window->AutoFitOnlyGrows = (window->AutoFitFramesX > 0) || (window->AutoFitFramesY > 0); } +} + +static ImGuiWindow* CreateNewWindow(const char* name, ImGuiWindowFlags flags) +{ + // Create window the first time + //IMGUI_DEBUG_LOG("CreateNewWindow '%s', flags = 0x%08X\n", name, flags); + ImGuiContext& g = *GImGui; + ImGuiWindow* window = IM_NEW(ImGuiWindow)(&g, name); + window->Flags = flags; + g.WindowsById.SetVoidPtr(window->ID, window); + + ImGuiWindowSettings* settings = NULL; + if (!(flags & ImGuiWindowFlags_NoSavedSettings)) + if ((settings = ImGui::FindWindowSettingsByWindow(window)) != 0) + window->SettingsOffset = g.SettingsWindows.offset_from_ptr(settings); + + InitOrLoadWindowSettings(window, settings); - g.WindowsFocusOrder.push_back(window); if (flags & ImGuiWindowFlags_NoBringToFrontOnFocus) g.Windows.push_front(window); // Quite slow but rare and only once else g.Windows.push_back(window); + return window; } -static ImVec2 CalcWindowSizeAfterConstraint(ImGuiWindow* window, ImVec2 new_size) +static ImGuiWindow* GetWindowForTitleDisplay(ImGuiWindow* window) +{ + return window->DockNodeAsHost ? window->DockNodeAsHost->VisibleWindow : window; +} + +static ImGuiWindow* GetWindowForTitleAndMenuHeight(ImGuiWindow* window) +{ + return (window->DockNodeAsHost && window->DockNodeAsHost->VisibleWindow) ? window->DockNodeAsHost->VisibleWindow : window; +} + +static inline ImVec2 CalcWindowMinSize(ImGuiWindow* window) +{ + // We give windows non-zero minimum size to facilitate understanding problematic cases (e.g. empty popups) + // FIXME: Essentially we want to restrict manual resizing to WindowMinSize+Decoration, and allow api resizing to be smaller. + // Perhaps should tend further a neater test for this. + ImGuiContext& g = *GImGui; + ImVec2 size_min; + if ((window->Flags & ImGuiWindowFlags_ChildWindow) && !(window->Flags & ImGuiWindowFlags_Popup)) + { + size_min.x = (window->ChildFlags & ImGuiChildFlags_ResizeX) ? g.Style.WindowMinSize.x : 4.0f; + size_min.y = (window->ChildFlags & ImGuiChildFlags_ResizeY) ? g.Style.WindowMinSize.y : 4.0f; + } + else + { + size_min.x = ((window->Flags & ImGuiWindowFlags_AlwaysAutoResize) == 0) ? g.Style.WindowMinSize.x : 4.0f; + size_min.y = ((window->Flags & ImGuiWindowFlags_AlwaysAutoResize) == 0) ? g.Style.WindowMinSize.y : 4.0f; + } + + // Reduce artifacts with very small windows + ImGuiWindow* window_for_height = GetWindowForTitleAndMenuHeight(window); + size_min.y = ImMax(size_min.y, window_for_height->TitleBarHeight + window_for_height->MenuBarHeight + ImMax(0.0f, g.Style.WindowRounding - 1.0f)); + return size_min; +} + +static ImVec2 CalcWindowSizeAfterConstraint(ImGuiWindow* window, const ImVec2& size_desired) { ImGuiContext& g = *GImGui; - if (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasSizeConstraint) + ImVec2 new_size = size_desired; + if (g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasSizeConstraint) { - // Using -1,-1 on either X/Y axis to preserve the current size. + // See comments in SetNextWindowSizeConstraints() for details about setting size_min an size_max. ImRect cr = g.NextWindowData.SizeConstraintRect; new_size.x = (cr.Min.x >= 0 && cr.Max.x >= 0) ? ImClamp(new_size.x, cr.Min.x, cr.Max.x) : window->SizeFull.x; new_size.y = (cr.Min.y >= 0 && cr.Max.y >= 0) ? ImClamp(new_size.y, cr.Min.y, cr.Max.y) : window->SizeFull.y; @@ -4922,40 +6642,43 @@ static ImVec2 CalcWindowSizeAfterConstraint(ImGuiWindow* window, ImVec2 new_size g.NextWindowData.SizeCallback(&data); new_size = data.DesiredSize; } - new_size.x = ImFloor(new_size.x); - new_size.y = ImFloor(new_size.y); + new_size.x = IM_TRUNC(new_size.x); + new_size.y = IM_TRUNC(new_size.y); } // Minimum size - if (!(window->Flags & (ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_AlwaysAutoResize))) - { - new_size = ImMax(new_size, g.Style.WindowMinSize); - new_size.y = ImMax(new_size.y, window->TitleBarHeight() + window->MenuBarHeight() + ImMax(0.0f, g.Style.WindowRounding - 1.0f)); // Reduce artifacts with very small windows - } - return new_size; + ImVec2 size_min = CalcWindowMinSize(window); + return ImMax(new_size, size_min); } -static ImVec2 CalcWindowContentSize(ImGuiWindow* window) +static void CalcWindowContentSizes(ImGuiWindow* window, ImVec2* content_size_current, ImVec2* content_size_ideal) { - if (window->Collapsed) - if (window->AutoFitFramesX <= 0 && window->AutoFitFramesY <= 0) - return window->ContentSize; - if (window->Hidden && window->HiddenFramesCannotSkipItems == 0 && window->HiddenFramesCanSkipItems > 0) - return window->ContentSize; + bool preserve_old_content_sizes = false; + if (window->Collapsed && window->AutoFitFramesX <= 0 && window->AutoFitFramesY <= 0) + preserve_old_content_sizes = true; + else if (window->Hidden && window->HiddenFramesCannotSkipItems == 0 && window->HiddenFramesCanSkipItems > 0) + preserve_old_content_sizes = true; + if (preserve_old_content_sizes) + { + *content_size_current = window->ContentSize; + *content_size_ideal = window->ContentSizeIdeal; + return; + } - ImVec2 sz; - sz.x = (float)(int)((window->ContentSizeExplicit.x != 0.0f) ? window->ContentSizeExplicit.x : window->DC.CursorMaxPos.x - window->DC.CursorStartPos.x); - sz.y = (float)(int)((window->ContentSizeExplicit.y != 0.0f) ? window->ContentSizeExplicit.y : window->DC.CursorMaxPos.y - window->DC.CursorStartPos.y); - return sz; + content_size_current->x = (window->ContentSizeExplicit.x != 0.0f) ? window->ContentSizeExplicit.x : IM_TRUNC(window->DC.CursorMaxPos.x - window->DC.CursorStartPos.x); + content_size_current->y = (window->ContentSizeExplicit.y != 0.0f) ? window->ContentSizeExplicit.y : IM_TRUNC(window->DC.CursorMaxPos.y - window->DC.CursorStartPos.y); + content_size_ideal->x = (window->ContentSizeExplicit.x != 0.0f) ? window->ContentSizeExplicit.x : IM_TRUNC(ImMax(window->DC.CursorMaxPos.x, window->DC.IdealMaxPos.x) - window->DC.CursorStartPos.x); + content_size_ideal->y = (window->ContentSizeExplicit.y != 0.0f) ? window->ContentSizeExplicit.y : IM_TRUNC(ImMax(window->DC.CursorMaxPos.y, window->DC.IdealMaxPos.y) - window->DC.CursorStartPos.y); } static ImVec2 CalcWindowAutoFitSize(ImGuiWindow* window, const ImVec2& size_contents) { ImGuiContext& g = *GImGui; ImGuiStyle& style = g.Style; - ImVec2 size_decorations = ImVec2(0.0f, window->TitleBarHeight() + window->MenuBarHeight()); + const float decoration_w_without_scrollbars = window->DecoOuterSizeX1 + window->DecoOuterSizeX2 - window->ScrollbarSizes.x; + const float decoration_h_without_scrollbars = window->DecoOuterSizeY1 + window->DecoOuterSizeY2 - window->ScrollbarSizes.y; ImVec2 size_pad = window->WindowPadding * 2.0f; - ImVec2 size_desired = size_contents + size_pad + size_decorations; + ImVec2 size_desired = size_contents + size_pad + ImVec2(decoration_w_without_scrollbars, decoration_h_without_scrollbars); if (window->Flags & ImGuiWindowFlags_Tooltip) { // Tooltip always resize @@ -4964,18 +6687,34 @@ static ImVec2 CalcWindowAutoFitSize(ImGuiWindow* window, const ImVec2& size_cont else { // Maximum window size is determined by the viewport size or monitor size - const bool is_popup = (window->Flags & ImGuiWindowFlags_Popup) != 0; - const bool is_menu = (window->Flags & ImGuiWindowFlags_ChildMenu) != 0; - ImVec2 size_min = style.WindowMinSize; - if (is_popup || is_menu) // Popups and menus bypass style.WindowMinSize by default, but we give then a non-zero minimum size to facilitate understanding problematic cases (e.g. empty popups) - size_min = ImMin(size_min, ImVec2(4.0f, 4.0f)); - ImVec2 size_auto_fit = ImClamp(size_desired, size_min, ImMax(size_min, g.IO.DisplaySize - style.DisplaySafeAreaPadding * 2.0f)); + ImVec2 size_min = CalcWindowMinSize(window); + ImVec2 size_max = ImVec2(FLT_MAX, FLT_MAX); + + // Child windows are layed within their parent (unless they are also popups/menus) and thus have no restriction + if ((window->Flags & ImGuiWindowFlags_ChildWindow) == 0 || (window->Flags & ImGuiWindowFlags_Popup) != 0) + { + if (!window->ViewportOwned) + size_max = ImGui::GetMainViewport()->WorkSize - style.DisplaySafeAreaPadding * 2.0f; + const int monitor_idx = window->ViewportAllowPlatformMonitorExtend; + if (monitor_idx >= 0 && monitor_idx < g.PlatformIO.Monitors.Size) + size_max = g.PlatformIO.Monitors[monitor_idx].WorkSize - style.DisplaySafeAreaPadding * 2.0f; + } + + ImVec2 size_auto_fit = ImClamp(size_desired, size_min, ImMax(size_min, size_max)); + + // FIXME: CalcWindowAutoFitSize() doesn't take into account that only one axis may be auto-fit when calculating scrollbars, + // we may need to compute/store three variants of size_auto_fit, for x/y/xy. + // Here we implement a workaround for child windows only, but a full solution would apply to normal windows as well: + if ((window->ChildFlags & ImGuiChildFlags_ResizeX) && !(window->ChildFlags & ImGuiChildFlags_ResizeY)) + size_auto_fit.y = window->SizeFull.y; + else if (!(window->ChildFlags & ImGuiChildFlags_ResizeX) && (window->ChildFlags & ImGuiChildFlags_ResizeY)) + size_auto_fit.x = window->SizeFull.x; // When the window cannot fit all contents (either because of constraints, either because screen is too small), // we are growing the size on the other axis to compensate for expected scrollbar. FIXME: Might turn bigger than ViewportSize-WindowPadding. ImVec2 size_auto_fit_after_constraint = CalcWindowSizeAfterConstraint(window, size_auto_fit); - bool will_have_scrollbar_x = (size_auto_fit_after_constraint.x - size_pad.x - size_decorations.x < size_contents.x && !(window->Flags & ImGuiWindowFlags_NoScrollbar) && (window->Flags & ImGuiWindowFlags_HorizontalScrollbar)) || (window->Flags & ImGuiWindowFlags_AlwaysHorizontalScrollbar); - bool will_have_scrollbar_y = (size_auto_fit_after_constraint.y - size_pad.y - size_decorations.y < size_contents.y && !(window->Flags & ImGuiWindowFlags_NoScrollbar)) || (window->Flags & ImGuiWindowFlags_AlwaysVerticalScrollbar); + bool will_have_scrollbar_x = (size_auto_fit_after_constraint.x - size_pad.x - decoration_w_without_scrollbars < size_contents.x && !(window->Flags & ImGuiWindowFlags_NoScrollbar) && (window->Flags & ImGuiWindowFlags_HorizontalScrollbar)) || (window->Flags & ImGuiWindowFlags_AlwaysHorizontalScrollbar); + bool will_have_scrollbar_y = (size_auto_fit_after_constraint.y - size_pad.y - decoration_h_without_scrollbars < size_contents.y && !(window->Flags & ImGuiWindowFlags_NoScrollbar)) || (window->Flags & ImGuiWindowFlags_AlwaysVerticalScrollbar); if (will_have_scrollbar_x) size_auto_fit.y += style.ScrollbarSize; if (will_have_scrollbar_y) @@ -4984,19 +6723,21 @@ static ImVec2 CalcWindowAutoFitSize(ImGuiWindow* window, const ImVec2& size_cont } } -ImVec2 ImGui::CalcWindowExpectedSize(ImGuiWindow* window) +ImVec2 ImGui::CalcWindowNextAutoFitSize(ImGuiWindow* window) { - ImVec2 size_contents = CalcWindowContentSize(window); - ImVec2 size_auto_fit = CalcWindowAutoFitSize(window, size_contents); + ImVec2 size_contents_current; + ImVec2 size_contents_ideal; + CalcWindowContentSizes(window, &size_contents_current, &size_contents_ideal); + ImVec2 size_auto_fit = CalcWindowAutoFitSize(window, size_contents_ideal); ImVec2 size_final = CalcWindowSizeAfterConstraint(window, size_auto_fit); return size_final; } -static ImGuiCol GetWindowBgColorIdxFromFlags(ImGuiWindowFlags flags) +static ImGuiCol GetWindowBgColorIdx(ImGuiWindow* window) { - if (flags & (ImGuiWindowFlags_Tooltip | ImGuiWindowFlags_Popup)) + if (window->Flags & (ImGuiWindowFlags_Tooltip | ImGuiWindowFlags_Popup)) return ImGuiCol_PopupBg; - if (flags & ImGuiWindowFlags_ChildWindow) + if ((window->Flags & ImGuiWindowFlags_ChildWindow) && !window->DockIsActive) return ImGuiCol_ChildBg; return ImGuiCol_WindowBg; } @@ -5015,217 +6756,368 @@ static void CalcResizePosSizeFromAnyCorner(ImGuiWindow* window, const ImVec2& co *out_size = size_constrained; } +// Data for resizing from resize grip / corner struct ImGuiResizeGripDef { ImVec2 CornerPosN; ImVec2 InnerDir; int AngleMin12, AngleMax12; }; - static const ImGuiResizeGripDef resize_grip_def[4] = { - { ImVec2(1,1), ImVec2(-1,-1), 0, 3 }, // Lower right - { ImVec2(0,1), ImVec2(+1,-1), 3, 6 }, // Lower left - { ImVec2(0,0), ImVec2(+1,+1), 6, 9 }, // Upper left - { ImVec2(1,0), ImVec2(-1,+1), 9,12 }, // Upper right + { ImVec2(1, 1), ImVec2(-1, -1), 0, 3 }, // Lower-right + { ImVec2(0, 1), ImVec2(+1, -1), 3, 6 }, // Lower-left + { ImVec2(0, 0), ImVec2(+1, +1), 6, 9 }, // Upper-left (Unused) + { ImVec2(1, 0), ImVec2(-1, +1), 9, 12 } // Upper-right (Unused) +}; + +// Data for resizing from borders +struct ImGuiResizeBorderDef +{ + ImVec2 InnerDir; // Normal toward inside + ImVec2 SegmentN1, SegmentN2; // End positions, normalized (0,0: upper left) + float OuterAngle; // Angle toward outside +}; +static const ImGuiResizeBorderDef resize_border_def[4] = +{ + { ImVec2(+1, 0), ImVec2(0, 1), ImVec2(0, 0), IM_PI * 1.00f }, // Left + { ImVec2(-1, 0), ImVec2(1, 0), ImVec2(1, 1), IM_PI * 0.00f }, // Right + { ImVec2(0, +1), ImVec2(0, 0), ImVec2(1, 0), IM_PI * 1.50f }, // Up + { ImVec2(0, -1), ImVec2(1, 1), ImVec2(0, 1), IM_PI * 0.50f } // Down }; static ImRect GetResizeBorderRect(ImGuiWindow* window, int border_n, float perp_padding, float thickness) { ImRect rect = window->Rect(); - if (thickness == 0.0f) rect.Max -= ImVec2(1,1); - if (border_n == 0) return ImRect(rect.Min.x + perp_padding, rect.Min.y - thickness, rect.Max.x - perp_padding, rect.Min.y + thickness); // Top - if (border_n == 1) return ImRect(rect.Max.x - thickness, rect.Min.y + perp_padding, rect.Max.x + thickness, rect.Max.y - perp_padding); // Right - if (border_n == 2) return ImRect(rect.Min.x + perp_padding, rect.Max.y - thickness, rect.Max.x - perp_padding, rect.Max.y + thickness); // Bottom - if (border_n == 3) return ImRect(rect.Min.x - thickness, rect.Min.y + perp_padding, rect.Min.x + thickness, rect.Max.y - perp_padding); // Left + if (thickness == 0.0f) + rect.Max -= ImVec2(1, 1); + if (border_n == ImGuiDir_Left) { return ImRect(rect.Min.x - thickness, rect.Min.y + perp_padding, rect.Min.x + thickness, rect.Max.y - perp_padding); } + if (border_n == ImGuiDir_Right) { return ImRect(rect.Max.x - thickness, rect.Min.y + perp_padding, rect.Max.x + thickness, rect.Max.y - perp_padding); } + if (border_n == ImGuiDir_Up) { return ImRect(rect.Min.x + perp_padding, rect.Min.y - thickness, rect.Max.x - perp_padding, rect.Min.y + thickness); } + if (border_n == ImGuiDir_Down) { return ImRect(rect.Min.x + perp_padding, rect.Max.y - thickness, rect.Max.x - perp_padding, rect.Max.y + thickness); } IM_ASSERT(0); return ImRect(); } +// 0..3: corners (Lower-right, Lower-left, Unused, Unused) +ImGuiID ImGui::GetWindowResizeCornerID(ImGuiWindow* window, int n) +{ + IM_ASSERT(n >= 0 && n < 4); + ImGuiID id = window->DockIsActive ? window->DockNode->HostWindow->ID : window->ID; + id = ImHashStr("#RESIZE", 0, id); + id = ImHashData(&n, sizeof(int), id); + return id; +} + +// Borders (Left, Right, Up, Down) +ImGuiID ImGui::GetWindowResizeBorderID(ImGuiWindow* window, ImGuiDir dir) +{ + IM_ASSERT(dir >= 0 && dir < 4); + int n = (int)dir + 4; + ImGuiID id = window->DockIsActive ? window->DockNode->HostWindow->ID : window->ID; + id = ImHashStr("#RESIZE", 0, id); + id = ImHashData(&n, sizeof(int), id); + return id; +} + // Handle resize for: Resize Grips, Borders, Gamepad -// Return true when using auto-fit (double click on resize grip) -static bool ImGui::UpdateManualResize(ImGuiWindow* window, const ImVec2& size_auto_fit, int* border_held, int resize_grip_count, ImU32 resize_grip_col[4]) +// Return true when using auto-fit (double-click on resize grip) +static int ImGui::UpdateWindowManualResize(ImGuiWindow* window, const ImVec2& size_auto_fit, int* border_hovered, int* border_held, int resize_grip_count, ImU32 resize_grip_col[4], const ImRect& visibility_rect) { ImGuiContext& g = *GImGui; ImGuiWindowFlags flags = window->Flags; if ((flags & ImGuiWindowFlags_NoResize) || (flags & ImGuiWindowFlags_AlwaysAutoResize) || window->AutoFitFramesX > 0 || window->AutoFitFramesY > 0) return false; - if (window->WasActive == false) // Early out to avoid running this code for e.g. an hidden implicit/fallback Debug window. + if (window->WasActive == false) // Early out to avoid running this code for e.g. a hidden implicit/fallback Debug window. return false; - bool ret_auto_fit = false; - const int resize_border_count = g.IO.ConfigWindowsResizeFromEdges ? 4 : 0; - const float grip_draw_size = (float)(int)ImMax(g.FontSize * 1.35f, window->WindowRounding + 1.0f + g.FontSize * 0.2f); - const float grip_hover_inner_size = (float)(int)(grip_draw_size * 0.75f); - const float grip_hover_outer_size = g.IO.ConfigWindowsResizeFromEdges ? WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS : 0.0f; + int ret_auto_fit_mask = 0x00; + const float grip_draw_size = IM_TRUNC(ImMax(g.FontSize * 1.35f, window->WindowRounding + 1.0f + g.FontSize * 0.2f)); + const float grip_hover_inner_size = (resize_grip_count > 0) ? IM_TRUNC(grip_draw_size * 0.75f) : 0.0f; + const float grip_hover_outer_size = g.WindowsBorderHoverPadding; + + ImRect clamp_rect = visibility_rect; + const bool window_move_from_title_bar = g.IO.ConfigWindowsMoveFromTitleBarOnly && !(window->Flags & ImGuiWindowFlags_NoTitleBar); + if (window_move_from_title_bar) + clamp_rect.Min.y -= window->TitleBarHeight; ImVec2 pos_target(FLT_MAX, FLT_MAX); ImVec2 size_target(FLT_MAX, FLT_MAX); + // Clip mouse interaction rectangles within the viewport rectangle (in practice the narrowing is going to happen most of the time). + // - Not narrowing would mostly benefit the situation where OS windows _without_ decoration have a threshold for hovering when outside their limits. + // This is however not the case with current backends under Win32, but a custom borderless window implementation would benefit from it. + // - When decoration are enabled we typically benefit from that distance, but then our resize elements would be conflicting with OS resize elements, so we also narrow. + // - Note that we are unable to tell if the platform setup allows hovering with a distance threshold (on Win32, decorated window have such threshold). + // We only clip interaction so we overwrite window->ClipRect, cannot call PushClipRect() yet as DrawList is not yet setup. + const bool clip_with_viewport_rect = !(g.IO.BackendFlags & ImGuiBackendFlags_HasMouseHoveredViewport) || (g.IO.MouseHoveredViewport != window->ViewportId) || !(window->Viewport->Flags & ImGuiViewportFlags_NoDecoration); + if (clip_with_viewport_rect) + window->ClipRect = window->Viewport->GetMainRect(); + // Resize grips and borders are on layer 1 window->DC.NavLayerCurrent = ImGuiNavLayer_Menu; - window->DC.NavLayerCurrentMask = (1 << ImGuiNavLayer_Menu); // Manual resize grips PushID("#RESIZE"); for (int resize_grip_n = 0; resize_grip_n < resize_grip_count; resize_grip_n++) { - const ImGuiResizeGripDef& grip = resize_grip_def[resize_grip_n]; - const ImVec2 corner = ImLerp(window->Pos, window->Pos + window->Size, grip.CornerPosN); + const ImGuiResizeGripDef& def = resize_grip_def[resize_grip_n]; + const ImVec2 corner = ImLerp(window->Pos, window->Pos + window->Size, def.CornerPosN); // Using the FlattenChilds button flag we make the resize button accessible even if we are hovering over a child window - ImRect resize_rect(corner - grip.InnerDir * grip_hover_outer_size, corner + grip.InnerDir * grip_hover_inner_size); + bool hovered, held; + ImRect resize_rect(corner - def.InnerDir * grip_hover_outer_size, corner + def.InnerDir * grip_hover_inner_size); if (resize_rect.Min.x > resize_rect.Max.x) ImSwap(resize_rect.Min.x, resize_rect.Max.x); if (resize_rect.Min.y > resize_rect.Max.y) ImSwap(resize_rect.Min.y, resize_rect.Max.y); - bool hovered, held; - ButtonBehavior(resize_rect, window->GetID((void*)(intptr_t)resize_grip_n), &hovered, &held, ImGuiButtonFlags_FlattenChildren | ImGuiButtonFlags_NoNavFocus); + ImGuiID resize_grip_id = window->GetID(resize_grip_n); // == GetWindowResizeCornerID() + ItemAdd(resize_rect, resize_grip_id, NULL, ImGuiItemFlags_NoNav); + ButtonBehavior(resize_rect, resize_grip_id, &hovered, &held, ImGuiButtonFlags_FlattenChildren | ImGuiButtonFlags_NoNavFocus); //GetForegroundDrawList(window)->AddRect(resize_rect.Min, resize_rect.Max, IM_COL32(255, 255, 0, 255)); if (hovered || held) - g.MouseCursor = (resize_grip_n & 1) ? ImGuiMouseCursor_ResizeNESW : ImGuiMouseCursor_ResizeNWSE; + SetMouseCursor((resize_grip_n & 1) ? ImGuiMouseCursor_ResizeNESW : ImGuiMouseCursor_ResizeNWSE); - if (held && g.IO.MouseDoubleClicked[0] && resize_grip_n == 0) + if (held && g.IO.MouseDoubleClicked[0]) { - // Manual auto-fit when double-clicking + // Auto-fit when double-clicking size_target = CalcWindowSizeAfterConstraint(window, size_auto_fit); - ret_auto_fit = true; + ret_auto_fit_mask = 0x03; // Both axes ClearActiveID(); } else if (held) { // Resize from any of the four corners // We don't use an incremental MouseDelta but rather compute an absolute target size based on mouse position - ImVec2 corner_target = g.IO.MousePos - g.ActiveIdClickOffset + ImLerp(grip.InnerDir * grip_hover_outer_size, grip.InnerDir * -grip_hover_inner_size, grip.CornerPosN); // Corner of the window corresponding to our corner grip - CalcResizePosSizeFromAnyCorner(window, corner_target, grip.CornerPosN, &pos_target, &size_target); + ImVec2 clamp_min = ImVec2(def.CornerPosN.x == 1.0f ? clamp_rect.Min.x : -FLT_MAX, (def.CornerPosN.y == 1.0f || (def.CornerPosN.y == 0.0f && window_move_from_title_bar)) ? clamp_rect.Min.y : -FLT_MAX); + ImVec2 clamp_max = ImVec2(def.CornerPosN.x == 0.0f ? clamp_rect.Max.x : +FLT_MAX, def.CornerPosN.y == 0.0f ? clamp_rect.Max.y : +FLT_MAX); + ImVec2 corner_target = g.IO.MousePos - g.ActiveIdClickOffset + ImLerp(def.InnerDir * grip_hover_outer_size, def.InnerDir * -grip_hover_inner_size, def.CornerPosN); // Corner of the window corresponding to our corner grip + corner_target = ImClamp(corner_target, clamp_min, clamp_max); + CalcResizePosSizeFromAnyCorner(window, corner_target, def.CornerPosN, &pos_target, &size_target); } + + // Only lower-left grip is visible before hovering/activating if (resize_grip_n == 0 || held || hovered) resize_grip_col[resize_grip_n] = GetColorU32(held ? ImGuiCol_ResizeGripActive : hovered ? ImGuiCol_ResizeGripHovered : ImGuiCol_ResizeGrip); } - for (int border_n = 0; border_n < resize_border_count; border_n++) + + int resize_border_mask = 0x00; + if (window->Flags & ImGuiWindowFlags_ChildWindow) + resize_border_mask |= ((window->ChildFlags & ImGuiChildFlags_ResizeX) ? 0x02 : 0) | ((window->ChildFlags & ImGuiChildFlags_ResizeY) ? 0x08 : 0); + else + resize_border_mask = g.IO.ConfigWindowsResizeFromEdges ? 0x0F : 0x00; + for (int border_n = 0; border_n < 4; border_n++) { + if ((resize_border_mask & (1 << border_n)) == 0) + continue; + const ImGuiResizeBorderDef& def = resize_border_def[border_n]; + const ImGuiAxis axis = (border_n == ImGuiDir_Left || border_n == ImGuiDir_Right) ? ImGuiAxis_X : ImGuiAxis_Y; + bool hovered, held; - ImRect border_rect = GetResizeBorderRect(window, border_n, grip_hover_inner_size, WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS); - ButtonBehavior(border_rect, window->GetID((void*)(intptr_t)(border_n + 4)), &hovered, &held, ImGuiButtonFlags_FlattenChildren); - //GetForegroundDrawLists(window)->AddRect(border_rect.Min, border_rect.Max, IM_COL32(255, 255, 0, 255)); - if ((hovered && g.HoveredIdTimer > WINDOWS_RESIZE_FROM_EDGES_FEEDBACK_TIMER) || held) + ImRect border_rect = GetResizeBorderRect(window, border_n, grip_hover_inner_size, g.WindowsBorderHoverPadding); + ImGuiID border_id = window->GetID(border_n + 4); // == GetWindowResizeBorderID() + ItemAdd(border_rect, border_id, NULL, ImGuiItemFlags_NoNav); + ButtonBehavior(border_rect, border_id, &hovered, &held, ImGuiButtonFlags_FlattenChildren | ImGuiButtonFlags_NoNavFocus); + //GetForegroundDrawList(window)->AddRect(border_rect.Min, border_rect.Max, IM_COL32(255, 255, 0, 255)); + if (hovered && g.HoveredIdTimer <= WINDOWS_RESIZE_FROM_EDGES_FEEDBACK_TIMER) + hovered = false; + if (hovered || held) + SetMouseCursor((axis == ImGuiAxis_X) ? ImGuiMouseCursor_ResizeEW : ImGuiMouseCursor_ResizeNS); + if (held && g.IO.MouseDoubleClicked[0]) { - g.MouseCursor = (border_n & 1) ? ImGuiMouseCursor_ResizeEW : ImGuiMouseCursor_ResizeNS; - if (held) - *border_held = border_n; + // Double-clicking bottom or right border auto-fit on this axis + // FIXME: CalcWindowAutoFitSize() doesn't take into account that only one side may be auto-fit when calculating scrollbars. + // FIXME: Support top and right borders: rework CalcResizePosSizeFromAnyCorner() to be reusable in both cases. + if (border_n == 1 || border_n == 3) // Right and bottom border + { + size_target[axis] = CalcWindowSizeAfterConstraint(window, size_auto_fit)[axis]; + ret_auto_fit_mask |= (1 << axis); + hovered = held = false; // So border doesn't show highlighted at new position + } + ClearActiveID(); } - if (held) + else if (held) { + // Switch to relative resizing mode when border geometry moved (e.g. resizing a child altering parent scroll), in order to avoid resizing feedback loop. + // Currently only using relative mode on resizable child windows, as the problem to solve is more likely noticeable for them, but could apply for all windows eventually. + // FIXME: May want to generalize this idiom at lower-level, so more widgets can use it! + const bool just_scrolled_manually_while_resizing = (g.WheelingWindow != NULL && g.WheelingWindowScrolledFrame == g.FrameCount && IsWindowChildOf(window, g.WheelingWindow, false, true)); + if (g.ActiveIdIsJustActivated || just_scrolled_manually_while_resizing) + { + g.WindowResizeBorderExpectedRect = border_rect; + g.WindowResizeRelativeMode = false; + } + if ((window->Flags & ImGuiWindowFlags_ChildWindow) && memcmp(&g.WindowResizeBorderExpectedRect, &border_rect, sizeof(ImRect)) != 0) + g.WindowResizeRelativeMode = true; + + const ImVec2 border_curr = (window->Pos + ImMin(def.SegmentN1, def.SegmentN2) * window->Size); + const float border_target_rel_mode_for_axis = border_curr[axis] + g.IO.MouseDelta[axis]; + const float border_target_abs_mode_for_axis = g.IO.MousePos[axis] - g.ActiveIdClickOffset[axis] + g.WindowsBorderHoverPadding; // Match ButtonBehavior() padding above. + + // Use absolute mode position ImVec2 border_target = window->Pos; - ImVec2 border_posn; - if (border_n == 0) { border_posn = ImVec2(0, 0); border_target.y = (g.IO.MousePos.y - g.ActiveIdClickOffset.y + WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS); } // Top - if (border_n == 1) { border_posn = ImVec2(1, 0); border_target.x = (g.IO.MousePos.x - g.ActiveIdClickOffset.x + WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS); } // Right - if (border_n == 2) { border_posn = ImVec2(0, 1); border_target.y = (g.IO.MousePos.y - g.ActiveIdClickOffset.y + WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS); } // Bottom - if (border_n == 3) { border_posn = ImVec2(0, 0); border_target.x = (g.IO.MousePos.x - g.ActiveIdClickOffset.x + WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS); } // Left - CalcResizePosSizeFromAnyCorner(window, border_target, border_posn, &pos_target, &size_target); + border_target[axis] = border_target_abs_mode_for_axis; + + // Use relative mode target for child window, ignore resize when moving back toward the ideal absolute position. + bool ignore_resize = false; + if (g.WindowResizeRelativeMode) + { + //GetForegroundDrawList()->AddText(GetMainViewport()->WorkPos, IM_COL32_WHITE, "Relative Mode"); + border_target[axis] = border_target_rel_mode_for_axis; + if (g.IO.MouseDelta[axis] == 0.0f || (g.IO.MouseDelta[axis] > 0.0f) == (border_target_rel_mode_for_axis > border_target_abs_mode_for_axis)) + ignore_resize = true; + } + + // Clamp, apply + ImVec2 clamp_min(border_n == ImGuiDir_Right ? clamp_rect.Min.x : -FLT_MAX, border_n == ImGuiDir_Down || (border_n == ImGuiDir_Up && window_move_from_title_bar) ? clamp_rect.Min.y : -FLT_MAX); + ImVec2 clamp_max(border_n == ImGuiDir_Left ? clamp_rect.Max.x : +FLT_MAX, border_n == ImGuiDir_Up ? clamp_rect.Max.y : +FLT_MAX); + border_target = ImClamp(border_target, clamp_min, clamp_max); + if (flags & ImGuiWindowFlags_ChildWindow) // Clamp resizing of childs within parent + { + ImGuiWindow* parent_window = window->ParentWindow; + ImGuiWindowFlags parent_flags = parent_window->Flags; + ImRect border_limit_rect = parent_window->InnerRect; + border_limit_rect.Expand(ImVec2(-ImMax(parent_window->WindowPadding.x, parent_window->WindowBorderSize), -ImMax(parent_window->WindowPadding.y, parent_window->WindowBorderSize))); + if ((axis == ImGuiAxis_X) && ((parent_flags & (ImGuiWindowFlags_HorizontalScrollbar | ImGuiWindowFlags_AlwaysHorizontalScrollbar)) == 0 || (parent_flags & ImGuiWindowFlags_NoScrollbar))) + border_target.x = ImClamp(border_target.x, border_limit_rect.Min.x, border_limit_rect.Max.x); + if ((axis == ImGuiAxis_Y) && (parent_flags & ImGuiWindowFlags_NoScrollbar)) + border_target.y = ImClamp(border_target.y, border_limit_rect.Min.y, border_limit_rect.Max.y); + } + if (!ignore_resize) + CalcResizePosSizeFromAnyCorner(window, border_target, ImMin(def.SegmentN1, def.SegmentN2), &pos_target, &size_target); } + if (hovered) + *border_hovered = border_n; + if (held) + *border_held = border_n; } PopID(); + // Restore nav layer + window->DC.NavLayerCurrent = ImGuiNavLayer_Main; + // Navigation resize (keyboard/gamepad) - if (g.NavWindowingTarget && g.NavWindowingTarget->RootWindow == window) + // FIXME: This cannot be moved to NavUpdateWindowing() because CalcWindowSizeAfterConstraint() need to callback into user. + // Not even sure the callback works here. + if (g.NavWindowingTarget && g.NavWindowingTarget->RootWindowDockTree == window) { - ImVec2 nav_resize_delta; - if (g.NavInputSource == ImGuiInputSource_NavKeyboard && g.IO.KeyShift) - nav_resize_delta = GetNavInputAmount2d(ImGuiNavDirSourceFlags_Keyboard, ImGuiInputReadMode_Down); - if (g.NavInputSource == ImGuiInputSource_NavGamepad) - nav_resize_delta = GetNavInputAmount2d(ImGuiNavDirSourceFlags_PadDPad, ImGuiInputReadMode_Down); - if (nav_resize_delta.x != 0.0f || nav_resize_delta.y != 0.0f) + ImVec2 nav_resize_dir; + if (g.NavInputSource == ImGuiInputSource_Keyboard && g.IO.KeyShift) + nav_resize_dir = GetKeyMagnitude2d(ImGuiKey_LeftArrow, ImGuiKey_RightArrow, ImGuiKey_UpArrow, ImGuiKey_DownArrow); + if (g.NavInputSource == ImGuiInputSource_Gamepad) + nav_resize_dir = GetKeyMagnitude2d(ImGuiKey_GamepadDpadLeft, ImGuiKey_GamepadDpadRight, ImGuiKey_GamepadDpadUp, ImGuiKey_GamepadDpadDown); + if (nav_resize_dir.x != 0.0f || nav_resize_dir.y != 0.0f) { const float NAV_RESIZE_SPEED = 600.0f; - nav_resize_delta *= ImFloor(NAV_RESIZE_SPEED * g.IO.DeltaTime * ImMin(g.IO.DisplayFramebufferScale.x, g.IO.DisplayFramebufferScale.y)); + const float resize_step = NAV_RESIZE_SPEED * g.IO.DeltaTime * ImMin(g.IO.DisplayFramebufferScale.x, g.IO.DisplayFramebufferScale.y); + g.NavWindowingAccumDeltaSize += nav_resize_dir * resize_step; + g.NavWindowingAccumDeltaSize = ImMax(g.NavWindowingAccumDeltaSize, clamp_rect.Min - window->Pos - window->Size); // We need Pos+Size >= clmap_rect.Min, so Size >= clmap_rect.Min - Pos, so size_delta >= clmap_rect.Min - window->Pos - window->Size g.NavWindowingToggleLayer = false; - g.NavDisableMouseHover = true; + g.NavHighlightItemUnderNav = true; resize_grip_col[0] = GetColorU32(ImGuiCol_ResizeGripActive); - // FIXME-NAV: Should store and accumulate into a separate size buffer to handle sizing constraints properly, right now a constraint will make us stuck. - size_target = CalcWindowSizeAfterConstraint(window, window->SizeFull + nav_resize_delta); + ImVec2 accum_floored = ImTrunc(g.NavWindowingAccumDeltaSize); + if (accum_floored.x != 0.0f || accum_floored.y != 0.0f) + { + // FIXME-NAV: Should store and accumulate into a separate size buffer to handle sizing constraints properly, right now a constraint will make us stuck. + size_target = CalcWindowSizeAfterConstraint(window, window->SizeFull + accum_floored); + g.NavWindowingAccumDeltaSize -= accum_floored; + } } } // Apply back modified position/size to window - if (size_target.x != FLT_MAX) - { - window->SizeFull = size_target; + const ImVec2 curr_pos = window->Pos; + const ImVec2 curr_size = window->SizeFull; + if (size_target.x != FLT_MAX && (window->Size.x != size_target.x || window->SizeFull.x != size_target.x)) + window->Size.x = window->SizeFull.x = size_target.x; + if (size_target.y != FLT_MAX && (window->Size.y != size_target.y || window->SizeFull.y != size_target.y)) + window->Size.y = window->SizeFull.y = size_target.y; + if (pos_target.x != FLT_MAX && window->Pos.x != ImTrunc(pos_target.x)) + window->Pos.x = ImTrunc(pos_target.x); + if (pos_target.y != FLT_MAX && window->Pos.y != ImTrunc(pos_target.y)) + window->Pos.y = ImTrunc(pos_target.y); + if (curr_pos.x != window->Pos.x || curr_pos.y != window->Pos.y || curr_size.x != window->SizeFull.x || curr_size.y != window->SizeFull.y) MarkIniSettingsDirty(window); - } - if (pos_target.x != FLT_MAX) - { - window->Pos = ImFloor(pos_target); - MarkIniSettingsDirty(window); - } - // Resize nav layer - window->DC.NavLayerCurrent = ImGuiNavLayer_Main; - window->DC.NavLayerCurrentMask = (1 << ImGuiNavLayer_Main); + // Recalculate next expected border expected coordinates + if (*border_held != -1) + g.WindowResizeBorderExpectedRect = GetResizeBorderRect(window, *border_held, grip_hover_inner_size, g.WindowsBorderHoverPadding); - window->Size = window->SizeFull; - return ret_auto_fit; + return ret_auto_fit_mask; } -static inline void ClampWindowRect(ImGuiWindow* window, const ImRect& rect, const ImVec2& padding) +static inline void ClampWindowPos(ImGuiWindow* window, const ImRect& visibility_rect) { ImGuiContext& g = *GImGui; - ImVec2 size_for_clamping = (g.IO.ConfigWindowsMoveFromTitleBarOnly && !(window->Flags & ImGuiWindowFlags_NoTitleBar)) ? ImVec2(window->Size.x, window->TitleBarHeight()) : window->Size; - window->Pos = ImMin(rect.Max - padding, ImMax(window->Pos + size_for_clamping, rect.Min + padding) - size_for_clamping); + ImVec2 size_for_clamping = window->Size; + if (g.IO.ConfigWindowsMoveFromTitleBarOnly && window->DockNodeAsHost) + size_for_clamping.y = ImGui::GetFrameHeight(); // Not using window->TitleBarHeight() as DockNodeAsHost will report 0.0f here. + else if (g.IO.ConfigWindowsMoveFromTitleBarOnly && !(window->Flags & ImGuiWindowFlags_NoTitleBar)) + size_for_clamping.y = window->TitleBarHeight; + window->Pos = ImClamp(window->Pos, visibility_rect.Min - size_for_clamping, visibility_rect.Max); +} + +static void RenderWindowOuterSingleBorder(ImGuiWindow* window, int border_n, ImU32 border_col, float border_size) +{ + const ImGuiResizeBorderDef& def = resize_border_def[border_n]; + const float rounding = window->WindowRounding; + const ImRect border_r = GetResizeBorderRect(window, border_n, rounding, 0.0f); + window->DrawList->PathArcTo(ImLerp(border_r.Min, border_r.Max, def.SegmentN1) + ImVec2(0.5f, 0.5f) + def.InnerDir * rounding, rounding, def.OuterAngle - IM_PI * 0.25f, def.OuterAngle); + window->DrawList->PathArcTo(ImLerp(border_r.Min, border_r.Max, def.SegmentN2) + ImVec2(0.5f, 0.5f) + def.InnerDir * rounding, rounding, def.OuterAngle, def.OuterAngle + IM_PI * 0.25f); + window->DrawList->PathStroke(border_col, ImDrawFlags_None, border_size); } static void ImGui::RenderWindowOuterBorders(ImGuiWindow* window) { ImGuiContext& g = *GImGui; - float rounding = window->WindowRounding; - float border_size = window->WindowBorderSize; - if (border_size > 0.0f && !(window->Flags & ImGuiWindowFlags_NoBackground)) - window->DrawList->AddRect(window->Pos, window->Pos + window->Size, GetColorU32(ImGuiCol_Border), rounding, ImDrawCornerFlags_All, border_size); - - int border_held = window->ResizeBorderHeld; - if (border_held != -1) + const float border_size = window->WindowBorderSize; + const ImU32 border_col = GetColorU32(ImGuiCol_Border); + if (border_size > 0.0f && (window->Flags & ImGuiWindowFlags_NoBackground) == 0) + window->DrawList->AddRect(window->Pos, window->Pos + window->Size, border_col, window->WindowRounding, 0, window->WindowBorderSize); + else if (border_size > 0.0f) { - struct ImGuiResizeBorderDef - { - ImVec2 InnerDir; - ImVec2 CornerPosN1, CornerPosN2; - float OuterAngle; - }; - static const ImGuiResizeBorderDef resize_border_def[4] = - { - { ImVec2(0,+1), ImVec2(0,0), ImVec2(1,0), IM_PI*1.50f }, // Top - { ImVec2(-1,0), ImVec2(1,0), ImVec2(1,1), IM_PI*0.00f }, // Right - { ImVec2(0,-1), ImVec2(1,1), ImVec2(0,1), IM_PI*0.50f }, // Bottom - { ImVec2(+1,0), ImVec2(0,1), ImVec2(0,0), IM_PI*1.00f } // Left - }; - const ImGuiResizeBorderDef& def = resize_border_def[border_held]; - ImRect border_r = GetResizeBorderRect(window, border_held, rounding, 0.0f); - window->DrawList->PathArcTo(ImLerp(border_r.Min, border_r.Max, def.CornerPosN1) + ImVec2(0.5f, 0.5f) + def.InnerDir * rounding, rounding, def.OuterAngle - IM_PI*0.25f, def.OuterAngle); - window->DrawList->PathArcTo(ImLerp(border_r.Min, border_r.Max, def.CornerPosN2) + ImVec2(0.5f, 0.5f) + def.InnerDir * rounding, rounding, def.OuterAngle, def.OuterAngle + IM_PI*0.25f); - window->DrawList->PathStroke(GetColorU32(ImGuiCol_SeparatorActive), false, ImMax(2.0f, border_size)); // Thicker than usual + if (window->ChildFlags & ImGuiChildFlags_ResizeX) // Similar code as 'resize_border_mask' computation in UpdateWindowManualResize() but we specifically only always draw explicit child resize border. + RenderWindowOuterSingleBorder(window, 1, border_col, border_size); + if (window->ChildFlags & ImGuiChildFlags_ResizeY) + RenderWindowOuterSingleBorder(window, 3, border_col, border_size); } - if (g.Style.FrameBorderSize > 0 && !(window->Flags & ImGuiWindowFlags_NoTitleBar)) + if (window->ResizeBorderHovered != -1 || window->ResizeBorderHeld != -1) { - float y = window->Pos.y + window->TitleBarHeight() - 1; - window->DrawList->AddLine(ImVec2(window->Pos.x + border_size, y), ImVec2(window->Pos.x + window->Size.x - border_size, y), GetColorU32(ImGuiCol_Border), g.Style.FrameBorderSize); + const int border_n = (window->ResizeBorderHeld != -1) ? window->ResizeBorderHeld : window->ResizeBorderHovered; + const ImU32 border_col_resizing = GetColorU32((window->ResizeBorderHeld != -1) ? ImGuiCol_SeparatorActive : ImGuiCol_SeparatorHovered); + RenderWindowOuterSingleBorder(window, border_n, border_col_resizing, ImMax(2.0f, window->WindowBorderSize)); // Thicker than usual + } + if (g.Style.FrameBorderSize > 0 && !(window->Flags & ImGuiWindowFlags_NoTitleBar) && !window->DockIsActive) + { + float y = window->Pos.y + window->TitleBarHeight - 1; + window->DrawList->AddLine(ImVec2(window->Pos.x + border_size * 0.5f, y), ImVec2(window->Pos.x + window->Size.x - border_size * 0.5f, y), border_col, g.Style.FrameBorderSize); } } -void ImGui::RenderWindowDecorations(ImGuiWindow* window, const ImRect& title_bar_rect, bool title_bar_is_highlight, int resize_grip_count, const ImU32 resize_grip_col[4], float resize_grip_draw_size) +// Draw background and borders +// Draw and handle scrollbars +void ImGui::RenderWindowDecorations(ImGuiWindow* window, const ImRect& title_bar_rect, bool title_bar_is_highlight, bool handle_borders_and_resize_grips, int resize_grip_count, const ImU32 resize_grip_col[4], float resize_grip_draw_size) { ImGuiContext& g = *GImGui; ImGuiStyle& style = g.Style; ImGuiWindowFlags flags = window->Flags; + // Ensure that Scrollbar() doesn't read last frame's SkipItems + IM_ASSERT(window->BeginCount == 0); + window->SkipItems = false; + window->DC.NavLayerCurrent = ImGuiNavLayer_Menu; + // Draw window + handle manual resize - // As we highlight the title bar when want_focus is set, multiple reappearing windows will have have their title bar highlighted on their reappearing frame. + // As we highlight the title bar when want_focus is set, multiple reappearing windows will have their title bar highlighted on their reappearing frame. const float window_rounding = window->WindowRounding; const float window_border_size = window->WindowBorderSize; if (window->Collapsed) { // Title bar only - float backup_border_size = style.FrameBorderSize; + const float backup_border_size = style.FrameBorderSize; g.Style.FrameBorderSize = window->WindowBorderSize; - ImU32 title_bar_col = GetColorU32((title_bar_is_highlight && !g.NavDisableHighlight) ? ImGuiCol_TitleBgActive : ImGuiCol_TitleBgCollapsed); + ImU32 title_bar_col = GetColorU32((title_bar_is_highlight && g.NavCursorVisible) ? ImGuiCol_TitleBgActive : ImGuiCol_TitleBgCollapsed); + if (window->ViewportOwned) + title_bar_col |= IM_COL32_A_MASK; // No alpha (we don't support is_docking_transparent_payload here because simpler and less meaningful, but could with a bit of code shuffle/reuse) RenderFrame(title_bar_rect.Min, title_bar_rect.Max, title_bar_col, true, window_rounding); g.Style.FrameBorderSize = backup_border_size; } @@ -5234,20 +7126,59 @@ void ImGui::RenderWindowDecorations(ImGuiWindow* window, const ImRect& title_bar // Window background if (!(flags & ImGuiWindowFlags_NoBackground)) { - ImU32 bg_col = GetColorU32(GetWindowBgColorIdxFromFlags(flags)); - float alpha = 1.0f; - if (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasBgAlpha) - alpha = g.NextWindowData.BgAlphaVal; - if (alpha != 1.0f) - bg_col = (bg_col & ~IM_COL32_A_MASK) | (IM_F32_TO_INT8_SAT(alpha) << IM_COL32_A_SHIFT); - window->DrawList->AddRectFilled(window->Pos + ImVec2(0, window->TitleBarHeight()), window->Pos + window->Size, bg_col, window_rounding, (flags & ImGuiWindowFlags_NoTitleBar) ? ImDrawCornerFlags_All : ImDrawCornerFlags_Bot); + bool is_docking_transparent_payload = false; + if (g.DragDropActive && (g.FrameCount - g.DragDropAcceptFrameCount) <= 1 && g.IO.ConfigDockingTransparentPayload) + if (g.DragDropPayload.IsDataType(IMGUI_PAYLOAD_TYPE_WINDOW) && *(ImGuiWindow**)g.DragDropPayload.Data == window) + is_docking_transparent_payload = true; + + ImU32 bg_col = GetColorU32(GetWindowBgColorIdx(window)); + if (window->ViewportOwned) + { + bg_col |= IM_COL32_A_MASK; // No alpha + if (is_docking_transparent_payload) + window->Viewport->Alpha *= DOCKING_TRANSPARENT_PAYLOAD_ALPHA; + } + else + { + // Adjust alpha. For docking + bool override_alpha = false; + float alpha = 1.0f; + if (g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasBgAlpha) + { + alpha = g.NextWindowData.BgAlphaVal; + override_alpha = true; + } + if (is_docking_transparent_payload) + { + alpha *= DOCKING_TRANSPARENT_PAYLOAD_ALPHA; // FIXME-DOCK: Should that be an override? + override_alpha = true; + } + if (override_alpha) + bg_col = (bg_col & ~IM_COL32_A_MASK) | (IM_F32_TO_INT8_SAT(alpha) << IM_COL32_A_SHIFT); + } + + // Render, for docked windows and host windows we ensure bg goes before decorations + if (window->DockIsActive) + window->DockNode->LastBgColor = bg_col; + ImDrawList* bg_draw_list = window->DockIsActive ? window->DockNode->HostWindow->DrawList : window->DrawList; + if (window->DockIsActive || (flags & ImGuiWindowFlags_DockNodeHost)) + bg_draw_list->ChannelsSetCurrent(DOCKING_HOST_DRAW_CHANNEL_BG); + bg_draw_list->AddRectFilled(window->Pos + ImVec2(0, window->TitleBarHeight), window->Pos + window->Size, bg_col, window_rounding, (flags & ImGuiWindowFlags_NoTitleBar) ? 0 : ImDrawFlags_RoundCornersBottom); + if (window->DockIsActive || (flags & ImGuiWindowFlags_DockNodeHost)) + bg_draw_list->ChannelsSetCurrent(DOCKING_HOST_DRAW_CHANNEL_FG); } + if (window->DockIsActive) + window->DockNode->IsBgDrawnThisFrame = true; // Title bar - if (!(flags & ImGuiWindowFlags_NoTitleBar)) + // (when docked, DockNode are drawing their own title bar. Individual windows however do NOT set the _NoTitleBar flag, + // in order for their pos/size to be matching their undocking state.) + if (!(flags & ImGuiWindowFlags_NoTitleBar) && !window->DockIsActive) { ImU32 title_bar_col = GetColorU32(title_bar_is_highlight ? ImGuiCol_TitleBgActive : ImGuiCol_TitleBg); - window->DrawList->AddRectFilled(title_bar_rect.Min, title_bar_rect.Max, title_bar_col, window_rounding, ImDrawCornerFlags_Top); + if (window->ViewportOwned) + title_bar_col |= IM_COL32_A_MASK; // No alpha + window->DrawList->AddRectFilled(title_bar_rect.Min, title_bar_rect.Max, title_bar_col, window_rounding, ImDrawFlags_RoundCornersTop); } // Menu bar @@ -5255,9 +7186,30 @@ void ImGui::RenderWindowDecorations(ImGuiWindow* window, const ImRect& title_bar { ImRect menu_bar_rect = window->MenuBarRect(); menu_bar_rect.ClipWith(window->Rect()); // Soft clipping, in particular child window don't have minimum size covering the menu bar so this is useful for them. - window->DrawList->AddRectFilled(menu_bar_rect.Min + ImVec2(window_border_size, 0), menu_bar_rect.Max - ImVec2(window_border_size, 0), GetColorU32(ImGuiCol_MenuBarBg), (flags & ImGuiWindowFlags_NoTitleBar) ? window_rounding : 0.0f, ImDrawCornerFlags_Top); + window->DrawList->AddRectFilled(menu_bar_rect.Min, menu_bar_rect.Max, GetColorU32(ImGuiCol_MenuBarBg), (flags & ImGuiWindowFlags_NoTitleBar) ? window_rounding : 0.0f, ImDrawFlags_RoundCornersTop); if (style.FrameBorderSize > 0.0f && menu_bar_rect.Max.y < window->Pos.y + window->Size.y) - window->DrawList->AddLine(menu_bar_rect.GetBL(), menu_bar_rect.GetBR(), GetColorU32(ImGuiCol_Border), style.FrameBorderSize); + window->DrawList->AddLine(menu_bar_rect.GetBL() + ImVec2(window_border_size * 0.5f, 0.0f), menu_bar_rect.GetBR() - ImVec2(window_border_size * 0.5f, 0.0f), GetColorU32(ImGuiCol_Border), style.FrameBorderSize); + } + + // Docking: Unhide tab bar (small triangle in the corner), drag from small triangle to quickly undock + ImGuiDockNode* node = window->DockNode; + if (window->DockIsActive && node->IsHiddenTabBar() && !node->IsNoTabBar()) + { + float unhide_sz_draw = ImTrunc(g.FontSize * 0.70f); + float unhide_sz_hit = ImTrunc(g.FontSize * 0.55f); + ImVec2 p = node->Pos; + ImRect r(p, p + ImVec2(unhide_sz_hit, unhide_sz_hit)); + ImGuiID unhide_id = window->GetID("#UNHIDE"); + KeepAliveID(unhide_id); + bool hovered, held; + if (ButtonBehavior(r, unhide_id, &hovered, &held, ImGuiButtonFlags_FlattenChildren)) + node->WantHiddenTabBarToggle = true; + else if (held && IsMouseDragging(0)) + StartMouseMovingWindowOrNode(window, node, true); // Undock from tab-bar triangle = same as window/collapse menu button + + // FIXME-DOCK: Ideally we'd use ImGuiCol_TitleBgActive/ImGuiCol_TitleBg here, but neither is guaranteed to be visible enough at this sort of size.. + ImU32 col = GetColorU32(((held && hovered) || (node->IsFocused && !hovered)) ? ImGuiCol_ButtonActive : hovered ? ImGuiCol_ButtonHovered : ImGuiCol_Button); + window->DrawList->AddTriangleFilled(p, p + ImVec2(unhide_sz_draw, 0.0f), p + ImVec2(0.0f, unhide_sz_draw), col); } // Scrollbars @@ -5267,24 +7219,31 @@ void ImGui::RenderWindowDecorations(ImGuiWindow* window, const ImRect& title_bar Scrollbar(ImGuiAxis_Y); // Render resize grips (after their input handling so we don't have a frame of latency) - if (!(flags & ImGuiWindowFlags_NoResize)) + if (handle_borders_and_resize_grips && !(flags & ImGuiWindowFlags_NoResize)) { for (int resize_grip_n = 0; resize_grip_n < resize_grip_count; resize_grip_n++) { + const ImU32 col = resize_grip_col[resize_grip_n]; + if ((col & IM_COL32_A_MASK) == 0) + continue; const ImGuiResizeGripDef& grip = resize_grip_def[resize_grip_n]; const ImVec2 corner = ImLerp(window->Pos, window->Pos + window->Size, grip.CornerPosN); - window->DrawList->PathLineTo(corner + grip.InnerDir * ((resize_grip_n & 1) ? ImVec2(window_border_size, resize_grip_draw_size) : ImVec2(resize_grip_draw_size, window_border_size))); - window->DrawList->PathLineTo(corner + grip.InnerDir * ((resize_grip_n & 1) ? ImVec2(resize_grip_draw_size, window_border_size) : ImVec2(window_border_size, resize_grip_draw_size))); - window->DrawList->PathArcToFast(ImVec2(corner.x + grip.InnerDir.x * (window_rounding + window_border_size), corner.y + grip.InnerDir.y * (window_rounding + window_border_size)), window_rounding, grip.AngleMin12, grip.AngleMax12); - window->DrawList->PathFillConvex(resize_grip_col[resize_grip_n]); + const float border_inner = IM_ROUND(window_border_size * 0.5f); + window->DrawList->PathLineTo(corner + grip.InnerDir * ((resize_grip_n & 1) ? ImVec2(border_inner, resize_grip_draw_size) : ImVec2(resize_grip_draw_size, border_inner))); + window->DrawList->PathLineTo(corner + grip.InnerDir * ((resize_grip_n & 1) ? ImVec2(resize_grip_draw_size, border_inner) : ImVec2(border_inner, resize_grip_draw_size))); + window->DrawList->PathArcToFast(ImVec2(corner.x + grip.InnerDir.x * (window_rounding + border_inner), corner.y + grip.InnerDir.y * (window_rounding + border_inner)), window_rounding, grip.AngleMin12, grip.AngleMax12); + window->DrawList->PathFillConvex(col); } } - // Borders - RenderWindowOuterBorders(window); + // Borders (for dock node host they will be rendered over after the tab bar) + if (handle_borders_and_resize_grips && !window->DockNodeAsHost) + RenderWindowOuterBorders(window); } + window->DC.NavLayerCurrent = ImGuiNavLayer_Main; } +// When inside a dock node, this is handled in DockNodeCalcTabBarLayout() instead. // Render title text, collapse button, close button void ImGui::RenderWindowTitleBarContents(ImGuiWindow* window, const ImRect& title_bar_rect, const char* name, bool* p_open) { @@ -5296,10 +7255,10 @@ void ImGui::RenderWindowTitleBarContents(ImGuiWindow* window, const ImRect& titl const bool has_collapse_button = !(flags & ImGuiWindowFlags_NoCollapse) && (style.WindowMenuButtonPosition != ImGuiDir_None); // Close & Collapse button are on the Menu NavLayer and don't default focus (unless there's nothing else on that layer) - const ImGuiItemFlags item_flags_backup = window->DC.ItemFlags; - window->DC.ItemFlags |= ImGuiItemFlags_NoNavDefaultFocus; + // FIXME-NAV: Might want (or not?) to set the equivalent of ImGuiButtonFlags_NoNavFocus so that mouse clicks on standard title bar items don't necessarily set nav/keyboard ref? + const ImGuiItemFlags item_flags_backup = g.CurrentItemFlags; + g.CurrentItemFlags |= ImGuiItemFlags_NoNavDefaultFocus; window->DC.NavLayerCurrent = ImGuiNavLayer_Menu; - window->DC.NavLayerCurrentMask = (1 << ImGuiNavLayer_Menu); // Layout buttons // FIXME: Would be nice to generalize the subtleties expressed here into reusable code. @@ -5310,23 +7269,23 @@ void ImGui::RenderWindowTitleBarContents(ImGuiWindow* window, const ImRect& titl ImVec2 collapse_button_pos; if (has_close_button) { - pad_r += button_sz; - close_button_pos = ImVec2(title_bar_rect.Max.x - pad_r - style.FramePadding.x, title_bar_rect.Min.y); + close_button_pos = ImVec2(title_bar_rect.Max.x - pad_r - button_sz, title_bar_rect.Min.y + style.FramePadding.y); + pad_r += button_sz + style.ItemInnerSpacing.x; } if (has_collapse_button && style.WindowMenuButtonPosition == ImGuiDir_Right) { - pad_r += button_sz; - collapse_button_pos = ImVec2(title_bar_rect.Max.x - pad_r - style.FramePadding.x, title_bar_rect.Min.y); + collapse_button_pos = ImVec2(title_bar_rect.Max.x - pad_r - button_sz, title_bar_rect.Min.y + style.FramePadding.y); + pad_r += button_sz + style.ItemInnerSpacing.x; } if (has_collapse_button && style.WindowMenuButtonPosition == ImGuiDir_Left) { - collapse_button_pos = ImVec2(title_bar_rect.Min.x + pad_l - style.FramePadding.x, title_bar_rect.Min.y); - pad_l += button_sz; + collapse_button_pos = ImVec2(title_bar_rect.Min.x + pad_l, title_bar_rect.Min.y + style.FramePadding.y); + pad_l += button_sz + style.ItemInnerSpacing.x; } // Collapse button (submitting first so it gets priority when choosing a navigation init fallback) if (has_collapse_button) - if (CollapseButton(window->GetID("#COLLAPSE"), collapse_button_pos)) + if (CollapseButton(window->GetID("#COLLAPSE"), collapse_button_pos, NULL)) window->WantCollapseToggle = true; // Defer actual collapsing to next frame as we are too far in the Begin() function // Close button @@ -5335,17 +7294,15 @@ void ImGui::RenderWindowTitleBarContents(ImGuiWindow* window, const ImRect& titl *p_open = false; window->DC.NavLayerCurrent = ImGuiNavLayer_Main; - window->DC.NavLayerCurrentMask = (1 << ImGuiNavLayer_Main); - window->DC.ItemFlags = item_flags_backup; + g.CurrentItemFlags = item_flags_backup; // Title bar text (with: horizontal alignment, avoiding collapse/close button, optional "unsaved document" marker) // FIXME: Refactor text alignment facilities along with RenderText helpers, this is WAY too much messy code.. - const char* UNSAVED_DOCUMENT_MARKER = "*"; - const float marker_size_x = (flags & ImGuiWindowFlags_UnsavedDocument) ? CalcTextSize(UNSAVED_DOCUMENT_MARKER, NULL, false).x : 0.0f; + const float marker_size_x = (flags & ImGuiWindowFlags_UnsavedDocument) ? button_sz * 0.80f : 0.0f; const ImVec2 text_size = CalcTextSize(name, NULL, true) + ImVec2(marker_size_x, 0.0f); // As a nice touch we try to ensure that centered title text doesn't get affected by visibility of Close/Collapse button, - // while uncentered title text will still reach edges correct. + // while uncentered title text will still reach edges correctly. if (pad_l > style.FramePadding.x) pad_l += g.Style.ItemInnerSpacing.x; if (pad_r > style.FramePadding.x) @@ -5359,32 +7316,81 @@ void ImGui::RenderWindowTitleBarContents(ImGuiWindow* window, const ImRect& titl } ImRect layout_r(title_bar_rect.Min.x + pad_l, title_bar_rect.Min.y, title_bar_rect.Max.x - pad_r, title_bar_rect.Max.y); - ImRect clip_r(layout_r.Min.x, layout_r.Min.y, layout_r.Max.x + g.Style.ItemInnerSpacing.x, layout_r.Max.y); - //if (g.IO.KeyCtrl) window->DrawList->AddRect(layout_r.Min, layout_r.Max, IM_COL32(255, 128, 0, 255)); // [DEBUG] - RenderTextClipped(layout_r.Min, layout_r.Max, name, NULL, &text_size, style.WindowTitleAlign, &clip_r); + ImRect clip_r(layout_r.Min.x, layout_r.Min.y, ImMin(layout_r.Max.x + g.Style.ItemInnerSpacing.x, title_bar_rect.Max.x), layout_r.Max.y); if (flags & ImGuiWindowFlags_UnsavedDocument) { - ImVec2 marker_pos = ImVec2(ImMax(layout_r.Min.x, layout_r.Min.x + (layout_r.GetWidth() - text_size.x) * style.WindowTitleAlign.x) + text_size.x, layout_r.Min.y) + ImVec2(2 - marker_size_x, 0.0f); - ImVec2 off = ImVec2(0.0f, (float)(int)(-g.FontSize * 0.25f)); - RenderTextClipped(marker_pos + off, layout_r.Max + off, UNSAVED_DOCUMENT_MARKER, NULL, NULL, ImVec2(0, style.WindowTitleAlign.y), &clip_r); + ImVec2 marker_pos; + marker_pos.x = ImClamp(layout_r.Min.x + (layout_r.GetWidth() - text_size.x) * style.WindowTitleAlign.x + text_size.x, layout_r.Min.x, layout_r.Max.x); + marker_pos.y = (layout_r.Min.y + layout_r.Max.y) * 0.5f; + if (marker_pos.x > layout_r.Min.x) + { + RenderBullet(window->DrawList, marker_pos, GetColorU32(ImGuiCol_Text)); + clip_r.Max.x = ImMin(clip_r.Max.x, marker_pos.x - (int)(marker_size_x * 0.5f)); + } } + //if (g.IO.KeyShift) window->DrawList->AddRect(layout_r.Min, layout_r.Max, IM_COL32(255, 128, 0, 255)); // [DEBUG] + //if (g.IO.KeyCtrl) window->DrawList->AddRect(clip_r.Min, clip_r.Max, IM_COL32(255, 128, 0, 255)); // [DEBUG] + RenderTextClipped(layout_r.Min, layout_r.Max, name, NULL, &text_size, style.WindowTitleAlign, &clip_r); } void ImGui::UpdateWindowParentAndRootLinks(ImGuiWindow* window, ImGuiWindowFlags flags, ImGuiWindow* parent_window) { window->ParentWindow = parent_window; - window->RootWindow = window->RootWindowForTitleBarHighlight = window->RootWindowForNav = window; + window->RootWindow = window->RootWindowPopupTree = window->RootWindowDockTree = window->RootWindowForTitleBarHighlight = window->RootWindowForNav = window; if (parent_window && (flags & ImGuiWindowFlags_ChildWindow) && !(flags & ImGuiWindowFlags_Tooltip)) - window->RootWindow = parent_window->RootWindow; - if (parent_window && !(flags & ImGuiWindowFlags_Modal) && (flags & (ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_Popup))) + { + window->RootWindowDockTree = parent_window->RootWindowDockTree; + if (!window->DockIsActive && !(parent_window->Flags & ImGuiWindowFlags_DockNodeHost)) + window->RootWindow = parent_window->RootWindow; + } + if (parent_window && (flags & ImGuiWindowFlags_Popup)) + window->RootWindowPopupTree = parent_window->RootWindowPopupTree; + if (parent_window && !(flags & ImGuiWindowFlags_Modal) && (flags & (ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_Popup))) // FIXME: simply use _NoTitleBar ? window->RootWindowForTitleBarHighlight = parent_window->RootWindowForTitleBarHighlight; - while (window->RootWindowForNav->Flags & ImGuiWindowFlags_NavFlattened) + while (window->RootWindowForNav->ChildFlags & ImGuiChildFlags_NavFlattened) { IM_ASSERT(window->RootWindowForNav->ParentWindow != NULL); window->RootWindowForNav = window->RootWindowForNav->ParentWindow; } } +// [EXPERIMENTAL] Called by Begin(). NextWindowData is valid at this point. +// This is designed as a toy/test-bed for +void ImGui::UpdateWindowSkipRefresh(ImGuiWindow* window) +{ + ImGuiContext& g = *GImGui; + window->SkipRefresh = false; + if ((g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasRefreshPolicy) == 0) + return; + if (g.NextWindowData.RefreshFlagsVal & ImGuiWindowRefreshFlags_TryToAvoidRefresh) + { + // FIXME-IDLE: Tests for e.g. mouse clicks or keyboard while focused. + if (window->Appearing) // If currently appearing + return; + if (window->Hidden) // If was hidden (previous frame) + return; + if ((g.NextWindowData.RefreshFlagsVal & ImGuiWindowRefreshFlags_RefreshOnHover) && g.HoveredWindow) + if (window->RootWindow == g.HoveredWindow->RootWindow || IsWindowWithinBeginStackOf(g.HoveredWindow->RootWindow, window)) + return; + if ((g.NextWindowData.RefreshFlagsVal & ImGuiWindowRefreshFlags_RefreshOnFocus) && g.NavWindow) + if (window->RootWindow == g.NavWindow->RootWindow || IsWindowWithinBeginStackOf(g.NavWindow->RootWindow, window)) + return; + window->DrawList = NULL; + window->SkipRefresh = true; + } +} + +static void SetWindowActiveForSkipRefresh(ImGuiWindow* window) +{ + window->Active = true; + for (ImGuiWindow* child : window->DC.ChildWindows) + if (!child->Hidden) + { + child->Active = child->SkipRefresh = true; + SetWindowActiveForSkipRefresh(child); + } +} + // Push a new Dear ImGui window to add widgets to. // - A default window called "Debug" is automatically stacked at the beginning of every frame so you can use widgets without explicitly calling a Begin/End pair. // - Begin/End can be called multiple times during the frame with the same window name to append content. @@ -5397,45 +7403,47 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags) ImGuiContext& g = *GImGui; const ImGuiStyle& style = g.Style; IM_ASSERT(name != NULL && name[0] != '\0'); // Window name required - IM_ASSERT(g.FrameScopeActive); // Forgot to call ImGui::NewFrame() + IM_ASSERT(g.WithinFrameScope); // Forgot to call ImGui::NewFrame() IM_ASSERT(g.FrameCountEnded != g.FrameCount); // Called ImGui::Render() or ImGui::EndFrame() and haven't called ImGui::NewFrame() again yet // Find or create ImGuiWindow* window = FindWindowByName(name); const bool window_just_created = (window == NULL); if (window_just_created) - { - ImVec2 size_on_first_use = (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasSize) ? g.NextWindowData.SizeVal : ImVec2(0.0f, 0.0f); // Any condition flag will do since we are creating a new window here. - window = CreateNewWindow(name, size_on_first_use, flags); - } + window = CreateNewWindow(name, flags); + + // [DEBUG] Debug break requested by user + if (g.DebugBreakInWindow == window->ID) + IM_DEBUG_BREAK(); // Automatically disable manual moving/resizing when NoInputs is set if ((flags & ImGuiWindowFlags_NoInputs) == ImGuiWindowFlags_NoInputs) flags |= ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize; - if (flags & ImGuiWindowFlags_NavFlattened) - IM_ASSERT(flags & ImGuiWindowFlags_ChildWindow); - const int current_frame = g.FrameCount; const bool first_begin_of_the_frame = (window->LastFrameActive != current_frame); + window->IsFallbackWindow = (g.CurrentWindowStack.Size == 0 && g.WithinFrameScopeWithImplicitWindow); - // Update the Appearing flag - bool window_just_activated_by_user = (window->LastFrameActive < current_frame - 1); // Not using !WasActive because the implicit "Debug" window would always toggle off->on - const bool window_just_appearing_after_hidden_for_resize = (window->HiddenFramesCannotSkipItems > 0); + // Update the Appearing flag (note: the BeginDocked() path may also set this to true later) + bool window_just_activated_by_user = (window->LastFrameActive < current_frame - 1); // Not using !WasActive because the implicit "Debug" window would always toggle off->on if (flags & ImGuiWindowFlags_Popup) { ImGuiPopupData& popup_ref = g.OpenPopupStack[g.BeginPopupStack.Size]; window_just_activated_by_user |= (window->PopupId != popup_ref.PopupId); // We recycle popups so treat window as activated if popup id changed window_just_activated_by_user |= (window != popup_ref.Window); } - window->Appearing = (window_just_activated_by_user || window_just_appearing_after_hidden_for_resize); - if (window->Appearing) - SetWindowConditionAllowFlags(window, ImGuiCond_Appearing, true); // Update Flags, LastFrameActive, BeginOrderXXX fields + const bool window_was_appearing = window->Appearing; if (first_begin_of_the_frame) { + UpdateWindowInFocusOrderList(window, window_just_created, flags); + window->Appearing = window_just_activated_by_user; + if (window->Appearing) + SetWindowConditionAllowFlags(window, ImGuiCond_Appearing, true); + window->FlagsPreviousFrame = window->Flags; window->Flags = (ImGuiWindowFlags)flags; + window->ChildFlags = (g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasChildFlags) ? g.NextWindowData.ChildFlags : 0; window->LastFrameActive = current_frame; window->LastTimeActive = (float)g.Time; window->BeginOrderWithinParent = 0; @@ -5446,8 +7454,42 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags) flags = window->Flags; } + // Docking + // (NB: during the frame dock nodes are created, it is possible that (window->DockIsActive == false) even though (window->DockNode->Windows.Size > 1) + IM_ASSERT(window->DockNode == NULL || window->DockNodeAsHost == NULL); // Cannot be both + if (g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasDock) + SetWindowDock(window, g.NextWindowData.DockId, g.NextWindowData.DockCond); + if (first_begin_of_the_frame) + { + bool has_dock_node = (window->DockId != 0 || window->DockNode != NULL); + bool new_auto_dock_node = !has_dock_node && GetWindowAlwaysWantOwnTabBar(window); + bool dock_node_was_visible = window->DockNodeIsVisible; + bool dock_tab_was_visible = window->DockTabIsVisible; + if (has_dock_node || new_auto_dock_node) + { + BeginDocked(window, p_open); + flags = window->Flags; + if (window->DockIsActive) + { + IM_ASSERT(window->DockNode != NULL); + g.NextWindowData.HasFlags &= ~ImGuiNextWindowDataFlags_HasSizeConstraint; // Docking currently override constraints + } + + // Amend the Appearing flag + if (window->DockTabIsVisible && !dock_tab_was_visible && dock_node_was_visible && !window->Appearing && !window_was_appearing) + { + window->Appearing = true; + SetWindowConditionAllowFlags(window, ImGuiCond_Appearing, true); + } + } + else + { + window->DockIsActive = window->DockNodeIsVisible = window->DockTabIsVisible = false; + } + } + // Parent window is latched only on the first call to Begin() of the frame, so further append-calls can be done from a different window stack - ImGuiWindow* parent_window_in_stack = g.CurrentWindowStack.empty() ? NULL : g.CurrentWindowStack.back(); + ImGuiWindow* parent_window_in_stack = (window->DockIsActive && window->DockNode->HostWindow) ? window->DockNode->HostWindow : g.CurrentWindowStack.empty() ? NULL : g.CurrentWindowStack.back().Window; ImGuiWindow* parent_window = first_begin_of_the_frame ? ((flags & (ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_Popup)) ? parent_window_in_stack : NULL) : window->ParentWindow; IM_ASSERT(parent_window != NULL || !(flags & ImGuiWindowFlags_ChildWindow)); @@ -5456,25 +7498,62 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags) window->IDStack.push_back(window->ID); // Add to stack - // We intentionally set g.CurrentWindow to NULL to prevent usage until when the viewport is set, then will call SetCurrentWindow() - g.CurrentWindowStack.push_back(window); - g.CurrentWindow = NULL; - CheckStacksSize(window, true); + g.CurrentWindow = window; + g.CurrentWindowStack.resize(g.CurrentWindowStack.Size + 1); + ImGuiWindowStackData& window_stack_data = g.CurrentWindowStack.back(); + window_stack_data.Window = window; + window_stack_data.ParentLastItemDataBackup = g.LastItemData; + window_stack_data.DisabledOverrideReenable = (flags & ImGuiWindowFlags_Tooltip) && (g.CurrentItemFlags & ImGuiItemFlags_Disabled); + window_stack_data.DisabledOverrideReenableAlphaBackup = 0.0f; + ErrorRecoveryStoreState(&window_stack_data.StackSizesInBegin); + g.StackSizesInBeginForCurrentWindow = &window_stack_data.StackSizesInBegin; + if (flags & ImGuiWindowFlags_ChildMenu) + g.BeginMenuDepth++; + + // Update ->RootWindow and others pointers (before any possible call to FocusWindow) + if (first_begin_of_the_frame) + { + UpdateWindowParentAndRootLinks(window, flags, parent_window); + window->ParentWindowInBeginStack = parent_window_in_stack; + + // Focus route + // There's little point to expose a flag to set this: because the interesting cases won't be using parent_window_in_stack, + // Use for e.g. linking a tool window in a standalone viewport to a document window, regardless of their Begin() stack parenting. (#6798) + window->ParentWindowForFocusRoute = (window->RootWindow != window) ? parent_window_in_stack : NULL; + if (window->ParentWindowForFocusRoute == NULL && window->DockNode != NULL) + if (window->DockNode->MergedFlags & ImGuiDockNodeFlags_DockedWindowsInFocusRoute) + window->ParentWindowForFocusRoute = window->DockNode->HostWindow; + + // Override with SetNextWindowClass() field or direct call to SetWindowParentWindowForFocusRoute() + if (window->WindowClass.FocusRouteParentWindowId != 0) + { + window->ParentWindowForFocusRoute = FindWindowByID(window->WindowClass.FocusRouteParentWindowId); + IM_ASSERT(window->ParentWindowForFocusRoute != 0); // Invalid value for FocusRouteParentWindowId. + } + + // Inherit SetWindowFontScale() from parent until we fix this system... + window->FontWindowScaleParents = parent_window ? parent_window->FontWindowScaleParents * parent_window->FontWindowScale : 1.0f; + } + + // Add to focus scope stack + PushFocusScope((window->ChildFlags & ImGuiChildFlags_NavFlattened) ? g.CurrentFocusScopeId : window->ID); + window->NavRootFocusScopeId = g.CurrentFocusScopeId; + + // Add to popup stacks: update OpenPopupStack[] data, push to BeginPopupStack[] if (flags & ImGuiWindowFlags_Popup) { ImGuiPopupData& popup_ref = g.OpenPopupStack[g.BeginPopupStack.Size]; popup_ref.Window = window; + popup_ref.ParentNavLayer = parent_window_in_stack->DC.NavLayerCurrent; g.BeginPopupStack.push_back(popup_ref); window->PopupId = popup_ref.PopupId; } - if (window_just_appearing_after_hidden_for_resize && !(flags & ImGuiWindowFlags_ChildWindow)) - window->NavLastIds[0] = 0; - // Process SetNextWindow***() calls + // (FIXME: Consider splitting the HasXXX flags into X/Y components bool window_pos_set_by_api = false; bool window_size_x_set_by_api = false, window_size_y_set_by_api = false; - if (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasPos) + if (g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasPos) { window_pos_set_by_api = (window->SetWindowPosAllowFlags & g.NextWindowData.PosCond) != 0; if (window_pos_set_by_api && ImLengthSqr(g.NextWindowData.PosPivotVal) > 0.00001f) @@ -5490,34 +7569,69 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags) SetWindowPos(window, g.NextWindowData.PosVal, g.NextWindowData.PosCond); } } - if (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasSize) + if (g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasSize) { window_size_x_set_by_api = (window->SetWindowSizeAllowFlags & g.NextWindowData.SizeCond) != 0 && (g.NextWindowData.SizeVal.x > 0.0f); window_size_y_set_by_api = (window->SetWindowSizeAllowFlags & g.NextWindowData.SizeCond) != 0 && (g.NextWindowData.SizeVal.y > 0.0f); + if ((window->ChildFlags & ImGuiChildFlags_ResizeX) && (window->SetWindowSizeAllowFlags & ImGuiCond_FirstUseEver) == 0) // Axis-specific conditions for BeginChild() + g.NextWindowData.SizeVal.x = window->SizeFull.x; + if ((window->ChildFlags & ImGuiChildFlags_ResizeY) && (window->SetWindowSizeAllowFlags & ImGuiCond_FirstUseEver) == 0) + g.NextWindowData.SizeVal.y = window->SizeFull.y; SetWindowSize(window, g.NextWindowData.SizeVal, g.NextWindowData.SizeCond); } - if (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasContentSize) + if (g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasScroll) + { + if (g.NextWindowData.ScrollVal.x >= 0.0f) + { + window->ScrollTarget.x = g.NextWindowData.ScrollVal.x; + window->ScrollTargetCenterRatio.x = 0.0f; + } + if (g.NextWindowData.ScrollVal.y >= 0.0f) + { + window->ScrollTarget.y = g.NextWindowData.ScrollVal.y; + window->ScrollTargetCenterRatio.y = 0.0f; + } + } + if (g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasContentSize) window->ContentSizeExplicit = g.NextWindowData.ContentSizeVal; else if (first_begin_of_the_frame) window->ContentSizeExplicit = ImVec2(0.0f, 0.0f); - if (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasCollapsed) + if (g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasWindowClass) + window->WindowClass = g.NextWindowData.WindowClass; + if (g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasCollapsed) SetWindowCollapsed(window, g.NextWindowData.CollapsedVal, g.NextWindowData.CollapsedCond); - if (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasFocus) + if (g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasFocus) FocusWindow(window); if (window->Appearing) SetWindowConditionAllowFlags(window, ImGuiCond_Appearing, false); + // [EXPERIMENTAL] Skip Refresh mode + UpdateWindowSkipRefresh(window); + + // Nested root windows (typically tooltips) override disabled state + if (window_stack_data.DisabledOverrideReenable && window->RootWindow == window) + BeginDisabledOverrideReenable(); + + // We intentionally set g.CurrentWindow to NULL to prevent usage until when the viewport is set, then will call SetCurrentWindow() + g.CurrentWindow = NULL; + // When reusing window again multiple times a frame, just append content (don't need to setup again) - if (first_begin_of_the_frame) + if (first_begin_of_the_frame && !window->SkipRefresh) { // Initialize const bool window_is_child_tooltip = (flags & ImGuiWindowFlags_ChildWindow) && (flags & ImGuiWindowFlags_Tooltip); // FIXME-WIP: Undocumented behavior of Child+Tooltip for pinned tooltip (#1345) - UpdateWindowParentAndRootLinks(window, flags, parent_window); - + const bool window_just_appearing_after_hidden_for_resize = (window->HiddenFramesCannotSkipItems > 0); window->Active = true; window->HasCloseButton = (p_open != NULL); - window->ClipRect = ImVec4(-FLT_MAX,-FLT_MAX,+FLT_MAX,+FLT_MAX); + window->ClipRect = ImVec4(-FLT_MAX, -FLT_MAX, +FLT_MAX, +FLT_MAX); window->IDStack.resize(1); + window->DrawList->_ResetForNewFrame(); + window->DC.CurrentTableIdx = -1; + if (flags & ImGuiWindowFlags_DockNodeHost) + { + window->DrawList->ChannelsSplit(2); + window->DrawList->ChannelsSetCurrent(DOCKING_HOST_DRAW_CHANNEL_FG); // Render decorations on channel 1 as we will render the backgrounds manually later + } // Restore buffer capacity when woken from a compacted state, to avoid if (window->MemoryCompacted) @@ -5526,7 +7640,11 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags) // Update stored window name when it changes (which can _only_ happen with the "###" operator, so the ID would stay unchanged). // The title bar always display the 'name' parameter, so we only update the string storage if it needs to be visible to the end-user elsewhere. bool window_title_visible_elsewhere = false; - if (g.NavWindowingList != NULL && (window->Flags & ImGuiWindowFlags_NoNavFocus) == 0) // Window titles visible when using CTRL+TAB + if ((window->Viewport && window->Viewport->Window == window) || (window->DockIsActive)) + window_title_visible_elsewhere = true; + else if (g.NavWindowingListWindow != NULL && (flags & ImGuiWindowFlags_NoNavFocus) == 0) // Window titles visible when using CTRL+TAB + window_title_visible_elsewhere = true; + else if (flags & ImGuiWindowFlags_ChildMenu) window_title_visible_elsewhere = true; if (window_title_visible_elsewhere && !window_just_created && strcmp(name, window->Name) != 0) { @@ -5538,11 +7656,17 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags) // UPDATE CONTENTS SIZE, UPDATE HIDDEN STATUS // Update contents size from last frame for auto-fitting (or use explicit size) - window->ContentSize = CalcWindowContentSize(window); + CalcWindowContentSizes(window, &window->ContentSize, &window->ContentSizeIdeal); + + // FIXME: These flags are decremented before they are used. This means that in order to have these fields produce their intended behaviors + // for one frame we must set them to at least 2, which is counter-intuitive. HiddenFramesCannotSkipItems is a more complicated case because + // it has a single usage before this code block and may be set below before it is finally checked. if (window->HiddenFramesCanSkipItems > 0) window->HiddenFramesCanSkipItems--; if (window->HiddenFramesCannotSkipItems > 0) window->HiddenFramesCannotSkipItems--; + if (window->HiddenFramesForRenderOnly > 0) + window->HiddenFramesForRenderOnly--; // Hide new windows for one frame until they calculate their size if (window_just_created && (!window_size_x_set_by_api || !window_size_y_set_by_api)) @@ -5559,38 +7683,62 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags) window->Size.x = window->SizeFull.x = 0.f; if (!window_size_y_set_by_api) window->Size.y = window->SizeFull.y = 0.f; - window->ContentSize = ImVec2(0.f, 0.f); + window->ContentSize = window->ContentSizeIdeal = ImVec2(0.f, 0.f); } } - // FIXME-VIEWPORT: In the docking/viewport branch, this is the point where we select the current viewport (which may affect the style) + // SELECT VIEWPORT + // We need to do this before using any style/font sizes, as viewport with a different DPI may affect font sizes. + + WindowSelectViewport(window); + SetCurrentViewport(window, window->Viewport); + window->FontDpiScale = (g.IO.ConfigFlags & ImGuiConfigFlags_DpiEnableScaleFonts) ? window->Viewport->DpiScale : 1.0f; SetCurrentWindow(window); + flags = window->Flags; // LOCK BORDER SIZE AND PADDING FOR THE FRAME (so that altering them doesn't cause inconsistencies) + // We read Style data after the call to UpdateSelectWindowViewport() which might be swapping the style. - if (flags & ImGuiWindowFlags_ChildWindow) + if (!window->DockIsActive && (flags & ImGuiWindowFlags_ChildWindow)) window->WindowBorderSize = style.ChildBorderSize; else window->WindowBorderSize = ((flags & (ImGuiWindowFlags_Popup | ImGuiWindowFlags_Tooltip)) && !(flags & ImGuiWindowFlags_Modal)) ? style.PopupBorderSize : style.WindowBorderSize; window->WindowPadding = style.WindowPadding; - if ((flags & ImGuiWindowFlags_ChildWindow) && !(flags & (ImGuiWindowFlags_AlwaysUseWindowPadding | ImGuiWindowFlags_Popup)) && window->WindowBorderSize == 0.0f) + if (!window->DockIsActive && (flags & ImGuiWindowFlags_ChildWindow) && !(flags & ImGuiWindowFlags_Popup) && !(window->ChildFlags & ImGuiChildFlags_AlwaysUseWindowPadding) && window->WindowBorderSize == 0.0f) window->WindowPadding = ImVec2(0.0f, (flags & ImGuiWindowFlags_MenuBar) ? style.WindowPadding.y : 0.0f); + + // Lock menu offset so size calculation can use it as menu-bar windows need a minimum size. window->DC.MenuBarOffset.x = ImMax(ImMax(window->WindowPadding.x, style.ItemSpacing.x), g.NextWindowData.MenuBarOffsetMinVal.x); window->DC.MenuBarOffset.y = g.NextWindowData.MenuBarOffsetMinVal.y; + window->TitleBarHeight = (flags & ImGuiWindowFlags_NoTitleBar) ? 0.0f : g.FontSize + g.Style.FramePadding.y * 2.0f; + window->MenuBarHeight = (flags & ImGuiWindowFlags_MenuBar) ? window->DC.MenuBarOffset.y + g.FontSize + g.Style.FramePadding.y * 2.0f : 0.0f; + window->FontRefSize = g.FontSize; // Lock this to discourage calling window->CalcFontSize() outside of current window. + + // Depending on condition we use previous or current window size to compare against contents size to decide if a scrollbar should be visible. + // Those flags will be altered further down in the function depending on more conditions. + bool use_current_size_for_scrollbar_x = window_just_created; + bool use_current_size_for_scrollbar_y = window_just_created; + if (window_size_x_set_by_api && window->ContentSizeExplicit.x != 0.0f) + use_current_size_for_scrollbar_x = true; + if (window_size_y_set_by_api && window->ContentSizeExplicit.y != 0.0f) // #7252 + use_current_size_for_scrollbar_y = true; // Collapse window by double-clicking on title bar // At this point we don't have a clipping rectangle setup yet, so we can use the title bar area for hit detection and drawing - if (!(flags & ImGuiWindowFlags_NoTitleBar) && !(flags & ImGuiWindowFlags_NoCollapse)) + if (!(flags & ImGuiWindowFlags_NoTitleBar) && !(flags & ImGuiWindowFlags_NoCollapse) && !window->DockIsActive) { - // We don't use a regular button+id to test for double-click on title bar (mostly due to legacy reason, could be fixed), so verify that we don't have items over the title bar. + // We don't use a regular button+id to test for double-click on title bar (mostly due to legacy reason, could be fixed), + // so verify that we don't have items over the title bar. ImRect title_bar_rect = window->TitleBarRect(); - if (g.HoveredWindow == window && g.HoveredId == 0 && g.HoveredIdPreviousFrame == 0 && IsMouseHoveringRect(title_bar_rect.Min, title_bar_rect.Max) && g.IO.MouseDoubleClicked[0]) - window->WantCollapseToggle = true; + if (g.HoveredWindow == window && g.HoveredId == 0 && g.HoveredIdPreviousFrame == 0 && g.ActiveId == 0 && IsMouseHoveringRect(title_bar_rect.Min, title_bar_rect.Max)) + if (g.IO.MouseClickedCount[0] == 2 && GetKeyOwner(ImGuiKey_MouseLeft) == ImGuiKeyOwner_NoOwner) + window->WantCollapseToggle = true; if (window->WantCollapseToggle) { window->Collapsed = !window->Collapsed; + if (!window->Collapsed) + use_current_size_for_scrollbar_y = true; MarkIniSettingsDirty(window); - FocusWindow(window); } } else @@ -5601,10 +7749,17 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags) // SIZE + // Outer Decoration Sizes + // (we need to clear ScrollbarSize immediately as CalcWindowAutoFitSize() needs it and can be called from other locations). + const ImVec2 scrollbar_sizes_from_last_frame = window->ScrollbarSizes; + window->DecoOuterSizeX1 = 0.0f; + window->DecoOuterSizeX2 = 0.0f; + window->DecoOuterSizeY1 = window->TitleBarHeight + window->MenuBarHeight; + window->DecoOuterSizeY2 = 0.0f; + window->ScrollbarSizes = ImVec2(0.0f, 0.0f); + // Calculate auto-fit size, handle automatic resize - const ImVec2 size_auto_fit = CalcWindowAutoFitSize(window, window->ContentSize); - bool use_current_size_for_scrollbar_x = window_just_created; - bool use_current_size_for_scrollbar_y = window_just_created; + const ImVec2 size_auto_fit = CalcWindowAutoFitSize(window, window->ContentSizeIdeal); if ((flags & ImGuiWindowFlags_AlwaysAutoResize) && !window->Collapsed) { // Using SetNextWindowSize() overrides ImGuiWindowFlags_AlwaysAutoResize, so it can be used on tooltips/popups, etc. @@ -5641,16 +7796,13 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags) window->SizeFull = CalcWindowSizeAfterConstraint(window, window->SizeFull); window->Size = window->Collapsed && !(flags & ImGuiWindowFlags_ChildWindow) ? window->TitleBarRect().GetSize() : window->SizeFull; - // Decoration size - const float decoration_up_height = window->TitleBarHeight() + window->MenuBarHeight(); - // POSITION // Popup latch its initial position, will position itself when it appears next frame if (window_just_activated_by_user) { window->AutoPosLastDirection = ImGuiDir_None; - if ((flags & ImGuiWindowFlags_Popup) != 0 && !window_pos_set_by_api) + if ((flags & ImGuiWindowFlags_Popup) != 0 && !(flags & ImGuiWindowFlags_Modal) && !window_pos_set_by_api) // FIXME: BeginPopup() could use SetNextWindowPos() window->Pos = g.BeginPopupStack.back().OpenPopupPos; } @@ -5666,7 +7818,7 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags) const bool window_pos_with_pivot = (window->SetWindowPosVal.x != FLT_MAX && window->HiddenFramesCannotSkipItems == 0); if (window_pos_with_pivot) - SetWindowPos(window, window->SetWindowPosVal - window->SizeFull * window->SetWindowPosPivot, 0); // Position given a pivot (e.g. for centering) + SetWindowPos(window, window->SetWindowPosVal - window->Size * window->SetWindowPosPivot, 0); // Position given a pivot (e.g. for centering) else if ((flags & ImGuiWindowFlags_ChildMenu) != 0) window->Pos = FindBestWindowPosForPopup(window); else if ((flags & ImGuiWindowFlags_Popup) != 0 && !window_pos_set_by_api && window_just_appearing_after_hidden_for_resize) @@ -5674,22 +7826,70 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags) else if ((flags & ImGuiWindowFlags_Tooltip) != 0 && !window_pos_set_by_api && !window_is_child_tooltip) window->Pos = FindBestWindowPosForPopup(window); - // Clamp position/size so window stays visible within its viewport or monitor - - // Ignore zero-sized display explicitly to avoid losing positions if a window manager reports zero-sized window when initializing or minimizing. - ImRect viewport_rect(GetViewportRect()); - if (!window_pos_set_by_api && !(flags & ImGuiWindowFlags_ChildWindow) && window->AutoFitFramesX <= 0 && window->AutoFitFramesY <= 0) - { - if (g.IO.DisplaySize.x > 0.0f && g.IO.DisplaySize.y > 0.0f) // Ignore zero-sized display explicitly to avoid losing positions if a window manager reports zero-sized window when initializing or minimizing. + // Late create viewport if we don't fit within our current host viewport. + if (window->ViewportAllowPlatformMonitorExtend >= 0 && !window->ViewportOwned && !(window->Viewport->Flags & ImGuiViewportFlags_IsMinimized)) + if (!window->Viewport->GetMainRect().Contains(window->Rect())) { - ImVec2 clamp_padding = ImMax(style.DisplayWindowPadding, style.DisplaySafeAreaPadding); - ClampWindowRect(window, viewport_rect, clamp_padding); + // This is based on the assumption that the DPI will be known ahead (same as the DPI of the selection done in UpdateSelectWindowViewport) + //ImGuiViewport* old_viewport = window->Viewport; + window->Viewport = AddUpdateViewport(window, window->ID, window->Pos, window->Size, ImGuiViewportFlags_NoFocusOnAppearing); + + // FIXME-DPI + //IM_ASSERT(old_viewport->DpiScale == window->Viewport->DpiScale); // FIXME-DPI: Something went wrong + SetCurrentViewport(window, window->Viewport); + window->FontDpiScale = (g.IO.ConfigFlags & ImGuiConfigFlags_DpiEnableScaleFonts) ? window->Viewport->DpiScale : 1.0f; + SetCurrentWindow(window); + } + + if (window->ViewportOwned) + WindowSyncOwnedViewport(window, parent_window_in_stack); + + // Calculate the range of allowed position for that window (to be movable and visible past safe area padding) + // When clamping to stay visible, we will enforce that window->Pos stays inside of visibility_rect. + ImRect viewport_rect(window->Viewport->GetMainRect()); + ImRect viewport_work_rect(window->Viewport->GetWorkRect()); + ImVec2 visibility_padding = ImMax(style.DisplayWindowPadding, style.DisplaySafeAreaPadding); + ImRect visibility_rect(viewport_work_rect.Min + visibility_padding, viewport_work_rect.Max - visibility_padding); + + // Clamp position/size so window stays visible within its viewport or monitor + // Ignore zero-sized display explicitly to avoid losing positions if a window manager reports zero-sized window when initializing or minimizing. + // FIXME: Similar to code in GetWindowAllowedExtentRect() + if (!window_pos_set_by_api && !(flags & ImGuiWindowFlags_ChildWindow)) + { + if (!window->ViewportOwned && viewport_rect.GetWidth() > 0 && viewport_rect.GetHeight() > 0.0f) + { + ClampWindowPos(window, visibility_rect); + } + else if (window->ViewportOwned && g.PlatformIO.Monitors.Size > 0) + { + if (g.MovingWindow != NULL && window->RootWindowDockTree == g.MovingWindow->RootWindowDockTree) + { + // While moving windows we allow them to straddle monitors (#7299, #3071) + visibility_rect = g.PlatformMonitorsFullWorkRect; + } + else + { + // When not moving ensure visible in its monitor + // Lost windows (e.g. a monitor disconnected) will naturally moved to the fallback/dummy monitor aka the main viewport. + const ImGuiPlatformMonitor* monitor = GetViewportPlatformMonitor(window->Viewport); + visibility_rect = ImRect(monitor->WorkPos, monitor->WorkPos + monitor->WorkSize); + } + visibility_rect.Expand(-visibility_padding); + ClampWindowPos(window, visibility_rect); } } - window->Pos = ImFloor(window->Pos); + window->Pos = ImTrunc(window->Pos); // Lock window rounding for the frame (so that altering them doesn't cause inconsistencies) - window->WindowRounding = (flags & ImGuiWindowFlags_ChildWindow) ? style.ChildRounding : ((flags & ImGuiWindowFlags_Popup) && !(flags & ImGuiWindowFlags_Modal)) ? style.PopupRounding : style.WindowRounding; + // Large values tend to lead to variety of artifacts and are not recommended. + if (window->ViewportOwned || window->DockIsActive) + window->WindowRounding = 0.0f; + else + window->WindowRounding = (flags & ImGuiWindowFlags_ChildWindow) ? style.ChildRounding : ((flags & ImGuiWindowFlags_Popup) && !(flags & ImGuiWindowFlags_Modal)) ? style.PopupRounding : style.WindowRounding; + + // For windows with title bar or menu bar, we clamp to FrameHeight(FontSize + FramePadding.y * 2.0f) to completely hide artifacts. + //if ((window->Flags & ImGuiWindowFlags_MenuBar) || !(window->Flags & ImGuiWindowFlags_NoTitleBar)) + // window->WindowRounding = ImMin(window->WindowRounding, g.FontSize + style.FramePadding.y * 2.0f); // Apply window focus (new and reactivated windows are moved to front) bool want_focus = false; @@ -5697,42 +7897,99 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags) { if (flags & ImGuiWindowFlags_Popup) want_focus = true; - else if ((flags & (ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_Tooltip)) == 0) + else if ((window->DockIsActive || (flags & ImGuiWindowFlags_ChildWindow) == 0) && !(flags & ImGuiWindowFlags_Tooltip)) want_focus = true; } + // [Test Engine] Register whole window in the item system (before submitting further decorations) +#ifdef IMGUI_ENABLE_TEST_ENGINE + if (g.TestEngineHookItems) + { + IM_ASSERT(window->IDStack.Size == 1); + window->IDStack.Size = 0; // As window->IDStack[0] == window->ID here, make sure TestEngine doesn't erroneously see window as parent of itself. + window->DC.NavLayerCurrent = ImGuiNavLayer_Menu; + IMGUI_TEST_ENGINE_ITEM_ADD(window->ID, window->Rect(), NULL); + IMGUI_TEST_ENGINE_ITEM_INFO(window->ID, window->Name, (g.HoveredWindow == window) ? ImGuiItemStatusFlags_HoveredRect : 0); + window->IDStack.Size = 1; + window->DC.NavLayerCurrent = ImGuiNavLayer_Main; + + } +#endif + + // Decide if we are going to handle borders and resize grips + const bool handle_borders_and_resize_grips = (window->DockNodeAsHost || !window->DockIsActive); + // Handle manual resize: Resize Grips, Borders, Gamepad - int border_held = -1; - ImU32 resize_grip_col[4] = { 0 }; - const int resize_grip_count = g.IO.ConfigWindowsResizeFromEdges ? 2 : 1; // 4 - const float resize_grip_draw_size = (float)(int)ImMax(g.FontSize * 1.35f, window->WindowRounding + 1.0f + g.FontSize * 0.2f); - if (!window->Collapsed) - if (UpdateManualResize(window, size_auto_fit, &border_held, resize_grip_count, &resize_grip_col[0])) - use_current_size_for_scrollbar_x = use_current_size_for_scrollbar_y = true; + int border_hovered = -1, border_held = -1; + ImU32 resize_grip_col[4] = {}; + const int resize_grip_count = ((flags & ImGuiWindowFlags_ChildWindow) && !(flags & ImGuiWindowFlags_Popup)) ? 0 : g.IO.ConfigWindowsResizeFromEdges ? 2 : 1; // Allow resize from lower-left if we have the mouse cursor feedback for it. + const float resize_grip_draw_size = IM_TRUNC(ImMax(g.FontSize * 1.10f, window->WindowRounding + 1.0f + g.FontSize * 0.2f)); + if (handle_borders_and_resize_grips && !window->Collapsed) + if (int auto_fit_mask = UpdateWindowManualResize(window, size_auto_fit, &border_hovered, &border_held, resize_grip_count, &resize_grip_col[0], visibility_rect)) + { + if (auto_fit_mask & (1 << ImGuiAxis_X)) + use_current_size_for_scrollbar_x = true; + if (auto_fit_mask & (1 << ImGuiAxis_Y)) + use_current_size_for_scrollbar_y = true; + } + window->ResizeBorderHovered = (signed char)border_hovered; window->ResizeBorderHeld = (signed char)border_held; + // Synchronize window --> viewport again and one last time (clamping and manual resize may have affected either) + if (window->ViewportOwned) + { + if (!window->Viewport->PlatformRequestMove) + window->Viewport->Pos = window->Pos; + if (!window->Viewport->PlatformRequestResize) + window->Viewport->Size = window->Size; + window->Viewport->UpdateWorkRect(); + viewport_rect = window->Viewport->GetMainRect(); + } + + // Save last known viewport position within the window itself (so it can be saved in .ini file and restored) + window->ViewportPos = window->Viewport->Pos; + // SCROLLBAR VISIBILITY // Update scrollbar visibility (based on the Size that was effective during last frame or the auto-resized Size). if (!window->Collapsed) { // When reading the current size we need to read it after size constraints have been applied. - // When we use InnerRect here we are intentionally reading last frame size, same for ScrollbarSizes values before we set them again. - ImVec2 avail_size_from_current_frame = ImVec2(window->SizeFull.x, window->SizeFull.y - decoration_up_height); - ImVec2 avail_size_from_last_frame = window->InnerRect.GetSize() + window->ScrollbarSizes; + // Intentionally use previous frame values for InnerRect and ScrollbarSizes. + // And when we use window->DecorationUp here it doesn't have ScrollbarSizes.y applied yet. + ImVec2 avail_size_from_current_frame = ImVec2(window->SizeFull.x, window->SizeFull.y - (window->DecoOuterSizeY1 + window->DecoOuterSizeY2)); + ImVec2 avail_size_from_last_frame = window->InnerRect.GetSize() + scrollbar_sizes_from_last_frame; ImVec2 needed_size_from_last_frame = window_just_created ? ImVec2(0, 0) : window->ContentSize + window->WindowPadding * 2.0f; float size_x_for_scrollbars = use_current_size_for_scrollbar_x ? avail_size_from_current_frame.x : avail_size_from_last_frame.x; float size_y_for_scrollbars = use_current_size_for_scrollbar_y ? avail_size_from_current_frame.y : avail_size_from_last_frame.y; + bool scrollbar_x_prev = window->ScrollbarX; //bool scrollbar_y_from_last_frame = window->ScrollbarY; // FIXME: May want to use that in the ScrollbarX expression? How many pros vs cons? window->ScrollbarY = (flags & ImGuiWindowFlags_AlwaysVerticalScrollbar) || ((needed_size_from_last_frame.y > size_y_for_scrollbars) && !(flags & ImGuiWindowFlags_NoScrollbar)); window->ScrollbarX = (flags & ImGuiWindowFlags_AlwaysHorizontalScrollbar) || ((needed_size_from_last_frame.x > size_x_for_scrollbars - (window->ScrollbarY ? style.ScrollbarSize : 0.0f)) && !(flags & ImGuiWindowFlags_NoScrollbar) && (flags & ImGuiWindowFlags_HorizontalScrollbar)); + + // Track when ScrollbarX visibility keeps toggling, which is a sign of a feedback loop, and stabilize by enforcing visibility (#3285, #8488) + // (Feedback loops of this sort can manifest in various situations, but combining horizontal + vertical scrollbar + using a clipper with varying width items is one frequent cause. + // The better solution is to, either (1) enforce visibility by using ImGuiWindowFlags_AlwaysHorizontalScrollbar or (2) declare stable contents width with SetNextWindowContentSize(), if you can compute it) + window->ScrollbarXStabilizeToggledHistory <<= 1; + window->ScrollbarXStabilizeToggledHistory |= (scrollbar_x_prev != window->ScrollbarX) ? 0x01 : 0x00; + const bool scrollbar_x_stabilize = (window->ScrollbarXStabilizeToggledHistory != 0) && ImCountSetBits(window->ScrollbarXStabilizeToggledHistory) >= 4; // 4 == half of bits in our U8 history. + if (scrollbar_x_stabilize) + window->ScrollbarX = true; + //if (scrollbar_x_stabilize && !window->ScrollbarXStabilizeEnabled) + // IMGUI_DEBUG_LOG("[scroll] Stabilize ScrollbarX for Window '%s'\n", window->Name); + window->ScrollbarXStabilizeEnabled = scrollbar_x_stabilize; + if (window->ScrollbarX && !window->ScrollbarY) - window->ScrollbarY = (needed_size_from_last_frame.y > size_y_for_scrollbars) && !(flags & ImGuiWindowFlags_NoScrollbar); + window->ScrollbarY = (needed_size_from_last_frame.y > size_y_for_scrollbars - style.ScrollbarSize) && !(flags & ImGuiWindowFlags_NoScrollbar); window->ScrollbarSizes = ImVec2(window->ScrollbarY ? style.ScrollbarSize : 0.0f, window->ScrollbarX ? style.ScrollbarSize : 0.0f); + + // Amend the partially filled window->DecorationXXX values. + window->DecoOuterSizeX2 += window->ScrollbarSizes.x; + window->DecoOuterSizeY2 += window->ScrollbarSizes.y; } // UPDATE RECTANGLES (1- THOSE NOT AFFECTED BY SCROLLING) - // Update various regions. Variables they depends on should be set above in this function. + // Update various regions. Variables they depend on should be set above in this function. // We set this up after processing the resize grip so that our rectangles doesn't lag by a frame. // Outer rectangle @@ -5744,38 +8001,46 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags) const ImRect outer_rect = window->Rect(); const ImRect title_bar_rect = window->TitleBarRect(); window->OuterRectClipped = outer_rect; + if (window->DockIsActive) + window->OuterRectClipped.Min.y += window->TitleBarHeight; window->OuterRectClipped.ClipWith(host_rect); // Inner rectangle // Not affected by window border size. Used by: // - InnerClipRect - // - ScrollToBringRectIntoView() + // - ScrollToRectEx() // - NavUpdatePageUpPageDown() // - Scrollbar() - window->InnerRect.Min.x = window->Pos.x; - window->InnerRect.Min.y = window->Pos.y + decoration_up_height; - window->InnerRect.Max.x = window->Pos.x + window->Size.x - window->ScrollbarSizes.x; - window->InnerRect.Max.y = window->Pos.y + window->Size.y - window->ScrollbarSizes.y; + window->InnerRect.Min.x = window->Pos.x + window->DecoOuterSizeX1; + window->InnerRect.Min.y = window->Pos.y + window->DecoOuterSizeY1; + window->InnerRect.Max.x = window->Pos.x + window->Size.x - window->DecoOuterSizeX2; + window->InnerRect.Max.y = window->Pos.y + window->Size.y - window->DecoOuterSizeY2; // Inner clipping rectangle. - // Will extend a little bit outside the normal work region. - // This is to allow e.g. Selectable or CollapsingHeader or some separators to cover that space. - // Force round operator last to ensure that e.g. (int)(max.x-min.x) in user's render code produce correct result. + // - Extend a outside of normal work region up to borders. + // - This is to allow e.g. Selectable or CollapsingHeader or some separators to cover that space. + // - It also makes clipped items be more noticeable. + // - And is consistent on both axis (prior to 2024/05/03 ClipRect used WindowPadding.x * 0.5f on left and right edge), see #3312 + // - Force round operator last to ensure that e.g. (int)(max.x-min.x) in user's render code produce correct result. // Note that if our window is collapsed we will end up with an inverted (~null) clipping rectangle which is the correct behavior. // Affected by window/frame border size. Used by: // - Begin() initial clip rect float top_border_size = (((flags & ImGuiWindowFlags_MenuBar) || !(flags & ImGuiWindowFlags_NoTitleBar)) ? style.FrameBorderSize : window->WindowBorderSize); - window->InnerClipRect.Min.x = ImFloor(0.5f + window->InnerRect.Min.x + ImMax(ImFloor(window->WindowPadding.x * 0.5f), window->WindowBorderSize)); - window->InnerClipRect.Min.y = ImFloor(0.5f + window->InnerRect.Min.y + top_border_size); - window->InnerClipRect.Max.x = ImFloor(0.5f + window->InnerRect.Max.x - ImMax(ImFloor(window->WindowPadding.x * 0.5f), window->WindowBorderSize)); - window->InnerClipRect.Max.y = ImFloor(0.5f + window->InnerRect.Max.y - window->WindowBorderSize); + + // Try to match the fact that our border is drawn centered over the window rectangle, rather than inner. + // This is why we do a *0.5f here. We don't currently even technically support large values for WindowBorderSize, + // see e.g #7887 #7888, but may do after we move the window border to become an inner border (and then we can remove the 0.5f here). + window->InnerClipRect.Min.x = ImFloor(0.5f + window->InnerRect.Min.x + window->WindowBorderSize * 0.5f); + window->InnerClipRect.Min.y = ImFloor(0.5f + window->InnerRect.Min.y + top_border_size * 0.5f); + window->InnerClipRect.Max.x = ImFloor(window->InnerRect.Max.x - window->WindowBorderSize * 0.5f); + window->InnerClipRect.Max.y = ImFloor(window->InnerRect.Max.y - window->WindowBorderSize * 0.5f); window->InnerClipRect.ClipWithFull(host_rect); // Default item width. Make it proportional to window size if window manually resizes if (window->Size.x > 0.0f && !(flags & ImGuiWindowFlags_Tooltip) && !(flags & ImGuiWindowFlags_AlwaysAutoResize)) - window->ItemWidthDefault = (float)(int)(window->Size.x * 0.65f); + window->ItemWidthDefault = ImTrunc(window->Size.x * 0.65f); else - window->ItemWidthDefault = (float)(int)(g.FontSize * 16.0f); + window->ItemWidthDefault = ImTrunc(g.FontSize * 16.0f); // SCROLLING @@ -5786,66 +8051,44 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags) window->ScrollMax.y = ImMax(0.0f, window->ContentSize.y + window->WindowPadding.y * 2.0f - window->InnerRect.GetHeight()); // Apply scrolling - window->Scroll = CalcNextScrollFromScrollTargetAndClamp(window, true); + window->Scroll = CalcNextScrollFromScrollTargetAndClamp(window); window->ScrollTarget = ImVec2(FLT_MAX, FLT_MAX); + window->DecoInnerSizeX1 = window->DecoInnerSizeY1 = 0.0f; // DRAWING // Setup draw list and outer clipping rectangle - window->DrawList->Clear(); + IM_ASSERT(window->DrawList->CmdBuffer.Size == 1 && window->DrawList->CmdBuffer[0].ElemCount == 0); window->DrawList->PushTextureID(g.Font->ContainerAtlas->TexID); PushClipRect(host_rect.Min, host_rect.Max, false); - // Draw modal window background (darkens what is behind them, all viewports) - const bool dim_bg_for_modal = (flags & ImGuiWindowFlags_Modal) && window == GetTopMostPopupModal() && window->HiddenFramesCannotSkipItems <= 0; - const bool dim_bg_for_window_list = g.NavWindowingTargetAnim && (window == g.NavWindowingTargetAnim->RootWindow); - if (dim_bg_for_modal || dim_bg_for_window_list) - { - const ImU32 dim_bg_col = GetColorU32(dim_bg_for_modal ? ImGuiCol_ModalWindowDimBg : ImGuiCol_NavWindowingDimBg, g.DimBgRatio); - window->DrawList->AddRectFilled(viewport_rect.Min, viewport_rect.Max, dim_bg_col); - } - - // Draw navigation selection/windowing rectangle background - if (dim_bg_for_window_list && window == g.NavWindowingTargetAnim) - { - ImRect bb = window->Rect(); - bb.Expand(g.FontSize); - if (!bb.Contains(viewport_rect)) // Avoid drawing if the window covers all the viewport anyway - window->DrawList->AddRectFilled(bb.Min, bb.Max, GetColorU32(ImGuiCol_NavWindowingHighlight, g.NavWindowingHighlightAlpha * 0.25f), g.Style.WindowRounding); - } - - // Since 1.71, child window can render their decoration (bg color, border, scrollbars, etc.) within their parent to save a draw call. + // Child windows can render their decoration (bg color, border, scrollbars, etc.) within their parent to save a draw call (since 1.71) // When using overlapping child windows, this will break the assumption that child z-order is mapped to submission order. - // We disable this when the parent window has zero vertices, which is a common pattern leading to laying out multiple overlapping child. - // We also disabled this when we have dimming overlay behind this specific one child. - // FIXME: More code may rely on explicit sorting of overlapping child window and would need to disable this somehow. Please get in contact if you are affected. - bool render_decorations_in_parent = false; - if ((flags & ImGuiWindowFlags_ChildWindow) && !(flags & ImGuiWindowFlags_Popup) && !window_is_child_tooltip) - if (window->DrawList->CmdBuffer.back().ElemCount == 0 && parent_window->DrawList->VtxBuffer.Size > 0) - render_decorations_in_parent = true; - if (render_decorations_in_parent) - window->DrawList = parent_window->DrawList; - - // Handle title bar, scrollbar, resize grips and resize borders - const ImGuiWindow* window_to_highlight = g.NavWindowingTarget ? g.NavWindowingTarget : g.NavWindow; - const bool title_bar_is_highlight = want_focus || (window_to_highlight && window->RootWindowForTitleBarHighlight == window_to_highlight->RootWindowForTitleBarHighlight); - RenderWindowDecorations(window, title_bar_rect, title_bar_is_highlight, resize_grip_count, resize_grip_col, resize_grip_draw_size); - - if (render_decorations_in_parent) - window->DrawList = &window->DrawListInst; - - // Draw navigation selection/windowing rectangle border - if (g.NavWindowingTargetAnim == window) + // FIXME: User code may rely on explicit sorting of overlapping child window and would need to disable this somehow. Please get in contact if you are affected (github #4493) + const bool is_undocked_or_docked_visible = !window->DockIsActive || window->DockTabIsVisible; + if (is_undocked_or_docked_visible) { - float rounding = ImMax(window->WindowRounding, g.Style.WindowRounding); - ImRect bb = window->Rect(); - bb.Expand(g.FontSize); - if (bb.Contains(viewport_rect)) // If a window fits the entire viewport, adjust its highlight inward + bool render_decorations_in_parent = false; + if ((flags & ImGuiWindowFlags_ChildWindow) && !(flags & ImGuiWindowFlags_Popup) && !window_is_child_tooltip) { - bb.Expand(-g.FontSize - 1.0f); - rounding = window->WindowRounding; + // - We test overlap with the previous child window only (testing all would end up being O(log N) not a good investment here) + // - We disable this when the parent window has zero vertices, which is a common pattern leading to laying out multiple overlapping childs + ImGuiWindow* previous_child = parent_window->DC.ChildWindows.Size >= 2 ? parent_window->DC.ChildWindows[parent_window->DC.ChildWindows.Size - 2] : NULL; + bool previous_child_overlapping = previous_child ? previous_child->Rect().Overlaps(window->Rect()) : false; + bool parent_is_empty = (parent_window->DrawList->VtxBuffer.Size == 0); + if (window->DrawList->CmdBuffer.back().ElemCount == 0 && !parent_is_empty && !previous_child_overlapping) + render_decorations_in_parent = true; } - window->DrawList->AddRect(bb.Min, bb.Max, GetColorU32(ImGuiCol_NavWindowingHighlight, g.NavWindowingHighlightAlpha), rounding, ~0, 3.0f); + if (render_decorations_in_parent) + window->DrawList = parent_window->DrawList; + + // Handle title bar, scrollbar, resize grips and resize borders + const ImGuiWindow* window_to_highlight = g.NavWindowingTarget ? g.NavWindowingTarget : g.NavWindow; + const bool title_bar_is_highlight = want_focus || (window_to_highlight && (window->RootWindowForTitleBarHighlight == window_to_highlight->RootWindowForTitleBarHighlight || (window->DockNode && window->DockNode == window_to_highlight->DockNode))); + RenderWindowDecorations(window, title_bar_rect, title_bar_is_highlight, handle_borders_and_resize_grips, resize_grip_count, resize_grip_col, resize_grip_draw_size); + + if (render_decorations_in_parent) + window->DrawList = &window->DrawListInst; } // UPDATE RECTANGLES (2- THOSE AFFECTED BY SCROLLING) @@ -5857,379 +8100,320 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags) // - BeginTabBar() for right-most edge const bool allow_scrollbar_x = !(flags & ImGuiWindowFlags_NoScrollbar) && (flags & ImGuiWindowFlags_HorizontalScrollbar); const bool allow_scrollbar_y = !(flags & ImGuiWindowFlags_NoScrollbar); - const float work_rect_size_x = (window->ContentSizeExplicit.x != 0.0f ? window->ContentSizeExplicit.x : ImMax(allow_scrollbar_x ? window->ContentSize.x : 0.0f, window->Size.x - window->WindowPadding.x * 2.0f - window->ScrollbarSizes.x)); - const float work_rect_size_y = (window->ContentSizeExplicit.y != 0.0f ? window->ContentSizeExplicit.y : ImMax(allow_scrollbar_y ? window->ContentSize.y : 0.0f, window->Size.y - window->WindowPadding.y * 2.0f - decoration_up_height - window->ScrollbarSizes.y)); - window->WorkRect.Min.x = ImFloor(window->InnerRect.Min.x - window->Scroll.x + ImMax(window->WindowPadding.x, window->WindowBorderSize)); - window->WorkRect.Min.y = ImFloor(window->InnerRect.Min.y - window->Scroll.y + ImMax(window->WindowPadding.y, window->WindowBorderSize)); + const float work_rect_size_x = (window->ContentSizeExplicit.x != 0.0f ? window->ContentSizeExplicit.x : ImMax(allow_scrollbar_x ? window->ContentSize.x : 0.0f, window->Size.x - window->WindowPadding.x * 2.0f - (window->DecoOuterSizeX1 + window->DecoOuterSizeX2))); + const float work_rect_size_y = (window->ContentSizeExplicit.y != 0.0f ? window->ContentSizeExplicit.y : ImMax(allow_scrollbar_y ? window->ContentSize.y : 0.0f, window->Size.y - window->WindowPadding.y * 2.0f - (window->DecoOuterSizeY1 + window->DecoOuterSizeY2))); + window->WorkRect.Min.x = ImTrunc(window->InnerRect.Min.x - window->Scroll.x + ImMax(window->WindowPadding.x, window->WindowBorderSize)); + window->WorkRect.Min.y = ImTrunc(window->InnerRect.Min.y - window->Scroll.y + ImMax(window->WindowPadding.y, window->WindowBorderSize)); window->WorkRect.Max.x = window->WorkRect.Min.x + work_rect_size_x; window->WorkRect.Max.y = window->WorkRect.Min.y + work_rect_size_y; + window->ParentWorkRect = window->WorkRect; - // [LEGACY] Contents Region - // FIXME-OBSOLETE: window->ContentsRegionRect.Max is currently very misleading / partly faulty, but some BeginChild() patterns relies on it. + // [LEGACY] Content Region + // FIXME-OBSOLETE: window->ContentRegionRect.Max is currently very misleading / partly faulty, but some BeginChild() patterns relies on it. + // Unless explicit content size is specified by user, this currently represent the region leading to no scrolling. // Used by: // - Mouse wheel scrolling + many other things - window->ContentsRegionRect.Min.x = window->Pos.x - window->Scroll.x + window->WindowPadding.x; - window->ContentsRegionRect.Min.y = window->Pos.y - window->Scroll.y + window->WindowPadding.y + decoration_up_height; - window->ContentsRegionRect.Max.x = window->ContentsRegionRect.Min.x + (window->ContentSizeExplicit.x != 0.0f ? window->ContentSizeExplicit.x : (window->Size.x - window->WindowPadding.x * 2.0f - window->ScrollbarSizes.x)); - window->ContentsRegionRect.Max.y = window->ContentsRegionRect.Min.y + (window->ContentSizeExplicit.y != 0.0f ? window->ContentSizeExplicit.y : (window->Size.y - window->WindowPadding.y * 2.0f - decoration_up_height - window->ScrollbarSizes.y)); + window->ContentRegionRect.Min.x = window->Pos.x - window->Scroll.x + window->WindowPadding.x + window->DecoOuterSizeX1; + window->ContentRegionRect.Min.y = window->Pos.y - window->Scroll.y + window->WindowPadding.y + window->DecoOuterSizeY1; + window->ContentRegionRect.Max.x = window->ContentRegionRect.Min.x + (window->ContentSizeExplicit.x != 0.0f ? window->ContentSizeExplicit.x : (window->Size.x - window->WindowPadding.x * 2.0f - (window->DecoOuterSizeX1 + window->DecoOuterSizeX2))); + window->ContentRegionRect.Max.y = window->ContentRegionRect.Min.y + (window->ContentSizeExplicit.y != 0.0f ? window->ContentSizeExplicit.y : (window->Size.y - window->WindowPadding.y * 2.0f - (window->DecoOuterSizeY1 + window->DecoOuterSizeY2))); // Setup drawing context // (NB: That term "drawing context / DC" lost its meaning a long time ago. Initially was meant to hold transient data only. Nowadays difference between window-> and window->DC-> is dubious.) - window->DC.Indent.x = 0.0f + window->WindowPadding.x - window->Scroll.x; + window->DC.Indent.x = window->DecoOuterSizeX1 + window->WindowPadding.x - window->Scroll.x; window->DC.GroupOffset.x = 0.0f; window->DC.ColumnsOffset.x = 0.0f; - window->DC.CursorStartPos = window->Pos + ImVec2(window->DC.Indent.x + window->DC.ColumnsOffset.x, decoration_up_height + window->WindowPadding.y - window->Scroll.y); + + // Record the loss of precision of CursorStartPos which can happen due to really large scrolling amount. + // This is used by clipper to compensate and fix the most common use case of large scroll area. Easy and cheap, next best thing compared to switching everything to double or ImU64. + double start_pos_highp_x = (double)window->Pos.x + window->WindowPadding.x - (double)window->Scroll.x + window->DecoOuterSizeX1 + window->DC.ColumnsOffset.x; + double start_pos_highp_y = (double)window->Pos.y + window->WindowPadding.y - (double)window->Scroll.y + window->DecoOuterSizeY1; + window->DC.CursorStartPos = ImVec2((float)start_pos_highp_x, (float)start_pos_highp_y); + window->DC.CursorStartPosLossyness = ImVec2((float)(start_pos_highp_x - window->DC.CursorStartPos.x), (float)(start_pos_highp_y - window->DC.CursorStartPos.y)); window->DC.CursorPos = window->DC.CursorStartPos; window->DC.CursorPosPrevLine = window->DC.CursorPos; window->DC.CursorMaxPos = window->DC.CursorStartPos; + window->DC.IdealMaxPos = window->DC.CursorStartPos; window->DC.CurrLineSize = window->DC.PrevLineSize = ImVec2(0.0f, 0.0f); window->DC.CurrLineTextBaseOffset = window->DC.PrevLineTextBaseOffset = 0.0f; + window->DC.IsSameLine = window->DC.IsSetPos = false; + + window->DC.NavLayerCurrent = ImGuiNavLayer_Main; + window->DC.NavLayersActiveMask = window->DC.NavLayersActiveMaskNext; + window->DC.NavLayersActiveMaskNext = 0x00; + window->DC.NavIsScrollPushableX = true; window->DC.NavHideHighlightOneFrame = false; - window->DC.NavHasScroll = (window->ScrollMax.y > 0.0f); - window->DC.NavLayerActiveMask = window->DC.NavLayerActiveMaskNext; - window->DC.NavLayerActiveMaskNext = 0x00; + window->DC.NavWindowHasScrollY = (window->ScrollMax.y > 0.0f); + window->DC.MenuBarAppending = false; + window->DC.MenuColumns.Update(style.ItemSpacing.x, window_just_activated_by_user); + window->DC.TreeDepth = 0; + window->DC.TreeHasStackDataDepthMask = 0x00; window->DC.ChildWindows.resize(0); + window->DC.StateStorage = &window->StateStorage; + window->DC.CurrentColumns = NULL; window->DC.LayoutType = ImGuiLayoutType_Vertical; window->DC.ParentLayoutType = parent_window ? parent_window->DC.LayoutType : ImGuiLayoutType_Vertical; - window->DC.FocusCounterAll = window->DC.FocusCounterTab = -1; - window->DC.ItemFlags = parent_window ? parent_window->DC.ItemFlags : ImGuiItemFlags_Default_; + window->DC.ItemWidth = window->ItemWidthDefault; window->DC.TextWrapPos = -1.0f; // disabled - window->DC.ItemFlagsStack.resize(0); window->DC.ItemWidthStack.resize(0); window->DC.TextWrapPosStack.resize(0); - window->DC.CurrentColumns = NULL; - window->DC.TreeDepth = 0; - window->DC.TreeMayJumpToParentOnPopMask = 0x00; - window->DC.StateStorage = &window->StateStorage; - window->DC.GroupStack.resize(0); - window->MenuColumns.Update(3, style.ItemSpacing.x, window_just_activated_by_user); - - if ((flags & ImGuiWindowFlags_ChildWindow) && (window->DC.ItemFlags != parent_window->DC.ItemFlags)) - { - window->DC.ItemFlags = parent_window->DC.ItemFlags; - window->DC.ItemFlagsStack.push_back(window->DC.ItemFlags); - } + if (flags & ImGuiWindowFlags_Modal) + window->DC.ModalDimBgColor = ColorConvertFloat4ToU32(GetStyleColorVec4(ImGuiCol_ModalWindowDimBg)); if (window->AutoFitFramesX > 0) window->AutoFitFramesX--; if (window->AutoFitFramesY > 0) window->AutoFitFramesY--; + // Clear SetNextWindowXXX data (can aim to move this higher in the function) + g.NextWindowData.ClearFlags(); + // Apply focus (we need to call FocusWindow() AFTER setting DC.CursorStartPos so our initial navigation reference rectangle can start around there) + // We ImGuiFocusRequestFlags_UnlessBelowModal to: + // - Avoid focusing a window that is created outside of a modal. This will prevent active modal from being closed. + // - Position window behind the modal that is not a begin-parent of this window. if (want_focus) + FocusWindow(window, ImGuiFocusRequestFlags_UnlessBelowModal); + if (want_focus && window == g.NavWindow) + NavInitWindow(window, false); // <-- this is in the way for us to be able to defer and sort reappearing FocusWindow() calls + + // Close requested by platform window (apply to all windows in this viewport) + if (p_open != NULL && window->Viewport->PlatformRequestClose && window->Viewport != GetMainViewport()) { - FocusWindow(window); - NavInitWindow(window, false); + IMGUI_DEBUG_LOG_VIEWPORT("[viewport] Window '%s' closed by PlatformRequestClose\n", window->Name); + *p_open = false; + g.NavWindowingToggleLayer = false; // Assume user mapped PlatformRequestClose on ALT-F4 so we disable ALT for menu toggle. False positive not an issue. // FIXME-NAV: Try removing. } - // Title bar - if (!(flags & ImGuiWindowFlags_NoTitleBar)) - RenderWindowTitleBarContents(window, title_bar_rect, name, p_open); + // Pressing CTRL+C copy window content into the clipboard + // [EXPERIMENTAL] Breaks on nested Begin/End pairs. We need to work that out and add better logging scope. + // [EXPERIMENTAL] Text outputs has many issues. + if (g.IO.ConfigWindowsCopyContentsWithCtrlC) + if (g.NavWindow && g.NavWindow->RootWindow == window && g.ActiveId == 0 && Shortcut(ImGuiMod_Ctrl | ImGuiKey_C)) + LogToClipboard(0); - // Pressing CTRL+C while holding on a window copy its content to the clipboard - // This works but 1. doesn't handle multiple Begin/End pairs, 2. recursing into another Begin/End pair - so we need to work that out and add better logging scope. - // Maybe we can support CTRL+C on every element? - /* - if (g.ActiveId == move_id) - if (g.IO.KeyCtrl && IsKeyPressedMap(ImGuiKey_C)) - LogToClipboard(); - */ + // Title bar + if (!(flags & ImGuiWindowFlags_NoTitleBar) && !window->DockIsActive) + RenderWindowTitleBarContents(window, ImRect(title_bar_rect.Min.x + window->WindowBorderSize, title_bar_rect.Min.y, title_bar_rect.Max.x - window->WindowBorderSize, title_bar_rect.Max.y), name, p_open); + else if (!(flags & ImGuiWindowFlags_NoTitleBar) && window->DockIsActive) + LogText("%.*s\n", (int)(FindRenderedTextEnd(window->Name) - window->Name), window->Name); + + // Clear hit test shape every frame + window->HitTestHoleSize.x = window->HitTestHoleSize.y = 0; + + if (flags & ImGuiWindowFlags_Tooltip) + g.TooltipPreviousWindow = window; + + if (g.IO.ConfigFlags & ImGuiConfigFlags_DockingEnable) + { + // Docking: Dragging a dockable window (or any of its child) turns it into a drag and drop source. + // We need to do this _before_ we overwrite window->DC.LastItemId below because BeginDockableDragDropSource() also overwrites it. + if (g.MovingWindow == window && (window->RootWindowDockTree->Flags & ImGuiWindowFlags_NoDocking) == 0) + BeginDockableDragDropSource(window); + + // Docking: Any dockable window can act as a target. For dock node hosts we call BeginDockableDragDropTarget() in DockNodeUpdate() instead. + if (g.DragDropActive && !(flags & ImGuiWindowFlags_NoDocking)) + if (g.MovingWindow == NULL || g.MovingWindow->RootWindowDockTree != window) + if ((window == window->RootWindowDockTree) && !(window->Flags & ImGuiWindowFlags_DockNodeHost)) + BeginDockableDragDropTarget(window); + } // We fill last item data based on Title Bar/Tab, in order for IsItemHovered() and IsItemActive() to be usable after Begin(). // This is useful to allow creating context menus on title bar only, etc. - window->DC.LastItemId = window->MoveId; - window->DC.LastItemStatusFlags = IsMouseHoveringRect(title_bar_rect.Min, title_bar_rect.Max, false) ? ImGuiItemStatusFlags_HoveredRect : 0; - window->DC.LastItemRect = title_bar_rect; + window->DC.WindowItemStatusFlags = ImGuiItemStatusFlags_None; + window->DC.WindowItemStatusFlags |= IsMouseHoveringRect(title_bar_rect.Min, title_bar_rect.Max, false) ? ImGuiItemStatusFlags_HoveredRect : 0; + SetLastItemDataForWindow(window, title_bar_rect); + + // [DEBUG] +#ifndef IMGUI_DISABLE_DEBUG_TOOLS + if (g.DebugLocateId != 0 && (window->ID == g.DebugLocateId || window->MoveId == g.DebugLocateId)) + DebugLocateItemResolveWithLastItem(); +#endif + + // [Test Engine] Register title bar / tab with MoveId. #ifdef IMGUI_ENABLE_TEST_ENGINE if (!(window->Flags & ImGuiWindowFlags_NoTitleBar)) - IMGUI_TEST_ENGINE_ITEM_ADD(window->DC.LastItemRect, window->DC.LastItemId); + { + window->DC.NavLayerCurrent = ImGuiNavLayer_Menu; + IMGUI_TEST_ENGINE_ITEM_ADD(g.LastItemData.ID, g.LastItemData.Rect, &g.LastItemData); + window->DC.NavLayerCurrent = ImGuiNavLayer_Main; + } #endif } else { + // Skip refresh always mark active + if (window->SkipRefresh) + SetWindowActiveForSkipRefresh(window); + // Append + SetCurrentViewport(window, window->Viewport); SetCurrentWindow(window); + g.NextWindowData.ClearFlags(); + SetLastItemDataForWindow(window, window->TitleBarRect()); } - PushClipRect(window->InnerClipRect.Min, window->InnerClipRect.Max, true); + if (!(flags & ImGuiWindowFlags_DockNodeHost) && !window->SkipRefresh) + PushClipRect(window->InnerClipRect.Min, window->InnerClipRect.Max, true); // Clear 'accessed' flag last thing (After PushClipRect which will set the flag. We want the flag to stay false when the default "Debug" window is unused) - if (first_begin_of_the_frame) - window->WriteAccessed = false; - + window->WriteAccessed = false; window->BeginCount++; - g.NextWindowData.ClearFlags(); - if (flags & ImGuiWindowFlags_ChildWindow) + // Update visibility + if (first_begin_of_the_frame && !window->SkipRefresh) { - // Child window can be out of sight and have "negative" clip windows. - // Mark them as collapsed so commands are skipped earlier (we can't manually collapse them because they have no title bar). - IM_ASSERT((flags & ImGuiWindowFlags_NoTitleBar) != 0); - if (!(flags & ImGuiWindowFlags_AlwaysAutoResize) && window->AutoFitFramesX <= 0 && window->AutoFitFramesY <= 0) - if (window->OuterRectClipped.Min.x >= window->OuterRectClipped.Max.x || window->OuterRectClipped.Min.y >= window->OuterRectClipped.Max.y) + // When we are about to select this tab (which will only be visible on the _next frame_), flag it with a non-zero HiddenFramesCannotSkipItems. + // This will have the important effect of actually returning true in Begin() and not setting SkipItems, allowing an earlier submission of the window contents. + // This is analogous to regular windows being hidden from one frame. + // It is especially important as e.g. nested TabBars would otherwise generate flicker in the form of one empty frame, or focus requests won't be processed. + if (window->DockIsActive && !window->DockTabIsVisible) + { + if (window->LastFrameJustFocused == g.FrameCount) + window->HiddenFramesCannotSkipItems = 1; + else window->HiddenFramesCanSkipItems = 1; + } - // Hide along with parent or if parent is collapsed - if (parent_window && (parent_window->Collapsed || parent_window->HiddenFramesCanSkipItems > 0)) + if ((flags & ImGuiWindowFlags_ChildWindow) && !(flags & ImGuiWindowFlags_ChildMenu)) + { + // Child window can be out of sight and have "negative" clip windows. + // Mark them as collapsed so commands are skipped earlier (we can't manually collapse them because they have no title bar). + IM_ASSERT((flags & ImGuiWindowFlags_NoTitleBar) != 0 || window->DockIsActive); + const bool nav_request = (window->ChildFlags & ImGuiChildFlags_NavFlattened) && (g.NavAnyRequest && g.NavWindow && g.NavWindow->RootWindowForNav == window->RootWindowForNav); + if (!g.LogEnabled && !nav_request) + if (window->OuterRectClipped.Min.x >= window->OuterRectClipped.Max.x || window->OuterRectClipped.Min.y >= window->OuterRectClipped.Max.y) + { + if (window->AutoFitFramesX > 0 || window->AutoFitFramesY > 0) + window->HiddenFramesCannotSkipItems = 1; + else + window->HiddenFramesCanSkipItems = 1; + } + + // Hide along with parent or if parent is collapsed + if (parent_window && (parent_window->Collapsed || parent_window->HiddenFramesCanSkipItems > 0)) + window->HiddenFramesCanSkipItems = 1; + if (parent_window && parent_window->HiddenFramesCannotSkipItems > 0) + window->HiddenFramesCannotSkipItems = 1; + } + + // Don't render if style alpha is 0.0 at the time of Begin(). This is arbitrary and inconsistent but has been there for a long while (may remove at some point) + if (style.Alpha <= 0.0f) window->HiddenFramesCanSkipItems = 1; - if (parent_window && (parent_window->Collapsed || parent_window->HiddenFramesCannotSkipItems > 0)) - window->HiddenFramesCannotSkipItems = 1; + + // Update the Hidden flag + bool hidden_regular = (window->HiddenFramesCanSkipItems > 0) || (window->HiddenFramesCannotSkipItems > 0); + window->Hidden = hidden_regular || (window->HiddenFramesForRenderOnly > 0); + + // Disable inputs for requested number of frames + if (window->DisableInputsFrames > 0) + { + window->DisableInputsFrames--; + window->Flags |= ImGuiWindowFlags_NoInputs; + } + + // Update the SkipItems flag, used to early out of all items functions (no layout required) + bool skip_items = false; + if (window->Collapsed || !window->Active || hidden_regular) + if (window->AutoFitFramesX <= 0 && window->AutoFitFramesY <= 0 && window->HiddenFramesCannotSkipItems <= 0) + skip_items = true; + window->SkipItems = skip_items; + + // Restore NavLayersActiveMaskNext to previous value when not visible, so a CTRL+Tab back can use a safe value. + if (window->SkipItems) + window->DC.NavLayersActiveMaskNext = window->DC.NavLayersActiveMask; + + // Sanity check: there are two spots which can set Appearing = true + // - when 'window_just_activated_by_user' is set -> HiddenFramesCannotSkipItems is set -> SkipItems always false + // - in BeginDocked() path when DockNodeIsVisible == DockTabIsVisible == true -> hidden _should_ be all zero // FIXME: Not formally proven, hence the assert. + if (window->SkipItems && !window->Appearing) + IM_ASSERT(window->Appearing == false); // Please report on GitHub if this triggers: https://github.com/ocornut/imgui/issues/4177 + } + else if (first_begin_of_the_frame) + { + // Skip refresh mode + window->SkipItems = true; } - // Don't render if style alpha is 0.0 at the time of Begin(). This is arbitrary and inconsistent but has been there for a long while (may remove at some point) - if (style.Alpha <= 0.0f) - window->HiddenFramesCanSkipItems = 1; + // [DEBUG] io.ConfigDebugBeginReturnValue override return value to test Begin/End and BeginChild/EndChild behaviors. + // (The implicit fallback window is NOT automatically ended allowing it to always be able to receive commands without crashing) +#ifndef IMGUI_DISABLE_DEBUG_TOOLS + if (!window->IsFallbackWindow) + if ((g.IO.ConfigDebugBeginReturnValueOnce && window_just_created) || (g.IO.ConfigDebugBeginReturnValueLoop && g.DebugBeginReturnValueCullDepth == g.CurrentWindowStack.Size)) + { + if (window->AutoFitFramesX > 0) { window->AutoFitFramesX++; } + if (window->AutoFitFramesY > 0) { window->AutoFitFramesY++; } + return false; + } +#endif - // Update the Hidden flag - window->Hidden = (window->HiddenFramesCanSkipItems > 0) || (window->HiddenFramesCannotSkipItems > 0); - - // Update the SkipItems flag, used to early out of all items functions (no layout required) - bool skip_items = false; - if (window->Collapsed || !window->Active || window->Hidden) - if (window->AutoFitFramesX <= 0 && window->AutoFitFramesY <= 0 && window->HiddenFramesCannotSkipItems <= 0) - skip_items = true; - window->SkipItems = skip_items; - - return !skip_items; + return !window->SkipItems; } -// Old Begin() API with 5 parameters, avoid calling this version directly! Use SetNextWindowSize()/SetNextWindowBgAlpha() + Begin() instead. -#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS -bool ImGui::Begin(const char* name, bool* p_open, const ImVec2& size_first_use, float bg_alpha_override, ImGuiWindowFlags flags) -{ - // Old API feature: we could pass the initial window size as a parameter. This was misleading because it only had an effect if the window didn't have data in the .ini file. - if (size_first_use.x != 0.0f || size_first_use.y != 0.0f) - SetNextWindowSize(size_first_use, ImGuiCond_FirstUseEver); - - // Old API feature: override the window background alpha with a parameter. - if (bg_alpha_override >= 0.0f) - SetNextWindowBgAlpha(bg_alpha_override); - - return Begin(name, p_open, flags); -} -#endif // IMGUI_DISABLE_OBSOLETE_FUNCTIONS - void ImGui::End() { ImGuiContext& g = *GImGui; - - if (g.CurrentWindowStack.Size <= 1 && g.FrameScopePushedImplicitWindow) - { - IM_ASSERT(g.CurrentWindowStack.Size > 1 && "Calling End() too many times!"); - return; // FIXME-ERRORHANDLING - } - IM_ASSERT(g.CurrentWindowStack.Size > 0); - ImGuiWindow* window = g.CurrentWindow; + // Error checking: verify that user hasn't called End() too many times! + if (g.CurrentWindowStack.Size <= 1 && g.WithinFrameScopeWithImplicitWindow) + { + IM_ASSERT_USER_ERROR(g.CurrentWindowStack.Size > 1, "Calling End() too many times!"); + return; + } + ImGuiWindowStackData& window_stack_data = g.CurrentWindowStack.back(); + + // Error checking: verify that user doesn't directly call End() on a child window. + if ((window->Flags & ImGuiWindowFlags_ChildWindow) && !(window->Flags & ImGuiWindowFlags_DockNodeHost) && !window->DockIsActive) + IM_ASSERT_USER_ERROR(g.WithinEndChildID == window->ID, "Must call EndChild() and not End()!"); + + // Close anything that is open if (window->DC.CurrentColumns) EndColumns(); - PopClipRect(); // Inner window clip rectangle + if (!(window->Flags & ImGuiWindowFlags_DockNodeHost) && !window->SkipRefresh) // Pop inner window clip rectangle + PopClipRect(); + PopFocusScope(); + if (window_stack_data.DisabledOverrideReenable && window->RootWindow == window) + EndDisabledOverrideReenable(); + + if (window->SkipRefresh) + { + IM_ASSERT(window->DrawList == NULL); + window->DrawList = &window->DrawListInst; + } // Stop logging - if (!(window->Flags & ImGuiWindowFlags_ChildWindow)) // FIXME: add more options for scope of logging + if (g.LogWindow == window) // FIXME: add more options for scope of logging LogFinish(); + if (window->DC.IsSetPos) + ErrorCheckUsingSetCursorPosToExtendParentBoundaries(); + + // Docking: report contents sizes to parent to allow for auto-resize + if (window->DockNode && window->DockTabIsVisible) + if (ImGuiWindow* host_window = window->DockNode->HostWindow) // FIXME-DOCK + host_window->DC.CursorMaxPos = window->DC.CursorMaxPos + window->WindowPadding - host_window->WindowPadding; + // Pop from window stack - g.CurrentWindowStack.pop_back(); + g.LastItemData = window_stack_data.ParentLastItemDataBackup; + if (window->Flags & ImGuiWindowFlags_ChildMenu) + g.BeginMenuDepth--; if (window->Flags & ImGuiWindowFlags_Popup) g.BeginPopupStack.pop_back(); - CheckStacksSize(window, false); - SetCurrentWindow(g.CurrentWindowStack.empty() ? NULL : g.CurrentWindowStack.back()); -} - -void ImGui::BringWindowToFocusFront(ImGuiWindow* window) -{ - ImGuiContext& g = *GImGui; - if (g.WindowsFocusOrder.back() == window) - return; - for (int i = g.WindowsFocusOrder.Size - 2; i >= 0; i--) // We can ignore the top-most window - if (g.WindowsFocusOrder[i] == window) - { - memmove(&g.WindowsFocusOrder[i], &g.WindowsFocusOrder[i + 1], (size_t)(g.WindowsFocusOrder.Size - i - 1) * sizeof(ImGuiWindow*)); - g.WindowsFocusOrder[g.WindowsFocusOrder.Size - 1] = window; - break; - } -} - -void ImGui::BringWindowToDisplayFront(ImGuiWindow* window) -{ - ImGuiContext& g = *GImGui; - ImGuiWindow* current_front_window = g.Windows.back(); - if (current_front_window == window || current_front_window->RootWindow == window) - return; - for (int i = g.Windows.Size - 2; i >= 0; i--) // We can ignore the top-most window - if (g.Windows[i] == window) - { - memmove(&g.Windows[i], &g.Windows[i + 1], (size_t)(g.Windows.Size - i - 1) * sizeof(ImGuiWindow*)); - g.Windows[g.Windows.Size - 1] = window; - break; - } -} - -void ImGui::BringWindowToDisplayBack(ImGuiWindow* window) -{ - ImGuiContext& g = *GImGui; - if (g.Windows[0] == window) - return; - for (int i = 0; i < g.Windows.Size; i++) - if (g.Windows[i] == window) - { - memmove(&g.Windows[1], &g.Windows[0], (size_t)i * sizeof(ImGuiWindow*)); - g.Windows[0] = window; - break; - } -} - -// Moving window to front of display and set focus (which happens to be back of our sorted list) -void ImGui::FocusWindow(ImGuiWindow* window) -{ - ImGuiContext& g = *GImGui; - - if (g.NavWindow != window) - { - g.NavWindow = window; - if (window && g.NavDisableMouseHover) - g.NavMousePosDirty = true; - g.NavInitRequest = false; - g.NavId = window ? window->NavLastIds[0] : 0; // Restore NavId - g.NavIdIsAlive = false; - g.NavLayer = ImGuiNavLayer_Main; - //IMGUI_DEBUG_LOG("FocusWindow(\"%s\")\n", window ? window->Name : NULL); - } - - // Close popups if any - ClosePopupsOverWindow(window, false); - - // Passing NULL allow to disable keyboard focus - if (!window) - return; - - // Move the root window to the top of the pile - if (window->RootWindow) - window = window->RootWindow; - - // Steal focus on active widgets - if (window->Flags & ImGuiWindowFlags_Popup) // FIXME: This statement should be unnecessary. Need further testing before removing it.. - if (g.ActiveId != 0 && g.ActiveIdWindow && g.ActiveIdWindow->RootWindow != window) - ClearActiveID(); - - // Bring to front - BringWindowToFocusFront(window); - if (!(window->Flags & ImGuiWindowFlags_NoBringToFrontOnFocus)) - BringWindowToDisplayFront(window); -} - -void ImGui::FocusTopMostWindowUnderOne(ImGuiWindow* under_this_window, ImGuiWindow* ignore_window) -{ - ImGuiContext& g = *GImGui; - - int start_idx = g.WindowsFocusOrder.Size - 1; - if (under_this_window != NULL) - { - int under_this_window_idx = FindWindowFocusIndex(under_this_window); - if (under_this_window_idx != -1) - start_idx = under_this_window_idx - 1; - } - for (int i = start_idx; i >= 0; i--) - { - // We may later decide to test for different NoXXXInputs based on the active navigation input (mouse vs nav) but that may feel more confusing to the user. - ImGuiWindow* window = g.WindowsFocusOrder[i]; - if (window != ignore_window && window->WasActive && !(window->Flags & ImGuiWindowFlags_ChildWindow)) - if ((window->Flags & (ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoNavInputs)) != (ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoNavInputs)) - { - ImGuiWindow* focus_window = NavRestoreLastChildNavWindow(window); - FocusWindow(focus_window); - return; - } - } - FocusWindow(NULL); -} - -void ImGui::SetNextItemWidth(float item_width) -{ - ImGuiContext& g = *GImGui; - g.NextItemData.Flags |= ImGuiNextItemDataFlags_HasWidth; - g.NextItemData.Width = item_width; -} - -void ImGui::PushItemWidth(float item_width) -{ - ImGuiContext& g = *GImGui; - ImGuiWindow* window = g.CurrentWindow; - window->DC.ItemWidth = (item_width == 0.0f ? window->ItemWidthDefault : item_width); - window->DC.ItemWidthStack.push_back(window->DC.ItemWidth); - g.NextItemData.Flags &= ~ImGuiNextItemDataFlags_HasWidth; -} - -void ImGui::PushMultiItemsWidths(int components, float w_full) -{ - ImGuiContext& g = *GImGui; - ImGuiWindow* window = g.CurrentWindow; - const ImGuiStyle& style = g.Style; - const float w_item_one = ImMax(1.0f, (float)(int)((w_full - (style.ItemInnerSpacing.x) * (components-1)) / (float)components)); - const float w_item_last = ImMax(1.0f, (float)(int)(w_full - (w_item_one + style.ItemInnerSpacing.x) * (components-1))); - window->DC.ItemWidthStack.push_back(w_item_last); - for (int i = 0; i < components-1; i++) - window->DC.ItemWidthStack.push_back(w_item_one); - window->DC.ItemWidth = window->DC.ItemWidthStack.back(); - g.NextItemData.Flags &= ~ImGuiNextItemDataFlags_HasWidth; -} - -void ImGui::PopItemWidth() -{ - ImGuiWindow* window = GetCurrentWindow(); - window->DC.ItemWidthStack.pop_back(); - window->DC.ItemWidth = window->DC.ItemWidthStack.empty() ? window->ItemWidthDefault : window->DC.ItemWidthStack.back(); -} - -// Calculate default item width given value passed to PushItemWidth() or SetNextItemWidth(). -// The SetNextItemWidth() data is generally cleared/consumed by ItemAdd() or NextItemData.ClearFlags() -float ImGui::CalcItemWidth() -{ - ImGuiContext& g = *GImGui; - ImGuiWindow* window = g.CurrentWindow; - float w; - if (g.NextItemData.Flags & ImGuiNextItemDataFlags_HasWidth) - w = g.NextItemData.Width; - else - w = window->DC.ItemWidth; - if (w < 0.0f) - { - float region_max_x = GetContentRegionMaxAbs().x; - w = ImMax(1.0f, region_max_x - window->DC.CursorPos.x + w); - } - w = (float)(int)w; - return w; -} - -// [Internal] Calculate full item size given user provided 'size' parameter and default width/height. Default width is often == CalcItemWidth(). -// Those two functions CalcItemWidth vs CalcItemSize are awkwardly named because they are not fully symmetrical. -// Note that only CalcItemWidth() is publicly exposed. -// The 4.0f here may be changed to match CalcItemWidth() and/or BeginChild() (right now we have a mismatch which is harmless but undesirable) -ImVec2 ImGui::CalcItemSize(ImVec2 size, float default_w, float default_h) -{ - ImGuiWindow* window = GImGui->CurrentWindow; - - ImVec2 region_max; - if (size.x < 0.0f || size.y < 0.0f) - region_max = GetContentRegionMaxAbs(); - - if (size.x == 0.0f) - size.x = default_w; - else if (size.x < 0.0f) - size.x = ImMax(4.0f, region_max.x - window->DC.CursorPos.x + size.x); - - if (size.y == 0.0f) - size.y = default_h; - else if (size.y < 0.0f) - size.y = ImMax(4.0f, region_max.y - window->DC.CursorPos.y + size.y); - - return size; + + // Error handling, state recovery + if (g.IO.ConfigErrorRecovery) + ErrorRecoveryTryToRecoverWindowState(&window_stack_data.StackSizesInBegin); + + g.CurrentWindowStack.pop_back(); + SetCurrentWindow(g.CurrentWindowStack.Size == 0 ? NULL : g.CurrentWindowStack.back().Window); + if (g.CurrentWindow) + SetCurrentViewport(g.CurrentWindow, g.CurrentWindow->Viewport); } +// Important: this alone doesn't alter current ImDrawList state. This is called by PushFont/PopFont only. void ImGui::SetCurrentFont(ImFont* font) { ImGuiContext& g = *GImGui; @@ -6238,261 +8422,188 @@ void ImGui::SetCurrentFont(ImFont* font) g.Font = font; g.FontBaseSize = ImMax(1.0f, g.IO.FontGlobalScale * g.Font->FontSize * g.Font->Scale); g.FontSize = g.CurrentWindow ? g.CurrentWindow->CalcFontSize() : 0.0f; + g.FontScale = g.FontSize / g.Font->FontSize; ImFontAtlas* atlas = g.Font->ContainerAtlas; g.DrawListSharedData.TexUvWhitePixel = atlas->TexUvWhitePixel; + g.DrawListSharedData.TexUvLines = atlas->TexUvLines; g.DrawListSharedData.Font = g.Font; g.DrawListSharedData.FontSize = g.FontSize; + g.DrawListSharedData.FontScale = g.FontScale; } +// Use ImDrawList::_SetTextureID(), making our shared g.FontStack[] authorative against window-local ImDrawList. +// - Whereas ImDrawList::PushTextureID()/PopTextureID() is not to be used across Begin() calls. +// - Note that we don't propagate current texture id when e.g. Begin()-ing into a new window, we never really did... +// - Some code paths never really fully worked with multiple atlas textures. +// - The right-ish solution may be to remove _SetTextureID() and make AddText/RenderText lazily call PushTextureID()/PopTextureID() +// the same way AddImage() does, but then all other primitives would also need to? I don't think we should tackle this problem +// because we have a concrete need and a test bed for multiple atlas textures. void ImGui::PushFont(ImFont* font) { ImGuiContext& g = *GImGui; - if (!font) + if (font == NULL) font = GetDefaultFont(); - SetCurrentFont(font); g.FontStack.push_back(font); - g.CurrentWindow->DrawList->PushTextureID(font->ContainerAtlas->TexID); + SetCurrentFont(font); + g.CurrentWindow->DrawList->_SetTextureID(font->ContainerAtlas->TexID); } void ImGui::PopFont() { ImGuiContext& g = *GImGui; - g.CurrentWindow->DrawList->PopTextureID(); + if (g.FontStack.Size <= 0) + { + IM_ASSERT_USER_ERROR(0, "Calling PopFont() too many times!"); + return; + } g.FontStack.pop_back(); - SetCurrentFont(g.FontStack.empty() ? GetDefaultFont() : g.FontStack.back()); + ImFont* font = g.FontStack.Size == 0 ? GetDefaultFont() : g.FontStack.back(); + SetCurrentFont(font); + g.CurrentWindow->DrawList->_SetTextureID(font->ContainerAtlas->TexID); } void ImGui::PushItemFlag(ImGuiItemFlags option, bool enabled) { - ImGuiWindow* window = GetCurrentWindow(); + ImGuiContext& g = *GImGui; + ImGuiItemFlags item_flags = g.CurrentItemFlags; + IM_ASSERT(item_flags == g.ItemFlagsStack.back()); if (enabled) - window->DC.ItemFlags |= option; + item_flags |= option; else - window->DC.ItemFlags &= ~option; - window->DC.ItemFlagsStack.push_back(window->DC.ItemFlags); + item_flags &= ~option; + g.CurrentItemFlags = item_flags; + g.ItemFlagsStack.push_back(item_flags); } void ImGui::PopItemFlag() { - ImGuiWindow* window = GetCurrentWindow(); - window->DC.ItemFlagsStack.pop_back(); - window->DC.ItemFlags = window->DC.ItemFlagsStack.empty() ? ImGuiItemFlags_Default_ : window->DC.ItemFlagsStack.back(); + ImGuiContext& g = *GImGui; + if (g.ItemFlagsStack.Size <= 1) + { + IM_ASSERT_USER_ERROR(0, "Calling PopItemFlag() too many times!"); + return; + } + g.ItemFlagsStack.pop_back(); + g.CurrentItemFlags = g.ItemFlagsStack.back(); } -// FIXME: Look into renaming this once we have settled the new Focus/Activation/TabStop system. -void ImGui::PushAllowKeyboardFocus(bool allow_keyboard_focus) +// BeginDisabled()/EndDisabled() +// - Those can be nested but it cannot be used to enable an already disabled section (a single BeginDisabled(true) in the stack is enough to keep everything disabled) +// - Visually this is currently altering alpha, but it is expected that in a future styling system this would work differently. +// - Feedback welcome at https://github.com/ocornut/imgui/issues/211 +// - BeginDisabled(false)/EndDisabled() essentially does nothing but is provided to facilitate use of boolean expressions. +// (as a micro-optimization: if you have tens of thousands of BeginDisabled(false)/EndDisabled() pairs, you might want to reformulate your code to avoid making those calls) +// - Note: mixing up BeginDisabled() and PushItemFlag(ImGuiItemFlags_Disabled) is currently NOT SUPPORTED. +void ImGui::BeginDisabled(bool disabled) { - PushItemFlag(ImGuiItemFlags_NoTabStop, !allow_keyboard_focus); + ImGuiContext& g = *GImGui; + bool was_disabled = (g.CurrentItemFlags & ImGuiItemFlags_Disabled) != 0; + if (!was_disabled && disabled) + { + g.DisabledAlphaBackup = g.Style.Alpha; + g.Style.Alpha *= g.Style.DisabledAlpha; // PushStyleVar(ImGuiStyleVar_Alpha, g.Style.Alpha * g.Style.DisabledAlpha); + } + if (was_disabled || disabled) + g.CurrentItemFlags |= ImGuiItemFlags_Disabled; + g.ItemFlagsStack.push_back(g.CurrentItemFlags); // FIXME-OPT: can we simply skip this and use DisabledStackSize? + g.DisabledStackSize++; } -void ImGui::PopAllowKeyboardFocus() +void ImGui::EndDisabled() { - PopItemFlag(); + ImGuiContext& g = *GImGui; + if (g.DisabledStackSize <= 0) + { + IM_ASSERT_USER_ERROR(0, "Calling EndDisabled() too many times!"); + return; + } + g.DisabledStackSize--; + bool was_disabled = (g.CurrentItemFlags & ImGuiItemFlags_Disabled) != 0; + //PopItemFlag(); + g.ItemFlagsStack.pop_back(); + g.CurrentItemFlags = g.ItemFlagsStack.back(); + if (was_disabled && (g.CurrentItemFlags & ImGuiItemFlags_Disabled) == 0) + g.Style.Alpha = g.DisabledAlphaBackup; //PopStyleVar(); } -void ImGui::PushButtonRepeat(bool repeat) +// Could have been called BeginDisabledDisable() but it didn't want to be award nominated for most awkward function name. +// Ideally we would use a shared e.g. BeginDisabled()->BeginDisabledEx() but earlier needs to be optimal. +// The whole code for this is awkward, will reevaluate if we find a way to implement SetNextItemDisabled(). +void ImGui::BeginDisabledOverrideReenable() { - PushItemFlag(ImGuiItemFlags_ButtonRepeat, repeat); + ImGuiContext& g = *GImGui; + IM_ASSERT(g.CurrentItemFlags & ImGuiItemFlags_Disabled); + g.CurrentWindowStack.back().DisabledOverrideReenableAlphaBackup = g.Style.Alpha; + g.Style.Alpha = g.DisabledAlphaBackup; + g.CurrentItemFlags &= ~ImGuiItemFlags_Disabled; + g.ItemFlagsStack.push_back(g.CurrentItemFlags); + g.DisabledStackSize++; } -void ImGui::PopButtonRepeat() +void ImGui::EndDisabledOverrideReenable() { - PopItemFlag(); + ImGuiContext& g = *GImGui; + g.DisabledStackSize--; + IM_ASSERT(g.DisabledStackSize > 0); + g.ItemFlagsStack.pop_back(); + g.CurrentItemFlags = g.ItemFlagsStack.back(); + g.Style.Alpha = g.CurrentWindowStack.back().DisabledOverrideReenableAlphaBackup; } void ImGui::PushTextWrapPos(float wrap_pos_x) { - ImGuiWindow* window = GetCurrentWindow(); + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + window->DC.TextWrapPosStack.push_back(window->DC.TextWrapPos); window->DC.TextWrapPos = wrap_pos_x; - window->DC.TextWrapPosStack.push_back(wrap_pos_x); } void ImGui::PopTextWrapPos() { - ImGuiWindow* window = GetCurrentWindow(); + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + if (window->DC.TextWrapPosStack.Size <= 0) + { + IM_ASSERT_USER_ERROR(0, "Calling PopTextWrapPos() too many times!"); + return; + } + window->DC.TextWrapPos = window->DC.TextWrapPosStack.back(); window->DC.TextWrapPosStack.pop_back(); - window->DC.TextWrapPos = window->DC.TextWrapPosStack.empty() ? -1.0f : window->DC.TextWrapPosStack.back(); } -// FIXME: This may incur a round-trip (if the end user got their data from a float4) but eventually we aim to store the in-flight colors as ImU32 -void ImGui::PushStyleColor(ImGuiCol idx, ImU32 col) +static ImGuiWindow* GetCombinedRootWindow(ImGuiWindow* window, bool popup_hierarchy, bool dock_hierarchy) { - ImGuiContext& g = *GImGui; - ImGuiColorMod backup; - backup.Col = idx; - backup.BackupValue = g.Style.Colors[idx]; - g.ColorModifiers.push_back(backup); - g.Style.Colors[idx] = ColorConvertU32ToFloat4(col); -} - -void ImGui::PushStyleColor(ImGuiCol idx, const ImVec4& col) -{ - ImGuiContext& g = *GImGui; - ImGuiColorMod backup; - backup.Col = idx; - backup.BackupValue = g.Style.Colors[idx]; - g.ColorModifiers.push_back(backup); - g.Style.Colors[idx] = col; -} - -void ImGui::PopStyleColor(int count) -{ - ImGuiContext& g = *GImGui; - while (count > 0) + ImGuiWindow* last_window = NULL; + while (last_window != window) { - ImGuiColorMod& backup = g.ColorModifiers.back(); - g.Style.Colors[backup.Col] = backup.BackupValue; - g.ColorModifiers.pop_back(); - count--; - } + last_window = window; + window = window->RootWindow; + if (popup_hierarchy) + window = window->RootWindowPopupTree; + if (dock_hierarchy) + window = window->RootWindowDockTree; + } + return window; } -struct ImGuiStyleVarInfo +bool ImGui::IsWindowChildOf(ImGuiWindow* window, ImGuiWindow* potential_parent, bool popup_hierarchy, bool dock_hierarchy) { - ImGuiDataType Type; - ImU32 Count; - ImU32 Offset; - void* GetVarPtr(ImGuiStyle* style) const { return (void*)((unsigned char*)style + Offset); } -}; - -static const ImGuiStyleVarInfo GStyleVarInfo[] = -{ - { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, Alpha) }, // ImGuiStyleVar_Alpha - { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, WindowPadding) }, // ImGuiStyleVar_WindowPadding - { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, WindowRounding) }, // ImGuiStyleVar_WindowRounding - { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, WindowBorderSize) }, // ImGuiStyleVar_WindowBorderSize - { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, WindowMinSize) }, // ImGuiStyleVar_WindowMinSize - { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, WindowTitleAlign) }, // ImGuiStyleVar_WindowTitleAlign - { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, ChildRounding) }, // ImGuiStyleVar_ChildRounding - { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, ChildBorderSize) }, // ImGuiStyleVar_ChildBorderSize - { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, PopupRounding) }, // ImGuiStyleVar_PopupRounding - { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, PopupBorderSize) }, // ImGuiStyleVar_PopupBorderSize - { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, FramePadding) }, // ImGuiStyleVar_FramePadding - { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, FrameRounding) }, // ImGuiStyleVar_FrameRounding - { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, FrameBorderSize) }, // ImGuiStyleVar_FrameBorderSize - { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, ItemSpacing) }, // ImGuiStyleVar_ItemSpacing - { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, ItemInnerSpacing) }, // ImGuiStyleVar_ItemInnerSpacing - { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, IndentSpacing) }, // ImGuiStyleVar_IndentSpacing - { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, ScrollbarSize) }, // ImGuiStyleVar_ScrollbarSize - { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, ScrollbarRounding) }, // ImGuiStyleVar_ScrollbarRounding - { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, GrabMinSize) }, // ImGuiStyleVar_GrabMinSize - { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, GrabRounding) }, // ImGuiStyleVar_GrabRounding - { ImGuiDataType_Float, 1, (ImU32)IM_OFFSETOF(ImGuiStyle, TabRounding) }, // ImGuiStyleVar_TabRounding - { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, ButtonTextAlign) }, // ImGuiStyleVar_ButtonTextAlign - { ImGuiDataType_Float, 2, (ImU32)IM_OFFSETOF(ImGuiStyle, SelectableTextAlign) }, // ImGuiStyleVar_SelectableTextAlign -}; - -static const ImGuiStyleVarInfo* GetStyleVarInfo(ImGuiStyleVar idx) -{ - IM_ASSERT(idx >= 0 && idx < ImGuiStyleVar_COUNT); - IM_ASSERT(IM_ARRAYSIZE(GStyleVarInfo) == ImGuiStyleVar_COUNT); - return &GStyleVarInfo[idx]; -} - -void ImGui::PushStyleVar(ImGuiStyleVar idx, float val) -{ - const ImGuiStyleVarInfo* var_info = GetStyleVarInfo(idx); - if (var_info->Type == ImGuiDataType_Float && var_info->Count == 1) + ImGuiWindow* window_root = GetCombinedRootWindow(window, popup_hierarchy, dock_hierarchy); + if (window_root == potential_parent) + return true; + while (window != NULL) { - ImGuiContext& g = *GImGui; - float* pvar = (float*)var_info->GetVarPtr(&g.Style); - g.StyleModifiers.push_back(ImGuiStyleMod(idx, *pvar)); - *pvar = val; - return; + if (window == potential_parent) + return true; + if (window == window_root) // end of chain + return false; + window = window->ParentWindow; } - IM_ASSERT(0 && "Called PushStyleVar() float variant but variable is not a float!"); + return false; } -void ImGui::PushStyleVar(ImGuiStyleVar idx, const ImVec2& val) -{ - const ImGuiStyleVarInfo* var_info = GetStyleVarInfo(idx); - if (var_info->Type == ImGuiDataType_Float && var_info->Count == 2) - { - ImGuiContext& g = *GImGui; - ImVec2* pvar = (ImVec2*)var_info->GetVarPtr(&g.Style); - g.StyleModifiers.push_back(ImGuiStyleMod(idx, *pvar)); - *pvar = val; - return; - } - IM_ASSERT(0 && "Called PushStyleVar() ImVec2 variant but variable is not a ImVec2!"); -} - -void ImGui::PopStyleVar(int count) -{ - ImGuiContext& g = *GImGui; - while (count > 0) - { - // We avoid a generic memcpy(data, &backup.Backup.., GDataTypeSize[info->Type] * info->Count), the overhead in Debug is not worth it. - ImGuiStyleMod& backup = g.StyleModifiers.back(); - const ImGuiStyleVarInfo* info = GetStyleVarInfo(backup.VarIdx); - void* data = info->GetVarPtr(&g.Style); - if (info->Type == ImGuiDataType_Float && info->Count == 1) { ((float*)data)[0] = backup.BackupFloat[0]; } - else if (info->Type == ImGuiDataType_Float && info->Count == 2) { ((float*)data)[0] = backup.BackupFloat[0]; ((float*)data)[1] = backup.BackupFloat[1]; } - g.StyleModifiers.pop_back(); - count--; - } -} - -const char* ImGui::GetStyleColorName(ImGuiCol idx) -{ - // Create switch-case from enum with regexp: ImGuiCol_{.*}, --> case ImGuiCol_\1: return "\1"; - switch (idx) - { - case ImGuiCol_Text: return "Text"; - case ImGuiCol_TextDisabled: return "TextDisabled"; - case ImGuiCol_WindowBg: return "WindowBg"; - case ImGuiCol_ChildBg: return "ChildBg"; - case ImGuiCol_PopupBg: return "PopupBg"; - case ImGuiCol_Border: return "Border"; - case ImGuiCol_BorderShadow: return "BorderShadow"; - case ImGuiCol_FrameBg: return "FrameBg"; - case ImGuiCol_FrameBgHovered: return "FrameBgHovered"; - case ImGuiCol_FrameBgActive: return "FrameBgActive"; - case ImGuiCol_TitleBg: return "TitleBg"; - case ImGuiCol_TitleBgActive: return "TitleBgActive"; - case ImGuiCol_TitleBgCollapsed: return "TitleBgCollapsed"; - case ImGuiCol_MenuBarBg: return "MenuBarBg"; - case ImGuiCol_ScrollbarBg: return "ScrollbarBg"; - case ImGuiCol_ScrollbarGrab: return "ScrollbarGrab"; - case ImGuiCol_ScrollbarGrabHovered: return "ScrollbarGrabHovered"; - case ImGuiCol_ScrollbarGrabActive: return "ScrollbarGrabActive"; - case ImGuiCol_CheckMark: return "CheckMark"; - case ImGuiCol_SliderGrab: return "SliderGrab"; - case ImGuiCol_SliderGrabActive: return "SliderGrabActive"; - case ImGuiCol_Button: return "Button"; - case ImGuiCol_ButtonHovered: return "ButtonHovered"; - case ImGuiCol_ButtonActive: return "ButtonActive"; - case ImGuiCol_Header: return "Header"; - case ImGuiCol_HeaderHovered: return "HeaderHovered"; - case ImGuiCol_HeaderActive: return "HeaderActive"; - case ImGuiCol_Separator: return "Separator"; - case ImGuiCol_SeparatorHovered: return "SeparatorHovered"; - case ImGuiCol_SeparatorActive: return "SeparatorActive"; - case ImGuiCol_ResizeGrip: return "ResizeGrip"; - case ImGuiCol_ResizeGripHovered: return "ResizeGripHovered"; - case ImGuiCol_ResizeGripActive: return "ResizeGripActive"; - case ImGuiCol_Tab: return "Tab"; - case ImGuiCol_TabHovered: return "TabHovered"; - case ImGuiCol_TabActive: return "TabActive"; - case ImGuiCol_TabUnfocused: return "TabUnfocused"; - case ImGuiCol_TabUnfocusedActive: return "TabUnfocusedActive"; - case ImGuiCol_PlotLines: return "PlotLines"; - case ImGuiCol_PlotLinesHovered: return "PlotLinesHovered"; - case ImGuiCol_PlotHistogram: return "PlotHistogram"; - case ImGuiCol_PlotHistogramHovered: return "PlotHistogramHovered"; - case ImGuiCol_TextSelectedBg: return "TextSelectedBg"; - case ImGuiCol_DragDropTarget: return "DragDropTarget"; - case ImGuiCol_NavHighlight: return "NavHighlight"; - case ImGuiCol_NavWindowingHighlight: return "NavWindowingHighlight"; - case ImGuiCol_NavWindowingDimBg: return "NavWindowingDimBg"; - case ImGuiCol_ModalWindowDimBg: return "ModalWindowDimBg"; - } - IM_ASSERT(0); - return "Unknown"; -} - -bool ImGui::IsWindowChildOf(ImGuiWindow* window, ImGuiWindow* potential_parent) +bool ImGui::IsWindowWithinBeginStackOf(ImGuiWindow* window, ImGuiWindow* potential_parent) { if (window->RootWindow == potential_parent) return true; @@ -6500,79 +8611,91 @@ bool ImGui::IsWindowChildOf(ImGuiWindow* window, ImGuiWindow* potential_parent) { if (window == potential_parent) return true; - window = window->ParentWindow; + window = window->ParentWindowInBeginStack; } return false; } -bool ImGui::IsWindowHovered(ImGuiHoveredFlags flags) +bool ImGui::IsWindowAbove(ImGuiWindow* potential_above, ImGuiWindow* potential_below) { - IM_ASSERT((flags & ImGuiHoveredFlags_AllowWhenOverlapped) == 0); // Flags not supported by this function ImGuiContext& g = *GImGui; - if (flags & ImGuiHoveredFlags_AnyWindow) + // It would be saner to ensure that display layer is always reflected in the g.Windows[] order, which would likely requires altering all manipulations of that array + const int display_layer_delta = GetWindowDisplayLayer(potential_above) - GetWindowDisplayLayer(potential_below); + if (display_layer_delta != 0) + return display_layer_delta > 0; + + for (int i = g.Windows.Size - 1; i >= 0; i--) { - if (g.HoveredWindow == NULL) + ImGuiWindow* candidate_window = g.Windows[i]; + if (candidate_window == potential_above) + return true; + if (candidate_window == potential_below) return false; } - else + return false; +} + +// Is current window hovered and hoverable (e.g. not blocked by a popup/modal)? See ImGuiHoveredFlags_ for options. +// IMPORTANT: If you are trying to check whether your mouse should be dispatched to Dear ImGui or to your underlying app, +// you should not use this function! Use the 'io.WantCaptureMouse' boolean for that! +// Refer to FAQ entry "How can I tell whether to dispatch mouse/keyboard to Dear ImGui or my application?" for details. +bool ImGui::IsWindowHovered(ImGuiHoveredFlags flags) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT_USER_ERROR((flags & ~ImGuiHoveredFlags_AllowedMaskForIsWindowHovered) == 0, "Invalid flags for IsWindowHovered()!"); + + ImGuiWindow* ref_window = g.HoveredWindow; + ImGuiWindow* cur_window = g.CurrentWindow; + if (ref_window == NULL) + return false; + + if ((flags & ImGuiHoveredFlags_AnyWindow) == 0) { - switch (flags & (ImGuiHoveredFlags_RootWindow | ImGuiHoveredFlags_ChildWindows)) - { - case ImGuiHoveredFlags_RootWindow | ImGuiHoveredFlags_ChildWindows: - if (g.HoveredRootWindow != g.CurrentWindow->RootWindow) - return false; - break; - case ImGuiHoveredFlags_RootWindow: - if (g.HoveredWindow != g.CurrentWindow->RootWindow) - return false; - break; - case ImGuiHoveredFlags_ChildWindows: - if (g.HoveredWindow == NULL || !IsWindowChildOf(g.HoveredWindow, g.CurrentWindow)) - return false; - break; - default: - if (g.HoveredWindow != g.CurrentWindow) - return false; - break; - } + IM_ASSERT(cur_window); // Not inside a Begin()/End() + const bool popup_hierarchy = (flags & ImGuiHoveredFlags_NoPopupHierarchy) == 0; + const bool dock_hierarchy = (flags & ImGuiHoveredFlags_DockHierarchy) != 0; + if (flags & ImGuiHoveredFlags_RootWindow) + cur_window = GetCombinedRootWindow(cur_window, popup_hierarchy, dock_hierarchy); + + bool result; + if (flags & ImGuiHoveredFlags_ChildWindows) + result = IsWindowChildOf(ref_window, cur_window, popup_hierarchy, dock_hierarchy); + else + result = (ref_window == cur_window); + if (!result) + return false; } - if (!IsWindowContentHoverable(g.HoveredWindow, flags)) + if (!IsWindowContentHoverable(ref_window, flags)) return false; if (!(flags & ImGuiHoveredFlags_AllowWhenBlockedByActiveItem)) - if (g.ActiveId != 0 && !g.ActiveIdAllowOverlap && g.ActiveId != g.HoveredWindow->MoveId) + if (g.ActiveId != 0 && !g.ActiveIdAllowOverlap && g.ActiveId != ref_window->MoveId) return false; + + // When changing hovered window we requires a bit of stationary delay before activating hover timer. + // FIXME: We don't support delay other than stationary one for now, other delay would need a way + // to fulfill the possibility that multiple IsWindowHovered() with varying flag could return true + // for different windows of the hierarchy. Possibly need a Hash(Current+Flags) ==> (Timer) cache. + // We can implement this for _Stationary because the data is linked to HoveredWindow rather than CurrentWindow. + if (flags & ImGuiHoveredFlags_ForTooltip) + flags = ApplyHoverFlagsForTooltip(flags, g.Style.HoverFlagsForTooltipMouse); + if ((flags & ImGuiHoveredFlags_Stationary) != 0 && g.HoverWindowUnlockedStationaryId != ref_window->ID) + return false; + return true; } -bool ImGui::IsWindowFocused(ImGuiFocusedFlags flags) +ImGuiID ImGui::GetWindowDockID() { ImGuiContext& g = *GImGui; - - if (flags & ImGuiFocusedFlags_AnyWindow) - return g.NavWindow != NULL; - - IM_ASSERT(g.CurrentWindow); // Not inside a Begin()/End() - switch (flags & (ImGuiFocusedFlags_RootWindow | ImGuiFocusedFlags_ChildWindows)) - { - case ImGuiFocusedFlags_RootWindow | ImGuiFocusedFlags_ChildWindows: - return g.NavWindow && g.NavWindow->RootWindow == g.CurrentWindow->RootWindow; - case ImGuiFocusedFlags_RootWindow: - return g.NavWindow == g.CurrentWindow->RootWindow; - case ImGuiFocusedFlags_ChildWindows: - return g.NavWindow && IsWindowChildOf(g.NavWindow, g.CurrentWindow); - default: - return g.NavWindow == g.CurrentWindow; - } + return g.CurrentWindow->DockId; } -// Can we focus this window with CTRL+TAB (or PadMenu + PadFocusPrev/PadFocusNext) -// Note that NoNavFocus makes the window not reachable with CTRL+TAB but it can still be focused with mouse or programmaticaly. -// If you want a window to never be focused, you may use the e.g. NoInputs flag. -bool ImGui::IsWindowNavFocusable(ImGuiWindow* window) +bool ImGui::IsWindowDocked() { - return window->Active && window == window->RootWindow && !(window->Flags & ImGuiWindowFlags_NoNavFocus); + ImGuiContext& g = *GImGui; + return g.CurrentWindow->DockIsActive; } float ImGui::GetWindowWidth() @@ -6606,10 +8729,15 @@ void ImGui::SetWindowPos(ImGuiWindow* window, const ImVec2& pos, ImGuiCond cond) // Set const ImVec2 old_pos = window->Pos; - window->Pos = ImFloor(pos); + window->Pos = ImTrunc(pos); ImVec2 offset = window->Pos - old_pos; + if (offset.x == 0.0f && offset.y == 0.0f) + return; + MarkIniSettingsDirty(window); + // FIXME: share code with TranslateWindow(), need to confirm whether the 3 rect modified by TranslateWindow() are desirable here. window->DC.CursorPos += offset; // As we happen to move the window while it is being appended to (which is a bad idea - will smear) let's at least offset the cursor window->DC.CursorMaxPos += offset; // And more importantly we need to offset CursorMaxPos/CursorStartPos this so ContentSize calculation doesn't get affected. + window->DC.IdealMaxPos += offset; window->DC.CursorStartPos += offset; } @@ -6640,27 +8768,24 @@ void ImGui::SetWindowSize(ImGuiWindow* window, const ImVec2& size, ImGuiCond con IM_ASSERT(cond == 0 || ImIsPowerOfTwo(cond)); // Make sure the user doesn't attempt to combine multiple condition flags. window->SetWindowSizeAllowFlags &= ~(ImGuiCond_Once | ImGuiCond_FirstUseEver | ImGuiCond_Appearing); + // Enable auto-fit (not done in BeginChild() path unless appearing or combined with ImGuiChildFlags_AlwaysAutoResize) + if ((window->Flags & ImGuiWindowFlags_ChildWindow) == 0 || window->Appearing || (window->ChildFlags & ImGuiChildFlags_AlwaysAutoResize) != 0) + window->AutoFitFramesX = (size.x <= 0.0f) ? 2 : 0; + if ((window->Flags & ImGuiWindowFlags_ChildWindow) == 0 || window->Appearing || (window->ChildFlags & ImGuiChildFlags_AlwaysAutoResize) != 0) + window->AutoFitFramesY = (size.y <= 0.0f) ? 2 : 0; + // Set - if (size.x > 0.0f) - { - window->AutoFitFramesX = 0; - window->SizeFull.x = ImFloor(size.x); - } - else - { - window->AutoFitFramesX = 2; + ImVec2 old_size = window->SizeFull; + if (size.x <= 0.0f) window->AutoFitOnlyGrows = false; - } - if (size.y > 0.0f) - { - window->AutoFitFramesY = 0; - window->SizeFull.y = ImFloor(size.y); - } else - { - window->AutoFitFramesY = 2; + window->SizeFull.x = IM_TRUNC(size.x); + if (size.y <= 0.0f) window->AutoFitOnlyGrows = false; - } + else + window->SizeFull.y = IM_TRUNC(size.y); + if (old_size.x != window->SizeFull.x || old_size.y != window->SizeFull.y) + MarkIniSettingsDirty(window); } void ImGui::SetWindowSize(const ImVec2& size, ImGuiCond cond) @@ -6685,6 +8810,19 @@ void ImGui::SetWindowCollapsed(ImGuiWindow* window, bool collapsed, ImGuiCond co window->Collapsed = collapsed; } +void ImGui::SetWindowHitTestHole(ImGuiWindow* window, const ImVec2& pos, const ImVec2& size) +{ + IM_ASSERT(window->HitTestHoleSize.x == 0); // We don't support multiple holes/hit test filters + window->HitTestHoleSize = ImVec2ih(size); + window->HitTestHoleOffset = ImVec2ih(pos - window->Pos); +} + +void ImGui::SetWindowHiddenAndSkipItemsForCurrentFrame(ImGuiWindow* window) +{ + window->Hidden = window->SkipItems = true; + window->HiddenFramesCanSkipItems = 1; +} + void ImGui::SetWindowCollapsed(bool collapsed, ImGuiCond cond) { SetWindowCollapsed(GImGui->CurrentWindow, collapsed, cond); @@ -6708,47 +8846,34 @@ void ImGui::SetWindowCollapsed(const char* name, bool collapsed, ImGuiCond cond) SetWindowCollapsed(window, collapsed, cond); } -void ImGui::SetWindowFocus() -{ - FocusWindow(GImGui->CurrentWindow); -} - -void ImGui::SetWindowFocus(const char* name) -{ - if (name) - { - if (ImGuiWindow* window = FindWindowByName(name)) - FocusWindow(window); - } - else - { - FocusWindow(NULL); - } -} - void ImGui::SetNextWindowPos(const ImVec2& pos, ImGuiCond cond, const ImVec2& pivot) { ImGuiContext& g = *GImGui; IM_ASSERT(cond == 0 || ImIsPowerOfTwo(cond)); // Make sure the user doesn't attempt to combine multiple condition flags. - g.NextWindowData.Flags |= ImGuiNextWindowDataFlags_HasPos; + g.NextWindowData.HasFlags |= ImGuiNextWindowDataFlags_HasPos; g.NextWindowData.PosVal = pos; g.NextWindowData.PosPivotVal = pivot; g.NextWindowData.PosCond = cond ? cond : ImGuiCond_Always; + g.NextWindowData.PosUndock = true; } void ImGui::SetNextWindowSize(const ImVec2& size, ImGuiCond cond) { ImGuiContext& g = *GImGui; IM_ASSERT(cond == 0 || ImIsPowerOfTwo(cond)); // Make sure the user doesn't attempt to combine multiple condition flags. - g.NextWindowData.Flags |= ImGuiNextWindowDataFlags_HasSize; + g.NextWindowData.HasFlags |= ImGuiNextWindowDataFlags_HasSize; g.NextWindowData.SizeVal = size; g.NextWindowData.SizeCond = cond ? cond : ImGuiCond_Always; } +// For each axis: +// - Use 0.0f as min or FLT_MAX as max if you don't want limits, e.g. size_min = (500.0f, 0.0f), size_max = (FLT_MAX, FLT_MAX) sets a minimum width. +// - Use -1 for both min and max of same axis to preserve current size which itself is a constraint. +// - See "Demo->Examples->Constrained-resizing window" for examples. void ImGui::SetNextWindowSizeConstraints(const ImVec2& size_min, const ImVec2& size_max, ImGuiSizeCallback custom_callback, void* custom_callback_user_data) { ImGuiContext& g = *GImGui; - g.NextWindowData.Flags |= ImGuiNextWindowDataFlags_HasSizeConstraint; + g.NextWindowData.HasFlags |= ImGuiNextWindowDataFlags_HasSizeConstraint; g.NextWindowData.SizeConstraintRect = ImRect(size_min, size_max); g.NextWindowData.SizeCallback = custom_callback; g.NextWindowData.SizeCallbackUserData = custom_callback_user_data; @@ -6759,101 +8884,62 @@ void ImGui::SetNextWindowSizeConstraints(const ImVec2& size_min, const ImVec2& s void ImGui::SetNextWindowContentSize(const ImVec2& size) { ImGuiContext& g = *GImGui; - g.NextWindowData.Flags |= ImGuiNextWindowDataFlags_HasContentSize; - g.NextWindowData.ContentSizeVal = size; + g.NextWindowData.HasFlags |= ImGuiNextWindowDataFlags_HasContentSize; + g.NextWindowData.ContentSizeVal = ImTrunc(size); +} + +void ImGui::SetNextWindowScroll(const ImVec2& scroll) +{ + ImGuiContext& g = *GImGui; + g.NextWindowData.HasFlags |= ImGuiNextWindowDataFlags_HasScroll; + g.NextWindowData.ScrollVal = scroll; } void ImGui::SetNextWindowCollapsed(bool collapsed, ImGuiCond cond) { ImGuiContext& g = *GImGui; IM_ASSERT(cond == 0 || ImIsPowerOfTwo(cond)); // Make sure the user doesn't attempt to combine multiple condition flags. - g.NextWindowData.Flags |= ImGuiNextWindowDataFlags_HasCollapsed; + g.NextWindowData.HasFlags |= ImGuiNextWindowDataFlags_HasCollapsed; g.NextWindowData.CollapsedVal = collapsed; g.NextWindowData.CollapsedCond = cond ? cond : ImGuiCond_Always; } -void ImGui::SetNextWindowFocus() -{ - ImGuiContext& g = *GImGui; - g.NextWindowData.Flags |= ImGuiNextWindowDataFlags_HasFocus; -} - void ImGui::SetNextWindowBgAlpha(float alpha) { ImGuiContext& g = *GImGui; - g.NextWindowData.Flags |= ImGuiNextWindowDataFlags_HasBgAlpha; + g.NextWindowData.HasFlags |= ImGuiNextWindowDataFlags_HasBgAlpha; g.NextWindowData.BgAlphaVal = alpha; } -// FIXME: This is in window space (not screen space!). We should try to obsolete all those functions. -ImVec2 ImGui::GetContentRegionMax() +void ImGui::SetNextWindowViewport(ImGuiID id) { ImGuiContext& g = *GImGui; - ImGuiWindow* window = g.CurrentWindow; - ImVec2 mx = window->ContentsRegionRect.Max - window->Pos; - if (window->DC.CurrentColumns) - mx.x = window->WorkRect.Max.x - window->Pos.x; - return mx; + g.NextWindowData.HasFlags |= ImGuiNextWindowDataFlags_HasViewport; + g.NextWindowData.ViewportId = id; } -// [Internal] Absolute coordinate. Saner. This is not exposed until we finishing refactoring work rect features. -ImVec2 ImGui::GetContentRegionMaxAbs() +void ImGui::SetNextWindowDockID(ImGuiID id, ImGuiCond cond) { ImGuiContext& g = *GImGui; - ImGuiWindow* window = g.CurrentWindow; - ImVec2 mx = window->ContentsRegionRect.Max; - if (window->DC.CurrentColumns) - mx.x = window->WorkRect.Max.x; - return mx; + g.NextWindowData.HasFlags |= ImGuiNextWindowDataFlags_HasDock; + g.NextWindowData.DockCond = cond ? cond : ImGuiCond_Always; + g.NextWindowData.DockId = id; } -ImVec2 ImGui::GetContentRegionAvail() -{ - ImGuiWindow* window = GImGui->CurrentWindow; - return GetContentRegionMaxAbs() - window->DC.CursorPos; -} - -// In window space (not screen space!) -ImVec2 ImGui::GetWindowContentRegionMin() -{ - ImGuiWindow* window = GImGui->CurrentWindow; - return window->ContentsRegionRect.Min - window->Pos; -} - -ImVec2 ImGui::GetWindowContentRegionMax() -{ - ImGuiWindow* window = GImGui->CurrentWindow; - return window->ContentsRegionRect.Max - window->Pos; -} - -float ImGui::GetWindowContentRegionWidth() -{ - ImGuiWindow* window = GImGui->CurrentWindow; - return window->ContentsRegionRect.GetWidth(); -} - -float ImGui::GetTextLineHeight() +void ImGui::SetNextWindowClass(const ImGuiWindowClass* window_class) { ImGuiContext& g = *GImGui; - return g.FontSize; + IM_ASSERT((window_class->ViewportFlagsOverrideSet & window_class->ViewportFlagsOverrideClear) == 0); // Cannot set both set and clear for the same bit + g.NextWindowData.HasFlags |= ImGuiNextWindowDataFlags_HasWindowClass; + g.NextWindowData.WindowClass = *window_class; } -float ImGui::GetTextLineHeightWithSpacing() +// This is experimental and meant to be a toy for exploring a future/wider range of features. +void ImGui::SetNextWindowRefreshPolicy(ImGuiWindowRefreshFlags flags) { ImGuiContext& g = *GImGui; - return g.FontSize + g.Style.ItemSpacing.y; -} - -float ImGui::GetFrameHeight() -{ - ImGuiContext& g = *GImGui; - return g.FontSize + g.Style.FramePadding.y * 2.0f; -} - -float ImGui::GetFrameHeightWithSpacing() -{ - ImGuiContext& g = *GImGui; - return g.FontSize + g.Style.FramePadding.y * 2.0f + g.Style.ItemSpacing.y; + g.NextWindowData.HasFlags |= ImGuiNextWindowDataFlags_HasRefreshPolicy; + g.NextWindowData.RefreshFlagsVal = flags; } ImDrawList* ImGui::GetWindowDrawList() @@ -6862,6 +8948,19 @@ ImDrawList* ImGui::GetWindowDrawList() return window->DrawList; } +float ImGui::GetWindowDpiScale() +{ + ImGuiContext& g = *GImGui; + return g.CurrentDpiScale; +} + +ImGuiViewport* ImGui::GetWindowViewport() +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(g.CurrentViewport != NULL && g.CurrentViewport == g.CurrentWindow->Viewport); + return g.CurrentViewport; +} + ImFont* ImGui::GetFont() { return GImGui->Font; @@ -6879,10 +8978,2466 @@ ImVec2 ImGui::GetFontTexUvWhitePixel() void ImGui::SetWindowFontScale(float scale) { + IM_ASSERT(scale > 0.0f); ImGuiContext& g = *GImGui; ImGuiWindow* window = GetCurrentWindow(); window->FontWindowScale = scale; g.FontSize = g.DrawListSharedData.FontSize = window->CalcFontSize(); + g.FontScale = g.DrawListSharedData.FontScale = g.FontSize / g.Font->FontSize; +} + +void ImGui::PushFocusScope(ImGuiID id) +{ + ImGuiContext& g = *GImGui; + ImGuiFocusScopeData data; + data.ID = id; + data.WindowID = g.CurrentWindow->ID; + g.FocusScopeStack.push_back(data); + g.CurrentFocusScopeId = id; +} + +void ImGui::PopFocusScope() +{ + ImGuiContext& g = *GImGui; + if (g.FocusScopeStack.Size <= g.StackSizesInBeginForCurrentWindow->SizeOfFocusScopeStack) + { + IM_ASSERT_USER_ERROR(0, "Calling PopFocusScope() too many times!"); + return; + } + g.FocusScopeStack.pop_back(); + g.CurrentFocusScopeId = g.FocusScopeStack.Size ? g.FocusScopeStack.back().ID : 0; +} + +void ImGui::SetNavFocusScope(ImGuiID focus_scope_id) +{ + ImGuiContext& g = *GImGui; + g.NavFocusScopeId = focus_scope_id; + g.NavFocusRoute.resize(0); // Invalidate + if (focus_scope_id == 0) + return; + IM_ASSERT(g.NavWindow != NULL); + + // Store current path (in reverse order) + if (focus_scope_id == g.CurrentFocusScopeId) + { + // Top of focus stack contains local focus scopes inside current window + for (int n = g.FocusScopeStack.Size - 1; n >= 0 && g.FocusScopeStack.Data[n].WindowID == g.CurrentWindow->ID; n--) + g.NavFocusRoute.push_back(g.FocusScopeStack.Data[n]); + } + else if (focus_scope_id == g.NavWindow->NavRootFocusScopeId) + g.NavFocusRoute.push_back({ focus_scope_id, g.NavWindow->ID }); + else + return; + + // Then follow on manually set ParentWindowForFocusRoute field (#6798) + for (ImGuiWindow* window = g.NavWindow->ParentWindowForFocusRoute; window != NULL; window = window->ParentWindowForFocusRoute) + g.NavFocusRoute.push_back({ window->NavRootFocusScopeId, window->ID }); + IM_ASSERT(g.NavFocusRoute.Size < 100); // Maximum depth is technically 251 as per CalcRoutingScore(): 254 - 3 +} + +// Focus = move navigation cursor, set scrolling, set focus window. +void ImGui::FocusItem() +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + IMGUI_DEBUG_LOG_FOCUS("FocusItem(0x%08x) in window \"%s\"\n", g.LastItemData.ID, window->Name); + if (g.DragDropActive || g.MovingWindow != NULL) // FIXME: Opt-in flags for this? + { + IMGUI_DEBUG_LOG_FOCUS("FocusItem() ignored while DragDropActive!\n"); + return; + } + + ImGuiNavMoveFlags move_flags = ImGuiNavMoveFlags_IsTabbing | ImGuiNavMoveFlags_FocusApi | ImGuiNavMoveFlags_NoSetNavCursorVisible | ImGuiNavMoveFlags_NoSelect; + ImGuiScrollFlags scroll_flags = window->Appearing ? ImGuiScrollFlags_KeepVisibleEdgeX | ImGuiScrollFlags_AlwaysCenterY : ImGuiScrollFlags_KeepVisibleEdgeX | ImGuiScrollFlags_KeepVisibleEdgeY; + SetNavWindow(window); + NavMoveRequestSubmit(ImGuiDir_None, ImGuiDir_Up, move_flags, scroll_flags); + NavMoveRequestResolveWithLastItem(&g.NavMoveResultLocal); +} + +void ImGui::ActivateItemByID(ImGuiID id) +{ + ImGuiContext& g = *GImGui; + g.NavNextActivateId = id; + g.NavNextActivateFlags = ImGuiActivateFlags_None; +} + +// Note: this will likely be called ActivateItem() once we rework our Focus/Activation system! +// But ActivateItem() should function without altering scroll/focus? +void ImGui::SetKeyboardFocusHere(int offset) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + IM_ASSERT(offset >= -1); // -1 is allowed but not below + IMGUI_DEBUG_LOG_FOCUS("SetKeyboardFocusHere(%d) in window \"%s\"\n", offset, window->Name); + + // It makes sense in the vast majority of cases to never interrupt a drag and drop. + // When we refactor this function into ActivateItem() we may want to make this an option. + // MovingWindow is protected from most user inputs using SetActiveIdUsingNavAndKeys(), but + // is also automatically dropped in the event g.ActiveId is stolen. + if (g.DragDropActive || g.MovingWindow != NULL) + { + IMGUI_DEBUG_LOG_FOCUS("SetKeyboardFocusHere() ignored while DragDropActive!\n"); + return; + } + + SetNavWindow(window); + + ImGuiNavMoveFlags move_flags = ImGuiNavMoveFlags_IsTabbing | ImGuiNavMoveFlags_Activate | ImGuiNavMoveFlags_FocusApi | ImGuiNavMoveFlags_NoSetNavCursorVisible; + ImGuiScrollFlags scroll_flags = window->Appearing ? ImGuiScrollFlags_KeepVisibleEdgeX | ImGuiScrollFlags_AlwaysCenterY : ImGuiScrollFlags_KeepVisibleEdgeX | ImGuiScrollFlags_KeepVisibleEdgeY; + NavMoveRequestSubmit(ImGuiDir_None, offset < 0 ? ImGuiDir_Up : ImGuiDir_Down, move_flags, scroll_flags); // FIXME-NAV: Once we refactor tabbing, add LegacyApi flag to not activate non-inputable. + if (offset == -1) + { + NavMoveRequestResolveWithLastItem(&g.NavMoveResultLocal); + } + else + { + g.NavTabbingDir = 1; + g.NavTabbingCounter = offset + 1; + } +} + +void ImGui::SetItemDefaultFocus() +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + if (!window->Appearing) + return; + if (g.NavWindow != window->RootWindowForNav || (!g.NavInitRequest && g.NavInitResult.ID == 0) || g.NavLayer != window->DC.NavLayerCurrent) + return; + + g.NavInitRequest = false; + NavApplyItemToResult(&g.NavInitResult); + NavUpdateAnyRequestFlag(); + + // Scroll could be done in NavInitRequestApplyResult() via an opt-in flag (we however don't want regular init requests to scroll) + if (!window->ClipRect.Contains(g.LastItemData.Rect)) + ScrollToRectEx(window, g.LastItemData.Rect, ImGuiScrollFlags_None); +} + +void ImGui::SetStateStorage(ImGuiStorage* tree) +{ + ImGuiWindow* window = GImGui->CurrentWindow; + window->DC.StateStorage = tree ? tree : &window->StateStorage; +} + +ImGuiStorage* ImGui::GetStateStorage() +{ + ImGuiWindow* window = GImGui->CurrentWindow; + return window->DC.StateStorage; +} + +bool ImGui::IsRectVisible(const ImVec2& size) +{ + ImGuiWindow* window = GImGui->CurrentWindow; + return window->ClipRect.Overlaps(ImRect(window->DC.CursorPos, window->DC.CursorPos + size)); +} + +bool ImGui::IsRectVisible(const ImVec2& rect_min, const ImVec2& rect_max) +{ + ImGuiWindow* window = GImGui->CurrentWindow; + return window->ClipRect.Overlaps(ImRect(rect_min, rect_max)); +} + +//----------------------------------------------------------------------------- +// [SECTION] ID STACK +//----------------------------------------------------------------------------- + +// This is one of the very rare legacy case where we use ImGuiWindow methods, +// it should ideally be flattened at some point but it's been used a lots by widgets. +IM_MSVC_RUNTIME_CHECKS_OFF +ImGuiID ImGuiWindow::GetID(const char* str, const char* str_end) +{ + ImGuiID seed = IDStack.back(); + ImGuiID id = ImHashStr(str, str_end ? (str_end - str) : 0, seed); +#ifndef IMGUI_DISABLE_DEBUG_TOOLS + ImGuiContext& g = *Ctx; + if (g.DebugHookIdInfo == id) + ImGui::DebugHookIdInfo(id, ImGuiDataType_String, str, str_end); +#endif + return id; +} + +ImGuiID ImGuiWindow::GetID(const void* ptr) +{ + ImGuiID seed = IDStack.back(); + ImGuiID id = ImHashData(&ptr, sizeof(void*), seed); +#ifndef IMGUI_DISABLE_DEBUG_TOOLS + ImGuiContext& g = *Ctx; + if (g.DebugHookIdInfo == id) + ImGui::DebugHookIdInfo(id, ImGuiDataType_Pointer, ptr, NULL); +#endif + return id; +} + +ImGuiID ImGuiWindow::GetID(int n) +{ + ImGuiID seed = IDStack.back(); + ImGuiID id = ImHashData(&n, sizeof(n), seed); +#ifndef IMGUI_DISABLE_DEBUG_TOOLS + ImGuiContext& g = *Ctx; + if (g.DebugHookIdInfo == id) + ImGui::DebugHookIdInfo(id, ImGuiDataType_S32, (void*)(intptr_t)n, NULL); +#endif + return id; +} + +// This is only used in rare/specific situations to manufacture an ID out of nowhere. +// FIXME: Consider instead storing last non-zero ID + count of successive zero-ID, and combine those? +ImGuiID ImGuiWindow::GetIDFromPos(const ImVec2& p_abs) +{ + ImGuiID seed = IDStack.back(); + ImVec2 p_rel = ImGui::WindowPosAbsToRel(this, p_abs); + ImGuiID id = ImHashData(&p_rel, sizeof(p_rel), seed); + return id; +} + +// " +ImGuiID ImGuiWindow::GetIDFromRectangle(const ImRect& r_abs) +{ + ImGuiID seed = IDStack.back(); + ImRect r_rel = ImGui::WindowRectAbsToRel(this, r_abs); + ImGuiID id = ImHashData(&r_rel, sizeof(r_rel), seed); + return id; +} + +void ImGui::PushID(const char* str_id) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + ImGuiID id = window->GetID(str_id); + window->IDStack.push_back(id); +} + +void ImGui::PushID(const char* str_id_begin, const char* str_id_end) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + ImGuiID id = window->GetID(str_id_begin, str_id_end); + window->IDStack.push_back(id); +} + +void ImGui::PushID(const void* ptr_id) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + ImGuiID id = window->GetID(ptr_id); + window->IDStack.push_back(id); +} + +void ImGui::PushID(int int_id) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + ImGuiID id = window->GetID(int_id); + window->IDStack.push_back(id); +} + +// Push a given id value ignoring the ID stack as a seed. +void ImGui::PushOverrideID(ImGuiID id) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; +#ifndef IMGUI_DISABLE_DEBUG_TOOLS + if (g.DebugHookIdInfo == id) + DebugHookIdInfo(id, ImGuiDataType_ID, NULL, NULL); +#endif + window->IDStack.push_back(id); +} + +// Helper to avoid a common series of PushOverrideID -> GetID() -> PopID() call +// (note that when using this pattern, ID Stack Tool will tend to not display the intermediate stack level. +// for that to work we would need to do PushOverrideID() -> ItemAdd() -> PopID() which would alter widget code a little more) +ImGuiID ImGui::GetIDWithSeed(const char* str, const char* str_end, ImGuiID seed) +{ + ImGuiID id = ImHashStr(str, str_end ? (str_end - str) : 0, seed); +#ifndef IMGUI_DISABLE_DEBUG_TOOLS + ImGuiContext& g = *GImGui; + if (g.DebugHookIdInfo == id) + DebugHookIdInfo(id, ImGuiDataType_String, str, str_end); +#endif + return id; +} + +ImGuiID ImGui::GetIDWithSeed(int n, ImGuiID seed) +{ + ImGuiID id = ImHashData(&n, sizeof(n), seed); +#ifndef IMGUI_DISABLE_DEBUG_TOOLS + ImGuiContext& g = *GImGui; + if (g.DebugHookIdInfo == id) + DebugHookIdInfo(id, ImGuiDataType_S32, (void*)(intptr_t)n, NULL); +#endif + return id; +} + +void ImGui::PopID() +{ + ImGuiWindow* window = GImGui->CurrentWindow; + if (window->IDStack.Size <= 1) + { + IM_ASSERT_USER_ERROR(0, "Calling PopID() too many times!"); + return; + } + window->IDStack.pop_back(); +} + +ImGuiID ImGui::GetID(const char* str_id) +{ + ImGuiWindow* window = GImGui->CurrentWindow; + return window->GetID(str_id); +} + +ImGuiID ImGui::GetID(const char* str_id_begin, const char* str_id_end) +{ + ImGuiWindow* window = GImGui->CurrentWindow; + return window->GetID(str_id_begin, str_id_end); +} + +ImGuiID ImGui::GetID(const void* ptr_id) +{ + ImGuiWindow* window = GImGui->CurrentWindow; + return window->GetID(ptr_id); +} + +ImGuiID ImGui::GetID(int int_id) +{ + ImGuiWindow* window = GImGui->CurrentWindow; + return window->GetID(int_id); +} +IM_MSVC_RUNTIME_CHECKS_RESTORE + +//----------------------------------------------------------------------------- +// [SECTION] INPUTS +//----------------------------------------------------------------------------- +// - GetModForLRModKey() [Internal] +// - FixupKeyChord() [Internal] +// - GetKeyData() [Internal] +// - GetKeyIndex() [Internal] +// - GetKeyName() +// - GetKeyChordName() [Internal] +// - CalcTypematicRepeatAmount() [Internal] +// - GetTypematicRepeatRate() [Internal] +// - GetKeyPressedAmount() [Internal] +// - GetKeyMagnitude2d() [Internal] +//----------------------------------------------------------------------------- +// - UpdateKeyRoutingTable() [Internal] +// - GetRoutingIdFromOwnerId() [Internal] +// - GetShortcutRoutingData() [Internal] +// - CalcRoutingScore() [Internal] +// - SetShortcutRouting() [Internal] +// - TestShortcutRouting() [Internal] +//----------------------------------------------------------------------------- +// - IsKeyDown() +// - IsKeyPressed() +// - IsKeyReleased() +//----------------------------------------------------------------------------- +// - IsMouseDown() +// - IsMouseClicked() +// - IsMouseReleased() +// - IsMouseDoubleClicked() +// - GetMouseClickedCount() +// - IsMouseHoveringRect() [Internal] +// - IsMouseDragPastThreshold() [Internal] +// - IsMouseDragging() +// - GetMousePos() +// - SetMousePos() [Internal] +// - GetMousePosOnOpeningCurrentPopup() +// - IsMousePosValid() +// - IsAnyMouseDown() +// - GetMouseDragDelta() +// - ResetMouseDragDelta() +// - GetMouseCursor() +// - SetMouseCursor() +//----------------------------------------------------------------------------- +// - UpdateAliasKey() +// - GetMergedModsFromKeys() +// - UpdateKeyboardInputs() +// - UpdateMouseInputs() +//----------------------------------------------------------------------------- +// - LockWheelingWindow [Internal] +// - FindBestWheelingWindow [Internal] +// - UpdateMouseWheel() [Internal] +//----------------------------------------------------------------------------- +// - SetNextFrameWantCaptureKeyboard() +// - SetNextFrameWantCaptureMouse() +//----------------------------------------------------------------------------- +// - GetInputSourceName() [Internal] +// - DebugPrintInputEvent() [Internal] +// - UpdateInputEvents() [Internal] +//----------------------------------------------------------------------------- +// - GetKeyOwner() [Internal] +// - TestKeyOwner() [Internal] +// - SetKeyOwner() [Internal] +// - SetItemKeyOwner() [Internal] +// - Shortcut() [Internal] +//----------------------------------------------------------------------------- + +static ImGuiKeyChord GetModForLRModKey(ImGuiKey key) +{ + if (key == ImGuiKey_LeftCtrl || key == ImGuiKey_RightCtrl) + return ImGuiMod_Ctrl; + if (key == ImGuiKey_LeftShift || key == ImGuiKey_RightShift) + return ImGuiMod_Shift; + if (key == ImGuiKey_LeftAlt || key == ImGuiKey_RightAlt) + return ImGuiMod_Alt; + if (key == ImGuiKey_LeftSuper || key == ImGuiKey_RightSuper) + return ImGuiMod_Super; + return ImGuiMod_None; +} + +ImGuiKeyChord ImGui::FixupKeyChord(ImGuiKeyChord key_chord) +{ + // Add ImGuiMod_XXXX when a corresponding ImGuiKey_LeftXXX/ImGuiKey_RightXXX is specified. + ImGuiKey key = (ImGuiKey)(key_chord & ~ImGuiMod_Mask_); + if (IsLRModKey(key)) + key_chord |= GetModForLRModKey(key); + return key_chord; +} + +ImGuiKeyData* ImGui::GetKeyData(ImGuiContext* ctx, ImGuiKey key) +{ + ImGuiContext& g = *ctx; + + // Special storage location for mods + if (key & ImGuiMod_Mask_) + key = ConvertSingleModFlagToKey(key); + + IM_ASSERT(IsNamedKey(key) && "Support for user key indices was dropped in favor of ImGuiKey. Please update backend & user code."); + return &g.IO.KeysData[key - ImGuiKey_NamedKey_BEGIN]; +} + +// Those names are provided for debugging purpose and are not meant to be saved persistently nor compared. +static const char* const GKeyNames[] = +{ + "Tab", "LeftArrow", "RightArrow", "UpArrow", "DownArrow", "PageUp", "PageDown", + "Home", "End", "Insert", "Delete", "Backspace", "Space", "Enter", "Escape", + "LeftCtrl", "LeftShift", "LeftAlt", "LeftSuper", "RightCtrl", "RightShift", "RightAlt", "RightSuper", "Menu", + "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", + "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", + "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", + "F13", "F14", "F15", "F16", "F17", "F18", "F19", "F20", "F21", "F22", "F23", "F24", + "Apostrophe", "Comma", "Minus", "Period", "Slash", "Semicolon", "Equal", "LeftBracket", + "Backslash", "RightBracket", "GraveAccent", "CapsLock", "ScrollLock", "NumLock", "PrintScreen", + "Pause", "Keypad0", "Keypad1", "Keypad2", "Keypad3", "Keypad4", "Keypad5", "Keypad6", + "Keypad7", "Keypad8", "Keypad9", "KeypadDecimal", "KeypadDivide", "KeypadMultiply", + "KeypadSubtract", "KeypadAdd", "KeypadEnter", "KeypadEqual", + "AppBack", "AppForward", "Oem102", + "GamepadStart", "GamepadBack", + "GamepadFaceLeft", "GamepadFaceRight", "GamepadFaceUp", "GamepadFaceDown", + "GamepadDpadLeft", "GamepadDpadRight", "GamepadDpadUp", "GamepadDpadDown", + "GamepadL1", "GamepadR1", "GamepadL2", "GamepadR2", "GamepadL3", "GamepadR3", + "GamepadLStickLeft", "GamepadLStickRight", "GamepadLStickUp", "GamepadLStickDown", + "GamepadRStickLeft", "GamepadRStickRight", "GamepadRStickUp", "GamepadRStickDown", + "MouseLeft", "MouseRight", "MouseMiddle", "MouseX1", "MouseX2", "MouseWheelX", "MouseWheelY", + "ModCtrl", "ModShift", "ModAlt", "ModSuper", // ReservedForModXXX are showing the ModXXX names. +}; +IM_STATIC_ASSERT(ImGuiKey_NamedKey_COUNT == IM_ARRAYSIZE(GKeyNames)); + +const char* ImGui::GetKeyName(ImGuiKey key) +{ + if (key == ImGuiKey_None) + return "None"; + IM_ASSERT(IsNamedKeyOrMod(key) && "Support for user key indices was dropped in favor of ImGuiKey. Please update backend and user code."); + if (key & ImGuiMod_Mask_) + key = ConvertSingleModFlagToKey(key); + if (!IsNamedKey(key)) + return "Unknown"; + + return GKeyNames[key - ImGuiKey_NamedKey_BEGIN]; +} + +// Return untranslated names: on macOS, Cmd key will show as Ctrl, Ctrl key will show as super. +// Lifetime of return value: valid until next call to same function. +const char* ImGui::GetKeyChordName(ImGuiKeyChord key_chord) +{ + ImGuiContext& g = *GImGui; + + const ImGuiKey key = (ImGuiKey)(key_chord & ~ImGuiMod_Mask_); + if (IsLRModKey(key)) + key_chord &= ~GetModForLRModKey(key); // Return "Ctrl+LeftShift" instead of "Ctrl+Shift+LeftShift" + ImFormatString(g.TempKeychordName, IM_ARRAYSIZE(g.TempKeychordName), "%s%s%s%s%s", + (key_chord & ImGuiMod_Ctrl) ? "Ctrl+" : "", + (key_chord & ImGuiMod_Shift) ? "Shift+" : "", + (key_chord & ImGuiMod_Alt) ? "Alt+" : "", + (key_chord & ImGuiMod_Super) ? "Super+" : "", + (key != ImGuiKey_None || key_chord == ImGuiKey_None) ? GetKeyName(key) : ""); + size_t len; + if (key == ImGuiKey_None && key_chord != 0) + if ((len = ImStrlen(g.TempKeychordName)) != 0) // Remove trailing '+' + g.TempKeychordName[len - 1] = 0; + return g.TempKeychordName; +} + +// t0 = previous time (e.g.: g.Time - g.IO.DeltaTime) +// t1 = current time (e.g.: g.Time) +// An event is triggered at: +// t = 0.0f t = repeat_delay, t = repeat_delay + repeat_rate*N +int ImGui::CalcTypematicRepeatAmount(float t0, float t1, float repeat_delay, float repeat_rate) +{ + if (t1 == 0.0f) + return 1; + if (t0 >= t1) + return 0; + if (repeat_rate <= 0.0f) + return (t0 < repeat_delay) && (t1 >= repeat_delay); + const int count_t0 = (t0 < repeat_delay) ? -1 : (int)((t0 - repeat_delay) / repeat_rate); + const int count_t1 = (t1 < repeat_delay) ? -1 : (int)((t1 - repeat_delay) / repeat_rate); + const int count = count_t1 - count_t0; + return count; +} + +void ImGui::GetTypematicRepeatRate(ImGuiInputFlags flags, float* repeat_delay, float* repeat_rate) +{ + ImGuiContext& g = *GImGui; + switch (flags & ImGuiInputFlags_RepeatRateMask_) + { + case ImGuiInputFlags_RepeatRateNavMove: *repeat_delay = g.IO.KeyRepeatDelay * 0.72f; *repeat_rate = g.IO.KeyRepeatRate * 0.80f; return; + case ImGuiInputFlags_RepeatRateNavTweak: *repeat_delay = g.IO.KeyRepeatDelay * 0.72f; *repeat_rate = g.IO.KeyRepeatRate * 0.30f; return; + case ImGuiInputFlags_RepeatRateDefault: default: *repeat_delay = g.IO.KeyRepeatDelay * 1.00f; *repeat_rate = g.IO.KeyRepeatRate * 1.00f; return; + } +} + +// Return value representing the number of presses in the last time period, for the given repeat rate +// (most often returns 0 or 1. The result is generally only >1 when RepeatRate is smaller than DeltaTime, aka large DeltaTime or fast RepeatRate) +int ImGui::GetKeyPressedAmount(ImGuiKey key, float repeat_delay, float repeat_rate) +{ + ImGuiContext& g = *GImGui; + const ImGuiKeyData* key_data = GetKeyData(key); + if (!key_data->Down) // In theory this should already be encoded as (DownDuration < 0.0f), but testing this facilitates eating mechanism (until we finish work on key ownership) + return 0; + const float t = key_data->DownDuration; + return CalcTypematicRepeatAmount(t - g.IO.DeltaTime, t, repeat_delay, repeat_rate); +} + +// Return 2D vector representing the combination of four cardinal direction, with analog value support (for e.g. ImGuiKey_GamepadLStick* values). +ImVec2 ImGui::GetKeyMagnitude2d(ImGuiKey key_left, ImGuiKey key_right, ImGuiKey key_up, ImGuiKey key_down) +{ + return ImVec2( + GetKeyData(key_right)->AnalogValue - GetKeyData(key_left)->AnalogValue, + GetKeyData(key_down)->AnalogValue - GetKeyData(key_up)->AnalogValue); +} + +// Rewrite routing data buffers to strip old entries + sort by key to make queries not touch scattered data. +// Entries D,A,B,B,A,C,B --> A,A,B,B,B,C,D +// Index A:1 B:2 C:5 D:0 --> A:0 B:2 C:5 D:6 +// See 'Metrics->Key Owners & Shortcut Routing' to visualize the result of that operation. +static void ImGui::UpdateKeyRoutingTable(ImGuiKeyRoutingTable* rt) +{ + ImGuiContext& g = *GImGui; + rt->EntriesNext.resize(0); + for (ImGuiKey key = ImGuiKey_NamedKey_BEGIN; key < ImGuiKey_NamedKey_END; key = (ImGuiKey)(key + 1)) + { + const int new_routing_start_idx = rt->EntriesNext.Size; + ImGuiKeyRoutingData* routing_entry; + for (int old_routing_idx = rt->Index[key - ImGuiKey_NamedKey_BEGIN]; old_routing_idx != -1; old_routing_idx = routing_entry->NextEntryIndex) + { + routing_entry = &rt->Entries[old_routing_idx]; + routing_entry->RoutingCurrScore = routing_entry->RoutingNextScore; + routing_entry->RoutingCurr = routing_entry->RoutingNext; // Update entry + routing_entry->RoutingNext = ImGuiKeyOwner_NoOwner; + routing_entry->RoutingNextScore = 255; + if (routing_entry->RoutingCurr == ImGuiKeyOwner_NoOwner) + continue; + rt->EntriesNext.push_back(*routing_entry); // Write alive ones into new buffer + + // Apply routing to owner if there's no owner already (RoutingCurr == None at this point) + // This is the result of previous frame's SetShortcutRouting() call. + if (routing_entry->Mods == g.IO.KeyMods) + { + ImGuiKeyOwnerData* owner_data = GetKeyOwnerData(&g, key); + if (owner_data->OwnerCurr == ImGuiKeyOwner_NoOwner) + { + owner_data->OwnerCurr = routing_entry->RoutingCurr; + //IMGUI_DEBUG_LOG("SetKeyOwner(%s, owner_id=0x%08X) via Routing\n", GetKeyName(key), routing_entry->RoutingCurr); + } + } + } + + // Rewrite linked-list + rt->Index[key - ImGuiKey_NamedKey_BEGIN] = (ImGuiKeyRoutingIndex)(new_routing_start_idx < rt->EntriesNext.Size ? new_routing_start_idx : -1); + for (int n = new_routing_start_idx; n < rt->EntriesNext.Size; n++) + rt->EntriesNext[n].NextEntryIndex = (ImGuiKeyRoutingIndex)((n + 1 < rt->EntriesNext.Size) ? n + 1 : -1); + } + rt->Entries.swap(rt->EntriesNext); // Swap new and old indexes +} + +// owner_id may be None/Any, but routing_id needs to be always be set, so we default to GetCurrentFocusScope(). +static inline ImGuiID GetRoutingIdFromOwnerId(ImGuiID owner_id) +{ + ImGuiContext& g = *GImGui; + return (owner_id != ImGuiKeyOwner_NoOwner && owner_id != ImGuiKeyOwner_Any) ? owner_id : g.CurrentFocusScopeId; +} + +ImGuiKeyRoutingData* ImGui::GetShortcutRoutingData(ImGuiKeyChord key_chord) +{ + // Majority of shortcuts will be Key + any number of Mods + // We accept _Single_ mod with ImGuiKey_None. + // - Shortcut(ImGuiKey_S | ImGuiMod_Ctrl); // Legal + // - Shortcut(ImGuiKey_S | ImGuiMod_Ctrl | ImGuiMod_Shift); // Legal + // - Shortcut(ImGuiMod_Ctrl); // Legal + // - Shortcut(ImGuiMod_Ctrl | ImGuiMod_Shift); // Not legal + ImGuiContext& g = *GImGui; + ImGuiKeyRoutingTable* rt = &g.KeysRoutingTable; + ImGuiKeyRoutingData* routing_data; + ImGuiKey key = (ImGuiKey)(key_chord & ~ImGuiMod_Mask_); + ImGuiKey mods = (ImGuiKey)(key_chord & ImGuiMod_Mask_); + if (key == ImGuiKey_None) + key = ConvertSingleModFlagToKey(mods); + IM_ASSERT(IsNamedKey(key)); + + // Get (in the majority of case, the linked list will have one element so this should be 2 reads. + // Subsequent elements will be contiguous in memory as list is sorted/rebuilt in NewFrame). + for (ImGuiKeyRoutingIndex idx = rt->Index[key - ImGuiKey_NamedKey_BEGIN]; idx != -1; idx = routing_data->NextEntryIndex) + { + routing_data = &rt->Entries[idx]; + if (routing_data->Mods == mods) + return routing_data; + } + + // Add to linked-list + ImGuiKeyRoutingIndex routing_data_idx = (ImGuiKeyRoutingIndex)rt->Entries.Size; + rt->Entries.push_back(ImGuiKeyRoutingData()); + routing_data = &rt->Entries[routing_data_idx]; + routing_data->Mods = (ImU16)mods; + routing_data->NextEntryIndex = rt->Index[key - ImGuiKey_NamedKey_BEGIN]; // Setup linked list + rt->Index[key - ImGuiKey_NamedKey_BEGIN] = routing_data_idx; + return routing_data; +} + +// Current score encoding (lower is highest priority): +// - 0: ImGuiInputFlags_RouteGlobal | ImGuiInputFlags_RouteOverActive +// - 1: ImGuiInputFlags_ActiveItem or ImGuiInputFlags_RouteFocused (if item active) +// - 2: ImGuiInputFlags_RouteGlobal | ImGuiInputFlags_RouteOverFocused +// - 3+: ImGuiInputFlags_RouteFocused (if window in focus-stack) +// - 254: ImGuiInputFlags_RouteGlobal +// - 255: never route +// 'flags' should include an explicit routing policy +static int CalcRoutingScore(ImGuiID focus_scope_id, ImGuiID owner_id, ImGuiInputFlags flags) +{ + ImGuiContext& g = *GImGui; + if (flags & ImGuiInputFlags_RouteFocused) + { + // ActiveID gets top priority + // (we don't check g.ActiveIdUsingAllKeys here. Routing is applied but if input ownership is tested later it may discard it) + if (owner_id != 0 && g.ActiveId == owner_id) + return 1; + + // Score based on distance to focused window (lower is better) + // Assuming both windows are submitting a routing request, + // - When Window....... is focused -> Window scores 3 (best), Window/ChildB scores 255 (no match) + // - When Window/ChildB is focused -> Window scores 4, Window/ChildB scores 3 (best) + // Assuming only WindowA is submitting a routing request, + // - When Window/ChildB is focused -> Window scores 4 (best), Window/ChildB doesn't have a score. + // This essentially follow the window->ParentWindowForFocusRoute chain. + if (focus_scope_id == 0) + return 255; + for (int index_in_focus_path = 0; index_in_focus_path < g.NavFocusRoute.Size; index_in_focus_path++) + if (g.NavFocusRoute.Data[index_in_focus_path].ID == focus_scope_id) + return 3 + index_in_focus_path; + return 255; + } + else if (flags & ImGuiInputFlags_RouteActive) + { + if (owner_id != 0 && g.ActiveId == owner_id) + return 1; + return 255; + } + else if (flags & ImGuiInputFlags_RouteGlobal) + { + if (flags & ImGuiInputFlags_RouteOverActive) + return 0; + if (flags & ImGuiInputFlags_RouteOverFocused) + return 2; + return 254; + } + IM_ASSERT(0); + return 0; +} + +// - We need this to filter some Shortcut() routes when an item e.g. an InputText() is active +// e.g. ImGuiKey_G won't be considered a shortcut when item is active, but ImGuiMod|ImGuiKey_G can be. +// - This is also used by UpdateInputEvents() to avoid trickling in the most common case of e.g. pressing ImGuiKey_G also emitting a G character. +static bool IsKeyChordPotentiallyCharInput(ImGuiKeyChord key_chord) +{ + // Mimic 'ignore_char_inputs' logic in InputText() + ImGuiContext& g = *GImGui; + + // When the right mods are pressed it cannot be a char input so we won't filter the shortcut out. + ImGuiKey mods = (ImGuiKey)(key_chord & ImGuiMod_Mask_); + const bool ignore_char_inputs = ((mods & ImGuiMod_Ctrl) && !(mods & ImGuiMod_Alt)) || (g.IO.ConfigMacOSXBehaviors && (mods & ImGuiMod_Ctrl)); + if (ignore_char_inputs) + return false; + + // Return true for A-Z, 0-9 and other keys associated to char inputs. Other keys such as F1-F12 won't be filtered. + ImGuiKey key = (ImGuiKey)(key_chord & ~ImGuiMod_Mask_); + if (key == ImGuiKey_None) + return false; + return g.KeysMayBeCharInput.TestBit(key); +} + +// Request a desired route for an input chord (key + mods). +// Return true if the route is available this frame. +// - Routes and key ownership are attributed at the beginning of next frame based on best score and mod state. +// (Conceptually this does a "Submit for next frame" + "Test for current frame". +// As such, it could be called TrySetXXX or SubmitXXX, or the Submit and Test operations should be separate.) +bool ImGui::SetShortcutRouting(ImGuiKeyChord key_chord, ImGuiInputFlags flags, ImGuiID owner_id) +{ + ImGuiContext& g = *GImGui; + if ((flags & ImGuiInputFlags_RouteTypeMask_) == 0) + flags |= ImGuiInputFlags_RouteGlobal | ImGuiInputFlags_RouteOverFocused | ImGuiInputFlags_RouteOverActive; // IMPORTANT: This is the default for SetShortcutRouting() but NOT Shortcut() + else + IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiInputFlags_RouteTypeMask_)); // Check that only 1 routing flag is used + IM_ASSERT(owner_id != ImGuiKeyOwner_Any && owner_id != ImGuiKeyOwner_NoOwner); + if (flags & (ImGuiInputFlags_RouteOverFocused | ImGuiInputFlags_RouteOverActive | ImGuiInputFlags_RouteUnlessBgFocused)) + IM_ASSERT(flags & ImGuiInputFlags_RouteGlobal); + + // Add ImGuiMod_XXXX when a corresponding ImGuiKey_LeftXXX/ImGuiKey_RightXXX is specified. + key_chord = FixupKeyChord(key_chord); + + // [DEBUG] Debug break requested by user + if (g.DebugBreakInShortcutRouting == key_chord) + IM_DEBUG_BREAK(); + + if (flags & ImGuiInputFlags_RouteUnlessBgFocused) + if (g.NavWindow == NULL) + return false; + + // Note how ImGuiInputFlags_RouteAlways won't set routing and thus won't set owner. May want to rework this? + if (flags & ImGuiInputFlags_RouteAlways) + { + IMGUI_DEBUG_LOG_INPUTROUTING("SetShortcutRouting(%s, flags=%04X, owner_id=0x%08X) -> always, no register\n", GetKeyChordName(key_chord), flags, owner_id); + return true; + } + + // Specific culling when there's an active item. + if (g.ActiveId != 0 && g.ActiveId != owner_id) + { + if (flags & ImGuiInputFlags_RouteActive) + return false; + + // Cull shortcuts with no modifiers when it could generate a character. + // e.g. Shortcut(ImGuiKey_G) also generates 'g' character, should not trigger when InputText() is active. + // but Shortcut(Ctrl+G) should generally trigger when InputText() is active. + // TL;DR: lettered shortcut with no mods or with only Alt mod will not trigger while an item reading text input is active. + // (We cannot filter based on io.InputQueueCharacters[] contents because of trickling and key<>chars submission order are undefined) + if (g.IO.WantTextInput && IsKeyChordPotentiallyCharInput(key_chord)) + { + IMGUI_DEBUG_LOG_INPUTROUTING("SetShortcutRouting(%s, flags=%04X, owner_id=0x%08X) -> filtered as potential char input\n", GetKeyChordName(key_chord), flags, owner_id); + return false; + } + + // ActiveIdUsingAllKeyboardKeys trumps all for ActiveId + if ((flags & ImGuiInputFlags_RouteOverActive) == 0 && g.ActiveIdUsingAllKeyboardKeys) + { + ImGuiKey key = (ImGuiKey)(key_chord & ~ImGuiMod_Mask_); + if (key == ImGuiKey_None) + key = ConvertSingleModFlagToKey((ImGuiKey)(key_chord & ImGuiMod_Mask_)); + if (key >= ImGuiKey_Keyboard_BEGIN && key < ImGuiKey_Keyboard_END) + return false; + } + } + + // Where do we evaluate route for? + ImGuiID focus_scope_id = g.CurrentFocusScopeId; + if (flags & ImGuiInputFlags_RouteFromRootWindow) + focus_scope_id = g.CurrentWindow->RootWindow->ID; // See PushFocusScope() call in Begin() + + const int score = CalcRoutingScore(focus_scope_id, owner_id, flags); + IMGUI_DEBUG_LOG_INPUTROUTING("SetShortcutRouting(%s, flags=%04X, owner_id=0x%08X) -> score %d\n", GetKeyChordName(key_chord), flags, owner_id, score); + if (score == 255) + return false; + + // Submit routing for NEXT frame (assuming score is sufficient) + // FIXME: Could expose a way to use a "serve last" policy for same score resolution (using <= instead of <). + ImGuiKeyRoutingData* routing_data = GetShortcutRoutingData(key_chord); + //const bool set_route = (flags & ImGuiInputFlags_ServeLast) ? (score <= routing_data->RoutingNextScore) : (score < routing_data->RoutingNextScore); + if (score < routing_data->RoutingNextScore) + { + routing_data->RoutingNext = owner_id; + routing_data->RoutingNextScore = (ImU8)score; + } + + // Return routing state for CURRENT frame + if (routing_data->RoutingCurr == owner_id) + IMGUI_DEBUG_LOG_INPUTROUTING("--> granting current route\n"); + return routing_data->RoutingCurr == owner_id; +} + +// Currently unused by core (but used by tests) +// Note: this cannot be turned into GetShortcutRouting() because we do the owner_id->routing_id translation, name would be more misleading. +bool ImGui::TestShortcutRouting(ImGuiKeyChord key_chord, ImGuiID owner_id) +{ + const ImGuiID routing_id = GetRoutingIdFromOwnerId(owner_id); + key_chord = FixupKeyChord(key_chord); + ImGuiKeyRoutingData* routing_data = GetShortcutRoutingData(key_chord); // FIXME: Could avoid creating entry. + return routing_data->RoutingCurr == routing_id; +} + +// Note that Dear ImGui doesn't know the meaning/semantic of ImGuiKey from 0..511: they are legacy native keycodes. +// Consider transitioning from 'IsKeyDown(MY_ENGINE_KEY_A)' (<1.87) to IsKeyDown(ImGuiKey_A) (>= 1.87) +bool ImGui::IsKeyDown(ImGuiKey key) +{ + return IsKeyDown(key, ImGuiKeyOwner_Any); +} + +bool ImGui::IsKeyDown(ImGuiKey key, ImGuiID owner_id) +{ + const ImGuiKeyData* key_data = GetKeyData(key); + if (!key_data->Down) + return false; + if (!TestKeyOwner(key, owner_id)) + return false; + return true; +} + +bool ImGui::IsKeyPressed(ImGuiKey key, bool repeat) +{ + return IsKeyPressed(key, repeat ? ImGuiInputFlags_Repeat : ImGuiInputFlags_None, ImGuiKeyOwner_Any); +} + +// Important: unlike legacy IsKeyPressed(ImGuiKey, bool repeat=true) which DEFAULT to repeat, this requires EXPLICIT repeat. +bool ImGui::IsKeyPressed(ImGuiKey key, ImGuiInputFlags flags, ImGuiID owner_id) +{ + const ImGuiKeyData* key_data = GetKeyData(key); + if (!key_data->Down) // In theory this should already be encoded as (DownDuration < 0.0f), but testing this facilitates eating mechanism (until we finish work on key ownership) + return false; + const float t = key_data->DownDuration; + if (t < 0.0f) + return false; + IM_ASSERT((flags & ~ImGuiInputFlags_SupportedByIsKeyPressed) == 0); // Passing flags not supported by this function! + if (flags & (ImGuiInputFlags_RepeatRateMask_ | ImGuiInputFlags_RepeatUntilMask_)) // Setting any _RepeatXXX option enables _Repeat + flags |= ImGuiInputFlags_Repeat; + + bool pressed = (t == 0.0f); + if (!pressed && (flags & ImGuiInputFlags_Repeat) != 0) + { + float repeat_delay, repeat_rate; + GetTypematicRepeatRate(flags, &repeat_delay, &repeat_rate); + pressed = (t > repeat_delay) && GetKeyPressedAmount(key, repeat_delay, repeat_rate) > 0; + if (pressed && (flags & ImGuiInputFlags_RepeatUntilMask_)) + { + // Slightly bias 'key_pressed_time' as DownDuration is an accumulation of DeltaTime which we compare to an absolute time value. + // Ideally we'd replace DownDuration with KeyPressedTime but it would break user's code. + ImGuiContext& g = *GImGui; + double key_pressed_time = g.Time - t + 0.00001f; + if ((flags & ImGuiInputFlags_RepeatUntilKeyModsChange) && (g.LastKeyModsChangeTime > key_pressed_time)) + pressed = false; + if ((flags & ImGuiInputFlags_RepeatUntilKeyModsChangeFromNone) && (g.LastKeyModsChangeFromNoneTime > key_pressed_time)) + pressed = false; + if ((flags & ImGuiInputFlags_RepeatUntilOtherKeyPress) && (g.LastKeyboardKeyPressTime > key_pressed_time)) + pressed = false; + } + } + if (!pressed) + return false; + if (!TestKeyOwner(key, owner_id)) + return false; + return true; +} + +bool ImGui::IsKeyReleased(ImGuiKey key) +{ + return IsKeyReleased(key, ImGuiKeyOwner_Any); +} + +bool ImGui::IsKeyReleased(ImGuiKey key, ImGuiID owner_id) +{ + const ImGuiKeyData* key_data = GetKeyData(key); + if (key_data->DownDurationPrev < 0.0f || key_data->Down) + return false; + if (!TestKeyOwner(key, owner_id)) + return false; + return true; +} + +bool ImGui::IsMouseDown(ImGuiMouseButton button) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown)); + return g.IO.MouseDown[button] && TestKeyOwner(MouseButtonToKey(button), ImGuiKeyOwner_Any); // should be same as IsKeyDown(MouseButtonToKey(button), ImGuiKeyOwner_Any), but this allows legacy code hijacking the io.Mousedown[] array. +} + +bool ImGui::IsMouseDown(ImGuiMouseButton button, ImGuiID owner_id) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown)); + return g.IO.MouseDown[button] && TestKeyOwner(MouseButtonToKey(button), owner_id); // Should be same as IsKeyDown(MouseButtonToKey(button), owner_id), but this allows legacy code hijacking the io.Mousedown[] array. +} + +bool ImGui::IsMouseClicked(ImGuiMouseButton button, bool repeat) +{ + return IsMouseClicked(button, repeat ? ImGuiInputFlags_Repeat : ImGuiInputFlags_None, ImGuiKeyOwner_Any); +} + +bool ImGui::IsMouseClicked(ImGuiMouseButton button, ImGuiInputFlags flags, ImGuiID owner_id) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown)); + if (!g.IO.MouseDown[button]) // In theory this should already be encoded as (DownDuration < 0.0f), but testing this facilitates eating mechanism (until we finish work on key ownership) + return false; + const float t = g.IO.MouseDownDuration[button]; + if (t < 0.0f) + return false; + IM_ASSERT((flags & ~ImGuiInputFlags_SupportedByIsMouseClicked) == 0); // Passing flags not supported by this function! // FIXME: Could support RepeatRate and RepeatUntil flags here. + + const bool repeat = (flags & ImGuiInputFlags_Repeat) != 0; + const bool pressed = (t == 0.0f) || (repeat && t > g.IO.KeyRepeatDelay && CalcTypematicRepeatAmount(t - g.IO.DeltaTime, t, g.IO.KeyRepeatDelay, g.IO.KeyRepeatRate) > 0); + if (!pressed) + return false; + + if (!TestKeyOwner(MouseButtonToKey(button), owner_id)) + return false; + + return true; +} + +bool ImGui::IsMouseReleased(ImGuiMouseButton button) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown)); + return g.IO.MouseReleased[button] && TestKeyOwner(MouseButtonToKey(button), ImGuiKeyOwner_Any); // Should be same as IsKeyReleased(MouseButtonToKey(button), ImGuiKeyOwner_Any) +} + +bool ImGui::IsMouseReleased(ImGuiMouseButton button, ImGuiID owner_id) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown)); + return g.IO.MouseReleased[button] && TestKeyOwner(MouseButtonToKey(button), owner_id); // Should be same as IsKeyReleased(MouseButtonToKey(button), owner_id) +} + +// Use if you absolutely need to distinguish single-click from double-click by introducing a delay. +// Generally use with 'delay >= io.MouseDoubleClickTime' + combined with a 'io.MouseClickedLastCount == 1' test. +// This is a very rarely used UI idiom, but some apps use this: e.g. MS Explorer single click on an icon to rename. +bool ImGui::IsMouseReleasedWithDelay(ImGuiMouseButton button, float delay) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown)); + const float time_since_release = (float)(g.Time - g.IO.MouseReleasedTime[button]); + return !IsMouseDown(button) && (time_since_release - g.IO.DeltaTime < delay) && (time_since_release >= delay); +} + +bool ImGui::IsMouseDoubleClicked(ImGuiMouseButton button) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown)); + return g.IO.MouseClickedCount[button] == 2 && TestKeyOwner(MouseButtonToKey(button), ImGuiKeyOwner_Any); +} + +bool ImGui::IsMouseDoubleClicked(ImGuiMouseButton button, ImGuiID owner_id) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown)); + return g.IO.MouseClickedCount[button] == 2 && TestKeyOwner(MouseButtonToKey(button), owner_id); +} + +int ImGui::GetMouseClickedCount(ImGuiMouseButton button) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown)); + return g.IO.MouseClickedCount[button]; +} + +// Test if mouse cursor is hovering given rectangle +// NB- Rectangle is clipped by our current clip setting +// NB- Expand the rectangle to be generous on imprecise inputs systems (g.Style.TouchExtraPadding) +bool ImGui::IsMouseHoveringRect(const ImVec2& r_min, const ImVec2& r_max, bool clip) +{ + ImGuiContext& g = *GImGui; + + // Clip + ImRect rect_clipped(r_min, r_max); + if (clip) + rect_clipped.ClipWith(g.CurrentWindow->ClipRect); + + // Hit testing, expanded for touch input + if (!rect_clipped.ContainsWithPad(g.IO.MousePos, g.Style.TouchExtraPadding)) + return false; + if (!g.MouseViewport->GetMainRect().Overlaps(rect_clipped)) + return false; + return true; +} + +// Return if a mouse click/drag went past the given threshold. Valid to call during the MouseReleased frame. +// [Internal] This doesn't test if the button is pressed +bool ImGui::IsMouseDragPastThreshold(ImGuiMouseButton button, float lock_threshold) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown)); + if (lock_threshold < 0.0f) + lock_threshold = g.IO.MouseDragThreshold; + return g.IO.MouseDragMaxDistanceSqr[button] >= lock_threshold * lock_threshold; +} + +bool ImGui::IsMouseDragging(ImGuiMouseButton button, float lock_threshold) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown)); + if (!g.IO.MouseDown[button]) + return false; + return IsMouseDragPastThreshold(button, lock_threshold); +} + +ImVec2 ImGui::GetMousePos() +{ + ImGuiContext& g = *GImGui; + return g.IO.MousePos; +} + +// This is called TeleportMousePos() and not SetMousePos() to emphasis that setting MousePosPrev will effectively clear mouse delta as well. +// It is expected you only call this if (io.BackendFlags & ImGuiBackendFlags_HasSetMousePos) is set and supported by backend. +void ImGui::TeleportMousePos(const ImVec2& pos) +{ + ImGuiContext& g = *GImGui; + g.IO.MousePos = g.IO.MousePosPrev = pos; + g.IO.MouseDelta = ImVec2(0.0f, 0.0f); + g.IO.WantSetMousePos = true; + //IMGUI_DEBUG_LOG_IO("TeleportMousePos: (%.1f,%.1f)\n", io.MousePos.x, io.MousePos.y); +} + +// NB: prefer to call right after BeginPopup(). At the time Selectable/MenuItem is activated, the popup is already closed! +ImVec2 ImGui::GetMousePosOnOpeningCurrentPopup() +{ + ImGuiContext& g = *GImGui; + if (g.BeginPopupStack.Size > 0) + return g.OpenPopupStack[g.BeginPopupStack.Size - 1].OpenMousePos; + return g.IO.MousePos; +} + +// We typically use ImVec2(-FLT_MAX,-FLT_MAX) to denote an invalid mouse position. +bool ImGui::IsMousePosValid(const ImVec2* mouse_pos) +{ + // The assert is only to silence a false-positive in XCode Static Analysis. + // Because GImGui is not dereferenced in every code path, the static analyzer assume that it may be NULL (which it doesn't for other functions). + IM_ASSERT(GImGui != NULL); + const float MOUSE_INVALID = -256000.0f; + ImVec2 p = mouse_pos ? *mouse_pos : GImGui->IO.MousePos; + return p.x >= MOUSE_INVALID && p.y >= MOUSE_INVALID; +} + +// [WILL OBSOLETE] This was designed for backends, but prefer having backend maintain a mask of held mouse buttons, because upcoming input queue system will make this invalid. +bool ImGui::IsAnyMouseDown() +{ + ImGuiContext& g = *GImGui; + for (int n = 0; n < IM_ARRAYSIZE(g.IO.MouseDown); n++) + if (g.IO.MouseDown[n]) + return true; + return false; +} + +// Return the delta from the initial clicking position while the mouse button is clicked or was just released. +// This is locked and return 0.0f until the mouse moves past a distance threshold at least once. +// NB: This is only valid if IsMousePosValid(). backends in theory should always keep mouse position valid when dragging even outside the client window. +ImVec2 ImGui::GetMouseDragDelta(ImGuiMouseButton button, float lock_threshold) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown)); + if (lock_threshold < 0.0f) + lock_threshold = g.IO.MouseDragThreshold; + if (g.IO.MouseDown[button] || g.IO.MouseReleased[button]) + if (g.IO.MouseDragMaxDistanceSqr[button] >= lock_threshold * lock_threshold) + if (IsMousePosValid(&g.IO.MousePos) && IsMousePosValid(&g.IO.MouseClickedPos[button])) + return g.IO.MousePos - g.IO.MouseClickedPos[button]; + return ImVec2(0.0f, 0.0f); +} + +void ImGui::ResetMouseDragDelta(ImGuiMouseButton button) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown)); + // NB: We don't need to reset g.IO.MouseDragMaxDistanceSqr + g.IO.MouseClickedPos[button] = g.IO.MousePos; +} + +// Get desired mouse cursor shape. +// Important: this is meant to be used by a platform backend, it is reset in ImGui::NewFrame(), +// updated during the frame, and locked in EndFrame()/Render(). +// If you use software rendering by setting io.MouseDrawCursor then Dear ImGui will render those for you +ImGuiMouseCursor ImGui::GetMouseCursor() +{ + ImGuiContext& g = *GImGui; + return g.MouseCursor; +} + +// We intentionally accept values of ImGuiMouseCursor that are outside our bounds, in case users needs to hack-in a custom cursor value. +// Custom cursors may be handled by custom backends. If you are using a standard backend and want to hack in a custom cursor, you may +// handle it before the backend _NewFrame() call and temporarily set ImGuiConfigFlags_NoMouseCursorChange during the backend _NewFrame() call. +void ImGui::SetMouseCursor(ImGuiMouseCursor cursor_type) +{ + ImGuiContext& g = *GImGui; + g.MouseCursor = cursor_type; +} + +static void UpdateAliasKey(ImGuiKey key, bool v, float analog_value) +{ + IM_ASSERT(ImGui::IsAliasKey(key)); + ImGuiKeyData* key_data = ImGui::GetKeyData(key); + key_data->Down = v; + key_data->AnalogValue = analog_value; +} + +// [Internal] Do not use directly +static ImGuiKeyChord GetMergedModsFromKeys() +{ + ImGuiKeyChord mods = 0; + if (ImGui::IsKeyDown(ImGuiMod_Ctrl)) { mods |= ImGuiMod_Ctrl; } + if (ImGui::IsKeyDown(ImGuiMod_Shift)) { mods |= ImGuiMod_Shift; } + if (ImGui::IsKeyDown(ImGuiMod_Alt)) { mods |= ImGuiMod_Alt; } + if (ImGui::IsKeyDown(ImGuiMod_Super)) { mods |= ImGuiMod_Super; } + return mods; +} + +static void ImGui::UpdateKeyboardInputs() +{ + ImGuiContext& g = *GImGui; + ImGuiIO& io = g.IO; + + if (io.ConfigFlags & ImGuiConfigFlags_NoKeyboard) + io.ClearInputKeys(); + + // Update aliases + for (int n = 0; n < ImGuiMouseButton_COUNT; n++) + UpdateAliasKey(MouseButtonToKey(n), io.MouseDown[n], io.MouseDown[n] ? 1.0f : 0.0f); + UpdateAliasKey(ImGuiKey_MouseWheelX, io.MouseWheelH != 0.0f, io.MouseWheelH); + UpdateAliasKey(ImGuiKey_MouseWheelY, io.MouseWheel != 0.0f, io.MouseWheel); + + // Synchronize io.KeyMods and io.KeyCtrl/io.KeyShift/etc. values. + // - New backends (1.87+): send io.AddKeyEvent(ImGuiMod_XXX) -> -> (here) deriving io.KeyMods + io.KeyXXX from key array. + // - Legacy backends: set io.KeyXXX bools -> (above) set key array from io.KeyXXX -> (here) deriving io.KeyMods + io.KeyXXX from key array. + // So with legacy backends the 4 values will do a unnecessary back-and-forth but it makes the code simpler and future facing. + const ImGuiKeyChord prev_key_mods = io.KeyMods; + io.KeyMods = GetMergedModsFromKeys(); + io.KeyCtrl = (io.KeyMods & ImGuiMod_Ctrl) != 0; + io.KeyShift = (io.KeyMods & ImGuiMod_Shift) != 0; + io.KeyAlt = (io.KeyMods & ImGuiMod_Alt) != 0; + io.KeySuper = (io.KeyMods & ImGuiMod_Super) != 0; + if (prev_key_mods != io.KeyMods) + g.LastKeyModsChangeTime = g.Time; + if (prev_key_mods != io.KeyMods && prev_key_mods == 0) + g.LastKeyModsChangeFromNoneTime = g.Time; + + // Clear gamepad data if disabled + if ((io.BackendFlags & ImGuiBackendFlags_HasGamepad) == 0) + for (int key = ImGuiKey_Gamepad_BEGIN; key < ImGuiKey_Gamepad_END; key++) + { + io.KeysData[key - ImGuiKey_NamedKey_BEGIN].Down = false; + io.KeysData[key - ImGuiKey_NamedKey_BEGIN].AnalogValue = 0.0f; + } + + // Update keys + for (int key = ImGuiKey_NamedKey_BEGIN; key < ImGuiKey_NamedKey_END; key++) + { + ImGuiKeyData* key_data = &io.KeysData[key - ImGuiKey_NamedKey_BEGIN]; + key_data->DownDurationPrev = key_data->DownDuration; + key_data->DownDuration = key_data->Down ? (key_data->DownDuration < 0.0f ? 0.0f : key_data->DownDuration + io.DeltaTime) : -1.0f; + if (key_data->DownDuration == 0.0f) + { + if (IsKeyboardKey((ImGuiKey)key)) + g.LastKeyboardKeyPressTime = g.Time; + else if (key == ImGuiKey_ReservedForModCtrl || key == ImGuiKey_ReservedForModShift || key == ImGuiKey_ReservedForModAlt || key == ImGuiKey_ReservedForModSuper) + g.LastKeyboardKeyPressTime = g.Time; + } + } + + // Update keys/input owner (named keys only): one entry per key + for (ImGuiKey key = ImGuiKey_NamedKey_BEGIN; key < ImGuiKey_NamedKey_END; key = (ImGuiKey)(key + 1)) + { + ImGuiKeyData* key_data = &io.KeysData[key - ImGuiKey_NamedKey_BEGIN]; + ImGuiKeyOwnerData* owner_data = &g.KeysOwnerData[key - ImGuiKey_NamedKey_BEGIN]; + owner_data->OwnerCurr = owner_data->OwnerNext; + if (!key_data->Down) // Important: ownership is released on the frame after a release. Ensure a 'MouseDown -> CloseWindow -> MouseUp' chain doesn't lead to someone else seeing the MouseUp. + owner_data->OwnerNext = ImGuiKeyOwner_NoOwner; + owner_data->LockThisFrame = owner_data->LockUntilRelease = owner_data->LockUntilRelease && key_data->Down; // Clear LockUntilRelease when key is not Down anymore + } + + // Update key routing (for e.g. shortcuts) + UpdateKeyRoutingTable(&g.KeysRoutingTable); +} + +static void ImGui::UpdateMouseInputs() +{ + ImGuiContext& g = *GImGui; + ImGuiIO& io = g.IO; + + // Mouse Wheel swapping flag + // As a standard behavior holding SHIFT while using Vertical Mouse Wheel triggers Horizontal scroll instead + // - We avoid doing it on OSX as it the OS input layer handles this already. + // - FIXME: However this means when running on OSX over Emscripten, Shift+WheelY will incur two swapping (1 in OS, 1 here), canceling the feature. + // - FIXME: When we can distinguish e.g. touchpad scroll events from mouse ones, we'll set this accordingly based on input source. + io.MouseWheelRequestAxisSwap = io.KeyShift && !io.ConfigMacOSXBehaviors; + + // Round mouse position to avoid spreading non-rounded position (e.g. UpdateManualResize doesn't support them well) + if (IsMousePosValid(&io.MousePos)) + io.MousePos = g.MouseLastValidPos = ImFloor(io.MousePos); + + // If mouse just appeared or disappeared (usually denoted by -FLT_MAX components) we cancel out movement in MouseDelta + if (IsMousePosValid(&io.MousePos) && IsMousePosValid(&io.MousePosPrev)) + io.MouseDelta = io.MousePos - io.MousePosPrev; + else + io.MouseDelta = ImVec2(0.0f, 0.0f); + + // Update stationary timer. + // FIXME: May need to rework again to have some tolerance for occasional small movement, while being functional on high-framerates. + const float mouse_stationary_threshold = (io.MouseSource == ImGuiMouseSource_Mouse) ? 2.0f : 3.0f; // Slightly higher threshold for ImGuiMouseSource_TouchScreen/ImGuiMouseSource_Pen, may need rework. + const bool mouse_stationary = (ImLengthSqr(io.MouseDelta) <= mouse_stationary_threshold * mouse_stationary_threshold); + g.MouseStationaryTimer = mouse_stationary ? (g.MouseStationaryTimer + io.DeltaTime) : 0.0f; + //IMGUI_DEBUG_LOG("%.4f\n", g.MouseStationaryTimer); + + // If mouse moved we re-enable mouse hovering in case it was disabled by keyboard/gamepad. In theory should use a >0.0f threshold but would need to reset in everywhere we set this to true. + if (io.MouseDelta.x != 0.0f || io.MouseDelta.y != 0.0f) + g.NavHighlightItemUnderNav = false; + + for (int i = 0; i < IM_ARRAYSIZE(io.MouseDown); i++) + { + io.MouseClicked[i] = io.MouseDown[i] && io.MouseDownDuration[i] < 0.0f; + io.MouseClickedCount[i] = 0; // Will be filled below + io.MouseReleased[i] = !io.MouseDown[i] && io.MouseDownDuration[i] >= 0.0f; + if (io.MouseReleased[i]) + io.MouseReleasedTime[i] = g.Time; + io.MouseDownDurationPrev[i] = io.MouseDownDuration[i]; + io.MouseDownDuration[i] = io.MouseDown[i] ? (io.MouseDownDuration[i] < 0.0f ? 0.0f : io.MouseDownDuration[i] + io.DeltaTime) : -1.0f; + if (io.MouseClicked[i]) + { + bool is_repeated_click = false; + if ((float)(g.Time - io.MouseClickedTime[i]) < io.MouseDoubleClickTime) + { + ImVec2 delta_from_click_pos = IsMousePosValid(&io.MousePos) ? (io.MousePos - io.MouseClickedPos[i]) : ImVec2(0.0f, 0.0f); + if (ImLengthSqr(delta_from_click_pos) < io.MouseDoubleClickMaxDist * io.MouseDoubleClickMaxDist) + is_repeated_click = true; + } + if (is_repeated_click) + io.MouseClickedLastCount[i]++; + else + io.MouseClickedLastCount[i] = 1; + io.MouseClickedTime[i] = g.Time; + io.MouseClickedPos[i] = io.MousePos; + io.MouseClickedCount[i] = io.MouseClickedLastCount[i]; + io.MouseDragMaxDistanceAbs[i] = ImVec2(0.0f, 0.0f); + io.MouseDragMaxDistanceSqr[i] = 0.0f; + } + else if (io.MouseDown[i]) + { + // Maintain the maximum distance we reaching from the initial click position, which is used with dragging threshold + ImVec2 delta_from_click_pos = IsMousePosValid(&io.MousePos) ? (io.MousePos - io.MouseClickedPos[i]) : ImVec2(0.0f, 0.0f); + io.MouseDragMaxDistanceSqr[i] = ImMax(io.MouseDragMaxDistanceSqr[i], ImLengthSqr(delta_from_click_pos)); + io.MouseDragMaxDistanceAbs[i].x = ImMax(io.MouseDragMaxDistanceAbs[i].x, delta_from_click_pos.x < 0.0f ? -delta_from_click_pos.x : delta_from_click_pos.x); + io.MouseDragMaxDistanceAbs[i].y = ImMax(io.MouseDragMaxDistanceAbs[i].y, delta_from_click_pos.y < 0.0f ? -delta_from_click_pos.y : delta_from_click_pos.y); + } + + // We provide io.MouseDoubleClicked[] as a legacy service + io.MouseDoubleClicked[i] = (io.MouseClickedCount[i] == 2); + + // Clicking any mouse button reactivate mouse hovering which may have been deactivated by keyboard/gamepad navigation + if (io.MouseClicked[i]) + g.NavHighlightItemUnderNav = false; + } +} + +static void LockWheelingWindow(ImGuiWindow* window, float wheel_amount) +{ + ImGuiContext& g = *GImGui; + if (window) + g.WheelingWindowReleaseTimer = ImMin(g.WheelingWindowReleaseTimer + ImAbs(wheel_amount) * WINDOWS_MOUSE_WHEEL_SCROLL_LOCK_TIMER, WINDOWS_MOUSE_WHEEL_SCROLL_LOCK_TIMER); + else + g.WheelingWindowReleaseTimer = 0.0f; + if (g.WheelingWindow == window) + return; + IMGUI_DEBUG_LOG_IO("[io] LockWheelingWindow() \"%s\"\n", window ? window->Name : "NULL"); + g.WheelingWindow = window; + g.WheelingWindowRefMousePos = g.IO.MousePos; + if (window == NULL) + { + g.WheelingWindowStartFrame = -1; + g.WheelingAxisAvg = ImVec2(0.0f, 0.0f); + } +} + +static ImGuiWindow* FindBestWheelingWindow(const ImVec2& wheel) +{ + // For each axis, find window in the hierarchy that may want to use scrolling + ImGuiContext& g = *GImGui; + ImGuiWindow* windows[2] = { NULL, NULL }; + for (int axis = 0; axis < 2; axis++) + if (wheel[axis] != 0.0f) + for (ImGuiWindow* window = windows[axis] = g.HoveredWindow; window->Flags & ImGuiWindowFlags_ChildWindow; window = windows[axis] = window->ParentWindow) + { + // Bubble up into parent window if: + // - a child window doesn't allow any scrolling. + // - a child window has the ImGuiWindowFlags_NoScrollWithMouse flag. + //// - a child window doesn't need scrolling because it is already at the edge for the direction we are going in (FIXME-WIP) + const bool has_scrolling = (window->ScrollMax[axis] != 0.0f); + const bool inputs_disabled = (window->Flags & ImGuiWindowFlags_NoScrollWithMouse) && !(window->Flags & ImGuiWindowFlags_NoMouseInputs); + //const bool scrolling_past_limits = (wheel_v < 0.0f) ? (window->Scroll[axis] <= 0.0f) : (window->Scroll[axis] >= window->ScrollMax[axis]); + if (has_scrolling && !inputs_disabled) // && !scrolling_past_limits) + break; // select this window + } + if (windows[0] == NULL && windows[1] == NULL) + return NULL; + + // If there's only one window or only one axis then there's no ambiguity + if (windows[0] == windows[1] || windows[0] == NULL || windows[1] == NULL) + return windows[1] ? windows[1] : windows[0]; + + // If candidate are different windows we need to decide which one to prioritize + // - First frame: only find a winner if one axis is zero. + // - Subsequent frames: only find a winner when one is more than the other. + if (g.WheelingWindowStartFrame == -1) + g.WheelingWindowStartFrame = g.FrameCount; + if ((g.WheelingWindowStartFrame == g.FrameCount && wheel.x != 0.0f && wheel.y != 0.0f) || (g.WheelingAxisAvg.x == g.WheelingAxisAvg.y)) + { + g.WheelingWindowWheelRemainder = wheel; + return NULL; + } + return (g.WheelingAxisAvg.x > g.WheelingAxisAvg.y) ? windows[0] : windows[1]; +} + +// Called by NewFrame() +void ImGui::UpdateMouseWheel() +{ + // Reset the locked window if we move the mouse or after the timer elapses. + // FIXME: Ideally we could refactor to have one timer for "changing window w/ same axis" and a shorter timer for "changing window or axis w/ other axis" (#3795) + ImGuiContext& g = *GImGui; + if (g.WheelingWindow != NULL) + { + g.WheelingWindowReleaseTimer -= g.IO.DeltaTime; + if (IsMousePosValid() && ImLengthSqr(g.IO.MousePos - g.WheelingWindowRefMousePos) > g.IO.MouseDragThreshold * g.IO.MouseDragThreshold) + g.WheelingWindowReleaseTimer = 0.0f; + if (g.WheelingWindowReleaseTimer <= 0.0f) + LockWheelingWindow(NULL, 0.0f); + } + + ImVec2 wheel; + wheel.x = TestKeyOwner(ImGuiKey_MouseWheelX, ImGuiKeyOwner_NoOwner) ? g.IO.MouseWheelH : 0.0f; + wheel.y = TestKeyOwner(ImGuiKey_MouseWheelY, ImGuiKeyOwner_NoOwner) ? g.IO.MouseWheel : 0.0f; + + //IMGUI_DEBUG_LOG("MouseWheel X:%.3f Y:%.3f\n", wheel_x, wheel_y); + ImGuiWindow* mouse_window = g.WheelingWindow ? g.WheelingWindow : g.HoveredWindow; + if (!mouse_window || mouse_window->Collapsed) + return; + + // Zoom / Scale window + // FIXME-OBSOLETE: This is an old feature, it still works but pretty much nobody is using it and may be best redesigned. + if (wheel.y != 0.0f && g.IO.KeyCtrl && g.IO.FontAllowUserScaling) + { + LockWheelingWindow(mouse_window, wheel.y); + ImGuiWindow* window = mouse_window; + const float new_font_scale = ImClamp(window->FontWindowScale + g.IO.MouseWheel * 0.10f, 0.50f, 2.50f); + const float scale = new_font_scale / window->FontWindowScale; + window->FontWindowScale = new_font_scale; + if (window == window->RootWindow) + { + const ImVec2 offset = window->Size * (1.0f - scale) * (g.IO.MousePos - window->Pos) / window->Size; + SetWindowPos(window, window->Pos + offset, 0); + window->Size = ImTrunc(window->Size * scale); + window->SizeFull = ImTrunc(window->SizeFull * scale); + } + return; + } + if (g.IO.KeyCtrl) + return; + + // Mouse wheel scrolling + // Read about io.MouseWheelRequestAxisSwap and its issue on Mac+Emscripten in UpdateMouseInputs() + if (g.IO.MouseWheelRequestAxisSwap) + wheel = ImVec2(wheel.y, 0.0f); + + // Maintain a rough average of moving magnitude on both axes + // FIXME: should by based on wall clock time rather than frame-counter + g.WheelingAxisAvg.x = ImExponentialMovingAverage(g.WheelingAxisAvg.x, ImAbs(wheel.x), 30); + g.WheelingAxisAvg.y = ImExponentialMovingAverage(g.WheelingAxisAvg.y, ImAbs(wheel.y), 30); + + // In the rare situation where FindBestWheelingWindow() had to defer first frame of wheeling due to ambiguous main axis, reinject it now. + wheel += g.WheelingWindowWheelRemainder; + g.WheelingWindowWheelRemainder = ImVec2(0.0f, 0.0f); + if (wheel.x == 0.0f && wheel.y == 0.0f) + return; + + // Mouse wheel scrolling: find target and apply + // - don't renew lock if axis doesn't apply on the window. + // - select a main axis when both axes are being moved. + if (ImGuiWindow* window = (g.WheelingWindow ? g.WheelingWindow : FindBestWheelingWindow(wheel))) + if (!(window->Flags & ImGuiWindowFlags_NoScrollWithMouse) && !(window->Flags & ImGuiWindowFlags_NoMouseInputs)) + { + bool do_scroll[2] = { wheel.x != 0.0f && window->ScrollMax.x != 0.0f, wheel.y != 0.0f && window->ScrollMax.y != 0.0f }; + if (do_scroll[ImGuiAxis_X] && do_scroll[ImGuiAxis_Y]) + do_scroll[(g.WheelingAxisAvg.x > g.WheelingAxisAvg.y) ? ImGuiAxis_Y : ImGuiAxis_X] = false; + if (do_scroll[ImGuiAxis_X]) + { + LockWheelingWindow(window, wheel.x); + float max_step = window->InnerRect.GetWidth() * 0.67f; + float scroll_step = ImTrunc(ImMin(2 * window->FontRefSize, max_step)); + SetScrollX(window, window->Scroll.x - wheel.x * scroll_step); + g.WheelingWindowScrolledFrame = g.FrameCount; + } + if (do_scroll[ImGuiAxis_Y]) + { + LockWheelingWindow(window, wheel.y); + float max_step = window->InnerRect.GetHeight() * 0.67f; + float scroll_step = ImTrunc(ImMin(5 * window->FontRefSize, max_step)); + SetScrollY(window, window->Scroll.y - wheel.y * scroll_step); + g.WheelingWindowScrolledFrame = g.FrameCount; + } + } +} + +void ImGui::SetNextFrameWantCaptureKeyboard(bool want_capture_keyboard) +{ + ImGuiContext& g = *GImGui; + g.WantCaptureKeyboardNextFrame = want_capture_keyboard ? 1 : 0; +} + +void ImGui::SetNextFrameWantCaptureMouse(bool want_capture_mouse) +{ + ImGuiContext& g = *GImGui; + g.WantCaptureMouseNextFrame = want_capture_mouse ? 1 : 0; +} + +#ifndef IMGUI_DISABLE_DEBUG_TOOLS +static const char* GetInputSourceName(ImGuiInputSource source) +{ + const char* input_source_names[] = { "None", "Mouse", "Keyboard", "Gamepad" }; + IM_ASSERT(IM_ARRAYSIZE(input_source_names) == ImGuiInputSource_COUNT && source >= 0 && source < ImGuiInputSource_COUNT); + return input_source_names[source]; +} +static const char* GetMouseSourceName(ImGuiMouseSource source) +{ + const char* mouse_source_names[] = { "Mouse", "TouchScreen", "Pen" }; + IM_ASSERT(IM_ARRAYSIZE(mouse_source_names) == ImGuiMouseSource_COUNT && source >= 0 && source < ImGuiMouseSource_COUNT); + return mouse_source_names[source]; +} +static void DebugPrintInputEvent(const char* prefix, const ImGuiInputEvent* e) +{ + ImGuiContext& g = *GImGui; + if (e->Type == ImGuiInputEventType_MousePos) { if (e->MousePos.PosX == -FLT_MAX && e->MousePos.PosY == -FLT_MAX) IMGUI_DEBUG_LOG_IO("[io] %s: MousePos (-FLT_MAX, -FLT_MAX)\n", prefix); else IMGUI_DEBUG_LOG_IO("[io] %s: MousePos (%.1f, %.1f) (%s)\n", prefix, e->MousePos.PosX, e->MousePos.PosY, GetMouseSourceName(e->MousePos.MouseSource)); return; } + if (e->Type == ImGuiInputEventType_MouseButton) { IMGUI_DEBUG_LOG_IO("[io] %s: MouseButton %d %s (%s)\n", prefix, e->MouseButton.Button, e->MouseButton.Down ? "Down" : "Up", GetMouseSourceName(e->MouseButton.MouseSource)); return; } + if (e->Type == ImGuiInputEventType_MouseWheel) { IMGUI_DEBUG_LOG_IO("[io] %s: MouseWheel (%.3f, %.3f) (%s)\n", prefix, e->MouseWheel.WheelX, e->MouseWheel.WheelY, GetMouseSourceName(e->MouseWheel.MouseSource)); return; } + if (e->Type == ImGuiInputEventType_MouseViewport){IMGUI_DEBUG_LOG_IO("[io] %s: MouseViewport (0x%08X)\n", prefix, e->MouseViewport.HoveredViewportID); return; } + if (e->Type == ImGuiInputEventType_Key) { IMGUI_DEBUG_LOG_IO("[io] %s: Key \"%s\" %s\n", prefix, ImGui::GetKeyName(e->Key.Key), e->Key.Down ? "Down" : "Up"); return; } + if (e->Type == ImGuiInputEventType_Text) { IMGUI_DEBUG_LOG_IO("[io] %s: Text: %c (U+%08X)\n", prefix, e->Text.Char, e->Text.Char); return; } + if (e->Type == ImGuiInputEventType_Focus) { IMGUI_DEBUG_LOG_IO("[io] %s: AppFocused %d\n", prefix, e->AppFocused.Focused); return; } +} +#endif + +// Process input queue +// We always call this with the value of 'bool g.IO.ConfigInputTrickleEventQueue'. +// - trickle_fast_inputs = false : process all events, turn into flattened input state (e.g. successive down/up/down/up will be lost) +// - trickle_fast_inputs = true : process as many events as possible (successive down/up/down/up will be trickled over several frames so nothing is lost) (new feature in 1.87) +void ImGui::UpdateInputEvents(bool trickle_fast_inputs) +{ + ImGuiContext& g = *GImGui; + ImGuiIO& io = g.IO; + + // Only trickle chars<>key when working with InputText() + // FIXME: InputText() could parse event trail? + // FIXME: Could specialize chars<>keys trickling rules for control keys (those not typically associated to characters) + const bool trickle_interleaved_nonchar_keys_and_text = (trickle_fast_inputs && g.WantTextInputNextFrame == 1); + + bool mouse_moved = false, mouse_wheeled = false, key_changed = false, key_changed_nonchar = false, text_inputted = false; + int mouse_button_changed = 0x00; + ImBitArray key_changed_mask; + + int event_n = 0; + for (; event_n < g.InputEventsQueue.Size; event_n++) + { + ImGuiInputEvent* e = &g.InputEventsQueue[event_n]; + if (e->Type == ImGuiInputEventType_MousePos) + { + if (g.IO.WantSetMousePos) + continue; + // Trickling Rule: Stop processing queued events if we already handled a mouse button change + ImVec2 event_pos(e->MousePos.PosX, e->MousePos.PosY); + if (trickle_fast_inputs && (mouse_button_changed != 0 || mouse_wheeled || key_changed || text_inputted)) + break; + io.MousePos = event_pos; + io.MouseSource = e->MousePos.MouseSource; + mouse_moved = true; + } + else if (e->Type == ImGuiInputEventType_MouseButton) + { + // Trickling Rule: Stop processing queued events if we got multiple action on the same button + const ImGuiMouseButton button = e->MouseButton.Button; + IM_ASSERT(button >= 0 && button < ImGuiMouseButton_COUNT); + if (trickle_fast_inputs && ((mouse_button_changed & (1 << button)) || mouse_wheeled)) + break; + if (trickle_fast_inputs && e->MouseButton.MouseSource == ImGuiMouseSource_TouchScreen && mouse_moved) // #2702: TouchScreen have no initial hover. + break; + io.MouseDown[button] = e->MouseButton.Down; + io.MouseSource = e->MouseButton.MouseSource; + mouse_button_changed |= (1 << button); + } + else if (e->Type == ImGuiInputEventType_MouseWheel) + { + // Trickling Rule: Stop processing queued events if we got multiple action on the event + if (trickle_fast_inputs && (mouse_moved || mouse_button_changed != 0)) + break; + io.MouseWheelH += e->MouseWheel.WheelX; + io.MouseWheel += e->MouseWheel.WheelY; + io.MouseSource = e->MouseWheel.MouseSource; + mouse_wheeled = true; + } + else if (e->Type == ImGuiInputEventType_MouseViewport) + { + io.MouseHoveredViewport = e->MouseViewport.HoveredViewportID; + } + else if (e->Type == ImGuiInputEventType_Key) + { + // Trickling Rule: Stop processing queued events if we got multiple action on the same button + if (io.ConfigFlags & ImGuiConfigFlags_NoKeyboard) + continue; + ImGuiKey key = e->Key.Key; + IM_ASSERT(key != ImGuiKey_None); + ImGuiKeyData* key_data = GetKeyData(key); + const int key_data_index = (int)(key_data - g.IO.KeysData); + if (trickle_fast_inputs && key_data->Down != e->Key.Down && (key_changed_mask.TestBit(key_data_index) || mouse_button_changed != 0)) + break; + + const bool key_is_potentially_for_char_input = IsKeyChordPotentiallyCharInput(GetMergedModsFromKeys() | key); + if (trickle_interleaved_nonchar_keys_and_text && (text_inputted && !key_is_potentially_for_char_input)) + break; + + key_data->Down = e->Key.Down; + key_data->AnalogValue = e->Key.AnalogValue; + key_changed = true; + key_changed_mask.SetBit(key_data_index); + if (trickle_interleaved_nonchar_keys_and_text && !key_is_potentially_for_char_input) + key_changed_nonchar = true; + } + else if (e->Type == ImGuiInputEventType_Text) + { + if (io.ConfigFlags & ImGuiConfigFlags_NoKeyboard) + continue; + // Trickling Rule: Stop processing queued events if keys/mouse have been interacted with + if (trickle_fast_inputs && (mouse_button_changed != 0 || mouse_moved || mouse_wheeled)) + break; + if (trickle_interleaved_nonchar_keys_and_text && key_changed_nonchar) + break; + unsigned int c = e->Text.Char; + io.InputQueueCharacters.push_back(c <= IM_UNICODE_CODEPOINT_MAX ? (ImWchar)c : IM_UNICODE_CODEPOINT_INVALID); + if (trickle_interleaved_nonchar_keys_and_text) + text_inputted = true; + } + else if (e->Type == ImGuiInputEventType_Focus) + { + // We intentionally overwrite this and process in NewFrame(), in order to give a chance + // to multi-viewports backends to queue AddFocusEvent(false) + AddFocusEvent(true) in same frame. + const bool focus_lost = !e->AppFocused.Focused; + io.AppFocusLost = focus_lost; + } + else + { + IM_ASSERT(0 && "Unknown event!"); + } + } + + // Record trail (for domain-specific applications wanting to access a precise trail) + //if (event_n != 0) IMGUI_DEBUG_LOG_IO("Processed: %d / Remaining: %d\n", event_n, g.InputEventsQueue.Size - event_n); + for (int n = 0; n < event_n; n++) + g.InputEventsTrail.push_back(g.InputEventsQueue[n]); + + // [DEBUG] +#ifndef IMGUI_DISABLE_DEBUG_TOOLS + if (event_n != 0 && (g.DebugLogFlags & ImGuiDebugLogFlags_EventIO)) + for (int n = 0; n < g.InputEventsQueue.Size; n++) + DebugPrintInputEvent(n < event_n ? "Processed" : "Remaining", &g.InputEventsQueue[n]); +#endif + + // Remaining events will be processed on the next frame + if (event_n == g.InputEventsQueue.Size) + g.InputEventsQueue.resize(0); + else + g.InputEventsQueue.erase(g.InputEventsQueue.Data, g.InputEventsQueue.Data + event_n); + + // Clear buttons state when focus is lost + // - this is useful so e.g. releasing Alt after focus loss on Alt-Tab doesn't trigger the Alt menu toggle. + // - we clear in EndFrame() and not now in order allow application/user code polling this flag + // (e.g. custom backend may want to clear additional data, custom widgets may want to react with a "canceling" event). + if (g.IO.AppFocusLost) + { + g.IO.ClearInputKeys(); + g.IO.ClearInputMouse(); + } +} + +ImGuiID ImGui::GetKeyOwner(ImGuiKey key) +{ + if (!IsNamedKeyOrMod(key)) + return ImGuiKeyOwner_NoOwner; + + ImGuiContext& g = *GImGui; + ImGuiKeyOwnerData* owner_data = GetKeyOwnerData(&g, key); + ImGuiID owner_id = owner_data->OwnerCurr; + + if (g.ActiveIdUsingAllKeyboardKeys && owner_id != g.ActiveId && owner_id != ImGuiKeyOwner_Any) + if (key >= ImGuiKey_Keyboard_BEGIN && key < ImGuiKey_Keyboard_END) + return ImGuiKeyOwner_NoOwner; + + return owner_id; +} + +// TestKeyOwner(..., ID) : (owner == None || owner == ID) +// TestKeyOwner(..., None) : (owner == None) +// TestKeyOwner(..., Any) : no owner test +// All paths are also testing for key not being locked, for the rare cases that key have been locked with using ImGuiInputFlags_LockXXX flags. +bool ImGui::TestKeyOwner(ImGuiKey key, ImGuiID owner_id) +{ + if (!IsNamedKeyOrMod(key)) + return true; + + ImGuiContext& g = *GImGui; + if (g.ActiveIdUsingAllKeyboardKeys && owner_id != g.ActiveId && owner_id != ImGuiKeyOwner_Any) + if (key >= ImGuiKey_Keyboard_BEGIN && key < ImGuiKey_Keyboard_END) + return false; + + ImGuiKeyOwnerData* owner_data = GetKeyOwnerData(&g, key); + if (owner_id == ImGuiKeyOwner_Any) + return (owner_data->LockThisFrame == false); + + // Note: SetKeyOwner() sets OwnerCurr. It is not strictly required for most mouse routing overlap (because of ActiveId/HoveredId + // are acting as filter before this has a chance to filter), but sane as soon as user tries to look into things. + // Setting OwnerCurr in SetKeyOwner() is more consistent than testing OwnerNext here: would be inconsistent with getter and other functions. + if (owner_data->OwnerCurr != owner_id) + { + if (owner_data->LockThisFrame) + return false; + if (owner_data->OwnerCurr != ImGuiKeyOwner_NoOwner) + return false; + } + + return true; +} + +// _LockXXX flags are useful to lock keys away from code which is not input-owner aware. +// When using _LockXXX flags, you can use ImGuiKeyOwner_Any to lock keys from everyone. +// - SetKeyOwner(..., None) : clears owner +// - SetKeyOwner(..., Any, !Lock) : illegal (assert) +// - SetKeyOwner(..., Any or None, Lock) : set lock +void ImGui::SetKeyOwner(ImGuiKey key, ImGuiID owner_id, ImGuiInputFlags flags) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(IsNamedKeyOrMod(key) && (owner_id != ImGuiKeyOwner_Any || (flags & (ImGuiInputFlags_LockThisFrame | ImGuiInputFlags_LockUntilRelease)))); // Can only use _Any with _LockXXX flags (to eat a key away without an ID to retrieve it) + IM_ASSERT((flags & ~ImGuiInputFlags_SupportedBySetKeyOwner) == 0); // Passing flags not supported by this function! + //IMGUI_DEBUG_LOG("SetKeyOwner(%s, owner_id=0x%08X, flags=%08X)\n", GetKeyName(key), owner_id, flags); + + ImGuiKeyOwnerData* owner_data = GetKeyOwnerData(&g, key); + owner_data->OwnerCurr = owner_data->OwnerNext = owner_id; + + // We cannot lock by default as it would likely break lots of legacy code. + // In the case of using LockUntilRelease while key is not down we still lock during the frame (no key_data->Down test) + owner_data->LockUntilRelease = (flags & ImGuiInputFlags_LockUntilRelease) != 0; + owner_data->LockThisFrame = (flags & ImGuiInputFlags_LockThisFrame) != 0 || (owner_data->LockUntilRelease); +} + +// Rarely used helper +void ImGui::SetKeyOwnersForKeyChord(ImGuiKeyChord key_chord, ImGuiID owner_id, ImGuiInputFlags flags) +{ + if (key_chord & ImGuiMod_Ctrl) { SetKeyOwner(ImGuiMod_Ctrl, owner_id, flags); } + if (key_chord & ImGuiMod_Shift) { SetKeyOwner(ImGuiMod_Shift, owner_id, flags); } + if (key_chord & ImGuiMod_Alt) { SetKeyOwner(ImGuiMod_Alt, owner_id, flags); } + if (key_chord & ImGuiMod_Super) { SetKeyOwner(ImGuiMod_Super, owner_id, flags); } + if (key_chord & ~ImGuiMod_Mask_) { SetKeyOwner((ImGuiKey)(key_chord & ~ImGuiMod_Mask_), owner_id, flags); } +} + +// This is more or less equivalent to: +// if (IsItemHovered() || IsItemActive()) +// SetKeyOwner(key, GetItemID()); +// Extensive uses of that (e.g. many calls for a single item) may want to manually perform the tests once and then call SetKeyOwner() multiple times. +// More advanced usage scenarios may want to call SetKeyOwner() manually based on different condition. +// Worth noting is that only one item can be hovered and only one item can be active, therefore this usage pattern doesn't need to bother with routing and priority. +void ImGui::SetItemKeyOwner(ImGuiKey key, ImGuiInputFlags flags) +{ + ImGuiContext& g = *GImGui; + ImGuiID id = g.LastItemData.ID; + if (id == 0 || (g.HoveredId != id && g.ActiveId != id)) + return; + if ((flags & ImGuiInputFlags_CondMask_) == 0) + flags |= ImGuiInputFlags_CondDefault_; + if ((g.HoveredId == id && (flags & ImGuiInputFlags_CondHovered)) || (g.ActiveId == id && (flags & ImGuiInputFlags_CondActive))) + { + IM_ASSERT((flags & ~ImGuiInputFlags_SupportedBySetItemKeyOwner) == 0); // Passing flags not supported by this function! + SetKeyOwner(key, id, flags & ~ImGuiInputFlags_CondMask_); + } +} + +void ImGui::SetItemKeyOwner(ImGuiKey key) +{ + SetItemKeyOwner(key, ImGuiInputFlags_None); +} + +// This is the only public API until we expose owner_id versions of the API as replacements. +bool ImGui::IsKeyChordPressed(ImGuiKeyChord key_chord) +{ + return IsKeyChordPressed(key_chord, ImGuiInputFlags_None, ImGuiKeyOwner_Any); +} + +// This is equivalent to comparing KeyMods + doing a IsKeyPressed() +bool ImGui::IsKeyChordPressed(ImGuiKeyChord key_chord, ImGuiInputFlags flags, ImGuiID owner_id) +{ + ImGuiContext& g = *GImGui; + key_chord = FixupKeyChord(key_chord); + ImGuiKey mods = (ImGuiKey)(key_chord & ImGuiMod_Mask_); + if (g.IO.KeyMods != mods) + return false; + + // Special storage location for mods + ImGuiKey key = (ImGuiKey)(key_chord & ~ImGuiMod_Mask_); + if (key == ImGuiKey_None) + key = ConvertSingleModFlagToKey(mods); + if (!IsKeyPressed(key, (flags & ImGuiInputFlags_RepeatMask_), owner_id)) + return false; + return true; +} + +void ImGui::SetNextItemShortcut(ImGuiKeyChord key_chord, ImGuiInputFlags flags) +{ + ImGuiContext& g = *GImGui; + g.NextItemData.HasFlags |= ImGuiNextItemDataFlags_HasShortcut; + g.NextItemData.Shortcut = key_chord; + g.NextItemData.ShortcutFlags = flags; +} + +// Called from within ItemAdd: at this point we can read from NextItemData and write to LastItemData +void ImGui::ItemHandleShortcut(ImGuiID id) +{ + ImGuiContext& g = *GImGui; + ImGuiInputFlags flags = g.NextItemData.ShortcutFlags; + IM_ASSERT((flags & ~ImGuiInputFlags_SupportedBySetNextItemShortcut) == 0); // Passing flags not supported by SetNextItemShortcut()! + + if (g.LastItemData.ItemFlags & ImGuiItemFlags_Disabled) + return; + if (flags & ImGuiInputFlags_Tooltip) + { + g.LastItemData.StatusFlags |= ImGuiItemStatusFlags_HasShortcut; + g.LastItemData.Shortcut = g.NextItemData.Shortcut; + } + if (!Shortcut(g.NextItemData.Shortcut, flags & ImGuiInputFlags_SupportedByShortcut, id) || g.NavActivateId != 0) + return; + + // FIXME: Generalize Activation queue? + g.NavActivateId = id; // Will effectively disable clipping. + g.NavActivateFlags = ImGuiActivateFlags_PreferInput | ImGuiActivateFlags_FromShortcut; + //if (g.ActiveId == 0 || g.ActiveId == id) + g.NavActivateDownId = g.NavActivatePressedId = id; + NavHighlightActivated(id); +} + +bool ImGui::Shortcut(ImGuiKeyChord key_chord, ImGuiInputFlags flags) +{ + return Shortcut(key_chord, flags, ImGuiKeyOwner_Any); +} + +bool ImGui::Shortcut(ImGuiKeyChord key_chord, ImGuiInputFlags flags, ImGuiID owner_id) +{ + ImGuiContext& g = *GImGui; + //IMGUI_DEBUG_LOG("Shortcut(%s, flags=%X, owner_id=0x%08X)\n", GetKeyChordName(key_chord, g.TempBuffer.Data, g.TempBuffer.Size), flags, owner_id); + + // When using (owner_id == 0/Any): SetShortcutRouting() will use CurrentFocusScopeId and filter with this, so IsKeyPressed() is fine with he 0/Any. + if ((flags & ImGuiInputFlags_RouteTypeMask_) == 0) + flags |= ImGuiInputFlags_RouteFocused; + + // Using 'owner_id == ImGuiKeyOwner_Any/0': auto-assign an owner based on current focus scope (each window has its focus scope by default) + // Effectively makes Shortcut() always input-owner aware. + if (owner_id == ImGuiKeyOwner_Any || owner_id == ImGuiKeyOwner_NoOwner) + owner_id = GetRoutingIdFromOwnerId(owner_id); + + if (g.CurrentItemFlags & ImGuiItemFlags_Disabled) + return false; + + // Submit route + if (!SetShortcutRouting(key_chord, flags, owner_id)) + return false; + + // Default repeat behavior for Shortcut() + // So e.g. pressing Ctrl+W and releasing Ctrl while holding W will not trigger the W shortcut. + if ((flags & ImGuiInputFlags_Repeat) != 0 && (flags & ImGuiInputFlags_RepeatUntilMask_) == 0) + flags |= ImGuiInputFlags_RepeatUntilKeyModsChange; + + if (!IsKeyChordPressed(key_chord, flags, owner_id)) + return false; + + // Claim mods during the press + SetKeyOwnersForKeyChord(key_chord & ImGuiMod_Mask_, owner_id); + + IM_ASSERT((flags & ~ImGuiInputFlags_SupportedByShortcut) == 0); // Passing flags not supported by this function! + return true; +} + +//----------------------------------------------------------------------------- +// [SECTION] ERROR CHECKING, STATE RECOVERY +//----------------------------------------------------------------------------- +// - DebugCheckVersionAndDataLayout() (called via IMGUI_CHECKVERSION() macros) +// - ErrorCheckUsingSetCursorPosToExtendParentBoundaries() +// - ErrorCheckNewFrameSanityChecks() +// - ErrorCheckEndFrameSanityChecks() +// - ErrorRecoveryStoreState() +// - ErrorRecoveryTryToRecoverState() +// - ErrorRecoveryTryToRecoverWindowState() +// - ErrorLog() +//----------------------------------------------------------------------------- + +// Verify ABI compatibility between caller code and compiled version of Dear ImGui. This helps detects some build issues. +// Called by IMGUI_CHECKVERSION(). +// Verify that the type sizes are matching between the calling file's compilation unit and imgui.cpp's compilation unit +// If this triggers you have mismatched headers and compiled code versions. +// - It could be because of a build issue (using new headers with old compiled code) +// - It could be because of mismatched configuration #define, compilation settings, packing pragma etc. +// THE CONFIGURATION SETTINGS MENTIONED IN imconfig.h MUST BE SET FOR ALL COMPILATION UNITS INVOLVED WITH DEAR IMGUI. +// Which is why it is required you put them in your imconfig file (and NOT only before including imgui.h). +// Otherwise it is possible that different compilation units would see different structure layout. +// If you don't want to modify imconfig.h you can use the IMGUI_USER_CONFIG define to change filename. +bool ImGui::DebugCheckVersionAndDataLayout(const char* version, size_t sz_io, size_t sz_style, size_t sz_vec2, size_t sz_vec4, size_t sz_vert, size_t sz_idx) +{ + bool error = false; + if (strcmp(version, IMGUI_VERSION) != 0) { error = true; IM_ASSERT(strcmp(version, IMGUI_VERSION) == 0 && "Mismatched version string!"); } + if (sz_io != sizeof(ImGuiIO)) { error = true; IM_ASSERT(sz_io == sizeof(ImGuiIO) && "Mismatched struct layout!"); } + if (sz_style != sizeof(ImGuiStyle)) { error = true; IM_ASSERT(sz_style == sizeof(ImGuiStyle) && "Mismatched struct layout!"); } + if (sz_vec2 != sizeof(ImVec2)) { error = true; IM_ASSERT(sz_vec2 == sizeof(ImVec2) && "Mismatched struct layout!"); } + if (sz_vec4 != sizeof(ImVec4)) { error = true; IM_ASSERT(sz_vec4 == sizeof(ImVec4) && "Mismatched struct layout!"); } + if (sz_vert != sizeof(ImDrawVert)) { error = true; IM_ASSERT(sz_vert == sizeof(ImDrawVert) && "Mismatched struct layout!"); } + if (sz_idx != sizeof(ImDrawIdx)) { error = true; IM_ASSERT(sz_idx == sizeof(ImDrawIdx) && "Mismatched struct layout!"); } + return !error; +} + +// Until 1.89 (IMGUI_VERSION_NUM < 18814) it was legal to use SetCursorPos() to extend the boundary of a parent (e.g. window or table cell) +// This is causing issues and ambiguity and we need to retire that. +// See https://github.com/ocornut/imgui/issues/5548 for more details. +// [Scenario 1] +// Previously this would make the window content size ~200x200: +// Begin(...) + SetCursorScreenPos(GetCursorScreenPos() + ImVec2(200,200)) + End(); // NOT OK +// Instead, please submit an item: +// Begin(...) + SetCursorScreenPos(GetCursorScreenPos() + ImVec2(200,200)) + Dummy(ImVec2(0,0)) + End(); // OK +// Alternative: +// Begin(...) + Dummy(ImVec2(200,200)) + End(); // OK +// [Scenario 2] +// For reference this is one of the issue what we aim to fix with this change: +// BeginGroup() + SomeItem("foobar") + SetCursorScreenPos(GetCursorScreenPos()) + EndGroup() +// The previous logic made SetCursorScreenPos(GetCursorScreenPos()) have a side-effect! It would erroneously incorporate ItemSpacing.y after the item into content size, making the group taller! +// While this code is a little twisted, no-one would expect SetXXX(GetXXX()) to have a side-effect. Using vertical alignment patterns could trigger this issue. +void ImGui::ErrorCheckUsingSetCursorPosToExtendParentBoundaries() +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + IM_ASSERT(window->DC.IsSetPos); + window->DC.IsSetPos = false; +#ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + if (window->DC.CursorPos.x <= window->DC.CursorMaxPos.x && window->DC.CursorPos.y <= window->DC.CursorMaxPos.y) + return; + if (window->SkipItems) + return; + IM_ASSERT(0 && "Code uses SetCursorPos()/SetCursorScreenPos() to extend window/parent boundaries. Please submit an item e.g. Dummy() to validate extent."); +#else + window->DC.CursorMaxPos = ImMax(window->DC.CursorMaxPos, window->DC.CursorPos); +#endif +} + +static void ImGui::ErrorCheckNewFrameSanityChecks() +{ + ImGuiContext& g = *GImGui; + + // Check user IM_ASSERT macro + // (IF YOU GET A WARNING OR COMPILE ERROR HERE: it means your assert macro is incorrectly defined! + // If your macro uses multiple statements, it NEEDS to be surrounded by a 'do { ... } while (0)' block. + // This is a common C/C++ idiom to allow multiple statements macros to be used in control flow blocks.) + // #define IM_ASSERT(EXPR) if (SomeCode(EXPR)) SomeMoreCode(); // Wrong! + // #define IM_ASSERT(EXPR) do { if (SomeCode(EXPR)) SomeMoreCode(); } while (0) // Correct! + if (true) IM_ASSERT(1); else IM_ASSERT(0); + + // Emscripten backends are often imprecise in their submission of DeltaTime. (#6114, #3644) + // Ideally the Emscripten app/backend should aim to fix or smooth this value and avoid feeding zero, but we tolerate it. +#ifdef __EMSCRIPTEN__ + if (g.IO.DeltaTime <= 0.0f && g.FrameCount > 0) + g.IO.DeltaTime = 0.00001f; +#endif + + // Check user data + // (We pass an error message in the assert expression to make it visible to programmers who are not using a debugger, as most assert handlers display their argument) + IM_ASSERT(g.Initialized); + IM_ASSERT((g.IO.DeltaTime > 0.0f || g.FrameCount == 0) && "Need a positive DeltaTime!"); + IM_ASSERT((g.FrameCount == 0 || g.FrameCountEnded == g.FrameCount) && "Forgot to call Render() or EndFrame() at the end of the previous frame?"); + IM_ASSERT(g.IO.DisplaySize.x >= 0.0f && g.IO.DisplaySize.y >= 0.0f && "Invalid DisplaySize value!"); + IM_ASSERT(g.IO.Fonts->IsBuilt() && "Font Atlas not built! Make sure you called ImGui_ImplXXXX_NewFrame() function for renderer backend, which should call io.Fonts->GetTexDataAsRGBA32() / GetTexDataAsAlpha8()"); + IM_ASSERT(g.Style.CurveTessellationTol > 0.0f && "Invalid style setting!"); + IM_ASSERT(g.Style.CircleTessellationMaxError > 0.0f && "Invalid style setting!"); + IM_ASSERT(g.Style.Alpha >= 0.0f && g.Style.Alpha <= 1.0f && "Invalid style setting!"); // Allows us to avoid a few clamps in color computations + IM_ASSERT(g.Style.WindowMinSize.x >= 1.0f && g.Style.WindowMinSize.y >= 1.0f && "Invalid style setting!"); + IM_ASSERT(g.Style.WindowBorderHoverPadding > 0.0f && "Invalid style setting!"); // Required otherwise cannot resize from borders. + IM_ASSERT(g.Style.WindowMenuButtonPosition == ImGuiDir_None || g.Style.WindowMenuButtonPosition == ImGuiDir_Left || g.Style.WindowMenuButtonPosition == ImGuiDir_Right); + IM_ASSERT(g.Style.ColorButtonPosition == ImGuiDir_Left || g.Style.ColorButtonPosition == ImGuiDir_Right); + + // Error handling: we do not accept 100% silent recovery! Please contact me if you feel this is getting in your way. + if (g.IO.ConfigErrorRecovery) + IM_ASSERT(g.IO.ConfigErrorRecoveryEnableAssert || g.IO.ConfigErrorRecoveryEnableDebugLog || g.IO.ConfigErrorRecoveryEnableTooltip || g.ErrorCallback != NULL); + +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + // Remap legacy names + if (g.IO.ConfigFlags & ImGuiConfigFlags_NavEnableSetMousePos) + { + g.IO.ConfigNavMoveSetMousePos = true; + g.IO.ConfigFlags &= ~ImGuiConfigFlags_NavEnableSetMousePos; + } + if (g.IO.ConfigFlags & ImGuiConfigFlags_NavNoCaptureKeyboard) + { + g.IO.ConfigNavCaptureKeyboard = false; + g.IO.ConfigFlags &= ~ImGuiConfigFlags_NavNoCaptureKeyboard; + } + + // Remap legacy clipboard handlers (OBSOLETED in 1.91.1, August 2024) + if (g.IO.GetClipboardTextFn != NULL && (g.PlatformIO.Platform_GetClipboardTextFn == NULL || g.PlatformIO.Platform_GetClipboardTextFn == Platform_GetClipboardTextFn_DefaultImpl)) + g.PlatformIO.Platform_GetClipboardTextFn = [](ImGuiContext* ctx) { return ctx->IO.GetClipboardTextFn(ctx->IO.ClipboardUserData); }; + if (g.IO.SetClipboardTextFn != NULL && (g.PlatformIO.Platform_SetClipboardTextFn == NULL || g.PlatformIO.Platform_SetClipboardTextFn == Platform_SetClipboardTextFn_DefaultImpl)) + g.PlatformIO.Platform_SetClipboardTextFn = [](ImGuiContext* ctx, const char* text) { return ctx->IO.SetClipboardTextFn(ctx->IO.ClipboardUserData, text); }; +#endif + + // Perform simple check: error if Docking or Viewport are enabled _exactly_ on frame 1 (instead of frame 0 or later), which is a common error leading to loss of .ini data. + if (g.FrameCount == 1 && (g.IO.ConfigFlags & ImGuiConfigFlags_DockingEnable) && (g.ConfigFlagsLastFrame & ImGuiConfigFlags_DockingEnable) == 0) + IM_ASSERT(0 && "Please set DockingEnable before the first call to NewFrame()! Otherwise you will lose your .ini settings!"); + if (g.FrameCount == 1 && (g.IO.ConfigFlags & ImGuiConfigFlags_ViewportsEnable) && (g.ConfigFlagsLastFrame & ImGuiConfigFlags_ViewportsEnable) == 0) + IM_ASSERT(0 && "Please set ViewportsEnable before the first call to NewFrame()! Otherwise you will lose your .ini settings!"); + + // Perform simple checks: multi-viewport and platform windows support + if (g.IO.ConfigFlags & ImGuiConfigFlags_ViewportsEnable) + { + if ((g.IO.BackendFlags & ImGuiBackendFlags_PlatformHasViewports) && (g.IO.BackendFlags & ImGuiBackendFlags_RendererHasViewports)) + { + IM_ASSERT((g.FrameCount == 0 || g.FrameCount == g.FrameCountPlatformEnded) && "Forgot to call UpdatePlatformWindows() in main loop after EndFrame()? Check examples/ applications for reference."); + IM_ASSERT(g.PlatformIO.Platform_CreateWindow != NULL && "Platform init didn't install handlers?"); + IM_ASSERT(g.PlatformIO.Platform_DestroyWindow != NULL && "Platform init didn't install handlers?"); + IM_ASSERT(g.PlatformIO.Platform_GetWindowPos != NULL && "Platform init didn't install handlers?"); + IM_ASSERT(g.PlatformIO.Platform_SetWindowPos != NULL && "Platform init didn't install handlers?"); + IM_ASSERT(g.PlatformIO.Platform_GetWindowSize != NULL && "Platform init didn't install handlers?"); + IM_ASSERT(g.PlatformIO.Platform_SetWindowSize != NULL && "Platform init didn't install handlers?"); + IM_ASSERT(g.PlatformIO.Monitors.Size > 0 && "Platform init didn't setup Monitors list?"); + IM_ASSERT((g.Viewports[0]->PlatformUserData != NULL || g.Viewports[0]->PlatformHandle != NULL) && "Platform init didn't setup main viewport."); + if (g.IO.ConfigDockingTransparentPayload && (g.IO.ConfigFlags & ImGuiConfigFlags_DockingEnable)) + IM_ASSERT(g.PlatformIO.Platform_SetWindowAlpha != NULL && "Platform_SetWindowAlpha handler is required to use io.ConfigDockingTransparent!"); + } + else + { + // Disable feature, our backends do not support it + g.IO.ConfigFlags &= ~ImGuiConfigFlags_ViewportsEnable; + } + + // Perform simple checks on platform monitor data + compute a total bounding box for quick early outs + for (ImGuiPlatformMonitor& mon : g.PlatformIO.Monitors) + { + IM_UNUSED(mon); + IM_ASSERT(mon.MainSize.x > 0.0f && mon.MainSize.y > 0.0f && "Monitor main bounds not setup properly."); + IM_ASSERT(ImRect(mon.MainPos, mon.MainPos + mon.MainSize).Contains(ImRect(mon.WorkPos, mon.WorkPos + mon.WorkSize)) && "Monitor work bounds not setup properly. If you don't have work area information, just copy MainPos/MainSize into them."); + IM_ASSERT(mon.DpiScale > 0.0f && mon.DpiScale < 99.0f && "Monitor DpiScale is invalid."); // Typical correct values would be between 1.0f and 4.0f + } + } +} + +static void ImGui::ErrorCheckEndFrameSanityChecks() +{ + // Verify that io.KeyXXX fields haven't been tampered with. Key mods should not be modified between NewFrame() and EndFrame() + // One possible reason leading to this assert is that your backends update inputs _AFTER_ NewFrame(). + // It is known that when some modal native windows called mid-frame takes focus away, some backends such as GLFW will + // send key release events mid-frame. This would normally trigger this assertion and lead to sheared inputs. + // We silently accommodate for this case by ignoring the case where all io.KeyXXX modifiers were released (aka key_mod_flags == 0), + // while still correctly asserting on mid-frame key press events. + ImGuiContext& g = *GImGui; + const ImGuiKeyChord key_mods = GetMergedModsFromKeys(); + IM_UNUSED(g); + IM_UNUSED(key_mods); + IM_ASSERT((key_mods == 0 || g.IO.KeyMods == key_mods) && "Mismatching io.KeyCtrl/io.KeyShift/io.KeyAlt/io.KeySuper vs io.KeyMods"); + IM_UNUSED(key_mods); + + IM_ASSERT(g.CurrentWindowStack.Size == 1); + IM_ASSERT(g.CurrentWindowStack[0].Window->IsFallbackWindow); +} + +// Save current stack sizes. Called e.g. by NewFrame() and by Begin() but may be called for manual recovery. +void ImGui::ErrorRecoveryStoreState(ImGuiErrorRecoveryState* state_out) +{ + ImGuiContext& g = *GImGui; + state_out->SizeOfWindowStack = (short)g.CurrentWindowStack.Size; + state_out->SizeOfIDStack = (short)g.CurrentWindow->IDStack.Size; + state_out->SizeOfTreeStack = (short)g.CurrentWindow->DC.TreeDepth; // NOT g.TreeNodeStack.Size which is a partial stack! + state_out->SizeOfColorStack = (short)g.ColorStack.Size; + state_out->SizeOfStyleVarStack = (short)g.StyleVarStack.Size; + state_out->SizeOfFontStack = (short)g.FontStack.Size; + state_out->SizeOfFocusScopeStack = (short)g.FocusScopeStack.Size; + state_out->SizeOfGroupStack = (short)g.GroupStack.Size; + state_out->SizeOfItemFlagsStack = (short)g.ItemFlagsStack.Size; + state_out->SizeOfBeginPopupStack = (short)g.BeginPopupStack.Size; + state_out->SizeOfDisabledStack = (short)g.DisabledStackSize; +} + +// Chosen name "Try to recover" over e.g. "Restore" to suggest this is not a 100% guaranteed recovery. +// Called by e.g. EndFrame() but may be called for manual recovery. +// Attempt to recover full window stack. +void ImGui::ErrorRecoveryTryToRecoverState(const ImGuiErrorRecoveryState* state_in) +{ + // PVS-Studio V1044 is "Loop break conditions do not depend on the number of iterations" + ImGuiContext& g = *GImGui; + while (g.CurrentWindowStack.Size > state_in->SizeOfWindowStack) //-V1044 + { + // Recap: + // - Begin()/BeginChild() return false to indicate the window is collapsed or fully clipped. + // - Always call a matching End() for each Begin() call, regardless of its return value! + // - Begin/End and BeginChild/EndChild logic is KNOWN TO BE INCONSISTENT WITH ALL OTHER BEGIN/END FUNCTIONS. + // - We will fix that in a future major update. + ImGuiWindow* window = g.CurrentWindow; + if (window->Flags & ImGuiWindowFlags_ChildWindow) + { + if (g.CurrentTable != NULL && g.CurrentTable->InnerWindow == g.CurrentWindow) + { + IM_ASSERT_USER_ERROR(0, "Missing EndTable()"); + EndTable(); + } + else + { + IM_ASSERT_USER_ERROR(0, "Missing EndChild()"); + EndChild(); + } + } + else + { + IM_ASSERT_USER_ERROR(0, "Missing End()"); + End(); + } + } + if (g.CurrentWindowStack.Size == state_in->SizeOfWindowStack) + ErrorRecoveryTryToRecoverWindowState(state_in); +} + +// Called by e.g. End() but may be called for manual recovery. +// Read '// Error Handling [BETA]' block in imgui_internal.h for details. +// Attempt to recover from incorrect usage of BeginXXX/EndXXX/PushXXX/PopXXX calls. +void ImGui::ErrorRecoveryTryToRecoverWindowState(const ImGuiErrorRecoveryState* state_in) +{ + ImGuiContext& g = *GImGui; + + while (g.CurrentTable != NULL && g.CurrentTable->InnerWindow == g.CurrentWindow) //-V1044 + { + IM_ASSERT_USER_ERROR(0, "Missing EndTable()"); + EndTable(); + } + + ImGuiWindow* window = g.CurrentWindow; + + // FIXME: Can't recover from inside BeginTabItem/EndTabItem yet. + while (g.CurrentTabBar != NULL && g.CurrentTabBar->Window == window) //-V1044 + { + IM_ASSERT_USER_ERROR(0, "Missing EndTabBar()"); + EndTabBar(); + } + while (g.CurrentMultiSelect != NULL && g.CurrentMultiSelect->Storage->Window == window) //-V1044 + { + IM_ASSERT_USER_ERROR(0, "Missing EndMultiSelect()"); + EndMultiSelect(); + } + if (window->DC.MenuBarAppending) //-V1044 + { + IM_ASSERT_USER_ERROR(0, "Missing EndMenuBar()"); + EndMenuBar(); + } + while (window->DC.TreeDepth > state_in->SizeOfTreeStack) //-V1044 + { + IM_ASSERT_USER_ERROR(0, "Missing TreePop()"); + TreePop(); + } + while (g.GroupStack.Size > state_in->SizeOfGroupStack) //-V1044 + { + IM_ASSERT_USER_ERROR(0, "Missing EndGroup()"); + EndGroup(); + } + IM_ASSERT(g.GroupStack.Size == state_in->SizeOfGroupStack); + while (window->IDStack.Size > state_in->SizeOfIDStack) //-V1044 + { + IM_ASSERT_USER_ERROR(0, "Missing PopID()"); + PopID(); + } + while (g.DisabledStackSize > state_in->SizeOfDisabledStack) //-V1044 + { + IM_ASSERT_USER_ERROR(0, "Missing EndDisabled()"); + if (g.CurrentItemFlags & ImGuiItemFlags_Disabled) + EndDisabled(); + else + { + EndDisabledOverrideReenable(); + g.CurrentWindowStack.back().DisabledOverrideReenable = false; + } + } + IM_ASSERT(g.DisabledStackSize == state_in->SizeOfDisabledStack); + while (g.ColorStack.Size > state_in->SizeOfColorStack) //-V1044 + { + IM_ASSERT_USER_ERROR(0, "Missing PopStyleColor()"); + PopStyleColor(); + } + while (g.ItemFlagsStack.Size > state_in->SizeOfItemFlagsStack) //-V1044 + { + IM_ASSERT_USER_ERROR(0, "Missing PopItemFlag()"); + PopItemFlag(); + } + while (g.StyleVarStack.Size > state_in->SizeOfStyleVarStack) //-V1044 + { + IM_ASSERT_USER_ERROR(0, "Missing PopStyleVar()"); + PopStyleVar(); + } + while (g.FontStack.Size > state_in->SizeOfFontStack) //-V1044 + { + IM_ASSERT_USER_ERROR(0, "Missing PopFont()"); + PopFont(); + } + while (g.FocusScopeStack.Size > state_in->SizeOfFocusScopeStack) //-V1044 + { + IM_ASSERT_USER_ERROR(0, "Missing PopFocusScope()"); + PopFocusScope(); + } + //IM_ASSERT(g.FocusScopeStack.Size == state_in->SizeOfFocusScopeStack); +} + +bool ImGui::ErrorLog(const char* msg) +{ + ImGuiContext& g = *GImGui; + + // Output to debug log +#ifndef IMGUI_DISABLE_DEBUG_TOOLS + ImGuiWindow* window = g.CurrentWindow; + + if (g.IO.ConfigErrorRecoveryEnableDebugLog) + { + if (g.ErrorFirst) + IMGUI_DEBUG_LOG_ERROR("[imgui-error] (current settings: Assert=%d, Log=%d, Tooltip=%d)\n", + g.IO.ConfigErrorRecoveryEnableAssert, g.IO.ConfigErrorRecoveryEnableDebugLog, g.IO.ConfigErrorRecoveryEnableTooltip); + IMGUI_DEBUG_LOG_ERROR("[imgui-error] In window '%s': %s\n", window ? window->Name : "NULL", msg); + } + g.ErrorFirst = false; + + // Output to tooltip + if (g.IO.ConfigErrorRecoveryEnableTooltip) + { + if (g.WithinFrameScope && BeginErrorTooltip()) + { + if (g.ErrorCountCurrentFrame < 20) + { + Text("In window '%s': %s", window ? window->Name : "NULL", msg); + if (window && (!window->IsFallbackWindow || window->WasActive)) + GetForegroundDrawList(window)->AddRect(window->Pos, window->Pos + window->Size, IM_COL32(255, 0, 0, 255)); + } + if (g.ErrorCountCurrentFrame == 20) + Text("(and more errors)"); + // EndFrame() will amend debug buttons to this window, after all errors have been submitted. + EndErrorTooltip(); + } + g.ErrorCountCurrentFrame++; + } +#endif + + // Output to callback + if (g.ErrorCallback != NULL) + g.ErrorCallback(&g, g.ErrorCallbackUserData, msg); + + // Return whether we should assert + return g.IO.ConfigErrorRecoveryEnableAssert; +} + +void ImGui::ErrorCheckEndFrameFinalizeErrorTooltip() +{ +#ifndef IMGUI_DISABLE_DEBUG_TOOLS + ImGuiContext& g = *GImGui; + if (g.DebugDrawIdConflicts != 0 && g.IO.KeyCtrl == false) + g.DebugDrawIdConflictsCount = g.HoveredIdPreviousFrameItemCount; + if (g.DebugDrawIdConflicts != 0 && g.DebugItemPickerActive == false && BeginErrorTooltip()) + { + Text("Programmer error: %d visible items with conflicting ID!", g.DebugDrawIdConflictsCount); + BulletText("Code should use PushID()/PopID() in loops, or append \"##xx\" to same-label identifiers!"); + BulletText("Empty label e.g. Button(\"\") == same ID as parent widget/node. Use Button(\"##xx\") instead!"); + //BulletText("Code intending to use duplicate ID may use e.g. PushItemFlag(ImGuiItemFlags_AllowDuplicateId, true); ... PopItemFlag()"); // Not making this too visible for fear of it being abused. + BulletText("Set io.ConfigDebugHighlightIdConflicts=false to disable this warning in non-programmers builds."); + Separator(); + if (g.IO.ConfigDebugHighlightIdConflictsShowItemPicker) + { + Text("(Hold CTRL to: use "); + SameLine(0.0f, 0.0f); + if (SmallButton("Item Picker")) + DebugStartItemPicker(); + SameLine(0.0f, 0.0f); + Text(" to break in item call-stack, or "); + } + else + { + Text("(Hold CTRL to "); + } + SameLine(0.0f, 0.0f); + if (SmallButton("Open FAQ->About ID Stack System") && g.PlatformIO.Platform_OpenInShellFn != NULL) + g.PlatformIO.Platform_OpenInShellFn(&g, "https://github.com/ocornut/imgui/blob/master/docs/FAQ.md#qa-usage"); + SameLine(0.0f, 0.0f); + Text(")"); + EndErrorTooltip(); + } + + if (g.ErrorCountCurrentFrame > 0 && BeginErrorTooltip()) // Amend at end of frame + { + Separator(); + Text("(Hold CTRL to:"); + SameLine(); + if (SmallButton("Enable Asserts")) + g.IO.ConfigErrorRecoveryEnableAssert = true; + //SameLine(); + //if (SmallButton("Hide Error Tooltips")) + // g.IO.ConfigErrorRecoveryEnableTooltip = false; // Too dangerous + SameLine(0, 0); + Text(")"); + EndErrorTooltip(); + } +#endif +} + +// Pseudo-tooltip. Follow mouse until CTRL is held. When CTRL is held we lock position, allowing to click it. +bool ImGui::BeginErrorTooltip() +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = FindWindowByName("##Tooltip_Error"); + const bool use_locked_pos = (g.IO.KeyCtrl && window && window->WasActive); + PushStyleColor(ImGuiCol_PopupBg, ImLerp(g.Style.Colors[ImGuiCol_PopupBg], ImVec4(1.0f, 0.0f, 0.0f, 1.0f), 0.15f)); + if (use_locked_pos) + SetNextWindowPos(g.ErrorTooltipLockedPos); + bool is_visible = Begin("##Tooltip_Error", NULL, ImGuiWindowFlags_Tooltip | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_AlwaysAutoResize); + PopStyleColor(); + if (is_visible && g.CurrentWindow->BeginCount == 1) + { + SeparatorText("MESSAGE FROM DEAR IMGUI"); + BringWindowToDisplayFront(g.CurrentWindow); + BringWindowToFocusFront(g.CurrentWindow); + g.ErrorTooltipLockedPos = GetWindowPos(); + } + else if (!is_visible) + { + End(); + } + return is_visible; +} + +void ImGui::EndErrorTooltip() +{ + End(); +} + +//----------------------------------------------------------------------------- +// [SECTION] ITEM SUBMISSION +//----------------------------------------------------------------------------- +// - KeepAliveID() +// - ItemAdd() +//----------------------------------------------------------------------------- + +// Code not using ItemAdd() may need to call this manually otherwise ActiveId will be cleared. In IMGUI_VERSION_NUM < 18717 this was called by GetID(). +void ImGui::KeepAliveID(ImGuiID id) +{ + ImGuiContext& g = *GImGui; + if (g.ActiveId == id) + g.ActiveIdIsAlive = id; + if (g.DeactivatedItemData.ID == id) + g.DeactivatedItemData.IsAlive = true; +} + +// Declare item bounding box for clipping and interaction. +// Note that the size can be different than the one provided to ItemSize(). Typically, widgets that spread over available surface +// declare their minimum size requirement to ItemSize() and provide a larger region to ItemAdd() which is used drawing/interaction. +// THIS IS IN THE PERFORMANCE CRITICAL PATH (UNTIL THE CLIPPING TEST AND EARLY-RETURN) +IM_MSVC_RUNTIME_CHECKS_OFF +bool ImGui::ItemAdd(const ImRect& bb, ImGuiID id, const ImRect* nav_bb_arg, ImGuiItemFlags extra_flags) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + + // Set item data + // (DisplayRect is left untouched, made valid when ImGuiItemStatusFlags_HasDisplayRect is set) + g.LastItemData.ID = id; + g.LastItemData.Rect = bb; + g.LastItemData.NavRect = nav_bb_arg ? *nav_bb_arg : bb; + g.LastItemData.ItemFlags = g.CurrentItemFlags | g.NextItemData.ItemFlags | extra_flags; + g.LastItemData.StatusFlags = ImGuiItemStatusFlags_None; + // Note: we don't copy 'g.NextItemData.SelectionUserData' to an hypothetical g.LastItemData.SelectionUserData: since the former is not cleared. + + if (id != 0) + { + KeepAliveID(id); + + // Directional navigation processing + // Runs prior to clipping early-out + // (a) So that NavInitRequest can be honored, for newly opened windows to select a default widget + // (b) So that we can scroll up/down past clipped items. This adds a small O(N) cost to regular navigation requests + // unfortunately, but it is still limited to one window. It may not scale very well for windows with ten of + // thousands of item, but at least NavMoveRequest is only set on user interaction, aka maximum once a frame. + // We could early out with "if (is_clipped && !g.NavInitRequest) return false;" but when we wouldn't be able + // to reach unclipped widgets. This would work if user had explicit scrolling control (e.g. mapped on a stick). + // We intentionally don't check if g.NavWindow != NULL because g.NavAnyRequest should only be set when it is non null. + // If we crash on a NULL g.NavWindow we need to fix the bug elsewhere. + if (!(g.LastItemData.ItemFlags & ImGuiItemFlags_NoNav)) + { + // FIMXE-NAV: investigate changing the window tests into a simple 'if (g.NavFocusScopeId == g.CurrentFocusScopeId)' test. + window->DC.NavLayersActiveMaskNext |= (1 << window->DC.NavLayerCurrent); + if (g.NavId == id || g.NavAnyRequest) + if (g.NavWindow->RootWindowForNav == window->RootWindowForNav) + if (window == g.NavWindow || ((window->ChildFlags | g.NavWindow->ChildFlags) & ImGuiChildFlags_NavFlattened)) + NavProcessItem(); + } + + if (g.NextItemData.HasFlags & ImGuiNextItemDataFlags_HasShortcut) + ItemHandleShortcut(id); + } + + // Lightweight clear of SetNextItemXXX data. + g.NextItemData.HasFlags = ImGuiNextItemDataFlags_None; + g.NextItemData.ItemFlags = ImGuiItemFlags_None; + +#ifdef IMGUI_ENABLE_TEST_ENGINE + if (id != 0) + IMGUI_TEST_ENGINE_ITEM_ADD(id, g.LastItemData.NavRect, &g.LastItemData); +#endif + + // Clipping test + // (this is an inline copy of IsClippedEx() so we can reuse the is_rect_visible value, otherwise we'd do 'if (IsClippedEx(bb, id)) return false') + // g.NavActivateId is not necessarily == g.NavId, in the case of remote activation (e.g. shortcuts) + const bool is_rect_visible = bb.Overlaps(window->ClipRect); + if (!is_rect_visible) + if (id == 0 || (id != g.ActiveId && id != g.ActiveIdPreviousFrame && id != g.NavId && id != g.NavActivateId)) + if (!g.ItemUnclipByLog) + return false; + + // [DEBUG] +#ifndef IMGUI_DISABLE_DEBUG_TOOLS + if (id != 0) + { + if (id == g.DebugLocateId) + DebugLocateItemResolveWithLastItem(); + + // [DEBUG] People keep stumbling on this problem and using "" as identifier in the root of a window instead of "##something". + // Empty identifier are valid and useful in a small amount of cases, but 99.9% of the time you want to use "##something". + // READ THE FAQ: https://dearimgui.com/faq + IM_ASSERT(id != window->ID && "Cannot have an empty ID at the root of a window. If you need an empty label, use ## and read the FAQ about how the ID Stack works!"); + } + //if (g.IO.KeyAlt) window->DrawList->AddRect(bb.Min, bb.Max, IM_COL32(255,255,0,120)); // [DEBUG] + //if ((g.LastItemData.ItemFlags & ImGuiItemFlags_NoNav) == 0) + // window->DrawList->AddRect(g.LastItemData.NavRect.Min, g.LastItemData.NavRect.Max, IM_COL32(255,255,0,255)); // [DEBUG] +#endif + + if (id != 0 && g.DeactivatedItemData.ID == id) + g.DeactivatedItemData.ElapseFrame = g.FrameCount; + + // We need to calculate this now to take account of the current clipping rectangle (as items like Selectable may change them) + if (is_rect_visible) + g.LastItemData.StatusFlags |= ImGuiItemStatusFlags_Visible; + if (IsMouseHoveringRect(bb.Min, bb.Max)) + g.LastItemData.StatusFlags |= ImGuiItemStatusFlags_HoveredRect; + return true; +} +IM_MSVC_RUNTIME_CHECKS_RESTORE + +//----------------------------------------------------------------------------- +// [SECTION] LAYOUT +//----------------------------------------------------------------------------- +// - ItemSize() +// - SameLine() +// - GetCursorScreenPos() +// - SetCursorScreenPos() +// - GetCursorPos(), GetCursorPosX(), GetCursorPosY() +// - SetCursorPos(), SetCursorPosX(), SetCursorPosY() +// - GetCursorStartPos() +// - Indent() +// - Unindent() +// - SetNextItemWidth() +// - PushItemWidth() +// - PushMultiItemsWidths() +// - PopItemWidth() +// - CalcItemWidth() +// - CalcItemSize() +// - GetTextLineHeight() +// - GetTextLineHeightWithSpacing() +// - GetFrameHeight() +// - GetFrameHeightWithSpacing() +// - GetContentRegionMax() +// - GetContentRegionAvail(), +// - BeginGroup() +// - EndGroup() +// Also see in imgui_widgets: tab bars, and in imgui_tables: tables, columns. +//----------------------------------------------------------------------------- + +// Advance cursor given item size for layout. +// Register minimum needed size so it can extend the bounding box used for auto-fit calculation. +// See comments in ItemAdd() about how/why the size provided to ItemSize() vs ItemAdd() may often different. +// THIS IS IN THE PERFORMANCE CRITICAL PATH. +IM_MSVC_RUNTIME_CHECKS_OFF +void ImGui::ItemSize(const ImVec2& size, float text_baseline_y) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + if (window->SkipItems) + return; + + // We increase the height in this function to accommodate for baseline offset. + // In theory we should be offsetting the starting position (window->DC.CursorPos), that will be the topic of a larger refactor, + // but since ItemSize() is not yet an API that moves the cursor (to handle e.g. wrapping) enlarging the height has the same effect. + const float offset_to_match_baseline_y = (text_baseline_y >= 0) ? ImMax(0.0f, window->DC.CurrLineTextBaseOffset - text_baseline_y) : 0.0f; + + const float line_y1 = window->DC.IsSameLine ? window->DC.CursorPosPrevLine.y : window->DC.CursorPos.y; + const float line_height = ImMax(window->DC.CurrLineSize.y, /*ImMax(*/window->DC.CursorPos.y - line_y1/*, 0.0f)*/ + size.y + offset_to_match_baseline_y); + + // Always align ourselves on pixel boundaries + //if (g.IO.KeyAlt) window->DrawList->AddRect(window->DC.CursorPos, window->DC.CursorPos + ImVec2(size.x, line_height), IM_COL32(255,0,0,200)); // [DEBUG] + window->DC.CursorPosPrevLine.x = window->DC.CursorPos.x + size.x; + window->DC.CursorPosPrevLine.y = line_y1; + window->DC.CursorPos.x = IM_TRUNC(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x); // Next line + window->DC.CursorPos.y = IM_TRUNC(line_y1 + line_height + g.Style.ItemSpacing.y); // Next line + window->DC.CursorMaxPos.x = ImMax(window->DC.CursorMaxPos.x, window->DC.CursorPosPrevLine.x); + window->DC.CursorMaxPos.y = ImMax(window->DC.CursorMaxPos.y, window->DC.CursorPos.y - g.Style.ItemSpacing.y); + //if (g.IO.KeyAlt) window->DrawList->AddCircle(window->DC.CursorMaxPos, 3.0f, IM_COL32(255,0,0,255), 4); // [DEBUG] + + window->DC.PrevLineSize.y = line_height; + window->DC.CurrLineSize.y = 0.0f; + window->DC.PrevLineTextBaseOffset = ImMax(window->DC.CurrLineTextBaseOffset, text_baseline_y); + window->DC.CurrLineTextBaseOffset = 0.0f; + window->DC.IsSameLine = window->DC.IsSetPos = false; + + // Horizontal layout mode + if (window->DC.LayoutType == ImGuiLayoutType_Horizontal) + SameLine(); +} +IM_MSVC_RUNTIME_CHECKS_RESTORE + +// Gets back to previous line and continue with horizontal layout +// offset_from_start_x == 0 : follow right after previous item +// offset_from_start_x != 0 : align to specified x position (relative to window/group left) +// spacing_w < 0 : use default spacing if offset_from_start_x == 0, no spacing if offset_from_start_x != 0 +// spacing_w >= 0 : enforce spacing amount +void ImGui::SameLine(float offset_from_start_x, float spacing_w) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + if (window->SkipItems) + return; + + if (offset_from_start_x != 0.0f) + { + if (spacing_w < 0.0f) + spacing_w = 0.0f; + window->DC.CursorPos.x = window->Pos.x - window->Scroll.x + offset_from_start_x + spacing_w + window->DC.GroupOffset.x + window->DC.ColumnsOffset.x; + window->DC.CursorPos.y = window->DC.CursorPosPrevLine.y; + } + else + { + if (spacing_w < 0.0f) + spacing_w = g.Style.ItemSpacing.x; + window->DC.CursorPos.x = window->DC.CursorPosPrevLine.x + spacing_w; + window->DC.CursorPos.y = window->DC.CursorPosPrevLine.y; + } + window->DC.CurrLineSize = window->DC.PrevLineSize; + window->DC.CurrLineTextBaseOffset = window->DC.PrevLineTextBaseOffset; + window->DC.IsSameLine = true; +} + +ImVec2 ImGui::GetCursorScreenPos() +{ + ImGuiWindow* window = GetCurrentWindowRead(); + return window->DC.CursorPos; +} + +void ImGui::SetCursorScreenPos(const ImVec2& pos) +{ + ImGuiWindow* window = GetCurrentWindow(); + window->DC.CursorPos = pos; + //window->DC.CursorMaxPos = ImMax(window->DC.CursorMaxPos, window->DC.CursorPos); + window->DC.IsSetPos = true; } // User generally sees positions in window coordinates. Internally we store CursorPos in absolute screen coordinates because it is more convenient. @@ -6909,21 +11464,24 @@ void ImGui::SetCursorPos(const ImVec2& local_pos) { ImGuiWindow* window = GetCurrentWindow(); window->DC.CursorPos = window->Pos - window->Scroll + local_pos; - window->DC.CursorMaxPos = ImMax(window->DC.CursorMaxPos, window->DC.CursorPos); + //window->DC.CursorMaxPos = ImMax(window->DC.CursorMaxPos, window->DC.CursorPos); + window->DC.IsSetPos = true; } void ImGui::SetCursorPosX(float x) { ImGuiWindow* window = GetCurrentWindow(); window->DC.CursorPos.x = window->Pos.x - window->Scroll.x + x; - window->DC.CursorMaxPos.x = ImMax(window->DC.CursorMaxPos.x, window->DC.CursorPos.x); + //window->DC.CursorMaxPos.x = ImMax(window->DC.CursorMaxPos.x, window->DC.CursorPos.x); + window->DC.IsSetPos = true; } void ImGui::SetCursorPosY(float y) { ImGuiWindow* window = GetCurrentWindow(); window->DC.CursorPos.y = window->Pos.y - window->Scroll.y + y; - window->DC.CursorMaxPos.y = ImMax(window->DC.CursorMaxPos.y, window->DC.CursorPos.y); + //window->DC.CursorMaxPos.y = ImMax(window->DC.CursorMaxPos.y, window->DC.CursorPos.y); + window->DC.IsSetPos = true; } ImVec2 ImGui::GetCursorStartPos() @@ -6932,239 +11490,6 @@ ImVec2 ImGui::GetCursorStartPos() return window->DC.CursorStartPos - window->Pos; } -ImVec2 ImGui::GetCursorScreenPos() -{ - ImGuiWindow* window = GetCurrentWindowRead(); - return window->DC.CursorPos; -} - -void ImGui::SetCursorScreenPos(const ImVec2& pos) -{ - ImGuiWindow* window = GetCurrentWindow(); - window->DC.CursorPos = pos; - window->DC.CursorMaxPos = ImMax(window->DC.CursorMaxPos, window->DC.CursorPos); -} - -void ImGui::ActivateItem(ImGuiID id) -{ - ImGuiContext& g = *GImGui; - g.NavNextActivateId = id; -} - -void ImGui::SetKeyboardFocusHere(int offset) -{ - IM_ASSERT(offset >= -1); // -1 is allowed but not below - ImGuiContext& g = *GImGui; - ImGuiWindow* window = g.CurrentWindow; - g.FocusRequestNextWindow = window; - g.FocusRequestNextCounterAll = window->DC.FocusCounterAll + 1 + offset; - g.FocusRequestNextCounterTab = INT_MAX; -} - -void ImGui::SetItemDefaultFocus() -{ - ImGuiContext& g = *GImGui; - ImGuiWindow* window = g.CurrentWindow; - if (!window->Appearing) - return; - if (g.NavWindow == window->RootWindowForNav && (g.NavInitRequest || g.NavInitResultId != 0) && g.NavLayer == g.NavWindow->DC.NavLayerCurrent) - { - g.NavInitRequest = false; - g.NavInitResultId = g.NavWindow->DC.LastItemId; - g.NavInitResultRectRel = ImRect(g.NavWindow->DC.LastItemRect.Min - g.NavWindow->Pos, g.NavWindow->DC.LastItemRect.Max - g.NavWindow->Pos); - NavUpdateAnyRequestFlag(); - if (!IsItemVisible()) - SetScrollHereY(); - } -} - -void ImGui::SetStateStorage(ImGuiStorage* tree) -{ - ImGuiWindow* window = GImGui->CurrentWindow; - window->DC.StateStorage = tree ? tree : &window->StateStorage; -} - -ImGuiStorage* ImGui::GetStateStorage() -{ - ImGuiWindow* window = GImGui->CurrentWindow; - return window->DC.StateStorage; -} - -void ImGui::PushID(const char* str_id) -{ - ImGuiWindow* window = GImGui->CurrentWindow; - window->IDStack.push_back(window->GetIDNoKeepAlive(str_id)); -} - -void ImGui::PushID(const char* str_id_begin, const char* str_id_end) -{ - ImGuiWindow* window = GImGui->CurrentWindow; - window->IDStack.push_back(window->GetIDNoKeepAlive(str_id_begin, str_id_end)); -} - -void ImGui::PushID(const void* ptr_id) -{ - ImGuiWindow* window = GImGui->CurrentWindow; - window->IDStack.push_back(window->GetIDNoKeepAlive(ptr_id)); -} - -void ImGui::PushID(int int_id) -{ - ImGuiWindow* window = GImGui->CurrentWindow; - window->IDStack.push_back(window->GetIDNoKeepAlive(int_id)); -} - -// Push a given id value ignoring the ID stack as a seed. -void ImGui::PushOverrideID(ImGuiID id) -{ - ImGuiWindow* window = GImGui->CurrentWindow; - window->IDStack.push_back(id); -} - -void ImGui::PopID() -{ - ImGuiWindow* window = GImGui->CurrentWindow; - window->IDStack.pop_back(); -} - -ImGuiID ImGui::GetID(const char* str_id) -{ - ImGuiWindow* window = GImGui->CurrentWindow; - return window->GetID(str_id); -} - -ImGuiID ImGui::GetID(const char* str_id_begin, const char* str_id_end) -{ - ImGuiWindow* window = GImGui->CurrentWindow; - return window->GetID(str_id_begin, str_id_end); -} - -ImGuiID ImGui::GetID(const void* ptr_id) -{ - ImGuiWindow* window = GImGui->CurrentWindow; - return window->GetID(ptr_id); -} - -bool ImGui::IsRectVisible(const ImVec2& size) -{ - ImGuiWindow* window = GImGui->CurrentWindow; - return window->ClipRect.Overlaps(ImRect(window->DC.CursorPos, window->DC.CursorPos + size)); -} - -bool ImGui::IsRectVisible(const ImVec2& rect_min, const ImVec2& rect_max) -{ - ImGuiWindow* window = GImGui->CurrentWindow; - return window->ClipRect.Overlaps(ImRect(rect_min, rect_max)); -} - -// Lock horizontal starting position + capture group bounding box into one "item" (so you can use IsItemHovered() or layout primitives such as SameLine() on whole group, etc.) -void ImGui::BeginGroup() -{ - ImGuiContext& g = *GImGui; - ImGuiWindow* window = GetCurrentWindow(); - - window->DC.GroupStack.resize(window->DC.GroupStack.Size + 1); - ImGuiGroupData& group_data = window->DC.GroupStack.back(); - group_data.BackupCursorPos = window->DC.CursorPos; - group_data.BackupCursorMaxPos = window->DC.CursorMaxPos; - group_data.BackupIndent = window->DC.Indent; - group_data.BackupGroupOffset = window->DC.GroupOffset; - group_data.BackupCurrLineSize = window->DC.CurrLineSize; - group_data.BackupCurrLineTextBaseOffset = window->DC.CurrLineTextBaseOffset; - group_data.BackupActiveIdIsAlive = g.ActiveIdIsAlive; - group_data.BackupActiveIdPreviousFrameIsAlive = g.ActiveIdPreviousFrameIsAlive; - group_data.EmitItem = true; - - window->DC.GroupOffset.x = window->DC.CursorPos.x - window->Pos.x - window->DC.ColumnsOffset.x; - window->DC.Indent = window->DC.GroupOffset; - window->DC.CursorMaxPos = window->DC.CursorPos; - window->DC.CurrLineSize = ImVec2(0.0f, 0.0f); - if (g.LogEnabled) - g.LogLinePosY = -FLT_MAX; // To enforce Log carriage return -} - -void ImGui::EndGroup() -{ - ImGuiContext& g = *GImGui; - ImGuiWindow* window = GetCurrentWindow(); - IM_ASSERT(!window->DC.GroupStack.empty()); // Mismatched BeginGroup()/EndGroup() calls - - ImGuiGroupData& group_data = window->DC.GroupStack.back(); - - ImRect group_bb(group_data.BackupCursorPos, ImMax(window->DC.CursorMaxPos, group_data.BackupCursorPos)); - - window->DC.CursorPos = group_data.BackupCursorPos; - window->DC.CursorMaxPos = ImMax(group_data.BackupCursorMaxPos, window->DC.CursorMaxPos); - window->DC.Indent = group_data.BackupIndent; - window->DC.GroupOffset = group_data.BackupGroupOffset; - window->DC.CurrLineSize = group_data.BackupCurrLineSize; - window->DC.CurrLineTextBaseOffset = group_data.BackupCurrLineTextBaseOffset; - if (g.LogEnabled) - g.LogLinePosY = -FLT_MAX; // To enforce Log carriage return - - if (!group_data.EmitItem) - { - window->DC.GroupStack.pop_back(); - return; - } - - window->DC.CurrLineTextBaseOffset = ImMax(window->DC.PrevLineTextBaseOffset, group_data.BackupCurrLineTextBaseOffset); // FIXME: Incorrect, we should grab the base offset from the *first line* of the group but it is hard to obtain now. - ItemSize(group_bb.GetSize(), 0.0f); - ItemAdd(group_bb, 0); - - // If the current ActiveId was declared within the boundary of our group, we copy it to LastItemId so IsItemActive(), IsItemDeactivated() etc. will be functional on the entire group. - // It would be be neater if we replaced window.DC.LastItemId by e.g. 'bool LastItemIsActive', but would put a little more burden on individual widgets. - // Also if you grep for LastItemId you'll notice it is only used in that context. - // (The tests not symmetrical because ActiveIdIsAlive is an ID itself, in order to be able to handle ActiveId being overwritten during the frame.) - const bool group_contains_curr_active_id = (group_data.BackupActiveIdIsAlive != g.ActiveId) && (g.ActiveIdIsAlive == g.ActiveId) && g.ActiveId; - const bool group_contains_prev_active_id = !group_data.BackupActiveIdPreviousFrameIsAlive && g.ActiveIdPreviousFrameIsAlive; - if (group_contains_curr_active_id) - window->DC.LastItemId = g.ActiveId; - else if (group_contains_prev_active_id) - window->DC.LastItemId = g.ActiveIdPreviousFrame; - window->DC.LastItemRect = group_bb; - - // Forward Edited flag - if (group_contains_curr_active_id && g.ActiveIdHasBeenEditedThisFrame) - window->DC.LastItemStatusFlags |= ImGuiItemStatusFlags_Edited; - - // Forward Deactivated flag - window->DC.LastItemStatusFlags |= ImGuiItemStatusFlags_HasDeactivated; - if (group_contains_prev_active_id && g.ActiveId != g.ActiveIdPreviousFrame) - window->DC.LastItemStatusFlags |= ImGuiItemStatusFlags_Deactivated; - - window->DC.GroupStack.pop_back(); - //window->DrawList->AddRect(group_bb.Min, group_bb.Max, IM_COL32(255,0,255,255)); // [Debug] -} - -// Gets back to previous line and continue with horizontal layout -// offset_from_start_x == 0 : follow right after previous item -// offset_from_start_x != 0 : align to specified x position (relative to window/group left) -// spacing_w < 0 : use default spacing if pos_x == 0, no spacing if pos_x != 0 -// spacing_w >= 0 : enforce spacing amount -void ImGui::SameLine(float offset_from_start_x, float spacing_w) -{ - ImGuiWindow* window = GetCurrentWindow(); - if (window->SkipItems) - return; - - ImGuiContext& g = *GImGui; - if (offset_from_start_x != 0.0f) - { - if (spacing_w < 0.0f) spacing_w = 0.0f; - window->DC.CursorPos.x = window->Pos.x - window->Scroll.x + offset_from_start_x + spacing_w + window->DC.GroupOffset.x + window->DC.ColumnsOffset.x; - window->DC.CursorPos.y = window->DC.CursorPosPrevLine.y; - } - else - { - if (spacing_w < 0.0f) spacing_w = g.Style.ItemSpacing.x; - window->DC.CursorPos.x = window->DC.CursorPosPrevLine.x + spacing_w; - window->DC.CursorPos.y = window->DC.CursorPosPrevLine.y; - } - window->DC.CurrLineSize = window->DC.PrevLineSize; - window->DC.CurrLineTextBaseOffset = window->DC.PrevLineTextBaseOffset; -} - void ImGui::Indent(float indent_w) { ImGuiContext& g = *GImGui; @@ -7181,72 +11506,375 @@ void ImGui::Unindent(float indent_w) window->DC.CursorPos.x = window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x; } +// Affect large frame+labels widgets only. +void ImGui::SetNextItemWidth(float item_width) +{ + ImGuiContext& g = *GImGui; + g.NextItemData.HasFlags |= ImGuiNextItemDataFlags_HasWidth; + g.NextItemData.Width = item_width; +} + +// FIXME: Remove the == 0.0f behavior? +void ImGui::PushItemWidth(float item_width) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + window->DC.ItemWidthStack.push_back(window->DC.ItemWidth); // Backup current width + window->DC.ItemWidth = (item_width == 0.0f ? window->ItemWidthDefault : item_width); + g.NextItemData.HasFlags &= ~ImGuiNextItemDataFlags_HasWidth; +} + +void ImGui::PushMultiItemsWidths(int components, float w_full) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + IM_ASSERT(components > 0); + const ImGuiStyle& style = g.Style; + window->DC.ItemWidthStack.push_back(window->DC.ItemWidth); // Backup current width + float w_items = w_full - style.ItemInnerSpacing.x * (components - 1); + float prev_split = w_items; + for (int i = components - 1; i > 0; i--) + { + float next_split = IM_TRUNC(w_items * i / components); + window->DC.ItemWidthStack.push_back(ImMax(prev_split - next_split, 1.0f)); + prev_split = next_split; + } + window->DC.ItemWidth = ImMax(prev_split, 1.0f); + g.NextItemData.HasFlags &= ~ImGuiNextItemDataFlags_HasWidth; +} + +void ImGui::PopItemWidth() +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + if (window->DC.ItemWidthStack.Size <= 0) + { + IM_ASSERT_USER_ERROR(0, "Calling PopItemWidth() too many times!"); + return; + } + window->DC.ItemWidth = window->DC.ItemWidthStack.back(); + window->DC.ItemWidthStack.pop_back(); +} + +// Calculate default item width given value passed to PushItemWidth() or SetNextItemWidth(). +// The SetNextItemWidth() data is generally cleared/consumed by ItemAdd() or NextItemData.ClearFlags() +float ImGui::CalcItemWidth() +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + float w; + if (g.NextItemData.HasFlags & ImGuiNextItemDataFlags_HasWidth) + w = g.NextItemData.Width; + else + w = window->DC.ItemWidth; + if (w < 0.0f) + { + float region_avail_x = GetContentRegionAvail().x; + w = ImMax(1.0f, region_avail_x + w); + } + w = IM_TRUNC(w); + return w; +} + +// [Internal] Calculate full item size given user provided 'size' parameter and default width/height. Default width is often == CalcItemWidth(). +// Those two functions CalcItemWidth vs CalcItemSize are awkwardly named because they are not fully symmetrical. +// Note that only CalcItemWidth() is publicly exposed. +// The 4.0f here may be changed to match CalcItemWidth() and/or BeginChild() (right now we have a mismatch which is harmless but undesirable) +ImVec2 ImGui::CalcItemSize(ImVec2 size, float default_w, float default_h) +{ + ImVec2 avail; + if (size.x < 0.0f || size.y < 0.0f) + avail = GetContentRegionAvail(); + + if (size.x == 0.0f) + size.x = default_w; + else if (size.x < 0.0f) + size.x = ImMax(4.0f, avail.x + size.x); // <-- size.x is negative here so we are subtracting + + if (size.y == 0.0f) + size.y = default_h; + else if (size.y < 0.0f) + size.y = ImMax(4.0f, avail.y + size.y); // <-- size.y is negative here so we are subtracting + + return size; +} + +float ImGui::GetTextLineHeight() +{ + ImGuiContext& g = *GImGui; + return g.FontSize; +} + +float ImGui::GetTextLineHeightWithSpacing() +{ + ImGuiContext& g = *GImGui; + return g.FontSize + g.Style.ItemSpacing.y; +} + +float ImGui::GetFrameHeight() +{ + ImGuiContext& g = *GImGui; + return g.FontSize + g.Style.FramePadding.y * 2.0f; +} + +float ImGui::GetFrameHeightWithSpacing() +{ + ImGuiContext& g = *GImGui; + return g.FontSize + g.Style.FramePadding.y * 2.0f + g.Style.ItemSpacing.y; +} + +ImVec2 ImGui::GetContentRegionAvail() +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + ImVec2 mx = (window->DC.CurrentColumns || g.CurrentTable) ? window->WorkRect.Max : window->ContentRegionRect.Max; + return mx - window->DC.CursorPos; +} + +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + +// You should never need those functions. Always use GetCursorScreenPos() and GetContentRegionAvail()! +// They are bizarre local-coordinates which don't play well with scrolling. +ImVec2 ImGui::GetContentRegionMax() +{ + return GetContentRegionAvail() + GetCursorScreenPos() - GetWindowPos(); +} + +ImVec2 ImGui::GetWindowContentRegionMin() +{ + ImGuiWindow* window = GImGui->CurrentWindow; + return window->ContentRegionRect.Min - window->Pos; +} + +ImVec2 ImGui::GetWindowContentRegionMax() +{ + ImGuiWindow* window = GImGui->CurrentWindow; + return window->ContentRegionRect.Max - window->Pos; +} +#endif + +// Lock horizontal starting position + capture group bounding box into one "item" (so you can use IsItemHovered() or layout primitives such as SameLine() on whole group, etc.) +// Groups are currently a mishmash of functionalities which should perhaps be clarified and separated. +// FIXME-OPT: Could we safely early out on ->SkipItems? +void ImGui::BeginGroup() +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + + g.GroupStack.resize(g.GroupStack.Size + 1); + ImGuiGroupData& group_data = g.GroupStack.back(); + group_data.WindowID = window->ID; + group_data.BackupCursorPos = window->DC.CursorPos; + group_data.BackupCursorPosPrevLine = window->DC.CursorPosPrevLine; + group_data.BackupCursorMaxPos = window->DC.CursorMaxPos; + group_data.BackupIndent = window->DC.Indent; + group_data.BackupGroupOffset = window->DC.GroupOffset; + group_data.BackupCurrLineSize = window->DC.CurrLineSize; + group_data.BackupCurrLineTextBaseOffset = window->DC.CurrLineTextBaseOffset; + group_data.BackupActiveIdIsAlive = g.ActiveIdIsAlive; + group_data.BackupHoveredIdIsAlive = g.HoveredId != 0; + group_data.BackupIsSameLine = window->DC.IsSameLine; + group_data.BackupDeactivatedIdIsAlive = g.DeactivatedItemData.IsAlive; + group_data.EmitItem = true; + + window->DC.GroupOffset.x = window->DC.CursorPos.x - window->Pos.x - window->DC.ColumnsOffset.x; + window->DC.Indent = window->DC.GroupOffset; + window->DC.CursorMaxPos = window->DC.CursorPos; + window->DC.CurrLineSize = ImVec2(0.0f, 0.0f); + if (g.LogEnabled) + g.LogLinePosY = -FLT_MAX; // To enforce a carriage return +} + +void ImGui::EndGroup() +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + IM_ASSERT(g.GroupStack.Size > 0); // Mismatched BeginGroup()/EndGroup() calls + + ImGuiGroupData& group_data = g.GroupStack.back(); + IM_ASSERT(group_data.WindowID == window->ID); // EndGroup() in wrong window? + + if (window->DC.IsSetPos) + ErrorCheckUsingSetCursorPosToExtendParentBoundaries(); + + // Include LastItemData.Rect.Max as a workaround for e.g. EndTable() undershooting with CursorMaxPos report. (#7543) + ImRect group_bb(group_data.BackupCursorPos, ImMax(ImMax(window->DC.CursorMaxPos, g.LastItemData.Rect.Max), group_data.BackupCursorPos)); + window->DC.CursorPos = group_data.BackupCursorPos; + window->DC.CursorPosPrevLine = group_data.BackupCursorPosPrevLine; + window->DC.CursorMaxPos = ImMax(group_data.BackupCursorMaxPos, group_bb.Max); + window->DC.Indent = group_data.BackupIndent; + window->DC.GroupOffset = group_data.BackupGroupOffset; + window->DC.CurrLineSize = group_data.BackupCurrLineSize; + window->DC.CurrLineTextBaseOffset = group_data.BackupCurrLineTextBaseOffset; + window->DC.IsSameLine = group_data.BackupIsSameLine; + if (g.LogEnabled) + g.LogLinePosY = -FLT_MAX; // To enforce a carriage return + + if (!group_data.EmitItem) + { + g.GroupStack.pop_back(); + return; + } + + window->DC.CurrLineTextBaseOffset = ImMax(window->DC.PrevLineTextBaseOffset, group_data.BackupCurrLineTextBaseOffset); // FIXME: Incorrect, we should grab the base offset from the *first line* of the group but it is hard to obtain now. + ItemSize(group_bb.GetSize()); + ItemAdd(group_bb, 0, NULL, ImGuiItemFlags_NoTabStop); + + // If the current ActiveId was declared within the boundary of our group, we copy it to LastItemId so IsItemActive(), IsItemDeactivated() etc. will be functional on the entire group. + // It would be neater if we replaced window.DC.LastItemId by e.g. 'bool LastItemIsActive', but would put a little more burden on individual widgets. + // Also if you grep for LastItemId you'll notice it is only used in that context. + // (The two tests not the same because ActiveIdIsAlive is an ID itself, in order to be able to handle ActiveId being overwritten during the frame.) + const bool group_contains_curr_active_id = (group_data.BackupActiveIdIsAlive != g.ActiveId) && (g.ActiveIdIsAlive == g.ActiveId) && g.ActiveId; + const bool group_contains_deactivated_id = (group_data.BackupDeactivatedIdIsAlive == false) && (g.DeactivatedItemData.IsAlive == true); + if (group_contains_curr_active_id) + g.LastItemData.ID = g.ActiveId; + else if (group_contains_deactivated_id) + g.LastItemData.ID = g.DeactivatedItemData.ID; + g.LastItemData.Rect = group_bb; + + // Forward Hovered flag + const bool group_contains_curr_hovered_id = (group_data.BackupHoveredIdIsAlive == false) && g.HoveredId != 0; + if (group_contains_curr_hovered_id) + g.LastItemData.StatusFlags |= ImGuiItemStatusFlags_HoveredWindow; + + // Forward Edited flag + if (group_contains_curr_active_id && g.ActiveIdHasBeenEditedThisFrame) + g.LastItemData.StatusFlags |= ImGuiItemStatusFlags_Edited; + + // Forward Deactivated flag + g.LastItemData.StatusFlags |= ImGuiItemStatusFlags_HasDeactivated; + if (group_contains_deactivated_id) + g.LastItemData.StatusFlags |= ImGuiItemStatusFlags_Deactivated; + + g.GroupStack.pop_back(); + if (g.DebugShowGroupRects) + window->DrawList->AddRect(group_bb.Min, group_bb.Max, IM_COL32(255,0,255,255)); // [Debug] +} + //----------------------------------------------------------------------------- // [SECTION] SCROLLING //----------------------------------------------------------------------------- -static ImVec2 CalcNextScrollFromScrollTargetAndClamp(ImGuiWindow* window, bool snap_on_edges) +// Helper to snap on edges when aiming at an item very close to the edge, +// So the difference between WindowPadding and ItemSpacing will be in the visible area after scrolling. +// When we refactor the scrolling API this may be configurable with a flag? +// Note that the effect for this won't be visible on X axis with default Style settings as WindowPadding.x == ItemSpacing.x by default. +static float CalcScrollEdgeSnap(float target, float snap_min, float snap_max, float snap_threshold, float center_ratio) +{ + if (target <= snap_min + snap_threshold) + return ImLerp(snap_min, target, center_ratio); + if (target >= snap_max - snap_threshold) + return ImLerp(target, snap_max, center_ratio); + return target; +} + +static ImVec2 CalcNextScrollFromScrollTargetAndClamp(ImGuiWindow* window) { - ImGuiContext& g = *GImGui; ImVec2 scroll = window->Scroll; - if (window->ScrollTarget.x < FLT_MAX) + ImVec2 decoration_size(window->DecoOuterSizeX1 + window->DecoInnerSizeX1 + window->DecoOuterSizeX2, window->DecoOuterSizeY1 + window->DecoInnerSizeY1 + window->DecoOuterSizeY2); + for (int axis = 0; axis < 2; axis++) { - float cr_x = window->ScrollTargetCenterRatio.x; - float target_x = window->ScrollTarget.x; - if (snap_on_edges && cr_x <= 0.0f && target_x <= window->WindowPadding.x) - target_x = 0.0f; - else if (snap_on_edges && cr_x >= 1.0f && target_x >= window->ContentSize.x + window->WindowPadding.x + g.Style.ItemSpacing.x) - target_x = window->ContentSize.x + window->WindowPadding.x * 2.0f; - scroll.x = target_x - cr_x * (window->SizeFull.x - window->ScrollbarSizes.x); - } - if (window->ScrollTarget.y < FLT_MAX) - { - // 'snap_on_edges' allows for a discontinuity at the edge of scrolling limits to take account of WindowPadding so that scrolling to make the last item visible scroll far enough to see the padding. - float decoration_up_height = window->TitleBarHeight() + window->MenuBarHeight(); - float cr_y = window->ScrollTargetCenterRatio.y; - float target_y = window->ScrollTarget.y; - if (snap_on_edges && cr_y <= 0.0f && target_y <= window->WindowPadding.y) - target_y = 0.0f; - if (snap_on_edges && cr_y >= 1.0f && target_y >= window->ContentSize.y + window->WindowPadding.y + g.Style.ItemSpacing.y) - target_y = window->ContentSize.y + window->WindowPadding.y * 2.0f; - scroll.y = target_y - cr_y * (window->SizeFull.y - window->ScrollbarSizes.y - decoration_up_height); - } - scroll = ImMax(scroll, ImVec2(0.0f, 0.0f)); - if (!window->Collapsed && !window->SkipItems) - { - scroll.x = ImMin(scroll.x, window->ScrollMax.x); - scroll.y = ImMin(scroll.y, window->ScrollMax.y); + if (window->ScrollTarget[axis] < FLT_MAX) + { + float center_ratio = window->ScrollTargetCenterRatio[axis]; + float scroll_target = window->ScrollTarget[axis]; + if (window->ScrollTargetEdgeSnapDist[axis] > 0.0f) + { + float snap_min = 0.0f; + float snap_max = window->ScrollMax[axis] + window->SizeFull[axis] - decoration_size[axis]; + scroll_target = CalcScrollEdgeSnap(scroll_target, snap_min, snap_max, window->ScrollTargetEdgeSnapDist[axis], center_ratio); + } + scroll[axis] = scroll_target - center_ratio * (window->SizeFull[axis] - decoration_size[axis]); + } + scroll[axis] = IM_ROUND(ImMax(scroll[axis], 0.0f)); + if (!window->Collapsed && !window->SkipItems) + scroll[axis] = ImMin(scroll[axis], window->ScrollMax[axis]); } return scroll; } -// Scroll to keep newly navigated item fully into view -ImVec2 ImGui::ScrollToBringRectIntoView(ImGuiWindow* window, const ImRect& item_rect) +void ImGui::ScrollToItem(ImGuiScrollFlags flags) { ImGuiContext& g = *GImGui; - ImRect window_rect(window->InnerRect.Min - ImVec2(1, 1), window->InnerRect.Max + ImVec2(1, 1)); - //GetForegroundDrawList(window)->AddRect(window_rect.Min, window_rect.Max, IM_COL32_WHITE); // [DEBUG] + ImGuiWindow* window = g.CurrentWindow; + ScrollToRectEx(window, g.LastItemData.NavRect, flags); +} - ImVec2 delta_scroll; - if (!window_rect.Contains(item_rect)) +void ImGui::ScrollToRect(ImGuiWindow* window, const ImRect& item_rect, ImGuiScrollFlags flags) +{ + ScrollToRectEx(window, item_rect, flags); +} + +// Scroll to keep newly navigated item fully into view +ImVec2 ImGui::ScrollToRectEx(ImGuiWindow* window, const ImRect& item_rect, ImGuiScrollFlags flags) +{ + ImGuiContext& g = *GImGui; + ImRect scroll_rect(window->InnerRect.Min - ImVec2(1, 1), window->InnerRect.Max + ImVec2(1, 1)); + scroll_rect.Min.x = ImMin(scroll_rect.Min.x + window->DecoInnerSizeX1, scroll_rect.Max.x); + scroll_rect.Min.y = ImMin(scroll_rect.Min.y + window->DecoInnerSizeY1, scroll_rect.Max.y); + //GetForegroundDrawList(window)->AddRect(item_rect.Min, item_rect.Max, IM_COL32(255,0,0,255), 0.0f, 0, 5.0f); // [DEBUG] + //GetForegroundDrawList(window)->AddRect(scroll_rect.Min, scroll_rect.Max, IM_COL32_WHITE); // [DEBUG] + + // Check that only one behavior is selected per axis + IM_ASSERT((flags & ImGuiScrollFlags_MaskX_) == 0 || ImIsPowerOfTwo(flags & ImGuiScrollFlags_MaskX_)); + IM_ASSERT((flags & ImGuiScrollFlags_MaskY_) == 0 || ImIsPowerOfTwo(flags & ImGuiScrollFlags_MaskY_)); + + // Defaults + ImGuiScrollFlags in_flags = flags; + if ((flags & ImGuiScrollFlags_MaskX_) == 0 && window->ScrollbarX) + flags |= ImGuiScrollFlags_KeepVisibleEdgeX; + if ((flags & ImGuiScrollFlags_MaskY_) == 0) + flags |= window->Appearing ? ImGuiScrollFlags_AlwaysCenterY : ImGuiScrollFlags_KeepVisibleEdgeY; + + const bool fully_visible_x = item_rect.Min.x >= scroll_rect.Min.x && item_rect.Max.x <= scroll_rect.Max.x; + const bool fully_visible_y = item_rect.Min.y >= scroll_rect.Min.y && item_rect.Max.y <= scroll_rect.Max.y; + const bool can_be_fully_visible_x = (item_rect.GetWidth() + g.Style.ItemSpacing.x * 2.0f) <= scroll_rect.GetWidth() || (window->AutoFitFramesX > 0) || (window->Flags & ImGuiWindowFlags_AlwaysAutoResize) != 0; + const bool can_be_fully_visible_y = (item_rect.GetHeight() + g.Style.ItemSpacing.y * 2.0f) <= scroll_rect.GetHeight() || (window->AutoFitFramesY > 0) || (window->Flags & ImGuiWindowFlags_AlwaysAutoResize) != 0; + + if ((flags & ImGuiScrollFlags_KeepVisibleEdgeX) && !fully_visible_x) { - if (window->ScrollbarX && item_rect.Min.x < window_rect.Min.x) - SetScrollFromPosX(window, item_rect.Min.x - window->Pos.x + g.Style.ItemSpacing.x, 0.0f); - else if (window->ScrollbarX && item_rect.Max.x >= window_rect.Max.x) - SetScrollFromPosX(window, item_rect.Max.x - window->Pos.x + g.Style.ItemSpacing.x, 1.0f); - if (item_rect.Min.y < window_rect.Min.y) - SetScrollFromPosY(window, item_rect.Min.y - window->Pos.y - g.Style.ItemSpacing.y, 0.0f); - else if (item_rect.Max.y >= window_rect.Max.y) - SetScrollFromPosY(window, item_rect.Max.y - window->Pos.y + g.Style.ItemSpacing.y, 1.0f); - - ImVec2 next_scroll = CalcNextScrollFromScrollTargetAndClamp(window, false); - delta_scroll = next_scroll - window->Scroll; + if (item_rect.Min.x < scroll_rect.Min.x || !can_be_fully_visible_x) + SetScrollFromPosX(window, item_rect.Min.x - g.Style.ItemSpacing.x - window->Pos.x, 0.0f); + else if (item_rect.Max.x >= scroll_rect.Max.x) + SetScrollFromPosX(window, item_rect.Max.x + g.Style.ItemSpacing.x - window->Pos.x, 1.0f); + } + else if (((flags & ImGuiScrollFlags_KeepVisibleCenterX) && !fully_visible_x) || (flags & ImGuiScrollFlags_AlwaysCenterX)) + { + if (can_be_fully_visible_x) + SetScrollFromPosX(window, ImTrunc((item_rect.Min.x + item_rect.Max.x) * 0.5f) - window->Pos.x, 0.5f); + else + SetScrollFromPosX(window, item_rect.Min.x - window->Pos.x, 0.0f); } + if ((flags & ImGuiScrollFlags_KeepVisibleEdgeY) && !fully_visible_y) + { + if (item_rect.Min.y < scroll_rect.Min.y || !can_be_fully_visible_y) + SetScrollFromPosY(window, item_rect.Min.y - g.Style.ItemSpacing.y - window->Pos.y, 0.0f); + else if (item_rect.Max.y >= scroll_rect.Max.y) + SetScrollFromPosY(window, item_rect.Max.y + g.Style.ItemSpacing.y - window->Pos.y, 1.0f); + } + else if (((flags & ImGuiScrollFlags_KeepVisibleCenterY) && !fully_visible_y) || (flags & ImGuiScrollFlags_AlwaysCenterY)) + { + if (can_be_fully_visible_y) + SetScrollFromPosY(window, ImTrunc((item_rect.Min.y + item_rect.Max.y) * 0.5f) - window->Pos.y, 0.5f); + else + SetScrollFromPosY(window, item_rect.Min.y - window->Pos.y, 0.0f); + } + + ImVec2 next_scroll = CalcNextScrollFromScrollTargetAndClamp(window); + ImVec2 delta_scroll = next_scroll - window->Scroll; + // Also scroll parent window to keep us into view if necessary - if (window->Flags & ImGuiWindowFlags_ChildWindow) - delta_scroll += ScrollToBringRectIntoView(window->ParentWindow, ImRect(item_rect.Min - delta_scroll, item_rect.Max - delta_scroll)); + if (!(flags & ImGuiScrollFlags_NoScrollParent) && (window->Flags & ImGuiWindowFlags_ChildWindow)) + { + // FIXME-SCROLL: May be an option? + if ((in_flags & (ImGuiScrollFlags_AlwaysCenterX | ImGuiScrollFlags_KeepVisibleCenterX)) != 0) + in_flags = (in_flags & ~ImGuiScrollFlags_MaskX_) | ImGuiScrollFlags_KeepVisibleEdgeX; + if ((in_flags & (ImGuiScrollFlags_AlwaysCenterY | ImGuiScrollFlags_KeepVisibleCenterY)) != 0) + in_flags = (in_flags & ~ImGuiScrollFlags_MaskY_) | ImGuiScrollFlags_KeepVisibleEdgeY; + delta_scroll += ScrollToRectEx(window->ParentWindow, ImRect(item_rect.Min - delta_scroll, item_rect.Max - delta_scroll), in_flags); + } return delta_scroll; } @@ -7275,49 +11903,56 @@ float ImGui::GetScrollMaxY() return window->ScrollMax.y; } -void ImGui::SetScrollX(float scroll_x) +void ImGui::SetScrollX(ImGuiWindow* window, float scroll_x) { - ImGuiWindow* window = GetCurrentWindow(); window->ScrollTarget.x = scroll_x; window->ScrollTargetCenterRatio.x = 0.0f; + window->ScrollTargetEdgeSnapDist.x = 0.0f; +} + +void ImGui::SetScrollY(ImGuiWindow* window, float scroll_y) +{ + window->ScrollTarget.y = scroll_y; + window->ScrollTargetCenterRatio.y = 0.0f; + window->ScrollTargetEdgeSnapDist.y = 0.0f; +} + +void ImGui::SetScrollX(float scroll_x) +{ + ImGuiContext& g = *GImGui; + SetScrollX(g.CurrentWindow, scroll_x); } void ImGui::SetScrollY(float scroll_y) { - ImGuiWindow* window = GetCurrentWindow(); - window->ScrollTarget.y = scroll_y; - window->ScrollTargetCenterRatio.y = 0.0f; + ImGuiContext& g = *GImGui; + SetScrollY(g.CurrentWindow, scroll_y); } -void ImGui::SetScrollX(ImGuiWindow* window, float new_scroll_x) -{ - window->ScrollTarget.x = new_scroll_x; - window->ScrollTargetCenterRatio.x = 0.0f; -} - -void ImGui::SetScrollY(ImGuiWindow* window, float new_scroll_y) -{ - window->ScrollTarget.y = new_scroll_y; - window->ScrollTargetCenterRatio.y = 0.0f; -} - - +// Note that a local position will vary depending on initial scroll value, +// This is a little bit confusing so bear with us: +// - local_pos = (absolution_pos - window->Pos) +// - So local_x/local_y are 0.0f for a position at the upper-left corner of a window, +// and generally local_x/local_y are >(padding+decoration) && <(size-padding-decoration) when in the visible area. +// - They mostly exist because of legacy API. +// Following the rules above, when trying to work with scrolling code, consider that: +// - SetScrollFromPosY(0.0f) == SetScrollY(0.0f + scroll.y) == has no effect! +// - SetScrollFromPosY(-scroll.y) == SetScrollY(-scroll.y + scroll.y) == SetScrollY(0.0f) == reset scroll. Of course writing SetScrollY(0.0f) directly then makes more sense +// We store a target position so centering and clamping can occur on the next frame when we are guaranteed to have a known window size void ImGui::SetScrollFromPosX(ImGuiWindow* window, float local_x, float center_x_ratio) { - // We store a target position so centering can occur on the next frame when we are guaranteed to have a known window size IM_ASSERT(center_x_ratio >= 0.0f && center_x_ratio <= 1.0f); - window->ScrollTarget.x = (float)(int)(local_x + window->Scroll.x); + window->ScrollTarget.x = IM_TRUNC(local_x - window->DecoOuterSizeX1 - window->DecoInnerSizeX1 + window->Scroll.x); // Convert local position to scroll offset window->ScrollTargetCenterRatio.x = center_x_ratio; + window->ScrollTargetEdgeSnapDist.x = 0.0f; } void ImGui::SetScrollFromPosY(ImGuiWindow* window, float local_y, float center_y_ratio) { - // We store a target position so centering can occur on the next frame when we are guaranteed to have a known window size IM_ASSERT(center_y_ratio >= 0.0f && center_y_ratio <= 1.0f); - const float decoration_up_height = window->TitleBarHeight() + window->MenuBarHeight(); - local_y -= decoration_up_height; - window->ScrollTarget.y = (float)(int)(local_y + window->Scroll.y); + window->ScrollTarget.y = IM_TRUNC(local_y - window->DecoOuterSizeY1 - window->DecoInnerSizeY1 + window->Scroll.y); // Convert local position to scroll offset window->ScrollTargetCenterRatio.y = center_y_ratio; + window->ScrollTargetEdgeSnapDist.y = 0.0f; } void ImGui::SetScrollFromPosX(float local_x, float center_x_ratio) @@ -7337,10 +11972,12 @@ void ImGui::SetScrollHereX(float center_x_ratio) { ImGuiContext& g = *GImGui; ImGuiWindow* window = g.CurrentWindow; - float target_x = window->DC.LastItemRect.Min.x - window->Pos.x; // Left of last item, in window space - float last_item_width = window->DC.LastItemRect.GetWidth(); - target_x += (last_item_width * center_x_ratio) + (g.Style.ItemSpacing.x * (center_x_ratio - 0.5f) * 2.0f); // Precisely aim before, in the middle or after the last item. - SetScrollFromPosX(target_x, center_x_ratio); + float spacing_x = ImMax(window->WindowPadding.x, g.Style.ItemSpacing.x); + float target_pos_x = ImLerp(g.LastItemData.Rect.Min.x - spacing_x, g.LastItemData.Rect.Max.x + spacing_x, center_x_ratio); + SetScrollFromPosX(window, target_pos_x - window->Pos.x, center_x_ratio); // Convert from absolute to local pos + + // Tweak: snap on edges when aiming at an item very close to the edge + window->ScrollTargetEdgeSnapDist.x = ImMax(0.0f, window->WindowPadding.x - spacing_x); } // center_y_ratio: 0.0f top of last item, 0.5f vertical center of last item, 1.0f bottom of last item. @@ -7348,53 +11985,75 @@ void ImGui::SetScrollHereY(float center_y_ratio) { ImGuiContext& g = *GImGui; ImGuiWindow* window = g.CurrentWindow; - float target_y = window->DC.CursorPosPrevLine.y - window->Pos.y; // Top of last item, in window space - target_y += (window->DC.PrevLineSize.y * center_y_ratio) + (g.Style.ItemSpacing.y * (center_y_ratio - 0.5f) * 2.0f); // Precisely aim above, in the middle or below the last line. - SetScrollFromPosY(target_y, center_y_ratio); + float spacing_y = ImMax(window->WindowPadding.y, g.Style.ItemSpacing.y); + float target_pos_y = ImLerp(window->DC.CursorPosPrevLine.y - spacing_y, window->DC.CursorPosPrevLine.y + window->DC.PrevLineSize.y + spacing_y, center_y_ratio); + SetScrollFromPosY(window, target_pos_y - window->Pos.y, center_y_ratio); // Convert from absolute to local pos + + // Tweak: snap on edges when aiming at an item very close to the edge + window->ScrollTargetEdgeSnapDist.y = ImMax(0.0f, window->WindowPadding.y - spacing_y); } //----------------------------------------------------------------------------- // [SECTION] TOOLTIPS //----------------------------------------------------------------------------- -void ImGui::BeginTooltip() +bool ImGui::BeginTooltip() { - ImGuiContext& g = *GImGui; - if (g.DragDropWithinSourceOrTarget) - { - // The default tooltip position is a little offset to give space to see the context menu (it's also clamped within the current viewport/monitor) - // In the context of a dragging tooltip we try to reduce that offset and we enforce following the cursor. - // Whatever we do we want to call SetNextWindowPos() to enforce a tooltip position and disable clipping the tooltip without our display area, like regular tooltip do. - //ImVec2 tooltip_pos = g.IO.MousePos - g.ActiveIdClickOffset - g.Style.WindowPadding; - ImVec2 tooltip_pos = g.IO.MousePos + ImVec2(16 * g.Style.MouseCursorScale, 8 * g.Style.MouseCursorScale); - SetNextWindowPos(tooltip_pos); - SetNextWindowBgAlpha(g.Style.Colors[ImGuiCol_PopupBg].w * 0.60f); - //PushStyleVar(ImGuiStyleVar_Alpha, g.Style.Alpha * 0.60f); // This would be nice but e.g ColorButton with checkboard has issue with transparent colors :( - BeginTooltipEx(0, true); - } - else - { - BeginTooltipEx(0, false); - } + return BeginTooltipEx(ImGuiTooltipFlags_None, ImGuiWindowFlags_None); } -// Not exposed publicly as BeginTooltip() because bool parameters are evil. Let's see if other needs arise first. -void ImGui::BeginTooltipEx(ImGuiWindowFlags extra_flags, bool override_previous_tooltip) +bool ImGui::BeginItemTooltip() +{ + if (!IsItemHovered(ImGuiHoveredFlags_ForTooltip)) + return false; + return BeginTooltipEx(ImGuiTooltipFlags_None, ImGuiWindowFlags_None); +} + +bool ImGui::BeginTooltipEx(ImGuiTooltipFlags tooltip_flags, ImGuiWindowFlags extra_window_flags) { ImGuiContext& g = *GImGui; - char window_name[16]; - ImFormatString(window_name, IM_ARRAYSIZE(window_name), "##Tooltip_%02d", g.TooltipOverrideCount); - if (override_previous_tooltip) - if (ImGuiWindow* window = FindWindowByName(window_name)) - if (window->Active) - { - // Hide previous tooltip from being displayed. We can't easily "reset" the content of a window so we create a new one. - window->Hidden = true; - window->HiddenFramesCanSkipItems = 1; - ImFormatString(window_name, IM_ARRAYSIZE(window_name), "##Tooltip_%02d", ++g.TooltipOverrideCount); - } - ImGuiWindowFlags flags = ImGuiWindowFlags_Tooltip|ImGuiWindowFlags_NoInputs|ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoSavedSettings|ImGuiWindowFlags_AlwaysAutoResize; - Begin(window_name, NULL, flags | extra_flags); + + const bool is_dragdrop_tooltip = g.DragDropWithinSource || g.DragDropWithinTarget; + if (is_dragdrop_tooltip) + { + // Drag and Drop tooltips are positioning differently than other tooltips: + // - offset visibility to increase visibility around mouse. + // - never clamp within outer viewport boundary. + // We call SetNextWindowPos() to enforce position and disable clamping. + // See FindBestWindowPosForPopup() for positionning logic of other tooltips (not drag and drop ones). + //ImVec2 tooltip_pos = g.IO.MousePos - g.ActiveIdClickOffset - g.Style.WindowPadding; + const bool is_touchscreen = (g.IO.MouseSource == ImGuiMouseSource_TouchScreen); + if ((g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasPos) == 0) + { + ImVec2 tooltip_pos = is_touchscreen ? (g.IO.MousePos + TOOLTIP_DEFAULT_OFFSET_TOUCH * g.Style.MouseCursorScale) : (g.IO.MousePos + TOOLTIP_DEFAULT_OFFSET_MOUSE * g.Style.MouseCursorScale); + ImVec2 tooltip_pivot = is_touchscreen ? TOOLTIP_DEFAULT_PIVOT_TOUCH : ImVec2(0.0f, 0.0f); + SetNextWindowPos(tooltip_pos, ImGuiCond_None, tooltip_pivot); + } + + SetNextWindowBgAlpha(g.Style.Colors[ImGuiCol_PopupBg].w * 0.60f); + //PushStyleVar(ImGuiStyleVar_Alpha, g.Style.Alpha * 0.60f); // This would be nice but e.g ColorButton with checkboard has issue with transparent colors :( + tooltip_flags |= ImGuiTooltipFlags_OverridePrevious; + } + + const char* window_name_template = is_dragdrop_tooltip ? "##Tooltip_DragDrop_%02d" : "##Tooltip_%02d"; + char window_name[32]; + ImFormatString(window_name, IM_ARRAYSIZE(window_name), window_name_template, g.TooltipOverrideCount); + if ((tooltip_flags & ImGuiTooltipFlags_OverridePrevious) && g.TooltipPreviousWindow != NULL && g.TooltipPreviousWindow->Active) + { + // Hide previous tooltip from being displayed. We can't easily "reset" the content of a window so we create a new one. + //IMGUI_DEBUG_LOG("[tooltip] '%s' already active, using +1 for this frame\n", window_name); + SetWindowHiddenAndSkipItemsForCurrentFrame(g.TooltipPreviousWindow); + ImFormatString(window_name, IM_ARRAYSIZE(window_name), window_name_template, ++g.TooltipOverrideCount); + } + + ImGuiWindowFlags flags = ImGuiWindowFlags_Tooltip | ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoDocking; + Begin(window_name, NULL, flags | extra_window_flags); + // 2023-03-09: Added bool return value to the API, but currently always returning true. + // If this ever returns false we need to update BeginDragDropSource() accordingly. + //if (!ret) + // End(); + //return ret; + return true; } void ImGui::EndTooltip() @@ -7403,17 +12062,6 @@ void ImGui::EndTooltip() End(); } -void ImGui::SetTooltipV(const char* fmt, va_list args) -{ - ImGuiContext& g = *GImGui; - if (g.DragDropWithinSourceOrTarget) - BeginTooltip(); - else - BeginTooltipEx(0, true); - TextV(fmt, args); - EndTooltip(); -} - void ImGui::SetTooltip(const char* fmt, ...) { va_list args; @@ -7422,75 +12070,197 @@ void ImGui::SetTooltip(const char* fmt, ...) va_end(args); } +void ImGui::SetTooltipV(const char* fmt, va_list args) +{ + if (!BeginTooltipEx(ImGuiTooltipFlags_OverridePrevious, ImGuiWindowFlags_None)) + return; + TextV(fmt, args); + EndTooltip(); +} + +// Shortcut to use 'style.HoverFlagsForTooltipMouse' or 'style.HoverFlagsForTooltipNav'. +// Defaults to == ImGuiHoveredFlags_Stationary | ImGuiHoveredFlags_DelayShort when using the mouse. +void ImGui::SetItemTooltip(const char* fmt, ...) +{ + va_list args; + va_start(args, fmt); + if (IsItemHovered(ImGuiHoveredFlags_ForTooltip)) + SetTooltipV(fmt, args); + va_end(args); +} + +void ImGui::SetItemTooltipV(const char* fmt, va_list args) +{ + if (IsItemHovered(ImGuiHoveredFlags_ForTooltip)) + SetTooltipV(fmt, args); +} + + //----------------------------------------------------------------------------- // [SECTION] POPUPS //----------------------------------------------------------------------------- -bool ImGui::IsPopupOpen(ImGuiID id) +// Supported flags: ImGuiPopupFlags_AnyPopupId, ImGuiPopupFlags_AnyPopupLevel +bool ImGui::IsPopupOpen(ImGuiID id, ImGuiPopupFlags popup_flags) { ImGuiContext& g = *GImGui; - return g.OpenPopupStack.Size > g.BeginPopupStack.Size && g.OpenPopupStack[g.BeginPopupStack.Size].PopupId == id; + if (popup_flags & ImGuiPopupFlags_AnyPopupId) + { + // Return true if any popup is open at the current BeginPopup() level of the popup stack + // This may be used to e.g. test for another popups already opened to handle popups priorities at the same level. + IM_ASSERT(id == 0); + if (popup_flags & ImGuiPopupFlags_AnyPopupLevel) + return g.OpenPopupStack.Size > 0; + else + return g.OpenPopupStack.Size > g.BeginPopupStack.Size; + } + else + { + if (popup_flags & ImGuiPopupFlags_AnyPopupLevel) + { + // Return true if the popup is open anywhere in the popup stack + for (ImGuiPopupData& popup_data : g.OpenPopupStack) + if (popup_data.PopupId == id) + return true; + return false; + } + else + { + // Return true if the popup is open at the current BeginPopup() level of the popup stack (this is the most-common query) + return g.OpenPopupStack.Size > g.BeginPopupStack.Size && g.OpenPopupStack[g.BeginPopupStack.Size].PopupId == id; + } + } } -bool ImGui::IsPopupOpen(const char* str_id) +bool ImGui::IsPopupOpen(const char* str_id, ImGuiPopupFlags popup_flags) { ImGuiContext& g = *GImGui; - return g.OpenPopupStack.Size > g.BeginPopupStack.Size && g.OpenPopupStack[g.BeginPopupStack.Size].PopupId == g.CurrentWindow->GetID(str_id); + ImGuiID id = (popup_flags & ImGuiPopupFlags_AnyPopupId) ? 0 : g.CurrentWindow->GetID(str_id); + if ((popup_flags & ImGuiPopupFlags_AnyPopupLevel) && id != 0) + IM_ASSERT(0 && "Cannot use IsPopupOpen() with a string id and ImGuiPopupFlags_AnyPopupLevel."); // But non-string version is legal and used internally + return IsPopupOpen(id, popup_flags); } +// Also see FindBlockingModal(NULL) ImGuiWindow* ImGui::GetTopMostPopupModal() { ImGuiContext& g = *GImGui; - for (int n = g.OpenPopupStack.Size-1; n >= 0; n--) + for (int n = g.OpenPopupStack.Size - 1; n >= 0; n--) if (ImGuiWindow* popup = g.OpenPopupStack.Data[n].Window) if (popup->Flags & ImGuiWindowFlags_Modal) return popup; return NULL; } -void ImGui::OpenPopup(const char* str_id) +// See Demo->Stacked Modal to confirm what this is for. +ImGuiWindow* ImGui::GetTopMostAndVisiblePopupModal() { ImGuiContext& g = *GImGui; - OpenPopupEx(g.CurrentWindow->GetID(str_id)); + for (int n = g.OpenPopupStack.Size - 1; n >= 0; n--) + if (ImGuiWindow* popup = g.OpenPopupStack.Data[n].Window) + if ((popup->Flags & ImGuiWindowFlags_Modal) && IsWindowActiveAndVisible(popup)) + return popup; + return NULL; +} + + +// When a modal popup is open, newly created windows that want focus (i.e. are not popups and do not specify ImGuiWindowFlags_NoFocusOnAppearing) +// should be positioned behind that modal window, unless the window was created inside the modal begin-stack. +// In case of multiple stacked modals newly created window honors begin stack order and does not go below its own modal parent. +// - WindowA // FindBlockingModal() returns Modal1 +// - WindowB // .. returns Modal1 +// - Modal1 // .. returns Modal2 +// - WindowC // .. returns Modal2 +// - WindowD // .. returns Modal2 +// - Modal2 // .. returns Modal2 +// - WindowE // .. returns NULL +// Notes: +// - FindBlockingModal(NULL) == NULL is generally equivalent to GetTopMostPopupModal() == NULL. +// Only difference is here we check for ->Active/WasActive but it may be unnecessary. +ImGuiWindow* ImGui::FindBlockingModal(ImGuiWindow* window) +{ + ImGuiContext& g = *GImGui; + if (g.OpenPopupStack.Size <= 0) + return NULL; + + // Find a modal that has common parent with specified window. Specified window should be positioned behind that modal. + for (ImGuiPopupData& popup_data : g.OpenPopupStack) + { + ImGuiWindow* popup_window = popup_data.Window; + if (popup_window == NULL || !(popup_window->Flags & ImGuiWindowFlags_Modal)) + continue; + if (!popup_window->Active && !popup_window->WasActive) // Check WasActive, because this code may run before popup renders on current frame, also check Active to handle newly created windows. + continue; + if (window == NULL) // FindBlockingModal(NULL) test for if FocusWindow(NULL) is naturally possible via a mouse click. + return popup_window; + if (IsWindowWithinBeginStackOf(window, popup_window)) // Window may be over modal + continue; + return popup_window; // Place window right below first block modal + } + return NULL; +} + +void ImGui::OpenPopup(const char* str_id, ImGuiPopupFlags popup_flags) +{ + ImGuiContext& g = *GImGui; + ImGuiID id = g.CurrentWindow->GetID(str_id); + IMGUI_DEBUG_LOG_POPUP("[popup] OpenPopup(\"%s\" -> 0x%08X)\n", str_id, id); + OpenPopupEx(id, popup_flags); +} + +void ImGui::OpenPopup(ImGuiID id, ImGuiPopupFlags popup_flags) +{ + OpenPopupEx(id, popup_flags); } // Mark popup as open (toggle toward open state). // Popups are closed when user click outside, or activate a pressable item, or CloseCurrentPopup() is called within a BeginPopup()/EndPopup() block. // Popup identifiers are relative to the current ID-stack (so OpenPopup and BeginPopup needs to be at the same level). // One open popup per level of the popup hierarchy (NB: when assigning we reset the Window member of ImGuiPopupRef to NULL) -void ImGui::OpenPopupEx(ImGuiID id) +void ImGui::OpenPopupEx(ImGuiID id, ImGuiPopupFlags popup_flags) { ImGuiContext& g = *GImGui; ImGuiWindow* parent_window = g.CurrentWindow; - int current_stack_size = g.BeginPopupStack.Size; + const int current_stack_size = g.BeginPopupStack.Size; + + if (popup_flags & ImGuiPopupFlags_NoOpenOverExistingPopup) + if (IsPopupOpen((ImGuiID)0, ImGuiPopupFlags_AnyPopupId)) + return; + ImGuiPopupData popup_ref; // Tagged as new ref as Window will be set back to NULL if we write this into OpenPopupStack. popup_ref.PopupId = id; popup_ref.Window = NULL; - popup_ref.SourceWindow = g.NavWindow; + popup_ref.RestoreNavWindow = g.NavWindow; // When popup closes focus may be restored to NavWindow (depend on window type). popup_ref.OpenFrameCount = g.FrameCount; popup_ref.OpenParentId = parent_window->IDStack.back(); popup_ref.OpenPopupPos = NavCalcPreferredRefPos(); popup_ref.OpenMousePos = IsMousePosValid(&g.IO.MousePos) ? g.IO.MousePos : popup_ref.OpenPopupPos; - //IMGUI_DEBUG_LOG("OpenPopupEx(0x%08X)\n", g.FrameCount, id); + IMGUI_DEBUG_LOG_POPUP("[popup] OpenPopupEx(0x%08X)\n", id); if (g.OpenPopupStack.Size < current_stack_size + 1) { g.OpenPopupStack.push_back(popup_ref); } else { - // Gently handle the user mistakenly calling OpenPopup() every frame. It is a programming mistake! However, if we were to run the regular code path, the ui - // would become completely unusable because the popup will always be in hidden-while-calculating-size state _while_ claiming focus. Which would be a very confusing - // situation for the programmer. Instead, we silently allow the popup to proceed, it will keep reappearing and the programming error will be more obvious to understand. - if (g.OpenPopupStack[current_stack_size].PopupId == id && g.OpenPopupStack[current_stack_size].OpenFrameCount == g.FrameCount - 1) + // Gently handle the user mistakenly calling OpenPopup() every frames: it is likely a programming mistake! + // However, if we were to run the regular code path, the ui would become completely unusable because the popup will always be + // in hidden-while-calculating-size state _while_ claiming focus. Which is extremely confusing situation for the programmer. + // Instead, for successive frames calls to OpenPopup(), we silently avoid reopening even if ImGuiPopupFlags_NoReopen is not specified. + bool keep_existing = false; + if (g.OpenPopupStack[current_stack_size].PopupId == id) + if ((g.OpenPopupStack[current_stack_size].OpenFrameCount == g.FrameCount - 1) || (popup_flags & ImGuiPopupFlags_NoReopen)) + keep_existing = true; + if (keep_existing) { + // No reopen g.OpenPopupStack[current_stack_size].OpenFrameCount = popup_ref.OpenFrameCount; } else { - // Close child popups if any, then flag popup for open/reopen - g.OpenPopupStack.resize(current_stack_size + 1); - g.OpenPopupStack[current_stack_size] = popup_ref; + // Reopen: close child popups if any, then flag popup for open/reopen (set position, focus, init navigation) + ClosePopupToLevel(current_stack_size, true); + g.OpenPopupStack.push_back(popup_ref); } // When reopening a popup we first refocus its parent, otherwise if its parent is itself a popup it would get closed by ClosePopupsOverWindow(). @@ -7500,27 +12270,16 @@ void ImGui::OpenPopupEx(ImGuiID id) } } -bool ImGui::OpenPopupOnItemClick(const char* str_id, int mouse_button) -{ - ImGuiWindow* window = GImGui->CurrentWindow; - if (IsMouseReleased(mouse_button) && IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup)) - { - ImGuiID id = str_id ? window->GetID(str_id) : window->DC.LastItemId; // If user hasn't passed an ID, we can use the LastItemID. Using LastItemID as a Popup ID won't conflict! - IM_ASSERT(id != 0); // You cannot pass a NULL str_id if the last item has no identifier (e.g. a Text() item) - OpenPopupEx(id); - return true; - } - return false; -} - +// When popups are stacked, clicking on a lower level popups puts focus back to it and close popups above it. +// This function closes any popups that are over 'ref_window'. void ImGui::ClosePopupsOverWindow(ImGuiWindow* ref_window, bool restore_focus_to_window_under_popup) { ImGuiContext& g = *GImGui; - if (g.OpenPopupStack.empty()) + if (g.OpenPopupStack.Size == 0) return; - // When popups are stacked, clicking on a lower level popups puts focus back to it and close popups above it. // Don't close our own child popup windows. + //IMGUI_DEBUG_LOG_POPUP("[popup] ClosePopupsOverWindow(\"%s\") restore_under=%d\n", ref_window ? ref_window->Name : "", restore_focus_to_window_under_popup); int popup_count_to_keep = 0; if (ref_window) { @@ -7531,47 +12290,72 @@ void ImGui::ClosePopupsOverWindow(ImGuiWindow* ref_window, bool restore_focus_to if (!popup.Window) continue; IM_ASSERT((popup.Window->Flags & ImGuiWindowFlags_Popup) != 0); - if (popup.Window->Flags & ImGuiWindowFlags_ChildWindow) - continue; - // Trim the stack when popups are not direct descendant of the reference window (the reference window is often the NavWindow) - bool popup_or_descendent_is_ref_window = false; - for (int m = popup_count_to_keep; m < g.OpenPopupStack.Size && !popup_or_descendent_is_ref_window; m++) - if (ImGuiWindow* popup_window = g.OpenPopupStack[m].Window) - if (popup_window->RootWindow == ref_window->RootWindow) - popup_or_descendent_is_ref_window = true; - if (!popup_or_descendent_is_ref_window) + // Trim the stack unless the popup is a direct parent of the reference window (the reference window is often the NavWindow) + // - Clicking/Focusing Window2 won't close Popup1: + // Window -> Popup1 -> Window2(Ref) + // - Clicking/focusing Popup1 will close Popup2 and Popup3: + // Window -> Popup1(Ref) -> Popup2 -> Popup3 + // - Each popups may contain child windows, which is why we compare ->RootWindowDockTree! + // Window -> Popup1 -> Popup1_Child -> Popup2 -> Popup2_Child + // We step through every popup from bottom to top to validate their position relative to reference window. + bool ref_window_is_descendent_of_popup = false; + for (int n = popup_count_to_keep; n < g.OpenPopupStack.Size; n++) + if (ImGuiWindow* popup_window = g.OpenPopupStack[n].Window) + //if (popup_window->RootWindowDockTree == ref_window->RootWindowDockTree) // FIXME-MERGE + if (IsWindowWithinBeginStackOf(ref_window, popup_window)) + { + ref_window_is_descendent_of_popup = true; + break; + } + if (!ref_window_is_descendent_of_popup) break; } } if (popup_count_to_keep < g.OpenPopupStack.Size) // This test is not required but it allows to set a convenient breakpoint on the statement below { - //IMGUI_DEBUG_LOG("ClosePopupsOverWindow(%s) -> ClosePopupToLevel(%d)\n", ref_window->Name, popup_count_to_keep); + IMGUI_DEBUG_LOG_POPUP("[popup] ClosePopupsOverWindow(\"%s\")\n", ref_window ? ref_window->Name : ""); ClosePopupToLevel(popup_count_to_keep, restore_focus_to_window_under_popup); } } +void ImGui::ClosePopupsExceptModals() +{ + ImGuiContext& g = *GImGui; + + int popup_count_to_keep; + for (popup_count_to_keep = g.OpenPopupStack.Size; popup_count_to_keep > 0; popup_count_to_keep--) + { + ImGuiWindow* window = g.OpenPopupStack[popup_count_to_keep - 1].Window; + if (!window || (window->Flags & ImGuiWindowFlags_Modal)) + break; + } + if (popup_count_to_keep < g.OpenPopupStack.Size) // This test is not required but it allows to set a convenient breakpoint on the statement below + ClosePopupToLevel(popup_count_to_keep, true); +} + void ImGui::ClosePopupToLevel(int remaining, bool restore_focus_to_window_under_popup) { ImGuiContext& g = *GImGui; + IMGUI_DEBUG_LOG_POPUP("[popup] ClosePopupToLevel(%d), restore_under=%d\n", remaining, restore_focus_to_window_under_popup); IM_ASSERT(remaining >= 0 && remaining < g.OpenPopupStack.Size); - ImGuiWindow* focus_window = g.OpenPopupStack[remaining].SourceWindow; - ImGuiWindow* popup_window = g.OpenPopupStack[remaining].Window; + if (g.DebugLogFlags & ImGuiDebugLogFlags_EventPopup) + for (int n = remaining; n < g.OpenPopupStack.Size; n++) + IMGUI_DEBUG_LOG_POPUP("[popup] - Closing PopupID 0x%08X Window \"%s\"\n", g.OpenPopupStack[n].PopupId, g.OpenPopupStack[n].Window ? g.OpenPopupStack[n].Window->Name : NULL); + + // Trim open popup stack + ImGuiPopupData prev_popup = g.OpenPopupStack[remaining]; g.OpenPopupStack.resize(remaining); - if (restore_focus_to_window_under_popup) + // Restore focus (unless popup window was not yet submitted, and didn't have a chance to take focus anyhow. See #7325 for an edge case) + if (restore_focus_to_window_under_popup && prev_popup.Window) { - if (focus_window && !focus_window->WasActive && popup_window) - { - // Fallback - FocusTopMostWindowUnderOne(popup_window, NULL); - } + ImGuiWindow* popup_window = prev_popup.Window; + ImGuiWindow* focus_window = (popup_window->Flags & ImGuiWindowFlags_ChildMenu) ? popup_window->ParentWindow : prev_popup.RestoreNavWindow; + if (focus_window && !focus_window->WasActive) + FocusTopMostWindowUnderOne(popup_window, NULL, NULL, ImGuiFocusRequestFlags_RestoreFocusedChild); // Fallback else - { - if (g.NavLayer == 0 && focus_window) - focus_window = NavRestoreLastChildNavWindow(focus_window); - FocusWindow(focus_window); - } + FocusWindow(focus_window, (g.NavLayer == ImGuiNavLayer_Main) ? ImGuiFocusRequestFlags_RestoreFocusedChild : ImGuiFocusRequestFlags_None); } } @@ -7590,13 +12374,13 @@ void ImGui::CloseCurrentPopup() ImGuiWindow* parent_popup_window = g.OpenPopupStack[popup_idx - 1].Window; bool close_parent = false; if (popup_window && (popup_window->Flags & ImGuiWindowFlags_ChildMenu)) - if (parent_popup_window == NULL || !(parent_popup_window->Flags & ImGuiWindowFlags_Modal)) + if (parent_popup_window && !(parent_popup_window->Flags & ImGuiWindowFlags_MenuBar)) close_parent = true; if (!close_parent) break; popup_idx--; } - //IMGUI_DEBUG_LOG("CloseCurrentPopup %d -> %d\n", g.BeginPopupStack.Size - 1, popup_idx); + IMGUI_DEBUG_LOG_POPUP("[popup] CloseCurrentPopup %d -> %d\n", g.BeginPopupStack.Size - 1, popup_idx); ClosePopupToLevel(popup_idx, true); // A common pattern is to close a popup when selecting a menu item/selectable that will open another window. @@ -7606,25 +12390,43 @@ void ImGui::CloseCurrentPopup() window->DC.NavHideHighlightOneFrame = true; } -bool ImGui::BeginPopupEx(ImGuiID id, ImGuiWindowFlags extra_flags) +// Attention! BeginPopup() adds default flags when calling BeginPopupEx()! +bool ImGui::BeginPopupEx(ImGuiID id, ImGuiWindowFlags extra_window_flags) { ImGuiContext& g = *GImGui; - if (!IsPopupOpen(id)) + if (!IsPopupOpen(id, ImGuiPopupFlags_None)) { g.NextWindowData.ClearFlags(); // We behave like Begin() and need to consume those values return false; } char name[20]; - if (extra_flags & ImGuiWindowFlags_ChildMenu) - ImFormatString(name, IM_ARRAYSIZE(name), "##Menu_%02d", g.BeginPopupStack.Size); // Recycle windows based on depth - else - ImFormatString(name, IM_ARRAYSIZE(name), "##Popup_%08x", id); // Not recycling, so we can close/open during the same frame + IM_ASSERT((extra_window_flags & ImGuiWindowFlags_ChildMenu) == 0); // Use BeginPopupMenuEx() + ImFormatString(name, IM_ARRAYSIZE(name), "##Popup_%08x", id); // No recycling, so we can close/open during the same frame - bool is_open = Begin(name, NULL, extra_flags | ImGuiWindowFlags_Popup); + bool is_open = Begin(name, NULL, extra_window_flags | ImGuiWindowFlags_Popup | ImGuiWindowFlags_NoDocking); if (!is_open) // NB: Begin can return false when the popup is completely clipped (e.g. zero size display) EndPopup(); + //g.CurrentWindow->FocusRouteParentWindow = g.CurrentWindow->ParentWindowInBeginStack; + return is_open; +} +bool ImGui::BeginPopupMenuEx(ImGuiID id, const char* label, ImGuiWindowFlags extra_window_flags) +{ + ImGuiContext& g = *GImGui; + if (!IsPopupOpen(id, ImGuiPopupFlags_None)) + { + g.NextWindowData.ClearFlags(); // We behave like Begin() and need to consume those values + return false; + } + + char name[128]; + IM_ASSERT(extra_window_flags & ImGuiWindowFlags_ChildMenu); + ImFormatString(name, IM_ARRAYSIZE(name), "%s###Menu_%02d", label, g.BeginMenuDepth); // Recycle windows based on depth + bool is_open = Begin(name, NULL, extra_window_flags | ImGuiWindowFlags_Popup); + if (!is_open) // NB: Begin can return false when the popup is completely clipped (e.g. zero size display) + EndPopup(); + //g.CurrentWindow->FocusRouteParentWindow = g.CurrentWindow->ParentWindowInBeginStack; return is_open; } @@ -7637,28 +12439,37 @@ bool ImGui::BeginPopup(const char* str_id, ImGuiWindowFlags flags) return false; } flags |= ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoSavedSettings; - return BeginPopupEx(g.CurrentWindow->GetID(str_id), flags); + ImGuiID id = g.CurrentWindow->GetID(str_id); + return BeginPopupEx(id, flags); } // If 'p_open' is specified for a modal popup window, the popup will have a regular close button which will close the popup. -// Note that popup visibility status is owned by Dear ImGui (and manipulated with e.g. OpenPopup) so the actual value of *p_open is meaningless here. +// Note that popup visibility status is owned by Dear ImGui (and manipulated with e.g. OpenPopup). +// - *p_open set back to false in BeginPopupModal() when popup is not open. +// - if you set *p_open to false before calling BeginPopupModal(), it will close the popup. bool ImGui::BeginPopupModal(const char* name, bool* p_open, ImGuiWindowFlags flags) { ImGuiContext& g = *GImGui; ImGuiWindow* window = g.CurrentWindow; const ImGuiID id = window->GetID(name); - if (!IsPopupOpen(id)) + if (!IsPopupOpen(id, ImGuiPopupFlags_None)) { g.NextWindowData.ClearFlags(); // We behave like Begin() and need to consume those values + if (p_open && *p_open) + *p_open = false; return false; } - // Center modal windows by default + // Center modal windows by default for increased visibility + // (this won't really last as settings will kick in, and is mostly for backward compatibility. user may do the same themselves) // FIXME: Should test for (PosCond & window->SetWindowPosAllowFlags) with the upcoming window. - if ((g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasPos) == 0) - SetNextWindowPos(g.IO.DisplaySize * 0.5f, ImGuiCond_Appearing, ImVec2(0.5f, 0.5f)); + if ((g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasPos) == 0) + { + const ImGuiViewport* viewport = window->WasActive ? window->Viewport : GetMainViewport(); // FIXME-VIEWPORT: What may be our reference viewport? + SetNextWindowPos(viewport->GetCenter(), ImGuiCond_FirstUseEver, ImVec2(0.5f, 0.5f)); + } - flags |= ImGuiWindowFlags_Popup | ImGuiWindowFlags_Modal | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoSavedSettings; + flags |= ImGuiWindowFlags_Popup | ImGuiWindowFlags_Modal | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoDocking; const bool is_open = Begin(name, p_open, flags); if (!is_open || (p_open && !*p_open)) // NB: is_open can be 'false' when the popup is completely clipped (e.g. zero size display) { @@ -7673,53 +12484,100 @@ bool ImGui::BeginPopupModal(const char* name, bool* p_open, ImGuiWindowFlags fla void ImGui::EndPopup() { ImGuiContext& g = *GImGui; - IM_ASSERT(g.CurrentWindow->Flags & ImGuiWindowFlags_Popup); // Mismatched BeginPopup()/EndPopup() calls + ImGuiWindow* window = g.CurrentWindow; + IM_ASSERT(window->Flags & ImGuiWindowFlags_Popup); // Mismatched BeginPopup()/EndPopup() calls IM_ASSERT(g.BeginPopupStack.Size > 0); - // Make all menus and popups wrap around for now, may need to expose that policy. - NavMoveRequestTryWrapping(g.CurrentWindow, ImGuiNavMoveFlags_LoopY); + // Make all menus and popups wrap around for now, may need to expose that policy (e.g. focus scope could include wrap/loop policy flags used by new move requests) + if (g.NavWindow == window) + NavMoveRequestTryWrapping(window, ImGuiNavMoveFlags_LoopY); + // Child-popups don't need to be laid out + const ImGuiID backup_within_end_child_id = g.WithinEndChildID; + if (window->Flags & ImGuiWindowFlags_ChildWindow) + g.WithinEndChildID = window->ID; End(); + g.WithinEndChildID = backup_within_end_child_id; +} + +// Helper to open a popup if mouse button is released over the item +// - This is essentially the same as BeginPopupContextItem() but without the trailing BeginPopup() +void ImGui::OpenPopupOnItemClick(const char* str_id, ImGuiPopupFlags popup_flags) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + int mouse_button = (popup_flags & ImGuiPopupFlags_MouseButtonMask_); + if (IsMouseReleased(mouse_button) && IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup)) + { + ImGuiID id = str_id ? window->GetID(str_id) : g.LastItemData.ID; // If user hasn't passed an ID, we can use the LastItemID. Using LastItemID as a Popup ID won't conflict! + IM_ASSERT(id != 0); // You cannot pass a NULL str_id if the last item has no identifier (e.g. a Text() item) + OpenPopupEx(id, popup_flags); + } } // This is a helper to handle the simplest case of associating one named popup to one given widget. -// You may want to handle this on user side if you have specific needs (e.g. tweaking IsItemHovered() parameters). -// You can pass a NULL str_id to use the identifier of the last item. -bool ImGui::BeginPopupContextItem(const char* str_id, int mouse_button) +// - To create a popup associated to the last item, you generally want to pass a NULL value to str_id. +// - To create a popup with a specific identifier, pass it in str_id. +// - This is useful when using using BeginPopupContextItem() on an item which doesn't have an identifier, e.g. a Text() call. +// - This is useful when multiple code locations may want to manipulate/open the same popup, given an explicit id. +// - You may want to handle the whole on user side if you have specific needs (e.g. tweaking IsItemHovered() parameters). +// This is essentially the same as: +// id = str_id ? GetID(str_id) : GetItemID(); +// OpenPopupOnItemClick(str_id, ImGuiPopupFlags_MouseButtonRight); +// return BeginPopup(id); +// Which is essentially the same as: +// id = str_id ? GetID(str_id) : GetItemID(); +// if (IsItemHovered() && IsMouseReleased(ImGuiMouseButton_Right)) +// OpenPopup(id); +// return BeginPopup(id); +// The main difference being that this is tweaked to avoid computing the ID twice. +bool ImGui::BeginPopupContextItem(const char* str_id, ImGuiPopupFlags popup_flags) { - ImGuiWindow* window = GImGui->CurrentWindow; + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; if (window->SkipItems) return false; - ImGuiID id = str_id ? window->GetID(str_id) : window->DC.LastItemId; // If user hasn't passed an ID, we can use the LastItemID. Using LastItemID as a Popup ID won't conflict! - IM_ASSERT(id != 0); // You cannot pass a NULL str_id if the last item has no identifier (e.g. a Text() item) + ImGuiID id = str_id ? window->GetID(str_id) : g.LastItemData.ID; // If user hasn't passed an ID, we can use the LastItemID. Using LastItemID as a Popup ID won't conflict! + IM_ASSERT(id != 0); // You cannot pass a NULL str_id if the last item has no identifier (e.g. a Text() item) + int mouse_button = (popup_flags & ImGuiPopupFlags_MouseButtonMask_); if (IsMouseReleased(mouse_button) && IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup)) - OpenPopupEx(id); - return BeginPopupEx(id, ImGuiWindowFlags_AlwaysAutoResize|ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoSavedSettings); + OpenPopupEx(id, popup_flags); + return BeginPopupEx(id, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoSavedSettings); } -bool ImGui::BeginPopupContextWindow(const char* str_id, int mouse_button, bool also_over_items) +bool ImGui::BeginPopupContextWindow(const char* str_id, ImGuiPopupFlags popup_flags) { + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; if (!str_id) str_id = "window_context"; - ImGuiID id = GImGui->CurrentWindow->GetID(str_id); + ImGuiID id = window->GetID(str_id); + int mouse_button = (popup_flags & ImGuiPopupFlags_MouseButtonMask_); if (IsMouseReleased(mouse_button) && IsWindowHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup)) - if (also_over_items || !IsAnyItemHovered()) - OpenPopupEx(id); - return BeginPopupEx(id, ImGuiWindowFlags_AlwaysAutoResize|ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoSavedSettings); + if (!(popup_flags & ImGuiPopupFlags_NoOpenOverItems) || !IsAnyItemHovered()) + OpenPopupEx(id, popup_flags); + return BeginPopupEx(id, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoSavedSettings); } -bool ImGui::BeginPopupContextVoid(const char* str_id, int mouse_button) +bool ImGui::BeginPopupContextVoid(const char* str_id, ImGuiPopupFlags popup_flags) { + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; if (!str_id) str_id = "void_context"; - ImGuiID id = GImGui->CurrentWindow->GetID(str_id); + ImGuiID id = window->GetID(str_id); + int mouse_button = (popup_flags & ImGuiPopupFlags_MouseButtonMask_); if (IsMouseReleased(mouse_button) && !IsWindowHovered(ImGuiHoveredFlags_AnyWindow)) - OpenPopupEx(id); - return BeginPopupEx(id, ImGuiWindowFlags_AlwaysAutoResize|ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoSavedSettings); + if (GetTopMostPopupModal() == NULL) + OpenPopupEx(id, popup_flags); + return BeginPopupEx(id, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoSavedSettings); } // r_avoid = the rectangle to avoid (e.g. for tooltip it is a rectangle around the mouse cursor which we want to avoid. for popups it's a small point around the cursor.) // r_outer = the visible area rectangle, minus safe area padding. If our popup size won't fit because of safe area padding we ignore it. +// (r_outer is usually equivalent to the viewport rectangle minus padding, but when multi-viewports are enabled and monitor +// information are available, it may represent the entire platform monitor from the frame of reference of the current viewport. +// this allows us to have tooltips/popups displayed out of the parent viewport.) ImVec2 ImGui::FindBestWindowPosForPopupEx(const ImVec2& ref_pos, const ImVec2& size, ImGuiDir* last_dir, const ImRect& r_outer, const ImRect& r_avoid, ImGuiPopupPositionPolicy policy) { ImVec2 base_pos_clamped = ImClamp(ref_pos, r_outer.Min, r_outer.Max - size); @@ -7747,37 +12605,71 @@ ImVec2 ImGui::FindBestWindowPosForPopupEx(const ImVec2& ref_pos, const ImVec2& s } } - // Default popup policy - const ImGuiDir dir_prefered_order[ImGuiDir_COUNT] = { ImGuiDir_Right, ImGuiDir_Down, ImGuiDir_Up, ImGuiDir_Left }; - for (int n = (*last_dir != ImGuiDir_None) ? -1 : 0; n < ImGuiDir_COUNT; n++) + // Tooltip and Default popup policy + // (Always first try the direction we used on the last frame, if any) + if (policy == ImGuiPopupPositionPolicy_Tooltip || policy == ImGuiPopupPositionPolicy_Default) { - const ImGuiDir dir = (n == -1) ? *last_dir : dir_prefered_order[n]; - if (n != -1 && dir == *last_dir) // Already tried this direction? - continue; - float avail_w = (dir == ImGuiDir_Left ? r_avoid.Min.x : r_outer.Max.x) - (dir == ImGuiDir_Right ? r_avoid.Max.x : r_outer.Min.x); - float avail_h = (dir == ImGuiDir_Up ? r_avoid.Min.y : r_outer.Max.y) - (dir == ImGuiDir_Down ? r_avoid.Max.y : r_outer.Min.y); - if (avail_w < size.x || avail_h < size.y) - continue; - ImVec2 pos; - pos.x = (dir == ImGuiDir_Left) ? r_avoid.Min.x - size.x : (dir == ImGuiDir_Right) ? r_avoid.Max.x : base_pos_clamped.x; - pos.y = (dir == ImGuiDir_Up) ? r_avoid.Min.y - size.y : (dir == ImGuiDir_Down) ? r_avoid.Max.y : base_pos_clamped.y; - *last_dir = dir; - return pos; + const ImGuiDir dir_prefered_order[ImGuiDir_COUNT] = { ImGuiDir_Right, ImGuiDir_Down, ImGuiDir_Up, ImGuiDir_Left }; + for (int n = (*last_dir != ImGuiDir_None) ? -1 : 0; n < ImGuiDir_COUNT; n++) + { + const ImGuiDir dir = (n == -1) ? *last_dir : dir_prefered_order[n]; + if (n != -1 && dir == *last_dir) // Already tried this direction? + continue; + + const float avail_w = (dir == ImGuiDir_Left ? r_avoid.Min.x : r_outer.Max.x) - (dir == ImGuiDir_Right ? r_avoid.Max.x : r_outer.Min.x); + const float avail_h = (dir == ImGuiDir_Up ? r_avoid.Min.y : r_outer.Max.y) - (dir == ImGuiDir_Down ? r_avoid.Max.y : r_outer.Min.y); + + // If there's not enough room on one axis, there's no point in positioning on a side on this axis (e.g. when not enough width, use a top/bottom position to maximize available width) + if (avail_w < size.x && (dir == ImGuiDir_Left || dir == ImGuiDir_Right)) + continue; + if (avail_h < size.y && (dir == ImGuiDir_Up || dir == ImGuiDir_Down)) + continue; + + ImVec2 pos; + pos.x = (dir == ImGuiDir_Left) ? r_avoid.Min.x - size.x : (dir == ImGuiDir_Right) ? r_avoid.Max.x : base_pos_clamped.x; + pos.y = (dir == ImGuiDir_Up) ? r_avoid.Min.y - size.y : (dir == ImGuiDir_Down) ? r_avoid.Max.y : base_pos_clamped.y; + + // Clamp top-left corner of popup + pos.x = ImMax(pos.x, r_outer.Min.x); + pos.y = ImMax(pos.y, r_outer.Min.y); + + *last_dir = dir; + return pos; + } } - // Fallback, try to keep within display + // Fallback when not enough room: *last_dir = ImGuiDir_None; + + // For tooltip we prefer avoiding the cursor at all cost even if it means that part of the tooltip won't be visible. + if (policy == ImGuiPopupPositionPolicy_Tooltip) + return ref_pos + ImVec2(2, 2); + + // Otherwise try to keep within display ImVec2 pos = ref_pos; pos.x = ImMax(ImMin(pos.x + size.x, r_outer.Max.x) - size.x, r_outer.Min.x); pos.y = ImMax(ImMin(pos.y + size.y, r_outer.Max.y) - size.y, r_outer.Min.y); return pos; } -ImRect ImGui::GetWindowAllowedExtentRect(ImGuiWindow* window) +// Note that this is used for popups, which can overlap the non work-area of individual viewports. +ImRect ImGui::GetPopupAllowedExtentRect(ImGuiWindow* window) { - IM_UNUSED(window); - ImVec2 padding = GImGui->Style.DisplaySafeAreaPadding; - ImRect r_screen = GetViewportRect(); + ImGuiContext& g = *GImGui; + ImRect r_screen; + if (window->ViewportAllowPlatformMonitorExtend >= 0) + { + // Extent with be in the frame of reference of the given viewport (so Min is likely to be negative here) + const ImGuiPlatformMonitor& monitor = g.PlatformIO.Monitors[window->ViewportAllowPlatformMonitorExtend]; + r_screen.Min = monitor.WorkPos; + r_screen.Max = monitor.WorkPos + monitor.WorkSize; + } + else + { + // Use the full viewport area (not work area) for popups + r_screen = window->Viewport->GetMainRect(); + } + ImVec2 padding = g.Style.DisplaySafeAreaPadding; r_screen.Expand(ImVec2((r_screen.GetWidth() > padding.x * 2) ? -padding.x : 0.0f, (r_screen.GetHeight() > padding.y * 2) ? -padding.y : 0.0f)); return r_screen; } @@ -7786,110 +12678,479 @@ ImVec2 ImGui::FindBestWindowPosForPopup(ImGuiWindow* window) { ImGuiContext& g = *GImGui; - ImRect r_outer = GetWindowAllowedExtentRect(window); + ImRect r_outer = GetPopupAllowedExtentRect(window); if (window->Flags & ImGuiWindowFlags_ChildMenu) { // Child menus typically request _any_ position within the parent menu item, and then we move the new menu outside the parent bounds. // This is how we end up with child menus appearing (most-commonly) on the right of the parent menu. - IM_ASSERT(g.CurrentWindow == window); - ImGuiWindow* parent_window = g.CurrentWindowStack[g.CurrentWindowStack.Size - 2]; + ImGuiWindow* parent_window = window->ParentWindow; float horizontal_overlap = g.Style.ItemInnerSpacing.x; // We want some overlap to convey the relative depth of each menu (currently the amount of overlap is hard-coded to style.ItemSpacing.x). ImRect r_avoid; if (parent_window->DC.MenuBarAppending) - r_avoid = ImRect(-FLT_MAX, parent_window->Pos.y + parent_window->TitleBarHeight(), FLT_MAX, parent_window->Pos.y + parent_window->TitleBarHeight() + parent_window->MenuBarHeight()); + r_avoid = ImRect(-FLT_MAX, parent_window->ClipRect.Min.y, FLT_MAX, parent_window->ClipRect.Max.y); // Avoid parent menu-bar. If we wanted multi-line menu-bar, we may instead want to have the calling window setup e.g. a NextWindowData.PosConstraintAvoidRect field else r_avoid = ImRect(parent_window->Pos.x + horizontal_overlap, -FLT_MAX, parent_window->Pos.x + parent_window->Size.x - horizontal_overlap - parent_window->ScrollbarSizes.x, FLT_MAX); - return FindBestWindowPosForPopupEx(window->Pos, window->Size, &window->AutoPosLastDirection, r_outer, r_avoid); + return FindBestWindowPosForPopupEx(window->Pos, window->Size, &window->AutoPosLastDirection, r_outer, r_avoid, ImGuiPopupPositionPolicy_Default); } if (window->Flags & ImGuiWindowFlags_Popup) { - ImRect r_avoid = ImRect(window->Pos.x - 1, window->Pos.y - 1, window->Pos.x + 1, window->Pos.y + 1); - return FindBestWindowPosForPopupEx(window->Pos, window->Size, &window->AutoPosLastDirection, r_outer, r_avoid); + return FindBestWindowPosForPopupEx(window->Pos, window->Size, &window->AutoPosLastDirection, r_outer, ImRect(window->Pos, window->Pos), ImGuiPopupPositionPolicy_Default); // Ideally we'd disable r_avoid here } if (window->Flags & ImGuiWindowFlags_Tooltip) { - // Position tooltip (always follows mouse) - float sc = g.Style.MouseCursorScale; - ImVec2 ref_pos = NavCalcPreferredRefPos(); + // Position tooltip (always follows mouse + clamp within outer boundaries) + // FIXME: + // - Too many paths. One problem is that FindBestWindowPosForPopupEx() doesn't allow passing a suggested position (so touch screen path doesn't use it by default). + // - Drag and drop tooltips are not using this path either: BeginTooltipEx() manually sets their position. + // - Require some tidying up. In theory we could handle both cases in same location, but requires a bit of shuffling + // as drag and drop tooltips are calling SetNextWindowPos() leading to 'window_pos_set_by_api' being set in Begin(). + IM_ASSERT(g.CurrentWindow == window); + const float scale = g.Style.MouseCursorScale; + const ImVec2 ref_pos = NavCalcPreferredRefPos(); + + if (g.IO.MouseSource == ImGuiMouseSource_TouchScreen && NavCalcPreferredRefPosSource() == ImGuiInputSource_Mouse) + { + ImVec2 tooltip_pos = ref_pos + TOOLTIP_DEFAULT_OFFSET_TOUCH * scale - (TOOLTIP_DEFAULT_PIVOT_TOUCH * window->Size); + if (r_outer.Contains(ImRect(tooltip_pos, tooltip_pos + window->Size))) + return tooltip_pos; + } + + ImVec2 tooltip_pos = ref_pos + TOOLTIP_DEFAULT_OFFSET_MOUSE * scale; ImRect r_avoid; - if (!g.NavDisableHighlight && g.NavDisableMouseHover && !(g.IO.ConfigFlags & ImGuiConfigFlags_NavEnableSetMousePos)) + if (g.NavCursorVisible && g.NavHighlightItemUnderNav && !g.IO.ConfigNavMoveSetMousePos) r_avoid = ImRect(ref_pos.x - 16, ref_pos.y - 8, ref_pos.x + 16, ref_pos.y + 8); else - r_avoid = ImRect(ref_pos.x - 16, ref_pos.y - 8, ref_pos.x + 24 * sc, ref_pos.y + 24 * sc); // FIXME: Hard-coded based on mouse cursor shape expectation. Exact dimension not very important. - ImVec2 pos = FindBestWindowPosForPopupEx(ref_pos, window->Size, &window->AutoPosLastDirection, r_outer, r_avoid); - if (window->AutoPosLastDirection == ImGuiDir_None) - pos = ref_pos + ImVec2(2, 2); // If there's not enough room, for tooltip we prefer avoiding the cursor at all cost even if it means that part of the tooltip won't be visible. - return pos; + r_avoid = ImRect(ref_pos.x - 16, ref_pos.y - 8, ref_pos.x + 24 * scale, ref_pos.y + 24 * scale); // FIXME: Hard-coded based on mouse cursor shape expectation. Exact dimension not very important. + //GetForegroundDrawList()->AddRect(r_avoid.Min, r_avoid.Max, IM_COL32(255, 0, 255, 255)); + + return FindBestWindowPosForPopupEx(tooltip_pos, window->Size, &window->AutoPosLastDirection, r_outer, r_avoid, ImGuiPopupPositionPolicy_Tooltip); } IM_ASSERT(0); return window->Pos; } +//----------------------------------------------------------------------------- +// [SECTION] WINDOW FOCUS +//---------------------------------------------------------------------------- +// - SetWindowFocus() +// - SetNextWindowFocus() +// - IsWindowFocused() +// - UpdateWindowInFocusOrderList() [Internal] +// - BringWindowToFocusFront() [Internal] +// - BringWindowToDisplayFront() [Internal] +// - BringWindowToDisplayBack() [Internal] +// - BringWindowToDisplayBehind() [Internal] +// - FindWindowDisplayIndex() [Internal] +// - FocusWindow() [Internal] +// - FocusTopMostWindowUnderOne() [Internal] +//----------------------------------------------------------------------------- + +void ImGui::SetWindowFocus() +{ + FocusWindow(GImGui->CurrentWindow); +} + +void ImGui::SetWindowFocus(const char* name) +{ + if (name) + { + if (ImGuiWindow* window = FindWindowByName(name)) + FocusWindow(window); + } + else + { + FocusWindow(NULL); + } +} + +void ImGui::SetNextWindowFocus() +{ + ImGuiContext& g = *GImGui; + g.NextWindowData.HasFlags |= ImGuiNextWindowDataFlags_HasFocus; +} + +// Similar to IsWindowHovered() +bool ImGui::IsWindowFocused(ImGuiFocusedFlags flags) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* ref_window = g.NavWindow; + ImGuiWindow* cur_window = g.CurrentWindow; + + if (ref_window == NULL) + return false; + if (flags & ImGuiFocusedFlags_AnyWindow) + return true; + + IM_ASSERT(cur_window); // Not inside a Begin()/End() + const bool popup_hierarchy = (flags & ImGuiFocusedFlags_NoPopupHierarchy) == 0; + const bool dock_hierarchy = (flags & ImGuiFocusedFlags_DockHierarchy) != 0; + if (flags & ImGuiHoveredFlags_RootWindow) + cur_window = GetCombinedRootWindow(cur_window, popup_hierarchy, dock_hierarchy); + + if (flags & ImGuiHoveredFlags_ChildWindows) + return IsWindowChildOf(ref_window, cur_window, popup_hierarchy, dock_hierarchy); + else + return (ref_window == cur_window); +} + +static int ImGui::FindWindowFocusIndex(ImGuiWindow* window) +{ + ImGuiContext& g = *GImGui; + IM_UNUSED(g); + int order = window->FocusOrder; + IM_ASSERT(window->RootWindow == window); // No child window (not testing _ChildWindow because of docking) + IM_ASSERT(g.WindowsFocusOrder[order] == window); + return order; +} + +static void ImGui::UpdateWindowInFocusOrderList(ImGuiWindow* window, bool just_created, ImGuiWindowFlags new_flags) +{ + ImGuiContext& g = *GImGui; + + const bool new_is_explicit_child = (new_flags & ImGuiWindowFlags_ChildWindow) != 0 && ((new_flags & ImGuiWindowFlags_Popup) == 0 || (new_flags & ImGuiWindowFlags_ChildMenu) != 0); + const bool child_flag_changed = new_is_explicit_child != window->IsExplicitChild; + if ((just_created || child_flag_changed) && !new_is_explicit_child) + { + IM_ASSERT(!g.WindowsFocusOrder.contains(window)); + g.WindowsFocusOrder.push_back(window); + window->FocusOrder = (short)(g.WindowsFocusOrder.Size - 1); + } + else if (!just_created && child_flag_changed && new_is_explicit_child) + { + IM_ASSERT(g.WindowsFocusOrder[window->FocusOrder] == window); + for (int n = window->FocusOrder + 1; n < g.WindowsFocusOrder.Size; n++) + g.WindowsFocusOrder[n]->FocusOrder--; + g.WindowsFocusOrder.erase(g.WindowsFocusOrder.Data + window->FocusOrder); + window->FocusOrder = -1; + } + window->IsExplicitChild = new_is_explicit_child; +} + +void ImGui::BringWindowToFocusFront(ImGuiWindow* window) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(window == window->RootWindow); + + const int cur_order = window->FocusOrder; + IM_ASSERT(g.WindowsFocusOrder[cur_order] == window); + if (g.WindowsFocusOrder.back() == window) + return; + + const int new_order = g.WindowsFocusOrder.Size - 1; + for (int n = cur_order; n < new_order; n++) + { + g.WindowsFocusOrder[n] = g.WindowsFocusOrder[n + 1]; + g.WindowsFocusOrder[n]->FocusOrder--; + IM_ASSERT(g.WindowsFocusOrder[n]->FocusOrder == n); + } + g.WindowsFocusOrder[new_order] = window; + window->FocusOrder = (short)new_order; +} + +// Note technically focus related but rather adjacent and close to BringWindowToFocusFront() +void ImGui::BringWindowToDisplayFront(ImGuiWindow* window) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* current_front_window = g.Windows.back(); + if (current_front_window == window || current_front_window->RootWindowDockTree == window) // Cheap early out (could be better) + return; + for (int i = g.Windows.Size - 2; i >= 0; i--) // We can ignore the top-most window + if (g.Windows[i] == window) + { + memmove(&g.Windows[i], &g.Windows[i + 1], (size_t)(g.Windows.Size - i - 1) * sizeof(ImGuiWindow*)); + g.Windows[g.Windows.Size - 1] = window; + break; + } +} + +void ImGui::BringWindowToDisplayBack(ImGuiWindow* window) +{ + ImGuiContext& g = *GImGui; + if (g.Windows[0] == window) + return; + for (int i = 0; i < g.Windows.Size; i++) + if (g.Windows[i] == window) + { + memmove(&g.Windows[1], &g.Windows[0], (size_t)i * sizeof(ImGuiWindow*)); + g.Windows[0] = window; + break; + } +} + +void ImGui::BringWindowToDisplayBehind(ImGuiWindow* window, ImGuiWindow* behind_window) +{ + IM_ASSERT(window != NULL && behind_window != NULL); + ImGuiContext& g = *GImGui; + window = window->RootWindow; + behind_window = behind_window->RootWindow; + int pos_wnd = FindWindowDisplayIndex(window); + int pos_beh = FindWindowDisplayIndex(behind_window); + if (pos_wnd < pos_beh) + { + size_t copy_bytes = (pos_beh - pos_wnd - 1) * sizeof(ImGuiWindow*); + memmove(&g.Windows.Data[pos_wnd], &g.Windows.Data[pos_wnd + 1], copy_bytes); + g.Windows[pos_beh - 1] = window; + } + else + { + size_t copy_bytes = (pos_wnd - pos_beh) * sizeof(ImGuiWindow*); + memmove(&g.Windows.Data[pos_beh + 1], &g.Windows.Data[pos_beh], copy_bytes); + g.Windows[pos_beh] = window; + } +} + +int ImGui::FindWindowDisplayIndex(ImGuiWindow* window) +{ + ImGuiContext& g = *GImGui; + return g.Windows.index_from_ptr(g.Windows.find(window)); +} + +// Moving window to front of display and set focus (which happens to be back of our sorted list) +void ImGui::FocusWindow(ImGuiWindow* window, ImGuiFocusRequestFlags flags) +{ + ImGuiContext& g = *GImGui; + + // Modal check? + if ((flags & ImGuiFocusRequestFlags_UnlessBelowModal) && (g.NavWindow != window)) // Early out in common case. + if (ImGuiWindow* blocking_modal = FindBlockingModal(window)) + { + // This block would typically be reached in two situations: + // - API call to FocusWindow() with a window under a modal and ImGuiFocusRequestFlags_UnlessBelowModal flag. + // - User clicking on void or anything behind a modal while a modal is open (window == NULL) + IMGUI_DEBUG_LOG_FOCUS("[focus] FocusWindow(\"%s\", UnlessBelowModal): prevented by \"%s\".\n", window ? window->Name : "", blocking_modal->Name); + if (window && window == window->RootWindow && (window->Flags & ImGuiWindowFlags_NoBringToFrontOnFocus) == 0) + BringWindowToDisplayBehind(window, blocking_modal); // Still bring right under modal. (FIXME: Could move in focus list too?) + ClosePopupsOverWindow(GetTopMostPopupModal(), false); // Note how we need to use GetTopMostPopupModal() aad NOT blocking_modal, to handle nested modals + return; + } + + // Find last focused child (if any) and focus it instead. + if ((flags & ImGuiFocusRequestFlags_RestoreFocusedChild) && window != NULL) + window = NavRestoreLastChildNavWindow(window); + + // Apply focus + if (g.NavWindow != window) + { + SetNavWindow(window); + if (window && g.NavHighlightItemUnderNav) + g.NavMousePosDirty = true; + g.NavId = window ? window->NavLastIds[0] : 0; // Restore NavId + g.NavLayer = ImGuiNavLayer_Main; + SetNavFocusScope(window ? window->NavRootFocusScopeId : 0); + g.NavIdIsAlive = false; + g.NavLastValidSelectionUserData = ImGuiSelectionUserData_Invalid; + + // Close popups if any + ClosePopupsOverWindow(window, false); + } + + // Move the root window to the top of the pile + IM_ASSERT(window == NULL || window->RootWindowDockTree != NULL); + ImGuiWindow* focus_front_window = window ? window->RootWindow : NULL; + ImGuiWindow* display_front_window = window ? window->RootWindowDockTree : NULL; + ImGuiDockNode* dock_node = window ? window->DockNode : NULL; + bool active_id_window_is_dock_node_host = (g.ActiveIdWindow && dock_node && dock_node->HostWindow == g.ActiveIdWindow); + + // Steal active widgets. Some of the cases it triggers includes: + // - Focus a window while an InputText in another window is active, if focus happens before the old InputText can run. + // - When using Nav to activate menu items (due to timing of activating on press->new window appears->losing ActiveId) + // - Using dock host items (tab, collapse button) can trigger this before we redirect the ActiveIdWindow toward the child window. + if (g.ActiveId != 0 && g.ActiveIdWindow && g.ActiveIdWindow->RootWindow != focus_front_window) + if (!g.ActiveIdNoClearOnFocusLoss && !active_id_window_is_dock_node_host) + ClearActiveID(); + + // Passing NULL allow to disable keyboard focus + if (!window) + return; + window->LastFrameJustFocused = g.FrameCount; + + // Select in dock node + // For #2304 we avoid applying focus immediately before the tabbar is visible. + //if (dock_node && dock_node->TabBar) + // dock_node->TabBar->SelectedTabId = dock_node->TabBar->NextSelectedTabId = window->TabId; + + // Bring to front + BringWindowToFocusFront(focus_front_window); + if (((window->Flags | focus_front_window->Flags | display_front_window->Flags) & ImGuiWindowFlags_NoBringToFrontOnFocus) == 0) + BringWindowToDisplayFront(display_front_window); +} + +void ImGui::FocusTopMostWindowUnderOne(ImGuiWindow* under_this_window, ImGuiWindow* ignore_window, ImGuiViewport* filter_viewport, ImGuiFocusRequestFlags flags) +{ + ImGuiContext& g = *GImGui; + int start_idx = g.WindowsFocusOrder.Size - 1; + if (under_this_window != NULL) + { + // Aim at root window behind us, if we are in a child window that's our own root (see #4640) + int offset = -1; + while (under_this_window->Flags & ImGuiWindowFlags_ChildWindow) + { + under_this_window = under_this_window->ParentWindow; + offset = 0; + } + start_idx = FindWindowFocusIndex(under_this_window) + offset; + } + for (int i = start_idx; i >= 0; i--) + { + // We may later decide to test for different NoXXXInputs based on the active navigation input (mouse vs nav) but that may feel more confusing to the user. + ImGuiWindow* window = g.WindowsFocusOrder[i]; + if (window == ignore_window || !window->WasActive) + continue; + if (filter_viewport != NULL && window->Viewport != filter_viewport) + continue; + if ((window->Flags & (ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoNavInputs)) != (ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoNavInputs)) + { + // FIXME-DOCK: When ImGuiFocusRequestFlags_RestoreFocusedChild is set... + // This is failing (lagging by one frame) for docked windows. + // If A and B are docked into window and B disappear, at the NewFrame() call site window->NavLastChildNavWindow will still point to B. + // We might leverage the tab order implicitly stored in window->DockNodeAsHost->TabBar (essentially the 'most_recently_selected_tab' code in tab bar will do that but on next update) + // to tell which is the "previous" window. Or we may leverage 'LastFrameFocused/LastFrameJustFocused' and have this function handle child window itself? + FocusWindow(window, flags); + return; + } + } + FocusWindow(NULL, flags); +} //----------------------------------------------------------------------------- // [SECTION] KEYBOARD/GAMEPAD NAVIGATION //----------------------------------------------------------------------------- -ImGuiDir ImGetDirQuadrantFromDelta(float dx, float dy) +// FIXME-NAV: The existence of SetNavID vs SetFocusID vs FocusWindow() needs to be clarified/reworked. +// In our terminology those should be interchangeable, yet right now this is super confusing. +// Those two functions are merely a legacy artifact, so at minimum naming should be clarified. + +void ImGui::SetNavCursorVisible(bool visible) +{ + ImGuiContext& g = *GImGui; + if (g.IO.ConfigNavCursorVisibleAlways) + visible = true; + g.NavCursorVisible = visible; +} + +// (was called NavRestoreHighlightAfterMove() before 1.91.4) +void ImGui::SetNavCursorVisibleAfterMove() +{ + ImGuiContext& g = *GImGui; + if (g.IO.ConfigNavCursorVisibleAuto) + g.NavCursorVisible = true; + g.NavHighlightItemUnderNav = g.NavMousePosDirty = true; +} + +void ImGui::SetNavWindow(ImGuiWindow* window) +{ + ImGuiContext& g = *GImGui; + if (g.NavWindow != window) + { + IMGUI_DEBUG_LOG_FOCUS("[focus] SetNavWindow(\"%s\")\n", window ? window->Name : ""); + g.NavWindow = window; + g.NavLastValidSelectionUserData = ImGuiSelectionUserData_Invalid; + } + g.NavInitRequest = g.NavMoveSubmitted = g.NavMoveScoringItems = false; + NavUpdateAnyRequestFlag(); +} + +void ImGui::NavHighlightActivated(ImGuiID id) +{ + ImGuiContext& g = *GImGui; + g.NavHighlightActivatedId = id; + g.NavHighlightActivatedTimer = NAV_ACTIVATE_HIGHLIGHT_TIMER; +} + +void ImGui::NavClearPreferredPosForAxis(ImGuiAxis axis) +{ + ImGuiContext& g = *GImGui; + g.NavWindow->RootWindowForNav->NavPreferredScoringPosRel[g.NavLayer][axis] = FLT_MAX; +} + +void ImGui::SetNavID(ImGuiID id, ImGuiNavLayer nav_layer, ImGuiID focus_scope_id, const ImRect& rect_rel) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(g.NavWindow != NULL); + IM_ASSERT(nav_layer == ImGuiNavLayer_Main || nav_layer == ImGuiNavLayer_Menu); + g.NavId = id; + g.NavLayer = nav_layer; + SetNavFocusScope(focus_scope_id); + g.NavWindow->NavLastIds[nav_layer] = id; + g.NavWindow->NavRectRel[nav_layer] = rect_rel; + + // Clear preferred scoring position (NavMoveRequestApplyResult() will tend to restore it) + NavClearPreferredPosForAxis(ImGuiAxis_X); + NavClearPreferredPosForAxis(ImGuiAxis_Y); +} + +void ImGui::SetFocusID(ImGuiID id, ImGuiWindow* window) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(id != 0); + + if (g.NavWindow != window) + SetNavWindow(window); + + // Assume that SetFocusID() is called in the context where its window->DC.NavLayerCurrent and g.CurrentFocusScopeId are valid. + // Note that window may be != g.CurrentWindow (e.g. SetFocusID call in InputTextEx for multi-line text) + const ImGuiNavLayer nav_layer = window->DC.NavLayerCurrent; + g.NavId = id; + g.NavLayer = nav_layer; + SetNavFocusScope(g.CurrentFocusScopeId); + window->NavLastIds[nav_layer] = id; + if (g.LastItemData.ID == id) + window->NavRectRel[nav_layer] = WindowRectAbsToRel(window, g.LastItemData.NavRect); + + if (g.ActiveIdSource == ImGuiInputSource_Keyboard || g.ActiveIdSource == ImGuiInputSource_Gamepad) + g.NavHighlightItemUnderNav = true; + else if (g.IO.ConfigNavCursorVisibleAuto) + g.NavCursorVisible = false; + + // Clear preferred scoring position (NavMoveRequestApplyResult() will tend to restore it) + NavClearPreferredPosForAxis(ImGuiAxis_X); + NavClearPreferredPosForAxis(ImGuiAxis_Y); +} + +static ImGuiDir ImGetDirQuadrantFromDelta(float dx, float dy) { if (ImFabs(dx) > ImFabs(dy)) return (dx > 0.0f) ? ImGuiDir_Right : ImGuiDir_Left; return (dy > 0.0f) ? ImGuiDir_Down : ImGuiDir_Up; } -static float inline NavScoreItemDistInterval(float a0, float a1, float b0, float b1) +static float inline NavScoreItemDistInterval(float cand_min, float cand_max, float curr_min, float curr_max) { - if (a1 < b0) - return a1 - b0; - if (b1 < a0) - return a0 - b1; + if (cand_max < curr_min) + return cand_max - curr_min; + if (curr_max < cand_min) + return cand_min - curr_max; return 0.0f; } -static void inline NavClampRectToVisibleAreaForMoveDir(ImGuiDir move_dir, ImRect& r, const ImRect& clip_rect) -{ - if (move_dir == ImGuiDir_Left || move_dir == ImGuiDir_Right) - { - r.Min.y = ImClamp(r.Min.y, clip_rect.Min.y, clip_rect.Max.y); - r.Max.y = ImClamp(r.Max.y, clip_rect.Min.y, clip_rect.Max.y); - } - else - { - r.Min.x = ImClamp(r.Min.x, clip_rect.Min.x, clip_rect.Max.x); - r.Max.x = ImClamp(r.Max.x, clip_rect.Min.x, clip_rect.Max.x); - } -} - -// Scoring function for directional navigation. Based on https://gist.github.com/rygorous/6981057 -static bool ImGui::NavScoreItem(ImGuiNavMoveResult* result, ImRect cand) +// Scoring function for keyboard/gamepad directional navigation. Based on https://gist.github.com/rygorous/6981057 +static bool ImGui::NavScoreItem(ImGuiNavItemData* result) { ImGuiContext& g = *GImGui; ImGuiWindow* window = g.CurrentWindow; if (g.NavLayer != window->DC.NavLayerCurrent) return false; - const ImRect& curr = g.NavScoringRectScreen; // Current modified source rect (NB: we've applied Max.x = Min.x in NavUpdate() to inhibit the effect of having varied item width) - g.NavScoringCount++; + // FIXME: Those are not good variables names + ImRect cand = g.LastItemData.NavRect; // Current item nav rectangle + const ImRect curr = g.NavScoringRect; // Current modified source rect (NB: we've applied Max.x = Min.x in NavUpdate() to inhibit the effect of having varied item width) + g.NavScoringDebugCount++; // When entering through a NavFlattened border, we consider child window items as fully clipped for scoring if (window->ParentWindow == g.NavWindow) { - IM_ASSERT((window->Flags | g.NavWindow->Flags) & ImGuiWindowFlags_NavFlattened); + IM_ASSERT((window->ChildFlags | g.NavWindow->ChildFlags) & ImGuiChildFlags_NavFlattened); if (!window->ClipRect.Overlaps(cand)) return false; cand.ClipWithFull(window->ClipRect); // This allows the scored item to not overlap other candidates in the parent window } - // We perform scoring on items bounding box clipped by the current clipping rectangle on the other axis (clipping on our movement axis would give us equal scores for all clipped items) - // For example, this ensure that items in one column are not reached when moving vertically from items in another column. - NavClampRectToVisibleAreaForMoveDir(g.NavMoveClipDir, cand, window->ClipRect); - // Compute distance between boxes // FIXME-NAV: Introducing biases for vertical navigation, needs to be removed. float dbx = NavScoreItemDistInterval(cand.Min.x, cand.Max.x, curr.Min.x, curr.Max.x); float dby = NavScoreItemDistInterval(ImLerp(cand.Min.y, cand.Max.y, 0.2f), ImLerp(cand.Min.y, cand.Max.y, 0.8f), ImLerp(curr.Min.y, curr.Max.y, 0.2f), ImLerp(curr.Min.y, curr.Max.y, 0.8f)); // Scale down on Y to keep using box-distance for vertically touching items if (dby != 0.0f && dbx != 0.0f) - dbx = (dbx/1000.0f) + ((dbx > 0.0f) ? +1.0f : -1.0f); + dbx = (dbx / 1000.0f) + ((dbx > 0.0f) ? +1.0f : -1.0f); float dist_box = ImFabs(dbx) + ImFabs(dby); // Compute distance between centers (this is off by a factor of 2, but we only compare center distances with each other so it doesn't matter) @@ -7903,6 +13164,9 @@ static bool ImGui::NavScoreItem(ImGuiNavMoveResult* result, ImRect cand) if (dbx != 0.0f || dby != 0.0f) { // For non-overlapping boxes, use distance between boxes + // FIXME-NAV: Quadrant may be incorrect because of (1) dbx bias and (2) curr.Max.y bias applied by NavBiasScoringRect() where typically curr.Max.y==curr.Min.y + // One typical case where this happens, with style.WindowMenuButtonPosition == ImGuiDir_Right, pressing Left to navigate from Close to Collapse tends to fail. + // Also see #6344. Calling ImGetDirQuadrantFromDelta() with unbiased values may be good but side-effects are plenty. dax = dbx; day = dby; dist_axial = dist_box; @@ -7919,36 +13183,45 @@ static bool ImGui::NavScoreItem(ImGuiNavMoveResult* result, ImRect cand) else { // Degenerate case: two overlapping buttons with same center, break ties arbitrarily (note that LastItemId here is really the _previous_ item order, but it doesn't matter) - quadrant = (window->DC.LastItemId < g.NavId) ? ImGuiDir_Left : ImGuiDir_Right; + quadrant = (g.LastItemData.ID < g.NavId) ? ImGuiDir_Left : ImGuiDir_Right; } + const ImGuiDir move_dir = g.NavMoveDir; #if IMGUI_DEBUG_NAV_SCORING - char buf[128]; - if (IsMouseHoveringRect(cand.Min, cand.Max)) + char buf[200]; + if (g.IO.KeyCtrl) // Hold CTRL to preview score in matching quadrant. CTRL+Arrow to rotate. { - ImFormatString(buf, IM_ARRAYSIZE(buf), "dbox (%.2f,%.2f->%.4f)\ndcen (%.2f,%.2f->%.4f)\nd (%.2f,%.2f->%.4f)\nnav %c, quadrant %c", dbx, dby, dist_box, dcx, dcy, dist_center, dax, day, dist_axial, "WENS"[g.NavMoveDir], "WENS"[quadrant]); - ImDrawList* draw_list = GetForegroundDrawList(window); - draw_list->AddRect(curr.Min, curr.Max, IM_COL32(255,200,0,100)); - draw_list->AddRect(cand.Min, cand.Max, IM_COL32(255,255,0,200)); - draw_list->AddRectFilled(cand.Max - ImVec2(4,4), cand.Max + CalcTextSize(buf) + ImVec2(4,4), IM_COL32(40,0,0,150)); - draw_list->AddText(g.IO.FontDefault, 13.0f, cand.Max, ~0U, buf); - } - else if (g.IO.KeyCtrl) // Hold to preview score in matching quadrant. Press C to rotate. - { - if (IsKeyPressedMap(ImGuiKey_C)) { g.NavMoveDirLast = (ImGuiDir)((g.NavMoveDirLast + 1) & 3); g.IO.KeysDownDuration[g.IO.KeyMap[ImGuiKey_C]] = 0.01f; } - if (quadrant == g.NavMoveDir) + if (quadrant == move_dir) { ImFormatString(buf, IM_ARRAYSIZE(buf), "%.0f/%.0f", dist_box, dist_center); ImDrawList* draw_list = GetForegroundDrawList(window); - draw_list->AddRectFilled(cand.Min, cand.Max, IM_COL32(255, 0, 0, 200)); - draw_list->AddText(g.IO.FontDefault, 13.0f, cand.Min, IM_COL32(255, 255, 255, 255), buf); + draw_list->AddRectFilled(cand.Min, cand.Max, IM_COL32(255, 0, 0, 80)); + draw_list->AddRectFilled(cand.Min, cand.Min + CalcTextSize(buf), IM_COL32(255, 0, 0, 200)); + draw_list->AddText(cand.Min, IM_COL32(255, 255, 255, 255), buf); } } - #endif + const bool debug_hovering = IsMouseHoveringRect(cand.Min, cand.Max); + const bool debug_tty = (g.IO.KeyCtrl && IsKeyPressed(ImGuiKey_Space)); + if (debug_hovering || debug_tty) + { + ImFormatString(buf, IM_ARRAYSIZE(buf), + "d-box (%7.3f,%7.3f) -> %7.3f\nd-center (%7.3f,%7.3f) -> %7.3f\nd-axial (%7.3f,%7.3f) -> %7.3f\nnav %c, quadrant %c", + dbx, dby, dist_box, dcx, dcy, dist_center, dax, day, dist_axial, "-WENS"[move_dir+1], "-WENS"[quadrant+1]); + if (debug_hovering) + { + ImDrawList* draw_list = GetForegroundDrawList(window); + draw_list->AddRect(curr.Min, curr.Max, IM_COL32(255, 200, 0, 100)); + draw_list->AddRect(cand.Min, cand.Max, IM_COL32(255, 255, 0, 200)); + draw_list->AddRectFilled(cand.Max - ImVec2(4, 4), cand.Max + CalcTextSize(buf) + ImVec2(4, 4), IM_COL32(40, 0, 0, 200)); + draw_list->AddText(cand.Max, ~0U, buf); + } + if (debug_tty) { IMGUI_DEBUG_LOG_NAV("id 0x%08X\n%s\n", g.LastItemData.ID, buf); } + } +#endif - // Is it in the quadrant we're interesting in moving to? + // Is it in the quadrant we're interested in moving to? bool new_best = false; - if (quadrant == g.NavMoveDir) + if (quadrant == move_dir) { // Does it beat the current best candidate? if (dist_box < result->DistBox) @@ -7970,7 +13243,7 @@ static bool ImGui::NavScoreItem(ImGuiNavMoveResult* result, ImRect cand) // Still tied! we need to be extra-careful to make sure everything gets linked properly. We consistently break ties by symbolically moving "later" items // (with higher index) to the right/downwards by an infinitesimal amount since we the current "best" button already (so it must have a lower index), // this is fairly easy. This rule ensures that all buttons with dx==dy==0 will end up being linked in order of appearance along the x axis. - if (((g.NavMoveDir == ImGuiDir_Up || g.NavMoveDir == ImGuiDir_Down) ? dby : dbx) < 0.0f) // moving bj to the right/down decreases distance + if (((move_dir == ImGuiDir_Up || move_dir == ImGuiDir_Down) ? dby : dbx) < 0.0f) // moving bj to the right/down decreases distance new_best = true; } } @@ -7982,8 +13255,8 @@ static bool ImGui::NavScoreItem(ImGuiNavMoveResult* result, ImRect cand) // 2017/09/29: FIXME: This now currently only enabled inside menu bars, ideally we'd disable it everywhere. Menus in particular need to catch failure. For general navigation it feels awkward. // Disabling it may lead to disconnected graphs when nodes are very spaced out on different axis. Perhaps consider offering this as an option? if (result->DistBox == FLT_MAX && dist_axial < result->DistAxial) // Check axial match - if (g.NavLayer == 1 && !(g.NavWindow->Flags & ImGuiWindowFlags_ChildMenu)) - if ((g.NavMoveDir == ImGuiDir_Left && dax < 0.0f) || (g.NavMoveDir == ImGuiDir_Right && dax > 0.0f) || (g.NavMoveDir == ImGuiDir_Up && day < 0.0f) || (g.NavMoveDir == ImGuiDir_Down && day > 0.0f)) + if (g.NavLayer == ImGuiNavLayer_Menu && !(g.NavWindow->Flags & ImGuiWindowFlags_ChildMenu)) + if ((move_dir == ImGuiDir_Left && dax < 0.0f) || (move_dir == ImGuiDir_Right && dax > 0.0f) || (move_dir == ImGuiDir_Up && day < 0.0f) || (move_dir == ImGuiDir_Down && day > 0.0f)) { result->DistAxial = dist_axial; new_best = true; @@ -7992,26 +13265,58 @@ static bool ImGui::NavScoreItem(ImGuiNavMoveResult* result, ImRect cand) return new_best; } -// We get there when either NavId == id, or when g.NavAnyRequest is set (which is updated by NavUpdateAnyRequestFlag above) -static void ImGui::NavProcessItem(ImGuiWindow* window, const ImRect& nav_bb, const ImGuiID id) +static void ImGui::NavApplyItemToResult(ImGuiNavItemData* result) { ImGuiContext& g = *GImGui; - //if (!g.IO.NavActive) // [2017/10/06] Removed this possibly redundant test but I am not sure of all the side-effects yet. Some of the feature here will need to work regardless of using a _NoNavInputs flag. - // return; + ImGuiWindow* window = g.CurrentWindow; + result->Window = window; + result->ID = g.LastItemData.ID; + result->FocusScopeId = g.CurrentFocusScopeId; + result->ItemFlags = g.LastItemData.ItemFlags; + result->RectRel = WindowRectAbsToRel(window, g.LastItemData.NavRect); + if (result->ItemFlags & ImGuiItemFlags_HasSelectionUserData) + { + IM_ASSERT(g.NextItemData.SelectionUserData != ImGuiSelectionUserData_Invalid); + result->SelectionUserData = g.NextItemData.SelectionUserData; // INTENTIONAL: At this point this field is not cleared in NextItemData. Avoid unnecessary copy to LastItemData. + } +} - const ImGuiItemFlags item_flags = window->DC.ItemFlags; - const ImRect nav_bb_rel(nav_bb.Min - window->Pos, nav_bb.Max - window->Pos); +// True when current work location may be scrolled horizontally when moving left / right. +// This is generally always true UNLESS within a column. We don't have a vertical equivalent. +void ImGui::NavUpdateCurrentWindowIsScrollPushableX() +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + window->DC.NavIsScrollPushableX = (g.CurrentTable == NULL && window->DC.CurrentColumns == NULL); +} + +// We get there when either NavId == id, or when g.NavAnyRequest is set (which is updated by NavUpdateAnyRequestFlag above) +// This is called after LastItemData is set, but NextItemData is also still valid. +static void ImGui::NavProcessItem() +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + const ImGuiID id = g.LastItemData.ID; + const ImGuiItemFlags item_flags = g.LastItemData.ItemFlags; + + // When inside a container that isn't scrollable with Left<>Right, clip NavRect accordingly (#2221) + if (window->DC.NavIsScrollPushableX == false) + { + g.LastItemData.NavRect.Min.x = ImClamp(g.LastItemData.NavRect.Min.x, window->ClipRect.Min.x, window->ClipRect.Max.x); + g.LastItemData.NavRect.Max.x = ImClamp(g.LastItemData.NavRect.Max.x, window->ClipRect.Min.x, window->ClipRect.Max.x); + } + const ImRect nav_bb = g.LastItemData.NavRect; // Process Init Request - if (g.NavInitRequest && g.NavLayer == window->DC.NavLayerCurrent) + if (g.NavInitRequest && g.NavLayer == window->DC.NavLayerCurrent && (item_flags & ImGuiItemFlags_Disabled) == 0) { // Even if 'ImGuiItemFlags_NoNavDefaultFocus' is on (typically collapse/close button) we record the first ResultId so they can be used as a fallback - if (!(item_flags & ImGuiItemFlags_NoNavDefaultFocus) || g.NavInitResultId == 0) + const bool candidate_for_nav_default_focus = (item_flags & ImGuiItemFlags_NoNavDefaultFocus) == 0; + if (candidate_for_nav_default_focus || g.NavInitResult.ID == 0) { - g.NavInitResultId = id; - g.NavInitResultRectRel = nav_bb_rel; + NavApplyItemToResult(&g.NavInitResult); } - if (!(item_flags & ImGuiItemFlags_NoNavDefaultFocus)) + if (candidate_for_nav_default_focus) { g.NavInitRequest = false; // Found a match, clear request NavUpdateAnyRequestFlag(); @@ -8019,144 +13324,252 @@ static void ImGui::NavProcessItem(ImGuiWindow* window, const ImRect& nav_bb, con } // Process Move Request (scoring for navigation) - // FIXME-NAV: Consider policy for double scoring (scoring from NavScoringRectScreen + scoring from a rect wrapped according to current wrapping policy) - if ((g.NavId != id || (g.NavMoveRequestFlags & ImGuiNavMoveFlags_AllowCurrentNavId)) && !(item_flags & (ImGuiItemFlags_Disabled|ImGuiItemFlags_NoNav))) + // FIXME-NAV: Consider policy for double scoring (scoring from NavScoringRect + scoring from a rect wrapped according to current wrapping policy) + if (g.NavMoveScoringItems && (item_flags & ImGuiItemFlags_Disabled) == 0) { - ImGuiNavMoveResult* result = (window == g.NavWindow) ? &g.NavMoveResultLocal : &g.NavMoveResultOther; -#if IMGUI_DEBUG_NAV_SCORING - // [DEBUG] Score all items in NavWindow at all times - if (!g.NavMoveRequest) - g.NavMoveDir = g.NavMoveDirLast; - bool new_best = NavScoreItem(result, nav_bb) && g.NavMoveRequest; -#else - bool new_best = g.NavMoveRequest && NavScoreItem(result, nav_bb); -#endif - if (new_best) + if ((g.NavMoveFlags & ImGuiNavMoveFlags_FocusApi) || (window->Flags & ImGuiWindowFlags_NoNavInputs) == 0) { - result->ID = id; - result->SelectScopeId = g.MultiSelectScopeId; - result->Window = window; - result->RectRel = nav_bb_rel; - } + const bool is_tabbing = (g.NavMoveFlags & ImGuiNavMoveFlags_IsTabbing) != 0; + if (is_tabbing) + { + NavProcessItemForTabbingRequest(id, item_flags, g.NavMoveFlags); + } + else if (g.NavId != id || (g.NavMoveFlags & ImGuiNavMoveFlags_AllowCurrentNavId)) + { + ImGuiNavItemData* result = (window == g.NavWindow) ? &g.NavMoveResultLocal : &g.NavMoveResultOther; + if (NavScoreItem(result)) + NavApplyItemToResult(result); - const float VISIBLE_RATIO = 0.70f; - if ((g.NavMoveRequestFlags & ImGuiNavMoveFlags_AlsoScoreVisibleSet) && window->ClipRect.Overlaps(nav_bb)) - if (ImClamp(nav_bb.Max.y, window->ClipRect.Min.y, window->ClipRect.Max.y) - ImClamp(nav_bb.Min.y, window->ClipRect.Min.y, window->ClipRect.Max.y) >= (nav_bb.Max.y - nav_bb.Min.y) * VISIBLE_RATIO) - if (NavScoreItem(&g.NavMoveResultLocalVisibleSet, nav_bb)) - { - result = &g.NavMoveResultLocalVisibleSet; - result->ID = id; - result->SelectScopeId = g.MultiSelectScopeId; - result->Window = window; - result->RectRel = nav_bb_rel; - } + // Features like PageUp/PageDown need to maintain a separate score for the visible set of items. + const float VISIBLE_RATIO = 0.70f; + if ((g.NavMoveFlags & ImGuiNavMoveFlags_AlsoScoreVisibleSet) && window->ClipRect.Overlaps(nav_bb)) + if (ImClamp(nav_bb.Max.y, window->ClipRect.Min.y, window->ClipRect.Max.y) - ImClamp(nav_bb.Min.y, window->ClipRect.Min.y, window->ClipRect.Max.y) >= (nav_bb.Max.y - nav_bb.Min.y) * VISIBLE_RATIO) + if (NavScoreItem(&g.NavMoveResultLocalVisible)) + NavApplyItemToResult(&g.NavMoveResultLocalVisible); + } + } } - // Update window-relative bounding box of navigated item + // Update information for currently focused/navigated item if (g.NavId == id) { - g.NavWindow = window; // Always refresh g.NavWindow, because some operations such as FocusItem() don't have a window. + if (g.NavWindow != window) + SetNavWindow(window); // Always refresh g.NavWindow, because some operations such as FocusItem() may not have a window. g.NavLayer = window->DC.NavLayerCurrent; + SetNavFocusScope(g.CurrentFocusScopeId); // Will set g.NavFocusScopeId AND store g.NavFocusScopePath + g.NavFocusScopeId = g.CurrentFocusScopeId; g.NavIdIsAlive = true; - g.NavIdTabCounter = window->DC.FocusCounterTab; - window->NavRectRel[window->DC.NavLayerCurrent] = nav_bb_rel; // Store item bounding box (relative to window position) + if (g.LastItemData.ItemFlags & ImGuiItemFlags_HasSelectionUserData) + { + IM_ASSERT(g.NextItemData.SelectionUserData != ImGuiSelectionUserData_Invalid); + g.NavLastValidSelectionUserData = g.NextItemData.SelectionUserData; // INTENTIONAL: At this point this field is not cleared in NextItemData. Avoid unnecessary copy to LastItemData. + } + window->NavRectRel[window->DC.NavLayerCurrent] = WindowRectAbsToRel(window, nav_bb); // Store item bounding box (relative to window position) + } +} + +// Handle "scoring" of an item for a tabbing/focusing request initiated by NavUpdateCreateTabbingRequest(). +// Note that SetKeyboardFocusHere() API calls are considered tabbing requests! +// - Case 1: no nav/active id: set result to first eligible item, stop storing. +// - Case 2: tab forward: on ref id set counter, on counter elapse store result +// - Case 3: tab forward wrap: set result to first eligible item (preemptively), on ref id set counter, on next frame if counter hasn't elapsed store result. // FIXME-TABBING: Could be done as a next-frame forwarded request +// - Case 4: tab backward: store all results, on ref id pick prev, stop storing +// - Case 5: tab backward wrap: store all results, on ref id if no result keep storing until last // FIXME-TABBING: Could be done as next-frame forwarded requested +void ImGui::NavProcessItemForTabbingRequest(ImGuiID id, ImGuiItemFlags item_flags, ImGuiNavMoveFlags move_flags) +{ + ImGuiContext& g = *GImGui; + + if ((move_flags & ImGuiNavMoveFlags_FocusApi) == 0) + { + if (g.NavLayer != g.CurrentWindow->DC.NavLayerCurrent) + return; + if (g.NavFocusScopeId != g.CurrentFocusScopeId) + return; + } + + // - Can always land on an item when using API call. + // - Tabbing with _NavEnableKeyboard (space/enter/arrows): goes through every item. + // - Tabbing without _NavEnableKeyboard: goes through inputable items only. + bool can_stop; + if (move_flags & ImGuiNavMoveFlags_FocusApi) + can_stop = true; + else + can_stop = (item_flags & ImGuiItemFlags_NoTabStop) == 0 && ((g.IO.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard) || (item_flags & ImGuiItemFlags_Inputable)); + + // Always store in NavMoveResultLocal (unlike directional request which uses NavMoveResultOther on sibling/flattened windows) + ImGuiNavItemData* result = &g.NavMoveResultLocal; + if (g.NavTabbingDir == +1) + { + // Tab Forward or SetKeyboardFocusHere() with >= 0 + if (can_stop && g.NavTabbingResultFirst.ID == 0) + NavApplyItemToResult(&g.NavTabbingResultFirst); + if (can_stop && g.NavTabbingCounter > 0 && --g.NavTabbingCounter == 0) + NavMoveRequestResolveWithLastItem(result); + else if (g.NavId == id) + g.NavTabbingCounter = 1; + } + else if (g.NavTabbingDir == -1) + { + // Tab Backward + if (g.NavId == id) + { + if (result->ID) + { + g.NavMoveScoringItems = false; + NavUpdateAnyRequestFlag(); + } + } + else if (can_stop) + { + // Keep applying until reaching NavId + NavApplyItemToResult(result); + } + } + else if (g.NavTabbingDir == 0) + { + if (can_stop && g.NavId == id) + NavMoveRequestResolveWithLastItem(result); + if (can_stop && g.NavTabbingResultFirst.ID == 0) // Tab init + NavApplyItemToResult(&g.NavTabbingResultFirst); } } bool ImGui::NavMoveRequestButNoResultYet() { ImGuiContext& g = *GImGui; - return g.NavMoveRequest && g.NavMoveResultLocal.ID == 0 && g.NavMoveResultOther.ID == 0; + return g.NavMoveScoringItems && g.NavMoveResultLocal.ID == 0 && g.NavMoveResultOther.ID == 0; +} + +// FIXME: ScoringRect is not set +void ImGui::NavMoveRequestSubmit(ImGuiDir move_dir, ImGuiDir clip_dir, ImGuiNavMoveFlags move_flags, ImGuiScrollFlags scroll_flags) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(g.NavWindow != NULL); + //IMGUI_DEBUG_LOG_NAV("[nav] NavMoveRequestSubmit: dir %c, window \"%s\"\n", "-WENS"[move_dir + 1], g.NavWindow->Name); + + if (move_flags & ImGuiNavMoveFlags_IsTabbing) + move_flags |= ImGuiNavMoveFlags_AllowCurrentNavId; + + g.NavMoveSubmitted = g.NavMoveScoringItems = true; + g.NavMoveDir = move_dir; + g.NavMoveDirForDebug = move_dir; + g.NavMoveClipDir = clip_dir; + g.NavMoveFlags = move_flags; + g.NavMoveScrollFlags = scroll_flags; + g.NavMoveForwardToNextFrame = false; + g.NavMoveKeyMods = (move_flags & ImGuiNavMoveFlags_FocusApi) ? 0 : g.IO.KeyMods; + g.NavMoveResultLocal.Clear(); + g.NavMoveResultLocalVisible.Clear(); + g.NavMoveResultOther.Clear(); + g.NavTabbingCounter = 0; + g.NavTabbingResultFirst.Clear(); + NavUpdateAnyRequestFlag(); +} + +void ImGui::NavMoveRequestResolveWithLastItem(ImGuiNavItemData* result) +{ + ImGuiContext& g = *GImGui; + g.NavMoveScoringItems = false; // Ensure request doesn't need more processing + NavApplyItemToResult(result); + NavUpdateAnyRequestFlag(); +} + +// Called by TreePop() to implement ImGuiTreeNodeFlags_NavLeftJumpsBackHere +void ImGui::NavMoveRequestResolveWithPastTreeNode(ImGuiNavItemData* result, ImGuiTreeNodeStackData* tree_node_data) +{ + ImGuiContext& g = *GImGui; + g.NavMoveScoringItems = false; + g.LastItemData.ID = tree_node_data->ID; + g.LastItemData.ItemFlags = tree_node_data->ItemFlags & ~ImGuiItemFlags_HasSelectionUserData; // Losing SelectionUserData, recovered next-frame (cheaper). + g.LastItemData.NavRect = tree_node_data->NavRect; + NavApplyItemToResult(result); // Result this instead of implementing a NavApplyPastTreeNodeToResult() + NavClearPreferredPosForAxis(ImGuiAxis_Y); + NavUpdateAnyRequestFlag(); } void ImGui::NavMoveRequestCancel() { ImGuiContext& g = *GImGui; - g.NavMoveRequest = false; + g.NavMoveSubmitted = g.NavMoveScoringItems = false; NavUpdateAnyRequestFlag(); } -void ImGui::NavMoveRequestForward(ImGuiDir move_dir, ImGuiDir clip_dir, const ImRect& bb_rel, ImGuiNavMoveFlags move_flags) +// Forward will reuse the move request again on the next frame (generally with modifications done to it) +void ImGui::NavMoveRequestForward(ImGuiDir move_dir, ImGuiDir clip_dir, ImGuiNavMoveFlags move_flags, ImGuiScrollFlags scroll_flags) { ImGuiContext& g = *GImGui; - IM_ASSERT(g.NavMoveRequestForward == ImGuiNavForward_None); + IM_ASSERT(g.NavMoveForwardToNextFrame == false); NavMoveRequestCancel(); + g.NavMoveForwardToNextFrame = true; g.NavMoveDir = move_dir; g.NavMoveClipDir = clip_dir; - g.NavMoveRequestForward = ImGuiNavForward_ForwardQueued; - g.NavMoveRequestFlags = move_flags; - g.NavWindow->NavRectRel[g.NavLayer] = bb_rel; + g.NavMoveFlags = move_flags | ImGuiNavMoveFlags_Forwarded; + g.NavMoveScrollFlags = scroll_flags; } -void ImGui::NavMoveRequestTryWrapping(ImGuiWindow* window, ImGuiNavMoveFlags move_flags) +// Navigation wrap-around logic is delayed to the end of the frame because this operation is only valid after entire +// popup is assembled and in case of appended popups it is not clear which EndPopup() call is final. +void ImGui::NavMoveRequestTryWrapping(ImGuiWindow* window, ImGuiNavMoveFlags wrap_flags) { ImGuiContext& g = *GImGui; - if (g.NavWindow != window || !NavMoveRequestButNoResultYet() || g.NavMoveRequestForward != ImGuiNavForward_None || g.NavLayer != 0) - return; - IM_ASSERT(move_flags != 0); // No points calling this with no wrapping - ImRect bb_rel = window->NavRectRel[0]; + IM_ASSERT((wrap_flags & ImGuiNavMoveFlags_WrapMask_ ) != 0 && (wrap_flags & ~ImGuiNavMoveFlags_WrapMask_) == 0); // Call with _WrapX, _WrapY, _LoopX, _LoopY - ImGuiDir clip_dir = g.NavMoveDir; - if (g.NavMoveDir == ImGuiDir_Left && (move_flags & (ImGuiNavMoveFlags_WrapX | ImGuiNavMoveFlags_LoopX))) - { - bb_rel.Min.x = bb_rel.Max.x = ImMax(window->SizeFull.x, window->ContentSize.x + window->WindowPadding.x * 2.0f) - window->Scroll.x; - if (move_flags & ImGuiNavMoveFlags_WrapX) { bb_rel.TranslateY(-bb_rel.GetHeight()); clip_dir = ImGuiDir_Up; } - NavMoveRequestForward(g.NavMoveDir, clip_dir, bb_rel, move_flags); - } - if (g.NavMoveDir == ImGuiDir_Right && (move_flags & (ImGuiNavMoveFlags_WrapX | ImGuiNavMoveFlags_LoopX))) - { - bb_rel.Min.x = bb_rel.Max.x = -window->Scroll.x; - if (move_flags & ImGuiNavMoveFlags_WrapX) { bb_rel.TranslateY(+bb_rel.GetHeight()); clip_dir = ImGuiDir_Down; } - NavMoveRequestForward(g.NavMoveDir, clip_dir, bb_rel, move_flags); - } - if (g.NavMoveDir == ImGuiDir_Up && (move_flags & (ImGuiNavMoveFlags_WrapY | ImGuiNavMoveFlags_LoopY))) - { - bb_rel.Min.y = bb_rel.Max.y = ImMax(window->SizeFull.y, window->ContentSize.y + window->WindowPadding.y * 2.0f) - window->Scroll.y; - if (move_flags & ImGuiNavMoveFlags_WrapY) { bb_rel.TranslateX(-bb_rel.GetWidth()); clip_dir = ImGuiDir_Left; } - NavMoveRequestForward(g.NavMoveDir, clip_dir, bb_rel, move_flags); - } - if (g.NavMoveDir == ImGuiDir_Down && (move_flags & (ImGuiNavMoveFlags_WrapY | ImGuiNavMoveFlags_LoopY))) - { - bb_rel.Min.y = bb_rel.Max.y = -window->Scroll.y; - if (move_flags & ImGuiNavMoveFlags_WrapY) { bb_rel.TranslateX(+bb_rel.GetWidth()); clip_dir = ImGuiDir_Right; } - NavMoveRequestForward(g.NavMoveDir, clip_dir, bb_rel, move_flags); - } + // In theory we should test for NavMoveRequestButNoResultYet() but there's no point doing it: + // as NavEndFrame() will do the same test. It will end up calling NavUpdateCreateWrappingRequest(). + if (g.NavWindow == window && g.NavMoveScoringItems && g.NavLayer == ImGuiNavLayer_Main) + g.NavMoveFlags = (g.NavMoveFlags & ~ImGuiNavMoveFlags_WrapMask_) | wrap_flags; } // FIXME: This could be replaced by updating a frame number in each window when (window == NavWindow) and (NavLayer == 0). // This way we could find the last focused window among our children. It would be much less confusing this way? static void ImGui::NavSaveLastChildNavWindowIntoParent(ImGuiWindow* nav_window) { - ImGuiWindow* parent_window = nav_window; - while (parent_window && (parent_window->Flags & ImGuiWindowFlags_ChildWindow) != 0 && (parent_window->Flags & (ImGuiWindowFlags_Popup | ImGuiWindowFlags_ChildMenu)) == 0) - parent_window = parent_window->ParentWindow; - if (parent_window && parent_window != nav_window) - parent_window->NavLastChildNavWindow = nav_window; + ImGuiWindow* parent = nav_window; + while (parent && parent->RootWindow != parent && (parent->Flags & (ImGuiWindowFlags_Popup | ImGuiWindowFlags_ChildMenu)) == 0) + parent = parent->ParentWindow; + if (parent && parent != nav_window) + parent->NavLastChildNavWindow = nav_window; } // Restore the last focused child. // Call when we are expected to land on the Main Layer (0) after FocusWindow() static ImGuiWindow* ImGui::NavRestoreLastChildNavWindow(ImGuiWindow* window) { - return window->NavLastChildNavWindow ? window->NavLastChildNavWindow : window; + if (window->NavLastChildNavWindow && window->NavLastChildNavWindow->WasActive) + return window->NavLastChildNavWindow; + if (window->DockNodeAsHost && window->DockNodeAsHost->TabBar) + if (ImGuiTabItem* tab = TabBarFindMostRecentlySelectedTabForActiveWindow(window->DockNodeAsHost->TabBar)) + return tab->Window; + return window; } -static void NavRestoreLayer(ImGuiNavLayer layer) +void ImGui::NavRestoreLayer(ImGuiNavLayer layer) { ImGuiContext& g = *GImGui; - g.NavLayer = layer; - if (layer == 0) - g.NavWindow = ImGui::NavRestoreLastChildNavWindow(g.NavWindow); - if (layer == 0 && g.NavWindow->NavLastIds[0] != 0) - ImGui::SetNavIDWithRectRel(g.NavWindow->NavLastIds[0], layer, g.NavWindow->NavRectRel[0]); + if (layer == ImGuiNavLayer_Main) + { + ImGuiWindow* prev_nav_window = g.NavWindow; + g.NavWindow = NavRestoreLastChildNavWindow(g.NavWindow); // FIXME-NAV: Should clear ongoing nav requests? + g.NavLastValidSelectionUserData = ImGuiSelectionUserData_Invalid; + if (prev_nav_window) + IMGUI_DEBUG_LOG_FOCUS("[focus] NavRestoreLayer: from \"%s\" to SetNavWindow(\"%s\")\n", prev_nav_window->Name, g.NavWindow->Name); + } + ImGuiWindow* window = g.NavWindow; + if (window->NavLastIds[layer] != 0) + { + SetNavID(window->NavLastIds[layer], layer, 0, window->NavRectRel[layer]); + } else - ImGui::NavInitWindow(g.NavWindow, true); + { + g.NavLayer = layer; + NavInitWindow(window, true); + } } static inline void ImGui::NavUpdateAnyRequestFlag() { ImGuiContext& g = *GImGui; - g.NavAnyRequest = g.NavMoveRequest || g.NavInitRequest || (IMGUI_DEBUG_NAV_SCORING && g.NavWindow != NULL); + g.NavAnyRequest = g.NavMoveScoringItems || g.NavInitRequest || (IMGUI_DEBUG_NAV_SCORING && g.NavWindow != NULL); if (g.NavAnyRequest) IM_ASSERT(g.NavWindow != NULL); } @@ -8164,384 +13577,515 @@ static inline void ImGui::NavUpdateAnyRequestFlag() // This needs to be called before we submit any widget (aka in or before Begin) void ImGui::NavInitWindow(ImGuiWindow* window, bool force_reinit) { + // FIXME: ChildWindow test here is wrong for docking ImGuiContext& g = *GImGui; IM_ASSERT(window == g.NavWindow); + + if (window->Flags & ImGuiWindowFlags_NoNavInputs) + { + g.NavId = 0; + SetNavFocusScope(window->NavRootFocusScopeId); + return; + } + bool init_for_nav = false; - if (!(window->Flags & ImGuiWindowFlags_NoNavInputs)) - if (!(window->Flags & ImGuiWindowFlags_ChildWindow) || (window->Flags & ImGuiWindowFlags_Popup) || (window->NavLastIds[0] == 0) || force_reinit) - init_for_nav = true; + if (window == window->RootWindow || (window->Flags & ImGuiWindowFlags_Popup) || (window->NavLastIds[0] == 0) || force_reinit) + init_for_nav = true; + IMGUI_DEBUG_LOG_NAV("[nav] NavInitRequest: from NavInitWindow(), init_for_nav=%d, window=\"%s\", layer=%d\n", init_for_nav, window->Name, g.NavLayer); if (init_for_nav) { - SetNavID(0, g.NavLayer); + SetNavID(0, g.NavLayer, window->NavRootFocusScopeId, ImRect()); g.NavInitRequest = true; g.NavInitRequestFromMove = false; - g.NavInitResultId = 0; - g.NavInitResultRectRel = ImRect(); + g.NavInitResult.ID = 0; NavUpdateAnyRequestFlag(); } else { g.NavId = window->NavLastIds[0]; + SetNavFocusScope(window->NavRootFocusScopeId); } } +static ImGuiInputSource ImGui::NavCalcPreferredRefPosSource() +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.NavWindow; + const bool activated_shortcut = g.ActiveId != 0 && g.ActiveIdFromShortcut && g.ActiveId == g.LastItemData.ID; + + // Testing for !activated_shortcut here could in theory be removed if we decided that activating a remote shortcut altered one of the g.NavDisableXXX flag. + if ((!g.NavCursorVisible || !g.NavHighlightItemUnderNav || !window) && !activated_shortcut) + return ImGuiInputSource_Mouse; + else + return ImGuiInputSource_Keyboard; // or Nav in general +} + static ImVec2 ImGui::NavCalcPreferredRefPos() { ImGuiContext& g = *GImGui; - if (g.NavDisableHighlight || !g.NavDisableMouseHover || !g.NavWindow) + ImGuiWindow* window = g.NavWindow; + ImGuiInputSource source = NavCalcPreferredRefPosSource(); + + const bool activated_shortcut = g.ActiveId != 0 && g.ActiveIdFromShortcut && g.ActiveId == g.LastItemData.ID; + + // Testing for !activated_shortcut here could in theory be removed if we decided that activating a remote shortcut altered one of the g.NavDisableXXX flag. + if (source == ImGuiInputSource_Mouse) { // Mouse (we need a fallback in case the mouse becomes invalid after being used) - if (IsMousePosValid(&g.IO.MousePos)) - return g.IO.MousePos; - return g.LastValidMousePos; + // The +1.0f offset when stored by OpenPopupEx() allows reopening this or another popup (same or another mouse button) while not moving the mouse, it is pretty standard. + // In theory we could move that +1.0f offset in OpenPopupEx() + ImVec2 p = IsMousePosValid(&g.IO.MousePos) ? g.IO.MousePos : g.MouseLastValidPos; + return ImVec2(p.x + 1.0f, p.y); } else { - // When navigation is active and mouse is disabled, decide on an arbitrary position around the bottom left of the currently navigated item. - const ImRect& rect_rel = g.NavWindow->NavRectRel[g.NavLayer]; - ImVec2 pos = g.NavWindow->Pos + ImVec2(rect_rel.Min.x + ImMin(g.Style.FramePadding.x * 4, rect_rel.GetWidth()), rect_rel.Max.y - ImMin(g.Style.FramePadding.y, rect_rel.GetHeight())); - ImRect visible_rect = GetViewportRect(); - return ImFloor(ImClamp(pos, visible_rect.Min, visible_rect.Max)); // ImFloor() is important because non-integer mouse position application in back-end might be lossy and result in undesirable non-zero delta. + // When navigation is active and mouse is disabled, pick a position around the bottom left of the currently navigated item + ImRect ref_rect; + if (activated_shortcut) + ref_rect = g.LastItemData.NavRect; + else + ref_rect = WindowRectRelToAbs(window, window->NavRectRel[g.NavLayer]); + + // Take account of upcoming scrolling (maybe set mouse pos should be done in EndFrame?) + if (window->LastFrameActive != g.FrameCount && (window->ScrollTarget.x != FLT_MAX || window->ScrollTarget.y != FLT_MAX)) + { + ImVec2 next_scroll = CalcNextScrollFromScrollTargetAndClamp(window); + ref_rect.Translate(window->Scroll - next_scroll); + } + ImVec2 pos = ImVec2(ref_rect.Min.x + ImMin(g.Style.FramePadding.x * 4, ref_rect.GetWidth()), ref_rect.Max.y - ImMin(g.Style.FramePadding.y, ref_rect.GetHeight())); + ImGuiViewport* viewport = window->Viewport; + return ImTrunc(ImClamp(pos, viewport->Pos, viewport->Pos + viewport->Size)); // ImTrunc() is important because non-integer mouse position application in backend might be lossy and result in undesirable non-zero delta. } } -float ImGui::GetNavInputAmount(ImGuiNavInput n, ImGuiInputReadMode mode) +float ImGui::GetNavTweakPressedAmount(ImGuiAxis axis) { ImGuiContext& g = *GImGui; - if (mode == ImGuiInputReadMode_Down) - return g.IO.NavInputs[n]; // Instant, read analog input (0.0f..1.0f, as provided by user) + float repeat_delay, repeat_rate; + GetTypematicRepeatRate(ImGuiInputFlags_RepeatRateNavTweak, &repeat_delay, &repeat_rate); - const float t = g.IO.NavInputsDownDuration[n]; - if (t < 0.0f && mode == ImGuiInputReadMode_Released) // Return 1.0f when just released, no repeat, ignore analog input. - return (g.IO.NavInputsDownDurationPrev[n] >= 0.0f ? 1.0f : 0.0f); - if (t < 0.0f) - return 0.0f; - if (mode == ImGuiInputReadMode_Pressed) // Return 1.0f when just pressed, no repeat, ignore analog input. - return (t == 0.0f) ? 1.0f : 0.0f; - if (mode == ImGuiInputReadMode_Repeat) - return (float)CalcTypematicPressedRepeatAmount(t, t - g.IO.DeltaTime, g.IO.KeyRepeatDelay * 0.80f, g.IO.KeyRepeatRate * 0.80f); - if (mode == ImGuiInputReadMode_RepeatSlow) - return (float)CalcTypematicPressedRepeatAmount(t, t - g.IO.DeltaTime, g.IO.KeyRepeatDelay * 1.00f, g.IO.KeyRepeatRate * 2.00f); - if (mode == ImGuiInputReadMode_RepeatFast) - return (float)CalcTypematicPressedRepeatAmount(t, t - g.IO.DeltaTime, g.IO.KeyRepeatDelay * 0.80f, g.IO.KeyRepeatRate * 0.30f); - return 0.0f; -} - -ImVec2 ImGui::GetNavInputAmount2d(ImGuiNavDirSourceFlags dir_sources, ImGuiInputReadMode mode, float slow_factor, float fast_factor) -{ - ImVec2 delta(0.0f, 0.0f); - if (dir_sources & ImGuiNavDirSourceFlags_Keyboard) - delta += ImVec2(GetNavInputAmount(ImGuiNavInput_KeyRight_, mode) - GetNavInputAmount(ImGuiNavInput_KeyLeft_, mode), GetNavInputAmount(ImGuiNavInput_KeyDown_, mode) - GetNavInputAmount(ImGuiNavInput_KeyUp_, mode)); - if (dir_sources & ImGuiNavDirSourceFlags_PadDPad) - delta += ImVec2(GetNavInputAmount(ImGuiNavInput_DpadRight, mode) - GetNavInputAmount(ImGuiNavInput_DpadLeft, mode), GetNavInputAmount(ImGuiNavInput_DpadDown, mode) - GetNavInputAmount(ImGuiNavInput_DpadUp, mode)); - if (dir_sources & ImGuiNavDirSourceFlags_PadLStick) - delta += ImVec2(GetNavInputAmount(ImGuiNavInput_LStickRight, mode) - GetNavInputAmount(ImGuiNavInput_LStickLeft, mode), GetNavInputAmount(ImGuiNavInput_LStickDown, mode) - GetNavInputAmount(ImGuiNavInput_LStickUp, mode)); - if (slow_factor != 0.0f && IsNavInputDown(ImGuiNavInput_TweakSlow)) - delta *= slow_factor; - if (fast_factor != 0.0f && IsNavInputDown(ImGuiNavInput_TweakFast)) - delta *= fast_factor; - return delta; + ImGuiKey key_less, key_more; + if (g.NavInputSource == ImGuiInputSource_Gamepad) + { + key_less = (axis == ImGuiAxis_X) ? ImGuiKey_GamepadDpadLeft : ImGuiKey_GamepadDpadUp; + key_more = (axis == ImGuiAxis_X) ? ImGuiKey_GamepadDpadRight : ImGuiKey_GamepadDpadDown; + } + else + { + key_less = (axis == ImGuiAxis_X) ? ImGuiKey_LeftArrow : ImGuiKey_UpArrow; + key_more = (axis == ImGuiAxis_X) ? ImGuiKey_RightArrow : ImGuiKey_DownArrow; + } + float amount = (float)GetKeyPressedAmount(key_more, repeat_delay, repeat_rate) - (float)GetKeyPressedAmount(key_less, repeat_delay, repeat_rate); + if (amount != 0.0f && IsKeyDown(key_less) && IsKeyDown(key_more)) // Cancel when opposite directions are held, regardless of repeat phase + amount = 0.0f; + return amount; } static void ImGui::NavUpdate() { ImGuiContext& g = *GImGui; - g.IO.WantSetMousePos = false; -#if 0 - if (g.NavScoringCount > 0) IMGUI_DEBUG_LOG("NavScoringCount %d for '%s' layer %d (Init:%d, Move:%d)\n", g.FrameCount, g.NavScoringCount, g.NavWindow ? g.NavWindow->Name : "NULL", g.NavLayer, g.NavInitRequest || g.NavInitResultId != 0, g.NavMoveRequest); -#endif + ImGuiIO& io = g.IO; - // Set input source as Gamepad when buttons are pressed before we map Keyboard (some features differs when used with Gamepad vs Keyboard) - bool nav_keyboard_active = (g.IO.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard) != 0; - bool nav_gamepad_active = (g.IO.ConfigFlags & ImGuiConfigFlags_NavEnableGamepad) != 0 && (g.IO.BackendFlags & ImGuiBackendFlags_HasGamepad) != 0; + io.WantSetMousePos = false; + //if (g.NavScoringDebugCount > 0) IMGUI_DEBUG_LOG_NAV("[nav] NavScoringDebugCount %d for '%s' layer %d (Init:%d, Move:%d)\n", g.NavScoringDebugCount, g.NavWindow ? g.NavWindow->Name : "NULL", g.NavLayer, g.NavInitRequest || g.NavInitResultId != 0, g.NavMoveRequest); + + // Set input source based on which keys are last pressed (as some features differs when used with Gamepad vs Keyboard) + // FIXME-NAV: Now that keys are separated maybe we can get rid of NavInputSource? + const bool nav_gamepad_active = (io.ConfigFlags & ImGuiConfigFlags_NavEnableGamepad) != 0 && (io.BackendFlags & ImGuiBackendFlags_HasGamepad) != 0; + const ImGuiKey nav_gamepad_keys_to_change_source[] = { ImGuiKey_GamepadFaceRight, ImGuiKey_GamepadFaceLeft, ImGuiKey_GamepadFaceUp, ImGuiKey_GamepadFaceDown, ImGuiKey_GamepadDpadRight, ImGuiKey_GamepadDpadLeft, ImGuiKey_GamepadDpadUp, ImGuiKey_GamepadDpadDown }; if (nav_gamepad_active) - if (g.IO.NavInputs[ImGuiNavInput_Activate] > 0.0f || g.IO.NavInputs[ImGuiNavInput_Input] > 0.0f || g.IO.NavInputs[ImGuiNavInput_Cancel] > 0.0f || g.IO.NavInputs[ImGuiNavInput_Menu] > 0.0f) - g.NavInputSource = ImGuiInputSource_NavGamepad; - - // Update Keyboard->Nav inputs mapping + for (ImGuiKey key : nav_gamepad_keys_to_change_source) + if (IsKeyDown(key)) + g.NavInputSource = ImGuiInputSource_Gamepad; + const bool nav_keyboard_active = (io.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard) != 0; + const ImGuiKey nav_keyboard_keys_to_change_source[] = { ImGuiKey_Space, ImGuiKey_Enter, ImGuiKey_Escape, ImGuiKey_RightArrow, ImGuiKey_LeftArrow, ImGuiKey_UpArrow, ImGuiKey_DownArrow }; if (nav_keyboard_active) - { - #define NAV_MAP_KEY(_KEY, _NAV_INPUT) do { if (IsKeyDown(g.IO.KeyMap[_KEY])) { g.IO.NavInputs[_NAV_INPUT] = 1.0f; g.NavInputSource = ImGuiInputSource_NavKeyboard; } } while (0) - NAV_MAP_KEY(ImGuiKey_Space, ImGuiNavInput_Activate ); - NAV_MAP_KEY(ImGuiKey_Enter, ImGuiNavInput_Input ); - NAV_MAP_KEY(ImGuiKey_Escape, ImGuiNavInput_Cancel ); - NAV_MAP_KEY(ImGuiKey_LeftArrow, ImGuiNavInput_KeyLeft_ ); - NAV_MAP_KEY(ImGuiKey_RightArrow,ImGuiNavInput_KeyRight_); - NAV_MAP_KEY(ImGuiKey_UpArrow, ImGuiNavInput_KeyUp_ ); - NAV_MAP_KEY(ImGuiKey_DownArrow, ImGuiNavInput_KeyDown_ ); - NAV_MAP_KEY(ImGuiKey_Tab, ImGuiNavInput_KeyTab_ ); - if (g.IO.KeyCtrl) - g.IO.NavInputs[ImGuiNavInput_TweakSlow] = 1.0f; - if (g.IO.KeyShift) - g.IO.NavInputs[ImGuiNavInput_TweakFast] = 1.0f; - if (g.IO.KeyAlt && !g.IO.KeyCtrl) // AltGR is Alt+Ctrl, also even on keyboards without AltGR we don't want Alt+Ctrl to open menu. - g.IO.NavInputs[ImGuiNavInput_KeyMenu_] = 1.0f; - #undef NAV_MAP_KEY - } - memcpy(g.IO.NavInputsDownDurationPrev, g.IO.NavInputsDownDuration, sizeof(g.IO.NavInputsDownDuration)); - for (int i = 0; i < IM_ARRAYSIZE(g.IO.NavInputs); i++) - g.IO.NavInputsDownDuration[i] = (g.IO.NavInputs[i] > 0.0f) ? (g.IO.NavInputsDownDuration[i] < 0.0f ? 0.0f : g.IO.NavInputsDownDuration[i] + g.IO.DeltaTime) : -1.0f; + for (ImGuiKey key : nav_keyboard_keys_to_change_source) + if (IsKeyDown(key)) + g.NavInputSource = ImGuiInputSource_Keyboard; // Process navigation init request (select first/default focus) - // In very rare cases g.NavWindow may be null (e.g. clearing focus after requesting an init request, which does happen when releasing Alt while clicking on void) - if (g.NavInitResultId != 0 && (!g.NavDisableHighlight || g.NavInitRequestFromMove) && g.NavWindow) - { - // Apply result from previous navigation init request (will typically select the first item, unless SetItemDefaultFocus() has been called) - if (g.NavInitRequestFromMove) - SetNavIDWithRectRel(g.NavInitResultId, g.NavLayer, g.NavInitResultRectRel); - else - SetNavID(g.NavInitResultId, g.NavLayer); - g.NavWindow->NavRectRel[g.NavLayer] = g.NavInitResultRectRel; - } + g.NavJustMovedToId = 0; + g.NavJustMovedToFocusScopeId = g.NavJustMovedFromFocusScopeId = 0; + if (g.NavInitResult.ID != 0) + NavInitRequestApplyResult(); g.NavInitRequest = false; g.NavInitRequestFromMove = false; - g.NavInitResultId = 0; - g.NavJustMovedToId = 0; + g.NavInitResult.ID = 0; // Process navigation move request - if (g.NavMoveRequest) - NavUpdateMoveResult(); + if (g.NavMoveSubmitted) + NavMoveRequestApplyResult(); + g.NavTabbingCounter = 0; + g.NavMoveSubmitted = g.NavMoveScoringItems = false; + if (g.NavCursorHideFrames > 0) + if (--g.NavCursorHideFrames == 0) + g.NavCursorVisible = true; - // When a forwarded move request failed, we restore the highlight that we disabled during the forward frame - if (g.NavMoveRequestForward == ImGuiNavForward_ForwardActive) - { - IM_ASSERT(g.NavMoveRequest); - if (g.NavMoveResultLocal.ID == 0 && g.NavMoveResultOther.ID == 0) - g.NavDisableHighlight = false; - g.NavMoveRequestForward = ImGuiNavForward_None; - } - - // Apply application mouse position movement, after we had a chance to process move request result. + // Schedule mouse position update (will be done at the bottom of this function, after 1) processing all move requests and 2) updating scrolling) + bool set_mouse_pos = false; if (g.NavMousePosDirty && g.NavIdIsAlive) - { - // Set mouse position given our knowledge of the navigated item position from last frame - if ((g.IO.ConfigFlags & ImGuiConfigFlags_NavEnableSetMousePos) && (g.IO.BackendFlags & ImGuiBackendFlags_HasSetMousePos)) - { - if (!g.NavDisableHighlight && g.NavDisableMouseHover && g.NavWindow) - { - g.IO.MousePos = g.IO.MousePosPrev = NavCalcPreferredRefPos(); - g.IO.WantSetMousePos = true; - } - } - g.NavMousePosDirty = false; - } - g.NavIdIsAlive = false; - g.NavJustTabbedId = 0; - IM_ASSERT(g.NavLayer == 0 || g.NavLayer == 1); + if (g.NavCursorVisible && g.NavHighlightItemUnderNav && g.NavWindow) + set_mouse_pos = true; + g.NavMousePosDirty = false; + IM_ASSERT(g.NavLayer == ImGuiNavLayer_Main || g.NavLayer == ImGuiNavLayer_Menu); - // Store our return window (for returning from Layer 1 to Layer 0) and clear it as soon as we step back in our own Layer 0 + // Store our return window (for returning from Menu Layer to Main Layer) and clear it as soon as we step back in our own Layer 0 if (g.NavWindow) NavSaveLastChildNavWindowIntoParent(g.NavWindow); - if (g.NavWindow && g.NavWindow->NavLastChildNavWindow != NULL && g.NavLayer == 0) + if (g.NavWindow && g.NavWindow->NavLastChildNavWindow != NULL && g.NavLayer == ImGuiNavLayer_Main) g.NavWindow->NavLastChildNavWindow = NULL; // Update CTRL+TAB and Windowing features (hold Square to move/resize/etc.) NavUpdateWindowing(); // Set output flags for user application - g.IO.NavActive = (nav_keyboard_active || nav_gamepad_active) && g.NavWindow && !(g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs); - g.IO.NavVisible = (g.IO.NavActive && g.NavId != 0 && !g.NavDisableHighlight) || (g.NavWindowingTarget != NULL); + io.NavActive = (nav_keyboard_active || nav_gamepad_active) && g.NavWindow && !(g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs); + io.NavVisible = (io.NavActive && g.NavId != 0 && g.NavCursorVisible) || (g.NavWindowingTarget != NULL); // Process NavCancel input (to close a popup, get back to parent, clear focus) - if (IsNavInputPressed(ImGuiNavInput_Cancel, ImGuiInputReadMode_Pressed)) - { - if (g.ActiveId != 0) - { - if (!(g.ActiveIdBlockNavInputFlags & (1 << ImGuiNavInput_Cancel))) - ClearActiveID(); - } - else if (g.NavWindow && (g.NavWindow->Flags & ImGuiWindowFlags_ChildWindow) && !(g.NavWindow->Flags & ImGuiWindowFlags_Popup) && g.NavWindow->ParentWindow) - { - // Exit child window - ImGuiWindow* child_window = g.NavWindow; - ImGuiWindow* parent_window = g.NavWindow->ParentWindow; - IM_ASSERT(child_window->ChildId != 0); - FocusWindow(parent_window); - SetNavID(child_window->ChildId, 0); - g.NavIdIsAlive = false; - if (g.NavDisableMouseHover) - g.NavMousePosDirty = true; - } - else if (g.OpenPopupStack.Size > 0) - { - // Close open popup/menu - if (!(g.OpenPopupStack.back().Window->Flags & ImGuiWindowFlags_Modal)) - ClosePopupToLevel(g.OpenPopupStack.Size - 1, true); - } - else if (g.NavLayer != 0) - { - // Leave the "menu" layer - NavRestoreLayer(ImGuiNavLayer_Main); - } - else - { - // Clear NavLastId for popups but keep it for regular child window so we can leave one and come back where we were - if (g.NavWindow && ((g.NavWindow->Flags & ImGuiWindowFlags_Popup) || !(g.NavWindow->Flags & ImGuiWindowFlags_ChildWindow))) - g.NavWindow->NavLastIds[0] = 0; - g.NavId = 0; - } - } + NavUpdateCancelRequest(); // Process manual activation request - g.NavActivateId = g.NavActivateDownId = g.NavActivatePressedId = g.NavInputId = 0; - if (g.NavId != 0 && !g.NavDisableHighlight && !g.NavWindowingTarget && g.NavWindow && !(g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs)) + g.NavActivateId = g.NavActivateDownId = g.NavActivatePressedId = 0; + g.NavActivateFlags = ImGuiActivateFlags_None; + if (g.NavId != 0 && g.NavCursorVisible && !g.NavWindowingTarget && g.NavWindow && !(g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs)) { - bool activate_down = IsNavInputDown(ImGuiNavInput_Activate); - bool activate_pressed = activate_down && IsNavInputPressed(ImGuiNavInput_Activate, ImGuiInputReadMode_Pressed); + const bool activate_down = (nav_keyboard_active && IsKeyDown(ImGuiKey_Space, ImGuiKeyOwner_NoOwner)) || (nav_gamepad_active && IsKeyDown(ImGuiKey_NavGamepadActivate, ImGuiKeyOwner_NoOwner)); + const bool activate_pressed = activate_down && ((nav_keyboard_active && IsKeyPressed(ImGuiKey_Space, 0, ImGuiKeyOwner_NoOwner)) || (nav_gamepad_active && IsKeyPressed(ImGuiKey_NavGamepadActivate, 0, ImGuiKeyOwner_NoOwner))); + const bool input_down = (nav_keyboard_active && (IsKeyDown(ImGuiKey_Enter, ImGuiKeyOwner_NoOwner) || IsKeyDown(ImGuiKey_KeypadEnter, ImGuiKeyOwner_NoOwner))) || (nav_gamepad_active && IsKeyDown(ImGuiKey_NavGamepadInput, ImGuiKeyOwner_NoOwner)); + const bool input_pressed = input_down && ((nav_keyboard_active && (IsKeyPressed(ImGuiKey_Enter, 0, ImGuiKeyOwner_NoOwner) || IsKeyPressed(ImGuiKey_KeypadEnter, 0, ImGuiKeyOwner_NoOwner))) || (nav_gamepad_active && IsKeyPressed(ImGuiKey_NavGamepadInput, 0, ImGuiKeyOwner_NoOwner))); if (g.ActiveId == 0 && activate_pressed) + { g.NavActivateId = g.NavId; - if ((g.ActiveId == 0 || g.ActiveId == g.NavId) && activate_down) + g.NavActivateFlags = ImGuiActivateFlags_PreferTweak; + } + if ((g.ActiveId == 0 || g.ActiveId == g.NavId) && input_pressed) + { + g.NavActivateId = g.NavId; + g.NavActivateFlags = ImGuiActivateFlags_PreferInput; + } + if ((g.ActiveId == 0 || g.ActiveId == g.NavId) && (activate_down || input_down)) g.NavActivateDownId = g.NavId; - if ((g.ActiveId == 0 || g.ActiveId == g.NavId) && activate_pressed) + if ((g.ActiveId == 0 || g.ActiveId == g.NavId) && (activate_pressed || input_pressed)) + { g.NavActivatePressedId = g.NavId; - if ((g.ActiveId == 0 || g.ActiveId == g.NavId) && IsNavInputPressed(ImGuiNavInput_Input, ImGuiInputReadMode_Pressed)) - g.NavInputId = g.NavId; + NavHighlightActivated(g.NavId); + } } if (g.NavWindow && (g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs)) - g.NavDisableHighlight = true; + g.NavCursorVisible = false; + else if (g.IO.ConfigNavCursorVisibleAlways && g.NavCursorHideFrames == 0) + g.NavCursorVisible = true; if (g.NavActivateId != 0) IM_ASSERT(g.NavActivateDownId == g.NavActivateId); - g.NavMoveRequest = false; + + // Highlight + if (g.NavHighlightActivatedTimer > 0.0f) + g.NavHighlightActivatedTimer = ImMax(0.0f, g.NavHighlightActivatedTimer - io.DeltaTime); + if (g.NavHighlightActivatedTimer == 0.0f) + g.NavHighlightActivatedId = 0; // Process programmatic activation request + // FIXME-NAV: Those should eventually be queued (unlike focus they don't cancel each others) if (g.NavNextActivateId != 0) - g.NavActivateId = g.NavActivateDownId = g.NavActivatePressedId = g.NavInputId = g.NavNextActivateId; + { + g.NavActivateId = g.NavActivateDownId = g.NavActivatePressedId = g.NavNextActivateId; + g.NavActivateFlags = g.NavNextActivateFlags; + } g.NavNextActivateId = 0; - // Initiate directional inputs request - const int allowed_dir_flags = (g.ActiveId == 0) ? ~0 : g.ActiveIdAllowNavDirFlags; - if (g.NavMoveRequestForward == ImGuiNavForward_None) - { - g.NavMoveDir = ImGuiDir_None; - g.NavMoveRequestFlags = ImGuiNavMoveFlags_None; - if (g.NavWindow && !g.NavWindowingTarget && allowed_dir_flags && !(g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs)) - { - if ((allowed_dir_flags & (1 << ImGuiDir_Left)) && IsNavInputPressedAnyOfTwo(ImGuiNavInput_DpadLeft, ImGuiNavInput_KeyLeft_, ImGuiInputReadMode_Repeat)) { g.NavMoveDir = ImGuiDir_Left; } - if ((allowed_dir_flags & (1 << ImGuiDir_Right)) && IsNavInputPressedAnyOfTwo(ImGuiNavInput_DpadRight,ImGuiNavInput_KeyRight_,ImGuiInputReadMode_Repeat)) { g.NavMoveDir = ImGuiDir_Right; } - if ((allowed_dir_flags & (1 << ImGuiDir_Up)) && IsNavInputPressedAnyOfTwo(ImGuiNavInput_DpadUp, ImGuiNavInput_KeyUp_, ImGuiInputReadMode_Repeat)) { g.NavMoveDir = ImGuiDir_Up; } - if ((allowed_dir_flags & (1 << ImGuiDir_Down)) && IsNavInputPressedAnyOfTwo(ImGuiNavInput_DpadDown, ImGuiNavInput_KeyDown_, ImGuiInputReadMode_Repeat)) { g.NavMoveDir = ImGuiDir_Down; } - } - g.NavMoveClipDir = g.NavMoveDir; - } - else - { - // Forwarding previous request (which has been modified, e.g. wrap around menus rewrite the requests with a starting rectangle at the other side of the window) - // (Preserve g.NavMoveRequestFlags, g.NavMoveClipDir which were set by the NavMoveRequestForward() function) - IM_ASSERT(g.NavMoveDir != ImGuiDir_None && g.NavMoveClipDir != ImGuiDir_None); - IM_ASSERT(g.NavMoveRequestForward == ImGuiNavForward_ForwardQueued); - g.NavMoveRequestForward = ImGuiNavForward_ForwardActive; - } - - // Update PageUp/PageDown/Home/End scroll - // FIXME-NAV: Consider enabling those keys even without the master ImGuiConfigFlags_NavEnableKeyboard flag? - float nav_scoring_rect_offset_y = 0.0f; - if (nav_keyboard_active) - nav_scoring_rect_offset_y = NavUpdatePageUpPageDown(allowed_dir_flags); - - // If we initiate a movement request and have no current NavId, we initiate a InitDefautRequest that will be used as a fallback if the direction fails to find a match - if (g.NavMoveDir != ImGuiDir_None) - { - g.NavMoveRequest = true; - g.NavMoveDirLast = g.NavMoveDir; - } - if (g.NavMoveRequest && g.NavId == 0) - { - g.NavInitRequest = g.NavInitRequestFromMove = true; - g.NavInitResultId = 0; - g.NavDisableHighlight = false; - } + // Process move requests + NavUpdateCreateMoveRequest(); + if (g.NavMoveDir == ImGuiDir_None) + NavUpdateCreateTabbingRequest(); NavUpdateAnyRequestFlag(); + g.NavIdIsAlive = false; // Scrolling if (g.NavWindow && !(g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs) && !g.NavWindowingTarget) { // *Fallback* manual-scroll with Nav directional keys when window has no navigable item ImGuiWindow* window = g.NavWindow; - const float scroll_speed = ImFloor(window->CalcFontSize() * 100 * g.IO.DeltaTime + 0.5f); // We need round the scrolling speed because sub-pixel scroll isn't reliably supported. - if (window->DC.NavLayerActiveMask == 0x00 && window->DC.NavHasScroll && g.NavMoveRequest) + const float scroll_speed = IM_ROUND(window->FontRefSize * 100 * io.DeltaTime); // We need round the scrolling speed because sub-pixel scroll isn't reliably supported. + const ImGuiDir move_dir = g.NavMoveDir; + if (window->DC.NavLayersActiveMask == 0x00 && window->DC.NavWindowHasScrollY && move_dir != ImGuiDir_None) { - if (g.NavMoveDir == ImGuiDir_Left || g.NavMoveDir == ImGuiDir_Right) - SetScrollX(window, ImFloor(window->Scroll.x + ((g.NavMoveDir == ImGuiDir_Left) ? -1.0f : +1.0f) * scroll_speed)); - if (g.NavMoveDir == ImGuiDir_Up || g.NavMoveDir == ImGuiDir_Down) - SetScrollY(window, ImFloor(window->Scroll.y + ((g.NavMoveDir == ImGuiDir_Up) ? -1.0f : +1.0f) * scroll_speed)); + if (move_dir == ImGuiDir_Left || move_dir == ImGuiDir_Right) + SetScrollX(window, ImTrunc(window->Scroll.x + ((move_dir == ImGuiDir_Left) ? -1.0f : +1.0f) * scroll_speed)); + if (move_dir == ImGuiDir_Up || move_dir == ImGuiDir_Down) + SetScrollY(window, ImTrunc(window->Scroll.y + ((move_dir == ImGuiDir_Up) ? -1.0f : +1.0f) * scroll_speed)); } - // *Normal* Manual scroll with NavScrollXXX keys + // *Normal* Manual scroll with LStick // Next movement request will clamp the NavId reference rectangle to the visible area, so navigation will resume within those bounds. - ImVec2 scroll_dir = GetNavInputAmount2d(ImGuiNavDirSourceFlags_PadLStick, ImGuiInputReadMode_Down, 1.0f/10.0f, 10.0f); - if (scroll_dir.x != 0.0f && window->ScrollbarX) + if (nav_gamepad_active) { - SetScrollX(window, ImFloor(window->Scroll.x + scroll_dir.x * scroll_speed)); - g.NavMoveFromClampedRefRect = true; - } - if (scroll_dir.y != 0.0f) - { - SetScrollY(window, ImFloor(window->Scroll.y + scroll_dir.y * scroll_speed)); - g.NavMoveFromClampedRefRect = true; + const ImVec2 scroll_dir = GetKeyMagnitude2d(ImGuiKey_GamepadLStickLeft, ImGuiKey_GamepadLStickRight, ImGuiKey_GamepadLStickUp, ImGuiKey_GamepadLStickDown); + const float tweak_factor = IsKeyDown(ImGuiKey_NavGamepadTweakSlow) ? 1.0f / 10.0f : IsKeyDown(ImGuiKey_NavGamepadTweakFast) ? 10.0f : 1.0f; + if (scroll_dir.x != 0.0f && window->ScrollbarX) + SetScrollX(window, ImTrunc(window->Scroll.x + scroll_dir.x * scroll_speed * tweak_factor)); + if (scroll_dir.y != 0.0f) + SetScrollY(window, ImTrunc(window->Scroll.y + scroll_dir.y * scroll_speed * tweak_factor)); } } - // Reset search results - g.NavMoveResultLocal.Clear(); - g.NavMoveResultLocalVisibleSet.Clear(); - g.NavMoveResultOther.Clear(); - - // When we have manually scrolled (without using navigation) and NavId becomes out of bounds, we project its bounding box to the visible area to restart navigation within visible items - if (g.NavMoveRequest && g.NavMoveFromClampedRefRect && g.NavLayer == 0) + // Always prioritize mouse highlight if navigation is disabled + if (!nav_keyboard_active && !nav_gamepad_active) { - ImGuiWindow* window = g.NavWindow; - ImRect window_rect_rel(window->InnerRect.Min - window->Pos - ImVec2(1,1), window->InnerRect.Max - window->Pos + ImVec2(1,1)); - if (!window_rect_rel.Contains(window->NavRectRel[g.NavLayer])) - { - float pad = window->CalcFontSize() * 0.5f; - window_rect_rel.Expand(ImVec2(-ImMin(window_rect_rel.GetWidth(), pad), -ImMin(window_rect_rel.GetHeight(), pad))); // Terrible approximation for the intent of starting navigation from first fully visible item - window->NavRectRel[g.NavLayer].ClipWith(window_rect_rel); - g.NavId = 0; - } - g.NavMoveFromClampedRefRect = false; + g.NavCursorVisible = false; + g.NavHighlightItemUnderNav = set_mouse_pos = false; } - // For scoring we use a single segment on the left side our current item bounding box (not touching the edge to avoid box overlap with zero-spaced items) - ImRect nav_rect_rel = (g.NavWindow && !g.NavWindow->NavRectRel[g.NavLayer].IsInverted()) ? g.NavWindow->NavRectRel[g.NavLayer] : ImRect(0,0,0,0); - g.NavScoringRectScreen = g.NavWindow ? ImRect(g.NavWindow->Pos + nav_rect_rel.Min, g.NavWindow->Pos + nav_rect_rel.Max) : GetViewportRect(); - g.NavScoringRectScreen.TranslateY(nav_scoring_rect_offset_y); - g.NavScoringRectScreen.Min.x = ImMin(g.NavScoringRectScreen.Min.x + 1.0f, g.NavScoringRectScreen.Max.x); - g.NavScoringRectScreen.Max.x = g.NavScoringRectScreen.Min.x; - IM_ASSERT(!g.NavScoringRectScreen.IsInverted()); // Ensure if we have a finite, non-inverted bounding box here will allows us to remove extraneous ImFabs() calls in NavScoreItem(). - //GetForegroundDrawList()->AddRect(g.NavScoringRectScreen.Min, g.NavScoringRectScreen.Max, IM_COL32(255,200,0,255)); // [DEBUG] - g.NavScoringCount = 0; + // Update mouse position if requested + // (This will take into account the possibility that a Scroll was queued in the window to offset our absolute mouse position before scroll has been applied) + if (set_mouse_pos && io.ConfigNavMoveSetMousePos && (io.BackendFlags & ImGuiBackendFlags_HasSetMousePos)) + TeleportMousePos(NavCalcPreferredRefPos()); + + // [DEBUG] + g.NavScoringDebugCount = 0; #if IMGUI_DEBUG_NAV_RECTS - if (g.NavWindow) + if (ImGuiWindow* debug_window = g.NavWindow) { - ImDrawList* draw_list = GetForegroundDrawList(g.NavWindow); - if (1) { for (int layer = 0; layer < 2; layer++) draw_list->AddRect(g.NavWindow->Pos + g.NavWindow->NavRectRel[layer].Min, g.NavWindow->Pos + g.NavWindow->NavRectRel[layer].Max, IM_COL32(255,200,0,255)); } // [DEBUG] - if (1) { ImU32 col = (!g.NavWindow->Hidden) ? IM_COL32(255,0,255,255) : IM_COL32(255,0,0,255); ImVec2 p = NavCalcPreferredRefPos(); char buf[32]; ImFormatString(buf, 32, "%d", g.NavLayer); draw_list->AddCircleFilled(p, 3.0f, col); draw_list->AddText(NULL, 13.0f, p + ImVec2(8,-4), col, buf); } + ImDrawList* draw_list = GetForegroundDrawList(debug_window); + int layer = g.NavLayer; /* for (int layer = 0; layer < 2; layer++)*/ { ImRect r = WindowRectRelToAbs(debug_window, debug_window->NavRectRel[layer]); draw_list->AddRect(r.Min, r.Max, IM_COL32(255, 200, 0, 255)); } + //if (1) { ImU32 col = (!debug_window->Hidden) ? IM_COL32(255,0,255,255) : IM_COL32(255,0,0,255); ImVec2 p = NavCalcPreferredRefPos(); char buf[32]; ImFormatString(buf, 32, "%d", g.NavLayer); draw_list->AddCircleFilled(p, 3.0f, col); draw_list->AddText(NULL, 13.0f, p + ImVec2(8,-4), col, buf); } } #endif } -// Apply result from previous frame navigation directional move request -static void ImGui::NavUpdateMoveResult() +void ImGui::NavInitRequestApplyResult() +{ + // In very rare cases g.NavWindow may be null (e.g. clearing focus after requesting an init request, which does happen when releasing Alt while clicking on void) + ImGuiContext& g = *GImGui; + if (!g.NavWindow) + return; + + ImGuiNavItemData* result = &g.NavInitResult; + if (g.NavId != result->ID) + { + g.NavJustMovedFromFocusScopeId = g.NavFocusScopeId; + g.NavJustMovedToId = result->ID; + g.NavJustMovedToFocusScopeId = result->FocusScopeId; + g.NavJustMovedToKeyMods = 0; + g.NavJustMovedToIsTabbing = false; + g.NavJustMovedToHasSelectionData = (result->ItemFlags & ImGuiItemFlags_HasSelectionUserData) != 0; + } + + // Apply result from previous navigation init request (will typically select the first item, unless SetItemDefaultFocus() has been called) + // FIXME-NAV: On _NavFlattened windows, g.NavWindow will only be updated during subsequent frame. Not a problem currently. + IMGUI_DEBUG_LOG_NAV("[nav] NavInitRequest: ApplyResult: NavID 0x%08X in Layer %d Window \"%s\"\n", result->ID, g.NavLayer, g.NavWindow->Name); + SetNavID(result->ID, g.NavLayer, result->FocusScopeId, result->RectRel); + g.NavIdIsAlive = true; // Mark as alive from previous frame as we got a result + if (result->SelectionUserData != ImGuiSelectionUserData_Invalid) + g.NavLastValidSelectionUserData = result->SelectionUserData; + if (g.NavInitRequestFromMove) + SetNavCursorVisibleAfterMove(); +} + +// Bias scoring rect ahead of scoring + update preferred pos (if missing) using source position +static void NavBiasScoringRect(ImRect& r, ImVec2& preferred_pos_rel, ImGuiDir move_dir, ImGuiNavMoveFlags move_flags) +{ + // Bias initial rect + ImGuiContext& g = *GImGui; + const ImVec2 rel_to_abs_offset = g.NavWindow->DC.CursorStartPos; + + // Initialize bias on departure if we don't have any. So mouse-click + arrow will record bias. + // - We default to L/U bias, so moving down from a large source item into several columns will land on left-most column. + // - But each successful move sets new bias on one axis, only cleared when using mouse. + if ((move_flags & ImGuiNavMoveFlags_Forwarded) == 0) + { + if (preferred_pos_rel.x == FLT_MAX) + preferred_pos_rel.x = ImMin(r.Min.x + 1.0f, r.Max.x) - rel_to_abs_offset.x; + if (preferred_pos_rel.y == FLT_MAX) + preferred_pos_rel.y = r.GetCenter().y - rel_to_abs_offset.y; + } + + // Apply general bias on the other axis + if ((move_dir == ImGuiDir_Up || move_dir == ImGuiDir_Down) && preferred_pos_rel.x != FLT_MAX) + r.Min.x = r.Max.x = preferred_pos_rel.x + rel_to_abs_offset.x; + else if ((move_dir == ImGuiDir_Left || move_dir == ImGuiDir_Right) && preferred_pos_rel.y != FLT_MAX) + r.Min.y = r.Max.y = preferred_pos_rel.y + rel_to_abs_offset.y; +} + +void ImGui::NavUpdateCreateMoveRequest() { ImGuiContext& g = *GImGui; - if (g.NavMoveResultLocal.ID == 0 && g.NavMoveResultOther.ID == 0) + ImGuiIO& io = g.IO; + ImGuiWindow* window = g.NavWindow; + const bool nav_gamepad_active = (io.ConfigFlags & ImGuiConfigFlags_NavEnableGamepad) != 0 && (io.BackendFlags & ImGuiBackendFlags_HasGamepad) != 0; + const bool nav_keyboard_active = (io.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard) != 0; + + if (g.NavMoveForwardToNextFrame && window != NULL) { - // In a situation when there is no results but NavId != 0, re-enable the Navigation highlight (because g.NavId is not considered as a possible result) - if (g.NavId != 0) + // Forwarding previous request (which has been modified, e.g. wrap around menus rewrite the requests with a starting rectangle at the other side of the window) + // (preserve most state, which were already set by the NavMoveRequestForward() function) + IM_ASSERT(g.NavMoveDir != ImGuiDir_None && g.NavMoveClipDir != ImGuiDir_None); + IM_ASSERT(g.NavMoveFlags & ImGuiNavMoveFlags_Forwarded); + IMGUI_DEBUG_LOG_NAV("[nav] NavMoveRequestForward %d\n", g.NavMoveDir); + } + else + { + // Initiate directional inputs request + g.NavMoveDir = ImGuiDir_None; + g.NavMoveFlags = ImGuiNavMoveFlags_None; + g.NavMoveScrollFlags = ImGuiScrollFlags_None; + if (window && !g.NavWindowingTarget && !(window->Flags & ImGuiWindowFlags_NoNavInputs)) { - g.NavDisableHighlight = false; - g.NavDisableMouseHover = true; + const ImGuiInputFlags repeat_mode = ImGuiInputFlags_Repeat | (ImGuiInputFlags)ImGuiInputFlags_RepeatRateNavMove; + if (!IsActiveIdUsingNavDir(ImGuiDir_Left) && ((nav_gamepad_active && IsKeyPressed(ImGuiKey_GamepadDpadLeft, repeat_mode, ImGuiKeyOwner_NoOwner)) || (nav_keyboard_active && IsKeyPressed(ImGuiKey_LeftArrow, repeat_mode, ImGuiKeyOwner_NoOwner)))) { g.NavMoveDir = ImGuiDir_Left; } + if (!IsActiveIdUsingNavDir(ImGuiDir_Right) && ((nav_gamepad_active && IsKeyPressed(ImGuiKey_GamepadDpadRight, repeat_mode, ImGuiKeyOwner_NoOwner)) || (nav_keyboard_active && IsKeyPressed(ImGuiKey_RightArrow, repeat_mode, ImGuiKeyOwner_NoOwner)))) { g.NavMoveDir = ImGuiDir_Right; } + if (!IsActiveIdUsingNavDir(ImGuiDir_Up) && ((nav_gamepad_active && IsKeyPressed(ImGuiKey_GamepadDpadUp, repeat_mode, ImGuiKeyOwner_NoOwner)) || (nav_keyboard_active && IsKeyPressed(ImGuiKey_UpArrow, repeat_mode, ImGuiKeyOwner_NoOwner)))) { g.NavMoveDir = ImGuiDir_Up; } + if (!IsActiveIdUsingNavDir(ImGuiDir_Down) && ((nav_gamepad_active && IsKeyPressed(ImGuiKey_GamepadDpadDown, repeat_mode, ImGuiKeyOwner_NoOwner)) || (nav_keyboard_active && IsKeyPressed(ImGuiKey_DownArrow, repeat_mode, ImGuiKeyOwner_NoOwner)))) { g.NavMoveDir = ImGuiDir_Down; } } + g.NavMoveClipDir = g.NavMoveDir; + g.NavScoringNoClipRect = ImRect(+FLT_MAX, +FLT_MAX, -FLT_MAX, -FLT_MAX); + } + + // Update PageUp/PageDown/Home/End scroll + // FIXME-NAV: Consider enabling those keys even without the master ImGuiConfigFlags_NavEnableKeyboard flag? + float scoring_rect_offset_y = 0.0f; + if (window && g.NavMoveDir == ImGuiDir_None && nav_keyboard_active) + scoring_rect_offset_y = NavUpdatePageUpPageDown(); + if (scoring_rect_offset_y != 0.0f) + { + g.NavScoringNoClipRect = window->InnerRect; + g.NavScoringNoClipRect.TranslateY(scoring_rect_offset_y); + } + + // [DEBUG] Always send a request when holding CTRL. Hold CTRL + Arrow change the direction. +#if IMGUI_DEBUG_NAV_SCORING + //if (io.KeyCtrl && IsKeyPressed(ImGuiKey_C)) + // g.NavMoveDirForDebug = (ImGuiDir)((g.NavMoveDirForDebug + 1) & 3); + if (io.KeyCtrl) + { + if (g.NavMoveDir == ImGuiDir_None) + g.NavMoveDir = g.NavMoveDirForDebug; + g.NavMoveClipDir = g.NavMoveDir; + g.NavMoveFlags |= ImGuiNavMoveFlags_DebugNoResult; + } +#endif + + // Submit + g.NavMoveForwardToNextFrame = false; + if (g.NavMoveDir != ImGuiDir_None) + NavMoveRequestSubmit(g.NavMoveDir, g.NavMoveClipDir, g.NavMoveFlags, g.NavMoveScrollFlags); + + // Moving with no reference triggers an init request (will be used as a fallback if the direction fails to find a match) + if (g.NavMoveSubmitted && g.NavId == 0) + { + IMGUI_DEBUG_LOG_NAV("[nav] NavInitRequest: from move, window \"%s\", layer=%d\n", window ? window->Name : "", g.NavLayer); + g.NavInitRequest = g.NavInitRequestFromMove = true; + g.NavInitResult.ID = 0; + if (g.IO.ConfigNavCursorVisibleAuto) + g.NavCursorVisible = true; + } + + // When using gamepad, we project the reference nav bounding box into window visible area. + // This is to allow resuming navigation inside the visible area after doing a large amount of scrolling, + // since with gamepad all movements are relative (can't focus a visible object like we can with the mouse). + if (g.NavMoveSubmitted && g.NavInputSource == ImGuiInputSource_Gamepad && g.NavLayer == ImGuiNavLayer_Main && window != NULL)// && (g.NavMoveFlags & ImGuiNavMoveFlags_Forwarded)) + { + bool clamp_x = (g.NavMoveFlags & (ImGuiNavMoveFlags_LoopX | ImGuiNavMoveFlags_WrapX)) == 0; + bool clamp_y = (g.NavMoveFlags & (ImGuiNavMoveFlags_LoopY | ImGuiNavMoveFlags_WrapY)) == 0; + ImRect inner_rect_rel = WindowRectAbsToRel(window, ImRect(window->InnerRect.Min - ImVec2(1, 1), window->InnerRect.Max + ImVec2(1, 1))); + + // Take account of changing scroll to handle triggering a new move request on a scrolling frame. (#6171) + // Otherwise 'inner_rect_rel' would be off on the move result frame. + inner_rect_rel.Translate(CalcNextScrollFromScrollTargetAndClamp(window) - window->Scroll); + + if ((clamp_x || clamp_y) && !inner_rect_rel.Contains(window->NavRectRel[g.NavLayer])) + { + IMGUI_DEBUG_LOG_NAV("[nav] NavMoveRequest: clamp NavRectRel for gamepad move\n"); + float pad_x = ImMin(inner_rect_rel.GetWidth(), window->FontRefSize * 0.5f); + float pad_y = ImMin(inner_rect_rel.GetHeight(), window->FontRefSize * 0.5f); // Terrible approximation for the intent of starting navigation from first fully visible item + inner_rect_rel.Min.x = clamp_x ? (inner_rect_rel.Min.x + pad_x) : -FLT_MAX; + inner_rect_rel.Max.x = clamp_x ? (inner_rect_rel.Max.x - pad_x) : +FLT_MAX; + inner_rect_rel.Min.y = clamp_y ? (inner_rect_rel.Min.y + pad_y) : -FLT_MAX; + inner_rect_rel.Max.y = clamp_y ? (inner_rect_rel.Max.y - pad_y) : +FLT_MAX; + window->NavRectRel[g.NavLayer].ClipWithFull(inner_rect_rel); + g.NavId = 0; + } + } + + // For scoring we use a single segment on the left side our current item bounding box (not touching the edge to avoid box overlap with zero-spaced items) + ImRect scoring_rect; + if (window != NULL) + { + ImRect nav_rect_rel = !window->NavRectRel[g.NavLayer].IsInverted() ? window->NavRectRel[g.NavLayer] : ImRect(0, 0, 0, 0); + scoring_rect = WindowRectRelToAbs(window, nav_rect_rel); + scoring_rect.TranslateY(scoring_rect_offset_y); + if (g.NavMoveSubmitted) + NavBiasScoringRect(scoring_rect, window->RootWindowForNav->NavPreferredScoringPosRel[g.NavLayer], g.NavMoveDir, g.NavMoveFlags); + IM_ASSERT(!scoring_rect.IsInverted()); // Ensure we have a non-inverted bounding box here will allow us to remove extraneous ImFabs() calls in NavScoreItem(). + //GetForegroundDrawList()->AddRect(scoring_rect.Min, scoring_rect.Max, IM_COL32(255,200,0,255)); // [DEBUG] + //if (!g.NavScoringNoClipRect.IsInverted()) { GetForegroundDrawList()->AddRect(g.NavScoringNoClipRect.Min, g.NavScoringNoClipRect.Max, IM_COL32(255, 200, 0, 255)); } // [DEBUG] + } + g.NavScoringRect = scoring_rect; + g.NavScoringNoClipRect.Add(scoring_rect); +} + +void ImGui::NavUpdateCreateTabbingRequest() +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.NavWindow; + IM_ASSERT(g.NavMoveDir == ImGuiDir_None); + if (window == NULL || g.NavWindowingTarget != NULL || (window->Flags & ImGuiWindowFlags_NoNavInputs)) + return; + + const bool tab_pressed = IsKeyPressed(ImGuiKey_Tab, ImGuiInputFlags_Repeat, ImGuiKeyOwner_NoOwner) && !g.IO.KeyCtrl && !g.IO.KeyAlt; + if (!tab_pressed) + return; + + // Initiate tabbing request + // (this is ALWAYS ENABLED, regardless of ImGuiConfigFlags_NavEnableKeyboard flag!) + // See NavProcessItemForTabbingRequest() for a description of the various forward/backward tabbing cases with and without wrapping. + const bool nav_keyboard_active = (g.IO.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard) != 0; + if (nav_keyboard_active) + g.NavTabbingDir = g.IO.KeyShift ? -1 : (g.NavCursorVisible == false && g.ActiveId == 0) ? 0 : +1; + else + g.NavTabbingDir = g.IO.KeyShift ? -1 : (g.ActiveId == 0) ? 0 : +1; + ImGuiNavMoveFlags move_flags = ImGuiNavMoveFlags_IsTabbing | ImGuiNavMoveFlags_Activate; + ImGuiScrollFlags scroll_flags = window->Appearing ? ImGuiScrollFlags_KeepVisibleEdgeX | ImGuiScrollFlags_AlwaysCenterY : ImGuiScrollFlags_KeepVisibleEdgeX | ImGuiScrollFlags_KeepVisibleEdgeY; + ImGuiDir clip_dir = (g.NavTabbingDir < 0) ? ImGuiDir_Up : ImGuiDir_Down; + NavMoveRequestSubmit(ImGuiDir_None, clip_dir, move_flags, scroll_flags); // FIXME-NAV: Once we refactor tabbing, add LegacyApi flag to not activate non-inputable. + g.NavTabbingCounter = -1; +} + +// Apply result from previous frame navigation directional move request. Always called from NavUpdate() +void ImGui::NavMoveRequestApplyResult() +{ + ImGuiContext& g = *GImGui; +#if IMGUI_DEBUG_NAV_SCORING + if (g.NavMoveFlags & ImGuiNavMoveFlags_DebugNoResult) // [DEBUG] Scoring all items in NavWindow at all times + return; +#endif + + // Select which result to use + ImGuiNavItemData* result = (g.NavMoveResultLocal.ID != 0) ? &g.NavMoveResultLocal : (g.NavMoveResultOther.ID != 0) ? &g.NavMoveResultOther : NULL; + + // Tabbing forward wrap + if ((g.NavMoveFlags & ImGuiNavMoveFlags_IsTabbing) && result == NULL) + if ((g.NavTabbingCounter == 1 || g.NavTabbingDir == 0) && g.NavTabbingResultFirst.ID) + result = &g.NavTabbingResultFirst; + + // In a situation when there are no results but NavId != 0, re-enable the Navigation highlight (because g.NavId is not considered as a possible result) + const ImGuiAxis axis = (g.NavMoveDir == ImGuiDir_Up || g.NavMoveDir == ImGuiDir_Down) ? ImGuiAxis_Y : ImGuiAxis_X; + if (result == NULL) + { + if (g.NavMoveFlags & ImGuiNavMoveFlags_IsTabbing) + g.NavMoveFlags |= ImGuiNavMoveFlags_NoSetNavCursorVisible; + if (g.NavId != 0 && (g.NavMoveFlags & ImGuiNavMoveFlags_NoSetNavCursorVisible) == 0) + SetNavCursorVisibleAfterMove(); + NavClearPreferredPosForAxis(axis); // On a failed move, clear preferred pos for this axis. + IMGUI_DEBUG_LOG_NAV("[nav] NavMoveSubmitted but not led to a result!\n"); return; } - // Select which result to use - ImGuiNavMoveResult* result = (g.NavMoveResultLocal.ID != 0) ? &g.NavMoveResultLocal : &g.NavMoveResultOther; - // PageUp/PageDown behavior first jumps to the bottom/top mostly visible item, _otherwise_ use the result from the previous/next page. - if (g.NavMoveRequestFlags & ImGuiNavMoveFlags_AlsoScoreVisibleSet) - if (g.NavMoveResultLocalVisibleSet.ID != 0 && g.NavMoveResultLocalVisibleSet.ID != g.NavId) - result = &g.NavMoveResultLocalVisibleSet; + if (g.NavMoveFlags & ImGuiNavMoveFlags_AlsoScoreVisibleSet) + if (g.NavMoveResultLocalVisible.ID != 0 && g.NavMoveResultLocalVisible.ID != g.NavId) + result = &g.NavMoveResultLocalVisible; // Maybe entering a flattened child from the outside? In this case solve the tie using the regular scoring rules. if (result != &g.NavMoveResultOther && g.NavMoveResultOther.ID != 0 && g.NavMoveResultOther.Window->ParentWindow == g.NavWindow) @@ -8550,117 +14094,290 @@ static void ImGui::NavUpdateMoveResult() IM_ASSERT(g.NavWindow && result->Window); // Scroll to keep newly navigated item fully into view. - if (g.NavLayer == 0) + if (g.NavLayer == ImGuiNavLayer_Main) { - ImVec2 delta_scroll; - if (g.NavMoveRequestFlags & ImGuiNavMoveFlags_ScrollToEdge) + ImRect rect_abs = WindowRectRelToAbs(result->Window, result->RectRel); + ScrollToRectEx(result->Window, rect_abs, g.NavMoveScrollFlags); + + if (g.NavMoveFlags & ImGuiNavMoveFlags_ScrollToEdgeY) { + // FIXME: Should remove this? Or make more precise: use ScrollToRectEx() with edge? float scroll_target = (g.NavMoveDir == ImGuiDir_Up) ? result->Window->ScrollMax.y : 0.0f; - delta_scroll.y = result->Window->Scroll.y - scroll_target; SetScrollY(result->Window, scroll_target); } - else - { - ImRect rect_abs = ImRect(result->RectRel.Min + result->Window->Pos, result->RectRel.Max + result->Window->Pos); - delta_scroll = ScrollToBringRectIntoView(result->Window, rect_abs); - } - - // Offset our result position so mouse position can be applied immediately after in NavUpdate() - result->RectRel.TranslateX(-delta_scroll.x); - result->RectRel.TranslateY(-delta_scroll.y); } - ClearActiveID(); - g.NavWindow = result->Window; - if (g.NavId != result->ID) + if (g.NavWindow != result->Window) { - // Don't set NavJustMovedToId if just landed on the same spot (which may happen with ImGuiNavMoveFlags_AllowCurrentNavId) - g.NavJustMovedToId = result->ID; - g.NavJustMovedToMultiSelectScopeId = result->SelectScopeId; + IMGUI_DEBUG_LOG_FOCUS("[focus] NavMoveRequest: SetNavWindow(\"%s\")\n", result->Window->Name); + g.NavWindow = result->Window; + g.NavLastValidSelectionUserData = ImGuiSelectionUserData_Invalid; + } + + // Clear active id unless requested not to + // FIXME: ImGuiNavMoveFlags_NoClearActiveId is currently unused as we don't have a clear strategy to preserve active id after interaction, + // so this is mostly provided as a gateway for further experiments (see #1418, #2890) + if (g.ActiveId != result->ID && (g.NavMoveFlags & ImGuiNavMoveFlags_NoClearActiveId) == 0) + ClearActiveID(); + + // Don't set NavJustMovedToId if just landed on the same spot (which may happen with ImGuiNavMoveFlags_AllowCurrentNavId) + // PageUp/PageDown however sets always set NavJustMovedTo (vs Home/End which doesn't) mimicking Windows behavior. + if ((g.NavId != result->ID || (g.NavMoveFlags & ImGuiNavMoveFlags_IsPageMove)) && (g.NavMoveFlags & ImGuiNavMoveFlags_NoSelect) == 0) + { + g.NavJustMovedFromFocusScopeId = g.NavFocusScopeId; + g.NavJustMovedToId = result->ID; + g.NavJustMovedToFocusScopeId = result->FocusScopeId; + g.NavJustMovedToKeyMods = g.NavMoveKeyMods; + g.NavJustMovedToIsTabbing = (g.NavMoveFlags & ImGuiNavMoveFlags_IsTabbing) != 0; + g.NavJustMovedToHasSelectionData = (result->ItemFlags & ImGuiItemFlags_HasSelectionUserData) != 0; + //IMGUI_DEBUG_LOG_NAV("[nav] NavJustMovedFromFocusScopeId = 0x%08X, NavJustMovedToFocusScopeId = 0x%08X\n", g.NavJustMovedFromFocusScopeId, g.NavJustMovedToFocusScopeId); + } + + // Apply new NavID/Focus + IMGUI_DEBUG_LOG_NAV("[nav] NavMoveRequest: result NavID 0x%08X in Layer %d Window \"%s\"\n", result->ID, g.NavLayer, g.NavWindow->Name); + ImVec2 preferred_scoring_pos_rel = g.NavWindow->RootWindowForNav->NavPreferredScoringPosRel[g.NavLayer]; + SetNavID(result->ID, g.NavLayer, result->FocusScopeId, result->RectRel); + if (result->SelectionUserData != ImGuiSelectionUserData_Invalid) + g.NavLastValidSelectionUserData = result->SelectionUserData; + + // Restore last preferred position for current axis + // (storing in RootWindowForNav-> as the info is desirable at the beginning of a Move Request. In theory all storage should use RootWindowForNav..) + if ((g.NavMoveFlags & ImGuiNavMoveFlags_IsTabbing) == 0) + { + preferred_scoring_pos_rel[axis] = result->RectRel.GetCenter()[axis]; + g.NavWindow->RootWindowForNav->NavPreferredScoringPosRel[g.NavLayer] = preferred_scoring_pos_rel; + } + + // Tabbing: Activates Inputable, otherwise only Focus + if ((g.NavMoveFlags & ImGuiNavMoveFlags_IsTabbing) && (result->ItemFlags & ImGuiItemFlags_Inputable) == 0) + g.NavMoveFlags &= ~ImGuiNavMoveFlags_Activate; + + // Activate + if (g.NavMoveFlags & ImGuiNavMoveFlags_Activate) + { + g.NavNextActivateId = result->ID; + g.NavNextActivateFlags = ImGuiActivateFlags_None; + if (g.NavMoveFlags & ImGuiNavMoveFlags_IsTabbing) + g.NavNextActivateFlags |= ImGuiActivateFlags_PreferInput | ImGuiActivateFlags_TryToPreserveState | ImGuiActivateFlags_FromTabbing; + } + + // Make nav cursor visible + if ((g.NavMoveFlags & ImGuiNavMoveFlags_NoSetNavCursorVisible) == 0) + SetNavCursorVisibleAfterMove(); +} + +// Process Escape/NavCancel input (to close a popup, get back to parent, clear focus) +// FIXME: In order to support e.g. Escape to clear a selection we'll need: +// - either to store the equivalent of ActiveIdUsingKeyInputMask for a FocusScope and test for it. +// - either to move most/all of those tests to the epilogue/end functions of the scope they are dealing with (e.g. exit child window in EndChild()) or in EndFrame(), to allow an earlier intercept +static void ImGui::NavUpdateCancelRequest() +{ + ImGuiContext& g = *GImGui; + const bool nav_gamepad_active = (g.IO.ConfigFlags & ImGuiConfigFlags_NavEnableGamepad) != 0 && (g.IO.BackendFlags & ImGuiBackendFlags_HasGamepad) != 0; + const bool nav_keyboard_active = (g.IO.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard) != 0; + if (!(nav_keyboard_active && IsKeyPressed(ImGuiKey_Escape, 0, ImGuiKeyOwner_NoOwner)) && !(nav_gamepad_active && IsKeyPressed(ImGuiKey_NavGamepadCancel, 0, ImGuiKeyOwner_NoOwner))) + return; + + IMGUI_DEBUG_LOG_NAV("[nav] NavUpdateCancelRequest()\n"); + if (g.ActiveId != 0) + { + ClearActiveID(); + } + else if (g.NavLayer != ImGuiNavLayer_Main) + { + // Leave the "menu" layer + NavRestoreLayer(ImGuiNavLayer_Main); + SetNavCursorVisibleAfterMove(); + } + else if (g.NavWindow && g.NavWindow != g.NavWindow->RootWindow && !(g.NavWindow->RootWindowForNav->Flags & ImGuiWindowFlags_Popup) && g.NavWindow->RootWindowForNav->ParentWindow) + { + // Exit child window + ImGuiWindow* child_window = g.NavWindow->RootWindowForNav; + ImGuiWindow* parent_window = child_window->ParentWindow; + IM_ASSERT(child_window->ChildId != 0); + FocusWindow(parent_window); + SetNavID(child_window->ChildId, ImGuiNavLayer_Main, 0, WindowRectAbsToRel(parent_window, child_window->Rect())); + SetNavCursorVisibleAfterMove(); + } + else if (g.OpenPopupStack.Size > 0 && g.OpenPopupStack.back().Window != NULL && !(g.OpenPopupStack.back().Window->Flags & ImGuiWindowFlags_Modal)) + { + // Close open popup/menu + ClosePopupToLevel(g.OpenPopupStack.Size - 1, true); + } + else + { + // Clear NavLastId for popups but keep it for regular child window so we can leave one and come back where we were + // FIXME-NAV: This should happen on window appearing. + if (g.IO.ConfigNavEscapeClearFocusItem || g.IO.ConfigNavEscapeClearFocusWindow) + if (g.NavWindow && ((g.NavWindow->Flags & ImGuiWindowFlags_Popup)))// || !(g.NavWindow->Flags & ImGuiWindowFlags_ChildWindow))) + g.NavWindow->NavLastIds[0] = 0; + + // Clear nav focus + if (g.IO.ConfigNavEscapeClearFocusItem || g.IO.ConfigNavEscapeClearFocusWindow) + g.NavId = 0; + if (g.IO.ConfigNavEscapeClearFocusWindow) + FocusWindow(NULL); } - SetNavIDWithRectRel(result->ID, g.NavLayer, result->RectRel); - g.NavMoveFromClampedRefRect = false; } // Handle PageUp/PageDown/Home/End keys -static float ImGui::NavUpdatePageUpPageDown(int allowed_dir_flags) +// Called from NavUpdateCreateMoveRequest() which will use our output to create a move request +// FIXME-NAV: This doesn't work properly with NavFlattened siblings as we use NavWindow rectangle for reference +// FIXME-NAV: how to get Home/End to aim at the beginning/end of a 2D grid? +static float ImGui::NavUpdatePageUpPageDown() { ImGuiContext& g = *GImGui; - if (g.NavMoveDir != ImGuiDir_None || g.NavWindow == NULL) - return 0.0f; - if ((g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs) || g.NavWindowingTarget != NULL || g.NavLayer != 0) + ImGuiWindow* window = g.NavWindow; + if ((window->Flags & ImGuiWindowFlags_NoNavInputs) || g.NavWindowingTarget != NULL) return 0.0f; - ImGuiWindow* window = g.NavWindow; - const bool page_up_held = IsKeyDown(g.IO.KeyMap[ImGuiKey_PageUp]) && (allowed_dir_flags & (1 << ImGuiDir_Up)); - const bool page_down_held = IsKeyDown(g.IO.KeyMap[ImGuiKey_PageDown]) && (allowed_dir_flags & (1 << ImGuiDir_Down)); - const bool home_pressed = IsKeyPressed(g.IO.KeyMap[ImGuiKey_Home]) && (allowed_dir_flags & (1 << ImGuiDir_Up)); - const bool end_pressed = IsKeyPressed(g.IO.KeyMap[ImGuiKey_End]) && (allowed_dir_flags & (1 << ImGuiDir_Down)); - if (page_up_held != page_down_held || home_pressed != end_pressed) // If either (not both) are pressed + const bool page_up_held = IsKeyDown(ImGuiKey_PageUp, ImGuiKeyOwner_NoOwner); + const bool page_down_held = IsKeyDown(ImGuiKey_PageDown, ImGuiKeyOwner_NoOwner); + const bool home_pressed = IsKeyPressed(ImGuiKey_Home, ImGuiInputFlags_Repeat, ImGuiKeyOwner_NoOwner); + const bool end_pressed = IsKeyPressed(ImGuiKey_End, ImGuiInputFlags_Repeat, ImGuiKeyOwner_NoOwner); + if (page_up_held == page_down_held && home_pressed == end_pressed) // Proceed if either (not both) are pressed, otherwise early out + return 0.0f; + + if (g.NavLayer != ImGuiNavLayer_Main) + NavRestoreLayer(ImGuiNavLayer_Main); + + if (window->DC.NavLayersActiveMask == 0x00 && window->DC.NavWindowHasScrollY) { - if (window->DC.NavLayerActiveMask == 0x00 && window->DC.NavHasScroll) + // Fallback manual-scroll when window has no navigable item + if (IsKeyPressed(ImGuiKey_PageUp, ImGuiInputFlags_Repeat, ImGuiKeyOwner_NoOwner)) + SetScrollY(window, window->Scroll.y - window->InnerRect.GetHeight()); + else if (IsKeyPressed(ImGuiKey_PageDown, ImGuiInputFlags_Repeat, ImGuiKeyOwner_NoOwner)) + SetScrollY(window, window->Scroll.y + window->InnerRect.GetHeight()); + else if (home_pressed) + SetScrollY(window, 0.0f); + else if (end_pressed) + SetScrollY(window, window->ScrollMax.y); + } + else + { + ImRect& nav_rect_rel = window->NavRectRel[g.NavLayer]; + const float page_offset_y = ImMax(0.0f, window->InnerRect.GetHeight() - window->FontRefSize * 1.0f + nav_rect_rel.GetHeight()); + float nav_scoring_rect_offset_y = 0.0f; + if (IsKeyPressed(ImGuiKey_PageUp, true)) { - // Fallback manual-scroll when window has no navigable item - if (IsKeyPressed(g.IO.KeyMap[ImGuiKey_PageUp], true)) - SetScrollY(window, window->Scroll.y - window->InnerRect.GetHeight()); - else if (IsKeyPressed(g.IO.KeyMap[ImGuiKey_PageDown], true)) - SetScrollY(window, window->Scroll.y + window->InnerRect.GetHeight()); - else if (home_pressed) - SetScrollY(window, 0.0f); - else if (end_pressed) - SetScrollY(window, window->ScrollMax.y); + nav_scoring_rect_offset_y = -page_offset_y; + g.NavMoveDir = ImGuiDir_Down; // Because our scoring rect is offset up, we request the down direction (so we can always land on the last item) + g.NavMoveClipDir = ImGuiDir_Up; + g.NavMoveFlags = ImGuiNavMoveFlags_AllowCurrentNavId | ImGuiNavMoveFlags_AlsoScoreVisibleSet | ImGuiNavMoveFlags_IsPageMove; } - else + else if (IsKeyPressed(ImGuiKey_PageDown, true)) { - ImRect& nav_rect_rel = window->NavRectRel[g.NavLayer]; - const float page_offset_y = ImMax(0.0f, window->InnerRect.GetHeight() - window->CalcFontSize() * 1.0f + nav_rect_rel.GetHeight()); - float nav_scoring_rect_offset_y = 0.0f; - if (IsKeyPressed(g.IO.KeyMap[ImGuiKey_PageUp], true)) - { - nav_scoring_rect_offset_y = -page_offset_y; - g.NavMoveDir = ImGuiDir_Down; // Because our scoring rect is offset up, we request the down direction (so we can always land on the last item) - g.NavMoveClipDir = ImGuiDir_Up; - g.NavMoveRequestFlags = ImGuiNavMoveFlags_AllowCurrentNavId | ImGuiNavMoveFlags_AlsoScoreVisibleSet; - } - else if (IsKeyPressed(g.IO.KeyMap[ImGuiKey_PageDown], true)) - { - nav_scoring_rect_offset_y = +page_offset_y; - g.NavMoveDir = ImGuiDir_Up; // Because our scoring rect is offset down, we request the up direction (so we can always land on the last item) - g.NavMoveClipDir = ImGuiDir_Down; - g.NavMoveRequestFlags = ImGuiNavMoveFlags_AllowCurrentNavId | ImGuiNavMoveFlags_AlsoScoreVisibleSet; - } - else if (home_pressed) - { - // FIXME-NAV: handling of Home/End is assuming that the top/bottom most item will be visible with Scroll.y == 0/ScrollMax.y - // Scrolling will be handled via the ImGuiNavMoveFlags_ScrollToEdge flag, we don't scroll immediately to avoid scrolling happening before nav result. - // Preserve current horizontal position if we have any. - nav_rect_rel.Min.y = nav_rect_rel.Max.y = -window->Scroll.y; - if (nav_rect_rel.IsInverted()) - nav_rect_rel.Min.x = nav_rect_rel.Max.x = 0.0f; - g.NavMoveDir = ImGuiDir_Down; - g.NavMoveRequestFlags = ImGuiNavMoveFlags_AllowCurrentNavId | ImGuiNavMoveFlags_ScrollToEdge; - } - else if (end_pressed) - { - nav_rect_rel.Min.y = nav_rect_rel.Max.y = window->ScrollMax.y + window->SizeFull.y - window->Scroll.y; - if (nav_rect_rel.IsInverted()) - nav_rect_rel.Min.x = nav_rect_rel.Max.x = 0.0f; - g.NavMoveDir = ImGuiDir_Up; - g.NavMoveRequestFlags = ImGuiNavMoveFlags_AllowCurrentNavId | ImGuiNavMoveFlags_ScrollToEdge; - } - return nav_scoring_rect_offset_y; + nav_scoring_rect_offset_y = +page_offset_y; + g.NavMoveDir = ImGuiDir_Up; // Because our scoring rect is offset down, we request the up direction (so we can always land on the last item) + g.NavMoveClipDir = ImGuiDir_Down; + g.NavMoveFlags = ImGuiNavMoveFlags_AllowCurrentNavId | ImGuiNavMoveFlags_AlsoScoreVisibleSet | ImGuiNavMoveFlags_IsPageMove; } + else if (home_pressed) + { + // FIXME-NAV: handling of Home/End is assuming that the top/bottom most item will be visible with Scroll.y == 0/ScrollMax.y + // Scrolling will be handled via the ImGuiNavMoveFlags_ScrollToEdgeY flag, we don't scroll immediately to avoid scrolling happening before nav result. + // Preserve current horizontal position if we have any. + nav_rect_rel.Min.y = nav_rect_rel.Max.y = 0.0f; + if (nav_rect_rel.IsInverted()) + nav_rect_rel.Min.x = nav_rect_rel.Max.x = 0.0f; + g.NavMoveDir = ImGuiDir_Down; + g.NavMoveFlags = ImGuiNavMoveFlags_AllowCurrentNavId | ImGuiNavMoveFlags_ScrollToEdgeY; + // FIXME-NAV: MoveClipDir left to _None, intentional? + } + else if (end_pressed) + { + nav_rect_rel.Min.y = nav_rect_rel.Max.y = window->ContentSize.y; + if (nav_rect_rel.IsInverted()) + nav_rect_rel.Min.x = nav_rect_rel.Max.x = 0.0f; + g.NavMoveDir = ImGuiDir_Up; + g.NavMoveFlags = ImGuiNavMoveFlags_AllowCurrentNavId | ImGuiNavMoveFlags_ScrollToEdgeY; + // FIXME-NAV: MoveClipDir left to _None, intentional? + } + return nav_scoring_rect_offset_y; } return 0.0f; } -static int ImGui::FindWindowFocusIndex(ImGuiWindow* window) // FIXME-OPT O(N) +static void ImGui::NavEndFrame() { ImGuiContext& g = *GImGui; - for (int i = g.WindowsFocusOrder.Size-1; i >= 0; i--) - if (g.WindowsFocusOrder[i] == window) - return i; - return -1; + + // Show CTRL+TAB list window + if (g.NavWindowingTarget != NULL) + NavUpdateWindowingOverlay(); + + // Perform wrap-around in menus + // FIXME-NAV: Wrap may need to apply a weight bias on the other axis. e.g. 4x4 grid with 2 last items missing on last item won't handle LoopY/WrapY correctly. + // FIXME-NAV: Wrap (not Loop) support could be handled by the scoring function and then WrapX would function without an extra frame. + if (g.NavWindow && NavMoveRequestButNoResultYet() && (g.NavMoveFlags & ImGuiNavMoveFlags_WrapMask_) && (g.NavMoveFlags & ImGuiNavMoveFlags_Forwarded) == 0) + NavUpdateCreateWrappingRequest(); +} + +static void ImGui::NavUpdateCreateWrappingRequest() +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.NavWindow; + + bool do_forward = false; + ImRect bb_rel = window->NavRectRel[g.NavLayer]; + ImGuiDir clip_dir = g.NavMoveDir; + + const ImGuiNavMoveFlags move_flags = g.NavMoveFlags; + //const ImGuiAxis move_axis = (g.NavMoveDir == ImGuiDir_Up || g.NavMoveDir == ImGuiDir_Down) ? ImGuiAxis_Y : ImGuiAxis_X; + if (g.NavMoveDir == ImGuiDir_Left && (move_flags & (ImGuiNavMoveFlags_WrapX | ImGuiNavMoveFlags_LoopX))) + { + bb_rel.Min.x = bb_rel.Max.x = window->ContentSize.x + window->WindowPadding.x; + if (move_flags & ImGuiNavMoveFlags_WrapX) + { + bb_rel.TranslateY(-bb_rel.GetHeight()); // Previous row + clip_dir = ImGuiDir_Up; + } + do_forward = true; + } + if (g.NavMoveDir == ImGuiDir_Right && (move_flags & (ImGuiNavMoveFlags_WrapX | ImGuiNavMoveFlags_LoopX))) + { + bb_rel.Min.x = bb_rel.Max.x = -window->WindowPadding.x; + if (move_flags & ImGuiNavMoveFlags_WrapX) + { + bb_rel.TranslateY(+bb_rel.GetHeight()); // Next row + clip_dir = ImGuiDir_Down; + } + do_forward = true; + } + if (g.NavMoveDir == ImGuiDir_Up && (move_flags & (ImGuiNavMoveFlags_WrapY | ImGuiNavMoveFlags_LoopY))) + { + bb_rel.Min.y = bb_rel.Max.y = window->ContentSize.y + window->WindowPadding.y; + if (move_flags & ImGuiNavMoveFlags_WrapY) + { + bb_rel.TranslateX(-bb_rel.GetWidth()); // Previous column + clip_dir = ImGuiDir_Left; + } + do_forward = true; + } + if (g.NavMoveDir == ImGuiDir_Down && (move_flags & (ImGuiNavMoveFlags_WrapY | ImGuiNavMoveFlags_LoopY))) + { + bb_rel.Min.y = bb_rel.Max.y = -window->WindowPadding.y; + if (move_flags & ImGuiNavMoveFlags_WrapY) + { + bb_rel.TranslateX(+bb_rel.GetWidth()); // Next column + clip_dir = ImGuiDir_Right; + } + do_forward = true; + } + if (!do_forward) + return; + window->NavRectRel[g.NavLayer] = bb_rel; + NavClearPreferredPosForAxis(ImGuiAxis_X); + NavClearPreferredPosForAxis(ImGuiAxis_Y); + NavMoveRequestForward(g.NavMoveDir, clip_dir, move_flags, g.NavMoveScrollFlags); +} + +// Can we focus this window with CTRL+TAB (or PadMenu + PadFocusPrev/PadFocusNext) +// Note that NoNavFocus makes the window not reachable with CTRL+TAB but it can still be focused with mouse or programmatically. +// If you want a window to never be focused, you may use the e.g. NoInputs flag. +bool ImGui::IsWindowNavFocusable(ImGuiWindow* window) +{ + return window->WasActive && window == window->RootWindow && !(window->Flags & ImGuiWindowFlags_NoNavFocus); } static ImGuiWindow* FindWindowNavFocusable(int i_start, int i_stop, int dir) // FIXME-OPT O(N) @@ -8672,7 +14389,7 @@ static ImGuiWindow* FindWindowNavFocusable(int i_start, int i_stop, int dir) // return NULL; } -static void NavUpdateWindowingHighlightWindow(int focus_change_dir) +static void NavUpdateWindowingTarget(int focus_change_dir) { ImGuiContext& g = *GImGui; IM_ASSERT(g.NavWindowingTarget); @@ -8684,63 +14401,114 @@ static void NavUpdateWindowingHighlightWindow(int focus_change_dir) if (!window_target) window_target = FindWindowNavFocusable((focus_change_dir < 0) ? (g.WindowsFocusOrder.Size - 1) : 0, i_current, focus_change_dir); if (window_target) // Don't reset windowing target if there's a single window in the list + { g.NavWindowingTarget = g.NavWindowingTargetAnim = window_target; + g.NavWindowingAccumDeltaPos = g.NavWindowingAccumDeltaSize = ImVec2(0.0f, 0.0f); + } g.NavWindowingToggleLayer = false; } +// Apply focus and close overlay +static void ImGui::NavUpdateWindowingApplyFocus(ImGuiWindow* apply_focus_window) +{ + // FIXME: Many actions here could be part of a higher-level/reused function. Why aren't they in FocusWindow() ? + // Investigate for each of them: ClearActiveID(), NavRestoreHighlightAfterMove(), NavRestoreLastChildNavWindow(), ClosePopupsOverWindow(), NavInitWindow() + ImGuiContext& g = *GImGui; + if (g.NavWindow == NULL || apply_focus_window != g.NavWindow->RootWindow) + { + ImGuiViewport* previous_viewport = g.NavWindow ? g.NavWindow->Viewport : NULL; + ClearActiveID(); + SetNavCursorVisibleAfterMove(); + ClosePopupsOverWindow(apply_focus_window, false); + FocusWindow(apply_focus_window, ImGuiFocusRequestFlags_RestoreFocusedChild); + apply_focus_window = g.NavWindow; + if (apply_focus_window->NavLastIds[0] == 0) + NavInitWindow(apply_focus_window, false); + + // If the window has ONLY a menu layer (no main layer), select it directly + // Use NavLayersActiveMaskNext since windows didn't have a chance to be Begin()-ed on this frame, + // so CTRL+Tab where the keys are only held for 1 frame will be able to use correct layers mask since + // the target window as already been previewed once. + // FIXME-NAV: This should be done in NavInit.. or in FocusWindow... However in both of those cases, + // we won't have a guarantee that windows has been visible before and therefore NavLayersActiveMask* + // won't be valid. + if (apply_focus_window->DC.NavLayersActiveMaskNext == (1 << ImGuiNavLayer_Menu)) + g.NavLayer = ImGuiNavLayer_Menu; + + // Request OS level focus + if (apply_focus_window->Viewport != previous_viewport && g.PlatformIO.Platform_SetWindowFocus) + g.PlatformIO.Platform_SetWindowFocus(apply_focus_window->Viewport); + } + g.NavWindowingTarget = NULL; +} + // Windowing management mode // Keyboard: CTRL+Tab (change focus/move/resize), Alt (toggle menu layer) // Gamepad: Hold Menu/Square (change focus/move/resize), Tap Menu/Square (toggle menu layer) static void ImGui::NavUpdateWindowing() { ImGuiContext& g = *GImGui; + ImGuiIO& io = g.IO; + ImGuiWindow* apply_focus_window = NULL; bool apply_toggle_layer = false; ImGuiWindow* modal_window = GetTopMostPopupModal(); - if (modal_window != NULL) - { + bool allow_windowing = (modal_window == NULL); // FIXME: This prevent CTRL+TAB from being usable with windows that are inside the Begin-stack of that modal. + if (!allow_windowing) g.NavWindowingTarget = NULL; - return; - } // Fade out if (g.NavWindowingTargetAnim && g.NavWindowingTarget == NULL) { - g.NavWindowingHighlightAlpha = ImMax(g.NavWindowingHighlightAlpha - g.IO.DeltaTime * 10.0f, 0.0f); + g.NavWindowingHighlightAlpha = ImMax(g.NavWindowingHighlightAlpha - io.DeltaTime * 10.0f, 0.0f); if (g.DimBgRatio <= 0.0f && g.NavWindowingHighlightAlpha <= 0.0f) g.NavWindowingTargetAnim = NULL; } - // Start CTRL-TAB or Square+L/R window selection - bool start_windowing_with_gamepad = !g.NavWindowingTarget && IsNavInputPressed(ImGuiNavInput_Menu, ImGuiInputReadMode_Pressed); - bool start_windowing_with_keyboard = !g.NavWindowingTarget && g.IO.KeyCtrl && IsKeyPressedMap(ImGuiKey_Tab) && (g.IO.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard); + // Start CTRL+Tab or Square+L/R window selection + // (g.ConfigNavWindowingKeyNext/g.ConfigNavWindowingKeyPrev defaults are ImGuiMod_Ctrl|ImGuiKey_Tab and ImGuiMod_Ctrl|ImGuiMod_Shift|ImGuiKey_Tab) + const ImGuiID owner_id = ImHashStr("##NavUpdateWindowing"); + const bool nav_gamepad_active = (io.ConfigFlags & ImGuiConfigFlags_NavEnableGamepad) != 0 && (io.BackendFlags & ImGuiBackendFlags_HasGamepad) != 0; + const bool nav_keyboard_active = (io.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard) != 0; + const bool keyboard_next_window = allow_windowing && g.ConfigNavWindowingKeyNext && Shortcut(g.ConfigNavWindowingKeyNext, ImGuiInputFlags_Repeat | ImGuiInputFlags_RouteAlways, owner_id); + const bool keyboard_prev_window = allow_windowing && g.ConfigNavWindowingKeyPrev && Shortcut(g.ConfigNavWindowingKeyPrev, ImGuiInputFlags_Repeat | ImGuiInputFlags_RouteAlways, owner_id); + const bool start_windowing_with_gamepad = allow_windowing && nav_gamepad_active && !g.NavWindowingTarget && IsKeyPressed(ImGuiKey_NavGamepadMenu, ImGuiInputFlags_None); + const bool start_windowing_with_keyboard = allow_windowing && !g.NavWindowingTarget && (keyboard_next_window || keyboard_prev_window); // Note: enabled even without NavEnableKeyboard! + bool just_started_windowing_from_null_focus = false; if (start_windowing_with_gamepad || start_windowing_with_keyboard) if (ImGuiWindow* window = g.NavWindow ? g.NavWindow : FindWindowNavFocusable(g.WindowsFocusOrder.Size - 1, -INT_MAX, -1)) { - g.NavWindowingTarget = g.NavWindowingTargetAnim = window; + g.NavWindowingTarget = g.NavWindowingTargetAnim = window->RootWindow; // Current location g.NavWindowingTimer = g.NavWindowingHighlightAlpha = 0.0f; - g.NavWindowingToggleLayer = start_windowing_with_keyboard ? false : true; - g.NavInputSource = start_windowing_with_keyboard ? ImGuiInputSource_NavKeyboard : ImGuiInputSource_NavGamepad; + g.NavWindowingAccumDeltaPos = g.NavWindowingAccumDeltaSize = ImVec2(0.0f, 0.0f); + g.NavWindowingToggleLayer = start_windowing_with_gamepad ? true : false; // Gamepad starts toggling layer + g.NavInputSource = start_windowing_with_keyboard ? ImGuiInputSource_Keyboard : ImGuiInputSource_Gamepad; + if (g.NavWindow == NULL) + just_started_windowing_from_null_focus = true; + + // Manually register ownership of our mods. Using a global route in the Shortcut() calls instead would probably be correct but may have more side-effects. + if (keyboard_next_window || keyboard_prev_window) + SetKeyOwnersForKeyChord((g.ConfigNavWindowingKeyNext | g.ConfigNavWindowingKeyPrev) & ImGuiMod_Mask_, owner_id); } // Gamepad update - g.NavWindowingTimer += g.IO.DeltaTime; - if (g.NavWindowingTarget && g.NavInputSource == ImGuiInputSource_NavGamepad) + g.NavWindowingTimer += io.DeltaTime; + if (g.NavWindowingTarget && g.NavInputSource == ImGuiInputSource_Gamepad) { // Highlight only appears after a brief time holding the button, so that a fast tap on PadMenu (to toggle NavLayer) doesn't add visual noise g.NavWindowingHighlightAlpha = ImMax(g.NavWindowingHighlightAlpha, ImSaturate((g.NavWindowingTimer - NAV_WINDOWING_HIGHLIGHT_DELAY) / 0.05f)); // Select window to focus - const int focus_change_dir = (int)IsNavInputPressed(ImGuiNavInput_FocusPrev, ImGuiInputReadMode_RepeatSlow) - (int)IsNavInputPressed(ImGuiNavInput_FocusNext, ImGuiInputReadMode_RepeatSlow); - if (focus_change_dir != 0) + const int focus_change_dir = (int)IsKeyPressed(ImGuiKey_GamepadL1) - (int)IsKeyPressed(ImGuiKey_GamepadR1); + if (focus_change_dir != 0 && !just_started_windowing_from_null_focus) { - NavUpdateWindowingHighlightWindow(focus_change_dir); + NavUpdateWindowingTarget(focus_change_dir); g.NavWindowingHighlightAlpha = 1.0f; } // Single press toggles NavLayer, long press with L/R apply actual focus on release (until then the window was merely rendered top-most) - if (!IsNavInputDown(ImGuiNavInput_Menu)) + if (!IsKeyDown(ImGuiKey_NavGamepadMenu)) { g.NavWindowingToggleLayer &= (g.NavWindowingHighlightAlpha < 1.0f); // Once button was held long enough we don't consider it a tap-to-toggle-layer press anymore. if (g.NavWindowingToggleLayer && g.NavWindow) @@ -8752,68 +14520,91 @@ static void ImGui::NavUpdateWindowing() } // Keyboard: Focus - if (g.NavWindowingTarget && g.NavInputSource == ImGuiInputSource_NavKeyboard) + if (g.NavWindowingTarget && g.NavInputSource == ImGuiInputSource_Keyboard) { // Visuals only appears after a brief time after pressing TAB the first time, so that a fast CTRL+TAB doesn't add visual noise + ImGuiKeyChord shared_mods = ((g.ConfigNavWindowingKeyNext ? g.ConfigNavWindowingKeyNext : ImGuiMod_Mask_) & (g.ConfigNavWindowingKeyPrev ? g.ConfigNavWindowingKeyPrev : ImGuiMod_Mask_)) & ImGuiMod_Mask_; + IM_ASSERT(shared_mods != 0); // Next/Prev shortcut currently needs a shared modifier to "hold", otherwise Prev actions would keep cycling between two windows. g.NavWindowingHighlightAlpha = ImMax(g.NavWindowingHighlightAlpha, ImSaturate((g.NavWindowingTimer - NAV_WINDOWING_HIGHLIGHT_DELAY) / 0.05f)); // 1.0f - if (IsKeyPressedMap(ImGuiKey_Tab, true)) - NavUpdateWindowingHighlightWindow(g.IO.KeyShift ? +1 : -1); - if (!g.IO.KeyCtrl) + if ((keyboard_next_window || keyboard_prev_window) && !just_started_windowing_from_null_focus) + NavUpdateWindowingTarget(keyboard_next_window ? -1 : +1); + else if ((io.KeyMods & shared_mods) != shared_mods) apply_focus_window = g.NavWindowingTarget; } // Keyboard: Press and Release ALT to toggle menu layer - // FIXME: We lack an explicit IO variable for "is the imgui window focused", so compare mouse validity to detect the common case of back-end clearing releases all keys on ALT-TAB - if (IsNavInputPressed(ImGuiNavInput_KeyMenu_, ImGuiInputReadMode_Pressed)) - g.NavWindowingToggleLayer = true; - if ((g.ActiveId == 0 || g.ActiveIdAllowOverlap) && g.NavWindowingToggleLayer && IsNavInputPressed(ImGuiNavInput_KeyMenu_, ImGuiInputReadMode_Released)) - if (IsMousePosValid(&g.IO.MousePos) == IsMousePosValid(&g.IO.MousePosPrev)) - apply_toggle_layer = true; + const ImGuiKey windowing_toggle_keys[] = { ImGuiKey_LeftAlt, ImGuiKey_RightAlt }; + bool windowing_toggle_layer_start = false; + if (g.NavWindow != NULL && !(g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs)) + for (ImGuiKey windowing_toggle_key : windowing_toggle_keys) + if (nav_keyboard_active && IsKeyPressed(windowing_toggle_key, 0, ImGuiKeyOwner_NoOwner)) + { + windowing_toggle_layer_start = true; + g.NavWindowingToggleLayer = true; + g.NavWindowingToggleKey = windowing_toggle_key; + g.NavInputSource = ImGuiInputSource_Keyboard; + break; + } + if (g.NavWindowingToggleLayer && g.NavInputSource == ImGuiInputSource_Keyboard) + { + // We cancel toggling nav layer when any text has been typed (generally while holding Alt). (See #370) + // We cancel toggling nav layer when other modifiers are pressed. (See #4439) + // - AltGR is Alt+Ctrl on some layout but we can't reliably detect it (not all backends/systems/layout emit it as Alt+Ctrl). + // We cancel toggling nav layer if an owner has claimed the key. + if (io.InputQueueCharacters.Size > 0 || io.KeyCtrl || io.KeyShift || io.KeySuper) + g.NavWindowingToggleLayer = false; + else if (windowing_toggle_layer_start == false && g.LastKeyboardKeyPressTime == g.Time) + g.NavWindowingToggleLayer = false; + else if (TestKeyOwner(g.NavWindowingToggleKey, ImGuiKeyOwner_NoOwner) == false || TestKeyOwner(ImGuiMod_Alt, ImGuiKeyOwner_NoOwner) == false) + g.NavWindowingToggleLayer = false; + + // Apply layer toggle on Alt release + // Important: as before version <18314 we lacked an explicit IO event for focus gain/loss, we also compare mouse validity to detect old backends clearing mouse pos on focus loss. + if (IsKeyReleased(g.NavWindowingToggleKey) && g.NavWindowingToggleLayer) + if (g.ActiveId == 0 || g.ActiveIdAllowOverlap) + if (IsMousePosValid(&io.MousePos) == IsMousePosValid(&io.MousePosPrev)) + apply_toggle_layer = true; + if (!IsKeyDown(g.NavWindowingToggleKey)) + g.NavWindowingToggleLayer = false; + } // Move window if (g.NavWindowingTarget && !(g.NavWindowingTarget->Flags & ImGuiWindowFlags_NoMove)) { - ImVec2 move_delta; - if (g.NavInputSource == ImGuiInputSource_NavKeyboard && !g.IO.KeyShift) - move_delta = GetNavInputAmount2d(ImGuiNavDirSourceFlags_Keyboard, ImGuiInputReadMode_Down); - if (g.NavInputSource == ImGuiInputSource_NavGamepad) - move_delta = GetNavInputAmount2d(ImGuiNavDirSourceFlags_PadLStick, ImGuiInputReadMode_Down); - if (move_delta.x != 0.0f || move_delta.y != 0.0f) + ImVec2 nav_move_dir; + if (g.NavInputSource == ImGuiInputSource_Keyboard && !io.KeyShift) + nav_move_dir = GetKeyMagnitude2d(ImGuiKey_LeftArrow, ImGuiKey_RightArrow, ImGuiKey_UpArrow, ImGuiKey_DownArrow); + if (g.NavInputSource == ImGuiInputSource_Gamepad) + nav_move_dir = GetKeyMagnitude2d(ImGuiKey_GamepadLStickLeft, ImGuiKey_GamepadLStickRight, ImGuiKey_GamepadLStickUp, ImGuiKey_GamepadLStickDown); + if (nav_move_dir.x != 0.0f || nav_move_dir.y != 0.0f) { const float NAV_MOVE_SPEED = 800.0f; - const float move_speed = ImFloor(NAV_MOVE_SPEED * g.IO.DeltaTime * ImMin(g.IO.DisplayFramebufferScale.x, g.IO.DisplayFramebufferScale.y)); // FIXME: Doesn't code variable framerate very well - SetWindowPos(g.NavWindowingTarget->RootWindow, g.NavWindowingTarget->RootWindow->Pos + move_delta * move_speed, ImGuiCond_Always); - g.NavDisableMouseHover = true; - MarkIniSettingsDirty(g.NavWindowingTarget); + const float move_step = NAV_MOVE_SPEED * io.DeltaTime * ImMin(io.DisplayFramebufferScale.x, io.DisplayFramebufferScale.y); + g.NavWindowingAccumDeltaPos += nav_move_dir * move_step; + g.NavHighlightItemUnderNav = true; + ImVec2 accum_floored = ImTrunc(g.NavWindowingAccumDeltaPos); + if (accum_floored.x != 0.0f || accum_floored.y != 0.0f) + { + ImGuiWindow* moving_window = g.NavWindowingTarget->RootWindowDockTree; + SetWindowPos(moving_window, moving_window->Pos + accum_floored, ImGuiCond_Always); + g.NavWindowingAccumDeltaPos -= accum_floored; + } } } // Apply final focus - if (apply_focus_window && (g.NavWindow == NULL || apply_focus_window != g.NavWindow->RootWindow)) - { - ClearActiveID(); - g.NavDisableHighlight = false; - g.NavDisableMouseHover = true; - apply_focus_window = NavRestoreLastChildNavWindow(apply_focus_window); - ClosePopupsOverWindow(apply_focus_window, false); - FocusWindow(apply_focus_window); - if (apply_focus_window->NavLastIds[0] == 0) - NavInitWindow(apply_focus_window, false); - - // If the window only has a menu layer, select it directly - if (apply_focus_window->DC.NavLayerActiveMask == (1 << ImGuiNavLayer_Menu)) - g.NavLayer = ImGuiNavLayer_Menu; - } if (apply_focus_window) - g.NavWindowingTarget = NULL; + NavUpdateWindowingApplyFocus(apply_focus_window); // Apply menu/layer toggle if (apply_toggle_layer && g.NavWindow) { + ClearActiveID(); + // Move to parent menu if necessary ImGuiWindow* new_nav_window = g.NavWindow; while (new_nav_window->ParentWindow - && (new_nav_window->DC.NavLayerActiveMask & (1 << ImGuiNavLayer_Menu)) == 0 + && (new_nav_window->DC.NavLayersActiveMask & (1 << ImGuiNavLayer_Menu)) == 0 && (new_nav_window->Flags & ImGuiWindowFlags_ChildWindow) != 0 && (new_nav_window->Flags & (ImGuiWindowFlags_Popup | ImGuiWindowFlags_ChildMenu)) == 0) new_nav_window = new_nav_window->ParentWindow; @@ -8823,12 +14614,18 @@ static void ImGui::NavUpdateWindowing() FocusWindow(new_nav_window); new_nav_window->NavLastChildNavWindow = old_nav_window; } - g.NavDisableHighlight = false; - g.NavDisableMouseHover = true; - // When entering a regular menu bar with the Alt key, we always reinitialize the navigation ID. - const ImGuiNavLayer new_nav_layer = (g.NavWindow->DC.NavLayerActiveMask & (1 << ImGuiNavLayer_Menu)) ? (ImGuiNavLayer)((int)g.NavLayer ^ 1) : ImGuiNavLayer_Main; - NavRestoreLayer(new_nav_layer); + // Toggle layer + const ImGuiNavLayer new_nav_layer = (g.NavWindow->DC.NavLayersActiveMask & (1 << ImGuiNavLayer_Menu)) ? (ImGuiNavLayer)((int)g.NavLayer ^ 1) : ImGuiNavLayer_Main; + if (new_nav_layer != g.NavLayer) + { + // Reinitialize navigation when entering menu bar with the Alt key (FIXME: could be a properly of the layer?) + const bool preserve_layer_1_nav_id = (new_nav_window->DockNodeAsHost != NULL); + if (new_nav_layer == ImGuiNavLayer_Menu && !preserve_layer_1_nav_id) + g.NavWindow->NavLastIds[new_nav_layer] = 0; + NavRestoreLayer(new_nav_layer); + SetNavCursorVisibleAfterMove(); + } } } @@ -8836,10 +14633,12 @@ static void ImGui::NavUpdateWindowing() static const char* GetFallbackWindowNameForWindowingList(ImGuiWindow* window) { if (window->Flags & ImGuiWindowFlags_Popup) - return "(Popup)"; + return ImGui::LocalizeGetMsg(ImGuiLocKey_WindowingPopup); if ((window->Flags & ImGuiWindowFlags_MenuBar) && strcmp(window->Name, "##MainMenuBar") == 0) - return "(Main menu bar)"; - return "(Untitled)"; + return ImGui::LocalizeGetMsg(ImGuiLocKey_WindowingMainMenuBar); + if (window->DockNodeAsHost) + return "(Dock node)"; // Not normally shown to user. + return ImGui::LocalizeGetMsg(ImGuiLocKey_WindowingUntitled); } // Overlay displayed when using CTRL+TAB. Called by EndFrame(). @@ -8851,15 +14650,19 @@ void ImGui::NavUpdateWindowingOverlay() if (g.NavWindowingTimer < NAV_WINDOWING_LIST_APPEAR_DELAY) return; - if (g.NavWindowingList == NULL) - g.NavWindowingList = FindWindowByName("###NavWindowingList"); - SetNextWindowSizeConstraints(ImVec2(g.IO.DisplaySize.x * 0.20f, g.IO.DisplaySize.y * 0.20f), ImVec2(FLT_MAX, FLT_MAX)); - SetNextWindowPos(g.IO.DisplaySize * 0.5f, ImGuiCond_Always, ImVec2(0.5f, 0.5f)); + if (g.NavWindowingListWindow == NULL) + g.NavWindowingListWindow = FindWindowByName("##NavWindowingOverlay"); + const ImGuiViewport* viewport = /*g.NavWindow ? g.NavWindow->Viewport :*/ GetMainViewport(); + SetNextWindowSizeConstraints(ImVec2(viewport->Size.x * 0.20f, viewport->Size.y * 0.20f), ImVec2(FLT_MAX, FLT_MAX)); + SetNextWindowPos(viewport->GetCenter(), ImGuiCond_Always, ImVec2(0.5f, 0.5f)); PushStyleVar(ImGuiStyleVar_WindowPadding, g.Style.WindowPadding * 2.0f); - Begin("###NavWindowingList", NULL, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoSavedSettings); + Begin("##NavWindowingOverlay", NULL, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoSavedSettings); + if (g.ContextName[0] != 0) + SeparatorText(g.ContextName); for (int n = g.WindowsFocusOrder.Size - 1; n >= 0; n--) { ImGuiWindow* window = g.WindowsFocusOrder[n]; + IM_ASSERT(window != NULL); // Fix static analyzers if (!IsWindowNavFocusable(window)) continue; const char* label = window->Name; @@ -8871,14 +14674,21 @@ void ImGui::NavUpdateWindowingOverlay() PopStyleVar(); } - //----------------------------------------------------------------------------- // [SECTION] DRAG AND DROP //----------------------------------------------------------------------------- +bool ImGui::IsDragDropActive() +{ + ImGuiContext& g = *GImGui; + return g.DragDropActive; +} + void ImGui::ClearDragDrop() { ImGuiContext& g = *GImGui; + if (g.DragDropActive) + IMGUI_DEBUG_LOG_ACTIVEID("[dragdrop] ClearDragDrop()\n"); g.DragDropActive = false; g.DragDropPayload.Clear(); g.DragDropAcceptFlags = ImGuiDragDropFlags_None; @@ -8890,45 +14700,71 @@ void ImGui::ClearDragDrop() memset(&g.DragDropPayloadBufLocal, 0, sizeof(g.DragDropPayloadBufLocal)); } -// Call when current ID is active. +bool ImGui::BeginTooltipHidden() +{ + ImGuiContext& g = *GImGui; + bool ret = Begin("##Tooltip_Hidden", NULL, ImGuiWindowFlags_Tooltip | ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_AlwaysAutoResize); + SetWindowHiddenAndSkipItemsForCurrentFrame(g.CurrentWindow); + return ret; +} + // When this returns true you need to: a) call SetDragDropPayload() exactly once, b) you may render the payload visual/description, c) call EndDragDropSource() +// If the item has an identifier: +// - This assume/require the item to be activated (typically via ButtonBehavior). +// - Therefore if you want to use this with a mouse button other than left mouse button, it is up to the item itself to activate with another button. +// - We then pull and use the mouse button that was used to activate the item and use it to carry on the drag. +// If the item has no identifier: +// - Currently always assume left mouse button. bool ImGui::BeginDragDropSource(ImGuiDragDropFlags flags) { ImGuiContext& g = *GImGui; ImGuiWindow* window = g.CurrentWindow; + // FIXME-DRAGDROP: While in the common-most "drag from non-zero active id" case we can tell the mouse button, + // in both SourceExtern and id==0 cases we may requires something else (explicit flags or some heuristic). + ImGuiMouseButton mouse_button = ImGuiMouseButton_Left; + bool source_drag_active = false; ImGuiID source_id = 0; ImGuiID source_parent_id = 0; - int mouse_button = 0; - if (!(flags & ImGuiDragDropFlags_SourceExtern)) + if ((flags & ImGuiDragDropFlags_SourceExtern) == 0) { - source_id = window->DC.LastItemId; - if (source_id != 0 && g.ActiveId != source_id) // Early out for most common case - return false; - if (g.IO.MouseDown[mouse_button] == false) - return false; - - if (source_id == 0) + source_id = g.LastItemData.ID; + if (source_id != 0) { + // Common path: items with ID + if (g.ActiveId != source_id) + return false; + if (g.ActiveIdMouseButton != -1) + mouse_button = g.ActiveIdMouseButton; + if (g.IO.MouseDown[mouse_button] == false || window->SkipItems) + return false; + g.ActiveIdAllowOverlap = false; + } + else + { + // Uncommon path: items without ID + if (g.IO.MouseDown[mouse_button] == false || window->SkipItems) + return false; + if ((g.LastItemData.StatusFlags & ImGuiItemStatusFlags_HoveredRect) == 0 && (g.ActiveId == 0 || g.ActiveIdWindow != window)) + return false; + // If you want to use BeginDragDropSource() on an item with no unique identifier for interaction, such as Text() or Image(), you need to: - // A) Read the explanation below, B) Use the ImGuiDragDropFlags_SourceAllowNullID flag, C) Swallow your programmer pride. + // A) Read the explanation below, B) Use the ImGuiDragDropFlags_SourceAllowNullID flag. if (!(flags & ImGuiDragDropFlags_SourceAllowNullID)) { IM_ASSERT(0); return false; } - // Early out - if ((window->DC.LastItemStatusFlags & ImGuiItemStatusFlags_HoveredRect) == 0 && (g.ActiveId == 0 || g.ActiveIdWindow != window)) - return false; - - // Magic fallback (=somehow reprehensible) to handle items with no assigned ID, e.g. Text(), Image() + // Magic fallback to handle items with no assigned ID, e.g. Text(), Image() // We build a throwaway ID based on current ID stack + relative AABB of items in window. - // THE IDENTIFIER WON'T SURVIVE ANY REPOSITIONING OF THE WIDGET, so if your widget moves your dragging operation will be canceled. + // THE IDENTIFIER WON'T SURVIVE ANY REPOSITIONING/RESIZINGG OF THE WIDGET, so if your widget moves your dragging operation will be canceled. // We don't need to maintain/call ClearActiveID() as releasing the button will early out this function and trigger !ActiveIdIsAlive. - source_id = window->DC.LastItemId = window->GetIDFromRectangle(window->DC.LastItemRect); - bool is_hovered = ItemHoverable(window->DC.LastItemRect, source_id); + // Rely on keeping other window->LastItemXXX fields intact. + source_id = g.LastItemData.ID = window->GetIDFromRectangle(g.LastItemData.Rect); + KeepAliveID(source_id); + bool is_hovered = ItemHoverable(g.LastItemData.Rect, source_id, g.LastItemData.ItemFlags); if (is_hovered && g.IO.MouseClicked[mouse_button]) { SetActiveID(source_id, window); @@ -8937,64 +14773,72 @@ bool ImGui::BeginDragDropSource(ImGuiDragDropFlags flags) if (g.ActiveId == source_id) // Allow the underlying widget to display/return hovered during the mouse release frame, else we would get a flicker. g.ActiveIdAllowOverlap = is_hovered; } - else - { - g.ActiveIdAllowOverlap = false; - } if (g.ActiveId != source_id) return false; source_parent_id = window->IDStack.back(); source_drag_active = IsMouseDragging(mouse_button); + + // Disable navigation and key inputs while dragging + cancel existing request if any + SetActiveIdUsingAllKeyboardKeys(); } else { + // When ImGuiDragDropFlags_SourceExtern is set: window = NULL; source_id = ImHashStr("#SourceExtern"); source_drag_active = true; + mouse_button = g.IO.MouseDown[0] ? 0 : -1; + KeepAliveID(source_id); + SetActiveID(source_id, NULL); } - if (source_drag_active) + IM_ASSERT(g.DragDropWithinTarget == false); // Can't nest BeginDragDropSource() and BeginDragDropTarget() + if (!source_drag_active) + return false; + + // Activate drag and drop + if (!g.DragDropActive) { - if (!g.DragDropActive) - { - IM_ASSERT(source_id != 0); - ClearDragDrop(); - ImGuiPayload& payload = g.DragDropPayload; - payload.SourceId = source_id; - payload.SourceParentId = source_parent_id; - g.DragDropActive = true; - g.DragDropSourceFlags = flags; - g.DragDropMouseButton = mouse_button; - } - g.DragDropSourceFrameCount = g.FrameCount; - g.DragDropWithinSourceOrTarget = true; - - if (!(flags & ImGuiDragDropFlags_SourceNoPreviewTooltip)) - { - // Target can request the Source to not display its tooltip (we use a dedicated flag to make this request explicit) - // We unfortunately can't just modify the source flags and skip the call to BeginTooltip, as caller may be emitting contents. - BeginTooltip(); - if (g.DragDropAcceptIdPrev && (g.DragDropAcceptFlags & ImGuiDragDropFlags_AcceptNoPreviewTooltip)) - { - ImGuiWindow* tooltip_window = g.CurrentWindow; - tooltip_window->SkipItems = true; - tooltip_window->HiddenFramesCanSkipItems = 1; - } - } - - if (!(flags & ImGuiDragDropFlags_SourceNoDisableHover) && !(flags & ImGuiDragDropFlags_SourceExtern)) - window->DC.LastItemStatusFlags &= ~ImGuiItemStatusFlags_HoveredRect; - - return true; + IM_ASSERT(source_id != 0); + ClearDragDrop(); + IMGUI_DEBUG_LOG_ACTIVEID("[dragdrop] BeginDragDropSource() DragDropActive = true, source_id = 0x%08X%s\n", + source_id, (flags & ImGuiDragDropFlags_SourceExtern) ? " (EXTERN)" : ""); + ImGuiPayload& payload = g.DragDropPayload; + payload.SourceId = source_id; + payload.SourceParentId = source_parent_id; + g.DragDropActive = true; + g.DragDropSourceFlags = flags; + g.DragDropMouseButton = mouse_button; + if (payload.SourceId == g.ActiveId) + g.ActiveIdNoClearOnFocusLoss = true; } - return false; + g.DragDropSourceFrameCount = g.FrameCount; + g.DragDropWithinSource = true; + + if (!(flags & ImGuiDragDropFlags_SourceNoPreviewTooltip)) + { + // Target can request the Source to not display its tooltip (we use a dedicated flag to make this request explicit) + // We unfortunately can't just modify the source flags and skip the call to BeginTooltip, as caller may be emitting contents. + bool ret; + if (g.DragDropAcceptIdPrev && (g.DragDropAcceptFlags & ImGuiDragDropFlags_AcceptNoPreviewTooltip)) + ret = BeginTooltipHidden(); + else + ret = BeginTooltip(); + IM_ASSERT(ret); // FIXME-NEWBEGIN: If this ever becomes false, we need to Begin("##Hidden", NULL, ImGuiWindowFlags_NoSavedSettings) + SetWindowHiddendAndSkipItemsForCurrentFrame(). + IM_UNUSED(ret); + } + + if (!(flags & ImGuiDragDropFlags_SourceNoDisableHover) && !(flags & ImGuiDragDropFlags_SourceExtern)) + g.LastItemData.StatusFlags &= ~ImGuiItemStatusFlags_HoveredRect; + + return true; } void ImGui::EndDragDropSource() { ImGuiContext& g = *GImGui; IM_ASSERT(g.DragDropActive); - IM_ASSERT(g.DragDropWithinSourceOrTarget && "Not after a BeginDragDropSource()?"); + IM_ASSERT(g.DragDropWithinSource && "Not after a BeginDragDropSource()?"); if (!(g.DragDropSourceFlags & ImGuiDragDropFlags_SourceNoPreviewTooltip)) EndTooltip(); @@ -9002,7 +14846,7 @@ void ImGui::EndDragDropSource() // Discard the drag if have not called SetDragDropPayload() if (g.DragDropPayload.DataFrameCount == -1) ClearDragDrop(); - g.DragDropWithinSourceOrTarget = false; + g.DragDropWithinSource = false; } // Use 'cond' to choose to submit payload on drag start or every frame @@ -9014,10 +14858,10 @@ bool ImGui::SetDragDropPayload(const char* type, const void* data, size_t data_s cond = ImGuiCond_Always; IM_ASSERT(type != NULL); - IM_ASSERT(strlen(type) < IM_ARRAYSIZE(payload.DataType) && "Payload type can be at most 32 characters long"); + IM_ASSERT(ImStrlen(type) < IM_ARRAYSIZE(payload.DataType) && "Payload type can be at most 32 characters long"); IM_ASSERT((data != NULL && data_size > 0) || (data == NULL && data_size == 0)); IM_ASSERT(cond == ImGuiCond_Always || cond == ImGuiCond_Once); - IM_ASSERT(payload.SourceId != 0); // Not called between BeginDragDropSource() and EndDragDropSource() + IM_ASSERT(payload.SourceId != 0); // Not called between BeginDragDropSource() and EndDragDropSource() if (cond == ImGuiCond_Always || payload.DataFrameCount == -1) { @@ -9046,6 +14890,7 @@ bool ImGui::SetDragDropPayload(const char* type, const void* data, size_t data_s } payload.DataFrameCount = g.FrameCount; + // Return whether the payload has been accepted return (g.DragDropAcceptFrameCount == g.FrameCount) || (g.DragDropAcceptFrameCount == g.FrameCount - 1); } @@ -9056,7 +14901,8 @@ bool ImGui::BeginDragDropTargetCustom(const ImRect& bb, ImGuiID id) return false; ImGuiWindow* window = g.CurrentWindow; - if (g.HoveredWindow == NULL || window->RootWindow != g.HoveredWindow->RootWindow) + ImGuiWindow* hovered_window = g.HoveredWindowUnderMovingWindow; + if (hovered_window == NULL || window->RootWindowDockTree != hovered_window->RootWindowDockTree) return false; IM_ASSERT(id != 0); if (!IsMouseHoveringRect(bb.Min, bb.Max) || (id == g.DragDropPayload.SourceId)) @@ -9064,15 +14910,16 @@ bool ImGui::BeginDragDropTargetCustom(const ImRect& bb, ImGuiID id) if (window->SkipItems) return false; - IM_ASSERT(g.DragDropWithinSourceOrTarget == false); + IM_ASSERT(g.DragDropWithinTarget == false && g.DragDropWithinSource == false); // Can't nest BeginDragDropSource() and BeginDragDropTarget() g.DragDropTargetRect = bb; + g.DragDropTargetClipRect = window->ClipRect; // May want to be overridden by user depending on use case? g.DragDropTargetId = id; - g.DragDropWithinSourceOrTarget = true; + g.DragDropWithinTarget = true; return true; } // We don't use BeginDragDropTargetCustom() and duplicate its code because: -// 1) we use LastItemRectHoveredRect which handles items that pushes a temporarily clip rectangle in their code. Calling BeginDragDropTargetCustom(LastItemRect) would not handle them. +// 1) we use LastItemData's ImGuiItemStatusFlags_HoveredRect which handles items that push a temporarily clip rectangle in their code. Calling BeginDragDropTargetCustom(LastItemRect) would not handle them. // 2) and it's faster. as this code may be very frequently called, we want to early out as fast as we can. // Also note how the HoveredWindow test is positioned differently in both functions (in both functions we optimize for the cheapest early out case) bool ImGui::BeginDragDropTarget() @@ -9082,22 +14929,27 @@ bool ImGui::BeginDragDropTarget() return false; ImGuiWindow* window = g.CurrentWindow; - if (!(window->DC.LastItemStatusFlags & ImGuiItemStatusFlags_HoveredRect)) + if (!(g.LastItemData.StatusFlags & ImGuiItemStatusFlags_HoveredRect)) return false; - if (g.HoveredWindow == NULL || window->RootWindow != g.HoveredWindow->RootWindow) + ImGuiWindow* hovered_window = g.HoveredWindowUnderMovingWindow; + if (hovered_window == NULL || window->RootWindowDockTree != hovered_window->RootWindowDockTree || window->SkipItems) return false; - const ImRect& display_rect = (window->DC.LastItemStatusFlags & ImGuiItemStatusFlags_HasDisplayRect) ? window->DC.LastItemDisplayRect : window->DC.LastItemRect; - ImGuiID id = window->DC.LastItemId; + const ImRect& display_rect = (g.LastItemData.StatusFlags & ImGuiItemStatusFlags_HasDisplayRect) ? g.LastItemData.DisplayRect : g.LastItemData.Rect; + ImGuiID id = g.LastItemData.ID; if (id == 0) + { id = window->GetIDFromRectangle(display_rect); + KeepAliveID(id); + } if (g.DragDropPayload.SourceId == id) return false; - IM_ASSERT(g.DragDropWithinSourceOrTarget == false); + IM_ASSERT(g.DragDropWithinTarget == false && g.DragDropWithinSource == false); // Can't nest BeginDragDropSource() and BeginDragDropTarget() g.DragDropTargetRect = display_rect; + g.DragDropTargetClipRect = (g.LastItemData.StatusFlags & ImGuiItemStatusFlags_HasClipRect) ? g.LastItemData.ClipRect : window->ClipRect; g.DragDropTargetId = id; - g.DragDropWithinSourceOrTarget = true; + g.DragDropWithinTarget = true; return true; } @@ -9110,7 +14962,6 @@ bool ImGui::IsDragDropPayloadBeingAccepted() const ImGuiPayload* ImGui::AcceptDragDropPayload(const char* type, ImGuiDragDropFlags flags) { ImGuiContext& g = *GImGui; - ImGuiWindow* window = g.CurrentWindow; ImGuiPayload& payload = g.DragDropPayload; IM_ASSERT(g.DragDropActive); // Not called between BeginDragDropTarget() and EndDragDropTarget() ? IM_ASSERT(payload.DataFrameCount != -1); // Forgot to call EndDragDropTarget() ? @@ -9122,49 +14973,66 @@ const ImGuiPayload* ImGui::AcceptDragDropPayload(const char* type, ImGuiDragDrop const bool was_accepted_previously = (g.DragDropAcceptIdPrev == g.DragDropTargetId); ImRect r = g.DragDropTargetRect; float r_surface = r.GetWidth() * r.GetHeight(); - if (r_surface < g.DragDropAcceptIdCurrRectSurface) - { - g.DragDropAcceptFlags = flags; - g.DragDropAcceptIdCurr = g.DragDropTargetId; - g.DragDropAcceptIdCurrRectSurface = r_surface; - } + if (r_surface > g.DragDropAcceptIdCurrRectSurface) + return NULL; + + g.DragDropAcceptFlags = flags; + g.DragDropAcceptIdCurr = g.DragDropTargetId; + g.DragDropAcceptIdCurrRectSurface = r_surface; + //IMGUI_DEBUG_LOG("AcceptDragDropPayload(): %08X: accept\n", g.DragDropTargetId); // Render default drop visuals payload.Preview = was_accepted_previously; - flags |= (g.DragDropSourceFlags & ImGuiDragDropFlags_AcceptNoDrawDefaultRect); // Source can also inhibit the preview (useful for external sources that lives for 1 frame) + flags |= (g.DragDropSourceFlags & ImGuiDragDropFlags_AcceptNoDrawDefaultRect); // Source can also inhibit the preview (useful for external sources that live for 1 frame) if (!(flags & ImGuiDragDropFlags_AcceptNoDrawDefaultRect) && payload.Preview) - { - // FIXME-DRAG: Settle on a proper default visuals for drop target. - r.Expand(3.5f); - bool push_clip_rect = !window->ClipRect.Contains(r); - if (push_clip_rect) window->DrawList->PushClipRect(r.Min-ImVec2(1,1), r.Max+ImVec2(1,1)); - window->DrawList->AddRect(r.Min, r.Max, GetColorU32(ImGuiCol_DragDropTarget), 0.0f, ~0, 2.0f); - if (push_clip_rect) window->DrawList->PopClipRect(); - } + RenderDragDropTargetRect(r, g.DragDropTargetClipRect); g.DragDropAcceptFrameCount = g.FrameCount; - payload.Delivery = was_accepted_previously && !IsMouseDown(g.DragDropMouseButton); // For extern drag sources affecting os window focus, it's easier to just test !IsMouseDown() instead of IsMouseReleased() + if ((g.DragDropSourceFlags & ImGuiDragDropFlags_SourceExtern) && g.DragDropMouseButton == -1) + payload.Delivery = was_accepted_previously && (g.DragDropSourceFrameCount < g.FrameCount); + else + payload.Delivery = was_accepted_previously && !IsMouseDown(g.DragDropMouseButton); // For extern drag sources affecting OS window focus, it's easier to just test !IsMouseDown() instead of IsMouseReleased() if (!payload.Delivery && !(flags & ImGuiDragDropFlags_AcceptBeforeDelivery)) return NULL; + if (payload.Delivery) + IMGUI_DEBUG_LOG_ACTIVEID("[dragdrop] AcceptDragDropPayload(): 0x%08X: payload delivery\n", g.DragDropTargetId); return &payload; } +// FIXME-STYLE FIXME-DRAGDROP: Settle on a proper default visuals for drop target. +void ImGui::RenderDragDropTargetRect(const ImRect& bb, const ImRect& item_clip_rect) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + ImRect bb_display = bb; + bb_display.ClipWith(item_clip_rect); // Clip THEN expand so we have a way to visualize that target is not entirely visible. + bb_display.Expand(3.5f); + bool push_clip_rect = !window->ClipRect.Contains(bb_display); + if (push_clip_rect) + window->DrawList->PushClipRectFullScreen(); + window->DrawList->AddRect(bb_display.Min, bb_display.Max, GetColorU32(ImGuiCol_DragDropTarget), 0.0f, 0, 2.0f); + if (push_clip_rect) + window->DrawList->PopClipRect(); +} + const ImGuiPayload* ImGui::GetDragDropPayload() { ImGuiContext& g = *GImGui; - return g.DragDropActive ? &g.DragDropPayload : NULL; + return (g.DragDropActive && g.DragDropPayload.DataFrameCount != -1) ? &g.DragDropPayload : NULL; } -// We don't really use/need this now, but added it for the sake of consistency and because we might need it later. void ImGui::EndDragDropTarget() { ImGuiContext& g = *GImGui; IM_ASSERT(g.DragDropActive); - IM_ASSERT(g.DragDropWithinSourceOrTarget); - g.DragDropWithinSourceOrTarget = false; -} + IM_ASSERT(g.DragDropWithinTarget); + g.DragDropWithinTarget = false; + // Clear drag and drop state payload right after delivery + if (g.DragDropPayload.Delivery) + ClearDragDrop(); +} //----------------------------------------------------------------------------- // [SECTION] LOGGING/CAPTURING @@ -9174,6 +15042,20 @@ void ImGui::EndDragDropTarget() //----------------------------------------------------------------------------- // Pass text data straight to log (without being displayed) +static inline void LogTextV(ImGuiContext& g, const char* fmt, va_list args) +{ + if (g.LogFile) + { + g.LogBuffer.Buf.resize(0); + g.LogBuffer.appendfv(fmt, args); + ImFileWrite(g.LogBuffer.c_str(), sizeof(char), (ImU64)g.LogBuffer.size(), g.LogFile); + } + else + { + g.LogBuffer.appendfv(fmt, args); + } +} + void ImGui::LogText(const char* fmt, ...) { ImGuiContext& g = *GImGui; @@ -9182,88 +15064,117 @@ void ImGui::LogText(const char* fmt, ...) va_list args; va_start(args, fmt); - if (g.LogFile) - vfprintf(g.LogFile, fmt, args); - else - g.LogBuffer.appendfv(fmt, args); + LogTextV(g, fmt, args); va_end(args); } +void ImGui::LogTextV(const char* fmt, va_list args) +{ + ImGuiContext& g = *GImGui; + if (!g.LogEnabled) + return; + + LogTextV(g, fmt, args); +} + // Internal version that takes a position to decide on newline placement and pad items according to their depth. // We split text into individual lines to add current tree level padding +// FIXME: This code is a little complicated perhaps, considering simplifying the whole system. void ImGui::LogRenderedText(const ImVec2* ref_pos, const char* text, const char* text_end) { ImGuiContext& g = *GImGui; ImGuiWindow* window = g.CurrentWindow; + const char* prefix = g.LogNextPrefix; + const char* suffix = g.LogNextSuffix; + g.LogNextPrefix = g.LogNextSuffix = NULL; + if (!text_end) text_end = FindRenderedTextEnd(text, text_end); - const bool log_new_line = ref_pos && (ref_pos->y > g.LogLinePosY + 1); + const bool log_new_line = ref_pos && (ref_pos->y > g.LogLinePosY + g.Style.FramePadding.y + 1); if (ref_pos) g.LogLinePosY = ref_pos->y; if (log_new_line) + { + LogText(IM_NEWLINE); g.LogLineFirstItem = true; + } - const char* text_remaining = text; - if (g.LogDepthRef > window->DC.TreeDepth) // Re-adjust padding if we have popped out of our starting depth + if (prefix) + LogRenderedText(ref_pos, prefix, prefix + ImStrlen(prefix)); // Calculate end ourself to ensure "##" are included here. + + // Re-adjust padding if we have popped out of our starting depth + if (g.LogDepthRef > window->DC.TreeDepth) g.LogDepthRef = window->DC.TreeDepth; const int tree_depth = (window->DC.TreeDepth - g.LogDepthRef); + + const char* text_remaining = text; for (;;) { - // Split the string. Each new line (after a '\n') is followed by spacing corresponding to the current depth of our log entry. - // We don't add a trailing \n to allow a subsequent item on the same line to be captured. + // Split the string. Each new line (after a '\n') is followed by indentation corresponding to the current depth of our log entry. + // We don't add a trailing \n yet to allow a subsequent item on the same line to be captured. const char* line_start = text_remaining; const char* line_end = ImStreolRange(line_start, text_end); - const bool is_first_line = (line_start == text); const bool is_last_line = (line_end == text_end); - if (!is_last_line || (line_start != line_end)) + if (line_start != line_end || !is_last_line) { - const int char_count = (int)(line_end - line_start); - if (log_new_line || !is_first_line) - LogText(IM_NEWLINE "%*s%.*s", tree_depth * 4, "", char_count, line_start); - else if (g.LogLineFirstItem) - LogText("%*s%.*s", tree_depth * 4, "", char_count, line_start); - else - LogText(" %.*s", char_count, line_start); + const int line_length = (int)(line_end - line_start); + const int indentation = g.LogLineFirstItem ? tree_depth * 4 : 1; + LogText("%*s%.*s", indentation, "", line_length, line_start); g.LogLineFirstItem = false; + if (*line_end == '\n') + { + LogText(IM_NEWLINE); + g.LogLineFirstItem = true; + } } - else if (log_new_line) - { - // An empty "" string at a different Y position should output a carriage return. - LogText(IM_NEWLINE); - break; - } - if (is_last_line) break; text_remaining = line_end + 1; } + + if (suffix) + LogRenderedText(ref_pos, suffix, suffix + ImStrlen(suffix)); } // Start logging/capturing text output -void ImGui::LogBegin(ImGuiLogType type, int auto_open_depth) +void ImGui::LogBegin(ImGuiLogFlags flags, int auto_open_depth) { ImGuiContext& g = *GImGui; ImGuiWindow* window = g.CurrentWindow; IM_ASSERT(g.LogEnabled == false); - IM_ASSERT(g.LogFile == NULL); - IM_ASSERT(g.LogBuffer.empty()); - g.LogEnabled = true; - g.LogType = type; + IM_ASSERT(g.LogFile == NULL && g.LogBuffer.empty()); + IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiLogFlags_OutputMask_)); // Check that only 1 type flag is used + + g.LogEnabled = g.ItemUnclipByLog = true; + g.LogFlags = flags; + g.LogWindow = window; + g.LogNextPrefix = g.LogNextSuffix = NULL; g.LogDepthRef = window->DC.TreeDepth; g.LogDepthToExpand = ((auto_open_depth >= 0) ? auto_open_depth : g.LogDepthToExpandDefault); g.LogLinePosY = FLT_MAX; g.LogLineFirstItem = true; } +// Important: doesn't copy underlying data, use carefully (prefix/suffix must be in scope at the time of the next LogRenderedText) +void ImGui::LogSetNextTextDecoration(const char* prefix, const char* suffix) +{ + ImGuiContext& g = *GImGui; + g.LogNextPrefix = prefix; + g.LogNextSuffix = suffix; +} + void ImGui::LogToTTY(int auto_open_depth) { ImGuiContext& g = *GImGui; if (g.LogEnabled) return; - LogBegin(ImGuiLogType_TTY, auto_open_depth); + IM_UNUSED(auto_open_depth); +#ifndef IMGUI_DISABLE_TTY_FUNCTIONS + LogBegin(ImGuiLogFlags_OutputTTY, auto_open_depth); g.LogFile = stdout; +#endif } // Start logging/capturing text output to given file @@ -9280,14 +15191,14 @@ void ImGui::LogToFile(int auto_open_depth, const char* filename) filename = g.IO.LogFilename; if (!filename || !filename[0]) return; - FILE* f = ImFileOpen(filename, "ab"); - if (f == NULL) + ImFileHandle f = ImFileOpen(filename, "ab"); + if (!f) { IM_ASSERT(0); return; } - LogBegin(ImGuiLogType_File, auto_open_depth); + LogBegin(ImGuiLogFlags_OutputFile, auto_open_depth); g.LogFile = f; } @@ -9297,7 +15208,7 @@ void ImGui::LogToClipboard(int auto_open_depth) ImGuiContext& g = *GImGui; if (g.LogEnabled) return; - LogBegin(ImGuiLogType_Clipboard, auto_open_depth); + LogBegin(ImGuiLogFlags_OutputClipboard, auto_open_depth); } void ImGui::LogToBuffer(int auto_open_depth) @@ -9305,7 +15216,7 @@ void ImGui::LogToBuffer(int auto_open_depth) ImGuiContext& g = *GImGui; if (g.LogEnabled) return; - LogBegin(ImGuiLogType_Buffer, auto_open_depth); + LogBegin(ImGuiLogFlags_OutputBuffer, auto_open_depth); } void ImGui::LogFinish() @@ -9315,27 +15226,29 @@ void ImGui::LogFinish() return; LogText(IM_NEWLINE); - switch (g.LogType) + switch (g.LogFlags & ImGuiLogFlags_OutputMask_) { - case ImGuiLogType_TTY: + case ImGuiLogFlags_OutputTTY: +#ifndef IMGUI_DISABLE_TTY_FUNCTIONS fflush(g.LogFile); +#endif break; - case ImGuiLogType_File: - fclose(g.LogFile); + case ImGuiLogFlags_OutputFile: + ImFileClose(g.LogFile); break; - case ImGuiLogType_Buffer: + case ImGuiLogFlags_OutputBuffer: break; - case ImGuiLogType_Clipboard: + case ImGuiLogFlags_OutputClipboard: if (!g.LogBuffer.empty()) SetClipboardText(g.LogBuffer.begin()); break; - case ImGuiLogType_None: + default: IM_ASSERT(0); break; } - g.LogEnabled = false; - g.LogType = ImGuiLogType_None; + g.LogEnabled = g.ItemUnclipByLog = false; + g.LogFlags = ImGuiLogFlags_None; g.LogFile = NULL; g.LogBuffer.clear(); } @@ -9347,13 +15260,17 @@ void ImGui::LogButtons() ImGuiContext& g = *GImGui; PushID("LogButtons"); +#ifndef IMGUI_DISABLE_TTY_FUNCTIONS const bool log_to_tty = Button("Log To TTY"); SameLine(); +#else + const bool log_to_tty = false; +#endif const bool log_to_file = Button("Log To File"); SameLine(); const bool log_to_clipboard = Button("Log To Clipboard"); SameLine(); - PushAllowKeyboardFocus(false); + PushItemFlag(ImGuiItemFlags_NoTabStop, true); SetNextItemWidth(80.0f); SliderInt("Default Depth", &g.LogDepthToExpandDefault, 0, 9, NULL); - PopAllowKeyboardFocus(); + PopItemFlag(); PopID(); // Start logging at the end of the function so that the buttons don't appear in the log @@ -9368,6 +15285,49 @@ void ImGui::LogButtons() //----------------------------------------------------------------------------- // [SECTION] SETTINGS //----------------------------------------------------------------------------- +// - UpdateSettings() [Internal] +// - MarkIniSettingsDirty() [Internal] +// - FindSettingsHandler() [Internal] +// - ClearIniSettings() [Internal] +// - LoadIniSettingsFromDisk() +// - LoadIniSettingsFromMemory() +// - SaveIniSettingsToDisk() +// - SaveIniSettingsToMemory() +//----------------------------------------------------------------------------- +// - CreateNewWindowSettings() [Internal] +// - FindWindowSettingsByID() [Internal] +// - FindWindowSettingsByWindow() [Internal] +// - ClearWindowSettings() [Internal] +// - WindowSettingsHandler_***() [Internal] +//----------------------------------------------------------------------------- + +// Called by NewFrame() +void ImGui::UpdateSettings() +{ + // Load settings on first frame (if not explicitly loaded manually before) + ImGuiContext& g = *GImGui; + if (!g.SettingsLoaded) + { + IM_ASSERT(g.SettingsWindows.empty()); + if (g.IO.IniFilename) + LoadIniSettingsFromDisk(g.IO.IniFilename); + g.SettingsLoaded = true; + } + + // Save settings (with a delay after the last modification, so we don't spam disk too much) + if (g.SettingsDirtyTimer > 0.0f) + { + g.SettingsDirtyTimer -= g.IO.DeltaTime; + if (g.SettingsDirtyTimer <= 0.0f) + { + if (g.IO.IniFilename != NULL) + SaveIniSettingsToDisk(g.IO.IniFilename); + else + g.IO.WantSaveIniSettings = true; // Let user know they can call SaveIniSettingsToMemory(). user will need to clear io.WantSaveIniSettings themselves. + g.SettingsDirtyTimer = 0.0f; + } + } +} void ImGui::MarkIniSettingsDirty() { @@ -9384,36 +15344,38 @@ void ImGui::MarkIniSettingsDirty(ImGuiWindow* window) g.SettingsDirtyTimer = g.IO.IniSavingRate; } -ImGuiWindowSettings* ImGui::CreateNewWindowSettings(const char* name) +void ImGui::AddSettingsHandler(const ImGuiSettingsHandler* handler) { ImGuiContext& g = *GImGui; - g.SettingsWindows.push_back(ImGuiWindowSettings()); - ImGuiWindowSettings* settings = &g.SettingsWindows.back(); -#if !IMGUI_DEBUG_INI_SETTINGS - // Skip to the "###" marker if any. We don't skip past to match the behavior of GetID() - // Preserve the full string when IMGUI_DEBUG_INI_SETTINGS is set to make .ini inspection easier. - if (const char* p = strstr(name, "###")) - name = p; -#endif - settings->Name = ImStrdup(name); - settings->ID = ImHashStr(name); - return settings; + IM_ASSERT(FindSettingsHandler(handler->TypeName) == NULL); + g.SettingsHandlers.push_back(*handler); } -ImGuiWindowSettings* ImGui::FindWindowSettings(ImGuiID id) +void ImGui::RemoveSettingsHandler(const char* type_name) { ImGuiContext& g = *GImGui; - for (int i = 0; i != g.SettingsWindows.Size; i++) - if (g.SettingsWindows[i].ID == id) - return &g.SettingsWindows[i]; + if (ImGuiSettingsHandler* handler = FindSettingsHandler(type_name)) + g.SettingsHandlers.erase(handler); +} + +ImGuiSettingsHandler* ImGui::FindSettingsHandler(const char* type_name) +{ + ImGuiContext& g = *GImGui; + const ImGuiID type_hash = ImHashStr(type_name); + for (ImGuiSettingsHandler& handler : g.SettingsHandlers) + if (handler.TypeHash == type_hash) + return &handler; return NULL; } -ImGuiWindowSettings* ImGui::FindOrCreateWindowSettings(const char* name) +// Clear all settings (windows, tables, docking etc.) +void ImGui::ClearIniSettings() { - if (ImGuiWindowSettings* settings = FindWindowSettings(ImHashStr(name))) - return settings; - return CreateNewWindowSettings(name); + ImGuiContext& g = *GImGui; + g.SettingsIniData.clear(); + for (ImGuiSettingsHandler& handler : g.SettingsHandlers) + if (handler.ClearAllFn != NULL) + handler.ClearAllFn(&g, &handler); } void ImGui::LoadIniSettingsFromDisk(const char* ini_filename) @@ -9422,35 +15384,35 @@ void ImGui::LoadIniSettingsFromDisk(const char* ini_filename) char* file_data = (char*)ImFileLoadToMemory(ini_filename, "rb", &file_data_size); if (!file_data) return; - LoadIniSettingsFromMemory(file_data, (size_t)file_data_size); + if (file_data_size > 0) + LoadIniSettingsFromMemory(file_data, (size_t)file_data_size); IM_FREE(file_data); } -ImGuiSettingsHandler* ImGui::FindSettingsHandler(const char* type_name) -{ - ImGuiContext& g = *GImGui; - const ImGuiID type_hash = ImHashStr(type_name); - for (int handler_n = 0; handler_n < g.SettingsHandlers.Size; handler_n++) - if (g.SettingsHandlers[handler_n].TypeHash == type_hash) - return &g.SettingsHandlers[handler_n]; - return NULL; -} - // Zero-tolerance, no error reporting, cheap .ini parsing +// Set ini_size==0 to let us use strlen(ini_data). Do not call this function with a 0 if your buffer is actually empty! void ImGui::LoadIniSettingsFromMemory(const char* ini_data, size_t ini_size) { ImGuiContext& g = *GImGui; IM_ASSERT(g.Initialized); - IM_ASSERT(g.SettingsLoaded == false && g.FrameCount == 0); + //IM_ASSERT(!g.WithinFrameScope && "Cannot be called between NewFrame() and EndFrame()"); + //IM_ASSERT(g.SettingsLoaded == false && g.FrameCount == 0); // For user convenience, we allow passing a non zero-terminated string (hence the ini_size parameter). // For our convenience and to make the code simpler, we'll also write zero-terminators within the buffer. So let's create a writable copy.. if (ini_size == 0) - ini_size = strlen(ini_data); - char* buf = (char*)IM_ALLOC(ini_size + 1); - char* buf_end = buf + ini_size; + ini_size = ImStrlen(ini_data); + g.SettingsIniData.Buf.resize((int)ini_size + 1); + char* const buf = g.SettingsIniData.Buf.Data; + char* const buf_end = buf + ini_size; memcpy(buf, ini_data, ini_size); - buf[ini_size] = 0; + buf_end[0] = 0; + + // Call pre-read handlers + // Some types will clear their data (e.g. dock information) some types will allow merge/override (window) + for (ImGuiSettingsHandler& handler : g.SettingsHandlers) + if (handler.ReadInitFn != NULL) + handler.ReadInitFn(&g, &handler); void* entry_data = NULL; ImGuiSettingsHandler* entry_handler = NULL; @@ -9473,18 +15435,12 @@ void ImGui::LoadIniSettingsFromMemory(const char* ini_data, size_t ini_size) line_end[-1] = 0; const char* name_end = line_end - 1; const char* type_start = line + 1; - char* type_end = (char*)(intptr_t)ImStrchrRange(type_start, name_end, ']'); + char* type_end = (char*)(void*)ImStrchrRange(type_start, name_end, ']'); const char* name_start = type_end ? ImStrchrRange(type_end + 1, name_end, '[') : NULL; if (!type_end || !name_start) - { - name_start = type_start; // Import legacy entries that have no type - type_start = "Window"; - } - else - { - *type_end = 0; // Overwrite first ']' - name_start++; // Skip second '[' - } + continue; + *type_end = 0; // Overwrite first ']' + name_start++; // Skip second '[' entry_handler = FindSettingsHandler(type_start); entry_data = entry_handler ? entry_handler->ReadOpenFn(&g, entry_handler, name_start) : NULL; } @@ -9494,8 +15450,15 @@ void ImGui::LoadIniSettingsFromMemory(const char* ini_data, size_t ini_size) entry_handler->ReadLineFn(&g, entry_handler, entry_data, line); } } - IM_FREE(buf); g.SettingsLoaded = true; + + // [DEBUG] Restore untouched copy so it can be browsed in Metrics (not strictly necessary) + memcpy(buf, ini_data, ini_size); + + // Call post-read handlers + for (ImGuiSettingsHandler& handler : g.SettingsHandlers) + if (handler.ApplyAllFn != NULL) + handler.ApplyAllFn(&g, &handler); } void ImGui::SaveIniSettingsToDisk(const char* ini_filename) @@ -9507,11 +15470,11 @@ void ImGui::SaveIniSettingsToDisk(const char* ini_filename) size_t ini_data_size = 0; const char* ini_data = SaveIniSettingsToMemory(&ini_data_size); - FILE* f = ImFileOpen(ini_filename, "wt"); + ImFileHandle f = ImFileOpen(ini_filename, "wt"); if (!f) return; - fwrite(ini_data, sizeof(char), ini_data_size, f); - fclose(f); + ImFileWrite(ini_data, sizeof(char), ini_data_size, f); + ImFileClose(f); } // Call registered handlers (e.g. SettingsHandlerWindow_WriteAll() + custom handlers) to write their stuff into a text buffer @@ -9521,113 +15484,5195 @@ const char* ImGui::SaveIniSettingsToMemory(size_t* out_size) g.SettingsDirtyTimer = 0.0f; g.SettingsIniData.Buf.resize(0); g.SettingsIniData.Buf.push_back(0); - for (int handler_n = 0; handler_n < g.SettingsHandlers.Size; handler_n++) - { - ImGuiSettingsHandler* handler = &g.SettingsHandlers[handler_n]; - handler->WriteAllFn(&g, handler, &g.SettingsIniData); - } + for (ImGuiSettingsHandler& handler : g.SettingsHandlers) + handler.WriteAllFn(&g, &handler, &g.SettingsIniData); if (out_size) *out_size = (size_t)g.SettingsIniData.size(); return g.SettingsIniData.c_str(); } -static void* SettingsHandlerWindow_ReadOpen(ImGuiContext*, ImGuiSettingsHandler*, const char* name) +ImGuiWindowSettings* ImGui::CreateNewWindowSettings(const char* name) { - ImGuiWindowSettings* settings = ImGui::FindWindowSettings(ImHashStr(name)); - if (!settings) + ImGuiContext& g = *GImGui; + + if (g.IO.ConfigDebugIniSettings == false) + { + // Skip to the "###" marker if any. We don't skip past to match the behavior of GetID() + // Preserve the full string when ConfigDebugVerboseIniSettings is set to make .ini inspection easier. + if (const char* p = strstr(name, "###")) + name = p; + } + const size_t name_len = ImStrlen(name); + + // Allocate chunk + const size_t chunk_size = sizeof(ImGuiWindowSettings) + name_len + 1; + ImGuiWindowSettings* settings = g.SettingsWindows.alloc_chunk(chunk_size); + IM_PLACEMENT_NEW(settings) ImGuiWindowSettings(); + settings->ID = ImHashStr(name, name_len); + memcpy(settings->GetName(), name, name_len + 1); // Store with zero terminator + + return settings; +} + +// We don't provide a FindWindowSettingsByName() because Docking system doesn't always hold on names. +// This is called once per window .ini entry + once per newly instantiated window. +ImGuiWindowSettings* ImGui::FindWindowSettingsByID(ImGuiID id) +{ + ImGuiContext& g = *GImGui; + for (ImGuiWindowSettings* settings = g.SettingsWindows.begin(); settings != NULL; settings = g.SettingsWindows.next_chunk(settings)) + if (settings->ID == id && !settings->WantDelete) + return settings; + return NULL; +} + +// This is faster if you are holding on a Window already as we don't need to perform a search. +ImGuiWindowSettings* ImGui::FindWindowSettingsByWindow(ImGuiWindow* window) +{ + ImGuiContext& g = *GImGui; + if (window->SettingsOffset != -1) + return g.SettingsWindows.ptr_from_offset(window->SettingsOffset); + return FindWindowSettingsByID(window->ID); +} + +// This will revert window to its initial state, including enabling the ImGuiCond_FirstUseEver/ImGuiCond_Once conditions once more. +void ImGui::ClearWindowSettings(const char* name) +{ + //IMGUI_DEBUG_LOG("ClearWindowSettings('%s')\n", name); + ImGuiContext& g = *GImGui; + ImGuiWindow* window = FindWindowByName(name); + if (window != NULL) + { + window->Flags |= ImGuiWindowFlags_NoSavedSettings; + InitOrLoadWindowSettings(window, NULL); + if (window->DockId != 0) + DockContextProcessUndockWindow(&g, window, true); + } + if (ImGuiWindowSettings* settings = window ? FindWindowSettingsByWindow(window) : FindWindowSettingsByID(ImHashStr(name))) + settings->WantDelete = true; +} + +static void WindowSettingsHandler_ClearAll(ImGuiContext* ctx, ImGuiSettingsHandler*) +{ + ImGuiContext& g = *ctx; + for (ImGuiWindow* window : g.Windows) + window->SettingsOffset = -1; + g.SettingsWindows.clear(); +} + +static void* WindowSettingsHandler_ReadOpen(ImGuiContext*, ImGuiSettingsHandler*, const char* name) +{ + ImGuiID id = ImHashStr(name); + ImGuiWindowSettings* settings = ImGui::FindWindowSettingsByID(id); + if (settings) + *settings = ImGuiWindowSettings(); // Clear existing if recycling previous entry + else settings = ImGui::CreateNewWindowSettings(name); + settings->ID = id; + settings->WantApply = true; return (void*)settings; } -static void SettingsHandlerWindow_ReadLine(ImGuiContext*, ImGuiSettingsHandler*, void* entry, const char* line) +static void WindowSettingsHandler_ReadLine(ImGuiContext*, ImGuiSettingsHandler*, void* entry, const char* line) { ImGuiWindowSettings* settings = (ImGuiWindowSettings*)entry; int x, y; int i; - if (sscanf(line, "Pos=%i,%i", &x, &y) == 2) settings->Pos = ImVec2ih((short)x, (short)y); - else if (sscanf(line, "Size=%i,%i", &x, &y) == 2) settings->Size = ImVec2ih((short)x, (short)y); - else if (sscanf(line, "Collapsed=%d", &i) == 1) settings->Collapsed = (i != 0); + ImU32 u1; + if (sscanf(line, "Pos=%i,%i", &x, &y) == 2) { settings->Pos = ImVec2ih((short)x, (short)y); } + else if (sscanf(line, "Size=%i,%i", &x, &y) == 2) { settings->Size = ImVec2ih((short)x, (short)y); } + else if (sscanf(line, "ViewportId=0x%08X", &u1) == 1) { settings->ViewportId = u1; } + else if (sscanf(line, "ViewportPos=%i,%i", &x, &y) == 2){ settings->ViewportPos = ImVec2ih((short)x, (short)y); } + else if (sscanf(line, "Collapsed=%d", &i) == 1) { settings->Collapsed = (i != 0); } + else if (sscanf(line, "IsChild=%d", &i) == 1) { settings->IsChild = (i != 0); } + else if (sscanf(line, "DockId=0x%X,%d", &u1, &i) == 2) { settings->DockId = u1; settings->DockOrder = (short)i; } + else if (sscanf(line, "DockId=0x%X", &u1) == 1) { settings->DockId = u1; settings->DockOrder = -1; } + else if (sscanf(line, "ClassId=0x%X", &u1) == 1) { settings->ClassId = u1; } } -static void SettingsHandlerWindow_WriteAll(ImGuiContext* ctx, ImGuiSettingsHandler* handler, ImGuiTextBuffer* buf) +// Apply to existing windows (if any) +static void WindowSettingsHandler_ApplyAll(ImGuiContext* ctx, ImGuiSettingsHandler*) +{ + ImGuiContext& g = *ctx; + for (ImGuiWindowSettings* settings = g.SettingsWindows.begin(); settings != NULL; settings = g.SettingsWindows.next_chunk(settings)) + if (settings->WantApply) + { + if (ImGuiWindow* window = ImGui::FindWindowByID(settings->ID)) + ApplyWindowSettings(window, settings); + settings->WantApply = false; + } +} + +static void WindowSettingsHandler_WriteAll(ImGuiContext* ctx, ImGuiSettingsHandler* handler, ImGuiTextBuffer* buf) { // Gather data from windows that were active during this session // (if a window wasn't opened in this session we preserve its settings) ImGuiContext& g = *ctx; - for (int i = 0; i != g.Windows.Size; i++) + for (ImGuiWindow* window : g.Windows) { - ImGuiWindow* window = g.Windows[i]; if (window->Flags & ImGuiWindowFlags_NoSavedSettings) continue; - ImGuiWindowSettings* settings = (window->SettingsIdx != -1) ? &g.SettingsWindows[window->SettingsIdx] : ImGui::FindWindowSettings(window->ID); + ImGuiWindowSettings* settings = ImGui::FindWindowSettingsByWindow(window); if (!settings) { settings = ImGui::CreateNewWindowSettings(window->Name); - window->SettingsIdx = g.SettingsWindows.index_from_ptr(settings); + window->SettingsOffset = g.SettingsWindows.offset_from_ptr(settings); } IM_ASSERT(settings->ID == window->ID); - settings->Pos = ImVec2ih((short)window->Pos.x, (short)window->Pos.y); - settings->Size = ImVec2ih((short)window->SizeFull.x, (short)window->SizeFull.y); + settings->Pos = ImVec2ih(window->Pos - window->ViewportPos); + settings->Size = ImVec2ih(window->SizeFull); + settings->ViewportId = window->ViewportId; + settings->ViewportPos = ImVec2ih(window->ViewportPos); + IM_ASSERT(window->DockNode == NULL || window->DockNode->ID == window->DockId); + settings->DockId = window->DockId; + settings->ClassId = window->WindowClass.ClassId; + settings->DockOrder = window->DockOrder; settings->Collapsed = window->Collapsed; + settings->IsChild = (window->RootWindow != window); // Cannot rely on ImGuiWindowFlags_ChildWindow here as docked windows have this set. + settings->WantDelete = false; } // Write to text buffer - buf->reserve(buf->size() + g.SettingsWindows.Size * 96); // ballpark reserve - for (int i = 0; i != g.SettingsWindows.Size; i++) + buf->reserve(buf->size() + g.SettingsWindows.size() * 6); // ballpark reserve + for (ImGuiWindowSettings* settings = g.SettingsWindows.begin(); settings != NULL; settings = g.SettingsWindows.next_chunk(settings)) { - const ImGuiWindowSettings* settings = &g.SettingsWindows[i]; - buf->appendf("[%s][%s]\n", handler->TypeName, settings->Name); - buf->appendf("Pos=%d,%d\n", settings->Pos.x, settings->Pos.y); - buf->appendf("Size=%d,%d\n", settings->Size.x, settings->Size.y); - buf->appendf("Collapsed=%d\n", settings->Collapsed); - buf->appendf("\n"); + if (settings->WantDelete) + continue; + const char* settings_name = settings->GetName(); + buf->appendf("[%s][%s]\n", handler->TypeName, settings_name); + if (settings->IsChild) + { + buf->appendf("IsChild=1\n"); + buf->appendf("Size=%d,%d\n", settings->Size.x, settings->Size.y); + } + else + { + if (settings->ViewportId != 0 && settings->ViewportId != ImGui::IMGUI_VIEWPORT_DEFAULT_ID) + { + buf->appendf("ViewportPos=%d,%d\n", settings->ViewportPos.x, settings->ViewportPos.y); + buf->appendf("ViewportId=0x%08X\n", settings->ViewportId); + } + if (settings->Pos.x != 0 || settings->Pos.y != 0 || settings->ViewportId == ImGui::IMGUI_VIEWPORT_DEFAULT_ID) + buf->appendf("Pos=%d,%d\n", settings->Pos.x, settings->Pos.y); + if (settings->Size.x != 0 || settings->Size.y != 0) + buf->appendf("Size=%d,%d\n", settings->Size.x, settings->Size.y); + buf->appendf("Collapsed=%d\n", settings->Collapsed); + if (settings->DockId != 0) + { + //buf->appendf("TabId=0x%08X\n", ImHashStr("#TAB", 4, settings->ID)); // window->TabId: this is not read back but writing it makes "debugging" the .ini data easier. + if (settings->DockOrder == -1) + buf->appendf("DockId=0x%08X\n", settings->DockId); + else + buf->appendf("DockId=0x%08X,%d\n", settings->DockId, settings->DockOrder); + if (settings->ClassId != 0) + buf->appendf("ClassId=0x%08X\n", settings->ClassId); + } + } + buf->append("\n"); } } +//----------------------------------------------------------------------------- +// [SECTION] LOCALIZATION +//----------------------------------------------------------------------------- + +void ImGui::LocalizeRegisterEntries(const ImGuiLocEntry* entries, int count) +{ + ImGuiContext& g = *GImGui; + for (int n = 0; n < count; n++) + g.LocalizationTable[entries[n].Key] = entries[n].Text; +} //----------------------------------------------------------------------------- // [SECTION] VIEWPORTS, PLATFORM WINDOWS //----------------------------------------------------------------------------- +// - GetMainViewport() +// - FindViewportByID() +// - FindViewportByPlatformHandle() +// - SetCurrentViewport() [Internal] +// - SetWindowViewport() [Internal] +// - GetWindowAlwaysWantOwnViewport() [Internal] +// - UpdateTryMergeWindowIntoHostViewport() [Internal] +// - UpdateTryMergeWindowIntoHostViewports() [Internal] +// - TranslateWindowsInViewport() [Internal] +// - ScaleWindowsInViewport() [Internal] +// - FindHoveredViewportFromPlatformWindowStack() [Internal] +// - UpdateViewportsNewFrame() [Internal] +// - UpdateViewportsEndFrame() [Internal] +// - AddUpdateViewport() [Internal] +// - WindowSelectViewport() [Internal] +// - WindowSyncOwnedViewport() [Internal] +// - UpdatePlatformWindows() +// - RenderPlatformWindowsDefault() +// - FindPlatformMonitorForPos() [Internal] +// - FindPlatformMonitorForRect() [Internal] +// - UpdateViewportPlatformMonitor() [Internal] +// - DestroyPlatformWindow() [Internal] +// - DestroyPlatformWindows() +//----------------------------------------------------------------------------- -// (this section is filled in the 'docking' branch) +ImGuiViewport* ImGui::GetMainViewport() +{ + ImGuiContext& g = *GImGui; + return g.Viewports[0]; +} + +// FIXME: This leaks access to viewports not listed in PlatformIO.Viewports[]. Problematic? (#4236) +ImGuiViewport* ImGui::FindViewportByID(ImGuiID id) +{ + ImGuiContext& g = *GImGui; + for (ImGuiViewportP* viewport : g.Viewports) + if (viewport->ID == id) + return viewport; + return NULL; +} + +ImGuiViewport* ImGui::FindViewportByPlatformHandle(void* platform_handle) +{ + ImGuiContext& g = *GImGui; + for (ImGuiViewportP* viewport : g.Viewports) + if (viewport->PlatformHandle == platform_handle) + return viewport; + return NULL; +} + +void ImGui::SetCurrentViewport(ImGuiWindow* current_window, ImGuiViewportP* viewport) +{ + ImGuiContext& g = *GImGui; + (void)current_window; + + if (viewport) + viewport->LastFrameActive = g.FrameCount; + if (g.CurrentViewport == viewport) + return; + g.CurrentDpiScale = viewport ? viewport->DpiScale : 1.0f; + g.CurrentViewport = viewport; + IM_ASSERT(g.CurrentDpiScale > 0.0f && g.CurrentDpiScale < 99.0f); // Typical correct values would be between 1.0f and 4.0f + //IMGUI_DEBUG_LOG_VIEWPORT("[viewport] SetCurrentViewport changed '%s' 0x%08X\n", current_window ? current_window->Name : NULL, viewport ? viewport->ID : 0); + + // Notify platform layer of viewport changes + // FIXME-DPI: This is only currently used for experimenting with handling of multiple DPI + if (g.CurrentViewport && g.PlatformIO.Platform_OnChangedViewport) + g.PlatformIO.Platform_OnChangedViewport(g.CurrentViewport); +} + +void ImGui::SetWindowViewport(ImGuiWindow* window, ImGuiViewportP* viewport) +{ + // Abandon viewport + if (window->ViewportOwned && window->Viewport->Window == window) + window->Viewport->Size = ImVec2(0.0f, 0.0f); + + window->Viewport = viewport; + window->ViewportId = viewport->ID; + window->ViewportOwned = (viewport->Window == window); +} + +static bool ImGui::GetWindowAlwaysWantOwnViewport(ImGuiWindow* window) +{ + // Tooltips and menus are not automatically forced into their own viewport when the NoMerge flag is set, however the multiplication of viewports makes them more likely to protrude and create their own. + ImGuiContext& g = *GImGui; + if (g.IO.ConfigViewportsNoAutoMerge || (window->WindowClass.ViewportFlagsOverrideSet & ImGuiViewportFlags_NoAutoMerge)) + if (g.ConfigFlagsCurrFrame & ImGuiConfigFlags_ViewportsEnable) + if (!window->DockIsActive) + if ((window->Flags & (ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_ChildMenu | ImGuiWindowFlags_Tooltip)) == 0) + if ((window->Flags & ImGuiWindowFlags_Popup) == 0 || (window->Flags & ImGuiWindowFlags_Modal) != 0) + return true; + return false; +} + +static bool ImGui::UpdateTryMergeWindowIntoHostViewport(ImGuiWindow* window, ImGuiViewportP* viewport) +{ + ImGuiContext& g = *GImGui; + if (window->Viewport == viewport) + return false; + if ((viewport->Flags & ImGuiViewportFlags_CanHostOtherWindows) == 0) + return false; + if ((viewport->Flags & ImGuiViewportFlags_IsMinimized) != 0) + return false; + if (!viewport->GetMainRect().Contains(window->Rect())) + return false; + if (GetWindowAlwaysWantOwnViewport(window)) + return false; + + // FIXME: Can't use g.WindowsFocusOrder[] for root windows only as we care about Z order. If we maintained a DisplayOrder along with FocusOrder we could.. + for (ImGuiWindow* window_behind : g.Windows) + { + if (window_behind == window) + break; + if (window_behind->WasActive && window_behind->ViewportOwned && !(window_behind->Flags & ImGuiWindowFlags_ChildWindow)) + if (window_behind->Viewport->GetMainRect().Overlaps(window->Rect())) + return false; + } + + // Move to the existing viewport, Move child/hosted windows as well (FIXME-OPT: iterate child) + ImGuiViewportP* old_viewport = window->Viewport; + if (window->ViewportOwned) + for (int n = 0; n < g.Windows.Size; n++) + if (g.Windows[n]->Viewport == old_viewport) + SetWindowViewport(g.Windows[n], viewport); + SetWindowViewport(window, viewport); + BringWindowToDisplayFront(window); + + return true; +} + +// FIXME: handle 0 to N host viewports +static bool ImGui::UpdateTryMergeWindowIntoHostViewports(ImGuiWindow* window) +{ + ImGuiContext& g = *GImGui; + return UpdateTryMergeWindowIntoHostViewport(window, g.Viewports[0]); +} + +// Translate Dear ImGui windows when a Host Viewport has been moved +// (This additionally keeps windows at the same place when ImGuiConfigFlags_ViewportsEnable is toggled!) +void ImGui::TranslateWindowsInViewport(ImGuiViewportP* viewport, const ImVec2& old_pos, const ImVec2& new_pos, const ImVec2& old_size, const ImVec2& new_size) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(viewport->Window == NULL && (viewport->Flags & ImGuiViewportFlags_CanHostOtherWindows)); + + // 1) We test if ImGuiConfigFlags_ViewportsEnable was just toggled, which allows us to conveniently + // translate imgui windows from OS-window-local to absolute coordinates or vice-versa. + // 2) If it's not going to fit into the new size, keep it at same absolute position. + // One problem with this is that most Win32 applications doesn't update their render while dragging, + // and so the window will appear to teleport when releasing the mouse. + const bool translate_all_windows = (g.ConfigFlagsCurrFrame & ImGuiConfigFlags_ViewportsEnable) != (g.ConfigFlagsLastFrame & ImGuiConfigFlags_ViewportsEnable); + ImRect test_still_fit_rect(old_pos, old_pos + viewport->Size); + ImVec2 delta_pos = new_pos - old_pos; + for (ImGuiWindow* window : g.Windows) // FIXME-OPT + if (translate_all_windows || (window->Viewport == viewport && (old_size == new_size || test_still_fit_rect.Contains(window->Rect())))) + TranslateWindow(window, delta_pos); +} + +// Scale all windows (position, size). Use when e.g. changing DPI. (This is a lossy operation!) +void ImGui::ScaleWindowsInViewport(ImGuiViewportP* viewport, float scale) +{ + ImGuiContext& g = *GImGui; + if (viewport->Window) + { + ScaleWindow(viewport->Window, scale); + } + else + { + for (ImGuiWindow* window : g.Windows) + if (window->Viewport == viewport) + ScaleWindow(window, scale); + } +} + +// If the backend doesn't set MouseLastHoveredViewport or doesn't honor ImGuiViewportFlags_NoInputs, we do a search ourselves. +// A) It won't take account of the possibility that non-imgui windows may be in-between our dragged window and our target window. +// B) It requires Platform_GetWindowFocus to be implemented by backend. +ImGuiViewportP* ImGui::FindHoveredViewportFromPlatformWindowStack(const ImVec2& mouse_platform_pos) +{ + ImGuiContext& g = *GImGui; + ImGuiViewportP* best_candidate = NULL; + for (ImGuiViewportP* viewport : g.Viewports) + if (!(viewport->Flags & (ImGuiViewportFlags_NoInputs | ImGuiViewportFlags_IsMinimized)) && viewport->GetMainRect().Contains(mouse_platform_pos)) + if (best_candidate == NULL || best_candidate->LastFocusedStampCount < viewport->LastFocusedStampCount) + best_candidate = viewport; + return best_candidate; +} + +// Update viewports and monitor infos +// Note that this is running even if 'ImGuiConfigFlags_ViewportsEnable' is not set, in order to clear unused viewports (if any) and update monitor info. +static void ImGui::UpdateViewportsNewFrame() +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(g.PlatformIO.Viewports.Size <= g.Viewports.Size); + + // Update Minimized status (we need it first in order to decide if we'll apply Pos/Size of the main viewport) + // Update Focused status + const bool viewports_enabled = (g.ConfigFlagsCurrFrame & ImGuiConfigFlags_ViewportsEnable) != 0; + if (viewports_enabled) + { + ImGuiViewportP* focused_viewport = NULL; + for (ImGuiViewportP* viewport : g.Viewports) + { + const bool platform_funcs_available = viewport->PlatformWindowCreated; + if (g.PlatformIO.Platform_GetWindowMinimized && platform_funcs_available) + { + bool is_minimized = g.PlatformIO.Platform_GetWindowMinimized(viewport); + if (is_minimized) + viewport->Flags |= ImGuiViewportFlags_IsMinimized; + else + viewport->Flags &= ~ImGuiViewportFlags_IsMinimized; + } + + // Update our implicit z-order knowledge of platform windows, which is used when the backend cannot provide io.MouseHoveredViewport. + // When setting Platform_GetWindowFocus, it is expected that the platform backend can handle calls without crashing if it doesn't have data stored. + if (g.PlatformIO.Platform_GetWindowFocus && platform_funcs_available) + { + bool is_focused = g.PlatformIO.Platform_GetWindowFocus(viewport); + if (is_focused) + viewport->Flags |= ImGuiViewportFlags_IsFocused; + else + viewport->Flags &= ~ImGuiViewportFlags_IsFocused; + if (is_focused) + focused_viewport = viewport; + } + } + + // Focused viewport has changed? + if (focused_viewport && g.PlatformLastFocusedViewportId != focused_viewport->ID) + { + IMGUI_DEBUG_LOG_VIEWPORT("[viewport] Focused viewport changed %08X -> %08X, attempting to apply our focus.\n", g.PlatformLastFocusedViewportId, focused_viewport->ID); + const ImGuiViewport* prev_focused_viewport = FindViewportByID(g.PlatformLastFocusedViewportId); + const bool prev_focused_has_been_destroyed = (prev_focused_viewport == NULL) || (prev_focused_viewport->PlatformWindowCreated == false); + + // Store a tag so we can infer z-order easily from all our windows + // We compare PlatformLastFocusedViewportId so newly created viewports with _NoFocusOnAppearing flag + // will keep the front most stamp instead of losing it back to their parent viewport. + if (focused_viewport->LastFocusedStampCount != g.ViewportFocusedStampCount) + focused_viewport->LastFocusedStampCount = ++g.ViewportFocusedStampCount; + g.PlatformLastFocusedViewportId = focused_viewport->ID; + + // Focus associated dear imgui window + // - if focus didn't happen with a click within imgui boundaries, e.g. Clicking platform title bar. (#6299) + // - if focus didn't happen because we destroyed another window (#6462) + // FIXME: perhaps 'FocusTopMostWindowUnderOne()' can handle the 'focused_window->Window != NULL' case as well. + const bool apply_imgui_focus_on_focused_viewport = !IsAnyMouseDown() && !prev_focused_has_been_destroyed; + if (apply_imgui_focus_on_focused_viewport) + { + focused_viewport->LastFocusedHadNavWindow |= (g.NavWindow != NULL) && (g.NavWindow->Viewport == focused_viewport); // Update so a window changing viewport won't lose focus. + ImGuiFocusRequestFlags focus_request_flags = ImGuiFocusRequestFlags_UnlessBelowModal | ImGuiFocusRequestFlags_RestoreFocusedChild; + if (focused_viewport->Window != NULL) + FocusWindow(focused_viewport->Window, focus_request_flags); + else if (focused_viewport->LastFocusedHadNavWindow) + FocusTopMostWindowUnderOne(NULL, NULL, focused_viewport, focus_request_flags); // Focus top most in viewport + else + FocusWindow(NULL, focus_request_flags); // No window had focus last time viewport was focused + } + } + if (focused_viewport) + focused_viewport->LastFocusedHadNavWindow = (g.NavWindow != NULL) && (g.NavWindow->Viewport == focused_viewport); + } + + // Create/update main viewport with current platform position. + // FIXME-VIEWPORT: Size is driven by backend/user code for backward-compatibility but we should aim to make this more consistent. + ImGuiViewportP* main_viewport = g.Viewports[0]; + IM_ASSERT(main_viewport->ID == IMGUI_VIEWPORT_DEFAULT_ID); + IM_ASSERT(main_viewport->Window == NULL); + ImVec2 main_viewport_pos = viewports_enabled ? g.PlatformIO.Platform_GetWindowPos(main_viewport) : ImVec2(0.0f, 0.0f); + ImVec2 main_viewport_size = g.IO.DisplaySize; + if (viewports_enabled && (main_viewport->Flags & ImGuiViewportFlags_IsMinimized)) + { + main_viewport_pos = main_viewport->Pos; // Preserve last pos/size when minimized (FIXME: We don't do the same for Size outside of the viewport path) + main_viewport_size = main_viewport->Size; + } + AddUpdateViewport(NULL, IMGUI_VIEWPORT_DEFAULT_ID, main_viewport_pos, main_viewport_size, ImGuiViewportFlags_OwnedByApp | ImGuiViewportFlags_CanHostOtherWindows); + + g.CurrentDpiScale = 0.0f; + g.CurrentViewport = NULL; + g.MouseViewport = NULL; + for (int n = 0; n < g.Viewports.Size; n++) + { + ImGuiViewportP* viewport = g.Viewports[n]; + viewport->Idx = n; + + // Erase unused viewports + if (n > 0 && viewport->LastFrameActive < g.FrameCount - 2) + { + DestroyViewport(viewport); + n--; + continue; + } + + const bool platform_funcs_available = viewport->PlatformWindowCreated; + if (viewports_enabled) + { + // Update Position and Size (from Platform Window to ImGui) if requested. + // We do it early in the frame instead of waiting for UpdatePlatformWindows() to avoid a frame of lag when moving/resizing using OS facilities. + if (!(viewport->Flags & ImGuiViewportFlags_IsMinimized) && platform_funcs_available) + { + // Viewport->WorkPos and WorkSize will be updated below + if (viewport->PlatformRequestMove) + viewport->Pos = viewport->LastPlatformPos = g.PlatformIO.Platform_GetWindowPos(viewport); + if (viewport->PlatformRequestResize) + viewport->Size = viewport->LastPlatformSize = g.PlatformIO.Platform_GetWindowSize(viewport); + } + } + + // Update/copy monitor info + UpdateViewportPlatformMonitor(viewport); + + // Lock down space taken by menu bars and status bars + query initial insets from backend + // Setup initial value for functions like BeginMainMenuBar(), DockSpaceOverViewport() etc. + viewport->WorkInsetMin = viewport->BuildWorkInsetMin; + viewport->WorkInsetMax = viewport->BuildWorkInsetMax; + viewport->BuildWorkInsetMin = viewport->BuildWorkInsetMax = ImVec2(0.0f, 0.0f); + if (g.PlatformIO.Platform_GetWindowWorkAreaInsets != NULL && platform_funcs_available) + { + ImVec4 insets = g.PlatformIO.Platform_GetWindowWorkAreaInsets(viewport); + IM_ASSERT(insets.x >= 0.0f && insets.y >= 0.0f && insets.z >= 0.0f && insets.w >= 0.0f); + viewport->BuildWorkInsetMin = ImVec2(insets.x, insets.y); + viewport->BuildWorkInsetMax = ImVec2(insets.z, insets.w); + } + viewport->UpdateWorkRect(); + + // Reset alpha every frame. Users of transparency (docking) needs to request a lower alpha back. + viewport->Alpha = 1.0f; + + // Translate Dear ImGui windows when a Host Viewport has been moved + // (This additionally keeps windows at the same place when ImGuiConfigFlags_ViewportsEnable is toggled!) + const ImVec2 viewport_delta_pos = viewport->Pos - viewport->LastPos; + if ((viewport->Flags & ImGuiViewportFlags_CanHostOtherWindows) && (viewport_delta_pos.x != 0.0f || viewport_delta_pos.y != 0.0f)) + TranslateWindowsInViewport(viewport, viewport->LastPos, viewport->Pos, viewport->LastSize, viewport->Size); + + // Update DPI scale + float new_dpi_scale; + if (g.PlatformIO.Platform_GetWindowDpiScale && platform_funcs_available) + new_dpi_scale = g.PlatformIO.Platform_GetWindowDpiScale(viewport); + else if (viewport->PlatformMonitor != -1) + new_dpi_scale = g.PlatformIO.Monitors[viewport->PlatformMonitor].DpiScale; + else + new_dpi_scale = (viewport->DpiScale != 0.0f) ? viewport->DpiScale : 1.0f; + IM_ASSERT(new_dpi_scale > 0.0f && new_dpi_scale < 99.0f); // Typical correct values would be between 1.0f and 4.0f + if (viewport->DpiScale != 0.0f && new_dpi_scale != viewport->DpiScale) + { + float scale_factor = new_dpi_scale / viewport->DpiScale; + if (g.IO.ConfigFlags & ImGuiConfigFlags_DpiEnableScaleViewports) + ScaleWindowsInViewport(viewport, scale_factor); + //if (viewport == GetMainViewport()) + // g.PlatformInterface.SetWindowSize(viewport, viewport->Size * scale_factor); + + // Scale our window moving pivot so that the window will rescale roughly around the mouse position. + // FIXME-VIEWPORT: This currently creates a resizing feedback loop when a window is straddling a DPI transition border. + // (Minor: since our sizes do not perfectly linearly scale, deferring the click offset scale until we know the actual window scale ratio may get us slightly more precise mouse positioning.) + //if (g.MovingWindow != NULL && g.MovingWindow->Viewport == viewport) + // g.ActiveIdClickOffset = ImTrunc(g.ActiveIdClickOffset * scale_factor); + } + viewport->DpiScale = new_dpi_scale; + } + + // Update fallback monitor + g.PlatformMonitorsFullWorkRect = ImRect(+FLT_MAX, +FLT_MAX, -FLT_MAX, -FLT_MAX); + if (g.PlatformIO.Monitors.Size == 0) + { + ImGuiPlatformMonitor* monitor = &g.FallbackMonitor; + monitor->MainPos = main_viewport->Pos; + monitor->MainSize = main_viewport->Size; + monitor->WorkPos = main_viewport->WorkPos; + monitor->WorkSize = main_viewport->WorkSize; + monitor->DpiScale = main_viewport->DpiScale; + g.PlatformMonitorsFullWorkRect.Add(monitor->WorkPos); + g.PlatformMonitorsFullWorkRect.Add(monitor->WorkPos + monitor->WorkSize); + } + else + { + g.FallbackMonitor = g.PlatformIO.Monitors[0]; + } + for (ImGuiPlatformMonitor& monitor : g.PlatformIO.Monitors) + { + g.PlatformMonitorsFullWorkRect.Add(monitor.WorkPos); + g.PlatformMonitorsFullWorkRect.Add(monitor.WorkPos + monitor.WorkSize); + } + + if (!viewports_enabled) + { + g.MouseViewport = main_viewport; + return; + } + + // Mouse handling: decide on the actual mouse viewport for this frame between the active/focused viewport and the hovered viewport. + // Note that 'viewport_hovered' should skip over any viewport that has the ImGuiViewportFlags_NoInputs flags set. + ImGuiViewportP* viewport_hovered = NULL; + if (g.IO.BackendFlags & ImGuiBackendFlags_HasMouseHoveredViewport) + { + viewport_hovered = g.IO.MouseHoveredViewport ? (ImGuiViewportP*)FindViewportByID(g.IO.MouseHoveredViewport) : NULL; + if (viewport_hovered && (viewport_hovered->Flags & ImGuiViewportFlags_NoInputs)) + viewport_hovered = FindHoveredViewportFromPlatformWindowStack(g.IO.MousePos); // Backend failed to handle _NoInputs viewport: revert to our fallback. + } + else + { + // If the backend doesn't know how to honor ImGuiViewportFlags_NoInputs, we do a search ourselves. Note that this search: + // A) won't take account of the possibility that non-imgui windows may be in-between our dragged window and our target window. + // B) won't take account of how the backend apply parent<>child relationship to secondary viewports, which affects their Z order. + // C) uses LastFrameAsRefViewport as a flawed replacement for the last time a window was focused (we could/should fix that by introducing Focus functions in PlatformIO) + viewport_hovered = FindHoveredViewportFromPlatformWindowStack(g.IO.MousePos); + } + if (viewport_hovered != NULL) + g.MouseLastHoveredViewport = viewport_hovered; + else if (g.MouseLastHoveredViewport == NULL) + g.MouseLastHoveredViewport = g.Viewports[0]; + + // Update mouse reference viewport + // (when moving a window we aim at its viewport, but this will be overwritten below if we go in drag and drop mode) + // (MovingViewport->Viewport will be NULL in the rare situation where the window disappared while moving, set UpdateMouseMovingWindowNewFrame() for details) + if (g.MovingWindow && g.MovingWindow->Viewport) + g.MouseViewport = g.MovingWindow->Viewport; + else + g.MouseViewport = g.MouseLastHoveredViewport; + + // When dragging something, always refer to the last hovered viewport. + // - when releasing a moving window we will revert to aiming behind (at viewport_hovered) + // - when we are between viewports, our dragged preview will tend to show in the last viewport _even_ if we don't have tooltips in their viewports (when lacking monitor info) + // - consider the case of holding on a menu item to browse child menus: even thou a mouse button is held, there's no active id because menu items only react on mouse release. + // FIXME-VIEWPORT: This is essentially broken, when ImGuiBackendFlags_HasMouseHoveredViewport is set we want to trust when viewport_hovered==NULL and use that. + const bool is_mouse_dragging_with_an_expected_destination = g.DragDropActive; + if (is_mouse_dragging_with_an_expected_destination && viewport_hovered == NULL) + viewport_hovered = g.MouseLastHoveredViewport; + if (is_mouse_dragging_with_an_expected_destination || g.ActiveId == 0 || !IsAnyMouseDown()) + if (viewport_hovered != NULL && viewport_hovered != g.MouseViewport && !(viewport_hovered->Flags & ImGuiViewportFlags_NoInputs)) + g.MouseViewport = viewport_hovered; + + IM_ASSERT(g.MouseViewport != NULL); +} + +// Update user-facing viewport list (g.Viewports -> g.PlatformIO.Viewports after filtering out some) +static void ImGui::UpdateViewportsEndFrame() +{ + ImGuiContext& g = *GImGui; + g.PlatformIO.Viewports.resize(0); + for (int i = 0; i < g.Viewports.Size; i++) + { + ImGuiViewportP* viewport = g.Viewports[i]; + viewport->LastPos = viewport->Pos; + viewport->LastSize = viewport->Size; + if (viewport->LastFrameActive < g.FrameCount || viewport->Size.x <= 0.0f || viewport->Size.y <= 0.0f) + if (i > 0) // Always include main viewport in the list + continue; + if (viewport->Window && !IsWindowActiveAndVisible(viewport->Window)) + continue; + if (i > 0) + IM_ASSERT(viewport->Window != NULL); + g.PlatformIO.Viewports.push_back(viewport); + } + g.Viewports[0]->ClearRequestFlags(); // Clear main viewport flags because UpdatePlatformWindows() won't do it and may not even be called +} + +// FIXME: We should ideally refactor the system to call this every frame (we currently don't) +ImGuiViewportP* ImGui::AddUpdateViewport(ImGuiWindow* window, ImGuiID id, const ImVec2& pos, const ImVec2& size, ImGuiViewportFlags flags) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(id != 0); + + flags |= ImGuiViewportFlags_IsPlatformWindow; + if (window != NULL) + { + if (g.MovingWindow && g.MovingWindow->RootWindowDockTree == window) + flags |= ImGuiViewportFlags_NoInputs | ImGuiViewportFlags_NoFocusOnAppearing; + if ((window->Flags & ImGuiWindowFlags_NoMouseInputs) && (window->Flags & ImGuiWindowFlags_NoNavInputs)) + flags |= ImGuiViewportFlags_NoInputs; + if (window->Flags & ImGuiWindowFlags_NoFocusOnAppearing) + flags |= ImGuiViewportFlags_NoFocusOnAppearing; + } + + ImGuiViewportP* viewport = (ImGuiViewportP*)FindViewportByID(id); + if (viewport) + { + // Always update for main viewport as we are already pulling correct platform pos/size (see #4900) + ImVec2 prev_pos = viewport->Pos; + ImVec2 prev_size = viewport->Size; + if (!viewport->PlatformRequestMove || viewport->ID == IMGUI_VIEWPORT_DEFAULT_ID) + viewport->Pos = pos; + if (!viewport->PlatformRequestResize || viewport->ID == IMGUI_VIEWPORT_DEFAULT_ID) + viewport->Size = size; + viewport->Flags = flags | (viewport->Flags & (ImGuiViewportFlags_IsMinimized | ImGuiViewportFlags_IsFocused)); // Preserve existing flags + if (prev_pos != viewport->Pos || prev_size != viewport->Size) + UpdateViewportPlatformMonitor(viewport); + } + else + { + // New viewport + viewport = IM_NEW(ImGuiViewportP)(); + viewport->ID = id; + viewport->Idx = g.Viewports.Size; + viewport->Pos = viewport->LastPos = pos; + viewport->Size = viewport->LastSize = size; + viewport->Flags = flags; + UpdateViewportPlatformMonitor(viewport); + g.Viewports.push_back(viewport); + g.ViewportCreatedCount++; + IMGUI_DEBUG_LOG_VIEWPORT("[viewport] Add Viewport %08X '%s'\n", id, window ? window->Name : ""); + + // We normally setup for all viewports in NewFrame() but here need to handle the mid-frame creation of a new viewport. + // We need to extend the fullscreen clip rect so the OverlayDrawList clip is correct for that the first frame + g.DrawListSharedData.ClipRectFullscreen.x = ImMin(g.DrawListSharedData.ClipRectFullscreen.x, viewport->Pos.x); + g.DrawListSharedData.ClipRectFullscreen.y = ImMin(g.DrawListSharedData.ClipRectFullscreen.y, viewport->Pos.y); + g.DrawListSharedData.ClipRectFullscreen.z = ImMax(g.DrawListSharedData.ClipRectFullscreen.z, viewport->Pos.x + viewport->Size.x); + g.DrawListSharedData.ClipRectFullscreen.w = ImMax(g.DrawListSharedData.ClipRectFullscreen.w, viewport->Pos.y + viewport->Size.y); + + // Store initial DpiScale before the OS platform window creation, based on expected monitor data. + // This is so we can select an appropriate font size on the first frame of our window lifetime + if (viewport->PlatformMonitor != -1) + viewport->DpiScale = g.PlatformIO.Monitors[viewport->PlatformMonitor].DpiScale; + else + viewport->DpiScale = 1.0f; + } + + viewport->Window = window; + viewport->LastFrameActive = g.FrameCount; + viewport->UpdateWorkRect(); + IM_ASSERT(window == NULL || viewport->ID == window->ID); + + if (window != NULL) + window->ViewportOwned = true; + + return viewport; +} + +static void ImGui::DestroyViewport(ImGuiViewportP* viewport) +{ + // Clear references to this viewport in windows (window->ViewportId becomes the master data) + ImGuiContext& g = *GImGui; + for (ImGuiWindow* window : g.Windows) + { + if (window->Viewport != viewport) + continue; + window->Viewport = NULL; + window->ViewportOwned = false; + } + if (viewport == g.MouseLastHoveredViewport) + g.MouseLastHoveredViewport = NULL; + + // Destroy + IMGUI_DEBUG_LOG_VIEWPORT("[viewport] Delete Viewport %08X '%s'\n", viewport->ID, viewport->Window ? viewport->Window->Name : "n/a"); + DestroyPlatformWindow(viewport); // In most circumstances the platform window will already be destroyed here. + IM_ASSERT(g.PlatformIO.Viewports.contains(viewport) == false); + IM_ASSERT(g.Viewports[viewport->Idx] == viewport); + g.Viewports.erase(g.Viewports.Data + viewport->Idx); + IM_DELETE(viewport); +} + +// FIXME-VIEWPORT: This is all super messy and ought to be clarified or rewritten. +static void ImGui::WindowSelectViewport(ImGuiWindow* window) +{ + ImGuiContext& g = *GImGui; + ImGuiWindowFlags flags = window->Flags; + window->ViewportAllowPlatformMonitorExtend = -1; + + // Restore main viewport if multi-viewport is not supported by the backend + ImGuiViewportP* main_viewport = (ImGuiViewportP*)(void*)GetMainViewport(); + if (!(g.ConfigFlagsCurrFrame & ImGuiConfigFlags_ViewportsEnable)) + { + SetWindowViewport(window, main_viewport); + return; + } + window->ViewportOwned = false; + + // Appearing popups reset their viewport so they can inherit again + if ((flags & (ImGuiWindowFlags_Popup | ImGuiWindowFlags_Tooltip)) && window->Appearing) + { + window->Viewport = NULL; + window->ViewportId = 0; + } + + if ((g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasViewport) == 0) + { + // By default inherit from parent window + if (window->Viewport == NULL && window->ParentWindow && (!window->ParentWindow->IsFallbackWindow || window->ParentWindow->WasActive)) + window->Viewport = window->ParentWindow->Viewport; + + // Attempt to restore saved viewport id (= window that hasn't been activated yet), try to restore the viewport based on saved 'window->ViewportPos' restored from .ini file + if (window->Viewport == NULL && window->ViewportId != 0) + { + window->Viewport = (ImGuiViewportP*)FindViewportByID(window->ViewportId); + if (window->Viewport == NULL && window->ViewportPos.x != FLT_MAX && window->ViewportPos.y != FLT_MAX) + window->Viewport = AddUpdateViewport(window, window->ID, window->ViewportPos, window->Size, ImGuiViewportFlags_None); + } + } + + bool lock_viewport = false; + if (g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasViewport) + { + // Code explicitly request a viewport + window->Viewport = (ImGuiViewportP*)FindViewportByID(g.NextWindowData.ViewportId); + window->ViewportId = g.NextWindowData.ViewportId; // Store ID even if Viewport isn't resolved yet. + if (window->Viewport && (window->Flags & ImGuiWindowFlags_DockNodeHost) != 0 && window->Viewport->Window != NULL) + { + window->Viewport->Window = window; + window->Viewport->ID = window->ViewportId = window->ID; // Overwrite ID (always owned by node) + } + lock_viewport = true; + } + else if ((flags & ImGuiWindowFlags_ChildWindow) || (flags & ImGuiWindowFlags_ChildMenu)) + { + // Always inherit viewport from parent window + if (window->DockNode && window->DockNode->HostWindow) + IM_ASSERT(window->DockNode->HostWindow->Viewport == window->ParentWindow->Viewport); + window->Viewport = window->ParentWindow->Viewport; + } + else if (window->DockNode && window->DockNode->HostWindow) + { + // This covers the "always inherit viewport from parent window" case for when a window reattach to a node that was just created mid-frame + window->Viewport = window->DockNode->HostWindow->Viewport; + } + else if (flags & ImGuiWindowFlags_Tooltip) + { + window->Viewport = g.MouseViewport; + } + else if (GetWindowAlwaysWantOwnViewport(window)) + { + window->Viewport = AddUpdateViewport(window, window->ID, window->Pos, window->Size, ImGuiViewportFlags_None); + } + else if (g.MovingWindow && g.MovingWindow->RootWindowDockTree == window && IsMousePosValid()) + { + if (window->Viewport != NULL && window->Viewport->Window == window) + window->Viewport = AddUpdateViewport(window, window->ID, window->Pos, window->Size, ImGuiViewportFlags_None); + } + else + { + // Merge into host viewport? + // We cannot test window->ViewportOwned as it set lower in the function. + // Testing (g.ActiveId == 0 || g.ActiveIdAllowOverlap) to avoid merging during a short-term widget interaction. Main intent was to avoid during resize (see #4212) + bool try_to_merge_into_host_viewport = (window->Viewport && window == window->Viewport->Window && (g.ActiveId == 0 || g.ActiveIdAllowOverlap)); + if (try_to_merge_into_host_viewport) + UpdateTryMergeWindowIntoHostViewports(window); + } + + // Fallback: merge in default viewport if z-order matches, otherwise create a new viewport + if (window->Viewport == NULL) + if (!UpdateTryMergeWindowIntoHostViewport(window, main_viewport)) + window->Viewport = AddUpdateViewport(window, window->ID, window->Pos, window->Size, ImGuiViewportFlags_None); + + // Mark window as allowed to protrude outside of its viewport and into the current monitor + if (!lock_viewport) + { + if (flags & (ImGuiWindowFlags_Tooltip | ImGuiWindowFlags_Popup)) + { + // We need to take account of the possibility that mouse may become invalid. + // Popups/Tooltip always set ViewportAllowPlatformMonitorExtend so GetWindowAllowedExtentRect() will return full monitor bounds. + ImVec2 mouse_ref = (flags & ImGuiWindowFlags_Tooltip) ? g.IO.MousePos : g.BeginPopupStack.back().OpenMousePos; + bool use_mouse_ref = (!g.NavCursorVisible || !g.NavHighlightItemUnderNav || !g.NavWindow); + bool mouse_valid = IsMousePosValid(&mouse_ref); + if ((window->Appearing || (flags & (ImGuiWindowFlags_Tooltip | ImGuiWindowFlags_ChildMenu))) && (!use_mouse_ref || mouse_valid)) + window->ViewportAllowPlatformMonitorExtend = FindPlatformMonitorForPos((use_mouse_ref && mouse_valid) ? mouse_ref : NavCalcPreferredRefPos()); + else + window->ViewportAllowPlatformMonitorExtend = window->Viewport->PlatformMonitor; + } + else if (window->Viewport && window != window->Viewport->Window && window->Viewport->Window && !(flags & ImGuiWindowFlags_ChildWindow) && window->DockNode == NULL) + { + // When called from Begin() we don't have access to a proper version of the Hidden flag yet, so we replicate this code. + const bool will_be_visible = (window->DockIsActive && !window->DockTabIsVisible) ? false : true; + if ((window->Flags & ImGuiWindowFlags_DockNodeHost) && window->Viewport->LastFrameActive < g.FrameCount && will_be_visible) + { + // Steal/transfer ownership + IMGUI_DEBUG_LOG_VIEWPORT("[viewport] Window '%s' steal Viewport %08X from Window '%s'\n", window->Name, window->Viewport->ID, window->Viewport->Window->Name); + window->Viewport->Window = window; + window->Viewport->ID = window->ID; + window->Viewport->LastNameHash = 0; + } + else if (!UpdateTryMergeWindowIntoHostViewports(window)) // Merge? + { + // New viewport + window->Viewport = AddUpdateViewport(window, window->ID, window->Pos, window->Size, ImGuiViewportFlags_NoFocusOnAppearing); + } + } + else if (window->ViewportAllowPlatformMonitorExtend < 0 && (flags & ImGuiWindowFlags_ChildWindow) == 0) + { + // Regular (non-child, non-popup) windows by default are also allowed to protrude + // Child windows are kept contained within their parent. + window->ViewportAllowPlatformMonitorExtend = window->Viewport->PlatformMonitor; + } + } + + // Update flags + window->ViewportOwned = (window == window->Viewport->Window); + window->ViewportId = window->Viewport->ID; + + // If the OS window has a title bar, hide our imgui title bar + //if (window->ViewportOwned && !(window->Viewport->Flags & ImGuiViewportFlags_NoDecoration)) + // window->Flags |= ImGuiWindowFlags_NoTitleBar; +} + +void ImGui::WindowSyncOwnedViewport(ImGuiWindow* window, ImGuiWindow* parent_window_in_stack) +{ + ImGuiContext& g = *GImGui; + + bool viewport_rect_changed = false; + + // Synchronize window --> viewport in most situations + // Synchronize viewport -> window in case the platform window has been moved or resized from the OS/WM + if (window->Viewport->PlatformRequestMove) + { + window->Pos = window->Viewport->Pos; + MarkIniSettingsDirty(window); + } + else if (memcmp(&window->Viewport->Pos, &window->Pos, sizeof(window->Pos)) != 0) + { + viewport_rect_changed = true; + window->Viewport->Pos = window->Pos; + } + + if (window->Viewport->PlatformRequestResize) + { + window->Size = window->SizeFull = window->Viewport->Size; + MarkIniSettingsDirty(window); + } + else if (memcmp(&window->Viewport->Size, &window->Size, sizeof(window->Size)) != 0) + { + viewport_rect_changed = true; + window->Viewport->Size = window->Size; + } + window->Viewport->UpdateWorkRect(); + + // The viewport may have changed monitor since the global update in UpdateViewportsNewFrame() + // Either a SetNextWindowPos() call in the current frame or a SetWindowPos() call in the previous frame may have this effect. + if (viewport_rect_changed) + UpdateViewportPlatformMonitor(window->Viewport); + + // Update common viewport flags + const ImGuiViewportFlags viewport_flags_to_clear = ImGuiViewportFlags_TopMost | ImGuiViewportFlags_NoTaskBarIcon | ImGuiViewportFlags_NoDecoration | ImGuiViewportFlags_NoRendererClear; + ImGuiViewportFlags viewport_flags = window->Viewport->Flags & ~viewport_flags_to_clear; + ImGuiWindowFlags window_flags = window->Flags; + const bool is_modal = (window_flags & ImGuiWindowFlags_Modal) != 0; + const bool is_short_lived_floating_window = (window_flags & (ImGuiWindowFlags_ChildMenu | ImGuiWindowFlags_Tooltip | ImGuiWindowFlags_Popup)) != 0; + if (window_flags & ImGuiWindowFlags_Tooltip) + viewport_flags |= ImGuiViewportFlags_TopMost; + if ((g.IO.ConfigViewportsNoTaskBarIcon || is_short_lived_floating_window) && !is_modal) + viewport_flags |= ImGuiViewportFlags_NoTaskBarIcon; + if (g.IO.ConfigViewportsNoDecoration || is_short_lived_floating_window) + viewport_flags |= ImGuiViewportFlags_NoDecoration; + + // Not correct to set modal as topmost because: + // - Because other popups can be stacked above a modal (e.g. combo box in a modal) + // - ImGuiViewportFlags_TopMost is currently handled different in backends: in Win32 it is "appear top most" whereas in GLFW and SDL it is "stay topmost" + //if (flags & ImGuiWindowFlags_Modal) + // viewport_flags |= ImGuiViewportFlags_TopMost; + + // For popups and menus that may be protruding out of their parent viewport, we enable _NoFocusOnClick so that clicking on them + // won't steal the OS focus away from their parent window (which may be reflected in OS the title bar decoration). + // Setting _NoFocusOnClick would technically prevent us from bringing back to front in case they are being covered by an OS window from a different app, + // but it shouldn't be much of a problem considering those are already popups that are closed when clicking elsewhere. + if (is_short_lived_floating_window && !is_modal) + viewport_flags |= ImGuiViewportFlags_NoFocusOnAppearing | ImGuiViewportFlags_NoFocusOnClick; + + // We can overwrite viewport flags using ImGuiWindowClass (advanced users) + if (window->WindowClass.ViewportFlagsOverrideSet) + viewport_flags |= window->WindowClass.ViewportFlagsOverrideSet; + if (window->WindowClass.ViewportFlagsOverrideClear) + viewport_flags &= ~window->WindowClass.ViewportFlagsOverrideClear; + + // We can also tell the backend that clearing the platform window won't be necessary, + // as our window background is filling the viewport and we have disabled BgAlpha. + // FIXME: Work on support for per-viewport transparency (#2766) + if (!(window_flags & ImGuiWindowFlags_NoBackground)) + viewport_flags |= ImGuiViewportFlags_NoRendererClear; + + window->Viewport->Flags = viewport_flags; + + // Update parent viewport ID + // (the !IsFallbackWindow test mimic the one done in WindowSelectViewport()) + if (window->WindowClass.ParentViewportId != (ImGuiID)-1) + window->Viewport->ParentViewportId = window->WindowClass.ParentViewportId; + else if ((window_flags & (ImGuiWindowFlags_Popup | ImGuiWindowFlags_Tooltip)) && parent_window_in_stack && (!parent_window_in_stack->IsFallbackWindow || parent_window_in_stack->WasActive)) + window->Viewport->ParentViewportId = parent_window_in_stack->Viewport->ID; + else + window->Viewport->ParentViewportId = g.IO.ConfigViewportsNoDefaultParent ? 0 : IMGUI_VIEWPORT_DEFAULT_ID; +} + +// Called by user at the end of the main loop, after EndFrame() +// This will handle the creation/update of all OS windows via function defined in the ImGuiPlatformIO api. +void ImGui::UpdatePlatformWindows() +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(g.FrameCountEnded == g.FrameCount && "Forgot to call Render() or EndFrame() before UpdatePlatformWindows()?"); + IM_ASSERT(g.FrameCountPlatformEnded < g.FrameCount); + g.FrameCountPlatformEnded = g.FrameCount; + if (!(g.ConfigFlagsCurrFrame & ImGuiConfigFlags_ViewportsEnable)) + return; + + // Create/resize/destroy platform windows to match each active viewport. + // Skip the main viewport (index 0), which is always fully handled by the application! + for (int i = 1; i < g.Viewports.Size; i++) + { + ImGuiViewportP* viewport = g.Viewports[i]; + + // Destroy platform window if the viewport hasn't been submitted or if it is hosting a hidden window + // (the implicit/fallback Debug##Default window will be registering its viewport then be disabled, causing a dummy DestroyPlatformWindow to be made each frame) + bool destroy_platform_window = false; + destroy_platform_window |= (viewport->LastFrameActive < g.FrameCount - 1); + destroy_platform_window |= (viewport->Window && !IsWindowActiveAndVisible(viewport->Window)); + if (destroy_platform_window) + { + DestroyPlatformWindow(viewport); + continue; + } + + // New windows that appears directly in a new viewport won't always have a size on their first frame + if (viewport->LastFrameActive < g.FrameCount || viewport->Size.x <= 0 || viewport->Size.y <= 0) + continue; + + // Create window + const bool is_new_platform_window = (viewport->PlatformWindowCreated == false); + if (is_new_platform_window) + { + IMGUI_DEBUG_LOG_VIEWPORT("[viewport] Create Platform Window %08X '%s'\n", viewport->ID, viewport->Window ? viewport->Window->Name : "n/a"); + g.PlatformIO.Platform_CreateWindow(viewport); + if (g.PlatformIO.Renderer_CreateWindow != NULL) + g.PlatformIO.Renderer_CreateWindow(viewport); + g.PlatformWindowsCreatedCount++; + viewport->LastNameHash = 0; + viewport->LastPlatformPos = viewport->LastPlatformSize = ImVec2(FLT_MAX, FLT_MAX); // By clearing those we'll enforce a call to Platform_SetWindowPos/Size below, before Platform_ShowWindow (FIXME: Is that necessary?) + viewport->LastRendererSize = viewport->Size; // We don't need to call Renderer_SetWindowSize() as it is expected Renderer_CreateWindow() already did it. + viewport->PlatformWindowCreated = true; + } + + // Apply Position and Size (from ImGui to Platform/Renderer backends) + if ((viewport->LastPlatformPos.x != viewport->Pos.x || viewport->LastPlatformPos.y != viewport->Pos.y) && !viewport->PlatformRequestMove) + g.PlatformIO.Platform_SetWindowPos(viewport, viewport->Pos); + if ((viewport->LastPlatformSize.x != viewport->Size.x || viewport->LastPlatformSize.y != viewport->Size.y) && !viewport->PlatformRequestResize) + g.PlatformIO.Platform_SetWindowSize(viewport, viewport->Size); + if ((viewport->LastRendererSize.x != viewport->Size.x || viewport->LastRendererSize.y != viewport->Size.y) && g.PlatformIO.Renderer_SetWindowSize) + g.PlatformIO.Renderer_SetWindowSize(viewport, viewport->Size); + viewport->LastPlatformPos = viewport->Pos; + viewport->LastPlatformSize = viewport->LastRendererSize = viewport->Size; + + // Update title bar (if it changed) + if (ImGuiWindow* window_for_title = GetWindowForTitleDisplay(viewport->Window)) + { + const char* title_begin = window_for_title->Name; + char* title_end = (char*)(intptr_t)FindRenderedTextEnd(title_begin); + const ImGuiID title_hash = ImHashStr(title_begin, title_end - title_begin); + if (viewport->LastNameHash != title_hash) + { + char title_end_backup_c = *title_end; + *title_end = 0; // Cut existing buffer short instead of doing an alloc/free, no small gain. + g.PlatformIO.Platform_SetWindowTitle(viewport, title_begin); + *title_end = title_end_backup_c; + viewport->LastNameHash = title_hash; + } + } + + // Update alpha (if it changed) + if (viewport->LastAlpha != viewport->Alpha && g.PlatformIO.Platform_SetWindowAlpha) + g.PlatformIO.Platform_SetWindowAlpha(viewport, viewport->Alpha); + viewport->LastAlpha = viewport->Alpha; + + // Optional, general purpose call to allow the backend to perform general book-keeping even if things haven't changed. + if (g.PlatformIO.Platform_UpdateWindow) + g.PlatformIO.Platform_UpdateWindow(viewport); + + if (is_new_platform_window) + { + // On startup ensure new platform window don't steal focus (give it a few frames, as nested contents may lead to viewport being created a few frames late) + if (g.FrameCount < 3) + viewport->Flags |= ImGuiViewportFlags_NoFocusOnAppearing; + + // Show window + g.PlatformIO.Platform_ShowWindow(viewport); + + // Even without focus, we assume the window becomes front-most. + // This is useful for our platform z-order heuristic when io.MouseHoveredViewport is not available. + if (viewport->LastFocusedStampCount != g.ViewportFocusedStampCount) + viewport->LastFocusedStampCount = ++g.ViewportFocusedStampCount; + } + + // Clear request flags + viewport->ClearRequestFlags(); + } +} + +// This is a default/basic function for performing the rendering/swap of multiple Platform Windows. +// Custom renderers may prefer to not call this function at all, and instead iterate the publicly exposed platform data and handle rendering/sync themselves. +// The Render/Swap functions stored in ImGuiPlatformIO are merely here to allow for this helper to exist, but you can do it yourself: +// +// ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO(); +// for (int i = 1; i < platform_io.Viewports.Size; i++) +// if ((platform_io.Viewports[i]->Flags & ImGuiViewportFlags_Minimized) == 0) +// MyRenderFunction(platform_io.Viewports[i], my_args); +// for (int i = 1; i < platform_io.Viewports.Size; i++) +// if ((platform_io.Viewports[i]->Flags & ImGuiViewportFlags_Minimized) == 0) +// MySwapBufferFunction(platform_io.Viewports[i], my_args); +// +void ImGui::RenderPlatformWindowsDefault(void* platform_render_arg, void* renderer_render_arg) +{ + // Skip the main viewport (index 0), which is always fully handled by the application! + ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO(); + for (int i = 1; i < platform_io.Viewports.Size; i++) + { + ImGuiViewport* viewport = platform_io.Viewports[i]; + if (viewport->Flags & ImGuiViewportFlags_IsMinimized) + continue; + if (platform_io.Platform_RenderWindow) platform_io.Platform_RenderWindow(viewport, platform_render_arg); + if (platform_io.Renderer_RenderWindow) platform_io.Renderer_RenderWindow(viewport, renderer_render_arg); + } + for (int i = 1; i < platform_io.Viewports.Size; i++) + { + ImGuiViewport* viewport = platform_io.Viewports[i]; + if (viewport->Flags & ImGuiViewportFlags_IsMinimized) + continue; + if (platform_io.Platform_SwapBuffers) platform_io.Platform_SwapBuffers(viewport, platform_render_arg); + if (platform_io.Renderer_SwapBuffers) platform_io.Renderer_SwapBuffers(viewport, renderer_render_arg); + } +} + +static int ImGui::FindPlatformMonitorForPos(const ImVec2& pos) +{ + ImGuiContext& g = *GImGui; + for (int monitor_n = 0; monitor_n < g.PlatformIO.Monitors.Size; monitor_n++) + { + const ImGuiPlatformMonitor& monitor = g.PlatformIO.Monitors[monitor_n]; + if (ImRect(monitor.MainPos, monitor.MainPos + monitor.MainSize).Contains(pos)) + return monitor_n; + } + return -1; +} + +// Search for the monitor with the largest intersection area with the given rectangle +// We generally try to avoid searching loops but the monitor count should be very small here +// FIXME-OPT: We could test the last monitor used for that viewport first, and early +static int ImGui::FindPlatformMonitorForRect(const ImRect& rect) +{ + ImGuiContext& g = *GImGui; + + const int monitor_count = g.PlatformIO.Monitors.Size; + if (monitor_count <= 1) + return monitor_count - 1; + + // Use a minimum threshold of 1.0f so a zero-sized rect won't false positive, and will still find the correct monitor given its position. + // This is necessary for tooltips which always resize down to zero at first. + const float surface_threshold = ImMax(rect.GetWidth() * rect.GetHeight() * 0.5f, 1.0f); + int best_monitor_n = 0; // Default to the first monitor as fallback + float best_monitor_surface = 0.001f; + + for (int monitor_n = 0; monitor_n < g.PlatformIO.Monitors.Size && best_monitor_surface < surface_threshold; monitor_n++) + { + const ImGuiPlatformMonitor& monitor = g.PlatformIO.Monitors[monitor_n]; + const ImRect monitor_rect = ImRect(monitor.MainPos, monitor.MainPos + monitor.MainSize); + if (monitor_rect.Contains(rect)) + return monitor_n; + ImRect overlapping_rect = rect; + overlapping_rect.ClipWithFull(monitor_rect); + float overlapping_surface = overlapping_rect.GetWidth() * overlapping_rect.GetHeight(); + if (overlapping_surface < best_monitor_surface) + continue; + best_monitor_surface = overlapping_surface; + best_monitor_n = monitor_n; + } + return best_monitor_n; +} + +// Update monitor from viewport rectangle (we'll use this info to clamp windows and save windows lost in a removed monitor) +static void ImGui::UpdateViewportPlatformMonitor(ImGuiViewportP* viewport) +{ + viewport->PlatformMonitor = (short)FindPlatformMonitorForRect(viewport->GetMainRect()); +} + +// Return value is always != NULL, but don't hold on it across frames. +const ImGuiPlatformMonitor* ImGui::GetViewportPlatformMonitor(ImGuiViewport* viewport_p) +{ + ImGuiContext& g = *GImGui; + ImGuiViewportP* viewport = (ImGuiViewportP*)(void*)viewport_p; + int monitor_idx = viewport->PlatformMonitor; + if (monitor_idx >= 0 && monitor_idx < g.PlatformIO.Monitors.Size) + return &g.PlatformIO.Monitors[monitor_idx]; + return &g.FallbackMonitor; +} + +void ImGui::DestroyPlatformWindow(ImGuiViewportP* viewport) +{ + ImGuiContext& g = *GImGui; + if (viewport->PlatformWindowCreated) + { + IMGUI_DEBUG_LOG_VIEWPORT("[viewport] Destroy Platform Window %08X '%s'\n", viewport->ID, viewport->Window ? viewport->Window->Name : "n/a"); + if (g.PlatformIO.Renderer_DestroyWindow) + g.PlatformIO.Renderer_DestroyWindow(viewport); + if (g.PlatformIO.Platform_DestroyWindow) + g.PlatformIO.Platform_DestroyWindow(viewport); + IM_ASSERT(viewport->RendererUserData == NULL && viewport->PlatformUserData == NULL); + + // Don't clear PlatformWindowCreated for the main viewport, as we initially set that up to true in Initialize() + // The righter way may be to leave it to the backend to set this flag all-together, and made the flag public. + if (viewport->ID != IMGUI_VIEWPORT_DEFAULT_ID) + viewport->PlatformWindowCreated = false; + } + else + { + IM_ASSERT(viewport->RendererUserData == NULL && viewport->PlatformUserData == NULL && viewport->PlatformHandle == NULL); + } + viewport->RendererUserData = viewport->PlatformUserData = viewport->PlatformHandle = NULL; + viewport->ClearRequestFlags(); +} + +void ImGui::DestroyPlatformWindows() +{ + // We call the destroy window on every viewport (including the main viewport, index 0) to give a chance to the backend + // to clear any data they may have stored in e.g. PlatformUserData, RendererUserData. + // It is convenient for the platform backend code to store something in the main viewport, in order for e.g. the mouse handling + // code to operator a consistent manner. + // It is expected that the backend can handle calls to Renderer_DestroyWindow/Platform_DestroyWindow without + // crashing if it doesn't have data stored. + ImGuiContext& g = *GImGui; + for (ImGuiViewportP* viewport : g.Viewports) + DestroyPlatformWindow(viewport); +} //----------------------------------------------------------------------------- // [SECTION] DOCKING //----------------------------------------------------------------------------- +// Docking: Internal Types +// Docking: Forward Declarations +// Docking: ImGuiDockContext +// Docking: ImGuiDockContext Docking/Undocking functions +// Docking: ImGuiDockNode +// Docking: ImGuiDockNode Tree manipulation functions +// Docking: Public Functions (SetWindowDock, DockSpace, DockSpaceOverViewport) +// Docking: Builder Functions +// Docking: Begin/End Support Functions (called from Begin/End) +// Docking: Settings +//----------------------------------------------------------------------------- -// (this section is filled in the 'docking' branch) +//----------------------------------------------------------------------------- +// Typical Docking call flow: (root level is generally public API): +//----------------------------------------------------------------------------- +// - NewFrame() new dear imgui frame +// | DockContextNewFrameUpdateUndocking() - process queued undocking requests +// | - DockContextProcessUndockWindow() - process one window undocking request +// | - DockContextProcessUndockNode() - process one whole node undocking request +// | DockContextNewFrameUpdateUndocking() - process queue docking requests, create floating dock nodes +// | - update g.HoveredDockNode - [debug] update node hovered by mouse +// | - DockContextProcessDock() - process one docking request +// | - DockNodeUpdate() +// | - DockNodeUpdateForRootNode() +// | - DockNodeUpdateFlagsAndCollapse() +// | - DockNodeFindInfo() +// | - destroy unused node or tab bar +// | - create dock node host window +// | - Begin() etc. +// | - DockNodeStartMouseMovingWindow() +// | - DockNodeTreeUpdatePosSize() +// | - DockNodeTreeUpdateSplitter() +// | - draw node background +// | - DockNodeUpdateTabBar() - create/update tab bar for a docking node +// | - DockNodeAddTabBar() +// | - DockNodeWindowMenuUpdate() +// | - DockNodeCalcTabBarLayout() +// | - BeginTabBarEx() +// | - TabItemEx() calls +// | - EndTabBar() +// | - BeginDockableDragDropTarget() +// | - DockNodeUpdate() - recurse into child nodes... +//----------------------------------------------------------------------------- +// - DockSpace() user submit a dockspace into a window +// | Begin(Child) - create a child window +// | DockNodeUpdate() - call main dock node update function +// | End(Child) +// | ItemSize() +//----------------------------------------------------------------------------- +// - Begin() +// | BeginDocked() +// | BeginDockableDragDropSource() +// | BeginDockableDragDropTarget() +// | - DockNodePreviewDockRender() +//----------------------------------------------------------------------------- +// - EndFrame() +// | DockContextEndFrame() +//----------------------------------------------------------------------------- + +//----------------------------------------------------------------------------- +// Docking: Internal Types +//----------------------------------------------------------------------------- +// - ImGuiDockRequestType +// - ImGuiDockRequest +// - ImGuiDockPreviewData +// - ImGuiDockNodeSettings +// - ImGuiDockContext +//----------------------------------------------------------------------------- + +enum ImGuiDockRequestType +{ + ImGuiDockRequestType_None = 0, + ImGuiDockRequestType_Dock, + ImGuiDockRequestType_Undock, + ImGuiDockRequestType_Split // Split is the same as Dock but without a DockPayload +}; + +struct ImGuiDockRequest +{ + ImGuiDockRequestType Type; + ImGuiWindow* DockTargetWindow; // Destination/Target Window to dock into (may be a loose window or a DockNode, might be NULL in which case DockTargetNode cannot be NULL) + ImGuiDockNode* DockTargetNode; // Destination/Target Node to dock into + ImGuiWindow* DockPayload; // Source/Payload window to dock (may be a loose window or a DockNode), [Optional] + ImGuiDir DockSplitDir; + float DockSplitRatio; + bool DockSplitOuter; + ImGuiWindow* UndockTargetWindow; + ImGuiDockNode* UndockTargetNode; + + ImGuiDockRequest() + { + Type = ImGuiDockRequestType_None; + DockTargetWindow = DockPayload = UndockTargetWindow = NULL; + DockTargetNode = UndockTargetNode = NULL; + DockSplitDir = ImGuiDir_None; + DockSplitRatio = 0.5f; + DockSplitOuter = false; + } +}; + +struct ImGuiDockPreviewData +{ + ImGuiDockNode FutureNode; + bool IsDropAllowed; + bool IsCenterAvailable; + bool IsSidesAvailable; // Hold your breath, grammar freaks.. + bool IsSplitDirExplicit; // Set when hovered the drop rect (vs. implicit SplitDir==None when hovered the window) + ImGuiDockNode* SplitNode; + ImGuiDir SplitDir; + float SplitRatio; + ImRect DropRectsDraw[ImGuiDir_COUNT + 1]; // May be slightly different from hit-testing drop rects used in DockNodeCalcDropRects() + + ImGuiDockPreviewData() : FutureNode(0) { IsDropAllowed = IsCenterAvailable = IsSidesAvailable = IsSplitDirExplicit = false; SplitNode = NULL; SplitDir = ImGuiDir_None; SplitRatio = 0.f; for (int n = 0; n < IM_ARRAYSIZE(DropRectsDraw); n++) DropRectsDraw[n] = ImRect(+FLT_MAX, +FLT_MAX, -FLT_MAX, -FLT_MAX); } +}; + +// Persistent Settings data, stored contiguously in SettingsNodes (sizeof() ~32 bytes) +struct ImGuiDockNodeSettings +{ + ImGuiID ID; + ImGuiID ParentNodeId; + ImGuiID ParentWindowId; + ImGuiID SelectedTabId; + signed char SplitAxis; + char Depth; + ImGuiDockNodeFlags Flags; // NB: We save individual flags one by one in ascii format (ImGuiDockNodeFlags_SavedFlagsMask_) + ImVec2ih Pos; + ImVec2ih Size; + ImVec2ih SizeRef; + ImGuiDockNodeSettings() { memset(this, 0, sizeof(*this)); SplitAxis = ImGuiAxis_None; } +}; + +//----------------------------------------------------------------------------- +// Docking: Forward Declarations +//----------------------------------------------------------------------------- + +namespace ImGui +{ + // ImGuiDockContext + static ImGuiDockNode* DockContextAddNode(ImGuiContext* ctx, ImGuiID id); + static void DockContextRemoveNode(ImGuiContext* ctx, ImGuiDockNode* node, bool merge_sibling_into_parent_node); + static void DockContextQueueNotifyRemovedNode(ImGuiContext* ctx, ImGuiDockNode* node); + static void DockContextProcessDock(ImGuiContext* ctx, ImGuiDockRequest* req); + static void DockContextPruneUnusedSettingsNodes(ImGuiContext* ctx); + static ImGuiDockNode* DockContextBindNodeToWindow(ImGuiContext* ctx, ImGuiWindow* window); + static void DockContextBuildNodesFromSettings(ImGuiContext* ctx, ImGuiDockNodeSettings* node_settings_array, int node_settings_count); + static void DockContextBuildAddWindowsToNodes(ImGuiContext* ctx, ImGuiID root_id); // Use root_id==0 to add all + + // ImGuiDockNode + static void DockNodeAddWindow(ImGuiDockNode* node, ImGuiWindow* window, bool add_to_tab_bar); + static void DockNodeMoveWindows(ImGuiDockNode* dst_node, ImGuiDockNode* src_node); + static void DockNodeMoveChildNodes(ImGuiDockNode* dst_node, ImGuiDockNode* src_node); + static ImGuiWindow* DockNodeFindWindowByID(ImGuiDockNode* node, ImGuiID id); + static void DockNodeApplyPosSizeToWindows(ImGuiDockNode* node); + static void DockNodeRemoveWindow(ImGuiDockNode* node, ImGuiWindow* window, ImGuiID save_dock_id); + static void DockNodeHideHostWindow(ImGuiDockNode* node); + static void DockNodeUpdate(ImGuiDockNode* node); + static void DockNodeUpdateForRootNode(ImGuiDockNode* node); + static void DockNodeUpdateFlagsAndCollapse(ImGuiDockNode* node); + static void DockNodeUpdateHasCentralNodeChild(ImGuiDockNode* node); + static void DockNodeUpdateTabBar(ImGuiDockNode* node, ImGuiWindow* host_window); + static void DockNodeAddTabBar(ImGuiDockNode* node); + static void DockNodeRemoveTabBar(ImGuiDockNode* node); + static void DockNodeWindowMenuUpdate(ImGuiDockNode* node, ImGuiTabBar* tab_bar); + static void DockNodeUpdateVisibleFlag(ImGuiDockNode* node); + static void DockNodeStartMouseMovingWindow(ImGuiDockNode* node, ImGuiWindow* window); + static bool DockNodeIsDropAllowed(ImGuiWindow* host_window, ImGuiWindow* payload_window); + static void DockNodePreviewDockSetup(ImGuiWindow* host_window, ImGuiDockNode* host_node, ImGuiWindow* payload_window, ImGuiDockNode* payload_node, ImGuiDockPreviewData* preview_data, bool is_explicit_target, bool is_outer_docking); + static void DockNodePreviewDockRender(ImGuiWindow* host_window, ImGuiDockNode* host_node, ImGuiWindow* payload_window, const ImGuiDockPreviewData* preview_data); + static void DockNodeCalcTabBarLayout(const ImGuiDockNode* node, ImRect* out_title_rect, ImRect* out_tab_bar_rect, ImVec2* out_window_menu_button_pos, ImVec2* out_close_button_pos); + static void DockNodeCalcSplitRects(ImVec2& pos_old, ImVec2& size_old, ImVec2& pos_new, ImVec2& size_new, ImGuiDir dir, ImVec2 size_new_desired); + static bool DockNodeCalcDropRectsAndTestMousePos(const ImRect& parent, ImGuiDir dir, ImRect& out_draw, bool outer_docking, ImVec2* test_mouse_pos); + static const char* DockNodeGetHostWindowTitle(ImGuiDockNode* node, char* buf, int buf_size) { ImFormatString(buf, buf_size, "##DockNode_%02X", node->ID); return buf; } + static int DockNodeGetTabOrder(ImGuiWindow* window); + + // ImGuiDockNode tree manipulations + static void DockNodeTreeSplit(ImGuiContext* ctx, ImGuiDockNode* parent_node, ImGuiAxis split_axis, int split_first_child, float split_ratio, ImGuiDockNode* new_node); + static void DockNodeTreeMerge(ImGuiContext* ctx, ImGuiDockNode* parent_node, ImGuiDockNode* merge_lead_child); + static void DockNodeTreeUpdatePosSize(ImGuiDockNode* node, ImVec2 pos, ImVec2 size, ImGuiDockNode* only_write_to_single_node = NULL); + static void DockNodeTreeUpdateSplitter(ImGuiDockNode* node); + static ImGuiDockNode* DockNodeTreeFindVisibleNodeByPos(ImGuiDockNode* node, ImVec2 pos); + static ImGuiDockNode* DockNodeTreeFindFallbackLeafNode(ImGuiDockNode* node); + + // Settings + static void DockSettingsRenameNodeReferences(ImGuiID old_node_id, ImGuiID new_node_id); + static void DockSettingsRemoveNodeReferences(ImGuiID* node_ids, int node_ids_count); + static ImGuiDockNodeSettings* DockSettingsFindNodeSettings(ImGuiContext* ctx, ImGuiID node_id); + static void DockSettingsHandler_ClearAll(ImGuiContext*, ImGuiSettingsHandler*); + static void DockSettingsHandler_ApplyAll(ImGuiContext*, ImGuiSettingsHandler*); + static void* DockSettingsHandler_ReadOpen(ImGuiContext*, ImGuiSettingsHandler*, const char* name); + static void DockSettingsHandler_ReadLine(ImGuiContext*, ImGuiSettingsHandler*, void* entry, const char* line); + static void DockSettingsHandler_WriteAll(ImGuiContext* imgui_ctx, ImGuiSettingsHandler* handler, ImGuiTextBuffer* buf); +} + +//----------------------------------------------------------------------------- +// Docking: ImGuiDockContext +//----------------------------------------------------------------------------- +// The lifetime model is different from the one of regular windows: we always create a ImGuiDockNode for each ImGuiDockNodeSettings, +// or we always hold the entire docking node tree. Nodes are frequently hidden, e.g. if the window(s) or child nodes they host are not active. +// At boot time only, we run a simple GC to remove nodes that have no references. +// Because dock node settings (which are small, contiguous structures) are always mirrored by their corresponding dock nodes (more complete structures), +// we can also very easily recreate the nodes from scratch given the settings data (this is what DockContextRebuild() does). +// This is convenient as docking reconfiguration can be implemented by mostly poking at the simpler settings data. +//----------------------------------------------------------------------------- +// - DockContextInitialize() +// - DockContextShutdown() +// - DockContextClearNodes() +// - DockContextRebuildNodes() +// - DockContextNewFrameUpdateUndocking() +// - DockContextNewFrameUpdateDocking() +// - DockContextEndFrame() +// - DockContextFindNodeByID() +// - DockContextBindNodeToWindow() +// - DockContextGenNodeID() +// - DockContextAddNode() +// - DockContextRemoveNode() +// - ImGuiDockContextPruneNodeData +// - DockContextPruneUnusedSettingsNodes() +// - DockContextBuildNodesFromSettings() +// - DockContextBuildAddWindowsToNodes() +//----------------------------------------------------------------------------- + +void ImGui::DockContextInitialize(ImGuiContext* ctx) +{ + ImGuiContext& g = *ctx; + + // Add .ini handle for persistent docking data + ImGuiSettingsHandler ini_handler; + ini_handler.TypeName = "Docking"; + ini_handler.TypeHash = ImHashStr("Docking"); + ini_handler.ClearAllFn = DockSettingsHandler_ClearAll; + ini_handler.ReadInitFn = DockSettingsHandler_ClearAll; // Also clear on read + ini_handler.ReadOpenFn = DockSettingsHandler_ReadOpen; + ini_handler.ReadLineFn = DockSettingsHandler_ReadLine; + ini_handler.ApplyAllFn = DockSettingsHandler_ApplyAll; + ini_handler.WriteAllFn = DockSettingsHandler_WriteAll; + g.SettingsHandlers.push_back(ini_handler); + + g.DockNodeWindowMenuHandler = &DockNodeWindowMenuHandler_Default; +} + +void ImGui::DockContextShutdown(ImGuiContext* ctx) +{ + ImGuiDockContext* dc = &ctx->DockContext; + for (int n = 0; n < dc->Nodes.Data.Size; n++) + if (ImGuiDockNode* node = (ImGuiDockNode*)dc->Nodes.Data[n].val_p) + IM_DELETE(node); +} + +void ImGui::DockContextClearNodes(ImGuiContext* ctx, ImGuiID root_id, bool clear_settings_refs) +{ + IM_UNUSED(ctx); + IM_ASSERT(ctx == GImGui); + DockBuilderRemoveNodeDockedWindows(root_id, clear_settings_refs); + DockBuilderRemoveNodeChildNodes(root_id); +} + +// [DEBUG] This function also acts as a defacto test to make sure we can rebuild from scratch without a glitch +// (Different from DockSettingsHandler_ClearAll() + DockSettingsHandler_ApplyAll() because this reuses current settings!) +void ImGui::DockContextRebuildNodes(ImGuiContext* ctx) +{ + ImGuiContext& g = *ctx; + ImGuiDockContext* dc = &ctx->DockContext; + IMGUI_DEBUG_LOG_DOCKING("[docking] DockContextRebuildNodes\n"); + SaveIniSettingsToMemory(); + ImGuiID root_id = 0; // Rebuild all + DockContextClearNodes(ctx, root_id, false); + DockContextBuildNodesFromSettings(ctx, dc->NodesSettings.Data, dc->NodesSettings.Size); + DockContextBuildAddWindowsToNodes(ctx, root_id); +} + +// Docking context update function, called by NewFrame() +void ImGui::DockContextNewFrameUpdateUndocking(ImGuiContext* ctx) +{ + ImGuiContext& g = *ctx; + ImGuiDockContext* dc = &ctx->DockContext; + if (!(g.IO.ConfigFlags & ImGuiConfigFlags_DockingEnable)) + { + if (dc->Nodes.Data.Size > 0 || dc->Requests.Size > 0) + DockContextClearNodes(ctx, 0, true); + return; + } + + // Setting NoSplit at runtime merges all nodes + if (g.IO.ConfigDockingNoSplit) + for (int n = 0; n < dc->Nodes.Data.Size; n++) + if (ImGuiDockNode* node = (ImGuiDockNode*)dc->Nodes.Data[n].val_p) + if (node->IsRootNode() && node->IsSplitNode()) + { + DockBuilderRemoveNodeChildNodes(node->ID); + //dc->WantFullRebuild = true; + } + + // Process full rebuild +#if 0 + if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_C))) + dc->WantFullRebuild = true; +#endif + if (dc->WantFullRebuild) + { + DockContextRebuildNodes(ctx); + dc->WantFullRebuild = false; + } + + // Process Undocking requests (we need to process them _before_ the UpdateMouseMovingWindowNewFrame call in NewFrame) + for (ImGuiDockRequest& req : dc->Requests) + { + if (req.Type == ImGuiDockRequestType_Undock && req.UndockTargetWindow) + DockContextProcessUndockWindow(ctx, req.UndockTargetWindow); + else if (req.Type == ImGuiDockRequestType_Undock && req.UndockTargetNode) + DockContextProcessUndockNode(ctx, req.UndockTargetNode); + } +} + +// Docking context update function, called by NewFrame() +void ImGui::DockContextNewFrameUpdateDocking(ImGuiContext* ctx) +{ + ImGuiContext& g = *ctx; + ImGuiDockContext* dc = &ctx->DockContext; + if (!(g.IO.ConfigFlags & ImGuiConfigFlags_DockingEnable)) + return; + + // [DEBUG] Store hovered dock node. + // We could in theory use DockNodeTreeFindVisibleNodeByPos() on the root host dock node, but using ->DockNode is a good shortcut. + // Note this is mostly a debug thing and isn't actually used for docking target, because docking involve more detailed filtering. + g.DebugHoveredDockNode = NULL; + if (ImGuiWindow* hovered_window = g.HoveredWindowUnderMovingWindow) + { + if (hovered_window->DockNodeAsHost) + g.DebugHoveredDockNode = DockNodeTreeFindVisibleNodeByPos(hovered_window->DockNodeAsHost, g.IO.MousePos); + else if (hovered_window->RootWindow->DockNode) + g.DebugHoveredDockNode = hovered_window->RootWindow->DockNode; + } + + // Process Docking requests + for (ImGuiDockRequest& req : dc->Requests) + if (req.Type == ImGuiDockRequestType_Dock) + DockContextProcessDock(ctx, &req); + dc->Requests.resize(0); + + // Create windows for each automatic docking nodes + // We can have NULL pointers when we delete nodes, but because ID are recycled this should amortize nicely (and our node count will never be very high) + for (int n = 0; n < dc->Nodes.Data.Size; n++) + if (ImGuiDockNode* node = (ImGuiDockNode*)dc->Nodes.Data[n].val_p) + if (node->IsFloatingNode()) + DockNodeUpdate(node); +} + +void ImGui::DockContextEndFrame(ImGuiContext* ctx) +{ + // Draw backgrounds of node missing their window + ImGuiContext& g = *ctx; + ImGuiDockContext* dc = &g.DockContext; + for (int n = 0; n < dc->Nodes.Data.Size; n++) + if (ImGuiDockNode* node = (ImGuiDockNode*)dc->Nodes.Data[n].val_p) + if (node->LastFrameActive == g.FrameCount && node->IsVisible && node->HostWindow && node->IsLeafNode() && !node->IsBgDrawnThisFrame) + { + ImRect bg_rect(node->Pos + ImVec2(0.0f, GetFrameHeight()), node->Pos + node->Size); + ImDrawFlags bg_rounding_flags = CalcRoundingFlagsForRectInRect(bg_rect, node->HostWindow->Rect(), g.Style.DockingSeparatorSize); + node->HostWindow->DrawList->ChannelsSetCurrent(DOCKING_HOST_DRAW_CHANNEL_BG); + node->HostWindow->DrawList->AddRectFilled(bg_rect.Min, bg_rect.Max, node->LastBgColor, node->HostWindow->WindowRounding, bg_rounding_flags); + } +} + +ImGuiDockNode* ImGui::DockContextFindNodeByID(ImGuiContext* ctx, ImGuiID id) +{ + return (ImGuiDockNode*)ctx->DockContext.Nodes.GetVoidPtr(id); +} + +ImGuiID ImGui::DockContextGenNodeID(ImGuiContext* ctx) +{ + // Generate an ID for new node (the exact ID value doesn't matter as long as it is not already used) + // FIXME-OPT FIXME-DOCK: This is suboptimal, even if the node count is small enough not to be a worry.0 + // We should poke in ctx->Nodes to find a suitable ID faster. Even more so trivial that ctx->Nodes lookup is already sorted. + ImGuiID id = 0x0001; + while (DockContextFindNodeByID(ctx, id) != NULL) + id++; + return id; +} + +static ImGuiDockNode* ImGui::DockContextAddNode(ImGuiContext* ctx, ImGuiID id) +{ + // Generate an ID for the new node (the exact ID value doesn't matter as long as it is not already used) and add the first window. + ImGuiContext& g = *ctx; + if (id == 0) + id = DockContextGenNodeID(ctx); + else + IM_ASSERT(DockContextFindNodeByID(ctx, id) == NULL); + + // We don't set node->LastFrameAlive on construction. Nodes are always created at all time to reflect .ini settings! + IMGUI_DEBUG_LOG_DOCKING("[docking] DockContextAddNode 0x%08X\n", id); + ImGuiDockNode* node = IM_NEW(ImGuiDockNode)(id); + ctx->DockContext.Nodes.SetVoidPtr(node->ID, node); + return node; +} + +static void ImGui::DockContextRemoveNode(ImGuiContext* ctx, ImGuiDockNode* node, bool merge_sibling_into_parent_node) +{ + ImGuiContext& g = *ctx; + ImGuiDockContext* dc = &ctx->DockContext; + + IMGUI_DEBUG_LOG_DOCKING("[docking] DockContextRemoveNode 0x%08X\n", node->ID); + IM_ASSERT(DockContextFindNodeByID(ctx, node->ID) == node); + IM_ASSERT(node->ChildNodes[0] == NULL && node->ChildNodes[1] == NULL); + IM_ASSERT(node->Windows.Size == 0); + + if (node->HostWindow) + node->HostWindow->DockNodeAsHost = NULL; + + ImGuiDockNode* parent_node = node->ParentNode; + const bool merge = (merge_sibling_into_parent_node && parent_node != NULL); + if (merge) + { + IM_ASSERT(parent_node->ChildNodes[0] == node || parent_node->ChildNodes[1] == node); + ImGuiDockNode* sibling_node = (parent_node->ChildNodes[0] == node ? parent_node->ChildNodes[1] : parent_node->ChildNodes[0]); + DockNodeTreeMerge(&g, parent_node, sibling_node); + } + else + { + for (int n = 0; parent_node && n < IM_ARRAYSIZE(parent_node->ChildNodes); n++) + if (parent_node->ChildNodes[n] == node) + node->ParentNode->ChildNodes[n] = NULL; + dc->Nodes.SetVoidPtr(node->ID, NULL); + IM_DELETE(node); + } +} + +static int IMGUI_CDECL DockNodeComparerDepthMostFirst(const void* lhs, const void* rhs) +{ + const ImGuiDockNode* a = *(const ImGuiDockNode* const*)lhs; + const ImGuiDockNode* b = *(const ImGuiDockNode* const*)rhs; + return ImGui::DockNodeGetDepth(b) - ImGui::DockNodeGetDepth(a); +} + +// Pre C++0x doesn't allow us to use a function-local type (without linkage) as template parameter, so we moved this here. +struct ImGuiDockContextPruneNodeData +{ + int CountWindows, CountChildWindows, CountChildNodes; + ImGuiID RootId; + ImGuiDockContextPruneNodeData() { CountWindows = CountChildWindows = CountChildNodes = 0; RootId = 0; } +}; + +// Garbage collect unused nodes (run once at init time) +static void ImGui::DockContextPruneUnusedSettingsNodes(ImGuiContext* ctx) +{ + ImGuiContext& g = *ctx; + ImGuiDockContext* dc = &ctx->DockContext; + IM_ASSERT(g.Windows.Size == 0); + + ImPool pool; + pool.Reserve(dc->NodesSettings.Size); + + // Count child nodes and compute RootID + for (int settings_n = 0; settings_n < dc->NodesSettings.Size; settings_n++) + { + ImGuiDockNodeSettings* settings = &dc->NodesSettings[settings_n]; + ImGuiDockContextPruneNodeData* parent_data = settings->ParentNodeId ? pool.GetByKey(settings->ParentNodeId) : 0; + pool.GetOrAddByKey(settings->ID)->RootId = parent_data ? parent_data->RootId : settings->ID; + if (settings->ParentNodeId) + pool.GetOrAddByKey(settings->ParentNodeId)->CountChildNodes++; + } + + // Count reference to dock ids from dockspaces + // We track the 'auto-DockNode <- manual-Window <- manual-DockSpace' in order to avoid 'auto-DockNode' being ditched by DockContextPruneUnusedSettingsNodes() + for (int settings_n = 0; settings_n < dc->NodesSettings.Size; settings_n++) + { + ImGuiDockNodeSettings* settings = &dc->NodesSettings[settings_n]; + if (settings->ParentWindowId != 0) + if (ImGuiWindowSettings* window_settings = FindWindowSettingsByID(settings->ParentWindowId)) + if (window_settings->DockId) + if (ImGuiDockContextPruneNodeData* data = pool.GetByKey(window_settings->DockId)) + data->CountChildNodes++; + } + + // Count reference to dock ids from window settings + // We guard against the possibility of an invalid .ini file (RootID may point to a missing node) + for (ImGuiWindowSettings* settings = g.SettingsWindows.begin(); settings != NULL; settings = g.SettingsWindows.next_chunk(settings)) + if (ImGuiID dock_id = settings->DockId) + if (ImGuiDockContextPruneNodeData* data = pool.GetByKey(dock_id)) + { + data->CountWindows++; + if (ImGuiDockContextPruneNodeData* data_root = (data->RootId == dock_id) ? data : pool.GetByKey(data->RootId)) + data_root->CountChildWindows++; + } + + // Prune + for (int settings_n = 0; settings_n < dc->NodesSettings.Size; settings_n++) + { + ImGuiDockNodeSettings* settings = &dc->NodesSettings[settings_n]; + ImGuiDockContextPruneNodeData* data = pool.GetByKey(settings->ID); + if (data->CountWindows > 1) + continue; + ImGuiDockContextPruneNodeData* data_root = (data->RootId == settings->ID) ? data : pool.GetByKey(data->RootId); + + bool remove = false; + remove |= (data->CountWindows == 1 && settings->ParentNodeId == 0 && data->CountChildNodes == 0 && !(settings->Flags & ImGuiDockNodeFlags_CentralNode)); // Floating root node with only 1 window + remove |= (data->CountWindows == 0 && settings->ParentNodeId == 0 && data->CountChildNodes == 0); // Leaf nodes with 0 window + remove |= (data_root->CountChildWindows == 0); + if (remove) + { + IMGUI_DEBUG_LOG_DOCKING("[docking] DockContextPruneUnusedSettingsNodes: Prune 0x%08X\n", settings->ID); + DockSettingsRemoveNodeReferences(&settings->ID, 1); + settings->ID = 0; + } + } +} + +static void ImGui::DockContextBuildNodesFromSettings(ImGuiContext* ctx, ImGuiDockNodeSettings* node_settings_array, int node_settings_count) +{ + // Build nodes + for (int node_n = 0; node_n < node_settings_count; node_n++) + { + ImGuiDockNodeSettings* settings = &node_settings_array[node_n]; + if (settings->ID == 0) + continue; + ImGuiDockNode* node = DockContextAddNode(ctx, settings->ID); + node->ParentNode = settings->ParentNodeId ? DockContextFindNodeByID(ctx, settings->ParentNodeId) : NULL; + node->Pos = ImVec2(settings->Pos.x, settings->Pos.y); + node->Size = ImVec2(settings->Size.x, settings->Size.y); + node->SizeRef = ImVec2(settings->SizeRef.x, settings->SizeRef.y); + node->AuthorityForPos = node->AuthorityForSize = node->AuthorityForViewport = ImGuiDataAuthority_DockNode; + if (node->ParentNode && node->ParentNode->ChildNodes[0] == NULL) + node->ParentNode->ChildNodes[0] = node; + else if (node->ParentNode && node->ParentNode->ChildNodes[1] == NULL) + node->ParentNode->ChildNodes[1] = node; + node->SelectedTabId = settings->SelectedTabId; + node->SplitAxis = (ImGuiAxis)settings->SplitAxis; + node->SetLocalFlags(settings->Flags & ImGuiDockNodeFlags_SavedFlagsMask_); + + // Bind host window immediately if it already exist (in case of a rebuild) + // This is useful as the RootWindowForTitleBarHighlight links necessary to highlight the currently focused node requires node->HostWindow to be set. + char host_window_title[20]; + ImGuiDockNode* root_node = DockNodeGetRootNode(node); + node->HostWindow = FindWindowByName(DockNodeGetHostWindowTitle(root_node, host_window_title, IM_ARRAYSIZE(host_window_title))); + } +} + +void ImGui::DockContextBuildAddWindowsToNodes(ImGuiContext* ctx, ImGuiID root_id) +{ + // Rebind all windows to nodes (they can also lazily rebind but we'll have a visible glitch during the first frame) + ImGuiContext& g = *ctx; + for (ImGuiWindow* window : g.Windows) + { + if (window->DockId == 0 || window->LastFrameActive < g.FrameCount - 1) + continue; + if (window->DockNode != NULL) + continue; + + ImGuiDockNode* node = DockContextFindNodeByID(ctx, window->DockId); + IM_ASSERT(node != NULL); // This should have been called after DockContextBuildNodesFromSettings() + if (root_id == 0 || DockNodeGetRootNode(node)->ID == root_id) + DockNodeAddWindow(node, window, true); + } +} + +//----------------------------------------------------------------------------- +// Docking: ImGuiDockContext Docking/Undocking functions +//----------------------------------------------------------------------------- +// - DockContextQueueDock() +// - DockContextQueueUndockWindow() +// - DockContextQueueUndockNode() +// - DockContextQueueNotifyRemovedNode() +// - DockContextProcessDock() +// - DockContextProcessUndockWindow() +// - DockContextProcessUndockNode() +// - DockContextCalcDropPosForDocking() +//----------------------------------------------------------------------------- + +void ImGui::DockContextQueueDock(ImGuiContext* ctx, ImGuiWindow* target, ImGuiDockNode* target_node, ImGuiWindow* payload, ImGuiDir split_dir, float split_ratio, bool split_outer) +{ + IM_ASSERT(target != payload); + ImGuiDockRequest req; + req.Type = ImGuiDockRequestType_Dock; + req.DockTargetWindow = target; + req.DockTargetNode = target_node; + req.DockPayload = payload; + req.DockSplitDir = split_dir; + req.DockSplitRatio = split_ratio; + req.DockSplitOuter = split_outer; + ctx->DockContext.Requests.push_back(req); +} + +void ImGui::DockContextQueueUndockWindow(ImGuiContext* ctx, ImGuiWindow* window) +{ + ImGuiDockRequest req; + req.Type = ImGuiDockRequestType_Undock; + req.UndockTargetWindow = window; + ctx->DockContext.Requests.push_back(req); +} + +void ImGui::DockContextQueueUndockNode(ImGuiContext* ctx, ImGuiDockNode* node) +{ + ImGuiDockRequest req; + req.Type = ImGuiDockRequestType_Undock; + req.UndockTargetNode = node; + ctx->DockContext.Requests.push_back(req); +} + +void ImGui::DockContextQueueNotifyRemovedNode(ImGuiContext* ctx, ImGuiDockNode* node) +{ + ImGuiDockContext* dc = &ctx->DockContext; + for (ImGuiDockRequest& req : dc->Requests) + if (req.DockTargetNode == node) + req.Type = ImGuiDockRequestType_None; +} + +void ImGui::DockContextProcessDock(ImGuiContext* ctx, ImGuiDockRequest* req) +{ + IM_ASSERT((req->Type == ImGuiDockRequestType_Dock && req->DockPayload != NULL) || (req->Type == ImGuiDockRequestType_Split && req->DockPayload == NULL)); + IM_ASSERT(req->DockTargetWindow != NULL || req->DockTargetNode != NULL); + + ImGuiContext& g = *ctx; + IM_UNUSED(g); + + ImGuiWindow* payload_window = req->DockPayload; // Optional + ImGuiWindow* target_window = req->DockTargetWindow; + ImGuiDockNode* node = req->DockTargetNode; + if (payload_window) + IMGUI_DEBUG_LOG_DOCKING("[docking] DockContextProcessDock node 0x%08X target '%s' dock window '%s', split_dir %d\n", node ? node->ID : 0, target_window ? target_window->Name : "NULL", payload_window->Name, req->DockSplitDir); + else + IMGUI_DEBUG_LOG_DOCKING("[docking] DockContextProcessDock node 0x%08X, split_dir %d\n", node ? node->ID : 0, req->DockSplitDir); + + // Decide which Tab will be selected at the end of the operation + ImGuiID next_selected_id = 0; + ImGuiDockNode* payload_node = NULL; + if (payload_window) + { + payload_node = payload_window->DockNodeAsHost; + payload_window->DockNodeAsHost = NULL; // Important to clear this as the node will have its life as a child which might be merged/deleted later. + if (payload_node && payload_node->IsLeafNode()) + next_selected_id = payload_node->TabBar->NextSelectedTabId ? payload_node->TabBar->NextSelectedTabId : payload_node->TabBar->SelectedTabId; + if (payload_node == NULL) + next_selected_id = payload_window->TabId; + } + + // FIXME-DOCK: When we are trying to dock an existing single-window node into a loose window, transfer Node ID as well + // When processing an interactive split, usually LastFrameAlive will be < g.FrameCount. But DockBuilder operations can make it ==. + if (node) + IM_ASSERT(node->LastFrameAlive <= g.FrameCount); + if (node && target_window && node == target_window->DockNodeAsHost) + IM_ASSERT(node->Windows.Size > 0 || node->IsSplitNode() || node->IsCentralNode()); + + // Create new node and add existing window to it + if (node == NULL) + { + node = DockContextAddNode(ctx, 0); + node->Pos = target_window->Pos; + node->Size = target_window->Size; + if (target_window->DockNodeAsHost == NULL) + { + DockNodeAddWindow(node, target_window, true); + node->TabBar->Tabs[0].Flags &= ~ImGuiTabItemFlags_Unsorted; + target_window->DockIsActive = true; + } + } + + ImGuiDir split_dir = req->DockSplitDir; + if (split_dir != ImGuiDir_None) + { + // Split into two, one side will be our payload node unless we are dropping a loose window + const ImGuiAxis split_axis = (split_dir == ImGuiDir_Left || split_dir == ImGuiDir_Right) ? ImGuiAxis_X : ImGuiAxis_Y; + const int split_inheritor_child_idx = (split_dir == ImGuiDir_Left || split_dir == ImGuiDir_Up) ? 1 : 0; // Current contents will be moved to the opposite side + const float split_ratio = req->DockSplitRatio; + DockNodeTreeSplit(ctx, node, split_axis, split_inheritor_child_idx, split_ratio, payload_node); // payload_node may be NULL here! + ImGuiDockNode* new_node = node->ChildNodes[split_inheritor_child_idx ^ 1]; + new_node->HostWindow = node->HostWindow; + node = new_node; + } + node->SetLocalFlags(node->LocalFlags & ~ImGuiDockNodeFlags_HiddenTabBar); + + if (node != payload_node) + { + // Create tab bar before we call DockNodeMoveWindows (which would attempt to move the old tab-bar, which would lead us to payload tabs wrongly appearing before target tabs!) + if (node->Windows.Size > 0 && node->TabBar == NULL) + { + DockNodeAddTabBar(node); + for (int n = 0; n < node->Windows.Size; n++) + TabBarAddTab(node->TabBar, ImGuiTabItemFlags_None, node->Windows[n]); + } + + if (payload_node != NULL) + { + // Transfer full payload node (with 1+ child windows or child nodes) + if (payload_node->IsSplitNode()) + { + if (node->Windows.Size > 0) + { + // We can dock a split payload into a node that already has windows _only_ if our payload is a node tree with a single visible node. + // In this situation, we move the windows of the target node into the currently visible node of the payload. + // This allows us to preserve some of the underlying dock tree settings nicely. + IM_ASSERT(payload_node->OnlyNodeWithWindows != NULL); // The docking should have been blocked by DockNodePreviewDockSetup() early on and never submitted. + ImGuiDockNode* visible_node = payload_node->OnlyNodeWithWindows; + if (visible_node->TabBar) + IM_ASSERT(visible_node->TabBar->Tabs.Size > 0); + DockNodeMoveWindows(node, visible_node); + DockNodeMoveWindows(visible_node, node); + DockSettingsRenameNodeReferences(node->ID, visible_node->ID); + } + if (node->IsCentralNode()) + { + // Central node property needs to be moved to a leaf node, pick the last focused one. + // FIXME-DOCK: If we had to transfer other flags here, what would the policy be? + ImGuiDockNode* last_focused_node = DockContextFindNodeByID(ctx, payload_node->LastFocusedNodeId); + IM_ASSERT(last_focused_node != NULL); + ImGuiDockNode* last_focused_root_node = DockNodeGetRootNode(last_focused_node); + IM_ASSERT(last_focused_root_node == DockNodeGetRootNode(payload_node)); + last_focused_node->SetLocalFlags(last_focused_node->LocalFlags | ImGuiDockNodeFlags_CentralNode); + node->SetLocalFlags(node->LocalFlags & ~ImGuiDockNodeFlags_CentralNode); + last_focused_root_node->CentralNode = last_focused_node; + } + + IM_ASSERT(node->Windows.Size == 0); + DockNodeMoveChildNodes(node, payload_node); + } + else + { + const ImGuiID payload_dock_id = payload_node->ID; + DockNodeMoveWindows(node, payload_node); + DockSettingsRenameNodeReferences(payload_dock_id, node->ID); + } + DockContextRemoveNode(ctx, payload_node, true); + } + else if (payload_window) + { + // Transfer single window + const ImGuiID payload_dock_id = payload_window->DockId; + node->VisibleWindow = payload_window; + DockNodeAddWindow(node, payload_window, true); + if (payload_dock_id != 0) + DockSettingsRenameNodeReferences(payload_dock_id, node->ID); + } + } + else + { + // When docking a floating single window node we want to reevaluate auto-hiding of the tab bar + node->WantHiddenTabBarUpdate = true; + } + + // Update selection immediately + if (ImGuiTabBar* tab_bar = node->TabBar) + tab_bar->NextSelectedTabId = next_selected_id; + MarkIniSettingsDirty(); +} + +// Problem: +// Undocking a large (~full screen) window would leave it so large that the bottom right sizing corner would more +// than likely be off the screen and the window would be hard to resize to fit on screen. This can be particularly problematic +// with 'ConfigWindowsMoveFromTitleBarOnly=true' and/or with 'ConfigWindowsResizeFromEdges=false' as well (the later can be +// due to missing ImGuiBackendFlags_HasMouseCursors backend flag). +// Solution: +// When undocking a window we currently force its maximum size to 90% of the host viewport or monitor. +// Reevaluate this when we implement preserving docked/undocked size ("docking_wip/undocked_size" branch). +static ImVec2 FixLargeWindowsWhenUndocking(const ImVec2& size, ImGuiViewport* ref_viewport) +{ + if (ref_viewport == NULL) + return size; + + ImGuiContext& g = *GImGui; + ImVec2 max_size = ImTrunc(ref_viewport->WorkSize * 0.90f); + if (g.ConfigFlagsCurrFrame & ImGuiConfigFlags_ViewportsEnable) + { + const ImGuiPlatformMonitor* monitor = ImGui::GetViewportPlatformMonitor(ref_viewport); + max_size = ImTrunc(monitor->WorkSize * 0.90f); + } + return ImMin(size, max_size); +} + +void ImGui::DockContextProcessUndockWindow(ImGuiContext* ctx, ImGuiWindow* window, bool clear_persistent_docking_ref) +{ + ImGuiContext& g = *ctx; + IMGUI_DEBUG_LOG_DOCKING("[docking] DockContextProcessUndockWindow window '%s', clear_persistent_docking_ref = %d\n", window->Name, clear_persistent_docking_ref); + if (window->DockNode) + DockNodeRemoveWindow(window->DockNode, window, clear_persistent_docking_ref ? 0 : window->DockId); + else + window->DockId = 0; + window->Collapsed = false; + window->DockIsActive = false; + window->DockNodeIsVisible = window->DockTabIsVisible = false; + window->Size = window->SizeFull = FixLargeWindowsWhenUndocking(window->SizeFull, window->Viewport); + + MarkIniSettingsDirty(); +} + +void ImGui::DockContextProcessUndockNode(ImGuiContext* ctx, ImGuiDockNode* node) +{ + ImGuiContext& g = *ctx; + IMGUI_DEBUG_LOG_DOCKING("[docking] DockContextProcessUndockNode node %08X\n", node->ID); + IM_ASSERT(node->IsLeafNode()); + IM_ASSERT(node->Windows.Size >= 1); + + if (node->IsRootNode() || node->IsCentralNode()) + { + // In the case of a root node or central node, the node will have to stay in place. Create a new node to receive the payload. + ImGuiDockNode* new_node = DockContextAddNode(ctx, 0); + new_node->Pos = node->Pos; + new_node->Size = node->Size; + new_node->SizeRef = node->SizeRef; + DockNodeMoveWindows(new_node, node); + DockSettingsRenameNodeReferences(node->ID, new_node->ID); + node = new_node; + } + else + { + // Otherwise extract our node and merge our sibling back into the parent node. + IM_ASSERT(node->ParentNode->ChildNodes[0] == node || node->ParentNode->ChildNodes[1] == node); + int index_in_parent = (node->ParentNode->ChildNodes[0] == node) ? 0 : 1; + node->ParentNode->ChildNodes[index_in_parent] = NULL; + DockNodeTreeMerge(ctx, node->ParentNode, node->ParentNode->ChildNodes[index_in_parent ^ 1]); + node->ParentNode->AuthorityForViewport = ImGuiDataAuthority_Window; // The node that stays in place keeps the viewport, so our newly dragged out node will create a new viewport + node->ParentNode = NULL; + } + for (ImGuiWindow* window : node->Windows) + { + window->Flags &= ~ImGuiWindowFlags_ChildWindow; + if (window->ParentWindow) + window->ParentWindow->DC.ChildWindows.find_erase(window); + UpdateWindowParentAndRootLinks(window, window->Flags, NULL); + } + node->AuthorityForPos = node->AuthorityForSize = ImGuiDataAuthority_DockNode; + node->Size = FixLargeWindowsWhenUndocking(node->Size, node->Windows[0]->Viewport); + node->WantMouseMove = true; + MarkIniSettingsDirty(); +} + +// This is mostly used for automation. +bool ImGui::DockContextCalcDropPosForDocking(ImGuiWindow* target, ImGuiDockNode* target_node, ImGuiWindow* payload_window, ImGuiDockNode* payload_node, ImGuiDir split_dir, bool split_outer, ImVec2* out_pos) +{ + if (target != NULL && target_node == NULL) + target_node = target->DockNode; + + // In DockNodePreviewDockSetup() for a root central node instead of showing both "inner" and "outer" drop rects + // (which would be functionally identical) we only show the outer one. Reflect this here. + if (target_node && target_node->ParentNode == NULL && target_node->IsCentralNode() && split_dir != ImGuiDir_None) + split_outer = true; + ImGuiDockPreviewData split_data; + DockNodePreviewDockSetup(target, target_node, payload_window, payload_node, &split_data, false, split_outer); + if (split_data.DropRectsDraw[split_dir+1].IsInverted()) + return false; + *out_pos = split_data.DropRectsDraw[split_dir+1].GetCenter(); + return true; +} + +//----------------------------------------------------------------------------- +// Docking: ImGuiDockNode +//----------------------------------------------------------------------------- +// - DockNodeGetTabOrder() +// - DockNodeAddWindow() +// - DockNodeRemoveWindow() +// - DockNodeMoveChildNodes() +// - DockNodeMoveWindows() +// - DockNodeApplyPosSizeToWindows() +// - DockNodeHideHostWindow() +// - ImGuiDockNodeFindInfoResults +// - DockNodeFindInfo() +// - DockNodeFindWindowByID() +// - DockNodeUpdateFlagsAndCollapse() +// - DockNodeUpdateHasCentralNodeFlag() +// - DockNodeUpdateVisibleFlag() +// - DockNodeStartMouseMovingWindow() +// - DockNodeUpdate() +// - DockNodeUpdateWindowMenu() +// - DockNodeBeginAmendTabBar() +// - DockNodeEndAmendTabBar() +// - DockNodeUpdateTabBar() +// - DockNodeAddTabBar() +// - DockNodeRemoveTabBar() +// - DockNodeIsDropAllowedOne() +// - DockNodeIsDropAllowed() +// - DockNodeCalcTabBarLayout() +// - DockNodeCalcSplitRects() +// - DockNodeCalcDropRectsAndTestMousePos() +// - DockNodePreviewDockSetup() +// - DockNodePreviewDockRender() +//----------------------------------------------------------------------------- + +ImGuiDockNode::ImGuiDockNode(ImGuiID id) +{ + ID = id; + SharedFlags = LocalFlags = LocalFlagsInWindows = MergedFlags = ImGuiDockNodeFlags_None; + ParentNode = ChildNodes[0] = ChildNodes[1] = NULL; + TabBar = NULL; + SplitAxis = ImGuiAxis_None; + + State = ImGuiDockNodeState_Unknown; + LastBgColor = IM_COL32_WHITE; + HostWindow = VisibleWindow = NULL; + CentralNode = OnlyNodeWithWindows = NULL; + CountNodeWithWindows = 0; + LastFrameAlive = LastFrameActive = LastFrameFocused = -1; + LastFocusedNodeId = 0; + SelectedTabId = 0; + WantCloseTabId = 0; + RefViewportId = 0; + AuthorityForPos = AuthorityForSize = ImGuiDataAuthority_DockNode; + AuthorityForViewport = ImGuiDataAuthority_Auto; + IsVisible = true; + IsFocused = HasCloseButton = HasWindowMenuButton = HasCentralNodeChild = false; + IsBgDrawnThisFrame = false; + WantCloseAll = WantLockSizeOnce = WantMouseMove = WantHiddenTabBarUpdate = WantHiddenTabBarToggle = false; +} + +ImGuiDockNode::~ImGuiDockNode() +{ + IM_DELETE(TabBar); + TabBar = NULL; + ChildNodes[0] = ChildNodes[1] = NULL; +} + +int ImGui::DockNodeGetTabOrder(ImGuiWindow* window) +{ + ImGuiTabBar* tab_bar = window->DockNode->TabBar; + if (tab_bar == NULL) + return -1; + ImGuiTabItem* tab = TabBarFindTabByID(tab_bar, window->TabId); + return tab ? TabBarGetTabOrder(tab_bar, tab) : -1; +} + +static void DockNodeHideWindowDuringHostWindowCreation(ImGuiWindow* window) +{ + window->Hidden = true; + window->HiddenFramesCanSkipItems = window->Active ? 1 : 2; +} + +static void ImGui::DockNodeAddWindow(ImGuiDockNode* node, ImGuiWindow* window, bool add_to_tab_bar) +{ + ImGuiContext& g = *GImGui; (void)g; + if (window->DockNode) + { + // Can overwrite an existing window->DockNode (e.g. pointing to a disabled DockSpace node) + IM_ASSERT(window->DockNode->ID != node->ID); + DockNodeRemoveWindow(window->DockNode, window, 0); + } + IM_ASSERT(window->DockNode == NULL || window->DockNodeAsHost == NULL); + IMGUI_DEBUG_LOG_DOCKING("[docking] DockNodeAddWindow node 0x%08X window '%s'\n", node->ID, window->Name); + + // If more than 2 windows appeared on the same frame leading to the creation of a new hosting window, + // we'll hide windows until the host window is ready. Hide the 1st window after its been output (so it is not visible for one frame). + // We will call DockNodeHideWindowDuringHostWindowCreation() on ourselves in Begin() + if (node->HostWindow == NULL && node->Windows.Size == 1 && node->Windows[0]->WasActive == false) + DockNodeHideWindowDuringHostWindowCreation(node->Windows[0]); + + node->Windows.push_back(window); + node->WantHiddenTabBarUpdate = true; + window->DockNode = node; + window->DockId = node->ID; + window->DockIsActive = (node->Windows.Size > 1); + window->DockTabWantClose = false; + + // When reactivating a node with one or two loose window, the window pos/size/viewport are authoritative over the node storage. + // In particular it is important we init the viewport from the first window so we don't create two viewports and drop one. + if (node->HostWindow == NULL && node->IsFloatingNode()) + { + if (node->AuthorityForPos == ImGuiDataAuthority_Auto) + node->AuthorityForPos = ImGuiDataAuthority_Window; + if (node->AuthorityForSize == ImGuiDataAuthority_Auto) + node->AuthorityForSize = ImGuiDataAuthority_Window; + if (node->AuthorityForViewport == ImGuiDataAuthority_Auto) + node->AuthorityForViewport = ImGuiDataAuthority_Window; + } + + // Add to tab bar if requested + if (add_to_tab_bar) + { + if (node->TabBar == NULL) + { + DockNodeAddTabBar(node); + node->TabBar->SelectedTabId = node->TabBar->NextSelectedTabId = node->SelectedTabId; + + // Add existing windows + for (int n = 0; n < node->Windows.Size - 1; n++) + TabBarAddTab(node->TabBar, ImGuiTabItemFlags_None, node->Windows[n]); + } + TabBarAddTab(node->TabBar, ImGuiTabItemFlags_Unsorted, window); + } + + DockNodeUpdateVisibleFlag(node); + + // Update this without waiting for the next time we Begin() in the window, so our host window will have the proper title bar color on its first frame. + if (node->HostWindow) + UpdateWindowParentAndRootLinks(window, window->Flags | ImGuiWindowFlags_ChildWindow, node->HostWindow); +} + +static void ImGui::DockNodeRemoveWindow(ImGuiDockNode* node, ImGuiWindow* window, ImGuiID save_dock_id) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(window->DockNode == node); + //IM_ASSERT(window->RootWindowDockTree == node->HostWindow); + //IM_ASSERT(window->LastFrameActive < g.FrameCount); // We may call this from Begin() + IM_ASSERT(save_dock_id == 0 || save_dock_id == node->ID); + IMGUI_DEBUG_LOG_DOCKING("[docking] DockNodeRemoveWindow node 0x%08X window '%s'\n", node->ID, window->Name); + + window->DockNode = NULL; + window->DockIsActive = window->DockTabWantClose = false; + window->DockId = save_dock_id; + window->Flags &= ~ImGuiWindowFlags_ChildWindow; + if (window->ParentWindow) + window->ParentWindow->DC.ChildWindows.find_erase(window); + UpdateWindowParentAndRootLinks(window, window->Flags, NULL); // Update immediately + + if (node->HostWindow && node->HostWindow->ViewportOwned) + { + // When undocking from a user interaction this will always run in NewFrame() and have not much effect. + // But mid-frame, if we clear viewport we need to mark window as hidden as well. + window->Viewport = NULL; + window->ViewportId = 0; + window->ViewportOwned = false; + window->Hidden = true; + } + + // Remove window + bool erased = false; + for (int n = 0; n < node->Windows.Size; n++) + if (node->Windows[n] == window) + { + node->Windows.erase(node->Windows.Data + n); + erased = true; + break; + } + if (!erased) + IM_ASSERT(erased); + if (node->VisibleWindow == window) + node->VisibleWindow = NULL; + + // Remove tab and possibly tab bar + node->WantHiddenTabBarUpdate = true; + if (node->TabBar) + { + TabBarRemoveTab(node->TabBar, window->TabId); + const int tab_count_threshold_for_tab_bar = node->IsCentralNode() ? 1 : 2; + if (node->Windows.Size < tab_count_threshold_for_tab_bar) + DockNodeRemoveTabBar(node); + } + + if (node->Windows.Size == 0 && !node->IsCentralNode() && !node->IsDockSpace() && window->DockId != node->ID) + { + // Automatic dock node delete themselves if they are not holding at least one tab + DockContextRemoveNode(&g, node, true); + return; + } + + if (node->Windows.Size == 1 && !node->IsCentralNode() && node->HostWindow) + { + ImGuiWindow* remaining_window = node->Windows[0]; + // Note: we used to transport viewport ownership here. + remaining_window->Collapsed = node->HostWindow->Collapsed; + } + + // Update visibility immediately is required so the DockNodeUpdateRemoveInactiveChilds() processing can reflect changes up the tree + DockNodeUpdateVisibleFlag(node); +} + +static void ImGui::DockNodeMoveChildNodes(ImGuiDockNode* dst_node, ImGuiDockNode* src_node) +{ + IM_ASSERT(dst_node->Windows.Size == 0); + dst_node->ChildNodes[0] = src_node->ChildNodes[0]; + dst_node->ChildNodes[1] = src_node->ChildNodes[1]; + if (dst_node->ChildNodes[0]) + dst_node->ChildNodes[0]->ParentNode = dst_node; + if (dst_node->ChildNodes[1]) + dst_node->ChildNodes[1]->ParentNode = dst_node; + dst_node->SplitAxis = src_node->SplitAxis; + dst_node->SizeRef = src_node->SizeRef; + src_node->ChildNodes[0] = src_node->ChildNodes[1] = NULL; +} + +static void ImGui::DockNodeMoveWindows(ImGuiDockNode* dst_node, ImGuiDockNode* src_node) +{ + // Insert tabs in the same orders as currently ordered (node->Windows isn't ordered) + IM_ASSERT(src_node && dst_node && dst_node != src_node); + ImGuiTabBar* src_tab_bar = src_node->TabBar; + if (src_tab_bar != NULL) + IM_ASSERT(src_node->Windows.Size <= src_node->TabBar->Tabs.Size); + + // If the dst_node is empty we can just move the entire tab bar (to preserve selection, scrolling, etc.) + bool move_tab_bar = (src_tab_bar != NULL) && (dst_node->TabBar == NULL); + if (move_tab_bar) + { + dst_node->TabBar = src_node->TabBar; + src_node->TabBar = NULL; + } + + // Tab order is not important here, it is preserved by sorting in DockNodeUpdateTabBar(). + for (ImGuiWindow* window : src_node->Windows) + { + window->DockNode = NULL; + window->DockIsActive = false; + DockNodeAddWindow(dst_node, window, !move_tab_bar); + } + src_node->Windows.clear(); + + if (!move_tab_bar && src_node->TabBar) + { + if (dst_node->TabBar) + dst_node->TabBar->SelectedTabId = src_node->TabBar->SelectedTabId; + DockNodeRemoveTabBar(src_node); + } +} + +static void ImGui::DockNodeApplyPosSizeToWindows(ImGuiDockNode* node) +{ + for (ImGuiWindow* window : node->Windows) + { + SetWindowPos(window, node->Pos, ImGuiCond_Always); // We don't assign directly to Pos because it can break the calculation of SizeContents on next frame + SetWindowSize(window, node->Size, ImGuiCond_Always); + } +} + +static void ImGui::DockNodeHideHostWindow(ImGuiDockNode* node) +{ + if (node->HostWindow) + { + if (node->HostWindow->DockNodeAsHost == node) + node->HostWindow->DockNodeAsHost = NULL; + node->HostWindow = NULL; + } + + if (node->Windows.Size == 1) + { + node->VisibleWindow = node->Windows[0]; + node->Windows[0]->DockIsActive = false; + } + + if (node->TabBar) + DockNodeRemoveTabBar(node); +} + +// Search function called once by root node in DockNodeUpdate() +struct ImGuiDockNodeTreeInfo +{ + ImGuiDockNode* CentralNode; + ImGuiDockNode* FirstNodeWithWindows; + int CountNodesWithWindows; + //ImGuiWindowClass WindowClassForMerges; + + ImGuiDockNodeTreeInfo() { memset(this, 0, sizeof(*this)); } +}; + +static void DockNodeFindInfo(ImGuiDockNode* node, ImGuiDockNodeTreeInfo* info) +{ + if (node->Windows.Size > 0) + { + if (info->FirstNodeWithWindows == NULL) + info->FirstNodeWithWindows = node; + info->CountNodesWithWindows++; + } + if (node->IsCentralNode()) + { + IM_ASSERT(info->CentralNode == NULL); // Should be only one + IM_ASSERT(node->IsLeafNode() && "If you get this assert: please submit .ini file + repro of actions leading to this."); + info->CentralNode = node; + } + if (info->CountNodesWithWindows > 1 && info->CentralNode != NULL) + return; + if (node->ChildNodes[0]) + DockNodeFindInfo(node->ChildNodes[0], info); + if (node->ChildNodes[1]) + DockNodeFindInfo(node->ChildNodes[1], info); +} + +static ImGuiWindow* ImGui::DockNodeFindWindowByID(ImGuiDockNode* node, ImGuiID id) +{ + IM_ASSERT(id != 0); + for (ImGuiWindow* window : node->Windows) + if (window->ID == id) + return window; + return NULL; +} + +// - Remove inactive windows/nodes. +// - Update visibility flag. +static void ImGui::DockNodeUpdateFlagsAndCollapse(ImGuiDockNode* node) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(node->ParentNode == NULL || node->ParentNode->ChildNodes[0] == node || node->ParentNode->ChildNodes[1] == node); + + // Inherit most flags + if (node->ParentNode) + node->SharedFlags = node->ParentNode->SharedFlags & ImGuiDockNodeFlags_SharedFlagsInheritMask_; + + // Recurse into children + // There is the possibility that one of our child becoming empty will delete itself and moving its sibling contents into 'node'. + // If 'node->ChildNode[0]' delete itself, then 'node->ChildNode[1]->Windows' will be moved into 'node' + // If 'node->ChildNode[1]' delete itself, then 'node->ChildNode[0]->Windows' will be moved into 'node' and the "remove inactive windows" loop will have run twice on those windows (harmless) + node->HasCentralNodeChild = false; + if (node->ChildNodes[0]) + DockNodeUpdateFlagsAndCollapse(node->ChildNodes[0]); + if (node->ChildNodes[1]) + DockNodeUpdateFlagsAndCollapse(node->ChildNodes[1]); + + // Remove inactive windows, collapse nodes + // Merge node flags overrides stored in windows + node->LocalFlagsInWindows = ImGuiDockNodeFlags_None; + for (int window_n = 0; window_n < node->Windows.Size; window_n++) + { + ImGuiWindow* window = node->Windows[window_n]; + IM_ASSERT(window->DockNode == node); + + bool node_was_active = (node->LastFrameActive + 1 == g.FrameCount); + bool remove = false; + remove |= node_was_active && (window->LastFrameActive + 1 < g.FrameCount); + remove |= node_was_active && (node->WantCloseAll || node->WantCloseTabId == window->TabId) && window->HasCloseButton && !(window->Flags & ImGuiWindowFlags_UnsavedDocument); // Submit all _expected_ closure from last frame + remove |= (window->DockTabWantClose); + if (remove) + { + window->DockTabWantClose = false; + if (node->Windows.Size == 1 && !node->IsCentralNode()) + { + DockNodeHideHostWindow(node); + node->State = ImGuiDockNodeState_HostWindowHiddenBecauseSingleWindow; + DockNodeRemoveWindow(node, window, node->ID); // Will delete the node so it'll be invalid on return + return; + } + DockNodeRemoveWindow(node, window, node->ID); + window_n--; + continue; + } + + // FIXME-DOCKING: Missing policies for conflict resolution, hence the "Experimental" tag on this. + //node->LocalFlagsInWindow &= ~window->WindowClass.DockNodeFlagsOverrideClear; + node->LocalFlagsInWindows |= window->WindowClass.DockNodeFlagsOverrideSet; + } + node->UpdateMergedFlags(); + + // Auto-hide tab bar option + ImGuiDockNodeFlags node_flags = node->MergedFlags; + if (node->WantHiddenTabBarUpdate && node->Windows.Size == 1 && (node_flags & ImGuiDockNodeFlags_AutoHideTabBar) && !node->IsHiddenTabBar()) + node->WantHiddenTabBarToggle = true; + node->WantHiddenTabBarUpdate = false; + + // Cancel toggling if we know our tab bar is enforced to be hidden at all times + if (node->WantHiddenTabBarToggle && node->VisibleWindow && (node->VisibleWindow->WindowClass.DockNodeFlagsOverrideSet & ImGuiDockNodeFlags_HiddenTabBar)) + node->WantHiddenTabBarToggle = false; + + // Apply toggles at a single point of the frame (here!) + if (node->Windows.Size > 1) + node->SetLocalFlags(node->LocalFlags & ~ImGuiDockNodeFlags_HiddenTabBar); + else if (node->WantHiddenTabBarToggle) + node->SetLocalFlags(node->LocalFlags ^ ImGuiDockNodeFlags_HiddenTabBar); + node->WantHiddenTabBarToggle = false; + + DockNodeUpdateVisibleFlag(node); +} + +// This is rarely called as DockNodeUpdateForRootNode() generally does it most frames. +static void ImGui::DockNodeUpdateHasCentralNodeChild(ImGuiDockNode* node) +{ + node->HasCentralNodeChild = false; + if (node->ChildNodes[0]) + DockNodeUpdateHasCentralNodeChild(node->ChildNodes[0]); + if (node->ChildNodes[1]) + DockNodeUpdateHasCentralNodeChild(node->ChildNodes[1]); + if (node->IsRootNode()) + { + ImGuiDockNode* mark_node = node->CentralNode; + while (mark_node) + { + mark_node->HasCentralNodeChild = true; + mark_node = mark_node->ParentNode; + } + } +} + +static void ImGui::DockNodeUpdateVisibleFlag(ImGuiDockNode* node) +{ + // Update visibility flag + bool is_visible = (node->ParentNode == NULL) ? node->IsDockSpace() : node->IsCentralNode(); + is_visible |= (node->Windows.Size > 0); + is_visible |= (node->ChildNodes[0] && node->ChildNodes[0]->IsVisible); + is_visible |= (node->ChildNodes[1] && node->ChildNodes[1]->IsVisible); + node->IsVisible = is_visible; +} + +static void ImGui::DockNodeStartMouseMovingWindow(ImGuiDockNode* node, ImGuiWindow* window) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(node->WantMouseMove == true); + StartMouseMovingWindow(window); + g.ActiveIdClickOffset = g.IO.MouseClickedPos[0] - node->Pos; + g.MovingWindow = window; // If we are docked into a non moveable root window, StartMouseMovingWindow() won't set g.MovingWindow. Override that decision. + node->WantMouseMove = false; +} + +// Update CentralNode, OnlyNodeWithWindows, LastFocusedNodeID. Copy window class. +static void ImGui::DockNodeUpdateForRootNode(ImGuiDockNode* node) +{ + DockNodeUpdateFlagsAndCollapse(node); + + // - Setup central node pointers + // - Find if there's only a single visible window in the hierarchy (in which case we need to display a regular title bar -> FIXME-DOCK: that last part is not done yet!) + // Cannot merge this with DockNodeUpdateFlagsAndCollapse() because FirstNodeWithWindows is found after window removal and child collapsing + ImGuiDockNodeTreeInfo info; + DockNodeFindInfo(node, &info); + node->CentralNode = info.CentralNode; + node->OnlyNodeWithWindows = (info.CountNodesWithWindows == 1) ? info.FirstNodeWithWindows : NULL; + node->CountNodeWithWindows = info.CountNodesWithWindows; + if (node->LastFocusedNodeId == 0 && info.FirstNodeWithWindows != NULL) + node->LastFocusedNodeId = info.FirstNodeWithWindows->ID; + + // Copy the window class from of our first window so it can be used for proper dock filtering. + // When node has mixed windows, prioritize the class with the most constraint (DockingAllowUnclassed = false) as the reference to copy. + // FIXME-DOCK: We don't recurse properly, this code could be reworked to work from DockNodeUpdateScanRec. + if (ImGuiDockNode* first_node_with_windows = info.FirstNodeWithWindows) + { + node->WindowClass = first_node_with_windows->Windows[0]->WindowClass; + for (int n = 1; n < first_node_with_windows->Windows.Size; n++) + if (first_node_with_windows->Windows[n]->WindowClass.DockingAllowUnclassed == false) + { + node->WindowClass = first_node_with_windows->Windows[n]->WindowClass; + break; + } + } + + ImGuiDockNode* mark_node = node->CentralNode; + while (mark_node) + { + mark_node->HasCentralNodeChild = true; + mark_node = mark_node->ParentNode; + } +} + +static void DockNodeSetupHostWindow(ImGuiDockNode* node, ImGuiWindow* host_window) +{ + // Remove ourselves from any previous different host window + // This can happen if a user mistakenly does (see #4295 for details): + // - N+0: DockBuilderAddNode(id, 0) // missing ImGuiDockNodeFlags_DockSpace + // - N+1: NewFrame() // will create floating host window for that node + // - N+1: DockSpace(id) // requalify node as dockspace, moving host window + if (node->HostWindow && node->HostWindow != host_window && node->HostWindow->DockNodeAsHost == node) + node->HostWindow->DockNodeAsHost = NULL; + + host_window->DockNodeAsHost = node; + node->HostWindow = host_window; +} + +static void ImGui::DockNodeUpdate(ImGuiDockNode* node) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(node->LastFrameActive != g.FrameCount); + node->LastFrameAlive = g.FrameCount; + node->IsBgDrawnThisFrame = false; + + node->CentralNode = node->OnlyNodeWithWindows = NULL; + if (node->IsRootNode()) + DockNodeUpdateForRootNode(node); + + // Remove tab bar if not needed + if (node->TabBar && node->IsNoTabBar()) + DockNodeRemoveTabBar(node); + + // Early out for hidden root dock nodes (when all DockId references are in inactive windows, or there is only 1 floating window holding on the DockId) + bool want_to_hide_host_window = false; + if (node->IsFloatingNode()) + { + if (node->Windows.Size <= 1 && node->IsLeafNode()) + if (!g.IO.ConfigDockingAlwaysTabBar && (node->Windows.Size == 0 || !node->Windows[0]->WindowClass.DockingAlwaysTabBar)) + want_to_hide_host_window = true; + if (node->CountNodeWithWindows == 0) + want_to_hide_host_window = true; + } + if (want_to_hide_host_window) + { + if (node->Windows.Size == 1) + { + // Floating window pos/size is authoritative + ImGuiWindow* single_window = node->Windows[0]; + node->Pos = single_window->Pos; + node->Size = single_window->SizeFull; + node->AuthorityForPos = node->AuthorityForSize = node->AuthorityForViewport = ImGuiDataAuthority_Window; + + // Transfer focus immediately so when we revert to a regular window it is immediately selected + if (node->HostWindow && g.NavWindow == node->HostWindow) + FocusWindow(single_window); + if (node->HostWindow) + { + IMGUI_DEBUG_LOG_VIEWPORT("[viewport] Node %08X transfer Viewport %08X->%08X to Window '%s'\n", node->ID, node->HostWindow->Viewport->ID, single_window->ID, single_window->Name); + single_window->Viewport = node->HostWindow->Viewport; + single_window->ViewportId = node->HostWindow->ViewportId; + if (node->HostWindow->ViewportOwned) + { + single_window->Viewport->ID = single_window->ID; + single_window->Viewport->Window = single_window; + single_window->ViewportOwned = true; + } + } + node->RefViewportId = single_window->ViewportId; + } + + DockNodeHideHostWindow(node); + node->State = ImGuiDockNodeState_HostWindowHiddenBecauseSingleWindow; + node->WantCloseAll = false; + node->WantCloseTabId = 0; + node->HasCloseButton = node->HasWindowMenuButton = false; + node->LastFrameActive = g.FrameCount; + + if (node->WantMouseMove && node->Windows.Size == 1) + DockNodeStartMouseMovingWindow(node, node->Windows[0]); + return; + } + + // In some circumstance we will defer creating the host window (so everything will be kept hidden), + // while the expected visible window is resizing itself. + // This is important for first-time (no ini settings restored) single window when io.ConfigDockingAlwaysTabBar is enabled, + // otherwise the node ends up using the minimum window size. Effectively those windows will take an extra frame to show up: + // N+0: Begin(): window created (with no known size), node is created + // N+1: DockNodeUpdate(): node skip creating host window / Begin(): window size applied, not visible + // N+2: DockNodeUpdate(): node can create host window / Begin(): window becomes visible + // We could remove this frame if we could reliably calculate the expected window size during node update, before the Begin() code. + // It would require a generalization of CalcWindowExpectedSize(), probably extracting code away from Begin(). + // In reality it isn't very important as user quickly ends up with size data in .ini file. + if (node->IsVisible && node->HostWindow == NULL && node->IsFloatingNode() && node->IsLeafNode()) + { + IM_ASSERT(node->Windows.Size > 0); + ImGuiWindow* ref_window = NULL; + if (node->SelectedTabId != 0) // Note that we prune single-window-node settings on .ini loading, so this is generally 0 for them! + ref_window = DockNodeFindWindowByID(node, node->SelectedTabId); + if (ref_window == NULL) + ref_window = node->Windows[0]; + if (ref_window->AutoFitFramesX > 0 || ref_window->AutoFitFramesY > 0) + { + node->State = ImGuiDockNodeState_HostWindowHiddenBecauseWindowsAreResizing; + return; + } + } + + const ImGuiDockNodeFlags node_flags = node->MergedFlags; + + // Decide if the node will have a close button and a window menu button + node->HasWindowMenuButton = (node->Windows.Size > 0) && (node_flags & ImGuiDockNodeFlags_NoWindowMenuButton) == 0; + node->HasCloseButton = false; + for (ImGuiWindow* window : node->Windows) + { + // FIXME-DOCK: Setting DockIsActive here means that for single active window in a leaf node, DockIsActive will be cleared until the next Begin() call. + node->HasCloseButton |= window->HasCloseButton; + window->DockIsActive = (node->Windows.Size > 1); + } + if (node_flags & ImGuiDockNodeFlags_NoCloseButton) + node->HasCloseButton = false; + + // Bind or create host window + ImGuiWindow* host_window = NULL; + bool beginned_into_host_window = false; + if (node->IsDockSpace()) + { + // [Explicit root dockspace node] + IM_ASSERT(node->HostWindow); + host_window = node->HostWindow; + } + else + { + // [Automatic root or child nodes] + if (node->IsRootNode() && node->IsVisible) + { + ImGuiWindow* ref_window = (node->Windows.Size > 0) ? node->Windows[0] : NULL; + + // Sync Pos + if (node->AuthorityForPos == ImGuiDataAuthority_Window && ref_window) + SetNextWindowPos(ref_window->Pos); + else if (node->AuthorityForPos == ImGuiDataAuthority_DockNode) + SetNextWindowPos(node->Pos); + + // Sync Size + if (node->AuthorityForSize == ImGuiDataAuthority_Window && ref_window) + SetNextWindowSize(ref_window->SizeFull); + else if (node->AuthorityForSize == ImGuiDataAuthority_DockNode) + SetNextWindowSize(node->Size); + + // Sync Collapsed + if (node->AuthorityForSize == ImGuiDataAuthority_Window && ref_window) + SetNextWindowCollapsed(ref_window->Collapsed); + + // Sync Viewport + if (node->AuthorityForViewport == ImGuiDataAuthority_Window && ref_window) + SetNextWindowViewport(ref_window->ViewportId); + else if (node->AuthorityForViewport == ImGuiDataAuthority_Window && node->RefViewportId != 0) + SetNextWindowViewport(node->RefViewportId); + + SetNextWindowClass(&node->WindowClass); + + // Begin into the host window + char window_label[20]; + DockNodeGetHostWindowTitle(node, window_label, IM_ARRAYSIZE(window_label)); + ImGuiWindowFlags window_flags = ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse | ImGuiWindowFlags_DockNodeHost; + window_flags |= ImGuiWindowFlags_NoFocusOnAppearing; + window_flags |= ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoNavFocus | ImGuiWindowFlags_NoCollapse; + window_flags |= ImGuiWindowFlags_NoTitleBar; + + SetNextWindowBgAlpha(0.0f); // Don't set ImGuiWindowFlags_NoBackground because it disables borders + PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0)); + Begin(window_label, NULL, window_flags); + PopStyleVar(); + beginned_into_host_window = true; + + host_window = g.CurrentWindow; + DockNodeSetupHostWindow(node, host_window); + host_window->DC.CursorPos = host_window->Pos; + node->Pos = host_window->Pos; + node->Size = host_window->Size; + + // We set ImGuiWindowFlags_NoFocusOnAppearing because we don't want the host window to take full focus (e.g. steal NavWindow) + // But we still it bring it to the front of display. There's no way to choose this precise behavior via window flags. + // One simple case to ponder if: window A has a toggle to create windows B/C/D. Dock B/C/D together, clear the toggle and enable it again. + // When reappearing B/C/D will request focus and be moved to the top of the display pile, but they are not linked to the dock host window + // during the frame they appear. The dock host window would keep its old display order, and the sorting in EndFrame would move B/C/D back + // after the dock host window, losing their top-most status. + if (node->HostWindow->Appearing) + BringWindowToDisplayFront(node->HostWindow); + + node->AuthorityForPos = node->AuthorityForSize = node->AuthorityForViewport = ImGuiDataAuthority_Auto; + } + else if (node->ParentNode) + { + node->HostWindow = host_window = node->ParentNode->HostWindow; + node->AuthorityForPos = node->AuthorityForSize = node->AuthorityForViewport = ImGuiDataAuthority_Auto; + } + if (node->WantMouseMove && node->HostWindow) + DockNodeStartMouseMovingWindow(node, node->HostWindow); + } + node->RefViewportId = 0; // Clear when we have a host window + + // Update focused node (the one whose title bar is highlight) within a node tree + if (node->IsSplitNode()) + IM_ASSERT(node->TabBar == NULL); + if (node->IsRootNode()) + if (ImGuiWindow* p_window = g.NavWindow ? g.NavWindow->RootWindow : NULL) + while (p_window != NULL && p_window->DockNode != NULL) + { + ImGuiDockNode* p_node = DockNodeGetRootNode(p_window->DockNode); + if (p_node == node) + { + node->LastFocusedNodeId = p_window->DockNode->ID; // Note: not using root node ID! + break; + } + p_window = p_node->HostWindow ? p_node->HostWindow->RootWindow : NULL; + } + + // Register a hit-test hole in the window unless we are currently dragging a window that is compatible with our dockspace + ImGuiDockNode* central_node = node->CentralNode; + const bool central_node_hole = node->IsRootNode() && host_window && (node_flags & ImGuiDockNodeFlags_PassthruCentralNode) != 0 && central_node != NULL && central_node->IsEmpty(); + bool central_node_hole_register_hit_test_hole = central_node_hole; + if (central_node_hole) + if (const ImGuiPayload* payload = ImGui::GetDragDropPayload()) + if (payload->IsDataType(IMGUI_PAYLOAD_TYPE_WINDOW) && DockNodeIsDropAllowed(host_window, *(ImGuiWindow**)payload->Data)) + central_node_hole_register_hit_test_hole = false; + if (central_node_hole_register_hit_test_hole) + { + // We add a little padding to match the "resize from edges" behavior and allow grabbing the splitter easily. + // (But we only add it if there's something else on the other side of the hole, otherwise for e.g. fullscreen + // covering passthru node we'd have a gap on the edge not covered by the hole) + IM_ASSERT(node->IsDockSpace()); // We cannot pass this flag without the DockSpace() api. Testing this because we also setup the hole in host_window->ParentNode + ImGuiDockNode* root_node = DockNodeGetRootNode(central_node); + ImRect root_rect(root_node->Pos, root_node->Pos + root_node->Size); + ImRect hole_rect(central_node->Pos, central_node->Pos + central_node->Size); + if (hole_rect.Min.x > root_rect.Min.x) { hole_rect.Min.x += g.WindowsBorderHoverPadding; } + if (hole_rect.Max.x < root_rect.Max.x) { hole_rect.Max.x -= g.WindowsBorderHoverPadding; } + if (hole_rect.Min.y > root_rect.Min.y) { hole_rect.Min.y += g.WindowsBorderHoverPadding; } + if (hole_rect.Max.y < root_rect.Max.y) { hole_rect.Max.y -= g.WindowsBorderHoverPadding; } + //GetForegroundDrawList()->AddRect(hole_rect.Min, hole_rect.Max, IM_COL32(255, 0, 0, 255)); + if (central_node_hole && !hole_rect.IsInverted()) + { + SetWindowHitTestHole(host_window, hole_rect.Min, hole_rect.Max - hole_rect.Min); + if (host_window->ParentWindow) + SetWindowHitTestHole(host_window->ParentWindow, hole_rect.Min, hole_rect.Max - hole_rect.Min); + } + } + + // Update position/size, process and draw resizing splitters + if (node->IsRootNode() && host_window) + { + DockNodeTreeUpdatePosSize(node, host_window->Pos, host_window->Size); + PushStyleColor(ImGuiCol_Separator, g.Style.Colors[ImGuiCol_Border]); + PushStyleColor(ImGuiCol_SeparatorActive, g.Style.Colors[ImGuiCol_ResizeGripActive]); + PushStyleColor(ImGuiCol_SeparatorHovered, g.Style.Colors[ImGuiCol_ResizeGripHovered]); + DockNodeTreeUpdateSplitter(node); + PopStyleColor(3); + } + + // Draw empty node background (currently can only be the Central Node) + if (host_window && node->IsEmpty() && node->IsVisible) + { + host_window->DrawList->ChannelsSetCurrent(DOCKING_HOST_DRAW_CHANNEL_BG); + node->LastBgColor = (node_flags & ImGuiDockNodeFlags_PassthruCentralNode) ? 0 : GetColorU32(ImGuiCol_DockingEmptyBg); + if (node->LastBgColor != 0) + host_window->DrawList->AddRectFilled(node->Pos, node->Pos + node->Size, node->LastBgColor); + node->IsBgDrawnThisFrame = true; + } + + // Draw whole dockspace background if ImGuiDockNodeFlags_PassthruCentralNode if set. + // We need to draw a background at the root level if requested by ImGuiDockNodeFlags_PassthruCentralNode, but we will only know the correct pos/size + // _after_ processing the resizing splitters. So we are using the DrawList channel splitting facility to submit drawing primitives out of order! + const bool render_dockspace_bg = node->IsRootNode() && host_window && (node_flags & ImGuiDockNodeFlags_PassthruCentralNode) != 0; + if (render_dockspace_bg && node->IsVisible) + { + host_window->DrawList->ChannelsSetCurrent(DOCKING_HOST_DRAW_CHANNEL_BG); + if (central_node_hole) + RenderRectFilledWithHole(host_window->DrawList, node->Rect(), central_node->Rect(), GetColorU32(ImGuiCol_WindowBg), 0.0f); + else + host_window->DrawList->AddRectFilled(node->Pos, node->Pos + node->Size, GetColorU32(ImGuiCol_WindowBg), 0.0f); + } + + // Draw and populate Tab Bar + if (host_window) + host_window->DrawList->ChannelsSetCurrent(DOCKING_HOST_DRAW_CHANNEL_FG); + if (host_window && node->Windows.Size > 0) + { + DockNodeUpdateTabBar(node, host_window); + } + else + { + node->WantCloseAll = false; + node->WantCloseTabId = 0; + node->IsFocused = false; + } + if (node->TabBar && node->TabBar->SelectedTabId) + node->SelectedTabId = node->TabBar->SelectedTabId; + else if (node->Windows.Size > 0) + node->SelectedTabId = node->Windows[0]->TabId; + + // Draw payload drop target + if (host_window && node->IsVisible) + if (node->IsRootNode() && (g.MovingWindow == NULL || g.MovingWindow->RootWindowDockTree != host_window)) + BeginDockableDragDropTarget(host_window); + + // We update this after DockNodeUpdateTabBar() + node->LastFrameActive = g.FrameCount; + + // Recurse into children + // FIXME-DOCK FIXME-OPT: Should not need to recurse into children + if (host_window) + { + if (node->ChildNodes[0]) + DockNodeUpdate(node->ChildNodes[0]); + if (node->ChildNodes[1]) + DockNodeUpdate(node->ChildNodes[1]); + + // Render outer borders last (after the tab bar) + if (node->IsRootNode()) + RenderWindowOuterBorders(host_window); + } + + // End host window + if (beginned_into_host_window) //-V1020 + End(); +} + +// Compare TabItem nodes given the last known DockOrder (will persist in .ini file as hint), used to sort tabs when multiple tabs are added on the same frame. +static int IMGUI_CDECL TabItemComparerByDockOrder(const void* lhs, const void* rhs) +{ + ImGuiWindow* a = ((const ImGuiTabItem*)lhs)->Window; + ImGuiWindow* b = ((const ImGuiTabItem*)rhs)->Window; + if (int d = ((a->DockOrder == -1) ? INT_MAX : a->DockOrder) - ((b->DockOrder == -1) ? INT_MAX : b->DockOrder)) + return d; + return (a->BeginOrderWithinContext - b->BeginOrderWithinContext); +} + +// Default handler for g.DockNodeWindowMenuHandler(): display the list of windows for a given dock-node. +// This is exceptionally stored in a function pointer to also user applications to tweak this menu (undocumented) +// Custom overrides may want to decorate, group, sort entries. +// Please note those are internal structures: if you copy this expect occasional breakage. +// (if you don't need to modify the "Tabs.Size == 1" behavior/path it is recommend you call this function in your handler) +void ImGui::DockNodeWindowMenuHandler_Default(ImGuiContext* ctx, ImGuiDockNode* node, ImGuiTabBar* tab_bar) +{ + IM_UNUSED(ctx); + if (tab_bar->Tabs.Size == 1) + { + // "Hide tab bar" option. Being one of our rare user-facing string we pull it from a table. + if (MenuItem(LocalizeGetMsg(ImGuiLocKey_DockingHideTabBar), NULL, node->IsHiddenTabBar())) + node->WantHiddenTabBarToggle = true; + } + else + { + // Display a selectable list of windows in this docking node + for (int tab_n = 0; tab_n < tab_bar->Tabs.Size; tab_n++) + { + ImGuiTabItem* tab = &tab_bar->Tabs[tab_n]; + if (tab->Flags & ImGuiTabItemFlags_Button) + continue; + if (Selectable(TabBarGetTabName(tab_bar, tab), tab->ID == tab_bar->SelectedTabId)) + TabBarQueueFocus(tab_bar, tab); + SameLine(); + Text(" "); + } + } +} + +static void ImGui::DockNodeWindowMenuUpdate(ImGuiDockNode* node, ImGuiTabBar* tab_bar) +{ + // Try to position the menu so it is more likely to stays within the same viewport + ImGuiContext& g = *GImGui; + if (g.Style.WindowMenuButtonPosition == ImGuiDir_Left) + SetNextWindowPos(ImVec2(node->Pos.x, node->Pos.y + GetFrameHeight()), ImGuiCond_Always, ImVec2(0.0f, 0.0f)); + else + SetNextWindowPos(ImVec2(node->Pos.x + node->Size.x, node->Pos.y + GetFrameHeight()), ImGuiCond_Always, ImVec2(1.0f, 0.0f)); + if (BeginPopup("#WindowMenu")) + { + node->IsFocused = true; + g.DockNodeWindowMenuHandler(&g, node, tab_bar); + EndPopup(); + } +} + +// User helper to append/amend into a dock node tab bar. Most commonly used to add e.g. a "+" button. +bool ImGui::DockNodeBeginAmendTabBar(ImGuiDockNode* node) +{ + if (node->TabBar == NULL || node->HostWindow == NULL) + return false; + if (node->MergedFlags & ImGuiDockNodeFlags_KeepAliveOnly) + return false; + if (node->TabBar->ID == 0) + return false; + Begin(node->HostWindow->Name); + PushOverrideID(node->ID); + bool ret = BeginTabBarEx(node->TabBar, node->TabBar->BarRect, node->TabBar->Flags); + IM_UNUSED(ret); + IM_ASSERT(ret); + return true; +} + +void ImGui::DockNodeEndAmendTabBar() +{ + EndTabBar(); + PopID(); + End(); +} + +static bool IsDockNodeTitleBarHighlighted(ImGuiDockNode* node, ImGuiDockNode* root_node) +{ + // CTRL+Tab highlight (only highlighting leaf node, not whole hierarchy) + ImGuiContext& g = *GImGui; + if (g.NavWindowingTarget) + return (g.NavWindowingTarget->DockNode == node); + + // FIXME-DOCKING: May want alternative to treat central node void differently? e.g. if (g.NavWindow == host_window) + if (g.NavWindow && root_node->LastFocusedNodeId == node->ID) + { + // FIXME: This could all be backed in RootWindowForTitleBarHighlight? Probably need to reorganize for both dock nodes + other RootWindowForTitleBarHighlight users (not-node) + ImGuiWindow* parent_window = g.NavWindow->RootWindow; + while (parent_window->Flags & ImGuiWindowFlags_ChildMenu) + parent_window = parent_window->ParentWindow->RootWindow; + ImGuiDockNode* start_parent_node = parent_window->DockNodeAsHost ? parent_window->DockNodeAsHost : parent_window->DockNode; + for (ImGuiDockNode* parent_node = start_parent_node; parent_node != NULL; parent_node = parent_node->HostWindow ? parent_node->HostWindow->RootWindow->DockNode : NULL) + if ((parent_node = ImGui::DockNodeGetRootNode(parent_node)) == root_node) + return true; + } + return false; +} + +// Submit the tab bar corresponding to a dock node and various housekeeping details. +static void ImGui::DockNodeUpdateTabBar(ImGuiDockNode* node, ImGuiWindow* host_window) +{ + ImGuiContext& g = *GImGui; + ImGuiStyle& style = g.Style; + + const bool node_was_active = (node->LastFrameActive + 1 == g.FrameCount); + const bool closed_all = node->WantCloseAll && node_was_active; + const ImGuiID closed_one = node->WantCloseTabId && node_was_active; + node->WantCloseAll = false; + node->WantCloseTabId = 0; + + // Decide if we should use a focused title bar color + bool is_focused = false; + ImGuiDockNode* root_node = DockNodeGetRootNode(node); + if (IsDockNodeTitleBarHighlighted(node, root_node)) + is_focused = true; + + // Hidden tab bar will show a triangle on the upper-left (in Begin) + if (node->IsHiddenTabBar() || node->IsNoTabBar()) + { + node->VisibleWindow = (node->Windows.Size > 0) ? node->Windows[0] : NULL; + node->IsFocused = is_focused; + if (is_focused) + node->LastFrameFocused = g.FrameCount; + if (node->VisibleWindow) + { + // Notify root of visible window (used to display title in OS task bar) + if (is_focused || root_node->VisibleWindow == NULL) + root_node->VisibleWindow = node->VisibleWindow; + if (node->TabBar) + node->TabBar->VisibleTabId = node->VisibleWindow->TabId; + } + return; + } + + // Move ourselves to the Menu layer (so we can be accessed by tapping Alt) + undo SkipItems flag in order to draw over the title bar even if the window is collapsed + bool backup_skip_item = host_window->SkipItems; + if (!node->IsDockSpace()) + { + host_window->SkipItems = false; + host_window->DC.NavLayerCurrent = ImGuiNavLayer_Menu; + } + + // Use PushOverrideID() instead of PushID() to use the node id _without_ the host window ID. + // This is to facilitate computing those ID from the outside, and will affect more or less only the ID of the collapse button, popup and tabs, + // as docked windows themselves will override the stack with their own root ID. + PushOverrideID(node->ID); + ImGuiTabBar* tab_bar = node->TabBar; + bool tab_bar_is_recreated = (tab_bar == NULL); // Tab bar are automatically destroyed when a node gets hidden + if (tab_bar == NULL) + { + DockNodeAddTabBar(node); + tab_bar = node->TabBar; + } + + ImGuiID focus_tab_id = 0; + node->IsFocused = is_focused; + + const ImGuiDockNodeFlags node_flags = node->MergedFlags; + const bool has_window_menu_button = (node_flags & ImGuiDockNodeFlags_NoWindowMenuButton) == 0 && (style.WindowMenuButtonPosition != ImGuiDir_None); + + // In a dock node, the Collapse Button turns into the Window Menu button. + // FIXME-DOCK FIXME-OPT: Could we recycle popups id across multiple dock nodes? + if (has_window_menu_button && IsPopupOpen("#WindowMenu")) + { + ImGuiID next_selected_tab_id = tab_bar->NextSelectedTabId; + DockNodeWindowMenuUpdate(node, tab_bar); + if (tab_bar->NextSelectedTabId != 0 && tab_bar->NextSelectedTabId != next_selected_tab_id) + focus_tab_id = tab_bar->NextSelectedTabId; + is_focused |= node->IsFocused; + } + + // Layout + ImRect title_bar_rect, tab_bar_rect; + ImVec2 window_menu_button_pos; + ImVec2 close_button_pos; + DockNodeCalcTabBarLayout(node, &title_bar_rect, &tab_bar_rect, &window_menu_button_pos, &close_button_pos); + + // Submit new tabs, they will be added as Unsorted and sorted below based on relative DockOrder value. + const int tabs_count_old = tab_bar->Tabs.Size; + for (int window_n = 0; window_n < node->Windows.Size; window_n++) + { + ImGuiWindow* window = node->Windows[window_n]; + if (TabBarFindTabByID(tab_bar, window->TabId) == NULL) + TabBarAddTab(tab_bar, ImGuiTabItemFlags_Unsorted, window); + } + + // Title bar + if (is_focused) + node->LastFrameFocused = g.FrameCount; + ImU32 title_bar_col = GetColorU32(host_window->Collapsed ? ImGuiCol_TitleBgCollapsed : is_focused ? ImGuiCol_TitleBgActive : ImGuiCol_TitleBg); + ImDrawFlags rounding_flags = CalcRoundingFlagsForRectInRect(title_bar_rect, host_window->Rect(), g.Style.DockingSeparatorSize); + host_window->DrawList->AddRectFilled(title_bar_rect.Min, title_bar_rect.Max, title_bar_col, host_window->WindowRounding, rounding_flags); + + // Docking/Collapse button + if (has_window_menu_button) + { + if (CollapseButton(host_window->GetID("#COLLAPSE"), window_menu_button_pos, node)) // == DockNodeGetWindowMenuButtonId(node) + OpenPopup("#WindowMenu"); + if (IsItemActive()) + focus_tab_id = tab_bar->SelectedTabId; + if (IsItemHovered(ImGuiHoveredFlags_ForTooltip | ImGuiHoveredFlags_DelayNormal) && g.HoveredIdTimer > 0.5f) + SetTooltip("%s", LocalizeGetMsg(ImGuiLocKey_DockingDragToUndockOrMoveNode)); + } + + // If multiple tabs are appearing on the same frame, sort them based on their persistent DockOrder value + int tabs_unsorted_start = tab_bar->Tabs.Size; + for (int tab_n = tab_bar->Tabs.Size - 1; tab_n >= 0 && (tab_bar->Tabs[tab_n].Flags & ImGuiTabItemFlags_Unsorted); tab_n--) + { + // FIXME-DOCK: Consider only clearing the flag after the tab has been alive for a few consecutive frames, allowing late comers to not break sorting? + tab_bar->Tabs[tab_n].Flags &= ~ImGuiTabItemFlags_Unsorted; + tabs_unsorted_start = tab_n; + } + if (tab_bar->Tabs.Size > tabs_unsorted_start) + { + IMGUI_DEBUG_LOG_DOCKING("[docking] In node 0x%08X: %d new appearing tabs:%s\n", node->ID, tab_bar->Tabs.Size - tabs_unsorted_start, (tab_bar->Tabs.Size > tabs_unsorted_start + 1) ? " (will sort)" : ""); + for (int tab_n = tabs_unsorted_start; tab_n < tab_bar->Tabs.Size; tab_n++) + { + ImGuiTabItem* tab = &tab_bar->Tabs[tab_n]; + IM_UNUSED(tab); + IMGUI_DEBUG_LOG_DOCKING("[docking] - Tab 0x%08X '%s' Order %d\n", tab->ID, TabBarGetTabName(tab_bar, tab), tab->Window ? tab->Window->DockOrder : -1); + } + IMGUI_DEBUG_LOG_DOCKING("[docking] SelectedTabId = 0x%08X, NavWindow->TabId = 0x%08X\n", node->SelectedTabId, g.NavWindow ? g.NavWindow->TabId : -1); + if (tab_bar->Tabs.Size > tabs_unsorted_start + 1) + ImQsort(tab_bar->Tabs.Data + tabs_unsorted_start, tab_bar->Tabs.Size - tabs_unsorted_start, sizeof(ImGuiTabItem), TabItemComparerByDockOrder); + } + + // Apply NavWindow focus back to the tab bar + if (g.NavWindow && g.NavWindow->RootWindow->DockNode == node) + tab_bar->SelectedTabId = g.NavWindow->RootWindow->TabId; + + // Selected newly added tabs, or persistent tab ID if the tab bar was just recreated + if (tab_bar_is_recreated && TabBarFindTabByID(tab_bar, node->SelectedTabId) != NULL) + tab_bar->SelectedTabId = tab_bar->NextSelectedTabId = node->SelectedTabId; + else if (tab_bar->Tabs.Size > tabs_count_old) + tab_bar->SelectedTabId = tab_bar->NextSelectedTabId = tab_bar->Tabs.back().Window->TabId; + + // Begin tab bar + ImGuiTabBarFlags tab_bar_flags = ImGuiTabBarFlags_Reorderable | ImGuiTabBarFlags_AutoSelectNewTabs; // | ImGuiTabBarFlags_NoTabListScrollingButtons); + tab_bar_flags |= ImGuiTabBarFlags_SaveSettings | ImGuiTabBarFlags_DockNode;// | ImGuiTabBarFlags_FittingPolicyScroll; + tab_bar_flags |= ImGuiTabBarFlags_DrawSelectedOverline; + if (!host_window->Collapsed && is_focused) + tab_bar_flags |= ImGuiTabBarFlags_IsFocused; + tab_bar->ID = GetID("#TabBar"); + tab_bar->SeparatorMinX = node->Pos.x + host_window->WindowBorderSize; // Separator cover the whole node width + tab_bar->SeparatorMaxX = node->Pos.x + node->Size.x - host_window->WindowBorderSize; + BeginTabBarEx(tab_bar, tab_bar_rect, tab_bar_flags); + //host_window->DrawList->AddRect(tab_bar_rect.Min, tab_bar_rect.Max, IM_COL32(255,0,255,255)); + + // Backup style colors + ImVec4 backup_style_cols[ImGuiWindowDockStyleCol_COUNT]; + for (int color_n = 0; color_n < ImGuiWindowDockStyleCol_COUNT; color_n++) + backup_style_cols[color_n] = g.Style.Colors[GWindowDockStyleColors[color_n]]; + + // Submit actual tabs + node->VisibleWindow = NULL; + for (int window_n = 0; window_n < node->Windows.Size; window_n++) + { + ImGuiWindow* window = node->Windows[window_n]; + if ((closed_all || closed_one == window->TabId) && window->HasCloseButton && !(window->Flags & ImGuiWindowFlags_UnsavedDocument)) + continue; + if (window->LastFrameActive + 1 >= g.FrameCount || !node_was_active) + { + ImGuiTabItemFlags tab_item_flags = 0; + tab_item_flags |= window->WindowClass.TabItemFlagsOverrideSet; + if (window->Flags & ImGuiWindowFlags_UnsavedDocument) + tab_item_flags |= ImGuiTabItemFlags_UnsavedDocument; + if (tab_bar->Flags & ImGuiTabBarFlags_NoCloseWithMiddleMouseButton) + tab_item_flags |= ImGuiTabItemFlags_NoCloseWithMiddleMouseButton; + + // Apply stored style overrides for the window + for (int color_n = 0; color_n < ImGuiWindowDockStyleCol_COUNT; color_n++) + g.Style.Colors[GWindowDockStyleColors[color_n]] = ColorConvertU32ToFloat4(window->DockStyle.Colors[color_n]); + + // Note that TabItemEx() calls TabBarCalcTabID() so our tab item ID will ignore the current ID stack (rightly so) + bool tab_open = true; + TabItemEx(tab_bar, window->Name, window->HasCloseButton ? &tab_open : NULL, tab_item_flags, window); + if (!tab_open) + node->WantCloseTabId = window->TabId; + if (tab_bar->VisibleTabId == window->TabId) + node->VisibleWindow = window; + + // Store last item data so it can be queried with IsItemXXX functions after the user Begin() call + window->DC.DockTabItemStatusFlags = g.LastItemData.StatusFlags; + window->DC.DockTabItemRect = g.LastItemData.Rect; + + // Update navigation ID on menu layer + if (g.NavWindow && g.NavWindow->RootWindow == window && (window->DC.NavLayersActiveMask & (1 << ImGuiNavLayer_Menu)) == 0) + host_window->NavLastIds[1] = window->TabId; + } + } + + // Restore style colors + for (int color_n = 0; color_n < ImGuiWindowDockStyleCol_COUNT; color_n++) + g.Style.Colors[GWindowDockStyleColors[color_n]] = backup_style_cols[color_n]; + + // Notify root of visible window (used to display title in OS task bar) + if (node->VisibleWindow) + if (is_focused || root_node->VisibleWindow == NULL) + root_node->VisibleWindow = node->VisibleWindow; + + // Close button (after VisibleWindow was updated) + // Note that VisibleWindow may have been overrided by CTRL+Tabbing, so VisibleWindow->TabId may be != from tab_bar->SelectedTabId + const bool close_button_is_enabled = node->HasCloseButton && node->VisibleWindow && node->VisibleWindow->HasCloseButton; + const bool close_button_is_visible = node->HasCloseButton; + //const bool close_button_is_visible = close_button_is_enabled; // Most people would expect this behavior of not even showing the button (leaving a hole since we can't claim that space as other windows in the tba bar have one) + if (close_button_is_visible) + { + if (!close_button_is_enabled) + { + PushItemFlag(ImGuiItemFlags_Disabled, true); + PushStyleColor(ImGuiCol_Text, style.Colors[ImGuiCol_Text] * ImVec4(1.0f,1.0f,1.0f,0.4f)); + } + if (CloseButton(host_window->GetID("#CLOSE"), close_button_pos)) + { + node->WantCloseAll = true; + for (int n = 0; n < tab_bar->Tabs.Size; n++) + TabBarCloseTab(tab_bar, &tab_bar->Tabs[n]); + } + //if (IsItemActive()) + // focus_tab_id = tab_bar->SelectedTabId; + if (!close_button_is_enabled) + { + PopStyleColor(); + PopItemFlag(); + } + } + + // When clicking on the title bar outside of tabs, we still focus the selected tab for that node + // FIXME: TabItems submitted earlier use AllowItemOverlap so we manually perform a more specific test for now (hovered || held) in order to not cover them. + ImGuiID title_bar_id = host_window->GetID("#TITLEBAR"); + if (g.HoveredId == 0 || g.HoveredId == title_bar_id || g.ActiveId == title_bar_id) + { + // AllowOverlap mode required for appending into dock node tab bar, + // otherwise dragging window will steal HoveredId and amended tabs cannot get them. + bool held; + KeepAliveID(title_bar_id); + ButtonBehavior(title_bar_rect, title_bar_id, NULL, &held, ImGuiButtonFlags_AllowOverlap); + if (g.HoveredId == title_bar_id) + { + g.LastItemData.ID = title_bar_id; + } + if (held) + { + if (IsMouseClicked(0)) + focus_tab_id = tab_bar->SelectedTabId; + + // Forward moving request to selected window + if (ImGuiTabItem* tab = TabBarFindTabByID(tab_bar, tab_bar->SelectedTabId)) + StartMouseMovingWindowOrNode(tab->Window ? tab->Window : node->HostWindow, node, false); // Undock from tab bar empty space + } + } + + // Forward focus from host node to selected window + //if (is_focused && g.NavWindow == host_window && !g.NavWindowingTarget) + // focus_tab_id = tab_bar->SelectedTabId; + + // When clicked on a tab we requested focus to the docked child + // This overrides the value set by "forward focus from host node to selected window". + if (tab_bar->NextSelectedTabId) + focus_tab_id = tab_bar->NextSelectedTabId; + + // Apply navigation focus + if (focus_tab_id != 0) + if (ImGuiTabItem* tab = TabBarFindTabByID(tab_bar, focus_tab_id)) + if (tab->Window) + { + FocusWindow(tab->Window); + NavInitWindow(tab->Window, false); + } + + EndTabBar(); + PopID(); + + // Restore SkipItems flag + if (!node->IsDockSpace()) + { + host_window->DC.NavLayerCurrent = ImGuiNavLayer_Main; + host_window->SkipItems = backup_skip_item; + } +} + +static void ImGui::DockNodeAddTabBar(ImGuiDockNode* node) +{ + IM_ASSERT(node->TabBar == NULL); + node->TabBar = IM_NEW(ImGuiTabBar); +} + +static void ImGui::DockNodeRemoveTabBar(ImGuiDockNode* node) +{ + if (node->TabBar == NULL) + return; + IM_DELETE(node->TabBar); + node->TabBar = NULL; +} + +static bool DockNodeIsDropAllowedOne(ImGuiWindow* payload, ImGuiWindow* host_window) +{ + if (host_window->DockNodeAsHost && host_window->DockNodeAsHost->IsDockSpace() && payload->BeginOrderWithinContext < host_window->BeginOrderWithinContext) + return false; + + ImGuiWindowClass* host_class = host_window->DockNodeAsHost ? &host_window->DockNodeAsHost->WindowClass : &host_window->WindowClass; + ImGuiWindowClass* payload_class = &payload->WindowClass; + if (host_class->ClassId != payload_class->ClassId) + { + bool pass = false; + if (host_class->ClassId != 0 && host_class->DockingAllowUnclassed && payload_class->ClassId == 0) + pass = true; + if (payload_class->ClassId != 0 && payload_class->DockingAllowUnclassed && host_class->ClassId == 0) + pass = true; + if (!pass) + return false; + } + + // Prevent docking any window created above a popup + // Technically we should support it (e.g. in the case of a long-lived modal window that had fancy docking features), + // by e.g. adding a 'if (!ImGui::IsWindowWithinBeginStackOf(host_window, popup_window))' test. + // But it would requires more work on our end because the dock host windows is technically created in NewFrame() + // and our ->ParentXXX and ->RootXXX pointers inside windows are currently mislading or lacking. + ImGuiContext& g = *GImGui; + for (int i = g.OpenPopupStack.Size - 1; i >= 0; i--) + if (ImGuiWindow* popup_window = g.OpenPopupStack[i].Window) + if (ImGui::IsWindowWithinBeginStackOf(payload, popup_window)) // Payload is created from within a popup begin stack. + return false; + + return true; +} + +static bool ImGui::DockNodeIsDropAllowed(ImGuiWindow* host_window, ImGuiWindow* root_payload) +{ + if (root_payload->DockNodeAsHost && root_payload->DockNodeAsHost->IsSplitNode()) // FIXME-DOCK: Missing filtering + return true; + + const int payload_count = root_payload->DockNodeAsHost ? root_payload->DockNodeAsHost->Windows.Size : 1; + for (int payload_n = 0; payload_n < payload_count; payload_n++) + { + ImGuiWindow* payload = root_payload->DockNodeAsHost ? root_payload->DockNodeAsHost->Windows[payload_n] : root_payload; + if (DockNodeIsDropAllowedOne(payload, host_window)) + return true; + } + return false; +} + +// window menu button == collapse button when not in a dock node. +// FIXME: This is similar to RenderWindowTitleBarContents(), may want to share code. +static void ImGui::DockNodeCalcTabBarLayout(const ImGuiDockNode* node, ImRect* out_title_rect, ImRect* out_tab_bar_rect, ImVec2* out_window_menu_button_pos, ImVec2* out_close_button_pos) +{ + ImGuiContext& g = *GImGui; + ImGuiStyle& style = g.Style; + + ImRect r = ImRect(node->Pos.x, node->Pos.y, node->Pos.x + node->Size.x, node->Pos.y + g.FontSize + g.Style.FramePadding.y * 2.0f); + if (out_title_rect) { *out_title_rect = r; } + + r.Min.x += style.WindowBorderSize; + r.Max.x -= style.WindowBorderSize; + + float button_sz = g.FontSize; + r.Min.x += style.FramePadding.x; + r.Max.x -= style.FramePadding.x; + ImVec2 window_menu_button_pos = ImVec2(r.Min.x, r.Min.y + style.FramePadding.y); + if (node->HasCloseButton) + { + if (out_close_button_pos) *out_close_button_pos = ImVec2(r.Max.x - button_sz, r.Min.y + style.FramePadding.y); + r.Max.x -= button_sz + style.ItemInnerSpacing.x; + } + if (node->HasWindowMenuButton && style.WindowMenuButtonPosition == ImGuiDir_Left) + { + r.Min.x += button_sz + style.ItemInnerSpacing.x; + } + else if (node->HasWindowMenuButton && style.WindowMenuButtonPosition == ImGuiDir_Right) + { + window_menu_button_pos = ImVec2(r.Max.x - button_sz, r.Min.y + style.FramePadding.y); + r.Max.x -= button_sz + style.ItemInnerSpacing.x; + } + if (out_tab_bar_rect) { *out_tab_bar_rect = r; } + if (out_window_menu_button_pos) { *out_window_menu_button_pos = window_menu_button_pos; } +} + +void ImGui::DockNodeCalcSplitRects(ImVec2& pos_old, ImVec2& size_old, ImVec2& pos_new, ImVec2& size_new, ImGuiDir dir, ImVec2 size_new_desired) +{ + ImGuiContext& g = *GImGui; + const float dock_spacing = g.Style.ItemInnerSpacing.x; + const ImGuiAxis axis = (dir == ImGuiDir_Left || dir == ImGuiDir_Right) ? ImGuiAxis_X : ImGuiAxis_Y; + pos_new[axis ^ 1] = pos_old[axis ^ 1]; + size_new[axis ^ 1] = size_old[axis ^ 1]; + + // Distribute size on given axis (with a desired size or equally) + const float w_avail = size_old[axis] - dock_spacing; + if (size_new_desired[axis] > 0.0f && size_new_desired[axis] <= w_avail * 0.5f) + { + size_new[axis] = size_new_desired[axis]; + size_old[axis] = IM_TRUNC(w_avail - size_new[axis]); + } + else + { + size_new[axis] = IM_TRUNC(w_avail * 0.5f); + size_old[axis] = IM_TRUNC(w_avail - size_new[axis]); + } + + // Position each node + if (dir == ImGuiDir_Right || dir == ImGuiDir_Down) + { + pos_new[axis] = pos_old[axis] + size_old[axis] + dock_spacing; + } + else if (dir == ImGuiDir_Left || dir == ImGuiDir_Up) + { + pos_new[axis] = pos_old[axis]; + pos_old[axis] = pos_new[axis] + size_new[axis] + dock_spacing; + } +} + +// Retrieve the drop rectangles for a given direction or for the center + perform hit testing. +bool ImGui::DockNodeCalcDropRectsAndTestMousePos(const ImRect& parent, ImGuiDir dir, ImRect& out_r, bool outer_docking, ImVec2* test_mouse_pos) +{ + ImGuiContext& g = *GImGui; + + const float parent_smaller_axis = ImMin(parent.GetWidth(), parent.GetHeight()); + const float hs_for_central_nodes = ImMin(g.FontSize * 1.5f, ImMax(g.FontSize * 0.5f, parent_smaller_axis / 8.0f)); + float hs_w; // Half-size, longer axis + float hs_h; // Half-size, smaller axis + ImVec2 off; // Distance from edge or center + if (outer_docking) + { + //hs_w = ImTrunc(ImClamp(parent_smaller_axis - hs_for_central_nodes * 4.0f, g.FontSize * 0.5f, g.FontSize * 8.0f)); + //hs_h = ImTrunc(hs_w * 0.15f); + //off = ImVec2(ImTrunc(parent.GetWidth() * 0.5f - GetFrameHeightWithSpacing() * 1.4f - hs_h), ImTrunc(parent.GetHeight() * 0.5f - GetFrameHeightWithSpacing() * 1.4f - hs_h)); + hs_w = ImTrunc(hs_for_central_nodes * 1.50f); + hs_h = ImTrunc(hs_for_central_nodes * 0.80f); + off = ImTrunc(ImVec2(parent.GetWidth() * 0.5f - hs_h, parent.GetHeight() * 0.5f - hs_h)); + } + else + { + hs_w = ImTrunc(hs_for_central_nodes); + hs_h = ImTrunc(hs_for_central_nodes * 0.90f); + off = ImTrunc(ImVec2(hs_w * 2.40f, hs_w * 2.40f)); + } + + ImVec2 c = ImTrunc(parent.GetCenter()); + if (dir == ImGuiDir_None) { out_r = ImRect(c.x - hs_w, c.y - hs_w, c.x + hs_w, c.y + hs_w); } + else if (dir == ImGuiDir_Up) { out_r = ImRect(c.x - hs_w, c.y - off.y - hs_h, c.x + hs_w, c.y - off.y + hs_h); } + else if (dir == ImGuiDir_Down) { out_r = ImRect(c.x - hs_w, c.y + off.y - hs_h, c.x + hs_w, c.y + off.y + hs_h); } + else if (dir == ImGuiDir_Left) { out_r = ImRect(c.x - off.x - hs_h, c.y - hs_w, c.x - off.x + hs_h, c.y + hs_w); } + else if (dir == ImGuiDir_Right) { out_r = ImRect(c.x + off.x - hs_h, c.y - hs_w, c.x + off.x + hs_h, c.y + hs_w); } + + if (test_mouse_pos == NULL) + return false; + + ImRect hit_r = out_r; + if (!outer_docking) + { + // Custom hit testing for the 5-way selection, designed to reduce flickering when moving diagonally between sides + hit_r.Expand(ImTrunc(hs_w * 0.30f)); + ImVec2 mouse_delta = (*test_mouse_pos - c); + float mouse_delta_len2 = ImLengthSqr(mouse_delta); + float r_threshold_center = hs_w * 1.4f; + float r_threshold_sides = hs_w * (1.4f + 1.2f); + if (mouse_delta_len2 < r_threshold_center * r_threshold_center) + return (dir == ImGuiDir_None); + if (mouse_delta_len2 < r_threshold_sides * r_threshold_sides) + return (dir == ImGetDirQuadrantFromDelta(mouse_delta.x, mouse_delta.y)); + } + return hit_r.Contains(*test_mouse_pos); +} + +// host_node may be NULL if the window doesn't have a DockNode already. +// FIXME-DOCK: This is misnamed since it's also doing the filtering. +static void ImGui::DockNodePreviewDockSetup(ImGuiWindow* host_window, ImGuiDockNode* host_node, ImGuiWindow* payload_window, ImGuiDockNode* payload_node, ImGuiDockPreviewData* data, bool is_explicit_target, bool is_outer_docking) +{ + ImGuiContext& g = *GImGui; + + // There is an edge case when docking into a dockspace which only has inactive nodes. + // In this case DockNodeTreeFindNodeByPos() will have selected a leaf node which is inactive. + // Because the inactive leaf node doesn't have proper pos/size yet, we'll use the root node as reference. + if (payload_node == NULL) + payload_node = payload_window->DockNodeAsHost; + ImGuiDockNode* ref_node_for_rect = (host_node && !host_node->IsVisible) ? DockNodeGetRootNode(host_node) : host_node; + if (ref_node_for_rect) + IM_ASSERT(ref_node_for_rect->IsVisible == true); + + // Filter, figure out where we are allowed to dock + ImGuiDockNodeFlags src_node_flags = payload_node ? payload_node->MergedFlags : payload_window->WindowClass.DockNodeFlagsOverrideSet; + ImGuiDockNodeFlags dst_node_flags = host_node ? host_node->MergedFlags : host_window->WindowClass.DockNodeFlagsOverrideSet; + data->IsCenterAvailable = true; + if (is_outer_docking) + data->IsCenterAvailable = false; + else if (dst_node_flags & ImGuiDockNodeFlags_NoDockingOverMe) + data->IsCenterAvailable = false; + else if (host_node && (dst_node_flags & ImGuiDockNodeFlags_NoDockingOverCentralNode) && host_node->IsCentralNode()) + data->IsCenterAvailable = false; + else if ((!host_node || !host_node->IsEmpty()) && payload_node && payload_node->IsSplitNode() && (payload_node->OnlyNodeWithWindows == NULL)) // Is _visibly_ split? + data->IsCenterAvailable = false; + else if ((src_node_flags & ImGuiDockNodeFlags_NoDockingOverOther) && (!host_node || !host_node->IsEmpty())) + data->IsCenterAvailable = false; + else if ((src_node_flags & ImGuiDockNodeFlags_NoDockingOverEmpty) && host_node && host_node->IsEmpty()) + data->IsCenterAvailable = false; + + data->IsSidesAvailable = true; + if ((dst_node_flags & ImGuiDockNodeFlags_NoDockingSplit) || g.IO.ConfigDockingNoSplit) + data->IsSidesAvailable = false; + else if (!is_outer_docking && host_node && host_node->ParentNode == NULL && host_node->IsCentralNode()) + data->IsSidesAvailable = false; + else if (src_node_flags & ImGuiDockNodeFlags_NoDockingSplitOther) + data->IsSidesAvailable = false; + + // Build a tentative future node (reuse same structure because it is practical. Shape will be readjusted when previewing a split) + data->FutureNode.HasCloseButton = (host_node ? host_node->HasCloseButton : host_window->HasCloseButton) || (payload_window->HasCloseButton); + data->FutureNode.HasWindowMenuButton = host_node ? true : ((host_window->Flags & ImGuiWindowFlags_NoCollapse) == 0); + data->FutureNode.Pos = ref_node_for_rect ? ref_node_for_rect->Pos : host_window->Pos; + data->FutureNode.Size = ref_node_for_rect ? ref_node_for_rect->Size : host_window->Size; + + // Calculate drop shapes geometry for allowed splitting directions + IM_ASSERT(ImGuiDir_None == -1); + data->SplitNode = host_node; + data->SplitDir = ImGuiDir_None; + data->IsSplitDirExplicit = false; + if (!host_window->Collapsed) + for (int dir = ImGuiDir_None; dir < ImGuiDir_COUNT; dir++) + { + if (dir == ImGuiDir_None && !data->IsCenterAvailable) + continue; + if (dir != ImGuiDir_None && !data->IsSidesAvailable) + continue; + if (DockNodeCalcDropRectsAndTestMousePos(data->FutureNode.Rect(), (ImGuiDir)dir, data->DropRectsDraw[dir+1], is_outer_docking, &g.IO.MousePos)) + { + data->SplitDir = (ImGuiDir)dir; + data->IsSplitDirExplicit = true; + } + } + + // When docking without holding Shift, we only allow and preview docking when hovering over a drop rect or over the title bar + data->IsDropAllowed = (data->SplitDir != ImGuiDir_None) || (data->IsCenterAvailable); + if (!is_explicit_target && !data->IsSplitDirExplicit && !g.IO.ConfigDockingWithShift) + data->IsDropAllowed = false; + + // Calculate split area + data->SplitRatio = 0.0f; + if (data->SplitDir != ImGuiDir_None) + { + ImGuiDir split_dir = data->SplitDir; + ImGuiAxis split_axis = (split_dir == ImGuiDir_Left || split_dir == ImGuiDir_Right) ? ImGuiAxis_X : ImGuiAxis_Y; + ImVec2 pos_new, pos_old = data->FutureNode.Pos; + ImVec2 size_new, size_old = data->FutureNode.Size; + DockNodeCalcSplitRects(pos_old, size_old, pos_new, size_new, split_dir, payload_window->Size); + + // Calculate split ratio so we can pass it down the docking request + float split_ratio = ImSaturate(size_new[split_axis] / data->FutureNode.Size[split_axis]); + data->FutureNode.Pos = pos_new; + data->FutureNode.Size = size_new; + data->SplitRatio = (split_dir == ImGuiDir_Right || split_dir == ImGuiDir_Down) ? (1.0f - split_ratio) : (split_ratio); + } +} + +static void ImGui::DockNodePreviewDockRender(ImGuiWindow* host_window, ImGuiDockNode* host_node, ImGuiWindow* root_payload, const ImGuiDockPreviewData* data) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(g.CurrentWindow == host_window); // Because we rely on font size to calculate tab sizes + + // With this option, we only display the preview on the target viewport, and the payload viewport is made transparent. + // To compensate for the single layer obstructed by the payload, we'll increase the alpha of the preview nodes. + const bool is_transparent_payload = g.IO.ConfigDockingTransparentPayload; + + // In case the two windows involved are on different viewports, we will draw the overlay on each of them. + int overlay_draw_lists_count = 0; + ImDrawList* overlay_draw_lists[2]; + overlay_draw_lists[overlay_draw_lists_count++] = GetForegroundDrawList(host_window->Viewport); + if (host_window->Viewport != root_payload->Viewport && !is_transparent_payload) + overlay_draw_lists[overlay_draw_lists_count++] = GetForegroundDrawList(root_payload->Viewport); + + // Draw main preview rectangle + const ImU32 overlay_col_main = GetColorU32(ImGuiCol_DockingPreview, is_transparent_payload ? 0.60f : 0.40f); + const ImU32 overlay_col_drop = GetColorU32(ImGuiCol_DockingPreview, is_transparent_payload ? 0.90f : 0.70f); + const ImU32 overlay_col_drop_hovered = GetColorU32(ImGuiCol_DockingPreview, is_transparent_payload ? 1.20f : 1.00f); + const ImU32 overlay_col_lines = GetColorU32(ImGuiCol_NavWindowingHighlight, is_transparent_payload ? 0.80f : 0.60f); + + // Display area preview + const bool can_preview_tabs = (root_payload->DockNodeAsHost == NULL || root_payload->DockNodeAsHost->Windows.Size > 0); + if (data->IsDropAllowed) + { + ImRect overlay_rect = data->FutureNode.Rect(); + if (data->SplitDir == ImGuiDir_None && can_preview_tabs) + overlay_rect.Min.y += GetFrameHeight(); + if (data->SplitDir != ImGuiDir_None || data->IsCenterAvailable) + for (int overlay_n = 0; overlay_n < overlay_draw_lists_count; overlay_n++) + overlay_draw_lists[overlay_n]->AddRectFilled(overlay_rect.Min, overlay_rect.Max, overlay_col_main, host_window->WindowRounding, CalcRoundingFlagsForRectInRect(overlay_rect, host_window->Rect(), g.Style.DockingSeparatorSize)); + } + + // Display tab shape/label preview unless we are splitting node (it generally makes the situation harder to read) + if (data->IsDropAllowed && can_preview_tabs && data->SplitDir == ImGuiDir_None && data->IsCenterAvailable) + { + // Compute target tab bar geometry so we can locate our preview tabs + ImRect tab_bar_rect; + DockNodeCalcTabBarLayout(&data->FutureNode, NULL, &tab_bar_rect, NULL, NULL); + ImVec2 tab_pos = tab_bar_rect.Min; + if (host_node && host_node->TabBar) + { + if (!host_node->IsHiddenTabBar() && !host_node->IsNoTabBar()) + tab_pos.x += host_node->TabBar->WidthAllTabs + g.Style.ItemInnerSpacing.x; // We don't use OffsetNewTab because when using non-persistent-order tab bar it is incremented with each Tab submission. + else + tab_pos.x += g.Style.ItemInnerSpacing.x + TabItemCalcSize(host_node->Windows[0]).x; + } + else if (!(host_window->Flags & ImGuiWindowFlags_DockNodeHost)) + { + tab_pos.x += g.Style.ItemInnerSpacing.x + TabItemCalcSize(host_window).x; // Account for slight offset which will be added when changing from title bar to tab bar + } + + // Draw tab shape/label preview (payload may be a loose window or a host window carrying multiple tabbed windows) + if (root_payload->DockNodeAsHost) + IM_ASSERT(root_payload->DockNodeAsHost->Windows.Size <= root_payload->DockNodeAsHost->TabBar->Tabs.Size); + ImGuiTabBar* tab_bar_with_payload = root_payload->DockNodeAsHost ? root_payload->DockNodeAsHost->TabBar : NULL; + const int payload_count = tab_bar_with_payload ? tab_bar_with_payload->Tabs.Size : 1; + for (int payload_n = 0; payload_n < payload_count; payload_n++) + { + // DockNode's TabBar may have non-window Tabs manually appended by user + ImGuiWindow* payload_window = tab_bar_with_payload ? tab_bar_with_payload->Tabs[payload_n].Window : root_payload; + if (tab_bar_with_payload && payload_window == NULL) + continue; + if (!DockNodeIsDropAllowedOne(payload_window, host_window)) + continue; + + // Calculate the tab bounding box for each payload window + ImVec2 tab_size = TabItemCalcSize(payload_window); + ImRect tab_bb(tab_pos.x, tab_pos.y, tab_pos.x + tab_size.x, tab_pos.y + tab_size.y); + tab_pos.x += tab_size.x + g.Style.ItemInnerSpacing.x; + const ImU32 overlay_col_text = GetColorU32(payload_window->DockStyle.Colors[ImGuiWindowDockStyleCol_Text]); + const ImU32 overlay_col_tabs = GetColorU32(payload_window->DockStyle.Colors[ImGuiWindowDockStyleCol_TabSelected]); + PushStyleColor(ImGuiCol_Text, overlay_col_text); + for (int overlay_n = 0; overlay_n < overlay_draw_lists_count; overlay_n++) + { + ImGuiTabItemFlags tab_flags = (payload_window->Flags & ImGuiWindowFlags_UnsavedDocument) ? ImGuiTabItemFlags_UnsavedDocument : 0; + if (!tab_bar_rect.Contains(tab_bb)) + overlay_draw_lists[overlay_n]->PushClipRect(tab_bar_rect.Min, tab_bar_rect.Max); + TabItemBackground(overlay_draw_lists[overlay_n], tab_bb, tab_flags, overlay_col_tabs); + TabItemLabelAndCloseButton(overlay_draw_lists[overlay_n], tab_bb, tab_flags, g.Style.FramePadding, payload_window->Name, 0, 0, false, NULL, NULL); + if (!tab_bar_rect.Contains(tab_bb)) + overlay_draw_lists[overlay_n]->PopClipRect(); + } + PopStyleColor(); + } + } + + // Display drop boxes + const float overlay_rounding = ImMax(3.0f, g.Style.FrameRounding); + for (int dir = ImGuiDir_None; dir < ImGuiDir_COUNT; dir++) + { + if (!data->DropRectsDraw[dir + 1].IsInverted()) + { + ImRect draw_r = data->DropRectsDraw[dir + 1]; + ImRect draw_r_in = draw_r; + draw_r_in.Expand(-2.0f); + ImU32 overlay_col = (data->SplitDir == (ImGuiDir)dir && data->IsSplitDirExplicit) ? overlay_col_drop_hovered : overlay_col_drop; + for (int overlay_n = 0; overlay_n < overlay_draw_lists_count; overlay_n++) + { + ImVec2 center = ImFloor(draw_r_in.GetCenter()); + overlay_draw_lists[overlay_n]->AddRectFilled(draw_r.Min, draw_r.Max, overlay_col, overlay_rounding); + overlay_draw_lists[overlay_n]->AddRect(draw_r_in.Min, draw_r_in.Max, overlay_col_lines, overlay_rounding); + if (dir == ImGuiDir_Left || dir == ImGuiDir_Right) + overlay_draw_lists[overlay_n]->AddLine(ImVec2(center.x, draw_r_in.Min.y), ImVec2(center.x, draw_r_in.Max.y), overlay_col_lines); + if (dir == ImGuiDir_Up || dir == ImGuiDir_Down) + overlay_draw_lists[overlay_n]->AddLine(ImVec2(draw_r_in.Min.x, center.y), ImVec2(draw_r_in.Max.x, center.y), overlay_col_lines); + } + } + + // Stop after ImGuiDir_None + if ((host_node && (host_node->MergedFlags & ImGuiDockNodeFlags_NoDockingSplit)) || g.IO.ConfigDockingNoSplit) + return; + } +} + +//----------------------------------------------------------------------------- +// Docking: ImGuiDockNode Tree manipulation functions +//----------------------------------------------------------------------------- +// - DockNodeTreeSplit() +// - DockNodeTreeMerge() +// - DockNodeTreeUpdatePosSize() +// - DockNodeTreeUpdateSplitterFindTouchingNode() +// - DockNodeTreeUpdateSplitter() +// - DockNodeTreeFindFallbackLeafNode() +// - DockNodeTreeFindNodeByPos() +//----------------------------------------------------------------------------- + +void ImGui::DockNodeTreeSplit(ImGuiContext* ctx, ImGuiDockNode* parent_node, ImGuiAxis split_axis, int split_inheritor_child_idx, float split_ratio, ImGuiDockNode* new_node) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(split_axis != ImGuiAxis_None); + + ImGuiDockNode* child_0 = (new_node && split_inheritor_child_idx != 0) ? new_node : DockContextAddNode(ctx, 0); + child_0->ParentNode = parent_node; + + ImGuiDockNode* child_1 = (new_node && split_inheritor_child_idx != 1) ? new_node : DockContextAddNode(ctx, 0); + child_1->ParentNode = parent_node; + + ImGuiDockNode* child_inheritor = (split_inheritor_child_idx == 0) ? child_0 : child_1; + DockNodeMoveChildNodes(child_inheritor, parent_node); + parent_node->ChildNodes[0] = child_0; + parent_node->ChildNodes[1] = child_1; + parent_node->ChildNodes[split_inheritor_child_idx]->VisibleWindow = parent_node->VisibleWindow; + parent_node->SplitAxis = split_axis; + parent_node->VisibleWindow = NULL; + parent_node->AuthorityForPos = parent_node->AuthorityForSize = ImGuiDataAuthority_DockNode; + + float size_avail = (parent_node->Size[split_axis] - g.Style.DockingSeparatorSize); + size_avail = ImMax(size_avail, g.Style.WindowMinSize[split_axis] * 2.0f); + IM_ASSERT(size_avail > 0.0f); // If you created a node manually with DockBuilderAddNode(), you need to also call DockBuilderSetNodeSize() before splitting. + child_0->SizeRef = child_1->SizeRef = parent_node->Size; + child_0->SizeRef[split_axis] = ImTrunc(size_avail * split_ratio); + child_1->SizeRef[split_axis] = ImTrunc(size_avail - child_0->SizeRef[split_axis]); + + DockNodeMoveWindows(parent_node->ChildNodes[split_inheritor_child_idx], parent_node); + DockSettingsRenameNodeReferences(parent_node->ID, parent_node->ChildNodes[split_inheritor_child_idx]->ID); + DockNodeUpdateHasCentralNodeChild(DockNodeGetRootNode(parent_node)); + DockNodeTreeUpdatePosSize(parent_node, parent_node->Pos, parent_node->Size); + + // Flags transfer (e.g. this is where we transfer the ImGuiDockNodeFlags_CentralNode property) + child_0->SharedFlags = parent_node->SharedFlags & ImGuiDockNodeFlags_SharedFlagsInheritMask_; + child_1->SharedFlags = parent_node->SharedFlags & ImGuiDockNodeFlags_SharedFlagsInheritMask_; + child_inheritor->LocalFlags = parent_node->LocalFlags & ImGuiDockNodeFlags_LocalFlagsTransferMask_; + parent_node->LocalFlags &= ~ImGuiDockNodeFlags_LocalFlagsTransferMask_; + child_0->UpdateMergedFlags(); + child_1->UpdateMergedFlags(); + parent_node->UpdateMergedFlags(); + if (child_inheritor->IsCentralNode()) + DockNodeGetRootNode(parent_node)->CentralNode = child_inheritor; +} + +void ImGui::DockNodeTreeMerge(ImGuiContext* ctx, ImGuiDockNode* parent_node, ImGuiDockNode* merge_lead_child) +{ + // When called from DockContextProcessUndockNode() it is possible that one of the child is NULL. + ImGuiContext& g = *GImGui; + ImGuiDockNode* child_0 = parent_node->ChildNodes[0]; + ImGuiDockNode* child_1 = parent_node->ChildNodes[1]; + IM_ASSERT(child_0 || child_1); + IM_ASSERT(merge_lead_child == child_0 || merge_lead_child == child_1); + if ((child_0 && child_0->Windows.Size > 0) || (child_1 && child_1->Windows.Size > 0)) + { + IM_ASSERT(parent_node->TabBar == NULL); + IM_ASSERT(parent_node->Windows.Size == 0); + } + IMGUI_DEBUG_LOG_DOCKING("[docking] DockNodeTreeMerge: 0x%08X + 0x%08X back into parent 0x%08X\n", child_0 ? child_0->ID : 0, child_1 ? child_1->ID : 0, parent_node->ID); + + ImVec2 backup_last_explicit_size = parent_node->SizeRef; + DockNodeMoveChildNodes(parent_node, merge_lead_child); + if (child_0) + { + DockNodeMoveWindows(parent_node, child_0); // Generally only 1 of the 2 child node will have windows + DockSettingsRenameNodeReferences(child_0->ID, parent_node->ID); + } + if (child_1) + { + DockNodeMoveWindows(parent_node, child_1); + DockSettingsRenameNodeReferences(child_1->ID, parent_node->ID); + } + DockNodeApplyPosSizeToWindows(parent_node); + parent_node->AuthorityForPos = parent_node->AuthorityForSize = parent_node->AuthorityForViewport = ImGuiDataAuthority_Auto; + parent_node->VisibleWindow = merge_lead_child->VisibleWindow; + parent_node->SizeRef = backup_last_explicit_size; + + // Flags transfer + parent_node->LocalFlags &= ~ImGuiDockNodeFlags_LocalFlagsTransferMask_; // Preserve Dockspace flag + parent_node->LocalFlags |= (child_0 ? child_0->LocalFlags : 0) & ImGuiDockNodeFlags_LocalFlagsTransferMask_; + parent_node->LocalFlags |= (child_1 ? child_1->LocalFlags : 0) & ImGuiDockNodeFlags_LocalFlagsTransferMask_; + parent_node->LocalFlagsInWindows = (child_0 ? child_0->LocalFlagsInWindows : 0) | (child_1 ? child_1->LocalFlagsInWindows : 0); // FIXME: Would be more consistent to update from actual windows + parent_node->UpdateMergedFlags(); + + if (child_0) + { + ctx->DockContext.Nodes.SetVoidPtr(child_0->ID, NULL); + IM_DELETE(child_0); + } + if (child_1) + { + ctx->DockContext.Nodes.SetVoidPtr(child_1->ID, NULL); + IM_DELETE(child_1); + } +} + +// Update Pos/Size for a node hierarchy (don't affect child Windows yet) +// (Depth-first, Pre-Order) +void ImGui::DockNodeTreeUpdatePosSize(ImGuiDockNode* node, ImVec2 pos, ImVec2 size, ImGuiDockNode* only_write_to_single_node) +{ + // During the regular dock node update we write to all nodes. + // 'only_write_to_single_node' is only set when turning a node visible mid-frame and we need its size right-away. + ImGuiContext& g = *GImGui; + const bool write_to_node = only_write_to_single_node == NULL || only_write_to_single_node == node; + if (write_to_node) + { + node->Pos = pos; + node->Size = size; + } + + if (node->IsLeafNode()) + return; + + ImGuiDockNode* child_0 = node->ChildNodes[0]; + ImGuiDockNode* child_1 = node->ChildNodes[1]; + ImVec2 child_0_pos = pos, child_1_pos = pos; + ImVec2 child_0_size = size, child_1_size = size; + + const bool child_0_is_toward_single_node = (only_write_to_single_node != NULL && DockNodeIsInHierarchyOf(only_write_to_single_node, child_0)); + const bool child_1_is_toward_single_node = (only_write_to_single_node != NULL && DockNodeIsInHierarchyOf(only_write_to_single_node, child_1)); + const bool child_0_is_or_will_be_visible = child_0->IsVisible || child_0_is_toward_single_node; + const bool child_1_is_or_will_be_visible = child_1->IsVisible || child_1_is_toward_single_node; + + if (child_0_is_or_will_be_visible && child_1_is_or_will_be_visible) + { + const float spacing = g.Style.DockingSeparatorSize; + const ImGuiAxis axis = (ImGuiAxis)node->SplitAxis; + const float size_avail = ImMax(size[axis] - spacing, 0.0f); + + // Size allocation policy + // 1) The first 0..WindowMinSize[axis]*2 are allocated evenly to both windows. + const float size_min_each = ImTrunc(ImMin(size_avail, g.Style.WindowMinSize[axis] * 2.0f) * 0.5f); + + // FIXME: Blocks 2) and 3) are essentially doing nearly the same thing. + // Difference are: write-back to SizeRef; application of a minimum size; rounding before ImTrunc() + // Clarify and rework differences between Size & SizeRef and purpose of WantLockSizeOnce + + // 2) Process locked absolute size (during a splitter resize we preserve the child of nodes not touching the splitter edge) + if (child_0->WantLockSizeOnce && !child_1->WantLockSizeOnce) + { + child_0_size[axis] = child_0->SizeRef[axis] = ImMin(size_avail - 1.0f, child_0->Size[axis]); + child_1_size[axis] = child_1->SizeRef[axis] = (size_avail - child_0_size[axis]); + IM_ASSERT(child_0->SizeRef[axis] > 0.0f && child_1->SizeRef[axis] > 0.0f); + } + else if (child_1->WantLockSizeOnce && !child_0->WantLockSizeOnce) + { + child_1_size[axis] = child_1->SizeRef[axis] = ImMin(size_avail - 1.0f, child_1->Size[axis]); + child_0_size[axis] = child_0->SizeRef[axis] = (size_avail - child_1_size[axis]); + IM_ASSERT(child_0->SizeRef[axis] > 0.0f && child_1->SizeRef[axis] > 0.0f); + } + else if (child_0->WantLockSizeOnce && child_1->WantLockSizeOnce) + { + // FIXME-DOCK: We cannot honor the requested size, so apply ratio. + // Currently this path will only be taken if code programmatically sets WantLockSizeOnce + float split_ratio = child_0_size[axis] / (child_0_size[axis] + child_1_size[axis]); + child_0_size[axis] = child_0->SizeRef[axis] = ImTrunc(size_avail * split_ratio); + child_1_size[axis] = child_1->SizeRef[axis] = (size_avail - child_0_size[axis]); + IM_ASSERT(child_0->SizeRef[axis] > 0.0f && child_1->SizeRef[axis] > 0.0f); + } + + // 3) If one window is the central node (~ use remaining space, should be made explicit!), use explicit size from the other, and remainder for the central node + else if (child_0->SizeRef[axis] != 0.0f && child_1->HasCentralNodeChild) + { + child_0_size[axis] = ImMin(size_avail - size_min_each, child_0->SizeRef[axis]); + child_1_size[axis] = (size_avail - child_0_size[axis]); + } + else if (child_1->SizeRef[axis] != 0.0f && child_0->HasCentralNodeChild) + { + child_1_size[axis] = ImMin(size_avail - size_min_each, child_1->SizeRef[axis]); + child_0_size[axis] = (size_avail - child_1_size[axis]); + } + else + { + // 4) Otherwise distribute according to the relative ratio of each SizeRef value + float split_ratio = child_0->SizeRef[axis] / (child_0->SizeRef[axis] + child_1->SizeRef[axis]); + child_0_size[axis] = ImMax(size_min_each, ImTrunc(size_avail * split_ratio + 0.5f)); + child_1_size[axis] = (size_avail - child_0_size[axis]); + } + + child_1_pos[axis] += spacing + child_0_size[axis]; + } + + if (only_write_to_single_node == NULL) + child_0->WantLockSizeOnce = child_1->WantLockSizeOnce = false; + + const bool child_0_recurse = only_write_to_single_node ? child_0_is_toward_single_node : child_0->IsVisible; + const bool child_1_recurse = only_write_to_single_node ? child_1_is_toward_single_node : child_1->IsVisible; + if (child_0_recurse) + DockNodeTreeUpdatePosSize(child_0, child_0_pos, child_0_size); + if (child_1_recurse) + DockNodeTreeUpdatePosSize(child_1, child_1_pos, child_1_size); +} + +static void DockNodeTreeUpdateSplitterFindTouchingNode(ImGuiDockNode* node, ImGuiAxis axis, int side, ImVector* touching_nodes) +{ + if (node->IsLeafNode()) + { + touching_nodes->push_back(node); + return; + } + if (node->ChildNodes[0]->IsVisible) + if (node->SplitAxis != axis || side == 0 || !node->ChildNodes[1]->IsVisible) + DockNodeTreeUpdateSplitterFindTouchingNode(node->ChildNodes[0], axis, side, touching_nodes); + if (node->ChildNodes[1]->IsVisible) + if (node->SplitAxis != axis || side == 1 || !node->ChildNodes[0]->IsVisible) + DockNodeTreeUpdateSplitterFindTouchingNode(node->ChildNodes[1], axis, side, touching_nodes); +} + +// (Depth-First, Pre-Order) +void ImGui::DockNodeTreeUpdateSplitter(ImGuiDockNode* node) +{ + if (node->IsLeafNode()) + return; + + ImGuiContext& g = *GImGui; + + ImGuiDockNode* child_0 = node->ChildNodes[0]; + ImGuiDockNode* child_1 = node->ChildNodes[1]; + if (child_0->IsVisible && child_1->IsVisible) + { + // Bounding box of the splitter cover the space between both nodes (w = Spacing, h = Size[xy^1] for when splitting horizontally) + const ImGuiAxis axis = (ImGuiAxis)node->SplitAxis; + IM_ASSERT(axis != ImGuiAxis_None); + ImRect bb; + bb.Min = child_0->Pos; + bb.Max = child_1->Pos; + bb.Min[axis] += child_0->Size[axis]; + bb.Max[axis ^ 1] += child_1->Size[axis ^ 1]; + //if (g.IO.KeyCtrl) GetForegroundDrawList(g.CurrentWindow->Viewport)->AddRect(bb.Min, bb.Max, IM_COL32(255,0,255,255)); + + const ImGuiDockNodeFlags merged_flags = child_0->MergedFlags | child_1->MergedFlags; // Merged flags for BOTH childs + const ImGuiDockNodeFlags no_resize_axis_flag = (axis == ImGuiAxis_X) ? ImGuiDockNodeFlags_NoResizeX : ImGuiDockNodeFlags_NoResizeY; + if ((merged_flags & ImGuiDockNodeFlags_NoResize) || (merged_flags & no_resize_axis_flag)) + { + ImGuiWindow* window = g.CurrentWindow; + window->DrawList->AddRectFilled(bb.Min, bb.Max, GetColorU32(ImGuiCol_Separator), g.Style.FrameRounding); + } + else + { + //bb.Min[axis] += 1; // Display a little inward so highlight doesn't connect with nearby tabs on the neighbor node. + //bb.Max[axis] -= 1; + PushID(node->ID); + + // Find resizing limits by gathering list of nodes that are touching the splitter line. + ImVector touching_nodes[2]; + float min_size = g.Style.WindowMinSize[axis]; + float resize_limits[2]; + resize_limits[0] = node->ChildNodes[0]->Pos[axis] + min_size; + resize_limits[1] = node->ChildNodes[1]->Pos[axis] + node->ChildNodes[1]->Size[axis] - min_size; + + ImGuiID splitter_id = GetID("##Splitter"); + if (g.ActiveId == splitter_id) // Only process when splitter is active + { + DockNodeTreeUpdateSplitterFindTouchingNode(child_0, axis, 1, &touching_nodes[0]); + DockNodeTreeUpdateSplitterFindTouchingNode(child_1, axis, 0, &touching_nodes[1]); + for (int touching_node_n = 0; touching_node_n < touching_nodes[0].Size; touching_node_n++) + resize_limits[0] = ImMax(resize_limits[0], touching_nodes[0][touching_node_n]->Rect().Min[axis] + min_size); + for (int touching_node_n = 0; touching_node_n < touching_nodes[1].Size; touching_node_n++) + resize_limits[1] = ImMin(resize_limits[1], touching_nodes[1][touching_node_n]->Rect().Max[axis] - min_size); + + // [DEBUG] Render touching nodes & limits + /* + ImDrawList* draw_list = node->HostWindow ? GetForegroundDrawList(node->HostWindow) : GetForegroundDrawList(GetMainViewport()); + for (int n = 0; n < 2; n++) + { + for (int touching_node_n = 0; touching_node_n < touching_nodes[n].Size; touching_node_n++) + draw_list->AddRect(touching_nodes[n][touching_node_n]->Pos, touching_nodes[n][touching_node_n]->Pos + touching_nodes[n][touching_node_n]->Size, IM_COL32(0, 255, 0, 255)); + if (axis == ImGuiAxis_X) + draw_list->AddLine(ImVec2(resize_limits[n], node->ChildNodes[n]->Pos.y), ImVec2(resize_limits[n], node->ChildNodes[n]->Pos.y + node->ChildNodes[n]->Size.y), IM_COL32(255, 0, 255, 255), 3.0f); + else + draw_list->AddLine(ImVec2(node->ChildNodes[n]->Pos.x, resize_limits[n]), ImVec2(node->ChildNodes[n]->Pos.x + node->ChildNodes[n]->Size.x, resize_limits[n]), IM_COL32(255, 0, 255, 255), 3.0f); + } + */ + } + + // Use a short delay before highlighting the splitter (and changing the mouse cursor) in order for regular mouse movement to not highlight many splitters + float cur_size_0 = child_0->Size[axis]; + float cur_size_1 = child_1->Size[axis]; + float min_size_0 = resize_limits[0] - child_0->Pos[axis]; + float min_size_1 = child_1->Pos[axis] + child_1->Size[axis] - resize_limits[1]; + ImU32 bg_col = GetColorU32(ImGuiCol_WindowBg); + if (SplitterBehavior(bb, GetID("##Splitter"), axis, &cur_size_0, &cur_size_1, min_size_0, min_size_1, g.WindowsBorderHoverPadding, WINDOWS_RESIZE_FROM_EDGES_FEEDBACK_TIMER, bg_col)) + { + if (touching_nodes[0].Size > 0 && touching_nodes[1].Size > 0) + { + child_0->Size[axis] = child_0->SizeRef[axis] = cur_size_0; + child_1->Pos[axis] -= cur_size_1 - child_1->Size[axis]; + child_1->Size[axis] = child_1->SizeRef[axis] = cur_size_1; + + // Lock the size of every node that is a sibling of the node we are touching + // This might be less desirable if we can merge sibling of a same axis into the same parental level. + for (int side_n = 0; side_n < 2; side_n++) + for (int touching_node_n = 0; touching_node_n < touching_nodes[side_n].Size; touching_node_n++) + { + ImGuiDockNode* touching_node = touching_nodes[side_n][touching_node_n]; + //ImDrawList* draw_list = node->HostWindow ? GetForegroundDrawList(node->HostWindow) : GetForegroundDrawList(GetMainViewport()); + //draw_list->AddRect(touching_node->Pos, touching_node->Pos + touching_node->Size, IM_COL32(255, 128, 0, 255)); + while (touching_node->ParentNode != node) + { + if (touching_node->ParentNode->SplitAxis == axis) + { + // Mark other node so its size will be preserved during the upcoming call to DockNodeTreeUpdatePosSize(). + ImGuiDockNode* node_to_preserve = touching_node->ParentNode->ChildNodes[side_n]; + node_to_preserve->WantLockSizeOnce = true; + //draw_list->AddRect(touching_node->Pos, touching_node->Rect().Max, IM_COL32(255, 0, 0, 255)); + //draw_list->AddRectFilled(node_to_preserve->Pos, node_to_preserve->Rect().Max, IM_COL32(0, 255, 0, 100)); + } + touching_node = touching_node->ParentNode; + } + } + + DockNodeTreeUpdatePosSize(child_0, child_0->Pos, child_0->Size); + DockNodeTreeUpdatePosSize(child_1, child_1->Pos, child_1->Size); + MarkIniSettingsDirty(); + } + } + PopID(); + } + } + + if (child_0->IsVisible) + DockNodeTreeUpdateSplitter(child_0); + if (child_1->IsVisible) + DockNodeTreeUpdateSplitter(child_1); +} + +ImGuiDockNode* ImGui::DockNodeTreeFindFallbackLeafNode(ImGuiDockNode* node) +{ + if (node->IsLeafNode()) + return node; + if (ImGuiDockNode* leaf_node = DockNodeTreeFindFallbackLeafNode(node->ChildNodes[0])) + return leaf_node; + if (ImGuiDockNode* leaf_node = DockNodeTreeFindFallbackLeafNode(node->ChildNodes[1])) + return leaf_node; + return NULL; +} + +ImGuiDockNode* ImGui::DockNodeTreeFindVisibleNodeByPos(ImGuiDockNode* node, ImVec2 pos) +{ + if (!node->IsVisible) + return NULL; + + const float dock_spacing = 0.0f;// g.Style.ItemInnerSpacing.x; // FIXME: Relation to DOCKING_SPLITTER_SIZE? + ImRect r(node->Pos, node->Pos + node->Size); + r.Expand(dock_spacing * 0.5f); + bool inside = r.Contains(pos); + if (!inside) + return NULL; + + if (node->IsLeafNode()) + return node; + if (ImGuiDockNode* hovered_node = DockNodeTreeFindVisibleNodeByPos(node->ChildNodes[0], pos)) + return hovered_node; + if (ImGuiDockNode* hovered_node = DockNodeTreeFindVisibleNodeByPos(node->ChildNodes[1], pos)) + return hovered_node; + + // This means we are hovering over the splitter/spacing of a parent node + return node; +} + +//----------------------------------------------------------------------------- +// Docking: Public Functions (SetWindowDock, DockSpace, DockSpaceOverViewport) +//----------------------------------------------------------------------------- +// - SetWindowDock() [Internal] +// - DockSpace() +// - DockSpaceOverViewport() +//----------------------------------------------------------------------------- + +// [Internal] Called via SetNextWindowDockID() +void ImGui::SetWindowDock(ImGuiWindow* window, ImGuiID dock_id, ImGuiCond cond) +{ + // Test condition (NB: bit 0 is always true) and clear flags for next time + if (cond && (window->SetWindowDockAllowFlags & cond) == 0) + return; + window->SetWindowDockAllowFlags &= ~(ImGuiCond_Once | ImGuiCond_FirstUseEver | ImGuiCond_Appearing); + + if (window->DockId == dock_id) + return; + + // If the user attempt to set a dock id that is a split node, we'll dig within to find a suitable docking spot + ImGuiContext& g = *GImGui; + if (ImGuiDockNode* new_node = DockContextFindNodeByID(&g, dock_id)) + if (new_node->IsSplitNode()) + { + // Policy: Find central node or latest focused node. We first move back to our root node. + new_node = DockNodeGetRootNode(new_node); + if (new_node->CentralNode) + { + IM_ASSERT(new_node->CentralNode->IsCentralNode()); + dock_id = new_node->CentralNode->ID; + } + else + { + dock_id = new_node->LastFocusedNodeId; + } + } + + if (window->DockId == dock_id) + return; + + if (window->DockNode) + DockNodeRemoveWindow(window->DockNode, window, 0); + window->DockId = dock_id; +} + +// Create an explicit dockspace node within an existing window. Also expose dock node flags and creates a CentralNode by default. +// The Central Node is always displayed even when empty and shrink/extend according to the requested size of its neighbors. +// DockSpace() needs to be submitted _before_ any window they can host. If you use a dockspace, submit it early in your app. +// When ImGuiDockNodeFlags_KeepAliveOnly is set, nothing is submitted in the current window (function may be called from any location). +ImGuiID ImGui::DockSpace(ImGuiID dockspace_id, const ImVec2& size_arg, ImGuiDockNodeFlags flags, const ImGuiWindowClass* window_class) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = GetCurrentWindowRead(); + if (!(g.IO.ConfigFlags & ImGuiConfigFlags_DockingEnable)) + return 0; + + // Early out if parent window is hidden/collapsed + // This is faster but also DockNodeUpdateTabBar() relies on TabBarLayout() running (which won't if SkipItems=true) to set NextSelectedTabId = 0). See #2960. + // If for whichever reason this is causing problem we would need to ensure that DockNodeUpdateTabBar() ends up clearing NextSelectedTabId even if SkipItems=true. + if (window->SkipItems) + flags |= ImGuiDockNodeFlags_KeepAliveOnly; + if ((flags & ImGuiDockNodeFlags_KeepAliveOnly) == 0) + window = GetCurrentWindow(); // call to set window->WriteAccessed = true; + + IM_ASSERT((flags & ImGuiDockNodeFlags_DockSpace) == 0); // Flag is automatically set by DockSpace() as LocalFlags, not SharedFlags! + IM_ASSERT((flags & ImGuiDockNodeFlags_CentralNode) == 0); // Flag is automatically set by DockSpace() as LocalFlags, not SharedFlags! (#8145) + + IM_ASSERT(dockspace_id != 0); + ImGuiDockNode* node = DockContextFindNodeByID(&g, dockspace_id); + if (node == NULL) + { + IMGUI_DEBUG_LOG_DOCKING("[docking] DockSpace: dockspace node 0x%08X created\n", dockspace_id); + node = DockContextAddNode(&g, dockspace_id); + node->SetLocalFlags(ImGuiDockNodeFlags_CentralNode); + } + if (window_class && window_class->ClassId != node->WindowClass.ClassId) + IMGUI_DEBUG_LOG_DOCKING("[docking] DockSpace: dockspace node 0x%08X: setup WindowClass 0x%08X -> 0x%08X\n", dockspace_id, node->WindowClass.ClassId, window_class->ClassId); + node->SharedFlags = flags; + node->WindowClass = window_class ? *window_class : ImGuiWindowClass(); + + // When a DockSpace transitioned form implicit to explicit this may be called a second time + // It is possible that the node has already been claimed by a docked window which appeared before the DockSpace() node, so we overwrite IsDockSpace again. + if (node->LastFrameActive == g.FrameCount && !(flags & ImGuiDockNodeFlags_KeepAliveOnly)) + { + IM_ASSERT(node->IsDockSpace() == false && "Cannot call DockSpace() twice a frame with the same ID"); + node->SetLocalFlags(node->LocalFlags | ImGuiDockNodeFlags_DockSpace); + return dockspace_id; + } + node->SetLocalFlags(node->LocalFlags | ImGuiDockNodeFlags_DockSpace); + + // Keep alive mode, this is allow windows docked into this node so stay docked even if they are not visible + if (flags & ImGuiDockNodeFlags_KeepAliveOnly) + { + node->LastFrameAlive = g.FrameCount; + return dockspace_id; + } + + const ImVec2 content_avail = GetContentRegionAvail(); + ImVec2 size = ImTrunc(size_arg); + if (size.x <= 0.0f) + size.x = ImMax(content_avail.x + size.x, 4.0f); // Arbitrary minimum child size (0.0f causing too much issues) + if (size.y <= 0.0f) + size.y = ImMax(content_avail.y + size.y, 4.0f); + IM_ASSERT(size.x > 0.0f && size.y > 0.0f); + + node->Pos = window->DC.CursorPos; + node->Size = node->SizeRef = size; + SetNextWindowPos(node->Pos); + SetNextWindowSize(node->Size); + g.NextWindowData.PosUndock = false; + + // FIXME-DOCK: Why do we need a child window to host a dockspace, could we host it in the existing window? + // FIXME-DOCK: What is the reason for not simply calling BeginChild()? (OK to have a reason but should be commented) + ImGuiWindowFlags window_flags = ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_DockNodeHost; + window_flags |= ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoTitleBar; + window_flags |= ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse; + window_flags |= ImGuiWindowFlags_NoBackground; + + char title[256]; + ImFormatString(title, IM_ARRAYSIZE(title), "%s/DockSpace_%08X", window->Name, dockspace_id); + + PushStyleVar(ImGuiStyleVar_ChildBorderSize, 0.0f); + Begin(title, NULL, window_flags); + PopStyleVar(); + + ImGuiWindow* host_window = g.CurrentWindow; + DockNodeSetupHostWindow(node, host_window); + host_window->ChildId = window->GetID(title); + node->OnlyNodeWithWindows = NULL; + + IM_ASSERT(node->IsRootNode()); + + // We need to handle the rare case were a central node is missing. + // This can happen if the node was first created manually with DockBuilderAddNode() but _without_ the ImGuiDockNodeFlags_Dockspace. + // Doing it correctly would set the _CentralNode flags, which would then propagate according to subsequent split. + // It would also be ambiguous to attempt to assign a central node while there are split nodes, so we wait until there's a single node remaining. + // The specific sub-property of _CentralNode we are interested in recovering here is the "Don't delete when empty" property, + // as it doesn't make sense for an empty dockspace to not have this property. + if (node->IsLeafNode() && !node->IsCentralNode()) + node->SetLocalFlags(node->LocalFlags | ImGuiDockNodeFlags_CentralNode); + + // Update the node + DockNodeUpdate(node); + + End(); + + ImRect bb(node->Pos, node->Pos + size); + ItemSize(size); + ItemAdd(bb, dockspace_id, NULL, ImGuiItemFlags_NoNav); // Not a nav point (could be, would need to draw the nav rect and replicate/refactor activation from BeginChild(), but seems like CTRL+Tab works better here?) + if ((g.LastItemData.StatusFlags & ImGuiItemStatusFlags_HoveredRect) && IsWindowChildOf(g.HoveredWindow, host_window, false, true)) // To fullfill IsItemHovered(), similar to EndChild() + g.LastItemData.StatusFlags |= ImGuiItemStatusFlags_HoveredWindow; + + return dockspace_id; +} + +// Tips: Use with ImGuiDockNodeFlags_PassthruCentralNode! +// The limitation with this call is that your window won't have a local menu bar, but you can also use BeginMainMenuBar(). +// Even though we could pass window flags, it would also require the user to be able to call BeginMenuBar() somehow meaning we can't Begin/End in a single function. +// If you really want a menu bar inside the same window as the one hosting the dockspace, you will need to copy this code somewhere and tweak it. +ImGuiID ImGui::DockSpaceOverViewport(ImGuiID dockspace_id, const ImGuiViewport* viewport, ImGuiDockNodeFlags dockspace_flags, const ImGuiWindowClass* window_class) +{ + if (viewport == NULL) + viewport = GetMainViewport(); + + // Submit a window filling the entire viewport + SetNextWindowPos(viewport->WorkPos); + SetNextWindowSize(viewport->WorkSize); + SetNextWindowViewport(viewport->ID); + + ImGuiWindowFlags host_window_flags = 0; + host_window_flags |= ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDocking; + host_window_flags |= ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoNavFocus; + if (dockspace_flags & ImGuiDockNodeFlags_PassthruCentralNode) + host_window_flags |= ImGuiWindowFlags_NoBackground; + + // FIXME-OPT: When using ImGuiDockNodeFlags_KeepAliveOnly with DockSpaceOverViewport() we might be able to spare submitting the window, + // since DockSpace() with that flag doesn't need a window. We'd only need to compute the default ID accordingly. + if (dockspace_flags & ImGuiDockNodeFlags_KeepAliveOnly) + host_window_flags |= ImGuiWindowFlags_NoMouseInputs; + + char label[32]; + ImFormatString(label, IM_ARRAYSIZE(label), "WindowOverViewport_%08X", viewport->ID); + + PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f); + PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f); + PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f)); + Begin(label, NULL, host_window_flags); + PopStyleVar(3); + + // Submit the dockspace + if (dockspace_id == 0) + dockspace_id = GetID("DockSpace"); + DockSpace(dockspace_id, ImVec2(0.0f, 0.0f), dockspace_flags, window_class); + + End(); + + return dockspace_id; +} + +//----------------------------------------------------------------------------- +// Docking: Builder Functions +//----------------------------------------------------------------------------- +// Very early end-user API to manipulate dock nodes. +// Only available in imgui_internal.h. Expect this API to change/break! +// It is expected that those functions are all called _before_ the dockspace node submission. +//----------------------------------------------------------------------------- +// - DockBuilderDockWindow() +// - DockBuilderGetNode() +// - DockBuilderSetNodePos() +// - DockBuilderSetNodeSize() +// - DockBuilderAddNode() +// - DockBuilderRemoveNode() +// - DockBuilderRemoveNodeChildNodes() +// - DockBuilderRemoveNodeDockedWindows() +// - DockBuilderSplitNode() +// - DockBuilderCopyNodeRec() +// - DockBuilderCopyNode() +// - DockBuilderCopyWindowSettings() +// - DockBuilderCopyDockSpace() +// - DockBuilderFinish() +//----------------------------------------------------------------------------- + +void ImGui::DockBuilderDockWindow(const char* window_name, ImGuiID node_id) +{ + // We don't preserve relative order of multiple docked windows (by clearing DockOrder back to -1) + ImGuiContext& g = *GImGui; IM_UNUSED(g); + IMGUI_DEBUG_LOG_DOCKING("[docking] DockBuilderDockWindow '%s' to node 0x%08X\n", window_name, node_id); + ImGuiID window_id = ImHashStr(window_name); + if (ImGuiWindow* window = FindWindowByID(window_id)) + { + // Apply to created window + ImGuiID prev_node_id = window->DockId; + SetWindowDock(window, node_id, ImGuiCond_Always); + if (window->DockId != prev_node_id) + window->DockOrder = -1; + } + else + { + // Apply to settings + ImGuiWindowSettings* settings = FindWindowSettingsByID(window_id); + if (settings == NULL) + settings = CreateNewWindowSettings(window_name); + if (settings->DockId != node_id) + settings->DockOrder = -1; + settings->DockId = node_id; + } +} + +ImGuiDockNode* ImGui::DockBuilderGetNode(ImGuiID node_id) +{ + ImGuiContext& g = *GImGui; + return DockContextFindNodeByID(&g, node_id); +} + +void ImGui::DockBuilderSetNodePos(ImGuiID node_id, ImVec2 pos) +{ + ImGuiContext& g = *GImGui; + ImGuiDockNode* node = DockContextFindNodeByID(&g, node_id); + if (node == NULL) + return; + node->Pos = pos; + node->AuthorityForPos = ImGuiDataAuthority_DockNode; +} + +void ImGui::DockBuilderSetNodeSize(ImGuiID node_id, ImVec2 size) +{ + ImGuiContext& g = *GImGui; + ImGuiDockNode* node = DockContextFindNodeByID(&g, node_id); + if (node == NULL) + return; + IM_ASSERT(size.x > 0.0f && size.y > 0.0f); + node->Size = node->SizeRef = size; + node->AuthorityForSize = ImGuiDataAuthority_DockNode; +} + +// Make sure to use the ImGuiDockNodeFlags_DockSpace flag to create a dockspace node! Otherwise this will create a floating node! +// - Floating node: you can then call DockBuilderSetNodePos()/DockBuilderSetNodeSize() to position and size the floating node. +// - Dockspace node: calling DockBuilderSetNodePos() is unnecessary. +// - If you intend to split a node immediately after creation using DockBuilderSplitNode(), make sure to call DockBuilderSetNodeSize() beforehand! +// For various reason, the splitting code currently needs a base size otherwise space may not be allocated as precisely as you would expect. +// - Use (id == 0) to let the system allocate a node identifier. +// - Existing node with a same id will be removed. +ImGuiID ImGui::DockBuilderAddNode(ImGuiID node_id, ImGuiDockNodeFlags flags) +{ + ImGuiContext& g = *GImGui; IM_UNUSED(g); + IMGUI_DEBUG_LOG_DOCKING("[docking] DockBuilderAddNode 0x%08X flags=%08X\n", node_id, flags); + + if (node_id != 0) + DockBuilderRemoveNode(node_id); + + ImGuiDockNode* node = NULL; + if (flags & ImGuiDockNodeFlags_DockSpace) + { + DockSpace(node_id, ImVec2(0, 0), (flags & ~ImGuiDockNodeFlags_DockSpace) | ImGuiDockNodeFlags_KeepAliveOnly); + node = DockContextFindNodeByID(&g, node_id); + } + else + { + node = DockContextAddNode(&g, node_id); + node->SetLocalFlags(flags); + } + node->LastFrameAlive = g.FrameCount; // Set this otherwise BeginDocked will undock during the same frame. + return node->ID; +} + +void ImGui::DockBuilderRemoveNode(ImGuiID node_id) +{ + ImGuiContext& g = *GImGui; IM_UNUSED(g); + IMGUI_DEBUG_LOG_DOCKING("[docking] DockBuilderRemoveNode 0x%08X\n", node_id); + + ImGuiDockNode* node = DockContextFindNodeByID(&g, node_id); + if (node == NULL) + return; + DockBuilderRemoveNodeDockedWindows(node_id, true); + DockBuilderRemoveNodeChildNodes(node_id); + // Node may have moved or deleted if e.g. any merge happened + node = DockContextFindNodeByID(&g, node_id); + if (node == NULL) + return; + if (node->IsCentralNode() && node->ParentNode) + node->ParentNode->SetLocalFlags(node->ParentNode->LocalFlags | ImGuiDockNodeFlags_CentralNode); + DockContextRemoveNode(&g, node, true); +} + +// root_id = 0 to remove all, root_id != 0 to remove child of given node. +void ImGui::DockBuilderRemoveNodeChildNodes(ImGuiID root_id) +{ + ImGuiContext& g = *GImGui; + ImGuiDockContext* dc = &g.DockContext; + + ImGuiDockNode* root_node = root_id ? DockContextFindNodeByID(&g, root_id) : NULL; + if (root_id && root_node == NULL) + return; + bool has_central_node = false; + + ImGuiDataAuthority backup_root_node_authority_for_pos = root_node ? root_node->AuthorityForPos : ImGuiDataAuthority_Auto; + ImGuiDataAuthority backup_root_node_authority_for_size = root_node ? root_node->AuthorityForSize : ImGuiDataAuthority_Auto; + + // Process active windows + ImVector nodes_to_remove; + for (int n = 0; n < dc->Nodes.Data.Size; n++) + if (ImGuiDockNode* node = (ImGuiDockNode*)dc->Nodes.Data[n].val_p) + { + bool want_removal = (root_id == 0) || (node->ID != root_id && DockNodeGetRootNode(node)->ID == root_id); + if (want_removal) + { + if (node->IsCentralNode()) + has_central_node = true; + if (root_id != 0) + DockContextQueueNotifyRemovedNode(&g, node); + if (root_node) + { + DockNodeMoveWindows(root_node, node); + DockSettingsRenameNodeReferences(node->ID, root_node->ID); + } + nodes_to_remove.push_back(node); + } + } + + // DockNodeMoveWindows->DockNodeAddWindow will normally set those when reaching two windows (which is only adequate during interactive merge) + // Make sure we don't lose our current pos/size. (FIXME-DOCK: Consider tidying up that code in DockNodeAddWindow instead) + if (root_node) + { + root_node->AuthorityForPos = backup_root_node_authority_for_pos; + root_node->AuthorityForSize = backup_root_node_authority_for_size; + } + + // Apply to settings + for (ImGuiWindowSettings* settings = g.SettingsWindows.begin(); settings != NULL; settings = g.SettingsWindows.next_chunk(settings)) + if (ImGuiID window_settings_dock_id = settings->DockId) + for (int n = 0; n < nodes_to_remove.Size; n++) + if (nodes_to_remove[n]->ID == window_settings_dock_id) + { + settings->DockId = root_id; + break; + } + + // Not really efficient, but easier to destroy a whole hierarchy considering DockContextRemoveNode is attempting to merge nodes + if (nodes_to_remove.Size > 1) + ImQsort(nodes_to_remove.Data, nodes_to_remove.Size, sizeof(ImGuiDockNode*), DockNodeComparerDepthMostFirst); + for (int n = 0; n < nodes_to_remove.Size; n++) + DockContextRemoveNode(&g, nodes_to_remove[n], false); + + if (root_id == 0) + { + dc->Nodes.Clear(); + dc->Requests.clear(); + } + else if (has_central_node) + { + root_node->CentralNode = root_node; + root_node->SetLocalFlags(root_node->LocalFlags | ImGuiDockNodeFlags_CentralNode); + } +} + +void ImGui::DockBuilderRemoveNodeDockedWindows(ImGuiID root_id, bool clear_settings_refs) +{ + // Clear references in settings + ImGuiContext& g = *GImGui; + if (clear_settings_refs) + { + for (ImGuiWindowSettings* settings = g.SettingsWindows.begin(); settings != NULL; settings = g.SettingsWindows.next_chunk(settings)) + { + bool want_removal = (root_id == 0) || (settings->DockId == root_id); + if (!want_removal && settings->DockId != 0) + if (ImGuiDockNode* node = DockContextFindNodeByID(&g, settings->DockId)) + if (DockNodeGetRootNode(node)->ID == root_id) + want_removal = true; + if (want_removal) + settings->DockId = 0; + } + } + + // Clear references in windows + for (int n = 0; n < g.Windows.Size; n++) + { + ImGuiWindow* window = g.Windows[n]; + bool want_removal = (root_id == 0) || (window->DockNode && DockNodeGetRootNode(window->DockNode)->ID == root_id) || (window->DockNodeAsHost && window->DockNodeAsHost->ID == root_id); + if (want_removal) + { + const ImGuiID backup_dock_id = window->DockId; + IM_UNUSED(backup_dock_id); + DockContextProcessUndockWindow(&g, window, clear_settings_refs); + if (!clear_settings_refs) + IM_ASSERT(window->DockId == backup_dock_id); + } + } +} + +// If 'out_id_at_dir' or 'out_id_at_opposite_dir' are non NULL, the function will write out the ID of the two new nodes created. +// Return value is ID of the node at the specified direction, so same as (*out_id_at_dir) if that pointer is set. +// FIXME-DOCK: We are not exposing nor using split_outer. +ImGuiID ImGui::DockBuilderSplitNode(ImGuiID id, ImGuiDir split_dir, float size_ratio_for_node_at_dir, ImGuiID* out_id_at_dir, ImGuiID* out_id_at_opposite_dir) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(split_dir != ImGuiDir_None); + IMGUI_DEBUG_LOG_DOCKING("[docking] DockBuilderSplitNode: node 0x%08X, split_dir %d\n", id, split_dir); + + ImGuiDockNode* node = DockContextFindNodeByID(&g, id); + if (node == NULL) + { + IM_ASSERT(node != NULL); + return 0; + } + + ImGuiDockRequest req; + req.Type = ImGuiDockRequestType_Split; + req.DockTargetWindow = NULL; + req.DockTargetNode = node; + req.DockPayload = NULL; + req.DockSplitDir = split_dir; + req.DockSplitRatio = ImSaturate((split_dir == ImGuiDir_Left || split_dir == ImGuiDir_Up) ? size_ratio_for_node_at_dir : 1.0f - size_ratio_for_node_at_dir); + req.DockSplitOuter = false; + DockContextProcessDock(&g, &req); + + ImGuiID id_at_dir = node->ChildNodes[(split_dir == ImGuiDir_Left || split_dir == ImGuiDir_Up) ? 0 : 1]->ID; + ImGuiID id_at_opposite_dir = node->ChildNodes[(split_dir == ImGuiDir_Left || split_dir == ImGuiDir_Up) ? 1 : 0]->ID; + if (out_id_at_dir) + *out_id_at_dir = id_at_dir; + if (out_id_at_opposite_dir) + *out_id_at_opposite_dir = id_at_opposite_dir; + return id_at_dir; +} + +static ImGuiDockNode* DockBuilderCopyNodeRec(ImGuiDockNode* src_node, ImGuiID dst_node_id_if_known, ImVector* out_node_remap_pairs) +{ + ImGuiContext& g = *GImGui; + ImGuiDockNode* dst_node = ImGui::DockContextAddNode(&g, dst_node_id_if_known); + dst_node->SharedFlags = src_node->SharedFlags; + dst_node->LocalFlags = src_node->LocalFlags; + dst_node->LocalFlagsInWindows = ImGuiDockNodeFlags_None; + dst_node->Pos = src_node->Pos; + dst_node->Size = src_node->Size; + dst_node->SizeRef = src_node->SizeRef; + dst_node->SplitAxis = src_node->SplitAxis; + dst_node->UpdateMergedFlags(); + + out_node_remap_pairs->push_back(src_node->ID); + out_node_remap_pairs->push_back(dst_node->ID); + + for (int child_n = 0; child_n < IM_ARRAYSIZE(src_node->ChildNodes); child_n++) + if (src_node->ChildNodes[child_n]) + { + dst_node->ChildNodes[child_n] = DockBuilderCopyNodeRec(src_node->ChildNodes[child_n], 0, out_node_remap_pairs); + dst_node->ChildNodes[child_n]->ParentNode = dst_node; + } + + IMGUI_DEBUG_LOG_DOCKING("[docking] Fork node %08X -> %08X (%d childs)\n", src_node->ID, dst_node->ID, dst_node->IsSplitNode() ? 2 : 0); + return dst_node; +} + +void ImGui::DockBuilderCopyNode(ImGuiID src_node_id, ImGuiID dst_node_id, ImVector* out_node_remap_pairs) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(src_node_id != 0); + IM_ASSERT(dst_node_id != 0); + IM_ASSERT(out_node_remap_pairs != NULL); + + DockBuilderRemoveNode(dst_node_id); + + ImGuiDockNode* src_node = DockContextFindNodeByID(&g, src_node_id); + IM_ASSERT(src_node != NULL); + + out_node_remap_pairs->clear(); + DockBuilderCopyNodeRec(src_node, dst_node_id, out_node_remap_pairs); + + IM_ASSERT((out_node_remap_pairs->Size % 2) == 0); +} + +void ImGui::DockBuilderCopyWindowSettings(const char* src_name, const char* dst_name) +{ + ImGuiWindow* src_window = FindWindowByName(src_name); + if (src_window == NULL) + return; + if (ImGuiWindow* dst_window = FindWindowByName(dst_name)) + { + dst_window->Pos = src_window->Pos; + dst_window->Size = src_window->Size; + dst_window->SizeFull = src_window->SizeFull; + dst_window->Collapsed = src_window->Collapsed; + } + else + { + ImGuiWindowSettings* dst_settings = FindWindowSettingsByID(ImHashStr(dst_name)); + if (!dst_settings) + dst_settings = CreateNewWindowSettings(dst_name); + ImVec2ih window_pos_2ih = ImVec2ih(src_window->Pos); + if (src_window->ViewportId != 0 && src_window->ViewportId != IMGUI_VIEWPORT_DEFAULT_ID) + { + dst_settings->ViewportPos = window_pos_2ih; + dst_settings->ViewportId = src_window->ViewportId; + dst_settings->Pos = ImVec2ih(0, 0); + } + else + { + dst_settings->Pos = window_pos_2ih; + } + dst_settings->Size = ImVec2ih(src_window->SizeFull); + dst_settings->Collapsed = src_window->Collapsed; + } +} + +// FIXME: Will probably want to change this signature, in particular how the window remapping pairs are passed. +void ImGui::DockBuilderCopyDockSpace(ImGuiID src_dockspace_id, ImGuiID dst_dockspace_id, ImVector* in_window_remap_pairs) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(src_dockspace_id != 0); + IM_ASSERT(dst_dockspace_id != 0); + IM_ASSERT(in_window_remap_pairs != NULL); + IM_ASSERT((in_window_remap_pairs->Size % 2) == 0); + + // Duplicate entire dock + // FIXME: When overwriting dst_dockspace_id, windows that aren't part of our dockspace window class but that are docked in a same node will be split apart, + // whereas we could attempt to at least keep them together in a new, same floating node. + ImVector node_remap_pairs; + DockBuilderCopyNode(src_dockspace_id, dst_dockspace_id, &node_remap_pairs); + + // Attempt to transition all the upcoming windows associated to dst_dockspace_id into the newly created hierarchy of dock nodes + // (The windows associated to src_dockspace_id are staying in place) + ImVector src_windows; + for (int remap_window_n = 0; remap_window_n < in_window_remap_pairs->Size; remap_window_n += 2) + { + const char* src_window_name = (*in_window_remap_pairs)[remap_window_n]; + const char* dst_window_name = (*in_window_remap_pairs)[remap_window_n + 1]; + ImGuiID src_window_id = ImHashStr(src_window_name); + src_windows.push_back(src_window_id); + + // Search in the remapping tables + ImGuiID src_dock_id = 0; + if (ImGuiWindow* src_window = FindWindowByID(src_window_id)) + src_dock_id = src_window->DockId; + else if (ImGuiWindowSettings* src_window_settings = FindWindowSettingsByID(src_window_id)) + src_dock_id = src_window_settings->DockId; + ImGuiID dst_dock_id = 0; + for (int dock_remap_n = 0; dock_remap_n < node_remap_pairs.Size; dock_remap_n += 2) + if (node_remap_pairs[dock_remap_n] == src_dock_id) + { + dst_dock_id = node_remap_pairs[dock_remap_n + 1]; + //node_remap_pairs[dock_remap_n] = node_remap_pairs[dock_remap_n + 1] = 0; // Clear + break; + } + + if (dst_dock_id != 0) + { + // Docked windows gets redocked into the new node hierarchy. + IMGUI_DEBUG_LOG_DOCKING("[docking] Remap live window '%s' 0x%08X -> '%s' 0x%08X\n", src_window_name, src_dock_id, dst_window_name, dst_dock_id); + DockBuilderDockWindow(dst_window_name, dst_dock_id); + } + else + { + // Floating windows gets their settings transferred (regardless of whether the new window already exist or not) + // When this is leading to a Copy and not a Move, we would get two overlapping floating windows. Could we possibly dock them together? + IMGUI_DEBUG_LOG_DOCKING("[docking] Remap window settings '%s' -> '%s'\n", src_window_name, dst_window_name); + DockBuilderCopyWindowSettings(src_window_name, dst_window_name); + } + } + + // Anything else in the source nodes of 'node_remap_pairs' are windows that are not included in the remapping list. + // Find those windows and move to them to the cloned dock node. This may be optional? + // Dock those are a second step as undocking would invalidate source dock nodes. + struct DockRemainingWindowTask { ImGuiWindow* Window; ImGuiID DockId; DockRemainingWindowTask(ImGuiWindow* window, ImGuiID dock_id) { Window = window; DockId = dock_id; } }; + ImVector dock_remaining_windows; + for (int dock_remap_n = 0; dock_remap_n < node_remap_pairs.Size; dock_remap_n += 2) + if (ImGuiID src_dock_id = node_remap_pairs[dock_remap_n]) + { + ImGuiID dst_dock_id = node_remap_pairs[dock_remap_n + 1]; + ImGuiDockNode* node = DockBuilderGetNode(src_dock_id); + for (int window_n = 0; window_n < node->Windows.Size; window_n++) + { + ImGuiWindow* window = node->Windows[window_n]; + if (src_windows.contains(window->ID)) + continue; + + // Docked windows gets redocked into the new node hierarchy. + IMGUI_DEBUG_LOG_DOCKING("[docking] Remap window '%s' %08X -> %08X\n", window->Name, src_dock_id, dst_dock_id); + dock_remaining_windows.push_back(DockRemainingWindowTask(window, dst_dock_id)); + } + } + for (const DockRemainingWindowTask& task : dock_remaining_windows) + DockBuilderDockWindow(task.Window->Name, task.DockId); +} + +// FIXME-DOCK: This is awkward because in series of split user is likely to loose access to its root node. +void ImGui::DockBuilderFinish(ImGuiID root_id) +{ + ImGuiContext& g = *GImGui; + //DockContextRebuild(&g); + DockContextBuildAddWindowsToNodes(&g, root_id); +} + +//----------------------------------------------------------------------------- +// Docking: Begin/End Support Functions (called from Begin/End) +//----------------------------------------------------------------------------- +// - GetWindowAlwaysWantOwnTabBar() +// - DockContextBindNodeToWindow() +// - BeginDocked() +// - BeginDockableDragDropSource() +// - BeginDockableDragDropTarget() +//----------------------------------------------------------------------------- + +bool ImGui::GetWindowAlwaysWantOwnTabBar(ImGuiWindow* window) +{ + ImGuiContext& g = *GImGui; + if (g.IO.ConfigDockingAlwaysTabBar || window->WindowClass.DockingAlwaysTabBar) + if ((window->Flags & (ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoDocking)) == 0) + if (!window->IsFallbackWindow) // We don't support AlwaysTabBar on the fallback/implicit window to avoid unused dock-node overhead/noise + return true; + return false; +} + +static ImGuiDockNode* ImGui::DockContextBindNodeToWindow(ImGuiContext* ctx, ImGuiWindow* window) +{ + ImGuiContext& g = *ctx; + ImGuiDockNode* node = DockContextFindNodeByID(ctx, window->DockId); + IM_ASSERT(window->DockNode == NULL); + + // We should not be docking into a split node (SetWindowDock should avoid this) + if (node && node->IsSplitNode()) + { + DockContextProcessUndockWindow(ctx, window); + return NULL; + } + + // Create node + if (node == NULL) + { + node = DockContextAddNode(ctx, window->DockId); + node->AuthorityForPos = node->AuthorityForSize = node->AuthorityForViewport = ImGuiDataAuthority_Window; + node->LastFrameAlive = g.FrameCount; + } + + // If the node just turned visible and is part of a hierarchy, it doesn't have a Size assigned by DockNodeTreeUpdatePosSize() yet, + // so we're forcing a Pos/Size update from the first ancestor that is already visible (often it will be the root node). + // If we don't do this, the window will be assigned a zero-size on its first frame, which won't ideally warm up the layout. + // This is a little wonky because we don't normally update the Pos/Size of visible node mid-frame. + if (!node->IsVisible) + { + ImGuiDockNode* ancestor_node = node; + while (!ancestor_node->IsVisible && ancestor_node->ParentNode) + ancestor_node = ancestor_node->ParentNode; + IM_ASSERT(ancestor_node->Size.x > 0.0f && ancestor_node->Size.y > 0.0f); + DockNodeUpdateHasCentralNodeChild(DockNodeGetRootNode(ancestor_node)); + DockNodeTreeUpdatePosSize(ancestor_node, ancestor_node->Pos, ancestor_node->Size, node); + } + + // Add window to node + bool node_was_visible = node->IsVisible; + DockNodeAddWindow(node, window, true); + node->IsVisible = node_was_visible; // Don't mark visible right away (so DockContextEndFrame() doesn't render it, maybe other side effects? will see) + IM_ASSERT(node == window->DockNode); + return node; +} + +static void StoreDockStyleForWindow(ImGuiWindow* window) +{ + ImGuiContext& g = *GImGui; + for (int color_n = 0; color_n < ImGuiWindowDockStyleCol_COUNT; color_n++) + window->DockStyle.Colors[color_n] = ImGui::ColorConvertFloat4ToU32(g.Style.Colors[GWindowDockStyleColors[color_n]]); +} + +void ImGui::BeginDocked(ImGuiWindow* window, bool* p_open) +{ + ImGuiContext& g = *GImGui; + + // Clear fields ahead so most early-out paths don't have to do it + window->DockIsActive = window->DockNodeIsVisible = window->DockTabIsVisible = false; + + const bool auto_dock_node = GetWindowAlwaysWantOwnTabBar(window); + if (auto_dock_node) + { + if (window->DockId == 0) + { + IM_ASSERT(window->DockNode == NULL); + window->DockId = DockContextGenNodeID(&g); + } + } + else + { + // Calling SetNextWindowPos() undock windows by default (by setting PosUndock) + bool want_undock = false; + want_undock |= (window->Flags & ImGuiWindowFlags_NoDocking) != 0; + want_undock |= (g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasPos) && (window->SetWindowPosAllowFlags & g.NextWindowData.PosCond) && g.NextWindowData.PosUndock; + if (want_undock) + { + DockContextProcessUndockWindow(&g, window); + return; + } + } + + // Bind to our dock node + ImGuiDockNode* node = window->DockNode; + if (node != NULL) + IM_ASSERT(window->DockId == node->ID); + if (window->DockId != 0 && node == NULL) + { + node = DockContextBindNodeToWindow(&g, window); + if (node == NULL) + return; + } + +#if 0 + // Undock if the ImGuiDockNodeFlags_NoDockingInCentralNode got set + if (node->IsCentralNode && (node->Flags & ImGuiDockNodeFlags_NoDockingInCentralNode)) + { + DockContextProcessUndockWindow(ctx, window); + return; + } +#endif + + // Undock if our dockspace node disappeared + // Note how we are testing for LastFrameAlive and NOT LastFrameActive. A DockSpace node can be maintained alive while being inactive with ImGuiDockNodeFlags_KeepAliveOnly. + if (node->LastFrameAlive < g.FrameCount) + { + // If the window has been orphaned, transition the docknode to an implicit node processed in DockContextNewFrameUpdateDocking() + ImGuiDockNode* root_node = DockNodeGetRootNode(node); + if (root_node->LastFrameAlive < g.FrameCount) + DockContextProcessUndockWindow(&g, window); + else + window->DockIsActive = true; + return; + } + + // Store style overrides + StoreDockStyleForWindow(window); + + // Fast path return. It is common for windows to hold on a persistent DockId but be the only visible window, + // and never create neither a host window neither a tab bar. + // FIXME-DOCK: replace ->HostWindow NULL compare with something more explicit (~was initially intended as a first frame test) + if (node->HostWindow == NULL) + { + if (node->State == ImGuiDockNodeState_HostWindowHiddenBecauseWindowsAreResizing) + window->DockIsActive = true; + if (node->Windows.Size > 1 && window->Appearing) // Only hide appearing window + DockNodeHideWindowDuringHostWindowCreation(window); + return; + } + + // We can have zero-sized nodes (e.g. children of a small-size dockspace) + IM_ASSERT(node->HostWindow); + IM_ASSERT(node->IsLeafNode()); + IM_ASSERT(node->Size.x >= 0.0f && node->Size.y >= 0.0f); + node->State = ImGuiDockNodeState_HostWindowVisible; + + // Undock if we are submitted earlier than the host window + if (!(node->MergedFlags & ImGuiDockNodeFlags_KeepAliveOnly) && window->BeginOrderWithinContext < node->HostWindow->BeginOrderWithinContext) + { + DockContextProcessUndockWindow(&g, window); + return; + } + + // Position/Size window + SetNextWindowPos(node->Pos); + SetNextWindowSize(node->Size); + g.NextWindowData.PosUndock = false; // Cancel implicit undocking of SetNextWindowPos() + window->DockIsActive = true; + window->DockNodeIsVisible = true; + window->DockTabIsVisible = false; + if (node->MergedFlags & ImGuiDockNodeFlags_KeepAliveOnly) + return; + + // When the window is selected we mark it as visible. + if (node->VisibleWindow == window) + window->DockTabIsVisible = true; + + // Update window flag + IM_ASSERT((window->Flags & ImGuiWindowFlags_ChildWindow) == 0); + window->Flags |= ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_NoResize; + window->ChildFlags |= ImGuiChildFlags_AlwaysUseWindowPadding; + if (node->IsHiddenTabBar() || node->IsNoTabBar()) + window->Flags |= ImGuiWindowFlags_NoTitleBar; + else + window->Flags &= ~ImGuiWindowFlags_NoTitleBar; // Clear the NoTitleBar flag in case the user set it: confusingly enough we need a title bar height so we are correctly offset, but it won't be displayed! + + // Save new dock order only if the window has been visible once already + // This allows multiple windows to be created in the same frame and have their respective dock orders preserved. + if (node->TabBar && window->WasActive) + window->DockOrder = (short)DockNodeGetTabOrder(window); + + if ((node->WantCloseAll || node->WantCloseTabId == window->TabId) && p_open != NULL) + *p_open = false; + + // Update ChildId to allow returning from Child to Parent with Escape + ImGuiWindow* parent_window = window->DockNode->HostWindow; + window->ChildId = parent_window->GetID(window->Name); +} + +void ImGui::BeginDockableDragDropSource(ImGuiWindow* window) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(g.ActiveId == window->MoveId); + IM_ASSERT(g.MovingWindow == window); + IM_ASSERT(g.CurrentWindow == window); + + // 0: Hold SHIFT to disable docking, 1: Hold SHIFT to enable docking. + if (g.IO.ConfigDockingWithShift != g.IO.KeyShift) + { + // When ConfigDockingWithShift is set, display a tooltip to increase UI affordance. + // We cannot set for HoveredWindowUnderMovingWindow != NULL here, as it is only valid/useful when drag and drop is already active + // (because of the 'is_mouse_dragging_with_an_expected_destination' logic in UpdateViewportsNewFrame() function) + IM_ASSERT(g.NextWindowData.HasFlags == 0); + if (g.IO.ConfigDockingWithShift && g.MouseStationaryTimer >= 1.0f && g.ActiveId >= 1.0f) + SetTooltip("%s", LocalizeGetMsg(ImGuiLocKey_DockingHoldShiftToDock)); + return; + } + + g.LastItemData.ID = window->MoveId; + window = window->RootWindowDockTree; + IM_ASSERT((window->Flags & ImGuiWindowFlags_NoDocking) == 0); + bool is_drag_docking = (g.IO.ConfigDockingWithShift) || ImRect(0, 0, window->SizeFull.x, GetFrameHeight()).Contains(g.ActiveIdClickOffset); // FIXME-DOCKING: Need to make this stateful and explicit + ImGuiDragDropFlags drag_drop_flags = ImGuiDragDropFlags_SourceNoPreviewTooltip | ImGuiDragDropFlags_SourceNoHoldToOpenOthers | ImGuiDragDropFlags_PayloadAutoExpire | ImGuiDragDropFlags_PayloadNoCrossContext | ImGuiDragDropFlags_PayloadNoCrossProcess; + if (is_drag_docking && BeginDragDropSource(drag_drop_flags)) + { + SetDragDropPayload(IMGUI_PAYLOAD_TYPE_WINDOW, &window, sizeof(window)); + EndDragDropSource(); + StoreDockStyleForWindow(window); // Store style overrides while dragging (even when not docked) because docking preview may need it. + } +} + +void ImGui::BeginDockableDragDropTarget(ImGuiWindow* window) +{ + ImGuiContext& g = *GImGui; + + //IM_ASSERT(window->RootWindowDockTree == window); // May also be a DockSpace + IM_ASSERT((window->Flags & ImGuiWindowFlags_NoDocking) == 0); + if (!g.DragDropActive) + return; + //GetForegroundDrawList(window)->AddRect(window->Pos, window->Pos + window->Size, IM_COL32(255, 255, 0, 255)); + if (!BeginDragDropTargetCustom(window->Rect(), window->ID)) + return; + + // Peek into the payload before calling AcceptDragDropPayload() so we can handle overlapping dock nodes with filtering + // (this is a little unusual pattern, normally most code would call AcceptDragDropPayload directly) + const ImGuiPayload* payload = &g.DragDropPayload; + if (!payload->IsDataType(IMGUI_PAYLOAD_TYPE_WINDOW) || !DockNodeIsDropAllowed(window, *(ImGuiWindow**)payload->Data)) + { + EndDragDropTarget(); + return; + } + + ImGuiWindow* payload_window = *(ImGuiWindow**)payload->Data; + if (AcceptDragDropPayload(IMGUI_PAYLOAD_TYPE_WINDOW, ImGuiDragDropFlags_AcceptBeforeDelivery | ImGuiDragDropFlags_AcceptNoDrawDefaultRect)) + { + // Select target node + // (Important: we cannot use g.HoveredDockNode here! Because each of our target node have filters based on payload, each candidate drop target will do its own evaluation) + bool dock_into_floating_window = false; + ImGuiDockNode* node = NULL; + if (window->DockNodeAsHost) + { + // Cannot assume that node will != NULL even though we passed the rectangle test: it depends on padding/spacing handled by DockNodeTreeFindVisibleNodeByPos(). + node = DockNodeTreeFindVisibleNodeByPos(window->DockNodeAsHost, g.IO.MousePos); + + // There is an edge case when docking into a dockspace which only has _inactive_ nodes (because none of the windows are active) + // In this case we need to fallback into any leaf mode, possibly the central node. + // FIXME-20181220: We should not have to test for IsLeafNode() here but we have another bug to fix first. + if (node && node->IsDockSpace() && node->IsRootNode()) + node = (node->CentralNode && node->IsLeafNode()) ? node->CentralNode : DockNodeTreeFindFallbackLeafNode(node); + } + else + { + if (window->DockNode) + node = window->DockNode; + else + dock_into_floating_window = true; // Dock into a regular window + } + + const ImRect explicit_target_rect = (node && node->TabBar && !node->IsHiddenTabBar() && !node->IsNoTabBar()) ? node->TabBar->BarRect : ImRect(window->Pos, window->Pos + ImVec2(window->Size.x, GetFrameHeight())); + const bool is_explicit_target = g.IO.ConfigDockingWithShift || IsMouseHoveringRect(explicit_target_rect.Min, explicit_target_rect.Max); + + // Preview docking request and find out split direction/ratio + //const bool do_preview = true; // Ignore testing for payload->IsPreview() which removes one frame of delay, but breaks overlapping drop targets within the same window. + const bool do_preview = payload->IsPreview() || payload->IsDelivery(); + if (do_preview && (node != NULL || dock_into_floating_window)) + { + // If we have a non-leaf node it means we are hovering the border of a parent node, in which case only outer markers will appear. + ImGuiDockPreviewData split_inner; + ImGuiDockPreviewData split_outer; + ImGuiDockPreviewData* split_data = &split_inner; + if (node && (node->ParentNode || node->IsCentralNode() || !node->IsLeafNode())) + if (ImGuiDockNode* root_node = DockNodeGetRootNode(node)) + { + DockNodePreviewDockSetup(window, root_node, payload_window, NULL, &split_outer, is_explicit_target, true); + if (split_outer.IsSplitDirExplicit) + split_data = &split_outer; + } + if (!node || node->IsLeafNode()) + DockNodePreviewDockSetup(window, node, payload_window, NULL, &split_inner, is_explicit_target, false); + if (split_data == &split_outer) + split_inner.IsDropAllowed = false; + + // Draw inner then outer, so that previewed tab (in inner data) will be behind the outer drop boxes + DockNodePreviewDockRender(window, node, payload_window, &split_inner); + DockNodePreviewDockRender(window, node, payload_window, &split_outer); + + // Queue docking request + if (split_data->IsDropAllowed && payload->IsDelivery()) + DockContextQueueDock(&g, window, split_data->SplitNode, payload_window, split_data->SplitDir, split_data->SplitRatio, split_data == &split_outer); + } + } + EndDragDropTarget(); +} + +//----------------------------------------------------------------------------- +// Docking: Settings +//----------------------------------------------------------------------------- +// - DockSettingsRenameNodeReferences() +// - DockSettingsRemoveNodeReferences() +// - DockSettingsFindNodeSettings() +// - DockSettingsHandler_ApplyAll() +// - DockSettingsHandler_ReadOpen() +// - DockSettingsHandler_ReadLine() +// - DockSettingsHandler_DockNodeToSettings() +// - DockSettingsHandler_WriteAll() +//----------------------------------------------------------------------------- + +static void ImGui::DockSettingsRenameNodeReferences(ImGuiID old_node_id, ImGuiID new_node_id) +{ + ImGuiContext& g = *GImGui; + IMGUI_DEBUG_LOG_DOCKING("[docking] DockSettingsRenameNodeReferences: from 0x%08X -> to 0x%08X\n", old_node_id, new_node_id); + for (int window_n = 0; window_n < g.Windows.Size; window_n++) + { + ImGuiWindow* window = g.Windows[window_n]; + if (window->DockId == old_node_id && window->DockNode == NULL) + window->DockId = new_node_id; + } + //// FIXME-OPT: We could remove this loop by storing the index in the map + for (ImGuiWindowSettings* settings = g.SettingsWindows.begin(); settings != NULL; settings = g.SettingsWindows.next_chunk(settings)) + if (settings->DockId == old_node_id) + settings->DockId = new_node_id; +} + +// Remove references stored in ImGuiWindowSettings to the given ImGuiDockNodeSettings +static void ImGui::DockSettingsRemoveNodeReferences(ImGuiID* node_ids, int node_ids_count) +{ + ImGuiContext& g = *GImGui; + int found = 0; + //// FIXME-OPT: We could remove this loop by storing the index in the map + for (ImGuiWindowSettings* settings = g.SettingsWindows.begin(); settings != NULL; settings = g.SettingsWindows.next_chunk(settings)) + for (int node_n = 0; node_n < node_ids_count; node_n++) + if (settings->DockId == node_ids[node_n]) + { + settings->DockId = 0; + settings->DockOrder = -1; + if (++found < node_ids_count) + break; + return; + } +} + +static ImGuiDockNodeSettings* ImGui::DockSettingsFindNodeSettings(ImGuiContext* ctx, ImGuiID id) +{ + // FIXME-OPT + ImGuiDockContext* dc = &ctx->DockContext; + for (int n = 0; n < dc->NodesSettings.Size; n++) + if (dc->NodesSettings[n].ID == id) + return &dc->NodesSettings[n]; + return NULL; +} + +// Clear settings data +static void ImGui::DockSettingsHandler_ClearAll(ImGuiContext* ctx, ImGuiSettingsHandler*) +{ + ImGuiDockContext* dc = &ctx->DockContext; + dc->NodesSettings.clear(); + DockContextClearNodes(ctx, 0, true); +} + +// Recreate nodes based on settings data +static void ImGui::DockSettingsHandler_ApplyAll(ImGuiContext* ctx, ImGuiSettingsHandler*) +{ + // Prune settings at boot time only + ImGuiDockContext* dc = &ctx->DockContext; + if (ctx->Windows.Size == 0) + DockContextPruneUnusedSettingsNodes(ctx); + DockContextBuildNodesFromSettings(ctx, dc->NodesSettings.Data, dc->NodesSettings.Size); + DockContextBuildAddWindowsToNodes(ctx, 0); +} + +static void* ImGui::DockSettingsHandler_ReadOpen(ImGuiContext*, ImGuiSettingsHandler*, const char* name) +{ + if (strcmp(name, "Data") != 0) + return NULL; + return (void*)1; +} + +static void ImGui::DockSettingsHandler_ReadLine(ImGuiContext* ctx, ImGuiSettingsHandler*, void*, const char* line) +{ + char c = 0; + int x = 0, y = 0; + int r = 0; + + // Parsing, e.g. + // " DockNode ID=0x00000001 Pos=383,193 Size=201,322 Split=Y,0.506 " + // " DockNode ID=0x00000002 Parent=0x00000001 " + // Important: this code expect currently fields in a fixed order. + ImGuiDockNodeSettings node; + line = ImStrSkipBlank(line); + if (strncmp(line, "DockNode", 8) == 0) { line = ImStrSkipBlank(line + strlen("DockNode")); } + else if (strncmp(line, "DockSpace", 9) == 0) { line = ImStrSkipBlank(line + strlen("DockSpace")); node.Flags |= ImGuiDockNodeFlags_DockSpace; } + else return; + if (sscanf(line, "ID=0x%08X%n", &node.ID, &r) == 1) { line += r; } else return; + if (sscanf(line, " Parent=0x%08X%n", &node.ParentNodeId, &r) == 1) { line += r; if (node.ParentNodeId == 0) return; } + if (sscanf(line, " Window=0x%08X%n", &node.ParentWindowId, &r) ==1) { line += r; if (node.ParentWindowId == 0) return; } + if (node.ParentNodeId == 0) + { + if (sscanf(line, " Pos=%i,%i%n", &x, &y, &r) == 2) { line += r; node.Pos = ImVec2ih((short)x, (short)y); } else return; + if (sscanf(line, " Size=%i,%i%n", &x, &y, &r) == 2) { line += r; node.Size = ImVec2ih((short)x, (short)y); } else return; + } + else + { + if (sscanf(line, " SizeRef=%i,%i%n", &x, &y, &r) == 2) { line += r; node.SizeRef = ImVec2ih((short)x, (short)y); } + } + if (sscanf(line, " Split=%c%n", &c, &r) == 1) { line += r; if (c == 'X') node.SplitAxis = ImGuiAxis_X; else if (c == 'Y') node.SplitAxis = ImGuiAxis_Y; } + if (sscanf(line, " NoResize=%d%n", &x, &r) == 1) { line += r; if (x != 0) node.Flags |= ImGuiDockNodeFlags_NoResize; } + if (sscanf(line, " CentralNode=%d%n", &x, &r) == 1) { line += r; if (x != 0) node.Flags |= ImGuiDockNodeFlags_CentralNode; } + if (sscanf(line, " NoTabBar=%d%n", &x, &r) == 1) { line += r; if (x != 0) node.Flags |= ImGuiDockNodeFlags_NoTabBar; } + if (sscanf(line, " HiddenTabBar=%d%n", &x, &r) == 1) { line += r; if (x != 0) node.Flags |= ImGuiDockNodeFlags_HiddenTabBar; } + if (sscanf(line, " NoWindowMenuButton=%d%n", &x, &r) == 1) { line += r; if (x != 0) node.Flags |= ImGuiDockNodeFlags_NoWindowMenuButton; } + if (sscanf(line, " NoCloseButton=%d%n", &x, &r) == 1) { line += r; if (x != 0) node.Flags |= ImGuiDockNodeFlags_NoCloseButton; } + if (sscanf(line, " Selected=0x%08X%n", &node.SelectedTabId,&r) == 1) { line += r; } + if (node.ParentNodeId != 0) + if (ImGuiDockNodeSettings* parent_settings = DockSettingsFindNodeSettings(ctx, node.ParentNodeId)) + node.Depth = parent_settings->Depth + 1; + ctx->DockContext.NodesSettings.push_back(node); +} + +static void DockSettingsHandler_DockNodeToSettings(ImGuiDockContext* dc, ImGuiDockNode* node, int depth) +{ + ImGuiDockNodeSettings node_settings; + IM_ASSERT(depth < (1 << (sizeof(node_settings.Depth) << 3))); + node_settings.ID = node->ID; + node_settings.ParentNodeId = node->ParentNode ? node->ParentNode->ID : 0; + node_settings.ParentWindowId = (node->IsDockSpace() && node->HostWindow && node->HostWindow->ParentWindow) ? node->HostWindow->ParentWindow->ID : 0; + node_settings.SelectedTabId = node->SelectedTabId; + node_settings.SplitAxis = (signed char)(node->IsSplitNode() ? node->SplitAxis : ImGuiAxis_None); + node_settings.Depth = (char)depth; + node_settings.Flags = (node->LocalFlags & ImGuiDockNodeFlags_SavedFlagsMask_); + node_settings.Pos = ImVec2ih(node->Pos); + node_settings.Size = ImVec2ih(node->Size); + node_settings.SizeRef = ImVec2ih(node->SizeRef); + dc->NodesSettings.push_back(node_settings); + if (node->ChildNodes[0]) + DockSettingsHandler_DockNodeToSettings(dc, node->ChildNodes[0], depth + 1); + if (node->ChildNodes[1]) + DockSettingsHandler_DockNodeToSettings(dc, node->ChildNodes[1], depth + 1); +} + +static void ImGui::DockSettingsHandler_WriteAll(ImGuiContext* ctx, ImGuiSettingsHandler* handler, ImGuiTextBuffer* buf) +{ + ImGuiContext& g = *ctx; + ImGuiDockContext* dc = &ctx->DockContext; + if (!(g.IO.ConfigFlags & ImGuiConfigFlags_DockingEnable)) + return; + + // Gather settings data + // (unlike our windows settings, because nodes are always built we can do a full rewrite of the SettingsNode buffer) + dc->NodesSettings.resize(0); + dc->NodesSettings.reserve(dc->Nodes.Data.Size); + for (int n = 0; n < dc->Nodes.Data.Size; n++) + if (ImGuiDockNode* node = (ImGuiDockNode*)dc->Nodes.Data[n].val_p) + if (node->IsRootNode()) + DockSettingsHandler_DockNodeToSettings(dc, node, 0); + + int max_depth = 0; + for (int node_n = 0; node_n < dc->NodesSettings.Size; node_n++) + max_depth = ImMax((int)dc->NodesSettings[node_n].Depth, max_depth); + + // Write to text buffer + buf->appendf("[%s][Data]\n", handler->TypeName); + for (int node_n = 0; node_n < dc->NodesSettings.Size; node_n++) + { + const int line_start_pos = buf->size(); (void)line_start_pos; + const ImGuiDockNodeSettings* node_settings = &dc->NodesSettings[node_n]; + buf->appendf("%*s%s%*s", node_settings->Depth * 2, "", (node_settings->Flags & ImGuiDockNodeFlags_DockSpace) ? "DockSpace" : "DockNode ", (max_depth - node_settings->Depth) * 2, ""); // Text align nodes to facilitate looking at .ini file + buf->appendf(" ID=0x%08X", node_settings->ID); + if (node_settings->ParentNodeId) + { + buf->appendf(" Parent=0x%08X SizeRef=%d,%d", node_settings->ParentNodeId, node_settings->SizeRef.x, node_settings->SizeRef.y); + } + else + { + if (node_settings->ParentWindowId) + buf->appendf(" Window=0x%08X", node_settings->ParentWindowId); + buf->appendf(" Pos=%d,%d Size=%d,%d", node_settings->Pos.x, node_settings->Pos.y, node_settings->Size.x, node_settings->Size.y); + } + if (node_settings->SplitAxis != ImGuiAxis_None) + buf->appendf(" Split=%c", (node_settings->SplitAxis == ImGuiAxis_X) ? 'X' : 'Y'); + if (node_settings->Flags & ImGuiDockNodeFlags_NoResize) + buf->appendf(" NoResize=1"); + if (node_settings->Flags & ImGuiDockNodeFlags_CentralNode) + buf->appendf(" CentralNode=1"); + if (node_settings->Flags & ImGuiDockNodeFlags_NoTabBar) + buf->appendf(" NoTabBar=1"); + if (node_settings->Flags & ImGuiDockNodeFlags_HiddenTabBar) + buf->appendf(" HiddenTabBar=1"); + if (node_settings->Flags & ImGuiDockNodeFlags_NoWindowMenuButton) + buf->appendf(" NoWindowMenuButton=1"); + if (node_settings->Flags & ImGuiDockNodeFlags_NoCloseButton) + buf->appendf(" NoCloseButton=1"); + if (node_settings->SelectedTabId) + buf->appendf(" Selected=0x%08X", node_settings->SelectedTabId); + + // [DEBUG] Include comments in the .ini file to ease debugging (this makes saving slower!) + if (g.IO.ConfigDebugIniSettings) + if (ImGuiDockNode* node = DockContextFindNodeByID(ctx, node_settings->ID)) + { + buf->appendf("%*s", ImMax(2, (line_start_pos + 92) - buf->size()), ""); // Align everything + if (node->IsDockSpace() && node->HostWindow && node->HostWindow->ParentWindow) + buf->appendf(" ; in '%s'", node->HostWindow->ParentWindow->Name); + // Iterate settings so we can give info about windows that didn't exist during the session. + int contains_window = 0; + for (ImGuiWindowSettings* settings = g.SettingsWindows.begin(); settings != NULL; settings = g.SettingsWindows.next_chunk(settings)) + if (settings->DockId == node_settings->ID) + { + if (contains_window++ == 0) + buf->appendf(" ; contains "); + buf->appendf("'%s' ", settings->GetName()); + } + } + + buf->appendf("\n"); + } + buf->appendf("\n"); +} //----------------------------------------------------------------------------- // [SECTION] PLATFORM DEPENDENT HELPERS //----------------------------------------------------------------------------- - -#if defined(_WIN32) && !defined(_WINDOWS_) && !defined(IMGUI_DISABLE_WIN32_FUNCTIONS) && (!defined(IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS) || !defined(IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS)) -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#ifndef __MINGW32__ -#include -#else -#include -#endif -#elif defined(__APPLE__) -#include -#endif +// - Default clipboard handlers +// - Default shell function handlers +// - Default IME handlers +//----------------------------------------------------------------------------- #if defined(_WIN32) && !defined(IMGUI_DISABLE_WIN32_FUNCTIONS) && !defined(IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS) #ifdef _MSC_VER #pragma comment(lib, "user32") +#pragma comment(lib, "kernel32") #endif // Win32 clipboard implementation -static const char* GetClipboardTextFn_DefaultImpl(void*) +// We use g.ClipboardHandlerData for temporary storage to ensure it is freed on Shutdown() +static const char* Platform_GetClipboardTextFn_DefaultImpl(ImGuiContext* ctx) { - static ImVector buf_local; - buf_local.clear(); + ImGuiContext& g = *ctx; + g.ClipboardHandlerData.clear(); if (!::OpenClipboard(NULL)) return NULL; HANDLE wbuf_handle = ::GetClipboardData(CF_UNICODETEXT); @@ -9636,30 +20681,30 @@ static const char* GetClipboardTextFn_DefaultImpl(void*) ::CloseClipboard(); return NULL; } - if (ImWchar* wbuf_global = (ImWchar*)::GlobalLock(wbuf_handle)) + if (const WCHAR* wbuf_global = (const WCHAR*)::GlobalLock(wbuf_handle)) { - int buf_len = ImTextCountUtf8BytesFromStr(wbuf_global, NULL) + 1; - buf_local.resize(buf_len); - ImTextStrToUtf8(buf_local.Data, buf_len, wbuf_global, NULL); + int buf_len = ::WideCharToMultiByte(CP_UTF8, 0, wbuf_global, -1, NULL, 0, NULL, NULL); + g.ClipboardHandlerData.resize(buf_len); + ::WideCharToMultiByte(CP_UTF8, 0, wbuf_global, -1, g.ClipboardHandlerData.Data, buf_len, NULL, NULL); } ::GlobalUnlock(wbuf_handle); ::CloseClipboard(); - return buf_local.Data; + return g.ClipboardHandlerData.Data; } -static void SetClipboardTextFn_DefaultImpl(void*, const char* text) +static void Platform_SetClipboardTextFn_DefaultImpl(ImGuiContext*, const char* text) { if (!::OpenClipboard(NULL)) return; - const int wbuf_length = ImTextCountCharsFromUtf8(text, NULL) + 1; - HGLOBAL wbuf_handle = ::GlobalAlloc(GMEM_MOVEABLE, (SIZE_T)wbuf_length * sizeof(ImWchar)); + const int wbuf_length = ::MultiByteToWideChar(CP_UTF8, 0, text, -1, NULL, 0); + HGLOBAL wbuf_handle = ::GlobalAlloc(GMEM_MOVEABLE, (SIZE_T)wbuf_length * sizeof(WCHAR)); if (wbuf_handle == NULL) { ::CloseClipboard(); return; } - ImWchar* wbuf_global = (ImWchar*)::GlobalLock(wbuf_handle); - ImTextStrFromUtf8(wbuf_global, wbuf_length, text, NULL); + WCHAR* wbuf_global = (WCHAR*)::GlobalLock(wbuf_handle); + ::MultiByteToWideChar(CP_UTF8, 0, text, -1, wbuf_global, wbuf_length); ::GlobalUnlock(wbuf_handle); ::EmptyClipboard(); if (::SetClipboardData(CF_UNICODETEXT, wbuf_handle) == NULL) @@ -9674,12 +20719,12 @@ static PasteboardRef main_clipboard = 0; // OSX clipboard implementation // If you enable this you will need to add '-framework ApplicationServices' to your linker command-line! -static void SetClipboardTextFn_DefaultImpl(void*, const char* text) +static void Platform_SetClipboardTextFn_DefaultImpl(ImGuiContext*, const char* text) { if (!main_clipboard) PasteboardCreate(kPasteboardClipboard, &main_clipboard); PasteboardClear(main_clipboard); - CFDataRef cf_data = CFDataCreate(kCFAllocatorDefault, (const UInt8*)text, strlen(text)); + CFDataRef cf_data = CFDataCreate(kCFAllocatorDefault, (const UInt8*)text, ImStrlen(text)); if (cf_data) { PasteboardPutItemFlavor(main_clipboard, (PasteboardItemID)1, CFSTR("public.utf8-plain-text"), cf_data, 0); @@ -9687,8 +20732,9 @@ static void SetClipboardTextFn_DefaultImpl(void*, const char* text) } } -static const char* GetClipboardTextFn_DefaultImpl(void*) +static const char* Platform_GetClipboardTextFn_DefaultImpl(ImGuiContext* ctx) { + ImGuiContext& g = *ctx; if (!main_clipboard) PasteboardCreate(kPasteboardClipboard, &main_clipboard); PasteboardSynchronize(main_clipboard); @@ -9706,13 +20752,13 @@ static const char* GetClipboardTextFn_DefaultImpl(void*) CFDataRef cf_data; if (PasteboardCopyItemFlavorData(main_clipboard, item_id, CFSTR("public.utf8-plain-text"), &cf_data) == noErr) { - static ImVector clipboard_text; + g.ClipboardHandlerData.clear(); int length = (int)CFDataGetLength(cf_data); - clipboard_text.resize(length + 1); - CFDataGetBytes(cf_data, CFRangeMake(0, length), (UInt8*)clipboard_text.Data); - clipboard_text[length] = 0; + g.ClipboardHandlerData.resize(length + 1); + CFDataGetBytes(cf_data, CFRangeMake(0, length), (UInt8*)g.ClipboardHandlerData.Data); + g.ClipboardHandlerData[length] = 0; CFRelease(cf_data); - return clipboard_text.Data; + return g.ClipboardHandlerData.Data; } } } @@ -9722,93 +20768,439 @@ static const char* GetClipboardTextFn_DefaultImpl(void*) #else // Local Dear ImGui-only clipboard implementation, if user hasn't defined better clipboard handlers. -static const char* GetClipboardTextFn_DefaultImpl(void*) +static const char* Platform_GetClipboardTextFn_DefaultImpl(ImGuiContext* ctx) { - ImGuiContext& g = *GImGui; - return g.PrivateClipboard.empty() ? NULL : g.PrivateClipboard.begin(); + ImGuiContext& g = *ctx; + return g.ClipboardHandlerData.empty() ? NULL : g.ClipboardHandlerData.begin(); } -static void SetClipboardTextFn_DefaultImpl(void*, const char* text) +static void Platform_SetClipboardTextFn_DefaultImpl(ImGuiContext* ctx, const char* text) { - ImGuiContext& g = *GImGui; - g.PrivateClipboard.clear(); - const char* text_end = text + strlen(text); - g.PrivateClipboard.resize((int)(text_end - text) + 1); - memcpy(&g.PrivateClipboard[0], text, (size_t)(text_end - text)); - g.PrivateClipboard[(int)(text_end - text)] = 0; + ImGuiContext& g = *ctx; + g.ClipboardHandlerData.clear(); + const char* text_end = text + ImStrlen(text); + g.ClipboardHandlerData.resize((int)(text_end - text) + 1); + memcpy(&g.ClipboardHandlerData[0], text, (size_t)(text_end - text)); + g.ClipboardHandlerData[(int)(text_end - text)] = 0; } +#endif // Default clipboard handlers + +//----------------------------------------------------------------------------- + +#ifndef IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS +#if defined(__APPLE__) && TARGET_OS_IPHONE +#define IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS #endif +#if defined(__3DS__) +#define IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS +#endif +#if defined(_WIN32) && defined(IMGUI_DISABLE_WIN32_FUNCTIONS) +#define IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS +#endif +#endif // #ifndef IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS + +#ifndef IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS +#ifdef _WIN32 +#include // ShellExecuteA() +#ifdef _MSC_VER +#pragma comment(lib, "shell32") +#endif +static bool Platform_OpenInShellFn_DefaultImpl(ImGuiContext*, const char* path) +{ + const int path_wsize = ::MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0); + ImVector path_wbuf; + path_wbuf.resize(path_wsize); + ::MultiByteToWideChar(CP_UTF8, 0, path, -1, path_wbuf.Data, path_wsize); + return (INT_PTR)::ShellExecuteW(NULL, L"open", path_wbuf.Data, NULL, NULL, SW_SHOWDEFAULT) > 32; +} +#else +#include +#include +static bool Platform_OpenInShellFn_DefaultImpl(ImGuiContext*, const char* path) +{ +#if defined(__APPLE__) + const char* args[] { "open", "--", path, NULL }; +#else + const char* args[] { "xdg-open", path, NULL }; +#endif + pid_t pid = fork(); + if (pid < 0) + return false; + if (!pid) + { + execvp(args[0], const_cast(args)); + exit(-1); + } + else + { + int status; + waitpid(pid, &status, 0); + return WEXITSTATUS(status) == 0; + } +} +#endif +#else +static bool Platform_OpenInShellFn_DefaultImpl(ImGuiContext*, const char*) { return false; } +#endif // Default shell handlers + +//----------------------------------------------------------------------------- // Win32 API IME support (for Asian languages, etc.) -#if defined(_WIN32) && !defined(__GNUC__) && !defined(IMGUI_DISABLE_WIN32_FUNCTIONS) && !defined(IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS) +#if defined(_WIN32) && !defined(IMGUI_DISABLE_WIN32_FUNCTIONS) && !defined(IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS) #include #ifdef _MSC_VER #pragma comment(lib, "imm32") #endif -static void ImeSetInputScreenPosFn_DefaultImpl(int x, int y) +static void Platform_SetImeDataFn_DefaultImpl(ImGuiContext*, ImGuiViewport* viewport, ImGuiPlatformImeData* data) { // Notify OS Input Method Editor of text input position - ImGuiIO& io = ImGui::GetIO(); - if (HWND hwnd = (HWND)io.ImeWindowHandle) - if (HIMC himc = ::ImmGetContext(hwnd)) - { - COMPOSITIONFORM cf; - cf.ptCurrentPos.x = x; - cf.ptCurrentPos.y = y; - cf.dwStyle = CFS_FORCE_POSITION; - ::ImmSetCompositionWindow(himc, &cf); - ::ImmReleaseContext(hwnd, himc); - } + HWND hwnd = (HWND)viewport->PlatformHandleRaw; + if (hwnd == 0) + return; + + //::ImmAssociateContextEx(hwnd, NULL, data->WantVisible ? IACE_DEFAULT : 0); + if (HIMC himc = ::ImmGetContext(hwnd)) + { + COMPOSITIONFORM composition_form = {}; + composition_form.ptCurrentPos.x = (LONG)(data->InputPos.x - viewport->Pos.x); + composition_form.ptCurrentPos.y = (LONG)(data->InputPos.y - viewport->Pos.y); + composition_form.dwStyle = CFS_FORCE_POSITION; + ::ImmSetCompositionWindow(himc, &composition_form); + CANDIDATEFORM candidate_form = {}; + candidate_form.dwStyle = CFS_CANDIDATEPOS; + candidate_form.ptCurrentPos.x = (LONG)(data->InputPos.x - viewport->Pos.x); + candidate_form.ptCurrentPos.y = (LONG)(data->InputPos.y - viewport->Pos.y); + ::ImmSetCandidateWindow(himc, &candidate_form); + ::ImmReleaseContext(hwnd, himc); + } } #else -static void ImeSetInputScreenPosFn_DefaultImpl(int, int) {} +static void Platform_SetImeDataFn_DefaultImpl(ImGuiContext*, ImGuiViewport*, ImGuiPlatformImeData*) {} -#endif +#endif // Default IME handlers //----------------------------------------------------------------------------- -// [SECTION] METRICS/DEBUG WINDOW +// [SECTION] METRICS/DEBUGGER WINDOW +//----------------------------------------------------------------------------- +// - DebugRenderViewportThumbnail() [Internal] +// - RenderViewportsThumbnails() [Internal] +// - DebugTextEncoding() +// - MetricsHelpMarker() [Internal] +// - ShowFontAtlas() [Internal] +// - ShowMetricsWindow() +// - DebugNodeColumns() [Internal] +// - DebugNodeDockNode() [Internal] +// - DebugNodeDrawList() [Internal] +// - DebugNodeDrawCmdShowMeshAndBoundingBox() [Internal] +// - DebugNodeFont() [Internal] +// - DebugNodeFontGlyph() [Internal] +// - DebugNodeStorage() [Internal] +// - DebugNodeTabBar() [Internal] +// - DebugNodeViewport() [Internal] +// - DebugNodeWindow() [Internal] +// - DebugNodeWindowSettings() [Internal] +// - DebugNodeWindowsList() [Internal] +// - DebugNodeWindowsListByBeginStackParent() [Internal] //----------------------------------------------------------------------------- -#ifndef IMGUI_DISABLE_METRICS_WINDOW +#ifndef IMGUI_DISABLE_DEBUG_TOOLS + +void ImGui::DebugRenderViewportThumbnail(ImDrawList* draw_list, ImGuiViewportP* viewport, const ImRect& bb) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + + ImVec2 scale = bb.GetSize() / viewport->Size; + ImVec2 off = bb.Min - viewport->Pos * scale; + float alpha_mul = (viewport->Flags & ImGuiViewportFlags_IsMinimized) ? 0.30f : 1.00f; + window->DrawList->AddRectFilled(bb.Min, bb.Max, GetColorU32(ImGuiCol_Border, alpha_mul * 0.40f)); + for (ImGuiWindow* thumb_window : g.Windows) + { + if (!thumb_window->WasActive || (thumb_window->Flags & ImGuiWindowFlags_ChildWindow)) + continue; + if (thumb_window->Viewport != viewport) + continue; + + ImRect thumb_r = thumb_window->Rect(); + ImRect title_r = thumb_window->TitleBarRect(); + thumb_r = ImRect(ImTrunc(off + thumb_r.Min * scale), ImTrunc(off + thumb_r.Max * scale)); + title_r = ImRect(ImTrunc(off + title_r.Min * scale), ImTrunc(off + ImVec2(title_r.Max.x, title_r.Min.y + title_r.GetHeight() * 3.0f) * scale)); // Exaggerate title bar height + thumb_r.ClipWithFull(bb); + title_r.ClipWithFull(bb); + const bool window_is_focused = (g.NavWindow && thumb_window->RootWindowForTitleBarHighlight == g.NavWindow->RootWindowForTitleBarHighlight); + window->DrawList->AddRectFilled(thumb_r.Min, thumb_r.Max, GetColorU32(ImGuiCol_WindowBg, alpha_mul)); + window->DrawList->AddRectFilled(title_r.Min, title_r.Max, GetColorU32(window_is_focused ? ImGuiCol_TitleBgActive : ImGuiCol_TitleBg, alpha_mul)); + window->DrawList->AddRect(thumb_r.Min, thumb_r.Max, GetColorU32(ImGuiCol_Border, alpha_mul)); + window->DrawList->AddText(g.Font, g.FontSize * 1.0f, title_r.Min, GetColorU32(ImGuiCol_Text, alpha_mul), thumb_window->Name, FindRenderedTextEnd(thumb_window->Name)); + } + draw_list->AddRect(bb.Min, bb.Max, GetColorU32(ImGuiCol_Border, alpha_mul)); + if (viewport->ID == g.DebugMetricsConfig.HighlightViewportID) + window->DrawList->AddRect(bb.Min, bb.Max, IM_COL32(255, 255, 0, 255)); +} + +static void RenderViewportsThumbnails() +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + + // Draw monitor and calculate their boundaries + float SCALE = 1.0f / 8.0f; + ImRect bb_full(FLT_MAX, FLT_MAX, -FLT_MAX, -FLT_MAX); + for (ImGuiPlatformMonitor& monitor : g.PlatformIO.Monitors) + bb_full.Add(ImRect(monitor.MainPos, monitor.MainPos + monitor.MainSize)); + ImVec2 p = window->DC.CursorPos; + ImVec2 off = p - bb_full.Min * SCALE; + for (ImGuiPlatformMonitor& monitor : g.PlatformIO.Monitors) + { + ImRect monitor_draw_bb(off + (monitor.MainPos) * SCALE, off + (monitor.MainPos + monitor.MainSize) * SCALE); + window->DrawList->AddRect(monitor_draw_bb.Min, monitor_draw_bb.Max, (g.DebugMetricsConfig.HighlightMonitorIdx == g.PlatformIO.Monitors.index_from_ptr(&monitor)) ? IM_COL32(255, 255, 0, 255) : ImGui::GetColorU32(ImGuiCol_Border), 4.0f); + window->DrawList->AddRectFilled(monitor_draw_bb.Min, monitor_draw_bb.Max, ImGui::GetColorU32(ImGuiCol_Border, 0.10f), 4.0f); + } + + // Draw viewports + for (ImGuiViewportP* viewport : g.Viewports) + { + ImRect viewport_draw_bb(off + (viewport->Pos) * SCALE, off + (viewport->Pos + viewport->Size) * SCALE); + ImGui::DebugRenderViewportThumbnail(window->DrawList, viewport, viewport_draw_bb); + } + ImGui::Dummy(bb_full.GetSize() * SCALE); +} + +static int IMGUI_CDECL ViewportComparerByLastFocusedStampCount(const void* lhs, const void* rhs) +{ + const ImGuiViewportP* a = *(const ImGuiViewportP* const*)lhs; + const ImGuiViewportP* b = *(const ImGuiViewportP* const*)rhs; + return b->LastFocusedStampCount - a->LastFocusedStampCount; +} + +// Draw an arbitrary US keyboard layout to visualize translated keys +void ImGui::DebugRenderKeyboardPreview(ImDrawList* draw_list) +{ + const float scale = ImGui::GetFontSize() / 13.0f; + const ImVec2 key_size = ImVec2(35.0f, 35.0f) * scale; + const float key_rounding = 3.0f * scale; + const ImVec2 key_face_size = ImVec2(25.0f, 25.0f) * scale; + const ImVec2 key_face_pos = ImVec2(5.0f, 3.0f) * scale; + const float key_face_rounding = 2.0f * scale; + const ImVec2 key_label_pos = ImVec2(7.0f, 4.0f) * scale; + const ImVec2 key_step = ImVec2(key_size.x - 1.0f, key_size.y - 1.0f); + const float key_row_offset = 9.0f * scale; + + ImVec2 board_min = GetCursorScreenPos(); + ImVec2 board_max = ImVec2(board_min.x + 3 * key_step.x + 2 * key_row_offset + 10.0f, board_min.y + 3 * key_step.y + 10.0f); + ImVec2 start_pos = ImVec2(board_min.x + 5.0f - key_step.x, board_min.y); + + struct KeyLayoutData { int Row, Col; const char* Label; ImGuiKey Key; }; + const KeyLayoutData keys_to_display[] = + { + { 0, 0, "", ImGuiKey_Tab }, { 0, 1, "Q", ImGuiKey_Q }, { 0, 2, "W", ImGuiKey_W }, { 0, 3, "E", ImGuiKey_E }, { 0, 4, "R", ImGuiKey_R }, + { 1, 0, "", ImGuiKey_CapsLock }, { 1, 1, "A", ImGuiKey_A }, { 1, 2, "S", ImGuiKey_S }, { 1, 3, "D", ImGuiKey_D }, { 1, 4, "F", ImGuiKey_F }, + { 2, 0, "", ImGuiKey_LeftShift },{ 2, 1, "Z", ImGuiKey_Z }, { 2, 2, "X", ImGuiKey_X }, { 2, 3, "C", ImGuiKey_C }, { 2, 4, "V", ImGuiKey_V } + }; + + // Elements rendered manually via ImDrawList API are not clipped automatically. + // While not strictly necessary, here IsItemVisible() is used to avoid rendering these shapes when they are out of view. + Dummy(board_max - board_min); + if (!IsItemVisible()) + return; + draw_list->PushClipRect(board_min, board_max, true); + for (int n = 0; n < IM_ARRAYSIZE(keys_to_display); n++) + { + const KeyLayoutData* key_data = &keys_to_display[n]; + ImVec2 key_min = ImVec2(start_pos.x + key_data->Col * key_step.x + key_data->Row * key_row_offset, start_pos.y + key_data->Row * key_step.y); + ImVec2 key_max = key_min + key_size; + draw_list->AddRectFilled(key_min, key_max, IM_COL32(204, 204, 204, 255), key_rounding); + draw_list->AddRect(key_min, key_max, IM_COL32(24, 24, 24, 255), key_rounding); + ImVec2 face_min = ImVec2(key_min.x + key_face_pos.x, key_min.y + key_face_pos.y); + ImVec2 face_max = ImVec2(face_min.x + key_face_size.x, face_min.y + key_face_size.y); + draw_list->AddRect(face_min, face_max, IM_COL32(193, 193, 193, 255), key_face_rounding, ImDrawFlags_None, 2.0f); + draw_list->AddRectFilled(face_min, face_max, IM_COL32(252, 252, 252, 255), key_face_rounding); + ImVec2 label_min = ImVec2(key_min.x + key_label_pos.x, key_min.y + key_label_pos.y); + draw_list->AddText(label_min, IM_COL32(64, 64, 64, 255), key_data->Label); + if (IsKeyDown(key_data->Key)) + draw_list->AddRectFilled(key_min, key_max, IM_COL32(255, 0, 0, 128), key_rounding); + } + draw_list->PopClipRect(); +} + +// Helper tool to diagnose between text encoding issues and font loading issues. Pass your UTF-8 string and verify that there are correct. +void ImGui::DebugTextEncoding(const char* str) +{ + Text("Text: \"%s\"", str); + if (!BeginTable("##DebugTextEncoding", 4, ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg | ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_Resizable)) + return; + TableSetupColumn("Offset"); + TableSetupColumn("UTF-8"); + TableSetupColumn("Glyph"); + TableSetupColumn("Codepoint"); + TableHeadersRow(); + for (const char* p = str; *p != 0; ) + { + unsigned int c; + const int c_utf8_len = ImTextCharFromUtf8(&c, p, NULL); + TableNextColumn(); + Text("%d", (int)(p - str)); + TableNextColumn(); + for (int byte_index = 0; byte_index < c_utf8_len; byte_index++) + { + if (byte_index > 0) + SameLine(); + Text("0x%02X", (int)(unsigned char)p[byte_index]); + } + TableNextColumn(); + if (GetFont()->FindGlyphNoFallback((ImWchar)c)) + TextUnformatted(p, p + c_utf8_len); + else + TextUnformatted((c == IM_UNICODE_CODEPOINT_INVALID) ? "[invalid]" : "[missing]"); + TableNextColumn(); + Text("U+%04X", (int)c); + p += c_utf8_len; + } + EndTable(); +} + +static void DebugFlashStyleColorStop() +{ + ImGuiContext& g = *GImGui; + if (g.DebugFlashStyleColorIdx != ImGuiCol_COUNT) + g.Style.Colors[g.DebugFlashStyleColorIdx] = g.DebugFlashStyleColorBackup; + g.DebugFlashStyleColorIdx = ImGuiCol_COUNT; +} + +// Flash a given style color for some + inhibit modifications of this color via PushStyleColor() calls. +void ImGui::DebugFlashStyleColor(ImGuiCol idx) +{ + ImGuiContext& g = *GImGui; + DebugFlashStyleColorStop(); + g.DebugFlashStyleColorTime = 0.5f; + g.DebugFlashStyleColorIdx = idx; + g.DebugFlashStyleColorBackup = g.Style.Colors[idx]; +} + +void ImGui::UpdateDebugToolFlashStyleColor() +{ + ImGuiContext& g = *GImGui; + if (g.DebugFlashStyleColorTime <= 0.0f) + return; + ColorConvertHSVtoRGB(ImCos(g.DebugFlashStyleColorTime * 6.0f) * 0.5f + 0.5f, 0.5f, 0.5f, g.Style.Colors[g.DebugFlashStyleColorIdx].x, g.Style.Colors[g.DebugFlashStyleColorIdx].y, g.Style.Colors[g.DebugFlashStyleColorIdx].z); + g.Style.Colors[g.DebugFlashStyleColorIdx].w = 1.0f; + if ((g.DebugFlashStyleColorTime -= g.IO.DeltaTime) <= 0.0f) + DebugFlashStyleColorStop(); +} + +static const char* FormatTextureIDForDebugDisplay(char* buf, int buf_size, ImTextureID tex_id) +{ + union { void* ptr; int integer; } tex_id_opaque; + memcpy(&tex_id_opaque, &tex_id, ImMin(sizeof(void*), sizeof(tex_id))); + if (sizeof(tex_id) >= sizeof(void*)) + ImFormatString(buf, buf_size, "0x%p", tex_id_opaque.ptr); + else + ImFormatString(buf, buf_size, "0x%04X", tex_id_opaque.integer); + return buf; +} + +// Avoid naming collision with imgui_demo.cpp's HelpMarker() for unity builds. +static void MetricsHelpMarker(const char* desc) +{ + ImGui::TextDisabled("(?)"); + if (ImGui::BeginItemTooltip()) + { + ImGui::PushTextWrapPos(ImGui::GetFontSize() * 35.0f); + ImGui::TextUnformatted(desc); + ImGui::PopTextWrapPos(); + ImGui::EndTooltip(); + } +} + +// [DEBUG] List fonts in a font atlas and display its texture +void ImGui::ShowFontAtlas(ImFontAtlas* atlas) +{ + for (ImFont* font : atlas->Fonts) + { + PushID(font); + DebugNodeFont(font); + PopID(); + } + if (TreeNode("Font Atlas", "Font Atlas (%dx%d pixels)", atlas->TexWidth, atlas->TexHeight)) + { + ImGuiContext& g = *GImGui; + PushStyleVar(ImGuiStyleVar_ImageBorderSize, ImMax(1.0f, g.Style.ImageBorderSize)); + ImageWithBg(atlas->TexID, ImVec2((float)atlas->TexWidth, (float)atlas->TexHeight), ImVec2(0.0f, 0.0f), ImVec2(1.0f, 1.0f), ImVec4(0.0f, 0.0f, 0.0f, 1.0f)); + PopStyleVar(); + TreePop(); + } +} + void ImGui::ShowMetricsWindow(bool* p_open) { - if (!ImGui::Begin("Dear ImGui Metrics", p_open)) + ImGuiContext& g = *GImGui; + ImGuiIO& io = g.IO; + ImGuiMetricsConfig* cfg = &g.DebugMetricsConfig; + if (cfg->ShowDebugLog) + ShowDebugLogWindow(&cfg->ShowDebugLog); + if (cfg->ShowIDStackTool) + ShowIDStackToolWindow(&cfg->ShowIDStackTool); + + if (!Begin("Dear ImGui Metrics/Debugger", p_open) || GetCurrentWindow()->BeginCount > 1) { - ImGui::End(); + End(); return; } - // State - enum { WRT_OuterRect, WRT_OuterRectClipped, WRT_InnerRect, WRT_InnerClipRect, WRT_WorkRect, WRT_Contents, WRT_ContentsRegionRect, WRT_Count }; // Windows Rect Type - const char* wrt_rects_names[WRT_Count] = { "OuterRect", "OuterRectClipped", "InnerRect", "InnerClipRect", "WorkRect", "Contents", "ContentsRegionRect" }; - static bool show_windows_rects = false; - static int show_windows_rect_type = WRT_WorkRect; - static bool show_windows_begin_order = false; - static bool show_drawcmd_clip_rects = true; + // [DEBUG] Clear debug breaks hooks after exactly one cycle. + DebugBreakClearData(); // Basic info - ImGuiContext& g = *GImGui; - ImGuiIO& io = ImGui::GetIO(); - ImGui::Text("Dear ImGui %s", ImGui::GetVersion()); - ImGui::Text("Application average %.3f ms/frame (%.1f FPS)", 1000.0f / io.Framerate, io.Framerate); - ImGui::Text("%d vertices, %d indices (%d triangles)", io.MetricsRenderVertices, io.MetricsRenderIndices, io.MetricsRenderIndices / 3); - ImGui::Text("%d active windows (%d visible)", io.MetricsActiveWindows, io.MetricsRenderWindows); - ImGui::Text("%d active allocations", io.MetricsActiveAllocations); - ImGui::Separator(); + Text("Dear ImGui %s (%d)", IMGUI_VERSION, IMGUI_VERSION_NUM); + if (g.ContextName[0] != 0) + { + SameLine(); + Text("(Context Name: \"%s\")", g.ContextName); + } + Text("Application average %.3f ms/frame (%.1f FPS)", 1000.0f / io.Framerate, io.Framerate); + Text("%d vertices, %d indices (%d triangles)", io.MetricsRenderVertices, io.MetricsRenderIndices, io.MetricsRenderIndices / 3); + Text("%d visible windows, %d current allocations", io.MetricsRenderWindows, g.DebugAllocInfo.TotalAllocCount - g.DebugAllocInfo.TotalFreeCount); + //SameLine(); if (SmallButton("GC")) { g.GcCompactAll = true; } + + Separator(); + + // Debugging enums + enum { WRT_OuterRect, WRT_OuterRectClipped, WRT_InnerRect, WRT_InnerClipRect, WRT_WorkRect, WRT_Content, WRT_ContentIdeal, WRT_ContentRegionRect, WRT_Count }; // Windows Rect Type + const char* wrt_rects_names[WRT_Count] = { "OuterRect", "OuterRectClipped", "InnerRect", "InnerClipRect", "WorkRect", "Content", "ContentIdeal", "ContentRegionRect" }; + enum { TRT_OuterRect, TRT_InnerRect, TRT_WorkRect, TRT_HostClipRect, TRT_InnerClipRect, TRT_BackgroundClipRect, TRT_ColumnsRect, TRT_ColumnsWorkRect, TRT_ColumnsClipRect, TRT_ColumnsContentHeadersUsed, TRT_ColumnsContentHeadersIdeal, TRT_ColumnsContentFrozen, TRT_ColumnsContentUnfrozen, TRT_Count }; // Tables Rect Type + const char* trt_rects_names[TRT_Count] = { "OuterRect", "InnerRect", "WorkRect", "HostClipRect", "InnerClipRect", "BackgroundClipRect", "ColumnsRect", "ColumnsWorkRect", "ColumnsClipRect", "ColumnsContentHeadersUsed", "ColumnsContentHeadersIdeal", "ColumnsContentFrozen", "ColumnsContentUnfrozen" }; + if (cfg->ShowWindowsRectsType < 0) + cfg->ShowWindowsRectsType = WRT_WorkRect; + if (cfg->ShowTablesRectsType < 0) + cfg->ShowTablesRectsType = TRT_WorkRect; - // Helper functions to display common structures: - // - NodeDrawList - // - NodeColumns - // - NodeWindow - // - NodeWindows - // - NodeTabBar struct Funcs { + static ImRect GetTableRect(ImGuiTable* table, int rect_type, int n) + { + ImGuiTableInstanceData* table_instance = TableGetInstanceData(table, table->InstanceCurrent); // Always using last submitted instance + if (rect_type == TRT_OuterRect) { return table->OuterRect; } + else if (rect_type == TRT_InnerRect) { return table->InnerRect; } + else if (rect_type == TRT_WorkRect) { return table->WorkRect; } + else if (rect_type == TRT_HostClipRect) { return table->HostClipRect; } + else if (rect_type == TRT_InnerClipRect) { return table->InnerClipRect; } + else if (rect_type == TRT_BackgroundClipRect) { return table->BgClipRect; } + else if (rect_type == TRT_ColumnsRect) { ImGuiTableColumn* c = &table->Columns[n]; return ImRect(c->MinX, table->InnerClipRect.Min.y, c->MaxX, table->InnerClipRect.Min.y + table_instance->LastOuterHeight); } + else if (rect_type == TRT_ColumnsWorkRect) { ImGuiTableColumn* c = &table->Columns[n]; return ImRect(c->WorkMinX, table->WorkRect.Min.y, c->WorkMaxX, table->WorkRect.Max.y); } + else if (rect_type == TRT_ColumnsClipRect) { ImGuiTableColumn* c = &table->Columns[n]; return c->ClipRect; } + else if (rect_type == TRT_ColumnsContentHeadersUsed){ ImGuiTableColumn* c = &table->Columns[n]; return ImRect(c->WorkMinX, table->InnerClipRect.Min.y, c->ContentMaxXHeadersUsed, table->InnerClipRect.Min.y + table_instance->LastTopHeadersRowHeight); } // Note: y1/y2 not always accurate + else if (rect_type == TRT_ColumnsContentHeadersIdeal){ImGuiTableColumn* c = &table->Columns[n]; return ImRect(c->WorkMinX, table->InnerClipRect.Min.y, c->ContentMaxXHeadersIdeal, table->InnerClipRect.Min.y + table_instance->LastTopHeadersRowHeight); } + else if (rect_type == TRT_ColumnsContentFrozen) { ImGuiTableColumn* c = &table->Columns[n]; return ImRect(c->WorkMinX, table->InnerClipRect.Min.y, c->ContentMaxXFrozen, table->InnerClipRect.Min.y + table_instance->LastFrozenHeight); } + else if (rect_type == TRT_ColumnsContentUnfrozen) { ImGuiTableColumn* c = &table->Columns[n]; return ImRect(c->WorkMinX, table->InnerClipRect.Min.y + table_instance->LastFrozenHeight, c->ContentMaxXUnfrozen, table->InnerClipRect.Max.y); } + IM_ASSERT(0); + return ImRect(); + } + static ImRect GetWindowRect(ImGuiWindow* window, int rect_type) { if (rect_type == WRT_OuterRect) { return window->Rect(); } @@ -9816,286 +21208,1713 @@ void ImGui::ShowMetricsWindow(bool* p_open) else if (rect_type == WRT_InnerRect) { return window->InnerRect; } else if (rect_type == WRT_InnerClipRect) { return window->InnerClipRect; } else if (rect_type == WRT_WorkRect) { return window->WorkRect; } - else if (rect_type == WRT_Contents) { ImVec2 min = window->InnerRect.Min - window->Scroll + window->WindowPadding; return ImRect(min, min + window->ContentSize); } - else if (rect_type == WRT_ContentsRegionRect) { return window->ContentsRegionRect; } + else if (rect_type == WRT_Content) { ImVec2 min = window->InnerRect.Min - window->Scroll + window->WindowPadding; return ImRect(min, min + window->ContentSize); } + else if (rect_type == WRT_ContentIdeal) { ImVec2 min = window->InnerRect.Min - window->Scroll + window->WindowPadding; return ImRect(min, min + window->ContentSizeIdeal); } + else if (rect_type == WRT_ContentRegionRect) { return window->ContentRegionRect; } IM_ASSERT(0); return ImRect(); } - - static void NodeDrawList(ImGuiWindow* window, ImDrawList* draw_list, const char* label) - { - bool node_open = ImGui::TreeNode(draw_list, "%s: '%s' %d vtx, %d indices, %d cmds", label, draw_list->_OwnerName ? draw_list->_OwnerName : "", draw_list->VtxBuffer.Size, draw_list->IdxBuffer.Size, draw_list->CmdBuffer.Size); - if (draw_list == ImGui::GetWindowDrawList()) - { - ImGui::SameLine(); - ImGui::TextColored(ImVec4(1.0f,0.4f,0.4f,1.0f), "CURRENTLY APPENDING"); // Can't display stats for active draw list! (we don't have the data double-buffered) - if (node_open) ImGui::TreePop(); - return; - } - - ImDrawList* fg_draw_list = GetForegroundDrawList(window); // Render additional visuals into the top-most draw list - if (window && IsItemHovered()) - fg_draw_list->AddRect(window->Pos, window->Pos + window->Size, IM_COL32(255, 255, 0, 255)); - if (!node_open) - return; - - if (window && !window->WasActive) - ImGui::Text("(Note: owning Window is inactive: DrawList is not being rendered!)"); - - int elem_offset = 0; - for (const ImDrawCmd* pcmd = draw_list->CmdBuffer.begin(); pcmd < draw_list->CmdBuffer.end(); elem_offset += pcmd->ElemCount, pcmd++) - { - if (pcmd->UserCallback == NULL && pcmd->ElemCount == 0) - continue; - if (pcmd->UserCallback) - { - ImGui::BulletText("Callback %p, user_data %p", pcmd->UserCallback, pcmd->UserCallbackData); - continue; - } - ImDrawIdx* idx_buffer = (draw_list->IdxBuffer.Size > 0) ? draw_list->IdxBuffer.Data : NULL; - char buf[300]; - ImFormatString(buf, IM_ARRAYSIZE(buf), "Draw %4d triangles, tex 0x%p, clip_rect (%4.0f,%4.0f)-(%4.0f,%4.0f)", - pcmd->ElemCount/3, (void*)(intptr_t)pcmd->TextureId, pcmd->ClipRect.x, pcmd->ClipRect.y, pcmd->ClipRect.z, pcmd->ClipRect.w); - bool pcmd_node_open = ImGui::TreeNode((void*)(pcmd - draw_list->CmdBuffer.begin()), "%s", buf); - if (show_drawcmd_clip_rects && fg_draw_list && ImGui::IsItemHovered()) - { - ImRect clip_rect = pcmd->ClipRect; - ImRect vtxs_rect; - for (int i = elem_offset; i < elem_offset + (int)pcmd->ElemCount; i++) - vtxs_rect.Add(draw_list->VtxBuffer[idx_buffer ? idx_buffer[i] : i].pos); - clip_rect.Floor(); fg_draw_list->AddRect(clip_rect.Min, clip_rect.Max, IM_COL32(255,0,255,255)); - vtxs_rect.Floor(); fg_draw_list->AddRect(vtxs_rect.Min, vtxs_rect.Max, IM_COL32(255,255,0,255)); - } - if (!pcmd_node_open) - continue; - - // Display individual triangles/vertices. Hover on to get the corresponding triangle highlighted. - ImGui::Text("ElemCount: %d, ElemCount/3: %d, VtxOffset: +%d, IdxOffset: +%d", pcmd->ElemCount, pcmd->ElemCount/3, pcmd->VtxOffset, pcmd->IdxOffset); - ImGuiListClipper clipper(pcmd->ElemCount/3); // Manually coarse clip our print out of individual vertices to save CPU, only items that may be visible. - while (clipper.Step()) - for (int prim = clipper.DisplayStart, idx_i = elem_offset + clipper.DisplayStart*3; prim < clipper.DisplayEnd; prim++) - { - char *buf_p = buf, *buf_end = buf + IM_ARRAYSIZE(buf); - ImVec2 triangles_pos[3]; - for (int n = 0; n < 3; n++, idx_i++) - { - int vtx_i = idx_buffer ? idx_buffer[idx_i] : idx_i; - ImDrawVert& v = draw_list->VtxBuffer[vtx_i]; - triangles_pos[n] = v.pos; - buf_p += ImFormatString(buf_p, buf_end - buf_p, "%s %04d: pos (%8.2f,%8.2f), uv (%.6f,%.6f), col %08X\n", - (n == 0) ? "elem" : " ", idx_i, v.pos.x, v.pos.y, v.uv.x, v.uv.y, v.col); - } - ImGui::Selectable(buf, false); - if (fg_draw_list && ImGui::IsItemHovered()) - { - ImDrawListFlags backup_flags = fg_draw_list->Flags; - fg_draw_list->Flags &= ~ImDrawListFlags_AntiAliasedLines; // Disable AA on triangle outlines at is more readable for very large and thin triangles. - fg_draw_list->AddPolyline(triangles_pos, 3, IM_COL32(255,255,0,255), true, 1.0f); - fg_draw_list->Flags = backup_flags; - } - } - ImGui::TreePop(); - } - ImGui::TreePop(); - } - - static void NodeColumns(const ImGuiColumns* columns) - { - if (!ImGui::TreeNode((void*)(uintptr_t)columns->ID, "Columns Id: 0x%08X, Count: %d, Flags: 0x%04X", columns->ID, columns->Count, columns->Flags)) - return; - ImGui::BulletText("Width: %.1f (MinX: %.1f, MaxX: %.1f)", columns->OffMaxX - columns->OffMinX, columns->OffMinX, columns->OffMaxX); - for (int column_n = 0; column_n < columns->Columns.Size; column_n++) - ImGui::BulletText("Column %02d: OffsetNorm %.3f (= %.1f px)", column_n, columns->Columns[column_n].OffsetNorm, GetColumnOffsetFromNorm(columns, columns->Columns[column_n].OffsetNorm)); - ImGui::TreePop(); - } - - static void NodeWindows(ImVector& windows, const char* label) - { - if (!ImGui::TreeNode(label, "%s (%d)", label, windows.Size)) - return; - for (int i = 0; i < windows.Size; i++) - Funcs::NodeWindow(windows[i], "Window"); - ImGui::TreePop(); - } - - static void NodeWindow(ImGuiWindow* window, const char* label) - { - if (window == NULL) - { - ImGui::BulletText("%s: NULL", label); - return; - } - if (!ImGui::TreeNode(window, "%s '%s', %d @ 0x%p", label, window->Name, (window->Active || window->WasActive), window)) - return; - ImGuiWindowFlags flags = window->Flags; - NodeDrawList(window, window->DrawList, "DrawList"); - ImGui::BulletText("Pos: (%.1f,%.1f), Size: (%.1f,%.1f), ContentSize (%.1f,%.1f)", window->Pos.x, window->Pos.y, window->Size.x, window->Size.y, window->ContentSize.x, window->ContentSize.y); - ImGui::BulletText("Flags: 0x%08X (%s%s%s%s%s%s%s%s%s..)", flags, - (flags & ImGuiWindowFlags_ChildWindow) ? "Child " : "", (flags & ImGuiWindowFlags_Tooltip) ? "Tooltip " : "", (flags & ImGuiWindowFlags_Popup) ? "Popup " : "", - (flags & ImGuiWindowFlags_Modal) ? "Modal " : "", (flags & ImGuiWindowFlags_ChildMenu) ? "ChildMenu " : "", (flags & ImGuiWindowFlags_NoSavedSettings) ? "NoSavedSettings " : "", - (flags & ImGuiWindowFlags_NoMouseInputs)? "NoMouseInputs":"", (flags & ImGuiWindowFlags_NoNavInputs) ? "NoNavInputs" : "", (flags & ImGuiWindowFlags_AlwaysAutoResize) ? "AlwaysAutoResize" : ""); - ImGui::BulletText("Scroll: (%.2f/%.2f,%.2f/%.2f)", window->Scroll.x, window->ScrollMax.x, window->Scroll.y, window->ScrollMax.y); - ImGui::BulletText("Active: %d/%d, WriteAccessed: %d, BeginOrderWithinContext: %d", window->Active, window->WasActive, window->WriteAccessed, (window->Active || window->WasActive) ? window->BeginOrderWithinContext : -1); - ImGui::BulletText("Appearing: %d, Hidden: %d (CanSkip %d Cannot %d), SkipItems: %d", window->Appearing, window->Hidden, window->HiddenFramesCanSkipItems, window->HiddenFramesCannotSkipItems, window->SkipItems); - ImGui::BulletText("NavLastIds: 0x%08X,0x%08X, NavLayerActiveMask: %X", window->NavLastIds[0], window->NavLastIds[1], window->DC.NavLayerActiveMask); - ImGui::BulletText("NavLastChildNavWindow: %s", window->NavLastChildNavWindow ? window->NavLastChildNavWindow->Name : "NULL"); - if (!window->NavRectRel[0].IsInverted()) - ImGui::BulletText("NavRectRel[0]: (%.1f,%.1f)(%.1f,%.1f)", window->NavRectRel[0].Min.x, window->NavRectRel[0].Min.y, window->NavRectRel[0].Max.x, window->NavRectRel[0].Max.y); - else - ImGui::BulletText("NavRectRel[0]: "); - if (window->RootWindow != window) NodeWindow(window->RootWindow, "RootWindow"); - if (window->ParentWindow != NULL) NodeWindow(window->ParentWindow, "ParentWindow"); - if (window->DC.ChildWindows.Size > 0) NodeWindows(window->DC.ChildWindows, "ChildWindows"); - if (window->ColumnsStorage.Size > 0 && ImGui::TreeNode("Columns", "Columns sets (%d)", window->ColumnsStorage.Size)) - { - for (int n = 0; n < window->ColumnsStorage.Size; n++) - NodeColumns(&window->ColumnsStorage[n]); - ImGui::TreePop(); - } - ImGui::BulletText("Storage: %d bytes", window->StateStorage.Data.size_in_bytes()); - ImGui::TreePop(); - } - - static void NodeTabBar(ImGuiTabBar* tab_bar) - { - // Standalone tab bars (not associated to docking/windows functionality) currently hold no discernible strings. - char buf[256]; - char* p = buf; - const char* buf_end = buf + IM_ARRAYSIZE(buf); - ImFormatString(p, buf_end - p, "TabBar (%d tabs)%s", tab_bar->Tabs.Size, (tab_bar->PrevFrameVisible < ImGui::GetFrameCount() - 2) ? " *Inactive*" : ""); - if (ImGui::TreeNode(tab_bar, "%s", buf)) - { - for (int tab_n = 0; tab_n < tab_bar->Tabs.Size; tab_n++) - { - const ImGuiTabItem* tab = &tab_bar->Tabs[tab_n]; - ImGui::PushID(tab); - if (ImGui::SmallButton("<")) { TabBarQueueChangeTabOrder(tab_bar, tab, -1); } ImGui::SameLine(0, 2); - if (ImGui::SmallButton(">")) { TabBarQueueChangeTabOrder(tab_bar, tab, +1); } ImGui::SameLine(); - ImGui::Text("%02d%c Tab 0x%08X", tab_n, (tab->ID == tab_bar->SelectedTabId) ? '*' : ' ', tab->ID); - ImGui::PopID(); - } - ImGui::TreePop(); - } - } }; - Funcs::NodeWindows(g.Windows, "Windows"); - if (ImGui::TreeNode("DrawList", "Active DrawLists (%d)", g.DrawDataBuilder.Layers[0].Size)) - { - for (int i = 0; i < g.DrawDataBuilder.Layers[0].Size; i++) - Funcs::NodeDrawList(NULL, g.DrawDataBuilder.Layers[0][i], "DrawList"); - ImGui::TreePop(); - } - - if (ImGui::TreeNode("Popups", "Popups (%d)", g.OpenPopupStack.Size)) - { - for (int i = 0; i < g.OpenPopupStack.Size; i++) - { - ImGuiWindow* window = g.OpenPopupStack[i].Window; - ImGui::BulletText("PopupID: %08x, Window: '%s'%s%s", g.OpenPopupStack[i].PopupId, window ? window->Name : "NULL", window && (window->Flags & ImGuiWindowFlags_ChildWindow) ? " ChildWindow" : "", window && (window->Flags & ImGuiWindowFlags_ChildMenu) ? " ChildMenu" : ""); - } - ImGui::TreePop(); - } - - if (ImGui::TreeNode("TabBars", "Tab Bars (%d)", g.TabBars.Data.Size)) - { - for (int n = 0; n < g.TabBars.Data.Size; n++) - Funcs::NodeTabBar(g.TabBars.GetByIndex(n)); - ImGui::TreePop(); - } - -#if 0 - if (ImGui::TreeNode("Docking")) - { - ImGui::TreePop(); - } -#endif - -#if 0 - if (ImGui::TreeNode("Tables", "Tables (%d)", g.Tables.Data.Size)) - { - ImGui::TreePop(); - } -#endif - - if (ImGui::TreeNode("Internal state")) - { - const char* input_source_names[] = { "None", "Mouse", "Nav", "NavKeyboard", "NavGamepad" }; IM_ASSERT(IM_ARRAYSIZE(input_source_names) == ImGuiInputSource_COUNT); - ImGui::Text("HoveredWindow: '%s'", g.HoveredWindow ? g.HoveredWindow->Name : "NULL"); - ImGui::Text("HoveredRootWindow: '%s'", g.HoveredRootWindow ? g.HoveredRootWindow->Name : "NULL"); - ImGui::Text("HoveredId: 0x%08X/0x%08X (%.2f sec), AllowOverlap: %d", g.HoveredId, g.HoveredIdPreviousFrame, g.HoveredIdTimer, g.HoveredIdAllowOverlap); // Data is "in-flight" so depending on when the Metrics window is called we may see current frame information or not - ImGui::Text("ActiveId: 0x%08X/0x%08X (%.2f sec), AllowOverlap: %d, Source: %s", g.ActiveId, g.ActiveIdPreviousFrame, g.ActiveIdTimer, g.ActiveIdAllowOverlap, input_source_names[g.ActiveIdSource]); - ImGui::Text("ActiveIdWindow: '%s'", g.ActiveIdWindow ? g.ActiveIdWindow->Name : "NULL"); - ImGui::Text("MovingWindow: '%s'", g.MovingWindow ? g.MovingWindow->Name : "NULL"); - ImGui::Text("NavWindow: '%s'", g.NavWindow ? g.NavWindow->Name : "NULL"); - ImGui::Text("NavId: 0x%08X, NavLayer: %d", g.NavId, g.NavLayer); - ImGui::Text("NavInputSource: %s", input_source_names[g.NavInputSource]); - ImGui::Text("NavActive: %d, NavVisible: %d", g.IO.NavActive, g.IO.NavVisible); - ImGui::Text("NavActivateId: 0x%08X, NavInputId: 0x%08X", g.NavActivateId, g.NavInputId); - ImGui::Text("NavDisableHighlight: %d, NavDisableMouseHover: %d", g.NavDisableHighlight, g.NavDisableMouseHover); - ImGui::Text("NavWindowingTarget: '%s'", g.NavWindowingTarget ? g.NavWindowingTarget->Name : "NULL"); - ImGui::Text("DragDrop: %d, SourceId = 0x%08X, Payload \"%s\" (%d bytes)", g.DragDropActive, g.DragDropPayload.SourceId, g.DragDropPayload.DataType, g.DragDropPayload.DataSize); - ImGui::TreePop(); - } - - if (ImGui::TreeNode("Tools")) + // Tools + if (TreeNode("Tools")) { + // Debug Break features // The Item Picker tool is super useful to visually select an item and break into the call-stack of where it was submitted. - if (ImGui::Button("Item Picker..")) - ImGui::DebugStartItemPicker(); + SeparatorTextEx(0, "Debug breaks", NULL, CalcTextSize("(?)").x + g.Style.SeparatorTextPadding.x); + SameLine(); + MetricsHelpMarker("Will call the IM_DEBUG_BREAK() macro to break in debugger.\nWarning: If you don't have a debugger attached, this will probably crash."); + if (Checkbox("Show Item Picker", &g.DebugItemPickerActive) && g.DebugItemPickerActive) + DebugStartItemPicker(); + Checkbox("Show \"Debug Break\" buttons in other sections (io.ConfigDebugIsDebuggerPresent)", &g.IO.ConfigDebugIsDebuggerPresent); - ImGui::Checkbox("Show windows begin order", &show_windows_begin_order); - ImGui::Checkbox("Show windows rectangles", &show_windows_rects); - ImGui::SameLine(); - ImGui::SetNextItemWidth(ImGui::GetFontSize() * 12); - show_windows_rects |= ImGui::Combo("##show_windows_rect_type", &show_windows_rect_type, wrt_rects_names, WRT_Count); - if (show_windows_rects && g.NavWindow) + SeparatorText("Visualize"); + + Checkbox("Show Debug Log", &cfg->ShowDebugLog); + SameLine(); + MetricsHelpMarker("You can also call ImGui::ShowDebugLogWindow() from your code."); + + Checkbox("Show ID Stack Tool", &cfg->ShowIDStackTool); + SameLine(); + MetricsHelpMarker("You can also call ImGui::ShowIDStackToolWindow() from your code."); + + Checkbox("Show windows begin order", &cfg->ShowWindowsBeginOrder); + Checkbox("Show windows rectangles", &cfg->ShowWindowsRects); + SameLine(); + SetNextItemWidth(GetFontSize() * 12); + cfg->ShowWindowsRects |= Combo("##show_windows_rect_type", &cfg->ShowWindowsRectsType, wrt_rects_names, WRT_Count, WRT_Count); + if (cfg->ShowWindowsRects && g.NavWindow != NULL) { - ImGui::BulletText("'%s':", g.NavWindow->Name); - ImGui::Indent(); + BulletText("'%s':", g.NavWindow->Name); + Indent(); for (int rect_n = 0; rect_n < WRT_Count; rect_n++) { ImRect r = Funcs::GetWindowRect(g.NavWindow, rect_n); - ImGui::Text("(%6.1f,%6.1f) (%6.1f,%6.1f) Size (%6.1f,%6.1f) %s", r.Min.x, r.Min.y, r.Max.x, r.Max.y, r.GetWidth(), r.GetHeight(), wrt_rects_names[rect_n]); + Text("(%6.1f,%6.1f) (%6.1f,%6.1f) Size (%6.1f,%6.1f) %s", r.Min.x, r.Min.y, r.Max.x, r.Max.y, r.GetWidth(), r.GetHeight(), wrt_rects_names[rect_n]); } - ImGui::Unindent(); + Unindent(); } - ImGui::Checkbox("Show clipping rectangle when hovering ImDrawCmd node", &show_drawcmd_clip_rects); - ImGui::TreePop(); + + Checkbox("Show tables rectangles", &cfg->ShowTablesRects); + SameLine(); + SetNextItemWidth(GetFontSize() * 12); + cfg->ShowTablesRects |= Combo("##show_table_rects_type", &cfg->ShowTablesRectsType, trt_rects_names, TRT_Count, TRT_Count); + if (cfg->ShowTablesRects && g.NavWindow != NULL) + { + for (int table_n = 0; table_n < g.Tables.GetMapSize(); table_n++) + { + ImGuiTable* table = g.Tables.TryGetMapData(table_n); + if (table == NULL || table->LastFrameActive < g.FrameCount - 1 || (table->OuterWindow != g.NavWindow && table->InnerWindow != g.NavWindow)) + continue; + + BulletText("Table 0x%08X (%d columns, in '%s')", table->ID, table->ColumnsCount, table->OuterWindow->Name); + if (IsItemHovered()) + GetForegroundDrawList()->AddRect(table->OuterRect.Min - ImVec2(1, 1), table->OuterRect.Max + ImVec2(1, 1), IM_COL32(255, 255, 0, 255), 0.0f, 0, 2.0f); + Indent(); + char buf[128]; + for (int rect_n = 0; rect_n < TRT_Count; rect_n++) + { + if (rect_n >= TRT_ColumnsRect) + { + if (rect_n != TRT_ColumnsRect && rect_n != TRT_ColumnsClipRect) + continue; + for (int column_n = 0; column_n < table->ColumnsCount; column_n++) + { + ImRect r = Funcs::GetTableRect(table, rect_n, column_n); + ImFormatString(buf, IM_ARRAYSIZE(buf), "(%6.1f,%6.1f) (%6.1f,%6.1f) Size (%6.1f,%6.1f) Col %d %s", r.Min.x, r.Min.y, r.Max.x, r.Max.y, r.GetWidth(), r.GetHeight(), column_n, trt_rects_names[rect_n]); + Selectable(buf); + if (IsItemHovered()) + GetForegroundDrawList()->AddRect(r.Min - ImVec2(1, 1), r.Max + ImVec2(1, 1), IM_COL32(255, 255, 0, 255), 0.0f, 0, 2.0f); + } + } + else + { + ImRect r = Funcs::GetTableRect(table, rect_n, -1); + ImFormatString(buf, IM_ARRAYSIZE(buf), "(%6.1f,%6.1f) (%6.1f,%6.1f) Size (%6.1f,%6.1f) %s", r.Min.x, r.Min.y, r.Max.x, r.Max.y, r.GetWidth(), r.GetHeight(), trt_rects_names[rect_n]); + Selectable(buf); + if (IsItemHovered()) + GetForegroundDrawList()->AddRect(r.Min - ImVec2(1, 1), r.Max + ImVec2(1, 1), IM_COL32(255, 255, 0, 255), 0.0f, 0, 2.0f); + } + } + Unindent(); + } + } + Checkbox("Show groups rectangles", &g.DebugShowGroupRects); // Storing in context as this is used by group code and prefers to be in hot-data + + SeparatorText("Validate"); + + Checkbox("Debug Begin/BeginChild return value", &io.ConfigDebugBeginReturnValueLoop); + SameLine(); + MetricsHelpMarker("Some calls to Begin()/BeginChild() will return false.\n\nWill cycle through window depths then repeat. Windows should be flickering while running."); + + Checkbox("UTF-8 Encoding viewer", &cfg->ShowTextEncodingViewer); + SameLine(); + MetricsHelpMarker("You can also call ImGui::DebugTextEncoding() from your code with a given string to test that your UTF-8 encoding settings are correct."); + if (cfg->ShowTextEncodingViewer) + { + static char buf[64] = ""; + SetNextItemWidth(-FLT_MIN); + InputText("##DebugTextEncodingBuf", buf, IM_ARRAYSIZE(buf)); + if (buf[0] != 0) + DebugTextEncoding(buf); + } + + TreePop(); } - // Tool: Display windows Rectangles and Begin Order - if (show_windows_rects || show_windows_begin_order) + // Windows + if (TreeNode("Windows", "Windows (%d)", g.Windows.Size)) { - for (int n = 0; n < g.Windows.Size; n++) + //SetNextItemOpen(true, ImGuiCond_Once); + DebugNodeWindowsList(&g.Windows, "By display order"); + DebugNodeWindowsList(&g.WindowsFocusOrder, "By focus order (root windows)"); + if (TreeNode("By submission order (begin stack)")) + { + // Here we display windows in their submitted order/hierarchy, however note that the Begin stack doesn't constitute a Parent<>Child relationship! + ImVector& temp_buffer = g.WindowsTempSortBuffer; + temp_buffer.resize(0); + for (ImGuiWindow* window : g.Windows) + if (window->LastFrameActive + 1 >= g.FrameCount) + temp_buffer.push_back(window); + struct Func { static int IMGUI_CDECL WindowComparerByBeginOrder(const void* lhs, const void* rhs) { return ((int)(*(const ImGuiWindow* const *)lhs)->BeginOrderWithinContext - (*(const ImGuiWindow* const*)rhs)->BeginOrderWithinContext); } }; + ImQsort(temp_buffer.Data, (size_t)temp_buffer.Size, sizeof(ImGuiWindow*), Func::WindowComparerByBeginOrder); + DebugNodeWindowsListByBeginStackParent(temp_buffer.Data, temp_buffer.Size, NULL); + TreePop(); + } + + TreePop(); + } + + // DrawLists + int drawlist_count = 0; + for (ImGuiViewportP* viewport : g.Viewports) + drawlist_count += viewport->DrawDataP.CmdLists.Size; + if (TreeNode("DrawLists", "DrawLists (%d)", drawlist_count)) + { + Checkbox("Show ImDrawCmd mesh when hovering", &cfg->ShowDrawCmdMesh); + Checkbox("Show ImDrawCmd bounding boxes when hovering", &cfg->ShowDrawCmdBoundingBoxes); + for (ImGuiViewportP* viewport : g.Viewports) + { + bool viewport_has_drawlist = false; + for (ImDrawList* draw_list : viewport->DrawDataP.CmdLists) + { + if (!viewport_has_drawlist) + Text("Active DrawLists in Viewport #%d, ID: 0x%08X", viewport->Idx, viewport->ID); + viewport_has_drawlist = true; + DebugNodeDrawList(NULL, viewport, draw_list, "DrawList"); + } + } + TreePop(); + } + + // Viewports + if (TreeNode("Viewports", "Viewports (%d)", g.Viewports.Size)) + { + cfg->HighlightMonitorIdx = -1; + bool open = TreeNode("Monitors", "Monitors (%d)", g.PlatformIO.Monitors.Size); + SameLine(); + MetricsHelpMarker("Dear ImGui uses monitor data:\n- to query DPI settings on a per monitor basis\n- to position popup/tooltips so they don't straddle monitors."); + if (open) + { + for (int i = 0; i < g.PlatformIO.Monitors.Size; i++) + { + DebugNodePlatformMonitor(&g.PlatformIO.Monitors[i], "Monitor", i); + if (IsItemHovered()) + cfg->HighlightMonitorIdx = i; + } + DebugNodePlatformMonitor(&g.FallbackMonitor, "Fallback", 0); + TreePop(); + } + + SetNextItemOpen(true, ImGuiCond_Once); + if (TreeNode("Windows Minimap")) + { + RenderViewportsThumbnails(); + TreePop(); + } + cfg->HighlightViewportID = 0; + + BulletText("MouseViewport: 0x%08X (UserHovered 0x%08X, LastHovered 0x%08X)", g.MouseViewport ? g.MouseViewport->ID : 0, g.IO.MouseHoveredViewport, g.MouseLastHoveredViewport ? g.MouseLastHoveredViewport->ID : 0); + if (TreeNode("Inferred Z order (front-to-back)")) + { + static ImVector viewports; + viewports.resize(g.Viewports.Size); + memcpy(viewports.Data, g.Viewports.Data, g.Viewports.size_in_bytes()); + if (viewports.Size > 1) + ImQsort(viewports.Data, viewports.Size, sizeof(ImGuiViewport*), ViewportComparerByLastFocusedStampCount); + for (ImGuiViewportP* viewport : viewports) + { + BulletText("Viewport #%d, ID: 0x%08X, LastFocused = %08d, PlatformFocused = %s, Window: \"%s\"", + viewport->Idx, viewport->ID, viewport->LastFocusedStampCount, + (g.PlatformIO.Platform_GetWindowFocus && viewport->PlatformWindowCreated) ? (g.PlatformIO.Platform_GetWindowFocus(viewport) ? "1" : "0") : "N/A", + viewport->Window ? viewport->Window->Name : "N/A"); + if (IsItemHovered()) + cfg->HighlightViewportID = viewport->ID; + } + TreePop(); + } + + for (ImGuiViewportP* viewport : g.Viewports) + DebugNodeViewport(viewport); + TreePop(); + } + + // Details for Popups + if (TreeNode("Popups", "Popups (%d)", g.OpenPopupStack.Size)) + { + for (const ImGuiPopupData& popup_data : g.OpenPopupStack) + { + // As it's difficult to interact with tree nodes while popups are open, we display everything inline. + ImGuiWindow* window = popup_data.Window; + BulletText("PopupID: %08x, Window: '%s' (%s%s), RestoreNavWindow '%s', ParentWindow '%s'", + popup_data.PopupId, window ? window->Name : "NULL", window && (window->Flags & ImGuiWindowFlags_ChildWindow) ? "Child;" : "", window && (window->Flags & ImGuiWindowFlags_ChildMenu) ? "Menu;" : "", + popup_data.RestoreNavWindow ? popup_data.RestoreNavWindow->Name : "NULL", window && window->ParentWindow ? window->ParentWindow->Name : "NULL"); + } + TreePop(); + } + + // Details for TabBars + if (TreeNode("TabBars", "Tab Bars (%d)", g.TabBars.GetAliveCount())) + { + for (int n = 0; n < g.TabBars.GetMapSize(); n++) + if (ImGuiTabBar* tab_bar = g.TabBars.TryGetMapData(n)) + { + PushID(tab_bar); + DebugNodeTabBar(tab_bar, "TabBar"); + PopID(); + } + TreePop(); + } + + // Details for Tables + if (TreeNode("Tables", "Tables (%d)", g.Tables.GetAliveCount())) + { + for (int n = 0; n < g.Tables.GetMapSize(); n++) + if (ImGuiTable* table = g.Tables.TryGetMapData(n)) + DebugNodeTable(table); + TreePop(); + } + + // Details for Fonts + ImFontAtlas* atlas = g.IO.Fonts; + if (TreeNode("Fonts", "Fonts (%d)", atlas->Fonts.Size)) + { + ShowFontAtlas(atlas); + TreePop(); + } + + // Details for InputText + if (TreeNode("InputText")) + { + DebugNodeInputTextState(&g.InputTextState); + TreePop(); + } + + // Details for TypingSelect + if (TreeNode("TypingSelect", "TypingSelect (%d)", g.TypingSelectState.SearchBuffer[0] != 0 ? 1 : 0)) + { + DebugNodeTypingSelectState(&g.TypingSelectState); + TreePop(); + } + + // Details for MultiSelect + if (TreeNode("MultiSelect", "MultiSelect (%d)", g.MultiSelectStorage.GetAliveCount())) + { + ImGuiBoxSelectState* bs = &g.BoxSelectState; + BulletText("BoxSelect ID=0x%08X, Starting = %d, Active %d", bs->ID, bs->IsStarting, bs->IsActive); + for (int n = 0; n < g.MultiSelectStorage.GetMapSize(); n++) + if (ImGuiMultiSelectState* state = g.MultiSelectStorage.TryGetMapData(n)) + DebugNodeMultiSelectState(state); + TreePop(); + } + + // Details for Docking +#ifdef IMGUI_HAS_DOCK + if (TreeNode("Docking")) + { + static bool root_nodes_only = true; + ImGuiDockContext* dc = &g.DockContext; + Checkbox("List root nodes", &root_nodes_only); + Checkbox("Ctrl shows window dock info", &cfg->ShowDockingNodes); + if (SmallButton("Clear nodes")) { DockContextClearNodes(&g, 0, true); } + SameLine(); + if (SmallButton("Rebuild all")) { dc->WantFullRebuild = true; } + for (int n = 0; n < dc->Nodes.Data.Size; n++) + if (ImGuiDockNode* node = (ImGuiDockNode*)dc->Nodes.Data[n].val_p) + if (!root_nodes_only || node->IsRootNode()) + DebugNodeDockNode(node, "Node"); + TreePop(); + } +#endif // #ifdef IMGUI_HAS_DOCK + + // Settings + if (TreeNode("Settings")) + { + if (SmallButton("Clear")) + ClearIniSettings(); + SameLine(); + if (SmallButton("Save to memory")) + SaveIniSettingsToMemory(); + SameLine(); + if (SmallButton("Save to disk")) + SaveIniSettingsToDisk(g.IO.IniFilename); + SameLine(); + if (g.IO.IniFilename) + Text("\"%s\"", g.IO.IniFilename); + else + TextUnformatted(""); + Checkbox("io.ConfigDebugIniSettings", &io.ConfigDebugIniSettings); + Text("SettingsDirtyTimer %.2f", g.SettingsDirtyTimer); + if (TreeNode("SettingsHandlers", "Settings handlers: (%d)", g.SettingsHandlers.Size)) + { + for (ImGuiSettingsHandler& handler : g.SettingsHandlers) + BulletText("\"%s\"", handler.TypeName); + TreePop(); + } + if (TreeNode("SettingsWindows", "Settings packed data: Windows: %d bytes", g.SettingsWindows.size())) + { + for (ImGuiWindowSettings* settings = g.SettingsWindows.begin(); settings != NULL; settings = g.SettingsWindows.next_chunk(settings)) + DebugNodeWindowSettings(settings); + TreePop(); + } + + if (TreeNode("SettingsTables", "Settings packed data: Tables: %d bytes", g.SettingsTables.size())) + { + for (ImGuiTableSettings* settings = g.SettingsTables.begin(); settings != NULL; settings = g.SettingsTables.next_chunk(settings)) + DebugNodeTableSettings(settings); + TreePop(); + } + +#ifdef IMGUI_HAS_DOCK + if (TreeNode("SettingsDocking", "Settings packed data: Docking")) + { + ImGuiDockContext* dc = &g.DockContext; + Text("In SettingsWindows:"); + for (ImGuiWindowSettings* settings = g.SettingsWindows.begin(); settings != NULL; settings = g.SettingsWindows.next_chunk(settings)) + if (settings->DockId != 0) + BulletText("Window '%s' -> DockId %08X DockOrder=%d", settings->GetName(), settings->DockId, settings->DockOrder); + Text("In SettingsNodes:"); + for (int n = 0; n < dc->NodesSettings.Size; n++) + { + ImGuiDockNodeSettings* settings = &dc->NodesSettings[n]; + const char* selected_tab_name = NULL; + if (settings->SelectedTabId) + { + if (ImGuiWindow* window = FindWindowByID(settings->SelectedTabId)) + selected_tab_name = window->Name; + else if (ImGuiWindowSettings* window_settings = FindWindowSettingsByID(settings->SelectedTabId)) + selected_tab_name = window_settings->GetName(); + } + BulletText("Node %08X, Parent %08X, SelectedTab %08X ('%s')", settings->ID, settings->ParentNodeId, settings->SelectedTabId, selected_tab_name ? selected_tab_name : settings->SelectedTabId ? "N/A" : ""); + } + TreePop(); + } +#endif // #ifdef IMGUI_HAS_DOCK + + if (TreeNode("SettingsIniData", "Settings unpacked data (.ini): %d bytes", g.SettingsIniData.size())) + { + InputTextMultiline("##Ini", (char*)(void*)g.SettingsIniData.c_str(), g.SettingsIniData.Buf.Size, ImVec2(-FLT_MIN, GetTextLineHeight() * 20), ImGuiInputTextFlags_ReadOnly); + TreePop(); + } + TreePop(); + } + + // Settings + if (TreeNode("Memory allocations")) + { + ImGuiDebugAllocInfo* info = &g.DebugAllocInfo; + Text("%d current allocations", info->TotalAllocCount - info->TotalFreeCount); + if (SmallButton("GC now")) { g.GcCompactAll = true; } + Text("Recent frames with allocations:"); + int buf_size = IM_ARRAYSIZE(info->LastEntriesBuf); + for (int n = buf_size - 1; n >= 0; n--) + { + ImGuiDebugAllocEntry* entry = &info->LastEntriesBuf[(info->LastEntriesIdx - n + buf_size) % buf_size]; + BulletText("Frame %06d: %+3d ( %2d alloc, %2d free )", entry->FrameCount, entry->AllocCount - entry->FreeCount, entry->AllocCount, entry->FreeCount); + if (n == 0) + { + SameLine(); + Text("<- %d frames ago", g.FrameCount - entry->FrameCount); + } + } + TreePop(); + } + + if (TreeNode("Inputs")) + { + Text("KEYBOARD/GAMEPAD/MOUSE KEYS"); + { + // User code should never have to go through such hoops! You can generally iterate between ImGuiKey_NamedKey_BEGIN and ImGuiKey_NamedKey_END. + Indent(); + Text("Keys down:"); for (ImGuiKey key = ImGuiKey_NamedKey_BEGIN; key < ImGuiKey_NamedKey_END; key = (ImGuiKey)(key + 1)) { if (!IsKeyDown(key)) continue; SameLine(); Text(IsNamedKey(key) ? "\"%s\"" : "\"%s\" %d", GetKeyName(key), key); SameLine(); Text("(%.02f)", GetKeyData(key)->DownDuration); } + Text("Keys pressed:"); for (ImGuiKey key = ImGuiKey_NamedKey_BEGIN; key < ImGuiKey_NamedKey_END; key = (ImGuiKey)(key + 1)) { if (!IsKeyPressed(key)) continue; SameLine(); Text(IsNamedKey(key) ? "\"%s\"" : "\"%s\" %d", GetKeyName(key), key); } + Text("Keys released:"); for (ImGuiKey key = ImGuiKey_NamedKey_BEGIN; key < ImGuiKey_NamedKey_END; key = (ImGuiKey)(key + 1)) { if (!IsKeyReleased(key)) continue; SameLine(); Text(IsNamedKey(key) ? "\"%s\"" : "\"%s\" %d", GetKeyName(key), key); } + Text("Keys mods: %s%s%s%s", io.KeyCtrl ? "CTRL " : "", io.KeyShift ? "SHIFT " : "", io.KeyAlt ? "ALT " : "", io.KeySuper ? "SUPER " : ""); + Text("Chars queue:"); for (int i = 0; i < io.InputQueueCharacters.Size; i++) { ImWchar c = io.InputQueueCharacters[i]; SameLine(); Text("\'%c\' (0x%04X)", (c > ' ' && c <= 255) ? (char)c : '?', c); } // FIXME: We should convert 'c' to UTF-8 here but the functions are not public. + DebugRenderKeyboardPreview(GetWindowDrawList()); + Unindent(); + } + + Text("MOUSE STATE"); + { + Indent(); + if (IsMousePosValid()) + Text("Mouse pos: (%g, %g)", io.MousePos.x, io.MousePos.y); + else + Text("Mouse pos: "); + Text("Mouse delta: (%g, %g)", io.MouseDelta.x, io.MouseDelta.y); + int count = IM_ARRAYSIZE(io.MouseDown); + Text("Mouse down:"); for (int i = 0; i < count; i++) if (IsMouseDown(i)) { SameLine(); Text("b%d (%.02f secs)", i, io.MouseDownDuration[i]); } + Text("Mouse clicked:"); for (int i = 0; i < count; i++) if (IsMouseClicked(i)) { SameLine(); Text("b%d (%d)", i, io.MouseClickedCount[i]); } + Text("Mouse released:"); for (int i = 0; i < count; i++) if (IsMouseReleased(i)) { SameLine(); Text("b%d", i); } + Text("Mouse wheel: %.1f", io.MouseWheel); + Text("MouseStationaryTimer: %.2f", g.MouseStationaryTimer); + Text("Mouse source: %s", GetMouseSourceName(io.MouseSource)); + Text("Pen Pressure: %.1f", io.PenPressure); // Note: currently unused + Unindent(); + } + + Text("MOUSE WHEELING"); + { + Indent(); + Text("WheelingWindow: '%s'", g.WheelingWindow ? g.WheelingWindow->Name : "NULL"); + Text("WheelingWindowReleaseTimer: %.2f", g.WheelingWindowReleaseTimer); + Text("WheelingAxisAvg[] = { %.3f, %.3f }, Main Axis: %s", g.WheelingAxisAvg.x, g.WheelingAxisAvg.y, (g.WheelingAxisAvg.x > g.WheelingAxisAvg.y) ? "X" : (g.WheelingAxisAvg.x < g.WheelingAxisAvg.y) ? "Y" : ""); + Unindent(); + } + + Text("KEY OWNERS"); + { + Indent(); + if (BeginChild("##owners", ImVec2(-FLT_MIN, GetTextLineHeightWithSpacing() * 8), ImGuiChildFlags_FrameStyle | ImGuiChildFlags_ResizeY, ImGuiWindowFlags_NoSavedSettings)) + for (ImGuiKey key = ImGuiKey_NamedKey_BEGIN; key < ImGuiKey_NamedKey_END; key = (ImGuiKey)(key + 1)) + { + ImGuiKeyOwnerData* owner_data = GetKeyOwnerData(&g, key); + if (owner_data->OwnerCurr == ImGuiKeyOwner_NoOwner) + continue; + Text("%s: 0x%08X%s", GetKeyName(key), owner_data->OwnerCurr, + owner_data->LockUntilRelease ? " LockUntilRelease" : owner_data->LockThisFrame ? " LockThisFrame" : ""); + DebugLocateItemOnHover(owner_data->OwnerCurr); + } + EndChild(); + Unindent(); + } + Text("SHORTCUT ROUTING"); + SameLine(); + MetricsHelpMarker("Declared shortcut routes automatically set key owner when mods matches."); + { + Indent(); + if (BeginChild("##routes", ImVec2(-FLT_MIN, GetTextLineHeightWithSpacing() * 8), ImGuiChildFlags_FrameStyle | ImGuiChildFlags_ResizeY, ImGuiWindowFlags_NoSavedSettings)) + for (ImGuiKey key = ImGuiKey_NamedKey_BEGIN; key < ImGuiKey_NamedKey_END; key = (ImGuiKey)(key + 1)) + { + ImGuiKeyRoutingTable* rt = &g.KeysRoutingTable; + for (ImGuiKeyRoutingIndex idx = rt->Index[key - ImGuiKey_NamedKey_BEGIN]; idx != -1; ) + { + ImGuiKeyRoutingData* routing_data = &rt->Entries[idx]; + ImGuiKeyChord key_chord = key | routing_data->Mods; + Text("%s: 0x%08X (scored %d)", GetKeyChordName(key_chord), routing_data->RoutingCurr, routing_data->RoutingCurrScore); + DebugLocateItemOnHover(routing_data->RoutingCurr); + if (g.IO.ConfigDebugIsDebuggerPresent) + { + SameLine(); + if (DebugBreakButton("**DebugBreak**", "in SetShortcutRouting() for this KeyChord")) + g.DebugBreakInShortcutRouting = key_chord; + } + idx = routing_data->NextEntryIndex; + } + } + EndChild(); + Text("(ActiveIdUsing: AllKeyboardKeys: %d, NavDirMask: 0x%X)", g.ActiveIdUsingAllKeyboardKeys, g.ActiveIdUsingNavDirMask); + Unindent(); + } + TreePop(); + } + + if (TreeNode("Internal state")) + { + Text("WINDOWING"); + Indent(); + Text("HoveredWindow: '%s'", g.HoveredWindow ? g.HoveredWindow->Name : "NULL"); + Text("HoveredWindow->Root: '%s'", g.HoveredWindow ? g.HoveredWindow->RootWindowDockTree->Name : "NULL"); + Text("HoveredWindowUnderMovingWindow: '%s'", g.HoveredWindowUnderMovingWindow ? g.HoveredWindowUnderMovingWindow->Name : "NULL"); + Text("HoveredDockNode: 0x%08X", g.DebugHoveredDockNode ? g.DebugHoveredDockNode->ID : 0); + Text("MovingWindow: '%s'", g.MovingWindow ? g.MovingWindow->Name : "NULL"); + Text("MouseViewport: 0x%08X (UserHovered 0x%08X, LastHovered 0x%08X)", g.MouseViewport->ID, g.IO.MouseHoveredViewport, g.MouseLastHoveredViewport ? g.MouseLastHoveredViewport->ID : 0); + Unindent(); + + Text("ITEMS"); + Indent(); + Text("ActiveId: 0x%08X/0x%08X (%.2f sec), AllowOverlap: %d, Source: %s", g.ActiveId, g.ActiveIdPreviousFrame, g.ActiveIdTimer, g.ActiveIdAllowOverlap, GetInputSourceName(g.ActiveIdSource)); + DebugLocateItemOnHover(g.ActiveId); + Text("ActiveIdWindow: '%s'", g.ActiveIdWindow ? g.ActiveIdWindow->Name : "NULL"); + Text("ActiveIdUsing: AllKeyboardKeys: %d, NavDirMask: %X", g.ActiveIdUsingAllKeyboardKeys, g.ActiveIdUsingNavDirMask); + Text("HoveredId: 0x%08X (%.2f sec), AllowOverlap: %d", g.HoveredIdPreviousFrame, g.HoveredIdTimer, g.HoveredIdAllowOverlap); // Not displaying g.HoveredId as it is update mid-frame + Text("HoverItemDelayId: 0x%08X, Timer: %.2f, ClearTimer: %.2f", g.HoverItemDelayId, g.HoverItemDelayTimer, g.HoverItemDelayClearTimer); + Text("DragDrop: %d, SourceId = 0x%08X, Payload \"%s\" (%d bytes)", g.DragDropActive, g.DragDropPayload.SourceId, g.DragDropPayload.DataType, g.DragDropPayload.DataSize); + DebugLocateItemOnHover(g.DragDropPayload.SourceId); + Unindent(); + + Text("NAV,FOCUS"); + Indent(); + Text("NavWindow: '%s'", g.NavWindow ? g.NavWindow->Name : "NULL"); + Text("NavId: 0x%08X, NavLayer: %d", g.NavId, g.NavLayer); + DebugLocateItemOnHover(g.NavId); + Text("NavInputSource: %s", GetInputSourceName(g.NavInputSource)); + Text("NavLastValidSelectionUserData = %" IM_PRId64 " (0x%" IM_PRIX64 ")", g.NavLastValidSelectionUserData, g.NavLastValidSelectionUserData); + Text("NavActive: %d, NavVisible: %d", g.IO.NavActive, g.IO.NavVisible); + Text("NavActivateId/DownId/PressedId: %08X/%08X/%08X", g.NavActivateId, g.NavActivateDownId, g.NavActivatePressedId); + Text("NavActivateFlags: %04X", g.NavActivateFlags); + Text("NavCursorVisible: %d, NavHighlightItemUnderNav: %d", g.NavCursorVisible, g.NavHighlightItemUnderNav); + Text("NavFocusScopeId = 0x%08X", g.NavFocusScopeId); + Text("NavFocusRoute[] = "); + for (int path_n = g.NavFocusRoute.Size - 1; path_n >= 0; path_n--) + { + const ImGuiFocusScopeData& focus_scope = g.NavFocusRoute[path_n]; + SameLine(0.0f, 0.0f); + Text("0x%08X/", focus_scope.ID); + SetItemTooltip("In window \"%s\"", FindWindowByID(focus_scope.WindowID)->Name); + } + Text("NavWindowingTarget: '%s'", g.NavWindowingTarget ? g.NavWindowingTarget->Name : "NULL"); + Unindent(); + + TreePop(); + } + + // Overlay: Display windows Rectangles and Begin Order + if (cfg->ShowWindowsRects || cfg->ShowWindowsBeginOrder) + { + for (ImGuiWindow* window : g.Windows) { - ImGuiWindow* window = g.Windows[n]; if (!window->WasActive) continue; ImDrawList* draw_list = GetForegroundDrawList(window); - if (show_windows_rects) + if (cfg->ShowWindowsRects) { - ImRect r = Funcs::GetWindowRect(window, show_windows_rect_type); + ImRect r = Funcs::GetWindowRect(window, cfg->ShowWindowsRectsType); draw_list->AddRect(r.Min, r.Max, IM_COL32(255, 0, 128, 255)); } - if (show_windows_begin_order && !(window->Flags & ImGuiWindowFlags_ChildWindow)) + if (cfg->ShowWindowsBeginOrder && !(window->Flags & ImGuiWindowFlags_ChildWindow)) { char buf[32]; ImFormatString(buf, IM_ARRAYSIZE(buf), "%d", window->BeginOrderWithinContext); - float font_size = ImGui::GetFontSize(); + float font_size = GetFontSize(); draw_list->AddRectFilled(window->Pos, window->Pos + ImVec2(font_size, font_size), IM_COL32(200, 100, 100, 255)); draw_list->AddText(window->Pos, IM_COL32(255, 255, 255, 255), buf); } } } - ImGui::End(); + + // Overlay: Display Tables Rectangles + if (cfg->ShowTablesRects) + { + for (int table_n = 0; table_n < g.Tables.GetMapSize(); table_n++) + { + ImGuiTable* table = g.Tables.TryGetMapData(table_n); + if (table == NULL || table->LastFrameActive < g.FrameCount - 1) + continue; + ImDrawList* draw_list = GetForegroundDrawList(table->OuterWindow); + if (cfg->ShowTablesRectsType >= TRT_ColumnsRect) + { + for (int column_n = 0; column_n < table->ColumnsCount; column_n++) + { + ImRect r = Funcs::GetTableRect(table, cfg->ShowTablesRectsType, column_n); + ImU32 col = (table->HoveredColumnBody == column_n) ? IM_COL32(255, 255, 128, 255) : IM_COL32(255, 0, 128, 255); + float thickness = (table->HoveredColumnBody == column_n) ? 3.0f : 1.0f; + draw_list->AddRect(r.Min, r.Max, col, 0.0f, 0, thickness); + } + } + else + { + ImRect r = Funcs::GetTableRect(table, cfg->ShowTablesRectsType, -1); + draw_list->AddRect(r.Min, r.Max, IM_COL32(255, 0, 128, 255)); + } + } + } + +#ifdef IMGUI_HAS_DOCK + // Overlay: Display Docking info + if (cfg->ShowDockingNodes && g.IO.KeyCtrl && g.DebugHoveredDockNode) + { + char buf[64] = ""; + char* p = buf; + ImGuiDockNode* node = g.DebugHoveredDockNode; + ImDrawList* overlay_draw_list = node->HostWindow ? GetForegroundDrawList(node->HostWindow) : GetForegroundDrawList(GetMainViewport()); + p += ImFormatString(p, buf + IM_ARRAYSIZE(buf) - p, "DockId: %X%s\n", node->ID, node->IsCentralNode() ? " *CentralNode*" : ""); + p += ImFormatString(p, buf + IM_ARRAYSIZE(buf) - p, "WindowClass: %08X\n", node->WindowClass.ClassId); + p += ImFormatString(p, buf + IM_ARRAYSIZE(buf) - p, "Size: (%.0f, %.0f)\n", node->Size.x, node->Size.y); + p += ImFormatString(p, buf + IM_ARRAYSIZE(buf) - p, "SizeRef: (%.0f, %.0f)\n", node->SizeRef.x, node->SizeRef.y); + int depth = DockNodeGetDepth(node); + overlay_draw_list->AddRect(node->Pos + ImVec2(3, 3) * (float)depth, node->Pos + node->Size - ImVec2(3, 3) * (float)depth, IM_COL32(200, 100, 100, 255)); + ImVec2 pos = node->Pos + ImVec2(3, 3) * (float)depth; + overlay_draw_list->AddRectFilled(pos - ImVec2(1, 1), pos + CalcTextSize(buf) + ImVec2(1, 1), IM_COL32(200, 100, 100, 255)); + overlay_draw_list->AddText(NULL, 0.0f, pos, IM_COL32(255, 255, 255, 255), buf); + } +#endif // #ifdef IMGUI_HAS_DOCK + + End(); +} + +void ImGui::DebugBreakClearData() +{ + // Those fields are scattered in their respective subsystem to stay in hot-data locations + ImGuiContext& g = *GImGui; + g.DebugBreakInWindow = 0; + g.DebugBreakInTable = 0; + g.DebugBreakInShortcutRouting = ImGuiKey_None; +} + +void ImGui::DebugBreakButtonTooltip(bool keyboard_only, const char* description_of_location) +{ + if (!BeginItemTooltip()) + return; + Text("To call IM_DEBUG_BREAK() %s:", description_of_location); + Separator(); + TextUnformatted(keyboard_only ? "- Press 'Pause/Break' on keyboard." : "- Press 'Pause/Break' on keyboard.\n- or Click (may alter focus/active id).\n- or navigate using keyboard and press space."); + Separator(); + TextUnformatted("Choose one way that doesn't interfere with what you are trying to debug!\nYou need a debugger attached or this will crash!"); + EndTooltip(); +} + +// Special button that doesn't take focus, doesn't take input owner, and can be activated without a click etc. +// In order to reduce interferences with the contents we are trying to debug into. +bool ImGui::DebugBreakButton(const char* label, const char* description_of_location) +{ + ImGuiWindow* window = GetCurrentWindow(); + if (window->SkipItems) + return false; + + ImGuiContext& g = *GImGui; + const ImGuiID id = window->GetID(label); + const ImVec2 label_size = CalcTextSize(label, NULL, true); + ImVec2 pos = window->DC.CursorPos + ImVec2(0.0f, window->DC.CurrLineTextBaseOffset); + ImVec2 size = ImVec2(label_size.x + g.Style.FramePadding.x * 2.0f, label_size.y); + + const ImRect bb(pos, pos + size); + ItemSize(size, 0.0f); + if (!ItemAdd(bb, id)) + return false; + + // WE DO NOT USE ButtonEx() or ButtonBehavior() in order to reduce our side-effects. + bool hovered = ItemHoverable(bb, id, g.CurrentItemFlags); + bool pressed = hovered && (IsKeyChordPressed(g.DebugBreakKeyChord) || IsMouseClicked(0) || g.NavActivateId == id); + DebugBreakButtonTooltip(false, description_of_location); + + ImVec4 col4f = GetStyleColorVec4(hovered ? ImGuiCol_ButtonHovered : ImGuiCol_Button); + ImVec4 hsv; + ColorConvertRGBtoHSV(col4f.x, col4f.y, col4f.z, hsv.x, hsv.y, hsv.z); + ColorConvertHSVtoRGB(hsv.x + 0.20f, hsv.y, hsv.z, col4f.x, col4f.y, col4f.z); + + RenderNavCursor(bb, id); + RenderFrame(bb.Min, bb.Max, GetColorU32(col4f), true, g.Style.FrameRounding); + RenderTextClipped(bb.Min, bb.Max, label, NULL, &label_size, g.Style.ButtonTextAlign, &bb); + + IMGUI_TEST_ENGINE_ITEM_INFO(id, label, g.LastItemData.StatusFlags); + return pressed; +} + +// [DEBUG] Display contents of Columns +void ImGui::DebugNodeColumns(ImGuiOldColumns* columns) +{ + if (!TreeNode((void*)(uintptr_t)columns->ID, "Columns Id: 0x%08X, Count: %d, Flags: 0x%04X", columns->ID, columns->Count, columns->Flags)) + return; + BulletText("Width: %.1f (MinX: %.1f, MaxX: %.1f)", columns->OffMaxX - columns->OffMinX, columns->OffMinX, columns->OffMaxX); + for (ImGuiOldColumnData& column : columns->Columns) + BulletText("Column %02d: OffsetNorm %.3f (= %.1f px)", (int)columns->Columns.index_from_ptr(&column), column.OffsetNorm, GetColumnOffsetFromNorm(columns, column.OffsetNorm)); + TreePop(); +} + +static void DebugNodeDockNodeFlags(ImGuiDockNodeFlags* p_flags, const char* label, bool enabled) +{ + using namespace ImGui; + PushID(label); + PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0.0f, 0.0f)); + Text("%s:", label); + if (!enabled) + BeginDisabled(); + CheckboxFlags("NoResize", p_flags, ImGuiDockNodeFlags_NoResize); + CheckboxFlags("NoResizeX", p_flags, ImGuiDockNodeFlags_NoResizeX); + CheckboxFlags("NoResizeY",p_flags, ImGuiDockNodeFlags_NoResizeY); + CheckboxFlags("NoTabBar", p_flags, ImGuiDockNodeFlags_NoTabBar); + CheckboxFlags("HiddenTabBar", p_flags, ImGuiDockNodeFlags_HiddenTabBar); + CheckboxFlags("NoWindowMenuButton", p_flags, ImGuiDockNodeFlags_NoWindowMenuButton); + CheckboxFlags("NoCloseButton", p_flags, ImGuiDockNodeFlags_NoCloseButton); + CheckboxFlags("DockedWindowsInFocusRoute", p_flags, ImGuiDockNodeFlags_DockedWindowsInFocusRoute); + CheckboxFlags("NoDocking", p_flags, ImGuiDockNodeFlags_NoDocking); // Multiple flags + CheckboxFlags("NoDockingSplit", p_flags, ImGuiDockNodeFlags_NoDockingSplit); + CheckboxFlags("NoDockingSplitOther", p_flags, ImGuiDockNodeFlags_NoDockingSplitOther); + CheckboxFlags("NoDockingOver", p_flags, ImGuiDockNodeFlags_NoDockingOverMe); + CheckboxFlags("NoDockingOverOther", p_flags, ImGuiDockNodeFlags_NoDockingOverOther); + CheckboxFlags("NoDockingOverEmpty", p_flags, ImGuiDockNodeFlags_NoDockingOverEmpty); + CheckboxFlags("NoUndocking", p_flags, ImGuiDockNodeFlags_NoUndocking); + if (!enabled) + EndDisabled(); + PopStyleVar(); + PopID(); +} + +// [DEBUG] Display contents of ImDockNode +void ImGui::DebugNodeDockNode(ImGuiDockNode* node, const char* label) +{ + ImGuiContext& g = *GImGui; + const bool is_alive = (g.FrameCount - node->LastFrameAlive < 2); // Submitted with ImGuiDockNodeFlags_KeepAliveOnly + const bool is_active = (g.FrameCount - node->LastFrameActive < 2); // Submitted + if (!is_alive) { PushStyleColor(ImGuiCol_Text, GetStyleColorVec4(ImGuiCol_TextDisabled)); } + bool open; + ImGuiTreeNodeFlags tree_node_flags = node->IsFocused ? ImGuiTreeNodeFlags_Selected : ImGuiTreeNodeFlags_None; + if (node->Windows.Size > 0) + open = TreeNodeEx((void*)(intptr_t)node->ID, tree_node_flags, "%s 0x%04X%s: %d windows (vis: '%s')", label, node->ID, node->IsVisible ? "" : " (hidden)", node->Windows.Size, node->VisibleWindow ? node->VisibleWindow->Name : "NULL"); + else + open = TreeNodeEx((void*)(intptr_t)node->ID, tree_node_flags, "%s 0x%04X%s: %s (vis: '%s')", label, node->ID, node->IsVisible ? "" : " (hidden)", (node->SplitAxis == ImGuiAxis_X) ? "horizontal split" : (node->SplitAxis == ImGuiAxis_Y) ? "vertical split" : "empty", node->VisibleWindow ? node->VisibleWindow->Name : "NULL"); + if (!is_alive) { PopStyleColor(); } + if (is_active && IsItemHovered()) + if (ImGuiWindow* window = node->HostWindow ? node->HostWindow : node->VisibleWindow) + GetForegroundDrawList(window)->AddRect(node->Pos, node->Pos + node->Size, IM_COL32(255, 255, 0, 255)); + if (open) + { + IM_ASSERT(node->ChildNodes[0] == NULL || node->ChildNodes[0]->ParentNode == node); + IM_ASSERT(node->ChildNodes[1] == NULL || node->ChildNodes[1]->ParentNode == node); + BulletText("Pos (%.0f,%.0f), Size (%.0f, %.0f) Ref (%.0f, %.0f)", + node->Pos.x, node->Pos.y, node->Size.x, node->Size.y, node->SizeRef.x, node->SizeRef.y); + DebugNodeWindow(node->HostWindow, "HostWindow"); + DebugNodeWindow(node->VisibleWindow, "VisibleWindow"); + BulletText("SelectedTabID: 0x%08X, LastFocusedNodeID: 0x%08X", node->SelectedTabId, node->LastFocusedNodeId); + BulletText("Misc:%s%s%s%s%s%s%s", + node->IsDockSpace() ? " IsDockSpace" : "", + node->IsCentralNode() ? " IsCentralNode" : "", + is_alive ? " IsAlive" : "", is_active ? " IsActive" : "", node->IsFocused ? " IsFocused" : "", + node->WantLockSizeOnce ? " WantLockSizeOnce" : "", + node->HasCentralNodeChild ? " HasCentralNodeChild" : ""); + if (TreeNode("flags", "Flags Merged: 0x%04X, Local: 0x%04X, InWindows: 0x%04X, Shared: 0x%04X", node->MergedFlags, node->LocalFlags, node->LocalFlagsInWindows, node->SharedFlags)) + { + if (BeginTable("flags", 4)) + { + TableNextColumn(); DebugNodeDockNodeFlags(&node->MergedFlags, "MergedFlags", false); + TableNextColumn(); DebugNodeDockNodeFlags(&node->LocalFlags, "LocalFlags", true); + TableNextColumn(); DebugNodeDockNodeFlags(&node->LocalFlagsInWindows, "LocalFlagsInWindows", false); + TableNextColumn(); DebugNodeDockNodeFlags(&node->SharedFlags, "SharedFlags", true); + EndTable(); + } + TreePop(); + } + if (node->ParentNode) + DebugNodeDockNode(node->ParentNode, "ParentNode"); + if (node->ChildNodes[0]) + DebugNodeDockNode(node->ChildNodes[0], "Child[0]"); + if (node->ChildNodes[1]) + DebugNodeDockNode(node->ChildNodes[1], "Child[1]"); + if (node->TabBar) + DebugNodeTabBar(node->TabBar, "TabBar"); + DebugNodeWindowsList(&node->Windows, "Windows"); + + TreePop(); + } +} + +// [DEBUG] Display contents of ImDrawList +// Note that both 'window' and 'viewport' may be NULL here. Viewport is generally null of destroyed popups which previously owned a viewport. +void ImGui::DebugNodeDrawList(ImGuiWindow* window, ImGuiViewportP* viewport, const ImDrawList* draw_list, const char* label) +{ + ImGuiContext& g = *GImGui; + ImGuiMetricsConfig* cfg = &g.DebugMetricsConfig; + int cmd_count = draw_list->CmdBuffer.Size; + if (cmd_count > 0 && draw_list->CmdBuffer.back().ElemCount == 0 && draw_list->CmdBuffer.back().UserCallback == NULL) + cmd_count--; + bool node_open = TreeNode(draw_list, "%s: '%s' %d vtx, %d indices, %d cmds", label, draw_list->_OwnerName ? draw_list->_OwnerName : "", draw_list->VtxBuffer.Size, draw_list->IdxBuffer.Size, cmd_count); + if (draw_list == GetWindowDrawList()) + { + SameLine(); + TextColored(ImVec4(1.0f, 0.4f, 0.4f, 1.0f), "CURRENTLY APPENDING"); // Can't display stats for active draw list! (we don't have the data double-buffered) + if (node_open) + TreePop(); + return; + } + + ImDrawList* fg_draw_list = viewport ? GetForegroundDrawList(viewport) : NULL; // Render additional visuals into the top-most draw list + if (window && IsItemHovered() && fg_draw_list) + fg_draw_list->AddRect(window->Pos, window->Pos + window->Size, IM_COL32(255, 255, 0, 255)); + if (!node_open) + return; + + if (window && !window->WasActive) + TextDisabled("Warning: owning Window is inactive. This DrawList is not being rendered!"); + + for (const ImDrawCmd* pcmd = draw_list->CmdBuffer.Data; pcmd < draw_list->CmdBuffer.Data + cmd_count; pcmd++) + { + if (pcmd->UserCallback) + { + BulletText("Callback %p, user_data %p", pcmd->UserCallback, pcmd->UserCallbackData); + continue; + } + + char texid_desc[20]; + FormatTextureIDForDebugDisplay(texid_desc, IM_ARRAYSIZE(texid_desc), pcmd->TextureId); + char buf[300]; + ImFormatString(buf, IM_ARRAYSIZE(buf), "DrawCmd:%5d tris, Tex %s, ClipRect (%4.0f,%4.0f)-(%4.0f,%4.0f)", + pcmd->ElemCount / 3, texid_desc, pcmd->ClipRect.x, pcmd->ClipRect.y, pcmd->ClipRect.z, pcmd->ClipRect.w); + bool pcmd_node_open = TreeNode((void*)(pcmd - draw_list->CmdBuffer.begin()), "%s", buf); + if (IsItemHovered() && (cfg->ShowDrawCmdMesh || cfg->ShowDrawCmdBoundingBoxes) && fg_draw_list) + DebugNodeDrawCmdShowMeshAndBoundingBox(fg_draw_list, draw_list, pcmd, cfg->ShowDrawCmdMesh, cfg->ShowDrawCmdBoundingBoxes); + if (!pcmd_node_open) + continue; + + // Calculate approximate coverage area (touched pixel count) + // This will be in pixels squared as long there's no post-scaling happening to the renderer output. + const ImDrawIdx* idx_buffer = (draw_list->IdxBuffer.Size > 0) ? draw_list->IdxBuffer.Data : NULL; + const ImDrawVert* vtx_buffer = draw_list->VtxBuffer.Data + pcmd->VtxOffset; + float total_area = 0.0f; + for (unsigned int idx_n = pcmd->IdxOffset; idx_n < pcmd->IdxOffset + pcmd->ElemCount; ) + { + ImVec2 triangle[3]; + for (int n = 0; n < 3; n++, idx_n++) + triangle[n] = vtx_buffer[idx_buffer ? idx_buffer[idx_n] : idx_n].pos; + total_area += ImTriangleArea(triangle[0], triangle[1], triangle[2]); + } + + // Display vertex information summary. Hover to get all triangles drawn in wire-frame + ImFormatString(buf, IM_ARRAYSIZE(buf), "Mesh: ElemCount: %d, VtxOffset: +%d, IdxOffset: +%d, Area: ~%0.f px", pcmd->ElemCount, pcmd->VtxOffset, pcmd->IdxOffset, total_area); + Selectable(buf); + if (IsItemHovered() && fg_draw_list) + DebugNodeDrawCmdShowMeshAndBoundingBox(fg_draw_list, draw_list, pcmd, true, false); + + // Display individual triangles/vertices. Hover on to get the corresponding triangle highlighted. + ImGuiListClipper clipper; + clipper.Begin(pcmd->ElemCount / 3); // Manually coarse clip our print out of individual vertices to save CPU, only items that may be visible. + while (clipper.Step()) + for (int prim = clipper.DisplayStart, idx_i = pcmd->IdxOffset + clipper.DisplayStart * 3; prim < clipper.DisplayEnd; prim++) + { + char* buf_p = buf, * buf_end = buf + IM_ARRAYSIZE(buf); + ImVec2 triangle[3]; + for (int n = 0; n < 3; n++, idx_i++) + { + const ImDrawVert& v = vtx_buffer[idx_buffer ? idx_buffer[idx_i] : idx_i]; + triangle[n] = v.pos; + buf_p += ImFormatString(buf_p, buf_end - buf_p, "%s %04d: pos (%8.2f,%8.2f), uv (%.6f,%.6f), col %08X\n", + (n == 0) ? "Vert:" : " ", idx_i, v.pos.x, v.pos.y, v.uv.x, v.uv.y, v.col); + } + + Selectable(buf, false); + if (fg_draw_list && IsItemHovered()) + { + ImDrawListFlags backup_flags = fg_draw_list->Flags; + fg_draw_list->Flags &= ~ImDrawListFlags_AntiAliasedLines; // Disable AA on triangle outlines is more readable for very large and thin triangles. + fg_draw_list->AddPolyline(triangle, 3, IM_COL32(255, 255, 0, 255), ImDrawFlags_Closed, 1.0f); + fg_draw_list->Flags = backup_flags; + } + } + TreePop(); + } + TreePop(); +} + +// [DEBUG] Display mesh/aabb of a ImDrawCmd +void ImGui::DebugNodeDrawCmdShowMeshAndBoundingBox(ImDrawList* out_draw_list, const ImDrawList* draw_list, const ImDrawCmd* draw_cmd, bool show_mesh, bool show_aabb) +{ + IM_ASSERT(show_mesh || show_aabb); + + // Draw wire-frame version of all triangles + ImRect clip_rect = draw_cmd->ClipRect; + ImRect vtxs_rect(FLT_MAX, FLT_MAX, -FLT_MAX, -FLT_MAX); + ImDrawListFlags backup_flags = out_draw_list->Flags; + out_draw_list->Flags &= ~ImDrawListFlags_AntiAliasedLines; // Disable AA on triangle outlines is more readable for very large and thin triangles. + for (unsigned int idx_n = draw_cmd->IdxOffset, idx_end = draw_cmd->IdxOffset + draw_cmd->ElemCount; idx_n < idx_end; ) + { + ImDrawIdx* idx_buffer = (draw_list->IdxBuffer.Size > 0) ? draw_list->IdxBuffer.Data : NULL; // We don't hold on those pointers past iterations as ->AddPolyline() may invalidate them if out_draw_list==draw_list + ImDrawVert* vtx_buffer = draw_list->VtxBuffer.Data + draw_cmd->VtxOffset; + + ImVec2 triangle[3]; + for (int n = 0; n < 3; n++, idx_n++) + vtxs_rect.Add((triangle[n] = vtx_buffer[idx_buffer ? idx_buffer[idx_n] : idx_n].pos)); + if (show_mesh) + out_draw_list->AddPolyline(triangle, 3, IM_COL32(255, 255, 0, 255), ImDrawFlags_Closed, 1.0f); // In yellow: mesh triangles + } + // Draw bounding boxes + if (show_aabb) + { + out_draw_list->AddRect(ImTrunc(clip_rect.Min), ImTrunc(clip_rect.Max), IM_COL32(255, 0, 255, 255)); // In pink: clipping rectangle submitted to GPU + out_draw_list->AddRect(ImTrunc(vtxs_rect.Min), ImTrunc(vtxs_rect.Max), IM_COL32(0, 255, 255, 255)); // In cyan: bounding box of triangles + } + out_draw_list->Flags = backup_flags; +} + +// [DEBUG] Display details for a single font, called by ShowStyleEditor(). +void ImGui::DebugNodeFont(ImFont* font) +{ + bool opened = TreeNode(font, "Font: \"%s\": %.2f px, %d glyphs, %d sources(s)", + font->Sources ? font->Sources[0].Name : "", font->FontSize, font->Glyphs.Size, font->SourcesCount); + + // Display preview text + if (!opened) + Indent(); + Indent(); + PushFont(font); + Text("The quick brown fox jumps over the lazy dog"); + PopFont(); + if (!opened) + { + Unindent(); + Unindent(); + return; + } + if (SmallButton("Set as default")) + GetIO().FontDefault = font; + + // Display details + SetNextItemWidth(GetFontSize() * 8); + DragFloat("Font scale", &font->Scale, 0.005f, 0.3f, 2.0f, "%.1f"); + SameLine(); MetricsHelpMarker( + "Note that the default embedded font is NOT meant to be scaled.\n\n" + "Font are currently rendered into bitmaps at a given size at the time of building the atlas. " + "You may oversample them to get some flexibility with scaling. " + "You can also render at multiple sizes and select which one to use at runtime.\n\n" + "(Glimmer of hope: the atlas system will be rewritten in the future to make scaling more flexible.)"); + Text("Ascent: %f, Descent: %f, Height: %f", font->Ascent, font->Descent, font->Ascent - font->Descent); + char c_str[5]; + Text("Fallback character: '%s' (U+%04X)", ImTextCharToUtf8(c_str, font->FallbackChar), font->FallbackChar); + Text("Ellipsis character: '%s' (U+%04X)", ImTextCharToUtf8(c_str, font->EllipsisChar), font->EllipsisChar); + const int surface_sqrt = (int)ImSqrt((float)font->MetricsTotalSurface); + Text("Texture Area: about %d px ~%dx%d px", font->MetricsTotalSurface, surface_sqrt, surface_sqrt); + for (int config_i = 0; config_i < font->SourcesCount; config_i++) + if (font->Sources) + { + const ImFontConfig* src = &font->Sources[config_i]; + int oversample_h, oversample_v; + ImFontAtlasBuildGetOversampleFactors(src, &oversample_h, &oversample_v); + BulletText("Input %d: \'%s\', Oversample: (%d=>%d,%d=>%d), PixelSnapH: %d, Offset: (%.1f,%.1f)", + config_i, src->Name, src->OversampleH, oversample_h, src->OversampleV, oversample_v, src->PixelSnapH, src->GlyphOffset.x, src->GlyphOffset.y); + } + + // Display all glyphs of the fonts in separate pages of 256 characters + { + if (TreeNode("Glyphs", "Glyphs (%d)", font->Glyphs.Size)) + { + ImDrawList* draw_list = GetWindowDrawList(); + const ImU32 glyph_col = GetColorU32(ImGuiCol_Text); + const float cell_size = font->FontSize * 1; + const float cell_spacing = GetStyle().ItemSpacing.y; + for (unsigned int base = 0; base <= IM_UNICODE_CODEPOINT_MAX; base += 256) + { + // Skip ahead if a large bunch of glyphs are not present in the font (test in chunks of 4k) + // This is only a small optimization to reduce the number of iterations when IM_UNICODE_MAX_CODEPOINT + // is large // (if ImWchar==ImWchar32 we will do at least about 272 queries here) + if (!(base & 8191) && font->IsGlyphRangeUnused(base, base + 8191)) + { + base += 8192 - 256; + continue; + } + + int count = 0; + for (unsigned int n = 0; n < 256; n++) + if (font->FindGlyphNoFallback((ImWchar)(base + n))) + count++; + if (count <= 0) + continue; + if (!TreeNode((void*)(intptr_t)base, "U+%04X..U+%04X (%d %s)", base, base + 255, count, count > 1 ? "glyphs" : "glyph")) + continue; + + // Draw a 16x16 grid of glyphs + ImVec2 base_pos = GetCursorScreenPos(); + for (unsigned int n = 0; n < 256; n++) + { + // We use ImFont::RenderChar as a shortcut because we don't have UTF-8 conversion functions + // available here and thus cannot easily generate a zero-terminated UTF-8 encoded string. + ImVec2 cell_p1(base_pos.x + (n % 16) * (cell_size + cell_spacing), base_pos.y + (n / 16) * (cell_size + cell_spacing)); + ImVec2 cell_p2(cell_p1.x + cell_size, cell_p1.y + cell_size); + const ImFontGlyph* glyph = font->FindGlyphNoFallback((ImWchar)(base + n)); + draw_list->AddRect(cell_p1, cell_p2, glyph ? IM_COL32(255, 255, 255, 100) : IM_COL32(255, 255, 255, 50)); + if (!glyph) + continue; + font->RenderChar(draw_list, cell_size, cell_p1, glyph_col, (ImWchar)(base + n)); + if (IsMouseHoveringRect(cell_p1, cell_p2) && BeginTooltip()) + { + DebugNodeFontGlyph(font, glyph); + EndTooltip(); + } + } + Dummy(ImVec2((cell_size + cell_spacing) * 16, (cell_size + cell_spacing) * 16)); + TreePop(); + } + TreePop(); + } + } + TreePop(); + Unindent(); +} + +void ImGui::DebugNodeFontGlyph(ImFont*, const ImFontGlyph* glyph) +{ + Text("Codepoint: U+%04X", glyph->Codepoint); + Separator(); + Text("Visible: %d", glyph->Visible); + Text("AdvanceX: %.1f", glyph->AdvanceX); + Text("Pos: (%.2f,%.2f)->(%.2f,%.2f)", glyph->X0, glyph->Y0, glyph->X1, glyph->Y1); + Text("UV: (%.3f,%.3f)->(%.3f,%.3f)", glyph->U0, glyph->V0, glyph->U1, glyph->V1); +} + +// [DEBUG] Display contents of ImGuiStorage +void ImGui::DebugNodeStorage(ImGuiStorage* storage, const char* label) +{ + if (!TreeNode(label, "%s: %d entries, %d bytes", label, storage->Data.Size, storage->Data.size_in_bytes())) + return; + for (const ImGuiStoragePair& p : storage->Data) + { + BulletText("Key 0x%08X Value { i: %d }", p.key, p.val_i); // Important: we currently don't store a type, real value may not be integer. + DebugLocateItemOnHover(p.key); + } + TreePop(); +} + +// [DEBUG] Display contents of ImGuiTabBar +void ImGui::DebugNodeTabBar(ImGuiTabBar* tab_bar, const char* label) +{ + // Standalone tab bars (not associated to docking/windows functionality) currently hold no discernible strings. + char buf[256]; + char* p = buf; + const char* buf_end = buf + IM_ARRAYSIZE(buf); + const bool is_active = (tab_bar->PrevFrameVisible >= GetFrameCount() - 2); + p += ImFormatString(p, buf_end - p, "%s 0x%08X (%d tabs)%s {", label, tab_bar->ID, tab_bar->Tabs.Size, is_active ? "" : " *Inactive*"); + for (int tab_n = 0; tab_n < ImMin(tab_bar->Tabs.Size, 3); tab_n++) + { + ImGuiTabItem* tab = &tab_bar->Tabs[tab_n]; + p += ImFormatString(p, buf_end - p, "%s'%s'", tab_n > 0 ? ", " : "", TabBarGetTabName(tab_bar, tab)); + } + p += ImFormatString(p, buf_end - p, (tab_bar->Tabs.Size > 3) ? " ... }" : " } "); + if (!is_active) { PushStyleColor(ImGuiCol_Text, GetStyleColorVec4(ImGuiCol_TextDisabled)); } + bool open = TreeNode(label, "%s", buf); + if (!is_active) { PopStyleColor(); } + if (is_active && IsItemHovered()) + { + ImDrawList* draw_list = GetForegroundDrawList(); + draw_list->AddRect(tab_bar->BarRect.Min, tab_bar->BarRect.Max, IM_COL32(255, 255, 0, 255)); + draw_list->AddLine(ImVec2(tab_bar->ScrollingRectMinX, tab_bar->BarRect.Min.y), ImVec2(tab_bar->ScrollingRectMinX, tab_bar->BarRect.Max.y), IM_COL32(0, 255, 0, 255)); + draw_list->AddLine(ImVec2(tab_bar->ScrollingRectMaxX, tab_bar->BarRect.Min.y), ImVec2(tab_bar->ScrollingRectMaxX, tab_bar->BarRect.Max.y), IM_COL32(0, 255, 0, 255)); + } + if (open) + { + for (int tab_n = 0; tab_n < tab_bar->Tabs.Size; tab_n++) + { + ImGuiTabItem* tab = &tab_bar->Tabs[tab_n]; + PushID(tab); + if (SmallButton("<")) { TabBarQueueReorder(tab_bar, tab, -1); } SameLine(0, 2); + if (SmallButton(">")) { TabBarQueueReorder(tab_bar, tab, +1); } SameLine(); + Text("%02d%c Tab 0x%08X '%s' Offset: %.2f, Width: %.2f/%.2f", + tab_n, (tab->ID == tab_bar->SelectedTabId) ? '*' : ' ', tab->ID, TabBarGetTabName(tab_bar, tab), tab->Offset, tab->Width, tab->ContentWidth); + PopID(); + } + TreePop(); + } +} + +void ImGui::DebugNodeViewport(ImGuiViewportP* viewport) +{ + ImGuiContext& g = *GImGui; + SetNextItemOpen(true, ImGuiCond_Once); + bool open = TreeNode((void*)(intptr_t)viewport->ID, "Viewport #%d, ID: 0x%08X, Parent: 0x%08X, Window: \"%s\"", viewport->Idx, viewport->ID, viewport->ParentViewportId, viewport->Window ? viewport->Window->Name : "N/A"); + if (IsItemHovered()) + g.DebugMetricsConfig.HighlightViewportID = viewport->ID; + if (open) + { + ImGuiWindowFlags flags = viewport->Flags; + BulletText("Main Pos: (%.0f,%.0f), Size: (%.0f,%.0f)\nWorkArea Inset Left: %.0f Top: %.0f, Right: %.0f, Bottom: %.0f\nMonitor: %d, DpiScale: %.0f%%", + viewport->Pos.x, viewport->Pos.y, viewport->Size.x, viewport->Size.y, + viewport->WorkInsetMin.x, viewport->WorkInsetMin.y, viewport->WorkInsetMax.x, viewport->WorkInsetMax.y, + viewport->PlatformMonitor, viewport->DpiScale * 100.0f); + if (viewport->Idx > 0) { SameLine(); if (SmallButton("Reset Pos")) { viewport->Pos = ImVec2(200, 200); viewport->UpdateWorkRect(); if (viewport->Window) viewport->Window->Pos = viewport->Pos; } } + BulletText("Flags: 0x%04X =%s%s%s%s%s%s%s%s%s%s%s%s%s", viewport->Flags, + //(flags & ImGuiViewportFlags_IsPlatformWindow) ? " IsPlatformWindow" : "", // Omitting because it is the standard + (flags & ImGuiViewportFlags_IsPlatformMonitor) ? " IsPlatformMonitor" : "", + (flags & ImGuiViewportFlags_IsMinimized) ? " IsMinimized" : "", + (flags & ImGuiViewportFlags_IsFocused) ? " IsFocused" : "", + (flags & ImGuiViewportFlags_OwnedByApp) ? " OwnedByApp" : "", + (flags & ImGuiViewportFlags_NoDecoration) ? " NoDecoration" : "", + (flags & ImGuiViewportFlags_NoTaskBarIcon) ? " NoTaskBarIcon" : "", + (flags & ImGuiViewportFlags_NoFocusOnAppearing) ? " NoFocusOnAppearing" : "", + (flags & ImGuiViewportFlags_NoFocusOnClick) ? " NoFocusOnClick" : "", + (flags & ImGuiViewportFlags_NoInputs) ? " NoInputs" : "", + (flags & ImGuiViewportFlags_NoRendererClear) ? " NoRendererClear" : "", + (flags & ImGuiViewportFlags_NoAutoMerge) ? " NoAutoMerge" : "", + (flags & ImGuiViewportFlags_TopMost) ? " TopMost" : "", + (flags & ImGuiViewportFlags_CanHostOtherWindows) ? " CanHostOtherWindows" : ""); + for (ImDrawList* draw_list : viewport->DrawDataP.CmdLists) + DebugNodeDrawList(NULL, viewport, draw_list, "DrawList"); + TreePop(); + } +} + +void ImGui::DebugNodePlatformMonitor(ImGuiPlatformMonitor* monitor, const char* label, int idx) +{ + BulletText("%s %d: DPI %.0f%%\n MainMin (%.0f,%.0f), MainMax (%.0f,%.0f), MainSize (%.0f,%.0f)\n WorkMin (%.0f,%.0f), WorkMax (%.0f,%.0f), WorkSize (%.0f,%.0f)", + label, idx, monitor->DpiScale * 100.0f, + monitor->MainPos.x, monitor->MainPos.y, monitor->MainPos.x + monitor->MainSize.x, monitor->MainPos.y + monitor->MainSize.y, monitor->MainSize.x, monitor->MainSize.y, + monitor->WorkPos.x, monitor->WorkPos.y, monitor->WorkPos.x + monitor->WorkSize.x, monitor->WorkPos.y + monitor->WorkSize.y, monitor->WorkSize.x, monitor->WorkSize.y); +} + +void ImGui::DebugNodeWindow(ImGuiWindow* window, const char* label) +{ + if (window == NULL) + { + BulletText("%s: NULL", label); + return; + } + + ImGuiContext& g = *GImGui; + const bool is_active = window->WasActive; + ImGuiTreeNodeFlags tree_node_flags = (window == g.NavWindow) ? ImGuiTreeNodeFlags_Selected : ImGuiTreeNodeFlags_None; + if (!is_active) { PushStyleColor(ImGuiCol_Text, GetStyleColorVec4(ImGuiCol_TextDisabled)); } + const bool open = TreeNodeEx(label, tree_node_flags, "%s '%s'%s", label, window->Name, is_active ? "" : " *Inactive*"); + if (!is_active) { PopStyleColor(); } + if (IsItemHovered() && is_active) + GetForegroundDrawList(window)->AddRect(window->Pos, window->Pos + window->Size, IM_COL32(255, 255, 0, 255)); + if (!open) + return; + + if (window->MemoryCompacted) + TextDisabled("Note: some memory buffers have been compacted/freed."); + + if (g.IO.ConfigDebugIsDebuggerPresent && DebugBreakButton("**DebugBreak**", "in Begin()")) + g.DebugBreakInWindow = window->ID; + + ImGuiWindowFlags flags = window->Flags; + DebugNodeDrawList(window, window->Viewport, window->DrawList, "DrawList"); + BulletText("Pos: (%.1f,%.1f), Size: (%.1f,%.1f), ContentSize (%.1f,%.1f) Ideal (%.1f,%.1f)", window->Pos.x, window->Pos.y, window->Size.x, window->Size.y, window->ContentSize.x, window->ContentSize.y, window->ContentSizeIdeal.x, window->ContentSizeIdeal.y); + BulletText("Flags: 0x%08X (%s%s%s%s%s%s%s%s%s..)", flags, + (flags & ImGuiWindowFlags_ChildWindow) ? "Child " : "", (flags & ImGuiWindowFlags_Tooltip) ? "Tooltip " : "", (flags & ImGuiWindowFlags_Popup) ? "Popup " : "", + (flags & ImGuiWindowFlags_Modal) ? "Modal " : "", (flags & ImGuiWindowFlags_ChildMenu) ? "ChildMenu " : "", (flags & ImGuiWindowFlags_NoSavedSettings) ? "NoSavedSettings " : "", + (flags & ImGuiWindowFlags_NoMouseInputs)? "NoMouseInputs":"", (flags & ImGuiWindowFlags_NoNavInputs) ? "NoNavInputs" : "", (flags & ImGuiWindowFlags_AlwaysAutoResize) ? "AlwaysAutoResize" : ""); + if (flags & ImGuiWindowFlags_ChildWindow) + BulletText("ChildFlags: 0x%08X (%s%s%s%s..)", window->ChildFlags, + (window->ChildFlags & ImGuiChildFlags_Borders) ? "Borders " : "", + (window->ChildFlags & ImGuiChildFlags_ResizeX) ? "ResizeX " : "", + (window->ChildFlags & ImGuiChildFlags_ResizeY) ? "ResizeY " : "", + (window->ChildFlags & ImGuiChildFlags_NavFlattened) ? "NavFlattened " : ""); + BulletText("WindowClassId: 0x%08X", window->WindowClass.ClassId); + BulletText("Scroll: (%.2f/%.2f,%.2f/%.2f) Scrollbar:%s%s", window->Scroll.x, window->ScrollMax.x, window->Scroll.y, window->ScrollMax.y, window->ScrollbarX ? "X" : "", window->ScrollbarY ? "Y" : ""); + BulletText("Active: %d/%d, WriteAccessed: %d, BeginOrderWithinContext: %d", window->Active, window->WasActive, window->WriteAccessed, (window->Active || window->WasActive) ? window->BeginOrderWithinContext : -1); + BulletText("Appearing: %d, Hidden: %d (CanSkip %d Cannot %d), SkipItems: %d", window->Appearing, window->Hidden, window->HiddenFramesCanSkipItems, window->HiddenFramesCannotSkipItems, window->SkipItems); + for (int layer = 0; layer < ImGuiNavLayer_COUNT; layer++) + { + ImRect r = window->NavRectRel[layer]; + if (r.Min.x >= r.Max.x && r.Min.y >= r.Max.y) + BulletText("NavLastIds[%d]: 0x%08X", layer, window->NavLastIds[layer]); + else + BulletText("NavLastIds[%d]: 0x%08X at +(%.1f,%.1f)(%.1f,%.1f)", layer, window->NavLastIds[layer], r.Min.x, r.Min.y, r.Max.x, r.Max.y); + DebugLocateItemOnHover(window->NavLastIds[layer]); + } + const ImVec2* pr = window->NavPreferredScoringPosRel; + for (int layer = 0; layer < ImGuiNavLayer_COUNT; layer++) + BulletText("NavPreferredScoringPosRel[%d] = {%.1f,%.1f)", layer, (pr[layer].x == FLT_MAX ? -99999.0f : pr[layer].x), (pr[layer].y == FLT_MAX ? -99999.0f : pr[layer].y)); // Display as 99999.0f so it looks neater. + BulletText("NavLayersActiveMask: %X, NavLastChildNavWindow: %s", window->DC.NavLayersActiveMask, window->NavLastChildNavWindow ? window->NavLastChildNavWindow->Name : "NULL"); + + BulletText("Viewport: %d%s, ViewportId: 0x%08X, ViewportPos: (%.1f,%.1f)", window->Viewport ? window->Viewport->Idx : -1, window->ViewportOwned ? " (Owned)" : "", window->ViewportId, window->ViewportPos.x, window->ViewportPos.y); + BulletText("ViewportMonitor: %d", window->Viewport ? window->Viewport->PlatformMonitor : -1); + BulletText("DockId: 0x%04X, DockOrder: %d, Act: %d, Vis: %d", window->DockId, window->DockOrder, window->DockIsActive, window->DockTabIsVisible); + if (window->DockNode || window->DockNodeAsHost) + DebugNodeDockNode(window->DockNodeAsHost ? window->DockNodeAsHost : window->DockNode, window->DockNodeAsHost ? "DockNodeAsHost" : "DockNode"); + + if (window->RootWindow != window) { DebugNodeWindow(window->RootWindow, "RootWindow"); } + if (window->RootWindowDockTree != window->RootWindow) { DebugNodeWindow(window->RootWindowDockTree, "RootWindowDockTree"); } + if (window->ParentWindow != NULL) { DebugNodeWindow(window->ParentWindow, "ParentWindow"); } + if (window->ParentWindowForFocusRoute != NULL) { DebugNodeWindow(window->ParentWindowForFocusRoute, "ParentWindowForFocusRoute"); } + if (window->DC.ChildWindows.Size > 0) { DebugNodeWindowsList(&window->DC.ChildWindows, "ChildWindows"); } + if (window->ColumnsStorage.Size > 0 && TreeNode("Columns", "Columns sets (%d)", window->ColumnsStorage.Size)) + { + for (ImGuiOldColumns& columns : window->ColumnsStorage) + DebugNodeColumns(&columns); + TreePop(); + } + DebugNodeStorage(&window->StateStorage, "Storage"); + TreePop(); +} + +void ImGui::DebugNodeWindowSettings(ImGuiWindowSettings* settings) +{ + if (settings->WantDelete) + BeginDisabled(); + Text("0x%08X \"%s\" Pos (%d,%d) Size (%d,%d) Collapsed=%d", + settings->ID, settings->GetName(), settings->Pos.x, settings->Pos.y, settings->Size.x, settings->Size.y, settings->Collapsed); + if (settings->WantDelete) + EndDisabled(); +} + +void ImGui::DebugNodeWindowsList(ImVector* windows, const char* label) +{ + if (!TreeNode(label, "%s (%d)", label, windows->Size)) + return; + for (int i = windows->Size - 1; i >= 0; i--) // Iterate front to back + { + PushID((*windows)[i]); + DebugNodeWindow((*windows)[i], "Window"); + PopID(); + } + TreePop(); +} + +// FIXME-OPT: This is technically suboptimal, but it is simpler this way. +void ImGui::DebugNodeWindowsListByBeginStackParent(ImGuiWindow** windows, int windows_size, ImGuiWindow* parent_in_begin_stack) +{ + for (int i = 0; i < windows_size; i++) + { + ImGuiWindow* window = windows[i]; + if (window->ParentWindowInBeginStack != parent_in_begin_stack) + continue; + char buf[20]; + ImFormatString(buf, IM_ARRAYSIZE(buf), "[%04d] Window", window->BeginOrderWithinContext); + //BulletText("[%04d] Window '%s'", window->BeginOrderWithinContext, window->Name); + DebugNodeWindow(window, buf); + Indent(); + DebugNodeWindowsListByBeginStackParent(windows + i + 1, windows_size - i - 1, window); + Unindent(); + } +} + +//----------------------------------------------------------------------------- +// [SECTION] DEBUG LOG WINDOW +//----------------------------------------------------------------------------- + +void ImGui::DebugLog(const char* fmt, ...) +{ + va_list args; + va_start(args, fmt); + DebugLogV(fmt, args); + va_end(args); +} + +void ImGui::DebugLogV(const char* fmt, va_list args) +{ + ImGuiContext& g = *GImGui; + const int old_size = g.DebugLogBuf.size(); + if (g.ContextName[0] != 0) + g.DebugLogBuf.appendf("[%s] [%05d] ", g.ContextName, g.FrameCount); + else + g.DebugLogBuf.appendf("[%05d] ", g.FrameCount); + g.DebugLogBuf.appendfv(fmt, args); + g.DebugLogIndex.append(g.DebugLogBuf.c_str(), old_size, g.DebugLogBuf.size()); + if (g.DebugLogFlags & ImGuiDebugLogFlags_OutputToTTY) + IMGUI_DEBUG_PRINTF("%s", g.DebugLogBuf.begin() + old_size); +#ifdef IMGUI_ENABLE_TEST_ENGINE + // IMGUI_TEST_ENGINE_LOG() adds a trailing \n automatically + const int new_size = g.DebugLogBuf.size(); + const bool trailing_carriage_return = (g.DebugLogBuf[new_size - 1] == '\n'); + if (g.DebugLogFlags & ImGuiDebugLogFlags_OutputToTestEngine) + IMGUI_TEST_ENGINE_LOG("%.*s", new_size - old_size - (trailing_carriage_return ? 1 : 0), g.DebugLogBuf.begin() + old_size); +#endif +} + +// FIXME-LAYOUT: To be done automatically via layout mode once we rework ItemSize/ItemAdd into ItemLayout. +static void SameLineOrWrap(const ImVec2& size) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + ImVec2 pos(window->DC.CursorPosPrevLine.x + g.Style.ItemSpacing.x, window->DC.CursorPosPrevLine.y); + if (window->WorkRect.Contains(ImRect(pos, pos + size))) + ImGui::SameLine(); +} + +static void ShowDebugLogFlag(const char* name, ImGuiDebugLogFlags flags) +{ + ImGuiContext& g = *GImGui; + ImVec2 size(ImGui::GetFrameHeight() + g.Style.ItemInnerSpacing.x + ImGui::CalcTextSize(name).x, ImGui::GetFrameHeight()); + SameLineOrWrap(size); // FIXME-LAYOUT: To be done automatically once we rework ItemSize/ItemAdd into ItemLayout. + + bool highlight_errors = (flags == ImGuiDebugLogFlags_EventError && g.DebugLogSkippedErrors > 0); + if (highlight_errors) + ImGui::PushStyleColor(ImGuiCol_Text, ImLerp(g.Style.Colors[ImGuiCol_Text], ImVec4(1.0f, 0.0f, 0.0f, 1.0f), 0.30f)); + if (ImGui::CheckboxFlags(name, &g.DebugLogFlags, flags) && g.IO.KeyShift && (g.DebugLogFlags & flags) != 0) + { + g.DebugLogAutoDisableFrames = 2; + g.DebugLogAutoDisableFlags |= flags; + } + if (highlight_errors) + { + ImGui::PopStyleColor(); + ImGui::SetItemTooltip("%d past errors skipped.", g.DebugLogSkippedErrors); + } + else + { + ImGui::SetItemTooltip("Hold SHIFT when clicking to enable for 2 frames only (useful for spammy log entries)"); + } +} + +void ImGui::ShowDebugLogWindow(bool* p_open) +{ + ImGuiContext& g = *GImGui; + if ((g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasSize) == 0) + SetNextWindowSize(ImVec2(0.0f, GetFontSize() * 12.0f), ImGuiCond_FirstUseEver); + if (!Begin("Dear ImGui Debug Log", p_open) || GetCurrentWindow()->BeginCount > 1) + { + End(); + return; + } + + ImGuiDebugLogFlags all_enable_flags = ImGuiDebugLogFlags_EventMask_ & ~ImGuiDebugLogFlags_EventInputRouting; + CheckboxFlags("All", &g.DebugLogFlags, all_enable_flags); + SetItemTooltip("(except InputRouting which is spammy)"); + + ShowDebugLogFlag("Errors", ImGuiDebugLogFlags_EventError); + ShowDebugLogFlag("ActiveId", ImGuiDebugLogFlags_EventActiveId); + ShowDebugLogFlag("Clipper", ImGuiDebugLogFlags_EventClipper); + ShowDebugLogFlag("Docking", ImGuiDebugLogFlags_EventDocking); + ShowDebugLogFlag("Focus", ImGuiDebugLogFlags_EventFocus); + ShowDebugLogFlag("IO", ImGuiDebugLogFlags_EventIO); + //ShowDebugLogFlag("Font", ImGuiDebugLogFlags_EventFont); + ShowDebugLogFlag("Nav", ImGuiDebugLogFlags_EventNav); + ShowDebugLogFlag("Popup", ImGuiDebugLogFlags_EventPopup); + ShowDebugLogFlag("Selection", ImGuiDebugLogFlags_EventSelection); + ShowDebugLogFlag("Viewport", ImGuiDebugLogFlags_EventViewport); + ShowDebugLogFlag("InputRouting", ImGuiDebugLogFlags_EventInputRouting); + + if (SmallButton("Clear")) + { + g.DebugLogBuf.clear(); + g.DebugLogIndex.clear(); + g.DebugLogSkippedErrors = 0; + } + SameLine(); + if (SmallButton("Copy")) + SetClipboardText(g.DebugLogBuf.c_str()); + SameLine(); + if (SmallButton("Configure Outputs..")) + OpenPopup("Outputs"); + if (BeginPopup("Outputs")) + { + CheckboxFlags("OutputToTTY", &g.DebugLogFlags, ImGuiDebugLogFlags_OutputToTTY); +#ifndef IMGUI_ENABLE_TEST_ENGINE + BeginDisabled(); +#endif + CheckboxFlags("OutputToTestEngine", &g.DebugLogFlags, ImGuiDebugLogFlags_OutputToTestEngine); +#ifndef IMGUI_ENABLE_TEST_ENGINE + EndDisabled(); +#endif + EndPopup(); + } + + BeginChild("##log", ImVec2(0.0f, 0.0f), ImGuiChildFlags_Borders, ImGuiWindowFlags_AlwaysVerticalScrollbar | ImGuiWindowFlags_AlwaysHorizontalScrollbar); + + const ImGuiDebugLogFlags backup_log_flags = g.DebugLogFlags; + g.DebugLogFlags &= ~ImGuiDebugLogFlags_EventClipper; + + ImGuiListClipper clipper; + clipper.Begin(g.DebugLogIndex.size()); + while (clipper.Step()) + for (int line_no = clipper.DisplayStart; line_no < clipper.DisplayEnd; line_no++) + DebugTextUnformattedWithLocateItem(g.DebugLogIndex.get_line_begin(g.DebugLogBuf.c_str(), line_no), g.DebugLogIndex.get_line_end(g.DebugLogBuf.c_str(), line_no)); + g.DebugLogFlags = backup_log_flags; + if (GetScrollY() >= GetScrollMaxY()) + SetScrollHereY(1.0f); + EndChild(); + + End(); +} + +// Display line, search for 0xXXXXXXXX identifiers and call DebugLocateItemOnHover() when hovered. +void ImGui::DebugTextUnformattedWithLocateItem(const char* line_begin, const char* line_end) +{ + TextUnformatted(line_begin, line_end); + if (!IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup | ImGuiHoveredFlags_AllowWhenBlockedByActiveItem)) + return; + ImGuiContext& g = *GImGui; + ImRect text_rect = g.LastItemData.Rect; + for (const char* p = line_begin; p <= line_end - 10; p++) + { + ImGuiID id = 0; + if (p[0] != '0' || (p[1] != 'x' && p[1] != 'X') || sscanf(p + 2, "%X", &id) != 1 || ImCharIsXdigitA(p[10])) + continue; + ImVec2 p0 = CalcTextSize(line_begin, p); + ImVec2 p1 = CalcTextSize(p, p + 10); + g.LastItemData.Rect = ImRect(text_rect.Min + ImVec2(p0.x, 0.0f), text_rect.Min + ImVec2(p0.x + p1.x, p1.y)); + if (IsMouseHoveringRect(g.LastItemData.Rect.Min, g.LastItemData.Rect.Max, true)) + DebugLocateItemOnHover(id); + p += 10; + } +} + +//----------------------------------------------------------------------------- +// [SECTION] OTHER DEBUG TOOLS (ITEM PICKER, ID STACK TOOL) +//----------------------------------------------------------------------------- + +// Draw a small cross at current CursorPos in current window's DrawList +void ImGui::DebugDrawCursorPos(ImU32 col) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + ImVec2 pos = window->DC.CursorPos; + window->DrawList->AddLine(ImVec2(pos.x, pos.y - 3.0f), ImVec2(pos.x, pos.y + 4.0f), col, 1.0f); + window->DrawList->AddLine(ImVec2(pos.x - 3.0f, pos.y), ImVec2(pos.x + 4.0f, pos.y), col, 1.0f); +} + +// Draw a 10px wide rectangle around CurposPos.x using Line Y1/Y2 in current window's DrawList +void ImGui::DebugDrawLineExtents(ImU32 col) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + float curr_x = window->DC.CursorPos.x; + float line_y1 = (window->DC.IsSameLine ? window->DC.CursorPosPrevLine.y : window->DC.CursorPos.y); + float line_y2 = line_y1 + (window->DC.IsSameLine ? window->DC.PrevLineSize.y : window->DC.CurrLineSize.y); + window->DrawList->AddLine(ImVec2(curr_x - 5.0f, line_y1), ImVec2(curr_x + 5.0f, line_y1), col, 1.0f); + window->DrawList->AddLine(ImVec2(curr_x - 0.5f, line_y1), ImVec2(curr_x - 0.5f, line_y2), col, 1.0f); + window->DrawList->AddLine(ImVec2(curr_x - 5.0f, line_y2), ImVec2(curr_x + 5.0f, line_y2), col, 1.0f); +} + +// Draw last item rect in ForegroundDrawList (so it is always visible) +void ImGui::DebugDrawItemRect(ImU32 col) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + GetForegroundDrawList(window)->AddRect(g.LastItemData.Rect.Min, g.LastItemData.Rect.Max, col); +} + +// [DEBUG] Locate item position/rectangle given an ID. +static const ImU32 DEBUG_LOCATE_ITEM_COLOR = IM_COL32(0, 255, 0, 255); // Green + +void ImGui::DebugLocateItem(ImGuiID target_id) +{ + ImGuiContext& g = *GImGui; + g.DebugLocateId = target_id; + g.DebugLocateFrames = 2; + g.DebugBreakInLocateId = false; +} + +// FIXME: Doesn't work over through a modal window, because they clear HoveredWindow. +void ImGui::DebugLocateItemOnHover(ImGuiID target_id) +{ + if (target_id == 0 || !IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByActiveItem | ImGuiHoveredFlags_AllowWhenBlockedByPopup)) + return; + ImGuiContext& g = *GImGui; + DebugLocateItem(target_id); + GetForegroundDrawList(g.CurrentWindow)->AddRect(g.LastItemData.Rect.Min - ImVec2(3.0f, 3.0f), g.LastItemData.Rect.Max + ImVec2(3.0f, 3.0f), DEBUG_LOCATE_ITEM_COLOR); + + // Can't easily use a context menu here because it will mess with focus, active id etc. + if (g.IO.ConfigDebugIsDebuggerPresent && g.MouseStationaryTimer > 1.0f) + { + DebugBreakButtonTooltip(false, "in ItemAdd()"); + if (IsKeyChordPressed(g.DebugBreakKeyChord)) + g.DebugBreakInLocateId = true; + } +} + +void ImGui::DebugLocateItemResolveWithLastItem() +{ + ImGuiContext& g = *GImGui; + + // [DEBUG] Debug break requested by user + if (g.DebugBreakInLocateId) + IM_DEBUG_BREAK(); + + ImGuiLastItemData item_data = g.LastItemData; + g.DebugLocateId = 0; + ImDrawList* draw_list = GetForegroundDrawList(g.CurrentWindow); + ImRect r = item_data.Rect; + r.Expand(3.0f); + ImVec2 p1 = g.IO.MousePos; + ImVec2 p2 = ImVec2((p1.x < r.Min.x) ? r.Min.x : (p1.x > r.Max.x) ? r.Max.x : p1.x, (p1.y < r.Min.y) ? r.Min.y : (p1.y > r.Max.y) ? r.Max.y : p1.y); + draw_list->AddRect(r.Min, r.Max, DEBUG_LOCATE_ITEM_COLOR); + draw_list->AddLine(p1, p2, DEBUG_LOCATE_ITEM_COLOR); +} + +void ImGui::DebugStartItemPicker() +{ + ImGuiContext& g = *GImGui; + g.DebugItemPickerActive = true; +} + +// [DEBUG] Item picker tool - start with DebugStartItemPicker() - useful to visually select an item and break into its call-stack. +void ImGui::UpdateDebugToolItemPicker() +{ + ImGuiContext& g = *GImGui; + g.DebugItemPickerBreakId = 0; + if (!g.DebugItemPickerActive) + return; + + const ImGuiID hovered_id = g.HoveredIdPreviousFrame; + SetMouseCursor(ImGuiMouseCursor_Hand); + if (IsKeyPressed(ImGuiKey_Escape)) + g.DebugItemPickerActive = false; + const bool change_mapping = g.IO.KeyMods == (ImGuiMod_Ctrl | ImGuiMod_Shift); + if (!change_mapping && IsMouseClicked(g.DebugItemPickerMouseButton) && hovered_id) + { + g.DebugItemPickerBreakId = hovered_id; + g.DebugItemPickerActive = false; + } + for (int mouse_button = 0; mouse_button < 3; mouse_button++) + if (change_mapping && IsMouseClicked(mouse_button)) + g.DebugItemPickerMouseButton = (ImU8)mouse_button; + SetNextWindowBgAlpha(0.70f); + if (!BeginTooltip()) + return; + Text("HoveredId: 0x%08X", hovered_id); + Text("Press ESC to abort picking."); + const char* mouse_button_names[] = { "Left", "Right", "Middle" }; + if (change_mapping) + Text("Remap w/ Ctrl+Shift: click anywhere to select new mouse button."); + else + TextColored(GetStyleColorVec4(hovered_id ? ImGuiCol_Text : ImGuiCol_TextDisabled), "Click %s Button to break in debugger! (remap w/ Ctrl+Shift)", mouse_button_names[g.DebugItemPickerMouseButton]); + EndTooltip(); +} + +// [DEBUG] ID Stack Tool: update queries. Called by NewFrame() +void ImGui::UpdateDebugToolStackQueries() +{ + ImGuiContext& g = *GImGui; + ImGuiIDStackTool* tool = &g.DebugIDStackTool; + + // Clear hook when id stack tool is not visible + g.DebugHookIdInfo = 0; + if (g.FrameCount != tool->LastActiveFrame + 1) + return; + + // Update queries. The steps are: -1: query Stack, >= 0: query each stack item + // We can only perform 1 ID Info query every frame. This is designed so the GetID() tests are cheap and constant-time + const ImGuiID query_id = g.HoveredIdPreviousFrame ? g.HoveredIdPreviousFrame : g.ActiveId; + if (tool->QueryId != query_id) + { + tool->QueryId = query_id; + tool->StackLevel = -1; + tool->Results.resize(0); + } + if (query_id == 0) + return; + + // Advance to next stack level when we got our result, or after 2 frames (in case we never get a result) + int stack_level = tool->StackLevel; + if (stack_level >= 0 && stack_level < tool->Results.Size) + if (tool->Results[stack_level].QuerySuccess || tool->Results[stack_level].QueryFrameCount > 2) + tool->StackLevel++; + + // Update hook + stack_level = tool->StackLevel; + if (stack_level == -1) + g.DebugHookIdInfo = query_id; + if (stack_level >= 0 && stack_level < tool->Results.Size) + { + g.DebugHookIdInfo = tool->Results[stack_level].ID; + tool->Results[stack_level].QueryFrameCount++; + } +} + +// [DEBUG] ID Stack tool: hooks called by GetID() family functions +void ImGui::DebugHookIdInfo(ImGuiID id, ImGuiDataType data_type, const void* data_id, const void* data_id_end) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + ImGuiIDStackTool* tool = &g.DebugIDStackTool; + + // Step 0: stack query + // This assumes that the ID was computed with the current ID stack, which tends to be the case for our widget. + if (tool->StackLevel == -1) + { + tool->StackLevel++; + tool->Results.resize(window->IDStack.Size + 1, ImGuiStackLevelInfo()); + for (int n = 0; n < window->IDStack.Size + 1; n++) + tool->Results[n].ID = (n < window->IDStack.Size) ? window->IDStack[n] : id; + return; + } + + // Step 1+: query for individual level + IM_ASSERT(tool->StackLevel >= 0); + if (tool->StackLevel != window->IDStack.Size) + return; + ImGuiStackLevelInfo* info = &tool->Results[tool->StackLevel]; + IM_ASSERT(info->ID == id && info->QueryFrameCount > 0); + + switch (data_type) + { + case ImGuiDataType_S32: + ImFormatString(info->Desc, IM_ARRAYSIZE(info->Desc), "%d", (int)(intptr_t)data_id); + break; + case ImGuiDataType_String: + ImFormatString(info->Desc, IM_ARRAYSIZE(info->Desc), "%.*s", data_id_end ? (int)((const char*)data_id_end - (const char*)data_id) : (int)ImStrlen((const char*)data_id), (const char*)data_id); + break; + case ImGuiDataType_Pointer: + ImFormatString(info->Desc, IM_ARRAYSIZE(info->Desc), "(void*)0x%p", data_id); + break; + case ImGuiDataType_ID: + if (info->Desc[0] != 0) // PushOverrideID() is often used to avoid hashing twice, which would lead to 2 calls to DebugHookIdInfo(). We prioritize the first one. + return; + ImFormatString(info->Desc, IM_ARRAYSIZE(info->Desc), "0x%08X [override]", id); + break; + default: + IM_ASSERT(0); + } + info->QuerySuccess = true; + info->DataType = data_type; +} + +static int StackToolFormatLevelInfo(ImGuiIDStackTool* tool, int n, bool format_for_ui, char* buf, size_t buf_size) +{ + ImGuiStackLevelInfo* info = &tool->Results[n]; + ImGuiWindow* window = (info->Desc[0] == 0 && n == 0) ? ImGui::FindWindowByID(info->ID) : NULL; + if (window) // Source: window name (because the root ID don't call GetID() and so doesn't get hooked) + return ImFormatString(buf, buf_size, format_for_ui ? "\"%s\" [window]" : "%s", window->Name); + if (info->QuerySuccess) // Source: GetID() hooks (prioritize over ItemInfo() because we frequently use patterns like: PushID(str), Button("") where they both have same id) + return ImFormatString(buf, buf_size, (format_for_ui && info->DataType == ImGuiDataType_String) ? "\"%s\"" : "%s", info->Desc); + if (tool->StackLevel < tool->Results.Size) // Only start using fallback below when all queries are done, so during queries we don't flickering ??? markers. + return (*buf = 0); +#ifdef IMGUI_ENABLE_TEST_ENGINE + if (const char* label = ImGuiTestEngine_FindItemDebugLabel(GImGui, info->ID)) // Source: ImGuiTestEngine's ItemInfo() + return ImFormatString(buf, buf_size, format_for_ui ? "??? \"%s\"" : "%s", label); +#endif + return ImFormatString(buf, buf_size, "???"); +} + +// ID Stack Tool: Display UI +void ImGui::ShowIDStackToolWindow(bool* p_open) +{ + ImGuiContext& g = *GImGui; + if ((g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasSize) == 0) + SetNextWindowSize(ImVec2(0.0f, GetFontSize() * 8.0f), ImGuiCond_FirstUseEver); + if (!Begin("Dear ImGui ID Stack Tool", p_open) || GetCurrentWindow()->BeginCount > 1) + { + End(); + return; + } + + // Display hovered/active status + ImGuiIDStackTool* tool = &g.DebugIDStackTool; + + // Build and display path + tool->ResultPathBuf.resize(0); + for (int stack_n = 0; stack_n < tool->Results.Size; stack_n++) + { + char level_desc[256]; + StackToolFormatLevelInfo(tool, stack_n, false, level_desc, IM_ARRAYSIZE(level_desc)); + tool->ResultPathBuf.append(stack_n == 0 ? "//" : "/"); + for (int n = 0; level_desc[n]; n++) + { + if (level_desc[n] == '/') + tool->ResultPathBuf.append("\\"); + tool->ResultPathBuf.append(level_desc + n, level_desc + n + 1); + } + } + Text("0x%08X", tool->QueryId); + SameLine(); + MetricsHelpMarker("Hover an item with the mouse to display elements of the ID Stack leading to the item's final ID.\nEach level of the stack correspond to a PushID() call.\nAll levels of the stack are hashed together to make the final ID of a widget (ID displayed at the bottom level of the stack).\nRead FAQ entry about the ID stack for details."); + + // CTRL+C to copy path + const float time_since_copy = (float)g.Time - tool->CopyToClipboardLastTime; + SameLine(); + PushStyleVarY(ImGuiStyleVar_FramePadding, 0.0f); Checkbox("Ctrl+C: copy path", &tool->CopyToClipboardOnCtrlC); PopStyleVar(); + SameLine(); + TextColored((time_since_copy >= 0.0f && time_since_copy < 0.75f && ImFmod(time_since_copy, 0.25f) < 0.25f * 0.5f) ? ImVec4(1.f, 1.f, 0.3f, 1.f) : ImVec4(), "*COPIED*"); + if (tool->CopyToClipboardOnCtrlC && Shortcut(ImGuiMod_Ctrl | ImGuiKey_C, ImGuiInputFlags_RouteGlobal | ImGuiInputFlags_RouteOverFocused)) + { + tool->CopyToClipboardLastTime = (float)g.Time; + SetClipboardText(tool->ResultPathBuf.c_str()); + } + + Text("- Path \"%s\"", tool->ResultPathBuf.c_str()); +#ifdef IMGUI_ENABLE_TEST_ENGINE + Text("- Label \"%s\"", tool->QueryId ? ImGuiTestEngine_FindItemDebugLabel(&g, tool->QueryId) : ""); +#endif + + Separator(); + + // Display decorated stack + tool->LastActiveFrame = g.FrameCount; + if (tool->Results.Size > 0 && BeginTable("##table", 3, ImGuiTableFlags_Borders)) + { + const float id_width = CalcTextSize("0xDDDDDDDD").x; + TableSetupColumn("Seed", ImGuiTableColumnFlags_WidthFixed, id_width); + TableSetupColumn("PushID", ImGuiTableColumnFlags_WidthStretch); + TableSetupColumn("Result", ImGuiTableColumnFlags_WidthFixed, id_width); + TableHeadersRow(); + for (int n = 0; n < tool->Results.Size; n++) + { + ImGuiStackLevelInfo* info = &tool->Results[n]; + TableNextColumn(); + Text("0x%08X", (n > 0) ? tool->Results[n - 1].ID : 0); + TableNextColumn(); + StackToolFormatLevelInfo(tool, n, true, g.TempBuffer.Data, g.TempBuffer.Size); + TextUnformatted(g.TempBuffer.Data); + TableNextColumn(); + Text("0x%08X", info->ID); + if (n == tool->Results.Size - 1) + TableSetBgColor(ImGuiTableBgTarget_CellBg, GetColorU32(ImGuiCol_Header)); + } + EndTable(); + } + End(); } #else -void ImGui::ShowMetricsWindow(bool*) { } +void ImGui::ShowMetricsWindow(bool*) {} +void ImGui::ShowFontAtlas(ImFontAtlas*) {} +void ImGui::DebugNodeColumns(ImGuiOldColumns*) {} +void ImGui::DebugNodeDrawList(ImGuiWindow*, ImGuiViewportP*, const ImDrawList*, const char*) {} +void ImGui::DebugNodeDrawCmdShowMeshAndBoundingBox(ImDrawList*, const ImDrawList*, const ImDrawCmd*, bool, bool) {} +void ImGui::DebugNodeFont(ImFont*) {} +void ImGui::DebugNodeStorage(ImGuiStorage*, const char*) {} +void ImGui::DebugNodeTabBar(ImGuiTabBar*, const char*) {} +void ImGui::DebugNodeWindow(ImGuiWindow*, const char*) {} +void ImGui::DebugNodeWindowSettings(ImGuiWindowSettings*) {} +void ImGui::DebugNodeWindowsList(ImVector*, const char*) {} +void ImGui::DebugNodeViewport(ImGuiViewportP*) {} -#endif +void ImGui::ShowDebugLogWindow(bool*) {} +void ImGui::ShowIDStackToolWindow(bool*) {} +void ImGui::DebugStartItemPicker() {} +void ImGui::DebugHookIdInfo(ImGuiID, ImGuiDataType, const void*, const void*) {} + +#endif // #ifndef IMGUI_DISABLE_DEBUG_TOOLS //----------------------------------------------------------------------------- @@ -10106,3 +22925,5 @@ void ImGui::ShowMetricsWindow(bool*) { } #endif //----------------------------------------------------------------------------- + +#endif // #ifndef IMGUI_DISABLE diff --git a/imgui/imgui.h b/imgui/imgui.h index 00a1f5cb4..bafe97ff8 100644 --- a/imgui/imgui.h +++ b/imgui/imgui.h @@ -1,58 +1,86 @@ -// dear imgui, v1.73 +// dear imgui, v1.91.9b // (headers) -// See imgui.cpp file for documentation. -// Call and read ImGui::ShowDemoWindow() in imgui_demo.cpp for demo code. -// Newcomers, read 'Programmer guide' in imgui.cpp for notes on how to setup Dear ImGui in your codebase. -// Get latest version at https://github.com/ocornut/imgui +// Help: +// - See links below. +// - Call and read ImGui::ShowDemoWindow() in imgui_demo.cpp. All applications in examples/ are doing that. +// - Read top of imgui.cpp for more details, links and comments. +// - Add '#define IMGUI_DEFINE_MATH_OPERATORS' before including this file (or in imconfig.h) to access courtesy maths operators for ImVec2 and ImVec4. + +// Resources: +// - FAQ ........................ https://dearimgui.com/faq (in repository as docs/FAQ.md) +// - Homepage ................... https://github.com/ocornut/imgui +// - Releases & changelog ....... https://github.com/ocornut/imgui/releases +// - Gallery .................... https://github.com/ocornut/imgui/issues?q=label%3Agallery (please post your screenshots/video there!) +// - Wiki ....................... https://github.com/ocornut/imgui/wiki (lots of good stuff there) +// - Getting Started https://github.com/ocornut/imgui/wiki/Getting-Started (how to integrate in an existing app by adding ~25 lines of code) +// - Third-party Extensions https://github.com/ocornut/imgui/wiki/Useful-Extensions (ImPlot & many more) +// - Bindings/Backends https://github.com/ocornut/imgui/wiki/Bindings (language bindings, backends for various tech/engines) +// - Glossary https://github.com/ocornut/imgui/wiki/Glossary +// - Debug Tools https://github.com/ocornut/imgui/wiki/Debug-Tools +// - Software using Dear ImGui https://github.com/ocornut/imgui/wiki/Software-using-dear-imgui +// - Issues & support ........... https://github.com/ocornut/imgui/issues +// - Test Engine & Automation ... https://github.com/ocornut/imgui_test_engine (test suite, test engine to automate your apps) + +// For first-time users having issues compiling/linking/running/loading fonts: +// please post in https://github.com/ocornut/imgui/discussions if you cannot find a solution in resources above. +// Everything else should be asked in 'Issues'! We are building a database of cross-linked knowledge there. + +// Library Version +// (Integer encoded as XYYZZ for use in #if preprocessor conditionals, e.g. '#if IMGUI_VERSION_NUM >= 12345') +#define IMGUI_VERSION "1.91.9b" +#define IMGUI_VERSION_NUM 19191 +#define IMGUI_HAS_TABLE +#define IMGUI_HAS_VIEWPORT // Viewport WIP branch +#define IMGUI_HAS_DOCK // Docking WIP branch /* Index of this file: -// Header mess -// Forward declarations and basic types -// ImGui API (Dear ImGui end-user API) -// Flags & Enumerations -// Memory allocations macros -// ImVector<> -// ImGuiStyle -// ImGuiIO -// Misc data structures (ImGuiInputTextCallbackData, ImGuiSizeCallbackData, ImGuiPayload) -// Obsolete functions -// Helpers (ImGuiOnceUponAFrame, ImGuiTextFilter, ImGuiTextBuffer, ImGuiStorage, ImGuiListClipper, ImColor) -// Draw List API (ImDrawCallback, ImDrawCmd, ImDrawIdx, ImDrawVert, ImDrawChannel, ImDrawListSplitter, ImDrawListFlags, ImDrawList, ImDrawData) -// Font API (ImFontConfig, ImFontGlyph, ImFontGlyphRangesBuilder, ImFontAtlasFlags, ImFontAtlas, ImFont) +// [SECTION] Header mess +// [SECTION] Forward declarations and basic types +// [SECTION] Texture identifier (ImTextureID) +// [SECTION] Dear ImGui end-user API functions +// [SECTION] Flags & Enumerations +// [SECTION] Tables API flags and structures (ImGuiTableFlags, ImGuiTableColumnFlags, ImGuiTableRowFlags, ImGuiTableBgTarget, ImGuiTableSortSpecs, ImGuiTableColumnSortSpecs) +// [SECTION] Helpers: Debug log, Memory allocations macros, ImVector<> +// [SECTION] ImGuiStyle +// [SECTION] ImGuiIO +// [SECTION] Misc data structures (ImGuiInputTextCallbackData, ImGuiSizeCallbackData, ImGuiWindowClass, ImGuiPayload) +// [SECTION] Helpers (ImGuiOnceUponAFrame, ImGuiTextFilter, ImGuiTextBuffer, ImGuiStorage, ImGuiListClipper, Math Operators, ImColor) +// [SECTION] Multi-Select API flags and structures (ImGuiMultiSelectFlags, ImGuiMultiSelectIO, ImGuiSelectionRequest, ImGuiSelectionBasicStorage, ImGuiSelectionExternalStorage) +// [SECTION] Drawing API (ImDrawCallback, ImDrawCmd, ImDrawIdx, ImDrawVert, ImDrawChannel, ImDrawListSplitter, ImDrawFlags, ImDrawListFlags, ImDrawList, ImDrawData) +// [SECTION] Font API (ImFontConfig, ImFontGlyph, ImFontGlyphRangesBuilder, ImFontAtlasFlags, ImFontAtlas, ImFont) +// [SECTION] Viewports (ImGuiViewportFlags, ImGuiViewport) +// [SECTION] ImGuiPlatformIO + other Platform Dependent Interfaces (ImGuiPlatformMonitor, ImGuiPlatformImeData) +// [SECTION] Obsolete functions and types */ #pragma once -// Configuration file with compile-time options (edit imconfig.h or define IMGUI_USER_CONFIG to your own filename) +// Configuration file with compile-time options +// (edit imconfig.h or '#define IMGUI_USER_CONFIG "myfilename.h" from your build system) #ifdef IMGUI_USER_CONFIG #include IMGUI_USER_CONFIG #endif -#if !defined(IMGUI_DISABLE_INCLUDE_IMCONFIG_H) || defined(IMGUI_INCLUDE_IMCONFIG_H) #include "imconfig.h" -#endif + +#ifndef IMGUI_DISABLE //----------------------------------------------------------------------------- -// Header mess +// [SECTION] Header mess //----------------------------------------------------------------------------- -#include // FLT_MAX -#include // va_list +// Includes +#include // FLT_MIN, FLT_MAX +#include // va_list, va_start, va_end #include // ptrdiff_t, NULL #include // memset, memmove, memcpy, strlen, strchr, strcpy, strcmp -// Version -// (Integer encoded as XYYZZ for use in #if preprocessor conditionals. Work in progress versions typically starts at XYY99 then bounce up to XYY00, XYY01 etc. when release tagging happens) -#define IMGUI_VERSION "1.73" -#define IMGUI_VERSION_NUM 17300 -#define IMGUI_CHECKVERSION() ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert), sizeof(ImDrawIdx)) - // Define attributes of all API symbols declarations (e.g. for DLL under Windows) -// IMGUI_API is used for core imgui functions, IMGUI_IMPL_API is used for the default bindings files (imgui_impl_xxx.h) -// Using dear imgui via a shared library is not recommended, because of function call overhead and because we don't guarantee backward nor forward ABI compatibility. +// IMGUI_API is used for core imgui functions, IMGUI_IMPL_API is used for the default backends files (imgui_impl_xxx.h) +// Using dear imgui via a shared library is not recommended: we don't guarantee backward nor forward ABI compatibility + this is a call-heavy library and function call overhead adds up. #ifndef IMGUI_API #define IMGUI_API #endif @@ -65,38 +93,75 @@ Index of this file: #include #define IM_ASSERT(_EXPR) assert(_EXPR) // You can override the default assert handler by editing imconfig.h #endif -#if defined(__clang__) || defined(__GNUC__) -#define IM_FMTARGS(FMT) __attribute__((format(printf, FMT, FMT+1))) // Apply printf-style warnings to user functions. +#define IM_ARRAYSIZE(_ARR) ((int)(sizeof(_ARR) / sizeof(*(_ARR)))) // Size of a static C-style array. Don't use on pointers! +#define IM_UNUSED(_VAR) ((void)(_VAR)) // Used to silence "unused variable warnings". Often useful as asserts may be stripped out from final builds. + +// Check that version and structures layouts are matching between compiled imgui code and caller. Read comments above DebugCheckVersionAndDataLayout() for details. +#define IMGUI_CHECKVERSION() ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert), sizeof(ImDrawIdx)) + +// Helper Macros - IM_FMTARGS, IM_FMTLIST: Apply printf-style warnings to our formatting functions. +// (MSVC provides an equivalent mechanism via SAL Annotations but it would require the macros in a different +// location. e.g. #include + void myprintf(_Printf_format_string_ const char* format, ...)) +#if !defined(IMGUI_USE_STB_SPRINTF) && defined(__MINGW32__) && !defined(__clang__) +#define IM_FMTARGS(FMT) __attribute__((format(gnu_printf, FMT, FMT+1))) +#define IM_FMTLIST(FMT) __attribute__((format(gnu_printf, FMT, 0))) +#elif !defined(IMGUI_USE_STB_SPRINTF) && (defined(__clang__) || defined(__GNUC__)) +#define IM_FMTARGS(FMT) __attribute__((format(printf, FMT, FMT+1))) #define IM_FMTLIST(FMT) __attribute__((format(printf, FMT, 0))) #else #define IM_FMTARGS(FMT) #define IM_FMTLIST(FMT) #endif -#define IM_ARRAYSIZE(_ARR) ((int)(sizeof(_ARR)/sizeof(*_ARR))) // Size of a static C-style array. Don't use on pointers! -#define IM_UNUSED(_VAR) ((void)_VAR) // Used to silence "unused variable warnings". Often useful as asserts may be stripped out from final builds. -#if (__cplusplus >= 201100) -#define IM_OFFSETOF(_TYPE,_MEMBER) offsetof(_TYPE, _MEMBER) // Offset of _MEMBER within _TYPE. Standardized as offsetof() in C++11 + +// Disable some of MSVC most aggressive Debug runtime checks in function header/footer (used in some simple/low-level functions) +#if defined(_MSC_VER) && !defined(__clang__) && !defined(__INTEL_COMPILER) && !defined(IMGUI_DEBUG_PARANOID) +#define IM_MSVC_RUNTIME_CHECKS_OFF __pragma(runtime_checks("",off)) __pragma(check_stack(off)) __pragma(strict_gs_check(push,off)) +#define IM_MSVC_RUNTIME_CHECKS_RESTORE __pragma(runtime_checks("",restore)) __pragma(check_stack()) __pragma(strict_gs_check(pop)) #else -#define IM_OFFSETOF(_TYPE,_MEMBER) ((size_t)&(((_TYPE*)0)->_MEMBER)) // Offset of _MEMBER within _TYPE. Old style macro. +#define IM_MSVC_RUNTIME_CHECKS_OFF +#define IM_MSVC_RUNTIME_CHECKS_RESTORE #endif // Warnings +#ifdef _MSC_VER +#pragma warning (push) +#pragma warning (disable: 26495) // [Static Analyzer] Variable 'XXX' is uninitialized. Always initialize a member variable (type.6). +#endif #if defined(__clang__) #pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wold-style-cast" -#if __has_warning("-Wzero-as-null-pointer-constant") -#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" +#if __has_warning("-Wunknown-warning-option") +#pragma clang diagnostic ignored "-Wunknown-warning-option" // warning: unknown warning group 'xxx' #endif +#pragma clang diagnostic ignored "-Wunknown-pragmas" // warning: unknown warning group 'xxx' +#pragma clang diagnostic ignored "-Wold-style-cast" // warning: use of old-style cast +#pragma clang diagnostic ignored "-Wfloat-equal" // warning: comparing floating point with == or != is unsafe +#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" // warning: zero as null pointer constant +#pragma clang diagnostic ignored "-Wreserved-identifier" // warning: identifier '_Xxx' is reserved because it starts with '_' followed by a capital letter +#pragma clang diagnostic ignored "-Wunsafe-buffer-usage" // warning: 'xxx' is an unsafe pointer used for buffer access +#pragma clang diagnostic ignored "-Wnontrivial-memaccess" // warning: first argument in call to 'memset' is a pointer to non-trivially copyable type #elif defined(__GNUC__) #pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind -#pragma GCC diagnostic ignored "-Wclass-memaccess" // [__GNUC__ >= 8] warning: 'memset/memcpy' clearing/writing an object of type 'xxxx' with no trivial copy-assignment; use assignment or value-initialization instead +#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind +#pragma GCC diagnostic ignored "-Wfloat-equal" // warning: comparing floating-point with '==' or '!=' is unsafe +#pragma GCC diagnostic ignored "-Wclass-memaccess" // [__GNUC__ >= 8] warning: 'memset/memcpy' clearing/writing an object of type 'xxxx' with no trivial copy-assignment; use assignment or value-initialization instead #endif //----------------------------------------------------------------------------- -// Forward declarations and basic types +// [SECTION] Forward declarations and basic types //----------------------------------------------------------------------------- +// Scalar data types +typedef unsigned int ImGuiID;// A unique ID used by widgets (typically the result of hashing a stack of string) +typedef signed char ImS8; // 8-bit signed integer +typedef unsigned char ImU8; // 8-bit unsigned integer +typedef signed short ImS16; // 16-bit signed integer +typedef unsigned short ImU16; // 16-bit unsigned integer +typedef signed int ImS32; // 32-bit signed integer == int +typedef unsigned int ImU32; // 32-bit unsigned integer (often used to store packed colors) +typedef signed long long ImS64; // 64-bit signed integer +typedef unsigned long long ImU64; // 64-bit unsigned integer + +// Forward declarations: ImDrawList, ImFontAtlas layer struct ImDrawChannel; // Temporary storage to output draw commands out of order, used by ImDrawListSplitter and ImDrawList::ChannelsSplit() struct ImDrawCmd; // A single draw command within a parent ImDrawList (generally maps to 1 GPU draw call, unless it is a callback) struct ImDrawData; // All draw command lists required to render the frame + pos/size coordinates to use for the projection matrix. @@ -106,205 +171,276 @@ struct ImDrawListSplitter; // Helper to split a draw list into differen struct ImDrawVert; // A single vertex (pos + uv + col = 20 bytes by default. Override layout with IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT) struct ImFont; // Runtime data for a single font within a parent ImFontAtlas struct ImFontAtlas; // Runtime data for multiple fonts, bake multiple fonts into a single texture, TTF/OTF font loader +struct ImFontBuilderIO; // Opaque interface to a font builder (stb_truetype or FreeType). struct ImFontConfig; // Configuration data when adding a font or merging fonts struct ImFontGlyph; // A single font glyph (code point + coordinates within in ImFontAtlas + offset) struct ImFontGlyphRangesBuilder; // Helper to build glyph ranges from text/string data struct ImColor; // Helper functions to create a color that can be converted to either u32 or float4 (*OBSOLETE* please avoid using) -struct ImGuiContext; // Dear ImGui context (opaque structure, unless including imgui_internal.h) -struct ImGuiIO; // Main configuration and I/O between your application and ImGui -struct ImGuiInputTextCallbackData; // Shared state of InputText() when using custom ImGuiInputTextCallback (rare/advanced use) -struct ImGuiListClipper; // Helper to manually clip large list of items -struct ImGuiOnceUponAFrame; // Helper for running a block of code not more than once a frame, used by IMGUI_ONCE_UPON_A_FRAME macro -struct ImGuiPayload; // User data payload for drag and drop operations -struct ImGuiSizeCallbackData; // Callback data when using SetNextWindowSizeConstraints() (rare/advanced use) -struct ImGuiStorage; // Helper for key->value storage -struct ImGuiStyle; // Runtime data for styling/colors -struct ImGuiTextBuffer; // Helper to hold and append into a text buffer (~string builder) -struct ImGuiTextFilter; // Helper to parse and apply text filters (e.g. "aaaaa[,bbbb][,ccccc]") -// Typedefs and Enums/Flags (declared as int for compatibility with old C++, to allow using as flags and to not pollute the top of this file) -// Use your programming IDE "Go to definition" facility on the names of the center columns to find the actual flags/enum lists. -#ifndef ImTextureID -typedef void* ImTextureID; // User data to identify a texture (this is whatever to you want it to be! read the FAQ about ImTextureID in imgui.cpp) -#endif -typedef unsigned int ImGuiID; // Unique ID used by widgets (typically hashed from a stack of string) -typedef unsigned short ImWchar; // A single U16 character for keyboard input/display. We encode them as multi bytes UTF-8 when used in strings. +// Forward declarations: ImGui layer +struct ImGuiContext; // Dear ImGui context (opaque structure, unless including imgui_internal.h) +struct ImGuiIO; // Main configuration and I/O between your application and ImGui (also see: ImGuiPlatformIO) +struct ImGuiInputTextCallbackData; // Shared state of InputText() when using custom ImGuiInputTextCallback (rare/advanced use) +struct ImGuiKeyData; // Storage for ImGuiIO and IsKeyDown(), IsKeyPressed() etc functions. +struct ImGuiListClipper; // Helper to manually clip large list of items +struct ImGuiMultiSelectIO; // Structure to interact with a BeginMultiSelect()/EndMultiSelect() block +struct ImGuiOnceUponAFrame; // Helper for running a block of code not more than once a frame +struct ImGuiPayload; // User data payload for drag and drop operations +struct ImGuiPlatformIO; // Interface between platform/renderer backends and ImGui (e.g. Clipboard, IME, Multi-Viewport support). Extends ImGuiIO. +struct ImGuiPlatformImeData; // Platform IME data for io.PlatformSetImeDataFn() function. +struct ImGuiPlatformMonitor; // Multi-viewport support: user-provided bounds for each connected monitor/display. Used when positioning popups and tooltips to avoid them straddling monitors +struct ImGuiSelectionBasicStorage; // Optional helper to store multi-selection state + apply multi-selection requests. +struct ImGuiSelectionExternalStorage;//Optional helper to apply multi-selection requests to existing randomly accessible storage. +struct ImGuiSelectionRequest; // A selection request (stored in ImGuiMultiSelectIO) +struct ImGuiSizeCallbackData; // Callback data when using SetNextWindowSizeConstraints() (rare/advanced use) +struct ImGuiStorage; // Helper for key->value storage (container sorted by key) +struct ImGuiStoragePair; // Helper for key->value storage (pair) +struct ImGuiStyle; // Runtime data for styling/colors +struct ImGuiTableSortSpecs; // Sorting specifications for a table (often handling sort specs for a single column, occasionally more) +struct ImGuiTableColumnSortSpecs; // Sorting specification for one column of a table +struct ImGuiTextBuffer; // Helper to hold and append into a text buffer (~string builder) +struct ImGuiTextFilter; // Helper to parse and apply text filters (e.g. "aaaaa[,bbbbb][,ccccc]") +struct ImGuiViewport; // A Platform Window (always 1 unless multi-viewport are enabled. One per platform window to output to). In the future may represent Platform Monitor +struct ImGuiWindowClass; // Window class (rare/advanced uses: provide hints to the platform backend via altered viewport flags and parent/child info) + +// Enumerations +// - We don't use strongly typed enums much because they add constraints (can't extend in private code, can't store typed in bit fields, extra casting on iteration) +// - Tip: Use your programming IDE navigation facilities on the names in the _central column_ below to find the actual flags/enum lists! +// - In Visual Studio: CTRL+comma ("Edit.GoToAll") can follow symbols inside comments, whereas CTRL+F12 ("Edit.GoToImplementation") cannot. +// - In Visual Studio w/ Visual Assist installed: ALT+G ("VAssistX.GoToImplementation") can also follow symbols inside comments. +// - In VS Code, CLion, etc.: CTRL+click can follow symbols inside comments. +enum ImGuiDir : int; // -> enum ImGuiDir // Enum: A cardinal direction (Left, Right, Up, Down) +enum ImGuiKey : int; // -> enum ImGuiKey // Enum: A key identifier (ImGuiKey_XXX or ImGuiMod_XXX value) +enum ImGuiMouseSource : int; // -> enum ImGuiMouseSource // Enum; A mouse input source identifier (Mouse, TouchScreen, Pen) +enum ImGuiSortDirection : ImU8; // -> enum ImGuiSortDirection // Enum: A sorting direction (ascending or descending) typedef int ImGuiCol; // -> enum ImGuiCol_ // Enum: A color identifier for styling typedef int ImGuiCond; // -> enum ImGuiCond_ // Enum: A condition for many Set*() functions typedef int ImGuiDataType; // -> enum ImGuiDataType_ // Enum: A primary data type -typedef int ImGuiDir; // -> enum ImGuiDir_ // Enum: A cardinal direction -typedef int ImGuiKey; // -> enum ImGuiKey_ // Enum: A key identifier (ImGui-side enum) -typedef int ImGuiNavInput; // -> enum ImGuiNavInput_ // Enum: An input identifier for navigation -typedef int ImGuiMouseCursor; // -> enum ImGuiMouseCursor_ // Enum: A mouse cursor identifier +typedef int ImGuiMouseButton; // -> enum ImGuiMouseButton_ // Enum: A mouse button identifier (0=left, 1=right, 2=middle) +typedef int ImGuiMouseCursor; // -> enum ImGuiMouseCursor_ // Enum: A mouse cursor shape typedef int ImGuiStyleVar; // -> enum ImGuiStyleVar_ // Enum: A variable identifier for styling -typedef int ImDrawCornerFlags; // -> enum ImDrawCornerFlags_ // Flags: for ImDrawList::AddRect(), AddRectFilled() etc. -typedef int ImDrawListFlags; // -> enum ImDrawListFlags_ // Flags: for ImDrawList -typedef int ImFontAtlasFlags; // -> enum ImFontAtlasFlags_ // Flags: for ImFontAtlas +typedef int ImGuiTableBgTarget; // -> enum ImGuiTableBgTarget_ // Enum: A color target for TableSetBgColor() + +// Flags (declared as int to allow using as flags without overhead, and to not pollute the top of this file) +// - Tip: Use your programming IDE navigation facilities on the names in the _central column_ below to find the actual flags/enum lists! +// - In Visual Studio: CTRL+comma ("Edit.GoToAll") can follow symbols inside comments, whereas CTRL+F12 ("Edit.GoToImplementation") cannot. +// - In Visual Studio w/ Visual Assist installed: ALT+G ("VAssistX.GoToImplementation") can also follow symbols inside comments. +// - In VS Code, CLion, etc.: CTRL+click can follow symbols inside comments. +typedef int ImDrawFlags; // -> enum ImDrawFlags_ // Flags: for ImDrawList functions +typedef int ImDrawListFlags; // -> enum ImDrawListFlags_ // Flags: for ImDrawList instance +typedef int ImFontAtlasFlags; // -> enum ImFontAtlasFlags_ // Flags: for ImFontAtlas build typedef int ImGuiBackendFlags; // -> enum ImGuiBackendFlags_ // Flags: for io.BackendFlags +typedef int ImGuiButtonFlags; // -> enum ImGuiButtonFlags_ // Flags: for InvisibleButton() +typedef int ImGuiChildFlags; // -> enum ImGuiChildFlags_ // Flags: for BeginChild() typedef int ImGuiColorEditFlags; // -> enum ImGuiColorEditFlags_ // Flags: for ColorEdit4(), ColorPicker4() etc. typedef int ImGuiConfigFlags; // -> enum ImGuiConfigFlags_ // Flags: for io.ConfigFlags typedef int ImGuiComboFlags; // -> enum ImGuiComboFlags_ // Flags: for BeginCombo() +typedef int ImGuiDockNodeFlags; // -> enum ImGuiDockNodeFlags_ // Flags: for DockSpace() typedef int ImGuiDragDropFlags; // -> enum ImGuiDragDropFlags_ // Flags: for BeginDragDropSource(), AcceptDragDropPayload() typedef int ImGuiFocusedFlags; // -> enum ImGuiFocusedFlags_ // Flags: for IsWindowFocused() typedef int ImGuiHoveredFlags; // -> enum ImGuiHoveredFlags_ // Flags: for IsItemHovered(), IsWindowHovered() etc. +typedef int ImGuiInputFlags; // -> enum ImGuiInputFlags_ // Flags: for Shortcut(), SetNextItemShortcut() typedef int ImGuiInputTextFlags; // -> enum ImGuiInputTextFlags_ // Flags: for InputText(), InputTextMultiline() +typedef int ImGuiItemFlags; // -> enum ImGuiItemFlags_ // Flags: for PushItemFlag(), shared by all items +typedef int ImGuiKeyChord; // -> ImGuiKey | ImGuiMod_XXX // Flags: for IsKeyChordPressed(), Shortcut() etc. an ImGuiKey optionally OR-ed with one or more ImGuiMod_XXX values. +typedef int ImGuiPopupFlags; // -> enum ImGuiPopupFlags_ // Flags: for OpenPopup*(), BeginPopupContext*(), IsPopupOpen() +typedef int ImGuiMultiSelectFlags; // -> enum ImGuiMultiSelectFlags_// Flags: for BeginMultiSelect() typedef int ImGuiSelectableFlags; // -> enum ImGuiSelectableFlags_ // Flags: for Selectable() +typedef int ImGuiSliderFlags; // -> enum ImGuiSliderFlags_ // Flags: for DragFloat(), DragInt(), SliderFloat(), SliderInt() etc. typedef int ImGuiTabBarFlags; // -> enum ImGuiTabBarFlags_ // Flags: for BeginTabBar() typedef int ImGuiTabItemFlags; // -> enum ImGuiTabItemFlags_ // Flags: for BeginTabItem() +typedef int ImGuiTableFlags; // -> enum ImGuiTableFlags_ // Flags: For BeginTable() +typedef int ImGuiTableColumnFlags; // -> enum ImGuiTableColumnFlags_// Flags: For TableSetupColumn() +typedef int ImGuiTableRowFlags; // -> enum ImGuiTableRowFlags_ // Flags: For TableNextRow() typedef int ImGuiTreeNodeFlags; // -> enum ImGuiTreeNodeFlags_ // Flags: for TreeNode(), TreeNodeEx(), CollapsingHeader() +typedef int ImGuiViewportFlags; // -> enum ImGuiViewportFlags_ // Flags: for ImGuiViewport typedef int ImGuiWindowFlags; // -> enum ImGuiWindowFlags_ // Flags: for Begin(), BeginChild() -typedef int (*ImGuiInputTextCallback)(ImGuiInputTextCallbackData *data); -typedef void (*ImGuiSizeCallback)(ImGuiSizeCallbackData* data); -// Scalar data types -typedef signed char ImS8; // 8-bit signed integer == char -typedef unsigned char ImU8; // 8-bit unsigned integer -typedef signed short ImS16; // 16-bit signed integer -typedef unsigned short ImU16; // 16-bit unsigned integer -typedef signed int ImS32; // 32-bit signed integer == int -typedef unsigned int ImU32; // 32-bit unsigned integer (often used to store packed colors) -#if defined(_MSC_VER) && !defined(__clang__) -typedef signed __int64 ImS64; // 64-bit signed integer (pre and post C++11 with Visual Studio) -typedef unsigned __int64 ImU64; // 64-bit unsigned integer (pre and post C++11 with Visual Studio) -#elif (defined(__clang__) || defined(__GNUC__)) && (__cplusplus < 201100) -#include -typedef int64_t ImS64; // 64-bit signed integer (pre C++11) -typedef uint64_t ImU64; // 64-bit unsigned integer (pre C++11) +// Character types +// (we generally use UTF-8 encoded string in the API. This is storage specifically for a decoded character used for keyboard input and display) +typedef unsigned int ImWchar32; // A single decoded U32 character/code point. We encode them as multi bytes UTF-8 when used in strings. +typedef unsigned short ImWchar16; // A single decoded U16 character/code point. We encode them as multi bytes UTF-8 when used in strings. +#ifdef IMGUI_USE_WCHAR32 // ImWchar [configurable type: override in imconfig.h with '#define IMGUI_USE_WCHAR32' to support Unicode planes 1-16] +typedef ImWchar32 ImWchar; #else -typedef signed long long ImS64; // 64-bit signed integer (post C++11) -typedef unsigned long long ImU64; // 64-bit unsigned integer (post C++11) +typedef ImWchar16 ImWchar; #endif -// 2D vector (often used to store positions, sizes, etc.) +// Multi-Selection item index or identifier when using BeginMultiSelect() +// - Used by SetNextItemSelectionUserData() + and inside ImGuiMultiSelectIO structure. +// - Most users are likely to use this store an item INDEX but this may be used to store a POINTER/ID as well. Read comments near ImGuiMultiSelectIO for details. +typedef ImS64 ImGuiSelectionUserData; + +// Callback and functions types +typedef int (*ImGuiInputTextCallback)(ImGuiInputTextCallbackData* data); // Callback function for ImGui::InputText() +typedef void (*ImGuiSizeCallback)(ImGuiSizeCallbackData* data); // Callback function for ImGui::SetNextWindowSizeConstraints() +typedef void* (*ImGuiMemAllocFunc)(size_t sz, void* user_data); // Function signature for ImGui::SetAllocatorFunctions() +typedef void (*ImGuiMemFreeFunc)(void* ptr, void* user_data); // Function signature for ImGui::SetAllocatorFunctions() + +// ImVec2: 2D vector used to store positions, sizes etc. [Compile-time configurable type] +// - This is a frequently used type in the API. Consider using IM_VEC2_CLASS_EXTRA to create implicit cast from/to our preferred type. +// - Add '#define IMGUI_DEFINE_MATH_OPERATORS' before including this file (or in imconfig.h) to access courtesy maths operators for ImVec2 and ImVec4. +IM_MSVC_RUNTIME_CHECKS_OFF struct ImVec2 { - float x, y; - ImVec2() { x = y = 0.0f; } - ImVec2(float _x, float _y) { x = _x; y = _y; } - float operator[] (size_t idx) const { IM_ASSERT(idx <= 1); return (&x)[idx]; } // We very rarely use this [] operator, the assert overhead is fine. - float& operator[] (size_t idx) { IM_ASSERT(idx <= 1); return (&x)[idx]; } // We very rarely use this [] operator, the assert overhead is fine. + float x, y; + constexpr ImVec2() : x(0.0f), y(0.0f) { } + constexpr ImVec2(float _x, float _y) : x(_x), y(_y) { } + float& operator[] (size_t idx) { IM_ASSERT(idx == 0 || idx == 1); return ((float*)(void*)(char*)this)[idx]; } // We very rarely use this [] operator, so the assert overhead is fine. + float operator[] (size_t idx) const { IM_ASSERT(idx == 0 || idx == 1); return ((const float*)(const void*)(const char*)this)[idx]; } #ifdef IM_VEC2_CLASS_EXTRA IM_VEC2_CLASS_EXTRA // Define additional constructors and implicit cast operators in imconfig.h to convert back and forth between your math types and ImVec2. #endif }; -// 4D vector (often used to store floating-point colors) +// ImVec4: 4D vector used to store clipping rectangles, colors etc. [Compile-time configurable type] struct ImVec4 { - float x, y, z, w; - ImVec4() { x = y = z = w = 0.0f; } - ImVec4(float _x, float _y, float _z, float _w) { x = _x; y = _y; z = _z; w = _w; } + float x, y, z, w; + constexpr ImVec4() : x(0.0f), y(0.0f), z(0.0f), w(0.0f) { } + constexpr ImVec4(float _x, float _y, float _z, float _w) : x(_x), y(_y), z(_z), w(_w) { } #ifdef IM_VEC4_CLASS_EXTRA IM_VEC4_CLASS_EXTRA // Define additional constructors and implicit cast operators in imconfig.h to convert back and forth between your math types and ImVec4. #endif }; +IM_MSVC_RUNTIME_CHECKS_RESTORE //----------------------------------------------------------------------------- -// ImGui: Dear ImGui end-user API -// (Inside a namespace so you can add extra functions in your own separate file. Please don't modify imgui.cpp/.h!) +// [SECTION] Texture identifier (ImTextureID) +//----------------------------------------------------------------------------- + +// ImTexture: user data for renderer backend to identify a texture [Compile-time configurable type] +// - To use something else than an opaque void* pointer: override with e.g. '#define ImTextureID MyTextureType*' in your imconfig.h file. +// - This can be whatever to you want it to be! read the FAQ about ImTextureID for details. +// - You can make this a structure with various constructors if you need. You will have to implement ==/!= operators. +// - (note: before v1.91.4 (2024/10/08) the default type for ImTextureID was void*. Use intermediary intptr_t cast and read FAQ if you have casting warnings) +#ifndef ImTextureID +typedef ImU64 ImTextureID; // Default: store a pointer or an integer fitting in a pointer (most renderer backends are ok with that) +#endif + +//----------------------------------------------------------------------------- +// [SECTION] Dear ImGui end-user API functions +// (Note that ImGui:: being a namespace, you can add extra ImGui:: functions in your own separate file. Please don't modify imgui source files!) //----------------------------------------------------------------------------- namespace ImGui { // Context creation and access - // Each context create its own ImFontAtlas by default. You may instance one yourself and pass it to CreateContext() to share a font atlas between imgui contexts. - // All those functions are not reliant on the current context. + // - Each context create its own ImFontAtlas by default. You may instance one yourself and pass it to CreateContext() to share a font atlas between contexts. + // - DLL users: heaps and globals are not shared across DLL boundaries! You will need to call SetCurrentContext() + SetAllocatorFunctions() + // for each static/DLL boundary you are calling from. Read "Context and Memory Allocators" section of imgui.cpp for details. IMGUI_API ImGuiContext* CreateContext(ImFontAtlas* shared_font_atlas = NULL); IMGUI_API void DestroyContext(ImGuiContext* ctx = NULL); // NULL = destroy current context IMGUI_API ImGuiContext* GetCurrentContext(); IMGUI_API void SetCurrentContext(ImGuiContext* ctx); - IMGUI_API bool DebugCheckVersionAndDataLayout(const char* version_str, size_t sz_io, size_t sz_style, size_t sz_vec2, size_t sz_vec4, size_t sz_drawvert, size_t sz_drawidx); // Main - IMGUI_API ImGuiIO& GetIO(); // access the IO structure (mouse/keyboard/gamepad inputs, time, various configuration options/flags) - IMGUI_API ImGuiStyle& GetStyle(); // access the Style structure (colors, sizes). Always use PushStyleCol(), PushStyleVar() to modify style mid-frame. + IMGUI_API ImGuiIO& GetIO(); // access the ImGuiIO structure (mouse/keyboard/gamepad inputs, time, various configuration options/flags) + IMGUI_API ImGuiPlatformIO& GetPlatformIO(); // access the ImGuiPlatformIO structure (mostly hooks/functions to connect to platform/renderer and OS Clipboard, IME etc.) + IMGUI_API ImGuiStyle& GetStyle(); // access the Style structure (colors, sizes). Always use PushStyleColor(), PushStyleVar() to modify style mid-frame! IMGUI_API void NewFrame(); // start a new Dear ImGui frame, you can submit any command from this point until Render()/EndFrame(). - IMGUI_API void EndFrame(); // ends the Dear ImGui frame. automatically called by Render(), you likely don't need to call that yourself directly. If you don't need to render data (skipping rendering) you may call EndFrame() but you'll have wasted CPU already! If you don't need to render, better to not create any imgui windows and not call NewFrame() at all! - IMGUI_API void Render(); // ends the Dear ImGui frame, finalize the draw data. You can get call GetDrawData() to obtain it and run your rendering function. (Obsolete: this used to call io.RenderDrawListsFn(). Nowadays, we allow and prefer calling your render function yourself.) + IMGUI_API void EndFrame(); // ends the Dear ImGui frame. automatically called by Render(). If you don't need to render data (skipping rendering) you may call EndFrame() without Render()... but you'll have wasted CPU already! If you don't need to render, better to not create any windows and not call NewFrame() at all! + IMGUI_API void Render(); // ends the Dear ImGui frame, finalize the draw data. You can then get call GetDrawData(). IMGUI_API ImDrawData* GetDrawData(); // valid after Render() and until the next call to NewFrame(). this is what you have to render. // Demo, Debug, Information - IMGUI_API void ShowDemoWindow(bool* p_open = NULL); // create Demo window (previously called ShowTestWindow). demonstrate most ImGui features. call this to learn about the library! try to make it always available in your application! + IMGUI_API void ShowDemoWindow(bool* p_open = NULL); // create Demo window. demonstrate most ImGui features. call this to learn about the library! try to make it always available in your application! + IMGUI_API void ShowMetricsWindow(bool* p_open = NULL); // create Metrics/Debugger window. display Dear ImGui internals: windows, draw commands, various internal state, etc. + IMGUI_API void ShowDebugLogWindow(bool* p_open = NULL); // create Debug Log window. display a simplified log of important dear imgui events. + IMGUI_API void ShowIDStackToolWindow(bool* p_open = NULL); // create Stack Tool window. hover items with mouse to query information about the source of their unique ID. IMGUI_API void ShowAboutWindow(bool* p_open = NULL); // create About window. display Dear ImGui version, credits and build/system information. - IMGUI_API void ShowMetricsWindow(bool* p_open = NULL); // create Metrics/Debug window. display Dear ImGui internals: draw commands (with individual draw calls and vertices), window list, basic internal state, etc. IMGUI_API void ShowStyleEditor(ImGuiStyle* ref = NULL); // add style editor block (not a window). you can pass in a reference ImGuiStyle structure to compare to, revert to and save to (else it uses the default style) IMGUI_API bool ShowStyleSelector(const char* label); // add style selector block (not a window), essentially a combo listing the default styles. IMGUI_API void ShowFontSelector(const char* label); // add font selector block (not a window), essentially a combo listing the loaded fonts. - IMGUI_API void ShowUserGuide(); // add basic help/info block (not a window): how to manipulate ImGui as a end-user (mouse/keyboard controls). - IMGUI_API const char* GetVersion(); // get the compiled version string e.g. "1.23" (essentially the compiled value for IMGUI_VERSION) + IMGUI_API void ShowUserGuide(); // add basic help/info block (not a window): how to manipulate ImGui as an end-user (mouse/keyboard controls). + IMGUI_API const char* GetVersion(); // get the compiled version string e.g. "1.80 WIP" (essentially the value for IMGUI_VERSION from the compiled version of imgui.cpp) // Styles IMGUI_API void StyleColorsDark(ImGuiStyle* dst = NULL); // new, recommended style (default) - IMGUI_API void StyleColorsClassic(ImGuiStyle* dst = NULL); // classic imgui style IMGUI_API void StyleColorsLight(ImGuiStyle* dst = NULL); // best used with borders and a custom, thicker font + IMGUI_API void StyleColorsClassic(ImGuiStyle* dst = NULL); // classic imgui style // Windows // - Begin() = push window to the stack and start appending to it. End() = pop window from the stack. - // - You may append multiple times to the same window during the same frame. // - Passing 'bool* p_open != NULL' shows a window-closing widget in the upper-right corner of the window, // which clicking will set the boolean to false when clicked. + // - You may append multiple times to the same window during the same frame by calling Begin()/End() pairs multiple times. + // Some information such as 'flags' or 'p_open' will only be considered by the first call to Begin(). // - Begin() return false to indicate the window is collapsed or fully clipped, so you may early out and omit submitting // anything to the window. Always call a matching End() for each Begin() call, regardless of its return value! - // [this is due to legacy reason and is inconsistent with most other functions such as BeginMenu/EndMenu, BeginPopup/EndPopup, etc. - // where the EndXXX call should only be called if the corresponding BeginXXX function returned true.] + // [Important: due to legacy reason, Begin/End and BeginChild/EndChild are inconsistent with all other functions + // such as BeginMenu/EndMenu, BeginPopup/EndPopup, etc. where the EndXXX call should only be called if the corresponding + // BeginXXX function returned true. Begin and BeginChild are the only odd ones out. Will be fixed in a future update.] // - Note that the bottom of window stack always contains a window called "Debug". IMGUI_API bool Begin(const char* name, bool* p_open = NULL, ImGuiWindowFlags flags = 0); IMGUI_API void End(); // Child Windows // - Use child windows to begin into a self-contained independent scrolling/clipping regions within a host window. Child windows can embed their own child. - // - For each independent axis of 'size': ==0.0f: use remaining host window size / >0.0f: fixed size / <0.0f: use remaining window size minus abs(size) / Each axis can use a different mode, e.g. ImVec2(0,400). - // - BeginChild() returns false to indicate the window is collapsed or fully clipped, so you may early out and omit submitting anything to the window. - // Always call a matching EndChild() for each BeginChild() call, regardless of its return value [this is due to legacy reason and is inconsistent with most other functions such as BeginMenu/EndMenu, BeginPopup/EndPopup, etc. where the EndXXX call should only be called if the corresponding BeginXXX function returned true.] - IMGUI_API bool BeginChild(const char* str_id, const ImVec2& size = ImVec2(0,0), bool border = false, ImGuiWindowFlags flags = 0); - IMGUI_API bool BeginChild(ImGuiID id, const ImVec2& size = ImVec2(0,0), bool border = false, ImGuiWindowFlags flags = 0); + // - Before 1.90 (November 2023), the "ImGuiChildFlags child_flags = 0" parameter was "bool border = false". + // This API is backward compatible with old code, as we guarantee that ImGuiChildFlags_Borders == true. + // Consider updating your old code: + // BeginChild("Name", size, false) -> Begin("Name", size, 0); or Begin("Name", size, ImGuiChildFlags_None); + // BeginChild("Name", size, true) -> Begin("Name", size, ImGuiChildFlags_Borders); + // - Manual sizing (each axis can use a different setting e.g. ImVec2(0.0f, 400.0f)): + // == 0.0f: use remaining parent window size for this axis. + // > 0.0f: use specified size for this axis. + // < 0.0f: right/bottom-align to specified distance from available content boundaries. + // - Specifying ImGuiChildFlags_AutoResizeX or ImGuiChildFlags_AutoResizeY makes the sizing automatic based on child contents. + // Combining both ImGuiChildFlags_AutoResizeX _and_ ImGuiChildFlags_AutoResizeY defeats purpose of a scrolling region and is NOT recommended. + // - BeginChild() returns false to indicate the window is collapsed or fully clipped, so you may early out and omit submitting + // anything to the window. Always call a matching EndChild() for each BeginChild() call, regardless of its return value. + // [Important: due to legacy reason, Begin/End and BeginChild/EndChild are inconsistent with all other functions + // such as BeginMenu/EndMenu, BeginPopup/EndPopup, etc. where the EndXXX call should only be called if the corresponding + // BeginXXX function returned true. Begin and BeginChild are the only odd ones out. Will be fixed in a future update.] + IMGUI_API bool BeginChild(const char* str_id, const ImVec2& size = ImVec2(0, 0), ImGuiChildFlags child_flags = 0, ImGuiWindowFlags window_flags = 0); + IMGUI_API bool BeginChild(ImGuiID id, const ImVec2& size = ImVec2(0, 0), ImGuiChildFlags child_flags = 0, ImGuiWindowFlags window_flags = 0); IMGUI_API void EndChild(); // Windows Utilities - // - "current window" = the window we are appending into while inside a Begin()/End() block. "next window" = next window we will Begin() into. + // - 'current window' = the window we are appending into while inside a Begin()/End() block. 'next window' = next window we will Begin() into. IMGUI_API bool IsWindowAppearing(); IMGUI_API bool IsWindowCollapsed(); IMGUI_API bool IsWindowFocused(ImGuiFocusedFlags flags=0); // is current window focused? or its root/child, depending on flags. see flags for options. - IMGUI_API bool IsWindowHovered(ImGuiHoveredFlags flags=0); // is current window hovered (and typically: not blocked by a popup/modal)? see flags for options. NB: If you are trying to check whether your mouse should be dispatched to imgui or to your app, you should use the 'io.WantCaptureMouse' boolean for that! Please read the FAQ! + IMGUI_API bool IsWindowHovered(ImGuiHoveredFlags flags=0); // is current window hovered and hoverable (e.g. not blocked by a popup/modal)? See ImGuiHoveredFlags_ for options. IMPORTANT: If you are trying to check whether your mouse should be dispatched to Dear ImGui or to your underlying app, you should not use this function! Use the 'io.WantCaptureMouse' boolean for that! Refer to FAQ entry "How can I tell whether to dispatch mouse/keyboard to Dear ImGui or my application?" for details. IMGUI_API ImDrawList* GetWindowDrawList(); // get draw list associated to the current window, to append your own drawing primitives - IMGUI_API ImVec2 GetWindowPos(); // get current window position in screen space (useful if you want to do your own drawing via the DrawList API) - IMGUI_API ImVec2 GetWindowSize(); // get current window size - IMGUI_API float GetWindowWidth(); // get current window width (shortcut for GetWindowSize().x) - IMGUI_API float GetWindowHeight(); // get current window height (shortcut for GetWindowSize().y) + IMGUI_API float GetWindowDpiScale(); // get DPI scale currently associated to the current window's viewport. + IMGUI_API ImVec2 GetWindowPos(); // get current window position in screen space (IT IS UNLIKELY YOU EVER NEED TO USE THIS. Consider always using GetCursorScreenPos() and GetContentRegionAvail() instead) + IMGUI_API ImVec2 GetWindowSize(); // get current window size (IT IS UNLIKELY YOU EVER NEED TO USE THIS. Consider always using GetCursorScreenPos() and GetContentRegionAvail() instead) + IMGUI_API float GetWindowWidth(); // get current window width (IT IS UNLIKELY YOU EVER NEED TO USE THIS). Shortcut for GetWindowSize().x. + IMGUI_API float GetWindowHeight(); // get current window height (IT IS UNLIKELY YOU EVER NEED TO USE THIS). Shortcut for GetWindowSize().y. + IMGUI_API ImGuiViewport*GetWindowViewport(); // get viewport currently associated to the current window. - // Prefer using SetNextXXX functions (before Begin) rather that SetXXX functions (after Begin). - IMGUI_API void SetNextWindowPos(const ImVec2& pos, ImGuiCond cond = 0, const ImVec2& pivot = ImVec2(0,0)); // set next window position. call before Begin(). use pivot=(0.5f,0.5f) to center on given point, etc. + // Window manipulation + // - Prefer using SetNextXXX functions (before Begin) rather that SetXXX functions (after Begin). + IMGUI_API void SetNextWindowPos(const ImVec2& pos, ImGuiCond cond = 0, const ImVec2& pivot = ImVec2(0, 0)); // set next window position. call before Begin(). use pivot=(0.5f,0.5f) to center on given point, etc. IMGUI_API void SetNextWindowSize(const ImVec2& size, ImGuiCond cond = 0); // set next window size. set axis to 0.0f to force an auto-fit on this axis. call before Begin() - IMGUI_API void SetNextWindowSizeConstraints(const ImVec2& size_min, const ImVec2& size_max, ImGuiSizeCallback custom_callback = NULL, void* custom_callback_data = NULL); // set next window size limits. use -1,-1 on either X/Y axis to preserve the current size. Sizes will be rounded down. Use callback to apply non-trivial programmatic constraints. + IMGUI_API void SetNextWindowSizeConstraints(const ImVec2& size_min, const ImVec2& size_max, ImGuiSizeCallback custom_callback = NULL, void* custom_callback_data = NULL); // set next window size limits. use 0.0f or FLT_MAX if you don't want limits. Use -1 for both min and max of same axis to preserve current size (which itself is a constraint). Use callback to apply non-trivial programmatic constraints. IMGUI_API void SetNextWindowContentSize(const ImVec2& size); // set next window content size (~ scrollable client area, which enforce the range of scrollbars). Not including window decorations (title bar, menu bar, etc.) nor WindowPadding. set an axis to 0.0f to leave it automatic. call before Begin() IMGUI_API void SetNextWindowCollapsed(bool collapsed, ImGuiCond cond = 0); // set next window collapsed state. call before Begin() IMGUI_API void SetNextWindowFocus(); // set next window to be focused / top-most. call before Begin() - IMGUI_API void SetNextWindowBgAlpha(float alpha); // set next window background color alpha. helper to easily modify ImGuiCol_WindowBg/ChildBg/PopupBg. you may also use ImGuiWindowFlags_NoBackground. + IMGUI_API void SetNextWindowScroll(const ImVec2& scroll); // set next window scrolling value (use < 0.0f to not affect a given axis). + IMGUI_API void SetNextWindowBgAlpha(float alpha); // set next window background color alpha. helper to easily override the Alpha component of ImGuiCol_WindowBg/ChildBg/PopupBg. you may also use ImGuiWindowFlags_NoBackground. + IMGUI_API void SetNextWindowViewport(ImGuiID viewport_id); // set next window viewport IMGUI_API void SetWindowPos(const ImVec2& pos, ImGuiCond cond = 0); // (not recommended) set current window position - call within Begin()/End(). prefer using SetNextWindowPos(), as this may incur tearing and side-effects. - IMGUI_API void SetWindowSize(const ImVec2& size, ImGuiCond cond = 0); // (not recommended) set current window size - call within Begin()/End(). set to ImVec2(0,0) to force an auto-fit. prefer using SetNextWindowSize(), as this may incur tearing and minor side-effects. + IMGUI_API void SetWindowSize(const ImVec2& size, ImGuiCond cond = 0); // (not recommended) set current window size - call within Begin()/End(). set to ImVec2(0, 0) to force an auto-fit. prefer using SetNextWindowSize(), as this may incur tearing and minor side-effects. IMGUI_API void SetWindowCollapsed(bool collapsed, ImGuiCond cond = 0); // (not recommended) set current window collapsed state. prefer using SetNextWindowCollapsed(). IMGUI_API void SetWindowFocus(); // (not recommended) set current window to be focused / top-most. prefer using SetNextWindowFocus(). - IMGUI_API void SetWindowFontScale(float scale); // set font scale. Adjust IO.FontGlobalScale if you want to scale all windows. This is an old API! For correct scaling, prefer to reload font + rebuild ImFontAtlas + call style.ScaleAllSizes(). + IMGUI_API void SetWindowFontScale(float scale); // [OBSOLETE] set font scale. Adjust IO.FontGlobalScale if you want to scale all windows. This is an old API! For correct scaling, prefer to reload font + rebuild ImFontAtlas + call style.ScaleAllSizes(). IMGUI_API void SetWindowPos(const char* name, const ImVec2& pos, ImGuiCond cond = 0); // set named window position. IMGUI_API void SetWindowSize(const char* name, const ImVec2& size, ImGuiCond cond = 0); // set named window size. set axis to 0.0f to force an auto-fit on this axis. IMGUI_API void SetWindowCollapsed(const char* name, bool collapsed, ImGuiCond cond = 0); // set named window collapsed state IMGUI_API void SetWindowFocus(const char* name); // set named window to be focused / top-most. use NULL to remove focus. - // Content region - // - Those functions are bound to be redesigned soon (they are confusing, incomplete and return values in local window coordinates which increases confusion) - IMGUI_API ImVec2 GetContentRegionMax(); // current content boundaries (typically window boundaries including scrolling, or current column boundaries), in windows coordinates - IMGUI_API ImVec2 GetContentRegionAvail(); // == GetContentRegionMax() - GetCursorPos() - IMGUI_API ImVec2 GetWindowContentRegionMin(); // content boundaries min (roughly (0,0)-Scroll), in window coordinates - IMGUI_API ImVec2 GetWindowContentRegionMax(); // content boundaries max (roughly (0,0)+Size-Scroll) where Size can be override with SetNextWindowContentSize(), in window coordinates - IMGUI_API float GetWindowContentRegionWidth(); // - // Windows Scrolling - IMGUI_API float GetScrollX(); // get scrolling amount [0..GetScrollMaxX()] - IMGUI_API float GetScrollY(); // get scrolling amount [0..GetScrollMaxY()] - IMGUI_API float GetScrollMaxX(); // get maximum scrolling amount ~~ ContentSize.X - WindowSize.X - IMGUI_API float GetScrollMaxY(); // get maximum scrolling amount ~~ ContentSize.Y - WindowSize.Y - IMGUI_API void SetScrollX(float scroll_x); // set scrolling amount [0..GetScrollMaxX()] - IMGUI_API void SetScrollY(float scroll_y); // set scrolling amount [0..GetScrollMaxY()] + // - Any change of Scroll will be applied at the beginning of next frame in the first call to Begin(). + // - You may instead use SetNextWindowScroll() prior to calling Begin() to avoid this delay, as an alternative to using SetScrollX()/SetScrollY(). + IMGUI_API float GetScrollX(); // get scrolling amount [0 .. GetScrollMaxX()] + IMGUI_API float GetScrollY(); // get scrolling amount [0 .. GetScrollMaxY()] + IMGUI_API void SetScrollX(float scroll_x); // set scrolling amount [0 .. GetScrollMaxX()] + IMGUI_API void SetScrollY(float scroll_y); // set scrolling amount [0 .. GetScrollMaxY()] + IMGUI_API float GetScrollMaxX(); // get maximum scrolling amount ~~ ContentSize.x - WindowSize.x - DecorationsSize.x + IMGUI_API float GetScrollMaxY(); // get maximum scrolling amount ~~ ContentSize.y - WindowSize.y - DecorationsSize.y IMGUI_API void SetScrollHereX(float center_x_ratio = 0.5f); // adjust scrolling amount to make current cursor position visible. center_x_ratio=0.0: left, 0.5: center, 1.0: right. When using to make a "default/current item" visible, consider using SetItemDefaultFocus() instead. IMGUI_API void SetScrollHereY(float center_y_ratio = 0.5f); // adjust scrolling amount to make current cursor position visible. center_y_ratio=0.0: top, 0.5: center, 1.0: bottom. When using to make a "default/current item" visible, consider using SetItemDefaultFocus() instead. IMGUI_API void SetScrollFromPosX(float local_x, float center_x_ratio = 0.5f); // adjust scrolling amount to make given position visible. Generally GetCursorStartPos() + offset to compute a valid position. @@ -313,53 +449,66 @@ namespace ImGui // Parameters stacks (shared) IMGUI_API void PushFont(ImFont* font); // use NULL as a shortcut to push default font IMGUI_API void PopFont(); - IMGUI_API void PushStyleColor(ImGuiCol idx, ImU32 col); + IMGUI_API void PushStyleColor(ImGuiCol idx, ImU32 col); // modify a style color. always use this if you modify the style after NewFrame(). IMGUI_API void PushStyleColor(ImGuiCol idx, const ImVec4& col); IMGUI_API void PopStyleColor(int count = 1); - IMGUI_API void PushStyleVar(ImGuiStyleVar idx, float val); - IMGUI_API void PushStyleVar(ImGuiStyleVar idx, const ImVec2& val); + IMGUI_API void PushStyleVar(ImGuiStyleVar idx, float val); // modify a style float variable. always use this if you modify the style after NewFrame()! + IMGUI_API void PushStyleVar(ImGuiStyleVar idx, const ImVec2& val); // modify a style ImVec2 variable. " + IMGUI_API void PushStyleVarX(ImGuiStyleVar idx, float val_x); // modify X component of a style ImVec2 variable. " + IMGUI_API void PushStyleVarY(ImGuiStyleVar idx, float val_y); // modify Y component of a style ImVec2 variable. " IMGUI_API void PopStyleVar(int count = 1); - IMGUI_API const ImVec4& GetStyleColorVec4(ImGuiCol idx); // retrieve style color as stored in ImGuiStyle structure. use to feed back into PushStyleColor(), otherwise use GetColorU32() to get style color with style alpha baked in. - IMGUI_API ImFont* GetFont(); // get current font - IMGUI_API float GetFontSize(); // get current font size (= height in pixels) of current font with current scale applied - IMGUI_API ImVec2 GetFontTexUvWhitePixel(); // get UV coordinate for a while pixel, useful to draw custom shapes via the ImDrawList API - IMGUI_API ImU32 GetColorU32(ImGuiCol idx, float alpha_mul = 1.0f); // retrieve given style color with style alpha applied and optional extra alpha multiplier - IMGUI_API ImU32 GetColorU32(const ImVec4& col); // retrieve given color with style alpha applied - IMGUI_API ImU32 GetColorU32(ImU32 col); // retrieve given color with style alpha applied + IMGUI_API void PushItemFlag(ImGuiItemFlags option, bool enabled); // modify specified shared item flag, e.g. PushItemFlag(ImGuiItemFlags_NoTabStop, true) + IMGUI_API void PopItemFlag(); // Parameters stacks (current window) - IMGUI_API void PushItemWidth(float item_width); // set width of items for common large "item+label" widgets. >0.0f: width in pixels, <0.0f align xx pixels to the right of window (so -1.0f always align width to the right side). 0.0f = default to ~2/3 of windows width, + IMGUI_API void PushItemWidth(float item_width); // push width of items for common large "item+label" widgets. >0.0f: width in pixels, <0.0f align xx pixels to the right of window (so -FLT_MIN always align width to the right side). IMGUI_API void PopItemWidth(); - IMGUI_API void SetNextItemWidth(float item_width); // set width of the _next_ common large "item+label" widget. >0.0f: width in pixels, <0.0f align xx pixels to the right of window (so -1.0f always align width to the right side) + IMGUI_API void SetNextItemWidth(float item_width); // set width of the _next_ common large "item+label" widget. >0.0f: width in pixels, <0.0f align xx pixels to the right of window (so -FLT_MIN always align width to the right side) IMGUI_API float CalcItemWidth(); // width of item given pushed settings and current cursor position. NOT necessarily the width of last item unlike most 'Item' functions. - IMGUI_API void PushTextWrapPos(float wrap_local_pos_x = 0.0f); // word-wrapping for Text*() commands. < 0.0f: no wrapping; 0.0f: wrap to end of window (or column); > 0.0f: wrap at 'wrap_pos_x' position in window local space + IMGUI_API void PushTextWrapPos(float wrap_local_pos_x = 0.0f); // push word-wrapping position for Text*() commands. < 0.0f: no wrapping; 0.0f: wrap to end of window (or column); > 0.0f: wrap at 'wrap_pos_x' position in window local space IMGUI_API void PopTextWrapPos(); - IMGUI_API void PushAllowKeyboardFocus(bool allow_keyboard_focus); // allow focusing using TAB/Shift-TAB, enabled by default but you can disable it for certain widgets - IMGUI_API void PopAllowKeyboardFocus(); - IMGUI_API void PushButtonRepeat(bool repeat); // in 'repeat' mode, Button*() functions return repeated true in a typematic manner (using io.KeyRepeatDelay/io.KeyRepeatRate setting). Note that you can call IsItemActive() after any Button() to tell if the button is held in the current frame. - IMGUI_API void PopButtonRepeat(); - // Cursor / Layout + // Style read access + // - Use the ShowStyleEditor() function to interactively see/edit the colors. + IMGUI_API ImFont* GetFont(); // get current font + IMGUI_API float GetFontSize(); // get current font size (= height in pixels) of current font with current scale applied + IMGUI_API ImVec2 GetFontTexUvWhitePixel(); // get UV coordinate for a white pixel, useful to draw custom shapes via the ImDrawList API + IMGUI_API ImU32 GetColorU32(ImGuiCol idx, float alpha_mul = 1.0f); // retrieve given style color with style alpha applied and optional extra alpha multiplier, packed as a 32-bit value suitable for ImDrawList + IMGUI_API ImU32 GetColorU32(const ImVec4& col); // retrieve given color with style alpha applied, packed as a 32-bit value suitable for ImDrawList + IMGUI_API ImU32 GetColorU32(ImU32 col, float alpha_mul = 1.0f); // retrieve given color with style alpha applied, packed as a 32-bit value suitable for ImDrawList + IMGUI_API const ImVec4& GetStyleColorVec4(ImGuiCol idx); // retrieve style color as stored in ImGuiStyle structure. use to feed back into PushStyleColor(), otherwise use GetColorU32() to get style color with style alpha baked in. + + // Layout cursor positioning // - By "cursor" we mean the current output position. // - The typical widget behavior is to output themselves at the current cursor position, then move the cursor one line down. + // - You can call SameLine() between widgets to undo the last carriage return and output at the right of the preceding widget. + // - YOU CAN DO 99% OF WHAT YOU NEED WITH ONLY GetCursorScreenPos() and GetContentRegionAvail(). + // - Attention! We currently have inconsistencies between window-local and absolute positions we will aim to fix with future API: + // - Absolute coordinate: GetCursorScreenPos(), SetCursorScreenPos(), all ImDrawList:: functions. -> this is the preferred way forward. + // - Window-local coordinates: SameLine(offset), GetCursorPos(), SetCursorPos(), GetCursorStartPos(), PushTextWrapPos() + // - Window-local coordinates: GetContentRegionMax(), GetWindowContentRegionMin(), GetWindowContentRegionMax() --> all obsoleted. YOU DON'T NEED THEM. + // - GetCursorScreenPos() = GetCursorPos() + GetWindowPos(). GetWindowPos() is almost only ever useful to convert from window-local to absolute coordinates. Try not to use it. + IMGUI_API ImVec2 GetCursorScreenPos(); // cursor position, absolute coordinates. THIS IS YOUR BEST FRIEND (prefer using this rather than GetCursorPos(), also more useful to work with ImDrawList API). + IMGUI_API void SetCursorScreenPos(const ImVec2& pos); // cursor position, absolute coordinates. THIS IS YOUR BEST FRIEND. + IMGUI_API ImVec2 GetContentRegionAvail(); // available space from current position. THIS IS YOUR BEST FRIEND. + IMGUI_API ImVec2 GetCursorPos(); // [window-local] cursor position in window-local coordinates. This is not your best friend. + IMGUI_API float GetCursorPosX(); // [window-local] " + IMGUI_API float GetCursorPosY(); // [window-local] " + IMGUI_API void SetCursorPos(const ImVec2& local_pos); // [window-local] " + IMGUI_API void SetCursorPosX(float local_x); // [window-local] " + IMGUI_API void SetCursorPosY(float local_y); // [window-local] " + IMGUI_API ImVec2 GetCursorStartPos(); // [window-local] initial cursor position, in window-local coordinates. Call GetCursorScreenPos() after Begin() to get the absolute coordinates version. + + // Other layout functions IMGUI_API void Separator(); // separator, generally horizontal. inside a menu bar or in horizontal layout mode, this becomes a vertical separator. IMGUI_API void SameLine(float offset_from_start_x=0.0f, float spacing=-1.0f); // call between widgets or groups to layout them horizontally. X position given in window coordinates. - IMGUI_API void NewLine(); // undo a SameLine() or force a new line when in an horizontal-layout context. + IMGUI_API void NewLine(); // undo a SameLine() or force a new line when in a horizontal-layout context. IMGUI_API void Spacing(); // add vertical spacing. IMGUI_API void Dummy(const ImVec2& size); // add a dummy item of given size. unlike InvisibleButton(), Dummy() won't take the mouse click or be navigable into. - IMGUI_API void Indent(float indent_w = 0.0f); // move content position toward the right, by style.IndentSpacing or indent_w if != 0 - IMGUI_API void Unindent(float indent_w = 0.0f); // move content position back to the left, by style.IndentSpacing or indent_w if != 0 + IMGUI_API void Indent(float indent_w = 0.0f); // move content position toward the right, by indent_w, or style.IndentSpacing if indent_w <= 0 + IMGUI_API void Unindent(float indent_w = 0.0f); // move content position back to the left, by indent_w, or style.IndentSpacing if indent_w <= 0 IMGUI_API void BeginGroup(); // lock horizontal starting position IMGUI_API void EndGroup(); // unlock horizontal starting position + capture the whole group bounding box into one "item" (so you can use IsItemHovered() or layout primitives such as SameLine() on whole group, etc.) - IMGUI_API ImVec2 GetCursorPos(); // cursor position in window coordinates (relative to window position) - IMGUI_API float GetCursorPosX(); // (some functions are using window-relative coordinates, such as: GetCursorPos, GetCursorStartPos, GetContentRegionMax, GetWindowContentRegion* etc. - IMGUI_API float GetCursorPosY(); // other functions such as GetCursorScreenPos or everything in ImDrawList:: - IMGUI_API void SetCursorPos(const ImVec2& local_pos); // are using the main, absolute coordinate system. - IMGUI_API void SetCursorPosX(float local_x); // GetWindowPos() + GetCursorPos() == GetCursorScreenPos() etc.) - IMGUI_API void SetCursorPosY(float local_y); // - IMGUI_API ImVec2 GetCursorStartPos(); // initial cursor position in window coordinates - IMGUI_API ImVec2 GetCursorScreenPos(); // cursor position in absolute screen coordinates [0..io.DisplaySize] (useful to work with ImDrawList API) - IMGUI_API void SetCursorScreenPos(const ImVec2& pos); // cursor position in absolute screen coordinates [0..io.DisplaySize] IMGUI_API void AlignTextToFramePadding(); // vertically align upcoming text baseline to FramePadding.y so that it will align properly to regularly framed items (call if you have text on a line before a framed item) IMGUI_API float GetTextLineHeight(); // ~ FontSize IMGUI_API float GetTextLineHeightWithSpacing(); // ~ FontSize + style.ItemSpacing.y (distance in pixels between 2 consecutive lines of text) @@ -367,11 +516,15 @@ namespace ImGui IMGUI_API float GetFrameHeightWithSpacing(); // ~ FontSize + style.FramePadding.y * 2 + style.ItemSpacing.y (distance in pixels between 2 consecutive lines of framed widgets) // ID stack/scopes - // - Read the FAQ for more details about how ID are handled in dear imgui. If you are creating widgets in a loop you most - // likely want to push a unique identifier (e.g. object pointer, loop index) to uniquely differentiate them. - // - The resulting ID are hashes of the entire stack. + // Read the FAQ (docs/FAQ.md or http://dearimgui.com/faq) for more details about how ID are handled in dear imgui. + // - Those questions are answered and impacted by understanding of the ID stack system: + // - "Q: Why is my widget not reacting when I click on it?" + // - "Q: How can I have widgets with an empty label?" + // - "Q: How can I have multiple widgets with the same label?" + // - Short version: ID are hashes of the entire ID stack. If you are creating widgets in a loop you most likely + // want to push a unique identifier (e.g. object pointer, loop index) to uniquely differentiate them. // - You can also use the "Label##foobar" syntax within widget label to distinguish them from each others. - // - In this header file we use the "label"/"name" terminology to denote a string that will be displayed and used as an ID, + // - In this header file we use the "label"/"name" terminology to denote a string that will be displayed + used as an ID, // whereas "str_id" denote a string that is only used as an ID and not normally displayed. IMGUI_API void PushID(const char* str_id); // push string into the ID stack (will hash string). IMGUI_API void PushID(const char* str_id_begin, const char* str_id_end); // push string into the ID stack (will hash string). @@ -381,10 +534,11 @@ namespace ImGui IMGUI_API ImGuiID GetID(const char* str_id); // calculate unique ID (hash of whole ID stack + given parameter). e.g. if you want to query into ImGuiStorage yourself IMGUI_API ImGuiID GetID(const char* str_id_begin, const char* str_id_end); IMGUI_API ImGuiID GetID(const void* ptr_id); + IMGUI_API ImGuiID GetID(int int_id); // Widgets: Text - IMGUI_API void TextUnformatted(const char* text, const char* text_end = NULL); // raw text without formatting. Roughly equivalent to Text("%s", text) but: A) doesn't require null terminated string if 'text_end' is specified, B) it's faster, no memory copy is done, no buffer size limits, recommended for long chunks of text. - IMGUI_API void Text(const char* fmt, ...) IM_FMTARGS(1); // simple formatted text + IMGUI_API void TextUnformatted(const char* text, const char* text_end = NULL); // raw text without formatting. Roughly equivalent to Text("%s", text) but: A) doesn't require null terminated string if 'text_end' is specified, B) it's faster, no memory copy is done, no buffer size limits, recommended for long chunks of text. + IMGUI_API void Text(const char* fmt, ...) IM_FMTARGS(1); // formatted text IMGUI_API void TextV(const char* fmt, va_list args) IM_FMTLIST(1); IMGUI_API void TextColored(const ImVec4& col, const char* fmt, ...) IM_FMTARGS(2); // shortcut for PushStyleColor(ImGuiCol_Text, col); Text(fmt, ...); PopStyleColor(); IMGUI_API void TextColoredV(const ImVec4& col, const char* fmt, va_list args) IM_FMTLIST(2); @@ -396,74 +550,97 @@ namespace ImGui IMGUI_API void LabelTextV(const char* label, const char* fmt, va_list args) IM_FMTLIST(2); IMGUI_API void BulletText(const char* fmt, ...) IM_FMTARGS(1); // shortcut for Bullet()+Text() IMGUI_API void BulletTextV(const char* fmt, va_list args) IM_FMTLIST(1); + IMGUI_API void SeparatorText(const char* label); // currently: formatted text with a horizontal line // Widgets: Main // - Most widgets return true when the value has been changed or when pressed/selected - IMGUI_API bool Button(const char* label, const ImVec2& size = ImVec2(0,0)); // button - IMGUI_API bool SmallButton(const char* label); // button with FramePadding=(0,0) to easily embed within text - IMGUI_API bool InvisibleButton(const char* str_id, const ImVec2& size); // button behavior without the visuals, frequently useful to build custom behaviors using the public api (along with IsItemActive, IsItemHovered, etc.) + // - You may also use one of the many IsItemXXX functions (e.g. IsItemActive, IsItemHovered, etc.) to query widget state. + IMGUI_API bool Button(const char* label, const ImVec2& size = ImVec2(0, 0)); // button + IMGUI_API bool SmallButton(const char* label); // button with (FramePadding.y == 0) to easily embed within text + IMGUI_API bool InvisibleButton(const char* str_id, const ImVec2& size, ImGuiButtonFlags flags = 0); // flexible button behavior without the visuals, frequently useful to build custom behaviors using the public api (along with IsItemActive, IsItemHovered, etc.) IMGUI_API bool ArrowButton(const char* str_id, ImGuiDir dir); // square button with an arrow shape - IMGUI_API void Image(ImTextureID user_texture_id, const ImVec2& size, const ImVec2& uv0 = ImVec2(0,0), const ImVec2& uv1 = ImVec2(1,1), const ImVec4& tint_col = ImVec4(1,1,1,1), const ImVec4& border_col = ImVec4(0,0,0,0)); - IMGUI_API bool ImageButton(ImTextureID user_texture_id, const ImVec2& size, const ImVec2& uv0 = ImVec2(0,0), const ImVec2& uv1 = ImVec2(1,1), int frame_padding = -1, const ImVec4& bg_col = ImVec4(0,0,0,0), const ImVec4& tint_col = ImVec4(1,1,1,1)); // <0 frame_padding uses default frame padding settings. 0 for no padding IMGUI_API bool Checkbox(const char* label, bool* v); + IMGUI_API bool CheckboxFlags(const char* label, int* flags, int flags_value); IMGUI_API bool CheckboxFlags(const char* label, unsigned int* flags, unsigned int flags_value); IMGUI_API bool RadioButton(const char* label, bool active); // use with e.g. if (RadioButton("one", my_value==1)) { my_value = 1; } IMGUI_API bool RadioButton(const char* label, int* v, int v_button); // shortcut to handle the above pattern when value is an integer - IMGUI_API void ProgressBar(float fraction, const ImVec2& size_arg = ImVec2(-1,0), const char* overlay = NULL); - IMGUI_API void Bullet(); // draw a small circle and keep the cursor on the same line. advance cursor x position by GetTreeNodeToLabelSpacing(), same distance that TreeNode() uses + IMGUI_API void ProgressBar(float fraction, const ImVec2& size_arg = ImVec2(-FLT_MIN, 0), const char* overlay = NULL); + // by zfedoran, https://github.com/ocornut/imgui/issues/1901 (MaSzyna addition) + IMGUI_API bool BufferingBar(const char* label, float value, const ImVec2& size_arg, const ImU32& bg_col, const ImU32& fg_col); + IMGUI_API bool Spinner(const char* label, float radius, int thickness, const ImU32& color); + IMGUI_API void Bullet(); // draw a small circle + keep the cursor on the same line. advance cursor x position by GetTreeNodeToLabelSpacing(), same distance that TreeNode() uses + IMGUI_API bool TextLink(const char* label); // hyperlink text button, return true when clicked + IMGUI_API void TextLinkOpenURL(const char* label, const char* url = NULL); // hyperlink text button, automatically open file/url when clicked - // Widgets: Combo Box - // - The new BeginCombo()/EndCombo() api allows you to manage your contents and selection state however you want it, by creating e.g. Selectable() items. - // - The old Combo() api are helpers over BeginCombo()/EndCombo() which are kept available for convenience purpose. + // Widgets: Images + // - Read about ImTextureID here: https://github.com/ocornut/imgui/wiki/Image-Loading-and-Displaying-Examples + // - 'uv0' and 'uv1' are texture coordinates. Read about them from the same link above. + // - Image() pads adds style.ImageBorderSize on each side, ImageButton() adds style.FramePadding on each side. + // - ImageButton() draws a background based on regular Button() color + optionally an inner background if specified. + IMGUI_API void Image(ImTextureID user_texture_id, const ImVec2& image_size, const ImVec2& uv0 = ImVec2(0, 0), const ImVec2& uv1 = ImVec2(1, 1)); + IMGUI_API void ImageWithBg(ImTextureID user_texture_id, const ImVec2& image_size, const ImVec2& uv0 = ImVec2(0, 0), const ImVec2& uv1 = ImVec2(1, 1), const ImVec4& bg_col = ImVec4(0, 0, 0, 0), const ImVec4& tint_col = ImVec4(1, 1, 1, 1)); + IMGUI_API bool ImageButton(const char* str_id, ImTextureID user_texture_id, const ImVec2& image_size, const ImVec2& uv0 = ImVec2(0, 0), const ImVec2& uv1 = ImVec2(1, 1), const ImVec4& bg_col = ImVec4(0, 0, 0, 0), const ImVec4& tint_col = ImVec4(1, 1, 1, 1)); + + // Widgets: Combo Box (Dropdown) + // - The BeginCombo()/EndCombo() api allows you to manage your contents and selection state however you want it, by creating e.g. Selectable() items. + // - The old Combo() api are helpers over BeginCombo()/EndCombo() which are kept available for convenience purpose. This is analogous to how ListBox are created. IMGUI_API bool BeginCombo(const char* label, const char* preview_value, ImGuiComboFlags flags = 0); IMGUI_API void EndCombo(); // only call EndCombo() if BeginCombo() returns true! IMGUI_API bool Combo(const char* label, int* current_item, const char* const items[], int items_count, int popup_max_height_in_items = -1); IMGUI_API bool Combo(const char* label, int* current_item, const char* items_separated_by_zeros, int popup_max_height_in_items = -1); // Separate items with \0 within a string, end item-list with \0\0. e.g. "One\0Two\0Three\0" - IMGUI_API bool Combo(const char* label, int* current_item, bool(*items_getter)(void* data, int idx, const char** out_text), void* data, int items_count, int popup_max_height_in_items = -1); + IMGUI_API bool Combo(const char* label, int* current_item, const char* (*getter)(void* user_data, int idx), void* user_data, int items_count, int popup_max_height_in_items = -1); - // Widgets: Drags - // - CTRL+Click on any drag box to turn them into an input box. Manually input values aren't clamped and can go off-bounds. - // - For all the Float2/Float3/Float4/Int2/Int3/Int4 versions of every functions, note that a 'float v[X]' function argument is the same as 'float* v', the array syntax is just a way to document the number of elements that are expected to be accessible. You can pass address of your first element out of a contiguous set, e.g. &myvector.x + // Widgets: Drag Sliders + // - CTRL+Click on any drag box to turn them into an input box. Manually input values aren't clamped by default and can go off-bounds. Use ImGuiSliderFlags_AlwaysClamp to always clamp. + // - For all the Float2/Float3/Float4/Int2/Int3/Int4 versions of every function, note that a 'float v[X]' function argument is the same as 'float* v', + // the array syntax is just a way to document the number of elements that are expected to be accessible. You can pass address of your first element out of a contiguous set, e.g. &myvector.x // - Adjust format string to decorate the value with a prefix, a suffix, or adapt the editing and display precision e.g. "%.3f" -> 1.234; "%5.2f secs" -> 01.23 secs; "Biscuit: %.0f" -> Biscuit: 1; etc. - // - Speed are per-pixel of mouse movement (v_speed=0.2f: mouse needs to move by 5 pixels to increase value by 1). For gamepad/keyboard navigation, minimum speed is Max(v_speed, minimum_step_at_given_precision). - // - Use v_min < v_max to clamp edits to given limits. Note that CTRL+Click manual input can override those limits. - // - Use v_min > v_max to lock edits. - IMGUI_API bool DragFloat(const char* label, float* v, float v_speed = 1.0f, float v_min = 0.0f, float v_max = 0.0f, const char* format = "%.3f", float power = 1.0f); // If v_min >= v_max we have no bound - IMGUI_API bool DragFloat2(const char* label, float v[2], float v_speed = 1.0f, float v_min = 0.0f, float v_max = 0.0f, const char* format = "%.3f", float power = 1.0f); - IMGUI_API bool DragFloat3(const char* label, float v[3], float v_speed = 1.0f, float v_min = 0.0f, float v_max = 0.0f, const char* format = "%.3f", float power = 1.0f); - IMGUI_API bool DragFloat4(const char* label, float v[4], float v_speed = 1.0f, float v_min = 0.0f, float v_max = 0.0f, const char* format = "%.3f", float power = 1.0f); - IMGUI_API bool DragFloatRange2(const char* label, float* v_current_min, float* v_current_max, float v_speed = 1.0f, float v_min = 0.0f, float v_max = 0.0f, const char* format = "%.3f", const char* format_max = NULL, float power = 1.0f); - IMGUI_API bool DragInt(const char* label, int* v, float v_speed = 1.0f, int v_min = 0, int v_max = 0, const char* format = "%d"); // If v_min >= v_max we have no bound - IMGUI_API bool DragInt2(const char* label, int v[2], float v_speed = 1.0f, int v_min = 0, int v_max = 0, const char* format = "%d"); - IMGUI_API bool DragInt3(const char* label, int v[3], float v_speed = 1.0f, int v_min = 0, int v_max = 0, const char* format = "%d"); - IMGUI_API bool DragInt4(const char* label, int v[4], float v_speed = 1.0f, int v_min = 0, int v_max = 0, const char* format = "%d"); - IMGUI_API bool DragIntRange2(const char* label, int* v_current_min, int* v_current_max, float v_speed = 1.0f, int v_min = 0, int v_max = 0, const char* format = "%d", const char* format_max = NULL); - IMGUI_API bool DragScalar(const char* label, ImGuiDataType data_type, void* v, float v_speed, const void* v_min = NULL, const void* v_max = NULL, const char* format = NULL, float power = 1.0f); - IMGUI_API bool DragScalarN(const char* label, ImGuiDataType data_type, void* v, int components, float v_speed, const void* v_min = NULL, const void* v_max = NULL, const char* format = NULL, float power = 1.0f); + // - Format string may also be set to NULL or use the default format ("%f" or "%d"). + // - Speed are per-pixel of mouse movement (v_speed=0.2f: mouse needs to move by 5 pixels to increase value by 1). For keyboard/gamepad navigation, minimum speed is Max(v_speed, minimum_step_at_given_precision). + // - Use v_min < v_max to clamp edits to given limits. Note that CTRL+Click manual input can override those limits if ImGuiSliderFlags_AlwaysClamp is not used. + // - Use v_max = FLT_MAX / INT_MAX etc to avoid clamping to a maximum, same with v_min = -FLT_MAX / INT_MIN to avoid clamping to a minimum. + // - We use the same sets of flags for DragXXX() and SliderXXX() functions as the features are the same and it makes it easier to swap them. + // - Legacy: Pre-1.78 there are DragXXX() function signatures that take a final `float power=1.0f' argument instead of the `ImGuiSliderFlags flags=0' argument. + // If you get a warning converting a float to ImGuiSliderFlags, read https://github.com/ocornut/imgui/issues/3361 + IMGUI_API bool DragFloat(const char* label, float* v, float v_speed = 1.0f, float v_min = 0.0f, float v_max = 0.0f, const char* format = "%.3f", ImGuiSliderFlags flags = 0); // If v_min >= v_max we have no bound + IMGUI_API bool DragFloat2(const char* label, float v[2], float v_speed = 1.0f, float v_min = 0.0f, float v_max = 0.0f, const char* format = "%.3f", ImGuiSliderFlags flags = 0); + IMGUI_API bool DragFloat3(const char* label, float v[3], float v_speed = 1.0f, float v_min = 0.0f, float v_max = 0.0f, const char* format = "%.3f", ImGuiSliderFlags flags = 0); + IMGUI_API bool DragFloat4(const char* label, float v[4], float v_speed = 1.0f, float v_min = 0.0f, float v_max = 0.0f, const char* format = "%.3f", ImGuiSliderFlags flags = 0); + IMGUI_API bool DragFloatRange2(const char* label, float* v_current_min, float* v_current_max, float v_speed = 1.0f, float v_min = 0.0f, float v_max = 0.0f, const char* format = "%.3f", const char* format_max = NULL, ImGuiSliderFlags flags = 0); + IMGUI_API bool DragInt(const char* label, int* v, float v_speed = 1.0f, int v_min = 0, int v_max = 0, const char* format = "%d", ImGuiSliderFlags flags = 0); // If v_min >= v_max we have no bound + IMGUI_API bool DragInt2(const char* label, int v[2], float v_speed = 1.0f, int v_min = 0, int v_max = 0, const char* format = "%d", ImGuiSliderFlags flags = 0); + IMGUI_API bool DragInt3(const char* label, int v[3], float v_speed = 1.0f, int v_min = 0, int v_max = 0, const char* format = "%d", ImGuiSliderFlags flags = 0); + IMGUI_API bool DragInt4(const char* label, int v[4], float v_speed = 1.0f, int v_min = 0, int v_max = 0, const char* format = "%d", ImGuiSliderFlags flags = 0); + IMGUI_API bool DragIntRange2(const char* label, int* v_current_min, int* v_current_max, float v_speed = 1.0f, int v_min = 0, int v_max = 0, const char* format = "%d", const char* format_max = NULL, ImGuiSliderFlags flags = 0); + IMGUI_API bool DragScalar(const char* label, ImGuiDataType data_type, void* p_data, float v_speed = 1.0f, const void* p_min = NULL, const void* p_max = NULL, const char* format = NULL, ImGuiSliderFlags flags = 0); + IMGUI_API bool DragScalarN(const char* label, ImGuiDataType data_type, void* p_data, int components, float v_speed = 1.0f, const void* p_min = NULL, const void* p_max = NULL, const char* format = NULL, ImGuiSliderFlags flags = 0); - // Widgets: Sliders - // - CTRL+Click on any slider to turn them into an input box. Manually input values aren't clamped and can go off-bounds. + // Widgets: Regular Sliders + // - CTRL+Click on any slider to turn them into an input box. Manually input values aren't clamped by default and can go off-bounds. Use ImGuiSliderFlags_AlwaysClamp to always clamp. // - Adjust format string to decorate the value with a prefix, a suffix, or adapt the editing and display precision e.g. "%.3f" -> 1.234; "%5.2f secs" -> 01.23 secs; "Biscuit: %.0f" -> Biscuit: 1; etc. - IMGUI_API bool SliderFloat(const char* label, float* v, float v_min, float v_max, const char* format = "%.3f", float power = 1.0f); // adjust format to decorate the value with a prefix or a suffix for in-slider labels or unit display. Use power!=1.0 for power curve sliders - IMGUI_API bool SliderFloat2(const char* label, float v[2], float v_min, float v_max, const char* format = "%.3f", float power = 1.0f); - IMGUI_API bool SliderFloat3(const char* label, float v[3], float v_min, float v_max, const char* format = "%.3f", float power = 1.0f); - IMGUI_API bool SliderFloat4(const char* label, float v[4], float v_min, float v_max, const char* format = "%.3f", float power = 1.0f); - IMGUI_API bool SliderAngle(const char* label, float* v_rad, float v_degrees_min = -360.0f, float v_degrees_max = +360.0f, const char* format = "%.0f deg"); - IMGUI_API bool SliderInt(const char* label, int* v, int v_min, int v_max, const char* format = "%d"); - IMGUI_API bool SliderInt2(const char* label, int v[2], int v_min, int v_max, const char* format = "%d"); - IMGUI_API bool SliderInt3(const char* label, int v[3], int v_min, int v_max, const char* format = "%d"); - IMGUI_API bool SliderInt4(const char* label, int v[4], int v_min, int v_max, const char* format = "%d"); - IMGUI_API bool SliderScalar(const char* label, ImGuiDataType data_type, void* v, const void* v_min, const void* v_max, const char* format = NULL, float power = 1.0f); - IMGUI_API bool SliderScalarN(const char* label, ImGuiDataType data_type, void* v, int components, const void* v_min, const void* v_max, const char* format = NULL, float power = 1.0f); - IMGUI_API bool VSliderFloat(const char* label, const ImVec2& size, float* v, float v_min, float v_max, const char* format = "%.3f", float power = 1.0f); - IMGUI_API bool VSliderInt(const char* label, const ImVec2& size, int* v, int v_min, int v_max, const char* format = "%d"); - IMGUI_API bool VSliderScalar(const char* label, const ImVec2& size, ImGuiDataType data_type, void* v, const void* v_min, const void* v_max, const char* format = NULL, float power = 1.0f); + // - Format string may also be set to NULL or use the default format ("%f" or "%d"). + // - Legacy: Pre-1.78 there are SliderXXX() function signatures that take a final `float power=1.0f' argument instead of the `ImGuiSliderFlags flags=0' argument. + // If you get a warning converting a float to ImGuiSliderFlags, read https://github.com/ocornut/imgui/issues/3361 + IMGUI_API bool SliderFloat(const char* label, float* v, float v_min, float v_max, const char* format = "%.3f", ImGuiSliderFlags flags = 0); // adjust format to decorate the value with a prefix or a suffix for in-slider labels or unit display. + IMGUI_API bool SliderFloat2(const char* label, float v[2], float v_min, float v_max, const char* format = "%.3f", ImGuiSliderFlags flags = 0); + IMGUI_API bool SliderFloat3(const char* label, float v[3], float v_min, float v_max, const char* format = "%.3f", ImGuiSliderFlags flags = 0); + IMGUI_API bool SliderFloat4(const char* label, float v[4], float v_min, float v_max, const char* format = "%.3f", ImGuiSliderFlags flags = 0); + IMGUI_API bool SliderAngle(const char* label, float* v_rad, float v_degrees_min = -360.0f, float v_degrees_max = +360.0f, const char* format = "%.0f deg", ImGuiSliderFlags flags = 0); + IMGUI_API bool SliderInt(const char* label, int* v, int v_min, int v_max, const char* format = "%d", ImGuiSliderFlags flags = 0); + IMGUI_API bool SliderInt2(const char* label, int v[2], int v_min, int v_max, const char* format = "%d", ImGuiSliderFlags flags = 0); + IMGUI_API bool SliderInt3(const char* label, int v[3], int v_min, int v_max, const char* format = "%d", ImGuiSliderFlags flags = 0); + IMGUI_API bool SliderInt4(const char* label, int v[4], int v_min, int v_max, const char* format = "%d", ImGuiSliderFlags flags = 0); + IMGUI_API bool SliderScalar(const char* label, ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max, const char* format = NULL, ImGuiSliderFlags flags = 0); + IMGUI_API bool SliderScalarN(const char* label, ImGuiDataType data_type, void* p_data, int components, const void* p_min, const void* p_max, const char* format = NULL, ImGuiSliderFlags flags = 0); + IMGUI_API bool VSliderFloat(const char* label, const ImVec2& size, float* v, float v_min, float v_max, const char* format = "%.3f", ImGuiSliderFlags flags = 0); + IMGUI_API bool VSliderInt(const char* label, const ImVec2& size, int* v, int v_min, int v_max, const char* format = "%d", ImGuiSliderFlags flags = 0); + IMGUI_API bool VSliderScalar(const char* label, const ImVec2& size, ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max, const char* format = NULL, ImGuiSliderFlags flags = 0); // Widgets: Input with Keyboard - // - If you want to use InputText() with a dynamic string type such as std::string or your own, see misc/cpp/imgui_stdlib.h + // - If you want to use InputText() with std::string or any custom dynamic string type, see misc/cpp/imgui_stdlib.h and comments in imgui_demo.cpp. // - Most of the ImGuiInputTextFlags flags are only useful for InputText() and not for InputFloatX, InputIntX, InputDouble etc. IMGUI_API bool InputText(const char* label, char* buf, size_t buf_size, ImGuiInputTextFlags flags = 0, ImGuiInputTextCallback callback = NULL, void* user_data = NULL); - IMGUI_API bool InputTextMultiline(const char* label, char* buf, size_t buf_size, const ImVec2& size = ImVec2(0,0), ImGuiInputTextFlags flags = 0, ImGuiInputTextCallback callback = NULL, void* user_data = NULL); + IMGUI_API bool InputTextMultiline(const char* label, char* buf, size_t buf_size, const ImVec2& size = ImVec2(0, 0), ImGuiInputTextFlags flags = 0, ImGuiInputTextCallback callback = NULL, void* user_data = NULL); IMGUI_API bool InputTextWithHint(const char* label, const char* hint, char* buf, size_t buf_size, ImGuiInputTextFlags flags = 0, ImGuiInputTextCallback callback = NULL, void* user_data = NULL); IMGUI_API bool InputFloat(const char* label, float* v, float step = 0.0f, float step_fast = 0.0f, const char* format = "%.3f", ImGuiInputTextFlags flags = 0); IMGUI_API bool InputFloat2(const char* label, float v[2], const char* format = "%.3f", ImGuiInputTextFlags flags = 0); @@ -474,17 +651,17 @@ namespace ImGui IMGUI_API bool InputInt3(const char* label, int v[3], ImGuiInputTextFlags flags = 0); IMGUI_API bool InputInt4(const char* label, int v[4], ImGuiInputTextFlags flags = 0); IMGUI_API bool InputDouble(const char* label, double* v, double step = 0.0, double step_fast = 0.0, const char* format = "%.6f", ImGuiInputTextFlags flags = 0); - IMGUI_API bool InputScalar(const char* label, ImGuiDataType data_type, void* v, const void* step = NULL, const void* step_fast = NULL, const char* format = NULL, ImGuiInputTextFlags flags = 0); - IMGUI_API bool InputScalarN(const char* label, ImGuiDataType data_type, void* v, int components, const void* step = NULL, const void* step_fast = NULL, const char* format = NULL, ImGuiInputTextFlags flags = 0); + IMGUI_API bool InputScalar(const char* label, ImGuiDataType data_type, void* p_data, const void* p_step = NULL, const void* p_step_fast = NULL, const char* format = NULL, ImGuiInputTextFlags flags = 0); + IMGUI_API bool InputScalarN(const char* label, ImGuiDataType data_type, void* p_data, int components, const void* p_step = NULL, const void* p_step_fast = NULL, const char* format = NULL, ImGuiInputTextFlags flags = 0); - // Widgets: Color Editor/Picker (tip: the ColorEdit* functions have a little colored preview square that can be left-clicked to open a picker, and right-clicked to open an option menu.) + // Widgets: Color Editor/Picker (tip: the ColorEdit* functions have a little color square that can be left-clicked to open a picker, and right-clicked to open an option menu.) // - Note that in C++ a 'float v[X]' function argument is the _same_ as 'float* v', the array syntax is just a way to document the number of elements that are expected to be accessible. // - You can pass the address of a first float element out of a contiguous structure, e.g. &myvector.x IMGUI_API bool ColorEdit3(const char* label, float col[3], ImGuiColorEditFlags flags = 0); IMGUI_API bool ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flags = 0); IMGUI_API bool ColorPicker3(const char* label, float col[3], ImGuiColorEditFlags flags = 0); IMGUI_API bool ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags flags = 0, const float* ref_col = NULL); - IMGUI_API bool ColorButton(const char* desc_id, const ImVec4& col, ImGuiColorEditFlags flags = 0, ImVec2 size = ImVec2(0,0)); // display a colored square/button, hover for details, return true when pressed. + IMGUI_API bool ColorButton(const char* desc_id, const ImVec4& col, ImGuiColorEditFlags flags = 0, const ImVec2& size = ImVec2(0, 0)); // display a color square/button, hover for details, return true when pressed. IMGUI_API void SetColorEditOptions(ImGuiColorEditFlags flags); // initialize current options (generally on application startup) if you want to select a default format, picker type, etc. User will be able to change many settings, unless you pass the _NoOptions flag to your calls. // Widgets: Trees @@ -499,33 +676,51 @@ namespace ImGui IMGUI_API bool TreeNodeEx(const void* ptr_id, ImGuiTreeNodeFlags flags, const char* fmt, ...) IM_FMTARGS(3); IMGUI_API bool TreeNodeExV(const char* str_id, ImGuiTreeNodeFlags flags, const char* fmt, va_list args) IM_FMTLIST(3); IMGUI_API bool TreeNodeExV(const void* ptr_id, ImGuiTreeNodeFlags flags, const char* fmt, va_list args) IM_FMTLIST(3); - IMGUI_API void TreePush(const char* str_id); // ~ Indent()+PushId(). Already called by TreeNode() when returning true, but you can call TreePush/TreePop yourself if desired. - IMGUI_API void TreePush(const void* ptr_id = NULL); // " - IMGUI_API void TreePop(); // ~ Unindent()+PopId() + IMGUI_API void TreePush(const char* str_id); // ~ Indent()+PushID(). Already called by TreeNode() when returning true, but you can call TreePush/TreePop yourself if desired. + IMGUI_API void TreePush(const void* ptr_id); // " + IMGUI_API void TreePop(); // ~ Unindent()+PopID() IMGUI_API float GetTreeNodeToLabelSpacing(); // horizontal distance preceding label when using TreeNode*() or Bullet() == (g.FontSize + style.FramePadding.x*2) for a regular unframed TreeNode IMGUI_API bool CollapsingHeader(const char* label, ImGuiTreeNodeFlags flags = 0); // if returning 'true' the header is open. doesn't indent nor push on ID stack. user doesn't have to call TreePop(). - IMGUI_API bool CollapsingHeader(const char* label, bool* p_open, ImGuiTreeNodeFlags flags = 0); // when 'p_open' isn't NULL, display an additional small close button on upper right of the header + IMGUI_API bool CollapsingHeader(const char* label, bool* p_visible, ImGuiTreeNodeFlags flags = 0); // when 'p_visible != NULL': if '*p_visible==true' display an additional small close button on upper right of the header which will set the bool to false when clicked, if '*p_visible==false' don't display the header. IMGUI_API void SetNextItemOpen(bool is_open, ImGuiCond cond = 0); // set next TreeNode/CollapsingHeader open state. + IMGUI_API void SetNextItemStorageID(ImGuiID storage_id); // set id to use for open/close storage (default to same as item id). // Widgets: Selectables // - A selectable highlights when hovered, and can display another color when selected. - // - Neighbors selectable extend their highlight bounds in order to leave no gap between them. - IMGUI_API bool Selectable(const char* label, bool selected = false, ImGuiSelectableFlags flags = 0, const ImVec2& size = ImVec2(0,0)); // "bool selected" carry the selection state (read-only). Selectable() is clicked is returns true so you can modify your selection state. size.x==0.0: use remaining width, size.x>0.0: specify width. size.y==0.0: use label height, size.y>0.0: specify height - IMGUI_API bool Selectable(const char* label, bool* p_selected, ImGuiSelectableFlags flags = 0, const ImVec2& size = ImVec2(0,0)); // "bool* p_selected" point to the selection state (read-write), as a convenient helper. + // - Neighbors selectable extend their highlight bounds in order to leave no gap between them. This is so a series of selected Selectable appear contiguous. + IMGUI_API bool Selectable(const char* label, bool selected = false, ImGuiSelectableFlags flags = 0, const ImVec2& size = ImVec2(0, 0)); // "bool selected" carry the selection state (read-only). Selectable() is clicked is returns true so you can modify your selection state. size.x==0.0: use remaining width, size.x>0.0: specify width. size.y==0.0: use label height, size.y>0.0: specify height + IMGUI_API bool Selectable(const char* label, bool* p_selected, ImGuiSelectableFlags flags = 0, const ImVec2& size = ImVec2(0, 0)); // "bool* p_selected" point to the selection state (read-write), as a convenient helper. + + // Multi-selection system for Selectable(), Checkbox(), TreeNode() functions [BETA] + // - This enables standard multi-selection/range-selection idioms (CTRL+Mouse/Keyboard, SHIFT+Mouse/Keyboard, etc.) in a way that also allow a clipper to be used. + // - ImGuiSelectionUserData is often used to store your item index within the current view (but may store something else). + // - Read comments near ImGuiMultiSelectIO for instructions/details and see 'Demo->Widgets->Selection State & Multi-Select' for demo. + // - TreeNode() is technically supported but... using this correctly is more complicated. You need some sort of linear/random access to your tree, + // which is suited to advanced trees setups already implementing filters and clipper. We will work simplifying the current demo. + // - 'selection_size' and 'items_count' parameters are optional and used by a few features. If they are costly for you to compute, you may avoid them. + IMGUI_API ImGuiMultiSelectIO* BeginMultiSelect(ImGuiMultiSelectFlags flags, int selection_size = -1, int items_count = -1); + IMGUI_API ImGuiMultiSelectIO* EndMultiSelect(); + IMGUI_API void SetNextItemSelectionUserData(ImGuiSelectionUserData selection_user_data); + IMGUI_API bool IsItemToggledSelection(); // Was the last item selection state toggled? Useful if you need the per-item information _before_ reaching EndMultiSelect(). We only returns toggle _event_ in order to handle clipping correctly. // Widgets: List Boxes - // - FIXME: To be consistent with all the newer API, ListBoxHeader/ListBoxFooter should in reality be called BeginListBox/EndListBox. Will rename them. + // - This is essentially a thin wrapper to using BeginChild/EndChild with the ImGuiChildFlags_FrameStyle flag for stylistic changes + displaying a label. + // - If you don't need a label you can probably simply use BeginChild() with the ImGuiChildFlags_FrameStyle flag for the same result. + // - You can submit contents and manage your selection state however you want it, by creating e.g. Selectable() or any other items. + // - The simplified/old ListBox() api are helpers over BeginListBox()/EndListBox() which are kept available for convenience purpose. This is analoguous to how Combos are created. + // - Choose frame width: size.x > 0.0f: custom / size.x < 0.0f or -FLT_MIN: right-align / size.x = 0.0f (default): use current ItemWidth + // - Choose frame height: size.y > 0.0f: custom / size.y < 0.0f or -FLT_MIN: bottom-align / size.y = 0.0f (default): arbitrary default height which can fit ~7 items + IMGUI_API bool BeginListBox(const char* label, const ImVec2& size = ImVec2(0, 0)); // open a framed scrolling region + IMGUI_API void EndListBox(); // only call EndListBox() if BeginListBox() returned true! IMGUI_API bool ListBox(const char* label, int* current_item, const char* const items[], int items_count, int height_in_items = -1); - IMGUI_API bool ListBox(const char* label, int* current_item, bool (*items_getter)(void* data, int idx, const char** out_text), void* data, int items_count, int height_in_items = -1); - IMGUI_API bool ListBoxHeader(const char* label, const ImVec2& size = ImVec2(0,0)); // use if you want to reimplement ListBox() will custom data or interactions. if the function return true, you can output elements then call ListBoxFooter() afterwards. - IMGUI_API bool ListBoxHeader(const char* label, int items_count, int height_in_items = -1); // " - IMGUI_API void ListBoxFooter(); // terminate the scrolling region. only call ListBoxFooter() if ListBoxHeader() returned true! + IMGUI_API bool ListBox(const char* label, int* current_item, const char* (*getter)(void* user_data, int idx), void* user_data, int items_count, int height_in_items = -1); // Widgets: Data Plotting + // - Consider using ImPlot (https://github.com/epezent/implot) which is much better! IMGUI_API void PlotLines(const char* label, const float* values, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float)); IMGUI_API void PlotLines(const char* label, float(*values_getter)(void* data, int idx), void* data, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 0)); IMGUI_API void PlotHistogram(const char* label, const float* values, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float)); - IMGUI_API void PlotHistogram(const char* label, float(*values_getter)(void* data, int idx), void* data, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 0)); + IMGUI_API void PlotHistogram(const char* label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 0)); // Widgets: Value() Helpers. // - Those are merely shortcut to calling Text() with a format string. Output single value in "name: value" format (tip: freely declare more in your code to handle your types. you can add functions to the ImGui namespace) @@ -535,44 +730,138 @@ namespace ImGui IMGUI_API void Value(const char* prefix, float v, const char* float_format = NULL); // Widgets: Menus - IMGUI_API bool BeginMainMenuBar(); // create and append to a full screen menu-bar. - IMGUI_API void EndMainMenuBar(); // only call EndMainMenuBar() if BeginMainMenuBar() returns true! + // - Use BeginMenuBar() on a window ImGuiWindowFlags_MenuBar to append to its menu bar. + // - Use BeginMainMenuBar() to create a menu bar at the top of the screen and append to it. + // - Use BeginMenu() to create a menu. You can call BeginMenu() multiple time with the same identifier to append more items to it. + // - Not that MenuItem() keyboardshortcuts are displayed as a convenience but _not processed_ by Dear ImGui at the moment. IMGUI_API bool BeginMenuBar(); // append to menu-bar of current window (requires ImGuiWindowFlags_MenuBar flag set on parent window). IMGUI_API void EndMenuBar(); // only call EndMenuBar() if BeginMenuBar() returns true! + IMGUI_API bool BeginMainMenuBar(); // create and append to a full screen menu-bar. + IMGUI_API void EndMainMenuBar(); // only call EndMainMenuBar() if BeginMainMenuBar() returns true! IMGUI_API bool BeginMenu(const char* label, bool enabled = true); // create a sub-menu entry. only call EndMenu() if this returns true! IMGUI_API void EndMenu(); // only call EndMenu() if BeginMenu() returns true! - IMGUI_API bool MenuItem(const char* label, const char* shortcut = NULL, bool selected = false, bool enabled = true); // return true when activated. shortcuts are displayed for convenience but not processed by ImGui at the moment + IMGUI_API bool MenuItem(const char* label, const char* shortcut = NULL, bool selected = false, bool enabled = true); // return true when activated. IMGUI_API bool MenuItem(const char* label, const char* shortcut, bool* p_selected, bool enabled = true); // return true when activated + toggle (*p_selected) if p_selected != NULL // Tooltips - IMGUI_API void BeginTooltip(); // begin/append a tooltip window. to create full-featured tooltip (with any kind of items). - IMGUI_API void EndTooltip(); - IMGUI_API void SetTooltip(const char* fmt, ...) IM_FMTARGS(1); // set a text-only tooltip, typically use with ImGui::IsItemHovered(). override any previous call to SetTooltip(). + // - Tooltips are windows following the mouse. They do not take focus away. + // - A tooltip window can contain items of any types. + // - SetTooltip() is more or less a shortcut for the 'if (BeginTooltip()) { Text(...); EndTooltip(); }' idiom (with a subtlety that it discard any previously submitted tooltip) + IMGUI_API bool BeginTooltip(); // begin/append a tooltip window. + IMGUI_API void EndTooltip(); // only call EndTooltip() if BeginTooltip()/BeginItemTooltip() returns true! + IMGUI_API void SetTooltip(const char* fmt, ...) IM_FMTARGS(1); // set a text-only tooltip. Often used after a ImGui::IsItemHovered() check. Override any previous call to SetTooltip(). IMGUI_API void SetTooltipV(const char* fmt, va_list args) IM_FMTLIST(1); - // Popups, Modals - // The properties of popups windows are: - // - They block normal mouse hovering detection outside them. (*) - // - Unless modal, they can be closed by clicking anywhere outside them, or by pressing ESCAPE. - // - Their visibility state (~bool) is held internally by imgui instead of being held by the programmer as we are used to with regular Begin() calls. - // User can manipulate the visibility state by calling OpenPopup(). - // (*) One can use IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup) to bypass it and detect hovering even when normally blocked by a popup. - // Those three properties are connected. The library needs to hold their visibility state because it can close popups at any time. - IMGUI_API void OpenPopup(const char* str_id); // call to mark popup as open (don't call every frame!). popups are closed when user click outside, or if CloseCurrentPopup() is called within a BeginPopup()/EndPopup() block. By default, Selectable()/MenuItem() are calling CloseCurrentPopup(). Popup identifiers are relative to the current ID-stack (so OpenPopup and BeginPopup needs to be at the same level). - IMGUI_API bool BeginPopup(const char* str_id, ImGuiWindowFlags flags = 0); // return true if the popup is open, and you can start outputting to it. only call EndPopup() if BeginPopup() returns true! - IMGUI_API bool BeginPopupContextItem(const char* str_id = NULL, int mouse_button = 1); // helper to open and begin popup when clicked on last item. if you can pass a NULL str_id only if the previous item had an id. If you want to use that on a non-interactive item such as Text() you need to pass in an explicit ID here. read comments in .cpp! - IMGUI_API bool BeginPopupContextWindow(const char* str_id = NULL, int mouse_button = 1, bool also_over_items = true); // helper to open and begin popup when clicked on current window. - IMGUI_API bool BeginPopupContextVoid(const char* str_id = NULL, int mouse_button = 1); // helper to open and begin popup when clicked in void (where there are no imgui windows). - IMGUI_API bool BeginPopupModal(const char* name, bool* p_open = NULL, ImGuiWindowFlags flags = 0); // modal dialog (regular window with title bar, block interactions behind the modal window, can't close the modal window by clicking outside) - IMGUI_API void EndPopup(); // only call EndPopup() if BeginPopupXXX() returns true! - IMGUI_API bool OpenPopupOnItemClick(const char* str_id = NULL, int mouse_button = 1); // helper to open popup when clicked on last item (note: actually triggers on the mouse _released_ event to be consistent with popup behaviors). return true when just opened. - IMGUI_API bool IsPopupOpen(const char* str_id); // return true if the popup is open at the current begin-ed level of the popup stack. - IMGUI_API void CloseCurrentPopup(); // close the popup we have begin-ed into. clicking on a MenuItem or Selectable automatically close the current popup. + // Tooltips: helpers for showing a tooltip when hovering an item + // - BeginItemTooltip() is a shortcut for the 'if (IsItemHovered(ImGuiHoveredFlags_ForTooltip) && BeginTooltip())' idiom. + // - SetItemTooltip() is a shortcut for the 'if (IsItemHovered(ImGuiHoveredFlags_ForTooltip)) { SetTooltip(...); }' idiom. + // - Where 'ImGuiHoveredFlags_ForTooltip' itself is a shortcut to use 'style.HoverFlagsForTooltipMouse' or 'style.HoverFlagsForTooltipNav' depending on active input type. For mouse it defaults to 'ImGuiHoveredFlags_Stationary | ImGuiHoveredFlags_DelayShort'. + IMGUI_API bool BeginItemTooltip(); // begin/append a tooltip window if preceding item was hovered. + IMGUI_API void SetItemTooltip(const char* fmt, ...) IM_FMTARGS(1); // set a text-only tooltip if preceding item was hovered. override any previous call to SetTooltip(). + IMGUI_API void SetItemTooltipV(const char* fmt, va_list args) IM_FMTLIST(1); - // Columns + // Popups, Modals + // - They block normal mouse hovering detection (and therefore most mouse interactions) behind them. + // - If not modal: they can be closed by clicking anywhere outside them, or by pressing ESCAPE. + // - Their visibility state (~bool) is held internally instead of being held by the programmer as we are used to with regular Begin*() calls. + // - The 3 properties above are related: we need to retain popup visibility state in the library because popups may be closed as any time. + // - You can bypass the hovering restriction by using ImGuiHoveredFlags_AllowWhenBlockedByPopup when calling IsItemHovered() or IsWindowHovered(). + // - IMPORTANT: Popup identifiers are relative to the current ID stack, so OpenPopup and BeginPopup generally needs to be at the same level of the stack. + // This is sometimes leading to confusing mistakes. May rework this in the future. + // - BeginPopup(): query popup state, if open start appending into the window. Call EndPopup() afterwards if returned true. ImGuiWindowFlags are forwarded to the window. + // - BeginPopupModal(): block every interaction behind the window, cannot be closed by user, add a dimming background, has a title bar. + IMGUI_API bool BeginPopup(const char* str_id, ImGuiWindowFlags flags = 0); // return true if the popup is open, and you can start outputting to it. + IMGUI_API bool BeginPopupModal(const char* name, bool* p_open = NULL, ImGuiWindowFlags flags = 0); // return true if the modal is open, and you can start outputting to it. + IMGUI_API void EndPopup(); // only call EndPopup() if BeginPopupXXX() returns true! + + // Popups: open/close functions + // - OpenPopup(): set popup state to open. ImGuiPopupFlags are available for opening options. + // - If not modal: they can be closed by clicking anywhere outside them, or by pressing ESCAPE. + // - CloseCurrentPopup(): use inside the BeginPopup()/EndPopup() scope to close manually. + // - CloseCurrentPopup() is called by default by Selectable()/MenuItem() when activated (FIXME: need some options). + // - Use ImGuiPopupFlags_NoOpenOverExistingPopup to avoid opening a popup if there's already one at the same level. This is equivalent to e.g. testing for !IsAnyPopupOpen() prior to OpenPopup(). + // - Use IsWindowAppearing() after BeginPopup() to tell if a window just opened. + // - IMPORTANT: Notice that for OpenPopupOnItemClick() we exceptionally default flags to 1 (== ImGuiPopupFlags_MouseButtonRight) for backward compatibility with older API taking 'int mouse_button = 1' parameter + IMGUI_API void OpenPopup(const char* str_id, ImGuiPopupFlags popup_flags = 0); // call to mark popup as open (don't call every frame!). + IMGUI_API void OpenPopup(ImGuiID id, ImGuiPopupFlags popup_flags = 0); // id overload to facilitate calling from nested stacks + IMGUI_API void OpenPopupOnItemClick(const char* str_id = NULL, ImGuiPopupFlags popup_flags = 1); // helper to open popup when clicked on last item. Default to ImGuiPopupFlags_MouseButtonRight == 1. (note: actually triggers on the mouse _released_ event to be consistent with popup behaviors) + IMGUI_API void CloseCurrentPopup(); // manually close the popup we have begin-ed into. + + // Popups: open+begin combined functions helpers + // - Helpers to do OpenPopup+BeginPopup where the Open action is triggered by e.g. hovering an item and right-clicking. + // - They are convenient to easily create context menus, hence the name. + // - IMPORTANT: Notice that BeginPopupContextXXX takes ImGuiPopupFlags just like OpenPopup() and unlike BeginPopup(). For full consistency, we may add ImGuiWindowFlags to the BeginPopupContextXXX functions in the future. + // - IMPORTANT: Notice that we exceptionally default their flags to 1 (== ImGuiPopupFlags_MouseButtonRight) for backward compatibility with older API taking 'int mouse_button = 1' parameter, so if you add other flags remember to re-add the ImGuiPopupFlags_MouseButtonRight. + IMGUI_API bool BeginPopupContextItem(const char* str_id = NULL, ImGuiPopupFlags popup_flags = 1); // open+begin popup when clicked on last item. Use str_id==NULL to associate the popup to previous item. If you want to use that on a non-interactive item such as Text() you need to pass in an explicit ID here. read comments in .cpp! + IMGUI_API bool BeginPopupContextWindow(const char* str_id = NULL, ImGuiPopupFlags popup_flags = 1);// open+begin popup when clicked on current window. + IMGUI_API bool BeginPopupContextVoid(const char* str_id = NULL, ImGuiPopupFlags popup_flags = 1); // open+begin popup when clicked in void (where there are no windows). + + // Popups: query functions + // - IsPopupOpen(): return true if the popup is open at the current BeginPopup() level of the popup stack. + // - IsPopupOpen() with ImGuiPopupFlags_AnyPopupId: return true if any popup is open at the current BeginPopup() level of the popup stack. + // - IsPopupOpen() with ImGuiPopupFlags_AnyPopupId + ImGuiPopupFlags_AnyPopupLevel: return true if any popup is open. + IMGUI_API bool IsPopupOpen(const char* str_id, ImGuiPopupFlags flags = 0); // return true if the popup is open. + + // Tables + // - Full-featured replacement for old Columns API. + // - See Demo->Tables for demo code. See top of imgui_tables.cpp for general commentary. + // - See ImGuiTableFlags_ and ImGuiTableColumnFlags_ enums for a description of available flags. + // The typical call flow is: + // - 1. Call BeginTable(), early out if returning false. + // - 2. Optionally call TableSetupColumn() to submit column name/flags/defaults. + // - 3. Optionally call TableSetupScrollFreeze() to request scroll freezing of columns/rows. + // - 4. Optionally call TableHeadersRow() to submit a header row. Names are pulled from TableSetupColumn() data. + // - 5. Populate contents: + // - In most situations you can use TableNextRow() + TableSetColumnIndex(N) to start appending into a column. + // - If you are using tables as a sort of grid, where every column is holding the same type of contents, + // you may prefer using TableNextColumn() instead of TableNextRow() + TableSetColumnIndex(). + // TableNextColumn() will automatically wrap-around into the next row if needed. + // - IMPORTANT: Comparatively to the old Columns() API, we need to call TableNextColumn() for the first column! + // - Summary of possible call flow: + // - TableNextRow() -> TableSetColumnIndex(0) -> Text("Hello 0") -> TableSetColumnIndex(1) -> Text("Hello 1") // OK + // - TableNextRow() -> TableNextColumn() -> Text("Hello 0") -> TableNextColumn() -> Text("Hello 1") // OK + // - TableNextColumn() -> Text("Hello 0") -> TableNextColumn() -> Text("Hello 1") // OK: TableNextColumn() automatically gets to next row! + // - TableNextRow() -> Text("Hello 0") // Not OK! Missing TableSetColumnIndex() or TableNextColumn()! Text will not appear! + // - 5. Call EndTable() + IMGUI_API bool BeginTable(const char* str_id, int columns, ImGuiTableFlags flags = 0, const ImVec2& outer_size = ImVec2(0.0f, 0.0f), float inner_width = 0.0f); + IMGUI_API void EndTable(); // only call EndTable() if BeginTable() returns true! + IMGUI_API void TableNextRow(ImGuiTableRowFlags row_flags = 0, float min_row_height = 0.0f); // append into the first cell of a new row. + IMGUI_API bool TableNextColumn(); // append into the next column (or first column of next row if currently in last column). Return true when column is visible. + IMGUI_API bool TableSetColumnIndex(int column_n); // append into the specified column. Return true when column is visible. + + // Tables: Headers & Columns declaration + // - Use TableSetupColumn() to specify label, resizing policy, default width/weight, id, various other flags etc. + // - Use TableHeadersRow() to create a header row and automatically submit a TableHeader() for each column. + // Headers are required to perform: reordering, sorting, and opening the context menu. + // The context menu can also be made available in columns body using ImGuiTableFlags_ContextMenuInBody. + // - You may manually submit headers using TableNextRow() + TableHeader() calls, but this is only useful in + // some advanced use cases (e.g. adding custom widgets in header row). + // - Use TableSetupScrollFreeze() to lock columns/rows so they stay visible when scrolled. + IMGUI_API void TableSetupColumn(const char* label, ImGuiTableColumnFlags flags = 0, float init_width_or_weight = 0.0f, ImGuiID user_id = 0); + IMGUI_API void TableSetupScrollFreeze(int cols, int rows); // lock columns/rows so they stay visible when scrolled. + IMGUI_API void TableHeader(const char* label); // submit one header cell manually (rarely used) + IMGUI_API void TableHeadersRow(); // submit a row with headers cells based on data provided to TableSetupColumn() + submit context menu + IMGUI_API void TableAngledHeadersRow(); // submit a row with angled headers for every column with the ImGuiTableColumnFlags_AngledHeader flag. MUST BE FIRST ROW. + + // Tables: Sorting & Miscellaneous functions + // - Sorting: call TableGetSortSpecs() to retrieve latest sort specs for the table. NULL when not sorting. + // When 'sort_specs->SpecsDirty == true' you should sort your data. It will be true when sorting specs have + // changed since last call, or the first time. Make sure to set 'SpecsDirty = false' after sorting, + // else you may wastefully sort your data every frame! + // - Functions args 'int column_n' treat the default value of -1 as the same as passing the current column index. + IMGUI_API ImGuiTableSortSpecs* TableGetSortSpecs(); // get latest sort specs for the table (NULL if not sorting). Lifetime: don't hold on this pointer over multiple frames or past any subsequent call to BeginTable(). + IMGUI_API int TableGetColumnCount(); // return number of columns (value passed to BeginTable) + IMGUI_API int TableGetColumnIndex(); // return current column index. + IMGUI_API int TableGetRowIndex(); // return current row index. + IMGUI_API const char* TableGetColumnName(int column_n = -1); // return "" if column didn't have a name declared by TableSetupColumn(). Pass -1 to use current column. + IMGUI_API ImGuiTableColumnFlags TableGetColumnFlags(int column_n = -1); // return column flags so you can query their Enabled/Visible/Sorted/Hovered status flags. Pass -1 to use current column. + IMGUI_API void TableSetColumnEnabled(int column_n, bool v);// change user accessible enabled/disabled state of a column. Set to false to hide the column. User can use the context menu to change this themselves (right-click in headers, or right-click in columns body with ImGuiTableFlags_ContextMenuInBody) + IMGUI_API int TableGetHoveredColumn(); // return hovered column. return -1 when table is not hovered. return columns_count if the unused space at the right of visible columns is hovered. Can also use (TableGetColumnFlags() & ImGuiTableColumnFlags_IsHovered) instead. + IMGUI_API void TableSetBgColor(ImGuiTableBgTarget target, ImU32 color, int column_n = -1); // change the color of a cell, row, or column. See ImGuiTableBgTarget_ flags for details. + + // Legacy Columns API (prefer using Tables!) // - You can also use SameLine(pos_x) to mimic simplified columns. - // - The columns API is work-in-progress and rather lacking (columns are arguably the worst part of dear imgui at the moment!) - IMGUI_API void Columns(int count = 1, const char* id = NULL, bool border = true); + IMGUI_API void Columns(int count = 1, const char* id = NULL, bool borders = true); IMGUI_API void NextColumn(); // next column, defaults to current row or next row if the current row is finished IMGUI_API int GetColumnIndex(); // get current column index IMGUI_API float GetColumnWidth(int column_index = -1); // get column width (in pixels). pass -1 to use current column @@ -582,13 +871,34 @@ namespace ImGui IMGUI_API int GetColumnsCount(); // Tab Bars, Tabs - // [BETA API] API may evolve! + // - Note: Tabs are automatically created by the docking system (when in 'docking' branch). Use this to create tab bars/tabs yourself. IMGUI_API bool BeginTabBar(const char* str_id, ImGuiTabBarFlags flags = 0); // create and append into a TabBar IMGUI_API void EndTabBar(); // only call EndTabBar() if BeginTabBar() returns true! - IMGUI_API bool BeginTabItem(const char* label, bool* p_open = NULL, ImGuiTabItemFlags flags = 0);// create a Tab. Returns true if the Tab is selected. + IMGUI_API bool BeginTabItem(const char* label, bool* p_open = NULL, ImGuiTabItemFlags flags = 0); // create a Tab. Returns true if the Tab is selected. IMGUI_API void EndTabItem(); // only call EndTabItem() if BeginTabItem() returns true! + IMGUI_API bool TabItemButton(const char* label, ImGuiTabItemFlags flags = 0); // create a Tab behaving like a button. return true when clicked. cannot be selected in the tab bar. IMGUI_API void SetTabItemClosed(const char* tab_or_docked_window_label); // notify TabBar or Docking system of a closed tab/window ahead (useful to reduce visual flicker on reorderable tab bars). For tab-bar: call after BeginTabBar() and before Tab submissions. Otherwise call with a window name. + // Docking + // [BETA API] Enable with io.ConfigFlags |= ImGuiConfigFlags_DockingEnable. + // Note: You can use most Docking facilities without calling any API. You DO NOT need to call DockSpace() to use Docking! + // - Drag from window title bar or their tab to dock/undock. Hold SHIFT to disable docking. + // - Drag from window menu button (upper-left button) to undock an entire node (all windows). + // - When io.ConfigDockingWithShift == true, you instead need to hold SHIFT to enable docking. + // About dockspaces: + // - Use DockSpaceOverViewport() to create a window covering the screen or a specific viewport + a dockspace inside it. + // This is often used with ImGuiDockNodeFlags_PassthruCentralNode to make it transparent. + // - Use DockSpace() to create an explicit dock node _within_ an existing window. See Docking demo for details. + // - Important: Dockspaces need to be submitted _before_ any window they can host. Submit it early in your frame! + // - Important: Dockspaces need to be kept alive if hidden, otherwise windows docked into it will be undocked. + // e.g. if you have multiple tabs with a dockspace inside each tab: submit the non-visible dockspaces with ImGuiDockNodeFlags_KeepAliveOnly. + IMGUI_API ImGuiID DockSpace(ImGuiID dockspace_id, const ImVec2& size = ImVec2(0, 0), ImGuiDockNodeFlags flags = 0, const ImGuiWindowClass* window_class = NULL); + IMGUI_API ImGuiID DockSpaceOverViewport(ImGuiID dockspace_id = 0, const ImGuiViewport* viewport = NULL, ImGuiDockNodeFlags flags = 0, const ImGuiWindowClass* window_class = NULL); + IMGUI_API void SetNextWindowDockID(ImGuiID dock_id, ImGuiCond cond = 0); // set next window dock id + IMGUI_API void SetNextWindowClass(const ImGuiWindowClass* window_class); // set next window class (control docking compatibility + provide hints to platform backend via custom viewport flags and platform parent/child relationship) + IMGUI_API ImGuiID GetWindowDockID(); + IMGUI_API bool IsWindowDocked(); // is current window docked into another window? + // Logging/Capture // - All text output from the interface can be captured into tty/file/clipboard. By default, tree nodes are automatically opened during logging. IMGUI_API void LogToTTY(int auto_open_depth = -1); // start logging to tty (stdout) @@ -597,61 +907,87 @@ namespace ImGui IMGUI_API void LogFinish(); // stop logging (close file, etc.) IMGUI_API void LogButtons(); // helper to display buttons for logging to tty/file/clipboard IMGUI_API void LogText(const char* fmt, ...) IM_FMTARGS(1); // pass text data straight to log (without being displayed) + IMGUI_API void LogTextV(const char* fmt, va_list args) IM_FMTLIST(1); // Drag and Drop - // [BETA API] API may evolve! - IMGUI_API bool BeginDragDropSource(ImGuiDragDropFlags flags = 0); // call when the current item is active. If this return true, you can call SetDragDropPayload() + EndDragDropSource() - IMGUI_API bool SetDragDropPayload(const char* type, const void* data, size_t sz, ImGuiCond cond = 0); // type is a user defined string of maximum 32 characters. Strings starting with '_' are reserved for dear imgui internal types. Data is copied and held by imgui. + // - On source items, call BeginDragDropSource(), if it returns true also call SetDragDropPayload() + EndDragDropSource(). + // - On target candidates, call BeginDragDropTarget(), if it returns true also call AcceptDragDropPayload() + EndDragDropTarget(). + // - If you stop calling BeginDragDropSource() the payload is preserved however it won't have a preview tooltip (we currently display a fallback "..." tooltip, see #1725) + // - An item can be both drag source and drop target. + IMGUI_API bool BeginDragDropSource(ImGuiDragDropFlags flags = 0); // call after submitting an item which may be dragged. when this return true, you can call SetDragDropPayload() + EndDragDropSource() + IMGUI_API bool SetDragDropPayload(const char* type, const void* data, size_t sz, ImGuiCond cond = 0); // type is a user defined string of maximum 32 characters. Strings starting with '_' are reserved for dear imgui internal types. Data is copied and held by imgui. Return true when payload has been accepted. IMGUI_API void EndDragDropSource(); // only call EndDragDropSource() if BeginDragDropSource() returns true! IMGUI_API bool BeginDragDropTarget(); // call after submitting an item that may receive a payload. If this returns true, you can call AcceptDragDropPayload() + EndDragDropTarget() IMGUI_API const ImGuiPayload* AcceptDragDropPayload(const char* type, ImGuiDragDropFlags flags = 0); // accept contents of a given type. If ImGuiDragDropFlags_AcceptBeforeDelivery is set you can peek into the payload before the mouse button is released. IMGUI_API void EndDragDropTarget(); // only call EndDragDropTarget() if BeginDragDropTarget() returns true! - IMGUI_API const ImGuiPayload* GetDragDropPayload(); // peek directly into the current payload from anywhere. may return NULL. use ImGuiPayload::IsDataType() to test for the payload type. + IMGUI_API const ImGuiPayload* GetDragDropPayload(); // peek directly into the current payload from anywhere. returns NULL when drag and drop is finished or inactive. use ImGuiPayload::IsDataType() to test for the payload type. + + // Disabling [BETA API] + // - Disable all user interactions and dim items visuals (applying style.DisabledAlpha over current colors) + // - Those can be nested but it cannot be used to enable an already disabled section (a single BeginDisabled(true) in the stack is enough to keep everything disabled) + // - Tooltips windows by exception are opted out of disabling. + // - BeginDisabled(false)/EndDisabled() essentially does nothing but is provided to facilitate use of boolean expressions (as a micro-optimization: if you have tens of thousands of BeginDisabled(false)/EndDisabled() pairs, you might want to reformulate your code to avoid making those calls) + IMGUI_API void BeginDisabled(bool disabled = true); + IMGUI_API void EndDisabled(); // Clipping + // - Mouse hovering is affected by ImGui::PushClipRect() calls, unlike direct calls to ImDrawList::PushClipRect() which are render only. IMGUI_API void PushClipRect(const ImVec2& clip_rect_min, const ImVec2& clip_rect_max, bool intersect_with_current_clip_rect); IMGUI_API void PopClipRect(); // Focus, Activation - // - Prefer using "SetItemDefaultFocus()" over "if (IsWindowAppearing()) SetScrollHereY()" when applicable to signify "this is the default item" - IMGUI_API void SetItemDefaultFocus(); // make last item the default focused item of a window. + IMGUI_API void SetItemDefaultFocus(); // make last item the default focused item of a newly appearing window. IMGUI_API void SetKeyboardFocusHere(int offset = 0); // focus keyboard on the next widget. Use positive 'offset' to access sub components of a multiple component widget. Use -1 to access previous widget. - // Item/Widgets Utilities - // - Most of the functions are referring to the last/previous item we submitted. + // Keyboard/Gamepad Navigation + IMGUI_API void SetNavCursorVisible(bool visible); // alter visibility of keyboard/gamepad cursor. by default: show when using an arrow key, hide when clicking with mouse. + + // Overlapping mode + IMGUI_API void SetNextItemAllowOverlap(); // allow next item to be overlapped by a subsequent item. Useful with invisible buttons, selectable, treenode covering an area where subsequent items may need to be added. Note that both Selectable() and TreeNode() have dedicated flags doing this. + + // Item/Widgets Utilities and Query Functions + // - Most of the functions are referring to the previous Item that has been submitted. // - See Demo Window under "Widgets->Querying Status" for an interactive visualization of most of those functions. IMGUI_API bool IsItemHovered(ImGuiHoveredFlags flags = 0); // is the last item hovered? (and usable, aka not blocked by a popup, etc.). See ImGuiHoveredFlags for more options. IMGUI_API bool IsItemActive(); // is the last item active? (e.g. button being held, text field being edited. This will continuously return true while holding mouse button on an item. Items that don't interact will always return false) IMGUI_API bool IsItemFocused(); // is the last item focused for keyboard/gamepad navigation? - IMGUI_API bool IsItemClicked(int mouse_button = 0); // is the last item clicked? (e.g. button/node just clicked on) == IsMouseClicked(mouse_button) && IsItemHovered() + IMGUI_API bool IsItemClicked(ImGuiMouseButton mouse_button = 0); // is the last item hovered and mouse clicked on? (**) == IsMouseClicked(mouse_button) && IsItemHovered()Important. (**) this is NOT equivalent to the behavior of e.g. Button(). Read comments in function definition. IMGUI_API bool IsItemVisible(); // is the last item visible? (items may be out of sight because of clipping/scrolling) IMGUI_API bool IsItemEdited(); // did the last item modify its underlying value this frame? or was pressed? This is generally the same as the "bool" return value of many widgets. IMGUI_API bool IsItemActivated(); // was the last item just made active (item was previously inactive). - IMGUI_API bool IsItemDeactivated(); // was the last item just made inactive (item was previously active). Useful for Undo/Redo patterns with widgets that requires continuous editing. - IMGUI_API bool IsItemDeactivatedAfterEdit(); // was the last item just made inactive and made a value change when it was active? (e.g. Slider/Drag moved). Useful for Undo/Redo patterns with widgets that requires continuous editing. Note that you may get false positives (some widgets such as Combo()/ListBox()/Selectable() will return true even when clicking an already selected item). + IMGUI_API bool IsItemDeactivated(); // was the last item just made inactive (item was previously active). Useful for Undo/Redo patterns with widgets that require continuous editing. + IMGUI_API bool IsItemDeactivatedAfterEdit(); // was the last item just made inactive and made a value change when it was active? (e.g. Slider/Drag moved). Useful for Undo/Redo patterns with widgets that require continuous editing. Note that you may get false positives (some widgets such as Combo()/ListBox()/Selectable() will return true even when clicking an already selected item). + IMGUI_API bool IsItemToggledOpen(); // was the last item open state toggled? set by TreeNode(). IMGUI_API bool IsAnyItemHovered(); // is any item hovered? IMGUI_API bool IsAnyItemActive(); // is any item active? IMGUI_API bool IsAnyItemFocused(); // is any item focused? + IMGUI_API ImGuiID GetItemID(); // get ID of last item (~~ often same ImGui::GetID(label) beforehand) IMGUI_API ImVec2 GetItemRectMin(); // get upper-left bounding rectangle of the last item (screen space) IMGUI_API ImVec2 GetItemRectMax(); // get lower-right bounding rectangle of the last item (screen space) IMGUI_API ImVec2 GetItemRectSize(); // get size of last item - IMGUI_API void SetItemAllowOverlap(); // allow last item to be overlapped by a subsequent item. sometimes useful with invisible buttons, selectables, etc. to catch unused area. + + // Viewports + // - Currently represents the Platform Window created by the application which is hosting our Dear ImGui windows. + // - In 'docking' branch with multi-viewport enabled, we extend this concept to have multiple active viewports. + // - In the future we will extend this concept further to also represent Platform Monitor and support a "no main platform window" operation mode. + IMGUI_API ImGuiViewport* GetMainViewport(); // return primary/default viewport. This can never be NULL. + + // Background/Foreground Draw Lists + IMGUI_API ImDrawList* GetBackgroundDrawList(ImGuiViewport* viewport = NULL); // get background draw list for the given viewport or viewport associated to the current window. this draw list will be the first rendering one. Useful to quickly draw shapes/text behind dear imgui contents. + IMGUI_API ImDrawList* GetForegroundDrawList(ImGuiViewport* viewport = NULL); // get foreground draw list for the given viewport or viewport associated to the current window. this draw list will be the top-most rendered one. Useful to quickly draw shapes/text over dear imgui contents. // Miscellaneous Utilities IMGUI_API bool IsRectVisible(const ImVec2& size); // test if rectangle (of given size, starting from cursor position) is visible / not clipped. IMGUI_API bool IsRectVisible(const ImVec2& rect_min, const ImVec2& rect_max); // test if rectangle (in screen space) is visible / not clipped. to perform coarse clipping on user's side. IMGUI_API double GetTime(); // get global imgui time. incremented by io.DeltaTime every frame. IMGUI_API int GetFrameCount(); // get global imgui frame count. incremented by 1 every frame. - IMGUI_API ImDrawList* GetBackgroundDrawList(); // this draw list will be the first rendering one. Useful to quickly draw shapes/text behind dear imgui contents. - IMGUI_API ImDrawList* GetForegroundDrawList(); // this draw list will be the last rendered one. Useful to quickly draw shapes/text over dear imgui contents. IMGUI_API ImDrawListSharedData* GetDrawListSharedData(); // you may use this when creating your own ImDrawList instances. IMGUI_API const char* GetStyleColorName(ImGuiCol idx); // get a string corresponding to the enum value (for display, saving, etc.). IMGUI_API void SetStateStorage(ImGuiStorage* storage); // replace current window storage with our own (if you want to manipulate it yourself, typically clear subsection of it) IMGUI_API ImGuiStorage* GetStateStorage(); + + // Text Utilities IMGUI_API ImVec2 CalcTextSize(const char* text, const char* text_end = NULL, bool hide_text_after_double_hash = false, float wrap_width = -1.0f); - IMGUI_API void CalcListClipping(int items_count, float items_height, int* out_items_display_start, int* out_items_display_end); // calculate coarse clipping for large list of evenly sized items. Prefer using the ImGuiListClipper higher-level helper if you can. - IMGUI_API bool BeginChildFrame(ImGuiID id, const ImVec2& size, ImGuiWindowFlags flags = 0); // helper to create a child window / scrolling region that looks like a normal widget frame - IMGUI_API void EndChildFrame(); // always call EndChildFrame() regardless of BeginChildFrame() return values (which indicates a collapsed/clipped window) // Color Utilities IMGUI_API ImVec4 ColorConvertU32ToFloat4(ImU32 in); @@ -659,59 +995,117 @@ namespace ImGui IMGUI_API void ColorConvertRGBtoHSV(float r, float g, float b, float& out_h, float& out_s, float& out_v); IMGUI_API void ColorConvertHSVtoRGB(float h, float s, float v, float& out_r, float& out_g, float& out_b); - // Inputs Utilities - IMGUI_API int GetKeyIndex(ImGuiKey imgui_key); // map ImGuiKey_* values into user's key index. == io.KeyMap[key] - IMGUI_API bool IsKeyDown(int user_key_index); // is key being held. == io.KeysDown[user_key_index]. note that imgui doesn't know the semantic of each entry of io.KeysDown[]. Use your own indices/enums according to how your backend/engine stored them into io.KeysDown[]! - IMGUI_API bool IsKeyPressed(int user_key_index, bool repeat = true); // was key pressed (went from !Down to Down). if repeat=true, uses io.KeyRepeatDelay / KeyRepeatRate - IMGUI_API bool IsKeyReleased(int user_key_index); // was key released (went from Down to !Down).. - IMGUI_API int GetKeyPressedAmount(int key_index, float repeat_delay, float rate); // uses provided repeat rate/delay. return a count, most often 0 or 1 but might be >1 if RepeatRate is small enough that DeltaTime > RepeatRate - IMGUI_API bool IsMouseDown(int button); // is mouse button held (0=left, 1=right, 2=middle) - IMGUI_API bool IsAnyMouseDown(); // is any mouse button held - IMGUI_API bool IsMouseClicked(int button, bool repeat = false); // did mouse button clicked (went from !Down to Down) (0=left, 1=right, 2=middle) - IMGUI_API bool IsMouseDoubleClicked(int button); // did mouse button double-clicked. a double-click returns false in IsMouseClicked(). uses io.MouseDoubleClickTime. - IMGUI_API bool IsMouseReleased(int button); // did mouse button released (went from Down to !Down) - IMGUI_API bool IsMouseDragging(int button = 0, float lock_threshold = -1.0f); // is mouse dragging. if lock_threshold < -1.0f uses io.MouseDraggingThreshold - IMGUI_API bool IsMouseHoveringRect(const ImVec2& r_min, const ImVec2& r_max, bool clip = true); // is mouse hovering given bounding rect (in screen space). clipped by current clipping settings, but disregarding of other consideration of focus/window ordering/popup-block. - IMGUI_API bool IsMousePosValid(const ImVec2* mouse_pos = NULL); // by convention we use (-FLT_MAX,-FLT_MAX) to denote that there is no mouse - IMGUI_API ImVec2 GetMousePos(); // shortcut to ImGui::GetIO().MousePos provided by user, to be consistent with other calls - IMGUI_API ImVec2 GetMousePosOnOpeningCurrentPopup(); // retrieve backup of mouse position at the time of opening popup we have BeginPopup() into - IMGUI_API ImVec2 GetMouseDragDelta(int button = 0, float lock_threshold = -1.0f); // return the delta from the initial clicking position while the mouse button is pressed or was just released. This is locked and return 0.0f until the mouse moves past a distance threshold at least once. If lock_threshold < -1.0f uses io.MouseDraggingThreshold. - IMGUI_API void ResetMouseDragDelta(int button = 0); // - IMGUI_API ImGuiMouseCursor GetMouseCursor(); // get desired cursor type, reset in ImGui::NewFrame(), this is updated during the frame. valid before Render(). If you use software rendering by setting io.MouseDrawCursor ImGui will render those for you - IMGUI_API void SetMouseCursor(ImGuiMouseCursor type); // set desired cursor type - IMGUI_API void CaptureKeyboardFromApp(bool want_capture_keyboard_value = true); // attention: misleading name! manually override io.WantCaptureKeyboard flag next frame (said flag is entirely left for your application to handle). e.g. force capture keyboard when your widget is being hovered. This is equivalent to setting "io.WantCaptureKeyboard = want_capture_keyboard_value"; after the next NewFrame() call. - IMGUI_API void CaptureMouseFromApp(bool want_capture_mouse_value = true); // attention: misleading name! manually override io.WantCaptureMouse flag next frame (said flag is entirely left for your application to handle). This is equivalent to setting "io.WantCaptureMouse = want_capture_mouse_value;" after the next NewFrame() call. + // Inputs Utilities: Keyboard/Mouse/Gamepad + // - the ImGuiKey enum contains all possible keyboard, mouse and gamepad inputs (e.g. ImGuiKey_A, ImGuiKey_MouseLeft, ImGuiKey_GamepadDpadUp...). + // - (legacy: before v1.87, we used ImGuiKey to carry native/user indices as defined by each backends. This was obsoleted in 1.87 (2022-02) and completely removed in 1.91.5 (2024-11). See https://github.com/ocornut/imgui/issues/4921) + // - (legacy: any use of ImGuiKey will assert when key < 512 to detect passing legacy native/user indices) + IMGUI_API bool IsKeyDown(ImGuiKey key); // is key being held. + IMGUI_API bool IsKeyPressed(ImGuiKey key, bool repeat = true); // was key pressed (went from !Down to Down)? if repeat=true, uses io.KeyRepeatDelay / KeyRepeatRate + IMGUI_API bool IsKeyReleased(ImGuiKey key); // was key released (went from Down to !Down)? + IMGUI_API bool IsKeyChordPressed(ImGuiKeyChord key_chord); // was key chord (mods + key) pressed, e.g. you can pass 'ImGuiMod_Ctrl | ImGuiKey_S' as a key-chord. This doesn't do any routing or focus check, please consider using Shortcut() function instead. + IMGUI_API int GetKeyPressedAmount(ImGuiKey key, float repeat_delay, float rate); // uses provided repeat rate/delay. return a count, most often 0 or 1 but might be >1 if RepeatRate is small enough that DeltaTime > RepeatRate + IMGUI_API const char* GetKeyName(ImGuiKey key); // [DEBUG] returns English name of the key. Those names are provided for debugging purpose and are not meant to be saved persistently nor compared. + IMGUI_API void SetNextFrameWantCaptureKeyboard(bool want_capture_keyboard); // Override io.WantCaptureKeyboard flag next frame (said flag is left for your application to handle, typically when true it instructs your app to ignore inputs). e.g. force capture keyboard when your widget is being hovered. This is equivalent to setting "io.WantCaptureKeyboard = want_capture_keyboard"; after the next NewFrame() call. - // Clipboard Utilities (also see the LogToClipboard() function to capture or output text data to the clipboard) + // Inputs Utilities: Shortcut Testing & Routing [BETA] + // - ImGuiKeyChord = a ImGuiKey + optional ImGuiMod_Alt/ImGuiMod_Ctrl/ImGuiMod_Shift/ImGuiMod_Super. + // ImGuiKey_C // Accepted by functions taking ImGuiKey or ImGuiKeyChord arguments) + // ImGuiMod_Ctrl | ImGuiKey_C // Accepted by functions taking ImGuiKeyChord arguments) + // only ImGuiMod_XXX values are legal to combine with an ImGuiKey. You CANNOT combine two ImGuiKey values. + // - The general idea is that several callers may register interest in a shortcut, and only one owner gets it. + // Parent -> call Shortcut(Ctrl+S) // When Parent is focused, Parent gets the shortcut. + // Child1 -> call Shortcut(Ctrl+S) // When Child1 is focused, Child1 gets the shortcut (Child1 overrides Parent shortcuts) + // Child2 -> no call // When Child2 is focused, Parent gets the shortcut. + // The whole system is order independent, so if Child1 makes its calls before Parent, results will be identical. + // This is an important property as it facilitate working with foreign code or larger codebase. + // - To understand the difference: + // - IsKeyChordPressed() compares mods and call IsKeyPressed() -> function has no side-effect. + // - Shortcut() submits a route, routes are resolved, if it currently can be routed it calls IsKeyChordPressed() -> function has (desirable) side-effects as it can prevents another call from getting the route. + // - Visualize registered routes in 'Metrics/Debugger->Inputs'. + IMGUI_API bool Shortcut(ImGuiKeyChord key_chord, ImGuiInputFlags flags = 0); + IMGUI_API void SetNextItemShortcut(ImGuiKeyChord key_chord, ImGuiInputFlags flags = 0); + + // Inputs Utilities: Key/Input Ownership [BETA] + // - One common use case would be to allow your items to disable standard inputs behaviors such + // as Tab or Alt key handling, Mouse Wheel scrolling, etc. + // e.g. Button(...); SetItemKeyOwner(ImGuiKey_MouseWheelY); to make hovering/activating a button disable wheel for scrolling. + // - Reminder ImGuiKey enum include access to mouse buttons and gamepad, so key ownership can apply to them. + // - Many related features are still in imgui_internal.h. For instance, most IsKeyXXX()/IsMouseXXX() functions have an owner-id-aware version. + IMGUI_API void SetItemKeyOwner(ImGuiKey key); // Set key owner to last item ID if it is hovered or active. Equivalent to 'if (IsItemHovered() || IsItemActive()) { SetKeyOwner(key, GetItemID());'. + + // Inputs Utilities: Mouse + // - To refer to a mouse button, you may use named enums in your code e.g. ImGuiMouseButton_Left, ImGuiMouseButton_Right. + // - You can also use regular integer: it is forever guaranteed that 0=Left, 1=Right, 2=Middle. + // - Dragging operations are only reported after mouse has moved a certain distance away from the initial clicking position (see 'lock_threshold' and 'io.MouseDraggingThreshold') + IMGUI_API bool IsMouseDown(ImGuiMouseButton button); // is mouse button held? + IMGUI_API bool IsMouseClicked(ImGuiMouseButton button, bool repeat = false); // did mouse button clicked? (went from !Down to Down). Same as GetMouseClickedCount() == 1. + IMGUI_API bool IsMouseReleased(ImGuiMouseButton button); // did mouse button released? (went from Down to !Down) + IMGUI_API bool IsMouseDoubleClicked(ImGuiMouseButton button); // did mouse button double-clicked? Same as GetMouseClickedCount() == 2. (note that a double-click will also report IsMouseClicked() == true) + IMGUI_API bool IsMouseReleasedWithDelay(ImGuiMouseButton button, float delay); // delayed mouse release (use very sparingly!). Generally used with 'delay >= io.MouseDoubleClickTime' + combined with a 'io.MouseClickedLastCount==1' test. This is a very rarely used UI idiom, but some apps use this: e.g. MS Explorer single click on an icon to rename. + IMGUI_API int GetMouseClickedCount(ImGuiMouseButton button); // return the number of successive mouse-clicks at the time where a click happen (otherwise 0). + IMGUI_API bool IsMouseHoveringRect(const ImVec2& r_min, const ImVec2& r_max, bool clip = true);// is mouse hovering given bounding rect (in screen space). clipped by current clipping settings, but disregarding of other consideration of focus/window ordering/popup-block. + IMGUI_API bool IsMousePosValid(const ImVec2* mouse_pos = NULL); // by convention we use (-FLT_MAX,-FLT_MAX) to denote that there is no mouse available + IMGUI_API bool IsAnyMouseDown(); // [WILL OBSOLETE] is any mouse button held? This was designed for backends, but prefer having backend maintain a mask of held mouse buttons, because upcoming input queue system will make this invalid. + IMGUI_API ImVec2 GetMousePos(); // shortcut to ImGui::GetIO().MousePos provided by user, to be consistent with other calls + IMGUI_API ImVec2 GetMousePosOnOpeningCurrentPopup(); // retrieve mouse position at the time of opening popup we have BeginPopup() into (helper to avoid user backing that value themselves) + IMGUI_API bool IsMouseDragging(ImGuiMouseButton button, float lock_threshold = -1.0f); // is mouse dragging? (uses io.MouseDraggingThreshold if lock_threshold < 0.0f) + IMGUI_API ImVec2 GetMouseDragDelta(ImGuiMouseButton button = 0, float lock_threshold = -1.0f); // return the delta from the initial clicking position while the mouse button is pressed or was just released. This is locked and return 0.0f until the mouse moves past a distance threshold at least once (uses io.MouseDraggingThreshold if lock_threshold < 0.0f) + IMGUI_API void ResetMouseDragDelta(ImGuiMouseButton button = 0); // + IMGUI_API ImGuiMouseCursor GetMouseCursor(); // get desired mouse cursor shape. Important: reset in ImGui::NewFrame(), this is updated during the frame. valid before Render(). If you use software rendering by setting io.MouseDrawCursor ImGui will render those for you + IMGUI_API void SetMouseCursor(ImGuiMouseCursor cursor_type); // set desired mouse cursor shape + IMGUI_API void SetNextFrameWantCaptureMouse(bool want_capture_mouse); // Override io.WantCaptureMouse flag next frame (said flag is left for your application to handle, typical when true it instucts your app to ignore inputs). This is equivalent to setting "io.WantCaptureMouse = want_capture_mouse;" after the next NewFrame() call. + + // Clipboard Utilities + // - Also see the LogToClipboard() function to capture GUI into clipboard, or easily output text data to the clipboard. IMGUI_API const char* GetClipboardText(); IMGUI_API void SetClipboardText(const char* text); // Settings/.Ini Utilities // - The disk functions are automatically called if io.IniFilename != NULL (default is "imgui.ini"). // - Set io.IniFilename to NULL to load/save manually. Read io.WantSaveIniSettings description about handling .ini saving manually. + // - Important: default value "imgui.ini" is relative to current working dir! Most apps will want to lock this to an absolute path (e.g. same path as executables). IMGUI_API void LoadIniSettingsFromDisk(const char* ini_filename); // call after CreateContext() and before the first call to NewFrame(). NewFrame() automatically calls LoadIniSettingsFromDisk(io.IniFilename). IMGUI_API void LoadIniSettingsFromMemory(const char* ini_data, size_t ini_size=0); // call after CreateContext() and before the first call to NewFrame() to provide .ini data from your own data source. IMGUI_API void SaveIniSettingsToDisk(const char* ini_filename); // this is automatically called (if io.IniFilename is not empty) a few seconds after any modification that should be reflected in the .ini file (and also by DestroyContext). IMGUI_API const char* SaveIniSettingsToMemory(size_t* out_ini_size = NULL); // return a zero-terminated string with the .ini data which you can save by your own mean. call when io.WantSaveIniSettings is set, then save data by your own mean and clear io.WantSaveIniSettings. + // Debug Utilities + // - Your main debugging friend is the ShowMetricsWindow() function, which is also accessible from Demo->Tools->Metrics Debugger + IMGUI_API void DebugTextEncoding(const char* text); + IMGUI_API void DebugFlashStyleColor(ImGuiCol idx); + IMGUI_API void DebugStartItemPicker(); + IMGUI_API bool DebugCheckVersionAndDataLayout(const char* version_str, size_t sz_io, size_t sz_style, size_t sz_vec2, size_t sz_vec4, size_t sz_drawvert, size_t sz_drawidx); // This is called by IMGUI_CHECKVERSION() macro. +#ifndef IMGUI_DISABLE_DEBUG_TOOLS + IMGUI_API void DebugLog(const char* fmt, ...) IM_FMTARGS(1); // Call via IMGUI_DEBUG_LOG() for maximum stripping in caller code! + IMGUI_API void DebugLogV(const char* fmt, va_list args) IM_FMTLIST(1); +#endif + // Memory Allocators - // - All those functions are not reliant on the current context. - // - If you reload the contents of imgui.cpp at runtime, you may need to call SetCurrentContext() + SetAllocatorFunctions() again because we use global storage for those. - IMGUI_API void SetAllocatorFunctions(void* (*alloc_func)(size_t sz, void* user_data), void (*free_func)(void* ptr, void* user_data), void* user_data = NULL); + // - Those functions are not reliant on the current context. + // - DLL users: heaps and globals are not shared across DLL boundaries! You will need to call SetCurrentContext() + SetAllocatorFunctions() + // for each static/DLL boundary you are calling from. Read "Context and Memory Allocators" section of imgui.cpp for more details. + IMGUI_API void SetAllocatorFunctions(ImGuiMemAllocFunc alloc_func, ImGuiMemFreeFunc free_func, void* user_data = NULL); + IMGUI_API void GetAllocatorFunctions(ImGuiMemAllocFunc* p_alloc_func, ImGuiMemFreeFunc* p_free_func, void** p_user_data); IMGUI_API void* MemAlloc(size_t size); IMGUI_API void MemFree(void* ptr); - // by zfedoran, https://github.com/ocornut/imgui/issues/1901 - IMGUI_API bool BufferingBar( const char* label, float value, const ImVec2& size_arg, const ImU32& bg_col, const ImU32& fg_col ); - IMGUI_API bool Spinner( const char* label, float radius, int thickness, const ImU32& color ); + // (Optional) Platform/OS interface for multi-viewport support + // Read comments around the ImGuiPlatformIO structure for more details. + // Note: You may use GetWindowViewport() to get the current viewport of the current window. + IMGUI_API void UpdatePlatformWindows(); // call in main loop. will call CreateWindow/ResizeWindow/etc. platform functions for each secondary viewport, and DestroyWindow for each inactive viewport. + IMGUI_API void RenderPlatformWindowsDefault(void* platform_render_arg = NULL, void* renderer_render_arg = NULL); // call in main loop. will call RenderWindow/SwapBuffers platform functions for each secondary viewport which doesn't have the ImGuiViewportFlags_Minimized flag set. May be reimplemented by user for custom rendering needs. + IMGUI_API void DestroyPlatformWindows(); // call DestroyWindow platform functions for all viewports. call from backend Shutdown() if you need to close platform windows before imgui shutdown. otherwise will be called by DestroyContext(). + IMGUI_API ImGuiViewport* FindViewportByID(ImGuiID id); // this is a helper for backends. + IMGUI_API ImGuiViewport* FindViewportByPlatformHandle(void* platform_handle); // this is a helper for backends. the type platform_handle is decided by the backend (e.g. HWND, MyWindow*, GLFWwindow* etc.) } // namespace ImGui //----------------------------------------------------------------------------- -// Flags & Enumerations +// [SECTION] Flags & Enumerations //----------------------------------------------------------------------------- // Flags for ImGui::Begin() +// (Those are per-window flags. There are shared flags in ImGuiIO: io.ConfigWindowsResizeFromEdges and io.ConfigWindowsMoveFromTitleBarOnly) enum ImGuiWindowFlags_ { ImGuiWindowFlags_None = 0, @@ -720,7 +1114,7 @@ enum ImGuiWindowFlags_ ImGuiWindowFlags_NoMove = 1 << 2, // Disable user moving the window ImGuiWindowFlags_NoScrollbar = 1 << 3, // Disable scrollbars (window can still scroll with mouse or programmatically) ImGuiWindowFlags_NoScrollWithMouse = 1 << 4, // Disable user vertically scrolling with mouse wheel. On child window, mouse wheel will be forwarded to the parent unless NoScrollbar is also set. - ImGuiWindowFlags_NoCollapse = 1 << 5, // Disable user collapsing window by double-clicking on it + ImGuiWindowFlags_NoCollapse = 1 << 5, // Disable user collapsing window by double-clicking on it. Also referred to as Window Menu Button (e.g. within a docking node). ImGuiWindowFlags_AlwaysAutoResize = 1 << 6, // Resize every window to its content every frame ImGuiWindowFlags_NoBackground = 1 << 7, // Disable drawing background color (WindowBg, etc.) and outside border. Similar as using SetNextWindowBgAlpha(0.0f). ImGuiWindowFlags_NoSavedSettings = 1 << 8, // Never load/save settings in .ini file @@ -731,53 +1125,111 @@ enum ImGuiWindowFlags_ ImGuiWindowFlags_NoBringToFrontOnFocus = 1 << 13, // Disable bringing window to front when taking focus (e.g. clicking on it or programmatically giving it focus) ImGuiWindowFlags_AlwaysVerticalScrollbar= 1 << 14, // Always show vertical scrollbar (even if ContentSize.y < Size.y) ImGuiWindowFlags_AlwaysHorizontalScrollbar=1<< 15, // Always show horizontal scrollbar (even if ContentSize.x < Size.x) - ImGuiWindowFlags_AlwaysUseWindowPadding = 1 << 16, // Ensure child windows without border uses style.WindowPadding (ignored by default for non-bordered child windows, because more convenient) - ImGuiWindowFlags_NoNavInputs = 1 << 18, // No gamepad/keyboard navigation within the window - ImGuiWindowFlags_NoNavFocus = 1 << 19, // No focusing toward this window with gamepad/keyboard navigation (e.g. skipped by CTRL+TAB) - ImGuiWindowFlags_UnsavedDocument = 1 << 20, // Append '*' to title without affecting the ID, as a convenience to avoid using the ### operator. When used in a tab/docking context, tab is selected on closure and closure is deferred by one frame to allow code to cancel the closure (with a confirmation popup, etc.) without flicker. + ImGuiWindowFlags_NoNavInputs = 1 << 16, // No keyboard/gamepad navigation within the window + ImGuiWindowFlags_NoNavFocus = 1 << 17, // No focusing toward this window with keyboard/gamepad navigation (e.g. skipped by CTRL+TAB) + ImGuiWindowFlags_UnsavedDocument = 1 << 18, // Display a dot next to the title. When used in a tab/docking context, tab is selected when clicking the X + closure is not assumed (will wait for user to stop submitting the tab). Otherwise closure is assumed when pressing the X, so if you keep submitting the tab may reappear at end of tab bar. + ImGuiWindowFlags_NoDocking = 1 << 19, // Disable docking of this window ImGuiWindowFlags_NoNav = ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus, ImGuiWindowFlags_NoDecoration = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoCollapse, ImGuiWindowFlags_NoInputs = ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus, // [Internal] - ImGuiWindowFlags_NavFlattened = 1 << 23, // [BETA] Allow gamepad/keyboard navigation to cross over parent border to this child (only use on child that have no scrolling!) + ImGuiWindowFlags_DockNodeHost = 1 << 23, // Don't use! For internal use by Begin()/NewFrame() ImGuiWindowFlags_ChildWindow = 1 << 24, // Don't use! For internal use by BeginChild() ImGuiWindowFlags_Tooltip = 1 << 25, // Don't use! For internal use by BeginTooltip() ImGuiWindowFlags_Popup = 1 << 26, // Don't use! For internal use by BeginPopup() ImGuiWindowFlags_Modal = 1 << 27, // Don't use! For internal use by BeginPopupModal() - ImGuiWindowFlags_ChildMenu = 1 << 28 // Don't use! For internal use by BeginMenu() + ImGuiWindowFlags_ChildMenu = 1 << 28, // Don't use! For internal use by BeginMenu() - // [Obsolete] - //ImGuiWindowFlags_ShowBorders = 1 << 7, // --> Set style.FrameBorderSize=1.0f / style.WindowBorderSize=1.0f to enable borders around windows and items - //ImGuiWindowFlags_ResizeFromAnySide = 1 << 17, // --> Set io.ConfigWindowsResizeFromEdges and make sure mouse cursors are supported by back-end (io.BackendFlags & ImGuiBackendFlags_HasMouseCursors) + // Obsolete names +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + ImGuiWindowFlags_NavFlattened = 1 << 29, // Obsoleted in 1.90.9: Use ImGuiChildFlags_NavFlattened in BeginChild() call. + ImGuiWindowFlags_AlwaysUseWindowPadding = 1 << 30, // Obsoleted in 1.90.0: Use ImGuiChildFlags_AlwaysUseWindowPadding in BeginChild() call. +#endif +}; + +// Flags for ImGui::BeginChild() +// (Legacy: bit 0 must always correspond to ImGuiChildFlags_Borders to be backward compatible with old API using 'bool border = false'. +// About using AutoResizeX/AutoResizeY flags: +// - May be combined with SetNextWindowSizeConstraints() to set a min/max size for each axis (see "Demo->Child->Auto-resize with Constraints"). +// - Size measurement for a given axis is only performed when the child window is within visible boundaries, or is just appearing. +// - This allows BeginChild() to return false when not within boundaries (e.g. when scrolling), which is more optimal. BUT it won't update its auto-size while clipped. +// While not perfect, it is a better default behavior as the always-on performance gain is more valuable than the occasional "resizing after becoming visible again" glitch. +// - You may also use ImGuiChildFlags_AlwaysAutoResize to force an update even when child window is not in view. +// HOWEVER PLEASE UNDERSTAND THAT DOING SO WILL PREVENT BeginChild() FROM EVER RETURNING FALSE, disabling benefits of coarse clipping. +enum ImGuiChildFlags_ +{ + ImGuiChildFlags_None = 0, + ImGuiChildFlags_Borders = 1 << 0, // Show an outer border and enable WindowPadding. (IMPORTANT: this is always == 1 == true for legacy reason) + ImGuiChildFlags_AlwaysUseWindowPadding = 1 << 1, // Pad with style.WindowPadding even if no border are drawn (no padding by default for non-bordered child windows because it makes more sense) + ImGuiChildFlags_ResizeX = 1 << 2, // Allow resize from right border (layout direction). Enable .ini saving (unless ImGuiWindowFlags_NoSavedSettings passed to window flags) + ImGuiChildFlags_ResizeY = 1 << 3, // Allow resize from bottom border (layout direction). " + ImGuiChildFlags_AutoResizeX = 1 << 4, // Enable auto-resizing width. Read "IMPORTANT: Size measurement" details above. + ImGuiChildFlags_AutoResizeY = 1 << 5, // Enable auto-resizing height. Read "IMPORTANT: Size measurement" details above. + ImGuiChildFlags_AlwaysAutoResize = 1 << 6, // Combined with AutoResizeX/AutoResizeY. Always measure size even when child is hidden, always return true, always disable clipping optimization! NOT RECOMMENDED. + ImGuiChildFlags_FrameStyle = 1 << 7, // Style the child window like a framed item: use FrameBg, FrameRounding, FrameBorderSize, FramePadding instead of ChildBg, ChildRounding, ChildBorderSize, WindowPadding. + ImGuiChildFlags_NavFlattened = 1 << 8, // [BETA] Share focus scope, allow keyboard/gamepad navigation to cross over parent border to this child or between sibling child windows. + + // Obsolete names +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + ImGuiChildFlags_Border = ImGuiChildFlags_Borders, // Renamed in 1.91.1 (August 2024) for consistency. +#endif +}; + +// Flags for ImGui::PushItemFlag() +// (Those are shared by all items) +enum ImGuiItemFlags_ +{ + ImGuiItemFlags_None = 0, // (Default) + ImGuiItemFlags_NoTabStop = 1 << 0, // false // Disable keyboard tabbing. This is a "lighter" version of ImGuiItemFlags_NoNav. + ImGuiItemFlags_NoNav = 1 << 1, // false // Disable any form of focusing (keyboard/gamepad directional navigation and SetKeyboardFocusHere() calls). + ImGuiItemFlags_NoNavDefaultFocus = 1 << 2, // false // Disable item being a candidate for default focus (e.g. used by title bar items). + ImGuiItemFlags_ButtonRepeat = 1 << 3, // false // Any button-like behavior will have repeat mode enabled (based on io.KeyRepeatDelay and io.KeyRepeatRate values). Note that you can also call IsItemActive() after any button to tell if it is being held. + ImGuiItemFlags_AutoClosePopups = 1 << 4, // true // MenuItem()/Selectable() automatically close their parent popup window. + ImGuiItemFlags_AllowDuplicateId = 1 << 5, // false // Allow submitting an item with the same identifier as an item already submitted this frame without triggering a warning tooltip if io.ConfigDebugHighlightIdConflicts is set. }; // Flags for ImGui::InputText() +// (Those are per-item flags. There are shared flags in ImGuiIO: io.ConfigInputTextCursorBlink and io.ConfigInputTextEnterKeepActive) enum ImGuiInputTextFlags_ { + // Basic filters (also see ImGuiInputTextFlags_CallbackCharFilter) ImGuiInputTextFlags_None = 0, ImGuiInputTextFlags_CharsDecimal = 1 << 0, // Allow 0123456789.+-*/ ImGuiInputTextFlags_CharsHexadecimal = 1 << 1, // Allow 0123456789ABCDEFabcdef - ImGuiInputTextFlags_CharsUppercase = 1 << 2, // Turn a..z into A..Z - ImGuiInputTextFlags_CharsNoBlank = 1 << 3, // Filter out spaces, tabs - ImGuiInputTextFlags_AutoSelectAll = 1 << 4, // Select entire text when first taking mouse focus - ImGuiInputTextFlags_EnterReturnsTrue = 1 << 5, // Return 'true' when Enter is pressed (as opposed to every time the value was modified). Consider looking at the IsItemDeactivatedAfterEdit() function. - ImGuiInputTextFlags_CallbackCompletion = 1 << 6, // Callback on pressing TAB (for completion handling) - ImGuiInputTextFlags_CallbackHistory = 1 << 7, // Callback on pressing Up/Down arrows (for history handling) - ImGuiInputTextFlags_CallbackAlways = 1 << 8, // Callback on each iteration. User code may query cursor position, modify text buffer. - ImGuiInputTextFlags_CallbackCharFilter = 1 << 9, // Callback on character inputs to replace or discard them. Modify 'EventChar' to replace or discard, or return 1 in callback to discard. - ImGuiInputTextFlags_AllowTabInput = 1 << 10, // Pressing TAB input a '\t' character into the text field - ImGuiInputTextFlags_CtrlEnterForNewLine = 1 << 11, // In multi-line mode, unfocus with Enter, add new line with Ctrl+Enter (default is opposite: unfocus with Ctrl+Enter, add line with Enter). - ImGuiInputTextFlags_NoHorizontalScroll = 1 << 12, // Disable following the cursor horizontally - ImGuiInputTextFlags_AlwaysInsertMode = 1 << 13, // Insert mode - ImGuiInputTextFlags_ReadOnly = 1 << 14, // Read-only mode - ImGuiInputTextFlags_Password = 1 << 15, // Password mode, display all characters as '*' + ImGuiInputTextFlags_CharsScientific = 1 << 2, // Allow 0123456789.+-*/eE (Scientific notation input) + ImGuiInputTextFlags_CharsUppercase = 1 << 3, // Turn a..z into A..Z + ImGuiInputTextFlags_CharsNoBlank = 1 << 4, // Filter out spaces, tabs + + // Inputs + ImGuiInputTextFlags_AllowTabInput = 1 << 5, // Pressing TAB input a '\t' character into the text field + ImGuiInputTextFlags_EnterReturnsTrue = 1 << 6, // Return 'true' when Enter is pressed (as opposed to every time the value was modified). Consider using IsItemDeactivatedAfterEdit() instead! + ImGuiInputTextFlags_EscapeClearsAll = 1 << 7, // Escape key clears content if not empty, and deactivate otherwise (contrast to default behavior of Escape to revert) + ImGuiInputTextFlags_CtrlEnterForNewLine = 1 << 8, // In multi-line mode, validate with Enter, add new line with Ctrl+Enter (default is opposite: validate with Ctrl+Enter, add line with Enter). + + // Other options + ImGuiInputTextFlags_ReadOnly = 1 << 9, // Read-only mode + ImGuiInputTextFlags_Password = 1 << 10, // Password mode, display all characters as '*', disable copy + ImGuiInputTextFlags_AlwaysOverwrite = 1 << 11, // Overwrite mode + ImGuiInputTextFlags_AutoSelectAll = 1 << 12, // Select entire text when first taking mouse focus + ImGuiInputTextFlags_ParseEmptyRefVal = 1 << 13, // InputFloat(), InputInt(), InputScalar() etc. only: parse empty string as zero value. + ImGuiInputTextFlags_DisplayEmptyRefVal = 1 << 14, // InputFloat(), InputInt(), InputScalar() etc. only: when value is zero, do not display it. Generally used with ImGuiInputTextFlags_ParseEmptyRefVal. + ImGuiInputTextFlags_NoHorizontalScroll = 1 << 15, // Disable following the cursor horizontally ImGuiInputTextFlags_NoUndoRedo = 1 << 16, // Disable undo/redo. Note that input text owns the text data while active, if you want to provide your own undo/redo stack you need e.g. to call ClearActiveID(). - ImGuiInputTextFlags_CharsScientific = 1 << 17, // Allow 0123456789.+-*/eE (Scientific notation input) - ImGuiInputTextFlags_CallbackResize = 1 << 18, // Callback on buffer capacity changes request (beyond 'buf_size' parameter value), allowing the string to grow. Notify when the string wants to be resized (for string types which hold a cache of their Size). You will be provided a new BufSize in the callback and NEED to honor it. (see misc/cpp/imgui_stdlib.h for an example of using this) - // [Internal] - ImGuiInputTextFlags_Multiline = 1 << 20, // For internal use by InputTextMultiline() - ImGuiInputTextFlags_NoMarkEdited = 1 << 21 // For internal use by functions using InputText() before reformatting data + + // Elide display / Alignment + ImGuiInputTextFlags_ElideLeft = 1 << 17, // When text doesn't fit, elide left side to ensure right side stays visible. Useful for path/filenames. Single-line only! + + // Callback features + ImGuiInputTextFlags_CallbackCompletion = 1 << 18, // Callback on pressing TAB (for completion handling) + ImGuiInputTextFlags_CallbackHistory = 1 << 19, // Callback on pressing Up/Down arrows (for history handling) + ImGuiInputTextFlags_CallbackAlways = 1 << 20, // Callback on each iteration. User code may query cursor position, modify text buffer. + ImGuiInputTextFlags_CallbackCharFilter = 1 << 21, // Callback on character inputs to replace or discard them. Modify 'EventChar' to replace or discard, or return 1 in callback to discard. + ImGuiInputTextFlags_CallbackResize = 1 << 22, // Callback on buffer capacity changes request (beyond 'buf_size' parameter value), allowing the string to grow. Notify when the string wants to be resized (for string types which hold a cache of their Size). You will be provided a new BufSize in the callback and NEED to honor it. (see misc/cpp/imgui_stdlib.h for an example of using this) + ImGuiInputTextFlags_CallbackEdit = 1 << 23, // Callback on any edit. Note that InputText() already returns true on edit + you can always use IsItemEdited(). The callback is useful to manipulate the underlying buffer while focus is active. + + // Obsolete names + //ImGuiInputTextFlags_AlwaysInsertMode = ImGuiInputTextFlags_AlwaysOverwrite // [renamed in 1.82] name was not matching behavior }; // Flags for ImGui::TreeNodeEx(), ImGui::CollapsingHeader*() @@ -785,37 +1237,71 @@ enum ImGuiTreeNodeFlags_ { ImGuiTreeNodeFlags_None = 0, ImGuiTreeNodeFlags_Selected = 1 << 0, // Draw as selected - ImGuiTreeNodeFlags_Framed = 1 << 1, // Full colored frame (e.g. for CollapsingHeader) - ImGuiTreeNodeFlags_AllowItemOverlap = 1 << 2, // Hit testing to allow subsequent widgets to overlap this one + ImGuiTreeNodeFlags_Framed = 1 << 1, // Draw frame with background (e.g. for CollapsingHeader) + ImGuiTreeNodeFlags_AllowOverlap = 1 << 2, // Hit testing to allow subsequent widgets to overlap this one ImGuiTreeNodeFlags_NoTreePushOnOpen = 1 << 3, // Don't do a TreePush() when open (e.g. for CollapsingHeader) = no extra indent nor pushing on ID stack ImGuiTreeNodeFlags_NoAutoOpenOnLog = 1 << 4, // Don't automatically and temporarily open node when Logging is active (by default logging will automatically open tree nodes) ImGuiTreeNodeFlags_DefaultOpen = 1 << 5, // Default node to be open - ImGuiTreeNodeFlags_OpenOnDoubleClick = 1 << 6, // Need double-click to open node - ImGuiTreeNodeFlags_OpenOnArrow = 1 << 7, // Only open when clicking on the arrow part. If ImGuiTreeNodeFlags_OpenOnDoubleClick is also set, single-click arrow or double-click all box to open. + ImGuiTreeNodeFlags_OpenOnDoubleClick = 1 << 6, // Open on double-click instead of simple click (default for multi-select unless any _OpenOnXXX behavior is set explicitly). Both behaviors may be combined. + ImGuiTreeNodeFlags_OpenOnArrow = 1 << 7, // Open when clicking on the arrow part (default for multi-select unless any _OpenOnXXX behavior is set explicitly). Both behaviors may be combined. ImGuiTreeNodeFlags_Leaf = 1 << 8, // No collapsing, no arrow (use as a convenience for leaf nodes). - ImGuiTreeNodeFlags_Bullet = 1 << 9, // Display a bullet instead of arrow - ImGuiTreeNodeFlags_FramePadding = 1 << 10, // Use FramePadding (even for an unframed text node) to vertically align text baseline to regular widget height. Equivalent to calling AlignTextToFramePadding(). - ImGuiTreeNodeFlags_SpanAvailWidth = 1 << 11, // Extend hit box to the right-most edge, even if not framed. This is not the default in order to allow adding other items on the same line. In the future we may refactor the hit system to be front-to-back, allowing natural overlaps and then this can become the default. - ImGuiTreeNodeFlags_SpanFullWidth = 1 << 12, // Extend hit box to the left-most and right-most edges (bypass the indented area). - ImGuiTreeNodeFlags_NavLeftJumpsBackHere = 1 << 13, // (WIP) Nav: left direction may move to this TreeNode() from any of its child (items submitted between TreeNode and TreePop) - //ImGuiTreeNodeFlags_NoScrollOnOpen = 1 << 14, // FIXME: TODO: Disable automatic scroll on TreePop() if node got just open and contents is not visible - ImGuiTreeNodeFlags_CollapsingHeader = ImGuiTreeNodeFlags_Framed | ImGuiTreeNodeFlags_NoTreePushOnOpen | ImGuiTreeNodeFlags_NoAutoOpenOnLog + ImGuiTreeNodeFlags_Bullet = 1 << 9, // Display a bullet instead of arrow. IMPORTANT: node can still be marked open/close if you don't set the _Leaf flag! + ImGuiTreeNodeFlags_FramePadding = 1 << 10, // Use FramePadding (even for an unframed text node) to vertically align text baseline to regular widget height. Equivalent to calling AlignTextToFramePadding() before the node. + ImGuiTreeNodeFlags_SpanAvailWidth = 1 << 11, // Extend hit box to the right-most edge, even if not framed. This is not the default in order to allow adding other items on the same line without using AllowOverlap mode. + ImGuiTreeNodeFlags_SpanFullWidth = 1 << 12, // Extend hit box to the left-most and right-most edges (cover the indent area). + ImGuiTreeNodeFlags_SpanLabelWidth = 1 << 13, // Narrow hit box + narrow hovering highlight, will only cover the label text. + ImGuiTreeNodeFlags_SpanAllColumns = 1 << 14, // Frame will span all columns of its container table (label will still fit in current column) + ImGuiTreeNodeFlags_LabelSpanAllColumns = 1 << 15, // Label will span all columns of its container table + //ImGuiTreeNodeFlags_NoScrollOnOpen = 1 << 16, // FIXME: TODO: Disable automatic scroll on TreePop() if node got just open and contents is not visible + ImGuiTreeNodeFlags_NavLeftJumpsBackHere = 1 << 17, // (WIP) Nav: left direction may move to this TreeNode() from any of its child (items submitted between TreeNode and TreePop) + ImGuiTreeNodeFlags_CollapsingHeader = ImGuiTreeNodeFlags_Framed | ImGuiTreeNodeFlags_NoTreePushOnOpen | ImGuiTreeNodeFlags_NoAutoOpenOnLog, - // Obsolete names (will be removed) #ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS - , ImGuiTreeNodeFlags_AllowOverlapMode = ImGuiTreeNodeFlags_AllowItemOverlap // [renamed in 1.53] + ImGuiTreeNodeFlags_AllowItemOverlap = ImGuiTreeNodeFlags_AllowOverlap, // Renamed in 1.89.7 + ImGuiTreeNodeFlags_SpanTextWidth = ImGuiTreeNodeFlags_SpanLabelWidth,// Renamed in 1.90.7 #endif }; +// Flags for OpenPopup*(), BeginPopupContext*(), IsPopupOpen() functions. +// - To be backward compatible with older API which took an 'int mouse_button = 1' argument instead of 'ImGuiPopupFlags flags', +// we need to treat small flags values as a mouse button index, so we encode the mouse button in the first few bits of the flags. +// It is therefore guaranteed to be legal to pass a mouse button index in ImGuiPopupFlags. +// - For the same reason, we exceptionally default the ImGuiPopupFlags argument of BeginPopupContextXXX functions to 1 instead of 0. +// IMPORTANT: because the default parameter is 1 (==ImGuiPopupFlags_MouseButtonRight), if you rely on the default parameter +// and want to use another flag, you need to pass in the ImGuiPopupFlags_MouseButtonRight flag explicitly. +// - Multiple buttons currently cannot be combined/or-ed in those functions (we could allow it later). +enum ImGuiPopupFlags_ +{ + ImGuiPopupFlags_None = 0, + ImGuiPopupFlags_MouseButtonLeft = 0, // For BeginPopupContext*(): open on Left Mouse release. Guaranteed to always be == 0 (same as ImGuiMouseButton_Left) + ImGuiPopupFlags_MouseButtonRight = 1, // For BeginPopupContext*(): open on Right Mouse release. Guaranteed to always be == 1 (same as ImGuiMouseButton_Right) + ImGuiPopupFlags_MouseButtonMiddle = 2, // For BeginPopupContext*(): open on Middle Mouse release. Guaranteed to always be == 2 (same as ImGuiMouseButton_Middle) + ImGuiPopupFlags_MouseButtonMask_ = 0x1F, + ImGuiPopupFlags_MouseButtonDefault_ = 1, + ImGuiPopupFlags_NoReopen = 1 << 5, // For OpenPopup*(), BeginPopupContext*(): don't reopen same popup if already open (won't reposition, won't reinitialize navigation) + //ImGuiPopupFlags_NoReopenAlwaysNavInit = 1 << 6, // For OpenPopup*(), BeginPopupContext*(): focus and initialize navigation even when not reopening. + ImGuiPopupFlags_NoOpenOverExistingPopup = 1 << 7, // For OpenPopup*(), BeginPopupContext*(): don't open if there's already a popup at the same level of the popup stack + ImGuiPopupFlags_NoOpenOverItems = 1 << 8, // For BeginPopupContextWindow(): don't return true when hovering items, only when hovering empty space + ImGuiPopupFlags_AnyPopupId = 1 << 10, // For IsPopupOpen(): ignore the ImGuiID parameter and test for any popup. + ImGuiPopupFlags_AnyPopupLevel = 1 << 11, // For IsPopupOpen(): search/test at any level of the popup stack (default test in the current level) + ImGuiPopupFlags_AnyPopup = ImGuiPopupFlags_AnyPopupId | ImGuiPopupFlags_AnyPopupLevel, +}; + // Flags for ImGui::Selectable() enum ImGuiSelectableFlags_ { ImGuiSelectableFlags_None = 0, - ImGuiSelectableFlags_DontClosePopups = 1 << 0, // Clicking this don't close parent popup window - ImGuiSelectableFlags_SpanAllColumns = 1 << 1, // Selectable frame can span all columns (text will still fit in current column) + ImGuiSelectableFlags_NoAutoClosePopups = 1 << 0, // Clicking this doesn't close parent popup window (overrides ImGuiItemFlags_AutoClosePopups) + ImGuiSelectableFlags_SpanAllColumns = 1 << 1, // Frame will span all columns of its container table (text will still fit in current column) ImGuiSelectableFlags_AllowDoubleClick = 1 << 2, // Generate press events on double clicks too ImGuiSelectableFlags_Disabled = 1 << 3, // Cannot be selected, display grayed out text - ImGuiSelectableFlags_AllowItemOverlap = 1 << 4 // (WIP) Hit testing to allow subsequent widgets to overlap this one + ImGuiSelectableFlags_AllowOverlap = 1 << 4, // (WIP) Hit testing to allow subsequent widgets to overlap this one + ImGuiSelectableFlags_Highlight = 1 << 5, // Make the item be displayed as if it is hovered + +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + ImGuiSelectableFlags_DontClosePopups = ImGuiSelectableFlags_NoAutoClosePopups, // Renamed in 1.91.0 + ImGuiSelectableFlags_AllowItemOverlap = ImGuiSelectableFlags_AllowOverlap, // Renamed in 1.89.7 +#endif }; // Flags for ImGui::BeginCombo() @@ -829,7 +1315,8 @@ enum ImGuiComboFlags_ ImGuiComboFlags_HeightLargest = 1 << 4, // As many fitting items as possible ImGuiComboFlags_NoArrowButton = 1 << 5, // Display on the preview box without the square arrow button ImGuiComboFlags_NoPreview = 1 << 6, // Display only a square arrow button - ImGuiComboFlags_HeightMask_ = ImGuiComboFlags_HeightSmall | ImGuiComboFlags_HeightRegular | ImGuiComboFlags_HeightLarge | ImGuiComboFlags_HeightLargest + ImGuiComboFlags_WidthFitPreview = 1 << 7, // Width dynamically calculated from preview contents + ImGuiComboFlags_HeightMask_ = ImGuiComboFlags_HeightSmall | ImGuiComboFlags_HeightRegular | ImGuiComboFlags_HeightLarge | ImGuiComboFlags_HeightLargest, }; // Flags for ImGui::BeginTabBar() @@ -839,37 +1326,45 @@ enum ImGuiTabBarFlags_ ImGuiTabBarFlags_Reorderable = 1 << 0, // Allow manually dragging tabs to re-order them + New tabs are appended at the end of list ImGuiTabBarFlags_AutoSelectNewTabs = 1 << 1, // Automatically select new tabs when they appear ImGuiTabBarFlags_TabListPopupButton = 1 << 2, // Disable buttons to open the tab list popup - ImGuiTabBarFlags_NoCloseWithMiddleMouseButton = 1 << 3, // Disable behavior of closing tabs (that are submitted with p_open != NULL) with middle mouse button. You can still repro this behavior on user's side with if (IsItemHovered() && IsMouseClicked(2)) *p_open = false. + ImGuiTabBarFlags_NoCloseWithMiddleMouseButton = 1 << 3, // Disable behavior of closing tabs (that are submitted with p_open != NULL) with middle mouse button. You may handle this behavior manually on user's side with if (IsItemHovered() && IsMouseClicked(2)) *p_open = false. ImGuiTabBarFlags_NoTabListScrollingButtons = 1 << 4, // Disable scrolling buttons (apply when fitting policy is ImGuiTabBarFlags_FittingPolicyScroll) ImGuiTabBarFlags_NoTooltip = 1 << 5, // Disable tooltips when hovering a tab - ImGuiTabBarFlags_FittingPolicyResizeDown = 1 << 6, // Resize tabs when they don't fit - ImGuiTabBarFlags_FittingPolicyScroll = 1 << 7, // Add scroll buttons when tabs don't fit + ImGuiTabBarFlags_DrawSelectedOverline = 1 << 6, // Draw selected overline markers over selected tab + ImGuiTabBarFlags_FittingPolicyResizeDown = 1 << 7, // Resize tabs when they don't fit + ImGuiTabBarFlags_FittingPolicyScroll = 1 << 8, // Add scroll buttons when tabs don't fit ImGuiTabBarFlags_FittingPolicyMask_ = ImGuiTabBarFlags_FittingPolicyResizeDown | ImGuiTabBarFlags_FittingPolicyScroll, - ImGuiTabBarFlags_FittingPolicyDefault_ = ImGuiTabBarFlags_FittingPolicyResizeDown + ImGuiTabBarFlags_FittingPolicyDefault_ = ImGuiTabBarFlags_FittingPolicyResizeDown, }; // Flags for ImGui::BeginTabItem() enum ImGuiTabItemFlags_ { ImGuiTabItemFlags_None = 0, - ImGuiTabItemFlags_UnsavedDocument = 1 << 0, // Append '*' to title without affecting the ID, as a convenience to avoid using the ### operator. Also: tab is selected on closure and closure is deferred by one frame to allow code to undo it without flicker. + ImGuiTabItemFlags_UnsavedDocument = 1 << 0, // Display a dot next to the title + set ImGuiTabItemFlags_NoAssumedClosure. ImGuiTabItemFlags_SetSelected = 1 << 1, // Trigger flag to programmatically make the tab selected when calling BeginTabItem() - ImGuiTabItemFlags_NoCloseWithMiddleMouseButton = 1 << 2, // Disable behavior of closing tabs (that are submitted with p_open != NULL) with middle mouse button. You can still repro this behavior on user's side with if (IsItemHovered() && IsMouseClicked(2)) *p_open = false. - ImGuiTabItemFlags_NoPushId = 1 << 3 // Don't call PushID(tab->ID)/PopID() on BeginTabItem()/EndTabItem() + ImGuiTabItemFlags_NoCloseWithMiddleMouseButton = 1 << 2, // Disable behavior of closing tabs (that are submitted with p_open != NULL) with middle mouse button. You may handle this behavior manually on user's side with if (IsItemHovered() && IsMouseClicked(2)) *p_open = false. + ImGuiTabItemFlags_NoPushId = 1 << 3, // Don't call PushID()/PopID() on BeginTabItem()/EndTabItem() + ImGuiTabItemFlags_NoTooltip = 1 << 4, // Disable tooltip for the given tab + ImGuiTabItemFlags_NoReorder = 1 << 5, // Disable reordering this tab or having another tab cross over this tab + ImGuiTabItemFlags_Leading = 1 << 6, // Enforce the tab position to the left of the tab bar (after the tab list popup button) + ImGuiTabItemFlags_Trailing = 1 << 7, // Enforce the tab position to the right of the tab bar (before the scrolling buttons) + ImGuiTabItemFlags_NoAssumedClosure = 1 << 8, // Tab is selected when trying to close + closure is not immediately assumed (will wait for user to stop submitting the tab). Otherwise closure is assumed when pressing the X, so if you keep submitting the tab may reappear at end of tab bar. }; // Flags for ImGui::IsWindowFocused() enum ImGuiFocusedFlags_ { ImGuiFocusedFlags_None = 0, - ImGuiFocusedFlags_ChildWindows = 1 << 0, // IsWindowFocused(): Return true if any children of the window is focused - ImGuiFocusedFlags_RootWindow = 1 << 1, // IsWindowFocused(): Test from root window (top most parent of the current hierarchy) - ImGuiFocusedFlags_AnyWindow = 1 << 2, // IsWindowFocused(): Return true if any window is focused. Important: If you are trying to tell how to dispatch your low-level inputs, do NOT use this. Use ImGui::GetIO().WantCaptureMouse instead. - ImGuiFocusedFlags_RootAndChildWindows = ImGuiFocusedFlags_RootWindow | ImGuiFocusedFlags_ChildWindows + ImGuiFocusedFlags_ChildWindows = 1 << 0, // Return true if any children of the window is focused + ImGuiFocusedFlags_RootWindow = 1 << 1, // Test from root window (top most parent of the current hierarchy) + ImGuiFocusedFlags_AnyWindow = 1 << 2, // Return true if any window is focused. Important: If you are trying to tell how to dispatch your low-level inputs, do NOT use this. Use 'io.WantCaptureMouse' instead! Please read the FAQ! + ImGuiFocusedFlags_NoPopupHierarchy = 1 << 3, // Do not consider popup hierarchy (do not treat popup emitter as parent of popup) (when used with _ChildWindows or _RootWindow) + ImGuiFocusedFlags_DockHierarchy = 1 << 4, // Consider docking hierarchy (treat dockspace host as parent of docked window) (when used with _ChildWindows or _RootWindow) + ImGuiFocusedFlags_RootAndChildWindows = ImGuiFocusedFlags_RootWindow | ImGuiFocusedFlags_ChildWindows, }; // Flags for ImGui::IsItemHovered(), ImGui::IsWindowHovered() -// Note: if you are trying to check whether your mouse should be dispatched to imgui or to your app, you should use the 'io.WantCaptureMouse' boolean for that. Please read the FAQ! +// Note: if you are trying to check whether your mouse should be dispatched to Dear ImGui or to your app, you should use 'io.WantCaptureMouse' instead! Please read the FAQ! // Note: windows with the ImGuiWindowFlags_NoInputs flag are ignored by IsWindowHovered() calls. enum ImGuiHoveredFlags_ { @@ -877,13 +1372,56 @@ enum ImGuiHoveredFlags_ ImGuiHoveredFlags_ChildWindows = 1 << 0, // IsWindowHovered() only: Return true if any children of the window is hovered ImGuiHoveredFlags_RootWindow = 1 << 1, // IsWindowHovered() only: Test from root window (top most parent of the current hierarchy) ImGuiHoveredFlags_AnyWindow = 1 << 2, // IsWindowHovered() only: Return true if any window is hovered - ImGuiHoveredFlags_AllowWhenBlockedByPopup = 1 << 3, // Return true even if a popup window is normally blocking access to this item/window - //ImGuiHoveredFlags_AllowWhenBlockedByModal = 1 << 4, // Return true even if a modal popup window is normally blocking access to this item/window. FIXME-TODO: Unavailable yet. - ImGuiHoveredFlags_AllowWhenBlockedByActiveItem = 1 << 5, // Return true even if an active item is blocking access to this item/window. Useful for Drag and Drop patterns. - ImGuiHoveredFlags_AllowWhenOverlapped = 1 << 6, // Return true even if the position is obstructed or overlapped by another window - ImGuiHoveredFlags_AllowWhenDisabled = 1 << 7, // Return true even if the item is disabled + ImGuiHoveredFlags_NoPopupHierarchy = 1 << 3, // IsWindowHovered() only: Do not consider popup hierarchy (do not treat popup emitter as parent of popup) (when used with _ChildWindows or _RootWindow) + ImGuiHoveredFlags_DockHierarchy = 1 << 4, // IsWindowHovered() only: Consider docking hierarchy (treat dockspace host as parent of docked window) (when used with _ChildWindows or _RootWindow) + ImGuiHoveredFlags_AllowWhenBlockedByPopup = 1 << 5, // Return true even if a popup window is normally blocking access to this item/window + //ImGuiHoveredFlags_AllowWhenBlockedByModal = 1 << 6, // Return true even if a modal popup window is normally blocking access to this item/window. FIXME-TODO: Unavailable yet. + ImGuiHoveredFlags_AllowWhenBlockedByActiveItem = 1 << 7, // Return true even if an active item is blocking access to this item/window. Useful for Drag and Drop patterns. + ImGuiHoveredFlags_AllowWhenOverlappedByItem = 1 << 8, // IsItemHovered() only: Return true even if the item uses AllowOverlap mode and is overlapped by another hoverable item. + ImGuiHoveredFlags_AllowWhenOverlappedByWindow = 1 << 9, // IsItemHovered() only: Return true even if the position is obstructed or overlapped by another window. + ImGuiHoveredFlags_AllowWhenDisabled = 1 << 10, // IsItemHovered() only: Return true even if the item is disabled + ImGuiHoveredFlags_NoNavOverride = 1 << 11, // IsItemHovered() only: Disable using keyboard/gamepad navigation state when active, always query mouse + ImGuiHoveredFlags_AllowWhenOverlapped = ImGuiHoveredFlags_AllowWhenOverlappedByItem | ImGuiHoveredFlags_AllowWhenOverlappedByWindow, ImGuiHoveredFlags_RectOnly = ImGuiHoveredFlags_AllowWhenBlockedByPopup | ImGuiHoveredFlags_AllowWhenBlockedByActiveItem | ImGuiHoveredFlags_AllowWhenOverlapped, - ImGuiHoveredFlags_RootAndChildWindows = ImGuiHoveredFlags_RootWindow | ImGuiHoveredFlags_ChildWindows + ImGuiHoveredFlags_RootAndChildWindows = ImGuiHoveredFlags_RootWindow | ImGuiHoveredFlags_ChildWindows, + + // Tooltips mode + // - typically used in IsItemHovered() + SetTooltip() sequence. + // - this is a shortcut to pull flags from 'style.HoverFlagsForTooltipMouse' or 'style.HoverFlagsForTooltipNav' where you can reconfigure desired behavior. + // e.g. 'TooltipHoveredFlagsForMouse' defaults to 'ImGuiHoveredFlags_Stationary | ImGuiHoveredFlags_DelayShort'. + // - for frequently actioned or hovered items providing a tooltip, you want may to use ImGuiHoveredFlags_ForTooltip (stationary + delay) so the tooltip doesn't show too often. + // - for items which main purpose is to be hovered, or items with low affordance, or in less consistent apps, prefer no delay or shorter delay. + ImGuiHoveredFlags_ForTooltip = 1 << 12, // Shortcut for standard flags when using IsItemHovered() + SetTooltip() sequence. + + // (Advanced) Mouse Hovering delays. + // - generally you can use ImGuiHoveredFlags_ForTooltip to use application-standardized flags. + // - use those if you need specific overrides. + ImGuiHoveredFlags_Stationary = 1 << 13, // Require mouse to be stationary for style.HoverStationaryDelay (~0.15 sec) _at least one time_. After this, can move on same item/window. Using the stationary test tends to reduces the need for a long delay. + ImGuiHoveredFlags_DelayNone = 1 << 14, // IsItemHovered() only: Return true immediately (default). As this is the default you generally ignore this. + ImGuiHoveredFlags_DelayShort = 1 << 15, // IsItemHovered() only: Return true after style.HoverDelayShort elapsed (~0.15 sec) (shared between items) + requires mouse to be stationary for style.HoverStationaryDelay (once per item). + ImGuiHoveredFlags_DelayNormal = 1 << 16, // IsItemHovered() only: Return true after style.HoverDelayNormal elapsed (~0.40 sec) (shared between items) + requires mouse to be stationary for style.HoverStationaryDelay (once per item). + ImGuiHoveredFlags_NoSharedDelay = 1 << 17, // IsItemHovered() only: Disable shared delay system where moving from one item to the next keeps the previous timer for a short time (standard for tooltips with long delays) +}; + +// Flags for ImGui::DockSpace(), shared/inherited by child nodes. +// (Some flags can be applied to individual nodes directly) +// FIXME-DOCK: Also see ImGuiDockNodeFlagsPrivate_ which may involve using the WIP and internal DockBuilder api. +enum ImGuiDockNodeFlags_ +{ + ImGuiDockNodeFlags_None = 0, + ImGuiDockNodeFlags_KeepAliveOnly = 1 << 0, // // Don't display the dockspace node but keep it alive. Windows docked into this dockspace node won't be undocked. + //ImGuiDockNodeFlags_NoCentralNode = 1 << 1, // // Disable Central Node (the node which can stay empty) + ImGuiDockNodeFlags_NoDockingOverCentralNode = 1 << 2, // // Disable docking over the Central Node, which will be always kept empty. + ImGuiDockNodeFlags_PassthruCentralNode = 1 << 3, // // Enable passthru dockspace: 1) DockSpace() will render a ImGuiCol_WindowBg background covering everything excepted the Central Node when empty. Meaning the host window should probably use SetNextWindowBgAlpha(0.0f) prior to Begin() when using this. 2) When Central Node is empty: let inputs pass-through + won't display a DockingEmptyBg background. See demo for details. + ImGuiDockNodeFlags_NoDockingSplit = 1 << 4, // // Disable other windows/nodes from splitting this node. + ImGuiDockNodeFlags_NoResize = 1 << 5, // Saved // Disable resizing node using the splitter/separators. Useful with programmatically setup dockspaces. + ImGuiDockNodeFlags_AutoHideTabBar = 1 << 6, // // Tab bar will automatically hide when there is a single window in the dock node. + ImGuiDockNodeFlags_NoUndocking = 1 << 7, // // Disable undocking this node. + +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + ImGuiDockNodeFlags_NoSplit = ImGuiDockNodeFlags_NoDockingSplit, // Renamed in 1.90 + ImGuiDockNodeFlags_NoDockingInCentralNode = ImGuiDockNodeFlags_NoDockingOverCentralNode, // Renamed in 1.90 +#endif }; // Flags for ImGui::BeginDragDropSource(), ImGui::AcceptDragDropPayload() @@ -891,17 +1429,23 @@ enum ImGuiDragDropFlags_ { ImGuiDragDropFlags_None = 0, // BeginDragDropSource() flags - ImGuiDragDropFlags_SourceNoPreviewTooltip = 1 << 0, // By default, a successful call to BeginDragDropSource opens a tooltip so you can display a preview or description of the source contents. This flag disable this behavior. - ImGuiDragDropFlags_SourceNoDisableHover = 1 << 1, // By default, when dragging we clear data so that IsItemHovered() will return false, to avoid subsequent user code submitting tooltips. This flag disable this behavior so you can still call IsItemHovered() on the source item. + ImGuiDragDropFlags_SourceNoPreviewTooltip = 1 << 0, // Disable preview tooltip. By default, a successful call to BeginDragDropSource opens a tooltip so you can display a preview or description of the source contents. This flag disables this behavior. + ImGuiDragDropFlags_SourceNoDisableHover = 1 << 1, // By default, when dragging we clear data so that IsItemHovered() will return false, to avoid subsequent user code submitting tooltips. This flag disables this behavior so you can still call IsItemHovered() on the source item. ImGuiDragDropFlags_SourceNoHoldToOpenOthers = 1 << 2, // Disable the behavior that allows to open tree nodes and collapsing header by holding over them while dragging a source item. ImGuiDragDropFlags_SourceAllowNullID = 1 << 3, // Allow items such as Text(), Image() that have no unique identifier to be used as drag source, by manufacturing a temporary identifier based on their window-relative position. This is extremely unusual within the dear imgui ecosystem and so we made it explicit. ImGuiDragDropFlags_SourceExtern = 1 << 4, // External source (from outside of dear imgui), won't attempt to read current item/window info. Will always return true. Only one Extern source can be active simultaneously. - ImGuiDragDropFlags_SourceAutoExpirePayload = 1 << 5, // Automatically expire the payload if the source cease to be submitted (otherwise payloads are persisting while being dragged) + ImGuiDragDropFlags_PayloadAutoExpire = 1 << 5, // Automatically expire the payload if the source cease to be submitted (otherwise payloads are persisting while being dragged) + ImGuiDragDropFlags_PayloadNoCrossContext = 1 << 6, // Hint to specify that the payload may not be copied outside current dear imgui context. + ImGuiDragDropFlags_PayloadNoCrossProcess = 1 << 7, // Hint to specify that the payload may not be copied outside current process. // AcceptDragDropPayload() flags ImGuiDragDropFlags_AcceptBeforeDelivery = 1 << 10, // AcceptDragDropPayload() will returns true even before the mouse button is released. You can then call IsDelivery() to test if the payload needs to be delivered. ImGuiDragDropFlags_AcceptNoDrawDefaultRect = 1 << 11, // Do not draw the default highlight rectangle when hovering over target. ImGuiDragDropFlags_AcceptNoPreviewTooltip = 1 << 12, // Request hiding the BeginDragDropSource tooltip from the BeginDragDropTarget site. - ImGuiDragDropFlags_AcceptPeekOnly = ImGuiDragDropFlags_AcceptBeforeDelivery | ImGuiDragDropFlags_AcceptNoDrawDefaultRect // For peeking ahead and inspecting the payload before delivery. + ImGuiDragDropFlags_AcceptPeekOnly = ImGuiDragDropFlags_AcceptBeforeDelivery | ImGuiDragDropFlags_AcceptNoDrawDefaultRect, // For peeking ahead and inspecting the payload before delivery. + +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + ImGuiDragDropFlags_SourceAutoExpirePayload = ImGuiDragDropFlags_PayloadAutoExpire, // Renamed in 1.90.9 +#endif }; // Standard Drag and Drop payload types. You can define you own payload types using short strings. Types starting with '_' are defined by Dear ImGui. @@ -921,11 +1465,13 @@ enum ImGuiDataType_ ImGuiDataType_U64, // unsigned long long / unsigned __int64 ImGuiDataType_Float, // float ImGuiDataType_Double, // double + ImGuiDataType_Bool, // bool (provided for user convenience, not supported by scalar widgets) + ImGuiDataType_String, // char* (provided for user convenience, not supported by scalar widgets) ImGuiDataType_COUNT }; // A cardinal direction -enum ImGuiDir_ +enum ImGuiDir : int { ImGuiDir_None = -1, ImGuiDir_Left = 0, @@ -935,10 +1481,27 @@ enum ImGuiDir_ ImGuiDir_COUNT }; -// User fill ImGuiIO.KeyMap[] array with indices into the ImGuiIO.KeysDown[512] array -enum ImGuiKey_ +// A sorting direction +enum ImGuiSortDirection : ImU8 { - ImGuiKey_Tab, + ImGuiSortDirection_None = 0, + ImGuiSortDirection_Ascending = 1, // Ascending = 0->9, A->Z etc. + ImGuiSortDirection_Descending = 2 // Descending = 9->0, Z->A etc. +}; + +// A key identifier (ImGuiKey_XXX or ImGuiMod_XXX value): can represent Keyboard, Mouse and Gamepad values. +// All our named keys are >= 512. Keys value 0 to 511 are left unused and were legacy native/opaque key values (< 1.87). +// Support for legacy keys was completely removed in 1.91.5. +// Read details about the 1.87+ transition : https://github.com/ocornut/imgui/issues/4921 +// Note that "Keys" related to physical keys and are not the same concept as input "Characters", the later are submitted via io.AddInputCharacter(). +// The keyboard key enum values are named after the keys on a standard US keyboard, and on other keyboard types the keys reported may not match the keycaps. +enum ImGuiKey : int +{ + // Keyboard + ImGuiKey_None = 0, + ImGuiKey_NamedKey_BEGIN = 512, // First valid key value (other than 0) + + ImGuiKey_Tab = 512, // == ImGuiKey_NamedKey_BEGIN ImGuiKey_LeftArrow, ImGuiKey_RightArrow, ImGuiKey_UpArrow, @@ -953,76 +1516,177 @@ enum ImGuiKey_ ImGuiKey_Space, ImGuiKey_Enter, ImGuiKey_Escape, - ImGuiKey_KeyPadEnter, - ImGuiKey_A, // for text edit CTRL+A: select all - ImGuiKey_C, // for text edit CTRL+C: copy - ImGuiKey_V, // for text edit CTRL+V: paste - ImGuiKey_X, // for text edit CTRL+X: cut - ImGuiKey_Y, // for text edit CTRL+Y: redo - ImGuiKey_Z, // for text edit CTRL+Z: undo - ImGuiKey_COUNT + ImGuiKey_LeftCtrl, ImGuiKey_LeftShift, ImGuiKey_LeftAlt, ImGuiKey_LeftSuper, + ImGuiKey_RightCtrl, ImGuiKey_RightShift, ImGuiKey_RightAlt, ImGuiKey_RightSuper, + ImGuiKey_Menu, + ImGuiKey_0, ImGuiKey_1, ImGuiKey_2, ImGuiKey_3, ImGuiKey_4, ImGuiKey_5, ImGuiKey_6, ImGuiKey_7, ImGuiKey_8, ImGuiKey_9, + ImGuiKey_A, ImGuiKey_B, ImGuiKey_C, ImGuiKey_D, ImGuiKey_E, ImGuiKey_F, ImGuiKey_G, ImGuiKey_H, ImGuiKey_I, ImGuiKey_J, + ImGuiKey_K, ImGuiKey_L, ImGuiKey_M, ImGuiKey_N, ImGuiKey_O, ImGuiKey_P, ImGuiKey_Q, ImGuiKey_R, ImGuiKey_S, ImGuiKey_T, + ImGuiKey_U, ImGuiKey_V, ImGuiKey_W, ImGuiKey_X, ImGuiKey_Y, ImGuiKey_Z, + ImGuiKey_F1, ImGuiKey_F2, ImGuiKey_F3, ImGuiKey_F4, ImGuiKey_F5, ImGuiKey_F6, + ImGuiKey_F7, ImGuiKey_F8, ImGuiKey_F9, ImGuiKey_F10, ImGuiKey_F11, ImGuiKey_F12, + ImGuiKey_F13, ImGuiKey_F14, ImGuiKey_F15, ImGuiKey_F16, ImGuiKey_F17, ImGuiKey_F18, + ImGuiKey_F19, ImGuiKey_F20, ImGuiKey_F21, ImGuiKey_F22, ImGuiKey_F23, ImGuiKey_F24, + ImGuiKey_Apostrophe, // ' + ImGuiKey_Comma, // , + ImGuiKey_Minus, // - + ImGuiKey_Period, // . + ImGuiKey_Slash, // / + ImGuiKey_Semicolon, // ; + ImGuiKey_Equal, // = + ImGuiKey_LeftBracket, // [ + ImGuiKey_Backslash, // \ (this text inhibit multiline comment caused by backslash) + ImGuiKey_RightBracket, // ] + ImGuiKey_GraveAccent, // ` + ImGuiKey_CapsLock, + ImGuiKey_ScrollLock, + ImGuiKey_NumLock, + ImGuiKey_PrintScreen, + ImGuiKey_Pause, + ImGuiKey_Keypad0, ImGuiKey_Keypad1, ImGuiKey_Keypad2, ImGuiKey_Keypad3, ImGuiKey_Keypad4, + ImGuiKey_Keypad5, ImGuiKey_Keypad6, ImGuiKey_Keypad7, ImGuiKey_Keypad8, ImGuiKey_Keypad9, + ImGuiKey_KeypadDecimal, + ImGuiKey_KeypadDivide, + ImGuiKey_KeypadMultiply, + ImGuiKey_KeypadSubtract, + ImGuiKey_KeypadAdd, + ImGuiKey_KeypadEnter, + ImGuiKey_KeypadEqual, + ImGuiKey_AppBack, // Available on some keyboard/mouses. Often referred as "Browser Back" + ImGuiKey_AppForward, + ImGuiKey_Oem102, // Non-US backslash. + + // Gamepad (some of those are analog values, 0.0f to 1.0f) // NAVIGATION ACTION + // (download controller mapping PNG/PSD at http://dearimgui.com/controls_sheets) + ImGuiKey_GamepadStart, // Menu (Xbox) + (Switch) Start/Options (PS) + ImGuiKey_GamepadBack, // View (Xbox) - (Switch) Share (PS) + ImGuiKey_GamepadFaceLeft, // X (Xbox) Y (Switch) Square (PS) // Tap: Toggle Menu. Hold: Windowing mode (Focus/Move/Resize windows) + ImGuiKey_GamepadFaceRight, // B (Xbox) A (Switch) Circle (PS) // Cancel / Close / Exit + ImGuiKey_GamepadFaceUp, // Y (Xbox) X (Switch) Triangle (PS) // Text Input / On-screen Keyboard + ImGuiKey_GamepadFaceDown, // A (Xbox) B (Switch) Cross (PS) // Activate / Open / Toggle / Tweak + ImGuiKey_GamepadDpadLeft, // D-pad Left // Move / Tweak / Resize Window (in Windowing mode) + ImGuiKey_GamepadDpadRight, // D-pad Right // Move / Tweak / Resize Window (in Windowing mode) + ImGuiKey_GamepadDpadUp, // D-pad Up // Move / Tweak / Resize Window (in Windowing mode) + ImGuiKey_GamepadDpadDown, // D-pad Down // Move / Tweak / Resize Window (in Windowing mode) + ImGuiKey_GamepadL1, // L Bumper (Xbox) L (Switch) L1 (PS) // Tweak Slower / Focus Previous (in Windowing mode) + ImGuiKey_GamepadR1, // R Bumper (Xbox) R (Switch) R1 (PS) // Tweak Faster / Focus Next (in Windowing mode) + ImGuiKey_GamepadL2, // L Trig. (Xbox) ZL (Switch) L2 (PS) [Analog] + ImGuiKey_GamepadR2, // R Trig. (Xbox) ZR (Switch) R2 (PS) [Analog] + ImGuiKey_GamepadL3, // L Stick (Xbox) L3 (Switch) L3 (PS) + ImGuiKey_GamepadR3, // R Stick (Xbox) R3 (Switch) R3 (PS) + ImGuiKey_GamepadLStickLeft, // [Analog] // Move Window (in Windowing mode) + ImGuiKey_GamepadLStickRight, // [Analog] // Move Window (in Windowing mode) + ImGuiKey_GamepadLStickUp, // [Analog] // Move Window (in Windowing mode) + ImGuiKey_GamepadLStickDown, // [Analog] // Move Window (in Windowing mode) + ImGuiKey_GamepadRStickLeft, // [Analog] + ImGuiKey_GamepadRStickRight, // [Analog] + ImGuiKey_GamepadRStickUp, // [Analog] + ImGuiKey_GamepadRStickDown, // [Analog] + + // Aliases: Mouse Buttons (auto-submitted from AddMouseButtonEvent() calls) + // - This is mirroring the data also written to io.MouseDown[], io.MouseWheel, in a format allowing them to be accessed via standard key API. + ImGuiKey_MouseLeft, ImGuiKey_MouseRight, ImGuiKey_MouseMiddle, ImGuiKey_MouseX1, ImGuiKey_MouseX2, ImGuiKey_MouseWheelX, ImGuiKey_MouseWheelY, + + // [Internal] Reserved for mod storage + ImGuiKey_ReservedForModCtrl, ImGuiKey_ReservedForModShift, ImGuiKey_ReservedForModAlt, ImGuiKey_ReservedForModSuper, + ImGuiKey_NamedKey_END, + + // Keyboard Modifiers (explicitly submitted by backend via AddKeyEvent() calls) + // - This is mirroring the data also written to io.KeyCtrl, io.KeyShift, io.KeyAlt, io.KeySuper, in a format allowing + // them to be accessed via standard key API, allowing calls such as IsKeyPressed(), IsKeyReleased(), querying duration etc. + // - Code polling every key (e.g. an interface to detect a key press for input mapping) might want to ignore those + // and prefer using the real keys (e.g. ImGuiKey_LeftCtrl, ImGuiKey_RightCtrl instead of ImGuiMod_Ctrl). + // - In theory the value of keyboard modifiers should be roughly equivalent to a logical or of the equivalent left/right keys. + // In practice: it's complicated; mods are often provided from different sources. Keyboard layout, IME, sticky keys and + // backends tend to interfere and break that equivalence. The safer decision is to relay that ambiguity down to the end-user... + // - On macOS, we swap Cmd(Super) and Ctrl keys at the time of the io.AddKeyEvent() call. + ImGuiMod_None = 0, + ImGuiMod_Ctrl = 1 << 12, // Ctrl (non-macOS), Cmd (macOS) + ImGuiMod_Shift = 1 << 13, // Shift + ImGuiMod_Alt = 1 << 14, // Option/Menu + ImGuiMod_Super = 1 << 15, // Windows/Super (non-macOS), Ctrl (macOS) + ImGuiMod_Mask_ = 0xF000, // 4-bits + + // [Internal] If you need to iterate all keys (for e.g. an input mapper) you may use ImGuiKey_NamedKey_BEGIN..ImGuiKey_NamedKey_END. + ImGuiKey_NamedKey_COUNT = ImGuiKey_NamedKey_END - ImGuiKey_NamedKey_BEGIN, + //ImGuiKey_KeysData_SIZE = ImGuiKey_NamedKey_COUNT, // Size of KeysData[]: only hold named keys + //ImGuiKey_KeysData_OFFSET = ImGuiKey_NamedKey_BEGIN, // Accesses to io.KeysData[] must use (key - ImGuiKey_NamedKey_BEGIN) index. + +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + ImGuiKey_COUNT = ImGuiKey_NamedKey_END, // Obsoleted in 1.91.5 because it was extremely misleading (since named keys don't start at 0 anymore) + ImGuiMod_Shortcut = ImGuiMod_Ctrl, // Removed in 1.90.7, you can now simply use ImGuiMod_Ctrl + ImGuiKey_ModCtrl = ImGuiMod_Ctrl, ImGuiKey_ModShift = ImGuiMod_Shift, ImGuiKey_ModAlt = ImGuiMod_Alt, ImGuiKey_ModSuper = ImGuiMod_Super, // Renamed in 1.89 + //ImGuiKey_KeyPadEnter = ImGuiKey_KeypadEnter, // Renamed in 1.87 +#endif }; -// Gamepad/Keyboard directional navigation -// Keyboard: Set io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard to enable. NewFrame() will automatically fill io.NavInputs[] based on your io.KeysDown[] + io.KeyMap[] arrays. -// Gamepad: Set io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad to enable. Back-end: set ImGuiBackendFlags_HasGamepad and fill the io.NavInputs[] fields before calling NewFrame(). Note that io.NavInputs[] is cleared by EndFrame(). -// Read instructions in imgui.cpp for more details. Download PNG/PSD at http://goo.gl/9LgVZW. -enum ImGuiNavInput_ +// Flags for Shortcut(), SetNextItemShortcut(), +// (and for upcoming extended versions of IsKeyPressed(), IsMouseClicked(), Shortcut(), SetKeyOwner(), SetItemKeyOwner() that are still in imgui_internal.h) +// Don't mistake with ImGuiInputTextFlags! (which is for ImGui::InputText() function) +enum ImGuiInputFlags_ { - // Gamepad Mapping - ImGuiNavInput_Activate, // activate / open / toggle / tweak value // e.g. Cross (PS4), A (Xbox), A (Switch), Space (Keyboard) - ImGuiNavInput_Cancel, // cancel / close / exit // e.g. Circle (PS4), B (Xbox), B (Switch), Escape (Keyboard) - ImGuiNavInput_Input, // text input / on-screen keyboard // e.g. Triang.(PS4), Y (Xbox), X (Switch), Return (Keyboard) - ImGuiNavInput_Menu, // tap: toggle menu / hold: focus, move, resize // e.g. Square (PS4), X (Xbox), Y (Switch), Alt (Keyboard) - ImGuiNavInput_DpadLeft, // move / tweak / resize window (w/ PadMenu) // e.g. D-pad Left/Right/Up/Down (Gamepads), Arrow keys (Keyboard) - ImGuiNavInput_DpadRight, // - ImGuiNavInput_DpadUp, // - ImGuiNavInput_DpadDown, // - ImGuiNavInput_LStickLeft, // scroll / move window (w/ PadMenu) // e.g. Left Analog Stick Left/Right/Up/Down - ImGuiNavInput_LStickRight, // - ImGuiNavInput_LStickUp, // - ImGuiNavInput_LStickDown, // - ImGuiNavInput_FocusPrev, // next window (w/ PadMenu) // e.g. L1 or L2 (PS4), LB or LT (Xbox), L or ZL (Switch) - ImGuiNavInput_FocusNext, // prev window (w/ PadMenu) // e.g. R1 or R2 (PS4), RB or RT (Xbox), R or ZL (Switch) - ImGuiNavInput_TweakSlow, // slower tweaks // e.g. L1 or L2 (PS4), LB or LT (Xbox), L or ZL (Switch) - ImGuiNavInput_TweakFast, // faster tweaks // e.g. R1 or R2 (PS4), RB or RT (Xbox), R or ZL (Switch) + ImGuiInputFlags_None = 0, + ImGuiInputFlags_Repeat = 1 << 0, // Enable repeat. Return true on successive repeats. Default for legacy IsKeyPressed(). NOT Default for legacy IsMouseClicked(). MUST BE == 1. - // [Internal] Don't use directly! This is used internally to differentiate keyboard from gamepad inputs for behaviors that require to differentiate them. - // Keyboard behavior that have no corresponding gamepad mapping (e.g. CTRL+TAB) will be directly reading from io.KeysDown[] instead of io.NavInputs[]. - ImGuiNavInput_KeyMenu_, // toggle menu // = io.KeyAlt - ImGuiNavInput_KeyTab_, // tab // = Tab key - ImGuiNavInput_KeyLeft_, // move left // = Arrow keys - ImGuiNavInput_KeyRight_, // move right - ImGuiNavInput_KeyUp_, // move up - ImGuiNavInput_KeyDown_, // move down - ImGuiNavInput_COUNT, - ImGuiNavInput_InternalStart_ = ImGuiNavInput_KeyMenu_ + // Flags for Shortcut(), SetNextItemShortcut() + // - Routing policies: RouteGlobal+OverActive >> RouteActive or RouteFocused (if owner is active item) >> RouteGlobal+OverFocused >> RouteFocused (if in focused window stack) >> RouteGlobal. + // - Default policy is RouteFocused. Can select only 1 policy among all available. + ImGuiInputFlags_RouteActive = 1 << 10, // Route to active item only. + ImGuiInputFlags_RouteFocused = 1 << 11, // Route to windows in the focus stack (DEFAULT). Deep-most focused window takes inputs. Active item takes inputs over deep-most focused window. + ImGuiInputFlags_RouteGlobal = 1 << 12, // Global route (unless a focused window or active item registered the route). + ImGuiInputFlags_RouteAlways = 1 << 13, // Do not register route, poll keys directly. + // - Routing options + ImGuiInputFlags_RouteOverFocused = 1 << 14, // Option: global route: higher priority than focused route (unless active item in focused route). + ImGuiInputFlags_RouteOverActive = 1 << 15, // Option: global route: higher priority than active item. Unlikely you need to use that: will interfere with every active items, e.g. CTRL+A registered by InputText will be overridden by this. May not be fully honored as user/internal code is likely to always assume they can access keys when active. + ImGuiInputFlags_RouteUnlessBgFocused = 1 << 16, // Option: global route: will not be applied if underlying background/void is focused (== no Dear ImGui windows are focused). Useful for overlay applications. + ImGuiInputFlags_RouteFromRootWindow = 1 << 17, // Option: route evaluated from the point of view of root window rather than current window. + + // Flags for SetNextItemShortcut() + ImGuiInputFlags_Tooltip = 1 << 18, // Automatically display a tooltip when hovering item [BETA] Unsure of right api (opt-in/opt-out) }; // Configuration flags stored in io.ConfigFlags. Set by user/application. enum ImGuiConfigFlags_ { ImGuiConfigFlags_None = 0, - ImGuiConfigFlags_NavEnableKeyboard = 1 << 0, // Master keyboard navigation enable flag. NewFrame() will automatically fill io.NavInputs[] based on io.KeysDown[]. - ImGuiConfigFlags_NavEnableGamepad = 1 << 1, // Master gamepad navigation enable flag. This is mostly to instruct your imgui back-end to fill io.NavInputs[]. Back-end also needs to set ImGuiBackendFlags_HasGamepad. - ImGuiConfigFlags_NavEnableSetMousePos = 1 << 2, // Instruct navigation to move the mouse cursor. May be useful on TV/console systems where moving a virtual mouse is awkward. Will update io.MousePos and set io.WantSetMousePos=true. If enabled you MUST honor io.WantSetMousePos requests in your binding, otherwise ImGui will react as if the mouse is jumping around back and forth. - ImGuiConfigFlags_NavNoCaptureKeyboard = 1 << 3, // Instruct navigation to not set the io.WantCaptureKeyboard flag when io.NavActive is set. - ImGuiConfigFlags_NoMouse = 1 << 4, // Instruct imgui to clear mouse position/buttons in NewFrame(). This allows ignoring the mouse information set by the back-end. - ImGuiConfigFlags_NoMouseCursorChange = 1 << 5, // Instruct back-end to not alter mouse cursor shape and visibility. Use if the back-end cursor changes are interfering with yours and you don't want to use SetMouseCursor() to change mouse cursor. You may want to honor requests from imgui by reading GetMouseCursor() yourself instead. + ImGuiConfigFlags_NavEnableKeyboard = 1 << 0, // Master keyboard navigation enable flag. Enable full Tabbing + directional arrows + space/enter to activate. + ImGuiConfigFlags_NavEnableGamepad = 1 << 1, // Master gamepad navigation enable flag. Backend also needs to set ImGuiBackendFlags_HasGamepad. + ImGuiConfigFlags_NoMouse = 1 << 4, // Instruct dear imgui to disable mouse inputs and interactions. + ImGuiConfigFlags_NoMouseCursorChange = 1 << 5, // Instruct backend to not alter mouse cursor shape and visibility. Use if the backend cursor changes are interfering with yours and you don't want to use SetMouseCursor() to change mouse cursor. You may want to honor requests from imgui by reading GetMouseCursor() yourself instead. + ImGuiConfigFlags_NoKeyboard = 1 << 6, // Instruct dear imgui to disable keyboard inputs and interactions. This is done by ignoring keyboard events and clearing existing states. - // User storage (to allow your back-end/engine to communicate to code that may be shared between multiple projects. Those flags are not used by core Dear ImGui) + // [BETA] Docking + ImGuiConfigFlags_DockingEnable = 1 << 7, // Docking enable flags. + + // [BETA] Viewports + // When using viewports it is recommended that your default value for ImGuiCol_WindowBg is opaque (Alpha=1.0) so transition to a viewport won't be noticeable. + ImGuiConfigFlags_ViewportsEnable = 1 << 10, // Viewport enable flags (require both ImGuiBackendFlags_PlatformHasViewports + ImGuiBackendFlags_RendererHasViewports set by the respective backends) + ImGuiConfigFlags_DpiEnableScaleViewports= 1 << 14, // [BETA: Don't use] FIXME-DPI: Reposition and resize imgui windows when the DpiScale of a viewport changed (mostly useful for the main viewport hosting other window). Note that resizing the main window itself is up to your application. + ImGuiConfigFlags_DpiEnableScaleFonts = 1 << 15, // [BETA: Don't use] FIXME-DPI: Request bitmap-scaled fonts to match DpiScale. This is a very low-quality workaround. The correct way to handle DPI is _currently_ to replace the atlas and/or fonts in the Platform_OnChangedViewport callback, but this is all early work in progress. + + // User storage (to allow your backend/engine to communicate to code that may be shared between multiple projects. Those flags are NOT used by core Dear ImGui) ImGuiConfigFlags_IsSRGB = 1 << 20, // Application is SRGB-aware. - ImGuiConfigFlags_IsTouchScreen = 1 << 21 // Application is using a touch screen instead of a mouse. + ImGuiConfigFlags_IsTouchScreen = 1 << 21, // Application is using a touch screen instead of a mouse. + +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + ImGuiConfigFlags_NavEnableSetMousePos = 1 << 2, // [moved/renamed in 1.91.4] -> use bool io.ConfigNavMoveSetMousePos + ImGuiConfigFlags_NavNoCaptureKeyboard = 1 << 3, // [moved/renamed in 1.91.4] -> use bool io.ConfigNavCaptureKeyboard +#endif }; -// Back-end capabilities flags stored in io.BackendFlags. Set by imgui_impl_xxx or custom back-end. +// Backend capabilities flags stored in io.BackendFlags. Set by imgui_impl_xxx or custom backend. enum ImGuiBackendFlags_ { ImGuiBackendFlags_None = 0, - ImGuiBackendFlags_HasGamepad = 1 << 0, // Back-end Platform supports gamepad and currently has one connected. - ImGuiBackendFlags_HasMouseCursors = 1 << 1, // Back-end Platform supports honoring GetMouseCursor() value to change the OS cursor shape. - ImGuiBackendFlags_HasSetMousePos = 1 << 2, // Back-end Platform supports io.WantSetMousePos requests to reposition the OS mouse position (only used if ImGuiConfigFlags_NavEnableSetMousePos is set). - ImGuiBackendFlags_RendererHasVtxOffset = 1 << 3 // Back-end Renderer supports ImDrawCmd::VtxOffset. This enables output of large meshes (64K+ vertices) while still using 16-bits indices. + ImGuiBackendFlags_HasGamepad = 1 << 0, // Backend Platform supports gamepad and currently has one connected. + ImGuiBackendFlags_HasMouseCursors = 1 << 1, // Backend Platform supports honoring GetMouseCursor() value to change the OS cursor shape. + ImGuiBackendFlags_HasSetMousePos = 1 << 2, // Backend Platform supports io.WantSetMousePos requests to reposition the OS mouse position (only used if io.ConfigNavMoveSetMousePos is set). + ImGuiBackendFlags_RendererHasVtxOffset = 1 << 3, // Backend Renderer supports ImDrawCmd::VtxOffset. This enables output of large meshes (64K+ vertices) while still using 16-bit indices. + + // [BETA] Viewports + ImGuiBackendFlags_PlatformHasViewports = 1 << 10, // Backend Platform supports multiple viewports. + ImGuiBackendFlags_HasMouseHoveredViewport=1 << 11, // Backend Platform supports calling io.AddMouseViewportEvent() with the viewport under the mouse. IF POSSIBLE, ignore viewports with the ImGuiViewportFlags_NoInputs flag (Win32 backend, GLFW 3.30+ backend can do this, SDL backend cannot). If this cannot be done, Dear ImGui needs to use a flawed heuristic to find the viewport under. + ImGuiBackendFlags_RendererHasViewports = 1 << 12, // Backend Renderer supports multiple viewports. }; // Enumeration for PushStyleColor() / PopStyleColor() @@ -1038,15 +1702,15 @@ enum ImGuiCol_ ImGuiCol_FrameBg, // Background of checkbox, radio button, plot, slider, text input ImGuiCol_FrameBgHovered, ImGuiCol_FrameBgActive, - ImGuiCol_TitleBg, - ImGuiCol_TitleBgActive, - ImGuiCol_TitleBgCollapsed, + ImGuiCol_TitleBg, // Title bar + ImGuiCol_TitleBgActive, // Title bar when focused + ImGuiCol_TitleBgCollapsed, // Title bar when collapsed ImGuiCol_MenuBarBg, ImGuiCol_ScrollbarBg, ImGuiCol_ScrollbarGrab, ImGuiCol_ScrollbarGrabHovered, ImGuiCol_ScrollbarGrabActive, - ImGuiCol_CheckMark, + ImGuiCol_CheckMark, // Checkbox tick and RadioButton circle ImGuiCol_SliderGrab, ImGuiCol_SliderGrabActive, ImGuiCol_Button, @@ -1058,71 +1722,102 @@ enum ImGuiCol_ ImGuiCol_Separator, ImGuiCol_SeparatorHovered, ImGuiCol_SeparatorActive, - ImGuiCol_ResizeGrip, + ImGuiCol_ResizeGrip, // Resize grip in lower-right and lower-left corners of windows. ImGuiCol_ResizeGripHovered, ImGuiCol_ResizeGripActive, - ImGuiCol_Tab, - ImGuiCol_TabHovered, - ImGuiCol_TabActive, - ImGuiCol_TabUnfocused, - ImGuiCol_TabUnfocusedActive, + ImGuiCol_TabHovered, // Tab background, when hovered + ImGuiCol_Tab, // Tab background, when tab-bar is focused & tab is unselected + ImGuiCol_TabSelected, // Tab background, when tab-bar is focused & tab is selected + ImGuiCol_TabSelectedOverline, // Tab horizontal overline, when tab-bar is focused & tab is selected + ImGuiCol_TabDimmed, // Tab background, when tab-bar is unfocused & tab is unselected + ImGuiCol_TabDimmedSelected, // Tab background, when tab-bar is unfocused & tab is selected + ImGuiCol_TabDimmedSelectedOverline,//..horizontal overline, when tab-bar is unfocused & tab is selected + ImGuiCol_DockingPreview, // Preview overlay color when about to docking something + ImGuiCol_DockingEmptyBg, // Background color for empty node (e.g. CentralNode with no window docked into it) ImGuiCol_PlotLines, ImGuiCol_PlotLinesHovered, ImGuiCol_PlotHistogram, ImGuiCol_PlotHistogramHovered, + ImGuiCol_TableHeaderBg, // Table header background + ImGuiCol_TableBorderStrong, // Table outer and header borders (prefer using Alpha=1.0 here) + ImGuiCol_TableBorderLight, // Table inner borders (prefer using Alpha=1.0 here) + ImGuiCol_TableRowBg, // Table row background (even rows) + ImGuiCol_TableRowBgAlt, // Table row background (odd rows) + ImGuiCol_TextLink, // Hyperlink color ImGuiCol_TextSelectedBg, - ImGuiCol_DragDropTarget, - ImGuiCol_NavHighlight, // Gamepad/keyboard: current highlighted item + ImGuiCol_DragDropTarget, // Rectangle highlighting a drop target + ImGuiCol_NavCursor, // Color of keyboard/gamepad navigation cursor/rectangle, when visible ImGuiCol_NavWindowingHighlight, // Highlight window when using CTRL+TAB ImGuiCol_NavWindowingDimBg, // Darken/colorize entire screen behind the CTRL+TAB window list, when active ImGuiCol_ModalWindowDimBg, // Darken/colorize entire screen behind a modal window, when one is active - ImGuiCol_COUNT + ImGuiCol_COUNT, - // Obsolete names (will be removed) #ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS - , ImGuiCol_ModalWindowDarkening = ImGuiCol_ModalWindowDimBg // [renamed in 1.63] - , ImGuiCol_ChildWindowBg = ImGuiCol_ChildBg // [renamed in 1.53] - //ImGuiCol_CloseButton, ImGuiCol_CloseButtonActive, ImGuiCol_CloseButtonHovered, // [unused since 1.60+] the close button now uses regular button colors. - //ImGuiCol_ComboBg, // [unused since 1.53+] ComboBg has been merged with PopupBg, so a redirect isn't accurate. + ImGuiCol_TabActive = ImGuiCol_TabSelected, // [renamed in 1.90.9] + ImGuiCol_TabUnfocused = ImGuiCol_TabDimmed, // [renamed in 1.90.9] + ImGuiCol_TabUnfocusedActive = ImGuiCol_TabDimmedSelected, // [renamed in 1.90.9] + ImGuiCol_NavHighlight = ImGuiCol_NavCursor, // [renamed in 1.91.4] #endif }; // Enumeration for PushStyleVar() / PopStyleVar() to temporarily modify the ImGuiStyle structure. -// NB: the enum only refers to fields of ImGuiStyle which makes sense to be pushed/popped inside UI code. During initialization, feel free to just poke into ImGuiStyle directly. -// NB: if changing this enum, you need to update the associated internal table GStyleVarInfo[] accordingly. This is where we link enum values to members offset/type. +// - The enum only refers to fields of ImGuiStyle which makes sense to be pushed/popped inside UI code. +// During initialization or between frames, feel free to just poke into ImGuiStyle directly. +// - Tip: Use your programming IDE navigation facilities on the names in the _second column_ below to find the actual members and their description. +// - In Visual Studio: CTRL+comma ("Edit.GoToAll") can follow symbols inside comments, whereas CTRL+F12 ("Edit.GoToImplementation") cannot. +// - In Visual Studio w/ Visual Assist installed: ALT+G ("VAssistX.GoToImplementation") can also follow symbols inside comments. +// - In VS Code, CLion, etc.: CTRL+click can follow symbols inside comments. +// - When changing this enum, you need to update the associated internal table GStyleVarInfo[] accordingly. This is where we link enum values to members offset/type. enum ImGuiStyleVar_ { - // Enum name --------------------- // Member in ImGuiStyle structure (see ImGuiStyle for descriptions) - ImGuiStyleVar_Alpha, // float Alpha - ImGuiStyleVar_WindowPadding, // ImVec2 WindowPadding - ImGuiStyleVar_WindowRounding, // float WindowRounding - ImGuiStyleVar_WindowBorderSize, // float WindowBorderSize - ImGuiStyleVar_WindowMinSize, // ImVec2 WindowMinSize - ImGuiStyleVar_WindowTitleAlign, // ImVec2 WindowTitleAlign - ImGuiStyleVar_ChildRounding, // float ChildRounding - ImGuiStyleVar_ChildBorderSize, // float ChildBorderSize - ImGuiStyleVar_PopupRounding, // float PopupRounding - ImGuiStyleVar_PopupBorderSize, // float PopupBorderSize - ImGuiStyleVar_FramePadding, // ImVec2 FramePadding - ImGuiStyleVar_FrameRounding, // float FrameRounding - ImGuiStyleVar_FrameBorderSize, // float FrameBorderSize - ImGuiStyleVar_ItemSpacing, // ImVec2 ItemSpacing - ImGuiStyleVar_ItemInnerSpacing, // ImVec2 ItemInnerSpacing - ImGuiStyleVar_IndentSpacing, // float IndentSpacing - ImGuiStyleVar_ScrollbarSize, // float ScrollbarSize - ImGuiStyleVar_ScrollbarRounding, // float ScrollbarRounding - ImGuiStyleVar_GrabMinSize, // float GrabMinSize - ImGuiStyleVar_GrabRounding, // float GrabRounding - ImGuiStyleVar_TabRounding, // float TabRounding - ImGuiStyleVar_ButtonTextAlign, // ImVec2 ButtonTextAlign - ImGuiStyleVar_SelectableTextAlign, // ImVec2 SelectableTextAlign + // Enum name -------------------------- // Member in ImGuiStyle structure (see ImGuiStyle for descriptions) + ImGuiStyleVar_Alpha, // float Alpha + ImGuiStyleVar_DisabledAlpha, // float DisabledAlpha + ImGuiStyleVar_WindowPadding, // ImVec2 WindowPadding + ImGuiStyleVar_WindowRounding, // float WindowRounding + ImGuiStyleVar_WindowBorderSize, // float WindowBorderSize + ImGuiStyleVar_WindowMinSize, // ImVec2 WindowMinSize + ImGuiStyleVar_WindowTitleAlign, // ImVec2 WindowTitleAlign + ImGuiStyleVar_ChildRounding, // float ChildRounding + ImGuiStyleVar_ChildBorderSize, // float ChildBorderSize + ImGuiStyleVar_PopupRounding, // float PopupRounding + ImGuiStyleVar_PopupBorderSize, // float PopupBorderSize + ImGuiStyleVar_FramePadding, // ImVec2 FramePadding + ImGuiStyleVar_FrameRounding, // float FrameRounding + ImGuiStyleVar_FrameBorderSize, // float FrameBorderSize + ImGuiStyleVar_ItemSpacing, // ImVec2 ItemSpacing + ImGuiStyleVar_ItemInnerSpacing, // ImVec2 ItemInnerSpacing + ImGuiStyleVar_IndentSpacing, // float IndentSpacing + ImGuiStyleVar_CellPadding, // ImVec2 CellPadding + ImGuiStyleVar_ScrollbarSize, // float ScrollbarSize + ImGuiStyleVar_ScrollbarRounding, // float ScrollbarRounding + ImGuiStyleVar_GrabMinSize, // float GrabMinSize + ImGuiStyleVar_GrabRounding, // float GrabRounding + ImGuiStyleVar_ImageBorderSize, // float ImageBorderSize + ImGuiStyleVar_TabRounding, // float TabRounding + ImGuiStyleVar_TabBorderSize, // float TabBorderSize + ImGuiStyleVar_TabBarBorderSize, // float TabBarBorderSize + ImGuiStyleVar_TabBarOverlineSize, // float TabBarOverlineSize + ImGuiStyleVar_TableAngledHeadersAngle, // float TableAngledHeadersAngle + ImGuiStyleVar_TableAngledHeadersTextAlign,// ImVec2 TableAngledHeadersTextAlign + ImGuiStyleVar_ButtonTextAlign, // ImVec2 ButtonTextAlign + ImGuiStyleVar_SelectableTextAlign, // ImVec2 SelectableTextAlign + ImGuiStyleVar_SeparatorTextBorderSize, // float SeparatorTextBorderSize + ImGuiStyleVar_SeparatorTextAlign, // ImVec2 SeparatorTextAlign + ImGuiStyleVar_SeparatorTextPadding, // ImVec2 SeparatorTextPadding + ImGuiStyleVar_DockingSeparatorSize, // float DockingSeparatorSize ImGuiStyleVar_COUNT +}; - // Obsolete names (will be removed) -#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS - , ImGuiStyleVar_Count_ = ImGuiStyleVar_COUNT // [renamed in 1.60] - , ImGuiStyleVar_ChildWindowRounding = ImGuiStyleVar_ChildRounding // [renamed in 1.53] -#endif +// Flags for InvisibleButton() [extended in imgui_internal.h] +enum ImGuiButtonFlags_ +{ + ImGuiButtonFlags_None = 0, + ImGuiButtonFlags_MouseButtonLeft = 1 << 0, // React on left mouse button (default) + ImGuiButtonFlags_MouseButtonRight = 1 << 1, // React on right mouse button + ImGuiButtonFlags_MouseButtonMiddle = 1 << 2, // React on center mouse button + ImGuiButtonFlags_MouseButtonMask_ = ImGuiButtonFlags_MouseButtonLeft | ImGuiButtonFlags_MouseButtonRight | ImGuiButtonFlags_MouseButtonMiddle, // [Internal] + ImGuiButtonFlags_EnableNav = 1 << 3, // InvisibleButton(): do not disable navigation/tabbing. Otherwise disabled by default. }; // Flags for ColorEdit3() / ColorEdit4() / ColorPicker3() / ColorPicker4() / ColorButton() @@ -1130,19 +1825,26 @@ enum ImGuiColorEditFlags_ { ImGuiColorEditFlags_None = 0, ImGuiColorEditFlags_NoAlpha = 1 << 1, // // ColorEdit, ColorPicker, ColorButton: ignore Alpha component (will only read 3 components from the input pointer). - ImGuiColorEditFlags_NoPicker = 1 << 2, // // ColorEdit: disable picker when clicking on colored square. + ImGuiColorEditFlags_NoPicker = 1 << 2, // // ColorEdit: disable picker when clicking on color square. ImGuiColorEditFlags_NoOptions = 1 << 3, // // ColorEdit: disable toggling options menu when right-clicking on inputs/small preview. - ImGuiColorEditFlags_NoSmallPreview = 1 << 4, // // ColorEdit, ColorPicker: disable colored square preview next to the inputs. (e.g. to show only the inputs) - ImGuiColorEditFlags_NoInputs = 1 << 5, // // ColorEdit, ColorPicker: disable inputs sliders/text widgets (e.g. to show only the small preview colored square). + ImGuiColorEditFlags_NoSmallPreview = 1 << 4, // // ColorEdit, ColorPicker: disable color square preview next to the inputs. (e.g. to show only the inputs) + ImGuiColorEditFlags_NoInputs = 1 << 5, // // ColorEdit, ColorPicker: disable inputs sliders/text widgets (e.g. to show only the small preview color square). ImGuiColorEditFlags_NoTooltip = 1 << 6, // // ColorEdit, ColorPicker, ColorButton: disable tooltip when hovering the preview. ImGuiColorEditFlags_NoLabel = 1 << 7, // // ColorEdit, ColorPicker: disable display of inline text label (the label is still forwarded to the tooltip and picker). - ImGuiColorEditFlags_NoSidePreview = 1 << 8, // // ColorPicker: disable bigger color preview on right side of the picker, use small colored square preview instead. + ImGuiColorEditFlags_NoSidePreview = 1 << 8, // // ColorPicker: disable bigger color preview on right side of the picker, use small color square preview instead. ImGuiColorEditFlags_NoDragDrop = 1 << 9, // // ColorEdit: disable drag and drop target. ColorButton: disable drag and drop source. + ImGuiColorEditFlags_NoBorder = 1 << 10, // // ColorButton: disable border (which is enforced by default) + + // Alpha preview + // - Prior to 1.91.8 (2025/01/21): alpha was made opaque in the preview by default using old name ImGuiColorEditFlags_AlphaPreview. + // - We now display the preview as transparent by default. You can use ImGuiColorEditFlags_AlphaOpaque to use old behavior. + // - The new flags may be combined better and allow finer controls. + ImGuiColorEditFlags_AlphaOpaque = 1 << 11, // // ColorEdit, ColorPicker, ColorButton: disable alpha in the preview,. Contrary to _NoAlpha it may still be edited when calling ColorEdit4()/ColorPicker4(). For ColorButton() this does the same as _NoAlpha. + ImGuiColorEditFlags_AlphaNoBg = 1 << 12, // // ColorEdit, ColorPicker, ColorButton: disable rendering a checkerboard background behind transparent color. + ImGuiColorEditFlags_AlphaPreviewHalf= 1 << 13, // // ColorEdit, ColorPicker, ColorButton: display half opaque / half transparent preview. // User Options (right-click on widget to change some of them). ImGuiColorEditFlags_AlphaBar = 1 << 16, // // ColorEdit, ColorPicker: show vertical alpha bar/gradient in picker. - ImGuiColorEditFlags_AlphaPreview = 1 << 17, // // ColorEdit, ColorPicker, ColorButton: display preview as a transparent color over a checkerboard, instead of opaque. - ImGuiColorEditFlags_AlphaPreviewHalf= 1 << 18, // // ColorEdit, ColorPicker, ColorButton: display half opaque / half checkerboard, instead of opaque. ImGuiColorEditFlags_HDR = 1 << 19, // // (WIP) ColorEdit: Currently only disable 0.0f..1.0f limits in RGBA edition (note: you probably want to use ImGuiColorEditFlags_Float flag as well). ImGuiColorEditFlags_DisplayRGB = 1 << 20, // [Display] // ColorEdit: override _display_ type among RGB/HSV/Hex. ColorPicker: select any combination using one or more of RGB/HSV/Hex. ImGuiColorEditFlags_DisplayHSV = 1 << 21, // [Display] // " @@ -1156,77 +1858,297 @@ enum ImGuiColorEditFlags_ // Defaults Options. You can set application defaults using SetColorEditOptions(). The intent is that you probably don't want to // override them in most of your calls. Let the user choose via the option menu and/or call SetColorEditOptions() once during startup. - ImGuiColorEditFlags__OptionsDefault = ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_DisplayRGB|ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_PickerHueBar, + ImGuiColorEditFlags_DefaultOptions_ = ImGuiColorEditFlags_Uint8 | ImGuiColorEditFlags_DisplayRGB | ImGuiColorEditFlags_InputRGB | ImGuiColorEditFlags_PickerHueBar, // [Internal] Masks - ImGuiColorEditFlags__DisplayMask = ImGuiColorEditFlags_DisplayRGB|ImGuiColorEditFlags_DisplayHSV|ImGuiColorEditFlags_DisplayHex, - ImGuiColorEditFlags__DataTypeMask = ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_Float, - ImGuiColorEditFlags__PickerMask = ImGuiColorEditFlags_PickerHueWheel|ImGuiColorEditFlags_PickerHueBar, - ImGuiColorEditFlags__InputMask = ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_InputHSV + ImGuiColorEditFlags_AlphaMask_ = ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_AlphaOpaque | ImGuiColorEditFlags_AlphaNoBg | ImGuiColorEditFlags_AlphaPreviewHalf, + ImGuiColorEditFlags_DisplayMask_ = ImGuiColorEditFlags_DisplayRGB | ImGuiColorEditFlags_DisplayHSV | ImGuiColorEditFlags_DisplayHex, + ImGuiColorEditFlags_DataTypeMask_ = ImGuiColorEditFlags_Uint8 | ImGuiColorEditFlags_Float, + ImGuiColorEditFlags_PickerMask_ = ImGuiColorEditFlags_PickerHueWheel | ImGuiColorEditFlags_PickerHueBar, + ImGuiColorEditFlags_InputMask_ = ImGuiColorEditFlags_InputRGB | ImGuiColorEditFlags_InputHSV, - // Obsolete names (will be removed) + // Obsolete names #ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS - , ImGuiColorEditFlags_RGB = ImGuiColorEditFlags_DisplayRGB, ImGuiColorEditFlags_HSV = ImGuiColorEditFlags_DisplayHSV, ImGuiColorEditFlags_HEX = ImGuiColorEditFlags_DisplayHex // [renamed in 1.69] + ImGuiColorEditFlags_AlphaPreview = 0, // [Removed in 1.91.8] This is the default now. Will display a checkerboard unless ImGuiColorEditFlags_AlphaNoBg is set. #endif + //ImGuiColorEditFlags_RGB = ImGuiColorEditFlags_DisplayRGB, ImGuiColorEditFlags_HSV = ImGuiColorEditFlags_DisplayHSV, ImGuiColorEditFlags_HEX = ImGuiColorEditFlags_DisplayHex // [renamed in 1.69] +}; + +// Flags for DragFloat(), DragInt(), SliderFloat(), SliderInt() etc. +// We use the same sets of flags for DragXXX() and SliderXXX() functions as the features are the same and it makes it easier to swap them. +// (Those are per-item flags. There is shared behavior flag too: ImGuiIO: io.ConfigDragClickToInputText) +enum ImGuiSliderFlags_ +{ + ImGuiSliderFlags_None = 0, + ImGuiSliderFlags_Logarithmic = 1 << 5, // Make the widget logarithmic (linear otherwise). Consider using ImGuiSliderFlags_NoRoundToFormat with this if using a format-string with small amount of digits. + ImGuiSliderFlags_NoRoundToFormat = 1 << 6, // Disable rounding underlying value to match precision of the display format string (e.g. %.3f values are rounded to those 3 digits). + ImGuiSliderFlags_NoInput = 1 << 7, // Disable CTRL+Click or Enter key allowing to input text directly into the widget. + ImGuiSliderFlags_WrapAround = 1 << 8, // Enable wrapping around from max to min and from min to max. Only supported by DragXXX() functions for now. + ImGuiSliderFlags_ClampOnInput = 1 << 9, // Clamp value to min/max bounds when input manually with CTRL+Click. By default CTRL+Click allows going out of bounds. + ImGuiSliderFlags_ClampZeroRange = 1 << 10, // Clamp even if min==max==0.0f. Otherwise due to legacy reason DragXXX functions don't clamp with those values. When your clamping limits are dynamic you almost always want to use it. + ImGuiSliderFlags_NoSpeedTweaks = 1 << 11, // Disable keyboard modifiers altering tweak speed. Useful if you want to alter tweak speed yourself based on your own logic. + ImGuiSliderFlags_AlwaysClamp = ImGuiSliderFlags_ClampOnInput | ImGuiSliderFlags_ClampZeroRange, + ImGuiSliderFlags_InvalidMask_ = 0x7000000F, // [Internal] We treat using those bits as being potentially a 'float power' argument from the previous API that has got miscast to this enum, and will trigger an assert if needed. +}; + +// Identify a mouse button. +// Those values are guaranteed to be stable and we frequently use 0/1 directly. Named enums provided for convenience. +enum ImGuiMouseButton_ +{ + ImGuiMouseButton_Left = 0, + ImGuiMouseButton_Right = 1, + ImGuiMouseButton_Middle = 2, + ImGuiMouseButton_COUNT = 5 }; // Enumeration for GetMouseCursor() -// User code may request binding to display given cursor by calling SetMouseCursor(), which is why we have some cursors that are marked unused here +// User code may request backend to display given cursor by calling SetMouseCursor(), which is why we have some cursors that are marked unused here enum ImGuiMouseCursor_ { ImGuiMouseCursor_None = -1, ImGuiMouseCursor_Arrow = 0, ImGuiMouseCursor_TextInput, // When hovering over InputText, etc. ImGuiMouseCursor_ResizeAll, // (Unused by Dear ImGui functions) - ImGuiMouseCursor_ResizeNS, // When hovering over an horizontal border + ImGuiMouseCursor_ResizeNS, // When hovering over a horizontal border ImGuiMouseCursor_ResizeEW, // When hovering over a vertical border or a column ImGuiMouseCursor_ResizeNESW, // When hovering over the bottom-left corner of a window ImGuiMouseCursor_ResizeNWSE, // When hovering over the bottom-right corner of a window ImGuiMouseCursor_Hand, // (Unused by Dear ImGui functions. Use for e.g. hyperlinks) + ImGuiMouseCursor_Wait, // When waiting for something to process/load. + ImGuiMouseCursor_Progress, // When waiting for something to process/load, but application is still interactive. + ImGuiMouseCursor_NotAllowed, // When hovering something with disallowed interaction. Usually a crossed circle. ImGuiMouseCursor_COUNT - - // Obsolete names (will be removed) -#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS - , ImGuiMouseCursor_Count_ = ImGuiMouseCursor_COUNT // [renamed in 1.60] -#endif }; -// Enumateration for ImGui::SetWindow***(), SetNextWindow***(), SetNextItem***() functions +// Enumeration for AddMouseSourceEvent() actual source of Mouse Input data. +// Historically we use "Mouse" terminology everywhere to indicate pointer data, e.g. MousePos, IsMousePressed(), io.AddMousePosEvent() +// But that "Mouse" data can come from different source which occasionally may be useful for application to know about. +// You can submit a change of pointer type using io.AddMouseSourceEvent(). +enum ImGuiMouseSource : int +{ + ImGuiMouseSource_Mouse = 0, // Input is coming from an actual mouse. + ImGuiMouseSource_TouchScreen, // Input is coming from a touch screen (no hovering prior to initial press, less precise initial press aiming, dual-axis wheeling possible). + ImGuiMouseSource_Pen, // Input is coming from a pressure/magnetic pen (often used in conjunction with high-sampling rates). + ImGuiMouseSource_COUNT +}; + +// Enumeration for ImGui::SetNextWindow***(), SetWindow***(), SetNextItem***() functions // Represent a condition. // Important: Treat as a regular enum! Do NOT combine multiple values using binary operators! All the functions above treat 0 as a shortcut to ImGuiCond_Always. enum ImGuiCond_ { - ImGuiCond_Always = 1 << 0, // Set the variable - ImGuiCond_Once = 1 << 1, // Set the variable once per runtime session (only the first call with succeed) + ImGuiCond_None = 0, // No condition (always set the variable), same as _Always + ImGuiCond_Always = 1 << 0, // No condition (always set the variable), same as _None + ImGuiCond_Once = 1 << 1, // Set the variable once per runtime session (only the first call will succeed) ImGuiCond_FirstUseEver = 1 << 2, // Set the variable if the object/window has no persistently saved data (no entry in .ini file) - ImGuiCond_Appearing = 1 << 3 // Set the variable if the object/window is appearing after being hidden/inactive (or the first time) + ImGuiCond_Appearing = 1 << 3, // Set the variable if the object/window is appearing after being hidden/inactive (or the first time) }; //----------------------------------------------------------------------------- -// Helpers: Memory allocations macros -// IM_MALLOC(), IM_FREE(), IM_NEW(), IM_PLACEMENT_NEW(), IM_DELETE() -// We call C++ constructor on own allocated memory via the placement "new(ptr) Type()" syntax. -// Defining a custom placement new() with a dummy parameter allows us to bypass including which on some platforms complains when user has disabled exceptions. +// [SECTION] Tables API flags and structures (ImGuiTableFlags, ImGuiTableColumnFlags, ImGuiTableRowFlags, ImGuiTableBgTarget, ImGuiTableSortSpecs, ImGuiTableColumnSortSpecs) //----------------------------------------------------------------------------- -struct ImNewDummy {}; -inline void* operator new(size_t, ImNewDummy, void* ptr) { return ptr; } -inline void operator delete(void*, ImNewDummy, void*) {} // This is only required so we can use the symmetrical new() +// Flags for ImGui::BeginTable() +// - Important! Sizing policies have complex and subtle side effects, much more so than you would expect. +// Read comments/demos carefully + experiment with live demos to get acquainted with them. +// - The DEFAULT sizing policies are: +// - Default to ImGuiTableFlags_SizingFixedFit if ScrollX is on, or if host window has ImGuiWindowFlags_AlwaysAutoResize. +// - Default to ImGuiTableFlags_SizingStretchSame if ScrollX is off. +// - When ScrollX is off: +// - Table defaults to ImGuiTableFlags_SizingStretchSame -> all Columns defaults to ImGuiTableColumnFlags_WidthStretch with same weight. +// - Columns sizing policy allowed: Stretch (default), Fixed/Auto. +// - Fixed Columns (if any) will generally obtain their requested width (unless the table cannot fit them all). +// - Stretch Columns will share the remaining width according to their respective weight. +// - Mixed Fixed/Stretch columns is possible but has various side-effects on resizing behaviors. +// The typical use of mixing sizing policies is: any number of LEADING Fixed columns, followed by one or two TRAILING Stretch columns. +// (this is because the visible order of columns have subtle but necessary effects on how they react to manual resizing). +// - When ScrollX is on: +// - Table defaults to ImGuiTableFlags_SizingFixedFit -> all Columns defaults to ImGuiTableColumnFlags_WidthFixed +// - Columns sizing policy allowed: Fixed/Auto mostly. +// - Fixed Columns can be enlarged as needed. Table will show a horizontal scrollbar if needed. +// - When using auto-resizing (non-resizable) fixed columns, querying the content width to use item right-alignment e.g. SetNextItemWidth(-FLT_MIN) doesn't make sense, would create a feedback loop. +// - Using Stretch columns OFTEN DOES NOT MAKE SENSE if ScrollX is on, UNLESS you have specified a value for 'inner_width' in BeginTable(). +// If you specify a value for 'inner_width' then effectively the scrolling space is known and Stretch or mixed Fixed/Stretch columns become meaningful again. +// - Read on documentation at the top of imgui_tables.cpp for details. +enum ImGuiTableFlags_ +{ + // Features + ImGuiTableFlags_None = 0, + ImGuiTableFlags_Resizable = 1 << 0, // Enable resizing columns. + ImGuiTableFlags_Reorderable = 1 << 1, // Enable reordering columns in header row (need calling TableSetupColumn() + TableHeadersRow() to display headers) + ImGuiTableFlags_Hideable = 1 << 2, // Enable hiding/disabling columns in context menu. + ImGuiTableFlags_Sortable = 1 << 3, // Enable sorting. Call TableGetSortSpecs() to obtain sort specs. Also see ImGuiTableFlags_SortMulti and ImGuiTableFlags_SortTristate. + ImGuiTableFlags_NoSavedSettings = 1 << 4, // Disable persisting columns order, width and sort settings in the .ini file. + ImGuiTableFlags_ContextMenuInBody = 1 << 5, // Right-click on columns body/contents will display table context menu. By default it is available in TableHeadersRow(). + // Decorations + ImGuiTableFlags_RowBg = 1 << 6, // Set each RowBg color with ImGuiCol_TableRowBg or ImGuiCol_TableRowBgAlt (equivalent of calling TableSetBgColor with ImGuiTableBgFlags_RowBg0 on each row manually) + ImGuiTableFlags_BordersInnerH = 1 << 7, // Draw horizontal borders between rows. + ImGuiTableFlags_BordersOuterH = 1 << 8, // Draw horizontal borders at the top and bottom. + ImGuiTableFlags_BordersInnerV = 1 << 9, // Draw vertical borders between columns. + ImGuiTableFlags_BordersOuterV = 1 << 10, // Draw vertical borders on the left and right sides. + ImGuiTableFlags_BordersH = ImGuiTableFlags_BordersInnerH | ImGuiTableFlags_BordersOuterH, // Draw horizontal borders. + ImGuiTableFlags_BordersV = ImGuiTableFlags_BordersInnerV | ImGuiTableFlags_BordersOuterV, // Draw vertical borders. + ImGuiTableFlags_BordersInner = ImGuiTableFlags_BordersInnerV | ImGuiTableFlags_BordersInnerH, // Draw inner borders. + ImGuiTableFlags_BordersOuter = ImGuiTableFlags_BordersOuterV | ImGuiTableFlags_BordersOuterH, // Draw outer borders. + ImGuiTableFlags_Borders = ImGuiTableFlags_BordersInner | ImGuiTableFlags_BordersOuter, // Draw all borders. + ImGuiTableFlags_NoBordersInBody = 1 << 11, // [ALPHA] Disable vertical borders in columns Body (borders will always appear in Headers). -> May move to style + ImGuiTableFlags_NoBordersInBodyUntilResize = 1 << 12, // [ALPHA] Disable vertical borders in columns Body until hovered for resize (borders will always appear in Headers). -> May move to style + // Sizing Policy (read above for defaults) + ImGuiTableFlags_SizingFixedFit = 1 << 13, // Columns default to _WidthFixed or _WidthAuto (if resizable or not resizable), matching contents width. + ImGuiTableFlags_SizingFixedSame = 2 << 13, // Columns default to _WidthFixed or _WidthAuto (if resizable or not resizable), matching the maximum contents width of all columns. Implicitly enable ImGuiTableFlags_NoKeepColumnsVisible. + ImGuiTableFlags_SizingStretchProp = 3 << 13, // Columns default to _WidthStretch with default weights proportional to each columns contents widths. + ImGuiTableFlags_SizingStretchSame = 4 << 13, // Columns default to _WidthStretch with default weights all equal, unless overridden by TableSetupColumn(). + // Sizing Extra Options + ImGuiTableFlags_NoHostExtendX = 1 << 16, // Make outer width auto-fit to columns, overriding outer_size.x value. Only available when ScrollX/ScrollY are disabled and Stretch columns are not used. + ImGuiTableFlags_NoHostExtendY = 1 << 17, // Make outer height stop exactly at outer_size.y (prevent auto-extending table past the limit). Only available when ScrollX/ScrollY are disabled. Data below the limit will be clipped and not visible. + ImGuiTableFlags_NoKeepColumnsVisible = 1 << 18, // Disable keeping column always minimally visible when ScrollX is off and table gets too small. Not recommended if columns are resizable. + ImGuiTableFlags_PreciseWidths = 1 << 19, // Disable distributing remainder width to stretched columns (width allocation on a 100-wide table with 3 columns: Without this flag: 33,33,34. With this flag: 33,33,33). With larger number of columns, resizing will appear to be less smooth. + // Clipping + ImGuiTableFlags_NoClip = 1 << 20, // Disable clipping rectangle for every individual columns (reduce draw command count, items will be able to overflow into other columns). Generally incompatible with TableSetupScrollFreeze(). + // Padding + ImGuiTableFlags_PadOuterX = 1 << 21, // Default if BordersOuterV is on. Enable outermost padding. Generally desirable if you have headers. + ImGuiTableFlags_NoPadOuterX = 1 << 22, // Default if BordersOuterV is off. Disable outermost padding. + ImGuiTableFlags_NoPadInnerX = 1 << 23, // Disable inner padding between columns (double inner padding if BordersOuterV is on, single inner padding if BordersOuterV is off). + // Scrolling + ImGuiTableFlags_ScrollX = 1 << 24, // Enable horizontal scrolling. Require 'outer_size' parameter of BeginTable() to specify the container size. Changes default sizing policy. Because this creates a child window, ScrollY is currently generally recommended when using ScrollX. + ImGuiTableFlags_ScrollY = 1 << 25, // Enable vertical scrolling. Require 'outer_size' parameter of BeginTable() to specify the container size. + // Sorting + ImGuiTableFlags_SortMulti = 1 << 26, // Hold shift when clicking headers to sort on multiple column. TableGetSortSpecs() may return specs where (SpecsCount > 1). + ImGuiTableFlags_SortTristate = 1 << 27, // Allow no sorting, disable default sorting. TableGetSortSpecs() may return specs where (SpecsCount == 0). + // Miscellaneous + ImGuiTableFlags_HighlightHoveredColumn = 1 << 28, // Highlight column headers when hovered (may evolve into a fuller highlight) + + // [Internal] Combinations and masks + ImGuiTableFlags_SizingMask_ = ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_SizingFixedSame | ImGuiTableFlags_SizingStretchProp | ImGuiTableFlags_SizingStretchSame, +}; + +// Flags for ImGui::TableSetupColumn() +enum ImGuiTableColumnFlags_ +{ + // Input configuration flags + ImGuiTableColumnFlags_None = 0, + ImGuiTableColumnFlags_Disabled = 1 << 0, // Overriding/master disable flag: hide column, won't show in context menu (unlike calling TableSetColumnEnabled() which manipulates the user accessible state) + ImGuiTableColumnFlags_DefaultHide = 1 << 1, // Default as a hidden/disabled column. + ImGuiTableColumnFlags_DefaultSort = 1 << 2, // Default as a sorting column. + ImGuiTableColumnFlags_WidthStretch = 1 << 3, // Column will stretch. Preferable with horizontal scrolling disabled (default if table sizing policy is _SizingStretchSame or _SizingStretchProp). + ImGuiTableColumnFlags_WidthFixed = 1 << 4, // Column will not stretch. Preferable with horizontal scrolling enabled (default if table sizing policy is _SizingFixedFit and table is resizable). + ImGuiTableColumnFlags_NoResize = 1 << 5, // Disable manual resizing. + ImGuiTableColumnFlags_NoReorder = 1 << 6, // Disable manual reordering this column, this will also prevent other columns from crossing over this column. + ImGuiTableColumnFlags_NoHide = 1 << 7, // Disable ability to hide/disable this column. + ImGuiTableColumnFlags_NoClip = 1 << 8, // Disable clipping for this column (all NoClip columns will render in a same draw command). + ImGuiTableColumnFlags_NoSort = 1 << 9, // Disable ability to sort on this field (even if ImGuiTableFlags_Sortable is set on the table). + ImGuiTableColumnFlags_NoSortAscending = 1 << 10, // Disable ability to sort in the ascending direction. + ImGuiTableColumnFlags_NoSortDescending = 1 << 11, // Disable ability to sort in the descending direction. + ImGuiTableColumnFlags_NoHeaderLabel = 1 << 12, // TableHeadersRow() will submit an empty label for this column. Convenient for some small columns. Name will still appear in context menu or in angled headers. You may append into this cell by calling TableSetColumnIndex() right after the TableHeadersRow() call. + ImGuiTableColumnFlags_NoHeaderWidth = 1 << 13, // Disable header text width contribution to automatic column width. + ImGuiTableColumnFlags_PreferSortAscending = 1 << 14, // Make the initial sort direction Ascending when first sorting on this column (default). + ImGuiTableColumnFlags_PreferSortDescending = 1 << 15, // Make the initial sort direction Descending when first sorting on this column. + ImGuiTableColumnFlags_IndentEnable = 1 << 16, // Use current Indent value when entering cell (default for column 0). + ImGuiTableColumnFlags_IndentDisable = 1 << 17, // Ignore current Indent value when entering cell (default for columns > 0). Indentation changes _within_ the cell will still be honored. + ImGuiTableColumnFlags_AngledHeader = 1 << 18, // TableHeadersRow() will submit an angled header row for this column. Note this will add an extra row. + + // Output status flags, read-only via TableGetColumnFlags() + ImGuiTableColumnFlags_IsEnabled = 1 << 24, // Status: is enabled == not hidden by user/api (referred to as "Hide" in _DefaultHide and _NoHide) flags. + ImGuiTableColumnFlags_IsVisible = 1 << 25, // Status: is visible == is enabled AND not clipped by scrolling. + ImGuiTableColumnFlags_IsSorted = 1 << 26, // Status: is currently part of the sort specs + ImGuiTableColumnFlags_IsHovered = 1 << 27, // Status: is hovered by mouse + + // [Internal] Combinations and masks + ImGuiTableColumnFlags_WidthMask_ = ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_WidthFixed, + ImGuiTableColumnFlags_IndentMask_ = ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_IndentDisable, + ImGuiTableColumnFlags_StatusMask_ = ImGuiTableColumnFlags_IsEnabled | ImGuiTableColumnFlags_IsVisible | ImGuiTableColumnFlags_IsSorted | ImGuiTableColumnFlags_IsHovered, + ImGuiTableColumnFlags_NoDirectResize_ = 1 << 30, // [Internal] Disable user resizing this column directly (it may however we resized indirectly from its left edge) +}; + +// Flags for ImGui::TableNextRow() +enum ImGuiTableRowFlags_ +{ + ImGuiTableRowFlags_None = 0, + ImGuiTableRowFlags_Headers = 1 << 0, // Identify header row (set default background color + width of its contents accounted differently for auto column width) +}; + +// Enum for ImGui::TableSetBgColor() +// Background colors are rendering in 3 layers: +// - Layer 0: draw with RowBg0 color if set, otherwise draw with ColumnBg0 if set. +// - Layer 1: draw with RowBg1 color if set, otherwise draw with ColumnBg1 if set. +// - Layer 2: draw with CellBg color if set. +// The purpose of the two row/columns layers is to let you decide if a background color change should override or blend with the existing color. +// When using ImGuiTableFlags_RowBg on the table, each row has the RowBg0 color automatically set for odd/even rows. +// If you set the color of RowBg0 target, your color will override the existing RowBg0 color. +// If you set the color of RowBg1 or ColumnBg1 target, your color will blend over the RowBg0 color. +enum ImGuiTableBgTarget_ +{ + ImGuiTableBgTarget_None = 0, + ImGuiTableBgTarget_RowBg0 = 1, // Set row background color 0 (generally used for background, automatically set when ImGuiTableFlags_RowBg is used) + ImGuiTableBgTarget_RowBg1 = 2, // Set row background color 1 (generally used for selection marking) + ImGuiTableBgTarget_CellBg = 3, // Set cell background color (top-most color) +}; + +// Sorting specifications for a table (often handling sort specs for a single column, occasionally more) +// Obtained by calling TableGetSortSpecs(). +// When 'SpecsDirty == true' you can sort your data. It will be true with sorting specs have changed since last call, or the first time. +// Make sure to set 'SpecsDirty = false' after sorting, else you may wastefully sort your data every frame! +struct ImGuiTableSortSpecs +{ + const ImGuiTableColumnSortSpecs* Specs; // Pointer to sort spec array. + int SpecsCount; // Sort spec count. Most often 1. May be > 1 when ImGuiTableFlags_SortMulti is enabled. May be == 0 when ImGuiTableFlags_SortTristate is enabled. + bool SpecsDirty; // Set to true when specs have changed since last time! Use this to sort again, then clear the flag. + + ImGuiTableSortSpecs() { memset(this, 0, sizeof(*this)); } +}; + +// Sorting specification for one column of a table (sizeof == 12 bytes) +struct ImGuiTableColumnSortSpecs +{ + ImGuiID ColumnUserID; // User id of the column (if specified by a TableSetupColumn() call) + ImS16 ColumnIndex; // Index of the column + ImS16 SortOrder; // Index within parent ImGuiTableSortSpecs (always stored in order starting from 0, tables sorted on a single criteria will always have a 0 here) + ImGuiSortDirection SortDirection; // ImGuiSortDirection_Ascending or ImGuiSortDirection_Descending + + ImGuiTableColumnSortSpecs() { memset(this, 0, sizeof(*this)); } +}; + +//----------------------------------------------------------------------------- +// [SECTION] Helpers: Debug log, memory allocations macros, ImVector<> +//----------------------------------------------------------------------------- + +//----------------------------------------------------------------------------- +// Debug Logging into ShowDebugLogWindow(), tty and more. +//----------------------------------------------------------------------------- + +#ifndef IMGUI_DISABLE_DEBUG_TOOLS +#define IMGUI_DEBUG_LOG(...) ImGui::DebugLog(__VA_ARGS__) +#else +#define IMGUI_DEBUG_LOG(...) ((void)0) +#endif + +//----------------------------------------------------------------------------- +// IM_MALLOC(), IM_FREE(), IM_NEW(), IM_PLACEMENT_NEW(), IM_DELETE() +// We call C++ constructor on own allocated memory via the placement "new(ptr) Type()" syntax. +// Defining a custom placement new() with a custom parameter allows us to bypass including which on some platforms complains when user has disabled exceptions. +//----------------------------------------------------------------------------- + +struct ImNewWrapper {}; +inline void* operator new(size_t, ImNewWrapper, void* ptr) { return ptr; } +inline void operator delete(void*, ImNewWrapper, void*) {} // This is only required so we can use the symmetrical new() #define IM_ALLOC(_SIZE) ImGui::MemAlloc(_SIZE) #define IM_FREE(_PTR) ImGui::MemFree(_PTR) -#define IM_PLACEMENT_NEW(_PTR) new(ImNewDummy(), _PTR) -#define IM_NEW(_TYPE) new(ImNewDummy(), ImGui::MemAlloc(sizeof(_TYPE))) _TYPE +#define IM_PLACEMENT_NEW(_PTR) new(ImNewWrapper(), _PTR) +#define IM_NEW(_TYPE) new(ImNewWrapper(), ImGui::MemAlloc(sizeof(_TYPE))) _TYPE template void IM_DELETE(T* p) { if (p) { p->~T(); ImGui::MemFree(p); } } //----------------------------------------------------------------------------- -// Helper: ImVector<> +// ImVector<> // Lightweight std::vector<>-like class to avoid dragging dependencies (also, some implementations of STL with debug enabled are absurdly slow, we bypass it so our code runs fast in debug). -// You generally do NOT need to care or use this ever. But we need to make it available in imgui.h because some of our data structures are relying on it. -// Important: clear() frees memory, resize(0) keep the allocated buffer. We use resize(0) a lot to intentionally recycle allocated buffers across frames and amortize our costs. -// Important: our implementation does NOT call C++ constructors/destructors, we treat everything as raw data! This is intentional but be extra mindful of that, -// do NOT use this class as a std::vector replacement in your own code! Many of the structures used by dear imgui can be safely initialized by a zero-memset. +//----------------------------------------------------------------------------- +// - You generally do NOT need to care or use this ever. But we need to make it available in imgui.h because some of our public structures are relying on it. +// - We use std-like naming convention here, which is a little unusual for this codebase. +// - Important: clear() frees memory, resize(0) keep the allocated buffer. We use resize(0) a lot to intentionally recycle allocated buffers across frames and amortize our costs. +// - Important: our implementation does NOT call C++ constructors/destructors, we treat everything as raw data! This is intentional but be extra mindful of that, +// Do NOT use this class as a std::vector replacement in your own code! Many of the structures used by dear imgui can be safely initialized by a zero-memset. //----------------------------------------------------------------------------- +IM_MSVC_RUNTIME_CHECKS_OFF template struct ImVector { @@ -1242,17 +2164,21 @@ struct ImVector // Constructors, destructor inline ImVector() { Size = Capacity = 0; Data = NULL; } inline ImVector(const ImVector& src) { Size = Capacity = 0; Data = NULL; operator=(src); } - inline ImVector& operator=(const ImVector& src) { clear(); resize(src.Size); memcpy(Data, src.Data, (size_t)Size * sizeof(T)); return *this; } - inline ~ImVector() { if (Data) IM_FREE(Data); } + inline ImVector& operator=(const ImVector& src) { clear(); resize(src.Size); if (src.Data) memcpy(Data, src.Data, (size_t)Size * sizeof(T)); return *this; } + inline ~ImVector() { if (Data) IM_FREE(Data); } // Important: does not destruct anything + + inline void clear() { if (Data) { Size = Capacity = 0; IM_FREE(Data); Data = NULL; } } // Important: does not destruct anything + inline void clear_delete() { for (int n = 0; n < Size; n++) IM_DELETE(Data[n]); clear(); } // Important: never called automatically! always explicit. + inline void clear_destruct() { for (int n = 0; n < Size; n++) Data[n].~T(); clear(); } // Important: never called automatically! always explicit. inline bool empty() const { return Size == 0; } inline int size() const { return Size; } inline int size_in_bytes() const { return Size * (int)sizeof(T); } + inline int max_size() const { return 0x7FFFFFFF / (int)sizeof(T); } inline int capacity() const { return Capacity; } - inline T& operator[](int i) { IM_ASSERT(i < Size); return Data[i]; } - inline const T& operator[](int i) const { IM_ASSERT(i < Size); return Data[i]; } + inline T& operator[](int i) { IM_ASSERT(i >= 0 && i < Size); return Data[i]; } + inline const T& operator[](int i) const { IM_ASSERT(i >= 0 && i < Size); return Data[i]; } - inline void clear() { if (Data) { Size = Capacity = 0; IM_FREE(Data); Data = NULL; } } inline T* begin() { return Data; } inline const T* begin() const { return Data; } inline T* end() { return Data + Size; } @@ -1263,29 +2189,34 @@ struct ImVector inline const T& back() const { IM_ASSERT(Size > 0); return Data[Size - 1]; } inline void swap(ImVector& rhs) { int rhs_size = rhs.Size; rhs.Size = Size; Size = rhs_size; int rhs_cap = rhs.Capacity; rhs.Capacity = Capacity; Capacity = rhs_cap; T* rhs_data = rhs.Data; rhs.Data = Data; Data = rhs_data; } - inline int _grow_capacity(int sz) const { int new_capacity = Capacity ? (Capacity + Capacity/2) : 8; return new_capacity > sz ? new_capacity : sz; } + inline int _grow_capacity(int sz) const { int new_capacity = Capacity ? (Capacity + Capacity / 2) : 8; return new_capacity > sz ? new_capacity : sz; } inline void resize(int new_size) { if (new_size > Capacity) reserve(_grow_capacity(new_size)); Size = new_size; } inline void resize(int new_size, const T& v) { if (new_size > Capacity) reserve(_grow_capacity(new_size)); if (new_size > Size) for (int n = Size; n < new_size; n++) memcpy(&Data[n], &v, sizeof(v)); Size = new_size; } + inline void shrink(int new_size) { IM_ASSERT(new_size <= Size); Size = new_size; } // Resize a vector to a smaller size, guaranteed not to cause a reallocation inline void reserve(int new_capacity) { if (new_capacity <= Capacity) return; T* new_data = (T*)IM_ALLOC((size_t)new_capacity * sizeof(T)); if (Data) { memcpy(new_data, Data, (size_t)Size * sizeof(T)); IM_FREE(Data); } Data = new_data; Capacity = new_capacity; } + inline void reserve_discard(int new_capacity) { if (new_capacity <= Capacity) return; if (Data) IM_FREE(Data); Data = (T*)IM_ALLOC((size_t)new_capacity * sizeof(T)); Capacity = new_capacity; } // NB: It is illegal to call push_back/push_front/insert with a reference pointing inside the ImVector data itself! e.g. v.push_back(v[10]) is forbidden. inline void push_back(const T& v) { if (Size == Capacity) reserve(_grow_capacity(Size + 1)); memcpy(&Data[Size], &v, sizeof(v)); Size++; } inline void pop_back() { IM_ASSERT(Size > 0); Size--; } inline void push_front(const T& v) { if (Size == 0) push_back(v); else insert(Data, v); } - inline T* erase(const T* it) { IM_ASSERT(it >= Data && it < Data+Size); const ptrdiff_t off = it - Data; memmove(Data + off, Data + off + 1, ((size_t)Size - (size_t)off - 1) * sizeof(T)); Size--; return Data + off; } - inline T* erase(const T* it, const T* it_last){ IM_ASSERT(it >= Data && it < Data+Size && it_last > it && it_last <= Data+Size); const ptrdiff_t count = it_last - it; const ptrdiff_t off = it - Data; memmove(Data + off, Data + off + count, ((size_t)Size - (size_t)off - count) * sizeof(T)); Size -= (int)count; return Data + off; } - inline T* erase_unsorted(const T* it) { IM_ASSERT(it >= Data && it < Data+Size); const ptrdiff_t off = it - Data; if (it < Data+Size-1) memcpy(Data + off, Data + Size - 1, sizeof(T)); Size--; return Data + off; } - inline T* insert(const T* it, const T& v) { IM_ASSERT(it >= Data && it <= Data+Size); const ptrdiff_t off = it - Data; if (Size == Capacity) reserve(_grow_capacity(Size + 1)); if (off < (int)Size) memmove(Data + off + 1, Data + off, ((size_t)Size - (size_t)off) * sizeof(T)); memcpy(&Data[off], &v, sizeof(v)); Size++; return Data + off; } + inline T* erase(const T* it) { IM_ASSERT(it >= Data && it < Data + Size); const ptrdiff_t off = it - Data; memmove(Data + off, Data + off + 1, ((size_t)Size - (size_t)off - 1) * sizeof(T)); Size--; return Data + off; } + inline T* erase(const T* it, const T* it_last){ IM_ASSERT(it >= Data && it < Data + Size && it_last >= it && it_last <= Data + Size); const ptrdiff_t count = it_last - it; const ptrdiff_t off = it - Data; memmove(Data + off, Data + off + count, ((size_t)Size - (size_t)off - (size_t)count) * sizeof(T)); Size -= (int)count; return Data + off; } + inline T* erase_unsorted(const T* it) { IM_ASSERT(it >= Data && it < Data + Size); const ptrdiff_t off = it - Data; if (it < Data + Size - 1) memcpy(Data + off, Data + Size - 1, sizeof(T)); Size--; return Data + off; } + inline T* insert(const T* it, const T& v) { IM_ASSERT(it >= Data && it <= Data + Size); const ptrdiff_t off = it - Data; if (Size == Capacity) reserve(_grow_capacity(Size + 1)); if (off < (int)Size) memmove(Data + off + 1, Data + off, ((size_t)Size - (size_t)off) * sizeof(T)); memcpy(&Data[off], &v, sizeof(v)); Size++; return Data + off; } inline bool contains(const T& v) const { const T* data = Data; const T* data_end = Data + Size; while (data < data_end) if (*data++ == v) return true; return false; } inline T* find(const T& v) { T* data = Data; const T* data_end = Data + Size; while (data < data_end) if (*data == v) break; else ++data; return data; } inline const T* find(const T& v) const { const T* data = Data; const T* data_end = Data + Size; while (data < data_end) if (*data == v) break; else ++data; return data; } + inline int find_index(const T& v) const { const T* data_end = Data + Size; const T* it = find(v); if (it == data_end) return -1; const ptrdiff_t off = it - Data; return (int)off; } inline bool find_erase(const T& v) { const T* it = find(v); if (it < Data + Size) { erase(it); return true; } return false; } inline bool find_erase_unsorted(const T& v) { const T* it = find(v); if (it < Data + Size) { erase_unsorted(it); return true; } return false; } - inline int index_from_ptr(const T* it) const { IM_ASSERT(it >= Data && it <= Data+Size); const ptrdiff_t off = it - Data; return (int)off; } + inline int index_from_ptr(const T* it) const { IM_ASSERT(it >= Data && it < Data + Size); const ptrdiff_t off = it - Data; return (int)off; } }; +IM_MSVC_RUNTIME_CHECKS_RESTORE //----------------------------------------------------------------------------- -// ImGuiStyle +// [SECTION] ImGuiStyle +//----------------------------------------------------------------------------- // You may modify the ImGui::GetStyle() main instance during initialization and before NewFrame(). // During the frame, use ImGui::PushStyleVar(ImGuiStyleVar_XXXX)/PopStyleVar() to alter the main style values, // and ImGui::PushStyleColor(ImGuiCol_XXX)/PopStyleColor() for colors. @@ -1294,10 +2225,12 @@ struct ImVector struct ImGuiStyle { float Alpha; // Global alpha applies to everything in Dear ImGui. + float DisabledAlpha; // Additional alpha multiplier applied by BeginDisabled(). Multiply over current value of Alpha. ImVec2 WindowPadding; // Padding within a window. - float WindowRounding; // Radius of window corners rounding. Set to 0.0f to have rectangular windows. + float WindowRounding; // Radius of window corners rounding. Set to 0.0f to have rectangular windows. Large values tend to lead to variety of artifacts and are not recommended. float WindowBorderSize; // Thickness of border around windows. Generally set to 0.0f or 1.0f. (Other values are not well tested and more CPU/GPU costly). - ImVec2 WindowMinSize; // Minimum window size. This is a global setting. If you want to constraint individual windows, use SetNextWindowSizeConstraints(). + float WindowBorderHoverPadding; // Hit-testing extent outside/inside resizing border. Also extend determination of hovered window. Generally meaningfully larger than WindowBorderSize to make it easy to reach borders. + ImVec2 WindowMinSize; // Minimum window size. This is a global setting. If you want to constrain individual windows, use SetNextWindowSizeConstraints(). ImVec2 WindowTitleAlign; // Alignment for title bar text. Defaults to (0.0f,0.5f) for left-aligned,vertically centered. ImGuiDir WindowMenuButtonPosition; // Side of the collapsing/docking button in the title bar (None/Left/Right). Defaults to ImGuiDir_Left. float ChildRounding; // Radius of child window corners rounding. Set to 0.0f to have rectangular windows. @@ -1309,6 +2242,7 @@ struct ImGuiStyle float FrameBorderSize; // Thickness of border around frames. Generally set to 0.0f or 1.0f. (Other values are not well tested and more CPU/GPU costly). ImVec2 ItemSpacing; // Horizontal and vertical spacing between widgets/lines. ImVec2 ItemInnerSpacing; // Horizontal and vertical spacing between within elements of a composed widget (e.g. a slider and its label). + ImVec2 CellPadding; // Padding within a table cell. Cellpadding.x is locked for entire table. CellPadding.y may be altered between different rows. ImVec2 TouchExtraPadding; // Expand reactive bounding box for touch-based system where touch position is not accurate enough. Unfortunately we don't sort widgets so priority on overlap will always be given to the first widget. So don't grow this too much! float IndentSpacing; // Horizontal indentation when e.g. entering a tree node. Generally == (FontSize + FramePadding.x*2). float ColumnsMinSpacing; // Minimum horizontal spacing between two columns. Preferably > (FramePadding.x + 1). @@ -1316,179 +2250,340 @@ struct ImGuiStyle float ScrollbarRounding; // Radius of grab corners for scrollbar. float GrabMinSize; // Minimum width/height of a grab box for slider/scrollbar. float GrabRounding; // Radius of grabs corners rounding. Set to 0.0f to have rectangular slider grabs. + float LogSliderDeadzone; // The size in pixels of the dead-zone around zero on logarithmic sliders that cross zero. + float ImageBorderSize; // Thickness of border around Image() calls. float TabRounding; // Radius of upper corners of a tab. Set to 0.0f to have rectangular tabs. float TabBorderSize; // Thickness of border around tabs. + float TabCloseButtonMinWidthSelected; // -1: always visible. 0.0f: visible when hovered. >0.0f: visible when hovered if minimum width. + float TabCloseButtonMinWidthUnselected; // -1: always visible. 0.0f: visible when hovered. >0.0f: visible when hovered if minimum width. FLT_MAX: never show close button when unselected. + float TabBarBorderSize; // Thickness of tab-bar separator, which takes on the tab active color to denote focus. + float TabBarOverlineSize; // Thickness of tab-bar overline, which highlights the selected tab-bar. + float TableAngledHeadersAngle; // Angle of angled headers (supported values range from -50.0f degrees to +50.0f degrees). + ImVec2 TableAngledHeadersTextAlign;// Alignment of angled headers within the cell ImGuiDir ColorButtonPosition; // Side of the color button in the ColorEdit4 widget (left/right). Defaults to ImGuiDir_Right. ImVec2 ButtonTextAlign; // Alignment of button text when button is larger than text. Defaults to (0.5f, 0.5f) (centered). - ImVec2 SelectableTextAlign; // Alignment of selectable text when selectable is larger than text. Defaults to (0.0f, 0.0f) (top-left aligned). - ImVec2 DisplayWindowPadding; // Window position are clamped to be visible within the display area by at least this amount. Only applies to regular windows. - ImVec2 DisplaySafeAreaPadding; // If you cannot see the edges of your screen (e.g. on a TV) increase the safe area padding. Apply to popups/tooltips as well regular windows. NB: Prefer configuring your TV sets correctly! - float MouseCursorScale; // Scale software rendered mouse cursor (when io.MouseDrawCursor is enabled). May be removed later. - bool AntiAliasedLines; // Enable anti-aliasing on lines/borders. Disable if you are really tight on CPU/GPU. - bool AntiAliasedFill; // Enable anti-aliasing on filled shapes (rounded rectangles, circles, etc.) + ImVec2 SelectableTextAlign; // Alignment of selectable text. Defaults to (0.0f, 0.0f) (top-left aligned). It's generally important to keep this left-aligned if you want to lay multiple items on a same line. + float SeparatorTextBorderSize; // Thickness of border in SeparatorText() + ImVec2 SeparatorTextAlign; // Alignment of text within the separator. Defaults to (0.0f, 0.5f) (left aligned, center). + ImVec2 SeparatorTextPadding; // Horizontal offset of text from each edge of the separator + spacing on other axis. Generally small values. .y is recommended to be == FramePadding.y. + ImVec2 DisplayWindowPadding; // Apply to regular windows: amount which we enforce to keep visible when moving near edges of your screen. + ImVec2 DisplaySafeAreaPadding; // Apply to every windows, menus, popups, tooltips: amount where we avoid displaying contents. Adjust if you cannot see the edges of your screen (e.g. on a TV where scaling has not been configured). + float DockingSeparatorSize; // Thickness of resizing border between docked windows + float MouseCursorScale; // Scale software rendered mouse cursor (when io.MouseDrawCursor is enabled). We apply per-monitor DPI scaling over this scale. May be removed later. + bool AntiAliasedLines; // Enable anti-aliased lines/borders. Disable if you are really tight on CPU/GPU. Latched at the beginning of the frame (copied to ImDrawList). + bool AntiAliasedLinesUseTex; // Enable anti-aliased lines/borders using textures where possible. Require backend to render with bilinear filtering (NOT point/nearest filtering). Latched at the beginning of the frame (copied to ImDrawList). + bool AntiAliasedFill; // Enable anti-aliased edges around filled shapes (rounded rectangles, circles, etc.). Disable if you are really tight on CPU/GPU. Latched at the beginning of the frame (copied to ImDrawList). float CurveTessellationTol; // Tessellation tolerance when using PathBezierCurveTo() without a specific number of segments. Decrease for highly tessellated curves (higher quality, more polygons), increase to reduce quality. + float CircleTessellationMaxError; // Maximum error (in pixels) allowed when using AddCircle()/AddCircleFilled() or drawing rounded corner rectangles with no explicit segment count specified. Decrease for higher quality but more geometry. + + // Colors ImVec4 Colors[ImGuiCol_COUNT]; + // Behaviors + // (It is possible to modify those fields mid-frame if specific behavior need it, unlike e.g. configuration fields in ImGuiIO) + float HoverStationaryDelay; // Delay for IsItemHovered(ImGuiHoveredFlags_Stationary). Time required to consider mouse stationary. + float HoverDelayShort; // Delay for IsItemHovered(ImGuiHoveredFlags_DelayShort). Usually used along with HoverStationaryDelay. + float HoverDelayNormal; // Delay for IsItemHovered(ImGuiHoveredFlags_DelayNormal). " + ImGuiHoveredFlags HoverFlagsForTooltipMouse;// Default flags when using IsItemHovered(ImGuiHoveredFlags_ForTooltip) or BeginItemTooltip()/SetItemTooltip() while using mouse. + ImGuiHoveredFlags HoverFlagsForTooltipNav; // Default flags when using IsItemHovered(ImGuiHoveredFlags_ForTooltip) or BeginItemTooltip()/SetItemTooltip() while using keyboard/gamepad. + IMGUI_API ImGuiStyle(); IMGUI_API void ScaleAllSizes(float scale_factor); + + // Obsolete names +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + // TabMinWidthForCloseButton = TabCloseButtonMinWidthUnselected // Renamed in 1.91.9. +#endif }; //----------------------------------------------------------------------------- -// ImGuiIO +// [SECTION] ImGuiIO +//----------------------------------------------------------------------------- // Communicate most settings and inputs/outputs to Dear ImGui using this structure. // Access via ImGui::GetIO(). Read 'Programmer guide' section in .cpp file for general usage. +// It is generally expected that: +// - initialization: backends and user code writes to ImGuiIO. +// - main loop: backends writes to ImGuiIO, user code and imgui code reads from ImGuiIO. //----------------------------------------------------------------------------- +// Also see ImGui::GetPlatformIO() and ImGuiPlatformIO struct for OS/platform related functions: clipboard, IME etc. +//----------------------------------------------------------------------------- + +// [Internal] Storage used by IsKeyDown(), IsKeyPressed() etc functions. +// If prior to 1.87 you used io.KeysDownDuration[] (which was marked as internal), you should use GetKeyData(key)->DownDuration and *NOT* io.KeysData[key]->DownDuration. +struct ImGuiKeyData +{ + bool Down; // True for if key is down + float DownDuration; // Duration the key has been down (<0.0f: not pressed, 0.0f: just pressed, >0.0f: time held) + float DownDurationPrev; // Last frame duration the key has been down + float AnalogValue; // 0.0f..1.0f for gamepad values +}; struct ImGuiIO { //------------------------------------------------------------------ - // Configuration (fill once) // Default value + // Configuration // Default value //------------------------------------------------------------------ - ImGuiConfigFlags ConfigFlags; // = 0 // See ImGuiConfigFlags_ enum. Set by user/application. Gamepad/keyboard navigation options, etc. - ImGuiBackendFlags BackendFlags; // = 0 // See ImGuiBackendFlags_ enum. Set by back-end (imgui_impl_xxx files or custom back-end) to communicate features supported by the back-end. - ImVec2 DisplaySize; // // Main display size, in pixels. - float DeltaTime; // = 1.0f/60.0f // Time elapsed since last frame, in seconds. + ImGuiConfigFlags ConfigFlags; // = 0 // See ImGuiConfigFlags_ enum. Set by user/application. Keyboard/Gamepad navigation options, etc. + ImGuiBackendFlags BackendFlags; // = 0 // See ImGuiBackendFlags_ enum. Set by backend (imgui_impl_xxx files or custom backend) to communicate features supported by the backend. + ImVec2 DisplaySize; // // Main display size, in pixels (generally == GetMainViewport()->Size). May change every frame. + float DeltaTime; // = 1.0f/60.0f // Time elapsed since last frame, in seconds. May change every frame. float IniSavingRate; // = 5.0f // Minimum time between saving positions/sizes to .ini file, in seconds. - const char* IniFilename; // = "imgui.ini" // Path to .ini file. Set NULL to disable automatic .ini loading/saving, if e.g. you want to manually load/save from memory. + const char* IniFilename; // = "imgui.ini" // Path to .ini file (important: default "imgui.ini" is relative to current working dir!). Set NULL to disable automatic .ini loading/saving or if you want to manually call LoadIniSettingsXXX() / SaveIniSettingsXXX() functions. const char* LogFilename; // = "imgui_log.txt"// Path to .log file (default parameter to ImGui::LogToFile when no file is specified). - float MouseDoubleClickTime; // = 0.30f // Time for a double-click, in seconds. - float MouseDoubleClickMaxDist; // = 6.0f // Distance threshold to stay in to validate a double-click, in pixels. - float MouseDragThreshold; // = 6.0f // Distance threshold before considering we are dragging. - int KeyMap[ImGuiKey_COUNT]; // // Map of indices into the KeysDown[512] entries array which represent your "native" keyboard state. - float KeyRepeatDelay; // = 0.250f // When holding a key/button, time before it starts repeating, in seconds (for buttons in Repeat mode, etc.). - float KeyRepeatRate; // = 0.050f // When holding a key/button, rate at which it repeats, in seconds. - void* UserData; // = NULL // Store your own data for retrieval by callbacks. + void* UserData; // = NULL // Store your own data. + // Font system ImFontAtlas*Fonts; // // Font atlas: load, rasterize and pack one or more fonts into a single texture. float FontGlobalScale; // = 1.0f // Global scale all fonts - bool FontAllowUserScaling; // = false // Allow user scaling text of individual window with CTRL+Wheel. + bool FontAllowUserScaling; // = false // [OBSOLETE] Allow user scaling text of individual window with CTRL+Wheel. ImFont* FontDefault; // = NULL // Font to use on NewFrame(). Use NULL to uses Fonts->Fonts[0]. ImVec2 DisplayFramebufferScale; // = (1, 1) // For retina display or other situations where window coordinates are different from framebuffer coordinates. This generally ends up in ImDrawData::FramebufferScale. + // Keyboard/Gamepad Navigation options + bool ConfigNavSwapGamepadButtons; // = false // Swap Activate<>Cancel (A<>B) buttons, matching typical "Nintendo/Japanese style" gamepad layout. + bool ConfigNavMoveSetMousePos; // = false // Directional/tabbing navigation teleports the mouse cursor. May be useful on TV/console systems where moving a virtual mouse is difficult. Will update io.MousePos and set io.WantSetMousePos=true. + bool ConfigNavCaptureKeyboard; // = true // Sets io.WantCaptureKeyboard when io.NavActive is set. + bool ConfigNavEscapeClearFocusItem; // = true // Pressing Escape can clear focused item + navigation id/highlight. Set to false if you want to always keep highlight on. + bool ConfigNavEscapeClearFocusWindow;// = false // Pressing Escape can clear focused window as well (super set of io.ConfigNavEscapeClearFocusItem). + bool ConfigNavCursorVisibleAuto; // = true // Using directional navigation key makes the cursor visible. Mouse click hides the cursor. + bool ConfigNavCursorVisibleAlways; // = false // Navigation cursor is always visible. + + // Docking options (when ImGuiConfigFlags_DockingEnable is set) + bool ConfigDockingNoSplit; // = false // Simplified docking mode: disable window splitting, so docking is limited to merging multiple windows together into tab-bars. + bool ConfigDockingWithShift; // = false // Enable docking with holding Shift key (reduce visual noise, allows dropping in wider space) + bool ConfigDockingAlwaysTabBar; // = false // [BETA] [FIXME: This currently creates regression with auto-sizing and general overhead] Make every single floating window display within a docking node. + bool ConfigDockingTransparentPayload;// = false // [BETA] Make window or viewport transparent when docking and only display docking boxes on the target viewport. Useful if rendering of multiple viewport cannot be synced. Best used with ConfigViewportsNoAutoMerge. + + // Viewport options (when ImGuiConfigFlags_ViewportsEnable is set) + bool ConfigViewportsNoAutoMerge; // = false; // Set to make all floating imgui windows always create their own viewport. Otherwise, they are merged into the main host viewports when overlapping it. May also set ImGuiViewportFlags_NoAutoMerge on individual viewport. + bool ConfigViewportsNoTaskBarIcon; // = false // Disable default OS task bar icon flag for secondary viewports. When a viewport doesn't want a task bar icon, ImGuiViewportFlags_NoTaskBarIcon will be set on it. + bool ConfigViewportsNoDecoration; // = true // Disable default OS window decoration flag for secondary viewports. When a viewport doesn't want window decorations, ImGuiViewportFlags_NoDecoration will be set on it. Enabling decoration can create subsequent issues at OS levels (e.g. minimum window size). + bool ConfigViewportsNoDefaultParent; // = false // Disable default OS parenting to main viewport for secondary viewports. By default, viewports are marked with ParentViewportId = , expecting the platform backend to setup a parent/child relationship between the OS windows (some backend may ignore this). Set to true if you want the default to be 0, then all viewports will be top-level OS windows. + // Miscellaneous options - bool MouseDrawCursor; // = false // Request ImGui to draw a mouse cursor for you (if you are on a platform without a mouse cursor). Cannot be easily renamed to 'io.ConfigXXX' because this is frequently used by back-end implementations. - bool ConfigMacOSXBehaviors; // = defined(__APPLE__) // OS X style: Text editing cursor movement using Alt instead of Ctrl, Shortcuts using Cmd/Super instead of Ctrl, Line/Text Start and End using Cmd+Arrows instead of Home/End, Double click selects by word instead of selecting whole text, Multi-selection in lists uses Cmd/Super instead of Ctrl (was called io.OptMacOSXBehaviors prior to 1.63) - bool ConfigInputTextCursorBlink; // = true // Set to false to disable blinking cursor, for users who consider it distracting. (was called: io.OptCursorBlink prior to 1.63) - bool ConfigWindowsResizeFromEdges; // = true // Enable resizing of windows from their edges and from the lower-left corner. This requires (io.BackendFlags & ImGuiBackendFlags_HasMouseCursors) because it needs mouse cursor feedback. (This used to be a per-window ImGuiWindowFlags_ResizeFromAnySide flag) - bool ConfigWindowsMoveFromTitleBarOnly; // = false // [BETA] Set to true to only allow moving windows when clicked+dragged from the title bar. Windows without a title bar are not affected. - float ConfigWindowsMemoryCompactTimer;// = 60.0f // [BETA] Compact window memory usage when unused. Set to -1.0f to disable. + // (you can visualize and interact with all options in 'Demo->Configuration') + bool MouseDrawCursor; // = false // Request ImGui to draw a mouse cursor for you (if you are on a platform without a mouse cursor). Cannot be easily renamed to 'io.ConfigXXX' because this is frequently used by backend implementations. + bool ConfigMacOSXBehaviors; // = defined(__APPLE__) // Swap Cmd<>Ctrl keys + OS X style text editing cursor movement using Alt instead of Ctrl, Shortcuts using Cmd/Super instead of Ctrl, Line/Text Start and End using Cmd+Arrows instead of Home/End, Double click selects by word instead of selecting whole text, Multi-selection in lists uses Cmd/Super instead of Ctrl. + bool ConfigInputTrickleEventQueue; // = true // Enable input queue trickling: some types of events submitted during the same frame (e.g. button down + up) will be spread over multiple frames, improving interactions with low framerates. + bool ConfigInputTextCursorBlink; // = true // Enable blinking cursor (optional as some users consider it to be distracting). + bool ConfigInputTextEnterKeepActive; // = false // [BETA] Pressing Enter will keep item active and select contents (single-line only). + bool ConfigDragClickToInputText; // = false // [BETA] Enable turning DragXXX widgets into text input with a simple mouse click-release (without moving). Not desirable on devices without a keyboard. + bool ConfigWindowsResizeFromEdges; // = true // Enable resizing of windows from their edges and from the lower-left corner. This requires ImGuiBackendFlags_HasMouseCursors for better mouse cursor feedback. (This used to be a per-window ImGuiWindowFlags_ResizeFromAnySide flag) + bool ConfigWindowsMoveFromTitleBarOnly; // = false // Enable allowing to move windows only when clicking on their title bar. Does not apply to windows without a title bar. + bool ConfigWindowsCopyContentsWithCtrlC; // = false // [EXPERIMENTAL] CTRL+C copy the contents of focused window into the clipboard. Experimental because: (1) has known issues with nested Begin/End pairs (2) text output quality varies (3) text output is in submission order rather than spatial order. + bool ConfigScrollbarScrollByPage; // = true // Enable scrolling page by page when clicking outside the scrollbar grab. When disabled, always scroll to clicked location. When enabled, Shift+Click scrolls to clicked location. + float ConfigMemoryCompactTimer; // = 60.0f // Timer (in seconds) to free transient windows/tables memory buffers when unused. Set to -1.0f to disable. + + // Inputs Behaviors + // (other variables, ones which are expected to be tweaked within UI code, are exposed in ImGuiStyle) + float MouseDoubleClickTime; // = 0.30f // Time for a double-click, in seconds. + float MouseDoubleClickMaxDist; // = 6.0f // Distance threshold to stay in to validate a double-click, in pixels. + float MouseDragThreshold; // = 6.0f // Distance threshold before considering we are dragging. + float KeyRepeatDelay; // = 0.275f // When holding a key/button, time before it starts repeating, in seconds (for buttons in Repeat mode, etc.). + float KeyRepeatRate; // = 0.050f // When holding a key/button, rate at which it repeats, in seconds. //------------------------------------------------------------------ - // Platform Functions - // (the imgui_impl_xxxx back-end files are setting those up for you) + // Debug options //------------------------------------------------------------------ - // Optional: Platform/Renderer back-end name (informational only! will be displayed in About Window) + User data for back-end/wrappers to store their own stuff. + // Options to configure Error Handling and how we handle recoverable errors [EXPERIMENTAL] + // - Error recovery is provided as a way to facilitate: + // - Recovery after a programming error (native code or scripting language - the later tends to facilitate iterating on code while running). + // - Recovery after running an exception handler or any error processing which may skip code after an error has been detected. + // - Error recovery is not perfect nor guaranteed! It is a feature to ease development. + // You not are not supposed to rely on it in the course of a normal application run. + // - Functions that support error recovery are using IM_ASSERT_USER_ERROR() instead of IM_ASSERT(). + // - By design, we do NOT allow error recovery to be 100% silent. One of the three options needs to be checked! + // - Always ensure that on programmers seats you have at minimum Asserts or Tooltips enabled when making direct imgui API calls! + // Otherwise it would severely hinder your ability to catch and correct mistakes! + // Read https://github.com/ocornut/imgui/wiki/Error-Handling for details. + // - Programmer seats: keep asserts (default), or disable asserts and keep error tooltips (new and nice!) + // - Non-programmer seats: maybe disable asserts, but make sure errors are resurfaced (tooltips, visible log entries, use callback etc.) + // - Recovery after error/exception: record stack sizes with ErrorRecoveryStoreState(), disable assert, set log callback (to e.g. trigger high-level breakpoint), recover with ErrorRecoveryTryToRecoverState(), restore settings. + bool ConfigErrorRecovery; // = true // Enable error recovery support. Some errors won't be detected and lead to direct crashes if recovery is disabled. + bool ConfigErrorRecoveryEnableAssert; // = true // Enable asserts on recoverable error. By default call IM_ASSERT() when returning from a failing IM_ASSERT_USER_ERROR() + bool ConfigErrorRecoveryEnableDebugLog; // = true // Enable debug log output on recoverable errors. + bool ConfigErrorRecoveryEnableTooltip; // = true // Enable tooltip on recoverable errors. The tooltip include a way to enable asserts if they were disabled. + + // Option to enable various debug tools showing buttons that will call the IM_DEBUG_BREAK() macro. + // - The Item Picker tool will be available regardless of this being enabled, in order to maximize its discoverability. + // - Requires a debugger being attached, otherwise IM_DEBUG_BREAK() options will appear to crash your application. + // e.g. io.ConfigDebugIsDebuggerPresent = ::IsDebuggerPresent() on Win32, or refer to ImOsIsDebuggerPresent() imgui_test_engine/imgui_te_utils.cpp for a Unix compatible version). + bool ConfigDebugIsDebuggerPresent; // = false // Enable various tools calling IM_DEBUG_BREAK(). + + // Tools to detect code submitting items with conflicting/duplicate IDs + // - Code should use PushID()/PopID() in loops, or append "##xx" to same-label identifiers. + // - Empty label e.g. Button("") == same ID as parent widget/node. Use Button("##xx") instead! + // - See FAQ https://github.com/ocornut/imgui/blob/master/docs/FAQ.md#q-about-the-id-stack-system + bool ConfigDebugHighlightIdConflicts;// = true // Highlight and show an error message popup when multiple items have conflicting identifiers. + bool ConfigDebugHighlightIdConflictsShowItemPicker;//=true // Show "Item Picker" button in aforementioned popup. + + // Tools to test correct Begin/End and BeginChild/EndChild behaviors. + // - Presently Begin()/End() and BeginChild()/EndChild() needs to ALWAYS be called in tandem, regardless of return value of BeginXXX() + // - This is inconsistent with other BeginXXX functions and create confusion for many users. + // - We expect to update the API eventually. In the meanwhile we provide tools to facilitate checking user-code behavior. + bool ConfigDebugBeginReturnValueOnce;// = false // First-time calls to Begin()/BeginChild() will return false. NEEDS TO BE SET AT APPLICATION BOOT TIME if you don't want to miss windows. + bool ConfigDebugBeginReturnValueLoop;// = false // Some calls to Begin()/BeginChild() will return false. Will cycle through window depths then repeat. Suggested use: add "io.ConfigDebugBeginReturnValue = io.KeyShift" in your main loop then occasionally press SHIFT. Windows should be flickering while running. + + // Option to deactivate io.AddFocusEvent(false) handling. + // - May facilitate interactions with a debugger when focus loss leads to clearing inputs data. + // - Backends may have other side-effects on focus loss, so this will reduce side-effects but not necessary remove all of them. + bool ConfigDebugIgnoreFocusLoss; // = false // Ignore io.AddFocusEvent(false), consequently not calling io.ClearInputKeys()/io.ClearInputMouse() in input processing. + + // Option to audit .ini data + bool ConfigDebugIniSettings; // = false // Save .ini data with extra comments (particularly helpful for Docking, but makes saving slower) + + //------------------------------------------------------------------ + // Platform Identifiers + // (the imgui_impl_xxxx backend files are setting those up for you) + //------------------------------------------------------------------ + + // Nowadays those would be stored in ImGuiPlatformIO but we are leaving them here for legacy reasons. + // Optional: Platform/Renderer backend name (informational only! will be displayed in About Window) + User data for backend/wrappers to store their own stuff. const char* BackendPlatformName; // = NULL const char* BackendRendererName; // = NULL - void* BackendPlatformUserData; // = NULL - void* BackendRendererUserData; // = NULL - void* BackendLanguageUserData; // = NULL + void* BackendPlatformUserData; // = NULL // User data for platform backend + void* BackendRendererUserData; // = NULL // User data for renderer backend + void* BackendLanguageUserData; // = NULL // User data for non C++ programming language backend - // Optional: Access OS clipboard - // (default to use native Win32 clipboard on Windows, otherwise uses a private clipboard. Override to access OS clipboard on other architectures) - const char* (*GetClipboardTextFn)(void* user_data); - void (*SetClipboardTextFn)(void* user_data, const char* text); - void* ClipboardUserData; + //------------------------------------------------------------------ + // Input - Call before calling NewFrame() + //------------------------------------------------------------------ - // Optional: Notify OS Input Method Editor of the screen position of your cursor for text input position (e.g. when using Japanese/Chinese IME on Windows) - // (default to use native imm32 api on Windows) - void (*ImeSetInputScreenPosFn)(int x, int y); - void* ImeWindowHandle; // = NULL // (Windows) Set this to your HWND to get automatic IME cursor positioning. + // Input Functions + IMGUI_API void AddKeyEvent(ImGuiKey key, bool down); // Queue a new key down/up event. Key should be "translated" (as in, generally ImGuiKey_A matches the key end-user would use to emit an 'A' character) + IMGUI_API void AddKeyAnalogEvent(ImGuiKey key, bool down, float v); // Queue a new key down/up event for analog values (e.g. ImGuiKey_Gamepad_ values). Dead-zones should be handled by the backend. + IMGUI_API void AddMousePosEvent(float x, float y); // Queue a mouse position update. Use -FLT_MAX,-FLT_MAX to signify no mouse (e.g. app not focused and not hovered) + IMGUI_API void AddMouseButtonEvent(int button, bool down); // Queue a mouse button change + IMGUI_API void AddMouseWheelEvent(float wheel_x, float wheel_y); // Queue a mouse wheel update. wheel_y<0: scroll down, wheel_y>0: scroll up, wheel_x<0: scroll right, wheel_x>0: scroll left. + IMGUI_API void AddMouseSourceEvent(ImGuiMouseSource source); // Queue a mouse source change (Mouse/TouchScreen/Pen) + IMGUI_API void AddMouseViewportEvent(ImGuiID id); // Queue a mouse hovered viewport. Requires backend to set ImGuiBackendFlags_HasMouseHoveredViewport to call this (for multi-viewport support). + IMGUI_API void AddFocusEvent(bool focused); // Queue a gain/loss of focus for the application (generally based on OS/platform focus of your window) + IMGUI_API void AddInputCharacter(unsigned int c); // Queue a new character input + IMGUI_API void AddInputCharacterUTF16(ImWchar16 c); // Queue a new character input from a UTF-16 character, it can be a surrogate + IMGUI_API void AddInputCharactersUTF8(const char* str); // Queue a new characters input from a UTF-8 string + IMGUI_API void SetKeyEventNativeData(ImGuiKey key, int native_keycode, int native_scancode, int native_legacy_index = -1); // [Optional] Specify index for legacy <1.87 IsKeyXXX() functions with native indices + specify native keycode, scancode. + IMGUI_API void SetAppAcceptingEvents(bool accepting_events); // Set master flag for accepting key/mouse/text events (default to true). Useful if you have native dialog boxes that are interrupting your application loop/refresh, and you want to disable events being queued while your app is frozen. + IMGUI_API void ClearEventsQueue(); // Clear all incoming events. + IMGUI_API void ClearInputKeys(); // Clear current keyboard/gamepad state + current frame text input buffer. Equivalent to releasing all keys/buttons. + IMGUI_API void ClearInputMouse(); // Clear current mouse state. #ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS - // [OBSOLETE since 1.60+] Rendering function, will be automatically called in Render(). Please call your rendering function yourself now! - // You can obtain the ImDrawData* by calling ImGui::GetDrawData() after Render(). See example applications if you are unsure of how to implement this. - void (*RenderDrawListsFn)(ImDrawData* data); -#else - // This is only here to keep ImGuiIO the same size/layout, so that IMGUI_DISABLE_OBSOLETE_FUNCTIONS can exceptionally be used outside of imconfig.h. - void* RenderDrawListsFnUnused; + IMGUI_API void ClearInputCharacters(); // [Obsoleted in 1.89.8] Clear the current frame text input buffer. Now included within ClearInputKeys(). #endif //------------------------------------------------------------------ - // Input - Fill before calling NewFrame() + // Output - Updated by NewFrame() or EndFrame()/Render() + // (when reading from the io.WantCaptureMouse, io.WantCaptureKeyboard flags to dispatch your inputs, it is + // generally easier and more correct to use their state BEFORE calling NewFrame(). See FAQ for details!) //------------------------------------------------------------------ - ImVec2 MousePos; // Mouse position, in pixels. Set to ImVec2(-FLT_MAX,-FLT_MAX) if mouse is unavailable (on another screen, etc.) - bool MouseDown[5]; // Mouse buttons: 0=left, 1=right, 2=middle + extras. ImGui itself mostly only uses left button (BeginPopupContext** are using right button). Others buttons allows us to track if the mouse is being used by your application + available to user as a convenience via IsMouse** API. - float MouseWheel; // Mouse wheel Vertical: 1 unit scrolls about 5 lines text. - float MouseWheelH; // Mouse wheel Horizontal. Most users don't have a mouse with an horizontal wheel, may not be filled by all back-ends. - bool KeyCtrl; // Keyboard modifier pressed: Control - bool KeyShift; // Keyboard modifier pressed: Shift - bool KeyAlt; // Keyboard modifier pressed: Alt - bool KeySuper; // Keyboard modifier pressed: Cmd/Super/Windows - bool KeysDown[512]; // Keyboard keys that are pressed (ideally left in the "native" order your engine has access to keyboard keys, so you can use your own defines/enums for keys). - float NavInputs[ImGuiNavInput_COUNT]; // Gamepad inputs. Cleared back to zero by EndFrame(). Keyboard keys will be auto-mapped and be written here by NewFrame(). - - // Functions - IMGUI_API void AddInputCharacter(unsigned int c); // Queue new character input - IMGUI_API void AddInputCharactersUTF8(const char* str); // Queue new characters input from an UTF-8 string - IMGUI_API void ClearInputCharacters(); // Clear the text input buffer manually + bool WantCaptureMouse; // Set when Dear ImGui will use mouse inputs, in this case do not dispatch them to your main game/application (either way, always pass on mouse inputs to imgui). (e.g. unclicked mouse is hovering over an imgui window, widget is active, mouse was clicked over an imgui window, etc.). + bool WantCaptureKeyboard; // Set when Dear ImGui will use keyboard inputs, in this case do not dispatch them to your main game/application (either way, always pass keyboard inputs to imgui). (e.g. InputText active, or an imgui window is focused and navigation is enabled, etc.). + bool WantTextInput; // Mobile/console: when set, you may display an on-screen keyboard. This is set by Dear ImGui when it wants textual keyboard input to happen (e.g. when a InputText widget is active). + bool WantSetMousePos; // MousePos has been altered, backend should reposition mouse on next frame. Rarely used! Set only when io.ConfigNavMoveSetMousePos is enabled. + bool WantSaveIniSettings; // When manual .ini load/save is active (io.IniFilename == NULL), this will be set to notify your application that you can call SaveIniSettingsToMemory() and save yourself. Important: clear io.WantSaveIniSettings yourself after saving! + bool NavActive; // Keyboard/Gamepad navigation is currently allowed (will handle ImGuiKey_NavXXX events) = a window is focused and it doesn't use the ImGuiWindowFlags_NoNavInputs flag. + bool NavVisible; // Keyboard/Gamepad navigation highlight is visible and allowed (will handle ImGuiKey_NavXXX events). + float Framerate; // Estimate of application framerate (rolling average over 60 frames, based on io.DeltaTime), in frame per second. Solely for convenience. Slow applications may not want to use a moving average or may want to reset underlying buffers occasionally. + int MetricsRenderVertices; // Vertices output during last call to Render() + int MetricsRenderIndices; // Indices output during last call to Render() = number of triangles * 3 + int MetricsRenderWindows; // Number of visible windows + int MetricsActiveWindows; // Number of active windows + ImVec2 MouseDelta; // Mouse delta. Note that this is zero if either current or previous position are invalid (-FLT_MAX,-FLT_MAX), so a disappearing/reappearing mouse won't have a huge delta. //------------------------------------------------------------------ - // Output - Retrieve after calling NewFrame() + // [Internal] Dear ImGui will maintain those fields. Forward compatibility not guaranteed! //------------------------------------------------------------------ - bool WantCaptureMouse; // When io.WantCaptureMouse is true, imgui will use the mouse inputs, do not dispatch them to your main game/application (in both cases, always pass on mouse inputs to imgui). (e.g. unclicked mouse is hovering over an imgui window, widget is active, mouse was clicked over an imgui window, etc.). - bool WantCaptureKeyboard; // When io.WantCaptureKeyboard is true, imgui will use the keyboard inputs, do not dispatch them to your main game/application (in both cases, always pass keyboard inputs to imgui). (e.g. InputText active, or an imgui window is focused and navigation is enabled, etc.). - bool WantTextInput; // Mobile/console: when io.WantTextInput is true, you may display an on-screen keyboard. This is set by ImGui when it wants textual keyboard input to happen (e.g. when a InputText widget is active). - bool WantSetMousePos; // MousePos has been altered, back-end should reposition mouse on next frame. Set only when ImGuiConfigFlags_NavEnableSetMousePos flag is enabled. - bool WantSaveIniSettings; // When manual .ini load/save is active (io.IniFilename == NULL), this will be set to notify your application that you can call SaveIniSettingsToMemory() and save yourself. IMPORTANT: You need to clear io.WantSaveIniSettings yourself. - bool NavActive; // Directional navigation is currently allowed (will handle ImGuiKey_NavXXX events) = a window is focused and it doesn't use the ImGuiWindowFlags_NoNavInputs flag. - bool NavVisible; // Directional navigation is visible and allowed (will handle ImGuiKey_NavXXX events). - float Framerate; // Application framerate estimation, in frame per second. Solely for convenience. Rolling average estimation based on IO.DeltaTime over 120 frames - int MetricsRenderVertices; // Vertices output during last call to Render() - int MetricsRenderIndices; // Indices output during last call to Render() = number of triangles * 3 - int MetricsRenderWindows; // Number of visible windows - int MetricsActiveWindows; // Number of active windows - int MetricsActiveAllocations; // Number of active allocations, updated by MemAlloc/MemFree based on current context. May be off if you have multiple imgui contexts. - ImVec2 MouseDelta; // Mouse delta. Note that this is zero if either current or previous position are invalid (-FLT_MAX,-FLT_MAX), so a disappearing/reappearing mouse won't have a huge delta. + ImGuiContext* Ctx; // Parent UI context (needs to be set explicitly by parent). - //------------------------------------------------------------------ - // [Internal] ImGui will maintain those fields. Forward compatibility not guaranteed! - //------------------------------------------------------------------ + // Main Input State + // (this block used to be written by backend, since 1.87 it is best to NOT write to those directly, call the AddXXX functions above instead) + // (reading from those variables is fair game, as they are extremely unlikely to be moving anywhere) + ImVec2 MousePos; // Mouse position, in pixels. Set to ImVec2(-FLT_MAX, -FLT_MAX) if mouse is unavailable (on another screen, etc.) + bool MouseDown[5]; // Mouse buttons: 0=left, 1=right, 2=middle + extras (ImGuiMouseButton_COUNT == 5). Dear ImGui mostly uses left and right buttons. Other buttons allow us to track if the mouse is being used by your application + available to user as a convenience via IsMouse** API. + float MouseWheel; // Mouse wheel Vertical: 1 unit scrolls about 5 lines text. >0 scrolls Up, <0 scrolls Down. Hold SHIFT to turn vertical scroll into horizontal scroll. + float MouseWheelH; // Mouse wheel Horizontal. >0 scrolls Left, <0 scrolls Right. Most users don't have a mouse with a horizontal wheel, may not be filled by all backends. + ImGuiMouseSource MouseSource; // Mouse actual input peripheral (Mouse/TouchScreen/Pen). + ImGuiID MouseHoveredViewport; // (Optional) Modify using io.AddMouseViewportEvent(). With multi-viewports: viewport the OS mouse is hovering. If possible _IGNORING_ viewports with the ImGuiViewportFlags_NoInputs flag is much better (few backends can handle that). Set io.BackendFlags |= ImGuiBackendFlags_HasMouseHoveredViewport if you can provide this info. If you don't imgui will infer the value using the rectangles and last focused time of the viewports it knows about (ignoring other OS windows). + bool KeyCtrl; // Keyboard modifier down: Control + bool KeyShift; // Keyboard modifier down: Shift + bool KeyAlt; // Keyboard modifier down: Alt + bool KeySuper; // Keyboard modifier down: Cmd/Super/Windows - ImVec2 MousePosPrev; // Previous mouse position (note that MouseDelta is not necessary == MousePos-MousePosPrev, in case either position is invalid) - ImVec2 MouseClickedPos[5]; // Position at time of clicking - double MouseClickedTime[5]; // Time of last click (used to figure out double-click) - bool MouseClicked[5]; // Mouse button went from !Down to Down - bool MouseDoubleClicked[5]; // Has mouse button been double-clicked? - bool MouseReleased[5]; // Mouse button went from Down to !Down - bool MouseDownOwned[5]; // Track if button was clicked inside a dear imgui window. We don't request mouse capture from the application if click started outside ImGui bounds. - bool MouseDownWasDoubleClick[5]; // Track if button down was a double-click - float MouseDownDuration[5]; // Duration the mouse button has been down (0.0f == just clicked) - float MouseDownDurationPrev[5]; // Previous time the mouse button has been down - ImVec2 MouseDragMaxDistanceAbs[5]; // Maximum distance, absolute, on each axis, of how much mouse has traveled from the clicking point - float MouseDragMaxDistanceSqr[5]; // Squared maximum distance of how much mouse has traveled from the clicking point - float KeysDownDuration[512]; // Duration the keyboard key has been down (0.0f == just pressed) - float KeysDownDurationPrev[512]; // Previous duration the key has been down - float NavInputsDownDuration[ImGuiNavInput_COUNT]; - float NavInputsDownDurationPrev[ImGuiNavInput_COUNT]; - ImVector InputQueueCharacters; // Queue of _characters_ input (obtained by platform back-end). Fill using AddInputCharacter() helper. + // Other state maintained from data above + IO function calls + ImGuiKeyChord KeyMods; // Key mods flags (any of ImGuiMod_Ctrl/ImGuiMod_Shift/ImGuiMod_Alt/ImGuiMod_Super flags, same as io.KeyCtrl/KeyShift/KeyAlt/KeySuper but merged into flags. Read-only, updated by NewFrame() + ImGuiKeyData KeysData[ImGuiKey_NamedKey_COUNT];// Key state for all known keys. Use IsKeyXXX() functions to access this. + bool WantCaptureMouseUnlessPopupClose; // Alternative to WantCaptureMouse: (WantCaptureMouse == true && WantCaptureMouseUnlessPopupClose == false) when a click over void is expected to close a popup. + ImVec2 MousePosPrev; // Previous mouse position (note that MouseDelta is not necessary == MousePos-MousePosPrev, in case either position is invalid) + ImVec2 MouseClickedPos[5]; // Position at time of clicking + double MouseClickedTime[5]; // Time of last click (used to figure out double-click) + bool MouseClicked[5]; // Mouse button went from !Down to Down (same as MouseClickedCount[x] != 0) + bool MouseDoubleClicked[5]; // Has mouse button been double-clicked? (same as MouseClickedCount[x] == 2) + ImU16 MouseClickedCount[5]; // == 0 (not clicked), == 1 (same as MouseClicked[]), == 2 (double-clicked), == 3 (triple-clicked) etc. when going from !Down to Down + ImU16 MouseClickedLastCount[5]; // Count successive number of clicks. Stays valid after mouse release. Reset after another click is done. + bool MouseReleased[5]; // Mouse button went from Down to !Down + double MouseReleasedTime[5]; // Time of last released (rarely used! but useful to handle delayed single-click when trying to disambiguate them from double-click). + bool MouseDownOwned[5]; // Track if button was clicked inside a dear imgui window or over void blocked by a popup. We don't request mouse capture from the application if click started outside ImGui bounds. + bool MouseDownOwnedUnlessPopupClose[5]; // Track if button was clicked inside a dear imgui window. + bool MouseWheelRequestAxisSwap; // On a non-Mac system, holding SHIFT requests WheelY to perform the equivalent of a WheelX event. On a Mac system this is already enforced by the system. + bool MouseCtrlLeftAsRightClick; // (OSX) Set to true when the current click was a Ctrl+click that spawned a simulated right click + float MouseDownDuration[5]; // Duration the mouse button has been down (0.0f == just clicked) + float MouseDownDurationPrev[5]; // Previous time the mouse button has been down + ImVec2 MouseDragMaxDistanceAbs[5]; // Maximum distance, absolute, on each axis, of how much mouse has traveled from the clicking point + float MouseDragMaxDistanceSqr[5]; // Squared maximum distance of how much mouse has traveled from the clicking point (used for moving thresholds) + float PenPressure; // Touch/Pen pressure (0.0f to 1.0f, should be >0.0f only when MouseDown[0] == true). Helper storage currently unused by Dear ImGui. + bool AppFocusLost; // Only modify via AddFocusEvent() + bool AppAcceptingEvents; // Only modify via SetAppAcceptingEvents() + ImWchar16 InputQueueSurrogate; // For AddInputCharacterUTF16() + ImVector InputQueueCharacters; // Queue of _characters_ input (obtained by platform backend). Fill using AddInputCharacter() helper. + + // Legacy: before 1.87, we required backend to fill io.KeyMap[] (imgui->native map) during initialization and io.KeysDown[] (native indices) every frame. + // This is still temporarily supported as a legacy feature. However the new preferred scheme is for backend to call io.AddKeyEvent(). + // Old (<1.87): ImGui::IsKeyPressed(ImGui::GetIO().KeyMap[ImGuiKey_Space]) --> New (1.87+) ImGui::IsKeyPressed(ImGuiKey_Space) + // Old (<1.87): ImGui::IsKeyPressed(MYPLATFORM_KEY_SPACE) --> New (1.87+) ImGui::IsKeyPressed(ImGuiKey_Space) + // Read https://github.com/ocornut/imgui/issues/4921 for details. + //int KeyMap[ImGuiKey_COUNT]; // [LEGACY] Input: map of indices into the KeysDown[512] entries array which represent your "native" keyboard state. The first 512 are now unused and should be kept zero. Legacy backend will write into KeyMap[] using ImGuiKey_ indices which are always >512. + //bool KeysDown[ImGuiKey_COUNT]; // [LEGACY] Input: Keyboard keys that are pressed (ideally left in the "native" order your engine has access to keyboard keys, so you can use your own defines/enums for keys). This used to be [512] sized. It is now ImGuiKey_COUNT to allow legacy io.KeysDown[GetKeyIndex(...)] to work without an overflow. + //float NavInputs[ImGuiNavInput_COUNT]; // [LEGACY] Since 1.88, NavInputs[] was removed. Backends from 1.60 to 1.86 won't build. Feed gamepad inputs via io.AddKeyEvent() and ImGuiKey_GamepadXXX enums. + //void* ImeWindowHandle; // [Obsoleted in 1.87] Set ImGuiViewport::PlatformHandleRaw instead. Set this to your HWND to get automatic IME cursor positioning. + + // Legacy: before 1.91.1, clipboard functions were stored in ImGuiIO instead of ImGuiPlatformIO. + // As this is will affect all users of custom engines/backends, we are providing proper legacy redirection (will obsolete). +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + const char* (*GetClipboardTextFn)(void* user_data); + void (*SetClipboardTextFn)(void* user_data, const char* text); + void* ClipboardUserData; +#endif IMGUI_API ImGuiIO(); }; //----------------------------------------------------------------------------- -// Misc data structures +// [SECTION] Misc data structures (ImGuiInputTextCallbackData, ImGuiSizeCallbackData, ImGuiPayload) //----------------------------------------------------------------------------- // Shared state of InputText(), passed as an argument to your callback when a ImGuiInputTextFlags_Callback* flag is used. // The callback function should return 0 by default. // Callbacks (follow a flag name and see comments in ImGuiInputTextFlags_ declarations for more details) +// - ImGuiInputTextFlags_CallbackEdit: Callback on buffer edit. Note that InputText() already returns true on edit + you can always use IsItemEdited(). The callback is useful to manipulate the underlying buffer while focus is active. +// - ImGuiInputTextFlags_CallbackAlways: Callback on each iteration // - ImGuiInputTextFlags_CallbackCompletion: Callback on pressing TAB // - ImGuiInputTextFlags_CallbackHistory: Callback on pressing Up/Down arrows -// - ImGuiInputTextFlags_CallbackAlways: Callback on each iteration // - ImGuiInputTextFlags_CallbackCharFilter: Callback on character inputs to replace or discard them. Modify 'EventChar' to replace or discard, or return 1 in callback to discard. // - ImGuiInputTextFlags_CallbackResize: Callback on buffer capacity changes request (beyond 'buf_size' parameter value), allowing the string to grow. struct ImGuiInputTextCallbackData { + ImGuiContext* Ctx; // Parent UI context ImGuiInputTextFlags EventFlag; // One ImGuiInputTextFlags_Callback* // Read-only ImGuiInputTextFlags Flags; // What user passed to InputText() // Read-only void* UserData; // What user passed to InputText() // Read-only // Arguments for the different callback events + // - During Resize callback, Buf will be same as your input buffer. + // - However, during Completion/History/Always callback, Buf always points to our own internal data (it is not the same as your buffer)! Changes to it will be reflected into your own buffer shortly after the callback. // - To modify the text buffer in a callback, prefer using the InsertChars() / DeleteChars() function. InsertChars() will take care of calling the resize callback if necessary. // - If you know your edits are not going to resize the underlying buffer allocation, you may modify the contents of 'Buf[]' directly. You need to update 'BufTextLen' accordingly (0 <= BufTextLen < BufSize) and set 'BufDirty'' to true so InputText can update its internal state. ImWchar EventChar; // Character input // Read-write // [CharFilter] Replace character with another one, or set to zero to drop. return 1 is equivalent to setting EventChar=0; @@ -1506,19 +2601,43 @@ struct ImGuiInputTextCallbackData IMGUI_API ImGuiInputTextCallbackData(); IMGUI_API void DeleteChars(int pos, int bytes_count); IMGUI_API void InsertChars(int pos, const char* text, const char* text_end = NULL); - bool HasSelection() const { return SelectionStart != SelectionEnd; } + void SelectAll() { SelectionStart = 0; SelectionEnd = BufTextLen; } + void ClearSelection() { SelectionStart = SelectionEnd = BufTextLen; } + bool HasSelection() const { return SelectionStart != SelectionEnd; } }; // Resizing callback data to apply custom constraint. As enabled by SetNextWindowSizeConstraints(). Callback is called during the next Begin(). // NB: For basic min/max size constraint on each axis you don't need to use the callback! The SetNextWindowSizeConstraints() parameters are enough. struct ImGuiSizeCallbackData { - void* UserData; // Read-only. What user passed to SetNextWindowSizeConstraints() + void* UserData; // Read-only. What user passed to SetNextWindowSizeConstraints(). Generally store an integer or float in here (need reinterpret_cast<>). ImVec2 Pos; // Read-only. Window position, for reference. ImVec2 CurrentSize; // Read-only. Current window size. ImVec2 DesiredSize; // Read-write. Desired size, based on user's mouse position. Write to this field to restrain resizing. }; +// [ALPHA] Rarely used / very advanced uses only. Use with SetNextWindowClass() and DockSpace() functions. +// Important: the content of this class is still highly WIP and likely to change and be refactored +// before we stabilize Docking features. Please be mindful if using this. +// Provide hints: +// - To the platform backend via altered viewport flags (enable/disable OS decoration, OS task bar icons, etc.) +// - To the platform backend for OS level parent/child relationships of viewport. +// - To the docking system for various options and filtering. +struct ImGuiWindowClass +{ + ImGuiID ClassId; // User data. 0 = Default class (unclassed). Windows of different classes cannot be docked with each others. + ImGuiID ParentViewportId; // Hint for the platform backend. -1: use default. 0: request platform backend to not parent the platform. != 0: request platform backend to create a parent<>child relationship between the platform windows. Not conforming backends are free to e.g. parent every viewport to the main viewport or not. + ImGuiID FocusRouteParentWindowId; // ID of parent window for shortcut focus route evaluation, e.g. Shortcut() call from Parent Window will succeed when this window is focused. + ImGuiViewportFlags ViewportFlagsOverrideSet; // Viewport flags to set when a window of this class owns a viewport. This allows you to enforce OS decoration or task bar icon, override the defaults on a per-window basis. + ImGuiViewportFlags ViewportFlagsOverrideClear; // Viewport flags to clear when a window of this class owns a viewport. This allows you to enforce OS decoration or task bar icon, override the defaults on a per-window basis. + ImGuiTabItemFlags TabItemFlagsOverrideSet; // [EXPERIMENTAL] TabItem flags to set when a window of this class gets submitted into a dock node tab bar. May use with ImGuiTabItemFlags_Leading or ImGuiTabItemFlags_Trailing. + ImGuiDockNodeFlags DockNodeFlagsOverrideSet; // [EXPERIMENTAL] Dock node flags to set when a window of this class is hosted by a dock node (it doesn't have to be selected!) + bool DockingAlwaysTabBar; // Set to true to enforce single floating windows of this class always having their own docking node (equivalent of setting the global io.ConfigDockingAlwaysTabBar) + bool DockingAllowUnclassed; // Set to true to allow windows of this class to be docked/merged with an unclassed window. // FIXME-DOCK: Move to DockNodeFlags override? + + ImGuiWindowClass() { memset(this, 0, sizeof(*this)); ParentViewportId = (ImGuiID)-1; DockingAllowUnclassed = true; } +}; + // Data payload for Drag and Drop operations: AcceptDragDropPayload(), GetDragDropPayload() struct ImGuiPayload { @@ -1530,7 +2649,7 @@ struct ImGuiPayload ImGuiID SourceId; // Source item id ImGuiID SourceParentId; // Source parent id (if available) int DataFrameCount; // Data timestamp - char DataType[32+1]; // Data type tag (short user-supplied string, 32 characters max) + char DataType[32 + 1]; // Data type tag (short user-supplied string, 32 characters max) bool Preview; // Set when AcceptDragDropPayload() was called and mouse has been hovering the target item (nb: handle overlapping drag targets) bool Delivery; // Set when AcceptDragDropPayload() was called and mouse button is released over the target item. @@ -1542,55 +2661,18 @@ struct ImGuiPayload }; //----------------------------------------------------------------------------- -// Obsolete functions (Will be removed! Read 'API BREAKING CHANGES' section in imgui.cpp for details) -// Please keep your copy of dear imgui up to date! Occasionally set '#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS' in imconfig.h to stay ahead. +// [SECTION] Helpers (ImGuiOnceUponAFrame, ImGuiTextFilter, ImGuiTextBuffer, ImGuiStorage, ImGuiListClipper, Math Operators, ImColor) //----------------------------------------------------------------------------- -#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS -namespace ImGui -{ - // OBSOLETED in 1.72 (from July 2019) - static inline void TreeAdvanceToLabelPos() { SetCursorPosX(GetCursorPosX() + GetTreeNodeToLabelSpacing()); } - // OBSOLETED in 1.71 (from June 2019) - static inline void SetNextTreeNodeOpen(bool open, ImGuiCond cond = 0) { SetNextItemOpen(open, cond); } - // OBSOLETED in 1.70 (from May 2019) - static inline float GetContentRegionAvailWidth() { return GetContentRegionAvail().x; } - // OBSOLETED in 1.69 (from Mar 2019) - static inline ImDrawList* GetOverlayDrawList() { return GetForegroundDrawList(); } - // OBSOLETED in 1.66 (from Sep 2018) - static inline void SetScrollHere(float center_ratio=0.5f){ SetScrollHereY(center_ratio); } - // OBSOLETED in 1.63 (between Aug 2018 and Sept 2018) - static inline bool IsItemDeactivatedAfterChange() { return IsItemDeactivatedAfterEdit(); } - // OBSOLETED in 1.61 (between Apr 2018 and Aug 2018) - IMGUI_API bool InputFloat(const char* label, float* v, float step, float step_fast, int decimal_precision, ImGuiInputTextFlags flags = 0); // Use the 'const char* format' version instead of 'decimal_precision'! - IMGUI_API bool InputFloat2(const char* label, float v[2], int decimal_precision, ImGuiInputTextFlags flags = 0); - IMGUI_API bool InputFloat3(const char* label, float v[3], int decimal_precision, ImGuiInputTextFlags flags = 0); - IMGUI_API bool InputFloat4(const char* label, float v[4], int decimal_precision, ImGuiInputTextFlags flags = 0); - // OBSOLETED in 1.60 (between Dec 2017 and Apr 2018) - static inline bool IsAnyWindowFocused() { return IsWindowFocused(ImGuiFocusedFlags_AnyWindow); } - static inline bool IsAnyWindowHovered() { return IsWindowHovered(ImGuiHoveredFlags_AnyWindow); } - static inline ImVec2 CalcItemRectClosestPoint(const ImVec2& pos, bool on_edge = false, float outward = 0.f) { IM_UNUSED(on_edge); IM_UNUSED(outward); IM_ASSERT(0); return pos; } - // OBSOLETED in 1.53 (between Oct 2017 and Dec 2017) - static inline void ShowTestWindow() { return ShowDemoWindow(); } - static inline bool IsRootWindowFocused() { return IsWindowFocused(ImGuiFocusedFlags_RootWindow); } - static inline bool IsRootWindowOrAnyChildFocused() { return IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows); } - static inline void SetNextWindowContentWidth(float w) { SetNextWindowContentSize(ImVec2(w, 0.0f)); } - static inline float GetItemsLineHeightWithSpacing() { return GetFrameHeightWithSpacing(); } - // OBSOLETED in 1.52 (between Aug 2017 and Oct 2017) - IMGUI_API bool Begin(const char* name, bool* p_open, const ImVec2& size_on_first_use, float bg_alpha_override = -1.0f, ImGuiWindowFlags flags = 0); // Use SetNextWindowSize(size, ImGuiCond_FirstUseEver) + SetNextWindowBgAlpha() instead. - static inline bool IsRootWindowOrAnyChildHovered() { return IsWindowHovered(ImGuiHoveredFlags_RootAndChildWindows); } - static inline void AlignFirstTextHeightToWidgets() { AlignTextToFramePadding(); } - static inline void SetNextWindowPosCenter(ImGuiCond c=0) { ImGuiIO& io = GetIO(); SetNextWindowPos(ImVec2(io.DisplaySize.x * 0.5f, io.DisplaySize.y * 0.5f), c, ImVec2(0.5f, 0.5f)); } -} -typedef ImGuiInputTextCallback ImGuiTextEditCallback; // OBSOLETED in 1.63 (from Aug 2018): made the names consistent -typedef ImGuiInputTextCallbackData ImGuiTextEditCallbackData; +// Helper: Unicode defines +#define IM_UNICODE_CODEPOINT_INVALID 0xFFFD // Invalid Unicode code point (standard value). +#ifdef IMGUI_USE_WCHAR32 +#define IM_UNICODE_CODEPOINT_MAX 0x10FFFF // Maximum Unicode code point supported by this build. +#else +#define IM_UNICODE_CODEPOINT_MAX 0xFFFF // Maximum Unicode code point supported by this build. #endif -//----------------------------------------------------------------------------- -// Helpers -//----------------------------------------------------------------------------- - -// Helper: Execute a block of code at maximum once a frame. Convenient if you want to quickly create an UI within deep-nested code that runs multiple times every frame. +// Helper: Execute a block of code at maximum once a frame. Convenient if you want to quickly create a UI within deep-nested code that runs multiple times every frame. // Usage: static ImGuiOnceUponAFrame oaf; if (oaf) ImGui::Text("This will be called only once per frame"); struct ImGuiOnceUponAFrame { @@ -1633,12 +2715,13 @@ struct ImGuiTextBuffer IMGUI_API static char EmptyString[1]; ImGuiTextBuffer() { } - inline char operator[](int i) { IM_ASSERT(Buf.Data != NULL); return Buf.Data[i]; } + inline char operator[](int i) const { IM_ASSERT(Buf.Data != NULL); return Buf.Data[i]; } const char* begin() const { return Buf.Data ? &Buf.front() : EmptyString; } - const char* end() const { return Buf.Data ? &Buf.back() : EmptyString; } // Buf is zero-terminated, so end() will point on the zero-terminator + const char* end() const { return Buf.Data ? &Buf.back() : EmptyString; } // Buf is zero-terminated, so end() will point on the zero-terminator int size() const { return Buf.Size ? Buf.Size - 1 : 0; } - bool empty() { return Buf.Size <= 1; } + bool empty() const { return Buf.Size <= 1; } void clear() { Buf.clear(); } + void resize(int size) { if (Buf.Size > size) Buf.Data[size] = 0; Buf.resize(size ? size + 1 : 0, 0); } // Similar to resize(0) on ImVector: empty string but don't free buffer. void reserve(int capacity) { Buf.reserve(capacity); } const char* c_str() const { return Buf.Data ? Buf.Data : EmptyString; } IMGUI_API void append(const char* str, const char* str_end = NULL); @@ -1646,6 +2729,16 @@ struct ImGuiTextBuffer IMGUI_API void appendfv(const char* fmt, va_list args) IM_FMTLIST(2); }; +// [Internal] Key+Value for ImGuiStorage +struct ImGuiStoragePair +{ + ImGuiID key; + union { int val_i; float val_f; void* val_p; }; + ImGuiStoragePair(ImGuiID _key, int _val) { key = _key; val_i = _val; } + ImGuiStoragePair(ImGuiID _key, float _val) { key = _key; val_f = _val; } + ImGuiStoragePair(ImGuiID _key, void* _val) { key = _key; val_p = _val; } +}; + // Helper: Key->Value storage // Typically you don't have to worry about this since a storage is held within each Window. // We use it to e.g. store collapse state for a tree (Int 0/1) @@ -1657,15 +2750,6 @@ struct ImGuiTextBuffer struct ImGuiStorage { // [Internal] - struct ImGuiStoragePair - { - ImGuiID key; - union { int val_i; float val_f; void* val_p; }; - ImGuiStoragePair(ImGuiID _key, int _val_i) { key = _key; val_i = _val_i; } - ImGuiStoragePair(ImGuiID _key, float _val_f) { key = _key; val_f = _val_f; } - ImGuiStoragePair(ImGuiID _key, void* _val_p) { key = _key; val_p = _val_p; } - }; - ImVector Data; // - Get***() functions find pair, never add/allocate. Pairs are sorted so a query is O(log N) @@ -1690,44 +2774,107 @@ struct ImGuiStorage IMGUI_API float* GetFloatRef(ImGuiID key, float default_val = 0.0f); IMGUI_API void** GetVoidPtrRef(ImGuiID key, void* default_val = NULL); - // Use on your own storage if you know only integer are being stored (open/close all tree nodes) + // Advanced: for quicker full rebuild of a storage (instead of an incremental one), you may add all your contents and then sort once. + IMGUI_API void BuildSortByKey(); + // Obsolete: use on your own storage if you know only integer are being stored (open/close all tree nodes) IMGUI_API void SetAllInt(int val); - // For quicker full rebuild of a storage (instead of an incremental one), you may add all your contents and then sort once. - IMGUI_API void BuildSortByKey(); +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + //typedef ::ImGuiStoragePair ImGuiStoragePair; // 1.90.8: moved type outside struct +#endif }; // Helper: Manually clip large list of items. -// If you are submitting lots of evenly spaced items and you have a random access to the list, you can perform coarse clipping based on visibility to save yourself from processing those items at all. +// If you have lots evenly spaced items and you have random access to the list, you can perform coarse +// clipping based on visibility to only submit items that are in view. // The clipper calculates the range of visible items and advance the cursor to compensate for the non-visible items we have skipped. -// ImGui already clip items based on their bounds but it needs to measure text size to do so. Coarse clipping before submission makes this cost and your own data fetching/submission cost null. +// (Dear ImGui already clip items based on their bounds but: it needs to first layout the item to do so, and generally +// fetching/submitting your own data incurs additional cost. Coarse clipping using ImGuiListClipper allows you to easily +// scale using lists with tens of thousands of items without a problem) // Usage: -// ImGuiListClipper clipper(1000); // we have 1000 elements, evenly spaced. -// while (clipper.Step()) -// for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; i++) -// ImGui::Text("line number %d", i); -// - Step 0: the clipper let you process the first element, regardless of it being visible or not, so we can measure the element height (step skipped if we passed a known height as second arg to constructor). -// - Step 1: the clipper infer height from first element, calculate the actual range of elements to display, and position the cursor before the first element. -// - (Step 2: dummy step only required if an explicit items_height was passed to constructor or Begin() and user call Step(). Does nothing and switch to Step 3.) -// - Step 3: the clipper validate that we have reached the expected Y position (corresponding to element DisplayEnd), advance the cursor to the end of the list and then returns 'false' to end the loop. +// ImGuiListClipper clipper; +// clipper.Begin(1000); // We have 1000 elements, evenly spaced. +// while (clipper.Step()) +// for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; i++) +// ImGui::Text("line number %d", i); +// Generally what happens is: +// - Clipper lets you process the first element (DisplayStart = 0, DisplayEnd = 1) regardless of it being visible or not. +// - User code submit that one element. +// - Clipper can measure the height of the first element +// - Clipper calculate the actual range of elements to display based on the current clipping rectangle, position the cursor before the first visible element. +// - User code submit visible elements. +// - The clipper also handles various subtleties related to keyboard/gamepad navigation, wrapping etc. struct ImGuiListClipper { - float StartPosY; - float ItemsHeight; - int ItemsCount, StepNo, DisplayStart, DisplayEnd; + ImGuiContext* Ctx; // Parent UI context + int DisplayStart; // First item to display, updated by each call to Step() + int DisplayEnd; // End of items to display (exclusive) + int ItemsCount; // [Internal] Number of items + float ItemsHeight; // [Internal] Height of item after a first step and item submission can calculate it + float StartPosY; // [Internal] Cursor position at the time of Begin() or after table frozen rows are all processed + double StartSeekOffsetY; // [Internal] Account for frozen rows in a table and initial loss of precision in very large windows. + void* TempData; // [Internal] Internal data - // items_count: Use -1 to ignore (you can call Begin later). Use INT_MAX if you don't know how many items you have (in which case the cursor won't be advanced in the final step). + // items_count: Use INT_MAX if you don't know how many items you have (in which case the cursor won't be advanced in the final step, and you can call SeekCursorForItem() manually if you need) // items_height: Use -1.0f to be calculated automatically on first step. Otherwise pass in the distance between your items, typically GetTextLineHeightWithSpacing() or GetFrameHeightWithSpacing(). - // If you don't specify an items_height, you NEED to call Step(). If you specify items_height you may call the old Begin()/End() api directly, but prefer calling Step(). - ImGuiListClipper(int items_count = -1, float items_height = -1.0f) { Begin(items_count, items_height); } // NB: Begin() initialize every fields (as we allow user to call Begin/End multiple times on a same instance if they want). - ~ImGuiListClipper() { IM_ASSERT(ItemsCount == -1); } // Assert if user forgot to call End() or Step() until false. + IMGUI_API ImGuiListClipper(); + IMGUI_API ~ImGuiListClipper(); + IMGUI_API void Begin(int items_count, float items_height = -1.0f); + IMGUI_API void End(); // Automatically called on the last call of Step() that returns false. + IMGUI_API bool Step(); // Call until it returns false. The DisplayStart/DisplayEnd fields will be set and you can process/draw those items. - IMGUI_API bool Step(); // Call until it returns false. The DisplayStart/DisplayEnd fields will be set and you can process/draw those items. - IMGUI_API void Begin(int items_count, float items_height = -1.0f); // Automatically called by constructor if you passed 'items_count' or by Step() in Step 1. - IMGUI_API void End(); // Automatically called on the last call of Step() that returns false. + // Call IncludeItemByIndex() or IncludeItemsByIndex() *BEFORE* first call to Step() if you need a range of items to not be clipped, regardless of their visibility. + // (Due to alignment / padding of certain items it is possible that an extra item may be included on either end of the display range). + inline void IncludeItemByIndex(int item_index) { IncludeItemsByIndex(item_index, item_index + 1); } + IMGUI_API void IncludeItemsByIndex(int item_begin, int item_end); // item_end is exclusive e.g. use (42, 42+1) to make item 42 never clipped. + + // Seek cursor toward given item. This is automatically called while stepping. + // - The only reason to call this is: you can use ImGuiListClipper::Begin(INT_MAX) if you don't know item count ahead of time. + // - In this case, after all steps are done, you'll want to call SeekCursorForItem(item_count). + IMGUI_API void SeekCursorForItem(int item_index); + +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + inline void IncludeRangeByIndices(int item_begin, int item_end) { IncludeItemsByIndex(item_begin, item_end); } // [renamed in 1.89.9] + inline void ForceDisplayRangeByIndices(int item_begin, int item_end) { IncludeItemsByIndex(item_begin, item_end); } // [renamed in 1.89.6] + //inline ImGuiListClipper(int items_count, float items_height = -1.0f) { memset(this, 0, sizeof(*this)); ItemsCount = -1; Begin(items_count, items_height); } // [removed in 1.79] +#endif }; -// Helpers macros to generate 32-bits encoded colors +// Helpers: ImVec2/ImVec4 operators +// - It is important that we are keeping those disabled by default so they don't leak in user space. +// - This is in order to allow user enabling implicit cast operators between ImVec2/ImVec4 and their own types (using IM_VEC2_CLASS_EXTRA in imconfig.h) +// - Add '#define IMGUI_DEFINE_MATH_OPERATORS' before including this file (or in imconfig.h) to access courtesy maths operators for ImVec2 and ImVec4. +// - We intentionally provide ImVec2*float but not float*ImVec2: this is rare enough and we want to reduce the surface for possible user mistake. +#ifdef IMGUI_DEFINE_MATH_OPERATORS +#define IMGUI_DEFINE_MATH_OPERATORS_IMPLEMENTED +IM_MSVC_RUNTIME_CHECKS_OFF +static inline ImVec2 operator*(const ImVec2& lhs, const float rhs) { return ImVec2(lhs.x * rhs, lhs.y * rhs); } +static inline ImVec2 operator/(const ImVec2& lhs, const float rhs) { return ImVec2(lhs.x / rhs, lhs.y / rhs); } +static inline ImVec2 operator+(const ImVec2& lhs, const ImVec2& rhs) { return ImVec2(lhs.x + rhs.x, lhs.y + rhs.y); } +static inline ImVec2 operator-(const ImVec2& lhs, const ImVec2& rhs) { return ImVec2(lhs.x - rhs.x, lhs.y - rhs.y); } +static inline ImVec2 operator*(const ImVec2& lhs, const ImVec2& rhs) { return ImVec2(lhs.x * rhs.x, lhs.y * rhs.y); } +static inline ImVec2 operator/(const ImVec2& lhs, const ImVec2& rhs) { return ImVec2(lhs.x / rhs.x, lhs.y / rhs.y); } +static inline ImVec2 operator-(const ImVec2& lhs) { return ImVec2(-lhs.x, -lhs.y); } +static inline ImVec2& operator*=(ImVec2& lhs, const float rhs) { lhs.x *= rhs; lhs.y *= rhs; return lhs; } +static inline ImVec2& operator/=(ImVec2& lhs, const float rhs) { lhs.x /= rhs; lhs.y /= rhs; return lhs; } +static inline ImVec2& operator+=(ImVec2& lhs, const ImVec2& rhs) { lhs.x += rhs.x; lhs.y += rhs.y; return lhs; } +static inline ImVec2& operator-=(ImVec2& lhs, const ImVec2& rhs) { lhs.x -= rhs.x; lhs.y -= rhs.y; return lhs; } +static inline ImVec2& operator*=(ImVec2& lhs, const ImVec2& rhs) { lhs.x *= rhs.x; lhs.y *= rhs.y; return lhs; } +static inline ImVec2& operator/=(ImVec2& lhs, const ImVec2& rhs) { lhs.x /= rhs.x; lhs.y /= rhs.y; return lhs; } +static inline bool operator==(const ImVec2& lhs, const ImVec2& rhs) { return lhs.x == rhs.x && lhs.y == rhs.y; } +static inline bool operator!=(const ImVec2& lhs, const ImVec2& rhs) { return lhs.x != rhs.x || lhs.y != rhs.y; } +static inline ImVec4 operator+(const ImVec4& lhs, const ImVec4& rhs) { return ImVec4(lhs.x + rhs.x, lhs.y + rhs.y, lhs.z + rhs.z, lhs.w + rhs.w); } +static inline ImVec4 operator-(const ImVec4& lhs, const ImVec4& rhs) { return ImVec4(lhs.x - rhs.x, lhs.y - rhs.y, lhs.z - rhs.z, lhs.w - rhs.w); } +static inline ImVec4 operator*(const ImVec4& lhs, const ImVec4& rhs) { return ImVec4(lhs.x * rhs.x, lhs.y * rhs.y, lhs.z * rhs.z, lhs.w * rhs.w); } +static inline bool operator==(const ImVec4& lhs, const ImVec4& rhs) { return lhs.x == rhs.x && lhs.y == rhs.y && lhs.z == rhs.z && lhs.w == rhs.w; } +static inline bool operator!=(const ImVec4& lhs, const ImVec4& rhs) { return lhs.x != rhs.x || lhs.y != rhs.y || lhs.z != rhs.z || lhs.w != rhs.w; } +IM_MSVC_RUNTIME_CHECKS_RESTORE +#endif + +// Helpers macros to generate 32-bit encoded colors +// - User can declare their own format by #defining the 5 _SHIFT/_MASK macros in their imconfig file. +// - Any setting other than the default will need custom backend support. The only standard backend that supports anything else than the default is DirectX9. +#ifndef IM_COL32_R_SHIFT #ifdef IMGUI_USE_BGRA_PACKED_COLOR #define IM_COL32_R_SHIFT 16 #define IM_COL32_G_SHIFT 8 @@ -1741,10 +2888,11 @@ struct ImGuiListClipper #define IM_COL32_A_SHIFT 24 #define IM_COL32_A_MASK 0xFF000000 #endif +#endif #define IM_COL32(R,G,B,A) (((ImU32)(A)<>IM_COL32_R_SHIFT)&0xFF) * sc; Value.y = (float)((rgba>>IM_COL32_G_SHIFT)&0xFF) * sc; Value.z = (float)((rgba>>IM_COL32_B_SHIFT)&0xFF) * sc; Value.w = (float)((rgba>>IM_COL32_A_SHIFT)&0xFF) * sc; } - ImColor(float r, float g, float b, float a = 1.0f) { Value.x = r; Value.y = g; Value.z = b; Value.w = a; } - ImColor(const ImVec4& col) { Value = col; } + constexpr ImColor() { } + constexpr ImColor(float r, float g, float b, float a = 1.0f) : Value(r, g, b, a) { } + constexpr ImColor(const ImVec4& col) : Value(col) {} + constexpr ImColor(int r, int g, int b, int a = 255) : Value((float)r * (1.0f / 255.0f), (float)g * (1.0f / 255.0f), (float)b * (1.0f / 255.0f), (float)a* (1.0f / 255.0f)) {} + constexpr ImColor(ImU32 rgba) : Value((float)((rgba >> IM_COL32_R_SHIFT) & 0xFF) * (1.0f / 255.0f), (float)((rgba >> IM_COL32_G_SHIFT) & 0xFF) * (1.0f / 255.0f), (float)((rgba >> IM_COL32_B_SHIFT) & 0xFF) * (1.0f / 255.0f), (float)((rgba >> IM_COL32_A_SHIFT) & 0xFF) * (1.0f / 255.0f)) {} inline operator ImU32() const { return ImGui::ColorConvertFloat4ToU32(Value); } inline operator ImVec4() const { return Value; } // FIXME-OBSOLETE: May need to obsolete/cleanup those helpers. inline void SetHSV(float h, float s, float v, float a = 1.0f){ ImGui::ColorConvertHSVtoRGB(h, s, v, Value.x, Value.y, Value.z); Value.w = a; } - static ImColor HSV(float h, float s, float v, float a = 1.0f) { float r,g,b; ImGui::ColorConvertHSVtoRGB(h, s, v, r, g, b); return ImColor(r,g,b,a); } + static ImColor HSV(float h, float s, float v, float a = 1.0f) { float r, g, b; ImGui::ColorConvertHSVtoRGB(h, s, v, r, g, b); return ImColor(r, g, b, a); } }; //----------------------------------------------------------------------------- -// Draw List API (ImDrawCmd, ImDrawIdx, ImDrawVert, ImDrawChannel, ImDrawListSplitter, ImDrawListFlags, ImDrawList, ImDrawData) +// [SECTION] Multi-Select API flags and structures (ImGuiMultiSelectFlags, ImGuiSelectionRequestType, ImGuiSelectionRequest, ImGuiMultiSelectIO, ImGuiSelectionBasicStorage) +//----------------------------------------------------------------------------- + +// Multi-selection system +// Documentation at: https://github.com/ocornut/imgui/wiki/Multi-Select +// - Refer to 'Demo->Widgets->Selection State & Multi-Select' for demos using this. +// - This system implements standard multi-selection idioms (CTRL+Mouse/Keyboard, SHIFT+Mouse/Keyboard, etc) +// with support for clipper (skipping non-visible items), box-select and many other details. +// - Selectable(), Checkbox() are supported but custom widgets may use it as well. +// - TreeNode() is technically supported but... using this correctly is more complicated: you need some sort of linear/random access to your tree, +// which is suited to advanced trees setups also implementing filters and clipper. We will work toward simplifying and demoing it. +// - In the spirit of Dear ImGui design, your code owns actual selection data. +// This is designed to allow all kinds of selection storage you may use in your application e.g. set/map/hash. +// About ImGuiSelectionBasicStorage: +// - This is an optional helper to store a selection state and apply selection requests. +// - It is used by our demos and provided as a convenience to quickly implement multi-selection. +// Usage: +// - Identify submitted items with SetNextItemSelectionUserData(), most likely using an index into your current data-set. +// - Store and maintain actual selection data using persistent object identifiers. +// - Usage flow: +// BEGIN - (1) Call BeginMultiSelect() and retrieve the ImGuiMultiSelectIO* result. +// - (2) Honor request list (SetAll/SetRange requests) by updating your selection data. Same code as Step 6. +// - (3) [If using clipper] You need to make sure RangeSrcItem is always submitted. Calculate its index and pass to clipper.IncludeItemByIndex(). If storing indices in ImGuiSelectionUserData, a simple clipper.IncludeItemByIndex(ms_io->RangeSrcItem) call will work. +// LOOP - (4) Submit your items with SetNextItemSelectionUserData() + Selectable()/TreeNode() calls. +// END - (5) Call EndMultiSelect() and retrieve the ImGuiMultiSelectIO* result. +// - (6) Honor request list (SetAll/SetRange requests) by updating your selection data. Same code as Step 2. +// If you submit all items (no clipper), Step 2 and 3 are optional and will be handled by each item themselves. It is fine to always honor those steps. +// About ImGuiSelectionUserData: +// - This can store an application-defined identifier (e.g. index or pointer) submitted via SetNextItemSelectionUserData(). +// - In return we store them into RangeSrcItem/RangeFirstItem/RangeLastItem and other fields in ImGuiMultiSelectIO. +// - Most applications will store an object INDEX, hence the chosen name and type. Storing an index is natural, because +// SetRange requests will give you two end-points and you will need to iterate/interpolate between them to update your selection. +// - However it is perfectly possible to store a POINTER or another IDENTIFIER inside ImGuiSelectionUserData. +// Our system never assume that you identify items by indices, it never attempts to interpolate between two values. +// - If you enable ImGuiMultiSelectFlags_NoRangeSelect then it is guaranteed that you will never have to interpolate +// between two ImGuiSelectionUserData, which may be a convenient way to use part of the feature with less code work. +// - As most users will want to store an index, for convenience and to reduce confusion we use ImS64 instead of void*, +// being syntactically easier to downcast. Feel free to reinterpret_cast and store a pointer inside. + +// Flags for BeginMultiSelect() +enum ImGuiMultiSelectFlags_ +{ + ImGuiMultiSelectFlags_None = 0, + ImGuiMultiSelectFlags_SingleSelect = 1 << 0, // Disable selecting more than one item. This is available to allow single-selection code to share same code/logic if desired. It essentially disables the main purpose of BeginMultiSelect() tho! + ImGuiMultiSelectFlags_NoSelectAll = 1 << 1, // Disable CTRL+A shortcut to select all. + ImGuiMultiSelectFlags_NoRangeSelect = 1 << 2, // Disable Shift+selection mouse/keyboard support (useful for unordered 2D selection). With BoxSelect is also ensure contiguous SetRange requests are not combined into one. This allows not handling interpolation in SetRange requests. + ImGuiMultiSelectFlags_NoAutoSelect = 1 << 3, // Disable selecting items when navigating (useful for e.g. supporting range-select in a list of checkboxes). + ImGuiMultiSelectFlags_NoAutoClear = 1 << 4, // Disable clearing selection when navigating or selecting another one (generally used with ImGuiMultiSelectFlags_NoAutoSelect. useful for e.g. supporting range-select in a list of checkboxes). + ImGuiMultiSelectFlags_NoAutoClearOnReselect = 1 << 5, // Disable clearing selection when clicking/selecting an already selected item. + ImGuiMultiSelectFlags_BoxSelect1d = 1 << 6, // Enable box-selection with same width and same x pos items (e.g. full row Selectable()). Box-selection works better with little bit of spacing between items hit-box in order to be able to aim at empty space. + ImGuiMultiSelectFlags_BoxSelect2d = 1 << 7, // Enable box-selection with varying width or varying x pos items support (e.g. different width labels, or 2D layout/grid). This is slower: alters clipping logic so that e.g. horizontal movements will update selection of normally clipped items. + ImGuiMultiSelectFlags_BoxSelectNoScroll = 1 << 8, // Disable scrolling when box-selecting near edges of scope. + ImGuiMultiSelectFlags_ClearOnEscape = 1 << 9, // Clear selection when pressing Escape while scope is focused. + ImGuiMultiSelectFlags_ClearOnClickVoid = 1 << 10, // Clear selection when clicking on empty location within scope. + ImGuiMultiSelectFlags_ScopeWindow = 1 << 11, // Scope for _BoxSelect and _ClearOnClickVoid is whole window (Default). Use if BeginMultiSelect() covers a whole window or used a single time in same window. + ImGuiMultiSelectFlags_ScopeRect = 1 << 12, // Scope for _BoxSelect and _ClearOnClickVoid is rectangle encompassing BeginMultiSelect()/EndMultiSelect(). Use if BeginMultiSelect() is called multiple times in same window. + ImGuiMultiSelectFlags_SelectOnClick = 1 << 13, // Apply selection on mouse down when clicking on unselected item. (Default) + ImGuiMultiSelectFlags_SelectOnClickRelease = 1 << 14, // Apply selection on mouse release when clicking an unselected item. Allow dragging an unselected item without altering selection. + //ImGuiMultiSelectFlags_RangeSelect2d = 1 << 15, // Shift+Selection uses 2d geometry instead of linear sequence, so possible to use Shift+up/down to select vertically in grid. Analogous to what BoxSelect does. + ImGuiMultiSelectFlags_NavWrapX = 1 << 16, // [Temporary] Enable navigation wrapping on X axis. Provided as a convenience because we don't have a design for the general Nav API for this yet. When the more general feature be public we may obsolete this flag in favor of new one. +}; + +// Main IO structure returned by BeginMultiSelect()/EndMultiSelect(). +// This mainly contains a list of selection requests. +// - Use 'Demo->Tools->Debug Log->Selection' to see requests as they happen. +// - Some fields are only useful if your list is dynamic and allows deletion (getting post-deletion focus/state right is shown in the demo) +// - Below: who reads/writes each fields? 'r'=read, 'w'=write, 'ms'=multi-select code, 'app'=application/user code. +struct ImGuiMultiSelectIO +{ + //------------------------------------------// BeginMultiSelect / EndMultiSelect + ImVector Requests; // ms:w, app:r / ms:w app:r // Requests to apply to your selection data. + ImGuiSelectionUserData RangeSrcItem; // ms:w app:r / // (If using clipper) Begin: Source item (often the first selected item) must never be clipped: use clipper.IncludeItemByIndex() to ensure it is submitted. + ImGuiSelectionUserData NavIdItem; // ms:w, app:r / // (If using deletion) Last known SetNextItemSelectionUserData() value for NavId (if part of submitted items). + bool NavIdSelected; // ms:w, app:r / app:r // (If using deletion) Last known selection state for NavId (if part of submitted items). + bool RangeSrcReset; // app:w / ms:r // (If using deletion) Set before EndMultiSelect() to reset ResetSrcItem (e.g. if deleted selection). + int ItemsCount; // ms:w, app:r / app:r // 'int items_count' parameter to BeginMultiSelect() is copied here for convenience, allowing simpler calls to your ApplyRequests handler. Not used internally. +}; + +// Selection request type +enum ImGuiSelectionRequestType +{ + ImGuiSelectionRequestType_None = 0, + ImGuiSelectionRequestType_SetAll, // Request app to clear selection (if Selected==false) or select all items (if Selected==true). We cannot set RangeFirstItem/RangeLastItem as its contents is entirely up to user (not necessarily an index) + ImGuiSelectionRequestType_SetRange, // Request app to select/unselect [RangeFirstItem..RangeLastItem] items (inclusive) based on value of Selected. Only EndMultiSelect() request this, app code can read after BeginMultiSelect() and it will always be false. +}; + +// Selection request item +struct ImGuiSelectionRequest +{ + //------------------------------------------// BeginMultiSelect / EndMultiSelect + ImGuiSelectionRequestType Type; // ms:w, app:r / ms:w, app:r // Request type. You'll most often receive 1 Clear + 1 SetRange with a single-item range. + bool Selected; // ms:w, app:r / ms:w, app:r // Parameter for SetAll/SetRange requests (true = select, false = unselect) + ImS8 RangeDirection; // / ms:w app:r // Parameter for SetRange request: +1 when RangeFirstItem comes before RangeLastItem, -1 otherwise. Useful if you want to preserve selection order on a backward Shift+Click. + ImGuiSelectionUserData RangeFirstItem; // / ms:w, app:r // Parameter for SetRange request (this is generally == RangeSrcItem when shift selecting from top to bottom). + ImGuiSelectionUserData RangeLastItem; // / ms:w, app:r // Parameter for SetRange request (this is generally == RangeSrcItem when shift selecting from bottom to top). Inclusive! +}; + +// Optional helper to store multi-selection state + apply multi-selection requests. +// - Used by our demos and provided as a convenience to easily implement basic multi-selection. +// - Iterate selection with 'void* it = NULL; ImGuiID id; while (selection.GetNextSelectedItem(&it, &id)) { ... }' +// Or you can check 'if (Contains(id)) { ... }' for each possible object if their number is not too high to iterate. +// - USING THIS IS NOT MANDATORY. This is only a helper and not a required API. +// To store a multi-selection, in your application you could: +// - Use this helper as a convenience. We use our simple key->value ImGuiStorage as a std::set replacement. +// - Use your own external storage: e.g. std::set, std::vector, interval trees, intrusively stored selection etc. +// In ImGuiSelectionBasicStorage we: +// - always use indices in the multi-selection API (passed to SetNextItemSelectionUserData(), retrieved in ImGuiMultiSelectIO) +// - use the AdapterIndexToStorageId() indirection layer to abstract how persistent selection data is derived from an index. +// - use decently optimized logic to allow queries and insertion of very large selection sets. +// - do not preserve selection order. +// Many combinations are possible depending on how you prefer to store your items and how you prefer to store your selection. +// Large applications are likely to eventually want to get rid of this indirection layer and do their own thing. +// See https://github.com/ocornut/imgui/wiki/Multi-Select for details and pseudo-code using this helper. +struct ImGuiSelectionBasicStorage +{ + // Members + int Size; // // Number of selected items, maintained by this helper. + bool PreserveOrder; // = false // GetNextSelectedItem() will return ordered selection (currently implemented by two additional sorts of selection. Could be improved) + void* UserData; // = NULL // User data for use by adapter function // e.g. selection.UserData = (void*)my_items; + ImGuiID (*AdapterIndexToStorageId)(ImGuiSelectionBasicStorage* self, int idx); // e.g. selection.AdapterIndexToStorageId = [](ImGuiSelectionBasicStorage* self, int idx) { return ((MyItems**)self->UserData)[idx]->ID; }; + int _SelectionOrder;// [Internal] Increasing counter to store selection order + ImGuiStorage _Storage; // [Internal] Selection set. Think of this as similar to e.g. std::set. Prefer not accessing directly: iterate with GetNextSelectedItem(). + + // Methods + IMGUI_API ImGuiSelectionBasicStorage(); + IMGUI_API void ApplyRequests(ImGuiMultiSelectIO* ms_io); // Apply selection requests coming from BeginMultiSelect() and EndMultiSelect() functions. It uses 'items_count' passed to BeginMultiSelect() + IMGUI_API bool Contains(ImGuiID id) const; // Query if an item id is in selection. + IMGUI_API void Clear(); // Clear selection + IMGUI_API void Swap(ImGuiSelectionBasicStorage& r); // Swap two selections + IMGUI_API void SetItemSelected(ImGuiID id, bool selected); // Add/remove an item from selection (generally done by ApplyRequests() function) + IMGUI_API bool GetNextSelectedItem(void** opaque_it, ImGuiID* out_id); // Iterate selection with 'void* it = NULL; ImGuiID id; while (selection.GetNextSelectedItem(&it, &id)) { ... }' + inline ImGuiID GetStorageIdFromIndex(int idx) { return AdapterIndexToStorageId(this, idx); } // Convert index to item id based on provided adapter. +}; + +// Optional helper to apply multi-selection requests to existing randomly accessible storage. +// Convenient if you want to quickly wire multi-select API on e.g. an array of bool or items storing their own selection state. +struct ImGuiSelectionExternalStorage +{ + // Members + void* UserData; // User data for use by adapter function // e.g. selection.UserData = (void*)my_items; + void (*AdapterSetItemSelected)(ImGuiSelectionExternalStorage* self, int idx, bool selected); // e.g. AdapterSetItemSelected = [](ImGuiSelectionExternalStorage* self, int idx, bool selected) { ((MyItems**)self->UserData)[idx]->Selected = selected; } + + // Methods + IMGUI_API ImGuiSelectionExternalStorage(); + IMGUI_API void ApplyRequests(ImGuiMultiSelectIO* ms_io); // Apply selection requests by using AdapterSetItemSelected() calls +}; + +//----------------------------------------------------------------------------- +// [SECTION] Drawing API (ImDrawCmd, ImDrawIdx, ImDrawVert, ImDrawChannel, ImDrawListSplitter, ImDrawListFlags, ImDrawList, ImDrawData) // Hold a series of drawing commands. The user provides a renderer for ImDrawData which essentially contains an array of ImDrawList. //----------------------------------------------------------------------------- -// Draw callbacks for advanced uses. +// The maximum line width to bake anti-aliased textures for. Build atlas with ImFontAtlasFlags_NoBakedLines to disable baking. +#ifndef IM_DRAWLIST_TEX_LINES_WIDTH_MAX +#define IM_DRAWLIST_TEX_LINES_WIDTH_MAX (32) +#endif + +// ImDrawIdx: vertex index. [Compile-time configurable type] +// - To use 16-bit indices + allow large meshes: backend need to set 'io.BackendFlags |= ImGuiBackendFlags_RendererHasVtxOffset' and handle ImDrawCmd::VtxOffset (recommended). +// - To use 32-bit indices: override with '#define ImDrawIdx unsigned int' in your imconfig.h file. +#ifndef ImDrawIdx +typedef unsigned short ImDrawIdx; // Default: 16-bit (for maximum compatibility with renderer backends) +#endif + +// ImDrawCallback: Draw callbacks for advanced uses [configurable type: override in imconfig.h] // NB: You most likely do NOT need to use draw callbacks just to create your own widget or customized UI rendering, // you can poke into the draw list for that! Draw callback may be useful for example to: // A) Change your GPU render state, // B) render a complex 3D scene inside a UI element without an intermediate texture/render target, etc. // The expected behavior from your rendering function is 'if (cmd.UserCallback != NULL) { cmd.UserCallback(parent_list, cmd); } else { RenderTriangles() }' -// If you want to override the signature of ImDrawCallback, you can simply use e.g. '#define ImDrawCallback MyDrawCallback' (in imconfig.h) + update rendering back-end accordingly. +// If you want to override the signature of ImDrawCallback, you can simply use e.g. '#define ImDrawCallback MyDrawCallback' (in imconfig.h) + update rendering backend accordingly. #ifndef ImDrawCallback typedef void (*ImDrawCallback)(const ImDrawList* parent_list, const ImDrawCmd* cmd); #endif -// Special Draw callback value to request renderer back-end to reset the graphics/render state. -// The renderer back-end needs to handle this special value, otherwise it will crash trying to call a function at this address. -// This is useful for example if you submitted callbacks which you know have altered the render state and you want it to be restored. -// It is not done by default because they are many perfectly useful way of altering render state for imgui contents (e.g. changing shader/blending settings before an Image call). -#define ImDrawCallback_ResetRenderState (ImDrawCallback)(-1) +// Special Draw callback value to request renderer backend to reset the graphics/render state. +// The renderer backend needs to handle this special value, otherwise it will crash trying to call a function at this address. +// This is useful, for example, if you submitted callbacks which you know have altered the render state and you want it to be restored. +// Render state is not reset by default because they are many perfectly useful way of altering render state (e.g. changing shader/blending settings before an Image call). +#define ImDrawCallback_ResetRenderState (ImDrawCallback)(-8) // Typically, 1 command = 1 GPU draw call (unless command is a callback) -// Pre 1.71 back-ends will typically ignore the VtxOffset/IdxOffset fields. When 'io.BackendFlags & ImGuiBackendFlags_RendererHasVtxOffset' -// is enabled, those fields allow us to render meshes larger than 64K vertices while keeping 16-bits indices. +// - VtxOffset: When 'io.BackendFlags & ImGuiBackendFlags_RendererHasVtxOffset' is enabled, +// this fields allow us to render meshes larger than 64K vertices while keeping 16-bit indices. +// Backends made for <1.71. will typically ignore the VtxOffset fields. +// - The ClipRect/TextureId/VtxOffset fields must be contiguous as we memcmp() them together (this is asserted for). struct ImDrawCmd { - unsigned int ElemCount; // Number of indices (multiple of 3) to be rendered as triangles. Vertices are stored in the callee ImDrawList's vtx_buffer[] array, indices in idx_buffer[]. - ImVec4 ClipRect; // Clipping rectangle (x1, y1, x2, y2). Subtract ImDrawData->DisplayPos to get clipping rectangle in "viewport" coordinates - ImTextureID TextureId; // User-provided texture ID. Set by user in ImfontAtlas::SetTexID() for fonts or passed to Image*() functions. Ignore if never using images or multiple fonts atlas. - unsigned int VtxOffset; // Start offset in vertex buffer. Pre-1.71 or without ImGuiBackendFlags_RendererHasVtxOffset: always 0. With ImGuiBackendFlags_RendererHasVtxOffset: may be >0 to support meshes larger than 64K vertices with 16-bits indices. - unsigned int IdxOffset; // Start offset in index buffer. Always equal to sum of ElemCount drawn so far. - ImDrawCallback UserCallback; // If != NULL, call the function instead of rendering the vertices. clip_rect and texture_id will be set normally. - void* UserCallbackData; // The draw callback code can access this. + ImVec4 ClipRect; // 4*4 // Clipping rectangle (x1, y1, x2, y2). Subtract ImDrawData->DisplayPos to get clipping rectangle in "viewport" coordinates + ImTextureID TextureId; // 4-8 // User-provided texture ID. Set by user in ImfontAtlas::SetTexID() for fonts or passed to Image*() functions. Ignore if never using images or multiple fonts atlas. + unsigned int VtxOffset; // 4 // Start offset in vertex buffer. ImGuiBackendFlags_RendererHasVtxOffset: always 0, otherwise may be >0 to support meshes larger than 64K vertices with 16-bit indices. + unsigned int IdxOffset; // 4 // Start offset in index buffer. + unsigned int ElemCount; // 4 // Number of indices (multiple of 3) to be rendered as triangles. Vertices are stored in the callee ImDrawList's vtx_buffer[] array, indices in idx_buffer[]. + ImDrawCallback UserCallback; // 4-8 // If != NULL, call the function instead of rendering the vertices. clip_rect and texture_id will be set normally. + void* UserCallbackData; // 4-8 // Callback user data (when UserCallback != NULL). If called AddCallback() with size == 0, this is a copy of the AddCallback() argument. If called AddCallback() with size > 0, this is pointing to a buffer where data is stored. + int UserCallbackDataSize; // 4 // Size of callback user data when using storage, otherwise 0. + int UserCallbackDataOffset;// 4 // [Internal] Offset of callback user data when using storage, otherwise -1. - ImDrawCmd() { ElemCount = 0; TextureId = (ImTextureID)NULL; VtxOffset = IdxOffset = 0; UserCallback = NULL; UserCallbackData = NULL; } + ImDrawCmd() { memset(this, 0, sizeof(*this)); } // Also ensure our padding fields are zeroed + + // Since 1.83: returns ImTextureID associated with this draw call. Warning: DO NOT assume this is always same as 'TextureId' (we will change this function for an upcoming feature) + inline ImTextureID GetTexID() const { return TextureId; } }; -// Vertex index -// (to allow large meshes with 16-bits indices: set 'io.BackendFlags |= ImGuiBackendFlags_RendererHasVtxOffset' and handle ImDrawCmd::VtxOffset in the renderer back-end) -// (to use 32-bits indices: override with '#define ImDrawIdx unsigned int' in imconfig.h) -#ifndef ImDrawIdx -typedef unsigned short ImDrawIdx; -#endif - // Vertex layout #ifndef IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT struct ImDrawVert @@ -1823,12 +3131,20 @@ struct ImDrawVert #else // You can override the vertex format layout by defining IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT in imconfig.h // The code expect ImVec2 pos (8 bytes), ImVec2 uv (8 bytes), ImU32 col (4 bytes), but you can re-order them or add other fields as needed to simplify integration in your engine. -// The type has to be described within the macro (you can either declare the struct or use a typedef). This is because ImVec2/ImU32 are likely not declared a the time you'd want to set your type up. +// The type has to be described within the macro (you can either declare the struct or use a typedef). This is because ImVec2/ImU32 are likely not declared at the time you'd want to set your type up. // NOTE: IMGUI DOESN'T CLEAR THE STRUCTURE AND DOESN'T CALL A CONSTRUCTOR SO ANY CUSTOM FIELD WILL BE UNINITIALIZED. IF YOU ADD EXTRA FIELDS (SUCH AS A 'Z' COORDINATES) YOU WILL NEED TO CLEAR THEM DURING RENDER OR TO IGNORE THEM. IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT; #endif -// For use by ImDrawListSplitter. +// [Internal] For use by ImDrawList +struct ImDrawCmdHeader +{ + ImVec4 ClipRect; + ImTextureID TextureId; + unsigned int VtxOffset; +}; + +// [Internal] For use by ImDrawListSplitter struct ImDrawChannel { ImVector _CmdBuffer; @@ -1836,14 +3152,14 @@ struct ImDrawChannel }; // Split/Merge functions are used to split the draw list into different layers which can be drawn into out of order. -// This is used by the Columns api, so items of each column can be batched together in a same draw call. +// This is used by the Columns/Tables API, so items of each column can be batched together in a same draw call. struct ImDrawListSplitter { int _Current; // Current channel number (0) int _Count; // Number of active channels (1+) ImVector _Channels; // Draw channels (not resized down so _Count might be < Channels.Size) - inline ImDrawListSplitter() { Clear(); } + inline ImDrawListSplitter() { memset(this, 0, sizeof(*this)); } inline ~ImDrawListSplitter() { ClearFreeMemory(); } inline void Clear() { _Current = 0; _Count = 1; } // Do not clear Channels[] so our allocations are reused next frame IMGUI_API void ClearFreeMemory(); @@ -1852,26 +3168,35 @@ struct ImDrawListSplitter IMGUI_API void SetCurrentChannel(ImDrawList* draw_list, int channel_idx); }; -enum ImDrawCornerFlags_ +// Flags for ImDrawList functions +// (Legacy: bit 0 must always correspond to ImDrawFlags_Closed to be backward compatible with old API using a bool. Bits 1..3 must be unused) +enum ImDrawFlags_ { - ImDrawCornerFlags_None = 0, - ImDrawCornerFlags_TopLeft = 1 << 0, // 0x1 - ImDrawCornerFlags_TopRight = 1 << 1, // 0x2 - ImDrawCornerFlags_BotLeft = 1 << 2, // 0x4 - ImDrawCornerFlags_BotRight = 1 << 3, // 0x8 - ImDrawCornerFlags_Top = ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_TopRight, // 0x3 - ImDrawCornerFlags_Bot = ImDrawCornerFlags_BotLeft | ImDrawCornerFlags_BotRight, // 0xC - ImDrawCornerFlags_Left = ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_BotLeft, // 0x5 - ImDrawCornerFlags_Right = ImDrawCornerFlags_TopRight | ImDrawCornerFlags_BotRight, // 0xA - ImDrawCornerFlags_All = 0xF // In your function calls you may use ~0 (= all bits sets) instead of ImDrawCornerFlags_All, as a convenience + ImDrawFlags_None = 0, + ImDrawFlags_Closed = 1 << 0, // PathStroke(), AddPolyline(): specify that shape should be closed (Important: this is always == 1 for legacy reason) + ImDrawFlags_RoundCornersTopLeft = 1 << 4, // AddRect(), AddRectFilled(), PathRect(): enable rounding top-left corner only (when rounding > 0.0f, we default to all corners). Was 0x01. + ImDrawFlags_RoundCornersTopRight = 1 << 5, // AddRect(), AddRectFilled(), PathRect(): enable rounding top-right corner only (when rounding > 0.0f, we default to all corners). Was 0x02. + ImDrawFlags_RoundCornersBottomLeft = 1 << 6, // AddRect(), AddRectFilled(), PathRect(): enable rounding bottom-left corner only (when rounding > 0.0f, we default to all corners). Was 0x04. + ImDrawFlags_RoundCornersBottomRight = 1 << 7, // AddRect(), AddRectFilled(), PathRect(): enable rounding bottom-right corner only (when rounding > 0.0f, we default to all corners). Wax 0x08. + ImDrawFlags_RoundCornersNone = 1 << 8, // AddRect(), AddRectFilled(), PathRect(): disable rounding on all corners (when rounding > 0.0f). This is NOT zero, NOT an implicit flag! + ImDrawFlags_RoundCornersTop = ImDrawFlags_RoundCornersTopLeft | ImDrawFlags_RoundCornersTopRight, + ImDrawFlags_RoundCornersBottom = ImDrawFlags_RoundCornersBottomLeft | ImDrawFlags_RoundCornersBottomRight, + ImDrawFlags_RoundCornersLeft = ImDrawFlags_RoundCornersBottomLeft | ImDrawFlags_RoundCornersTopLeft, + ImDrawFlags_RoundCornersRight = ImDrawFlags_RoundCornersBottomRight | ImDrawFlags_RoundCornersTopRight, + ImDrawFlags_RoundCornersAll = ImDrawFlags_RoundCornersTopLeft | ImDrawFlags_RoundCornersTopRight | ImDrawFlags_RoundCornersBottomLeft | ImDrawFlags_RoundCornersBottomRight, + ImDrawFlags_RoundCornersDefault_ = ImDrawFlags_RoundCornersAll, // Default to ALL corners if none of the _RoundCornersXX flags are specified. + ImDrawFlags_RoundCornersMask_ = ImDrawFlags_RoundCornersAll | ImDrawFlags_RoundCornersNone, }; +// Flags for ImDrawList instance. Those are set automatically by ImGui:: functions from ImGuiIO settings, and generally not manipulated directly. +// It is however possible to temporarily alter flags between calls to ImDrawList:: functions. enum ImDrawListFlags_ { - ImDrawListFlags_None = 0, - ImDrawListFlags_AntiAliasedLines = 1 << 0, // Lines are anti-aliased (*2 the number of triangles for 1.0f wide line, otherwise *3 the number of triangles) - ImDrawListFlags_AntiAliasedFill = 1 << 1, // Filled shapes have anti-aliased edges (*2 the number of vertices) - ImDrawListFlags_AllowVtxOffset = 1 << 2 // Can emit 'VtxOffset > 0' to allow large meshes. Set when 'ImGuiBackendFlags_RendererHasVtxOffset' is enabled. + ImDrawListFlags_None = 0, + ImDrawListFlags_AntiAliasedLines = 1 << 0, // Enable anti-aliased lines/borders (*2 the number of triangles for 1.0f wide line or lines thin enough to be drawn using textures, otherwise *3 the number of triangles) + ImDrawListFlags_AntiAliasedLinesUseTex = 1 << 1, // Enable anti-aliased lines/borders using textures when possible. Require backend to render with bilinear filtering (NOT point/nearest filtering). + ImDrawListFlags_AntiAliasedFill = 1 << 2, // Enable anti-aliased edge around filled shapes (rounded rectangles, circles). + ImDrawListFlags_AllowVtxOffset = 1 << 3, // Can emit 'VtxOffset > 0' to allow large meshes. Set when 'ImGuiBackendFlags_RendererHasVtxOffset' is enabled. }; // Draw command list @@ -1880,7 +3205,8 @@ enum ImDrawListFlags_ // Each dear imgui window contains its own ImDrawList. You can use ImGui::GetWindowDrawList() to // access the current window draw list and draw custom primitives. // You can interleave normal ImGui:: calls and adding primitives to the current draw list. -// All positions are generally in pixel coordinates (top-left at (0,0), bottom-right at io.DisplaySize), but you are totally free to apply whatever transformation matrix to want to the data (if you apply such transformation you'll want to apply it to ClipRect as well) +// In single viewport mode, top-left is == GetMainViewport()->Pos (generally 0,0), bottom-right is == GetMainViewport()->Pos+Size (generally io.DisplaySize). +// You are totally free to apply whatever transformation matrix you want to the data (depending on the use of the transformation you may want to apply it to ClipRect as well!) // Important: Primitives are always added to the list and not culled (culling is done at higher-level by ImGui:: functions), if you use this API a lot consider coarse culling your drawn objects. struct ImDrawList { @@ -1891,21 +3217,25 @@ struct ImDrawList ImDrawListFlags Flags; // Flags, you may poke into these to adjust anti-aliasing settings per-primitive. // [Internal, used while building lists] - const ImDrawListSharedData* _Data; // Pointer to shared draw data (you can use ImGui::GetDrawListSharedData() to get the one from current ImGui context) - const char* _OwnerName; // Pointer to owner window's name for debugging - unsigned int _VtxCurrentOffset; // [Internal] Always 0 unless 'Flags & ImDrawListFlags_AllowVtxOffset'. - unsigned int _VtxCurrentIdx; // [Internal] Generally == VtxBuffer.Size unless we are past 64K vertices, in which case this gets reset to 0. + unsigned int _VtxCurrentIdx; // [Internal] generally == VtxBuffer.Size unless we are past 64K vertices, in which case this gets reset to 0. + ImDrawListSharedData* _Data; // Pointer to shared draw data (you can use ImGui::GetDrawListSharedData() to get the one from current ImGui context) ImDrawVert* _VtxWritePtr; // [Internal] point within VtxBuffer.Data after each add command (to avoid using the ImVector<> operators too much) ImDrawIdx* _IdxWritePtr; // [Internal] point within IdxBuffer.Data after each add command (to avoid using the ImVector<> operators too much) + ImVector _Path; // [Internal] current path building + ImDrawCmdHeader _CmdHeader; // [Internal] template of active commands. Fields should match those of CmdBuffer.back(). + ImDrawListSplitter _Splitter; // [Internal] for channels api (note: prefer using your own persistent instance of ImDrawListSplitter!) ImVector _ClipRectStack; // [Internal] ImVector _TextureIdStack; // [Internal] - ImVector _Path; // [Internal] current path building - ImDrawListSplitter _Splitter; // [Internal] for channels api + ImVector _CallbacksDataBuf; // [Internal] + float _FringeScale; // [Internal] anti-alias fringe is scaled by this value, this helps to keep things sharp while zooming at vertex buffer content + const char* _OwnerName; // Pointer to owner window's name for debugging - // If you want to create ImDrawList instances, pass them ImGui::GetDrawListSharedData() or create and use your own ImDrawListSharedData (so you can use ImDrawList without ImGui) - ImDrawList(const ImDrawListSharedData* shared_data) { _Data = shared_data; _OwnerName = NULL; Clear(); } - ~ImDrawList() { ClearFreeMemory(); } - IMGUI_API void PushClipRect(ImVec2 clip_rect_min, ImVec2 clip_rect_max, bool intersect_with_current_clip_rect = false); // Render-level scissoring. This is passed down to your render function but not used for CPU-side coarse clipping. Prefer using higher-level ImGui::PushClipRect() to affect logic (hit-testing and widget culling) + // If you want to create ImDrawList instances, pass them ImGui::GetDrawListSharedData(). + // (advanced: you may create and use your own ImDrawListSharedData so you can use ImDrawList without ImGui, but that's more involved) + IMGUI_API ImDrawList(ImDrawListSharedData* shared_data); + IMGUI_API ~ImDrawList(); + + IMGUI_API void PushClipRect(const ImVec2& clip_rect_min, const ImVec2& clip_rect_max, bool intersect_with_current_clip_rect = false); // Render-level scissoring. This is passed down to your render function but not used for CPU-side coarse clipping. Prefer using higher-level ImGui::PushClipRect() to affect logic (hit-testing and widget culling) IMGUI_API void PushClipRectFullScreen(); IMGUI_API void PopClipRect(); IMGUI_API void PushTextureID(ImTextureID texture_id); @@ -1914,22 +3244,37 @@ struct ImDrawList inline ImVec2 GetClipRectMax() const { const ImVec4& cr = _ClipRectStack.back(); return ImVec2(cr.z, cr.w); } // Primitives + // - Filled shapes must always use clockwise winding order. The anti-aliasing fringe depends on it. Counter-clockwise shapes will have "inward" anti-aliasing. // - For rectangular primitives, "p_min" and "p_max" represent the upper-left and lower-right corners. + // - For circle primitives, use "num_segments == 0" to automatically calculate tessellation (preferred). + // In older versions (until Dear ImGui 1.77) the AddCircle functions defaulted to num_segments == 12. + // In future versions we will use textures to provide cheaper and higher-quality circles. + // Use AddNgon() and AddNgonFilled() functions if you need to guarantee a specific number of sides. IMGUI_API void AddLine(const ImVec2& p1, const ImVec2& p2, ImU32 col, float thickness = 1.0f); - IMGUI_API void AddRect(const ImVec2& p_min, const ImVec2& p_max, ImU32 col, float rounding = 0.0f, ImDrawCornerFlags rounding_corners = ImDrawCornerFlags_All, float thickness = 1.0f); // a: upper-left, b: lower-right (== upper-left + size), rounding_corners_flags: 4-bits corresponding to which corner to round - IMGUI_API void AddRectFilled(const ImVec2& p_min, const ImVec2& p_max, ImU32 col, float rounding = 0.0f, ImDrawCornerFlags rounding_corners = ImDrawCornerFlags_All); // a: upper-left, b: lower-right (== upper-left + size) + IMGUI_API void AddRect(const ImVec2& p_min, const ImVec2& p_max, ImU32 col, float rounding = 0.0f, ImDrawFlags flags = 0, float thickness = 1.0f); // a: upper-left, b: lower-right (== upper-left + size) + IMGUI_API void AddRectFilled(const ImVec2& p_min, const ImVec2& p_max, ImU32 col, float rounding = 0.0f, ImDrawFlags flags = 0); // a: upper-left, b: lower-right (== upper-left + size) IMGUI_API void AddRectFilledMultiColor(const ImVec2& p_min, const ImVec2& p_max, ImU32 col_upr_left, ImU32 col_upr_right, ImU32 col_bot_right, ImU32 col_bot_left); IMGUI_API void AddQuad(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, ImU32 col, float thickness = 1.0f); IMGUI_API void AddQuadFilled(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, ImU32 col); IMGUI_API void AddTriangle(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, ImU32 col, float thickness = 1.0f); IMGUI_API void AddTriangleFilled(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, ImU32 col); - IMGUI_API void AddCircle(const ImVec2& center, float radius, ImU32 col, int num_segments = 12, float thickness = 1.0f); - IMGUI_API void AddCircleFilled(const ImVec2& center, float radius, ImU32 col, int num_segments = 12); + IMGUI_API void AddCircle(const ImVec2& center, float radius, ImU32 col, int num_segments = 0, float thickness = 1.0f); + IMGUI_API void AddCircleFilled(const ImVec2& center, float radius, ImU32 col, int num_segments = 0); + IMGUI_API void AddNgon(const ImVec2& center, float radius, ImU32 col, int num_segments, float thickness = 1.0f); + IMGUI_API void AddNgonFilled(const ImVec2& center, float radius, ImU32 col, int num_segments); + IMGUI_API void AddEllipse(const ImVec2& center, const ImVec2& radius, ImU32 col, float rot = 0.0f, int num_segments = 0, float thickness = 1.0f); + IMGUI_API void AddEllipseFilled(const ImVec2& center, const ImVec2& radius, ImU32 col, float rot = 0.0f, int num_segments = 0); IMGUI_API void AddText(const ImVec2& pos, ImU32 col, const char* text_begin, const char* text_end = NULL); - IMGUI_API void AddText(const ImFont* font, float font_size, const ImVec2& pos, ImU32 col, const char* text_begin, const char* text_end = NULL, float wrap_width = 0.0f, const ImVec4* cpu_fine_clip_rect = NULL); - IMGUI_API void AddPolyline(const ImVec2* points, int num_points, ImU32 col, bool closed, float thickness); - IMGUI_API void AddConvexPolyFilled(const ImVec2* points, int num_points, ImU32 col); // Note: Anti-aliased filling requires points to be in clockwise order. - IMGUI_API void AddBezierCurve(const ImVec2& pos0, const ImVec2& cp0, const ImVec2& cp1, const ImVec2& pos1, ImU32 col, float thickness, int num_segments = 0); + IMGUI_API void AddText(ImFont* font, float font_size, const ImVec2& pos, ImU32 col, const char* text_begin, const char* text_end = NULL, float wrap_width = 0.0f, const ImVec4* cpu_fine_clip_rect = NULL); + IMGUI_API void AddBezierCubic(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, ImU32 col, float thickness, int num_segments = 0); // Cubic Bezier (4 control points) + IMGUI_API void AddBezierQuadratic(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, ImU32 col, float thickness, int num_segments = 0); // Quadratic Bezier (3 control points) + + // General polygon + // - Only simple polygons are supported by filling functions (no self-intersections, no holes). + // - Concave polygon fill is more expensive than convex one: it has O(N^2) complexity. Provided as a convenience for the user but not used by the main library. + IMGUI_API void AddPolyline(const ImVec2* points, int num_points, ImU32 col, ImDrawFlags flags, float thickness); + IMGUI_API void AddConvexPolyFilled(const ImVec2* points, int num_points, ImU32 col); + IMGUI_API void AddConcavePolyFilled(const ImVec2* points, int num_points, ImU32 col); // Image primitives // - Read FAQ to understand what ImTextureID is. @@ -1937,44 +3282,80 @@ struct ImDrawList // - "uv_min" and "uv_max" represent the normalized texture coordinates to use for those corners. Using (0,0)->(1,1) texture coordinates will generally display the entire texture. IMGUI_API void AddImage(ImTextureID user_texture_id, const ImVec2& p_min, const ImVec2& p_max, const ImVec2& uv_min = ImVec2(0, 0), const ImVec2& uv_max = ImVec2(1, 1), ImU32 col = IM_COL32_WHITE); IMGUI_API void AddImageQuad(ImTextureID user_texture_id, const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, const ImVec2& uv1 = ImVec2(0, 0), const ImVec2& uv2 = ImVec2(1, 0), const ImVec2& uv3 = ImVec2(1, 1), const ImVec2& uv4 = ImVec2(0, 1), ImU32 col = IM_COL32_WHITE); - IMGUI_API void AddImageRounded(ImTextureID user_texture_id, const ImVec2& p_min, const ImVec2& p_max, const ImVec2& uv_min, const ImVec2& uv_max, ImU32 col, float rounding, ImDrawCornerFlags rounding_corners = ImDrawCornerFlags_All); + IMGUI_API void AddImageRounded(ImTextureID user_texture_id, const ImVec2& p_min, const ImVec2& p_max, const ImVec2& uv_min, const ImVec2& uv_max, ImU32 col, float rounding, ImDrawFlags flags = 0); // Stateful path API, add points then finish with PathFillConvex() or PathStroke() + // - Important: filled shapes must always use clockwise winding order! The anti-aliasing fringe depends on it. Counter-clockwise shapes will have "inward" anti-aliasing. + // so e.g. 'PathArcTo(center, radius, PI * -0.5f, PI)' is ok, whereas 'PathArcTo(center, radius, PI, PI * -0.5f)' won't have correct anti-aliasing when followed by PathFillConvex(). inline void PathClear() { _Path.Size = 0; } inline void PathLineTo(const ImVec2& pos) { _Path.push_back(pos); } - inline void PathLineToMergeDuplicate(const ImVec2& pos) { if (_Path.Size == 0 || memcmp(&_Path.Data[_Path.Size-1], &pos, 8) != 0) _Path.push_back(pos); } - inline void PathFillConvex(ImU32 col) { AddConvexPolyFilled(_Path.Data, _Path.Size, col); _Path.Size = 0; } // Note: Anti-aliased filling requires points to be in clockwise order. - inline void PathStroke(ImU32 col, bool closed, float thickness = 1.0f) { AddPolyline(_Path.Data, _Path.Size, col, closed, thickness); _Path.Size = 0; } - IMGUI_API void PathArcTo(const ImVec2& center, float radius, float a_min, float a_max, int num_segments = 10); - IMGUI_API void PathArcToFast(const ImVec2& center, float radius, int a_min_of_12, int a_max_of_12); // Use precomputed angles for a 12 steps circle - IMGUI_API void PathBezierCurveTo(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, int num_segments = 0); - IMGUI_API void PathRect(const ImVec2& rect_min, const ImVec2& rect_max, float rounding = 0.0f, ImDrawCornerFlags rounding_corners = ImDrawCornerFlags_All); + inline void PathLineToMergeDuplicate(const ImVec2& pos) { if (_Path.Size == 0 || memcmp(&_Path.Data[_Path.Size - 1], &pos, 8) != 0) _Path.push_back(pos); } + inline void PathFillConvex(ImU32 col) { AddConvexPolyFilled(_Path.Data, _Path.Size, col); _Path.Size = 0; } + inline void PathFillConcave(ImU32 col) { AddConcavePolyFilled(_Path.Data, _Path.Size, col); _Path.Size = 0; } + inline void PathStroke(ImU32 col, ImDrawFlags flags = 0, float thickness = 1.0f) { AddPolyline(_Path.Data, _Path.Size, col, flags, thickness); _Path.Size = 0; } + IMGUI_API void PathArcTo(const ImVec2& center, float radius, float a_min, float a_max, int num_segments = 0); + IMGUI_API void PathArcToFast(const ImVec2& center, float radius, int a_min_of_12, int a_max_of_12); // Use precomputed angles for a 12 steps circle + IMGUI_API void PathEllipticalArcTo(const ImVec2& center, const ImVec2& radius, float rot, float a_min, float a_max, int num_segments = 0); // Ellipse + IMGUI_API void PathBezierCubicCurveTo(const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, int num_segments = 0); // Cubic Bezier (4 control points) + IMGUI_API void PathBezierQuadraticCurveTo(const ImVec2& p2, const ImVec2& p3, int num_segments = 0); // Quadratic Bezier (3 control points) + IMGUI_API void PathRect(const ImVec2& rect_min, const ImVec2& rect_max, float rounding = 0.0f, ImDrawFlags flags = 0); - // Advanced - IMGUI_API void AddCallback(ImDrawCallback callback, void* callback_data); // Your rendering function must check for 'UserCallback' in ImDrawCmd and call the function instead of rendering triangles. + // Advanced: Draw Callbacks + // - May be used to alter render state (change sampler, blending, current shader). May be used to emit custom rendering commands (difficult to do correctly, but possible). + // - Use special ImDrawCallback_ResetRenderState callback to instruct backend to reset its render state to the default. + // - Your rendering loop must check for 'UserCallback' in ImDrawCmd and call the function instead of rendering triangles. All standard backends are honoring this. + // - For some backends, the callback may access selected render-states exposed by the backend in a ImGui_ImplXXXX_RenderState structure pointed to by platform_io.Renderer_RenderState. + // - IMPORTANT: please be mindful of the different level of indirection between using size==0 (copying argument) and using size>0 (copying pointed data into a buffer). + // - If userdata_size == 0: we copy/store the 'userdata' argument as-is. It will be available unmodified in ImDrawCmd::UserCallbackData during render. + // - If userdata_size > 0, we copy/store 'userdata_size' bytes pointed to by 'userdata'. We store them in a buffer stored inside the drawlist. ImDrawCmd::UserCallbackData will point inside that buffer so you have to retrieve data from there. Your callback may need to use ImDrawCmd::UserCallbackDataSize if you expect dynamically-sized data. + // - Support for userdata_size > 0 was added in v1.91.4, October 2024. So earlier code always only allowed to copy/store a simple void*. + IMGUI_API void AddCallback(ImDrawCallback callback, void* userdata, size_t userdata_size = 0); + + // Advanced: Miscellaneous IMGUI_API void AddDrawCmd(); // This is useful if you need to forcefully create a new draw call (to allow for dependent rendering / blending). Otherwise primitives are merged into the same draw-call as much as possible IMGUI_API ImDrawList* CloneOutput() const; // Create a clone of the CmdBuffer/IdxBuffer/VtxBuffer. // Advanced: Channels - // - Use to split render into layers. By switching channels to can render out-of-order (e.g. submit foreground primitives before background primitives) - // - Use to minimize draw calls (e.g. if going back-and-forth between multiple non-overlapping clipping rectangles, prefer to append into separate channels then merge at the end) + // - Use to split render into layers. By switching channels to can render out-of-order (e.g. submit FG primitives before BG primitives) + // - Use to minimize draw calls (e.g. if going back-and-forth between multiple clipping rectangles, prefer to append into separate channels then merge at the end) + // - This API shouldn't have been in ImDrawList in the first place! + // Prefer using your own persistent instance of ImDrawListSplitter as you can stack them. + // Using the ImDrawList::ChannelsXXXX you cannot stack a split over another. inline void ChannelsSplit(int count) { _Splitter.Split(this, count); } inline void ChannelsMerge() { _Splitter.Merge(this); } inline void ChannelsSetCurrent(int n) { _Splitter.SetCurrentChannel(this, n); } - // Internal helpers - // NB: all primitives needs to be reserved via PrimReserve() beforehand! - IMGUI_API void Clear(); - IMGUI_API void ClearFreeMemory(); + // Advanced: Primitives allocations + // - We render triangles (three vertices) + // - All primitives needs to be reserved via PrimReserve() beforehand. IMGUI_API void PrimReserve(int idx_count, int vtx_count); + IMGUI_API void PrimUnreserve(int idx_count, int vtx_count); IMGUI_API void PrimRect(const ImVec2& a, const ImVec2& b, ImU32 col); // Axis aligned rectangle (composed of two triangles) IMGUI_API void PrimRectUV(const ImVec2& a, const ImVec2& b, const ImVec2& uv_a, const ImVec2& uv_b, ImU32 col); IMGUI_API void PrimQuadUV(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& d, const ImVec2& uv_a, const ImVec2& uv_b, const ImVec2& uv_c, const ImVec2& uv_d, ImU32 col); - inline void PrimWriteVtx(const ImVec2& pos, const ImVec2& uv, ImU32 col){ _VtxWritePtr->pos = pos; _VtxWritePtr->uv = uv; _VtxWritePtr->col = col; _VtxWritePtr++; _VtxCurrentIdx++; } - inline void PrimWriteIdx(ImDrawIdx idx) { *_IdxWritePtr = idx; _IdxWritePtr++; } - inline void PrimVtx(const ImVec2& pos, const ImVec2& uv, ImU32 col) { PrimWriteIdx((ImDrawIdx)_VtxCurrentIdx); PrimWriteVtx(pos, uv, col); } - IMGUI_API void UpdateClipRect(); - IMGUI_API void UpdateTextureID(); + inline void PrimWriteVtx(const ImVec2& pos, const ImVec2& uv, ImU32 col) { _VtxWritePtr->pos = pos; _VtxWritePtr->uv = uv; _VtxWritePtr->col = col; _VtxWritePtr++; _VtxCurrentIdx++; } + inline void PrimWriteIdx(ImDrawIdx idx) { *_IdxWritePtr = idx; _IdxWritePtr++; } + inline void PrimVtx(const ImVec2& pos, const ImVec2& uv, ImU32 col) { PrimWriteIdx((ImDrawIdx)_VtxCurrentIdx); PrimWriteVtx(pos, uv, col); } // Write vertex with unique index + + // Obsolete names + //inline void AddEllipse(const ImVec2& center, float radius_x, float radius_y, ImU32 col, float rot = 0.0f, int num_segments = 0, float thickness = 1.0f) { AddEllipse(center, ImVec2(radius_x, radius_y), col, rot, num_segments, thickness); } // OBSOLETED in 1.90.5 (Mar 2024) + //inline void AddEllipseFilled(const ImVec2& center, float radius_x, float radius_y, ImU32 col, float rot = 0.0f, int num_segments = 0) { AddEllipseFilled(center, ImVec2(radius_x, radius_y), col, rot, num_segments); } // OBSOLETED in 1.90.5 (Mar 2024) + //inline void PathEllipticalArcTo(const ImVec2& center, float radius_x, float radius_y, float rot, float a_min, float a_max, int num_segments = 0) { PathEllipticalArcTo(center, ImVec2(radius_x, radius_y), rot, a_min, a_max, num_segments); } // OBSOLETED in 1.90.5 (Mar 2024) + //inline void AddBezierCurve(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, ImU32 col, float thickness, int num_segments = 0) { AddBezierCubic(p1, p2, p3, p4, col, thickness, num_segments); } // OBSOLETED in 1.80 (Jan 2021) + //inline void PathBezierCurveTo(const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, int num_segments = 0) { PathBezierCubicCurveTo(p2, p3, p4, num_segments); } // OBSOLETED in 1.80 (Jan 2021) + + // [Internal helpers] + IMGUI_API void _ResetForNewFrame(); + IMGUI_API void _ClearFreeMemory(); + IMGUI_API void _PopUnusedDrawCmd(); + IMGUI_API void _TryMergeDrawCmds(); + IMGUI_API void _OnChangedClipRect(); + IMGUI_API void _OnChangedTextureID(); + IMGUI_API void _OnChangedVtxOffset(); + IMGUI_API void _SetTextureID(ImTextureID texture_id); + IMGUI_API int _CalcCircleAutoSegmentCount(float radius) const; + IMGUI_API void _PathArcToFastEx(const ImVec2& center, float radius, int a_min_sample, int a_max_sample, int a_step); + IMGUI_API void _PathArcToN(const ImVec2& center, float radius, float a_min, float a_max, int num_segments); }; // All draw data to render a Dear ImGui frame @@ -1982,46 +3363,50 @@ struct ImDrawList // as this is one of the oldest structure exposed by the library! Basically, ImDrawList == CmdList) struct ImDrawData { - bool Valid; // Only valid after Render() is called and before the next NewFrame() is called. - ImDrawList** CmdLists; // Array of ImDrawList* to render. The ImDrawList are owned by ImGuiContext and only pointed to from here. - int CmdListsCount; // Number of ImDrawList* to render - int TotalIdxCount; // For convenience, sum of all ImDrawList's IdxBuffer.Size - int TotalVtxCount; // For convenience, sum of all ImDrawList's VtxBuffer.Size - ImVec2 DisplayPos; // Upper-left position of the viewport to render (== upper-left of the orthogonal projection matrix to use) - ImVec2 DisplaySize; // Size of the viewport to render (== io.DisplaySize for the main viewport) (DisplayPos + DisplaySize == lower-right of the orthogonal projection matrix to use) - ImVec2 FramebufferScale; // Amount of pixels for each unit of DisplaySize. Based on io.DisplayFramebufferScale. Generally (1,1) on normal display, (2,2) on OSX with Retina display. + bool Valid; // Only valid after Render() is called and before the next NewFrame() is called. + int CmdListsCount; // Number of ImDrawList* to render + int TotalIdxCount; // For convenience, sum of all ImDrawList's IdxBuffer.Size + int TotalVtxCount; // For convenience, sum of all ImDrawList's VtxBuffer.Size + ImVector CmdLists; // Array of ImDrawList* to render. The ImDrawLists are owned by ImGuiContext and only pointed to from here. + ImVec2 DisplayPos; // Top-left position of the viewport to render (== top-left of the orthogonal projection matrix to use) (== GetMainViewport()->Pos for the main viewport, == (0.0) in most single-viewport applications) + ImVec2 DisplaySize; // Size of the viewport to render (== GetMainViewport()->Size for the main viewport, == io.DisplaySize in most single-viewport applications) + ImVec2 FramebufferScale; // Amount of pixels for each unit of DisplaySize. Based on io.DisplayFramebufferScale. Generally (1,1) on normal display, (2,2) on OSX with Retina display. + ImGuiViewport* OwnerViewport; // Viewport carrying the ImDrawData instance, might be of use to the renderer (generally not). // Functions - ImDrawData() { Valid = false; Clear(); } - ~ImDrawData() { Clear(); } - void Clear() { Valid = false; CmdLists = NULL; CmdListsCount = TotalVtxCount = TotalIdxCount = 0; DisplayPos = DisplaySize = FramebufferScale = ImVec2(0.f, 0.f); } // The ImDrawList are owned by ImGuiContext! + ImDrawData() { Clear(); } + IMGUI_API void Clear(); + IMGUI_API void AddDrawList(ImDrawList* draw_list); // Helper to add an external draw list into an existing ImDrawData. IMGUI_API void DeIndexAllBuffers(); // Helper to convert all buffers from indexed to non-indexed, in case you cannot render indexed. Note: this is slow and most likely a waste of resources. Always prefer indexed rendering! IMGUI_API void ScaleClipRects(const ImVec2& fb_scale); // Helper to scale the ClipRect field of each ImDrawCmd. Use if your final output buffer is at a different scale than Dear ImGui expects, or if there is a difference between your window resolution and framebuffer resolution. }; //----------------------------------------------------------------------------- -// Font API (ImFontConfig, ImFontGlyph, ImFontAtlasFlags, ImFontAtlas, ImFontGlyphRangesBuilder, ImFont) +// [SECTION] Font API (ImFontConfig, ImFontGlyph, ImFontAtlasFlags, ImFontAtlas, ImFontGlyphRangesBuilder, ImFont) //----------------------------------------------------------------------------- +// A font input/source (we may rename this to ImFontSource in the future) struct ImFontConfig { void* FontData; // // TTF/OTF data int FontDataSize; // // TTF/OTF data size bool FontDataOwnedByAtlas; // true // TTF/OTF data ownership taken by the container ImFontAtlas (will delete memory itself). + bool MergeMode; // false // Merge into previous ImFont, so you can combine multiple inputs font into one ImFont (e.g. ASCII font + icons + Japanese glyphs). You may want to use GlyphOffset.y when merge font of different heights. + bool PixelSnapH; // false // Align every glyph AdvanceX to pixel boundaries. Useful e.g. if you are merging a non-pixel aligned font with the default font. If enabled, you can set OversampleH/V to 1. int FontNo; // 0 // Index of font within TTF/OTF file + int OversampleH; // 0 (2) // Rasterize at higher quality for sub-pixel positioning. 0 == auto == 1 or 2 depending on size. Note the difference between 2 and 3 is minimal. You can reduce this to 1 for large glyphs save memory. Read https://github.com/nothings/stb/blob/master/tests/oversample/README.md for details. + int OversampleV; // 0 (1) // Rasterize at higher quality for sub-pixel positioning. 0 == auto == 1. This is not really useful as we don't use sub-pixel positions on the Y axis. float SizePixels; // // Size in pixels for rasterizer (more or less maps to the resulting font height). - int OversampleH; // 3 // Rasterize at higher quality for sub-pixel positioning. Read https://github.com/nothings/stb/blob/master/tests/oversample/README.md for details. - int OversampleV; // 1 // Rasterize at higher quality for sub-pixel positioning. We don't use sub-pixel positions on the Y axis. - bool PixelSnapH; // false // Align every glyph to pixel boundary. Useful e.g. if you are merging a non-pixel aligned font with the default font. If enabled, you can set OversampleH/V to 1. - ImVec2 GlyphExtraSpacing; // 0, 0 // Extra spacing (in pixels) between glyphs. Only X axis is supported for now. + //ImVec2 GlyphExtraSpacing; // 0, 0 // (REMOVED IN 1.91.9: use GlyphExtraAdvanceX) ImVec2 GlyphOffset; // 0, 0 // Offset all glyphs from this font input. - const ImWchar* GlyphRanges; // NULL // Pointer to a user-provided list of Unicode range (2 value per range, values are inclusive, zero-terminated list). THE ARRAY DATA NEEDS TO PERSIST AS LONG AS THE FONT IS ALIVE. + const ImWchar* GlyphRanges; // NULL // THE ARRAY DATA NEEDS TO PERSIST AS LONG AS THE FONT IS ALIVE. Pointer to a user-provided list of Unicode range (2 value per range, values are inclusive, zero-terminated list). float GlyphMinAdvanceX; // 0 // Minimum AdvanceX for glyphs, set Min to align font icons, set both Min/Max to enforce mono-space font float GlyphMaxAdvanceX; // FLT_MAX // Maximum AdvanceX for glyphs - bool MergeMode; // false // Merge into previous ImFont, so you can combine multiple inputs font into one ImFont (e.g. ASCII font + icons + Japanese glyphs). You may want to use GlyphOffset.y when merge font of different heights. - unsigned int RasterizerFlags; // 0x00 // Settings for custom font rasterizer (e.g. ImGuiFreeType). Leave as zero if you aren't using one. - float RasterizerMultiply; // 1.0f // Brighten (>1.0f) or darken (<1.0f) font output. Brightening small fonts may be a good workaround to make them more readable. - ImWchar EllipsisChar; // -1 // Explicitly specify unicode codepoint of ellipsis character. When fonts are being merged first specified ellipsis will be used. + float GlyphExtraAdvanceX; // 0 // Extra spacing (in pixels) between glyphs. Please contact us if you are using this. + unsigned int FontBuilderFlags; // 0 // Settings for custom font builder. THIS IS BUILDER IMPLEMENTATION DEPENDENT. Leave as zero if unsure. + float RasterizerMultiply; // 1.0f // Linearly brighten (>1.0f) or darken (<1.0f) font output. Brightening small fonts may be a good workaround to make them more readable. This is a silly thing we may remove in the future. + float RasterizerDensity; // 1.0f // DPI scale for rasterization, not altering other font metrics: make it easy to swap between e.g. a 100% and a 400% fonts for a zooming display. IMPORTANT: If you increase this it is expected that you increase font scale accordingly, otherwise quality may look lowered. + ImWchar EllipsisChar; // 0 // Explicitly specify Unicode codepoint of ellipsis character. When fonts are being merged first specified ellipsis will be used. // [Internal] char Name[40]; // Name (strictly to ease debugging) @@ -2030,10 +3415,14 @@ struct ImFontConfig IMGUI_API ImFontConfig(); }; +// Hold rendering data for one glyph. +// (Note: some language parsers may fail to convert the 31+1 bitfield members, in this case maybe drop store a single u32 or we can rework this) struct ImFontGlyph { - ImWchar Codepoint; // 0x0000..0xFFFF - float AdvanceX; // Distance to next character (= data from font + ImFontConfig::GlyphExtraSpacing.x baked in) + unsigned int Colored : 1; // Flag to indicate glyph is colored and should generally ignore tinting (make it usable with no shift on little-endian as this is used in loops) + unsigned int Visible : 1; // Flag to indicate glyph has no visible pixels (e.g. space). Allow early out when rendering. + unsigned int Codepoint : 30; // 0x0000..0x10FFFF + float AdvanceX; // Horizontal distance to advance layout with float X0, Y0, X1, Y1; // Glyph corners float U0, V0, U1, V1; // Texture coordinates }; @@ -2044,11 +3433,11 @@ struct ImFontGlyphRangesBuilder { ImVector UsedChars; // Store 1-bit per Unicode code point (0=unused, 1=used) - ImFontGlyphRangesBuilder() { Clear(); } - inline void Clear() { int size_in_bytes = 0x10000 / 8; UsedChars.resize(size_in_bytes / (int)sizeof(ImU32)); memset(UsedChars.Data, 0, (size_t)size_in_bytes); } - inline bool GetBit(int n) const { int off = (n >> 5); ImU32 mask = 1u << (n & 31); return (UsedChars[off] & mask) != 0; } // Get bit n in the array - inline void SetBit(int n) { int off = (n >> 5); ImU32 mask = 1u << (n & 31); UsedChars[off] |= mask; } // Set bit n in the array - inline void AddChar(ImWchar c) { SetBit(c); } // Add character + ImFontGlyphRangesBuilder() { Clear(); } + inline void Clear() { int size_in_bytes = (IM_UNICODE_CODEPOINT_MAX + 1) / 8; UsedChars.resize(size_in_bytes / (int)sizeof(ImU32)); memset(UsedChars.Data, 0, (size_t)size_in_bytes); } + inline bool GetBit(size_t n) const { int off = (int)(n >> 5); ImU32 mask = 1u << (n & 31); return (UsedChars[off] & mask) != 0; } // Get bit n in the array + inline void SetBit(size_t n) { int off = (int)(n >> 5); ImU32 mask = 1u << (n & 31); UsedChars[off] |= mask; } // Set bit n in the array + inline void AddChar(ImWchar c) { SetBit(c); } // Add character IMGUI_API void AddText(const char* text, const char* text_end = NULL); // Add string (each character of the UTF-8 string are added) IMGUI_API void AddRanges(const ImWchar* ranges); // Add ranges, e.g. builder.AddRanges(ImFontAtlas::GetGlyphRangesDefault()) to force add all of ASCII/Latin+Ext IMGUI_API void BuildRanges(ImVector* out_ranges); // Output new ranges @@ -2057,21 +3446,26 @@ struct ImFontGlyphRangesBuilder // See ImFontAtlas::AddCustomRectXXX functions. struct ImFontAtlasCustomRect { - unsigned int ID; // Input // User ID. Use <0x10000 to map into a font glyph, >=0x10000 for other/internal/custom texture data. - unsigned short Width, Height; // Input // Desired rectangle dimension unsigned short X, Y; // Output // Packed position in Atlas - float GlyphAdvanceX; // Input // For custom font glyphs only (ID<0x10000): glyph xadvance - ImVec2 GlyphOffset; // Input // For custom font glyphs only (ID<0x10000): glyph display offset - ImFont* Font; // Input // For custom font glyphs only (ID<0x10000): target font - ImFontAtlasCustomRect() { ID = 0xFFFFFFFF; Width = Height = 0; X = Y = 0xFFFF; GlyphAdvanceX = 0.0f; GlyphOffset = ImVec2(0,0); Font = NULL; } + + // [Internal] + unsigned short Width, Height; // Input // Desired rectangle dimension + unsigned int GlyphID : 31; // Input // For custom font glyphs only (ID < 0x110000) + unsigned int GlyphColored : 1; // Input // For custom font glyphs only: glyph is colored, removed tinting. + float GlyphAdvanceX; // Input // For custom font glyphs only: glyph xadvance + ImVec2 GlyphOffset; // Input // For custom font glyphs only: glyph display offset + ImFont* Font; // Input // For custom font glyphs only: target font + ImFontAtlasCustomRect() { X = Y = 0xFFFF; Width = Height = 0; GlyphID = 0; GlyphColored = 0; GlyphAdvanceX = 0.0f; GlyphOffset = ImVec2(0, 0); Font = NULL; } bool IsPacked() const { return X != 0xFFFF; } }; +// Flags for ImFontAtlas build enum ImFontAtlasFlags_ { ImFontAtlasFlags_None = 0, ImFontAtlasFlags_NoPowerOfTwoHeight = 1 << 0, // Don't round the height to next power of two - ImFontAtlasFlags_NoMouseCursors = 1 << 1 // Don't build software mouse cursors into the atlas + ImFontAtlasFlags_NoMouseCursors = 1 << 1, // Don't build software mouse cursors into the atlas (save a little texture memory) + ImFontAtlasFlags_NoBakedLines = 1 << 2, // Don't build thick line textures into the atlas (save a little texture memory, allow support for point/nearest filtering). The AntiAliasedLinesUseTex features uses them, otherwise they will be rendered using polygons (more expensive for CPU/GPU). }; // Load and rasterize multiple TTF/OTF fonts into a same texture. The font atlas will build a single texture holding: @@ -2090,7 +3484,7 @@ enum ImFontAtlasFlags_ // - Important: By default, AddFontFromMemoryTTF() takes ownership of the data. Even though we are not writing to it, we will free the pointer on destruction. // You can set font_cfg->FontDataOwnedByAtlas=false to keep ownership of your data and it won't be freed, // - Even though many functions are suffixed with "TTF", OTF data is supported just as well. -// - This is an old API and it is currently awkward for those and and various other reasons! We will address them in the future! +// - This is an old API and it is currently awkward for those and various other reasons! We will address them in the future! struct ImFontAtlas { IMGUI_API ImFontAtlas(); @@ -2098,12 +3492,12 @@ struct ImFontAtlas IMGUI_API ImFont* AddFont(const ImFontConfig* font_cfg); IMGUI_API ImFont* AddFontDefault(const ImFontConfig* font_cfg = NULL); IMGUI_API ImFont* AddFontFromFileTTF(const char* filename, float size_pixels, const ImFontConfig* font_cfg = NULL, const ImWchar* glyph_ranges = NULL); - IMGUI_API ImFont* AddFontFromMemoryTTF(void* font_data, int font_size, float size_pixels, const ImFontConfig* font_cfg = NULL, const ImWchar* glyph_ranges = NULL); // Note: Transfer ownership of 'ttf_data' to ImFontAtlas! Will be deleted after destruction of the atlas. Set font_cfg->FontDataOwnedByAtlas=false to keep ownership of your data and it won't be freed. - IMGUI_API ImFont* AddFontFromMemoryCompressedTTF(const void* compressed_font_data, int compressed_font_size, float size_pixels, const ImFontConfig* font_cfg = NULL, const ImWchar* glyph_ranges = NULL); // 'compressed_font_data' still owned by caller. Compress with binary_to_compressed_c.cpp. + IMGUI_API ImFont* AddFontFromMemoryTTF(void* font_data, int font_data_size, float size_pixels, const ImFontConfig* font_cfg = NULL, const ImWchar* glyph_ranges = NULL); // Note: Transfer ownership of 'ttf_data' to ImFontAtlas! Will be deleted after destruction of the atlas. Set font_cfg->FontDataOwnedByAtlas=false to keep ownership of your data and it won't be freed. + IMGUI_API ImFont* AddFontFromMemoryCompressedTTF(const void* compressed_font_data, int compressed_font_data_size, float size_pixels, const ImFontConfig* font_cfg = NULL, const ImWchar* glyph_ranges = NULL); // 'compressed_font_data' still owned by caller. Compress with binary_to_compressed_c.cpp. IMGUI_API ImFont* AddFontFromMemoryCompressedBase85TTF(const char* compressed_font_data_base85, float size_pixels, const ImFontConfig* font_cfg = NULL, const ImWchar* glyph_ranges = NULL); // 'compressed_font_data_base85' still owned by caller. Compress with binary_to_compressed_c.cpp with -base85 parameter. IMGUI_API void ClearInputData(); // Clear input data (all ImFontConfig structures including sizes, TTF data, glyph ranges, etc.) = all the data used to build the texture and fonts. + IMGUI_API void ClearFonts(); // Clear input+output font data (same as ClearInputData() + glyphs storage, UV coordinates). IMGUI_API void ClearTexData(); // Clear output texture data (CPU side). Saves RAM once the texture has been copied to graphics memory. - IMGUI_API void ClearFonts(); // Clear output font data (glyphs storage, UV coordinates). IMGUI_API void Clear(); // Clear all input and output. // Build atlas, retrieve pixel data. @@ -2114,7 +3508,7 @@ struct ImFontAtlas IMGUI_API bool Build(); // Build pixels data. This is called automatically for you by the GetTexData*** functions. IMGUI_API void GetTexDataAsAlpha8(unsigned char** out_pixels, int* out_width, int* out_height, int* out_bytes_per_pixel = NULL); // 1 byte per-pixel IMGUI_API void GetTexDataAsRGBA32(unsigned char** out_pixels, int* out_width, int* out_height, int* out_bytes_per_pixel = NULL); // 4 bytes-per-pixel - bool IsBuilt() { return Fonts.Size > 0 && (TexPixelsAlpha8 != NULL || TexPixelsRGBA32 != NULL); } + bool IsBuilt() const { return Fonts.Size > 0 && TexReady; } // Bit ambiguous: used to detect when user didn't build texture but effectively we should check TexID != 0 except that would be backend dependent... void SetTexID(ImTextureID id) { TexID = id; } //------------------------------------------- @@ -2122,11 +3516,13 @@ struct ImFontAtlas //------------------------------------------- // Helpers to retrieve list of common Unicode ranges (2 value per range, values are inclusive, zero-terminated list) - // NB: Make sure that your string are UTF-8 and NOT in your local code page. In C++11, you can create UTF-8 string literal using the u8"Hello world" syntax. See FAQ for details. + // NB: Make sure that your string are UTF-8 and NOT in your local code page. + // Read https://github.com/ocornut/imgui/blob/master/docs/FONTS.md/#about-utf-8-encoding for details. // NB: Consider using ImFontGlyphRangesBuilder to build glyph ranges from textual data. IMGUI_API const ImWchar* GetGlyphRangesDefault(); // Basic Latin, Extended Latin + IMGUI_API const ImWchar* GetGlyphRangesGreek(); // Default + Greek and Coptic IMGUI_API const ImWchar* GetGlyphRangesKorean(); // Default + Korean characters - IMGUI_API const ImWchar* GetGlyphRangesJapanese(); // Default + Hiragana, Katakana, Half-Width, Selection of 1946 Ideographs + IMGUI_API const ImWchar* GetGlyphRangesJapanese(); // Default + Hiragana, Katakana, Half-Width, Selection of 2999 Ideographs IMGUI_API const ImWchar* GetGlyphRangesChineseFull(); // Default + Half-Width + Japanese Hiragana/Katakana + full set of about 21000 CJK Unified Ideographs IMGUI_API const ImWchar* GetGlyphRangesChineseSimplifiedCommon();// Default + Half-Width + Japanese Hiragana/Katakana + set of 2500 CJK Unified Ideographs for common simplified Chinese IMGUI_API const ImWchar* GetGlyphRangesCyrillic(); // Default + about 400 Cyrillic characters @@ -2134,34 +3530,39 @@ struct ImFontAtlas IMGUI_API const ImWchar* GetGlyphRangesVietnamese(); // Default + Vietnamese characters //------------------------------------------- - // [BETA] Custom Rectangles/Glyphs API + // [ALPHA] Custom Rectangles/Glyphs API //------------------------------------------- // You can request arbitrary rectangles to be packed into the atlas, for your own purposes. - // After calling Build(), you can query the rectangle position and render your pixels. - // You can also request your rectangles to be mapped as font glyph (given a font + Unicode point), - // so you can render e.g. custom colorful icons and use them as regular glyphs. - // Read misc/fonts/README.txt for more details about using colorful icons. - IMGUI_API int AddCustomRectRegular(unsigned int id, int width, int height); // Id needs to be >= 0x10000. Id >= 0x80000000 are reserved for ImGui and ImDrawList - IMGUI_API int AddCustomRectFontGlyph(ImFont* font, ImWchar id, int width, int height, float advance_x, const ImVec2& offset = ImVec2(0,0)); // Id needs to be < 0x10000 to register a rectangle to map into a specific font. - const ImFontAtlasCustomRect*GetCustomRectByIndex(int index) const { if (index < 0) return NULL; return &CustomRects[index]; } + // - After calling Build(), you can query the rectangle position and render your pixels. + // - If you render colored output, set 'atlas->TexPixelsUseColors = true' as this may help some backends decide of preferred texture format. + // - You can also request your rectangles to be mapped as font glyph (given a font + Unicode point), + // so you can render e.g. custom colorful icons and use them as regular glyphs. + // - Read docs/FONTS.md for more details about using colorful icons. + // - Note: this API may be redesigned later in order to support multi-monitor varying DPI settings. + IMGUI_API int AddCustomRectRegular(int width, int height); + IMGUI_API int AddCustomRectFontGlyph(ImFont* font, ImWchar id, int width, int height, float advance_x, const ImVec2& offset = ImVec2(0, 0)); + ImFontAtlasCustomRect* GetCustomRectByIndex(int index) { IM_ASSERT(index >= 0); return &CustomRects[index]; } // [Internal] - IMGUI_API void CalcCustomRectUV(const ImFontAtlasCustomRect* rect, ImVec2* out_uv_min, ImVec2* out_uv_max); - IMGUI_API bool GetMouseCursorTexData(ImGuiMouseCursor cursor, ImVec2* out_offset, ImVec2* out_size, ImVec2 out_uv_border[2], ImVec2 out_uv_fill[2]); + IMGUI_API void CalcCustomRectUV(const ImFontAtlasCustomRect* rect, ImVec2* out_uv_min, ImVec2* out_uv_max) const; //------------------------------------------- // Members //------------------------------------------- - bool Locked; // Marked as Locked by ImGui::NewFrame() so attempt to modify the atlas will assert. + // Input ImFontAtlasFlags Flags; // Build flags (see ImFontAtlasFlags_) ImTextureID TexID; // User data to refer to the texture once it has been uploaded to user's graphic systems. It is passed back to you during rendering via the ImDrawCmd structure. int TexDesiredWidth; // Texture width desired by user before Build(). Must be a power-of-two. If have many glyphs your graphics API have texture size restrictions you may want to increase texture width to decrease height. - int TexGlyphPadding; // Padding between glyphs within texture in pixels. Defaults to 1. If your rendering method doesn't rely on bilinear filtering you may set this to 0. + int TexGlyphPadding; // FIXME: Should be called "TexPackPadding". Padding between glyphs within texture in pixels. Defaults to 1. If your rendering method doesn't rely on bilinear filtering you may set this to 0 (will also need to set AntiAliasedLinesUseTex = false). + void* UserData; // Store your own atlas related user-data (if e.g. you have multiple font atlas). // [Internal] // NB: Access texture data via GetTexData*() calls! Which will setup a default font for you. + bool Locked; // Marked as Locked by ImGui::NewFrame() so attempt to modify the atlas will assert. + bool TexReady; // Set when texture was built matching current font input + bool TexPixelsUseColors; // Tell whether our texture data is known to use colors (rather than just alpha channel), in order to help backend select a format. unsigned char* TexPixelsAlpha8; // 1 component per pixel, each component is unsigned 8-bit. Total size = TexWidth * TexHeight unsigned int* TexPixelsRGBA32; // 4 component per pixel, each component is unsigned 8-bit. Total size = TexWidth * TexHeight * 4 int TexWidth; // Texture width calculated during Build(). @@ -2170,69 +3571,440 @@ struct ImFontAtlas ImVec2 TexUvWhitePixel; // Texture coordinates to a white pixel ImVector Fonts; // Hold all the fonts returned by AddFont*. Fonts[0] is the default font upon calling ImGui::NewFrame(), use ImGui::PushFont()/PopFont() to change the current font. ImVector CustomRects; // Rectangles for packing custom texture data into the atlas. - ImVector ConfigData; // Internal data - int CustomRectIds[1]; // Identifiers of custom texture rectangle used by ImFontAtlas/ImDrawList + ImVector Sources; // Source/configuration data + ImVec4 TexUvLines[IM_DRAWLIST_TEX_LINES_WIDTH_MAX + 1]; // UVs for baked anti-aliased lines -#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS - typedef ImFontAtlasCustomRect CustomRect; // OBSOLETED in 1.72+ - typedef ImFontGlyphRangesBuilder GlyphRangesBuilder; // OBSOLETED in 1.67+ -#endif + // [Internal] Font builder + const ImFontBuilderIO* FontBuilderIO; // Opaque interface to a font builder (default to stb_truetype, can be changed to use FreeType by defining IMGUI_ENABLE_FREETYPE). + unsigned int FontBuilderFlags; // Shared flags (for all fonts) for custom font builder. THIS IS BUILD IMPLEMENTATION DEPENDENT. Per-font override is also available in ImFontConfig. + + // [Internal] Packing data + int PackIdMouseCursors; // Custom texture rectangle ID for white pixel and mouse cursors + int PackIdLines; // Custom texture rectangle ID for baked anti-aliased lines + + // [Obsolete] + //typedef ImFontAtlasCustomRect CustomRect; // OBSOLETED in 1.72+ + //typedef ImFontGlyphRangesBuilder GlyphRangesBuilder; // OBSOLETED in 1.67+ }; // Font runtime data and rendering // ImFontAtlas automatically loads a default embedded font for you when you call GetTexDataAsAlpha8() or GetTexDataAsRGBA32(). struct ImFont { - // Members: Hot ~20/24 bytes (for CalcTextSize) - ImVector IndexAdvanceX; // 12-16 // out // // Sparse. Glyphs->AdvanceX in a directly indexable way (cache-friendly for CalcTextSize functions which only this this info, and are often bottleneck in large UI). + // [Internal] Members: Hot ~20/24 bytes (for CalcTextSize) + ImVector IndexAdvanceX; // 12-16 // out // Sparse. Glyphs->AdvanceX in a directly indexable way (cache-friendly for CalcTextSize functions which only this info, and are often bottleneck in large UI). float FallbackAdvanceX; // 4 // out // = FallbackGlyph->AdvanceX - float FontSize; // 4 // in // // Height of characters/line, set during loading (don't change after loading) + float FontSize; // 4 // in // Height of characters/line, set during loading (don't change after loading) - // Members: Hot ~36/48 bytes (for CalcTextSize + render loop) - ImVector IndexLookup; // 12-16 // out // // Sparse. Index glyphs by Unicode code-point. - ImVector Glyphs; // 12-16 // out // // All glyphs. - const ImFontGlyph* FallbackGlyph; // 4-8 // out // = FindGlyph(FontFallbackChar) - ImVec2 DisplayOffset; // 8 // in // = (0,0) // Offset font rendering by xx pixels + // [Internal] Members: Hot ~28/40 bytes (for RenderText loop) + ImVector IndexLookup; // 12-16 // out // Sparse. Index glyphs by Unicode code-point. + ImVector Glyphs; // 12-16 // out // All glyphs. + ImFontGlyph* FallbackGlyph; // 4-8 // out // = FindGlyph(FontFallbackChar) - // Members: Cold ~32/40 bytes - ImFontAtlas* ContainerAtlas; // 4-8 // out // // What we has been loaded into - const ImFontConfig* ConfigData; // 4-8 // in // // Pointer within ContainerAtlas->ConfigData - short ConfigDataCount; // 2 // in // ~ 1 // Number of ImFontConfig involved in creating this font. Bigger than 1 when merging multiple font sources into one ImFont. - ImWchar FallbackChar; // 2 // in // = '?' // Replacement character if a glyph isn't found. Only set via SetFallbackChar() - ImWchar EllipsisChar; // 2 // out // = -1 // Character used for ellipsis rendering. - float Scale; // 4 // in // = 1.f // Base font scale, multiplied by the per-window font scale which you can adjust with SetWindowFontScale() - float Ascent, Descent; // 4+4 // out // // Ascent: distance from top to bottom of e.g. 'A' [0..FontSize] - int MetricsTotalSurface;// 4 // out // // Total surface in pixels to get an idea of the font rasterization/texture cost (not exact, we approximate the cost of padding between glyphs) + // [Internal] Members: Cold ~32/40 bytes + // Conceptually Sources[] is the list of font sources merged to create this font. + ImFontAtlas* ContainerAtlas; // 4-8 // out // What we has been loaded into + ImFontConfig* Sources; // 4-8 // in // Pointer within ContainerAtlas->Sources[], to SourcesCount instances + short SourcesCount; // 2 // in // Number of ImFontConfig involved in creating this font. Usually 1, or >1 when merging multiple font sources into one ImFont. + short EllipsisCharCount; // 1 // out // 1 or 3 + ImWchar EllipsisChar; // 2-4 // out // Character used for ellipsis rendering ('...'). + ImWchar FallbackChar; // 2-4 // out // Character used if a glyph isn't found (U+FFFD, '?') + float EllipsisWidth; // 4 // out // Total ellipsis Width + float EllipsisCharStep; // 4 // out // Step between characters when EllipsisCount > 0 + float Scale; // 4 // in // Base font scale (1.0f), multiplied by the per-window font scale which you can adjust with SetWindowFontScale() + float Ascent, Descent; // 4+4 // out // Ascent: distance from top to bottom of e.g. 'A' [0..FontSize] (unscaled) + int MetricsTotalSurface;// 4 // out // Total surface in pixels to get an idea of the font rasterization/texture cost (not exact, we approximate the cost of padding between glyphs) bool DirtyLookupTables; // 1 // out // + ImU8 Used8kPagesMap[(IM_UNICODE_CODEPOINT_MAX+1)/8192/8]; // 1 bytes if ImWchar=ImWchar16, 16 bytes if ImWchar==ImWchar32. Store 1-bit for each block of 4K codepoints that has one active glyph. This is mainly used to facilitate iterations across all used codepoints. // Methods IMGUI_API ImFont(); IMGUI_API ~ImFont(); - IMGUI_API const ImFontGlyph*FindGlyph(ImWchar c) const; - IMGUI_API const ImFontGlyph*FindGlyphNoFallback(ImWchar c) const; - float GetCharAdvance(ImWchar c) const { return ((int)c < IndexAdvanceX.Size) ? IndexAdvanceX[(int)c] : FallbackAdvanceX; } - bool IsLoaded() const { return ContainerAtlas != NULL; } - const char* GetDebugName() const { return ConfigData ? ConfigData->Name : ""; } + IMGUI_API ImFontGlyph* FindGlyph(ImWchar c); + IMGUI_API ImFontGlyph* FindGlyphNoFallback(ImWchar c); + float GetCharAdvance(ImWchar c) { return ((int)c < IndexAdvanceX.Size) ? IndexAdvanceX[(int)c] : FallbackAdvanceX; } + bool IsLoaded() const { return ContainerAtlas != NULL; } + const char* GetDebugName() const { return Sources ? Sources->Name : ""; } + // [Internal] Don't use! // 'max_width' stops rendering after a certain width (could be turned into a 2d size). FLT_MAX to disable. // 'wrap_width' enable automatic word-wrapping across multiple lines to fit into given width. 0.0f to disable. - IMGUI_API ImVec2 CalcTextSizeA(float size, float max_width, float wrap_width, const char* text_begin, const char* text_end = NULL, const char** remaining = NULL) const; // utf8 - IMGUI_API const char* CalcWordWrapPositionA(float scale, const char* text, const char* text_end, float wrap_width) const; - IMGUI_API void RenderChar(ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col, ImWchar c) const; - IMGUI_API void RenderText(ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col, const ImVec4& clip_rect, const char* text_begin, const char* text_end, float wrap_width = 0.0f, bool cpu_fine_clip = false) const; + IMGUI_API ImVec2 CalcTextSizeA(float size, float max_width, float wrap_width, const char* text_begin, const char* text_end = NULL, const char** remaining = NULL); // utf8 + IMGUI_API const char* CalcWordWrapPositionA(float scale, const char* text, const char* text_end, float wrap_width); + IMGUI_API void RenderChar(ImDrawList* draw_list, float size, const ImVec2& pos, ImU32 col, ImWchar c); + IMGUI_API void RenderText(ImDrawList* draw_list, float size, const ImVec2& pos, ImU32 col, const ImVec4& clip_rect, const char* text_begin, const char* text_end, float wrap_width = 0.0f, bool cpu_fine_clip = false); // [Internal] Don't use! IMGUI_API void BuildLookupTable(); IMGUI_API void ClearOutputData(); IMGUI_API void GrowIndex(int new_size); - IMGUI_API void AddGlyph(ImWchar c, float x0, float y0, float x1, float y1, float u0, float v0, float u1, float v1, float advance_x); + IMGUI_API void AddGlyph(const ImFontConfig* src_cfg, ImWchar c, float x0, float y0, float x1, float y1, float u0, float v0, float u1, float v1, float advance_x); IMGUI_API void AddRemapChar(ImWchar dst, ImWchar src, bool overwrite_dst = true); // Makes 'dst' character/glyph points to 'src' character/glyph. Currently needs to be called AFTER fonts have been built. - IMGUI_API void SetFallbackChar(ImWchar c); + IMGUI_API bool IsGlyphRangeUnused(unsigned int c_begin, unsigned int c_last); +}; + +//----------------------------------------------------------------------------- +// [SECTION] Viewports +//----------------------------------------------------------------------------- + +// Flags stored in ImGuiViewport::Flags, giving indications to the platform backends. +enum ImGuiViewportFlags_ +{ + ImGuiViewportFlags_None = 0, + ImGuiViewportFlags_IsPlatformWindow = 1 << 0, // Represent a Platform Window + ImGuiViewportFlags_IsPlatformMonitor = 1 << 1, // Represent a Platform Monitor (unused yet) + ImGuiViewportFlags_OwnedByApp = 1 << 2, // Platform Window: Is created/managed by the user application? (rather than our backend) + ImGuiViewportFlags_NoDecoration = 1 << 3, // Platform Window: Disable platform decorations: title bar, borders, etc. (generally set all windows, but if ImGuiConfigFlags_ViewportsDecoration is set we only set this on popups/tooltips) + ImGuiViewportFlags_NoTaskBarIcon = 1 << 4, // Platform Window: Disable platform task bar icon (generally set on popups/tooltips, or all windows if ImGuiConfigFlags_ViewportsNoTaskBarIcon is set) + ImGuiViewportFlags_NoFocusOnAppearing = 1 << 5, // Platform Window: Don't take focus when created. + ImGuiViewportFlags_NoFocusOnClick = 1 << 6, // Platform Window: Don't take focus when clicked on. + ImGuiViewportFlags_NoInputs = 1 << 7, // Platform Window: Make mouse pass through so we can drag this window while peaking behind it. + ImGuiViewportFlags_NoRendererClear = 1 << 8, // Platform Window: Renderer doesn't need to clear the framebuffer ahead (because we will fill it entirely). + ImGuiViewportFlags_NoAutoMerge = 1 << 9, // Platform Window: Avoid merging this window into another host window. This can only be set via ImGuiWindowClass viewport flags override (because we need to now ahead if we are going to create a viewport in the first place!). + ImGuiViewportFlags_TopMost = 1 << 10, // Platform Window: Display on top (for tooltips only). + ImGuiViewportFlags_CanHostOtherWindows = 1 << 11, // Viewport can host multiple imgui windows (secondary viewports are associated to a single window). // FIXME: In practice there's still probably code making the assumption that this is always and only on the MainViewport. Will fix once we add support for "no main viewport". + + // Output status flags (from Platform) + ImGuiViewportFlags_IsMinimized = 1 << 12, // Platform Window: Window is minimized, can skip render. When minimized we tend to avoid using the viewport pos/size for clipping window or testing if they are contained in the viewport. + ImGuiViewportFlags_IsFocused = 1 << 13, // Platform Window: Window is focused (last call to Platform_GetWindowFocus() returned true) +}; + +// - Currently represents the Platform Window created by the application which is hosting our Dear ImGui windows. +// - With multi-viewport enabled, we extend this concept to have multiple active viewports. +// - In the future we will extend this concept further to also represent Platform Monitor and support a "no main platform window" operation mode. +// - About Main Area vs Work Area: +// - Main Area = entire viewport. +// - Work Area = entire viewport minus sections used by main menu bars (for platform windows), or by task bar (for platform monitor). +// - Windows are generally trying to stay within the Work Area of their host viewport. +struct ImGuiViewport +{ + ImGuiID ID; // Unique identifier for the viewport + ImGuiViewportFlags Flags; // See ImGuiViewportFlags_ + ImVec2 Pos; // Main Area: Position of the viewport (Dear ImGui coordinates are the same as OS desktop/native coordinates) + ImVec2 Size; // Main Area: Size of the viewport. + ImVec2 WorkPos; // Work Area: Position of the viewport minus task bars, menus bars, status bars (>= Pos) + ImVec2 WorkSize; // Work Area: Size of the viewport minus task bars, menu bars, status bars (<= Size) + float DpiScale; // 1.0f = 96 DPI = No extra scale. + ImGuiID ParentViewportId; // (Advanced) 0: no parent. Instruct the platform backend to setup a parent/child relationship between platform windows. + ImDrawData* DrawData; // The ImDrawData corresponding to this viewport. Valid after Render() and until the next call to NewFrame(). + + // Platform/Backend Dependent Data + // Our design separate the Renderer and Platform backends to facilitate combining default backends with each others. + // When our create your own backend for a custom engine, it is possible that both Renderer and Platform will be handled + // by the same system and you may not need to use all the UserData/Handle fields. + // The library never uses those fields, they are merely storage to facilitate backend implementation. + void* RendererUserData; // void* to hold custom data structure for the renderer (e.g. swap chain, framebuffers etc.). generally set by your Renderer_CreateWindow function. + void* PlatformUserData; // void* to hold custom data structure for the OS / platform (e.g. windowing info, render context). generally set by your Platform_CreateWindow function. + void* PlatformHandle; // void* to hold higher-level, platform window handle (e.g. HWND for Win32 backend, Uint32 WindowID for SDL, GLFWWindow* for GLFW), for FindViewportByPlatformHandle(). + void* PlatformHandleRaw; // void* to hold lower-level, platform-native window handle (always HWND on Win32 platform, unused for other platforms). + bool PlatformWindowCreated; // Platform window has been created (Platform_CreateWindow() has been called). This is false during the first frame where a viewport is being created. + bool PlatformRequestMove; // Platform window requested move (e.g. window was moved by the OS / host window manager, authoritative position will be OS window position) + bool PlatformRequestResize; // Platform window requested resize (e.g. window was resized by the OS / host window manager, authoritative size will be OS window size) + bool PlatformRequestClose; // Platform window requested closure (e.g. window was moved by the OS / host window manager, e.g. pressing ALT-F4) + + ImGuiViewport() { memset(this, 0, sizeof(*this)); } + ~ImGuiViewport() { IM_ASSERT(PlatformUserData == NULL && RendererUserData == NULL); } + + // Helpers + ImVec2 GetCenter() const { return ImVec2(Pos.x + Size.x * 0.5f, Pos.y + Size.y * 0.5f); } + ImVec2 GetWorkCenter() const { return ImVec2(WorkPos.x + WorkSize.x * 0.5f, WorkPos.y + WorkSize.y * 0.5f); } +}; + +//----------------------------------------------------------------------------- +// [SECTION] ImGuiPlatformIO + other Platform Dependent Interfaces (ImGuiPlatformMonitor, ImGuiPlatformImeData) +//----------------------------------------------------------------------------- + +// [BETA] (Optional) Multi-Viewport Support! +// If you are new to Dear ImGui and trying to integrate it into your engine, you can probably ignore this for now. +// +// This feature allows you to seamlessly drag Dear ImGui windows outside of your application viewport. +// This is achieved by creating new Platform/OS windows on the fly, and rendering into them. +// Dear ImGui manages the viewport structures, and the backend create and maintain one Platform/OS window for each of those viewports. +// +// See Recap: https://github.com/ocornut/imgui/wiki/Multi-Viewports +// See Glossary https://github.com/ocornut/imgui/wiki/Glossary for details about some of the terminology. +// +// About the coordinates system: +// - When multi-viewports are enabled, all Dear ImGui coordinates become absolute coordinates (same as OS coordinates!) +// - So e.g. ImGui::SetNextWindowPos(ImVec2(0,0)) will position a window relative to your primary monitor! +// - If you want to position windows relative to your main application viewport, use ImGui::GetMainViewport()->Pos as a base position. +// +// Steps to use multi-viewports in your application, when using a default backend from the examples/ folder: +// - Application: Enable feature with 'io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable'. +// - Backend: The backend initialization will setup all necessary ImGuiPlatformIO's functions and update monitors info every frame. +// - Application: In your main loop, call ImGui::UpdatePlatformWindows(), ImGui::RenderPlatformWindowsDefault() after EndFrame() or Render(). +// - Application: Fix absolute coordinates used in ImGui::SetWindowPos() or ImGui::SetNextWindowPos() calls. +// +// Steps to use multi-viewports in your application, when using a custom backend: +// - Important: THIS IS NOT EASY TO DO and comes with many subtleties not described here! +// It's also an experimental feature, so some of the requirements may evolve. +// Consider using default backends if you can. Either way, carefully follow and refer to examples/ backends for details. +// - Application: Enable feature with 'io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable'. +// - Backend: Hook ImGuiPlatformIO's Platform_* and Renderer_* callbacks (see below). +// Set 'io.BackendFlags |= ImGuiBackendFlags_PlatformHasViewports' and 'io.BackendFlags |= ImGuiBackendFlags_PlatformHasViewports'. +// Update ImGuiPlatformIO's Monitors list every frame. +// Update MousePos every frame, in absolute coordinates. +// - Application: In your main loop, call ImGui::UpdatePlatformWindows(), ImGui::RenderPlatformWindowsDefault() after EndFrame() or Render(). +// You may skip calling RenderPlatformWindowsDefault() if its API is not convenient for your needs. Read comments below. +// - Application: Fix absolute coordinates used in ImGui::SetWindowPos() or ImGui::SetNextWindowPos() calls. +// +// About ImGui::RenderPlatformWindowsDefault(): +// - This function is a mostly a _helper_ for the common-most cases, and to facilitate using default backends. +// - You can check its simple source code to understand what it does. +// It basically iterates secondary viewports and call 4 functions that are setup in ImGuiPlatformIO, if available: +// Platform_RenderWindow(), Renderer_RenderWindow(), Platform_SwapBuffers(), Renderer_SwapBuffers() +// Those functions pointers exists only for the benefit of RenderPlatformWindowsDefault(). +// - If you have very specific rendering needs (e.g. flipping multiple swap-chain simultaneously, unusual sync/threading issues, etc.), +// you may be tempted to ignore RenderPlatformWindowsDefault() and write customized code to perform your renderingg. +// You may decide to setup the platform_io's *RenderWindow and *SwapBuffers pointers and call your functions through those pointers, +// or you may decide to never setup those pointers and call your code directly. They are a convenience, not an obligatory interface. +//----------------------------------------------------------------------------- + +// Access via ImGui::GetPlatformIO() +struct ImGuiPlatformIO +{ + IMGUI_API ImGuiPlatformIO(); + + //------------------------------------------------------------------ + // Input - Interface with OS and Platform backend (most common stuff) + //------------------------------------------------------------------ + + // Optional: Access OS clipboard + // (default to use native Win32 clipboard on Windows, otherwise uses a private clipboard. Override to access OS clipboard on other architectures) + const char* (*Platform_GetClipboardTextFn)(ImGuiContext* ctx); + void (*Platform_SetClipboardTextFn)(ImGuiContext* ctx, const char* text); + void* Platform_ClipboardUserData; + + // Optional: Open link/folder/file in OS Shell + // (default to use ShellExecuteW() on Windows, system() on Linux/Mac) + bool (*Platform_OpenInShellFn)(ImGuiContext* ctx, const char* path); + void* Platform_OpenInShellUserData; + + // Optional: Notify OS Input Method Editor of the screen position of your cursor for text input position (e.g. when using Japanese/Chinese IME on Windows) + // (default to use native imm32 api on Windows) + void (*Platform_SetImeDataFn)(ImGuiContext* ctx, ImGuiViewport* viewport, ImGuiPlatformImeData* data); + void* Platform_ImeUserData; + //void (*SetPlatformImeDataFn)(ImGuiViewport* viewport, ImGuiPlatformImeData* data); // [Renamed to platform_io.PlatformSetImeDataFn in 1.91.1] + + // Optional: Platform locale + // [Experimental] Configure decimal point e.g. '.' or ',' useful for some languages (e.g. German), generally pulled from *localeconv()->decimal_point + ImWchar Platform_LocaleDecimalPoint; // '.' + + //------------------------------------------------------------------ + // Input - Interface with Renderer Backend + //------------------------------------------------------------------ + + // Written by some backends during ImGui_ImplXXXX_RenderDrawData() call to point backend_specific ImGui_ImplXXXX_RenderState* structure. + void* Renderer_RenderState; + + //------------------------------------------------------------------ + // Input - Interface with Platform & Renderer backends for Multi-Viewport support + //------------------------------------------------------------------ + + // For reference, the second column shows which function are generally calling the Platform Functions: + // N = ImGui::NewFrame() ~ beginning of the dear imgui frame: read info from platform/OS windows (latest size/position) + // F = ImGui::Begin(), ImGui::EndFrame() ~ during the dear imgui frame + // U = ImGui::UpdatePlatformWindows() ~ after the dear imgui frame: create and update all platform/OS windows + // R = ImGui::RenderPlatformWindowsDefault() ~ render + // D = ImGui::DestroyPlatformWindows() ~ shutdown + // The general idea is that NewFrame() we will read the current Platform/OS state, and UpdatePlatformWindows() will write to it. + + // The handlers are designed so we can mix and match two imgui_impl_xxxx files, one Platform backend and one Renderer backend. + // Custom engine backends will often provide both Platform and Renderer interfaces together and so may not need to use all functions. + // Platform functions are typically called _before_ their Renderer counterpart, apart from Destroy which are called the other way. + + // Platform Backend functions (e.g. Win32, GLFW, SDL) ------------------- Called by ----- + void (*Platform_CreateWindow)(ImGuiViewport* vp); // . . U . . // Create a new platform window for the given viewport + void (*Platform_DestroyWindow)(ImGuiViewport* vp); // N . U . D // + void (*Platform_ShowWindow)(ImGuiViewport* vp); // . . U . . // Newly created windows are initially hidden so SetWindowPos/Size/Title can be called on them before showing the window + void (*Platform_SetWindowPos)(ImGuiViewport* vp, ImVec2 pos); // . . U . . // Set platform window position (given the upper-left corner of client area) + ImVec2 (*Platform_GetWindowPos)(ImGuiViewport* vp); // N . . . . // + void (*Platform_SetWindowSize)(ImGuiViewport* vp, ImVec2 size); // . . U . . // Set platform window client area size (ignoring OS decorations such as OS title bar etc.) + ImVec2 (*Platform_GetWindowSize)(ImGuiViewport* vp); // N . . . . // Get platform window client area size + void (*Platform_SetWindowFocus)(ImGuiViewport* vp); // N . . . . // Move window to front and set input focus + bool (*Platform_GetWindowFocus)(ImGuiViewport* vp); // . . U . . // + bool (*Platform_GetWindowMinimized)(ImGuiViewport* vp); // N . . . . // Get platform window minimized state. When minimized, we generally won't attempt to get/set size and contents will be culled more easily + void (*Platform_SetWindowTitle)(ImGuiViewport* vp, const char* str); // . . U . . // Set platform window title (given an UTF-8 string) + void (*Platform_SetWindowAlpha)(ImGuiViewport* vp, float alpha); // . . U . . // (Optional) Setup global transparency (not per-pixel transparency) + void (*Platform_UpdateWindow)(ImGuiViewport* vp); // . . U . . // (Optional) Called by UpdatePlatformWindows(). Optional hook to allow the platform backend from doing general book-keeping every frame. + void (*Platform_RenderWindow)(ImGuiViewport* vp, void* render_arg); // . . . R . // (Optional) Main rendering (platform side! This is often unused, or just setting a "current" context for OpenGL bindings). 'render_arg' is the value passed to RenderPlatformWindowsDefault(). + void (*Platform_SwapBuffers)(ImGuiViewport* vp, void* render_arg); // . . . R . // (Optional) Call Present/SwapBuffers (platform side! This is often unused!). 'render_arg' is the value passed to RenderPlatformWindowsDefault(). + float (*Platform_GetWindowDpiScale)(ImGuiViewport* vp); // N . . . . // (Optional) [BETA] FIXME-DPI: DPI handling: Return DPI scale for this viewport. 1.0f = 96 DPI. + void (*Platform_OnChangedViewport)(ImGuiViewport* vp); // . F . . . // (Optional) [BETA] FIXME-DPI: DPI handling: Called during Begin() every time the viewport we are outputting into changes, so backend has a chance to swap fonts to adjust style. + ImVec4 (*Platform_GetWindowWorkAreaInsets)(ImGuiViewport* vp); // N . . . . // (Optional) [BETA] Get initial work area inset for the viewport (won't be covered by main menu bar, dockspace over viewport etc.). Default to (0,0),(0,0). 'safeAreaInsets' in iOS land, 'DisplayCutout' in Android land. + int (*Platform_CreateVkSurface)(ImGuiViewport* vp, ImU64 vk_inst, const void* vk_allocators, ImU64* out_vk_surface); // (Optional) For a Vulkan Renderer to call into Platform code (since the surface creation needs to tie them both). + + // Renderer Backend functions (e.g. DirectX, OpenGL, Vulkan) ------------ Called by ----- + void (*Renderer_CreateWindow)(ImGuiViewport* vp); // . . U . . // Create swap chain, frame buffers etc. (called after Platform_CreateWindow) + void (*Renderer_DestroyWindow)(ImGuiViewport* vp); // N . U . D // Destroy swap chain, frame buffers etc. (called before Platform_DestroyWindow) + void (*Renderer_SetWindowSize)(ImGuiViewport* vp, ImVec2 size); // . . U . . // Resize swap chain, frame buffers etc. (called after Platform_SetWindowSize) + void (*Renderer_RenderWindow)(ImGuiViewport* vp, void* render_arg); // . . . R . // (Optional) Clear framebuffer, setup render target, then render the viewport->DrawData. 'render_arg' is the value passed to RenderPlatformWindowsDefault(). + void (*Renderer_SwapBuffers)(ImGuiViewport* vp, void* render_arg); // . . . R . // (Optional) Call Present/SwapBuffers. 'render_arg' is the value passed to RenderPlatformWindowsDefault(). + + // (Optional) Monitor list + // - Updated by: app/backend. Update every frame to dynamically support changing monitor or DPI configuration. + // - Used by: dear imgui to query DPI info, clamp popups/tooltips within same monitor and not have them straddle monitors. + ImVector Monitors; + + //------------------------------------------------------------------ + // Output - List of viewports to render into platform windows + //------------------------------------------------------------------ + + // Viewports list (the list is updated by calling ImGui::EndFrame or ImGui::Render) + // (in the future we will attempt to organize this feature to remove the need for a "main viewport") + ImVector Viewports; // Main viewports, followed by all secondary viewports. +}; + +// (Optional) This is required when enabling multi-viewport. Represent the bounds of each connected monitor/display and their DPI. +// We use this information for multiple DPI support + clamping the position of popups and tooltips so they don't straddle multiple monitors. +struct ImGuiPlatformMonitor +{ + ImVec2 MainPos, MainSize; // Coordinates of the area displayed on this monitor (Min = upper left, Max = bottom right) + ImVec2 WorkPos, WorkSize; // Coordinates without task bars / side bars / menu bars. Used to avoid positioning popups/tooltips inside this region. If you don't have this info, please copy the value for MainPos/MainSize. + float DpiScale; // 1.0f = 96 DPI + void* PlatformHandle; // Backend dependant data (e.g. HMONITOR, GLFWmonitor*, SDL Display Index, NSScreen*) + ImGuiPlatformMonitor() { MainPos = MainSize = WorkPos = WorkSize = ImVec2(0, 0); DpiScale = 1.0f; PlatformHandle = NULL; } +}; + +// (Optional) Support for IME (Input Method Editor) via the platform_io.Platform_SetImeDataFn() function. +struct ImGuiPlatformImeData +{ + bool WantVisible; // A widget wants the IME to be visible + ImVec2 InputPos; // Position of the input cursor + float InputLineHeight; // Line height + + ImGuiPlatformImeData() { memset(this, 0, sizeof(*this)); } +}; + +//----------------------------------------------------------------------------- +// [SECTION] Obsolete functions and types +// (Will be removed! Read 'API BREAKING CHANGES' section in imgui.cpp for details) +// Please keep your copy of dear imgui up to date! Occasionally set '#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS' in imconfig.h to stay ahead. +//----------------------------------------------------------------------------- #ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS - typedef ImFontGlyph Glyph; // OBSOLETED in 1.52+ +namespace ImGui +{ + // OBSOLETED in 1.91.9 (from February 2025) + IMGUI_API void Image(ImTextureID user_texture_id, const ImVec2& image_size, const ImVec2& uv0, const ImVec2& uv1, const ImVec4& tint_col, const ImVec4& border_col); // <-- border_col was removed in favor of ImGuiCol_ImageBorder. + // OBSOLETED in 1.91.0 (from July 2024) + static inline void PushButtonRepeat(bool repeat) { PushItemFlag(ImGuiItemFlags_ButtonRepeat, repeat); } + static inline void PopButtonRepeat() { PopItemFlag(); } + static inline void PushTabStop(bool tab_stop) { PushItemFlag(ImGuiItemFlags_NoTabStop, !tab_stop); } + static inline void PopTabStop() { PopItemFlag(); } + IMGUI_API ImVec2 GetContentRegionMax(); // Content boundaries max (e.g. window boundaries including scrolling, or current column boundaries). You should never need this. Always use GetCursorScreenPos() and GetContentRegionAvail()! + IMGUI_API ImVec2 GetWindowContentRegionMin(); // Content boundaries min for the window (roughly (0,0)-Scroll), in window-local coordinates. You should never need this. Always use GetCursorScreenPos() and GetContentRegionAvail()! + IMGUI_API ImVec2 GetWindowContentRegionMax(); // Content boundaries max for the window (roughly (0,0)+Size-Scroll), in window-local coordinates. You should never need this. Always use GetCursorScreenPos() and GetContentRegionAvail()! + // OBSOLETED in 1.90.0 (from September 2023) + static inline bool BeginChildFrame(ImGuiID id, const ImVec2& size, ImGuiWindowFlags window_flags = 0) { return BeginChild(id, size, ImGuiChildFlags_FrameStyle, window_flags); } + static inline void EndChildFrame() { EndChild(); } + //static inline bool BeginChild(const char* str_id, const ImVec2& size_arg, bool borders, ImGuiWindowFlags window_flags){ return BeginChild(str_id, size_arg, borders ? ImGuiChildFlags_Borders : ImGuiChildFlags_None, window_flags); } // Unnecessary as true == ImGuiChildFlags_Borders + //static inline bool BeginChild(ImGuiID id, const ImVec2& size_arg, bool borders, ImGuiWindowFlags window_flags) { return BeginChild(id, size_arg, borders ? ImGuiChildFlags_Borders : ImGuiChildFlags_None, window_flags); } // Unnecessary as true == ImGuiChildFlags_Borders + static inline void ShowStackToolWindow(bool* p_open = NULL) { ShowIDStackToolWindow(p_open); } + IMGUI_API bool Combo(const char* label, int* current_item, bool (*old_callback)(void* user_data, int idx, const char** out_text), void* user_data, int items_count, int popup_max_height_in_items = -1); + IMGUI_API bool ListBox(const char* label, int* current_item, bool (*old_callback)(void* user_data, int idx, const char** out_text), void* user_data, int items_count, int height_in_items = -1); + // OBSOLETED in 1.89.7 (from June 2023) + IMGUI_API void SetItemAllowOverlap(); // Use SetNextItemAllowOverlap() before item. + // OBSOLETED in 1.89.4 (from March 2023) + static inline void PushAllowKeyboardFocus(bool tab_stop) { PushItemFlag(ImGuiItemFlags_NoTabStop, !tab_stop); } + static inline void PopAllowKeyboardFocus() { PopItemFlag(); } + + // Some of the older obsolete names along with their replacement (commented out so they are not reported in IDE) + //-- OBSOLETED in 1.89 (from August 2022) + //IMGUI_API bool ImageButton(ImTextureID user_texture_id, const ImVec2& size, const ImVec2& uv0 = ImVec2(0, 0), const ImVec2& uv1 = ImVec2(1, 1), int frame_padding = -1, const ImVec4& bg_col = ImVec4(0, 0, 0, 0), const ImVec4& tint_col = ImVec4(1, 1, 1, 1)); // --> Use new ImageButton() signature (explicit item id, regular FramePadding). Refer to code in 1.91 if you want to grab a copy of this version. + //-- OBSOLETED in 1.88 (from May 2022) + //static inline void CaptureKeyboardFromApp(bool want_capture_keyboard = true) { SetNextFrameWantCaptureKeyboard(want_capture_keyboard); } // Renamed as name was misleading + removed default value. + //static inline void CaptureMouseFromApp(bool want_capture_mouse = true) { SetNextFrameWantCaptureMouse(want_capture_mouse); } // Renamed as name was misleading + removed default value. + //-- OBSOLETED in 1.87 (from February 2022, more formally obsoleted April 2024) + //IMGUI_API ImGuiKey GetKeyIndex(ImGuiKey key); { IM_ASSERT(key >= ImGuiKey_NamedKey_BEGIN && key < ImGuiKey_NamedKey_END); const ImGuiKeyData* key_data = GetKeyData(key); return (ImGuiKey)(key_data - g.IO.KeysData); } // Map ImGuiKey_* values into legacy native key index. == io.KeyMap[key]. When using a 1.87+ backend using io.AddKeyEvent(), calling GetKeyIndex() with ANY ImGuiKey_XXXX values will return the same value! + //static inline ImGuiKey GetKeyIndex(ImGuiKey key) { IM_ASSERT(key >= ImGuiKey_NamedKey_BEGIN && key < ImGuiKey_NamedKey_END); return key; } + //-- OBSOLETED in 1.86 (from November 2021) + //IMGUI_API void CalcListClipping(int items_count, float items_height, int* out_items_display_start, int* out_items_display_end); // Code removed, see 1.90 for last version of the code. Calculate range of visible items for large list of evenly sized items. Prefer using ImGuiListClipper. + //-- OBSOLETED in 1.85 (from August 2021) + //static inline float GetWindowContentRegionWidth() { return GetWindowContentRegionMax().x - GetWindowContentRegionMin().x; } + //-- OBSOLETED in 1.81 (from February 2021) + //static inline bool ListBoxHeader(const char* label, const ImVec2& size = ImVec2(0, 0)) { return BeginListBox(label, size); } + //static inline bool ListBoxHeader(const char* label, int items_count, int height_in_items = -1) { float height = GetTextLineHeightWithSpacing() * ((height_in_items < 0 ? ImMin(items_count, 7) : height_in_items) + 0.25f) + GetStyle().FramePadding.y * 2.0f; return BeginListBox(label, ImVec2(0.0f, height)); } // Helper to calculate size from items_count and height_in_items + //static inline void ListBoxFooter() { EndListBox(); } + //-- OBSOLETED in 1.79 (from August 2020) + //static inline void OpenPopupContextItem(const char* str_id = NULL, ImGuiMouseButton mb = 1) { OpenPopupOnItemClick(str_id, mb); } // Bool return value removed. Use IsWindowAppearing() in BeginPopup() instead. Renamed in 1.77, renamed back in 1.79. Sorry! + //-- OBSOLETED in 1.78 (from June 2020): Old drag/sliders functions that took a 'float power > 1.0f' argument instead of ImGuiSliderFlags_Logarithmic. See github.com/ocornut/imgui/issues/3361 for details. + //IMGUI_API bool DragScalar(const char* label, ImGuiDataType data_type, void* p_data, float v_speed, const void* p_min, const void* p_max, const char* format, float power = 1.0f) // OBSOLETED in 1.78 (from June 2020) + //IMGUI_API bool DragScalarN(const char* label, ImGuiDataType data_type, void* p_data, int components, float v_speed, const void* p_min, const void* p_max, const char* format, float power = 1.0f); // OBSOLETED in 1.78 (from June 2020) + //IMGUI_API bool SliderScalar(const char* label, ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max, const char* format, float power = 1.0f); // OBSOLETED in 1.78 (from June 2020) + //IMGUI_API bool SliderScalarN(const char* label, ImGuiDataType data_type, void* p_data, int components, const void* p_min, const void* p_max, const char* format, float power = 1.0f); // OBSOLETED in 1.78 (from June 2020) + //static inline bool DragFloat(const char* label, float* v, float v_speed, float v_min, float v_max, const char* format, float power = 1.0f) { return DragScalar(label, ImGuiDataType_Float, v, v_speed, &v_min, &v_max, format, power); } // OBSOLETED in 1.78 (from June 2020) + //static inline bool DragFloat2(const char* label, float v[2], float v_speed, float v_min, float v_max, const char* format, float power = 1.0f) { return DragScalarN(label, ImGuiDataType_Float, v, 2, v_speed, &v_min, &v_max, format, power); } // OBSOLETED in 1.78 (from June 2020) + //static inline bool DragFloat3(const char* label, float v[3], float v_speed, float v_min, float v_max, const char* format, float power = 1.0f) { return DragScalarN(label, ImGuiDataType_Float, v, 3, v_speed, &v_min, &v_max, format, power); } // OBSOLETED in 1.78 (from June 2020) + //static inline bool DragFloat4(const char* label, float v[4], float v_speed, float v_min, float v_max, const char* format, float power = 1.0f) { return DragScalarN(label, ImGuiDataType_Float, v, 4, v_speed, &v_min, &v_max, format, power); } // OBSOLETED in 1.78 (from June 2020) + //static inline bool SliderFloat(const char* label, float* v, float v_min, float v_max, const char* format, float power = 1.0f) { return SliderScalar(label, ImGuiDataType_Float, v, &v_min, &v_max, format, power); } // OBSOLETED in 1.78 (from June 2020) + //static inline bool SliderFloat2(const char* label, float v[2], float v_min, float v_max, const char* format, float power = 1.0f) { return SliderScalarN(label, ImGuiDataType_Float, v, 2, &v_min, &v_max, format, power); } // OBSOLETED in 1.78 (from June 2020) + //static inline bool SliderFloat3(const char* label, float v[3], float v_min, float v_max, const char* format, float power = 1.0f) { return SliderScalarN(label, ImGuiDataType_Float, v, 3, &v_min, &v_max, format, power); } // OBSOLETED in 1.78 (from June 2020) + //static inline bool SliderFloat4(const char* label, float v[4], float v_min, float v_max, const char* format, float power = 1.0f) { return SliderScalarN(label, ImGuiDataType_Float, v, 4, &v_min, &v_max, format, power); } // OBSOLETED in 1.78 (from June 2020) + //-- OBSOLETED in 1.77 and before + //static inline bool BeginPopupContextWindow(const char* str_id, ImGuiMouseButton mb, bool over_items) { return BeginPopupContextWindow(str_id, mb | (over_items ? 0 : ImGuiPopupFlags_NoOpenOverItems)); } // OBSOLETED in 1.77 (from June 2020) + //static inline void TreeAdvanceToLabelPos() { SetCursorPosX(GetCursorPosX() + GetTreeNodeToLabelSpacing()); } // OBSOLETED in 1.72 (from July 2019) + //static inline void SetNextTreeNodeOpen(bool open, ImGuiCond cond = 0) { SetNextItemOpen(open, cond); } // OBSOLETED in 1.71 (from June 2019) + //static inline float GetContentRegionAvailWidth() { return GetContentRegionAvail().x; } // OBSOLETED in 1.70 (from May 2019) + //static inline ImDrawList* GetOverlayDrawList() { return GetForegroundDrawList(); } // OBSOLETED in 1.69 (from Mar 2019) + //static inline void SetScrollHere(float ratio = 0.5f) { SetScrollHereY(ratio); } // OBSOLETED in 1.66 (from Nov 2018) + //static inline bool IsItemDeactivatedAfterChange() { return IsItemDeactivatedAfterEdit(); } // OBSOLETED in 1.63 (from Aug 2018) + //-- OBSOLETED in 1.60 and before + //static inline bool IsAnyWindowFocused() { return IsWindowFocused(ImGuiFocusedFlags_AnyWindow); } // OBSOLETED in 1.60 (from Apr 2018) + //static inline bool IsAnyWindowHovered() { return IsWindowHovered(ImGuiHoveredFlags_AnyWindow); } // OBSOLETED in 1.60 (between Dec 2017 and Apr 2018) + //static inline void ShowTestWindow() { return ShowDemoWindow(); } // OBSOLETED in 1.53 (between Oct 2017 and Dec 2017) + //static inline bool IsRootWindowFocused() { return IsWindowFocused(ImGuiFocusedFlags_RootWindow); } // OBSOLETED in 1.53 (between Oct 2017 and Dec 2017) + //static inline bool IsRootWindowOrAnyChildFocused() { return IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows); } // OBSOLETED in 1.53 (between Oct 2017 and Dec 2017) + //static inline void SetNextWindowContentWidth(float w) { SetNextWindowContentSize(ImVec2(w, 0.0f)); } // OBSOLETED in 1.53 (between Oct 2017 and Dec 2017) + //static inline float GetItemsLineHeightWithSpacing() { return GetFrameHeightWithSpacing(); } // OBSOLETED in 1.53 (between Oct 2017 and Dec 2017) + //IMGUI_API bool Begin(char* name, bool* p_open, ImVec2 size_first_use, float bg_alpha = -1.0f, ImGuiWindowFlags flags=0); // OBSOLETED in 1.52 (between Aug 2017 and Oct 2017): Equivalent of using SetNextWindowSize(size, ImGuiCond_FirstUseEver) and SetNextWindowBgAlpha(). + //static inline bool IsRootWindowOrAnyChildHovered() { return IsWindowHovered(ImGuiHoveredFlags_RootAndChildWindows); } // OBSOLETED in 1.52 (between Aug 2017 and Oct 2017) + //static inline void AlignFirstTextHeightToWidgets() { AlignTextToFramePadding(); } // OBSOLETED in 1.52 (between Aug 2017 and Oct 2017) + //static inline void SetNextWindowPosCenter(ImGuiCond c=0) { SetNextWindowPos(GetMainViewport()->GetCenter(), c, ImVec2(0.5f,0.5f)); } // OBSOLETED in 1.52 (between Aug 2017 and Oct 2017) + //static inline bool IsItemHoveredRect() { return IsItemHovered(ImGuiHoveredFlags_RectOnly); } // OBSOLETED in 1.51 (between Jun 2017 and Aug 2017) + //static inline bool IsPosHoveringAnyWindow(const ImVec2&) { IM_ASSERT(0); return false; } // OBSOLETED in 1.51 (between Jun 2017 and Aug 2017): This was misleading and partly broken. You probably want to use the io.WantCaptureMouse flag instead. + //static inline bool IsMouseHoveringAnyWindow() { return IsWindowHovered(ImGuiHoveredFlags_AnyWindow); } // OBSOLETED in 1.51 (between Jun 2017 and Aug 2017) + //static inline bool IsMouseHoveringWindow() { return IsWindowHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup | ImGuiHoveredFlags_AllowWhenBlockedByActiveItem); } // OBSOLETED in 1.51 (between Jun 2017 and Aug 2017) + //-- OBSOLETED in 1.50 and before + //static inline bool CollapsingHeader(char* label, const char* str_id, bool framed = true, bool default_open = false) { return CollapsingHeader(label, (default_open ? (1 << 5) : 0)); } // OBSOLETED in 1.49 + //static inline ImFont*GetWindowFont() { return GetFont(); } // OBSOLETED in 1.48 + //static inline float GetWindowFontSize() { return GetFontSize(); } // OBSOLETED in 1.48 + //static inline void SetScrollPosHere() { SetScrollHere(); } // OBSOLETED in 1.42 +} + +//-- OBSOLETED in 1.82 (from Mars 2021): flags for AddRect(), AddRectFilled(), AddImageRounded(), PathRect() +//typedef ImDrawFlags ImDrawCornerFlags; +//enum ImDrawCornerFlags_ +//{ +// ImDrawCornerFlags_None = ImDrawFlags_RoundCornersNone, // Was == 0 prior to 1.82, this is now == ImDrawFlags_RoundCornersNone which is != 0 and not implicit +// ImDrawCornerFlags_TopLeft = ImDrawFlags_RoundCornersTopLeft, // Was == 0x01 (1 << 0) prior to 1.82. Order matches ImDrawFlags_NoRoundCorner* flag (we exploit this internally). +// ImDrawCornerFlags_TopRight = ImDrawFlags_RoundCornersTopRight, // Was == 0x02 (1 << 1) prior to 1.82. +// ImDrawCornerFlags_BotLeft = ImDrawFlags_RoundCornersBottomLeft, // Was == 0x04 (1 << 2) prior to 1.82. +// ImDrawCornerFlags_BotRight = ImDrawFlags_RoundCornersBottomRight, // Was == 0x08 (1 << 3) prior to 1.82. +// ImDrawCornerFlags_All = ImDrawFlags_RoundCornersAll, // Was == 0x0F prior to 1.82 +// ImDrawCornerFlags_Top = ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_TopRight, +// ImDrawCornerFlags_Bot = ImDrawCornerFlags_BotLeft | ImDrawCornerFlags_BotRight, +// ImDrawCornerFlags_Left = ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_BotLeft, +// ImDrawCornerFlags_Right = ImDrawCornerFlags_TopRight | ImDrawCornerFlags_BotRight, +//}; + +// RENAMED and MERGED both ImGuiKey_ModXXX and ImGuiModFlags_XXX into ImGuiMod_XXX (from September 2022) +// RENAMED ImGuiKeyModFlags -> ImGuiModFlags in 1.88 (from April 2022). Exceptionally commented out ahead of obscolescence schedule to reduce confusion and because they were not meant to be used in the first place. +//typedef ImGuiKeyChord ImGuiModFlags; // == int. We generally use ImGuiKeyChord to mean "a ImGuiKey or-ed with any number of ImGuiMod_XXX value", so you may store mods in there. +//enum ImGuiModFlags_ { ImGuiModFlags_None = 0, ImGuiModFlags_Ctrl = ImGuiMod_Ctrl, ImGuiModFlags_Shift = ImGuiMod_Shift, ImGuiModFlags_Alt = ImGuiMod_Alt, ImGuiModFlags_Super = ImGuiMod_Super }; +//typedef ImGuiKeyChord ImGuiKeyModFlags; // == int +//enum ImGuiKeyModFlags_ { ImGuiKeyModFlags_None = 0, ImGuiKeyModFlags_Ctrl = ImGuiMod_Ctrl, ImGuiKeyModFlags_Shift = ImGuiMod_Shift, ImGuiKeyModFlags_Alt = ImGuiMod_Alt, ImGuiKeyModFlags_Super = ImGuiMod_Super }; + +#define IM_OFFSETOF(_TYPE,_MEMBER) offsetof(_TYPE, _MEMBER) // OBSOLETED IN 1.90 (now using C++11 standard version) + +#endif // #ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + +// RENAMED IMGUI_DISABLE_METRICS_WINDOW > IMGUI_DISABLE_DEBUG_TOOLS in 1.88 (from June 2022) +#ifdef IMGUI_DISABLE_METRICS_WINDOW +#error IMGUI_DISABLE_METRICS_WINDOW was renamed to IMGUI_DISABLE_DEBUG_TOOLS, please use new name. #endif -}; + +//----------------------------------------------------------------------------- #if defined(__clang__) #pragma clang diagnostic pop @@ -2240,7 +4012,18 @@ struct ImFont #pragma GCC diagnostic pop #endif -// Include imgui_user.h at the end of imgui.h (convenient for user to only explicitly include vanilla imgui.h) +#ifdef _MSC_VER +#pragma warning (pop) +#endif + +// Include imgui_user.h at the end of imgui.h +// May be convenient for some users to only explicitly include vanilla imgui.h and have extra stuff included. #ifdef IMGUI_INCLUDE_IMGUI_USER_H +#ifdef IMGUI_USER_H_FILENAME +#include IMGUI_USER_H_FILENAME +#else #include "imgui_user.h" #endif +#endif + +#endif // #ifndef IMGUI_DISABLE diff --git a/imgui/imgui_demo.cpp b/imgui/imgui_demo.cpp index b8576e586..cea9a8a2f 100644 --- a/imgui/imgui_demo.cpp +++ b/imgui/imgui_demo.cpp @@ -1,43 +1,110 @@ -// dear imgui, v1.71 +// dear imgui, v1.91.9b // (demo code) -// Message to the person tempted to delete this file when integrating Dear ImGui into their code base: -// Do NOT remove this file from your project! Think again! It is the most useful reference code that you and other coders -// will want to refer to and call. Have the ImGui::ShowDemoWindow() function wired in an always-available debug menu of -// your game/app! Removing this file from your project is hindering access to documentation for everyone in your team, +// Help: +// - Read FAQ at http://dearimgui.com/faq +// - Call and read ImGui::ShowDemoWindow() in imgui_demo.cpp. All applications in examples/ are doing that. +// - Need help integrating Dear ImGui in your codebase? +// - Read Getting Started https://github.com/ocornut/imgui/wiki/Getting-Started +// - Read 'Programmer guide' in imgui.cpp for notes on how to setup Dear ImGui in your codebase. +// Read top of imgui.cpp and imgui.h for many details, documentation, comments, links. +// Get the latest version at https://github.com/ocornut/imgui + +// How to easily locate code? +// - Use Tools->Item Picker to debug break in code by clicking any widgets: https://github.com/ocornut/imgui/wiki/Debug-Tools +// - Browse an online version the demo with code linked to hovered widgets: https://pthom.github.io/imgui_manual_online/manual/imgui_manual.html +// - Find a visible string and search for it in the code! + +//--------------------------------------------------- +// PLEASE DO NOT REMOVE THIS FILE FROM YOUR PROJECT! +//--------------------------------------------------- +// Message to the person tempted to delete this file when integrating Dear ImGui into their codebase: +// Think again! It is the most useful reference code that you and other coders will want to refer to and call. +// Have the ImGui::ShowDemoWindow() function wired in an always-available debug menu of your game/app! +// Also include Metrics! ItemPicker! DebugLog! and other debug features. +// Removing this file from your project is hindering access to documentation for everyone in your team, // likely leading you to poorer usage of the library. // Everything in this file will be stripped out by the linker if you don't call ImGui::ShowDemoWindow(). -// If you want to link core Dear ImGui in your shipped builds but want an easy guarantee that the demo will not be linked, -// you can setup your imconfig.h with #define IMGUI_DISABLE_DEMO_WINDOWS and those functions will be empty. -// In other situation, whenever you have Dear ImGui available you probably want this to be available for reference. +// If you want to link core Dear ImGui in your shipped builds but want a thorough guarantee that the demo will not be +// linked, you can setup your imconfig.h with #define IMGUI_DISABLE_DEMO_WINDOWS and those functions will be empty. +// In another situation, whenever you have Dear ImGui available you probably want this to be available for reference. // Thank you, -// -Your beloved friend, imgui_demo.cpp (that you won't delete) +// -Your beloved friend, imgui_demo.cpp (which you won't delete) -// Message to beginner C/C++ programmers about the meaning of the 'static' keyword: -// In this demo code, we frequently we use 'static' variables inside functions. A static variable persist across calls, so it is -// essentially like a global variable but declared inside the scope of the function. We do this as a way to gather code and data -// in the same place, to make the demo source code faster to read, faster to write, and smaller in size. -// It also happens to be a convenient way of storing simple UI related information as long as your function doesn't need to be -// reentrant or used in multiple threads. This might be a pattern you will want to use in your code, but most of the real data -// you would be editing is likely going to be stored outside your functions. +//-------------------------------------------- +// ABOUT THE MEANING OF THE 'static' KEYWORD: +//-------------------------------------------- +// In this demo code, we frequently use 'static' variables inside functions. +// A static variable persists across calls. It is essentially a global variable but declared inside the scope of the function. +// Think of "static int n = 0;" as "global int n = 0;" ! +// We do this IN THE DEMO because we want: +// - to gather code and data in the same place. +// - to make the demo source code faster to read, faster to change, smaller in size. +// - it is also a convenient way of storing simple UI related information as long as your function +// doesn't need to be reentrant or used in multiple threads. +// This might be a pattern you will want to use in your code, but most of the data you would be working +// with in a complex codebase is likely going to be stored outside your functions. -// The Demo code is this file is designed to be easy to copy-and-paste in into your application! +//----------------------------------------- +// ABOUT THE CODING STYLE OF OUR DEMO CODE +//----------------------------------------- +// The Demo code in this file is designed to be easy to copy-and-paste into your application! // Because of this: -// - We never omit the ImGui:: namespace when calling functions, even though most of our code is already in the same namespace. +// - We never omit the ImGui:: prefix when calling functions, even though most code here is in the same namespace. // - We try to declare static variables in the local scope, as close as possible to the code using them. -// - We never use any of the helpers/facilities used internally by dear imgui, unless it has been exposed in the public API (imgui.h). -// - We never use maths operators on ImVec2/ImVec4. For other imgui sources files, they are provided by imgui_internal.h w/ IMGUI_DEFINE_MATH_OPERATORS, -// for your own sources file they are optional and require you either enable those, either provide your own via IM_VEC2_CLASS_EXTRA in imconfig.h. -// Because we don't want to assume anything about your support of maths operators, we don't use them in imgui_demo.cpp. +// - We never use any of the helpers/facilities used internally by Dear ImGui, unless available in the public API. +// - We never use maths operators on ImVec2/ImVec4. For our other sources files we use them, and they are provided +// by imgui.h using the IMGUI_DEFINE_MATH_OPERATORS define. For your own sources file they are optional +// and require you either enable those, either provide your own via IM_VEC2_CLASS_EXTRA in imconfig.h. +// Because we can't assume anything about your support of maths operators, we cannot use them in imgui_demo.cpp. + +// Navigating this file: +// - In Visual Studio: CTRL+comma ("Edit.GoToAll") can follow symbols inside comments, whereas CTRL+F12 ("Edit.GoToImplementation") cannot. +// - In Visual Studio w/ Visual Assist installed: ALT+G ("VAssistX.GoToImplementation") can also follow symbols inside comments. +// - In VS Code, CLion, etc.: CTRL+click can follow symbols inside comments. +// - You can search/grep for all sections listed in the index to find the section. /* Index of this file: -// [SECTION] Forward Declarations, Helpers +// [SECTION] Forward Declarations +// [SECTION] Helpers // [SECTION] Demo Window / ShowDemoWindow() +// [SECTION] DemoWindowMenuBar() +// [SECTION] Helpers: ExampleTreeNode, ExampleMemberInfo (for use by Property Editor & Multi-Select demos) +// [SECTION] DemoWindowWidgetsBasic() +// [SECTION] DemoWindowWidgetsBullets() +// [SECTION] DemoWindowWidgetsCollapsingHeaders() +// [SECTION] DemoWindowWidgetsComboBoxes() +// [SECTION] DemoWindowWidgetsColorAndPickers() +// [SECTION] DemoWindowWidgetsDataTypes() +// [SECTION] DemoWindowWidgetsDisableBlocks() +// [SECTION] DemoWindowWidgetsDragAndDrop() +// [SECTION] DemoWindowWidgetsDragsAndSliders() +// [SECTION] DemoWindowWidgetsImages() +// [SECTION] DemoWindowWidgetsListBoxes() +// [SECTION] DemoWindowWidgetsMultiComponents() +// [SECTION] DemoWindowWidgetsPlotting() +// [SECTION] DemoWindowWidgetsProgressBars() +// [SECTION] DemoWindowWidgetsQueryingStatuses() +// [SECTION] DemoWindowWidgetsSelectables() +// [SECTION] DemoWindowWidgetsSelectionAndMultiSelect() +// [SECTION] DemoWindowWidgetsTabs() +// [SECTION] DemoWindowWidgetsText() +// [SECTION] DemoWindowWidgetsTextFilter() +// [SECTION] DemoWindowWidgetsTextInput() +// [SECTION] DemoWindowWidgetsTooltips() +// [SECTION] DemoWindowWidgetsTreeNodes() +// [SECTION] DemoWindowWidgetsVerticalSliders() +// [SECTION] DemoWindowWidgets() +// [SECTION] DemoWindowLayout() +// [SECTION] DemoWindowPopups() +// [SECTION] DemoWindowTables() +// [SECTION] DemoWindowInputs() // [SECTION] About Window / ShowAboutWindow() // [SECTION] Style Editor / ShowStyleEditor() +// [SECTION] User Guide / ShowUserGuide() // [SECTION] Example App: Main Menu Bar / ShowExampleAppMainMenuBar() // [SECTION] Example App: Debug Console / ShowExampleAppConsole() // [SECTION] Example App: Debug Log / ShowExampleAppLog() @@ -46,10 +113,13 @@ Index of this file: // [SECTION] Example App: Long Text / ShowExampleAppLongText() // [SECTION] Example App: Auto Resize / ShowExampleAppAutoResize() // [SECTION] Example App: Constrained Resize / ShowExampleAppConstrainedResize() -// [SECTION] Example App: Simple Overlay / ShowExampleAppSimpleOverlay() -// [SECTION] Example App: Manipulating Window Titles / ShowExampleAppWindowTitles() +// [SECTION] Example App: Simple overlay / ShowExampleAppSimpleOverlay() +// [SECTION] Example App: Fullscreen window / ShowExampleAppFullscreen() +// [SECTION] Example App: Manipulating window titles / ShowExampleAppWindowTitles() // [SECTION] Example App: Custom Rendering using ImDrawList API / ShowExampleAppCustomRendering() +// [SECTION] Example App: Docking, DockSpace / ShowExampleAppDockSpace() // [SECTION] Example App: Documents Handling / ShowExampleAppDocuments() +// [SECTION] Example App: Assets Browser / ShowExampleAppAssetsBrowser() */ @@ -58,90 +128,154 @@ Index of this file: #endif #include "imgui.h" +#ifndef IMGUI_DISABLE + +// System includes #include // toupper #include // INT_MIN, INT_MAX #include // sqrtf, powf, cosf, sinf, floorf, ceilf #include // vsnprintf, sscanf, printf #include // NULL, malloc, free, atoi -#if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier -#include // intptr_t -#else #include // intptr_t +#if !defined(_MSC_VER) || _MSC_VER >= 1800 +#include // PRId64/PRIu64, not avail in some MinGW headers. +#endif +#ifdef __EMSCRIPTEN__ +#include // __EMSCRIPTEN_major__ etc. #endif +// Visual Studio warnings #ifdef _MSC_VER -#pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen -#endif -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wold-style-cast" // warning : use of old-style cast // yes, they are more terse. -#pragma clang diagnostic ignored "-Wdeprecated-declarations" // warning : 'xx' is deprecated: The POSIX name for this item.. // for strdup used in demo code (so user can copy & paste the code) -#pragma clang diagnostic ignored "-Wint-to-void-pointer-cast" // warning : cast to 'void *' from smaller integer type 'int' -#pragma clang diagnostic ignored "-Wformat-security" // warning : warning: format string is not a string literal -#pragma clang diagnostic ignored "-Wexit-time-destructors" // warning : declaration requires an exit-time destructor // exit-time destruction order is undefined. if MemFree() leads to users code that has been disabled before exit it might cause problems. ImGui coding style welcomes static/globals. -#pragma clang diagnostic ignored "-Wunused-macros" // warning : warning: macro is not used // we define snprintf/vsnprintf on Windows so they are available, but not always used. -#if __has_warning("-Wzero-as-null-pointer-constant") -#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" // warning : zero as null pointer constant // some standard header variations use #define NULL 0 -#endif -#if __has_warning("-Wdouble-promotion") -#pragma clang diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function // using printf() is a misery with this as C++ va_arg ellipsis changes float to double. -#endif -#if __has_warning("-Wreserved-id-macro") -#pragma clang diagnostic ignored "-Wreserved-id-macro" // warning : macro name is a reserved identifier // -#endif -#elif defined(__GNUC__) -#pragma GCC diagnostic ignored "-Wint-to-pointer-cast" // warning: cast to pointer from integer of different size -#pragma GCC diagnostic ignored "-Wformat-security" // warning : format string is not a string literal (potentially insecure) -#pragma GCC diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function -#pragma GCC diagnostic ignored "-Wconversion" // warning: conversion to 'xxxx' from 'xxxx' may alter its value -#if (__GNUC__ >= 6) -#pragma GCC diagnostic ignored "-Wmisleading-indentation" // warning: this 'if' clause does not guard this statement // GCC 6.0+ only. See #883 on GitHub. -#endif +#pragma warning (disable: 4127) // condition expression is constant +#pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen +#pragma warning (disable: 26451) // [Static Analyzer] Arithmetic overflow : Using operator 'xxx' on a 4 byte value and then casting the result to an 8 byte value. Cast the value to the wider type before calling operator 'xxx' to avoid overflow(io.2). #endif -// Play it nice with Windows users. Notepad in 2017 still doesn't display text data with Unix-style \n. +// Clang/GCC warnings with -Weverything +#if defined(__clang__) +#if __has_warning("-Wunknown-warning-option") +#pragma clang diagnostic ignored "-Wunknown-warning-option" // warning: unknown warning group 'xxx' // not all warnings are known by all Clang versions and they tend to be rename-happy.. so ignoring warnings triggers new warnings on some configuration. Great! +#endif +#pragma clang diagnostic ignored "-Wunknown-pragmas" // warning: unknown warning group 'xxx' +#pragma clang diagnostic ignored "-Wold-style-cast" // warning: use of old-style cast // yes, they are more terse. +#pragma clang diagnostic ignored "-Wdeprecated-declarations" // warning: 'xx' is deprecated: The POSIX name for this.. // for strdup used in demo code (so user can copy & paste the code) +#pragma clang diagnostic ignored "-Wint-to-void-pointer-cast" // warning: cast to 'void *' from smaller integer type +#pragma clang diagnostic ignored "-Wformat" // warning: format specifies type 'int' but the argument has type 'unsigned int' +#pragma clang diagnostic ignored "-Wformat-security" // warning: format string is not a string literal +#pragma clang diagnostic ignored "-Wexit-time-destructors" // warning: declaration requires an exit-time destructor // exit-time destruction order is undefined. if MemFree() leads to users code that has been disabled before exit it might cause problems. ImGui coding style welcomes static/globals. +#pragma clang diagnostic ignored "-Wunused-macros" // warning: macro is not used // we define snprintf/vsnprintf on Windows so they are available, but not always used. +#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" // warning: zero as null pointer constant // some standard header variations use #define NULL 0 +#pragma clang diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function // using printf() is a misery with this as C++ va_arg ellipsis changes float to double. +#pragma clang diagnostic ignored "-Wreserved-id-macro" // warning: macro name is a reserved identifier +#pragma clang diagnostic ignored "-Wimplicit-int-float-conversion" // warning: implicit conversion from 'xxx' to 'float' may lose precision +#pragma clang diagnostic ignored "-Wunsafe-buffer-usage" // warning: 'xxx' is an unsafe pointer used for buffer access +#pragma clang diagnostic ignored "-Wswitch-default" // warning: 'switch' missing 'default' label +#elif defined(__GNUC__) +#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind +#pragma GCC diagnostic ignored "-Wfloat-equal" // warning: comparing floating-point with '==' or '!=' is unsafe +#pragma GCC diagnostic ignored "-Wint-to-pointer-cast" // warning: cast to pointer from integer of different size +#pragma GCC diagnostic ignored "-Wformat" // warning: format '%p' expects argument of type 'int'/'void*', but argument X has type 'unsigned int'/'ImGuiWindow*' +#pragma GCC diagnostic ignored "-Wformat-security" // warning: format string is not a string literal (potentially insecure) +#pragma GCC diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function +#pragma GCC diagnostic ignored "-Wconversion" // warning: conversion to 'xxxx' from 'xxxx' may alter its value +#pragma GCC diagnostic ignored "-Wmisleading-indentation" // [__GNUC__ >= 6] warning: this 'if' clause does not guard this statement // GCC 6.0+ only. See #883 on GitHub. +#pragma GCC diagnostic ignored "-Wstrict-overflow" // warning: assuming signed overflow does not occur when simplifying division / ..when changing X +- C1 cmp C2 to X cmp C2 -+ C1 +#pragma GCC diagnostic ignored "-Wcast-qual" // warning: cast from type 'const xxxx *' to type 'xxxx *' casts away qualifiers +#endif + +// Play it nice with Windows users (Update: May 2018, Notepad now supports Unix-style carriage returns!) #ifdef _WIN32 #define IM_NEWLINE "\r\n" -#define snprintf _snprintf -#define vsnprintf _vsnprintf #else #define IM_NEWLINE "\n" #endif -#define IM_MAX(_A,_B) (((_A) >= (_B)) ? (_A) : (_B)) - -//----------------------------------------------------------------------------- -// [SECTION] Forward Declarations, Helpers -//----------------------------------------------------------------------------- - -#if !defined(IMGUI_DISABLE_OBSOLETE_FUNCTIONS) && defined(IMGUI_DISABLE_TEST_WINDOWS) && !defined(IMGUI_DISABLE_DEMO_WINDOWS) // Obsolete name since 1.53, TEST->DEMO -#define IMGUI_DISABLE_DEMO_WINDOWS +// Helpers +#if defined(_MSC_VER) && !defined(snprintf) +#define snprintf _snprintf #endif +#if defined(_MSC_VER) && !defined(vsnprintf) +#define vsnprintf _vsnprintf +#endif + +// Format specifiers for 64-bit values (hasn't been decently standardized before VS2013) +#if !defined(PRId64) && defined(_MSC_VER) +#define PRId64 "I64d" +#define PRIu64 "I64u" +#elif !defined(PRId64) +#define PRId64 "lld" +#define PRIu64 "llu" +#endif + +// Helpers macros +// We normally try to not use many helpers in imgui_demo.cpp in order to make code easier to copy and paste, +// but making an exception here as those are largely simplifying code... +// In other imgui sources we can use nicer internal functions from imgui_internal.h (ImMin/ImMax) but not in the demo. +#define IM_MIN(A, B) (((A) < (B)) ? (A) : (B)) +#define IM_MAX(A, B) (((A) >= (B)) ? (A) : (B)) +#define IM_CLAMP(V, MN, MX) ((V) < (MN) ? (MN) : (V) > (MX) ? (MX) : (V)) + +// Enforce cdecl calling convention for functions called by the standard library, +// in case compilation settings changed the default to e.g. __vectorcall +#ifndef IMGUI_CDECL +#ifdef _MSC_VER +#define IMGUI_CDECL __cdecl +#else +#define IMGUI_CDECL +#endif +#endif + +//----------------------------------------------------------------------------- +// [SECTION] Forward Declarations +//----------------------------------------------------------------------------- #if !defined(IMGUI_DISABLE_DEMO_WINDOWS) // Forward Declarations -static void ShowExampleAppDocuments(bool* p_open); +struct ImGuiDemoWindowData; static void ShowExampleAppMainMenuBar(); +static void ShowExampleAppAssetsBrowser(bool* p_open); static void ShowExampleAppConsole(bool* p_open); +static void ShowExampleAppCustomRendering(bool* p_open); +static void ShowExampleAppDockSpace(bool* p_open); +static void ShowExampleAppDocuments(bool* p_open); static void ShowExampleAppLog(bool* p_open); static void ShowExampleAppLayout(bool* p_open); -static void ShowExampleAppPropertyEditor(bool* p_open); -static void ShowExampleAppLongText(bool* p_open); +static void ShowExampleAppPropertyEditor(bool* p_open, ImGuiDemoWindowData* demo_data); +static void ShowExampleAppSimpleOverlay(bool* p_open); static void ShowExampleAppAutoResize(bool* p_open); static void ShowExampleAppConstrainedResize(bool* p_open); -static void ShowExampleAppSimpleOverlay(bool* p_open); +static void ShowExampleAppFullscreen(bool* p_open); +static void ShowExampleAppLongText(bool* p_open); static void ShowExampleAppWindowTitles(bool* p_open); -static void ShowExampleAppCustomRendering(bool* p_open); static void ShowExampleMenuFile(); +// We split the contents of the big ShowDemoWindow() function into smaller functions +// (because the link time of very large functions tends to grow non-linearly) +static void DemoWindowMenuBar(ImGuiDemoWindowData* demo_data); +static void DemoWindowWidgets(ImGuiDemoWindowData* demo_data); +static void DemoWindowLayout(); +static void DemoWindowPopups(); +static void DemoWindowTables(); +static void DemoWindowColumns(); +static void DemoWindowInputs(); + +// Helper tree functions used by Property Editor & Multi-Select demos +struct ExampleTreeNode; +static ExampleTreeNode* ExampleTree_CreateNode(const char* name, int uid, ExampleTreeNode* parent); +static void ExampleTree_DestroyNode(ExampleTreeNode* node); + +//----------------------------------------------------------------------------- +// [SECTION] Helpers +//----------------------------------------------------------------------------- + // Helper to display a little (?) mark which shows a tooltip when hovered. -// In your own code you may want to display an actual icon if you are using a merged icon fonts (see misc/fonts/README.txt) +// In your own code you may want to display an actual icon if you are using a merged icon fonts (see docs/FONTS.md) static void HelpMarker(const char* desc) { ImGui::TextDisabled("(?)"); - if (ImGui::IsItemHovered()) + if (ImGui::BeginItemTooltip()) { - ImGui::BeginTooltip(); ImGui::PushTextWrapPos(ImGui::GetFontSize() * 35.0f); ImGui::TextUnformatted(desc); ImGui::PopTextWrapPos(); @@ -149,82 +283,105 @@ static void HelpMarker(const char* desc) } } -// Helper to display basic user controls. -void ImGui::ShowUserGuide() +static void ShowDockingDisabledMessage() { ImGuiIO& io = ImGui::GetIO(); - ImGui::BulletText("Double-click on title bar to collapse window."); - ImGui::BulletText("Click and drag on lower right corner to resize window\n(double-click to auto fit window to its contents)."); - ImGui::BulletText("Click and drag on any empty space to move window."); - ImGui::BulletText("TAB/SHIFT+TAB to cycle through keyboard editable fields."); - ImGui::BulletText("CTRL+Click on a slider or drag box to input value as text."); - if (io.FontAllowUserScaling) - ImGui::BulletText("CTRL+Mouse Wheel to zoom window contents."); - ImGui::BulletText("Mouse Wheel to scroll."); - ImGui::BulletText("While editing text:\n"); - ImGui::Indent(); - ImGui::BulletText("Hold SHIFT or use mouse to select text."); - ImGui::BulletText("CTRL+Left/Right to word jump."); - ImGui::BulletText("CTRL+A or double-click to select all."); - ImGui::BulletText("CTRL+X,CTRL+C,CTRL+V to use clipboard."); - ImGui::BulletText("CTRL+Z,CTRL+Y to undo/redo."); - ImGui::BulletText("ESCAPE to revert."); - ImGui::BulletText("You can apply arithmetic operators +,*,/ on numerical values.\nUse +- to subtract."); - ImGui::Unindent(); + ImGui::Text("ERROR: Docking is not enabled! See Demo > Configuration."); + ImGui::Text("Set io.ConfigFlags |= ImGuiConfigFlags_DockingEnable in your code, or "); + ImGui::SameLine(0.0f, 0.0f); + if (ImGui::SmallButton("click here")) + io.ConfigFlags |= ImGuiConfigFlags_DockingEnable; } +// Helper to wire demo markers located in code to an interactive browser +typedef void (*ImGuiDemoMarkerCallback)(const char* file, int line, const char* section, void* user_data); +extern ImGuiDemoMarkerCallback GImGuiDemoMarkerCallback; +extern void* GImGuiDemoMarkerCallbackUserData; +ImGuiDemoMarkerCallback GImGuiDemoMarkerCallback = NULL; +void* GImGuiDemoMarkerCallbackUserData = NULL; +#define IMGUI_DEMO_MARKER(section) do { if (GImGuiDemoMarkerCallback != NULL) GImGuiDemoMarkerCallback(__FILE__, __LINE__, section, GImGuiDemoMarkerCallbackUserData); } while (0) + //----------------------------------------------------------------------------- // [SECTION] Demo Window / ShowDemoWindow() //----------------------------------------------------------------------------- -// We split the contents of the big ShowDemoWindow() function into smaller functions (because the link time of very large functions grow non-linearly) -static void ShowDemoWindowWidgets(); -static void ShowDemoWindowLayout(); -static void ShowDemoWindowPopups(); -static void ShowDemoWindowColumns(); -static void ShowDemoWindowMisc(); +// Data to be shared across different functions of the demo. +struct ImGuiDemoWindowData +{ + // Examples Apps (accessible from the "Examples" menu) + bool ShowMainMenuBar = false; + bool ShowAppAssetsBrowser = false; + bool ShowAppConsole = false; + bool ShowAppCustomRendering = false; + bool ShowAppDocuments = false; + bool ShowAppDockSpace = false; + bool ShowAppLog = false; + bool ShowAppLayout = false; + bool ShowAppPropertyEditor = false; + bool ShowAppSimpleOverlay = false; + bool ShowAppAutoResize = false; + bool ShowAppConstrainedResize = false; + bool ShowAppFullscreen = false; + bool ShowAppLongText = false; + bool ShowAppWindowTitles = false; + + // Dear ImGui Tools (accessible from the "Tools" menu) + bool ShowMetrics = false; + bool ShowDebugLog = false; + bool ShowIDStackTool = false; + bool ShowStyleEditor = false; + bool ShowAbout = false; + + // Other data + bool DisableSections = false; + ExampleTreeNode* DemoTree = NULL; + + ~ImGuiDemoWindowData() { if (DemoTree) ExampleTree_DestroyNode(DemoTree); } +}; // Demonstrate most Dear ImGui features (this is big function!) -// You may execute this function to experiment with the UI and understand what it does. You may then search for keywords in the code when you are interested by a specific feature. +// You may execute this function to experiment with the UI and understand what it does. +// You may then search for keywords in the code when you are interested by a specific feature. void ImGui::ShowDemoWindow(bool* p_open) { - IM_ASSERT(ImGui::GetCurrentContext() != NULL && "Missing dear imgui context. Refer to examples app!"); // Exceptionally add an extra assert here for people confused with initial dear imgui setup + // Exceptionally add an extra assert here for people confused about initial Dear ImGui setup + // Most functions would normally just assert/crash if the context is missing. + IM_ASSERT(ImGui::GetCurrentContext() != NULL && "Missing Dear ImGui context. Refer to examples app!"); + + // Verify ABI compatibility between caller code and compiled version of Dear ImGui. This helps detects some build issues. + IMGUI_CHECKVERSION(); + + // Stored data + static ImGuiDemoWindowData demo_data; // Examples Apps (accessible from the "Examples" menu) - static bool show_app_documents = false; - static bool show_app_main_menu_bar = false; - static bool show_app_console = false; - static bool show_app_log = false; - static bool show_app_layout = false; - static bool show_app_property_editor = false; - static bool show_app_long_text = false; - static bool show_app_auto_resize = false; - static bool show_app_constrained_resize = false; - static bool show_app_simple_overlay = false; - static bool show_app_window_titles = false; - static bool show_app_custom_rendering = false; + if (demo_data.ShowMainMenuBar) { ShowExampleAppMainMenuBar(); } + if (demo_data.ShowAppDockSpace) { ShowExampleAppDockSpace(&demo_data.ShowAppDockSpace); } // Important: Process the Docking app first, as explicit DockSpace() nodes needs to be submitted early (read comments near the DockSpace function) + if (demo_data.ShowAppDocuments) { ShowExampleAppDocuments(&demo_data.ShowAppDocuments); } // ...process the Document app next, as it may also use a DockSpace() + if (demo_data.ShowAppAssetsBrowser) { ShowExampleAppAssetsBrowser(&demo_data.ShowAppAssetsBrowser); } + if (demo_data.ShowAppConsole) { ShowExampleAppConsole(&demo_data.ShowAppConsole); } + if (demo_data.ShowAppCustomRendering) { ShowExampleAppCustomRendering(&demo_data.ShowAppCustomRendering); } + if (demo_data.ShowAppLog) { ShowExampleAppLog(&demo_data.ShowAppLog); } + if (demo_data.ShowAppLayout) { ShowExampleAppLayout(&demo_data.ShowAppLayout); } + if (demo_data.ShowAppPropertyEditor) { ShowExampleAppPropertyEditor(&demo_data.ShowAppPropertyEditor, &demo_data); } + if (demo_data.ShowAppSimpleOverlay) { ShowExampleAppSimpleOverlay(&demo_data.ShowAppSimpleOverlay); } + if (demo_data.ShowAppAutoResize) { ShowExampleAppAutoResize(&demo_data.ShowAppAutoResize); } + if (demo_data.ShowAppConstrainedResize) { ShowExampleAppConstrainedResize(&demo_data.ShowAppConstrainedResize); } + if (demo_data.ShowAppFullscreen) { ShowExampleAppFullscreen(&demo_data.ShowAppFullscreen); } + if (demo_data.ShowAppLongText) { ShowExampleAppLongText(&demo_data.ShowAppLongText); } + if (demo_data.ShowAppWindowTitles) { ShowExampleAppWindowTitles(&demo_data.ShowAppWindowTitles); } - if (show_app_documents) ShowExampleAppDocuments(&show_app_documents); - if (show_app_main_menu_bar) ShowExampleAppMainMenuBar(); - if (show_app_console) ShowExampleAppConsole(&show_app_console); - if (show_app_log) ShowExampleAppLog(&show_app_log); - if (show_app_layout) ShowExampleAppLayout(&show_app_layout); - if (show_app_property_editor) ShowExampleAppPropertyEditor(&show_app_property_editor); - if (show_app_long_text) ShowExampleAppLongText(&show_app_long_text); - if (show_app_auto_resize) ShowExampleAppAutoResize(&show_app_auto_resize); - if (show_app_constrained_resize) ShowExampleAppConstrainedResize(&show_app_constrained_resize); - if (show_app_simple_overlay) ShowExampleAppSimpleOverlay(&show_app_simple_overlay); - if (show_app_window_titles) ShowExampleAppWindowTitles(&show_app_window_titles); - if (show_app_custom_rendering) ShowExampleAppCustomRendering(&show_app_custom_rendering); - - // Dear ImGui Apps (accessible from the "Help" menu) - static bool show_app_metrics = false; - static bool show_app_style_editor = false; - static bool show_app_about = false; - - if (show_app_metrics) { ImGui::ShowMetricsWindow(&show_app_metrics); } - if (show_app_style_editor) { ImGui::Begin("Style Editor", &show_app_style_editor); ImGui::ShowStyleEditor(); ImGui::End(); } - if (show_app_about) { ImGui::ShowAboutWindow(&show_app_about); } + // Dear ImGui Tools (accessible from the "Tools" menu) + if (demo_data.ShowMetrics) { ImGui::ShowMetricsWindow(&demo_data.ShowMetrics); } + if (demo_data.ShowDebugLog) { ImGui::ShowDebugLogWindow(&demo_data.ShowDebugLog); } + if (demo_data.ShowIDStackTool) { ImGui::ShowIDStackToolWindow(&demo_data.ShowIDStackTool); } + if (demo_data.ShowAbout) { ImGui::ShowAboutWindow(&demo_data.ShowAbout); } + if (demo_data.ShowStyleEditor) + { + ImGui::Begin("Dear ImGui Style Editor", &demo_data.ShowStyleEditor); + ImGui::ShowStyleEditor(); + ImGui::End(); + } // Demonstrate the various window flags. Typically you would just use the default! static bool no_titlebar = false; @@ -237,6 +394,8 @@ void ImGui::ShowDemoWindow(bool* p_open) static bool no_nav = false; static bool no_background = false; static bool no_bring_to_front = false; + static bool no_docking = false; + static bool unsaved_document = false; ImGuiWindowFlags window_flags = 0; if (no_titlebar) window_flags |= ImGuiWindowFlags_NoTitleBar; @@ -248,10 +407,14 @@ void ImGui::ShowDemoWindow(bool* p_open) if (no_nav) window_flags |= ImGuiWindowFlags_NoNav; if (no_background) window_flags |= ImGuiWindowFlags_NoBackground; if (no_bring_to_front) window_flags |= ImGuiWindowFlags_NoBringToFrontOnFocus; + if (no_docking) window_flags |= ImGuiWindowFlags_NoDocking; + if (unsaved_document) window_flags |= ImGuiWindowFlags_UnsavedDocument; if (no_close) p_open = NULL; // Don't pass our bool* to Begin - // We specify a default position/size in case there's no data in the .ini file. Typically this isn't required! We only do it to make the Demo applications a little more welcoming. - ImGui::SetNextWindowPos(ImVec2(650, 20), ImGuiCond_FirstUseEver); + // We specify a default position/size in case there's no data in the .ini file. + // We only do it to make the demo applications a little more welcoming, but typically this isn't required. + const ImGuiViewport* main_viewport = ImGui::GetMainViewport(); + ImGui::SetNextWindowPos(ImVec2(main_viewport->WorkPos.x + 650, main_viewport->WorkPos.y + 20), ImGuiCond_FirstUseEver); ImGui::SetNextWindowSize(ImVec2(550, 680), ImGuiCond_FirstUseEver); // Main body of the Demo window starts here. @@ -262,121 +425,230 @@ void ImGui::ShowDemoWindow(bool* p_open) return; } - // Most "big" widgets share a common width settings by default. - //ImGui::PushItemWidth(ImGui::GetWindowWidth() * 0.65f); // Use 2/3 of the space for widgets and 1/3 for labels (default) - ImGui::PushItemWidth(ImGui::GetFontSize() * -12); // Use fixed width for labels (by passing a negative value), the rest goes to widgets. We choose a width proportional to our font size. + // Most "big" widgets share a common width settings by default. See 'Demo->Layout->Widgets Width' for details. + ImGui::PushItemWidth(ImGui::GetFontSize() * -12); // e.g. Leave a fixed amount of width for labels (by passing a negative value), the rest goes to widgets. + //ImGui::PushItemWidth(-ImGui::GetWindowWidth() * 0.35f); // e.g. Use 2/3 of the space for widgets and 1/3 for labels (right align) // Menu Bar - if (ImGui::BeginMenuBar()) - { - if (ImGui::BeginMenu("Menu")) - { - ShowExampleMenuFile(); - ImGui::EndMenu(); - } - if (ImGui::BeginMenu("Examples")) - { - ImGui::MenuItem("Main menu bar", NULL, &show_app_main_menu_bar); - ImGui::MenuItem("Console", NULL, &show_app_console); - ImGui::MenuItem("Log", NULL, &show_app_log); - ImGui::MenuItem("Simple layout", NULL, &show_app_layout); - ImGui::MenuItem("Property editor", NULL, &show_app_property_editor); - ImGui::MenuItem("Long text display", NULL, &show_app_long_text); - ImGui::MenuItem("Auto-resizing window", NULL, &show_app_auto_resize); - ImGui::MenuItem("Constrained-resizing window", NULL, &show_app_constrained_resize); - ImGui::MenuItem("Simple overlay", NULL, &show_app_simple_overlay); - ImGui::MenuItem("Manipulating window titles", NULL, &show_app_window_titles); - ImGui::MenuItem("Custom rendering", NULL, &show_app_custom_rendering); - ImGui::MenuItem("Documents", NULL, &show_app_documents); - ImGui::EndMenu(); - } - if (ImGui::BeginMenu("Help")) - { - ImGui::MenuItem("Metrics", NULL, &show_app_metrics); - ImGui::MenuItem("Style Editor", NULL, &show_app_style_editor); - ImGui::MenuItem("About Dear ImGui", NULL, &show_app_about); - ImGui::EndMenu(); - } - ImGui::EndMenuBar(); - } + DemoWindowMenuBar(&demo_data); - ImGui::Text("dear imgui says hello. (%s)", IMGUI_VERSION); + ImGui::Text("dear imgui says hello! (%s) (%d)", IMGUI_VERSION, IMGUI_VERSION_NUM); ImGui::Spacing(); + IMGUI_DEMO_MARKER("Help"); if (ImGui::CollapsingHeader("Help")) { - ImGui::Text("PROGRAMMER GUIDE:"); - ImGui::BulletText("Please see the ShowDemoWindow() code in imgui_demo.cpp. <- you are here!"); - ImGui::BulletText("Please see the comments in imgui.cpp."); - ImGui::BulletText("Please see the examples/ in application."); - ImGui::BulletText("Enable 'io.ConfigFlags |= NavEnableKeyboard' for keyboard controls."); - ImGui::BulletText("Enable 'io.ConfigFlags |= NavEnableGamepad' for gamepad controls."); - ImGui::Separator(); + ImGui::SeparatorText("ABOUT THIS DEMO:"); + ImGui::BulletText("Sections below are demonstrating many aspects of the library."); + ImGui::BulletText("The \"Examples\" menu above leads to more demo contents."); + ImGui::BulletText("The \"Tools\" menu above gives access to: About Box, Style Editor,\n" + "and Metrics/Debugger (general purpose Dear ImGui debugging tool)."); - ImGui::Text("USER GUIDE:"); + ImGui::SeparatorText("PROGRAMMER GUIDE:"); + ImGui::BulletText("See the ShowDemoWindow() code in imgui_demo.cpp. <- you are here!"); + ImGui::BulletText("See comments in imgui.cpp."); + ImGui::BulletText("See example applications in the examples/ folder."); + ImGui::BulletText("Read the FAQ at "); + ImGui::SameLine(0, 0); + ImGui::TextLinkOpenURL("https://www.dearimgui.com/faq/"); + ImGui::BulletText("Set 'io.ConfigFlags |= NavEnableKeyboard' for keyboard controls."); + ImGui::BulletText("Set 'io.ConfigFlags |= NavEnableGamepad' for gamepad controls."); + + ImGui::SeparatorText("USER GUIDE:"); ImGui::ShowUserGuide(); } + IMGUI_DEMO_MARKER("Configuration"); if (ImGui::CollapsingHeader("Configuration")) { ImGuiIO& io = ImGui::GetIO(); if (ImGui::TreeNode("Configuration##2")) { - ImGui::CheckboxFlags("io.ConfigFlags: NavEnableKeyboard", (unsigned int *)&io.ConfigFlags, ImGuiConfigFlags_NavEnableKeyboard); - ImGui::CheckboxFlags("io.ConfigFlags: NavEnableGamepad", (unsigned int *)&io.ConfigFlags, ImGuiConfigFlags_NavEnableGamepad); - ImGui::SameLine(); HelpMarker("Required back-end to feed in gamepad inputs in io.NavInputs[] and set io.BackendFlags |= ImGuiBackendFlags_HasGamepad.\n\nRead instructions in imgui.cpp for details."); - ImGui::CheckboxFlags("io.ConfigFlags: NavEnableSetMousePos", (unsigned int *)&io.ConfigFlags, ImGuiConfigFlags_NavEnableSetMousePos); - ImGui::SameLine(); HelpMarker("Instruct navigation to move the mouse cursor. See comment for ImGuiConfigFlags_NavEnableSetMousePos."); - ImGui::CheckboxFlags("io.ConfigFlags: NoMouse", (unsigned int *)&io.ConfigFlags, ImGuiConfigFlags_NoMouse); - if (io.ConfigFlags & ImGuiConfigFlags_NoMouse) // Create a way to restore this flag otherwise we could be stuck completely! + ImGui::SeparatorText("General"); + ImGui::CheckboxFlags("io.ConfigFlags: NavEnableKeyboard", &io.ConfigFlags, ImGuiConfigFlags_NavEnableKeyboard); + ImGui::SameLine(); HelpMarker("Enable keyboard controls."); + ImGui::CheckboxFlags("io.ConfigFlags: NavEnableGamepad", &io.ConfigFlags, ImGuiConfigFlags_NavEnableGamepad); + ImGui::SameLine(); HelpMarker("Enable gamepad controls. Require backend to set io.BackendFlags |= ImGuiBackendFlags_HasGamepad.\n\nRead instructions in imgui.cpp for details."); + ImGui::CheckboxFlags("io.ConfigFlags: NoMouse", &io.ConfigFlags, ImGuiConfigFlags_NoMouse); + ImGui::SameLine(); HelpMarker("Instruct dear imgui to disable mouse inputs and interactions."); + + // The "NoMouse" option can get us stuck with a disabled mouse! Let's provide an alternative way to fix it: + if (io.ConfigFlags & ImGuiConfigFlags_NoMouse) { if (fmodf((float)ImGui::GetTime(), 0.40f) < 0.20f) { ImGui::SameLine(); ImGui::Text("<>"); } - if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Space))) + // Prevent both being checked + if (ImGui::IsKeyPressed(ImGuiKey_Space) || (io.ConfigFlags & ImGuiConfigFlags_NoKeyboard)) io.ConfigFlags &= ~ImGuiConfigFlags_NoMouse; } - ImGui::CheckboxFlags("io.ConfigFlags: NoMouseCursorChange", (unsigned int *)&io.ConfigFlags, ImGuiConfigFlags_NoMouseCursorChange); - ImGui::SameLine(); HelpMarker("Instruct back-end to not alter mouse cursor shape and visibility."); - ImGui::Checkbox("io.ConfigInputTextCursorBlink", &io.ConfigInputTextCursorBlink); - ImGui::SameLine(); HelpMarker("Set to false to disable blinking cursor, for users who consider it distracting"); - ImGui::Checkbox("io.ConfigWindowsResizeFromEdges", &io.ConfigWindowsResizeFromEdges); - ImGui::SameLine(); HelpMarker("Enable resizing of windows from their edges and from the lower-left corner.\nThis requires (io.BackendFlags & ImGuiBackendFlags_HasMouseCursors) because it needs mouse cursor feedback."); - ImGui::Checkbox("io.ConfigWindowsMoveFromTitleBarOnly", &io.ConfigWindowsMoveFromTitleBarOnly); + + ImGui::CheckboxFlags("io.ConfigFlags: NoMouseCursorChange", &io.ConfigFlags, ImGuiConfigFlags_NoMouseCursorChange); + ImGui::SameLine(); HelpMarker("Instruct backend to not alter mouse cursor shape and visibility."); + ImGui::CheckboxFlags("io.ConfigFlags: NoKeyboard", &io.ConfigFlags, ImGuiConfigFlags_NoKeyboard); + ImGui::SameLine(); HelpMarker("Instruct dear imgui to disable keyboard inputs and interactions."); + + ImGui::Checkbox("io.ConfigInputTrickleEventQueue", &io.ConfigInputTrickleEventQueue); + ImGui::SameLine(); HelpMarker("Enable input queue trickling: some types of events submitted during the same frame (e.g. button down + up) will be spread over multiple frames, improving interactions with low framerates."); ImGui::Checkbox("io.MouseDrawCursor", &io.MouseDrawCursor); - ImGui::SameLine(); HelpMarker("Instruct Dear ImGui to render a mouse cursor for you. Note that a mouse cursor rendered via your application GPU rendering path will feel more laggy than hardware cursor, but will be more in sync with your other visuals.\n\nSome desktop applications may use both kinds of cursors (e.g. enable software cursor only when resizing/dragging something)."); + ImGui::SameLine(); HelpMarker("Instruct Dear ImGui to render a mouse cursor itself. Note that a mouse cursor rendered via your application GPU rendering path will feel more laggy than hardware cursor, but will be more in sync with your other visuals.\n\nSome desktop applications may use both kinds of cursors (e.g. enable software cursor only when resizing/dragging something)."); + + ImGui::SeparatorText("Keyboard/Gamepad Navigation"); + ImGui::Checkbox("io.ConfigNavSwapGamepadButtons", &io.ConfigNavSwapGamepadButtons); + ImGui::Checkbox("io.ConfigNavMoveSetMousePos", &io.ConfigNavMoveSetMousePos); + ImGui::SameLine(); HelpMarker("Directional/tabbing navigation teleports the mouse cursor. May be useful on TV/console systems where moving a virtual mouse is difficult"); + ImGui::Checkbox("io.ConfigNavCaptureKeyboard", &io.ConfigNavCaptureKeyboard); + ImGui::Checkbox("io.ConfigNavEscapeClearFocusItem", &io.ConfigNavEscapeClearFocusItem); + ImGui::SameLine(); HelpMarker("Pressing Escape clears focused item."); + ImGui::Checkbox("io.ConfigNavEscapeClearFocusWindow", &io.ConfigNavEscapeClearFocusWindow); + ImGui::SameLine(); HelpMarker("Pressing Escape clears focused window."); + ImGui::Checkbox("io.ConfigNavCursorVisibleAuto", &io.ConfigNavCursorVisibleAuto); + ImGui::SameLine(); HelpMarker("Using directional navigation key makes the cursor visible. Mouse click hides the cursor."); + ImGui::Checkbox("io.ConfigNavCursorVisibleAlways", &io.ConfigNavCursorVisibleAlways); + ImGui::SameLine(); HelpMarker("Navigation cursor is always visible."); + + ImGui::SeparatorText("Docking"); + ImGui::CheckboxFlags("io.ConfigFlags: DockingEnable", &io.ConfigFlags, ImGuiConfigFlags_DockingEnable); + ImGui::SameLine(); + if (io.ConfigDockingWithShift) + HelpMarker("Drag from window title bar or their tab to dock/undock. Hold SHIFT to enable docking.\n\nDrag from window menu button (upper-left button) to undock an entire node (all windows)."); + else + HelpMarker("Drag from window title bar or their tab to dock/undock. Hold SHIFT to disable docking.\n\nDrag from window menu button (upper-left button) to undock an entire node (all windows)."); + if (io.ConfigFlags & ImGuiConfigFlags_DockingEnable) + { + ImGui::Indent(); + ImGui::Checkbox("io.ConfigDockingNoSplit", &io.ConfigDockingNoSplit); + ImGui::SameLine(); HelpMarker("Simplified docking mode: disable window splitting, so docking is limited to merging multiple windows together into tab-bars."); + ImGui::Checkbox("io.ConfigDockingWithShift", &io.ConfigDockingWithShift); + ImGui::SameLine(); HelpMarker("Enable docking when holding Shift only (allow to drop in wider space, reduce visual noise)"); + ImGui::Checkbox("io.ConfigDockingAlwaysTabBar", &io.ConfigDockingAlwaysTabBar); + ImGui::SameLine(); HelpMarker("Create a docking node and tab-bar on single floating windows."); + ImGui::Checkbox("io.ConfigDockingTransparentPayload", &io.ConfigDockingTransparentPayload); + ImGui::SameLine(); HelpMarker("Make window or viewport transparent when docking and only display docking boxes on the target viewport. Useful if rendering of multiple viewport cannot be synced. Best used with ConfigViewportsNoAutoMerge."); + ImGui::Unindent(); + } + + ImGui::SeparatorText("Multi-viewports"); + ImGui::CheckboxFlags("io.ConfigFlags: ViewportsEnable", &io.ConfigFlags, ImGuiConfigFlags_ViewportsEnable); + ImGui::SameLine(); HelpMarker("[beta] Enable beta multi-viewports support. See ImGuiPlatformIO for details."); + if (io.ConfigFlags & ImGuiConfigFlags_ViewportsEnable) + { + ImGui::Indent(); + ImGui::Checkbox("io.ConfigViewportsNoAutoMerge", &io.ConfigViewportsNoAutoMerge); + ImGui::SameLine(); HelpMarker("Set to make all floating imgui windows always create their own viewport. Otherwise, they are merged into the main host viewports when overlapping it."); + ImGui::Checkbox("io.ConfigViewportsNoTaskBarIcon", &io.ConfigViewportsNoTaskBarIcon); + ImGui::SameLine(); HelpMarker("Toggling this at runtime is normally unsupported (most platform backends won't refresh the task bar icon state right away)."); + ImGui::Checkbox("io.ConfigViewportsNoDecoration", &io.ConfigViewportsNoDecoration); + ImGui::SameLine(); HelpMarker("Toggling this at runtime is normally unsupported (most platform backends won't refresh the decoration right away)."); + ImGui::Checkbox("io.ConfigViewportsNoDefaultParent", &io.ConfigViewportsNoDefaultParent); + ImGui::SameLine(); HelpMarker("Toggling this at runtime is normally unsupported (most platform backends won't refresh the parenting right away)."); + ImGui::Unindent(); + } + + ImGui::SeparatorText("Windows"); + ImGui::Checkbox("io.ConfigWindowsResizeFromEdges", &io.ConfigWindowsResizeFromEdges); + ImGui::SameLine(); HelpMarker("Enable resizing of windows from their edges and from the lower-left corner.\nThis requires ImGuiBackendFlags_HasMouseCursors for better mouse cursor feedback."); + ImGui::Checkbox("io.ConfigWindowsMoveFromTitleBarOnly", &io.ConfigWindowsMoveFromTitleBarOnly); + ImGui::Checkbox("io.ConfigWindowsCopyContentsWithCtrlC", &io.ConfigWindowsCopyContentsWithCtrlC); // [EXPERIMENTAL] + ImGui::SameLine(); HelpMarker("*EXPERIMENTAL* CTRL+C copy the contents of focused window into the clipboard.\n\nExperimental because:\n- (1) has known issues with nested Begin/End pairs.\n- (2) text output quality varies.\n- (3) text output is in submission order rather than spatial order."); + ImGui::Checkbox("io.ConfigScrollbarScrollByPage", &io.ConfigScrollbarScrollByPage); + ImGui::SameLine(); HelpMarker("Enable scrolling page by page when clicking outside the scrollbar grab.\nWhen disabled, always scroll to clicked location.\nWhen enabled, Shift+Click scrolls to clicked location."); + + ImGui::SeparatorText("Widgets"); + ImGui::Checkbox("io.ConfigInputTextCursorBlink", &io.ConfigInputTextCursorBlink); + ImGui::SameLine(); HelpMarker("Enable blinking cursor (optional as some users consider it to be distracting)."); + ImGui::Checkbox("io.ConfigInputTextEnterKeepActive", &io.ConfigInputTextEnterKeepActive); + ImGui::SameLine(); HelpMarker("Pressing Enter will keep item active and select contents (single-line only)."); + ImGui::Checkbox("io.ConfigDragClickToInputText", &io.ConfigDragClickToInputText); + ImGui::SameLine(); HelpMarker("Enable turning DragXXX widgets into text input with a simple mouse click-release (without moving)."); + ImGui::Checkbox("io.ConfigMacOSXBehaviors", &io.ConfigMacOSXBehaviors); + ImGui::SameLine(); HelpMarker("Swap Cmd<>Ctrl keys, enable various MacOS style behaviors."); + ImGui::Text("Also see Style->Rendering for rendering options."); + + // Also read: https://github.com/ocornut/imgui/wiki/Error-Handling + ImGui::SeparatorText("Error Handling"); + + ImGui::Checkbox("io.ConfigErrorRecovery", &io.ConfigErrorRecovery); + ImGui::SameLine(); HelpMarker( + "Options to configure how we handle recoverable errors.\n" + "- Error recovery is not perfect nor guaranteed! It is a feature to ease development.\n" + "- You not are not supposed to rely on it in the course of a normal application run.\n" + "- Possible usage: facilitate recovery from errors triggered from a scripting language or after specific exceptions handlers.\n" + "- Always ensure that on programmers seat you have at minimum Asserts or Tooltips enabled when making direct imgui API call! " + "Otherwise it would severely hinder your ability to catch and correct mistakes!"); + ImGui::Checkbox("io.ConfigErrorRecoveryEnableAssert", &io.ConfigErrorRecoveryEnableAssert); + ImGui::Checkbox("io.ConfigErrorRecoveryEnableDebugLog", &io.ConfigErrorRecoveryEnableDebugLog); + ImGui::Checkbox("io.ConfigErrorRecoveryEnableTooltip", &io.ConfigErrorRecoveryEnableTooltip); + if (!io.ConfigErrorRecoveryEnableAssert && !io.ConfigErrorRecoveryEnableDebugLog && !io.ConfigErrorRecoveryEnableTooltip) + io.ConfigErrorRecoveryEnableAssert = io.ConfigErrorRecoveryEnableDebugLog = io.ConfigErrorRecoveryEnableTooltip = true; + + // Also read: https://github.com/ocornut/imgui/wiki/Debug-Tools + ImGui::SeparatorText("Debug"); + ImGui::Checkbox("io.ConfigDebugIsDebuggerPresent", &io.ConfigDebugIsDebuggerPresent); + ImGui::SameLine(); HelpMarker("Enable various tools calling IM_DEBUG_BREAK().\n\nRequires a debugger being attached, otherwise IM_DEBUG_BREAK() options will appear to crash your application."); + ImGui::Checkbox("io.ConfigDebugHighlightIdConflicts", &io.ConfigDebugHighlightIdConflicts); + ImGui::SameLine(); HelpMarker("Highlight and show an error message when multiple items have conflicting identifiers."); + ImGui::BeginDisabled(); + ImGui::Checkbox("io.ConfigDebugBeginReturnValueOnce", &io.ConfigDebugBeginReturnValueOnce); + ImGui::EndDisabled(); + ImGui::SameLine(); HelpMarker("First calls to Begin()/BeginChild() will return false.\n\nTHIS OPTION IS DISABLED because it needs to be set at application boot-time to make sense. Showing the disabled option is a way to make this feature easier to discover."); + ImGui::Checkbox("io.ConfigDebugBeginReturnValueLoop", &io.ConfigDebugBeginReturnValueLoop); + ImGui::SameLine(); HelpMarker("Some calls to Begin()/BeginChild() will return false.\n\nWill cycle through window depths then repeat. Windows should be flickering while running."); + ImGui::Checkbox("io.ConfigDebugIgnoreFocusLoss", &io.ConfigDebugIgnoreFocusLoss); + ImGui::SameLine(); HelpMarker("Option to deactivate io.AddFocusEvent(false) handling. May facilitate interactions with a debugger when focus loss leads to clearing inputs data."); + ImGui::Checkbox("io.ConfigDebugIniSettings", &io.ConfigDebugIniSettings); + ImGui::SameLine(); HelpMarker("Option to save .ini data with extra comments (particularly helpful for Docking, but makes saving slower)."); + ImGui::TreePop(); - ImGui::Separator(); + ImGui::Spacing(); } + IMGUI_DEMO_MARKER("Configuration/Backend Flags"); if (ImGui::TreeNode("Backend Flags")) { - HelpMarker("Those flags are set by the back-ends (imgui_impl_xxx files) to specify their capabilities."); - ImGuiBackendFlags backend_flags = io.BackendFlags; // Make a local copy to avoid modifying actual back-end flags. - ImGui::CheckboxFlags("io.BackendFlags: HasGamepad", (unsigned int *)&backend_flags, ImGuiBackendFlags_HasGamepad); - ImGui::CheckboxFlags("io.BackendFlags: HasMouseCursors", (unsigned int *)&backend_flags, ImGuiBackendFlags_HasMouseCursors); - ImGui::CheckboxFlags("io.BackendFlags: HasSetMousePos", (unsigned int *)&backend_flags, ImGuiBackendFlags_HasSetMousePos); - ImGui::CheckboxFlags("io.BackendFlags: RendererHasVtxOffset", (unsigned int *)&backend_flags, ImGuiBackendFlags_RendererHasVtxOffset); + HelpMarker( + "Those flags are set by the backends (imgui_impl_xxx files) to specify their capabilities.\n" + "Here we expose them as read-only fields to avoid breaking interactions with your backend."); + + // Make a local copy to avoid modifying actual backend flags. + // FIXME: Maybe we need a BeginReadonly() equivalent to keep label bright? + ImGui::BeginDisabled(); + ImGui::CheckboxFlags("io.BackendFlags: HasGamepad", &io.BackendFlags, ImGuiBackendFlags_HasGamepad); + ImGui::CheckboxFlags("io.BackendFlags: HasMouseCursors", &io.BackendFlags, ImGuiBackendFlags_HasMouseCursors); + ImGui::CheckboxFlags("io.BackendFlags: HasSetMousePos", &io.BackendFlags, ImGuiBackendFlags_HasSetMousePos); + ImGui::CheckboxFlags("io.BackendFlags: PlatformHasViewports", &io.BackendFlags, ImGuiBackendFlags_PlatformHasViewports); + ImGui::CheckboxFlags("io.BackendFlags: HasMouseHoveredViewport",&io.BackendFlags, ImGuiBackendFlags_HasMouseHoveredViewport); + ImGui::CheckboxFlags("io.BackendFlags: RendererHasVtxOffset", &io.BackendFlags, ImGuiBackendFlags_RendererHasVtxOffset); + ImGui::CheckboxFlags("io.BackendFlags: RendererHasViewports", &io.BackendFlags, ImGuiBackendFlags_RendererHasViewports); + ImGui::EndDisabled(); + ImGui::TreePop(); - ImGui::Separator(); + ImGui::Spacing(); } + IMGUI_DEMO_MARKER("Configuration/Style"); if (ImGui::TreeNode("Style")) { - ImGui::ShowStyleEditor(); + ImGui::Checkbox("Style Editor", &demo_data.ShowStyleEditor); + ImGui::SameLine(); + HelpMarker("The same contents can be accessed in 'Tools->Style Editor' or by calling the ShowStyleEditor() function."); ImGui::TreePop(); - ImGui::Separator(); + ImGui::Spacing(); } + IMGUI_DEMO_MARKER("Configuration/Capture, Logging"); if (ImGui::TreeNode("Capture/Logging")) { - ImGui::TextWrapped("The logging API redirects all text output so you can easily capture the content of a window or a block. Tree nodes can be automatically expanded."); - HelpMarker("Try opening any of the contents below in this window and then click one of the \"Log To\" button."); + HelpMarker( + "The logging API redirects all text output so you can easily capture the content of " + "a window or a block. Tree nodes can be automatically expanded.\n" + "Try opening any of the contents below in this window and then click one of the \"Log To\" button."); ImGui::LogButtons(); - ImGui::TextWrapped("You can also call ImGui::LogText() to output directly to the log without a visual output."); + + HelpMarker("You can also call ImGui::LogText() to output directly to the log without a visual output."); if (ImGui::Button("Copy \"Hello, world!\" to clipboard")) { ImGui::LogToClipboard(); @@ -387,38 +659,218 @@ void ImGui::ShowDemoWindow(bool* p_open) } } + IMGUI_DEMO_MARKER("Window options"); if (ImGui::CollapsingHeader("Window options")) { - ImGui::Checkbox("No titlebar", &no_titlebar); ImGui::SameLine(150); - ImGui::Checkbox("No scrollbar", &no_scrollbar); ImGui::SameLine(300); - ImGui::Checkbox("No menu", &no_menu); - ImGui::Checkbox("No move", &no_move); ImGui::SameLine(150); - ImGui::Checkbox("No resize", &no_resize); ImGui::SameLine(300); - ImGui::Checkbox("No collapse", &no_collapse); - ImGui::Checkbox("No close", &no_close); ImGui::SameLine(150); - ImGui::Checkbox("No nav", &no_nav); ImGui::SameLine(300); - ImGui::Checkbox("No background", &no_background); - ImGui::Checkbox("No bring to front", &no_bring_to_front); + if (ImGui::BeginTable("split", 3)) + { + ImGui::TableNextColumn(); ImGui::Checkbox("No titlebar", &no_titlebar); + ImGui::TableNextColumn(); ImGui::Checkbox("No scrollbar", &no_scrollbar); + ImGui::TableNextColumn(); ImGui::Checkbox("No menu", &no_menu); + ImGui::TableNextColumn(); ImGui::Checkbox("No move", &no_move); + ImGui::TableNextColumn(); ImGui::Checkbox("No resize", &no_resize); + ImGui::TableNextColumn(); ImGui::Checkbox("No collapse", &no_collapse); + ImGui::TableNextColumn(); ImGui::Checkbox("No close", &no_close); + ImGui::TableNextColumn(); ImGui::Checkbox("No nav", &no_nav); + ImGui::TableNextColumn(); ImGui::Checkbox("No background", &no_background); + ImGui::TableNextColumn(); ImGui::Checkbox("No bring to front", &no_bring_to_front); + ImGui::TableNextColumn(); ImGui::Checkbox("No docking", &no_docking); + ImGui::TableNextColumn(); ImGui::Checkbox("Unsaved document", &unsaved_document); + ImGui::EndTable(); + } } // All demo contents - ShowDemoWindowWidgets(); - ShowDemoWindowLayout(); - ShowDemoWindowPopups(); - ShowDemoWindowColumns(); - ShowDemoWindowMisc(); + DemoWindowWidgets(&demo_data); + DemoWindowLayout(); + DemoWindowPopups(); + DemoWindowTables(); + DemoWindowInputs(); // End of ShowDemoWindow() + ImGui::PopItemWidth(); ImGui::End(); } -static void ShowDemoWindowWidgets() -{ - if (!ImGui::CollapsingHeader("Widgets")) - return; +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowMenuBar() +//----------------------------------------------------------------------------- +static void DemoWindowMenuBar(ImGuiDemoWindowData* demo_data) +{ + IMGUI_DEMO_MARKER("Menu"); + if (ImGui::BeginMenuBar()) + { + if (ImGui::BeginMenu("Menu")) + { + IMGUI_DEMO_MARKER("Menu/File"); + ShowExampleMenuFile(); + ImGui::EndMenu(); + } + if (ImGui::BeginMenu("Examples")) + { + IMGUI_DEMO_MARKER("Menu/Examples"); + ImGui::MenuItem("Main menu bar", NULL, &demo_data->ShowMainMenuBar); + + ImGui::SeparatorText("Mini apps"); + ImGui::MenuItem("Assets Browser", NULL, &demo_data->ShowAppAssetsBrowser); + ImGui::MenuItem("Console", NULL, &demo_data->ShowAppConsole); + ImGui::MenuItem("Custom rendering", NULL, &demo_data->ShowAppCustomRendering); + ImGui::MenuItem("Documents", NULL, &demo_data->ShowAppDocuments); + ImGui::MenuItem("Dockspace", NULL, &demo_data->ShowAppDockSpace); + ImGui::MenuItem("Log", NULL, &demo_data->ShowAppLog); + ImGui::MenuItem("Property editor", NULL, &demo_data->ShowAppPropertyEditor); + ImGui::MenuItem("Simple layout", NULL, &demo_data->ShowAppLayout); + ImGui::MenuItem("Simple overlay", NULL, &demo_data->ShowAppSimpleOverlay); + + ImGui::SeparatorText("Concepts"); + ImGui::MenuItem("Auto-resizing window", NULL, &demo_data->ShowAppAutoResize); + ImGui::MenuItem("Constrained-resizing window", NULL, &demo_data->ShowAppConstrainedResize); + ImGui::MenuItem("Fullscreen window", NULL, &demo_data->ShowAppFullscreen); + ImGui::MenuItem("Long text display", NULL, &demo_data->ShowAppLongText); + ImGui::MenuItem("Manipulating window titles", NULL, &demo_data->ShowAppWindowTitles); + + ImGui::EndMenu(); + } + //if (ImGui::MenuItem("MenuItem")) {} // You can also use MenuItem() inside a menu bar! + if (ImGui::BeginMenu("Tools")) + { + IMGUI_DEMO_MARKER("Menu/Tools"); + ImGuiIO& io = ImGui::GetIO(); +#ifndef IMGUI_DISABLE_DEBUG_TOOLS + const bool has_debug_tools = true; +#else + const bool has_debug_tools = false; +#endif + ImGui::MenuItem("Metrics/Debugger", NULL, &demo_data->ShowMetrics, has_debug_tools); + if (ImGui::BeginMenu("Debug Options")) + { + ImGui::BeginDisabled(!has_debug_tools); + ImGui::Checkbox("Highlight ID Conflicts", &io.ConfigDebugHighlightIdConflicts); + ImGui::EndDisabled(); + ImGui::Checkbox("Assert on error recovery", &io.ConfigErrorRecoveryEnableAssert); + ImGui::TextDisabled("(see Demo->Configuration for details & more)"); + ImGui::EndMenu(); + } + ImGui::MenuItem("Debug Log", NULL, &demo_data->ShowDebugLog, has_debug_tools); + ImGui::MenuItem("ID Stack Tool", NULL, &demo_data->ShowIDStackTool, has_debug_tools); + bool is_debugger_present = io.ConfigDebugIsDebuggerPresent; + if (ImGui::MenuItem("Item Picker", NULL, false, has_debug_tools))// && is_debugger_present)) + ImGui::DebugStartItemPicker(); + if (!is_debugger_present) + ImGui::SetItemTooltip("Requires io.ConfigDebugIsDebuggerPresent=true to be set.\n\nWe otherwise disable some extra features to avoid casual users crashing the application."); + ImGui::MenuItem("Style Editor", NULL, &demo_data->ShowStyleEditor); + ImGui::MenuItem("About Dear ImGui", NULL, &demo_data->ShowAbout); + + ImGui::EndMenu(); + } + ImGui::EndMenuBar(); + } +} + +//----------------------------------------------------------------------------- +// [SECTION] Helpers: ExampleTreeNode, ExampleMemberInfo (for use by Property Editor & Multi-Select demos) +//----------------------------------------------------------------------------- + +// Simple representation for a tree +// (this is designed to be simple to understand for our demos, not to be fancy or efficient etc.) +struct ExampleTreeNode +{ + // Tree structure + char Name[28] = ""; + int UID = 0; + ExampleTreeNode* Parent = NULL; + ImVector Childs; + unsigned short IndexInParent = 0; // Maintaining this allows us to implement linear traversal more easily + + // Leaf Data + bool HasData = false; // All leaves have data + bool DataMyBool = true; + int DataMyInt = 128; + ImVec2 DataMyVec2 = ImVec2(0.0f, 3.141592f); +}; + +// Simple representation of struct metadata/serialization data. +// (this is a minimal version of what a typical advanced application may provide) +struct ExampleMemberInfo +{ + const char* Name; // Member name + ImGuiDataType DataType; // Member type + int DataCount; // Member count (1 when scalar) + int Offset; // Offset inside parent structure +}; + +// Metadata description of ExampleTreeNode struct. +static const ExampleMemberInfo ExampleTreeNodeMemberInfos[] +{ + { "MyName", ImGuiDataType_String, 1, offsetof(ExampleTreeNode, Name) }, + { "MyBool", ImGuiDataType_Bool, 1, offsetof(ExampleTreeNode, DataMyBool) }, + { "MyInt", ImGuiDataType_S32, 1, offsetof(ExampleTreeNode, DataMyInt) }, + { "MyVec2", ImGuiDataType_Float, 2, offsetof(ExampleTreeNode, DataMyVec2) }, +}; + +static ExampleTreeNode* ExampleTree_CreateNode(const char* name, int uid, ExampleTreeNode* parent) +{ + ExampleTreeNode* node = IM_NEW(ExampleTreeNode); + snprintf(node->Name, IM_ARRAYSIZE(node->Name), "%s", name); + node->UID = uid; + node->Parent = parent; + node->IndexInParent = parent ? (unsigned short)parent->Childs.Size : 0; + if (parent) + parent->Childs.push_back(node); + return node; +} + +static void ExampleTree_DestroyNode(ExampleTreeNode* node) +{ + for (ExampleTreeNode* child_node : node->Childs) + ExampleTree_DestroyNode(child_node); + IM_DELETE(node); +} + +// Create example tree data +// (this allocates _many_ more times than most other code in either Dear ImGui or others demo) +static ExampleTreeNode* ExampleTree_CreateDemoTree() +{ + static const char* root_names[] = { "Apple", "Banana", "Cherry", "Kiwi", "Mango", "Orange", "Pear", "Pineapple", "Strawberry", "Watermelon" }; + const size_t NAME_MAX_LEN = sizeof(ExampleTreeNode::Name); + char name_buf[NAME_MAX_LEN]; + int uid = 0; + ExampleTreeNode* node_L0 = ExampleTree_CreateNode("", ++uid, NULL); + const int root_items_multiplier = 2; + for (int idx_L0 = 0; idx_L0 < IM_ARRAYSIZE(root_names) * root_items_multiplier; idx_L0++) + { + snprintf(name_buf, IM_ARRAYSIZE(name_buf), "%s %d", root_names[idx_L0 / root_items_multiplier], idx_L0 % root_items_multiplier); + ExampleTreeNode* node_L1 = ExampleTree_CreateNode(name_buf, ++uid, node_L0); + const int number_of_childs = (int)strlen(node_L1->Name); + for (int idx_L1 = 0; idx_L1 < number_of_childs; idx_L1++) + { + snprintf(name_buf, IM_ARRAYSIZE(name_buf), "Child %d", idx_L1); + ExampleTreeNode* node_L2 = ExampleTree_CreateNode(name_buf, ++uid, node_L1); + node_L2->HasData = true; + if (idx_L1 == 0) + { + snprintf(name_buf, IM_ARRAYSIZE(name_buf), "Sub-child %d", 0); + ExampleTreeNode* node_L3 = ExampleTree_CreateNode(name_buf, ++uid, node_L2); + node_L3->HasData = true; + } + } + } + return node_L0; +} + +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowWidgetsBasic() +//----------------------------------------------------------------------------- + +static void DemoWindowWidgetsBasic() +{ + IMGUI_DEMO_MARKER("Widgets/Basic"); if (ImGui::TreeNode("Basic")) { + ImGui::SeparatorText("General"); + + IMGUI_DEMO_MARKER("Widgets/Basic/Button"); static int clicked = 0; if (ImGui::Button("Button")) clicked++; @@ -428,83 +880,82 @@ static void ShowDemoWindowWidgets() ImGui::Text("Thanks for clicking me!"); } + IMGUI_DEMO_MARKER("Widgets/Basic/Checkbox"); static bool check = true; ImGui::Checkbox("checkbox", &check); + IMGUI_DEMO_MARKER("Widgets/Basic/RadioButton"); static int e = 0; ImGui::RadioButton("radio a", &e, 0); ImGui::SameLine(); ImGui::RadioButton("radio b", &e, 1); ImGui::SameLine(); ImGui::RadioButton("radio c", &e, 2); // Color buttons, demonstrate using PushID() to add unique identifier in the ID stack, and changing style. + IMGUI_DEMO_MARKER("Widgets/Basic/Buttons (Colored)"); for (int i = 0; i < 7; i++) { if (i > 0) ImGui::SameLine(); ImGui::PushID(i); - ImGui::PushStyleColor(ImGuiCol_Button, (ImVec4)ImColor::HSV(i/7.0f, 0.6f, 0.6f)); - ImGui::PushStyleColor(ImGuiCol_ButtonHovered, (ImVec4)ImColor::HSV(i/7.0f, 0.7f, 0.7f)); - ImGui::PushStyleColor(ImGuiCol_ButtonActive, (ImVec4)ImColor::HSV(i/7.0f, 0.8f, 0.8f)); + ImGui::PushStyleColor(ImGuiCol_Button, (ImVec4)ImColor::HSV(i / 7.0f, 0.6f, 0.6f)); + ImGui::PushStyleColor(ImGuiCol_ButtonHovered, (ImVec4)ImColor::HSV(i / 7.0f, 0.7f, 0.7f)); + ImGui::PushStyleColor(ImGuiCol_ButtonActive, (ImVec4)ImColor::HSV(i / 7.0f, 0.8f, 0.8f)); ImGui::Button("Click"); ImGui::PopStyleColor(3); ImGui::PopID(); } - // Use AlignTextToFramePadding() to align text baseline to the baseline of framed elements (otherwise a Text+SameLine+Button sequence will have the text a little too high by default) + // Use AlignTextToFramePadding() to align text baseline to the baseline of framed widgets elements + // (otherwise a Text+SameLine+Button sequence will have the text a little too high by default!) + // See 'Demo->Layout->Text Baseline Alignment' for details. ImGui::AlignTextToFramePadding(); ImGui::Text("Hold to repeat:"); ImGui::SameLine(); // Arrow buttons with Repeater + IMGUI_DEMO_MARKER("Widgets/Basic/Buttons (Repeating)"); static int counter = 0; float spacing = ImGui::GetStyle().ItemInnerSpacing.x; - ImGui::PushButtonRepeat(true); + ImGui::PushItemFlag(ImGuiItemFlags_ButtonRepeat, true); if (ImGui::ArrowButton("##left", ImGuiDir_Left)) { counter--; } ImGui::SameLine(0.0f, spacing); if (ImGui::ArrowButton("##right", ImGuiDir_Right)) { counter++; } - ImGui::PopButtonRepeat(); + ImGui::PopItemFlag(); ImGui::SameLine(); ImGui::Text("%d", counter); - ImGui::Text("Hover over me"); - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("I am a tooltip"); - - ImGui::SameLine(); - ImGui::Text("- or me"); - if (ImGui::IsItemHovered()) - { - ImGui::BeginTooltip(); - ImGui::Text("I am a fancy tooltip"); - static float arr[] = { 0.6f, 0.1f, 1.0f, 0.5f, 0.92f, 0.1f, 0.2f }; - ImGui::PlotLines("Curve", arr, IM_ARRAYSIZE(arr)); - ImGui::EndTooltip(); - } - - ImGui::Separator(); + ImGui::Button("Tooltip"); + ImGui::SetItemTooltip("I am a tooltip"); ImGui::LabelText("label", "Value"); - { - // Using the _simplified_ one-liner Combo() api here - // See "Combo" section for examples of how to use the more complete BeginCombo()/EndCombo() api. - const char* items[] = { "AAAA", "BBBB", "CCCC", "DDDD", "EEEE", "FFFF", "GGGG", "HHHH", "IIII", "JJJJ", "KKKK", "LLLLLLL", "MMMM", "OOOOOOO" }; - static int item_current = 0; - ImGui::Combo("combo", &item_current, items, IM_ARRAYSIZE(items)); - ImGui::SameLine(); HelpMarker("Refer to the \"Combo\" section below for an explanation of the full BeginCombo/EndCombo API, and demonstration of various flags.\n"); - } + ImGui::SeparatorText("Inputs"); { + // To wire InputText() with std::string or any other custom string type, + // see the "Text Input > Resize Callback" section of this demo, and the misc/cpp/imgui_stdlib.h file. + IMGUI_DEMO_MARKER("Widgets/Basic/InputText"); static char str0[128] = "Hello, world!"; ImGui::InputText("input text", str0, IM_ARRAYSIZE(str0)); - ImGui::SameLine(); HelpMarker("USER:\nHold SHIFT or use mouse to select text.\n" "CTRL+Left/Right to word jump.\n" "CTRL+A or double-click to select all.\n" "CTRL+X,CTRL+C,CTRL+V clipboard.\n" "CTRL+Z,CTRL+Y undo/redo.\n" "ESCAPE to revert.\n\nPROGRAMMER:\nYou can use the ImGuiInputTextFlags_CallbackResize facility if you need to wire InputText() to a dynamic string type. See misc/cpp/imgui_stdlib.h for an example (this is not demonstrated in imgui_demo.cpp)."); + ImGui::SameLine(); HelpMarker( + "USER:\n" + "Hold SHIFT or use mouse to select text.\n" + "CTRL+Left/Right to word jump.\n" + "CTRL+A or Double-Click to select all.\n" + "CTRL+X,CTRL+C,CTRL+V for clipboard.\n" + "CTRL+Z to undo, CTRL+Y/CTRL+SHIFT+Z to redo.\n" + "ESCAPE to revert.\n\n" + "PROGRAMMER:\n" + "You can use the ImGuiInputTextFlags_CallbackResize facility if you need to wire InputText() " + "to a dynamic string type. See misc/cpp/imgui_stdlib.h for an example (this is not demonstrated " + "in imgui_demo.cpp)."); static char str1[128] = ""; ImGui::InputTextWithHint("input text (w/ hint)", "enter text here", str1, IM_ARRAYSIZE(str1)); + IMGUI_DEMO_MARKER("Widgets/Basic/InputInt, InputFloat"); static int i0 = 123; ImGui::InputInt("input int", &i0); - ImGui::SameLine(); HelpMarker("You can apply arithmetic operators +,*,/ on numerical values.\n e.g. [ 100 ], input \'*2\', result becomes [ 200 ]\nUse +- to subtract.\n"); static float f0 = 0.001f; ImGui::InputFloat("input float", &f0, 0.01f, 1.0f, "%.3f"); @@ -514,149 +965,145 @@ static void ShowDemoWindowWidgets() static float f1 = 1.e10f; ImGui::InputFloat("input scientific", &f1, 0.0f, 0.0f, "%e"); - ImGui::SameLine(); HelpMarker("You can input value using the scientific notation,\n e.g. \"1e+8\" becomes \"100000000\".\n"); + ImGui::SameLine(); HelpMarker( + "You can input value using the scientific notation,\n" + " e.g. \"1e+8\" becomes \"100000000\"."); static float vec4a[4] = { 0.10f, 0.20f, 0.30f, 0.44f }; ImGui::InputFloat3("input float3", vec4a); } + ImGui::SeparatorText("Drags"); + { - static int i1 = 50, i2 = 42; + IMGUI_DEMO_MARKER("Widgets/Basic/DragInt, DragFloat"); + static int i1 = 50, i2 = 42, i3 = 128; ImGui::DragInt("drag int", &i1, 1); - ImGui::SameLine(); HelpMarker("Click and drag to edit value.\nHold SHIFT/ALT for faster/slower edit.\nDouble-click or CTRL+click to input value."); + ImGui::SameLine(); HelpMarker( + "Click and drag to edit value.\n" + "Hold SHIFT/ALT for faster/slower edit.\n" + "Double-click or CTRL+click to input value."); + ImGui::DragInt("drag int 0..100", &i2, 1, 0, 100, "%d%%", ImGuiSliderFlags_AlwaysClamp); + ImGui::DragInt("drag int wrap 100..200", &i3, 1, 100, 200, "%d", ImGuiSliderFlags_WrapAround); - ImGui::DragInt("drag int 0..100", &i2, 1, 0, 100, "%d%%"); - - static float f1=1.00f, f2=0.0067f; + static float f1 = 1.00f, f2 = 0.0067f; ImGui::DragFloat("drag float", &f1, 0.005f); ImGui::DragFloat("drag small float", &f2, 0.0001f, 0.0f, 0.0f, "%.06f ns"); + //ImGui::DragFloat("drag wrap -1..1", &f3, 0.005f, -1.0f, 1.0f, NULL, ImGuiSliderFlags_WrapAround); } + ImGui::SeparatorText("Sliders"); + { - static int i1=0; + IMGUI_DEMO_MARKER("Widgets/Basic/SliderInt, SliderFloat"); + static int i1 = 0; ImGui::SliderInt("slider int", &i1, -1, 3); ImGui::SameLine(); HelpMarker("CTRL+click to input value."); - static float f1=0.123f, f2=0.0f; + static float f1 = 0.123f, f2 = 0.0f; ImGui::SliderFloat("slider float", &f1, 0.0f, 1.0f, "ratio = %.3f"); - ImGui::SliderFloat("slider float (curve)", &f2, -10.0f, 10.0f, "%.4f", 2.0f); + ImGui::SliderFloat("slider float (log)", &f2, -10.0f, 10.0f, "%.4f", ImGuiSliderFlags_Logarithmic); + + IMGUI_DEMO_MARKER("Widgets/Basic/SliderAngle"); static float angle = 0.0f; ImGui::SliderAngle("slider angle", &angle); + + // Using the format string to display a name instead of an integer. + // Here we completely omit '%d' from the format string, so it'll only display a name. + // This technique can also be used with DragInt(). + IMGUI_DEMO_MARKER("Widgets/Basic/Slider (enum)"); + enum Element { Element_Fire, Element_Earth, Element_Air, Element_Water, Element_COUNT }; + static int elem = Element_Fire; + const char* elems_names[Element_COUNT] = { "Fire", "Earth", "Air", "Water" }; + const char* elem_name = (elem >= 0 && elem < Element_COUNT) ? elems_names[elem] : "Unknown"; + ImGui::SliderInt("slider enum", &elem, 0, Element_COUNT - 1, elem_name); // Use ImGuiSliderFlags_NoInput flag to disable CTRL+Click here. + ImGui::SameLine(); HelpMarker("Using the format string parameter to display a name instead of the underlying integer."); } + ImGui::SeparatorText("Selectors/Pickers"); + { - static float col1[3] = { 1.0f,0.0f,0.2f }; - static float col2[4] = { 0.4f,0.7f,0.0f,0.5f }; + IMGUI_DEMO_MARKER("Widgets/Basic/ColorEdit3, ColorEdit4"); + static float col1[3] = { 1.0f, 0.0f, 0.2f }; + static float col2[4] = { 0.4f, 0.7f, 0.0f, 0.5f }; ImGui::ColorEdit3("color 1", col1); - ImGui::SameLine(); HelpMarker("Click on the colored square to open a color picker.\nClick and hold to use drag and drop.\nRight-click on the colored square to show options.\nCTRL+click on individual component to input value.\n"); + ImGui::SameLine(); HelpMarker( + "Click on the color square to open a color picker.\n" + "Click and hold to use drag and drop.\n" + "Right-click on the color square to show options.\n" + "CTRL+click on individual component to input value.\n"); ImGui::ColorEdit4("color 2", col2); } { - // List box - const char* listbox_items[] = { "Apple", "Banana", "Cherry", "Kiwi", "Mango", "Orange", "Pineapple", "Strawberry", "Watermelon" }; - static int listbox_item_current = 1; - ImGui::ListBox("listbox\n(single select)", &listbox_item_current, listbox_items, IM_ARRAYSIZE(listbox_items), 4); - - //static int listbox_item_current2 = 2; - //ImGui::SetNextItemWidth(-1); - //ImGui::ListBox("##listbox2", &listbox_item_current2, listbox_items, IM_ARRAYSIZE(listbox_items), 4); + // Using the _simplified_ one-liner Combo() api here + // See "Combo" section for examples of how to use the more flexible BeginCombo()/EndCombo() api. + IMGUI_DEMO_MARKER("Widgets/Basic/Combo"); + const char* items[] = { "AAAA", "BBBB", "CCCC", "DDDD", "EEEE", "FFFF", "GGGG", "HHHH", "IIIIIII", "JJJJ", "KKKKKKK" }; + static int item_current = 0; + ImGui::Combo("combo", &item_current, items, IM_ARRAYSIZE(items)); + ImGui::SameLine(); HelpMarker( + "Using the simplified one-liner Combo API here.\n" + "Refer to the \"Combo\" section below for an explanation of how to use the more flexible and general BeginCombo/EndCombo API."); } + { + // Using the _simplified_ one-liner ListBox() api here + // See "List boxes" section for examples of how to use the more flexible BeginListBox()/EndListBox() api. + IMGUI_DEMO_MARKER("Widgets/Basic/ListBox"); + const char* items[] = { "Apple", "Banana", "Cherry", "Kiwi", "Mango", "Orange", "Pineapple", "Strawberry", "Watermelon" }; + static int item_current = 1; + ImGui::ListBox("listbox", &item_current, items, IM_ARRAYSIZE(items), 4); + ImGui::SameLine(); HelpMarker( + "Using the simplified one-liner ListBox API here.\n" + "Refer to the \"List boxes\" section below for an explanation of how to use the more flexible and general BeginListBox/EndListBox API."); + } + + // Testing ImGuiOnceUponAFrame helper. + //static ImGuiOnceUponAFrame once; + //for (int i = 0; i < 5; i++) + // if (once) + // ImGui::Text("This will be displayed only once."); + ImGui::TreePop(); } +} - // Testing ImGuiOnceUponAFrame helper. - //static ImGuiOnceUponAFrame once; - //for (int i = 0; i < 5; i++) - // if (once) - // ImGui::Text("This will be displayed only once."); +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowWidgetsBullets() +//----------------------------------------------------------------------------- - if (ImGui::TreeNode("Trees")) +static void DemoWindowWidgetsBullets() +{ + IMGUI_DEMO_MARKER("Widgets/Bullets"); + if (ImGui::TreeNode("Bullets")) { - if (ImGui::TreeNode("Basic trees")) + ImGui::BulletText("Bullet point 1"); + ImGui::BulletText("Bullet point 2\nOn multiple lines"); + if (ImGui::TreeNode("Tree node")) { - for (int i = 0; i < 5; i++) - { - // Use SetNextItemOpen() so set the default state of a node to be open. - // We could also use TreeNodeEx() with the ImGuiTreeNodeFlags_DefaultOpen flag to achieve the same thing! - if (i == 0) - ImGui::SetNextItemOpen(true, ImGuiCond_Once); - - if (ImGui::TreeNode((void*)(intptr_t)i, "Child %d", i)) - { - ImGui::Text("blah blah"); - ImGui::SameLine(); - if (ImGui::SmallButton("button")) {}; - ImGui::TreePop(); - } - } - ImGui::TreePop(); - } - - if (ImGui::TreeNode("Advanced, with Selectable nodes")) - { - HelpMarker("This is a more typical looking tree with selectable nodes.\nClick to select, CTRL+Click to toggle, click on arrows or double-click to open."); - static bool align_label_with_current_x_position = false; - ImGui::Checkbox("Align label with current X position)", &align_label_with_current_x_position); - ImGui::Text("Hello!"); - if (align_label_with_current_x_position) - ImGui::Unindent(ImGui::GetTreeNodeToLabelSpacing()); - - static int selection_mask = (1 << 2); // Dumb representation of what may be user-side selection state. You may carry selection state inside or outside your objects in whatever format you see fit. - int node_clicked = -1; // Temporary storage of what node we have clicked to process selection at the end of the loop. May be a pointer to your own node type, etc. - ImGui::PushStyleVar(ImGuiStyleVar_IndentSpacing, ImGui::GetFontSize()*3); // Increase spacing to differentiate leaves from expanded contents. - for (int i = 0; i < 6; i++) - { - // Disable the default open on single-click behavior and pass in Selected flag according to our selection state. - ImGuiTreeNodeFlags node_flags = ImGuiTreeNodeFlags_OpenOnArrow | ImGuiTreeNodeFlags_OpenOnDoubleClick; - if (selection_mask & (1 << i)) - node_flags |= ImGuiTreeNodeFlags_Selected; - if (i < 3) - { - // Items 0..2 are Tree Node - bool node_open = ImGui::TreeNodeEx((void*)(intptr_t)i, node_flags, "Selectable Node %d", i); - if (ImGui::IsItemClicked()) - node_clicked = i; - if (node_open) - { - ImGui::Text("Blah blah\nBlah Blah"); - ImGui::TreePop(); - } - } - else - { - // Items 3..5 are Tree Leaves - // The only reason we use TreeNode at all is to allow selection of the leaf. - // Otherwise we can use BulletText() or TreeAdvanceToLabelPos()+Text(). - node_flags |= ImGuiTreeNodeFlags_Leaf | ImGuiTreeNodeFlags_NoTreePushOnOpen; // ImGuiTreeNodeFlags_Bullet - ImGui::TreeNodeEx((void*)(intptr_t)i, node_flags, "Selectable Leaf %d", i); - if (ImGui::IsItemClicked()) - node_clicked = i; - } - } - if (node_clicked != -1) - { - // Update selection state. Process outside of tree loop to avoid visual inconsistencies during the clicking-frame. - if (ImGui::GetIO().KeyCtrl) - selection_mask ^= (1 << node_clicked); // CTRL+click to toggle - else //if (!(selection_mask & (1 << node_clicked))) // Depending on selection behavior you want, this commented bit preserve selection when clicking on item that is part of the selection - selection_mask = (1 << node_clicked); // Click to single-select - } - ImGui::PopStyleVar(); - if (align_label_with_current_x_position) - ImGui::Indent(ImGui::GetTreeNodeToLabelSpacing()); + ImGui::BulletText("Another bullet point"); ImGui::TreePop(); } + ImGui::Bullet(); ImGui::Text("Bullet point 3 (two calls)"); + ImGui::Bullet(); ImGui::SmallButton("Button"); ImGui::TreePop(); } +} +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowWidgetsCollapsingHeaders() +//----------------------------------------------------------------------------- + +static void DemoWindowWidgetsCollapsingHeaders() +{ + IMGUI_DEMO_MARKER("Widgets/Collapsing Headers"); if (ImGui::TreeNode("Collapsing Headers")) { static bool closable_group = true; ImGui::Checkbox("Show 2nd header", &closable_group); - if (ImGui::CollapsingHeader("Header")) + if (ImGui::CollapsingHeader("Header", ImGuiTreeNodeFlags_None)) { ImGui::Text("IsItemHovered: %d", ImGui::IsItemHovered()); for (int i = 0; i < 5; i++) @@ -668,484 +1115,79 @@ static void ShowDemoWindowWidgets() for (int i = 0; i < 5; i++) ImGui::Text("More content %d", i); } + /* + if (ImGui::CollapsingHeader("Header with a bullet", ImGuiTreeNodeFlags_Bullet)) + ImGui::Text("IsItemHovered: %d", ImGui::IsItemHovered()); + */ ImGui::TreePop(); } +} - if (ImGui::TreeNode("Bullets")) - { - ImGui::BulletText("Bullet point 1"); - ImGui::BulletText("Bullet point 2\nOn multiple lines"); - ImGui::Bullet(); ImGui::Text("Bullet point 3 (two calls)"); - ImGui::Bullet(); ImGui::SmallButton("Button"); - ImGui::TreePop(); - } - - if (ImGui::TreeNode("Text")) - { - if (ImGui::TreeNode("Colored Text")) - { - // Using shortcut. You can use PushStyleColor()/PopStyleColor() for more flexibility. - ImGui::TextColored(ImVec4(1.0f,0.0f,1.0f,1.0f), "Pink"); - ImGui::TextColored(ImVec4(1.0f,1.0f,0.0f,1.0f), "Yellow"); - ImGui::TextDisabled("Disabled"); - ImGui::SameLine(); HelpMarker("The TextDisabled color is stored in ImGuiStyle."); - ImGui::TreePop(); - } - - if (ImGui::TreeNode("Word Wrapping")) - { - // Using shortcut. You can use PushTextWrapPos()/PopTextWrapPos() for more flexibility. - ImGui::TextWrapped("This text should automatically wrap on the edge of the window. The current implementation for text wrapping follows simple rules suitable for English and possibly other languages."); - ImGui::Spacing(); - - static float wrap_width = 200.0f; - ImGui::SliderFloat("Wrap width", &wrap_width, -20, 600, "%.0f"); - - ImGui::Text("Test paragraph 1:"); - ImVec2 pos = ImGui::GetCursorScreenPos(); - ImGui::GetWindowDrawList()->AddRectFilled(ImVec2(pos.x + wrap_width, pos.y), ImVec2(pos.x + wrap_width + 10, pos.y + ImGui::GetTextLineHeight()), IM_COL32(255,0,255,255)); - ImGui::PushTextWrapPos(ImGui::GetCursorPos().x + wrap_width); - ImGui::Text("The lazy dog is a good dog. This paragraph is made to fit within %.0f pixels. Testing a 1 character word. The quick brown fox jumps over the lazy dog.", wrap_width); - ImGui::GetWindowDrawList()->AddRect(ImGui::GetItemRectMin(), ImGui::GetItemRectMax(), IM_COL32(255,255,0,255)); - ImGui::PopTextWrapPos(); - - ImGui::Text("Test paragraph 2:"); - pos = ImGui::GetCursorScreenPos(); - ImGui::GetWindowDrawList()->AddRectFilled(ImVec2(pos.x + wrap_width, pos.y), ImVec2(pos.x + wrap_width + 10, pos.y + ImGui::GetTextLineHeight()), IM_COL32(255,0,255,255)); - ImGui::PushTextWrapPos(ImGui::GetCursorPos().x + wrap_width); - ImGui::Text("aaaaaaaa bbbbbbbb, c cccccccc,dddddddd. d eeeeeeee ffffffff. gggggggg!hhhhhhhh"); - ImGui::GetWindowDrawList()->AddRect(ImGui::GetItemRectMin(), ImGui::GetItemRectMax(), IM_COL32(255,255,0,255)); - ImGui::PopTextWrapPos(); - - ImGui::TreePop(); - } - - if (ImGui::TreeNode("UTF-8 Text")) - { - // UTF-8 test with Japanese characters - // (Needs a suitable font, try Noto, or Arial Unicode, or M+ fonts. Read misc/fonts/README.txt for details.) - // - From C++11 you can use the u8"my text" syntax to encode literal strings as UTF-8 - // - For earlier compiler, you may be able to encode your sources as UTF-8 (e.g. Visual Studio save your file as 'UTF-8 without signature') - // - FOR THIS DEMO FILE ONLY, BECAUSE WE WANT TO SUPPORT OLD COMPILERS, WE ARE *NOT* INCLUDING RAW UTF-8 CHARACTERS IN THIS SOURCE FILE. - // Instead we are encoding a few strings with hexadecimal constants. Don't do this in your application! - // Please use u8"text in any language" in your application! - // Note that characters values are preserved even by InputText() if the font cannot be displayed, so you can safely copy & paste garbled characters into another application. - ImGui::TextWrapped("CJK text will only appears if the font was loaded with the appropriate CJK character ranges. Call io.Font->AddFontFromFileTTF() manually to load extra character ranges. Read misc/fonts/README.txt for details."); - ImGui::Text("Hiragana: \xe3\x81\x8b\xe3\x81\x8d\xe3\x81\x8f\xe3\x81\x91\xe3\x81\x93 (kakikukeko)"); // Normally we would use u8"blah blah" with the proper characters directly in the string. - ImGui::Text("Kanjis: \xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e (nihongo)"); - static char buf[32] = "\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e"; - //static char buf[32] = u8"NIHONGO"; // <- this is how you would write it with C++11, using real kanjis - ImGui::InputText("UTF-8 input", buf, IM_ARRAYSIZE(buf)); - ImGui::TreePop(); - } - ImGui::TreePop(); - } - - if (ImGui::TreeNode("Images")) - { - ImGuiIO& io = ImGui::GetIO(); - ImGui::TextWrapped("Below we are displaying the font texture (which is the only texture we have access to in this demo). Use the 'ImTextureID' type as storage to pass pointers or identifier to your own texture data. Hover the texture for a zoomed view!"); - - // Here we are grabbing the font texture because that's the only one we have access to inside the demo code. - // Remember that ImTextureID is just storage for whatever you want it to be, it is essentially a value that will be passed to the render function inside the ImDrawCmd structure. - // If you use one of the default imgui_impl_XXXX.cpp renderer, they all have comments at the top of their file to specify what they expect to be stored in ImTextureID. - // (for example, the imgui_impl_dx11.cpp renderer expect a 'ID3D11ShaderResourceView*' pointer. The imgui_impl_glfw_gl3.cpp renderer expect a GLuint OpenGL texture identifier etc.) - // If you decided that ImTextureID = MyEngineTexture*, then you can pass your MyEngineTexture* pointers to ImGui::Image(), and gather width/height through your own functions, etc. - // Using ShowMetricsWindow() as a "debugger" to inspect the draw data that are being passed to your render will help you debug issues if you are confused about this. - // Consider using the lower-level ImDrawList::AddImage() API, via ImGui::GetWindowDrawList()->AddImage(). - ImTextureID my_tex_id = io.Fonts->TexID; - float my_tex_w = (float)io.Fonts->TexWidth; - float my_tex_h = (float)io.Fonts->TexHeight; - - ImGui::Text("%.0fx%.0f", my_tex_w, my_tex_h); - ImVec2 pos = ImGui::GetCursorScreenPos(); - ImGui::Image(my_tex_id, ImVec2(my_tex_w, my_tex_h), ImVec2(0,0), ImVec2(1,1), ImVec4(1.0f,1.0f,1.0f,1.0f), ImVec4(1.0f,1.0f,1.0f,0.5f)); - if (ImGui::IsItemHovered()) - { - ImGui::BeginTooltip(); - float region_sz = 32.0f; - float region_x = io.MousePos.x - pos.x - region_sz * 0.5f; if (region_x < 0.0f) region_x = 0.0f; else if (region_x > my_tex_w - region_sz) region_x = my_tex_w - region_sz; - float region_y = io.MousePos.y - pos.y - region_sz * 0.5f; if (region_y < 0.0f) region_y = 0.0f; else if (region_y > my_tex_h - region_sz) region_y = my_tex_h - region_sz; - float zoom = 4.0f; - ImGui::Text("Min: (%.2f, %.2f)", region_x, region_y); - ImGui::Text("Max: (%.2f, %.2f)", region_x + region_sz, region_y + region_sz); - ImVec2 uv0 = ImVec2((region_x) / my_tex_w, (region_y) / my_tex_h); - ImVec2 uv1 = ImVec2((region_x + region_sz) / my_tex_w, (region_y + region_sz) / my_tex_h); - ImGui::Image(my_tex_id, ImVec2(region_sz * zoom, region_sz * zoom), uv0, uv1, ImVec4(1.0f, 1.0f, 1.0f, 1.0f), ImVec4(1.0f, 1.0f, 1.0f, 0.5f)); - ImGui::EndTooltip(); - } - ImGui::TextWrapped("And now some textured buttons.."); - static int pressed_count = 0; - for (int i = 0; i < 8; i++) - { - ImGui::PushID(i); - int frame_padding = -1 + i; // -1 = uses default padding - if (ImGui::ImageButton(my_tex_id, ImVec2(32,32), ImVec2(0,0), ImVec2(32.0f/my_tex_w,32/my_tex_h), frame_padding, ImVec4(0.0f,0.0f,0.0f,1.0f))) - pressed_count += 1; - ImGui::PopID(); - ImGui::SameLine(); - } - ImGui::NewLine(); - ImGui::Text("Pressed %d times.", pressed_count); - ImGui::TreePop(); - } - - if (ImGui::TreeNode("Combo")) - { - // Expose flags as checkbox for the demo - static ImGuiComboFlags flags = 0; - ImGui::CheckboxFlags("ImGuiComboFlags_PopupAlignLeft", (unsigned int*)&flags, ImGuiComboFlags_PopupAlignLeft); - ImGui::SameLine(); HelpMarker("Only makes a difference if the popup is larger than the combo"); - if (ImGui::CheckboxFlags("ImGuiComboFlags_NoArrowButton", (unsigned int*)&flags, ImGuiComboFlags_NoArrowButton)) - flags &= ~ImGuiComboFlags_NoPreview; // Clear the other flag, as we cannot combine both - if (ImGui::CheckboxFlags("ImGuiComboFlags_NoPreview", (unsigned int*)&flags, ImGuiComboFlags_NoPreview)) - flags &= ~ImGuiComboFlags_NoArrowButton; // Clear the other flag, as we cannot combine both - - // General BeginCombo() API, you have full control over your selection data and display type. - // (your selection data could be an index, a pointer to the object, an id for the object, a flag stored in the object itself, etc.) - const char* items[] = { "AAAA", "BBBB", "CCCC", "DDDD", "EEEE", "FFFF", "GGGG", "HHHH", "IIII", "JJJJ", "KKKK", "LLLLLLL", "MMMM", "OOOOOOO" }; - static const char* item_current = items[0]; // Here our selection is a single pointer stored outside the object. - if (ImGui::BeginCombo("combo 1", item_current, flags)) // The second parameter is the label previewed before opening the combo. - { - for (int n = 0; n < IM_ARRAYSIZE(items); n++) - { - bool is_selected = (item_current == items[n]); - if (ImGui::Selectable(items[n], is_selected)) - item_current = items[n]; - if (is_selected) - ImGui::SetItemDefaultFocus(); // Set the initial focus when opening the combo (scrolling + for keyboard navigation support in the upcoming navigation branch) - } - ImGui::EndCombo(); - } - - // Simplified one-liner Combo() API, using values packed in a single constant string - static int item_current_2 = 0; - ImGui::Combo("combo 2 (one-liner)", &item_current_2, "aaaa\0bbbb\0cccc\0dddd\0eeee\0\0"); - - // Simplified one-liner Combo() using an array of const char* - static int item_current_3 = -1; // If the selection isn't within 0..count, Combo won't display a preview - ImGui::Combo("combo 3 (array)", &item_current_3, items, IM_ARRAYSIZE(items)); - - // Simplified one-liner Combo() using an accessor function - struct FuncHolder { static bool ItemGetter(void* data, int idx, const char** out_str) { *out_str = ((const char**)data)[idx]; return true; } }; - static int item_current_4 = 0; - ImGui::Combo("combo 4 (function)", &item_current_4, &FuncHolder::ItemGetter, items, IM_ARRAYSIZE(items)); - - ImGui::TreePop(); - } - - if (ImGui::TreeNode("Selectables")) - { - // Selectable() has 2 overloads: - // - The one taking "bool selected" as a read-only selection information. When Selectable() has been clicked is returns true and you can alter selection state accordingly. - // - The one taking "bool* p_selected" as a read-write selection information (convenient in some cases) - // The earlier is more flexible, as in real application your selection may be stored in a different manner (in flags within objects, as an external list, etc). - if (ImGui::TreeNode("Basic")) - { - static bool selection[5] = { false, true, false, false, false }; - ImGui::Selectable("1. I am selectable", &selection[0]); - ImGui::Selectable("2. I am selectable", &selection[1]); - ImGui::Text("3. I am not selectable"); - ImGui::Selectable("4. I am selectable", &selection[3]); - if (ImGui::Selectable("5. I am double clickable", selection[4], ImGuiSelectableFlags_AllowDoubleClick)) - if (ImGui::IsMouseDoubleClicked(0)) - selection[4] = !selection[4]; - ImGui::TreePop(); - } - if (ImGui::TreeNode("Selection State: Single Selection")) - { - static int selected = -1; - for (int n = 0; n < 5; n++) - { - char buf[32]; - sprintf(buf, "Object %d", n); - if (ImGui::Selectable(buf, selected == n)) - selected = n; - } - ImGui::TreePop(); - } - if (ImGui::TreeNode("Selection State: Multiple Selection")) - { - HelpMarker("Hold CTRL and click to select multiple items."); - static bool selection[5] = { false, false, false, false, false }; - for (int n = 0; n < 5; n++) - { - char buf[32]; - sprintf(buf, "Object %d", n); - if (ImGui::Selectable(buf, selection[n])) - { - if (!ImGui::GetIO().KeyCtrl) // Clear selection when CTRL is not held - memset(selection, 0, sizeof(selection)); - selection[n] ^= 1; - } - } - ImGui::TreePop(); - } - if (ImGui::TreeNode("Rendering more text into the same line")) - { - // Using the Selectable() override that takes "bool* p_selected" parameter and toggle your booleans automatically. - static bool selected[3] = { false, false, false }; - ImGui::Selectable("main.c", &selected[0]); ImGui::SameLine(300); ImGui::Text(" 2,345 bytes"); - ImGui::Selectable("Hello.cpp", &selected[1]); ImGui::SameLine(300); ImGui::Text("12,345 bytes"); - ImGui::Selectable("Hello.h", &selected[2]); ImGui::SameLine(300); ImGui::Text(" 2,345 bytes"); - ImGui::TreePop(); - } - if (ImGui::TreeNode("In columns")) - { - ImGui::Columns(3, NULL, false); - static bool selected[16] = { 0 }; - for (int i = 0; i < 16; i++) - { - char label[32]; sprintf(label, "Item %d", i); - if (ImGui::Selectable(label, &selected[i])) {} - ImGui::NextColumn(); - } - ImGui::Columns(1); - ImGui::TreePop(); - } - if (ImGui::TreeNode("Grid")) - { - static bool selected[4*4] = { true, false, false, false, false, true, false, false, false, false, true, false, false, false, false, true }; - for (int i = 0; i < 4*4; i++) - { - ImGui::PushID(i); - if (ImGui::Selectable("Sailor", &selected[i], 0, ImVec2(50,50))) - { - // Note: We _unnecessarily_ test for both x/y and i here only to silence some static analyzer. The second part of each test is unnecessary. - int x = i % 4; - int y = i / 4; - if (x > 0) { selected[i - 1] ^= 1; } - if (x < 3 && i < 15) { selected[i + 1] ^= 1; } - if (y > 0 && i > 3) { selected[i - 4] ^= 1; } - if (y < 3 && i < 12) { selected[i + 4] ^= 1; } - } - if ((i % 4) < 3) ImGui::SameLine(); - ImGui::PopID(); - } - ImGui::TreePop(); - } - if (ImGui::TreeNode("Alignment")) - { - HelpMarker("Alignment applies when a selectable is larger than its text content.\nBy default, Selectables uses style.SelectableTextAlign but it can be overriden on a per-item basis using PushStyleVar()."); - static bool selected[3*3] = { true, false, true, false, true, false, true, false, true }; - for (int y = 0; y < 3; y++) - { - for (int x = 0; x < 3; x++) - { - ImVec2 alignment = ImVec2((float)x / 2.0f, (float)y / 2.0f); - char name[32]; - sprintf(name, "(%.1f,%.1f)", alignment.x, alignment.y); - if (x > 0) ImGui::SameLine(); - ImGui::PushStyleVar(ImGuiStyleVar_SelectableTextAlign, alignment); - ImGui::Selectable(name, &selected[3*y+x], ImGuiSelectableFlags_None, ImVec2(80,80)); - ImGui::PopStyleVar(); - } - } - ImGui::TreePop(); - } - ImGui::TreePop(); - } - - if (ImGui::TreeNode("Text Input")) - { - if (ImGui::TreeNode("Multi-line Text Input")) - { - // Note: we are using a fixed-sized buffer for simplicity here. See ImGuiInputTextFlags_CallbackResize - // and the code in misc/cpp/imgui_stdlib.h for how to setup InputText() for dynamically resizing strings. - static char text[1024 * 16] = - "/*\n" - " The Pentium F00F bug, shorthand for F0 0F C7 C8,\n" - " the hexadecimal encoding of one offending instruction,\n" - " more formally, the invalid operand with locked CMPXCHG8B\n" - " instruction bug, is a design flaw in the majority of\n" - " Intel Pentium, Pentium MMX, and Pentium OverDrive\n" - " processors (all in the P5 microarchitecture).\n" - "*/\n\n" - "label:\n" - "\tlock cmpxchg8b eax\n"; - - static ImGuiInputTextFlags flags = ImGuiInputTextFlags_AllowTabInput; - HelpMarker("You can use the ImGuiInputTextFlags_CallbackResize facility if you need to wire InputTextMultiline() to a dynamic string type. See misc/cpp/imgui_stdlib.h for an example. (This is not demonstrated in imgui_demo.cpp)"); - ImGui::CheckboxFlags("ImGuiInputTextFlags_ReadOnly", (unsigned int*)&flags, ImGuiInputTextFlags_ReadOnly); - ImGui::CheckboxFlags("ImGuiInputTextFlags_AllowTabInput", (unsigned int*)&flags, ImGuiInputTextFlags_AllowTabInput); - ImGui::CheckboxFlags("ImGuiInputTextFlags_CtrlEnterForNewLine", (unsigned int*)&flags, ImGuiInputTextFlags_CtrlEnterForNewLine); - ImGui::InputTextMultiline("##source", text, IM_ARRAYSIZE(text), ImVec2(-1.0f, ImGui::GetTextLineHeight() * 16), flags); - ImGui::TreePop(); - } - - if (ImGui::TreeNode("Filtered Text Input")) - { - static char buf1[64] = ""; ImGui::InputText("default", buf1, 64); - static char buf2[64] = ""; ImGui::InputText("decimal", buf2, 64, ImGuiInputTextFlags_CharsDecimal); - static char buf3[64] = ""; ImGui::InputText("hexadecimal", buf3, 64, ImGuiInputTextFlags_CharsHexadecimal | ImGuiInputTextFlags_CharsUppercase); - static char buf4[64] = ""; ImGui::InputText("uppercase", buf4, 64, ImGuiInputTextFlags_CharsUppercase); - static char buf5[64] = ""; ImGui::InputText("no blank", buf5, 64, ImGuiInputTextFlags_CharsNoBlank); - struct TextFilters { static int FilterImGuiLetters(ImGuiInputTextCallbackData* data) { if (data->EventChar < 256 && strchr("imgui", (char)data->EventChar)) return 0; return 1; } }; - static char buf6[64] = ""; ImGui::InputText("\"imgui\" letters", buf6, 64, ImGuiInputTextFlags_CallbackCharFilter, TextFilters::FilterImGuiLetters); - - ImGui::Text("Password input"); - static char bufpass[64] = "password123"; - ImGui::InputText("password", bufpass, 64, ImGuiInputTextFlags_Password | ImGuiInputTextFlags_CharsNoBlank); - ImGui::SameLine(); HelpMarker("Display all characters as '*'.\nDisable clipboard cut and copy.\nDisable logging.\n"); - ImGui::InputTextWithHint("password (w/ hint)", "", bufpass, 64, ImGuiInputTextFlags_Password | ImGuiInputTextFlags_CharsNoBlank); - ImGui::InputText("password (clear)", bufpass, 64, ImGuiInputTextFlags_CharsNoBlank); - ImGui::TreePop(); - } - - if (ImGui::TreeNode("Resize Callback")) - { - // If you have a custom string type you would typically create a ImGui::InputText() wrapper than takes your type as input. - // See misc/cpp/imgui_stdlib.h and .cpp for an implementation of this using std::string. - HelpMarker("Demonstrate using ImGuiInputTextFlags_CallbackResize to wire your resizable string type to InputText().\n\nSee misc/cpp/imgui_stdlib.h for an implementation of this for std::string."); - struct Funcs - { - static int MyResizeCallback(ImGuiInputTextCallbackData* data) - { - if (data->EventFlag == ImGuiInputTextFlags_CallbackResize) - { - ImVector* my_str = (ImVector*)data->UserData; - IM_ASSERT(my_str->begin() == data->Buf); - my_str->resize(data->BufSize); // NB: On resizing calls, generally data->BufSize == data->BufTextLen + 1 - data->Buf = my_str->begin(); - } - return 0; - } - - // Tip: Because ImGui:: is a namespace you would typicall add your own function into the namespace in your own source files. - // For example, you may add a function called ImGui::InputText(const char* label, MyString* my_str). - static bool MyInputTextMultiline(const char* label, ImVector* my_str, const ImVec2& size = ImVec2(0, 0), ImGuiInputTextFlags flags = 0) - { - IM_ASSERT((flags & ImGuiInputTextFlags_CallbackResize) == 0); - return ImGui::InputTextMultiline(label, my_str->begin(), (size_t)my_str->size(), size, flags | ImGuiInputTextFlags_CallbackResize, Funcs::MyResizeCallback, (void*)my_str); - } - }; - - // For this demo we are using ImVector as a string container. - // Note that because we need to store a terminating zero character, our size/capacity are 1 more than usually reported by a typical string class. - static ImVector my_str; - if (my_str.empty()) - my_str.push_back(0); - Funcs::MyInputTextMultiline("##MyStr", &my_str, ImVec2(-1.0f, ImGui::GetTextLineHeight() * 16)); - ImGui::Text("Data: %p\nSize: %d\nCapacity: %d", (void*)my_str.begin(), my_str.size(), my_str.capacity()); - ImGui::TreePop(); - } - - ImGui::TreePop(); - } - - if (ImGui::TreeNode("Plots Widgets")) - { - static bool animate = true; - ImGui::Checkbox("Animate", &animate); - - static float arr[] = { 0.6f, 0.1f, 1.0f, 0.5f, 0.92f, 0.1f, 0.2f }; - ImGui::PlotLines("Frame Times", arr, IM_ARRAYSIZE(arr)); - - // Create a dummy array of contiguous float values to plot - // Tip: If your float aren't contiguous but part of a structure, you can pass a pointer to your first float and the sizeof() of your structure in the Stride parameter. - static float values[90] = { 0 }; - static int values_offset = 0; - static double refresh_time = 0.0; - if (!animate || refresh_time == 0.0) - refresh_time = ImGui::GetTime(); - while (refresh_time < ImGui::GetTime()) // Create dummy data at fixed 60 hz rate for the demo - { - static float phase = 0.0f; - values[values_offset] = cosf(phase); - values_offset = (values_offset+1) % IM_ARRAYSIZE(values); - phase += 0.10f*values_offset; - refresh_time += 1.0f/60.0f; - } - ImGui::PlotLines("Lines", values, IM_ARRAYSIZE(values), values_offset, "avg 0.0", -1.0f, 1.0f, ImVec2(0,80)); - ImGui::PlotHistogram("Histogram", arr, IM_ARRAYSIZE(arr), 0, NULL, 0.0f, 1.0f, ImVec2(0,80)); - - // Use functions to generate output - // FIXME: This is rather awkward because current plot API only pass in indices. We probably want an API passing floats and user provide sample rate/count. - struct Funcs - { - static float Sin(void*, int i) { return sinf(i * 0.1f); } - static float Saw(void*, int i) { return (i & 1) ? 1.0f : -1.0f; } - }; - static int func_type = 0, display_count = 70; - ImGui::Separator(); - ImGui::SetNextItemWidth(100); - ImGui::Combo("func", &func_type, "Sin\0Saw\0"); - ImGui::SameLine(); - ImGui::SliderInt("Sample count", &display_count, 1, 400); - float (*func)(void*, int) = (func_type == 0) ? Funcs::Sin : Funcs::Saw; - ImGui::PlotLines("Lines", func, NULL, display_count, 0, NULL, -1.0f, 1.0f, ImVec2(0,80)); - ImGui::PlotHistogram("Histogram", func, NULL, display_count, 0, NULL, -1.0f, 1.0f, ImVec2(0,80)); - ImGui::Separator(); - - // Animate a simple progress bar - static float progress = 0.0f, progress_dir = 1.0f; - if (animate) - { - progress += progress_dir * 0.4f * ImGui::GetIO().DeltaTime; - if (progress >= +1.1f) { progress = +1.1f; progress_dir *= -1.0f; } - if (progress <= -0.1f) { progress = -0.1f; progress_dir *= -1.0f; } - } - - // Typically we would use ImVec2(-1.0f,0.0f) to use all available width, or ImVec2(width,0.0f) for a specified width. ImVec2(0.0f,0.0f) uses ItemWidth. - ImGui::ProgressBar(progress, ImVec2(0.0f,0.0f)); - ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x); - ImGui::Text("Progress Bar"); - - float progress_saturated = (progress < 0.0f) ? 0.0f : (progress > 1.0f) ? 1.0f : progress; - char buf[32]; - sprintf(buf, "%d/%d", (int)(progress_saturated*1753), 1753); - ImGui::ProgressBar(progress, ImVec2(0.f,0.f), buf); - ImGui::TreePop(); - } +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowWidgetsColorAndPickers() +//----------------------------------------------------------------------------- +static void DemoWindowWidgetsColorAndPickers() +{ + IMGUI_DEMO_MARKER("Widgets/Color"); if (ImGui::TreeNode("Color/Picker Widgets")) { - static ImVec4 color = ImVec4(114.0f/255.0f, 144.0f/255.0f, 154.0f/255.0f, 200.0f/255.0f); + static ImVec4 color = ImVec4(114.0f / 255.0f, 144.0f / 255.0f, 154.0f / 255.0f, 200.0f / 255.0f); + static ImGuiColorEditFlags base_flags = ImGuiColorEditFlags_None; - static bool alpha_preview = true; - static bool alpha_half_preview = false; - static bool drag_and_drop = true; - static bool options_menu = true; - static bool hdr = false; - ImGui::Checkbox("With Alpha Preview", &alpha_preview); - ImGui::Checkbox("With Half Alpha Preview", &alpha_half_preview); - ImGui::Checkbox("With Drag and Drop", &drag_and_drop); - ImGui::Checkbox("With Options Menu", &options_menu); ImGui::SameLine(); HelpMarker("Right-click on the individual color widget to show options."); - ImGui::Checkbox("With HDR", &hdr); ImGui::SameLine(); HelpMarker("Currently all this does is to lift the 0..1 limits on dragging widgets."); - int misc_flags = (hdr ? ImGuiColorEditFlags_HDR : 0) | (drag_and_drop ? 0 : ImGuiColorEditFlags_NoDragDrop) | (alpha_half_preview ? ImGuiColorEditFlags_AlphaPreviewHalf : (alpha_preview ? ImGuiColorEditFlags_AlphaPreview : 0)) | (options_menu ? 0 : ImGuiColorEditFlags_NoOptions); + ImGui::SeparatorText("Options"); + ImGui::CheckboxFlags("ImGuiColorEditFlags_NoAlpha", &base_flags, ImGuiColorEditFlags_NoAlpha); + ImGui::CheckboxFlags("ImGuiColorEditFlags_AlphaOpaque", &base_flags, ImGuiColorEditFlags_AlphaOpaque); + ImGui::CheckboxFlags("ImGuiColorEditFlags_AlphaNoBg", &base_flags, ImGuiColorEditFlags_AlphaNoBg); + ImGui::CheckboxFlags("ImGuiColorEditFlags_AlphaPreviewHalf", &base_flags, ImGuiColorEditFlags_AlphaPreviewHalf); + ImGui::CheckboxFlags("ImGuiColorEditFlags_NoDragDrop", &base_flags, ImGuiColorEditFlags_NoDragDrop); + ImGui::CheckboxFlags("ImGuiColorEditFlags_NoOptions", &base_flags, ImGuiColorEditFlags_NoOptions); ImGui::SameLine(); HelpMarker("Right-click on the individual color widget to show options."); + ImGui::CheckboxFlags("ImGuiColorEditFlags_HDR", &base_flags, ImGuiColorEditFlags_HDR); ImGui::SameLine(); HelpMarker("Currently all this does is to lift the 0..1 limits on dragging widgets."); + IMGUI_DEMO_MARKER("Widgets/Color/ColorEdit"); + ImGui::SeparatorText("Inline color editor"); ImGui::Text("Color widget:"); - ImGui::SameLine(); HelpMarker("Click on the colored square to open a color picker.\nCTRL+click on individual component to input value.\n"); - ImGui::ColorEdit3("MyColor##1", (float*)&color, misc_flags); + ImGui::SameLine(); HelpMarker( + "Click on the color square to open a color picker.\n" + "CTRL+click on individual component to input value.\n"); + ImGui::ColorEdit3("MyColor##1", (float*)&color, base_flags); + IMGUI_DEMO_MARKER("Widgets/Color/ColorEdit (HSV, with Alpha)"); ImGui::Text("Color widget HSV with Alpha:"); - ImGui::ColorEdit4("MyColor##2", (float*)&color, ImGuiColorEditFlags_DisplayHSV | misc_flags); + ImGui::ColorEdit4("MyColor##2", (float*)&color, ImGuiColorEditFlags_DisplayHSV | base_flags); + IMGUI_DEMO_MARKER("Widgets/Color/ColorEdit (float display)"); ImGui::Text("Color widget with Float Display:"); - ImGui::ColorEdit4("MyColor##2f", (float*)&color, ImGuiColorEditFlags_Float | misc_flags); + ImGui::ColorEdit4("MyColor##2f", (float*)&color, ImGuiColorEditFlags_Float | base_flags); + IMGUI_DEMO_MARKER("Widgets/Color/ColorButton (with Picker)"); ImGui::Text("Color button with Picker:"); - ImGui::SameLine(); HelpMarker("With the ImGuiColorEditFlags_NoInputs flag you can hide all the slider/text inputs.\nWith the ImGuiColorEditFlags_NoLabel flag you can pass a non-empty label which will only be used for the tooltip and picker popup."); - ImGui::ColorEdit4("MyColor##3", (float*)&color, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | misc_flags); + ImGui::SameLine(); HelpMarker( + "With the ImGuiColorEditFlags_NoInputs flag you can hide all the slider/text inputs.\n" + "With the ImGuiColorEditFlags_NoLabel flag you can pass a non-empty label which will only " + "be used for the tooltip and picker popup."); + ImGui::ColorEdit4("MyColor##3", (float*)&color, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | base_flags); + IMGUI_DEMO_MARKER("Widgets/Color/ColorButton (with custom Picker popup)"); ImGui::Text("Color button with Custom Picker Popup:"); - // Generate a dummy default palette. The palette will persist and can be edited. + // Generate a default palette. The palette will persist and can be edited. static bool saved_palette_init = true; - static ImVec4 saved_palette[32] = { }; + static ImVec4 saved_palette[32] = {}; if (saved_palette_init) { for (int n = 0; n < IM_ARRAYSIZE(saved_palette); n++) { - ImGui::ColorConvertHSVtoRGB(n / 31.0f, 0.8f, 0.8f, saved_palette[n].x, saved_palette[n].y, saved_palette[n].z); + ImGui::ColorConvertHSVtoRGB(n / 31.0f, 0.8f, 0.8f, + saved_palette[n].x, saved_palette[n].y, saved_palette[n].z); saved_palette[n].w = 1.0f; // Alpha } saved_palette_init = false; } static ImVec4 backup_color; - bool open_popup = ImGui::ColorButton("MyColor##3b", color, misc_flags); - ImGui::SameLine(); + bool open_popup = ImGui::ColorButton("MyColor##3b", color, base_flags); + ImGui::SameLine(0, ImGui::GetStyle().ItemInnerSpacing.x); open_popup |= ImGui::Button("Palette"); if (open_popup) { @@ -1156,14 +1198,14 @@ static void ShowDemoWindowWidgets() { ImGui::Text("MY CUSTOM COLOR PICKER WITH AN AMAZING PALETTE!"); ImGui::Separator(); - ImGui::ColorPicker4("##picker", (float*)&color, misc_flags | ImGuiColorEditFlags_NoSidePreview | ImGuiColorEditFlags_NoSmallPreview); + ImGui::ColorPicker4("##picker", (float*)&color, base_flags | ImGuiColorEditFlags_NoSidePreview | ImGuiColorEditFlags_NoSmallPreview); ImGui::SameLine(); ImGui::BeginGroup(); // Lock X position ImGui::Text("Current"); - ImGui::ColorButton("##current", color, ImGuiColorEditFlags_NoPicker | ImGuiColorEditFlags_AlphaPreviewHalf, ImVec2(60,40)); + ImGui::ColorButton("##current", color, ImGuiColorEditFlags_NoPicker | ImGuiColorEditFlags_AlphaPreviewHalf, ImVec2(60, 40)); ImGui::Text("Previous"); - if (ImGui::ColorButton("##previous", backup_color, ImGuiColorEditFlags_NoPicker | ImGuiColorEditFlags_AlphaPreviewHalf, ImVec2(60,40))) + if (ImGui::ColorButton("##previous", backup_color, ImGuiColorEditFlags_NoPicker | ImGuiColorEditFlags_AlphaPreviewHalf, ImVec2(60, 40))) color = backup_color; ImGui::Separator(); ImGui::Text("Palette"); @@ -1172,11 +1214,13 @@ static void ShowDemoWindowWidgets() ImGui::PushID(n); if ((n % 8) != 0) ImGui::SameLine(0.0f, ImGui::GetStyle().ItemSpacing.y); - if (ImGui::ColorButton("##palette", saved_palette[n], ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_NoPicker | ImGuiColorEditFlags_NoTooltip, ImVec2(20,20))) + + ImGuiColorEditFlags palette_button_flags = ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_NoPicker | ImGuiColorEditFlags_NoTooltip; + if (ImGui::ColorButton("##palette", saved_palette[n], palette_button_flags, ImVec2(20, 20))) color = ImVec4(saved_palette[n].x, saved_palette[n].y, saved_palette[n].z, color.w); // Preserve alpha! - // Allow user to drop colors into each palette entry - // (Note that ColorButton is already a drag source by default, unless using ImGuiColorEditFlags_NoDragDrop) + // Allow user to drop colors into each palette entry. Note that ColorButton() is already a + // drag source by default, unless specifying the ImGuiColorEditFlags_NoDragDrop flag. if (ImGui::BeginDragDropTarget()) { if (const ImGuiPayload* payload = ImGui::AcceptDragDropPayload(IMGUI_PAYLOAD_TYPE_COLOR_3F)) @@ -1192,38 +1236,46 @@ static void ShowDemoWindowWidgets() ImGui::EndPopup(); } + IMGUI_DEMO_MARKER("Widgets/Color/ColorButton (simple)"); ImGui::Text("Color button only:"); - ImGui::ColorButton("MyColor##3c", *(ImVec4*)&color, misc_flags, ImVec2(80,80)); + static bool no_border = false; + ImGui::Checkbox("ImGuiColorEditFlags_NoBorder", &no_border); + ImGui::ColorButton("MyColor##3c", *(ImVec4*)&color, base_flags | (no_border ? ImGuiColorEditFlags_NoBorder : 0), ImVec2(80, 80)); + + IMGUI_DEMO_MARKER("Widgets/Color/ColorPicker"); + ImGui::SeparatorText("Color picker"); - ImGui::Text("Color picker:"); - static bool alpha = true; - static bool alpha_bar = true; - static bool side_preview = true; static bool ref_color = false; - static ImVec4 ref_color_v(1.0f,0.0f,1.0f,0.5f); - static int display_mode = 0; + static ImVec4 ref_color_v(1.0f, 0.0f, 1.0f, 0.5f); static int picker_mode = 0; - ImGui::Checkbox("With Alpha", &alpha); - ImGui::Checkbox("With Alpha Bar", &alpha_bar); - ImGui::Checkbox("With Side Preview", &side_preview); - if (side_preview) + static int display_mode = 0; + static ImGuiColorEditFlags color_picker_flags = ImGuiColorEditFlags_AlphaBar; + + ImGui::PushID("Color picker"); + ImGui::CheckboxFlags("ImGuiColorEditFlags_NoAlpha", &color_picker_flags, ImGuiColorEditFlags_NoAlpha); + ImGui::CheckboxFlags("ImGuiColorEditFlags_AlphaBar", &color_picker_flags, ImGuiColorEditFlags_AlphaBar); + ImGui::CheckboxFlags("ImGuiColorEditFlags_NoSidePreview", &color_picker_flags, ImGuiColorEditFlags_NoSidePreview); + if (color_picker_flags & ImGuiColorEditFlags_NoSidePreview) { ImGui::SameLine(); ImGui::Checkbox("With Ref Color", &ref_color); if (ref_color) { ImGui::SameLine(); - ImGui::ColorEdit4("##RefColor", &ref_color_v.x, ImGuiColorEditFlags_NoInputs | misc_flags); + ImGui::ColorEdit4("##RefColor", &ref_color_v.x, ImGuiColorEditFlags_NoInputs | base_flags); } } - ImGui::Combo("Display Mode", &display_mode, "Auto/Current\0None\0RGB Only\0HSV Only\0Hex Only\0"); - ImGui::SameLine(); HelpMarker("ColorEdit defaults to displaying RGB inputs if you don't specify a display mode, but the user can change it with a right-click.\n\nColorPicker defaults to displaying RGB+HSV+Hex if you don't specify a display mode.\n\nYou can change the defaults using SetColorEditOptions()."); - ImGui::Combo("Picker Mode", &picker_mode, "Auto/Current\0Hue bar + SV rect\0Hue wheel + SV triangle\0"); - ImGui::SameLine(); HelpMarker("User can right-click the picker to change mode."); - ImGuiColorEditFlags flags = misc_flags; - if (!alpha) flags |= ImGuiColorEditFlags_NoAlpha; // This is by default if you call ColorPicker3() instead of ColorPicker4() - if (alpha_bar) flags |= ImGuiColorEditFlags_AlphaBar; - if (!side_preview) flags |= ImGuiColorEditFlags_NoSidePreview; + + ImGui::Combo("Picker Mode", &picker_mode, "Auto/Current\0ImGuiColorEditFlags_PickerHueBar\0ImGuiColorEditFlags_PickerHueWheel\0"); + ImGui::SameLine(); HelpMarker("When not specified explicitly, user can right-click the picker to change mode."); + + ImGui::Combo("Display Mode", &display_mode, "Auto/Current\0ImGuiColorEditFlags_NoInputs\0ImGuiColorEditFlags_DisplayRGB\0ImGuiColorEditFlags_DisplayHSV\0ImGuiColorEditFlags_DisplayHex\0"); + ImGui::SameLine(); HelpMarker( + "ColorEdit defaults to displaying RGB inputs if you don't specify a display mode, " + "but the user can change it with a right-click on those inputs.\n\nColorPicker defaults to displaying RGB+HSV+Hex " + "if you don't specify a display mode.\n\nYou can change the defaults using SetColorEditOptions()."); + + ImGuiColorEditFlags flags = base_flags | color_picker_flags; if (picker_mode == 1) flags |= ImGuiColorEditFlags_PickerHueBar; if (picker_mode == 2) flags |= ImGuiColorEditFlags_PickerHueWheel; if (display_mode == 1) flags |= ImGuiColorEditFlags_NoInputs; // Disable all RGB/HSV/Hex displays @@ -1232,51 +1284,168 @@ static void ShowDemoWindowWidgets() if (display_mode == 4) flags |= ImGuiColorEditFlags_DisplayHex; ImGui::ColorPicker4("MyColor##4", (float*)&color, flags, ref_color ? &ref_color_v.x : NULL); - ImGui::Text("Programmatically set defaults:"); - ImGui::SameLine(); HelpMarker("SetColorEditOptions() is designed to allow you to set boot-time default.\nWe don't have Push/Pop functions because you can force options on a per-widget basis if needed, and the user can change non-forced ones with the options menu.\nWe don't have a getter to avoid encouraging you to persistently save values that aren't forward-compatible."); + ImGui::Text("Set defaults in code:"); + ImGui::SameLine(); HelpMarker( + "SetColorEditOptions() is designed to allow you to set boot-time default.\n" + "We don't have Push/Pop functions because you can force options on a per-widget basis if needed, " + "and the user can change non-forced ones with the options menu.\nWe don't have a getter to avoid " + "encouraging you to persistently save values that aren't forward-compatible."); if (ImGui::Button("Default: Uint8 + HSV + Hue Bar")) ImGui::SetColorEditOptions(ImGuiColorEditFlags_Uint8 | ImGuiColorEditFlags_DisplayHSV | ImGuiColorEditFlags_PickerHueBar); if (ImGui::Button("Default: Float + HDR + Hue Wheel")) ImGui::SetColorEditOptions(ImGuiColorEditFlags_Float | ImGuiColorEditFlags_HDR | ImGuiColorEditFlags_PickerHueWheel); + // Always display a small version of both types of pickers + // (that's in order to make it more visible in the demo to people who are skimming quickly through it) + ImGui::Text("Both types:"); + float w = (ImGui::GetContentRegionAvail().x - ImGui::GetStyle().ItemSpacing.y) * 0.40f; + ImGui::SetNextItemWidth(w); + ImGui::ColorPicker3("##MyColor##5", (float*)&color, ImGuiColorEditFlags_PickerHueBar | ImGuiColorEditFlags_NoSidePreview | ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoAlpha); + ImGui::SameLine(); + ImGui::SetNextItemWidth(w); + ImGui::ColorPicker3("##MyColor##6", (float*)&color, ImGuiColorEditFlags_PickerHueWheel | ImGuiColorEditFlags_NoSidePreview | ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoAlpha); + ImGui::PopID(); + // HSV encoded support (to avoid RGB<>HSV round trips and singularities when S==0 or V==0) - static ImVec4 color_stored_as_hsv(0.23f, 1.0f, 1.0f, 1.0f); + static ImVec4 color_hsv(0.23f, 1.0f, 1.0f, 1.0f); // Stored as HSV! ImGui::Spacing(); ImGui::Text("HSV encoded colors"); - ImGui::SameLine(); HelpMarker("By default, colors are given to ColorEdit and ColorPicker in RGB, but ImGuiColorEditFlags_InputHSV allows you to store colors as HSV and pass them to ColorEdit and ColorPicker as HSV. This comes with the added benefit that you can manipulate hue values with the picker even when saturation or value are zero."); + ImGui::SameLine(); HelpMarker( + "By default, colors are given to ColorEdit and ColorPicker in RGB, but ImGuiColorEditFlags_InputHSV " + "allows you to store colors as HSV and pass them to ColorEdit and ColorPicker as HSV. This comes with the " + "added benefit that you can manipulate hue values with the picker even when saturation or value are zero."); ImGui::Text("Color widget with InputHSV:"); - ImGui::ColorEdit4("HSV shown as RGB##1", (float*)&color_stored_as_hsv, ImGuiColorEditFlags_DisplayRGB | ImGuiColorEditFlags_InputHSV | ImGuiColorEditFlags_Float); - ImGui::ColorEdit4("HSV shown as HSV##1", (float*)&color_stored_as_hsv, ImGuiColorEditFlags_DisplayHSV | ImGuiColorEditFlags_InputHSV | ImGuiColorEditFlags_Float); - ImGui::DragFloat4("Raw HSV values", (float*)&color_stored_as_hsv, 0.01f, 0.0f, 1.0f); + ImGui::ColorEdit4("HSV shown as RGB##1", (float*)&color_hsv, ImGuiColorEditFlags_DisplayRGB | ImGuiColorEditFlags_InputHSV | ImGuiColorEditFlags_Float); + ImGui::ColorEdit4("HSV shown as HSV##1", (float*)&color_hsv, ImGuiColorEditFlags_DisplayHSV | ImGuiColorEditFlags_InputHSV | ImGuiColorEditFlags_Float); + ImGui::DragFloat4("Raw HSV values", (float*)&color_hsv, 0.01f, 0.0f, 1.0f); ImGui::TreePop(); } +} - if (ImGui::TreeNode("Range Widgets")) +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowWidgetsComboBoxes() +//----------------------------------------------------------------------------- + +static void DemoWindowWidgetsComboBoxes() +{ + IMGUI_DEMO_MARKER("Widgets/Combo"); + if (ImGui::TreeNode("Combo")) { - static float begin = 10, end = 90; - static int begin_i = 100, end_i = 1000; - ImGui::DragFloatRange2("range", &begin, &end, 0.25f, 0.0f, 100.0f, "Min: %.1f %%", "Max: %.1f %%"); - ImGui::DragIntRange2("range int (no bounds)", &begin_i, &end_i, 5, 0, 0, "Min: %d units", "Max: %d units"); + // Combo Boxes are also called "Dropdown" in other systems + // Expose flags as checkbox for the demo + static ImGuiComboFlags flags = 0; + ImGui::CheckboxFlags("ImGuiComboFlags_PopupAlignLeft", &flags, ImGuiComboFlags_PopupAlignLeft); + ImGui::SameLine(); HelpMarker("Only makes a difference if the popup is larger than the combo"); + if (ImGui::CheckboxFlags("ImGuiComboFlags_NoArrowButton", &flags, ImGuiComboFlags_NoArrowButton)) + flags &= ~ImGuiComboFlags_NoPreview; // Clear incompatible flags + if (ImGui::CheckboxFlags("ImGuiComboFlags_NoPreview", &flags, ImGuiComboFlags_NoPreview)) + flags &= ~(ImGuiComboFlags_NoArrowButton | ImGuiComboFlags_WidthFitPreview); // Clear incompatible flags + if (ImGui::CheckboxFlags("ImGuiComboFlags_WidthFitPreview", &flags, ImGuiComboFlags_WidthFitPreview)) + flags &= ~ImGuiComboFlags_NoPreview; + + // Override default popup height + if (ImGui::CheckboxFlags("ImGuiComboFlags_HeightSmall", &flags, ImGuiComboFlags_HeightSmall)) + flags &= ~(ImGuiComboFlags_HeightMask_ & ~ImGuiComboFlags_HeightSmall); + if (ImGui::CheckboxFlags("ImGuiComboFlags_HeightRegular", &flags, ImGuiComboFlags_HeightRegular)) + flags &= ~(ImGuiComboFlags_HeightMask_ & ~ImGuiComboFlags_HeightRegular); + if (ImGui::CheckboxFlags("ImGuiComboFlags_HeightLargest", &flags, ImGuiComboFlags_HeightLargest)) + flags &= ~(ImGuiComboFlags_HeightMask_ & ~ImGuiComboFlags_HeightLargest); + + // Using the generic BeginCombo() API, you have full control over how to display the combo contents. + // (your selection data could be an index, a pointer to the object, an id for the object, a flag intrusively + // stored in the object itself, etc.) + const char* items[] = { "AAAA", "BBBB", "CCCC", "DDDD", "EEEE", "FFFF", "GGGG", "HHHH", "IIII", "JJJJ", "KKKK", "LLLLLLL", "MMMM", "OOOOOOO" }; + static int item_selected_idx = 0; // Here we store our selection data as an index. + + // Pass in the preview value visible before opening the combo (it could technically be different contents or not pulled from items[]) + const char* combo_preview_value = items[item_selected_idx]; + if (ImGui::BeginCombo("combo 1", combo_preview_value, flags)) + { + for (int n = 0; n < IM_ARRAYSIZE(items); n++) + { + const bool is_selected = (item_selected_idx == n); + if (ImGui::Selectable(items[n], is_selected)) + item_selected_idx = n; + + // Set the initial focus when opening the combo (scrolling + keyboard navigation focus) + if (is_selected) + ImGui::SetItemDefaultFocus(); + } + ImGui::EndCombo(); + } + + // Show case embedding a filter using a simple trick: displaying the filter inside combo contents. + // See https://github.com/ocornut/imgui/issues/718 for advanced/esoteric alternatives. + if (ImGui::BeginCombo("combo 2 (w/ filter)", combo_preview_value, flags)) + { + static ImGuiTextFilter filter; + if (ImGui::IsWindowAppearing()) + { + ImGui::SetKeyboardFocusHere(); + filter.Clear(); + } + ImGui::SetNextItemShortcut(ImGuiMod_Ctrl | ImGuiKey_F); + filter.Draw("##Filter", -FLT_MIN); + + for (int n = 0; n < IM_ARRAYSIZE(items); n++) + { + const bool is_selected = (item_selected_idx == n); + if (filter.PassFilter(items[n])) + if (ImGui::Selectable(items[n], is_selected)) + item_selected_idx = n; + } + ImGui::EndCombo(); + } + + ImGui::Spacing(); + ImGui::SeparatorText("One-liner variants"); + HelpMarker("The Combo() function is not greatly useful apart from cases were you want to embed all options in a single strings.\nFlags above don't apply to this section."); + + // Simplified one-liner Combo() API, using values packed in a single constant string + // This is a convenience for when the selection set is small and known at compile-time. + static int item_current_2 = 0; + ImGui::Combo("combo 3 (one-liner)", &item_current_2, "aaaa\0bbbb\0cccc\0dddd\0eeee\0\0"); + + // Simplified one-liner Combo() using an array of const char* + // This is not very useful (may obsolete): prefer using BeginCombo()/EndCombo() for full control. + static int item_current_3 = -1; // If the selection isn't within 0..count, Combo won't display a preview + ImGui::Combo("combo 4 (array)", &item_current_3, items, IM_ARRAYSIZE(items)); + + // Simplified one-liner Combo() using an accessor function + static int item_current_4 = 0; + ImGui::Combo("combo 5 (function)", &item_current_4, [](void* data, int n) { return ((const char**)data)[n]; }, items, IM_ARRAYSIZE(items)); + ImGui::TreePop(); } +} +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowWidgetsDataTypes() +//----------------------------------------------------------------------------- + +static void DemoWindowWidgetsDataTypes() +{ + IMGUI_DEMO_MARKER("Widgets/Data Types"); if (ImGui::TreeNode("Data Types")) { - // The DragScalar/InputScalar/SliderScalar functions allow various data types: signed/unsigned int/long long and float/double - // To avoid polluting the public API with all possible combinations, we use the ImGuiDataType enum to pass the type, - // and passing all arguments by address. - // This is the reason the test code below creates local variables to hold "zero" "one" etc. for each types. - // In practice, if you frequently use a given type that is not covered by the normal API entry points, you can wrap it - // yourself inside a 1 line function which can take typed argument as value instead of void*, and then pass their address - // to the generic function. For example: + // DragScalar/InputScalar/SliderScalar functions allow various data types + // - signed/unsigned + // - 8/16/32/64-bits + // - integer/float/double + // To avoid polluting the public API with all possible combinations, we use the ImGuiDataType enum + // to pass the type, and passing all arguments by pointer. + // This is the reason the test code below creates local variables to hold "zero" "one" etc. for each type. + // In practice, if you frequently use a given type that is not covered by the normal API entry points, + // you can wrap it yourself inside a 1 line function which can take typed argument as value instead of void*, + // and then pass their address to the generic function. For example: // bool MySliderU64(const char *label, u64* value, u64 min = 0, u64 max = 0, const char* format = "%lld") // { // return SliderScalar(label, ImGuiDataType_U64, value, &min, &max, format); // } - // Limits (as helper variables that we can take the address of) - // Note that the SliderScalar function has a maximum usable range of half the natural type maximum, hence the /2 below. + // Setup limits (as helper variables so we can take their address, as explained above) + // Note: SliderScalar() functions have a maximum usable range of half the natural type maximum, hence the /2. #ifndef LLONG_MIN ImS64 LLONG_MIN = -9223372036854775807LL - 1; ImS64 LLONG_MAX = 9223372036854775807LL; @@ -1307,177 +1476,127 @@ static void ShowDemoWindowWidgets() const float drag_speed = 0.2f; static bool drag_clamp = false; - ImGui::Text("Drags:"); - ImGui::Checkbox("Clamp integers to 0..50", &drag_clamp); ImGui::SameLine(); HelpMarker("As with every widgets in dear imgui, we never modify values unless there is a user interaction.\nYou can override the clamping limits by using CTRL+Click to input a value."); + IMGUI_DEMO_MARKER("Widgets/Data Types/Drags"); + ImGui::SeparatorText("Drags"); + ImGui::Checkbox("Clamp integers to 0..50", &drag_clamp); + ImGui::SameLine(); HelpMarker( + "As with every widget in dear imgui, we never modify values unless there is a user interaction.\n" + "You can override the clamping limits by using CTRL+Click to input a value."); ImGui::DragScalar("drag s8", ImGuiDataType_S8, &s8_v, drag_speed, drag_clamp ? &s8_zero : NULL, drag_clamp ? &s8_fifty : NULL); ImGui::DragScalar("drag u8", ImGuiDataType_U8, &u8_v, drag_speed, drag_clamp ? &u8_zero : NULL, drag_clamp ? &u8_fifty : NULL, "%u ms"); ImGui::DragScalar("drag s16", ImGuiDataType_S16, &s16_v, drag_speed, drag_clamp ? &s16_zero : NULL, drag_clamp ? &s16_fifty : NULL); ImGui::DragScalar("drag u16", ImGuiDataType_U16, &u16_v, drag_speed, drag_clamp ? &u16_zero : NULL, drag_clamp ? &u16_fifty : NULL, "%u ms"); ImGui::DragScalar("drag s32", ImGuiDataType_S32, &s32_v, drag_speed, drag_clamp ? &s32_zero : NULL, drag_clamp ? &s32_fifty : NULL); + ImGui::DragScalar("drag s32 hex", ImGuiDataType_S32, &s32_v, drag_speed, drag_clamp ? &s32_zero : NULL, drag_clamp ? &s32_fifty : NULL, "0x%08X"); ImGui::DragScalar("drag u32", ImGuiDataType_U32, &u32_v, drag_speed, drag_clamp ? &u32_zero : NULL, drag_clamp ? &u32_fifty : NULL, "%u ms"); ImGui::DragScalar("drag s64", ImGuiDataType_S64, &s64_v, drag_speed, drag_clamp ? &s64_zero : NULL, drag_clamp ? &s64_fifty : NULL); ImGui::DragScalar("drag u64", ImGuiDataType_U64, &u64_v, drag_speed, drag_clamp ? &u64_zero : NULL, drag_clamp ? &u64_fifty : NULL); - ImGui::DragScalar("drag float", ImGuiDataType_Float, &f32_v, 0.005f, &f32_zero, &f32_one, "%f", 1.0f); - ImGui::DragScalar("drag float ^2", ImGuiDataType_Float, &f32_v, 0.005f, &f32_zero, &f32_one, "%f", 2.0f); ImGui::SameLine(); HelpMarker("You can use the 'power' parameter to increase tweaking precision on one side of the range."); - ImGui::DragScalar("drag double", ImGuiDataType_Double, &f64_v, 0.0005f, &f64_zero, NULL, "%.10f grams", 1.0f); - ImGui::DragScalar("drag double ^2", ImGuiDataType_Double, &f64_v, 0.0005f, &f64_zero, &f64_one, "0 < %.10f < 1", 2.0f); + ImGui::DragScalar("drag float", ImGuiDataType_Float, &f32_v, 0.005f, &f32_zero, &f32_one, "%f"); + ImGui::DragScalar("drag float log", ImGuiDataType_Float, &f32_v, 0.005f, &f32_zero, &f32_one, "%f", ImGuiSliderFlags_Logarithmic); + ImGui::DragScalar("drag double", ImGuiDataType_Double, &f64_v, 0.0005f, &f64_zero, NULL, "%.10f grams"); + ImGui::DragScalar("drag double log",ImGuiDataType_Double, &f64_v, 0.0005f, &f64_zero, &f64_one, "0 < %.10f < 1", ImGuiSliderFlags_Logarithmic); - ImGui::Text("Sliders"); - ImGui::SliderScalar("slider s8 full", ImGuiDataType_S8, &s8_v, &s8_min, &s8_max, "%d"); - ImGui::SliderScalar("slider u8 full", ImGuiDataType_U8, &u8_v, &u8_min, &u8_max, "%u"); - ImGui::SliderScalar("slider s16 full", ImGuiDataType_S16, &s16_v, &s16_min, &s16_max, "%d"); - ImGui::SliderScalar("slider u16 full", ImGuiDataType_U16, &u16_v, &u16_min, &u16_max, "%u"); - ImGui::SliderScalar("slider s32 low", ImGuiDataType_S32, &s32_v, &s32_zero, &s32_fifty,"%d"); - ImGui::SliderScalar("slider s32 high", ImGuiDataType_S32, &s32_v, &s32_hi_a, &s32_hi_b, "%d"); - ImGui::SliderScalar("slider s32 full", ImGuiDataType_S32, &s32_v, &s32_min, &s32_max, "%d"); - ImGui::SliderScalar("slider u32 low", ImGuiDataType_U32, &u32_v, &u32_zero, &u32_fifty,"%u"); - ImGui::SliderScalar("slider u32 high", ImGuiDataType_U32, &u32_v, &u32_hi_a, &u32_hi_b, "%u"); - ImGui::SliderScalar("slider u32 full", ImGuiDataType_U32, &u32_v, &u32_min, &u32_max, "%u"); - ImGui::SliderScalar("slider s64 low", ImGuiDataType_S64, &s64_v, &s64_zero, &s64_fifty,"%I64d"); - ImGui::SliderScalar("slider s64 high", ImGuiDataType_S64, &s64_v, &s64_hi_a, &s64_hi_b, "%I64d"); - ImGui::SliderScalar("slider s64 full", ImGuiDataType_S64, &s64_v, &s64_min, &s64_max, "%I64d"); - ImGui::SliderScalar("slider u64 low", ImGuiDataType_U64, &u64_v, &u64_zero, &u64_fifty,"%I64u ms"); - ImGui::SliderScalar("slider u64 high", ImGuiDataType_U64, &u64_v, &u64_hi_a, &u64_hi_b, "%I64u ms"); - ImGui::SliderScalar("slider u64 full", ImGuiDataType_U64, &u64_v, &u64_min, &u64_max, "%I64u ms"); - ImGui::SliderScalar("slider float low", ImGuiDataType_Float, &f32_v, &f32_zero, &f32_one); - ImGui::SliderScalar("slider float low^2", ImGuiDataType_Float, &f32_v, &f32_zero, &f32_one, "%.10f", 2.0f); - ImGui::SliderScalar("slider float high", ImGuiDataType_Float, &f32_v, &f32_lo_a, &f32_hi_a, "%e"); - ImGui::SliderScalar("slider double low", ImGuiDataType_Double, &f64_v, &f64_zero, &f64_one, "%.10f grams", 1.0f); - ImGui::SliderScalar("slider double low^2",ImGuiDataType_Double, &f64_v, &f64_zero, &f64_one, "%.10f", 2.0f); - ImGui::SliderScalar("slider double high", ImGuiDataType_Double, &f64_v, &f64_lo_a, &f64_hi_a, "%e grams", 1.0f); + IMGUI_DEMO_MARKER("Widgets/Data Types/Sliders"); + ImGui::SeparatorText("Sliders"); + ImGui::SliderScalar("slider s8 full", ImGuiDataType_S8, &s8_v, &s8_min, &s8_max, "%d"); + ImGui::SliderScalar("slider u8 full", ImGuiDataType_U8, &u8_v, &u8_min, &u8_max, "%u"); + ImGui::SliderScalar("slider s16 full", ImGuiDataType_S16, &s16_v, &s16_min, &s16_max, "%d"); + ImGui::SliderScalar("slider u16 full", ImGuiDataType_U16, &u16_v, &u16_min, &u16_max, "%u"); + ImGui::SliderScalar("slider s32 low", ImGuiDataType_S32, &s32_v, &s32_zero, &s32_fifty,"%d"); + ImGui::SliderScalar("slider s32 high", ImGuiDataType_S32, &s32_v, &s32_hi_a, &s32_hi_b, "%d"); + ImGui::SliderScalar("slider s32 full", ImGuiDataType_S32, &s32_v, &s32_min, &s32_max, "%d"); + ImGui::SliderScalar("slider s32 hex", ImGuiDataType_S32, &s32_v, &s32_zero, &s32_fifty, "0x%04X"); + ImGui::SliderScalar("slider u32 low", ImGuiDataType_U32, &u32_v, &u32_zero, &u32_fifty,"%u"); + ImGui::SliderScalar("slider u32 high", ImGuiDataType_U32, &u32_v, &u32_hi_a, &u32_hi_b, "%u"); + ImGui::SliderScalar("slider u32 full", ImGuiDataType_U32, &u32_v, &u32_min, &u32_max, "%u"); + ImGui::SliderScalar("slider s64 low", ImGuiDataType_S64, &s64_v, &s64_zero, &s64_fifty,"%" PRId64); + ImGui::SliderScalar("slider s64 high", ImGuiDataType_S64, &s64_v, &s64_hi_a, &s64_hi_b, "%" PRId64); + ImGui::SliderScalar("slider s64 full", ImGuiDataType_S64, &s64_v, &s64_min, &s64_max, "%" PRId64); + ImGui::SliderScalar("slider u64 low", ImGuiDataType_U64, &u64_v, &u64_zero, &u64_fifty,"%" PRIu64 " ms"); + ImGui::SliderScalar("slider u64 high", ImGuiDataType_U64, &u64_v, &u64_hi_a, &u64_hi_b, "%" PRIu64 " ms"); + ImGui::SliderScalar("slider u64 full", ImGuiDataType_U64, &u64_v, &u64_min, &u64_max, "%" PRIu64 " ms"); + ImGui::SliderScalar("slider float low", ImGuiDataType_Float, &f32_v, &f32_zero, &f32_one); + ImGui::SliderScalar("slider float low log", ImGuiDataType_Float, &f32_v, &f32_zero, &f32_one, "%.10f", ImGuiSliderFlags_Logarithmic); + ImGui::SliderScalar("slider float high", ImGuiDataType_Float, &f32_v, &f32_lo_a, &f32_hi_a, "%e"); + ImGui::SliderScalar("slider double low", ImGuiDataType_Double, &f64_v, &f64_zero, &f64_one, "%.10f grams"); + ImGui::SliderScalar("slider double low log",ImGuiDataType_Double, &f64_v, &f64_zero, &f64_one, "%.10f", ImGuiSliderFlags_Logarithmic); + ImGui::SliderScalar("slider double high", ImGuiDataType_Double, &f64_v, &f64_lo_a, &f64_hi_a, "%e grams"); + ImGui::SeparatorText("Sliders (reverse)"); + ImGui::SliderScalar("slider s8 reverse", ImGuiDataType_S8, &s8_v, &s8_max, &s8_min, "%d"); + ImGui::SliderScalar("slider u8 reverse", ImGuiDataType_U8, &u8_v, &u8_max, &u8_min, "%u"); + ImGui::SliderScalar("slider s32 reverse", ImGuiDataType_S32, &s32_v, &s32_fifty, &s32_zero, "%d"); + ImGui::SliderScalar("slider u32 reverse", ImGuiDataType_U32, &u32_v, &u32_fifty, &u32_zero, "%u"); + ImGui::SliderScalar("slider s64 reverse", ImGuiDataType_S64, &s64_v, &s64_fifty, &s64_zero, "%" PRId64); + ImGui::SliderScalar("slider u64 reverse", ImGuiDataType_U64, &u64_v, &u64_fifty, &u64_zero, "%" PRIu64 " ms"); + + IMGUI_DEMO_MARKER("Widgets/Data Types/Inputs"); static bool inputs_step = true; - ImGui::Text("Inputs"); + static ImGuiInputTextFlags flags = ImGuiInputTextFlags_None; + ImGui::SeparatorText("Inputs"); ImGui::Checkbox("Show step buttons", &inputs_step); - ImGui::InputScalar("input s8", ImGuiDataType_S8, &s8_v, inputs_step ? &s8_one : NULL, NULL, "%d"); - ImGui::InputScalar("input u8", ImGuiDataType_U8, &u8_v, inputs_step ? &u8_one : NULL, NULL, "%u"); - ImGui::InputScalar("input s16", ImGuiDataType_S16, &s16_v, inputs_step ? &s16_one : NULL, NULL, "%d"); - ImGui::InputScalar("input u16", ImGuiDataType_U16, &u16_v, inputs_step ? &u16_one : NULL, NULL, "%u"); - ImGui::InputScalar("input s32", ImGuiDataType_S32, &s32_v, inputs_step ? &s32_one : NULL, NULL, "%d"); - ImGui::InputScalar("input s32 hex", ImGuiDataType_S32, &s32_v, inputs_step ? &s32_one : NULL, NULL, "%08X", ImGuiInputTextFlags_CharsHexadecimal); - ImGui::InputScalar("input u32", ImGuiDataType_U32, &u32_v, inputs_step ? &u32_one : NULL, NULL, "%u"); - ImGui::InputScalar("input u32 hex", ImGuiDataType_U32, &u32_v, inputs_step ? &u32_one : NULL, NULL, "%08X", ImGuiInputTextFlags_CharsHexadecimal); - ImGui::InputScalar("input s64", ImGuiDataType_S64, &s64_v, inputs_step ? &s64_one : NULL); - ImGui::InputScalar("input u64", ImGuiDataType_U64, &u64_v, inputs_step ? &u64_one : NULL); - ImGui::InputScalar("input float", ImGuiDataType_Float, &f32_v, inputs_step ? &f32_one : NULL); - ImGui::InputScalar("input double", ImGuiDataType_Double, &f64_v, inputs_step ? &f64_one : NULL); + ImGui::CheckboxFlags("ImGuiInputTextFlags_ReadOnly", &flags, ImGuiInputTextFlags_ReadOnly); + ImGui::CheckboxFlags("ImGuiInputTextFlags_ParseEmptyRefVal", &flags, ImGuiInputTextFlags_ParseEmptyRefVal); + ImGui::CheckboxFlags("ImGuiInputTextFlags_DisplayEmptyRefVal", &flags, ImGuiInputTextFlags_DisplayEmptyRefVal); + ImGui::InputScalar("input s8", ImGuiDataType_S8, &s8_v, inputs_step ? &s8_one : NULL, NULL, "%d", flags); + ImGui::InputScalar("input u8", ImGuiDataType_U8, &u8_v, inputs_step ? &u8_one : NULL, NULL, "%u", flags); + ImGui::InputScalar("input s16", ImGuiDataType_S16, &s16_v, inputs_step ? &s16_one : NULL, NULL, "%d", flags); + ImGui::InputScalar("input u16", ImGuiDataType_U16, &u16_v, inputs_step ? &u16_one : NULL, NULL, "%u", flags); + ImGui::InputScalar("input s32", ImGuiDataType_S32, &s32_v, inputs_step ? &s32_one : NULL, NULL, "%d", flags); + ImGui::InputScalar("input s32 hex", ImGuiDataType_S32, &s32_v, inputs_step ? &s32_one : NULL, NULL, "%04X", flags); + ImGui::InputScalar("input u32", ImGuiDataType_U32, &u32_v, inputs_step ? &u32_one : NULL, NULL, "%u", flags); + ImGui::InputScalar("input u32 hex", ImGuiDataType_U32, &u32_v, inputs_step ? &u32_one : NULL, NULL, "%08X", flags); + ImGui::InputScalar("input s64", ImGuiDataType_S64, &s64_v, inputs_step ? &s64_one : NULL, NULL, NULL, flags); + ImGui::InputScalar("input u64", ImGuiDataType_U64, &u64_v, inputs_step ? &u64_one : NULL, NULL, NULL, flags); + ImGui::InputScalar("input float", ImGuiDataType_Float, &f32_v, inputs_step ? &f32_one : NULL, NULL, NULL, flags); + ImGui::InputScalar("input double", ImGuiDataType_Double, &f64_v, inputs_step ? &f64_one : NULL, NULL, NULL, flags); ImGui::TreePop(); } +} - if (ImGui::TreeNode("Multi-component Widgets")) +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowWidgetsDisableBlocks() +//----------------------------------------------------------------------------- + +static void DemoWindowWidgetsDisableBlocks(ImGuiDemoWindowData* demo_data) +{ + IMGUI_DEMO_MARKER("Widgets/Disable Blocks"); + if (ImGui::TreeNode("Disable Blocks")) { - static float vec4f[4] = { 0.10f, 0.20f, 0.30f, 0.44f }; - static int vec4i[4] = { 1, 5, 100, 255 }; - - ImGui::InputFloat2("input float2", vec4f); - ImGui::DragFloat2("drag float2", vec4f, 0.01f, 0.0f, 1.0f); - ImGui::SliderFloat2("slider float2", vec4f, 0.0f, 1.0f); - ImGui::InputInt2("input int2", vec4i); - ImGui::DragInt2("drag int2", vec4i, 1, 0, 255); - ImGui::SliderInt2("slider int2", vec4i, 0, 255); - ImGui::Spacing(); - - ImGui::InputFloat3("input float3", vec4f); - ImGui::DragFloat3("drag float3", vec4f, 0.01f, 0.0f, 1.0f); - ImGui::SliderFloat3("slider float3", vec4f, 0.0f, 1.0f); - ImGui::InputInt3("input int3", vec4i); - ImGui::DragInt3("drag int3", vec4i, 1, 0, 255); - ImGui::SliderInt3("slider int3", vec4i, 0, 255); - ImGui::Spacing(); - - ImGui::InputFloat4("input float4", vec4f); - ImGui::DragFloat4("drag float4", vec4f, 0.01f, 0.0f, 1.0f); - ImGui::SliderFloat4("slider float4", vec4f, 0.0f, 1.0f); - ImGui::InputInt4("input int4", vec4i); - ImGui::DragInt4("drag int4", vec4i, 1, 0, 255); - ImGui::SliderInt4("slider int4", vec4i, 0, 255); - + ImGui::Checkbox("Disable entire section above", &demo_data->DisableSections); + ImGui::SameLine(); HelpMarker("Demonstrate using BeginDisabled()/EndDisabled() across other sections."); ImGui::TreePop(); } +} - if (ImGui::TreeNode("Vertical Sliders")) - { - const float spacing = 4; - ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(spacing, spacing)); - - static int int_value = 0; - ImGui::VSliderInt("##int", ImVec2(18,160), &int_value, 0, 5); - ImGui::SameLine(); - - static float values[7] = { 0.0f, 0.60f, 0.35f, 0.9f, 0.70f, 0.20f, 0.0f }; - ImGui::PushID("set1"); - for (int i = 0; i < 7; i++) - { - if (i > 0) ImGui::SameLine(); - ImGui::PushID(i); - ImGui::PushStyleColor(ImGuiCol_FrameBg, (ImVec4)ImColor::HSV(i/7.0f, 0.5f, 0.5f)); - ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, (ImVec4)ImColor::HSV(i/7.0f, 0.6f, 0.5f)); - ImGui::PushStyleColor(ImGuiCol_FrameBgActive, (ImVec4)ImColor::HSV(i/7.0f, 0.7f, 0.5f)); - ImGui::PushStyleColor(ImGuiCol_SliderGrab, (ImVec4)ImColor::HSV(i/7.0f, 0.9f, 0.9f)); - ImGui::VSliderFloat("##v", ImVec2(18,160), &values[i], 0.0f, 1.0f, ""); - if (ImGui::IsItemActive() || ImGui::IsItemHovered()) - ImGui::SetTooltip("%.3f", values[i]); - ImGui::PopStyleColor(4); - ImGui::PopID(); - } - ImGui::PopID(); - - ImGui::SameLine(); - ImGui::PushID("set2"); - static float values2[4] = { 0.20f, 0.80f, 0.40f, 0.25f }; - const int rows = 3; - const ImVec2 small_slider_size(18, (160.0f-(rows-1)*spacing)/rows); - for (int nx = 0; nx < 4; nx++) - { - if (nx > 0) ImGui::SameLine(); - ImGui::BeginGroup(); - for (int ny = 0; ny < rows; ny++) - { - ImGui::PushID(nx*rows+ny); - ImGui::VSliderFloat("##v", small_slider_size, &values2[nx], 0.0f, 1.0f, ""); - if (ImGui::IsItemActive() || ImGui::IsItemHovered()) - ImGui::SetTooltip("%.3f", values2[nx]); - ImGui::PopID(); - } - ImGui::EndGroup(); - } - ImGui::PopID(); - - ImGui::SameLine(); - ImGui::PushID("set3"); - for (int i = 0; i < 4; i++) - { - if (i > 0) ImGui::SameLine(); - ImGui::PushID(i); - ImGui::PushStyleVar(ImGuiStyleVar_GrabMinSize, 40); - ImGui::VSliderFloat("##v", ImVec2(40,160), &values[i], 0.0f, 1.0f, "%.2f\nsec"); - ImGui::PopStyleVar(); - ImGui::PopID(); - } - ImGui::PopID(); - ImGui::PopStyleVar(); - ImGui::TreePop(); - } +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowWidgetsDragAndDrop() +//----------------------------------------------------------------------------- +static void DemoWindowWidgetsDragAndDrop() +{ + IMGUI_DEMO_MARKER("Widgets/Drag and drop"); if (ImGui::TreeNode("Drag and Drop")) { + IMGUI_DEMO_MARKER("Widgets/Drag and drop/Standard widgets"); + if (ImGui::TreeNode("Drag and drop in standard widgets")) { // ColorEdit widgets automatically act as drag source and drag target. - // They are using standardized payload strings IMGUI_PAYLOAD_TYPE_COLOR_3F and IMGUI_PAYLOAD_TYPE_COLOR_4F to allow your own widgets - // to use colors in their drag and drop interaction. Also see the demo in Color Picker -> Palette demo. - ImGui::BulletText("Drag and drop in standard widgets"); - ImGui::Indent(); - static float col1[3] = { 1.0f,0.0f,0.2f }; - static float col2[4] = { 0.4f,0.7f,0.0f,0.5f }; + // They are using standardized payload strings IMGUI_PAYLOAD_TYPE_COLOR_3F and IMGUI_PAYLOAD_TYPE_COLOR_4F + // to allow your own widgets to use colors in their drag and drop interaction. + // Also see 'Demo->Widgets->Color/Picker Widgets->Palette' demo. + HelpMarker("You can drag from the color squares."); + static float col1[3] = { 1.0f, 0.0f, 0.2f }; + static float col2[4] = { 0.4f, 0.7f, 0.0f, 0.5f }; ImGui::ColorEdit3("color 1", col1); ImGui::ColorEdit4("color 2", col2); - ImGui::Unindent(); + ImGui::TreePop(); } + IMGUI_DEMO_MARKER("Widgets/Drag and drop/Copy-swap items"); + if (ImGui::TreeNode("Drag and drop to copy/swap items")) { - ImGui::BulletText("Drag and drop to copy/swap items"); - ImGui::Indent(); enum Mode { Mode_Copy, @@ -1488,19 +1607,28 @@ static void ShowDemoWindowWidgets() if (ImGui::RadioButton("Copy", mode == Mode_Copy)) { mode = Mode_Copy; } ImGui::SameLine(); if (ImGui::RadioButton("Move", mode == Mode_Move)) { mode = Mode_Move; } ImGui::SameLine(); if (ImGui::RadioButton("Swap", mode == Mode_Swap)) { mode = Mode_Swap; } - static const char* names[9] = { "Bobby", "Beatrice", "Betty", "Brianna", "Barry", "Bernard", "Bibi", "Blaine", "Bryn" }; + static const char* names[9] = + { + "Bobby", "Beatrice", "Betty", + "Brianna", "Barry", "Bernard", + "Bibi", "Blaine", "Bryn" + }; for (int n = 0; n < IM_ARRAYSIZE(names); n++) { ImGui::PushID(n); if ((n % 3) != 0) ImGui::SameLine(); - ImGui::Button(names[n], ImVec2(60,60)); + ImGui::Button(names[n], ImVec2(60, 60)); // Our buttons are both drag sources and drag targets here! if (ImGui::BeginDragDropSource(ImGuiDragDropFlags_None)) { - ImGui::SetDragDropPayload("DND_DEMO_CELL", &n, sizeof(int)); // Set payload to carry the index of our item (could be anything) - if (mode == Mode_Copy) { ImGui::Text("Copy %s", names[n]); } // Display preview (could be anything, e.g. when dragging an image we could decide to display the filename and a small preview of the image, etc.) + // Set payload to carry the index of our item (could be anything) + ImGui::SetDragDropPayload("DND_DEMO_CELL", &n, sizeof(int)); + + // Display preview (could be anything, e.g. when dragging an image we could decide to display + // the filename and a small preview of the image, etc.) + if (mode == Mode_Copy) { ImGui::Text("Copy %s", names[n]); } if (mode == Mode_Move) { ImGui::Text("Move %s", names[n]); } if (mode == Mode_Swap) { ImGui::Text("Swap %s", names[n]); } ImGui::EndDragDropSource(); @@ -1531,49 +1659,504 @@ static void ShowDemoWindowWidgets() } ImGui::PopID(); } - ImGui::Unindent(); + ImGui::TreePop(); + } + + IMGUI_DEMO_MARKER("Widgets/Drag and Drop/Drag to reorder items (simple)"); + if (ImGui::TreeNode("Drag to reorder items (simple)")) + { + // FIXME: there is temporary (usually single-frame) ID Conflict during reordering as a same item may be submitting twice. + // This code was always slightly faulty but in a way which was not easily noticeable. + // Until we fix this, enable ImGuiItemFlags_AllowDuplicateId to disable detecting the issue. + ImGui::PushItemFlag(ImGuiItemFlags_AllowDuplicateId, true); + + // Simple reordering + HelpMarker( + "We don't use the drag and drop api at all here! " + "Instead we query when the item is held but not hovered, and order items accordingly."); + static const char* item_names[] = { "Item One", "Item Two", "Item Three", "Item Four", "Item Five" }; + for (int n = 0; n < IM_ARRAYSIZE(item_names); n++) + { + const char* item = item_names[n]; + ImGui::Selectable(item); + + if (ImGui::IsItemActive() && !ImGui::IsItemHovered()) + { + int n_next = n + (ImGui::GetMouseDragDelta(0).y < 0.f ? -1 : 1); + if (n_next >= 0 && n_next < IM_ARRAYSIZE(item_names)) + { + item_names[n] = item_names[n_next]; + item_names[n_next] = item; + ImGui::ResetMouseDragDelta(); + } + } + } + + ImGui::PopItemFlag(); + ImGui::TreePop(); + } + + IMGUI_DEMO_MARKER("Widgets/Drag and Drop/Tooltip at target location"); + if (ImGui::TreeNode("Tooltip at target location")) + { + for (int n = 0; n < 2; n++) + { + // Drop targets + ImGui::Button(n ? "drop here##1" : "drop here##0"); + if (ImGui::BeginDragDropTarget()) + { + ImGuiDragDropFlags drop_target_flags = ImGuiDragDropFlags_AcceptBeforeDelivery | ImGuiDragDropFlags_AcceptNoPreviewTooltip; + if (const ImGuiPayload* payload = ImGui::AcceptDragDropPayload(IMGUI_PAYLOAD_TYPE_COLOR_4F, drop_target_flags)) + { + IM_UNUSED(payload); + ImGui::SetMouseCursor(ImGuiMouseCursor_NotAllowed); + ImGui::SetTooltip("Cannot drop here!"); + } + ImGui::EndDragDropTarget(); + } + + // Drop source + static ImVec4 col4 = { 1.0f, 0.0f, 0.2f, 1.0f }; + if (n == 0) + ImGui::ColorButton("drag me", col4); + + } + ImGui::TreePop(); } ImGui::TreePop(); } +} - if (ImGui::TreeNode("Querying Status (Active/Focused/Hovered etc.)")) +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowWidgetsDragsAndSliders() +//----------------------------------------------------------------------------- + +static void DemoWindowWidgetsDragsAndSliders() +{ + IMGUI_DEMO_MARKER("Widgets/Drag and Slider Flags"); + if (ImGui::TreeNode("Drag/Slider Flags")) { - // Display the value of IsItemHovered() and other common item state functions. Note that the flags can be combined. - // (because BulletText is an item itself and that would affect the output of IsItemHovered() we pass all state in a single call to simplify the code). - static int item_type = 1; + // Demonstrate using advanced flags for DragXXX and SliderXXX functions. Note that the flags are the same! + static ImGuiSliderFlags flags = ImGuiSliderFlags_None; + ImGui::CheckboxFlags("ImGuiSliderFlags_AlwaysClamp", &flags, ImGuiSliderFlags_AlwaysClamp); + ImGui::CheckboxFlags("ImGuiSliderFlags_ClampOnInput", &flags, ImGuiSliderFlags_ClampOnInput); + ImGui::SameLine(); HelpMarker("Clamp value to min/max bounds when input manually with CTRL+Click. By default CTRL+Click allows going out of bounds."); + ImGui::CheckboxFlags("ImGuiSliderFlags_ClampZeroRange", &flags, ImGuiSliderFlags_ClampZeroRange); + ImGui::SameLine(); HelpMarker("Clamp even if min==max==0.0f. Otherwise DragXXX functions don't clamp."); + ImGui::CheckboxFlags("ImGuiSliderFlags_Logarithmic", &flags, ImGuiSliderFlags_Logarithmic); + ImGui::SameLine(); HelpMarker("Enable logarithmic editing (more precision for small values)."); + ImGui::CheckboxFlags("ImGuiSliderFlags_NoRoundToFormat", &flags, ImGuiSliderFlags_NoRoundToFormat); + ImGui::SameLine(); HelpMarker("Disable rounding underlying value to match precision of the format string (e.g. %.3f values are rounded to those 3 digits)."); + ImGui::CheckboxFlags("ImGuiSliderFlags_NoInput", &flags, ImGuiSliderFlags_NoInput); + ImGui::SameLine(); HelpMarker("Disable CTRL+Click or Enter key allowing to input text directly into the widget."); + ImGui::CheckboxFlags("ImGuiSliderFlags_NoSpeedTweaks", &flags, ImGuiSliderFlags_NoSpeedTweaks); + ImGui::SameLine(); HelpMarker("Disable keyboard modifiers altering tweak speed. Useful if you want to alter tweak speed yourself based on your own logic."); + ImGui::CheckboxFlags("ImGuiSliderFlags_WrapAround", &flags, ImGuiSliderFlags_WrapAround); + ImGui::SameLine(); HelpMarker("Enable wrapping around from max to min and from min to max (only supported by DragXXX() functions)"); + + // Drags + static float drag_f = 0.5f; + static int drag_i = 50; + ImGui::Text("Underlying float value: %f", drag_f); + ImGui::DragFloat("DragFloat (0 -> 1)", &drag_f, 0.005f, 0.0f, 1.0f, "%.3f", flags); + ImGui::DragFloat("DragFloat (0 -> +inf)", &drag_f, 0.005f, 0.0f, FLT_MAX, "%.3f", flags); + ImGui::DragFloat("DragFloat (-inf -> 1)", &drag_f, 0.005f, -FLT_MAX, 1.0f, "%.3f", flags); + ImGui::DragFloat("DragFloat (-inf -> +inf)", &drag_f, 0.005f, -FLT_MAX, +FLT_MAX, "%.3f", flags); + //ImGui::DragFloat("DragFloat (0 -> 0)", &drag_f, 0.005f, 0.0f, 0.0f, "%.3f", flags); // To test ClampZeroRange + //ImGui::DragFloat("DragFloat (100 -> 100)", &drag_f, 0.005f, 100.0f, 100.0f, "%.3f", flags); + ImGui::DragInt("DragInt (0 -> 100)", &drag_i, 0.5f, 0, 100, "%d", flags); + + // Sliders + static float slider_f = 0.5f; + static int slider_i = 50; + const ImGuiSliderFlags flags_for_sliders = flags & ~ImGuiSliderFlags_WrapAround; + ImGui::Text("Underlying float value: %f", slider_f); + ImGui::SliderFloat("SliderFloat (0 -> 1)", &slider_f, 0.0f, 1.0f, "%.3f", flags_for_sliders); + ImGui::SliderInt("SliderInt (0 -> 100)", &slider_i, 0, 100, "%d", flags_for_sliders); + + ImGui::TreePop(); + } +} + +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowWidgetsImages() +//----------------------------------------------------------------------------- + +static void DemoWindowWidgetsImages() +{ + IMGUI_DEMO_MARKER("Widgets/Images"); + if (ImGui::TreeNode("Images")) + { + ImGuiIO& io = ImGui::GetIO(); + ImGui::TextWrapped( + "Below we are displaying the font texture (which is the only texture we have access to in this demo). " + "Use the 'ImTextureID' type as storage to pass pointers or identifier to your own texture data. " + "Hover the texture for a zoomed view!"); + + // Below we are displaying the font texture because it is the only texture we have access to inside the demo! + // Remember that ImTextureID is just storage for whatever you want it to be. It is essentially a value that + // will be passed to the rendering backend via the ImDrawCmd structure. + // If you use one of the default imgui_impl_XXXX.cpp rendering backend, they all have comments at the top + // of their respective source file to specify what they expect to be stored in ImTextureID, for example: + // - The imgui_impl_dx11.cpp renderer expect a 'ID3D11ShaderResourceView*' pointer + // - The imgui_impl_opengl3.cpp renderer expect a GLuint OpenGL texture identifier, etc. + // More: + // - If you decided that ImTextureID = MyEngineTexture*, then you can pass your MyEngineTexture* pointers + // to ImGui::Image(), and gather width/height through your own functions, etc. + // - You can use ShowMetricsWindow() to inspect the draw data that are being passed to your renderer, + // it will help you debug issues if you are confused about it. + // - Consider using the lower-level ImDrawList::AddImage() API, via ImGui::GetWindowDrawList()->AddImage(). + // - Read https://github.com/ocornut/imgui/blob/master/docs/FAQ.md + // - Read https://github.com/ocornut/imgui/wiki/Image-Loading-and-Displaying-Examples + ImTextureID my_tex_id = io.Fonts->TexID; + float my_tex_w = (float)io.Fonts->TexWidth; + float my_tex_h = (float)io.Fonts->TexHeight; + { + ImGui::Text("%.0fx%.0f", my_tex_w, my_tex_h); + ImVec2 pos = ImGui::GetCursorScreenPos(); + ImVec2 uv_min = ImVec2(0.0f, 0.0f); // Top-left + ImVec2 uv_max = ImVec2(1.0f, 1.0f); // Lower-right + ImGui::PushStyleVar(ImGuiStyleVar_ImageBorderSize, IM_MAX(1.0f, ImGui::GetStyle().ImageBorderSize)); + ImGui::ImageWithBg(my_tex_id, ImVec2(my_tex_w, my_tex_h), uv_min, uv_max, ImVec4(0.0f, 0.0f, 0.0f, 1.0f)); + if (ImGui::BeginItemTooltip()) + { + float region_sz = 32.0f; + float region_x = io.MousePos.x - pos.x - region_sz * 0.5f; + float region_y = io.MousePos.y - pos.y - region_sz * 0.5f; + float zoom = 4.0f; + if (region_x < 0.0f) { region_x = 0.0f; } + else if (region_x > my_tex_w - region_sz) { region_x = my_tex_w - region_sz; } + if (region_y < 0.0f) { region_y = 0.0f; } + else if (region_y > my_tex_h - region_sz) { region_y = my_tex_h - region_sz; } + ImGui::Text("Min: (%.2f, %.2f)", region_x, region_y); + ImGui::Text("Max: (%.2f, %.2f)", region_x + region_sz, region_y + region_sz); + ImVec2 uv0 = ImVec2((region_x) / my_tex_w, (region_y) / my_tex_h); + ImVec2 uv1 = ImVec2((region_x + region_sz) / my_tex_w, (region_y + region_sz) / my_tex_h); + ImGui::ImageWithBg(my_tex_id, ImVec2(region_sz * zoom, region_sz * zoom), uv0, uv1, ImVec4(0.0f, 0.0f, 0.0f, 1.0f)); + ImGui::EndTooltip(); + } + ImGui::PopStyleVar(); + } + + IMGUI_DEMO_MARKER("Widgets/Images/Textured buttons"); + ImGui::TextWrapped("And now some textured buttons.."); + static int pressed_count = 0; + for (int i = 0; i < 8; i++) + { + // UV coordinates are often (0.0f, 0.0f) and (1.0f, 1.0f) to display an entire textures. + // Here are trying to display only a 32x32 pixels area of the texture, hence the UV computation. + // Read about UV coordinates here: https://github.com/ocornut/imgui/wiki/Image-Loading-and-Displaying-Examples + ImGui::PushID(i); + if (i > 0) + ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(i - 1.0f, i - 1.0f)); + ImVec2 size = ImVec2(32.0f, 32.0f); // Size of the image we want to make visible + ImVec2 uv0 = ImVec2(0.0f, 0.0f); // UV coordinates for lower-left + ImVec2 uv1 = ImVec2(32.0f / my_tex_w, 32.0f / my_tex_h); // UV coordinates for (32,32) in our texture + ImVec4 bg_col = ImVec4(0.0f, 0.0f, 0.0f, 1.0f); // Black background + ImVec4 tint_col = ImVec4(1.0f, 1.0f, 1.0f, 1.0f); // No tint + if (ImGui::ImageButton("", my_tex_id, size, uv0, uv1, bg_col, tint_col)) + pressed_count += 1; + if (i > 0) + ImGui::PopStyleVar(); + ImGui::PopID(); + ImGui::SameLine(); + } + ImGui::NewLine(); + ImGui::Text("Pressed %d times.", pressed_count); + ImGui::TreePop(); + } +} + +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowWidgetsListBoxes() +//----------------------------------------------------------------------------- + +static void DemoWindowWidgetsListBoxes() +{ + IMGUI_DEMO_MARKER("Widgets/List Boxes"); + if (ImGui::TreeNode("List Boxes")) + { + // BeginListBox() is essentially a thin wrapper to using BeginChild()/EndChild() + // using the ImGuiChildFlags_FrameStyle flag for stylistic changes + displaying a label. + // You may be tempted to simply use BeginChild() directly. However note that BeginChild() requires EndChild() + // to always be called (inconsistent with BeginListBox()/EndListBox()). + + // Using the generic BeginListBox() API, you have full control over how to display the combo contents. + // (your selection data could be an index, a pointer to the object, an id for the object, a flag intrusively + // stored in the object itself, etc.) + const char* items[] = { "AAAA", "BBBB", "CCCC", "DDDD", "EEEE", "FFFF", "GGGG", "HHHH", "IIII", "JJJJ", "KKKK", "LLLLLLL", "MMMM", "OOOOOOO" }; + static int item_selected_idx = 0; // Here we store our selected data as an index. + + static bool item_highlight = false; + int item_highlighted_idx = -1; // Here we store our highlighted data as an index. + ImGui::Checkbox("Highlight hovered item in second listbox", &item_highlight); + + if (ImGui::BeginListBox("listbox 1")) + { + for (int n = 0; n < IM_ARRAYSIZE(items); n++) + { + const bool is_selected = (item_selected_idx == n); + if (ImGui::Selectable(items[n], is_selected)) + item_selected_idx = n; + + if (item_highlight && ImGui::IsItemHovered()) + item_highlighted_idx = n; + + // Set the initial focus when opening the combo (scrolling + keyboard navigation focus) + if (is_selected) + ImGui::SetItemDefaultFocus(); + } + ImGui::EndListBox(); + } + ImGui::SameLine(); HelpMarker("Here we are sharing selection state between both boxes."); + + // Custom size: use all width, 5 items tall + ImGui::Text("Full-width:"); + if (ImGui::BeginListBox("##listbox 2", ImVec2(-FLT_MIN, 5 * ImGui::GetTextLineHeightWithSpacing()))) + { + for (int n = 0; n < IM_ARRAYSIZE(items); n++) + { + bool is_selected = (item_selected_idx == n); + ImGuiSelectableFlags flags = (item_highlighted_idx == n) ? ImGuiSelectableFlags_Highlight : 0; + if (ImGui::Selectable(items[n], is_selected, flags)) + item_selected_idx = n; + + // Set the initial focus when opening the combo (scrolling + keyboard navigation focus) + if (is_selected) + ImGui::SetItemDefaultFocus(); + } + ImGui::EndListBox(); + } + + ImGui::TreePop(); + } +} + +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowWidgetsMultiComponents() +//----------------------------------------------------------------------------- + +static void DemoWindowWidgetsMultiComponents() +{ + IMGUI_DEMO_MARKER("Widgets/Multi-component Widgets"); + if (ImGui::TreeNode("Multi-component Widgets")) + { + static float vec4f[4] = { 0.10f, 0.20f, 0.30f, 0.44f }; + static int vec4i[4] = { 1, 5, 100, 255 }; + + ImGui::SeparatorText("2-wide"); + ImGui::InputFloat2("input float2", vec4f); + ImGui::DragFloat2("drag float2", vec4f, 0.01f, 0.0f, 1.0f); + ImGui::SliderFloat2("slider float2", vec4f, 0.0f, 1.0f); + ImGui::InputInt2("input int2", vec4i); + ImGui::DragInt2("drag int2", vec4i, 1, 0, 255); + ImGui::SliderInt2("slider int2", vec4i, 0, 255); + + ImGui::SeparatorText("3-wide"); + ImGui::InputFloat3("input float3", vec4f); + ImGui::DragFloat3("drag float3", vec4f, 0.01f, 0.0f, 1.0f); + ImGui::SliderFloat3("slider float3", vec4f, 0.0f, 1.0f); + ImGui::InputInt3("input int3", vec4i); + ImGui::DragInt3("drag int3", vec4i, 1, 0, 255); + ImGui::SliderInt3("slider int3", vec4i, 0, 255); + + ImGui::SeparatorText("4-wide"); + ImGui::InputFloat4("input float4", vec4f); + ImGui::DragFloat4("drag float4", vec4f, 0.01f, 0.0f, 1.0f); + ImGui::SliderFloat4("slider float4", vec4f, 0.0f, 1.0f); + ImGui::InputInt4("input int4", vec4i); + ImGui::DragInt4("drag int4", vec4i, 1, 0, 255); + ImGui::SliderInt4("slider int4", vec4i, 0, 255); + + ImGui::SeparatorText("Ranges"); + static float begin = 10, end = 90; + static int begin_i = 100, end_i = 1000; + ImGui::DragFloatRange2("range float", &begin, &end, 0.25f, 0.0f, 100.0f, "Min: %.1f %%", "Max: %.1f %%", ImGuiSliderFlags_AlwaysClamp); + ImGui::DragIntRange2("range int", &begin_i, &end_i, 5, 0, 1000, "Min: %d units", "Max: %d units"); + ImGui::DragIntRange2("range int (no bounds)", &begin_i, &end_i, 5, 0, 0, "Min: %d units", "Max: %d units"); + + ImGui::TreePop(); + } +} + +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowWidgetsPlotting() +//----------------------------------------------------------------------------- + +static void DemoWindowWidgetsPlotting() +{ + // Plot/Graph widgets are not very good. +// Consider using a third-party library such as ImPlot: https://github.com/epezent/implot +// (see others https://github.com/ocornut/imgui/wiki/Useful-Extensions) + IMGUI_DEMO_MARKER("Widgets/Plotting"); + if (ImGui::TreeNode("Plotting")) + { + ImGui::Text("Need better plotting and graphing? Consider using ImPlot:"); + ImGui::TextLinkOpenURL("https://github.com/epezent/implot"); + ImGui::Separator(); + + static bool animate = true; + ImGui::Checkbox("Animate", &animate); + + // Plot as lines and plot as histogram + static float arr[] = { 0.6f, 0.1f, 1.0f, 0.5f, 0.92f, 0.1f, 0.2f }; + ImGui::PlotLines("Frame Times", arr, IM_ARRAYSIZE(arr)); + ImGui::PlotHistogram("Histogram", arr, IM_ARRAYSIZE(arr), 0, NULL, 0.0f, 1.0f, ImVec2(0, 80.0f)); + //ImGui::SameLine(); HelpMarker("Consider using ImPlot instead!"); + + // Fill an array of contiguous float values to plot + // Tip: If your float aren't contiguous but part of a structure, you can pass a pointer to your first float + // and the sizeof() of your structure in the "stride" parameter. + static float values[90] = {}; + static int values_offset = 0; + static double refresh_time = 0.0; + if (!animate || refresh_time == 0.0) + refresh_time = ImGui::GetTime(); + while (refresh_time < ImGui::GetTime()) // Create data at fixed 60 Hz rate for the demo + { + static float phase = 0.0f; + values[values_offset] = cosf(phase); + values_offset = (values_offset + 1) % IM_ARRAYSIZE(values); + phase += 0.10f * values_offset; + refresh_time += 1.0f / 60.0f; + } + + // Plots can display overlay texts + // (in this example, we will display an average value) + { + float average = 0.0f; + for (int n = 0; n < IM_ARRAYSIZE(values); n++) + average += values[n]; + average /= (float)IM_ARRAYSIZE(values); + char overlay[32]; + sprintf(overlay, "avg %f", average); + ImGui::PlotLines("Lines", values, IM_ARRAYSIZE(values), values_offset, overlay, -1.0f, 1.0f, ImVec2(0, 80.0f)); + } + + // Use functions to generate output + // FIXME: This is actually VERY awkward because current plot API only pass in indices. + // We probably want an API passing floats and user provide sample rate/count. + struct Funcs + { + static float Sin(void*, int i) { return sinf(i * 0.1f); } + static float Saw(void*, int i) { return (i & 1) ? 1.0f : -1.0f; } + }; + static int func_type = 0, display_count = 70; + ImGui::SeparatorText("Functions"); + ImGui::SetNextItemWidth(ImGui::GetFontSize() * 8); + ImGui::Combo("func", &func_type, "Sin\0Saw\0"); + ImGui::SameLine(); + ImGui::SliderInt("Sample count", &display_count, 1, 400); + float (*func)(void*, int) = (func_type == 0) ? Funcs::Sin : Funcs::Saw; + ImGui::PlotLines("Lines##2", func, NULL, display_count, 0, NULL, -1.0f, 1.0f, ImVec2(0, 80)); + ImGui::PlotHistogram("Histogram##2", func, NULL, display_count, 0, NULL, -1.0f, 1.0f, ImVec2(0, 80)); + + ImGui::TreePop(); + } +} + +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowWidgetsProgressBars() +//----------------------------------------------------------------------------- + +static void DemoWindowWidgetsProgressBars() +{ + IMGUI_DEMO_MARKER("Widgets/Progress Bars"); + if (ImGui::TreeNode("Progress Bars")) + { + // Animate a simple progress bar + static float progress = 0.0f, progress_dir = 1.0f; + progress += progress_dir * 0.4f * ImGui::GetIO().DeltaTime; + if (progress >= +1.1f) { progress = +1.1f; progress_dir *= -1.0f; } + if (progress <= -0.1f) { progress = -0.1f; progress_dir *= -1.0f; } + + // Typically we would use ImVec2(-1.0f,0.0f) or ImVec2(-FLT_MIN,0.0f) to use all available width, + // or ImVec2(width,0.0f) for a specified width. ImVec2(0.0f,0.0f) uses ItemWidth. + ImGui::ProgressBar(progress, ImVec2(0.0f, 0.0f)); + ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x); + ImGui::Text("Progress Bar"); + + float progress_saturated = IM_CLAMP(progress, 0.0f, 1.0f); + char buf[32]; + sprintf(buf, "%d/%d", (int)(progress_saturated * 1753), 1753); + ImGui::ProgressBar(progress, ImVec2(0.f, 0.f), buf); + + // Pass an animated negative value, e.g. -1.0f * (float)ImGui::GetTime() is the recommended value. + // Adjust the factor if you want to adjust the animation speed. + ImGui::ProgressBar(-1.0f * (float)ImGui::GetTime(), ImVec2(0.0f, 0.0f), "Searching.."); + ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x); + ImGui::Text("Indeterminate"); + + ImGui::TreePop(); + } +} + +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowWidgetsQueryingStatuses() +//----------------------------------------------------------------------------- + +static void DemoWindowWidgetsQueryingStatuses() +{ + IMGUI_DEMO_MARKER("Widgets/Querying Item Status (Edited,Active,Hovered etc.)"); + if (ImGui::TreeNode("Querying Item Status (Edited/Active/Hovered etc.)")) + { + // Select an item type + const char* item_names[] = + { + "Text", "Button", "Button (w/ repeat)", "Checkbox", "SliderFloat", "InputText", "InputTextMultiline", "InputFloat", + "InputFloat3", "ColorEdit4", "Selectable", "MenuItem", "TreeNode", "TreeNode (w/ double-click)", "Combo", "ListBox" + }; + static int item_type = 4; + static bool item_disabled = false; + ImGui::Combo("Item Type", &item_type, item_names, IM_ARRAYSIZE(item_names), IM_ARRAYSIZE(item_names)); + ImGui::SameLine(); + HelpMarker("Testing how various types of items are interacting with the IsItemXXX functions. Note that the bool return value of most ImGui function is generally equivalent to calling ImGui::IsItemHovered()."); + ImGui::Checkbox("Item Disabled", &item_disabled); + + // Submit selected items so we can query their status in the code following it. + bool ret = false; static bool b = false; static float col4f[4] = { 1.0f, 0.5, 0.0f, 1.0f }; static char str[16] = {}; - ImGui::RadioButton("Text", &item_type, 0); - ImGui::RadioButton("Button", &item_type, 1); - ImGui::RadioButton("Checkbox", &item_type, 2); - ImGui::RadioButton("SliderFloat", &item_type, 3); - ImGui::RadioButton("InputText", &item_type, 4); - ImGui::RadioButton("InputFloat3", &item_type, 5); - ImGui::RadioButton("ColorEdit4", &item_type, 6); - ImGui::RadioButton("MenuItem", &item_type, 7); - ImGui::RadioButton("TreeNode (w/ double-click)", &item_type, 8); - ImGui::RadioButton("ListBox", &item_type, 9); - ImGui::Separator(); - bool ret = false; + if (item_disabled) + ImGui::BeginDisabled(true); if (item_type == 0) { ImGui::Text("ITEM: Text"); } // Testing text items with no identifier/interaction if (item_type == 1) { ret = ImGui::Button("ITEM: Button"); } // Testing button - if (item_type == 2) { ret = ImGui::Checkbox("ITEM: Checkbox", &b); } // Testing checkbox - if (item_type == 3) { ret = ImGui::SliderFloat("ITEM: SliderFloat", &col4f[0], 0.0f, 1.0f); } // Testing basic item - if (item_type == 4) { ret = ImGui::InputText("ITEM: InputText", &str[0], IM_ARRAYSIZE(str)); } // Testing input text (which handles tabbing) - if (item_type == 5) { ret = ImGui::InputFloat3("ITEM: InputFloat3", col4f); } // Testing multi-component items (IsItemXXX flags are reported merged) - if (item_type == 6) { ret = ImGui::ColorEdit4("ITEM: ColorEdit4", col4f); } // Testing multi-component items (IsItemXXX flags are reported merged) - if (item_type == 7) { ret = ImGui::MenuItem("ITEM: MenuItem"); } // Testing menu item (they use ImGuiButtonFlags_PressedOnRelease button policy) - if (item_type == 8) { ret = ImGui::TreeNodeEx("ITEM: TreeNode w/ ImGuiTreeNodeFlags_OpenOnDoubleClick", ImGuiTreeNodeFlags_OpenOnDoubleClick | ImGuiTreeNodeFlags_NoTreePushOnOpen); } // Testing tree node with ImGuiButtonFlags_PressedOnDoubleClick button policy. - if (item_type == 9) { const char* items[] = { "Apple", "Banana", "Cherry", "Kiwi" }; static int current = 1; ret = ImGui::ListBox("ITEM: ListBox", ¤t, items, IM_ARRAYSIZE(items), IM_ARRAYSIZE(items)); } + if (item_type == 2) { ImGui::PushItemFlag(ImGuiItemFlags_ButtonRepeat, true); ret = ImGui::Button("ITEM: Button"); ImGui::PopItemFlag(); } // Testing button (with repeater) + if (item_type == 3) { ret = ImGui::Checkbox("ITEM: Checkbox", &b); } // Testing checkbox + if (item_type == 4) { ret = ImGui::SliderFloat("ITEM: SliderFloat", &col4f[0], 0.0f, 1.0f); } // Testing basic item + if (item_type == 5) { ret = ImGui::InputText("ITEM: InputText", &str[0], IM_ARRAYSIZE(str)); } // Testing input text (which handles tabbing) + if (item_type == 6) { ret = ImGui::InputTextMultiline("ITEM: InputTextMultiline", &str[0], IM_ARRAYSIZE(str)); } // Testing input text (which uses a child window) + if (item_type == 7) { ret = ImGui::InputFloat("ITEM: InputFloat", col4f, 1.0f); } // Testing +/- buttons on scalar input + if (item_type == 8) { ret = ImGui::InputFloat3("ITEM: InputFloat3", col4f); } // Testing multi-component items (IsItemXXX flags are reported merged) + if (item_type == 9) { ret = ImGui::ColorEdit4("ITEM: ColorEdit4", col4f); } // Testing multi-component items (IsItemXXX flags are reported merged) + if (item_type == 10) { ret = ImGui::Selectable("ITEM: Selectable"); } // Testing selectable item + if (item_type == 11) { ret = ImGui::MenuItem("ITEM: MenuItem"); } // Testing menu item (they use ImGuiButtonFlags_PressedOnRelease button policy) + if (item_type == 12) { ret = ImGui::TreeNode("ITEM: TreeNode"); if (ret) ImGui::TreePop(); } // Testing tree node + if (item_type == 13) { ret = ImGui::TreeNodeEx("ITEM: TreeNode w/ ImGuiTreeNodeFlags_OpenOnDoubleClick", ImGuiTreeNodeFlags_OpenOnDoubleClick | ImGuiTreeNodeFlags_NoTreePushOnOpen); } // Testing tree node with ImGuiButtonFlags_PressedOnDoubleClick button policy. + if (item_type == 14) { const char* items[] = { "Apple", "Banana", "Cherry", "Kiwi" }; static int current = 1; ret = ImGui::Combo("ITEM: Combo", ¤t, items, IM_ARRAYSIZE(items)); } + if (item_type == 15) { const char* items[] = { "Apple", "Banana", "Cherry", "Kiwi" }; static int current = 1; ret = ImGui::ListBox("ITEM: ListBox", ¤t, items, IM_ARRAYSIZE(items), IM_ARRAYSIZE(items)); } + + bool hovered_delay_none = ImGui::IsItemHovered(); + bool hovered_delay_stationary = ImGui::IsItemHovered(ImGuiHoveredFlags_Stationary); + bool hovered_delay_short = ImGui::IsItemHovered(ImGuiHoveredFlags_DelayShort); + bool hovered_delay_normal = ImGui::IsItemHovered(ImGuiHoveredFlags_DelayNormal); + bool hovered_delay_tooltip = ImGui::IsItemHovered(ImGuiHoveredFlags_ForTooltip); // = Normal + Stationary + + // Display the values of IsItemHovered() and other common item state functions. + // Note that the ImGuiHoveredFlags_XXX flags can be combined. + // Because BulletText is an item itself and that would affect the output of IsItemXXX functions, + // we query every state in a single call to avoid storing them and to simplify the code. ImGui::BulletText( "Return value = %d\n" "IsItemFocused() = %d\n" "IsItemHovered() = %d\n" "IsItemHovered(_AllowWhenBlockedByPopup) = %d\n" "IsItemHovered(_AllowWhenBlockedByActiveItem) = %d\n" - "IsItemHovered(_AllowWhenOverlapped) = %d\n" + "IsItemHovered(_AllowWhenOverlappedByItem) = %d\n" + "IsItemHovered(_AllowWhenOverlappedByWindow) = %d\n" + "IsItemHovered(_AllowWhenDisabled) = %d\n" "IsItemHovered(_RectOnly) = %d\n" "IsItemActive() = %d\n" "IsItemEdited() = %d\n" @@ -1582,6 +2165,7 @@ static void ShowDemoWindowWidgets() "IsItemDeactivatedAfterEdit() = %d\n" "IsItemVisible() = %d\n" "IsItemClicked() = %d\n" + "IsItemToggledOpen() = %d\n" "GetItemRectMin() = (%.1f, %.1f)\n" "GetItemRectMax() = (%.1f, %.1f)\n" "GetItemRectSize() = (%.1f, %.1f)", @@ -1590,7 +2174,9 @@ static void ShowDemoWindowWidgets() ImGui::IsItemHovered(), ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup), ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByActiveItem), - ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenOverlapped), + ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenOverlappedByItem), + ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenOverlappedByWindow), + ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled), ImGui::IsItemHovered(ImGuiHoveredFlags_RectOnly), ImGui::IsItemActive(), ImGui::IsItemEdited(), @@ -1599,63 +2185,112 @@ static void ShowDemoWindowWidgets() ImGui::IsItemDeactivatedAfterEdit(), ImGui::IsItemVisible(), ImGui::IsItemClicked(), + ImGui::IsItemToggledOpen(), ImGui::GetItemRectMin().x, ImGui::GetItemRectMin().y, ImGui::GetItemRectMax().x, ImGui::GetItemRectMax().y, ImGui::GetItemRectSize().x, ImGui::GetItemRectSize().y ); + ImGui::BulletText( + "with Hovering Delay or Stationary test:\n" + "IsItemHovered() = = %d\n" + "IsItemHovered(_Stationary) = %d\n" + "IsItemHovered(_DelayShort) = %d\n" + "IsItemHovered(_DelayNormal) = %d\n" + "IsItemHovered(_Tooltip) = %d", + hovered_delay_none, hovered_delay_stationary, hovered_delay_short, hovered_delay_normal, hovered_delay_tooltip); + if (item_disabled) + ImGui::EndDisabled(); + + char buf[1] = ""; + ImGui::InputText("unused", buf, IM_ARRAYSIZE(buf), ImGuiInputTextFlags_ReadOnly); + ImGui::SameLine(); + HelpMarker("This widget is only here to be able to tab-out of the widgets above and see e.g. Deactivated() status."); + + ImGui::TreePop(); + } + + IMGUI_DEMO_MARKER("Widgets/Querying Window Status (Focused,Hovered etc.)"); + if (ImGui::TreeNode("Querying Window Status (Focused/Hovered etc.)")) + { static bool embed_all_inside_a_child_window = false; - ImGui::Checkbox("Embed everything inside a child window (for additional testing)", &embed_all_inside_a_child_window); + ImGui::Checkbox("Embed everything inside a child window for testing _RootWindow flag.", &embed_all_inside_a_child_window); if (embed_all_inside_a_child_window) - ImGui::BeginChild("outer_child", ImVec2(0, ImGui::GetFontSize() * 20), true); + ImGui::BeginChild("outer_child", ImVec2(0, ImGui::GetFontSize() * 20.0f), ImGuiChildFlags_Borders); - // Testing IsWindowFocused() function with its various flags. Note that the flags can be combined. + // Testing IsWindowFocused() function with its various flags. ImGui::BulletText( "IsWindowFocused() = %d\n" "IsWindowFocused(_ChildWindows) = %d\n" + "IsWindowFocused(_ChildWindows|_NoPopupHierarchy) = %d\n" + "IsWindowFocused(_ChildWindows|_DockHierarchy) = %d\n" "IsWindowFocused(_ChildWindows|_RootWindow) = %d\n" + "IsWindowFocused(_ChildWindows|_RootWindow|_NoPopupHierarchy) = %d\n" + "IsWindowFocused(_ChildWindows|_RootWindow|_DockHierarchy) = %d\n" "IsWindowFocused(_RootWindow) = %d\n" + "IsWindowFocused(_RootWindow|_NoPopupHierarchy) = %d\n" + "IsWindowFocused(_RootWindow|_DockHierarchy) = %d\n" "IsWindowFocused(_AnyWindow) = %d\n", ImGui::IsWindowFocused(), ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows), + ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows | ImGuiFocusedFlags_NoPopupHierarchy), + ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows | ImGuiFocusedFlags_DockHierarchy), ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows | ImGuiFocusedFlags_RootWindow), + ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows | ImGuiFocusedFlags_RootWindow | ImGuiFocusedFlags_NoPopupHierarchy), + ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows | ImGuiFocusedFlags_RootWindow | ImGuiFocusedFlags_DockHierarchy), ImGui::IsWindowFocused(ImGuiFocusedFlags_RootWindow), + ImGui::IsWindowFocused(ImGuiFocusedFlags_RootWindow | ImGuiFocusedFlags_NoPopupHierarchy), + ImGui::IsWindowFocused(ImGuiFocusedFlags_RootWindow | ImGuiFocusedFlags_DockHierarchy), ImGui::IsWindowFocused(ImGuiFocusedFlags_AnyWindow)); - // Testing IsWindowHovered() function with its various flags. Note that the flags can be combined. + // Testing IsWindowHovered() function with its various flags. ImGui::BulletText( "IsWindowHovered() = %d\n" "IsWindowHovered(_AllowWhenBlockedByPopup) = %d\n" "IsWindowHovered(_AllowWhenBlockedByActiveItem) = %d\n" "IsWindowHovered(_ChildWindows) = %d\n" + "IsWindowHovered(_ChildWindows|_NoPopupHierarchy) = %d\n" + "IsWindowHovered(_ChildWindows|_DockHierarchy) = %d\n" "IsWindowHovered(_ChildWindows|_RootWindow) = %d\n" - "IsWindowHovered(_ChildWindows|_AllowWhenBlockedByPopup) = %d\n" + "IsWindowHovered(_ChildWindows|_RootWindow|_NoPopupHierarchy) = %d\n" + "IsWindowHovered(_ChildWindows|_RootWindow|_DockHierarchy) = %d\n" "IsWindowHovered(_RootWindow) = %d\n" - "IsWindowHovered(_AnyWindow) = %d\n", + "IsWindowHovered(_RootWindow|_NoPopupHierarchy) = %d\n" + "IsWindowHovered(_RootWindow|_DockHierarchy) = %d\n" + "IsWindowHovered(_ChildWindows|_AllowWhenBlockedByPopup) = %d\n" + "IsWindowHovered(_AnyWindow) = %d\n" + "IsWindowHovered(_Stationary) = %d\n", ImGui::IsWindowHovered(), ImGui::IsWindowHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup), ImGui::IsWindowHovered(ImGuiHoveredFlags_AllowWhenBlockedByActiveItem), ImGui::IsWindowHovered(ImGuiHoveredFlags_ChildWindows), + ImGui::IsWindowHovered(ImGuiHoveredFlags_ChildWindows | ImGuiHoveredFlags_NoPopupHierarchy), + ImGui::IsWindowHovered(ImGuiHoveredFlags_ChildWindows | ImGuiHoveredFlags_DockHierarchy), ImGui::IsWindowHovered(ImGuiHoveredFlags_ChildWindows | ImGuiHoveredFlags_RootWindow), - ImGui::IsWindowHovered(ImGuiHoveredFlags_ChildWindows | ImGuiHoveredFlags_AllowWhenBlockedByPopup), + ImGui::IsWindowHovered(ImGuiHoveredFlags_ChildWindows | ImGuiHoveredFlags_RootWindow | ImGuiHoveredFlags_NoPopupHierarchy), + ImGui::IsWindowHovered(ImGuiHoveredFlags_ChildWindows | ImGuiHoveredFlags_RootWindow | ImGuiHoveredFlags_DockHierarchy), ImGui::IsWindowHovered(ImGuiHoveredFlags_RootWindow), - ImGui::IsWindowHovered(ImGuiHoveredFlags_AnyWindow)); + ImGui::IsWindowHovered(ImGuiHoveredFlags_RootWindow | ImGuiHoveredFlags_NoPopupHierarchy), + ImGui::IsWindowHovered(ImGuiHoveredFlags_RootWindow | ImGuiHoveredFlags_DockHierarchy), + ImGui::IsWindowHovered(ImGuiHoveredFlags_ChildWindows | ImGuiHoveredFlags_AllowWhenBlockedByPopup), + ImGui::IsWindowHovered(ImGuiHoveredFlags_AnyWindow), + ImGui::IsWindowHovered(ImGuiHoveredFlags_Stationary)); - ImGui::BeginChild("child", ImVec2(0, 50), true); + ImGui::BeginChild("child", ImVec2(0, 50), ImGuiChildFlags_Borders); ImGui::Text("This is another child window for testing the _ChildWindows flag."); ImGui::EndChild(); if (embed_all_inside_a_child_window) ImGui::EndChild(); - static char dummy_str[] = "This is a dummy field to be able to tab-out of the widgets above."; - ImGui::InputText("dummy", dummy_str, IM_ARRAYSIZE(dummy_str), ImGuiInputTextFlags_ReadOnly); - // Calling IsItemHovered() after begin returns the hovered status of the title bar. - // This is useful in particular if you want to create a context menu (with BeginPopupContextItem) associated to the title bar of a window. + // This is useful in particular if you want to create a context menu associated to the title bar of a window. + // This will also work when docked into a Tab (the Tab replace the Title Bar and guarantee the same properties). static bool test_window = false; ImGui::Checkbox("Hovered/Active tests after Begin() for title bar testing", &test_window); if (test_window) { + // FIXME-DOCK: This window cannot be docked within the ImGui Demo window, this will cause a feedback loop and get them stuck. + // Could we fix this through an ImGuiWindowClass feature? Or an API call to tag our parent as "don't skip items"? ImGui::Begin("Title bar Hovered/Active tests", &test_window); if (ImGui::BeginPopupContextItem()) // <-- This is using IsItemHovered() { @@ -1673,219 +2308,1120 @@ static void ShowDemoWindowWidgets() } } -static void ShowDemoWindowLayout() +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowWidgetsSelectables() +//----------------------------------------------------------------------------- + +static void DemoWindowWidgetsSelectables() { - if (!ImGui::CollapsingHeader("Layout")) - return; - - if (ImGui::TreeNode("Child windows")) + IMGUI_DEMO_MARKER("Widgets/Selectables"); + //ImGui::SetNextItemOpen(true, ImGuiCond_Once); + if (ImGui::TreeNode("Selectables")) { - HelpMarker("Use child windows to begin into a self-contained independent scrolling/clipping regions within a host window."); - static bool disable_mouse_wheel = false; - static bool disable_menu = false; - ImGui::Checkbox("Disable Mouse Wheel", &disable_mouse_wheel); - ImGui::Checkbox("Disable Menu", &disable_menu); - - static int line = 50; - bool goto_line = ImGui::Button("Goto"); - ImGui::SameLine(); - ImGui::SetNextItemWidth(100); - goto_line |= ImGui::InputInt("##Line", &line, 0, 0, ImGuiInputTextFlags_EnterReturnsTrue); - - // Child 1: no border, enable horizontal scrollbar + // Selectable() has 2 overloads: + // - The one taking "bool selected" as a read-only selection information. + // When Selectable() has been clicked it returns true and you can alter selection state accordingly. + // - The one taking "bool* p_selected" as a read-write selection information (convenient in some cases) + // The earlier is more flexible, as in real application your selection may be stored in many different ways + // and not necessarily inside a bool value (e.g. in flags within objects, as an external list, etc). + IMGUI_DEMO_MARKER("Widgets/Selectables/Basic"); + if (ImGui::TreeNode("Basic")) { - ImGuiWindowFlags window_flags = ImGuiWindowFlags_HorizontalScrollbar | (disable_mouse_wheel ? ImGuiWindowFlags_NoScrollWithMouse : 0); - ImGui::BeginChild("Child1", ImVec2(ImGui::GetWindowContentRegionWidth() * 0.5f, 260), false, window_flags); - for (int i = 0; i < 100; i++) - { - ImGui::Text("%04d: scrollable region", i); - if (goto_line && line == i) - ImGui::SetScrollHereY(); - } - if (goto_line && line >= 100) - ImGui::SetScrollHereY(); - ImGui::EndChild(); + static bool selection[5] = { false, true, false, false }; + ImGui::Selectable("1. I am selectable", &selection[0]); + ImGui::Selectable("2. I am selectable", &selection[1]); + ImGui::Selectable("3. I am selectable", &selection[2]); + if (ImGui::Selectable("4. I am double clickable", selection[3], ImGuiSelectableFlags_AllowDoubleClick)) + if (ImGui::IsMouseDoubleClicked(0)) + selection[3] = !selection[3]; + ImGui::TreePop(); } - ImGui::SameLine(); - - // Child 2: rounded border + IMGUI_DEMO_MARKER("Widgets/Selectables/Rendering more items on the same line"); + if (ImGui::TreeNode("Rendering more items on the same line")) { - ImGuiWindowFlags window_flags = (disable_mouse_wheel ? ImGuiWindowFlags_NoScrollWithMouse : 0) | (disable_menu ? 0 : ImGuiWindowFlags_MenuBar); - ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, 5.0f); - ImGui::BeginChild("Child2", ImVec2(0, 260), true, window_flags); - if (!disable_menu && ImGui::BeginMenuBar()) + // (1) Using SetNextItemAllowOverlap() + // (2) Using the Selectable() override that takes "bool* p_selected" parameter, the bool value is toggled automatically. + static bool selected[3] = { false, false, false }; + ImGui::SetNextItemAllowOverlap(); ImGui::Selectable("main.c", &selected[0]); ImGui::SameLine(); ImGui::SmallButton("Link 1"); + ImGui::SetNextItemAllowOverlap(); ImGui::Selectable("Hello.cpp", &selected[1]); ImGui::SameLine(); ImGui::SmallButton("Link 2"); + ImGui::SetNextItemAllowOverlap(); ImGui::Selectable("Hello.h", &selected[2]); ImGui::SameLine(); ImGui::SmallButton("Link 3"); + ImGui::TreePop(); + } + + IMGUI_DEMO_MARKER("Widgets/Selectables/In Tables"); + if (ImGui::TreeNode("In Tables")) + { + static bool selected[10] = {}; + + if (ImGui::BeginTable("split1", 3, ImGuiTableFlags_Resizable | ImGuiTableFlags_NoSavedSettings | ImGuiTableFlags_Borders)) { - if (ImGui::BeginMenu("Menu")) + for (int i = 0; i < 10; i++) { - ShowExampleMenuFile(); - ImGui::EndMenu(); + char label[32]; + sprintf(label, "Item %d", i); + ImGui::TableNextColumn(); + ImGui::Selectable(label, &selected[i]); // FIXME-TABLE: Selection overlap } - ImGui::EndMenuBar(); + ImGui::EndTable(); } - ImGui::Columns(2); - for (int i = 0; i < 100; i++) + ImGui::Spacing(); + if (ImGui::BeginTable("split2", 3, ImGuiTableFlags_Resizable | ImGuiTableFlags_NoSavedSettings | ImGuiTableFlags_Borders)) + { + for (int i = 0; i < 10; i++) + { + char label[32]; + sprintf(label, "Item %d", i); + ImGui::TableNextRow(); + ImGui::TableNextColumn(); + ImGui::Selectable(label, &selected[i], ImGuiSelectableFlags_SpanAllColumns); + ImGui::TableNextColumn(); + ImGui::Text("Some other contents"); + ImGui::TableNextColumn(); + ImGui::Text("123456"); + } + ImGui::EndTable(); + } + ImGui::TreePop(); + } + + IMGUI_DEMO_MARKER("Widgets/Selectables/Grid"); + if (ImGui::TreeNode("Grid")) + { + static char selected[4][4] = { { 1, 0, 0, 0 }, { 0, 1, 0, 0 }, { 0, 0, 1, 0 }, { 0, 0, 0, 1 } }; + + // Add in a bit of silly fun... + const float time = (float)ImGui::GetTime(); + const bool winning_state = memchr(selected, 0, sizeof(selected)) == NULL; // If all cells are selected... + if (winning_state) + ImGui::PushStyleVar(ImGuiStyleVar_SelectableTextAlign, ImVec2(0.5f + 0.5f * cosf(time * 2.0f), 0.5f + 0.5f * sinf(time * 3.0f))); + + for (int y = 0; y < 4; y++) + for (int x = 0; x < 4; x++) + { + if (x > 0) + ImGui::SameLine(); + ImGui::PushID(y * 4 + x); + if (ImGui::Selectable("Sailor", selected[y][x] != 0, 0, ImVec2(50, 50))) + { + // Toggle clicked cell + toggle neighbors + selected[y][x] ^= 1; + if (x > 0) { selected[y][x - 1] ^= 1; } + if (x < 3) { selected[y][x + 1] ^= 1; } + if (y > 0) { selected[y - 1][x] ^= 1; } + if (y < 3) { selected[y + 1][x] ^= 1; } + } + ImGui::PopID(); + } + + if (winning_state) + ImGui::PopStyleVar(); + ImGui::TreePop(); + } + IMGUI_DEMO_MARKER("Widgets/Selectables/Alignment"); + if (ImGui::TreeNode("Alignment")) + { + HelpMarker( + "By default, Selectables uses style.SelectableTextAlign but it can be overridden on a per-item " + "basis using PushStyleVar(). You'll probably want to always keep your default situation to " + "left-align otherwise it becomes difficult to layout multiple items on a same line"); + static bool selected[3 * 3] = { true, false, true, false, true, false, true, false, true }; + for (int y = 0; y < 3; y++) + { + for (int x = 0; x < 3; x++) + { + ImVec2 alignment = ImVec2((float)x / 2.0f, (float)y / 2.0f); + char name[32]; + sprintf(name, "(%.1f,%.1f)", alignment.x, alignment.y); + if (x > 0) ImGui::SameLine(); + ImGui::PushStyleVar(ImGuiStyleVar_SelectableTextAlign, alignment); + ImGui::Selectable(name, &selected[3 * y + x], ImGuiSelectableFlags_None, ImVec2(80, 80)); + ImGui::PopStyleVar(); + } + } + ImGui::TreePop(); + } + ImGui::TreePop(); + } +} + +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowWidgetsSelectionAndMultiSelect() +//----------------------------------------------------------------------------- +// Multi-selection demos +// Also read: https://github.com/ocornut/imgui/wiki/Multi-Select +//----------------------------------------------------------------------------- + +static const char* ExampleNames[] = +{ + "Artichoke", "Arugula", "Asparagus", "Avocado", "Bamboo Shoots", "Bean Sprouts", "Beans", "Beet", "Belgian Endive", "Bell Pepper", + "Bitter Gourd", "Bok Choy", "Broccoli", "Brussels Sprouts", "Burdock Root", "Cabbage", "Calabash", "Capers", "Carrot", "Cassava", + "Cauliflower", "Celery", "Celery Root", "Celcuce", "Chayote", "Chinese Broccoli", "Corn", "Cucumber" +}; + +// Extra functions to add deletion support to ImGuiSelectionBasicStorage +struct ExampleSelectionWithDeletion : ImGuiSelectionBasicStorage +{ + // Find which item should be Focused after deletion. + // Call _before_ item submission. Retunr an index in the before-deletion item list, your item loop should call SetKeyboardFocusHere() on it. + // The subsequent ApplyDeletionPostLoop() code will use it to apply Selection. + // - We cannot provide this logic in core Dear ImGui because we don't have access to selection data. + // - We don't actually manipulate the ImVector<> here, only in ApplyDeletionPostLoop(), but using similar API for consistency and flexibility. + // - Important: Deletion only works if the underlying ImGuiID for your items are stable: aka not depend on their index, but on e.g. item id/ptr. + // FIXME-MULTISELECT: Doesn't take account of the possibility focus target will be moved during deletion. Need refocus or scroll offset. + int ApplyDeletionPreLoop(ImGuiMultiSelectIO* ms_io, int items_count) + { + if (Size == 0) + return -1; + + // If focused item is not selected... + const int focused_idx = (int)ms_io->NavIdItem; // Index of currently focused item + if (ms_io->NavIdSelected == false) // This is merely a shortcut, == Contains(adapter->IndexToStorage(items, focused_idx)) + { + ms_io->RangeSrcReset = true; // Request to recover RangeSrc from NavId next frame. Would be ok to reset even when NavIdSelected==true, but it would take an extra frame to recover RangeSrc when deleting a selected item. + return focused_idx; // Request to focus same item after deletion. + } + + // If focused item is selected: land on first unselected item after focused item. + for (int idx = focused_idx + 1; idx < items_count; idx++) + if (!Contains(GetStorageIdFromIndex(idx))) + return idx; + + // If focused item is selected: otherwise return last unselected item before focused item. + for (int idx = IM_MIN(focused_idx, items_count) - 1; idx >= 0; idx--) + if (!Contains(GetStorageIdFromIndex(idx))) + return idx; + + return -1; + } + + // Rewrite item list (delete items) + update selection. + // - Call after EndMultiSelect() + // - We cannot provide this logic in core Dear ImGui because we don't have access to your items, nor to selection data. + template + void ApplyDeletionPostLoop(ImGuiMultiSelectIO* ms_io, ImVector& items, int item_curr_idx_to_select) + { + // Rewrite item list (delete items) + convert old selection index (before deletion) to new selection index (after selection). + // If NavId was not part of selection, we will stay on same item. + ImVector new_items; + new_items.reserve(items.Size - Size); + int item_next_idx_to_select = -1; + for (int idx = 0; idx < items.Size; idx++) + { + if (!Contains(GetStorageIdFromIndex(idx))) + new_items.push_back(items[idx]); + if (item_curr_idx_to_select == idx) + item_next_idx_to_select = new_items.Size - 1; + } + items.swap(new_items); + + // Update selection + Clear(); + if (item_next_idx_to_select != -1 && ms_io->NavIdSelected) + SetItemSelected(GetStorageIdFromIndex(item_next_idx_to_select), true); + } +}; + +// Example: Implement dual list box storage and interface +struct ExampleDualListBox +{ + ImVector Items[2]; // ID is index into ExampleName[] + ImGuiSelectionBasicStorage Selections[2]; // Store ExampleItemId into selection + bool OptKeepSorted = true; + + void MoveAll(int src, int dst) + { + IM_ASSERT((src == 0 && dst == 1) || (src == 1 && dst == 0)); + for (ImGuiID item_id : Items[src]) + Items[dst].push_back(item_id); + Items[src].clear(); + SortItems(dst); + Selections[src].Swap(Selections[dst]); + Selections[src].Clear(); + } + void MoveSelected(int src, int dst) + { + for (int src_n = 0; src_n < Items[src].Size; src_n++) + { + ImGuiID item_id = Items[src][src_n]; + if (!Selections[src].Contains(item_id)) + continue; + Items[src].erase(&Items[src][src_n]); // FIXME-OPT: Could be implemented more optimally (rebuild src items and swap) + Items[dst].push_back(item_id); + src_n--; + } + if (OptKeepSorted) + SortItems(dst); + Selections[src].Swap(Selections[dst]); + Selections[src].Clear(); + } + void ApplySelectionRequests(ImGuiMultiSelectIO* ms_io, int side) + { + // In this example we store item id in selection (instead of item index) + Selections[side].UserData = Items[side].Data; + Selections[side].AdapterIndexToStorageId = [](ImGuiSelectionBasicStorage* self, int idx) { ImGuiID* items = (ImGuiID*)self->UserData; return items[idx]; }; + Selections[side].ApplyRequests(ms_io); + } + static int IMGUI_CDECL CompareItemsByValue(const void* lhs, const void* rhs) + { + const int* a = (const int*)lhs; + const int* b = (const int*)rhs; + return (*a - *b) > 0 ? +1 : -1; + } + void SortItems(int n) + { + qsort(Items[n].Data, (size_t)Items[n].Size, sizeof(Items[n][0]), CompareItemsByValue); + } + void Show() + { + //ImGui::Checkbox("Sorted", &OptKeepSorted); + if (ImGui::BeginTable("split", 3, ImGuiTableFlags_None)) + { + ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch); // Left side + ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthFixed); // Buttons + ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch); // Right side + ImGui::TableNextRow(); + + int request_move_selected = -1; + int request_move_all = -1; + float child_height_0 = 0.0f; + for (int side = 0; side < 2; side++) + { + // FIXME-MULTISELECT: Dual List Box: Add context menus + // FIXME-NAV: Using ImGuiWindowFlags_NavFlattened exhibit many issues. + ImVector& items = Items[side]; + ImGuiSelectionBasicStorage& selection = Selections[side]; + + ImGui::TableSetColumnIndex((side == 0) ? 0 : 2); + ImGui::Text("%s (%d)", (side == 0) ? "Available" : "Basket", items.Size); + + // Submit scrolling range to avoid glitches on moving/deletion + const float items_height = ImGui::GetTextLineHeightWithSpacing(); + ImGui::SetNextWindowContentSize(ImVec2(0.0f, items.Size * items_height)); + + bool child_visible; + if (side == 0) + { + // Left child is resizable + ImGui::SetNextWindowSizeConstraints(ImVec2(0.0f, ImGui::GetFrameHeightWithSpacing() * 4), ImVec2(FLT_MAX, FLT_MAX)); + child_visible = ImGui::BeginChild("0", ImVec2(-FLT_MIN, ImGui::GetFontSize() * 20), ImGuiChildFlags_FrameStyle | ImGuiChildFlags_ResizeY); + child_height_0 = ImGui::GetWindowSize().y; + } + else + { + // Right child use same height as left one + child_visible = ImGui::BeginChild("1", ImVec2(-FLT_MIN, child_height_0), ImGuiChildFlags_FrameStyle); + } + if (child_visible) + { + ImGuiMultiSelectFlags flags = ImGuiMultiSelectFlags_None; + ImGuiMultiSelectIO* ms_io = ImGui::BeginMultiSelect(flags, selection.Size, items.Size); + ApplySelectionRequests(ms_io, side); + + for (int item_n = 0; item_n < items.Size; item_n++) + { + ImGuiID item_id = items[item_n]; + bool item_is_selected = selection.Contains(item_id); + ImGui::SetNextItemSelectionUserData(item_n); + ImGui::Selectable(ExampleNames[item_id], item_is_selected, ImGuiSelectableFlags_AllowDoubleClick); + if (ImGui::IsItemFocused()) + { + // FIXME-MULTISELECT: Dual List Box: Transfer focus + if (ImGui::IsKeyPressed(ImGuiKey_Enter) || ImGui::IsKeyPressed(ImGuiKey_KeypadEnter)) + request_move_selected = side; + if (ImGui::IsMouseDoubleClicked(0)) // FIXME-MULTISELECT: Double-click on multi-selection? + request_move_selected = side; + } + } + + ms_io = ImGui::EndMultiSelect(); + ApplySelectionRequests(ms_io, side); + } + ImGui::EndChild(); + } + + // Buttons columns + ImGui::TableSetColumnIndex(1); + ImGui::NewLine(); + //ImVec2 button_sz = { ImGui::CalcTextSize(">>").x + ImGui::GetStyle().FramePadding.x * 2.0f, ImGui::GetFrameHeight() + padding.y * 2.0f }; + ImVec2 button_sz = { ImGui::GetFrameHeight(), ImGui::GetFrameHeight() }; + + // (Using BeginDisabled()/EndDisabled() works but feels distracting given how it is currently visualized) + if (ImGui::Button(">>", button_sz)) + request_move_all = 0; + if (ImGui::Button(">", button_sz)) + request_move_selected = 0; + if (ImGui::Button("<", button_sz)) + request_move_selected = 1; + if (ImGui::Button("<<", button_sz)) + request_move_all = 1; + + // Process requests + if (request_move_all != -1) + MoveAll(request_move_all, request_move_all ^ 1); + if (request_move_selected != -1) + MoveSelected(request_move_selected, request_move_selected ^ 1); + + // FIXME-MULTISELECT: Support action from outside + /* + if (OptKeepSorted == false) + { + ImGui::NewLine(); + if (ImGui::ArrowButton("MoveUp", ImGuiDir_Up)) {} + if (ImGui::ArrowButton("MoveDown", ImGuiDir_Down)) {} + } + */ + + ImGui::EndTable(); + } + } +}; + +static void DemoWindowWidgetsSelectionAndMultiSelect(ImGuiDemoWindowData* demo_data) +{ + IMGUI_DEMO_MARKER("Widgets/Selection State & Multi-Select"); + if (ImGui::TreeNode("Selection State & Multi-Select")) + { + HelpMarker("Selections can be built using Selectable(), TreeNode() or other widgets. Selection state is owned by application code/data."); + + // Without any fancy API: manage single-selection yourself. + IMGUI_DEMO_MARKER("Widgets/Selection State/Single-Select"); + if (ImGui::TreeNode("Single-Select")) + { + static int selected = -1; + for (int n = 0; n < 5; n++) { char buf[32]; - sprintf(buf, "%03d", i); - ImGui::Button(buf, ImVec2(-1.0f, 0.0f)); - ImGui::NextColumn(); + sprintf(buf, "Object %d", n); + if (ImGui::Selectable(buf, selected == n)) + selected = n; + } + ImGui::TreePop(); + } + + // Demonstrate implementation a most-basic form of multi-selection manually + // This doesn't support the SHIFT modifier which requires BeginMultiSelect()! + IMGUI_DEMO_MARKER("Widgets/Selection State/Multi-Select (manual/simplified, without BeginMultiSelect)"); + if (ImGui::TreeNode("Multi-Select (manual/simplified, without BeginMultiSelect)")) + { + HelpMarker("Hold CTRL and click to select multiple items."); + static bool selection[5] = { false, false, false, false, false }; + for (int n = 0; n < 5; n++) + { + char buf[32]; + sprintf(buf, "Object %d", n); + if (ImGui::Selectable(buf, selection[n])) + { + if (!ImGui::GetIO().KeyCtrl) // Clear selection when CTRL is not held + memset(selection, 0, sizeof(selection)); + selection[n] ^= 1; // Toggle current item + } + } + ImGui::TreePop(); + } + + // Demonstrate handling proper multi-selection using the BeginMultiSelect/EndMultiSelect API. + // SHIFT+Click w/ CTRL and other standard features are supported. + // We use the ImGuiSelectionBasicStorage helper which you may freely reimplement. + IMGUI_DEMO_MARKER("Widgets/Selection State/Multi-Select"); + if (ImGui::TreeNode("Multi-Select")) + { + ImGui::Text("Supported features:"); + ImGui::BulletText("Keyboard navigation (arrows, page up/down, home/end, space)."); + ImGui::BulletText("Ctrl modifier to preserve and toggle selection."); + ImGui::BulletText("Shift modifier for range selection."); + ImGui::BulletText("CTRL+A to select all."); + ImGui::BulletText("Escape to clear selection."); + ImGui::BulletText("Click and drag to box-select."); + ImGui::Text("Tip: Use 'Demo->Tools->Debug Log->Selection' to see selection requests as they happen."); + + // Use default selection.Adapter: Pass index to SetNextItemSelectionUserData(), store index in Selection + const int ITEMS_COUNT = 50; + static ImGuiSelectionBasicStorage selection; + ImGui::Text("Selection: %d/%d", selection.Size, ITEMS_COUNT); + + // The BeginChild() has no purpose for selection logic, other that offering a scrolling region. + if (ImGui::BeginChild("##Basket", ImVec2(-FLT_MIN, ImGui::GetFontSize() * 20), ImGuiChildFlags_FrameStyle | ImGuiChildFlags_ResizeY)) + { + ImGuiMultiSelectFlags flags = ImGuiMultiSelectFlags_ClearOnEscape | ImGuiMultiSelectFlags_BoxSelect1d; + ImGuiMultiSelectIO* ms_io = ImGui::BeginMultiSelect(flags, selection.Size, ITEMS_COUNT); + selection.ApplyRequests(ms_io); + + for (int n = 0; n < ITEMS_COUNT; n++) + { + char label[64]; + sprintf(label, "Object %05d: %s", n, ExampleNames[n % IM_ARRAYSIZE(ExampleNames)]); + bool item_is_selected = selection.Contains((ImGuiID)n); + ImGui::SetNextItemSelectionUserData(n); + ImGui::Selectable(label, item_is_selected); + } + + ms_io = ImGui::EndMultiSelect(); + selection.ApplyRequests(ms_io); } ImGui::EndChild(); - ImGui::PopStyleVar(); + ImGui::TreePop(); } - ImGui::Separator(); - - // Demonstrate a few extra things - // - Changing ImGuiCol_ChildBg (which is transparent black in default styles) - // - Using SetCursorPos() to position the child window (because the child window is an item from the POV of the parent window) - // You can also call SetNextWindowPos() to position the child window. The parent window will effectively layout from this position. - // - Using ImGui::GetItemRectMin/Max() to query the "item" state (because the child window is an item from the POV of the parent window) - // See "Widgets" -> "Querying Status (Active/Focused/Hovered etc.)" section for more details about this. + // Demonstrate using the clipper with BeginMultiSelect()/EndMultiSelect() + IMGUI_DEMO_MARKER("Widgets/Selection State/Multi-Select (with clipper)"); + if (ImGui::TreeNode("Multi-Select (with clipper)")) { - ImGui::SetCursorPosX(50); - ImGui::PushStyleColor(ImGuiCol_ChildBg, IM_COL32(255, 0, 0, 100)); - ImGui::BeginChild("blah", ImVec2(200, 100), true, ImGuiWindowFlags_None); - for (int n = 0; n < 50; n++) - ImGui::Text("Some test %d", n); + // Use default selection.Adapter: Pass index to SetNextItemSelectionUserData(), store index in Selection + static ImGuiSelectionBasicStorage selection; + + ImGui::Text("Added features:"); + ImGui::BulletText("Using ImGuiListClipper."); + + const int ITEMS_COUNT = 10000; + ImGui::Text("Selection: %d/%d", selection.Size, ITEMS_COUNT); + if (ImGui::BeginChild("##Basket", ImVec2(-FLT_MIN, ImGui::GetFontSize() * 20), ImGuiChildFlags_FrameStyle | ImGuiChildFlags_ResizeY)) + { + ImGuiMultiSelectFlags flags = ImGuiMultiSelectFlags_ClearOnEscape | ImGuiMultiSelectFlags_BoxSelect1d; + ImGuiMultiSelectIO* ms_io = ImGui::BeginMultiSelect(flags, selection.Size, ITEMS_COUNT); + selection.ApplyRequests(ms_io); + + ImGuiListClipper clipper; + clipper.Begin(ITEMS_COUNT); + if (ms_io->RangeSrcItem != -1) + clipper.IncludeItemByIndex((int)ms_io->RangeSrcItem); // Ensure RangeSrc item is not clipped. + while (clipper.Step()) + { + for (int n = clipper.DisplayStart; n < clipper.DisplayEnd; n++) + { + char label[64]; + sprintf(label, "Object %05d: %s", n, ExampleNames[n % IM_ARRAYSIZE(ExampleNames)]); + bool item_is_selected = selection.Contains((ImGuiID)n); + ImGui::SetNextItemSelectionUserData(n); + ImGui::Selectable(label, item_is_selected); + } + } + + ms_io = ImGui::EndMultiSelect(); + selection.ApplyRequests(ms_io); + } ImGui::EndChild(); - ImVec2 child_rect_min = ImGui::GetItemRectMin(); - ImVec2 child_rect_max = ImGui::GetItemRectMax(); - ImGui::PopStyleColor(); - ImGui::Text("Rect of child window is: (%.0f,%.0f) (%.0f,%.0f)", child_rect_min.x, child_rect_min.y, child_rect_max.x, child_rect_max.y); + ImGui::TreePop(); } - ImGui::TreePop(); - } - - if (ImGui::TreeNode("Widgets Width")) - { - // Use SetNextItemWidth() to set the width of a single upcoming item. - // Use PushItemWidth()/PopItemWidth() to set the width of a group of items. - static float f = 0.0f; - ImGui::Text("SetNextItemWidth/PushItemWidth(100)"); - ImGui::SameLine(); HelpMarker("Fixed width."); - ImGui::SetNextItemWidth(100); - ImGui::DragFloat("float##1", &f); - - ImGui::Text("SetNextItemWidth/PushItemWidth(GetWindowWidth() * 0.5f)"); - ImGui::SameLine(); HelpMarker("Half of window width."); - ImGui::SetNextItemWidth(ImGui::GetWindowWidth() * 0.5f); - ImGui::DragFloat("float##2", &f); - - ImGui::Text("SetNextItemWidth/PushItemWidth(GetContentRegionAvail().x * 0.5f)"); - ImGui::SameLine(); HelpMarker("Half of available width.\n(~ right-cursor_pos)\n(works within a column set)"); - ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x * 0.5f); - ImGui::DragFloat("float##3", &f); - - ImGui::Text("SetNextItemWidth/PushItemWidth(-100)"); - ImGui::SameLine(); HelpMarker("Align to right edge minus 100"); - ImGui::SetNextItemWidth(-100); - ImGui::DragFloat("float##4", &f); - - // Demonstrate using PushItemWidth to surround three items. Calling SetNextItemWidth() before each of them would have the same effect. - ImGui::Text("SetNextItemWidth/PushItemWidth(-1)"); - ImGui::SameLine(); HelpMarker("Align to right edge"); - ImGui::PushItemWidth(-1); - ImGui::DragFloat("float##5a", &f); - ImGui::DragFloat("float##5b", &f); - ImGui::DragFloat("float##5c", &f); - ImGui::PopItemWidth(); - - ImGui::TreePop(); - } - - if (ImGui::TreeNode("Basic Horizontal Layout")) - { - ImGui::TextWrapped("(Use ImGui::SameLine() to keep adding items to the right of the preceding item)"); - - // Text - ImGui::Text("Two items: Hello"); ImGui::SameLine(); - ImGui::TextColored(ImVec4(1,1,0,1), "Sailor"); - - // Adjust spacing - ImGui::Text("More spacing: Hello"); ImGui::SameLine(0, 20); - ImGui::TextColored(ImVec4(1,1,0,1), "Sailor"); - - // Button - ImGui::AlignTextToFramePadding(); - ImGui::Text("Normal buttons"); ImGui::SameLine(); - ImGui::Button("Banana"); ImGui::SameLine(); - ImGui::Button("Apple"); ImGui::SameLine(); - ImGui::Button("Corniflower"); - - // Button - ImGui::Text("Small buttons"); ImGui::SameLine(); - ImGui::SmallButton("Like this one"); ImGui::SameLine(); - ImGui::Text("can fit within a text block."); - - // Aligned to arbitrary position. Easy/cheap column. - ImGui::Text("Aligned"); - ImGui::SameLine(150); ImGui::Text("x=150"); - ImGui::SameLine(300); ImGui::Text("x=300"); - ImGui::Text("Aligned"); - ImGui::SameLine(150); ImGui::SmallButton("x=150"); - ImGui::SameLine(300); ImGui::SmallButton("x=300"); - - // Checkbox - static bool c1 = false, c2 = false, c3 = false, c4 = false; - ImGui::Checkbox("My", &c1); ImGui::SameLine(); - ImGui::Checkbox("Tailor", &c2); ImGui::SameLine(); - ImGui::Checkbox("Is", &c3); ImGui::SameLine(); - ImGui::Checkbox("Rich", &c4); - - // Various - static float f0 = 1.0f, f1 = 2.0f, f2 = 3.0f; - ImGui::PushItemWidth(80); - const char* items[] = { "AAAA", "BBBB", "CCCC", "DDDD" }; - static int item = -1; - ImGui::Combo("Combo", &item, items, IM_ARRAYSIZE(items)); ImGui::SameLine(); - ImGui::SliderFloat("X", &f0, 0.0f, 5.0f); ImGui::SameLine(); - ImGui::SliderFloat("Y", &f1, 0.0f, 5.0f); ImGui::SameLine(); - ImGui::SliderFloat("Z", &f2, 0.0f, 5.0f); - ImGui::PopItemWidth(); - - ImGui::PushItemWidth(80); - ImGui::Text("Lists:"); - static int selection[4] = { 0, 1, 2, 3 }; - for (int i = 0; i < 4; i++) + // Demonstrate dynamic item list + deletion support using the BeginMultiSelect/EndMultiSelect API. + // In order to support Deletion without any glitches you need to: + // - (1) If items are submitted in their own scrolling area, submit contents size SetNextWindowContentSize() ahead of time to prevent one-frame readjustment of scrolling. + // - (2) Items needs to have persistent ID Stack identifier = ID needs to not depends on their index. PushID(index) = KO. PushID(item_id) = OK. This is in order to focus items reliably after a selection. + // - (3) BeginXXXX process + // - (4) Focus process + // - (5) EndXXXX process + IMGUI_DEMO_MARKER("Widgets/Selection State/Multi-Select (with deletion)"); + if (ImGui::TreeNode("Multi-Select (with deletion)")) { - if (i > 0) ImGui::SameLine(); - ImGui::PushID(i); - ImGui::ListBox("", &selection[i], items, IM_ARRAYSIZE(items)); - ImGui::PopID(); - //if (ImGui::IsItemHovered()) ImGui::SetTooltip("ListBox %d hovered", i); + // Storing items data separately from selection data. + // (you may decide to store selection data inside your item (aka intrusive storage) if you don't need multiple views over same items) + // Use a custom selection.Adapter: store item identifier in Selection (instead of index) + static ImVector items; + static ExampleSelectionWithDeletion selection; + selection.UserData = (void*)&items; + selection.AdapterIndexToStorageId = [](ImGuiSelectionBasicStorage* self, int idx) { ImVector* p_items = (ImVector*)self->UserData; return (*p_items)[idx]; }; // Index -> ID + + ImGui::Text("Added features:"); + ImGui::BulletText("Dynamic list with Delete key support."); + ImGui::Text("Selection size: %d/%d", selection.Size, items.Size); + + // Initialize default list with 50 items + button to add/remove items. + static ImGuiID items_next_id = 0; + if (items_next_id == 0) + for (ImGuiID n = 0; n < 50; n++) + items.push_back(items_next_id++); + if (ImGui::SmallButton("Add 20 items")) { for (int n = 0; n < 20; n++) { items.push_back(items_next_id++); } } + ImGui::SameLine(); + if (ImGui::SmallButton("Remove 20 items")) { for (int n = IM_MIN(20, items.Size); n > 0; n--) { selection.SetItemSelected(items.back(), false); items.pop_back(); } } + + // (1) Extra to support deletion: Submit scrolling range to avoid glitches on deletion + const float items_height = ImGui::GetTextLineHeightWithSpacing(); + ImGui::SetNextWindowContentSize(ImVec2(0.0f, items.Size * items_height)); + + if (ImGui::BeginChild("##Basket", ImVec2(-FLT_MIN, ImGui::GetFontSize() * 20), ImGuiChildFlags_FrameStyle | ImGuiChildFlags_ResizeY)) + { + ImGuiMultiSelectFlags flags = ImGuiMultiSelectFlags_ClearOnEscape | ImGuiMultiSelectFlags_BoxSelect1d; + ImGuiMultiSelectIO* ms_io = ImGui::BeginMultiSelect(flags, selection.Size, items.Size); + selection.ApplyRequests(ms_io); + + const bool want_delete = ImGui::Shortcut(ImGuiKey_Delete, ImGuiInputFlags_Repeat) && (selection.Size > 0); + const int item_curr_idx_to_focus = want_delete ? selection.ApplyDeletionPreLoop(ms_io, items.Size) : -1; + + for (int n = 0; n < items.Size; n++) + { + const ImGuiID item_id = items[n]; + char label[64]; + sprintf(label, "Object %05u: %s", item_id, ExampleNames[item_id % IM_ARRAYSIZE(ExampleNames)]); + + bool item_is_selected = selection.Contains(item_id); + ImGui::SetNextItemSelectionUserData(n); + ImGui::Selectable(label, item_is_selected); + if (item_curr_idx_to_focus == n) + ImGui::SetKeyboardFocusHere(-1); + } + + // Apply multi-select requests + ms_io = ImGui::EndMultiSelect(); + selection.ApplyRequests(ms_io); + if (want_delete) + selection.ApplyDeletionPostLoop(ms_io, items, item_curr_idx_to_focus); + } + ImGui::EndChild(); + ImGui::TreePop(); } - ImGui::PopItemWidth(); - // Dummy - ImVec2 button_sz(40, 40); - ImGui::Button("A", button_sz); ImGui::SameLine(); - ImGui::Dummy(button_sz); ImGui::SameLine(); - ImGui::Button("B", button_sz); - - // Manually wrapping (we should eventually provide this as an automatic layout feature, but for now you can do it manually) - ImGui::Text("Manually wrapping:"); - ImGuiStyle& style = ImGui::GetStyle(); - int buttons_count = 20; - float window_visible_x2 = ImGui::GetWindowPos().x + ImGui::GetWindowContentRegionMax().x; - for (int n = 0; n < buttons_count; n++) + // Implement a Dual List Box (#6648) + IMGUI_DEMO_MARKER("Widgets/Selection State/Multi-Select (dual list box)"); + if (ImGui::TreeNode("Multi-Select (dual list box)")) { - ImGui::PushID(n); - ImGui::Button("Box", button_sz); - float last_button_x2 = ImGui::GetItemRectMax().x; - float next_button_x2 = last_button_x2 + style.ItemSpacing.x + button_sz.x; // Expected position if next button was on same line - if (n + 1 < buttons_count && next_button_x2 < window_visible_x2) + // Init default state + static ExampleDualListBox dlb; + if (dlb.Items[0].Size == 0 && dlb.Items[1].Size == 0) + for (int item_id = 0; item_id < IM_ARRAYSIZE(ExampleNames); item_id++) + dlb.Items[0].push_back((ImGuiID)item_id); + + // Show + dlb.Show(); + + ImGui::TreePop(); + } + + // Demonstrate using the clipper with BeginMultiSelect()/EndMultiSelect() + IMGUI_DEMO_MARKER("Widgets/Selection State/Multi-Select (in a table)"); + if (ImGui::TreeNode("Multi-Select (in a table)")) + { + static ImGuiSelectionBasicStorage selection; + + const int ITEMS_COUNT = 10000; + ImGui::Text("Selection: %d/%d", selection.Size, ITEMS_COUNT); + if (ImGui::BeginTable("##Basket", 2, ImGuiTableFlags_ScrollY | ImGuiTableFlags_RowBg | ImGuiTableFlags_BordersOuter)) + { + ImGui::TableSetupColumn("Object"); + ImGui::TableSetupColumn("Action"); + ImGui::TableSetupScrollFreeze(0, 1); + ImGui::TableHeadersRow(); + + ImGuiMultiSelectFlags flags = ImGuiMultiSelectFlags_ClearOnEscape | ImGuiMultiSelectFlags_BoxSelect1d; + ImGuiMultiSelectIO* ms_io = ImGui::BeginMultiSelect(flags, selection.Size, ITEMS_COUNT); + selection.ApplyRequests(ms_io); + + ImGuiListClipper clipper; + clipper.Begin(ITEMS_COUNT); + if (ms_io->RangeSrcItem != -1) + clipper.IncludeItemByIndex((int)ms_io->RangeSrcItem); // Ensure RangeSrc item is not clipped. + while (clipper.Step()) + { + for (int n = clipper.DisplayStart; n < clipper.DisplayEnd; n++) + { + ImGui::TableNextRow(); + ImGui::TableNextColumn(); + char label[64]; + sprintf(label, "Object %05d: %s", n, ExampleNames[n % IM_ARRAYSIZE(ExampleNames)]); + bool item_is_selected = selection.Contains((ImGuiID)n); + ImGui::SetNextItemSelectionUserData(n); + ImGui::Selectable(label, item_is_selected, ImGuiSelectableFlags_SpanAllColumns | ImGuiSelectableFlags_AllowOverlap); + ImGui::TableNextColumn(); + ImGui::SmallButton("hello"); + } + } + + ms_io = ImGui::EndMultiSelect(); + selection.ApplyRequests(ms_io); + ImGui::EndTable(); + } + ImGui::TreePop(); + } + + IMGUI_DEMO_MARKER("Widgets/Selection State/Multi-Select (checkboxes)"); + if (ImGui::TreeNode("Multi-Select (checkboxes)")) + { + ImGui::Text("In a list of checkboxes (not selectable):"); + ImGui::BulletText("Using _NoAutoSelect + _NoAutoClear flags."); + ImGui::BulletText("Shift+Click to check multiple boxes."); + ImGui::BulletText("Shift+Keyboard to copy current value to other boxes."); + + // If you have an array of checkboxes, you may want to use NoAutoSelect + NoAutoClear and the ImGuiSelectionExternalStorage helper. + static bool items[20] = {}; + static ImGuiMultiSelectFlags flags = ImGuiMultiSelectFlags_NoAutoSelect | ImGuiMultiSelectFlags_NoAutoClear | ImGuiMultiSelectFlags_ClearOnEscape; + ImGui::CheckboxFlags("ImGuiMultiSelectFlags_NoAutoSelect", &flags, ImGuiMultiSelectFlags_NoAutoSelect); + ImGui::CheckboxFlags("ImGuiMultiSelectFlags_NoAutoClear", &flags, ImGuiMultiSelectFlags_NoAutoClear); + ImGui::CheckboxFlags("ImGuiMultiSelectFlags_BoxSelect2d", &flags, ImGuiMultiSelectFlags_BoxSelect2d); // Cannot use ImGuiMultiSelectFlags_BoxSelect1d as checkboxes are varying width. + + if (ImGui::BeginChild("##Basket", ImVec2(-FLT_MIN, ImGui::GetFontSize() * 20), ImGuiChildFlags_Borders | ImGuiChildFlags_ResizeY)) + { + ImGuiMultiSelectIO* ms_io = ImGui::BeginMultiSelect(flags, -1, IM_ARRAYSIZE(items)); + ImGuiSelectionExternalStorage storage_wrapper; + storage_wrapper.UserData = (void*)items; + storage_wrapper.AdapterSetItemSelected = [](ImGuiSelectionExternalStorage* self, int n, bool selected) { bool* array = (bool*)self->UserData; array[n] = selected; }; + storage_wrapper.ApplyRequests(ms_io); + for (int n = 0; n < 20; n++) + { + char label[32]; + sprintf(label, "Item %d", n); + ImGui::SetNextItemSelectionUserData(n); + ImGui::Checkbox(label, &items[n]); + } + ms_io = ImGui::EndMultiSelect(); + storage_wrapper.ApplyRequests(ms_io); + } + ImGui::EndChild(); + + ImGui::TreePop(); + } + + // Demonstrate individual selection scopes in same window + IMGUI_DEMO_MARKER("Widgets/Selection State/Multi-Select (multiple scopes)"); + if (ImGui::TreeNode("Multi-Select (multiple scopes)")) + { + // Use default select: Pass index to SetNextItemSelectionUserData(), store index in Selection + const int SCOPES_COUNT = 3; + const int ITEMS_COUNT = 8; // Per scope + static ImGuiSelectionBasicStorage selections_data[SCOPES_COUNT]; + + // Use ImGuiMultiSelectFlags_ScopeRect to not affect other selections in same window. + static ImGuiMultiSelectFlags flags = ImGuiMultiSelectFlags_ScopeRect | ImGuiMultiSelectFlags_ClearOnEscape;// | ImGuiMultiSelectFlags_ClearOnClickVoid; + if (ImGui::CheckboxFlags("ImGuiMultiSelectFlags_ScopeWindow", &flags, ImGuiMultiSelectFlags_ScopeWindow) && (flags & ImGuiMultiSelectFlags_ScopeWindow)) + flags &= ~ImGuiMultiSelectFlags_ScopeRect; + if (ImGui::CheckboxFlags("ImGuiMultiSelectFlags_ScopeRect", &flags, ImGuiMultiSelectFlags_ScopeRect) && (flags & ImGuiMultiSelectFlags_ScopeRect)) + flags &= ~ImGuiMultiSelectFlags_ScopeWindow; + ImGui::CheckboxFlags("ImGuiMultiSelectFlags_ClearOnClickVoid", &flags, ImGuiMultiSelectFlags_ClearOnClickVoid); + ImGui::CheckboxFlags("ImGuiMultiSelectFlags_BoxSelect1d", &flags, ImGuiMultiSelectFlags_BoxSelect1d); + + for (int selection_scope_n = 0; selection_scope_n < SCOPES_COUNT; selection_scope_n++) + { + ImGui::PushID(selection_scope_n); + ImGuiSelectionBasicStorage* selection = &selections_data[selection_scope_n]; + ImGuiMultiSelectIO* ms_io = ImGui::BeginMultiSelect(flags, selection->Size, ITEMS_COUNT); + selection->ApplyRequests(ms_io); + + ImGui::SeparatorText("Selection scope"); + ImGui::Text("Selection size: %d/%d", selection->Size, ITEMS_COUNT); + + for (int n = 0; n < ITEMS_COUNT; n++) + { + char label[64]; + sprintf(label, "Object %05d: %s", n, ExampleNames[n % IM_ARRAYSIZE(ExampleNames)]); + bool item_is_selected = selection->Contains((ImGuiID)n); + ImGui::SetNextItemSelectionUserData(n); + ImGui::Selectable(label, item_is_selected); + } + + // Apply multi-select requests + ms_io = ImGui::EndMultiSelect(); + selection->ApplyRequests(ms_io); + ImGui::PopID(); + } + ImGui::TreePop(); + } + + // See ShowExampleAppAssetsBrowser() + if (ImGui::TreeNode("Multi-Select (tiled assets browser)")) + { + ImGui::Checkbox("Assets Browser", &demo_data->ShowAppAssetsBrowser); + ImGui::Text("(also access from 'Examples->Assets Browser' in menu)"); + ImGui::TreePop(); + } + + // Demonstrate supporting multiple-selection in a tree. + // - We don't use linear indices for selection user data, but our ExampleTreeNode* pointer directly! + // This showcase how SetNextItemSelectionUserData() never assume indices! + // - The difficulty here is to "interpolate" from RangeSrcItem to RangeDstItem in the SetAll/SetRange request. + // We want this interpolation to match what the user sees: in visible order, skipping closed nodes. + // This is implemented by our TreeGetNextNodeInVisibleOrder() user-space helper. + // - Important: In a real codebase aiming to implement full-featured selectable tree with custom filtering, you + // are more likely to build an array mapping sequential indices to visible tree nodes, since your + // filtering/search + clipping process will benefit from it. Having this will make this interpolation much easier. + // - Consider this a prototype: we are working toward simplifying some of it. + IMGUI_DEMO_MARKER("Widgets/Selection State/Multi-Select (trees)"); + if (ImGui::TreeNode("Multi-Select (trees)")) + { + HelpMarker( + "This is rather advanced and experimental. If you are getting started with multi-select, " + "please don't start by looking at how to use it for a tree!\n\n" + "Future versions will try to simplify and formalize some of this."); + + struct ExampleTreeFuncs + { + static void DrawNode(ExampleTreeNode* node, ImGuiSelectionBasicStorage* selection) + { + ImGuiTreeNodeFlags tree_node_flags = ImGuiTreeNodeFlags_SpanAvailWidth | ImGuiTreeNodeFlags_OpenOnArrow | ImGuiTreeNodeFlags_OpenOnDoubleClick; + tree_node_flags |= ImGuiTreeNodeFlags_NavLeftJumpsBackHere; // Enable pressing left to jump to parent + if (node->Childs.Size == 0) + tree_node_flags |= ImGuiTreeNodeFlags_Bullet | ImGuiTreeNodeFlags_Leaf; + if (selection->Contains((ImGuiID)node->UID)) + tree_node_flags |= ImGuiTreeNodeFlags_Selected; + + // Using SetNextItemStorageID() to specify storage id, so we can easily peek into + // the storage holding open/close stage, using our TreeNodeGetOpen/TreeNodeSetOpen() functions. + ImGui::SetNextItemSelectionUserData((ImGuiSelectionUserData)(intptr_t)node); + ImGui::SetNextItemStorageID((ImGuiID)node->UID); + if (ImGui::TreeNodeEx(node->Name, tree_node_flags)) + { + for (ExampleTreeNode* child : node->Childs) + DrawNode(child, selection); + ImGui::TreePop(); + } + else if (ImGui::IsItemToggledOpen()) + { + TreeCloseAndUnselectChildNodes(node, selection); + } + } + + static bool TreeNodeGetOpen(ExampleTreeNode* node) + { + return ImGui::GetStateStorage()->GetBool((ImGuiID)node->UID); + } + + static void TreeNodeSetOpen(ExampleTreeNode* node, bool open) + { + ImGui::GetStateStorage()->SetBool((ImGuiID)node->UID, open); + } + + // When closing a node: 1) close and unselect all child nodes, 2) select parent if any child was selected. + // FIXME: This is currently handled by user logic but I'm hoping to eventually provide tree node + // features to do this automatically, e.g. a ImGuiTreeNodeFlags_AutoCloseChildNodes etc. + static int TreeCloseAndUnselectChildNodes(ExampleTreeNode* node, ImGuiSelectionBasicStorage* selection, int depth = 0) + { + // Recursive close (the test for depth == 0 is because we call this on a node that was just closed!) + int unselected_count = selection->Contains((ImGuiID)node->UID) ? 1 : 0; + if (depth == 0 || TreeNodeGetOpen(node)) + { + for (ExampleTreeNode* child : node->Childs) + unselected_count += TreeCloseAndUnselectChildNodes(child, selection, depth + 1); + TreeNodeSetOpen(node, false); + } + + // Select root node if any of its child was selected, otherwise unselect + selection->SetItemSelected((ImGuiID)node->UID, (depth == 0 && unselected_count > 0)); + return unselected_count; + } + + // Apply multi-selection requests + static void ApplySelectionRequests(ImGuiMultiSelectIO* ms_io, ExampleTreeNode* tree, ImGuiSelectionBasicStorage* selection) + { + for (ImGuiSelectionRequest& req : ms_io->Requests) + { + if (req.Type == ImGuiSelectionRequestType_SetAll) + { + if (req.Selected) + TreeSetAllInOpenNodes(tree, selection, req.Selected); + else + selection->Clear(); + } + else if (req.Type == ImGuiSelectionRequestType_SetRange) + { + ExampleTreeNode* first_node = (ExampleTreeNode*)(intptr_t)req.RangeFirstItem; + ExampleTreeNode* last_node = (ExampleTreeNode*)(intptr_t)req.RangeLastItem; + for (ExampleTreeNode* node = first_node; node != NULL; node = TreeGetNextNodeInVisibleOrder(node, last_node)) + selection->SetItemSelected((ImGuiID)node->UID, req.Selected); + } + } + } + + static void TreeSetAllInOpenNodes(ExampleTreeNode* node, ImGuiSelectionBasicStorage* selection, bool selected) + { + if (node->Parent != NULL) // Root node isn't visible nor selectable in our scheme + selection->SetItemSelected((ImGuiID)node->UID, selected); + if (node->Parent == NULL || TreeNodeGetOpen(node)) + for (ExampleTreeNode* child : node->Childs) + TreeSetAllInOpenNodes(child, selection, selected); + } + + // Interpolate in *user-visible order* AND only *over opened nodes*. + // If you have a sequential mapping tables (e.g. generated after a filter/search pass) this would be simpler. + // Here the tricks are that: + // - we store/maintain ExampleTreeNode::IndexInParent which allows implementing a linear iterator easily, without searches, without recursion. + // this could be replaced by a search in parent, aka 'int index_in_parent = curr_node->Parent->Childs.find_index(curr_node)' + // which would only be called when crossing from child to a parent, aka not too much. + // - we call SetNextItemStorageID() before our TreeNode() calls with an ID which doesn't relate to UI stack, + // making it easier to call TreeNodeGetOpen()/TreeNodeSetOpen() from any location. + static ExampleTreeNode* TreeGetNextNodeInVisibleOrder(ExampleTreeNode* curr_node, ExampleTreeNode* last_node) + { + // Reached last node + if (curr_node == last_node) + return NULL; + + // Recurse into childs. Query storage to tell if the node is open. + if (curr_node->Childs.Size > 0 && TreeNodeGetOpen(curr_node)) + return curr_node->Childs[0]; + + // Next sibling, then into our own parent + while (curr_node->Parent != NULL) + { + if (curr_node->IndexInParent + 1 < curr_node->Parent->Childs.Size) + return curr_node->Parent->Childs[curr_node->IndexInParent + 1]; + curr_node = curr_node->Parent; + } + return NULL; + } + + }; // ExampleTreeFuncs + + static ImGuiSelectionBasicStorage selection; + if (demo_data->DemoTree == NULL) + demo_data->DemoTree = ExampleTree_CreateDemoTree(); // Create tree once + ImGui::Text("Selection size: %d", selection.Size); + + if (ImGui::BeginChild("##Tree", ImVec2(-FLT_MIN, ImGui::GetFontSize() * 20), ImGuiChildFlags_FrameStyle | ImGuiChildFlags_ResizeY)) + { + ExampleTreeNode* tree = demo_data->DemoTree; + ImGuiMultiSelectFlags ms_flags = ImGuiMultiSelectFlags_ClearOnEscape | ImGuiMultiSelectFlags_BoxSelect2d; + ImGuiMultiSelectIO* ms_io = ImGui::BeginMultiSelect(ms_flags, selection.Size, -1); + ExampleTreeFuncs::ApplySelectionRequests(ms_io, tree, &selection); + for (ExampleTreeNode* node : tree->Childs) + ExampleTreeFuncs::DrawNode(node, &selection); + ms_io = ImGui::EndMultiSelect(); + ExampleTreeFuncs::ApplySelectionRequests(ms_io, tree, &selection); + } + ImGui::EndChild(); + + ImGui::TreePop(); + } + + // Advanced demonstration of BeginMultiSelect() + // - Showcase clipping. + // - Showcase deletion. + // - Showcase basic drag and drop. + // - Showcase TreeNode variant (note that tree node don't expand in the demo: supporting expanding tree nodes + clipping a separate thing). + // - Showcase using inside a table. + IMGUI_DEMO_MARKER("Widgets/Selection State/Multi-Select (advanced)"); + //ImGui::SetNextItemOpen(true, ImGuiCond_Once); + if (ImGui::TreeNode("Multi-Select (advanced)")) + { + // Options + enum WidgetType { WidgetType_Selectable, WidgetType_TreeNode }; + static bool use_clipper = true; + static bool use_deletion = true; + static bool use_drag_drop = true; + static bool show_in_table = false; + static bool show_color_button = true; + static ImGuiMultiSelectFlags flags = ImGuiMultiSelectFlags_ClearOnEscape | ImGuiMultiSelectFlags_BoxSelect1d; + static WidgetType widget_type = WidgetType_Selectable; + + if (ImGui::TreeNode("Options")) + { + if (ImGui::RadioButton("Selectables", widget_type == WidgetType_Selectable)) { widget_type = WidgetType_Selectable; } ImGui::SameLine(); - ImGui::PopID(); - } + if (ImGui::RadioButton("Tree nodes", widget_type == WidgetType_TreeNode)) { widget_type = WidgetType_TreeNode; } + ImGui::SameLine(); + HelpMarker("TreeNode() is technically supported but... using this correctly is more complicated (you need some sort of linear/random access to your tree, which is suited to advanced trees setups already implementing filters and clipper. We will work toward simplifying and demoing this.\n\nFor now the tree demo is actually a little bit meaningless because it is an empty tree with only root nodes."); + ImGui::Checkbox("Enable clipper", &use_clipper); + ImGui::Checkbox("Enable deletion", &use_deletion); + ImGui::Checkbox("Enable drag & drop", &use_drag_drop); + ImGui::Checkbox("Show in a table", &show_in_table); + ImGui::Checkbox("Show color button", &show_color_button); + ImGui::CheckboxFlags("ImGuiMultiSelectFlags_SingleSelect", &flags, ImGuiMultiSelectFlags_SingleSelect); + ImGui::CheckboxFlags("ImGuiMultiSelectFlags_NoSelectAll", &flags, ImGuiMultiSelectFlags_NoSelectAll); + ImGui::CheckboxFlags("ImGuiMultiSelectFlags_NoRangeSelect", &flags, ImGuiMultiSelectFlags_NoRangeSelect); + ImGui::CheckboxFlags("ImGuiMultiSelectFlags_NoAutoSelect", &flags, ImGuiMultiSelectFlags_NoAutoSelect); + ImGui::CheckboxFlags("ImGuiMultiSelectFlags_NoAutoClear", &flags, ImGuiMultiSelectFlags_NoAutoClear); + ImGui::CheckboxFlags("ImGuiMultiSelectFlags_NoAutoClearOnReselect", &flags, ImGuiMultiSelectFlags_NoAutoClearOnReselect); + ImGui::CheckboxFlags("ImGuiMultiSelectFlags_BoxSelect1d", &flags, ImGuiMultiSelectFlags_BoxSelect1d); + ImGui::CheckboxFlags("ImGuiMultiSelectFlags_BoxSelect2d", &flags, ImGuiMultiSelectFlags_BoxSelect2d); + ImGui::CheckboxFlags("ImGuiMultiSelectFlags_BoxSelectNoScroll", &flags, ImGuiMultiSelectFlags_BoxSelectNoScroll); + ImGui::CheckboxFlags("ImGuiMultiSelectFlags_ClearOnEscape", &flags, ImGuiMultiSelectFlags_ClearOnEscape); + ImGui::CheckboxFlags("ImGuiMultiSelectFlags_ClearOnClickVoid", &flags, ImGuiMultiSelectFlags_ClearOnClickVoid); + if (ImGui::CheckboxFlags("ImGuiMultiSelectFlags_ScopeWindow", &flags, ImGuiMultiSelectFlags_ScopeWindow) && (flags & ImGuiMultiSelectFlags_ScopeWindow)) + flags &= ~ImGuiMultiSelectFlags_ScopeRect; + if (ImGui::CheckboxFlags("ImGuiMultiSelectFlags_ScopeRect", &flags, ImGuiMultiSelectFlags_ScopeRect) && (flags & ImGuiMultiSelectFlags_ScopeRect)) + flags &= ~ImGuiMultiSelectFlags_ScopeWindow; + if (ImGui::CheckboxFlags("ImGuiMultiSelectFlags_SelectOnClick", &flags, ImGuiMultiSelectFlags_SelectOnClick) && (flags & ImGuiMultiSelectFlags_SelectOnClick)) + flags &= ~ImGuiMultiSelectFlags_SelectOnClickRelease; + if (ImGui::CheckboxFlags("ImGuiMultiSelectFlags_SelectOnClickRelease", &flags, ImGuiMultiSelectFlags_SelectOnClickRelease) && (flags & ImGuiMultiSelectFlags_SelectOnClickRelease)) + flags &= ~ImGuiMultiSelectFlags_SelectOnClick; + ImGui::SameLine(); HelpMarker("Allow dragging an unselected item without altering selection."); + ImGui::TreePop(); + } + // Initialize default list with 1000 items. + // Use default selection.Adapter: Pass index to SetNextItemSelectionUserData(), store index in Selection + static ImVector items; + static int items_next_id = 0; + if (items_next_id == 0) { for (int n = 0; n < 1000; n++) { items.push_back(items_next_id++); } } + static ExampleSelectionWithDeletion selection; + static bool request_deletion_from_menu = false; // Queue deletion triggered from context menu + + ImGui::Text("Selection size: %d/%d", selection.Size, items.Size); + + const float items_height = (widget_type == WidgetType_TreeNode) ? ImGui::GetTextLineHeight() : ImGui::GetTextLineHeightWithSpacing(); + ImGui::SetNextWindowContentSize(ImVec2(0.0f, items.Size * items_height)); + if (ImGui::BeginChild("##Basket", ImVec2(-FLT_MIN, ImGui::GetFontSize() * 20), ImGuiChildFlags_FrameStyle | ImGuiChildFlags_ResizeY)) + { + ImVec2 color_button_sz(ImGui::GetFontSize(), ImGui::GetFontSize()); + if (widget_type == WidgetType_TreeNode) + ImGui::PushStyleVarY(ImGuiStyleVar_ItemSpacing, 0.0f); + + ImGuiMultiSelectIO* ms_io = ImGui::BeginMultiSelect(flags, selection.Size, items.Size); + selection.ApplyRequests(ms_io); + + const bool want_delete = (ImGui::Shortcut(ImGuiKey_Delete, ImGuiInputFlags_Repeat) && (selection.Size > 0)) || request_deletion_from_menu; + const int item_curr_idx_to_focus = want_delete ? selection.ApplyDeletionPreLoop(ms_io, items.Size) : -1; + request_deletion_from_menu = false; + + if (show_in_table) + { + if (widget_type == WidgetType_TreeNode) + ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, ImVec2(0.0f, 0.0f)); + ImGui::BeginTable("##Split", 2, ImGuiTableFlags_Resizable | ImGuiTableFlags_NoSavedSettings | ImGuiTableFlags_NoPadOuterX); + ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch, 0.70f); + ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch, 0.30f); + //ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacingY, 0.0f); + } + + ImGuiListClipper clipper; + if (use_clipper) + { + clipper.Begin(items.Size); + if (item_curr_idx_to_focus != -1) + clipper.IncludeItemByIndex(item_curr_idx_to_focus); // Ensure focused item is not clipped. + if (ms_io->RangeSrcItem != -1) + clipper.IncludeItemByIndex((int)ms_io->RangeSrcItem); // Ensure RangeSrc item is not clipped. + } + + while (!use_clipper || clipper.Step()) + { + const int item_begin = use_clipper ? clipper.DisplayStart : 0; + const int item_end = use_clipper ? clipper.DisplayEnd : items.Size; + for (int n = item_begin; n < item_end; n++) + { + if (show_in_table) + ImGui::TableNextColumn(); + + const int item_id = items[n]; + const char* item_category = ExampleNames[item_id % IM_ARRAYSIZE(ExampleNames)]; + char label[64]; + sprintf(label, "Object %05d: %s", item_id, item_category); + + // IMPORTANT: for deletion refocus to work we need object ID to be stable, + // aka not depend on their index in the list. Here we use our persistent item_id + // instead of index to build a unique ID that will persist. + // (If we used PushID(index) instead, focus wouldn't be restored correctly after deletion). + ImGui::PushID(item_id); + + // Emit a color button, to test that Shift+LeftArrow landing on an item that is not part + // of the selection scope doesn't erroneously alter our selection. + if (show_color_button) + { + ImU32 dummy_col = (ImU32)((unsigned int)n * 0xC250B74B) | IM_COL32_A_MASK; + ImGui::ColorButton("##", ImColor(dummy_col), ImGuiColorEditFlags_NoTooltip, color_button_sz); + ImGui::SameLine(); + } + + // Submit item + bool item_is_selected = selection.Contains((ImGuiID)n); + bool item_is_open = false; + ImGui::SetNextItemSelectionUserData(n); + if (widget_type == WidgetType_Selectable) + { + ImGui::Selectable(label, item_is_selected, ImGuiSelectableFlags_None); + } + else if (widget_type == WidgetType_TreeNode) + { + ImGuiTreeNodeFlags tree_node_flags = ImGuiTreeNodeFlags_SpanAvailWidth | ImGuiTreeNodeFlags_OpenOnArrow | ImGuiTreeNodeFlags_OpenOnDoubleClick; + if (item_is_selected) + tree_node_flags |= ImGuiTreeNodeFlags_Selected; + item_is_open = ImGui::TreeNodeEx(label, tree_node_flags); + } + + // Focus (for after deletion) + if (item_curr_idx_to_focus == n) + ImGui::SetKeyboardFocusHere(-1); + + // Drag and Drop + if (use_drag_drop && ImGui::BeginDragDropSource()) + { + // Create payload with full selection OR single unselected item. + // (the later is only possible when using ImGuiMultiSelectFlags_SelectOnClickRelease) + if (ImGui::GetDragDropPayload() == NULL) + { + ImVector payload_items; + void* it = NULL; + ImGuiID id = 0; + if (!item_is_selected) + payload_items.push_back(item_id); + else + while (selection.GetNextSelectedItem(&it, &id)) + payload_items.push_back((int)id); + ImGui::SetDragDropPayload("MULTISELECT_DEMO_ITEMS", payload_items.Data, (size_t)payload_items.size_in_bytes()); + } + + // Display payload content in tooltip + const ImGuiPayload* payload = ImGui::GetDragDropPayload(); + const int* payload_items = (int*)payload->Data; + const int payload_count = (int)payload->DataSize / (int)sizeof(int); + if (payload_count == 1) + ImGui::Text("Object %05d: %s", payload_items[0], ExampleNames[payload_items[0] % IM_ARRAYSIZE(ExampleNames)]); + else + ImGui::Text("Dragging %d objects", payload_count); + + ImGui::EndDragDropSource(); + } + + if (widget_type == WidgetType_TreeNode && item_is_open) + ImGui::TreePop(); + + // Right-click: context menu + if (ImGui::BeginPopupContextItem()) + { + ImGui::BeginDisabled(!use_deletion || selection.Size == 0); + sprintf(label, "Delete %d item(s)###DeleteSelected", selection.Size); + if (ImGui::Selectable(label)) + request_deletion_from_menu = true; + ImGui::EndDisabled(); + ImGui::Selectable("Close"); + ImGui::EndPopup(); + } + + // Demo content within a table + if (show_in_table) + { + ImGui::TableNextColumn(); + ImGui::SetNextItemWidth(-FLT_MIN); + ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0)); + ImGui::InputText("###NoLabel", (char*)(void*)item_category, strlen(item_category), ImGuiInputTextFlags_ReadOnly); + ImGui::PopStyleVar(); + } + + ImGui::PopID(); + } + if (!use_clipper) + break; + } + + if (show_in_table) + { + ImGui::EndTable(); + if (widget_type == WidgetType_TreeNode) + ImGui::PopStyleVar(); + } + + // Apply multi-select requests + ms_io = ImGui::EndMultiSelect(); + selection.ApplyRequests(ms_io); + if (want_delete) + selection.ApplyDeletionPostLoop(ms_io, items, item_curr_idx_to_focus); + + if (widget_type == WidgetType_TreeNode) + ImGui::PopStyleVar(); + } + ImGui::EndChild(); + ImGui::TreePop(); + } ImGui::TreePop(); } +} +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowWidgetsTabs() +//----------------------------------------------------------------------------- + +static void DemoWindowWidgetsTabs() +{ + IMGUI_DEMO_MARKER("Widgets/Tabs"); if (ImGui::TreeNode("Tabs")) { + IMGUI_DEMO_MARKER("Widgets/Tabs/Basic"); if (ImGui::TreeNode("Basic")) { ImGuiTabBarFlags tab_bar_flags = ImGuiTabBarFlags_None; @@ -1912,35 +3448,40 @@ static void ShowDemoWindowLayout() ImGui::TreePop(); } + IMGUI_DEMO_MARKER("Widgets/Tabs/Advanced & Close Button"); if (ImGui::TreeNode("Advanced & Close Button")) { // Expose a couple of the available flags. In most cases you may just call BeginTabBar() with no flags (0). static ImGuiTabBarFlags tab_bar_flags = ImGuiTabBarFlags_Reorderable; - ImGui::CheckboxFlags("ImGuiTabBarFlags_Reorderable", (unsigned int*)&tab_bar_flags, ImGuiTabBarFlags_Reorderable); - ImGui::CheckboxFlags("ImGuiTabBarFlags_AutoSelectNewTabs", (unsigned int*)&tab_bar_flags, ImGuiTabBarFlags_AutoSelectNewTabs); - ImGui::CheckboxFlags("ImGuiTabBarFlags_TabListPopupButton", (unsigned int*)&tab_bar_flags, ImGuiTabBarFlags_TabListPopupButton); - ImGui::CheckboxFlags("ImGuiTabBarFlags_NoCloseWithMiddleMouseButton", (unsigned int*)&tab_bar_flags, ImGuiTabBarFlags_NoCloseWithMiddleMouseButton); + ImGui::CheckboxFlags("ImGuiTabBarFlags_Reorderable", &tab_bar_flags, ImGuiTabBarFlags_Reorderable); + ImGui::CheckboxFlags("ImGuiTabBarFlags_AutoSelectNewTabs", &tab_bar_flags, ImGuiTabBarFlags_AutoSelectNewTabs); + ImGui::CheckboxFlags("ImGuiTabBarFlags_TabListPopupButton", &tab_bar_flags, ImGuiTabBarFlags_TabListPopupButton); + ImGui::CheckboxFlags("ImGuiTabBarFlags_NoCloseWithMiddleMouseButton", &tab_bar_flags, ImGuiTabBarFlags_NoCloseWithMiddleMouseButton); + ImGui::CheckboxFlags("ImGuiTabBarFlags_DrawSelectedOverline", &tab_bar_flags, ImGuiTabBarFlags_DrawSelectedOverline); if ((tab_bar_flags & ImGuiTabBarFlags_FittingPolicyMask_) == 0) tab_bar_flags |= ImGuiTabBarFlags_FittingPolicyDefault_; - if (ImGui::CheckboxFlags("ImGuiTabBarFlags_FittingPolicyResizeDown", (unsigned int*)&tab_bar_flags, ImGuiTabBarFlags_FittingPolicyResizeDown)) + if (ImGui::CheckboxFlags("ImGuiTabBarFlags_FittingPolicyResizeDown", &tab_bar_flags, ImGuiTabBarFlags_FittingPolicyResizeDown)) tab_bar_flags &= ~(ImGuiTabBarFlags_FittingPolicyMask_ ^ ImGuiTabBarFlags_FittingPolicyResizeDown); - if (ImGui::CheckboxFlags("ImGuiTabBarFlags_FittingPolicyScroll", (unsigned int*)&tab_bar_flags, ImGuiTabBarFlags_FittingPolicyScroll)) + if (ImGui::CheckboxFlags("ImGuiTabBarFlags_FittingPolicyScroll", &tab_bar_flags, ImGuiTabBarFlags_FittingPolicyScroll)) tab_bar_flags &= ~(ImGuiTabBarFlags_FittingPolicyMask_ ^ ImGuiTabBarFlags_FittingPolicyScroll); // Tab Bar + ImGui::AlignTextToFramePadding(); + ImGui::Text("Opened:"); const char* names[4] = { "Artichoke", "Beetroot", "Celery", "Daikon" }; static bool opened[4] = { true, true, true, true }; // Persistent user state for (int n = 0; n < IM_ARRAYSIZE(opened); n++) { - if (n > 0) { ImGui::SameLine(); } + ImGui::SameLine(); ImGui::Checkbox(names[n], &opened[n]); } - // Passing a bool* to BeginTabItem() is similar to passing one to Begin(): the underlying bool will be set to false when the tab is closed. + // Passing a bool* to BeginTabItem() is similar to passing one to Begin(): + // the underlying bool will be set to false when the tab is closed. if (ImGui::BeginTabBar("MyTabBar", tab_bar_flags)) { for (int n = 0; n < IM_ARRAYSIZE(opened); n++) - if (opened[n] && ImGui::BeginTabItem(names[n], &opened[n])) + if (opened[n] && ImGui::BeginTabItem(names[n], &opened[n], ImGuiTabItemFlags_None)) { ImGui::Text("This is the %s tab!", names[n]); if (n & 1) @@ -1952,12 +3493,1077 @@ static void ShowDemoWindowLayout() ImGui::Separator(); ImGui::TreePop(); } + + IMGUI_DEMO_MARKER("Widgets/Tabs/TabItemButton & Leading-Trailing flags"); + if (ImGui::TreeNode("TabItemButton & Leading/Trailing flags")) + { + static ImVector active_tabs; + static int next_tab_id = 0; + if (next_tab_id == 0) // Initialize with some default tabs + for (int i = 0; i < 3; i++) + active_tabs.push_back(next_tab_id++); + + // TabItemButton() and Leading/Trailing flags are distinct features which we will demo together. + // (It is possible to submit regular tabs with Leading/Trailing flags, or TabItemButton tabs without Leading/Trailing flags... + // but they tend to make more sense together) + static bool show_leading_button = true; + static bool show_trailing_button = true; + ImGui::Checkbox("Show Leading TabItemButton()", &show_leading_button); + ImGui::Checkbox("Show Trailing TabItemButton()", &show_trailing_button); + + // Expose some other flags which are useful to showcase how they interact with Leading/Trailing tabs + static ImGuiTabBarFlags tab_bar_flags = ImGuiTabBarFlags_AutoSelectNewTabs | ImGuiTabBarFlags_Reorderable | ImGuiTabBarFlags_FittingPolicyResizeDown; + ImGui::CheckboxFlags("ImGuiTabBarFlags_TabListPopupButton", &tab_bar_flags, ImGuiTabBarFlags_TabListPopupButton); + if (ImGui::CheckboxFlags("ImGuiTabBarFlags_FittingPolicyResizeDown", &tab_bar_flags, ImGuiTabBarFlags_FittingPolicyResizeDown)) + tab_bar_flags &= ~(ImGuiTabBarFlags_FittingPolicyMask_ ^ ImGuiTabBarFlags_FittingPolicyResizeDown); + if (ImGui::CheckboxFlags("ImGuiTabBarFlags_FittingPolicyScroll", &tab_bar_flags, ImGuiTabBarFlags_FittingPolicyScroll)) + tab_bar_flags &= ~(ImGuiTabBarFlags_FittingPolicyMask_ ^ ImGuiTabBarFlags_FittingPolicyScroll); + + if (ImGui::BeginTabBar("MyTabBar", tab_bar_flags)) + { + // Demo a Leading TabItemButton(): click the "?" button to open a menu + if (show_leading_button) + if (ImGui::TabItemButton("?", ImGuiTabItemFlags_Leading | ImGuiTabItemFlags_NoTooltip)) + ImGui::OpenPopup("MyHelpMenu"); + if (ImGui::BeginPopup("MyHelpMenu")) + { + ImGui::Selectable("Hello!"); + ImGui::EndPopup(); + } + + // Demo Trailing Tabs: click the "+" button to add a new tab. + // (In your app you may want to use a font icon instead of the "+") + // We submit it before the regular tabs, but thanks to the ImGuiTabItemFlags_Trailing flag it will always appear at the end. + if (show_trailing_button) + if (ImGui::TabItemButton("+", ImGuiTabItemFlags_Trailing | ImGuiTabItemFlags_NoTooltip)) + active_tabs.push_back(next_tab_id++); // Add new tab + + // Submit our regular tabs + for (int n = 0; n < active_tabs.Size; ) + { + bool open = true; + char name[16]; + snprintf(name, IM_ARRAYSIZE(name), "%04d", active_tabs[n]); + if (ImGui::BeginTabItem(name, &open, ImGuiTabItemFlags_None)) + { + ImGui::Text("This is the %s tab!", name); + ImGui::EndTabItem(); + } + + if (!open) + active_tabs.erase(active_tabs.Data + n); + else + n++; + } + + ImGui::EndTabBar(); + } + ImGui::Separator(); + ImGui::TreePop(); + } + ImGui::TreePop(); + } +} + +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowWidgetsText() +//----------------------------------------------------------------------------- + +static void DemoWindowWidgetsText() +{ + IMGUI_DEMO_MARKER("Widgets/Text"); + if (ImGui::TreeNode("Text")) + { + IMGUI_DEMO_MARKER("Widgets/Text/Colored Text"); + if (ImGui::TreeNode("Colorful Text")) + { + // Using shortcut. You can use PushStyleColor()/PopStyleColor() for more flexibility. + ImGui::TextColored(ImVec4(1.0f, 0.0f, 1.0f, 1.0f), "Pink"); + ImGui::TextColored(ImVec4(1.0f, 1.0f, 0.0f, 1.0f), "Yellow"); + ImGui::TextDisabled("Disabled"); + ImGui::SameLine(); HelpMarker("The TextDisabled color is stored in ImGuiStyle."); + ImGui::TreePop(); + } + + IMGUI_DEMO_MARKER("Widgets/Text/Word Wrapping"); + if (ImGui::TreeNode("Word Wrapping")) + { + // Using shortcut. You can use PushTextWrapPos()/PopTextWrapPos() for more flexibility. + ImGui::TextWrapped( + "This text should automatically wrap on the edge of the window. The current implementation " + "for text wrapping follows simple rules suitable for English and possibly other languages."); + ImGui::Spacing(); + + static float wrap_width = 200.0f; + ImGui::SliderFloat("Wrap width", &wrap_width, -20, 600, "%.0f"); + + ImDrawList* draw_list = ImGui::GetWindowDrawList(); + for (int n = 0; n < 2; n++) + { + ImGui::Text("Test paragraph %d:", n); + ImVec2 pos = ImGui::GetCursorScreenPos(); + ImVec2 marker_min = ImVec2(pos.x + wrap_width, pos.y); + ImVec2 marker_max = ImVec2(pos.x + wrap_width + 10, pos.y + ImGui::GetTextLineHeight()); + ImGui::PushTextWrapPos(ImGui::GetCursorPos().x + wrap_width); + if (n == 0) + ImGui::Text("The lazy dog is a good dog. This paragraph should fit within %.0f pixels. Testing a 1 character word. The quick brown fox jumps over the lazy dog.", wrap_width); + else + ImGui::Text("aaaaaaaa bbbbbbbb, c cccccccc,dddddddd. d eeeeeeee ffffffff. gggggggg!hhhhhhhh"); + + // Draw actual text bounding box, following by marker of our expected limit (should not overlap!) + draw_list->AddRect(ImGui::GetItemRectMin(), ImGui::GetItemRectMax(), IM_COL32(255, 255, 0, 255)); + draw_list->AddRectFilled(marker_min, marker_max, IM_COL32(255, 0, 255, 255)); + ImGui::PopTextWrapPos(); + } + + ImGui::TreePop(); + } + + IMGUI_DEMO_MARKER("Widgets/Text/UTF-8 Text"); + if (ImGui::TreeNode("UTF-8 Text")) + { + // UTF-8 test with Japanese characters + // (Needs a suitable font? Try "Google Noto" or "Arial Unicode". See docs/FONTS.md for details.) + // - From C++11 you can use the u8"my text" syntax to encode literal strings as UTF-8 + // - For earlier compiler, you may be able to encode your sources as UTF-8 (e.g. in Visual Studio, you + // can save your source files as 'UTF-8 without signature'). + // - FOR THIS DEMO FILE ONLY, BECAUSE WE WANT TO SUPPORT OLD COMPILERS, WE ARE *NOT* INCLUDING RAW UTF-8 + // CHARACTERS IN THIS SOURCE FILE. Instead we are encoding a few strings with hexadecimal constants. + // Don't do this in your application! Please use u8"text in any language" in your application! + // Note that characters values are preserved even by InputText() if the font cannot be displayed, + // so you can safely copy & paste garbled characters into another application. + ImGui::TextWrapped( + "CJK text will only appear if the font was loaded with the appropriate CJK character ranges. " + "Call io.Fonts->AddFontFromFileTTF() manually to load extra character ranges. " + "Read docs/FONTS.md for details."); + ImGui::Text("Hiragana: \xe3\x81\x8b\xe3\x81\x8d\xe3\x81\x8f\xe3\x81\x91\xe3\x81\x93 (kakikukeko)"); + ImGui::Text("Kanjis: \xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e (nihongo)"); + static char buf[32] = "\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e"; + //static char buf[32] = u8"NIHONGO"; // <- this is how you would write it with C++11, using real kanjis + ImGui::InputText("UTF-8 input", buf, IM_ARRAYSIZE(buf)); + ImGui::TreePop(); + } + ImGui::TreePop(); + } +} + +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowWidgetsTextFilter() +//----------------------------------------------------------------------------- + +static void DemoWindowWidgetsTextFilter() +{ + IMGUI_DEMO_MARKER("Widgets/Text Filter"); + if (ImGui::TreeNode("Text Filter")) + { + // Helper class to easy setup a text filter. + // You may want to implement a more feature-full filtering scheme in your own application. + HelpMarker("Not a widget per-se, but ImGuiTextFilter is a helper to perform simple filtering on text strings."); + static ImGuiTextFilter filter; + ImGui::Text("Filter usage:\n" + " \"\" display all lines\n" + " \"xxx\" display lines containing \"xxx\"\n" + " \"xxx,yyy\" display lines containing \"xxx\" or \"yyy\"\n" + " \"-xxx\" hide lines containing \"xxx\""); + filter.Draw(); + const char* lines[] = { "aaa1.c", "bbb1.c", "ccc1.c", "aaa2.cpp", "bbb2.cpp", "ccc2.cpp", "abc.h", "hello, world" }; + for (int i = 0; i < IM_ARRAYSIZE(lines); i++) + if (filter.PassFilter(lines[i])) + ImGui::BulletText("%s", lines[i]); + ImGui::TreePop(); + } +} + +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowWidgetsTextInput() +//----------------------------------------------------------------------------- + +static void DemoWindowWidgetsTextInput() +{ + // To wire InputText() with std::string or any other custom string type, + // see the "Text Input > Resize Callback" section of this demo, and the misc/cpp/imgui_stdlib.h file. + IMGUI_DEMO_MARKER("Widgets/Text Input"); + if (ImGui::TreeNode("Text Input")) + { + IMGUI_DEMO_MARKER("Widgets/Text Input/Multi-line Text Input"); + if (ImGui::TreeNode("Multi-line Text Input")) + { + // Note: we are using a fixed-sized buffer for simplicity here. See ImGuiInputTextFlags_CallbackResize + // and the code in misc/cpp/imgui_stdlib.h for how to setup InputText() for dynamically resizing strings. + static char text[1024 * 16] = + "/*\n" + " The Pentium F00F bug, shorthand for F0 0F C7 C8,\n" + " the hexadecimal encoding of one offending instruction,\n" + " more formally, the invalid operand with locked CMPXCHG8B\n" + " instruction bug, is a design flaw in the majority of\n" + " Intel Pentium, Pentium MMX, and Pentium OverDrive\n" + " processors (all in the P5 microarchitecture).\n" + "*/\n\n" + "label:\n" + "\tlock cmpxchg8b eax\n"; + + static ImGuiInputTextFlags flags = ImGuiInputTextFlags_AllowTabInput; + HelpMarker("You can use the ImGuiInputTextFlags_CallbackResize facility if you need to wire InputTextMultiline() to a dynamic string type. See misc/cpp/imgui_stdlib.h for an example. (This is not demonstrated in imgui_demo.cpp because we don't want to include in here)"); + ImGui::CheckboxFlags("ImGuiInputTextFlags_ReadOnly", &flags, ImGuiInputTextFlags_ReadOnly); + ImGui::CheckboxFlags("ImGuiInputTextFlags_AllowTabInput", &flags, ImGuiInputTextFlags_AllowTabInput); + ImGui::SameLine(); HelpMarker("When _AllowTabInput is set, passing through the widget with Tabbing doesn't automatically activate it, in order to also cycling through subsequent widgets."); + ImGui::CheckboxFlags("ImGuiInputTextFlags_CtrlEnterForNewLine", &flags, ImGuiInputTextFlags_CtrlEnterForNewLine); + ImGui::InputTextMultiline("##source", text, IM_ARRAYSIZE(text), ImVec2(-FLT_MIN, ImGui::GetTextLineHeight() * 16), flags); + ImGui::TreePop(); + } + + IMGUI_DEMO_MARKER("Widgets/Text Input/Filtered Text Input"); + if (ImGui::TreeNode("Filtered Text Input")) + { + struct TextFilters + { + // Modify character input by altering 'data->Eventchar' (ImGuiInputTextFlags_CallbackCharFilter callback) + static int FilterCasingSwap(ImGuiInputTextCallbackData* data) + { + if (data->EventChar >= 'a' && data->EventChar <= 'z') { data->EventChar -= 'a' - 'A'; } // Lowercase becomes uppercase + else if (data->EventChar >= 'A' && data->EventChar <= 'Z') { data->EventChar += 'a' - 'A'; } // Uppercase becomes lowercase + return 0; + } + + // Return 0 (pass) if the character is 'i' or 'm' or 'g' or 'u' or 'i', otherwise return 1 (filter out) + static int FilterImGuiLetters(ImGuiInputTextCallbackData* data) + { + if (data->EventChar < 256 && strchr("imgui", (char)data->EventChar)) + return 0; + return 1; + } + }; + + static char buf1[32] = ""; ImGui::InputText("default", buf1, 32); + static char buf2[32] = ""; ImGui::InputText("decimal", buf2, 32, ImGuiInputTextFlags_CharsDecimal); + static char buf3[32] = ""; ImGui::InputText("hexadecimal", buf3, 32, ImGuiInputTextFlags_CharsHexadecimal | ImGuiInputTextFlags_CharsUppercase); + static char buf4[32] = ""; ImGui::InputText("uppercase", buf4, 32, ImGuiInputTextFlags_CharsUppercase); + static char buf5[32] = ""; ImGui::InputText("no blank", buf5, 32, ImGuiInputTextFlags_CharsNoBlank); + static char buf6[32] = ""; ImGui::InputText("casing swap", buf6, 32, ImGuiInputTextFlags_CallbackCharFilter, TextFilters::FilterCasingSwap); // Use CharFilter callback to replace characters. + static char buf7[32] = ""; ImGui::InputText("\"imgui\"", buf7, 32, ImGuiInputTextFlags_CallbackCharFilter, TextFilters::FilterImGuiLetters); // Use CharFilter callback to disable some characters. + ImGui::TreePop(); + } + + IMGUI_DEMO_MARKER("Widgets/Text Input/Password input"); + if (ImGui::TreeNode("Password Input")) + { + static char password[64] = "password123"; + ImGui::InputText("password", password, IM_ARRAYSIZE(password), ImGuiInputTextFlags_Password); + ImGui::SameLine(); HelpMarker("Display all characters as '*'.\nDisable clipboard cut and copy.\nDisable logging.\n"); + ImGui::InputTextWithHint("password (w/ hint)", "", password, IM_ARRAYSIZE(password), ImGuiInputTextFlags_Password); + ImGui::InputText("password (clear)", password, IM_ARRAYSIZE(password)); + ImGui::TreePop(); + } + + IMGUI_DEMO_MARKER("Widgets/Text Input/Completion, History, Edit Callbacks"); + if (ImGui::TreeNode("Completion, History, Edit Callbacks")) + { + struct Funcs + { + static int MyCallback(ImGuiInputTextCallbackData* data) + { + if (data->EventFlag == ImGuiInputTextFlags_CallbackCompletion) + { + data->InsertChars(data->CursorPos, ".."); + } + else if (data->EventFlag == ImGuiInputTextFlags_CallbackHistory) + { + if (data->EventKey == ImGuiKey_UpArrow) + { + data->DeleteChars(0, data->BufTextLen); + data->InsertChars(0, "Pressed Up!"); + data->SelectAll(); + } + else if (data->EventKey == ImGuiKey_DownArrow) + { + data->DeleteChars(0, data->BufTextLen); + data->InsertChars(0, "Pressed Down!"); + data->SelectAll(); + } + } + else if (data->EventFlag == ImGuiInputTextFlags_CallbackEdit) + { + // Toggle casing of first character + char c = data->Buf[0]; + if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) data->Buf[0] ^= 32; + data->BufDirty = true; + + // Increment a counter + int* p_int = (int*)data->UserData; + *p_int = *p_int + 1; + } + return 0; + } + }; + static char buf1[64]; + ImGui::InputText("Completion", buf1, 64, ImGuiInputTextFlags_CallbackCompletion, Funcs::MyCallback); + ImGui::SameLine(); HelpMarker( + "Here we append \"..\" each time Tab is pressed. " + "See 'Examples>Console' for a more meaningful demonstration of using this callback."); + + static char buf2[64]; + ImGui::InputText("History", buf2, 64, ImGuiInputTextFlags_CallbackHistory, Funcs::MyCallback); + ImGui::SameLine(); HelpMarker( + "Here we replace and select text each time Up/Down are pressed. " + "See 'Examples>Console' for a more meaningful demonstration of using this callback."); + + static char buf3[64]; + static int edit_count = 0; + ImGui::InputText("Edit", buf3, 64, ImGuiInputTextFlags_CallbackEdit, Funcs::MyCallback, (void*)&edit_count); + ImGui::SameLine(); HelpMarker( + "Here we toggle the casing of the first character on every edit + count edits."); + ImGui::SameLine(); ImGui::Text("(%d)", edit_count); + + ImGui::TreePop(); + } + + IMGUI_DEMO_MARKER("Widgets/Text Input/Resize Callback"); + if (ImGui::TreeNode("Resize Callback")) + { + // To wire InputText() with std::string or any other custom string type, + // you can use the ImGuiInputTextFlags_CallbackResize flag + create a custom ImGui::InputText() wrapper + // using your preferred type. See misc/cpp/imgui_stdlib.h for an implementation of this using std::string. + HelpMarker( + "Using ImGuiInputTextFlags_CallbackResize to wire your custom string type to InputText().\n\n" + "See misc/cpp/imgui_stdlib.h for an implementation of this for std::string."); + struct Funcs + { + static int MyResizeCallback(ImGuiInputTextCallbackData* data) + { + if (data->EventFlag == ImGuiInputTextFlags_CallbackResize) + { + ImVector* my_str = (ImVector*)data->UserData; + IM_ASSERT(my_str->begin() == data->Buf); + my_str->resize(data->BufSize); // NB: On resizing calls, generally data->BufSize == data->BufTextLen + 1 + data->Buf = my_str->begin(); + } + return 0; + } + + // Note: Because ImGui:: is a namespace you would typically add your own function into the namespace. + // For example, you code may declare a function 'ImGui::InputText(const char* label, MyString* my_str)' + static bool MyInputTextMultiline(const char* label, ImVector* my_str, const ImVec2& size = ImVec2(0, 0), ImGuiInputTextFlags flags = 0) + { + IM_ASSERT((flags & ImGuiInputTextFlags_CallbackResize) == 0); + return ImGui::InputTextMultiline(label, my_str->begin(), (size_t)my_str->size(), size, flags | ImGuiInputTextFlags_CallbackResize, Funcs::MyResizeCallback, (void*)my_str); + } + }; + + // For this demo we are using ImVector as a string container. + // Note that because we need to store a terminating zero character, our size/capacity are 1 more + // than usually reported by a typical string class. + static ImVector my_str; + if (my_str.empty()) + my_str.push_back(0); + Funcs::MyInputTextMultiline("##MyStr", &my_str, ImVec2(-FLT_MIN, ImGui::GetTextLineHeight() * 16)); + ImGui::Text("Data: %p\nSize: %d\nCapacity: %d", (void*)my_str.begin(), my_str.size(), my_str.capacity()); + ImGui::TreePop(); + } + + IMGUI_DEMO_MARKER("Widgets/Text Input/Eliding, Alignment"); + if (ImGui::TreeNode("Eliding, Alignment")) + { + static char buf1[128] = "/path/to/some/folder/with/long/filename.cpp"; + static ImGuiInputTextFlags flags = ImGuiInputTextFlags_ElideLeft; + ImGui::CheckboxFlags("ImGuiInputTextFlags_ElideLeft", &flags, ImGuiInputTextFlags_ElideLeft); + ImGui::InputText("Path", buf1, IM_ARRAYSIZE(buf1), flags); + ImGui::TreePop(); + } + + IMGUI_DEMO_MARKER("Widgets/Text Input/Miscellaneous"); + if (ImGui::TreeNode("Miscellaneous")) + { + static char buf1[16]; + static ImGuiInputTextFlags flags = ImGuiInputTextFlags_EscapeClearsAll; + ImGui::CheckboxFlags("ImGuiInputTextFlags_EscapeClearsAll", &flags, ImGuiInputTextFlags_EscapeClearsAll); + ImGui::CheckboxFlags("ImGuiInputTextFlags_ReadOnly", &flags, ImGuiInputTextFlags_ReadOnly); + ImGui::CheckboxFlags("ImGuiInputTextFlags_NoUndoRedo", &flags, ImGuiInputTextFlags_NoUndoRedo); + ImGui::InputText("Hello", buf1, IM_ARRAYSIZE(buf1), flags); + ImGui::TreePop(); + } + ImGui::TreePop(); } +} + +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowWidgetsTooltips() +//----------------------------------------------------------------------------- + +static void DemoWindowWidgetsTooltips() +{ + IMGUI_DEMO_MARKER("Widgets/Tooltips"); + if (ImGui::TreeNode("Tooltips")) + { + // Tooltips are windows following the mouse. They do not take focus away. + ImGui::SeparatorText("General"); + + // Typical use cases: + // - Short-form (text only): SetItemTooltip("Hello"); + // - Short-form (any contents): if (BeginItemTooltip()) { Text("Hello"); EndTooltip(); } + + // - Full-form (text only): if (IsItemHovered(...)) { SetTooltip("Hello"); } + // - Full-form (any contents): if (IsItemHovered(...) && BeginTooltip()) { Text("Hello"); EndTooltip(); } + + HelpMarker( + "Tooltip are typically created by using a IsItemHovered() + SetTooltip() sequence.\n\n" + "We provide a helper SetItemTooltip() function to perform the two with standards flags."); + + ImVec2 sz = ImVec2(-FLT_MIN, 0.0f); + + ImGui::Button("Basic", sz); + ImGui::SetItemTooltip("I am a tooltip"); + + ImGui::Button("Fancy", sz); + if (ImGui::BeginItemTooltip()) + { + ImGui::Text("I am a fancy tooltip"); + static float arr[] = { 0.6f, 0.1f, 1.0f, 0.5f, 0.92f, 0.1f, 0.2f }; + ImGui::PlotLines("Curve", arr, IM_ARRAYSIZE(arr)); + ImGui::Text("Sin(time) = %f", sinf((float)ImGui::GetTime())); + ImGui::EndTooltip(); + } + + ImGui::SeparatorText("Always On"); + + // Showcase NOT relying on a IsItemHovered() to emit a tooltip. + // Here the tooltip is always emitted when 'always_on == true'. + static int always_on = 0; + ImGui::RadioButton("Off", &always_on, 0); + ImGui::SameLine(); + ImGui::RadioButton("Always On (Simple)", &always_on, 1); + ImGui::SameLine(); + ImGui::RadioButton("Always On (Advanced)", &always_on, 2); + if (always_on == 1) + ImGui::SetTooltip("I am following you around."); + else if (always_on == 2 && ImGui::BeginTooltip()) + { + ImGui::ProgressBar(sinf((float)ImGui::GetTime()) * 0.5f + 0.5f, ImVec2(ImGui::GetFontSize() * 25, 0.0f)); + ImGui::EndTooltip(); + } + + ImGui::SeparatorText("Custom"); + + HelpMarker( + "Passing ImGuiHoveredFlags_ForTooltip to IsItemHovered() is the preferred way to standardize " + "tooltip activation details across your application. You may however decide to use custom " + "flags for a specific tooltip instance."); + + // The following examples are passed for documentation purpose but may not be useful to most users. + // Passing ImGuiHoveredFlags_ForTooltip to IsItemHovered() will pull ImGuiHoveredFlags flags values from + // 'style.HoverFlagsForTooltipMouse' or 'style.HoverFlagsForTooltipNav' depending on whether mouse or keyboard/gamepad is being used. + // With default settings, ImGuiHoveredFlags_ForTooltip is equivalent to ImGuiHoveredFlags_DelayShort + ImGuiHoveredFlags_Stationary. + ImGui::Button("Manual", sz); + if (ImGui::IsItemHovered(ImGuiHoveredFlags_ForTooltip)) + ImGui::SetTooltip("I am a manually emitted tooltip."); + + ImGui::Button("DelayNone", sz); + if (ImGui::IsItemHovered(ImGuiHoveredFlags_DelayNone)) + ImGui::SetTooltip("I am a tooltip with no delay."); + + ImGui::Button("DelayShort", sz); + if (ImGui::IsItemHovered(ImGuiHoveredFlags_DelayShort | ImGuiHoveredFlags_NoSharedDelay)) + ImGui::SetTooltip("I am a tooltip with a short delay (%0.2f sec).", ImGui::GetStyle().HoverDelayShort); + + ImGui::Button("DelayLong", sz); + if (ImGui::IsItemHovered(ImGuiHoveredFlags_DelayNormal | ImGuiHoveredFlags_NoSharedDelay)) + ImGui::SetTooltip("I am a tooltip with a long delay (%0.2f sec).", ImGui::GetStyle().HoverDelayNormal); + + ImGui::Button("Stationary", sz); + if (ImGui::IsItemHovered(ImGuiHoveredFlags_Stationary)) + ImGui::SetTooltip("I am a tooltip requiring mouse to be stationary before activating."); + + // Using ImGuiHoveredFlags_ForTooltip will pull flags from 'style.HoverFlagsForTooltipMouse' or 'style.HoverFlagsForTooltipNav', + // which default value include the ImGuiHoveredFlags_AllowWhenDisabled flag. + ImGui::BeginDisabled(); + ImGui::Button("Disabled item", sz); + if (ImGui::IsItemHovered(ImGuiHoveredFlags_ForTooltip)) + ImGui::SetTooltip("I am a a tooltip for a disabled item."); + ImGui::EndDisabled(); + + ImGui::TreePop(); + } +} + +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowWidgetsTreeNodes() +//----------------------------------------------------------------------------- + +static void DemoWindowWidgetsTreeNodes() +{ + IMGUI_DEMO_MARKER("Widgets/Tree Nodes"); + if (ImGui::TreeNode("Tree Nodes")) + { + IMGUI_DEMO_MARKER("Widgets/Tree Nodes/Basic trees"); + if (ImGui::TreeNode("Basic trees")) + { + for (int i = 0; i < 5; i++) + { + // Use SetNextItemOpen() so set the default state of a node to be open. We could + // also use TreeNodeEx() with the ImGuiTreeNodeFlags_DefaultOpen flag to achieve the same thing! + if (i == 0) + ImGui::SetNextItemOpen(true, ImGuiCond_Once); + + // Here we use PushID() to generate a unique base ID, and then the "" used as TreeNode id won't conflict. + // An alternative to using 'PushID() + TreeNode("", ...)' to generate a unique ID is to use 'TreeNode((void*)(intptr_t)i, ...)', + // aka generate a dummy pointer-sized value to be hashed. The demo below uses that technique. Both are fine. + ImGui::PushID(i); + if (ImGui::TreeNode("", "Child %d", i)) + { + ImGui::Text("blah blah"); + ImGui::SameLine(); + if (ImGui::SmallButton("button")) {} + ImGui::TreePop(); + } + ImGui::PopID(); + } + ImGui::TreePop(); + } + + IMGUI_DEMO_MARKER("Widgets/Tree Nodes/Advanced, with Selectable nodes"); + if (ImGui::TreeNode("Advanced, with Selectable nodes")) + { + HelpMarker( + "This is a more typical looking tree with selectable nodes.\n" + "Click to select, CTRL+Click to toggle, click on arrows or double-click to open."); + static ImGuiTreeNodeFlags base_flags = ImGuiTreeNodeFlags_OpenOnArrow | ImGuiTreeNodeFlags_OpenOnDoubleClick | ImGuiTreeNodeFlags_SpanAvailWidth; + static bool align_label_with_current_x_position = false; + static bool test_drag_and_drop = false; + ImGui::CheckboxFlags("ImGuiTreeNodeFlags_OpenOnArrow", &base_flags, ImGuiTreeNodeFlags_OpenOnArrow); + ImGui::CheckboxFlags("ImGuiTreeNodeFlags_OpenOnDoubleClick", &base_flags, ImGuiTreeNodeFlags_OpenOnDoubleClick); + ImGui::CheckboxFlags("ImGuiTreeNodeFlags_SpanAvailWidth", &base_flags, ImGuiTreeNodeFlags_SpanAvailWidth); ImGui::SameLine(); HelpMarker("Extend hit area to all available width instead of allowing more items to be laid out after the node."); + ImGui::CheckboxFlags("ImGuiTreeNodeFlags_SpanFullWidth", &base_flags, ImGuiTreeNodeFlags_SpanFullWidth); + ImGui::CheckboxFlags("ImGuiTreeNodeFlags_SpanLabelWidth", &base_flags, ImGuiTreeNodeFlags_SpanLabelWidth); ImGui::SameLine(); HelpMarker("Reduce hit area to the text label and a bit of margin."); + ImGui::CheckboxFlags("ImGuiTreeNodeFlags_SpanAllColumns", &base_flags, ImGuiTreeNodeFlags_SpanAllColumns); ImGui::SameLine(); HelpMarker("For use in Tables only."); + ImGui::CheckboxFlags("ImGuiTreeNodeFlags_AllowOverlap", &base_flags, ImGuiTreeNodeFlags_AllowOverlap); + ImGui::CheckboxFlags("ImGuiTreeNodeFlags_Framed", &base_flags, ImGuiTreeNodeFlags_Framed); ImGui::SameLine(); HelpMarker("Draw frame with background (e.g. for CollapsingHeader)"); + ImGui::CheckboxFlags("ImGuiTreeNodeFlags_NavLeftJumpsBackHere", &base_flags, ImGuiTreeNodeFlags_NavLeftJumpsBackHere); + ImGui::Checkbox("Align label with current X position", &align_label_with_current_x_position); + ImGui::Checkbox("Test tree node as drag source", &test_drag_and_drop); + ImGui::Text("Hello!"); + if (align_label_with_current_x_position) + ImGui::Unindent(ImGui::GetTreeNodeToLabelSpacing()); + + // 'selection_mask' is dumb representation of what may be user-side selection state. + // You may retain selection state inside or outside your objects in whatever format you see fit. + // 'node_clicked' is temporary storage of what node we have clicked to process selection at the end + /// of the loop. May be a pointer to your own node type, etc. + static int selection_mask = (1 << 2); + int node_clicked = -1; + for (int i = 0; i < 6; i++) + { + // Disable the default "open on single-click behavior" + set Selected flag according to our selection. + // To alter selection we use IsItemClicked() && !IsItemToggledOpen(), so clicking on an arrow doesn't alter selection. + ImGuiTreeNodeFlags node_flags = base_flags; + const bool is_selected = (selection_mask & (1 << i)) != 0; + if (is_selected) + node_flags |= ImGuiTreeNodeFlags_Selected; + if (i < 3) + { + // Items 0..2 are Tree Node + bool node_open = ImGui::TreeNodeEx((void*)(intptr_t)i, node_flags, "Selectable Node %d", i); + if (ImGui::IsItemClicked() && !ImGui::IsItemToggledOpen()) + node_clicked = i; + if (test_drag_and_drop && ImGui::BeginDragDropSource()) + { + ImGui::SetDragDropPayload("_TREENODE", NULL, 0); + ImGui::Text("This is a drag and drop source"); + ImGui::EndDragDropSource(); + } + if (i == 2 && (base_flags & ImGuiTreeNodeFlags_SpanLabelWidth)) + { + // Item 2 has an additional inline button to help demonstrate SpanLabelWidth. + ImGui::SameLine(); + if (ImGui::SmallButton("button")) {} + } + if (node_open) + { + ImGui::BulletText("Blah blah\nBlah Blah"); + ImGui::SameLine(); + ImGui::SmallButton("Button"); + ImGui::TreePop(); + } + } + else + { + // Items 3..5 are Tree Leaves + // The only reason we use TreeNode at all is to allow selection of the leaf. Otherwise we can + // use BulletText() or advance the cursor by GetTreeNodeToLabelSpacing() and call Text(). + node_flags |= ImGuiTreeNodeFlags_Leaf | ImGuiTreeNodeFlags_NoTreePushOnOpen; // ImGuiTreeNodeFlags_Bullet + ImGui::TreeNodeEx((void*)(intptr_t)i, node_flags, "Selectable Leaf %d", i); + if (ImGui::IsItemClicked() && !ImGui::IsItemToggledOpen()) + node_clicked = i; + if (test_drag_and_drop && ImGui::BeginDragDropSource()) + { + ImGui::SetDragDropPayload("_TREENODE", NULL, 0); + ImGui::Text("This is a drag and drop source"); + ImGui::EndDragDropSource(); + } + } + } + if (node_clicked != -1) + { + // Update selection state + // (process outside of tree loop to avoid visual inconsistencies during the clicking frame) + if (ImGui::GetIO().KeyCtrl) + selection_mask ^= (1 << node_clicked); // CTRL+click to toggle + else //if (!(selection_mask & (1 << node_clicked))) // Depending on selection behavior you want, may want to preserve selection when clicking on item that is part of the selection + selection_mask = (1 << node_clicked); // Click to single-select + } + if (align_label_with_current_x_position) + ImGui::Indent(ImGui::GetTreeNodeToLabelSpacing()); + ImGui::TreePop(); + } + ImGui::TreePop(); + } +} + +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowWidgetsVerticalSliders() +//----------------------------------------------------------------------------- + +static void DemoWindowWidgetsVerticalSliders() +{ + IMGUI_DEMO_MARKER("Widgets/Vertical Sliders"); + if (ImGui::TreeNode("Vertical Sliders")) + { + const float spacing = 4; + ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(spacing, spacing)); + + static int int_value = 0; + ImGui::VSliderInt("##int", ImVec2(18, 160), &int_value, 0, 5); + ImGui::SameLine(); + + static float values[7] = { 0.0f, 0.60f, 0.35f, 0.9f, 0.70f, 0.20f, 0.0f }; + ImGui::PushID("set1"); + for (int i = 0; i < 7; i++) + { + if (i > 0) ImGui::SameLine(); + ImGui::PushID(i); + ImGui::PushStyleColor(ImGuiCol_FrameBg, (ImVec4)ImColor::HSV(i / 7.0f, 0.5f, 0.5f)); + ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, (ImVec4)ImColor::HSV(i / 7.0f, 0.6f, 0.5f)); + ImGui::PushStyleColor(ImGuiCol_FrameBgActive, (ImVec4)ImColor::HSV(i / 7.0f, 0.7f, 0.5f)); + ImGui::PushStyleColor(ImGuiCol_SliderGrab, (ImVec4)ImColor::HSV(i / 7.0f, 0.9f, 0.9f)); + ImGui::VSliderFloat("##v", ImVec2(18, 160), &values[i], 0.0f, 1.0f, ""); + if (ImGui::IsItemActive() || ImGui::IsItemHovered()) + ImGui::SetTooltip("%.3f", values[i]); + ImGui::PopStyleColor(4); + ImGui::PopID(); + } + ImGui::PopID(); + + ImGui::SameLine(); + ImGui::PushID("set2"); + static float values2[4] = { 0.20f, 0.80f, 0.40f, 0.25f }; + const int rows = 3; + const ImVec2 small_slider_size(18, (float)(int)((160.0f - (rows - 1) * spacing) / rows)); + for (int nx = 0; nx < 4; nx++) + { + if (nx > 0) ImGui::SameLine(); + ImGui::BeginGroup(); + for (int ny = 0; ny < rows; ny++) + { + ImGui::PushID(nx * rows + ny); + ImGui::VSliderFloat("##v", small_slider_size, &values2[nx], 0.0f, 1.0f, ""); + if (ImGui::IsItemActive() || ImGui::IsItemHovered()) + ImGui::SetTooltip("%.3f", values2[nx]); + ImGui::PopID(); + } + ImGui::EndGroup(); + } + ImGui::PopID(); + + ImGui::SameLine(); + ImGui::PushID("set3"); + for (int i = 0; i < 4; i++) + { + if (i > 0) ImGui::SameLine(); + ImGui::PushID(i); + ImGui::PushStyleVar(ImGuiStyleVar_GrabMinSize, 40); + ImGui::VSliderFloat("##v", ImVec2(40, 160), &values[i], 0.0f, 1.0f, "%.2f\nsec"); + ImGui::PopStyleVar(); + ImGui::PopID(); + } + ImGui::PopID(); + ImGui::PopStyleVar(); + ImGui::TreePop(); + } +} + +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowWidgets() +//----------------------------------------------------------------------------- + +static void DemoWindowWidgets(ImGuiDemoWindowData* demo_data) +{ + IMGUI_DEMO_MARKER("Widgets"); + //ImGui::SetNextItemOpen(true, ImGuiCond_Once); + if (!ImGui::CollapsingHeader("Widgets")) + return; + + const bool disable_all = demo_data->DisableSections; // The Checkbox for that is inside the "Disabled" section at the bottom + if (disable_all) + ImGui::BeginDisabled(); + + DemoWindowWidgetsBasic(); + DemoWindowWidgetsBullets(); + DemoWindowWidgetsCollapsingHeaders(); + DemoWindowWidgetsComboBoxes(); + DemoWindowWidgetsColorAndPickers(); + DemoWindowWidgetsDataTypes(); + + if (disable_all) + ImGui::EndDisabled(); + DemoWindowWidgetsDisableBlocks(demo_data); + if (disable_all) + ImGui::BeginDisabled(); + + DemoWindowWidgetsDragAndDrop(); + DemoWindowWidgetsDragsAndSliders(); + DemoWindowWidgetsImages(); + DemoWindowWidgetsListBoxes(); + DemoWindowWidgetsMultiComponents(); + DemoWindowWidgetsPlotting(); + DemoWindowWidgetsProgressBars(); + DemoWindowWidgetsQueryingStatuses(); + DemoWindowWidgetsSelectables(); + DemoWindowWidgetsSelectionAndMultiSelect(demo_data); + DemoWindowWidgetsTabs(); + DemoWindowWidgetsText(); + DemoWindowWidgetsTextFilter(); + DemoWindowWidgetsTextInput(); + DemoWindowWidgetsTooltips(); + DemoWindowWidgetsTreeNodes(); + DemoWindowWidgetsVerticalSliders(); + + if (disable_all) + ImGui::EndDisabled(); +} + +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowLayout() +//----------------------------------------------------------------------------- + +static void DemoWindowLayout() +{ + IMGUI_DEMO_MARKER("Layout"); + if (!ImGui::CollapsingHeader("Layout & Scrolling")) + return; + + IMGUI_DEMO_MARKER("Layout/Child windows"); + if (ImGui::TreeNode("Child windows")) + { + ImGui::SeparatorText("Child windows"); + + HelpMarker("Use child windows to begin into a self-contained independent scrolling/clipping regions within a host window."); + static bool disable_mouse_wheel = false; + static bool disable_menu = false; + ImGui::Checkbox("Disable Mouse Wheel", &disable_mouse_wheel); + ImGui::Checkbox("Disable Menu", &disable_menu); + + // Child 1: no border, enable horizontal scrollbar + { + ImGuiWindowFlags window_flags = ImGuiWindowFlags_HorizontalScrollbar; + if (disable_mouse_wheel) + window_flags |= ImGuiWindowFlags_NoScrollWithMouse; + ImGui::BeginChild("ChildL", ImVec2(ImGui::GetContentRegionAvail().x * 0.5f, 260), ImGuiChildFlags_None, window_flags); + for (int i = 0; i < 100; i++) + ImGui::Text("%04d: scrollable region", i); + ImGui::EndChild(); + } + + ImGui::SameLine(); + + // Child 2: rounded border + { + ImGuiWindowFlags window_flags = ImGuiWindowFlags_None; + if (disable_mouse_wheel) + window_flags |= ImGuiWindowFlags_NoScrollWithMouse; + if (!disable_menu) + window_flags |= ImGuiWindowFlags_MenuBar; + ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, 5.0f); + ImGui::BeginChild("ChildR", ImVec2(0, 260), ImGuiChildFlags_Borders, window_flags); + if (!disable_menu && ImGui::BeginMenuBar()) + { + if (ImGui::BeginMenu("Menu")) + { + ShowExampleMenuFile(); + ImGui::EndMenu(); + } + ImGui::EndMenuBar(); + } + if (ImGui::BeginTable("split", 2, ImGuiTableFlags_Resizable | ImGuiTableFlags_NoSavedSettings)) + { + for (int i = 0; i < 100; i++) + { + char buf[32]; + sprintf(buf, "%03d", i); + ImGui::TableNextColumn(); + ImGui::Button(buf, ImVec2(-FLT_MIN, 0.0f)); + } + ImGui::EndTable(); + } + ImGui::EndChild(); + ImGui::PopStyleVar(); + } + + // Child 3: manual-resize + ImGui::SeparatorText("Manual-resize"); + { + HelpMarker("Drag bottom border to resize. Double-click bottom border to auto-fit to vertical contents."); + //if (ImGui::Button("Set Height to 200")) + // ImGui::SetNextWindowSize(ImVec2(-FLT_MIN, 200.0f)); + + ImGui::PushStyleColor(ImGuiCol_ChildBg, ImGui::GetStyleColorVec4(ImGuiCol_FrameBg)); + if (ImGui::BeginChild("ResizableChild", ImVec2(-FLT_MIN, ImGui::GetTextLineHeightWithSpacing() * 8), ImGuiChildFlags_Borders | ImGuiChildFlags_ResizeY)) + for (int n = 0; n < 10; n++) + ImGui::Text("Line %04d", n); + ImGui::PopStyleColor(); + ImGui::EndChild(); + } + + // Child 4: auto-resizing height with a limit + ImGui::SeparatorText("Auto-resize with constraints"); + { + static int draw_lines = 3; + static int max_height_in_lines = 10; + ImGui::SetNextItemWidth(ImGui::GetFontSize() * 8); + ImGui::DragInt("Lines Count", &draw_lines, 0.2f); + ImGui::SetNextItemWidth(ImGui::GetFontSize() * 8); + ImGui::DragInt("Max Height (in Lines)", &max_height_in_lines, 0.2f); + + ImGui::SetNextWindowSizeConstraints(ImVec2(0.0f, ImGui::GetTextLineHeightWithSpacing() * 1), ImVec2(FLT_MAX, ImGui::GetTextLineHeightWithSpacing() * max_height_in_lines)); + if (ImGui::BeginChild("ConstrainedChild", ImVec2(-FLT_MIN, 0.0f), ImGuiChildFlags_Borders | ImGuiChildFlags_AutoResizeY)) + for (int n = 0; n < draw_lines; n++) + ImGui::Text("Line %04d", n); + ImGui::EndChild(); + } + + ImGui::SeparatorText("Misc/Advanced"); + + // Demonstrate a few extra things + // - Changing ImGuiCol_ChildBg (which is transparent black in default styles) + // - Using SetCursorPos() to position child window (the child window is an item from the POV of parent window) + // You can also call SetNextWindowPos() to position the child window. The parent window will effectively + // layout from this position. + // - Using ImGui::GetItemRectMin/Max() to query the "item" state (because the child window is an item from + // the POV of the parent window). See 'Demo->Querying Status (Edited/Active/Hovered etc.)' for details. + { + static int offset_x = 0; + static bool override_bg_color = true; + static ImGuiChildFlags child_flags = ImGuiChildFlags_Borders | ImGuiChildFlags_ResizeX | ImGuiChildFlags_ResizeY; + ImGui::SetNextItemWidth(ImGui::GetFontSize() * 8); + ImGui::DragInt("Offset X", &offset_x, 1.0f, -1000, 1000); + ImGui::Checkbox("Override ChildBg color", &override_bg_color); + ImGui::CheckboxFlags("ImGuiChildFlags_Borders", &child_flags, ImGuiChildFlags_Borders); + ImGui::CheckboxFlags("ImGuiChildFlags_AlwaysUseWindowPadding", &child_flags, ImGuiChildFlags_AlwaysUseWindowPadding); + ImGui::CheckboxFlags("ImGuiChildFlags_ResizeX", &child_flags, ImGuiChildFlags_ResizeX); + ImGui::CheckboxFlags("ImGuiChildFlags_ResizeY", &child_flags, ImGuiChildFlags_ResizeY); + ImGui::CheckboxFlags("ImGuiChildFlags_FrameStyle", &child_flags, ImGuiChildFlags_FrameStyle); + ImGui::SameLine(); HelpMarker("Style the child window like a framed item: use FrameBg, FrameRounding, FrameBorderSize, FramePadding instead of ChildBg, ChildRounding, ChildBorderSize, WindowPadding."); + if (child_flags & ImGuiChildFlags_FrameStyle) + override_bg_color = false; + + ImGui::SetCursorPosX(ImGui::GetCursorPosX() + (float)offset_x); + if (override_bg_color) + ImGui::PushStyleColor(ImGuiCol_ChildBg, IM_COL32(255, 0, 0, 100)); + ImGui::BeginChild("Red", ImVec2(200, 100), child_flags, ImGuiWindowFlags_None); + if (override_bg_color) + ImGui::PopStyleColor(); + + for (int n = 0; n < 50; n++) + ImGui::Text("Some test %d", n); + ImGui::EndChild(); + bool child_is_hovered = ImGui::IsItemHovered(); + ImVec2 child_rect_min = ImGui::GetItemRectMin(); + ImVec2 child_rect_max = ImGui::GetItemRectMax(); + ImGui::Text("Hovered: %d", child_is_hovered); + ImGui::Text("Rect of child window is: (%.0f,%.0f) (%.0f,%.0f)", child_rect_min.x, child_rect_min.y, child_rect_max.x, child_rect_max.y); + } + + ImGui::TreePop(); + } + + IMGUI_DEMO_MARKER("Layout/Widgets Width"); + if (ImGui::TreeNode("Widgets Width")) + { + static float f = 0.0f; + static bool show_indented_items = true; + ImGui::Checkbox("Show indented items", &show_indented_items); + + // Use SetNextItemWidth() to set the width of a single upcoming item. + // Use PushItemWidth()/PopItemWidth() to set the width of a group of items. + // In real code use you'll probably want to choose width values that are proportional to your font size + // e.g. Using '20.0f * GetFontSize()' as width instead of '200.0f', etc. + + ImGui::Text("SetNextItemWidth/PushItemWidth(100)"); + ImGui::SameLine(); HelpMarker("Fixed width."); + ImGui::PushItemWidth(100); + ImGui::DragFloat("float##1b", &f); + if (show_indented_items) + { + ImGui::Indent(); + ImGui::DragFloat("float (indented)##1b", &f); + ImGui::Unindent(); + } + ImGui::PopItemWidth(); + + ImGui::Text("SetNextItemWidth/PushItemWidth(-100)"); + ImGui::SameLine(); HelpMarker("Align to right edge minus 100"); + ImGui::PushItemWidth(-100); + ImGui::DragFloat("float##2a", &f); + if (show_indented_items) + { + ImGui::Indent(); + ImGui::DragFloat("float (indented)##2b", &f); + ImGui::Unindent(); + } + ImGui::PopItemWidth(); + + ImGui::Text("SetNextItemWidth/PushItemWidth(GetContentRegionAvail().x * 0.5f)"); + ImGui::SameLine(); HelpMarker("Half of available width.\n(~ right-cursor_pos)\n(works within a column set)"); + ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x * 0.5f); + ImGui::DragFloat("float##3a", &f); + if (show_indented_items) + { + ImGui::Indent(); + ImGui::DragFloat("float (indented)##3b", &f); + ImGui::Unindent(); + } + ImGui::PopItemWidth(); + + ImGui::Text("SetNextItemWidth/PushItemWidth(-GetContentRegionAvail().x * 0.5f)"); + ImGui::SameLine(); HelpMarker("Align to right edge minus half"); + ImGui::PushItemWidth(-ImGui::GetContentRegionAvail().x * 0.5f); + ImGui::DragFloat("float##4a", &f); + if (show_indented_items) + { + ImGui::Indent(); + ImGui::DragFloat("float (indented)##4b", &f); + ImGui::Unindent(); + } + ImGui::PopItemWidth(); + + // Demonstrate using PushItemWidth to surround three items. + // Calling SetNextItemWidth() before each of them would have the same effect. + ImGui::Text("SetNextItemWidth/PushItemWidth(-FLT_MIN)"); + ImGui::SameLine(); HelpMarker("Align to right edge"); + ImGui::PushItemWidth(-FLT_MIN); + ImGui::DragFloat("##float5a", &f); + if (show_indented_items) + { + ImGui::Indent(); + ImGui::DragFloat("float (indented)##5b", &f); + ImGui::Unindent(); + } + ImGui::PopItemWidth(); + + ImGui::TreePop(); + } + + IMGUI_DEMO_MARKER("Layout/Basic Horizontal Layout"); + if (ImGui::TreeNode("Basic Horizontal Layout")) + { + ImGui::TextWrapped("(Use ImGui::SameLine() to keep adding items to the right of the preceding item)"); + + // Text + IMGUI_DEMO_MARKER("Layout/Basic Horizontal Layout/SameLine"); + ImGui::Text("Two items: Hello"); ImGui::SameLine(); + ImGui::TextColored(ImVec4(1, 1, 0, 1), "Sailor"); + + // Adjust spacing + ImGui::Text("More spacing: Hello"); ImGui::SameLine(0, 20); + ImGui::TextColored(ImVec4(1, 1, 0, 1), "Sailor"); + + // Button + ImGui::AlignTextToFramePadding(); + ImGui::Text("Normal buttons"); ImGui::SameLine(); + ImGui::Button("Banana"); ImGui::SameLine(); + ImGui::Button("Apple"); ImGui::SameLine(); + ImGui::Button("Corniflower"); + + // Button + ImGui::Text("Small buttons"); ImGui::SameLine(); + ImGui::SmallButton("Like this one"); ImGui::SameLine(); + ImGui::Text("can fit within a text block."); + + // Aligned to arbitrary position. Easy/cheap column. + IMGUI_DEMO_MARKER("Layout/Basic Horizontal Layout/SameLine (with offset)"); + ImGui::Text("Aligned"); + ImGui::SameLine(150); ImGui::Text("x=150"); + ImGui::SameLine(300); ImGui::Text("x=300"); + ImGui::Text("Aligned"); + ImGui::SameLine(150); ImGui::SmallButton("x=150"); + ImGui::SameLine(300); ImGui::SmallButton("x=300"); + + // Checkbox + IMGUI_DEMO_MARKER("Layout/Basic Horizontal Layout/SameLine (more)"); + static bool c1 = false, c2 = false, c3 = false, c4 = false; + ImGui::Checkbox("My", &c1); ImGui::SameLine(); + ImGui::Checkbox("Tailor", &c2); ImGui::SameLine(); + ImGui::Checkbox("Is", &c3); ImGui::SameLine(); + ImGui::Checkbox("Rich", &c4); + + // Various + static float f0 = 1.0f, f1 = 2.0f, f2 = 3.0f; + ImGui::PushItemWidth(80); + const char* items[] = { "AAAA", "BBBB", "CCCC", "DDDD" }; + static int item = -1; + ImGui::Combo("Combo", &item, items, IM_ARRAYSIZE(items)); ImGui::SameLine(); + ImGui::SliderFloat("X", &f0, 0.0f, 5.0f); ImGui::SameLine(); + ImGui::SliderFloat("Y", &f1, 0.0f, 5.0f); ImGui::SameLine(); + ImGui::SliderFloat("Z", &f2, 0.0f, 5.0f); + ImGui::PopItemWidth(); + + ImGui::PushItemWidth(80); + ImGui::Text("Lists:"); + static int selection[4] = { 0, 1, 2, 3 }; + for (int i = 0; i < 4; i++) + { + if (i > 0) ImGui::SameLine(); + ImGui::PushID(i); + ImGui::ListBox("", &selection[i], items, IM_ARRAYSIZE(items)); + ImGui::PopID(); + //ImGui::SetItemTooltip("ListBox %d hovered", i); + } + ImGui::PopItemWidth(); + + // Dummy + IMGUI_DEMO_MARKER("Layout/Basic Horizontal Layout/Dummy"); + ImVec2 button_sz(40, 40); + ImGui::Button("A", button_sz); ImGui::SameLine(); + ImGui::Dummy(button_sz); ImGui::SameLine(); + ImGui::Button("B", button_sz); + + // Manually wrapping + // (we should eventually provide this as an automatic layout feature, but for now you can do it manually) + IMGUI_DEMO_MARKER("Layout/Basic Horizontal Layout/Manual wrapping"); + ImGui::Text("Manual wrapping:"); + ImGuiStyle& style = ImGui::GetStyle(); + int buttons_count = 20; + float window_visible_x2 = ImGui::GetCursorScreenPos().x + ImGui::GetContentRegionAvail().x; + for (int n = 0; n < buttons_count; n++) + { + ImGui::PushID(n); + ImGui::Button("Box", button_sz); + float last_button_x2 = ImGui::GetItemRectMax().x; + float next_button_x2 = last_button_x2 + style.ItemSpacing.x + button_sz.x; // Expected position if next button was on same line + if (n + 1 < buttons_count && next_button_x2 < window_visible_x2) + ImGui::SameLine(); + ImGui::PopID(); + } + + ImGui::TreePop(); + } + + IMGUI_DEMO_MARKER("Layout/Groups"); if (ImGui::TreeNode("Groups")) { - HelpMarker("Using ImGui::BeginGroup()/EndGroup() to layout items. BeginGroup() basically locks the horizontal position. EndGroup() bundles the whole group so that you can use functions such as IsItemHovered() on it."); + HelpMarker( + "BeginGroup() basically locks the horizontal position for new line. " + "EndGroup() bundles the whole group so that you can use \"item\" functions such as " + "IsItemHovered()/IsItemActive() or SameLine() etc. on the whole group."); ImGui::BeginGroup(); { ImGui::BeginGroup(); @@ -1972,134 +4578,217 @@ static void ShowDemoWindowLayout() ImGui::SameLine(); ImGui::Button("EEE"); ImGui::EndGroup(); - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("First group hovered"); + ImGui::SetItemTooltip("First group hovered"); } // Capture the group size and create widgets using the same size ImVec2 size = ImGui::GetItemRectSize(); const float values[5] = { 0.5f, 0.20f, 0.80f, 0.60f, 0.25f }; ImGui::PlotHistogram("##values", values, IM_ARRAYSIZE(values), 0, NULL, 0.0f, 1.0f, size); - ImGui::Button("ACTION", ImVec2((size.x - ImGui::GetStyle().ItemSpacing.x)*0.5f, size.y)); + ImGui::Button("ACTION", ImVec2((size.x - ImGui::GetStyle().ItemSpacing.x) * 0.5f, size.y)); ImGui::SameLine(); - ImGui::Button("REACTION", ImVec2((size.x - ImGui::GetStyle().ItemSpacing.x)*0.5f, size.y)); + ImGui::Button("REACTION", ImVec2((size.x - ImGui::GetStyle().ItemSpacing.x) * 0.5f, size.y)); ImGui::EndGroup(); ImGui::SameLine(); ImGui::Button("LEVERAGE\nBUZZWORD", size); ImGui::SameLine(); - if (ImGui::ListBoxHeader("List", size)) + if (ImGui::BeginListBox("List", size)) { ImGui::Selectable("Selected", true); ImGui::Selectable("Not Selected", false); - ImGui::ListBoxFooter(); + ImGui::EndListBox(); } ImGui::TreePop(); } + IMGUI_DEMO_MARKER("Layout/Text Baseline Alignment"); if (ImGui::TreeNode("Text Baseline Alignment")) { - HelpMarker("This is testing the vertical alignment that gets applied on text to keep it aligned with widgets. Lines only composed of text or \"small\" widgets fit in less vertical spaces than lines with normal widgets."); + { + ImGui::BulletText("Text baseline:"); + ImGui::SameLine(); HelpMarker( + "This is testing the vertical alignment that gets applied on text to keep it aligned with widgets. " + "Lines only composed of text or \"small\" widgets use less vertical space than lines with framed widgets."); + ImGui::Indent(); - ImGui::Text("One\nTwo\nThree"); ImGui::SameLine(); - ImGui::Text("Hello\nWorld"); ImGui::SameLine(); - ImGui::Text("Banana"); + ImGui::Text("KO Blahblah"); ImGui::SameLine(); + ImGui::Button("Some framed item"); ImGui::SameLine(); + HelpMarker("Baseline of button will look misaligned with text.."); - ImGui::Text("Banana"); ImGui::SameLine(); - ImGui::Text("Hello\nWorld"); ImGui::SameLine(); - ImGui::Text("One\nTwo\nThree"); + // If your line starts with text, call AlignTextToFramePadding() to align text to upcoming widgets. + // (because we don't know what's coming after the Text() statement, we need to move the text baseline + // down by FramePadding.y ahead of time) + ImGui::AlignTextToFramePadding(); + ImGui::Text("OK Blahblah"); ImGui::SameLine(); + ImGui::Button("Some framed item##2"); ImGui::SameLine(); + HelpMarker("We call AlignTextToFramePadding() to vertically align the text baseline by +FramePadding.y"); - ImGui::Button("HOP##1"); ImGui::SameLine(); - ImGui::Text("Banana"); ImGui::SameLine(); - ImGui::Text("Hello\nWorld"); ImGui::SameLine(); - ImGui::Text("Banana"); + // SmallButton() uses the same vertical padding as Text + ImGui::Button("TEST##1"); ImGui::SameLine(); + ImGui::Text("TEST"); ImGui::SameLine(); + ImGui::SmallButton("TEST##2"); - ImGui::Button("HOP##2"); ImGui::SameLine(); - ImGui::Text("Hello\nWorld"); ImGui::SameLine(); - ImGui::Text("Banana"); + // If your line starts with text, call AlignTextToFramePadding() to align text to upcoming widgets. + ImGui::AlignTextToFramePadding(); + ImGui::Text("Text aligned to framed item"); ImGui::SameLine(); + ImGui::Button("Item##1"); ImGui::SameLine(); + ImGui::Text("Item"); ImGui::SameLine(); + ImGui::SmallButton("Item##2"); ImGui::SameLine(); + ImGui::Button("Item##3"); - ImGui::Button("TEST##1"); ImGui::SameLine(); - ImGui::Text("TEST"); ImGui::SameLine(); - ImGui::SmallButton("TEST##2"); + ImGui::Unindent(); + } - ImGui::AlignTextToFramePadding(); // If your line starts with text, call this to align it to upcoming widgets. - ImGui::Text("Text aligned to Widget"); ImGui::SameLine(); - ImGui::Button("Widget##1"); ImGui::SameLine(); - ImGui::Text("Widget"); ImGui::SameLine(); - ImGui::SmallButton("Widget##2"); ImGui::SameLine(); - ImGui::Button("Widget##3"); + ImGui::Spacing(); - // Tree - const float spacing = ImGui::GetStyle().ItemInnerSpacing.x; - ImGui::Button("Button##1"); - ImGui::SameLine(0.0f, spacing); - if (ImGui::TreeNode("Node##1")) { for (int i = 0; i < 6; i++) ImGui::BulletText("Item %d..", i); ImGui::TreePop(); } // Dummy tree data + { + ImGui::BulletText("Multi-line text:"); + ImGui::Indent(); + ImGui::Text("One\nTwo\nThree"); ImGui::SameLine(); + ImGui::Text("Hello\nWorld"); ImGui::SameLine(); + ImGui::Text("Banana"); - ImGui::AlignTextToFramePadding(); // Vertically align text node a bit lower so it'll be vertically centered with upcoming widget. Otherwise you can use SmallButton (smaller fit). - bool node_open = ImGui::TreeNode("Node##2"); // Common mistake to avoid: if we want to SameLine after TreeNode we need to do it before we add child content. - ImGui::SameLine(0.0f, spacing); ImGui::Button("Button##2"); - if (node_open) { for (int i = 0; i < 6; i++) ImGui::BulletText("Item %d..", i); ImGui::TreePop(); } // Dummy tree data + ImGui::Text("Banana"); ImGui::SameLine(); + ImGui::Text("Hello\nWorld"); ImGui::SameLine(); + ImGui::Text("One\nTwo\nThree"); - // Bullet - ImGui::Button("Button##3"); - ImGui::SameLine(0.0f, spacing); - ImGui::BulletText("Bullet text"); + ImGui::Button("HOP##1"); ImGui::SameLine(); + ImGui::Text("Banana"); ImGui::SameLine(); + ImGui::Text("Hello\nWorld"); ImGui::SameLine(); + ImGui::Text("Banana"); - ImGui::AlignTextToFramePadding(); - ImGui::BulletText("Node"); - ImGui::SameLine(0.0f, spacing); ImGui::Button("Button##4"); + ImGui::Button("HOP##2"); ImGui::SameLine(); + ImGui::Text("Hello\nWorld"); ImGui::SameLine(); + ImGui::Text("Banana"); + ImGui::Unindent(); + } + + ImGui::Spacing(); + + { + ImGui::BulletText("Misc items:"); + ImGui::Indent(); + + // SmallButton() sets FramePadding to zero. Text baseline is aligned to match baseline of previous Button. + ImGui::Button("80x80", ImVec2(80, 80)); + ImGui::SameLine(); + ImGui::Button("50x50", ImVec2(50, 50)); + ImGui::SameLine(); + ImGui::Button("Button()"); + ImGui::SameLine(); + ImGui::SmallButton("SmallButton()"); + + // Tree + const float spacing = ImGui::GetStyle().ItemInnerSpacing.x; + ImGui::Button("Button##1"); + ImGui::SameLine(0.0f, spacing); + if (ImGui::TreeNode("Node##1")) + { + // Placeholder tree data + for (int i = 0; i < 6; i++) + ImGui::BulletText("Item %d..", i); + ImGui::TreePop(); + } + + // Vertically align text node a bit lower so it'll be vertically centered with upcoming widget. + // Otherwise you can use SmallButton() (smaller fit). + ImGui::AlignTextToFramePadding(); + + // Common mistake to avoid: if we want to SameLine after TreeNode we need to do it before we add + // other contents below the node. + bool node_open = ImGui::TreeNode("Node##2"); + ImGui::SameLine(0.0f, spacing); ImGui::Button("Button##2"); + if (node_open) + { + // Placeholder tree data + for (int i = 0; i < 6; i++) + ImGui::BulletText("Item %d..", i); + ImGui::TreePop(); + } + + // Bullet + ImGui::Button("Button##3"); + ImGui::SameLine(0.0f, spacing); + ImGui::BulletText("Bullet text"); + + ImGui::AlignTextToFramePadding(); + ImGui::BulletText("Node"); + ImGui::SameLine(0.0f, spacing); ImGui::Button("Button##4"); + ImGui::Unindent(); + } ImGui::TreePop(); } + IMGUI_DEMO_MARKER("Layout/Scrolling"); if (ImGui::TreeNode("Scrolling")) { - HelpMarker("Use SetScrollHereY() or SetScrollFromPosY() to scroll to a given position."); + // Vertical scroll functions + IMGUI_DEMO_MARKER("Layout/Scrolling/Vertical"); + HelpMarker("Use SetScrollHereY() or SetScrollFromPosY() to scroll to a given vertical position."); - static bool track = true; - static int track_line = 50; + static int track_item = 50; + static bool enable_track = true; + static bool enable_extra_decorations = false; static float scroll_to_off_px = 0.0f; static float scroll_to_pos_px = 200.0f; - ImGui::Checkbox("Track", &track); + + ImGui::Checkbox("Decoration", &enable_extra_decorations); + + ImGui::Checkbox("Track", &enable_track); ImGui::PushItemWidth(100); - ImGui::SameLine(140); track |= ImGui::DragInt("##line", &track_line, 0.25f, 0, 99, "Line = %d"); + ImGui::SameLine(140); enable_track |= ImGui::DragInt("##item", &track_item, 0.25f, 0, 99, "Item = %d"); bool scroll_to_off = ImGui::Button("Scroll Offset"); - ImGui::SameLine(140); scroll_to_off |= ImGui::DragFloat("##off_y", &scroll_to_off_px, 1.00f, 0, 9999, "+%.0f px"); + ImGui::SameLine(140); scroll_to_off |= ImGui::DragFloat("##off", &scroll_to_off_px, 1.00f, 0, FLT_MAX, "+%.0f px"); bool scroll_to_pos = ImGui::Button("Scroll To Pos"); - ImGui::SameLine(140); scroll_to_pos |= ImGui::DragFloat("##pos_y", &scroll_to_pos_px, 1.00f, 0, 9999, "Y = %.0f px"); - + ImGui::SameLine(140); scroll_to_pos |= ImGui::DragFloat("##pos", &scroll_to_pos_px, 1.00f, -10, FLT_MAX, "X/Y = %.0f px"); ImGui::PopItemWidth(); + if (scroll_to_off || scroll_to_pos) - track = false; + enable_track = false; ImGuiStyle& style = ImGui::GetStyle(); float child_w = (ImGui::GetContentRegionAvail().x - 4 * style.ItemSpacing.x) / 5; + if (child_w < 1.0f) + child_w = 1.0f; + ImGui::PushID("##VerticalScrolling"); for (int i = 0; i < 5; i++) { if (i > 0) ImGui::SameLine(); ImGui::BeginGroup(); - ImGui::Text("%s", i == 0 ? "Top" : i == 1 ? "25%" : i == 2 ? "Center" : i == 3 ? "75%" : "Bottom"); + const char* names[] = { "Top", "25%", "Center", "75%", "Bottom" }; + ImGui::TextUnformatted(names[i]); - ImGuiWindowFlags child_flags = ImGuiWindowFlags_MenuBar; - ImGui::BeginChild(ImGui::GetID((void*)(intptr_t)i), ImVec2(child_w, 200.0f), true, child_flags); + const ImGuiWindowFlags child_flags = enable_extra_decorations ? ImGuiWindowFlags_MenuBar : 0; + const ImGuiID child_id = ImGui::GetID((void*)(intptr_t)i); + const bool child_is_visible = ImGui::BeginChild(child_id, ImVec2(child_w, 200.0f), ImGuiChildFlags_Borders, child_flags); + if (ImGui::BeginMenuBar()) + { + ImGui::TextUnformatted("abc"); + ImGui::EndMenuBar(); + } if (scroll_to_off) ImGui::SetScrollY(scroll_to_off_px); if (scroll_to_pos) ImGui::SetScrollFromPosY(ImGui::GetCursorStartPos().y + scroll_to_pos_px, i * 0.25f); - for (int line = 0; line < 100; line++) + if (child_is_visible) // Avoid calling SetScrollHereY when running with culled items { - if (track && line == track_line) + for (int item = 0; item < 100; item++) { - ImGui::TextColored(ImVec4(1,1,0,1), "Line %d", line); - ImGui::SetScrollHereY(i * 0.25f); // 0.0f:top, 0.5f:center, 1.0f:bottom - } - else - { - ImGui::Text("Line %d", line); + if (enable_track && item == track_item) + { + ImGui::TextColored(ImVec4(1, 1, 0, 1), "Item %d", item); + ImGui::SetScrollHereY(i * 0.25f); // 0.0f:top, 0.5f:center, 1.0f:bottom + } + else + { + ImGui::Text("Item %d", item); + } } } float scroll_y = ImGui::GetScrollY(); @@ -2108,21 +4797,71 @@ static void ShowDemoWindowLayout() ImGui::Text("%.0f/%.0f", scroll_y, scroll_max_y); ImGui::EndGroup(); } - ImGui::TreePop(); - } + ImGui::PopID(); - if (ImGui::TreeNode("Horizontal Scrolling")) - { - HelpMarker("Horizontal scrolling for a window has to be enabled explicitly via the ImGuiWindowFlags_HorizontalScrollbar flag.\n\nYou may want to explicitly specify content width by calling SetNextWindowContentWidth() before Begin()."); + // Horizontal scroll functions + IMGUI_DEMO_MARKER("Layout/Scrolling/Horizontal"); + ImGui::Spacing(); + HelpMarker( + "Use SetScrollHereX() or SetScrollFromPosX() to scroll to a given horizontal position.\n\n" + "Because the clipping rectangle of most window hides half worth of WindowPadding on the " + "left/right, using SetScrollFromPosX(+1) will usually result in clipped text whereas the " + "equivalent SetScrollFromPosY(+1) wouldn't."); + ImGui::PushID("##HorizontalScrolling"); + for (int i = 0; i < 5; i++) + { + float child_height = ImGui::GetTextLineHeight() + style.ScrollbarSize + style.WindowPadding.y * 2.0f; + ImGuiWindowFlags child_flags = ImGuiWindowFlags_HorizontalScrollbar | (enable_extra_decorations ? ImGuiWindowFlags_AlwaysVerticalScrollbar : 0); + ImGuiID child_id = ImGui::GetID((void*)(intptr_t)i); + bool child_is_visible = ImGui::BeginChild(child_id, ImVec2(-100, child_height), ImGuiChildFlags_Borders, child_flags); + if (scroll_to_off) + ImGui::SetScrollX(scroll_to_off_px); + if (scroll_to_pos) + ImGui::SetScrollFromPosX(ImGui::GetCursorStartPos().x + scroll_to_pos_px, i * 0.25f); + if (child_is_visible) // Avoid calling SetScrollHereY when running with culled items + { + for (int item = 0; item < 100; item++) + { + if (item > 0) + ImGui::SameLine(); + if (enable_track && item == track_item) + { + ImGui::TextColored(ImVec4(1, 1, 0, 1), "Item %d", item); + ImGui::SetScrollHereX(i * 0.25f); // 0.0f:left, 0.5f:center, 1.0f:right + } + else + { + ImGui::Text("Item %d", item); + } + } + } + float scroll_x = ImGui::GetScrollX(); + float scroll_max_x = ImGui::GetScrollMaxX(); + ImGui::EndChild(); + ImGui::SameLine(); + const char* names[] = { "Left", "25%", "Center", "75%", "Right" }; + ImGui::Text("%s\n%.0f/%.0f", names[i], scroll_x, scroll_max_x); + ImGui::Spacing(); + } + ImGui::PopID(); + + // Miscellaneous Horizontal Scrolling Demo + IMGUI_DEMO_MARKER("Layout/Scrolling/Horizontal (more)"); + HelpMarker( + "Horizontal scrolling for a window is enabled via the ImGuiWindowFlags_HorizontalScrollbar flag.\n\n" + "You may want to also explicitly specify content width by using SetNextWindowContentWidth() before Begin()."); static int lines = 7; ImGui::SliderInt("Lines", &lines, 1, 15); ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f); ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(2.0f, 1.0f)); - ImGui::BeginChild("scrolling", ImVec2(0, ImGui::GetFrameHeightWithSpacing() * 7 + 30), true, ImGuiWindowFlags_HorizontalScrollbar); + ImVec2 scrolling_child_size = ImVec2(0, ImGui::GetFrameHeightWithSpacing() * 7 + 30); + ImGui::BeginChild("scrolling", scrolling_child_size, ImGuiChildFlags_Borders, ImGuiWindowFlags_HorizontalScrollbar); for (int line = 0; line < lines; line++) { - // Display random stuff (for the sake of this trivial demo we are using basic Button+SameLine. If you want to create your own time line for a real application you may be better off - // manipulating the cursor position yourself, aka using SetCursorPos/SetCursorScreenPos to position the widgets yourself. You may also want to use the lower-level ImDrawList API) + // Display random stuff. For the sake of this trivial demo we are using basic Button() + SameLine() + // If you want to create your own time line for a real application you may be better off manipulating + // the cursor position yourself, aka using SetCursorPos/SetCursorScreenPos to position the widgets + // yourself. You may also want to use the lower-level ImDrawList API. int num_buttons = 10 + ((line & 1) ? line * 9 : line * 3); for (int n = 0; n < num_buttons; n++) { @@ -2130,8 +4869,8 @@ static void ShowDemoWindowLayout() ImGui::PushID(n + line * 1000); char num_buf[16]; sprintf(num_buf, "%d", n); - const char* label = (!(n%15)) ? "FizzBuzz" : (!(n%3)) ? "Fizz" : (!(n%5)) ? "Buzz" : num_buf; - float hue = n*0.05f; + const char* label = (!(n % 15)) ? "FizzBuzz" : (!(n % 3)) ? "Fizz" : (!(n % 5)) ? "Buzz" : num_buf; + float hue = n * 0.05f; ImGui::PushStyleColor(ImGuiCol_Button, (ImVec4)ImColor::HSV(hue, 0.6f, 0.6f)); ImGui::PushStyleColor(ImGuiCol_ButtonHovered, (ImVec4)ImColor::HSV(hue, 0.7f, 0.7f)); ImGui::PushStyleColor(ImGuiCol_ButtonActive, (ImVec4)ImColor::HSV(hue, 0.8f, 0.8f)); @@ -2145,13 +4884,21 @@ static void ShowDemoWindowLayout() ImGui::EndChild(); ImGui::PopStyleVar(2); float scroll_x_delta = 0.0f; - ImGui::SmallButton("<<"); if (ImGui::IsItemActive()) { scroll_x_delta = -ImGui::GetIO().DeltaTime * 1000.0f; } ImGui::SameLine(); + ImGui::SmallButton("<<"); + if (ImGui::IsItemActive()) + scroll_x_delta = -ImGui::GetIO().DeltaTime * 1000.0f; + ImGui::SameLine(); ImGui::Text("Scroll from code"); ImGui::SameLine(); - ImGui::SmallButton(">>"); if (ImGui::IsItemActive()) { scroll_x_delta = +ImGui::GetIO().DeltaTime * 1000.0f; } ImGui::SameLine(); + ImGui::SmallButton(">>"); + if (ImGui::IsItemActive()) + scroll_x_delta = +ImGui::GetIO().DeltaTime * 1000.0f; + ImGui::SameLine(); ImGui::Text("%.0f/%.0f", scroll_x, scroll_max_x); if (scroll_x_delta != 0.0f) { - ImGui::BeginChild("scrolling"); // Demonstrate a trick: you can use Begin to set yourself in the context of another window (here we are already out of your child window) + // Demonstrate a trick: you can use Begin to set yourself in the context of another window + // (here we are already out of your child window) + ImGui::BeginChild("scrolling"); ImGui::SetScrollX(ImGui::GetScrollX() + scroll_x_delta); ImGui::EndChild(); } @@ -2174,9 +4921,12 @@ static void ShowDemoWindowLayout() if (explicit_content_size) ImGui::SetNextWindowContentSize(ImVec2(contents_size_x, 0.0f)); ImGui::Begin("Horizontal contents size demo window", &show_horizontal_contents_size_demo_window, show_h_scrollbar ? ImGuiWindowFlags_HorizontalScrollbar : 0); + IMGUI_DEMO_MARKER("Layout/Scrolling/Horizontal contents size demo window"); ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(2, 0)); ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(2, 0)); - HelpMarker("Test of different widgets react and impact the work rectangle growing when horizontal scrolling is enabled.\n\nUse 'Metrics->Tools->Show windows rectangles' to visualize rectangles."); + HelpMarker( + "Test how different widgets react and impact the work rectangle growing when horizontal scrolling is enabled.\n\n" + "Use 'Metrics->Tools->Show windows rectangles' to visualize rectangles."); ImGui::Checkbox("H-scrollbar", &show_h_scrollbar); ImGui::Checkbox("Button", &show_button); // Will grow contents size (unless explicitly overwritten) ImGui::Checkbox("Tree nodes", &show_tree_nodes); // Will grow contents size and display highlight over full width @@ -2191,7 +4941,7 @@ static void ShowDemoWindowLayout() ImGui::SameLine(); ImGui::SetNextItemWidth(100); ImGui::DragFloat("##csx", &contents_size_x); - ImVec2 p = ImGui::GetCursorScreenPos(); + ImVec2 p = ImGui::GetCursorScreenPos(); ImGui::GetWindowDrawList()->AddRectFilled(p, ImVec2(p.x + 10, p.y + 10), IM_COL32_WHITE); ImGui::GetWindowDrawList()->AddRectFilled(ImVec2(p.x + contents_size_x - 10, p.y), ImVec2(p.x + contents_size_x, p.y + 10), IM_COL32_WHITE); ImGui::Dummy(ImVec2(0, 10)); @@ -2222,6 +4972,17 @@ static void ShowDemoWindowLayout() } if (show_columns) { + ImGui::Text("Tables:"); + if (ImGui::BeginTable("table", 4, ImGuiTableFlags_Borders)) + { + for (int n = 0; n < 4; n++) + { + ImGui::TableNextColumn(); + ImGui::Text("Width %.2f", ImGui::GetContentRegionAvail().x); + } + ImGui::EndTable(); + } + ImGui::Text("Columns:"); ImGui::Columns(4); for (int n = 0; n < 4; n++) { @@ -2240,7 +5001,7 @@ static void ShowDemoWindowLayout() } if (show_child) { - ImGui::BeginChild("child", ImVec2(0,0), true); + ImGui::BeginChild("child", ImVec2(0, 0), ImGuiChildFlags_Borders); ImGui::EndChild(); } ImGui::End(); @@ -2249,34 +5010,122 @@ static void ShowDemoWindowLayout() ImGui::TreePop(); } - if (ImGui::TreeNode("Clipping")) + IMGUI_DEMO_MARKER("Layout/Text Clipping"); + if (ImGui::TreeNode("Text Clipping")) { - static ImVec2 size(100, 100), offset(50, 20); - ImGui::TextWrapped("On a per-widget basis we are occasionally clipping text CPU-side if it won't fit in its frame. Otherwise we are doing coarser clipping + passing a scissor rectangle to the renderer. The system is designed to try minimizing both execution and CPU/GPU rendering cost."); + static ImVec2 size(100.0f, 100.0f); + static ImVec2 offset(30.0f, 30.0f); ImGui::DragFloat2("size", (float*)&size, 0.5f, 1.0f, 200.0f, "%.0f"); - ImGui::TextWrapped("(Click and drag)"); - ImVec2 pos = ImGui::GetCursorScreenPos(); - ImVec4 clip_rect(pos.x, pos.y, pos.x + size.x, pos.y + size.y); - ImGui::InvisibleButton("##dummy", size); - if (ImGui::IsItemActive() && ImGui::IsMouseDragging()) { offset.x += ImGui::GetIO().MouseDelta.x; offset.y += ImGui::GetIO().MouseDelta.y; } - ImGui::GetWindowDrawList()->AddRectFilled(pos, ImVec2(pos.x + size.x, pos.y + size.y), IM_COL32(90, 90, 120, 255)); - ImGui::GetWindowDrawList()->AddText(ImGui::GetFont(), ImGui::GetFontSize()*2.0f, ImVec2(pos.x + offset.x, pos.y + offset.y), IM_COL32(255, 255, 255, 255), "Line 1 hello\nLine 2 clip me!", NULL, 0.0f, &clip_rect); + ImGui::TextWrapped("(Click and drag to scroll)"); + + HelpMarker( + "(Left) Using ImGui::PushClipRect():\n" + "Will alter ImGui hit-testing logic + ImDrawList rendering.\n" + "(use this if you want your clipping rectangle to affect interactions)\n\n" + "(Center) Using ImDrawList::PushClipRect():\n" + "Will alter ImDrawList rendering only.\n" + "(use this as a shortcut if you are only using ImDrawList calls)\n\n" + "(Right) Using ImDrawList::AddText() with a fine ClipRect:\n" + "Will alter only this specific ImDrawList::AddText() rendering.\n" + "This is often used internally to avoid altering the clipping rectangle and minimize draw calls."); + + for (int n = 0; n < 3; n++) + { + if (n > 0) + ImGui::SameLine(); + + ImGui::PushID(n); + ImGui::InvisibleButton("##canvas", size); + if (ImGui::IsItemActive() && ImGui::IsMouseDragging(ImGuiMouseButton_Left)) + { + offset.x += ImGui::GetIO().MouseDelta.x; + offset.y += ImGui::GetIO().MouseDelta.y; + } + ImGui::PopID(); + if (!ImGui::IsItemVisible()) // Skip rendering as ImDrawList elements are not clipped. + continue; + + const ImVec2 p0 = ImGui::GetItemRectMin(); + const ImVec2 p1 = ImGui::GetItemRectMax(); + const char* text_str = "Line 1 hello\nLine 2 clip me!"; + const ImVec2 text_pos = ImVec2(p0.x + offset.x, p0.y + offset.y); + ImDrawList* draw_list = ImGui::GetWindowDrawList(); + switch (n) + { + case 0: + ImGui::PushClipRect(p0, p1, true); + draw_list->AddRectFilled(p0, p1, IM_COL32(90, 90, 120, 255)); + draw_list->AddText(text_pos, IM_COL32_WHITE, text_str); + ImGui::PopClipRect(); + break; + case 1: + draw_list->PushClipRect(p0, p1, true); + draw_list->AddRectFilled(p0, p1, IM_COL32(90, 90, 120, 255)); + draw_list->AddText(text_pos, IM_COL32_WHITE, text_str); + draw_list->PopClipRect(); + break; + case 2: + ImVec4 clip_rect(p0.x, p0.y, p1.x, p1.y); // AddText() takes a ImVec4* here so let's convert. + draw_list->AddRectFilled(p0, p1, IM_COL32(90, 90, 120, 255)); + draw_list->AddText(ImGui::GetFont(), ImGui::GetFontSize(), text_pos, IM_COL32_WHITE, text_str, NULL, 0.0f, &clip_rect); + break; + } + } + + ImGui::TreePop(); + } + + IMGUI_DEMO_MARKER("Layout/Overlap Mode"); + if (ImGui::TreeNode("Overlap Mode")) + { + static bool enable_allow_overlap = true; + + HelpMarker( + "Hit-testing is by default performed in item submission order, which generally is perceived as 'back-to-front'.\n\n" + "By using SetNextItemAllowOverlap() you can notify that an item may be overlapped by another. " + "Doing so alters the hovering logic: items using AllowOverlap mode requires an extra frame to accept hovered state."); + ImGui::Checkbox("Enable AllowOverlap", &enable_allow_overlap); + + ImVec2 button1_pos = ImGui::GetCursorScreenPos(); + ImVec2 button2_pos = ImVec2(button1_pos.x + 50.0f, button1_pos.y + 50.0f); + if (enable_allow_overlap) + ImGui::SetNextItemAllowOverlap(); + ImGui::Button("Button 1", ImVec2(80, 80)); + ImGui::SetCursorScreenPos(button2_pos); + ImGui::Button("Button 2", ImVec2(80, 80)); + + // This is typically used with width-spanning items. + // (note that Selectable() has a dedicated flag ImGuiSelectableFlags_AllowOverlap, which is a shortcut + // for using SetNextItemAllowOverlap(). For demo purpose we use SetNextItemAllowOverlap() here.) + if (enable_allow_overlap) + ImGui::SetNextItemAllowOverlap(); + ImGui::Selectable("Some Selectable", false); + ImGui::SameLine(); + ImGui::SmallButton("++"); + ImGui::TreePop(); } } -static void ShowDemoWindowPopups() +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowPopups() +//----------------------------------------------------------------------------- + +static void DemoWindowPopups() { + IMGUI_DEMO_MARKER("Popups"); if (!ImGui::CollapsingHeader("Popups & Modal windows")) return; // The properties of popups windows are: // - They block normal mouse hovering detection outside them. (*) // - Unless modal, they can be closed by clicking anywhere outside them, or by pressing ESCAPE. - // - Their visibility state (~bool) is held internally by Dear ImGui instead of being held by the programmer as we are used to with regular Begin() calls. - // User can manipulate the visibility state by calling OpenPopup(). - // (*) One can use IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup) to bypass it and detect hovering even when normally blocked by a popup. - // Those three properties are connected. The library needs to hold their visibility state because it can close popups at any time. + // - Their visibility state (~bool) is held internally by Dear ImGui instead of being held by the programmer as + // we are used to with regular Begin() calls. User can manipulate the visibility state by calling OpenPopup(). + // (*) One can use IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup) to bypass it and detect hovering even + // when normally blocked by a popup. + // Those three properties are connected. The library needs to hold their visibility state BECAUSE it can close + // popups at any time. // Typical use for regular windows: // bool my_tool_is_active = false; if (ImGui::Button("Open")) my_tool_is_active = true; [...] if (my_tool_is_active) Begin("My Tool", &my_tool_is_active) { [...] } End(); @@ -2286,24 +5135,26 @@ static void ShowDemoWindowPopups() // With popups we have to go through a library call (here OpenPopup) to manipulate the visibility state. // This may be a bit confusing at first but it should quickly make sense. Follow on the examples below. + IMGUI_DEMO_MARKER("Popups/Popups"); if (ImGui::TreeNode("Popups")) { - ImGui::TextWrapped("When a popup is active, it inhibits interacting with windows that are behind the popup. Clicking outside the popup closes it."); + ImGui::TextWrapped( + "When a popup is active, it inhibits interacting with windows that are behind the popup. " + "Clicking outside the popup closes it."); static int selected_fish = -1; const char* names[] = { "Bream", "Haddock", "Mackerel", "Pollock", "Tilefish" }; static bool toggles[] = { true, false, false, false, false }; - // Simple selection popup - // (If you want to show the current selection inside the Button itself, you may want to build a string using the "###" operator to preserve a constant ID with a variable label) + // Simple selection popup (if you want to show the current selection inside the Button itself, + // you may want to build a string using the "###" operator to preserve a constant ID with a variable label) if (ImGui::Button("Select..")) ImGui::OpenPopup("my_select_popup"); ImGui::SameLine(); ImGui::TextUnformatted(selected_fish == -1 ? "" : names[selected_fish]); if (ImGui::BeginPopup("my_select_popup")) { - ImGui::Text("Aquarium"); - ImGui::Separator(); + ImGui::SeparatorText("Aquarium"); for (int i = 0; i < IM_ARRAYSIZE(names); i++) if (ImGui::Selectable(names[i])) selected_fish = i; @@ -2325,8 +5176,7 @@ static void ShowDemoWindowPopups() ImGui::Separator(); ImGui::Text("Tooltip here"); - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("I am a tooltip over a popup"); + ImGui::SetItemTooltip("I am a tooltip over a popup"); if (ImGui::Button("Stacked Popup")) ImGui::OpenPopup("another popup"); @@ -2352,73 +5202,138 @@ static void ShowDemoWindowPopups() } // Call the more complete ShowExampleMenuFile which we use in various places of this demo - if (ImGui::Button("File Menu..")) + if (ImGui::Button("With a menu..")) ImGui::OpenPopup("my_file_popup"); - if (ImGui::BeginPopup("my_file_popup")) + if (ImGui::BeginPopup("my_file_popup", ImGuiWindowFlags_MenuBar)) { - ShowExampleMenuFile(); + if (ImGui::BeginMenuBar()) + { + if (ImGui::BeginMenu("File")) + { + ShowExampleMenuFile(); + ImGui::EndMenu(); + } + if (ImGui::BeginMenu("Edit")) + { + ImGui::MenuItem("Dummy"); + ImGui::EndMenu(); + } + ImGui::EndMenuBar(); + } + ImGui::Text("Hello from popup!"); + ImGui::Button("This is a dummy button.."); ImGui::EndPopup(); } ImGui::TreePop(); } + IMGUI_DEMO_MARKER("Popups/Context menus"); if (ImGui::TreeNode("Context menus")) { + HelpMarker("\"Context\" functions are simple helpers to associate a Popup to a given Item or Window identifier."); + // BeginPopupContextItem() is a helper to provide common/simple popup behavior of essentially doing: - // if (IsItemHovered() && IsMouseReleased(0)) - // OpenPopup(id); - // return BeginPopup(id); - // For more advanced uses you may want to replicate and cuztomize this code. This the comments inside BeginPopupContextItem() implementation. - static float value = 0.5f; - ImGui::Text("Value = %.3f (<-- right-click here)", value); - if (ImGui::BeginPopupContextItem("item context menu")) + // if (id == 0) + // id = GetItemID(); // Use last item id + // if (IsItemHovered() && IsMouseReleased(ImGuiMouseButton_Right)) + // OpenPopup(id); + // return BeginPopup(id); + // For advanced uses you may want to replicate and customize this code. + // See more details in BeginPopupContextItem(). + + // Example 1 + // When used after an item that has an ID (e.g. Button), we can skip providing an ID to BeginPopupContextItem(), + // and BeginPopupContextItem() will use the last item ID as the popup ID. { - if (ImGui::Selectable("Set to zero")) value = 0.0f; - if (ImGui::Selectable("Set to PI")) value = 3.1415f; - ImGui::SetNextItemWidth(-1); - ImGui::DragFloat("##Value", &value, 0.1f, 0.0f, 0.0f); - ImGui::EndPopup(); + const char* names[5] = { "Label1", "Label2", "Label3", "Label4", "Label5" }; + static int selected = -1; + for (int n = 0; n < 5; n++) + { + if (ImGui::Selectable(names[n], selected == n)) + selected = n; + if (ImGui::BeginPopupContextItem()) // <-- use last item id as popup id + { + selected = n; + ImGui::Text("This a popup for \"%s\"!", names[n]); + if (ImGui::Button("Close")) + ImGui::CloseCurrentPopup(); + ImGui::EndPopup(); + } + ImGui::SetItemTooltip("Right-click to open popup"); + } } - // We can also use OpenPopupOnItemClick() which is the same as BeginPopupContextItem() but without the Begin call. - // So here we will make it that clicking on the text field with the right mouse button (1) will toggle the visibility of the popup above. - ImGui::Text("(You can also right-click me to open the same popup as above.)"); - ImGui::OpenPopupOnItemClick("item context menu", 1); - - // When used after an item that has an ID (here the Button), we can skip providing an ID to BeginPopupContextItem(). - // BeginPopupContextItem() will use the last item ID as the popup ID. - // In addition here, we want to include your editable label inside the button label. We use the ### operator to override the ID (read FAQ about ID for details) - static char name[32] = "Label1"; - char buf[64]; sprintf(buf, "Button: %s###Button", name); // ### operator override ID ignoring the preceding label - ImGui::Button(buf); - if (ImGui::BeginPopupContextItem()) + // Example 2 + // Popup on a Text() element which doesn't have an identifier: we need to provide an identifier to BeginPopupContextItem(). + // Using an explicit identifier is also convenient if you want to activate the popups from different locations. { - ImGui::Text("Edit name:"); - ImGui::InputText("##edit", name, IM_ARRAYSIZE(name)); - if (ImGui::Button("Close")) - ImGui::CloseCurrentPopup(); - ImGui::EndPopup(); + HelpMarker("Text() elements don't have stable identifiers so we need to provide one."); + static float value = 0.5f; + ImGui::Text("Value = %.3f <-- (1) right-click this text", value); + if (ImGui::BeginPopupContextItem("my popup")) + { + if (ImGui::Selectable("Set to zero")) value = 0.0f; + if (ImGui::Selectable("Set to PI")) value = 3.1415f; + ImGui::SetNextItemWidth(-FLT_MIN); + ImGui::DragFloat("##Value", &value, 0.1f, 0.0f, 0.0f); + ImGui::EndPopup(); + } + + // We can also use OpenPopupOnItemClick() to toggle the visibility of a given popup. + // Here we make it that right-clicking this other text element opens the same popup as above. + // The popup itself will be submitted by the code above. + ImGui::Text("(2) Or right-click this text"); + ImGui::OpenPopupOnItemClick("my popup", ImGuiPopupFlags_MouseButtonRight); + + // Back to square one: manually open the same popup. + if (ImGui::Button("(3) Or click this button")) + ImGui::OpenPopup("my popup"); + } + + // Example 3 + // When using BeginPopupContextItem() with an implicit identifier (NULL == use last item ID), + // we need to make sure your item identifier is stable. + // In this example we showcase altering the item label while preserving its identifier, using the ### operator (see FAQ). + { + HelpMarker("Showcase using a popup ID linked to item ID, with the item having a changing label + stable ID using the ### operator."); + static char name[32] = "Label1"; + char buf[64]; + sprintf(buf, "Button: %s###Button", name); // ### operator override ID ignoring the preceding label + ImGui::Button(buf); + if (ImGui::BeginPopupContextItem()) + { + ImGui::Text("Edit name:"); + ImGui::InputText("##edit", name, IM_ARRAYSIZE(name)); + if (ImGui::Button("Close")) + ImGui::CloseCurrentPopup(); + ImGui::EndPopup(); + } + ImGui::SameLine(); ImGui::Text("(<-- right-click here)"); } - ImGui::SameLine(); ImGui::Text("(<-- right-click here)"); ImGui::TreePop(); } + IMGUI_DEMO_MARKER("Popups/Modals"); if (ImGui::TreeNode("Modals")) { - ImGui::TextWrapped("Modal windows are like popups but the user cannot close them by clicking outside the window."); + ImGui::TextWrapped("Modal windows are like popups but the user cannot close them by clicking outside."); if (ImGui::Button("Delete..")) ImGui::OpenPopup("Delete?"); + // Always center this window when appearing + ImVec2 center = ImGui::GetMainViewport()->GetCenter(); + ImGui::SetNextWindowPos(center, ImGuiCond_Appearing, ImVec2(0.5f, 0.5f)); + if (ImGui::BeginPopupModal("Delete?", NULL, ImGuiWindowFlags_AlwaysAutoResize)) { - ImGui::Text("All those beautiful files will be deleted.\nThis operation cannot be undone!\n\n"); + ImGui::Text("All those beautiful files will be deleted.\nThis operation cannot be undone!"); ImGui::Separator(); - //static int dummy_i = 0; - //ImGui::Combo("Combo", &dummy_i, "Delete\0Delete harder\0"); + //static int unused_i = 0; + //ImGui::Combo("Combo", &unused_i, "Delete\0Delete harder\0"); static bool dont_ask_me_next_time = false; ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0)); @@ -2440,7 +5355,7 @@ static void ShowDemoWindowPopups() { if (ImGui::BeginMenu("File")) { - if (ImGui::MenuItem("Dummy menu item")) {} + if (ImGui::MenuItem("Some menu item")) {} ImGui::EndMenu(); } ImGui::EndMenuBar(); @@ -2449,19 +5364,21 @@ static void ShowDemoWindowPopups() // Testing behavior of widgets stacking their own regular popups over the modal. static int item = 1; - static float color[4] = { 0.4f,0.7f,0.0f,0.5f }; + static float color[4] = { 0.4f, 0.7f, 0.0f, 0.5f }; ImGui::Combo("Combo", &item, "aaaa\0bbbb\0cccc\0dddd\0eeee\0\0"); - ImGui::ColorEdit4("color", color); + ImGui::ColorEdit4("Color", color); if (ImGui::Button("Add another modal..")) ImGui::OpenPopup("Stacked 2"); - // Also demonstrate passing a bool* to BeginPopupModal(), this will create a regular close button which will close the popup. - // Note that the visibility state of popups is owned by imgui, so the input value of the bool actually doesn't matter here. - bool dummy_open = true; - if (ImGui::BeginPopupModal("Stacked 2", &dummy_open)) + // Also demonstrate passing a bool* to BeginPopupModal(), this will create a regular close button which + // will close the popup. Note that the visibility state of popups is owned by imgui, so the input value + // of the bool actually doesn't matter here. + bool unused_open = true; + if (ImGui::BeginPopupModal("Stacked 2", &unused_open)) { ImGui::Text("Hello from Stacked The Second!"); + ImGui::ColorEdit4("Color", color); // Allow opening another nested popup if (ImGui::Button("Close")) ImGui::CloseCurrentPopup(); ImGui::EndPopup(); @@ -2475,41 +5392,2105 @@ static void ShowDemoWindowPopups() ImGui::TreePop(); } + IMGUI_DEMO_MARKER("Popups/Menus inside a regular window"); if (ImGui::TreeNode("Menus inside a regular window")) { ImGui::TextWrapped("Below we are testing adding menu items to a regular window. It's rather unusual but should work!"); ImGui::Separator(); - // NB: As a quirk in this very specific example, we want to differentiate the parent of this menu from the parent of the various popup menus above. - // To do so we are encloding the items in a PushID()/PopID() block to make them two different menusets. If we don't, opening any popup above and hovering our menu here - // would open it. This is because once a menu is active, we allow to switch to a sibling menu by just hovering on it, which is the desired behavior for regular menus. - ImGui::PushID("foo"); + ImGui::MenuItem("Menu item", "CTRL+M"); if (ImGui::BeginMenu("Menu inside a regular window")) { ShowExampleMenuFile(); ImGui::EndMenu(); } - ImGui::PopID(); ImGui::Separator(); ImGui::TreePop(); } } -static void ShowDemoWindowColumns() +// Dummy data structure that we use for the Table demo. +// (pre-C++11 doesn't allow us to instantiate ImVector template if this structure is defined inside the demo function) +namespace { - if (!ImGui::CollapsingHeader("Columns")) +// We are passing our own identifier to TableSetupColumn() to facilitate identifying columns in the sorting code. +// This identifier will be passed down into ImGuiTableSortSpec::ColumnUserID. +// But it is possible to omit the user id parameter of TableSetupColumn() and just use the column index instead! (ImGuiTableSortSpec::ColumnIndex) +// If you don't use sorting, you will generally never care about giving column an ID! +enum MyItemColumnID +{ + MyItemColumnID_ID, + MyItemColumnID_Name, + MyItemColumnID_Action, + MyItemColumnID_Quantity, + MyItemColumnID_Description +}; + +struct MyItem +{ + int ID; + const char* Name; + int Quantity; + + // We have a problem which is affecting _only this demo_ and should not affect your code: + // As we don't rely on std:: or other third-party library to compile dear imgui, we only have reliable access to qsort(), + // however qsort doesn't allow passing user data to comparing function. + // As a workaround, we are storing the sort specs in a static/global for the comparing function to access. + // In your own use case you would probably pass the sort specs to your sorting/comparing functions directly and not use a global. + // We could technically call ImGui::TableGetSortSpecs() in CompareWithSortSpecs(), but considering that this function is called + // very often by the sorting algorithm it would be a little wasteful. + static const ImGuiTableSortSpecs* s_current_sort_specs; + + static void SortWithSortSpecs(ImGuiTableSortSpecs* sort_specs, MyItem* items, int items_count) + { + s_current_sort_specs = sort_specs; // Store in variable accessible by the sort function. + if (items_count > 1) + qsort(items, (size_t)items_count, sizeof(items[0]), MyItem::CompareWithSortSpecs); + s_current_sort_specs = NULL; + } + + // Compare function to be used by qsort() + static int IMGUI_CDECL CompareWithSortSpecs(const void* lhs, const void* rhs) + { + const MyItem* a = (const MyItem*)lhs; + const MyItem* b = (const MyItem*)rhs; + for (int n = 0; n < s_current_sort_specs->SpecsCount; n++) + { + // Here we identify columns using the ColumnUserID value that we ourselves passed to TableSetupColumn() + // We could also choose to identify columns based on their index (sort_spec->ColumnIndex), which is simpler! + const ImGuiTableColumnSortSpecs* sort_spec = &s_current_sort_specs->Specs[n]; + int delta = 0; + switch (sort_spec->ColumnUserID) + { + case MyItemColumnID_ID: delta = (a->ID - b->ID); break; + case MyItemColumnID_Name: delta = (strcmp(a->Name, b->Name)); break; + case MyItemColumnID_Quantity: delta = (a->Quantity - b->Quantity); break; + case MyItemColumnID_Description: delta = (strcmp(a->Name, b->Name)); break; + default: IM_ASSERT(0); break; + } + if (delta > 0) + return (sort_spec->SortDirection == ImGuiSortDirection_Ascending) ? +1 : -1; + if (delta < 0) + return (sort_spec->SortDirection == ImGuiSortDirection_Ascending) ? -1 : +1; + } + + // qsort() is instable so always return a way to differenciate items. + // Your own compare function may want to avoid fallback on implicit sort specs. + // e.g. a Name compare if it wasn't already part of the sort specs. + return (a->ID - b->ID); + } +}; +const ImGuiTableSortSpecs* MyItem::s_current_sort_specs = NULL; +} + +// Make the UI compact because there are so many fields +static void PushStyleCompact() +{ + ImGuiStyle& style = ImGui::GetStyle(); + ImGui::PushStyleVarY(ImGuiStyleVar_FramePadding, (float)(int)(style.FramePadding.y * 0.60f)); + ImGui::PushStyleVarY(ImGuiStyleVar_ItemSpacing, (float)(int)(style.ItemSpacing.y * 0.60f)); +} + +static void PopStyleCompact() +{ + ImGui::PopStyleVar(2); +} + +// Show a combo box with a choice of sizing policies +static void EditTableSizingFlags(ImGuiTableFlags* p_flags) +{ + struct EnumDesc { ImGuiTableFlags Value; const char* Name; const char* Tooltip; }; + static const EnumDesc policies[] = + { + { ImGuiTableFlags_None, "Default", "Use default sizing policy:\n- ImGuiTableFlags_SizingFixedFit if ScrollX is on or if host window has ImGuiWindowFlags_AlwaysAutoResize.\n- ImGuiTableFlags_SizingStretchSame otherwise." }, + { ImGuiTableFlags_SizingFixedFit, "ImGuiTableFlags_SizingFixedFit", "Columns default to _WidthFixed (if resizable) or _WidthAuto (if not resizable), matching contents width." }, + { ImGuiTableFlags_SizingFixedSame, "ImGuiTableFlags_SizingFixedSame", "Columns are all the same width, matching the maximum contents width.\nImplicitly disable ImGuiTableFlags_Resizable and enable ImGuiTableFlags_NoKeepColumnsVisible." }, + { ImGuiTableFlags_SizingStretchProp, "ImGuiTableFlags_SizingStretchProp", "Columns default to _WidthStretch with weights proportional to their widths." }, + { ImGuiTableFlags_SizingStretchSame, "ImGuiTableFlags_SizingStretchSame", "Columns default to _WidthStretch with same weights." } + }; + int idx; + for (idx = 0; idx < IM_ARRAYSIZE(policies); idx++) + if (policies[idx].Value == (*p_flags & ImGuiTableFlags_SizingMask_)) + break; + const char* preview_text = (idx < IM_ARRAYSIZE(policies)) ? policies[idx].Name + (idx > 0 ? strlen("ImGuiTableFlags") : 0) : ""; + if (ImGui::BeginCombo("Sizing Policy", preview_text)) + { + for (int n = 0; n < IM_ARRAYSIZE(policies); n++) + if (ImGui::Selectable(policies[n].Name, idx == n)) + *p_flags = (*p_flags & ~ImGuiTableFlags_SizingMask_) | policies[n].Value; + ImGui::EndCombo(); + } + ImGui::SameLine(); + ImGui::TextDisabled("(?)"); + if (ImGui::BeginItemTooltip()) + { + ImGui::PushTextWrapPos(ImGui::GetFontSize() * 50.0f); + for (int m = 0; m < IM_ARRAYSIZE(policies); m++) + { + ImGui::Separator(); + ImGui::Text("%s:", policies[m].Name); + ImGui::Separator(); + ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetStyle().IndentSpacing * 0.5f); + ImGui::TextUnformatted(policies[m].Tooltip); + } + ImGui::PopTextWrapPos(); + ImGui::EndTooltip(); + } +} + +static void EditTableColumnsFlags(ImGuiTableColumnFlags* p_flags) +{ + ImGui::CheckboxFlags("_Disabled", p_flags, ImGuiTableColumnFlags_Disabled); ImGui::SameLine(); HelpMarker("Master disable flag (also hide from context menu)"); + ImGui::CheckboxFlags("_DefaultHide", p_flags, ImGuiTableColumnFlags_DefaultHide); + ImGui::CheckboxFlags("_DefaultSort", p_flags, ImGuiTableColumnFlags_DefaultSort); + if (ImGui::CheckboxFlags("_WidthStretch", p_flags, ImGuiTableColumnFlags_WidthStretch)) + *p_flags &= ~(ImGuiTableColumnFlags_WidthMask_ ^ ImGuiTableColumnFlags_WidthStretch); + if (ImGui::CheckboxFlags("_WidthFixed", p_flags, ImGuiTableColumnFlags_WidthFixed)) + *p_flags &= ~(ImGuiTableColumnFlags_WidthMask_ ^ ImGuiTableColumnFlags_WidthFixed); + ImGui::CheckboxFlags("_NoResize", p_flags, ImGuiTableColumnFlags_NoResize); + ImGui::CheckboxFlags("_NoReorder", p_flags, ImGuiTableColumnFlags_NoReorder); + ImGui::CheckboxFlags("_NoHide", p_flags, ImGuiTableColumnFlags_NoHide); + ImGui::CheckboxFlags("_NoClip", p_flags, ImGuiTableColumnFlags_NoClip); + ImGui::CheckboxFlags("_NoSort", p_flags, ImGuiTableColumnFlags_NoSort); + ImGui::CheckboxFlags("_NoSortAscending", p_flags, ImGuiTableColumnFlags_NoSortAscending); + ImGui::CheckboxFlags("_NoSortDescending", p_flags, ImGuiTableColumnFlags_NoSortDescending); + ImGui::CheckboxFlags("_NoHeaderLabel", p_flags, ImGuiTableColumnFlags_NoHeaderLabel); + ImGui::CheckboxFlags("_NoHeaderWidth", p_flags, ImGuiTableColumnFlags_NoHeaderWidth); + ImGui::CheckboxFlags("_PreferSortAscending", p_flags, ImGuiTableColumnFlags_PreferSortAscending); + ImGui::CheckboxFlags("_PreferSortDescending", p_flags, ImGuiTableColumnFlags_PreferSortDescending); + ImGui::CheckboxFlags("_IndentEnable", p_flags, ImGuiTableColumnFlags_IndentEnable); ImGui::SameLine(); HelpMarker("Default for column 0"); + ImGui::CheckboxFlags("_IndentDisable", p_flags, ImGuiTableColumnFlags_IndentDisable); ImGui::SameLine(); HelpMarker("Default for column >0"); + ImGui::CheckboxFlags("_AngledHeader", p_flags, ImGuiTableColumnFlags_AngledHeader); +} + +static void ShowTableColumnsStatusFlags(ImGuiTableColumnFlags flags) +{ + ImGui::CheckboxFlags("_IsEnabled", &flags, ImGuiTableColumnFlags_IsEnabled); + ImGui::CheckboxFlags("_IsVisible", &flags, ImGuiTableColumnFlags_IsVisible); + ImGui::CheckboxFlags("_IsSorted", &flags, ImGuiTableColumnFlags_IsSorted); + ImGui::CheckboxFlags("_IsHovered", &flags, ImGuiTableColumnFlags_IsHovered); +} + +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowTables() +//----------------------------------------------------------------------------- + +static void DemoWindowTables() +{ + //ImGui::SetNextItemOpen(true, ImGuiCond_Once); + IMGUI_DEMO_MARKER("Tables"); + if (!ImGui::CollapsingHeader("Tables & Columns")) return; - ImGui::PushID("Columns"); + // Using those as a base value to create width/height that are factor of the size of our font + const float TEXT_BASE_WIDTH = ImGui::CalcTextSize("A").x; + const float TEXT_BASE_HEIGHT = ImGui::GetTextLineHeightWithSpacing(); + ImGui::PushID("Tables"); + + int open_action = -1; + if (ImGui::Button("Expand all")) + open_action = 1; + ImGui::SameLine(); + if (ImGui::Button("Collapse all")) + open_action = 0; + ImGui::SameLine(); + + // Options static bool disable_indent = false; ImGui::Checkbox("Disable tree indentation", &disable_indent); ImGui::SameLine(); - HelpMarker("Disable the indenting of tree nodes so demo columns can use the full window width."); + HelpMarker("Disable the indenting of tree nodes so demo tables can use the full window width."); + ImGui::Separator(); if (disable_indent) ImGui::PushStyleVar(ImGuiStyleVar_IndentSpacing, 0.0f); + // About Styling of tables + // Most settings are configured on a per-table basis via the flags passed to BeginTable() and TableSetupColumns APIs. + // There are however a few settings that a shared and part of the ImGuiStyle structure: + // style.CellPadding // Padding within each cell + // style.Colors[ImGuiCol_TableHeaderBg] // Table header background + // style.Colors[ImGuiCol_TableBorderStrong] // Table outer and header borders + // style.Colors[ImGuiCol_TableBorderLight] // Table inner borders + // style.Colors[ImGuiCol_TableRowBg] // Table row background when ImGuiTableFlags_RowBg is enabled (even rows) + // style.Colors[ImGuiCol_TableRowBgAlt] // Table row background when ImGuiTableFlags_RowBg is enabled (odds rows) + + // Demos + if (open_action != -1) + ImGui::SetNextItemOpen(open_action != 0); + IMGUI_DEMO_MARKER("Tables/Basic"); + if (ImGui::TreeNode("Basic")) + { + // Here we will showcase three different ways to output a table. + // They are very simple variations of a same thing! + + // [Method 1] Using TableNextRow() to create a new row, and TableSetColumnIndex() to select the column. + // In many situations, this is the most flexible and easy to use pattern. + HelpMarker("Using TableNextRow() + calling TableSetColumnIndex() _before_ each cell, in a loop."); + if (ImGui::BeginTable("table1", 3)) + { + for (int row = 0; row < 4; row++) + { + ImGui::TableNextRow(); + for (int column = 0; column < 3; column++) + { + ImGui::TableSetColumnIndex(column); + ImGui::Text("Row %d Column %d", row, column); + } + } + ImGui::EndTable(); + } + + // [Method 2] Using TableNextColumn() called multiple times, instead of using a for loop + TableSetColumnIndex(). + // This is generally more convenient when you have code manually submitting the contents of each column. + HelpMarker("Using TableNextRow() + calling TableNextColumn() _before_ each cell, manually."); + if (ImGui::BeginTable("table2", 3)) + { + for (int row = 0; row < 4; row++) + { + ImGui::TableNextRow(); + ImGui::TableNextColumn(); + ImGui::Text("Row %d", row); + ImGui::TableNextColumn(); + ImGui::Text("Some contents"); + ImGui::TableNextColumn(); + ImGui::Text("123.456"); + } + ImGui::EndTable(); + } + + // [Method 3] We call TableNextColumn() _before_ each cell. We never call TableNextRow(), + // as TableNextColumn() will automatically wrap around and create new rows as needed. + // This is generally more convenient when your cells all contains the same type of data. + HelpMarker( + "Only using TableNextColumn(), which tends to be convenient for tables where every cell contains " + "the same type of contents.\n This is also more similar to the old NextColumn() function of the " + "Columns API, and provided to facilitate the Columns->Tables API transition."); + if (ImGui::BeginTable("table3", 3)) + { + for (int item = 0; item < 14; item++) + { + ImGui::TableNextColumn(); + ImGui::Text("Item %d", item); + } + ImGui::EndTable(); + } + + ImGui::TreePop(); + } + + if (open_action != -1) + ImGui::SetNextItemOpen(open_action != 0); + IMGUI_DEMO_MARKER("Tables/Borders, background"); + if (ImGui::TreeNode("Borders, background")) + { + // Expose a few Borders related flags interactively + enum ContentsType { CT_Text, CT_FillButton }; + static ImGuiTableFlags flags = ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg; + static bool display_headers = false; + static int contents_type = CT_Text; + + PushStyleCompact(); + ImGui::CheckboxFlags("ImGuiTableFlags_RowBg", &flags, ImGuiTableFlags_RowBg); + ImGui::CheckboxFlags("ImGuiTableFlags_Borders", &flags, ImGuiTableFlags_Borders); + ImGui::SameLine(); HelpMarker("ImGuiTableFlags_Borders\n = ImGuiTableFlags_BordersInnerV\n | ImGuiTableFlags_BordersOuterV\n | ImGuiTableFlags_BordersInnerH\n | ImGuiTableFlags_BordersOuterH"); + ImGui::Indent(); + + ImGui::CheckboxFlags("ImGuiTableFlags_BordersH", &flags, ImGuiTableFlags_BordersH); + ImGui::Indent(); + ImGui::CheckboxFlags("ImGuiTableFlags_BordersOuterH", &flags, ImGuiTableFlags_BordersOuterH); + ImGui::CheckboxFlags("ImGuiTableFlags_BordersInnerH", &flags, ImGuiTableFlags_BordersInnerH); + ImGui::Unindent(); + + ImGui::CheckboxFlags("ImGuiTableFlags_BordersV", &flags, ImGuiTableFlags_BordersV); + ImGui::Indent(); + ImGui::CheckboxFlags("ImGuiTableFlags_BordersOuterV", &flags, ImGuiTableFlags_BordersOuterV); + ImGui::CheckboxFlags("ImGuiTableFlags_BordersInnerV", &flags, ImGuiTableFlags_BordersInnerV); + ImGui::Unindent(); + + ImGui::CheckboxFlags("ImGuiTableFlags_BordersOuter", &flags, ImGuiTableFlags_BordersOuter); + ImGui::CheckboxFlags("ImGuiTableFlags_BordersInner", &flags, ImGuiTableFlags_BordersInner); + ImGui::Unindent(); + + ImGui::AlignTextToFramePadding(); ImGui::Text("Cell contents:"); + ImGui::SameLine(); ImGui::RadioButton("Text", &contents_type, CT_Text); + ImGui::SameLine(); ImGui::RadioButton("FillButton", &contents_type, CT_FillButton); + ImGui::Checkbox("Display headers", &display_headers); + ImGui::CheckboxFlags("ImGuiTableFlags_NoBordersInBody", &flags, ImGuiTableFlags_NoBordersInBody); ImGui::SameLine(); HelpMarker("Disable vertical borders in columns Body (borders will always appear in Headers"); + PopStyleCompact(); + + if (ImGui::BeginTable("table1", 3, flags)) + { + // Display headers so we can inspect their interaction with borders + // (Headers are not the main purpose of this section of the demo, so we are not elaborating on them now. See other sections for details) + if (display_headers) + { + ImGui::TableSetupColumn("One"); + ImGui::TableSetupColumn("Two"); + ImGui::TableSetupColumn("Three"); + ImGui::TableHeadersRow(); + } + + for (int row = 0; row < 5; row++) + { + ImGui::TableNextRow(); + for (int column = 0; column < 3; column++) + { + ImGui::TableSetColumnIndex(column); + char buf[32]; + sprintf(buf, "Hello %d,%d", column, row); + if (contents_type == CT_Text) + ImGui::TextUnformatted(buf); + else if (contents_type == CT_FillButton) + ImGui::Button(buf, ImVec2(-FLT_MIN, 0.0f)); + } + } + ImGui::EndTable(); + } + ImGui::TreePop(); + } + + if (open_action != -1) + ImGui::SetNextItemOpen(open_action != 0); + IMGUI_DEMO_MARKER("Tables/Resizable, stretch"); + if (ImGui::TreeNode("Resizable, stretch")) + { + // By default, if we don't enable ScrollX the sizing policy for each column is "Stretch" + // All columns maintain a sizing weight, and they will occupy all available width. + static ImGuiTableFlags flags = ImGuiTableFlags_SizingStretchSame | ImGuiTableFlags_Resizable | ImGuiTableFlags_BordersOuter | ImGuiTableFlags_BordersV | ImGuiTableFlags_ContextMenuInBody; + PushStyleCompact(); + ImGui::CheckboxFlags("ImGuiTableFlags_Resizable", &flags, ImGuiTableFlags_Resizable); + ImGui::CheckboxFlags("ImGuiTableFlags_BordersV", &flags, ImGuiTableFlags_BordersV); + ImGui::SameLine(); HelpMarker( + "Using the _Resizable flag automatically enables the _BordersInnerV flag as well, " + "this is why the resize borders are still showing when unchecking this."); + PopStyleCompact(); + + if (ImGui::BeginTable("table1", 3, flags)) + { + for (int row = 0; row < 5; row++) + { + ImGui::TableNextRow(); + for (int column = 0; column < 3; column++) + { + ImGui::TableSetColumnIndex(column); + ImGui::Text("Hello %d,%d", column, row); + } + } + ImGui::EndTable(); + } + ImGui::TreePop(); + } + + if (open_action != -1) + ImGui::SetNextItemOpen(open_action != 0); + IMGUI_DEMO_MARKER("Tables/Resizable, fixed"); + if (ImGui::TreeNode("Resizable, fixed")) + { + // Here we use ImGuiTableFlags_SizingFixedFit (even though _ScrollX is not set) + // So columns will adopt the "Fixed" policy and will maintain a fixed width regardless of the whole available width (unless table is small) + // If there is not enough available width to fit all columns, they will however be resized down. + // FIXME-TABLE: Providing a stretch-on-init would make sense especially for tables which don't have saved settings + HelpMarker( + "Using _Resizable + _SizingFixedFit flags.\n" + "Fixed-width columns generally makes more sense if you want to use horizontal scrolling.\n\n" + "Double-click a column border to auto-fit the column to its contents."); + PushStyleCompact(); + static ImGuiTableFlags flags = ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_Resizable | ImGuiTableFlags_BordersOuter | ImGuiTableFlags_BordersV | ImGuiTableFlags_ContextMenuInBody; + ImGui::CheckboxFlags("ImGuiTableFlags_NoHostExtendX", &flags, ImGuiTableFlags_NoHostExtendX); + PopStyleCompact(); + + if (ImGui::BeginTable("table1", 3, flags)) + { + for (int row = 0; row < 5; row++) + { + ImGui::TableNextRow(); + for (int column = 0; column < 3; column++) + { + ImGui::TableSetColumnIndex(column); + ImGui::Text("Hello %d,%d", column, row); + } + } + ImGui::EndTable(); + } + ImGui::TreePop(); + } + + if (open_action != -1) + ImGui::SetNextItemOpen(open_action != 0); + IMGUI_DEMO_MARKER("Tables/Resizable, mixed"); + if (ImGui::TreeNode("Resizable, mixed")) + { + HelpMarker( + "Using TableSetupColumn() to alter resizing policy on a per-column basis.\n\n" + "When combining Fixed and Stretch columns, generally you only want one, maybe two trailing columns to use _WidthStretch."); + static ImGuiTableFlags flags = ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_RowBg | ImGuiTableFlags_Borders | ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable; + + if (ImGui::BeginTable("table1", 3, flags)) + { + ImGui::TableSetupColumn("AAA", ImGuiTableColumnFlags_WidthFixed); + ImGui::TableSetupColumn("BBB", ImGuiTableColumnFlags_WidthFixed); + ImGui::TableSetupColumn("CCC", ImGuiTableColumnFlags_WidthStretch); + ImGui::TableHeadersRow(); + for (int row = 0; row < 5; row++) + { + ImGui::TableNextRow(); + for (int column = 0; column < 3; column++) + { + ImGui::TableSetColumnIndex(column); + ImGui::Text("%s %d,%d", (column == 2) ? "Stretch" : "Fixed", column, row); + } + } + ImGui::EndTable(); + } + if (ImGui::BeginTable("table2", 6, flags)) + { + ImGui::TableSetupColumn("AAA", ImGuiTableColumnFlags_WidthFixed); + ImGui::TableSetupColumn("BBB", ImGuiTableColumnFlags_WidthFixed); + ImGui::TableSetupColumn("CCC", ImGuiTableColumnFlags_WidthFixed | ImGuiTableColumnFlags_DefaultHide); + ImGui::TableSetupColumn("DDD", ImGuiTableColumnFlags_WidthStretch); + ImGui::TableSetupColumn("EEE", ImGuiTableColumnFlags_WidthStretch); + ImGui::TableSetupColumn("FFF", ImGuiTableColumnFlags_WidthStretch | ImGuiTableColumnFlags_DefaultHide); + ImGui::TableHeadersRow(); + for (int row = 0; row < 5; row++) + { + ImGui::TableNextRow(); + for (int column = 0; column < 6; column++) + { + ImGui::TableSetColumnIndex(column); + ImGui::Text("%s %d,%d", (column >= 3) ? "Stretch" : "Fixed", column, row); + } + } + ImGui::EndTable(); + } + ImGui::TreePop(); + } + + if (open_action != -1) + ImGui::SetNextItemOpen(open_action != 0); + IMGUI_DEMO_MARKER("Tables/Reorderable, hideable, with headers"); + if (ImGui::TreeNode("Reorderable, hideable, with headers")) + { + HelpMarker( + "Click and drag column headers to reorder columns.\n\n" + "Right-click on a header to open a context menu."); + static ImGuiTableFlags flags = ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable | ImGuiTableFlags_BordersOuter | ImGuiTableFlags_BordersV; + PushStyleCompact(); + ImGui::CheckboxFlags("ImGuiTableFlags_Resizable", &flags, ImGuiTableFlags_Resizable); + ImGui::CheckboxFlags("ImGuiTableFlags_Reorderable", &flags, ImGuiTableFlags_Reorderable); + ImGui::CheckboxFlags("ImGuiTableFlags_Hideable", &flags, ImGuiTableFlags_Hideable); + ImGui::CheckboxFlags("ImGuiTableFlags_NoBordersInBody", &flags, ImGuiTableFlags_NoBordersInBody); + ImGui::CheckboxFlags("ImGuiTableFlags_NoBordersInBodyUntilResize", &flags, ImGuiTableFlags_NoBordersInBodyUntilResize); ImGui::SameLine(); HelpMarker("Disable vertical borders in columns Body until hovered for resize (borders will always appear in Headers)"); + ImGui::CheckboxFlags("ImGuiTableFlags_HighlightHoveredColumn", &flags, ImGuiTableFlags_HighlightHoveredColumn); + PopStyleCompact(); + + if (ImGui::BeginTable("table1", 3, flags)) + { + // Submit columns name with TableSetupColumn() and call TableHeadersRow() to create a row with a header in each column. + // (Later we will show how TableSetupColumn() has other uses, optional flags, sizing weight etc.) + ImGui::TableSetupColumn("One"); + ImGui::TableSetupColumn("Two"); + ImGui::TableSetupColumn("Three"); + ImGui::TableHeadersRow(); + for (int row = 0; row < 6; row++) + { + ImGui::TableNextRow(); + for (int column = 0; column < 3; column++) + { + ImGui::TableSetColumnIndex(column); + ImGui::Text("Hello %d,%d", column, row); + } + } + ImGui::EndTable(); + } + + // Use outer_size.x == 0.0f instead of default to make the table as tight as possible + // (only valid when no scrolling and no stretch column) + if (ImGui::BeginTable("table2", 3, flags | ImGuiTableFlags_SizingFixedFit, ImVec2(0.0f, 0.0f))) + { + ImGui::TableSetupColumn("One"); + ImGui::TableSetupColumn("Two"); + ImGui::TableSetupColumn("Three"); + ImGui::TableHeadersRow(); + for (int row = 0; row < 6; row++) + { + ImGui::TableNextRow(); + for (int column = 0; column < 3; column++) + { + ImGui::TableSetColumnIndex(column); + ImGui::Text("Fixed %d,%d", column, row); + } + } + ImGui::EndTable(); + } + ImGui::TreePop(); + } + + if (open_action != -1) + ImGui::SetNextItemOpen(open_action != 0); + IMGUI_DEMO_MARKER("Tables/Padding"); + if (ImGui::TreeNode("Padding")) + { + // First example: showcase use of padding flags and effect of BorderOuterV/BorderInnerV on X padding. + // We don't expose BorderOuterH/BorderInnerH here because they have no effect on X padding. + HelpMarker( + "We often want outer padding activated when any using features which makes the edges of a column visible:\n" + "e.g.:\n" + "- BorderOuterV\n" + "- any form of row selection\n" + "Because of this, activating BorderOuterV sets the default to PadOuterX. " + "Using PadOuterX or NoPadOuterX you can override the default.\n\n" + "Actual padding values are using style.CellPadding.\n\n" + "In this demo we don't show horizontal borders to emphasize how they don't affect default horizontal padding."); + + static ImGuiTableFlags flags1 = ImGuiTableFlags_BordersV; + PushStyleCompact(); + ImGui::CheckboxFlags("ImGuiTableFlags_PadOuterX", &flags1, ImGuiTableFlags_PadOuterX); + ImGui::SameLine(); HelpMarker("Enable outer-most padding (default if ImGuiTableFlags_BordersOuterV is set)"); + ImGui::CheckboxFlags("ImGuiTableFlags_NoPadOuterX", &flags1, ImGuiTableFlags_NoPadOuterX); + ImGui::SameLine(); HelpMarker("Disable outer-most padding (default if ImGuiTableFlags_BordersOuterV is not set)"); + ImGui::CheckboxFlags("ImGuiTableFlags_NoPadInnerX", &flags1, ImGuiTableFlags_NoPadInnerX); + ImGui::SameLine(); HelpMarker("Disable inner padding between columns (double inner padding if BordersOuterV is on, single inner padding if BordersOuterV is off)"); + ImGui::CheckboxFlags("ImGuiTableFlags_BordersOuterV", &flags1, ImGuiTableFlags_BordersOuterV); + ImGui::CheckboxFlags("ImGuiTableFlags_BordersInnerV", &flags1, ImGuiTableFlags_BordersInnerV); + static bool show_headers = false; + ImGui::Checkbox("show_headers", &show_headers); + PopStyleCompact(); + + if (ImGui::BeginTable("table_padding", 3, flags1)) + { + if (show_headers) + { + ImGui::TableSetupColumn("One"); + ImGui::TableSetupColumn("Two"); + ImGui::TableSetupColumn("Three"); + ImGui::TableHeadersRow(); + } + + for (int row = 0; row < 5; row++) + { + ImGui::TableNextRow(); + for (int column = 0; column < 3; column++) + { + ImGui::TableSetColumnIndex(column); + if (row == 0) + { + ImGui::Text("Avail %.2f", ImGui::GetContentRegionAvail().x); + } + else + { + char buf[32]; + sprintf(buf, "Hello %d,%d", column, row); + ImGui::Button(buf, ImVec2(-FLT_MIN, 0.0f)); + } + //if (ImGui::TableGetColumnFlags() & ImGuiTableColumnFlags_IsHovered) + // ImGui::TableSetBgColor(ImGuiTableBgTarget_CellBg, IM_COL32(0, 100, 0, 255)); + } + } + ImGui::EndTable(); + } + + // Second example: set style.CellPadding to (0.0) or a custom value. + // FIXME-TABLE: Vertical border effectively not displayed the same way as horizontal one... + HelpMarker("Setting style.CellPadding to (0,0) or a custom value."); + static ImGuiTableFlags flags2 = ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg; + static ImVec2 cell_padding(0.0f, 0.0f); + static bool show_widget_frame_bg = true; + + PushStyleCompact(); + ImGui::CheckboxFlags("ImGuiTableFlags_Borders", &flags2, ImGuiTableFlags_Borders); + ImGui::CheckboxFlags("ImGuiTableFlags_BordersH", &flags2, ImGuiTableFlags_BordersH); + ImGui::CheckboxFlags("ImGuiTableFlags_BordersV", &flags2, ImGuiTableFlags_BordersV); + ImGui::CheckboxFlags("ImGuiTableFlags_BordersInner", &flags2, ImGuiTableFlags_BordersInner); + ImGui::CheckboxFlags("ImGuiTableFlags_BordersOuter", &flags2, ImGuiTableFlags_BordersOuter); + ImGui::CheckboxFlags("ImGuiTableFlags_RowBg", &flags2, ImGuiTableFlags_RowBg); + ImGui::CheckboxFlags("ImGuiTableFlags_Resizable", &flags2, ImGuiTableFlags_Resizable); + ImGui::Checkbox("show_widget_frame_bg", &show_widget_frame_bg); + ImGui::SliderFloat2("CellPadding", &cell_padding.x, 0.0f, 10.0f, "%.0f"); + PopStyleCompact(); + + ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, cell_padding); + if (ImGui::BeginTable("table_padding_2", 3, flags2)) + { + static char text_bufs[3 * 5][16]; // Mini text storage for 3x5 cells + static bool init = true; + if (!show_widget_frame_bg) + ImGui::PushStyleColor(ImGuiCol_FrameBg, 0); + for (int cell = 0; cell < 3 * 5; cell++) + { + ImGui::TableNextColumn(); + if (init) + strcpy(text_bufs[cell], "edit me"); + ImGui::SetNextItemWidth(-FLT_MIN); + ImGui::PushID(cell); + ImGui::InputText("##cell", text_bufs[cell], IM_ARRAYSIZE(text_bufs[cell])); + ImGui::PopID(); + } + if (!show_widget_frame_bg) + ImGui::PopStyleColor(); + init = false; + ImGui::EndTable(); + } + ImGui::PopStyleVar(); + + ImGui::TreePop(); + } + + if (open_action != -1) + ImGui::SetNextItemOpen(open_action != 0); + IMGUI_DEMO_MARKER("Tables/Explicit widths"); + if (ImGui::TreeNode("Sizing policies")) + { + static ImGuiTableFlags flags1 = ImGuiTableFlags_BordersV | ImGuiTableFlags_BordersOuterH | ImGuiTableFlags_RowBg | ImGuiTableFlags_ContextMenuInBody; + PushStyleCompact(); + ImGui::CheckboxFlags("ImGuiTableFlags_Resizable", &flags1, ImGuiTableFlags_Resizable); + ImGui::CheckboxFlags("ImGuiTableFlags_NoHostExtendX", &flags1, ImGuiTableFlags_NoHostExtendX); + PopStyleCompact(); + + static ImGuiTableFlags sizing_policy_flags[4] = { ImGuiTableFlags_SizingFixedFit, ImGuiTableFlags_SizingFixedSame, ImGuiTableFlags_SizingStretchProp, ImGuiTableFlags_SizingStretchSame }; + for (int table_n = 0; table_n < 4; table_n++) + { + ImGui::PushID(table_n); + ImGui::SetNextItemWidth(TEXT_BASE_WIDTH * 30); + EditTableSizingFlags(&sizing_policy_flags[table_n]); + + // To make it easier to understand the different sizing policy, + // For each policy: we display one table where the columns have equal contents width, + // and one where the columns have different contents width. + if (ImGui::BeginTable("table1", 3, sizing_policy_flags[table_n] | flags1)) + { + for (int row = 0; row < 3; row++) + { + ImGui::TableNextRow(); + ImGui::TableNextColumn(); ImGui::Text("Oh dear"); + ImGui::TableNextColumn(); ImGui::Text("Oh dear"); + ImGui::TableNextColumn(); ImGui::Text("Oh dear"); + } + ImGui::EndTable(); + } + if (ImGui::BeginTable("table2", 3, sizing_policy_flags[table_n] | flags1)) + { + for (int row = 0; row < 3; row++) + { + ImGui::TableNextRow(); + ImGui::TableNextColumn(); ImGui::Text("AAAA"); + ImGui::TableNextColumn(); ImGui::Text("BBBBBBBB"); + ImGui::TableNextColumn(); ImGui::Text("CCCCCCCCCCCC"); + } + ImGui::EndTable(); + } + ImGui::PopID(); + } + + ImGui::Spacing(); + ImGui::TextUnformatted("Advanced"); + ImGui::SameLine(); + HelpMarker( + "This section allows you to interact and see the effect of various sizing policies " + "depending on whether Scroll is enabled and the contents of your columns."); + + enum ContentsType { CT_ShowWidth, CT_ShortText, CT_LongText, CT_Button, CT_FillButton, CT_InputText }; + static ImGuiTableFlags flags = ImGuiTableFlags_ScrollY | ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg | ImGuiTableFlags_Resizable; + static int contents_type = CT_ShowWidth; + static int column_count = 3; + + PushStyleCompact(); + ImGui::PushID("Advanced"); + ImGui::PushItemWidth(TEXT_BASE_WIDTH * 30); + EditTableSizingFlags(&flags); + ImGui::Combo("Contents", &contents_type, "Show width\0Short Text\0Long Text\0Button\0Fill Button\0InputText\0"); + if (contents_type == CT_FillButton) + { + ImGui::SameLine(); + HelpMarker( + "Be mindful that using right-alignment (e.g. size.x = -FLT_MIN) creates a feedback loop " + "where contents width can feed into auto-column width can feed into contents width."); + } + ImGui::DragInt("Columns", &column_count, 0.1f, 1, 64, "%d", ImGuiSliderFlags_AlwaysClamp); + ImGui::CheckboxFlags("ImGuiTableFlags_Resizable", &flags, ImGuiTableFlags_Resizable); + ImGui::CheckboxFlags("ImGuiTableFlags_PreciseWidths", &flags, ImGuiTableFlags_PreciseWidths); + ImGui::SameLine(); HelpMarker("Disable distributing remainder width to stretched columns (width allocation on a 100-wide table with 3 columns: Without this flag: 33,33,34. With this flag: 33,33,33). With larger number of columns, resizing will appear to be less smooth."); + ImGui::CheckboxFlags("ImGuiTableFlags_ScrollX", &flags, ImGuiTableFlags_ScrollX); + ImGui::CheckboxFlags("ImGuiTableFlags_ScrollY", &flags, ImGuiTableFlags_ScrollY); + ImGui::CheckboxFlags("ImGuiTableFlags_NoClip", &flags, ImGuiTableFlags_NoClip); + ImGui::PopItemWidth(); + ImGui::PopID(); + PopStyleCompact(); + + if (ImGui::BeginTable("table2", column_count, flags, ImVec2(0.0f, TEXT_BASE_HEIGHT * 7))) + { + for (int cell = 0; cell < 10 * column_count; cell++) + { + ImGui::TableNextColumn(); + int column = ImGui::TableGetColumnIndex(); + int row = ImGui::TableGetRowIndex(); + + ImGui::PushID(cell); + char label[32]; + static char text_buf[32] = ""; + sprintf(label, "Hello %d,%d", column, row); + switch (contents_type) + { + case CT_ShortText: ImGui::TextUnformatted(label); break; + case CT_LongText: ImGui::Text("Some %s text %d,%d\nOver two lines..", column == 0 ? "long" : "longeeer", column, row); break; + case CT_ShowWidth: ImGui::Text("W: %.1f", ImGui::GetContentRegionAvail().x); break; + case CT_Button: ImGui::Button(label); break; + case CT_FillButton: ImGui::Button(label, ImVec2(-FLT_MIN, 0.0f)); break; + case CT_InputText: ImGui::SetNextItemWidth(-FLT_MIN); ImGui::InputText("##", text_buf, IM_ARRAYSIZE(text_buf)); break; + } + ImGui::PopID(); + } + ImGui::EndTable(); + } + ImGui::TreePop(); + } + + if (open_action != -1) + ImGui::SetNextItemOpen(open_action != 0); + IMGUI_DEMO_MARKER("Tables/Vertical scrolling, with clipping"); + if (ImGui::TreeNode("Vertical scrolling, with clipping")) + { + HelpMarker( + "Here we activate ScrollY, which will create a child window container to allow hosting scrollable contents.\n\n" + "We also demonstrate using ImGuiListClipper to virtualize the submission of many items."); + static ImGuiTableFlags flags = ImGuiTableFlags_ScrollY | ImGuiTableFlags_RowBg | ImGuiTableFlags_BordersOuter | ImGuiTableFlags_BordersV | ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable; + + PushStyleCompact(); + ImGui::CheckboxFlags("ImGuiTableFlags_ScrollY", &flags, ImGuiTableFlags_ScrollY); + PopStyleCompact(); + + // When using ScrollX or ScrollY we need to specify a size for our table container! + // Otherwise by default the table will fit all available space, like a BeginChild() call. + ImVec2 outer_size = ImVec2(0.0f, TEXT_BASE_HEIGHT * 8); + if (ImGui::BeginTable("table_scrolly", 3, flags, outer_size)) + { + ImGui::TableSetupScrollFreeze(0, 1); // Make top row always visible + ImGui::TableSetupColumn("One", ImGuiTableColumnFlags_None); + ImGui::TableSetupColumn("Two", ImGuiTableColumnFlags_None); + ImGui::TableSetupColumn("Three", ImGuiTableColumnFlags_None); + ImGui::TableHeadersRow(); + + // Demonstrate using clipper for large vertical lists + ImGuiListClipper clipper; + clipper.Begin(1000); + while (clipper.Step()) + { + for (int row = clipper.DisplayStart; row < clipper.DisplayEnd; row++) + { + ImGui::TableNextRow(); + for (int column = 0; column < 3; column++) + { + ImGui::TableSetColumnIndex(column); + ImGui::Text("Hello %d,%d", column, row); + } + } + } + ImGui::EndTable(); + } + ImGui::TreePop(); + } + + if (open_action != -1) + ImGui::SetNextItemOpen(open_action != 0); + IMGUI_DEMO_MARKER("Tables/Horizontal scrolling"); + if (ImGui::TreeNode("Horizontal scrolling")) + { + HelpMarker( + "When ScrollX is enabled, the default sizing policy becomes ImGuiTableFlags_SizingFixedFit, " + "as automatically stretching columns doesn't make much sense with horizontal scrolling.\n\n" + "Also note that as of the current version, you will almost always want to enable ScrollY along with ScrollX, " + "because the container window won't automatically extend vertically to fix contents " + "(this may be improved in future versions)."); + static ImGuiTableFlags flags = ImGuiTableFlags_ScrollX | ImGuiTableFlags_ScrollY | ImGuiTableFlags_RowBg | ImGuiTableFlags_BordersOuter | ImGuiTableFlags_BordersV | ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable; + static int freeze_cols = 1; + static int freeze_rows = 1; + + PushStyleCompact(); + ImGui::CheckboxFlags("ImGuiTableFlags_Resizable", &flags, ImGuiTableFlags_Resizable); + ImGui::CheckboxFlags("ImGuiTableFlags_ScrollX", &flags, ImGuiTableFlags_ScrollX); + ImGui::CheckboxFlags("ImGuiTableFlags_ScrollY", &flags, ImGuiTableFlags_ScrollY); + ImGui::SetNextItemWidth(ImGui::GetFrameHeight()); + ImGui::DragInt("freeze_cols", &freeze_cols, 0.2f, 0, 9, NULL, ImGuiSliderFlags_NoInput); + ImGui::SetNextItemWidth(ImGui::GetFrameHeight()); + ImGui::DragInt("freeze_rows", &freeze_rows, 0.2f, 0, 9, NULL, ImGuiSliderFlags_NoInput); + PopStyleCompact(); + + // When using ScrollX or ScrollY we need to specify a size for our table container! + // Otherwise by default the table will fit all available space, like a BeginChild() call. + ImVec2 outer_size = ImVec2(0.0f, TEXT_BASE_HEIGHT * 8); + if (ImGui::BeginTable("table_scrollx", 7, flags, outer_size)) + { + ImGui::TableSetupScrollFreeze(freeze_cols, freeze_rows); + ImGui::TableSetupColumn("Line #", ImGuiTableColumnFlags_NoHide); // Make the first column not hideable to match our use of TableSetupScrollFreeze() + ImGui::TableSetupColumn("One"); + ImGui::TableSetupColumn("Two"); + ImGui::TableSetupColumn("Three"); + ImGui::TableSetupColumn("Four"); + ImGui::TableSetupColumn("Five"); + ImGui::TableSetupColumn("Six"); + ImGui::TableHeadersRow(); + for (int row = 0; row < 20; row++) + { + ImGui::TableNextRow(); + for (int column = 0; column < 7; column++) + { + // Both TableNextColumn() and TableSetColumnIndex() return true when a column is visible or performing width measurement. + // Because here we know that: + // - A) all our columns are contributing the same to row height + // - B) column 0 is always visible, + // We only always submit this one column and can skip others. + // More advanced per-column clipping behaviors may benefit from polling the status flags via TableGetColumnFlags(). + if (!ImGui::TableSetColumnIndex(column) && column > 0) + continue; + if (column == 0) + ImGui::Text("Line %d", row); + else + ImGui::Text("Hello world %d,%d", column, row); + } + } + ImGui::EndTable(); + } + + ImGui::Spacing(); + ImGui::TextUnformatted("Stretch + ScrollX"); + ImGui::SameLine(); + HelpMarker( + "Showcase using Stretch columns + ScrollX together: " + "this is rather unusual and only makes sense when specifying an 'inner_width' for the table!\n" + "Without an explicit value, inner_width is == outer_size.x and therefore using Stretch columns " + "along with ScrollX doesn't make sense."); + static ImGuiTableFlags flags2 = ImGuiTableFlags_SizingStretchSame | ImGuiTableFlags_ScrollX | ImGuiTableFlags_ScrollY | ImGuiTableFlags_BordersOuter | ImGuiTableFlags_RowBg | ImGuiTableFlags_ContextMenuInBody; + static float inner_width = 1000.0f; + PushStyleCompact(); + ImGui::PushID("flags3"); + ImGui::PushItemWidth(TEXT_BASE_WIDTH * 30); + ImGui::CheckboxFlags("ImGuiTableFlags_ScrollX", &flags2, ImGuiTableFlags_ScrollX); + ImGui::DragFloat("inner_width", &inner_width, 1.0f, 0.0f, FLT_MAX, "%.1f"); + ImGui::PopItemWidth(); + ImGui::PopID(); + PopStyleCompact(); + if (ImGui::BeginTable("table2", 7, flags2, outer_size, inner_width)) + { + for (int cell = 0; cell < 20 * 7; cell++) + { + ImGui::TableNextColumn(); + ImGui::Text("Hello world %d,%d", ImGui::TableGetColumnIndex(), ImGui::TableGetRowIndex()); + } + ImGui::EndTable(); + } + ImGui::TreePop(); + } + + if (open_action != -1) + ImGui::SetNextItemOpen(open_action != 0); + IMGUI_DEMO_MARKER("Tables/Columns flags"); + if (ImGui::TreeNode("Columns flags")) + { + // Create a first table just to show all the options/flags we want to make visible in our example! + const int column_count = 3; + const char* column_names[column_count] = { "One", "Two", "Three" }; + static ImGuiTableColumnFlags column_flags[column_count] = { ImGuiTableColumnFlags_DefaultSort, ImGuiTableColumnFlags_None, ImGuiTableColumnFlags_DefaultHide }; + static ImGuiTableColumnFlags column_flags_out[column_count] = { 0, 0, 0 }; // Output from TableGetColumnFlags() + + if (ImGui::BeginTable("table_columns_flags_checkboxes", column_count, ImGuiTableFlags_None)) + { + PushStyleCompact(); + for (int column = 0; column < column_count; column++) + { + ImGui::TableNextColumn(); + ImGui::PushID(column); + ImGui::AlignTextToFramePadding(); // FIXME-TABLE: Workaround for wrong text baseline propagation across columns + ImGui::Text("'%s'", column_names[column]); + ImGui::Spacing(); + ImGui::Text("Input flags:"); + EditTableColumnsFlags(&column_flags[column]); + ImGui::Spacing(); + ImGui::Text("Output flags:"); + ImGui::BeginDisabled(); + ShowTableColumnsStatusFlags(column_flags_out[column]); + ImGui::EndDisabled(); + ImGui::PopID(); + } + PopStyleCompact(); + ImGui::EndTable(); + } + + // Create the real table we care about for the example! + // We use a scrolling table to be able to showcase the difference between the _IsEnabled and _IsVisible flags above, + // otherwise in a non-scrolling table columns are always visible (unless using ImGuiTableFlags_NoKeepColumnsVisible + // + resizing the parent window down). + const ImGuiTableFlags flags + = ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_ScrollX | ImGuiTableFlags_ScrollY + | ImGuiTableFlags_RowBg | ImGuiTableFlags_BordersOuter | ImGuiTableFlags_BordersV + | ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable | ImGuiTableFlags_Sortable; + ImVec2 outer_size = ImVec2(0.0f, TEXT_BASE_HEIGHT * 9); + if (ImGui::BeginTable("table_columns_flags", column_count, flags, outer_size)) + { + bool has_angled_header = false; + for (int column = 0; column < column_count; column++) + { + has_angled_header |= (column_flags[column] & ImGuiTableColumnFlags_AngledHeader) != 0; + ImGui::TableSetupColumn(column_names[column], column_flags[column]); + } + if (has_angled_header) + ImGui::TableAngledHeadersRow(); + ImGui::TableHeadersRow(); + for (int column = 0; column < column_count; column++) + column_flags_out[column] = ImGui::TableGetColumnFlags(column); + float indent_step = (float)((int)TEXT_BASE_WIDTH / 2); + for (int row = 0; row < 8; row++) + { + // Add some indentation to demonstrate usage of per-column IndentEnable/IndentDisable flags. + ImGui::Indent(indent_step); + ImGui::TableNextRow(); + for (int column = 0; column < column_count; column++) + { + ImGui::TableSetColumnIndex(column); + ImGui::Text("%s %s", (column == 0) ? "Indented" : "Hello", ImGui::TableGetColumnName(column)); + } + } + ImGui::Unindent(indent_step * 8.0f); + + ImGui::EndTable(); + } + ImGui::TreePop(); + } + + if (open_action != -1) + ImGui::SetNextItemOpen(open_action != 0); + IMGUI_DEMO_MARKER("Tables/Columns widths"); + if (ImGui::TreeNode("Columns widths")) + { + HelpMarker("Using TableSetupColumn() to setup default width."); + + static ImGuiTableFlags flags1 = ImGuiTableFlags_Borders | ImGuiTableFlags_NoBordersInBodyUntilResize; + PushStyleCompact(); + ImGui::CheckboxFlags("ImGuiTableFlags_Resizable", &flags1, ImGuiTableFlags_Resizable); + ImGui::CheckboxFlags("ImGuiTableFlags_NoBordersInBodyUntilResize", &flags1, ImGuiTableFlags_NoBordersInBodyUntilResize); + PopStyleCompact(); + if (ImGui::BeginTable("table1", 3, flags1)) + { + // We could also set ImGuiTableFlags_SizingFixedFit on the table and all columns will default to ImGuiTableColumnFlags_WidthFixed. + ImGui::TableSetupColumn("one", ImGuiTableColumnFlags_WidthFixed, 100.0f); // Default to 100.0f + ImGui::TableSetupColumn("two", ImGuiTableColumnFlags_WidthFixed, 200.0f); // Default to 200.0f + ImGui::TableSetupColumn("three", ImGuiTableColumnFlags_WidthFixed); // Default to auto + ImGui::TableHeadersRow(); + for (int row = 0; row < 4; row++) + { + ImGui::TableNextRow(); + for (int column = 0; column < 3; column++) + { + ImGui::TableSetColumnIndex(column); + if (row == 0) + ImGui::Text("(w: %5.1f)", ImGui::GetContentRegionAvail().x); + else + ImGui::Text("Hello %d,%d", column, row); + } + } + ImGui::EndTable(); + } + + HelpMarker( + "Using TableSetupColumn() to setup explicit width.\n\nUnless _NoKeepColumnsVisible is set, " + "fixed columns with set width may still be shrunk down if there's not enough space in the host."); + + static ImGuiTableFlags flags2 = ImGuiTableFlags_None; + PushStyleCompact(); + ImGui::CheckboxFlags("ImGuiTableFlags_NoKeepColumnsVisible", &flags2, ImGuiTableFlags_NoKeepColumnsVisible); + ImGui::CheckboxFlags("ImGuiTableFlags_BordersInnerV", &flags2, ImGuiTableFlags_BordersInnerV); + ImGui::CheckboxFlags("ImGuiTableFlags_BordersOuterV", &flags2, ImGuiTableFlags_BordersOuterV); + PopStyleCompact(); + if (ImGui::BeginTable("table2", 4, flags2)) + { + // We could also set ImGuiTableFlags_SizingFixedFit on the table and then all columns + // will default to ImGuiTableColumnFlags_WidthFixed. + ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthFixed, 100.0f); + ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthFixed, TEXT_BASE_WIDTH * 15.0f); + ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthFixed, TEXT_BASE_WIDTH * 30.0f); + ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthFixed, TEXT_BASE_WIDTH * 15.0f); + for (int row = 0; row < 5; row++) + { + ImGui::TableNextRow(); + for (int column = 0; column < 4; column++) + { + ImGui::TableSetColumnIndex(column); + if (row == 0) + ImGui::Text("(w: %5.1f)", ImGui::GetContentRegionAvail().x); + else + ImGui::Text("Hello %d,%d", column, row); + } + } + ImGui::EndTable(); + } + ImGui::TreePop(); + } + + if (open_action != -1) + ImGui::SetNextItemOpen(open_action != 0); + IMGUI_DEMO_MARKER("Tables/Nested tables"); + if (ImGui::TreeNode("Nested tables")) + { + HelpMarker("This demonstrates embedding a table into another table cell."); + + if (ImGui::BeginTable("table_nested1", 2, ImGuiTableFlags_Borders | ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable)) + { + ImGui::TableSetupColumn("A0"); + ImGui::TableSetupColumn("A1"); + ImGui::TableHeadersRow(); + + ImGui::TableNextColumn(); + ImGui::Text("A0 Row 0"); + { + float rows_height = TEXT_BASE_HEIGHT * 2; + if (ImGui::BeginTable("table_nested2", 2, ImGuiTableFlags_Borders | ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable)) + { + ImGui::TableSetupColumn("B0"); + ImGui::TableSetupColumn("B1"); + ImGui::TableHeadersRow(); + + ImGui::TableNextRow(ImGuiTableRowFlags_None, rows_height); + ImGui::TableNextColumn(); + ImGui::Text("B0 Row 0"); + ImGui::TableNextColumn(); + ImGui::Text("B1 Row 0"); + ImGui::TableNextRow(ImGuiTableRowFlags_None, rows_height); + ImGui::TableNextColumn(); + ImGui::Text("B0 Row 1"); + ImGui::TableNextColumn(); + ImGui::Text("B1 Row 1"); + + ImGui::EndTable(); + } + } + ImGui::TableNextColumn(); ImGui::Text("A1 Row 0"); + ImGui::TableNextColumn(); ImGui::Text("A0 Row 1"); + ImGui::TableNextColumn(); ImGui::Text("A1 Row 1"); + ImGui::EndTable(); + } + ImGui::TreePop(); + } + + if (open_action != -1) + ImGui::SetNextItemOpen(open_action != 0); + IMGUI_DEMO_MARKER("Tables/Row height"); + if (ImGui::TreeNode("Row height")) + { + HelpMarker( + "You can pass a 'min_row_height' to TableNextRow().\n\nRows are padded with 'style.CellPadding.y' on top and bottom, " + "so effectively the minimum row height will always be >= 'style.CellPadding.y * 2.0f'.\n\n" + "We cannot honor a _maximum_ row height as that would require a unique clipping rectangle per row."); + if (ImGui::BeginTable("table_row_height", 1, ImGuiTableFlags_Borders)) + { + for (int row = 0; row < 8; row++) + { + float min_row_height = (float)(int)(TEXT_BASE_HEIGHT * 0.30f * row); + ImGui::TableNextRow(ImGuiTableRowFlags_None, min_row_height); + ImGui::TableNextColumn(); + ImGui::Text("min_row_height = %.2f", min_row_height); + } + ImGui::EndTable(); + } + + HelpMarker( + "Showcase using SameLine(0,0) to share Current Line Height between cells.\n\n" + "Please note that Tables Row Height is not the same thing as Current Line Height, " + "as a table cell may contains multiple lines."); + if (ImGui::BeginTable("table_share_lineheight", 2, ImGuiTableFlags_Borders)) + { + ImGui::TableNextRow(); + ImGui::TableNextColumn(); + ImGui::ColorButton("##1", ImVec4(0.13f, 0.26f, 0.40f, 1.0f), ImGuiColorEditFlags_None, ImVec2(40, 40)); + ImGui::TableNextColumn(); + ImGui::Text("Line 1"); + ImGui::Text("Line 2"); + + ImGui::TableNextRow(); + ImGui::TableNextColumn(); + ImGui::ColorButton("##2", ImVec4(0.13f, 0.26f, 0.40f, 1.0f), ImGuiColorEditFlags_None, ImVec2(40, 40)); + ImGui::TableNextColumn(); + ImGui::SameLine(0.0f, 0.0f); // Reuse line height from previous column + ImGui::Text("Line 1, with SameLine(0,0)"); + ImGui::Text("Line 2"); + + ImGui::EndTable(); + } + + HelpMarker("Showcase altering CellPadding.y between rows. Note that CellPadding.x is locked for the entire table."); + if (ImGui::BeginTable("table_changing_cellpadding_y", 1, ImGuiTableFlags_Borders)) + { + ImGuiStyle& style = ImGui::GetStyle(); + for (int row = 0; row < 8; row++) + { + if ((row % 3) == 2) + ImGui::PushStyleVarY(ImGuiStyleVar_CellPadding, 20.0f); + ImGui::TableNextRow(ImGuiTableRowFlags_None); + ImGui::TableNextColumn(); + ImGui::Text("CellPadding.y = %.2f", style.CellPadding.y); + if ((row % 3) == 2) + ImGui::PopStyleVar(); + } + ImGui::EndTable(); + } + + ImGui::TreePop(); + } + + if (open_action != -1) + ImGui::SetNextItemOpen(open_action != 0); + IMGUI_DEMO_MARKER("Tables/Outer size"); + if (ImGui::TreeNode("Outer size")) + { + // Showcasing use of ImGuiTableFlags_NoHostExtendX and ImGuiTableFlags_NoHostExtendY + // Important to that note how the two flags have slightly different behaviors! + ImGui::Text("Using NoHostExtendX and NoHostExtendY:"); + PushStyleCompact(); + static ImGuiTableFlags flags = ImGuiTableFlags_Borders | ImGuiTableFlags_Resizable | ImGuiTableFlags_ContextMenuInBody | ImGuiTableFlags_RowBg | ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_NoHostExtendX; + ImGui::CheckboxFlags("ImGuiTableFlags_NoHostExtendX", &flags, ImGuiTableFlags_NoHostExtendX); + ImGui::SameLine(); HelpMarker("Make outer width auto-fit to columns, overriding outer_size.x value.\n\nOnly available when ScrollX/ScrollY are disabled and Stretch columns are not used."); + ImGui::CheckboxFlags("ImGuiTableFlags_NoHostExtendY", &flags, ImGuiTableFlags_NoHostExtendY); + ImGui::SameLine(); HelpMarker("Make outer height stop exactly at outer_size.y (prevent auto-extending table past the limit).\n\nOnly available when ScrollX/ScrollY are disabled. Data below the limit will be clipped and not visible."); + PopStyleCompact(); + + ImVec2 outer_size = ImVec2(0.0f, TEXT_BASE_HEIGHT * 5.5f); + if (ImGui::BeginTable("table1", 3, flags, outer_size)) + { + for (int row = 0; row < 10; row++) + { + ImGui::TableNextRow(); + for (int column = 0; column < 3; column++) + { + ImGui::TableNextColumn(); + ImGui::Text("Cell %d,%d", column, row); + } + } + ImGui::EndTable(); + } + ImGui::SameLine(); + ImGui::Text("Hello!"); + + ImGui::Spacing(); + + ImGui::Text("Using explicit size:"); + if (ImGui::BeginTable("table2", 3, ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg, ImVec2(TEXT_BASE_WIDTH * 30, 0.0f))) + { + for (int row = 0; row < 5; row++) + { + ImGui::TableNextRow(); + for (int column = 0; column < 3; column++) + { + ImGui::TableNextColumn(); + ImGui::Text("Cell %d,%d", column, row); + } + } + ImGui::EndTable(); + } + ImGui::SameLine(); + if (ImGui::BeginTable("table3", 3, ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg, ImVec2(TEXT_BASE_WIDTH * 30, 0.0f))) + { + for (int row = 0; row < 3; row++) + { + ImGui::TableNextRow(0, TEXT_BASE_HEIGHT * 1.5f); + for (int column = 0; column < 3; column++) + { + ImGui::TableNextColumn(); + ImGui::Text("Cell %d,%d", column, row); + } + } + ImGui::EndTable(); + } + + ImGui::TreePop(); + } + + if (open_action != -1) + ImGui::SetNextItemOpen(open_action != 0); + IMGUI_DEMO_MARKER("Tables/Background color"); + if (ImGui::TreeNode("Background color")) + { + static ImGuiTableFlags flags = ImGuiTableFlags_RowBg; + static int row_bg_type = 1; + static int row_bg_target = 1; + static int cell_bg_type = 1; + + PushStyleCompact(); + ImGui::CheckboxFlags("ImGuiTableFlags_Borders", &flags, ImGuiTableFlags_Borders); + ImGui::CheckboxFlags("ImGuiTableFlags_RowBg", &flags, ImGuiTableFlags_RowBg); + ImGui::SameLine(); HelpMarker("ImGuiTableFlags_RowBg automatically sets RowBg0 to alternative colors pulled from the Style."); + ImGui::Combo("row bg type", (int*)&row_bg_type, "None\0Red\0Gradient\0"); + ImGui::Combo("row bg target", (int*)&row_bg_target, "RowBg0\0RowBg1\0"); ImGui::SameLine(); HelpMarker("Target RowBg0 to override the alternating odd/even colors,\nTarget RowBg1 to blend with them."); + ImGui::Combo("cell bg type", (int*)&cell_bg_type, "None\0Blue\0"); ImGui::SameLine(); HelpMarker("We are colorizing cells to B1->C2 here."); + IM_ASSERT(row_bg_type >= 0 && row_bg_type <= 2); + IM_ASSERT(row_bg_target >= 0 && row_bg_target <= 1); + IM_ASSERT(cell_bg_type >= 0 && cell_bg_type <= 1); + PopStyleCompact(); + + if (ImGui::BeginTable("table1", 5, flags)) + { + for (int row = 0; row < 6; row++) + { + ImGui::TableNextRow(); + + // Demonstrate setting a row background color with 'ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBgX, ...)' + // We use a transparent color so we can see the one behind in case our target is RowBg1 and RowBg0 was already targeted by the ImGuiTableFlags_RowBg flag. + if (row_bg_type != 0) + { + ImU32 row_bg_color = ImGui::GetColorU32(row_bg_type == 1 ? ImVec4(0.7f, 0.3f, 0.3f, 0.65f) : ImVec4(0.2f + row * 0.1f, 0.2f, 0.2f, 0.65f)); // Flat or Gradient? + ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0 + row_bg_target, row_bg_color); + } + + // Fill cells + for (int column = 0; column < 5; column++) + { + ImGui::TableSetColumnIndex(column); + ImGui::Text("%c%c", 'A' + row, '0' + column); + + // Change background of Cells B1->C2 + // Demonstrate setting a cell background color with 'ImGui::TableSetBgColor(ImGuiTableBgTarget_CellBg, ...)' + // (the CellBg color will be blended over the RowBg and ColumnBg colors) + // We can also pass a column number as a third parameter to TableSetBgColor() and do this outside the column loop. + if (row >= 1 && row <= 2 && column >= 1 && column <= 2 && cell_bg_type == 1) + { + ImU32 cell_bg_color = ImGui::GetColorU32(ImVec4(0.3f, 0.3f, 0.7f, 0.65f)); + ImGui::TableSetBgColor(ImGuiTableBgTarget_CellBg, cell_bg_color); + } + } + } + ImGui::EndTable(); + } + ImGui::TreePop(); + } + + if (open_action != -1) + ImGui::SetNextItemOpen(open_action != 0); + IMGUI_DEMO_MARKER("Tables/Tree view"); + if (ImGui::TreeNode("Tree view")) + { + static ImGuiTableFlags table_flags = ImGuiTableFlags_BordersV | ImGuiTableFlags_BordersOuterH | ImGuiTableFlags_Resizable | ImGuiTableFlags_RowBg | ImGuiTableFlags_NoBordersInBody; + + static ImGuiTreeNodeFlags tree_node_flags_base = ImGuiTreeNodeFlags_SpanAllColumns; + ImGui::CheckboxFlags("ImGuiTreeNodeFlags_SpanFullWidth", &tree_node_flags_base, ImGuiTreeNodeFlags_SpanFullWidth); + ImGui::CheckboxFlags("ImGuiTreeNodeFlags_SpanLabelWidth", &tree_node_flags_base, ImGuiTreeNodeFlags_SpanLabelWidth); + ImGui::CheckboxFlags("ImGuiTreeNodeFlags_SpanAllColumns", &tree_node_flags_base, ImGuiTreeNodeFlags_SpanAllColumns); + ImGui::CheckboxFlags("ImGuiTreeNodeFlags_LabelSpanAllColumns", &tree_node_flags_base, ImGuiTreeNodeFlags_LabelSpanAllColumns); + ImGui::SameLine(); HelpMarker("Useful if you know that you aren't displaying contents in other columns"); + + HelpMarker("See \"Columns flags\" section to configure how indentation is applied to individual columns."); + if (ImGui::BeginTable("3ways", 3, table_flags)) + { + // The first column will use the default _WidthStretch when ScrollX is Off and _WidthFixed when ScrollX is On + ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_NoHide); + ImGui::TableSetupColumn("Size", ImGuiTableColumnFlags_WidthFixed, TEXT_BASE_WIDTH * 12.0f); + ImGui::TableSetupColumn("Type", ImGuiTableColumnFlags_WidthFixed, TEXT_BASE_WIDTH * 18.0f); + ImGui::TableHeadersRow(); + + // Simple storage to output a dummy file-system. + struct MyTreeNode + { + const char* Name; + const char* Type; + int Size; + int ChildIdx; + int ChildCount; + static void DisplayNode(const MyTreeNode* node, const MyTreeNode* all_nodes) + { + ImGui::TableNextRow(); + ImGui::TableNextColumn(); + const bool is_folder = (node->ChildCount > 0); + + ImGuiTreeNodeFlags node_flags = tree_node_flags_base; + if (node != &all_nodes[0]) + node_flags &= ~ImGuiTreeNodeFlags_LabelSpanAllColumns; // Only demonstrate this on the root node. + + if (is_folder) + { + bool open = ImGui::TreeNodeEx(node->Name, node_flags); + if ((node_flags & ImGuiTreeNodeFlags_LabelSpanAllColumns) == 0) + { + ImGui::TableNextColumn(); + ImGui::TextDisabled("--"); + ImGui::TableNextColumn(); + ImGui::TextUnformatted(node->Type); + } + if (open) + { + for (int child_n = 0; child_n < node->ChildCount; child_n++) + DisplayNode(&all_nodes[node->ChildIdx + child_n], all_nodes); + ImGui::TreePop(); + } + } + else + { + ImGui::TreeNodeEx(node->Name, node_flags | ImGuiTreeNodeFlags_Leaf | ImGuiTreeNodeFlags_Bullet | ImGuiTreeNodeFlags_NoTreePushOnOpen); + ImGui::TableNextColumn(); + ImGui::Text("%d", node->Size); + ImGui::TableNextColumn(); + ImGui::TextUnformatted(node->Type); + } + } + }; + static const MyTreeNode nodes[] = + { + { "Root with Long Name", "Folder", -1, 1, 3 }, // 0 + { "Music", "Folder", -1, 4, 2 }, // 1 + { "Textures", "Folder", -1, 6, 3 }, // 2 + { "desktop.ini", "System file", 1024, -1,-1 }, // 3 + { "File1_a.wav", "Audio file", 123000, -1,-1 }, // 4 + { "File1_b.wav", "Audio file", 456000, -1,-1 }, // 5 + { "Image001.png", "Image file", 203128, -1,-1 }, // 6 + { "Copy of Image001.png", "Image file", 203256, -1,-1 }, // 7 + { "Copy of Image001 (Final2).png","Image file", 203512, -1,-1 }, // 8 + }; + + MyTreeNode::DisplayNode(&nodes[0], nodes); + + ImGui::EndTable(); + } + ImGui::TreePop(); + } + + if (open_action != -1) + ImGui::SetNextItemOpen(open_action != 0); + IMGUI_DEMO_MARKER("Tables/Item width"); + if (ImGui::TreeNode("Item width")) + { + HelpMarker( + "Showcase using PushItemWidth() and how it is preserved on a per-column basis.\n\n" + "Note that on auto-resizing non-resizable fixed columns, querying the content width for " + "e.g. right-alignment doesn't make sense."); + if (ImGui::BeginTable("table_item_width", 3, ImGuiTableFlags_Borders)) + { + ImGui::TableSetupColumn("small"); + ImGui::TableSetupColumn("half"); + ImGui::TableSetupColumn("right-align"); + ImGui::TableHeadersRow(); + + for (int row = 0; row < 3; row++) + { + ImGui::TableNextRow(); + if (row == 0) + { + // Setup ItemWidth once (instead of setting up every time, which is also possible but less efficient) + ImGui::TableSetColumnIndex(0); + ImGui::PushItemWidth(TEXT_BASE_WIDTH * 3.0f); // Small + ImGui::TableSetColumnIndex(1); + ImGui::PushItemWidth(-ImGui::GetContentRegionAvail().x * 0.5f); + ImGui::TableSetColumnIndex(2); + ImGui::PushItemWidth(-FLT_MIN); // Right-aligned + } + + // Draw our contents + static float dummy_f = 0.0f; + ImGui::PushID(row); + ImGui::TableSetColumnIndex(0); + ImGui::SliderFloat("float0", &dummy_f, 0.0f, 1.0f); + ImGui::TableSetColumnIndex(1); + ImGui::SliderFloat("float1", &dummy_f, 0.0f, 1.0f); + ImGui::TableSetColumnIndex(2); + ImGui::SliderFloat("##float2", &dummy_f, 0.0f, 1.0f); // No visible label since right-aligned + ImGui::PopID(); + } + ImGui::EndTable(); + } + ImGui::TreePop(); + } + + // Demonstrate using TableHeader() calls instead of TableHeadersRow() + if (open_action != -1) + ImGui::SetNextItemOpen(open_action != 0); + IMGUI_DEMO_MARKER("Tables/Custom headers"); + if (ImGui::TreeNode("Custom headers")) + { + const int COLUMNS_COUNT = 3; + if (ImGui::BeginTable("table_custom_headers", COLUMNS_COUNT, ImGuiTableFlags_Borders | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable)) + { + ImGui::TableSetupColumn("Apricot"); + ImGui::TableSetupColumn("Banana"); + ImGui::TableSetupColumn("Cherry"); + + // Dummy entire-column selection storage + // FIXME: It would be nice to actually demonstrate full-featured selection using those checkbox. + static bool column_selected[3] = {}; + + // Instead of calling TableHeadersRow() we'll submit custom headers ourselves. + // (A different approach is also possible: + // - Specify ImGuiTableColumnFlags_NoHeaderLabel in some TableSetupColumn() call. + // - Call TableHeadersRow() normally. This will submit TableHeader() with no name. + // - Then call TableSetColumnIndex() to position yourself in the column and submit your stuff e.g. Checkbox().) + ImGui::TableNextRow(ImGuiTableRowFlags_Headers); + for (int column = 0; column < COLUMNS_COUNT; column++) + { + ImGui::TableSetColumnIndex(column); + const char* column_name = ImGui::TableGetColumnName(column); // Retrieve name passed to TableSetupColumn() + ImGui::PushID(column); + ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0)); + ImGui::Checkbox("##checkall", &column_selected[column]); + ImGui::PopStyleVar(); + ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x); + ImGui::TableHeader(column_name); + ImGui::PopID(); + } + + // Submit table contents + for (int row = 0; row < 5; row++) + { + ImGui::TableNextRow(); + for (int column = 0; column < 3; column++) + { + char buf[32]; + sprintf(buf, "Cell %d,%d", column, row); + ImGui::TableSetColumnIndex(column); + ImGui::Selectable(buf, column_selected[column]); + } + } + ImGui::EndTable(); + } + ImGui::TreePop(); + } + + // Demonstrate using ImGuiTableColumnFlags_AngledHeader flag to create angled headers + if (open_action != -1) + ImGui::SetNextItemOpen(open_action != 0); + IMGUI_DEMO_MARKER("Tables/Angled headers"); + if (ImGui::TreeNode("Angled headers")) + { + const char* column_names[] = { "Track", "cabasa", "ride", "smash", "tom-hi", "tom-mid", "tom-low", "hihat-o", "hihat-c", "snare-s", "snare-c", "clap", "rim", "kick" }; + const int columns_count = IM_ARRAYSIZE(column_names); + const int rows_count = 12; + + static ImGuiTableFlags table_flags = ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_ScrollX | ImGuiTableFlags_ScrollY | ImGuiTableFlags_BordersOuter | ImGuiTableFlags_BordersInnerH | ImGuiTableFlags_Hideable | ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_HighlightHoveredColumn; + static ImGuiTableColumnFlags column_flags = ImGuiTableColumnFlags_AngledHeader | ImGuiTableColumnFlags_WidthFixed; + static bool bools[columns_count * rows_count] = {}; // Dummy storage selection storage + static int frozen_cols = 1; + static int frozen_rows = 2; + ImGui::CheckboxFlags("_ScrollX", &table_flags, ImGuiTableFlags_ScrollX); + ImGui::CheckboxFlags("_ScrollY", &table_flags, ImGuiTableFlags_ScrollY); + ImGui::CheckboxFlags("_Resizable", &table_flags, ImGuiTableFlags_Resizable); + ImGui::CheckboxFlags("_Sortable", &table_flags, ImGuiTableFlags_Sortable); + ImGui::CheckboxFlags("_NoBordersInBody", &table_flags, ImGuiTableFlags_NoBordersInBody); + ImGui::CheckboxFlags("_HighlightHoveredColumn", &table_flags, ImGuiTableFlags_HighlightHoveredColumn); + ImGui::SetNextItemWidth(ImGui::GetFontSize() * 8); + ImGui::SliderInt("Frozen columns", &frozen_cols, 0, 2); + ImGui::SetNextItemWidth(ImGui::GetFontSize() * 8); + ImGui::SliderInt("Frozen rows", &frozen_rows, 0, 2); + ImGui::CheckboxFlags("Disable header contributing to column width", &column_flags, ImGuiTableColumnFlags_NoHeaderWidth); + + if (ImGui::TreeNode("Style settings")) + { + ImGui::SameLine(); + HelpMarker("Giving access to some ImGuiStyle value in this demo for convenience."); + ImGui::SetNextItemWidth(ImGui::GetFontSize() * 8); + ImGui::SliderAngle("style.TableAngledHeadersAngle", &ImGui::GetStyle().TableAngledHeadersAngle, -50.0f, +50.0f); + ImGui::SetNextItemWidth(ImGui::GetFontSize() * 8); + ImGui::SliderFloat2("style.TableAngledHeadersTextAlign", (float*)&ImGui::GetStyle().TableAngledHeadersTextAlign, 0.0f, 1.0f, "%.2f"); + ImGui::TreePop(); + } + + if (ImGui::BeginTable("table_angled_headers", columns_count, table_flags, ImVec2(0.0f, TEXT_BASE_HEIGHT * 12))) + { + ImGui::TableSetupColumn(column_names[0], ImGuiTableColumnFlags_NoHide | ImGuiTableColumnFlags_NoReorder); + for (int n = 1; n < columns_count; n++) + ImGui::TableSetupColumn(column_names[n], column_flags); + ImGui::TableSetupScrollFreeze(frozen_cols, frozen_rows); + + ImGui::TableAngledHeadersRow(); // Draw angled headers for all columns with the ImGuiTableColumnFlags_AngledHeader flag. + ImGui::TableHeadersRow(); // Draw remaining headers and allow access to context-menu and other functions. + for (int row = 0; row < rows_count; row++) + { + ImGui::PushID(row); + ImGui::TableNextRow(); + ImGui::TableSetColumnIndex(0); + ImGui::AlignTextToFramePadding(); + ImGui::Text("Track %d", row); + for (int column = 1; column < columns_count; column++) + if (ImGui::TableSetColumnIndex(column)) + { + ImGui::PushID(column); + ImGui::Checkbox("", &bools[row * columns_count + column]); + ImGui::PopID(); + } + ImGui::PopID(); + } + ImGui::EndTable(); + } + ImGui::TreePop(); + } + + // Demonstrate creating custom context menus inside columns, + // while playing it nice with context menus provided by TableHeadersRow()/TableHeader() + if (open_action != -1) + ImGui::SetNextItemOpen(open_action != 0); + IMGUI_DEMO_MARKER("Tables/Context menus"); + if (ImGui::TreeNode("Context menus")) + { + HelpMarker( + "By default, right-clicking over a TableHeadersRow()/TableHeader() line will open the default context-menu.\n" + "Using ImGuiTableFlags_ContextMenuInBody we also allow right-clicking over columns body."); + static ImGuiTableFlags flags1 = ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable | ImGuiTableFlags_Borders | ImGuiTableFlags_ContextMenuInBody; + + PushStyleCompact(); + ImGui::CheckboxFlags("ImGuiTableFlags_ContextMenuInBody", &flags1, ImGuiTableFlags_ContextMenuInBody); + PopStyleCompact(); + + // Context Menus: first example + // [1.1] Right-click on the TableHeadersRow() line to open the default table context menu. + // [1.2] Right-click in columns also open the default table context menu (if ImGuiTableFlags_ContextMenuInBody is set) + const int COLUMNS_COUNT = 3; + if (ImGui::BeginTable("table_context_menu", COLUMNS_COUNT, flags1)) + { + ImGui::TableSetupColumn("One"); + ImGui::TableSetupColumn("Two"); + ImGui::TableSetupColumn("Three"); + + // [1.1]] Right-click on the TableHeadersRow() line to open the default table context menu. + ImGui::TableHeadersRow(); + + // Submit dummy contents + for (int row = 0; row < 4; row++) + { + ImGui::TableNextRow(); + for (int column = 0; column < COLUMNS_COUNT; column++) + { + ImGui::TableSetColumnIndex(column); + ImGui::Text("Cell %d,%d", column, row); + } + } + ImGui::EndTable(); + } + + // Context Menus: second example + // [2.1] Right-click on the TableHeadersRow() line to open the default table context menu. + // [2.2] Right-click on the ".." to open a custom popup + // [2.3] Right-click in columns to open another custom popup + HelpMarker( + "Demonstrate mixing table context menu (over header), item context button (over button) " + "and custom per-colunm context menu (over column body)."); + ImGuiTableFlags flags2 = ImGuiTableFlags_Resizable | ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable | ImGuiTableFlags_Borders; + if (ImGui::BeginTable("table_context_menu_2", COLUMNS_COUNT, flags2)) + { + ImGui::TableSetupColumn("One"); + ImGui::TableSetupColumn("Two"); + ImGui::TableSetupColumn("Three"); + + // [2.1] Right-click on the TableHeadersRow() line to open the default table context menu. + ImGui::TableHeadersRow(); + for (int row = 0; row < 4; row++) + { + ImGui::TableNextRow(); + for (int column = 0; column < COLUMNS_COUNT; column++) + { + // Submit dummy contents + ImGui::TableSetColumnIndex(column); + ImGui::Text("Cell %d,%d", column, row); + ImGui::SameLine(); + + // [2.2] Right-click on the ".." to open a custom popup + ImGui::PushID(row * COLUMNS_COUNT + column); + ImGui::SmallButton(".."); + if (ImGui::BeginPopupContextItem()) + { + ImGui::Text("This is the popup for Button(\"..\") in Cell %d,%d", column, row); + if (ImGui::Button("Close")) + ImGui::CloseCurrentPopup(); + ImGui::EndPopup(); + } + ImGui::PopID(); + } + } + + // [2.3] Right-click anywhere in columns to open another custom popup + // (instead of testing for !IsAnyItemHovered() we could also call OpenPopup() with ImGuiPopupFlags_NoOpenOverExistingPopup + // to manage popup priority as the popups triggers, here "are we hovering a column" are overlapping) + int hovered_column = -1; + for (int column = 0; column < COLUMNS_COUNT + 1; column++) + { + ImGui::PushID(column); + if (ImGui::TableGetColumnFlags(column) & ImGuiTableColumnFlags_IsHovered) + hovered_column = column; + if (hovered_column == column && !ImGui::IsAnyItemHovered() && ImGui::IsMouseReleased(1)) + ImGui::OpenPopup("MyPopup"); + if (ImGui::BeginPopup("MyPopup")) + { + if (column == COLUMNS_COUNT) + ImGui::Text("This is a custom popup for unused space after the last column."); + else + ImGui::Text("This is a custom popup for Column %d", column); + if (ImGui::Button("Close")) + ImGui::CloseCurrentPopup(); + ImGui::EndPopup(); + } + ImGui::PopID(); + } + + ImGui::EndTable(); + ImGui::Text("Hovered column: %d", hovered_column); + } + ImGui::TreePop(); + } + + // Demonstrate creating multiple tables with the same ID + if (open_action != -1) + ImGui::SetNextItemOpen(open_action != 0); + IMGUI_DEMO_MARKER("Tables/Synced instances"); + if (ImGui::TreeNode("Synced instances")) + { + HelpMarker("Multiple tables with the same identifier will share their settings, width, visibility, order etc."); + + static ImGuiTableFlags flags = ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable | ImGuiTableFlags_Borders | ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_NoSavedSettings; + ImGui::CheckboxFlags("ImGuiTableFlags_Resizable", &flags, ImGuiTableFlags_Resizable); + ImGui::CheckboxFlags("ImGuiTableFlags_ScrollY", &flags, ImGuiTableFlags_ScrollY); + ImGui::CheckboxFlags("ImGuiTableFlags_SizingFixedFit", &flags, ImGuiTableFlags_SizingFixedFit); + ImGui::CheckboxFlags("ImGuiTableFlags_HighlightHoveredColumn", &flags, ImGuiTableFlags_HighlightHoveredColumn); + for (int n = 0; n < 3; n++) + { + char buf[32]; + sprintf(buf, "Synced Table %d", n); + bool open = ImGui::CollapsingHeader(buf, ImGuiTreeNodeFlags_DefaultOpen); + if (open && ImGui::BeginTable("Table", 3, flags, ImVec2(0.0f, ImGui::GetTextLineHeightWithSpacing() * 5))) + { + ImGui::TableSetupColumn("One"); + ImGui::TableSetupColumn("Two"); + ImGui::TableSetupColumn("Three"); + ImGui::TableHeadersRow(); + const int cell_count = (n == 1) ? 27 : 9; // Make second table have a scrollbar to verify that additional decoration is not affecting column positions. + for (int cell = 0; cell < cell_count; cell++) + { + ImGui::TableNextColumn(); + ImGui::Text("this cell %d", cell); + } + ImGui::EndTable(); + } + } + ImGui::TreePop(); + } + + // Demonstrate using Sorting facilities + // This is a simplified version of the "Advanced" example, where we mostly focus on the code necessary to handle sorting. + // Note that the "Advanced" example also showcase manually triggering a sort (e.g. if item quantities have been modified) + static const char* template_items_names[] = + { + "Banana", "Apple", "Cherry", "Watermelon", "Grapefruit", "Strawberry", "Mango", + "Kiwi", "Orange", "Pineapple", "Blueberry", "Plum", "Coconut", "Pear", "Apricot" + }; + if (open_action != -1) + ImGui::SetNextItemOpen(open_action != 0); + IMGUI_DEMO_MARKER("Tables/Sorting"); + if (ImGui::TreeNode("Sorting")) + { + // Create item list + static ImVector items; + if (items.Size == 0) + { + items.resize(50, MyItem()); + for (int n = 0; n < items.Size; n++) + { + const int template_n = n % IM_ARRAYSIZE(template_items_names); + MyItem& item = items[n]; + item.ID = n; + item.Name = template_items_names[template_n]; + item.Quantity = (n * n - n) % 20; // Assign default quantities + } + } + + // Options + static ImGuiTableFlags flags = + ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable | ImGuiTableFlags_Sortable | ImGuiTableFlags_SortMulti + | ImGuiTableFlags_RowBg | ImGuiTableFlags_BordersOuter | ImGuiTableFlags_BordersV | ImGuiTableFlags_NoBordersInBody + | ImGuiTableFlags_ScrollY; + PushStyleCompact(); + ImGui::CheckboxFlags("ImGuiTableFlags_SortMulti", &flags, ImGuiTableFlags_SortMulti); + ImGui::SameLine(); HelpMarker("When sorting is enabled: hold shift when clicking headers to sort on multiple column. TableGetSortSpecs() may return specs where (SpecsCount > 1)."); + ImGui::CheckboxFlags("ImGuiTableFlags_SortTristate", &flags, ImGuiTableFlags_SortTristate); + ImGui::SameLine(); HelpMarker("When sorting is enabled: allow no sorting, disable default sorting. TableGetSortSpecs() may return specs where (SpecsCount == 0)."); + PopStyleCompact(); + + if (ImGui::BeginTable("table_sorting", 4, flags, ImVec2(0.0f, TEXT_BASE_HEIGHT * 15), 0.0f)) + { + // Declare columns + // We use the "user_id" parameter of TableSetupColumn() to specify a user id that will be stored in the sort specifications. + // This is so our sort function can identify a column given our own identifier. We could also identify them based on their index! + // Demonstrate using a mixture of flags among available sort-related flags: + // - ImGuiTableColumnFlags_DefaultSort + // - ImGuiTableColumnFlags_NoSort / ImGuiTableColumnFlags_NoSortAscending / ImGuiTableColumnFlags_NoSortDescending + // - ImGuiTableColumnFlags_PreferSortAscending / ImGuiTableColumnFlags_PreferSortDescending + ImGui::TableSetupColumn("ID", ImGuiTableColumnFlags_DefaultSort | ImGuiTableColumnFlags_WidthFixed, 0.0f, MyItemColumnID_ID); + ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_WidthFixed, 0.0f, MyItemColumnID_Name); + ImGui::TableSetupColumn("Action", ImGuiTableColumnFlags_NoSort | ImGuiTableColumnFlags_WidthFixed, 0.0f, MyItemColumnID_Action); + ImGui::TableSetupColumn("Quantity", ImGuiTableColumnFlags_PreferSortDescending | ImGuiTableColumnFlags_WidthStretch, 0.0f, MyItemColumnID_Quantity); + ImGui::TableSetupScrollFreeze(0, 1); // Make row always visible + ImGui::TableHeadersRow(); + + // Sort our data if sort specs have been changed! + if (ImGuiTableSortSpecs* sort_specs = ImGui::TableGetSortSpecs()) + if (sort_specs->SpecsDirty) + { + MyItem::SortWithSortSpecs(sort_specs, items.Data, items.Size); + sort_specs->SpecsDirty = false; + } + + // Demonstrate using clipper for large vertical lists + ImGuiListClipper clipper; + clipper.Begin(items.Size); + while (clipper.Step()) + for (int row_n = clipper.DisplayStart; row_n < clipper.DisplayEnd; row_n++) + { + // Display a data item + MyItem* item = &items[row_n]; + ImGui::PushID(item->ID); + ImGui::TableNextRow(); + ImGui::TableNextColumn(); + ImGui::Text("%04d", item->ID); + ImGui::TableNextColumn(); + ImGui::TextUnformatted(item->Name); + ImGui::TableNextColumn(); + ImGui::SmallButton("None"); + ImGui::TableNextColumn(); + ImGui::Text("%d", item->Quantity); + ImGui::PopID(); + } + ImGui::EndTable(); + } + ImGui::TreePop(); + } + + // In this example we'll expose most table flags and settings. + // For specific flags and settings refer to the corresponding section for more detailed explanation. + // This section is mostly useful to experiment with combining certain flags or settings with each others. + //ImGui::SetNextItemOpen(true, ImGuiCond_Once); // [DEBUG] + if (open_action != -1) + ImGui::SetNextItemOpen(open_action != 0); + IMGUI_DEMO_MARKER("Tables/Advanced"); + if (ImGui::TreeNode("Advanced")) + { + static ImGuiTableFlags flags = + ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable + | ImGuiTableFlags_Sortable | ImGuiTableFlags_SortMulti + | ImGuiTableFlags_RowBg | ImGuiTableFlags_Borders | ImGuiTableFlags_NoBordersInBody + | ImGuiTableFlags_ScrollX | ImGuiTableFlags_ScrollY + | ImGuiTableFlags_SizingFixedFit; + static ImGuiTableColumnFlags columns_base_flags = ImGuiTableColumnFlags_None; + + enum ContentsType { CT_Text, CT_Button, CT_SmallButton, CT_FillButton, CT_Selectable, CT_SelectableSpanRow }; + static int contents_type = CT_SelectableSpanRow; + const char* contents_type_names[] = { "Text", "Button", "SmallButton", "FillButton", "Selectable", "Selectable (span row)" }; + static int freeze_cols = 1; + static int freeze_rows = 1; + static int items_count = IM_ARRAYSIZE(template_items_names) * 2; + static ImVec2 outer_size_value = ImVec2(0.0f, TEXT_BASE_HEIGHT * 12); + static float row_min_height = 0.0f; // Auto + static float inner_width_with_scroll = 0.0f; // Auto-extend + static bool outer_size_enabled = true; + static bool show_headers = true; + static bool show_wrapped_text = false; + //static ImGuiTextFilter filter; + //ImGui::SetNextItemOpen(true, ImGuiCond_Once); // FIXME-TABLE: Enabling this results in initial clipped first pass on table which tend to affect column sizing + if (ImGui::TreeNode("Options")) + { + // Make the UI compact because there are so many fields + PushStyleCompact(); + ImGui::PushItemWidth(TEXT_BASE_WIDTH * 28.0f); + + if (ImGui::TreeNodeEx("Features:", ImGuiTreeNodeFlags_DefaultOpen)) + { + ImGui::CheckboxFlags("ImGuiTableFlags_Resizable", &flags, ImGuiTableFlags_Resizable); + ImGui::CheckboxFlags("ImGuiTableFlags_Reorderable", &flags, ImGuiTableFlags_Reorderable); + ImGui::CheckboxFlags("ImGuiTableFlags_Hideable", &flags, ImGuiTableFlags_Hideable); + ImGui::CheckboxFlags("ImGuiTableFlags_Sortable", &flags, ImGuiTableFlags_Sortable); + ImGui::CheckboxFlags("ImGuiTableFlags_NoSavedSettings", &flags, ImGuiTableFlags_NoSavedSettings); + ImGui::CheckboxFlags("ImGuiTableFlags_ContextMenuInBody", &flags, ImGuiTableFlags_ContextMenuInBody); + ImGui::TreePop(); + } + + if (ImGui::TreeNodeEx("Decorations:", ImGuiTreeNodeFlags_DefaultOpen)) + { + ImGui::CheckboxFlags("ImGuiTableFlags_RowBg", &flags, ImGuiTableFlags_RowBg); + ImGui::CheckboxFlags("ImGuiTableFlags_BordersV", &flags, ImGuiTableFlags_BordersV); + ImGui::CheckboxFlags("ImGuiTableFlags_BordersOuterV", &flags, ImGuiTableFlags_BordersOuterV); + ImGui::CheckboxFlags("ImGuiTableFlags_BordersInnerV", &flags, ImGuiTableFlags_BordersInnerV); + ImGui::CheckboxFlags("ImGuiTableFlags_BordersH", &flags, ImGuiTableFlags_BordersH); + ImGui::CheckboxFlags("ImGuiTableFlags_BordersOuterH", &flags, ImGuiTableFlags_BordersOuterH); + ImGui::CheckboxFlags("ImGuiTableFlags_BordersInnerH", &flags, ImGuiTableFlags_BordersInnerH); + ImGui::CheckboxFlags("ImGuiTableFlags_NoBordersInBody", &flags, ImGuiTableFlags_NoBordersInBody); ImGui::SameLine(); HelpMarker("Disable vertical borders in columns Body (borders will always appear in Headers"); + ImGui::CheckboxFlags("ImGuiTableFlags_NoBordersInBodyUntilResize", &flags, ImGuiTableFlags_NoBordersInBodyUntilResize); ImGui::SameLine(); HelpMarker("Disable vertical borders in columns Body until hovered for resize (borders will always appear in Headers)"); + ImGui::TreePop(); + } + + if (ImGui::TreeNodeEx("Sizing:", ImGuiTreeNodeFlags_DefaultOpen)) + { + EditTableSizingFlags(&flags); + ImGui::SameLine(); HelpMarker("In the Advanced demo we override the policy of each column so those table-wide settings have less effect that typical."); + ImGui::CheckboxFlags("ImGuiTableFlags_NoHostExtendX", &flags, ImGuiTableFlags_NoHostExtendX); + ImGui::SameLine(); HelpMarker("Make outer width auto-fit to columns, overriding outer_size.x value.\n\nOnly available when ScrollX/ScrollY are disabled and Stretch columns are not used."); + ImGui::CheckboxFlags("ImGuiTableFlags_NoHostExtendY", &flags, ImGuiTableFlags_NoHostExtendY); + ImGui::SameLine(); HelpMarker("Make outer height stop exactly at outer_size.y (prevent auto-extending table past the limit).\n\nOnly available when ScrollX/ScrollY are disabled. Data below the limit will be clipped and not visible."); + ImGui::CheckboxFlags("ImGuiTableFlags_NoKeepColumnsVisible", &flags, ImGuiTableFlags_NoKeepColumnsVisible); + ImGui::SameLine(); HelpMarker("Only available if ScrollX is disabled."); + ImGui::CheckboxFlags("ImGuiTableFlags_PreciseWidths", &flags, ImGuiTableFlags_PreciseWidths); + ImGui::SameLine(); HelpMarker("Disable distributing remainder width to stretched columns (width allocation on a 100-wide table with 3 columns: Without this flag: 33,33,34. With this flag: 33,33,33). With larger number of columns, resizing will appear to be less smooth."); + ImGui::CheckboxFlags("ImGuiTableFlags_NoClip", &flags, ImGuiTableFlags_NoClip); + ImGui::SameLine(); HelpMarker("Disable clipping rectangle for every individual columns (reduce draw command count, items will be able to overflow into other columns). Generally incompatible with ScrollFreeze options."); + ImGui::TreePop(); + } + + if (ImGui::TreeNodeEx("Padding:", ImGuiTreeNodeFlags_DefaultOpen)) + { + ImGui::CheckboxFlags("ImGuiTableFlags_PadOuterX", &flags, ImGuiTableFlags_PadOuterX); + ImGui::CheckboxFlags("ImGuiTableFlags_NoPadOuterX", &flags, ImGuiTableFlags_NoPadOuterX); + ImGui::CheckboxFlags("ImGuiTableFlags_NoPadInnerX", &flags, ImGuiTableFlags_NoPadInnerX); + ImGui::TreePop(); + } + + if (ImGui::TreeNodeEx("Scrolling:", ImGuiTreeNodeFlags_DefaultOpen)) + { + ImGui::CheckboxFlags("ImGuiTableFlags_ScrollX", &flags, ImGuiTableFlags_ScrollX); + ImGui::SameLine(); + ImGui::SetNextItemWidth(ImGui::GetFrameHeight()); + ImGui::DragInt("freeze_cols", &freeze_cols, 0.2f, 0, 9, NULL, ImGuiSliderFlags_NoInput); + ImGui::CheckboxFlags("ImGuiTableFlags_ScrollY", &flags, ImGuiTableFlags_ScrollY); + ImGui::SameLine(); + ImGui::SetNextItemWidth(ImGui::GetFrameHeight()); + ImGui::DragInt("freeze_rows", &freeze_rows, 0.2f, 0, 9, NULL, ImGuiSliderFlags_NoInput); + ImGui::TreePop(); + } + + if (ImGui::TreeNodeEx("Sorting:", ImGuiTreeNodeFlags_DefaultOpen)) + { + ImGui::CheckboxFlags("ImGuiTableFlags_SortMulti", &flags, ImGuiTableFlags_SortMulti); + ImGui::SameLine(); HelpMarker("When sorting is enabled: hold shift when clicking headers to sort on multiple column. TableGetSortSpecs() may return specs where (SpecsCount > 1)."); + ImGui::CheckboxFlags("ImGuiTableFlags_SortTristate", &flags, ImGuiTableFlags_SortTristate); + ImGui::SameLine(); HelpMarker("When sorting is enabled: allow no sorting, disable default sorting. TableGetSortSpecs() may return specs where (SpecsCount == 0)."); + ImGui::TreePop(); + } + + if (ImGui::TreeNodeEx("Headers:", ImGuiTreeNodeFlags_DefaultOpen)) + { + ImGui::Checkbox("show_headers", &show_headers); + ImGui::CheckboxFlags("ImGuiTableFlags_HighlightHoveredColumn", &flags, ImGuiTableFlags_HighlightHoveredColumn); + ImGui::CheckboxFlags("ImGuiTableColumnFlags_AngledHeader", &columns_base_flags, ImGuiTableColumnFlags_AngledHeader); + ImGui::SameLine(); HelpMarker("Enable AngledHeader on all columns. Best enabled on selected narrow columns (see \"Angled headers\" section of the demo)."); + ImGui::TreePop(); + } + + if (ImGui::TreeNodeEx("Other:", ImGuiTreeNodeFlags_DefaultOpen)) + { + ImGui::Checkbox("show_wrapped_text", &show_wrapped_text); + + ImGui::DragFloat2("##OuterSize", &outer_size_value.x); + ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x); + ImGui::Checkbox("outer_size", &outer_size_enabled); + ImGui::SameLine(); + HelpMarker("If scrolling is disabled (ScrollX and ScrollY not set):\n" + "- The table is output directly in the parent window.\n" + "- OuterSize.x < 0.0f will right-align the table.\n" + "- OuterSize.x = 0.0f will narrow fit the table unless there are any Stretch columns.\n" + "- OuterSize.y then becomes the minimum size for the table, which will extend vertically if there are more rows (unless NoHostExtendY is set)."); + + // From a user point of view we will tend to use 'inner_width' differently depending on whether our table is embedding scrolling. + // To facilitate toying with this demo we will actually pass 0.0f to the BeginTable() when ScrollX is disabled. + ImGui::DragFloat("inner_width (when ScrollX active)", &inner_width_with_scroll, 1.0f, 0.0f, FLT_MAX); + + ImGui::DragFloat("row_min_height", &row_min_height, 1.0f, 0.0f, FLT_MAX); + ImGui::SameLine(); HelpMarker("Specify height of the Selectable item."); + + ImGui::DragInt("items_count", &items_count, 0.1f, 0, 9999); + ImGui::Combo("items_type (first column)", &contents_type, contents_type_names, IM_ARRAYSIZE(contents_type_names)); + //filter.Draw("filter"); + ImGui::TreePop(); + } + + ImGui::PopItemWidth(); + PopStyleCompact(); + ImGui::Spacing(); + ImGui::TreePop(); + } + + // Update item list if we changed the number of items + static ImVector items; + static ImVector selection; + static bool items_need_sort = false; + if (items.Size != items_count) + { + items.resize(items_count, MyItem()); + for (int n = 0; n < items_count; n++) + { + const int template_n = n % IM_ARRAYSIZE(template_items_names); + MyItem& item = items[n]; + item.ID = n; + item.Name = template_items_names[template_n]; + item.Quantity = (template_n == 3) ? 10 : (template_n == 4) ? 20 : 0; // Assign default quantities + } + } + + const ImDrawList* parent_draw_list = ImGui::GetWindowDrawList(); + const int parent_draw_list_draw_cmd_count = parent_draw_list->CmdBuffer.Size; + ImVec2 table_scroll_cur, table_scroll_max; // For debug display + const ImDrawList* table_draw_list = NULL; // " + + // Submit table + const float inner_width_to_use = (flags & ImGuiTableFlags_ScrollX) ? inner_width_with_scroll : 0.0f; + if (ImGui::BeginTable("table_advanced", 6, flags, outer_size_enabled ? outer_size_value : ImVec2(0, 0), inner_width_to_use)) + { + // Declare columns + // We use the "user_id" parameter of TableSetupColumn() to specify a user id that will be stored in the sort specifications. + // This is so our sort function can identify a column given our own identifier. We could also identify them based on their index! + ImGui::TableSetupColumn("ID", columns_base_flags | ImGuiTableColumnFlags_DefaultSort | ImGuiTableColumnFlags_WidthFixed | ImGuiTableColumnFlags_NoHide, 0.0f, MyItemColumnID_ID); + ImGui::TableSetupColumn("Name", columns_base_flags | ImGuiTableColumnFlags_WidthFixed, 0.0f, MyItemColumnID_Name); + ImGui::TableSetupColumn("Action", columns_base_flags | ImGuiTableColumnFlags_NoSort | ImGuiTableColumnFlags_WidthFixed, 0.0f, MyItemColumnID_Action); + ImGui::TableSetupColumn("Quantity", columns_base_flags | ImGuiTableColumnFlags_PreferSortDescending, 0.0f, MyItemColumnID_Quantity); + ImGui::TableSetupColumn("Description", columns_base_flags | ((flags & ImGuiTableFlags_NoHostExtendX) ? 0 : ImGuiTableColumnFlags_WidthStretch), 0.0f, MyItemColumnID_Description); + ImGui::TableSetupColumn("Hidden", columns_base_flags | ImGuiTableColumnFlags_DefaultHide | ImGuiTableColumnFlags_NoSort); + ImGui::TableSetupScrollFreeze(freeze_cols, freeze_rows); + + // Sort our data if sort specs have been changed! + ImGuiTableSortSpecs* sort_specs = ImGui::TableGetSortSpecs(); + if (sort_specs && sort_specs->SpecsDirty) + items_need_sort = true; + if (sort_specs && items_need_sort && items.Size > 1) + { + MyItem::SortWithSortSpecs(sort_specs, items.Data, items.Size); + sort_specs->SpecsDirty = false; + } + items_need_sort = false; + + // Take note of whether we are currently sorting based on the Quantity field, + // we will use this to trigger sorting when we know the data of this column has been modified. + const bool sorts_specs_using_quantity = (ImGui::TableGetColumnFlags(3) & ImGuiTableColumnFlags_IsSorted) != 0; + + // Show headers + if (show_headers && (columns_base_flags & ImGuiTableColumnFlags_AngledHeader) != 0) + ImGui::TableAngledHeadersRow(); + if (show_headers) + ImGui::TableHeadersRow(); + + // Show data + // FIXME-TABLE FIXME-NAV: How we can get decent up/down even though we have the buttons here? +#if 1 + // Demonstrate using clipper for large vertical lists + ImGuiListClipper clipper; + clipper.Begin(items.Size); + while (clipper.Step()) + { + for (int row_n = clipper.DisplayStart; row_n < clipper.DisplayEnd; row_n++) +#else + // Without clipper + { + for (int row_n = 0; row_n < items.Size; row_n++) +#endif + { + MyItem* item = &items[row_n]; + //if (!filter.PassFilter(item->Name)) + // continue; + + const bool item_is_selected = selection.contains(item->ID); + ImGui::PushID(item->ID); + ImGui::TableNextRow(ImGuiTableRowFlags_None, row_min_height); + + // For the demo purpose we can select among different type of items submitted in the first column + ImGui::TableSetColumnIndex(0); + char label[32]; + sprintf(label, "%04d", item->ID); + if (contents_type == CT_Text) + ImGui::TextUnformatted(label); + else if (contents_type == CT_Button) + ImGui::Button(label); + else if (contents_type == CT_SmallButton) + ImGui::SmallButton(label); + else if (contents_type == CT_FillButton) + ImGui::Button(label, ImVec2(-FLT_MIN, 0.0f)); + else if (contents_type == CT_Selectable || contents_type == CT_SelectableSpanRow) + { + ImGuiSelectableFlags selectable_flags = (contents_type == CT_SelectableSpanRow) ? ImGuiSelectableFlags_SpanAllColumns | ImGuiSelectableFlags_AllowOverlap : ImGuiSelectableFlags_None; + if (ImGui::Selectable(label, item_is_selected, selectable_flags, ImVec2(0, row_min_height))) + { + if (ImGui::GetIO().KeyCtrl) + { + if (item_is_selected) + selection.find_erase_unsorted(item->ID); + else + selection.push_back(item->ID); + } + else + { + selection.clear(); + selection.push_back(item->ID); + } + } + } + + if (ImGui::TableSetColumnIndex(1)) + ImGui::TextUnformatted(item->Name); + + // Here we demonstrate marking our data set as needing to be sorted again if we modified a quantity, + // and we are currently sorting on the column showing the Quantity. + // To avoid triggering a sort while holding the button, we only trigger it when the button has been released. + // You will probably need some extra logic if you want to automatically sort when a specific entry changes. + if (ImGui::TableSetColumnIndex(2)) + { + if (ImGui::SmallButton("Chop")) { item->Quantity += 1; } + if (sorts_specs_using_quantity && ImGui::IsItemDeactivated()) { items_need_sort = true; } + ImGui::SameLine(); + if (ImGui::SmallButton("Eat")) { item->Quantity -= 1; } + if (sorts_specs_using_quantity && ImGui::IsItemDeactivated()) { items_need_sort = true; } + } + + if (ImGui::TableSetColumnIndex(3)) + ImGui::Text("%d", item->Quantity); + + ImGui::TableSetColumnIndex(4); + if (show_wrapped_text) + ImGui::TextWrapped("Lorem ipsum dolor sit amet"); + else + ImGui::Text("Lorem ipsum dolor sit amet"); + + if (ImGui::TableSetColumnIndex(5)) + ImGui::Text("1234"); + + ImGui::PopID(); + } + } + + // Store some info to display debug details below + table_scroll_cur = ImVec2(ImGui::GetScrollX(), ImGui::GetScrollY()); + table_scroll_max = ImVec2(ImGui::GetScrollMaxX(), ImGui::GetScrollMaxY()); + table_draw_list = ImGui::GetWindowDrawList(); + ImGui::EndTable(); + } + static bool show_debug_details = false; + ImGui::Checkbox("Debug details", &show_debug_details); + if (show_debug_details && table_draw_list) + { + ImGui::SameLine(0.0f, 0.0f); + const int table_draw_list_draw_cmd_count = table_draw_list->CmdBuffer.Size; + if (table_draw_list == parent_draw_list) + ImGui::Text(": DrawCmd: +%d (in same window)", + table_draw_list_draw_cmd_count - parent_draw_list_draw_cmd_count); + else + ImGui::Text(": DrawCmd: +%d (in child window), Scroll: (%.f/%.f) (%.f/%.f)", + table_draw_list_draw_cmd_count - 1, table_scroll_cur.x, table_scroll_max.x, table_scroll_cur.y, table_scroll_max.y); + } + ImGui::TreePop(); + } + + ImGui::PopID(); + + DemoWindowColumns(); + + if (disable_indent) + ImGui::PopStyleVar(); +} + +// Demonstrate old/legacy Columns API! +// [2020: Columns are under-featured and not maintained. Prefer using the more flexible and powerful BeginTable() API!] +static void DemoWindowColumns() +{ + IMGUI_DEMO_MARKER("Columns (legacy API)"); + bool open = ImGui::TreeNode("Legacy Columns API"); + ImGui::SameLine(); + HelpMarker("Columns() is an old API! Prefer using the more flexible and powerful BeginTable() API!"); + if (!open) + return; + // Basic columns + IMGUI_DEMO_MARKER("Columns (legacy API)/Basic"); if (ImGui::TreeNode("Basic")) { ImGui::Text("Without border:"); @@ -2520,7 +7501,7 @@ static void ShowDemoWindowColumns() char label[32]; sprintf(label, "Item %d", n); if (ImGui::Selectable(label)) {} - //if (ImGui::Button(label, ImVec2(-1,0))) {} + //if (ImGui::Button(label, ImVec2(-FLT_MIN,0.0f))) {} ImGui::NextColumn(); } ImGui::Columns(1); @@ -2554,24 +7535,35 @@ static void ShowDemoWindowColumns() ImGui::TreePop(); } + IMGUI_DEMO_MARKER("Columns (legacy API)/Borders"); if (ImGui::TreeNode("Borders")) { // NB: Future columns API should allow automatic horizontal borders. static bool h_borders = true; static bool v_borders = true; + static int columns_count = 4; + const int lines_count = 3; + ImGui::SetNextItemWidth(ImGui::GetFontSize() * 8); + ImGui::DragInt("##columns_count", &columns_count, 0.1f, 2, 10, "%d columns"); + if (columns_count < 2) + columns_count = 2; + ImGui::SameLine(); ImGui::Checkbox("horizontal", &h_borders); ImGui::SameLine(); ImGui::Checkbox("vertical", &v_borders); - ImGui::Columns(4, NULL, v_borders); - for (int i = 0; i < 4 * 3; i++) + ImGui::Columns(columns_count, NULL, v_borders); + for (int i = 0; i < columns_count * lines_count; i++) { if (h_borders && ImGui::GetColumnIndex() == 0) ImGui::Separator(); + ImGui::PushID(i); ImGui::Text("%c%c%c", 'a' + i, 'a' + i, 'a' + i); ImGui::Text("Width %.2f", ImGui::GetColumnWidth()); + ImGui::Text("Avail %.2f", ImGui::GetContentRegionAvail().x); ImGui::Text("Offset %.2f", ImGui::GetColumnOffset()); ImGui::Text("Long text that is likely to clip"); - ImGui::Button("Button", ImVec2(-1.0f, 0.0f)); + ImGui::Button("Button", ImVec2(-FLT_MIN, 0.0f)); + ImGui::PopID(); ImGui::NextColumn(); } ImGui::Columns(1); @@ -2581,6 +7573,7 @@ static void ShowDemoWindowColumns() } // Create multiple items in a same cell before switching to next column + IMGUI_DEMO_MARKER("Columns (legacy API)/Mixed items"); if (ImGui::TreeNode("Mixed items")) { ImGui::Columns(3, "mixed"); @@ -2612,6 +7605,7 @@ static void ShowDemoWindowColumns() } // Word wrapping + IMGUI_DEMO_MARKER("Columns (legacy API)/Word-wrapping"); if (ImGui::TreeNode("Word-wrapping")) { ImGui::Columns(2, "word-wrapping"); @@ -2626,39 +7620,18 @@ static void ShowDemoWindowColumns() ImGui::TreePop(); } - // Scrolling columns - /* - if (ImGui::TreeNode("Vertical Scrolling")) - { - ImGui::BeginChild("##header", ImVec2(0, ImGui::GetTextLineHeightWithSpacing()+ImGui::GetStyle().ItemSpacing.y)); - ImGui::Columns(3); - ImGui::Text("ID"); ImGui::NextColumn(); - ImGui::Text("Name"); ImGui::NextColumn(); - ImGui::Text("Path"); ImGui::NextColumn(); - ImGui::Columns(1); - ImGui::Separator(); - ImGui::EndChild(); - ImGui::BeginChild("##scrollingregion", ImVec2(0, 60)); - ImGui::Columns(3); - for (int i = 0; i < 10; i++) - { - ImGui::Text("%04d", i); ImGui::NextColumn(); - ImGui::Text("Foobar"); ImGui::NextColumn(); - ImGui::Text("/path/foobar/%04d/", i); ImGui::NextColumn(); - } - ImGui::Columns(1); - ImGui::EndChild(); - ImGui::TreePop(); - } - */ - + IMGUI_DEMO_MARKER("Columns (legacy API)/Horizontal Scrolling"); if (ImGui::TreeNode("Horizontal Scrolling")) { ImGui::SetNextWindowContentSize(ImVec2(1500.0f, 0.0f)); - ImGui::BeginChild("##ScrollingRegion", ImVec2(0, ImGui::GetFontSize() * 20), false, ImGuiWindowFlags_HorizontalScrollbar); + ImVec2 child_size = ImVec2(0, ImGui::GetFontSize() * 20.0f); + ImGui::BeginChild("##ScrollingRegion", child_size, ImGuiChildFlags_None, ImGuiWindowFlags_HorizontalScrollbar); ImGui::Columns(10); + + // Also demonstrate using clipper for large vertical lists int ITEMS_COUNT = 2000; - ImGuiListClipper clipper(ITEMS_COUNT); // Also demonstrate using the clipper for large list + ImGuiListClipper clipper; + clipper.Begin(ITEMS_COUNT); while (clipper.Step()) { for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; i++) @@ -2673,6 +7646,7 @@ static void ShowDemoWindowColumns() ImGui::TreePop(); } + IMGUI_DEMO_MARKER("Columns (legacy API)/Tree"); if (ImGui::TreeNode("Tree")) { ImGui::Columns(2, "tree", true); @@ -2709,87 +7683,245 @@ static void ShowDemoWindowColumns() ImGui::TreePop(); } - if (disable_indent) - ImGui::PopStyleVar(); - ImGui::PopID(); + ImGui::TreePop(); } -static void ShowDemoWindowMisc() -{ - if (ImGui::CollapsingHeader("Filtering")) - { - static ImGuiTextFilter filter; - ImGui::Text("Filter usage:\n" - " \"\" display all lines\n" - " \"xxx\" display lines containing \"xxx\"\n" - " \"xxx,yyy\" display lines containing \"xxx\" or \"yyy\"\n" - " \"-xxx\" hide lines containing \"xxx\""); - filter.Draw(); - const char* lines[] = { "aaa1.c", "bbb1.c", "ccc1.c", "aaa2.cpp", "bbb2.cpp", "ccc2.cpp", "abc.h", "hello, world" }; - for (int i = 0; i < IM_ARRAYSIZE(lines); i++) - if (filter.PassFilter(lines[i])) - ImGui::BulletText("%s", lines[i]); - } +//----------------------------------------------------------------------------- +// [SECTION] DemoWindowInputs() +//----------------------------------------------------------------------------- - if (ImGui::CollapsingHeader("Inputs, Navigation & Focus")) +static void DemoWindowInputs() +{ + IMGUI_DEMO_MARKER("Inputs & Focus"); + if (ImGui::CollapsingHeader("Inputs & Focus")) { ImGuiIO& io = ImGui::GetIO(); - ImGui::Text("WantCaptureMouse: %d", io.WantCaptureMouse); - ImGui::Text("WantCaptureKeyboard: %d", io.WantCaptureKeyboard); - ImGui::Text("WantTextInput: %d", io.WantTextInput); - ImGui::Text("WantSetMousePos: %d", io.WantSetMousePos); - ImGui::Text("NavActive: %d, NavVisible: %d", io.NavActive, io.NavVisible); - - if (ImGui::TreeNode("Keyboard, Mouse & Navigation State")) + // Display inputs submitted to ImGuiIO + IMGUI_DEMO_MARKER("Inputs & Focus/Inputs"); + ImGui::SetNextItemOpen(true, ImGuiCond_Once); + bool inputs_opened = ImGui::TreeNode("Inputs"); + ImGui::SameLine(); + HelpMarker( + "This is a simplified view. See more detailed input state:\n" + "- in 'Tools->Metrics/Debugger->Inputs'.\n" + "- in 'Tools->Debug Log->IO'."); + if (inputs_opened) { if (ImGui::IsMousePosValid()) ImGui::Text("Mouse pos: (%g, %g)", io.MousePos.x, io.MousePos.y); else ImGui::Text("Mouse pos: "); ImGui::Text("Mouse delta: (%g, %g)", io.MouseDelta.x, io.MouseDelta.y); - ImGui::Text("Mouse down:"); for (int i = 0; i < IM_ARRAYSIZE(io.MouseDown); i++) if (io.MouseDownDuration[i] >= 0.0f) { ImGui::SameLine(); ImGui::Text("b%d (%.02f secs)", i, io.MouseDownDuration[i]); } - ImGui::Text("Mouse clicked:"); for (int i = 0; i < IM_ARRAYSIZE(io.MouseDown); i++) if (ImGui::IsMouseClicked(i)) { ImGui::SameLine(); ImGui::Text("b%d", i); } - ImGui::Text("Mouse dbl-clicked:"); for (int i = 0; i < IM_ARRAYSIZE(io.MouseDown); i++) if (ImGui::IsMouseDoubleClicked(i)) { ImGui::SameLine(); ImGui::Text("b%d", i); } - ImGui::Text("Mouse released:"); for (int i = 0; i < IM_ARRAYSIZE(io.MouseDown); i++) if (ImGui::IsMouseReleased(i)) { ImGui::SameLine(); ImGui::Text("b%d", i); } + ImGui::Text("Mouse down:"); + for (int i = 0; i < IM_ARRAYSIZE(io.MouseDown); i++) if (ImGui::IsMouseDown(i)) { ImGui::SameLine(); ImGui::Text("b%d (%.02f secs)", i, io.MouseDownDuration[i]); } ImGui::Text("Mouse wheel: %.1f", io.MouseWheel); + ImGui::Text("Mouse clicked count:"); + for (int i = 0; i < IM_ARRAYSIZE(io.MouseDown); i++) if (io.MouseClickedCount[i] > 0) { ImGui::SameLine(); ImGui::Text("b%d: %d", i, io.MouseClickedCount[i]); } - ImGui::Text("Keys down:"); for (int i = 0; i < IM_ARRAYSIZE(io.KeysDown); i++) if (io.KeysDownDuration[i] >= 0.0f) { ImGui::SameLine(); ImGui::Text("%d (0x%X) (%.02f secs)", i, i, io.KeysDownDuration[i]); } - ImGui::Text("Keys pressed:"); for (int i = 0; i < IM_ARRAYSIZE(io.KeysDown); i++) if (ImGui::IsKeyPressed(i)) { ImGui::SameLine(); ImGui::Text("%d (0x%X)", i, i); } - ImGui::Text("Keys release:"); for (int i = 0; i < IM_ARRAYSIZE(io.KeysDown); i++) if (ImGui::IsKeyReleased(i)) { ImGui::SameLine(); ImGui::Text("%d (0x%X)", i, i); } + // We iterate both legacy native range and named ImGuiKey ranges. This is a little unusual/odd but this allows + // displaying the data for old/new backends. + // User code should never have to go through such hoops! + // You can generally iterate between ImGuiKey_NamedKey_BEGIN and ImGuiKey_NamedKey_END. + struct funcs { static bool IsLegacyNativeDupe(ImGuiKey) { return false; } }; + ImGuiKey start_key = ImGuiKey_NamedKey_BEGIN; + ImGui::Text("Keys down:"); for (ImGuiKey key = start_key; key < ImGuiKey_NamedKey_END; key = (ImGuiKey)(key + 1)) { if (funcs::IsLegacyNativeDupe(key) || !ImGui::IsKeyDown(key)) continue; ImGui::SameLine(); ImGui::Text((key < ImGuiKey_NamedKey_BEGIN) ? "\"%s\"" : "\"%s\" %d", ImGui::GetKeyName(key), key); } ImGui::Text("Keys mods: %s%s%s%s", io.KeyCtrl ? "CTRL " : "", io.KeyShift ? "SHIFT " : "", io.KeyAlt ? "ALT " : "", io.KeySuper ? "SUPER " : ""); - ImGui::Text("Chars queue:"); for (int i = 0; i < io.InputQueueCharacters.Size; i++) { ImWchar c = io.InputQueueCharacters[i]; ImGui::SameLine(); ImGui::Text("\'%c\' (0x%04X)", (c > ' ' && c <= 255) ? (char)c : '?', c); } // FIXME: We should convert 'c' to UTF-8 here but the functions are not public. - - ImGui::Text("NavInputs down:"); for (int i = 0; i < IM_ARRAYSIZE(io.NavInputs); i++) if (io.NavInputs[i] > 0.0f) { ImGui::SameLine(); ImGui::Text("[%d] %.2f", i, io.NavInputs[i]); } - ImGui::Text("NavInputs pressed:"); for (int i = 0; i < IM_ARRAYSIZE(io.NavInputs); i++) if (io.NavInputsDownDuration[i] == 0.0f) { ImGui::SameLine(); ImGui::Text("[%d]", i); } - ImGui::Text("NavInputs duration:"); for (int i = 0; i < IM_ARRAYSIZE(io.NavInputs); i++) if (io.NavInputsDownDuration[i] >= 0.0f) { ImGui::SameLine(); ImGui::Text("[%d] %.2f", i, io.NavInputsDownDuration[i]); } - - ImGui::Button("Hovering me sets the\nkeyboard capture flag"); - if (ImGui::IsItemHovered()) - ImGui::CaptureKeyboardFromApp(true); - ImGui::SameLine(); - ImGui::Button("Holding me clears the\nthe keyboard capture flag"); - if (ImGui::IsItemActive()) - ImGui::CaptureKeyboardFromApp(false); + ImGui::Text("Chars queue:"); for (int i = 0; i < io.InputQueueCharacters.Size; i++) { ImWchar c = io.InputQueueCharacters[i]; ImGui::SameLine(); ImGui::Text("\'%c\' (0x%04X)", (c > ' ' && c <= 255) ? (char)c : '?', c); } // FIXME: We should convert 'c' to UTF-8 here but the functions are not public. ImGui::TreePop(); } + // Display ImGuiIO output flags + IMGUI_DEMO_MARKER("Inputs & Focus/Outputs"); + ImGui::SetNextItemOpen(true, ImGuiCond_Once); + bool outputs_opened = ImGui::TreeNode("Outputs"); + ImGui::SameLine(); + HelpMarker( + "The value of io.WantCaptureMouse and io.WantCaptureKeyboard are normally set by Dear ImGui " + "to instruct your application of how to route inputs. Typically, when a value is true, it means " + "Dear ImGui wants the corresponding inputs and we expect the underlying application to ignore them.\n\n" + "The most typical case is: when hovering a window, Dear ImGui set io.WantCaptureMouse to true, " + "and underlying application should ignore mouse inputs (in practice there are many and more subtle " + "rules leading to how those flags are set)."); + if (outputs_opened) + { + ImGui::Text("io.WantCaptureMouse: %d", io.WantCaptureMouse); + ImGui::Text("io.WantCaptureMouseUnlessPopupClose: %d", io.WantCaptureMouseUnlessPopupClose); + ImGui::Text("io.WantCaptureKeyboard: %d", io.WantCaptureKeyboard); + ImGui::Text("io.WantTextInput: %d", io.WantTextInput); + ImGui::Text("io.WantSetMousePos: %d", io.WantSetMousePos); + ImGui::Text("io.NavActive: %d, io.NavVisible: %d", io.NavActive, io.NavVisible); + + IMGUI_DEMO_MARKER("Inputs & Focus/Outputs/WantCapture override"); + if (ImGui::TreeNode("WantCapture override")) + { + HelpMarker( + "Hovering the colored canvas will override io.WantCaptureXXX fields.\n" + "Notice how normally (when set to none), the value of io.WantCaptureKeyboard would be false when hovering " + "and true when clicking."); + static int capture_override_mouse = -1; + static int capture_override_keyboard = -1; + const char* capture_override_desc[] = { "None", "Set to false", "Set to true" }; + ImGui::SetNextItemWidth(ImGui::GetFontSize() * 15); + ImGui::SliderInt("SetNextFrameWantCaptureMouse() on hover", &capture_override_mouse, -1, +1, capture_override_desc[capture_override_mouse + 1], ImGuiSliderFlags_AlwaysClamp); + ImGui::SetNextItemWidth(ImGui::GetFontSize() * 15); + ImGui::SliderInt("SetNextFrameWantCaptureKeyboard() on hover", &capture_override_keyboard, -1, +1, capture_override_desc[capture_override_keyboard + 1], ImGuiSliderFlags_AlwaysClamp); + + ImGui::ColorButton("##panel", ImVec4(0.7f, 0.1f, 0.7f, 1.0f), ImGuiColorEditFlags_NoTooltip | ImGuiColorEditFlags_NoDragDrop, ImVec2(128.0f, 96.0f)); // Dummy item + if (ImGui::IsItemHovered() && capture_override_mouse != -1) + ImGui::SetNextFrameWantCaptureMouse(capture_override_mouse == 1); + if (ImGui::IsItemHovered() && capture_override_keyboard != -1) + ImGui::SetNextFrameWantCaptureKeyboard(capture_override_keyboard == 1); + + ImGui::TreePop(); + } + ImGui::TreePop(); + } + + // Demonstrate using Shortcut() and Routing Policies. + // The general flow is: + // - Code interested in a chord (e.g. "Ctrl+A") declares their intent. + // - Multiple locations may be interested in same chord! Routing helps find a winner. + // - Every frame, we resolve all claims and assign one owner if the modifiers are matching. + // - The lower-level function is 'bool SetShortcutRouting()', returns true when caller got the route. + // - Most of the times, SetShortcutRouting() is not called directly. User mostly calls Shortcut() with routing flags. + // - If you call Shortcut() WITHOUT any routing option, it uses ImGuiInputFlags_RouteFocused. + // TL;DR: Most uses will simply be: + // - Shortcut(ImGuiMod_Ctrl | ImGuiKey_A); // Use ImGuiInputFlags_RouteFocused policy. + IMGUI_DEMO_MARKER("Inputs & Focus/Shortcuts"); + if (ImGui::TreeNode("Shortcuts")) + { + static ImGuiInputFlags route_options = ImGuiInputFlags_Repeat; + static ImGuiInputFlags route_type = ImGuiInputFlags_RouteFocused; + ImGui::CheckboxFlags("ImGuiInputFlags_Repeat", &route_options, ImGuiInputFlags_Repeat); + ImGui::RadioButton("ImGuiInputFlags_RouteActive", &route_type, ImGuiInputFlags_RouteActive); + ImGui::RadioButton("ImGuiInputFlags_RouteFocused (default)", &route_type, ImGuiInputFlags_RouteFocused); + ImGui::RadioButton("ImGuiInputFlags_RouteGlobal", &route_type, ImGuiInputFlags_RouteGlobal); + ImGui::Indent(); + ImGui::BeginDisabled(route_type != ImGuiInputFlags_RouteGlobal); + ImGui::CheckboxFlags("ImGuiInputFlags_RouteOverFocused", &route_options, ImGuiInputFlags_RouteOverFocused); + ImGui::CheckboxFlags("ImGuiInputFlags_RouteOverActive", &route_options, ImGuiInputFlags_RouteOverActive); + ImGui::CheckboxFlags("ImGuiInputFlags_RouteUnlessBgFocused", &route_options, ImGuiInputFlags_RouteUnlessBgFocused); + ImGui::EndDisabled(); + ImGui::Unindent(); + ImGui::RadioButton("ImGuiInputFlags_RouteAlways", &route_type, ImGuiInputFlags_RouteAlways); + ImGuiInputFlags flags = route_type | route_options; // Merged flags + if (route_type != ImGuiInputFlags_RouteGlobal) + flags &= ~(ImGuiInputFlags_RouteOverFocused | ImGuiInputFlags_RouteOverActive | ImGuiInputFlags_RouteUnlessBgFocused); + + ImGui::SeparatorText("Using SetNextItemShortcut()"); + ImGui::Text("Ctrl+S"); + ImGui::SetNextItemShortcut(ImGuiMod_Ctrl | ImGuiKey_S, flags | ImGuiInputFlags_Tooltip); + ImGui::Button("Save"); + ImGui::Text("Alt+F"); + ImGui::SetNextItemShortcut(ImGuiMod_Alt | ImGuiKey_F, flags | ImGuiInputFlags_Tooltip); + static float f = 0.5f; + ImGui::SliderFloat("Factor", &f, 0.0f, 1.0f); + + ImGui::SeparatorText("Using Shortcut()"); + const float line_height = ImGui::GetTextLineHeightWithSpacing(); + const ImGuiKeyChord key_chord = ImGuiMod_Ctrl | ImGuiKey_A; + + ImGui::Text("Ctrl+A"); + ImGui::Text("IsWindowFocused: %d, Shortcut: %s", ImGui::IsWindowFocused(), ImGui::Shortcut(key_chord, flags) ? "PRESSED" : "..."); + + ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 0.0f, 1.0f, 0.1f)); + + ImGui::BeginChild("WindowA", ImVec2(-FLT_MIN, line_height * 14), true); + ImGui::Text("Press CTRL+A and see who receives it!"); + ImGui::Separator(); + + // 1: Window polling for CTRL+A + ImGui::Text("(in WindowA)"); + ImGui::Text("IsWindowFocused: %d, Shortcut: %s", ImGui::IsWindowFocused(), ImGui::Shortcut(key_chord, flags) ? "PRESSED" : "..."); + + // 2: InputText also polling for CTRL+A: it always uses _RouteFocused internally (gets priority when active) + // (Commmented because the owner-aware version of Shortcut() is still in imgui_internal.h) + //char str[16] = "Press CTRL+A"; + //ImGui::Spacing(); + //ImGui::InputText("InputTextB", str, IM_ARRAYSIZE(str), ImGuiInputTextFlags_ReadOnly); + //ImGuiID item_id = ImGui::GetItemID(); + //ImGui::SameLine(); HelpMarker("Internal widgets always use _RouteFocused"); + //ImGui::Text("IsWindowFocused: %d, Shortcut: %s", ImGui::IsWindowFocused(), ImGui::Shortcut(key_chord, flags, item_id) ? "PRESSED" : "..."); + + // 3: Dummy child is not claiming the route: focusing them shouldn't steal route away from WindowA + ImGui::BeginChild("ChildD", ImVec2(-FLT_MIN, line_height * 4), true); + ImGui::Text("(in ChildD: not using same Shortcut)"); + ImGui::Text("IsWindowFocused: %d", ImGui::IsWindowFocused()); + ImGui::EndChild(); + + // 4: Child window polling for CTRL+A. It is deeper than WindowA and gets priority when focused. + ImGui::BeginChild("ChildE", ImVec2(-FLT_MIN, line_height * 4), true); + ImGui::Text("(in ChildE: using same Shortcut)"); + ImGui::Text("IsWindowFocused: %d, Shortcut: %s", ImGui::IsWindowFocused(), ImGui::Shortcut(key_chord, flags) ? "PRESSED" : "..."); + ImGui::EndChild(); + + // 5: In a popup + if (ImGui::Button("Open Popup")) + ImGui::OpenPopup("PopupF"); + if (ImGui::BeginPopup("PopupF")) + { + ImGui::Text("(in PopupF)"); + ImGui::Text("IsWindowFocused: %d, Shortcut: %s", ImGui::IsWindowFocused(), ImGui::Shortcut(key_chord, flags) ? "PRESSED" : "..."); + // (Commmented because the owner-aware version of Shortcut() is still in imgui_internal.h) + //ImGui::InputText("InputTextG", str, IM_ARRAYSIZE(str), ImGuiInputTextFlags_ReadOnly); + //ImGui::Text("IsWindowFocused: %d, Shortcut: %s", ImGui::IsWindowFocused(), ImGui::Shortcut(key_chord, flags, ImGui::GetItemID()) ? "PRESSED" : "..."); + ImGui::EndPopup(); + } + ImGui::EndChild(); + ImGui::PopStyleColor(); + + ImGui::TreePop(); + } + + // Display mouse cursors + IMGUI_DEMO_MARKER("Inputs & Focus/Mouse Cursors"); + if (ImGui::TreeNode("Mouse Cursors")) + { + const char* mouse_cursors_names[] = { "Arrow", "TextInput", "ResizeAll", "ResizeNS", "ResizeEW", "ResizeNESW", "ResizeNWSE", "Hand", "Wait", "Progress", "NotAllowed" }; + IM_ASSERT(IM_ARRAYSIZE(mouse_cursors_names) == ImGuiMouseCursor_COUNT); + + ImGuiMouseCursor current = ImGui::GetMouseCursor(); + const char* cursor_name = (current >= ImGuiMouseCursor_Arrow) && (current < ImGuiMouseCursor_COUNT) ? mouse_cursors_names[current] : "N/A"; + ImGui::Text("Current mouse cursor = %d: %s", current, cursor_name); + ImGui::BeginDisabled(true); + ImGui::CheckboxFlags("io.BackendFlags: HasMouseCursors", &io.BackendFlags, ImGuiBackendFlags_HasMouseCursors); + ImGui::EndDisabled(); + + ImGui::Text("Hover to see mouse cursors:"); + ImGui::SameLine(); HelpMarker( + "Your application can render a different mouse cursor based on what ImGui::GetMouseCursor() returns. " + "If software cursor rendering (io.MouseDrawCursor) is set ImGui will draw the right cursor for you, " + "otherwise your backend needs to handle it."); + for (int i = 0; i < ImGuiMouseCursor_COUNT; i++) + { + char label[32]; + sprintf(label, "Mouse cursor %d: %s", i, mouse_cursors_names[i]); + ImGui::Bullet(); ImGui::Selectable(label, false); + if (ImGui::IsItemHovered()) + ImGui::SetMouseCursor(i); + } + ImGui::TreePop(); + } + + IMGUI_DEMO_MARKER("Inputs & Focus/Tabbing"); if (ImGui::TreeNode("Tabbing")) { ImGui::Text("Use TAB/SHIFT+TAB to cycle through keyboard editable fields."); - static char buf[32] = "dummy"; + static char buf[32] = "hello"; ImGui::InputText("1", buf, IM_ARRAYSIZE(buf)); ImGui::InputText("2", buf, IM_ARRAYSIZE(buf)); ImGui::InputText("3", buf, IM_ARRAYSIZE(buf)); - ImGui::PushAllowKeyboardFocus(false); + ImGui::PushItemFlag(ImGuiItemFlags_NoTabStop, true); ImGui::InputText("4 (tab skip)", buf, IM_ARRAYSIZE(buf)); - //ImGui::SameLine(); HelpMarker("Use ImGui::PushAllowKeyboardFocus(bool)\nto disable tabbing through certain widgets."); - ImGui::PopAllowKeyboardFocus(); + ImGui::SameLine(); HelpMarker("Item won't be cycled through when using TAB or Shift+Tab."); + ImGui::PopItemFlag(); ImGui::InputText("5", buf, IM_ARRAYSIZE(buf)); ImGui::TreePop(); } + IMGUI_DEMO_MARKER("Inputs & Focus/Focus from code"); if (ImGui::TreeNode("Focus from code")) { bool focus_1 = ImGui::Button("Focus on 1"); ImGui::SameLine(); @@ -2806,11 +7938,12 @@ static void ShowDemoWindowMisc() ImGui::InputText("2", buf, IM_ARRAYSIZE(buf)); if (ImGui::IsItemActive()) has_focus = 2; - ImGui::PushAllowKeyboardFocus(false); + ImGui::PushItemFlag(ImGuiItemFlags_NoTabStop, true); if (focus_3) ImGui::SetKeyboardFocusHere(); ImGui::InputText("3 (tab skip)", buf, IM_ARRAYSIZE(buf)); if (ImGui::IsItemActive()) has_focus = 3; - ImGui::PopAllowKeyboardFocus(); + ImGui::SameLine(); HelpMarker("Item won't be cycled through when using TAB or Shift+Tab."); + ImGui::PopItemFlag(); if (has_focus) ImGui::Text("Item with focus: %d", has_focus); @@ -2830,42 +7963,32 @@ static void ShowDemoWindowMisc() ImGui::TreePop(); } + IMGUI_DEMO_MARKER("Inputs & Focus/Dragging"); if (ImGui::TreeNode("Dragging")) { ImGui::TextWrapped("You can use ImGui::GetMouseDragDelta(0) to query for the dragged amount on any widget."); for (int button = 0; button < 3; button++) - ImGui::Text("IsMouseDragging(%d):\n w/ default threshold: %d,\n w/ zero threshold: %d\n w/ large threshold: %d", - button, ImGui::IsMouseDragging(button), ImGui::IsMouseDragging(button, 0.0f), ImGui::IsMouseDragging(button, 20.0f)); + { + ImGui::Text("IsMouseDragging(%d):", button); + ImGui::Text(" w/ default threshold: %d,", ImGui::IsMouseDragging(button)); + ImGui::Text(" w/ zero threshold: %d,", ImGui::IsMouseDragging(button, 0.0f)); + ImGui::Text(" w/ large threshold: %d,", ImGui::IsMouseDragging(button, 20.0f)); + } ImGui::Button("Drag Me"); if (ImGui::IsItemActive()) ImGui::GetForegroundDrawList()->AddLine(io.MouseClickedPos[0], io.MousePos, ImGui::GetColorU32(ImGuiCol_Button), 4.0f); // Draw a line between the button and the mouse cursor - // Drag operations gets "unlocked" when the mouse has moved past a certain threshold (the default threshold is stored in io.MouseDragThreshold) - // You can request a lower or higher threshold using the second parameter of IsMouseDragging() and GetMouseDragDelta() + // Drag operations gets "unlocked" when the mouse has moved past a certain threshold + // (the default threshold is stored in io.MouseDragThreshold). You can request a lower or higher + // threshold using the second parameter of IsMouseDragging() and GetMouseDragDelta(). ImVec2 value_raw = ImGui::GetMouseDragDelta(0, 0.0f); ImVec2 value_with_lock_threshold = ImGui::GetMouseDragDelta(0); ImVec2 mouse_delta = io.MouseDelta; - ImGui::Text("GetMouseDragDelta(0):\n w/ default threshold: (%.1f, %.1f),\n w/ zero threshold: (%.1f, %.1f)\nMouseDelta: (%.1f, %.1f)", value_with_lock_threshold.x, value_with_lock_threshold.y, value_raw.x, value_raw.y, mouse_delta.x, mouse_delta.y); - ImGui::TreePop(); - } - - if (ImGui::TreeNode("Mouse cursors")) - { - const char* mouse_cursors_names[] = { "Arrow", "TextInput", "Move", "ResizeNS", "ResizeEW", "ResizeNESW", "ResizeNWSE", "Hand" }; - IM_ASSERT(IM_ARRAYSIZE(mouse_cursors_names) == ImGuiMouseCursor_COUNT); - - ImGui::Text("Current mouse cursor = %d: %s", ImGui::GetMouseCursor(), mouse_cursors_names[ImGui::GetMouseCursor()]); - ImGui::Text("Hover to see mouse cursors:"); - ImGui::SameLine(); HelpMarker("Your application can render a different mouse cursor based on what ImGui::GetMouseCursor() returns. If software cursor rendering (io.MouseDrawCursor) is set ImGui will draw the right cursor for you, otherwise your backend needs to handle it."); - for (int i = 0; i < ImGuiMouseCursor_COUNT; i++) - { - char label[32]; - sprintf(label, "Mouse cursor %d: %s", i, mouse_cursors_names[i]); - ImGui::Bullet(); ImGui::Selectable(label, false); - if (ImGui::IsItemHovered() || ImGui::IsItemFocused()) - ImGui::SetMouseCursor(i); - } + ImGui::Text("GetMouseDragDelta(0):"); + ImGui::Text(" w/ default threshold: (%.1f, %.1f)", value_with_lock_threshold.x, value_with_lock_threshold.y); + ImGui::Text(" w/ zero threshold: (%.1f, %.1f)", value_raw.x, value_raw.y); + ImGui::Text("io.MouseDelta: (%.1f, %.1f)", mouse_delta.x, mouse_delta.y); ImGui::TreePop(); } } @@ -2873,7 +7996,7 @@ static void ShowDemoWindowMisc() //----------------------------------------------------------------------------- // [SECTION] About Window / ShowAboutWindow() -// Access from Dear ImGui Demo -> Help -> About +// Access from Dear ImGui Demo -> Tools -> About //----------------------------------------------------------------------------- void ImGui::ShowAboutWindow(bool* p_open) @@ -2883,10 +8006,24 @@ void ImGui::ShowAboutWindow(bool* p_open) ImGui::End(); return; } - ImGui::Text("Dear ImGui %s", ImGui::GetVersion()); + IMGUI_DEMO_MARKER("Tools/About Dear ImGui"); + ImGui::Text("Dear ImGui %s (%d)", IMGUI_VERSION, IMGUI_VERSION_NUM); + + ImGui::TextLinkOpenURL("Homepage", "https://github.com/ocornut/imgui"); + ImGui::SameLine(); + ImGui::TextLinkOpenURL("FAQ", "https://github.com/ocornut/imgui/blob/master/docs/FAQ.md"); + ImGui::SameLine(); + ImGui::TextLinkOpenURL("Wiki", "https://github.com/ocornut/imgui/wiki"); + ImGui::SameLine(); + ImGui::TextLinkOpenURL("Releases", "https://github.com/ocornut/imgui/releases"); + ImGui::SameLine(); + ImGui::TextLinkOpenURL("Funding", "https://github.com/ocornut/imgui/wiki/Funding"); + ImGui::Separator(); - ImGui::Text("By Omar Cornut and all dear imgui contributors."); + ImGui::Text("(c) 2014-2025 Omar Cornut"); + ImGui::Text("Developed by Omar Cornut and all Dear ImGui contributors."); ImGui::Text("Dear ImGui is licensed under the MIT License, see LICENSE for more information."); + ImGui::Text("If your company uses this, please consider funding the project."); static bool show_config_info = false; ImGui::Checkbox("Config/Build Information", &show_config_info); @@ -2896,9 +8033,13 @@ void ImGui::ShowAboutWindow(bool* p_open) ImGuiStyle& style = ImGui::GetStyle(); bool copy_to_clipboard = ImGui::Button("Copy to clipboard"); - ImGui::BeginChildFrame(ImGui::GetID("cfginfos"), ImVec2(0, ImGui::GetTextLineHeightWithSpacing() * 18), ImGuiWindowFlags_NoMove); + ImVec2 child_size = ImVec2(0, ImGui::GetTextLineHeightWithSpacing() * 18); + ImGui::BeginChild(ImGui::GetID("cfg_infos"), child_size, ImGuiChildFlags_FrameStyle); if (copy_to_clipboard) + { ImGui::LogToClipboard(); + ImGui::LogText("```\n"); // Back quotes will make text appears without formatting when pasting on GitHub + } ImGui::Text("Dear ImGui %s (%d)", IMGUI_VERSION, IMGUI_VERSION_NUM); ImGui::Separator(); @@ -2916,11 +8057,20 @@ void ImGui::ShowAboutWindow(bool* p_open) #ifdef IMGUI_DISABLE_WIN32_FUNCTIONS ImGui::Text("define: IMGUI_DISABLE_WIN32_FUNCTIONS"); #endif -#ifdef IMGUI_DISABLE_FORMAT_STRING_FUNCTIONS - ImGui::Text("define: IMGUI_DISABLE_FORMAT_STRING_FUNCTIONS"); +#ifdef IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS + ImGui::Text("define: IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS"); #endif -#ifdef IMGUI_DISABLE_MATH_FUNCTIONS - ImGui::Text("define: IMGUI_DISABLE_MATH_FUNCTIONS"); +#ifdef IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS + ImGui::Text("define: IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS"); +#endif +#ifdef IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS + ImGui::Text("define: IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS"); +#endif +#ifdef IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS + ImGui::Text("define: IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS"); +#endif +#ifdef IMGUI_DISABLE_FILE_FUNCTIONS + ImGui::Text("define: IMGUI_DISABLE_FILE_FUNCTIONS"); #endif #ifdef IMGUI_DISABLE_DEFAULT_ALLOCATORS ImGui::Text("define: IMGUI_DISABLE_DEFAULT_ALLOCATORS"); @@ -2943,6 +8093,9 @@ void ImGui::ShowAboutWindow(bool* p_open) #ifdef _MSC_VER ImGui::Text("define: _MSC_VER=%d", _MSC_VER); #endif +#ifdef _MSVC_LANG + ImGui::Text("define: _MSVC_LANG=%d", (int)_MSVC_LANG); +#endif #ifdef __MINGW32__ ImGui::Text("define: __MINGW32__"); #endif @@ -2954,6 +8107,16 @@ void ImGui::ShowAboutWindow(bool* p_open) #endif #ifdef __clang_version__ ImGui::Text("define: __clang_version__=%s", __clang_version__); +#endif +#ifdef __EMSCRIPTEN__ + ImGui::Text("define: __EMSCRIPTEN__"); + ImGui::Text("Emscripten: %d.%d.%d", __EMSCRIPTEN_major__, __EMSCRIPTEN_minor__, __EMSCRIPTEN_tiny__); +#endif +#ifdef IMGUI_HAS_VIEWPORT + ImGui::Text("define: IMGUI_HAS_VIEWPORT"); +#endif +#ifdef IMGUI_HAS_DOCK + ImGui::Text("define: IMGUI_HAS_DOCK"); #endif ImGui::Separator(); ImGui::Text("io.BackendPlatformName: %s", io.BackendPlatformName ? io.BackendPlatformName : "NULL"); @@ -2961,20 +8124,37 @@ void ImGui::ShowAboutWindow(bool* p_open) ImGui::Text("io.ConfigFlags: 0x%08X", io.ConfigFlags); if (io.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard) ImGui::Text(" NavEnableKeyboard"); if (io.ConfigFlags & ImGuiConfigFlags_NavEnableGamepad) ImGui::Text(" NavEnableGamepad"); - if (io.ConfigFlags & ImGuiConfigFlags_NavEnableSetMousePos) ImGui::Text(" NavEnableSetMousePos"); - if (io.ConfigFlags & ImGuiConfigFlags_NavNoCaptureKeyboard) ImGui::Text(" NavNoCaptureKeyboard"); if (io.ConfigFlags & ImGuiConfigFlags_NoMouse) ImGui::Text(" NoMouse"); if (io.ConfigFlags & ImGuiConfigFlags_NoMouseCursorChange) ImGui::Text(" NoMouseCursorChange"); + if (io.ConfigFlags & ImGuiConfigFlags_NoKeyboard) ImGui::Text(" NoKeyboard"); + if (io.ConfigFlags & ImGuiConfigFlags_DockingEnable) ImGui::Text(" DockingEnable"); + if (io.ConfigFlags & ImGuiConfigFlags_ViewportsEnable) ImGui::Text(" ViewportsEnable"); + if (io.ConfigFlags & ImGuiConfigFlags_DpiEnableScaleViewports) ImGui::Text(" DpiEnableScaleViewports"); + if (io.ConfigFlags & ImGuiConfigFlags_DpiEnableScaleFonts) ImGui::Text(" DpiEnableScaleFonts"); if (io.MouseDrawCursor) ImGui::Text("io.MouseDrawCursor"); + if (io.ConfigViewportsNoAutoMerge) ImGui::Text("io.ConfigViewportsNoAutoMerge"); + if (io.ConfigViewportsNoTaskBarIcon) ImGui::Text("io.ConfigViewportsNoTaskBarIcon"); + if (io.ConfigViewportsNoDecoration) ImGui::Text("io.ConfigViewportsNoDecoration"); + if (io.ConfigViewportsNoDefaultParent) ImGui::Text("io.ConfigViewportsNoDefaultParent"); + if (io.ConfigDockingNoSplit) ImGui::Text("io.ConfigDockingNoSplit"); + if (io.ConfigDockingWithShift) ImGui::Text("io.ConfigDockingWithShift"); + if (io.ConfigDockingAlwaysTabBar) ImGui::Text("io.ConfigDockingAlwaysTabBar"); + if (io.ConfigDockingTransparentPayload) ImGui::Text("io.ConfigDockingTransparentPayload"); if (io.ConfigMacOSXBehaviors) ImGui::Text("io.ConfigMacOSXBehaviors"); + if (io.ConfigNavMoveSetMousePos) ImGui::Text("io.ConfigNavMoveSetMousePos"); + if (io.ConfigNavCaptureKeyboard) ImGui::Text("io.ConfigNavCaptureKeyboard"); if (io.ConfigInputTextCursorBlink) ImGui::Text("io.ConfigInputTextCursorBlink"); if (io.ConfigWindowsResizeFromEdges) ImGui::Text("io.ConfigWindowsResizeFromEdges"); if (io.ConfigWindowsMoveFromTitleBarOnly) ImGui::Text("io.ConfigWindowsMoveFromTitleBarOnly"); + if (io.ConfigMemoryCompactTimer >= 0.0f) ImGui::Text("io.ConfigMemoryCompactTimer = %.1f", io.ConfigMemoryCompactTimer); ImGui::Text("io.BackendFlags: 0x%08X", io.BackendFlags); if (io.BackendFlags & ImGuiBackendFlags_HasGamepad) ImGui::Text(" HasGamepad"); if (io.BackendFlags & ImGuiBackendFlags_HasMouseCursors) ImGui::Text(" HasMouseCursors"); if (io.BackendFlags & ImGuiBackendFlags_HasSetMousePos) ImGui::Text(" HasSetMousePos"); + if (io.BackendFlags & ImGuiBackendFlags_PlatformHasViewports) ImGui::Text(" PlatformHasViewports"); + if (io.BackendFlags & ImGuiBackendFlags_HasMouseHoveredViewport)ImGui::Text(" HasMouseHoveredViewport"); if (io.BackendFlags & ImGuiBackendFlags_RendererHasVtxOffset) ImGui::Text(" RendererHasVtxOffset"); + if (io.BackendFlags & ImGuiBackendFlags_RendererHasViewports) ImGui::Text(" RendererHasViewports"); ImGui::Separator(); ImGui::Text("io.Fonts: %d fonts, Flags: 0x%08X, TexSize: %d,%d", io.Fonts->Fonts.Size, io.Fonts->Flags, io.Fonts->TexWidth, io.Fonts->TexHeight); ImGui::Text("io.DisplaySize: %.2f,%.2f", io.DisplaySize.x, io.DisplaySize.y); @@ -2989,8 +8169,11 @@ void ImGui::ShowAboutWindow(bool* p_open) ImGui::Text("style.ItemInnerSpacing: %.2f,%.2f", style.ItemInnerSpacing.x, style.ItemInnerSpacing.y); if (copy_to_clipboard) + { + ImGui::LogText("\n```\n"); ImGui::LogFinish(); - ImGui::EndChildFrame(); + } + ImGui::EndChild(); } ImGui::End(); } @@ -2998,39 +8181,29 @@ void ImGui::ShowAboutWindow(bool* p_open) //----------------------------------------------------------------------------- // [SECTION] Style Editor / ShowStyleEditor() //----------------------------------------------------------------------------- +// - ShowFontSelector() +// - ShowStyleSelector() +// - ShowStyleEditor() +//----------------------------------------------------------------------------- -// Demo helper function to select among default colors. See ShowStyleEditor() for more advanced options. -// Here we use the simplified Combo() api that packs items into a single literal string. Useful for quick combo boxes where the choices are known locally. -bool ImGui::ShowStyleSelector(const char* label) -{ - static int style_idx = -1; - if (ImGui::Combo(label, &style_idx, "Classic\0Dark\0Light\0")) - { - switch (style_idx) - { - case 0: ImGui::StyleColorsClassic(); break; - case 1: ImGui::StyleColorsDark(); break; - case 2: ImGui::StyleColorsLight(); break; - } - return true; - } - return false; -} +// Forward declare ShowFontAtlas() which isn't worth putting in public API yet +namespace ImGui { IMGUI_API void ShowFontAtlas(ImFontAtlas* atlas); } // Demo helper function to select among loaded fonts. -// Here we use the regular BeginCombo()/EndCombo() api which is more the more flexible one. +// Here we use the regular BeginCombo()/EndCombo() api which is the more flexible one. void ImGui::ShowFontSelector(const char* label) { ImGuiIO& io = ImGui::GetIO(); ImFont* font_current = ImGui::GetFont(); if (ImGui::BeginCombo(label, font_current->GetDebugName())) { - for (int n = 0; n < io.Fonts->Fonts.Size; n++) + for (ImFont* font : io.Fonts->Fonts) { - ImFont* font = io.Fonts->Fonts[n]; ImGui::PushID((void*)font); if (ImGui::Selectable(font->GetDebugName(), font == font_current)) io.FontDefault = font; + if (font == font_current) + ImGui::SetItemDefaultFocus(); ImGui::PopID(); } ImGui::EndCombo(); @@ -3039,13 +8212,34 @@ void ImGui::ShowFontSelector(const char* label) HelpMarker( "- Load additional fonts with io.Fonts->AddFontFromFileTTF().\n" "- The font atlas is built when calling io.Fonts->GetTexDataAsXXXX() or io.Fonts->Build().\n" - "- Read FAQ and documentation in misc/fonts/ for more details.\n" + "- Read FAQ and docs/FONTS.md for more details.\n" "- If you need to add/remove fonts at runtime (e.g. for DPI change), do it before calling NewFrame()."); } +// Demo helper function to select among default colors. See ShowStyleEditor() for more advanced options. +// Here we use the simplified Combo() api that packs items into a single literal string. +// Useful for quick combo boxes where the choices are known locally. +bool ImGui::ShowStyleSelector(const char* label) +{ + static int style_idx = -1; + if (ImGui::Combo(label, &style_idx, "Dark\0Light\0Classic\0")) + { + switch (style_idx) + { + case 0: ImGui::StyleColorsDark(); break; + case 1: ImGui::StyleColorsLight(); break; + case 2: ImGui::StyleColorsClassic(); break; + } + return true; + } + return false; +} + void ImGui::ShowStyleEditor(ImGuiStyle* ref) { - // You can pass in a reference ImGuiStyle structure to compare to, revert to and save to (else it compares to an internally stored reference) + IMGUI_DEMO_MARKER("Tools/Style Editor"); + // You can pass in a reference ImGuiStyle structure to compare to, revert to and save to + // (without a reference style pointer, we will use one compared locally as a reference) ImGuiStyle& style = ImGui::GetStyle(); static ImGuiStyle ref_saved_style; @@ -3063,14 +8257,14 @@ void ImGui::ShowStyleEditor(ImGuiStyle* ref) ref_saved_style = style; ImGui::ShowFontSelector("Fonts##Selector"); - // Simplified Settings + // Simplified Settings (expose floating-pointer border sizes as boolean representing 0.0f or 1.0f) if (ImGui::SliderFloat("FrameRounding", &style.FrameRounding, 0.0f, 12.0f, "%.0f")) style.GrabRounding = style.FrameRounding; // Make GrabRounding always the same value as FrameRounding - { bool window_border = (style.WindowBorderSize > 0.0f); if (ImGui::Checkbox("WindowBorder", &window_border)) style.WindowBorderSize = window_border ? 1.0f : 0.0f; } + { bool border = (style.WindowBorderSize > 0.0f); if (ImGui::Checkbox("WindowBorder", &border)) { style.WindowBorderSize = border ? 1.0f : 0.0f; } } ImGui::SameLine(); - { bool frame_border = (style.FrameBorderSize > 0.0f); if (ImGui::Checkbox("FrameBorder", &frame_border)) style.FrameBorderSize = frame_border ? 1.0f : 0.0f; } + { bool border = (style.FrameBorderSize > 0.0f); if (ImGui::Checkbox("FrameBorder", &border)) { style.FrameBorderSize = border ? 1.0f : 0.0f; } } ImGui::SameLine(); - { bool popup_border = (style.PopupBorderSize > 0.0f); if (ImGui::Checkbox("PopupBorder", &popup_border)) style.PopupBorderSize = popup_border ? 1.0f : 0.0f; } + { bool border = (style.PopupBorderSize > 0.0f); if (ImGui::Checkbox("PopupBorder", &border)) { style.PopupBorderSize = border ? 1.0f : 0.0f; } } // Save/Revert button if (ImGui::Button("Save Ref")) @@ -3079,7 +8273,9 @@ void ImGui::ShowStyleEditor(ImGuiStyle* ref) if (ImGui::Button("Revert Ref")) style = *ref; ImGui::SameLine(); - HelpMarker("Save/Revert in local non-persistent storage. Default Colors definition are not affected. Use \"Export Colors\" below to save them somewhere."); + HelpMarker( + "Save/Revert in local non-persistent storage. Default Colors definition are not affected. " + "Use \"Export\" below to save them somewhere."); ImGui::Separator(); @@ -3087,7 +8283,7 @@ void ImGui::ShowStyleEditor(ImGuiStyle* ref) { if (ImGui::BeginTabItem("Sizes")) { - ImGui::Text("Main"); + ImGui::SeparatorText("Main"); ImGui::SliderFloat2("WindowPadding", (float*)&style.WindowPadding, 0.0f, 20.0f, "%.0f"); ImGui::SliderFloat2("FramePadding", (float*)&style.FramePadding, 0.0f, 20.0f, "%.0f"); ImGui::SliderFloat2("ItemSpacing", (float*)&style.ItemSpacing, 0.0f, 20.0f, "%.0f"); @@ -3096,27 +8292,74 @@ void ImGui::ShowStyleEditor(ImGuiStyle* ref) ImGui::SliderFloat("IndentSpacing", &style.IndentSpacing, 0.0f, 30.0f, "%.0f"); ImGui::SliderFloat("ScrollbarSize", &style.ScrollbarSize, 1.0f, 20.0f, "%.0f"); ImGui::SliderFloat("GrabMinSize", &style.GrabMinSize, 1.0f, 20.0f, "%.0f"); - ImGui::Text("Borders"); + + ImGui::SeparatorText("Borders"); ImGui::SliderFloat("WindowBorderSize", &style.WindowBorderSize, 0.0f, 1.0f, "%.0f"); ImGui::SliderFloat("ChildBorderSize", &style.ChildBorderSize, 0.0f, 1.0f, "%.0f"); ImGui::SliderFloat("PopupBorderSize", &style.PopupBorderSize, 0.0f, 1.0f, "%.0f"); ImGui::SliderFloat("FrameBorderSize", &style.FrameBorderSize, 0.0f, 1.0f, "%.0f"); - ImGui::SliderFloat("TabBorderSize", &style.TabBorderSize, 0.0f, 1.0f, "%.0f"); - ImGui::Text("Rounding"); + + ImGui::SeparatorText("Rounding"); ImGui::SliderFloat("WindowRounding", &style.WindowRounding, 0.0f, 12.0f, "%.0f"); ImGui::SliderFloat("ChildRounding", &style.ChildRounding, 0.0f, 12.0f, "%.0f"); ImGui::SliderFloat("FrameRounding", &style.FrameRounding, 0.0f, 12.0f, "%.0f"); ImGui::SliderFloat("PopupRounding", &style.PopupRounding, 0.0f, 12.0f, "%.0f"); ImGui::SliderFloat("ScrollbarRounding", &style.ScrollbarRounding, 0.0f, 12.0f, "%.0f"); ImGui::SliderFloat("GrabRounding", &style.GrabRounding, 0.0f, 12.0f, "%.0f"); + + ImGui::SeparatorText("Tabs"); + ImGui::SliderFloat("TabBorderSize", &style.TabBorderSize, 0.0f, 1.0f, "%.0f"); + ImGui::SliderFloat("TabBarBorderSize", &style.TabBarBorderSize, 0.0f, 2.0f, "%.0f"); + ImGui::SliderFloat("TabBarOverlineSize", &style.TabBarOverlineSize, 0.0f, 3.0f, "%.0f"); + ImGui::SameLine(); HelpMarker("Overline is only drawn over the selected tab when ImGuiTabBarFlags_DrawSelectedOverline is set."); + ImGui::DragFloat("TabCloseButtonMinWidthSelected", &style.TabCloseButtonMinWidthSelected, 0.1f, -1.0f, 100.0f, (style.TabCloseButtonMinWidthSelected < 0.0f) ? "%.0f (Always)" : "%.0f"); + ImGui::DragFloat("TabCloseButtonMinWidthUnselected", &style.TabCloseButtonMinWidthUnselected, 0.1f, -1.0f, 100.0f, (style.TabCloseButtonMinWidthUnselected < 0.0f) ? "%.0f (Always)" : "%.0f"); ImGui::SliderFloat("TabRounding", &style.TabRounding, 0.0f, 12.0f, "%.0f"); - ImGui::Text("Alignment"); + + ImGui::SeparatorText("Tables"); + ImGui::SliderFloat2("CellPadding", (float*)&style.CellPadding, 0.0f, 20.0f, "%.0f"); + ImGui::SliderAngle("TableAngledHeadersAngle", &style.TableAngledHeadersAngle, -50.0f, +50.0f); + ImGui::SliderFloat2("TableAngledHeadersTextAlign", (float*)&style.TableAngledHeadersTextAlign, 0.0f, 1.0f, "%.2f"); + + ImGui::SeparatorText("Windows"); ImGui::SliderFloat2("WindowTitleAlign", (float*)&style.WindowTitleAlign, 0.0f, 1.0f, "%.2f"); - ImGui::Combo("WindowMenuButtonPosition", (int*)&style.WindowMenuButtonPosition, "Left\0Right\0"); - ImGui::SliderFloat2("ButtonTextAlign", (float*)&style.ButtonTextAlign, 0.0f, 1.0f, "%.2f"); ImGui::SameLine(); HelpMarker("Alignment applies when a button is larger than its text content."); - ImGui::SliderFloat2("SelectableTextAlign", (float*)&style.SelectableTextAlign, 0.0f, 1.0f, "%.2f"); ImGui::SameLine(); HelpMarker("Alignment applies when a selectable is larger than its text content."); - ImGui::Text("Safe Area Padding"); ImGui::SameLine(); HelpMarker("Adjust if you cannot see the edges of your screen (e.g. on a TV where scaling has not been configured)."); - ImGui::SliderFloat2("DisplaySafeAreaPadding", (float*)&style.DisplaySafeAreaPadding, 0.0f, 30.0f, "%.0f"); + ImGui::SliderFloat("WindowBorderHoverPadding", &style.WindowBorderHoverPadding, 1.0f, 20.0f, "%.0f"); + int window_menu_button_position = style.WindowMenuButtonPosition + 1; + if (ImGui::Combo("WindowMenuButtonPosition", (int*)&window_menu_button_position, "None\0Left\0Right\0")) + style.WindowMenuButtonPosition = (ImGuiDir)(window_menu_button_position - 1); + + ImGui::SeparatorText("Widgets"); + ImGui::Combo("ColorButtonPosition", (int*)&style.ColorButtonPosition, "Left\0Right\0"); + ImGui::SliderFloat2("ButtonTextAlign", (float*)&style.ButtonTextAlign, 0.0f, 1.0f, "%.2f"); + ImGui::SameLine(); HelpMarker("Alignment applies when a button is larger than its text content."); + ImGui::SliderFloat2("SelectableTextAlign", (float*)&style.SelectableTextAlign, 0.0f, 1.0f, "%.2f"); + ImGui::SameLine(); HelpMarker("Alignment applies when a selectable is larger than its text content."); + ImGui::SliderFloat("SeparatorTextBorderSize", &style.SeparatorTextBorderSize, 0.0f, 10.0f, "%.0f"); + ImGui::SliderFloat2("SeparatorTextAlign", (float*)&style.SeparatorTextAlign, 0.0f, 1.0f, "%.2f"); + ImGui::SliderFloat2("SeparatorTextPadding", (float*)&style.SeparatorTextPadding, 0.0f, 40.0f, "%.0f"); + ImGui::SliderFloat("LogSliderDeadzone", &style.LogSliderDeadzone, 0.0f, 12.0f, "%.0f"); + ImGui::SliderFloat("ImageBorderSize", &style.ImageBorderSize, 0.0f, 1.0f, "%.0f"); + + ImGui::SeparatorText("Docking"); + ImGui::SliderFloat("DockingSplitterSize", &style.DockingSeparatorSize, 0.0f, 12.0f, "%.0f"); + + ImGui::SeparatorText("Tooltips"); + for (int n = 0; n < 2; n++) + if (ImGui::TreeNodeEx(n == 0 ? "HoverFlagsForTooltipMouse" : "HoverFlagsForTooltipNav")) + { + ImGuiHoveredFlags* p = (n == 0) ? &style.HoverFlagsForTooltipMouse : &style.HoverFlagsForTooltipNav; + ImGui::CheckboxFlags("ImGuiHoveredFlags_DelayNone", p, ImGuiHoveredFlags_DelayNone); + ImGui::CheckboxFlags("ImGuiHoveredFlags_DelayShort", p, ImGuiHoveredFlags_DelayShort); + ImGui::CheckboxFlags("ImGuiHoveredFlags_DelayNormal", p, ImGuiHoveredFlags_DelayNormal); + ImGui::CheckboxFlags("ImGuiHoveredFlags_Stationary", p, ImGuiHoveredFlags_Stationary); + ImGui::CheckboxFlags("ImGuiHoveredFlags_NoSharedDelay", p, ImGuiHoveredFlags_NoSharedDelay); + ImGui::TreePop(); + } + + ImGui::SeparatorText("Misc"); + ImGui::SliderFloat2("DisplayWindowPadding", (float*)&style.DisplayWindowPadding, 0.0f, 30.0f, "%.0f"); ImGui::SameLine(); HelpMarker("Apply to regular windows: amount which we enforce to keep visible when moving near edges of your screen."); + ImGui::SliderFloat2("DisplaySafeAreaPadding", (float*)&style.DisplaySafeAreaPadding, 0.0f, 30.0f, "%.0f"); ImGui::SameLine(); HelpMarker("Apply to every windows, menus, popups, tooltips: amount where we avoid displaying contents. Adjust if you cannot see the edges of your screen (e.g. on a TV where scaling has not been configured)."); + ImGui::EndTabItem(); } @@ -3124,7 +8367,7 @@ void ImGui::ShowStyleEditor(ImGuiStyle* ref) { static int output_dest = 0; static bool output_only_modified = true; - if (ImGui::Button("Export Unsaved")) + if (ImGui::Button("Export")) { if (output_dest == 0) ImGui::LogToClipboard(); @@ -3136,7 +8379,8 @@ void ImGui::ShowStyleEditor(ImGuiStyle* ref) const ImVec4& col = style.Colors[i]; const char* name = ImGui::GetStyleColorName(i); if (!output_only_modified || memcmp(&col, &ref->Colors[i], sizeof(ImVec4)) != 0) - ImGui::LogText("colors[ImGuiCol_%s]%*s= ImVec4(%.2ff, %.2ff, %.2ff, %.2ff);" IM_NEWLINE, name, 23 - (int)strlen(name), "", col.x, col.y, col.z, col.w); + ImGui::LogText("colors[ImGuiCol_%s]%*s= ImVec4(%.2ff, %.2ff, %.2ff, %.2ff);" IM_NEWLINE, + name, 23 - (int)strlen(name), "", col.x, col.y, col.z, col.w); } ImGui::LogFinish(); } @@ -3147,26 +8391,37 @@ void ImGui::ShowStyleEditor(ImGuiStyle* ref) filter.Draw("Filter colors", ImGui::GetFontSize() * 16); static ImGuiColorEditFlags alpha_flags = 0; - ImGui::RadioButton("Opaque", &alpha_flags, 0); ImGui::SameLine(); - ImGui::RadioButton("Alpha", &alpha_flags, ImGuiColorEditFlags_AlphaPreview); ImGui::SameLine(); - ImGui::RadioButton("Both", &alpha_flags, ImGuiColorEditFlags_AlphaPreviewHalf); ImGui::SameLine(); - HelpMarker("In the color list:\nLeft-click on colored square to open color picker,\nRight-click to open edit options menu."); + if (ImGui::RadioButton("Opaque", alpha_flags == ImGuiColorEditFlags_AlphaOpaque)) { alpha_flags = ImGuiColorEditFlags_AlphaOpaque; } ImGui::SameLine(); + if (ImGui::RadioButton("Alpha", alpha_flags == ImGuiColorEditFlags_None)) { alpha_flags = ImGuiColorEditFlags_None; } ImGui::SameLine(); + if (ImGui::RadioButton("Both", alpha_flags == ImGuiColorEditFlags_AlphaPreviewHalf)) { alpha_flags = ImGuiColorEditFlags_AlphaPreviewHalf; } ImGui::SameLine(); + HelpMarker( + "In the color list:\n" + "Left-click on color square to open color picker,\n" + "Right-click to open edit options menu."); - ImGui::BeginChild("##colors", ImVec2(0, 0), true, ImGuiWindowFlags_AlwaysVerticalScrollbar | ImGuiWindowFlags_AlwaysHorizontalScrollbar | ImGuiWindowFlags_NavFlattened); - ImGui::PushItemWidth(-160); + ImGui::SetNextWindowSizeConstraints(ImVec2(0.0f, ImGui::GetTextLineHeightWithSpacing() * 10), ImVec2(FLT_MAX, FLT_MAX)); + ImGui::BeginChild("##colors", ImVec2(0, 0), ImGuiChildFlags_Borders | ImGuiChildFlags_NavFlattened, ImGuiWindowFlags_AlwaysVerticalScrollbar | ImGuiWindowFlags_AlwaysHorizontalScrollbar); + ImGui::PushItemWidth(ImGui::GetFontSize() * -12); for (int i = 0; i < ImGuiCol_COUNT; i++) { const char* name = ImGui::GetStyleColorName(i); if (!filter.PassFilter(name)) continue; ImGui::PushID(i); +#ifndef IMGUI_DISABLE_DEBUG_TOOLS + if (ImGui::Button("?")) + ImGui::DebugFlashStyleColor((ImGuiCol)i); + ImGui::SetItemTooltip("Flash given color to identify places where it is used."); + ImGui::SameLine(); +#endif ImGui::ColorEdit4("##color", (float*)&style.Colors[i], ImGuiColorEditFlags_AlphaBar | alpha_flags); if (memcmp(&style.Colors[i], &ref->Colors[i], sizeof(ImVec4)) != 0) { - // Tips: in a real user application, you may want to merge and use an icon font into the main font, so instead of "Save"/"Revert" you'd use icons. - // Read the FAQ and misc/fonts/README.txt about using icon fonts. It's really easy and super convenient! - ImGui::SameLine(0.0f, style.ItemInnerSpacing.x); if (ImGui::Button("Save")) ref->Colors[i] = style.Colors[i]; - ImGui::SameLine(0.0f, style.ItemInnerSpacing.x); if (ImGui::Button("Revert")) style.Colors[i] = ref->Colors[i]; + // Tips: in a real user application, you may want to merge and use an icon font into the main font, + // so instead of "Save"/"Revert" you'd use icons! + // Read the FAQ and docs/FONTS.md about using icon fonts. It's really easy and super convenient! + ImGui::SameLine(0.0f, style.ItemInnerSpacing.x); if (ImGui::Button("Save")) { ref->Colors[i] = style.Colors[i]; } + ImGui::SameLine(0.0f, style.ItemInnerSpacing.x); if (ImGui::Button("Revert")) { style.Colors[i] = ref->Colors[i]; } } ImGui::SameLine(0.0f, style.ItemInnerSpacing.x); ImGui::TextUnformatted(name); @@ -3182,84 +8437,23 @@ void ImGui::ShowStyleEditor(ImGuiStyle* ref) { ImGuiIO& io = ImGui::GetIO(); ImFontAtlas* atlas = io.Fonts; - HelpMarker("Read FAQ and misc/fonts/README.txt for details on font loading."); - ImGui::PushItemWidth(120); - for (int i = 0; i < atlas->Fonts.Size; i++) - { - ImFont* font = atlas->Fonts[i]; - ImGui::PushID(font); - bool font_details_opened = ImGui::TreeNode(font, "Font %d: \"%s\"\n%.2f px, %d glyphs, %d file(s)", i, font->ConfigData ? font->ConfigData[0].Name : "", font->FontSize, font->Glyphs.Size, font->ConfigDataCount); - ImGui::SameLine(); if (ImGui::SmallButton("Set as default")) { io.FontDefault = font; } - if (font_details_opened) - { - ImGui::PushFont(font); - ImGui::Text("The quick brown fox jumps over the lazy dog"); - ImGui::PopFont(); - ImGui::DragFloat("Font scale", &font->Scale, 0.005f, 0.3f, 2.0f, "%.1f"); // Scale only this font - ImGui::SameLine(); HelpMarker("Note than the default embedded font is NOT meant to be scaled.\n\nFont are currently rendered into bitmaps at a given size at the time of building the atlas. You may oversample them to get some flexibility with scaling. You can also render at multiple sizes and select which one to use at runtime.\n\n(Glimmer of hope: the atlas system should hopefully be rewritten in the future to make scaling more natural and automatic.)"); - ImGui::InputFloat("Font offset", &font->DisplayOffset.y, 1, 1, "%.0f"); - ImGui::Text("Ascent: %f, Descent: %f, Height: %f", font->Ascent, font->Descent, font->Ascent - font->Descent); - ImGui::Text("Fallback character: '%c' (%d)", font->FallbackChar, font->FallbackChar); - const float surface_sqrt = sqrtf((float)font->MetricsTotalSurface); - ImGui::Text("Texture surface: %d pixels (approx) ~ %dx%d", font->MetricsTotalSurface, (int)surface_sqrt, (int)surface_sqrt); - for (int config_i = 0; config_i < font->ConfigDataCount; config_i++) - if (const ImFontConfig* cfg = &font->ConfigData[config_i]) - ImGui::BulletText("Input %d: \'%s\', Oversample: (%d,%d), PixelSnapH: %d", config_i, cfg->Name, cfg->OversampleH, cfg->OversampleV, cfg->PixelSnapH); - if (ImGui::TreeNode("Glyphs", "Glyphs (%d)", font->Glyphs.Size)) - { - // Display all glyphs of the fonts in separate pages of 256 characters - for (int base = 0; base < 0x10000; base += 256) - { - int count = 0; - for (int n = 0; n < 256; n++) - count += font->FindGlyphNoFallback((ImWchar)(base + n)) ? 1 : 0; - if (count > 0 && ImGui::TreeNode((void*)(intptr_t)base, "U+%04X..U+%04X (%d %s)", base, base + 255, count, count > 1 ? "glyphs" : "glyph")) - { - float cell_size = font->FontSize * 1; - float cell_spacing = style.ItemSpacing.y; - ImVec2 base_pos = ImGui::GetCursorScreenPos(); - ImDrawList* draw_list = ImGui::GetWindowDrawList(); - for (int n = 0; n < 256; n++) - { - ImVec2 cell_p1(base_pos.x + (n % 16) * (cell_size + cell_spacing), base_pos.y + (n / 16) * (cell_size + cell_spacing)); - ImVec2 cell_p2(cell_p1.x + cell_size, cell_p1.y + cell_size); - const ImFontGlyph* glyph = font->FindGlyphNoFallback((ImWchar)(base + n)); - draw_list->AddRect(cell_p1, cell_p2, glyph ? IM_COL32(255, 255, 255, 100) : IM_COL32(255, 255, 255, 50)); - if (glyph) - font->RenderChar(draw_list, cell_size, cell_p1, ImGui::GetColorU32(ImGuiCol_Text), (ImWchar)(base + n)); // We use ImFont::RenderChar as a shortcut because we don't have UTF-8 conversion functions available to generate a string. - if (glyph && ImGui::IsMouseHoveringRect(cell_p1, cell_p2)) - { - ImGui::BeginTooltip(); - ImGui::Text("Codepoint: U+%04X", base + n); - ImGui::Separator(); - ImGui::Text("AdvanceX: %.1f", glyph->AdvanceX); - ImGui::Text("Pos: (%.2f,%.2f)->(%.2f,%.2f)", glyph->X0, glyph->Y0, glyph->X1, glyph->Y1); - ImGui::Text("UV: (%.3f,%.3f)->(%.3f,%.3f)", glyph->U0, glyph->V0, glyph->U1, glyph->V1); - ImGui::EndTooltip(); - } - } - ImGui::Dummy(ImVec2((cell_size + cell_spacing) * 16, (cell_size + cell_spacing) * 16)); - ImGui::TreePop(); - } - } - ImGui::TreePop(); - } - ImGui::TreePop(); - } - ImGui::PopID(); - } - if (ImGui::TreeNode("Atlas texture", "Atlas texture (%dx%d pixels)", atlas->TexWidth, atlas->TexHeight)) - { - ImVec4 tint_col = ImVec4(1.0f, 1.0f, 1.0f, 1.0f); - ImVec4 border_col = ImVec4(1.0f, 1.0f, 1.0f, 0.5f); - ImGui::Image(atlas->TexID, ImVec2((float)atlas->TexWidth, (float)atlas->TexHeight), ImVec2(0, 0), ImVec2(1, 1), tint_col, border_col); - ImGui::TreePop(); - } + HelpMarker("Read FAQ and docs/FONTS.md for details on font loading."); + ImGui::ShowFontAtlas(atlas); + // Post-baking font scaling. Note that this is NOT the nice way of scaling fonts, read below. + // (we enforce hard clamping manually as by default DragFloat/SliderFloat allows CTRL+Click text to get out of bounds). + const float MIN_SCALE = 0.3f; + const float MAX_SCALE = 2.0f; + HelpMarker( + "Those are old settings provided for convenience.\n" + "However, the _correct_ way of scaling your UI is currently to reload your font at the designed size, " + "rebuild the font atlas, and call style.ScaleAllSizes() on a reference ImGuiStyle structure.\n" + "Using those settings here will give you poor quality results."); static float window_scale = 1.0f; - if (ImGui::DragFloat("this window scale", &window_scale, 0.005f, 0.3f, 2.0f, "%.2f")) // scale only this window + ImGui::PushItemWidth(ImGui::GetFontSize() * 8); + if (ImGui::DragFloat("window scale", &window_scale, 0.005f, MIN_SCALE, MAX_SCALE, "%.2f", ImGuiSliderFlags_AlwaysClamp)) // Scale only this window ImGui::SetWindowFontScale(window_scale); - ImGui::DragFloat("global scale", &io.FontGlobalScale, 0.005f, 0.3f, 2.0f, "%.2f"); // scale everything + ImGui::DragFloat("global scale", &io.FontGlobalScale, 0.005f, MIN_SCALE, MAX_SCALE, "%.2f", ImGuiSliderFlags_AlwaysClamp); // Scale everything ImGui::PopItemWidth(); ImGui::EndTabItem(); @@ -3267,12 +8461,65 @@ void ImGui::ShowStyleEditor(ImGuiStyle* ref) if (ImGui::BeginTabItem("Rendering")) { - ImGui::Checkbox("Anti-aliased lines", &style.AntiAliasedLines); ImGui::SameLine(); HelpMarker("When disabling anti-aliasing lines, you'll probably want to disable borders in your style as well."); + ImGui::Checkbox("Anti-aliased lines", &style.AntiAliasedLines); + ImGui::SameLine(); + HelpMarker("When disabling anti-aliasing lines, you'll probably want to disable borders in your style as well."); + + ImGui::Checkbox("Anti-aliased lines use texture", &style.AntiAliasedLinesUseTex); + ImGui::SameLine(); + HelpMarker("Faster lines using texture data. Require backend to render with bilinear filtering (not point/nearest filtering)."); + ImGui::Checkbox("Anti-aliased fill", &style.AntiAliasedFill); - ImGui::PushItemWidth(100); - ImGui::DragFloat("Curve Tessellation Tolerance", &style.CurveTessellationTol, 0.02f, 0.10f, FLT_MAX, "%.2f", 2.0f); + ImGui::PushItemWidth(ImGui::GetFontSize() * 8); + ImGui::DragFloat("Curve Tessellation Tolerance", &style.CurveTessellationTol, 0.02f, 0.10f, 10.0f, "%.2f"); if (style.CurveTessellationTol < 0.10f) style.CurveTessellationTol = 0.10f; + + // When editing the "Circle Segment Max Error" value, draw a preview of its effect on auto-tessellated circles. + ImGui::DragFloat("Circle Tessellation Max Error", &style.CircleTessellationMaxError , 0.005f, 0.10f, 5.0f, "%.2f", ImGuiSliderFlags_AlwaysClamp); + const bool show_samples = ImGui::IsItemActive(); + if (show_samples) + ImGui::SetNextWindowPos(ImGui::GetCursorScreenPos()); + if (show_samples && ImGui::BeginTooltip()) + { + ImGui::TextUnformatted("(R = radius, N = approx number of segments)"); + ImGui::Spacing(); + ImDrawList* draw_list = ImGui::GetWindowDrawList(); + const float min_widget_width = ImGui::CalcTextSize("R: MMM\nN: MMM").x; + for (int n = 0; n < 8; n++) + { + const float RAD_MIN = 5.0f; + const float RAD_MAX = 70.0f; + const float rad = RAD_MIN + (RAD_MAX - RAD_MIN) * (float)n / (8.0f - 1.0f); + + ImGui::BeginGroup(); + + // N is not always exact here due to how PathArcTo() function work internally + ImGui::Text("R: %.f\nN: %d", rad, draw_list->_CalcCircleAutoSegmentCount(rad)); + + const float canvas_width = IM_MAX(min_widget_width, rad * 2.0f); + const float offset_x = floorf(canvas_width * 0.5f); + const float offset_y = floorf(RAD_MAX); + + const ImVec2 p1 = ImGui::GetCursorScreenPos(); + draw_list->AddCircle(ImVec2(p1.x + offset_x, p1.y + offset_y), rad, ImGui::GetColorU32(ImGuiCol_Text)); + ImGui::Dummy(ImVec2(canvas_width, RAD_MAX * 2)); + + /* + const ImVec2 p2 = ImGui::GetCursorScreenPos(); + draw_list->AddCircleFilled(ImVec2(p2.x + offset_x, p2.y + offset_y), rad, ImGui::GetColorU32(ImGuiCol_Text)); + ImGui::Dummy(ImVec2(canvas_width, RAD_MAX * 2)); + */ + + ImGui::EndGroup(); + ImGui::SameLine(); + } + ImGui::EndTooltip(); + } + ImGui::SameLine(); + HelpMarker("When drawing circle primitives with \"num_segments == 0\" tessellation will be calculated automatically."); + ImGui::DragFloat("Global Alpha", &style.Alpha, 0.005f, 0.20f, 1.0f, "%.2f"); // Not exposing zero here so user doesn't "lose" the UI (zero alpha clips all widgets). But application code could have a toggle to switch between zero and non-zero. + ImGui::DragFloat("Disabled Alpha", &style.DisabledAlpha, 0.005f, 0.0f, 1.0f, "%.2f"); ImGui::SameLine(); HelpMarker("Additional alpha multiplier for disabled items (multiply over current value of Alpha)."); ImGui::PopItemWidth(); ImGui::EndTabItem(); @@ -3284,13 +8531,50 @@ void ImGui::ShowStyleEditor(ImGuiStyle* ref) ImGui::PopItemWidth(); } +//----------------------------------------------------------------------------- +// [SECTION] User Guide / ShowUserGuide() +//----------------------------------------------------------------------------- + +void ImGui::ShowUserGuide() +{ + ImGuiIO& io = ImGui::GetIO(); + ImGui::BulletText("Double-click on title bar to collapse window."); + ImGui::BulletText( + "Click and drag on lower corner to resize window\n" + "(double-click to auto fit window to its contents)."); + ImGui::BulletText("CTRL+Click on a slider or drag box to input value as text."); + ImGui::BulletText("TAB/SHIFT+TAB to cycle through keyboard editable fields."); + ImGui::BulletText("CTRL+Tab to select a window."); + if (io.FontAllowUserScaling) + ImGui::BulletText("CTRL+Mouse Wheel to zoom window contents."); + ImGui::BulletText("While inputting text:\n"); + ImGui::Indent(); + ImGui::BulletText("CTRL+Left/Right to word jump."); + ImGui::BulletText("CTRL+A or double-click to select all."); + ImGui::BulletText("CTRL+X/C/V to use clipboard cut/copy/paste."); + ImGui::BulletText("CTRL+Z to undo, CTRL+Y/CTRL+SHIFT+Z to redo."); + ImGui::BulletText("ESCAPE to revert."); + ImGui::Unindent(); + ImGui::BulletText("With keyboard navigation enabled:"); + ImGui::Indent(); + ImGui::BulletText("Arrow keys to navigate."); + ImGui::BulletText("Space to activate a widget."); + ImGui::BulletText("Return to input text into a widget."); + ImGui::BulletText("Escape to deactivate a widget, close popup, exit child window."); + ImGui::BulletText("Alt to jump to the menu layer of a window."); + ImGui::Unindent(); +} + //----------------------------------------------------------------------------- // [SECTION] Example App: Main Menu Bar / ShowExampleAppMainMenuBar() //----------------------------------------------------------------------------- +// - ShowExampleAppMainMenuBar() +// - ShowExampleMenuFile() +//----------------------------------------------------------------------------- // Demonstrate creating a "main" fullscreen menu bar and populating it. // Note the difference between BeginMainMenuBar() and BeginMenuBar(): -// - BeginMenuBar() = menu-bar inside current window we Begin()-ed into (the window needs the ImGuiWindowFlags_MenuBar flag) +// - BeginMenuBar() = menu-bar inside current window (which needs the ImGuiWindowFlags_MenuBar flag!) // - BeginMainMenuBar() = helper to create menu-bar-sized window at the top of the main viewport + call BeginMenuBar() into it. static void ShowExampleAppMainMenuBar() { @@ -3304,7 +8588,7 @@ static void ShowExampleAppMainMenuBar() if (ImGui::BeginMenu("Edit")) { if (ImGui::MenuItem("Undo", "CTRL+Z")) {} - if (ImGui::MenuItem("Redo", "CTRL+Y", false, false)) {} // Disabled item + if (ImGui::MenuItem("Redo", "CTRL+Y", false, false)) {} // Disabled item ImGui::Separator(); if (ImGui::MenuItem("Cut", "CTRL+X")) {} if (ImGui::MenuItem("Copy", "CTRL+C")) {} @@ -3315,10 +8599,12 @@ static void ShowExampleAppMainMenuBar() } } -// Note that shortcuts are currently provided for display only (future version will add flags to BeginMenu to process shortcuts) +// Note that shortcuts are currently provided for display only +// (future version will add explicit flags to BeginMenu() to request processing shortcuts) static void ShowExampleMenuFile() { - ImGui::MenuItem("(dummy menu)", NULL, false, false); + IMGUI_DEMO_MARKER("Examples/Menu"); + ImGui::MenuItem("(demo menu)", NULL, false, false); if (ImGui::MenuItem("New")) {} if (ImGui::MenuItem("Open", "Ctrl+O")) {} if (ImGui::BeginMenu("Open Recent")) @@ -3341,24 +8627,26 @@ static void ShowExampleMenuFile() } if (ImGui::MenuItem("Save", "Ctrl+S")) {} if (ImGui::MenuItem("Save As..")) {} + ImGui::Separator(); + IMGUI_DEMO_MARKER("Examples/Menu/Options"); if (ImGui::BeginMenu("Options")) { static bool enabled = true; ImGui::MenuItem("Enabled", "", &enabled); - ImGui::BeginChild("child", ImVec2(0, 60), true); + ImGui::BeginChild("child", ImVec2(0, 60), ImGuiChildFlags_Borders); for (int i = 0; i < 10; i++) ImGui::Text("Scrolling Text %d", i); ImGui::EndChild(); static float f = 0.5f; static int n = 0; - static bool b = true; ImGui::SliderFloat("Value", &f, 0.0f, 1.0f); ImGui::InputFloat("Input", &f, 0.1f); ImGui::Combo("Combo", &n, "Yes\0No\0Maybe\0\0"); - ImGui::Checkbox("Check", &b); ImGui::EndMenu(); } + + IMGUI_DEMO_MARKER("Examples/Menu/Colors"); if (ImGui::BeginMenu("Colors")) { float sz = ImGui::GetTextLineHeight(); @@ -3366,18 +8654,31 @@ static void ShowExampleMenuFile() { const char* name = ImGui::GetStyleColorName((ImGuiCol)i); ImVec2 p = ImGui::GetCursorScreenPos(); - ImGui::GetWindowDrawList()->AddRectFilled(p, ImVec2(p.x+sz, p.y+sz), ImGui::GetColorU32((ImGuiCol)i)); + ImGui::GetWindowDrawList()->AddRectFilled(p, ImVec2(p.x + sz, p.y + sz), ImGui::GetColorU32((ImGuiCol)i)); ImGui::Dummy(ImVec2(sz, sz)); ImGui::SameLine(); ImGui::MenuItem(name); } ImGui::EndMenu(); } + + // Here we demonstrate appending again to the "Options" menu (which we already created above) + // Of course in this demo it is a little bit silly that this function calls BeginMenu("Options") twice. + // In a real code-base using it would make senses to use this feature from very different code locations. + if (ImGui::BeginMenu("Options")) // <-- Append! + { + IMGUI_DEMO_MARKER("Examples/Menu/Append to an existing menu"); + static bool b = true; + ImGui::Checkbox("SomeOption", &b); + ImGui::EndMenu(); + } + if (ImGui::BeginMenu("Disabled", false)) // Disabled { IM_ASSERT(0); } if (ImGui::MenuItem("Checked", NULL, true)) {} + ImGui::Separator(); if (ImGui::MenuItem("Quit", "Alt+F4")) {} } @@ -3386,7 +8687,7 @@ static void ShowExampleMenuFile() //----------------------------------------------------------------------------- // Demonstrate creating a simple console window, with scrolling, filtering, completion and history. -// For the console example, here we are using a more C++ like approach of declaring a class to hold the data and the functions. +// For the console example, we are using a more C++ like approach of declaring a class to hold both data and functions. struct ExampleAppConsole { char InputBuf[256]; @@ -3400,36 +8701,38 @@ struct ExampleAppConsole ExampleAppConsole() { + IMGUI_DEMO_MARKER("Examples/Console"); ClearLog(); memset(InputBuf, 0, sizeof(InputBuf)); HistoryPos = -1; + + // "CLASSIFY" is here to provide the test case where "C"+[tab] completes to "CL" and display multiple matches. Commands.push_back("HELP"); Commands.push_back("HISTORY"); Commands.push_back("CLEAR"); - Commands.push_back("CLASSIFY"); // "classify" is only here to provide an example of "C"+[tab] completing to "CL" and displaying matches. + Commands.push_back("CLASSIFY"); AutoScroll = true; - ScrollToBottom = true; + ScrollToBottom = false; AddLog("Welcome to Dear ImGui!"); } ~ExampleAppConsole() { ClearLog(); for (int i = 0; i < History.Size; i++) - free(History[i]); + ImGui::MemFree(History[i]); } // Portable helpers - static int Stricmp(const char* str1, const char* str2) { int d; while ((d = toupper(*str2) - toupper(*str1)) == 0 && *str1) { str1++; str2++; } return d; } - static int Strnicmp(const char* str1, const char* str2, int n) { int d = 0; while (n > 0 && (d = toupper(*str2) - toupper(*str1)) == 0 && *str1) { str1++; str2++; n--; } return d; } - static char* Strdup(const char *str) { size_t len = strlen(str) + 1; void* buf = malloc(len); IM_ASSERT(buf); return (char*)memcpy(buf, (const void*)str, len); } - static void Strtrim(char* str) { char* str_end = str + strlen(str); while (str_end > str && str_end[-1] == ' ') str_end--; *str_end = 0; } + static int Stricmp(const char* s1, const char* s2) { int d; while ((d = toupper(*s2) - toupper(*s1)) == 0 && *s1) { s1++; s2++; } return d; } + static int Strnicmp(const char* s1, const char* s2, int n) { int d = 0; while (n > 0 && (d = toupper(*s2) - toupper(*s1)) == 0 && *s1) { s1++; s2++; n--; } return d; } + static char* Strdup(const char* s) { IM_ASSERT(s); size_t len = strlen(s) + 1; void* buf = ImGui::MemAlloc(len); IM_ASSERT(buf); return (char*)memcpy(buf, (const void*)s, len); } + static void Strtrim(char* s) { char* str_end = s + strlen(s); while (str_end > s && str_end[-1] == ' ') str_end--; *str_end = 0; } void ClearLog() { for (int i = 0; i < Items.Size; i++) - free(Items[i]); + ImGui::MemFree(Items[i]); Items.clear(); - ScrollToBottom = true; } void AddLog(const char* fmt, ...) IM_FMTARGS(2) @@ -3442,20 +8745,19 @@ struct ExampleAppConsole buf[IM_ARRAYSIZE(buf)-1] = 0; va_end(args); Items.push_back(Strdup(buf)); - if (AutoScroll) - ScrollToBottom = true; } void Draw(const char* title, bool* p_open) { - ImGui::SetNextWindowSize(ImVec2(520,600), ImGuiCond_FirstUseEver); + ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver); if (!ImGui::Begin(title, p_open)) { ImGui::End(); return; } - // As a specific feature guaranteed by the library, after calling Begin() the last Item represent the title bar. So e.g. IsItemHovered() will return true when hovering the title bar. + // As a specific feature guaranteed by the library, after calling Begin() the last Item represent the title bar. + // So e.g. IsItemHovered() will return true when hovering the title bar. // Here we create a context menu only available from the title bar. if (ImGui::BeginPopupContextItem()) { @@ -3464,16 +8766,20 @@ struct ExampleAppConsole ImGui::EndPopup(); } - ImGui::TextWrapped("This example implements a console with basic coloring, completion and history. A more elaborate implementation may want to store entries along with extra data such as timestamp, emitter, etc."); - ImGui::TextWrapped("Enter 'HELP' for help, press TAB to use text completion."); + ImGui::TextWrapped( + "This example implements a console with basic coloring, completion (TAB key) and history (Up/Down keys). A more elaborate " + "implementation may want to store entries along with extra data such as timestamp, emitter, etc."); + ImGui::TextWrapped("Enter 'HELP' for help."); // TODO: display items starting from the bottom - if (ImGui::SmallButton("Add Dummy Text")) { AddLog("%d some text", Items.Size); AddLog("some more text"); AddLog("display very important message here!"); } ImGui::SameLine(); - if (ImGui::SmallButton("Add Dummy Error")) { AddLog("[error] something went wrong"); } ImGui::SameLine(); - if (ImGui::SmallButton("Clear")) { ClearLog(); } ImGui::SameLine(); - bool copy_to_clipboard = ImGui::SmallButton("Copy"); ImGui::SameLine(); - if (ImGui::SmallButton("Scroll to bottom")) ScrollToBottom = true; + if (ImGui::SmallButton("Add Debug Text")) { AddLog("%d some text", Items.Size); AddLog("some more text"); AddLog("display very important message here!"); } + ImGui::SameLine(); + if (ImGui::SmallButton("Add Debug Error")) { AddLog("[error] something went wrong"); } + ImGui::SameLine(); + if (ImGui::SmallButton("Clear")) { ClearLog(); } + ImGui::SameLine(); + bool copy_to_clipboard = ImGui::SmallButton("Copy"); //static float t = 0.0f; if (ImGui::GetTime() - t > 0.02f) { t = ImGui::GetTime(); AddLog("Spam %f", t); } ImGui::Separator(); @@ -3481,67 +8787,90 @@ struct ExampleAppConsole // Options menu if (ImGui::BeginPopup("Options")) { - if (ImGui::Checkbox("Auto-scroll", &AutoScroll)) - if (AutoScroll) - ScrollToBottom = true; + ImGui::Checkbox("Auto-scroll", &AutoScroll); ImGui::EndPopup(); } // Options, Filter + ImGui::SetNextItemShortcut(ImGuiMod_Ctrl | ImGuiKey_O, ImGuiInputFlags_Tooltip); if (ImGui::Button("Options")) ImGui::OpenPopup("Options"); ImGui::SameLine(); Filter.Draw("Filter (\"incl,-excl\") (\"error\")", 180); ImGui::Separator(); - const float footer_height_to_reserve = ImGui::GetStyle().ItemSpacing.y + ImGui::GetFrameHeightWithSpacing(); // 1 separator, 1 input text - ImGui::BeginChild("ScrollingRegion", ImVec2(0, -footer_height_to_reserve), false, ImGuiWindowFlags_HorizontalScrollbar); // Leave room for 1 separator + 1 InputText - if (ImGui::BeginPopupContextWindow()) + // Reserve enough left-over height for 1 separator + 1 input text + const float footer_height_to_reserve = ImGui::GetStyle().ItemSpacing.y + ImGui::GetFrameHeightWithSpacing(); + if (ImGui::BeginChild("ScrollingRegion", ImVec2(0, -footer_height_to_reserve), ImGuiChildFlags_NavFlattened, ImGuiWindowFlags_HorizontalScrollbar)) { - if (ImGui::Selectable("Clear")) ClearLog(); - ImGui::EndPopup(); - } + if (ImGui::BeginPopupContextWindow()) + { + if (ImGui::Selectable("Clear")) ClearLog(); + ImGui::EndPopup(); + } - // Display every line as a separate entry so we can change their color or add custom widgets. If you only want raw text you can use ImGui::TextUnformatted(log.begin(), log.end()); - // NB- if you have thousands of entries this approach may be too inefficient and may require user-side clipping to only process visible items. - // You can seek and display only the lines that are visible using the ImGuiListClipper helper, if your elements are evenly spaced and you have cheap random access to the elements. - // To use the clipper we could replace the 'for (int i = 0; i < Items.Size; i++)' loop with: - // ImGuiListClipper clipper(Items.Size); - // while (clipper.Step()) - // for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; i++) - // However, note that you can not use this code as is if a filter is active because it breaks the 'cheap random-access' property. We would need random-access on the post-filtered list. - // A typical application wanting coarse clipping and filtering may want to pre-compute an array of indices that passed the filtering test, recomputing this array when user changes the filter, - // and appending newly elements as they are inserted. This is left as a task to the user until we can manage to improve this example code! - // If your items are of variable size you may want to implement code similar to what ImGuiListClipper does. Or split your data into fixed height items to allow random-seeking into your list. - ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(4,1)); // Tighten spacing - if (copy_to_clipboard) - ImGui::LogToClipboard(); - for (int i = 0; i < Items.Size; i++) - { - const char* item = Items[i]; - if (!Filter.PassFilter(item)) - continue; + // Display every line as a separate entry so we can change their color or add custom widgets. + // If you only want raw text you can use ImGui::TextUnformatted(log.begin(), log.end()); + // NB- if you have thousands of entries this approach may be too inefficient and may require user-side clipping + // to only process visible items. The clipper will automatically measure the height of your first item and then + // "seek" to display only items in the visible area. + // To use the clipper we can replace your standard loop: + // for (int i = 0; i < Items.Size; i++) + // With: + // ImGuiListClipper clipper; + // clipper.Begin(Items.Size); + // while (clipper.Step()) + // for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; i++) + // - That your items are evenly spaced (same height) + // - That you have cheap random access to your elements (you can access them given their index, + // without processing all the ones before) + // You cannot this code as-is if a filter is active because it breaks the 'cheap random-access' property. + // We would need random-access on the post-filtered list. + // A typical application wanting coarse clipping and filtering may want to pre-compute an array of indices + // or offsets of items that passed the filtering test, recomputing this array when user changes the filter, + // and appending newly elements as they are inserted. This is left as a task to the user until we can manage + // to improve this example code! + // If your items are of variable height: + // - Split them into same height items would be simpler and facilitate random-seeking into your list. + // - Consider using manual call to IsRectVisible() and skipping extraneous decoration from your items. + ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(4, 1)); // Tighten spacing + if (copy_to_clipboard) + ImGui::LogToClipboard(); + for (const char* item : Items) + { + if (!Filter.PassFilter(item)) + continue; - // Normally you would store more information in your item (e.g. make Items[] an array of structure, store color/type etc.) - bool pop_color = false; - if (strstr(item, "[error]")) { ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.0f, 0.4f, 0.4f, 1.0f)); pop_color = true; } - else if (strncmp(item, "# ", 2) == 0) { ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.0f, 0.8f, 0.6f, 1.0f)); pop_color = true; } - ImGui::TextUnformatted(item); - if (pop_color) - ImGui::PopStyleColor(); + // Normally you would store more information in your item than just a string. + // (e.g. make Items[] an array of structure, store color/type etc.) + ImVec4 color; + bool has_color = false; + if (strstr(item, "[error]")) { color = ImVec4(1.0f, 0.4f, 0.4f, 1.0f); has_color = true; } + else if (strncmp(item, "# ", 2) == 0) { color = ImVec4(1.0f, 0.8f, 0.6f, 1.0f); has_color = true; } + if (has_color) + ImGui::PushStyleColor(ImGuiCol_Text, color); + ImGui::TextUnformatted(item); + if (has_color) + ImGui::PopStyleColor(); + } + if (copy_to_clipboard) + ImGui::LogFinish(); + + // Keep up at the bottom of the scroll region if we were already at the bottom at the beginning of the frame. + // Using a scrollbar or mouse-wheel will take away from the bottom edge. + if (ScrollToBottom || (AutoScroll && ImGui::GetScrollY() >= ImGui::GetScrollMaxY())) + ImGui::SetScrollHereY(1.0f); + ScrollToBottom = false; + + ImGui::PopStyleVar(); } - if (copy_to_clipboard) - ImGui::LogFinish(); - if (ScrollToBottom) - ImGui::SetScrollHereY(1.0f); - ScrollToBottom = false; - ImGui::PopStyleVar(); ImGui::EndChild(); ImGui::Separator(); // Command-line bool reclaim_focus = false; - if (ImGui::InputText("Input", InputBuf, IM_ARRAYSIZE(InputBuf), ImGuiInputTextFlags_EnterReturnsTrue|ImGuiInputTextFlags_CallbackCompletion|ImGuiInputTextFlags_CallbackHistory, &TextEditCallbackStub, (void*)this)) + ImGuiInputTextFlags input_text_flags = ImGuiInputTextFlags_EnterReturnsTrue | ImGuiInputTextFlags_EscapeClearsAll | ImGuiInputTextFlags_CallbackCompletion | ImGuiInputTextFlags_CallbackHistory; + if (ImGui::InputText("Input", InputBuf, IM_ARRAYSIZE(InputBuf), input_text_flags, &TextEditCallbackStub, (void*)this)) { char* s = InputBuf; Strtrim(s); @@ -3563,12 +8892,13 @@ struct ExampleAppConsole { AddLog("# %s\n", command_line); - // Insert into history. First find match and delete it so it can be pushed to the back. This isn't trying to be smart or optimal. + // Insert into history. First find match and delete it so it can be pushed to the back. + // This isn't trying to be smart or optimal. HistoryPos = -1; - for (int i = History.Size-1; i >= 0; i--) + for (int i = History.Size - 1; i >= 0; i--) if (Stricmp(History[i], command_line) == 0) { - free(History[i]); + ImGui::MemFree(History[i]); History.erase(History.begin() + i); break; } @@ -3596,11 +8926,12 @@ struct ExampleAppConsole AddLog("Unknown command: '%s'\n", command_line); } - // On commad input, we scroll to bottom even if AutoScroll==false + // On command input, we scroll to bottom even if AutoScroll==false ScrollToBottom = true; } - static int TextEditCallbackStub(ImGuiInputTextCallbackData* data) // In C++11 you are better off using lambdas for this sort of forwarding callbacks + // In C++11 you'd be better off using lambdas for this sort of forwarding callbacks + static int TextEditCallbackStub(ImGuiInputTextCallbackData* data) { ExampleAppConsole* console = (ExampleAppConsole*)data->UserData; return console->TextEditCallback(data); @@ -3629,24 +8960,25 @@ struct ExampleAppConsole // Build a list of candidates ImVector candidates; for (int i = 0; i < Commands.Size; i++) - if (Strnicmp(Commands[i], word_start, (int)(word_end-word_start)) == 0) + if (Strnicmp(Commands[i], word_start, (int)(word_end - word_start)) == 0) candidates.push_back(Commands[i]); if (candidates.Size == 0) { // No match - AddLog("No match for \"%.*s\"!\n", (int)(word_end-word_start), word_start); + AddLog("No match for \"%.*s\"!\n", (int)(word_end - word_start), word_start); } else if (candidates.Size == 1) { - // Single match. Delete the beginning of the word and replace it entirely so we've got nice casing - data->DeleteChars((int)(word_start-data->Buf), (int)(word_end-word_start)); + // Single match. Delete the beginning of the word and replace it entirely so we've got nice casing. + data->DeleteChars((int)(word_start - data->Buf), (int)(word_end - word_start)); data->InsertChars(data->CursorPos, candidates[0]); data->InsertChars(data->CursorPos, " "); } else { - // Multiple matches. Complete as much as we can, so inputing "C" will complete to "CL" and display "CLEAR" and "CLASSIFY" + // Multiple matches. Complete as much as we can.. + // So inputting "C"+Tab will complete to "CL" then display "CLEAR" and "CLASSIFY" as matches. int match_len = (int)(word_end - word_start); for (;;) { @@ -3664,7 +8996,7 @@ struct ExampleAppConsole if (match_len > 0) { - data->DeleteChars((int)(word_start - data->Buf), (int)(word_end-word_start)); + data->DeleteChars((int)(word_start - data->Buf), (int)(word_end - word_start)); data->InsertChars(data->CursorPos, candidates[0], candidates[0] + match_len); } @@ -3725,14 +9057,12 @@ struct ExampleAppLog { ImGuiTextBuffer Buf; ImGuiTextFilter Filter; - ImVector LineOffsets; // Index to lines offset. We maintain this with AddLog() calls, allowing us to have a random access on lines - bool AutoScroll; - bool ScrollToBottom; + ImVector LineOffsets; // Index to lines offset. We maintain this with AddLog() calls. + bool AutoScroll; // Keep scrolling if already at the bottom. ExampleAppLog() { AutoScroll = true; - ScrollToBottom = false; Clear(); } @@ -3753,8 +9083,6 @@ struct ExampleAppLog for (int new_size = Buf.size(); old_size < new_size; old_size++) if (Buf[old_size] == '\n') LineOffsets.push_back(old_size + 1); - if (AutoScroll) - ScrollToBottom = true; } void Draw(const char* title, bool* p_open = NULL) @@ -3768,9 +9096,7 @@ struct ExampleAppLog // Options menu if (ImGui::BeginPopup("Options")) { - if (ImGui::Checkbox("Auto-scroll", &AutoScroll)) - if (AutoScroll) - ScrollToBottom = true; + ImGui::Checkbox("Auto-scroll", &AutoScroll); ImGui::EndPopup(); } @@ -3785,59 +9111,66 @@ struct ExampleAppLog Filter.Draw("Filter", -100.0f); ImGui::Separator(); - ImGui::BeginChild("scrolling", ImVec2(0,0), false, ImGuiWindowFlags_HorizontalScrollbar); - if (clear) - Clear(); - if (copy) - ImGui::LogToClipboard(); + if (ImGui::BeginChild("scrolling", ImVec2(0, 0), ImGuiChildFlags_None, ImGuiWindowFlags_HorizontalScrollbar)) + { + if (clear) + Clear(); + if (copy) + ImGui::LogToClipboard(); - ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0, 0)); - const char* buf = Buf.begin(); - const char* buf_end = Buf.end(); - if (Filter.IsActive()) - { - // In this example we don't use the clipper when Filter is enabled. - // This is because we don't have a random access on the result on our filter. - // A real application processing logs with ten of thousands of entries may want to store the result of search/filter. - // especially if the filtering function is not trivial (e.g. reg-exp). - for (int line_no = 0; line_no < LineOffsets.Size; line_no++) + ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0, 0)); + const char* buf = Buf.begin(); + const char* buf_end = Buf.end(); + if (Filter.IsActive()) { - const char* line_start = buf + LineOffsets[line_no]; - const char* line_end = (line_no + 1 < LineOffsets.Size) ? (buf + LineOffsets[line_no + 1] - 1) : buf_end; - if (Filter.PassFilter(line_start, line_end)) - ImGui::TextUnformatted(line_start, line_end); - } - } - else - { - // The simplest and easy way to display the entire buffer: - // ImGui::TextUnformatted(buf_begin, buf_end); - // And it'll just work. TextUnformatted() has specialization for large blob of text and will fast-forward to skip non-visible lines. - // Here we instead demonstrate using the clipper to only process lines that are within the visible area. - // If you have tens of thousands of items and their processing cost is non-negligible, coarse clipping them on your side is recommended. - // Using ImGuiListClipper requires A) random access into your data, and B) items all being the same height, - // both of which we can handle since we an array pointing to the beginning of each line of text. - // When using the filter (in the block of code above) we don't have random access into the data to display anymore, which is why we don't use the clipper. - // Storing or skimming through the search result would make it possible (and would be recommended if you want to search through tens of thousands of entries) - ImGuiListClipper clipper; - clipper.Begin(LineOffsets.Size); - while (clipper.Step()) - { - for (int line_no = clipper.DisplayStart; line_no < clipper.DisplayEnd; line_no++) + // In this example we don't use the clipper when Filter is enabled. + // This is because we don't have random access to the result of our filter. + // A real application processing logs with ten of thousands of entries may want to store the result of + // search/filter.. especially if the filtering function is not trivial (e.g. reg-exp). + for (int line_no = 0; line_no < LineOffsets.Size; line_no++) { const char* line_start = buf + LineOffsets[line_no]; const char* line_end = (line_no + 1 < LineOffsets.Size) ? (buf + LineOffsets[line_no + 1] - 1) : buf_end; - ImGui::TextUnformatted(line_start, line_end); + if (Filter.PassFilter(line_start, line_end)) + ImGui::TextUnformatted(line_start, line_end); } } - clipper.End(); - } - ImGui::PopStyleVar(); + else + { + // The simplest and easy way to display the entire buffer: + // ImGui::TextUnformatted(buf_begin, buf_end); + // And it'll just work. TextUnformatted() has specialization for large blob of text and will fast-forward + // to skip non-visible lines. Here we instead demonstrate using the clipper to only process lines that are + // within the visible area. + // If you have tens of thousands of items and their processing cost is non-negligible, coarse clipping them + // on your side is recommended. Using ImGuiListClipper requires + // - A) random access into your data + // - B) items all being the same height, + // both of which we can handle since we have an array pointing to the beginning of each line of text. + // When using the filter (in the block of code above) we don't have random access into the data to display + // anymore, which is why we don't use the clipper. Storing or skimming through the search result would make + // it possible (and would be recommended if you want to search through tens of thousands of entries). + ImGuiListClipper clipper; + clipper.Begin(LineOffsets.Size); + while (clipper.Step()) + { + for (int line_no = clipper.DisplayStart; line_no < clipper.DisplayEnd; line_no++) + { + const char* line_start = buf + LineOffsets[line_no]; + const char* line_end = (line_no + 1 < LineOffsets.Size) ? (buf + LineOffsets[line_no + 1] - 1) : buf_end; + ImGui::TextUnformatted(line_start, line_end); + } + } + clipper.End(); + } + ImGui::PopStyleVar(); - if (ScrollToBottom) - ImGui::SetScrollHereY(1.0f); - ScrollToBottom = false; + // Keep up at the bottom of the scroll region if we were already at the bottom at the beginning of the frame. + // Using a scrollbar or mouse-wheel will take away from the bottom edge. + if (AutoScroll && ImGui::GetScrollY() >= ImGui::GetScrollMaxY()) + ImGui::SetScrollHereY(1.0f); + } ImGui::EndChild(); ImGui::End(); } @@ -3853,15 +9186,18 @@ static void ShowExampleAppLog(bool* p_open) // Most of the contents of the window will be added by the log.Draw() call. ImGui::SetNextWindowSize(ImVec2(500, 400), ImGuiCond_FirstUseEver); ImGui::Begin("Example: Log", p_open); + IMGUI_DEMO_MARKER("Examples/Log"); if (ImGui::SmallButton("[Debug] Add 5 entries")) { static int counter = 0; + const char* categories[3] = { "info", "warn", "error" }; + const char* words[] = { "Bumfuzzled", "Cattywampus", "Snickersnee", "Abibliophobia", "Absquatulate", "Nincompoop", "Pauciloquent" }; for (int n = 0; n < 5; n++) { - const char* categories[3] = { "info", "warn", "error" }; - const char* words[] = { "Bumfuzzled", "Cattywampus", "Snickersnee", "Abibliophobia", "Absquatulate", "Nincompoop", "Pauciloquent" }; + const char* category = categories[counter % IM_ARRAYSIZE(categories)]; + const char* word = words[counter % IM_ARRAYSIZE(words)]; log.AddLog("[%05d] [%s] Hello, current time is %.1f, here's a word: '%s'\n", - ImGui::GetFrameCount(), categories[counter % IM_ARRAYSIZE(categories)], ImGui::GetTime(), words[counter % IM_ARRAYSIZE(words)]); + ImGui::GetFrameCount(), category, ImGui::GetTime(), word); counter++; } } @@ -3881,53 +9217,59 @@ static void ShowExampleAppLayout(bool* p_open) ImGui::SetNextWindowSize(ImVec2(500, 440), ImGuiCond_FirstUseEver); if (ImGui::Begin("Example: Simple layout", p_open, ImGuiWindowFlags_MenuBar)) { + IMGUI_DEMO_MARKER("Examples/Simple layout"); if (ImGui::BeginMenuBar()) { if (ImGui::BeginMenu("File")) { - if (ImGui::MenuItem("Close")) *p_open = false; + if (ImGui::MenuItem("Close", "Ctrl+W")) { *p_open = false; } ImGui::EndMenu(); } ImGui::EndMenuBar(); } - // left + // Left static int selected = 0; - ImGui::BeginChild("left pane", ImVec2(150, 0), true); - for (int i = 0; i < 100; i++) { - char label[128]; - sprintf(label, "MyObject %d", i); - if (ImGui::Selectable(label, selected == i)) - selected = i; + ImGui::BeginChild("left pane", ImVec2(150, 0), ImGuiChildFlags_Borders | ImGuiChildFlags_ResizeX); + for (int i = 0; i < 100; i++) + { + // FIXME: Good candidate to use ImGuiSelectableFlags_SelectOnNav + char label[128]; + sprintf(label, "MyObject %d", i); + if (ImGui::Selectable(label, selected == i)) + selected = i; + } + ImGui::EndChild(); } - ImGui::EndChild(); ImGui::SameLine(); - // right - ImGui::BeginGroup(); + // Right + { + ImGui::BeginGroup(); ImGui::BeginChild("item view", ImVec2(0, -ImGui::GetFrameHeightWithSpacing())); // Leave room for 1 line below us - ImGui::Text("MyObject: %d", selected); - ImGui::Separator(); - if (ImGui::BeginTabBar("##Tabs", ImGuiTabBarFlags_None)) + ImGui::Text("MyObject: %d", selected); + ImGui::Separator(); + if (ImGui::BeginTabBar("##Tabs", ImGuiTabBarFlags_None)) + { + if (ImGui::BeginTabItem("Description")) { - if (ImGui::BeginTabItem("Description")) - { - ImGui::TextWrapped("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. "); - ImGui::EndTabItem(); - } - if (ImGui::BeginTabItem("Details")) - { - ImGui::Text("ID: 0123456789"); - ImGui::EndTabItem(); - } - ImGui::EndTabBar(); + ImGui::TextWrapped("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. "); + ImGui::EndTabItem(); } + if (ImGui::BeginTabItem("Details")) + { + ImGui::Text("ID: 0123456789"); + ImGui::EndTabItem(); + } + ImGui::EndTabBar(); + } ImGui::EndChild(); if (ImGui::Button("Revert")) {} ImGui::SameLine(); if (ImGui::Button("Save")) {} - ImGui::EndGroup(); + ImGui::EndGroup(); + } } ImGui::End(); } @@ -3935,72 +9277,152 @@ static void ShowExampleAppLayout(bool* p_open) //----------------------------------------------------------------------------- // [SECTION] Example App: Property Editor / ShowExampleAppPropertyEditor() //----------------------------------------------------------------------------- +// Some of the interactions are a bit lack-luster: +// - We would want pressing validating or leaving the filter to somehow restore focus. +// - We may want more advanced filtering (child nodes) and clipper support: both will need extra work. +// - We would want to customize some keyboard interactions to easily keyboard navigate between the tree and the properties. +//----------------------------------------------------------------------------- -// Demonstrate create a simple property editor. -static void ShowExampleAppPropertyEditor(bool* p_open) +struct ExampleAppPropertyEditor { - ImGui::SetNextWindowSize(ImVec2(430,450), ImGuiCond_FirstUseEver); + ImGuiTextFilter Filter; + ExampleTreeNode* VisibleNode = NULL; + + void Draw(ExampleTreeNode* root_node) + { + // Left side: draw tree + // - Currently using a table to benefit from RowBg feature + if (ImGui::BeginChild("##tree", ImVec2(300, 0), ImGuiChildFlags_ResizeX | ImGuiChildFlags_Borders | ImGuiChildFlags_NavFlattened)) + { + ImGui::SetNextItemWidth(-FLT_MIN); + ImGui::SetNextItemShortcut(ImGuiMod_Ctrl | ImGuiKey_F, ImGuiInputFlags_Tooltip); + ImGui::PushItemFlag(ImGuiItemFlags_NoNavDefaultFocus, true); + if (ImGui::InputTextWithHint("##Filter", "incl,-excl", Filter.InputBuf, IM_ARRAYSIZE(Filter.InputBuf), ImGuiInputTextFlags_EscapeClearsAll)) + Filter.Build(); + ImGui::PopItemFlag(); + + if (ImGui::BeginTable("##bg", 1, ImGuiTableFlags_RowBg)) + { + for (ExampleTreeNode* node : root_node->Childs) + if (Filter.PassFilter(node->Name)) // Filter root node + DrawTreeNode(node); + ImGui::EndTable(); + } + } + ImGui::EndChild(); + + // Right side: draw properties + ImGui::SameLine(); + + ImGui::BeginGroup(); // Lock X position + if (ExampleTreeNode* node = VisibleNode) + { + ImGui::Text("%s", node->Name); + ImGui::TextDisabled("UID: 0x%08X", node->UID); + ImGui::Separator(); + if (ImGui::BeginTable("##properties", 2, ImGuiTableFlags_Resizable | ImGuiTableFlags_ScrollY)) + { + // Push object ID after we entered the table, so table is shared for all objects + ImGui::PushID((int)node->UID); + ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthFixed); + ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch, 2.0f); // Default twice larger + if (node->HasData) + { + // In a typical application, the structure description would be derived from a data-driven system. + // - We try to mimic this with our ExampleMemberInfo structure and the ExampleTreeNodeMemberInfos[] array. + // - Limits and some details are hard-coded to simplify the demo. + for (const ExampleMemberInfo& field_desc : ExampleTreeNodeMemberInfos) + { + ImGui::TableNextRow(); + ImGui::PushID(field_desc.Name); + ImGui::TableNextColumn(); + ImGui::AlignTextToFramePadding(); + ImGui::TextUnformatted(field_desc.Name); + ImGui::TableNextColumn(); + void* field_ptr = (void*)(((unsigned char*)node) + field_desc.Offset); + switch (field_desc.DataType) + { + case ImGuiDataType_Bool: + { + IM_ASSERT(field_desc.DataCount == 1); + ImGui::Checkbox("##Editor", (bool*)field_ptr); + break; + } + case ImGuiDataType_S32: + { + int v_min = INT_MIN, v_max = INT_MAX; + ImGui::SetNextItemWidth(-FLT_MIN); + ImGui::DragScalarN("##Editor", field_desc.DataType, field_ptr, field_desc.DataCount, 1.0f, &v_min, &v_max); + break; + } + case ImGuiDataType_Float: + { + float v_min = 0.0f, v_max = 1.0f; + ImGui::SetNextItemWidth(-FLT_MIN); + ImGui::SliderScalarN("##Editor", field_desc.DataType, field_ptr, field_desc.DataCount, &v_min, &v_max); + break; + } + case ImGuiDataType_String: + { + ImGui::InputText("##Editor", reinterpret_cast(field_ptr), 28); + break; + } + } + ImGui::PopID(); + } + } + ImGui::PopID(); + ImGui::EndTable(); + } + } + ImGui::EndGroup(); + } + + void DrawTreeNode(ExampleTreeNode* node) + { + ImGui::TableNextRow(); + ImGui::TableNextColumn(); + ImGui::PushID(node->UID); + ImGuiTreeNodeFlags tree_flags = ImGuiTreeNodeFlags_None; + tree_flags |= ImGuiTreeNodeFlags_OpenOnArrow | ImGuiTreeNodeFlags_OpenOnDoubleClick; // Standard opening mode as we are likely to want to add selection afterwards + tree_flags |= ImGuiTreeNodeFlags_NavLeftJumpsBackHere; // Left arrow support + if (node == VisibleNode) + tree_flags |= ImGuiTreeNodeFlags_Selected; + if (node->Childs.Size == 0) + tree_flags |= ImGuiTreeNodeFlags_Leaf | ImGuiTreeNodeFlags_Bullet; + if (node->DataMyBool == false) + ImGui::PushStyleColor(ImGuiCol_Text, ImGui::GetStyle().Colors[ImGuiCol_TextDisabled]); + bool node_open = ImGui::TreeNodeEx("", tree_flags, "%s", node->Name); + if (node->DataMyBool == false) + ImGui::PopStyleColor(); + if (ImGui::IsItemFocused()) + VisibleNode = node; + if (node_open) + { + for (ExampleTreeNode* child : node->Childs) + DrawTreeNode(child); + ImGui::TreePop(); + } + ImGui::PopID(); + } +}; + +// Demonstrate creating a simple property editor. +static void ShowExampleAppPropertyEditor(bool* p_open, ImGuiDemoWindowData* demo_data) +{ + ImGui::SetNextWindowSize(ImVec2(430, 450), ImGuiCond_FirstUseEver); if (!ImGui::Begin("Example: Property editor", p_open)) { ImGui::End(); return; } - HelpMarker("This example shows how you may implement a property editor using two columns.\nAll objects/fields data are dummies here.\nRemember that in many simple cases, you can use ImGui::SameLine(xxx) to position\nyour cursor horizontally instead of using the Columns() API."); + IMGUI_DEMO_MARKER("Examples/Property Editor"); + static ExampleAppPropertyEditor property_editor; + if (demo_data->DemoTree == NULL) + demo_data->DemoTree = ExampleTree_CreateDemoTree(); + property_editor.Draw(demo_data->DemoTree); - ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(2,2)); - ImGui::Columns(2); - ImGui::Separator(); - - struct funcs - { - static void ShowDummyObject(const char* prefix, int uid) - { - ImGui::PushID(uid); // Use object uid as identifier. Most commonly you could also use the object pointer as a base ID. - ImGui::AlignTextToFramePadding(); // Text and Tree nodes are less high than regular widgets, here we add vertical spacing to make the tree lines equal high. - bool node_open = ImGui::TreeNode("Object", "%s_%u", prefix, uid); - ImGui::NextColumn(); - ImGui::AlignTextToFramePadding(); - ImGui::Text("my sailor is rich"); - ImGui::NextColumn(); - if (node_open) - { - static float dummy_members[8] = { 0.0f,0.0f,1.0f,3.1416f,100.0f,999.0f }; - for (int i = 0; i < 8; i++) - { - ImGui::PushID(i); // Use field index as identifier. - if (i < 2) - { - ShowDummyObject("Child", 424242); - } - else - { - // Here we use a TreeNode to highlight on hover (we could use e.g. Selectable as well) - ImGui::AlignTextToFramePadding(); - ImGui::TreeNodeEx("Field", ImGuiTreeNodeFlags_Leaf | ImGuiTreeNodeFlags_NoTreePushOnOpen | ImGuiTreeNodeFlags_Bullet, "Field_%d", i); - ImGui::NextColumn(); - ImGui::SetNextItemWidth(-1); - if (i >= 5) - ImGui::InputFloat("##value", &dummy_members[i], 1.0f); - else - ImGui::DragFloat("##value", &dummy_members[i], 0.01f); - ImGui::NextColumn(); - } - ImGui::PopID(); - } - ImGui::TreePop(); - } - ImGui::PopID(); - } - }; - - // Iterate dummy objects with dummy members (all the same data) - for (int obj_i = 0; obj_i < 3; obj_i++) - funcs::ShowDummyObject("Object", obj_i); - - ImGui::Columns(1); - ImGui::Separator(); - ImGui::PopStyleVar(); ImGui::End(); } @@ -4011,25 +9433,29 @@ static void ShowExampleAppPropertyEditor(bool* p_open) // Demonstrate/test rendering huge amount of text, and the incidence of clipping. static void ShowExampleAppLongText(bool* p_open) { - ImGui::SetNextWindowSize(ImVec2(520,600), ImGuiCond_FirstUseEver); + ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver); if (!ImGui::Begin("Example: Long text display", p_open)) { ImGui::End(); return; } + IMGUI_DEMO_MARKER("Examples/Long text display"); static int test_type = 0; static ImGuiTextBuffer log; static int lines = 0; ImGui::Text("Printing unusually long amount of text."); - ImGui::Combo("Test type", &test_type, "Single call to TextUnformatted()\0Multiple calls to Text(), clipped manually\0Multiple calls to Text(), not clipped (slow)\0"); + ImGui::Combo("Test type", &test_type, + "Single call to TextUnformatted()\0" + "Multiple calls to Text(), clipped\0" + "Multiple calls to Text(), not clipped (slow)\0"); ImGui::Text("Buffer contents: %d lines, %d bytes", lines, log.size()); if (ImGui::Button("Clear")) { log.clear(); lines = 0; } ImGui::SameLine(); if (ImGui::Button("Add 1000 lines")) { for (int i = 0; i < 1000; i++) - log.appendf("%i The quick brown fox jumps over the lazy dog\n", lines+i); + log.appendf("%i The quick brown fox jumps over the lazy dog\n", lines + i); lines += 1000; } ImGui::BeginChild("Log"); @@ -4042,8 +9468,9 @@ static void ShowExampleAppLongText(bool* p_open) case 1: { // Multiple calls to Text(), manually coarsely clipped - demonstrate how to use the ImGuiListClipper helper. - ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0,0)); - ImGuiListClipper clipper(lines); + ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0, 0)); + ImGuiListClipper clipper; + clipper.Begin(lines); while (clipper.Step()) for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; i++) ImGui::Text("%i The quick brown fox jumps over the lazy dog", i); @@ -4052,7 +9479,7 @@ static void ShowExampleAppLongText(bool* p_open) } case 2: // Multiple calls to Text(), not clipped (slow) - ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0,0)); + ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0, 0)); for (int i = 0; i < lines; i++) ImGui::Text("%i The quick brown fox jumps over the lazy dog", i); ImGui::PopStyleVar(); @@ -4074,9 +9501,13 @@ static void ShowExampleAppAutoResize(bool* p_open) ImGui::End(); return; } + IMGUI_DEMO_MARKER("Examples/Auto-resizing window"); static int lines = 10; - ImGui::Text("Window will resize every-frame to the size of its content.\nNote that you probably don't want to query the window size to\noutput your content because that would create a feedback loop."); + ImGui::TextUnformatted( + "Window will resize every-frame to the size of its content.\n" + "Note that you probably don't want to query the window size to\n" + "output your content because that would create a feedback loop."); ImGui::SliderInt("Number of lines", &lines, 1, 20); for (int i = 0; i < lines; i++) ImGui::Text("%*sThis is line %d", i * 4, "", i); // Pad with space to extend size horizontally @@ -4088,72 +9519,139 @@ static void ShowExampleAppAutoResize(bool* p_open) //----------------------------------------------------------------------------- // Demonstrate creating a window with custom resize constraints. +// Note that size constraints currently don't work on a docked window (when in 'docking' branch) static void ShowExampleAppConstrainedResize(bool* p_open) { - struct CustomConstraints // Helper functions to demonstrate programmatic constraints + struct CustomConstraints { - static void Square(ImGuiSizeCallbackData* data) { data->DesiredSize = ImVec2(IM_MAX(data->DesiredSize.x, data->DesiredSize.y), IM_MAX(data->DesiredSize.x, data->DesiredSize.y)); } - static void Step(ImGuiSizeCallbackData* data) { float step = (float)(int)(intptr_t)data->UserData; data->DesiredSize = ImVec2((int)(data->DesiredSize.x / step + 0.5f) * step, (int)(data->DesiredSize.y / step + 0.5f) * step); } + // Helper functions to demonstrate programmatic constraints + // FIXME: This doesn't take account of decoration size (e.g. title bar), library should make this easier. + // FIXME: None of the three demos works consistently when resizing from borders. + static void AspectRatio(ImGuiSizeCallbackData* data) + { + float aspect_ratio = *(float*)data->UserData; + data->DesiredSize.y = (float)(int)(data->DesiredSize.x / aspect_ratio); + } + static void Square(ImGuiSizeCallbackData* data) + { + data->DesiredSize.x = data->DesiredSize.y = IM_MAX(data->DesiredSize.x, data->DesiredSize.y); + } + static void Step(ImGuiSizeCallbackData* data) + { + float step = *(float*)data->UserData; + data->DesiredSize = ImVec2((int)(data->DesiredSize.x / step + 0.5f) * step, (int)(data->DesiredSize.y / step + 0.5f) * step); + } }; - static bool auto_resize = false; - static int type = 0; - static int display_lines = 10; - if (type == 0) ImGui::SetNextWindowSizeConstraints(ImVec2(-1, 0), ImVec2(-1, FLT_MAX)); // Vertical only - if (type == 1) ImGui::SetNextWindowSizeConstraints(ImVec2(0, -1), ImVec2(FLT_MAX, -1)); // Horizontal only - if (type == 2) ImGui::SetNextWindowSizeConstraints(ImVec2(100, 100), ImVec2(FLT_MAX, FLT_MAX)); // Width > 100, Height > 100 - if (type == 3) ImGui::SetNextWindowSizeConstraints(ImVec2(400, -1), ImVec2(500, -1)); // Width 400-500 - if (type == 4) ImGui::SetNextWindowSizeConstraints(ImVec2(-1, 400), ImVec2(-1, 500)); // Height 400-500 - if (type == 5) ImGui::SetNextWindowSizeConstraints(ImVec2(0, 0), ImVec2(FLT_MAX, FLT_MAX), CustomConstraints::Square); // Always Square - if (type == 6) ImGui::SetNextWindowSizeConstraints(ImVec2(0, 0), ImVec2(FLT_MAX, FLT_MAX), CustomConstraints::Step, (void*)(intptr_t)100); // Fixed Step - - ImGuiWindowFlags flags = auto_resize ? ImGuiWindowFlags_AlwaysAutoResize : 0; - if (ImGui::Begin("Example: Constrained Resize", p_open, flags)) + const char* test_desc[] = { - const char* desc[] = + "Between 100x100 and 500x500", + "At least 100x100", + "Resize vertical + lock current width", + "Resize horizontal + lock current height", + "Width Between 400 and 500", + "Height at least 400", + "Custom: Aspect Ratio 16:9", + "Custom: Always Square", + "Custom: Fixed Steps (100)", + }; + + // Options + static bool auto_resize = false; + static bool window_padding = true; + static int type = 6; // Aspect Ratio + static int display_lines = 10; + + // Submit constraint + float aspect_ratio = 16.0f / 9.0f; + float fixed_step = 100.0f; + if (type == 0) ImGui::SetNextWindowSizeConstraints(ImVec2(100, 100), ImVec2(500, 500)); // Between 100x100 and 500x500 + if (type == 1) ImGui::SetNextWindowSizeConstraints(ImVec2(100, 100), ImVec2(FLT_MAX, FLT_MAX)); // Width > 100, Height > 100 + if (type == 2) ImGui::SetNextWindowSizeConstraints(ImVec2(-1, 0), ImVec2(-1, FLT_MAX)); // Resize vertical + lock current width + if (type == 3) ImGui::SetNextWindowSizeConstraints(ImVec2(0, -1), ImVec2(FLT_MAX, -1)); // Resize horizontal + lock current height + if (type == 4) ImGui::SetNextWindowSizeConstraints(ImVec2(400, -1), ImVec2(500, -1)); // Width Between and 400 and 500 + if (type == 5) ImGui::SetNextWindowSizeConstraints(ImVec2(-1, 400), ImVec2(-1, FLT_MAX)); // Height at least 400 + if (type == 6) ImGui::SetNextWindowSizeConstraints(ImVec2(0, 0), ImVec2(FLT_MAX, FLT_MAX), CustomConstraints::AspectRatio, (void*)&aspect_ratio); // Aspect ratio + if (type == 7) ImGui::SetNextWindowSizeConstraints(ImVec2(0, 0), ImVec2(FLT_MAX, FLT_MAX), CustomConstraints::Square); // Always Square + if (type == 8) ImGui::SetNextWindowSizeConstraints(ImVec2(0, 0), ImVec2(FLT_MAX, FLT_MAX), CustomConstraints::Step, (void*)&fixed_step); // Fixed Step + + // Submit window + if (!window_padding) + ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f)); + const ImGuiWindowFlags window_flags = auto_resize ? ImGuiWindowFlags_AlwaysAutoResize : 0; + const bool window_open = ImGui::Begin("Example: Constrained Resize", p_open, window_flags); + if (!window_padding) + ImGui::PopStyleVar(); + if (window_open) + { + IMGUI_DEMO_MARKER("Examples/Constrained Resizing window"); + if (ImGui::GetIO().KeyShift) { - "Resize vertical only", - "Resize horizontal only", - "Width > 100, Height > 100", - "Width 400-500", - "Height 400-500", - "Custom: Always Square", - "Custom: Fixed Steps (100)", - }; - if (ImGui::Button("200x200")) { ImGui::SetWindowSize(ImVec2(200, 200)); } ImGui::SameLine(); - if (ImGui::Button("500x500")) { ImGui::SetWindowSize(ImVec2(500, 500)); } ImGui::SameLine(); - if (ImGui::Button("800x200")) { ImGui::SetWindowSize(ImVec2(800, 200)); } - ImGui::SetNextItemWidth(200); - ImGui::Combo("Constraint", &type, desc, IM_ARRAYSIZE(desc)); - ImGui::SetNextItemWidth(200); - ImGui::DragInt("Lines", &display_lines, 0.2f, 1, 100); - ImGui::Checkbox("Auto-resize", &auto_resize); - for (int i = 0; i < display_lines; i++) - ImGui::Text("%*sHello, sailor! Making this line long enough for the example.", i * 4, ""); + // Display a dummy viewport (in your real app you would likely use ImageButton() to display a texture. + ImVec2 avail_size = ImGui::GetContentRegionAvail(); + ImVec2 pos = ImGui::GetCursorScreenPos(); + ImGui::ColorButton("viewport", ImVec4(0.5f, 0.2f, 0.5f, 1.0f), ImGuiColorEditFlags_NoTooltip | ImGuiColorEditFlags_NoDragDrop, avail_size); + ImGui::SetCursorScreenPos(ImVec2(pos.x + 10, pos.y + 10)); + ImGui::Text("%.2f x %.2f", avail_size.x, avail_size.y); + } + else + { + ImGui::Text("(Hold SHIFT to display a dummy viewport)"); + if (ImGui::IsWindowDocked()) + ImGui::Text("Warning: Sizing Constraints won't work if the window is docked!"); + if (ImGui::Button("Set 200x200")) { ImGui::SetWindowSize(ImVec2(200, 200)); } ImGui::SameLine(); + if (ImGui::Button("Set 500x500")) { ImGui::SetWindowSize(ImVec2(500, 500)); } ImGui::SameLine(); + if (ImGui::Button("Set 800x200")) { ImGui::SetWindowSize(ImVec2(800, 200)); } + ImGui::SetNextItemWidth(ImGui::GetFontSize() * 20); + ImGui::Combo("Constraint", &type, test_desc, IM_ARRAYSIZE(test_desc)); + ImGui::SetNextItemWidth(ImGui::GetFontSize() * 20); + ImGui::DragInt("Lines", &display_lines, 0.2f, 1, 100); + ImGui::Checkbox("Auto-resize", &auto_resize); + ImGui::Checkbox("Window padding", &window_padding); + for (int i = 0; i < display_lines; i++) + ImGui::Text("%*sHello, sailor! Making this line long enough for the example.", i * 4, ""); + } } ImGui::End(); } //----------------------------------------------------------------------------- -// [SECTION] Example App: Simple Overlay / ShowExampleAppSimpleOverlay() +// [SECTION] Example App: Simple overlay / ShowExampleAppSimpleOverlay() //----------------------------------------------------------------------------- -// Demonstrate creating a simple static window with no decoration + a context-menu to choose which corner of the screen to use. +// Demonstrate creating a simple static window with no decoration +// + a context-menu to choose which corner of the screen to use. static void ShowExampleAppSimpleOverlay(bool* p_open) { - const float DISTANCE = 10.0f; - static int corner = 0; + static int location = 0; ImGuiIO& io = ImGui::GetIO(); - if (corner != -1) + ImGuiWindowFlags window_flags = ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoDocking | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoNav; + if (location >= 0) { - ImVec2 window_pos = ImVec2((corner & 1) ? io.DisplaySize.x - DISTANCE : DISTANCE, (corner & 2) ? io.DisplaySize.y - DISTANCE : DISTANCE); - ImVec2 window_pos_pivot = ImVec2((corner & 1) ? 1.0f : 0.0f, (corner & 2) ? 1.0f : 0.0f); + const float PAD = 10.0f; + const ImGuiViewport* viewport = ImGui::GetMainViewport(); + ImVec2 work_pos = viewport->WorkPos; // Use work area to avoid menu-bar/task-bar, if any! + ImVec2 work_size = viewport->WorkSize; + ImVec2 window_pos, window_pos_pivot; + window_pos.x = (location & 1) ? (work_pos.x + work_size.x - PAD) : (work_pos.x + PAD); + window_pos.y = (location & 2) ? (work_pos.y + work_size.y - PAD) : (work_pos.y + PAD); + window_pos_pivot.x = (location & 1) ? 1.0f : 0.0f; + window_pos_pivot.y = (location & 2) ? 1.0f : 0.0f; ImGui::SetNextWindowPos(window_pos, ImGuiCond_Always, window_pos_pivot); + ImGui::SetNextWindowViewport(viewport->ID); + window_flags |= ImGuiWindowFlags_NoMove; } - ImGui::SetNextWindowBgAlpha(0.35f); // Forward background - if (ImGui::Begin("Example: Simple overlay", p_open, (corner != -1 ? ImGuiWindowFlags_NoMove : 0) | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoNav)) + else if (location == -2) { - ImGui::Text("Simple overlay\n" "in the corner of the screen.\n" "(right-click to change position)"); + // Center window + ImGui::SetNextWindowPos(ImGui::GetMainViewport()->GetCenter(), ImGuiCond_Always, ImVec2(0.5f, 0.5f)); + window_flags |= ImGuiWindowFlags_NoMove; + } + ImGui::SetNextWindowBgAlpha(0.35f); // Transparent background + if (ImGui::Begin("Example: Simple overlay", p_open, window_flags)) + { + IMGUI_DEMO_MARKER("Examples/Simple Overlay"); + ImGui::Text("Simple overlay\n" "(right-click to change position)"); ImGui::Separator(); if (ImGui::IsMousePosValid()) ImGui::Text("Mouse Position: (%.1f,%.1f)", io.MousePos.x, io.MousePos.y); @@ -4161,11 +9659,12 @@ static void ShowExampleAppSimpleOverlay(bool* p_open) ImGui::Text("Mouse Position: "); if (ImGui::BeginPopupContextWindow()) { - if (ImGui::MenuItem("Custom", NULL, corner == -1)) corner = -1; - if (ImGui::MenuItem("Top-left", NULL, corner == 0)) corner = 0; - if (ImGui::MenuItem("Top-right", NULL, corner == 1)) corner = 1; - if (ImGui::MenuItem("Bottom-left", NULL, corner == 2)) corner = 2; - if (ImGui::MenuItem("Bottom-right", NULL, corner == 3)) corner = 3; + if (ImGui::MenuItem("Custom", NULL, location == -1)) location = -1; + if (ImGui::MenuItem("Center", NULL, location == -2)) location = -2; + if (ImGui::MenuItem("Top-left", NULL, location == 0)) location = 0; + if (ImGui::MenuItem("Top-right", NULL, location == 1)) location = 1; + if (ImGui::MenuItem("Bottom-left", NULL, location == 2)) location = 2; + if (ImGui::MenuItem("Bottom-right", NULL, location == 3)) location = 3; if (p_open && ImGui::MenuItem("Close")) *p_open = false; ImGui::EndPopup(); } @@ -4173,24 +9672,65 @@ static void ShowExampleAppSimpleOverlay(bool* p_open) ImGui::End(); } +//----------------------------------------------------------------------------- +// [SECTION] Example App: Fullscreen window / ShowExampleAppFullscreen() +//----------------------------------------------------------------------------- + +// Demonstrate creating a window covering the entire screen/viewport +static void ShowExampleAppFullscreen(bool* p_open) +{ + static bool use_work_area = true; + static ImGuiWindowFlags flags = ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings; + + // We demonstrate using the full viewport area or the work area (without menu-bars, task-bars etc.) + // Based on your use case you may want one or the other. + const ImGuiViewport* viewport = ImGui::GetMainViewport(); + ImGui::SetNextWindowPos(use_work_area ? viewport->WorkPos : viewport->Pos); + ImGui::SetNextWindowSize(use_work_area ? viewport->WorkSize : viewport->Size); + + if (ImGui::Begin("Example: Fullscreen window", p_open, flags)) + { + ImGui::Checkbox("Use work area instead of main area", &use_work_area); + ImGui::SameLine(); + HelpMarker("Main Area = entire viewport,\nWork Area = entire viewport minus sections used by the main menu bars, task bars etc.\n\nEnable the main-menu bar in Examples menu to see the difference."); + + ImGui::CheckboxFlags("ImGuiWindowFlags_NoBackground", &flags, ImGuiWindowFlags_NoBackground); + ImGui::CheckboxFlags("ImGuiWindowFlags_NoDecoration", &flags, ImGuiWindowFlags_NoDecoration); + ImGui::Indent(); + ImGui::CheckboxFlags("ImGuiWindowFlags_NoTitleBar", &flags, ImGuiWindowFlags_NoTitleBar); + ImGui::CheckboxFlags("ImGuiWindowFlags_NoCollapse", &flags, ImGuiWindowFlags_NoCollapse); + ImGui::CheckboxFlags("ImGuiWindowFlags_NoScrollbar", &flags, ImGuiWindowFlags_NoScrollbar); + ImGui::Unindent(); + + if (p_open && ImGui::Button("Close this window")) + *p_open = false; + } + ImGui::End(); +} + //----------------------------------------------------------------------------- // [SECTION] Example App: Manipulating Window Titles / ShowExampleAppWindowTitles() //----------------------------------------------------------------------------- -// Demonstrate using "##" and "###" in identifiers to manipulate ID generation. -// This apply to all regular items as well. Read FAQ section "How can I have multiple widgets with the same label? Can I have widget without a label? (Yes). A primer on the purpose of labels/IDs." for details. +// Demonstrate the use of "##" and "###" in identifiers to manipulate ID generation. +// This applies to all regular items as well. +// Read FAQ section "How can I have multiple widgets with the same label?" for details. static void ShowExampleAppWindowTitles(bool*) { + const ImGuiViewport* viewport = ImGui::GetMainViewport(); + const ImVec2 base_pos = viewport->Pos; + // By default, Windows are uniquely identified by their title. // You can use the "##" and "###" markers to manipulate the display/ID. // Using "##" to display same title but have unique identifier. - ImGui::SetNextWindowPos(ImVec2(100, 100), ImGuiCond_FirstUseEver); + ImGui::SetNextWindowPos(ImVec2(base_pos.x + 100, base_pos.y + 100), ImGuiCond_FirstUseEver); ImGui::Begin("Same title as another window##1"); + IMGUI_DEMO_MARKER("Examples/Manipulating window titles"); ImGui::Text("This is window 1.\nMy title is the same as window 2, but my identifier is unique."); ImGui::End(); - ImGui::SetNextWindowPos(ImVec2(100, 200), ImGuiCond_FirstUseEver); + ImGui::SetNextWindowPos(ImVec2(base_pos.x + 100, base_pos.y + 200), ImGuiCond_FirstUseEver); ImGui::Begin("Same title as another window##2"); ImGui::Text("This is window 2.\nMy title is the same as window 1, but my identifier is unique."); ImGui::End(); @@ -4198,7 +9738,7 @@ static void ShowExampleAppWindowTitles(bool*) // Using "###" to display a changing title but keep a static identifier "AnimatedTitle" char buf[128]; sprintf(buf, "Animated title %c %d###AnimatedTitle", "|/-\\"[(int)(ImGui::GetTime() / 0.25f) & 3], ImGui::GetFrameCount()); - ImGui::SetNextWindowPos(ImVec2(100, 300), ImGuiCond_FirstUseEver); + ImGui::SetNextWindowPos(ImVec2(base_pos.x + 100, base_pos.y + 300), ImGuiCond_FirstUseEver); ImGui::Begin(buf); ImGui::Text("This window has a changing title."); ImGui::End(); @@ -4208,121 +9748,252 @@ static void ShowExampleAppWindowTitles(bool*) // [SECTION] Example App: Custom Rendering using ImDrawList API / ShowExampleAppCustomRendering() //----------------------------------------------------------------------------- +// Add a |_| looking shape +static void PathConcaveShape(ImDrawList* draw_list, float x, float y, float sz) +{ + const ImVec2 pos_norms[] = { { 0.0f, 0.0f }, { 0.3f, 0.0f }, { 0.3f, 0.7f }, { 0.7f, 0.7f }, { 0.7f, 0.0f }, { 1.0f, 0.0f }, { 1.0f, 1.0f }, { 0.0f, 1.0f } }; + for (const ImVec2& p : pos_norms) + draw_list->PathLineTo(ImVec2(x + 0.5f + (int)(sz * p.x), y + 0.5f + (int)(sz * p.y))); +} + // Demonstrate using the low-level ImDrawList to draw custom shapes. static void ShowExampleAppCustomRendering(bool* p_open) { - ImGui::SetNextWindowSize(ImVec2(350, 560), ImGuiCond_FirstUseEver); if (!ImGui::Begin("Example: Custom rendering", p_open)) { ImGui::End(); return; } + IMGUI_DEMO_MARKER("Examples/Custom Rendering"); - // Tip: If you do a lot of custom rendering, you probably want to use your own geometrical types and benefit of overloaded operators, etc. - // Define IM_VEC2_CLASS_EXTRA in imconfig.h to create implicit conversions between your types and ImVec2/ImVec4. - // ImGui defines overloaded operators but they are internal to imgui.cpp and not exposed outside (to avoid messing with your types) - // In this example we are not using the maths operators! - ImDrawList* draw_list = ImGui::GetWindowDrawList(); + // Tip: If you do a lot of custom rendering, you probably want to use your own geometrical types and benefit of + // overloaded operators, etc. Define IM_VEC2_CLASS_EXTRA in imconfig.h to create implicit conversions between your + // types and ImVec2/ImVec4. Dear ImGui defines overloaded operators but they are internal to imgui.cpp and not + // exposed outside (to avoid messing with your types) In this example we are not using the maths operators! if (ImGui::BeginTabBar("##TabBar")) { - // Primitives if (ImGui::BeginTabItem("Primitives")) { + ImGui::PushItemWidth(-ImGui::GetFontSize() * 15); + ImDrawList* draw_list = ImGui::GetWindowDrawList(); + + // Draw gradients + // (note that those are currently exacerbating our sRGB/Linear issues) + // Calling ImGui::GetColorU32() multiplies the given colors by the current Style Alpha, but you may pass the IM_COL32() directly as well.. + ImGui::Text("Gradients"); + ImVec2 gradient_size = ImVec2(ImGui::CalcItemWidth(), ImGui::GetFrameHeight()); + { + ImVec2 p0 = ImGui::GetCursorScreenPos(); + ImVec2 p1 = ImVec2(p0.x + gradient_size.x, p0.y + gradient_size.y); + ImU32 col_a = ImGui::GetColorU32(IM_COL32(0, 0, 0, 255)); + ImU32 col_b = ImGui::GetColorU32(IM_COL32(255, 255, 255, 255)); + draw_list->AddRectFilledMultiColor(p0, p1, col_a, col_b, col_b, col_a); + ImGui::InvisibleButton("##gradient1", gradient_size); + } + { + ImVec2 p0 = ImGui::GetCursorScreenPos(); + ImVec2 p1 = ImVec2(p0.x + gradient_size.x, p0.y + gradient_size.y); + ImU32 col_a = ImGui::GetColorU32(IM_COL32(0, 255, 0, 255)); + ImU32 col_b = ImGui::GetColorU32(IM_COL32(255, 0, 0, 255)); + draw_list->AddRectFilledMultiColor(p0, p1, col_a, col_b, col_b, col_a); + ImGui::InvisibleButton("##gradient2", gradient_size); + } + + // Draw a bunch of primitives + ImGui::Text("All primitives"); static float sz = 36.0f; static float thickness = 3.0f; + static int ngon_sides = 6; + static bool circle_segments_override = false; + static int circle_segments_override_v = 12; + static bool curve_segments_override = false; + static int curve_segments_override_v = 8; static ImVec4 colf = ImVec4(1.0f, 1.0f, 0.4f, 1.0f); - ImGui::DragFloat("Size", &sz, 0.2f, 2.0f, 72.0f, "%.0f"); + ImGui::DragFloat("Size", &sz, 0.2f, 2.0f, 100.0f, "%.0f"); ImGui::DragFloat("Thickness", &thickness, 0.05f, 1.0f, 8.0f, "%.02f"); + ImGui::SliderInt("N-gon sides", &ngon_sides, 3, 12); + ImGui::Checkbox("##circlesegmentoverride", &circle_segments_override); + ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x); + circle_segments_override |= ImGui::SliderInt("Circle segments override", &circle_segments_override_v, 3, 40); + ImGui::Checkbox("##curvessegmentoverride", &curve_segments_override); + ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x); + curve_segments_override |= ImGui::SliderInt("Curves segments override", &curve_segments_override_v, 3, 40); ImGui::ColorEdit4("Color", &colf.x); + const ImVec2 p = ImGui::GetCursorScreenPos(); const ImU32 col = ImColor(colf); - float x = p.x + 4.0f, y = p.y + 4.0f; - float spacing = 10.0f; - ImDrawCornerFlags corners_none = 0; - ImDrawCornerFlags corners_all = ImDrawCornerFlags_All; - ImDrawCornerFlags corners_tl_br = ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_BotRight; + const float spacing = 10.0f; + const ImDrawFlags corners_tl_br = ImDrawFlags_RoundCornersTopLeft | ImDrawFlags_RoundCornersBottomRight; + const float rounding = sz / 5.0f; + const int circle_segments = circle_segments_override ? circle_segments_override_v : 0; + const int curve_segments = curve_segments_override ? curve_segments_override_v : 0; + const ImVec2 cp3[3] = { ImVec2(0.0f, sz * 0.6f), ImVec2(sz * 0.5f, -sz * 0.4f), ImVec2(sz, sz) }; // Control points for curves + const ImVec2 cp4[4] = { ImVec2(0.0f, 0.0f), ImVec2(sz * 1.3f, sz * 0.3f), ImVec2(sz - sz * 1.3f, sz - sz * 0.3f), ImVec2(sz, sz) }; + + float x = p.x + 4.0f; + float y = p.y + 4.0f; for (int n = 0; n < 2; n++) { // First line uses a thickness of 1.0f, second line uses the configurable thickness float th = (n == 0) ? 1.0f : thickness; - draw_list->AddCircle(ImVec2(x + sz*0.5f, y + sz*0.5f), sz*0.5f, col, 6, th); x += sz + spacing; // Hexagon - draw_list->AddCircle(ImVec2(x + sz*0.5f, y + sz*0.5f), sz*0.5f, col, 20, th); x += sz + spacing; // Circle - draw_list->AddRect(ImVec2(x, y), ImVec2(x + sz, y + sz), col, 0.0f, corners_none, th); x += sz + spacing; // Square - draw_list->AddRect(ImVec2(x, y), ImVec2(x + sz, y + sz), col, 10.0f, corners_all, th); x += sz + spacing; // Square with all rounded corners - draw_list->AddRect(ImVec2(x, y), ImVec2(x + sz, y + sz), col, 10.0f, corners_tl_br, th); x += sz + spacing; // Square with two rounded corners - draw_list->AddTriangle(ImVec2(x+sz*0.5f,y), ImVec2(x+sz, y+sz-0.5f), ImVec2(x, y+sz-0.5f), col, th); x += sz + spacing; // Triangle - draw_list->AddTriangle(ImVec2(x+sz*0.2f,y), ImVec2(x, y+sz-0.5f), ImVec2(x+sz*0.4f, y+sz-0.5f), col, th); x += sz*0.4f + spacing; // Thin triangle - draw_list->AddLine(ImVec2(x, y), ImVec2(x + sz, y), col, th); x += sz + spacing; // Horizontal line (note: drawing a filled rectangle will be faster!) - draw_list->AddLine(ImVec2(x, y), ImVec2(x, y + sz), col, th); x += spacing; // Vertical line (note: drawing a filled rectangle will be faster!) - draw_list->AddLine(ImVec2(x, y), ImVec2(x + sz, y + sz), col, th); x += sz + spacing; // Diagonal line - draw_list->AddBezierCurve(ImVec2(x, y), ImVec2(x + sz*1.3f, y + sz*0.3f), ImVec2(x + sz - sz*1.3f, y + sz - sz*0.3f), ImVec2(x + sz, y + sz), col, th); + draw_list->AddNgon(ImVec2(x + sz*0.5f, y + sz*0.5f), sz*0.5f, col, ngon_sides, th); x += sz + spacing; // N-gon + draw_list->AddCircle(ImVec2(x + sz*0.5f, y + sz*0.5f), sz*0.5f, col, circle_segments, th); x += sz + spacing; // Circle + draw_list->AddEllipse(ImVec2(x + sz*0.5f, y + sz*0.5f), ImVec2(sz*0.5f, sz*0.3f), col, -0.3f, circle_segments, th); x += sz + spacing; // Ellipse + draw_list->AddRect(ImVec2(x, y), ImVec2(x + sz, y + sz), col, 0.0f, ImDrawFlags_None, th); x += sz + spacing; // Square + draw_list->AddRect(ImVec2(x, y), ImVec2(x + sz, y + sz), col, rounding, ImDrawFlags_None, th); x += sz + spacing; // Square with all rounded corners + draw_list->AddRect(ImVec2(x, y), ImVec2(x + sz, y + sz), col, rounding, corners_tl_br, th); x += sz + spacing; // Square with two rounded corners + draw_list->AddTriangle(ImVec2(x+sz*0.5f,y), ImVec2(x+sz, y+sz-0.5f), ImVec2(x, y+sz-0.5f), col, th);x += sz + spacing; // Triangle + //draw_list->AddTriangle(ImVec2(x+sz*0.2f,y), ImVec2(x, y+sz-0.5f), ImVec2(x+sz*0.4f, y+sz-0.5f), col, th);x+= sz*0.4f + spacing; // Thin triangle + PathConcaveShape(draw_list, x, y, sz); draw_list->PathStroke(col, ImDrawFlags_Closed, th); x += sz + spacing; // Concave Shape + //draw_list->AddPolyline(concave_shape, IM_ARRAYSIZE(concave_shape), col, ImDrawFlags_Closed, th); + draw_list->AddLine(ImVec2(x, y), ImVec2(x + sz, y), col, th); x += sz + spacing; // Horizontal line (note: drawing a filled rectangle will be faster!) + draw_list->AddLine(ImVec2(x, y), ImVec2(x, y + sz), col, th); x += spacing; // Vertical line (note: drawing a filled rectangle will be faster!) + draw_list->AddLine(ImVec2(x, y), ImVec2(x + sz, y + sz), col, th); x += sz + spacing; // Diagonal line + + // Path + draw_list->PathArcTo(ImVec2(x + sz*0.5f, y + sz*0.5f), sz*0.5f, 3.141592f, 3.141592f * -0.5f); + draw_list->PathStroke(col, ImDrawFlags_None, th); + x += sz + spacing; + + // Quadratic Bezier Curve (3 control points) + draw_list->AddBezierQuadratic(ImVec2(x + cp3[0].x, y + cp3[0].y), ImVec2(x + cp3[1].x, y + cp3[1].y), ImVec2(x + cp3[2].x, y + cp3[2].y), col, th, curve_segments); + x += sz + spacing; + + // Cubic Bezier Curve (4 control points) + draw_list->AddBezierCubic(ImVec2(x + cp4[0].x, y + cp4[0].y), ImVec2(x + cp4[1].x, y + cp4[1].y), ImVec2(x + cp4[2].x, y + cp4[2].y), ImVec2(x + cp4[3].x, y + cp4[3].y), col, th, curve_segments); + x = p.x + 4; y += sz + spacing; } - draw_list->AddCircleFilled(ImVec2(x + sz*0.5f, y + sz*0.5f), sz*0.5f, col, 6); x += sz + spacing; // Hexagon - draw_list->AddCircleFilled(ImVec2(x + sz*0.5f, y + sz*0.5f), sz*0.5f, col, 32); x += sz + spacing; // Circle - draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + sz, y + sz), col); x += sz + spacing; // Square - draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + sz, y + sz), col, 10.0f); x += sz + spacing; // Square with all rounded corners - draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + sz, y + sz), col, 10.0f, corners_tl_br); x += sz + spacing; // Square with two rounded corners - draw_list->AddTriangleFilled(ImVec2(x+sz*0.5f,y), ImVec2(x+sz, y+sz-0.5f), ImVec2(x, y+sz-0.5f), col); x += sz + spacing; // Triangle - draw_list->AddTriangleFilled(ImVec2(x+sz*0.2f,y), ImVec2(x, y+sz-0.5f), ImVec2(x+sz*0.4f, y+sz-0.5f), col); x += sz*0.4f + spacing; // Thin triangle - draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + sz, y + thickness), col); x += sz + spacing; // Horizontal line (faster than AddLine, but only handle integer thickness) - draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + thickness, y + sz), col); x += spacing*2.0f; // Vertical line (faster than AddLine, but only handle integer thickness) - draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + 1, y + 1), col); x += sz; // Pixel (faster than AddLine) + + // Filled shapes + draw_list->AddNgonFilled(ImVec2(x + sz * 0.5f, y + sz * 0.5f), sz * 0.5f, col, ngon_sides); x += sz + spacing; // N-gon + draw_list->AddCircleFilled(ImVec2(x + sz * 0.5f, y + sz * 0.5f), sz * 0.5f, col, circle_segments); x += sz + spacing; // Circle + draw_list->AddEllipseFilled(ImVec2(x + sz * 0.5f, y + sz * 0.5f), ImVec2(sz * 0.5f, sz * 0.3f), col, -0.3f, circle_segments); x += sz + spacing;// Ellipse + draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + sz, y + sz), col); x += sz + spacing; // Square + draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + sz, y + sz), col, 10.0f); x += sz + spacing; // Square with all rounded corners + draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + sz, y + sz), col, 10.0f, corners_tl_br); x += sz + spacing; // Square with two rounded corners + draw_list->AddTriangleFilled(ImVec2(x+sz*0.5f,y), ImVec2(x+sz, y+sz-0.5f), ImVec2(x, y+sz-0.5f), col); x += sz + spacing; // Triangle + //draw_list->AddTriangleFilled(ImVec2(x+sz*0.2f,y), ImVec2(x, y+sz-0.5f), ImVec2(x+sz*0.4f, y+sz-0.5f), col); x += sz*0.4f + spacing; // Thin triangle + PathConcaveShape(draw_list, x, y, sz); draw_list->PathFillConcave(col); x += sz + spacing; // Concave shape + draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + sz, y + thickness), col); x += sz + spacing; // Horizontal line (faster than AddLine, but only handle integer thickness) + draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + thickness, y + sz), col); x += spacing * 2.0f;// Vertical line (faster than AddLine, but only handle integer thickness) + draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x + 1, y + 1), col); x += sz; // Pixel (faster than AddLine) + + // Path + draw_list->PathArcTo(ImVec2(x + sz * 0.5f, y + sz * 0.5f), sz * 0.5f, 3.141592f * -0.5f, 3.141592f); + draw_list->PathFillConvex(col); + x += sz + spacing; + + // Quadratic Bezier Curve (3 control points) + draw_list->PathLineTo(ImVec2(x + cp3[0].x, y + cp3[0].y)); + draw_list->PathBezierQuadraticCurveTo(ImVec2(x + cp3[1].x, y + cp3[1].y), ImVec2(x + cp3[2].x, y + cp3[2].y), curve_segments); + draw_list->PathFillConvex(col); + x += sz + spacing; + draw_list->AddRectFilledMultiColor(ImVec2(x, y), ImVec2(x + sz, y + sz), IM_COL32(0, 0, 0, 255), IM_COL32(255, 0, 0, 255), IM_COL32(255, 255, 0, 255), IM_COL32(0, 255, 0, 255)); - ImGui::Dummy(ImVec2((sz + spacing) * 9.8f, (sz + spacing) * 3)); + x += sz + spacing; + + ImGui::Dummy(ImVec2((sz + spacing) * 13.2f, (sz + spacing) * 3.0f)); + ImGui::PopItemWidth(); ImGui::EndTabItem(); } if (ImGui::BeginTabItem("Canvas")) { static ImVector points; + static ImVec2 scrolling(0.0f, 0.0f); + static bool opt_enable_grid = true; + static bool opt_enable_context_menu = true; static bool adding_line = false; - if (ImGui::Button("Clear")) points.clear(); - if (points.Size >= 2) { ImGui::SameLine(); if (ImGui::Button("Undo")) { points.pop_back(); points.pop_back(); } } - ImGui::Text("Left-click and drag to add lines,\nRight-click to undo"); - // Here we are using InvisibleButton() as a convenience to 1) advance the cursor and 2) allows us to use IsItemHovered() - // But you can also draw directly and poll mouse/keyboard by yourself. You can manipulate the cursor using GetCursorPos() and SetCursorPos(). - // If you only use the ImDrawList API, you can notify the owner window of its extends by using SetCursorPos(max). - ImVec2 canvas_pos = ImGui::GetCursorScreenPos(); // ImDrawList API uses screen coordinates! - ImVec2 canvas_size = ImGui::GetContentRegionAvail(); // Resize canvas to what's available - if (canvas_size.x < 50.0f) canvas_size.x = 50.0f; - if (canvas_size.y < 50.0f) canvas_size.y = 50.0f; - draw_list->AddRectFilledMultiColor(canvas_pos, ImVec2(canvas_pos.x + canvas_size.x, canvas_pos.y + canvas_size.y), IM_COL32(50, 50, 50, 255), IM_COL32(50, 50, 60, 255), IM_COL32(60, 60, 70, 255), IM_COL32(50, 50, 60, 255)); - draw_list->AddRect(canvas_pos, ImVec2(canvas_pos.x + canvas_size.x, canvas_pos.y + canvas_size.y), IM_COL32(255, 255, 255, 255)); + ImGui::Checkbox("Enable grid", &opt_enable_grid); + ImGui::Checkbox("Enable context menu", &opt_enable_context_menu); + ImGui::Text("Mouse Left: drag to add lines,\nMouse Right: drag to scroll, click for context menu."); - bool adding_preview = false; - ImGui::InvisibleButton("canvas", canvas_size); - ImVec2 mouse_pos_in_canvas = ImVec2(ImGui::GetIO().MousePos.x - canvas_pos.x, ImGui::GetIO().MousePos.y - canvas_pos.y); + // Typically you would use a BeginChild()/EndChild() pair to benefit from a clipping region + own scrolling. + // Here we demonstrate that this can be replaced by simple offsetting + custom drawing + PushClipRect/PopClipRect() calls. + // To use a child window instead we could use, e.g: + // ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0)); // Disable padding + // ImGui::PushStyleColor(ImGuiCol_ChildBg, IM_COL32(50, 50, 50, 255)); // Set a background color + // ImGui::BeginChild("canvas", ImVec2(0.0f, 0.0f), ImGuiChildFlags_Borders, ImGuiWindowFlags_NoMove); + // ImGui::PopStyleColor(); + // ImGui::PopStyleVar(); + // [...] + // ImGui::EndChild(); + + // Using InvisibleButton() as a convenience 1) it will advance the layout cursor and 2) allows us to use IsItemHovered()/IsItemActive() + ImVec2 canvas_p0 = ImGui::GetCursorScreenPos(); // ImDrawList API uses screen coordinates! + ImVec2 canvas_sz = ImGui::GetContentRegionAvail(); // Resize canvas to what's available + if (canvas_sz.x < 50.0f) canvas_sz.x = 50.0f; + if (canvas_sz.y < 50.0f) canvas_sz.y = 50.0f; + ImVec2 canvas_p1 = ImVec2(canvas_p0.x + canvas_sz.x, canvas_p0.y + canvas_sz.y); + + // Draw border and background color + ImGuiIO& io = ImGui::GetIO(); + ImDrawList* draw_list = ImGui::GetWindowDrawList(); + draw_list->AddRectFilled(canvas_p0, canvas_p1, IM_COL32(50, 50, 50, 255)); + draw_list->AddRect(canvas_p0, canvas_p1, IM_COL32(255, 255, 255, 255)); + + // This will catch our interactions + ImGui::InvisibleButton("canvas", canvas_sz, ImGuiButtonFlags_MouseButtonLeft | ImGuiButtonFlags_MouseButtonRight); + const bool is_hovered = ImGui::IsItemHovered(); // Hovered + const bool is_active = ImGui::IsItemActive(); // Held + const ImVec2 origin(canvas_p0.x + scrolling.x, canvas_p0.y + scrolling.y); // Lock scrolled origin + const ImVec2 mouse_pos_in_canvas(io.MousePos.x - origin.x, io.MousePos.y - origin.y); + + // Add first and second point + if (is_hovered && !adding_line && ImGui::IsMouseClicked(ImGuiMouseButton_Left)) + { + points.push_back(mouse_pos_in_canvas); + points.push_back(mouse_pos_in_canvas); + adding_line = true; + } if (adding_line) { - adding_preview = true; - points.push_back(mouse_pos_in_canvas); - if (!ImGui::IsMouseDown(0)) - adding_line = adding_preview = false; + points.back() = mouse_pos_in_canvas; + if (!ImGui::IsMouseDown(ImGuiMouseButton_Left)) + adding_line = false; } - if (ImGui::IsItemHovered()) + + // Pan (we use a zero mouse threshold when there's no context menu) + // You may decide to make that threshold dynamic based on whether the mouse is hovering something etc. + const float mouse_threshold_for_pan = opt_enable_context_menu ? -1.0f : 0.0f; + if (is_active && ImGui::IsMouseDragging(ImGuiMouseButton_Right, mouse_threshold_for_pan)) { - if (!adding_line && ImGui::IsMouseClicked(0)) - { - points.push_back(mouse_pos_in_canvas); - adding_line = true; - } - if (ImGui::IsMouseClicked(1) && !points.empty()) - { - adding_line = adding_preview = false; - points.pop_back(); - points.pop_back(); - } + scrolling.x += io.MouseDelta.x; + scrolling.y += io.MouseDelta.y; } - draw_list->PushClipRect(canvas_pos, ImVec2(canvas_pos.x + canvas_size.x, canvas_pos.y + canvas_size.y), true); // clip lines within the canvas (if we resize it, etc.) - for (int i = 0; i < points.Size - 1; i += 2) - draw_list->AddLine(ImVec2(canvas_pos.x + points[i].x, canvas_pos.y + points[i].y), ImVec2(canvas_pos.x + points[i + 1].x, canvas_pos.y + points[i + 1].y), IM_COL32(255, 255, 0, 255), 2.0f); + + // Context menu (under default mouse threshold) + ImVec2 drag_delta = ImGui::GetMouseDragDelta(ImGuiMouseButton_Right); + if (opt_enable_context_menu && drag_delta.x == 0.0f && drag_delta.y == 0.0f) + ImGui::OpenPopupOnItemClick("context", ImGuiPopupFlags_MouseButtonRight); + if (ImGui::BeginPopup("context")) + { + if (adding_line) + points.resize(points.size() - 2); + adding_line = false; + if (ImGui::MenuItem("Remove one", NULL, false, points.Size > 0)) { points.resize(points.size() - 2); } + if (ImGui::MenuItem("Remove all", NULL, false, points.Size > 0)) { points.clear(); } + ImGui::EndPopup(); + } + + // Draw grid + all lines in the canvas + draw_list->PushClipRect(canvas_p0, canvas_p1, true); + if (opt_enable_grid) + { + const float GRID_STEP = 64.0f; + for (float x = fmodf(scrolling.x, GRID_STEP); x < canvas_sz.x; x += GRID_STEP) + draw_list->AddLine(ImVec2(canvas_p0.x + x, canvas_p0.y), ImVec2(canvas_p0.x + x, canvas_p1.y), IM_COL32(200, 200, 200, 40)); + for (float y = fmodf(scrolling.y, GRID_STEP); y < canvas_sz.y; y += GRID_STEP) + draw_list->AddLine(ImVec2(canvas_p0.x, canvas_p0.y + y), ImVec2(canvas_p1.x, canvas_p0.y + y), IM_COL32(200, 200, 200, 40)); + } + for (int n = 0; n < points.Size; n += 2) + draw_list->AddLine(ImVec2(origin.x + points[n].x, origin.y + points[n].y), ImVec2(origin.x + points[n + 1].x, origin.y + points[n + 1].y), IM_COL32(255, 255, 0, 255), 2.0f); draw_list->PopClipRect(); - if (adding_preview) - points.pop_back(); + ImGui::EndTabItem(); } @@ -4331,14 +10002,53 @@ static void ShowExampleAppCustomRendering(bool* p_open) static bool draw_bg = true; static bool draw_fg = true; ImGui::Checkbox("Draw in Background draw list", &draw_bg); + ImGui::SameLine(); HelpMarker("The Background draw list will be rendered below every Dear ImGui windows."); ImGui::Checkbox("Draw in Foreground draw list", &draw_fg); + ImGui::SameLine(); HelpMarker("The Foreground draw list will be rendered over every Dear ImGui windows."); ImVec2 window_pos = ImGui::GetWindowPos(); ImVec2 window_size = ImGui::GetWindowSize(); ImVec2 window_center = ImVec2(window_pos.x + window_size.x * 0.5f, window_pos.y + window_size.y * 0.5f); if (draw_bg) - ImGui::GetBackgroundDrawList()->AddCircle(window_center, window_size.x * 0.6f, IM_COL32(255, 0, 0, 200), 32, 10+4); + ImGui::GetBackgroundDrawList()->AddCircle(window_center, window_size.x * 0.6f, IM_COL32(255, 0, 0, 200), 0, 10 + 4); if (draw_fg) - ImGui::GetForegroundDrawList()->AddCircle(window_center, window_size.y * 0.6f, IM_COL32(0, 255, 0, 200), 32, 10); + ImGui::GetForegroundDrawList()->AddCircle(window_center, window_size.y * 0.6f, IM_COL32(0, 255, 0, 200), 0, 10); + ImGui::EndTabItem(); + } + + // Demonstrate out-of-order rendering via channels splitting + // We use functions in ImDrawList as each draw list contains a convenience splitter, + // but you can also instantiate your own ImDrawListSplitter if you need to nest them. + if (ImGui::BeginTabItem("Draw Channels")) + { + ImDrawList* draw_list = ImGui::GetWindowDrawList(); + { + ImGui::Text("Blue shape is drawn first: appears in back"); + ImGui::Text("Red shape is drawn after: appears in front"); + ImVec2 p0 = ImGui::GetCursorScreenPos(); + draw_list->AddRectFilled(ImVec2(p0.x, p0.y), ImVec2(p0.x + 50, p0.y + 50), IM_COL32(0, 0, 255, 255)); // Blue + draw_list->AddRectFilled(ImVec2(p0.x + 25, p0.y + 25), ImVec2(p0.x + 75, p0.y + 75), IM_COL32(255, 0, 0, 255)); // Red + ImGui::Dummy(ImVec2(75, 75)); + } + ImGui::Separator(); + { + ImGui::Text("Blue shape is drawn first, into channel 1: appears in front"); + ImGui::Text("Red shape is drawn after, into channel 0: appears in back"); + ImVec2 p1 = ImGui::GetCursorScreenPos(); + + // Create 2 channels and draw a Blue shape THEN a Red shape. + // You can create any number of channels. Tables API use 1 channel per column in order to better batch draw calls. + draw_list->ChannelsSplit(2); + draw_list->ChannelsSetCurrent(1); + draw_list->AddRectFilled(ImVec2(p1.x, p1.y), ImVec2(p1.x + 50, p1.y + 50), IM_COL32(0, 0, 255, 255)); // Blue + draw_list->ChannelsSetCurrent(0); + draw_list->AddRectFilled(ImVec2(p1.x + 25, p1.y + 25), ImVec2(p1.x + 75, p1.y + 75), IM_COL32(255, 0, 0, 255)); // Red + + // Flatten/reorder channels. Red shape is in channel 0 and it appears below the Blue shape in channel 1. + // This works by copying draw indices only (vertices are not copied). + draw_list->ChannelsMerge(); + ImGui::Dummy(ImVec2(75, 75)); + ImGui::Text("After reordering, contents of channel 0 appears below channel 1."); + } ImGui::EndTabItem(); } @@ -4348,6 +10058,134 @@ static void ShowExampleAppCustomRendering(bool* p_open) ImGui::End(); } +//----------------------------------------------------------------------------- +// [SECTION] Example App: Docking, DockSpace / ShowExampleAppDockSpace() +//----------------------------------------------------------------------------- + +// Demonstrate using DockSpace() to create an explicit docking node within an existing window. +// Note: You can use most Docking facilities without calling any API. You DO NOT need to call DockSpace() to use Docking! +// - Drag from window title bar or their tab to dock/undock. Hold SHIFT to disable docking. +// - Drag from window menu button (upper-left button) to undock an entire node (all windows). +// - When io.ConfigDockingWithShift == true, you instead need to hold SHIFT to enable docking. +// About dockspaces: +// - Use DockSpace() to create an explicit dock node _within_ an existing window. +// - Use DockSpaceOverViewport() to create an explicit dock node covering the screen or a specific viewport. +// This is often used with ImGuiDockNodeFlags_PassthruCentralNode. +// - Important: Dockspaces need to be submitted _before_ any window they can host. Submit it early in your frame! (*) +// - Important: Dockspaces need to be kept alive if hidden, otherwise windows docked into it will be undocked. +// e.g. if you have multiple tabs with a dockspace inside each tab: submit the non-visible dockspaces with ImGuiDockNodeFlags_KeepAliveOnly. +// (*) because of this constraint, the implicit \"Debug\" window can not be docked into an explicit DockSpace() node, +// because that window is submitted as part of the part of the NewFrame() call. An easy workaround is that you can create +// your own implicit "Debug##2" window after calling DockSpace() and leave it in the window stack for anyone to use. +void ShowExampleAppDockSpace(bool* p_open) +{ + // READ THIS !!! + // TL;DR; this demo is more complicated than what most users you would normally use. + // If we remove all options we are showcasing, this demo would become: + // void ShowExampleAppDockSpace() + // { + // ImGui::DockSpaceOverViewport(0, ImGui::GetMainViewport()); + // } + // In most cases you should be able to just call DockSpaceOverViewport() and ignore all the code below! + // In this specific demo, we are not using DockSpaceOverViewport() because: + // - (1) we allow the host window to be floating/moveable instead of filling the viewport (when opt_fullscreen == false) + // - (2) we allow the host window to have padding (when opt_padding == true) + // - (3) we expose many flags and need a way to have them visible. + // - (4) we have a local menu bar in the host window (vs. you could use BeginMainMenuBar() + DockSpaceOverViewport() + // in your code, but we don't here because we allow the window to be floating) + + static bool opt_fullscreen = true; + static bool opt_padding = false; + static ImGuiDockNodeFlags dockspace_flags = ImGuiDockNodeFlags_None; + + // We are using the ImGuiWindowFlags_NoDocking flag to make the parent window not dockable into, + // because it would be confusing to have two docking targets within each others. + ImGuiWindowFlags window_flags = ImGuiWindowFlags_MenuBar | ImGuiWindowFlags_NoDocking; + if (opt_fullscreen) + { + const ImGuiViewport* viewport = ImGui::GetMainViewport(); + ImGui::SetNextWindowPos(viewport->WorkPos); + ImGui::SetNextWindowSize(viewport->WorkSize); + ImGui::SetNextWindowViewport(viewport->ID); + ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f); + ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f); + window_flags |= ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove; + window_flags |= ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoNavFocus; + } + else + { + dockspace_flags &= ~ImGuiDockNodeFlags_PassthruCentralNode; + } + + // When using ImGuiDockNodeFlags_PassthruCentralNode, DockSpace() will render our background + // and handle the pass-thru hole, so we ask Begin() to not render a background. + if (dockspace_flags & ImGuiDockNodeFlags_PassthruCentralNode) + window_flags |= ImGuiWindowFlags_NoBackground; + + // Important: note that we proceed even if Begin() returns false (aka window is collapsed). + // This is because we want to keep our DockSpace() active. If a DockSpace() is inactive, + // all active windows docked into it will lose their parent and become undocked. + // We cannot preserve the docking relationship between an active window and an inactive docking, otherwise + // any change of dockspace/settings would lead to windows being stuck in limbo and never being visible. + if (!opt_padding) + ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f)); + ImGui::Begin("DockSpace Demo", p_open, window_flags); + if (!opt_padding) + ImGui::PopStyleVar(); + + if (opt_fullscreen) + ImGui::PopStyleVar(2); + + // Submit the DockSpace + ImGuiIO& io = ImGui::GetIO(); + if (io.ConfigFlags & ImGuiConfigFlags_DockingEnable) + { + ImGuiID dockspace_id = ImGui::GetID("MyDockSpace"); + ImGui::DockSpace(dockspace_id, ImVec2(0.0f, 0.0f), dockspace_flags); + } + else + { + ShowDockingDisabledMessage(); + } + + if (ImGui::BeginMenuBar()) + { + if (ImGui::BeginMenu("Options")) + { + // Disabling fullscreen would allow the window to be moved to the front of other windows, + // which we can't undo at the moment without finer window depth/z control. + ImGui::MenuItem("Fullscreen", NULL, &opt_fullscreen); + ImGui::MenuItem("Padding", NULL, &opt_padding); + ImGui::Separator(); + + if (ImGui::MenuItem("Flag: NoDockingOverCentralNode", "", (dockspace_flags & ImGuiDockNodeFlags_NoDockingOverCentralNode) != 0)) { dockspace_flags ^= ImGuiDockNodeFlags_NoDockingOverCentralNode; } + if (ImGui::MenuItem("Flag: NoDockingSplit", "", (dockspace_flags & ImGuiDockNodeFlags_NoDockingSplit) != 0)) { dockspace_flags ^= ImGuiDockNodeFlags_NoDockingSplit; } + if (ImGui::MenuItem("Flag: NoUndocking", "", (dockspace_flags & ImGuiDockNodeFlags_NoUndocking) != 0)) { dockspace_flags ^= ImGuiDockNodeFlags_NoUndocking; } + if (ImGui::MenuItem("Flag: NoResize", "", (dockspace_flags & ImGuiDockNodeFlags_NoResize) != 0)) { dockspace_flags ^= ImGuiDockNodeFlags_NoResize; } + if (ImGui::MenuItem("Flag: AutoHideTabBar", "", (dockspace_flags & ImGuiDockNodeFlags_AutoHideTabBar) != 0)) { dockspace_flags ^= ImGuiDockNodeFlags_AutoHideTabBar; } + if (ImGui::MenuItem("Flag: PassthruCentralNode", "", (dockspace_flags & ImGuiDockNodeFlags_PassthruCentralNode) != 0, opt_fullscreen)) { dockspace_flags ^= ImGuiDockNodeFlags_PassthruCentralNode; } + ImGui::Separator(); + + if (ImGui::MenuItem("Close", NULL, false, p_open != NULL)) + *p_open = false; + ImGui::EndMenu(); + } + HelpMarker( + "When docking is enabled, you can ALWAYS dock MOST window into another! Try it now!" "\n" + "- Drag from window title bar or their tab to dock/undock." "\n" + "- Drag from window menu button (upper-left button) to undock an entire node (all windows)." "\n" + "- Hold SHIFT to disable docking (if io.ConfigDockingWithShift == false, default)" "\n" + "- Hold SHIFT to enable docking (if io.ConfigDockingWithShift == true)" "\n" + "This demo app has nothing to do with enabling docking!" "\n\n" + "This demo app only demonstrate the use of ImGui::DockSpace() which allows you to manually create a docking node _within_ another window." "\n\n" + "Read comments in ShowExampleAppDockSpace() for more details."); + + ImGui::EndMenuBar(); + } + + ImGui::End(); +} + //----------------------------------------------------------------------------- // [SECTION] Example App: Documents Handling / ShowExampleAppDocuments() //----------------------------------------------------------------------------- @@ -4355,101 +10193,143 @@ static void ShowExampleAppCustomRendering(bool* p_open) // Simplified structure to mimic a Document model struct MyDocument { - const char* Name; // Document title - bool Open; // Set when the document is open (in this demo, we keep an array of all available documents to simplify the demo) - bool OpenPrev; // Copy of Open from last update. - bool Dirty; // Set when the document has been modified - bool WantClose; // Set when the document - ImVec4 Color; // An arbitrary variable associated to the document + char Name[32]; // Document title + int UID; // Unique ID (necessary as we can change title) + bool Open; // Set when open (we keep an array of all available documents to simplify demo code!) + bool OpenPrev; // Copy of Open from last update. + bool Dirty; // Set when the document has been modified + ImVec4 Color; // An arbitrary variable associated to the document - MyDocument(const char* name, bool open = true, const ImVec4& color = ImVec4(1.0f,1.0f,1.0f,1.0f)) + MyDocument(int uid, const char* name, bool open = true, const ImVec4& color = ImVec4(1.0f, 1.0f, 1.0f, 1.0f)) { - Name = name; + UID = uid; + snprintf(Name, sizeof(Name), "%s", name); Open = OpenPrev = open; Dirty = false; - WantClose = false; Color = color; } void DoOpen() { Open = true; } - void DoQueueClose() { WantClose = true; } void DoForceClose() { Open = false; Dirty = false; } void DoSave() { Dirty = false; } +}; - // Display dummy contents for the Document - static void DisplayContents(MyDocument* doc) +struct ExampleAppDocuments +{ + ImVector Documents; + ImVector CloseQueue; + MyDocument* RenamingDoc = NULL; + bool RenamingStarted = false; + + ExampleAppDocuments() + { + Documents.push_back(MyDocument(0, "Lettuce", true, ImVec4(0.4f, 0.8f, 0.4f, 1.0f))); + Documents.push_back(MyDocument(1, "Eggplant", true, ImVec4(0.8f, 0.5f, 1.0f, 1.0f))); + Documents.push_back(MyDocument(2, "Carrot", true, ImVec4(1.0f, 0.8f, 0.5f, 1.0f))); + Documents.push_back(MyDocument(3, "Tomato", false, ImVec4(1.0f, 0.3f, 0.4f, 1.0f))); + Documents.push_back(MyDocument(4, "A Rather Long Title", false, ImVec4(0.4f, 0.8f, 0.8f, 1.0f))); + Documents.push_back(MyDocument(5, "Some Document", false, ImVec4(0.8f, 0.8f, 1.0f, 1.0f))); + } + + // As we allow to change document name, we append a never-changing document ID so tabs are stable + void GetTabName(MyDocument* doc, char* out_buf, size_t out_buf_size) + { + snprintf(out_buf, out_buf_size, "%s###doc%d", doc->Name, doc->UID); + } + + // Display placeholder contents for the Document + void DisplayDocContents(MyDocument* doc) { ImGui::PushID(doc); ImGui::Text("Document \"%s\"", doc->Name); ImGui::PushStyleColor(ImGuiCol_Text, doc->Color); ImGui::TextWrapped("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."); ImGui::PopStyleColor(); - if (ImGui::Button("Modify", ImVec2(100, 0))) - doc->Dirty = true; + + ImGui::SetNextItemShortcut(ImGuiMod_Ctrl | ImGuiKey_R, ImGuiInputFlags_Tooltip); + if (ImGui::Button("Rename..")) + { + RenamingDoc = doc; + RenamingStarted = true; + } ImGui::SameLine(); - if (ImGui::Button("Save", ImVec2(100, 0))) + + ImGui::SetNextItemShortcut(ImGuiMod_Ctrl | ImGuiKey_M, ImGuiInputFlags_Tooltip); + if (ImGui::Button("Modify")) + doc->Dirty = true; + + ImGui::SameLine(); + ImGui::SetNextItemShortcut(ImGuiMod_Ctrl | ImGuiKey_S, ImGuiInputFlags_Tooltip); + if (ImGui::Button("Save")) doc->DoSave(); + + ImGui::SameLine(); + ImGui::SetNextItemShortcut(ImGuiMod_Ctrl | ImGuiKey_W, ImGuiInputFlags_Tooltip); + if (ImGui::Button("Close")) + CloseQueue.push_back(doc); ImGui::ColorEdit3("color", &doc->Color.x); // Useful to test drag and drop and hold-dragged-to-open-tab behavior. ImGui::PopID(); } // Display context menu for the Document - static void DisplayContextMenu(MyDocument* doc) + void DisplayDocContextMenu(MyDocument* doc) { if (!ImGui::BeginPopupContextItem()) return; char buf[256]; sprintf(buf, "Save %s", doc->Name); - if (ImGui::MenuItem(buf, "CTRL+S", false, doc->Open)) + if (ImGui::MenuItem(buf, "Ctrl+S", false, doc->Open)) doc->DoSave(); - if (ImGui::MenuItem("Close", "CTRL+W", false, doc->Open)) - doc->DoQueueClose(); + if (ImGui::MenuItem("Rename...", "Ctrl+R", false, doc->Open)) + RenamingDoc = doc; + if (ImGui::MenuItem("Close", "Ctrl+W", false, doc->Open)) + CloseQueue.push_back(doc); ImGui::EndPopup(); } -}; -struct ExampleAppDocuments -{ - ImVector Documents; - - ExampleAppDocuments() + // [Optional] Notify the system of Tabs/Windows closure that happened outside the regular tab interface. + // If a tab has been closed programmatically (aka closed from another source such as the Checkbox() in the demo, + // as opposed to clicking on the regular tab closing button) and stops being submitted, it will take a frame for + // the tab bar to notice its absence. During this frame there will be a gap in the tab bar, and if the tab that has + // disappeared was the selected one, the tab bar will report no selected tab during the frame. This will effectively + // give the impression of a flicker for one frame. + // We call SetTabItemClosed() to manually notify the Tab Bar or Docking system of removed tabs to avoid this glitch. + // Note that this completely optional, and only affect tab bars with the ImGuiTabBarFlags_Reorderable flag. + void NotifyOfDocumentsClosedElsewhere() { - Documents.push_back(MyDocument("Lettuce", true, ImVec4(0.4f, 0.8f, 0.4f, 1.0f))); - Documents.push_back(MyDocument("Eggplant", true, ImVec4(0.8f, 0.5f, 1.0f, 1.0f))); - Documents.push_back(MyDocument("Carrot", true, ImVec4(1.0f, 0.8f, 0.5f, 1.0f))); - Documents.push_back(MyDocument("Tomato", false, ImVec4(1.0f, 0.3f, 0.4f, 1.0f))); - Documents.push_back(MyDocument("A Rather Long Title", false)); - Documents.push_back(MyDocument("Some Document", false)); + for (MyDocument& doc : Documents) + { + if (!doc.Open && doc.OpenPrev) + ImGui::SetTabItemClosed(doc.Name); + doc.OpenPrev = doc.Open; + } } }; -// [Optional] Notify the system of Tabs/Windows closure that happened outside the regular tab interface. -// If a tab has been closed programmatically (aka closed from another source such as the Checkbox() in the demo, as opposed -// to clicking on the regular tab closing button) and stops being submitted, it will take a frame for the tab bar to notice its absence. -// During this frame there will be a gap in the tab bar, and if the tab that has disappeared was the selected one, the tab bar -// will report no selected tab during the frame. This will effectively give the impression of a flicker for one frame. -// We call SetTabItemClosed() to manually notify the Tab Bar or Docking system of removed tabs to avoid this glitch. -// Note that this completely optional, and only affect tab bars with the ImGuiTabBarFlags_Reorderable flag. -static void NotifyOfDocumentsClosedElsewhere(ExampleAppDocuments& app) -{ - for (int doc_n = 0; doc_n < app.Documents.Size; doc_n++) - { - MyDocument* doc = &app.Documents[doc_n]; - if (!doc->Open && doc->OpenPrev) - ImGui::SetTabItemClosed(doc->Name); - doc->OpenPrev = doc->Open; - } -} - void ShowExampleAppDocuments(bool* p_open) { static ExampleAppDocuments app; // Options + enum Target + { + Target_None, + Target_Tab, // Create documents as local tab into a local tab bar + Target_DockSpaceAndWindow // Create documents as regular windows, and create an embedded dockspace + }; + static Target opt_target = Target_Tab; static bool opt_reorderable = true; static ImGuiTabBarFlags opt_fitting_flags = ImGuiTabBarFlags_FittingPolicyDefault_; - if (!ImGui::Begin("Example: Documents", p_open, ImGuiWindowFlags_MenuBar)) + // When (opt_target == Target_DockSpaceAndWindow) there is the possibily that one of our child Document window (e.g. "Eggplant") + // that we emit gets docked into the same spot as the parent window ("Example: Documents"). + // This would create a problematic feedback loop because selecting the "Eggplant" tab would make the "Example: Documents" tab + // not visible, which in turn would stop submitting the "Eggplant" window. + // We avoid this problem by submitting our documents window even if our parent window is not currently visible. + // Another solution may be to make the "Example: Documents" window use the ImGuiWindowFlags_NoDocking. + + bool window_contents_visible = ImGui::Begin("Example: Documents", p_open, ImGuiWindowFlags_MenuBar); + if (!window_contents_visible && opt_target != Target_DockSpaceAndWindow) { ImGui::End(); return; @@ -4461,24 +10341,21 @@ void ShowExampleAppDocuments(bool* p_open) if (ImGui::BeginMenu("File")) { int open_count = 0; - for (int doc_n = 0; doc_n < app.Documents.Size; doc_n++) - open_count += app.Documents[doc_n].Open ? 1 : 0; + for (MyDocument& doc : app.Documents) + open_count += doc.Open ? 1 : 0; if (ImGui::BeginMenu("Open", open_count < app.Documents.Size)) { - for (int doc_n = 0; doc_n < app.Documents.Size; doc_n++) - { - MyDocument* doc = &app.Documents[doc_n]; - if (!doc->Open) - if (ImGui::MenuItem(doc->Name)) - doc->DoOpen(); - } + for (MyDocument& doc : app.Documents) + if (!doc.Open && ImGui::MenuItem(doc.Name)) + doc.DoOpen(); ImGui::EndMenu(); } if (ImGui::MenuItem("Close All Documents", NULL, false, open_count > 0)) - for (int doc_n = 0; doc_n < app.Documents.Size; doc_n++) - app.Documents[doc_n].DoQueueClose(); - if (ImGui::MenuItem("Exit", "Alt+F4")) {} + for (MyDocument& doc : app.Documents) + app.CloseQueue.push_back(&doc); + if (ImGui::MenuItem("Exit") && p_open) + *p_open = false; ImGui::EndMenu(); } ImGui::EndMenuBar(); @@ -4487,51 +10364,71 @@ void ShowExampleAppDocuments(bool* p_open) // [Debug] List documents with one checkbox for each for (int doc_n = 0; doc_n < app.Documents.Size; doc_n++) { - MyDocument* doc = &app.Documents[doc_n]; + MyDocument& doc = app.Documents[doc_n]; if (doc_n > 0) ImGui::SameLine(); - ImGui::PushID(doc); - if (ImGui::Checkbox(doc->Name, &doc->Open)) - if (!doc->Open) - doc->DoForceClose(); + ImGui::PushID(&doc); + if (ImGui::Checkbox(doc.Name, &doc.Open)) + if (!doc.Open) + doc.DoForceClose(); ImGui::PopID(); } + ImGui::PushItemWidth(ImGui::GetFontSize() * 12); + ImGui::Combo("Output", (int*)&opt_target, "None\0TabBar+Tabs\0DockSpace+Window\0"); + ImGui::PopItemWidth(); + bool redock_all = false; + if (opt_target == Target_Tab) { ImGui::SameLine(); ImGui::Checkbox("Reorderable Tabs", &opt_reorderable); } + if (opt_target == Target_DockSpaceAndWindow) { ImGui::SameLine(); redock_all = ImGui::Button("Redock all"); } ImGui::Separator(); - // Submit Tab Bar and Tabs + // About the ImGuiWindowFlags_UnsavedDocument / ImGuiTabItemFlags_UnsavedDocument flags. + // They have multiple effects: + // - Display a dot next to the title. + // - Tab is selected when clicking the X close button. + // - Closure is not assumed (will wait for user to stop submitting the tab). + // Otherwise closure is assumed when pressing the X, so if you keep submitting the tab may reappear at end of tab bar. + // We need to assume closure by default otherwise waiting for "lack of submission" on the next frame would leave an empty + // hole for one-frame, both in the tab-bar and in tab-contents when closing a tab/window. + // The rarely used SetTabItemClosed() function is a way to notify of programmatic closure to avoid the one-frame hole. + + // Tabs + if (opt_target == Target_Tab) { ImGuiTabBarFlags tab_bar_flags = (opt_fitting_flags) | (opt_reorderable ? ImGuiTabBarFlags_Reorderable : 0); + tab_bar_flags |= ImGuiTabBarFlags_DrawSelectedOverline; if (ImGui::BeginTabBar("##tabs", tab_bar_flags)) { if (opt_reorderable) - NotifyOfDocumentsClosedElsewhere(app); + app.NotifyOfDocumentsClosedElsewhere(); // [DEBUG] Stress tests //if ((ImGui::GetFrameCount() % 30) == 0) docs[1].Open ^= 1; // [DEBUG] Automatically show/hide a tab. Test various interactions e.g. dragging with this on. //if (ImGui::GetIO().KeyCtrl) ImGui::SetTabItemSelected(docs[1].Name); // [DEBUG] Test SetTabItemSelected(), probably not very useful as-is anyway.. // Submit Tabs - for (int doc_n = 0; doc_n < app.Documents.Size; doc_n++) + for (MyDocument& doc : app.Documents) { - MyDocument* doc = &app.Documents[doc_n]; - if (!doc->Open) + if (!doc.Open) continue; - ImGuiTabItemFlags tab_flags = (doc->Dirty ? ImGuiTabItemFlags_UnsavedDocument : 0); - bool visible = ImGui::BeginTabItem(doc->Name, &doc->Open, tab_flags); + // As we allow to change document name, we append a never-changing document id so tabs are stable + char doc_name_buf[64]; + app.GetTabName(&doc, doc_name_buf, sizeof(doc_name_buf)); + ImGuiTabItemFlags tab_flags = (doc.Dirty ? ImGuiTabItemFlags_UnsavedDocument : 0); + bool visible = ImGui::BeginTabItem(doc_name_buf, &doc.Open, tab_flags); // Cancel attempt to close when unsaved add to save queue so we can display a popup. - if (!doc->Open && doc->Dirty) + if (!doc.Open && doc.Dirty) { - doc->Open = true; - doc->DoQueueClose(); + doc.Open = true; + app.CloseQueue.push_back(&doc); } - MyDocument::DisplayContextMenu(doc); + app.DisplayDocContextMenu(&doc); if (visible) { - MyDocument::DisplayContents(doc); + app.DisplayDocContents(&doc); ImGui::EndTabItem(); } } @@ -4539,77 +10436,131 @@ void ShowExampleAppDocuments(bool* p_open) ImGui::EndTabBar(); } } - - // Update closing queue - static ImVector close_queue; - if (close_queue.empty()) + else if (opt_target == Target_DockSpaceAndWindow) { - // Close queue is locked once we started a popup - for (int doc_n = 0; doc_n < app.Documents.Size; doc_n++) + if (ImGui::GetIO().ConfigFlags & ImGuiConfigFlags_DockingEnable) { - MyDocument* doc = &app.Documents[doc_n]; - if (doc->WantClose) + app.NotifyOfDocumentsClosedElsewhere(); + + // Create a DockSpace node where any window can be docked + ImGuiID dockspace_id = ImGui::GetID("MyDockSpace"); + ImGui::DockSpace(dockspace_id); + + // Create Windows + for (int doc_n = 0; doc_n < app.Documents.Size; doc_n++) { - doc->WantClose = false; - close_queue.push_back(doc); + MyDocument* doc = &app.Documents[doc_n]; + if (!doc->Open) + continue; + + ImGui::SetNextWindowDockID(dockspace_id, redock_all ? ImGuiCond_Always : ImGuiCond_FirstUseEver); + ImGuiWindowFlags window_flags = (doc->Dirty ? ImGuiWindowFlags_UnsavedDocument : 0); + bool visible = ImGui::Begin(doc->Name, &doc->Open, window_flags); + + // Cancel attempt to close when unsaved add to save queue so we can display a popup. + if (!doc->Open && doc->Dirty) + { + doc->Open = true; + app.CloseQueue.push_back(doc); + } + + app.DisplayDocContextMenu(doc); + if (visible) + app.DisplayDocContents(doc); + + ImGui::End(); } } + else + { + ShowDockingDisabledMessage(); + } + } + + // Early out other contents + if (!window_contents_visible) + { + ImGui::End(); + return; + } + + // Display renaming UI + if (app.RenamingDoc != NULL) + { + if (app.RenamingStarted) + ImGui::OpenPopup("Rename"); + if (ImGui::BeginPopup("Rename")) + { + ImGui::SetNextItemWidth(ImGui::GetFontSize() * 30); + if (ImGui::InputText("###Name", app.RenamingDoc->Name, IM_ARRAYSIZE(app.RenamingDoc->Name), ImGuiInputTextFlags_EnterReturnsTrue)) + { + ImGui::CloseCurrentPopup(); + app.RenamingDoc = NULL; + } + if (app.RenamingStarted) + ImGui::SetKeyboardFocusHere(-1); + ImGui::EndPopup(); + } + else + { + app.RenamingDoc = NULL; + } + app.RenamingStarted = false; } // Display closing confirmation UI - if (!close_queue.empty()) + if (!app.CloseQueue.empty()) { int close_queue_unsaved_documents = 0; - for (int n = 0; n < close_queue.Size; n++) - if (close_queue[n]->Dirty) + for (int n = 0; n < app.CloseQueue.Size; n++) + if (app.CloseQueue[n]->Dirty) close_queue_unsaved_documents++; if (close_queue_unsaved_documents == 0) { // Close documents when all are unsaved - for (int n = 0; n < close_queue.Size; n++) - close_queue[n]->DoForceClose(); - close_queue.clear(); + for (int n = 0; n < app.CloseQueue.Size; n++) + app.CloseQueue[n]->DoForceClose(); + app.CloseQueue.clear(); } else { if (!ImGui::IsPopupOpen("Save?")) ImGui::OpenPopup("Save?"); - if (ImGui::BeginPopupModal("Save?")) + if (ImGui::BeginPopupModal("Save?", NULL, ImGuiWindowFlags_AlwaysAutoResize)) { ImGui::Text("Save change to the following items?"); - ImGui::SetNextItemWidth(-1.0f); - if (ImGui::ListBoxHeader("##", close_queue_unsaved_documents, 6)) - { - for (int n = 0; n < close_queue.Size; n++) - if (close_queue[n]->Dirty) - ImGui::Text("%s", close_queue[n]->Name); - ImGui::ListBoxFooter(); - } + float item_height = ImGui::GetTextLineHeightWithSpacing(); + if (ImGui::BeginChild(ImGui::GetID("frame"), ImVec2(-FLT_MIN, 6.25f * item_height), ImGuiChildFlags_FrameStyle)) + for (MyDocument* doc : app.CloseQueue) + if (doc->Dirty) + ImGui::Text("%s", doc->Name); + ImGui::EndChild(); - if (ImGui::Button("Yes", ImVec2(80, 0))) + ImVec2 button_size(ImGui::GetFontSize() * 7.0f, 0.0f); + if (ImGui::Button("Yes", button_size)) { - for (int n = 0; n < close_queue.Size; n++) + for (MyDocument* doc : app.CloseQueue) { - if (close_queue[n]->Dirty) - close_queue[n]->DoSave(); - close_queue[n]->DoForceClose(); + if (doc->Dirty) + doc->DoSave(); + doc->DoForceClose(); } - close_queue.clear(); + app.CloseQueue.clear(); ImGui::CloseCurrentPopup(); } ImGui::SameLine(); - if (ImGui::Button("No", ImVec2(80, 0))) + if (ImGui::Button("No", button_size)) { - for (int n = 0; n < close_queue.Size; n++) - close_queue[n]->DoForceClose(); - close_queue.clear(); + for (MyDocument* doc : app.CloseQueue) + doc->DoForceClose(); + app.CloseQueue.clear(); ImGui::CloseCurrentPopup(); } ImGui::SameLine(); - if (ImGui::Button("Cancel", ImVec2(80, 0))) + if (ImGui::Button("Cancel", button_size)) { - close_queue.clear(); + app.CloseQueue.clear(); ImGui::CloseCurrentPopup(); } ImGui::EndPopup(); @@ -4620,6 +10571,404 @@ void ShowExampleAppDocuments(bool* p_open) ImGui::End(); } +//----------------------------------------------------------------------------- +// [SECTION] Example App: Assets Browser / ShowExampleAppAssetsBrowser() +//----------------------------------------------------------------------------- + +//#include "imgui_internal.h" // NavMoveRequestTryWrapping() + +struct ExampleAsset +{ + ImGuiID ID; + int Type; + + ExampleAsset(ImGuiID id, int type) { ID = id; Type = type; } + + static const ImGuiTableSortSpecs* s_current_sort_specs; + + static void SortWithSortSpecs(ImGuiTableSortSpecs* sort_specs, ExampleAsset* items, int items_count) + { + s_current_sort_specs = sort_specs; // Store in variable accessible by the sort function. + if (items_count > 1) + qsort(items, (size_t)items_count, sizeof(items[0]), ExampleAsset::CompareWithSortSpecs); + s_current_sort_specs = NULL; + } + + // Compare function to be used by qsort() + static int IMGUI_CDECL CompareWithSortSpecs(const void* lhs, const void* rhs) + { + const ExampleAsset* a = (const ExampleAsset*)lhs; + const ExampleAsset* b = (const ExampleAsset*)rhs; + for (int n = 0; n < s_current_sort_specs->SpecsCount; n++) + { + const ImGuiTableColumnSortSpecs* sort_spec = &s_current_sort_specs->Specs[n]; + int delta = 0; + if (sort_spec->ColumnIndex == 0) + delta = ((int)a->ID - (int)b->ID); + else if (sort_spec->ColumnIndex == 1) + delta = (a->Type - b->Type); + if (delta > 0) + return (sort_spec->SortDirection == ImGuiSortDirection_Ascending) ? +1 : -1; + if (delta < 0) + return (sort_spec->SortDirection == ImGuiSortDirection_Ascending) ? -1 : +1; + } + return ((int)a->ID - (int)b->ID); + } +}; +const ImGuiTableSortSpecs* ExampleAsset::s_current_sort_specs = NULL; + +struct ExampleAssetsBrowser +{ + // Options + bool ShowTypeOverlay = true; + bool AllowSorting = true; + bool AllowDragUnselected = false; + bool AllowBoxSelect = true; + float IconSize = 32.0f; + int IconSpacing = 10; + int IconHitSpacing = 4; // Increase hit-spacing if you want to make it possible to clear or box-select from gaps. Some spacing is required to able to amend with Shift+box-select. Value is small in Explorer. + bool StretchSpacing = true; + + // State + ImVector Items; // Our items + ExampleSelectionWithDeletion Selection; // Our selection (ImGuiSelectionBasicStorage + helper funcs to handle deletion) + ImGuiID NextItemId = 0; // Unique identifier when creating new items + bool RequestDelete = false; // Deferred deletion request + bool RequestSort = false; // Deferred sort request + float ZoomWheelAccum = 0.0f; // Mouse wheel accumulator to handle smooth wheels better + + // Calculated sizes for layout, output of UpdateLayoutSizes(). Could be locals but our code is simpler this way. + ImVec2 LayoutItemSize; + ImVec2 LayoutItemStep; // == LayoutItemSize + LayoutItemSpacing + float LayoutItemSpacing = 0.0f; + float LayoutSelectableSpacing = 0.0f; + float LayoutOuterPadding = 0.0f; + int LayoutColumnCount = 0; + int LayoutLineCount = 0; + + // Functions + ExampleAssetsBrowser() + { + AddItems(10000); + } + void AddItems(int count) + { + if (Items.Size == 0) + NextItemId = 0; + Items.reserve(Items.Size + count); + for (int n = 0; n < count; n++, NextItemId++) + Items.push_back(ExampleAsset(NextItemId, (NextItemId % 20) < 15 ? 0 : (NextItemId % 20) < 18 ? 1 : 2)); + RequestSort = true; + } + void ClearItems() + { + Items.clear(); + Selection.Clear(); + } + + // Logic would be written in the main code BeginChild() and outputing to local variables. + // We extracted it into a function so we can call it easily from multiple places. + void UpdateLayoutSizes(float avail_width) + { + // Layout: when not stretching: allow extending into right-most spacing. + LayoutItemSpacing = (float)IconSpacing; + if (StretchSpacing == false) + avail_width += floorf(LayoutItemSpacing * 0.5f); + + // Layout: calculate number of icon per line and number of lines + LayoutItemSize = ImVec2(floorf(IconSize), floorf(IconSize)); + LayoutColumnCount = IM_MAX((int)(avail_width / (LayoutItemSize.x + LayoutItemSpacing)), 1); + LayoutLineCount = (Items.Size + LayoutColumnCount - 1) / LayoutColumnCount; + + // Layout: when stretching: allocate remaining space to more spacing. Round before division, so item_spacing may be non-integer. + if (StretchSpacing && LayoutColumnCount > 1) + LayoutItemSpacing = floorf(avail_width - LayoutItemSize.x * LayoutColumnCount) / LayoutColumnCount; + + LayoutItemStep = ImVec2(LayoutItemSize.x + LayoutItemSpacing, LayoutItemSize.y + LayoutItemSpacing); + LayoutSelectableSpacing = IM_MAX(floorf(LayoutItemSpacing) - IconHitSpacing, 0.0f); + LayoutOuterPadding = floorf(LayoutItemSpacing * 0.5f); + } + + void Draw(const char* title, bool* p_open) + { + ImGui::SetNextWindowSize(ImVec2(IconSize * 25, IconSize * 15), ImGuiCond_FirstUseEver); + if (!ImGui::Begin(title, p_open, ImGuiWindowFlags_MenuBar)) + { + ImGui::End(); + return; + } + + // Menu bar + if (ImGui::BeginMenuBar()) + { + if (ImGui::BeginMenu("File")) + { + if (ImGui::MenuItem("Add 10000 items")) + AddItems(10000); + if (ImGui::MenuItem("Clear items")) + ClearItems(); + ImGui::Separator(); + if (ImGui::MenuItem("Close", NULL, false, p_open != NULL)) + *p_open = false; + ImGui::EndMenu(); + } + if (ImGui::BeginMenu("Edit")) + { + if (ImGui::MenuItem("Delete", "Del", false, Selection.Size > 0)) + RequestDelete = true; + ImGui::EndMenu(); + } + if (ImGui::BeginMenu("Options")) + { + ImGui::PushItemWidth(ImGui::GetFontSize() * 10); + + ImGui::SeparatorText("Contents"); + ImGui::Checkbox("Show Type Overlay", &ShowTypeOverlay); + ImGui::Checkbox("Allow Sorting", &AllowSorting); + + ImGui::SeparatorText("Selection Behavior"); + ImGui::Checkbox("Allow dragging unselected item", &AllowDragUnselected); + ImGui::Checkbox("Allow box-selection", &AllowBoxSelect); + + ImGui::SeparatorText("Layout"); + ImGui::SliderFloat("Icon Size", &IconSize, 16.0f, 128.0f, "%.0f"); + ImGui::SameLine(); HelpMarker("Use CTRL+Wheel to zoom"); + ImGui::SliderInt("Icon Spacing", &IconSpacing, 0, 32); + ImGui::SliderInt("Icon Hit Spacing", &IconHitSpacing, 0, 32); + ImGui::Checkbox("Stretch Spacing", &StretchSpacing); + ImGui::PopItemWidth(); + ImGui::EndMenu(); + } + ImGui::EndMenuBar(); + } + + // Show a table with ONLY one header row to showcase the idea/possibility of using this to provide a sorting UI + if (AllowSorting) + { + ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0, 0)); + ImGuiTableFlags table_flags_for_sort_specs = ImGuiTableFlags_Sortable | ImGuiTableFlags_SortMulti | ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_Borders; + if (ImGui::BeginTable("for_sort_specs_only", 2, table_flags_for_sort_specs, ImVec2(0.0f, ImGui::GetFrameHeight()))) + { + ImGui::TableSetupColumn("Index"); + ImGui::TableSetupColumn("Type"); + ImGui::TableHeadersRow(); + if (ImGuiTableSortSpecs* sort_specs = ImGui::TableGetSortSpecs()) + if (sort_specs->SpecsDirty || RequestSort) + { + ExampleAsset::SortWithSortSpecs(sort_specs, Items.Data, Items.Size); + sort_specs->SpecsDirty = RequestSort = false; + } + ImGui::EndTable(); + } + ImGui::PopStyleVar(); + } + + ImGuiIO& io = ImGui::GetIO(); + ImGui::SetNextWindowContentSize(ImVec2(0.0f, LayoutOuterPadding + LayoutLineCount * (LayoutItemSize.y + LayoutItemSpacing))); + if (ImGui::BeginChild("Assets", ImVec2(0.0f, -ImGui::GetTextLineHeightWithSpacing()), ImGuiChildFlags_Borders, ImGuiWindowFlags_NoMove)) + { + ImDrawList* draw_list = ImGui::GetWindowDrawList(); + + const float avail_width = ImGui::GetContentRegionAvail().x; + UpdateLayoutSizes(avail_width); + + // Calculate and store start position. + ImVec2 start_pos = ImGui::GetCursorScreenPos(); + start_pos = ImVec2(start_pos.x + LayoutOuterPadding, start_pos.y + LayoutOuterPadding); + ImGui::SetCursorScreenPos(start_pos); + + // Multi-select + ImGuiMultiSelectFlags ms_flags = ImGuiMultiSelectFlags_ClearOnEscape | ImGuiMultiSelectFlags_ClearOnClickVoid; + + // - Enable box-select (in 2D mode, so that changing box-select rectangle X1/X2 boundaries will affect clipped items) + if (AllowBoxSelect) + ms_flags |= ImGuiMultiSelectFlags_BoxSelect2d; + + // - This feature allows dragging an unselected item without selecting it (rarely used) + if (AllowDragUnselected) + ms_flags |= ImGuiMultiSelectFlags_SelectOnClickRelease; + + // - Enable keyboard wrapping on X axis + // (FIXME-MULTISELECT: We haven't designed/exposed a general nav wrapping api yet, so this flag is provided as a courtesy to avoid doing: + // ImGui::NavMoveRequestTryWrapping(ImGui::GetCurrentWindow(), ImGuiNavMoveFlags_WrapX); + // When we finish implementing a more general API for this, we will obsolete this flag in favor of the new system) + ms_flags |= ImGuiMultiSelectFlags_NavWrapX; + + ImGuiMultiSelectIO* ms_io = ImGui::BeginMultiSelect(ms_flags, Selection.Size, Items.Size); + + // Use custom selection adapter: store ID in selection (recommended) + Selection.UserData = this; + Selection.AdapterIndexToStorageId = [](ImGuiSelectionBasicStorage* self_, int idx) { ExampleAssetsBrowser* self = (ExampleAssetsBrowser*)self_->UserData; return self->Items[idx].ID; }; + Selection.ApplyRequests(ms_io); + + const bool want_delete = (ImGui::Shortcut(ImGuiKey_Delete, ImGuiInputFlags_Repeat) && (Selection.Size > 0)) || RequestDelete; + const int item_curr_idx_to_focus = want_delete ? Selection.ApplyDeletionPreLoop(ms_io, Items.Size) : -1; + RequestDelete = false; + + // Push LayoutSelectableSpacing (which is LayoutItemSpacing minus hit-spacing, if we decide to have hit gaps between items) + // Altering style ItemSpacing may seem unnecessary as we position every items using SetCursorScreenPos()... + // But it is necessary for two reasons: + // - Selectables uses it by default to visually fill the space between two items. + // - The vertical spacing would be measured by Clipper to calculate line height if we didn't provide it explicitly (here we do). + ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(LayoutSelectableSpacing, LayoutSelectableSpacing)); + + // Rendering parameters + const ImU32 icon_type_overlay_colors[3] = { 0, IM_COL32(200, 70, 70, 255), IM_COL32(70, 170, 70, 255) }; + const ImU32 icon_bg_color = ImGui::GetColorU32(IM_COL32(35, 35, 35, 220)); + const ImVec2 icon_type_overlay_size = ImVec2(4.0f, 4.0f); + const bool display_label = (LayoutItemSize.x >= ImGui::CalcTextSize("999").x); + + const int column_count = LayoutColumnCount; + ImGuiListClipper clipper; + clipper.Begin(LayoutLineCount, LayoutItemStep.y); + if (item_curr_idx_to_focus != -1) + clipper.IncludeItemByIndex(item_curr_idx_to_focus / column_count); // Ensure focused item line is not clipped. + if (ms_io->RangeSrcItem != -1) + clipper.IncludeItemByIndex((int)ms_io->RangeSrcItem / column_count); // Ensure RangeSrc item line is not clipped. + while (clipper.Step()) + { + for (int line_idx = clipper.DisplayStart; line_idx < clipper.DisplayEnd; line_idx++) + { + const int item_min_idx_for_current_line = line_idx * column_count; + const int item_max_idx_for_current_line = IM_MIN((line_idx + 1) * column_count, Items.Size); + for (int item_idx = item_min_idx_for_current_line; item_idx < item_max_idx_for_current_line; ++item_idx) + { + ExampleAsset* item_data = &Items[item_idx]; + ImGui::PushID((int)item_data->ID); + + // Position item + ImVec2 pos = ImVec2(start_pos.x + (item_idx % column_count) * LayoutItemStep.x, start_pos.y + line_idx * LayoutItemStep.y); + ImGui::SetCursorScreenPos(pos); + + ImGui::SetNextItemSelectionUserData(item_idx); + bool item_is_selected = Selection.Contains((ImGuiID)item_data->ID); + bool item_is_visible = ImGui::IsRectVisible(LayoutItemSize); + ImGui::Selectable("", item_is_selected, ImGuiSelectableFlags_None, LayoutItemSize); + + // Update our selection state immediately (without waiting for EndMultiSelect() requests) + // because we use this to alter the color of our text/icon. + if (ImGui::IsItemToggledSelection()) + item_is_selected = !item_is_selected; + + // Focus (for after deletion) + if (item_curr_idx_to_focus == item_idx) + ImGui::SetKeyboardFocusHere(-1); + + // Drag and drop + if (ImGui::BeginDragDropSource()) + { + // Create payload with full selection OR single unselected item. + // (the later is only possible when using ImGuiMultiSelectFlags_SelectOnClickRelease) + if (ImGui::GetDragDropPayload() == NULL) + { + ImVector payload_items; + void* it = NULL; + ImGuiID id = 0; + if (!item_is_selected) + payload_items.push_back(item_data->ID); + else + while (Selection.GetNextSelectedItem(&it, &id)) + payload_items.push_back(id); + ImGui::SetDragDropPayload("ASSETS_BROWSER_ITEMS", payload_items.Data, (size_t)payload_items.size_in_bytes()); + } + + // Display payload content in tooltip, by extracting it from the payload data + // (we could read from selection, but it is more correct and reusable to read from payload) + const ImGuiPayload* payload = ImGui::GetDragDropPayload(); + const int payload_count = (int)payload->DataSize / (int)sizeof(ImGuiID); + ImGui::Text("%d assets", payload_count); + + ImGui::EndDragDropSource(); + } + + // Render icon (a real app would likely display an image/thumbnail here) + // Because we use ImGuiMultiSelectFlags_BoxSelect2d, clipping vertical may occasionally be larger, so we coarse-clip our rendering as well. + if (item_is_visible) + { + ImVec2 box_min(pos.x - 1, pos.y - 1); + ImVec2 box_max(box_min.x + LayoutItemSize.x + 2, box_min.y + LayoutItemSize.y + 2); // Dubious + draw_list->AddRectFilled(box_min, box_max, icon_bg_color); // Background color + if (ShowTypeOverlay && item_data->Type != 0) + { + ImU32 type_col = icon_type_overlay_colors[item_data->Type % IM_ARRAYSIZE(icon_type_overlay_colors)]; + draw_list->AddRectFilled(ImVec2(box_max.x - 2 - icon_type_overlay_size.x, box_min.y + 2), ImVec2(box_max.x - 2, box_min.y + 2 + icon_type_overlay_size.y), type_col); + } + if (display_label) + { + ImU32 label_col = ImGui::GetColorU32(item_is_selected ? ImGuiCol_Text : ImGuiCol_TextDisabled); + char label[32]; + sprintf(label, "%d", item_data->ID); + draw_list->AddText(ImVec2(box_min.x, box_max.y - ImGui::GetFontSize()), label_col, label); + } + } + + ImGui::PopID(); + } + } + } + clipper.End(); + ImGui::PopStyleVar(); // ImGuiStyleVar_ItemSpacing + + // Context menu + if (ImGui::BeginPopupContextWindow()) + { + ImGui::Text("Selection: %d items", Selection.Size); + ImGui::Separator(); + if (ImGui::MenuItem("Delete", "Del", false, Selection.Size > 0)) + RequestDelete = true; + ImGui::EndPopup(); + } + + ms_io = ImGui::EndMultiSelect(); + Selection.ApplyRequests(ms_io); + if (want_delete) + Selection.ApplyDeletionPostLoop(ms_io, Items, item_curr_idx_to_focus); + + // Zooming with CTRL+Wheel + if (ImGui::IsWindowAppearing()) + ZoomWheelAccum = 0.0f; + if (ImGui::IsWindowHovered() && io.MouseWheel != 0.0f && ImGui::IsKeyDown(ImGuiMod_Ctrl) && ImGui::IsAnyItemActive() == false) + { + ZoomWheelAccum += io.MouseWheel; + if (fabsf(ZoomWheelAccum) >= 1.0f) + { + // Calculate hovered item index from mouse location + // FIXME: Locking aiming on 'hovered_item_idx' (with a cool-down timer) would ensure zoom keeps on it. + const float hovered_item_nx = (io.MousePos.x - start_pos.x + LayoutItemSpacing * 0.5f) / LayoutItemStep.x; + const float hovered_item_ny = (io.MousePos.y - start_pos.y + LayoutItemSpacing * 0.5f) / LayoutItemStep.y; + const int hovered_item_idx = ((int)hovered_item_ny * LayoutColumnCount) + (int)hovered_item_nx; + //ImGui::SetTooltip("%f,%f -> item %d", hovered_item_nx, hovered_item_ny, hovered_item_idx); // Move those 4 lines in block above for easy debugging + + // Zoom + IconSize *= powf(1.1f, (float)(int)ZoomWheelAccum); + IconSize = IM_CLAMP(IconSize, 16.0f, 128.0f); + ZoomWheelAccum -= (int)ZoomWheelAccum; + UpdateLayoutSizes(avail_width); + + // Manipulate scroll to that we will land at the same Y location of currently hovered item. + // - Calculate next frame position of item under mouse + // - Set new scroll position to be used in next ImGui::BeginChild() call. + float hovered_item_rel_pos_y = ((float)(hovered_item_idx / LayoutColumnCount) + fmodf(hovered_item_ny, 1.0f)) * LayoutItemStep.y; + hovered_item_rel_pos_y += ImGui::GetStyle().WindowPadding.y; + float mouse_local_y = io.MousePos.y - ImGui::GetWindowPos().y; + ImGui::SetScrollY(hovered_item_rel_pos_y - mouse_local_y); + } + } + } + ImGui::EndChild(); + + ImGui::Text("Selected: %d/%d items", Selection.Size, Items.Size); + ImGui::End(); + } +}; + +void ShowExampleAppAssetsBrowser(bool* p_open) +{ + IMGUI_DEMO_MARKER("Examples/Assets Browser"); + static ExampleAssetsBrowser assets_browser; + assets_browser.Draw("Example: Assets Browser", p_open); +} + // End of Demo code #else @@ -4627,5 +10976,9 @@ void ImGui::ShowAboutWindow(bool*) {} void ImGui::ShowDemoWindow(bool*) {} void ImGui::ShowUserGuide() {} void ImGui::ShowStyleEditor(ImGuiStyle*) {} +bool ImGui::ShowStyleSelector(const char* label) { return false; } +void ImGui::ShowFontSelector(const char* label) {} #endif + +#endif // #ifndef IMGUI_DISABLE diff --git a/imgui/imgui_draw.cpp b/imgui/imgui_draw.cpp index 845cd04e8..7c4eaa4b3 100644 --- a/imgui/imgui_draw.cpp +++ b/imgui/imgui_draw.cpp @@ -1,4 +1,4 @@ -// dear imgui, v1.73 +// dear imgui, v1.91.9b // (drawing and font code) /* @@ -8,15 +8,16 @@ Index of this file: // [SECTION] STB libraries implementation // [SECTION] Style functions // [SECTION] ImDrawList +// [SECTION] ImTriangulator, ImDrawList concave polygon fill // [SECTION] ImDrawListSplitter // [SECTION] ImDrawData // [SECTION] Helpers ShadeVertsXXX functions // [SECTION] ImFontConfig // [SECTION] ImFontAtlas -// [SECTION] ImFontAtlas glyph ranges helpers +// [SECTION] ImFontAtlas: glyph ranges helpers // [SECTION] ImFontGlyphRangesBuilder // [SECTION] ImFont -// [SECTION] Internal Render Helpers +// [SECTION] ImGui Internal Render Helpers // [SECTION] Decompression code // [SECTION] Default font data (ProggyClean.ttf) @@ -26,62 +27,62 @@ Index of this file: #define _CRT_SECURE_NO_WARNINGS #endif -#include "imgui.h" #ifndef IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS #endif + +#include "imgui.h" +#ifndef IMGUI_DISABLE #include "imgui_internal.h" +#ifdef IMGUI_ENABLE_FREETYPE +#include "misc/freetype/imgui_freetype.h" +#endif #include // vsnprintf, sscanf, printf -#if !defined(alloca) -#if defined(__GLIBC__) || defined(__sun) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__SWITCH__) -#include // alloca (glibc uses . Note that Cygwin may have _WIN32 defined, so the order matters here) -#elif defined(_WIN32) -#include // alloca -#if !defined(alloca) -#define alloca _alloca // for clang with MS Codegen -#endif -#else -#include // alloca -#endif -#endif // Visual Studio warnings #ifdef _MSC_VER -#pragma warning (disable: 4127) // condition expression is constant -#pragma warning (disable: 4505) // unreferenced local function has been removed (stb stuff) -#pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen +#pragma warning (disable: 4127) // condition expression is constant +#pragma warning (disable: 4505) // unreferenced local function has been removed (stb stuff) +#pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen +#pragma warning (disable: 26451) // [Static Analyzer] Arithmetic overflow : Using operator 'xxx' on a 4 byte value and then casting the result to a 8 byte value. Cast the value to the wider type before calling operator 'xxx' to avoid overflow(io.2). +#pragma warning (disable: 26812) // [Static Analyzer] The enum type 'xxx' is unscoped. Prefer 'enum class' over 'enum' (Enum.3). [MSVC Static Analyzer) #endif // Clang/GCC warnings with -Weverything #if defined(__clang__) -#pragma clang diagnostic ignored "-Wold-style-cast" // warning : use of old-style cast // yes, they are more terse. -#pragma clang diagnostic ignored "-Wfloat-equal" // warning : comparing floating point with == or != is unsafe // storing and comparing against same constants ok. -#pragma clang diagnostic ignored "-Wglobal-constructors" // warning : declaration requires a global destructor // similar to above, not sure what the exact difference is. -#pragma clang diagnostic ignored "-Wsign-conversion" // warning : implicit conversion changes signedness // -#if __has_warning("-Wzero-as-null-pointer-constant") -#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" // warning : zero as null pointer constant // some standard header variations use #define NULL 0 -#endif -#if __has_warning("-Wcomma") -#pragma clang diagnostic ignored "-Wcomma" // warning : possible misuse of comma operator here // -#endif -#if __has_warning("-Wreserved-id-macro") -#pragma clang diagnostic ignored "-Wreserved-id-macro" // warning : macro name is a reserved identifier // -#endif -#if __has_warning("-Wdouble-promotion") -#pragma clang diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function // using printf() is a misery with this as C++ va_arg ellipsis changes float to double. +#if __has_warning("-Wunknown-warning-option") +#pragma clang diagnostic ignored "-Wunknown-warning-option" // warning: unknown warning group 'xxx' // not all warnings are known by all Clang versions and they tend to be rename-happy.. so ignoring warnings triggers new warnings on some configuration. Great! #endif +#pragma clang diagnostic ignored "-Wunknown-pragmas" // warning: unknown warning group 'xxx' +#pragma clang diagnostic ignored "-Wold-style-cast" // warning: use of old-style cast // yes, they are more terse. +#pragma clang diagnostic ignored "-Wfloat-equal" // warning: comparing floating point with == or != is unsafe // storing and comparing against same constants ok. +#pragma clang diagnostic ignored "-Wglobal-constructors" // warning: declaration requires a global destructor // similar to above, not sure what the exact difference is. +#pragma clang diagnostic ignored "-Wsign-conversion" // warning: implicit conversion changes signedness +#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" // warning: zero as null pointer constant // some standard header variations use #define NULL 0 +#pragma clang diagnostic ignored "-Wcomma" // warning: possible misuse of comma operator here +#pragma clang diagnostic ignored "-Wreserved-id-macro" // warning: macro name is a reserved identifier +#pragma clang diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function // using printf() is a misery with this as C++ va_arg ellipsis changes float to double. +#pragma clang diagnostic ignored "-Wimplicit-int-float-conversion" // warning: implicit conversion from 'xxx' to 'float' may lose precision +#pragma clang diagnostic ignored "-Wreserved-identifier" // warning: identifier '_Xxx' is reserved because it starts with '_' followed by a capital letter +#pragma clang diagnostic ignored "-Wunsafe-buffer-usage" // warning: 'xxx' is an unsafe pointer used for buffer access +#pragma clang diagnostic ignored "-Wnontrivial-memaccess" // warning: first argument in call to 'memset' is a pointer to non-trivially copyable type +#pragma clang diagnostic ignored "-Wcast-qual" // warning: cast from 'const xxxx *' to 'xxx *' drops const qualifier +#pragma clang diagnostic ignored "-Wswitch-default" // warning: 'switch' missing 'default' label #elif defined(__GNUC__) -#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind -#pragma GCC diagnostic ignored "-Wunused-function" // warning: 'xxxx' defined but not used -#pragma GCC diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function -#pragma GCC diagnostic ignored "-Wconversion" // warning: conversion to 'xxxx' from 'xxxx' may alter its value -#pragma GCC diagnostic ignored "-Wstack-protector" // warning: stack protector not protecting local variables: variable length buffer -#pragma GCC diagnostic ignored "-Wclass-memaccess" // [__GNUC__ >= 8] warning: 'memset/memcpy' clearing/writing an object of type 'xxxx' with no trivial copy-assignment; use assignment or value-initialization instead +#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind +#pragma GCC diagnostic ignored "-Wunused-function" // warning: 'xxxx' defined but not used +#pragma GCC diagnostic ignored "-Wfloat-equal" // warning: comparing floating-point with '==' or '!=' is unsafe +#pragma GCC diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function +#pragma GCC diagnostic ignored "-Wconversion" // warning: conversion to 'xxxx' from 'xxxx' may alter its value +#pragma GCC diagnostic ignored "-Wstack-protector" // warning: stack protector not protecting local variables: variable length buffer +#pragma GCC diagnostic ignored "-Wstrict-overflow" // warning: assuming signed overflow does not occur when simplifying division / ..when changing X +- C1 cmp C2 to X cmp C2 -+ C1 +#pragma GCC diagnostic ignored "-Wclass-memaccess" // [__GNUC__ >= 8] warning: 'memset/memcpy' clearing/writing an object of type 'xxxx' with no trivial copy-assignment; use assignment or value-initialization instead +#pragma GCC diagnostic ignored "-Wcast-qual" // warning: cast from type 'const xxxx *' to type 'xxxx *' casts away qualifiers #endif //------------------------------------------------------------------------- -// [SECTION] STB libraries implementation +// [SECTION] STB libraries implementation (for stb_truetype and stb_rect_pack) //------------------------------------------------------------------------- // Compile time options: @@ -99,26 +100,28 @@ namespace IMGUI_STB_NAMESPACE #ifdef _MSC_VER #pragma warning (push) #pragma warning (disable: 4456) // declaration of 'xx' hides previous local declaration +#pragma warning (disable: 6011) // (stb_rectpack) Dereferencing NULL pointer 'cur->next'. +#pragma warning (disable: 6385) // (stb_truetype) Reading invalid data from 'buffer': the readable size is '_Old_3`kernel_width' bytes, but '3' bytes may be read. +#pragma warning (disable: 28182) // (stb_rectpack) Dereferencing NULL pointer. 'cur' contains the same NULL value as 'cur->next' did. #endif #if defined(__clang__) #pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wunused-function" +#pragma clang diagnostic ignored "-Wunused-function" // warning: 'xxxx' defined but not used #pragma clang diagnostic ignored "-Wmissing-prototypes" #pragma clang diagnostic ignored "-Wimplicit-fallthrough" -#pragma clang diagnostic ignored "-Wcast-qual" // warning : cast from 'const xxxx *' to 'xxx *' drops const qualifier // #endif #if defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wtype-limits" // warning: comparison is always true due to limited range of data type [-Wtype-limits] -#pragma GCC diagnostic ignored "-Wcast-qual" // warning: cast from type 'const xxxx *' to type 'xxxx *' casts away qualifiers +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" // warning: this statement may fall through #endif #ifndef STB_RECT_PACK_IMPLEMENTATION // in case the user already have an implementation in the _same_ compilation unit (e.g. unity builds) -#ifndef IMGUI_DISABLE_STB_RECT_PACK_IMPLEMENTATION +#ifndef IMGUI_DISABLE_STB_RECT_PACK_IMPLEMENTATION // in case the user already have an implementation in another compilation unit #define STBRP_STATIC -#define STBRP_ASSERT(x) IM_ASSERT(x) +#define STBRP_ASSERT(x) do { IM_ASSERT(x); } while (0) #define STBRP_SORT ImQsort #define STB_RECT_PACK_IMPLEMENTATION #endif @@ -129,17 +132,19 @@ namespace IMGUI_STB_NAMESPACE #endif #endif +#ifdef IMGUI_ENABLE_STB_TRUETYPE #ifndef STB_TRUETYPE_IMPLEMENTATION // in case the user already have an implementation in the _same_ compilation unit (e.g. unity builds) -#ifndef IMGUI_DISABLE_STB_TRUETYPE_IMPLEMENTATION +#ifndef IMGUI_DISABLE_STB_TRUETYPE_IMPLEMENTATION // in case the user already have an implementation in another compilation unit #define STBTT_malloc(x,u) ((void)(u), IM_ALLOC(x)) #define STBTT_free(x,u) ((void)(u), IM_FREE(x)) -#define STBTT_assert(x) IM_ASSERT(x) +#define STBTT_assert(x) do { IM_ASSERT(x); } while(0) #define STBTT_fmod(x,y) ImFmod(x,y) #define STBTT_sqrt(x) ImSqrt(x) #define STBTT_pow(x,y) ImPow(x,y) #define STBTT_fabs(x) ImFabs(x) -#define STBTT_ifloor(x) ((int)ImFloorStd(x)) +#define STBTT_ifloor(x) ((int)ImFloor(x)) #define STBTT_iceil(x) ((int)ImCeil(x)) +#define STBTT_strlen(x) ImStrlen(x) #define STBTT_STATIC #define STB_TRUETYPE_IMPLEMENTATION #else @@ -151,6 +156,7 @@ namespace IMGUI_STB_NAMESPACE #include "imstb_truetype.h" #endif #endif +#endif // IMGUI_ENABLE_STB_TRUETYPE #if defined(__GNUC__) #pragma GCC diagnostic pop @@ -208,21 +214,31 @@ void ImGui::StyleColorsDark(ImGuiStyle* dst) colors[ImGuiCol_Separator] = colors[ImGuiCol_Border]; colors[ImGuiCol_SeparatorHovered] = ImVec4(0.10f, 0.40f, 0.75f, 0.78f); colors[ImGuiCol_SeparatorActive] = ImVec4(0.10f, 0.40f, 0.75f, 1.00f); - colors[ImGuiCol_ResizeGrip] = ImVec4(0.26f, 0.59f, 0.98f, 0.25f); + colors[ImGuiCol_ResizeGrip] = ImVec4(0.26f, 0.59f, 0.98f, 0.20f); colors[ImGuiCol_ResizeGripHovered] = ImVec4(0.26f, 0.59f, 0.98f, 0.67f); colors[ImGuiCol_ResizeGripActive] = ImVec4(0.26f, 0.59f, 0.98f, 0.95f); - colors[ImGuiCol_Tab] = ImLerp(colors[ImGuiCol_Header], colors[ImGuiCol_TitleBgActive], 0.80f); colors[ImGuiCol_TabHovered] = colors[ImGuiCol_HeaderHovered]; - colors[ImGuiCol_TabActive] = ImLerp(colors[ImGuiCol_HeaderActive], colors[ImGuiCol_TitleBgActive], 0.60f); - colors[ImGuiCol_TabUnfocused] = ImLerp(colors[ImGuiCol_Tab], colors[ImGuiCol_TitleBg], 0.80f); - colors[ImGuiCol_TabUnfocusedActive] = ImLerp(colors[ImGuiCol_TabActive], colors[ImGuiCol_TitleBg], 0.40f); + colors[ImGuiCol_Tab] = ImLerp(colors[ImGuiCol_Header], colors[ImGuiCol_TitleBgActive], 0.80f); + colors[ImGuiCol_TabSelected] = ImLerp(colors[ImGuiCol_HeaderActive], colors[ImGuiCol_TitleBgActive], 0.60f); + colors[ImGuiCol_TabSelectedOverline] = colors[ImGuiCol_HeaderActive]; + colors[ImGuiCol_TabDimmed] = ImLerp(colors[ImGuiCol_Tab], colors[ImGuiCol_TitleBg], 0.80f); + colors[ImGuiCol_TabDimmedSelected] = ImLerp(colors[ImGuiCol_TabSelected], colors[ImGuiCol_TitleBg], 0.40f); + colors[ImGuiCol_TabDimmedSelectedOverline] = ImVec4(0.50f, 0.50f, 0.50f, 0.00f); + colors[ImGuiCol_DockingPreview] = colors[ImGuiCol_HeaderActive] * ImVec4(1.0f, 1.0f, 1.0f, 0.7f); + colors[ImGuiCol_DockingEmptyBg] = ImVec4(0.20f, 0.20f, 0.20f, 1.00f); colors[ImGuiCol_PlotLines] = ImVec4(0.61f, 0.61f, 0.61f, 1.00f); colors[ImGuiCol_PlotLinesHovered] = ImVec4(1.00f, 0.43f, 0.35f, 1.00f); colors[ImGuiCol_PlotHistogram] = ImVec4(0.90f, 0.70f, 0.00f, 1.00f); colors[ImGuiCol_PlotHistogramHovered] = ImVec4(1.00f, 0.60f, 0.00f, 1.00f); + colors[ImGuiCol_TableHeaderBg] = ImVec4(0.19f, 0.19f, 0.20f, 1.00f); + colors[ImGuiCol_TableBorderStrong] = ImVec4(0.31f, 0.31f, 0.35f, 1.00f); // Prefer using Alpha=1.0 here + colors[ImGuiCol_TableBorderLight] = ImVec4(0.23f, 0.23f, 0.25f, 1.00f); // Prefer using Alpha=1.0 here + colors[ImGuiCol_TableRowBg] = ImVec4(0.00f, 0.00f, 0.00f, 0.00f); + colors[ImGuiCol_TableRowBgAlt] = ImVec4(1.00f, 1.00f, 1.00f, 0.06f); + colors[ImGuiCol_TextLink] = colors[ImGuiCol_HeaderActive]; colors[ImGuiCol_TextSelectedBg] = ImVec4(0.26f, 0.59f, 0.98f, 0.35f); colors[ImGuiCol_DragDropTarget] = ImVec4(1.00f, 1.00f, 0.00f, 0.90f); - colors[ImGuiCol_NavHighlight] = ImVec4(0.26f, 0.59f, 0.98f, 1.00f); + colors[ImGuiCol_NavCursor] = ImVec4(0.26f, 0.59f, 0.98f, 1.00f); colors[ImGuiCol_NavWindowingHighlight] = ImVec4(1.00f, 1.00f, 1.00f, 0.70f); colors[ImGuiCol_NavWindowingDimBg] = ImVec4(0.80f, 0.80f, 0.80f, 0.20f); colors[ImGuiCol_ModalWindowDimBg] = ImVec4(0.80f, 0.80f, 0.80f, 0.35f); @@ -235,7 +251,7 @@ void ImGui::StyleColorsClassic(ImGuiStyle* dst) colors[ImGuiCol_Text] = ImVec4(0.90f, 0.90f, 0.90f, 1.00f); colors[ImGuiCol_TextDisabled] = ImVec4(0.60f, 0.60f, 0.60f, 1.00f); - colors[ImGuiCol_WindowBg] = ImVec4(0.00f, 0.00f, 0.00f, 0.70f); + colors[ImGuiCol_WindowBg] = ImVec4(0.00f, 0.00f, 0.00f, 0.85f); colors[ImGuiCol_ChildBg] = ImVec4(0.00f, 0.00f, 0.00f, 0.00f); colors[ImGuiCol_PopupBg] = ImVec4(0.11f, 0.11f, 0.14f, 0.92f); colors[ImGuiCol_Border] = ImVec4(0.50f, 0.50f, 0.50f, 0.50f); @@ -263,21 +279,31 @@ void ImGui::StyleColorsClassic(ImGuiStyle* dst) colors[ImGuiCol_Separator] = ImVec4(0.50f, 0.50f, 0.50f, 0.60f); colors[ImGuiCol_SeparatorHovered] = ImVec4(0.60f, 0.60f, 0.70f, 1.00f); colors[ImGuiCol_SeparatorActive] = ImVec4(0.70f, 0.70f, 0.90f, 1.00f); - colors[ImGuiCol_ResizeGrip] = ImVec4(1.00f, 1.00f, 1.00f, 0.16f); + colors[ImGuiCol_ResizeGrip] = ImVec4(1.00f, 1.00f, 1.00f, 0.10f); colors[ImGuiCol_ResizeGripHovered] = ImVec4(0.78f, 0.82f, 1.00f, 0.60f); colors[ImGuiCol_ResizeGripActive] = ImVec4(0.78f, 0.82f, 1.00f, 0.90f); - colors[ImGuiCol_Tab] = ImLerp(colors[ImGuiCol_Header], colors[ImGuiCol_TitleBgActive], 0.80f); colors[ImGuiCol_TabHovered] = colors[ImGuiCol_HeaderHovered]; - colors[ImGuiCol_TabActive] = ImLerp(colors[ImGuiCol_HeaderActive], colors[ImGuiCol_TitleBgActive], 0.60f); - colors[ImGuiCol_TabUnfocused] = ImLerp(colors[ImGuiCol_Tab], colors[ImGuiCol_TitleBg], 0.80f); - colors[ImGuiCol_TabUnfocusedActive] = ImLerp(colors[ImGuiCol_TabActive], colors[ImGuiCol_TitleBg], 0.40f); + colors[ImGuiCol_Tab] = ImLerp(colors[ImGuiCol_Header], colors[ImGuiCol_TitleBgActive], 0.80f); + colors[ImGuiCol_TabSelected] = ImLerp(colors[ImGuiCol_HeaderActive], colors[ImGuiCol_TitleBgActive], 0.60f); + colors[ImGuiCol_TabSelectedOverline] = colors[ImGuiCol_HeaderActive]; + colors[ImGuiCol_TabDimmed] = ImLerp(colors[ImGuiCol_Tab], colors[ImGuiCol_TitleBg], 0.80f); + colors[ImGuiCol_TabDimmedSelected] = ImLerp(colors[ImGuiCol_TabSelected], colors[ImGuiCol_TitleBg], 0.40f); + colors[ImGuiCol_TabDimmedSelectedOverline] = ImVec4(0.53f, 0.53f, 0.87f, 0.00f); + colors[ImGuiCol_DockingPreview] = colors[ImGuiCol_Header] * ImVec4(1.0f, 1.0f, 1.0f, 0.7f); + colors[ImGuiCol_DockingEmptyBg] = ImVec4(0.20f, 0.20f, 0.20f, 1.00f); colors[ImGuiCol_PlotLines] = ImVec4(1.00f, 1.00f, 1.00f, 1.00f); colors[ImGuiCol_PlotLinesHovered] = ImVec4(0.90f, 0.70f, 0.00f, 1.00f); colors[ImGuiCol_PlotHistogram] = ImVec4(0.90f, 0.70f, 0.00f, 1.00f); colors[ImGuiCol_PlotHistogramHovered] = ImVec4(1.00f, 0.60f, 0.00f, 1.00f); + colors[ImGuiCol_TableHeaderBg] = ImVec4(0.27f, 0.27f, 0.38f, 1.00f); + colors[ImGuiCol_TableBorderStrong] = ImVec4(0.31f, 0.31f, 0.45f, 1.00f); // Prefer using Alpha=1.0 here + colors[ImGuiCol_TableBorderLight] = ImVec4(0.26f, 0.26f, 0.28f, 1.00f); // Prefer using Alpha=1.0 here + colors[ImGuiCol_TableRowBg] = ImVec4(0.00f, 0.00f, 0.00f, 0.00f); + colors[ImGuiCol_TableRowBgAlt] = ImVec4(1.00f, 1.00f, 1.00f, 0.07f); + colors[ImGuiCol_TextLink] = colors[ImGuiCol_HeaderActive]; colors[ImGuiCol_TextSelectedBg] = ImVec4(0.00f, 0.00f, 1.00f, 0.35f); colors[ImGuiCol_DragDropTarget] = ImVec4(1.00f, 1.00f, 0.00f, 0.90f); - colors[ImGuiCol_NavHighlight] = colors[ImGuiCol_HeaderHovered]; + colors[ImGuiCol_NavCursor] = colors[ImGuiCol_HeaderHovered]; colors[ImGuiCol_NavWindowingHighlight] = ImVec4(1.00f, 1.00f, 1.00f, 0.70f); colors[ImGuiCol_NavWindowingDimBg] = ImVec4(0.80f, 0.80f, 0.80f, 0.20f); colors[ImGuiCol_ModalWindowDimBg] = ImVec4(0.20f, 0.20f, 0.20f, 0.35f); @@ -319,72 +345,118 @@ void ImGui::StyleColorsLight(ImGuiStyle* dst) colors[ImGuiCol_Separator] = ImVec4(0.39f, 0.39f, 0.39f, 0.62f); colors[ImGuiCol_SeparatorHovered] = ImVec4(0.14f, 0.44f, 0.80f, 0.78f); colors[ImGuiCol_SeparatorActive] = ImVec4(0.14f, 0.44f, 0.80f, 1.00f); - colors[ImGuiCol_ResizeGrip] = ImVec4(0.80f, 0.80f, 0.80f, 0.56f); + colors[ImGuiCol_ResizeGrip] = ImVec4(0.35f, 0.35f, 0.35f, 0.17f); colors[ImGuiCol_ResizeGripHovered] = ImVec4(0.26f, 0.59f, 0.98f, 0.67f); colors[ImGuiCol_ResizeGripActive] = ImVec4(0.26f, 0.59f, 0.98f, 0.95f); - colors[ImGuiCol_Tab] = ImLerp(colors[ImGuiCol_Header], colors[ImGuiCol_TitleBgActive], 0.90f); colors[ImGuiCol_TabHovered] = colors[ImGuiCol_HeaderHovered]; - colors[ImGuiCol_TabActive] = ImLerp(colors[ImGuiCol_HeaderActive], colors[ImGuiCol_TitleBgActive], 0.60f); - colors[ImGuiCol_TabUnfocused] = ImLerp(colors[ImGuiCol_Tab], colors[ImGuiCol_TitleBg], 0.80f); - colors[ImGuiCol_TabUnfocusedActive] = ImLerp(colors[ImGuiCol_TabActive], colors[ImGuiCol_TitleBg], 0.40f); + colors[ImGuiCol_Tab] = ImLerp(colors[ImGuiCol_Header], colors[ImGuiCol_TitleBgActive], 0.90f); + colors[ImGuiCol_TabSelected] = ImLerp(colors[ImGuiCol_HeaderActive], colors[ImGuiCol_TitleBgActive], 0.60f); + colors[ImGuiCol_TabSelectedOverline] = colors[ImGuiCol_HeaderActive]; + colors[ImGuiCol_TabDimmed] = ImLerp(colors[ImGuiCol_Tab], colors[ImGuiCol_TitleBg], 0.80f); + colors[ImGuiCol_TabDimmedSelected] = ImLerp(colors[ImGuiCol_TabSelected], colors[ImGuiCol_TitleBg], 0.40f); + colors[ImGuiCol_TabDimmedSelectedOverline] = ImVec4(0.26f, 0.59f, 1.00f, 0.00f); + colors[ImGuiCol_DockingPreview] = colors[ImGuiCol_Header] * ImVec4(1.0f, 1.0f, 1.0f, 0.7f); + colors[ImGuiCol_DockingEmptyBg] = ImVec4(0.20f, 0.20f, 0.20f, 1.00f); colors[ImGuiCol_PlotLines] = ImVec4(0.39f, 0.39f, 0.39f, 1.00f); colors[ImGuiCol_PlotLinesHovered] = ImVec4(1.00f, 0.43f, 0.35f, 1.00f); colors[ImGuiCol_PlotHistogram] = ImVec4(0.90f, 0.70f, 0.00f, 1.00f); colors[ImGuiCol_PlotHistogramHovered] = ImVec4(1.00f, 0.45f, 0.00f, 1.00f); + colors[ImGuiCol_TableHeaderBg] = ImVec4(0.78f, 0.87f, 0.98f, 1.00f); + colors[ImGuiCol_TableBorderStrong] = ImVec4(0.57f, 0.57f, 0.64f, 1.00f); // Prefer using Alpha=1.0 here + colors[ImGuiCol_TableBorderLight] = ImVec4(0.68f, 0.68f, 0.74f, 1.00f); // Prefer using Alpha=1.0 here + colors[ImGuiCol_TableRowBg] = ImVec4(0.00f, 0.00f, 0.00f, 0.00f); + colors[ImGuiCol_TableRowBgAlt] = ImVec4(0.30f, 0.30f, 0.30f, 0.09f); + colors[ImGuiCol_TextLink] = colors[ImGuiCol_HeaderActive]; colors[ImGuiCol_TextSelectedBg] = ImVec4(0.26f, 0.59f, 0.98f, 0.35f); colors[ImGuiCol_DragDropTarget] = ImVec4(0.26f, 0.59f, 0.98f, 0.95f); - colors[ImGuiCol_NavHighlight] = colors[ImGuiCol_HeaderHovered]; + colors[ImGuiCol_NavCursor] = colors[ImGuiCol_HeaderHovered]; colors[ImGuiCol_NavWindowingHighlight] = ImVec4(0.70f, 0.70f, 0.70f, 0.70f); colors[ImGuiCol_NavWindowingDimBg] = ImVec4(0.20f, 0.20f, 0.20f, 0.20f); colors[ImGuiCol_ModalWindowDimBg] = ImVec4(0.20f, 0.20f, 0.20f, 0.35f); } //----------------------------------------------------------------------------- -// ImDrawList +// [SECTION] ImDrawList //----------------------------------------------------------------------------- ImDrawListSharedData::ImDrawListSharedData() { - Font = NULL; - FontSize = 0.0f; - CurveTessellationTol = 0.0f; - ClipRectFullscreen = ImVec4(-8192.0f, -8192.0f, +8192.0f, +8192.0f); - InitialFlags = ImDrawListFlags_None; - - // Const data - for (int i = 0; i < IM_ARRAYSIZE(CircleVtx12); i++) + memset(this, 0, sizeof(*this)); + InitialFringeScale = 1.0f; + for (int i = 0; i < IM_ARRAYSIZE(ArcFastVtx); i++) { - const float a = ((float)i * 2 * IM_PI) / (float)IM_ARRAYSIZE(CircleVtx12); - CircleVtx12[i] = ImVec2(ImCos(a), ImSin(a)); + const float a = ((float)i * 2 * IM_PI) / (float)IM_ARRAYSIZE(ArcFastVtx); + ArcFastVtx[i] = ImVec2(ImCos(a), ImSin(a)); } + ArcFastRadiusCutoff = IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_CALC_R(IM_DRAWLIST_ARCFAST_SAMPLE_MAX, CircleSegmentMaxError); } -void ImDrawList::Clear() +void ImDrawListSharedData::SetCircleTessellationMaxError(float max_error) { + if (CircleSegmentMaxError == max_error) + return; + + IM_ASSERT(max_error > 0.0f); + CircleSegmentMaxError = max_error; + for (int i = 0; i < IM_ARRAYSIZE(CircleSegmentCounts); i++) + { + const float radius = (float)i; + CircleSegmentCounts[i] = (ImU8)((i > 0) ? IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_CALC(radius, CircleSegmentMaxError) : IM_DRAWLIST_ARCFAST_SAMPLE_MAX); + } + ArcFastRadiusCutoff = IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_CALC_R(IM_DRAWLIST_ARCFAST_SAMPLE_MAX, CircleSegmentMaxError); +} + +ImDrawList::ImDrawList(ImDrawListSharedData* shared_data) +{ + memset(this, 0, sizeof(*this)); + _Data = shared_data; +} + +ImDrawList::~ImDrawList() +{ + _ClearFreeMemory(); +} + +// Initialize before use in a new frame. We always have a command ready in the buffer. +// In the majority of cases, you would want to call PushClipRect() and PushTextureID() after this. +void ImDrawList::_ResetForNewFrame() +{ + // Verify that the ImDrawCmd fields we want to memcmp() are contiguous in memory. + IM_STATIC_ASSERT(offsetof(ImDrawCmd, ClipRect) == 0); + IM_STATIC_ASSERT(offsetof(ImDrawCmd, TextureId) == sizeof(ImVec4)); + IM_STATIC_ASSERT(offsetof(ImDrawCmd, VtxOffset) == sizeof(ImVec4) + sizeof(ImTextureID)); + if (_Splitter._Count > 1) + _Splitter.Merge(this); + CmdBuffer.resize(0); IdxBuffer.resize(0); VtxBuffer.resize(0); - Flags = _Data ? _Data->InitialFlags : ImDrawListFlags_None; - _VtxCurrentOffset = 0; + Flags = _Data->InitialFlags; + memset(&_CmdHeader, 0, sizeof(_CmdHeader)); _VtxCurrentIdx = 0; _VtxWritePtr = NULL; _IdxWritePtr = NULL; _ClipRectStack.resize(0); _TextureIdStack.resize(0); + _CallbacksDataBuf.resize(0); _Path.resize(0); _Splitter.Clear(); + CmdBuffer.push_back(ImDrawCmd()); + _FringeScale = _Data->InitialFringeScale; } -void ImDrawList::ClearFreeMemory() +void ImDrawList::_ClearFreeMemory() { CmdBuffer.clear(); IdxBuffer.clear(); VtxBuffer.clear(); + Flags = ImDrawListFlags_None; _VtxCurrentIdx = 0; _VtxWritePtr = NULL; _IdxWritePtr = NULL; _ClipRectStack.clear(); _TextureIdStack.clear(); + _CallbacksDataBuf.clear(); _Path.clear(); _Splitter.ClearFreeMemory(); } @@ -399,86 +471,163 @@ ImDrawList* ImDrawList::CloneOutput() const return dst; } -// Using macros because C++ is a terrible language, we want guaranteed inline, no code in header, and no overhead in Debug builds -#define GetCurrentClipRect() (_ClipRectStack.Size ? _ClipRectStack.Data[_ClipRectStack.Size-1] : _Data->ClipRectFullscreen) -#define GetCurrentTextureId() (_TextureIdStack.Size ? _TextureIdStack.Data[_TextureIdStack.Size-1] : (ImTextureID)NULL) - void ImDrawList::AddDrawCmd() { ImDrawCmd draw_cmd; - draw_cmd.ClipRect = GetCurrentClipRect(); - draw_cmd.TextureId = GetCurrentTextureId(); - draw_cmd.VtxOffset = _VtxCurrentOffset; + draw_cmd.ClipRect = _CmdHeader.ClipRect; // Same as calling ImDrawCmd_HeaderCopy() + draw_cmd.TextureId = _CmdHeader.TextureId; + draw_cmd.VtxOffset = _CmdHeader.VtxOffset; draw_cmd.IdxOffset = IdxBuffer.Size; IM_ASSERT(draw_cmd.ClipRect.x <= draw_cmd.ClipRect.z && draw_cmd.ClipRect.y <= draw_cmd.ClipRect.w); CmdBuffer.push_back(draw_cmd); } -void ImDrawList::AddCallback(ImDrawCallback callback, void* callback_data) +// Pop trailing draw command (used before merging or presenting to user) +// Note that this leaves the ImDrawList in a state unfit for further commands, as most code assume that CmdBuffer.Size > 0 && CmdBuffer.back().UserCallback == NULL +void ImDrawList::_PopUnusedDrawCmd() { - ImDrawCmd* current_cmd = CmdBuffer.Size ? &CmdBuffer.back() : NULL; - if (!current_cmd || current_cmd->ElemCount != 0 || current_cmd->UserCallback != NULL) + while (CmdBuffer.Size > 0) + { + ImDrawCmd* curr_cmd = &CmdBuffer.Data[CmdBuffer.Size - 1]; + if (curr_cmd->ElemCount != 0 || curr_cmd->UserCallback != NULL) + return;// break; + CmdBuffer.pop_back(); + } +} + +void ImDrawList::AddCallback(ImDrawCallback callback, void* userdata, size_t userdata_size) +{ + IM_ASSERT_PARANOID(CmdBuffer.Size > 0); + ImDrawCmd* curr_cmd = &CmdBuffer.Data[CmdBuffer.Size - 1]; + IM_ASSERT(curr_cmd->UserCallback == NULL); + if (curr_cmd->ElemCount != 0) { AddDrawCmd(); - current_cmd = &CmdBuffer.back(); + curr_cmd = &CmdBuffer.Data[CmdBuffer.Size - 1]; + } + + curr_cmd->UserCallback = callback; + if (userdata_size == 0) + { + // Store user data directly in command (no indirection) + curr_cmd->UserCallbackData = userdata; + curr_cmd->UserCallbackDataSize = 0; + curr_cmd->UserCallbackDataOffset = -1; + } + else + { + // Copy and store user data in a buffer + IM_ASSERT(userdata != NULL); + IM_ASSERT(userdata_size < (1u << 31)); + curr_cmd->UserCallbackData = NULL; // Will be resolved during Render() + curr_cmd->UserCallbackDataSize = (int)userdata_size; + curr_cmd->UserCallbackDataOffset = _CallbacksDataBuf.Size; + _CallbacksDataBuf.resize(_CallbacksDataBuf.Size + (int)userdata_size); + memcpy(_CallbacksDataBuf.Data + (size_t)curr_cmd->UserCallbackDataOffset, userdata, userdata_size); } - current_cmd->UserCallback = callback; - current_cmd->UserCallbackData = callback_data; AddDrawCmd(); // Force a new command after us (see comment below) } +// Compare ClipRect, TextureId and VtxOffset with a single memcmp() +#define ImDrawCmd_HeaderSize (offsetof(ImDrawCmd, VtxOffset) + sizeof(unsigned int)) +#define ImDrawCmd_HeaderCompare(CMD_LHS, CMD_RHS) (memcmp(CMD_LHS, CMD_RHS, ImDrawCmd_HeaderSize)) // Compare ClipRect, TextureId, VtxOffset +#define ImDrawCmd_HeaderCopy(CMD_DST, CMD_SRC) (memcpy(CMD_DST, CMD_SRC, ImDrawCmd_HeaderSize)) // Copy ClipRect, TextureId, VtxOffset +#define ImDrawCmd_AreSequentialIdxOffset(CMD_0, CMD_1) (CMD_0->IdxOffset + CMD_0->ElemCount == CMD_1->IdxOffset) + +// Try to merge two last draw commands +void ImDrawList::_TryMergeDrawCmds() +{ + IM_ASSERT_PARANOID(CmdBuffer.Size > 0); + ImDrawCmd* curr_cmd = &CmdBuffer.Data[CmdBuffer.Size - 1]; + ImDrawCmd* prev_cmd = curr_cmd - 1; + if (ImDrawCmd_HeaderCompare(curr_cmd, prev_cmd) == 0 && ImDrawCmd_AreSequentialIdxOffset(prev_cmd, curr_cmd) && curr_cmd->UserCallback == NULL && prev_cmd->UserCallback == NULL) + { + prev_cmd->ElemCount += curr_cmd->ElemCount; + CmdBuffer.pop_back(); + } +} + // Our scheme may appears a bit unusual, basically we want the most-common calls AddLine AddRect etc. to not have to perform any check so we always have a command ready in the stack. // The cost of figuring out if a new command has to be added or if we can merge is paid in those Update** functions only. -void ImDrawList::UpdateClipRect() +void ImDrawList::_OnChangedClipRect() { // If current command is used with different settings we need to add a new command - const ImVec4 curr_clip_rect = GetCurrentClipRect(); - ImDrawCmd* curr_cmd = CmdBuffer.Size > 0 ? &CmdBuffer.Data[CmdBuffer.Size-1] : NULL; - if (!curr_cmd || (curr_cmd->ElemCount != 0 && memcmp(&curr_cmd->ClipRect, &curr_clip_rect, sizeof(ImVec4)) != 0) || curr_cmd->UserCallback != NULL) + IM_ASSERT_PARANOID(CmdBuffer.Size > 0); + ImDrawCmd* curr_cmd = &CmdBuffer.Data[CmdBuffer.Size - 1]; + if (curr_cmd->ElemCount != 0 && memcmp(&curr_cmd->ClipRect, &_CmdHeader.ClipRect, sizeof(ImVec4)) != 0) { AddDrawCmd(); return; } + IM_ASSERT(curr_cmd->UserCallback == NULL); // Try to merge with previous command if it matches, else use current command - ImDrawCmd* prev_cmd = CmdBuffer.Size > 1 ? curr_cmd - 1 : NULL; - if (curr_cmd->ElemCount == 0 && prev_cmd && memcmp(&prev_cmd->ClipRect, &curr_clip_rect, sizeof(ImVec4)) == 0 && prev_cmd->TextureId == GetCurrentTextureId() && prev_cmd->UserCallback == NULL) + ImDrawCmd* prev_cmd = curr_cmd - 1; + if (curr_cmd->ElemCount == 0 && CmdBuffer.Size > 1 && ImDrawCmd_HeaderCompare(&_CmdHeader, prev_cmd) == 0 && ImDrawCmd_AreSequentialIdxOffset(prev_cmd, curr_cmd) && prev_cmd->UserCallback == NULL) + { CmdBuffer.pop_back(); - else - curr_cmd->ClipRect = curr_clip_rect; + return; + } + curr_cmd->ClipRect = _CmdHeader.ClipRect; } -void ImDrawList::UpdateTextureID() +void ImDrawList::_OnChangedTextureID() { // If current command is used with different settings we need to add a new command - const ImTextureID curr_texture_id = GetCurrentTextureId(); - ImDrawCmd* curr_cmd = CmdBuffer.Size ? &CmdBuffer.back() : NULL; - if (!curr_cmd || (curr_cmd->ElemCount != 0 && curr_cmd->TextureId != curr_texture_id) || curr_cmd->UserCallback != NULL) + IM_ASSERT_PARANOID(CmdBuffer.Size > 0); + ImDrawCmd* curr_cmd = &CmdBuffer.Data[CmdBuffer.Size - 1]; + if (curr_cmd->ElemCount != 0 && curr_cmd->TextureId != _CmdHeader.TextureId) { AddDrawCmd(); return; } + IM_ASSERT(curr_cmd->UserCallback == NULL); // Try to merge with previous command if it matches, else use current command - ImDrawCmd* prev_cmd = CmdBuffer.Size > 1 ? curr_cmd - 1 : NULL; - if (curr_cmd->ElemCount == 0 && prev_cmd && prev_cmd->TextureId == curr_texture_id && memcmp(&prev_cmd->ClipRect, &GetCurrentClipRect(), sizeof(ImVec4)) == 0 && prev_cmd->UserCallback == NULL) + ImDrawCmd* prev_cmd = curr_cmd - 1; + if (curr_cmd->ElemCount == 0 && CmdBuffer.Size > 1 && ImDrawCmd_HeaderCompare(&_CmdHeader, prev_cmd) == 0 && ImDrawCmd_AreSequentialIdxOffset(prev_cmd, curr_cmd) && prev_cmd->UserCallback == NULL) + { CmdBuffer.pop_back(); - else - curr_cmd->TextureId = curr_texture_id; + return; + } + curr_cmd->TextureId = _CmdHeader.TextureId; } -#undef GetCurrentClipRect -#undef GetCurrentTextureId +void ImDrawList::_OnChangedVtxOffset() +{ + // We don't need to compare curr_cmd->VtxOffset != _CmdHeader.VtxOffset because we know it'll be different at the time we call this. + _VtxCurrentIdx = 0; + IM_ASSERT_PARANOID(CmdBuffer.Size > 0); + ImDrawCmd* curr_cmd = &CmdBuffer.Data[CmdBuffer.Size - 1]; + //IM_ASSERT(curr_cmd->VtxOffset != _CmdHeader.VtxOffset); // See #3349 + if (curr_cmd->ElemCount != 0) + { + AddDrawCmd(); + return; + } + IM_ASSERT(curr_cmd->UserCallback == NULL); + curr_cmd->VtxOffset = _CmdHeader.VtxOffset; +} + +int ImDrawList::_CalcCircleAutoSegmentCount(float radius) const +{ + // Automatic segment count + const int radius_idx = (int)(radius + 0.999999f); // ceil to never reduce accuracy + if (radius_idx >= 0 && radius_idx < IM_ARRAYSIZE(_Data->CircleSegmentCounts)) + return _Data->CircleSegmentCounts[radius_idx]; // Use cached value + else + return IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_CALC(radius, _Data->CircleSegmentMaxError); +} // Render-level scissoring. This is passed down to your render function but not used for CPU-side coarse clipping. Prefer using higher-level ImGui::PushClipRect() to affect logic (hit-testing and widget culling) -void ImDrawList::PushClipRect(ImVec2 cr_min, ImVec2 cr_max, bool intersect_with_current_clip_rect) +void ImDrawList::PushClipRect(const ImVec2& cr_min, const ImVec2& cr_max, bool intersect_with_current_clip_rect) { ImVec4 cr(cr_min.x, cr_min.y, cr_max.x, cr_max.y); - if (intersect_with_current_clip_rect && _ClipRectStack.Size) + if (intersect_with_current_clip_rect) { - ImVec4 current = _ClipRectStack.Data[_ClipRectStack.Size-1]; + ImVec4 current = _CmdHeader.ClipRect; if (cr.x < current.x) cr.x = current.x; if (cr.y < current.y) cr.y = current.y; if (cr.z > current.z) cr.z = current.z; @@ -488,7 +637,8 @@ void ImDrawList::PushClipRect(ImVec2 cr_min, ImVec2 cr_max, bool intersect_with_ cr.w = ImMax(cr.y, cr.w); _ClipRectStack.push_back(cr); - UpdateClipRect(); + _CmdHeader.ClipRect = cr; + _OnChangedClipRect(); } void ImDrawList::PushClipRectFullScreen() @@ -498,37 +648,52 @@ void ImDrawList::PushClipRectFullScreen() void ImDrawList::PopClipRect() { - IM_ASSERT(_ClipRectStack.Size > 0); _ClipRectStack.pop_back(); - UpdateClipRect(); + _CmdHeader.ClipRect = (_ClipRectStack.Size == 0) ? _Data->ClipRectFullscreen : _ClipRectStack.Data[_ClipRectStack.Size - 1]; + _OnChangedClipRect(); } void ImDrawList::PushTextureID(ImTextureID texture_id) { _TextureIdStack.push_back(texture_id); - UpdateTextureID(); + _CmdHeader.TextureId = texture_id; + _OnChangedTextureID(); } void ImDrawList::PopTextureID() { - IM_ASSERT(_TextureIdStack.Size > 0); _TextureIdStack.pop_back(); - UpdateTextureID(); + _CmdHeader.TextureId = (_TextureIdStack.Size == 0) ? (ImTextureID)NULL : _TextureIdStack.Data[_TextureIdStack.Size - 1]; + _OnChangedTextureID(); } -// NB: this can be called with negative count for removing primitives (as long as the result does not underflow) +// This is used by ImGui::PushFont()/PopFont(). It works because we never use _TextureIdStack[] elsewhere than in PushTextureID()/PopTextureID(). +void ImDrawList::_SetTextureID(ImTextureID texture_id) +{ + if (_CmdHeader.TextureId == texture_id) + return; + _CmdHeader.TextureId = texture_id; + _OnChangedTextureID(); +} + +// Reserve space for a number of vertices and indices. +// You must finish filling your reserved data before calling PrimReserve() again, as it may reallocate or +// submit the intermediate results. PrimUnreserve() can be used to release unused allocations. void ImDrawList::PrimReserve(int idx_count, int vtx_count) { // Large mesh support (when enabled) + IM_ASSERT_PARANOID(idx_count >= 0 && vtx_count >= 0); if (sizeof(ImDrawIdx) == 2 && (_VtxCurrentIdx + vtx_count >= (1 << 16)) && (Flags & ImDrawListFlags_AllowVtxOffset)) { - _VtxCurrentOffset = VtxBuffer.Size; - _VtxCurrentIdx = 0; - AddDrawCmd(); + // FIXME: In theory we should be testing that vtx_count <64k here. + // In practice, RenderText() relies on reserving ahead for a worst case scenario so it is currently useful for us + // to not make that check until we rework the text functions to handle clipping and large horizontal lines better. + _CmdHeader.VtxOffset = VtxBuffer.Size; + _OnChangedVtxOffset(); } - ImDrawCmd& draw_cmd = CmdBuffer.Data[CmdBuffer.Size-1]; - draw_cmd.ElemCount += idx_count; + ImDrawCmd* draw_cmd = &CmdBuffer.Data[CmdBuffer.Size - 1]; + draw_cmd->ElemCount += idx_count; int vtx_buffer_old_size = VtxBuffer.Size; VtxBuffer.resize(vtx_buffer_old_size + vtx_count); @@ -539,6 +704,17 @@ void ImDrawList::PrimReserve(int idx_count, int vtx_count) _IdxWritePtr = IdxBuffer.Data + idx_buffer_old_size; } +// Release the number of reserved vertices/indices from the end of the last reservation made with PrimReserve(). +void ImDrawList::PrimUnreserve(int idx_count, int vtx_count) +{ + IM_ASSERT_PARANOID(idx_count >= 0 && vtx_count >= 0); + + ImDrawCmd* draw_cmd = &CmdBuffer.Data[CmdBuffer.Size - 1]; + draw_cmd->ElemCount -= idx_count; + VtxBuffer.shrink(VtxBuffer.Size - vtx_count); + IdxBuffer.shrink(IdxBuffer.Size - idx_count); +} + // Fully unrolled with inline call to keep our debug builds decently fast. void ImDrawList::PrimRect(const ImVec2& a, const ImVec2& c, ImU32 col) { @@ -584,42 +760,58 @@ void ImDrawList::PrimQuadUV(const ImVec2& a, const ImVec2& b, const ImVec2& c, c _IdxWritePtr += 6; } -// On AddPolyline() and AddConvexPolyFilled() we intentionally avoid using ImVec2 and superflous function calls to optimize debug/non-inlined builds. -// Those macros expects l-values. -#define IM_NORMALIZE2F_OVER_ZERO(VX,VY) { float d2 = VX*VX + VY*VY; if (d2 > 0.0f) { float inv_len = 1.0f / ImSqrt(d2); VX *= inv_len; VY *= inv_len; } } -#define IM_FIXNORMAL2F(VX,VY) { float d2 = VX*VX + VY*VY; if (d2 < 0.5f) d2 = 0.5f; float inv_lensq = 1.0f / d2; VX *= inv_lensq; VY *= inv_lensq; } +// On AddPolyline() and AddConvexPolyFilled() we intentionally avoid using ImVec2 and superfluous function calls to optimize debug/non-inlined builds. +// - Those macros expects l-values and need to be used as their own statement. +// - Those macros are intentionally not surrounded by the 'do {} while (0)' idiom because even that translates to runtime with debug compilers. +#define IM_NORMALIZE2F_OVER_ZERO(VX,VY) { float d2 = VX*VX + VY*VY; if (d2 > 0.0f) { float inv_len = ImRsqrt(d2); VX *= inv_len; VY *= inv_len; } } (void)0 +#define IM_FIXNORMAL2F_MAX_INVLEN2 100.0f // 500.0f (see #4053, #3366) +#define IM_FIXNORMAL2F(VX,VY) { float d2 = VX*VX + VY*VY; if (d2 > 0.000001f) { float inv_len2 = 1.0f / d2; if (inv_len2 > IM_FIXNORMAL2F_MAX_INVLEN2) inv_len2 = IM_FIXNORMAL2F_MAX_INVLEN2; VX *= inv_len2; VY *= inv_len2; } } (void)0 // TODO: Thickness anti-aliased lines cap are missing their AA fringe. // We avoid using the ImVec2 math operators here to reduce cost to a minimum for debug/non-inlined builds. -void ImDrawList::AddPolyline(const ImVec2* points, const int points_count, ImU32 col, bool closed, float thickness) +void ImDrawList::AddPolyline(const ImVec2* points, const int points_count, ImU32 col, ImDrawFlags flags, float thickness) { - if (points_count < 2) + if (points_count < 2 || (col & IM_COL32_A_MASK) == 0) return; - const ImVec2 uv = _Data->TexUvWhitePixel; + const bool closed = (flags & ImDrawFlags_Closed) != 0; + const ImVec2 opaque_uv = _Data->TexUvWhitePixel; + const int count = closed ? points_count : points_count - 1; // The number of line segments we need to draw + const bool thick_line = (thickness > _FringeScale); - int count = points_count; - if (!closed) - count = points_count-1; - - const bool thick_line = thickness > 1.0f; if (Flags & ImDrawListFlags_AntiAliasedLines) { // Anti-aliased stroke - const float AA_SIZE = 1.0f; + const float AA_SIZE = _FringeScale; const ImU32 col_trans = col & ~IM_COL32_A_MASK; - const int idx_count = thick_line ? count*18 : count*12; - const int vtx_count = thick_line ? points_count*4 : points_count*3; + // Thicknesses <1.0 should behave like thickness 1.0 + thickness = ImMax(thickness, 1.0f); + const int integer_thickness = (int)thickness; + const float fractional_thickness = thickness - integer_thickness; + + // Do we want to draw this line using a texture? + // - For now, only draw integer-width lines using textures to avoid issues with the way scaling occurs, could be improved. + // - If AA_SIZE is not 1.0f we cannot use the texture path. + const bool use_texture = (Flags & ImDrawListFlags_AntiAliasedLinesUseTex) && (integer_thickness < IM_DRAWLIST_TEX_LINES_WIDTH_MAX) && (fractional_thickness <= 0.00001f) && (AA_SIZE == 1.0f); + + // We should never hit this, because NewFrame() doesn't set ImDrawListFlags_AntiAliasedLinesUseTex unless ImFontAtlasFlags_NoBakedLines is off + IM_ASSERT_PARANOID(!use_texture || !(_Data->Font->ContainerAtlas->Flags & ImFontAtlasFlags_NoBakedLines)); + + const int idx_count = use_texture ? (count * 6) : (thick_line ? count * 18 : count * 12); + const int vtx_count = use_texture ? (points_count * 2) : (thick_line ? points_count * 4 : points_count * 3); PrimReserve(idx_count, vtx_count); // Temporary buffer - ImVec2* temp_normals = (ImVec2*)alloca(points_count * (thick_line ? 5 : 3) * sizeof(ImVec2)); //-V630 + // The first items are normals at each line point, then after that there are either 2 or 4 temp points for each line point + _Data->TempBuffer.reserve_discard(points_count * ((use_texture || !thick_line) ? 3 : 5)); + ImVec2* temp_normals = _Data->TempBuffer.Data; ImVec2* temp_points = temp_normals + points_count; + // Calculate normals (tangents) for each line segment for (int i1 = 0; i1 < count; i1++) { - const int i2 = (i1+1) == points_count ? 0 : i1+1; + const int i2 = (i1 + 1) == points_count ? 0 : i1 + 1; float dx = points[i2].x - points[i1].x; float dy = points[i2].y - points[i1].y; IM_NORMALIZE2F_OVER_ZERO(dx, dy); @@ -627,79 +819,134 @@ void ImDrawList::AddPolyline(const ImVec2* points, const int points_count, ImU32 temp_normals[i1].y = -dx; } if (!closed) - temp_normals[points_count-1] = temp_normals[points_count-2]; + temp_normals[points_count - 1] = temp_normals[points_count - 2]; - if (!thick_line) + // If we are drawing a one-pixel-wide line without a texture, or a textured line of any width, we only need 2 or 3 vertices per point + if (use_texture || !thick_line) { + // [PATH 1] Texture-based lines (thick or non-thick) + // [PATH 2] Non texture-based lines (non-thick) + + // The width of the geometry we need to draw - this is essentially pixels for the line itself, plus "one pixel" for AA. + // - In the texture-based path, we don't use AA_SIZE here because the +1 is tied to the generated texture + // (see ImFontAtlasBuildRenderLinesTexData() function), and so alternate values won't work without changes to that code. + // - In the non texture-based paths, we would allow AA_SIZE to potentially be != 1.0f with a patch (e.g. fringe_scale patch to + // allow scaling geometry while preserving one-screen-pixel AA fringe). + const float half_draw_size = use_texture ? ((thickness * 0.5f) + 1) : AA_SIZE; + + // If line is not closed, the first and last points need to be generated differently as there are no normals to blend if (!closed) { - temp_points[0] = points[0] + temp_normals[0] * AA_SIZE; - temp_points[1] = points[0] - temp_normals[0] * AA_SIZE; - temp_points[(points_count-1)*2+0] = points[points_count-1] + temp_normals[points_count-1] * AA_SIZE; - temp_points[(points_count-1)*2+1] = points[points_count-1] - temp_normals[points_count-1] * AA_SIZE; + temp_points[0] = points[0] + temp_normals[0] * half_draw_size; + temp_points[1] = points[0] - temp_normals[0] * half_draw_size; + temp_points[(points_count-1)*2+0] = points[points_count-1] + temp_normals[points_count-1] * half_draw_size; + temp_points[(points_count-1)*2+1] = points[points_count-1] - temp_normals[points_count-1] * half_draw_size; } + // Generate the indices to form a number of triangles for each line segment, and the vertices for the line edges + // This takes points n and n+1 and writes into n+1, with the first point in a closed line being generated from the final one (as n+1 wraps) // FIXME-OPT: Merge the different loops, possibly remove the temporary buffer. - unsigned int idx1 = _VtxCurrentIdx; - for (int i1 = 0; i1 < count; i1++) + unsigned int idx1 = _VtxCurrentIdx; // Vertex index for start of line segment + for (int i1 = 0; i1 < count; i1++) // i1 is the first point of the line segment { - const int i2 = (i1+1) == points_count ? 0 : i1+1; - unsigned int idx2 = (i1+1) == points_count ? _VtxCurrentIdx : idx1+3; + const int i2 = (i1 + 1) == points_count ? 0 : i1 + 1; // i2 is the second point of the line segment + const unsigned int idx2 = ((i1 + 1) == points_count) ? _VtxCurrentIdx : (idx1 + (use_texture ? 2 : 3)); // Vertex index for end of segment // Average normals float dm_x = (temp_normals[i1].x + temp_normals[i2].x) * 0.5f; float dm_y = (temp_normals[i1].y + temp_normals[i2].y) * 0.5f; - IM_FIXNORMAL2F(dm_x, dm_y) - dm_x *= AA_SIZE; - dm_y *= AA_SIZE; + IM_FIXNORMAL2F(dm_x, dm_y); + dm_x *= half_draw_size; // dm_x, dm_y are offset to the outer edge of the AA area + dm_y *= half_draw_size; - // Add temporary vertexes - ImVec2* out_vtx = &temp_points[i2*2]; + // Add temporary vertexes for the outer edges + ImVec2* out_vtx = &temp_points[i2 * 2]; out_vtx[0].x = points[i2].x + dm_x; out_vtx[0].y = points[i2].y + dm_y; out_vtx[1].x = points[i2].x - dm_x; out_vtx[1].y = points[i2].y - dm_y; - // Add indexes - _IdxWritePtr[0] = (ImDrawIdx)(idx2+0); _IdxWritePtr[1] = (ImDrawIdx)(idx1+0); _IdxWritePtr[2] = (ImDrawIdx)(idx1+2); - _IdxWritePtr[3] = (ImDrawIdx)(idx1+2); _IdxWritePtr[4] = (ImDrawIdx)(idx2+2); _IdxWritePtr[5] = (ImDrawIdx)(idx2+0); - _IdxWritePtr[6] = (ImDrawIdx)(idx2+1); _IdxWritePtr[7] = (ImDrawIdx)(idx1+1); _IdxWritePtr[8] = (ImDrawIdx)(idx1+0); - _IdxWritePtr[9] = (ImDrawIdx)(idx1+0); _IdxWritePtr[10]= (ImDrawIdx)(idx2+0); _IdxWritePtr[11]= (ImDrawIdx)(idx2+1); - _IdxWritePtr += 12; + if (use_texture) + { + // Add indices for two triangles + _IdxWritePtr[0] = (ImDrawIdx)(idx2 + 0); _IdxWritePtr[1] = (ImDrawIdx)(idx1 + 0); _IdxWritePtr[2] = (ImDrawIdx)(idx1 + 1); // Right tri + _IdxWritePtr[3] = (ImDrawIdx)(idx2 + 1); _IdxWritePtr[4] = (ImDrawIdx)(idx1 + 1); _IdxWritePtr[5] = (ImDrawIdx)(idx2 + 0); // Left tri + _IdxWritePtr += 6; + } + else + { + // Add indexes for four triangles + _IdxWritePtr[0] = (ImDrawIdx)(idx2 + 0); _IdxWritePtr[1] = (ImDrawIdx)(idx1 + 0); _IdxWritePtr[2] = (ImDrawIdx)(idx1 + 2); // Right tri 1 + _IdxWritePtr[3] = (ImDrawIdx)(idx1 + 2); _IdxWritePtr[4] = (ImDrawIdx)(idx2 + 2); _IdxWritePtr[5] = (ImDrawIdx)(idx2 + 0); // Right tri 2 + _IdxWritePtr[6] = (ImDrawIdx)(idx2 + 1); _IdxWritePtr[7] = (ImDrawIdx)(idx1 + 1); _IdxWritePtr[8] = (ImDrawIdx)(idx1 + 0); // Left tri 1 + _IdxWritePtr[9] = (ImDrawIdx)(idx1 + 0); _IdxWritePtr[10] = (ImDrawIdx)(idx2 + 0); _IdxWritePtr[11] = (ImDrawIdx)(idx2 + 1); // Left tri 2 + _IdxWritePtr += 12; + } idx1 = idx2; } - // Add vertexes - for (int i = 0; i < points_count; i++) + // Add vertexes for each point on the line + if (use_texture) { - _VtxWritePtr[0].pos = points[i]; _VtxWritePtr[0].uv = uv; _VtxWritePtr[0].col = col; - _VtxWritePtr[1].pos = temp_points[i*2+0]; _VtxWritePtr[1].uv = uv; _VtxWritePtr[1].col = col_trans; - _VtxWritePtr[2].pos = temp_points[i*2+1]; _VtxWritePtr[2].uv = uv; _VtxWritePtr[2].col = col_trans; - _VtxWritePtr += 3; + // If we're using textures we only need to emit the left/right edge vertices + ImVec4 tex_uvs = _Data->TexUvLines[integer_thickness]; + /*if (fractional_thickness != 0.0f) // Currently always zero when use_texture==false! + { + const ImVec4 tex_uvs_1 = _Data->TexUvLines[integer_thickness + 1]; + tex_uvs.x = tex_uvs.x + (tex_uvs_1.x - tex_uvs.x) * fractional_thickness; // inlined ImLerp() + tex_uvs.y = tex_uvs.y + (tex_uvs_1.y - tex_uvs.y) * fractional_thickness; + tex_uvs.z = tex_uvs.z + (tex_uvs_1.z - tex_uvs.z) * fractional_thickness; + tex_uvs.w = tex_uvs.w + (tex_uvs_1.w - tex_uvs.w) * fractional_thickness; + }*/ + ImVec2 tex_uv0(tex_uvs.x, tex_uvs.y); + ImVec2 tex_uv1(tex_uvs.z, tex_uvs.w); + for (int i = 0; i < points_count; i++) + { + _VtxWritePtr[0].pos = temp_points[i * 2 + 0]; _VtxWritePtr[0].uv = tex_uv0; _VtxWritePtr[0].col = col; // Left-side outer edge + _VtxWritePtr[1].pos = temp_points[i * 2 + 1]; _VtxWritePtr[1].uv = tex_uv1; _VtxWritePtr[1].col = col; // Right-side outer edge + _VtxWritePtr += 2; + } + } + else + { + // If we're not using a texture, we need the center vertex as well + for (int i = 0; i < points_count; i++) + { + _VtxWritePtr[0].pos = points[i]; _VtxWritePtr[0].uv = opaque_uv; _VtxWritePtr[0].col = col; // Center of line + _VtxWritePtr[1].pos = temp_points[i * 2 + 0]; _VtxWritePtr[1].uv = opaque_uv; _VtxWritePtr[1].col = col_trans; // Left-side outer edge + _VtxWritePtr[2].pos = temp_points[i * 2 + 1]; _VtxWritePtr[2].uv = opaque_uv; _VtxWritePtr[2].col = col_trans; // Right-side outer edge + _VtxWritePtr += 3; + } } } else { + // [PATH 2] Non texture-based lines (thick): we need to draw the solid line core and thus require four vertices per point const float half_inner_thickness = (thickness - AA_SIZE) * 0.5f; + + // If line is not closed, the first and last points need to be generated differently as there are no normals to blend if (!closed) { + const int points_last = points_count - 1; temp_points[0] = points[0] + temp_normals[0] * (half_inner_thickness + AA_SIZE); temp_points[1] = points[0] + temp_normals[0] * (half_inner_thickness); temp_points[2] = points[0] - temp_normals[0] * (half_inner_thickness); temp_points[3] = points[0] - temp_normals[0] * (half_inner_thickness + AA_SIZE); - temp_points[(points_count-1)*4+0] = points[points_count-1] + temp_normals[points_count-1] * (half_inner_thickness + AA_SIZE); - temp_points[(points_count-1)*4+1] = points[points_count-1] + temp_normals[points_count-1] * (half_inner_thickness); - temp_points[(points_count-1)*4+2] = points[points_count-1] - temp_normals[points_count-1] * (half_inner_thickness); - temp_points[(points_count-1)*4+3] = points[points_count-1] - temp_normals[points_count-1] * (half_inner_thickness + AA_SIZE); + temp_points[points_last * 4 + 0] = points[points_last] + temp_normals[points_last] * (half_inner_thickness + AA_SIZE); + temp_points[points_last * 4 + 1] = points[points_last] + temp_normals[points_last] * (half_inner_thickness); + temp_points[points_last * 4 + 2] = points[points_last] - temp_normals[points_last] * (half_inner_thickness); + temp_points[points_last * 4 + 3] = points[points_last] - temp_normals[points_last] * (half_inner_thickness + AA_SIZE); } + // Generate the indices to form a number of triangles for each line segment, and the vertices for the line edges + // This takes points n and n+1 and writes into n+1, with the first point in a closed line being generated from the final one (as n+1 wraps) // FIXME-OPT: Merge the different loops, possibly remove the temporary buffer. - unsigned int idx1 = _VtxCurrentIdx; - for (int i1 = 0; i1 < count; i1++) + unsigned int idx1 = _VtxCurrentIdx; // Vertex index for start of line segment + for (int i1 = 0; i1 < count; i1++) // i1 is the first point of the line segment { - const int i2 = (i1+1) == points_count ? 0 : i1+1; - unsigned int idx2 = (i1+1) == points_count ? _VtxCurrentIdx : idx1+4; + const int i2 = (i1 + 1) == points_count ? 0 : (i1 + 1); // i2 is the second point of the line segment + const unsigned int idx2 = (i1 + 1) == points_count ? _VtxCurrentIdx : (idx1 + 4); // Vertex index for end of segment // Average normals float dm_x = (temp_normals[i1].x + temp_normals[i2].x) * 0.5f; @@ -710,8 +957,8 @@ void ImDrawList::AddPolyline(const ImVec2* points, const int points_count, ImU32 float dm_in_x = dm_x * half_inner_thickness; float dm_in_y = dm_y * half_inner_thickness; - // Add temporary vertexes - ImVec2* out_vtx = &temp_points[i2*4]; + // Add temporary vertices + ImVec2* out_vtx = &temp_points[i2 * 4]; out_vtx[0].x = points[i2].x + dm_out_x; out_vtx[0].y = points[i2].y + dm_out_y; out_vtx[1].x = points[i2].x + dm_in_x; @@ -722,24 +969,24 @@ void ImDrawList::AddPolyline(const ImVec2* points, const int points_count, ImU32 out_vtx[3].y = points[i2].y - dm_out_y; // Add indexes - _IdxWritePtr[0] = (ImDrawIdx)(idx2+1); _IdxWritePtr[1] = (ImDrawIdx)(idx1+1); _IdxWritePtr[2] = (ImDrawIdx)(idx1+2); - _IdxWritePtr[3] = (ImDrawIdx)(idx1+2); _IdxWritePtr[4] = (ImDrawIdx)(idx2+2); _IdxWritePtr[5] = (ImDrawIdx)(idx2+1); - _IdxWritePtr[6] = (ImDrawIdx)(idx2+1); _IdxWritePtr[7] = (ImDrawIdx)(idx1+1); _IdxWritePtr[8] = (ImDrawIdx)(idx1+0); - _IdxWritePtr[9] = (ImDrawIdx)(idx1+0); _IdxWritePtr[10] = (ImDrawIdx)(idx2+0); _IdxWritePtr[11] = (ImDrawIdx)(idx2+1); - _IdxWritePtr[12] = (ImDrawIdx)(idx2+2); _IdxWritePtr[13] = (ImDrawIdx)(idx1+2); _IdxWritePtr[14] = (ImDrawIdx)(idx1+3); - _IdxWritePtr[15] = (ImDrawIdx)(idx1+3); _IdxWritePtr[16] = (ImDrawIdx)(idx2+3); _IdxWritePtr[17] = (ImDrawIdx)(idx2+2); + _IdxWritePtr[0] = (ImDrawIdx)(idx2 + 1); _IdxWritePtr[1] = (ImDrawIdx)(idx1 + 1); _IdxWritePtr[2] = (ImDrawIdx)(idx1 + 2); + _IdxWritePtr[3] = (ImDrawIdx)(idx1 + 2); _IdxWritePtr[4] = (ImDrawIdx)(idx2 + 2); _IdxWritePtr[5] = (ImDrawIdx)(idx2 + 1); + _IdxWritePtr[6] = (ImDrawIdx)(idx2 + 1); _IdxWritePtr[7] = (ImDrawIdx)(idx1 + 1); _IdxWritePtr[8] = (ImDrawIdx)(idx1 + 0); + _IdxWritePtr[9] = (ImDrawIdx)(idx1 + 0); _IdxWritePtr[10] = (ImDrawIdx)(idx2 + 0); _IdxWritePtr[11] = (ImDrawIdx)(idx2 + 1); + _IdxWritePtr[12] = (ImDrawIdx)(idx2 + 2); _IdxWritePtr[13] = (ImDrawIdx)(idx1 + 2); _IdxWritePtr[14] = (ImDrawIdx)(idx1 + 3); + _IdxWritePtr[15] = (ImDrawIdx)(idx1 + 3); _IdxWritePtr[16] = (ImDrawIdx)(idx2 + 3); _IdxWritePtr[17] = (ImDrawIdx)(idx2 + 2); _IdxWritePtr += 18; idx1 = idx2; } - // Add vertexes + // Add vertices for (int i = 0; i < points_count; i++) { - _VtxWritePtr[0].pos = temp_points[i*4+0]; _VtxWritePtr[0].uv = uv; _VtxWritePtr[0].col = col_trans; - _VtxWritePtr[1].pos = temp_points[i*4+1]; _VtxWritePtr[1].uv = uv; _VtxWritePtr[1].col = col; - _VtxWritePtr[2].pos = temp_points[i*4+2]; _VtxWritePtr[2].uv = uv; _VtxWritePtr[2].col = col; - _VtxWritePtr[3].pos = temp_points[i*4+3]; _VtxWritePtr[3].uv = uv; _VtxWritePtr[3].col = col_trans; + _VtxWritePtr[0].pos = temp_points[i * 4 + 0]; _VtxWritePtr[0].uv = opaque_uv; _VtxWritePtr[0].col = col_trans; + _VtxWritePtr[1].pos = temp_points[i * 4 + 1]; _VtxWritePtr[1].uv = opaque_uv; _VtxWritePtr[1].col = col; + _VtxWritePtr[2].pos = temp_points[i * 4 + 2]; _VtxWritePtr[2].uv = opaque_uv; _VtxWritePtr[2].col = col; + _VtxWritePtr[3].pos = temp_points[i * 4 + 3]; _VtxWritePtr[3].uv = opaque_uv; _VtxWritePtr[3].col = col_trans; _VtxWritePtr += 4; } } @@ -747,14 +994,14 @@ void ImDrawList::AddPolyline(const ImVec2* points, const int points_count, ImU32 } else { - // Non Anti-aliased Stroke - const int idx_count = count*6; - const int vtx_count = count*4; // FIXME-OPT: Not sharing edges + // [PATH 4] Non texture-based, Non anti-aliased lines + const int idx_count = count * 6; + const int vtx_count = count * 4; // FIXME-OPT: Not sharing edges PrimReserve(idx_count, vtx_count); for (int i1 = 0; i1 < count; i1++) { - const int i2 = (i1+1) == points_count ? 0 : i1+1; + const int i2 = (i1 + 1) == points_count ? 0 : i1 + 1; const ImVec2& p1 = points[i1]; const ImVec2& p2 = points[i2]; @@ -764,24 +1011,25 @@ void ImDrawList::AddPolyline(const ImVec2* points, const int points_count, ImU32 dx *= (thickness * 0.5f); dy *= (thickness * 0.5f); - _VtxWritePtr[0].pos.x = p1.x + dy; _VtxWritePtr[0].pos.y = p1.y - dx; _VtxWritePtr[0].uv = uv; _VtxWritePtr[0].col = col; - _VtxWritePtr[1].pos.x = p2.x + dy; _VtxWritePtr[1].pos.y = p2.y - dx; _VtxWritePtr[1].uv = uv; _VtxWritePtr[1].col = col; - _VtxWritePtr[2].pos.x = p2.x - dy; _VtxWritePtr[2].pos.y = p2.y + dx; _VtxWritePtr[2].uv = uv; _VtxWritePtr[2].col = col; - _VtxWritePtr[3].pos.x = p1.x - dy; _VtxWritePtr[3].pos.y = p1.y + dx; _VtxWritePtr[3].uv = uv; _VtxWritePtr[3].col = col; + _VtxWritePtr[0].pos.x = p1.x + dy; _VtxWritePtr[0].pos.y = p1.y - dx; _VtxWritePtr[0].uv = opaque_uv; _VtxWritePtr[0].col = col; + _VtxWritePtr[1].pos.x = p2.x + dy; _VtxWritePtr[1].pos.y = p2.y - dx; _VtxWritePtr[1].uv = opaque_uv; _VtxWritePtr[1].col = col; + _VtxWritePtr[2].pos.x = p2.x - dy; _VtxWritePtr[2].pos.y = p2.y + dx; _VtxWritePtr[2].uv = opaque_uv; _VtxWritePtr[2].col = col; + _VtxWritePtr[3].pos.x = p1.x - dy; _VtxWritePtr[3].pos.y = p1.y + dx; _VtxWritePtr[3].uv = opaque_uv; _VtxWritePtr[3].col = col; _VtxWritePtr += 4; - _IdxWritePtr[0] = (ImDrawIdx)(_VtxCurrentIdx); _IdxWritePtr[1] = (ImDrawIdx)(_VtxCurrentIdx+1); _IdxWritePtr[2] = (ImDrawIdx)(_VtxCurrentIdx+2); - _IdxWritePtr[3] = (ImDrawIdx)(_VtxCurrentIdx); _IdxWritePtr[4] = (ImDrawIdx)(_VtxCurrentIdx+2); _IdxWritePtr[5] = (ImDrawIdx)(_VtxCurrentIdx+3); + _IdxWritePtr[0] = (ImDrawIdx)(_VtxCurrentIdx); _IdxWritePtr[1] = (ImDrawIdx)(_VtxCurrentIdx + 1); _IdxWritePtr[2] = (ImDrawIdx)(_VtxCurrentIdx + 2); + _IdxWritePtr[3] = (ImDrawIdx)(_VtxCurrentIdx); _IdxWritePtr[4] = (ImDrawIdx)(_VtxCurrentIdx + 2); _IdxWritePtr[5] = (ImDrawIdx)(_VtxCurrentIdx + 3); _IdxWritePtr += 6; _VtxCurrentIdx += 4; } } } -// We intentionally avoid using ImVec2 and its math operators here to reduce cost to a minimum for debug/non-inlined builds. +// - We intentionally avoid using ImVec2 and its math operators here to reduce cost to a minimum for debug/non-inlined builds. +// - Filled shapes must always use clockwise winding order. The anti-aliasing fringe depends on it. Counter-clockwise shapes will have "inward" anti-aliasing. void ImDrawList::AddConvexPolyFilled(const ImVec2* points, const int points_count, ImU32 col) { - if (points_count < 3) + if (points_count < 3 || (col & IM_COL32_A_MASK) == 0) return; const ImVec2 uv = _Data->TexUvWhitePixel; @@ -789,24 +1037,25 @@ void ImDrawList::AddConvexPolyFilled(const ImVec2* points, const int points_coun if (Flags & ImDrawListFlags_AntiAliasedFill) { // Anti-aliased Fill - const float AA_SIZE = 1.0f; + const float AA_SIZE = _FringeScale; const ImU32 col_trans = col & ~IM_COL32_A_MASK; - const int idx_count = (points_count-2)*3 + points_count*6; - const int vtx_count = (points_count*2); + const int idx_count = (points_count - 2)*3 + points_count * 6; + const int vtx_count = (points_count * 2); PrimReserve(idx_count, vtx_count); // Add indexes for fill unsigned int vtx_inner_idx = _VtxCurrentIdx; - unsigned int vtx_outer_idx = _VtxCurrentIdx+1; + unsigned int vtx_outer_idx = _VtxCurrentIdx + 1; for (int i = 2; i < points_count; i++) { - _IdxWritePtr[0] = (ImDrawIdx)(vtx_inner_idx); _IdxWritePtr[1] = (ImDrawIdx)(vtx_inner_idx+((i-1)<<1)); _IdxWritePtr[2] = (ImDrawIdx)(vtx_inner_idx+(i<<1)); + _IdxWritePtr[0] = (ImDrawIdx)(vtx_inner_idx); _IdxWritePtr[1] = (ImDrawIdx)(vtx_inner_idx + ((i - 1) << 1)); _IdxWritePtr[2] = (ImDrawIdx)(vtx_inner_idx + (i << 1)); _IdxWritePtr += 3; } // Compute normals - ImVec2* temp_normals = (ImVec2*)alloca(points_count * sizeof(ImVec2)); //-V630 - for (int i0 = points_count-1, i1 = 0; i1 < points_count; i0 = i1++) + _Data->TempBuffer.reserve_discard(points_count); + ImVec2* temp_normals = _Data->TempBuffer.Data; + for (int i0 = points_count - 1, i1 = 0; i1 < points_count; i0 = i1++) { const ImVec2& p0 = points[i0]; const ImVec2& p1 = points[i1]; @@ -817,7 +1066,7 @@ void ImDrawList::AddConvexPolyFilled(const ImVec2* points, const int points_coun temp_normals[i0].y = -dx; } - for (int i0 = points_count-1, i1 = 0; i1 < points_count; i0 = i1++) + for (int i0 = points_count - 1, i1 = 0; i1 < points_count; i0 = i1++) { // Average normals const ImVec2& n0 = temp_normals[i0]; @@ -834,8 +1083,8 @@ void ImDrawList::AddConvexPolyFilled(const ImVec2* points, const int points_coun _VtxWritePtr += 2; // Add indexes for fringes - _IdxWritePtr[0] = (ImDrawIdx)(vtx_inner_idx+(i1<<1)); _IdxWritePtr[1] = (ImDrawIdx)(vtx_inner_idx+(i0<<1)); _IdxWritePtr[2] = (ImDrawIdx)(vtx_outer_idx+(i0<<1)); - _IdxWritePtr[3] = (ImDrawIdx)(vtx_outer_idx+(i0<<1)); _IdxWritePtr[4] = (ImDrawIdx)(vtx_outer_idx+(i1<<1)); _IdxWritePtr[5] = (ImDrawIdx)(vtx_inner_idx+(i1<<1)); + _IdxWritePtr[0] = (ImDrawIdx)(vtx_inner_idx + (i1 << 1)); _IdxWritePtr[1] = (ImDrawIdx)(vtx_inner_idx + (i0 << 1)); _IdxWritePtr[2] = (ImDrawIdx)(vtx_outer_idx + (i0 << 1)); + _IdxWritePtr[3] = (ImDrawIdx)(vtx_outer_idx + (i0 << 1)); _IdxWritePtr[4] = (ImDrawIdx)(vtx_outer_idx + (i1 << 1)); _IdxWritePtr[5] = (ImDrawIdx)(vtx_inner_idx + (i1 << 1)); _IdxWritePtr += 6; } _VtxCurrentIdx += (ImDrawIdx)vtx_count; @@ -843,7 +1092,7 @@ void ImDrawList::AddConvexPolyFilled(const ImVec2* points, const int points_coun else { // Non Anti-aliased Fill - const int idx_count = (points_count-2)*3; + const int idx_count = (points_count - 2)*3; const int vtx_count = points_count; PrimReserve(idx_count, vtx_count); for (int i = 0; i < vtx_count; i++) @@ -853,31 +1102,108 @@ void ImDrawList::AddConvexPolyFilled(const ImVec2* points, const int points_coun } for (int i = 2; i < points_count; i++) { - _IdxWritePtr[0] = (ImDrawIdx)(_VtxCurrentIdx); _IdxWritePtr[1] = (ImDrawIdx)(_VtxCurrentIdx+i-1); _IdxWritePtr[2] = (ImDrawIdx)(_VtxCurrentIdx+i); + _IdxWritePtr[0] = (ImDrawIdx)(_VtxCurrentIdx); _IdxWritePtr[1] = (ImDrawIdx)(_VtxCurrentIdx + i - 1); _IdxWritePtr[2] = (ImDrawIdx)(_VtxCurrentIdx + i); _IdxWritePtr += 3; } _VtxCurrentIdx += (ImDrawIdx)vtx_count; } } -void ImDrawList::PathArcToFast(const ImVec2& center, float radius, int a_min_of_12, int a_max_of_12) +void ImDrawList::_PathArcToFastEx(const ImVec2& center, float radius, int a_min_sample, int a_max_sample, int a_step) { - if (radius == 0.0f || a_min_of_12 > a_max_of_12) + if (radius < 0.5f) { _Path.push_back(center); return; } - _Path.reserve(_Path.Size + (a_max_of_12 - a_min_of_12 + 1)); - for (int a = a_min_of_12; a <= a_max_of_12; a++) + + // Calculate arc auto segment step size + if (a_step <= 0) + a_step = IM_DRAWLIST_ARCFAST_SAMPLE_MAX / _CalcCircleAutoSegmentCount(radius); + + // Make sure we never do steps larger than one quarter of the circle + a_step = ImClamp(a_step, 1, IM_DRAWLIST_ARCFAST_TABLE_SIZE / 4); + + const int sample_range = ImAbs(a_max_sample - a_min_sample); + const int a_next_step = a_step; + + int samples = sample_range + 1; + bool extra_max_sample = false; + if (a_step > 1) { - const ImVec2& c = _Data->CircleVtx12[a % IM_ARRAYSIZE(_Data->CircleVtx12)]; - _Path.push_back(ImVec2(center.x + c.x * radius, center.y + c.y * radius)); + samples = sample_range / a_step + 1; + const int overstep = sample_range % a_step; + + if (overstep > 0) + { + extra_max_sample = true; + samples++; + + // When we have overstep to avoid awkwardly looking one long line and one tiny one at the end, + // distribute first step range evenly between them by reducing first step size. + if (sample_range > 0) + a_step -= (a_step - overstep) / 2; + } } + + _Path.resize(_Path.Size + samples); + ImVec2* out_ptr = _Path.Data + (_Path.Size - samples); + + int sample_index = a_min_sample; + if (sample_index < 0 || sample_index >= IM_DRAWLIST_ARCFAST_SAMPLE_MAX) + { + sample_index = sample_index % IM_DRAWLIST_ARCFAST_SAMPLE_MAX; + if (sample_index < 0) + sample_index += IM_DRAWLIST_ARCFAST_SAMPLE_MAX; + } + + if (a_max_sample >= a_min_sample) + { + for (int a = a_min_sample; a <= a_max_sample; a += a_step, sample_index += a_step, a_step = a_next_step) + { + // a_step is clamped to IM_DRAWLIST_ARCFAST_SAMPLE_MAX, so we have guaranteed that it will not wrap over range twice or more + if (sample_index >= IM_DRAWLIST_ARCFAST_SAMPLE_MAX) + sample_index -= IM_DRAWLIST_ARCFAST_SAMPLE_MAX; + + const ImVec2 s = _Data->ArcFastVtx[sample_index]; + out_ptr->x = center.x + s.x * radius; + out_ptr->y = center.y + s.y * radius; + out_ptr++; + } + } + else + { + for (int a = a_min_sample; a >= a_max_sample; a -= a_step, sample_index -= a_step, a_step = a_next_step) + { + // a_step is clamped to IM_DRAWLIST_ARCFAST_SAMPLE_MAX, so we have guaranteed that it will not wrap over range twice or more + if (sample_index < 0) + sample_index += IM_DRAWLIST_ARCFAST_SAMPLE_MAX; + + const ImVec2 s = _Data->ArcFastVtx[sample_index]; + out_ptr->x = center.x + s.x * radius; + out_ptr->y = center.y + s.y * radius; + out_ptr++; + } + } + + if (extra_max_sample) + { + int normalized_max_sample = a_max_sample % IM_DRAWLIST_ARCFAST_SAMPLE_MAX; + if (normalized_max_sample < 0) + normalized_max_sample += IM_DRAWLIST_ARCFAST_SAMPLE_MAX; + + const ImVec2 s = _Data->ArcFastVtx[normalized_max_sample]; + out_ptr->x = center.x + s.x * radius; + out_ptr->y = center.y + s.y * radius; + out_ptr++; + } + + IM_ASSERT_PARANOID(_Path.Data + _Path.Size == out_ptr); } -void ImDrawList::PathArcTo(const ImVec2& center, float radius, float a_min, float a_max, int num_segments) +void ImDrawList::_PathArcToN(const ImVec2& center, float radius, float a_min, float a_max, int num_segments) { - if (radius == 0.0f) + if (radius < 0.5f) { _Path.push_back(center); return; @@ -893,62 +1219,215 @@ void ImDrawList::PathArcTo(const ImVec2& center, float radius, float a_min, floa } } -static void PathBezierToCasteljau(ImVector* path, float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4, float tess_tol, int level) +// 0: East, 3: South, 6: West, 9: North, 12: East +void ImDrawList::PathArcToFast(const ImVec2& center, float radius, int a_min_of_12, int a_max_of_12) +{ + if (radius < 0.5f) + { + _Path.push_back(center); + return; + } + _PathArcToFastEx(center, radius, a_min_of_12 * IM_DRAWLIST_ARCFAST_SAMPLE_MAX / 12, a_max_of_12 * IM_DRAWLIST_ARCFAST_SAMPLE_MAX / 12, 0); +} + +void ImDrawList::PathArcTo(const ImVec2& center, float radius, float a_min, float a_max, int num_segments) +{ + if (radius < 0.5f) + { + _Path.push_back(center); + return; + } + + if (num_segments > 0) + { + _PathArcToN(center, radius, a_min, a_max, num_segments); + return; + } + + // Automatic segment count + if (radius <= _Data->ArcFastRadiusCutoff) + { + const bool a_is_reverse = a_max < a_min; + + // We are going to use precomputed values for mid samples. + // Determine first and last sample in lookup table that belong to the arc. + const float a_min_sample_f = IM_DRAWLIST_ARCFAST_SAMPLE_MAX * a_min / (IM_PI * 2.0f); + const float a_max_sample_f = IM_DRAWLIST_ARCFAST_SAMPLE_MAX * a_max / (IM_PI * 2.0f); + + const int a_min_sample = a_is_reverse ? (int)ImFloor(a_min_sample_f) : (int)ImCeil(a_min_sample_f); + const int a_max_sample = a_is_reverse ? (int)ImCeil(a_max_sample_f) : (int)ImFloor(a_max_sample_f); + const int a_mid_samples = a_is_reverse ? ImMax(a_min_sample - a_max_sample, 0) : ImMax(a_max_sample - a_min_sample, 0); + + const float a_min_segment_angle = a_min_sample * IM_PI * 2.0f / IM_DRAWLIST_ARCFAST_SAMPLE_MAX; + const float a_max_segment_angle = a_max_sample * IM_PI * 2.0f / IM_DRAWLIST_ARCFAST_SAMPLE_MAX; + const bool a_emit_start = ImAbs(a_min_segment_angle - a_min) >= 1e-5f; + const bool a_emit_end = ImAbs(a_max - a_max_segment_angle) >= 1e-5f; + + _Path.reserve(_Path.Size + (a_mid_samples + 1 + (a_emit_start ? 1 : 0) + (a_emit_end ? 1 : 0))); + if (a_emit_start) + _Path.push_back(ImVec2(center.x + ImCos(a_min) * radius, center.y + ImSin(a_min) * radius)); + if (a_mid_samples > 0) + _PathArcToFastEx(center, radius, a_min_sample, a_max_sample, 0); + if (a_emit_end) + _Path.push_back(ImVec2(center.x + ImCos(a_max) * radius, center.y + ImSin(a_max) * radius)); + } + else + { + const float arc_length = ImAbs(a_max - a_min); + const int circle_segment_count = _CalcCircleAutoSegmentCount(radius); + const int arc_segment_count = ImMax((int)ImCeil(circle_segment_count * arc_length / (IM_PI * 2.0f)), (int)(2.0f * IM_PI / arc_length)); + _PathArcToN(center, radius, a_min, a_max, arc_segment_count); + } +} + +void ImDrawList::PathEllipticalArcTo(const ImVec2& center, const ImVec2& radius, float rot, float a_min, float a_max, int num_segments) +{ + if (num_segments <= 0) + num_segments = _CalcCircleAutoSegmentCount(ImMax(radius.x, radius.y)); // A bit pessimistic, maybe there's a better computation to do here. + + _Path.reserve(_Path.Size + (num_segments + 1)); + + const float cos_rot = ImCos(rot); + const float sin_rot = ImSin(rot); + for (int i = 0; i <= num_segments; i++) + { + const float a = a_min + ((float)i / (float)num_segments) * (a_max - a_min); + ImVec2 point(ImCos(a) * radius.x, ImSin(a) * radius.y); + const ImVec2 rel((point.x * cos_rot) - (point.y * sin_rot), (point.x * sin_rot) + (point.y * cos_rot)); + point.x = rel.x + center.x; + point.y = rel.y + center.y; + _Path.push_back(point); + } +} + +ImVec2 ImBezierCubicCalc(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, float t) +{ + float u = 1.0f - t; + float w1 = u * u * u; + float w2 = 3 * u * u * t; + float w3 = 3 * u * t * t; + float w4 = t * t * t; + return ImVec2(w1 * p1.x + w2 * p2.x + w3 * p3.x + w4 * p4.x, w1 * p1.y + w2 * p2.y + w3 * p3.y + w4 * p4.y); +} + +ImVec2 ImBezierQuadraticCalc(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, float t) +{ + float u = 1.0f - t; + float w1 = u * u; + float w2 = 2 * u * t; + float w3 = t * t; + return ImVec2(w1 * p1.x + w2 * p2.x + w3 * p3.x, w1 * p1.y + w2 * p2.y + w3 * p3.y); +} + +// Closely mimics ImBezierCubicClosestPointCasteljau() in imgui.cpp +static void PathBezierCubicCurveToCasteljau(ImVector* path, float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4, float tess_tol, int level) { float dx = x4 - x1; float dy = y4 - y1; - float d2 = ((x2 - x4) * dy - (y2 - y4) * dx); - float d3 = ((x3 - x4) * dy - (y3 - y4) * dx); + float d2 = (x2 - x4) * dy - (y2 - y4) * dx; + float d3 = (x3 - x4) * dy - (y3 - y4) * dx; d2 = (d2 >= 0) ? d2 : -d2; d3 = (d3 >= 0) ? d3 : -d3; - if ((d2+d3) * (d2+d3) < tess_tol * (dx*dx + dy*dy)) + if ((d2 + d3) * (d2 + d3) < tess_tol * (dx * dx + dy * dy)) { path->push_back(ImVec2(x4, y4)); } else if (level < 10) { - float x12 = (x1+x2)*0.5f, y12 = (y1+y2)*0.5f; - float x23 = (x2+x3)*0.5f, y23 = (y2+y3)*0.5f; - float x34 = (x3+x4)*0.5f, y34 = (y3+y4)*0.5f; - float x123 = (x12+x23)*0.5f, y123 = (y12+y23)*0.5f; - float x234 = (x23+x34)*0.5f, y234 = (y23+y34)*0.5f; - float x1234 = (x123+x234)*0.5f, y1234 = (y123+y234)*0.5f; - - PathBezierToCasteljau(path, x1,y1, x12,y12, x123,y123, x1234,y1234, tess_tol, level+1); - PathBezierToCasteljau(path, x1234,y1234, x234,y234, x34,y34, x4,y4, tess_tol, level+1); + float x12 = (x1 + x2) * 0.5f, y12 = (y1 + y2) * 0.5f; + float x23 = (x2 + x3) * 0.5f, y23 = (y2 + y3) * 0.5f; + float x34 = (x3 + x4) * 0.5f, y34 = (y3 + y4) * 0.5f; + float x123 = (x12 + x23) * 0.5f, y123 = (y12 + y23) * 0.5f; + float x234 = (x23 + x34) * 0.5f, y234 = (y23 + y34) * 0.5f; + float x1234 = (x123 + x234) * 0.5f, y1234 = (y123 + y234) * 0.5f; + PathBezierCubicCurveToCasteljau(path, x1, y1, x12, y12, x123, y123, x1234, y1234, tess_tol, level + 1); + PathBezierCubicCurveToCasteljau(path, x1234, y1234, x234, y234, x34, y34, x4, y4, tess_tol, level + 1); } } -void ImDrawList::PathBezierCurveTo(const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, int num_segments) +static void PathBezierQuadraticCurveToCasteljau(ImVector* path, float x1, float y1, float x2, float y2, float x3, float y3, float tess_tol, int level) +{ + float dx = x3 - x1, dy = y3 - y1; + float det = (x2 - x3) * dy - (y2 - y3) * dx; + if (det * det * 4.0f < tess_tol * (dx * dx + dy * dy)) + { + path->push_back(ImVec2(x3, y3)); + } + else if (level < 10) + { + float x12 = (x1 + x2) * 0.5f, y12 = (y1 + y2) * 0.5f; + float x23 = (x2 + x3) * 0.5f, y23 = (y2 + y3) * 0.5f; + float x123 = (x12 + x23) * 0.5f, y123 = (y12 + y23) * 0.5f; + PathBezierQuadraticCurveToCasteljau(path, x1, y1, x12, y12, x123, y123, tess_tol, level + 1); + PathBezierQuadraticCurveToCasteljau(path, x123, y123, x23, y23, x3, y3, tess_tol, level + 1); + } +} + +void ImDrawList::PathBezierCubicCurveTo(const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, int num_segments) { ImVec2 p1 = _Path.back(); if (num_segments == 0) { - // Auto-tessellated - PathBezierToCasteljau(&_Path, p1.x, p1.y, p2.x, p2.y, p3.x, p3.y, p4.x, p4.y, _Data->CurveTessellationTol, 0); + IM_ASSERT(_Data->CurveTessellationTol > 0.0f); + PathBezierCubicCurveToCasteljau(&_Path, p1.x, p1.y, p2.x, p2.y, p3.x, p3.y, p4.x, p4.y, _Data->CurveTessellationTol, 0); // Auto-tessellated } else { float t_step = 1.0f / (float)num_segments; for (int i_step = 1; i_step <= num_segments; i_step++) - { - float t = t_step * i_step; - float u = 1.0f - t; - float w1 = u*u*u; - float w2 = 3*u*u*t; - float w3 = 3*u*t*t; - float w4 = t*t*t; - _Path.push_back(ImVec2(w1*p1.x + w2*p2.x + w3*p3.x + w4*p4.x, w1*p1.y + w2*p2.y + w3*p3.y + w4*p4.y)); - } + _Path.push_back(ImBezierCubicCalc(p1, p2, p3, p4, t_step * i_step)); } } -void ImDrawList::PathRect(const ImVec2& a, const ImVec2& b, float rounding, ImDrawCornerFlags rounding_corners) +void ImDrawList::PathBezierQuadraticCurveTo(const ImVec2& p2, const ImVec2& p3, int num_segments) { - rounding = ImMin(rounding, ImFabs(b.x - a.x) * ( ((rounding_corners & ImDrawCornerFlags_Top) == ImDrawCornerFlags_Top) || ((rounding_corners & ImDrawCornerFlags_Bot) == ImDrawCornerFlags_Bot) ? 0.5f : 1.0f ) - 1.0f); - rounding = ImMin(rounding, ImFabs(b.y - a.y) * ( ((rounding_corners & ImDrawCornerFlags_Left) == ImDrawCornerFlags_Left) || ((rounding_corners & ImDrawCornerFlags_Right) == ImDrawCornerFlags_Right) ? 0.5f : 1.0f ) - 1.0f); + ImVec2 p1 = _Path.back(); + if (num_segments == 0) + { + IM_ASSERT(_Data->CurveTessellationTol > 0.0f); + PathBezierQuadraticCurveToCasteljau(&_Path, p1.x, p1.y, p2.x, p2.y, p3.x, p3.y, _Data->CurveTessellationTol, 0);// Auto-tessellated + } + else + { + float t_step = 1.0f / (float)num_segments; + for (int i_step = 1; i_step <= num_segments; i_step++) + _Path.push_back(ImBezierQuadraticCalc(p1, p2, p3, t_step * i_step)); + } +} - if (rounding <= 0.0f || rounding_corners == 0) +static inline ImDrawFlags FixRectCornerFlags(ImDrawFlags flags) +{ + /* + IM_STATIC_ASSERT(ImDrawFlags_RoundCornersTopLeft == (1 << 4)); +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + // Obsoleted in 1.82 (from February 2021). This code was stripped/simplified and mostly commented in 1.90 (from September 2023) + // - Legacy Support for hard coded ~0 (used to be a suggested equivalent to ImDrawCornerFlags_All) + if (flags == ~0) { return ImDrawFlags_RoundCornersAll; } + // - Legacy Support for hard coded 0x01 to 0x0F (matching 15 out of 16 old flags combinations). Read details in older version of this code. + if (flags >= 0x01 && flags <= 0x0F) { return (flags << 4); } + // We cannot support hard coded 0x00 with 'float rounding > 0.0f' --> replace with ImDrawFlags_RoundCornersNone or use 'float rounding = 0.0f' +#endif + */ + // If this assert triggers, please update your code replacing hardcoded values with new ImDrawFlags_RoundCorners* values. + // Note that ImDrawFlags_Closed (== 0x01) is an invalid flag for AddRect(), AddRectFilled(), PathRect() etc. anyway. + // See details in 1.82 Changelog as well as 2021/03/12 and 2023/09/08 entries in "API BREAKING CHANGES" section. + IM_ASSERT((flags & 0x0F) == 0 && "Misuse of legacy hardcoded ImDrawCornerFlags values!"); + + if ((flags & ImDrawFlags_RoundCornersMask_) == 0) + flags |= ImDrawFlags_RoundCornersAll; + + return flags; +} + +void ImDrawList::PathRect(const ImVec2& a, const ImVec2& b, float rounding, ImDrawFlags flags) +{ + if (rounding >= 0.5f) + { + flags = FixRectCornerFlags(flags); + rounding = ImMin(rounding, ImFabs(b.x - a.x) * (((flags & ImDrawFlags_RoundCornersTop) == ImDrawFlags_RoundCornersTop) || ((flags & ImDrawFlags_RoundCornersBottom) == ImDrawFlags_RoundCornersBottom) ? 0.5f : 1.0f) - 1.0f); + rounding = ImMin(rounding, ImFabs(b.y - a.y) * (((flags & ImDrawFlags_RoundCornersLeft) == ImDrawFlags_RoundCornersLeft) || ((flags & ImDrawFlags_RoundCornersRight) == ImDrawFlags_RoundCornersRight) ? 0.5f : 1.0f) - 1.0f); + } + if (rounding < 0.5f || (flags & ImDrawFlags_RoundCornersMask_) == ImDrawFlags_RoundCornersNone) { PathLineTo(a); PathLineTo(ImVec2(b.x, a.y)); @@ -957,10 +1436,10 @@ void ImDrawList::PathRect(const ImVec2& a, const ImVec2& b, float rounding, ImDr } else { - const float rounding_tl = (rounding_corners & ImDrawCornerFlags_TopLeft) ? rounding : 0.0f; - const float rounding_tr = (rounding_corners & ImDrawCornerFlags_TopRight) ? rounding : 0.0f; - const float rounding_br = (rounding_corners & ImDrawCornerFlags_BotRight) ? rounding : 0.0f; - const float rounding_bl = (rounding_corners & ImDrawCornerFlags_BotLeft) ? rounding : 0.0f; + const float rounding_tl = (flags & ImDrawFlags_RoundCornersTopLeft) ? rounding : 0.0f; + const float rounding_tr = (flags & ImDrawFlags_RoundCornersTopRight) ? rounding : 0.0f; + const float rounding_br = (flags & ImDrawFlags_RoundCornersBottomRight) ? rounding : 0.0f; + const float rounding_bl = (flags & ImDrawFlags_RoundCornersBottomLeft) ? rounding : 0.0f; PathArcToFast(ImVec2(a.x + rounding_tl, a.y + rounding_tl), rounding_tl, 6, 9); PathArcToFast(ImVec2(b.x - rounding_tr, a.y + rounding_tr), rounding_tr, 9, 12); PathArcToFast(ImVec2(b.x - rounding_br, b.y - rounding_br), rounding_br, 0, 3); @@ -974,36 +1453,36 @@ void ImDrawList::AddLine(const ImVec2& p1, const ImVec2& p2, ImU32 col, float th return; PathLineTo(p1 + ImVec2(0.5f, 0.5f)); PathLineTo(p2 + ImVec2(0.5f, 0.5f)); - PathStroke(col, false, thickness); + PathStroke(col, 0, thickness); } // p_min = upper-left, p_max = lower-right // Note we don't render 1 pixels sized rectangles properly. -void ImDrawList::AddRect(const ImVec2& p_min, const ImVec2& p_max, ImU32 col, float rounding, ImDrawCornerFlags rounding_corners, float thickness) +void ImDrawList::AddRect(const ImVec2& p_min, const ImVec2& p_max, ImU32 col, float rounding, ImDrawFlags flags, float thickness) { if ((col & IM_COL32_A_MASK) == 0) return; if (Flags & ImDrawListFlags_AntiAliasedLines) - PathRect(p_min + ImVec2(0.50f,0.50f), p_max - ImVec2(0.50f,0.50f), rounding, rounding_corners); + PathRect(p_min + ImVec2(0.50f, 0.50f), p_max - ImVec2(0.50f, 0.50f), rounding, flags); else - PathRect(p_min + ImVec2(0.50f,0.50f), p_max - ImVec2(0.49f,0.49f), rounding, rounding_corners); // Better looking lower-right corner and rounded non-AA shapes. - PathStroke(col, true, thickness); + PathRect(p_min + ImVec2(0.50f, 0.50f), p_max - ImVec2(0.49f, 0.49f), rounding, flags); // Better looking lower-right corner and rounded non-AA shapes. + PathStroke(col, ImDrawFlags_Closed, thickness); } -void ImDrawList::AddRectFilled(const ImVec2& p_min, const ImVec2& p_max, ImU32 col, float rounding, ImDrawCornerFlags rounding_corners) +void ImDrawList::AddRectFilled(const ImVec2& p_min, const ImVec2& p_max, ImU32 col, float rounding, ImDrawFlags flags) { if ((col & IM_COL32_A_MASK) == 0) return; - if (rounding > 0.0f) - { - PathRect(p_min, p_max, rounding, rounding_corners); - PathFillConvex(col); - } - else + if (rounding < 0.5f || (flags & ImDrawFlags_RoundCornersMask_) == ImDrawFlags_RoundCornersNone) { PrimReserve(6, 4); PrimRect(p_min, p_max, col); } + else + { + PathRect(p_min, p_max, rounding, flags); + PathFillConvex(col); + } } // p_min = upper-left, p_max = lower-right @@ -1014,8 +1493,8 @@ void ImDrawList::AddRectFilledMultiColor(const ImVec2& p_min, const ImVec2& p_ma const ImVec2 uv = _Data->TexUvWhitePixel; PrimReserve(6, 4); - PrimWriteIdx((ImDrawIdx)(_VtxCurrentIdx)); PrimWriteIdx((ImDrawIdx)(_VtxCurrentIdx+1)); PrimWriteIdx((ImDrawIdx)(_VtxCurrentIdx+2)); - PrimWriteIdx((ImDrawIdx)(_VtxCurrentIdx)); PrimWriteIdx((ImDrawIdx)(_VtxCurrentIdx+2)); PrimWriteIdx((ImDrawIdx)(_VtxCurrentIdx+3)); + PrimWriteIdx((ImDrawIdx)(_VtxCurrentIdx)); PrimWriteIdx((ImDrawIdx)(_VtxCurrentIdx + 1)); PrimWriteIdx((ImDrawIdx)(_VtxCurrentIdx + 2)); + PrimWriteIdx((ImDrawIdx)(_VtxCurrentIdx)); PrimWriteIdx((ImDrawIdx)(_VtxCurrentIdx + 2)); PrimWriteIdx((ImDrawIdx)(_VtxCurrentIdx + 3)); PrimWriteVtx(p_min, uv, col_upr_left); PrimWriteVtx(ImVec2(p_max.x, p_min.y), uv, col_upr_right); PrimWriteVtx(p_max, uv, col_bot_right); @@ -1031,7 +1510,7 @@ void ImDrawList::AddQuad(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, c PathLineTo(p2); PathLineTo(p3); PathLineTo(p4); - PathStroke(col, true, thickness); + PathStroke(col, ImDrawFlags_Closed, thickness); } void ImDrawList::AddQuadFilled(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, ImU32 col) @@ -1054,7 +1533,7 @@ void ImDrawList::AddTriangle(const ImVec2& p1, const ImVec2& p2, const ImVec2& p PathLineTo(p1); PathLineTo(p2); PathLineTo(p3); - PathStroke(col, true, thickness); + PathStroke(col, ImDrawFlags_Closed, thickness); } void ImDrawList::AddTriangleFilled(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, ImU32 col) @@ -1069,6 +1548,55 @@ void ImDrawList::AddTriangleFilled(const ImVec2& p1, const ImVec2& p2, const ImV } void ImDrawList::AddCircle(const ImVec2& center, float radius, ImU32 col, int num_segments, float thickness) +{ + if ((col & IM_COL32_A_MASK) == 0 || radius < 0.5f) + return; + + if (num_segments <= 0) + { + // Use arc with automatic segment count + _PathArcToFastEx(center, radius - 0.5f, 0, IM_DRAWLIST_ARCFAST_SAMPLE_MAX, 0); + _Path.Size--; + } + else + { + // Explicit segment count (still clamp to avoid drawing insanely tessellated shapes) + num_segments = ImClamp(num_segments, 3, IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_MAX); + + // Because we are filling a closed shape we remove 1 from the count of segments/points + const float a_max = (IM_PI * 2.0f) * ((float)num_segments - 1.0f) / (float)num_segments; + PathArcTo(center, radius - 0.5f, 0.0f, a_max, num_segments - 1); + } + + PathStroke(col, ImDrawFlags_Closed, thickness); +} + +void ImDrawList::AddCircleFilled(const ImVec2& center, float radius, ImU32 col, int num_segments) +{ + if ((col & IM_COL32_A_MASK) == 0 || radius < 0.5f) + return; + + if (num_segments <= 0) + { + // Use arc with automatic segment count + _PathArcToFastEx(center, radius, 0, IM_DRAWLIST_ARCFAST_SAMPLE_MAX, 0); + _Path.Size--; + } + else + { + // Explicit segment count (still clamp to avoid drawing insanely tessellated shapes) + num_segments = ImClamp(num_segments, 3, IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_MAX); + + // Because we are filling a closed shape we remove 1 from the count of segments/points + const float a_max = (IM_PI * 2.0f) * ((float)num_segments - 1.0f) / (float)num_segments; + PathArcTo(center, radius, 0.0f, a_max, num_segments - 1); + } + + PathFillConvex(col); +} + +// Guaranteed to honor 'num_segments' +void ImDrawList::AddNgon(const ImVec2& center, float radius, ImU32 col, int num_segments, float thickness) { if ((col & IM_COL32_A_MASK) == 0 || num_segments <= 2) return; @@ -1076,10 +1604,11 @@ void ImDrawList::AddCircle(const ImVec2& center, float radius, ImU32 col, int nu // Because we are filling a closed shape we remove 1 from the count of segments/points const float a_max = (IM_PI * 2.0f) * ((float)num_segments - 1.0f) / (float)num_segments; PathArcTo(center, radius - 0.5f, 0.0f, a_max, num_segments - 1); - PathStroke(col, true, thickness); + PathStroke(col, ImDrawFlags_Closed, thickness); } -void ImDrawList::AddCircleFilled(const ImVec2& center, float radius, ImU32 col, int num_segments) +// Guaranteed to honor 'num_segments' +void ImDrawList::AddNgonFilled(const ImVec2& center, float radius, ImU32 col, int num_segments) { if ((col & IM_COL32_A_MASK) == 0 || num_segments <= 2) return; @@ -1090,35 +1619,76 @@ void ImDrawList::AddCircleFilled(const ImVec2& center, float radius, ImU32 col, PathFillConvex(col); } -void ImDrawList::AddBezierCurve(const ImVec2& pos0, const ImVec2& cp0, const ImVec2& cp1, const ImVec2& pos1, ImU32 col, float thickness, int num_segments) +// Ellipse +void ImDrawList::AddEllipse(const ImVec2& center, const ImVec2& radius, ImU32 col, float rot, int num_segments, float thickness) { if ((col & IM_COL32_A_MASK) == 0) return; - PathLineTo(pos0); - PathBezierCurveTo(cp0, cp1, pos1, num_segments); - PathStroke(col, false, thickness); + if (num_segments <= 0) + num_segments = _CalcCircleAutoSegmentCount(ImMax(radius.x, radius.y)); // A bit pessimistic, maybe there's a better computation to do here. + + // Because we are filling a closed shape we remove 1 from the count of segments/points + const float a_max = IM_PI * 2.0f * ((float)num_segments - 1.0f) / (float)num_segments; + PathEllipticalArcTo(center, radius, rot, 0.0f, a_max, num_segments - 1); + PathStroke(col, true, thickness); } -void ImDrawList::AddText(const ImFont* font, float font_size, const ImVec2& pos, ImU32 col, const char* text_begin, const char* text_end, float wrap_width, const ImVec4* cpu_fine_clip_rect) +void ImDrawList::AddEllipseFilled(const ImVec2& center, const ImVec2& radius, ImU32 col, float rot, int num_segments) { if ((col & IM_COL32_A_MASK) == 0) return; - if (text_end == NULL) - text_end = text_begin + strlen(text_begin); - if (text_begin == text_end) + if (num_segments <= 0) + num_segments = _CalcCircleAutoSegmentCount(ImMax(radius.x, radius.y)); // A bit pessimistic, maybe there's a better computation to do here. + + // Because we are filling a closed shape we remove 1 from the count of segments/points + const float a_max = IM_PI * 2.0f * ((float)num_segments - 1.0f) / (float)num_segments; + PathEllipticalArcTo(center, radius, rot, 0.0f, a_max, num_segments - 1); + PathFillConvex(col); +} + +// Cubic Bezier takes 4 controls points +void ImDrawList::AddBezierCubic(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, ImU32 col, float thickness, int num_segments) +{ + if ((col & IM_COL32_A_MASK) == 0) return; + PathLineTo(p1); + PathBezierCubicCurveTo(p2, p3, p4, num_segments); + PathStroke(col, 0, thickness); +} + +// Quadratic Bezier takes 3 controls points +void ImDrawList::AddBezierQuadratic(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, ImU32 col, float thickness, int num_segments) +{ + if ((col & IM_COL32_A_MASK) == 0) + return; + + PathLineTo(p1); + PathBezierQuadraticCurveTo(p2, p3, num_segments); + PathStroke(col, 0, thickness); +} + +void ImDrawList::AddText(ImFont* font, float font_size, const ImVec2& pos, ImU32 col, const char* text_begin, const char* text_end, float wrap_width, const ImVec4* cpu_fine_clip_rect) +{ + if ((col & IM_COL32_A_MASK) == 0) + return; + + // Accept null ranges + if (text_begin == text_end || text_begin[0] == 0) + return; + // No need to strlen() here: font->RenderText() will do it and may early out. + // Pull default font/size from the shared ImDrawListSharedData instance if (font == NULL) font = _Data->Font; if (font_size == 0.0f) font_size = _Data->FontSize; - IM_ASSERT(font->ContainerAtlas->TexID == _TextureIdStack.back()); // Use high-level ImGui::PushFont() or low-level ImDrawList::PushTextureId() to change font. + IM_ASSERT(font->ContainerAtlas->TexID == _CmdHeader.TextureId); // Use high-level ImGui::PushFont() or low-level ImDrawList::PushTextureId() to change font. - ImVec4 clip_rect = _ClipRectStack.back(); + ImVec4 clip_rect = _CmdHeader.ClipRect; if (cpu_fine_clip_rect) { clip_rect.x = ImMax(clip_rect.x, cpu_fine_clip_rect->x); @@ -1131,7 +1701,7 @@ void ImDrawList::AddText(const ImFont* font, float font_size, const ImVec2& pos, void ImDrawList::AddText(const ImVec2& pos, ImU32 col, const char* text_begin, const char* text_end) { - AddText(NULL, 0.0f, pos, col, text_begin, text_end); + AddText(_Data->Font, _Data->FontSize, pos, col, text_begin, text_end); } void ImDrawList::AddImage(ImTextureID user_texture_id, const ImVec2& p_min, const ImVec2& p_max, const ImVec2& uv_min, const ImVec2& uv_max, ImU32 col) @@ -1139,7 +1709,7 @@ void ImDrawList::AddImage(ImTextureID user_texture_id, const ImVec2& p_min, cons if ((col & IM_COL32_A_MASK) == 0) return; - const bool push_texture_id = _TextureIdStack.empty() || user_texture_id != _TextureIdStack.back(); + const bool push_texture_id = user_texture_id != _CmdHeader.TextureId; if (push_texture_id) PushTextureID(user_texture_id); @@ -1155,7 +1725,7 @@ void ImDrawList::AddImageQuad(ImTextureID user_texture_id, const ImVec2& p1, con if ((col & IM_COL32_A_MASK) == 0) return; - const bool push_texture_id = _TextureIdStack.empty() || user_texture_id != _TextureIdStack.back(); + const bool push_texture_id = user_texture_id != _CmdHeader.TextureId; if (push_texture_id) PushTextureID(user_texture_id); @@ -1166,23 +1736,24 @@ void ImDrawList::AddImageQuad(ImTextureID user_texture_id, const ImVec2& p1, con PopTextureID(); } -void ImDrawList::AddImageRounded(ImTextureID user_texture_id, const ImVec2& p_min, const ImVec2& p_max, const ImVec2& uv_min, const ImVec2& uv_max, ImU32 col, float rounding, ImDrawCornerFlags rounding_corners) +void ImDrawList::AddImageRounded(ImTextureID user_texture_id, const ImVec2& p_min, const ImVec2& p_max, const ImVec2& uv_min, const ImVec2& uv_max, ImU32 col, float rounding, ImDrawFlags flags) { if ((col & IM_COL32_A_MASK) == 0) return; - if (rounding <= 0.0f || (rounding_corners & ImDrawCornerFlags_All) == 0) + flags = FixRectCornerFlags(flags); + if (rounding < 0.5f || (flags & ImDrawFlags_RoundCornersMask_) == ImDrawFlags_RoundCornersNone) { AddImage(user_texture_id, p_min, p_max, uv_min, uv_max, col); return; } - const bool push_texture_id = _TextureIdStack.empty() || user_texture_id != _TextureIdStack.back(); + const bool push_texture_id = user_texture_id != _CmdHeader.TextureId; if (push_texture_id) PushTextureID(user_texture_id); int vert_start_idx = VtxBuffer.Size; - PathRect(p_min, p_max, rounding, rounding_corners); + PathRect(p_min, p_max, rounding, flags); PathFillConvex(col); int vert_end_idx = VtxBuffer.Size; ImGui::ShadeVertsLinearUV(this, vert_start_idx, vert_end_idx, p_min, p_max, uv_min, uv_max, true); @@ -1191,9 +1762,319 @@ void ImDrawList::AddImageRounded(ImTextureID user_texture_id, const ImVec2& p_mi PopTextureID(); } +//----------------------------------------------------------------------------- +// [SECTION] ImTriangulator, ImDrawList concave polygon fill +//----------------------------------------------------------------------------- +// Triangulate concave polygons. Based on "Triangulation by Ear Clipping" paper, O(N^2) complexity. +// Reference: https://www.geometrictools.com/Documentation/TriangulationByEarClipping.pdf +// Provided as a convenience for user but not used by main library. +//----------------------------------------------------------------------------- +// - ImTriangulator [Internal] +// - AddConcavePolyFilled() +//----------------------------------------------------------------------------- + +enum ImTriangulatorNodeType +{ + ImTriangulatorNodeType_Convex, + ImTriangulatorNodeType_Ear, + ImTriangulatorNodeType_Reflex +}; + +struct ImTriangulatorNode +{ + ImTriangulatorNodeType Type; + int Index; + ImVec2 Pos; + ImTriangulatorNode* Next; + ImTriangulatorNode* Prev; + + void Unlink() { Next->Prev = Prev; Prev->Next = Next; } +}; + +struct ImTriangulatorNodeSpan +{ + ImTriangulatorNode** Data = NULL; + int Size = 0; + + void push_back(ImTriangulatorNode* node) { Data[Size++] = node; } + void find_erase_unsorted(int idx) { for (int i = Size - 1; i >= 0; i--) if (Data[i]->Index == idx) { Data[i] = Data[Size - 1]; Size--; return; } } +}; + +struct ImTriangulator +{ + static int EstimateTriangleCount(int points_count) { return (points_count < 3) ? 0 : points_count - 2; } + static int EstimateScratchBufferSize(int points_count) { return sizeof(ImTriangulatorNode) * points_count + sizeof(ImTriangulatorNode*) * points_count * 2; } + + void Init(const ImVec2* points, int points_count, void* scratch_buffer); + void GetNextTriangle(unsigned int out_triangle[3]); // Return relative indexes for next triangle + + // Internal functions + void BuildNodes(const ImVec2* points, int points_count); + void BuildReflexes(); + void BuildEars(); + void FlipNodeList(); + bool IsEar(int i0, int i1, int i2, const ImVec2& v0, const ImVec2& v1, const ImVec2& v2) const; + void ReclassifyNode(ImTriangulatorNode* node); + + // Internal members + int _TrianglesLeft = 0; + ImTriangulatorNode* _Nodes = NULL; + ImTriangulatorNodeSpan _Ears; + ImTriangulatorNodeSpan _Reflexes; +}; + +// Distribute storage for nodes, ears and reflexes. +// FIXME-OPT: if everything is convex, we could report it to caller and let it switch to an convex renderer +// (this would require first building reflexes to bail to convex if empty, without even building nodes) +void ImTriangulator::Init(const ImVec2* points, int points_count, void* scratch_buffer) +{ + IM_ASSERT(scratch_buffer != NULL && points_count >= 3); + _TrianglesLeft = EstimateTriangleCount(points_count); + _Nodes = (ImTriangulatorNode*)scratch_buffer; // points_count x Node + _Ears.Data = (ImTriangulatorNode**)(_Nodes + points_count); // points_count x Node* + _Reflexes.Data = (ImTriangulatorNode**)(_Nodes + points_count) + points_count; // points_count x Node* + BuildNodes(points, points_count); + BuildReflexes(); + BuildEars(); +} + +void ImTriangulator::BuildNodes(const ImVec2* points, int points_count) +{ + for (int i = 0; i < points_count; i++) + { + _Nodes[i].Type = ImTriangulatorNodeType_Convex; + _Nodes[i].Index = i; + _Nodes[i].Pos = points[i]; + _Nodes[i].Next = _Nodes + i + 1; + _Nodes[i].Prev = _Nodes + i - 1; + } + _Nodes[0].Prev = _Nodes + points_count - 1; + _Nodes[points_count - 1].Next = _Nodes; +} + +void ImTriangulator::BuildReflexes() +{ + ImTriangulatorNode* n1 = _Nodes; + for (int i = _TrianglesLeft; i >= 0; i--, n1 = n1->Next) + { + if (ImTriangleIsClockwise(n1->Prev->Pos, n1->Pos, n1->Next->Pos)) + continue; + n1->Type = ImTriangulatorNodeType_Reflex; + _Reflexes.push_back(n1); + } +} + +void ImTriangulator::BuildEars() +{ + ImTriangulatorNode* n1 = _Nodes; + for (int i = _TrianglesLeft; i >= 0; i--, n1 = n1->Next) + { + if (n1->Type != ImTriangulatorNodeType_Convex) + continue; + if (!IsEar(n1->Prev->Index, n1->Index, n1->Next->Index, n1->Prev->Pos, n1->Pos, n1->Next->Pos)) + continue; + n1->Type = ImTriangulatorNodeType_Ear; + _Ears.push_back(n1); + } +} + +void ImTriangulator::GetNextTriangle(unsigned int out_triangle[3]) +{ + if (_Ears.Size == 0) + { + FlipNodeList(); + + ImTriangulatorNode* node = _Nodes; + for (int i = _TrianglesLeft; i >= 0; i--, node = node->Next) + node->Type = ImTriangulatorNodeType_Convex; + _Reflexes.Size = 0; + BuildReflexes(); + BuildEars(); + + // If we still don't have ears, it means geometry is degenerated. + if (_Ears.Size == 0) + { + // Return first triangle available, mimicking the behavior of convex fill. + IM_ASSERT(_TrianglesLeft > 0); // Geometry is degenerated + _Ears.Data[0] = _Nodes; + _Ears.Size = 1; + } + } + + ImTriangulatorNode* ear = _Ears.Data[--_Ears.Size]; + out_triangle[0] = ear->Prev->Index; + out_triangle[1] = ear->Index; + out_triangle[2] = ear->Next->Index; + + ear->Unlink(); + if (ear == _Nodes) + _Nodes = ear->Next; + + ReclassifyNode(ear->Prev); + ReclassifyNode(ear->Next); + _TrianglesLeft--; +} + +void ImTriangulator::FlipNodeList() +{ + ImTriangulatorNode* prev = _Nodes; + ImTriangulatorNode* temp = _Nodes; + ImTriangulatorNode* current = _Nodes->Next; + prev->Next = prev; + prev->Prev = prev; + while (current != _Nodes) + { + temp = current->Next; + + current->Next = prev; + prev->Prev = current; + _Nodes->Next = current; + current->Prev = _Nodes; + + prev = current; + current = temp; + } + _Nodes = prev; +} + +// A triangle is an ear is no other vertex is inside it. We can test reflexes vertices only (see reference algorithm) +bool ImTriangulator::IsEar(int i0, int i1, int i2, const ImVec2& v0, const ImVec2& v1, const ImVec2& v2) const +{ + ImTriangulatorNode** p_end = _Reflexes.Data + _Reflexes.Size; + for (ImTriangulatorNode** p = _Reflexes.Data; p < p_end; p++) + { + ImTriangulatorNode* reflex = *p; + if (reflex->Index != i0 && reflex->Index != i1 && reflex->Index != i2) + if (ImTriangleContainsPoint(v0, v1, v2, reflex->Pos)) + return false; + } + return true; +} + +void ImTriangulator::ReclassifyNode(ImTriangulatorNode* n1) +{ + // Classify node + ImTriangulatorNodeType type; + const ImTriangulatorNode* n0 = n1->Prev; + const ImTriangulatorNode* n2 = n1->Next; + if (!ImTriangleIsClockwise(n0->Pos, n1->Pos, n2->Pos)) + type = ImTriangulatorNodeType_Reflex; + else if (IsEar(n0->Index, n1->Index, n2->Index, n0->Pos, n1->Pos, n2->Pos)) + type = ImTriangulatorNodeType_Ear; + else + type = ImTriangulatorNodeType_Convex; + + // Update lists when a type changes + if (type == n1->Type) + return; + if (n1->Type == ImTriangulatorNodeType_Reflex) + _Reflexes.find_erase_unsorted(n1->Index); + else if (n1->Type == ImTriangulatorNodeType_Ear) + _Ears.find_erase_unsorted(n1->Index); + if (type == ImTriangulatorNodeType_Reflex) + _Reflexes.push_back(n1); + else if (type == ImTriangulatorNodeType_Ear) + _Ears.push_back(n1); + n1->Type = type; +} + +// Use ear-clipping algorithm to triangulate a simple polygon (no self-interaction, no holes). +// (Reminder: we don't perform any coarse clipping/culling in ImDrawList layer! +// It is up to caller to ensure not making costly calls that will be outside of visible area. +// As concave fill is noticeably more expensive than other primitives, be mindful of this... +// Caller can build AABB of points, and avoid filling if 'draw_list->_CmdHeader.ClipRect.Overlays(points_bb) == false') +void ImDrawList::AddConcavePolyFilled(const ImVec2* points, const int points_count, ImU32 col) +{ + if (points_count < 3 || (col & IM_COL32_A_MASK) == 0) + return; + + const ImVec2 uv = _Data->TexUvWhitePixel; + ImTriangulator triangulator; + unsigned int triangle[3]; + if (Flags & ImDrawListFlags_AntiAliasedFill) + { + // Anti-aliased Fill + const float AA_SIZE = _FringeScale; + const ImU32 col_trans = col & ~IM_COL32_A_MASK; + const int idx_count = (points_count - 2) * 3 + points_count * 6; + const int vtx_count = (points_count * 2); + PrimReserve(idx_count, vtx_count); + + // Add indexes for fill + unsigned int vtx_inner_idx = _VtxCurrentIdx; + unsigned int vtx_outer_idx = _VtxCurrentIdx + 1; + + _Data->TempBuffer.reserve_discard((ImTriangulator::EstimateScratchBufferSize(points_count) + sizeof(ImVec2)) / sizeof(ImVec2)); + triangulator.Init(points, points_count, _Data->TempBuffer.Data); + while (triangulator._TrianglesLeft > 0) + { + triangulator.GetNextTriangle(triangle); + _IdxWritePtr[0] = (ImDrawIdx)(vtx_inner_idx + (triangle[0] << 1)); _IdxWritePtr[1] = (ImDrawIdx)(vtx_inner_idx + (triangle[1] << 1)); _IdxWritePtr[2] = (ImDrawIdx)(vtx_inner_idx + (triangle[2] << 1)); + _IdxWritePtr += 3; + } + + // Compute normals + _Data->TempBuffer.reserve_discard(points_count); + ImVec2* temp_normals = _Data->TempBuffer.Data; + for (int i0 = points_count - 1, i1 = 0; i1 < points_count; i0 = i1++) + { + const ImVec2& p0 = points[i0]; + const ImVec2& p1 = points[i1]; + float dx = p1.x - p0.x; + float dy = p1.y - p0.y; + IM_NORMALIZE2F_OVER_ZERO(dx, dy); + temp_normals[i0].x = dy; + temp_normals[i0].y = -dx; + } + + for (int i0 = points_count - 1, i1 = 0; i1 < points_count; i0 = i1++) + { + // Average normals + const ImVec2& n0 = temp_normals[i0]; + const ImVec2& n1 = temp_normals[i1]; + float dm_x = (n0.x + n1.x) * 0.5f; + float dm_y = (n0.y + n1.y) * 0.5f; + IM_FIXNORMAL2F(dm_x, dm_y); + dm_x *= AA_SIZE * 0.5f; + dm_y *= AA_SIZE * 0.5f; + + // Add vertices + _VtxWritePtr[0].pos.x = (points[i1].x - dm_x); _VtxWritePtr[0].pos.y = (points[i1].y - dm_y); _VtxWritePtr[0].uv = uv; _VtxWritePtr[0].col = col; // Inner + _VtxWritePtr[1].pos.x = (points[i1].x + dm_x); _VtxWritePtr[1].pos.y = (points[i1].y + dm_y); _VtxWritePtr[1].uv = uv; _VtxWritePtr[1].col = col_trans; // Outer + _VtxWritePtr += 2; + + // Add indexes for fringes + _IdxWritePtr[0] = (ImDrawIdx)(vtx_inner_idx + (i1 << 1)); _IdxWritePtr[1] = (ImDrawIdx)(vtx_inner_idx + (i0 << 1)); _IdxWritePtr[2] = (ImDrawIdx)(vtx_outer_idx + (i0 << 1)); + _IdxWritePtr[3] = (ImDrawIdx)(vtx_outer_idx + (i0 << 1)); _IdxWritePtr[4] = (ImDrawIdx)(vtx_outer_idx + (i1 << 1)); _IdxWritePtr[5] = (ImDrawIdx)(vtx_inner_idx + (i1 << 1)); + _IdxWritePtr += 6; + } + _VtxCurrentIdx += (ImDrawIdx)vtx_count; + } + else + { + // Non Anti-aliased Fill + const int idx_count = (points_count - 2) * 3; + const int vtx_count = points_count; + PrimReserve(idx_count, vtx_count); + for (int i = 0; i < vtx_count; i++) + { + _VtxWritePtr[0].pos = points[i]; _VtxWritePtr[0].uv = uv; _VtxWritePtr[0].col = col; + _VtxWritePtr++; + } + _Data->TempBuffer.reserve_discard((ImTriangulator::EstimateScratchBufferSize(points_count) + sizeof(ImVec2)) / sizeof(ImVec2)); + triangulator.Init(points, points_count, _Data->TempBuffer.Data); + while (triangulator._TrianglesLeft > 0) + { + triangulator.GetNextTriangle(triangle); + _IdxWritePtr[0] = (ImDrawIdx)(_VtxCurrentIdx + triangle[0]); _IdxWritePtr[1] = (ImDrawIdx)(_VtxCurrentIdx + triangle[1]); _IdxWritePtr[2] = (ImDrawIdx)(_VtxCurrentIdx + triangle[2]); + _IdxWritePtr += 3; + } + _VtxCurrentIdx += (ImDrawIdx)vtx_count; + } +} //----------------------------------------------------------------------------- -// ImDrawListSplitter +// [SECTION] ImDrawListSplitter //----------------------------------------------------------------------------- // FIXME: This may be a little confusing, trying to be a little too low-level/optimal instead of just doing vector swap.. //----------------------------------------------------------------------------- @@ -1214,10 +2095,14 @@ void ImDrawListSplitter::ClearFreeMemory() void ImDrawListSplitter::Split(ImDrawList* draw_list, int channels_count) { - IM_ASSERT(_Current == 0 && _Count <= 1); + IM_UNUSED(draw_list); + IM_ASSERT(_Current == 0 && _Count <= 1 && "Nested channel splitting is not supported. Please use separate instances of ImDrawListSplitter."); int old_channels_count = _Channels.Size; if (old_channels_count < channels_count) + { + _Channels.reserve(channels_count); // Avoid over reserving since this is likely to stay stable _Channels.resize(channels_count); + } _Count = channels_count; // Channels[] (24/32 bytes each) hold storage that we'll swap with draw_list->_CmdBuffer/_IdxBuffer @@ -1235,30 +2120,17 @@ void ImDrawListSplitter::Split(ImDrawList* draw_list, int channels_count) _Channels[i]._CmdBuffer.resize(0); _Channels[i]._IdxBuffer.resize(0); } - if (_Channels[i]._CmdBuffer.Size == 0) - { - ImDrawCmd draw_cmd; - draw_cmd.ClipRect = draw_list->_ClipRectStack.back(); - draw_cmd.TextureId = draw_list->_TextureIdStack.back(); - _Channels[i]._CmdBuffer.push_back(draw_cmd); - } } } -static inline bool CanMergeDrawCommands(ImDrawCmd* a, ImDrawCmd* b) -{ - return memcmp(&a->ClipRect, &b->ClipRect, sizeof(a->ClipRect)) == 0 && a->TextureId == b->TextureId && a->VtxOffset == b->VtxOffset && !a->UserCallback && !b->UserCallback; -} - void ImDrawListSplitter::Merge(ImDrawList* draw_list) { - // Note that we never use or rely on channels.Size because it is merely a buffer that we never shrink back to 0 to keep all sub-buffers ready for use. + // Note that we never use or rely on _Channels.Size because it is merely a buffer that we never shrink back to 0 to keep all sub-buffers ready for use. if (_Count <= 1) return; SetCurrentChannel(draw_list, 0); - if (draw_list->CmdBuffer.Size != 0 && draw_list->CmdBuffer.back().ElemCount == 0) - draw_list->CmdBuffer.pop_back(); + draw_list->_PopUnusedDrawCmd(); // Calculate our final buffer sizes. Also fix the incorrect IdxOffset values in each command. int new_cmd_buffer_count = 0; @@ -1268,14 +2140,21 @@ void ImDrawListSplitter::Merge(ImDrawList* draw_list) for (int i = 1; i < _Count; i++) { ImDrawChannel& ch = _Channels[i]; - if (ch._CmdBuffer.Size > 0 && ch._CmdBuffer.back().ElemCount == 0) + if (ch._CmdBuffer.Size > 0 && ch._CmdBuffer.back().ElemCount == 0 && ch._CmdBuffer.back().UserCallback == NULL) // Equivalent of PopUnusedDrawCmd() ch._CmdBuffer.pop_back(); - if (ch._CmdBuffer.Size > 0 && last_cmd != NULL && CanMergeDrawCommands(last_cmd, &ch._CmdBuffer[0])) + + if (ch._CmdBuffer.Size > 0 && last_cmd != NULL) { - // Merge previous channel last draw command with current channel first draw command if matching. - last_cmd->ElemCount += ch._CmdBuffer[0].ElemCount; - idx_offset += ch._CmdBuffer[0].ElemCount; - ch._CmdBuffer.erase(ch._CmdBuffer.Data); + // Do not include ImDrawCmd_AreSequentialIdxOffset() in the compare as we rebuild IdxOffset values ourselves. + // Manipulating IdxOffset (e.g. by reordering draw commands like done by RenderDimmedBackgroundBehindWindow()) is not supported within a splitter. + ImDrawCmd* next_cmd = &ch._CmdBuffer[0]; + if (ImDrawCmd_HeaderCompare(last_cmd, next_cmd) == 0 && last_cmd->UserCallback == NULL && next_cmd->UserCallback == NULL) + { + // Merge previous channel last draw command with current channel first draw command if matching. + last_cmd->ElemCount += next_cmd->ElemCount; + idx_offset += next_cmd->ElemCount; + ch._CmdBuffer.erase(ch._CmdBuffer.Data); // FIXME-OPT: Improve for multiple merges. + } } if (ch._CmdBuffer.Size > 0) last_cmd = &ch._CmdBuffer.back(); @@ -1300,8 +2179,18 @@ void ImDrawListSplitter::Merge(ImDrawList* draw_list) if (int sz = ch._IdxBuffer.Size) { memcpy(idx_write, ch._IdxBuffer.Data, sz * sizeof(ImDrawIdx)); idx_write += sz; } } draw_list->_IdxWritePtr = idx_write; - draw_list->UpdateClipRect(); // We call this instead of AddDrawCmd(), so that empty channels won't produce an extra draw call. - draw_list->UpdateTextureID(); + + // Ensure there's always a non-callback draw command trailing the command-buffer + if (draw_list->CmdBuffer.Size == 0 || draw_list->CmdBuffer.back().UserCallback != NULL) + draw_list->AddDrawCmd(); + + // If current command is used with different settings we need to add a new command + ImDrawCmd* curr_cmd = &draw_list->CmdBuffer.Data[draw_list->CmdBuffer.Size - 1]; + if (curr_cmd->ElemCount == 0) + ImDrawCmd_HeaderCopy(curr_cmd, &draw_list->_CmdHeader); // Copy ClipRect, TextureId, VtxOffset + else if (ImDrawCmd_HeaderCompare(curr_cmd, &draw_list->_CmdHeader) != 0) + draw_list->AddDrawCmd(); + _Count = 1; } @@ -1310,6 +2199,7 @@ void ImDrawListSplitter::SetCurrentChannel(ImDrawList* draw_list, int idx) IM_ASSERT(idx >= 0 && idx < _Count); if (_Current == idx) return; + // Overwrite ImVector (12/16 bytes), four times. This is merely a silly optimization instead of doing .swap() memcpy(&_Channels.Data[_Current]._CmdBuffer, &draw_list->CmdBuffer, sizeof(draw_list->CmdBuffer)); memcpy(&_Channels.Data[_Current]._IdxBuffer, &draw_list->IdxBuffer, sizeof(draw_list->IdxBuffer)); @@ -1317,12 +2207,84 @@ void ImDrawListSplitter::SetCurrentChannel(ImDrawList* draw_list, int idx) memcpy(&draw_list->CmdBuffer, &_Channels.Data[idx]._CmdBuffer, sizeof(draw_list->CmdBuffer)); memcpy(&draw_list->IdxBuffer, &_Channels.Data[idx]._IdxBuffer, sizeof(draw_list->IdxBuffer)); draw_list->_IdxWritePtr = draw_list->IdxBuffer.Data + draw_list->IdxBuffer.Size; + + // If current command is used with different settings we need to add a new command + ImDrawCmd* curr_cmd = (draw_list->CmdBuffer.Size == 0) ? NULL : &draw_list->CmdBuffer.Data[draw_list->CmdBuffer.Size - 1]; + if (curr_cmd == NULL) + draw_list->AddDrawCmd(); + else if (curr_cmd->ElemCount == 0) + ImDrawCmd_HeaderCopy(curr_cmd, &draw_list->_CmdHeader); // Copy ClipRect, TextureId, VtxOffset + else if (ImDrawCmd_HeaderCompare(curr_cmd, &draw_list->_CmdHeader) != 0) + draw_list->AddDrawCmd(); } //----------------------------------------------------------------------------- // [SECTION] ImDrawData //----------------------------------------------------------------------------- +void ImDrawData::Clear() +{ + Valid = false; + CmdListsCount = TotalIdxCount = TotalVtxCount = 0; + CmdLists.resize(0); // The ImDrawList are NOT owned by ImDrawData but e.g. by ImGuiContext, so we don't clear them. + DisplayPos = DisplaySize = FramebufferScale = ImVec2(0.0f, 0.0f); + OwnerViewport = NULL; +} + +// Important: 'out_list' is generally going to be draw_data->CmdLists, but may be another temporary list +// as long at it is expected that the result will be later merged into draw_data->CmdLists[]. +void ImGui::AddDrawListToDrawDataEx(ImDrawData* draw_data, ImVector* out_list, ImDrawList* draw_list) +{ + if (draw_list->CmdBuffer.Size == 0) + return; + if (draw_list->CmdBuffer.Size == 1 && draw_list->CmdBuffer[0].ElemCount == 0 && draw_list->CmdBuffer[0].UserCallback == NULL) + return; + + // Draw list sanity check. Detect mismatch between PrimReserve() calls and incrementing _VtxCurrentIdx, _VtxWritePtr etc. + // May trigger for you if you are using PrimXXX functions incorrectly. + IM_ASSERT(draw_list->VtxBuffer.Size == 0 || draw_list->_VtxWritePtr == draw_list->VtxBuffer.Data + draw_list->VtxBuffer.Size); + IM_ASSERT(draw_list->IdxBuffer.Size == 0 || draw_list->_IdxWritePtr == draw_list->IdxBuffer.Data + draw_list->IdxBuffer.Size); + if (!(draw_list->Flags & ImDrawListFlags_AllowVtxOffset)) + IM_ASSERT((int)draw_list->_VtxCurrentIdx == draw_list->VtxBuffer.Size); + + // Check that draw_list doesn't use more vertices than indexable (default ImDrawIdx = unsigned short = 2 bytes = 64K vertices per ImDrawList = per window) + // If this assert triggers because you are drawing lots of stuff manually: + // - First, make sure you are coarse clipping yourself and not trying to draw many things outside visible bounds. + // Be mindful that the lower-level ImDrawList API doesn't filter vertices. Use the Metrics/Debugger window to inspect draw list contents. + // - If you want large meshes with more than 64K vertices, you can either: + // (A) Handle the ImDrawCmd::VtxOffset value in your renderer backend, and set 'io.BackendFlags |= ImGuiBackendFlags_RendererHasVtxOffset'. + // Most example backends already support this from 1.71. Pre-1.71 backends won't. + // Some graphics API such as GL ES 1/2 don't have a way to offset the starting vertex so it is not supported for them. + // (B) Or handle 32-bit indices in your renderer backend, and uncomment '#define ImDrawIdx unsigned int' line in imconfig.h. + // Most example backends already support this. For example, the OpenGL example code detect index size at compile-time: + // glDrawElements(GL_TRIANGLES, (GLsizei)pcmd->ElemCount, sizeof(ImDrawIdx) == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, idx_buffer_offset); + // Your own engine or render API may use different parameters or function calls to specify index sizes. + // 2 and 4 bytes indices are generally supported by most graphics API. + // - If for some reason neither of those solutions works for you, a workaround is to call BeginChild()/EndChild() before reaching + // the 64K limit to split your draw commands in multiple draw lists. + if (sizeof(ImDrawIdx) == 2) + IM_ASSERT(draw_list->_VtxCurrentIdx < (1 << 16) && "Too many vertices in ImDrawList using 16-bit indices. Read comment above"); + + // Resolve callback data pointers + if (draw_list->_CallbacksDataBuf.Size > 0) + for (ImDrawCmd& cmd : draw_list->CmdBuffer) + if (cmd.UserCallback != NULL && cmd.UserCallbackDataOffset != -1 && cmd.UserCallbackDataSize > 0) + cmd.UserCallbackData = draw_list->_CallbacksDataBuf.Data + cmd.UserCallbackDataOffset; + + // Add to output list + records state in ImDrawData + out_list->push_back(draw_list); + draw_data->CmdListsCount++; + draw_data->TotalVtxCount += draw_list->VtxBuffer.Size; + draw_data->TotalIdxCount += draw_list->IdxBuffer.Size; +} + +void ImDrawData::AddDrawList(ImDrawList* draw_list) +{ + IM_ASSERT(CmdLists.Size == CmdListsCount); + draw_list->_PopUnusedDrawCmd(); + ImGui::AddDrawListToDrawDataEx(this, &CmdLists, draw_list); +} + // For backward compatibility: convert all buffers from indexed to de-indexed, in case you cannot render indexed. Note: this is slow and most likely a waste of resources. Always prefer indexed rendering! void ImDrawData::DeIndexAllBuffers() { @@ -1347,15 +2309,9 @@ void ImDrawData::DeIndexAllBuffers() // or if there is a difference between your window resolution and framebuffer resolution. void ImDrawData::ScaleClipRects(const ImVec2& fb_scale) { - for (int i = 0; i < CmdListsCount; i++) - { - ImDrawList* cmd_list = CmdLists[i]; - for (int cmd_i = 0; cmd_i < cmd_list->CmdBuffer.Size; cmd_i++) - { - ImDrawCmd* cmd = &cmd_list->CmdBuffer[cmd_i]; - cmd->ClipRect = ImVec4(cmd->ClipRect.x * fb_scale.x, cmd->ClipRect.y * fb_scale.y, cmd->ClipRect.z * fb_scale.x, cmd->ClipRect.w * fb_scale.y); - } - } + for (ImDrawList* draw_list : CmdLists) + for (ImDrawCmd& cmd : draw_list->CmdBuffer) + cmd.ClipRect = ImVec4(cmd.ClipRect.x * fb_scale.x, cmd.ClipRect.y * fb_scale.y, cmd.ClipRect.z * fb_scale.x, cmd.ClipRect.w * fb_scale.y); } //----------------------------------------------------------------------------- @@ -1369,13 +2325,19 @@ void ImGui::ShadeVertsLinearColorGradientKeepAlpha(ImDrawList* draw_list, int ve float gradient_inv_length2 = 1.0f / ImLengthSqr(gradient_extent); ImDrawVert* vert_start = draw_list->VtxBuffer.Data + vert_start_idx; ImDrawVert* vert_end = draw_list->VtxBuffer.Data + vert_end_idx; + const int col0_r = (int)(col0 >> IM_COL32_R_SHIFT) & 0xFF; + const int col0_g = (int)(col0 >> IM_COL32_G_SHIFT) & 0xFF; + const int col0_b = (int)(col0 >> IM_COL32_B_SHIFT) & 0xFF; + const int col_delta_r = ((int)(col1 >> IM_COL32_R_SHIFT) & 0xFF) - col0_r; + const int col_delta_g = ((int)(col1 >> IM_COL32_G_SHIFT) & 0xFF) - col0_g; + const int col_delta_b = ((int)(col1 >> IM_COL32_B_SHIFT) & 0xFF) - col0_b; for (ImDrawVert* vert = vert_start; vert < vert_end; vert++) { float d = ImDot(vert->pos - gradient_p0, gradient_extent); float t = ImClamp(d * gradient_inv_length2, 0.0f, 1.0f); - int r = ImLerp((int)(col0 >> IM_COL32_R_SHIFT) & 0xFF, (int)(col1 >> IM_COL32_R_SHIFT) & 0xFF, t); - int g = ImLerp((int)(col0 >> IM_COL32_G_SHIFT) & 0xFF, (int)(col1 >> IM_COL32_G_SHIFT) & 0xFF, t); - int b = ImLerp((int)(col0 >> IM_COL32_B_SHIFT) & 0xFF, (int)(col1 >> IM_COL32_B_SHIFT) & 0xFF, t); + int r = (int)(col0_r + col_delta_r * t); + int g = (int)(col0_g + col_delta_g * t); + int b = (int)(col0_b + col_delta_b * t); vert->col = (r << IM_COL32_R_SHIFT) | (g << IM_COL32_G_SHIFT) | (b << IM_COL32_B_SHIFT) | (vert->col & IM_COL32_A_MASK); } } @@ -1405,71 +2367,100 @@ void ImGui::ShadeVertsLinearUV(ImDrawList* draw_list, int vert_start_idx, int ve } } +void ImGui::ShadeVertsTransformPos(ImDrawList* draw_list, int vert_start_idx, int vert_end_idx, const ImVec2& pivot_in, float cos_a, float sin_a, const ImVec2& pivot_out) +{ + ImDrawVert* vert_start = draw_list->VtxBuffer.Data + vert_start_idx; + ImDrawVert* vert_end = draw_list->VtxBuffer.Data + vert_end_idx; + for (ImDrawVert* vertex = vert_start; vertex < vert_end; ++vertex) + vertex->pos = ImRotate(vertex->pos- pivot_in, cos_a, sin_a) + pivot_out; +} + //----------------------------------------------------------------------------- // [SECTION] ImFontConfig //----------------------------------------------------------------------------- ImFontConfig::ImFontConfig() { - FontData = NULL; - FontDataSize = 0; + memset(this, 0, sizeof(*this)); FontDataOwnedByAtlas = true; - FontNo = 0; - SizePixels = 0.0f; - OversampleH = 3; // FIXME: 2 may be a better default? - OversampleV = 1; - PixelSnapH = false; - GlyphExtraSpacing = ImVec2(0.0f, 0.0f); - GlyphOffset = ImVec2(0.0f, 0.0f); - GlyphRanges = NULL; - GlyphMinAdvanceX = 0.0f; + OversampleH = 0; // Auto == 1 or 2 depending on size + OversampleV = 0; // Auto == 1 GlyphMaxAdvanceX = FLT_MAX; - MergeMode = false; - RasterizerFlags = 0x00; RasterizerMultiply = 1.0f; - EllipsisChar = (ImWchar)-1; - memset(Name, 0, sizeof(Name)); - DstFont = NULL; + RasterizerDensity = 1.0f; + EllipsisChar = 0; } //----------------------------------------------------------------------------- // [SECTION] ImFontAtlas //----------------------------------------------------------------------------- +// - Default texture data encoded in ASCII +// - ImFontAtlas::ClearInputData() +// - ImFontAtlas::ClearTexData() +// - ImFontAtlas::ClearFonts() +// - ImFontAtlas::Clear() +// - ImFontAtlas::GetTexDataAsAlpha8() +// - ImFontAtlas::GetTexDataAsRGBA32() +// - ImFontAtlas::AddFont() +// - ImFontAtlas::AddFontDefault() +// - ImFontAtlas::AddFontFromFileTTF() +// - ImFontAtlas::AddFontFromMemoryTTF() +// - ImFontAtlas::AddFontFromMemoryCompressedTTF() +// - ImFontAtlas::AddFontFromMemoryCompressedBase85TTF() +// - ImFontAtlas::AddCustomRectRegular() +// - ImFontAtlas::AddCustomRectFontGlyph() +// - ImFontAtlas::CalcCustomRectUV() +// - ImFontAtlasGetMouseCursorTexData() +// - ImFontAtlas::Build() +// - ImFontAtlasBuildMultiplyCalcLookupTable() +// - ImFontAtlasBuildMultiplyRectAlpha8() +// - ImFontAtlasBuildWithStbTruetype() +// - ImFontAtlasGetBuilderForStbTruetype() +// - ImFontAtlasUpdateSourcesPointers() +// - ImFontAtlasBuildSetupFont() +// - ImFontAtlasBuildPackCustomRects() +// - ImFontAtlasBuildRender8bppRectFromString() +// - ImFontAtlasBuildRender32bppRectFromString() +// - ImFontAtlasBuildRenderDefaultTexData() +// - ImFontAtlasBuildRenderLinesTexData() +// - ImFontAtlasBuildInit() +// - ImFontAtlasBuildFinish() +//----------------------------------------------------------------------------- // A work of art lies ahead! (. = white layer, X = black layer, others are blank) -// The white texels on the top left are the ones we'll use everywhere in Dear ImGui to render filled shapes. -const int FONT_ATLAS_DEFAULT_TEX_DATA_W_HALF = 108; -const int FONT_ATLAS_DEFAULT_TEX_DATA_H = 27; -const unsigned int FONT_ATLAS_DEFAULT_TEX_DATA_ID = 0x80000000; -static const char FONT_ATLAS_DEFAULT_TEX_DATA_PIXELS[FONT_ATLAS_DEFAULT_TEX_DATA_W_HALF * FONT_ATLAS_DEFAULT_TEX_DATA_H + 1] = +// The 2x2 white texels on the top left are the ones we'll use everywhere in Dear ImGui to render filled shapes. +// (This is used when io.MouseDrawCursor = true) +const int FONT_ATLAS_DEFAULT_TEX_DATA_W = 122; // Actual texture will be 2 times that + 1 spacing. +const int FONT_ATLAS_DEFAULT_TEX_DATA_H = 27; +static const char FONT_ATLAS_DEFAULT_TEX_DATA_PIXELS[FONT_ATLAS_DEFAULT_TEX_DATA_W * FONT_ATLAS_DEFAULT_TEX_DATA_H + 1] = { - "..- -XXXXXXX- X - X -XXXXXXX - XXXXXXX- XX " - "..- -X.....X- X.X - X.X -X.....X - X.....X- X..X " - "--- -XXX.XXX- X...X - X...X -X....X - X....X- X..X " - "X - X.X - X.....X - X.....X -X...X - X...X- X..X " - "XX - X.X -X.......X- X.......X -X..X.X - X.X..X- X..X " - "X.X - X.X -XXXX.XXXX- XXXX.XXXX -X.X X.X - X.X X.X- X..XXX " - "X..X - X.X - X.X - X.X -XX X.X - X.X XX- X..X..XXX " - "X...X - X.X - X.X - XX X.X XX - X.X - X.X - X..X..X..XX " - "X....X - X.X - X.X - X.X X.X X.X - X.X - X.X - X..X..X..X.X " - "X.....X - X.X - X.X - X..X X.X X..X - X.X - X.X -XXX X..X..X..X..X" - "X......X - X.X - X.X - X...XXXXXX.XXXXXX...X - X.X XX-XX X.X -X..XX........X..X" - "X.......X - X.X - X.X -X.....................X- X.X X.X-X.X X.X -X...X...........X" - "X........X - X.X - X.X - X...XXXXXX.XXXXXX...X - X.X..X-X..X.X - X..............X" - "X.........X -XXX.XXX- X.X - X..X X.X X..X - X...X-X...X - X.............X" - "X..........X-X.....X- X.X - X.X X.X X.X - X....X-X....X - X.............X" - "X......XXXXX-XXXXXXX- X.X - XX X.X XX - X.....X-X.....X - X............X" - "X...X..X --------- X.X - X.X - XXXXXXX-XXXXXXX - X...........X " - "X..X X..X - -XXXX.XXXX- XXXX.XXXX ------------------------------------- X..........X " - "X.X X..X - -X.......X- X.......X - XX XX - - X..........X " - "XX X..X - - X.....X - X.....X - X.X X.X - - X........X " - " X..X - X...X - X...X - X..X X..X - - X........X " - " XX - X.X - X.X - X...XXXXXXXXXXXXX...X - - XXXXXXXXXX " - "------------ - X - X -X.....................X- ------------------" - " ----------------------------------- X...XXXXXXXXXXXXX...X - " - " - X..X X..X - " - " - X.X X.X - " - " - XX XX - " + "..- -XXXXXXX- X - X -XXXXXXX - XXXXXXX- XX - XX XX " + "..- -X.....X- X.X - X.X -X.....X - X.....X- X..X -X..X X..X" + "--- -XXX.XXX- X...X - X...X -X....X - X....X- X..X -X...X X...X" + "X - X.X - X.....X - X.....X -X...X - X...X- X..X - X...X X...X " + "XX - X.X -X.......X- X.......X -X..X.X - X.X..X- X..X - X...X...X " + "X.X - X.X -XXXX.XXXX- XXXX.XXXX -X.X X.X - X.X X.X- X..XXX - X.....X " + "X..X - X.X - X.X - X.X -XX X.X - X.X XX- X..X..XXX - X...X " + "X...X - X.X - X.X - XX X.X XX - X.X - X.X - X..X..X..XX - X.X " + "X....X - X.X - X.X - X.X X.X X.X - X.X - X.X - X..X..X..X.X - X...X " + "X.....X - X.X - X.X - X..X X.X X..X - X.X - X.X -XXX X..X..X..X..X- X.....X " + "X......X - X.X - X.X - X...XXXXXX.XXXXXX...X - X.X XX-XX X.X -X..XX........X..X- X...X...X " + "X.......X - X.X - X.X -X.....................X- X.X X.X-X.X X.X -X...X...........X- X...X X...X " + "X........X - X.X - X.X - X...XXXXXX.XXXXXX...X - X.X..X-X..X.X - X..............X-X...X X...X" + "X.........X -XXX.XXX- X.X - X..X X.X X..X - X...X-X...X - X.............X-X..X X..X" + "X..........X-X.....X- X.X - X.X X.X X.X - X....X-X....X - X.............X- XX XX " + "X......XXXXX-XXXXXXX- X.X - XX X.X XX - X.....X-X.....X - X............X--------------" + "X...X..X --------- X.X - X.X - XXXXXXX-XXXXXXX - X...........X - " + "X..X X..X - -XXXX.XXXX- XXXX.XXXX ------------------------------------- X..........X - " + "X.X X..X - -X.......X- X.......X - XX XX - - X..........X - " + "XX X..X - - X.....X - X.....X - X.X X.X - - X........X - " + " X..X - - X...X - X...X - X..X X..X - - X........X - " + " XX - - X.X - X.X - X...XXXXXXXXXXXXX...X - - XXXXXXXXXX - " + "------------- - X - X -X.....................X- ------------------- " + " ----------------------------------- X...XXXXXXXXXXXXX...X - " + " - X..X X..X - " + " - X.X X.X - " + " - XX XX - " }; static const ImVec2 FONT_ATLAS_DEFAULT_TEX_CURSOR_DATA[ImGuiMouseCursor_COUNT][3] = @@ -1483,23 +2474,16 @@ static const ImVec2 FONT_ATLAS_DEFAULT_TEX_CURSOR_DATA[ImGuiMouseCursor_COUNT][3 { ImVec2(73,0), ImVec2(17,17), ImVec2( 8, 8) }, // ImGuiMouseCursor_ResizeNESW { ImVec2(55,0), ImVec2(17,17), ImVec2( 8, 8) }, // ImGuiMouseCursor_ResizeNWSE { ImVec2(91,0), ImVec2(17,22), ImVec2( 5, 0) }, // ImGuiMouseCursor_Hand + { ImVec2(0,3), ImVec2(12,19), ImVec2(0, 0) }, // ImGuiMouseCursor_Wait // Arrow + custom code in ImGui::RenderMouseCursor() + { ImVec2(0,3), ImVec2(12,19), ImVec2(0, 0) }, // ImGuiMouseCursor_Progress // Arrow + custom code in ImGui::RenderMouseCursor() + { ImVec2(109,0),ImVec2(13,15), ImVec2( 6, 7) }, // ImGuiMouseCursor_NotAllowed }; ImFontAtlas::ImFontAtlas() { - Locked = false; - Flags = ImFontAtlasFlags_None; - TexID = (ImTextureID)NULL; - TexDesiredWidth = 0; + memset(this, 0, sizeof(*this)); TexGlyphPadding = 1; - - TexPixelsAlpha8 = NULL; - TexPixelsRGBA32 = NULL; - TexWidth = TexHeight = 0; - TexUvScale = ImVec2(0.0f, 0.0f); - TexUvWhitePixel = ImVec2(0.0f, 0.0f); - for (int n = 0; n < IM_ARRAYSIZE(CustomRectIds); n++) - CustomRectIds[n] = -1; + PackIdMouseCursors = PackIdLines = -1; } ImFontAtlas::~ImFontAtlas() @@ -1511,24 +2495,24 @@ ImFontAtlas::~ImFontAtlas() void ImFontAtlas::ClearInputData() { IM_ASSERT(!Locked && "Cannot modify a locked ImFontAtlas between NewFrame() and EndFrame/Render()!"); - for (int i = 0; i < ConfigData.Size; i++) - if (ConfigData[i].FontData && ConfigData[i].FontDataOwnedByAtlas) + for (ImFontConfig& font_cfg : Sources) + if (font_cfg.FontData && font_cfg.FontDataOwnedByAtlas) { - IM_FREE(ConfigData[i].FontData); - ConfigData[i].FontData = NULL; + IM_FREE(font_cfg.FontData); + font_cfg.FontData = NULL; } // When clearing this we lose access to the font name and other information used to build the font. - for (int i = 0; i < Fonts.Size; i++) - if (Fonts[i]->ConfigData >= ConfigData.Data && Fonts[i]->ConfigData < ConfigData.Data + ConfigData.Size) + for (ImFont* font : Fonts) + if (font->Sources >= Sources.Data && font->Sources < Sources.Data + Sources.Size) { - Fonts[i]->ConfigData = NULL; - Fonts[i]->ConfigDataCount = 0; + font->Sources = NULL; + font->SourcesCount = 0; } - ConfigData.clear(); + Sources.clear(); CustomRects.clear(); - for (int n = 0; n < IM_ARRAYSIZE(CustomRectIds); n++) - CustomRectIds[n] = -1; + PackIdMouseCursors = PackIdLines = -1; + // Important: we leave TexReady untouched } void ImFontAtlas::ClearTexData() @@ -1540,14 +2524,16 @@ void ImFontAtlas::ClearTexData() IM_FREE(TexPixelsRGBA32); TexPixelsAlpha8 = NULL; TexPixelsRGBA32 = NULL; + TexPixelsUseColors = false; + // Important: we leave TexReady untouched } void ImFontAtlas::ClearFonts() { IM_ASSERT(!Locked && "Cannot modify a locked ImFontAtlas between NewFrame() and EndFrame/Render()!"); - for (int i = 0; i < Fonts.Size; i++) - IM_DELETE(Fonts[i]); - Fonts.clear(); + ClearInputData(); + Fonts.clear_delete(); + TexReady = false; } void ImFontAtlas::Clear() @@ -1561,11 +2547,7 @@ void ImFontAtlas::GetTexDataAsAlpha8(unsigned char** out_pixels, int* out_wid { // Build atlas on demand if (TexPixelsAlpha8 == NULL) - { - if (ConfigData.empty()) - AddFontDefault(); Build(); - } *out_pixels = TexPixelsAlpha8; if (out_width) *out_width = TexWidth; @@ -1601,16 +2583,17 @@ ImFont* ImFontAtlas::AddFont(const ImFontConfig* font_cfg) { IM_ASSERT(!Locked && "Cannot modify a locked ImFontAtlas between NewFrame() and EndFrame/Render()!"); IM_ASSERT(font_cfg->FontData != NULL && font_cfg->FontDataSize > 0); - IM_ASSERT(font_cfg->SizePixels > 0.0f); + IM_ASSERT(font_cfg->SizePixels > 0.0f && "Is ImFontConfig struct correctly initialized?"); + IM_ASSERT(font_cfg->RasterizerDensity > 0.0f && "Is ImFontConfig struct correctly initialized?"); // Create new font if (!font_cfg->MergeMode) Fonts.push_back(IM_NEW(ImFont)); else - IM_ASSERT(!Fonts.empty() && "Cannot use MergeMode for the first font"); // When using MergeMode make sure that a font has already been added before. You can use ImGui::GetIO().Fonts->AddFontDefault() to add the default imgui font. + IM_ASSERT(Fonts.Size > 0 && "Cannot use MergeMode for the first font"); // When using MergeMode make sure that a font has already been added before. You can use ImGui::GetIO().Fonts->AddFontDefault() to add the default imgui font. - ConfigData.push_back(*font_cfg); - ImFontConfig& new_font_cfg = ConfigData.back(); + Sources.push_back(*font_cfg); + ImFontConfig& new_font_cfg = Sources.back(); if (new_font_cfg.DstFont == NULL) new_font_cfg.DstFont = Fonts.back(); if (!new_font_cfg.FontDataOwnedByAtlas) @@ -1620,33 +2603,43 @@ ImFont* ImFontAtlas::AddFont(const ImFontConfig* font_cfg) memcpy(new_font_cfg.FontData, font_cfg->FontData, (size_t)new_font_cfg.FontDataSize); } - if (new_font_cfg.DstFont->EllipsisChar == (ImWchar)-1) - new_font_cfg.DstFont->EllipsisChar = font_cfg->EllipsisChar; + // Round font size + // - We started rounding in 1.90 WIP (18991) as our layout system currently doesn't support non-rounded font size well yet. + // - Note that using io.FontGlobalScale or SetWindowFontScale(), with are legacy-ish, partially supported features, can still lead to unrounded sizes. + // - We may support it better later and remove this rounding. + new_font_cfg.SizePixels = ImTrunc(new_font_cfg.SizePixels); + + // Pointers to Sources data are otherwise dangling + ImFontAtlasUpdateSourcesPointers(this); // Invalidate texture + TexReady = false; ClearTexData(); return new_font_cfg.DstFont; } // Default font TTF is compressed with stb_compress then base85 encoded (see misc/fonts/binary_to_compressed_c.cpp for encoder) -static unsigned int stb_decompress_length(const unsigned char *input); -static unsigned int stb_decompress(unsigned char *output, const unsigned char *input, unsigned int length); -static const char* GetDefaultCompressedFontDataTTFBase85(); +static unsigned int stb_decompress_length(const unsigned char* input); +static unsigned int stb_decompress(unsigned char* output, const unsigned char* input, unsigned int length); static unsigned int Decode85Byte(char c) { return c >= '\\' ? c-36 : c-35; } static void Decode85(const unsigned char* src, unsigned char* dst) { while (*src) { - unsigned int tmp = Decode85Byte(src[0]) + 85*(Decode85Byte(src[1]) + 85*(Decode85Byte(src[2]) + 85*(Decode85Byte(src[3]) + 85*Decode85Byte(src[4])))); + unsigned int tmp = Decode85Byte(src[0]) + 85 * (Decode85Byte(src[1]) + 85 * (Decode85Byte(src[2]) + 85 * (Decode85Byte(src[3]) + 85 * Decode85Byte(src[4])))); dst[0] = ((tmp >> 0) & 0xFF); dst[1] = ((tmp >> 8) & 0xFF); dst[2] = ((tmp >> 16) & 0xFF); dst[3] = ((tmp >> 24) & 0xFF); // We can't assume little-endianness. src += 5; dst += 4; } } +#ifndef IMGUI_DISABLE_DEFAULT_FONT +static const char* GetDefaultCompressedFontDataTTF(int* out_size); +#endif // Load embedded ProggyClean.ttf at size 13, disable oversampling ImFont* ImFontAtlas::AddFontDefault(const ImFontConfig* font_cfg_template) { +#ifndef IMGUI_DISABLE_DEFAULT_FONT ImFontConfig font_cfg = font_cfg_template ? *font_cfg_template : ImFontConfig(); if (!font_cfg_template) { @@ -1658,12 +2651,18 @@ ImFont* ImFontAtlas::AddFontDefault(const ImFontConfig* font_cfg_template) if (font_cfg.Name[0] == '\0') ImFormatString(font_cfg.Name, IM_ARRAYSIZE(font_cfg.Name), "ProggyClean.ttf, %dpx", (int)font_cfg.SizePixels); font_cfg.EllipsisChar = (ImWchar)0x0085; + font_cfg.GlyphOffset.y = 1.0f * IM_TRUNC(font_cfg.SizePixels / 13.0f); // Add +1 offset per 13 units - const char* ttf_compressed_base85 = GetDefaultCompressedFontDataTTFBase85(); + int ttf_compressed_size = 0; + const char* ttf_compressed = GetDefaultCompressedFontDataTTF(&ttf_compressed_size); const ImWchar* glyph_ranges = font_cfg.GlyphRanges != NULL ? font_cfg.GlyphRanges : GetGlyphRangesDefault(); - ImFont* font = AddFontFromMemoryCompressedBase85TTF(ttf_compressed_base85, font_cfg.SizePixels, &font_cfg, glyph_ranges); - font->DisplayOffset.y = 1.0f; + ImFont* font = AddFontFromMemoryCompressedTTF(ttf_compressed, ttf_compressed_size, font_cfg.SizePixels, &font_cfg, glyph_ranges); return font; +#else + IM_ASSERT(0 && "AddFontDefault() disabled in this build."); + IM_UNUSED(font_cfg_template); + return NULL; +#endif // #ifndef IMGUI_DISABLE_DEFAULT_FONT } ImFont* ImFontAtlas::AddFontFromFileTTF(const char* filename, float size_pixels, const ImFontConfig* font_cfg_template, const ImWchar* glyph_ranges) @@ -1673,7 +2672,7 @@ ImFont* ImFontAtlas::AddFontFromFileTTF(const char* filename, float size_pixels, void* data = ImFileLoadToMemory(filename, "rb", &data_size, 0); if (!data) { - IM_ASSERT(0); // Could not load file. + IM_ASSERT_USER_ERROR(0, "Could not load font file!"); return NULL; } ImFontConfig font_cfg = font_cfg_template ? *font_cfg_template : ImFontConfig(); @@ -1681,21 +2680,22 @@ ImFont* ImFontAtlas::AddFontFromFileTTF(const char* filename, float size_pixels, { // Store a short copy of filename into into the font name for convenience const char* p; - for (p = filename + strlen(filename); p > filename && p[-1] != '/' && p[-1] != '\\'; p--) {} + for (p = filename + ImStrlen(filename); p > filename && p[-1] != '/' && p[-1] != '\\'; p--) {} ImFormatString(font_cfg.Name, IM_ARRAYSIZE(font_cfg.Name), "%s, %.0fpx", p, size_pixels); } return AddFontFromMemoryTTF(data, (int)data_size, size_pixels, &font_cfg, glyph_ranges); } // NB: Transfer ownership of 'ttf_data' to ImFontAtlas, unless font_cfg_template->FontDataOwnedByAtlas == false. Owned TTF buffer will be deleted after Build(). -ImFont* ImFontAtlas::AddFontFromMemoryTTF(void* ttf_data, int ttf_size, float size_pixels, const ImFontConfig* font_cfg_template, const ImWchar* glyph_ranges) +ImFont* ImFontAtlas::AddFontFromMemoryTTF(void* font_data, int font_data_size, float size_pixels, const ImFontConfig* font_cfg_template, const ImWchar* glyph_ranges) { IM_ASSERT(!Locked && "Cannot modify a locked ImFontAtlas between NewFrame() and EndFrame/Render()!"); ImFontConfig font_cfg = font_cfg_template ? *font_cfg_template : ImFontConfig(); IM_ASSERT(font_cfg.FontData == NULL); - font_cfg.FontData = ttf_data; - font_cfg.FontDataSize = ttf_size; - font_cfg.SizePixels = size_pixels; + IM_ASSERT(font_data_size > 100 && "Incorrect value for font_data_size!"); // Heuristic to prevent accidentally passing a wrong value to font_data_size. + font_cfg.FontData = font_data; + font_cfg.FontDataSize = font_data_size; + font_cfg.SizePixels = size_pixels > 0.0f ? size_pixels : font_cfg.SizePixels; if (glyph_ranges) font_cfg.GlyphRanges = glyph_ranges; return AddFont(&font_cfg); @@ -1704,7 +2704,7 @@ ImFont* ImFontAtlas::AddFontFromMemoryTTF(void* ttf_data, int ttf_size, float si ImFont* ImFontAtlas::AddFontFromMemoryCompressedTTF(const void* compressed_ttf_data, int compressed_ttf_size, float size_pixels, const ImFontConfig* font_cfg_template, const ImWchar* glyph_ranges) { const unsigned int buf_decompressed_size = stb_decompress_length((const unsigned char*)compressed_ttf_data); - unsigned char* buf_decompressed_data = (unsigned char *)IM_ALLOC(buf_decompressed_size); + unsigned char* buf_decompressed_data = (unsigned char*)IM_ALLOC(buf_decompressed_size); stb_decompress(buf_decompressed_data, (const unsigned char*)compressed_ttf_data, (unsigned int)compressed_ttf_size); ImFontConfig font_cfg = font_cfg_template ? *font_cfg_template : ImFontConfig(); @@ -1715,7 +2715,7 @@ ImFont* ImFontAtlas::AddFontFromMemoryCompressedTTF(const void* compressed_ttf_d ImFont* ImFontAtlas::AddFontFromMemoryCompressedBase85TTF(const char* compressed_ttf_data_base85, float size_pixels, const ImFontConfig* font_cfg, const ImWchar* glyph_ranges) { - int compressed_ttf_size = (((int)strlen(compressed_ttf_data_base85) + 4) / 5) * 4; + int compressed_ttf_size = (((int)ImStrlen(compressed_ttf_data_base85) + 4) / 5) * 4; void* compressed_ttf = IM_ALLOC((size_t)compressed_ttf_size); Decode85((const unsigned char*)compressed_ttf_data_base85, (unsigned char*)compressed_ttf); ImFont* font = AddFontFromMemoryCompressedTTF(compressed_ttf, compressed_ttf_size, size_pixels, font_cfg, glyph_ranges); @@ -1723,13 +2723,11 @@ ImFont* ImFontAtlas::AddFontFromMemoryCompressedBase85TTF(const char* compressed return font; } -int ImFontAtlas::AddCustomRectRegular(unsigned int id, int width, int height) +int ImFontAtlas::AddCustomRectRegular(int width, int height) { - IM_ASSERT(id >= 0x10000); IM_ASSERT(width > 0 && width <= 0xFFFF); IM_ASSERT(height > 0 && height <= 0xFFFF); ImFontAtlasCustomRect r; - r.ID = id; r.Width = (unsigned short)width; r.Height = (unsigned short)height; CustomRects.push_back(r); @@ -1738,13 +2736,17 @@ int ImFontAtlas::AddCustomRectRegular(unsigned int id, int width, int height) int ImFontAtlas::AddCustomRectFontGlyph(ImFont* font, ImWchar id, int width, int height, float advance_x, const ImVec2& offset) { +#ifdef IMGUI_USE_WCHAR32 + IM_ASSERT(id <= IM_UNICODE_CODEPOINT_MAX); +#endif IM_ASSERT(font != NULL); IM_ASSERT(width > 0 && width <= 0xFFFF); IM_ASSERT(height > 0 && height <= 0xFFFF); ImFontAtlasCustomRect r; - r.ID = id; r.Width = (unsigned short)width; r.Height = (unsigned short)height; + r.GlyphID = id; + r.GlyphColored = 0; // Set to 1 manually to mark glyph as colored // FIXME: No official API for that (#8133) r.GlyphAdvanceX = advance_x; r.GlyphOffset = offset; r.Font = font; @@ -1752,7 +2754,7 @@ int ImFontAtlas::AddCustomRectFontGlyph(ImFont* font, ImWchar id, int width, int return CustomRects.Size - 1; // Return index } -void ImFontAtlas::CalcCustomRectUV(const ImFontAtlasCustomRect* rect, ImVec2* out_uv_min, ImVec2* out_uv_max) +void ImFontAtlas::CalcCustomRectUV(const ImFontAtlasCustomRect* rect, ImVec2* out_uv_min, ImVec2* out_uv_max) const { IM_ASSERT(TexWidth > 0 && TexHeight > 0); // Font atlas needs to be built before we can calculate UV coordinates IM_ASSERT(rect->IsPacked()); // Make sure the rectangle has been packed @@ -1760,32 +2762,54 @@ void ImFontAtlas::CalcCustomRectUV(const ImFontAtlasCustomRect* rect, ImVec2* ou *out_uv_max = ImVec2((float)(rect->X + rect->Width) * TexUvScale.x, (float)(rect->Y + rect->Height) * TexUvScale.y); } -bool ImFontAtlas::GetMouseCursorTexData(ImGuiMouseCursor cursor_type, ImVec2* out_offset, ImVec2* out_size, ImVec2 out_uv_border[2], ImVec2 out_uv_fill[2]) +bool ImFontAtlasGetMouseCursorTexData(ImFontAtlas* atlas, ImGuiMouseCursor cursor_type, ImVec2* out_offset, ImVec2* out_size, ImVec2 out_uv_border[2], ImVec2 out_uv_fill[2]) { if (cursor_type <= ImGuiMouseCursor_None || cursor_type >= ImGuiMouseCursor_COUNT) return false; - if (Flags & ImFontAtlasFlags_NoMouseCursors) + if (atlas->Flags & ImFontAtlasFlags_NoMouseCursors) return false; - IM_ASSERT(CustomRectIds[0] != -1); - ImFontAtlasCustomRect& r = CustomRects[CustomRectIds[0]]; - IM_ASSERT(r.ID == FONT_ATLAS_DEFAULT_TEX_DATA_ID); - ImVec2 pos = FONT_ATLAS_DEFAULT_TEX_CURSOR_DATA[cursor_type][0] + ImVec2((float)r.X, (float)r.Y); + IM_ASSERT(atlas->PackIdMouseCursors != -1); + ImFontAtlasCustomRect* r = atlas->GetCustomRectByIndex(atlas->PackIdMouseCursors); + ImVec2 pos = FONT_ATLAS_DEFAULT_TEX_CURSOR_DATA[cursor_type][0] + ImVec2((float)r->X, (float)r->Y); ImVec2 size = FONT_ATLAS_DEFAULT_TEX_CURSOR_DATA[cursor_type][1]; *out_size = size; *out_offset = FONT_ATLAS_DEFAULT_TEX_CURSOR_DATA[cursor_type][2]; - out_uv_border[0] = (pos) * TexUvScale; - out_uv_border[1] = (pos + size) * TexUvScale; - pos.x += FONT_ATLAS_DEFAULT_TEX_DATA_W_HALF + 1; - out_uv_fill[0] = (pos) * TexUvScale; - out_uv_fill[1] = (pos + size) * TexUvScale; + out_uv_border[0] = (pos) * atlas->TexUvScale; + out_uv_border[1] = (pos + size) * atlas->TexUvScale; + pos.x += FONT_ATLAS_DEFAULT_TEX_DATA_W + 1; + out_uv_fill[0] = (pos) * atlas->TexUvScale; + out_uv_fill[1] = (pos + size) * atlas->TexUvScale; return true; } bool ImFontAtlas::Build() { IM_ASSERT(!Locked && "Cannot modify a locked ImFontAtlas between NewFrame() and EndFrame/Render()!"); - return ImFontAtlasBuildWithStbTruetype(this); + + // Default font is none are specified + if (Sources.Size == 0) + AddFontDefault(); + + // Select builder + // - Note that we do not reassign to atlas->FontBuilderIO, since it is likely to point to static data which + // may mess with some hot-reloading schemes. If you need to assign to this (for dynamic selection) AND are + // using a hot-reloading scheme that messes up static data, store your own instance of ImFontBuilderIO somewhere + // and point to it instead of pointing directly to return value of the GetBuilderXXX functions. + const ImFontBuilderIO* builder_io = FontBuilderIO; + if (builder_io == NULL) + { +#ifdef IMGUI_ENABLE_FREETYPE + builder_io = ImGuiFreeType::GetBuilderForFreeType(); +#elif defined(IMGUI_ENABLE_STB_TRUETYPE) + builder_io = ImFontAtlasGetBuilderForStbTruetype(); +#else + IM_ASSERT(0); // Invalid Build function +#endif + } + + // Build + return builder_io->FontBuilder_Build(this); } void ImFontAtlasBuildMultiplyCalcLookupTable(unsigned char out_table[256], float in_brighten_factor) @@ -1799,12 +2823,21 @@ void ImFontAtlasBuildMultiplyCalcLookupTable(unsigned char out_table[256], fl void ImFontAtlasBuildMultiplyRectAlpha8(const unsigned char table[256], unsigned char* pixels, int x, int y, int w, int h, int stride) { + IM_ASSERT_PARANOID(w <= stride); unsigned char* data = pixels + x + y * stride; - for (int j = h; j > 0; j--, data += stride) - for (int i = 0; i < w; i++) - data[i] = table[data[i]]; + for (int j = h; j > 0; j--, data += stride - w) + for (int i = w; i > 0; i--, data++) + *data = table[*data]; } +void ImFontAtlasBuildGetOversampleFactors(const ImFontConfig* src, int* out_oversample_h, int* out_oversample_v) +{ + // Automatically disable horizontal oversampling over size 36 + *out_oversample_h = (src->OversampleH != 0) ? src->OversampleH : (src->SizePixels * src->RasterizerDensity > 36.0f || src->PixelSnapH) ? 1 : 2; + *out_oversample_v = (src->OversampleV != 0) ? src->OversampleV : 1; +} + +#ifdef IMGUI_ENABLE_STB_TRUETYPE // Temporary data for one source font (multiple source fonts can be merged into one destination ImFont) // (C++03 doesn't allow instancing ImVector<> with function-local types so we declare the type here.) struct ImFontBuildSrcData @@ -1817,8 +2850,8 @@ struct ImFontBuildSrcData int DstIndex; // Index into atlas->Fonts[] and dst_tmp_array[] int GlyphsHighest; // Highest requested codepoint int GlyphsCount; // Glyph count (excluding missing glyphs and glyphs already set by an earlier source font) - ImBoolVector GlyphsSet; // Glyph bit map (random access, 1-bit per codepoint. This will be a maximum of 8KB) - ImVector GlyphsList; // Glyph codepoints list (flattened version of GlyphsMap) + ImBitVector GlyphsSet; // Glyph bit map (random access, 1-bit per codepoint. This will be a maximum of 8KB) + ImVector GlyphsList; // Glyph codepoints list (flattened version of GlyphsSet) }; // Temporary data for one destination ImFont* (multiple source fonts can be merged into one destination ImFont) @@ -1827,26 +2860,26 @@ struct ImFontBuildDstData int SrcCount; // Number of source fonts targeting this destination font. int GlyphsHighest; int GlyphsCount; - ImBoolVector GlyphsSet; // This is used to resolve collision when multiple sources are merged into a same destination font. + ImBitVector GlyphsSet; // This is used to resolve collision when multiple sources are merged into a same destination font. }; -static void UnpackBoolVectorToFlatIndexList(const ImBoolVector* in, ImVector* out) +static void UnpackBitVectorToFlatIndexList(const ImBitVector* in, ImVector* out) { IM_ASSERT(sizeof(in->Storage.Data[0]) == sizeof(int)); - const int* it_begin = in->Storage.begin(); - const int* it_end = in->Storage.end(); - for (const int* it = it_begin; it < it_end; it++) - if (int entries_32 = *it) - for (int bit_n = 0; bit_n < 32; bit_n++) - if (entries_32 & (1u << bit_n)) - out->push_back((int)((it - it_begin) << 5) + bit_n); + const ImU32* it_begin = in->Storage.begin(); + const ImU32* it_end = in->Storage.end(); + for (const ImU32* it = it_begin; it < it_end; it++) + if (ImU32 entries_32 = *it) + for (ImU32 bit_n = 0; bit_n < 32; bit_n++) + if (entries_32 & ((ImU32)1 << bit_n)) + out->push_back((int)(((it - it_begin) << 5) + bit_n)); } -bool ImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas) +static bool ImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas) { - IM_ASSERT(atlas->ConfigData.Size > 0); + IM_ASSERT(atlas->Sources.Size > 0); - ImFontAtlasBuildRegisterDefaultCustomRects(atlas); + ImFontAtlasBuildInit(atlas); // Clear atlas atlas->TexID = (ImTextureID)NULL; @@ -1858,38 +2891,48 @@ bool ImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas) // Temporary storage for building ImVector src_tmp_array; ImVector dst_tmp_array; - src_tmp_array.resize(atlas->ConfigData.Size); + src_tmp_array.resize(atlas->Sources.Size); dst_tmp_array.resize(atlas->Fonts.Size); memset(src_tmp_array.Data, 0, (size_t)src_tmp_array.size_in_bytes()); memset(dst_tmp_array.Data, 0, (size_t)dst_tmp_array.size_in_bytes()); // 1. Initialize font loading structure, check font data validity - for (int src_i = 0; src_i < atlas->ConfigData.Size; src_i++) + for (int src_i = 0; src_i < atlas->Sources.Size; src_i++) { ImFontBuildSrcData& src_tmp = src_tmp_array[src_i]; - ImFontConfig& cfg = atlas->ConfigData[src_i]; - IM_ASSERT(cfg.DstFont && (!cfg.DstFont->IsLoaded() || cfg.DstFont->ContainerAtlas == atlas)); + ImFontConfig& src = atlas->Sources[src_i]; + IM_ASSERT(src.DstFont && (!src.DstFont->IsLoaded() || src.DstFont->ContainerAtlas == atlas)); - // Find index from cfg.DstFont (we allow the user to set cfg.DstFont. Also it makes casual debugging nicer than when storing indices) + // Find index from src.DstFont (we allow the user to set cfg.DstFont. Also it makes casual debugging nicer than when storing indices) src_tmp.DstIndex = -1; for (int output_i = 0; output_i < atlas->Fonts.Size && src_tmp.DstIndex == -1; output_i++) - if (cfg.DstFont == atlas->Fonts[output_i]) + if (src.DstFont == atlas->Fonts[output_i]) src_tmp.DstIndex = output_i; - IM_ASSERT(src_tmp.DstIndex != -1); // cfg.DstFont not pointing within atlas->Fonts[] array? if (src_tmp.DstIndex == -1) + { + IM_ASSERT(src_tmp.DstIndex != -1); // src.DstFont not pointing within atlas->Fonts[] array? return false; - + } // Initialize helper structure for font loading and verify that the TTF/OTF data is correct - const int font_offset = stbtt_GetFontOffsetForIndex((unsigned char*)cfg.FontData, cfg.FontNo); + const int font_offset = stbtt_GetFontOffsetForIndex((unsigned char*)src.FontData, src.FontNo); IM_ASSERT(font_offset >= 0 && "FontData is incorrect, or FontNo cannot be found."); - if (!stbtt_InitFont(&src_tmp.FontInfo, (unsigned char*)cfg.FontData, font_offset)) + if (!stbtt_InitFont(&src_tmp.FontInfo, (unsigned char*)src.FontData, font_offset)) + { + IM_ASSERT(0 && "stbtt_InitFont(): failed to parse FontData. It is correct and complete? Check FontDataSize."); return false; + } // Measure highest codepoints ImFontBuildDstData& dst_tmp = dst_tmp_array[src_tmp.DstIndex]; - src_tmp.SrcRanges = cfg.GlyphRanges ? cfg.GlyphRanges : atlas->GetGlyphRangesDefault(); + src_tmp.SrcRanges = src.GlyphRanges ? src.GlyphRanges : atlas->GetGlyphRangesDefault(); for (const ImWchar* src_range = src_tmp.SrcRanges; src_range[0] && src_range[1]; src_range += 2) + { + // Check for valid range. This may also help detect *some* dangling pointers, because a common + // user error is to setup ImFontConfig::GlyphRanges with a pointer to data that isn't persistent, + // or to forget to zero-terminate the glyph range array. + IM_ASSERT(src_range[0] <= src_range[1] && "Invalid range: is your glyph range array persistent? it is zero-terminated?"); src_tmp.GlyphsHighest = ImMax(src_tmp.GlyphsHighest, (int)src_range[1]); + } dst_tmp.SrcCount++; dst_tmp.GlyphsHighest = ImMax(dst_tmp.GlyphsHighest, src_tmp.GlyphsHighest); } @@ -1900,14 +2943,14 @@ bool ImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas) { ImFontBuildSrcData& src_tmp = src_tmp_array[src_i]; ImFontBuildDstData& dst_tmp = dst_tmp_array[src_tmp.DstIndex]; - src_tmp.GlyphsSet.Resize(src_tmp.GlyphsHighest + 1); + src_tmp.GlyphsSet.Create(src_tmp.GlyphsHighest + 1); if (dst_tmp.GlyphsSet.Storage.empty()) - dst_tmp.GlyphsSet.Resize(dst_tmp.GlyphsHighest + 1); + dst_tmp.GlyphsSet.Create(dst_tmp.GlyphsHighest + 1); for (const ImWchar* src_range = src_tmp.SrcRanges; src_range[0] && src_range[1]; src_range += 2) - for (int codepoint = src_range[0]; codepoint <= src_range[1]; codepoint++) + for (unsigned int codepoint = src_range[0]; codepoint <= src_range[1]; codepoint++) { - if (dst_tmp.GlyphsSet.GetBit(codepoint)) // Don't overwrite existing glyphs. We could make this an option for MergeMode (e.g. MergeOverwrite==true) + if (dst_tmp.GlyphsSet.TestBit(codepoint)) // Don't overwrite existing glyphs. We could make this an option for MergeMode (e.g. MergeOverwrite==true) continue; if (!stbtt_FindGlyphIndex(&src_tmp.FontInfo, codepoint)) // It is actually in the font? continue; @@ -1915,8 +2958,8 @@ bool ImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas) // Add to avail set/counters src_tmp.GlyphsCount++; dst_tmp.GlyphsCount++; - src_tmp.GlyphsSet.SetBit(codepoint, true); - dst_tmp.GlyphsSet.SetBit(codepoint, true); + src_tmp.GlyphsSet.SetBit(codepoint); + dst_tmp.GlyphsSet.SetBit(codepoint); total_glyphs_count++; } } @@ -1926,7 +2969,7 @@ bool ImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas) { ImFontBuildSrcData& src_tmp = src_tmp_array[src_i]; src_tmp.GlyphsList.reserve(src_tmp.GlyphsCount); - UnpackBoolVectorToFlatIndexList(&src_tmp.GlyphsSet, &src_tmp.GlyphsList); + UnpackBitVectorToFlatIndexList(&src_tmp.GlyphsSet, &src_tmp.GlyphsList); src_tmp.GlyphsSet.Clear(); IM_ASSERT(src_tmp.GlyphsList.Size == src_tmp.GlyphsCount); } @@ -1947,6 +2990,7 @@ bool ImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas) int total_surface = 0; int buf_rects_out_n = 0; int buf_packedchars_out_n = 0; + const int pack_padding = atlas->TexGlyphPadding; for (int src_i = 0; src_i < src_tmp_array.Size; src_i++) { ImFontBuildSrcData& src_tmp = src_tmp_array[src_i]; @@ -1958,30 +3002,35 @@ bool ImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas) buf_rects_out_n += src_tmp.GlyphsCount; buf_packedchars_out_n += src_tmp.GlyphsCount; + // Automatic selection of oversampling parameters + ImFontConfig& src = atlas->Sources[src_i]; + int oversample_h, oversample_v; + ImFontAtlasBuildGetOversampleFactors(&src, &oversample_h, &oversample_v); + // Convert our ranges in the format stb_truetype wants - ImFontConfig& cfg = atlas->ConfigData[src_i]; - src_tmp.PackRange.font_size = cfg.SizePixels; + src_tmp.PackRange.font_size = src.SizePixels * src.RasterizerDensity; src_tmp.PackRange.first_unicode_codepoint_in_range = 0; src_tmp.PackRange.array_of_unicode_codepoints = src_tmp.GlyphsList.Data; src_tmp.PackRange.num_chars = src_tmp.GlyphsList.Size; src_tmp.PackRange.chardata_for_range = src_tmp.PackedChars; - src_tmp.PackRange.h_oversample = (unsigned char)cfg.OversampleH; - src_tmp.PackRange.v_oversample = (unsigned char)cfg.OversampleV; + src_tmp.PackRange.h_oversample = (unsigned char)oversample_h; + src_tmp.PackRange.v_oversample = (unsigned char)oversample_v; // Gather the sizes of all rectangles we will need to pack (this loop is based on stbtt_PackFontRangesGatherRects) - const float scale = (cfg.SizePixels > 0) ? stbtt_ScaleForPixelHeight(&src_tmp.FontInfo, cfg.SizePixels) : stbtt_ScaleForMappingEmToPixels(&src_tmp.FontInfo, -cfg.SizePixels); - const int padding = atlas->TexGlyphPadding; + const float scale = (src.SizePixels > 0.0f) ? stbtt_ScaleForPixelHeight(&src_tmp.FontInfo, src.SizePixels * src.RasterizerDensity) : stbtt_ScaleForMappingEmToPixels(&src_tmp.FontInfo, -src.SizePixels * src.RasterizerDensity); for (int glyph_i = 0; glyph_i < src_tmp.GlyphsList.Size; glyph_i++) { int x0, y0, x1, y1; const int glyph_index_in_font = stbtt_FindGlyphIndex(&src_tmp.FontInfo, src_tmp.GlyphsList[glyph_i]); IM_ASSERT(glyph_index_in_font != 0); - stbtt_GetGlyphBitmapBoxSubpixel(&src_tmp.FontInfo, glyph_index_in_font, scale * cfg.OversampleH, scale * cfg.OversampleV, 0, 0, &x0, &y0, &x1, &y1); - src_tmp.Rects[glyph_i].w = (stbrp_coord)(x1 - x0 + padding + cfg.OversampleH - 1); - src_tmp.Rects[glyph_i].h = (stbrp_coord)(y1 - y0 + padding + cfg.OversampleV - 1); + stbtt_GetGlyphBitmapBoxSubpixel(&src_tmp.FontInfo, glyph_index_in_font, scale * oversample_h, scale * oversample_v, 0, 0, &x0, &y0, &x1, &y1); + src_tmp.Rects[glyph_i].w = (stbrp_coord)(x1 - x0 + pack_padding + oversample_h - 1); + src_tmp.Rects[glyph_i].h = (stbrp_coord)(y1 - y0 + pack_padding + oversample_v - 1); total_surface += src_tmp.Rects[glyph_i].w * src_tmp.Rects[glyph_i].h; } } + for (int i = 0; i < atlas->CustomRects.Size; i++) + total_surface += (atlas->CustomRects[i].Width + pack_padding) * (atlas->CustomRects[i].Height + pack_padding); // We need a width for the skyline algorithm, any width! // The exact width doesn't really matter much, but some API/GPU have texture size limitations and increasing width can decrease height. @@ -1991,13 +3040,14 @@ bool ImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas) if (atlas->TexDesiredWidth > 0) atlas->TexWidth = atlas->TexDesiredWidth; else - atlas->TexWidth = (surface_sqrt >= 4096*0.7f) ? 4096 : (surface_sqrt >= 2048*0.7f) ? 2048 : (surface_sqrt >= 1024*0.7f) ? 1024 : 512; + atlas->TexWidth = (surface_sqrt >= 4096 * 0.7f) ? 4096 : (surface_sqrt >= 2048 * 0.7f) ? 2048 : (surface_sqrt >= 1024 * 0.7f) ? 1024 : 512; // 5. Start packing // Pack our extra data rectangles first, so it will be on the upper-left corner of our texture (UV will have small values). const int TEX_HEIGHT_MAX = 1024 * 32; stbtt_pack_context spc = {}; - stbtt_PackBegin(&spc, NULL, atlas->TexWidth, TEX_HEIGHT_MAX, 0, atlas->TexGlyphPadding, NULL); + stbtt_PackBegin(&spc, NULL, atlas->TexWidth, TEX_HEIGHT_MAX, 0, 0, NULL); + spc.padding = atlas->TexGlyphPadding; // Because we mixup stbtt_PackXXX and stbrp_PackXXX there's a bit of a hack here, not passing the value to stbtt_PackBegin() allows us to still pack a TexWidth-1 wide item. (#8107) ImFontAtlasBuildPackCustomRects(atlas, spc.pack_info); // 6. Pack each source font. No rendering yet, we are working with rectangles in an infinitely tall texture at this point. @@ -2027,7 +3077,7 @@ bool ImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas) // 8. Render/rasterize font characters into the texture for (int src_i = 0; src_i < src_tmp_array.Size; src_i++) { - ImFontConfig& cfg = atlas->ConfigData[src_i]; + ImFontConfig& src = atlas->Sources[src_i]; ImFontBuildSrcData& src_tmp = src_tmp_array[src_i]; if (src_tmp.GlyphsCount == 0) continue; @@ -2035,10 +3085,10 @@ bool ImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas) stbtt_PackFontRangesRenderIntoRects(&spc, &src_tmp.FontInfo, &src_tmp.PackRange, 1, src_tmp.Rects); // Apply multiply operator - if (cfg.RasterizerMultiply != 1.0f) + if (src.RasterizerMultiply != 1.0f) { unsigned char multiply_table[256]; - ImFontAtlasBuildMultiplyCalcLookupTable(multiply_table, cfg.RasterizerMultiply); + ImFontAtlasBuildMultiplyCalcLookupTable(multiply_table, src.RasterizerMultiply); stbrp_rect* r = &src_tmp.Rects[0]; for (int glyph_i = 0; glyph_i < src_tmp.GlyphsCount; glyph_i++, r++) if (r->was_packed) @@ -2054,58 +3104,69 @@ bool ImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas) // 9. Setup ImFont and glyphs for runtime for (int src_i = 0; src_i < src_tmp_array.Size; src_i++) { + // When merging fonts with MergeMode=true: + // - We can have multiple input fonts writing into a same destination font. + // - dst_font->Sources is != from src which is our source configuration. ImFontBuildSrcData& src_tmp = src_tmp_array[src_i]; - if (src_tmp.GlyphsCount == 0) - continue; + ImFontConfig& src = atlas->Sources[src_i]; + ImFont* dst_font = src.DstFont; - ImFontConfig& cfg = atlas->ConfigData[src_i]; - ImFont* dst_font = cfg.DstFont; // We can have multiple input fonts writing into a same destination font (when using MergeMode=true) - - const float font_scale = stbtt_ScaleForPixelHeight(&src_tmp.FontInfo, cfg.SizePixels); + const float font_scale = stbtt_ScaleForPixelHeight(&src_tmp.FontInfo, src.SizePixels); int unscaled_ascent, unscaled_descent, unscaled_line_gap; stbtt_GetFontVMetrics(&src_tmp.FontInfo, &unscaled_ascent, &unscaled_descent, &unscaled_line_gap); - const float ascent = ImFloor(unscaled_ascent * font_scale + ((unscaled_ascent > 0.0f) ? +1 : -1)); - const float descent = ImFloor(unscaled_descent * font_scale + ((unscaled_descent > 0.0f) ? +1 : -1)); - ImFontAtlasBuildSetupFont(atlas, dst_font, &cfg, ascent, descent); - const float font_off_x = cfg.GlyphOffset.x; - const float font_off_y = cfg.GlyphOffset.y + (float)(int)(dst_font->Ascent + 0.5f); + const float ascent = ImCeil(unscaled_ascent * font_scale); + const float descent = ImFloor(unscaled_descent * font_scale); + ImFontAtlasBuildSetupFont(atlas, dst_font, &src, ascent, descent); + const float font_off_x = src.GlyphOffset.x; + const float font_off_y = src.GlyphOffset.y + IM_ROUND(dst_font->Ascent); + + const float inv_rasterization_scale = 1.0f / src.RasterizerDensity; for (int glyph_i = 0; glyph_i < src_tmp.GlyphsCount; glyph_i++) { + // Register glyph const int codepoint = src_tmp.GlyphsList[glyph_i]; const stbtt_packedchar& pc = src_tmp.PackedChars[glyph_i]; - - const float char_advance_x_org = pc.xadvance; - const float char_advance_x_mod = ImClamp(char_advance_x_org, cfg.GlyphMinAdvanceX, cfg.GlyphMaxAdvanceX); - float char_off_x = font_off_x; - if (char_advance_x_org != char_advance_x_mod) - char_off_x += cfg.PixelSnapH ? (float)(int)((char_advance_x_mod - char_advance_x_org) * 0.5f) : (char_advance_x_mod - char_advance_x_org) * 0.5f; - - // Register glyph stbtt_aligned_quad q; - float dummy_x = 0.0f, dummy_y = 0.0f; - stbtt_GetPackedQuad(src_tmp.PackedChars, atlas->TexWidth, atlas->TexHeight, glyph_i, &dummy_x, &dummy_y, &q, 0); - dst_font->AddGlyph((ImWchar)codepoint, q.x0 + char_off_x, q.y0 + font_off_y, q.x1 + char_off_x, q.y1 + font_off_y, q.s0, q.t0, q.s1, q.t1, char_advance_x_mod); + float unused_x = 0.0f, unused_y = 0.0f; + stbtt_GetPackedQuad(src_tmp.PackedChars, atlas->TexWidth, atlas->TexHeight, glyph_i, &unused_x, &unused_y, &q, 0); + float x0 = q.x0 * inv_rasterization_scale + font_off_x; + float y0 = q.y0 * inv_rasterization_scale + font_off_y; + float x1 = q.x1 * inv_rasterization_scale + font_off_x; + float y1 = q.y1 * inv_rasterization_scale + font_off_y; + dst_font->AddGlyph(&src, (ImWchar)codepoint, x0, y0, x1, y1, q.s0, q.t0, q.s1, q.t1, pc.xadvance * inv_rasterization_scale); } } - // Cleanup temporary (ImVector doesn't honor destructor) - for (int src_i = 0; src_i < src_tmp_array.Size; src_i++) - src_tmp_array[src_i].~ImFontBuildSrcData(); + // Cleanup + src_tmp_array.clear_destruct(); ImFontAtlasBuildFinish(atlas); return true; } -void ImFontAtlasBuildRegisterDefaultCustomRects(ImFontAtlas* atlas) +const ImFontBuilderIO* ImFontAtlasGetBuilderForStbTruetype() { - if (atlas->CustomRectIds[0] >= 0) - return; - if (!(atlas->Flags & ImFontAtlasFlags_NoMouseCursors)) - atlas->CustomRectIds[0] = atlas->AddCustomRectRegular(FONT_ATLAS_DEFAULT_TEX_DATA_ID, FONT_ATLAS_DEFAULT_TEX_DATA_W_HALF*2+1, FONT_ATLAS_DEFAULT_TEX_DATA_H); - else - atlas->CustomRectIds[0] = atlas->AddCustomRectRegular(FONT_ATLAS_DEFAULT_TEX_DATA_ID, 2, 2); + static ImFontBuilderIO io; + io.FontBuilder_Build = ImFontAtlasBuildWithStbTruetype; + return &io; +} + +#endif // IMGUI_ENABLE_STB_TRUETYPE + +void ImFontAtlasUpdateSourcesPointers(ImFontAtlas* atlas) +{ + for (ImFontConfig& src : atlas->Sources) + { + ImFont* font = src.DstFont; + if (!src.MergeMode) + { + font->Sources = &src; + font->SourcesCount = 0; + } + font->SourcesCount++; + } } void ImFontAtlasBuildSetupFont(ImFontAtlas* atlas, ImFont* font, ImFontConfig* font_config, float ascent, float descent) @@ -2114,12 +3175,11 @@ void ImFontAtlasBuildSetupFont(ImFontAtlas* atlas, ImFont* font, ImFontConfig* f { font->ClearOutputData(); font->FontSize = font_config->SizePixels; - font->ConfigData = font_config; + IM_ASSERT(font->Sources == font_config); font->ContainerAtlas = atlas; font->Ascent = ascent; font->Descent = descent; } - font->ConfigDataCount++; } void ImFontAtlasBuildPackCustomRects(ImFontAtlas* atlas, void* stbrp_context_opaque) @@ -2129,98 +3189,208 @@ void ImFontAtlasBuildPackCustomRects(ImFontAtlas* atlas, void* stbrp_context_opa ImVector& user_rects = atlas->CustomRects; IM_ASSERT(user_rects.Size >= 1); // We expect at least the default custom rects to be registered, else something went wrong. +#ifdef __GNUC__ + if (user_rects.Size < 1) { __builtin_unreachable(); } // Workaround for GCC bug if IM_ASSERT() is defined to conditionally throw (see #5343) +#endif + const int pack_padding = atlas->TexGlyphPadding; ImVector pack_rects; pack_rects.resize(user_rects.Size); memset(pack_rects.Data, 0, (size_t)pack_rects.size_in_bytes()); for (int i = 0; i < user_rects.Size; i++) { - pack_rects[i].w = user_rects[i].Width; - pack_rects[i].h = user_rects[i].Height; + pack_rects[i].w = user_rects[i].Width + pack_padding; + pack_rects[i].h = user_rects[i].Height + pack_padding; } stbrp_pack_rects(pack_context, &pack_rects[0], pack_rects.Size); for (int i = 0; i < pack_rects.Size; i++) if (pack_rects[i].was_packed) { - user_rects[i].X = pack_rects[i].x; - user_rects[i].Y = pack_rects[i].y; - IM_ASSERT(pack_rects[i].w == user_rects[i].Width && pack_rects[i].h == user_rects[i].Height); + user_rects[i].X = (unsigned short)pack_rects[i].x; + user_rects[i].Y = (unsigned short)pack_rects[i].y; + IM_ASSERT(pack_rects[i].w == user_rects[i].Width + pack_padding && pack_rects[i].h == user_rects[i].Height + pack_padding); atlas->TexHeight = ImMax(atlas->TexHeight, pack_rects[i].y + pack_rects[i].h); } } +void ImFontAtlasBuildRender8bppRectFromString(ImFontAtlas* atlas, int x, int y, int w, int h, const char* in_str, char in_marker_char, unsigned char in_marker_pixel_value) +{ + IM_ASSERT(x >= 0 && x + w <= atlas->TexWidth); + IM_ASSERT(y >= 0 && y + h <= atlas->TexHeight); + unsigned char* out_pixel = atlas->TexPixelsAlpha8 + x + (y * atlas->TexWidth); + for (int off_y = 0; off_y < h; off_y++, out_pixel += atlas->TexWidth, in_str += w) + for (int off_x = 0; off_x < w; off_x++) + out_pixel[off_x] = (in_str[off_x] == in_marker_char) ? in_marker_pixel_value : 0x00; +} + +void ImFontAtlasBuildRender32bppRectFromString(ImFontAtlas* atlas, int x, int y, int w, int h, const char* in_str, char in_marker_char, unsigned int in_marker_pixel_value) +{ + IM_ASSERT(x >= 0 && x + w <= atlas->TexWidth); + IM_ASSERT(y >= 0 && y + h <= atlas->TexHeight); + unsigned int* out_pixel = atlas->TexPixelsRGBA32 + x + (y * atlas->TexWidth); + for (int off_y = 0; off_y < h; off_y++, out_pixel += atlas->TexWidth, in_str += w) + for (int off_x = 0; off_x < w; off_x++) + out_pixel[off_x] = (in_str[off_x] == in_marker_char) ? in_marker_pixel_value : IM_COL32_BLACK_TRANS; +} + static void ImFontAtlasBuildRenderDefaultTexData(ImFontAtlas* atlas) { - IM_ASSERT(atlas->CustomRectIds[0] >= 0); - IM_ASSERT(atlas->TexPixelsAlpha8 != NULL); - ImFontAtlasCustomRect& r = atlas->CustomRects[atlas->CustomRectIds[0]]; - IM_ASSERT(r.ID == FONT_ATLAS_DEFAULT_TEX_DATA_ID); - IM_ASSERT(r.IsPacked()); + ImFontAtlasCustomRect* r = atlas->GetCustomRectByIndex(atlas->PackIdMouseCursors); + IM_ASSERT(r->IsPacked()); const int w = atlas->TexWidth; - if (!(atlas->Flags & ImFontAtlasFlags_NoMouseCursors)) + if (atlas->Flags & ImFontAtlasFlags_NoMouseCursors) { - // Render/copy pixels - IM_ASSERT(r.Width == FONT_ATLAS_DEFAULT_TEX_DATA_W_HALF * 2 + 1 && r.Height == FONT_ATLAS_DEFAULT_TEX_DATA_H); - for (int y = 0, n = 0; y < FONT_ATLAS_DEFAULT_TEX_DATA_H; y++) - for (int x = 0; x < FONT_ATLAS_DEFAULT_TEX_DATA_W_HALF; x++, n++) - { - const int offset0 = (int)(r.X + x) + (int)(r.Y + y) * w; - const int offset1 = offset0 + FONT_ATLAS_DEFAULT_TEX_DATA_W_HALF + 1; - atlas->TexPixelsAlpha8[offset0] = FONT_ATLAS_DEFAULT_TEX_DATA_PIXELS[n] == '.' ? 0xFF : 0x00; - atlas->TexPixelsAlpha8[offset1] = FONT_ATLAS_DEFAULT_TEX_DATA_PIXELS[n] == 'X' ? 0xFF : 0x00; - } + // White pixels only + IM_ASSERT(r->Width == 2 && r->Height == 2); + const int offset = (int)r->X + (int)r->Y * w; + if (atlas->TexPixelsAlpha8 != NULL) + { + atlas->TexPixelsAlpha8[offset] = atlas->TexPixelsAlpha8[offset + 1] = atlas->TexPixelsAlpha8[offset + w] = atlas->TexPixelsAlpha8[offset + w + 1] = 0xFF; + } + else + { + atlas->TexPixelsRGBA32[offset] = atlas->TexPixelsRGBA32[offset + 1] = atlas->TexPixelsRGBA32[offset + w] = atlas->TexPixelsRGBA32[offset + w + 1] = IM_COL32_WHITE; + } } else { - IM_ASSERT(r.Width == 2 && r.Height == 2); - const int offset = (int)(r.X) + (int)(r.Y) * w; - atlas->TexPixelsAlpha8[offset] = atlas->TexPixelsAlpha8[offset + 1] = atlas->TexPixelsAlpha8[offset + w] = atlas->TexPixelsAlpha8[offset + w + 1] = 0xFF; + // White pixels and mouse cursor + IM_ASSERT(r->Width == FONT_ATLAS_DEFAULT_TEX_DATA_W * 2 + 1 && r->Height == FONT_ATLAS_DEFAULT_TEX_DATA_H); + const int x_for_white = r->X; + const int x_for_black = r->X + FONT_ATLAS_DEFAULT_TEX_DATA_W + 1; + if (atlas->TexPixelsAlpha8 != NULL) + { + ImFontAtlasBuildRender8bppRectFromString(atlas, x_for_white, r->Y, FONT_ATLAS_DEFAULT_TEX_DATA_W, FONT_ATLAS_DEFAULT_TEX_DATA_H, FONT_ATLAS_DEFAULT_TEX_DATA_PIXELS, '.', 0xFF); + ImFontAtlasBuildRender8bppRectFromString(atlas, x_for_black, r->Y, FONT_ATLAS_DEFAULT_TEX_DATA_W, FONT_ATLAS_DEFAULT_TEX_DATA_H, FONT_ATLAS_DEFAULT_TEX_DATA_PIXELS, 'X', 0xFF); + } + else + { + ImFontAtlasBuildRender32bppRectFromString(atlas, x_for_white, r->Y, FONT_ATLAS_DEFAULT_TEX_DATA_W, FONT_ATLAS_DEFAULT_TEX_DATA_H, FONT_ATLAS_DEFAULT_TEX_DATA_PIXELS, '.', IM_COL32_WHITE); + ImFontAtlasBuildRender32bppRectFromString(atlas, x_for_black, r->Y, FONT_ATLAS_DEFAULT_TEX_DATA_W, FONT_ATLAS_DEFAULT_TEX_DATA_H, FONT_ATLAS_DEFAULT_TEX_DATA_PIXELS, 'X', IM_COL32_WHITE); + } } - atlas->TexUvWhitePixel = ImVec2((r.X + 0.5f) * atlas->TexUvScale.x, (r.Y + 0.5f) * atlas->TexUvScale.y); + atlas->TexUvWhitePixel = ImVec2((r->X + 0.5f) * atlas->TexUvScale.x, (r->Y + 0.5f) * atlas->TexUvScale.y); } +static void ImFontAtlasBuildRenderLinesTexData(ImFontAtlas* atlas) +{ + if (atlas->Flags & ImFontAtlasFlags_NoBakedLines) + return; + + // This generates a triangular shape in the texture, with the various line widths stacked on top of each other to allow interpolation between them + ImFontAtlasCustomRect* r = atlas->GetCustomRectByIndex(atlas->PackIdLines); + IM_ASSERT(r->IsPacked()); + for (int n = 0; n < IM_DRAWLIST_TEX_LINES_WIDTH_MAX + 1; n++) // +1 because of the zero-width row + { + // Each line consists of at least two empty pixels at the ends, with a line of solid pixels in the middle + int y = n; + int line_width = n; + int pad_left = (r->Width - line_width) / 2; + int pad_right = r->Width - (pad_left + line_width); + + // Write each slice + IM_ASSERT(pad_left + line_width + pad_right == r->Width && y < r->Height); // Make sure we're inside the texture bounds before we start writing pixels + if (atlas->TexPixelsAlpha8 != NULL) + { + unsigned char* write_ptr = &atlas->TexPixelsAlpha8[r->X + ((r->Y + y) * atlas->TexWidth)]; + for (int i = 0; i < pad_left; i++) + *(write_ptr + i) = 0x00; + + for (int i = 0; i < line_width; i++) + *(write_ptr + pad_left + i) = 0xFF; + + for (int i = 0; i < pad_right; i++) + *(write_ptr + pad_left + line_width + i) = 0x00; + } + else + { + unsigned int* write_ptr = &atlas->TexPixelsRGBA32[r->X + ((r->Y + y) * atlas->TexWidth)]; + for (int i = 0; i < pad_left; i++) + *(write_ptr + i) = IM_COL32(255, 255, 255, 0); + + for (int i = 0; i < line_width; i++) + *(write_ptr + pad_left + i) = IM_COL32_WHITE; + + for (int i = 0; i < pad_right; i++) + *(write_ptr + pad_left + line_width + i) = IM_COL32(255, 255, 255, 0); + } + + // Calculate UVs for this line + ImVec2 uv0 = ImVec2((float)(r->X + pad_left - 1), (float)(r->Y + y)) * atlas->TexUvScale; + ImVec2 uv1 = ImVec2((float)(r->X + pad_left + line_width + 1), (float)(r->Y + y + 1)) * atlas->TexUvScale; + float half_v = (uv0.y + uv1.y) * 0.5f; // Calculate a constant V in the middle of the row to avoid sampling artifacts + atlas->TexUvLines[n] = ImVec4(uv0.x, half_v, uv1.x, half_v); + } +} + +// Note: this is called / shared by both the stb_truetype and the FreeType builder +void ImFontAtlasBuildInit(ImFontAtlas* atlas) +{ + // Register texture region for mouse cursors or standard white pixels + if (atlas->PackIdMouseCursors < 0) + { + if (!(atlas->Flags & ImFontAtlasFlags_NoMouseCursors)) + atlas->PackIdMouseCursors = atlas->AddCustomRectRegular(FONT_ATLAS_DEFAULT_TEX_DATA_W * 2 + 1, FONT_ATLAS_DEFAULT_TEX_DATA_H); + else + atlas->PackIdMouseCursors = atlas->AddCustomRectRegular(2, 2); + } + + // Register texture region for thick lines + // The +2 here is to give space for the end caps, whilst height +1 is to accommodate the fact we have a zero-width row + if (atlas->PackIdLines < 0) + { + if (!(atlas->Flags & ImFontAtlasFlags_NoBakedLines)) + atlas->PackIdLines = atlas->AddCustomRectRegular(IM_DRAWLIST_TEX_LINES_WIDTH_MAX + 2, IM_DRAWLIST_TEX_LINES_WIDTH_MAX + 1); + } +} + +// This is called/shared by both the stb_truetype and the FreeType builder. void ImFontAtlasBuildFinish(ImFontAtlas* atlas) { - // Render into our custom data block + // Render into our custom data blocks + IM_ASSERT(atlas->TexPixelsAlpha8 != NULL || atlas->TexPixelsRGBA32 != NULL); ImFontAtlasBuildRenderDefaultTexData(atlas); + ImFontAtlasBuildRenderLinesTexData(atlas); // Register custom rectangle glyphs for (int i = 0; i < atlas->CustomRects.Size; i++) { - const ImFontAtlasCustomRect& r = atlas->CustomRects[i]; - if (r.Font == NULL || r.ID > 0x10000) + const ImFontAtlasCustomRect* r = &atlas->CustomRects[i]; + if (r->Font == NULL || r->GlyphID == 0) continue; - IM_ASSERT(r.Font->ContainerAtlas == atlas); + // Will ignore ImFontConfig settings: GlyphMinAdvanceX, GlyphMinAdvanceY, PixelSnapH + IM_ASSERT(r->Font->ContainerAtlas == atlas); ImVec2 uv0, uv1; - atlas->CalcCustomRectUV(&r, &uv0, &uv1); - r.Font->AddGlyph((ImWchar)r.ID, r.GlyphOffset.x, r.GlyphOffset.y, r.GlyphOffset.x + r.Width, r.GlyphOffset.y + r.Height, uv0.x, uv0.y, uv1.x, uv1.y, r.GlyphAdvanceX); + atlas->CalcCustomRectUV(r, &uv0, &uv1); + r->Font->AddGlyph(NULL, (ImWchar)r->GlyphID, r->GlyphOffset.x, r->GlyphOffset.y, r->GlyphOffset.x + r->Width, r->GlyphOffset.y + r->Height, uv0.x, uv0.y, uv1.x, uv1.y, r->GlyphAdvanceX); + if (r->GlyphColored) + r->Font->Glyphs.back().Colored = 1; } // Build all fonts lookup tables - for (int i = 0; i < atlas->Fonts.Size; i++) - if (atlas->Fonts[i]->DirtyLookupTables) - atlas->Fonts[i]->BuildLookupTable(); + for (ImFont* font : atlas->Fonts) + if (font->DirtyLookupTables) + font->BuildLookupTable(); - // Ellipsis character is required for rendering elided text. We prefer using U+2026 (horizontal ellipsis). - // However some old fonts may contain ellipsis at U+0085. Here we auto-detect most suitable ellipsis character. - // FIXME: Also note that 0x2026 is currently seldomly included in our font ranges. Because of this we are more likely to use three individual dots. - for (int i = 0; i < atlas->Fonts.size(); i++) - { - ImFont* font = atlas->Fonts[i]; - if (font->EllipsisChar != (ImWchar)-1) - continue; - const ImWchar ellipsis_variants[] = { (ImWchar)0x2026, (ImWchar)0x0085 }; - for (int j = 0; j < IM_ARRAYSIZE(ellipsis_variants); j++) - if (font->FindGlyphNoFallback(ellipsis_variants[j]) != NULL) // Verify glyph exists - { - font->EllipsisChar = ellipsis_variants[j]; - break; - } - } + atlas->TexReady = true; } +//------------------------------------------------------------------------- +// [SECTION] ImFontAtlas: glyph ranges helpers +//------------------------------------------------------------------------- +// - GetGlyphRangesDefault() +// - GetGlyphRangesGreek() +// - GetGlyphRangesKorean() +// - GetGlyphRangesChineseFull() +// - GetGlyphRangesChineseSimplifiedCommon() +// - GetGlyphRangesJapanese() +// - GetGlyphRangesCyrillic() +// - GetGlyphRangesThai() +// - GetGlyphRangesVietnamese() +//----------------------------------------------------------------------------- + // Retrieve list of range (2 int per range, values are inclusive) const ImWchar* ImFontAtlas::GetGlyphRangesDefault() { @@ -2232,13 +3402,25 @@ const ImWchar* ImFontAtlas::GetGlyphRangesDefault() return &ranges[0]; } +const ImWchar* ImFontAtlas::GetGlyphRangesGreek() +{ + static const ImWchar ranges[] = + { + 0x0020, 0x00FF, // Basic Latin + Latin Supplement + 0x0370, 0x03FF, // Greek and Coptic + 0, + }; + return &ranges[0]; +} + const ImWchar* ImFontAtlas::GetGlyphRangesKorean() { static const ImWchar ranges[] = { 0x0020, 0x00FF, // Basic Latin + Latin Supplement 0x3131, 0x3163, // Korean alphabets - 0xAC00, 0xD79D, // Korean characters + 0xAC00, 0xD7A3, // Korean characters + 0xFFFD, 0xFFFD, // Invalid 0, }; return &ranges[0]; @@ -2253,6 +3435,7 @@ const ImWchar* ImFontAtlas::GetGlyphRangesChineseFull() 0x3000, 0x30FF, // CJK Symbols and Punctuations, Hiragana, Katakana 0x31F0, 0x31FF, // Katakana Phonetic Extensions 0xFF00, 0xFFEF, // Half-width characters + 0xFFFD, 0xFFFD, // Invalid 0x4e00, 0x9FAF, // CJK Ideograms 0, }; @@ -2269,10 +3452,6 @@ static void UnpackAccumulativeOffsetsIntoRanges(int base_codepoint, const short* out_ranges[0] = 0; } -//------------------------------------------------------------------------- -// [SECTION] ImFontAtlas glyph ranges helpers -//------------------------------------------------------------------------- - const ImWchar* ImFontAtlas::GetGlyphRangesChineseSimplifiedCommon() { // Store 2500 regularly used characters for Simplified Chinese. @@ -2329,7 +3508,8 @@ const ImWchar* ImFontAtlas::GetGlyphRangesChineseSimplifiedCommon() 0x2000, 0x206F, // General Punctuation 0x3000, 0x30FF, // CJK Symbols and Punctuations, Hiragana, Katakana 0x31F0, 0x31FF, // Katakana Phonetic Extensions - 0xFF00, 0xFFEF // Half-width characters + 0xFF00, 0xFFEF, // Half-width characters + 0xFFFD, 0xFFFD // Invalid }; static ImWchar full_ranges[IM_ARRAYSIZE(base_ranges) + IM_ARRAYSIZE(accumulative_offsets_from_0x4E00) * 2 + 1] = { 0 }; if (!full_ranges[0]) @@ -2342,52 +3522,84 @@ const ImWchar* ImFontAtlas::GetGlyphRangesChineseSimplifiedCommon() const ImWchar* ImFontAtlas::GetGlyphRangesJapanese() { - // 1946 common ideograms code points for Japanese - // Sourced from http://theinstructionlimit.com/common-kanji-character-ranges-for-xna-spritefont-rendering - // FIXME: Source a list of the revised 2136 Joyo Kanji list from 2010 and rebuild this. + // 2999 ideograms code points for Japanese + // - 2136 Joyo (meaning "for regular use" or "for common use") Kanji code points + // - 863 Jinmeiyo (meaning "for personal name") Kanji code points + // - Sourced from official information provided by the government agencies of Japan: + // - List of Joyo Kanji by the Agency for Cultural Affairs + // - https://www.bunka.go.jp/kokugo_nihongo/sisaku/joho/joho/kijun/naikaku/kanji/ + // - List of Jinmeiyo Kanji by the Ministry of Justice + // - http://www.moj.go.jp/MINJI/minji86.html + // - Available under the terms of the Creative Commons Attribution 4.0 International (CC BY 4.0). + // - https://creativecommons.org/licenses/by/4.0/legalcode + // - You can generate this code by the script at: + // - https://github.com/vaiorabbit/everyday_use_kanji + // - References: + // - List of Joyo Kanji + // - (Wikipedia) https://en.wikipedia.org/wiki/List_of_j%C5%8Dy%C5%8D_kanji + // - List of Jinmeiyo Kanji + // - (Wikipedia) https://en.wikipedia.org/wiki/Jinmeiy%C5%8D_kanji + // - Missing 1 Joyo Kanji: U+20B9F (Kun'yomi: Shikaru, On'yomi: Shitsu,shichi), see https://github.com/ocornut/imgui/pull/3627 for details. // You can use ImFontGlyphRangesBuilder to create your own ranges derived from this, by merging existing ranges or adding new characters. // (Stored as accumulative offsets from the initial unicode codepoint 0x4E00. This encoding is designed to helps us compact the source code size.) static const short accumulative_offsets_from_0x4E00[] = { - 0,1,2,4,1,1,1,1,2,1,6,2,2,1,8,5,7,11,1,2,10,10,8,2,4,20,2,11,8,2,1,2,1,6,2,1,7,5,3,7,1,1,13,7,9,1,4,6,1,2,1,10,1,1,9,2,2,4,5,6,14,1,1,9,3,18, - 5,4,2,2,10,7,1,1,1,3,2,4,3,23,2,10,12,2,14,2,4,13,1,6,10,3,1,7,13,6,4,13,5,2,3,17,2,2,5,7,6,4,1,7,14,16,6,13,9,15,1,1,7,16,4,7,1,19,9,2,7,15, - 2,6,5,13,25,4,14,13,11,25,1,1,1,2,1,2,2,3,10,11,3,3,1,1,4,4,2,1,4,9,1,4,3,5,5,2,7,12,11,15,7,16,4,5,16,2,1,1,6,3,3,1,1,2,7,6,6,7,1,4,7,6,1,1, - 2,1,12,3,3,9,5,8,1,11,1,2,3,18,20,4,1,3,6,1,7,3,5,5,7,2,2,12,3,1,4,2,3,2,3,11,8,7,4,17,1,9,25,1,1,4,2,2,4,1,2,7,1,1,1,3,1,2,6,16,1,2,1,1,3,12, - 20,2,5,20,8,7,6,2,1,1,1,1,6,2,1,2,10,1,1,6,1,3,1,2,1,4,1,12,4,1,3,1,1,1,1,1,10,4,7,5,13,1,15,1,1,30,11,9,1,15,38,14,1,32,17,20,1,9,31,2,21,9, - 4,49,22,2,1,13,1,11,45,35,43,55,12,19,83,1,3,2,3,13,2,1,7,3,18,3,13,8,1,8,18,5,3,7,25,24,9,24,40,3,17,24,2,1,6,2,3,16,15,6,7,3,12,1,9,7,3,3, - 3,15,21,5,16,4,5,12,11,11,3,6,3,2,31,3,2,1,1,23,6,6,1,4,2,6,5,2,1,1,3,3,22,2,6,2,3,17,3,2,4,5,1,9,5,1,1,6,15,12,3,17,2,14,2,8,1,23,16,4,2,23, - 8,15,23,20,12,25,19,47,11,21,65,46,4,3,1,5,6,1,2,5,26,2,1,1,3,11,1,1,1,2,1,2,3,1,1,10,2,3,1,1,1,3,6,3,2,2,6,6,9,2,2,2,6,2,5,10,2,4,1,2,1,2,2, - 3,1,1,3,1,2,9,23,9,2,1,1,1,1,5,3,2,1,10,9,6,1,10,2,31,25,3,7,5,40,1,15,6,17,7,27,180,1,3,2,2,1,1,1,6,3,10,7,1,3,6,17,8,6,2,2,1,3,5,5,8,16,14, - 15,1,1,4,1,2,1,1,1,3,2,7,5,6,2,5,10,1,4,2,9,1,1,11,6,1,44,1,3,7,9,5,1,3,1,1,10,7,1,10,4,2,7,21,15,7,2,5,1,8,3,4,1,3,1,6,1,4,2,1,4,10,8,1,4,5, - 1,5,10,2,7,1,10,1,1,3,4,11,10,29,4,7,3,5,2,3,33,5,2,19,3,1,4,2,6,31,11,1,3,3,3,1,8,10,9,12,11,12,8,3,14,8,6,11,1,4,41,3,1,2,7,13,1,5,6,2,6,12, - 12,22,5,9,4,8,9,9,34,6,24,1,1,20,9,9,3,4,1,7,2,2,2,6,2,28,5,3,6,1,4,6,7,4,2,1,4,2,13,6,4,4,3,1,8,8,3,2,1,5,1,2,2,3,1,11,11,7,3,6,10,8,6,16,16, - 22,7,12,6,21,5,4,6,6,3,6,1,3,2,1,2,8,29,1,10,1,6,13,6,6,19,31,1,13,4,4,22,17,26,33,10,4,15,12,25,6,67,10,2,3,1,6,10,2,6,2,9,1,9,4,4,1,2,16,2, - 5,9,2,3,8,1,8,3,9,4,8,6,4,8,11,3,2,1,1,3,26,1,7,5,1,11,1,5,3,5,2,13,6,39,5,1,5,2,11,6,10,5,1,15,5,3,6,19,21,22,2,4,1,6,1,8,1,4,8,2,4,2,2,9,2, - 1,1,1,4,3,6,3,12,7,1,14,2,4,10,2,13,1,17,7,3,2,1,3,2,13,7,14,12,3,1,29,2,8,9,15,14,9,14,1,3,1,6,5,9,11,3,38,43,20,7,7,8,5,15,12,19,15,81,8,7, - 1,5,73,13,37,28,8,8,1,15,18,20,165,28,1,6,11,8,4,14,7,15,1,3,3,6,4,1,7,14,1,1,11,30,1,5,1,4,14,1,4,2,7,52,2,6,29,3,1,9,1,21,3,5,1,26,3,11,14, - 11,1,17,5,1,2,1,3,2,8,1,2,9,12,1,1,2,3,8,3,24,12,7,7,5,17,3,3,3,1,23,10,4,4,6,3,1,16,17,22,3,10,21,16,16,6,4,10,2,1,1,2,8,8,6,5,3,3,3,39,25, - 15,1,1,16,6,7,25,15,6,6,12,1,22,13,1,4,9,5,12,2,9,1,12,28,8,3,5,10,22,60,1,2,40,4,61,63,4,1,13,12,1,4,31,12,1,14,89,5,16,6,29,14,2,5,49,18,18, - 5,29,33,47,1,17,1,19,12,2,9,7,39,12,3,7,12,39,3,1,46,4,12,3,8,9,5,31,15,18,3,2,2,66,19,13,17,5,3,46,124,13,57,34,2,5,4,5,8,1,1,1,4,3,1,17,5, - 3,5,3,1,8,5,6,3,27,3,26,7,12,7,2,17,3,7,18,78,16,4,36,1,2,1,6,2,1,39,17,7,4,13,4,4,4,1,10,4,2,4,6,3,10,1,19,1,26,2,4,33,2,73,47,7,3,8,2,4,15, - 18,1,29,2,41,14,1,21,16,41,7,39,25,13,44,2,2,10,1,13,7,1,7,3,5,20,4,8,2,49,1,10,6,1,6,7,10,7,11,16,3,12,20,4,10,3,1,2,11,2,28,9,2,4,7,2,15,1, - 27,1,28,17,4,5,10,7,3,24,10,11,6,26,3,2,7,2,2,49,16,10,16,15,4,5,27,61,30,14,38,22,2,7,5,1,3,12,23,24,17,17,3,3,2,4,1,6,2,7,5,1,1,5,1,1,9,4, - 1,3,6,1,8,2,8,4,14,3,5,11,4,1,3,32,1,19,4,1,13,11,5,2,1,8,6,8,1,6,5,13,3,23,11,5,3,16,3,9,10,1,24,3,198,52,4,2,2,5,14,5,4,22,5,20,4,11,6,41, - 1,5,2,2,11,5,2,28,35,8,22,3,18,3,10,7,5,3,4,1,5,3,8,9,3,6,2,16,22,4,5,5,3,3,18,23,2,6,23,5,27,8,1,33,2,12,43,16,5,2,3,6,1,20,4,2,9,7,1,11,2, - 10,3,14,31,9,3,25,18,20,2,5,5,26,14,1,11,17,12,40,19,9,6,31,83,2,7,9,19,78,12,14,21,76,12,113,79,34,4,1,1,61,18,85,10,2,2,13,31,11,50,6,33,159, - 179,6,6,7,4,4,2,4,2,5,8,7,20,32,22,1,3,10,6,7,28,5,10,9,2,77,19,13,2,5,1,4,4,7,4,13,3,9,31,17,3,26,2,6,6,5,4,1,7,11,3,4,2,1,6,2,20,4,1,9,2,6, - 3,7,1,1,1,20,2,3,1,6,2,3,6,2,4,8,1,5,13,8,4,11,23,1,10,6,2,1,3,21,2,2,4,24,31,4,10,10,2,5,192,15,4,16,7,9,51,1,2,1,1,5,1,1,2,1,3,5,3,1,3,4,1, - 3,1,3,3,9,8,1,2,2,2,4,4,18,12,92,2,10,4,3,14,5,25,16,42,4,14,4,2,21,5,126,30,31,2,1,5,13,3,22,5,6,6,20,12,1,14,12,87,3,19,1,8,2,9,9,3,3,23,2, - 3,7,6,3,1,2,3,9,1,3,1,6,3,2,1,3,11,3,1,6,10,3,2,3,1,2,1,5,1,1,11,3,6,4,1,7,2,1,2,5,5,34,4,14,18,4,19,7,5,8,2,6,79,1,5,2,14,8,2,9,2,1,36,28,16, - 4,1,1,1,2,12,6,42,39,16,23,7,15,15,3,2,12,7,21,64,6,9,28,8,12,3,3,41,59,24,51,55,57,294,9,9,2,6,2,15,1,2,13,38,90,9,9,9,3,11,7,1,1,1,5,6,3,2, - 1,2,2,3,8,1,4,4,1,5,7,1,4,3,20,4,9,1,1,1,5,5,17,1,5,2,6,2,4,1,4,5,7,3,18,11,11,32,7,5,4,7,11,127,8,4,3,3,1,10,1,1,6,21,14,1,16,1,7,1,3,6,9,65, - 51,4,3,13,3,10,1,1,12,9,21,110,3,19,24,1,1,10,62,4,1,29,42,78,28,20,18,82,6,3,15,6,84,58,253,15,155,264,15,21,9,14,7,58,40,39, + 0,1,2,4,1,1,1,1,2,1,3,3,2,2,1,5,3,5,7,5,6,1,2,1,7,2,6,3,1,8,1,1,4,1,1,18,2,11,2,6,2,1,2,1,5,1,2,1,3,1,2,1,2,3,3,1,1,2,3,1,1,1,12,7,9,1,4,5,1, + 1,2,1,10,1,1,9,2,2,4,5,6,9,3,1,1,1,1,9,3,18,5,2,2,2,2,1,6,3,7,1,1,1,1,2,2,4,2,1,23,2,10,4,3,5,2,4,10,2,4,13,1,6,1,9,3,1,1,6,6,7,6,3,1,2,11,3, + 2,2,3,2,15,2,2,5,4,3,6,4,1,2,5,2,12,16,6,13,9,13,2,1,1,7,16,4,7,1,19,1,5,1,2,2,7,7,8,2,6,5,4,9,18,7,4,5,9,13,11,8,15,2,1,1,1,2,1,2,2,1,2,2,8, + 2,9,3,3,1,1,4,4,1,1,1,4,9,1,4,3,5,5,2,7,5,3,4,8,2,1,13,2,3,3,1,14,1,1,4,5,1,3,6,1,5,2,1,1,3,3,3,3,1,1,2,7,6,6,7,1,4,7,6,1,1,1,1,1,12,3,3,9,5, + 2,6,1,5,6,1,2,3,18,2,4,14,4,1,3,6,1,1,6,3,5,5,3,2,2,2,2,12,3,1,4,2,3,2,3,11,1,7,4,1,2,1,3,17,1,9,1,24,1,1,4,2,2,4,1,2,7,1,1,1,3,1,2,2,4,15,1, + 1,2,1,1,2,1,5,2,5,20,2,5,9,1,10,8,7,6,1,1,1,1,1,1,6,2,1,2,8,1,1,1,1,5,1,1,3,1,1,1,1,3,1,1,12,4,1,3,1,1,1,1,1,10,3,1,7,5,13,1,2,3,4,6,1,1,30, + 2,9,9,1,15,38,11,3,1,8,24,7,1,9,8,10,2,1,9,31,2,13,6,2,9,4,49,5,2,15,2,1,10,2,1,1,1,2,2,6,15,30,35,3,14,18,8,1,16,10,28,12,19,45,38,1,3,2,3, + 13,2,1,7,3,6,5,3,4,3,1,5,7,8,1,5,3,18,5,3,6,1,21,4,24,9,24,40,3,14,3,21,3,2,1,2,4,2,3,1,15,15,6,5,1,1,3,1,5,6,1,9,7,3,3,2,1,4,3,8,21,5,16,4, + 5,2,10,11,11,3,6,3,2,9,3,6,13,1,2,1,1,1,1,11,12,6,6,1,4,2,6,5,2,1,1,3,3,6,13,3,1,1,5,1,2,3,3,14,2,1,2,2,2,5,1,9,5,1,1,6,12,3,12,3,4,13,2,14, + 2,8,1,17,5,1,16,4,2,2,21,8,9,6,23,20,12,25,19,9,38,8,3,21,40,25,33,13,4,3,1,4,1,2,4,1,2,5,26,2,1,1,2,1,3,6,2,1,1,1,1,1,1,2,3,1,1,1,9,2,3,1,1, + 1,3,6,3,2,1,1,6,6,1,8,2,2,2,1,4,1,2,3,2,7,3,2,4,1,2,1,2,2,1,1,1,1,1,3,1,2,5,4,10,9,4,9,1,1,1,1,1,1,5,3,2,1,6,4,9,6,1,10,2,31,17,8,3,7,5,40,1, + 7,7,1,6,5,2,10,7,8,4,15,39,25,6,28,47,18,10,7,1,3,1,1,2,1,1,1,3,3,3,1,1,1,3,4,2,1,4,1,3,6,10,7,8,6,2,2,1,3,3,2,5,8,7,9,12,2,15,1,1,4,1,2,1,1, + 1,3,2,1,3,3,5,6,2,3,2,10,1,4,2,8,1,1,1,11,6,1,21,4,16,3,1,3,1,4,2,3,6,5,1,3,1,1,3,3,4,6,1,1,10,4,2,7,10,4,7,4,2,9,4,3,1,1,1,4,1,8,3,4,1,3,1, + 6,1,4,2,1,4,7,2,1,8,1,4,5,1,1,2,2,4,6,2,7,1,10,1,1,3,4,11,10,8,21,4,6,1,3,5,2,1,2,28,5,5,2,3,13,1,2,3,1,4,2,1,5,20,3,8,11,1,3,3,3,1,8,10,9,2, + 10,9,2,3,1,1,2,4,1,8,3,6,1,7,8,6,11,1,4,29,8,4,3,1,2,7,13,1,4,1,6,2,6,12,12,2,20,3,2,3,6,4,8,9,2,7,34,5,1,18,6,1,1,4,4,5,7,9,1,2,2,4,3,4,1,7, + 2,2,2,6,2,3,25,5,3,6,1,4,6,7,4,2,1,4,2,13,6,4,4,3,1,5,3,4,4,3,2,1,1,4,1,2,1,1,3,1,11,1,6,3,1,7,3,6,2,8,8,6,9,3,4,11,3,2,10,12,2,5,11,1,6,4,5, + 3,1,8,5,4,6,6,3,5,1,1,3,2,1,2,2,6,17,12,1,10,1,6,12,1,6,6,19,9,6,16,1,13,4,4,15,7,17,6,11,9,15,12,6,7,2,1,2,2,15,9,3,21,4,6,49,18,7,3,2,3,1, + 6,8,2,2,6,2,9,1,3,6,4,4,1,2,16,2,5,2,1,6,2,3,5,3,1,2,5,1,2,1,9,3,1,8,6,4,8,11,3,1,1,1,1,3,1,13,8,4,1,3,2,2,1,4,1,11,1,5,2,1,5,2,5,8,6,1,1,7, + 4,3,8,3,2,7,2,1,5,1,5,2,4,7,6,2,8,5,1,11,4,5,3,6,18,1,2,13,3,3,1,21,1,1,4,1,4,1,1,1,8,1,2,2,7,1,2,4,2,2,9,2,1,1,1,4,3,6,3,12,5,1,1,1,5,6,3,2, + 4,8,2,2,4,2,7,1,8,9,5,2,3,2,1,3,2,13,7,14,6,5,1,1,2,1,4,2,23,2,1,1,6,3,1,4,1,15,3,1,7,3,9,14,1,3,1,4,1,1,5,8,1,3,8,3,8,15,11,4,14,4,4,2,5,5, + 1,7,1,6,14,7,7,8,5,15,4,8,6,5,6,2,1,13,1,20,15,11,9,2,5,6,2,11,2,6,2,5,1,5,8,4,13,19,25,4,1,1,11,1,34,2,5,9,14,6,2,2,6,1,1,14,1,3,14,13,1,6, + 12,21,14,14,6,32,17,8,32,9,28,1,2,4,11,8,3,1,14,2,5,15,1,1,1,1,3,6,4,1,3,4,11,3,1,1,11,30,1,5,1,4,1,5,8,1,1,3,2,4,3,17,35,2,6,12,17,3,1,6,2, + 1,1,12,2,7,3,3,2,1,16,2,8,3,6,5,4,7,3,3,8,1,9,8,5,1,2,1,3,2,8,1,2,9,12,1,1,2,3,8,3,24,12,4,3,7,5,8,3,3,3,3,3,3,1,23,10,3,1,2,2,6,3,1,16,1,16, + 22,3,10,4,11,6,9,7,7,3,6,2,2,2,4,10,2,1,1,2,8,7,1,6,4,1,3,3,3,5,10,12,12,2,3,12,8,15,1,1,16,6,6,1,5,9,11,4,11,4,2,6,12,1,17,5,13,1,4,9,5,1,11, + 2,1,8,1,5,7,28,8,3,5,10,2,17,3,38,22,1,2,18,12,10,4,38,18,1,4,44,19,4,1,8,4,1,12,1,4,31,12,1,14,7,75,7,5,10,6,6,13,3,2,11,11,3,2,5,28,15,6,18, + 18,5,6,4,3,16,1,7,18,7,36,3,5,3,1,7,1,9,1,10,7,2,4,2,6,2,9,7,4,3,32,12,3,7,10,2,23,16,3,1,12,3,31,4,11,1,3,8,9,5,1,30,15,6,12,3,2,2,11,19,9, + 14,2,6,2,3,19,13,17,5,3,3,25,3,14,1,1,1,36,1,3,2,19,3,13,36,9,13,31,6,4,16,34,2,5,4,2,3,3,5,1,1,1,4,3,1,17,3,2,3,5,3,1,3,2,3,5,6,3,12,11,1,3, + 1,2,26,7,12,7,2,14,3,3,7,7,11,25,25,28,16,4,36,1,2,1,6,2,1,9,3,27,17,4,3,4,13,4,1,3,2,2,1,10,4,2,4,6,3,8,2,1,18,1,1,24,2,2,4,33,2,3,63,7,1,6, + 40,7,3,4,4,2,4,15,18,1,16,1,1,11,2,41,14,1,3,18,13,3,2,4,16,2,17,7,15,24,7,18,13,44,2,2,3,6,1,1,7,5,1,7,1,4,3,3,5,10,8,2,3,1,8,1,1,27,4,2,1, + 12,1,2,1,10,6,1,6,7,5,2,3,7,11,5,11,3,6,6,2,3,15,4,9,1,1,2,1,2,11,2,8,12,8,5,4,2,3,1,5,2,2,1,14,1,12,11,4,1,11,17,17,4,3,2,5,5,7,3,1,5,9,9,8, + 2,5,6,6,13,13,2,1,2,6,1,2,2,49,4,9,1,2,10,16,7,8,4,3,2,23,4,58,3,29,1,14,19,19,11,11,2,7,5,1,3,4,6,2,18,5,12,12,17,17,3,3,2,4,1,6,2,3,4,3,1, + 1,1,1,5,1,1,9,1,3,1,3,6,1,8,1,1,2,6,4,14,3,1,4,11,4,1,3,32,1,2,4,13,4,1,2,4,2,1,3,1,11,1,4,2,1,4,4,6,3,5,1,6,5,7,6,3,23,3,5,3,5,3,3,13,3,9,10, + 1,12,10,2,3,18,13,7,160,52,4,2,2,3,2,14,5,4,12,4,6,4,1,20,4,11,6,2,12,27,1,4,1,2,2,7,4,5,2,28,3,7,25,8,3,19,3,6,10,2,2,1,10,2,5,4,1,3,4,1,5, + 3,2,6,9,3,6,2,16,3,3,16,4,5,5,3,2,1,2,16,15,8,2,6,21,2,4,1,22,5,8,1,1,21,11,2,1,11,11,19,13,12,4,2,3,2,3,6,1,8,11,1,4,2,9,5,2,1,11,2,9,1,1,2, + 14,31,9,3,4,21,14,4,8,1,7,2,2,2,5,1,4,20,3,3,4,10,1,11,9,8,2,1,4,5,14,12,14,2,17,9,6,31,4,14,1,20,13,26,5,2,7,3,6,13,2,4,2,19,6,2,2,18,9,3,5, + 12,12,14,4,6,2,3,6,9,5,22,4,5,25,6,4,8,5,2,6,27,2,35,2,16,3,7,8,8,6,6,5,9,17,2,20,6,19,2,13,3,1,1,1,4,17,12,2,14,7,1,4,18,12,38,33,2,10,1,1, + 2,13,14,17,11,50,6,33,20,26,74,16,23,45,50,13,38,33,6,6,7,4,4,2,1,3,2,5,8,7,8,9,3,11,21,9,13,1,3,10,6,7,1,2,2,18,5,5,1,9,9,2,68,9,19,13,2,5, + 1,4,4,7,4,13,3,9,10,21,17,3,26,2,1,5,2,4,5,4,1,7,4,7,3,4,2,1,6,1,1,20,4,1,9,2,2,1,3,3,2,3,2,1,1,1,20,2,3,1,6,2,3,6,2,4,8,1,3,2,10,3,5,3,4,4, + 3,4,16,1,6,1,10,2,4,2,1,1,2,10,11,2,2,3,1,24,31,4,10,10,2,5,12,16,164,15,4,16,7,9,15,19,17,1,2,1,1,5,1,1,1,1,1,3,1,4,3,1,3,1,3,1,2,1,1,3,3,7, + 2,8,1,2,2,2,1,3,4,3,7,8,12,92,2,10,3,1,3,14,5,25,16,42,4,7,7,4,2,21,5,27,26,27,21,25,30,31,2,1,5,13,3,22,5,6,6,11,9,12,1,5,9,7,5,5,22,60,3,5, + 13,1,1,8,1,1,3,3,2,1,9,3,3,18,4,1,2,3,7,6,3,1,2,3,9,1,3,1,3,2,1,3,1,1,1,2,1,11,3,1,6,9,1,3,2,3,1,2,1,5,1,1,4,3,4,1,2,2,4,4,1,7,2,1,2,2,3,5,13, + 18,3,4,14,9,9,4,16,3,7,5,8,2,6,48,28,3,1,1,4,2,14,8,2,9,2,1,15,2,4,3,2,10,16,12,8,7,1,1,3,1,1,1,2,7,4,1,6,4,38,39,16,23,7,15,15,3,2,12,7,21, + 37,27,6,5,4,8,2,10,8,8,6,5,1,2,1,3,24,1,16,17,9,23,10,17,6,1,51,55,44,13,294,9,3,6,2,4,2,2,15,1,1,1,13,21,17,68,14,8,9,4,1,4,9,3,11,7,1,1,1, + 5,6,3,2,1,1,1,2,3,8,1,2,2,4,1,5,5,2,1,4,3,7,13,4,1,4,1,3,1,1,1,5,5,10,1,6,1,5,2,1,5,2,4,1,4,5,7,3,18,2,9,11,32,4,3,3,2,4,7,11,16,9,11,8,13,38, + 32,8,4,2,1,1,2,1,2,4,4,1,1,1,4,1,21,3,11,1,16,1,1,6,1,3,2,4,9,8,57,7,44,1,3,3,13,3,10,1,1,7,5,2,7,21,47,63,3,15,4,7,1,16,1,1,2,8,2,3,42,15,4, + 1,29,7,22,10,3,78,16,12,20,18,4,67,11,5,1,3,15,6,21,31,32,27,18,13,71,35,5,142,4,10,1,2,50,19,33,16,35,37,16,19,27,7,1,133,19,1,4,8,7,20,1,4, + 4,1,10,3,1,6,1,2,51,5,40,15,24,43,22928,11,1,13,154,70,3,1,1,7,4,10,1,2,1,1,2,1,2,1,2,2,1,1,2,1,1,1,1,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,2,1,1,1, + 3,2,1,1,1,1,2,1,1, }; static ImWchar base_ranges[] = // not zero-terminated { 0x0020, 0x00FF, // Basic Latin + Latin Supplement 0x3000, 0x30FF, // CJK Symbols and Punctuations, Hiragana, Katakana 0x31F0, 0x31FF, // Katakana Phonetic Extensions - 0xFF00, 0xFFEF // Half-width characters + 0xFF00, 0xFFEF, // Half-width characters + 0xFFFD, 0xFFFD // Invalid }; static ImWchar full_ranges[IM_ARRAYSIZE(base_ranges) + IM_ARRAYSIZE(accumulative_offsets_from_0x4E00)*2 + 1] = { 0 }; if (!full_ranges[0]) @@ -2453,26 +3665,25 @@ void ImFontGlyphRangesBuilder::AddText(const char* text, const char* text_end) text += c_len; if (c_len == 0) break; - if (c < 0x10000) - AddChar((ImWchar)c); + AddChar((ImWchar)c); } } void ImFontGlyphRangesBuilder::AddRanges(const ImWchar* ranges) { for (; ranges[0]; ranges += 2) - for (ImWchar c = ranges[0]; c <= ranges[1]; c++) - AddChar(c); + for (unsigned int c = ranges[0]; c <= ranges[1] && c <= IM_UNICODE_CODEPOINT_MAX; c++) //-V560 + AddChar((ImWchar)c); } void ImFontGlyphRangesBuilder::BuildRanges(ImVector* out_ranges) { - int max_codepoint = 0x10000; - for (int n = 0; n < max_codepoint; n++) + const int max_codepoint = IM_UNICODE_CODEPOINT_MAX; + for (int n = 0; n <= max_codepoint; n++) if (GetBit(n)) { out_ranges->push_back((ImWchar)n); - while (n < max_codepoint - 1 && GetBit(n + 1)) + while (n < max_codepoint && GetBit(n + 1)) n++; out_ranges->push_back((ImWchar)n); } @@ -2485,19 +3696,8 @@ void ImFontGlyphRangesBuilder::BuildRanges(ImVector* out_ranges) ImFont::ImFont() { - FontSize = 0.0f; - FallbackAdvanceX = 0.0f; - FallbackChar = (ImWchar)'?'; - EllipsisChar = (ImWchar)-1; - DisplayOffset = ImVec2(0.0f, 0.0f); - FallbackGlyph = NULL; - ContainerAtlas = NULL; - ConfigData = NULL; - ConfigDataCount = 0; - DirtyLookupTables = false; + memset(this, 0, sizeof(*this)); Scale = 1.0f; - Ascent = Descent = 0.0f; - MetricsTotalSurface = 0; } ImFont::~ImFont() @@ -2517,6 +3717,15 @@ void ImFont::ClearOutputData() DirtyLookupTables = true; Ascent = Descent = 0.0f; MetricsTotalSurface = 0; + memset(Used8kPagesMap, 0, sizeof(Used8kPagesMap)); +} + +static ImWchar FindFirstExistingGlyph(ImFont* font, const ImWchar* candidate_chars, int candidate_chars_count) +{ + for (int n = 0; n < candidate_chars_count; n++) + if (font->FindGlyphNoFallback(candidate_chars[n]) != NULL) + return candidate_chars[n]; + return 0; } void ImFont::BuildLookupTable() @@ -2525,43 +3734,97 @@ void ImFont::BuildLookupTable() for (int i = 0; i != Glyphs.Size; i++) max_codepoint = ImMax(max_codepoint, (int)Glyphs[i].Codepoint); + // Build lookup table + IM_ASSERT(Glyphs.Size > 0 && "Font has not loaded glyph!"); IM_ASSERT(Glyphs.Size < 0xFFFF); // -1 is reserved IndexAdvanceX.clear(); IndexLookup.clear(); DirtyLookupTables = false; + memset(Used8kPagesMap, 0, sizeof(Used8kPagesMap)); GrowIndex(max_codepoint + 1); for (int i = 0; i < Glyphs.Size; i++) { int codepoint = (int)Glyphs[i].Codepoint; IndexAdvanceX[codepoint] = Glyphs[i].AdvanceX; - IndexLookup[codepoint] = (ImWchar)i; + IndexLookup[codepoint] = (ImU16)i; + + // Mark 4K page as used + const int page_n = codepoint / 8192; + Used8kPagesMap[page_n >> 3] |= 1 << (page_n & 7); } // Create a glyph to handle TAB // FIXME: Needs proper TAB handling but it needs to be contextualized (or we could arbitrary say that each string starts at "column 0" ?) if (FindGlyph((ImWchar)' ')) { - if (Glyphs.back().Codepoint != '\t') // So we can call this function multiple times + if (Glyphs.back().Codepoint != '\t') // So we can call this function multiple times (FIXME: Flaky) Glyphs.resize(Glyphs.Size + 1); ImFontGlyph& tab_glyph = Glyphs.back(); tab_glyph = *FindGlyph((ImWchar)' '); tab_glyph.Codepoint = '\t'; tab_glyph.AdvanceX *= IM_TABSIZE; IndexAdvanceX[(int)tab_glyph.Codepoint] = (float)tab_glyph.AdvanceX; - IndexLookup[(int)tab_glyph.Codepoint] = (ImWchar)(Glyphs.Size-1); + IndexLookup[(int)tab_glyph.Codepoint] = (ImU16)(Glyphs.Size - 1); } + // Mark special glyphs as not visible (note that AddGlyph already mark as non-visible glyphs with zero-size polygons) + if (ImFontGlyph* glyph = (ImFontGlyph*)(void*)FindGlyph((ImWchar)' ')) + glyph->Visible = false; + if (ImFontGlyph* glyph = (ImFontGlyph*)(void*)FindGlyph((ImWchar)'\t')) + glyph->Visible = false; + + // Setup Fallback character + const ImWchar fallback_chars[] = { (ImWchar)IM_UNICODE_CODEPOINT_INVALID, (ImWchar)'?', (ImWchar)' ' }; FallbackGlyph = FindGlyphNoFallback(FallbackChar); - FallbackAdvanceX = FallbackGlyph ? FallbackGlyph->AdvanceX : 0.0f; + if (FallbackGlyph == NULL) + { + FallbackChar = FindFirstExistingGlyph(this, fallback_chars, IM_ARRAYSIZE(fallback_chars)); + FallbackGlyph = FindGlyphNoFallback(FallbackChar); + if (FallbackGlyph == NULL) + { + FallbackGlyph = &Glyphs.back(); + FallbackChar = (ImWchar)FallbackGlyph->Codepoint; + } + } + FallbackAdvanceX = FallbackGlyph->AdvanceX; for (int i = 0; i < max_codepoint + 1; i++) if (IndexAdvanceX[i] < 0.0f) IndexAdvanceX[i] = FallbackAdvanceX; + + // Setup Ellipsis character. It is required for rendering elided text. We prefer using U+2026 (horizontal ellipsis). + // However some old fonts may contain ellipsis at U+0085. Here we auto-detect most suitable ellipsis character. + // FIXME: Note that 0x2026 is rarely included in our font ranges. Because of this we are more likely to use three individual dots. + const ImWchar ellipsis_chars[] = { Sources->EllipsisChar, (ImWchar)0x2026, (ImWchar)0x0085 }; + const ImWchar dots_chars[] = { (ImWchar)'.', (ImWchar)0xFF0E }; + if (EllipsisChar == 0) + EllipsisChar = FindFirstExistingGlyph(this, ellipsis_chars, IM_ARRAYSIZE(ellipsis_chars)); + const ImWchar dot_char = FindFirstExistingGlyph(this, dots_chars, IM_ARRAYSIZE(dots_chars)); + if (EllipsisChar != 0) + { + EllipsisCharCount = 1; + EllipsisWidth = EllipsisCharStep = FindGlyph(EllipsisChar)->X1; + } + else if (dot_char != 0) + { + const ImFontGlyph* dot_glyph = FindGlyph(dot_char); + EllipsisChar = dot_char; + EllipsisCharCount = 3; + EllipsisCharStep = (float)(int)(dot_glyph->X1 - dot_glyph->X0) + 1.0f; + EllipsisWidth = ImMax(dot_glyph->AdvanceX, dot_glyph->X0 + EllipsisCharStep * 3.0f - 1.0f); // FIXME: Slightly odd for normally mono-space fonts but since this is used for trailing contents. + } } -void ImFont::SetFallbackChar(ImWchar c) +// API is designed this way to avoid exposing the 8K page size +// e.g. use with IsGlyphRangeUnused(0, 255) +bool ImFont::IsGlyphRangeUnused(unsigned int c_begin, unsigned int c_last) { - FallbackChar = c; - BuildLookupTable(); + unsigned int page_begin = (c_begin / 8192); + unsigned int page_last = (c_last / 8192); + for (unsigned int page_n = page_begin; page_n <= page_last; page_n++) + if ((page_n >> 3) < sizeof(Used8kPagesMap)) + if (Used8kPagesMap[page_n >> 3] & (1 << (page_n & 7))) + return false; + return true; } void ImFont::GrowIndex(int new_size) @@ -2570,16 +3833,40 @@ void ImFont::GrowIndex(int new_size) if (new_size <= IndexLookup.Size) return; IndexAdvanceX.resize(new_size, -1.0f); - IndexLookup.resize(new_size, (ImWchar)-1); + IndexLookup.resize(new_size, (ImU16)-1); } // x0/y0/x1/y1 are offset from the character upper-left layout position, in pixels. Therefore x0/y0 are often fairly close to zero. // Not to be mistaken with texture coordinates, which are held by u0/v0/u1/v1 in normalized format (0.0..1.0 on each texture axis). -void ImFont::AddGlyph(ImWchar codepoint, float x0, float y0, float x1, float y1, float u0, float v0, float u1, float v1, float advance_x) +// 'src' is not necessarily == 'this->Sources' because multiple source fonts+configs can be used to build one target font. +void ImFont::AddGlyph(const ImFontConfig* src, ImWchar codepoint, float x0, float y0, float x1, float y1, float u0, float v0, float u1, float v1, float advance_x) { + if (src != NULL) + { + // Clamp & recenter if needed + const float advance_x_original = advance_x; + advance_x = ImClamp(advance_x, src->GlyphMinAdvanceX, src->GlyphMaxAdvanceX); + if (advance_x != advance_x_original) + { + float char_off_x = src->PixelSnapH ? ImTrunc((advance_x - advance_x_original) * 0.5f) : (advance_x - advance_x_original) * 0.5f; + x0 += char_off_x; + x1 += char_off_x; + } + + // Snap to pixel + if (src->PixelSnapH) + advance_x = IM_ROUND(advance_x); + + // Bake extra spacing + advance_x += src->GlyphExtraAdvanceX; + } + + int glyph_idx = Glyphs.Size; Glyphs.resize(Glyphs.Size + 1); - ImFontGlyph& glyph = Glyphs.back(); - glyph.Codepoint = (ImWchar)codepoint; + ImFontGlyph& glyph = Glyphs[glyph_idx]; + glyph.Codepoint = (unsigned int)codepoint; + glyph.Visible = (x0 != x1) && (y0 != y1); + glyph.Colored = false; glyph.X0 = x0; glyph.Y0 = y0; glyph.X1 = x1; @@ -2588,56 +3875,69 @@ void ImFont::AddGlyph(ImWchar codepoint, float x0, float y0, float x1, float y1, glyph.V0 = v0; glyph.U1 = u1; glyph.V1 = v1; - glyph.AdvanceX = advance_x + ConfigData->GlyphExtraSpacing.x; // Bake spacing into AdvanceX - - if (ConfigData->PixelSnapH) - glyph.AdvanceX = (float)(int)(glyph.AdvanceX + 0.5f); + glyph.AdvanceX = advance_x; + IM_ASSERT(Glyphs.Size < 0xFFFF); // IndexLookup[] hold 16-bit values and -1 is reserved. // Compute rough surface usage metrics (+1 to account for average padding, +0.99 to round) + // We use (U1-U0)*TexWidth instead of X1-X0 to account for oversampling. + float pad = ContainerAtlas->TexGlyphPadding + 0.99f; DirtyLookupTables = true; - MetricsTotalSurface += (int)((glyph.U1 - glyph.U0) * ContainerAtlas->TexWidth + 1.99f) * (int)((glyph.V1 - glyph.V0) * ContainerAtlas->TexHeight + 1.99f); + MetricsTotalSurface += (int)((glyph.U1 - glyph.U0) * ContainerAtlas->TexWidth + pad) * (int)((glyph.V1 - glyph.V0) * ContainerAtlas->TexHeight + pad); } void ImFont::AddRemapChar(ImWchar dst, ImWchar src, bool overwrite_dst) { IM_ASSERT(IndexLookup.Size > 0); // Currently this can only be called AFTER the font has been built, aka after calling ImFontAtlas::GetTexDataAs*() function. - int index_size = IndexLookup.Size; + unsigned int index_size = (unsigned int)IndexLookup.Size; - if (dst < index_size && IndexLookup.Data[dst] == (ImWchar)-1 && !overwrite_dst) // 'dst' already exists + if (dst < index_size && IndexLookup.Data[dst] == (ImU16)-1 && !overwrite_dst) // 'dst' already exists return; if (src >= index_size && dst >= index_size) // both 'dst' and 'src' don't exist -> no-op return; GrowIndex(dst + 1); - IndexLookup[dst] = (src < index_size) ? IndexLookup.Data[src] : (ImWchar)-1; + IndexLookup[dst] = (src < index_size) ? IndexLookup.Data[src] : (ImU16)-1; IndexAdvanceX[dst] = (src < index_size) ? IndexAdvanceX.Data[src] : 1.0f; } -const ImFontGlyph* ImFont::FindGlyph(ImWchar c) const +// Find glyph, return fallback if missing +ImFontGlyph* ImFont::FindGlyph(ImWchar c) { - if (c >= IndexLookup.Size) + if (c >= (size_t)IndexLookup.Size) return FallbackGlyph; - const ImWchar i = IndexLookup.Data[c]; - if (i == (ImWchar)-1) + const ImU16 i = IndexLookup.Data[c]; + if (i == (ImU16)-1) return FallbackGlyph; return &Glyphs.Data[i]; } -const ImFontGlyph* ImFont::FindGlyphNoFallback(ImWchar c) const +ImFontGlyph* ImFont::FindGlyphNoFallback(ImWchar c) { - if (c >= IndexLookup.Size) + if (c >= (size_t)IndexLookup.Size) return NULL; - const ImWchar i = IndexLookup.Data[c]; - if (i == (ImWchar)-1) + const ImU16 i = IndexLookup.Data[c]; + if (i == (ImU16)-1) return NULL; return &Glyphs.Data[i]; } -const char* ImFont::CalcWordWrapPositionA(float scale, const char* text, const char* text_end, float wrap_width) const +// Trim trailing space and find beginning of next line +static inline const char* CalcWordWrapNextLineStartA(const char* text, const char* text_end) { - // Simple word-wrapping for English, not full-featured. Please submit failing cases! - // FIXME: Much possible improvements (don't cut things like "word !", "word!!!" but cut within "word,,,,", more sensible support for punctuations, support for Unicode punctuations, etc.) + while (text < text_end && ImCharIsBlankA(*text)) + text++; + if (*text == '\n') + text++; + return text; +} +#define ImFontGetCharAdvanceX(_FONT, _CH) ((int)(_CH) < (_FONT)->IndexAdvanceX.Size ? (_FONT)->IndexAdvanceX.Data[_CH] : (_FONT)->FallbackAdvanceX) + +// Simple word-wrapping for English, not full-featured. Please submit failing cases! +// This will return the next location to wrap from. If no wrapping if necessary, this will fast-forward to e.g. text_end. +// FIXME: Much possible improvements (don't cut things like "word !", "word!!!" but cut within "word,,,,", more sensible support for punctuations, support for Unicode punctuations, etc.) +const char* ImFont::CalcWordWrapPositionA(float scale, const char* text, const char* text_end, float wrap_width) +{ // For references, possible wrap point marked with ^ // "aaa bbb, ccc,ddd. eee fff. ggg!" // ^ ^ ^ ^ ^__ ^ ^ @@ -2649,7 +3949,6 @@ const char* ImFont::CalcWordWrapPositionA(float scale, const char* text, const c // Cut words that cannot possibly fit within one line. // e.g.: "The tropical fish" with ~5 characters worth of width --> "The tr" "opical" "fish" - float line_width = 0.0f; float word_width = 0.0f; float blank_width = 0.0f; @@ -2660,6 +3959,7 @@ const char* ImFont::CalcWordWrapPositionA(float scale, const char* text, const c bool inside_word = true; const char* s = text; + IM_ASSERT(text_end != NULL); while (s < text_end) { unsigned int c = (unsigned int)*s; @@ -2668,8 +3968,6 @@ const char* ImFont::CalcWordWrapPositionA(float scale, const char* text, const c next_s = s + 1; else next_s = s + ImTextCharFromUtf8(&c, s, text_end); - if (c == 0) - break; if (c < 32) { @@ -2687,7 +3985,7 @@ const char* ImFont::CalcWordWrapPositionA(float scale, const char* text, const c } } - const float char_width = ((int)c < IndexAdvanceX.Size ? IndexAdvanceX.Data[c] : FallbackAdvanceX); + const float char_width = ImFontGetCharAdvanceX(this, c); if (ImCharIsBlankW(c)) { if (inside_word) @@ -2714,7 +4012,7 @@ const char* ImFont::CalcWordWrapPositionA(float scale, const char* text, const c } // Allow wrapping after punctuation. - inside_word = !(c == '.' || c == ',' || c == ';' || c == '!' || c == '?' || c == '\"'); + inside_word = (c != '.' && c != ',' && c != ';' && c != '!' && c != '?' && c != '\"'); } // We ignore blank width at the end of the line (they can be skipped) @@ -2729,18 +4027,22 @@ const char* ImFont::CalcWordWrapPositionA(float scale, const char* text, const c s = next_s; } + // Wrap_width is too small to fit anything. Force displaying 1 character to minimize the height discontinuity. + // +1 may not be a character start point in UTF-8 but it's ok because caller loops use (text >= word_wrap_eol). + if (s == text && text < text_end) + return s + 1; return s; } -ImVec2 ImFont::CalcTextSizeA(float size, float max_width, float wrap_width, const char* text_begin, const char* text_end, const char** remaining) const +ImVec2 ImFont::CalcTextSizeA(float size, float max_width, float wrap_width, const char* text_begin, const char* text_end, const char** remaining) { if (!text_end) - text_end = text_begin + strlen(text_begin); // FIXME-OPT: Need to avoid this. + text_end = text_begin + ImStrlen(text_begin); // FIXME-OPT: Need to avoid this. const float line_height = size; const float scale = size / FontSize; - ImVec2 text_size = ImVec2(0,0); + ImVec2 text_size = ImVec2(0, 0); float line_width = 0.0f; const bool word_wrap_enabled = (wrap_width > 0.0f); @@ -2753,11 +4055,7 @@ ImVec2 ImFont::CalcTextSizeA(float size, float max_width, float wrap_width, cons { // Calculate how far we can render. Requires two passes on the string data but keeps the code simple and not intrusive for what's essentially an uncommon feature. if (!word_wrap_eol) - { word_wrap_eol = CalcWordWrapPositionA(scale, s, text_end, wrap_width - line_width); - if (word_wrap_eol == s) // Wrap_width is too small to fit anything. Force displaying 1 character to minimize the height discontinuity. - word_wrap_eol++; // +1 may not be a character start point in UTF-8 but it's ok because we use s >= word_wrap_eol below - } if (s >= word_wrap_eol) { @@ -2766,13 +4064,7 @@ ImVec2 ImFont::CalcTextSizeA(float size, float max_width, float wrap_width, cons text_size.y += line_height; line_width = 0.0f; word_wrap_eol = NULL; - - // Wrapping skips upcoming blanks - while (s < text_end) - { - const char c = *s; - if (ImCharIsBlankA(c)) { s++; } else if (c == '\n') { s++; break; } else { break; } - } + s = CalcWordWrapNextLineStartA(s, text_end); // Wrapping skips upcoming blanks continue; } } @@ -2781,15 +4073,9 @@ ImVec2 ImFont::CalcTextSizeA(float size, float max_width, float wrap_width, cons const char* prev_s = s; unsigned int c = (unsigned int)*s; if (c < 0x80) - { s += 1; - } else - { s += ImTextCharFromUtf8(&c, s, text_end); - if (c == 0) // Malformed UTF-8? - break; - } if (c < 32) { @@ -2804,7 +4090,7 @@ ImVec2 ImFont::CalcTextSizeA(float size, float max_width, float wrap_width, cons continue; } - const float char_width = ((int)c < IndexAdvanceX.Size ? IndexAdvanceX.Data[c] : FallbackAdvanceX) * scale; + const float char_width = ImFontGetCharAdvanceX(this, c) * scale; if (line_width + char_width >= max_width) { s = prev_s; @@ -2826,45 +4112,56 @@ ImVec2 ImFont::CalcTextSizeA(float size, float max_width, float wrap_width, cons return text_size; } -void ImFont::RenderChar(ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col, ImWchar c) const +// Note: as with every ImDrawList drawing function, this expects that the font atlas texture is bound. +void ImFont::RenderChar(ImDrawList* draw_list, float size, const ImVec2& pos, ImU32 col, ImWchar c) { - if (c == ' ' || c == '\t' || c == '\n' || c == '\r') // Match behavior of RenderText(), those 4 codepoints are hard-coded. + const ImFontGlyph* glyph = FindGlyph(c); + if (!glyph || !glyph->Visible) return; - if (const ImFontGlyph* glyph = FindGlyph(c)) - { - float scale = (size >= 0.0f) ? (size / FontSize) : 1.0f; - pos.x = (float)(int)pos.x + DisplayOffset.x; - pos.y = (float)(int)pos.y + DisplayOffset.y; - draw_list->PrimReserve(6, 4); - draw_list->PrimRectUV(ImVec2(pos.x + glyph->X0 * scale, pos.y + glyph->Y0 * scale), ImVec2(pos.x + glyph->X1 * scale, pos.y + glyph->Y1 * scale), ImVec2(glyph->U0, glyph->V0), ImVec2(glyph->U1, glyph->V1), col); - } + if (glyph->Colored) + col |= ~IM_COL32_A_MASK; + float scale = (size >= 0.0f) ? (size / FontSize) : 1.0f; + float x = IM_TRUNC(pos.x); + float y = IM_TRUNC(pos.y); + draw_list->PrimReserve(6, 4); + draw_list->PrimRectUV(ImVec2(x + glyph->X0 * scale, y + glyph->Y0 * scale), ImVec2(x + glyph->X1 * scale, y + glyph->Y1 * scale), ImVec2(glyph->U0, glyph->V0), ImVec2(glyph->U1, glyph->V1), col); } -void ImFont::RenderText(ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col, const ImVec4& clip_rect, const char* text_begin, const char* text_end, float wrap_width, bool cpu_fine_clip) const +// Note: as with every ImDrawList drawing function, this expects that the font atlas texture is bound. +void ImFont::RenderText(ImDrawList* draw_list, float size, const ImVec2& pos, ImU32 col, const ImVec4& clip_rect, const char* text_begin, const char* text_end, float wrap_width, bool cpu_fine_clip) { - if (!text_end) - text_end = text_begin + strlen(text_begin); // ImGui:: functions generally already provides a valid text_end, so this is merely to handle direct calls. - // Align to be pixel perfect - pos.x = (float)(int)pos.x + DisplayOffset.x; - pos.y = (float)(int)pos.y + DisplayOffset.y; - float x = pos.x; - float y = pos.y; + float x = IM_TRUNC(pos.x); + float y = IM_TRUNC(pos.y); if (y > clip_rect.w) return; + if (!text_end) + text_end = text_begin + ImStrlen(text_begin); // ImGui:: functions generally already provides a valid text_end, so this is merely to handle direct calls. + const float scale = size / FontSize; const float line_height = FontSize * scale; + const float origin_x = x; const bool word_wrap_enabled = (wrap_width > 0.0f); - const char* word_wrap_eol = NULL; // Fast-forward to first visible line const char* s = text_begin; - if (y + line_height < clip_rect.y && !word_wrap_enabled) + if (y + line_height < clip_rect.y) while (y + line_height < clip_rect.y && s < text_end) { - s = (const char*)memchr(s, '\n', text_end - s); - s = s ? s + 1 : text_end; + const char* line_end = (const char*)ImMemchr(s, '\n', text_end - s); + if (word_wrap_enabled) + { + // FIXME-OPT: This is not optimal as do first do a search for \n before calling CalcWordWrapPositionA(). + // If the specs for CalcWordWrapPositionA() were reworked to optionally return on \n we could combine both. + // However it is still better than nothing performing the fast-forward! + s = CalcWordWrapPositionA(scale, s, line_end ? line_end : text_end, wrap_width); + s = CalcWordWrapNextLineStartA(s, text_end); + } + else + { + s = line_end ? line_end + 1 : text_end; + } y += line_height; } @@ -2876,7 +4173,7 @@ void ImFont::RenderText(ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col float y_end = y; while (y_end < clip_rect.w && s_end < text_end) { - s_end = (const char*)memchr(s_end, '\n', text_end - s_end); + s_end = (const char*)ImMemchr(s_end, '\n', text_end - s_end); s_end = s_end ? s_end + 1 : text_end; y_end += line_height; } @@ -2890,10 +4187,12 @@ void ImFont::RenderText(ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col const int idx_count_max = (int)(text_end - s) * 6; const int idx_expected_size = draw_list->IdxBuffer.Size + idx_count_max; draw_list->PrimReserve(idx_count_max, vtx_count_max); + ImDrawVert* vtx_write = draw_list->_VtxWritePtr; + ImDrawIdx* idx_write = draw_list->_IdxWritePtr; + unsigned int vtx_index = draw_list->_VtxCurrentIdx; - ImDrawVert* vtx_write = draw_list->_VtxWritePtr; - ImDrawIdx* idx_write = draw_list->_IdxWritePtr; - unsigned int vtx_current_idx = draw_list->_VtxCurrentIdx; + const ImU32 col_untinted = col | ~IM_COL32_A_MASK; + const char* word_wrap_eol = NULL; while (s < text_end) { @@ -2901,24 +4200,16 @@ void ImFont::RenderText(ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col { // Calculate how far we can render. Requires two passes on the string data but keeps the code simple and not intrusive for what's essentially an uncommon feature. if (!word_wrap_eol) - { - word_wrap_eol = CalcWordWrapPositionA(scale, s, text_end, wrap_width - (x - pos.x)); - if (word_wrap_eol == s) // Wrap_width is too small to fit anything. Force displaying 1 character to minimize the height discontinuity. - word_wrap_eol++; // +1 may not be a character start point in UTF-8 but it's ok because we use s >= word_wrap_eol below - } + word_wrap_eol = CalcWordWrapPositionA(scale, s, text_end, wrap_width - (x - origin_x)); if (s >= word_wrap_eol) { - x = pos.x; + x = origin_x; y += line_height; + if (y > clip_rect.w) + break; // break out of main loop word_wrap_eol = NULL; - - // Wrapping skips upcoming blanks - while (s < text_end) - { - const char c = *s; - if (ImCharIsBlankA(c)) { s++; } else if (c == '\n') { s++; break; } else { break; } - } + s = CalcWordWrapNextLineStartA(s, text_end); // Wrapping skips upcoming blanks continue; } } @@ -2926,21 +4217,15 @@ void ImFont::RenderText(ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col // Decode and advance source unsigned int c = (unsigned int)*s; if (c < 0x80) - { s += 1; - } else - { s += ImTextCharFromUtf8(&c, s, text_end); - if (c == 0) // Malformed UTF-8? - break; - } if (c < 32) { if (c == '\n') { - x = pos.x; + x = origin_x; y += line_height; if (y > clip_rect.w) break; // break out of main loop @@ -2950,113 +4235,152 @@ void ImFont::RenderText(ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col continue; } - float char_width = 0.0f; - if (const ImFontGlyph* glyph = FindGlyph((ImWchar)c)) + const ImFontGlyph* glyph = FindGlyph((ImWchar)c); + if (glyph == NULL) + continue; + + float char_width = glyph->AdvanceX * scale; + if (glyph->Visible) { - char_width = glyph->AdvanceX * scale; - - // Arbitrarily assume that both space and tabs are empty glyphs as an optimization - if (c != ' ' && c != '\t') + // We don't do a second finer clipping test on the Y axis as we've already skipped anything before clip_rect.y and exit once we pass clip_rect.w + float x1 = x + glyph->X0 * scale; + float x2 = x + glyph->X1 * scale; + float y1 = y + glyph->Y0 * scale; + float y2 = y + glyph->Y1 * scale; + if (x1 <= clip_rect.z && x2 >= clip_rect.x) { - // We don't do a second finer clipping test on the Y axis as we've already skipped anything before clip_rect.y and exit once we pass clip_rect.w - float x1 = x + glyph->X0 * scale; - float x2 = x + glyph->X1 * scale; - float y1 = y + glyph->Y0 * scale; - float y2 = y + glyph->Y1 * scale; - if (x1 <= clip_rect.z && x2 >= clip_rect.x) + // Render a character + float u1 = glyph->U0; + float v1 = glyph->V0; + float u2 = glyph->U1; + float v2 = glyph->V1; + + // CPU side clipping used to fit text in their frame when the frame is too small. Only does clipping for axis aligned quads. + if (cpu_fine_clip) { - // Render a character - float u1 = glyph->U0; - float v1 = glyph->V0; - float u2 = glyph->U1; - float v2 = glyph->V1; - - // CPU side clipping used to fit text in their frame when the frame is too small. Only does clipping for axis aligned quads. - if (cpu_fine_clip) + if (x1 < clip_rect.x) { - if (x1 < clip_rect.x) - { - u1 = u1 + (1.0f - (x2 - clip_rect.x) / (x2 - x1)) * (u2 - u1); - x1 = clip_rect.x; - } - if (y1 < clip_rect.y) - { - v1 = v1 + (1.0f - (y2 - clip_rect.y) / (y2 - y1)) * (v2 - v1); - y1 = clip_rect.y; - } - if (x2 > clip_rect.z) - { - u2 = u1 + ((clip_rect.z - x1) / (x2 - x1)) * (u2 - u1); - x2 = clip_rect.z; - } - if (y2 > clip_rect.w) - { - v2 = v1 + ((clip_rect.w - y1) / (y2 - y1)) * (v2 - v1); - y2 = clip_rect.w; - } - if (y1 >= y2) - { - x += char_width; - continue; - } + u1 = u1 + (1.0f - (x2 - clip_rect.x) / (x2 - x1)) * (u2 - u1); + x1 = clip_rect.x; } - - // We are NOT calling PrimRectUV() here because non-inlined causes too much overhead in a debug builds. Inlined here: + if (y1 < clip_rect.y) { - idx_write[0] = (ImDrawIdx)(vtx_current_idx); idx_write[1] = (ImDrawIdx)(vtx_current_idx+1); idx_write[2] = (ImDrawIdx)(vtx_current_idx+2); - idx_write[3] = (ImDrawIdx)(vtx_current_idx); idx_write[4] = (ImDrawIdx)(vtx_current_idx+2); idx_write[5] = (ImDrawIdx)(vtx_current_idx+3); - vtx_write[0].pos.x = x1; vtx_write[0].pos.y = y1; vtx_write[0].col = col; vtx_write[0].uv.x = u1; vtx_write[0].uv.y = v1; - vtx_write[1].pos.x = x2; vtx_write[1].pos.y = y1; vtx_write[1].col = col; vtx_write[1].uv.x = u2; vtx_write[1].uv.y = v1; - vtx_write[2].pos.x = x2; vtx_write[2].pos.y = y2; vtx_write[2].col = col; vtx_write[2].uv.x = u2; vtx_write[2].uv.y = v2; - vtx_write[3].pos.x = x1; vtx_write[3].pos.y = y2; vtx_write[3].col = col; vtx_write[3].uv.x = u1; vtx_write[3].uv.y = v2; - vtx_write += 4; - vtx_current_idx += 4; - idx_write += 6; + v1 = v1 + (1.0f - (y2 - clip_rect.y) / (y2 - y1)) * (v2 - v1); + y1 = clip_rect.y; } + if (x2 > clip_rect.z) + { + u2 = u1 + ((clip_rect.z - x1) / (x2 - x1)) * (u2 - u1); + x2 = clip_rect.z; + } + if (y2 > clip_rect.w) + { + v2 = v1 + ((clip_rect.w - y1) / (y2 - y1)) * (v2 - v1); + y2 = clip_rect.w; + } + if (y1 >= y2) + { + x += char_width; + continue; + } + } + + // Support for untinted glyphs + ImU32 glyph_col = glyph->Colored ? col_untinted : col; + + // We are NOT calling PrimRectUV() here because non-inlined causes too much overhead in a debug builds. Inlined here: + { + vtx_write[0].pos.x = x1; vtx_write[0].pos.y = y1; vtx_write[0].col = glyph_col; vtx_write[0].uv.x = u1; vtx_write[0].uv.y = v1; + vtx_write[1].pos.x = x2; vtx_write[1].pos.y = y1; vtx_write[1].col = glyph_col; vtx_write[1].uv.x = u2; vtx_write[1].uv.y = v1; + vtx_write[2].pos.x = x2; vtx_write[2].pos.y = y2; vtx_write[2].col = glyph_col; vtx_write[2].uv.x = u2; vtx_write[2].uv.y = v2; + vtx_write[3].pos.x = x1; vtx_write[3].pos.y = y2; vtx_write[3].col = glyph_col; vtx_write[3].uv.x = u1; vtx_write[3].uv.y = v2; + idx_write[0] = (ImDrawIdx)(vtx_index); idx_write[1] = (ImDrawIdx)(vtx_index + 1); idx_write[2] = (ImDrawIdx)(vtx_index + 2); + idx_write[3] = (ImDrawIdx)(vtx_index); idx_write[4] = (ImDrawIdx)(vtx_index + 2); idx_write[5] = (ImDrawIdx)(vtx_index + 3); + vtx_write += 4; + vtx_index += 4; + idx_write += 6; } } } - x += char_width; } - // Give back unused vertices - draw_list->VtxBuffer.resize((int)(vtx_write - draw_list->VtxBuffer.Data)); - draw_list->IdxBuffer.resize((int)(idx_write - draw_list->IdxBuffer.Data)); - draw_list->CmdBuffer[draw_list->CmdBuffer.Size-1].ElemCount -= (idx_expected_size - draw_list->IdxBuffer.Size); + // Give back unused vertices (clipped ones, blanks) ~ this is essentially a PrimUnreserve() action. + draw_list->VtxBuffer.Size = (int)(vtx_write - draw_list->VtxBuffer.Data); // Same as calling shrink() + draw_list->IdxBuffer.Size = (int)(idx_write - draw_list->IdxBuffer.Data); + draw_list->CmdBuffer[draw_list->CmdBuffer.Size - 1].ElemCount -= (idx_expected_size - draw_list->IdxBuffer.Size); draw_list->_VtxWritePtr = vtx_write; draw_list->_IdxWritePtr = idx_write; - draw_list->_VtxCurrentIdx = vtx_current_idx; + draw_list->_VtxCurrentIdx = vtx_index; } //----------------------------------------------------------------------------- -// [SECTION] Internal Render Helpers -// (progressively moved from imgui.cpp to here when they are redesigned to stop accessing ImGui global state) +// [SECTION] ImGui Internal Render Helpers //----------------------------------------------------------------------------- -// - RenderMouseCursor() +// Vaguely redesigned to stop accessing ImGui global state: +// - RenderArrow() +// - RenderBullet() +// - RenderCheckMark() +// - RenderArrowDockMenu() // - RenderArrowPointingAt() // - RenderRectFilledRangeH() +// - RenderRectFilledWithHole() +//----------------------------------------------------------------------------- +// Function in need of a redesign (legacy mess) +// - RenderColorRectWithAlphaCheckerboard() //----------------------------------------------------------------------------- -void ImGui::RenderMouseCursor(ImDrawList* draw_list, ImVec2 pos, float scale, ImGuiMouseCursor mouse_cursor, ImU32 col_fill, ImU32 col_border, ImU32 col_shadow) +// Render an arrow aimed to be aligned with text (p_min is a position in the same space text would be positioned). To e.g. denote expanded/collapsed state +void ImGui::RenderArrow(ImDrawList* draw_list, ImVec2 pos, ImU32 col, ImGuiDir dir, float scale) { - if (mouse_cursor == ImGuiMouseCursor_None) - return; - IM_ASSERT(mouse_cursor > ImGuiMouseCursor_None && mouse_cursor < ImGuiMouseCursor_COUNT); + const float h = draw_list->_Data->FontSize * 1.00f; + float r = h * 0.40f * scale; + ImVec2 center = pos + ImVec2(h * 0.50f, h * 0.50f * scale); - ImFontAtlas* font_atlas = draw_list->_Data->Font->ContainerAtlas; - ImVec2 offset, size, uv[4]; - if (font_atlas->GetMouseCursorTexData(mouse_cursor, &offset, &size, &uv[0], &uv[2])) + ImVec2 a, b, c; + switch (dir) { - pos -= offset; - const ImTextureID tex_id = font_atlas->TexID; - draw_list->PushTextureID(tex_id); - draw_list->AddImage(tex_id, pos + ImVec2(1,0)*scale, pos + ImVec2(1,0)*scale + size*scale, uv[2], uv[3], col_shadow); - draw_list->AddImage(tex_id, pos + ImVec2(2,0)*scale, pos + ImVec2(2,0)*scale + size*scale, uv[2], uv[3], col_shadow); - draw_list->AddImage(tex_id, pos, pos + size*scale, uv[2], uv[3], col_border); - draw_list->AddImage(tex_id, pos, pos + size*scale, uv[0], uv[1], col_fill); - draw_list->PopTextureID(); + case ImGuiDir_Up: + case ImGuiDir_Down: + if (dir == ImGuiDir_Up) r = -r; + a = ImVec2(+0.000f, +0.750f) * r; + b = ImVec2(-0.866f, -0.750f) * r; + c = ImVec2(+0.866f, -0.750f) * r; + break; + case ImGuiDir_Left: + case ImGuiDir_Right: + if (dir == ImGuiDir_Left) r = -r; + a = ImVec2(+0.750f, +0.000f) * r; + b = ImVec2(-0.750f, +0.866f) * r; + c = ImVec2(-0.750f, -0.866f) * r; + break; + case ImGuiDir_None: + case ImGuiDir_COUNT: + IM_ASSERT(0); + break; } + draw_list->AddTriangleFilled(center + a, center + b, center + c, col); +} + +void ImGui::RenderBullet(ImDrawList* draw_list, ImVec2 pos, ImU32 col) +{ + // FIXME-OPT: This should be baked in font. + draw_list->AddCircleFilled(pos, draw_list->_Data->FontSize * 0.20f, col, 8); +} + +void ImGui::RenderCheckMark(ImDrawList* draw_list, ImVec2 pos, ImU32 col, float sz) +{ + float thickness = ImMax(sz / 5.0f, 1.0f); + sz -= thickness * 0.5f; + pos += ImVec2(thickness * 0.25f, thickness * 0.25f); + + float third = sz / 3.0f; + float bx = pos.x + third; + float by = pos.y + sz - third * 0.5f; + draw_list->PathLineTo(ImVec2(bx - third, by - third)); + draw_list->PathLineTo(ImVec2(bx, by)); + draw_list->PathLineTo(ImVec2(bx + third * 2.0f, by - third * 2.0f)); + draw_list->PathStroke(col, 0, thickness); } // Render an arrow. 'pos' is position of the arrow tip. half_sz.x is length from base to tip. half_sz.y is length on each side. @@ -3072,6 +4396,14 @@ void ImGui::RenderArrowPointingAt(ImDrawList* draw_list, ImVec2 pos, ImVec2 half } } +// This is less wide than RenderArrow() and we use in dock nodes instead of the regular RenderArrow() to denote a change of functionality, +// and because the saved space means that the left-most tab label can stay at exactly the same position as the label of a loose window. +void ImGui::RenderArrowDockMenu(ImDrawList* draw_list, ImVec2 p_min, float sz, ImU32 col) +{ + draw_list->AddRectFilled(p_min + ImVec2(sz * 0.20f, sz * 0.15f), p_min + ImVec2(sz * 0.80f, sz * 0.30f), col); + RenderArrowPointingAt(draw_list, p_min + ImVec2(sz * 0.50f, sz * 0.85f), ImVec2(sz * 0.30f, sz * 0.40f), ImGuiDir_Down, col); +} + static inline float ImAcos01(float x) { if (x <= 0.0f) return IM_PI * 0.5f; @@ -3114,8 +4446,8 @@ void ImGui::RenderRectFilledRangeH(ImDrawList* draw_list, const ImRect& rect, Im } else { - draw_list->PathArcTo(ImVec2(x0, p1.y - rounding), rounding, IM_PI - arc0_e, IM_PI - arc0_b, 3); // BL - draw_list->PathArcTo(ImVec2(x0, p0.y + rounding), rounding, IM_PI + arc0_b, IM_PI + arc0_e, 3); // TR + draw_list->PathArcTo(ImVec2(x0, p1.y - rounding), rounding, IM_PI - arc0_e, IM_PI - arc0_b); // BL + draw_list->PathArcTo(ImVec2(x0, p0.y + rounding), rounding, IM_PI + arc0_b, IM_PI + arc0_e); // TR } if (p1.x > rect.Min.x + rounding) { @@ -3134,13 +4466,81 @@ void ImGui::RenderRectFilledRangeH(ImDrawList* draw_list, const ImRect& rect, Im } else { - draw_list->PathArcTo(ImVec2(x1, p0.y + rounding), rounding, -arc1_e, -arc1_b, 3); // TR - draw_list->PathArcTo(ImVec2(x1, p1.y - rounding), rounding, +arc1_b, +arc1_e, 3); // BR + draw_list->PathArcTo(ImVec2(x1, p0.y + rounding), rounding, -arc1_e, -arc1_b); // TR + draw_list->PathArcTo(ImVec2(x1, p1.y - rounding), rounding, +arc1_b, +arc1_e); // BR } } draw_list->PathFillConvex(col); } +void ImGui::RenderRectFilledWithHole(ImDrawList* draw_list, const ImRect& outer, const ImRect& inner, ImU32 col, float rounding) +{ + const bool fill_L = (inner.Min.x > outer.Min.x); + const bool fill_R = (inner.Max.x < outer.Max.x); + const bool fill_U = (inner.Min.y > outer.Min.y); + const bool fill_D = (inner.Max.y < outer.Max.y); + if (fill_L) draw_list->AddRectFilled(ImVec2(outer.Min.x, inner.Min.y), ImVec2(inner.Min.x, inner.Max.y), col, rounding, ImDrawFlags_RoundCornersNone | (fill_U ? 0 : ImDrawFlags_RoundCornersTopLeft) | (fill_D ? 0 : ImDrawFlags_RoundCornersBottomLeft)); + if (fill_R) draw_list->AddRectFilled(ImVec2(inner.Max.x, inner.Min.y), ImVec2(outer.Max.x, inner.Max.y), col, rounding, ImDrawFlags_RoundCornersNone | (fill_U ? 0 : ImDrawFlags_RoundCornersTopRight) | (fill_D ? 0 : ImDrawFlags_RoundCornersBottomRight)); + if (fill_U) draw_list->AddRectFilled(ImVec2(inner.Min.x, outer.Min.y), ImVec2(inner.Max.x, inner.Min.y), col, rounding, ImDrawFlags_RoundCornersNone | (fill_L ? 0 : ImDrawFlags_RoundCornersTopLeft) | (fill_R ? 0 : ImDrawFlags_RoundCornersTopRight)); + if (fill_D) draw_list->AddRectFilled(ImVec2(inner.Min.x, inner.Max.y), ImVec2(inner.Max.x, outer.Max.y), col, rounding, ImDrawFlags_RoundCornersNone | (fill_L ? 0 : ImDrawFlags_RoundCornersBottomLeft) | (fill_R ? 0 : ImDrawFlags_RoundCornersBottomRight)); + if (fill_L && fill_U) draw_list->AddRectFilled(ImVec2(outer.Min.x, outer.Min.y), ImVec2(inner.Min.x, inner.Min.y), col, rounding, ImDrawFlags_RoundCornersTopLeft); + if (fill_R && fill_U) draw_list->AddRectFilled(ImVec2(inner.Max.x, outer.Min.y), ImVec2(outer.Max.x, inner.Min.y), col, rounding, ImDrawFlags_RoundCornersTopRight); + if (fill_L && fill_D) draw_list->AddRectFilled(ImVec2(outer.Min.x, inner.Max.y), ImVec2(inner.Min.x, outer.Max.y), col, rounding, ImDrawFlags_RoundCornersBottomLeft); + if (fill_R && fill_D) draw_list->AddRectFilled(ImVec2(inner.Max.x, inner.Max.y), ImVec2(outer.Max.x, outer.Max.y), col, rounding, ImDrawFlags_RoundCornersBottomRight); +} + +ImDrawFlags ImGui::CalcRoundingFlagsForRectInRect(const ImRect& r_in, const ImRect& r_outer, float threshold) +{ + bool round_l = r_in.Min.x <= r_outer.Min.x + threshold; + bool round_r = r_in.Max.x >= r_outer.Max.x - threshold; + bool round_t = r_in.Min.y <= r_outer.Min.y + threshold; + bool round_b = r_in.Max.y >= r_outer.Max.y - threshold; + return ImDrawFlags_RoundCornersNone + | ((round_t && round_l) ? ImDrawFlags_RoundCornersTopLeft : 0) | ((round_t && round_r) ? ImDrawFlags_RoundCornersTopRight : 0) + | ((round_b && round_l) ? ImDrawFlags_RoundCornersBottomLeft : 0) | ((round_b && round_r) ? ImDrawFlags_RoundCornersBottomRight : 0); +} + +// Helper for ColorPicker4() +// NB: This is rather brittle and will show artifact when rounding this enabled if rounded corners overlap multiple cells. Caller currently responsible for avoiding that. +// Spent a non reasonable amount of time trying to getting this right for ColorButton with rounding+anti-aliasing+ImGuiColorEditFlags_HalfAlphaPreview flag + various grid sizes and offsets, and eventually gave up... probably more reasonable to disable rounding altogether. +// FIXME: uses ImGui::GetColorU32 +void ImGui::RenderColorRectWithAlphaCheckerboard(ImDrawList* draw_list, ImVec2 p_min, ImVec2 p_max, ImU32 col, float grid_step, ImVec2 grid_off, float rounding, ImDrawFlags flags) +{ + if ((flags & ImDrawFlags_RoundCornersMask_) == 0) + flags = ImDrawFlags_RoundCornersDefault_; + if (((col & IM_COL32_A_MASK) >> IM_COL32_A_SHIFT) < 0xFF) + { + ImU32 col_bg1 = GetColorU32(ImAlphaBlendColors(IM_COL32(204, 204, 204, 255), col)); + ImU32 col_bg2 = GetColorU32(ImAlphaBlendColors(IM_COL32(128, 128, 128, 255), col)); + draw_list->AddRectFilled(p_min, p_max, col_bg1, rounding, flags); + + int yi = 0; + for (float y = p_min.y + grid_off.y; y < p_max.y; y += grid_step, yi++) + { + float y1 = ImClamp(y, p_min.y, p_max.y), y2 = ImMin(y + grid_step, p_max.y); + if (y2 <= y1) + continue; + for (float x = p_min.x + grid_off.x + (yi & 1) * grid_step; x < p_max.x; x += grid_step * 2.0f) + { + float x1 = ImClamp(x, p_min.x, p_max.x), x2 = ImMin(x + grid_step, p_max.x); + if (x2 <= x1) + continue; + ImDrawFlags cell_flags = ImDrawFlags_RoundCornersNone; + if (y1 <= p_min.y) { if (x1 <= p_min.x) cell_flags |= ImDrawFlags_RoundCornersTopLeft; if (x2 >= p_max.x) cell_flags |= ImDrawFlags_RoundCornersTopRight; } + if (y2 >= p_max.y) { if (x1 <= p_min.x) cell_flags |= ImDrawFlags_RoundCornersBottomLeft; if (x2 >= p_max.x) cell_flags |= ImDrawFlags_RoundCornersBottomRight; } + + // Combine flags + cell_flags = (flags == ImDrawFlags_RoundCornersNone || cell_flags == ImDrawFlags_RoundCornersNone) ? ImDrawFlags_RoundCornersNone : (cell_flags & flags); + draw_list->AddRectFilled(ImVec2(x1, y1), ImVec2(x2, y2), col_bg2, rounding, cell_flags); + } + } + } + else + { + draw_list->AddRectFilled(p_min, p_max, col, rounding, flags); + } +} + //----------------------------------------------------------------------------- // [SECTION] Decompression code //----------------------------------------------------------------------------- @@ -3201,9 +4601,9 @@ static unsigned int stb_adler32(unsigned int adler32, unsigned char *buffer, uns { const unsigned long ADLER_MOD = 65521; unsigned long s1 = adler32 & 0xffff, s2 = adler32 >> 16; - unsigned long blocklen, i; + unsigned long blocklen = buflen % 5552; - blocklen = buflen % 5552; + unsigned long i; while (buflen) { for (i=0; i + 7 < blocklen; i += 8) { s1 += buffer[0], s2 += s1; @@ -3230,10 +4630,9 @@ static unsigned int stb_adler32(unsigned int adler32, unsigned char *buffer, uns static unsigned int stb_decompress(unsigned char *output, const unsigned char *i, unsigned int /*length*/) { - unsigned int olen; if (stb__in4(0) != 0x57bC0000) return 0; if (stb__in4(4) != 0) return 0; // error! stream is > 4GB - olen = stb_decompress_length(i); + const unsigned int olen = stb_decompress_length(i); stb__barrier_in_b = i; stb__barrier_out_e = output + olen; stb__barrier_out_b = output; @@ -3266,102 +4665,190 @@ static unsigned int stb_decompress(unsigned char *output, const unsigned char *i //----------------------------------------------------------------------------- // ProggyClean.ttf // Copyright (c) 2004, 2005 Tristan Grimmer -// MIT license (see License.txt in http://www.upperbounds.net/download/ProggyClean.ttf.zip) -// Download and more information at http://upperbounds.net +// MIT license (see License.txt in http://www.proggyfonts.net/index.php?menu=download) +// Download and more information at http://www.proggyfonts.net or http://upperboundsinteractive.com/fonts.php //----------------------------------------------------------------------------- -// File: 'ProggyClean.ttf' (41208 bytes) -// Exported using misc/fonts/binary_to_compressed_c.cpp (with compression + base85 string encoding). -// The purpose of encoding as base85 instead of "0x00,0x01,..." style is only save on _source code_ size. -//----------------------------------------------------------------------------- -static const char proggy_clean_ttf_compressed_data_base85[11980+1] = - "7])#######hV0qs'/###[),##/l:$#Q6>##5[n42>c-TH`->>#/e>11NNV=Bv(*:.F?uu#(gRU.o0XGH`$vhLG1hxt9?W`#,5LsCp#-i>.r$<$6pD>Lb';9Crc6tgXmKVeU2cD4Eo3R/" - "2*>]b(MC;$jPfY.;h^`IWM9Qo#t'X#(v#Y9w0#1D$CIf;W'#pWUPXOuxXuU(H9M(1=Ke$$'5F%)]0^#0X@U.a$FBjVQTSDgEKnIS7EM9>ZY9w0#L;>>#Mx&4Mvt//L[MkA#W@lK.N'[0#7RL_&#w+F%HtG9M#XL`N&.,GM4Pg;--VsM.M0rJfLH2eTM`*oJMHRC`N" - "kfimM2J,W-jXS:)r0wK#@Fge$U>`w'N7G#$#fB#$E^$#:9:hk+eOe--6x)F7*E%?76%^GMHePW-Z5l'&GiF#$956:rS?dA#fiK:)Yr+`�j@'DbG&#^$PG.Ll+DNa&VZ>1i%h1S9u5o@YaaW$e+bROPOpxTO7Stwi1::iB1q)C_=dV26J;2,]7op$]uQr@_V7$q^%lQwtuHY]=DX,n3L#0PHDO4f9>dC@O>HBuKPpP*E,N+b3L#lpR/MrTEH.IAQk.a>D[.e;mc." - "x]Ip.PH^'/aqUO/$1WxLoW0[iLAw=4h(9.`G" - "CRUxHPeR`5Mjol(dUWxZa(>STrPkrJiWx`5U7F#.g*jrohGg`cg:lSTvEY/EV_7H4Q9[Z%cnv;JQYZ5q.l7Zeas:HOIZOB?Ggv:[7MI2k).'2($5FNP&EQ(,)" - "U]W]+fh18.vsai00);D3@4ku5P?DP8aJt+;qUM]=+b'8@;mViBKx0DE[-auGl8:PJ&Dj+M6OC]O^((##]`0i)drT;-7X`=-H3[igUnPG-NZlo.#k@h#=Ork$m>a>$-?Tm$UV(?#P6YY#" - "'/###xe7q.73rI3*pP/$1>s9)W,JrM7SN]'/4C#v$U`0#V.[0>xQsH$fEmPMgY2u7Kh(G%siIfLSoS+MK2eTM$=5,M8p`A.;_R%#u[K#$x4AG8.kK/HSB==-'Ie/QTtG?-.*^N-4B/ZM" - "_3YlQC7(p7q)&](`6_c)$/*JL(L-^(]$wIM`dPtOdGA,U3:w2M-0+WomX2u7lqM2iEumMTcsF?-aT=Z-97UEnXglEn1K-bnEO`gu" - "Ft(c%=;Am_Qs@jLooI&NX;]0#j4#F14;gl8-GQpgwhrq8'=l_f-b49'UOqkLu7-##oDY2L(te+Mch&gLYtJ,MEtJfLh'x'M=$CS-ZZ%P]8bZ>#S?YY#%Q&q'3^Fw&?D)UDNrocM3A76/" - "/oL?#h7gl85[qW/NDOk%16ij;+:1a'iNIdb-ou8.P*w,v5#EI$TWS>Pot-R*H'-SEpA:g)f+O$%%`kA#G=8RMmG1&O`>to8bC]T&$,n.LoO>29sp3dt-52U%VM#q7'DHpg+#Z9%H[Ket`e;)f#Km8&+DC$I46>#Kr]]u-[=99tts1.qb#q72g1WJO81q+eN'03'eM>&1XxY-caEnO" - "j%2n8)),?ILR5^.Ibn<-X-Mq7[a82Lq:F&#ce+S9wsCK*x`569E8ew'He]h:sI[2LM$[guka3ZRd6:t%IG:;$%YiJ:Nq=?eAw;/:nnDq0(CYcMpG)qLN4$##&J-XTt,%OVU4)S1+R-#dg0/Nn?Ku1^0f$B*P:Rowwm-`0PKjYDDM'3]d39VZHEl4,.j']Pk-M.h^&:0FACm$maq-&sgw0t7/6(^xtk%" - "LuH88Fj-ekm>GA#_>568x6(OFRl-IZp`&b,_P'$MhLbxfc$mj`,O;&%W2m`Zh:/)Uetw:aJ%]K9h:TcF]u_-Sj9,VK3M.*'&0D[Ca]J9gp8,kAW]" - "%(?A%R$f<->Zts'^kn=-^@c4%-pY6qI%J%1IGxfLU9CP8cbPlXv);C=b),<2mOvP8up,UVf3839acAWAW-W?#ao/^#%KYo8fRULNd2.>%m]UK:n%r$'sw]J;5pAoO_#2mO3n,'=H5(et" - "Hg*`+RLgv>=4U8guD$I%D:W>-r5V*%j*W:Kvej.Lp$'?;++O'>()jLR-^u68PHm8ZFWe+ej8h:9r6L*0//c&iH&R8pRbA#Kjm%upV1g:" - "a_#Ur7FuA#(tRh#.Y5K+@?3<-8m0$PEn;J:rh6?I6uG<-`wMU'ircp0LaE_OtlMb&1#6T.#FDKu#1Lw%u%+GM+X'e?YLfjM[VO0MbuFp7;>Q&#WIo)0@F%q7c#4XAXN-U&VBpqB>0ie&jhZ[?iLR@@_AvA-iQC(=ksRZRVp7`.=+NpBC%rh&3]R:8XDmE5^V8O(x<-+k?'(^](H.aREZSi,#1:[IXaZFOm<-ui#qUq2$##Ri;u75OK#(RtaW-K-F`S+cF]uN`-KMQ%rP/Xri.LRcB##=YL3BgM/3M" - "D?@f&1'BW-)Ju#bmmWCMkk&#TR`C,5d>g)F;t,4:@_l8G/5h4vUd%&%950:VXD'QdWoY-F$BtUwmfe$YqL'8(PWX(" - "P?^@Po3$##`MSs?DWBZ/S>+4%>fX,VWv/w'KD`LP5IbH;rTV>n3cEK8U#bX]l-/V+^lj3;vlMb&[5YQ8#pekX9JP3XUC72L,,?+Ni&co7ApnO*5NK,((W-i:$,kp'UDAO(G0Sq7MVjJs" - "bIu)'Z,*[>br5fX^:FPAWr-m2KgLQ_nN6'8uTGT5g)uLv:873UpTLgH+#FgpH'_o1780Ph8KmxQJ8#H72L4@768@Tm&Q" - "h4CB/5OvmA&,Q&QbUoi$a_%3M01H)4x7I^&KQVgtFnV+;[Pc>[m4k//,]1?#`VY[Jr*3&&slRfLiVZJ:]?=K3Sw=[$=uRB?3xk48@aege0jT6'N#(q%.O=?2S]u*(m<-" - "V8J'(1)G][68hW$5'q[GC&5j`TE?m'esFGNRM)j,ffZ?-qx8;->g4t*:CIP/[Qap7/9'#(1sao7w-.qNUdkJ)tCF&#B^;xGvn2r9FEPFFFcL@.iFNkTve$m%#QvQS8U@)2Z+3K:AKM5i" - "sZ88+dKQ)W6>J%CL`.d*(B`-n8D9oK-XV1q['-5k'cAZ69e;D_?$ZPP&s^+7])$*$#@QYi9,5P r+$%CE=68>K8r0=dSC%%(@p7" - ".m7jilQ02'0-VWAgTlGW'b)Tq7VT9q^*^$$.:&N@@" - "$&)WHtPm*5_rO0&e%K&#-30j(E4#'Zb.o/(Tpm$>K'f@[PvFl,hfINTNU6u'0pao7%XUp9]5.>%h`8_=VYbxuel.NTSsJfLacFu3B'lQSu/m6-Oqem8T+oE--$0a/k]uj9EwsG>%veR*" - "hv^BFpQj:K'#SJ,sB-'#](j.Lg92rTw-*n%@/;39rrJF,l#qV%OrtBeC6/,;qB3ebNW[?,Hqj2L.1NP&GjUR=1D8QaS3Up&@*9wP?+lo7b?@%'k4`p0Z$22%K3+iCZj?XJN4Nm&+YF]u" - "@-W$U%VEQ/,,>>#)D#%8cY#YZ?=,`Wdxu/ae&#" - "w6)R89tI#6@s'(6Bf7a&?S=^ZI_kS&ai`&=tE72L_D,;^R)7[$so8lKN%5/$(vdfq7+ebA#" - "u1p]ovUKW&Y%q]'>$1@-[xfn$7ZTp7mM,G,Ko7a&Gu%G[RMxJs[0MM%wci.LFDK)(%:_i2B5CsR8&9Z&#=mPEnm0f`<&c)QL5uJ#%u%lJj+D-r;BoFDoS97h5g)E#o:&S4weDF,9^Hoe`h*L+_a*NrLW-1pG_&2UdB8" - "6e%B/:=>)N4xeW.*wft-;$'58-ESqr#U`'6AQ]m&6/`Z>#S?YY#Vc;r7U2&326d=w&H####?TZ`*4?&.MK?LP8Vxg>$[QXc%QJv92.(Db*B)gb*BM9dM*hJMAo*c&#" - "b0v=Pjer]$gG&JXDf->'StvU7505l9$AFvgYRI^&<^b68?j#q9QX4SM'RO#&sL1IM.rJfLUAj221]d##DW=m83u5;'bYx,*Sl0hL(W;;$doB&O/TQ:(Z^xBdLjLV#*8U_72Lh+2Q8Cj0i:6hp&$C/:p(HK>T8Y[gHQ4`4)'$Ab(Nof%V'8hL&#SfD07&6D@M.*J:;$-rv29'M]8qMv-tLp,'886iaC=Hb*YJoKJ,(j%K=H`K.v9HggqBIiZu'QvBT.#=)0ukruV&.)3=(^1`o*Pj4<-#MJ+gLq9-##@HuZPN0]u:h7.T..G:;$/Usj(T7`Q8tT72LnYl<-qx8;-HV7Q-&Xdx%1a,hC=0u+HlsV>nuIQL-5" - "_>@kXQtMacfD.m-VAb8;IReM3$wf0''hra*so568'Ip&vRs849'MRYSp%:t:h5qSgwpEr$B>Q,;s(C#$)`svQuF$##-D,##,g68@2[T;.XSdN9Qe)rpt._K-#5wF)sP'##p#C0c%-Gb%" - "hd+<-j'Ai*x&&HMkT]C'OSl##5RG[JXaHN;d'uA#x._U;.`PU@(Z3dt4r152@:v,'R.Sj'w#0<-;kPI)FfJ&#AYJ&#//)>-k=m=*XnK$>=)72L]0I%>.G690a:$##<,);?;72#?x9+d;" - "^V'9;jY@;)br#q^YQpx:X#Te$Z^'=-=bGhLf:D6&bNwZ9-ZD#n^9HhLMr5G;']d&6'wYmTFmLq9wI>P(9mI[>kC-ekLC/R&CH+s'B;K-M6$EB%is00:" - "+A4[7xks.LrNk0&E)wILYF@2L'0Nb$+pv<(2.768/FrY&h$^3i&@+G%JT'<-,v`3;_)I9M^AE]CN?Cl2AZg+%4iTpT3$U4O]GKx'm9)b@p7YsvK3w^YR-" - "CdQ*:Ir<($u&)#(&?L9Rg3H)4fiEp^iI9O8KnTj,]H?D*r7'M;PwZ9K0E^k&-cpI;.p/6_vwoFMV<->#%Xi.LxVnrU(4&8/P+:hLSKj$#U%]49t'I:rgMi'FL@a:0Y-uA[39',(vbma*" - "hU%<-SRF`Tt:542R_VV$p@[p8DV[A,?1839FWdFTi1O*H&#(AL8[_P%.M>v^-))qOT*F5Cq0`Ye%+$B6i:7@0IXSsDiWP,##P`%/L-" - "S(qw%sf/@%#B6;/U7K]uZbi^Oc^2n%t<)'mEVE''n`WnJra$^TKvX5B>;_aSEK',(hwa0:i4G?.Bci.(X[?b*($,=-n<.Q%`(X=?+@Am*Js0&=3bh8K]mL69=Lb,OcZV/);TTm8VI;?%OtJ<(b4mq7M6:u?KRdFl*:xP?Yb.5)%w_I?7uk5JC+FS(m#i'k.'a0i)9<7b'fs'59hq$*5Uhv##pi^8+hIEBF`nvo`;'l0.^S1<-wUK2/Coh58KKhLj" - "M=SO*rfO`+qC`W-On.=AJ56>>i2@2LH6A:&5q`?9I3@@'04&p2/LVa*T-4<-i3;M9UvZd+N7>b*eIwg:CC)c<>nO&#$(>.Z-I&J(Q0Hd5Q%7Co-b`-cP)hI;*_F]u`Rb[.j8_Q/<&>uu+VsH$sM9TA%?)(vmJ80),P7E>)tjD%2L=-t#fK[%`v=Q8WlA2);Sa" - ">gXm8YB`1d@K#n]76-a$U,mF%Ul:#/'xoFM9QX-$.QN'>" - "[%$Z$uF6pA6Ki2O5:8w*vP1<-1`[G,)-m#>0`P&#eb#.3i)rtB61(o'$?X3B2Qft^ae_5tKL9MUe9b*sLEQ95C&`=G?@Mj=wh*'3E>=-<)Gt*Iw)'QG:`@I" - "wOf7&]1i'S01B+Ev/Nac#9S;=;YQpg_6U`*kVY39xK,[/6Aj7:'1Bm-_1EYfa1+o&o4hp7KN_Q(OlIo@S%;jVdn0'1h19w,WQhLI)3S#f$2(eb,jr*b;3Vw]*7NH%$c4Vs,eD9>XW8?N]o+(*pgC%/72LV-uW%iewS8W6m2rtCpo'RS1R84=@paTKt)>=%&1[)*vp'u+x,VrwN;&]kuO9JDbg=pO$J*.jVe;u'm0dr9l,<*wMK*Oe=g8lV_KEBFkO'oU]^=[-792#ok,)" - "i]lR8qQ2oA8wcRCZ^7w/Njh;?.stX?Q1>S1q4Bn$)K1<-rGdO'$Wr.Lc.CG)$/*JL4tNR/,SVO3,aUw'DJN:)Ss;wGn9A32ijw%FL+Z0Fn.U9;reSq)bmI32U==5ALuG&#Vf1398/pVo" - "1*c-(aY168o<`JsSbk-,1N;$>0:OUas(3:8Z972LSfF8eb=c-;>SPw7.6hn3m`9^Xkn(r.qS[0;T%&Qc=+STRxX'q1BNk3&*eu2;&8q$&x>Q#Q7^Tf+6<(d%ZVmj2bDi%.3L2n+4W'$P" - "iDDG)g,r%+?,$@?uou5tSe2aN_AQU*'IAO" - "URQ##V^Fv-XFbGM7Fl(N<3DhLGF%q.1rC$#:T__&Pi68%0xi_&[qFJ(77j_&JWoF.V735&T,[R*:xFR*K5>>#`bW-?4Ne_&6Ne_&6Ne_&n`kr-#GJcM6X;uM6X;uM(.a..^2TkL%oR(#" - ";u.T%fAr%4tJ8&><1=GHZ_+m9/#H1F^R#SC#*N=BA9(D?v[UiFY>>^8p,KKF.W]L29uLkLlu/+4T" - "w$)F./^n3+rlo+DB;5sIYGNk+i1t-69Jg--0pao7Sm#K)pdHW&;LuDNH@H>#/X-TI(;P>#,Gc>#0Su>#4`1?#8lC?#xL$#B.`$#F:r$#JF.%#NR@%#R_R%#Vke%#Zww%#_-4^Rh%Sflr-k'MS.o?.5/sWel/wpEM0%3'/1)K^f1-d>G21&v(35>V`39V7A4=onx4" - "A1OY5EI0;6Ibgr6M$HS7Q<)58C5w,;WoA*#[%T*#`1g*#d=#+#hI5+#lUG+#pbY+#tnl+#x$),#&1;,#*=M,#.I`,#2Ur,#6b.-#;w[H#iQtA#m^0B#qjBB#uvTB##-hB#'9$C#+E6C#" - "/QHC#3^ZC#7jmC#;v)D#?,)4kMYD4lVu`4m`:&5niUA5@(A5BA1]PBB:xlBCC=2CDLXMCEUtiCf&0g2'tN?PGT4CPGT4CPGT4CPGT4CPGT4CPGT4CPGT4CP" - "GT4CPGT4CPGT4CPGT4CPGT4CPGT4CP-qekC`.9kEg^+F$kwViFJTB&5KTB&5KTB&5KTB&5KTB&5KTB&5KTB&5KTB&5KTB&5KTB&5KTB&5KTB&5KTB&5KTB&5KTB&5o,^<-28ZI'O?;xp" - "O?;xpO?;xpO?;xpO?;xpO?;xpO?;xpO?;xpO?;xpO?;xpO?;xpO?;xpO?;xpO?;xp;7q-#lLYI:xvD=#"; -static const char* GetDefaultCompressedFontDataTTFBase85() +#ifndef IMGUI_DISABLE_DEFAULT_FONT + +// File: 'ProggyClean.ttf' (41208 bytes) +// Exported using binary_to_compressed_c.exe -u8 "ProggyClean.ttf" proggy_clean_ttf +static const unsigned int proggy_clean_ttf_compressed_size = 9583; +static const unsigned char proggy_clean_ttf_compressed_data[9583] = { - return proggy_clean_ttf_compressed_data_base85; + 87,188,0,0,0,0,0,0,0,0,160,248,0,4,0,0,55,0,1,0,0,0,12,0,128,0,3,0,64,79,83,47,50,136,235,116,144,0,0,1,72,130,21,44,78,99,109,97,112,2,18,35,117,0,0,3,160,130,19,36,82,99,118,116, + 32,130,23,130,2,33,4,252,130,4,56,2,103,108,121,102,18,175,137,86,0,0,7,4,0,0,146,128,104,101,97,100,215,145,102,211,130,27,32,204,130,3,33,54,104,130,16,39,8,66,1,195,0,0,1,4,130, + 15,59,36,104,109,116,120,138,0,126,128,0,0,1,152,0,0,2,6,108,111,99,97,140,115,176,216,0,0,5,130,30,41,2,4,109,97,120,112,1,174,0,218,130,31,32,40,130,16,44,32,110,97,109,101,37,89, + 187,150,0,0,153,132,130,19,44,158,112,111,115,116,166,172,131,239,0,0,155,36,130,51,44,210,112,114,101,112,105,2,1,18,0,0,4,244,130,47,32,8,132,203,46,1,0,0,60,85,233,213,95,15,60, + 245,0,3,8,0,131,0,34,183,103,119,130,63,43,0,0,189,146,166,215,0,0,254,128,3,128,131,111,130,241,33,2,0,133,0,32,1,130,65,38,192,254,64,0,0,3,128,131,16,130,5,32,1,131,7,138,3,33,2, + 0,130,17,36,1,1,0,144,0,130,121,130,23,38,2,0,8,0,64,0,10,130,9,32,118,130,9,130,6,32,0,130,59,33,1,144,131,200,35,2,188,2,138,130,16,32,143,133,7,37,1,197,0,50,2,0,131,0,33,4,9,131, + 5,145,3,43,65,108,116,115,0,64,0,0,32,172,8,0,131,0,35,5,0,1,128,131,77,131,3,33,3,128,191,1,33,1,128,130,184,35,0,0,128,0,130,3,131,11,32,1,130,7,33,0,128,131,1,32,1,136,9,32,0,132, + 15,135,5,32,1,131,13,135,27,144,35,32,1,149,25,131,21,32,0,130,0,32,128,132,103,130,35,132,39,32,0,136,45,136,97,133,17,130,5,33,0,0,136,19,34,0,128,1,133,13,133,5,32,128,130,15,132, + 131,32,3,130,5,32,3,132,27,144,71,32,0,133,27,130,29,130,31,136,29,131,63,131,3,65,63,5,132,5,132,205,130,9,33,0,0,131,9,137,119,32,3,132,19,138,243,130,55,32,1,132,35,135,19,131,201, + 136,11,132,143,137,13,130,41,32,0,131,3,144,35,33,128,0,135,1,131,223,131,3,141,17,134,13,136,63,134,15,136,53,143,15,130,96,33,0,3,131,4,130,3,34,28,0,1,130,5,34,0,0,76,130,17,131, + 9,36,28,0,4,0,48,130,17,46,8,0,8,0,2,0,0,0,127,0,255,32,172,255,255,130,9,34,0,0,129,132,9,130,102,33,223,213,134,53,132,22,33,1,6,132,6,64,4,215,32,129,165,216,39,177,0,1,141,184, + 1,255,133,134,45,33,198,0,193,1,8,190,244,1,28,1,158,2,20,2,136,2,252,3,20,3,88,3,156,3,222,4,20,4,50,4,80,4,98,4,162,5,22,5,102,5,188,6,18,6,116,6,214,7,56,7,126,7,236,8,78,8,108, + 8,150,8,208,9,16,9,74,9,136,10,22,10,128,11,4,11,86,11,200,12,46,12,130,12,234,13,94,13,164,13,234,14,80,14,150,15,40,15,176,16,18,16,116,16,224,17,82,17,182,18,4,18,110,18,196,19, + 76,19,172,19,246,20,88,20,174,20,234,21,64,21,128,21,166,21,184,22,18,22,126,22,198,23,52,23,142,23,224,24,86,24,186,24,238,25,54,25,150,25,212,26,72,26,156,26,240,27,92,27,200,28, + 4,28,76,28,150,28,234,29,42,29,146,29,210,30,64,30,142,30,224,31,36,31,118,31,166,31,166,32,16,130,1,52,46,32,138,32,178,32,200,33,20,33,116,33,152,33,238,34,98,34,134,35,12,130,1, + 33,128,35,131,1,60,152,35,176,35,216,36,0,36,74,36,104,36,144,36,174,37,6,37,96,37,130,37,248,37,248,38,88,38,170,130,1,8,190,216,39,64,39,154,40,10,40,104,40,168,41,14,41,32,41,184, + 41,248,42,54,42,96,42,96,43,2,43,42,43,94,43,172,43,230,44,32,44,52,44,154,45,40,45,92,45,120,45,170,45,232,46,38,46,166,47,38,47,182,47,244,48,94,48,200,49,62,49,180,50,30,50,158, + 51,30,51,130,51,238,52,92,52,206,53,58,53,134,53,212,54,38,54,114,54,230,55,118,55,216,56,58,56,166,57,18,57,116,57,174,58,46,58,154,59,6,59,124,59,232,60,58,60,150,61,34,61,134,61, + 236,62,86,62,198,63,42,63,154,64,18,64,106,64,208,65,54,65,162,66,8,66,64,66,122,66,184,66,240,67,98,67,204,68,42,68,138,68,238,69,88,69,182,69,226,70,84,70,180,71,20,71,122,71,218, + 72,84,72,198,73,64,0,36,70,21,8,8,77,3,0,7,0,11,0,15,0,19,0,23,0,27,0,31,0,35,0,39,0,43,0,47,0,51,0,55,0,59,0,63,0,67,0,71,0,75,0,79,0,83,0,87,0,91,0,95,0,99,0,103,0,107,0,111,0,115, + 0,119,0,123,0,127,0,131,0,135,0,139,0,143,0,0,17,53,51,21,49,150,3,32,5,130,23,32,33,130,3,211,7,151,115,32,128,133,0,37,252,128,128,2,128,128,190,5,133,74,32,4,133,6,206,5,42,0,7, + 1,128,0,0,2,0,4,0,0,65,139,13,37,0,1,53,51,21,7,146,3,32,3,130,19,32,1,141,133,32,3,141,14,131,13,38,255,0,128,128,0,6,1,130,84,35,2,128,4,128,140,91,132,89,32,51,65,143,6,139,7,33, + 1,0,130,57,32,254,130,3,32,128,132,4,32,4,131,14,138,89,35,0,0,24,0,130,0,33,3,128,144,171,66,55,33,148,115,65,187,19,32,5,130,151,143,155,163,39,32,1,136,182,32,253,134,178,132,7, + 132,200,145,17,32,3,65,48,17,165,17,39,0,0,21,0,128,255,128,3,65,175,17,65,3,27,132,253,131,217,139,201,155,233,155,27,131,67,131,31,130,241,33,255,0,131,181,137,232,132,15,132,4,138, + 247,34,255,0,128,179,238,32,0,130,0,32,20,65,239,48,33,0,19,67,235,10,32,51,65,203,14,65,215,11,32,7,154,27,135,39,32,33,130,35,33,128,128,130,231,32,253,132,231,32,128,132,232,34, + 128,128,254,133,13,136,8,32,253,65,186,5,130,36,130,42,176,234,133,231,34,128,0,0,66,215,44,33,0,1,68,235,6,68,211,19,32,49,68,239,14,139,207,139,47,66,13,7,32,51,130,47,33,1,0,130, + 207,35,128,128,1,0,131,222,131,5,130,212,130,6,131,212,32,0,130,10,133,220,130,233,130,226,32,254,133,255,178,233,39,3,1,128,3,0,2,0,4,68,15,7,68,99,12,130,89,130,104,33,128,4,133, + 93,130,10,38,0,0,11,1,0,255,0,68,63,16,70,39,9,66,215,8,32,7,68,77,6,68,175,14,32,29,68,195,6,132,7,35,2,0,128,255,131,91,132,4,65,178,5,141,111,67,129,23,165,135,140,107,142,135,33, + 21,5,69,71,6,131,7,33,1,0,140,104,132,142,130,4,137,247,140,30,68,255,12,39,11,0,128,0,128,3,0,3,69,171,15,67,251,7,65,15,8,66,249,11,65,229,7,67,211,7,66,13,7,35,1,128,128,254,133, + 93,32,254,131,145,132,4,132,18,32,2,151,128,130,23,34,0,0,9,154,131,65,207,8,68,107,15,68,51,7,32,7,70,59,7,135,121,130,82,32,128,151,111,41,0,0,4,0,128,255,0,1,128,1,137,239,33,0, + 37,70,145,10,65,77,10,65,212,14,37,0,0,0,5,0,128,66,109,5,70,123,10,33,0,19,72,33,18,133,237,70,209,11,33,0,2,130,113,137,119,136,115,33,1,0,133,43,130,5,34,0,0,10,69,135,6,70,219, + 13,66,155,7,65,9,12,66,157,11,66,9,11,32,7,130,141,132,252,66,151,9,137,9,66,15,30,36,0,20,0,128,0,130,218,71,11,42,68,51,8,65,141,7,73,19,15,69,47,23,143,39,66,81,7,32,1,66,55,6,34, + 1,128,128,68,25,5,69,32,6,137,6,136,25,32,254,131,42,32,3,66,88,26,148,26,32,0,130,0,32,14,164,231,70,225,12,66,233,7,67,133,19,71,203,15,130,161,32,255,130,155,32,254,139,127,134, + 12,164,174,33,0,15,164,159,33,59,0,65,125,20,66,25,7,32,5,68,191,6,66,29,7,144,165,65,105,9,35,128,128,255,0,137,2,133,182,164,169,33,128,128,197,171,130,155,68,235,7,32,21,70,77,19, + 66,21,10,68,97,8,66,30,5,66,4,43,34,0,17,0,71,19,41,65,253,20,71,25,23,65,91,15,65,115,7,34,2,128,128,66,9,8,130,169,33,1,0,66,212,13,132,28,72,201,43,35,0,0,0,18,66,27,38,76,231,5, + 68,157,20,135,157,32,7,68,185,13,65,129,28,66,20,5,32,253,66,210,11,65,128,49,133,61,32,0,65,135,6,74,111,37,72,149,12,66,203,19,65,147,19,68,93,7,68,85,8,76,4,5,33,255,0,133,129,34, + 254,0,128,68,69,8,181,197,34,0,0,12,65,135,32,65,123,20,69,183,27,133,156,66,50,5,72,87,10,67,137,32,33,0,19,160,139,78,251,13,68,55,20,67,119,19,65,91,36,69,177,15,32,254,143,16,65, + 98,53,32,128,130,0,32,0,66,43,54,70,141,23,66,23,15,131,39,69,47,11,131,15,70,129,19,74,161,9,36,128,255,0,128,254,130,153,65,148,32,67,41,9,34,0,0,4,79,15,5,73,99,10,71,203,8,32,3, + 72,123,6,72,43,8,32,2,133,56,131,99,130,9,34,0,0,6,72,175,5,73,159,14,144,63,135,197,132,189,133,66,33,255,0,73,6,7,70,137,12,35,0,0,0,10,130,3,73,243,25,67,113,12,65,73,7,69,161,7, + 138,7,37,21,2,0,128,128,254,134,3,73,116,27,33,128,128,130,111,39,12,0,128,1,0,3,128,2,72,219,21,35,43,0,47,0,67,47,20,130,111,33,21,1,68,167,13,81,147,8,133,230,32,128,77,73,6,32, + 128,131,142,134,18,130,6,32,255,75,18,12,131,243,37,128,0,128,3,128,3,74,231,21,135,123,32,29,134,107,135,7,32,21,74,117,7,135,7,134,96,135,246,74,103,23,132,242,33,0,10,67,151,28, + 67,133,20,66,141,11,131,11,32,3,77,71,6,32,128,130,113,32,1,81,4,6,134,218,66,130,24,131,31,34,0,26,0,130,0,77,255,44,83,15,11,148,155,68,13,7,32,49,78,231,18,79,7,11,73,243,11,32, + 33,65,187,10,130,63,65,87,8,73,239,19,35,0,128,1,0,131,226,32,252,65,100,6,32,128,139,8,33,1,0,130,21,32,253,72,155,44,73,255,20,32,128,71,67,8,81,243,39,67,15,20,74,191,23,68,121, + 27,32,1,66,150,6,32,254,79,19,11,131,214,32,128,130,215,37,2,0,128,253,0,128,136,5,65,220,24,147,212,130,210,33,0,24,72,219,42,84,255,13,67,119,16,69,245,19,72,225,19,65,3,15,69,93, + 19,131,55,132,178,71,115,14,81,228,6,142,245,33,253,0,132,43,172,252,65,16,11,75,219,8,65,219,31,66,223,24,75,223,10,33,29,1,80,243,10,66,175,8,131,110,134,203,133,172,130,16,70,30, + 7,164,183,130,163,32,20,65,171,48,65,163,36,65,143,23,65,151,19,65,147,13,65,134,17,133,17,130,216,67,114,5,164,217,65,137,12,72,147,48,79,71,19,74,169,22,80,251,8,65,173,7,66,157, + 15,74,173,15,32,254,65,170,8,71,186,45,72,131,6,77,143,40,187,195,152,179,65,123,38,68,215,57,68,179,15,65,85,7,69,187,14,32,21,66,95,15,67,19,25,32,1,83,223,6,32,2,76,240,7,77,166, + 43,65,8,5,130,206,32,0,67,39,54,143,167,66,255,19,82,193,11,151,47,85,171,5,67,27,17,132,160,69,172,11,69,184,56,66,95,6,33,12,1,130,237,32,2,68,179,27,68,175,16,80,135,15,72,55,7, + 71,87,12,73,3,12,132,12,66,75,32,76,215,5,169,139,147,135,148,139,81,12,12,81,185,36,75,251,7,65,23,27,76,215,9,87,165,12,65,209,15,72,157,7,65,245,31,32,128,71,128,6,32,1,82,125,5, + 34,0,128,254,131,169,32,254,131,187,71,180,9,132,27,32,2,88,129,44,32,0,78,47,40,65,79,23,79,171,14,32,21,71,87,8,72,15,14,65,224,33,130,139,74,27,62,93,23,7,68,31,7,75,27,7,139,15, + 74,3,7,74,23,27,65,165,11,65,177,15,67,123,5,32,1,130,221,32,252,71,96,5,74,12,12,133,244,130,25,34,1,0,128,130,2,139,8,93,26,8,65,9,32,65,57,14,140,14,32,0,73,79,67,68,119,11,135, + 11,32,51,90,75,14,139,247,65,43,7,131,19,139,11,69,159,11,65,247,6,36,1,128,128,253,0,90,71,9,33,1,0,132,14,32,128,89,93,14,69,133,6,130,44,131,30,131,6,65,20,56,33,0,16,72,179,40, + 75,47,12,65,215,19,74,95,19,65,43,11,131,168,67,110,5,75,23,17,69,106,6,75,65,5,71,204,43,32,0,80,75,47,71,203,15,159,181,68,91,11,67,197,7,73,101,13,68,85,6,33,128,128,130,214,130, + 25,32,254,74,236,48,130,194,37,0,18,0,128,255,128,77,215,40,65,139,64,32,51,80,159,10,65,147,39,130,219,84,212,43,130,46,75,19,97,74,33,11,65,201,23,65,173,31,33,1,0,79,133,6,66,150, + 5,67,75,48,85,187,6,70,207,37,32,71,87,221,13,73,163,14,80,167,15,132,15,83,193,19,82,209,8,78,99,9,72,190,11,77,110,49,89,63,5,80,91,35,99,63,32,70,235,23,81,99,10,69,148,10,65,110, + 36,32,0,65,99,47,95,219,11,68,171,51,66,87,7,72,57,7,74,45,17,143,17,65,114,50,33,14,0,65,111,40,159,195,98,135,15,35,7,53,51,21,100,78,9,95,146,16,32,254,82,114,6,32,128,67,208,37, + 130,166,99,79,58,32,17,96,99,14,72,31,19,72,87,31,82,155,7,67,47,14,32,21,131,75,134,231,72,51,17,72,78,8,133,8,80,133,6,33,253,128,88,37,9,66,124,36,72,65,12,134,12,71,55,43,66,139, + 27,85,135,10,91,33,12,65,35,11,66,131,11,71,32,8,90,127,6,130,244,71,76,11,168,207,33,0,12,66,123,32,32,0,65,183,15,68,135,11,66,111,7,67,235,11,66,111,15,32,254,97,66,12,160,154,67, + 227,52,80,33,15,87,249,15,93,45,31,75,111,12,93,45,11,77,99,9,160,184,81,31,12,32,15,98,135,30,104,175,7,77,249,36,69,73,15,78,5,12,32,254,66,151,19,34,128,128,4,87,32,12,149,35,133, + 21,96,151,31,32,19,72,35,5,98,173,15,143,15,32,21,143,99,158,129,33,0,0,65,35,52,65,11,15,147,15,98,75,11,33,1,0,143,151,132,15,32,254,99,200,37,132,43,130,4,39,0,10,0,128,1,128,3, + 0,104,151,14,97,187,20,69,131,15,67,195,11,87,227,7,33,128,128,132,128,33,254,0,68,131,9,65,46,26,42,0,0,0,7,0,0,255,128,3,128,0,88,223,15,33,0,21,89,61,22,66,209,12,65,2,12,37,0,2, + 1,0,3,128,101,83,8,36,0,1,53,51,29,130,3,34,21,1,0,66,53,8,32,0,68,215,6,100,55,25,107,111,9,66,193,11,72,167,8,73,143,31,139,31,33,1,0,131,158,32,254,132,5,33,253,128,65,16,9,133, + 17,89,130,25,141,212,33,0,0,93,39,8,90,131,25,93,39,14,66,217,6,106,179,8,159,181,71,125,15,139,47,138,141,87,11,14,76,23,14,65,231,26,140,209,66,122,8,81,179,5,101,195,26,32,47,74, + 75,13,69,159,11,83,235,11,67,21,16,136,167,131,106,130,165,130,15,32,128,101,90,24,134,142,32,0,65,103,51,108,23,11,101,231,15,75,173,23,74,237,23,66,15,6,66,46,17,66,58,17,65,105, + 49,66,247,55,71,179,12,70,139,15,86,229,7,84,167,15,32,1,95,72,12,89,49,6,33,128,128,65,136,38,66,30,9,32,0,100,239,7,66,247,29,70,105,20,65,141,19,69,81,15,130,144,32,128,83,41,5, + 32,255,131,177,68,185,5,133,126,65,97,37,32,0,130,0,33,21,0,130,55,66,195,28,67,155,13,34,79,0,83,66,213,13,73,241,19,66,59,19,65,125,11,135,201,66,249,16,32,128,66,44,11,66,56,17, + 68,143,8,68,124,38,67,183,12,96,211,9,65,143,29,112,171,5,32,0,68,131,63,34,33,53,51,71,121,11,32,254,98,251,16,32,253,74,231,10,65,175,37,133,206,37,0,0,8,1,0,0,107,123,11,113,115, + 9,33,0,1,130,117,131,3,73,103,7,66,51,18,66,44,5,133,75,70,88,5,32,254,65,39,12,68,80,9,34,12,0,128,107,179,28,68,223,6,155,111,86,147,15,32,2,131,82,141,110,33,254,0,130,15,32,4,103, + 184,15,141,35,87,176,5,83,11,5,71,235,23,114,107,11,65,189,16,70,33,15,86,153,31,135,126,86,145,30,65,183,41,32,0,130,0,32,10,65,183,24,34,35,0,39,67,85,9,65,179,15,143,15,33,1,0,65, + 28,17,157,136,130,123,32,20,130,3,32,0,97,135,24,115,167,19,80,71,12,32,51,110,163,14,78,35,19,131,19,155,23,77,229,8,78,9,17,151,17,67,231,46,94,135,8,73,31,31,93,215,56,82,171,25, + 72,77,8,162,179,169,167,99,131,11,69,85,19,66,215,15,76,129,13,68,115,22,72,79,35,67,113,5,34,0,0,19,70,31,46,65,89,52,73,223,15,85,199,33,95,33,8,132,203,73,29,32,67,48,16,177,215, + 101,13,15,65,141,43,69,141,15,75,89,5,70,0,11,70,235,21,178,215,36,10,0,128,0,0,71,207,24,33,0,19,100,67,6,80,215,11,66,67,7,80,43,12,71,106,7,80,192,5,65,63,5,66,217,26,33,0,13,156, + 119,68,95,5,72,233,12,134,129,85,81,11,76,165,20,65,43,8,73,136,8,75,10,31,38,128,128,0,0,0,13,1,130,4,32,3,106,235,29,114,179,12,66,131,23,32,7,77,133,6,67,89,12,131,139,116,60,9, + 89,15,37,32,0,74,15,7,103,11,22,65,35,5,33,55,0,93,81,28,67,239,23,78,85,5,107,93,14,66,84,17,65,193,26,74,183,10,66,67,34,143,135,79,91,15,32,7,117,111,8,75,56,9,84,212,9,154,134, + 32,0,130,0,32,18,130,3,70,171,41,83,7,16,70,131,19,84,191,15,84,175,19,84,167,30,84,158,12,154,193,68,107,15,33,0,0,65,79,42,65,71,7,73,55,7,118,191,16,83,180,9,32,255,76,166,9,154, + 141,32,0,130,0,69,195,52,65,225,15,151,15,75,215,31,80,56,10,68,240,17,100,32,9,70,147,39,65,93,12,71,71,41,92,85,15,84,135,23,78,35,15,110,27,10,84,125,8,107,115,29,136,160,38,0,0, + 14,0,128,255,0,82,155,24,67,239,8,119,255,11,69,131,11,77,29,6,112,31,8,134,27,105,203,8,32,2,75,51,11,75,195,12,74,13,29,136,161,37,128,0,0,0,11,1,130,163,82,115,8,125,191,17,69,35, + 12,74,137,15,143,15,32,1,65,157,12,136,12,161,142,65,43,40,65,199,6,65,19,24,102,185,11,76,123,11,99,6,12,135,12,32,254,130,8,161,155,101,23,9,39,8,0,0,1,128,3,128,2,78,63,17,72,245, + 12,67,41,11,90,167,9,32,128,97,49,9,32,128,109,51,14,132,97,81,191,8,130,97,125,99,12,121,35,9,127,75,15,71,79,12,81,151,23,87,97,7,70,223,15,80,245,16,105,97,15,32,254,113,17,6,32, + 128,130,8,105,105,8,76,122,18,65,243,21,74,63,7,38,4,1,0,255,0,2,0,119,247,28,133,65,32,255,141,91,35,0,0,0,16,67,63,36,34,59,0,63,77,59,9,119,147,11,143,241,66,173,15,66,31,11,67, + 75,8,81,74,16,32,128,131,255,87,181,42,127,43,5,34,255,128,2,120,235,11,37,19,0,23,0,0,37,109,191,14,118,219,7,127,43,14,65,79,14,35,0,0,0,3,73,91,5,130,5,38,3,0,7,0,11,0,0,70,205, + 11,88,221,12,32,0,73,135,7,87,15,22,73,135,10,79,153,15,97,71,19,65,49,11,32,1,131,104,121,235,11,80,65,11,142,179,144,14,81,123,46,32,1,88,217,5,112,5,8,65,201,15,83,29,15,122,147, + 11,135,179,142,175,143,185,67,247,39,66,199,7,35,5,0,128,3,69,203,15,123,163,12,67,127,7,130,119,71,153,10,141,102,70,175,8,32,128,121,235,30,136,89,100,191,11,116,195,11,111,235,15, + 72,39,7,32,2,97,43,5,132,5,94,67,8,131,8,125,253,10,32,3,65,158,16,146,16,130,170,40,0,21,0,128,0,0,3,128,5,88,219,15,24,64,159,32,135,141,65,167,15,68,163,10,97,73,49,32,255,82,58, + 7,93,80,8,97,81,16,24,67,87,52,34,0,0,5,130,231,33,128,2,80,51,13,65,129,8,113,61,6,132,175,65,219,5,130,136,77,152,17,32,0,95,131,61,70,215,6,33,21,51,90,53,10,78,97,23,105,77,31, + 65,117,7,139,75,24,68,195,9,24,64,22,9,33,0,128,130,11,33,128,128,66,25,5,121,38,5,134,5,134,45,66,40,36,66,59,18,34,128,0,0,66,59,81,135,245,123,103,19,120,159,19,77,175,12,33,255, + 0,87,29,10,94,70,21,66,59,54,39,3,1,128,3,0,2,128,4,24,65,7,15,66,47,7,72,98,12,37,0,0,0,3,1,0,24,65,55,21,131,195,32,1,67,178,6,33,4,0,77,141,8,32,6,131,47,74,67,16,24,69,3,20,24, + 65,251,7,133,234,130,229,94,108,17,35,0,0,6,0,141,175,86,59,5,162,79,85,166,8,70,112,13,32,13,24,64,67,26,24,71,255,7,123,211,12,80,121,11,69,215,15,66,217,11,69,71,10,131,113,132, + 126,119,90,9,66,117,19,132,19,32,0,130,0,24,64,47,59,33,7,0,73,227,5,68,243,15,85,13,12,76,37,22,74,254,15,130,138,33,0,4,65,111,6,137,79,65,107,16,32,1,77,200,6,34,128,128,3,75,154, + 12,37,0,16,0,0,2,0,104,115,36,140,157,68,67,19,68,51,15,106,243,15,134,120,70,37,10,68,27,10,140,152,65,121,24,32,128,94,155,7,67,11,8,24,74,11,25,65,3,12,83,89,18,82,21,37,67,200, + 5,130,144,24,64,172,12,33,4,0,134,162,74,80,14,145,184,32,0,130,0,69,251,20,32,19,81,243,5,82,143,8,33,5,53,89,203,5,133,112,79,109,15,33,0,21,130,71,80,175,41,36,75,0,79,0,83,121, + 117,9,87,89,27,66,103,11,70,13,15,75,191,11,135,67,87,97,20,109,203,5,69,246,8,108,171,5,78,195,38,65,51,13,107,203,11,77,3,17,24,75,239,17,65,229,28,79,129,39,130,175,32,128,123,253, + 7,132,142,24,65,51,15,65,239,41,36,128,128,0,0,13,65,171,5,66,163,28,136,183,118,137,11,80,255,15,67,65,7,74,111,8,32,0,130,157,32,253,24,76,35,10,103,212,5,81,175,9,69,141,7,66,150, + 29,131,158,24,75,199,28,124,185,7,76,205,15,68,124,14,32,3,123,139,16,130,16,33,128,128,108,199,6,33,0,3,65,191,35,107,11,6,73,197,11,24,70,121,15,83,247,15,24,70,173,23,69,205,14, + 32,253,131,140,32,254,136,4,94,198,9,32,3,78,4,13,66,127,13,143,13,32,0,130,0,33,16,0,24,69,59,39,109,147,12,76,253,19,24,69,207,15,69,229,15,130,195,71,90,10,139,10,130,152,73,43, + 40,91,139,10,65,131,37,35,75,0,79,0,84,227,12,143,151,68,25,15,80,9,23,95,169,11,34,128,2,128,112,186,5,130,6,83,161,19,76,50,6,130,37,65,145,44,110,83,5,32,16,67,99,6,71,67,15,76, + 55,17,140,215,67,97,23,76,69,15,77,237,11,104,211,23,77,238,11,65,154,43,33,0,10,83,15,28,83,13,20,67,145,19,67,141,14,97,149,21,68,9,15,86,251,5,66,207,5,66,27,37,82,1,23,127,71,12, + 94,235,10,110,175,24,98,243,15,132,154,132,4,24,66,69,10,32,4,67,156,43,130,198,35,2,1,0,4,75,27,9,69,85,9,95,240,7,32,128,130,35,32,28,66,43,40,24,82,63,23,83,123,12,72,231,15,127, + 59,23,116,23,19,117,71,7,24,77,99,15,67,111,15,71,101,8,36,2,128,128,252,128,127,60,11,32,1,132,16,130,18,141,24,67,107,9,32,3,68,194,15,175,15,38,0,11,0,128,1,128,2,80,63,25,32,0, + 24,65,73,11,69,185,15,83,243,16,32,0,24,81,165,8,130,86,77,35,6,155,163,88,203,5,24,66,195,30,70,19,19,24,80,133,15,32,1,75,211,8,32,254,108,133,8,79,87,20,65,32,9,41,0,0,7,0,128,0, + 0,2,128,2,68,87,15,66,1,16,92,201,16,24,76,24,17,133,17,34,128,0,30,66,127,64,34,115,0,119,73,205,9,66,43,11,109,143,15,24,79,203,11,90,143,15,131,15,155,31,65,185,15,86,87,11,35,128, + 128,253,0,69,7,6,130,213,33,1,0,119,178,15,142,17,66,141,74,83,28,6,36,7,0,0,4,128,82,39,18,76,149,12,67,69,21,32,128,79,118,15,32,0,130,0,32,8,131,206,32,2,79,83,9,100,223,14,102, + 113,23,115,115,7,24,65,231,12,130,162,32,4,68,182,19,130,102,93,143,8,69,107,29,24,77,255,12,143,197,72,51,7,76,195,15,132,139,85,49,15,130,152,131,18,71,81,23,70,14,11,36,0,10,0,128, + 2,69,59,9,89,151,15,66,241,11,76,165,12,71,43,15,75,49,13,65,12,23,132,37,32,0,179,115,130,231,95,181,16,132,77,32,254,67,224,8,65,126,20,79,171,8,32,2,89,81,5,75,143,6,80,41,8,34, + 2,0,128,24,81,72,9,32,0,130,0,35,17,0,0,255,77,99,39,95,65,36,67,109,15,24,69,93,11,77,239,5,95,77,23,35,128,1,0,128,24,86,7,8,132,167,32,2,69,198,41,130,202,33,0,26,120,75,44,24,89, + 51,15,71,243,12,70,239,11,24,84,3,11,66,7,11,71,255,10,32,21,69,155,35,88,151,12,32,128,74,38,10,65,210,8,74,251,5,65,226,5,75,201,13,32,3,65,9,41,146,41,40,0,0,0,9,1,0,1,0,2,91,99, + 19,32,35,106,119,13,70,219,15,83,239,12,137,154,32,2,67,252,19,36,128,0,0,4,1,130,196,32,2,130,8,91,107,8,32,0,135,81,24,73,211,8,132,161,73,164,13,36,0,8,0,128,2,105,123,26,139,67, + 76,99,15,34,1,0,128,135,76,83,156,20,92,104,8,67,251,30,24,86,47,27,123,207,12,24,86,7,15,71,227,8,32,4,65,20,20,131,127,32,0,130,123,32,0,71,223,26,32,19,90,195,22,71,223,15,84,200, + 6,32,128,133,241,24,84,149,9,67,41,25,36,0,0,0,22,0,88,111,49,32,87,66,21,5,77,3,27,123,75,7,71,143,19,135,183,71,183,19,130,171,74,252,5,131,5,89,87,17,32,1,132,18,130,232,68,11,10, + 33,1,128,70,208,16,66,230,18,147,18,130,254,223,255,75,27,23,65,59,15,135,39,155,255,34,128,128,254,104,92,8,33,0,128,65,32,11,65,1,58,33,26,0,130,0,72,71,18,78,55,17,76,11,19,86,101, + 12,75,223,11,89,15,11,24,76,87,15,75,235,15,131,15,72,95,7,85,71,11,72,115,11,73,64,6,34,1,128,128,66,215,9,34,128,254,128,134,14,33,128,255,67,102,5,32,0,130,16,70,38,11,66,26,57, + 88,11,8,24,76,215,34,78,139,7,95,245,7,32,7,24,73,75,23,32,128,131,167,130,170,101,158,9,82,49,22,118,139,6,32,18,67,155,44,116,187,9,108,55,14,80,155,23,66,131,15,93,77,10,131,168, + 32,128,73,211,12,24,75,187,22,32,4,96,71,20,67,108,19,132,19,120,207,8,32,5,76,79,15,66,111,21,66,95,8,32,3,190,211,111,3,8,211,212,32,20,65,167,44,34,75,0,79,97,59,13,32,33,112,63, + 10,65,147,19,69,39,19,143,39,24,66,71,9,130,224,65,185,43,94,176,12,65,183,24,71,38,8,24,72,167,7,65,191,38,136,235,24,96,167,12,65,203,62,115,131,13,65,208,42,175,235,67,127,6,32, + 4,76,171,29,114,187,5,32,71,65,211,5,65,203,68,72,51,8,164,219,32,0,172,214,71,239,58,78,3,27,66,143,15,77,19,15,147,31,35,33,53,51,21,66,183,10,173,245,66,170,30,150,30,34,0,0,23, + 80,123,54,76,1,16,73,125,15,82,245,11,167,253,24,76,85,12,70,184,5,32,254,131,185,37,254,0,128,1,0,128,133,16,117,158,18,92,27,38,65,3,17,130,251,35,17,0,128,254,24,69,83,39,140,243, + 121,73,19,109,167,7,81,41,15,24,95,175,12,102,227,15,121,96,11,24,95,189,7,32,3,145,171,154,17,24,77,47,9,33,0,5,70,71,37,68,135,7,32,29,117,171,11,69,87,15,24,79,97,19,24,79,149,23, + 131,59,32,1,75,235,5,72,115,11,72,143,7,132,188,71,27,46,131,51,32,0,69,95,6,175,215,32,21,131,167,81,15,19,151,191,151,23,131,215,71,43,5,32,254,24,79,164,24,74,109,8,77,166,13,65, + 176,26,88,162,5,98,159,6,171,219,120,247,6,79,29,8,99,169,10,103,59,19,65,209,35,131,35,91,25,19,112,94,15,83,36,8,173,229,33,20,0,88,75,43,71,31,12,65,191,71,33,1,0,130,203,32,254, + 131,4,68,66,7,67,130,6,104,61,13,173,215,38,13,1,0,0,0,2,128,67,111,28,74,129,16,104,35,19,79,161,16,87,14,7,138,143,132,10,67,62,36,114,115,5,162,151,67,33,16,108,181,15,143,151,67, + 5,5,24,100,242,15,170,153,34,0,0,14,65,51,34,32,55,79,75,9,32,51,74,7,10,65,57,38,132,142,32,254,72,0,14,139,163,32,128,80,254,8,67,158,21,65,63,7,32,4,72,227,27,95,155,12,67,119,19, + 124,91,24,149,154,72,177,34,97,223,8,155,151,24,108,227,15,88,147,16,72,117,19,68,35,11,92,253,15,70,199,15,24,87,209,17,32,2,87,233,7,32,1,24,88,195,10,119,24,8,32,3,81,227,24,65, + 125,21,35,128,128,0,25,76,59,48,24,90,187,9,97,235,12,66,61,11,91,105,19,24,79,141,11,24,79,117,15,24,79,129,27,90,53,13,130,13,32,253,131,228,24,79,133,40,69,70,8,66,137,31,65,33, + 19,96,107,8,68,119,29,66,7,5,68,125,16,65,253,19,65,241,27,24,90,179,13,24,79,143,18,33,128,128,130,246,32,254,130,168,68,154,36,77,51,9,97,47,5,167,195,32,21,131,183,78,239,27,155, + 195,78,231,14,201,196,77,11,6,32,5,73,111,37,97,247,12,77,19,31,155,207,78,215,19,162,212,69,17,14,66,91,19,80,143,57,78,203,39,159,215,32,128,93,134,8,24,80,109,24,66,113,15,169,215, + 66,115,6,32,4,69,63,33,32,0,101,113,7,86,227,35,143,211,36,49,53,51,21,1,77,185,14,65,159,28,69,251,34,67,56,8,33,9,0,24,107,175,25,90,111,12,110,251,11,119,189,24,119,187,34,87,15, + 9,32,4,66,231,37,90,39,7,66,239,8,84,219,15,69,105,23,24,85,27,27,87,31,11,33,1,128,76,94,6,32,1,85,241,7,33,128,128,106,48,10,33,128,128,69,136,11,133,13,24,79,116,49,84,236,8,24, + 91,87,9,32,5,165,255,69,115,12,66,27,15,159,15,24,72,247,12,74,178,5,24,80,64,15,33,0,128,143,17,77,89,51,130,214,24,81,43,7,170,215,74,49,8,159,199,143,31,139,215,69,143,5,32,254, + 24,81,50,35,181,217,84,123,70,143,195,159,15,65,187,16,66,123,7,65,175,15,65,193,29,68,207,39,79,27,5,70,131,6,32,4,68,211,33,33,67,0,83,143,14,159,207,143,31,140,223,33,0,128,24,80, + 82,14,24,93,16,23,32,253,65,195,5,68,227,40,133,214,107,31,7,32,5,67,115,27,87,9,8,107,31,43,66,125,6,32,0,103,177,23,131,127,72,203,36,32,0,110,103,8,155,163,73,135,6,32,19,24,112, + 99,10,65,71,11,73,143,19,143,31,126,195,5,24,85,21,9,24,76,47,14,32,254,24,93,77,36,68,207,11,39,25,0,0,255,128,3,128,4,66,51,37,95,247,13,82,255,24,76,39,19,147,221,66,85,27,24,118, + 7,8,24,74,249,12,76,74,8,91,234,8,67,80,17,131,222,33,253,0,121,30,44,73,0,16,69,15,6,32,0,65,23,38,69,231,12,65,179,6,98,131,16,86,31,27,24,108,157,14,80,160,8,24,65,46,17,33,4,0, + 96,2,18,144,191,65,226,8,68,19,5,171,199,80,9,15,180,199,67,89,5,32,255,24,79,173,28,174,201,24,79,179,50,32,1,24,122,5,10,82,61,10,180,209,83,19,8,32,128,24,80,129,27,111,248,43,131, + 71,24,115,103,8,67,127,41,78,213,24,100,247,19,66,115,39,75,107,5,32,254,165,219,78,170,40,24,112,163,49,32,1,97,203,6,65,173,64,32,0,83,54,7,133,217,88,37,12,32,254,131,28,33,128, + 3,67,71,44,84,183,6,32,5,69,223,33,96,7,7,123,137,16,192,211,24,112,14,9,32,255,67,88,29,68,14,10,84,197,38,33,0,22,116,47,50,32,87,106,99,9,116,49,15,89,225,15,97,231,23,70,41,19, + 82,85,8,93,167,6,32,253,132,236,108,190,7,89,251,5,116,49,58,33,128,128,131,234,32,15,24,74,67,38,70,227,24,24,83,45,23,89,219,12,70,187,12,89,216,19,32,2,69,185,24,141,24,70,143,66, + 24,82,119,56,78,24,10,32,253,133,149,132,6,24,106,233,7,69,198,48,178,203,81,243,12,68,211,15,106,255,23,66,91,15,69,193,7,100,39,10,24,83,72,16,176,204,33,19,0,88,207,45,68,21,12, + 68,17,10,65,157,53,68,17,6,32,254,92,67,10,65,161,25,69,182,43,24,118,91,47,69,183,18,181,209,111,253,12,89,159,8,66,112,12,69,184,45,35,0,0,0,9,24,80,227,26,73,185,16,118,195,15,131, + 15,33,1,0,65,59,15,66,39,27,160,111,66,205,12,148,111,143,110,33,128,128,156,112,24,81,199,8,75,199,23,66,117,20,155,121,32,254,68,126,12,72,213,29,134,239,149,123,89,27,16,148,117, + 65,245,8,24,71,159,14,141,134,134,28,73,51,55,109,77,15,105,131,11,68,67,11,76,169,27,107,209,12,102,174,8,32,128,72,100,18,116,163,56,79,203,11,75,183,44,85,119,19,71,119,23,151,227, + 32,1,93,27,8,65,122,5,77,102,8,110,120,20,66,23,8,66,175,17,66,63,12,133,12,79,35,8,74,235,33,67,149,16,69,243,15,78,57,15,69,235,16,67,177,7,151,192,130,23,67,84,29,141,192,174,187, + 77,67,15,69,11,12,159,187,77,59,10,199,189,24,70,235,50,96,83,19,66,53,23,105,65,19,77,47,12,163,199,66,67,37,78,207,50,67,23,23,174,205,67,228,6,71,107,13,67,22,14,66,85,11,83,187, + 38,124,47,49,95,7,19,66,83,23,67,23,19,24,96,78,17,80,101,16,71,98,40,33,0,7,88,131,22,24,89,245,12,84,45,12,102,213,5,123,12,9,32,2,126,21,14,43,255,0,128,128,0,0,20,0,128,255,128, + 3,126,19,39,32,75,106,51,7,113,129,15,24,110,135,19,126,47,15,115,117,11,69,47,11,32,2,109,76,9,102,109,9,32,128,75,2,10,130,21,32,254,69,47,6,32,3,94,217,47,32,0,65,247,10,69,15,46, + 65,235,31,65,243,15,101,139,10,66,174,14,65,247,16,72,102,28,69,17,14,84,243,9,165,191,88,47,48,66,53,12,32,128,71,108,6,203,193,32,17,75,187,42,73,65,16,65,133,52,114,123,9,167,199, + 69,21,37,86,127,44,75,171,11,180,197,78,213,12,148,200,81,97,46,24,95,243,9,32,4,66,75,33,113,103,9,87,243,36,143,225,24,84,27,31,90,145,8,148,216,67,49,5,24,84,34,14,75,155,27,67, + 52,13,140,13,36,0,20,0,128,255,24,135,99,46,88,59,43,155,249,80,165,7,136,144,71,161,23,32,253,132,33,32,254,88,87,44,136,84,35,128,0,0,21,81,103,5,94,47,44,76,51,12,143,197,151,15, + 65,215,31,24,64,77,13,65,220,20,65,214,14,71,4,40,65,213,13,32,0,130,0,35,21,1,2,0,135,0,34,36,0,72,134,10,36,1,0,26,0,130,134,11,36,2,0,14,0,108,134,11,32,3,138,23,32,4,138,11,34, + 5,0,20,134,33,34,0,0,6,132,23,32,1,134,15,32,18,130,25,133,11,37,1,0,13,0,49,0,133,11,36,2,0,7,0,38,134,11,36,3,0,17,0,45,134,11,32,4,138,35,36,5,0,10,0,62,134,23,32,6,132,23,36,3, + 0,1,4,9,130,87,131,167,133,11,133,167,133,11,133,167,133,11,37,3,0,34,0,122,0,133,11,133,167,133,11,133,167,133,11,133,167,34,50,0,48,130,1,34,52,0,47,134,5,8,49,49,0,53,98,121,32, + 84,114,105,115,116,97,110,32,71,114,105,109,109,101,114,82,101,103,117,108,97,114,84,84,88,32,80,114,111,103,103,121,67,108,101,97,110,84,84,50,48,48,52,47,130,2,53,49,53,0,98,0,121, + 0,32,0,84,0,114,0,105,0,115,0,116,0,97,0,110,130,15,32,71,132,15,36,109,0,109,0,101,130,9,32,82,130,5,36,103,0,117,0,108,130,29,32,114,130,43,34,84,0,88,130,35,32,80,130,25,34,111, + 0,103,130,1,34,121,0,67,130,27,32,101,132,59,32,84,130,31,33,0,0,65,155,9,34,20,0,0,65,11,6,130,8,135,2,33,1,1,130,9,8,120,1,1,2,1,3,1,4,1,5,1,6,1,7,1,8,1,9,1,10,1,11,1,12,1,13,1,14, + 1,15,1,16,1,17,1,18,1,19,1,20,1,21,1,22,1,23,1,24,1,25,1,26,1,27,1,28,1,29,1,30,1,31,1,32,0,3,0,4,0,5,0,6,0,7,0,8,0,9,0,10,0,11,0,12,0,13,0,14,0,15,0,16,0,17,0,18,0,19,0,20,0,21,0, + 22,0,23,0,24,0,25,0,26,0,27,0,28,0,29,0,30,0,31,130,187,8,66,33,0,34,0,35,0,36,0,37,0,38,0,39,0,40,0,41,0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,0,50,0,51,0,52,0,53,0,54,0,55,0,56,0, + 57,0,58,0,59,0,60,0,61,0,62,0,63,0,64,0,65,0,66,130,243,9,75,68,0,69,0,70,0,71,0,72,0,73,0,74,0,75,0,76,0,77,0,78,0,79,0,80,0,81,0,82,0,83,0,84,0,85,0,86,0,87,0,88,0,89,0,90,0,91,0, + 92,0,93,0,94,0,95,0,96,0,97,1,33,1,34,1,35,1,36,1,37,1,38,1,39,1,40,1,41,1,42,1,43,1,44,1,45,1,46,1,47,1,48,1,49,1,50,1,51,1,52,1,53,1,54,1,55,1,56,1,57,1,58,1,59,1,60,1,61,1,62,1, + 63,1,64,1,65,0,172,0,163,0,132,0,133,0,189,0,150,0,232,0,134,0,142,0,139,0,157,0,169,0,164,0,239,0,138,0,218,0,131,0,147,0,242,0,243,0,141,0,151,0,136,0,195,0,222,0,241,0,158,0,170, + 0,245,0,244,0,246,0,162,0,173,0,201,0,199,0,174,0,98,0,99,0,144,0,100,0,203,0,101,0,200,0,202,0,207,0,204,0,205,0,206,0,233,0,102,0,211,0,208,0,209,0,175,0,103,0,240,0,145,0,214,0, + 212,0,213,0,104,0,235,0,237,0,137,0,106,0,105,0,107,0,109,0,108,0,110,0,160,0,111,0,113,0,112,0,114,0,115,0,117,0,116,0,118,0,119,0,234,0,120,0,122,0,121,0,123,0,125,0,124,0,184,0, + 161,0,127,0,126,0,128,0,129,0,236,0,238,0,186,14,117,110,105,99,111,100,101,35,48,120,48,48,48,49,141,14,32,50,141,14,32,51,141,14,32,52,141,14,32,53,141,14,32,54,141,14,32,55,141, + 14,32,56,141,14,32,57,141,14,32,97,141,14,32,98,141,14,32,99,141,14,32,100,141,14,32,101,141,14,32,102,140,14,33,49,48,141,14,141,239,32,49,141,239,32,49,141,239,32,49,141,239,32,49, + 141,239,32,49,141,239,32,49,141,239,32,49,141,239,32,49,141,239,32,49,141,239,32,49,141,239,32,49,141,239,32,49,141,239,32,49,141,239,45,49,102,6,100,101,108,101,116,101,4,69,117,114, + 111,140,236,32,56,141,236,32,56,141,236,32,56,141,236,32,56,141,236,32,56,141,236,32,56,141,236,32,56,141,236,32,56,141,236,32,56,141,236,32,56,141,236,32,56,141,236,32,56,141,236, + 32,56,141,236,32,56,141,236,32,56,65,220,13,32,57,65,220,13,32,57,141,239,32,57,141,239,32,57,141,239,32,57,141,239,32,57,141,239,32,57,141,239,32,57,141,239,32,57,141,239,32,57,141, + 239,32,57,141,239,32,57,141,239,32,57,141,239,32,57,141,239,32,57,141,239,35,57,102,0,0,5,250,72,249,98,247, +}; + +static const char* GetDefaultCompressedFontDataTTF(int* out_size) +{ + *out_size = proggy_clean_ttf_compressed_size; + return (const char*)proggy_clean_ttf_compressed_data; } +#endif // #ifndef IMGUI_DISABLE_DEFAULT_FONT + +#endif // #ifndef IMGUI_DISABLE diff --git a/imgui/imgui_impl_glfw.cpp b/imgui/imgui_impl_glfw.cpp index a9e72c6cb..a3d545491 100644 --- a/imgui/imgui_impl_glfw.cpp +++ b/imgui/imgui_impl_glfw.cpp @@ -1,20 +1,79 @@ -// dear imgui: Platform Binding for GLFW -// This needs to be used along with a Renderer (e.g. OpenGL3, Vulkan..) +// dear imgui: Platform Backend for GLFW +// This needs to be used along with a Renderer (e.g. OpenGL3, Vulkan, WebGPU..) // (Info: GLFW is a cross-platform general purpose library for handling windows, inputs, OpenGL/Vulkan graphics context creation, etc.) -// (Requires: GLFW 3.1+) +// (Requires: GLFW 3.1+. Prefer GLFW 3.3+ or GLFW 3.4+ for full feature support.) // Implemented features: // [X] Platform: Clipboard support. +// [X] Platform: Mouse support. Can discriminate Mouse/TouchScreen/Pen (Windows only). +// [X] Platform: Keyboard support. Since 1.87 we are using the io.AddKeyEvent() function. Pass ImGuiKey values to all key functions e.g. ImGui::IsKeyPressed(ImGuiKey_Space). [Legacy GLFW_KEY_* values are obsolete since 1.87 and not supported since 1.91.5] // [X] Platform: Gamepad support. Enable with 'io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad'. -// [x] Platform: Mouse cursor shape and visibility. Disable with 'io.ConfigFlags |= ImGuiConfigFlags_NoMouseCursorChange'. FIXME: 3 cursors types are missing from GLFW. -// [X] Platform: Keyboard arrays indexed using GLFW_KEY_* codes, e.g. ImGui::IsKeyPressed(GLFW_KEY_SPACE). +// [X] Platform: Mouse cursor shape and visibility (ImGuiBackendFlags_HasMouseCursors). Resizing cursors requires GLFW 3.4+! Disable with 'io.ConfigFlags |= ImGuiConfigFlags_NoMouseCursorChange'. +// [X] Platform: Multi-viewport support (multiple windows). Enable with 'io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable'. +// Missing features or Issues: +// [ ] Touch events are only correctly identified as Touch on Windows. This create issues with some interactions. GLFW doesn't provide a way to identify touch inputs from mouse inputs, we cannot call io.AddMouseSourceEvent() to identify the source. We provide a Windows-specific workaround. +// [ ] Missing ImGuiMouseCursor_Wait and ImGuiMouseCursor_Progress cursors. +// [ ] Multi-viewport: ParentViewportID not honored, and so io.ConfigViewportsNoDefaultParent has no effect (minor). -// You can copy and use unmodified imgui_impl_* files in your project. See main.cpp for an example of using this. -// If you are new to dear imgui, read examples/README.txt and read the documentation at the top of imgui.cpp. -// https://github.com/ocornut/imgui +// You can use unmodified imgui_impl_* files in your project. See examples/ folder for examples of using this. +// Prefer including the entire imgui/ repository into your project (either as a copy or as a submodule), and only build the backends you need. +// Learn about Dear ImGui: +// - FAQ https://dearimgui.com/faq +// - Getting Started https://dearimgui.com/getting-started +// - Documentation https://dearimgui.com/docs (same as your local docs/ folder). +// - Introduction, links and more at the top of imgui.cpp + +// About Emscripten support: +// - Emscripten provides its own GLFW (3.2.1) implementation (syntax: "-sUSE_GLFW=3"), but Joystick is broken and several features are not supported (multiple windows, clipboard, timer, etc.) +// - A third-party Emscripten GLFW (3.4.0) implementation (syntax: "--use-port=contrib.glfw3") fixes the Joystick issue and implements all relevant features for the browser. +// See https://github.com/pongasoft/emscripten-glfw/blob/master/docs/Comparison.md for details. // CHANGELOG // (minor and older changes stripped away, please see git history for details) +// 2025-XX-XX: Platform: Added support for multiple windows via the ImGuiPlatformIO interface. +// 2025-03-10: Map GLFW_KEY_WORLD_1 and GLFW_KEY_WORLD_2 into ImGuiKey_Oem102. +// 2025-03-03: Fixed clipboard handler assertion when using GLFW <= 3.2.1 compiled with asserts enabled. +// 2025-02-21: [Docking] Update monitors and work areas information every frame, as the later may change regardless of monitor changes. (#8415) +// 2024-11-05: [Docking] Added Linux workaround for spurious mouse up events emitted while dragging and creating new viewport. (#3158, #7733, #7922) +// 2024-08-22: Moved some OS/backend related function pointers from ImGuiIO to ImGuiPlatformIO: +// - io.GetClipboardTextFn -> platform_io.Platform_GetClipboardTextFn +// - io.SetClipboardTextFn -> platform_io.Platform_SetClipboardTextFn +// - io.PlatformOpenInShellFn -> platform_io.Platform_OpenInShellFn +// 2024-07-31: Added ImGui_ImplGlfw_Sleep() helper function for usage by our examples app, since GLFW doesn't provide one. +// 2024-07-08: *BREAKING* Renamed ImGui_ImplGlfw_InstallEmscriptenCanvasResizeCallback to ImGui_ImplGlfw_InstallEmscriptenCallbacks(), added GLFWWindow* parameter. +// 2024-07-08: Emscripten: Added support for GLFW3 contrib port (GLFW 3.4.0 features + bug fixes): to enable, replace -sUSE_GLFW=3 with --use-port=contrib.glfw3 (requires emscripten 3.1.59+) (https://github.com/pongasoft/emscripten-glfw) +// 2024-07-02: Emscripten: Added io.PlatformOpenInShellFn() handler for Emscripten versions. +// 2023-12-19: Emscripten: Added ImGui_ImplGlfw_InstallEmscriptenCanvasResizeCallback() to register canvas selector and auto-resize GLFW window. +// 2023-10-05: Inputs: Added support for extra ImGuiKey values: F13 to F24 function keys. +// 2023-07-18: Inputs: Revert ignoring mouse data on GLFW_CURSOR_DISABLED as it can be used differently. User may set ImGuiConfigFLags_NoMouse if desired. (#5625, #6609) +// 2023-06-12: Accept glfwGetTime() not returning a monotonically increasing value. This seems to happens on some Windows setup when peripherals disconnect, and is likely to also happen on browser + Emscripten. (#6491) +// 2023-04-04: Inputs: Added support for io.AddMouseSourceEvent() to discriminate ImGuiMouseSource_Mouse/ImGuiMouseSource_TouchScreen/ImGuiMouseSource_Pen on Windows ONLY, using a custom WndProc hook. (#2702) +// 2023-03-16: Inputs: Fixed key modifiers handling on secondary viewports (docking branch). Broken on 2023/01/04. (#6248, #6034) +// 2023-03-14: Emscripten: Avoid using glfwGetError() and glfwGetGamepadState() which are not correctly implemented in Emscripten emulation. (#6240) +// 2023-02-03: Emscripten: Registering custom low-level mouse wheel handler to get more accurate scrolling impulses on Emscripten. (#4019, #6096) +// 2023-01-18: Handle unsupported glfwGetVideoMode() call on e.g. Emscripten. +// 2023-01-04: Inputs: Fixed mods state on Linux when using Alt-GR text input (e.g. German keyboard layout), could lead to broken text input. Revert a 2022/01/17 change were we resumed using mods provided by GLFW, turns out they were faulty. +// 2022-11-22: Perform a dummy glfwGetError() read to cancel missing names with glfwGetKeyName(). (#5908) +// 2022-10-18: Perform a dummy glfwGetError() read to cancel missing mouse cursors errors. Using GLFW_VERSION_COMBINED directly. (#5785) +// 2022-10-11: Using 'nullptr' instead of 'NULL' as per our switch to C++11. +// 2022-09-26: Inputs: Renamed ImGuiKey_ModXXX introduced in 1.87 to ImGuiMod_XXX (old names still supported). +// 2022-09-01: Inputs: Honor GLFW_CURSOR_DISABLED by not setting mouse position *EDIT* Reverted 2023-07-18. +// 2022-04-30: Inputs: Fixed ImGui_ImplGlfw_TranslateUntranslatedKey() for lower case letters on OSX. +// 2022-03-23: Inputs: Fixed a regression in 1.87 which resulted in keyboard modifiers events being reported incorrectly on Linux/X11. +// 2022-02-07: Added ImGui_ImplGlfw_InstallCallbacks()/ImGui_ImplGlfw_RestoreCallbacks() helpers to facilitate user installing callbacks after initializing backend. +// 2022-01-26: Inputs: replaced short-lived io.AddKeyModsEvent() (added two weeks ago) with io.AddKeyEvent() using ImGuiKey_ModXXX flags. Sorry for the confusion. +// 2021-01-20: Inputs: calling new io.AddKeyAnalogEvent() for gamepad support, instead of writing directly to io.NavInputs[]. +// 2022-01-17: Inputs: calling new io.AddMousePosEvent(), io.AddMouseButtonEvent(), io.AddMouseWheelEvent() API (1.87+). +// 2022-01-17: Inputs: always update key mods next and before key event (not in NewFrame) to fix input queue with very low framerates. +// 2022-01-12: *BREAKING CHANGE*: Now using glfwSetCursorPosCallback(). If you called ImGui_ImplGlfw_InitXXX() with install_callbacks = false, you MUST install glfwSetCursorPosCallback() and forward it to the backend via ImGui_ImplGlfw_CursorPosCallback(). +// 2022-01-10: Inputs: calling new io.AddKeyEvent(), io.AddKeyModsEvent() + io.SetKeyEventNativeData() API (1.87+). Support for full ImGuiKey range. +// 2022-01-05: Inputs: Converting GLFW untranslated keycodes back to translated keycodes (in the ImGui_ImplGlfw_KeyCallback() function) in order to match the behavior of every other backend, and facilitate the use of GLFW with lettered-shortcuts API. +// 2021-08-17: *BREAKING CHANGE*: Now using glfwSetWindowFocusCallback() to calling io.AddFocusEvent(). If you called ImGui_ImplGlfw_InitXXX() with install_callbacks = false, you MUST install glfwSetWindowFocusCallback() and forward it to the backend via ImGui_ImplGlfw_WindowFocusCallback(). +// 2021-07-29: *BREAKING CHANGE*: Now using glfwSetCursorEnterCallback(). MousePos is correctly reported when the host platform window is hovered but not focused. If you called ImGui_ImplGlfw_InitXXX() with install_callbacks = false, you MUST install glfwSetWindowFocusCallback() callback and forward it to the backend via ImGui_ImplGlfw_CursorEnterCallback(). +// 2021-06-29: Reorganized backend to pull data from a single structure to facilitate usage with multiple-contexts (all g_XXXX access changed to bd->XXXX). +// 2020-01-17: Inputs: Disable error callback while assigning mouse cursors because some X11 setup don't have them and it generates errors. +// 2019-12-05: Inputs: Added support for new mouse cursors added in GLFW 3.4+ (resizing cursors, not allowed cursor). +// 2019-10-18: Misc: Previously installed user callbacks are now restored on shutdown. // 2019-07-21: Inputs: Added mapping for ImGuiKey_KeyPadEnter. // 2019-05-11: Inputs: Don't filter value from character callback before calling AddInputCharacter(). // 2019-03-12: Misc: Preserve DisplayFramebufferScale when main window is minimized. @@ -35,161 +94,629 @@ // 2016-10-15: Misc: Added a void* user_data parameter to Clipboard function handlers. #include "imgui.h" +#ifndef IMGUI_DISABLE #include "imgui_impl_glfw.h" +// Clang warnings with -Weverything +#if defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wold-style-cast" // warning: use of old-style cast +#pragma clang diagnostic ignored "-Wsign-conversion" // warning: implicit conversion changes signedness +#endif + // GLFW #include + #ifdef _WIN32 #undef APIENTRY +#ifndef GLFW_EXPOSE_NATIVE_WIN32 #define GLFW_EXPOSE_NATIVE_WIN32 -#include // for glfwGetWin32Window #endif -#define GLFW_HAS_WINDOW_TOPMOST (GLFW_VERSION_MAJOR * 1000 + GLFW_VERSION_MINOR * 100 >= 3200) // 3.2+ GLFW_FLOATING -#define GLFW_HAS_WINDOW_HOVERED (GLFW_VERSION_MAJOR * 1000 + GLFW_VERSION_MINOR * 100 >= 3300) // 3.3+ GLFW_HOVERED -#define GLFW_HAS_WINDOW_ALPHA (GLFW_VERSION_MAJOR * 1000 + GLFW_VERSION_MINOR * 100 >= 3300) // 3.3+ glfwSetWindowOpacity -#define GLFW_HAS_PER_MONITOR_DPI (GLFW_VERSION_MAJOR * 1000 + GLFW_VERSION_MINOR * 100 >= 3300) // 3.3+ glfwGetMonitorContentScale -#define GLFW_HAS_VULKAN (GLFW_VERSION_MAJOR * 1000 + GLFW_VERSION_MINOR * 100 >= 3200) // 3.2+ glfwCreateWindowSurface +#include // for glfwGetWin32Window() +#endif +#ifdef __APPLE__ +#ifndef GLFW_EXPOSE_NATIVE_COCOA +#define GLFW_EXPOSE_NATIVE_COCOA +#endif +#include // for glfwGetCocoaWindow() +#endif +#ifndef _WIN32 +#include // for usleep() +#endif -// Data +#ifdef __EMSCRIPTEN__ +#include +#include +#ifdef EMSCRIPTEN_USE_PORT_CONTRIB_GLFW3 +#include +#else +#define EMSCRIPTEN_USE_EMBEDDED_GLFW3 +#endif +#endif + +// We gather version tests as define in order to easily see which features are version-dependent. +#define GLFW_VERSION_COMBINED (GLFW_VERSION_MAJOR * 1000 + GLFW_VERSION_MINOR * 100 + GLFW_VERSION_REVISION) +#define GLFW_HAS_WINDOW_TOPMOST (GLFW_VERSION_COMBINED >= 3200) // 3.2+ GLFW_FLOATING +#define GLFW_HAS_WINDOW_HOVERED (GLFW_VERSION_COMBINED >= 3300) // 3.3+ GLFW_HOVERED +#define GLFW_HAS_WINDOW_ALPHA (GLFW_VERSION_COMBINED >= 3300) // 3.3+ glfwSetWindowOpacity +#define GLFW_HAS_PER_MONITOR_DPI (GLFW_VERSION_COMBINED >= 3300) // 3.3+ glfwGetMonitorContentScale +#if defined(__EMSCRIPTEN__) || defined(__SWITCH__) // no Vulkan support in GLFW for Emscripten or homebrew Nintendo Switch +#define GLFW_HAS_VULKAN (0) +#else +#define GLFW_HAS_VULKAN (GLFW_VERSION_COMBINED >= 3200) // 3.2+ glfwCreateWindowSurface +#endif +#define GLFW_HAS_FOCUS_WINDOW (GLFW_VERSION_COMBINED >= 3200) // 3.2+ glfwFocusWindow +#define GLFW_HAS_FOCUS_ON_SHOW (GLFW_VERSION_COMBINED >= 3300) // 3.3+ GLFW_FOCUS_ON_SHOW +#define GLFW_HAS_MONITOR_WORK_AREA (GLFW_VERSION_COMBINED >= 3300) // 3.3+ glfwGetMonitorWorkarea +#define GLFW_HAS_OSX_WINDOW_POS_FIX (GLFW_VERSION_COMBINED >= 3301) // 3.3.1+ Fixed: Resizing window repositions it on MacOS #1553 +#ifdef GLFW_RESIZE_NESW_CURSOR // Let's be nice to people who pulled GLFW between 2019-04-16 (3.4 define) and 2019-11-29 (cursors defines) // FIXME: Remove when GLFW 3.4 is released? +#define GLFW_HAS_NEW_CURSORS (GLFW_VERSION_COMBINED >= 3400) // 3.4+ GLFW_RESIZE_ALL_CURSOR, GLFW_RESIZE_NESW_CURSOR, GLFW_RESIZE_NWSE_CURSOR, GLFW_NOT_ALLOWED_CURSOR +#else +#define GLFW_HAS_NEW_CURSORS (0) +#endif +#ifdef GLFW_MOUSE_PASSTHROUGH // Let's be nice to people who pulled GLFW between 2019-04-16 (3.4 define) and 2020-07-17 (passthrough) +#define GLFW_HAS_MOUSE_PASSTHROUGH (GLFW_VERSION_COMBINED >= 3400) // 3.4+ GLFW_MOUSE_PASSTHROUGH +#else +#define GLFW_HAS_MOUSE_PASSTHROUGH (0) +#endif +#define GLFW_HAS_GAMEPAD_API (GLFW_VERSION_COMBINED >= 3300) // 3.3+ glfwGetGamepadState() new api +#define GLFW_HAS_GETKEYNAME (GLFW_VERSION_COMBINED >= 3200) // 3.2+ glfwGetKeyName() +#define GLFW_HAS_GETERROR (GLFW_VERSION_COMBINED >= 3300) // 3.3+ glfwGetError() + +// GLFW data enum GlfwClientApi { GlfwClientApi_Unknown, GlfwClientApi_OpenGL, - GlfwClientApi_Vulkan + GlfwClientApi_Vulkan, }; -static GLFWwindow* g_Window = NULL; // Main window -static GlfwClientApi g_ClientApi = GlfwClientApi_Unknown; -static double g_Time = 0.0; -static bool g_MouseJustPressed[5] = { false, false, false, false, false }; -static GLFWcursor* g_MouseCursors[ImGuiMouseCursor_COUNT] = { 0 }; -// Chain GLFW callbacks: our callbacks will call the user's previously installed callbacks, if any. -static GLFWmousebuttonfun g_PrevUserCallbackMousebutton = NULL; -static GLFWscrollfun g_PrevUserCallbackScroll = NULL; -static GLFWkeyfun g_PrevUserCallbackKey = NULL; -static GLFWcharfun g_PrevUserCallbackChar = NULL; - -static const char* ImGui_ImplGlfw_GetClipboardText(void* user_data) +struct ImGui_ImplGlfw_Data { - return glfwGetClipboardString((GLFWwindow*)user_data); + GLFWwindow* Window; + GlfwClientApi ClientApi; + double Time; + GLFWwindow* MouseWindow; + GLFWcursor* MouseCursors[ImGuiMouseCursor_COUNT]; + bool MouseIgnoreButtonUpWaitForFocusLoss; + bool MouseIgnoreButtonUp; + ImVec2 LastValidMousePos; + GLFWwindow* KeyOwnerWindows[GLFW_KEY_LAST]; + bool InstalledCallbacks; + bool CallbacksChainForAllWindows; +#ifdef EMSCRIPTEN_USE_EMBEDDED_GLFW3 + const char* CanvasSelector; +#endif + + // Chain GLFW callbacks: our callbacks will call the user's previously installed callbacks, if any. + GLFWwindowfocusfun PrevUserCallbackWindowFocus; + GLFWcursorposfun PrevUserCallbackCursorPos; + GLFWcursorenterfun PrevUserCallbackCursorEnter; + GLFWmousebuttonfun PrevUserCallbackMousebutton; + GLFWscrollfun PrevUserCallbackScroll; + GLFWkeyfun PrevUserCallbackKey; + GLFWcharfun PrevUserCallbackChar; + GLFWmonitorfun PrevUserCallbackMonitor; +#ifdef _WIN32 + WNDPROC PrevWndProc; +#endif + + ImGui_ImplGlfw_Data() { memset((void*)this, 0, sizeof(*this)); } +}; + +// Backend data stored in io.BackendPlatformUserData to allow support for multiple Dear ImGui contexts +// It is STRONGLY preferred that you use docking branch with multi-viewports (== single Dear ImGui context + multiple windows) instead of multiple Dear ImGui contexts. +// FIXME: multi-context support is not well tested and probably dysfunctional in this backend. +// - Because glfwPollEvents() process all windows and some events may be called outside of it, you will need to register your own callbacks +// (passing install_callbacks=false in ImGui_ImplGlfw_InitXXX functions), set the current dear imgui context and then call our callbacks. +// - Otherwise we may need to store a GLFWWindow* -> ImGuiContext* map and handle this in the backend, adding a little bit of extra complexity to it. +// FIXME: some shared resources (mouse cursor shape, gamepad) are mishandled when using multi-context. +static ImGui_ImplGlfw_Data* ImGui_ImplGlfw_GetBackendData() +{ + return ImGui::GetCurrentContext() ? (ImGui_ImplGlfw_Data*)ImGui::GetIO().BackendPlatformUserData : nullptr; } -static void ImGui_ImplGlfw_SetClipboardText(void* user_data, const char* text) +// Forward Declarations +static void ImGui_ImplGlfw_UpdateMonitors(); +static void ImGui_ImplGlfw_InitMultiViewportSupport(); +static void ImGui_ImplGlfw_ShutdownMultiViewportSupport(); + +// Functions + +// Not static to allow third-party code to use that if they want to (but undocumented) +ImGuiKey ImGui_ImplGlfw_KeyToImGuiKey(int keycode, int scancode); +ImGuiKey ImGui_ImplGlfw_KeyToImGuiKey(int keycode, int scancode) { - glfwSetClipboardString((GLFWwindow*)user_data, text); + IM_UNUSED(scancode); + switch (keycode) + { + case GLFW_KEY_TAB: return ImGuiKey_Tab; + case GLFW_KEY_LEFT: return ImGuiKey_LeftArrow; + case GLFW_KEY_RIGHT: return ImGuiKey_RightArrow; + case GLFW_KEY_UP: return ImGuiKey_UpArrow; + case GLFW_KEY_DOWN: return ImGuiKey_DownArrow; + case GLFW_KEY_PAGE_UP: return ImGuiKey_PageUp; + case GLFW_KEY_PAGE_DOWN: return ImGuiKey_PageDown; + case GLFW_KEY_HOME: return ImGuiKey_Home; + case GLFW_KEY_END: return ImGuiKey_End; + case GLFW_KEY_INSERT: return ImGuiKey_Insert; + case GLFW_KEY_DELETE: return ImGuiKey_Delete; + case GLFW_KEY_BACKSPACE: return ImGuiKey_Backspace; + case GLFW_KEY_SPACE: return ImGuiKey_Space; + case GLFW_KEY_ENTER: return ImGuiKey_Enter; + case GLFW_KEY_ESCAPE: return ImGuiKey_Escape; + case GLFW_KEY_APOSTROPHE: return ImGuiKey_Apostrophe; + case GLFW_KEY_COMMA: return ImGuiKey_Comma; + case GLFW_KEY_MINUS: return ImGuiKey_Minus; + case GLFW_KEY_PERIOD: return ImGuiKey_Period; + case GLFW_KEY_SLASH: return ImGuiKey_Slash; + case GLFW_KEY_SEMICOLON: return ImGuiKey_Semicolon; + case GLFW_KEY_EQUAL: return ImGuiKey_Equal; + case GLFW_KEY_LEFT_BRACKET: return ImGuiKey_LeftBracket; + case GLFW_KEY_BACKSLASH: return ImGuiKey_Backslash; + case GLFW_KEY_WORLD_1: return ImGuiKey_Oem102; + case GLFW_KEY_WORLD_2: return ImGuiKey_Oem102; + case GLFW_KEY_RIGHT_BRACKET: return ImGuiKey_RightBracket; + case GLFW_KEY_GRAVE_ACCENT: return ImGuiKey_GraveAccent; + case GLFW_KEY_CAPS_LOCK: return ImGuiKey_CapsLock; + case GLFW_KEY_SCROLL_LOCK: return ImGuiKey_ScrollLock; + case GLFW_KEY_NUM_LOCK: return ImGuiKey_NumLock; + case GLFW_KEY_PRINT_SCREEN: return ImGuiKey_PrintScreen; + case GLFW_KEY_PAUSE: return ImGuiKey_Pause; + case GLFW_KEY_KP_0: return ImGuiKey_Keypad0; + case GLFW_KEY_KP_1: return ImGuiKey_Keypad1; + case GLFW_KEY_KP_2: return ImGuiKey_Keypad2; + case GLFW_KEY_KP_3: return ImGuiKey_Keypad3; + case GLFW_KEY_KP_4: return ImGuiKey_Keypad4; + case GLFW_KEY_KP_5: return ImGuiKey_Keypad5; + case GLFW_KEY_KP_6: return ImGuiKey_Keypad6; + case GLFW_KEY_KP_7: return ImGuiKey_Keypad7; + case GLFW_KEY_KP_8: return ImGuiKey_Keypad8; + case GLFW_KEY_KP_9: return ImGuiKey_Keypad9; + case GLFW_KEY_KP_DECIMAL: return ImGuiKey_KeypadDecimal; + case GLFW_KEY_KP_DIVIDE: return ImGuiKey_KeypadDivide; + case GLFW_KEY_KP_MULTIPLY: return ImGuiKey_KeypadMultiply; + case GLFW_KEY_KP_SUBTRACT: return ImGuiKey_KeypadSubtract; + case GLFW_KEY_KP_ADD: return ImGuiKey_KeypadAdd; + case GLFW_KEY_KP_ENTER: return ImGuiKey_KeypadEnter; + case GLFW_KEY_KP_EQUAL: return ImGuiKey_KeypadEqual; + case GLFW_KEY_LEFT_SHIFT: return ImGuiKey_LeftShift; + case GLFW_KEY_LEFT_CONTROL: return ImGuiKey_LeftCtrl; + case GLFW_KEY_LEFT_ALT: return ImGuiKey_LeftAlt; + case GLFW_KEY_LEFT_SUPER: return ImGuiKey_LeftSuper; + case GLFW_KEY_RIGHT_SHIFT: return ImGuiKey_RightShift; + case GLFW_KEY_RIGHT_CONTROL: return ImGuiKey_RightCtrl; + case GLFW_KEY_RIGHT_ALT: return ImGuiKey_RightAlt; + case GLFW_KEY_RIGHT_SUPER: return ImGuiKey_RightSuper; + case GLFW_KEY_MENU: return ImGuiKey_Menu; + case GLFW_KEY_0: return ImGuiKey_0; + case GLFW_KEY_1: return ImGuiKey_1; + case GLFW_KEY_2: return ImGuiKey_2; + case GLFW_KEY_3: return ImGuiKey_3; + case GLFW_KEY_4: return ImGuiKey_4; + case GLFW_KEY_5: return ImGuiKey_5; + case GLFW_KEY_6: return ImGuiKey_6; + case GLFW_KEY_7: return ImGuiKey_7; + case GLFW_KEY_8: return ImGuiKey_8; + case GLFW_KEY_9: return ImGuiKey_9; + case GLFW_KEY_A: return ImGuiKey_A; + case GLFW_KEY_B: return ImGuiKey_B; + case GLFW_KEY_C: return ImGuiKey_C; + case GLFW_KEY_D: return ImGuiKey_D; + case GLFW_KEY_E: return ImGuiKey_E; + case GLFW_KEY_F: return ImGuiKey_F; + case GLFW_KEY_G: return ImGuiKey_G; + case GLFW_KEY_H: return ImGuiKey_H; + case GLFW_KEY_I: return ImGuiKey_I; + case GLFW_KEY_J: return ImGuiKey_J; + case GLFW_KEY_K: return ImGuiKey_K; + case GLFW_KEY_L: return ImGuiKey_L; + case GLFW_KEY_M: return ImGuiKey_M; + case GLFW_KEY_N: return ImGuiKey_N; + case GLFW_KEY_O: return ImGuiKey_O; + case GLFW_KEY_P: return ImGuiKey_P; + case GLFW_KEY_Q: return ImGuiKey_Q; + case GLFW_KEY_R: return ImGuiKey_R; + case GLFW_KEY_S: return ImGuiKey_S; + case GLFW_KEY_T: return ImGuiKey_T; + case GLFW_KEY_U: return ImGuiKey_U; + case GLFW_KEY_V: return ImGuiKey_V; + case GLFW_KEY_W: return ImGuiKey_W; + case GLFW_KEY_X: return ImGuiKey_X; + case GLFW_KEY_Y: return ImGuiKey_Y; + case GLFW_KEY_Z: return ImGuiKey_Z; + case GLFW_KEY_F1: return ImGuiKey_F1; + case GLFW_KEY_F2: return ImGuiKey_F2; + case GLFW_KEY_F3: return ImGuiKey_F3; + case GLFW_KEY_F4: return ImGuiKey_F4; + case GLFW_KEY_F5: return ImGuiKey_F5; + case GLFW_KEY_F6: return ImGuiKey_F6; + case GLFW_KEY_F7: return ImGuiKey_F7; + case GLFW_KEY_F8: return ImGuiKey_F8; + case GLFW_KEY_F9: return ImGuiKey_F9; + case GLFW_KEY_F10: return ImGuiKey_F10; + case GLFW_KEY_F11: return ImGuiKey_F11; + case GLFW_KEY_F12: return ImGuiKey_F12; + case GLFW_KEY_F13: return ImGuiKey_F13; + case GLFW_KEY_F14: return ImGuiKey_F14; + case GLFW_KEY_F15: return ImGuiKey_F15; + case GLFW_KEY_F16: return ImGuiKey_F16; + case GLFW_KEY_F17: return ImGuiKey_F17; + case GLFW_KEY_F18: return ImGuiKey_F18; + case GLFW_KEY_F19: return ImGuiKey_F19; + case GLFW_KEY_F20: return ImGuiKey_F20; + case GLFW_KEY_F21: return ImGuiKey_F21; + case GLFW_KEY_F22: return ImGuiKey_F22; + case GLFW_KEY_F23: return ImGuiKey_F23; + case GLFW_KEY_F24: return ImGuiKey_F24; + default: return ImGuiKey_None; + } +} + +// X11 does not include current pressed/released modifier key in 'mods' flags submitted by GLFW +// See https://github.com/ocornut/imgui/issues/6034 and https://github.com/glfw/glfw/issues/1630 +static void ImGui_ImplGlfw_UpdateKeyModifiers(GLFWwindow* window) +{ + ImGuiIO& io = ImGui::GetIO(); + io.AddKeyEvent(ImGuiMod_Ctrl, (glfwGetKey(window, GLFW_KEY_LEFT_CONTROL) == GLFW_PRESS) || (glfwGetKey(window, GLFW_KEY_RIGHT_CONTROL) == GLFW_PRESS)); + io.AddKeyEvent(ImGuiMod_Shift, (glfwGetKey(window, GLFW_KEY_LEFT_SHIFT) == GLFW_PRESS) || (glfwGetKey(window, GLFW_KEY_RIGHT_SHIFT) == GLFW_PRESS)); + io.AddKeyEvent(ImGuiMod_Alt, (glfwGetKey(window, GLFW_KEY_LEFT_ALT) == GLFW_PRESS) || (glfwGetKey(window, GLFW_KEY_RIGHT_ALT) == GLFW_PRESS)); + io.AddKeyEvent(ImGuiMod_Super, (glfwGetKey(window, GLFW_KEY_LEFT_SUPER) == GLFW_PRESS) || (glfwGetKey(window, GLFW_KEY_RIGHT_SUPER) == GLFW_PRESS)); +} + +static bool ImGui_ImplGlfw_ShouldChainCallback(GLFWwindow* window) +{ + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); + return bd->CallbacksChainForAllWindows ? true : (window == bd->Window); } void ImGui_ImplGlfw_MouseButtonCallback(GLFWwindow* window, int button, int action, int mods) { - if (g_PrevUserCallbackMousebutton != NULL) - g_PrevUserCallbackMousebutton(window, button, action, mods); + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); + if (bd->PrevUserCallbackMousebutton != nullptr && ImGui_ImplGlfw_ShouldChainCallback(window)) + bd->PrevUserCallbackMousebutton(window, button, action, mods); - if (action == GLFW_PRESS && button >= 0 && button < IM_ARRAYSIZE(g_MouseJustPressed)) - g_MouseJustPressed[button] = true; + // Workaround for Linux: ignore mouse up events which are following an focus loss following a viewport creation + if (bd->MouseIgnoreButtonUp && action == GLFW_RELEASE) + return; + + ImGui_ImplGlfw_UpdateKeyModifiers(window); + + ImGuiIO& io = ImGui::GetIO(); + if (button >= 0 && button < ImGuiMouseButton_COUNT) + io.AddMouseButtonEvent(button, action == GLFW_PRESS); } void ImGui_ImplGlfw_ScrollCallback(GLFWwindow* window, double xoffset, double yoffset) { - if (g_PrevUserCallbackScroll != NULL) - g_PrevUserCallbackScroll(window, xoffset, yoffset); + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); + if (bd->PrevUserCallbackScroll != nullptr && ImGui_ImplGlfw_ShouldChainCallback(window)) + bd->PrevUserCallbackScroll(window, xoffset, yoffset); + +#ifdef EMSCRIPTEN_USE_EMBEDDED_GLFW3 + // Ignore GLFW events: will be processed in ImGui_ImplEmscripten_WheelCallback(). + return; +#endif ImGuiIO& io = ImGui::GetIO(); - io.MouseWheelH += (float)xoffset; - io.MouseWheel += (float)yoffset; + io.AddMouseWheelEvent((float)xoffset, (float)yoffset); } -void ImGui_ImplGlfw_KeyCallback(GLFWwindow* window, int key, int scancode, int action, int mods) +// FIXME: should this be baked into ImGui_ImplGlfw_KeyToImGuiKey()? then what about the values passed to io.SetKeyEventNativeData()? +static int ImGui_ImplGlfw_TranslateUntranslatedKey(int key, int scancode) { - if (g_PrevUserCallbackKey != NULL) - g_PrevUserCallbackKey(window, key, scancode, action, mods); +#if GLFW_HAS_GETKEYNAME && !defined(EMSCRIPTEN_USE_EMBEDDED_GLFW3) + // GLFW 3.1+ attempts to "untranslate" keys, which goes the opposite of what every other framework does, making using lettered shortcuts difficult. + // (It had reasons to do so: namely GLFW is/was more likely to be used for WASD-type game controls rather than lettered shortcuts, but IHMO the 3.1 change could have been done differently) + // See https://github.com/glfw/glfw/issues/1502 for details. + // Adding a workaround to undo this (so our keys are translated->untranslated->translated, likely a lossy process). + // This won't cover edge cases but this is at least going to cover common cases. + if (key >= GLFW_KEY_KP_0 && key <= GLFW_KEY_KP_EQUAL) + return key; + GLFWerrorfun prev_error_callback = glfwSetErrorCallback(nullptr); + const char* key_name = glfwGetKeyName(key, scancode); + glfwSetErrorCallback(prev_error_callback); +#if GLFW_HAS_GETERROR && !defined(EMSCRIPTEN_USE_EMBEDDED_GLFW3) // Eat errors (see #5908) + (void)glfwGetError(nullptr); +#endif + if (key_name && key_name[0] != 0 && key_name[1] == 0) + { + const char char_names[] = "`-=[]\\,;\'./"; + const int char_keys[] = { GLFW_KEY_GRAVE_ACCENT, GLFW_KEY_MINUS, GLFW_KEY_EQUAL, GLFW_KEY_LEFT_BRACKET, GLFW_KEY_RIGHT_BRACKET, GLFW_KEY_BACKSLASH, GLFW_KEY_COMMA, GLFW_KEY_SEMICOLON, GLFW_KEY_APOSTROPHE, GLFW_KEY_PERIOD, GLFW_KEY_SLASH, 0 }; + IM_ASSERT(IM_ARRAYSIZE(char_names) == IM_ARRAYSIZE(char_keys)); + if (key_name[0] >= '0' && key_name[0] <= '9') { key = GLFW_KEY_0 + (key_name[0] - '0'); } + else if (key_name[0] >= 'A' && key_name[0] <= 'Z') { key = GLFW_KEY_A + (key_name[0] - 'A'); } + else if (key_name[0] >= 'a' && key_name[0] <= 'z') { key = GLFW_KEY_A + (key_name[0] - 'a'); } + else if (const char* p = strchr(char_names, key_name[0])) { key = char_keys[p - char_names]; } + } + // if (action == GLFW_PRESS) printf("key %d scancode %d name '%s'\n", key, scancode, key_name); +#else + IM_UNUSED(scancode); +#endif + return key; +} + +void ImGui_ImplGlfw_KeyCallback(GLFWwindow* window, int keycode, int scancode, int action, int mods) +{ + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); + if (bd->PrevUserCallbackKey != nullptr && ImGui_ImplGlfw_ShouldChainCallback(window)) + bd->PrevUserCallbackKey(window, keycode, scancode, action, mods); + + if (action != GLFW_PRESS && action != GLFW_RELEASE) + return; + + ImGui_ImplGlfw_UpdateKeyModifiers(window); + + if (keycode >= 0 && keycode < IM_ARRAYSIZE(bd->KeyOwnerWindows)) + bd->KeyOwnerWindows[keycode] = (action == GLFW_PRESS) ? window : nullptr; + + keycode = ImGui_ImplGlfw_TranslateUntranslatedKey(keycode, scancode); ImGuiIO& io = ImGui::GetIO(); - if (action == GLFW_PRESS) - io.KeysDown[key] = true; - if (action == GLFW_RELEASE) - io.KeysDown[key] = false; + ImGuiKey imgui_key = ImGui_ImplGlfw_KeyToImGuiKey(keycode, scancode); + io.AddKeyEvent(imgui_key, (action == GLFW_PRESS)); + io.SetKeyEventNativeData(imgui_key, keycode, scancode); // To support legacy indexing (<1.87 user code) +} - // Modifiers are not reliable across systems - io.KeyCtrl = io.KeysDown[GLFW_KEY_LEFT_CONTROL] || io.KeysDown[GLFW_KEY_RIGHT_CONTROL]; - io.KeyShift = io.KeysDown[GLFW_KEY_LEFT_SHIFT] || io.KeysDown[GLFW_KEY_RIGHT_SHIFT]; - io.KeyAlt = io.KeysDown[GLFW_KEY_LEFT_ALT] || io.KeysDown[GLFW_KEY_RIGHT_ALT]; - io.KeySuper = io.KeysDown[GLFW_KEY_LEFT_SUPER] || io.KeysDown[GLFW_KEY_RIGHT_SUPER]; +void ImGui_ImplGlfw_WindowFocusCallback(GLFWwindow* window, int focused) +{ + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); + if (bd->PrevUserCallbackWindowFocus != nullptr && ImGui_ImplGlfw_ShouldChainCallback(window)) + bd->PrevUserCallbackWindowFocus(window, focused); + + // Workaround for Linux: when losing focus with MouseIgnoreButtonUpWaitForFocusLoss set, we will temporarily ignore subsequent Mouse Up events + bd->MouseIgnoreButtonUp = (bd->MouseIgnoreButtonUpWaitForFocusLoss && focused == 0); + bd->MouseIgnoreButtonUpWaitForFocusLoss = false; + + ImGuiIO& io = ImGui::GetIO(); + io.AddFocusEvent(focused != 0); +} + +void ImGui_ImplGlfw_CursorPosCallback(GLFWwindow* window, double x, double y) +{ + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); + if (bd->PrevUserCallbackCursorPos != nullptr && ImGui_ImplGlfw_ShouldChainCallback(window)) + bd->PrevUserCallbackCursorPos(window, x, y); + + ImGuiIO& io = ImGui::GetIO(); + if (io.ConfigFlags & ImGuiConfigFlags_ViewportsEnable) + { + int window_x, window_y; + glfwGetWindowPos(window, &window_x, &window_y); + x += window_x; + y += window_y; + } + io.AddMousePosEvent((float)x, (float)y); + bd->LastValidMousePos = ImVec2((float)x, (float)y); +} + +// Workaround: X11 seems to send spurious Leave/Enter events which would make us lose our position, +// so we back it up and restore on Leave/Enter (see https://github.com/ocornut/imgui/issues/4984) +void ImGui_ImplGlfw_CursorEnterCallback(GLFWwindow* window, int entered) +{ + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); + if (bd->PrevUserCallbackCursorEnter != nullptr && ImGui_ImplGlfw_ShouldChainCallback(window)) + bd->PrevUserCallbackCursorEnter(window, entered); + + ImGuiIO& io = ImGui::GetIO(); + if (entered) + { + bd->MouseWindow = window; + io.AddMousePosEvent(bd->LastValidMousePos.x, bd->LastValidMousePos.y); + } + else if (!entered && bd->MouseWindow == window) + { + bd->LastValidMousePos = io.MousePos; + bd->MouseWindow = nullptr; + io.AddMousePosEvent(-FLT_MAX, -FLT_MAX); + } } void ImGui_ImplGlfw_CharCallback(GLFWwindow* window, unsigned int c) { - if (g_PrevUserCallbackChar != NULL) - g_PrevUserCallbackChar(window, c); + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); + if (bd->PrevUserCallbackChar != nullptr && ImGui_ImplGlfw_ShouldChainCallback(window)) + bd->PrevUserCallbackChar(window, c); ImGuiIO& io = ImGui::GetIO(); io.AddInputCharacter(c); } -static bool ImGui_ImplGlfw_Init(GLFWwindow* window, bool install_callbacks, GlfwClientApi client_api) +void ImGui_ImplGlfw_MonitorCallback(GLFWmonitor*, int) { - g_Window = window; - g_Time = 0.0; + // This function is technically part of the API even if we stopped using the callback, so leaving it around. +} - // Setup back-end capabilities flags +#ifdef EMSCRIPTEN_USE_EMBEDDED_GLFW3 +static EM_BOOL ImGui_ImplEmscripten_WheelCallback(int, const EmscriptenWheelEvent* ev, void*) +{ + // Mimic Emscripten_HandleWheel() in SDL. + // Corresponding equivalent in GLFW JS emulation layer has incorrect quantizing preventing small values. See #6096 + float multiplier = 0.0f; + if (ev->deltaMode == DOM_DELTA_PIXEL) { multiplier = 1.0f / 100.0f; } // 100 pixels make up a step. + else if (ev->deltaMode == DOM_DELTA_LINE) { multiplier = 1.0f / 3.0f; } // 3 lines make up a step. + else if (ev->deltaMode == DOM_DELTA_PAGE) { multiplier = 80.0f; } // A page makes up 80 steps. + float wheel_x = ev->deltaX * -multiplier; + float wheel_y = ev->deltaY * -multiplier; ImGuiIO& io = ImGui::GetIO(); - io.BackendFlags |= ImGuiBackendFlags_HasMouseCursors; // We can honor GetMouseCursor() values (optional) - io.BackendFlags |= ImGuiBackendFlags_HasSetMousePos; // We can honor io.WantSetMousePos requests (optional, rarely used) - io.BackendPlatformName = "imgui_impl_glfw"; - - // Keyboard mapping. ImGui will use those indices to peek into the io.KeysDown[] array. - io.KeyMap[ImGuiKey_Tab] = GLFW_KEY_TAB; - io.KeyMap[ImGuiKey_LeftArrow] = GLFW_KEY_LEFT; - io.KeyMap[ImGuiKey_RightArrow] = GLFW_KEY_RIGHT; - io.KeyMap[ImGuiKey_UpArrow] = GLFW_KEY_UP; - io.KeyMap[ImGuiKey_DownArrow] = GLFW_KEY_DOWN; - io.KeyMap[ImGuiKey_PageUp] = GLFW_KEY_PAGE_UP; - io.KeyMap[ImGuiKey_PageDown] = GLFW_KEY_PAGE_DOWN; - io.KeyMap[ImGuiKey_Home] = GLFW_KEY_HOME; - io.KeyMap[ImGuiKey_End] = GLFW_KEY_END; - io.KeyMap[ImGuiKey_Insert] = GLFW_KEY_INSERT; - io.KeyMap[ImGuiKey_Delete] = GLFW_KEY_DELETE; - io.KeyMap[ImGuiKey_Backspace] = GLFW_KEY_BACKSPACE; - io.KeyMap[ImGuiKey_Space] = GLFW_KEY_SPACE; - io.KeyMap[ImGuiKey_Enter] = GLFW_KEY_ENTER; - io.KeyMap[ImGuiKey_Escape] = GLFW_KEY_ESCAPE; - io.KeyMap[ImGuiKey_KeyPadEnter] = GLFW_KEY_KP_ENTER; - io.KeyMap[ImGuiKey_A] = GLFW_KEY_A; - io.KeyMap[ImGuiKey_C] = GLFW_KEY_C; - io.KeyMap[ImGuiKey_V] = GLFW_KEY_V; - io.KeyMap[ImGuiKey_X] = GLFW_KEY_X; - io.KeyMap[ImGuiKey_Y] = GLFW_KEY_Y; - io.KeyMap[ImGuiKey_Z] = GLFW_KEY_Z; - - io.SetClipboardTextFn = ImGui_ImplGlfw_SetClipboardText; - io.GetClipboardTextFn = ImGui_ImplGlfw_GetClipboardText; - io.ClipboardUserData = g_Window; -#if defined(_WIN32) - io.ImeWindowHandle = (void*)glfwGetWin32Window(g_Window); + io.AddMouseWheelEvent(wheel_x, wheel_y); + //IMGUI_DEBUG_LOG("[Emsc] mode %d dx: %.2f, dy: %.2f, dz: %.2f --> feed %.2f %.2f\n", (int)ev->deltaMode, ev->deltaX, ev->deltaY, ev->deltaZ, wheel_x, wheel_y); + return EM_TRUE; +} #endif - g_MouseCursors[ImGuiMouseCursor_Arrow] = glfwCreateStandardCursor(GLFW_ARROW_CURSOR); - g_MouseCursors[ImGuiMouseCursor_TextInput] = glfwCreateStandardCursor(GLFW_IBEAM_CURSOR); - g_MouseCursors[ImGuiMouseCursor_ResizeAll] = glfwCreateStandardCursor(GLFW_ARROW_CURSOR); // FIXME: GLFW doesn't have this. - g_MouseCursors[ImGuiMouseCursor_ResizeNS] = glfwCreateStandardCursor(GLFW_VRESIZE_CURSOR); - g_MouseCursors[ImGuiMouseCursor_ResizeEW] = glfwCreateStandardCursor(GLFW_HRESIZE_CURSOR); - g_MouseCursors[ImGuiMouseCursor_ResizeNESW] = glfwCreateStandardCursor(GLFW_ARROW_CURSOR); // FIXME: GLFW doesn't have this. - g_MouseCursors[ImGuiMouseCursor_ResizeNWSE] = glfwCreateStandardCursor(GLFW_ARROW_CURSOR); // FIXME: GLFW doesn't have this. - g_MouseCursors[ImGuiMouseCursor_Hand] = glfwCreateStandardCursor(GLFW_HAND_CURSOR); +#ifdef _WIN32 +static LRESULT CALLBACK ImGui_ImplGlfw_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); +#endif + +void ImGui_ImplGlfw_InstallCallbacks(GLFWwindow* window) +{ + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); + IM_ASSERT(bd->InstalledCallbacks == false && "Callbacks already installed!"); + IM_ASSERT(bd->Window == window); + + bd->PrevUserCallbackWindowFocus = glfwSetWindowFocusCallback(window, ImGui_ImplGlfw_WindowFocusCallback); + bd->PrevUserCallbackCursorEnter = glfwSetCursorEnterCallback(window, ImGui_ImplGlfw_CursorEnterCallback); + bd->PrevUserCallbackCursorPos = glfwSetCursorPosCallback(window, ImGui_ImplGlfw_CursorPosCallback); + bd->PrevUserCallbackMousebutton = glfwSetMouseButtonCallback(window, ImGui_ImplGlfw_MouseButtonCallback); + bd->PrevUserCallbackScroll = glfwSetScrollCallback(window, ImGui_ImplGlfw_ScrollCallback); + bd->PrevUserCallbackKey = glfwSetKeyCallback(window, ImGui_ImplGlfw_KeyCallback); + bd->PrevUserCallbackChar = glfwSetCharCallback(window, ImGui_ImplGlfw_CharCallback); + bd->PrevUserCallbackMonitor = glfwSetMonitorCallback(ImGui_ImplGlfw_MonitorCallback); + bd->InstalledCallbacks = true; +} + +void ImGui_ImplGlfw_RestoreCallbacks(GLFWwindow* window) +{ + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); + IM_ASSERT(bd->InstalledCallbacks == true && "Callbacks not installed!"); + IM_ASSERT(bd->Window == window); + + glfwSetWindowFocusCallback(window, bd->PrevUserCallbackWindowFocus); + glfwSetCursorEnterCallback(window, bd->PrevUserCallbackCursorEnter); + glfwSetCursorPosCallback(window, bd->PrevUserCallbackCursorPos); + glfwSetMouseButtonCallback(window, bd->PrevUserCallbackMousebutton); + glfwSetScrollCallback(window, bd->PrevUserCallbackScroll); + glfwSetKeyCallback(window, bd->PrevUserCallbackKey); + glfwSetCharCallback(window, bd->PrevUserCallbackChar); + glfwSetMonitorCallback(bd->PrevUserCallbackMonitor); + bd->InstalledCallbacks = false; + bd->PrevUserCallbackWindowFocus = nullptr; + bd->PrevUserCallbackCursorEnter = nullptr; + bd->PrevUserCallbackCursorPos = nullptr; + bd->PrevUserCallbackMousebutton = nullptr; + bd->PrevUserCallbackScroll = nullptr; + bd->PrevUserCallbackKey = nullptr; + bd->PrevUserCallbackChar = nullptr; + bd->PrevUserCallbackMonitor = nullptr; +} + +// Set to 'true' to enable chaining installed callbacks for all windows (including secondary viewports created by backends or by user. +// This is 'false' by default meaning we only chain callbacks for the main viewport. +// We cannot set this to 'true' by default because user callbacks code may be not testing the 'window' parameter of their callback. +// If you set this to 'true' your user callback code will need to make sure you are testing the 'window' parameter. +void ImGui_ImplGlfw_SetCallbacksChainForAllWindows(bool chain_for_all_windows) +{ + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); + bd->CallbacksChainForAllWindows = chain_for_all_windows; +} + +#ifdef __EMSCRIPTEN__ +#if EMSCRIPTEN_USE_PORT_CONTRIB_GLFW3 >= 34020240817 +void ImGui_ImplGlfw_EmscriptenOpenURL(const char* url) { if (url) emscripten::glfw3::OpenURL(url); } +#else +EM_JS(void, ImGui_ImplGlfw_EmscriptenOpenURL, (const char* url), { url = url ? UTF8ToString(url) : null; if (url) window.open(url, '_blank'); }); +#endif +#endif + +static bool ImGui_ImplGlfw_Init(GLFWwindow* window, bool install_callbacks, GlfwClientApi client_api) +{ + ImGuiIO& io = ImGui::GetIO(); + IMGUI_CHECKVERSION(); + IM_ASSERT(io.BackendPlatformUserData == nullptr && "Already initialized a platform backend!"); + //printf("GLFW_VERSION: %d.%d.%d (%d)", GLFW_VERSION_MAJOR, GLFW_VERSION_MINOR, GLFW_VERSION_REVISION, GLFW_VERSION_COMBINED); + + // Setup backend capabilities flags + ImGui_ImplGlfw_Data* bd = IM_NEW(ImGui_ImplGlfw_Data)(); + io.BackendPlatformUserData = (void*)bd; + io.BackendPlatformName = "imgui_impl_glfw"; + io.BackendFlags |= ImGuiBackendFlags_HasMouseCursors; // We can honor GetMouseCursor() values (optional) + io.BackendFlags |= ImGuiBackendFlags_HasSetMousePos; // We can honor io.WantSetMousePos requests (optional, rarely used) +#ifndef __EMSCRIPTEN__ + io.BackendFlags |= ImGuiBackendFlags_PlatformHasViewports; // We can create multi-viewports on the Platform side (optional) +#endif +#if GLFW_HAS_MOUSE_PASSTHROUGH || GLFW_HAS_WINDOW_HOVERED + io.BackendFlags |= ImGuiBackendFlags_HasMouseHoveredViewport; // We can call io.AddMouseViewportEvent() with correct data (optional) +#endif + + bd->Window = window; + bd->Time = 0.0; + + ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO(); +#if GLFW_VERSION_COMBINED < 3300 + platform_io.Platform_SetClipboardTextFn = [](ImGuiContext*, const char* text) { glfwSetClipboardString(ImGui_ImplGlfw_GetBackendData()->Window, text); }; + platform_io.Platform_GetClipboardTextFn = [](ImGuiContext*) { return glfwGetClipboardString(ImGui_ImplGlfw_GetBackendData()->Window); }; +#else + platform_io.Platform_SetClipboardTextFn = [](ImGuiContext*, const char* text) { glfwSetClipboardString(nullptr, text); }; + platform_io.Platform_GetClipboardTextFn = [](ImGuiContext*) { return glfwGetClipboardString(nullptr); }; +#endif + +#ifdef __EMSCRIPTEN__ + platform_io.Platform_OpenInShellFn = [](ImGuiContext*, const char* url) { ImGui_ImplGlfw_EmscriptenOpenURL(url); return true; }; +#endif + + // Create mouse cursors + // (By design, on X11 cursors are user configurable and some cursors may be missing. When a cursor doesn't exist, + // GLFW will emit an error which will often be printed by the app, so we temporarily disable error reporting. + // Missing cursors will return nullptr and our _UpdateMouseCursor() function will use the Arrow cursor instead.) + GLFWerrorfun prev_error_callback = glfwSetErrorCallback(nullptr); + bd->MouseCursors[ImGuiMouseCursor_Arrow] = glfwCreateStandardCursor(GLFW_ARROW_CURSOR); + bd->MouseCursors[ImGuiMouseCursor_TextInput] = glfwCreateStandardCursor(GLFW_IBEAM_CURSOR); + bd->MouseCursors[ImGuiMouseCursor_ResizeNS] = glfwCreateStandardCursor(GLFW_VRESIZE_CURSOR); + bd->MouseCursors[ImGuiMouseCursor_ResizeEW] = glfwCreateStandardCursor(GLFW_HRESIZE_CURSOR); + bd->MouseCursors[ImGuiMouseCursor_Hand] = glfwCreateStandardCursor(GLFW_HAND_CURSOR); +#if GLFW_HAS_NEW_CURSORS + bd->MouseCursors[ImGuiMouseCursor_ResizeAll] = glfwCreateStandardCursor(GLFW_RESIZE_ALL_CURSOR); + bd->MouseCursors[ImGuiMouseCursor_ResizeNESW] = glfwCreateStandardCursor(GLFW_RESIZE_NESW_CURSOR); + bd->MouseCursors[ImGuiMouseCursor_ResizeNWSE] = glfwCreateStandardCursor(GLFW_RESIZE_NWSE_CURSOR); + bd->MouseCursors[ImGuiMouseCursor_NotAllowed] = glfwCreateStandardCursor(GLFW_NOT_ALLOWED_CURSOR); +#else + bd->MouseCursors[ImGuiMouseCursor_ResizeAll] = glfwCreateStandardCursor(GLFW_ARROW_CURSOR); + bd->MouseCursors[ImGuiMouseCursor_ResizeNESW] = glfwCreateStandardCursor(GLFW_ARROW_CURSOR); + bd->MouseCursors[ImGuiMouseCursor_ResizeNWSE] = glfwCreateStandardCursor(GLFW_ARROW_CURSOR); + bd->MouseCursors[ImGuiMouseCursor_NotAllowed] = glfwCreateStandardCursor(GLFW_ARROW_CURSOR); +#endif + glfwSetErrorCallback(prev_error_callback); +#if GLFW_HAS_GETERROR && !defined(__EMSCRIPTEN__) // Eat errors (see #5908) + (void)glfwGetError(nullptr); +#endif // Chain GLFW callbacks: our callbacks will call the user's previously installed callbacks, if any. - g_PrevUserCallbackMousebutton = NULL; - g_PrevUserCallbackScroll = NULL; - g_PrevUserCallbackKey = NULL; - g_PrevUserCallbackChar = NULL; if (install_callbacks) - { - g_PrevUserCallbackMousebutton = glfwSetMouseButtonCallback(window, ImGui_ImplGlfw_MouseButtonCallback); - g_PrevUserCallbackScroll = glfwSetScrollCallback(window, ImGui_ImplGlfw_ScrollCallback); - g_PrevUserCallbackKey = glfwSetKeyCallback(window, ImGui_ImplGlfw_KeyCallback); - g_PrevUserCallbackChar = glfwSetCharCallback(window, ImGui_ImplGlfw_CharCallback); - } + ImGui_ImplGlfw_InstallCallbacks(window); - g_ClientApi = client_api; + // Update monitor a first time during init + // (note: monitor callback are broken in GLFW 3.2 and earlier, see github.com/glfw/glfw/issues/784) + ImGui_ImplGlfw_UpdateMonitors(); + glfwSetMonitorCallback(ImGui_ImplGlfw_MonitorCallback); + + // Set platform dependent data in viewport + ImGuiViewport* main_viewport = ImGui::GetMainViewport(); + main_viewport->PlatformHandle = (void*)bd->Window; +#ifdef _WIN32 + main_viewport->PlatformHandleRaw = glfwGetWin32Window(bd->Window); +#elif defined(__APPLE__) + main_viewport->PlatformHandleRaw = (void*)glfwGetCocoaWindow(bd->Window); +#else + IM_UNUSED(main_viewport); +#endif + ImGui_ImplGlfw_InitMultiViewportSupport(); + + // Windows: register a WndProc hook so we can intercept some messages. +#ifdef _WIN32 + bd->PrevWndProc = (WNDPROC)::GetWindowLongPtrW((HWND)main_viewport->PlatformHandleRaw, GWLP_WNDPROC); + IM_ASSERT(bd->PrevWndProc != nullptr); + ::SetWindowLongPtrW((HWND)main_viewport->PlatformHandleRaw, GWLP_WNDPROC, (LONG_PTR)ImGui_ImplGlfw_WndProc); +#endif + + // Emscripten: the same application can run on various platforms, so we detect the Apple platform at runtime + // to override io.ConfigMacOSXBehaviors from its default (which is always false in Emscripten). +#ifdef __EMSCRIPTEN__ +#if EMSCRIPTEN_USE_PORT_CONTRIB_GLFW3 >= 34020240817 + if (emscripten::glfw3::IsRuntimePlatformApple()) + { + ImGui::GetIO().ConfigMacOSXBehaviors = true; + + // Due to how the browser (poorly) handles the Meta Key, this line essentially disables repeats when used. + // This means that Meta + V only registers a single key-press, even if the keys are held. + // This is a compromise for dealing with this issue in ImGui since ImGui implements key repeat itself. + // See https://github.com/pongasoft/emscripten-glfw/blob/v3.4.0.20240817/docs/Usage.md#the-problem-of-the-super-key + emscripten::glfw3::SetSuperPlusKeyTimeouts(10, 10); + } +#endif +#endif + + bd->ClientApi = client_api; return true; } @@ -203,130 +730,731 @@ bool ImGui_ImplGlfw_InitForVulkan(GLFWwindow* window, bool install_callbacks) return ImGui_ImplGlfw_Init(window, install_callbacks, GlfwClientApi_Vulkan); } -void ImGui_ImplGlfw_Shutdown() +bool ImGui_ImplGlfw_InitForOther(GLFWwindow* window, bool install_callbacks) { - for (ImGuiMouseCursor cursor_n = 0; cursor_n < ImGuiMouseCursor_COUNT; cursor_n++) - { - glfwDestroyCursor(g_MouseCursors[cursor_n]); - g_MouseCursors[cursor_n] = NULL; - } - g_ClientApi = GlfwClientApi_Unknown; + return ImGui_ImplGlfw_Init(window, install_callbacks, GlfwClientApi_Unknown); } -static void ImGui_ImplGlfw_UpdateMousePosAndButtons() +void ImGui_ImplGlfw_Shutdown() { - // Update buttons + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); + IM_ASSERT(bd != nullptr && "No platform backend to shutdown, or already shutdown?"); ImGuiIO& io = ImGui::GetIO(); - for (int i = 0; i < IM_ARRAYSIZE(io.MouseDown); i++) + + ImGui_ImplGlfw_ShutdownMultiViewportSupport(); + + if (bd->InstalledCallbacks) + ImGui_ImplGlfw_RestoreCallbacks(bd->Window); +#ifdef EMSCRIPTEN_USE_EMBEDDED_GLFW3 + if (bd->CanvasSelector) + emscripten_set_wheel_callback(bd->CanvasSelector, nullptr, false, nullptr); +#endif + + for (ImGuiMouseCursor cursor_n = 0; cursor_n < ImGuiMouseCursor_COUNT; cursor_n++) + glfwDestroyCursor(bd->MouseCursors[cursor_n]); + + // Windows: restore our WndProc hook +#ifdef _WIN32 + ImGuiViewport* main_viewport = ImGui::GetMainViewport(); + ::SetWindowLongPtrW((HWND)main_viewport->PlatformHandleRaw, GWLP_WNDPROC, (LONG_PTR)bd->PrevWndProc); + bd->PrevWndProc = nullptr; +#endif + + io.BackendPlatformName = nullptr; + io.BackendPlatformUserData = nullptr; + io.BackendFlags &= ~(ImGuiBackendFlags_HasMouseCursors | ImGuiBackendFlags_HasSetMousePos | ImGuiBackendFlags_HasGamepad | ImGuiBackendFlags_PlatformHasViewports | ImGuiBackendFlags_HasMouseHoveredViewport); + IM_DELETE(bd); +} + +static void ImGui_ImplGlfw_UpdateMouseData() +{ + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); + ImGuiIO& io = ImGui::GetIO(); + ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO(); + + ImGuiID mouse_viewport_id = 0; + const ImVec2 mouse_pos_prev = io.MousePos; + for (int n = 0; n < platform_io.Viewports.Size; n++) { - // If a mouse press event came, always pass it as "mouse held this frame", so we don't miss click-release events that are shorter than 1 frame. - io.MouseDown[i] = g_MouseJustPressed[i] || glfwGetMouseButton(g_Window, i) != 0; - g_MouseJustPressed[i] = false; + ImGuiViewport* viewport = platform_io.Viewports[n]; + GLFWwindow* window = (GLFWwindow*)viewport->PlatformHandle; + +#ifdef EMSCRIPTEN_USE_EMBEDDED_GLFW3 + const bool is_window_focused = true; +#else + const bool is_window_focused = glfwGetWindowAttrib(window, GLFW_FOCUSED) != 0; +#endif + if (is_window_focused) + { + // (Optional) Set OS mouse position from Dear ImGui if requested (rarely used, only when io.ConfigNavMoveSetMousePos is enabled by user) + // When multi-viewports are enabled, all Dear ImGui positions are same as OS positions. + if (io.WantSetMousePos) + glfwSetCursorPos(window, (double)(mouse_pos_prev.x - viewport->Pos.x), (double)(mouse_pos_prev.y - viewport->Pos.y)); + + // (Optional) Fallback to provide mouse position when focused (ImGui_ImplGlfw_CursorPosCallback already provides this when hovered or captured) + if (bd->MouseWindow == nullptr) + { + double mouse_x, mouse_y; + glfwGetCursorPos(window, &mouse_x, &mouse_y); + if (io.ConfigFlags & ImGuiConfigFlags_ViewportsEnable) + { + // Single viewport mode: mouse position in client window coordinates (io.MousePos is (0,0) when the mouse is on the upper-left corner of the app window) + // Multi-viewport mode: mouse position in OS absolute coordinates (io.MousePos is (0,0) when the mouse is on the upper-left of the primary monitor) + int window_x, window_y; + glfwGetWindowPos(window, &window_x, &window_y); + mouse_x += window_x; + mouse_y += window_y; + } + bd->LastValidMousePos = ImVec2((float)mouse_x, (float)mouse_y); + io.AddMousePosEvent((float)mouse_x, (float)mouse_y); + } + } + + // (Optional) When using multiple viewports: call io.AddMouseViewportEvent() with the viewport the OS mouse cursor is hovering. + // If ImGuiBackendFlags_HasMouseHoveredViewport is not set by the backend, Dear imGui will ignore this field and infer the information using its flawed heuristic. + // - [X] GLFW >= 3.3 backend ON WINDOWS ONLY does correctly ignore viewports with the _NoInputs flag (since we implement hit via our WndProc hook) + // On other platforms we rely on the library fallbacking to its own search when reporting a viewport with _NoInputs flag. + // - [!] GLFW <= 3.2 backend CANNOT correctly ignore viewports with the _NoInputs flag, and CANNOT reported Hovered Viewport because of mouse capture. + // Some backend are not able to handle that correctly. If a backend report an hovered viewport that has the _NoInputs flag (e.g. when dragging a window + // for docking, the viewport has the _NoInputs flag in order to allow us to find the viewport under), then Dear ImGui is forced to ignore the value reported + // by the backend, and use its flawed heuristic to guess the viewport behind. + // - [X] GLFW backend correctly reports this regardless of another viewport behind focused and dragged from (we need this to find a useful drag and drop target). + // FIXME: This is currently only correct on Win32. See what we do below with the WM_NCHITTEST, missing an equivalent for other systems. + // See https://github.com/glfw/glfw/issues/1236 if you want to help in making this a GLFW feature. +#if GLFW_HAS_MOUSE_PASSTHROUGH + const bool window_no_input = (viewport->Flags & ImGuiViewportFlags_NoInputs) != 0; + glfwSetWindowAttrib(window, GLFW_MOUSE_PASSTHROUGH, window_no_input); +#endif +#if GLFW_HAS_MOUSE_PASSTHROUGH || GLFW_HAS_WINDOW_HOVERED + if (glfwGetWindowAttrib(window, GLFW_HOVERED)) + mouse_viewport_id = viewport->ID; +#else + // We cannot use bd->MouseWindow maintained from CursorEnter/Leave callbacks, because it is locked to the window capturing mouse. +#endif } - // Update mouse position - const ImVec2 mouse_pos_backup = io.MousePos; - io.MousePos = ImVec2(-FLT_MAX, -FLT_MAX); -#ifdef __EMSCRIPTEN__ - const bool focused = true; // Emscripten -#else - const bool focused = glfwGetWindowAttrib(g_Window, GLFW_FOCUSED) != 0; -#endif - if (focused) - { - if (io.WantSetMousePos) - { - glfwSetCursorPos(g_Window, (double)mouse_pos_backup.x, (double)mouse_pos_backup.y); - } - else - { - double mouse_x, mouse_y; - glfwGetCursorPos(g_Window, &mouse_x, &mouse_y); - io.MousePos = ImVec2((float)mouse_x, (float)mouse_y); - } - } + if (io.BackendFlags & ImGuiBackendFlags_HasMouseHoveredViewport) + io.AddMouseViewportEvent(mouse_viewport_id); } static void ImGui_ImplGlfw_UpdateMouseCursor() { ImGuiIO& io = ImGui::GetIO(); - if ((io.ConfigFlags & ImGuiConfigFlags_NoMouseCursorChange) || glfwGetInputMode(g_Window, GLFW_CURSOR) == GLFW_CURSOR_DISABLED) + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); + if ((io.ConfigFlags & ImGuiConfigFlags_NoMouseCursorChange) || glfwGetInputMode(bd->Window, GLFW_CURSOR) == GLFW_CURSOR_DISABLED) return; ImGuiMouseCursor imgui_cursor = ImGui::GetMouseCursor(); - if (imgui_cursor == ImGuiMouseCursor_None || io.MouseDrawCursor) + ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO(); + for (int n = 0; n < platform_io.Viewports.Size; n++) { - // Hide OS mouse cursor if imgui is drawing it or if it wants no cursor - glfwSetInputMode(g_Window, GLFW_CURSOR, GLFW_CURSOR_HIDDEN); - } - else - { - // Show OS mouse cursor - // FIXME-PLATFORM: Unfocused windows seems to fail changing the mouse cursor with GLFW 3.2, but 3.3 works here. - glfwSetCursor(g_Window, g_MouseCursors[imgui_cursor] ? g_MouseCursors[imgui_cursor] : g_MouseCursors[ImGuiMouseCursor_Arrow]); - glfwSetInputMode(g_Window, GLFW_CURSOR, GLFW_CURSOR_NORMAL); + GLFWwindow* window = (GLFWwindow*)platform_io.Viewports[n]->PlatformHandle; + if (imgui_cursor == ImGuiMouseCursor_None || io.MouseDrawCursor) + { + // Hide OS mouse cursor if imgui is drawing it or if it wants no cursor + glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_HIDDEN); + } + else + { + // Show OS mouse cursor + // FIXME-PLATFORM: Unfocused windows seems to fail changing the mouse cursor with GLFW 3.2, but 3.3 works here. + glfwSetCursor(window, bd->MouseCursors[imgui_cursor] ? bd->MouseCursors[imgui_cursor] : bd->MouseCursors[ImGuiMouseCursor_Arrow]); + glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_NORMAL); + } } } +// Update gamepad inputs +static inline float Saturate(float v) { return v < 0.0f ? 0.0f : v > 1.0f ? 1.0f : v; } static void ImGui_ImplGlfw_UpdateGamepads() { ImGuiIO& io = ImGui::GetIO(); - memset(io.NavInputs, 0, sizeof(io.NavInputs)); - if ((io.ConfigFlags & ImGuiConfigFlags_NavEnableGamepad) == 0) + if ((io.ConfigFlags & ImGuiConfigFlags_NavEnableGamepad) == 0) // FIXME: Technically feeding gamepad shouldn't depend on this now that they are regular inputs. return; - // Update gamepad inputs - #define MAP_BUTTON(NAV_NO, BUTTON_NO) { if (buttons_count > BUTTON_NO && buttons[BUTTON_NO] == GLFW_PRESS) io.NavInputs[NAV_NO] = 1.0f; } - #define MAP_ANALOG(NAV_NO, AXIS_NO, V0, V1) { float v = (axes_count > AXIS_NO) ? axes[AXIS_NO] : V0; v = (v - V0) / (V1 - V0); if (v > 1.0f) v = 1.0f; if (io.NavInputs[NAV_NO] < v) io.NavInputs[NAV_NO] = v; } + io.BackendFlags &= ~ImGuiBackendFlags_HasGamepad; +#if GLFW_HAS_GAMEPAD_API && !defined(EMSCRIPTEN_USE_EMBEDDED_GLFW3) + GLFWgamepadstate gamepad; + if (!glfwGetGamepadState(GLFW_JOYSTICK_1, &gamepad)) + return; + #define MAP_BUTTON(KEY_NO, BUTTON_NO, _UNUSED) do { io.AddKeyEvent(KEY_NO, gamepad.buttons[BUTTON_NO] != 0); } while (0) + #define MAP_ANALOG(KEY_NO, AXIS_NO, _UNUSED, V0, V1) do { float v = gamepad.axes[AXIS_NO]; v = (v - V0) / (V1 - V0); io.AddKeyAnalogEvent(KEY_NO, v > 0.10f, Saturate(v)); } while (0) +#else int axes_count = 0, buttons_count = 0; const float* axes = glfwGetJoystickAxes(GLFW_JOYSTICK_1, &axes_count); const unsigned char* buttons = glfwGetJoystickButtons(GLFW_JOYSTICK_1, &buttons_count); - MAP_BUTTON(ImGuiNavInput_Activate, 0); // Cross / A - MAP_BUTTON(ImGuiNavInput_Cancel, 1); // Circle / B - MAP_BUTTON(ImGuiNavInput_Menu, 2); // Square / X - MAP_BUTTON(ImGuiNavInput_Input, 3); // Triangle / Y - MAP_BUTTON(ImGuiNavInput_DpadLeft, 13); // D-Pad Left - MAP_BUTTON(ImGuiNavInput_DpadRight, 11); // D-Pad Right - MAP_BUTTON(ImGuiNavInput_DpadUp, 10); // D-Pad Up - MAP_BUTTON(ImGuiNavInput_DpadDown, 12); // D-Pad Down - MAP_BUTTON(ImGuiNavInput_FocusPrev, 4); // L1 / LB - MAP_BUTTON(ImGuiNavInput_FocusNext, 5); // R1 / RB - MAP_BUTTON(ImGuiNavInput_TweakSlow, 4); // L1 / LB - MAP_BUTTON(ImGuiNavInput_TweakFast, 5); // R1 / RB - MAP_ANALOG(ImGuiNavInput_LStickLeft, 0, -0.3f, -0.9f); - MAP_ANALOG(ImGuiNavInput_LStickRight,0, +0.3f, +0.9f); - MAP_ANALOG(ImGuiNavInput_LStickUp, 1, +0.3f, +0.9f); - MAP_ANALOG(ImGuiNavInput_LStickDown, 1, -0.3f, -0.9f); + if (axes_count == 0 || buttons_count == 0) + return; + #define MAP_BUTTON(KEY_NO, _UNUSED, BUTTON_NO) do { io.AddKeyEvent(KEY_NO, (buttons_count > BUTTON_NO && buttons[BUTTON_NO] == GLFW_PRESS)); } while (0) + #define MAP_ANALOG(KEY_NO, _UNUSED, AXIS_NO, V0, V1) do { float v = (axes_count > AXIS_NO) ? axes[AXIS_NO] : V0; v = (v - V0) / (V1 - V0); io.AddKeyAnalogEvent(KEY_NO, v > 0.10f, Saturate(v)); } while (0) +#endif + io.BackendFlags |= ImGuiBackendFlags_HasGamepad; + MAP_BUTTON(ImGuiKey_GamepadStart, GLFW_GAMEPAD_BUTTON_START, 7); + MAP_BUTTON(ImGuiKey_GamepadBack, GLFW_GAMEPAD_BUTTON_BACK, 6); + MAP_BUTTON(ImGuiKey_GamepadFaceLeft, GLFW_GAMEPAD_BUTTON_X, 2); // Xbox X, PS Square + MAP_BUTTON(ImGuiKey_GamepadFaceRight, GLFW_GAMEPAD_BUTTON_B, 1); // Xbox B, PS Circle + MAP_BUTTON(ImGuiKey_GamepadFaceUp, GLFW_GAMEPAD_BUTTON_Y, 3); // Xbox Y, PS Triangle + MAP_BUTTON(ImGuiKey_GamepadFaceDown, GLFW_GAMEPAD_BUTTON_A, 0); // Xbox A, PS Cross + MAP_BUTTON(ImGuiKey_GamepadDpadLeft, GLFW_GAMEPAD_BUTTON_DPAD_LEFT, 13); + MAP_BUTTON(ImGuiKey_GamepadDpadRight, GLFW_GAMEPAD_BUTTON_DPAD_RIGHT, 11); + MAP_BUTTON(ImGuiKey_GamepadDpadUp, GLFW_GAMEPAD_BUTTON_DPAD_UP, 10); + MAP_BUTTON(ImGuiKey_GamepadDpadDown, GLFW_GAMEPAD_BUTTON_DPAD_DOWN, 12); + MAP_BUTTON(ImGuiKey_GamepadL1, GLFW_GAMEPAD_BUTTON_LEFT_BUMPER, 4); + MAP_BUTTON(ImGuiKey_GamepadR1, GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER, 5); + MAP_ANALOG(ImGuiKey_GamepadL2, GLFW_GAMEPAD_AXIS_LEFT_TRIGGER, 4, -0.75f, +1.0f); + MAP_ANALOG(ImGuiKey_GamepadR2, GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER, 5, -0.75f, +1.0f); + MAP_BUTTON(ImGuiKey_GamepadL3, GLFW_GAMEPAD_BUTTON_LEFT_THUMB, 8); + MAP_BUTTON(ImGuiKey_GamepadR3, GLFW_GAMEPAD_BUTTON_RIGHT_THUMB, 9); + MAP_ANALOG(ImGuiKey_GamepadLStickLeft, GLFW_GAMEPAD_AXIS_LEFT_X, 0, -0.25f, -1.0f); + MAP_ANALOG(ImGuiKey_GamepadLStickRight, GLFW_GAMEPAD_AXIS_LEFT_X, 0, +0.25f, +1.0f); + MAP_ANALOG(ImGuiKey_GamepadLStickUp, GLFW_GAMEPAD_AXIS_LEFT_Y, 1, -0.25f, -1.0f); + MAP_ANALOG(ImGuiKey_GamepadLStickDown, GLFW_GAMEPAD_AXIS_LEFT_Y, 1, +0.25f, +1.0f); + MAP_ANALOG(ImGuiKey_GamepadRStickLeft, GLFW_GAMEPAD_AXIS_RIGHT_X, 2, -0.25f, -1.0f); + MAP_ANALOG(ImGuiKey_GamepadRStickRight, GLFW_GAMEPAD_AXIS_RIGHT_X, 2, +0.25f, +1.0f); + MAP_ANALOG(ImGuiKey_GamepadRStickUp, GLFW_GAMEPAD_AXIS_RIGHT_Y, 3, -0.25f, -1.0f); + MAP_ANALOG(ImGuiKey_GamepadRStickDown, GLFW_GAMEPAD_AXIS_RIGHT_Y, 3, +0.25f, +1.0f); #undef MAP_BUTTON #undef MAP_ANALOG - if (axes_count > 0 && buttons_count > 0) - io.BackendFlags |= ImGuiBackendFlags_HasGamepad; - else - io.BackendFlags &= ~ImGuiBackendFlags_HasGamepad; +} + +static void ImGui_ImplGlfw_UpdateMonitors() +{ + ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO(); + + int monitors_count = 0; + GLFWmonitor** glfw_monitors = glfwGetMonitors(&monitors_count); + if (monitors_count == 0) // Preserve existing monitor list if there are none. Happens on macOS sleeping (#5683) + return; + + platform_io.Monitors.resize(0); + for (int n = 0; n < monitors_count; n++) + { + ImGuiPlatformMonitor monitor; + int x, y; + glfwGetMonitorPos(glfw_monitors[n], &x, &y); + const GLFWvidmode* vid_mode = glfwGetVideoMode(glfw_monitors[n]); + if (vid_mode == nullptr) + continue; // Failed to get Video mode (e.g. Emscripten does not support this function) + monitor.MainPos = monitor.WorkPos = ImVec2((float)x, (float)y); + monitor.MainSize = monitor.WorkSize = ImVec2((float)vid_mode->width, (float)vid_mode->height); +#if GLFW_HAS_MONITOR_WORK_AREA + int w, h; + glfwGetMonitorWorkarea(glfw_monitors[n], &x, &y, &w, &h); + if (w > 0 && h > 0) // Workaround a small GLFW issue reporting zero on monitor changes: https://github.com/glfw/glfw/pull/1761 + { + monitor.WorkPos = ImVec2((float)x, (float)y); + monitor.WorkSize = ImVec2((float)w, (float)h); + } +#endif +#if GLFW_HAS_PER_MONITOR_DPI + // Warning: the validity of monitor DPI information on Windows depends on the application DPI awareness settings, which generally needs to be set in the manifest or at runtime. + float x_scale, y_scale; + glfwGetMonitorContentScale(glfw_monitors[n], &x_scale, &y_scale); + if (x_scale == 0.0f) + continue; // Some accessibility applications are declaring virtual monitors with a DPI of 0, see #7902. + monitor.DpiScale = x_scale; +#endif + monitor.PlatformHandle = (void*)glfw_monitors[n]; // [...] GLFW doc states: "guaranteed to be valid only until the monitor configuration changes" + platform_io.Monitors.push_back(monitor); + } } void ImGui_ImplGlfw_NewFrame() { ImGuiIO& io = ImGui::GetIO(); - IM_ASSERT(io.Fonts->IsBuilt() && "Font atlas not built! It is generally built by the renderer back-end. Missing call to renderer _NewFrame() function? e.g. ImGui_ImplOpenGL3_NewFrame()."); + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); + IM_ASSERT(bd != nullptr && "Context or backend not initialized! Did you call ImGui_ImplGlfw_InitForXXX()?"); // Setup display size (every frame to accommodate for window resizing) int w, h; int display_w, display_h; - glfwGetWindowSize(g_Window, &w, &h); - glfwGetFramebufferSize(g_Window, &display_w, &display_h); + glfwGetWindowSize(bd->Window, &w, &h); + glfwGetFramebufferSize(bd->Window, &display_w, &display_h); io.DisplaySize = ImVec2((float)w, (float)h); if (w > 0 && h > 0) - io.DisplayFramebufferScale = ImVec2((float)display_w / w, (float)display_h / h); + io.DisplayFramebufferScale = ImVec2((float)display_w / (float)w, (float)display_h / (float)h); + ImGui_ImplGlfw_UpdateMonitors(); // Setup time step + // (Accept glfwGetTime() not returning a monotonically increasing value. Seems to happens on disconnecting peripherals and probably on VMs and Emscripten, see #6491, #6189, #6114, #3644) double current_time = glfwGetTime(); - io.DeltaTime = g_Time > 0.0 ? (float)(current_time - g_Time) : (float)(1.0f/60.0f); - g_Time = current_time; + if (current_time <= bd->Time) + current_time = bd->Time + 0.00001f; + io.DeltaTime = bd->Time > 0.0 ? (float)(current_time - bd->Time) : (float)(1.0f / 60.0f); + bd->Time = current_time; - ImGui_ImplGlfw_UpdateMousePosAndButtons(); + bd->MouseIgnoreButtonUp = false; + ImGui_ImplGlfw_UpdateMouseData(); ImGui_ImplGlfw_UpdateMouseCursor(); // Update game controllers (if enabled and available) ImGui_ImplGlfw_UpdateGamepads(); } + +// GLFW doesn't provide a portable sleep function +void ImGui_ImplGlfw_Sleep(int milliseconds) +{ +#ifdef _WIN32 + ::Sleep(milliseconds); +#else + usleep(milliseconds * 1000); +#endif +} + +#ifdef EMSCRIPTEN_USE_EMBEDDED_GLFW3 +static EM_BOOL ImGui_ImplGlfw_OnCanvasSizeChange(int event_type, const EmscriptenUiEvent* event, void* user_data) +{ + ImGui_ImplGlfw_Data* bd = (ImGui_ImplGlfw_Data*)user_data; + double canvas_width, canvas_height; + emscripten_get_element_css_size(bd->CanvasSelector, &canvas_width, &canvas_height); + glfwSetWindowSize(bd->Window, (int)canvas_width, (int)canvas_height); + return true; +} + +static EM_BOOL ImGui_ImplEmscripten_FullscreenChangeCallback(int event_type, const EmscriptenFullscreenChangeEvent* event, void* user_data) +{ + ImGui_ImplGlfw_Data* bd = (ImGui_ImplGlfw_Data*)user_data; + double canvas_width, canvas_height; + emscripten_get_element_css_size(bd->CanvasSelector, &canvas_width, &canvas_height); + glfwSetWindowSize(bd->Window, (int)canvas_width, (int)canvas_height); + return true; +} + +// 'canvas_selector' is a CSS selector. The event listener is applied to the first element that matches the query. +// STRING MUST PERSIST FOR THE APPLICATION DURATION. PLEASE USE A STRING LITERAL OR ENSURE POINTER WILL STAY VALID. +void ImGui_ImplGlfw_InstallEmscriptenCallbacks(GLFWwindow*, const char* canvas_selector) +{ + IM_ASSERT(canvas_selector != nullptr); + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); + IM_ASSERT(bd != nullptr && "Context or backend not initialized! Did you call ImGui_ImplGlfw_InitForXXX()?"); + + bd->CanvasSelector = canvas_selector; + emscripten_set_resize_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, bd, false, ImGui_ImplGlfw_OnCanvasSizeChange); + emscripten_set_fullscreenchange_callback(EMSCRIPTEN_EVENT_TARGET_DOCUMENT, bd, false, ImGui_ImplEmscripten_FullscreenChangeCallback); + + // Change the size of the GLFW window according to the size of the canvas + ImGui_ImplGlfw_OnCanvasSizeChange(EMSCRIPTEN_EVENT_RESIZE, {}, bd); + + // Register Emscripten Wheel callback to workaround issue in Emscripten GLFW Emulation (#6096) + // We intentionally do not check 'if (install_callbacks)' here, as some users may set it to false and call GLFW callback themselves. + // FIXME: May break chaining in case user registered their own Emscripten callback? + emscripten_set_wheel_callback(bd->CanvasSelector, nullptr, false, ImGui_ImplEmscripten_WheelCallback); +} +#elif defined(EMSCRIPTEN_USE_PORT_CONTRIB_GLFW3) +// When using --use-port=contrib.glfw3 for the GLFW implementation, you can override the behavior of this call +// by invoking emscripten_glfw_make_canvas_resizable afterward. +// See https://github.com/pongasoft/emscripten-glfw/blob/master/docs/Usage.md#how-to-make-the-canvas-resizable-by-the-user for an explanation +void ImGui_ImplGlfw_InstallEmscriptenCallbacks(GLFWwindow* window, const char* canvas_selector) +{ + GLFWwindow* w = (GLFWwindow*)(EM_ASM_INT({ return Module.glfwGetWindow(UTF8ToString($0)); }, canvas_selector)); + IM_ASSERT(window == w); // Sanity check + IM_UNUSED(w); + emscripten_glfw_make_canvas_resizable(window, "window", nullptr); +} +#endif // #ifdef EMSCRIPTEN_USE_PORT_CONTRIB_GLFW3 + + +//-------------------------------------------------------------------------------------------------------- +// MULTI-VIEWPORT / PLATFORM INTERFACE SUPPORT +// This is an _advanced_ and _optional_ feature, allowing the backend to create and handle multiple viewports simultaneously. +// If you are new to dear imgui or creating a new binding for dear imgui, it is recommended that you completely ignore this section first.. +//-------------------------------------------------------------------------------------------------------- + +// Helper structure we store in the void* PlatformUserData field of each ImGuiViewport to easily retrieve our backend data. +struct ImGui_ImplGlfw_ViewportData +{ + GLFWwindow* Window; // Stored in ImGuiViewport::PlatformHandle + bool WindowOwned; + int IgnoreWindowPosEventFrame; + int IgnoreWindowSizeEventFrame; +#ifdef _WIN32 + WNDPROC PrevWndProc; +#endif + + ImGui_ImplGlfw_ViewportData() { memset((void*)this, 0, sizeof(*this)); IgnoreWindowSizeEventFrame = IgnoreWindowPosEventFrame = -1; } + ~ImGui_ImplGlfw_ViewportData() { IM_ASSERT(Window == nullptr); } +}; + +static void ImGui_ImplGlfw_WindowCloseCallback(GLFWwindow* window) +{ + if (ImGuiViewport* viewport = ImGui::FindViewportByPlatformHandle(window)) + viewport->PlatformRequestClose = true; +} + +// GLFW may dispatch window pos/size events after calling glfwSetWindowPos()/glfwSetWindowSize(). +// However: depending on the platform the callback may be invoked at different time: +// - on Windows it appears to be called within the glfwSetWindowPos()/glfwSetWindowSize() call +// - on Linux it is queued and invoked during glfwPollEvents() +// Because the event doesn't always fire on glfwSetWindowXXX() we use a frame counter tag to only +// ignore recent glfwSetWindowXXX() calls. +static void ImGui_ImplGlfw_WindowPosCallback(GLFWwindow* window, int, int) +{ + if (ImGuiViewport* viewport = ImGui::FindViewportByPlatformHandle(window)) + { + if (ImGui_ImplGlfw_ViewportData* vd = (ImGui_ImplGlfw_ViewportData*)viewport->PlatformUserData) + { + bool ignore_event = (ImGui::GetFrameCount() <= vd->IgnoreWindowPosEventFrame + 1); + //data->IgnoreWindowPosEventFrame = -1; + if (ignore_event) + return; + } + viewport->PlatformRequestMove = true; + } +} + +static void ImGui_ImplGlfw_WindowSizeCallback(GLFWwindow* window, int, int) +{ + if (ImGuiViewport* viewport = ImGui::FindViewportByPlatformHandle(window)) + { + if (ImGui_ImplGlfw_ViewportData* vd = (ImGui_ImplGlfw_ViewportData*)viewport->PlatformUserData) + { + bool ignore_event = (ImGui::GetFrameCount() <= vd->IgnoreWindowSizeEventFrame + 1); + //data->IgnoreWindowSizeEventFrame = -1; + if (ignore_event) + return; + } + viewport->PlatformRequestResize = true; + } +} + +static void ImGui_ImplGlfw_CreateWindow(ImGuiViewport* viewport) +{ + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); + ImGui_ImplGlfw_ViewportData* vd = IM_NEW(ImGui_ImplGlfw_ViewportData)(); + viewport->PlatformUserData = vd; + + // Workaround for Linux: ignore mouse up events corresponding to losing focus of the previously focused window (#7733, #3158, #7922) +#ifdef __linux__ + bd->MouseIgnoreButtonUpWaitForFocusLoss = true; +#endif + + // GLFW 3.2 unfortunately always set focus on glfwCreateWindow() if GLFW_VISIBLE is set, regardless of GLFW_FOCUSED + // With GLFW 3.3, the hint GLFW_FOCUS_ON_SHOW fixes this problem + glfwWindowHint(GLFW_VISIBLE, false); + glfwWindowHint(GLFW_FOCUSED, false); +#if GLFW_HAS_FOCUS_ON_SHOW + glfwWindowHint(GLFW_FOCUS_ON_SHOW, false); + #endif + glfwWindowHint(GLFW_DECORATED, (viewport->Flags & ImGuiViewportFlags_NoDecoration) ? false : true); +#if GLFW_HAS_WINDOW_TOPMOST + glfwWindowHint(GLFW_FLOATING, (viewport->Flags & ImGuiViewportFlags_TopMost) ? true : false); +#endif + GLFWwindow* share_window = (bd->ClientApi == GlfwClientApi_OpenGL) ? bd->Window : nullptr; + vd->Window = glfwCreateWindow((int)viewport->Size.x, (int)viewport->Size.y, "No Title Yet", nullptr, share_window); + vd->WindowOwned = true; + viewport->PlatformHandle = (void*)vd->Window; +#ifdef _WIN32 + viewport->PlatformHandleRaw = glfwGetWin32Window(vd->Window); +#elif defined(__APPLE__) + viewport->PlatformHandleRaw = (void*)glfwGetCocoaWindow(vd->Window); +#endif + glfwSetWindowPos(vd->Window, (int)viewport->Pos.x, (int)viewport->Pos.y); + + // Install GLFW callbacks for secondary viewports + glfwSetWindowFocusCallback(vd->Window, ImGui_ImplGlfw_WindowFocusCallback); + glfwSetCursorEnterCallback(vd->Window, ImGui_ImplGlfw_CursorEnterCallback); + glfwSetCursorPosCallback(vd->Window, ImGui_ImplGlfw_CursorPosCallback); + glfwSetMouseButtonCallback(vd->Window, ImGui_ImplGlfw_MouseButtonCallback); + glfwSetScrollCallback(vd->Window, ImGui_ImplGlfw_ScrollCallback); + glfwSetKeyCallback(vd->Window, ImGui_ImplGlfw_KeyCallback); + glfwSetCharCallback(vd->Window, ImGui_ImplGlfw_CharCallback); + glfwSetWindowCloseCallback(vd->Window, ImGui_ImplGlfw_WindowCloseCallback); + glfwSetWindowPosCallback(vd->Window, ImGui_ImplGlfw_WindowPosCallback); + glfwSetWindowSizeCallback(vd->Window, ImGui_ImplGlfw_WindowSizeCallback); + if (bd->ClientApi == GlfwClientApi_OpenGL) + { + glfwMakeContextCurrent(vd->Window); + glfwSwapInterval(0); + } +} + +static void ImGui_ImplGlfw_DestroyWindow(ImGuiViewport* viewport) +{ + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); + if (ImGui_ImplGlfw_ViewportData* vd = (ImGui_ImplGlfw_ViewportData*)viewport->PlatformUserData) + { + if (vd->WindowOwned) + { +#if !GLFW_HAS_MOUSE_PASSTHROUGH && GLFW_HAS_WINDOW_HOVERED && defined(_WIN32) + HWND hwnd = (HWND)viewport->PlatformHandleRaw; + ::RemovePropA(hwnd, "IMGUI_VIEWPORT"); +#endif + + // Release any keys that were pressed in the window being destroyed and are still held down, + // because we will not receive any release events after window is destroyed. + for (int i = 0; i < IM_ARRAYSIZE(bd->KeyOwnerWindows); i++) + if (bd->KeyOwnerWindows[i] == vd->Window) + ImGui_ImplGlfw_KeyCallback(vd->Window, i, 0, GLFW_RELEASE, 0); // Later params are only used for main viewport, on which this function is never called. + + glfwDestroyWindow(vd->Window); + } + vd->Window = nullptr; + IM_DELETE(vd); + } + viewport->PlatformUserData = viewport->PlatformHandle = nullptr; +} + +static void ImGui_ImplGlfw_ShowWindow(ImGuiViewport* viewport) +{ + ImGui_ImplGlfw_ViewportData* vd = (ImGui_ImplGlfw_ViewportData*)viewport->PlatformUserData; + +#if defined(_WIN32) + // GLFW hack: Hide icon from task bar + HWND hwnd = (HWND)viewport->PlatformHandleRaw; + if (viewport->Flags & ImGuiViewportFlags_NoTaskBarIcon) + { + LONG ex_style = ::GetWindowLong(hwnd, GWL_EXSTYLE); + ex_style &= ~WS_EX_APPWINDOW; + ex_style |= WS_EX_TOOLWINDOW; + ::SetWindowLong(hwnd, GWL_EXSTYLE, ex_style); + } + + // GLFW hack: install hook for WM_NCHITTEST message handler +#if !GLFW_HAS_MOUSE_PASSTHROUGH && GLFW_HAS_WINDOW_HOVERED && defined(_WIN32) + ::SetPropA(hwnd, "IMGUI_VIEWPORT", viewport); + vd->PrevWndProc = (WNDPROC)::GetWindowLongPtrW(hwnd, GWLP_WNDPROC); + ::SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)ImGui_ImplGlfw_WndProc); +#endif + +#if !GLFW_HAS_FOCUS_ON_SHOW + // GLFW hack: GLFW 3.2 has a bug where glfwShowWindow() also activates/focus the window. + // The fix was pushed to GLFW repository on 2018/01/09 and should be included in GLFW 3.3 via a GLFW_FOCUS_ON_SHOW window attribute. + // See https://github.com/glfw/glfw/issues/1189 + // FIXME-VIEWPORT: Implement same work-around for Linux/OSX in the meanwhile. + if (viewport->Flags & ImGuiViewportFlags_NoFocusOnAppearing) + { + ::ShowWindow(hwnd, SW_SHOWNA); + return; + } +#endif +#endif + + glfwShowWindow(vd->Window); +} + +static ImVec2 ImGui_ImplGlfw_GetWindowPos(ImGuiViewport* viewport) +{ + ImGui_ImplGlfw_ViewportData* vd = (ImGui_ImplGlfw_ViewportData*)viewport->PlatformUserData; + int x = 0, y = 0; + glfwGetWindowPos(vd->Window, &x, &y); + return ImVec2((float)x, (float)y); +} + +static void ImGui_ImplGlfw_SetWindowPos(ImGuiViewport* viewport, ImVec2 pos) +{ + ImGui_ImplGlfw_ViewportData* vd = (ImGui_ImplGlfw_ViewportData*)viewport->PlatformUserData; + vd->IgnoreWindowPosEventFrame = ImGui::GetFrameCount(); + glfwSetWindowPos(vd->Window, (int)pos.x, (int)pos.y); +} + +static ImVec2 ImGui_ImplGlfw_GetWindowSize(ImGuiViewport* viewport) +{ + ImGui_ImplGlfw_ViewportData* vd = (ImGui_ImplGlfw_ViewportData*)viewport->PlatformUserData; + int w = 0, h = 0; + glfwGetWindowSize(vd->Window, &w, &h); + return ImVec2((float)w, (float)h); +} + +static void ImGui_ImplGlfw_SetWindowSize(ImGuiViewport* viewport, ImVec2 size) +{ + ImGui_ImplGlfw_ViewportData* vd = (ImGui_ImplGlfw_ViewportData*)viewport->PlatformUserData; +#if __APPLE__ && !GLFW_HAS_OSX_WINDOW_POS_FIX + // Native OS windows are positioned from the bottom-left corner on macOS, whereas on other platforms they are + // positioned from the upper-left corner. GLFW makes an effort to convert macOS style coordinates, however it + // doesn't handle it when changing size. We are manually moving the window in order for changes of size to be based + // on the upper-left corner. + int x, y, width, height; + glfwGetWindowPos(vd->Window, &x, &y); + glfwGetWindowSize(vd->Window, &width, &height); + glfwSetWindowPos(vd->Window, x, y - height + size.y); +#endif + vd->IgnoreWindowSizeEventFrame = ImGui::GetFrameCount(); + glfwSetWindowSize(vd->Window, (int)size.x, (int)size.y); +} + +static void ImGui_ImplGlfw_SetWindowTitle(ImGuiViewport* viewport, const char* title) +{ + ImGui_ImplGlfw_ViewportData* vd = (ImGui_ImplGlfw_ViewportData*)viewport->PlatformUserData; + glfwSetWindowTitle(vd->Window, title); +} + +static void ImGui_ImplGlfw_SetWindowFocus(ImGuiViewport* viewport) +{ +#if GLFW_HAS_FOCUS_WINDOW + ImGui_ImplGlfw_ViewportData* vd = (ImGui_ImplGlfw_ViewportData*)viewport->PlatformUserData; + glfwFocusWindow(vd->Window); +#else + // FIXME: What are the effect of not having this function? At the moment imgui doesn't actually call SetWindowFocus - we set that up ahead, will answer that question later. + (void)viewport; +#endif +} + +static bool ImGui_ImplGlfw_GetWindowFocus(ImGuiViewport* viewport) +{ + ImGui_ImplGlfw_ViewportData* vd = (ImGui_ImplGlfw_ViewportData*)viewport->PlatformUserData; + return glfwGetWindowAttrib(vd->Window, GLFW_FOCUSED) != 0; +} + +static bool ImGui_ImplGlfw_GetWindowMinimized(ImGuiViewport* viewport) +{ + ImGui_ImplGlfw_ViewportData* vd = (ImGui_ImplGlfw_ViewportData*)viewport->PlatformUserData; + return glfwGetWindowAttrib(vd->Window, GLFW_ICONIFIED) != 0; +} + +#if GLFW_HAS_WINDOW_ALPHA +static void ImGui_ImplGlfw_SetWindowAlpha(ImGuiViewport* viewport, float alpha) +{ + ImGui_ImplGlfw_ViewportData* vd = (ImGui_ImplGlfw_ViewportData*)viewport->PlatformUserData; + glfwSetWindowOpacity(vd->Window, alpha); +} +#endif + +static void ImGui_ImplGlfw_RenderWindow(ImGuiViewport* viewport, void*) +{ + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); + ImGui_ImplGlfw_ViewportData* vd = (ImGui_ImplGlfw_ViewportData*)viewport->PlatformUserData; + if (bd->ClientApi == GlfwClientApi_OpenGL) + glfwMakeContextCurrent(vd->Window); +} + +static void ImGui_ImplGlfw_SwapBuffers(ImGuiViewport* viewport, void*) +{ + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); + ImGui_ImplGlfw_ViewportData* vd = (ImGui_ImplGlfw_ViewportData*)viewport->PlatformUserData; + if (bd->ClientApi == GlfwClientApi_OpenGL) + { + glfwMakeContextCurrent(vd->Window); + glfwSwapBuffers(vd->Window); + } +} + +//-------------------------------------------------------------------------------------------------------- +// Vulkan support (the Vulkan renderer needs to call a platform-side support function to create the surface) +//-------------------------------------------------------------------------------------------------------- + +// Avoid including so we can build without it +#if GLFW_HAS_VULKAN +#ifndef VULKAN_H_ +#define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; +#if defined(__LP64__) || defined(_WIN64) || defined(__x86_64__) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__) +#define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef struct object##_T *object; +#else +#define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object; +#endif +VK_DEFINE_HANDLE(VkInstance) +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSurfaceKHR) +struct VkAllocationCallbacks; +enum VkResult { VK_RESULT_MAX_ENUM = 0x7FFFFFFF }; +#endif // VULKAN_H_ +extern "C" { extern GLFWAPI VkResult glfwCreateWindowSurface(VkInstance instance, GLFWwindow* window, const VkAllocationCallbacks* allocator, VkSurfaceKHR* surface); } +static int ImGui_ImplGlfw_CreateVkSurface(ImGuiViewport* viewport, ImU64 vk_instance, const void* vk_allocator, ImU64* out_vk_surface) +{ + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); + ImGui_ImplGlfw_ViewportData* vd = (ImGui_ImplGlfw_ViewportData*)viewport->PlatformUserData; + IM_UNUSED(bd); + IM_ASSERT(bd->ClientApi == GlfwClientApi_Vulkan); + VkResult err = glfwCreateWindowSurface((VkInstance)vk_instance, vd->Window, (const VkAllocationCallbacks*)vk_allocator, (VkSurfaceKHR*)out_vk_surface); + return (int)err; +} +#endif // GLFW_HAS_VULKAN + +static void ImGui_ImplGlfw_InitMultiViewportSupport() +{ + // Register platform interface (will be coupled with a renderer interface) + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); + ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO(); + platform_io.Platform_CreateWindow = ImGui_ImplGlfw_CreateWindow; + platform_io.Platform_DestroyWindow = ImGui_ImplGlfw_DestroyWindow; + platform_io.Platform_ShowWindow = ImGui_ImplGlfw_ShowWindow; + platform_io.Platform_SetWindowPos = ImGui_ImplGlfw_SetWindowPos; + platform_io.Platform_GetWindowPos = ImGui_ImplGlfw_GetWindowPos; + platform_io.Platform_SetWindowSize = ImGui_ImplGlfw_SetWindowSize; + platform_io.Platform_GetWindowSize = ImGui_ImplGlfw_GetWindowSize; + platform_io.Platform_SetWindowFocus = ImGui_ImplGlfw_SetWindowFocus; + platform_io.Platform_GetWindowFocus = ImGui_ImplGlfw_GetWindowFocus; + platform_io.Platform_GetWindowMinimized = ImGui_ImplGlfw_GetWindowMinimized; + platform_io.Platform_SetWindowTitle = ImGui_ImplGlfw_SetWindowTitle; + platform_io.Platform_RenderWindow = ImGui_ImplGlfw_RenderWindow; + platform_io.Platform_SwapBuffers = ImGui_ImplGlfw_SwapBuffers; +#if GLFW_HAS_WINDOW_ALPHA + platform_io.Platform_SetWindowAlpha = ImGui_ImplGlfw_SetWindowAlpha; +#endif +#if GLFW_HAS_VULKAN + platform_io.Platform_CreateVkSurface = ImGui_ImplGlfw_CreateVkSurface; +#endif + + // Register main window handle (which is owned by the main application, not by us) + // This is mostly for simplicity and consistency, so that our code (e.g. mouse handling etc.) can use same logic for main and secondary viewports. + ImGuiViewport* main_viewport = ImGui::GetMainViewport(); + ImGui_ImplGlfw_ViewportData* vd = IM_NEW(ImGui_ImplGlfw_ViewportData)(); + vd->Window = bd->Window; + vd->WindowOwned = false; + main_viewport->PlatformUserData = vd; + main_viewport->PlatformHandle = (void*)bd->Window; +} + +static void ImGui_ImplGlfw_ShutdownMultiViewportSupport() +{ + ImGui::DestroyPlatformWindows(); +} + +//----------------------------------------------------------------------------- + +// WndProc hook (declared here because we will need access to ImGui_ImplGlfw_ViewportData) +#ifdef _WIN32 +static ImGuiMouseSource GetMouseSourceFromMessageExtraInfo() +{ + LPARAM extra_info = ::GetMessageExtraInfo(); + if ((extra_info & 0xFFFFFF80) == 0xFF515700) + return ImGuiMouseSource_Pen; + if ((extra_info & 0xFFFFFF80) == 0xFF515780) + return ImGuiMouseSource_TouchScreen; + return ImGuiMouseSource_Mouse; +} +static LRESULT CALLBACK ImGui_ImplGlfw_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); + WNDPROC prev_wndproc = bd->PrevWndProc; + ImGuiViewport* viewport = (ImGuiViewport*)::GetPropA(hWnd, "IMGUI_VIEWPORT"); + if (viewport != NULL) + if (ImGui_ImplGlfw_ViewportData* vd = (ImGui_ImplGlfw_ViewportData*)viewport->PlatformUserData) + prev_wndproc = vd->PrevWndProc; + + switch (msg) + { + // GLFW doesn't allow to distinguish Mouse vs TouchScreen vs Pen. + // Add support for Win32 (based on imgui_impl_win32), because we rely on _TouchScreen info to trickle inputs differently. + case WM_MOUSEMOVE: case WM_NCMOUSEMOVE: + case WM_LBUTTONDOWN: case WM_LBUTTONDBLCLK: case WM_LBUTTONUP: + case WM_RBUTTONDOWN: case WM_RBUTTONDBLCLK: case WM_RBUTTONUP: + case WM_MBUTTONDOWN: case WM_MBUTTONDBLCLK: case WM_MBUTTONUP: + case WM_XBUTTONDOWN: case WM_XBUTTONDBLCLK: case WM_XBUTTONUP: + ImGui::GetIO().AddMouseSourceEvent(GetMouseSourceFromMessageExtraInfo()); + break; + + // We have submitted https://github.com/glfw/glfw/pull/1568 to allow GLFW to support "transparent inputs". + // In the meanwhile we implement custom per-platform workarounds here (FIXME-VIEWPORT: Implement same work-around for Linux/OSX!) +#if !GLFW_HAS_MOUSE_PASSTHROUGH && GLFW_HAS_WINDOW_HOVERED + case WM_NCHITTEST: + { + // Let mouse pass-through the window. This will allow the backend to call io.AddMouseViewportEvent() properly (which is OPTIONAL). + // The ImGuiViewportFlags_NoInputs flag is set while dragging a viewport, as want to detect the window behind the one we are dragging. + // If you cannot easily access those viewport flags from your windowing/event code: you may manually synchronize its state e.g. in + // your main loop after calling UpdatePlatformWindows(). Iterate all viewports/platform windows and pass the flag to your windowing system. + if (viewport && (viewport->Flags & ImGuiViewportFlags_NoInputs)) + return HTTRANSPARENT; + break; + } +#endif + } + return ::CallWindowProcW(prev_wndproc, hWnd, msg, wParam, lParam); +} +#endif // #ifdef _WIN32 + +//----------------------------------------------------------------------------- + +#if defined(__clang__) +#pragma clang diagnostic pop +#endif + +#endif // #ifndef IMGUI_DISABLE diff --git a/imgui/imgui_impl_glfw.h b/imgui/imgui_impl_glfw.h index ccbe840d4..fb6f3118a 100644 --- a/imgui/imgui_impl_glfw.h +++ b/imgui/imgui_impl_glfw.h @@ -1,33 +1,69 @@ -// dear imgui: Platform Binding for GLFW -// This needs to be used along with a Renderer (e.g. OpenGL3, Vulkan..) +// dear imgui: Platform Backend for GLFW +// This needs to be used along with a Renderer (e.g. OpenGL3, Vulkan, WebGPU..) // (Info: GLFW is a cross-platform general purpose library for handling windows, inputs, OpenGL/Vulkan graphics context creation, etc.) +// (Requires: GLFW 3.1+. Prefer GLFW 3.3+ for full feature support.) // Implemented features: // [X] Platform: Clipboard support. +// [X] Platform: Mouse support. Can discriminate Mouse/TouchScreen/Pen (Windows only). +// [X] Platform: Keyboard support. Since 1.87 we are using the io.AddKeyEvent() function. Pass ImGuiKey values to all key functions e.g. ImGui::IsKeyPressed(ImGuiKey_Space). [Legacy GLFW_KEY_* values are obsolete since 1.87 and not supported since 1.91.5] // [X] Platform: Gamepad support. Enable with 'io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad'. -// [x] Platform: Mouse cursor shape and visibility. Disable with 'io.ConfigFlags |= ImGuiConfigFlags_NoMouseCursorChange'. FIXME: 3 cursors types are missing from GLFW. -// [X] Platform: Keyboard arrays indexed using GLFW_KEY_* codes, e.g. ImGui::IsKeyPressed(GLFW_KEY_SPACE). +// [X] Platform: Mouse cursor shape and visibility (ImGuiBackendFlags_HasMouseCursors). Resizing cursors requires GLFW 3.4+! Disable with 'io.ConfigFlags |= ImGuiConfigFlags_NoMouseCursorChange'. +// [X] Platform: Multi-viewport support (multiple windows). Enable with 'io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable'. +// Missing features or Issues: +// [ ] Touch events are only correctly identified as Touch on Windows. This create issues with some interactions. GLFW doesn't provide a way to identify touch inputs from mouse inputs, we cannot call io.AddMouseSourceEvent() to identify the source. We provide a Windows-specific workaround. +// [ ] Missing ImGuiMouseCursor_Wait and ImGuiMouseCursor_Progress cursors. +// [ ] Multi-viewport: ParentViewportID not honored, and so io.ConfigViewportsNoDefaultParent has no effect (minor). -// You can copy and use unmodified imgui_impl_* files in your project. See main.cpp for an example of using this. -// If you are new to dear imgui, read examples/README.txt and read the documentation at the top of imgui.cpp. -// https://github.com/ocornut/imgui - -// About GLSL version: -// The 'glsl_version' initialization parameter defaults to "#version 150" if NULL. -// Only override if your GL version doesn't handle this GLSL version. Keep NULL if unsure! +// You can use unmodified imgui_impl_* files in your project. See examples/ folder for examples of using this. +// Prefer including the entire imgui/ repository into your project (either as a copy or as a submodule), and only build the backends you need. +// Learn about Dear ImGui: +// - FAQ https://dearimgui.com/faq +// - Getting Started https://dearimgui.com/getting-started +// - Documentation https://dearimgui.com/docs (same as your local docs/ folder). +// - Introduction, links and more at the top of imgui.cpp #pragma once +#include "imgui.h" // IMGUI_IMPL_API +#ifndef IMGUI_DISABLE struct GLFWwindow; +struct GLFWmonitor; +// Follow "Getting Started" link and check examples/ folder to learn about using backends! IMGUI_IMPL_API bool ImGui_ImplGlfw_InitForOpenGL(GLFWwindow* window, bool install_callbacks); IMGUI_IMPL_API bool ImGui_ImplGlfw_InitForVulkan(GLFWwindow* window, bool install_callbacks); +IMGUI_IMPL_API bool ImGui_ImplGlfw_InitForOther(GLFWwindow* window, bool install_callbacks); IMGUI_IMPL_API void ImGui_ImplGlfw_Shutdown(); IMGUI_IMPL_API void ImGui_ImplGlfw_NewFrame(); -// InitXXX function with 'install_callbacks=true': install GLFW callbacks. They will call user's previously installed callbacks, if any. -// InitXXX function with 'install_callbacks=false': do not install GLFW callbacks. You will need to call them yourself from your own GLFW callbacks. +// Emscripten related initialization phase methods (call after ImGui_ImplGlfw_InitForOpenGL) +#ifdef __EMSCRIPTEN__ +IMGUI_IMPL_API void ImGui_ImplGlfw_InstallEmscriptenCallbacks(GLFWwindow* window, const char* canvas_selector); +//static inline void ImGui_ImplGlfw_InstallEmscriptenCanvasResizeCallback(const char* canvas_selector) { ImGui_ImplGlfw_InstallEmscriptenCallbacks(nullptr, canvas_selector); } } // Renamed in 1.91.0 +#endif + +// GLFW callbacks install +// - When calling Init with 'install_callbacks=true': ImGui_ImplGlfw_InstallCallbacks() is called. GLFW callbacks will be installed for you. They will chain-call user's previously installed callbacks, if any. +// - When calling Init with 'install_callbacks=false': GLFW callbacks won't be installed. You will need to call individual function yourself from your own GLFW callbacks. +IMGUI_IMPL_API void ImGui_ImplGlfw_InstallCallbacks(GLFWwindow* window); +IMGUI_IMPL_API void ImGui_ImplGlfw_RestoreCallbacks(GLFWwindow* window); + +// GFLW callbacks options: +// - Set 'chain_for_all_windows=true' to enable chaining callbacks for all windows (including secondary viewports created by backends or by user) +IMGUI_IMPL_API void ImGui_ImplGlfw_SetCallbacksChainForAllWindows(bool chain_for_all_windows); + +// GLFW callbacks (individual callbacks to call yourself if you didn't install callbacks) +IMGUI_IMPL_API void ImGui_ImplGlfw_WindowFocusCallback(GLFWwindow* window, int focused); // Since 1.84 +IMGUI_IMPL_API void ImGui_ImplGlfw_CursorEnterCallback(GLFWwindow* window, int entered); // Since 1.84 +IMGUI_IMPL_API void ImGui_ImplGlfw_CursorPosCallback(GLFWwindow* window, double x, double y); // Since 1.87 IMGUI_IMPL_API void ImGui_ImplGlfw_MouseButtonCallback(GLFWwindow* window, int button, int action, int mods); IMGUI_IMPL_API void ImGui_ImplGlfw_ScrollCallback(GLFWwindow* window, double xoffset, double yoffset); IMGUI_IMPL_API void ImGui_ImplGlfw_KeyCallback(GLFWwindow* window, int key, int scancode, int action, int mods); IMGUI_IMPL_API void ImGui_ImplGlfw_CharCallback(GLFWwindow* window, unsigned int c); +IMGUI_IMPL_API void ImGui_ImplGlfw_MonitorCallback(GLFWmonitor* monitor, int event); + +// GLFW helpers +IMGUI_IMPL_API void ImGui_ImplGlfw_Sleep(int milliseconds); + +#endif // #ifndef IMGUI_DISABLE diff --git a/imgui/imgui_impl_opengl2.cpp b/imgui/imgui_impl_opengl2.cpp index 8bb303acb..d970e52a9 100644 --- a/imgui/imgui_impl_opengl2.cpp +++ b/imgui/imgui_impl_opengl2.cpp @@ -1,12 +1,19 @@ -// dear imgui: Renderer for OpenGL2 (legacy OpenGL, fixed pipeline) -// This needs to be used along with a Platform Binding (e.g. GLFW, SDL, Win32, custom..) +// dear imgui: Renderer Backend for OpenGL2 (legacy OpenGL, fixed pipeline) +// This needs to be used along with a Platform Backend (e.g. GLFW, SDL, Win32, custom..) // Implemented features: -// [X] Renderer: User texture binding. Use 'GLuint' OpenGL texture identifier as void*/ImTextureID. Read the FAQ about ImTextureID in imgui.cpp. +// [X] Renderer: User texture binding. Use 'GLuint' OpenGL texture identifier as void*/ImTextureID. Read the FAQ about ImTextureID! +// [X] Renderer: Multi-viewport support (multiple windows). Enable with 'io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable'. +// Missing features or Issues: +// [ ] Renderer: Large meshes support (64k+ vertices) even with 16-bit indices (ImGuiBackendFlags_RendererHasVtxOffset). -// You can copy and use unmodified imgui_impl_* files in your project. See main.cpp for an example of using this. -// If you are new to dear imgui, read examples/README.txt and read the documentation at the top of imgui.cpp. -// https://github.com/ocornut/imgui +// You can use unmodified imgui_impl_* files in your project. See examples/ folder for examples of using this. +// Prefer including the entire imgui/ repository into your project (either as a copy or as a submodule), and only build the backends you need. +// Learn about Dear ImGui: +// - FAQ https://dearimgui.com/faq +// - Getting Started https://dearimgui.com/getting-started +// - Documentation https://dearimgui.com/docs (same as your local docs/ folder). +// - Introduction, links and more at the top of imgui.cpp // **DO NOT USE THIS CODE IF YOUR CODE/ENGINE IS USING MODERN OPENGL (SHADERS, VBO, VAO, etc.)** // **Prefer using the code in imgui_impl_opengl3.cpp** @@ -18,6 +25,15 @@ // CHANGELOG // (minor and older changes stripped away, please see git history for details) +// 2025-XX-XX: Platform: Added support for multiple windows via the ImGuiPlatformIO interface. +// 2024-10-07: OpenGL: Changed default texture sampler to Clamp instead of Repeat/Wrap. +// 2024-06-28: OpenGL: ImGui_ImplOpenGL2_NewFrame() recreates font texture if it has been destroyed by ImGui_ImplOpenGL2_DestroyFontsTexture(). (#7748) +// 2022-10-11: Using 'nullptr' instead of 'NULL' as per our switch to C++11. +// 2021-12-08: OpenGL: Fixed mishandling of the ImDrawCmd::IdxOffset field! This is an old bug but it never had an effect until some internal rendering changes in 1.86. +// 2021-06-29: Reorganized backend to pull data from a single structure to facilitate usage with multiple-contexts (all g_XXXX access changed to bd->XXXX). +// 2021-05-19: OpenGL: Replaced direct access to ImDrawCmd::TextureId with a call to ImDrawCmd::GetTexID(). (will become a requirement) +// 2021-01-03: OpenGL: Backup, setup and restore GL_SHADE_MODEL state, disable GL_STENCIL_TEST and disable GL_NORMAL_ARRAY client state to increase compatibility with legacy OpenGL applications. +// 2020-01-23: OpenGL: Backup, setup and restore GL_TEXTURE_ENV to increase compatibility with legacy OpenGL applications. // 2019-04-30: OpenGL: Added support for special ImDrawCallback_ResetRenderState callback to reset render state. // 2019-02-11: OpenGL: Projecting clipping rectangles correctly using draw_data->FramebufferScale to allow multi-viewports for retina display. // 2018-11-30: Misc: Setting up io.BackendRendererName so it can be displayed in the About Window. @@ -30,31 +46,88 @@ // 2016-09-05: OpenGL: Fixed save and restore of current scissor rectangle. #include "imgui.h" +#ifndef IMGUI_DISABLE #include "imgui_impl_opengl2.h" +#include // intptr_t -#include // Needs to be initialized with gladLoadGL() in user's code +// Clang/GCC warnings with -Weverything +#if defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunused-macros" // warning: macro is not used +#pragma clang diagnostic ignored "-Wnonportable-system-include-path" +#endif -// OpenGL Data -static GLuint g_FontTexture = 0; +#include // MaSzyna: GL functions come from glad, initialized by the simulator + +// [Debugging] +//#define IMGUI_IMPL_OPENGL_DEBUG +#ifdef IMGUI_IMPL_OPENGL_DEBUG +#include +#define GL_CALL(_CALL) do { _CALL; GLenum gl_err = glGetError(); if (gl_err != 0) fprintf(stderr, "GL error 0x%x returned from '%s'.\n", gl_err, #_CALL); } while (0) // Call with error check +#else +#define GL_CALL(_CALL) _CALL // Call without error check +#endif + +// OpenGL data +struct ImGui_ImplOpenGL2_Data +{ + GLuint FontTexture; + + ImGui_ImplOpenGL2_Data() { memset((void*)this, 0, sizeof(*this)); } +}; + +// Backend data stored in io.BackendRendererUserData to allow support for multiple Dear ImGui contexts +// It is STRONGLY preferred that you use docking branch with multi-viewports (== single Dear ImGui context + multiple windows) instead of multiple Dear ImGui contexts. +static ImGui_ImplOpenGL2_Data* ImGui_ImplOpenGL2_GetBackendData() +{ + return ImGui::GetCurrentContext() ? (ImGui_ImplOpenGL2_Data*)ImGui::GetIO().BackendRendererUserData : nullptr; +} + +// Forward Declarations +static void ImGui_ImplOpenGL2_InitMultiViewportSupport(); +static void ImGui_ImplOpenGL2_ShutdownMultiViewportSupport(); // Functions bool ImGui_ImplOpenGL2_Init() { - // Setup back-end capabilities flags ImGuiIO& io = ImGui::GetIO(); + IMGUI_CHECKVERSION(); + IM_ASSERT(io.BackendRendererUserData == nullptr && "Already initialized a renderer backend!"); + + // Setup backend capabilities flags + ImGui_ImplOpenGL2_Data* bd = IM_NEW(ImGui_ImplOpenGL2_Data)(); + io.BackendRendererUserData = (void*)bd; io.BackendRendererName = "imgui_impl_opengl2"; + io.BackendFlags |= ImGuiBackendFlags_RendererHasViewports; // We can create multi-viewports on the Renderer side (optional) + + ImGui_ImplOpenGL2_InitMultiViewportSupport(); + return true; } void ImGui_ImplOpenGL2_Shutdown() { + ImGui_ImplOpenGL2_Data* bd = ImGui_ImplOpenGL2_GetBackendData(); + IM_ASSERT(bd != nullptr && "No renderer backend to shutdown, or already shutdown?"); + ImGuiIO& io = ImGui::GetIO(); + + ImGui_ImplOpenGL2_ShutdownMultiViewportSupport(); ImGui_ImplOpenGL2_DestroyDeviceObjects(); + io.BackendRendererName = nullptr; + io.BackendRendererUserData = nullptr; + io.BackendFlags &= ~ImGuiBackendFlags_RendererHasViewports; + IM_DELETE(bd); } void ImGui_ImplOpenGL2_NewFrame() { - if (!g_FontTexture) + ImGui_ImplOpenGL2_Data* bd = ImGui_ImplOpenGL2_GetBackendData(); + IM_ASSERT(bd != nullptr && "Context or backend not initialized! Did you call ImGui_ImplOpenGL2_Init()?"); + + if (!bd->FontTexture) ImGui_ImplOpenGL2_CreateDeviceObjects(); + if (!bd->FontTexture) + ImGui_ImplOpenGL2_CreateFontsTexture(); } static void ImGui_ImplOpenGL2_SetupRenderState(ImDrawData* draw_data, int fb_width, int fb_height) @@ -62,28 +135,36 @@ static void ImGui_ImplOpenGL2_SetupRenderState(ImDrawData* draw_data, int fb_wid // Setup render state: alpha-blending enabled, no face culling, no depth testing, scissor enabled, vertex/texcoord/color pointers, polygon fill. glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + //glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA); // In order to composite our output buffer we need to preserve alpha glDisable(GL_CULL_FACE); glDisable(GL_DEPTH_TEST); + glDisable(GL_STENCIL_TEST); glDisable(GL_LIGHTING); glDisable(GL_COLOR_MATERIAL); glEnable(GL_SCISSOR_TEST); glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_TEXTURE_COORD_ARRAY); glEnableClientState(GL_COLOR_ARRAY); + glDisableClientState(GL_NORMAL_ARRAY); glEnable(GL_TEXTURE_2D); glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); + glShadeModel(GL_SMOOTH); + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); // If you are using this code with non-legacy OpenGL header/contexts (which you should not, prefer using imgui_impl_opengl3.cpp!!), - // you may need to backup/reset/restore current shader using the lines below. DO NOT MODIFY THIS FILE! Add the code in your calling function: - // GLint last_program; - // glGetIntegerv(GL_CURRENT_PROGRAM, &last_program); - // glUseProgram(0); - // ImGui_ImplOpenGL2_RenderDrawData(...); - // glUseProgram(last_program) + // you may need to backup/reset/restore other state, e.g. for current shader using the commented lines below. + // (DO NOT MODIFY THIS FILE! Add the code in your calling function) + // GLint last_program; + // glGetIntegerv(GL_CURRENT_PROGRAM, &last_program); + // glUseProgram(0); + // ImGui_ImplOpenGL2_RenderDrawData(...); + // glUseProgram(last_program) + // There are potentially many more states you could need to clear/setup that we can't access from default headers. + // e.g. glBindBuffer(GL_ARRAY_BUFFER, 0), glDisable(GL_TEXTURE_CUBE_MAP). // Setup viewport, orthographic projection matrix // Our visible imgui space lies from draw_data->DisplayPos (top left) to draw_data->DisplayPos+data_data->DisplaySize (bottom right). DisplayPos is (0,0) for single viewport apps. - glViewport(0, 0, (GLsizei)fb_width, (GLsizei)fb_height); + GL_CALL(glViewport(0, 0, (GLsizei)fb_width, (GLsizei)fb_height)); glMatrixMode(GL_PROJECTION); glPushMatrix(); glLoadIdentity(); @@ -94,8 +175,8 @@ static void ImGui_ImplOpenGL2_SetupRenderState(ImDrawData* draw_data, int fb_wid } // OpenGL2 Render function. -// (this used to be set in io.RenderDrawListsFn and called by ImGui::Render(), but you can now call this directly from your main loop) -// Note that this implementation is little overcomplicated because we are saving/setting up/restoring every OpenGL state explicitly, in order to be able to run within any OpenGL engine that doesn't do so. +// Note that this implementation is little overcomplicated because we are saving/setting up/restoring every OpenGL state explicitly. +// This is in order to be able to run within an OpenGL engine that doesn't do so. void ImGui_ImplOpenGL2_RenderDrawData(ImDrawData* draw_data) { // Avoid rendering when minimized, scale coordinates for retina displays (screen coordinates != framebuffer coordinates) @@ -109,6 +190,8 @@ void ImGui_ImplOpenGL2_RenderDrawData(ImDrawData* draw_data) GLint last_polygon_mode[2]; glGetIntegerv(GL_POLYGON_MODE, last_polygon_mode); GLint last_viewport[4]; glGetIntegerv(GL_VIEWPORT, last_viewport); GLint last_scissor_box[4]; glGetIntegerv(GL_SCISSOR_BOX, last_scissor_box); + GLint last_shade_model; glGetIntegerv(GL_SHADE_MODEL, &last_shade_model); + GLint last_tex_env_mode; glGetTexEnviv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, &last_tex_env_mode); glPushAttrib(GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT | GL_TRANSFORM_BIT); // Setup desired GL state @@ -121,16 +204,16 @@ void ImGui_ImplOpenGL2_RenderDrawData(ImDrawData* draw_data) // Render command lists for (int n = 0; n < draw_data->CmdListsCount; n++) { - const ImDrawList* cmd_list = draw_data->CmdLists[n]; - const ImDrawVert* vtx_buffer = cmd_list->VtxBuffer.Data; - const ImDrawIdx* idx_buffer = cmd_list->IdxBuffer.Data; - glVertexPointer(2, GL_FLOAT, sizeof(ImDrawVert), (const GLvoid*)((const char*)vtx_buffer + IM_OFFSETOF(ImDrawVert, pos))); - glTexCoordPointer(2, GL_FLOAT, sizeof(ImDrawVert), (const GLvoid*)((const char*)vtx_buffer + IM_OFFSETOF(ImDrawVert, uv))); - glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(ImDrawVert), (const GLvoid*)((const char*)vtx_buffer + IM_OFFSETOF(ImDrawVert, col))); + const ImDrawList* draw_list = draw_data->CmdLists[n]; + const ImDrawVert* vtx_buffer = draw_list->VtxBuffer.Data; + const ImDrawIdx* idx_buffer = draw_list->IdxBuffer.Data; + glVertexPointer(2, GL_FLOAT, sizeof(ImDrawVert), (const GLvoid*)((const char*)vtx_buffer + offsetof(ImDrawVert, pos))); + glTexCoordPointer(2, GL_FLOAT, sizeof(ImDrawVert), (const GLvoid*)((const char*)vtx_buffer + offsetof(ImDrawVert, uv))); + glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(ImDrawVert), (const GLvoid*)((const char*)vtx_buffer + offsetof(ImDrawVert, col))); - for (int cmd_i = 0; cmd_i < cmd_list->CmdBuffer.Size; cmd_i++) + for (int cmd_i = 0; cmd_i < draw_list->CmdBuffer.Size; cmd_i++) { - const ImDrawCmd* pcmd = &cmd_list->CmdBuffer[cmd_i]; + const ImDrawCmd* pcmd = &draw_list->CmdBuffer[cmd_i]; if (pcmd->UserCallback) { // User callback, registered via ImDrawList::AddCallback() @@ -138,28 +221,23 @@ void ImGui_ImplOpenGL2_RenderDrawData(ImDrawData* draw_data) if (pcmd->UserCallback == ImDrawCallback_ResetRenderState) ImGui_ImplOpenGL2_SetupRenderState(draw_data, fb_width, fb_height); else - pcmd->UserCallback(cmd_list, pcmd); + pcmd->UserCallback(draw_list, pcmd); } else { // Project scissor/clipping rectangles into framebuffer space - ImVec4 clip_rect; - clip_rect.x = (pcmd->ClipRect.x - clip_off.x) * clip_scale.x; - clip_rect.y = (pcmd->ClipRect.y - clip_off.y) * clip_scale.y; - clip_rect.z = (pcmd->ClipRect.z - clip_off.x) * clip_scale.x; - clip_rect.w = (pcmd->ClipRect.w - clip_off.y) * clip_scale.y; + ImVec2 clip_min((pcmd->ClipRect.x - clip_off.x) * clip_scale.x, (pcmd->ClipRect.y - clip_off.y) * clip_scale.y); + ImVec2 clip_max((pcmd->ClipRect.z - clip_off.x) * clip_scale.x, (pcmd->ClipRect.w - clip_off.y) * clip_scale.y); + if (clip_max.x <= clip_min.x || clip_max.y <= clip_min.y) + continue; - if (clip_rect.x < fb_width && clip_rect.y < fb_height && clip_rect.z >= 0.0f && clip_rect.w >= 0.0f) - { - // Apply scissor/clipping rectangle - glScissor((int)clip_rect.x, (int)(fb_height - clip_rect.w), (int)(clip_rect.z - clip_rect.x), (int)(clip_rect.w - clip_rect.y)); + // Apply scissor/clipping rectangle (Y is inverted in OpenGL) + glScissor((int)clip_min.x, (int)((float)fb_height - clip_max.y), (int)(clip_max.x - clip_min.x), (int)(clip_max.y - clip_min.y)); - // Bind texture, Draw - glBindTexture(GL_TEXTURE_2D, (GLuint)(intptr_t)pcmd->TextureId); - glDrawElements(GL_TRIANGLES, (GLsizei)pcmd->ElemCount, sizeof(ImDrawIdx) == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, idx_buffer); - } + // Bind texture, Draw + glBindTexture(GL_TEXTURE_2D, (GLuint)(intptr_t)pcmd->GetTexID()); + glDrawElements(GL_TRIANGLES, (GLsizei)pcmd->ElemCount, sizeof(ImDrawIdx) == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, idx_buffer + pcmd->IdxOffset); } - idx_buffer += pcmd->ElemCount; } } @@ -176,28 +254,34 @@ void ImGui_ImplOpenGL2_RenderDrawData(ImDrawData* draw_data) glPolygonMode(GL_FRONT, (GLenum)last_polygon_mode[0]); glPolygonMode(GL_BACK, (GLenum)last_polygon_mode[1]); glViewport(last_viewport[0], last_viewport[1], (GLsizei)last_viewport[2], (GLsizei)last_viewport[3]); glScissor(last_scissor_box[0], last_scissor_box[1], (GLsizei)last_scissor_box[2], (GLsizei)last_scissor_box[3]); + glShadeModel(last_shade_model); + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, last_tex_env_mode); } bool ImGui_ImplOpenGL2_CreateFontsTexture() { // Build texture atlas ImGuiIO& io = ImGui::GetIO(); + ImGui_ImplOpenGL2_Data* bd = ImGui_ImplOpenGL2_GetBackendData(); unsigned char* pixels; int width, height; - io.Fonts->GetTexDataAsRGBA32(&pixels, &width, &height); // Load as RGBA 32-bits (75% of the memory is wasted, but default font is so small) because it is more likely to be compatible with user's existing shaders. If your ImTextureId represent a higher-level concept than just a GL texture id, consider calling GetTexDataAsAlpha8() instead to save on GPU memory. + io.Fonts->GetTexDataAsRGBA32(&pixels, &width, &height); // Load as RGBA 32-bit (75% of the memory is wasted, but default font is so small) because it is more likely to be compatible with user's existing shaders. If your ImTextureId represent a higher-level concept than just a GL texture id, consider calling GetTexDataAsAlpha8() instead to save on GPU memory. // Upload texture to graphics system + // (Bilinear sampling is required by default. Set 'io.Fonts->Flags |= ImFontAtlasFlags_NoBakedLines' or 'style.AntiAliasedLinesUseTex = false' to allow point/nearest sampling) GLint last_texture; glGetIntegerv(GL_TEXTURE_BINDING_2D, &last_texture); - glGenTextures(1, &g_FontTexture); - glBindTexture(GL_TEXTURE_2D, g_FontTexture); + glGenTextures(1, &bd->FontTexture); + glBindTexture(GL_TEXTURE_2D, bd->FontTexture); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels); // Store our identifier - io.Fonts->TexID = (ImTextureID)(intptr_t)g_FontTexture; + io.Fonts->SetTexID((ImTextureID)(intptr_t)bd->FontTexture); // Restore state glBindTexture(GL_TEXTURE_2D, last_texture); @@ -207,12 +291,13 @@ bool ImGui_ImplOpenGL2_CreateFontsTexture() void ImGui_ImplOpenGL2_DestroyFontsTexture() { - if (g_FontTexture) + ImGuiIO& io = ImGui::GetIO(); + ImGui_ImplOpenGL2_Data* bd = ImGui_ImplOpenGL2_GetBackendData(); + if (bd->FontTexture) { - ImGuiIO& io = ImGui::GetIO(); - glDeleteTextures(1, &g_FontTexture); - io.Fonts->TexID = 0; - g_FontTexture = 0; + glDeleteTextures(1, &bd->FontTexture); + io.Fonts->SetTexID(0); + bd->FontTexture = 0; } } @@ -225,3 +310,40 @@ void ImGui_ImplOpenGL2_DestroyDeviceObjects() { ImGui_ImplOpenGL2_DestroyFontsTexture(); } + + +//-------------------------------------------------------------------------------------------------------- +// MULTI-VIEWPORT / PLATFORM INTERFACE SUPPORT +// This is an _advanced_ and _optional_ feature, allowing the backend to create and handle multiple viewports simultaneously. +// If you are new to dear imgui or creating a new binding for dear imgui, it is recommended that you completely ignore this section first.. +//-------------------------------------------------------------------------------------------------------- + +static void ImGui_ImplOpenGL2_RenderWindow(ImGuiViewport* viewport, void*) +{ + if (!(viewport->Flags & ImGuiViewportFlags_NoRendererClear)) + { + ImVec4 clear_color = ImVec4(0.0f, 0.0f, 0.0f, 1.0f); + glClearColor(clear_color.x, clear_color.y, clear_color.z, clear_color.w); + glClear(GL_COLOR_BUFFER_BIT); + } + ImGui_ImplOpenGL2_RenderDrawData(viewport->DrawData); +} + +static void ImGui_ImplOpenGL2_InitMultiViewportSupport() +{ + ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO(); + platform_io.Renderer_RenderWindow = ImGui_ImplOpenGL2_RenderWindow; +} + +static void ImGui_ImplOpenGL2_ShutdownMultiViewportSupport() +{ + ImGui::DestroyPlatformWindows(); +} + +//----------------------------------------------------------------------------- + +#if defined(__clang__) +#pragma clang diagnostic pop +#endif + +#endif // #ifndef IMGUI_DISABLE diff --git a/imgui/imgui_impl_opengl2.h b/imgui/imgui_impl_opengl2.h index 2e3271dcf..c7b40e077 100644 --- a/imgui/imgui_impl_opengl2.h +++ b/imgui/imgui_impl_opengl2.h @@ -1,12 +1,19 @@ -// dear imgui: Renderer for OpenGL2 (legacy OpenGL, fixed pipeline) -// This needs to be used along with a Platform Binding (e.g. GLFW, SDL, Win32, custom..) +// dear imgui: Renderer Backend for OpenGL2 (legacy OpenGL, fixed pipeline) +// This needs to be used along with a Platform Backend (e.g. GLFW, SDL, Win32, custom..) // Implemented features: -// [X] Renderer: User texture binding. Use 'GLuint' OpenGL texture identifier as void*/ImTextureID. Read the FAQ about ImTextureID in imgui.cpp. +// [X] Renderer: User texture binding. Use 'GLuint' OpenGL texture identifier as void*/ImTextureID. Read the FAQ about ImTextureID! +// [X] Renderer: Multi-viewport support (multiple windows). Enable with 'io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable'. +// Missing features or Issues: +// [ ] Renderer: Large meshes support (64k+ vertices) even with 16-bit indices (ImGuiBackendFlags_RendererHasVtxOffset). -// You can copy and use unmodified imgui_impl_* files in your project. See main.cpp for an example of using this. -// If you are new to dear imgui, read examples/README.txt and read the documentation at the top of imgui.cpp. -// https://github.com/ocornut/imgui +// You can use unmodified imgui_impl_* files in your project. See examples/ folder for examples of using this. +// Prefer including the entire imgui/ repository into your project (either as a copy or as a submodule), and only build the backends you need. +// Learn about Dear ImGui: +// - FAQ https://dearimgui.com/faq +// - Getting Started https://dearimgui.com/getting-started +// - Documentation https://dearimgui.com/docs (same as your local docs/ folder). +// - Introduction, links and more at the top of imgui.cpp // **DO NOT USE THIS CODE IF YOUR CODE/ENGINE IS USING MODERN OPENGL (SHADERS, VBO, VAO, etc.)** // **Prefer using the code in imgui_impl_opengl3.cpp** @@ -17,7 +24,10 @@ // The GL2 code is unable to reset attributes or even call e.g. "glUseProgram(0)" because they don't exist in that API. #pragma once +#include "imgui.h" // IMGUI_IMPL_API +#ifndef IMGUI_DISABLE +// Follow "Getting Started" link and check examples/ folder to learn about using backends! IMGUI_IMPL_API bool ImGui_ImplOpenGL2_Init(); IMGUI_IMPL_API void ImGui_ImplOpenGL2_Shutdown(); IMGUI_IMPL_API void ImGui_ImplOpenGL2_NewFrame(); @@ -28,3 +38,5 @@ IMGUI_IMPL_API bool ImGui_ImplOpenGL2_CreateFontsTexture(); IMGUI_IMPL_API void ImGui_ImplOpenGL2_DestroyFontsTexture(); IMGUI_IMPL_API bool ImGui_ImplOpenGL2_CreateDeviceObjects(); IMGUI_IMPL_API void ImGui_ImplOpenGL2_DestroyDeviceObjects(); + +#endif // #ifndef IMGUI_DISABLE diff --git a/imgui/imgui_impl_opengl3.cpp b/imgui/imgui_impl_opengl3.cpp index e4bf631c6..4ce48f5c8 100644 --- a/imgui/imgui_impl_opengl3.cpp +++ b/imgui/imgui_impl_opengl3.cpp @@ -1,24 +1,75 @@ -// dear imgui: Renderer for modern OpenGL with shaders / programmatic pipeline +// dear imgui: Renderer Backend for modern OpenGL with shaders / programmatic pipeline // - Desktop GL: 2.x 3.x 4.x // - Embedded GL: ES 2.0 (WebGL 1.0), ES 3.0 (WebGL 2.0) -// This needs to be used along with a Platform Binding (e.g. GLFW, SDL, Win32, custom..) +// This needs to be used along with a Platform Backend (e.g. GLFW, SDL, Win32, custom..) // Implemented features: -// [X] Renderer: User texture binding. Use 'GLuint' OpenGL texture identifier as void*/ImTextureID. Read the FAQ about ImTextureID in imgui.cpp. -// [x] Renderer: Desktop GL only: Support for large meshes (64k+ vertices) with 16-bits indices. +// [X] Renderer: User texture binding. Use 'GLuint' OpenGL texture identifier as void*/ImTextureID. Read the FAQ about ImTextureID! +// [x] Renderer: Large meshes support (64k+ vertices) even with 16-bit indices (ImGuiBackendFlags_RendererHasVtxOffset) [Desktop OpenGL only!] +// [X] Renderer: Multi-viewport support (multiple windows). Enable with 'io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable'. -// You can copy and use unmodified imgui_impl_* files in your project. See main.cpp for an example of using this. -// If you are new to dear imgui, read examples/README.txt and read the documentation at the top of imgui.cpp. -// https://github.com/ocornut/imgui +// About WebGL/ES: +// - You need to '#define IMGUI_IMPL_OPENGL_ES2' or '#define IMGUI_IMPL_OPENGL_ES3' to use WebGL or OpenGL ES. +// - This is done automatically on iOS, Android and Emscripten targets. +// - For other targets, the define needs to be visible from the imgui_impl_opengl3.cpp compilation unit. If unsure, define globally or in imconfig.h. + +// You can use unmodified imgui_impl_* files in your project. See examples/ folder for examples of using this. +// Prefer including the entire imgui/ repository into your project (either as a copy or as a submodule), and only build the backends you need. +// Learn about Dear ImGui: +// - FAQ https://dearimgui.com/faq +// - Getting Started https://dearimgui.com/getting-started +// - Documentation https://dearimgui.com/docs (same as your local docs/ folder). +// - Introduction, links and more at the top of imgui.cpp // CHANGELOG // (minor and older changes stripped away, please see git history for details) +// 2025-XX-XX: Platform: Added support for multiple windows via the ImGuiPlatformIO interface. +// 2025-02-18: OpenGL: Lazily reinitialize embedded GL loader for when calling backend from e.g. other DLL boundaries. (#8406) +// 2024-10-07: OpenGL: Changed default texture sampler to Clamp instead of Repeat/Wrap. +// 2024-06-28: OpenGL: ImGui_ImplOpenGL3_NewFrame() recreates font texture if it has been destroyed by ImGui_ImplOpenGL3_DestroyFontsTexture(). (#7748) +// 2024-05-07: OpenGL: Update loader for Linux to support EGL/GLVND. (#7562) +// 2024-04-16: OpenGL: Detect ES3 contexts on desktop based on version string, to e.g. avoid calling glPolygonMode() on them. (#7447) +// 2024-01-09: OpenGL: Update GL3W based imgui_impl_opengl3_loader.h to load "libGL.so" and variants, fixing regression on distros missing a symlink. +// 2023-11-08: OpenGL: Update GL3W based imgui_impl_opengl3_loader.h to load "libGL.so" instead of "libGL.so.1", accommodating for NetBSD systems having only "libGL.so.3" available. (#6983) +// 2023-10-05: OpenGL: Rename symbols in our internal loader so that LTO compilation with another copy of gl3w is possible. (#6875, #6668, #4445) +// 2023-06-20: OpenGL: Fixed erroneous use glGetIntegerv(GL_CONTEXT_PROFILE_MASK) on contexts lower than 3.2. (#6539, #6333) +// 2023-05-09: OpenGL: Support for glBindSampler() backup/restore on ES3. (#6375) +// 2023-04-18: OpenGL: Restore front and back polygon mode separately when supported by context. (#6333) +// 2023-03-23: OpenGL: Properly restoring "no shader program bound" if it was the case prior to running the rendering function. (#6267, #6220, #6224) +// 2023-03-15: OpenGL: Fixed GL loader crash when GL_VERSION returns NULL. (#6154, #4445, #3530) +// 2023-03-06: OpenGL: Fixed restoration of a potentially deleted OpenGL program, by calling glIsProgram(). (#6220, #6224) +// 2022-11-09: OpenGL: Reverted use of glBufferSubData(), too many corruptions issues + old issues seemingly can't be reproed with Intel drivers nowadays (revert 2021-12-15 and 2022-05-23 changes). +// 2022-10-11: Using 'nullptr' instead of 'NULL' as per our switch to C++11. +// 2022-09-27: OpenGL: Added ability to '#define IMGUI_IMPL_OPENGL_DEBUG'. +// 2022-05-23: OpenGL: Reworking 2021-12-15 "Using buffer orphaning" so it only happens on Intel GPU, seems to cause problems otherwise. (#4468, #4825, #4832, #5127). +// 2022-05-13: OpenGL: Fixed state corruption on OpenGL ES 2.0 due to not preserving GL_ELEMENT_ARRAY_BUFFER_BINDING and vertex attribute states. +// 2021-12-15: OpenGL: Using buffer orphaning + glBufferSubData(), seems to fix leaks with multi-viewports with some Intel HD drivers. +// 2021-08-23: OpenGL: Fixed ES 3.0 shader ("#version 300 es") use normal precision floats to avoid wobbly rendering at HD resolutions. +// 2021-08-19: OpenGL: Embed and use our own minimal GL loader (imgui_impl_opengl3_loader.h), removing requirement and support for third-party loader. +// 2021-06-29: Reorganized backend to pull data from a single structure to facilitate usage with multiple-contexts (all g_XXXX access changed to bd->XXXX). +// 2021-06-25: OpenGL: Use OES_vertex_array extension on Emscripten + backup/restore current state. +// 2021-06-21: OpenGL: Destroy individual vertex/fragment shader objects right after they are linked into the main shader. +// 2021-05-24: OpenGL: Access GL_CLIP_ORIGIN when "GL_ARB_clip_control" extension is detected, inside of just OpenGL 4.5 version. +// 2021-05-19: OpenGL: Replaced direct access to ImDrawCmd::TextureId with a call to ImDrawCmd::GetTexID(). (will become a requirement) +// 2021-04-06: OpenGL: Don't try to read GL_CLIP_ORIGIN unless we're OpenGL 4.5 or greater. +// 2021-02-18: OpenGL: Change blending equation to preserve alpha in output buffer. +// 2021-01-03: OpenGL: Backup, setup and restore GL_STENCIL_TEST state. +// 2020-10-23: OpenGL: Backup, setup and restore GL_PRIMITIVE_RESTART state. +// 2020-10-15: OpenGL: Use glGetString(GL_VERSION) instead of glGetIntegerv(GL_MAJOR_VERSION, ...) when the later returns zero (e.g. Desktop GL 2.x) +// 2020-09-17: OpenGL: Fix to avoid compiling/calling glBindSampler() on ES or pre-3.3 context which have the defines set by a loader. +// 2020-07-10: OpenGL: Added support for glad2 OpenGL loader. +// 2020-05-08: OpenGL: Made default GLSL version 150 (instead of 130) on OSX. +// 2020-04-21: OpenGL: Fixed handling of glClipControl(GL_UPPER_LEFT) by inverting projection matrix. +// 2020-04-12: OpenGL: Fixed context version check mistakenly testing for 4.0+ instead of 3.2+ to enable ImGuiBackendFlags_RendererHasVtxOffset. +// 2020-03-24: OpenGL: Added support for glbinding 2.x OpenGL loader. +// 2020-01-07: OpenGL: Added support for glbinding 3.x OpenGL loader. +// 2019-10-25: OpenGL: Using a combination of GL define and runtime GL version to decide whether to use glDrawElementsBaseVertex(). Fix building with pre-3.2 GL loaders. // 2019-09-22: OpenGL: Detect default GL loader using __has_include compiler facility. // 2019-09-16: OpenGL: Tweak initialization code to allow application calling ImGui_ImplOpenGL3_CreateFontsTexture() before the first NewFrame() call. // 2019-05-29: OpenGL: Desktop GL only: Added support for large mesh (64K+ vertices), enable ImGuiBackendFlags_RendererHasVtxOffset flag. // 2019-04-30: OpenGL: Added support for special ImDrawCallback_ResetRenderState callback to reset render state. // 2019-03-29: OpenGL: Not calling glBindBuffer more than necessary in the render loop. -// 2019-03-15: OpenGL: Added a dummy GL call + comments in ImGui_ImplOpenGL3_Init() to detect uninitialized GL function loaders early. +// 2019-03-15: OpenGL: Added a GL call + comments in ImGui_ImplOpenGL3_Init() to detect uninitialized GL function loaders early. // 2019-03-03: OpenGL: Fix support for ES 2.0 (WebGL 1.0). // 2019-02-20: OpenGL: Fix for OSX not supporting OpenGL 4.5, we don't try to read GL_CLIP_ORIGIN even if defined by the headers/loader. // 2019-02-11: OpenGL: Projecting clipping rectangles correctly using draw_data->FramebufferScale to allow multi-viewports for retina display. @@ -32,7 +83,7 @@ // 2018-06-08: Misc: Extracted imgui_impl_opengl3.cpp/.h away from the old combined GLFW/SDL+OpenGL3 examples. // 2018-06-08: OpenGL: Use draw_data->DisplayPos and draw_data->DisplaySize to setup projection matrix and clipping rectangle. // 2018-05-25: OpenGL: Removed unnecessary backup/restore of GL_ELEMENT_ARRAY_BUFFER_BINDING since this is part of the VAO state. -// 2018-05-14: OpenGL: Making the call to glBindSampler() optional so 3.2 context won't fail if the function is a NULL pointer. +// 2018-05-14: OpenGL: Making the call to glBindSampler() optional so 3.2 context won't fail if the function is a nullptr pointer. // 2018-03-06: OpenGL: Added const char* glsl_version parameter to ImGui_ImplOpenGL3_Init() so user can override the GLSL version e.g. "#version 150". // 2018-02-23: OpenGL: Create the VAO in the render function so the setup can more easily be used with multiple shared GL context. // 2018-02-16: Misc: Obsoleted the io.RenderDrawListsFn callback and exposed ImGui_ImplSdlGL3_RenderDrawData() in the .h file so you can call it yourself. @@ -61,94 +112,378 @@ // ES 3.0 300 "#version 300 es" = WebGL 2.0 //---------------------------------------- -#include "stdafx.h" -#include "utilities/Globals.h" - #if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS) #define _CRT_SECURE_NO_WARNINGS #endif #include "imgui.h" +#ifndef IMGUI_DISABLE #include "imgui_impl_opengl3.h" +// MaSzyna: GL functions come from glad, initialized by the simulator (desktop GL and GLES contexts alike); +// srgb and gamma handling of the ui follows the settings of the renderer +#include "stdafx.h" +#include "utilities/Globals.h" +#include +#include +#include // intptr_t +#if defined(__APPLE__) +#include +#endif -#include // Needs to be initialized with gladLoadGL() in user's code +// Clang/GCC warnings with -Weverything +#if defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunknown-warning-option" // warning: ignore unknown flags +#pragma clang diagnostic ignored "-Wold-style-cast" // warning: use of old-style cast +#pragma clang diagnostic ignored "-Wsign-conversion" // warning: implicit conversion changes signedness +#pragma clang diagnostic ignored "-Wunused-macros" // warning: macro is not used +#pragma clang diagnostic ignored "-Wnonportable-system-include-path" +#pragma clang diagnostic ignored "-Wcast-function-type" // warning: cast between incompatible function types (for loader) +#endif +#if defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // warning: unknown warning group 'xxx' +#pragma GCC diagnostic ignored "-Wcast-function-type" // warning: cast between incompatible function types (for loader) +#pragma GCC diagnostic ignored "-Wstrict-overflow" // warning: assuming signed overflow does not occur when simplifying division / ..when changing X +- C1 cmp C2 to X cmp C2 -+ C1 +#endif + +// GL includes +#if defined(IMGUI_IMPL_OPENGL_ES2) +#if (defined(__APPLE__) && (TARGET_OS_IOS || TARGET_OS_TV)) +#include // Use GL ES 2 +#else +#include // Use GL ES 2 +#endif +#if defined(__EMSCRIPTEN__) +#ifndef GL_GLEXT_PROTOTYPES +#define GL_GLEXT_PROTOTYPES +#endif +#include +#endif +#elif defined(IMGUI_IMPL_OPENGL_ES3) +#if (defined(__APPLE__) && (TARGET_OS_IOS || TARGET_OS_TV)) +#include // Use GL ES 3 +#else +#include // Use GL ES 3 +#endif +#elif !defined(IMGUI_IMPL_OPENGL_LOADER_CUSTOM) +// Modern desktop OpenGL doesn't have a standard portable header file to load OpenGL function pointers. +// Helper libraries are often used for this purpose! Here we are using our own minimal custom loader based on gl3w. +// In the rest of your app/engine, you can use another loader of your choice (gl3w, glew, glad, glbinding, glext, glLoadGen, etc.). +// If you happen to be developing a new feature for this backend (imgui_impl_opengl3.cpp): +// - You may need to regenerate imgui_impl_opengl3_loader.h to add new symbols. See https://github.com/dearimgui/gl3w_stripped +// Typically you would run: python3 ./gl3w_gen.py --output ../imgui/backends/imgui_impl_opengl3_loader.h --ref ../imgui/backends/imgui_impl_opengl3.cpp ./extra_symbols.txt +// - You can temporarily use an unstripped version. See https://github.com/dearimgui/gl3w_stripped/releases +// Changes to this backend using new APIs should be accompanied by a regenerated stripped loader version. +#define IMGL3W_IMPL +#define IMGUI_IMPL_OPENGL_LOADER_IMGL3W +#include "imgui_impl_opengl3_loader.h" +#endif + +// Vertex arrays are not supported on ES2/WebGL1 unless Emscripten which uses an extension +#ifndef IMGUI_IMPL_OPENGL_ES2 +#define IMGUI_IMPL_OPENGL_USE_VERTEX_ARRAY +#elif defined(__EMSCRIPTEN__) +#define IMGUI_IMPL_OPENGL_USE_VERTEX_ARRAY +#define glBindVertexArray glBindVertexArrayOES +#define glGenVertexArrays glGenVertexArraysOES +#define glDeleteVertexArrays glDeleteVertexArraysOES +#define GL_VERTEX_ARRAY_BINDING GL_VERTEX_ARRAY_BINDING_OES +#endif + +// Desktop GL 2.0+ has extension and glPolygonMode() which GL ES and WebGL don't have.. +// A desktop ES context can technically compile fine with our loader, so we also perform a runtime checks +#if !defined(IMGUI_IMPL_OPENGL_ES2) && !defined(IMGUI_IMPL_OPENGL_ES3) +#define IMGUI_IMPL_OPENGL_HAS_EXTENSIONS // has glGetIntegerv(GL_NUM_EXTENSIONS) +#define IMGUI_IMPL_OPENGL_MAY_HAVE_POLYGON_MODE // may have glPolygonMode() +#endif + +// Desktop GL 2.1+ and GL ES 3.0+ have glBindBuffer() with GL_PIXEL_UNPACK_BUFFER target. +#if !defined(IMGUI_IMPL_OPENGL_ES2) +#define IMGUI_IMPL_OPENGL_MAY_HAVE_BIND_BUFFER_PIXEL_UNPACK +#endif + +// Desktop GL 3.1+ has GL_PRIMITIVE_RESTART state +#if !defined(IMGUI_IMPL_OPENGL_ES2) && !defined(IMGUI_IMPL_OPENGL_ES3) && defined(GL_VERSION_3_1) +#define IMGUI_IMPL_OPENGL_MAY_HAVE_PRIMITIVE_RESTART +#endif + +// Desktop GL 3.2+ has glDrawElementsBaseVertex() which GL ES and WebGL don't have. +#if !defined(IMGUI_IMPL_OPENGL_ES2) && !defined(IMGUI_IMPL_OPENGL_ES3) && defined(GL_VERSION_3_2) +#define IMGUI_IMPL_OPENGL_MAY_HAVE_VTX_OFFSET +#endif + +// Desktop GL 3.3+ and GL ES 3.0+ have glBindSampler() +#if !defined(IMGUI_IMPL_OPENGL_ES2) && (defined(IMGUI_IMPL_OPENGL_ES3) || defined(GL_VERSION_3_3)) +#define IMGUI_IMPL_OPENGL_MAY_HAVE_BIND_SAMPLER +#endif + +// [Debugging] +//#define IMGUI_IMPL_OPENGL_DEBUG +#ifdef IMGUI_IMPL_OPENGL_DEBUG +#include +#define GL_CALL(_CALL) do { _CALL; GLenum gl_err = glGetError(); if (gl_err != 0) fprintf(stderr, "GL error 0x%x returned from '%s'.\n", gl_err, #_CALL); } while (0) // Call with error check +#else +#define GL_CALL(_CALL) _CALL // Call without error check +#endif // OpenGL Data -static char g_GlslVersionString[128] = ""; -static GLuint g_FontTexture = 0; -static GLuint g_ShaderHandle = 0, g_VertHandle = 0, g_FragHandle = 0; -static int g_AttribLocationTex = 0, g_AttribLocationProjMtx = 0; // Uniforms location -static int g_AttribLocationVtxPos = 0, g_AttribLocationVtxUV = 0, g_AttribLocationVtxColor = 0; // Vertex attributes location -static unsigned int g_VboHandle = 0, g_ElementsHandle = 0; -static int IMGUI_IMPL_OPENGL_HAS_DRAW_WITH_BASE_VERTEX = 0; +struct ImGui_ImplOpenGL3_Data +{ + GLuint GlVersion; // Extracted at runtime using GL_MAJOR_VERSION, GL_MINOR_VERSION queries (e.g. 320 for GL 3.2) + char GlslVersionString[128]; // Specified by user or detected based on compile time GL settings. + bool GlProfileIsES2; + bool GlProfileIsES3; + bool GlProfileIsCompat; + GLint GlProfileMask; + GLuint FontTexture; + GLuint ShaderHandle; + GLint AttribLocationTex; // Uniforms location + GLint AttribLocationProjMtx; + GLuint AttribLocationVtxPos; // Vertex attributes location + GLuint AttribLocationVtxUV; + GLuint AttribLocationVtxColor; + unsigned int VboHandle, ElementsHandle; + GLsizeiptr VertexBufferSize; + GLsizeiptr IndexBufferSize; + bool HasPolygonMode; + bool HasClipOrigin; + bool UseBufferSubData; + + ImGui_ImplOpenGL3_Data() { memset((void*)this, 0, sizeof(*this)); } +}; + +// Backend data stored in io.BackendRendererUserData to allow support for multiple Dear ImGui contexts +// It is STRONGLY preferred that you use docking branch with multi-viewports (== single Dear ImGui context + multiple windows) instead of multiple Dear ImGui contexts. +static ImGui_ImplOpenGL3_Data* ImGui_ImplOpenGL3_GetBackendData() +{ + return ImGui::GetCurrentContext() ? (ImGui_ImplOpenGL3_Data*)ImGui::GetIO().BackendRendererUserData : nullptr; +} + +// Forward Declarations +static void ImGui_ImplOpenGL3_InitMultiViewportSupport(); +static void ImGui_ImplOpenGL3_ShutdownMultiViewportSupport(); + +// OpenGL vertex attribute state (for ES 1.0 and ES 2.0 only) +#ifndef IMGUI_IMPL_OPENGL_USE_VERTEX_ARRAY +struct ImGui_ImplOpenGL3_VtxAttribState +{ + GLint Enabled, Size, Type, Normalized, Stride; + GLvoid* Ptr; + + void GetState(GLint index) + { + glGetVertexAttribiv(index, GL_VERTEX_ATTRIB_ARRAY_ENABLED, &Enabled); + glGetVertexAttribiv(index, GL_VERTEX_ATTRIB_ARRAY_SIZE, &Size); + glGetVertexAttribiv(index, GL_VERTEX_ATTRIB_ARRAY_TYPE, &Type); + glGetVertexAttribiv(index, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, &Normalized); + glGetVertexAttribiv(index, GL_VERTEX_ATTRIB_ARRAY_STRIDE, &Stride); + glGetVertexAttribPointerv(index, GL_VERTEX_ATTRIB_ARRAY_POINTER, &Ptr); + } + void SetState(GLint index) + { + glVertexAttribPointer(index, Size, Type, (GLboolean)Normalized, Stride, Ptr); + if (Enabled) glEnableVertexAttribArray(index); else glDisableVertexAttribArray(index); + } +}; +#endif + +// Not static to allow third-party code to use that if they want to (but undocumented) +bool ImGui_ImplOpenGL3_InitLoader(); +bool ImGui_ImplOpenGL3_InitLoader() +{ + // Initialize our loader +#ifdef IMGUI_IMPL_OPENGL_LOADER_IMGL3W + if (glGetIntegerv == nullptr && imgl3wInit() != 0) + { + fprintf(stderr, "Failed to initialize OpenGL loader!\n"); + return false; + } +#endif + return true; +} // Functions bool ImGui_ImplOpenGL3_Init(const char* glsl_version) { - // Setup back-end capabilities flags ImGuiIO& io = ImGui::GetIO(); + IMGUI_CHECKVERSION(); + IM_ASSERT(io.BackendRendererUserData == nullptr && "Already initialized a renderer backend!"); + + // Initialize loader + if (!ImGui_ImplOpenGL3_InitLoader()) + return false; + + // Setup backend capabilities flags + ImGui_ImplOpenGL3_Data* bd = IM_NEW(ImGui_ImplOpenGL3_Data)(); + io.BackendRendererUserData = (void*)bd; io.BackendRendererName = "imgui_impl_opengl3"; - if (GLAD_GL_VERSION_3_3 || GLAD_GL_ES_VERSION_3_2) - IMGUI_IMPL_OPENGL_HAS_DRAW_WITH_BASE_VERTEX = 1; - -#if IMGUI_IMPL_OPENGL_HAS_DRAW_WITH_BASE_VERTEX - io.BackendFlags |= ImGuiBackendFlags_RendererHasVtxOffset; // We can honor the ImDrawCmd::VtxOffset field, allowing for large meshes. + // Query for GL version (e.g. 320 for GL 3.2) + const char* gl_version_str = (const char*)glGetString(GL_VERSION); +#if defined(IMGUI_IMPL_OPENGL_ES2) + // GLES 2 + bd->GlVersion = 200; + bd->GlProfileIsES2 = true; + IM_UNUSED(gl_version_str); +#else + // Desktop or GLES 3 + GLint major = 0; + GLint minor = 0; + glGetIntegerv(GL_MAJOR_VERSION, &major); + glGetIntegerv(GL_MINOR_VERSION, &minor); + if (major == 0 && minor == 0) + sscanf(gl_version_str, "%d.%d", &major, &minor); // Query GL_VERSION in desktop GL 2.x, the string will start with "." + bd->GlVersion = (GLuint)(major * 100 + minor * 10); +#if defined(GL_CONTEXT_PROFILE_MASK) + if (bd->GlVersion >= 320) + glGetIntegerv(GL_CONTEXT_PROFILE_MASK, &bd->GlProfileMask); + bd->GlProfileIsCompat = (bd->GlProfileMask & GL_CONTEXT_COMPATIBILITY_PROFILE_BIT) != 0; #endif - // Store GLSL version string so we can refer to it later in case we recreate shaders. Note: GLSL version is NOT the same as GL version. Leave this to NULL if unsure. +#if defined(IMGUI_IMPL_OPENGL_ES3) + bd->GlProfileIsES3 = true; +#else + if (strncmp(gl_version_str, "OpenGL ES 3", 11) == 0) + bd->GlProfileIsES3 = true; +#endif + + bd->UseBufferSubData = false; + /* + // Query vendor to enable glBufferSubData kludge +#ifdef _WIN32 + if (const char* vendor = (const char*)glGetString(GL_VENDOR)) + if (strncmp(vendor, "Intel", 5) == 0) + bd->UseBufferSubData = true; +#endif + */ +#endif + +#ifdef IMGUI_IMPL_OPENGL_DEBUG + printf("GlVersion = %d, \"%s\"\nGlProfileIsCompat = %d\nGlProfileMask = 0x%X\nGlProfileIsES2/IsEs3 = %d/%d\nGL_VENDOR = '%s'\nGL_RENDERER = '%s'\n", bd->GlVersion, gl_version_str, bd->GlProfileIsCompat, bd->GlProfileMask, bd->GlProfileIsES2, bd->GlProfileIsES3, (const char*)glGetString(GL_VENDOR), (const char*)glGetString(GL_RENDERER)); // [DEBUG] +#endif + +#ifdef IMGUI_IMPL_OPENGL_MAY_HAVE_VTX_OFFSET + if (bd->GlVersion >= 320) + io.BackendFlags |= ImGuiBackendFlags_RendererHasVtxOffset; // We can honor the ImDrawCmd::VtxOffset field, allowing for large meshes. +#endif + io.BackendFlags |= ImGuiBackendFlags_RendererHasViewports; // We can create multi-viewports on the Renderer side (optional) + + // Store GLSL version string so we can refer to it later in case we recreate shaders. + // Note: GLSL version is NOT the same as GL version. Leave this to nullptr if unsure. + if (glsl_version == nullptr) + { #if defined(IMGUI_IMPL_OPENGL_ES2) - if (glsl_version == NULL) glsl_version = "#version 100"; #elif defined(IMGUI_IMPL_OPENGL_ES3) - if (glsl_version == NULL) glsl_version = "#version 300 es"; +#elif defined(__APPLE__) + glsl_version = "#version 150"; #else - if (glsl_version == NULL) glsl_version = "#version 130"; #endif - IM_ASSERT((int)strlen(glsl_version) + 2 < IM_ARRAYSIZE(g_GlslVersionString)); - strcpy(g_GlslVersionString, glsl_version); - strcat(g_GlslVersionString, "\n"); + } + IM_ASSERT((int)strlen(glsl_version) + 2 < IM_ARRAYSIZE(bd->GlslVersionString)); + strcpy(bd->GlslVersionString, glsl_version); + strcat(bd->GlslVersionString, "\n"); - // Make a dummy GL call (we don't actually need the result) - // IF YOU GET A CRASH HERE: it probably means that you haven't initialized the OpenGL function loader used by this code. - // Desktop OpenGL 3/4 need a function loader. See the IMGUI_IMPL_OPENGL_LOADER_xxx explanation above. + // Make an arbitrary GL call (we don't actually need the result) + // IF YOU GET A CRASH HERE: it probably means the OpenGL function loader didn't do its job. Let us know! GLint current_texture; glGetIntegerv(GL_TEXTURE_BINDING_2D, ¤t_texture); + // Detect extensions we support +#ifdef IMGUI_IMPL_OPENGL_MAY_HAVE_POLYGON_MODE + bd->HasPolygonMode = (!bd->GlProfileIsES2 && !bd->GlProfileIsES3); +#endif + bd->HasClipOrigin = (bd->GlVersion >= 450); +#ifdef IMGUI_IMPL_OPENGL_HAS_EXTENSIONS + GLint num_extensions = 0; + glGetIntegerv(GL_NUM_EXTENSIONS, &num_extensions); + for (GLint i = 0; i < num_extensions; i++) + { + const char* extension = (const char*)glGetStringi(GL_EXTENSIONS, i); + if (extension != nullptr && strcmp(extension, "GL_ARB_clip_control") == 0) + bd->HasClipOrigin = true; + } +#endif + + ImGui_ImplOpenGL3_InitMultiViewportSupport(); + return true; } void ImGui_ImplOpenGL3_Shutdown() { + ImGui_ImplOpenGL3_Data* bd = ImGui_ImplOpenGL3_GetBackendData(); + IM_ASSERT(bd != nullptr && "No renderer backend to shutdown, or already shutdown?"); + ImGuiIO& io = ImGui::GetIO(); + + ImGui_ImplOpenGL3_ShutdownMultiViewportSupport(); ImGui_ImplOpenGL3_DestroyDeviceObjects(); + io.BackendRendererName = nullptr; + io.BackendRendererUserData = nullptr; + io.BackendFlags &= ~(ImGuiBackendFlags_RendererHasVtxOffset | ImGuiBackendFlags_RendererHasViewports); + IM_DELETE(bd); } void ImGui_ImplOpenGL3_NewFrame() { - if (!g_ShaderHandle) + ImGui_ImplOpenGL3_Data* bd = ImGui_ImplOpenGL3_GetBackendData(); + IM_ASSERT(bd != nullptr && "Context or backend not initialized! Did you call ImGui_ImplOpenGL3_Init()?"); + + ImGui_ImplOpenGL3_InitLoader(); // Lazily init loader if not already done for e.g. DLL boundaries. + + if (!bd->ShaderHandle) ImGui_ImplOpenGL3_CreateDeviceObjects(); + if (!bd->FontTexture) + ImGui_ImplOpenGL3_CreateFontsTexture(); } static void ImGui_ImplOpenGL3_SetupRenderState(ImDrawData* draw_data, int fb_width, int fb_height, GLuint vertex_array_object) { + ImGui_ImplOpenGL3_Data* bd = ImGui_ImplOpenGL3_GetBackendData(); + // Setup render state: alpha-blending enabled, no face culling, no depth testing, scissor enabled, polygon fill glEnable(GL_BLEND); glBlendEquation(GL_FUNC_ADD); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA); glDisable(GL_CULL_FACE); glDisable(GL_DEPTH_TEST); + glDisable(GL_STENCIL_TEST); glEnable(GL_SCISSOR_TEST); +#ifdef IMGUI_IMPL_OPENGL_MAY_HAVE_PRIMITIVE_RESTART + if (bd->GlVersion >= 310) + glDisable(GL_PRIMITIVE_RESTART); +#endif +#ifdef IMGUI_IMPL_OPENGL_MAY_HAVE_POLYGON_MODE + if (bd->HasPolygonMode) + glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); +#endif + + // Support for GL 4.5 rarely used glClipControl(GL_UPPER_LEFT) +#if defined(GL_CLIP_ORIGIN) + bool clip_origin_lower_left = true; + if (bd->HasClipOrigin) + { + GLenum current_clip_origin = 0; glGetIntegerv(GL_CLIP_ORIGIN, (GLint*)¤t_clip_origin); + if (current_clip_origin == GL_UPPER_LEFT) + clip_origin_lower_left = false; + } +#endif // Setup viewport, orthographic projection matrix // Our visible imgui space lies from draw_data->DisplayPos (top left) to draw_data->DisplayPos+data_data->DisplaySize (bottom right). DisplayPos is (0,0) for single viewport apps. - glViewport(0, 0, (GLsizei)fb_width, (GLsizei)fb_height); + GL_CALL(glViewport(0, 0, (GLsizei)fb_width, (GLsizei)fb_height)); float L = draw_data->DisplayPos.x; float R = draw_data->DisplayPos.x + draw_data->DisplaySize.x; float T = draw_data->DisplayPos.y; float B = draw_data->DisplayPos.y + draw_data->DisplaySize.y; +#if defined(GL_CLIP_ORIGIN) + if (!clip_origin_lower_left) { float tmp = T; T = B; B = tmp; } // Swap top and bottom if origin is upper left +#endif const float ortho_projection[4][4] = { { 2.0f/(R-L), 0.0f, 0.0f, 0.0f }, @@ -156,29 +491,34 @@ static void ImGui_ImplOpenGL3_SetupRenderState(ImDrawData* draw_data, int fb_wid { 0.0f, 0.0f, -1.0f, 0.0f }, { (R+L)/(L-R), (T+B)/(B-T), 0.0f, 1.0f }, }; - glUseProgram(g_ShaderHandle); - glUniform1i(g_AttribLocationTex, 0); - glUniformMatrix4fv(g_AttribLocationProjMtx, 1, GL_FALSE, &ortho_projection[0][0]); + glUseProgram(bd->ShaderHandle); + glUniform1i(bd->AttribLocationTex, 0); + glUniformMatrix4fv(bd->AttribLocationProjMtx, 1, GL_FALSE, &ortho_projection[0][0]); + +#ifdef IMGUI_IMPL_OPENGL_MAY_HAVE_BIND_SAMPLER + if (bd->GlVersion >= 330 || bd->GlProfileIsES3) + glBindSampler(0, 0); // We use combined texture/sampler state. Applications using GL 3.3 and GL ES 3.0 may set that otherwise. +#endif (void)vertex_array_object; -#ifndef IMGUI_IMPL_OPENGL_ES2 +#ifdef IMGUI_IMPL_OPENGL_USE_VERTEX_ARRAY glBindVertexArray(vertex_array_object); #endif // Bind vertex/index buffers and setup attributes for ImDrawVert - glBindBuffer(GL_ARRAY_BUFFER, g_VboHandle); - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, g_ElementsHandle); - glEnableVertexAttribArray(g_AttribLocationVtxPos); - glEnableVertexAttribArray(g_AttribLocationVtxUV); - glEnableVertexAttribArray(g_AttribLocationVtxColor); - glVertexAttribPointer(g_AttribLocationVtxPos, 2, GL_FLOAT, GL_FALSE, sizeof(ImDrawVert), (GLvoid*)IM_OFFSETOF(ImDrawVert, pos)); - glVertexAttribPointer(g_AttribLocationVtxUV, 2, GL_FLOAT, GL_FALSE, sizeof(ImDrawVert), (GLvoid*)IM_OFFSETOF(ImDrawVert, uv)); - glVertexAttribPointer(g_AttribLocationVtxColor, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(ImDrawVert), (GLvoid*)IM_OFFSETOF(ImDrawVert, col)); + GL_CALL(glBindBuffer(GL_ARRAY_BUFFER, bd->VboHandle)); + GL_CALL(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, bd->ElementsHandle)); + GL_CALL(glEnableVertexAttribArray(bd->AttribLocationVtxPos)); + GL_CALL(glEnableVertexAttribArray(bd->AttribLocationVtxUV)); + GL_CALL(glEnableVertexAttribArray(bd->AttribLocationVtxColor)); + GL_CALL(glVertexAttribPointer(bd->AttribLocationVtxPos, 2, GL_FLOAT, GL_FALSE, sizeof(ImDrawVert), (GLvoid*)offsetof(ImDrawVert, pos))); + GL_CALL(glVertexAttribPointer(bd->AttribLocationVtxUV, 2, GL_FLOAT, GL_FALSE, sizeof(ImDrawVert), (GLvoid*)offsetof(ImDrawVert, uv))); + GL_CALL(glVertexAttribPointer(bd->AttribLocationVtxColor, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(ImDrawVert), (GLvoid*)offsetof(ImDrawVert, col))); } // OpenGL3 Render function. -// (this used to be set in io.RenderDrawListsFn and called by ImGui::Render(), but you can now call this directly from your main loop) -// Note that this implementation is little overcomplicated because we are saving/setting up/restoring every OpenGL state explicitly, in order to be able to run within any OpenGL engine that doesn't do so. +// Note that this implementation is little overcomplicated because we are saving/setting up/restoring every OpenGL state explicitly. +// This is in order to be able to run within an OpenGL engine that doesn't do so. void ImGui_ImplOpenGL3_RenderDrawData(ImDrawData* draw_data) { // Avoid rendering when minimized, scale coordinates for retina displays (screen coordinates != framebuffer coordinates) @@ -187,25 +527,38 @@ void ImGui_ImplOpenGL3_RenderDrawData(ImDrawData* draw_data) if (fb_width <= 0 || fb_height <= 0) return; + ImGui_ImplOpenGL3_InitLoader(); // Lazily init loader if not already done for e.g. DLL boundaries. + + ImGui_ImplOpenGL3_Data* bd = ImGui_ImplOpenGL3_GetBackendData(); + // Backup GL state + GLboolean last_enable_srgb = GL_FALSE; + if (!Global.gfx_usegles && !Global.gfx_shadergamma) + { + last_enable_srgb = glIsEnabled(GL_FRAMEBUFFER_SRGB); + glEnable(GL_FRAMEBUFFER_SRGB); + } GLenum last_active_texture; glGetIntegerv(GL_ACTIVE_TEXTURE, (GLint*)&last_active_texture); glActiveTexture(GL_TEXTURE0); - GLint last_program; glGetIntegerv(GL_CURRENT_PROGRAM, &last_program); - GLint last_texture; glGetIntegerv(GL_TEXTURE_BINDING_2D, &last_texture); - GLint last_array_buffer; glGetIntegerv(GL_ARRAY_BUFFER_BINDING, &last_array_buffer); -#ifndef IMGUI_IMPL_OPENGL_ES2 - GLint last_vertex_array_object; glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &last_vertex_array_object); + GLuint last_program; glGetIntegerv(GL_CURRENT_PROGRAM, (GLint*)&last_program); + GLuint last_texture; glGetIntegerv(GL_TEXTURE_BINDING_2D, (GLint*)&last_texture); +#ifdef IMGUI_IMPL_OPENGL_MAY_HAVE_BIND_SAMPLER + GLuint last_sampler; if (bd->GlVersion >= 330 || bd->GlProfileIsES3) { glGetIntegerv(GL_SAMPLER_BINDING, (GLint*)&last_sampler); } else { last_sampler = 0; } +#endif + GLuint last_array_buffer; glGetIntegerv(GL_ARRAY_BUFFER_BINDING, (GLint*)&last_array_buffer); +#ifndef IMGUI_IMPL_OPENGL_USE_VERTEX_ARRAY + // This is part of VAO on OpenGL 3.0+ and OpenGL ES 3.0+. + GLint last_element_array_buffer; glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING, &last_element_array_buffer); + ImGui_ImplOpenGL3_VtxAttribState last_vtx_attrib_state_pos; last_vtx_attrib_state_pos.GetState(bd->AttribLocationVtxPos); + ImGui_ImplOpenGL3_VtxAttribState last_vtx_attrib_state_uv; last_vtx_attrib_state_uv.GetState(bd->AttribLocationVtxUV); + ImGui_ImplOpenGL3_VtxAttribState last_vtx_attrib_state_color; last_vtx_attrib_state_color.GetState(bd->AttribLocationVtxColor); +#endif +#ifdef IMGUI_IMPL_OPENGL_USE_VERTEX_ARRAY + GLuint last_vertex_array_object; glGetIntegerv(GL_VERTEX_ARRAY_BINDING, (GLint*)&last_vertex_array_object); +#endif +#ifdef IMGUI_IMPL_OPENGL_MAY_HAVE_POLYGON_MODE + GLint last_polygon_mode[2]; if (bd->HasPolygonMode) { glGetIntegerv(GL_POLYGON_MODE, last_polygon_mode); } #endif - GLboolean last_enable_srgb; - if (!Global.gfx_usegles) - { - if (!Global.gfx_shadergamma) - { - last_enable_srgb = glIsEnabled(GL_FRAMEBUFFER_SRGB); - glEnable(GL_FRAMEBUFFER_SRGB); - } - } - GLint last_viewport[4]; glGetIntegerv(GL_VIEWPORT, last_viewport); GLint last_scissor_box[4]; glGetIntegerv(GL_SCISSOR_BOX, last_scissor_box); GLenum last_blend_src_rgb; glGetIntegerv(GL_BLEND_SRC_RGB, (GLint*)&last_blend_src_rgb); @@ -217,15 +570,18 @@ void ImGui_ImplOpenGL3_RenderDrawData(ImDrawData* draw_data) GLboolean last_enable_blend = glIsEnabled(GL_BLEND); GLboolean last_enable_cull_face = glIsEnabled(GL_CULL_FACE); GLboolean last_enable_depth_test = glIsEnabled(GL_DEPTH_TEST); + GLboolean last_enable_stencil_test = glIsEnabled(GL_STENCIL_TEST); GLboolean last_enable_scissor_test = glIsEnabled(GL_SCISSOR_TEST); - bool clip_origin_lower_left = true; +#ifdef IMGUI_IMPL_OPENGL_MAY_HAVE_PRIMITIVE_RESTART + GLboolean last_enable_primitive_restart = (bd->GlVersion >= 310) ? glIsEnabled(GL_PRIMITIVE_RESTART) : GL_FALSE; +#endif // Setup desired GL state // Recreate the VAO every time (this is to easily allow multiple GL contexts to be rendered to. VAO are not shared among GL contexts) // The renderer would actually work without any VAO bound, but then our VertexAttrib calls would overwrite the default one currently bound. GLuint vertex_array_object = 0; -#ifndef IMGUI_IMPL_OPENGL_ES2 - glGenVertexArrays(1, &vertex_array_object); +#ifdef IMGUI_IMPL_OPENGL_USE_VERTEX_ARRAY + GL_CALL(glGenVertexArrays(1, &vertex_array_object)); #endif ImGui_ImplOpenGL3_SetupRenderState(draw_data, fb_width, fb_height, vertex_array_object); @@ -236,140 +592,183 @@ void ImGui_ImplOpenGL3_RenderDrawData(ImDrawData* draw_data) // Render command lists for (int n = 0; n < draw_data->CmdListsCount; n++) { - const ImDrawList* cmd_list = draw_data->CmdLists[n]; + const ImDrawList* draw_list = draw_data->CmdLists[n]; // Upload vertex/index buffers - glBufferData(GL_ARRAY_BUFFER, (GLsizeiptr)cmd_list->VtxBuffer.Size * sizeof(ImDrawVert), (const GLvoid*)cmd_list->VtxBuffer.Data, GL_STREAM_DRAW); - glBufferData(GL_ELEMENT_ARRAY_BUFFER, (GLsizeiptr)cmd_list->IdxBuffer.Size * sizeof(ImDrawIdx), (const GLvoid*)cmd_list->IdxBuffer.Data, GL_STREAM_DRAW); - - for (int cmd_i = 0; cmd_i < cmd_list->CmdBuffer.Size; cmd_i++) + // - OpenGL drivers are in a very sorry state nowadays.... + // During 2021 we attempted to switch from glBufferData() to orphaning+glBufferSubData() following reports + // of leaks on Intel GPU when using multi-viewports on Windows. + // - After this we kept hearing of various display corruptions issues. We started disabling on non-Intel GPU, but issues still got reported on Intel. + // - We are now back to using exclusively glBufferData(). So bd->UseBufferSubData IS ALWAYS FALSE in this code. + // We are keeping the old code path for a while in case people finding new issues may want to test the bd->UseBufferSubData path. + // - See https://github.com/ocornut/imgui/issues/4468 and please report any corruption issues. + const GLsizeiptr vtx_buffer_size = (GLsizeiptr)draw_list->VtxBuffer.Size * (int)sizeof(ImDrawVert); + const GLsizeiptr idx_buffer_size = (GLsizeiptr)draw_list->IdxBuffer.Size * (int)sizeof(ImDrawIdx); + if (bd->UseBufferSubData) { - const ImDrawCmd* pcmd = &cmd_list->CmdBuffer[cmd_i]; - if (pcmd->UserCallback != NULL) + if (bd->VertexBufferSize < vtx_buffer_size) + { + bd->VertexBufferSize = vtx_buffer_size; + GL_CALL(glBufferData(GL_ARRAY_BUFFER, bd->VertexBufferSize, nullptr, GL_STREAM_DRAW)); + } + if (bd->IndexBufferSize < idx_buffer_size) + { + bd->IndexBufferSize = idx_buffer_size; + GL_CALL(glBufferData(GL_ELEMENT_ARRAY_BUFFER, bd->IndexBufferSize, nullptr, GL_STREAM_DRAW)); + } + GL_CALL(glBufferSubData(GL_ARRAY_BUFFER, 0, vtx_buffer_size, (const GLvoid*)draw_list->VtxBuffer.Data)); + GL_CALL(glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, idx_buffer_size, (const GLvoid*)draw_list->IdxBuffer.Data)); + } + else + { + GL_CALL(glBufferData(GL_ARRAY_BUFFER, vtx_buffer_size, (const GLvoid*)draw_list->VtxBuffer.Data, GL_STREAM_DRAW)); + GL_CALL(glBufferData(GL_ELEMENT_ARRAY_BUFFER, idx_buffer_size, (const GLvoid*)draw_list->IdxBuffer.Data, GL_STREAM_DRAW)); + } + + for (int cmd_i = 0; cmd_i < draw_list->CmdBuffer.Size; cmd_i++) + { + const ImDrawCmd* pcmd = &draw_list->CmdBuffer[cmd_i]; + if (pcmd->UserCallback != nullptr) { // User callback, registered via ImDrawList::AddCallback() // (ImDrawCallback_ResetRenderState is a special callback value used by the user to request the renderer to reset render state.) if (pcmd->UserCallback == ImDrawCallback_ResetRenderState) ImGui_ImplOpenGL3_SetupRenderState(draw_data, fb_width, fb_height, vertex_array_object); else - pcmd->UserCallback(cmd_list, pcmd); + pcmd->UserCallback(draw_list, pcmd); } else { // Project scissor/clipping rectangles into framebuffer space - ImVec4 clip_rect; - clip_rect.x = (pcmd->ClipRect.x - clip_off.x) * clip_scale.x; - clip_rect.y = (pcmd->ClipRect.y - clip_off.y) * clip_scale.y; - clip_rect.z = (pcmd->ClipRect.z - clip_off.x) * clip_scale.x; - clip_rect.w = (pcmd->ClipRect.w - clip_off.y) * clip_scale.y; + ImVec2 clip_min((pcmd->ClipRect.x - clip_off.x) * clip_scale.x, (pcmd->ClipRect.y - clip_off.y) * clip_scale.y); + ImVec2 clip_max((pcmd->ClipRect.z - clip_off.x) * clip_scale.x, (pcmd->ClipRect.w - clip_off.y) * clip_scale.y); + if (clip_max.x <= clip_min.x || clip_max.y <= clip_min.y) + continue; - if (clip_rect.x < fb_width && clip_rect.y < fb_height && clip_rect.z >= 0.0f && clip_rect.w >= 0.0f) - { - // Apply scissor/clipping rectangle - if (clip_origin_lower_left) - glScissor((int)clip_rect.x, (int)(fb_height - clip_rect.w), (int)(clip_rect.z - clip_rect.x), (int)(clip_rect.w - clip_rect.y)); - else - glScissor((int)clip_rect.x, (int)clip_rect.y, (int)clip_rect.z, (int)clip_rect.w); // Support for GL 4.5 rarely used glClipControl(GL_UPPER_LEFT) + // Apply scissor/clipping rectangle (Y is inverted in OpenGL) + GL_CALL(glScissor((int)clip_min.x, (int)((float)fb_height - clip_max.y), (int)(clip_max.x - clip_min.x), (int)(clip_max.y - clip_min.y))); - // Bind texture, Draw - glBindTexture(GL_TEXTURE_2D, (GLuint)(intptr_t)pcmd->TextureId); -#if IMGUI_IMPL_OPENGL_HAS_DRAW_WITH_BASE_VERTEX - glDrawElementsBaseVertex(GL_TRIANGLES, (GLsizei)pcmd->ElemCount, sizeof(ImDrawIdx) == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, (void*)(intptr_t)(pcmd->IdxOffset * sizeof(ImDrawIdx)), (GLint)pcmd->VtxOffset); -#else - glDrawElements(GL_TRIANGLES, (GLsizei)pcmd->ElemCount, sizeof(ImDrawIdx) == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, (void*)(intptr_t)(pcmd->IdxOffset * sizeof(ImDrawIdx))); + // Bind texture, Draw + GL_CALL(glBindTexture(GL_TEXTURE_2D, (GLuint)(intptr_t)pcmd->GetTexID())); +#ifdef IMGUI_IMPL_OPENGL_MAY_HAVE_VTX_OFFSET + if (bd->GlVersion >= 320) + GL_CALL(glDrawElementsBaseVertex(GL_TRIANGLES, (GLsizei)pcmd->ElemCount, sizeof(ImDrawIdx) == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, (void*)(intptr_t)(pcmd->IdxOffset * sizeof(ImDrawIdx)), (GLint)pcmd->VtxOffset)); + else #endif - } + GL_CALL(glDrawElements(GL_TRIANGLES, (GLsizei)pcmd->ElemCount, sizeof(ImDrawIdx) == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, (void*)(intptr_t)(pcmd->IdxOffset * sizeof(ImDrawIdx)))); } } } // Destroy the temporary VAO -#ifndef IMGUI_IMPL_OPENGL_ES2 - glDeleteVertexArrays(1, &vertex_array_object); +#ifdef IMGUI_IMPL_OPENGL_USE_VERTEX_ARRAY + GL_CALL(glDeleteVertexArrays(1, &vertex_array_object)); #endif // Restore modified GL state - glUseProgram(last_program); + // This "glIsProgram()" check is required because if the program is "pending deletion" at the time of binding backup, it will have been deleted by now and will cause an OpenGL error. See #6220. + if (last_program == 0 || glIsProgram(last_program)) glUseProgram(last_program); glBindTexture(GL_TEXTURE_2D, last_texture); +#ifdef IMGUI_IMPL_OPENGL_MAY_HAVE_BIND_SAMPLER + if (bd->GlVersion >= 330 || bd->GlProfileIsES3) + glBindSampler(0, last_sampler); +#endif glActiveTexture(last_active_texture); -#ifndef IMGUI_IMPL_OPENGL_ES2 +#ifdef IMGUI_IMPL_OPENGL_USE_VERTEX_ARRAY glBindVertexArray(last_vertex_array_object); #endif glBindBuffer(GL_ARRAY_BUFFER, last_array_buffer); +#ifndef IMGUI_IMPL_OPENGL_USE_VERTEX_ARRAY + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, last_element_array_buffer); + last_vtx_attrib_state_pos.SetState(bd->AttribLocationVtxPos); + last_vtx_attrib_state_uv.SetState(bd->AttribLocationVtxUV); + last_vtx_attrib_state_color.SetState(bd->AttribLocationVtxColor); +#endif glBlendEquationSeparate(last_blend_equation_rgb, last_blend_equation_alpha); glBlendFuncSeparate(last_blend_src_rgb, last_blend_dst_rgb, last_blend_src_alpha, last_blend_dst_alpha); if (last_enable_blend) glEnable(GL_BLEND); else glDisable(GL_BLEND); if (last_enable_cull_face) glEnable(GL_CULL_FACE); else glDisable(GL_CULL_FACE); if (last_enable_depth_test) glEnable(GL_DEPTH_TEST); else glDisable(GL_DEPTH_TEST); + if (last_enable_stencil_test) glEnable(GL_STENCIL_TEST); else glDisable(GL_STENCIL_TEST); if (last_enable_scissor_test) glEnable(GL_SCISSOR_TEST); else glDisable(GL_SCISSOR_TEST); +#ifdef IMGUI_IMPL_OPENGL_MAY_HAVE_PRIMITIVE_RESTART + if (bd->GlVersion >= 310) { if (last_enable_primitive_restart) glEnable(GL_PRIMITIVE_RESTART); else glDisable(GL_PRIMITIVE_RESTART); } +#endif + +#ifdef IMGUI_IMPL_OPENGL_MAY_HAVE_POLYGON_MODE + // Desktop OpenGL 3.0 and OpenGL 3.1 had separate polygon draw modes for front-facing and back-facing faces of polygons + if (bd->HasPolygonMode) { if (bd->GlVersion <= 310 || bd->GlProfileIsCompat) { glPolygonMode(GL_FRONT, (GLenum)last_polygon_mode[0]); glPolygonMode(GL_BACK, (GLenum)last_polygon_mode[1]); } else { glPolygonMode(GL_FRONT_AND_BACK, (GLenum)last_polygon_mode[0]); } } +#endif // IMGUI_IMPL_OPENGL_MAY_HAVE_POLYGON_MODE + glViewport(last_viewport[0], last_viewport[1], (GLsizei)last_viewport[2], (GLsizei)last_viewport[3]); glScissor(last_scissor_box[0], last_scissor_box[1], (GLsizei)last_scissor_box[2], (GLsizei)last_scissor_box[3]); - - if (!Global.gfx_usegles) + if (!Global.gfx_usegles && !Global.gfx_shadergamma) { - if (!Global.gfx_shadergamma) - { - if (last_enable_srgb) - glEnable(GL_FRAMEBUFFER_SRGB); - else - glDisable(GL_FRAMEBUFFER_SRGB); - } + if (last_enable_srgb) glEnable(GL_FRAMEBUFFER_SRGB); else glDisable(GL_FRAMEBUFFER_SRGB); } + (void)bd; // Not all compilation paths use this } bool ImGui_ImplOpenGL3_CreateFontsTexture() { - // Build texture atlas ImGuiIO& io = ImGui::GetIO(); + ImGui_ImplOpenGL3_Data* bd = ImGui_ImplOpenGL3_GetBackendData(); + + // Build texture atlas unsigned char* pixels; int width, height; - io.Fonts->GetTexDataAsRGBA32(&pixels, &width, &height); // Load as RGBA 32-bits (75% of the memory is wasted, but default font is so small) because it is more likely to be compatible with user's existing shaders. If your ImTextureId represent a higher-level concept than just a GL texture id, consider calling GetTexDataAsAlpha8() instead to save on GPU memory. + io.Fonts->GetTexDataAsRGBA32(&pixels, &width, &height); // Load as RGBA 32-bit (75% of the memory is wasted, but default font is so small) because it is more likely to be compatible with user's existing shaders. If your ImTextureId represent a higher-level concept than just a GL texture id, consider calling GetTexDataAsAlpha8() instead to save on GPU memory. // Upload texture to graphics system + // (Bilinear sampling is required by default. Set 'io.Fonts->Flags |= ImFontAtlasFlags_NoBakedLines' or 'style.AntiAliasedLinesUseTex = false' to allow point/nearest sampling) GLint last_texture; - glGetIntegerv(GL_TEXTURE_BINDING_2D, &last_texture); - glGenTextures(1, &g_FontTexture); - glBindTexture(GL_TEXTURE_2D, g_FontTexture); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); -#ifdef GL_UNPACK_ROW_LENGTH - glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); + GL_CALL(glGetIntegerv(GL_TEXTURE_BINDING_2D, &last_texture)); + GL_CALL(glGenTextures(1, &bd->FontTexture)); + GL_CALL(glBindTexture(GL_TEXTURE_2D, bd->FontTexture)); + GL_CALL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR)); + GL_CALL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR)); + GL_CALL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE)); + GL_CALL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE)); +#ifdef GL_UNPACK_ROW_LENGTH // Not on WebGL/ES + GL_CALL(glPixelStorei(GL_UNPACK_ROW_LENGTH, 0)); #endif - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels); + GL_CALL(glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels)); - // Store our identifier - io.Fonts->TexID = (ImTextureID)(intptr_t)g_FontTexture; + // Store identifier + io.Fonts->SetTexID((ImTextureID)(intptr_t)bd->FontTexture); // Restore state - glBindTexture(GL_TEXTURE_2D, last_texture); + GL_CALL(glBindTexture(GL_TEXTURE_2D, last_texture)); return true; } void ImGui_ImplOpenGL3_DestroyFontsTexture() { - if (g_FontTexture) + ImGuiIO& io = ImGui::GetIO(); + ImGui_ImplOpenGL3_Data* bd = ImGui_ImplOpenGL3_GetBackendData(); + if (bd->FontTexture) { - ImGuiIO& io = ImGui::GetIO(); - glDeleteTextures(1, &g_FontTexture); - io.Fonts->TexID = 0; - g_FontTexture = 0; + glDeleteTextures(1, &bd->FontTexture); + io.Fonts->SetTexID(0); + bd->FontTexture = 0; } } // If you get an error please report on github. You may try different GL context version or GLSL version. See GL<>GLSL version table at the top of this file. static bool CheckShader(GLuint handle, const char* desc) { + ImGui_ImplOpenGL3_Data* bd = ImGui_ImplOpenGL3_GetBackendData(); GLint status = 0, log_length = 0; glGetShaderiv(handle, GL_COMPILE_STATUS, &status); glGetShaderiv(handle, GL_INFO_LOG_LENGTH, &log_length); if ((GLboolean)status == GL_FALSE) - fprintf(stderr, "ERROR: ImGui_ImplOpenGL3_CreateDeviceObjects: failed to compile %s!\n", desc); + fprintf(stderr, "ERROR: ImGui_ImplOpenGL3_CreateDeviceObjects: failed to compile %s! With GLSL: %s\n", desc, bd->GlslVersionString); if (log_length > 1) { ImVector buf; buf.resize((int)(log_length + 1)); - glGetShaderInfoLog(handle, log_length, NULL, (GLchar*)buf.begin()); + glGetShaderInfoLog(handle, log_length, nullptr, (GLchar*)buf.begin()); fprintf(stderr, "%s\n", buf.begin()); } return (GLboolean)status == GL_TRUE; @@ -378,16 +777,17 @@ static bool CheckShader(GLuint handle, const char* desc) // If you get an error please report on GitHub. You may try different GL context version or GLSL version. static bool CheckProgram(GLuint handle, const char* desc) { + ImGui_ImplOpenGL3_Data* bd = ImGui_ImplOpenGL3_GetBackendData(); GLint status = 0, log_length = 0; glGetProgramiv(handle, GL_LINK_STATUS, &status); glGetProgramiv(handle, GL_INFO_LOG_LENGTH, &log_length); if ((GLboolean)status == GL_FALSE) - fprintf(stderr, "ERROR: ImGui_ImplOpenGL3_CreateDeviceObjects: failed to link %s! (with GLSL '%s')\n", desc, g_GlslVersionString); + fprintf(stderr, "ERROR: ImGui_ImplOpenGL3_CreateDeviceObjects: failed to link %s! With GLSL %s\n", desc, bd->GlslVersionString); if (log_length > 1) { ImVector buf; buf.resize((int)(log_length + 1)); - glGetProgramInfoLog(handle, log_length, NULL, (GLchar*)buf.begin()); + glGetProgramInfoLog(handle, log_length, nullptr, (GLchar*)buf.begin()); fprintf(stderr, "%s\n", buf.begin()); } return (GLboolean)status == GL_TRUE; @@ -395,18 +795,24 @@ static bool CheckProgram(GLuint handle, const char* desc) bool ImGui_ImplOpenGL3_CreateDeviceObjects() { + ImGui_ImplOpenGL3_Data* bd = ImGui_ImplOpenGL3_GetBackendData(); + // Backup GL state GLint last_texture, last_array_buffer; glGetIntegerv(GL_TEXTURE_BINDING_2D, &last_texture); glGetIntegerv(GL_ARRAY_BUFFER_BINDING, &last_array_buffer); -#ifndef IMGUI_IMPL_OPENGL_ES2 +#ifdef IMGUI_IMPL_OPENGL_MAY_HAVE_BIND_BUFFER_PIXEL_UNPACK + GLint last_pixel_unpack_buffer = 0; + if (bd->GlVersion >= 210) { glGetIntegerv(GL_PIXEL_UNPACK_BUFFER_BINDING, &last_pixel_unpack_buffer); glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); } +#endif +#ifdef IMGUI_IMPL_OPENGL_USE_VERTEX_ARRAY GLint last_vertex_array; glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &last_vertex_array); #endif // Parse GLSL version string int glsl_version = 130; - sscanf(g_GlslVersionString, "#version %d", &glsl_version); + sscanf(bd->GlslVersionString, "#version %d", &glsl_version); const GLchar* vertex_shader_glsl_120 = "uniform mat4 ProjMtx;\n" @@ -437,7 +843,7 @@ bool ImGui_ImplOpenGL3_CreateDeviceObjects() "}\n"; const GLchar* vertex_shader_glsl_300_es = - "precision mediump float;\n" + "precision highp float;\n" "layout (location = 0) in vec2 Position;\n" "layout (location = 1) in vec2 UV;\n" "layout (location = 2) in vec4 Color;\n" @@ -509,8 +915,8 @@ bool ImGui_ImplOpenGL3_CreateDeviceObjects() "}\n"; // Select shaders matching our GLSL versions - const GLchar* vertex_shader = NULL; - const GLchar* fragment_shader = NULL; + const GLchar* vertex_shader = nullptr; + const GLchar* fragment_shader = nullptr; if (glsl_version < 130) { vertex_shader = vertex_shader_glsl_120; @@ -533,43 +939,54 @@ bool ImGui_ImplOpenGL3_CreateDeviceObjects() } // Create shaders - const GLchar* vertex_shader_with_version[2] = { g_GlslVersionString, vertex_shader }; - g_VertHandle = glCreateShader(GL_VERTEX_SHADER); - glShaderSource(g_VertHandle, 2, vertex_shader_with_version, NULL); - glCompileShader(g_VertHandle); - CheckShader(g_VertHandle, "vertex shader"); + const GLchar* vertex_shader_with_version[2] = { bd->GlslVersionString, vertex_shader }; + GLuint vert_handle; + GL_CALL(vert_handle = glCreateShader(GL_VERTEX_SHADER)); + glShaderSource(vert_handle, 2, vertex_shader_with_version, nullptr); + glCompileShader(vert_handle); + CheckShader(vert_handle, "vertex shader"); + // MaSzyna: FBOUT() encodes the gamma when the renderer does it in shaders instead of a srgb framebuffer const GLchar* fbout_copy = "vec4 FBOUT(vec4 x) { return x; }\n"; const GLchar* fbout_gamma = "vec4 FBOUT(vec4 x) { return vec4(pow(x.rgb, vec3(1.0 / 2.2)), x.a); }\n"; + const GLchar* fragment_shader_with_version[3] = { bd->GlslVersionString, Global.gfx_shadergamma ? fbout_gamma : fbout_copy, fragment_shader }; + GLuint frag_handle; + GL_CALL(frag_handle = glCreateShader(GL_FRAGMENT_SHADER)); + glShaderSource(frag_handle, 3, fragment_shader_with_version, nullptr); + glCompileShader(frag_handle); + CheckShader(frag_handle, "fragment shader"); - const GLchar* fragment_shader_with_version[3] = { g_GlslVersionString, Global.gfx_shadergamma ? fbout_gamma : fbout_copy, fragment_shader }; - g_FragHandle = glCreateShader(GL_FRAGMENT_SHADER); - glShaderSource(g_FragHandle, 3, fragment_shader_with_version, NULL); - glCompileShader(g_FragHandle); - CheckShader(g_FragHandle, "fragment shader"); + // Link + bd->ShaderHandle = glCreateProgram(); + glAttachShader(bd->ShaderHandle, vert_handle); + glAttachShader(bd->ShaderHandle, frag_handle); + glLinkProgram(bd->ShaderHandle); + CheckProgram(bd->ShaderHandle, "shader program"); - g_ShaderHandle = glCreateProgram(); - glAttachShader(g_ShaderHandle, g_VertHandle); - glAttachShader(g_ShaderHandle, g_FragHandle); - glLinkProgram(g_ShaderHandle); - CheckProgram(g_ShaderHandle, "shader program"); + glDetachShader(bd->ShaderHandle, vert_handle); + glDetachShader(bd->ShaderHandle, frag_handle); + glDeleteShader(vert_handle); + glDeleteShader(frag_handle); - g_AttribLocationTex = glGetUniformLocation(g_ShaderHandle, "Texture"); - g_AttribLocationProjMtx = glGetUniformLocation(g_ShaderHandle, "ProjMtx"); - g_AttribLocationVtxPos = glGetAttribLocation(g_ShaderHandle, "Position"); - g_AttribLocationVtxUV = glGetAttribLocation(g_ShaderHandle, "UV"); - g_AttribLocationVtxColor = glGetAttribLocation(g_ShaderHandle, "Color"); + bd->AttribLocationTex = glGetUniformLocation(bd->ShaderHandle, "Texture"); + bd->AttribLocationProjMtx = glGetUniformLocation(bd->ShaderHandle, "ProjMtx"); + bd->AttribLocationVtxPos = (GLuint)glGetAttribLocation(bd->ShaderHandle, "Position"); + bd->AttribLocationVtxUV = (GLuint)glGetAttribLocation(bd->ShaderHandle, "UV"); + bd->AttribLocationVtxColor = (GLuint)glGetAttribLocation(bd->ShaderHandle, "Color"); // Create buffers - glGenBuffers(1, &g_VboHandle); - glGenBuffers(1, &g_ElementsHandle); + glGenBuffers(1, &bd->VboHandle); + glGenBuffers(1, &bd->ElementsHandle); ImGui_ImplOpenGL3_CreateFontsTexture(); // Restore modified GL state glBindTexture(GL_TEXTURE_2D, last_texture); glBindBuffer(GL_ARRAY_BUFFER, last_array_buffer); -#ifndef IMGUI_IMPL_OPENGL_ES2 +#ifdef IMGUI_IMPL_OPENGL_MAY_HAVE_BIND_BUFFER_PIXEL_UNPACK + if (bd->GlVersion >= 210) { glBindBuffer(GL_PIXEL_UNPACK_BUFFER, last_pixel_unpack_buffer); } +#endif +#ifdef IMGUI_IMPL_OPENGL_USE_VERTEX_ARRAY glBindVertexArray(last_vertex_array); #endif @@ -578,13 +995,48 @@ bool ImGui_ImplOpenGL3_CreateDeviceObjects() void ImGui_ImplOpenGL3_DestroyDeviceObjects() { - if (g_VboHandle) { glDeleteBuffers(1, &g_VboHandle); g_VboHandle = 0; } - if (g_ElementsHandle) { glDeleteBuffers(1, &g_ElementsHandle); g_ElementsHandle = 0; } - if (g_ShaderHandle && g_VertHandle) { glDetachShader(g_ShaderHandle, g_VertHandle); } - if (g_ShaderHandle && g_FragHandle) { glDetachShader(g_ShaderHandle, g_FragHandle); } - if (g_VertHandle) { glDeleteShader(g_VertHandle); g_VertHandle = 0; } - if (g_FragHandle) { glDeleteShader(g_FragHandle); g_FragHandle = 0; } - if (g_ShaderHandle) { glDeleteProgram(g_ShaderHandle); g_ShaderHandle = 0; } - + ImGui_ImplOpenGL3_Data* bd = ImGui_ImplOpenGL3_GetBackendData(); + if (bd->VboHandle) { glDeleteBuffers(1, &bd->VboHandle); bd->VboHandle = 0; } + if (bd->ElementsHandle) { glDeleteBuffers(1, &bd->ElementsHandle); bd->ElementsHandle = 0; } + if (bd->ShaderHandle) { glDeleteProgram(bd->ShaderHandle); bd->ShaderHandle = 0; } ImGui_ImplOpenGL3_DestroyFontsTexture(); } + +//-------------------------------------------------------------------------------------------------------- +// MULTI-VIEWPORT / PLATFORM INTERFACE SUPPORT +// This is an _advanced_ and _optional_ feature, allowing the backend to create and handle multiple viewports simultaneously. +// If you are new to dear imgui or creating a new binding for dear imgui, it is recommended that you completely ignore this section first.. +//-------------------------------------------------------------------------------------------------------- + +static void ImGui_ImplOpenGL3_RenderWindow(ImGuiViewport* viewport, void*) +{ + if (!(viewport->Flags & ImGuiViewportFlags_NoRendererClear)) + { + ImVec4 clear_color = ImVec4(0.0f, 0.0f, 0.0f, 1.0f); + glClearColor(clear_color.x, clear_color.y, clear_color.z, clear_color.w); + glClear(GL_COLOR_BUFFER_BIT); + } + ImGui_ImplOpenGL3_RenderDrawData(viewport->DrawData); +} + +static void ImGui_ImplOpenGL3_InitMultiViewportSupport() +{ + ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO(); + platform_io.Renderer_RenderWindow = ImGui_ImplOpenGL3_RenderWindow; +} + +static void ImGui_ImplOpenGL3_ShutdownMultiViewportSupport() +{ + ImGui::DestroyPlatformWindows(); +} + +//----------------------------------------------------------------------------- + +#if defined(__GNUC__) +#pragma GCC diagnostic pop +#endif +#if defined(__clang__) +#pragma clang diagnostic pop +#endif + +#endif // #ifndef IMGUI_DISABLE diff --git a/imgui/imgui_impl_opengl3.h b/imgui/imgui_impl_opengl3.h index 1cb790b16..d56213044 100644 --- a/imgui/imgui_impl_opengl3.h +++ b/imgui/imgui_impl_opengl3.h @@ -1,30 +1,37 @@ -// dear imgui: Renderer for modern OpenGL with shaders / programmatic pipeline +// dear imgui: Renderer Backend for modern OpenGL with shaders / programmatic pipeline // - Desktop GL: 2.x 3.x 4.x // - Embedded GL: ES 2.0 (WebGL 1.0), ES 3.0 (WebGL 2.0) -// This needs to be used along with a Platform Binding (e.g. GLFW, SDL, Win32, custom..) +// This needs to be used along with a Platform Backend (e.g. GLFW, SDL, Win32, custom..) // Implemented features: -// [X] Renderer: User texture binding. Use 'GLuint' OpenGL texture identifier as void*/ImTextureID. Read the FAQ about ImTextureID in imgui.cpp. -// [x] Renderer: Desktop GL only: Support for large meshes (64k+ vertices) with 16-bits indices. +// [X] Renderer: User texture binding. Use 'GLuint' OpenGL texture identifier as void*/ImTextureID. Read the FAQ about ImTextureID! +// [x] Renderer: Large meshes support (64k+ vertices) even with 16-bit indices (ImGuiBackendFlags_RendererHasVtxOffset) [Desktop OpenGL only!] +// [X] Renderer: Multi-viewport support (multiple windows). Enable with 'io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable'. -// You can copy and use unmodified imgui_impl_* files in your project. See main.cpp for an example of using this. -// If you are new to dear imgui, read examples/README.txt and read the documentation at the top of imgui.cpp. -// https://github.com/ocornut/imgui +// About WebGL/ES: +// - You need to '#define IMGUI_IMPL_OPENGL_ES2' or '#define IMGUI_IMPL_OPENGL_ES3' to use WebGL or OpenGL ES. +// - This is done automatically on iOS, Android and Emscripten targets. +// - For other targets, the define needs to be visible from the imgui_impl_opengl3.cpp compilation unit. If unsure, define globally or in imconfig.h. -// About Desktop OpenGL function loaders: -// Modern desktop OpenGL doesn't have a standard portable header file to load OpenGL function pointers. -// Helper libraries are often used for this purpose! Here we are supporting a few common ones (gl3w, glew, glad). -// You may use another loader/header of your choice (glext, glLoadGen, etc.), or chose to manually implement your own. +// You can use unmodified imgui_impl_* files in your project. See examples/ folder for examples of using this. +// Prefer including the entire imgui/ repository into your project (either as a copy or as a submodule), and only build the backends you need. +// Learn about Dear ImGui: +// - FAQ https://dearimgui.com/faq +// - Getting Started https://dearimgui.com/getting-started +// - Documentation https://dearimgui.com/docs (same as your local docs/ folder). +// - Introduction, links and more at the top of imgui.cpp // About GLSL version: -// The 'glsl_version' initialization parameter should be NULL (default) or a "#version XXX" string. +// The 'glsl_version' initialization parameter should be nullptr (default) or a "#version XXX" string. // On computer platform the GLSL version default to "#version 130". On OpenGL ES 3 platform it defaults to "#version 300 es" // Only override if your GL version doesn't handle this GLSL version. See GLSL version table at the top of imgui_impl_opengl3.cpp. #pragma once +#include "imgui.h" // IMGUI_IMPL_API +#ifndef IMGUI_DISABLE -// Backend API -IMGUI_IMPL_API bool ImGui_ImplOpenGL3_Init(const char* glsl_version = NULL); +// Follow "Getting Started" link and check examples/ folder to learn about using backends! +IMGUI_IMPL_API bool ImGui_ImplOpenGL3_Init(const char* glsl_version = nullptr); IMGUI_IMPL_API void ImGui_ImplOpenGL3_Shutdown(); IMGUI_IMPL_API void ImGui_ImplOpenGL3_NewFrame(); IMGUI_IMPL_API void ImGui_ImplOpenGL3_RenderDrawData(ImDrawData* draw_data); @@ -35,30 +42,26 @@ IMGUI_IMPL_API void ImGui_ImplOpenGL3_DestroyFontsTexture(); IMGUI_IMPL_API bool ImGui_ImplOpenGL3_CreateDeviceObjects(); IMGUI_IMPL_API void ImGui_ImplOpenGL3_DestroyDeviceObjects(); -// Specific OpenGL versions -//#define IMGUI_IMPL_OPENGL_ES2 // Auto-detected on Emscripten -//#define IMGUI_IMPL_OPENGL_ES3 // Auto-detected on iOS/Android +// Configuration flags to add in your imconfig file: +//#define IMGUI_IMPL_OPENGL_ES2 // Enable ES 2 (Auto-detected on Emscripten) +//#define IMGUI_IMPL_OPENGL_ES3 // Enable ES 3 (Auto-detected on iOS/Android) -// Desktop OpenGL: attempt to detect default GL loader based on available header files. -// If auto-detection fails or doesn't select the same GL loader file as used by your application, -// you are likely to get a crash in ImGui_ImplOpenGL3_Init(). -// You can explicitly select a loader by using '#define IMGUI_IMPL_OPENGL_LOADER_XXX' in imconfig.h or compiler command-line. -#if !defined(IMGUI_IMPL_OPENGL_LOADER_GL3W) \ - && !defined(IMGUI_IMPL_OPENGL_LOADER_GLEW) \ - && !defined(IMGUI_IMPL_OPENGL_LOADER_GLAD) \ - && !defined(IMGUI_IMPL_OPENGL_LOADER_CUSTOM) - #if defined(__has_include) - #if __has_include() - #define IMGUI_IMPL_OPENGL_LOADER_GLEW - #elif __has_include() - #define IMGUI_IMPL_OPENGL_LOADER_GLAD - #elif __has_include() - #define IMGUI_IMPL_OPENGL_LOADER_GL3W - #else - #error "Cannot detect OpenGL loader!" - #endif - #else - #define IMGUI_IMPL_OPENGL_LOADER_GL3W // Default to GL3W - #endif +// You can explicitly select GLES2 or GLES3 API by using one of the '#define IMGUI_IMPL_OPENGL_LOADER_XXX' in imconfig.h or compiler command-line. +#if !defined(IMGUI_IMPL_OPENGL_ES2) \ + && !defined(IMGUI_IMPL_OPENGL_ES3) + +// Try to detect GLES on matching platforms +#if defined(__APPLE__) +#include +#endif +#if (defined(__APPLE__) && (TARGET_OS_IOS || TARGET_OS_TV)) || (defined(__ANDROID__)) +#define IMGUI_IMPL_OPENGL_ES3 // iOS, Android -> GL ES 3, "#version 300 es" +#elif defined(__EMSCRIPTEN__) || defined(__amigaos4__) +#define IMGUI_IMPL_OPENGL_ES2 // Emscripten -> GL ES 2, "#version 100" +#else +// Otherwise imgui_impl_opengl3_loader.h will be used. #endif +#endif + +#endif // #ifndef IMGUI_DISABLE diff --git a/imgui/imgui_internal.h b/imgui/imgui_internal.h index 6d3931039..0f106d434 100644 --- a/imgui/imgui_internal.h +++ b/imgui/imgui_internal.h @@ -1,129 +1,220 @@ -// dear imgui, v1.73 +// dear imgui, v1.91.9b // (internal structures/api) -// You may use this file to debug, understand or extend ImGui features but we don't provide any guarantee of forward compatibility! -// Set: -// #define IMGUI_DEFINE_MATH_OPERATORS -// To implement maths operators for ImVec2 (disabled by default to not collide with using IM_VEC2_CLASS_EXTRA along with your own math types+operators) +// You may use this file to debug, understand or extend Dear ImGui features but we don't provide any guarantee of forward compatibility. /* Index of this file: -// Header mess -// Forward declarations -// STB libraries includes -// Context pointer -// Generic helpers -// Misc data structures -// Main imgui context -// Tab bar, tab item -// Internal API + +// [SECTION] Header mess +// [SECTION] Forward declarations +// [SECTION] Context pointer +// [SECTION] STB libraries includes +// [SECTION] Macros +// [SECTION] Generic helpers +// [SECTION] ImDrawList support +// [SECTION] Style support +// [SECTION] Data types support +// [SECTION] Widgets support: flags, enums, data structures +// [SECTION] Popup support +// [SECTION] Inputs support +// [SECTION] Clipper support +// [SECTION] Navigation support +// [SECTION] Typing-select support +// [SECTION] Columns support +// [SECTION] Box-select support +// [SECTION] Multi-select support +// [SECTION] Docking support +// [SECTION] Viewport support +// [SECTION] Settings support +// [SECTION] Localization support +// [SECTION] Error handling, State recovery support +// [SECTION] Metrics, Debug tools +// [SECTION] Generic context hooks +// [SECTION] ImGuiContext (main imgui context) +// [SECTION] ImGuiWindowTempData, ImGuiWindow +// [SECTION] Tab bar, Tab item support +// [SECTION] Table support +// [SECTION] ImGui internal API +// [SECTION] ImFontAtlas internal API +// [SECTION] Test Engine specific hooks (imgui_test_engine) */ #pragma once +#ifndef IMGUI_DISABLE //----------------------------------------------------------------------------- -// Header mess +// [SECTION] Header mess //----------------------------------------------------------------------------- #ifndef IMGUI_VERSION -#error Must include imgui.h before imgui_internal.h +#include "imgui.h" #endif -#include // FILE* +#include // FILE*, sscanf #include // NULL, malloc, free, qsort, atoi, atof #include // sqrtf, fabsf, fmodf, powf, floorf, ceilf, cosf, sinf #include // INT_MIN, INT_MAX +// Enable SSE intrinsics if available +#if (defined __SSE__ || defined __x86_64__ || defined _M_X64 || (defined(_M_IX86_FP) && (_M_IX86_FP >= 1))) && !defined(IMGUI_DISABLE_SSE) +#define IMGUI_ENABLE_SSE +#include +#if (defined __AVX__ || defined __SSE4_2__) +#define IMGUI_ENABLE_SSE4_2 +#include +#endif +#endif +// Emscripten has partial SSE 4.2 support where _mm_crc32_u32 is not available. See https://emscripten.org/docs/porting/simd.html#id11 and #8213 +#if defined(IMGUI_ENABLE_SSE4_2) && !defined(IMGUI_USE_LEGACY_CRC32_ADLER) && !defined(__EMSCRIPTEN__) +#define IMGUI_ENABLE_SSE4_2_CRC +#endif + // Visual Studio warnings #ifdef _MSC_VER #pragma warning (push) -#pragma warning (disable: 4251) // class 'xxx' needs to have dll-interface to be used by clients of struct 'xxx' // when IMGUI_API is set to__declspec(dllexport) +#pragma warning (disable: 4251) // class 'xxx' needs to have dll-interface to be used by clients of struct 'xxx' // when IMGUI_API is set to__declspec(dllexport) +#pragma warning (disable: 26812) // The enum type 'xxx' is unscoped. Prefer 'enum class' over 'enum' (Enum.3). [MSVC Static Analyzer) +#pragma warning (disable: 26495) // [Static Analyzer] Variable 'XXX' is uninitialized. Always initialize a member variable (type.6). +#if defined(_MSC_VER) && _MSC_VER >= 1922 // MSVC 2019 16.2 or later +#pragma warning (disable: 5054) // operator '|': deprecated between enumerations of different types +#endif #endif // Clang/GCC warnings with -Weverything #if defined(__clang__) #pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wunused-function" // for stb_textedit.h -#pragma clang diagnostic ignored "-Wmissing-prototypes" // for stb_textedit.h -#pragma clang diagnostic ignored "-Wold-style-cast" -#if __has_warning("-Wzero-as-null-pointer-constant") -#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" -#endif -#if __has_warning("-Wdouble-promotion") -#pragma clang diagnostic ignored "-Wdouble-promotion" +#if __has_warning("-Wunknown-warning-option") +#pragma clang diagnostic ignored "-Wunknown-warning-option" // warning: unknown warning group 'xxx' #endif +#pragma clang diagnostic ignored "-Wunknown-pragmas" // warning: unknown warning group 'xxx' +#pragma clang diagnostic ignored "-Wfloat-equal" // warning: comparing floating point with == or != is unsafe // storing and comparing against same constants ok, for ImFloor() +#pragma clang diagnostic ignored "-Wold-style-cast" // warning: use of old-style cast +#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" // warning: zero as null pointer constant +#pragma clang diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function +#pragma clang diagnostic ignored "-Wimplicit-int-float-conversion" // warning: implicit conversion from 'xxx' to 'float' may lose precision +#pragma clang diagnostic ignored "-Wmissing-noreturn" // warning: function 'xxx' could be declared with attribute 'noreturn' +#pragma clang diagnostic ignored "-Wdeprecated-enum-enum-conversion"// warning: bitwise operation between different enumeration types ('XXXFlags_' and 'XXXFlagsPrivate_') is deprecated +#pragma clang diagnostic ignored "-Wunsafe-buffer-usage" // warning: 'xxx' is an unsafe pointer used for buffer access +#pragma clang diagnostic ignored "-Wnontrivial-memaccess" // warning: first argument in call to 'memset' is a pointer to non-trivially copyable type #elif defined(__GNUC__) #pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind -#pragma GCC diagnostic ignored "-Wclass-memaccess" // [__GNUC__ >= 8] warning: 'memset/memcpy' clearing/writing an object of type 'xxxx' with no trivial copy-assignment; use assignment or value-initialization instead +#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind +#pragma GCC diagnostic ignored "-Wfloat-equal" // warning: comparing floating-point with '==' or '!=' is unsafe +#pragma GCC diagnostic ignored "-Wclass-memaccess" // [__GNUC__ >= 8] warning: 'memset/memcpy' clearing/writing an object of type 'xxxx' with no trivial copy-assignment; use assignment or value-initialization instead +#pragma GCC diagnostic ignored "-Wdeprecated-enum-enum-conversion" // warning: bitwise operation between different enumeration types ('XXXFlags_' and 'XXXFlagsPrivate_') is deprecated +#endif + +// In 1.89.4, we moved the implementation of "courtesy maths operators" from imgui_internal.h in imgui.h +// As they are frequently requested, we do not want to encourage to many people using imgui_internal.h +#if defined(IMGUI_DEFINE_MATH_OPERATORS) && !defined(IMGUI_DEFINE_MATH_OPERATORS_IMPLEMENTED) +#error Please '#define IMGUI_DEFINE_MATH_OPERATORS' _BEFORE_ including imgui.h! +#endif + +// Legacy defines +#ifdef IMGUI_DISABLE_FORMAT_STRING_FUNCTIONS // Renamed in 1.74 +#error Use IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS +#endif +#ifdef IMGUI_DISABLE_MATH_FUNCTIONS // Renamed in 1.74 +#error Use IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS +#endif + +// Enable stb_truetype by default unless FreeType is enabled. +// You can compile with both by defining both IMGUI_ENABLE_FREETYPE and IMGUI_ENABLE_STB_TRUETYPE together. +#ifndef IMGUI_ENABLE_FREETYPE +#define IMGUI_ENABLE_STB_TRUETYPE #endif //----------------------------------------------------------------------------- -// Forward declarations +// [SECTION] Forward declarations //----------------------------------------------------------------------------- +// Utilities +// (other types which are not forwarded declared are: ImBitArray<>, ImSpan<>, ImSpanAllocator<>, ImPool<>, ImChunkStream<>) +struct ImBitVector; // Store 1-bit per value struct ImRect; // An axis-aligned rectangle (2 points) +struct ImGuiTextIndex; // Maintain a line index for a text buffer. + +// ImDrawList/ImFontAtlas struct ImDrawDataBuilder; // Helper to build a ImDrawData instance struct ImDrawListSharedData; // Data shared between all ImDrawList instances + +// ImGui +struct ImGuiBoxSelectState; // Box-selection state (currently used by multi-selection, could potentially be used by others) struct ImGuiColorMod; // Stacked color modifier, backup of modified data so we can restore it -struct ImGuiColumnData; // Storage data for a single column -struct ImGuiColumns; // Storage data for a columns set struct ImGuiContext; // Main Dear ImGui context +struct ImGuiContextHook; // Hook for extensions like ImGuiTestEngine struct ImGuiDataTypeInfo; // Type information associated to a ImGuiDataType enum +struct ImGuiDeactivatedItemData; // Data for IsItemDeactivated()/IsItemDeactivatedAfterEdit() function. +struct ImGuiDockContext; // Docking system context +struct ImGuiDockRequest; // Docking system dock/undock queued request +struct ImGuiDockNode; // Docking system node (hold a list of Windows OR two child dock nodes) +struct ImGuiDockNodeSettings; // Storage for a dock node in .ini file (we preserve those even if the associated dock node isn't active during the session) +struct ImGuiErrorRecoveryState; // Storage of stack sizes for error handling and recovery struct ImGuiGroupData; // Stacked storage data for BeginGroup()/EndGroup() struct ImGuiInputTextState; // Internal state of the currently focused/edited text input box -struct ImGuiItemHoveredDataBackup; // Backup and restore IsItemHovered() internal data +struct ImGuiInputTextDeactivateData;// Short term storage to backup text of a deactivating InputText() while another is stealing active id +struct ImGuiLastItemData; // Status storage for last submitted items +struct ImGuiLocEntry; // A localization entry. struct ImGuiMenuColumns; // Simple column measurement, currently used for MenuItem() only -struct ImGuiNavMoveResult; // Result of a directional navigation move query result +struct ImGuiMultiSelectState; // Multi-selection persistent state (for focused selection). +struct ImGuiMultiSelectTempData; // Multi-selection temporary state (while traversing). +struct ImGuiNavItemData; // Result of a keyboard/gamepad directional navigation move query result +struct ImGuiMetricsConfig; // Storage for ShowMetricsWindow() and DebugNodeXXX() functions struct ImGuiNextWindowData; // Storage for SetNextWindow** functions struct ImGuiNextItemData; // Storage for SetNextItem** functions +struct ImGuiOldColumnData; // Storage data for a single column for legacy Columns() api +struct ImGuiOldColumns; // Storage data for a columns set for legacy Columns() api struct ImGuiPopupData; // Storage for current popup stack struct ImGuiSettingsHandler; // Storage for one type registered in the .ini file struct ImGuiStyleMod; // Stacked style modifier, backup of modified data so we can restore it +struct ImGuiStyleVarInfo; // Style variable information (e.g. to access style variables from an enum) struct ImGuiTabBar; // Storage for a tab bar struct ImGuiTabItem; // Storage for a tab item (within a tab bar) +struct ImGuiTable; // Storage for a table +struct ImGuiTableHeaderData; // Storage for TableAngledHeadersRow() +struct ImGuiTableColumn; // Storage for one column of a table +struct ImGuiTableInstanceData; // Storage for one instance of a same table +struct ImGuiTableTempData; // Temporary storage for one table (one per table in the stack), shared between tables. +struct ImGuiTableSettings; // Storage for a table .ini settings +struct ImGuiTableColumnsSettings; // Storage for a column .ini settings +struct ImGuiTreeNodeStackData; // Temporary storage for TreeNode(). +struct ImGuiTypingSelectState; // Storage for GetTypingSelectRequest() +struct ImGuiTypingSelectRequest; // Storage for GetTypingSelectRequest() (aimed to be public) struct ImGuiWindow; // Storage for one window -struct ImGuiWindowTempData; // Temporary storage for one window (that's the data which in theory we could ditch at the end of the frame) -struct ImGuiWindowSettings; // Storage for window settings stored in .ini file (we keep one of those even if the actual window wasn't instanced during this session) +struct ImGuiWindowDockStyle; // Storage for window-style data which needs to be stored for docking purpose +struct ImGuiWindowTempData; // Temporary storage for one window (that's the data which in theory we could ditch at the end of the frame, in practice we currently keep it for each window) +struct ImGuiWindowSettings; // Storage for a window .ini settings (we keep one of those even if the actual window wasn't instanced during this session) +// Enumerations // Use your programming IDE "Go to definition" facility on the names of the center columns to find the actual flags/enum lists. +enum ImGuiLocKey : int; // -> enum ImGuiLocKey // Enum: a localization entry for translation. +typedef int ImGuiDataAuthority; // -> enum ImGuiDataAuthority_ // Enum: for storing the source authority (dock node vs window) of a field typedef int ImGuiLayoutType; // -> enum ImGuiLayoutType_ // Enum: Horizontal or vertical -typedef int ImGuiButtonFlags; // -> enum ImGuiButtonFlags_ // Flags: for ButtonEx(), ButtonBehavior() -typedef int ImGuiColumnsFlags; // -> enum ImGuiColumnsFlags_ // Flags: BeginColumns() -typedef int ImGuiDragFlags; // -> enum ImGuiDragFlags_ // Flags: for DragBehavior() -typedef int ImGuiItemFlags; // -> enum ImGuiItemFlags_ // Flags: for PushItemFlag() -typedef int ImGuiItemStatusFlags; // -> enum ImGuiItemStatusFlags_ // Flags: for DC.LastItemStatusFlags -typedef int ImGuiNavHighlightFlags; // -> enum ImGuiNavHighlightFlags_ // Flags: for RenderNavHighlight() -typedef int ImGuiNavDirSourceFlags; // -> enum ImGuiNavDirSourceFlags_ // Flags: for GetNavInputAmount2d() + +// Flags +typedef int ImGuiActivateFlags; // -> enum ImGuiActivateFlags_ // Flags: for navigation/focus function (will be for ActivateItem() later) +typedef int ImGuiDebugLogFlags; // -> enum ImGuiDebugLogFlags_ // Flags: for ShowDebugLogWindow(), g.DebugLogFlags +typedef int ImGuiFocusRequestFlags; // -> enum ImGuiFocusRequestFlags_ // Flags: for FocusWindow() +typedef int ImGuiItemStatusFlags; // -> enum ImGuiItemStatusFlags_ // Flags: for g.LastItemData.StatusFlags +typedef int ImGuiOldColumnFlags; // -> enum ImGuiOldColumnFlags_ // Flags: for BeginColumns() +typedef int ImGuiLogFlags; // -> enum ImGuiLogFlags_ // Flags: for LogBegin() text capturing function +typedef int ImGuiNavRenderCursorFlags; // -> enum ImGuiNavRenderCursorFlags_//Flags: for RenderNavCursor() typedef int ImGuiNavMoveFlags; // -> enum ImGuiNavMoveFlags_ // Flags: for navigation requests typedef int ImGuiNextItemDataFlags; // -> enum ImGuiNextItemDataFlags_ // Flags: for SetNextItemXXX() functions typedef int ImGuiNextWindowDataFlags; // -> enum ImGuiNextWindowDataFlags_// Flags: for SetNextWindowXXX() functions +typedef int ImGuiScrollFlags; // -> enum ImGuiScrollFlags_ // Flags: for ScrollToItem() and navigation requests typedef int ImGuiSeparatorFlags; // -> enum ImGuiSeparatorFlags_ // Flags: for SeparatorEx() -typedef int ImGuiSliderFlags; // -> enum ImGuiSliderFlags_ // Flags: for SliderBehavior() typedef int ImGuiTextFlags; // -> enum ImGuiTextFlags_ // Flags: for TextEx() - -//------------------------------------------------------------------------- -// STB libraries includes -//------------------------------------------------------------------------- - -namespace ImStb -{ - -#undef STB_TEXTEDIT_STRING -#undef STB_TEXTEDIT_CHARTYPE -#define STB_TEXTEDIT_STRING ImGuiInputTextState -#define STB_TEXTEDIT_CHARTYPE ImWchar -#define STB_TEXTEDIT_GETWIDTH_NEWLINE -1.0f -#define STB_TEXTEDIT_UNDOSTATECOUNT 99 -#define STB_TEXTEDIT_UNDOCHARCOUNT 999 -#include "imstb_textedit.h" - -} // namespace ImStb +typedef int ImGuiTooltipFlags; // -> enum ImGuiTooltipFlags_ // Flags: for BeginTooltipEx() +typedef int ImGuiTypingSelectFlags; // -> enum ImGuiTypingSelectFlags_ // Flags: for GetTypingSelectRequest() +typedef int ImGuiWindowRefreshFlags; // -> enum ImGuiWindowRefreshFlags_ // Flags: for SetNextWindowRefreshPolicy() //----------------------------------------------------------------------------- -// Context pointer +// [SECTION] Context pointer +// See implementation of this variable in imgui.cpp for comments and details. //----------------------------------------------------------------------------- #ifndef GImGui @@ -131,23 +222,76 @@ extern IMGUI_API ImGuiContext* GImGui; // Current implicit context pointer #endif //----------------------------------------------------------------------------- -// Generic helpers +// [SECTION] Macros //----------------------------------------------------------------------------- -#define IM_PI 3.14159265358979323846f -#ifdef _WIN32 -#define IM_NEWLINE "\r\n" // Play it nice with Windows users (2018/05 news: Microsoft announced that Notepad will finally display Unix-style carriage returns!) +// Internal Drag and Drop payload types. String starting with '_' are reserved for Dear ImGui. +#define IMGUI_PAYLOAD_TYPE_WINDOW "_IMWINDOW" // Payload == ImGuiWindow* + +// Debug Printing Into TTY +// (since IMGUI_VERSION_NUM >= 18729: IMGUI_DEBUG_LOG was reworked into IMGUI_DEBUG_PRINTF (and removed framecount from it). If you were using a #define IMGUI_DEBUG_LOG please rename) +#ifndef IMGUI_DEBUG_PRINTF +#ifndef IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS +#define IMGUI_DEBUG_PRINTF(_FMT,...) printf(_FMT, __VA_ARGS__) #else -#define IM_NEWLINE "\n" +#define IMGUI_DEBUG_PRINTF(_FMT,...) ((void)0) #endif -#define IM_TABSIZE (4) -#define IM_STATIC_ASSERT(_COND) typedef char static_assertion_##__line__[(_COND)?1:-1] +#endif + +// Debug Logging for ShowDebugLogWindow(). This is designed for relatively rare events so please don't spam. +#define IMGUI_DEBUG_LOG_ERROR(...) do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventError) IMGUI_DEBUG_LOG(__VA_ARGS__); else g.DebugLogSkippedErrors++; } while (0) +#define IMGUI_DEBUG_LOG_ACTIVEID(...) do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventActiveId) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0) +#define IMGUI_DEBUG_LOG_FOCUS(...) do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventFocus) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0) +#define IMGUI_DEBUG_LOG_POPUP(...) do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventPopup) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0) +#define IMGUI_DEBUG_LOG_NAV(...) do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventNav) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0) +#define IMGUI_DEBUG_LOG_SELECTION(...) do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventSelection) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0) +#define IMGUI_DEBUG_LOG_CLIPPER(...) do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventClipper) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0) +#define IMGUI_DEBUG_LOG_IO(...) do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventIO) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0) +#define IMGUI_DEBUG_LOG_FONT(...) do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventFont) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0) +#define IMGUI_DEBUG_LOG_INPUTROUTING(...) do{if (g.DebugLogFlags & ImGuiDebugLogFlags_EventInputRouting)IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0) +#define IMGUI_DEBUG_LOG_DOCKING(...) do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventDocking) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0) +#define IMGUI_DEBUG_LOG_VIEWPORT(...) do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventViewport) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0) + +// Static Asserts +#define IM_STATIC_ASSERT(_COND) static_assert(_COND, "") + +// "Paranoid" Debug Asserts are meant to only be enabled during specific debugging/work, otherwise would slow down the code too much. +// We currently don't have many of those so the effect is currently negligible, but onward intent to add more aggressive ones in the code. +//#define IMGUI_DEBUG_PARANOID +#ifdef IMGUI_DEBUG_PARANOID +#define IM_ASSERT_PARANOID(_EXPR) IM_ASSERT(_EXPR) +#else +#define IM_ASSERT_PARANOID(_EXPR) +#endif + +// Misc Macros +#define IM_PI 3.14159265358979323846f +#ifdef _WIN32 +#define IM_NEWLINE "\r\n" // Play it nice with Windows users (Update: since 2018-05, Notepad finally appears to support Unix-style carriage returns!) +#else +#define IM_NEWLINE "\n" +#endif +#ifndef IM_TABSIZE // Until we move this to runtime and/or add proper tab support, at least allow users to compile-time override +#define IM_TABSIZE (4) +#endif +#define IM_MEMALIGN(_OFF,_ALIGN) (((_OFF) + ((_ALIGN) - 1)) & ~((_ALIGN) - 1)) // Memory align e.g. IM_ALIGN(0,4)=0, IM_ALIGN(1,4)=4, IM_ALIGN(4,4)=4, IM_ALIGN(5,4)=8 #define IM_F32_TO_INT8_UNBOUND(_VAL) ((int)((_VAL) * 255.0f + ((_VAL)>=0 ? 0.5f : -0.5f))) // Unsaturated, for display purpose #define IM_F32_TO_INT8_SAT(_VAL) ((int)(ImSaturate(_VAL) * 255.0f + 0.5f)) // Saturated, always output 0..255 +#define IM_TRUNC(_VAL) ((float)(int)(_VAL)) // ImTrunc() is not inlined in MSVC debug builds +#define IM_ROUND(_VAL) ((float)(int)((_VAL) + 0.5f)) // +#define IM_STRINGIFY_HELPER(_X) #_X +#define IM_STRINGIFY(_X) IM_STRINGIFY_HELPER(_X) // Preprocessor idiom to stringify e.g. an integer. +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS +#define IM_FLOOR IM_TRUNC +#endif -// Debug Logging -#ifndef IMGUI_DEBUG_LOG -#define IMGUI_DEBUG_LOG(_FMT,...) printf("[%05d] " _FMT, GImGui->FrameCount, __VA_ARGS__) +// Hint for branch prediction +#if (defined(__cplusplus) && (__cplusplus >= 202002L)) || (defined(_MSVC_LANG) && (_MSVC_LANG >= 202002L)) +#define IM_LIKELY [[likely]] +#define IM_UNLIKELY [[unlikely]] +#else +#define IM_LIKELY +#define IM_UNLIKELY #endif // Enforce cdecl calling convention for functions called by the standard library, in case compilation settings changed the default to e.g. __vectorcall @@ -157,92 +301,186 @@ extern IMGUI_API ImGuiContext* GImGui; // Current implicit context pointer #define IMGUI_CDECL #endif -// Helpers: UTF-8 <> wchar -IMGUI_API int ImTextStrToUtf8(char* buf, int buf_size, const ImWchar* in_text, const ImWchar* in_text_end); // return output UTF-8 bytes count -IMGUI_API int ImTextCharFromUtf8(unsigned int* out_char, const char* in_text, const char* in_text_end); // read one character. return input UTF-8 bytes count -IMGUI_API int ImTextStrFromUtf8(ImWchar* buf, int buf_size, const char* in_text, const char* in_text_end, const char** in_remaining = NULL); // return input UTF-8 bytes count -IMGUI_API int ImTextCountCharsFromUtf8(const char* in_text, const char* in_text_end); // return number of UTF-8 code-points (NOT bytes count) -IMGUI_API int ImTextCountUtf8BytesFromChar(const char* in_text, const char* in_text_end); // return number of bytes to express one char in UTF-8 -IMGUI_API int ImTextCountUtf8BytesFromStr(const ImWchar* in_text, const ImWchar* in_text_end); // return number of bytes to express string in UTF-8 - -// Helpers: Misc -IMGUI_API ImU32 ImHashData(const void* data, size_t data_size, ImU32 seed = 0); -IMGUI_API ImU32 ImHashStr(const char* data, size_t data_size = 0, ImU32 seed = 0); -IMGUI_API void* ImFileLoadToMemory(const char* filename, const char* file_open_mode, size_t* out_file_size = NULL, int padding_bytes = 0); -IMGUI_API FILE* ImFileOpen(const char* filename, const char* file_open_mode); -static inline bool ImCharIsBlankA(char c) { return c == ' ' || c == '\t'; } -static inline bool ImCharIsBlankW(unsigned int c) { return c == ' ' || c == '\t' || c == 0x3000; } -static inline bool ImIsPowerOfTwo(int v) { return v != 0 && (v & (v - 1)) == 0; } -static inline int ImUpperPowerOfTwo(int v) { v--; v |= v >> 1; v |= v >> 2; v |= v >> 4; v |= v >> 8; v |= v >> 16; v++; return v; } -#define ImQsort qsort -#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS -static inline ImU32 ImHash(const void* data, int size, ImU32 seed = 0) { return size ? ImHashData(data, (size_t)size, seed) : ImHashStr((const char*)data, 0, seed); } // [moved to ImHashStr/ImHashData in 1.68] +// Warnings +#if defined(_MSC_VER) && !defined(__clang__) +#define IM_MSVC_WARNING_SUPPRESS(XXXX) __pragma(warning(suppress: XXXX)) +#else +#define IM_MSVC_WARNING_SUPPRESS(XXXX) #endif -// Helpers: Geometry -IMGUI_API ImVec2 ImLineClosestPoint(const ImVec2& a, const ImVec2& b, const ImVec2& p); -IMGUI_API bool ImTriangleContainsPoint(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& p); -IMGUI_API ImVec2 ImTriangleClosestPoint(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& p); -IMGUI_API void ImTriangleBarycentricCoords(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& p, float& out_u, float& out_v, float& out_w); -IMGUI_API ImGuiDir ImGetDirQuadrantFromDelta(float dx, float dy); +// Debug Tools +// Use 'Metrics/Debugger->Tools->Item Picker' to break into the call-stack of a specific item. +// This will call IM_DEBUG_BREAK() which you may redefine yourself. See https://github.com/scottt/debugbreak for more reference. +#ifndef IM_DEBUG_BREAK +#if defined (_MSC_VER) +#define IM_DEBUG_BREAK() __debugbreak() +#elif defined(__clang__) +#define IM_DEBUG_BREAK() __builtin_debugtrap() +#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#define IM_DEBUG_BREAK() __asm__ volatile("int3;nop") +#elif defined(__GNUC__) && defined(__thumb__) +#define IM_DEBUG_BREAK() __asm__ volatile(".inst 0xde01") +#elif defined(__GNUC__) && defined(__arm__) && !defined(__thumb__) +#define IM_DEBUG_BREAK() __asm__ volatile(".inst 0xe7f001f0") +#else +#define IM_DEBUG_BREAK() IM_ASSERT(0) // It is expected that you define IM_DEBUG_BREAK() into something that will break nicely in a debugger! +#endif +#endif // #ifndef IM_DEBUG_BREAK + +// Format specifiers, printing 64-bit hasn't been decently standardized... +// In a real application you should be using PRId64 and PRIu64 from (non-windows) and on Windows define them yourself. +#if defined(_MSC_VER) && !defined(__clang__) +#define IM_PRId64 "I64d" +#define IM_PRIu64 "I64u" +#define IM_PRIX64 "I64X" +#else +#define IM_PRId64 "lld" +#define IM_PRIu64 "llu" +#define IM_PRIX64 "llX" +#endif + +//----------------------------------------------------------------------------- +// [SECTION] Generic helpers +// Note that the ImXXX helpers functions are lower-level than ImGui functions. +// ImGui functions or the ImGui context are never called/used from other ImXXX functions. +//----------------------------------------------------------------------------- +// - Helpers: Hashing +// - Helpers: Sorting +// - Helpers: Bit manipulation +// - Helpers: String +// - Helpers: Formatting +// - Helpers: UTF-8 <> wchar conversions +// - Helpers: ImVec2/ImVec4 operators +// - Helpers: Maths +// - Helpers: Geometry +// - Helper: ImVec1 +// - Helper: ImVec2ih +// - Helper: ImRect +// - Helper: ImBitArray +// - Helper: ImBitVector +// - Helper: ImSpan<>, ImSpanAllocator<> +// - Helper: ImPool<> +// - Helper: ImChunkStream<> +// - Helper: ImGuiTextIndex +// - Helper: ImGuiStorage +//----------------------------------------------------------------------------- + +// Helpers: Hashing +IMGUI_API ImGuiID ImHashData(const void* data, size_t data_size, ImGuiID seed = 0); +IMGUI_API ImGuiID ImHashStr(const char* data, size_t data_size = 0, ImGuiID seed = 0); + +// Helpers: Sorting +#ifndef ImQsort +static inline void ImQsort(void* base, size_t count, size_t size_of_element, int(IMGUI_CDECL *compare_func)(void const*, void const*)) { if (count > 1) qsort(base, count, size_of_element, compare_func); } +#endif + +// Helpers: Color Blending +IMGUI_API ImU32 ImAlphaBlendColors(ImU32 col_a, ImU32 col_b); + +// Helpers: Bit manipulation +static inline bool ImIsPowerOfTwo(int v) { return v != 0 && (v & (v - 1)) == 0; } +static inline bool ImIsPowerOfTwo(ImU64 v) { return v != 0 && (v & (v - 1)) == 0; } +static inline int ImUpperPowerOfTwo(int v) { v--; v |= v >> 1; v |= v >> 2; v |= v >> 4; v |= v >> 8; v |= v >> 16; v++; return v; } +static inline unsigned int ImCountSetBits(unsigned int v) { unsigned int count = 0; while (v > 0) { v = v & (v - 1); count++; } return count; } // Helpers: String -IMGUI_API int ImStricmp(const char* str1, const char* str2); -IMGUI_API int ImStrnicmp(const char* str1, const char* str2, size_t count); -IMGUI_API void ImStrncpy(char* dst, const char* src, size_t count); -IMGUI_API char* ImStrdup(const char* str); -IMGUI_API char* ImStrdupcpy(char* dst, size_t* p_dst_size, const char* str); -IMGUI_API const char* ImStrchrRange(const char* str_begin, const char* str_end, char c); -IMGUI_API int ImStrlenW(const ImWchar* str); +#define ImStrlen strlen +#define ImMemchr memchr +IMGUI_API int ImStricmp(const char* str1, const char* str2); // Case insensitive compare. +IMGUI_API int ImStrnicmp(const char* str1, const char* str2, size_t count); // Case insensitive compare to a certain count. +IMGUI_API void ImStrncpy(char* dst, const char* src, size_t count); // Copy to a certain count and always zero terminate (strncpy doesn't). +IMGUI_API char* ImStrdup(const char* str); // Duplicate a string. +IMGUI_API char* ImStrdupcpy(char* dst, size_t* p_dst_size, const char* str); // Copy in provided buffer, recreate buffer if needed. +IMGUI_API const char* ImStrchrRange(const char* str_begin, const char* str_end, char c); // Find first occurrence of 'c' in string range. IMGUI_API const char* ImStreolRange(const char* str, const char* str_end); // End end-of-line -IMGUI_API const ImWchar*ImStrbolW(const ImWchar* buf_mid_line, const ImWchar* buf_begin); // Find beginning-of-line -IMGUI_API const char* ImStristr(const char* haystack, const char* haystack_end, const char* needle, const char* needle_end); -IMGUI_API void ImStrTrimBlanks(char* str); +IMGUI_API const char* ImStristr(const char* haystack, const char* haystack_end, const char* needle, const char* needle_end); // Find a substring in a string range. +IMGUI_API void ImStrTrimBlanks(char* str); // Remove leading and trailing blanks from a buffer. +IMGUI_API const char* ImStrSkipBlank(const char* str); // Find first non-blank character. +IMGUI_API int ImStrlenW(const ImWchar* str); // Computer string length (ImWchar string) +IMGUI_API const char* ImStrbol(const char* buf_mid_line, const char* buf_begin); // Find beginning-of-line +IM_MSVC_RUNTIME_CHECKS_OFF +static inline char ImToUpper(char c) { return (c >= 'a' && c <= 'z') ? c &= ~32 : c; } +static inline bool ImCharIsBlankA(char c) { return c == ' ' || c == '\t'; } +static inline bool ImCharIsBlankW(unsigned int c) { return c == ' ' || c == '\t' || c == 0x3000; } +static inline bool ImCharIsXdigitA(char c) { return (c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f'); } +IM_MSVC_RUNTIME_CHECKS_RESTORE + +// Helpers: Formatting IMGUI_API int ImFormatString(char* buf, size_t buf_size, const char* fmt, ...) IM_FMTARGS(3); IMGUI_API int ImFormatStringV(char* buf, size_t buf_size, const char* fmt, va_list args) IM_FMTLIST(3); +IMGUI_API void ImFormatStringToTempBuffer(const char** out_buf, const char** out_buf_end, const char* fmt, ...) IM_FMTARGS(3); +IMGUI_API void ImFormatStringToTempBufferV(const char** out_buf, const char** out_buf_end, const char* fmt, va_list args) IM_FMTLIST(3); IMGUI_API const char* ImParseFormatFindStart(const char* format); IMGUI_API const char* ImParseFormatFindEnd(const char* format); IMGUI_API const char* ImParseFormatTrimDecorations(const char* format, char* buf, size_t buf_size); +IMGUI_API void ImParseFormatSanitizeForPrinting(const char* fmt_in, char* fmt_out, size_t fmt_out_size); +IMGUI_API const char* ImParseFormatSanitizeForScanning(const char* fmt_in, char* fmt_out, size_t fmt_out_size); IMGUI_API int ImParseFormatPrecision(const char* format, int default_value); -// Helpers: ImVec2/ImVec4 operators -// We are keeping those disabled by default so they don't leak in user space, to allow user enabling implicit cast operators between ImVec2 and their own types (using IM_VEC2_CLASS_EXTRA etc.) -// We unfortunately don't have a unary- operator for ImVec2 because this would needs to be defined inside the class itself. -#ifdef IMGUI_DEFINE_MATH_OPERATORS -static inline ImVec2 operator*(const ImVec2& lhs, const float rhs) { return ImVec2(lhs.x*rhs, lhs.y*rhs); } -static inline ImVec2 operator/(const ImVec2& lhs, const float rhs) { return ImVec2(lhs.x/rhs, lhs.y/rhs); } -static inline ImVec2 operator+(const ImVec2& lhs, const ImVec2& rhs) { return ImVec2(lhs.x+rhs.x, lhs.y+rhs.y); } -static inline ImVec2 operator-(const ImVec2& lhs, const ImVec2& rhs) { return ImVec2(lhs.x-rhs.x, lhs.y-rhs.y); } -static inline ImVec2 operator*(const ImVec2& lhs, const ImVec2& rhs) { return ImVec2(lhs.x*rhs.x, lhs.y*rhs.y); } -static inline ImVec2 operator/(const ImVec2& lhs, const ImVec2& rhs) { return ImVec2(lhs.x/rhs.x, lhs.y/rhs.y); } -static inline ImVec2& operator+=(ImVec2& lhs, const ImVec2& rhs) { lhs.x += rhs.x; lhs.y += rhs.y; return lhs; } -static inline ImVec2& operator-=(ImVec2& lhs, const ImVec2& rhs) { lhs.x -= rhs.x; lhs.y -= rhs.y; return lhs; } -static inline ImVec2& operator*=(ImVec2& lhs, const float rhs) { lhs.x *= rhs; lhs.y *= rhs; return lhs; } -static inline ImVec2& operator/=(ImVec2& lhs, const float rhs) { lhs.x /= rhs; lhs.y /= rhs; return lhs; } -static inline ImVec4 operator+(const ImVec4& lhs, const ImVec4& rhs) { return ImVec4(lhs.x+rhs.x, lhs.y+rhs.y, lhs.z+rhs.z, lhs.w+rhs.w); } -static inline ImVec4 operator-(const ImVec4& lhs, const ImVec4& rhs) { return ImVec4(lhs.x-rhs.x, lhs.y-rhs.y, lhs.z-rhs.z, lhs.w-rhs.w); } -static inline ImVec4 operator*(const ImVec4& lhs, const ImVec4& rhs) { return ImVec4(lhs.x*rhs.x, lhs.y*rhs.y, lhs.z*rhs.z, lhs.w*rhs.w); } +// Helpers: UTF-8 <> wchar conversions +IMGUI_API const char* ImTextCharToUtf8(char out_buf[5], unsigned int c); // return out_buf +IMGUI_API int ImTextStrToUtf8(char* out_buf, int out_buf_size, const ImWchar* in_text, const ImWchar* in_text_end); // return output UTF-8 bytes count +IMGUI_API int ImTextCharFromUtf8(unsigned int* out_char, const char* in_text, const char* in_text_end); // read one character. return input UTF-8 bytes count +IMGUI_API int ImTextStrFromUtf8(ImWchar* out_buf, int out_buf_size, const char* in_text, const char* in_text_end, const char** in_remaining = NULL); // return input UTF-8 bytes count +IMGUI_API int ImTextCountCharsFromUtf8(const char* in_text, const char* in_text_end); // return number of UTF-8 code-points (NOT bytes count) +IMGUI_API int ImTextCountUtf8BytesFromChar(const char* in_text, const char* in_text_end); // return number of bytes to express one char in UTF-8 +IMGUI_API int ImTextCountUtf8BytesFromStr(const ImWchar* in_text, const ImWchar* in_text_end); // return number of bytes to express string in UTF-8 +IMGUI_API const char* ImTextFindPreviousUtf8Codepoint(const char* in_text_start, const char* in_text_curr); // return previous UTF-8 code-point. +IMGUI_API int ImTextCountLines(const char* in_text, const char* in_text_end); // return number of lines taken by text. trailing carriage return doesn't count as an extra line. + +// Helpers: File System +#ifdef IMGUI_DISABLE_FILE_FUNCTIONS +#define IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS +typedef void* ImFileHandle; +static inline ImFileHandle ImFileOpen(const char*, const char*) { return NULL; } +static inline bool ImFileClose(ImFileHandle) { return false; } +static inline ImU64 ImFileGetSize(ImFileHandle) { return (ImU64)-1; } +static inline ImU64 ImFileRead(void*, ImU64, ImU64, ImFileHandle) { return 0; } +static inline ImU64 ImFileWrite(const void*, ImU64, ImU64, ImFileHandle) { return 0; } #endif +#ifndef IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS +typedef FILE* ImFileHandle; +IMGUI_API ImFileHandle ImFileOpen(const char* filename, const char* mode); +IMGUI_API bool ImFileClose(ImFileHandle file); +IMGUI_API ImU64 ImFileGetSize(ImFileHandle file); +IMGUI_API ImU64 ImFileRead(void* data, ImU64 size, ImU64 count, ImFileHandle file); +IMGUI_API ImU64 ImFileWrite(const void* data, ImU64 size, ImU64 count, ImFileHandle file); +#else +#define IMGUI_DISABLE_TTY_FUNCTIONS // Can't use stdout, fflush if we are not using default file functions +#endif +IMGUI_API void* ImFileLoadToMemory(const char* filename, const char* mode, size_t* out_file_size = NULL, int padding_bytes = 0); // Helpers: Maths +IM_MSVC_RUNTIME_CHECKS_OFF // - Wrapper for standard libs functions. (Note that imgui_demo.cpp does _not_ use them to keep the code easy to copy) -#ifndef IMGUI_DISABLE_MATH_FUNCTIONS -static inline float ImFabs(float x) { return fabsf(x); } -static inline float ImSqrt(float x) { return sqrtf(x); } -static inline float ImPow(float x, float y) { return powf(x, y); } -static inline double ImPow(double x, double y) { return pow(x, y); } -static inline float ImFmod(float x, float y) { return fmodf(x, y); } -static inline double ImFmod(double x, double y) { return fmod(x, y); } -static inline float ImCos(float x) { return cosf(x); } -static inline float ImSin(float x) { return sinf(x); } -static inline float ImAcos(float x) { return acosf(x); } -static inline float ImAtan2(float y, float x) { return atan2f(y, x); } -static inline double ImAtof(const char* s) { return atof(s); } -static inline float ImFloorStd(float x) { return floorf(x); } // we already uses our own ImFloor() { return (float)(int)v } internally so the standard one wrapper is named differently (it's used by stb_truetype) -static inline float ImCeil(float x) { return ceilf(x); } +#ifndef IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS +#define ImFabs(X) fabsf(X) +#define ImSqrt(X) sqrtf(X) +#define ImFmod(X, Y) fmodf((X), (Y)) +#define ImCos(X) cosf(X) +#define ImSin(X) sinf(X) +#define ImAcos(X) acosf(X) +#define ImAtan2(Y, X) atan2f((Y), (X)) +#define ImAtof(STR) atof(STR) +#define ImCeil(X) ceilf(X) +static inline float ImPow(float x, float y) { return powf(x, y); } // DragBehaviorT/SliderBehaviorT uses ImPow with either float/double and need the precision +static inline double ImPow(double x, double y) { return pow(x, y); } +static inline float ImLog(float x) { return logf(x); } // DragBehaviorT/SliderBehaviorT uses ImLog with either float/double and need the precision +static inline double ImLog(double x) { return log(x); } +static inline int ImAbs(int x) { return x < 0 ? -x : x; } +static inline float ImAbs(float x) { return fabsf(x); } +static inline double ImAbs(double x) { return fabs(x); } +static inline float ImSign(float x) { return (x < 0.0f) ? -1.0f : (x > 0.0f) ? 1.0f : 0.0f; } // Sign operator - returns -1, 0 or 1 based on sign of argument +static inline double ImSign(double x) { return (x < 0.0) ? -1.0 : (x > 0.0) ? 1.0 : 0.0; } +#ifdef IMGUI_ENABLE_SSE +static inline float ImRsqrt(float x) { return _mm_cvtss_f32(_mm_rsqrt_ss(_mm_set_ss(x))); } +#else +static inline float ImRsqrt(float x) { return 1.0f / sqrtf(x); } #endif -// - ImMin/ImMax/ImClamp/ImLerp/ImSwap are used by widgets which support for variety of types: signed/unsigned int/long long float/double -// (Exceptionally using templates here but we could also redefine them for variety of types) +static inline double ImRsqrt(double x) { return 1.0 / sqrt(x); } +#endif +// - ImMin/ImMax/ImClamp/ImLerp/ImSwap are used by widgets which support variety of types: signed/unsigned int/long long float/double +// (Exceptionally using templates here but we could also redefine them for those types) template static inline T ImMin(T lhs, T rhs) { return lhs < rhs ? lhs : rhs; } template static inline T ImMax(T lhs, T rhs) { return lhs >= rhs ? lhs : rhs; } template static inline T ImClamp(T v, T mn, T mx) { return (v < mn) ? mn : (v > mx) ? mx : v; } @@ -253,170 +491,553 @@ template static inline T ImSubClampOverflow(T a, T b, T mn, T mx) // - Misc maths helpers static inline ImVec2 ImMin(const ImVec2& lhs, const ImVec2& rhs) { return ImVec2(lhs.x < rhs.x ? lhs.x : rhs.x, lhs.y < rhs.y ? lhs.y : rhs.y); } static inline ImVec2 ImMax(const ImVec2& lhs, const ImVec2& rhs) { return ImVec2(lhs.x >= rhs.x ? lhs.x : rhs.x, lhs.y >= rhs.y ? lhs.y : rhs.y); } -static inline ImVec2 ImClamp(const ImVec2& v, const ImVec2& mn, ImVec2 mx) { return ImVec2((v.x < mn.x) ? mn.x : (v.x > mx.x) ? mx.x : v.x, (v.y < mn.y) ? mn.y : (v.y > mx.y) ? mx.y : v.y); } +static inline ImVec2 ImClamp(const ImVec2& v, const ImVec2&mn, const ImVec2&mx) { return ImVec2((v.x < mn.x) ? mn.x : (v.x > mx.x) ? mx.x : v.x, (v.y < mn.y) ? mn.y : (v.y > mx.y) ? mx.y : v.y); } static inline ImVec2 ImLerp(const ImVec2& a, const ImVec2& b, float t) { return ImVec2(a.x + (b.x - a.x) * t, a.y + (b.y - a.y) * t); } static inline ImVec2 ImLerp(const ImVec2& a, const ImVec2& b, const ImVec2& t) { return ImVec2(a.x + (b.x - a.x) * t.x, a.y + (b.y - a.y) * t.y); } static inline ImVec4 ImLerp(const ImVec4& a, const ImVec4& b, float t) { return ImVec4(a.x + (b.x - a.x) * t, a.y + (b.y - a.y) * t, a.z + (b.z - a.z) * t, a.w + (b.w - a.w) * t); } static inline float ImSaturate(float f) { return (f < 0.0f) ? 0.0f : (f > 1.0f) ? 1.0f : f; } -static inline float ImLengthSqr(const ImVec2& lhs) { return lhs.x*lhs.x + lhs.y*lhs.y; } -static inline float ImLengthSqr(const ImVec4& lhs) { return lhs.x*lhs.x + lhs.y*lhs.y + lhs.z*lhs.z + lhs.w*lhs.w; } -static inline float ImInvLength(const ImVec2& lhs, float fail_value) { float d = lhs.x*lhs.x + lhs.y*lhs.y; if (d > 0.0f) return 1.0f / ImSqrt(d); return fail_value; } -static inline float ImFloor(float f) { return (float)(int)f; } -static inline ImVec2 ImFloor(const ImVec2& v) { return ImVec2((float)(int)v.x, (float)(int)v.y); } +static inline float ImLengthSqr(const ImVec2& lhs) { return (lhs.x * lhs.x) + (lhs.y * lhs.y); } +static inline float ImLengthSqr(const ImVec4& lhs) { return (lhs.x * lhs.x) + (lhs.y * lhs.y) + (lhs.z * lhs.z) + (lhs.w * lhs.w); } +static inline float ImInvLength(const ImVec2& lhs, float fail_value) { float d = (lhs.x * lhs.x) + (lhs.y * lhs.y); if (d > 0.0f) return ImRsqrt(d); return fail_value; } +static inline float ImTrunc(float f) { return (float)(int)(f); } +static inline ImVec2 ImTrunc(const ImVec2& v) { return ImVec2((float)(int)(v.x), (float)(int)(v.y)); } +static inline float ImFloor(float f) { return (float)((f >= 0 || (float)(int)f == f) ? (int)f : (int)f - 1); } // Decent replacement for floorf() +static inline ImVec2 ImFloor(const ImVec2& v) { return ImVec2(ImFloor(v.x), ImFloor(v.y)); } static inline int ImModPositive(int a, int b) { return (a + b) % b; } static inline float ImDot(const ImVec2& a, const ImVec2& b) { return a.x * b.x + a.y * b.y; } static inline ImVec2 ImRotate(const ImVec2& v, float cos_a, float sin_a) { return ImVec2(v.x * cos_a - v.y * sin_a, v.x * sin_a + v.y * cos_a); } static inline float ImLinearSweep(float current, float target, float speed) { if (current < target) return ImMin(current + speed, target); if (current > target) return ImMax(current - speed, target); return current; } +static inline float ImLinearRemapClamp(float s0, float s1, float d0, float d1, float x) { return ImSaturate((x - s0) / (s1 - s0)) * (d1 - d0) + d0; } static inline ImVec2 ImMul(const ImVec2& lhs, const ImVec2& rhs) { return ImVec2(lhs.x * rhs.x, lhs.y * rhs.y); } +static inline bool ImIsFloatAboveGuaranteedIntegerPrecision(float f) { return f <= -16777216 || f >= 16777216; } +static inline float ImExponentialMovingAverage(float avg, float sample, int n) { avg -= avg / n; avg += sample / n; return avg; } +IM_MSVC_RUNTIME_CHECKS_RESTORE -// Helper: ImBoolVector. Store 1-bit per value. -// Note that Resize() currently clears the whole vector. -struct ImBoolVector +// Helpers: Geometry +IMGUI_API ImVec2 ImBezierCubicCalc(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, float t); +IMGUI_API ImVec2 ImBezierCubicClosestPoint(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, const ImVec2& p, int num_segments); // For curves with explicit number of segments +IMGUI_API ImVec2 ImBezierCubicClosestPointCasteljau(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, const ImVec2& p, float tess_tol);// For auto-tessellated curves you can use tess_tol = style.CurveTessellationTol +IMGUI_API ImVec2 ImBezierQuadraticCalc(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, float t); +IMGUI_API ImVec2 ImLineClosestPoint(const ImVec2& a, const ImVec2& b, const ImVec2& p); +IMGUI_API bool ImTriangleContainsPoint(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& p); +IMGUI_API ImVec2 ImTriangleClosestPoint(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& p); +IMGUI_API void ImTriangleBarycentricCoords(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& p, float& out_u, float& out_v, float& out_w); +inline float ImTriangleArea(const ImVec2& a, const ImVec2& b, const ImVec2& c) { return ImFabs((a.x * (b.y - c.y)) + (b.x * (c.y - a.y)) + (c.x * (a.y - b.y))) * 0.5f; } +inline bool ImTriangleIsClockwise(const ImVec2& a, const ImVec2& b, const ImVec2& c) { return ((b.x - a.x) * (c.y - b.y)) - ((c.x - b.x) * (b.y - a.y)) > 0.0f; } + +// Helper: ImVec1 (1D vector) +// (this odd construct is used to facilitate the transition between 1D and 2D, and the maintenance of some branches/patches) +IM_MSVC_RUNTIME_CHECKS_OFF +struct ImVec1 { - ImVector Storage; - ImBoolVector() { } - void Resize(int sz) { Storage.resize((sz + 31) >> 5); memset(Storage.Data, 0, (size_t)Storage.Size * sizeof(Storage.Data[0])); } - void Clear() { Storage.clear(); } - bool GetBit(int n) const { int off = (n >> 5); int mask = 1 << (n & 31); return (Storage[off] & mask) != 0; } - void SetBit(int n, bool v) { int off = (n >> 5); int mask = 1 << (n & 31); if (v) Storage[off] |= mask; else Storage[off] &= ~mask; } + float x; + constexpr ImVec1() : x(0.0f) { } + constexpr ImVec1(float _x) : x(_x) { } }; -// Helper: ImPool<>. Basic keyed storage for contiguous instances, slow/amortized insertion, O(1) indexable, O(Log N) queries by ID over a dense/hot buffer, +// Helper: ImVec2ih (2D vector, half-size integer, for long-term packed storage) +struct ImVec2ih +{ + short x, y; + constexpr ImVec2ih() : x(0), y(0) {} + constexpr ImVec2ih(short _x, short _y) : x(_x), y(_y) {} + constexpr explicit ImVec2ih(const ImVec2& rhs) : x((short)rhs.x), y((short)rhs.y) {} +}; + +// Helper: ImRect (2D axis aligned bounding-box) +// NB: we can't rely on ImVec2 math operators being available here! +struct IMGUI_API ImRect +{ + ImVec2 Min; // Upper-left + ImVec2 Max; // Lower-right + + constexpr ImRect() : Min(0.0f, 0.0f), Max(0.0f, 0.0f) {} + constexpr ImRect(const ImVec2& min, const ImVec2& max) : Min(min), Max(max) {} + constexpr ImRect(const ImVec4& v) : Min(v.x, v.y), Max(v.z, v.w) {} + constexpr ImRect(float x1, float y1, float x2, float y2) : Min(x1, y1), Max(x2, y2) {} + + ImVec2 GetCenter() const { return ImVec2((Min.x + Max.x) * 0.5f, (Min.y + Max.y) * 0.5f); } + ImVec2 GetSize() const { return ImVec2(Max.x - Min.x, Max.y - Min.y); } + float GetWidth() const { return Max.x - Min.x; } + float GetHeight() const { return Max.y - Min.y; } + float GetArea() const { return (Max.x - Min.x) * (Max.y - Min.y); } + ImVec2 GetTL() const { return Min; } // Top-left + ImVec2 GetTR() const { return ImVec2(Max.x, Min.y); } // Top-right + ImVec2 GetBL() const { return ImVec2(Min.x, Max.y); } // Bottom-left + ImVec2 GetBR() const { return Max; } // Bottom-right + bool Contains(const ImVec2& p) const { return p.x >= Min.x && p.y >= Min.y && p.x < Max.x && p.y < Max.y; } + bool Contains(const ImRect& r) const { return r.Min.x >= Min.x && r.Min.y >= Min.y && r.Max.x <= Max.x && r.Max.y <= Max.y; } + bool ContainsWithPad(const ImVec2& p, const ImVec2& pad) const { return p.x >= Min.x - pad.x && p.y >= Min.y - pad.y && p.x < Max.x + pad.x && p.y < Max.y + pad.y; } + bool Overlaps(const ImRect& r) const { return r.Min.y < Max.y && r.Max.y > Min.y && r.Min.x < Max.x && r.Max.x > Min.x; } + void Add(const ImVec2& p) { if (Min.x > p.x) Min.x = p.x; if (Min.y > p.y) Min.y = p.y; if (Max.x < p.x) Max.x = p.x; if (Max.y < p.y) Max.y = p.y; } + void Add(const ImRect& r) { if (Min.x > r.Min.x) Min.x = r.Min.x; if (Min.y > r.Min.y) Min.y = r.Min.y; if (Max.x < r.Max.x) Max.x = r.Max.x; if (Max.y < r.Max.y) Max.y = r.Max.y; } + void Expand(const float amount) { Min.x -= amount; Min.y -= amount; Max.x += amount; Max.y += amount; } + void Expand(const ImVec2& amount) { Min.x -= amount.x; Min.y -= amount.y; Max.x += amount.x; Max.y += amount.y; } + void Translate(const ImVec2& d) { Min.x += d.x; Min.y += d.y; Max.x += d.x; Max.y += d.y; } + void TranslateX(float dx) { Min.x += dx; Max.x += dx; } + void TranslateY(float dy) { Min.y += dy; Max.y += dy; } + void ClipWith(const ImRect& r) { Min = ImMax(Min, r.Min); Max = ImMin(Max, r.Max); } // Simple version, may lead to an inverted rectangle, which is fine for Contains/Overlaps test but not for display. + void ClipWithFull(const ImRect& r) { Min = ImClamp(Min, r.Min, r.Max); Max = ImClamp(Max, r.Min, r.Max); } // Full version, ensure both points are fully clipped. + void Floor() { Min.x = IM_TRUNC(Min.x); Min.y = IM_TRUNC(Min.y); Max.x = IM_TRUNC(Max.x); Max.y = IM_TRUNC(Max.y); } + bool IsInverted() const { return Min.x > Max.x || Min.y > Max.y; } + ImVec4 ToVec4() const { return ImVec4(Min.x, Min.y, Max.x, Max.y); } +}; + +// Helper: ImBitArray +#define IM_BITARRAY_TESTBIT(_ARRAY, _N) ((_ARRAY[(_N) >> 5] & ((ImU32)1 << ((_N) & 31))) != 0) // Macro version of ImBitArrayTestBit(): ensure args have side-effect or are costly! +#define IM_BITARRAY_CLEARBIT(_ARRAY, _N) ((_ARRAY[(_N) >> 5] &= ~((ImU32)1 << ((_N) & 31)))) // Macro version of ImBitArrayClearBit(): ensure args have side-effect or are costly! +inline size_t ImBitArrayGetStorageSizeInBytes(int bitcount) { return (size_t)((bitcount + 31) >> 5) << 2; } +inline void ImBitArrayClearAllBits(ImU32* arr, int bitcount){ memset(arr, 0, ImBitArrayGetStorageSizeInBytes(bitcount)); } +inline bool ImBitArrayTestBit(const ImU32* arr, int n) { ImU32 mask = (ImU32)1 << (n & 31); return (arr[n >> 5] & mask) != 0; } +inline void ImBitArrayClearBit(ImU32* arr, int n) { ImU32 mask = (ImU32)1 << (n & 31); arr[n >> 5] &= ~mask; } +inline void ImBitArraySetBit(ImU32* arr, int n) { ImU32 mask = (ImU32)1 << (n & 31); arr[n >> 5] |= mask; } +inline void ImBitArraySetBitRange(ImU32* arr, int n, int n2) // Works on range [n..n2) +{ + n2--; + while (n <= n2) + { + int a_mod = (n & 31); + int b_mod = (n2 > (n | 31) ? 31 : (n2 & 31)) + 1; + ImU32 mask = (ImU32)(((ImU64)1 << b_mod) - 1) & ~(ImU32)(((ImU64)1 << a_mod) - 1); + arr[n >> 5] |= mask; + n = (n + 32) & ~31; + } +} + +typedef ImU32* ImBitArrayPtr; // Name for use in structs + +// Helper: ImBitArray class (wrapper over ImBitArray functions) +// Store 1-bit per value. +template +struct ImBitArray +{ + ImU32 Storage[(BITCOUNT + 31) >> 5]; + ImBitArray() { ClearAllBits(); } + void ClearAllBits() { memset(Storage, 0, sizeof(Storage)); } + void SetAllBits() { memset(Storage, 255, sizeof(Storage)); } + bool TestBit(int n) const { n += OFFSET; IM_ASSERT(n >= 0 && n < BITCOUNT); return IM_BITARRAY_TESTBIT(Storage, n); } + void SetBit(int n) { n += OFFSET; IM_ASSERT(n >= 0 && n < BITCOUNT); ImBitArraySetBit(Storage, n); } + void ClearBit(int n) { n += OFFSET; IM_ASSERT(n >= 0 && n < BITCOUNT); ImBitArrayClearBit(Storage, n); } + void SetBitRange(int n, int n2) { n += OFFSET; n2 += OFFSET; IM_ASSERT(n >= 0 && n < BITCOUNT && n2 > n && n2 <= BITCOUNT); ImBitArraySetBitRange(Storage, n, n2); } // Works on range [n..n2) + bool operator[](int n) const { n += OFFSET; IM_ASSERT(n >= 0 && n < BITCOUNT); return IM_BITARRAY_TESTBIT(Storage, n); } +}; + +// Helper: ImBitVector +// Store 1-bit per value. +struct IMGUI_API ImBitVector +{ + ImVector Storage; + void Create(int sz) { Storage.resize((sz + 31) >> 5); memset(Storage.Data, 0, (size_t)Storage.Size * sizeof(Storage.Data[0])); } + void Clear() { Storage.clear(); } + bool TestBit(int n) const { IM_ASSERT(n < (Storage.Size << 5)); return IM_BITARRAY_TESTBIT(Storage.Data, n); } + void SetBit(int n) { IM_ASSERT(n < (Storage.Size << 5)); ImBitArraySetBit(Storage.Data, n); } + void ClearBit(int n) { IM_ASSERT(n < (Storage.Size << 5)); ImBitArrayClearBit(Storage.Data, n); } +}; +IM_MSVC_RUNTIME_CHECKS_RESTORE + +// Helper: ImSpan<> +// Pointing to a span of data we don't own. +template +struct ImSpan +{ + T* Data; + T* DataEnd; + + // Constructors, destructor + inline ImSpan() { Data = DataEnd = NULL; } + inline ImSpan(T* data, int size) { Data = data; DataEnd = data + size; } + inline ImSpan(T* data, T* data_end) { Data = data; DataEnd = data_end; } + + inline void set(T* data, int size) { Data = data; DataEnd = data + size; } + inline void set(T* data, T* data_end) { Data = data; DataEnd = data_end; } + inline int size() const { return (int)(ptrdiff_t)(DataEnd - Data); } + inline int size_in_bytes() const { return (int)(ptrdiff_t)(DataEnd - Data) * (int)sizeof(T); } + inline T& operator[](int i) { T* p = Data + i; IM_ASSERT(p >= Data && p < DataEnd); return *p; } + inline const T& operator[](int i) const { const T* p = Data + i; IM_ASSERT(p >= Data && p < DataEnd); return *p; } + + inline T* begin() { return Data; } + inline const T* begin() const { return Data; } + inline T* end() { return DataEnd; } + inline const T* end() const { return DataEnd; } + + // Utilities + inline int index_from_ptr(const T* it) const { IM_ASSERT(it >= Data && it < DataEnd); const ptrdiff_t off = it - Data; return (int)off; } +}; + +// Helper: ImSpanAllocator<> +// Facilitate storing multiple chunks into a single large block (the "arena") +// - Usage: call Reserve() N times, allocate GetArenaSizeInBytes() worth, pass it to SetArenaBasePtr(), call GetSpan() N times to retrieve the aligned ranges. +template +struct ImSpanAllocator +{ + char* BasePtr; + int CurrOff; + int CurrIdx; + int Offsets[CHUNKS]; + int Sizes[CHUNKS]; + + ImSpanAllocator() { memset(this, 0, sizeof(*this)); } + inline void Reserve(int n, size_t sz, int a=4) { IM_ASSERT(n == CurrIdx && n < CHUNKS); CurrOff = IM_MEMALIGN(CurrOff, a); Offsets[n] = CurrOff; Sizes[n] = (int)sz; CurrIdx++; CurrOff += (int)sz; } + inline int GetArenaSizeInBytes() { return CurrOff; } + inline void SetArenaBasePtr(void* base_ptr) { BasePtr = (char*)base_ptr; } + inline void* GetSpanPtrBegin(int n) { IM_ASSERT(n >= 0 && n < CHUNKS && CurrIdx == CHUNKS); return (void*)(BasePtr + Offsets[n]); } + inline void* GetSpanPtrEnd(int n) { IM_ASSERT(n >= 0 && n < CHUNKS && CurrIdx == CHUNKS); return (void*)(BasePtr + Offsets[n] + Sizes[n]); } + template + inline void GetSpan(int n, ImSpan* span) { span->set((T*)GetSpanPtrBegin(n), (T*)GetSpanPtrEnd(n)); } +}; + +// Helper: ImPool<> +// Basic keyed storage for contiguous instances, slow/amortized insertion, O(1) indexable, O(Log N) queries by ID over a dense/hot buffer, // Honor constructor/destructor. Add/remove invalidate all pointers. Indexes have the same lifetime as the associated object. typedef int ImPoolIdx; template -struct IMGUI_API ImPool +struct ImPool { - ImVector Data; // Contiguous data + ImVector Buf; // Contiguous data ImGuiStorage Map; // ID->Index ImPoolIdx FreeIdx; // Next free idx to use + ImPoolIdx AliveCount; // Number of active/alive items (for display purpose) - ImPool() { FreeIdx = 0; } + ImPool() { FreeIdx = AliveCount = 0; } ~ImPool() { Clear(); } - T* GetByKey(ImGuiID key) { int idx = Map.GetInt(key, -1); return (idx != -1) ? &Data[idx] : NULL; } - T* GetByIndex(ImPoolIdx n) { return &Data[n]; } - ImPoolIdx GetIndex(const T* p) const { IM_ASSERT(p >= Data.Data && p < Data.Data + Data.Size); return (ImPoolIdx)(p - Data.Data); } - T* GetOrAddByKey(ImGuiID key) { int* p_idx = Map.GetIntRef(key, -1); if (*p_idx != -1) return &Data[*p_idx]; *p_idx = FreeIdx; return Add(); } - bool Contains(const T* p) const { return (p >= Data.Data && p < Data.Data + Data.Size); } - void Clear() { for (int n = 0; n < Map.Data.Size; n++) { int idx = Map.Data[n].val_i; if (idx != -1) Data[idx].~T(); } Map.Clear(); Data.clear(); FreeIdx = 0; } - T* Add() { int idx = FreeIdx; if (idx == Data.Size) { Data.resize(Data.Size + 1); FreeIdx++; } else { FreeIdx = *(int*)&Data[idx]; } IM_PLACEMENT_NEW(&Data[idx]) T(); return &Data[idx]; } + T* GetByKey(ImGuiID key) { int idx = Map.GetInt(key, -1); return (idx != -1) ? &Buf[idx] : NULL; } + T* GetByIndex(ImPoolIdx n) { return &Buf[n]; } + ImPoolIdx GetIndex(const T* p) const { IM_ASSERT(p >= Buf.Data && p < Buf.Data + Buf.Size); return (ImPoolIdx)(p - Buf.Data); } + T* GetOrAddByKey(ImGuiID key) { int* p_idx = Map.GetIntRef(key, -1); if (*p_idx != -1) return &Buf[*p_idx]; *p_idx = FreeIdx; return Add(); } + bool Contains(const T* p) const { return (p >= Buf.Data && p < Buf.Data + Buf.Size); } + void Clear() { for (int n = 0; n < Map.Data.Size; n++) { int idx = Map.Data[n].val_i; if (idx != -1) Buf[idx].~T(); } Map.Clear(); Buf.clear(); FreeIdx = AliveCount = 0; } + T* Add() { int idx = FreeIdx; if (idx == Buf.Size) { Buf.resize(Buf.Size + 1); FreeIdx++; } else { FreeIdx = *(int*)&Buf[idx]; } IM_PLACEMENT_NEW(&Buf[idx]) T(); AliveCount++; return &Buf[idx]; } void Remove(ImGuiID key, const T* p) { Remove(key, GetIndex(p)); } - void Remove(ImGuiID key, ImPoolIdx idx) { Data[idx].~T(); *(int*)&Data[idx] = FreeIdx; FreeIdx = idx; Map.SetInt(key, -1); } - void Reserve(int capacity) { Data.reserve(capacity); Map.Data.reserve(capacity); } - int GetSize() const { return Data.Size; } + void Remove(ImGuiID key, ImPoolIdx idx) { Buf[idx].~T(); *(int*)&Buf[idx] = FreeIdx; FreeIdx = idx; Map.SetInt(key, -1); AliveCount--; } + void Reserve(int capacity) { Buf.reserve(capacity); Map.Data.reserve(capacity); } + + // To iterate a ImPool: for (int n = 0; n < pool.GetMapSize(); n++) if (T* t = pool.TryGetMapData(n)) { ... } + // Can be avoided if you know .Remove() has never been called on the pool, or AliveCount == GetMapSize() + int GetAliveCount() const { return AliveCount; } // Number of active/alive items in the pool (for display purpose) + int GetBufSize() const { return Buf.Size; } + int GetMapSize() const { return Map.Data.Size; } // It is the map we need iterate to find valid items, since we don't have "alive" storage anywhere + T* TryGetMapData(ImPoolIdx n) { int idx = Map.Data[n].val_i; if (idx == -1) return NULL; return GetByIndex(idx); } +}; + +// Helper: ImChunkStream<> +// Build and iterate a contiguous stream of variable-sized structures. +// This is used by Settings to store persistent data while reducing allocation count. +// We store the chunk size first, and align the final size on 4 bytes boundaries. +// The tedious/zealous amount of casting is to avoid -Wcast-align warnings. +template +struct ImChunkStream +{ + ImVector Buf; + + void clear() { Buf.clear(); } + bool empty() const { return Buf.Size == 0; } + int size() const { return Buf.Size; } + T* alloc_chunk(size_t sz) { size_t HDR_SZ = 4; sz = IM_MEMALIGN(HDR_SZ + sz, 4u); int off = Buf.Size; Buf.resize(off + (int)sz); ((int*)(void*)(Buf.Data + off))[0] = (int)sz; return (T*)(void*)(Buf.Data + off + (int)HDR_SZ); } + T* begin() { size_t HDR_SZ = 4; if (!Buf.Data) return NULL; return (T*)(void*)(Buf.Data + HDR_SZ); } + T* next_chunk(T* p) { size_t HDR_SZ = 4; IM_ASSERT(p >= begin() && p < end()); p = (T*)(void*)((char*)(void*)p + chunk_size(p)); if (p == (T*)(void*)((char*)end() + HDR_SZ)) return (T*)0; IM_ASSERT(p < end()); return p; } + int chunk_size(const T* p) { return ((const int*)p)[-1]; } + T* end() { return (T*)(void*)(Buf.Data + Buf.Size); } + int offset_from_ptr(const T* p) { IM_ASSERT(p >= begin() && p < end()); const ptrdiff_t off = (const char*)p - Buf.Data; return (int)off; } + T* ptr_from_offset(int off) { IM_ASSERT(off >= 4 && off < Buf.Size); return (T*)(void*)(Buf.Data + off); } + void swap(ImChunkStream& rhs) { rhs.Buf.swap(Buf); } +}; + +// Helper: ImGuiTextIndex +// Maintain a line index for a text buffer. This is a strong candidate to be moved into the public API. +struct ImGuiTextIndex +{ + ImVector LineOffsets; + int EndOffset = 0; // Because we don't own text buffer we need to maintain EndOffset (may bake in LineOffsets?) + + void clear() { LineOffsets.clear(); EndOffset = 0; } + int size() { return LineOffsets.Size; } + const char* get_line_begin(const char* base, int n) { return base + LineOffsets[n]; } + const char* get_line_end(const char* base, int n) { return base + (n + 1 < LineOffsets.Size ? (LineOffsets[n + 1] - 1) : EndOffset); } + void append(const char* base, int old_size, int new_size); +}; + +// Helper: ImGuiStorage +IMGUI_API ImGuiStoragePair* ImLowerBound(ImGuiStoragePair* in_begin, ImGuiStoragePair* in_end, ImGuiID key); + +//----------------------------------------------------------------------------- +// [SECTION] ImDrawList support +//----------------------------------------------------------------------------- + +// ImDrawList: Helper function to calculate a circle's segment count given its radius and a "maximum error" value. +// Estimation of number of circle segment based on error is derived using method described in https://stackoverflow.com/a/2244088/15194693 +// Number of segments (N) is calculated using equation: +// N = ceil ( pi / acos(1 - error / r) ) where r > 0, error <= r +// Our equation is significantly simpler that one in the post thanks for choosing segment that is +// perpendicular to X axis. Follow steps in the article from this starting condition and you will +// will get this result. +// +// Rendering circles with an odd number of segments, while mathematically correct will produce +// asymmetrical results on the raster grid. Therefore we're rounding N to next even number (7->8, 8->8, 9->10 etc.) +#define IM_ROUNDUP_TO_EVEN(_V) ((((_V) + 1) / 2) * 2) +#define IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_MIN 4 +#define IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_MAX 512 +#define IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_CALC(_RAD,_MAXERROR) ImClamp(IM_ROUNDUP_TO_EVEN((int)ImCeil(IM_PI / ImAcos(1 - ImMin((_MAXERROR), (_RAD)) / (_RAD)))), IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_MIN, IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_MAX) + +// Raw equation from IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_CALC rewritten for 'r' and 'error'. +#define IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_CALC_R(_N,_MAXERROR) ((_MAXERROR) / (1 - ImCos(IM_PI / ImMax((float)(_N), IM_PI)))) +#define IM_DRAWLIST_CIRCLE_AUTO_SEGMENT_CALC_ERROR(_N,_RAD) ((1 - ImCos(IM_PI / ImMax((float)(_N), IM_PI))) / (_RAD)) + +// ImDrawList: Lookup table size for adaptive arc drawing, cover full circle. +#ifndef IM_DRAWLIST_ARCFAST_TABLE_SIZE +#define IM_DRAWLIST_ARCFAST_TABLE_SIZE 48 // Number of samples in lookup table. +#endif +#define IM_DRAWLIST_ARCFAST_SAMPLE_MAX IM_DRAWLIST_ARCFAST_TABLE_SIZE // Sample index _PathArcToFastEx() for 360 angle. + +// Data shared between all ImDrawList instances +// Conceptually this could have been called e.g. ImDrawListSharedContext +// Typically one ImGui context would create and maintain one of this. +// You may want to create your own instance of you try to ImDrawList completely without ImGui. In that case, watch out for future changes to this structure. +struct IMGUI_API ImDrawListSharedData +{ + ImVec2 TexUvWhitePixel; // UV of white pixel in the atlas + const ImVec4* TexUvLines; // UV of anti-aliased lines in the atlas + ImFont* Font; // Current/default font (optional, for simplified AddText overload) + float FontSize; // Current/default font size (optional, for simplified AddText overload) + float FontScale; // Current/default font scale (== FontSize / Font->FontSize) + float CurveTessellationTol; // Tessellation tolerance when using PathBezierCurveTo() + float CircleSegmentMaxError; // Number of circle segments to use per pixel of radius for AddCircle() etc + float InitialFringeScale; // Initial scale to apply to AA fringe + ImDrawListFlags InitialFlags; // Initial flags at the beginning of the frame (it is possible to alter flags on a per-drawlist basis afterwards) + ImVec4 ClipRectFullscreen; // Value for PushClipRectFullscreen() + ImVector TempBuffer; // Temporary write buffer + + // Lookup tables + ImVec2 ArcFastVtx[IM_DRAWLIST_ARCFAST_TABLE_SIZE]; // Sample points on the quarter of the circle. + float ArcFastRadiusCutoff; // Cutoff radius after which arc drawing will fallback to slower PathArcTo() + ImU8 CircleSegmentCounts[64]; // Precomputed segment count for given radius before we calculate it dynamically (to avoid calculation overhead) + + ImDrawListSharedData(); + void SetCircleTessellationMaxError(float max_error); +}; + +struct ImDrawDataBuilder +{ + ImVector* Layers[2]; // Pointers to global layers for: regular, tooltip. LayersP[0] is owned by DrawData. + ImVector LayerData1; + + ImDrawDataBuilder() { memset(this, 0, sizeof(*this)); } }; //----------------------------------------------------------------------------- -// Misc data structures +// [SECTION] Style support //----------------------------------------------------------------------------- -enum ImGuiButtonFlags_ +struct ImGuiStyleVarInfo { - ImGuiButtonFlags_None = 0, - ImGuiButtonFlags_Repeat = 1 << 0, // hold to repeat - ImGuiButtonFlags_PressedOnClickRelease = 1 << 1, // [Default] return true on click + release on same item - ImGuiButtonFlags_PressedOnClick = 1 << 2, // return true on click (default requires click+release) - ImGuiButtonFlags_PressedOnRelease = 1 << 3, // return true on release (default requires click+release) - ImGuiButtonFlags_PressedOnDoubleClick = 1 << 4, // return true on double-click (default requires click+release) - ImGuiButtonFlags_FlattenChildren = 1 << 5, // allow interactions even if a child window is overlapping - ImGuiButtonFlags_AllowItemOverlap = 1 << 6, // require previous frame HoveredId to either match id or be null before being usable, use along with SetItemAllowOverlap() - ImGuiButtonFlags_DontClosePopups = 1 << 7, // disable automatically closing parent popup on press // [UNUSED] - ImGuiButtonFlags_Disabled = 1 << 8, // disable interactions - ImGuiButtonFlags_AlignTextBaseLine = 1 << 9, // vertically align button to match text baseline - ButtonEx() only // FIXME: Should be removed and handled by SmallButton(), not possible currently because of DC.CursorPosPrevLine - ImGuiButtonFlags_NoKeyModifiers = 1 << 10, // disable interaction if a key modifier is held - ImGuiButtonFlags_NoHoldingActiveID = 1 << 11, // don't set ActiveId while holding the mouse (ImGuiButtonFlags_PressedOnClick only) - ImGuiButtonFlags_PressedOnDragDropHold = 1 << 12, // press when held into while we are drag and dropping another item (used by e.g. tree nodes, collapsing headers) - ImGuiButtonFlags_NoNavFocus = 1 << 13, // don't override navigation focus when activated - ImGuiButtonFlags_NoHoveredOnNav = 1 << 14 // don't report as hovered when navigated on + ImU32 Count : 8; // 1+ + ImGuiDataType DataType : 8; + ImU32 Offset : 16; // Offset in parent structure + void* GetVarPtr(void* parent) const { return (void*)((unsigned char*)parent + Offset); } }; -enum ImGuiSliderFlags_ +// Stacked color modifier, backup of modified data so we can restore it +struct ImGuiColorMod { - ImGuiSliderFlags_None = 0, - ImGuiSliderFlags_Vertical = 1 << 0 + ImGuiCol Col; + ImVec4 BackupValue; }; -enum ImGuiDragFlags_ +// Stacked style modifier, backup of modified data so we can restore it. Data type inferred from the variable. +struct ImGuiStyleMod { - ImGuiDragFlags_None = 0, - ImGuiDragFlags_Vertical = 1 << 0 + ImGuiStyleVar VarIdx; + union { int BackupInt[2]; float BackupFloat[2]; }; + ImGuiStyleMod(ImGuiStyleVar idx, int v) { VarIdx = idx; BackupInt[0] = v; } + ImGuiStyleMod(ImGuiStyleVar idx, float v) { VarIdx = idx; BackupFloat[0] = v; } + ImGuiStyleMod(ImGuiStyleVar idx, ImVec2 v) { VarIdx = idx; BackupFloat[0] = v.x; BackupFloat[1] = v.y; } }; -enum ImGuiColumnsFlags_ +//----------------------------------------------------------------------------- +// [SECTION] Data types support +//----------------------------------------------------------------------------- + +struct ImGuiDataTypeStorage { - // Default: 0 - ImGuiColumnsFlags_None = 0, - ImGuiColumnsFlags_NoBorder = 1 << 0, // Disable column dividers - ImGuiColumnsFlags_NoResize = 1 << 1, // Disable resizing columns when clicking on the dividers - ImGuiColumnsFlags_NoPreserveWidths = 1 << 2, // Disable column width preservation when adjusting columns - ImGuiColumnsFlags_NoForceWithinWindow = 1 << 3, // Disable forcing columns to fit within window - ImGuiColumnsFlags_GrowParentContentsSize= 1 << 4 // (WIP) Restore pre-1.51 behavior of extending the parent window contents size but _without affecting the columns width at all_. Will eventually remove. + ImU8 Data[8]; // Opaque storage to fit any data up to ImGuiDataType_COUNT +}; + +// Type information associated to one ImGuiDataType. Retrieve with DataTypeGetInfo(). +struct ImGuiDataTypeInfo +{ + size_t Size; // Size in bytes + const char* Name; // Short descriptive name for the type, for debugging + const char* PrintFmt; // Default printf format for the type + const char* ScanFmt; // Default scanf format for the type +}; + +// Extend ImGuiDataType_ +enum ImGuiDataTypePrivate_ +{ + ImGuiDataType_Pointer = ImGuiDataType_COUNT, + ImGuiDataType_ID, +}; + +//----------------------------------------------------------------------------- +// [SECTION] Widgets support: flags, enums, data structures +//----------------------------------------------------------------------------- + +// Extend ImGuiItemFlags +// - input: PushItemFlag() manipulates g.CurrentItemFlags, g.NextItemData.ItemFlags, ItemAdd() calls may add extra flags too. +// - output: stored in g.LastItemData.ItemFlags +enum ImGuiItemFlagsPrivate_ +{ + // Controlled by user + ImGuiItemFlags_Disabled = 1 << 10, // false // Disable interactions (DOES NOT affect visuals. DO NOT mix direct use of this with BeginDisabled(). See BeginDisabled()/EndDisabled() for full disable feature, and github #211). + ImGuiItemFlags_ReadOnly = 1 << 11, // false // [ALPHA] Allow hovering interactions but underlying value is not changed. + ImGuiItemFlags_MixedValue = 1 << 12, // false // [BETA] Represent a mixed/indeterminate value, generally multi-selection where values differ. Currently only supported by Checkbox() (later should support all sorts of widgets) + ImGuiItemFlags_NoWindowHoverableCheck = 1 << 13, // false // Disable hoverable check in ItemHoverable() + ImGuiItemFlags_AllowOverlap = 1 << 14, // false // Allow being overlapped by another widget. Not-hovered to Hovered transition deferred by a frame. + ImGuiItemFlags_NoNavDisableMouseHover = 1 << 15, // false // Nav keyboard/gamepad mode doesn't disable hover highlight (behave as if NavHighlightItemUnderNav==false). + ImGuiItemFlags_NoMarkEdited = 1 << 16, // false // Skip calling MarkItemEdited() + + // Controlled by widget code + ImGuiItemFlags_Inputable = 1 << 20, // false // [WIP] Auto-activate input mode when tab focused. Currently only used and supported by a few items before it becomes a generic feature. + ImGuiItemFlags_HasSelectionUserData = 1 << 21, // false // Set by SetNextItemSelectionUserData() + ImGuiItemFlags_IsMultiSelect = 1 << 22, // false // Set by SetNextItemSelectionUserData() + + ImGuiItemFlags_Default_ = ImGuiItemFlags_AutoClosePopups, // Please don't change, use PushItemFlag() instead. + + // Obsolete + //ImGuiItemFlags_SelectableDontClosePopup = !ImGuiItemFlags_AutoClosePopups, // Can't have a redirect as we inverted the behavior +}; + +// Status flags for an already submitted item +// - output: stored in g.LastItemData.StatusFlags +enum ImGuiItemStatusFlags_ +{ + ImGuiItemStatusFlags_None = 0, + ImGuiItemStatusFlags_HoveredRect = 1 << 0, // Mouse position is within item rectangle (does NOT mean that the window is in correct z-order and can be hovered!, this is only one part of the most-common IsItemHovered test) + ImGuiItemStatusFlags_HasDisplayRect = 1 << 1, // g.LastItemData.DisplayRect is valid + ImGuiItemStatusFlags_Edited = 1 << 2, // Value exposed by item was edited in the current frame (should match the bool return value of most widgets) + ImGuiItemStatusFlags_ToggledSelection = 1 << 3, // Set when Selectable(), TreeNode() reports toggling a selection. We can't report "Selected", only state changes, in order to easily handle clipping with less issues. + ImGuiItemStatusFlags_ToggledOpen = 1 << 4, // Set when TreeNode() reports toggling their open state. + ImGuiItemStatusFlags_HasDeactivated = 1 << 5, // Set if the widget/group is able to provide data for the ImGuiItemStatusFlags_Deactivated flag. + ImGuiItemStatusFlags_Deactivated = 1 << 6, // Only valid if ImGuiItemStatusFlags_HasDeactivated is set. + ImGuiItemStatusFlags_HoveredWindow = 1 << 7, // Override the HoveredWindow test to allow cross-window hover testing. + ImGuiItemStatusFlags_Visible = 1 << 8, // [WIP] Set when item is overlapping the current clipping rectangle (Used internally. Please don't use yet: API/system will change as we refactor Itemadd()). + ImGuiItemStatusFlags_HasClipRect = 1 << 9, // g.LastItemData.ClipRect is valid. + ImGuiItemStatusFlags_HasShortcut = 1 << 10, // g.LastItemData.Shortcut valid. Set by SetNextItemShortcut() -> ItemAdd(). + + // Additional status + semantic for ImGuiTestEngine +#ifdef IMGUI_ENABLE_TEST_ENGINE + ImGuiItemStatusFlags_Openable = 1 << 20, // Item is an openable (e.g. TreeNode) + ImGuiItemStatusFlags_Opened = 1 << 21, // Opened status + ImGuiItemStatusFlags_Checkable = 1 << 22, // Item is a checkable (e.g. CheckBox, MenuItem) + ImGuiItemStatusFlags_Checked = 1 << 23, // Checked status + ImGuiItemStatusFlags_Inputable = 1 << 24, // Item is a text-inputable (e.g. InputText, SliderXXX, DragXXX) +#endif +}; + +// Extend ImGuiHoveredFlags_ +enum ImGuiHoveredFlagsPrivate_ +{ + ImGuiHoveredFlags_DelayMask_ = ImGuiHoveredFlags_DelayNone | ImGuiHoveredFlags_DelayShort | ImGuiHoveredFlags_DelayNormal | ImGuiHoveredFlags_NoSharedDelay, + ImGuiHoveredFlags_AllowedMaskForIsWindowHovered = ImGuiHoveredFlags_ChildWindows | ImGuiHoveredFlags_RootWindow | ImGuiHoveredFlags_AnyWindow | ImGuiHoveredFlags_NoPopupHierarchy | ImGuiHoveredFlags_DockHierarchy | ImGuiHoveredFlags_AllowWhenBlockedByPopup | ImGuiHoveredFlags_AllowWhenBlockedByActiveItem | ImGuiHoveredFlags_ForTooltip | ImGuiHoveredFlags_Stationary, + ImGuiHoveredFlags_AllowedMaskForIsItemHovered = ImGuiHoveredFlags_AllowWhenBlockedByPopup | ImGuiHoveredFlags_AllowWhenBlockedByActiveItem | ImGuiHoveredFlags_AllowWhenOverlapped | ImGuiHoveredFlags_AllowWhenDisabled | ImGuiHoveredFlags_NoNavOverride | ImGuiHoveredFlags_ForTooltip | ImGuiHoveredFlags_Stationary | ImGuiHoveredFlags_DelayMask_, +}; + +// Extend ImGuiInputTextFlags_ +enum ImGuiInputTextFlagsPrivate_ +{ + // [Internal] + ImGuiInputTextFlags_Multiline = 1 << 26, // For internal use by InputTextMultiline() + ImGuiInputTextFlags_MergedItem = 1 << 27, // For internal use by TempInputText(), will skip calling ItemAdd(). Require bounding-box to strictly match. + ImGuiInputTextFlags_LocalizeDecimalPoint= 1 << 28, // For internal use by InputScalar() and TempInputScalar() +}; + +// Extend ImGuiButtonFlags_ +enum ImGuiButtonFlagsPrivate_ +{ + ImGuiButtonFlags_PressedOnClick = 1 << 4, // return true on click (mouse down event) + ImGuiButtonFlags_PressedOnClickRelease = 1 << 5, // [Default] return true on click + release on same item <-- this is what the majority of Button are using + ImGuiButtonFlags_PressedOnClickReleaseAnywhere = 1 << 6, // return true on click + release even if the release event is not done while hovering the item + ImGuiButtonFlags_PressedOnRelease = 1 << 7, // return true on release (default requires click+release) + ImGuiButtonFlags_PressedOnDoubleClick = 1 << 8, // return true on double-click (default requires click+release) + ImGuiButtonFlags_PressedOnDragDropHold = 1 << 9, // return true when held into while we are drag and dropping another item (used by e.g. tree nodes, collapsing headers) + //ImGuiButtonFlags_Repeat = 1 << 10, // hold to repeat -> use ImGuiItemFlags_ButtonRepeat instead. + ImGuiButtonFlags_FlattenChildren = 1 << 11, // allow interactions even if a child window is overlapping + ImGuiButtonFlags_AllowOverlap = 1 << 12, // require previous frame HoveredId to either match id or be null before being usable. + //ImGuiButtonFlags_DontClosePopups = 1 << 13, // disable automatically closing parent popup on press + //ImGuiButtonFlags_Disabled = 1 << 14, // disable interactions -> use BeginDisabled() or ImGuiItemFlags_Disabled + ImGuiButtonFlags_AlignTextBaseLine = 1 << 15, // vertically align button to match text baseline - ButtonEx() only // FIXME: Should be removed and handled by SmallButton(), not possible currently because of DC.CursorPosPrevLine + ImGuiButtonFlags_NoKeyModsAllowed = 1 << 16, // disable mouse interaction if a key modifier is held + ImGuiButtonFlags_NoHoldingActiveId = 1 << 17, // don't set ActiveId while holding the mouse (ImGuiButtonFlags_PressedOnClick only) + ImGuiButtonFlags_NoNavFocus = 1 << 18, // don't override navigation focus when activated (FIXME: this is essentially used every time an item uses ImGuiItemFlags_NoNav, but because legacy specs don't requires LastItemData to be set ButtonBehavior(), we can't poll g.LastItemData.ItemFlags) + ImGuiButtonFlags_NoHoveredOnFocus = 1 << 19, // don't report as hovered when nav focus is on this item + ImGuiButtonFlags_NoSetKeyOwner = 1 << 20, // don't set key/input owner on the initial click (note: mouse buttons are keys! often, the key in question will be ImGuiKey_MouseLeft!) + ImGuiButtonFlags_NoTestKeyOwner = 1 << 21, // don't test key/input owner when polling the key (note: mouse buttons are keys! often, the key in question will be ImGuiKey_MouseLeft!) + ImGuiButtonFlags_PressedOnMask_ = ImGuiButtonFlags_PressedOnClick | ImGuiButtonFlags_PressedOnClickRelease | ImGuiButtonFlags_PressedOnClickReleaseAnywhere | ImGuiButtonFlags_PressedOnRelease | ImGuiButtonFlags_PressedOnDoubleClick | ImGuiButtonFlags_PressedOnDragDropHold, + ImGuiButtonFlags_PressedOnDefault_ = ImGuiButtonFlags_PressedOnClickRelease, +}; + +// Extend ImGuiComboFlags_ +enum ImGuiComboFlagsPrivate_ +{ + ImGuiComboFlags_CustomPreview = 1 << 20, // enable BeginComboPreview() +}; + +// Extend ImGuiSliderFlags_ +enum ImGuiSliderFlagsPrivate_ +{ + ImGuiSliderFlags_Vertical = 1 << 20, // Should this slider be orientated vertically? + ImGuiSliderFlags_ReadOnly = 1 << 21, // Consider using g.NextItemData.ItemFlags |= ImGuiItemFlags_ReadOnly instead. }; // Extend ImGuiSelectableFlags_ enum ImGuiSelectableFlagsPrivate_ { // NB: need to be in sync with last value of ImGuiSelectableFlags_ - ImGuiSelectableFlags_NoHoldingActiveID = 1 << 20, - ImGuiSelectableFlags_PressedOnClick = 1 << 21, - ImGuiSelectableFlags_PressedOnRelease = 1 << 22, - ImGuiSelectableFlags_DrawFillAvailWidth = 1 << 23, // FIXME: We may be able to remove this (added in 6251d379 for menus) - ImGuiSelectableFlags_DrawHoveredWhenHeld= 1 << 24, // Always show active when held, even is not hovered. This concept could probably be renamed/formalized somehow. - ImGuiSelectableFlags_SetNavIdOnHover = 1 << 25 + ImGuiSelectableFlags_NoHoldingActiveID = 1 << 20, + ImGuiSelectableFlags_SelectOnNav = 1 << 21, // (WIP) Auto-select when moved into. This is not exposed in public API as to handle multi-select and modifiers we will need user to explicitly control focus scope. May be replaced with a BeginSelection() API. + ImGuiSelectableFlags_SelectOnClick = 1 << 22, // Override button behavior to react on Click (default is Click+Release) + ImGuiSelectableFlags_SelectOnRelease = 1 << 23, // Override button behavior to react on Release (default is Click+Release) + ImGuiSelectableFlags_SpanAvailWidth = 1 << 24, // Span all avail width even if we declared less for layout purpose. FIXME: We may be able to remove this (added in 6251d379, 2bcafc86 for menus) + ImGuiSelectableFlags_SetNavIdOnHover = 1 << 25, // Set Nav/Focus ID on mouse hover (used by MenuItem) + ImGuiSelectableFlags_NoPadWithHalfSpacing = 1 << 26, // Disable padding each side with ItemSpacing * 0.5f + ImGuiSelectableFlags_NoSetKeyOwner = 1 << 27, // Don't set key/input owner on the initial click (note: mouse buttons are keys! often, the key in question will be ImGuiKey_MouseLeft!) }; // Extend ImGuiTreeNodeFlags_ enum ImGuiTreeNodeFlagsPrivate_ { - ImGuiTreeNodeFlags_ClipLabelForTrailingButton = 1 << 20 + ImGuiTreeNodeFlags_ClipLabelForTrailingButton = 1 << 28,// FIXME-WIP: Hard-coded for CollapsingHeader() + ImGuiTreeNodeFlags_UpsideDownArrow = 1 << 29,// FIXME-WIP: Turn Down arrow into an Up arrow, for reversed trees (#6517) + ImGuiTreeNodeFlags_OpenOnMask_ = ImGuiTreeNodeFlags_OpenOnDoubleClick | ImGuiTreeNodeFlags_OpenOnArrow, }; enum ImGuiSeparatorFlags_ { - ImGuiSeparatorFlags_None = 0, - ImGuiSeparatorFlags_Horizontal = 1 << 0, // Axis default to current layout type, so generally Horizontal unless e.g. in a menu bar - ImGuiSeparatorFlags_Vertical = 1 << 1, - ImGuiSeparatorFlags_SpanAllColumns = 1 << 2 + ImGuiSeparatorFlags_None = 0, + ImGuiSeparatorFlags_Horizontal = 1 << 0, // Axis default to current layout type, so generally Horizontal unless e.g. in a menu bar + ImGuiSeparatorFlags_Vertical = 1 << 1, + ImGuiSeparatorFlags_SpanAllColumns = 1 << 2, // Make separator cover all columns of a legacy Columns() set. }; -// Transient per-window flags, reset at the beginning of the frame. For child window, inherited from parent on first Begin(). -// This is going to be exposed in imgui.h when stabilized enough. -enum ImGuiItemFlags_ +// Flags for FocusWindow(). This is not called ImGuiFocusFlags to avoid confusion with public-facing ImGuiFocusedFlags. +// FIXME: Once we finishing replacing more uses of GetTopMostPopupModal()+IsWindowWithinBeginStackOf() +// and FindBlockingModal() with this, we may want to change the flag to be opt-out instead of opt-in. +enum ImGuiFocusRequestFlags_ { - ImGuiItemFlags_NoTabStop = 1 << 0, // false - ImGuiItemFlags_ButtonRepeat = 1 << 1, // false // Button() will return true multiple times based on io.KeyRepeatDelay and io.KeyRepeatRate settings. - ImGuiItemFlags_Disabled = 1 << 2, // false // [BETA] Disable interactions but doesn't affect visuals yet. See github.com/ocornut/imgui/issues/211 - ImGuiItemFlags_NoNav = 1 << 3, // false - ImGuiItemFlags_NoNavDefaultFocus = 1 << 4, // false - ImGuiItemFlags_SelectableDontClosePopup = 1 << 5, // false // MenuItem/Selectable() automatically closes current Popup window - ImGuiItemFlags_MixedValue = 1 << 6, // false // [BETA] Represent a mixed/indeterminate value, generally multi-selection where values differ. Currently only supported by Checkbox() (later should support all sorts of widgets) - ImGuiItemFlags_Default_ = 0 -}; - -// Storage for LastItem data -enum ImGuiItemStatusFlags_ -{ - ImGuiItemStatusFlags_None = 0, - ImGuiItemStatusFlags_HoveredRect = 1 << 0, - ImGuiItemStatusFlags_HasDisplayRect = 1 << 1, - ImGuiItemStatusFlags_Edited = 1 << 2, // Value exposed by item was edited in the current frame (should match the bool return value of most widgets) - ImGuiItemStatusFlags_ToggledSelection = 1 << 3, // Set when Selectable(), TreeNode() reports toggling a selection. We can't report "Selected" because reporting the change allows us to handle clipping with less issues. - ImGuiItemStatusFlags_HasDeactivated = 1 << 4, // Set if the widget/group is able to provide data for the ImGuiItemStatusFlags_Deactivated flag. - ImGuiItemStatusFlags_Deactivated = 1 << 5 // Only valid if ImGuiItemStatusFlags_HasDeactivated is set. - -#ifdef IMGUI_ENABLE_TEST_ENGINE - , // [imgui_tests only] - ImGuiItemStatusFlags_Openable = 1 << 10, // - ImGuiItemStatusFlags_Opened = 1 << 11, // - ImGuiItemStatusFlags_Checkable = 1 << 12, // - ImGuiItemStatusFlags_Checked = 1 << 13 // -#endif + ImGuiFocusRequestFlags_None = 0, + ImGuiFocusRequestFlags_RestoreFocusedChild = 1 << 0, // Find last focused child (if any) and focus it instead. + ImGuiFocusRequestFlags_UnlessBelowModal = 1 << 1, // Do not set focus if the window is below a modal. }; enum ImGuiTextFlags_ { - ImGuiTextFlags_None = 0, - ImGuiTextFlags_NoWidthForLargeClippedText = 1 << 0 + ImGuiTextFlags_None = 0, + ImGuiTextFlags_NoWidthForLargeClippedText = 1 << 0, +}; + +enum ImGuiTooltipFlags_ +{ + ImGuiTooltipFlags_None = 0, + ImGuiTooltipFlags_OverridePrevious = 1 << 1, // Clear/ignore previously submitted tooltip (defaults to append) }; // FIXME: this is in development, not exposed/functional as a generic feature yet. @@ -427,13 +1048,16 @@ enum ImGuiLayoutType_ ImGuiLayoutType_Vertical = 1 }; -enum ImGuiLogType +// Flags for LogBegin() text capturing function +enum ImGuiLogFlags_ { - ImGuiLogType_None = 0, - ImGuiLogType_TTY, - ImGuiLogType_File, - ImGuiLogType_Buffer, - ImGuiLogType_Clipboard + ImGuiLogFlags_None = 0, + + ImGuiLogFlags_OutputTTY = 1 << 0, + ImGuiLogFlags_OutputFile = 1 << 1, + ImGuiLogFlags_OutputBuffer = 1 << 2, + ImGuiLogFlags_OutputClipboard = 1 << 3, + ImGuiLogFlags_OutputMask_ = ImGuiLogFlags_OutputTTY | ImGuiLogFlags_OutputFile | ImGuiLogFlags_OutputBuffer | ImGuiLogFlags_OutputClipboard, }; // X/Y enums are fixed to 0/1 so they may be used to index ImVec2 @@ -447,336 +1071,136 @@ enum ImGuiAxis enum ImGuiPlotType { ImGuiPlotType_Lines, - ImGuiPlotType_Histogram + ImGuiPlotType_Histogram, }; -enum ImGuiInputSource +// Storage data for BeginComboPreview()/EndComboPreview() +struct IMGUI_API ImGuiComboPreviewData { - ImGuiInputSource_None = 0, - ImGuiInputSource_Mouse, - ImGuiInputSource_Nav, - ImGuiInputSource_NavKeyboard, // Only used occasionally for storage, not tested/handled by most code - ImGuiInputSource_NavGamepad, // " - ImGuiInputSource_COUNT -}; + ImRect PreviewRect; + ImVec2 BackupCursorPos; + ImVec2 BackupCursorMaxPos; + ImVec2 BackupCursorPosPrevLine; + float BackupPrevLineTextBaseOffset; + ImGuiLayoutType BackupLayout; -// FIXME-NAV: Clarify/expose various repeat delay/rate -enum ImGuiInputReadMode -{ - ImGuiInputReadMode_Down, - ImGuiInputReadMode_Pressed, - ImGuiInputReadMode_Released, - ImGuiInputReadMode_Repeat, - ImGuiInputReadMode_RepeatSlow, - ImGuiInputReadMode_RepeatFast -}; - -enum ImGuiNavHighlightFlags_ -{ - ImGuiNavHighlightFlags_None = 0, - ImGuiNavHighlightFlags_TypeDefault = 1 << 0, - ImGuiNavHighlightFlags_TypeThin = 1 << 1, - ImGuiNavHighlightFlags_AlwaysDraw = 1 << 2, // Draw rectangular highlight if (g.NavId == id) _even_ when using the mouse. - ImGuiNavHighlightFlags_NoRounding = 1 << 3 -}; - -enum ImGuiNavDirSourceFlags_ -{ - ImGuiNavDirSourceFlags_None = 0, - ImGuiNavDirSourceFlags_Keyboard = 1 << 0, - ImGuiNavDirSourceFlags_PadDPad = 1 << 1, - ImGuiNavDirSourceFlags_PadLStick = 1 << 2 -}; - -enum ImGuiNavMoveFlags_ -{ - ImGuiNavMoveFlags_None = 0, - ImGuiNavMoveFlags_LoopX = 1 << 0, // On failed request, restart from opposite side - ImGuiNavMoveFlags_LoopY = 1 << 1, - ImGuiNavMoveFlags_WrapX = 1 << 2, // On failed request, request from opposite side one line down (when NavDir==right) or one line up (when NavDir==left) - ImGuiNavMoveFlags_WrapY = 1 << 3, // This is not super useful for provided for completeness - ImGuiNavMoveFlags_AllowCurrentNavId = 1 << 4, // Allow scoring and considering the current NavId as a move target candidate. This is used when the move source is offset (e.g. pressing PageDown actually needs to send a Up move request, if we are pressing PageDown from the bottom-most item we need to stay in place) - ImGuiNavMoveFlags_AlsoScoreVisibleSet = 1 << 5, // Store alternate result in NavMoveResultLocalVisibleSet that only comprise elements that are already fully visible. - ImGuiNavMoveFlags_ScrollToEdge = 1 << 6 -}; - -enum ImGuiNavForward -{ - ImGuiNavForward_None, - ImGuiNavForward_ForwardQueued, - ImGuiNavForward_ForwardActive -}; - -enum ImGuiNavLayer -{ - ImGuiNavLayer_Main = 0, // Main scrolling layer - ImGuiNavLayer_Menu = 1, // Menu layer (access with Alt/ImGuiNavInput_Menu) - ImGuiNavLayer_COUNT -}; - -enum ImGuiPopupPositionPolicy -{ - ImGuiPopupPositionPolicy_Default, - ImGuiPopupPositionPolicy_ComboBox -}; - -// 1D vector (this odd construct is used to facilitate the transition between 1D and 2D, and the maintenance of some branches/patches) -struct ImVec1 -{ - float x; - ImVec1() { x = 0.0f; } - ImVec1(float _x) { x = _x; } -}; - -// 2D vector (half-size integer) -struct ImVec2ih -{ - short x, y; - ImVec2ih() { x = y = 0; } - ImVec2ih(short _x, short _y) { x = _x; y = _y; } -}; - -// 2D axis aligned bounding-box -// NB: we can't rely on ImVec2 math operators being available here -struct IMGUI_API ImRect -{ - ImVec2 Min; // Upper-left - ImVec2 Max; // Lower-right - - ImRect() : Min(FLT_MAX,FLT_MAX), Max(-FLT_MAX,-FLT_MAX) {} - ImRect(const ImVec2& min, const ImVec2& max) : Min(min), Max(max) {} - ImRect(const ImVec4& v) : Min(v.x, v.y), Max(v.z, v.w) {} - ImRect(float x1, float y1, float x2, float y2) : Min(x1, y1), Max(x2, y2) {} - - ImVec2 GetCenter() const { return ImVec2((Min.x + Max.x) * 0.5f, (Min.y + Max.y) * 0.5f); } - ImVec2 GetSize() const { return ImVec2(Max.x - Min.x, Max.y - Min.y); } - float GetWidth() const { return Max.x - Min.x; } - float GetHeight() const { return Max.y - Min.y; } - ImVec2 GetTL() const { return Min; } // Top-left - ImVec2 GetTR() const { return ImVec2(Max.x, Min.y); } // Top-right - ImVec2 GetBL() const { return ImVec2(Min.x, Max.y); } // Bottom-left - ImVec2 GetBR() const { return Max; } // Bottom-right - bool Contains(const ImVec2& p) const { return p.x >= Min.x && p.y >= Min.y && p.x < Max.x && p.y < Max.y; } - bool Contains(const ImRect& r) const { return r.Min.x >= Min.x && r.Min.y >= Min.y && r.Max.x <= Max.x && r.Max.y <= Max.y; } - bool Overlaps(const ImRect& r) const { return r.Min.y < Max.y && r.Max.y > Min.y && r.Min.x < Max.x && r.Max.x > Min.x; } - void Add(const ImVec2& p) { if (Min.x > p.x) Min.x = p.x; if (Min.y > p.y) Min.y = p.y; if (Max.x < p.x) Max.x = p.x; if (Max.y < p.y) Max.y = p.y; } - void Add(const ImRect& r) { if (Min.x > r.Min.x) Min.x = r.Min.x; if (Min.y > r.Min.y) Min.y = r.Min.y; if (Max.x < r.Max.x) Max.x = r.Max.x; if (Max.y < r.Max.y) Max.y = r.Max.y; } - void Expand(const float amount) { Min.x -= amount; Min.y -= amount; Max.x += amount; Max.y += amount; } - void Expand(const ImVec2& amount) { Min.x -= amount.x; Min.y -= amount.y; Max.x += amount.x; Max.y += amount.y; } - void Translate(const ImVec2& d) { Min.x += d.x; Min.y += d.y; Max.x += d.x; Max.y += d.y; } - void TranslateX(float dx) { Min.x += dx; Max.x += dx; } - void TranslateY(float dy) { Min.y += dy; Max.y += dy; } - void ClipWith(const ImRect& r) { Min = ImMax(Min, r.Min); Max = ImMin(Max, r.Max); } // Simple version, may lead to an inverted rectangle, which is fine for Contains/Overlaps test but not for display. - void ClipWithFull(const ImRect& r) { Min = ImClamp(Min, r.Min, r.Max); Max = ImClamp(Max, r.Min, r.Max); } // Full version, ensure both points are fully clipped. - void Floor() { Min.x = (float)(int)Min.x; Min.y = (float)(int)Min.y; Max.x = (float)(int)Max.x; Max.y = (float)(int)Max.y; } - bool IsInverted() const { return Min.x > Max.x || Min.y > Max.y; } -}; - -// Type information associated to one ImGuiDataType. Retrieve with DataTypeGetInfo(). -struct ImGuiDataTypeInfo -{ - size_t Size; // Size in byte - const char* PrintFmt; // Default printf format for the type - const char* ScanFmt; // Default scanf format for the type -}; - -// Stacked color modifier, backup of modified data so we can restore it -struct ImGuiColorMod -{ - ImGuiCol Col; - ImVec4 BackupValue; -}; - -// Stacked style modifier, backup of modified data so we can restore it. Data type inferred from the variable. -struct ImGuiStyleMod -{ - ImGuiStyleVar VarIdx; - union { int BackupInt[2]; float BackupFloat[2]; }; - ImGuiStyleMod(ImGuiStyleVar idx, int v) { VarIdx = idx; BackupInt[0] = v; } - ImGuiStyleMod(ImGuiStyleVar idx, float v) { VarIdx = idx; BackupFloat[0] = v; } - ImGuiStyleMod(ImGuiStyleVar idx, ImVec2 v) { VarIdx = idx; BackupFloat[0] = v.x; BackupFloat[1] = v.y; } + ImGuiComboPreviewData() { memset(this, 0, sizeof(*this)); } }; // Stacked storage data for BeginGroup()/EndGroup() -struct ImGuiGroupData +struct IMGUI_API ImGuiGroupData { + ImGuiID WindowID; ImVec2 BackupCursorPos; ImVec2 BackupCursorMaxPos; + ImVec2 BackupCursorPosPrevLine; ImVec1 BackupIndent; ImVec1 BackupGroupOffset; ImVec2 BackupCurrLineSize; float BackupCurrLineTextBaseOffset; ImGuiID BackupActiveIdIsAlive; - bool BackupActiveIdPreviousFrameIsAlive; + bool BackupDeactivatedIdIsAlive; + bool BackupHoveredIdIsAlive; + bool BackupIsSameLine; bool EmitItem; }; // Simple column measurement, currently used for MenuItem() only.. This is very short-sighted/throw-away code and NOT a generic helper. struct IMGUI_API ImGuiMenuColumns { - float Spacing; - float Width, NextWidth; - float Pos[3], NextWidths[3]; + ImU32 TotalWidth; + ImU32 NextTotalWidth; + ImU16 Spacing; + ImU16 OffsetIcon; // Always zero for now + ImU16 OffsetLabel; // Offsets are locked in Update() + ImU16 OffsetShortcut; + ImU16 OffsetMark; + ImU16 Widths[4]; // Width of: Icon, Label, Shortcut, Mark (accumulators for current frame) - ImGuiMenuColumns(); - void Update(int count, float spacing, bool clear); - float DeclColumns(float w0, float w1, float w2); - float CalcExtraSpace(float avail_w); + ImGuiMenuColumns() { memset(this, 0, sizeof(*this)); } + void Update(float spacing, bool window_reappearing); + float DeclColumns(float w_icon, float w_label, float w_shortcut, float w_mark); + void CalcNextTotalWidth(bool update_offsets); }; +// Internal temporary state for deactivating InputText() instances. +struct IMGUI_API ImGuiInputTextDeactivatedState +{ + ImGuiID ID; // widget id owning the text state (which just got deactivated) + ImVector TextA; // text buffer + + ImGuiInputTextDeactivatedState() { memset(this, 0, sizeof(*this)); } + void ClearFreeMemory() { ID = 0; TextA.clear(); } +}; + +// Forward declare imstb_textedit.h structure + make its main configuration define accessible +#undef IMSTB_TEXTEDIT_STRING +#undef IMSTB_TEXTEDIT_CHARTYPE +#define IMSTB_TEXTEDIT_STRING ImGuiInputTextState +#define IMSTB_TEXTEDIT_CHARTYPE char +#define IMSTB_TEXTEDIT_GETWIDTH_NEWLINE (-1.0f) +#define IMSTB_TEXTEDIT_UNDOSTATECOUNT 99 +#define IMSTB_TEXTEDIT_UNDOCHARCOUNT 999 +namespace ImStb { struct STB_TexteditState; } +typedef ImStb::STB_TexteditState ImStbTexteditState; + // Internal state of the currently focused/edited text input box +// For a given item ID, access with ImGui::GetInputTextState() struct IMGUI_API ImGuiInputTextState { + ImGuiContext* Ctx; // parent UI context (needs to be set explicitly by parent). + ImStbTexteditState* Stb; // State for stb_textedit.h + ImGuiInputTextFlags Flags; // copy of InputText() flags. may be used to check if e.g. ImGuiInputTextFlags_Password is set. ImGuiID ID; // widget id owning the text state - int CurLenW, CurLenA; // we need to maintain our buffer length in both UTF-8 and wchar format. UTF-8 len is valid even if TextA is not. - ImVector TextW; // edit buffer, we need to persist but can't guarantee the persistence of the user-provided buffer. so we copy into own buffer. - ImVector TextA; // temporary UTF8 buffer for callbacks and other operations. this is not updated in every code-path! size=capacity. - ImVector InitialTextA; // backup of end-user buffer at the time of focus (in UTF-8, unaltered) - bool TextAIsValid; // temporary UTF8 buffer is not initially valid before we make the widget active (until then we pull the data from user argument) - int BufCapacityA; // end-user buffer capacity - float ScrollX; // horizontal scrolling/offset - ImStb::STB_TexteditState Stb; // state for stb_textedit.h + int TextLen; // UTF-8 length of the string in TextA (in bytes) + const char* TextSrc; // == TextA.Data unless read-only, in which case == buf passed to InputText(). Field only set and valid _inside_ the call InputText() call. + ImVector TextA; // main UTF8 buffer. TextA.Size is a buffer size! Should always be >= buf_size passed by user (and of course >= CurLenA + 1). + ImVector TextToRevertTo; // value to revert to when pressing Escape = backup of end-user buffer at the time of focus (in UTF-8, unaltered) + ImVector CallbackTextBackup; // temporary storage for callback to support automatic reconcile of undo-stack + int BufCapacity; // end-user buffer capacity (include zero terminator) + ImVec2 Scroll; // horizontal offset (managed manually) + vertical scrolling (pulled from child window's own Scroll.y) float CursorAnim; // timer for cursor blink, reset on every user action so the cursor reappears immediately bool CursorFollow; // set when we want scrolling to follow the current cursor position (not always!) bool SelectedAllMouseLock; // after a double-click to select all, we ignore further mouse drags to update selection - ImGuiInputTextFlags UserFlags; // Temporarily set while we call user's callback - ImGuiInputTextCallback UserCallback; // " - void* UserCallbackData; // " + bool Edited; // edited this frame + bool WantReloadUserBuf; // force a reload of user buf so it may be modified externally. may be automatic in future version. + int ReloadSelectionStart; + int ReloadSelectionEnd; - ImGuiInputTextState() { memset(this, 0, sizeof(*this)); } - void ClearText() { CurLenW = CurLenA = 0; TextW[0] = 0; TextA[0] = 0; CursorClamp(); } - void ClearFreeMemory() { TextW.clear(); TextA.clear(); InitialTextA.clear(); } - int GetUndoAvailCount() const { return Stb.undostate.undo_point; } - int GetRedoAvailCount() const { return STB_TEXTEDIT_UNDOSTATECOUNT - Stb.undostate.redo_point; } + ImGuiInputTextState(); + ~ImGuiInputTextState(); + void ClearText() { TextLen = 0; TextA[0] = 0; CursorClamp(); } + void ClearFreeMemory() { TextA.clear(); TextToRevertTo.clear(); } void OnKeyPressed(int key); // Cannot be inline because we call in code in stb_textedit.h implementation + void OnCharPressed(unsigned int c); // Cursor & Selection - void CursorAnimReset() { CursorAnim = -0.30f; } // After a user-input the cursor stays on for a while without blinking - void CursorClamp() { Stb.cursor = ImMin(Stb.cursor, CurLenW); Stb.select_start = ImMin(Stb.select_start, CurLenW); Stb.select_end = ImMin(Stb.select_end, CurLenW); } - bool HasSelection() const { return Stb.select_start != Stb.select_end; } - void ClearSelection() { Stb.select_start = Stb.select_end = Stb.cursor; } - void SelectAll() { Stb.select_start = 0; Stb.cursor = Stb.select_end = CurLenW; Stb.has_preferred_x = 0; } + void CursorAnimReset(); + void CursorClamp(); + bool HasSelection() const; + void ClearSelection(); + int GetCursorPos() const; + int GetSelectionStart() const; + int GetSelectionEnd() const; + void SelectAll(); + + // Reload user buf (WIP #2890) + // If you modify underlying user-passed const char* while active you need to call this (InputText V2 may lift this) + // strcpy(my_buf, "hello"); + // if (ImGuiInputTextState* state = ImGui::GetInputTextState(id)) // id may be ImGui::GetItemID() is last item + // state->ReloadUserBufAndSelectAll(); + void ReloadUserBufAndSelectAll(); + void ReloadUserBufAndKeepSelection(); + void ReloadUserBufAndMoveToEnd(); }; -// Windows data saved in imgui.ini file -struct ImGuiWindowSettings +enum ImGuiWindowRefreshFlags_ { - char* Name; - ImGuiID ID; - ImVec2ih Pos; - ImVec2ih Size; - bool Collapsed; - - ImGuiWindowSettings() { Name = NULL; ID = 0; Pos = Size = ImVec2ih(0, 0); Collapsed = false; } -}; - -struct ImGuiSettingsHandler -{ - const char* TypeName; // Short description stored in .ini file. Disallowed characters: '[' ']' - ImGuiID TypeHash; // == ImHashStr(TypeName) - void* (*ReadOpenFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, const char* name); // Read: Called when entering into a new ini entry e.g. "[Window][Name]" - void (*ReadLineFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, void* entry, const char* line); // Read: Called for every line of text within an ini entry - void (*WriteAllFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, ImGuiTextBuffer* out_buf); // Write: Output every entries into 'out_buf' - void* UserData; - - ImGuiSettingsHandler() { memset(this, 0, sizeof(*this)); } -}; - -// Storage for current popup stack -struct ImGuiPopupData -{ - ImGuiID PopupId; // Set on OpenPopup() - ImGuiWindow* Window; // Resolved on BeginPopup() - may stay unresolved if user never calls OpenPopup() - ImGuiWindow* SourceWindow; // Set on OpenPopup() copy of NavWindow at the time of opening the popup - int OpenFrameCount; // Set on OpenPopup() - ImGuiID OpenParentId; // Set on OpenPopup(), we need this to differentiate multiple menu sets from each others (e.g. inside menu bar vs loose menu items) - ImVec2 OpenPopupPos; // Set on OpenPopup(), preferred popup position (typically == OpenMousePos when using mouse) - ImVec2 OpenMousePos; // Set on OpenPopup(), copy of mouse position at the time of opening popup - - ImGuiPopupData() { PopupId = 0; Window = SourceWindow = NULL; OpenFrameCount = -1; OpenParentId = 0; } -}; - -struct ImGuiColumnData -{ - float OffsetNorm; // Column start offset, normalized 0.0 (far left) -> 1.0 (far right) - float OffsetNormBeforeResize; - ImGuiColumnsFlags Flags; // Not exposed - ImRect ClipRect; - - ImGuiColumnData() { OffsetNorm = OffsetNormBeforeResize = 0.0f; Flags = ImGuiColumnsFlags_None; } -}; - -struct ImGuiColumns -{ - ImGuiID ID; - ImGuiColumnsFlags Flags; - bool IsFirstFrame; - bool IsBeingResized; - int Current; - int Count; - float OffMinX, OffMaxX; // Offsets from HostWorkRect.Min.x - float LineMinY, LineMaxY; - float HostCursorPosY; // Backup of CursorPos at the time of BeginColumns() - float HostCursorMaxPosX; // Backup of CursorMaxPos at the time of BeginColumns() - ImRect HostClipRect; // Backup of ClipRect at the time of BeginColumns() - ImRect HostWorkRect; // Backup of WorkRect at the time of BeginColumns() - ImVector Columns; - - ImGuiColumns() { Clear(); } - void Clear() - { - ID = 0; - Flags = ImGuiColumnsFlags_None; - IsFirstFrame = false; - IsBeingResized = false; - Current = 0; - Count = 1; - OffMinX = OffMaxX = 0.0f; - LineMinY = LineMaxY = 0.0f; - HostCursorPosY = 0.0f; - HostCursorMaxPosX = 0.0f; - Columns.clear(); - } -}; - -// Data shared between all ImDrawList instances -struct IMGUI_API ImDrawListSharedData -{ - ImVec2 TexUvWhitePixel; // UV of white pixel in the atlas - ImFont* Font; // Current/default font (optional, for simplified AddText overload) - float FontSize; // Current/default font size (optional, for simplified AddText overload) - float CurveTessellationTol; - ImVec4 ClipRectFullscreen; // Value for PushClipRectFullscreen() - ImDrawListFlags InitialFlags; // Initial flags at the beginning of the frame (it is possible to alter flags on a per-drawlist basis afterwards) - - // Const data - // FIXME: Bake rounded corners fill/borders in atlas - ImVec2 CircleVtx12[12]; - - ImDrawListSharedData(); -}; - -struct ImDrawDataBuilder -{ - ImVector Layers[2]; // Global layers for: regular, tooltip - - void Clear() { for (int n = 0; n < IM_ARRAYSIZE(Layers); n++) Layers[n].resize(0); } - void ClearFreeMemory() { for (int n = 0; n < IM_ARRAYSIZE(Layers); n++) Layers[n].clear(); } - IMGUI_API void FlattenIntoSingleLayer(); -}; - -struct ImGuiNavMoveResult -{ - ImGuiID ID; // Best candidate - ImGuiID SelectScopeId;// Best candidate window current selectable group ID - ImGuiWindow* Window; // Best candidate window - float DistBox; // Best candidate box distance to current NavId - float DistCenter; // Best candidate center distance to current NavId - float DistAxial; - ImRect RectRel; // Best candidate bounding box in window relative space - - ImGuiNavMoveResult() { Clear(); } - void Clear() { ID = SelectScopeId = 0; Window = NULL; DistBox = DistCenter = DistAxial = FLT_MAX; RectRel = ImRect(); } + ImGuiWindowRefreshFlags_None = 0, + ImGuiWindowRefreshFlags_TryToAvoidRefresh = 1 << 0, // [EXPERIMENTAL] Try to keep existing contents, USER MUST NOT HONOR BEGIN() RETURNING FALSE AND NOT APPEND. + ImGuiWindowRefreshFlags_RefreshOnHover = 1 << 1, // [EXPERIMENTAL] Always refresh on hover + ImGuiWindowRefreshFlags_RefreshOnFocus = 1 << 2, // [EXPERIMENTAL] Always refresh on focus + // Refresh policy/frequency, Load Balancing etc. }; enum ImGuiNextWindowDataFlags_ @@ -788,216 +1212,1286 @@ enum ImGuiNextWindowDataFlags_ ImGuiNextWindowDataFlags_HasCollapsed = 1 << 3, ImGuiNextWindowDataFlags_HasSizeConstraint = 1 << 4, ImGuiNextWindowDataFlags_HasFocus = 1 << 5, - ImGuiNextWindowDataFlags_HasBgAlpha = 1 << 6 + ImGuiNextWindowDataFlags_HasBgAlpha = 1 << 6, + ImGuiNextWindowDataFlags_HasScroll = 1 << 7, + ImGuiNextWindowDataFlags_HasWindowFlags = 1 << 8, + ImGuiNextWindowDataFlags_HasChildFlags = 1 << 9, + ImGuiNextWindowDataFlags_HasRefreshPolicy = 1 << 10, + ImGuiNextWindowDataFlags_HasViewport = 1 << 11, + ImGuiNextWindowDataFlags_HasDock = 1 << 12, + ImGuiNextWindowDataFlags_HasWindowClass = 1 << 13, }; // Storage for SetNexWindow** functions struct ImGuiNextWindowData { - ImGuiNextWindowDataFlags Flags; + ImGuiNextWindowDataFlags HasFlags; + + // Members below are NOT cleared. Always rely on HasFlags. ImGuiCond PosCond; ImGuiCond SizeCond; ImGuiCond CollapsedCond; + ImGuiCond DockCond; ImVec2 PosVal; ImVec2 PosPivotVal; ImVec2 SizeVal; ImVec2 ContentSizeVal; + ImVec2 ScrollVal; + ImGuiWindowFlags WindowFlags; // Only honored by BeginTable() + ImGuiChildFlags ChildFlags; + bool PosUndock; bool CollapsedVal; ImRect SizeConstraintRect; ImGuiSizeCallback SizeCallback; void* SizeCallbackUserData; - float BgAlphaVal; - ImVec2 MenuBarOffsetMinVal; // *Always on* This is not exposed publicly, so we don't clear it. + float BgAlphaVal; // Override background alpha + ImGuiID ViewportId; + ImGuiID DockId; + ImGuiWindowClass WindowClass; + ImVec2 MenuBarOffsetMinVal; // (Always on) This is not exposed publicly, so we don't clear it and it doesn't have a corresponding flag (could we? for consistency?) + ImGuiWindowRefreshFlags RefreshFlagsVal; ImGuiNextWindowData() { memset(this, 0, sizeof(*this)); } - inline void ClearFlags() { Flags = ImGuiNextWindowDataFlags_None; } + inline void ClearFlags() { HasFlags = ImGuiNextWindowDataFlags_None; } }; enum ImGuiNextItemDataFlags_ { - ImGuiNextItemDataFlags_None = 0, - ImGuiNextItemDataFlags_HasWidth = 1 << 0, - ImGuiNextItemDataFlags_HasOpen = 1 << 1 + ImGuiNextItemDataFlags_None = 0, + ImGuiNextItemDataFlags_HasWidth = 1 << 0, + ImGuiNextItemDataFlags_HasOpen = 1 << 1, + ImGuiNextItemDataFlags_HasShortcut = 1 << 2, + ImGuiNextItemDataFlags_HasRefVal = 1 << 3, + ImGuiNextItemDataFlags_HasStorageID = 1 << 4, }; struct ImGuiNextItemData { - ImGuiNextItemDataFlags Flags; - float Width; // Set by SetNextItemWidth(). - bool OpenVal; // Set by SetNextItemOpen() function. - ImGuiCond OpenCond; + ImGuiNextItemDataFlags HasFlags; // Called HasFlags instead of Flags to avoid mistaking this + ImGuiItemFlags ItemFlags; // Currently only tested/used for ImGuiItemFlags_AllowOverlap and ImGuiItemFlags_HasSelectionUserData. - ImGuiNextItemData() { memset(this, 0, sizeof(*this)); } - inline void ClearFlags() { Flags = ImGuiNextItemDataFlags_None; } + // Members below are NOT cleared by ItemAdd() meaning they are still valid during e.g. NavProcessItem(). Always rely on HasFlags. + ImGuiID FocusScopeId; // Set by SetNextItemSelectionUserData() + ImGuiSelectionUserData SelectionUserData; // Set by SetNextItemSelectionUserData() (note that NULL/0 is a valid value, we use -1 == ImGuiSelectionUserData_Invalid to mark invalid values) + float Width; // Set by SetNextItemWidth() + ImGuiKeyChord Shortcut; // Set by SetNextItemShortcut() + ImGuiInputFlags ShortcutFlags; // Set by SetNextItemShortcut() + bool OpenVal; // Set by SetNextItemOpen() + ImU8 OpenCond; // Set by SetNextItemOpen() + ImGuiDataTypeStorage RefVal; // Not exposed yet, for ImGuiInputTextFlags_ParseEmptyAsRefVal + ImGuiID StorageId; // Set by SetNextItemStorageID() + + ImGuiNextItemData() { memset(this, 0, sizeof(*this)); SelectionUserData = -1; } + inline void ClearFlags() { HasFlags = ImGuiNextItemDataFlags_None; ItemFlags = ImGuiItemFlags_None; } // Also cleared manually by ItemAdd()! }; -//----------------------------------------------------------------------------- -// Tabs -//----------------------------------------------------------------------------- +// Status storage for the last submitted item +struct ImGuiLastItemData +{ + ImGuiID ID; + ImGuiItemFlags ItemFlags; // See ImGuiItemFlags_ (called 'InFlags' before v1.91.4). + ImGuiItemStatusFlags StatusFlags; // See ImGuiItemStatusFlags_ + ImRect Rect; // Full rectangle + ImRect NavRect; // Navigation scoring rectangle (not displayed) + // Rarely used fields are not explicitly cleared, only valid when the corresponding ImGuiItemStatusFlags are set. + ImRect DisplayRect; // Display rectangle. ONLY VALID IF (StatusFlags & ImGuiItemStatusFlags_HasDisplayRect) is set. + ImRect ClipRect; // Clip rectangle at the time of submitting item. ONLY VALID IF (StatusFlags & ImGuiItemStatusFlags_HasClipRect) is set.. + ImGuiKeyChord Shortcut; // Shortcut at the time of submitting item. ONLY VALID IF (StatusFlags & ImGuiItemStatusFlags_HasShortcut) is set.. + + ImGuiLastItemData() { memset(this, 0, sizeof(*this)); } +}; + +// Store data emitted by TreeNode() for usage by TreePop() +// - To implement ImGuiTreeNodeFlags_NavLeftJumpsBackHere: store the minimum amount of data +// which we can't infer in TreePop(), to perform the equivalent of NavApplyItemToResult(). +// Only stored when the node is a potential candidate for landing on a Left arrow jump. +struct ImGuiTreeNodeStackData +{ + ImGuiID ID; + ImGuiTreeNodeFlags TreeFlags; + ImGuiItemFlags ItemFlags; // Used for nav landing + ImRect NavRect; // Used for nav landing +}; + +// sizeof() = 20 +struct IMGUI_API ImGuiErrorRecoveryState +{ + short SizeOfWindowStack; + short SizeOfIDStack; + short SizeOfTreeStack; + short SizeOfColorStack; + short SizeOfStyleVarStack; + short SizeOfFontStack; + short SizeOfFocusScopeStack; + short SizeOfGroupStack; + short SizeOfItemFlagsStack; + short SizeOfBeginPopupStack; + short SizeOfDisabledStack; + + ImGuiErrorRecoveryState() { memset(this, 0, sizeof(*this)); } +}; + +// Data saved for each window pushed into the stack +struct ImGuiWindowStackData +{ + ImGuiWindow* Window; + ImGuiLastItemData ParentLastItemDataBackup; + ImGuiErrorRecoveryState StackSizesInBegin; // Store size of various stacks for asserting + bool DisabledOverrideReenable; // Non-child window override disabled flag + float DisabledOverrideReenableAlphaBackup; +}; struct ImGuiShrinkWidthItem { - int Index; - float Width; + int Index; + float Width; + float InitialWidth; }; struct ImGuiPtrOrIndex { - void* Ptr; // Either field can be set, not both. e.g. Dock node tab bars are loose while BeginTabBar() ones are in a pool. - int Index; // Usually index in a main pool. + void* Ptr; // Either field can be set, not both. e.g. Dock node tab bars are loose while BeginTabBar() ones are in a pool. + int Index; // Usually index in a main pool. - ImGuiPtrOrIndex(void* ptr) { Ptr = ptr; Index = -1; } - ImGuiPtrOrIndex(int index) { Ptr = NULL; Index = index; } + ImGuiPtrOrIndex(void* ptr) { Ptr = ptr; Index = -1; } + ImGuiPtrOrIndex(int index) { Ptr = NULL; Index = index; } +}; + +// Data used by IsItemDeactivated()/IsItemDeactivatedAfterEdit() functions +struct ImGuiDeactivatedItemData +{ + ImGuiID ID; + int ElapseFrame; + bool HasBeenEditedBefore; + bool IsAlive; }; //----------------------------------------------------------------------------- -// Main imgui context +// [SECTION] Popup support +//----------------------------------------------------------------------------- + +enum ImGuiPopupPositionPolicy +{ + ImGuiPopupPositionPolicy_Default, + ImGuiPopupPositionPolicy_ComboBox, + ImGuiPopupPositionPolicy_Tooltip, +}; + +// Storage for popup stacks (g.OpenPopupStack and g.BeginPopupStack) +struct ImGuiPopupData +{ + ImGuiID PopupId; // Set on OpenPopup() + ImGuiWindow* Window; // Resolved on BeginPopup() - may stay unresolved if user never calls OpenPopup() + ImGuiWindow* RestoreNavWindow;// Set on OpenPopup(), a NavWindow that will be restored on popup close + int ParentNavLayer; // Resolved on BeginPopup(). Actually a ImGuiNavLayer type (declared down below), initialized to -1 which is not part of an enum, but serves well-enough as "not any of layers" value + int OpenFrameCount; // Set on OpenPopup() + ImGuiID OpenParentId; // Set on OpenPopup(), we need this to differentiate multiple menu sets from each others (e.g. inside menu bar vs loose menu items) + ImVec2 OpenPopupPos; // Set on OpenPopup(), preferred popup position (typically == OpenMousePos when using mouse) + ImVec2 OpenMousePos; // Set on OpenPopup(), copy of mouse position at the time of opening popup + + ImGuiPopupData() { memset(this, 0, sizeof(*this)); ParentNavLayer = OpenFrameCount = -1; } +}; + +//----------------------------------------------------------------------------- +// [SECTION] Inputs support +//----------------------------------------------------------------------------- + +// Bit array for named keys +typedef ImBitArray ImBitArrayForNamedKeys; + +// [Internal] Key ranges +#define ImGuiKey_LegacyNativeKey_BEGIN 0 +#define ImGuiKey_LegacyNativeKey_END 512 +#define ImGuiKey_Keyboard_BEGIN (ImGuiKey_NamedKey_BEGIN) +#define ImGuiKey_Keyboard_END (ImGuiKey_GamepadStart) +#define ImGuiKey_Gamepad_BEGIN (ImGuiKey_GamepadStart) +#define ImGuiKey_Gamepad_END (ImGuiKey_GamepadRStickDown + 1) +#define ImGuiKey_Mouse_BEGIN (ImGuiKey_MouseLeft) +#define ImGuiKey_Mouse_END (ImGuiKey_MouseWheelY + 1) +#define ImGuiKey_Aliases_BEGIN (ImGuiKey_Mouse_BEGIN) +#define ImGuiKey_Aliases_END (ImGuiKey_Mouse_END) + +// [Internal] Named shortcuts for Navigation +#define ImGuiKey_NavKeyboardTweakSlow ImGuiMod_Ctrl +#define ImGuiKey_NavKeyboardTweakFast ImGuiMod_Shift +#define ImGuiKey_NavGamepadTweakSlow ImGuiKey_GamepadL1 +#define ImGuiKey_NavGamepadTweakFast ImGuiKey_GamepadR1 +#define ImGuiKey_NavGamepadActivate (g.IO.ConfigNavSwapGamepadButtons ? ImGuiKey_GamepadFaceRight : ImGuiKey_GamepadFaceDown) +#define ImGuiKey_NavGamepadCancel (g.IO.ConfigNavSwapGamepadButtons ? ImGuiKey_GamepadFaceDown : ImGuiKey_GamepadFaceRight) +#define ImGuiKey_NavGamepadMenu ImGuiKey_GamepadFaceLeft +#define ImGuiKey_NavGamepadInput ImGuiKey_GamepadFaceUp + +enum ImGuiInputEventType +{ + ImGuiInputEventType_None = 0, + ImGuiInputEventType_MousePos, + ImGuiInputEventType_MouseWheel, + ImGuiInputEventType_MouseButton, + ImGuiInputEventType_MouseViewport, + ImGuiInputEventType_Key, + ImGuiInputEventType_Text, + ImGuiInputEventType_Focus, + ImGuiInputEventType_COUNT +}; + +enum ImGuiInputSource +{ + ImGuiInputSource_None = 0, + ImGuiInputSource_Mouse, // Note: may be Mouse or TouchScreen or Pen. See io.MouseSource to distinguish them. + ImGuiInputSource_Keyboard, + ImGuiInputSource_Gamepad, + ImGuiInputSource_COUNT +}; + +// FIXME: Structures in the union below need to be declared as anonymous unions appears to be an extension? +// Using ImVec2() would fail on Clang 'union member 'MousePos' has a non-trivial default constructor' +struct ImGuiInputEventMousePos { float PosX, PosY; ImGuiMouseSource MouseSource; }; +struct ImGuiInputEventMouseWheel { float WheelX, WheelY; ImGuiMouseSource MouseSource; }; +struct ImGuiInputEventMouseButton { int Button; bool Down; ImGuiMouseSource MouseSource; }; +struct ImGuiInputEventMouseViewport { ImGuiID HoveredViewportID; }; +struct ImGuiInputEventKey { ImGuiKey Key; bool Down; float AnalogValue; }; +struct ImGuiInputEventText { unsigned int Char; }; +struct ImGuiInputEventAppFocused { bool Focused; }; + +struct ImGuiInputEvent +{ + ImGuiInputEventType Type; + ImGuiInputSource Source; + ImU32 EventId; // Unique, sequential increasing integer to identify an event (if you need to correlate them to other data). + union + { + ImGuiInputEventMousePos MousePos; // if Type == ImGuiInputEventType_MousePos + ImGuiInputEventMouseWheel MouseWheel; // if Type == ImGuiInputEventType_MouseWheel + ImGuiInputEventMouseButton MouseButton; // if Type == ImGuiInputEventType_MouseButton + ImGuiInputEventMouseViewport MouseViewport; // if Type == ImGuiInputEventType_MouseViewport + ImGuiInputEventKey Key; // if Type == ImGuiInputEventType_Key + ImGuiInputEventText Text; // if Type == ImGuiInputEventType_Text + ImGuiInputEventAppFocused AppFocused; // if Type == ImGuiInputEventType_Focus + }; + bool AddedByTestEngine; + + ImGuiInputEvent() { memset(this, 0, sizeof(*this)); } +}; + +// Input function taking an 'ImGuiID owner_id' argument defaults to (ImGuiKeyOwner_Any == 0) aka don't test ownership, which matches legacy behavior. +#define ImGuiKeyOwner_Any ((ImGuiID)0) // Accept key that have an owner, UNLESS a call to SetKeyOwner() explicitly used ImGuiInputFlags_LockThisFrame or ImGuiInputFlags_LockUntilRelease. +#define ImGuiKeyOwner_NoOwner ((ImGuiID)-1) // Require key to have no owner. +//#define ImGuiKeyOwner_None ImGuiKeyOwner_NoOwner // We previously called this 'ImGuiKeyOwner_None' but it was inconsistent with our pattern that _None values == 0 and quite dangerous. Also using _NoOwner makes the IsKeyPressed() calls more explicit. + +typedef ImS16 ImGuiKeyRoutingIndex; + +// Routing table entry (sizeof() == 16 bytes) +struct ImGuiKeyRoutingData +{ + ImGuiKeyRoutingIndex NextEntryIndex; + ImU16 Mods; // Technically we'd only need 4-bits but for simplify we store ImGuiMod_ values which need 16-bits. + ImU8 RoutingCurrScore; // [DEBUG] For debug display + ImU8 RoutingNextScore; // Lower is better (0: perfect score) + ImGuiID RoutingCurr; + ImGuiID RoutingNext; + + ImGuiKeyRoutingData() { NextEntryIndex = -1; Mods = 0; RoutingCurrScore = RoutingNextScore = 255; RoutingCurr = RoutingNext = ImGuiKeyOwner_NoOwner; } +}; + +// Routing table: maintain a desired owner for each possible key-chord (key + mods), and setup owner in NewFrame() when mods are matching. +// Stored in main context (1 instance) +struct ImGuiKeyRoutingTable +{ + ImGuiKeyRoutingIndex Index[ImGuiKey_NamedKey_COUNT]; // Index of first entry in Entries[] + ImVector Entries; + ImVector EntriesNext; // Double-buffer to avoid reallocation (could use a shared buffer) + + ImGuiKeyRoutingTable() { Clear(); } + void Clear() { for (int n = 0; n < IM_ARRAYSIZE(Index); n++) Index[n] = -1; Entries.clear(); EntriesNext.clear(); } +}; + +// This extends ImGuiKeyData but only for named keys (legacy keys don't support the new features) +// Stored in main context (1 per named key). In the future it might be merged into ImGuiKeyData. +struct ImGuiKeyOwnerData +{ + ImGuiID OwnerCurr; + ImGuiID OwnerNext; + bool LockThisFrame; // Reading this key requires explicit owner id (until end of frame). Set by ImGuiInputFlags_LockThisFrame. + bool LockUntilRelease; // Reading this key requires explicit owner id (until key is released). Set by ImGuiInputFlags_LockUntilRelease. When this is true LockThisFrame is always true as well. + + ImGuiKeyOwnerData() { OwnerCurr = OwnerNext = ImGuiKeyOwner_NoOwner; LockThisFrame = LockUntilRelease = false; } +}; + +// Extend ImGuiInputFlags_ +// Flags for extended versions of IsKeyPressed(), IsMouseClicked(), Shortcut(), SetKeyOwner(), SetItemKeyOwner() +// Don't mistake with ImGuiInputTextFlags! (which is for ImGui::InputText() function) +enum ImGuiInputFlagsPrivate_ +{ + // Flags for IsKeyPressed(), IsKeyChordPressed(), IsMouseClicked(), Shortcut() + // - Repeat mode: Repeat rate selection + ImGuiInputFlags_RepeatRateDefault = 1 << 1, // Repeat rate: Regular (default) + ImGuiInputFlags_RepeatRateNavMove = 1 << 2, // Repeat rate: Fast + ImGuiInputFlags_RepeatRateNavTweak = 1 << 3, // Repeat rate: Faster + // - Repeat mode: Specify when repeating key pressed can be interrupted. + // - In theory ImGuiInputFlags_RepeatUntilOtherKeyPress may be a desirable default, but it would break too many behavior so everything is opt-in. + ImGuiInputFlags_RepeatUntilRelease = 1 << 4, // Stop repeating when released (default for all functions except Shortcut). This only exists to allow overriding Shortcut() default behavior. + ImGuiInputFlags_RepeatUntilKeyModsChange = 1 << 5, // Stop repeating when released OR if keyboard mods are changed (default for Shortcut) + ImGuiInputFlags_RepeatUntilKeyModsChangeFromNone = 1 << 6, // Stop repeating when released OR if keyboard mods are leaving the None state. Allows going from Mod+Key to Key by releasing Mod. + ImGuiInputFlags_RepeatUntilOtherKeyPress = 1 << 7, // Stop repeating when released OR if any other keyboard key is pressed during the repeat + + // Flags for SetKeyOwner(), SetItemKeyOwner() + // - Locking key away from non-input aware code. Locking is useful to make input-owner-aware code steal keys from non-input-owner-aware code. If all code is input-owner-aware locking would never be necessary. + ImGuiInputFlags_LockThisFrame = 1 << 20, // Further accesses to key data will require EXPLICIT owner ID (ImGuiKeyOwner_Any/0 will NOT accepted for polling). Cleared at end of frame. + ImGuiInputFlags_LockUntilRelease = 1 << 21, // Further accesses to key data will require EXPLICIT owner ID (ImGuiKeyOwner_Any/0 will NOT accepted for polling). Cleared when the key is released or at end of each frame if key is released. + + // - Condition for SetItemKeyOwner() + ImGuiInputFlags_CondHovered = 1 << 22, // Only set if item is hovered (default to both) + ImGuiInputFlags_CondActive = 1 << 23, // Only set if item is active (default to both) + ImGuiInputFlags_CondDefault_ = ImGuiInputFlags_CondHovered | ImGuiInputFlags_CondActive, + + // [Internal] Mask of which function support which flags + ImGuiInputFlags_RepeatRateMask_ = ImGuiInputFlags_RepeatRateDefault | ImGuiInputFlags_RepeatRateNavMove | ImGuiInputFlags_RepeatRateNavTweak, + ImGuiInputFlags_RepeatUntilMask_ = ImGuiInputFlags_RepeatUntilRelease | ImGuiInputFlags_RepeatUntilKeyModsChange | ImGuiInputFlags_RepeatUntilKeyModsChangeFromNone | ImGuiInputFlags_RepeatUntilOtherKeyPress, + ImGuiInputFlags_RepeatMask_ = ImGuiInputFlags_Repeat | ImGuiInputFlags_RepeatRateMask_ | ImGuiInputFlags_RepeatUntilMask_, + ImGuiInputFlags_CondMask_ = ImGuiInputFlags_CondHovered | ImGuiInputFlags_CondActive, + ImGuiInputFlags_RouteTypeMask_ = ImGuiInputFlags_RouteActive | ImGuiInputFlags_RouteFocused | ImGuiInputFlags_RouteGlobal | ImGuiInputFlags_RouteAlways, + ImGuiInputFlags_RouteOptionsMask_ = ImGuiInputFlags_RouteOverFocused | ImGuiInputFlags_RouteOverActive | ImGuiInputFlags_RouteUnlessBgFocused | ImGuiInputFlags_RouteFromRootWindow, + ImGuiInputFlags_SupportedByIsKeyPressed = ImGuiInputFlags_RepeatMask_, + ImGuiInputFlags_SupportedByIsMouseClicked = ImGuiInputFlags_Repeat, + ImGuiInputFlags_SupportedByShortcut = ImGuiInputFlags_RepeatMask_ | ImGuiInputFlags_RouteTypeMask_ | ImGuiInputFlags_RouteOptionsMask_, + ImGuiInputFlags_SupportedBySetNextItemShortcut = ImGuiInputFlags_RepeatMask_ | ImGuiInputFlags_RouteTypeMask_ | ImGuiInputFlags_RouteOptionsMask_ | ImGuiInputFlags_Tooltip, + ImGuiInputFlags_SupportedBySetKeyOwner = ImGuiInputFlags_LockThisFrame | ImGuiInputFlags_LockUntilRelease, + ImGuiInputFlags_SupportedBySetItemKeyOwner = ImGuiInputFlags_SupportedBySetKeyOwner | ImGuiInputFlags_CondMask_, +}; + +//----------------------------------------------------------------------------- +// [SECTION] Clipper support +//----------------------------------------------------------------------------- + +// Note that Max is exclusive, so perhaps should be using a Begin/End convention. +struct ImGuiListClipperRange +{ + int Min; + int Max; + bool PosToIndexConvert; // Begin/End are absolute position (will be converted to indices later) + ImS8 PosToIndexOffsetMin; // Add to Min after converting to indices + ImS8 PosToIndexOffsetMax; // Add to Min after converting to indices + + static ImGuiListClipperRange FromIndices(int min, int max) { ImGuiListClipperRange r = { min, max, false, 0, 0 }; return r; } + static ImGuiListClipperRange FromPositions(float y1, float y2, int off_min, int off_max) { ImGuiListClipperRange r = { (int)y1, (int)y2, true, (ImS8)off_min, (ImS8)off_max }; return r; } +}; + +// Temporary clipper data, buffers shared/reused between instances +struct ImGuiListClipperData +{ + ImGuiListClipper* ListClipper; + float LossynessOffset; + int StepNo; + int ItemsFrozen; + ImVector Ranges; + + ImGuiListClipperData() { memset(this, 0, sizeof(*this)); } + void Reset(ImGuiListClipper* clipper) { ListClipper = clipper; StepNo = ItemsFrozen = 0; Ranges.resize(0); } +}; + +//----------------------------------------------------------------------------- +// [SECTION] Navigation support +//----------------------------------------------------------------------------- + +enum ImGuiActivateFlags_ +{ + ImGuiActivateFlags_None = 0, + ImGuiActivateFlags_PreferInput = 1 << 0, // Favor activation that requires keyboard text input (e.g. for Slider/Drag). Default for Enter key. + ImGuiActivateFlags_PreferTweak = 1 << 1, // Favor activation for tweaking with arrows or gamepad (e.g. for Slider/Drag). Default for Space key and if keyboard is not used. + ImGuiActivateFlags_TryToPreserveState = 1 << 2, // Request widget to preserve state if it can (e.g. InputText will try to preserve cursor/selection) + ImGuiActivateFlags_FromTabbing = 1 << 3, // Activation requested by a tabbing request + ImGuiActivateFlags_FromShortcut = 1 << 4, // Activation requested by an item shortcut via SetNextItemShortcut() function. +}; + +// Early work-in-progress API for ScrollToItem() +enum ImGuiScrollFlags_ +{ + ImGuiScrollFlags_None = 0, + ImGuiScrollFlags_KeepVisibleEdgeX = 1 << 0, // If item is not visible: scroll as little as possible on X axis to bring item back into view [default for X axis] + ImGuiScrollFlags_KeepVisibleEdgeY = 1 << 1, // If item is not visible: scroll as little as possible on Y axis to bring item back into view [default for Y axis for windows that are already visible] + ImGuiScrollFlags_KeepVisibleCenterX = 1 << 2, // If item is not visible: scroll to make the item centered on X axis [rarely used] + ImGuiScrollFlags_KeepVisibleCenterY = 1 << 3, // If item is not visible: scroll to make the item centered on Y axis + ImGuiScrollFlags_AlwaysCenterX = 1 << 4, // Always center the result item on X axis [rarely used] + ImGuiScrollFlags_AlwaysCenterY = 1 << 5, // Always center the result item on Y axis [default for Y axis for appearing window) + ImGuiScrollFlags_NoScrollParent = 1 << 6, // Disable forwarding scrolling to parent window if required to keep item/rect visible (only scroll window the function was applied to). + ImGuiScrollFlags_MaskX_ = ImGuiScrollFlags_KeepVisibleEdgeX | ImGuiScrollFlags_KeepVisibleCenterX | ImGuiScrollFlags_AlwaysCenterX, + ImGuiScrollFlags_MaskY_ = ImGuiScrollFlags_KeepVisibleEdgeY | ImGuiScrollFlags_KeepVisibleCenterY | ImGuiScrollFlags_AlwaysCenterY, +}; + +enum ImGuiNavRenderCursorFlags_ +{ + ImGuiNavRenderCursorFlags_None = 0, + ImGuiNavRenderCursorFlags_Compact = 1 << 1, // Compact highlight, no padding/distance from focused item + ImGuiNavRenderCursorFlags_AlwaysDraw = 1 << 2, // Draw rectangular highlight if (g.NavId == id) even when g.NavCursorVisible == false, aka even when using the mouse. + ImGuiNavRenderCursorFlags_NoRounding = 1 << 3, +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + ImGuiNavHighlightFlags_None = ImGuiNavRenderCursorFlags_None, // Renamed in 1.91.4 + ImGuiNavHighlightFlags_Compact = ImGuiNavRenderCursorFlags_Compact, // Renamed in 1.91.4 + ImGuiNavHighlightFlags_AlwaysDraw = ImGuiNavRenderCursorFlags_AlwaysDraw, // Renamed in 1.91.4 + ImGuiNavHighlightFlags_NoRounding = ImGuiNavRenderCursorFlags_NoRounding, // Renamed in 1.91.4 +#endif +}; + +enum ImGuiNavMoveFlags_ +{ + ImGuiNavMoveFlags_None = 0, + ImGuiNavMoveFlags_LoopX = 1 << 0, // On failed request, restart from opposite side + ImGuiNavMoveFlags_LoopY = 1 << 1, + ImGuiNavMoveFlags_WrapX = 1 << 2, // On failed request, request from opposite side one line down (when NavDir==right) or one line up (when NavDir==left) + ImGuiNavMoveFlags_WrapY = 1 << 3, // This is not super useful but provided for completeness + ImGuiNavMoveFlags_WrapMask_ = ImGuiNavMoveFlags_LoopX | ImGuiNavMoveFlags_LoopY | ImGuiNavMoveFlags_WrapX | ImGuiNavMoveFlags_WrapY, + ImGuiNavMoveFlags_AllowCurrentNavId = 1 << 4, // Allow scoring and considering the current NavId as a move target candidate. This is used when the move source is offset (e.g. pressing PageDown actually needs to send a Up move request, if we are pressing PageDown from the bottom-most item we need to stay in place) + ImGuiNavMoveFlags_AlsoScoreVisibleSet = 1 << 5, // Store alternate result in NavMoveResultLocalVisible that only comprise elements that are already fully visible (used by PageUp/PageDown) + ImGuiNavMoveFlags_ScrollToEdgeY = 1 << 6, // Force scrolling to min/max (used by Home/End) // FIXME-NAV: Aim to remove or reword, probably unnecessary + ImGuiNavMoveFlags_Forwarded = 1 << 7, + ImGuiNavMoveFlags_DebugNoResult = 1 << 8, // Dummy scoring for debug purpose, don't apply result + ImGuiNavMoveFlags_FocusApi = 1 << 9, // Requests from focus API can land/focus/activate items even if they are marked with _NoTabStop (see NavProcessItemForTabbingRequest() for details) + ImGuiNavMoveFlags_IsTabbing = 1 << 10, // == Focus + Activate if item is Inputable + DontChangeNavHighlight + ImGuiNavMoveFlags_IsPageMove = 1 << 11, // Identify a PageDown/PageUp request. + ImGuiNavMoveFlags_Activate = 1 << 12, // Activate/select target item. + ImGuiNavMoveFlags_NoSelect = 1 << 13, // Don't trigger selection by not setting g.NavJustMovedTo + ImGuiNavMoveFlags_NoSetNavCursorVisible = 1 << 14, // Do not alter the nav cursor visible state + ImGuiNavMoveFlags_NoClearActiveId = 1 << 15, // (Experimental) Do not clear active id when applying move result +}; + +enum ImGuiNavLayer +{ + ImGuiNavLayer_Main = 0, // Main scrolling layer + ImGuiNavLayer_Menu = 1, // Menu layer (access with Alt) + ImGuiNavLayer_COUNT +}; + +// Storage for navigation query/results +struct ImGuiNavItemData +{ + ImGuiWindow* Window; // Init,Move // Best candidate window (result->ItemWindow->RootWindowForNav == request->Window) + ImGuiID ID; // Init,Move // Best candidate item ID + ImGuiID FocusScopeId; // Init,Move // Best candidate focus scope ID + ImRect RectRel; // Init,Move // Best candidate bounding box in window relative space + ImGuiItemFlags ItemFlags; // ????,Move // Best candidate item flags + float DistBox; // Move // Best candidate box distance to current NavId + float DistCenter; // Move // Best candidate center distance to current NavId + float DistAxial; // Move // Best candidate axial distance to current NavId + ImGuiSelectionUserData SelectionUserData;//I+Mov // Best candidate SetNextItemSelectionUserData() value. Valid if (ItemFlags & ImGuiItemFlags_HasSelectionUserData) + + ImGuiNavItemData() { Clear(); } + void Clear() { Window = NULL; ID = FocusScopeId = 0; ItemFlags = 0; SelectionUserData = -1; DistBox = DistCenter = DistAxial = FLT_MAX; } +}; + +// Storage for PushFocusScope(), g.FocusScopeStack[], g.NavFocusRoute[] +struct ImGuiFocusScopeData +{ + ImGuiID ID; + ImGuiID WindowID; +}; + +//----------------------------------------------------------------------------- +// [SECTION] Typing-select support +//----------------------------------------------------------------------------- + +// Flags for GetTypingSelectRequest() +enum ImGuiTypingSelectFlags_ +{ + ImGuiTypingSelectFlags_None = 0, + ImGuiTypingSelectFlags_AllowBackspace = 1 << 0, // Backspace to delete character inputs. If using: ensure GetTypingSelectRequest() is not called more than once per frame (filter by e.g. focus state) + ImGuiTypingSelectFlags_AllowSingleCharMode = 1 << 1, // Allow "single char" search mode which is activated when pressing the same character multiple times. +}; + +// Returned by GetTypingSelectRequest(), designed to eventually be public. +struct IMGUI_API ImGuiTypingSelectRequest +{ + ImGuiTypingSelectFlags Flags; // Flags passed to GetTypingSelectRequest() + int SearchBufferLen; + const char* SearchBuffer; // Search buffer contents (use full string. unless SingleCharMode is set, in which case use SingleCharSize). + bool SelectRequest; // Set when buffer was modified this frame, requesting a selection. + bool SingleCharMode; // Notify when buffer contains same character repeated, to implement special mode. In this situation it preferred to not display any on-screen search indication. + ImS8 SingleCharSize; // Length in bytes of first letter codepoint (1 for ascii, 2-4 for UTF-8). If (SearchBufferLen==RepeatCharSize) only 1 letter has been input. +}; + +// Storage for GetTypingSelectRequest() +struct IMGUI_API ImGuiTypingSelectState +{ + ImGuiTypingSelectRequest Request; // User-facing data + char SearchBuffer[64]; // Search buffer: no need to make dynamic as this search is very transient. + ImGuiID FocusScope; + int LastRequestFrame = 0; + float LastRequestTime = 0.0f; + bool SingleCharModeLock = false; // After a certain single char repeat count we lock into SingleCharMode. Two benefits: 1) buffer never fill, 2) we can provide an immediate SingleChar mode without timer elapsing. + + ImGuiTypingSelectState() { memset(this, 0, sizeof(*this)); } + void Clear() { SearchBuffer[0] = 0; SingleCharModeLock = false; } // We preserve remaining data for easier debugging +}; + +//----------------------------------------------------------------------------- +// [SECTION] Columns support +//----------------------------------------------------------------------------- + +// Flags for internal's BeginColumns(). This is an obsolete API. Prefer using BeginTable() nowadays! +enum ImGuiOldColumnFlags_ +{ + ImGuiOldColumnFlags_None = 0, + ImGuiOldColumnFlags_NoBorder = 1 << 0, // Disable column dividers + ImGuiOldColumnFlags_NoResize = 1 << 1, // Disable resizing columns when clicking on the dividers + ImGuiOldColumnFlags_NoPreserveWidths = 1 << 2, // Disable column width preservation when adjusting columns + ImGuiOldColumnFlags_NoForceWithinWindow = 1 << 3, // Disable forcing columns to fit within window + ImGuiOldColumnFlags_GrowParentContentsSize = 1 << 4, // Restore pre-1.51 behavior of extending the parent window contents size but _without affecting the columns width at all_. Will eventually remove. + + // Obsolete names (will be removed) +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + //ImGuiColumnsFlags_None = ImGuiOldColumnFlags_None, + //ImGuiColumnsFlags_NoBorder = ImGuiOldColumnFlags_NoBorder, + //ImGuiColumnsFlags_NoResize = ImGuiOldColumnFlags_NoResize, + //ImGuiColumnsFlags_NoPreserveWidths = ImGuiOldColumnFlags_NoPreserveWidths, + //ImGuiColumnsFlags_NoForceWithinWindow = ImGuiOldColumnFlags_NoForceWithinWindow, + //ImGuiColumnsFlags_GrowParentContentsSize = ImGuiOldColumnFlags_GrowParentContentsSize, +#endif +}; + +struct ImGuiOldColumnData +{ + float OffsetNorm; // Column start offset, normalized 0.0 (far left) -> 1.0 (far right) + float OffsetNormBeforeResize; + ImGuiOldColumnFlags Flags; // Not exposed + ImRect ClipRect; + + ImGuiOldColumnData() { memset(this, 0, sizeof(*this)); } +}; + +struct ImGuiOldColumns +{ + ImGuiID ID; + ImGuiOldColumnFlags Flags; + bool IsFirstFrame; + bool IsBeingResized; + int Current; + int Count; + float OffMinX, OffMaxX; // Offsets from HostWorkRect.Min.x + float LineMinY, LineMaxY; + float HostCursorPosY; // Backup of CursorPos at the time of BeginColumns() + float HostCursorMaxPosX; // Backup of CursorMaxPos at the time of BeginColumns() + ImRect HostInitialClipRect; // Backup of ClipRect at the time of BeginColumns() + ImRect HostBackupClipRect; // Backup of ClipRect during PushColumnsBackground()/PopColumnsBackground() + ImRect HostBackupParentWorkRect;//Backup of WorkRect at the time of BeginColumns() + ImVector Columns; + ImDrawListSplitter Splitter; + + ImGuiOldColumns() { memset(this, 0, sizeof(*this)); } +}; + +//----------------------------------------------------------------------------- +// [SECTION] Box-select support +//----------------------------------------------------------------------------- + +struct ImGuiBoxSelectState +{ + // Active box-selection data (persistent, 1 active at a time) + ImGuiID ID; + bool IsActive; + bool IsStarting; + bool IsStartedFromVoid; // Starting click was not from an item. + bool IsStartedSetNavIdOnce; + bool RequestClear; + ImGuiKeyChord KeyMods : 16; // Latched key-mods for box-select logic. + ImVec2 StartPosRel; // Start position in window-contents relative space (to support scrolling) + ImVec2 EndPosRel; // End position in window-contents relative space + ImVec2 ScrollAccum; // Scrolling accumulator (to behave at high-frame spaces) + ImGuiWindow* Window; + + // Temporary/Transient data + bool UnclipMode; // (Temp/Transient, here in hot area). Set/cleared by the BeginMultiSelect()/EndMultiSelect() owning active box-select. + ImRect UnclipRect; // Rectangle where ItemAdd() clipping may be temporarily disabled. Need support by multi-select supporting widgets. + ImRect BoxSelectRectPrev; // Selection rectangle in absolute coordinates (derived every frame from BoxSelectStartPosRel and MousePos) + ImRect BoxSelectRectCurr; + + ImGuiBoxSelectState() { memset(this, 0, sizeof(*this)); } +}; + +//----------------------------------------------------------------------------- +// [SECTION] Multi-select support +//----------------------------------------------------------------------------- + +// We always assume that -1 is an invalid value (which works for indices and pointers) +#define ImGuiSelectionUserData_Invalid ((ImGuiSelectionUserData)-1) + +// Temporary storage for multi-select +struct IMGUI_API ImGuiMultiSelectTempData +{ + ImGuiMultiSelectIO IO; // MUST BE FIRST FIELD. Requests are set and returned by BeginMultiSelect()/EndMultiSelect() + written to by user during the loop. + ImGuiMultiSelectState* Storage; + ImGuiID FocusScopeId; // Copied from g.CurrentFocusScopeId (unless another selection scope was pushed manually) + ImGuiMultiSelectFlags Flags; + ImVec2 ScopeRectMin; + ImVec2 BackupCursorMaxPos; + ImGuiSelectionUserData LastSubmittedItem; // Copy of last submitted item data, used to merge output ranges. + ImGuiID BoxSelectId; + ImGuiKeyChord KeyMods; + ImS8 LoopRequestSetAll; // -1: no operation, 0: clear all, 1: select all. + bool IsEndIO; // Set when switching IO from BeginMultiSelect() to EndMultiSelect() state. + bool IsFocused; // Set if currently focusing the selection scope (any item of the selection). May be used if you have custom shortcut associated to selection. + bool IsKeyboardSetRange; // Set by BeginMultiSelect() when using Shift+Navigation. Because scrolling may be affected we can't afford a frame of lag with Shift+Navigation. + bool NavIdPassedBy; + bool RangeSrcPassedBy; // Set by the item that matches RangeSrcItem. + bool RangeDstPassedBy; // Set by the item that matches NavJustMovedToId when IsSetRange is set. + + ImGuiMultiSelectTempData() { Clear(); } + void Clear() { size_t io_sz = sizeof(IO); ClearIO(); memset((void*)(&IO + 1), 0, sizeof(*this) - io_sz); } // Zero-clear except IO as we preserve IO.Requests[] buffer allocation. + void ClearIO() { IO.Requests.resize(0); IO.RangeSrcItem = IO.NavIdItem = ImGuiSelectionUserData_Invalid; IO.NavIdSelected = IO.RangeSrcReset = false; } +}; + +// Persistent storage for multi-select (as long as selection is alive) +struct IMGUI_API ImGuiMultiSelectState +{ + ImGuiWindow* Window; + ImGuiID ID; + int LastFrameActive; // Last used frame-count, for GC. + int LastSelectionSize; // Set by BeginMultiSelect() based on optional info provided by user. May be -1 if unknown. + ImS8 RangeSelected; // -1 (don't have) or true/false + ImS8 NavIdSelected; // -1 (don't have) or true/false + ImGuiSelectionUserData RangeSrcItem; // + ImGuiSelectionUserData NavIdItem; // SetNextItemSelectionUserData() value for NavId (if part of submitted items) + + ImGuiMultiSelectState() { Window = NULL; ID = 0; LastFrameActive = LastSelectionSize = 0; RangeSelected = NavIdSelected = -1; RangeSrcItem = NavIdItem = ImGuiSelectionUserData_Invalid; } +}; + +//----------------------------------------------------------------------------- +// [SECTION] Docking support +//----------------------------------------------------------------------------- + +#define DOCKING_HOST_DRAW_CHANNEL_BG 0 // Dock host: background fill +#define DOCKING_HOST_DRAW_CHANNEL_FG 1 // Dock host: decorations and contents + +#ifdef IMGUI_HAS_DOCK + +// Extend ImGuiDockNodeFlags_ +enum ImGuiDockNodeFlagsPrivate_ +{ + // [Internal] + ImGuiDockNodeFlags_DockSpace = 1 << 10, // Saved // A dockspace is a node that occupy space within an existing user window. Otherwise the node is floating and create its own window. + ImGuiDockNodeFlags_CentralNode = 1 << 11, // Saved // The central node has 2 main properties: stay visible when empty, only use "remaining" spaces from its neighbor. + ImGuiDockNodeFlags_NoTabBar = 1 << 12, // Saved // Tab bar is completely unavailable. No triangle in the corner to enable it back. + ImGuiDockNodeFlags_HiddenTabBar = 1 << 13, // Saved // Tab bar is hidden, with a triangle in the corner to show it again (NB: actual tab-bar instance may be destroyed as this is only used for single-window tab bar) + ImGuiDockNodeFlags_NoWindowMenuButton = 1 << 14, // Saved // Disable window/docking menu (that one that appears instead of the collapse button) + ImGuiDockNodeFlags_NoCloseButton = 1 << 15, // Saved // Disable close button + ImGuiDockNodeFlags_NoResizeX = 1 << 16, // // + ImGuiDockNodeFlags_NoResizeY = 1 << 17, // // + ImGuiDockNodeFlags_DockedWindowsInFocusRoute= 1 << 18, // // Any docked window will be automatically be focus-route chained (window->ParentWindowForFocusRoute set to this) so Shortcut() in this window can run when any docked window is focused. + + // Disable docking/undocking actions in this dockspace or individual node (existing docked nodes will be preserved) + // Those are not exposed in public because the desirable sharing/inheriting/copy-flag-on-split behaviors are quite difficult to design and understand. + // The two public flags ImGuiDockNodeFlags_NoDockingOverCentralNode/ImGuiDockNodeFlags_NoDockingSplit don't have those issues. + ImGuiDockNodeFlags_NoDockingSplitOther = 1 << 19, // // Disable this node from splitting other windows/nodes. + ImGuiDockNodeFlags_NoDockingOverMe = 1 << 20, // // Disable other windows/nodes from being docked over this node. + ImGuiDockNodeFlags_NoDockingOverOther = 1 << 21, // // Disable this node from being docked over another window or non-empty node. + ImGuiDockNodeFlags_NoDockingOverEmpty = 1 << 22, // // Disable this node from being docked over an empty node (e.g. DockSpace with no other windows) + ImGuiDockNodeFlags_NoDocking = ImGuiDockNodeFlags_NoDockingOverMe | ImGuiDockNodeFlags_NoDockingOverOther | ImGuiDockNodeFlags_NoDockingOverEmpty | ImGuiDockNodeFlags_NoDockingSplit | ImGuiDockNodeFlags_NoDockingSplitOther, + + // Masks + ImGuiDockNodeFlags_SharedFlagsInheritMask_ = ~0, + ImGuiDockNodeFlags_NoResizeFlagsMask_ = (int)ImGuiDockNodeFlags_NoResize | ImGuiDockNodeFlags_NoResizeX | ImGuiDockNodeFlags_NoResizeY, + + // When splitting, those local flags are moved to the inheriting child, never duplicated + ImGuiDockNodeFlags_LocalFlagsTransferMask_ = (int)ImGuiDockNodeFlags_NoDockingSplit | ImGuiDockNodeFlags_NoResizeFlagsMask_ | (int)ImGuiDockNodeFlags_AutoHideTabBar | ImGuiDockNodeFlags_CentralNode | ImGuiDockNodeFlags_NoTabBar | ImGuiDockNodeFlags_HiddenTabBar | ImGuiDockNodeFlags_NoWindowMenuButton | ImGuiDockNodeFlags_NoCloseButton, + ImGuiDockNodeFlags_SavedFlagsMask_ = ImGuiDockNodeFlags_NoResizeFlagsMask_ | ImGuiDockNodeFlags_DockSpace | ImGuiDockNodeFlags_CentralNode | ImGuiDockNodeFlags_NoTabBar | ImGuiDockNodeFlags_HiddenTabBar | ImGuiDockNodeFlags_NoWindowMenuButton | ImGuiDockNodeFlags_NoCloseButton, +}; + +// Store the source authority (dock node vs window) of a field +enum ImGuiDataAuthority_ +{ + ImGuiDataAuthority_Auto, + ImGuiDataAuthority_DockNode, + ImGuiDataAuthority_Window, +}; + +enum ImGuiDockNodeState +{ + ImGuiDockNodeState_Unknown, + ImGuiDockNodeState_HostWindowHiddenBecauseSingleWindow, + ImGuiDockNodeState_HostWindowHiddenBecauseWindowsAreResizing, + ImGuiDockNodeState_HostWindowVisible, +}; + +// sizeof() 156~192 +struct IMGUI_API ImGuiDockNode +{ + ImGuiID ID; + ImGuiDockNodeFlags SharedFlags; // (Write) Flags shared by all nodes of a same dockspace hierarchy (inherited from the root node) + ImGuiDockNodeFlags LocalFlags; // (Write) Flags specific to this node + ImGuiDockNodeFlags LocalFlagsInWindows; // (Write) Flags specific to this node, applied from windows + ImGuiDockNodeFlags MergedFlags; // (Read) Effective flags (== SharedFlags | LocalFlagsInNode | LocalFlagsInWindows) + ImGuiDockNodeState State; + ImGuiDockNode* ParentNode; + ImGuiDockNode* ChildNodes[2]; // [Split node only] Child nodes (left/right or top/bottom). Consider switching to an array. + ImVector Windows; // Note: unordered list! Iterate TabBar->Tabs for user-order. + ImGuiTabBar* TabBar; + ImVec2 Pos; // Current position + ImVec2 Size; // Current size + ImVec2 SizeRef; // [Split node only] Last explicitly written-to size (overridden when using a splitter affecting the node), used to calculate Size. + ImGuiAxis SplitAxis; // [Split node only] Split axis (X or Y) + ImGuiWindowClass WindowClass; // [Root node only] + ImU32 LastBgColor; + + ImGuiWindow* HostWindow; + ImGuiWindow* VisibleWindow; // Generally point to window which is ID is == SelectedTabID, but when CTRL+Tabbing this can be a different window. + ImGuiDockNode* CentralNode; // [Root node only] Pointer to central node. + ImGuiDockNode* OnlyNodeWithWindows; // [Root node only] Set when there is a single visible node within the hierarchy. + int CountNodeWithWindows; // [Root node only] + int LastFrameAlive; // Last frame number the node was updated or kept alive explicitly with DockSpace() + ImGuiDockNodeFlags_KeepAliveOnly + int LastFrameActive; // Last frame number the node was updated. + int LastFrameFocused; // Last frame number the node was focused. + ImGuiID LastFocusedNodeId; // [Root node only] Which of our child docking node (any ancestor in the hierarchy) was last focused. + ImGuiID SelectedTabId; // [Leaf node only] Which of our tab/window is selected. + ImGuiID WantCloseTabId; // [Leaf node only] Set when closing a specific tab/window. + ImGuiID RefViewportId; // Reference viewport ID from visible window when HostWindow == NULL. + ImGuiDataAuthority AuthorityForPos :3; + ImGuiDataAuthority AuthorityForSize :3; + ImGuiDataAuthority AuthorityForViewport :3; + bool IsVisible :1; // Set to false when the node is hidden (usually disabled as it has no active window) + bool IsFocused :1; + bool IsBgDrawnThisFrame :1; + bool HasCloseButton :1; // Provide space for a close button (if any of the docked window has one). Note that button may be hidden on window without one. + bool HasWindowMenuButton :1; + bool HasCentralNodeChild :1; + bool WantCloseAll :1; // Set when closing all tabs at once. + bool WantLockSizeOnce :1; + bool WantMouseMove :1; // After a node extraction we need to transition toward moving the newly created host window + bool WantHiddenTabBarUpdate :1; + bool WantHiddenTabBarToggle :1; + + ImGuiDockNode(ImGuiID id); + ~ImGuiDockNode(); + bool IsRootNode() const { return ParentNode == NULL; } + bool IsDockSpace() const { return (MergedFlags & ImGuiDockNodeFlags_DockSpace) != 0; } + bool IsFloatingNode() const { return ParentNode == NULL && (MergedFlags & ImGuiDockNodeFlags_DockSpace) == 0; } + bool IsCentralNode() const { return (MergedFlags & ImGuiDockNodeFlags_CentralNode) != 0; } + bool IsHiddenTabBar() const { return (MergedFlags & ImGuiDockNodeFlags_HiddenTabBar) != 0; } // Hidden tab bar can be shown back by clicking the small triangle + bool IsNoTabBar() const { return (MergedFlags & ImGuiDockNodeFlags_NoTabBar) != 0; } // Never show a tab bar + bool IsSplitNode() const { return ChildNodes[0] != NULL; } + bool IsLeafNode() const { return ChildNodes[0] == NULL; } + bool IsEmpty() const { return ChildNodes[0] == NULL && Windows.Size == 0; } + ImRect Rect() const { return ImRect(Pos.x, Pos.y, Pos.x + Size.x, Pos.y + Size.y); } + + void SetLocalFlags(ImGuiDockNodeFlags flags) { LocalFlags = flags; UpdateMergedFlags(); } + void UpdateMergedFlags() { MergedFlags = SharedFlags | LocalFlags | LocalFlagsInWindows; } +}; + +// List of colors that are stored at the time of Begin() into Docked Windows. +// We currently store the packed colors in a simple array window->DockStyle.Colors[]. +// A better solution may involve appending into a log of colors in ImGuiContext + store offsets into those arrays in ImGuiWindow, +// but it would be more complex as we'd need to double-buffer both as e.g. drop target may refer to window from last frame. +enum ImGuiWindowDockStyleCol +{ + ImGuiWindowDockStyleCol_Text, + ImGuiWindowDockStyleCol_TabHovered, + ImGuiWindowDockStyleCol_TabFocused, + ImGuiWindowDockStyleCol_TabSelected, + ImGuiWindowDockStyleCol_TabSelectedOverline, + ImGuiWindowDockStyleCol_TabDimmed, + ImGuiWindowDockStyleCol_TabDimmedSelected, + ImGuiWindowDockStyleCol_TabDimmedSelectedOverline, + ImGuiWindowDockStyleCol_COUNT +}; + +// We don't store style.Alpha: dock_node->LastBgColor embeds it and otherwise it would only affect the docking tab, which intuitively I would say we don't want to. +struct ImGuiWindowDockStyle +{ + ImU32 Colors[ImGuiWindowDockStyleCol_COUNT]; +}; + +struct ImGuiDockContext +{ + ImGuiStorage Nodes; // Map ID -> ImGuiDockNode*: Active nodes + ImVector Requests; + ImVector NodesSettings; + bool WantFullRebuild; + ImGuiDockContext() { memset(this, 0, sizeof(*this)); } +}; + +#endif // #ifdef IMGUI_HAS_DOCK + +//----------------------------------------------------------------------------- +// [SECTION] Viewport support +//----------------------------------------------------------------------------- + +// ImGuiViewport Private/Internals fields (cardinal sin: we are using inheritance!) +// Every instance of ImGuiViewport is in fact a ImGuiViewportP. +struct ImGuiViewportP : public ImGuiViewport +{ + ImGuiWindow* Window; // Set when the viewport is owned by a window (and ImGuiViewportFlags_CanHostOtherWindows is NOT set) + int Idx; + int LastFrameActive; // Last frame number this viewport was activated by a window + int LastFocusedStampCount; // Last stamp number from when a window hosted by this viewport was focused (by comparing this value between two viewport we have an implicit viewport z-order we use as fallback) + ImGuiID LastNameHash; + ImVec2 LastPos; + ImVec2 LastSize; + float Alpha; // Window opacity (when dragging dockable windows/viewports we make them transparent) + float LastAlpha; + bool LastFocusedHadNavWindow;// Instead of maintaining a LastFocusedWindow (which may harder to correctly maintain), we merely store weither NavWindow != NULL last time the viewport was focused. + short PlatformMonitor; + int BgFgDrawListsLastFrame[2]; // Last frame number the background (0) and foreground (1) draw lists were used + ImDrawList* BgFgDrawLists[2]; // Convenience background (0) and foreground (1) draw lists. We use them to draw software mouser cursor when io.MouseDrawCursor is set and to draw most debug overlays. + ImDrawData DrawDataP; + ImDrawDataBuilder DrawDataBuilder; // Temporary data while building final ImDrawData + ImVec2 LastPlatformPos; + ImVec2 LastPlatformSize; + ImVec2 LastRendererSize; + + // Per-viewport work area + // - Insets are >= 0.0f values, distance from viewport corners to work area. + // - BeginMainMenuBar() and DockspaceOverViewport() tend to use work area to avoid stepping over existing contents. + // - Generally 'safeAreaInsets' in iOS land, 'DisplayCutout' in Android land. + ImVec2 WorkInsetMin; // Work Area inset locked for the frame. GetWorkRect() always fits within GetMainRect(). + ImVec2 WorkInsetMax; // " + ImVec2 BuildWorkInsetMin; // Work Area inset accumulator for current frame, to become next frame's WorkInset + ImVec2 BuildWorkInsetMax; // " + + ImGuiViewportP() { Window = NULL; Idx = -1; LastFrameActive = BgFgDrawListsLastFrame[0] = BgFgDrawListsLastFrame[1] = LastFocusedStampCount = -1; LastNameHash = 0; Alpha = LastAlpha = 1.0f; LastFocusedHadNavWindow = false; PlatformMonitor = -1; BgFgDrawLists[0] = BgFgDrawLists[1] = NULL; LastPlatformPos = LastPlatformSize = LastRendererSize = ImVec2(FLT_MAX, FLT_MAX); } + ~ImGuiViewportP() { if (BgFgDrawLists[0]) IM_DELETE(BgFgDrawLists[0]); if (BgFgDrawLists[1]) IM_DELETE(BgFgDrawLists[1]); } + void ClearRequestFlags() { PlatformRequestClose = PlatformRequestMove = PlatformRequestResize = false; } + + // Calculate work rect pos/size given a set of offset (we have 1 pair of offset for rect locked from last frame data, and 1 pair for currently building rect) + ImVec2 CalcWorkRectPos(const ImVec2& inset_min) const { return ImVec2(Pos.x + inset_min.x, Pos.y + inset_min.y); } + ImVec2 CalcWorkRectSize(const ImVec2& inset_min, const ImVec2& inset_max) const { return ImVec2(ImMax(0.0f, Size.x - inset_min.x - inset_max.x), ImMax(0.0f, Size.y - inset_min.y - inset_max.y)); } + void UpdateWorkRect() { WorkPos = CalcWorkRectPos(WorkInsetMin); WorkSize = CalcWorkRectSize(WorkInsetMin, WorkInsetMax); } // Update public fields + + // Helpers to retrieve ImRect (we don't need to store BuildWorkRect as every access tend to change it, hence the code asymmetry) + ImRect GetMainRect() const { return ImRect(Pos.x, Pos.y, Pos.x + Size.x, Pos.y + Size.y); } + ImRect GetWorkRect() const { return ImRect(WorkPos.x, WorkPos.y, WorkPos.x + WorkSize.x, WorkPos.y + WorkSize.y); } + ImRect GetBuildWorkRect() const { ImVec2 pos = CalcWorkRectPos(BuildWorkInsetMin); ImVec2 size = CalcWorkRectSize(BuildWorkInsetMin, BuildWorkInsetMax); return ImRect(pos.x, pos.y, pos.x + size.x, pos.y + size.y); } +}; + +//----------------------------------------------------------------------------- +// [SECTION] Settings support +//----------------------------------------------------------------------------- + +// Windows data saved in imgui.ini file +// Because we never destroy or rename ImGuiWindowSettings, we can store the names in a separate buffer easily. +// (this is designed to be stored in a ImChunkStream buffer, with the variable-length Name following our structure) +struct ImGuiWindowSettings +{ + ImGuiID ID; + ImVec2ih Pos; // NB: Settings position are stored RELATIVE to the viewport! Whereas runtime ones are absolute positions. + ImVec2ih Size; + ImVec2ih ViewportPos; + ImGuiID ViewportId; + ImGuiID DockId; // ID of last known DockNode (even if the DockNode is invisible because it has only 1 active window), or 0 if none. + ImGuiID ClassId; // ID of window class if specified + short DockOrder; // Order of the last time the window was visible within its DockNode. This is used to reorder windows that are reappearing on the same frame. Same value between windows that were active and windows that were none are possible. + bool Collapsed; + bool IsChild; + bool WantApply; // Set when loaded from .ini data (to enable merging/loading .ini data into an already running context) + bool WantDelete; // Set to invalidate/delete the settings entry + + ImGuiWindowSettings() { memset(this, 0, sizeof(*this)); DockOrder = -1; } + char* GetName() { return (char*)(this + 1); } +}; + +struct ImGuiSettingsHandler +{ + const char* TypeName; // Short description stored in .ini file. Disallowed characters: '[' ']' + ImGuiID TypeHash; // == ImHashStr(TypeName) + void (*ClearAllFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler); // Clear all settings data + void (*ReadInitFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler); // Read: Called before reading (in registration order) + void* (*ReadOpenFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, const char* name); // Read: Called when entering into a new ini entry e.g. "[Window][Name]" + void (*ReadLineFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, void* entry, const char* line); // Read: Called for every line of text within an ini entry + void (*ApplyAllFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler); // Read: Called after reading (in registration order) + void (*WriteAllFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, ImGuiTextBuffer* out_buf); // Write: Output every entries into 'out_buf' + void* UserData; + + ImGuiSettingsHandler() { memset(this, 0, sizeof(*this)); } +}; + +//----------------------------------------------------------------------------- +// [SECTION] Localization support +//----------------------------------------------------------------------------- + +// This is experimental and not officially supported, it'll probably fall short of features, if/when it does we may backtrack. +enum ImGuiLocKey : int +{ + ImGuiLocKey_VersionStr, + ImGuiLocKey_TableSizeOne, + ImGuiLocKey_TableSizeAllFit, + ImGuiLocKey_TableSizeAllDefault, + ImGuiLocKey_TableResetOrder, + ImGuiLocKey_WindowingMainMenuBar, + ImGuiLocKey_WindowingPopup, + ImGuiLocKey_WindowingUntitled, + ImGuiLocKey_OpenLink_s, + ImGuiLocKey_CopyLink, + ImGuiLocKey_DockingHideTabBar, + ImGuiLocKey_DockingHoldShiftToDock, + ImGuiLocKey_DockingDragToUndockOrMoveNode, + ImGuiLocKey_COUNT +}; + +struct ImGuiLocEntry +{ + ImGuiLocKey Key; + const char* Text; +}; + +//----------------------------------------------------------------------------- +// [SECTION] Error handling, State recovery support +//----------------------------------------------------------------------------- + +// Macros used by Recoverable Error handling +// - Only dispatch error if _EXPR: evaluate as assert (similar to an assert macro). +// - The message will always be a string literal, in order to increase likelihood of being display by an assert handler. +// - See 'Demo->Configuration->Error Handling' and ImGuiIO definitions for details on error handling. +// - Read https://github.com/ocornut/imgui/wiki/Error-Handling for details on error handling. +#ifndef IM_ASSERT_USER_ERROR +#define IM_ASSERT_USER_ERROR(_EXPR,_MSG) do { if (!(_EXPR) && ImGui::ErrorLog(_MSG)) { IM_ASSERT((_EXPR) && _MSG); } } while (0) // Recoverable User Error +#endif + +// The error callback is currently not public, as it is expected that only advanced users will rely on it. +typedef void (*ImGuiErrorCallback)(ImGuiContext* ctx, void* user_data, const char* msg); // Function signature for g.ErrorCallback + +//----------------------------------------------------------------------------- +// [SECTION] Metrics, Debug Tools +//----------------------------------------------------------------------------- + +// See IMGUI_DEBUG_LOG() and IMGUI_DEBUG_LOG_XXX() macros. +enum ImGuiDebugLogFlags_ +{ + // Event types + ImGuiDebugLogFlags_None = 0, + ImGuiDebugLogFlags_EventError = 1 << 0, // Error submitted by IM_ASSERT_USER_ERROR() + ImGuiDebugLogFlags_EventActiveId = 1 << 1, + ImGuiDebugLogFlags_EventFocus = 1 << 2, + ImGuiDebugLogFlags_EventPopup = 1 << 3, + ImGuiDebugLogFlags_EventNav = 1 << 4, + ImGuiDebugLogFlags_EventClipper = 1 << 5, + ImGuiDebugLogFlags_EventSelection = 1 << 6, + ImGuiDebugLogFlags_EventIO = 1 << 7, + ImGuiDebugLogFlags_EventFont = 1 << 8, + ImGuiDebugLogFlags_EventInputRouting = 1 << 9, + ImGuiDebugLogFlags_EventDocking = 1 << 10, + ImGuiDebugLogFlags_EventViewport = 1 << 11, + + ImGuiDebugLogFlags_EventMask_ = ImGuiDebugLogFlags_EventError | ImGuiDebugLogFlags_EventActiveId | ImGuiDebugLogFlags_EventFocus | ImGuiDebugLogFlags_EventPopup | ImGuiDebugLogFlags_EventNav | ImGuiDebugLogFlags_EventClipper | ImGuiDebugLogFlags_EventSelection | ImGuiDebugLogFlags_EventIO | ImGuiDebugLogFlags_EventFont | ImGuiDebugLogFlags_EventInputRouting | ImGuiDebugLogFlags_EventDocking | ImGuiDebugLogFlags_EventViewport, + ImGuiDebugLogFlags_OutputToTTY = 1 << 20, // Also send output to TTY + ImGuiDebugLogFlags_OutputToTestEngine = 1 << 21, // Also send output to Test Engine +}; + +struct ImGuiDebugAllocEntry +{ + int FrameCount; + ImS16 AllocCount; + ImS16 FreeCount; +}; + +struct ImGuiDebugAllocInfo +{ + int TotalAllocCount; // Number of call to MemAlloc(). + int TotalFreeCount; + ImS16 LastEntriesIdx; // Current index in buffer + ImGuiDebugAllocEntry LastEntriesBuf[6]; // Track last 6 frames that had allocations + + ImGuiDebugAllocInfo() { memset(this, 0, sizeof(*this)); } +}; + +struct ImGuiMetricsConfig +{ + bool ShowDebugLog = false; + bool ShowIDStackTool = false; + bool ShowWindowsRects = false; + bool ShowWindowsBeginOrder = false; + bool ShowTablesRects = false; + bool ShowDrawCmdMesh = true; + bool ShowDrawCmdBoundingBoxes = true; + bool ShowTextEncodingViewer = false; + bool ShowDockingNodes = false; + int ShowWindowsRectsType = -1; + int ShowTablesRectsType = -1; + int HighlightMonitorIdx = -1; + ImGuiID HighlightViewportID = 0; +}; + +struct ImGuiStackLevelInfo +{ + ImGuiID ID; + ImS8 QueryFrameCount; // >= 1: Query in progress + bool QuerySuccess; // Obtained result from DebugHookIdInfo() + ImGuiDataType DataType : 8; + char Desc[57]; // Arbitrarily sized buffer to hold a result (FIXME: could replace Results[] with a chunk stream?) FIXME: Now that we added CTRL+C this should be fixed. + + ImGuiStackLevelInfo() { memset(this, 0, sizeof(*this)); } +}; + +// State for ID Stack tool queries +struct ImGuiIDStackTool +{ + int LastActiveFrame; + int StackLevel; // -1: query stack and resize Results, >= 0: individual stack level + ImGuiID QueryId; // ID to query details for + ImVector Results; + bool CopyToClipboardOnCtrlC; + float CopyToClipboardLastTime; + ImGuiTextBuffer ResultPathBuf; + + ImGuiIDStackTool() { memset(this, 0, sizeof(*this)); CopyToClipboardLastTime = -FLT_MAX; } +}; + +//----------------------------------------------------------------------------- +// [SECTION] Generic context hooks +//----------------------------------------------------------------------------- + +typedef void (*ImGuiContextHookCallback)(ImGuiContext* ctx, ImGuiContextHook* hook); +enum ImGuiContextHookType { ImGuiContextHookType_NewFramePre, ImGuiContextHookType_NewFramePost, ImGuiContextHookType_EndFramePre, ImGuiContextHookType_EndFramePost, ImGuiContextHookType_RenderPre, ImGuiContextHookType_RenderPost, ImGuiContextHookType_Shutdown, ImGuiContextHookType_PendingRemoval_ }; + +struct ImGuiContextHook +{ + ImGuiID HookId; // A unique ID assigned by AddContextHook() + ImGuiContextHookType Type; + ImGuiID Owner; + ImGuiContextHookCallback Callback; + void* UserData; + + ImGuiContextHook() { memset(this, 0, sizeof(*this)); } +}; + +//----------------------------------------------------------------------------- +// [SECTION] ImGuiContext (main Dear ImGui context) //----------------------------------------------------------------------------- struct ImGuiContext { bool Initialized; - bool FrameScopeActive; // Set by NewFrame(), cleared by EndFrame() - bool FrameScopePushedImplicitWindow; // Set by NewFrame(), cleared by EndFrame() - bool FontAtlasOwnedByContext; // Io.Fonts-> is owned by the ImGuiContext and will be destructed along with it. + bool FontAtlasOwnedByContext; // IO.Fonts-> is owned by the ImGuiContext and will be destructed along with it. ImGuiIO IO; + ImGuiPlatformIO PlatformIO; ImGuiStyle Style; + ImGuiConfigFlags ConfigFlagsCurrFrame; // = g.IO.ConfigFlags at the time of NewFrame() + ImGuiConfigFlags ConfigFlagsLastFrame; ImFont* Font; // (Shortcut) == FontStack.empty() ? IO.Font : FontStack.back() float FontSize; // (Shortcut) == FontBaseSize * g.CurrentWindow->FontWindowScale == window->FontSize(). Text height for current window. float FontBaseSize; // (Shortcut) == IO.FontGlobalScale * Font->Scale * Font->FontSize. Base text height. + float FontScale; // == FontSize / Font->FontSize + float CurrentDpiScale; // Current window/viewport DpiScale == CurrentViewport->DpiScale ImDrawListSharedData DrawListSharedData; double Time; int FrameCount; int FrameCountEnded; + int FrameCountPlatformEnded; int FrameCountRendered; + ImGuiID WithinEndChildID; // Set within EndChild() + bool WithinFrameScope; // Set by NewFrame(), cleared by EndFrame() + bool WithinFrameScopeWithImplicitWindow; // Set by NewFrame(), cleared by EndFrame() when the implicit debug window has been pushed + bool GcCompactAll; // Request full GC + bool TestEngineHookItems; // Will call test engine hooks: ImGuiTestEngineHook_ItemAdd(), ImGuiTestEngineHook_ItemInfo(), ImGuiTestEngineHook_Log() + void* TestEngine; // Test engine user data + char ContextName[16]; // Storage for a context name (to facilitate debugging multi-context setups) + + // Inputs + ImVector InputEventsQueue; // Input events which will be trickled/written into IO structure. + ImVector InputEventsTrail; // Past input events processed in NewFrame(). This is to allow domain-specific application to access e.g mouse/pen trail. + ImGuiMouseSource InputEventsNextMouseSource; + ImU32 InputEventsNextEventId; // Windows state ImVector Windows; // Windows, sorted in display order, back to front - ImVector WindowsFocusOrder; // Windows, sorted in focus order, back to front - ImVector WindowsSortBuffer; - ImVector CurrentWindowStack; - ImGuiStorage WindowsById; - int WindowsActiveCount; - ImGuiWindow* CurrentWindow; // Being drawn into - ImGuiWindow* HoveredWindow; // Will catch mouse inputs - ImGuiWindow* HoveredRootWindow; // Will catch mouse inputs (for focus/move only) - ImGuiWindow* MovingWindow; // Track the window we clicked on (in order to preserve focus). The actually window that is moved is generally MovingWindow->RootWindow. - ImGuiWindow* WheelingWindow; + ImVector WindowsFocusOrder; // Root windows, sorted in focus order, back to front. + ImVector WindowsTempSortBuffer; // Temporary buffer used in EndFrame() to reorder windows so parents are kept before their child + ImVector CurrentWindowStack; + ImGuiStorage WindowsById; // Map window's ImGuiID to ImGuiWindow* + int WindowsActiveCount; // Number of unique windows submitted by frame + float WindowsBorderHoverPadding; // Padding around resizable windows for which hovering on counts as hovering the window == ImMax(style.TouchExtraPadding, style.WindowBorderHoverPadding). This isn't so multi-dpi friendly. + ImGuiID DebugBreakInWindow; // Set to break in Begin() call. + ImGuiWindow* CurrentWindow; // Window being drawn into + ImGuiWindow* HoveredWindow; // Window the mouse is hovering. Will typically catch mouse inputs. + ImGuiWindow* HoveredWindowUnderMovingWindow; // Hovered window ignoring MovingWindow. Only set if MovingWindow is set. + ImGuiWindow* HoveredWindowBeforeClear; // Window the mouse is hovering. Filled even with _NoMouse. This is currently useful for multi-context compositors. + ImGuiWindow* MovingWindow; // Track the window we clicked on (in order to preserve focus). The actual window that is moved is generally MovingWindow->RootWindowDockTree. + ImGuiWindow* WheelingWindow; // Track the window we started mouse-wheeling on. Until a timer elapse or mouse has moved, generally keep scrolling the same window even if during the course of scrolling the mouse ends up hovering a child window. ImVec2 WheelingWindowRefMousePos; - float WheelingWindowTimer; + int WheelingWindowStartFrame; // This may be set one frame before WheelingWindow is != NULL + int WheelingWindowScrolledFrame; + float WheelingWindowReleaseTimer; + ImVec2 WheelingWindowWheelRemainder; + ImVec2 WheelingAxisAvg; // Item/widgets state and tracking information - ImGuiID HoveredId; // Hovered widget - bool HoveredIdAllowOverlap; + ImGuiID DebugDrawIdConflicts; // Set when we detect multiple items with the same identifier + ImGuiID DebugHookIdInfo; // Will call core hooks: DebugHookIdInfo() from GetID functions, used by ID Stack Tool [next HoveredId/ActiveId to not pull in an extra cache-line] + ImGuiID HoveredId; // Hovered widget, filled during the frame ImGuiID HoveredIdPreviousFrame; + int HoveredIdPreviousFrameItemCount; // Count numbers of items using the same ID as last frame's hovered id float HoveredIdTimer; // Measure contiguous hovering time float HoveredIdNotActiveTimer; // Measure contiguous hovering time where the item has not been active + bool HoveredIdAllowOverlap; + bool HoveredIdIsDisabled; // At least one widget passed the rect test, but has been discarded by disabled flag or popup inhibit. May be true even if HoveredId == 0. + bool ItemUnclipByLog; // Disable ItemAdd() clipping, essentially a memory-locality friendly copy of LogEnabled ImGuiID ActiveId; // Active widget ImGuiID ActiveIdIsAlive; // Active widget has been seen this frame (we can't use a bool as the ActiveId may change within the frame) float ActiveIdTimer; bool ActiveIdIsJustActivated; // Set at the time of activation for one frame bool ActiveIdAllowOverlap; // Active widget allows another widget to steal active id (generally for overlapping widgets, but not always) + bool ActiveIdNoClearOnFocusLoss; // Disable losing active id if the active id window gets unfocused. bool ActiveIdHasBeenPressedBefore; // Track whether the active id led to a press (this is to allow changing between PressOnClick and PressOnRelease without pressing twice). Used by range_select branch. bool ActiveIdHasBeenEditedBefore; // Was the value associated to the widget Edited over the course of the Active state. bool ActiveIdHasBeenEditedThisFrame; - int ActiveIdAllowNavDirFlags; // Active widget allows using directional navigation (e.g. can activate a button and move away from it) - int ActiveIdBlockNavInputFlags; + bool ActiveIdFromShortcut; + int ActiveIdMouseButton : 8; ImVec2 ActiveIdClickOffset; // Clicked offset from upper-left corner, if applicable (currently only set by ButtonBehavior) ImGuiWindow* ActiveIdWindow; - ImGuiInputSource ActiveIdSource; // Activating with mouse or nav (gamepad/keyboard) + ImGuiInputSource ActiveIdSource; // Activating source: ImGuiInputSource_Mouse OR ImGuiInputSource_Keyboard OR ImGuiInputSource_Gamepad ImGuiID ActiveIdPreviousFrame; - bool ActiveIdPreviousFrameIsAlive; - bool ActiveIdPreviousFrameHasBeenEditedBefore; - ImGuiWindow* ActiveIdPreviousFrameWindow; - + ImGuiDeactivatedItemData DeactivatedItemData; + ImGuiDataTypeStorage ActiveIdValueOnActivation; // Backup of initial value at the time of activation. ONLY SET BY SPECIFIC WIDGETS: DragXXX and SliderXXX. ImGuiID LastActiveId; // Store the last non-zero ActiveId, useful for animation. float LastActiveIdTimer; // Store the last non-zero ActiveId timer since the beginning of activation, useful for animation. + // Key/Input Ownership + Shortcut Routing system + // - The idea is that instead of "eating" a given key, we can link to an owner. + // - Input query can then read input by specifying ImGuiKeyOwner_Any (== 0), ImGuiKeyOwner_NoOwner (== -1) or a custom ID. + // - Routing is requested ahead of time for a given chord (Key + Mods) and granted in NewFrame(). + double LastKeyModsChangeTime; // Record the last time key mods changed (affect repeat delay when using shortcut logic) + double LastKeyModsChangeFromNoneTime; // Record the last time key mods changed away from being 0 (affect repeat delay when using shortcut logic) + double LastKeyboardKeyPressTime; // Record the last time a keyboard key (ignore mouse/gamepad ones) was pressed. + ImBitArrayForNamedKeys KeysMayBeCharInput; // Lookup to tell if a key can emit char input, see IsKeyChordPotentiallyCharInput(). sizeof() = 20 bytes + ImGuiKeyOwnerData KeysOwnerData[ImGuiKey_NamedKey_COUNT]; + ImGuiKeyRoutingTable KeysRoutingTable; + ImU32 ActiveIdUsingNavDirMask; // Active widget will want to read those nav move requests (e.g. can activate a button and move away from it) + bool ActiveIdUsingAllKeyboardKeys; // Active widget will want to read all keyboard keys inputs. (this is a shortcut for not taking ownership of 100+ keys, frequently used by drag operations) + ImGuiKeyChord DebugBreakInShortcutRouting; // Set to break in SetShortcutRouting()/Shortcut() calls. + //ImU32 ActiveIdUsingNavInputMask; // [OBSOLETE] Since (IMGUI_VERSION_NUM >= 18804) : 'g.ActiveIdUsingNavInputMask |= (1 << ImGuiNavInput_Cancel);' becomes --> 'SetKeyOwner(ImGuiKey_Escape, g.ActiveId) and/or SetKeyOwner(ImGuiKey_NavGamepadCancel, g.ActiveId);' + // Next window/item data - ImGuiNextWindowData NextWindowData; // Storage for SetNextWindow** functions + ImGuiID CurrentFocusScopeId; // Value for currently appending items == g.FocusScopeStack.back(). Not to be mistaken with g.NavFocusScopeId. + ImGuiItemFlags CurrentItemFlags; // Value for currently appending items == g.ItemFlagsStack.back() + ImGuiID DebugLocateId; // Storage for DebugLocateItemOnHover() feature: this is read by ItemAdd() so we keep it in a hot/cached location ImGuiNextItemData NextItemData; // Storage for SetNextItem** functions + ImGuiLastItemData LastItemData; // Storage for last submitted item (setup by ItemAdd) + ImGuiNextWindowData NextWindowData; // Storage for SetNextWindow** functions + bool DebugShowGroupRects; // Shared stacks - ImVector ColorModifiers; // Stack for PushStyleColor()/PopStyleColor() - ImVector StyleModifiers; // Stack for PushStyleVar()/PopStyleVar() - ImVector FontStack; // Stack for PushFont()/PopFont() - ImVectorOpenPopupStack; // Which popups are open (persistent) - ImVectorBeginPopupStack; // Which level of BeginPopup() we are in (reset every frame) + ImGuiCol DebugFlashStyleColorIdx; // (Keep close to ColorStack to share cache line) + ImVector ColorStack; // Stack for PushStyleColor()/PopStyleColor() - inherited by Begin() + ImVector StyleVarStack; // Stack for PushStyleVar()/PopStyleVar() - inherited by Begin() + ImVector FontStack; // Stack for PushFont()/PopFont() - inherited by Begin() + ImVector FocusScopeStack; // Stack for PushFocusScope()/PopFocusScope() - inherited by BeginChild(), pushed into by Begin() + ImVector ItemFlagsStack; // Stack for PushItemFlag()/PopItemFlag() - inherited by Begin() + ImVector GroupStack; // Stack for BeginGroup()/EndGroup() - not inherited by Begin() + ImVector OpenPopupStack; // Which popups are open (persistent) + ImVector BeginPopupStack; // Which level of BeginPopup() we are in (reset every frame) + ImVectorTreeNodeStack; // Stack for TreeNode() - // Navigation data (for gamepad/keyboard) - ImGuiWindow* NavWindow; // Focused window for navigation. Could be called 'FocusWindow' + // Viewports + ImVector Viewports; // Active viewports (always 1+, and generally 1 unless multi-viewports are enabled). Each viewports hold their copy of ImDrawData. + ImGuiViewportP* CurrentViewport; // We track changes of viewport (happening in Begin) so we can call Platform_OnChangedViewport() + ImGuiViewportP* MouseViewport; + ImGuiViewportP* MouseLastHoveredViewport; // Last known viewport that was hovered by mouse (even if we are not hovering any viewport any more) + honoring the _NoInputs flag. + ImGuiID PlatformLastFocusedViewportId; + ImGuiPlatformMonitor FallbackMonitor; // Virtual monitor used as fallback if backend doesn't provide monitor information. + ImRect PlatformMonitorsFullWorkRect; // Bounding box of all platform monitors + int ViewportCreatedCount; // Unique sequential creation counter (mostly for testing/debugging) + int PlatformWindowsCreatedCount; // Unique sequential creation counter (mostly for testing/debugging) + int ViewportFocusedStampCount; // Every time the front-most window changes, we stamp its viewport with an incrementing counter + + // Keyboard/Gamepad Navigation + bool NavCursorVisible; // Nav focus cursor/rectangle is visible? We hide it after a mouse click. We show it after a nav move. + bool NavHighlightItemUnderNav; // Disable mouse hovering highlight. Highlight navigation focused item instead of mouse hovered item. + //bool NavDisableHighlight; // Old name for !g.NavCursorVisible before 1.91.4 (2024/10/18). OPPOSITE VALUE (g.NavDisableHighlight == !g.NavCursorVisible) + //bool NavDisableMouseHover; // Old name for g.NavHighlightItemUnderNav before 1.91.1 (2024/10/18) this was called When user starts using keyboard/gamepad, we hide mouse hovering highlight until mouse is touched again. + bool NavMousePosDirty; // When set we will update mouse position if io.ConfigNavMoveSetMousePos is set (not enabled by default) + bool NavIdIsAlive; // Nav widget has been seen this frame ~~ NavRectRel is valid ImGuiID NavId; // Focused item for navigation - ImGuiID NavActivateId; // ~~ (g.ActiveId == 0) && IsNavInputPressed(ImGuiNavInput_Activate) ? NavId : 0, also set when calling ActivateItem() - ImGuiID NavActivateDownId; // ~~ IsNavInputDown(ImGuiNavInput_Activate) ? NavId : 0 - ImGuiID NavActivatePressedId; // ~~ IsNavInputPressed(ImGuiNavInput_Activate) ? NavId : 0 - ImGuiID NavInputId; // ~~ IsNavInputPressed(ImGuiNavInput_Input) ? NavId : 0 - ImGuiID NavJustTabbedId; // Just tabbed to this id. - ImGuiID NavJustMovedToId; // Just navigated to this id (result of a successfully MoveRequest). - ImGuiID NavJustMovedToMultiSelectScopeId; // Just navigated to this select scope id (result of a successfully MoveRequest). + ImGuiWindow* NavWindow; // Focused window for navigation. Could be called 'FocusedWindow' + ImGuiID NavFocusScopeId; // Focused focus scope (e.g. selection code often wants to "clear other items" when landing on an item of the same scope) + ImGuiNavLayer NavLayer; // Focused layer (main scrolling layer, or menu/title bar layer) + ImGuiID NavActivateId; // ~~ (g.ActiveId == 0) && (IsKeyPressed(ImGuiKey_Space) || IsKeyDown(ImGuiKey_Enter) || IsKeyPressed(ImGuiKey_NavGamepadActivate)) ? NavId : 0, also set when calling ActivateItem() + ImGuiID NavActivateDownId; // ~~ IsKeyDown(ImGuiKey_Space) || IsKeyDown(ImGuiKey_Enter) || IsKeyDown(ImGuiKey_NavGamepadActivate) ? NavId : 0 + ImGuiID NavActivatePressedId; // ~~ IsKeyPressed(ImGuiKey_Space) || IsKeyPressed(ImGuiKey_Enter) || IsKeyPressed(ImGuiKey_NavGamepadActivate) ? NavId : 0 (no repeat) + ImGuiActivateFlags NavActivateFlags; + ImVector NavFocusRoute; // Reversed copy focus scope stack for NavId (should contains NavFocusScopeId). This essentially follow the window->ParentWindowForFocusRoute chain. + ImGuiID NavHighlightActivatedId; + float NavHighlightActivatedTimer; ImGuiID NavNextActivateId; // Set by ActivateItem(), queued until next frame. - ImGuiInputSource NavInputSource; // Keyboard or Gamepad mode? THIS WILL ONLY BE None or NavGamepad or NavKeyboard. - ImRect NavScoringRectScreen; // Rectangle used for scoring, in screen space. Based of window->DC.NavRefRectRel[], modified for directional navigation scoring. - int NavScoringCount; // Metrics for debugging - ImGuiWindow* NavWindowingTarget; // When selecting a window (holding Menu+FocusPrev/Next, or equivalent of CTRL-TAB) this window is temporarily displayed top-most. - ImGuiWindow* NavWindowingTargetAnim; // Record of last valid NavWindowingTarget until DimBgRatio and NavWindowingHighlightAlpha becomes 0.0f - ImGuiWindow* NavWindowingList; + ImGuiActivateFlags NavNextActivateFlags; + ImGuiInputSource NavInputSource; // Keyboard or Gamepad mode? THIS CAN ONLY BE ImGuiInputSource_Keyboard or ImGuiInputSource_Mouse + ImGuiSelectionUserData NavLastValidSelectionUserData; // Last valid data passed to SetNextItemSelectionUser(), or -1. For current window. Not reset when focusing an item that doesn't have selection data. + ImS8 NavCursorHideFrames; + + // Navigation: Init & Move Requests + bool NavAnyRequest; // ~~ NavMoveRequest || NavInitRequest this is to perform early out in ItemAdd() + bool NavInitRequest; // Init request for appearing window to select first item + bool NavInitRequestFromMove; + ImGuiNavItemData NavInitResult; // Init request result (first item of the window, or one for which SetItemDefaultFocus() was called) + bool NavMoveSubmitted; // Move request submitted, will process result on next NewFrame() + bool NavMoveScoringItems; // Move request submitted, still scoring incoming items + bool NavMoveForwardToNextFrame; + ImGuiNavMoveFlags NavMoveFlags; + ImGuiScrollFlags NavMoveScrollFlags; + ImGuiKeyChord NavMoveKeyMods; + ImGuiDir NavMoveDir; // Direction of the move request (left/right/up/down) + ImGuiDir NavMoveDirForDebug; + ImGuiDir NavMoveClipDir; // FIXME-NAV: Describe the purpose of this better. Might want to rename? + ImRect NavScoringRect; // Rectangle used for scoring, in screen space. Based of window->NavRectRel[], modified for directional navigation scoring. + ImRect NavScoringNoClipRect; // Some nav operations (such as PageUp/PageDown) enforce a region which clipper will attempt to always keep submitted + int NavScoringDebugCount; // Metrics for debugging + int NavTabbingDir; // Generally -1 or +1, 0 when tabbing without a nav id + int NavTabbingCounter; // >0 when counting items for tabbing + ImGuiNavItemData NavMoveResultLocal; // Best move request candidate within NavWindow + ImGuiNavItemData NavMoveResultLocalVisible; // Best move request candidate within NavWindow that are mostly visible (when using ImGuiNavMoveFlags_AlsoScoreVisibleSet flag) + ImGuiNavItemData NavMoveResultOther; // Best move request candidate within NavWindow's flattened hierarchy (when using ImGuiWindowFlags_NavFlattened flag) + ImGuiNavItemData NavTabbingResultFirst; // First tabbing request candidate within NavWindow and flattened hierarchy + + // Navigation: record of last move request + ImGuiID NavJustMovedFromFocusScopeId; // Just navigated from this focus scope id (result of a successfully MoveRequest). + ImGuiID NavJustMovedToId; // Just navigated to this id (result of a successfully MoveRequest). + ImGuiID NavJustMovedToFocusScopeId; // Just navigated to this focus scope id (result of a successfully MoveRequest). + ImGuiKeyChord NavJustMovedToKeyMods; + bool NavJustMovedToIsTabbing; // Copy of ImGuiNavMoveFlags_IsTabbing. Maybe we should store whole flags. + bool NavJustMovedToHasSelectionData; // Copy of move result's ItemFlags & ImGuiItemFlags_HasSelectionUserData). Maybe we should just store ImGuiNavItemData. + + // Navigation: Windowing (CTRL+TAB for list, or Menu button + keys or directional pads to move/resize) + ImGuiKeyChord ConfigNavWindowingKeyNext; // = ImGuiMod_Ctrl | ImGuiKey_Tab (or ImGuiMod_Super | ImGuiKey_Tab on OS X). For reconfiguration (see #4828) + ImGuiKeyChord ConfigNavWindowingKeyPrev; // = ImGuiMod_Ctrl | ImGuiMod_Shift | ImGuiKey_Tab (or ImGuiMod_Super | ImGuiMod_Shift | ImGuiKey_Tab on OS X) + ImGuiWindow* NavWindowingTarget; // Target window when doing CTRL+Tab (or Pad Menu + FocusPrev/Next), this window is temporarily displayed top-most! + ImGuiWindow* NavWindowingTargetAnim; // Record of last valid NavWindowingTarget until DimBgRatio and NavWindowingHighlightAlpha becomes 0.0f, so the fade-out can stay on it. + ImGuiWindow* NavWindowingListWindow; // Internal window actually listing the CTRL+Tab contents float NavWindowingTimer; float NavWindowingHighlightAlpha; bool NavWindowingToggleLayer; - ImGuiNavLayer NavLayer; // Layer we are navigating on. For now the system is hard-coded for 0=main contents and 1=menu/title bar, may expose layers later. - int NavIdTabCounter; // == NavWindow->DC.FocusIdxTabCounter at time of NavId processing - bool NavIdIsAlive; // Nav widget has been seen this frame ~~ NavRefRectRel is valid - bool NavMousePosDirty; // When set we will update mouse position if (io.ConfigFlags & ImGuiConfigFlags_NavEnableSetMousePos) if set (NB: this not enabled by default) - bool NavDisableHighlight; // When user starts using mouse, we hide gamepad/keyboard highlight (NB: but they are still available, which is why NavDisableHighlight isn't always != NavDisableMouseHover) - bool NavDisableMouseHover; // When user starts using gamepad/keyboard, we hide mouse hovering highlight until mouse is touched again. - bool NavAnyRequest; // ~~ NavMoveRequest || NavInitRequest - bool NavInitRequest; // Init request for appearing window to select first item - bool NavInitRequestFromMove; - ImGuiID NavInitResultId; - ImRect NavInitResultRectRel; - bool NavMoveFromClampedRefRect; // Set by manual scrolling, if we scroll to a point where NavId isn't visible we reset navigation from visible items - bool NavMoveRequest; // Move request for this frame - ImGuiNavMoveFlags NavMoveRequestFlags; - ImGuiNavForward NavMoveRequestForward; // None / ForwardQueued / ForwardActive (this is used to navigate sibling parent menus from a child menu) - ImGuiDir NavMoveDir, NavMoveDirLast; // Direction of the move request (left/right/up/down), direction of the previous move request - ImGuiDir NavMoveClipDir; // FIXME-NAV: Describe the purpose of this better. Might want to rename? - ImGuiNavMoveResult NavMoveResultLocal; // Best move request candidate within NavWindow - ImGuiNavMoveResult NavMoveResultLocalVisibleSet; // Best move request candidate within NavWindow that are mostly visible (when using ImGuiNavMoveFlags_AlsoScoreVisibleSet flag) - ImGuiNavMoveResult NavMoveResultOther; // Best move request candidate within NavWindow's flattened hierarchy (when using ImGuiWindowFlags_NavFlattened flag) - - // Tabbing system (older than Nav, active even if Nav is disabled. FIXME-NAV: This needs a redesign!) - ImGuiWindow* FocusRequestCurrWindow; // - ImGuiWindow* FocusRequestNextWindow; // - int FocusRequestCurrCounterAll; // Any item being requested for focus, stored as an index (we on layout to be stable between the frame pressing TAB and the next frame, semi-ouch) - int FocusRequestCurrCounterTab; // Tab item being requested for focus, stored as an index - int FocusRequestNextCounterAll; // Stored for next frame - int FocusRequestNextCounterTab; // " - bool FocusTabPressed; // + ImGuiKey NavWindowingToggleKey; + ImVec2 NavWindowingAccumDeltaPos; + ImVec2 NavWindowingAccumDeltaSize; // Render - ImDrawData DrawData; // Main ImDrawData instance to pass render information to the user - ImDrawDataBuilder DrawDataBuilder; float DimBgRatio; // 0.0..1.0 animation when fading in a dimming background (for modal window and CTRL+TAB list) - ImDrawList BackgroundDrawList; // First draw list to be rendered. - ImDrawList ForegroundDrawList; // Last draw list to be rendered. This is where we the render software mouse cursor (if io.MouseDrawCursor is set) and most debug overlays. - ImGuiMouseCursor MouseCursor; // Drag and Drop bool DragDropActive; - bool DragDropWithinSourceOrTarget; + bool DragDropWithinSource; // Set when within a BeginDragDropXXX/EndDragDropXXX block for a drag source. + bool DragDropWithinTarget; // Set when within a BeginDragDropXXX/EndDragDropXXX block for a drag target. ImGuiDragDropFlags DragDropSourceFlags; int DragDropSourceFrameCount; int DragDropMouseButton; ImGuiPayload DragDropPayload; - ImRect DragDropTargetRect; + ImRect DragDropTargetRect; // Store rectangle of current target candidate (we favor small targets when overlapping) + ImRect DragDropTargetClipRect; // Store ClipRect at the time of item's drawing ImGuiID DragDropTargetId; ImGuiDragDropFlags DragDropAcceptFlags; float DragDropAcceptIdCurrRectSurface; // Target item surface (we resolve overlapping targets by prioritizing the smaller surface) ImGuiID DragDropAcceptIdCurr; // Target item id (set at the time of accepting the payload) ImGuiID DragDropAcceptIdPrev; // Target item id from previous frame (we need to store this to allow for overlapping drag and drop targets) int DragDropAcceptFrameCount; // Last time a target expressed a desire to accept the source - ImVector DragDropPayloadBufHeap; // We don't expose the ImVector<> directly - unsigned char DragDropPayloadBufLocal[8]; // Local buffer for small payloads + ImGuiID DragDropHoldJustPressedId; // Set when holding a payload just made ButtonBehavior() return a press. + ImVector DragDropPayloadBufHeap; // We don't expose the ImVector<> directly, ImGuiPayload only holds pointer+size + unsigned char DragDropPayloadBufLocal[16]; // Local buffer for small payloads + + // Clipper + int ClipperTempDataStacked; + ImVector ClipperTempData; + + // Tables + ImGuiTable* CurrentTable; + ImGuiID DebugBreakInTable; // Set to break in BeginTable() call. + int TablesTempDataStacked; // Temporary table data size (because we leave previous instances undestructed, we generally don't use TablesTempData.Size) + ImVector TablesTempData; // Temporary table data (buffers reused/shared across instances, support nesting) + ImPool Tables; // Persistent table data + ImVector TablesLastTimeActive; // Last used timestamp of each tables (SOA, for efficient GC) + ImVector DrawChannelsTempMergeBuffer; // Tab bars ImGuiTabBar* CurrentTabBar; @@ -1005,361 +2499,337 @@ struct ImGuiContext ImVector CurrentTabBarStack; ImVector ShrinkWidthBuffer; + // Multi-Select state + ImGuiBoxSelectState BoxSelectState; + ImGuiMultiSelectTempData* CurrentMultiSelect; + int MultiSelectTempDataStacked; // Temporary multi-select data size (because we leave previous instances undestructed, we generally don't use MultiSelectTempData.Size) + ImVector MultiSelectTempData; + ImPool MultiSelectStorage; + + // Hover Delay system + ImGuiID HoverItemDelayId; + ImGuiID HoverItemDelayIdPreviousFrame; + float HoverItemDelayTimer; // Currently used by IsItemHovered() + float HoverItemDelayClearTimer; // Currently used by IsItemHovered(): grace time before g.TooltipHoverTimer gets cleared. + ImGuiID HoverItemUnlockedStationaryId; // Mouse has once been stationary on this item. Only reset after departing the item. + ImGuiID HoverWindowUnlockedStationaryId; // Mouse has once been stationary on this window. Only reset after departing the window. + + // Mouse state + ImGuiMouseCursor MouseCursor; + float MouseStationaryTimer; // Time the mouse has been stationary (with some loose heuristic) + ImVec2 MouseLastValidPos; + // Widget state - ImVec2 LastValidMousePos; ImGuiInputTextState InputTextState; + ImGuiInputTextDeactivatedState InputTextDeactivatedState; ImFont InputTextPasswordFont; - ImGuiID TempInputTextId; // Temporary text input when CTRL+clicking on a slider, etc. + ImGuiID TempInputId; // Temporary text input when CTRL+clicking on a slider, etc. + ImGuiDataTypeStorage DataTypeZeroValue; // 0 for all data types + int BeginMenuDepth; + int BeginComboDepth; ImGuiColorEditFlags ColorEditOptions; // Store user options for color edit widgets - float ColorEditLastHue; - float ColorEditLastColor[3]; - ImVec4 ColorPickerRef; + ImGuiID ColorEditCurrentID; // Set temporarily while inside of the parent-most ColorEdit4/ColorPicker4 (because they call each others). + ImGuiID ColorEditSavedID; // ID we are saving/restoring HS for + float ColorEditSavedHue; // Backup of last Hue associated to LastColor, so we can restore Hue in lossy RGB<>HSV round trips + float ColorEditSavedSat; // Backup of last Saturation associated to LastColor, so we can restore Saturation in lossy RGB<>HSV round trips + ImU32 ColorEditSavedColor; // RGB value with alpha set to 0. + ImVec4 ColorPickerRef; // Initial/reference color at the time of opening the color picker. + ImGuiComboPreviewData ComboPreviewData; + ImRect WindowResizeBorderExpectedRect; // Expected border rect, switch to relative edit if moving + bool WindowResizeRelativeMode; + short ScrollbarSeekMode; // 0: scroll to clicked location, -1/+1: prev/next page. + float ScrollbarClickDeltaToGrabCenter; // When scrolling to mouse location: distance between mouse and center of grab box, normalized in parent space. + float SliderGrabClickOffset; + float SliderCurrentAccum; // Accumulated slider delta when using navigation controls. + bool SliderCurrentAccumDirty; // Has the accumulated slider delta changed since last time we tried to apply it? bool DragCurrentAccumDirty; float DragCurrentAccum; // Accumulator for dragging modification. Always high-precision, not rounded by end-user precision settings float DragSpeedDefaultRatio; // If speed == 0.0f, uses (max-min) * DragSpeedDefaultRatio - float ScrollbarClickDeltaToGrabCenter; // Distance between mouse and center of grab box, normalized in parent space. Use storage? - int TooltipOverrideCount; - ImVector PrivateClipboard; // If no custom clipboard handler is defined - - // Range-Select/Multi-Select - // [This is unused in this branch, but left here to facilitate merging/syncing multiple branches] - ImGuiID MultiSelectScopeId; + float DisabledAlphaBackup; // Backup for style.Alpha for BeginDisabled() + short DisabledStackSize; + short TooltipOverrideCount; + ImGuiWindow* TooltipPreviousWindow; // Window of last tooltip submitted during the frame + ImVector ClipboardHandlerData; // If no custom clipboard handler is defined + ImVector MenusIdSubmittedThisFrame; // A list of menu IDs that were rendered at least once + ImGuiTypingSelectState TypingSelectState; // State for GetTypingSelectRequest() // Platform support - ImVec2 PlatformImePos; // Cursor position request & last passed to the OS Input Method Editor - ImVec2 PlatformImeLastPos; + ImGuiPlatformImeData PlatformImeData; // Data updated by current frame + ImGuiPlatformImeData PlatformImeDataPrev; // Previous frame data. When changed we call the platform_io.Platform_SetImeDataFn() handler. + ImGuiID PlatformImeViewport; + + // Extensions + // FIXME: We could provide an API to register one slot in an array held in ImGuiContext? + ImGuiDockContext DockContext; + void (*DockNodeWindowMenuHandler)(ImGuiContext* ctx, ImGuiDockNode* node, ImGuiTabBar* tab_bar); // Settings - bool SettingsLoaded; - float SettingsDirtyTimer; // Save .ini Settings to memory when time reaches zero - ImGuiTextBuffer SettingsIniData; // In memory .ini settings - ImVector SettingsHandlers; // List of .ini settings handlers - ImVector SettingsWindows; // ImGuiWindow .ini settings entries (parsed from the last loaded .ini file and maintained on saving) + bool SettingsLoaded; + float SettingsDirtyTimer; // Save .ini Settings to memory when time reaches zero + ImGuiTextBuffer SettingsIniData; // In memory .ini settings + ImVector SettingsHandlers; // List of .ini settings handlers + ImChunkStream SettingsWindows; // ImGuiWindow .ini settings entries + ImChunkStream SettingsTables; // ImGuiTable .ini settings entries + ImVector Hooks; // Hooks for extensions (e.g. test engine) + ImGuiID HookIdNext; // Next available HookId - // Logging - bool LogEnabled; - ImGuiLogType LogType; - FILE* LogFile; // If != NULL log to stdout/ file + // Localization + const char* LocalizationTable[ImGuiLocKey_COUNT]; + + // Capture/Logging + bool LogEnabled; // Currently capturing + ImGuiLogFlags LogFlags; // Capture flags/type + ImGuiWindow* LogWindow; + ImFileHandle LogFile; // If != NULL log to stdout/ file ImGuiTextBuffer LogBuffer; // Accumulation buffer when log to clipboard. This is pointer so our GImGui static constructor doesn't call heap allocators. + const char* LogNextPrefix; + const char* LogNextSuffix; float LogLinePosY; bool LogLineFirstItem; int LogDepthRef; int LogDepthToExpand; int LogDepthToExpandDefault; // Default/stored value for LogDepthMaxExpand if not specified in the LogXXX function call. + // Error Handling + ImGuiErrorCallback ErrorCallback; // = NULL. May be exposed in public API eventually. + void* ErrorCallbackUserData; // = NULL + ImVec2 ErrorTooltipLockedPos; + bool ErrorFirst; + int ErrorCountCurrentFrame; // [Internal] Number of errors submitted this frame. + ImGuiErrorRecoveryState StackSizesInNewFrame; // [Internal] + ImGuiErrorRecoveryState*StackSizesInBeginForCurrentWindow; // [Internal] + // Debug Tools - bool DebugItemPickerActive; - ImGuiID DebugItemPickerBreakID; // Will call IM_DEBUG_BREAK() when encountering this id + // (some of the highly frequently used data are interleaved in other structures above: DebugBreakXXX fields, DebugHookIdInfo, DebugLocateId etc.) + int DebugDrawIdConflictsCount; // Locked count (preserved when holding CTRL) + ImGuiDebugLogFlags DebugLogFlags; + ImGuiTextBuffer DebugLogBuf; + ImGuiTextIndex DebugLogIndex; + int DebugLogSkippedErrors; + ImGuiDebugLogFlags DebugLogAutoDisableFlags; + ImU8 DebugLogAutoDisableFrames; + ImU8 DebugLocateFrames; // For DebugLocateItemOnHover(). This is used together with DebugLocateId which is in a hot/cached spot above. + bool DebugBreakInLocateId; // Debug break in ItemAdd() call for g.DebugLocateId. + ImGuiKeyChord DebugBreakKeyChord; // = ImGuiKey_Pause + ImS8 DebugBeginReturnValueCullDepth; // Cycle between 0..9 then wrap around. + bool DebugItemPickerActive; // Item picker is active (started with DebugStartItemPicker()) + ImU8 DebugItemPickerMouseButton; + ImGuiID DebugItemPickerBreakId; // Will call IM_DEBUG_BREAK() when encountering this ID + float DebugFlashStyleColorTime; + ImVec4 DebugFlashStyleColorBackup; + ImGuiMetricsConfig DebugMetricsConfig; + ImGuiIDStackTool DebugIDStackTool; + ImGuiDebugAllocInfo DebugAllocInfo; + ImGuiDockNode* DebugHoveredDockNode; // Hovered dock node. // Misc - float FramerateSecPerFrame[120]; // Calculate estimate of framerate for user over the last 2 seconds. + float FramerateSecPerFrame[60]; // Calculate estimate of framerate for user over the last 60 frames.. int FramerateSecPerFrameIdx; + int FramerateSecPerFrameCount; float FramerateSecPerFrameAccum; - int WantCaptureMouseNextFrame; // Explicit capture via CaptureKeyboardFromApp()/CaptureMouseFromApp() sets those flags - int WantCaptureKeyboardNextFrame; + int WantCaptureMouseNextFrame; // Explicit capture override via SetNextFrameWantCaptureMouse()/SetNextFrameWantCaptureKeyboard(). Default to -1. + int WantCaptureKeyboardNextFrame; // " int WantTextInputNextFrame; - char TempBuffer[1024*3+1]; // Temporary text buffer + ImVector TempBuffer; // Temporary text buffer + char TempKeychordName[64]; - ImGuiContext(ImFontAtlas* shared_font_atlas) : BackgroundDrawList(&DrawListSharedData), ForegroundDrawList(&DrawListSharedData) - { - Initialized = false; - FrameScopeActive = FrameScopePushedImplicitWindow = false; - Font = NULL; - FontSize = FontBaseSize = 0.0f; - FontAtlasOwnedByContext = shared_font_atlas ? false : true; - IO.Fonts = shared_font_atlas ? shared_font_atlas : IM_NEW(ImFontAtlas)(); - Time = 0.0f; - FrameCount = 0; - FrameCountEnded = FrameCountRendered = -1; - - WindowsActiveCount = 0; - CurrentWindow = NULL; - HoveredWindow = NULL; - HoveredRootWindow = NULL; - MovingWindow = NULL; - WheelingWindow = NULL; - WheelingWindowTimer = 0.0f; - - HoveredId = 0; - HoveredIdAllowOverlap = false; - HoveredIdPreviousFrame = 0; - HoveredIdTimer = HoveredIdNotActiveTimer = 0.0f; - ActiveId = 0; - ActiveIdIsAlive = 0; - ActiveIdTimer = 0.0f; - ActiveIdIsJustActivated = false; - ActiveIdAllowOverlap = false; - ActiveIdHasBeenPressedBefore = false; - ActiveIdHasBeenEditedBefore = false; - ActiveIdHasBeenEditedThisFrame = false; - ActiveIdAllowNavDirFlags = 0x00; - ActiveIdBlockNavInputFlags = 0x00; - ActiveIdClickOffset = ImVec2(-1,-1); - ActiveIdWindow = NULL; - ActiveIdSource = ImGuiInputSource_None; - - ActiveIdPreviousFrame = 0; - ActiveIdPreviousFrameIsAlive = false; - ActiveIdPreviousFrameHasBeenEditedBefore = false; - ActiveIdPreviousFrameWindow = NULL; - - LastActiveId = 0; - LastActiveIdTimer = 0.0f; - - NavWindow = NULL; - NavId = NavActivateId = NavActivateDownId = NavActivatePressedId = NavInputId = 0; - NavJustTabbedId = NavJustMovedToId = NavJustMovedToMultiSelectScopeId = NavNextActivateId = 0; - NavInputSource = ImGuiInputSource_None; - NavScoringRectScreen = ImRect(); - NavScoringCount = 0; - NavWindowingTarget = NavWindowingTargetAnim = NavWindowingList = NULL; - NavWindowingTimer = NavWindowingHighlightAlpha = 0.0f; - NavWindowingToggleLayer = false; - NavLayer = ImGuiNavLayer_Main; - NavIdTabCounter = INT_MAX; - NavIdIsAlive = false; - NavMousePosDirty = false; - NavDisableHighlight = true; - NavDisableMouseHover = false; - NavAnyRequest = false; - NavInitRequest = false; - NavInitRequestFromMove = false; - NavInitResultId = 0; - NavMoveFromClampedRefRect = false; - NavMoveRequest = false; - NavMoveRequestFlags = 0; - NavMoveRequestForward = ImGuiNavForward_None; - NavMoveDir = NavMoveDirLast = NavMoveClipDir = ImGuiDir_None; - - FocusRequestCurrWindow = FocusRequestNextWindow = NULL; - FocusRequestCurrCounterAll = FocusRequestCurrCounterTab = INT_MAX; - FocusRequestNextCounterAll = FocusRequestNextCounterTab = INT_MAX; - FocusTabPressed = false; - - DimBgRatio = 0.0f; - BackgroundDrawList._OwnerName = "##Background"; // Give it a name for debugging - ForegroundDrawList._OwnerName = "##Foreground"; // Give it a name for debugging - MouseCursor = ImGuiMouseCursor_Arrow; - - DragDropActive = DragDropWithinSourceOrTarget = false; - DragDropSourceFlags = 0; - DragDropSourceFrameCount = -1; - DragDropMouseButton = -1; - DragDropTargetId = 0; - DragDropAcceptFlags = 0; - DragDropAcceptIdCurrRectSurface = 0.0f; - DragDropAcceptIdPrev = DragDropAcceptIdCurr = 0; - DragDropAcceptFrameCount = -1; - memset(DragDropPayloadBufLocal, 0, sizeof(DragDropPayloadBufLocal)); - - CurrentTabBar = NULL; - - LastValidMousePos = ImVec2(0.0f, 0.0f); - TempInputTextId = 0; - ColorEditOptions = ImGuiColorEditFlags__OptionsDefault; - ColorEditLastHue = 0.0f; - ColorEditLastColor[0] = ColorEditLastColor[1] = ColorEditLastColor[2] = FLT_MAX; - DragCurrentAccumDirty = false; - DragCurrentAccum = 0.0f; - DragSpeedDefaultRatio = 1.0f / 100.0f; - ScrollbarClickDeltaToGrabCenter = 0.0f; - TooltipOverrideCount = 0; - - MultiSelectScopeId = 0; - - PlatformImePos = PlatformImeLastPos = ImVec2(FLT_MAX, FLT_MAX); - - SettingsLoaded = false; - SettingsDirtyTimer = 0.0f; - - LogEnabled = false; - LogType = ImGuiLogType_None; - LogFile = NULL; - LogLinePosY = FLT_MAX; - LogLineFirstItem = false; - LogDepthRef = 0; - LogDepthToExpand = LogDepthToExpandDefault = 2; - - DebugItemPickerActive = false; - DebugItemPickerBreakID = 0; - - memset(FramerateSecPerFrame, 0, sizeof(FramerateSecPerFrame)); - FramerateSecPerFrameIdx = 0; - FramerateSecPerFrameAccum = 0.0f; - WantCaptureMouseNextFrame = WantCaptureKeyboardNextFrame = WantTextInputNextFrame = -1; - memset(TempBuffer, 0, sizeof(TempBuffer)); - } + ImGuiContext(ImFontAtlas* shared_font_atlas); }; //----------------------------------------------------------------------------- -// ImGuiWindow +// [SECTION] ImGuiWindowTempData, ImGuiWindow //----------------------------------------------------------------------------- // Transient per-window data, reset at the beginning of the frame. This used to be called ImGuiDrawContext, hence the DC variable name in ImGuiWindow. -// FIXME: That's theory, in practice the delimitation between ImGuiWindow and ImGuiWindowTempData is quite tenuous and could be reconsidered. +// (That's theory, in practice the delimitation between ImGuiWindow and ImGuiWindowTempData is quite tenuous and could be reconsidered..) +// (This doesn't need a constructor because we zero-clear it as part of ImGuiWindow and all frame-temporary data are setup on Begin) struct IMGUI_API ImGuiWindowTempData { + // Layout ImVec2 CursorPos; // Current emitting position, in absolute coordinates. ImVec2 CursorPosPrevLine; ImVec2 CursorStartPos; // Initial position after Begin(), generally ~ window position + WindowPadding. - ImVec2 CursorMaxPos; // Used to implicitly calculate the size of our contents, always growing during the frame. Used to calculate window->ContentSize at the beginning of next frame + ImVec2 CursorMaxPos; // Used to implicitly calculate ContentSize at the beginning of next frame, for scrolling range and auto-resize. Always growing during the frame. + ImVec2 IdealMaxPos; // Used to implicitly calculate ContentSizeIdeal at the beginning of next frame, for auto-resize only. Always growing during the frame. ImVec2 CurrLineSize; ImVec2 PrevLineSize; float CurrLineTextBaseOffset; // Baseline offset (0.0f by default on a new line, generally == style.FramePadding.y when a framed item has been added). float PrevLineTextBaseOffset; - int TreeDepth; // Current tree depth. - ImU32 TreeMayJumpToParentOnPopMask; // Store a copy of !g.NavIdIsAlive for TreeDepth 0..31.. Could be turned into a ImU64 if necessary. - ImGuiID LastItemId; // ID for last item - ImGuiItemStatusFlags LastItemStatusFlags; // Status flags for last item (see ImGuiItemStatusFlags_) - ImRect LastItemRect; // Interaction rect for last item - ImRect LastItemDisplayRect; // End-user display rect for last item (only valid if LastItemStatusFlags & ImGuiItemStatusFlags_HasDisplayRect) + bool IsSameLine; + bool IsSetPos; + ImVec1 Indent; // Indentation / start position from left of window (increased by TreePush/TreePop, etc.) + ImVec1 ColumnsOffset; // Offset to the current column (if ColumnsCurrent > 0). FIXME: This and the above should be a stack to allow use cases like Tree->Column->Tree. Need revamp columns API. + ImVec1 GroupOffset; + ImVec2 CursorStartPosLossyness;// Record the loss of precision of CursorStartPos due to really large scrolling amount. This is used by clipper to compensate and fix the most common use case of large scroll area. + + // Keyboard/Gamepad navigation ImGuiNavLayer NavLayerCurrent; // Current layer, 0..31 (we currently only use 0..1) - int NavLayerCurrentMask; // = (1 << NavLayerCurrent) used by ItemAdd prior to clipping. - int NavLayerActiveMask; // Which layer have been written to (result from previous frame) - int NavLayerActiveMaskNext; // Which layer have been written to (buffer for current frame) + short NavLayersActiveMask; // Which layers have been written to (result from previous frame) + short NavLayersActiveMaskNext;// Which layers have been written to (accumulator for current frame) + bool NavIsScrollPushableX; // Set when current work location may be scrolled horizontally when moving left / right. This is generally always true UNLESS within a column. bool NavHideHighlightOneFrame; - bool NavHasScroll; // Set when scrolling can be used (ScrollMax > 0.0f) + bool NavWindowHasScrollY; // Set per window when scrolling can be used (== ScrollMax.y > 0.0f) + + // Miscellaneous bool MenuBarAppending; // FIXME: Remove this ImVec2 MenuBarOffset; // MenuBarOffset.x is sort of equivalent of a per-layer CursorPos.x, saved/restored as we switch to the menu bar. The only situation when MenuBarOffset.y is > 0 if when (SafeAreaPadding.y > FramePadding.y), often used on TVs. + ImGuiMenuColumns MenuColumns; // Simplified columns storage for menu items measurement + int TreeDepth; // Current tree depth. + ImU32 TreeHasStackDataDepthMask; // Store whether given depth has ImGuiTreeNodeStackData data. Could be turned into a ImU64 if necessary. ImVector ChildWindows; ImGuiStorage* StateStorage; // Current persistent per-window storage (store e.g. tree node open/close state) + ImGuiOldColumns* CurrentColumns; // Current columns set + int CurrentTableIdx; // Current table index (into g.Tables) ImGuiLayoutType LayoutType; ImGuiLayoutType ParentLayoutType; // Layout type of parent window at the time of Begin() - int FocusCounterAll; // Counter for focus/tabbing system. Start at -1 and increase as assigned via FocusableItemRegister() (FIXME-NAV: Needs redesign) - int FocusCounterTab; // (same, but only count widgets which you can Tab through) + ImU32 ModalDimBgColor; + // Status flags + ImGuiItemStatusFlags WindowItemStatusFlags; + ImGuiItemStatusFlags ChildItemStatusFlags; + ImGuiItemStatusFlags DockTabItemStatusFlags; + ImRect DockTabItemRect; + + // Local parameters stacks // We store the current settings outside of the vectors to increase memory locality (reduce cache misses). The vectors are rarely modified. Also it allows us to not heap allocate for short-lived windows which are not using those settings. - ImGuiItemFlags ItemFlags; // == ItemFlagsStack.back() [empty == ImGuiItemFlags_Default] - float ItemWidth; // == ItemWidthStack.back(). 0.0: default, >0.0: width in pixels, <0.0: align xx pixels to the right of window - float TextWrapPos; // == TextWrapPosStack.back() [empty == -1.0f] - ImVectorItemFlagsStack; - ImVector ItemWidthStack; - ImVector TextWrapPosStack; - ImVectorGroupStack; - short StackSizesBackup[6]; // Store size of various stacks for asserting - - ImVec1 Indent; // Indentation / start position from left of window (increased by TreePush/TreePop, etc.) - ImVec1 GroupOffset; - ImVec1 ColumnsOffset; // Offset to the current column (if ColumnsCurrent > 0). FIXME: This and the above should be a stack to allow use cases like Tree->Column->Tree. Need revamp columns API. - ImGuiColumns* CurrentColumns; // Current columns set - - ImGuiWindowTempData() - { - CursorPos = CursorPosPrevLine = CursorStartPos = CursorMaxPos = ImVec2(0.0f, 0.0f); - CurrLineSize = PrevLineSize = ImVec2(0.0f, 0.0f); - CurrLineTextBaseOffset = PrevLineTextBaseOffset = 0.0f; - TreeDepth = 0; - TreeMayJumpToParentOnPopMask = 0x00; - LastItemId = 0; - LastItemStatusFlags = 0; - LastItemRect = LastItemDisplayRect = ImRect(); - NavLayerActiveMask = NavLayerActiveMaskNext = 0x00; - NavLayerCurrent = ImGuiNavLayer_Main; - NavLayerCurrentMask = (1 << ImGuiNavLayer_Main); - NavHideHighlightOneFrame = false; - NavHasScroll = false; - MenuBarAppending = false; - MenuBarOffset = ImVec2(0.0f, 0.0f); - StateStorage = NULL; - LayoutType = ParentLayoutType = ImGuiLayoutType_Vertical; - FocusCounterAll = FocusCounterTab = -1; - - ItemFlags = ImGuiItemFlags_Default_; - ItemWidth = 0.0f; - TextWrapPos = -1.0f; - memset(StackSizesBackup, 0, sizeof(StackSizesBackup)); - - Indent = ImVec1(0.0f); - GroupOffset = ImVec1(0.0f); - ColumnsOffset = ImVec1(0.0f); - CurrentColumns = NULL; - } + float ItemWidth; // Current item width (>0.0: width in pixels, <0.0: align xx pixels to the right of window). + float TextWrapPos; // Current text wrap pos. + ImVector ItemWidthStack; // Store item widths to restore (attention: .back() is not == ItemWidth) + ImVector TextWrapPosStack; // Store text wrap pos to restore (attention: .back() is not == TextWrapPos) }; // Storage for one window struct IMGUI_API ImGuiWindow { - char* Name; - ImGuiID ID; // == ImHash(Name) - ImGuiWindowFlags Flags; // See enum ImGuiWindowFlags_ + ImGuiContext* Ctx; // Parent UI context (needs to be set explicitly by parent). + char* Name; // Window name, owned by the window. + ImGuiID ID; // == ImHashStr(Name) + ImGuiWindowFlags Flags, FlagsPreviousFrame; // See enum ImGuiWindowFlags_ + ImGuiChildFlags ChildFlags; // Set when window is a child window. See enum ImGuiChildFlags_ + ImGuiWindowClass WindowClass; // Advanced users only. Set with SetNextWindowClass() + ImGuiViewportP* Viewport; // Always set in Begin(). Inactive windows may have a NULL value here if their viewport was discarded. + ImGuiID ViewportId; // We backup the viewport id (since the viewport may disappear or never be created if the window is inactive) + ImVec2 ViewportPos; // We backup the viewport position (since the viewport may disappear or never be created if the window is inactive) + int ViewportAllowPlatformMonitorExtend; // Reset to -1 every frame (index is guaranteed to be valid between NewFrame..EndFrame), only used in the Appearing frame of a tooltip/popup to enforce clamping to a given monitor ImVec2 Pos; // Position (always rounded-up to nearest pixel) ImVec2 Size; // Current size (==SizeFull or collapsed title bar size) ImVec2 SizeFull; // Size when non collapsed ImVec2 ContentSize; // Size of contents/scrollable client area (calculated from the extents reach of the cursor) from previous frame. Does not include window decoration or window padding. + ImVec2 ContentSizeIdeal; ImVec2 ContentSizeExplicit; // Size of contents/scrollable client area explicitly request by the user via SetNextWindowContentSize(). ImVec2 WindowPadding; // Window padding at the time of Begin(). - float WindowRounding; // Window rounding at the time of Begin(). + float WindowRounding; // Window rounding at the time of Begin(). May be clamped lower to avoid rendering artifacts with title bar, menu bar etc. float WindowBorderSize; // Window border size at the time of Begin(). + float TitleBarHeight, MenuBarHeight; // Note that those used to be function before 2024/05/28. If you have old code calling TitleBarHeight() you can change it to TitleBarHeight. + float DecoOuterSizeX1, DecoOuterSizeY1; // Left/Up offsets. Sum of non-scrolling outer decorations (X1 generally == 0.0f. Y1 generally = TitleBarHeight + MenuBarHeight). Locked during Begin(). + float DecoOuterSizeX2, DecoOuterSizeY2; // Right/Down offsets (X2 generally == ScrollbarSize.x, Y2 == ScrollbarSizes.y). + float DecoInnerSizeX1, DecoInnerSizeY1; // Applied AFTER/OVER InnerRect. Specialized for Tables as they use specialized form of clipping and frozen rows/columns are inside InnerRect (and not part of regular decoration sizes). int NameBufLen; // Size of buffer storing Name. May be larger than strlen(Name)! ImGuiID MoveId; // == window->GetID("#MOVE") + ImGuiID TabId; // == window->GetID("#TAB") ImGuiID ChildId; // ID of corresponding item in parent window (for navigation to return from child window to parent window) + ImGuiID PopupId; // ID in the popup stack when this window is used as a popup/menu (because we use generic Name/ID for recycling) ImVec2 Scroll; ImVec2 ScrollMax; ImVec2 ScrollTarget; // target scroll position. stored as cursor position with scrolling canceled out, so the highest point is always 0.0f. (FLT_MAX for no change) ImVec2 ScrollTargetCenterRatio; // 0.0f = scroll so that target position is at top, 0.5f = scroll so that target position is centered - ImVec2 ScrollbarSizes; // Size taken by scrollbars on each axis + ImVec2 ScrollTargetEdgeSnapDist; // 0.0f = no snapping, >0.0f snapping threshold + ImVec2 ScrollbarSizes; // Size taken by each scrollbars on their smaller axis. Pay attention! ScrollbarSizes.x == width of the vertical scrollbar, ScrollbarSizes.y = height of the horizontal scrollbar. bool ScrollbarX, ScrollbarY; // Are scrollbars visible? + bool ScrollbarXStabilizeEnabled; // Was ScrollbarX previously auto-stabilized? + ImU8 ScrollbarXStabilizeToggledHistory; // Used to stabilize scrollbar visibility in case of feedback loops + bool ViewportOwned; bool Active; // Set to true on Begin(), unless Collapsed bool WasActive; bool WriteAccessed; // Set to true when any widget access the current window bool Collapsed; // Set when collapsing window to become only title-bar bool WantCollapseToggle; bool SkipItems; // Set when items can safely be all clipped (e.g. window not visible or collapsed) + bool SkipRefresh; // [EXPERIMENTAL] Reuse previous frame drawn contents, Begin() returns false. bool Appearing; // Set during the frame where the window is appearing (or re-appearing) - bool Hidden; // Do not display (== (HiddenFrames*** > 0)) + bool Hidden; // Do not display (== HiddenFrames*** > 0) + bool IsFallbackWindow; // Set on the "Debug##Default" window. + bool IsExplicitChild; // Set when passed _ChildWindow, left to false by BeginDocked() bool HasCloseButton; // Set when the window has a close button (p_open != NULL) + signed char ResizeBorderHovered; // Current border being hovered for resize (-1: none, otherwise 0-3) signed char ResizeBorderHeld; // Current border being held for resize (-1: none, otherwise 0-3) short BeginCount; // Number of Begin() during the current frame (generally 0 or 1, 1+ if appending via multiple Begin/End pairs) - short BeginOrderWithinParent; // Order within immediate parent window, if we are a child window. Otherwise 0. - short BeginOrderWithinContext; // Order within entire imgui context. This is mostly used for debugging submission order related issues. - ImGuiID PopupId; // ID in the popup stack when this window is used as a popup/menu (because we use generic Name/ID for recycling) + short BeginCountPreviousFrame; // Number of Begin() during the previous frame + short BeginOrderWithinParent; // Begin() order within immediate parent window, if we are a child window. Otherwise 0. + short BeginOrderWithinContext; // Begin() order within entire imgui context. This is mostly used for debugging submission order related issues. + short FocusOrder; // Order within WindowsFocusOrder[], altered when windows are focused. ImS8 AutoFitFramesX, AutoFitFramesY; - ImS8 AutoFitChildAxises; bool AutoFitOnlyGrows; ImGuiDir AutoPosLastDirection; - int HiddenFramesCanSkipItems; // Hide the window for N frames - int HiddenFramesCannotSkipItems; // Hide the window for N frames while allowing items to be submitted so we can measure their size - ImGuiCond SetWindowPosAllowFlags; // store acceptable condition flags for SetNextWindowPos() use. - ImGuiCond SetWindowSizeAllowFlags; // store acceptable condition flags for SetNextWindowSize() use. - ImGuiCond SetWindowCollapsedAllowFlags; // store acceptable condition flags for SetNextWindowCollapsed() use. + ImS8 HiddenFramesCanSkipItems; // Hide the window for N frames + ImS8 HiddenFramesCannotSkipItems; // Hide the window for N frames while allowing items to be submitted so we can measure their size + ImS8 HiddenFramesForRenderOnly; // Hide the window until frame N at Render() time only + ImS8 DisableInputsFrames; // Disable window interactions for N frames + ImGuiCond SetWindowPosAllowFlags : 8; // store acceptable condition flags for SetNextWindowPos() use. + ImGuiCond SetWindowSizeAllowFlags : 8; // store acceptable condition flags for SetNextWindowSize() use. + ImGuiCond SetWindowCollapsedAllowFlags : 8; // store acceptable condition flags for SetNextWindowCollapsed() use. + ImGuiCond SetWindowDockAllowFlags : 8; // store acceptable condition flags for SetNextWindowDock() use. ImVec2 SetWindowPosVal; // store window position when using a non-zero Pivot (position set needs to be processed when we know the window size) - ImVec2 SetWindowPosPivot; // store window pivot for positioning. ImVec2(0,0) when positioning from top-left corner; ImVec2(0.5f,0.5f) for centering; ImVec2(1,1) for bottom right. + ImVec2 SetWindowPosPivot; // store window pivot for positioning. ImVec2(0, 0) when positioning from top-left corner; ImVec2(0.5f, 0.5f) for centering; ImVec2(1, 1) for bottom right. ImVector IDStack; // ID stack. ID are hashes seeded with the value at the top of the stack. (In theory this should be in the TempData structure) ImGuiWindowTempData DC; // Temporary per-window data, reset at the beginning of the frame. This used to be called ImGuiDrawContext, hence the "DC" variable name. - // The best way to understand what those rectangles are is to use the 'Metrics -> Tools -> Show windows rectangles' viewer. + // The best way to understand what those rectangles are is to use the 'Metrics->Tools->Show Windows Rectangles' viewer. // The main 'OuterRect', omitted as a field, is window->Rect(). ImRect OuterRectClipped; // == Window->Rect() just after setup in Begin(). == window->Rect() for root window. ImRect InnerRect; // Inner rectangle (omit title bar, menu bar, scroll bar) ImRect InnerClipRect; // == InnerRect shrunk by WindowPadding*0.5f on each side, clipped within viewport or parent clip rect. - ImRect WorkRect; // Cover the whole scrolling region, shrunk by WindowPadding*1.0f on each side. This is meant to replace ContentsRegionRect over time (from 1.71+ onward). + ImRect WorkRect; // Initially covers the whole scrolling region. Reduced by containers e.g columns/tables when active. Shrunk by WindowPadding*1.0f on each side. This is meant to replace ContentRegionRect over time (from 1.71+ onward). + ImRect ParentWorkRect; // Backup of WorkRect before entering a container such as columns/tables. Used by e.g. SpanAllColumns functions to easily access. Stacked containers are responsible for maintaining this. // FIXME-WORKRECT: Could be a stack? ImRect ClipRect; // Current clipping/scissoring rectangle, evolve as we are using PushClipRect(), etc. == DrawList->clip_rect_stack.back(). - ImRect ContentsRegionRect; // FIXME: This is currently confusing/misleading. It is essentially WorkRect but not handling of scrolling. We currently rely on it as right/bottom aligned sizing operation need some size to rely on. + ImRect ContentRegionRect; // FIXME: This is currently confusing/misleading. It is essentially WorkRect but not handling of scrolling. We currently rely on it as right/bottom aligned sizing operation need some size to rely on. + ImVec2ih HitTestHoleSize; // Define an optional rectangular hole where mouse will pass-through the window. + ImVec2ih HitTestHoleOffset; int LastFrameActive; // Last frame number the window was Active. + int LastFrameJustFocused; // Last frame number the window was made Focused. float LastTimeActive; // Last timestamp the window was Active (using float as we don't need high precision there) float ItemWidthDefault; - ImGuiMenuColumns MenuColumns; // Simplified columns storage for menu items ImGuiStorage StateStorage; - ImVector ColumnsStorage; + ImVector ColumnsStorage; float FontWindowScale; // User scale multiplier per-window, via SetWindowFontScale() - int SettingsIdx; // Index into SettingsWindow[] (indices are always valid as we only grow the array from the back) + float FontWindowScaleParents; + float FontDpiScale; + float FontRefSize; // This is a copy of window->CalcFontSize() at the time of Begin(), trying to phase out CalcFontSize() especially as it may be called on non-current window. + int SettingsOffset; // Offset into SettingsWindows[] (offsets are always valid as we only grow the array from the back) ImDrawList* DrawList; // == &DrawListInst (for backward compatibility reason with code using imgui_internal.h we keep this a pointer) ImDrawList DrawListInst; - ImGuiWindow* ParentWindow; // If we are a child _or_ popup window, this is pointing to our parent. Otherwise NULL. - ImGuiWindow* RootWindow; // Point to ourself or first ancestor that is not a child window. + ImGuiWindow* ParentWindow; // If we are a child _or_ popup _or_ docked window, this is pointing to our parent. Otherwise NULL. + ImGuiWindow* ParentWindowInBeginStack; + ImGuiWindow* RootWindow; // Point to ourself or first ancestor that is not a child window. Doesn't cross through popups/dock nodes. + ImGuiWindow* RootWindowPopupTree; // Point to ourself or first ancestor that is not a child window. Cross through popups parent<>child. + ImGuiWindow* RootWindowDockTree; // Point to ourself or first ancestor that is not a child window. Cross through dock nodes. ImGuiWindow* RootWindowForTitleBarHighlight; // Point to ourself or first ancestor which will display TitleBgActive color when this window is active. ImGuiWindow* RootWindowForNav; // Point to ourself or first ancestor which doesn't have the NavFlattened flag. + ImGuiWindow* ParentWindowForFocusRoute; // Set to manual link a window to its logical parent so that Shortcut() chain are honoerd (e.g. Tool linked to Document) ImGuiWindow* NavLastChildNavWindow; // When going to the menu bar, we remember the child window we came from. (This could probably be made implicit if we kept g.Windows sorted by last focused including child window.) ImGuiID NavLastIds[ImGuiNavLayer_COUNT]; // Last known NavId for this window, per layer (0/1) ImRect NavRectRel[ImGuiNavLayer_COUNT]; // Reference rectangle, in window relative space + ImVec2 NavPreferredScoringPosRel[ImGuiNavLayer_COUNT]; // Preferred X/Y position updated when moving on a given axis, reset to FLT_MAX. + ImGuiID NavRootFocusScopeId; // Focus Scope ID at the time of Begin() - bool MemoryCompacted; - int MemoryDrawListIdxCapacity; + int MemoryDrawListIdxCapacity; // Backup of last idx/vtx count, so when waking up the window we can preallocate and avoid iterative alloc/copy int MemoryDrawListVtxCapacity; + bool MemoryCompacted; // Set when window extraneous data have been garbage collected + + // Docking + bool DockIsActive :1; // When docking artifacts are actually visible. When this is set, DockNode is guaranteed to be != NULL. ~~ (DockNode != NULL) && (DockNode->Windows.Size > 1). + bool DockNodeIsVisible :1; + bool DockTabIsVisible :1; // Is our window visible this frame? ~~ is the corresponding tab selected? + bool DockTabWantClose :1; + short DockOrder; // Order of the last time the window was visible within its DockNode. This is used to reorder windows that are reappearing on the same frame. Same value between windows that were active and windows that were none are possible. + ImGuiWindowDockStyle DockStyle; + ImGuiDockNode* DockNode; // Which node are we docked into. Important: Prefer testing DockIsActive in many cases as this will still be set when the dock node is hidden. + ImGuiDockNode* DockNodeAsHost; // Which node are we owning (for parent windows) + ImGuiID DockId; // Backup of last valid DockNode->ID, so single window remember their dock node id even when they are not bound any more public: ImGuiWindow(ImGuiContext* context, const char* name); @@ -1368,35 +2838,18 @@ public: ImGuiID GetID(const char* str, const char* str_end = NULL); ImGuiID GetID(const void* ptr); ImGuiID GetID(int n); - ImGuiID GetIDNoKeepAlive(const char* str, const char* str_end = NULL); - ImGuiID GetIDNoKeepAlive(const void* ptr); - ImGuiID GetIDNoKeepAlive(int n); + ImGuiID GetIDFromPos(const ImVec2& p_abs); ImGuiID GetIDFromRectangle(const ImRect& r_abs); - // We don't use g.FontSize because the window may be != g.CurrentWidow. - ImRect Rect() const { return ImRect(Pos.x, Pos.y, Pos.x+Size.x, Pos.y+Size.y); } - float CalcFontSize() const { ImGuiContext& g = *GImGui; float scale = g.FontBaseSize * FontWindowScale; if (ParentWindow) scale *= ParentWindow->FontWindowScale; return scale; } - float TitleBarHeight() const { ImGuiContext& g = *GImGui; return (Flags & ImGuiWindowFlags_NoTitleBar) ? 0.0f : CalcFontSize() + g.Style.FramePadding.y * 2.0f; } - ImRect TitleBarRect() const { return ImRect(Pos, ImVec2(Pos.x + SizeFull.x, Pos.y + TitleBarHeight())); } - float MenuBarHeight() const { ImGuiContext& g = *GImGui; return (Flags & ImGuiWindowFlags_MenuBar) ? DC.MenuBarOffset.y + CalcFontSize() + g.Style.FramePadding.y * 2.0f : 0.0f; } - ImRect MenuBarRect() const { float y1 = Pos.y + TitleBarHeight(); return ImRect(Pos.x, y1, Pos.x + SizeFull.x, y1 + MenuBarHeight()); } -}; - -// Backup and restore just enough data to be able to use IsItemHovered() on item A after another B in the same window has overwritten the data. -struct ImGuiItemHoveredDataBackup -{ - ImGuiID LastItemId; - ImGuiItemStatusFlags LastItemStatusFlags; - ImRect LastItemRect; - ImRect LastItemDisplayRect; - - ImGuiItemHoveredDataBackup() { Backup(); } - void Backup() { ImGuiWindow* window = GImGui->CurrentWindow; LastItemId = window->DC.LastItemId; LastItemStatusFlags = window->DC.LastItemStatusFlags; LastItemRect = window->DC.LastItemRect; LastItemDisplayRect = window->DC.LastItemDisplayRect; } - void Restore() const { ImGuiWindow* window = GImGui->CurrentWindow; window->DC.LastItemId = LastItemId; window->DC.LastItemStatusFlags = LastItemStatusFlags; window->DC.LastItemRect = LastItemRect; window->DC.LastItemDisplayRect = LastItemDisplayRect; } + // We don't use g.FontSize because the window may be != g.CurrentWindow. + ImRect Rect() const { return ImRect(Pos.x, Pos.y, Pos.x + Size.x, Pos.y + Size.y); } + float CalcFontSize() const { ImGuiContext& g = *Ctx; return g.FontBaseSize * FontWindowScale * FontDpiScale * FontWindowScaleParents; } + ImRect TitleBarRect() const { return ImRect(Pos, ImVec2(Pos.x + SizeFull.x, Pos.y + TitleBarHeight)); } + ImRect MenuBarRect() const { float y1 = Pos.y + TitleBarHeight; return ImRect(Pos.x, y1, Pos.x + SizeFull.x, y1 + MenuBarHeight); } }; //----------------------------------------------------------------------------- -// Tab bar, tab item +// [SECTION] Tab bar, Tab item support //----------------------------------------------------------------------------- // Extend ImGuiTabBarFlags_ @@ -1404,129 +2857,490 @@ enum ImGuiTabBarFlagsPrivate_ { ImGuiTabBarFlags_DockNode = 1 << 20, // Part of a dock node [we don't use this in the master branch but it facilitate branch syncing to keep this around] ImGuiTabBarFlags_IsFocused = 1 << 21, - ImGuiTabBarFlags_SaveSettings = 1 << 22 // FIXME: Settings are handled by the docking system, this only request the tab bar to mark settings dirty when reordering tabs + ImGuiTabBarFlags_SaveSettings = 1 << 22, // FIXME: Settings are handled by the docking system, this only request the tab bar to mark settings dirty when reordering tabs }; // Extend ImGuiTabItemFlags_ enum ImGuiTabItemFlagsPrivate_ { - ImGuiTabItemFlags_NoCloseButton = 1 << 20 // Store whether p_open is set or not, which we need to recompute WidthContents during layout. + ImGuiTabItemFlags_SectionMask_ = ImGuiTabItemFlags_Leading | ImGuiTabItemFlags_Trailing, + ImGuiTabItemFlags_NoCloseButton = 1 << 20, // Track whether p_open was set or not (we'll need this info on the next frame to recompute ContentWidth during layout) + ImGuiTabItemFlags_Button = 1 << 21, // Used by TabItemButton, change the tab item behavior to mimic a button + ImGuiTabItemFlags_Invisible = 1 << 22, // To reserve space e.g. with ImGuiTabItemFlags_Leading + ImGuiTabItemFlags_Unsorted = 1 << 23, // [Docking] Trailing tabs with the _Unsorted flag will be sorted based on the DockOrder of their Window. }; -// Storage for one active tab item (sizeof() 26~32 bytes) +// Storage for one active tab item (sizeof() 48 bytes) struct ImGuiTabItem { ImGuiID ID; ImGuiTabItemFlags Flags; + ImGuiWindow* Window; // When TabItem is part of a DockNode's TabBar, we hold on to a window. int LastFrameVisible; int LastFrameSelected; // This allows us to infer an ordered list of the last activated tabs with little maintenance - int NameOffset; // When Window==NULL, offset to name within parent ImGuiTabBar::TabsNames float Offset; // Position relative to beginning of tab float Width; // Width currently displayed - float WidthContents; // Width of actual contents, stored during BeginTabItem() call + float ContentWidth; // Width of label, stored during BeginTabItem() call + float RequestedWidth; // Width optionally requested by caller, -1.0f is unused + ImS32 NameOffset; // When Window==NULL, offset to name within parent ImGuiTabBar::TabsNames + ImS16 BeginOrder; // BeginTabItem() order, used to re-order tabs after toggling ImGuiTabBarFlags_Reorderable + ImS16 IndexDuringLayout; // Index only used during TabBarLayout(). Tabs gets reordered so 'Tabs[n].IndexDuringLayout == n' but may mismatch during additions. + bool WantClose; // Marked as closed by SetTabItemClosed() - ImGuiTabItem() { ID = Flags = 0; LastFrameVisible = LastFrameSelected = -1; NameOffset = -1; Offset = Width = WidthContents = 0.0f; } + ImGuiTabItem() { memset(this, 0, sizeof(*this)); LastFrameVisible = LastFrameSelected = -1; RequestedWidth = -1.0f; NameOffset = -1; BeginOrder = IndexDuringLayout = -1; } }; -// Storage for a tab bar (sizeof() 92~96 bytes) -struct ImGuiTabBar +// Storage for a tab bar (sizeof() 160 bytes) +struct IMGUI_API ImGuiTabBar { + ImGuiWindow* Window; ImVector Tabs; + ImGuiTabBarFlags Flags; ImGuiID ID; // Zero for tab-bars used by docking - ImGuiID SelectedTabId; // Selected tab - ImGuiID NextSelectedTabId; + ImGuiID SelectedTabId; // Selected tab/window + ImGuiID NextSelectedTabId; // Next selected tab/window. Will also trigger a scrolling animation ImGuiID VisibleTabId; // Can occasionally be != SelectedTabId (e.g. when previewing contents for CTRL+TAB preview) int CurrFrameVisible; int PrevFrameVisible; ImRect BarRect; - float LastTabContentHeight; // Record the height of contents submitted below the tab bar - float OffsetMax; // Distance from BarRect.Min.x, locked during layout - float OffsetMaxIdeal; // Ideal offset if all tabs were visible and not clipped - float OffsetNextTab; // Distance from BarRect.Min.x, incremented with each BeginTabItem() call, not used if ImGuiTabBarFlags_Reorderable if set. + float CurrTabsContentsHeight; + float PrevTabsContentsHeight; // Record the height of contents submitted below the tab bar + float WidthAllTabs; // Actual width of all tabs (locked during layout) + float WidthAllTabsIdeal; // Ideal width if all tabs were visible and not clipped float ScrollingAnim; float ScrollingTarget; float ScrollingTargetDistToVisibility; float ScrollingSpeed; - ImGuiTabBarFlags Flags; + float ScrollingRectMinX; + float ScrollingRectMaxX; + float SeparatorMinX; + float SeparatorMaxX; ImGuiID ReorderRequestTabId; - ImS8 ReorderRequestDir; + ImS16 ReorderRequestOffset; + ImS8 BeginCount; bool WantLayout; bool VisibleTabWasSubmitted; - short LastTabItemIdx; // For BeginTabItem()/EndTabItem() + bool TabsAddedNew; // Set to true when a new tab item or button has been added to the tab bar during last frame + ImS16 TabsActiveCount; // Number of tabs submitted this frame. + ImS16 LastTabItemIdx; // Index of last BeginTabItem() tab for use by EndTabItem() + float ItemSpacingY; ImVec2 FramePadding; // style.FramePadding locked at the time of BeginTabBar() + ImVec2 BackupCursorPos; ImGuiTextBuffer TabsNames; // For non-docking tab bar we re-append names in a contiguous buffer. ImGuiTabBar(); - int GetTabOrder(const ImGuiTabItem* tab) const { return Tabs.index_from_ptr(tab); } - const char* GetTabName(const ImGuiTabItem* tab) const - { - IM_ASSERT(tab->NameOffset != -1 && tab->NameOffset < TabsNames.Buf.Size); - return TabsNames.Buf.Data + tab->NameOffset; - } }; //----------------------------------------------------------------------------- -// Internal API -// No guarantee of forward compatibility here. +// [SECTION] Table support +//----------------------------------------------------------------------------- + +#define IM_COL32_DISABLE IM_COL32(0,0,0,1) // Special sentinel code which cannot be used as a regular color. +#define IMGUI_TABLE_MAX_COLUMNS 512 // May be further lifted + +// Our current column maximum is 64 but we may raise that in the future. +typedef ImS16 ImGuiTableColumnIdx; +typedef ImU16 ImGuiTableDrawChannelIdx; + +// [Internal] sizeof() ~ 112 +// We use the terminology "Enabled" to refer to a column that is not Hidden by user/api. +// We use the terminology "Clipped" to refer to a column that is out of sight because of scrolling/clipping. +// This is in contrast with some user-facing api such as IsItemVisible() / IsRectVisible() which use "Visible" to mean "not clipped". +struct ImGuiTableColumn +{ + ImGuiTableColumnFlags Flags; // Flags after some patching (not directly same as provided by user). See ImGuiTableColumnFlags_ + float WidthGiven; // Final/actual width visible == (MaxX - MinX), locked in TableUpdateLayout(). May be > WidthRequest to honor minimum width, may be < WidthRequest to honor shrinking columns down in tight space. + float MinX; // Absolute positions + float MaxX; + float WidthRequest; // Master width absolute value when !(Flags & _WidthStretch). When Stretch this is derived every frame from StretchWeight in TableUpdateLayout() + float WidthAuto; // Automatic width + float WidthMax; // Maximum width (FIXME: overwritten by each instance) + float StretchWeight; // Master width weight when (Flags & _WidthStretch). Often around ~1.0f initially. + float InitStretchWeightOrWidth; // Value passed to TableSetupColumn(). For Width it is a content width (_without padding_). + ImRect ClipRect; // Clipping rectangle for the column + ImGuiID UserID; // Optional, value passed to TableSetupColumn() + float WorkMinX; // Contents region min ~(MinX + CellPaddingX + CellSpacingX1) == cursor start position when entering column + float WorkMaxX; // Contents region max ~(MaxX - CellPaddingX - CellSpacingX2) + float ItemWidth; // Current item width for the column, preserved across rows + float ContentMaxXFrozen; // Contents maximum position for frozen rows (apart from headers), from which we can infer content width. + float ContentMaxXUnfrozen; + float ContentMaxXHeadersUsed; // Contents maximum position for headers rows (regardless of freezing). TableHeader() automatically softclip itself + report ideal desired size, to avoid creating extraneous draw calls + float ContentMaxXHeadersIdeal; + ImS16 NameOffset; // Offset into parent ColumnsNames[] + ImGuiTableColumnIdx DisplayOrder; // Index within Table's IndexToDisplayOrder[] (column may be reordered by users) + ImGuiTableColumnIdx IndexWithinEnabledSet; // Index within enabled/visible set (<= IndexToDisplayOrder) + ImGuiTableColumnIdx PrevEnabledColumn; // Index of prev enabled/visible column within Columns[], -1 if first enabled/visible column + ImGuiTableColumnIdx NextEnabledColumn; // Index of next enabled/visible column within Columns[], -1 if last enabled/visible column + ImGuiTableColumnIdx SortOrder; // Index of this column within sort specs, -1 if not sorting on this column, 0 for single-sort, may be >0 on multi-sort + ImGuiTableDrawChannelIdx DrawChannelCurrent; // Index within DrawSplitter.Channels[] + ImGuiTableDrawChannelIdx DrawChannelFrozen; // Draw channels for frozen rows (often headers) + ImGuiTableDrawChannelIdx DrawChannelUnfrozen; // Draw channels for unfrozen rows + bool IsEnabled; // IsUserEnabled && (Flags & ImGuiTableColumnFlags_Disabled) == 0 + bool IsUserEnabled; // Is the column not marked Hidden by the user? (unrelated to being off view, e.g. clipped by scrolling). + bool IsUserEnabledNextFrame; + bool IsVisibleX; // Is actually in view (e.g. overlapping the host window clipping rectangle, not scrolled). + bool IsVisibleY; + bool IsRequestOutput; // Return value for TableSetColumnIndex() / TableNextColumn(): whether we request user to output contents or not. + bool IsSkipItems; // Do we want item submissions to this column to be completely ignored (no layout will happen). + bool IsPreserveWidthAuto; + ImS8 NavLayerCurrent; // ImGuiNavLayer in 1 byte + ImU8 AutoFitQueue; // Queue of 8 values for the next 8 frames to request auto-fit + ImU8 CannotSkipItemsQueue; // Queue of 8 values for the next 8 frames to disable Clipped/SkipItem + ImU8 SortDirection : 2; // ImGuiSortDirection_Ascending or ImGuiSortDirection_Descending + ImU8 SortDirectionsAvailCount : 2; // Number of available sort directions (0 to 3) + ImU8 SortDirectionsAvailMask : 4; // Mask of available sort directions (1-bit each) + ImU8 SortDirectionsAvailList; // Ordered list of available sort directions (2-bits each, total 8-bits) + + ImGuiTableColumn() + { + memset(this, 0, sizeof(*this)); + StretchWeight = WidthRequest = -1.0f; + NameOffset = -1; + DisplayOrder = IndexWithinEnabledSet = -1; + PrevEnabledColumn = NextEnabledColumn = -1; + SortOrder = -1; + SortDirection = ImGuiSortDirection_None; + DrawChannelCurrent = DrawChannelFrozen = DrawChannelUnfrozen = (ImU8)-1; + } +}; + +// Transient cell data stored per row. +// sizeof() ~ 6 bytes +struct ImGuiTableCellData +{ + ImU32 BgColor; // Actual color + ImGuiTableColumnIdx Column; // Column number +}; + +// Parameters for TableAngledHeadersRowEx() +// This may end up being refactored for more general purpose. +// sizeof() ~ 12 bytes +struct ImGuiTableHeaderData +{ + ImGuiTableColumnIdx Index; // Column index + ImU32 TextColor; + ImU32 BgColor0; + ImU32 BgColor1; +}; + +// Per-instance data that needs preserving across frames (seemingly most others do not need to be preserved aside from debug needs. Does that means they could be moved to ImGuiTableTempData?) +// sizeof() ~ 24 bytes +struct ImGuiTableInstanceData +{ + ImGuiID TableInstanceID; + float LastOuterHeight; // Outer height from last frame + float LastTopHeadersRowHeight; // Height of first consecutive header rows from last frame (FIXME: this is used assuming consecutive headers are in same frozen set) + float LastFrozenHeight; // Height of frozen section from last frame + int HoveredRowLast; // Index of row which was hovered last frame. + int HoveredRowNext; // Index of row hovered this frame, set after encountering it. + + ImGuiTableInstanceData() { TableInstanceID = 0; LastOuterHeight = LastTopHeadersRowHeight = LastFrozenHeight = 0.0f; HoveredRowLast = HoveredRowNext = -1; } +}; + +// sizeof() ~ 592 bytes + heap allocs described in TableBeginInitMemory() +struct IMGUI_API ImGuiTable +{ + ImGuiID ID; + ImGuiTableFlags Flags; + void* RawData; // Single allocation to hold Columns[], DisplayOrderToIndex[], and RowCellData[] + ImGuiTableTempData* TempData; // Transient data while table is active. Point within g.CurrentTableStack[] + ImSpan Columns; // Point within RawData[] + ImSpan DisplayOrderToIndex; // Point within RawData[]. Store display order of columns (when not reordered, the values are 0...Count-1) + ImSpan RowCellData; // Point within RawData[]. Store cells background requests for current row. + ImBitArrayPtr EnabledMaskByDisplayOrder; // Column DisplayOrder -> IsEnabled map + ImBitArrayPtr EnabledMaskByIndex; // Column Index -> IsEnabled map (== not hidden by user/api) in a format adequate for iterating column without touching cold data + ImBitArrayPtr VisibleMaskByIndex; // Column Index -> IsVisibleX|IsVisibleY map (== not hidden by user/api && not hidden by scrolling/cliprect) + ImGuiTableFlags SettingsLoadedFlags; // Which data were loaded from the .ini file (e.g. when order is not altered we won't save order) + int SettingsOffset; // Offset in g.SettingsTables + int LastFrameActive; + int ColumnsCount; // Number of columns declared in BeginTable() + int CurrentRow; + int CurrentColumn; + ImS16 InstanceCurrent; // Count of BeginTable() calls with same ID in the same frame (generally 0). This is a little bit similar to BeginCount for a window, but multiple tables with the same ID are multiple tables, they are just synced. + ImS16 InstanceInteracted; // Mark which instance (generally 0) of the same ID is being interacted with + float RowPosY1; + float RowPosY2; + float RowMinHeight; // Height submitted to TableNextRow() + float RowCellPaddingY; // Top and bottom padding. Reloaded during row change. + float RowTextBaseline; + float RowIndentOffsetX; + ImGuiTableRowFlags RowFlags : 16; // Current row flags, see ImGuiTableRowFlags_ + ImGuiTableRowFlags LastRowFlags : 16; + int RowBgColorCounter; // Counter for alternating background colors (can be fast-forwarded by e.g clipper), not same as CurrentRow because header rows typically don't increase this. + ImU32 RowBgColor[2]; // Background color override for current row. + ImU32 BorderColorStrong; + ImU32 BorderColorLight; + float BorderX1; + float BorderX2; + float HostIndentX; + float MinColumnWidth; + float OuterPaddingX; + float CellPaddingX; // Padding from each borders. Locked in BeginTable()/Layout. + float CellSpacingX1; // Spacing between non-bordered cells. Locked in BeginTable()/Layout. + float CellSpacingX2; + float InnerWidth; // User value passed to BeginTable(), see comments at the top of BeginTable() for details. + float ColumnsGivenWidth; // Sum of current column width + float ColumnsAutoFitWidth; // Sum of ideal column width in order nothing to be clipped, used for auto-fitting and content width submission in outer window + float ColumnsStretchSumWeights; // Sum of weight of all enabled stretching columns + float ResizedColumnNextWidth; + float ResizeLockMinContentsX2; // Lock minimum contents width while resizing down in order to not create feedback loops. But we allow growing the table. + float RefScale; // Reference scale to be able to rescale columns on font/dpi changes. + float AngledHeadersHeight; // Set by TableAngledHeadersRow(), used in TableUpdateLayout() + float AngledHeadersSlope; // Set by TableAngledHeadersRow(), used in TableUpdateLayout() + ImRect OuterRect; // Note: for non-scrolling table, OuterRect.Max.y is often FLT_MAX until EndTable(), unless a height has been specified in BeginTable(). + ImRect InnerRect; // InnerRect but without decoration. As with OuterRect, for non-scrolling tables, InnerRect.Max.y is " + ImRect WorkRect; + ImRect InnerClipRect; + ImRect BgClipRect; // We use this to cpu-clip cell background color fill, evolve during the frame as we cross frozen rows boundaries + ImRect Bg0ClipRectForDrawCmd; // Actual ImDrawCmd clip rect for BG0/1 channel. This tends to be == OuterWindow->ClipRect at BeginTable() because output in BG0/BG1 is cpu-clipped + ImRect Bg2ClipRectForDrawCmd; // Actual ImDrawCmd clip rect for BG2 channel. This tends to be a correct, tight-fit, because output to BG2 are done by widgets relying on regular ClipRect. + ImRect HostClipRect; // This is used to check if we can eventually merge our columns draw calls into the current draw call of the current window. + ImRect HostBackupInnerClipRect; // Backup of InnerWindow->ClipRect during PushTableBackground()/PopTableBackground() + ImGuiWindow* OuterWindow; // Parent window for the table + ImGuiWindow* InnerWindow; // Window holding the table data (== OuterWindow or a child window) + ImGuiTextBuffer ColumnsNames; // Contiguous buffer holding columns names + ImDrawListSplitter* DrawSplitter; // Shortcut to TempData->DrawSplitter while in table. Isolate draw commands per columns to avoid switching clip rect constantly + ImGuiTableInstanceData InstanceDataFirst; + ImVector InstanceDataExtra; // FIXME-OPT: Using a small-vector pattern would be good. + ImGuiTableColumnSortSpecs SortSpecsSingle; + ImVector SortSpecsMulti; // FIXME-OPT: Using a small-vector pattern would be good. + ImGuiTableSortSpecs SortSpecs; // Public facing sorts specs, this is what we return in TableGetSortSpecs() + ImGuiTableColumnIdx SortSpecsCount; + ImGuiTableColumnIdx ColumnsEnabledCount; // Number of enabled columns (<= ColumnsCount) + ImGuiTableColumnIdx ColumnsEnabledFixedCount; // Number of enabled columns using fixed width (<= ColumnsCount) + ImGuiTableColumnIdx DeclColumnsCount; // Count calls to TableSetupColumn() + ImGuiTableColumnIdx AngledHeadersCount; // Count columns with angled headers + ImGuiTableColumnIdx HoveredColumnBody; // Index of column whose visible region is being hovered. Important: == ColumnsCount when hovering empty region after the right-most column! + ImGuiTableColumnIdx HoveredColumnBorder; // Index of column whose right-border is being hovered (for resizing). + ImGuiTableColumnIdx HighlightColumnHeader; // Index of column which should be highlighted. + ImGuiTableColumnIdx AutoFitSingleColumn; // Index of single column requesting auto-fit. + ImGuiTableColumnIdx ResizedColumn; // Index of column being resized. Reset when InstanceCurrent==0. + ImGuiTableColumnIdx LastResizedColumn; // Index of column being resized from previous frame. + ImGuiTableColumnIdx HeldHeaderColumn; // Index of column header being held. + ImGuiTableColumnIdx ReorderColumn; // Index of column being reordered. (not cleared) + ImGuiTableColumnIdx ReorderColumnDir; // -1 or +1 + ImGuiTableColumnIdx LeftMostEnabledColumn; // Index of left-most non-hidden column. + ImGuiTableColumnIdx RightMostEnabledColumn; // Index of right-most non-hidden column. + ImGuiTableColumnIdx LeftMostStretchedColumn; // Index of left-most stretched column. + ImGuiTableColumnIdx RightMostStretchedColumn; // Index of right-most stretched column. + ImGuiTableColumnIdx ContextPopupColumn; // Column right-clicked on, of -1 if opening context menu from a neutral/empty spot + ImGuiTableColumnIdx FreezeRowsRequest; // Requested frozen rows count + ImGuiTableColumnIdx FreezeRowsCount; // Actual frozen row count (== FreezeRowsRequest, or == 0 when no scrolling offset) + ImGuiTableColumnIdx FreezeColumnsRequest; // Requested frozen columns count + ImGuiTableColumnIdx FreezeColumnsCount; // Actual frozen columns count (== FreezeColumnsRequest, or == 0 when no scrolling offset) + ImGuiTableColumnIdx RowCellDataCurrent; // Index of current RowCellData[] entry in current row + ImGuiTableDrawChannelIdx DummyDrawChannel; // Redirect non-visible columns here. + ImGuiTableDrawChannelIdx Bg2DrawChannelCurrent; // For Selectable() and other widgets drawing across columns after the freezing line. Index within DrawSplitter.Channels[] + ImGuiTableDrawChannelIdx Bg2DrawChannelUnfrozen; + ImS8 NavLayer; // ImGuiNavLayer at the time of BeginTable(). + bool IsLayoutLocked; // Set by TableUpdateLayout() which is called when beginning the first row. + bool IsInsideRow; // Set when inside TableBeginRow()/TableEndRow(). + bool IsInitializing; + bool IsSortSpecsDirty; + bool IsUsingHeaders; // Set when the first row had the ImGuiTableRowFlags_Headers flag. + bool IsContextPopupOpen; // Set when default context menu is open (also see: ContextPopupColumn, InstanceInteracted). + bool DisableDefaultContextMenu; // Disable default context menu contents. You may submit your own using TableBeginContextMenuPopup()/EndPopup() + bool IsSettingsRequestLoad; + bool IsSettingsDirty; // Set when table settings have changed and needs to be reported into ImGuiTableSetttings data. + bool IsDefaultDisplayOrder; // Set when display order is unchanged from default (DisplayOrder contains 0...Count-1) + bool IsResetAllRequest; + bool IsResetDisplayOrderRequest; + bool IsUnfrozenRows; // Set when we got past the frozen row. + bool IsDefaultSizingPolicy; // Set if user didn't explicitly set a sizing policy in BeginTable() + bool IsActiveIdAliveBeforeTable; + bool IsActiveIdInTable; + bool HasScrollbarYCurr; // Whether ANY instance of this table had a vertical scrollbar during the current frame. + bool HasScrollbarYPrev; // Whether ANY instance of this table had a vertical scrollbar during the previous. + bool MemoryCompacted; + bool HostSkipItems; // Backup of InnerWindow->SkipItem at the end of BeginTable(), because we will overwrite InnerWindow->SkipItem on a per-column basis + + ImGuiTable() { memset(this, 0, sizeof(*this)); LastFrameActive = -1; } + ~ImGuiTable() { IM_FREE(RawData); } +}; + +// Transient data that are only needed between BeginTable() and EndTable(), those buffers are shared (1 per level of stacked table). +// - Accessing those requires chasing an extra pointer so for very frequently used data we leave them in the main table structure. +// - We also leave out of this structure data that tend to be particularly useful for debugging/metrics. +// FIXME-TABLE: more transient data could be stored in a stacked ImGuiTableTempData: e.g. SortSpecs. +// sizeof() ~ 136 bytes. +struct IMGUI_API ImGuiTableTempData +{ + int TableIndex; // Index in g.Tables.Buf[] pool + float LastTimeActive; // Last timestamp this structure was used + float AngledHeadersExtraWidth; // Used in EndTable() + ImVector AngledHeadersRequests; // Used in TableAngledHeadersRow() + + ImVec2 UserOuterSize; // outer_size.x passed to BeginTable() + ImDrawListSplitter DrawSplitter; + + ImRect HostBackupWorkRect; // Backup of InnerWindow->WorkRect at the end of BeginTable() + ImRect HostBackupParentWorkRect; // Backup of InnerWindow->ParentWorkRect at the end of BeginTable() + ImVec2 HostBackupPrevLineSize; // Backup of InnerWindow->DC.PrevLineSize at the end of BeginTable() + ImVec2 HostBackupCurrLineSize; // Backup of InnerWindow->DC.CurrLineSize at the end of BeginTable() + ImVec2 HostBackupCursorMaxPos; // Backup of InnerWindow->DC.CursorMaxPos at the end of BeginTable() + ImVec1 HostBackupColumnsOffset; // Backup of OuterWindow->DC.ColumnsOffset at the end of BeginTable() + float HostBackupItemWidth; // Backup of OuterWindow->DC.ItemWidth at the end of BeginTable() + int HostBackupItemWidthStackSize;//Backup of OuterWindow->DC.ItemWidthStack.Size at the end of BeginTable() + + ImGuiTableTempData() { memset(this, 0, sizeof(*this)); LastTimeActive = -1.0f; } +}; + +// sizeof() ~ 16 +struct ImGuiTableColumnSettings +{ + float WidthOrWeight; + ImGuiID UserID; + ImGuiTableColumnIdx Index; + ImGuiTableColumnIdx DisplayOrder; + ImGuiTableColumnIdx SortOrder; + ImU8 SortDirection : 2; + ImS8 IsEnabled : 2; // "Visible" in ini file + ImU8 IsStretch : 1; + + ImGuiTableColumnSettings() + { + WidthOrWeight = 0.0f; + UserID = 0; + Index = -1; + DisplayOrder = SortOrder = -1; + SortDirection = ImGuiSortDirection_None; + IsEnabled = -1; + IsStretch = 0; + } +}; + +// This is designed to be stored in a single ImChunkStream (1 header followed by N ImGuiTableColumnSettings, etc.) +struct ImGuiTableSettings +{ + ImGuiID ID; // Set to 0 to invalidate/delete the setting + ImGuiTableFlags SaveFlags; // Indicate data we want to save using the Resizable/Reorderable/Sortable/Hideable flags (could be using its own flags..) + float RefScale; // Reference scale to be able to rescale columns on font/dpi changes. + ImGuiTableColumnIdx ColumnsCount; + ImGuiTableColumnIdx ColumnsCountMax; // Maximum number of columns this settings instance can store, we can recycle a settings instance with lower number of columns but not higher + bool WantApply; // Set when loaded from .ini data (to enable merging/loading .ini data into an already running context) + + ImGuiTableSettings() { memset(this, 0, sizeof(*this)); } + ImGuiTableColumnSettings* GetColumnSettings() { return (ImGuiTableColumnSettings*)(this + 1); } +}; + +//----------------------------------------------------------------------------- +// [SECTION] ImGui internal API +// No guarantee of forward compatibility here! //----------------------------------------------------------------------------- namespace ImGui { + // Windows // We should always have a CurrentWindow in the stack (there is an implicit "Debug" window) - // If this ever crash because g.CurrentWindow is NULL it means that either + // If this ever crashes because g.CurrentWindow is NULL, it means that either: // - ImGui::NewFrame() has never been called, which is illegal. // - You are calling ImGui functions after ImGui::EndFrame()/ImGui::Render() and before the next ImGui::NewFrame(), which is also illegal. + IMGUI_API ImGuiIO& GetIO(ImGuiContext* ctx); + IMGUI_API ImGuiPlatformIO& GetPlatformIO(ImGuiContext* ctx); inline ImGuiWindow* GetCurrentWindowRead() { ImGuiContext& g = *GImGui; return g.CurrentWindow; } inline ImGuiWindow* GetCurrentWindow() { ImGuiContext& g = *GImGui; g.CurrentWindow->WriteAccessed = true; return g.CurrentWindow; } IMGUI_API ImGuiWindow* FindWindowByID(ImGuiID id); IMGUI_API ImGuiWindow* FindWindowByName(const char* name); - IMGUI_API void FocusWindow(ImGuiWindow* window); - IMGUI_API void FocusTopMostWindowUnderOne(ImGuiWindow* under_this_window, ImGuiWindow* ignore_window); - IMGUI_API void BringWindowToFocusFront(ImGuiWindow* window); - IMGUI_API void BringWindowToDisplayFront(ImGuiWindow* window); - IMGUI_API void BringWindowToDisplayBack(ImGuiWindow* window); IMGUI_API void UpdateWindowParentAndRootLinks(ImGuiWindow* window, ImGuiWindowFlags flags, ImGuiWindow* parent_window); - IMGUI_API ImVec2 CalcWindowExpectedSize(ImGuiWindow* window); - IMGUI_API bool IsWindowChildOf(ImGuiWindow* window, ImGuiWindow* potential_parent); + IMGUI_API void UpdateWindowSkipRefresh(ImGuiWindow* window); + IMGUI_API ImVec2 CalcWindowNextAutoFitSize(ImGuiWindow* window); + IMGUI_API bool IsWindowChildOf(ImGuiWindow* window, ImGuiWindow* potential_parent, bool popup_hierarchy, bool dock_hierarchy); + IMGUI_API bool IsWindowWithinBeginStackOf(ImGuiWindow* window, ImGuiWindow* potential_parent); + IMGUI_API bool IsWindowAbove(ImGuiWindow* potential_above, ImGuiWindow* potential_below); IMGUI_API bool IsWindowNavFocusable(ImGuiWindow* window); - IMGUI_API ImRect GetWindowAllowedExtentRect(ImGuiWindow* window); IMGUI_API void SetWindowPos(ImGuiWindow* window, const ImVec2& pos, ImGuiCond cond = 0); IMGUI_API void SetWindowSize(ImGuiWindow* window, const ImVec2& size, ImGuiCond cond = 0); IMGUI_API void SetWindowCollapsed(ImGuiWindow* window, bool collapsed, ImGuiCond cond = 0); - IMGUI_API void GcCompactTransientWindowBuffers(ImGuiWindow* window); - IMGUI_API void GcAwakeTransientWindowBuffers(ImGuiWindow* window); + IMGUI_API void SetWindowHitTestHole(ImGuiWindow* window, const ImVec2& pos, const ImVec2& size); + IMGUI_API void SetWindowHiddenAndSkipItemsForCurrentFrame(ImGuiWindow* window); + inline void SetWindowParentWindowForFocusRoute(ImGuiWindow* window, ImGuiWindow* parent_window) { window->ParentWindowForFocusRoute = parent_window; } // You may also use SetNextWindowClass()'s FocusRouteParentWindowId field. + inline ImRect WindowRectAbsToRel(ImGuiWindow* window, const ImRect& r) { ImVec2 off = window->DC.CursorStartPos; return ImRect(r.Min.x - off.x, r.Min.y - off.y, r.Max.x - off.x, r.Max.y - off.y); } + inline ImRect WindowRectRelToAbs(ImGuiWindow* window, const ImRect& r) { ImVec2 off = window->DC.CursorStartPos; return ImRect(r.Min.x + off.x, r.Min.y + off.y, r.Max.x + off.x, r.Max.y + off.y); } + inline ImVec2 WindowPosAbsToRel(ImGuiWindow* window, const ImVec2& p) { ImVec2 off = window->DC.CursorStartPos; return ImVec2(p.x - off.x, p.y - off.y); } + inline ImVec2 WindowPosRelToAbs(ImGuiWindow* window, const ImVec2& p) { ImVec2 off = window->DC.CursorStartPos; return ImVec2(p.x + off.x, p.y + off.y); } + // Windows: Display Order and Focus Order + IMGUI_API void FocusWindow(ImGuiWindow* window, ImGuiFocusRequestFlags flags = 0); + IMGUI_API void FocusTopMostWindowUnderOne(ImGuiWindow* under_this_window, ImGuiWindow* ignore_window, ImGuiViewport* filter_viewport, ImGuiFocusRequestFlags flags); + IMGUI_API void BringWindowToFocusFront(ImGuiWindow* window); + IMGUI_API void BringWindowToDisplayFront(ImGuiWindow* window); + IMGUI_API void BringWindowToDisplayBack(ImGuiWindow* window); + IMGUI_API void BringWindowToDisplayBehind(ImGuiWindow* window, ImGuiWindow* above_window); + IMGUI_API int FindWindowDisplayIndex(ImGuiWindow* window); + IMGUI_API ImGuiWindow* FindBottomMostVisibleWindowWithinBeginStack(ImGuiWindow* window); + + // Windows: Idle, Refresh Policies [EXPERIMENTAL] + IMGUI_API void SetNextWindowRefreshPolicy(ImGuiWindowRefreshFlags flags); + + // Fonts, drawing IMGUI_API void SetCurrentFont(ImFont* font); inline ImFont* GetDefaultFont() { ImGuiContext& g = *GImGui; return g.IO.FontDefault ? g.IO.FontDefault : g.IO.Fonts->Fonts[0]; } - inline ImDrawList* GetForegroundDrawList(ImGuiWindow*) { ImGuiContext& g = *GImGui; return &g.ForegroundDrawList; } // This seemingly unnecessary wrapper simplifies compatibility between the 'master' and 'docking' branches. + IMGUI_API void PushPasswordFont(); + inline ImDrawList* GetForegroundDrawList(ImGuiWindow* window) { return GetForegroundDrawList(window->Viewport); } + IMGUI_API void AddDrawListToDrawDataEx(ImDrawData* draw_data, ImVector* out_list, ImDrawList* draw_list); // Init - IMGUI_API void Initialize(ImGuiContext* context); - IMGUI_API void Shutdown(ImGuiContext* context); // Since 1.60 this is a _private_ function. You can call DestroyContext() to destroy the context created by CreateContext(). + IMGUI_API void Initialize(); + IMGUI_API void Shutdown(); // Since 1.60 this is a _private_ function. You can call DestroyContext() to destroy the context created by CreateContext(). // NewFrame + IMGUI_API void UpdateInputEvents(bool trickle_fast_inputs); IMGUI_API void UpdateHoveredWindowAndCaptureFlags(); + IMGUI_API void FindHoveredWindowEx(const ImVec2& pos, bool find_first_and_in_any_viewport, ImGuiWindow** out_hovered_window, ImGuiWindow** out_hovered_window_under_moving_window); IMGUI_API void StartMouseMovingWindow(ImGuiWindow* window); + IMGUI_API void StartMouseMovingWindowOrNode(ImGuiWindow* window, ImGuiDockNode* node, bool undock); IMGUI_API void UpdateMouseMovingWindowNewFrame(); IMGUI_API void UpdateMouseMovingWindowEndFrame(); + // Generic context hooks + IMGUI_API ImGuiID AddContextHook(ImGuiContext* context, const ImGuiContextHook* hook); + IMGUI_API void RemoveContextHook(ImGuiContext* context, ImGuiID hook_to_remove); + IMGUI_API void CallContextHooks(ImGuiContext* context, ImGuiContextHookType type); + + // Viewports + IMGUI_API void TranslateWindowsInViewport(ImGuiViewportP* viewport, const ImVec2& old_pos, const ImVec2& new_pos, const ImVec2& old_size, const ImVec2& new_size); + IMGUI_API void ScaleWindowsInViewport(ImGuiViewportP* viewport, float scale); + IMGUI_API void DestroyPlatformWindow(ImGuiViewportP* viewport); + IMGUI_API void SetWindowViewport(ImGuiWindow* window, ImGuiViewportP* viewport); + IMGUI_API void SetCurrentViewport(ImGuiWindow* window, ImGuiViewportP* viewport); + IMGUI_API const ImGuiPlatformMonitor* GetViewportPlatformMonitor(ImGuiViewport* viewport); + IMGUI_API ImGuiViewportP* FindHoveredViewportFromPlatformWindowStack(const ImVec2& mouse_platform_pos); + // Settings IMGUI_API void MarkIniSettingsDirty(); IMGUI_API void MarkIniSettingsDirty(ImGuiWindow* window); - IMGUI_API ImGuiWindowSettings* CreateNewWindowSettings(const char* name); - IMGUI_API ImGuiWindowSettings* FindWindowSettings(ImGuiID id); - IMGUI_API ImGuiWindowSettings* FindOrCreateWindowSettings(const char* name); + IMGUI_API void ClearIniSettings(); + IMGUI_API void AddSettingsHandler(const ImGuiSettingsHandler* handler); + IMGUI_API void RemoveSettingsHandler(const char* type_name); IMGUI_API ImGuiSettingsHandler* FindSettingsHandler(const char* type_name); + // Settings - Windows + IMGUI_API ImGuiWindowSettings* CreateNewWindowSettings(const char* name); + IMGUI_API ImGuiWindowSettings* FindWindowSettingsByID(ImGuiID id); + IMGUI_API ImGuiWindowSettings* FindWindowSettingsByWindow(ImGuiWindow* window); + IMGUI_API void ClearWindowSettings(const char* name); + + // Localization + IMGUI_API void LocalizeRegisterEntries(const ImGuiLocEntry* entries, int count); + inline const char* LocalizeGetMsg(ImGuiLocKey key) { ImGuiContext& g = *GImGui; const char* msg = g.LocalizationTable[key]; return msg ? msg : "*Missing Text*"; } + // Scrolling - IMGUI_API void SetScrollX(ImGuiWindow* window, float new_scroll_x); - IMGUI_API void SetScrollY(ImGuiWindow* window, float new_scroll_y); - IMGUI_API void SetScrollFromPosX(ImGuiWindow* window, float local_x, float center_x_ratio = 0.5f); - IMGUI_API void SetScrollFromPosY(ImGuiWindow* window, float local_y, float center_y_ratio = 0.5f); - IMGUI_API ImVec2 ScrollToBringRectIntoView(ImGuiWindow* window, const ImRect& item_rect); + IMGUI_API void SetScrollX(ImGuiWindow* window, float scroll_x); + IMGUI_API void SetScrollY(ImGuiWindow* window, float scroll_y); + IMGUI_API void SetScrollFromPosX(ImGuiWindow* window, float local_x, float center_x_ratio); + IMGUI_API void SetScrollFromPosY(ImGuiWindow* window, float local_y, float center_y_ratio); + + // Early work-in-progress API (ScrollToItem() will become public) + IMGUI_API void ScrollToItem(ImGuiScrollFlags flags = 0); + IMGUI_API void ScrollToRect(ImGuiWindow* window, const ImRect& rect, ImGuiScrollFlags flags = 0); + IMGUI_API ImVec2 ScrollToRectEx(ImGuiWindow* window, const ImRect& rect, ImGuiScrollFlags flags = 0); +//#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + inline void ScrollToBringRectIntoView(ImGuiWindow* window, const ImRect& rect) { ScrollToRect(window, rect, ImGuiScrollFlags_KeepVisibleEdgeY); } +//#endif // Basic Accessors - inline ImGuiID GetItemID() { ImGuiContext& g = *GImGui; return g.CurrentWindow->DC.LastItemId; } + inline ImGuiItemStatusFlags GetItemStatusFlags() { ImGuiContext& g = *GImGui; return g.LastItemData.StatusFlags; } + inline ImGuiItemFlags GetItemFlags() { ImGuiContext& g = *GImGui; return g.LastItemData.ItemFlags; } inline ImGuiID GetActiveID() { ImGuiContext& g = *GImGui; return g.ActiveId; } inline ImGuiID GetFocusID() { ImGuiContext& g = *GImGui; return g.NavId; } IMGUI_API void SetActiveID(ImGuiID id, ImGuiWindow* window); @@ -1535,155 +3349,452 @@ namespace ImGui IMGUI_API ImGuiID GetHoveredID(); IMGUI_API void SetHoveredID(ImGuiID id); IMGUI_API void KeepAliveID(ImGuiID id); - IMGUI_API void MarkItemEdited(ImGuiID id); - IMGUI_API void PushOverrideID(ImGuiID id); + IMGUI_API void MarkItemEdited(ImGuiID id); // Mark data associated to given item as "edited", used by IsItemDeactivatedAfterEdit() function. + IMGUI_API void PushOverrideID(ImGuiID id); // Push given value as-is at the top of the ID stack (whereas PushID combines old and new hashes) + IMGUI_API ImGuiID GetIDWithSeed(const char* str_id_begin, const char* str_id_end, ImGuiID seed); + IMGUI_API ImGuiID GetIDWithSeed(int n, ImGuiID seed); // Basic Helpers for widget code - IMGUI_API void ItemSize(const ImVec2& size, float text_offset_y = 0.0f); - IMGUI_API void ItemSize(const ImRect& bb, float text_offset_y = 0.0f); - IMGUI_API bool ItemAdd(const ImRect& bb, ImGuiID id, const ImRect* nav_bb = NULL); - IMGUI_API bool ItemHoverable(const ImRect& bb, ImGuiID id); - IMGUI_API bool IsClippedEx(const ImRect& bb, ImGuiID id, bool clip_even_when_logged); - IMGUI_API bool FocusableItemRegister(ImGuiWindow* window, ImGuiID id); // Return true if focus is requested - IMGUI_API void FocusableItemUnregister(ImGuiWindow* window); + IMGUI_API void ItemSize(const ImVec2& size, float text_baseline_y = -1.0f); + inline void ItemSize(const ImRect& bb, float text_baseline_y = -1.0f) { ItemSize(bb.GetSize(), text_baseline_y); } // FIXME: This is a misleading API since we expect CursorPos to be bb.Min. + IMGUI_API bool ItemAdd(const ImRect& bb, ImGuiID id, const ImRect* nav_bb = NULL, ImGuiItemFlags extra_flags = 0); + IMGUI_API bool ItemHoverable(const ImRect& bb, ImGuiID id, ImGuiItemFlags item_flags); + IMGUI_API bool IsWindowContentHoverable(ImGuiWindow* window, ImGuiHoveredFlags flags = 0); + IMGUI_API bool IsClippedEx(const ImRect& bb, ImGuiID id); + IMGUI_API void SetLastItemData(ImGuiID item_id, ImGuiItemFlags item_flags, ImGuiItemStatusFlags status_flags, const ImRect& item_rect); IMGUI_API ImVec2 CalcItemSize(ImVec2 size, float default_w, float default_h); IMGUI_API float CalcWrapWidthForPos(const ImVec2& pos, float wrap_pos_x); IMGUI_API void PushMultiItemsWidths(int components, float width_full); - IMGUI_API void PushItemFlag(ImGuiItemFlags option, bool enabled); - IMGUI_API void PopItemFlag(); - IMGUI_API bool IsItemToggledSelection(); // Was the last item selection toggled? (after Selectable(), TreeNode() etc. We only returns toggle _event_ in order to handle clipping correctly) - IMGUI_API ImVec2 GetContentRegionMaxAbs(); IMGUI_API void ShrinkWidths(ImGuiShrinkWidthItem* items, int count, float width_excess); - // Logging/Capture - IMGUI_API void LogBegin(ImGuiLogType type, int auto_open_depth); // -> BeginCapture() when we design v2 api, for now stay under the radar by using the old name. - IMGUI_API void LogToBuffer(int auto_open_depth = -1); // Start logging/capturing to internal buffer + // Parameter stacks (shared) + IMGUI_API const ImGuiStyleVarInfo* GetStyleVarInfo(ImGuiStyleVar idx); + IMGUI_API void BeginDisabledOverrideReenable(); + IMGUI_API void EndDisabledOverrideReenable(); - // Popups, Modals, Tooltips - IMGUI_API void OpenPopupEx(ImGuiID id); + // Logging/Capture + IMGUI_API void LogBegin(ImGuiLogFlags flags, int auto_open_depth); // -> BeginCapture() when we design v2 api, for now stay under the radar by using the old name. + IMGUI_API void LogToBuffer(int auto_open_depth = -1); // Start logging/capturing to internal buffer + IMGUI_API void LogRenderedText(const ImVec2* ref_pos, const char* text, const char* text_end = NULL); + IMGUI_API void LogSetNextTextDecoration(const char* prefix, const char* suffix); + + // Childs + IMGUI_API bool BeginChildEx(const char* name, ImGuiID id, const ImVec2& size_arg, ImGuiChildFlags child_flags, ImGuiWindowFlags window_flags); + + // Popups, Modals + IMGUI_API bool BeginPopupEx(ImGuiID id, ImGuiWindowFlags extra_window_flags); + IMGUI_API bool BeginPopupMenuEx(ImGuiID id, const char* label, ImGuiWindowFlags extra_window_flags); + IMGUI_API void OpenPopupEx(ImGuiID id, ImGuiPopupFlags popup_flags = ImGuiPopupFlags_None); IMGUI_API void ClosePopupToLevel(int remaining, bool restore_focus_to_window_under_popup); IMGUI_API void ClosePopupsOverWindow(ImGuiWindow* ref_window, bool restore_focus_to_window_under_popup); - IMGUI_API bool IsPopupOpen(ImGuiID id); // Test for id within current popup stack level (currently begin-ed into); this doesn't scan the whole popup stack! - IMGUI_API bool BeginPopupEx(ImGuiID id, ImGuiWindowFlags extra_flags); - IMGUI_API void BeginTooltipEx(ImGuiWindowFlags extra_flags, bool override_previous_tooltip = true); + IMGUI_API void ClosePopupsExceptModals(); + IMGUI_API bool IsPopupOpen(ImGuiID id, ImGuiPopupFlags popup_flags); + IMGUI_API ImRect GetPopupAllowedExtentRect(ImGuiWindow* window); IMGUI_API ImGuiWindow* GetTopMostPopupModal(); + IMGUI_API ImGuiWindow* GetTopMostAndVisiblePopupModal(); + IMGUI_API ImGuiWindow* FindBlockingModal(ImGuiWindow* window); IMGUI_API ImVec2 FindBestWindowPosForPopup(ImGuiWindow* window); - IMGUI_API ImVec2 FindBestWindowPosForPopupEx(const ImVec2& ref_pos, const ImVec2& size, ImGuiDir* last_dir, const ImRect& r_outer, const ImRect& r_avoid, ImGuiPopupPositionPolicy policy = ImGuiPopupPositionPolicy_Default); + IMGUI_API ImVec2 FindBestWindowPosForPopupEx(const ImVec2& ref_pos, const ImVec2& size, ImGuiDir* last_dir, const ImRect& r_outer, const ImRect& r_avoid, ImGuiPopupPositionPolicy policy); - // Navigation + // Tooltips + IMGUI_API bool BeginTooltipEx(ImGuiTooltipFlags tooltip_flags, ImGuiWindowFlags extra_window_flags); + IMGUI_API bool BeginTooltipHidden(); + + // Menus + IMGUI_API bool BeginViewportSideBar(const char* name, ImGuiViewport* viewport, ImGuiDir dir, float size, ImGuiWindowFlags window_flags); + IMGUI_API bool BeginMenuEx(const char* label, const char* icon, bool enabled = true); + IMGUI_API bool MenuItemEx(const char* label, const char* icon, const char* shortcut = NULL, bool selected = false, bool enabled = true); + + // Combos + IMGUI_API bool BeginComboPopup(ImGuiID popup_id, const ImRect& bb, ImGuiComboFlags flags); + IMGUI_API bool BeginComboPreview(); + IMGUI_API void EndComboPreview(); + + // Keyboard/Gamepad Navigation IMGUI_API void NavInitWindow(ImGuiWindow* window, bool force_reinit); + IMGUI_API void NavInitRequestApplyResult(); IMGUI_API bool NavMoveRequestButNoResultYet(); + IMGUI_API void NavMoveRequestSubmit(ImGuiDir move_dir, ImGuiDir clip_dir, ImGuiNavMoveFlags move_flags, ImGuiScrollFlags scroll_flags); + IMGUI_API void NavMoveRequestForward(ImGuiDir move_dir, ImGuiDir clip_dir, ImGuiNavMoveFlags move_flags, ImGuiScrollFlags scroll_flags); + IMGUI_API void NavMoveRequestResolveWithLastItem(ImGuiNavItemData* result); + IMGUI_API void NavMoveRequestResolveWithPastTreeNode(ImGuiNavItemData* result, ImGuiTreeNodeStackData* tree_node_data); IMGUI_API void NavMoveRequestCancel(); - IMGUI_API void NavMoveRequestForward(ImGuiDir move_dir, ImGuiDir clip_dir, const ImRect& bb_rel, ImGuiNavMoveFlags move_flags); + IMGUI_API void NavMoveRequestApplyResult(); IMGUI_API void NavMoveRequestTryWrapping(ImGuiWindow* window, ImGuiNavMoveFlags move_flags); - IMGUI_API float GetNavInputAmount(ImGuiNavInput n, ImGuiInputReadMode mode); - IMGUI_API ImVec2 GetNavInputAmount2d(ImGuiNavDirSourceFlags dir_sources, ImGuiInputReadMode mode, float slow_factor = 0.0f, float fast_factor = 0.0f); - IMGUI_API int CalcTypematicPressedRepeatAmount(float t, float t_prev, float repeat_delay, float repeat_rate); - IMGUI_API void ActivateItem(ImGuiID id); // Remotely activate a button, checkbox, tree node etc. given its unique ID. activation is queued and processed on the next frame when the item is encountered again. - IMGUI_API void SetNavID(ImGuiID id, int nav_layer); - IMGUI_API void SetNavIDWithRectRel(ImGuiID id, int nav_layer, const ImRect& rect_rel); + IMGUI_API void NavHighlightActivated(ImGuiID id); + IMGUI_API void NavClearPreferredPosForAxis(ImGuiAxis axis); + IMGUI_API void SetNavCursorVisibleAfterMove(); + IMGUI_API void NavUpdateCurrentWindowIsScrollPushableX(); + IMGUI_API void SetNavWindow(ImGuiWindow* window); + IMGUI_API void SetNavID(ImGuiID id, ImGuiNavLayer nav_layer, ImGuiID focus_scope_id, const ImRect& rect_rel); + IMGUI_API void SetNavFocusScope(ImGuiID focus_scope_id); + + // Focus/Activation + // This should be part of a larger set of API: FocusItem(offset = -1), FocusItemByID(id), ActivateItem(offset = -1), ActivateItemByID(id) etc. which are + // much harder to design and implement than expected. I have a couple of private branches on this matter but it's not simple. For now implementing the easy ones. + IMGUI_API void FocusItem(); // Focus last item (no selection/activation). + IMGUI_API void ActivateItemByID(ImGuiID id); // Activate an item by ID (button, checkbox, tree node etc.). Activation is queued and processed on the next frame when the item is encountered again. // Inputs - IMGUI_API bool IsMouseDragPastThreshold(int button, float lock_threshold = -1.0f); - inline bool IsKeyPressedMap(ImGuiKey key, bool repeat = true) { const int key_index = GImGui->IO.KeyMap[key]; return (key_index >= 0) ? IsKeyPressed(key_index, repeat) : false; } - inline bool IsNavInputDown(ImGuiNavInput n) { return GImGui->IO.NavInputs[n] > 0.0f; } - inline bool IsNavInputPressed(ImGuiNavInput n, ImGuiInputReadMode mode) { return GetNavInputAmount(n, mode) > 0.0f; } - inline bool IsNavInputPressedAnyOfTwo(ImGuiNavInput n1, ImGuiNavInput n2, ImGuiInputReadMode mode) { return (GetNavInputAmount(n1, mode) + GetNavInputAmount(n2, mode)) > 0.0f; } + // FIXME: Eventually we should aim to move e.g. IsActiveIdUsingKey() into IsKeyXXX functions. + inline bool IsNamedKey(ImGuiKey key) { return key >= ImGuiKey_NamedKey_BEGIN && key < ImGuiKey_NamedKey_END; } + inline bool IsNamedKeyOrMod(ImGuiKey key) { return (key >= ImGuiKey_NamedKey_BEGIN && key < ImGuiKey_NamedKey_END) || key == ImGuiMod_Ctrl || key == ImGuiMod_Shift || key == ImGuiMod_Alt || key == ImGuiMod_Super; } + inline bool IsLegacyKey(ImGuiKey key) { return key >= ImGuiKey_LegacyNativeKey_BEGIN && key < ImGuiKey_LegacyNativeKey_END; } + inline bool IsKeyboardKey(ImGuiKey key) { return key >= ImGuiKey_Keyboard_BEGIN && key < ImGuiKey_Keyboard_END; } + inline bool IsGamepadKey(ImGuiKey key) { return key >= ImGuiKey_Gamepad_BEGIN && key < ImGuiKey_Gamepad_END; } + inline bool IsMouseKey(ImGuiKey key) { return key >= ImGuiKey_Mouse_BEGIN && key < ImGuiKey_Mouse_END; } + inline bool IsAliasKey(ImGuiKey key) { return key >= ImGuiKey_Aliases_BEGIN && key < ImGuiKey_Aliases_END; } + inline bool IsLRModKey(ImGuiKey key) { return key >= ImGuiKey_LeftCtrl && key <= ImGuiKey_RightSuper; } + ImGuiKeyChord FixupKeyChord(ImGuiKeyChord key_chord); + inline ImGuiKey ConvertSingleModFlagToKey(ImGuiKey key) + { + if (key == ImGuiMod_Ctrl) return ImGuiKey_ReservedForModCtrl; + if (key == ImGuiMod_Shift) return ImGuiKey_ReservedForModShift; + if (key == ImGuiMod_Alt) return ImGuiKey_ReservedForModAlt; + if (key == ImGuiMod_Super) return ImGuiKey_ReservedForModSuper; + return key; + } + + IMGUI_API ImGuiKeyData* GetKeyData(ImGuiContext* ctx, ImGuiKey key); + inline ImGuiKeyData* GetKeyData(ImGuiKey key) { ImGuiContext& g = *GImGui; return GetKeyData(&g, key); } + IMGUI_API const char* GetKeyChordName(ImGuiKeyChord key_chord); + inline ImGuiKey MouseButtonToKey(ImGuiMouseButton button) { IM_ASSERT(button >= 0 && button < ImGuiMouseButton_COUNT); return (ImGuiKey)(ImGuiKey_MouseLeft + button); } + IMGUI_API bool IsMouseDragPastThreshold(ImGuiMouseButton button, float lock_threshold = -1.0f); + IMGUI_API ImVec2 GetKeyMagnitude2d(ImGuiKey key_left, ImGuiKey key_right, ImGuiKey key_up, ImGuiKey key_down); + IMGUI_API float GetNavTweakPressedAmount(ImGuiAxis axis); + IMGUI_API int CalcTypematicRepeatAmount(float t0, float t1, float repeat_delay, float repeat_rate); + IMGUI_API void GetTypematicRepeatRate(ImGuiInputFlags flags, float* repeat_delay, float* repeat_rate); + IMGUI_API void TeleportMousePos(const ImVec2& pos); + IMGUI_API void SetActiveIdUsingAllKeyboardKeys(); + inline bool IsActiveIdUsingNavDir(ImGuiDir dir) { ImGuiContext& g = *GImGui; return (g.ActiveIdUsingNavDirMask & (1 << dir)) != 0; } + + // [EXPERIMENTAL] Low-Level: Key/Input Ownership + // - The idea is that instead of "eating" a given input, we can link to an owner id. + // - Ownership is most often claimed as a result of reacting to a press/down event (but occasionally may be claimed ahead). + // - Input queries can then read input by specifying ImGuiKeyOwner_Any (== 0), ImGuiKeyOwner_NoOwner (== -1) or a custom ID. + // - Legacy input queries (without specifying an owner or _Any or _None) are equivalent to using ImGuiKeyOwner_Any (== 0). + // - Input ownership is automatically released on the frame after a key is released. Therefore: + // - for ownership registration happening as a result of a down/press event, the SetKeyOwner() call may be done once (common case). + // - for ownership registration happening ahead of a down/press event, the SetKeyOwner() call needs to be made every frame (happens if e.g. claiming ownership on hover). + // - SetItemKeyOwner() is a shortcut for common simple case. A custom widget will probably want to call SetKeyOwner() multiple times directly based on its interaction state. + // - This is marked experimental because not all widgets are fully honoring the Set/Test idioms. We will need to move forward step by step. + // Please open a GitHub Issue to submit your usage scenario or if there's a use case you need solved. + IMGUI_API ImGuiID GetKeyOwner(ImGuiKey key); + IMGUI_API void SetKeyOwner(ImGuiKey key, ImGuiID owner_id, ImGuiInputFlags flags = 0); + IMGUI_API void SetKeyOwnersForKeyChord(ImGuiKeyChord key, ImGuiID owner_id, ImGuiInputFlags flags = 0); + IMGUI_API void SetItemKeyOwner(ImGuiKey key, ImGuiInputFlags flags); // Set key owner to last item if it is hovered or active. Equivalent to 'if (IsItemHovered() || IsItemActive()) { SetKeyOwner(key, GetItemID());'. + IMGUI_API bool TestKeyOwner(ImGuiKey key, ImGuiID owner_id); // Test that key is either not owned, either owned by 'owner_id' + inline ImGuiKeyOwnerData* GetKeyOwnerData(ImGuiContext* ctx, ImGuiKey key) { if (key & ImGuiMod_Mask_) key = ConvertSingleModFlagToKey(key); IM_ASSERT(IsNamedKey(key)); return &ctx->KeysOwnerData[key - ImGuiKey_NamedKey_BEGIN]; } + + // [EXPERIMENTAL] High-Level: Input Access functions w/ support for Key/Input Ownership + // - Important: legacy IsKeyPressed(ImGuiKey, bool repeat=true) _DEFAULTS_ to repeat, new IsKeyPressed() requires _EXPLICIT_ ImGuiInputFlags_Repeat flag. + // - Expected to be later promoted to public API, the prototypes are designed to replace existing ones (since owner_id can default to Any == 0) + // - Specifying a value for 'ImGuiID owner' will test that EITHER the key is NOT owned (UNLESS locked), EITHER the key is owned by 'owner'. + // Legacy functions use ImGuiKeyOwner_Any meaning that they typically ignore ownership, unless a call to SetKeyOwner() explicitly used ImGuiInputFlags_LockThisFrame or ImGuiInputFlags_LockUntilRelease. + // - Binding generators may want to ignore those for now, or suffix them with Ex() until we decide if this gets moved into public API. + IMGUI_API bool IsKeyDown(ImGuiKey key, ImGuiID owner_id); + IMGUI_API bool IsKeyPressed(ImGuiKey key, ImGuiInputFlags flags, ImGuiID owner_id = 0); // Important: when transitioning from old to new IsKeyPressed(): old API has "bool repeat = true", so would default to repeat. New API requiress explicit ImGuiInputFlags_Repeat. + IMGUI_API bool IsKeyReleased(ImGuiKey key, ImGuiID owner_id); + IMGUI_API bool IsKeyChordPressed(ImGuiKeyChord key_chord, ImGuiInputFlags flags, ImGuiID owner_id = 0); + IMGUI_API bool IsMouseDown(ImGuiMouseButton button, ImGuiID owner_id); + IMGUI_API bool IsMouseClicked(ImGuiMouseButton button, ImGuiInputFlags flags, ImGuiID owner_id = 0); + IMGUI_API bool IsMouseReleased(ImGuiMouseButton button, ImGuiID owner_id); + IMGUI_API bool IsMouseDoubleClicked(ImGuiMouseButton button, ImGuiID owner_id); + + // Shortcut Testing & Routing + // - Set Shortcut() and SetNextItemShortcut() in imgui.h + // - When a policy (except for ImGuiInputFlags_RouteAlways *) is set, Shortcut() will register itself with SetShortcutRouting(), + // allowing the system to decide where to route the input among other route-aware calls. + // (* using ImGuiInputFlags_RouteAlways is roughly equivalent to calling IsKeyChordPressed(key) and bypassing route registration and check) + // - When using one of the routing option: + // - The default route is ImGuiInputFlags_RouteFocused (accept inputs if window is in focus stack. Deep-most focused window takes inputs. ActiveId takes inputs over deep-most focused window.) + // - Routes are requested given a chord (key + modifiers) and a routing policy. + // - Routes are resolved during NewFrame(): if keyboard modifiers are matching current ones: SetKeyOwner() is called + route is granted for the frame. + // - Each route may be granted to a single owner. When multiple requests are made we have policies to select the winning route (e.g. deep most window). + // - Multiple read sites may use the same owner id can all access the granted route. + // - When owner_id is 0 we use the current Focus Scope ID as a owner ID in order to identify our location. + // - You can chain two unrelated windows in the focus stack using SetWindowParentWindowForFocusRoute() + // e.g. if you have a tool window associated to a document, and you want document shortcuts to run when the tool is focused. + IMGUI_API bool Shortcut(ImGuiKeyChord key_chord, ImGuiInputFlags flags, ImGuiID owner_id); + IMGUI_API bool SetShortcutRouting(ImGuiKeyChord key_chord, ImGuiInputFlags flags, ImGuiID owner_id); // owner_id needs to be explicit and cannot be 0 + IMGUI_API bool TestShortcutRouting(ImGuiKeyChord key_chord, ImGuiID owner_id); + IMGUI_API ImGuiKeyRoutingData* GetShortcutRoutingData(ImGuiKeyChord key_chord); + + // Docking + // (some functions are only declared in imgui.cpp, see Docking section) + IMGUI_API void DockContextInitialize(ImGuiContext* ctx); + IMGUI_API void DockContextShutdown(ImGuiContext* ctx); + IMGUI_API void DockContextClearNodes(ImGuiContext* ctx, ImGuiID root_id, bool clear_settings_refs); // Use root_id==0 to clear all + IMGUI_API void DockContextRebuildNodes(ImGuiContext* ctx); + IMGUI_API void DockContextNewFrameUpdateUndocking(ImGuiContext* ctx); + IMGUI_API void DockContextNewFrameUpdateDocking(ImGuiContext* ctx); + IMGUI_API void DockContextEndFrame(ImGuiContext* ctx); + IMGUI_API ImGuiID DockContextGenNodeID(ImGuiContext* ctx); + IMGUI_API void DockContextQueueDock(ImGuiContext* ctx, ImGuiWindow* target, ImGuiDockNode* target_node, ImGuiWindow* payload, ImGuiDir split_dir, float split_ratio, bool split_outer); + IMGUI_API void DockContextQueueUndockWindow(ImGuiContext* ctx, ImGuiWindow* window); + IMGUI_API void DockContextQueueUndockNode(ImGuiContext* ctx, ImGuiDockNode* node); + IMGUI_API void DockContextProcessUndockWindow(ImGuiContext* ctx, ImGuiWindow* window, bool clear_persistent_docking_ref = true); + IMGUI_API void DockContextProcessUndockNode(ImGuiContext* ctx, ImGuiDockNode* node); + IMGUI_API bool DockContextCalcDropPosForDocking(ImGuiWindow* target, ImGuiDockNode* target_node, ImGuiWindow* payload_window, ImGuiDockNode* payload_node, ImGuiDir split_dir, bool split_outer, ImVec2* out_pos); + IMGUI_API ImGuiDockNode*DockContextFindNodeByID(ImGuiContext* ctx, ImGuiID id); + IMGUI_API void DockNodeWindowMenuHandler_Default(ImGuiContext* ctx, ImGuiDockNode* node, ImGuiTabBar* tab_bar); + IMGUI_API bool DockNodeBeginAmendTabBar(ImGuiDockNode* node); + IMGUI_API void DockNodeEndAmendTabBar(); + inline ImGuiDockNode* DockNodeGetRootNode(ImGuiDockNode* node) { while (node->ParentNode) node = node->ParentNode; return node; } + inline bool DockNodeIsInHierarchyOf(ImGuiDockNode* node, ImGuiDockNode* parent) { while (node) { if (node == parent) return true; node = node->ParentNode; } return false; } + inline int DockNodeGetDepth(const ImGuiDockNode* node) { int depth = 0; while (node->ParentNode) { node = node->ParentNode; depth++; } return depth; } + inline ImGuiID DockNodeGetWindowMenuButtonId(const ImGuiDockNode* node) { return ImHashStr("#COLLAPSE", 0, node->ID); } + inline ImGuiDockNode* GetWindowDockNode() { ImGuiContext& g = *GImGui; return g.CurrentWindow->DockNode; } + IMGUI_API bool GetWindowAlwaysWantOwnTabBar(ImGuiWindow* window); + IMGUI_API void BeginDocked(ImGuiWindow* window, bool* p_open); + IMGUI_API void BeginDockableDragDropSource(ImGuiWindow* window); + IMGUI_API void BeginDockableDragDropTarget(ImGuiWindow* window); + IMGUI_API void SetWindowDock(ImGuiWindow* window, ImGuiID dock_id, ImGuiCond cond); + + // Docking - Builder function needs to be generally called before the node is used/submitted. + // - The DockBuilderXXX functions are designed to _eventually_ become a public API, but it is too early to expose it and guarantee stability. + // - Do not hold on ImGuiDockNode* pointers! They may be invalidated by any split/merge/remove operation and every frame. + // - To create a DockSpace() node, make sure to set the ImGuiDockNodeFlags_DockSpace flag when calling DockBuilderAddNode(). + // You can create dockspace nodes (attached to a window) _or_ floating nodes (carry its own window) with this API. + // - DockBuilderSplitNode() create 2 child nodes within 1 node. The initial node becomes a parent node. + // - If you intend to split the node immediately after creation using DockBuilderSplitNode(), make sure + // to call DockBuilderSetNodeSize() beforehand. If you don't, the resulting split sizes may not be reliable. + // - Call DockBuilderFinish() after you are done. + IMGUI_API void DockBuilderDockWindow(const char* window_name, ImGuiID node_id); + IMGUI_API ImGuiDockNode*DockBuilderGetNode(ImGuiID node_id); + inline ImGuiDockNode* DockBuilderGetCentralNode(ImGuiID node_id) { ImGuiDockNode* node = DockBuilderGetNode(node_id); if (!node) return NULL; return DockNodeGetRootNode(node)->CentralNode; } + IMGUI_API ImGuiID DockBuilderAddNode(ImGuiID node_id = 0, ImGuiDockNodeFlags flags = 0); + IMGUI_API void DockBuilderRemoveNode(ImGuiID node_id); // Remove node and all its child, undock all windows + IMGUI_API void DockBuilderRemoveNodeDockedWindows(ImGuiID node_id, bool clear_settings_refs = true); + IMGUI_API void DockBuilderRemoveNodeChildNodes(ImGuiID node_id); // Remove all split/hierarchy. All remaining docked windows will be re-docked to the remaining root node (node_id). + IMGUI_API void DockBuilderSetNodePos(ImGuiID node_id, ImVec2 pos); + IMGUI_API void DockBuilderSetNodeSize(ImGuiID node_id, ImVec2 size); + IMGUI_API ImGuiID DockBuilderSplitNode(ImGuiID node_id, ImGuiDir split_dir, float size_ratio_for_node_at_dir, ImGuiID* out_id_at_dir, ImGuiID* out_id_at_opposite_dir); // Create 2 child nodes in this parent node. + IMGUI_API void DockBuilderCopyDockSpace(ImGuiID src_dockspace_id, ImGuiID dst_dockspace_id, ImVector* in_window_remap_pairs); + IMGUI_API void DockBuilderCopyNode(ImGuiID src_node_id, ImGuiID dst_node_id, ImVector* out_node_remap_pairs); + IMGUI_API void DockBuilderCopyWindowSettings(const char* src_name, const char* dst_name); + IMGUI_API void DockBuilderFinish(ImGuiID node_id); + + // [EXPERIMENTAL] Focus Scope + // This is generally used to identify a unique input location (for e.g. a selection set) + // There is one per window (automatically set in Begin), but: + // - Selection patterns generally need to react (e.g. clear a selection) when landing on one item of the set. + // So in order to identify a set multiple lists in same window may each need a focus scope. + // If you imagine an hypothetical BeginSelectionGroup()/EndSelectionGroup() api, it would likely call PushFocusScope()/EndFocusScope() + // - Shortcut routing also use focus scope as a default location identifier if an owner is not provided. + // We don't use the ID Stack for this as it is common to want them separate. + IMGUI_API void PushFocusScope(ImGuiID id); + IMGUI_API void PopFocusScope(); + inline ImGuiID GetCurrentFocusScope() { ImGuiContext& g = *GImGui; return g.CurrentFocusScopeId; } // Focus scope we are outputting into, set by PushFocusScope() // Drag and Drop + IMGUI_API bool IsDragDropActive(); IMGUI_API bool BeginDragDropTargetCustom(const ImRect& bb, ImGuiID id); IMGUI_API void ClearDragDrop(); IMGUI_API bool IsDragDropPayloadBeingAccepted(); + IMGUI_API void RenderDragDropTargetRect(const ImRect& bb, const ImRect& item_clip_rect); - // New Columns API (FIXME-WIP) - IMGUI_API void BeginColumns(const char* str_id, int count, ImGuiColumnsFlags flags = 0); // setup number of columns. use an identifier to distinguish multiple column sets. close with EndColumns(). - IMGUI_API void EndColumns(); // close columns + // Typing-Select API + // (provide Windows Explorer style "select items by typing partial name" + "cycle through items by typing same letter" feature) + // (this is currently not documented nor used by main library, but should work. See "widgets_typingselect" in imgui_test_suite for usage code. Please let us know if you use this!) + IMGUI_API ImGuiTypingSelectRequest* GetTypingSelectRequest(ImGuiTypingSelectFlags flags = ImGuiTypingSelectFlags_None); + IMGUI_API int TypingSelectFindMatch(ImGuiTypingSelectRequest* req, int items_count, const char* (*get_item_name_func)(void*, int), void* user_data, int nav_item_idx); + IMGUI_API int TypingSelectFindNextSingleCharMatch(ImGuiTypingSelectRequest* req, int items_count, const char* (*get_item_name_func)(void*, int), void* user_data, int nav_item_idx); + IMGUI_API int TypingSelectFindBestLeadingMatch(ImGuiTypingSelectRequest* req, int items_count, const char* (*get_item_name_func)(void*, int), void* user_data); + + // Box-Select API + IMGUI_API bool BeginBoxSelect(const ImRect& scope_rect, ImGuiWindow* window, ImGuiID box_select_id, ImGuiMultiSelectFlags ms_flags); + IMGUI_API void EndBoxSelect(const ImRect& scope_rect, ImGuiMultiSelectFlags ms_flags); + + // Multi-Select API + IMGUI_API void MultiSelectItemHeader(ImGuiID id, bool* p_selected, ImGuiButtonFlags* p_button_flags); + IMGUI_API void MultiSelectItemFooter(ImGuiID id, bool* p_selected, bool* p_pressed); + IMGUI_API void MultiSelectAddSetAll(ImGuiMultiSelectTempData* ms, bool selected); + IMGUI_API void MultiSelectAddSetRange(ImGuiMultiSelectTempData* ms, bool selected, int range_dir, ImGuiSelectionUserData first_item, ImGuiSelectionUserData last_item); + inline ImGuiBoxSelectState* GetBoxSelectState(ImGuiID id) { ImGuiContext& g = *GImGui; return (id != 0 && g.BoxSelectState.ID == id && g.BoxSelectState.IsActive) ? &g.BoxSelectState : NULL; } + inline ImGuiMultiSelectState* GetMultiSelectState(ImGuiID id) { ImGuiContext& g = *GImGui; return g.MultiSelectStorage.GetByKey(id); } + + // Internal Columns API (this is not exposed because we will encourage transitioning to the Tables API) + IMGUI_API void SetWindowClipRectBeforeSetChannel(ImGuiWindow* window, const ImRect& clip_rect); + IMGUI_API void BeginColumns(const char* str_id, int count, ImGuiOldColumnFlags flags = 0); // setup number of columns. use an identifier to distinguish multiple column sets. close with EndColumns(). + IMGUI_API void EndColumns(); // close columns IMGUI_API void PushColumnClipRect(int column_index); IMGUI_API void PushColumnsBackground(); IMGUI_API void PopColumnsBackground(); IMGUI_API ImGuiID GetColumnsID(const char* str_id, int count); - IMGUI_API ImGuiColumns* FindOrCreateColumns(ImGuiWindow* window, ImGuiID id); - IMGUI_API float GetColumnOffsetFromNorm(const ImGuiColumns* columns, float offset_norm); - IMGUI_API float GetColumnNormFromOffset(const ImGuiColumns* columns, float offset); + IMGUI_API ImGuiOldColumns* FindOrCreateColumns(ImGuiWindow* window, ImGuiID id); + IMGUI_API float GetColumnOffsetFromNorm(const ImGuiOldColumns* columns, float offset_norm); + IMGUI_API float GetColumnNormFromOffset(const ImGuiOldColumns* columns, float offset); + + // Tables: Candidates for public API + IMGUI_API void TableOpenContextMenu(int column_n = -1); + IMGUI_API void TableSetColumnWidth(int column_n, float width); + IMGUI_API void TableSetColumnSortDirection(int column_n, ImGuiSortDirection sort_direction, bool append_to_sort_specs); + IMGUI_API int TableGetHoveredRow(); // Retrieve *PREVIOUS FRAME* hovered row. This difference with TableGetHoveredColumn() is the reason why this is not public yet. + IMGUI_API float TableGetHeaderRowHeight(); + IMGUI_API float TableGetHeaderAngledMaxLabelWidth(); + IMGUI_API void TablePushBackgroundChannel(); + IMGUI_API void TablePopBackgroundChannel(); + IMGUI_API void TableAngledHeadersRowEx(ImGuiID row_id, float angle, float max_label_width, const ImGuiTableHeaderData* data, int data_count); + + // Tables: Internals + inline ImGuiTable* GetCurrentTable() { ImGuiContext& g = *GImGui; return g.CurrentTable; } + IMGUI_API ImGuiTable* TableFindByID(ImGuiID id); + IMGUI_API bool BeginTableEx(const char* name, ImGuiID id, int columns_count, ImGuiTableFlags flags = 0, const ImVec2& outer_size = ImVec2(0, 0), float inner_width = 0.0f); + IMGUI_API void TableBeginInitMemory(ImGuiTable* table, int columns_count); + IMGUI_API void TableBeginApplyRequests(ImGuiTable* table); + IMGUI_API void TableSetupDrawChannels(ImGuiTable* table); + IMGUI_API void TableUpdateLayout(ImGuiTable* table); + IMGUI_API void TableUpdateBorders(ImGuiTable* table); + IMGUI_API void TableUpdateColumnsWeightFromWidth(ImGuiTable* table); + IMGUI_API void TableDrawBorders(ImGuiTable* table); + IMGUI_API void TableDrawDefaultContextMenu(ImGuiTable* table, ImGuiTableFlags flags_for_section_to_display); + IMGUI_API bool TableBeginContextMenuPopup(ImGuiTable* table); + IMGUI_API void TableMergeDrawChannels(ImGuiTable* table); + inline ImGuiTableInstanceData* TableGetInstanceData(ImGuiTable* table, int instance_no) { if (instance_no == 0) return &table->InstanceDataFirst; return &table->InstanceDataExtra[instance_no - 1]; } + inline ImGuiID TableGetInstanceID(ImGuiTable* table, int instance_no) { return TableGetInstanceData(table, instance_no)->TableInstanceID; } + IMGUI_API void TableSortSpecsSanitize(ImGuiTable* table); + IMGUI_API void TableSortSpecsBuild(ImGuiTable* table); + IMGUI_API ImGuiSortDirection TableGetColumnNextSortDirection(ImGuiTableColumn* column); + IMGUI_API void TableFixColumnSortDirection(ImGuiTable* table, ImGuiTableColumn* column); + IMGUI_API float TableGetColumnWidthAuto(ImGuiTable* table, ImGuiTableColumn* column); + IMGUI_API void TableBeginRow(ImGuiTable* table); + IMGUI_API void TableEndRow(ImGuiTable* table); + IMGUI_API void TableBeginCell(ImGuiTable* table, int column_n); + IMGUI_API void TableEndCell(ImGuiTable* table); + IMGUI_API ImRect TableGetCellBgRect(const ImGuiTable* table, int column_n); + IMGUI_API const char* TableGetColumnName(const ImGuiTable* table, int column_n); + IMGUI_API ImGuiID TableGetColumnResizeID(ImGuiTable* table, int column_n, int instance_no = 0); + IMGUI_API float TableCalcMaxColumnWidth(const ImGuiTable* table, int column_n); + IMGUI_API void TableSetColumnWidthAutoSingle(ImGuiTable* table, int column_n); + IMGUI_API void TableSetColumnWidthAutoAll(ImGuiTable* table); + IMGUI_API void TableRemove(ImGuiTable* table); + IMGUI_API void TableGcCompactTransientBuffers(ImGuiTable* table); + IMGUI_API void TableGcCompactTransientBuffers(ImGuiTableTempData* table); + IMGUI_API void TableGcCompactSettings(); + + // Tables: Settings + IMGUI_API void TableLoadSettings(ImGuiTable* table); + IMGUI_API void TableSaveSettings(ImGuiTable* table); + IMGUI_API void TableResetSettings(ImGuiTable* table); + IMGUI_API ImGuiTableSettings* TableGetBoundSettings(ImGuiTable* table); + IMGUI_API void TableSettingsAddSettingsHandler(); + IMGUI_API ImGuiTableSettings* TableSettingsCreate(ImGuiID id, int columns_count); + IMGUI_API ImGuiTableSettings* TableSettingsFindByID(ImGuiID id); // Tab Bars + inline ImGuiTabBar* GetCurrentTabBar() { ImGuiContext& g = *GImGui; return g.CurrentTabBar; } IMGUI_API bool BeginTabBarEx(ImGuiTabBar* tab_bar, const ImRect& bb, ImGuiTabBarFlags flags); IMGUI_API ImGuiTabItem* TabBarFindTabByID(ImGuiTabBar* tab_bar, ImGuiID tab_id); + IMGUI_API ImGuiTabItem* TabBarFindTabByOrder(ImGuiTabBar* tab_bar, int order); + IMGUI_API ImGuiTabItem* TabBarFindMostRecentlySelectedTabForActiveWindow(ImGuiTabBar* tab_bar); + IMGUI_API ImGuiTabItem* TabBarGetCurrentTab(ImGuiTabBar* tab_bar); + inline int TabBarGetTabOrder(ImGuiTabBar* tab_bar, ImGuiTabItem* tab) { return tab_bar->Tabs.index_from_ptr(tab); } + IMGUI_API const char* TabBarGetTabName(ImGuiTabBar* tab_bar, ImGuiTabItem* tab); + IMGUI_API void TabBarAddTab(ImGuiTabBar* tab_bar, ImGuiTabItemFlags tab_flags, ImGuiWindow* window); IMGUI_API void TabBarRemoveTab(ImGuiTabBar* tab_bar, ImGuiID tab_id); IMGUI_API void TabBarCloseTab(ImGuiTabBar* tab_bar, ImGuiTabItem* tab); - IMGUI_API void TabBarQueueChangeTabOrder(ImGuiTabBar* tab_bar, const ImGuiTabItem* tab, int dir); - IMGUI_API bool TabItemEx(ImGuiTabBar* tab_bar, const char* label, bool* p_open, ImGuiTabItemFlags flags); - IMGUI_API ImVec2 TabItemCalcSize(const char* label, bool has_close_button); + IMGUI_API void TabBarQueueFocus(ImGuiTabBar* tab_bar, ImGuiTabItem* tab); + IMGUI_API void TabBarQueueFocus(ImGuiTabBar* tab_bar, const char* tab_name); + IMGUI_API void TabBarQueueReorder(ImGuiTabBar* tab_bar, ImGuiTabItem* tab, int offset); + IMGUI_API void TabBarQueueReorderFromMousePos(ImGuiTabBar* tab_bar, ImGuiTabItem* tab, ImVec2 mouse_pos); + IMGUI_API bool TabBarProcessReorder(ImGuiTabBar* tab_bar); + IMGUI_API bool TabItemEx(ImGuiTabBar* tab_bar, const char* label, bool* p_open, ImGuiTabItemFlags flags, ImGuiWindow* docked_window); + IMGUI_API void TabItemSpacing(const char* str_id, ImGuiTabItemFlags flags, float width); + IMGUI_API ImVec2 TabItemCalcSize(const char* label, bool has_close_button_or_unsaved_marker); + IMGUI_API ImVec2 TabItemCalcSize(ImGuiWindow* window); IMGUI_API void TabItemBackground(ImDrawList* draw_list, const ImRect& bb, ImGuiTabItemFlags flags, ImU32 col); - IMGUI_API bool TabItemLabelAndCloseButton(ImDrawList* draw_list, const ImRect& bb, ImGuiTabItemFlags flags, ImVec2 frame_padding, const char* label, ImGuiID tab_id, ImGuiID close_button_id); + IMGUI_API void TabItemLabelAndCloseButton(ImDrawList* draw_list, const ImRect& bb, ImGuiTabItemFlags flags, ImVec2 frame_padding, const char* label, ImGuiID tab_id, ImGuiID close_button_id, bool is_contents_visible, bool* out_just_closed, bool* out_text_clipped); // Render helpers // AVOID USING OUTSIDE OF IMGUI.CPP! NOT FOR PUBLIC CONSUMPTION. THOSE FUNCTIONS ARE A MESS. THEIR SIGNATURE AND BEHAVIOR WILL CHANGE, THEY NEED TO BE REFACTORED INTO SOMETHING DECENT. // NB: All position are in absolute pixels coordinates (we are never using window coordinates internally) IMGUI_API void RenderText(ImVec2 pos, const char* text, const char* text_end = NULL, bool hide_text_after_hash = true); IMGUI_API void RenderTextWrapped(ImVec2 pos, const char* text, const char* text_end, float wrap_width); - IMGUI_API void RenderTextClipped(const ImVec2& pos_min, const ImVec2& pos_max, const char* text, const char* text_end, const ImVec2* text_size_if_known, const ImVec2& align = ImVec2(0,0), const ImRect* clip_rect = NULL); + IMGUI_API void RenderTextClipped(const ImVec2& pos_min, const ImVec2& pos_max, const char* text, const char* text_end, const ImVec2* text_size_if_known, const ImVec2& align = ImVec2(0, 0), const ImRect* clip_rect = NULL); IMGUI_API void RenderTextClippedEx(ImDrawList* draw_list, const ImVec2& pos_min, const ImVec2& pos_max, const char* text, const char* text_end, const ImVec2* text_size_if_known, const ImVec2& align = ImVec2(0, 0), const ImRect* clip_rect = NULL); IMGUI_API void RenderTextEllipsis(ImDrawList* draw_list, const ImVec2& pos_min, const ImVec2& pos_max, float clip_max_x, float ellipsis_max_x, const char* text, const char* text_end, const ImVec2* text_size_if_known); - IMGUI_API void RenderFrame(ImVec2 p_min, ImVec2 p_max, ImU32 fill_col, bool border = true, float rounding = 0.0f); + IMGUI_API void RenderFrame(ImVec2 p_min, ImVec2 p_max, ImU32 fill_col, bool borders = true, float rounding = 0.0f); IMGUI_API void RenderFrameBorder(ImVec2 p_min, ImVec2 p_max, float rounding = 0.0f); - IMGUI_API void RenderColorRectWithAlphaCheckerboard(ImVec2 p_min, ImVec2 p_max, ImU32 fill_col, float grid_step, ImVec2 grid_off, float rounding = 0.0f, int rounding_corners_flags = ~0); - IMGUI_API void RenderCheckMark(ImVec2 pos, ImU32 col, float sz); - IMGUI_API void RenderNavHighlight(const ImRect& bb, ImGuiID id, ImGuiNavHighlightFlags flags = ImGuiNavHighlightFlags_TypeDefault); // Navigation highlight + IMGUI_API void RenderColorRectWithAlphaCheckerboard(ImDrawList* draw_list, ImVec2 p_min, ImVec2 p_max, ImU32 fill_col, float grid_step, ImVec2 grid_off, float rounding = 0.0f, ImDrawFlags flags = 0); + IMGUI_API void RenderNavCursor(const ImRect& bb, ImGuiID id, ImGuiNavRenderCursorFlags flags = ImGuiNavRenderCursorFlags_None); // Navigation highlight +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + inline void RenderNavHighlight(const ImRect& bb, ImGuiID id, ImGuiNavRenderCursorFlags flags = ImGuiNavRenderCursorFlags_None) { RenderNavCursor(bb, id, flags); } // Renamed in 1.91.4 +#endif IMGUI_API const char* FindRenderedTextEnd(const char* text, const char* text_end = NULL); // Find the optional ## from which we stop displaying text. - IMGUI_API void LogRenderedText(const ImVec2* ref_pos, const char* text, const char* text_end = NULL); + IMGUI_API void RenderMouseCursor(ImVec2 pos, float scale, ImGuiMouseCursor mouse_cursor, ImU32 col_fill, ImU32 col_border, ImU32 col_shadow); // Render helpers (those functions don't access any ImGui state!) IMGUI_API void RenderArrow(ImDrawList* draw_list, ImVec2 pos, ImU32 col, ImGuiDir dir, float scale = 1.0f); IMGUI_API void RenderBullet(ImDrawList* draw_list, ImVec2 pos, ImU32 col); - IMGUI_API void RenderMouseCursor(ImDrawList* draw_list, ImVec2 pos, float scale, ImGuiMouseCursor mouse_cursor, ImU32 col_fill, ImU32 col_border, ImU32 col_shadow); + IMGUI_API void RenderCheckMark(ImDrawList* draw_list, ImVec2 pos, ImU32 col, float sz); IMGUI_API void RenderArrowPointingAt(ImDrawList* draw_list, ImVec2 pos, ImVec2 half_sz, ImGuiDir direction, ImU32 col); + IMGUI_API void RenderArrowDockMenu(ImDrawList* draw_list, ImVec2 p_min, float sz, ImU32 col); IMGUI_API void RenderRectFilledRangeH(ImDrawList* draw_list, const ImRect& rect, ImU32 col, float x_start_norm, float x_end_norm, float rounding); - -#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS - // 2019/06/07: Updating prototypes of some of the internal functions. Leaving those for reference for a short while. - inline void RenderArrow(ImVec2 pos, ImGuiDir dir, float scale=1.0f) { ImGuiWindow* window = GetCurrentWindow(); RenderArrow(window->DrawList, pos, GetColorU32(ImGuiCol_Text), dir, scale); } - inline void RenderBullet(ImVec2 pos) { ImGuiWindow* window = GetCurrentWindow(); RenderBullet(window->DrawList, pos, GetColorU32(ImGuiCol_Text)); } -#endif + IMGUI_API void RenderRectFilledWithHole(ImDrawList* draw_list, const ImRect& outer, const ImRect& inner, ImU32 col, float rounding); + IMGUI_API ImDrawFlags CalcRoundingFlagsForRectInRect(const ImRect& r_in, const ImRect& r_outer, float threshold); // Widgets IMGUI_API void TextEx(const char* text, const char* text_end = NULL, ImGuiTextFlags flags = 0); - IMGUI_API bool ButtonEx(const char* label, const ImVec2& size_arg = ImVec2(0,0), ImGuiButtonFlags flags = 0); + IMGUI_API bool ButtonEx(const char* label, const ImVec2& size_arg = ImVec2(0, 0), ImGuiButtonFlags flags = 0); + IMGUI_API bool ArrowButtonEx(const char* str_id, ImGuiDir dir, ImVec2 size_arg, ImGuiButtonFlags flags = 0); + IMGUI_API bool ImageButtonEx(ImGuiID id, ImTextureID user_texture_id, const ImVec2& image_size, const ImVec2& uv0, const ImVec2& uv1, const ImVec4& bg_col, const ImVec4& tint_col, ImGuiButtonFlags flags = 0); + IMGUI_API void SeparatorEx(ImGuiSeparatorFlags flags, float thickness = 1.0f); + IMGUI_API void SeparatorTextEx(ImGuiID id, const char* label, const char* label_end, float extra_width); + IMGUI_API bool CheckboxFlags(const char* label, ImS64* flags, ImS64 flags_value); + IMGUI_API bool CheckboxFlags(const char* label, ImU64* flags, ImU64 flags_value); + + // Widgets: Window Decorations IMGUI_API bool CloseButton(ImGuiID id, const ImVec2& pos); - IMGUI_API bool CollapseButton(ImGuiID id, const ImVec2& pos); - IMGUI_API bool ArrowButtonEx(const char* str_id, ImGuiDir dir, ImVec2 size_arg, ImGuiButtonFlags flags); + IMGUI_API bool CollapseButton(ImGuiID id, const ImVec2& pos, ImGuiDockNode* dock_node); IMGUI_API void Scrollbar(ImGuiAxis axis); - IMGUI_API bool ScrollbarEx(const ImRect& bb, ImGuiID id, ImGuiAxis axis, float* p_scroll_v, float avail_v, float contents_v, ImDrawCornerFlags rounding_corners); - IMGUI_API ImGuiID GetScrollbarID(ImGuiWindow* window, ImGuiAxis axis); - IMGUI_API void SeparatorEx(ImGuiSeparatorFlags flags); + IMGUI_API bool ScrollbarEx(const ImRect& bb, ImGuiID id, ImGuiAxis axis, ImS64* p_scroll_v, ImS64 avail_v, ImS64 contents_v, ImDrawFlags draw_rounding_flags = 0); + IMGUI_API ImRect GetWindowScrollbarRect(ImGuiWindow* window, ImGuiAxis axis); + IMGUI_API ImGuiID GetWindowScrollbarID(ImGuiWindow* window, ImGuiAxis axis); + IMGUI_API ImGuiID GetWindowResizeCornerID(ImGuiWindow* window, int n); // 0..3: corners + IMGUI_API ImGuiID GetWindowResizeBorderID(ImGuiWindow* window, ImGuiDir dir); // Widgets low-level behaviors IMGUI_API bool ButtonBehavior(const ImRect& bb, ImGuiID id, bool* out_hovered, bool* out_held, ImGuiButtonFlags flags = 0); - IMGUI_API bool DragBehavior(ImGuiID id, ImGuiDataType data_type, void* v, float v_speed, const void* v_min, const void* v_max, const char* format, float power, ImGuiDragFlags flags); - IMGUI_API bool SliderBehavior(const ImRect& bb, ImGuiID id, ImGuiDataType data_type, void* v, const void* v_min, const void* v_max, const char* format, float power, ImGuiSliderFlags flags, ImRect* out_grab_bb); - IMGUI_API bool SplitterBehavior(const ImRect& bb, ImGuiID id, ImGuiAxis axis, float* size1, float* size2, float min_size1, float min_size2, float hover_extend = 0.0f, float hover_visibility_delay = 0.0f); + IMGUI_API bool DragBehavior(ImGuiID id, ImGuiDataType data_type, void* p_v, float v_speed, const void* p_min, const void* p_max, const char* format, ImGuiSliderFlags flags); + IMGUI_API bool SliderBehavior(const ImRect& bb, ImGuiID id, ImGuiDataType data_type, void* p_v, const void* p_min, const void* p_max, const char* format, ImGuiSliderFlags flags, ImRect* out_grab_bb); + IMGUI_API bool SplitterBehavior(const ImRect& bb, ImGuiID id, ImGuiAxis axis, float* size1, float* size2, float min_size1, float min_size2, float hover_extend = 0.0f, float hover_visibility_delay = 0.0f, ImU32 bg_col = 0); + + // Widgets: Tree Nodes IMGUI_API bool TreeNodeBehavior(ImGuiID id, ImGuiTreeNodeFlags flags, const char* label, const char* label_end = NULL); - IMGUI_API bool TreeNodeBehaviorIsOpen(ImGuiID id, ImGuiTreeNodeFlags flags = 0); // Consume previous SetNextItemOpen() data, if any. May return true when logging IMGUI_API void TreePushOverrideID(ImGuiID id); + IMGUI_API bool TreeNodeGetOpen(ImGuiID storage_id); + IMGUI_API void TreeNodeSetOpen(ImGuiID storage_id, bool open); + IMGUI_API bool TreeNodeUpdateNextOpen(ImGuiID storage_id, ImGuiTreeNodeFlags flags); // Return open state. Consume previous SetNextItemOpen() data, if any. May return true when logging. // Template functions are instantiated in imgui_widgets.cpp for a finite number of types. // To use them externally (for custom widget) you may need an "extern template" statement in your code in order to link to existing instances and silence Clang warnings (see #2036). // e.g. " extern template IMGUI_API float RoundScalarWithFormatT(const char* format, ImGuiDataType data_type, float v); " - template IMGUI_API bool DragBehaviorT(ImGuiDataType data_type, T* v, float v_speed, T v_min, T v_max, const char* format, float power, ImGuiDragFlags flags); - template IMGUI_API bool SliderBehaviorT(const ImRect& bb, ImGuiID id, ImGuiDataType data_type, T* v, T v_min, T v_max, const char* format, float power, ImGuiSliderFlags flags, ImRect* out_grab_bb); - template IMGUI_API float SliderCalcRatioFromValueT(ImGuiDataType data_type, T v, T v_min, T v_max, float power, float linear_zero_pos); - template IMGUI_API T RoundScalarWithFormatT(const char* format, ImGuiDataType data_type, T v); + template IMGUI_API float ScaleRatioFromValueT(ImGuiDataType data_type, T v, T v_min, T v_max, bool is_logarithmic, float logarithmic_zero_epsilon, float zero_deadzone_size); + template IMGUI_API T ScaleValueFromRatioT(ImGuiDataType data_type, float t, T v_min, T v_max, bool is_logarithmic, float logarithmic_zero_epsilon, float zero_deadzone_size); + template IMGUI_API bool DragBehaviorT(ImGuiDataType data_type, T* v, float v_speed, T v_min, T v_max, const char* format, ImGuiSliderFlags flags); + template IMGUI_API bool SliderBehaviorT(const ImRect& bb, ImGuiID id, ImGuiDataType data_type, T* v, T v_min, T v_max, const char* format, ImGuiSliderFlags flags, ImRect* out_grab_bb); + template IMGUI_API T RoundScalarWithFormatT(const char* format, ImGuiDataType data_type, T v); + template IMGUI_API bool CheckboxFlagsT(const char* label, T* flags, T flags_value); // Data type helpers IMGUI_API const ImGuiDataTypeInfo* DataTypeGetInfo(ImGuiDataType data_type); - IMGUI_API int DataTypeFormatString(char* buf, int buf_size, ImGuiDataType data_type, const void* data_ptr, const char* format); - IMGUI_API void DataTypeApplyOp(ImGuiDataType data_type, int op, void* output, void* arg_1, const void* arg_2); - IMGUI_API bool DataTypeApplyOpFromText(const char* buf, const char* initial_value_buf, ImGuiDataType data_type, void* data_ptr, const char* format); + IMGUI_API int DataTypeFormatString(char* buf, int buf_size, ImGuiDataType data_type, const void* p_data, const char* format); + IMGUI_API void DataTypeApplyOp(ImGuiDataType data_type, int op, void* output, const void* arg_1, const void* arg_2); + IMGUI_API bool DataTypeApplyFromText(const char* buf, ImGuiDataType data_type, void* p_data, const char* format, void* p_data_when_empty = NULL); + IMGUI_API int DataTypeCompare(ImGuiDataType data_type, const void* arg_1, const void* arg_2); + IMGUI_API bool DataTypeClamp(ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max); + IMGUI_API bool DataTypeIsZero(ImGuiDataType data_type, const void* p_data); // InputText IMGUI_API bool InputTextEx(const char* label, const char* hint, char* buf, int buf_size, const ImVec2& size_arg, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback = NULL, void* user_data = NULL); - IMGUI_API bool TempInputTextScalar(const ImRect& bb, ImGuiID id, const char* label, ImGuiDataType data_type, void* data_ptr, const char* format); - inline bool TempInputTextIsActive(ImGuiID id) { ImGuiContext& g = *GImGui; return (g.ActiveId == id && g.TempInputTextId == id); } + IMGUI_API void InputTextDeactivateHook(ImGuiID id); + IMGUI_API bool TempInputText(const ImRect& bb, ImGuiID id, const char* label, char* buf, int buf_size, ImGuiInputTextFlags flags); + IMGUI_API bool TempInputScalar(const ImRect& bb, ImGuiID id, const char* label, ImGuiDataType data_type, void* p_data, const char* format, const void* p_clamp_min = NULL, const void* p_clamp_max = NULL); + inline bool TempInputIsActive(ImGuiID id) { ImGuiContext& g = *GImGui; return (g.ActiveId == id && g.TempInputId == id); } + inline ImGuiInputTextState* GetInputTextState(ImGuiID id) { ImGuiContext& g = *GImGui; return (id != 0 && g.InputTextState.ID == id) ? &g.InputTextState : NULL; } // Get input text state if active + IMGUI_API void SetNextItemRefVal(ImGuiDataType data_type, void* p_data); + inline bool IsItemActiveAsInputText() { ImGuiContext& g = *GImGui; return g.ActiveId != 0 && g.ActiveId == g.LastItemData.ID && g.InputTextState.ID == g.LastItemData.ID; } // This may be useful to apply workaround that a based on distinguish whenever an item is active as a text input field. // Color IMGUI_API void ColorTooltip(const char* text, const float* col, ImGuiColorEditFlags flags); @@ -1691,55 +3802,130 @@ namespace ImGui IMGUI_API void ColorPickerOptionsPopup(const float* ref_col, ImGuiColorEditFlags flags); // Plot - IMGUI_API void PlotEx(ImGuiPlotType plot_type, const char* label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 frame_size); + IMGUI_API int PlotEx(ImGuiPlotType plot_type, const char* label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_offset, const char* overlay_text, float scale_min, float scale_max, const ImVec2& size_arg); // Shade functions (write over already created vertices) IMGUI_API void ShadeVertsLinearColorGradientKeepAlpha(ImDrawList* draw_list, int vert_start_idx, int vert_end_idx, ImVec2 gradient_p0, ImVec2 gradient_p1, ImU32 col0, ImU32 col1); IMGUI_API void ShadeVertsLinearUV(ImDrawList* draw_list, int vert_start_idx, int vert_end_idx, const ImVec2& a, const ImVec2& b, const ImVec2& uv_a, const ImVec2& uv_b, bool clamp); + IMGUI_API void ShadeVertsTransformPos(ImDrawList* draw_list, int vert_start_idx, int vert_end_idx, const ImVec2& pivot_in, float cos_a, float sin_a, const ImVec2& pivot_out); + + // Garbage collection + IMGUI_API void GcCompactTransientMiscBuffers(); + IMGUI_API void GcCompactTransientWindowBuffers(ImGuiWindow* window); + IMGUI_API void GcAwakeTransientWindowBuffers(ImGuiWindow* window); + + // Error handling, State Recovery + IMGUI_API bool ErrorLog(const char* msg); + IMGUI_API void ErrorRecoveryStoreState(ImGuiErrorRecoveryState* state_out); + IMGUI_API void ErrorRecoveryTryToRecoverState(const ImGuiErrorRecoveryState* state_in); + IMGUI_API void ErrorRecoveryTryToRecoverWindowState(const ImGuiErrorRecoveryState* state_in); + IMGUI_API void ErrorCheckUsingSetCursorPosToExtendParentBoundaries(); + IMGUI_API void ErrorCheckEndFrameFinalizeErrorTooltip(); + IMGUI_API bool BeginErrorTooltip(); + IMGUI_API void EndErrorTooltip(); // Debug Tools - inline void DebugStartItemPicker() { GImGui->DebugItemPickerActive = true; } + IMGUI_API void DebugAllocHook(ImGuiDebugAllocInfo* info, int frame_count, void* ptr, size_t size); // size >= 0 : alloc, size = -1 : free + IMGUI_API void DebugDrawCursorPos(ImU32 col = IM_COL32(255, 0, 0, 255)); + IMGUI_API void DebugDrawLineExtents(ImU32 col = IM_COL32(255, 0, 0, 255)); + IMGUI_API void DebugDrawItemRect(ImU32 col = IM_COL32(255, 0, 0, 255)); + IMGUI_API void DebugTextUnformattedWithLocateItem(const char* line_begin, const char* line_end); + IMGUI_API void DebugLocateItem(ImGuiID target_id); // Call sparingly: only 1 at the same time! + IMGUI_API void DebugLocateItemOnHover(ImGuiID target_id); // Only call on reaction to a mouse Hover: because only 1 at the same time! + IMGUI_API void DebugLocateItemResolveWithLastItem(); + IMGUI_API void DebugBreakClearData(); + IMGUI_API bool DebugBreakButton(const char* label, const char* description_of_location); + IMGUI_API void DebugBreakButtonTooltip(bool keyboard_only, const char* description_of_location); + IMGUI_API void ShowFontAtlas(ImFontAtlas* atlas); + IMGUI_API void DebugHookIdInfo(ImGuiID id, ImGuiDataType data_type, const void* data_id, const void* data_id_end); + IMGUI_API void DebugNodeColumns(ImGuiOldColumns* columns); + IMGUI_API void DebugNodeDockNode(ImGuiDockNode* node, const char* label); + IMGUI_API void DebugNodeDrawList(ImGuiWindow* window, ImGuiViewportP* viewport, const ImDrawList* draw_list, const char* label); + IMGUI_API void DebugNodeDrawCmdShowMeshAndBoundingBox(ImDrawList* out_draw_list, const ImDrawList* draw_list, const ImDrawCmd* draw_cmd, bool show_mesh, bool show_aabb); + IMGUI_API void DebugNodeFont(ImFont* font); + IMGUI_API void DebugNodeFontGlyph(ImFont* font, const ImFontGlyph* glyph); + IMGUI_API void DebugNodeStorage(ImGuiStorage* storage, const char* label); + IMGUI_API void DebugNodeTabBar(ImGuiTabBar* tab_bar, const char* label); + IMGUI_API void DebugNodeTable(ImGuiTable* table); + IMGUI_API void DebugNodeTableSettings(ImGuiTableSettings* settings); + IMGUI_API void DebugNodeInputTextState(ImGuiInputTextState* state); + IMGUI_API void DebugNodeTypingSelectState(ImGuiTypingSelectState* state); + IMGUI_API void DebugNodeMultiSelectState(ImGuiMultiSelectState* state); + IMGUI_API void DebugNodeWindow(ImGuiWindow* window, const char* label); + IMGUI_API void DebugNodeWindowSettings(ImGuiWindowSettings* settings); + IMGUI_API void DebugNodeWindowsList(ImVector* windows, const char* label); + IMGUI_API void DebugNodeWindowsListByBeginStackParent(ImGuiWindow** windows, int windows_size, ImGuiWindow* parent_in_begin_stack); + IMGUI_API void DebugNodeViewport(ImGuiViewportP* viewport); + IMGUI_API void DebugNodePlatformMonitor(ImGuiPlatformMonitor* monitor, const char* label, int idx); + IMGUI_API void DebugRenderKeyboardPreview(ImDrawList* draw_list); + IMGUI_API void DebugRenderViewportThumbnail(ImDrawList* draw_list, ImGuiViewportP* viewport, const ImRect& bb); + + // Obsolete functions +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + //inline void SetItemUsingMouseWheel() { SetItemKeyOwner(ImGuiKey_MouseWheelY); } // Changed in 1.89 + //inline bool TreeNodeBehaviorIsOpen(ImGuiID id, ImGuiTreeNodeFlags flags = 0) { return TreeNodeUpdateNextOpen(id, flags); } // Renamed in 1.89 + //inline bool IsKeyPressedMap(ImGuiKey key, bool repeat = true) { IM_ASSERT(IsNamedKey(key)); return IsKeyPressed(key, repeat); } // Removed in 1.87: Mapping from named key is always identity! + + // Refactored focus/nav/tabbing system in 1.82 and 1.84. If you have old/custom copy-and-pasted widgets which used FocusableItemRegister(): + // (Old) IMGUI_VERSION_NUM < 18209: using 'ItemAdd(....)' and 'bool tab_focused = FocusableItemRegister(...)' + // (Old) IMGUI_VERSION_NUM >= 18209: using 'ItemAdd(..., ImGuiItemAddFlags_Focusable)' and 'bool tab_focused = (g.LastItemData.StatusFlags & ImGuiItemStatusFlags_Focused) != 0' + // (New) IMGUI_VERSION_NUM >= 18413: using 'ItemAdd(..., ImGuiItemFlags_Inputable)' and 'bool tab_focused = (g.NavActivateId == id && (g.NavActivateFlags & ImGuiActivateFlags_PreferInput))' + //inline bool FocusableItemRegister(ImGuiWindow* window, ImGuiID id) // -> pass ImGuiItemAddFlags_Inputable flag to ItemAdd() + //inline void FocusableItemUnregister(ImGuiWindow* window) // -> unnecessary: TempInputText() uses ImGuiInputTextFlags_MergedItem +#endif } // namespace ImGui -// ImFontAtlas internals -IMGUI_API bool ImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas); -IMGUI_API void ImFontAtlasBuildRegisterDefaultCustomRects(ImFontAtlas* atlas); -IMGUI_API void ImFontAtlasBuildSetupFont(ImFontAtlas* atlas, ImFont* font, ImFontConfig* font_config, float ascent, float descent); -IMGUI_API void ImFontAtlasBuildPackCustomRects(ImFontAtlas* atlas, void* stbrp_context_opaque); -IMGUI_API void ImFontAtlasBuildFinish(ImFontAtlas* atlas); -IMGUI_API void ImFontAtlasBuildMultiplyCalcLookupTable(unsigned char out_table[256], float in_multiply_factor); -IMGUI_API void ImFontAtlasBuildMultiplyRectAlpha8(const unsigned char table[256], unsigned char* pixels, int x, int y, int w, int h, int stride); -// Debug Tools -// Use 'Metrics->Tools->Item Picker' to break into the call-stack of a specific item. -#ifndef IM_DEBUG_BREAK -#if defined(__clang__) -#define IM_DEBUG_BREAK() __builtin_debugtrap() -#elif defined (_MSC_VER) -#define IM_DEBUG_BREAK() __debugbreak() -#else -#define IM_DEBUG_BREAK() IM_ASSERT(0) // It is expected that you define IM_DEBUG_BREAK() into something that will break nicely in a debugger! +//----------------------------------------------------------------------------- +// [SECTION] ImFontAtlas internal API +//----------------------------------------------------------------------------- + +// This structure is likely to evolve as we add support for incremental atlas updates. +// Conceptually this could be in ImGuiPlatformIO, but we are far from ready to make this public. +struct ImFontBuilderIO +{ + bool (*FontBuilder_Build)(ImFontAtlas* atlas); +}; + +// Helper for font builder +#ifdef IMGUI_ENABLE_STB_TRUETYPE +IMGUI_API const ImFontBuilderIO* ImFontAtlasGetBuilderForStbTruetype(); #endif -#endif // #ifndef IM_DEBUG_BREAK +IMGUI_API void ImFontAtlasUpdateSourcesPointers(ImFontAtlas* atlas); +IMGUI_API void ImFontAtlasBuildInit(ImFontAtlas* atlas); +IMGUI_API void ImFontAtlasBuildSetupFont(ImFontAtlas* atlas, ImFont* font, ImFontConfig* src, float ascent, float descent); +IMGUI_API void ImFontAtlasBuildPackCustomRects(ImFontAtlas* atlas, void* stbrp_context_opaque); +IMGUI_API void ImFontAtlasBuildFinish(ImFontAtlas* atlas); +IMGUI_API void ImFontAtlasBuildRender8bppRectFromString(ImFontAtlas* atlas, int x, int y, int w, int h, const char* in_str, char in_marker_char, unsigned char in_marker_pixel_value); +IMGUI_API void ImFontAtlasBuildRender32bppRectFromString(ImFontAtlas* atlas, int x, int y, int w, int h, const char* in_str, char in_marker_char, unsigned int in_marker_pixel_value); +IMGUI_API void ImFontAtlasBuildMultiplyCalcLookupTable(unsigned char out_table[256], float in_multiply_factor); +IMGUI_API void ImFontAtlasBuildMultiplyRectAlpha8(const unsigned char table[256], unsigned char* pixels, int x, int y, int w, int h, int stride); +IMGUI_API void ImFontAtlasBuildGetOversampleFactors(const ImFontConfig* src, int* out_oversample_h, int* out_oversample_v); + +IMGUI_API bool ImFontAtlasGetMouseCursorTexData(ImFontAtlas* atlas, ImGuiMouseCursor cursor_type, ImVec2* out_offset, ImVec2* out_size, ImVec2 out_uv_border[2], ImVec2 out_uv_fill[2]); + +//----------------------------------------------------------------------------- +// [SECTION] Test Engine specific hooks (imgui_test_engine) +//----------------------------------------------------------------------------- -// Test Engine Hooks (imgui_tests) -//#define IMGUI_ENABLE_TEST_ENGINE #ifdef IMGUI_ENABLE_TEST_ENGINE -extern void ImGuiTestEngineHook_PreNewFrame(ImGuiContext* ctx); -extern void ImGuiTestEngineHook_PostNewFrame(ImGuiContext* ctx); -extern void ImGuiTestEngineHook_ItemAdd(ImGuiContext* ctx, const ImRect& bb, ImGuiID id); -extern void ImGuiTestEngineHook_ItemInfo(ImGuiContext* ctx, ImGuiID id, const char* label, ImGuiItemStatusFlags flags); -extern void ImGuiTestEngineHook_Log(ImGuiContext* ctx, const char* fmt, ...); -#define IMGUI_TEST_ENGINE_ITEM_ADD(_BB, _ID) ImGuiTestEngineHook_ItemAdd(&g, _BB, _ID) // Register item bounding box -#define IMGUI_TEST_ENGINE_ITEM_INFO(_ID, _LABEL, _FLAGS) ImGuiTestEngineHook_ItemInfo(&g, _ID, _LABEL, _FLAGS) // Register item label and status flags (optional) -#define IMGUI_TEST_ENGINE_LOG(_FMT, ...) ImGuiTestEngineHook_Log(&g, _FMT, __VA_ARGS__) // Custom log entry from user land into test log +extern void ImGuiTestEngineHook_ItemAdd(ImGuiContext* ctx, ImGuiID id, const ImRect& bb, const ImGuiLastItemData* item_data); // item_data may be NULL +extern void ImGuiTestEngineHook_ItemInfo(ImGuiContext* ctx, ImGuiID id, const char* label, ImGuiItemStatusFlags flags); +extern void ImGuiTestEngineHook_Log(ImGuiContext* ctx, const char* fmt, ...); +extern const char* ImGuiTestEngine_FindItemDebugLabel(ImGuiContext* ctx, ImGuiID id); + +// In IMGUI_VERSION_NUM >= 18934: changed IMGUI_TEST_ENGINE_ITEM_ADD(bb,id) to IMGUI_TEST_ENGINE_ITEM_ADD(id,bb,item_data); +#define IMGUI_TEST_ENGINE_ITEM_ADD(_ID,_BB,_ITEM_DATA) if (g.TestEngineHookItems) ImGuiTestEngineHook_ItemAdd(&g, _ID, _BB, _ITEM_DATA) // Register item bounding box +#define IMGUI_TEST_ENGINE_ITEM_INFO(_ID,_LABEL,_FLAGS) if (g.TestEngineHookItems) ImGuiTestEngineHook_ItemInfo(&g, _ID, _LABEL, _FLAGS) // Register item label and status flags (optional) +#define IMGUI_TEST_ENGINE_LOG(_FMT,...) ImGuiTestEngineHook_Log(&g, _FMT, __VA_ARGS__) // Custom log entry from user land into test log #else -#define IMGUI_TEST_ENGINE_ITEM_ADD(_BB, _ID) do { } while (0) -#define IMGUI_TEST_ENGINE_ITEM_INFO(_ID, _LABEL, _FLAGS) do { } while (0) -#define IMGUI_TEST_ENGINE_LOG(_FMT, ...) do { } while (0) +#define IMGUI_TEST_ENGINE_ITEM_ADD(_BB,_ID) ((void)0) +#define IMGUI_TEST_ENGINE_ITEM_INFO(_ID,_LABEL,_FLAGS) ((void)g) #endif +//----------------------------------------------------------------------------- + #if defined(__clang__) #pragma clang diagnostic pop #elif defined(__GNUC__) @@ -1749,3 +3935,5 @@ extern void ImGuiTestEngineHook_Log(ImGuiContext* ctx, const cha #ifdef _MSC_VER #pragma warning (pop) #endif + +#endif // #ifndef IMGUI_DISABLE diff --git a/imgui/imgui_tables.cpp b/imgui/imgui_tables.cpp new file mode 100644 index 000000000..c98aea2d1 --- /dev/null +++ b/imgui/imgui_tables.cpp @@ -0,0 +1,4525 @@ +// dear imgui, v1.91b +// (tables and columns code) + +/* + +Index of this file: + +// [SECTION] Commentary +// [SECTION] Header mess +// [SECTION] Tables: Main code +// [SECTION] Tables: Simple accessors +// [SECTION] Tables: Row changes +// [SECTION] Tables: Columns changes +// [SECTION] Tables: Columns width management +// [SECTION] Tables: Drawing +// [SECTION] Tables: Sorting +// [SECTION] Tables: Headers +// [SECTION] Tables: Context Menu +// [SECTION] Tables: Settings (.ini data) +// [SECTION] Tables: Garbage Collection +// [SECTION] Tables: Debugging +// [SECTION] Columns, BeginColumns, EndColumns, etc. + +*/ + +// Navigating this file: +// - In Visual Studio: CTRL+comma ("Edit.GoToAll") can follow symbols inside comments, whereas CTRL+F12 ("Edit.GoToImplementation") cannot. +// - In Visual Studio w/ Visual Assist installed: ALT+G ("VAssistX.GoToImplementation") can also follow symbols inside comments. +// - In VS Code, CLion, etc.: CTRL+click can follow symbols inside comments. + +//----------------------------------------------------------------------------- +// [SECTION] Commentary +//----------------------------------------------------------------------------- + +//----------------------------------------------------------------------------- +// Typical tables call flow: (root level is generally public API): +//----------------------------------------------------------------------------- +// - BeginTable() user begin into a table +// | BeginChild() - (if ScrollX/ScrollY is set) +// | TableBeginInitMemory() - first time table is used +// | TableResetSettings() - on settings reset +// | TableLoadSettings() - on settings load +// | TableBeginApplyRequests() - apply queued resizing/reordering/hiding requests +// | - TableSetColumnWidth() - apply resizing width (for mouse resize, often requested by previous frame) +// | - TableUpdateColumnsWeightFromWidth()- recompute columns weights (of stretch columns) from their respective width +// - TableSetupColumn() user submit columns details (optional) +// - TableSetupScrollFreeze() user submit scroll freeze information (optional) +//----------------------------------------------------------------------------- +// - TableUpdateLayout() [Internal] followup to BeginTable(): setup everything: widths, columns positions, clipping rectangles. Automatically called by the FIRST call to TableNextRow() or TableHeadersRow(). +// | TableSetupDrawChannels() - setup ImDrawList channels +// | TableUpdateBorders() - detect hovering columns for resize, ahead of contents submission +// | TableBeginContextMenuPopup() +// | - TableDrawDefaultContextMenu() - draw right-click context menu contents +//----------------------------------------------------------------------------- +// - TableHeadersRow() or TableHeader() user submit a headers row (optional) +// | TableSortSpecsClickColumn() - when left-clicked: alter sort order and sort direction +// | TableOpenContextMenu() - when right-clicked: trigger opening of the default context menu +// - TableGetSortSpecs() user queries updated sort specs (optional, generally after submitting headers) +// - TableNextRow() user begin into a new row (also automatically called by TableHeadersRow()) +// | TableEndRow() - finish existing row +// | TableBeginRow() - add a new row +// - TableSetColumnIndex() / TableNextColumn() user begin into a cell +// | TableEndCell() - close existing column/cell +// | TableBeginCell() - enter into current column/cell +// - [...] user emit contents +//----------------------------------------------------------------------------- +// - EndTable() user ends the table +// | TableDrawBorders() - draw outer borders, inner vertical borders +// | TableMergeDrawChannels() - merge draw channels if clipping isn't required +// | EndChild() - (if ScrollX/ScrollY is set) +//----------------------------------------------------------------------------- + +//----------------------------------------------------------------------------- +// TABLE SIZING +//----------------------------------------------------------------------------- +// (Read carefully because this is subtle but it does make sense!) +//----------------------------------------------------------------------------- +// About 'outer_size': +// Its meaning needs to differ slightly depending on if we are using ScrollX/ScrollY flags. +// Default value is ImVec2(0.0f, 0.0f). +// X +// - outer_size.x <= 0.0f -> Right-align from window/work-rect right-most edge. With -FLT_MIN or 0.0f will align exactly on right-most edge. +// - outer_size.x > 0.0f -> Set Fixed width. +// Y with ScrollX/ScrollY disabled: we output table directly in current window +// - outer_size.y < 0.0f -> Bottom-align (but will auto extend, unless _NoHostExtendY is set). Not meaningful if parent window can vertically scroll. +// - outer_size.y = 0.0f -> No minimum height (but will auto extend, unless _NoHostExtendY is set) +// - outer_size.y > 0.0f -> Set Minimum height (but will auto extend, unless _NoHostExtendY is set) +// Y with ScrollX/ScrollY enabled: using a child window for scrolling +// - outer_size.y < 0.0f -> Bottom-align. Not meaningful if parent window can vertically scroll. +// - outer_size.y = 0.0f -> Bottom-align, consistent with BeginChild(). Not recommended unless table is last item in parent window. +// - outer_size.y > 0.0f -> Set Exact height. Recommended when using Scrolling on any axis. +//----------------------------------------------------------------------------- +// Outer size is also affected by the NoHostExtendX/NoHostExtendY flags. +// Important to note how the two flags have slightly different behaviors! +// - ImGuiTableFlags_NoHostExtendX -> Make outer width auto-fit to columns (overriding outer_size.x value). Only available when ScrollX/ScrollY are disabled and Stretch columns are not used. +// - ImGuiTableFlags_NoHostExtendY -> Make outer height stop exactly at outer_size.y (prevent auto-extending table past the limit). Only available when ScrollX/ScrollY is disabled. Data below the limit will be clipped and not visible. +// In theory ImGuiTableFlags_NoHostExtendY could be the default and any non-scrolling tables with outer_size.y != 0.0f would use exact height. +// This would be consistent but perhaps less useful and more confusing (as vertically clipped items are not useful and not easily noticeable). +//----------------------------------------------------------------------------- +// About 'inner_width': +// With ScrollX disabled: +// - inner_width -> *ignored* +// With ScrollX enabled: +// - inner_width < 0.0f -> *illegal* fit in known width (right align from outer_size.x) <-- weird +// - inner_width = 0.0f -> fit in outer_width: Fixed size columns will take space they need (if avail, otherwise shrink down), Stretch columns becomes Fixed columns. +// - inner_width > 0.0f -> override scrolling width, generally to be larger than outer_size.x. Fixed column take space they need (if avail, otherwise shrink down), Stretch columns share remaining space! +//----------------------------------------------------------------------------- +// Details: +// - If you want to use Stretch columns with ScrollX, you generally need to specify 'inner_width' otherwise the concept +// of "available space" doesn't make sense. +// - Even if not really useful, we allow 'inner_width < outer_size.x' for consistency and to facilitate understanding +// of what the value does. +//----------------------------------------------------------------------------- + +//----------------------------------------------------------------------------- +// COLUMNS SIZING POLICIES +// (Reference: ImGuiTableFlags_SizingXXX flags and ImGuiTableColumnFlags_WidthXXX flags) +//----------------------------------------------------------------------------- +// About overriding column sizing policy and width/weight with TableSetupColumn(): +// We use a default parameter of -1 for 'init_width'/'init_weight'. +// - with ImGuiTableColumnFlags_WidthFixed, init_width <= 0 (default) --> width is automatic +// - with ImGuiTableColumnFlags_WidthFixed, init_width > 0 (explicit) --> width is custom +// - with ImGuiTableColumnFlags_WidthStretch, init_weight <= 0 (default) --> weight is 1.0f +// - with ImGuiTableColumnFlags_WidthStretch, init_weight > 0 (explicit) --> weight is custom +// Widths are specified _without_ CellPadding. If you specify a width of 100.0f, the column will be cover (100.0f + Padding * 2.0f) +// and you can fit a 100.0f wide item in it without clipping and with padding honored. +//----------------------------------------------------------------------------- +// About default sizing policy (if you don't specify a ImGuiTableColumnFlags_WidthXXXX flag) +// - with Table policy ImGuiTableFlags_SizingFixedFit --> default Column policy is ImGuiTableColumnFlags_WidthFixed, default Width is equal to contents width +// - with Table policy ImGuiTableFlags_SizingFixedSame --> default Column policy is ImGuiTableColumnFlags_WidthFixed, default Width is max of all contents width +// - with Table policy ImGuiTableFlags_SizingStretchSame --> default Column policy is ImGuiTableColumnFlags_WidthStretch, default Weight is 1.0f +// - with Table policy ImGuiTableFlags_SizingStretchWeight --> default Column policy is ImGuiTableColumnFlags_WidthStretch, default Weight is proportional to contents +// Default Width and default Weight can be overridden when calling TableSetupColumn(). +//----------------------------------------------------------------------------- +// About mixing Fixed/Auto and Stretch columns together: +// - the typical use of mixing sizing policies is: any number of LEADING Fixed columns, followed by one or two TRAILING Stretch columns. +// - using mixed policies with ScrollX does not make much sense, as using Stretch columns with ScrollX does not make much sense in the first place! +// that is, unless 'inner_width' is passed to BeginTable() to explicitly provide a total width to layout columns in. +// - when using ImGuiTableFlags_SizingFixedSame with mixed columns, only the Fixed/Auto columns will match their widths to the width of the maximum contents. +// - when using ImGuiTableFlags_SizingStretchSame with mixed columns, only the Stretch columns will match their weights/widths. +//----------------------------------------------------------------------------- +// About using column width: +// If a column is manually resizable or has a width specified with TableSetupColumn(): +// - you may use GetContentRegionAvail().x to query the width available in a given column. +// - right-side alignment features such as SetNextItemWidth(-x) or PushItemWidth(-x) will rely on this width. +// If the column is not resizable and has no width specified with TableSetupColumn(): +// - its width will be automatic and be set to the max of items submitted. +// - therefore you generally cannot have ALL items of the columns use e.g. SetNextItemWidth(-FLT_MIN). +// - but if the column has one or more items of known/fixed size, this will become the reference width used by SetNextItemWidth(-FLT_MIN). +//----------------------------------------------------------------------------- + + +//----------------------------------------------------------------------------- +// TABLES CLIPPING/CULLING +//----------------------------------------------------------------------------- +// About clipping/culling of Rows in Tables: +// - For large numbers of rows, it is recommended you use ImGuiListClipper to submit only visible rows. +// ImGuiListClipper is reliant on the fact that rows are of equal height. +// See 'Demo->Tables->Vertical Scrolling' or 'Demo->Tables->Advanced' for a demo of using the clipper. +// - Note that auto-resizing columns don't play well with using the clipper. +// By default a table with _ScrollX but without _Resizable will have column auto-resize. +// So, if you want to use the clipper, make sure to either enable _Resizable, either setup columns width explicitly with _WidthFixed. +//----------------------------------------------------------------------------- +// About clipping/culling of Columns in Tables: +// - Both TableSetColumnIndex() and TableNextColumn() return true when the column is visible or performing +// width measurements. Otherwise, you may skip submitting the contents of a cell/column, BUT ONLY if you know +// it is not going to contribute to row height. +// In many situations, you may skip submitting contents for every column but one (e.g. the first one). +// - Case A: column is not hidden by user, and at least partially in sight (most common case). +// - Case B: column is clipped / out of sight (because of scrolling or parent ClipRect): TableNextColumn() return false as a hint but we still allow layout output. +// - Case C: column is hidden explicitly by the user (e.g. via the context menu, or _DefaultHide column flag, etc.). +// +// [A] [B] [C] +// TableNextColumn(): true false false -> [userland] when TableNextColumn() / TableSetColumnIndex() returns false, user can skip submitting items but only if the column doesn't contribute to row height. +// SkipItems: false false true -> [internal] when SkipItems is true, most widgets will early out if submitted, resulting is no layout output. +// ClipRect: normal zero-width zero-width -> [internal] when ClipRect is zero, ItemAdd() will return false and most widgets will early out mid-way. +// ImDrawList output: normal dummy dummy -> [internal] when using the dummy channel, ImDrawList submissions (if any) will be wasted (because cliprect is zero-width anyway). +// +// - We need to distinguish those cases because non-hidden columns that are clipped outside of scrolling bounds should still contribute their height to the row. +// However, in the majority of cases, the contribution to row height is the same for all columns, or the tallest cells are known by the programmer. +//----------------------------------------------------------------------------- +// About clipping/culling of whole Tables: +// - Scrolling tables with a known outer size can be clipped earlier as BeginTable() will return false. +//----------------------------------------------------------------------------- + +//----------------------------------------------------------------------------- +// [SECTION] Header mess +//----------------------------------------------------------------------------- + +#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS) +#define _CRT_SECURE_NO_WARNINGS +#endif + +#ifndef IMGUI_DEFINE_MATH_OPERATORS +#define IMGUI_DEFINE_MATH_OPERATORS +#endif + +#include "imgui.h" +#ifndef IMGUI_DISABLE +#include "imgui_internal.h" + +// System includes +#include // intptr_t + +// Visual Studio warnings +#ifdef _MSC_VER +#pragma warning (disable: 4127) // condition expression is constant +#pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen +#if defined(_MSC_VER) && _MSC_VER >= 1922 // MSVC 2019 16.2 or later +#pragma warning (disable: 5054) // operator '|': deprecated between enumerations of different types +#endif +#pragma warning (disable: 26451) // [Static Analyzer] Arithmetic overflow : Using operator 'xxx' on a 4 byte value and then casting the result to a 8 byte value. Cast the value to the wider type before calling operator 'xxx' to avoid overflow(io.2). +#pragma warning (disable: 26812) // [Static Analyzer] The enum type 'xxx' is unscoped. Prefer 'enum class' over 'enum' (Enum.3). +#endif + +// Clang/GCC warnings with -Weverything +#if defined(__clang__) +#if __has_warning("-Wunknown-warning-option") +#pragma clang diagnostic ignored "-Wunknown-warning-option" // warning: unknown warning group 'xxx' // not all warnings are known by all Clang versions and they tend to be rename-happy.. so ignoring warnings triggers new warnings on some configuration. Great! +#endif +#pragma clang diagnostic ignored "-Wunknown-pragmas" // warning: unknown warning group 'xxx' +#pragma clang diagnostic ignored "-Wold-style-cast" // warning: use of old-style cast // yes, they are more terse. +#pragma clang diagnostic ignored "-Wfloat-equal" // warning: comparing floating point with == or != is unsafe // storing and comparing against same constants (typically 0.0f) is ok. +#pragma clang diagnostic ignored "-Wformat" // warning: format specifies type 'int' but the argument has type 'unsigned int' +#pragma clang diagnostic ignored "-Wformat-nonliteral" // warning: format string is not a string literal // passing non-literal to vsnformat(). yes, user passing incorrect format strings can crash the code. +#pragma clang diagnostic ignored "-Wsign-conversion" // warning: implicit conversion changes signedness +#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" // warning: zero as null pointer constant // some standard header variations use #define NULL 0 +#pragma clang diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function // using printf() is a misery with this as C++ va_arg ellipsis changes float to double. +#pragma clang diagnostic ignored "-Wenum-enum-conversion" // warning: bitwise operation between different enumeration types ('XXXFlags_' and 'XXXFlagsPrivate_') +#pragma clang diagnostic ignored "-Wdeprecated-enum-enum-conversion"// warning: bitwise operation between different enumeration types ('XXXFlags_' and 'XXXFlagsPrivate_') is deprecated +#pragma clang diagnostic ignored "-Wimplicit-int-float-conversion" // warning: implicit conversion from 'xxx' to 'float' may lose precision +#pragma clang diagnostic ignored "-Wunsafe-buffer-usage" // warning: 'xxx' is an unsafe pointer used for buffer access +#pragma clang diagnostic ignored "-Wnontrivial-memaccess" // warning: first argument in call to 'memset' is a pointer to non-trivially copyable type +#pragma clang diagnostic ignored "-Wswitch-default" // warning: 'switch' missing 'default' label +#elif defined(__GNUC__) +#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind +#pragma GCC diagnostic ignored "-Wfloat-equal" // warning: comparing floating-point with '==' or '!=' is unsafe +#pragma GCC diagnostic ignored "-Wformat-nonliteral" // warning: format not a string literal, format string not checked +#pragma GCC diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function +#pragma GCC diagnostic ignored "-Wformat" // warning: format '%p' expects argument of type 'int'/'void*', but argument X has type 'unsigned int'/'ImGuiWindow*' +#pragma GCC diagnostic ignored "-Wstrict-overflow" +#pragma GCC diagnostic ignored "-Wclass-memaccess" // [__GNUC__ >= 8] warning: 'memset/memcpy' clearing/writing an object of type 'xxxx' with no trivial copy-assignment; use assignment or value-initialization instead +#endif + +//----------------------------------------------------------------------------- +// [SECTION] Tables: Main code +//----------------------------------------------------------------------------- +// - TableFixFlags() [Internal] +// - TableFindByID() [Internal] +// - BeginTable() +// - BeginTableEx() [Internal] +// - TableBeginInitMemory() [Internal] +// - TableBeginApplyRequests() [Internal] +// - TableSetupColumnFlags() [Internal] +// - TableUpdateLayout() [Internal] +// - TableUpdateBorders() [Internal] +// - EndTable() +// - TableSetupColumn() +// - TableSetupScrollFreeze() +//----------------------------------------------------------------------------- + +// Configuration +static const int TABLE_DRAW_CHANNEL_BG0 = 0; +static const int TABLE_DRAW_CHANNEL_BG2_FROZEN = 1; +static const int TABLE_DRAW_CHANNEL_NOCLIP = 2; // When using ImGuiTableFlags_NoClip (this becomes the last visible channel) +static const float TABLE_BORDER_SIZE = 1.0f; // FIXME-TABLE: Currently hard-coded because of clipping assumptions with outer borders rendering. +static const float TABLE_RESIZE_SEPARATOR_HALF_THICKNESS = 4.0f; // Extend outside inner borders. +static const float TABLE_RESIZE_SEPARATOR_FEEDBACK_TIMER = 0.06f; // Delay/timer before making the hover feedback (color+cursor) visible because tables/columns tends to be more cramped. + +// Helper +inline ImGuiTableFlags TableFixFlags(ImGuiTableFlags flags, ImGuiWindow* outer_window) +{ + // Adjust flags: set default sizing policy + if ((flags & ImGuiTableFlags_SizingMask_) == 0) + flags |= ((flags & ImGuiTableFlags_ScrollX) || (outer_window->Flags & ImGuiWindowFlags_AlwaysAutoResize)) ? ImGuiTableFlags_SizingFixedFit : ImGuiTableFlags_SizingStretchSame; + + // Adjust flags: enable NoKeepColumnsVisible when using ImGuiTableFlags_SizingFixedSame + if ((flags & ImGuiTableFlags_SizingMask_) == ImGuiTableFlags_SizingFixedSame) + flags |= ImGuiTableFlags_NoKeepColumnsVisible; + + // Adjust flags: enforce borders when resizable + if (flags & ImGuiTableFlags_Resizable) + flags |= ImGuiTableFlags_BordersInnerV; + + // Adjust flags: disable NoHostExtendX/NoHostExtendY if we have any scrolling going on + if (flags & (ImGuiTableFlags_ScrollX | ImGuiTableFlags_ScrollY)) + flags &= ~(ImGuiTableFlags_NoHostExtendX | ImGuiTableFlags_NoHostExtendY); + + // Adjust flags: NoBordersInBodyUntilResize takes priority over NoBordersInBody + if (flags & ImGuiTableFlags_NoBordersInBodyUntilResize) + flags &= ~ImGuiTableFlags_NoBordersInBody; + + // Adjust flags: disable saved settings if there's nothing to save + if ((flags & (ImGuiTableFlags_Resizable | ImGuiTableFlags_Hideable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Sortable)) == 0) + flags |= ImGuiTableFlags_NoSavedSettings; + + // Inherit _NoSavedSettings from top-level window (child windows always have _NoSavedSettings set) + if (outer_window->RootWindow->Flags & ImGuiWindowFlags_NoSavedSettings) + flags |= ImGuiTableFlags_NoSavedSettings; + + return flags; +} + +ImGuiTable* ImGui::TableFindByID(ImGuiID id) +{ + ImGuiContext& g = *GImGui; + return g.Tables.GetByKey(id); +} + +// Read about "TABLE SIZING" at the top of this file. +bool ImGui::BeginTable(const char* str_id, int columns_count, ImGuiTableFlags flags, const ImVec2& outer_size, float inner_width) +{ + ImGuiID id = GetID(str_id); + return BeginTableEx(str_id, id, columns_count, flags, outer_size, inner_width); +} + +bool ImGui::BeginTableEx(const char* name, ImGuiID id, int columns_count, ImGuiTableFlags flags, const ImVec2& outer_size, float inner_width) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* outer_window = GetCurrentWindow(); + if (outer_window->SkipItems) // Consistent with other tables + beneficial side effect that assert on miscalling EndTable() will be more visible. + return false; + + // Sanity checks + IM_ASSERT(columns_count > 0 && columns_count < IMGUI_TABLE_MAX_COLUMNS); + if (flags & ImGuiTableFlags_ScrollX) + IM_ASSERT(inner_width >= 0.0f); + + // If an outer size is specified ahead we will be able to early out when not visible. Exact clipping criteria may evolve. + // FIXME: coarse clipping because access to table data causes two issues: + // - instance numbers varying/unstable. may not be a direct problem for users, but could make outside access broken or confusing, e.g. TestEngine. + // - can't implement support for ImGuiChildFlags_ResizeY as we need to somehow pull the height data from somewhere. this also needs stable instance numbers. + // The side-effects of accessing table data on coarse clip would be: + // - always reserving the pooled ImGuiTable data ahead for a fully clipped table (minor IMHO). Also the 'outer_window_is_measuring_size' criteria may already be defeating this in some situations. + // - always performing the GetOrAddByKey() O(log N) query in g.Tables.Map[]. + const bool use_child_window = (flags & (ImGuiTableFlags_ScrollX | ImGuiTableFlags_ScrollY)) != 0; + const ImVec2 avail_size = GetContentRegionAvail(); + const ImVec2 actual_outer_size = ImTrunc(CalcItemSize(outer_size, ImMax(avail_size.x, 1.0f), use_child_window ? ImMax(avail_size.y, 1.0f) : 0.0f)); + const ImRect outer_rect(outer_window->DC.CursorPos, outer_window->DC.CursorPos + actual_outer_size); + const bool outer_window_is_measuring_size = (outer_window->AutoFitFramesX > 0) || (outer_window->AutoFitFramesY > 0); // Doesn't apply to AlwaysAutoResize windows! + if (use_child_window && IsClippedEx(outer_rect, 0) && !outer_window_is_measuring_size) + { + ItemSize(outer_rect); + ItemAdd(outer_rect, id); + g.NextWindowData.ClearFlags(); + return false; + } + + // [DEBUG] Debug break requested by user + if (g.DebugBreakInTable == id) + IM_DEBUG_BREAK(); + + // Acquire storage for the table + ImGuiTable* table = g.Tables.GetOrAddByKey(id); + + // Acquire temporary buffers + const int table_idx = g.Tables.GetIndex(table); + if (++g.TablesTempDataStacked > g.TablesTempData.Size) + g.TablesTempData.resize(g.TablesTempDataStacked, ImGuiTableTempData()); + ImGuiTableTempData* temp_data = table->TempData = &g.TablesTempData[g.TablesTempDataStacked - 1]; + temp_data->TableIndex = table_idx; + table->DrawSplitter = &table->TempData->DrawSplitter; + table->DrawSplitter->Clear(); + + // Fix flags + table->IsDefaultSizingPolicy = (flags & ImGuiTableFlags_SizingMask_) == 0; + flags = TableFixFlags(flags, outer_window); + + // Initialize + const int previous_frame_active = table->LastFrameActive; + const int instance_no = (previous_frame_active != g.FrameCount) ? 0 : table->InstanceCurrent + 1; + const ImGuiTableFlags previous_flags = table->Flags; + table->ID = id; + table->Flags = flags; + table->LastFrameActive = g.FrameCount; + table->OuterWindow = table->InnerWindow = outer_window; + table->ColumnsCount = columns_count; + table->IsLayoutLocked = false; + table->InnerWidth = inner_width; + table->NavLayer = (ImS8)outer_window->DC.NavLayerCurrent; + temp_data->UserOuterSize = outer_size; + + // Instance data (for instance 0, TableID == TableInstanceID) + ImGuiID instance_id; + table->InstanceCurrent = (ImS16)instance_no; + if (instance_no > 0) + { + IM_ASSERT(table->ColumnsCount == columns_count && "BeginTable(): Cannot change columns count mid-frame while preserving same ID"); + if (table->InstanceDataExtra.Size < instance_no) + table->InstanceDataExtra.push_back(ImGuiTableInstanceData()); + instance_id = GetIDWithSeed(instance_no, GetIDWithSeed("##Instances", NULL, id)); // Push "##Instances" followed by (int)instance_no in ID stack. + } + else + { + instance_id = id; + } + ImGuiTableInstanceData* table_instance = TableGetInstanceData(table, table->InstanceCurrent); + table_instance->TableInstanceID = instance_id; + + // When not using a child window, WorkRect.Max will grow as we append contents. + if (use_child_window) + { + // Ensure no vertical scrollbar appears if we only want horizontal one, to make flag consistent + // (we have no other way to disable vertical scrollbar of a window while keeping the horizontal one showing) + ImVec2 override_content_size(FLT_MAX, FLT_MAX); + if ((flags & ImGuiTableFlags_ScrollX) && !(flags & ImGuiTableFlags_ScrollY)) + override_content_size.y = FLT_MIN; + + // Ensure specified width (when not specified, Stretched columns will act as if the width == OuterWidth and + // never lead to any scrolling). We don't handle inner_width < 0.0f, we could potentially use it to right-align + // based on the right side of the child window work rect, which would require knowing ahead if we are going to + // have decoration taking horizontal spaces (typically a vertical scrollbar). + if ((flags & ImGuiTableFlags_ScrollX) && inner_width > 0.0f) + override_content_size.x = inner_width; + + if (override_content_size.x != FLT_MAX || override_content_size.y != FLT_MAX) + SetNextWindowContentSize(ImVec2(override_content_size.x != FLT_MAX ? override_content_size.x : 0.0f, override_content_size.y != FLT_MAX ? override_content_size.y : 0.0f)); + + // Reset scroll if we are reactivating it + if ((previous_flags & (ImGuiTableFlags_ScrollX | ImGuiTableFlags_ScrollY)) == 0) + if ((g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasScroll) == 0) + SetNextWindowScroll(ImVec2(0.0f, 0.0f)); + + // Create scrolling region (without border and zero window padding) + ImGuiChildFlags child_child_flags = (g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasChildFlags) ? g.NextWindowData.ChildFlags : ImGuiChildFlags_None; + ImGuiWindowFlags child_window_flags = (g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasWindowFlags) ? g.NextWindowData.WindowFlags : ImGuiWindowFlags_None; + if (flags & ImGuiTableFlags_ScrollX) + child_window_flags |= ImGuiWindowFlags_HorizontalScrollbar; + BeginChildEx(name, instance_id, outer_rect.GetSize(), child_child_flags, child_window_flags); + table->InnerWindow = g.CurrentWindow; + table->WorkRect = table->InnerWindow->WorkRect; + table->OuterRect = table->InnerWindow->Rect(); + table->InnerRect = table->InnerWindow->InnerRect; + IM_ASSERT(table->InnerWindow->WindowPadding.x == 0.0f && table->InnerWindow->WindowPadding.y == 0.0f && table->InnerWindow->WindowBorderSize == 0.0f); + + // Allow submitting when host is measuring + if (table->InnerWindow->SkipItems && outer_window_is_measuring_size) + table->InnerWindow->SkipItems = false; + + // When using multiple instances, ensure they have the same amount of horizontal decorations (aka vertical scrollbar) so stretched columns can be aligned) + if (instance_no == 0) + { + table->HasScrollbarYPrev = table->HasScrollbarYCurr; + table->HasScrollbarYCurr = false; + } + table->HasScrollbarYCurr |= table->InnerWindow->ScrollbarY; + } + else + { + // For non-scrolling tables, WorkRect == OuterRect == InnerRect. + // But at this point we do NOT have a correct value for .Max.y (unless a height has been explicitly passed in). It will only be updated in EndTable(). + table->WorkRect = table->OuterRect = table->InnerRect = outer_rect; + table->HasScrollbarYPrev = table->HasScrollbarYCurr = false; + } + + // Push a standardized ID for both child-using and not-child-using tables + PushOverrideID(id); + if (instance_no > 0) + PushOverrideID(instance_id); // FIXME: Somehow this is not resolved by stack-tool, even tho GetIDWithSeed() submitted the symbol. + + // Backup a copy of host window members we will modify + ImGuiWindow* inner_window = table->InnerWindow; + table->HostIndentX = inner_window->DC.Indent.x; + table->HostClipRect = inner_window->ClipRect; + table->HostSkipItems = inner_window->SkipItems; + temp_data->HostBackupWorkRect = inner_window->WorkRect; + temp_data->HostBackupParentWorkRect = inner_window->ParentWorkRect; + temp_data->HostBackupColumnsOffset = outer_window->DC.ColumnsOffset; + temp_data->HostBackupPrevLineSize = inner_window->DC.PrevLineSize; + temp_data->HostBackupCurrLineSize = inner_window->DC.CurrLineSize; + temp_data->HostBackupCursorMaxPos = inner_window->DC.CursorMaxPos; + temp_data->HostBackupItemWidth = outer_window->DC.ItemWidth; + temp_data->HostBackupItemWidthStackSize = outer_window->DC.ItemWidthStack.Size; + inner_window->DC.PrevLineSize = inner_window->DC.CurrLineSize = ImVec2(0.0f, 0.0f); + + // Make borders not overlap our contents by offsetting HostClipRect (#6765, #7428, #3752) + // (we normally shouldn't alter HostClipRect as we rely on TableMergeDrawChannels() expanding non-clipped column toward the + // limits of that rectangle, in order for ImDrawListSplitter::Merge() to merge the draw commands. However since the overlap + // problem only affect scrolling tables in this case we can get away with doing it without extra cost). + if (inner_window != outer_window) + { + // FIXME: Because inner_window's Scrollbar doesn't know about border size, since it's not encoded in window->WindowBorderSize, + // it already overlaps it and doesn't need an extra offset. Ideally we should be able to pass custom border size with + // different x/y values to BeginChild(). + if (flags & ImGuiTableFlags_BordersOuterV) + { + table->HostClipRect.Min.x = ImMin(table->HostClipRect.Min.x + TABLE_BORDER_SIZE, table->HostClipRect.Max.x); + if (inner_window->DecoOuterSizeX2 == 0.0f) + table->HostClipRect.Max.x = ImMax(table->HostClipRect.Max.x - TABLE_BORDER_SIZE, table->HostClipRect.Min.x); + } + if (flags & ImGuiTableFlags_BordersOuterH) + { + table->HostClipRect.Min.y = ImMin(table->HostClipRect.Min.y + TABLE_BORDER_SIZE, table->HostClipRect.Max.y); + if (inner_window->DecoOuterSizeY2 == 0.0f) + table->HostClipRect.Max.y = ImMax(table->HostClipRect.Max.y - TABLE_BORDER_SIZE, table->HostClipRect.Min.y); + } + } + + // Padding and Spacing + // - None ........Content..... Pad .....Content........ + // - PadOuter | Pad ..Content..... Pad .....Content.. Pad | + // - PadInner ........Content.. Pad | Pad ..Content........ + // - PadOuter+PadInner | Pad ..Content.. Pad | Pad ..Content.. Pad | + const bool pad_outer_x = (flags & ImGuiTableFlags_NoPadOuterX) ? false : (flags & ImGuiTableFlags_PadOuterX) ? true : (flags & ImGuiTableFlags_BordersOuterV) != 0; + const bool pad_inner_x = (flags & ImGuiTableFlags_NoPadInnerX) ? false : true; + const float inner_spacing_for_border = (flags & ImGuiTableFlags_BordersInnerV) ? TABLE_BORDER_SIZE : 0.0f; + const float inner_spacing_explicit = (pad_inner_x && (flags & ImGuiTableFlags_BordersInnerV) == 0) ? g.Style.CellPadding.x : 0.0f; + const float inner_padding_explicit = (pad_inner_x && (flags & ImGuiTableFlags_BordersInnerV) != 0) ? g.Style.CellPadding.x : 0.0f; + table->CellSpacingX1 = inner_spacing_explicit + inner_spacing_for_border; + table->CellSpacingX2 = inner_spacing_explicit; + table->CellPaddingX = inner_padding_explicit; + + const float outer_padding_for_border = (flags & ImGuiTableFlags_BordersOuterV) ? TABLE_BORDER_SIZE : 0.0f; + const float outer_padding_explicit = pad_outer_x ? g.Style.CellPadding.x : 0.0f; + table->OuterPaddingX = (outer_padding_for_border + outer_padding_explicit) - table->CellPaddingX; + + table->CurrentColumn = -1; + table->CurrentRow = -1; + table->RowBgColorCounter = 0; + table->LastRowFlags = ImGuiTableRowFlags_None; + table->InnerClipRect = (inner_window == outer_window) ? table->WorkRect : inner_window->ClipRect; + table->InnerClipRect.ClipWith(table->WorkRect); // We need this to honor inner_width + table->InnerClipRect.ClipWithFull(table->HostClipRect); + table->InnerClipRect.Max.y = (flags & ImGuiTableFlags_NoHostExtendY) ? ImMin(table->InnerClipRect.Max.y, inner_window->WorkRect.Max.y) : table->HostClipRect.Max.y; + + table->RowPosY1 = table->RowPosY2 = table->WorkRect.Min.y; // This is needed somehow + table->RowTextBaseline = 0.0f; // This will be cleared again by TableBeginRow() + table->RowCellPaddingY = 0.0f; + table->FreezeRowsRequest = table->FreezeRowsCount = 0; // This will be setup by TableSetupScrollFreeze(), if any + table->FreezeColumnsRequest = table->FreezeColumnsCount = 0; + table->IsUnfrozenRows = true; + table->DeclColumnsCount = table->AngledHeadersCount = 0; + if (previous_frame_active + 1 < g.FrameCount) + table->IsActiveIdInTable = false; + table->AngledHeadersHeight = 0.0f; + temp_data->AngledHeadersExtraWidth = 0.0f; + + // Using opaque colors facilitate overlapping lines of the grid, otherwise we'd need to improve TableDrawBorders() + table->BorderColorStrong = GetColorU32(ImGuiCol_TableBorderStrong); + table->BorderColorLight = GetColorU32(ImGuiCol_TableBorderLight); + + // Make table current + g.CurrentTable = table; + outer_window->DC.NavIsScrollPushableX = false; // Shortcut for NavUpdateCurrentWindowIsScrollPushableX(); + outer_window->DC.CurrentTableIdx = table_idx; + if (inner_window != outer_window) // So EndChild() within the inner window can restore the table properly. + inner_window->DC.CurrentTableIdx = table_idx; + + if ((previous_flags & ImGuiTableFlags_Reorderable) && (flags & ImGuiTableFlags_Reorderable) == 0) + table->IsResetDisplayOrderRequest = true; + + // Mark as used to avoid GC + if (table_idx >= g.TablesLastTimeActive.Size) + g.TablesLastTimeActive.resize(table_idx + 1, -1.0f); + g.TablesLastTimeActive[table_idx] = (float)g.Time; + temp_data->LastTimeActive = (float)g.Time; + table->MemoryCompacted = false; + + // Setup memory buffer (clear data if columns count changed) + ImGuiTableColumn* old_columns_to_preserve = NULL; + void* old_columns_raw_data = NULL; + const int old_columns_count = table->Columns.size(); + if (old_columns_count != 0 && old_columns_count != columns_count) + { + // Attempt to preserve width on column count change (#4046) + old_columns_to_preserve = table->Columns.Data; + old_columns_raw_data = table->RawData; + table->RawData = NULL; + } + if (table->RawData == NULL) + { + TableBeginInitMemory(table, columns_count); + table->IsInitializing = table->IsSettingsRequestLoad = true; + } + if (table->IsResetAllRequest) + TableResetSettings(table); + if (table->IsInitializing) + { + // Initialize + table->SettingsOffset = -1; + table->IsSortSpecsDirty = true; + table->IsSettingsDirty = true; // Records itself into .ini file even when in default state (#7934) + table->InstanceInteracted = -1; + table->ContextPopupColumn = -1; + table->ReorderColumn = table->ResizedColumn = table->LastResizedColumn = -1; + table->AutoFitSingleColumn = -1; + table->HoveredColumnBody = table->HoveredColumnBorder = -1; + for (int n = 0; n < columns_count; n++) + { + ImGuiTableColumn* column = &table->Columns[n]; + if (old_columns_to_preserve && n < old_columns_count) + { + // FIXME: We don't attempt to preserve column order in this path. + *column = old_columns_to_preserve[n]; + } + else + { + float width_auto = column->WidthAuto; + *column = ImGuiTableColumn(); + column->WidthAuto = width_auto; + column->IsPreserveWidthAuto = true; // Preserve WidthAuto when reinitializing a live table: not technically necessary but remove a visible flicker + column->IsEnabled = column->IsUserEnabled = column->IsUserEnabledNextFrame = true; + } + column->DisplayOrder = table->DisplayOrderToIndex[n] = (ImGuiTableColumnIdx)n; + } + } + if (old_columns_raw_data) + IM_FREE(old_columns_raw_data); + + // Load settings + if (table->IsSettingsRequestLoad) + TableLoadSettings(table); + + // Handle DPI/font resize + // This is designed to facilitate DPI changes with the assumption that e.g. style.CellPadding has been scaled as well. + // It will also react to changing fonts with mixed results. It doesn't need to be perfect but merely provide a decent transition. + // FIXME-DPI: Provide consistent standards for reference size. Perhaps using g.CurrentDpiScale would be more self explanatory. + // This is will lead us to non-rounded WidthRequest in columns, which should work but is a poorly tested path. + const float new_ref_scale_unit = g.FontSize; // g.Font->GetCharAdvance('A') ? + if (table->RefScale != 0.0f && table->RefScale != new_ref_scale_unit) + { + const float scale_factor = new_ref_scale_unit / table->RefScale; + //IMGUI_DEBUG_PRINT("[table] %08X RefScaleUnit %.3f -> %.3f, scaling width by %.3f\n", table->ID, table->RefScaleUnit, new_ref_scale_unit, scale_factor); + for (int n = 0; n < columns_count; n++) + table->Columns[n].WidthRequest = table->Columns[n].WidthRequest * scale_factor; + } + table->RefScale = new_ref_scale_unit; + + // Disable output until user calls TableNextRow() or TableNextColumn() leading to the TableUpdateLayout() call.. + // This is not strictly necessary but will reduce cases were "out of table" output will be misleading to the user. + // Because we cannot safely assert in EndTable() when no rows have been created, this seems like our best option. + inner_window->SkipItems = true; + + // Clear names + // At this point the ->NameOffset field of each column will be invalid until TableUpdateLayout() or the first call to TableSetupColumn() + if (table->ColumnsNames.Buf.Size > 0) + table->ColumnsNames.Buf.resize(0); + + // Apply queued resizing/reordering/hiding requests + TableBeginApplyRequests(table); + + return true; +} + +// For reference, the average total _allocation count_ for a table is: +// + 0 (for ImGuiTable instance, we are pooling allocations in g.Tables[]) +// + 1 (for table->RawData allocated below) +// + 1 (for table->ColumnsNames, if names are used) +// Shared allocations for the maximum number of simultaneously nested tables (generally a very small number) +// + 1 (for table->Splitter._Channels) +// + 2 * active_channels_count (for ImDrawCmd and ImDrawIdx buffers inside channels) +// Where active_channels_count is variable but often == columns_count or == columns_count + 1, see TableSetupDrawChannels() for details. +// Unused channels don't perform their +2 allocations. +void ImGui::TableBeginInitMemory(ImGuiTable* table, int columns_count) +{ + // Allocate single buffer for our arrays + const int columns_bit_array_size = (int)ImBitArrayGetStorageSizeInBytes(columns_count); + ImSpanAllocator<6> span_allocator; + span_allocator.Reserve(0, columns_count * sizeof(ImGuiTableColumn)); + span_allocator.Reserve(1, columns_count * sizeof(ImGuiTableColumnIdx)); + span_allocator.Reserve(2, columns_count * sizeof(ImGuiTableCellData), 4); + for (int n = 3; n < 6; n++) + span_allocator.Reserve(n, columns_bit_array_size); + table->RawData = IM_ALLOC(span_allocator.GetArenaSizeInBytes()); + memset(table->RawData, 0, span_allocator.GetArenaSizeInBytes()); + span_allocator.SetArenaBasePtr(table->RawData); + span_allocator.GetSpan(0, &table->Columns); + span_allocator.GetSpan(1, &table->DisplayOrderToIndex); + span_allocator.GetSpan(2, &table->RowCellData); + table->EnabledMaskByDisplayOrder = (ImU32*)span_allocator.GetSpanPtrBegin(3); + table->EnabledMaskByIndex = (ImU32*)span_allocator.GetSpanPtrBegin(4); + table->VisibleMaskByIndex = (ImU32*)span_allocator.GetSpanPtrBegin(5); +} + +// Apply queued resizing/reordering/hiding requests +void ImGui::TableBeginApplyRequests(ImGuiTable* table) +{ + // Handle resizing request + // (We process this in the TableBegin() of the first instance of each table) + // FIXME-TABLE: Contains columns if our work area doesn't allow for scrolling? + if (table->InstanceCurrent == 0) + { + if (table->ResizedColumn != -1 && table->ResizedColumnNextWidth != FLT_MAX) + TableSetColumnWidth(table->ResizedColumn, table->ResizedColumnNextWidth); + table->LastResizedColumn = table->ResizedColumn; + table->ResizedColumnNextWidth = FLT_MAX; + table->ResizedColumn = -1; + + // Process auto-fit for single column, which is a special case for stretch columns and fixed columns with FixedSame policy. + // FIXME-TABLE: Would be nice to redistribute available stretch space accordingly to other weights, instead of giving it all to siblings. + if (table->AutoFitSingleColumn != -1) + { + TableSetColumnWidth(table->AutoFitSingleColumn, table->Columns[table->AutoFitSingleColumn].WidthAuto); + table->AutoFitSingleColumn = -1; + } + } + + // Handle reordering request + // Note: we don't clear ReorderColumn after handling the request. + if (table->InstanceCurrent == 0) + { + if (table->HeldHeaderColumn == -1 && table->ReorderColumn != -1) + table->ReorderColumn = -1; + table->HeldHeaderColumn = -1; + if (table->ReorderColumn != -1 && table->ReorderColumnDir != 0) + { + // We need to handle reordering across hidden columns. + // In the configuration below, moving C to the right of E will lead to: + // ... C [D] E ---> ... [D] E C (Column name/index) + // ... 2 3 4 ... 2 3 4 (Display order) + const int reorder_dir = table->ReorderColumnDir; + IM_ASSERT(reorder_dir == -1 || reorder_dir == +1); + IM_ASSERT(table->Flags & ImGuiTableFlags_Reorderable); + ImGuiTableColumn* src_column = &table->Columns[table->ReorderColumn]; + ImGuiTableColumn* dst_column = &table->Columns[(reorder_dir == -1) ? src_column->PrevEnabledColumn : src_column->NextEnabledColumn]; + IM_UNUSED(dst_column); + const int src_order = src_column->DisplayOrder; + const int dst_order = dst_column->DisplayOrder; + src_column->DisplayOrder = (ImGuiTableColumnIdx)dst_order; + for (int order_n = src_order + reorder_dir; order_n != dst_order + reorder_dir; order_n += reorder_dir) + table->Columns[table->DisplayOrderToIndex[order_n]].DisplayOrder -= (ImGuiTableColumnIdx)reorder_dir; + IM_ASSERT(dst_column->DisplayOrder == dst_order - reorder_dir); + + // Display order is stored in both columns->IndexDisplayOrder and table->DisplayOrder[]. Rebuild later from the former. + for (int column_n = 0; column_n < table->ColumnsCount; column_n++) + table->DisplayOrderToIndex[table->Columns[column_n].DisplayOrder] = (ImGuiTableColumnIdx)column_n; + table->ReorderColumnDir = 0; + table->IsSettingsDirty = true; + } + } + + // Handle display order reset request + if (table->IsResetDisplayOrderRequest) + { + for (int n = 0; n < table->ColumnsCount; n++) + table->DisplayOrderToIndex[n] = table->Columns[n].DisplayOrder = (ImGuiTableColumnIdx)n; + table->IsResetDisplayOrderRequest = false; + table->IsSettingsDirty = true; + } +} + +// Adjust flags: default width mode + stretch columns are not allowed when auto extending +static void TableSetupColumnFlags(ImGuiTable* table, ImGuiTableColumn* column, ImGuiTableColumnFlags flags_in) +{ + ImGuiTableColumnFlags flags = flags_in; + + // Sizing Policy + if ((flags & ImGuiTableColumnFlags_WidthMask_) == 0) + { + const ImGuiTableFlags table_sizing_policy = (table->Flags & ImGuiTableFlags_SizingMask_); + if (table_sizing_policy == ImGuiTableFlags_SizingFixedFit || table_sizing_policy == ImGuiTableFlags_SizingFixedSame) + flags |= ImGuiTableColumnFlags_WidthFixed; + else + flags |= ImGuiTableColumnFlags_WidthStretch; + } + else + { + IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiTableColumnFlags_WidthMask_)); // Check that only 1 of each set is used. + } + + // Resize + if ((table->Flags & ImGuiTableFlags_Resizable) == 0) + flags |= ImGuiTableColumnFlags_NoResize; + + // Sorting + if ((flags & ImGuiTableColumnFlags_NoSortAscending) && (flags & ImGuiTableColumnFlags_NoSortDescending)) + flags |= ImGuiTableColumnFlags_NoSort; + + // Indentation + if ((flags & ImGuiTableColumnFlags_IndentMask_) == 0) + flags |= (table->Columns.index_from_ptr(column) == 0) ? ImGuiTableColumnFlags_IndentEnable : ImGuiTableColumnFlags_IndentDisable; + + // Alignment + //if ((flags & ImGuiTableColumnFlags_AlignMask_) == 0) + // flags |= ImGuiTableColumnFlags_AlignCenter; + //IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiTableColumnFlags_AlignMask_)); // Check that only 1 of each set is used. + + // Preserve status flags + column->Flags = flags | (column->Flags & ImGuiTableColumnFlags_StatusMask_); + + // Build an ordered list of available sort directions + column->SortDirectionsAvailCount = column->SortDirectionsAvailMask = column->SortDirectionsAvailList = 0; + if (table->Flags & ImGuiTableFlags_Sortable) + { + int count = 0, mask = 0, list = 0; + if ((flags & ImGuiTableColumnFlags_PreferSortAscending) != 0 && (flags & ImGuiTableColumnFlags_NoSortAscending) == 0) { mask |= 1 << ImGuiSortDirection_Ascending; list |= ImGuiSortDirection_Ascending << (count << 1); count++; } + if ((flags & ImGuiTableColumnFlags_PreferSortDescending) != 0 && (flags & ImGuiTableColumnFlags_NoSortDescending) == 0) { mask |= 1 << ImGuiSortDirection_Descending; list |= ImGuiSortDirection_Descending << (count << 1); count++; } + if ((flags & ImGuiTableColumnFlags_PreferSortAscending) == 0 && (flags & ImGuiTableColumnFlags_NoSortAscending) == 0) { mask |= 1 << ImGuiSortDirection_Ascending; list |= ImGuiSortDirection_Ascending << (count << 1); count++; } + if ((flags & ImGuiTableColumnFlags_PreferSortDescending) == 0 && (flags & ImGuiTableColumnFlags_NoSortDescending) == 0) { mask |= 1 << ImGuiSortDirection_Descending; list |= ImGuiSortDirection_Descending << (count << 1); count++; } + if ((table->Flags & ImGuiTableFlags_SortTristate) || count == 0) { mask |= 1 << ImGuiSortDirection_None; count++; } + column->SortDirectionsAvailList = (ImU8)list; + column->SortDirectionsAvailMask = (ImU8)mask; + column->SortDirectionsAvailCount = (ImU8)count; + ImGui::TableFixColumnSortDirection(table, column); + } +} + +// Layout columns for the frame. This is in essence the followup to BeginTable() and this is our largest function. +// Runs on the first call to TableNextRow(), to give a chance for TableSetupColumn() and other TableSetupXXXXX() functions to be called first. +// FIXME-TABLE: Our width (and therefore our WorkRect) will be minimal in the first frame for _WidthAuto columns. +// Increase feedback side-effect with widgets relying on WorkRect.Max.x... Maybe provide a default distribution for _WidthAuto columns? +void ImGui::TableUpdateLayout(ImGuiTable* table) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(table->IsLayoutLocked == false); + + const ImGuiTableFlags table_sizing_policy = (table->Flags & ImGuiTableFlags_SizingMask_); + table->IsDefaultDisplayOrder = true; + table->ColumnsEnabledCount = 0; + ImBitArrayClearAllBits(table->EnabledMaskByIndex, table->ColumnsCount); + ImBitArrayClearAllBits(table->EnabledMaskByDisplayOrder, table->ColumnsCount); + table->LeftMostEnabledColumn = -1; + table->MinColumnWidth = ImMax(1.0f, g.Style.FramePadding.x * 1.0f); // g.Style.ColumnsMinSpacing; // FIXME-TABLE + + // [Part 1] Apply/lock Enabled and Order states. Calculate auto/ideal width for columns. Count fixed/stretch columns. + // Process columns in their visible orders as we are building the Prev/Next indices. + int count_fixed = 0; // Number of columns that have fixed sizing policies + int count_stretch = 0; // Number of columns that have stretch sizing policies + int prev_visible_column_idx = -1; + bool has_auto_fit_request = false; + bool has_resizable = false; + float stretch_sum_width_auto = 0.0f; + float fixed_max_width_auto = 0.0f; + for (int order_n = 0; order_n < table->ColumnsCount; order_n++) + { + const int column_n = table->DisplayOrderToIndex[order_n]; + if (column_n != order_n) + table->IsDefaultDisplayOrder = false; + ImGuiTableColumn* column = &table->Columns[column_n]; + + // Clear column setup if not submitted by user. Currently we make it mandatory to call TableSetupColumn() every frame. + // It would easily work without but we're not ready to guarantee it since e.g. names need resubmission anyway. + // We take a slight shortcut but in theory we could be calling TableSetupColumn() here with dummy values, it should yield the same effect. + if (table->DeclColumnsCount <= column_n) + { + TableSetupColumnFlags(table, column, ImGuiTableColumnFlags_None); + column->NameOffset = -1; + column->UserID = 0; + column->InitStretchWeightOrWidth = -1.0f; + } + + // Update Enabled state, mark settings and sort specs dirty + if (!(table->Flags & ImGuiTableFlags_Hideable) || (column->Flags & ImGuiTableColumnFlags_NoHide)) + column->IsUserEnabledNextFrame = true; + if (column->IsUserEnabled != column->IsUserEnabledNextFrame) + { + column->IsUserEnabled = column->IsUserEnabledNextFrame; + table->IsSettingsDirty = true; + } + column->IsEnabled = column->IsUserEnabled && (column->Flags & ImGuiTableColumnFlags_Disabled) == 0; + + if (column->SortOrder != -1 && !column->IsEnabled) + table->IsSortSpecsDirty = true; + if (column->SortOrder > 0 && !(table->Flags & ImGuiTableFlags_SortMulti)) + table->IsSortSpecsDirty = true; + + // Auto-fit unsized columns + const bool start_auto_fit = (column->Flags & ImGuiTableColumnFlags_WidthFixed) ? (column->WidthRequest < 0.0f) : (column->StretchWeight < 0.0f); + if (start_auto_fit) + column->AutoFitQueue = column->CannotSkipItemsQueue = (1 << 3) - 1; // Fit for three frames + + if (!column->IsEnabled) + { + column->IndexWithinEnabledSet = -1; + continue; + } + + // Mark as enabled and link to previous/next enabled column + column->PrevEnabledColumn = (ImGuiTableColumnIdx)prev_visible_column_idx; + column->NextEnabledColumn = -1; + if (prev_visible_column_idx != -1) + table->Columns[prev_visible_column_idx].NextEnabledColumn = (ImGuiTableColumnIdx)column_n; + else + table->LeftMostEnabledColumn = (ImGuiTableColumnIdx)column_n; + column->IndexWithinEnabledSet = table->ColumnsEnabledCount++; + ImBitArraySetBit(table->EnabledMaskByIndex, column_n); + ImBitArraySetBit(table->EnabledMaskByDisplayOrder, column->DisplayOrder); + prev_visible_column_idx = column_n; + IM_ASSERT(column->IndexWithinEnabledSet <= column->DisplayOrder); + + // Calculate ideal/auto column width (that's the width required for all contents to be visible without clipping) + // Combine width from regular rows + width from headers unless requested not to. + if (!column->IsPreserveWidthAuto && table->InstanceCurrent == 0) + column->WidthAuto = TableGetColumnWidthAuto(table, column); + + // Non-resizable columns keep their requested width (apply user value regardless of IsPreserveWidthAuto) + const bool column_is_resizable = (column->Flags & ImGuiTableColumnFlags_NoResize) == 0; + if (column_is_resizable) + has_resizable = true; + if ((column->Flags & ImGuiTableColumnFlags_WidthFixed) && column->InitStretchWeightOrWidth > 0.0f && !column_is_resizable) + column->WidthAuto = column->InitStretchWeightOrWidth; + + if (column->AutoFitQueue != 0x00) + has_auto_fit_request = true; + if (column->Flags & ImGuiTableColumnFlags_WidthStretch) + { + stretch_sum_width_auto += column->WidthAuto; + count_stretch++; + } + else + { + fixed_max_width_auto = ImMax(fixed_max_width_auto, column->WidthAuto); + count_fixed++; + } + } + if ((table->Flags & ImGuiTableFlags_Sortable) && table->SortSpecsCount == 0 && !(table->Flags & ImGuiTableFlags_SortTristate)) + table->IsSortSpecsDirty = true; + table->RightMostEnabledColumn = (ImGuiTableColumnIdx)prev_visible_column_idx; + IM_ASSERT(table->LeftMostEnabledColumn >= 0 && table->RightMostEnabledColumn >= 0); + + // [Part 2] Disable child window clipping while fitting columns. This is not strictly necessary but makes it possible to avoid + // the column fitting having to wait until the first visible frame of the child container (may or not be a good thing). Also see #6510. + // FIXME-TABLE: for always auto-resizing columns may not want to do that all the time. + if (has_auto_fit_request && table->OuterWindow != table->InnerWindow) + table->InnerWindow->SkipItems = false; + if (has_auto_fit_request) + table->IsSettingsDirty = true; + + // [Part 3] Fix column flags and record a few extra information. + float sum_width_requests = 0.0f; // Sum of all width for fixed and auto-resize columns, excluding width contributed by Stretch columns but including spacing/padding. + float stretch_sum_weights = 0.0f; // Sum of all weights for stretch columns. + table->LeftMostStretchedColumn = table->RightMostStretchedColumn = -1; + for (int column_n = 0; column_n < table->ColumnsCount; column_n++) + { + if (!IM_BITARRAY_TESTBIT(table->EnabledMaskByIndex, column_n)) + continue; + ImGuiTableColumn* column = &table->Columns[column_n]; + + const bool column_is_resizable = (column->Flags & ImGuiTableColumnFlags_NoResize) == 0; + if (column->Flags & ImGuiTableColumnFlags_WidthFixed) + { + // Apply same widths policy + float width_auto = column->WidthAuto; + if (table_sizing_policy == ImGuiTableFlags_SizingFixedSame && (column->AutoFitQueue != 0x00 || !column_is_resizable)) + width_auto = fixed_max_width_auto; + + // Apply automatic width + // Latch initial size for fixed columns and update it constantly for auto-resizing column (unless clipped!) + if (column->AutoFitQueue != 0x00) + column->WidthRequest = width_auto; + else if ((column->Flags & ImGuiTableColumnFlags_WidthFixed) && !column_is_resizable && column->IsRequestOutput) + column->WidthRequest = width_auto; + + // FIXME-TABLE: Increase minimum size during init frame to avoid biasing auto-fitting widgets + // (e.g. TextWrapped) too much. Otherwise what tends to happen is that TextWrapped would output a very + // large height (= first frame scrollbar display very off + clipper would skip lots of items). + // This is merely making the side-effect less extreme, but doesn't properly fixes it. + // FIXME: Move this to ->WidthGiven to avoid temporary lossyless? + // FIXME: This break IsPreserveWidthAuto from not flickering if the stored WidthAuto was smaller. + if (column->AutoFitQueue > 0x01 && table->IsInitializing && !column->IsPreserveWidthAuto) + column->WidthRequest = ImMax(column->WidthRequest, table->MinColumnWidth * 4.0f); // FIXME-TABLE: Another constant/scale? + sum_width_requests += column->WidthRequest; + } + else + { + // Initialize stretch weight + if (column->AutoFitQueue != 0x00 || column->StretchWeight < 0.0f || !column_is_resizable) + { + if (column->InitStretchWeightOrWidth > 0.0f) + column->StretchWeight = column->InitStretchWeightOrWidth; + else if (table_sizing_policy == ImGuiTableFlags_SizingStretchProp) + column->StretchWeight = (column->WidthAuto / stretch_sum_width_auto) * count_stretch; + else + column->StretchWeight = 1.0f; + } + + stretch_sum_weights += column->StretchWeight; + if (table->LeftMostStretchedColumn == -1 || table->Columns[table->LeftMostStretchedColumn].DisplayOrder > column->DisplayOrder) + table->LeftMostStretchedColumn = (ImGuiTableColumnIdx)column_n; + if (table->RightMostStretchedColumn == -1 || table->Columns[table->RightMostStretchedColumn].DisplayOrder < column->DisplayOrder) + table->RightMostStretchedColumn = (ImGuiTableColumnIdx)column_n; + } + column->IsPreserveWidthAuto = false; + sum_width_requests += table->CellPaddingX * 2.0f; + } + table->ColumnsEnabledFixedCount = (ImGuiTableColumnIdx)count_fixed; + table->ColumnsStretchSumWeights = stretch_sum_weights; + + // [Part 4] Apply final widths based on requested widths + const ImRect work_rect = table->WorkRect; + const float width_spacings = (table->OuterPaddingX * 2.0f) + (table->CellSpacingX1 + table->CellSpacingX2) * (table->ColumnsEnabledCount - 1); + const float width_removed = (table->HasScrollbarYPrev && !table->InnerWindow->ScrollbarY) ? g.Style.ScrollbarSize : 0.0f; // To synchronize decoration width of synced tables with mismatching scrollbar state (#5920) + const float width_avail = ImMax(1.0f, (((table->Flags & ImGuiTableFlags_ScrollX) && table->InnerWidth == 0.0f) ? table->InnerClipRect.GetWidth() : work_rect.GetWidth()) - width_removed); + const float width_avail_for_stretched_columns = width_avail - width_spacings - sum_width_requests; + float width_remaining_for_stretched_columns = width_avail_for_stretched_columns; + table->ColumnsGivenWidth = width_spacings + (table->CellPaddingX * 2.0f) * table->ColumnsEnabledCount; + for (int column_n = 0; column_n < table->ColumnsCount; column_n++) + { + if (!IM_BITARRAY_TESTBIT(table->EnabledMaskByIndex, column_n)) + continue; + ImGuiTableColumn* column = &table->Columns[column_n]; + + // Allocate width for stretched/weighted columns (StretchWeight gets converted into WidthRequest) + if (column->Flags & ImGuiTableColumnFlags_WidthStretch) + { + float weight_ratio = column->StretchWeight / stretch_sum_weights; + column->WidthRequest = IM_TRUNC(ImMax(width_avail_for_stretched_columns * weight_ratio, table->MinColumnWidth) + 0.01f); + width_remaining_for_stretched_columns -= column->WidthRequest; + } + + // [Resize Rule 1] The right-most Visible column is not resizable if there is at least one Stretch column + // See additional comments in TableSetColumnWidth(). + if (column->NextEnabledColumn == -1 && table->LeftMostStretchedColumn != -1) + column->Flags |= ImGuiTableColumnFlags_NoDirectResize_; + + // Assign final width, record width in case we will need to shrink + column->WidthGiven = ImTrunc(ImMax(column->WidthRequest, table->MinColumnWidth)); + table->ColumnsGivenWidth += column->WidthGiven; + } + + // [Part 5] Redistribute stretch remainder width due to rounding (remainder width is < 1.0f * number of Stretch column). + // Using right-to-left distribution (more likely to match resizing cursor). + if (width_remaining_for_stretched_columns >= 1.0f && !(table->Flags & ImGuiTableFlags_PreciseWidths)) + for (int order_n = table->ColumnsCount - 1; stretch_sum_weights > 0.0f && width_remaining_for_stretched_columns >= 1.0f && order_n >= 0; order_n--) + { + if (!IM_BITARRAY_TESTBIT(table->EnabledMaskByDisplayOrder, order_n)) + continue; + ImGuiTableColumn* column = &table->Columns[table->DisplayOrderToIndex[order_n]]; + if (!(column->Flags & ImGuiTableColumnFlags_WidthStretch)) + continue; + column->WidthRequest += 1.0f; + column->WidthGiven += 1.0f; + width_remaining_for_stretched_columns -= 1.0f; + } + + // Determine if table is hovered which will be used to flag columns as hovered. + // - In principle we'd like to use the equivalent of IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByActiveItem), + // but because our item is partially submitted at this point we use ItemHoverable() and a workaround (temporarily + // clear ActiveId, which is equivalent to the change provided by _AllowWhenBLockedByActiveItem). + // - This allows columns to be marked as hovered when e.g. clicking a button inside the column, or using drag and drop. + ImGuiTableInstanceData* table_instance = TableGetInstanceData(table, table->InstanceCurrent); + table_instance->HoveredRowLast = table_instance->HoveredRowNext; + table_instance->HoveredRowNext = -1; + table->HoveredColumnBody = table->HoveredColumnBorder = -1; + const ImRect mouse_hit_rect(table->OuterRect.Min.x, table->OuterRect.Min.y, table->OuterRect.Max.x, ImMax(table->OuterRect.Max.y, table->OuterRect.Min.y + table_instance->LastOuterHeight)); + const ImGuiID backup_active_id = g.ActiveId; + g.ActiveId = 0; + const bool is_hovering_table = ItemHoverable(mouse_hit_rect, 0, ImGuiItemFlags_None); + g.ActiveId = backup_active_id; + + // Determine skewed MousePos.x to support angled headers. + float mouse_skewed_x = g.IO.MousePos.x; + if (table->AngledHeadersHeight > 0.0f) + if (g.IO.MousePos.y >= table->OuterRect.Min.y && g.IO.MousePos.y <= table->OuterRect.Min.y + table->AngledHeadersHeight) + mouse_skewed_x += ImTrunc((table->OuterRect.Min.y + table->AngledHeadersHeight - g.IO.MousePos.y) * table->AngledHeadersSlope); + + // [Part 6] Setup final position, offset, skip/clip states and clipping rectangles, detect hovered column + // Process columns in their visible orders as we are comparing the visible order and adjusting host_clip_rect while looping. + int visible_n = 0; + bool has_at_least_one_column_requesting_output = false; + bool offset_x_frozen = (table->FreezeColumnsCount > 0); + float offset_x = ((table->FreezeColumnsCount > 0) ? table->OuterRect.Min.x : work_rect.Min.x) + table->OuterPaddingX - table->CellSpacingX1; + ImRect host_clip_rect = table->InnerClipRect; + //host_clip_rect.Max.x += table->CellPaddingX + table->CellSpacingX2; + ImBitArrayClearAllBits(table->VisibleMaskByIndex, table->ColumnsCount); + for (int order_n = 0; order_n < table->ColumnsCount; order_n++) + { + const int column_n = table->DisplayOrderToIndex[order_n]; + ImGuiTableColumn* column = &table->Columns[column_n]; + + // Initial nav layer: using FreezeRowsCount, NOT FreezeRowsRequest, so Header line changes layer when frozen + column->NavLayerCurrent = (ImS8)(table->FreezeRowsCount > 0 ? ImGuiNavLayer_Menu : (ImGuiNavLayer)table->NavLayer); + + if (offset_x_frozen && table->FreezeColumnsCount == visible_n) + { + offset_x += work_rect.Min.x - table->OuterRect.Min.x; + offset_x_frozen = false; + } + + // Clear status flags + column->Flags &= ~ImGuiTableColumnFlags_StatusMask_; + + if (!IM_BITARRAY_TESTBIT(table->EnabledMaskByDisplayOrder, order_n)) + { + // Hidden column: clear a few fields and we are done with it for the remainder of the function. + // We set a zero-width clip rect but set Min.y/Max.y properly to not interfere with the clipper. + column->MinX = column->MaxX = column->WorkMinX = column->ClipRect.Min.x = column->ClipRect.Max.x = offset_x; + column->WidthGiven = 0.0f; + column->ClipRect.Min.y = work_rect.Min.y; + column->ClipRect.Max.y = FLT_MAX; + column->ClipRect.ClipWithFull(host_clip_rect); + column->IsVisibleX = column->IsVisibleY = column->IsRequestOutput = false; + column->IsSkipItems = true; + column->ItemWidth = 1.0f; + continue; + } + + // Lock start position + column->MinX = offset_x; + + // Lock width based on start position and minimum/maximum width for this position + column->WidthMax = TableCalcMaxColumnWidth(table, column_n); + column->WidthGiven = ImMin(column->WidthGiven, column->WidthMax); + column->WidthGiven = ImMax(column->WidthGiven, ImMin(column->WidthRequest, table->MinColumnWidth)); + column->MaxX = offset_x + column->WidthGiven + table->CellSpacingX1 + table->CellSpacingX2 + table->CellPaddingX * 2.0f; + + // Lock other positions + // - ClipRect.Min.x: Because merging draw commands doesn't compare min boundaries, we make ClipRect.Min.x match left bounds to be consistent regardless of merging. + // - ClipRect.Max.x: using WorkMaxX instead of MaxX (aka including padding) makes things more consistent when resizing down, tho slightly detrimental to visibility in very-small column. + // - ClipRect.Max.x: using MaxX makes it easier for header to receive hover highlight with no discontinuity and display sorting arrow. + // - FIXME-TABLE: We want equal width columns to have equal (ClipRect.Max.x - WorkMinX) width, which means ClipRect.max.x cannot stray off host_clip_rect.Max.x else right-most column may appear shorter. + const float previous_instance_work_min_x = column->WorkMinX; + column->WorkMinX = column->MinX + table->CellPaddingX + table->CellSpacingX1; + column->WorkMaxX = column->MaxX - table->CellPaddingX - table->CellSpacingX2; // Expected max + column->ItemWidth = ImTrunc(column->WidthGiven * 0.65f); + column->ClipRect.Min.x = column->MinX; + column->ClipRect.Min.y = work_rect.Min.y; + column->ClipRect.Max.x = column->MaxX; //column->WorkMaxX; + column->ClipRect.Max.y = FLT_MAX; + column->ClipRect.ClipWithFull(host_clip_rect); + + // Mark column as Clipped (not in sight) + // Note that scrolling tables (where inner_window != outer_window) handle Y clipped earlier in BeginTable() so IsVisibleY really only applies to non-scrolling tables. + // FIXME-TABLE: Because InnerClipRect.Max.y is conservatively ==outer_window->ClipRect.Max.y, we never can mark columns _Above_ the scroll line as not IsVisibleY. + // Taking advantage of LastOuterHeight would yield good results there... + // FIXME-TABLE: Y clipping is disabled because it effectively means not submitting will reduce contents width which is fed to outer_window->DC.CursorMaxPos.x, + // and this may be used (e.g. typically by outer_window using AlwaysAutoResize or outer_window's horizontal scrollbar, but could be something else). + // Possible solution to preserve last known content width for clipped column. Test 'table_reported_size' fails when enabling Y clipping and window is resized small. + column->IsVisibleX = (column->ClipRect.Max.x > column->ClipRect.Min.x); + column->IsVisibleY = true; // (column->ClipRect.Max.y > column->ClipRect.Min.y); + const bool is_visible = column->IsVisibleX; //&& column->IsVisibleY; + if (is_visible) + ImBitArraySetBit(table->VisibleMaskByIndex, column_n); + + // Mark column as requesting output from user. Note that fixed + non-resizable sets are auto-fitting at all times and therefore always request output. + column->IsRequestOutput = is_visible || column->AutoFitQueue != 0 || column->CannotSkipItemsQueue != 0; + + // Mark column as SkipItems (ignoring all items/layout) + // (table->HostSkipItems is a copy of inner_window->SkipItems before we cleared it above in Part 2) + column->IsSkipItems = !column->IsEnabled || table->HostSkipItems; + if (column->IsSkipItems) + IM_ASSERT(!is_visible); + if (column->IsRequestOutput && !column->IsSkipItems) + has_at_least_one_column_requesting_output = true; + + // Update status flags + column->Flags |= ImGuiTableColumnFlags_IsEnabled; + if (is_visible) + column->Flags |= ImGuiTableColumnFlags_IsVisible; + if (column->SortOrder != -1) + column->Flags |= ImGuiTableColumnFlags_IsSorted; + + // Detect hovered column + if (is_hovering_table && mouse_skewed_x >= column->ClipRect.Min.x && mouse_skewed_x < column->ClipRect.Max.x) + { + column->Flags |= ImGuiTableColumnFlags_IsHovered; + table->HoveredColumnBody = (ImGuiTableColumnIdx)column_n; + } + + // Alignment + // FIXME-TABLE: This align based on the whole column width, not per-cell, and therefore isn't useful in + // many cases (to be able to honor this we might be able to store a log of cells width, per row, for + // visible rows, but nav/programmatic scroll would have visible artifacts.) + //if (column->Flags & ImGuiTableColumnFlags_AlignRight) + // column->WorkMinX = ImMax(column->WorkMinX, column->MaxX - column->ContentWidthRowsUnfrozen); + //else if (column->Flags & ImGuiTableColumnFlags_AlignCenter) + // column->WorkMinX = ImLerp(column->WorkMinX, ImMax(column->StartX, column->MaxX - column->ContentWidthRowsUnfrozen), 0.5f); + + // Reset content width variables + if (table->InstanceCurrent == 0) + { + column->ContentMaxXFrozen = column->WorkMinX; + column->ContentMaxXUnfrozen = column->WorkMinX; + column->ContentMaxXHeadersUsed = column->WorkMinX; + column->ContentMaxXHeadersIdeal = column->WorkMinX; + } + else + { + // As we store an absolute value to make per-cell updates faster, we need to offset values used for width computation. + const float offset_from_previous_instance = column->WorkMinX - previous_instance_work_min_x; + column->ContentMaxXFrozen += offset_from_previous_instance; + column->ContentMaxXUnfrozen += offset_from_previous_instance; + column->ContentMaxXHeadersUsed += offset_from_previous_instance; + column->ContentMaxXHeadersIdeal += offset_from_previous_instance; + } + + // Don't decrement auto-fit counters until container window got a chance to submit its items + if (table->HostSkipItems == false && table->InstanceCurrent == 0) + { + column->AutoFitQueue >>= 1; + column->CannotSkipItemsQueue >>= 1; + } + + if (visible_n < table->FreezeColumnsCount) + host_clip_rect.Min.x = ImClamp(column->MaxX + TABLE_BORDER_SIZE, host_clip_rect.Min.x, host_clip_rect.Max.x); + + offset_x += column->WidthGiven + table->CellSpacingX1 + table->CellSpacingX2 + table->CellPaddingX * 2.0f; + visible_n++; + } + + // In case the table is visible (e.g. decorations) but all columns clipped, we keep a column visible. + // Else if give no chance to a clipper-savy user to submit rows and therefore total contents height used by scrollbar. + if (has_at_least_one_column_requesting_output == false) + { + table->Columns[table->LeftMostEnabledColumn].IsRequestOutput = true; + table->Columns[table->LeftMostEnabledColumn].IsSkipItems = false; + } + + // [Part 7] Detect/store when we are hovering the unused space after the right-most column (so e.g. context menus can react on it) + // Clear Resizable flag if none of our column are actually resizable (either via an explicit _NoResize flag, either + // because of using _WidthAuto/_WidthStretch). This will hide the resizing option from the context menu. + const float unused_x1 = ImMax(table->WorkRect.Min.x, table->Columns[table->RightMostEnabledColumn].ClipRect.Max.x); + if (is_hovering_table && table->HoveredColumnBody == -1) + if (mouse_skewed_x >= unused_x1) + table->HoveredColumnBody = (ImGuiTableColumnIdx)table->ColumnsCount; + if (has_resizable == false && (table->Flags & ImGuiTableFlags_Resizable)) + table->Flags &= ~ImGuiTableFlags_Resizable; + + table->IsActiveIdAliveBeforeTable = (g.ActiveIdIsAlive != 0); + + // [Part 8] Lock actual OuterRect/WorkRect right-most position. + // This is done late to handle the case of fixed-columns tables not claiming more widths that they need. + // Because of this we are careful with uses of WorkRect and InnerClipRect before this point. + if (table->RightMostStretchedColumn != -1) + table->Flags &= ~ImGuiTableFlags_NoHostExtendX; + if (table->Flags & ImGuiTableFlags_NoHostExtendX) + { + table->OuterRect.Max.x = table->WorkRect.Max.x = unused_x1; + table->InnerClipRect.Max.x = ImMin(table->InnerClipRect.Max.x, unused_x1); + } + table->InnerWindow->ParentWorkRect = table->WorkRect; + table->BorderX1 = table->InnerClipRect.Min.x; + table->BorderX2 = table->InnerClipRect.Max.x; + + // Setup window's WorkRect.Max.y for GetContentRegionAvail(). Other values will be updated in each TableBeginCell() call. + float window_content_max_y; + if (table->Flags & ImGuiTableFlags_NoHostExtendY) + window_content_max_y = table->OuterRect.Max.y; + else + window_content_max_y = ImMax(table->InnerWindow->ContentRegionRect.Max.y, (table->Flags & ImGuiTableFlags_ScrollY) ? 0.0f : table->OuterRect.Max.y); + table->InnerWindow->WorkRect.Max.y = ImClamp(window_content_max_y - g.Style.CellPadding.y, table->InnerWindow->WorkRect.Min.y, table->InnerWindow->WorkRect.Max.y); + + // [Part 9] Allocate draw channels and setup background cliprect + TableSetupDrawChannels(table); + + // [Part 10] Hit testing on borders + if (table->Flags & ImGuiTableFlags_Resizable) + TableUpdateBorders(table); + table_instance->LastTopHeadersRowHeight = 0.0f; + table->IsLayoutLocked = true; + table->IsUsingHeaders = false; + + // Highlight header + table->HighlightColumnHeader = -1; + if (table->IsContextPopupOpen && table->ContextPopupColumn != -1 && table->InstanceInteracted == table->InstanceCurrent) + table->HighlightColumnHeader = table->ContextPopupColumn; + else if ((table->Flags & ImGuiTableFlags_HighlightHoveredColumn) && table->HoveredColumnBody != -1 && table->HoveredColumnBody != table->ColumnsCount && table->HoveredColumnBorder == -1) + if (g.ActiveId == 0 || (table->IsActiveIdInTable || g.DragDropActive)) + table->HighlightColumnHeader = table->HoveredColumnBody; + + // [Part 11] Default context menu + // - To append to this menu: you can call TableBeginContextMenuPopup()/.../EndPopup(). + // - To modify or replace this: set table->IsContextPopupNoDefaultContents = true, then call TableBeginContextMenuPopup()/.../EndPopup(). + // - You may call TableDrawDefaultContextMenu() with selected flags to display specific sections of the default menu, + // e.g. TableDrawDefaultContextMenu(table, table->Flags & ~ImGuiTableFlags_Hideable) will display everything EXCEPT columns visibility options. + if (table->DisableDefaultContextMenu == false && TableBeginContextMenuPopup(table)) + { + TableDrawDefaultContextMenu(table, table->Flags); + EndPopup(); + } + + // [Part 12] Sanitize and build sort specs before we have a chance to use them for display. + // This path will only be exercised when sort specs are modified before header rows (e.g. init or visibility change) + if (table->IsSortSpecsDirty && (table->Flags & ImGuiTableFlags_Sortable)) + TableSortSpecsBuild(table); + + // [Part 13] Setup inner window decoration size (for scrolling / nav tracking to properly take account of frozen rows/columns) + if (table->FreezeColumnsRequest > 0) + table->InnerWindow->DecoInnerSizeX1 = table->Columns[table->DisplayOrderToIndex[table->FreezeColumnsRequest - 1]].MaxX - table->OuterRect.Min.x; + if (table->FreezeRowsRequest > 0) + table->InnerWindow->DecoInnerSizeY1 = table_instance->LastFrozenHeight; + table_instance->LastFrozenHeight = 0.0f; + + // Initial state + ImGuiWindow* inner_window = table->InnerWindow; + if (table->Flags & ImGuiTableFlags_NoClip) + table->DrawSplitter->SetCurrentChannel(inner_window->DrawList, TABLE_DRAW_CHANNEL_NOCLIP); + else + inner_window->DrawList->PushClipRect(inner_window->InnerClipRect.Min, inner_window->InnerClipRect.Max, false); // FIXME: use table->InnerClipRect? +} + +// Process hit-testing on resizing borders. Actual size change will be applied in EndTable() +// - Set table->HoveredColumnBorder with a short delay/timer to reduce visual feedback noise. +void ImGui::TableUpdateBorders(ImGuiTable* table) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(table->Flags & ImGuiTableFlags_Resizable); + + // At this point OuterRect height may be zero or under actual final height, so we rely on temporal coherency and + // use the final height from last frame. Because this is only affecting _interaction_ with columns, it is not + // really problematic (whereas the actual visual will be displayed in EndTable() and using the current frame height). + // Actual columns highlight/render will be performed in EndTable() and not be affected. + ImGuiTableInstanceData* table_instance = TableGetInstanceData(table, table->InstanceCurrent); + const float hit_half_width = ImTrunc(TABLE_RESIZE_SEPARATOR_HALF_THICKNESS * g.CurrentDpiScale); + const float hit_y1 = (table->FreezeRowsCount >= 1 ? table->OuterRect.Min.y : table->WorkRect.Min.y) + table->AngledHeadersHeight; + const float hit_y2_body = ImMax(table->OuterRect.Max.y, hit_y1 + table_instance->LastOuterHeight - table->AngledHeadersHeight); + const float hit_y2_head = hit_y1 + table_instance->LastTopHeadersRowHeight; + + for (int order_n = 0; order_n < table->ColumnsCount; order_n++) + { + if (!IM_BITARRAY_TESTBIT(table->EnabledMaskByDisplayOrder, order_n)) + continue; + + const int column_n = table->DisplayOrderToIndex[order_n]; + ImGuiTableColumn* column = &table->Columns[column_n]; + if (column->Flags & (ImGuiTableColumnFlags_NoResize | ImGuiTableColumnFlags_NoDirectResize_)) + continue; + + // ImGuiTableFlags_NoBordersInBodyUntilResize will be honored in TableDrawBorders() + const float border_y2_hit = (table->Flags & ImGuiTableFlags_NoBordersInBody) ? hit_y2_head : hit_y2_body; + if ((table->Flags & ImGuiTableFlags_NoBordersInBody) && table->IsUsingHeaders == false) + continue; + + if (!column->IsVisibleX && table->LastResizedColumn != column_n) + continue; + + ImGuiID column_id = TableGetColumnResizeID(table, column_n, table->InstanceCurrent); + ImRect hit_rect(column->MaxX - hit_half_width, hit_y1, column->MaxX + hit_half_width, border_y2_hit); + ItemAdd(hit_rect, column_id, NULL, ImGuiItemFlags_NoNav); + //GetForegroundDrawList()->AddRect(hit_rect.Min, hit_rect.Max, IM_COL32(255, 0, 0, 100)); + + bool hovered = false, held = false; + bool pressed = ButtonBehavior(hit_rect, column_id, &hovered, &held, ImGuiButtonFlags_FlattenChildren | ImGuiButtonFlags_PressedOnClick | ImGuiButtonFlags_PressedOnDoubleClick | ImGuiButtonFlags_NoNavFocus); + if (pressed && IsMouseDoubleClicked(0)) + { + TableSetColumnWidthAutoSingle(table, column_n); + ClearActiveID(); + held = false; + } + if (held) + { + if (table->LastResizedColumn == -1) + table->ResizeLockMinContentsX2 = table->RightMostEnabledColumn != -1 ? table->Columns[table->RightMostEnabledColumn].MaxX : -FLT_MAX; + table->ResizedColumn = (ImGuiTableColumnIdx)column_n; + table->InstanceInteracted = table->InstanceCurrent; + } + if ((hovered && g.HoveredIdTimer > TABLE_RESIZE_SEPARATOR_FEEDBACK_TIMER) || held) + { + table->HoveredColumnBorder = (ImGuiTableColumnIdx)column_n; + SetMouseCursor(ImGuiMouseCursor_ResizeEW); + } + } +} + +void ImGui::EndTable() +{ + ImGuiContext& g = *GImGui; + ImGuiTable* table = g.CurrentTable; + if (table == NULL) + { + IM_ASSERT_USER_ERROR(table != NULL, "EndTable() call should only be done while in BeginTable() scope!"); + return; + } + + // This assert would be very useful to catch a common error... unfortunately it would probably trigger in some + // cases, and for consistency user may sometimes output empty tables (and still benefit from e.g. outer border) + //IM_ASSERT(table->IsLayoutLocked && "Table unused: never called TableNextRow(), is that the intent?"); + + // If the user never got to call TableNextRow() or TableNextColumn(), we call layout ourselves to ensure all our + // code paths are consistent (instead of just hoping that TableBegin/TableEnd will work), get borders drawn, etc. + if (!table->IsLayoutLocked) + TableUpdateLayout(table); + + const ImGuiTableFlags flags = table->Flags; + ImGuiWindow* inner_window = table->InnerWindow; + ImGuiWindow* outer_window = table->OuterWindow; + ImGuiTableTempData* temp_data = table->TempData; + IM_ASSERT(inner_window == g.CurrentWindow); + IM_ASSERT(outer_window == inner_window || outer_window == inner_window->ParentWindow); + + if (table->IsInsideRow) + TableEndRow(table); + + // Context menu in columns body + if (flags & ImGuiTableFlags_ContextMenuInBody) + if (table->HoveredColumnBody != -1 && !IsAnyItemHovered() && IsMouseReleased(ImGuiMouseButton_Right)) + TableOpenContextMenu((int)table->HoveredColumnBody); + + // Finalize table height + ImGuiTableInstanceData* table_instance = TableGetInstanceData(table, table->InstanceCurrent); + inner_window->DC.PrevLineSize = temp_data->HostBackupPrevLineSize; + inner_window->DC.CurrLineSize = temp_data->HostBackupCurrLineSize; + inner_window->DC.CursorMaxPos = temp_data->HostBackupCursorMaxPos; + const float inner_content_max_y = table->RowPosY2; + IM_ASSERT(table->RowPosY2 == inner_window->DC.CursorPos.y); + if (inner_window != outer_window) + inner_window->DC.CursorMaxPos.y = inner_content_max_y; + else if (!(flags & ImGuiTableFlags_NoHostExtendY)) + table->OuterRect.Max.y = table->InnerRect.Max.y = ImMax(table->OuterRect.Max.y, inner_content_max_y); // Patch OuterRect/InnerRect height + table->WorkRect.Max.y = ImMax(table->WorkRect.Max.y, table->OuterRect.Max.y); + table_instance->LastOuterHeight = table->OuterRect.GetHeight(); + + // Setup inner scrolling range + // FIXME: This ideally should be done earlier, in BeginTable() SetNextWindowContentSize call, just like writing to inner_window->DC.CursorMaxPos.y, + // but since the later is likely to be impossible to do we'd rather update both axes together. + if (table->Flags & ImGuiTableFlags_ScrollX) + { + const float outer_padding_for_border = (table->Flags & ImGuiTableFlags_BordersOuterV) ? TABLE_BORDER_SIZE : 0.0f; + float max_pos_x = table->InnerWindow->DC.CursorMaxPos.x; + if (table->RightMostEnabledColumn != -1) + max_pos_x = ImMax(max_pos_x, table->Columns[table->RightMostEnabledColumn].WorkMaxX + table->CellPaddingX + table->OuterPaddingX - outer_padding_for_border); + if (table->ResizedColumn != -1) + max_pos_x = ImMax(max_pos_x, table->ResizeLockMinContentsX2); + table->InnerWindow->DC.CursorMaxPos.x = max_pos_x + table->TempData->AngledHeadersExtraWidth; + } + + // Pop clipping rect + if (!(flags & ImGuiTableFlags_NoClip)) + inner_window->DrawList->PopClipRect(); + inner_window->ClipRect = inner_window->DrawList->_ClipRectStack.back(); + + // Draw borders + if ((flags & ImGuiTableFlags_Borders) != 0) + TableDrawBorders(table); + +#if 0 + // Strip out dummy channel draw calls + // We have no way to prevent user submitting direct ImDrawList calls into a hidden column (but ImGui:: calls will be clipped out) + // Pros: remove draw calls which will have no effect. since they'll have zero-size cliprect they may be early out anyway. + // Cons: making it harder for users watching metrics/debugger to spot the wasted vertices. + if (table->DummyDrawChannel != (ImGuiTableColumnIdx)-1) + { + ImDrawChannel* dummy_channel = &table->DrawSplitter._Channels[table->DummyDrawChannel]; + dummy_channel->_CmdBuffer.resize(0); + dummy_channel->_IdxBuffer.resize(0); + } +#endif + + // Flatten channels and merge draw calls + ImDrawListSplitter* splitter = table->DrawSplitter; + splitter->SetCurrentChannel(inner_window->DrawList, 0); + if ((table->Flags & ImGuiTableFlags_NoClip) == 0) + TableMergeDrawChannels(table); + splitter->Merge(inner_window->DrawList); + + // Update ColumnsAutoFitWidth to get us ahead for host using our size to auto-resize without waiting for next BeginTable() + float auto_fit_width_for_fixed = 0.0f; + float auto_fit_width_for_stretched = 0.0f; + float auto_fit_width_for_stretched_min = 0.0f; + for (int column_n = 0; column_n < table->ColumnsCount; column_n++) + if (IM_BITARRAY_TESTBIT(table->EnabledMaskByIndex, column_n)) + { + ImGuiTableColumn* column = &table->Columns[column_n]; + float column_width_request = ((column->Flags & ImGuiTableColumnFlags_WidthFixed) && !(column->Flags & ImGuiTableColumnFlags_NoResize)) ? column->WidthRequest : TableGetColumnWidthAuto(table, column); + if (column->Flags & ImGuiTableColumnFlags_WidthFixed) + auto_fit_width_for_fixed += column_width_request; + else + auto_fit_width_for_stretched += column_width_request; + if ((column->Flags & ImGuiTableColumnFlags_WidthStretch) && (column->Flags & ImGuiTableColumnFlags_NoResize) != 0) + auto_fit_width_for_stretched_min = ImMax(auto_fit_width_for_stretched_min, column_width_request / (column->StretchWeight / table->ColumnsStretchSumWeights)); + } + const float width_spacings = (table->OuterPaddingX * 2.0f) + (table->CellSpacingX1 + table->CellSpacingX2) * (table->ColumnsEnabledCount - 1); + table->ColumnsAutoFitWidth = width_spacings + (table->CellPaddingX * 2.0f) * table->ColumnsEnabledCount + auto_fit_width_for_fixed + ImMax(auto_fit_width_for_stretched, auto_fit_width_for_stretched_min); + + // Update scroll + if ((table->Flags & ImGuiTableFlags_ScrollX) == 0 && inner_window != outer_window) + { + inner_window->Scroll.x = 0.0f; + } + else if (table->LastResizedColumn != -1 && table->ResizedColumn == -1 && inner_window->ScrollbarX && table->InstanceInteracted == table->InstanceCurrent) + { + // When releasing a column being resized, scroll to keep the resulting column in sight + const float neighbor_width_to_keep_visible = table->MinColumnWidth + table->CellPaddingX * 2.0f; + ImGuiTableColumn* column = &table->Columns[table->LastResizedColumn]; + if (column->MaxX < table->InnerClipRect.Min.x) + SetScrollFromPosX(inner_window, column->MaxX - inner_window->Pos.x - neighbor_width_to_keep_visible, 1.0f); + else if (column->MaxX > table->InnerClipRect.Max.x) + SetScrollFromPosX(inner_window, column->MaxX - inner_window->Pos.x + neighbor_width_to_keep_visible, 1.0f); + } + + // Apply resizing/dragging at the end of the frame + if (table->ResizedColumn != -1 && table->InstanceCurrent == table->InstanceInteracted) + { + ImGuiTableColumn* column = &table->Columns[table->ResizedColumn]; + const float new_x2 = (g.IO.MousePos.x - g.ActiveIdClickOffset.x + ImTrunc(TABLE_RESIZE_SEPARATOR_HALF_THICKNESS * g.CurrentDpiScale)); + const float new_width = ImTrunc(new_x2 - column->MinX - table->CellSpacingX1 - table->CellPaddingX * 2.0f); + table->ResizedColumnNextWidth = new_width; + } + + table->IsActiveIdInTable = (g.ActiveIdIsAlive != 0 && table->IsActiveIdAliveBeforeTable == false); + + // Pop from id stack + IM_ASSERT_USER_ERROR(inner_window->IDStack.back() == table_instance->TableInstanceID, "Mismatching PushID/PopID!"); + IM_ASSERT_USER_ERROR(outer_window->DC.ItemWidthStack.Size >= temp_data->HostBackupItemWidthStackSize, "Too many PopItemWidth!"); + if (table->InstanceCurrent > 0) + PopID(); + PopID(); + + // Restore window data that we modified + const ImVec2 backup_outer_max_pos = outer_window->DC.CursorMaxPos; + inner_window->WorkRect = temp_data->HostBackupWorkRect; + inner_window->ParentWorkRect = temp_data->HostBackupParentWorkRect; + inner_window->SkipItems = table->HostSkipItems; + outer_window->DC.CursorPos = table->OuterRect.Min; + outer_window->DC.ItemWidth = temp_data->HostBackupItemWidth; + outer_window->DC.ItemWidthStack.Size = temp_data->HostBackupItemWidthStackSize; + outer_window->DC.ColumnsOffset = temp_data->HostBackupColumnsOffset; + + // Layout in outer window + // (FIXME: To allow auto-fit and allow desirable effect of SameLine() we dissociate 'used' vs 'ideal' size by overriding + // CursorPosPrevLine and CursorMaxPos manually. That should be a more general layout feature, see same problem e.g. #3414) + if (inner_window != outer_window) + { + short backup_nav_layers_active_mask = inner_window->DC.NavLayersActiveMask; + inner_window->DC.NavLayersActiveMask |= 1 << table->NavLayer; // So empty table don't appear to navigate differently. + g.CurrentTable = NULL; // To avoid error recovery recursing + EndChild(); + g.CurrentTable = table; + inner_window->DC.NavLayersActiveMask = backup_nav_layers_active_mask; + } + else + { + ItemSize(table->OuterRect.GetSize()); + ItemAdd(table->OuterRect, 0); + } + + // Override declared contents width/height to enable auto-resize while not needlessly adding a scrollbar + if (table->Flags & ImGuiTableFlags_NoHostExtendX) + { + // FIXME-TABLE: Could we remove this section? + // ColumnsAutoFitWidth may be one frame ahead here since for Fixed+NoResize is calculated from latest contents + IM_ASSERT((table->Flags & ImGuiTableFlags_ScrollX) == 0); + outer_window->DC.CursorMaxPos.x = ImMax(backup_outer_max_pos.x, table->OuterRect.Min.x + table->ColumnsAutoFitWidth); + } + else if (temp_data->UserOuterSize.x <= 0.0f) + { + // Some references for this: #7651 + tests "table_reported_size", "table_reported_size_outer" equivalent Y block + // - Checking for ImGuiTableFlags_ScrollX/ScrollY flag makes us a frame ahead when disabling those flags. + // - FIXME-TABLE: Would make sense to pre-compute expected scrollbar visibility/sizes to generally save a frame of feedback. + const float inner_content_max_x = table->OuterRect.Min.x + table->ColumnsAutoFitWidth; // Slightly misleading name but used for code symmetry with inner_content_max_y + const float decoration_size = table->TempData->AngledHeadersExtraWidth + ((table->Flags & ImGuiTableFlags_ScrollY) ? inner_window->ScrollbarSizes.x : 0.0f); + outer_window->DC.IdealMaxPos.x = ImMax(outer_window->DC.IdealMaxPos.x, inner_content_max_x + decoration_size - temp_data->UserOuterSize.x); + outer_window->DC.CursorMaxPos.x = ImMax(backup_outer_max_pos.x, ImMin(table->OuterRect.Max.x, inner_content_max_x + decoration_size)); + } + else + { + outer_window->DC.CursorMaxPos.x = ImMax(backup_outer_max_pos.x, table->OuterRect.Max.x); + } + if (temp_data->UserOuterSize.y <= 0.0f) + { + const float decoration_size = (table->Flags & ImGuiTableFlags_ScrollX) ? inner_window->ScrollbarSizes.y : 0.0f; + outer_window->DC.IdealMaxPos.y = ImMax(outer_window->DC.IdealMaxPos.y, inner_content_max_y + decoration_size - temp_data->UserOuterSize.y); + outer_window->DC.CursorMaxPos.y = ImMax(backup_outer_max_pos.y, ImMin(table->OuterRect.Max.y, inner_content_max_y + decoration_size)); + } + else + { + // OuterRect.Max.y may already have been pushed downward from the initial value (unless ImGuiTableFlags_NoHostExtendY is set) + outer_window->DC.CursorMaxPos.y = ImMax(backup_outer_max_pos.y, table->OuterRect.Max.y); + } + + // Save settings + if (table->IsSettingsDirty) + TableSaveSettings(table); + table->IsInitializing = false; + + // Clear or restore current table, if any + IM_ASSERT(g.CurrentWindow == outer_window && g.CurrentTable == table); + IM_ASSERT(g.TablesTempDataStacked > 0); + temp_data = (--g.TablesTempDataStacked > 0) ? &g.TablesTempData[g.TablesTempDataStacked - 1] : NULL; + g.CurrentTable = temp_data ? g.Tables.GetByIndex(temp_data->TableIndex) : NULL; + if (g.CurrentTable) + { + g.CurrentTable->TempData = temp_data; + g.CurrentTable->DrawSplitter = &temp_data->DrawSplitter; + } + outer_window->DC.CurrentTableIdx = g.CurrentTable ? g.Tables.GetIndex(g.CurrentTable) : -1; + NavUpdateCurrentWindowIsScrollPushableX(); +} + +// Called in TableSetupColumn() when initializing and in TableLoadSettings() for defaults before applying stored settings. +// 'init_mask' specify which fields to initialize. +static void TableInitColumnDefaults(ImGuiTable* table, ImGuiTableColumn* column, ImGuiTableColumnFlags init_mask) +{ + ImGuiTableColumnFlags flags = column->Flags; + if (init_mask & ImGuiTableFlags_Resizable) + { + float init_width_or_weight = column->InitStretchWeightOrWidth; + column->WidthRequest = ((flags & ImGuiTableColumnFlags_WidthFixed) && init_width_or_weight > 0.0f) ? init_width_or_weight : -1.0f; + column->StretchWeight = (init_width_or_weight > 0.0f && (flags & ImGuiTableColumnFlags_WidthStretch)) ? init_width_or_weight : -1.0f; + if (init_width_or_weight > 0.0f) // Disable auto-fit if an explicit width/weight has been specified + column->AutoFitQueue = 0x00; + } + if (init_mask & ImGuiTableFlags_Reorderable) + column->DisplayOrder = (ImGuiTableColumnIdx)table->Columns.index_from_ptr(column); + if (init_mask & ImGuiTableFlags_Hideable) + column->IsUserEnabled = column->IsUserEnabledNextFrame = (flags & ImGuiTableColumnFlags_DefaultHide) ? 0 : 1; + if (init_mask & ImGuiTableFlags_Sortable) + { + // Multiple columns using _DefaultSort will be reassigned unique SortOrder values when building the sort specs. + column->SortOrder = (flags & ImGuiTableColumnFlags_DefaultSort) ? 0 : -1; + column->SortDirection = (flags & ImGuiTableColumnFlags_DefaultSort) ? ((flags & ImGuiTableColumnFlags_PreferSortDescending) ? (ImS8)ImGuiSortDirection_Descending : (ImU8)(ImGuiSortDirection_Ascending)) : (ImS8)ImGuiSortDirection_None; + } +} + +// See "COLUMNS SIZING POLICIES" comments at the top of this file +// If (init_width_or_weight <= 0.0f) it is ignored +void ImGui::TableSetupColumn(const char* label, ImGuiTableColumnFlags flags, float init_width_or_weight, ImGuiID user_id) +{ + ImGuiContext& g = *GImGui; + ImGuiTable* table = g.CurrentTable; + if (table == NULL) + { + IM_ASSERT_USER_ERROR(table != NULL, "Call should only be done while in BeginTable() scope!"); + return; + } + IM_ASSERT(table->IsLayoutLocked == false && "Need to call TableSetupColumn() before first row!"); + IM_ASSERT((flags & ImGuiTableColumnFlags_StatusMask_) == 0 && "Illegal to pass StatusMask values to TableSetupColumn()"); + if (table->DeclColumnsCount >= table->ColumnsCount) + { + IM_ASSERT_USER_ERROR(table->DeclColumnsCount < table->ColumnsCount, "Called TableSetupColumn() too many times!"); + return; + } + + ImGuiTableColumn* column = &table->Columns[table->DeclColumnsCount]; + table->DeclColumnsCount++; + + // Assert when passing a width or weight if policy is entirely left to default, to avoid storing width into weight and vice-versa. + // Give a grace to users of ImGuiTableFlags_ScrollX. + if (table->IsDefaultSizingPolicy && (flags & ImGuiTableColumnFlags_WidthMask_) == 0 && (flags & ImGuiTableFlags_ScrollX) == 0) + IM_ASSERT(init_width_or_weight <= 0.0f && "Can only specify width/weight if sizing policy is set explicitly in either Table or Column."); + + // When passing a width automatically enforce WidthFixed policy + // (whereas TableSetupColumnFlags would default to WidthAuto if table is not resizable) + if ((flags & ImGuiTableColumnFlags_WidthMask_) == 0 && init_width_or_weight > 0.0f) + if ((table->Flags & ImGuiTableFlags_SizingMask_) == ImGuiTableFlags_SizingFixedFit || (table->Flags & ImGuiTableFlags_SizingMask_) == ImGuiTableFlags_SizingFixedSame) + flags |= ImGuiTableColumnFlags_WidthFixed; + if (flags & ImGuiTableColumnFlags_AngledHeader) + { + flags |= ImGuiTableColumnFlags_NoHeaderLabel; + table->AngledHeadersCount++; + } + + TableSetupColumnFlags(table, column, flags); + column->UserID = user_id; + flags = column->Flags; + + // Initialize defaults + column->InitStretchWeightOrWidth = init_width_or_weight; + if (table->IsInitializing) + { + ImGuiTableFlags init_flags = ~table->SettingsLoadedFlags; + if (column->WidthRequest < 0.0f && column->StretchWeight < 0.0f) + init_flags |= ImGuiTableFlags_Resizable; + TableInitColumnDefaults(table, column, init_flags); + } + + // Store name (append with zero-terminator in contiguous buffer) + // FIXME: If we recorded the number of \n in names we could compute header row height + column->NameOffset = -1; + if (label != NULL && label[0] != 0) + { + column->NameOffset = (ImS16)table->ColumnsNames.size(); + table->ColumnsNames.append(label, label + ImStrlen(label) + 1); + } +} + +// [Public] +void ImGui::TableSetupScrollFreeze(int columns, int rows) +{ + ImGuiContext& g = *GImGui; + ImGuiTable* table = g.CurrentTable; + if (table == NULL) + { + IM_ASSERT_USER_ERROR(table != NULL, "Call should only be done while in BeginTable() scope!"); + return; + } + IM_ASSERT(table->IsLayoutLocked == false && "Need to call TableSetupColumn() before first row!"); + IM_ASSERT(columns >= 0 && columns < IMGUI_TABLE_MAX_COLUMNS); + IM_ASSERT(rows >= 0 && rows < 128); // Arbitrary limit + + table->FreezeColumnsRequest = (table->Flags & ImGuiTableFlags_ScrollX) ? (ImGuiTableColumnIdx)ImMin(columns, table->ColumnsCount) : 0; + table->FreezeColumnsCount = (table->InnerWindow->Scroll.x != 0.0f) ? table->FreezeColumnsRequest : 0; + table->FreezeRowsRequest = (table->Flags & ImGuiTableFlags_ScrollY) ? (ImGuiTableColumnIdx)rows : 0; + table->FreezeRowsCount = (table->InnerWindow->Scroll.y != 0.0f) ? table->FreezeRowsRequest : 0; + table->IsUnfrozenRows = (table->FreezeRowsCount == 0); // Make sure this is set before TableUpdateLayout() so ImGuiListClipper can benefit from it.b + + // Ensure frozen columns are ordered in their section. We still allow multiple frozen columns to be reordered. + // FIXME-TABLE: This work for preserving 2143 into 21|43. How about 4321 turning into 21|43? (preserve relative order in each section) + for (int column_n = 0; column_n < table->FreezeColumnsRequest; column_n++) + { + int order_n = table->DisplayOrderToIndex[column_n]; + if (order_n != column_n && order_n >= table->FreezeColumnsRequest) + { + ImSwap(table->Columns[table->DisplayOrderToIndex[order_n]].DisplayOrder, table->Columns[table->DisplayOrderToIndex[column_n]].DisplayOrder); + ImSwap(table->DisplayOrderToIndex[order_n], table->DisplayOrderToIndex[column_n]); + } + } +} + +//----------------------------------------------------------------------------- +// [SECTION] Tables: Simple accessors +//----------------------------------------------------------------------------- +// - TableGetColumnCount() +// - TableGetColumnName() +// - TableGetColumnName() [Internal] +// - TableSetColumnEnabled() +// - TableGetColumnFlags() +// - TableGetCellBgRect() [Internal] +// - TableGetColumnResizeID() [Internal] +// - TableGetHoveredColumn() [Internal] +// - TableGetHoveredRow() [Internal] +// - TableSetBgColor() +//----------------------------------------------------------------------------- + +int ImGui::TableGetColumnCount() +{ + ImGuiContext& g = *GImGui; + ImGuiTable* table = g.CurrentTable; + return table ? table->ColumnsCount : 0; +} + +const char* ImGui::TableGetColumnName(int column_n) +{ + ImGuiContext& g = *GImGui; + ImGuiTable* table = g.CurrentTable; + if (!table) + return NULL; + if (column_n < 0) + column_n = table->CurrentColumn; + return TableGetColumnName(table, column_n); +} + +const char* ImGui::TableGetColumnName(const ImGuiTable* table, int column_n) +{ + if (table->IsLayoutLocked == false && column_n >= table->DeclColumnsCount) + return ""; // NameOffset is invalid at this point + const ImGuiTableColumn* column = &table->Columns[column_n]; + if (column->NameOffset == -1) + return ""; + return &table->ColumnsNames.Buf[column->NameOffset]; +} + +// Change user accessible enabled/disabled state of a column (often perceived as "showing/hiding" from users point of view) +// Note that end-user can use the context menu to change this themselves (right-click in headers, or right-click in columns body with ImGuiTableFlags_ContextMenuInBody) +// - Require table to have the ImGuiTableFlags_Hideable flag because we are manipulating user accessible state. +// - Request will be applied during next layout, which happens on the first call to TableNextRow() after BeginTable(). +// - For the getter you can test (TableGetColumnFlags() & ImGuiTableColumnFlags_IsEnabled) != 0. +// - Alternative: the ImGuiTableColumnFlags_Disabled is an overriding/master disable flag which will also hide the column from context menu. +void ImGui::TableSetColumnEnabled(int column_n, bool enabled) +{ + ImGuiContext& g = *GImGui; + ImGuiTable* table = g.CurrentTable; + if (table == NULL) + { + IM_ASSERT_USER_ERROR(table != NULL, "Call should only be done while in BeginTable() scope!"); + return; + } + IM_ASSERT(table->Flags & ImGuiTableFlags_Hideable); // See comments above + if (column_n < 0) + column_n = table->CurrentColumn; + IM_ASSERT(column_n >= 0 && column_n < table->ColumnsCount); + ImGuiTableColumn* column = &table->Columns[column_n]; + column->IsUserEnabledNextFrame = enabled; +} + +// We allow querying for an extra column in order to poll the IsHovered state of the right-most section +ImGuiTableColumnFlags ImGui::TableGetColumnFlags(int column_n) +{ + ImGuiContext& g = *GImGui; + ImGuiTable* table = g.CurrentTable; + if (!table) + return ImGuiTableColumnFlags_None; + if (column_n < 0) + column_n = table->CurrentColumn; + if (column_n == table->ColumnsCount) + return (table->HoveredColumnBody == column_n) ? ImGuiTableColumnFlags_IsHovered : ImGuiTableColumnFlags_None; + return table->Columns[column_n].Flags; +} + +// Return the cell rectangle based on currently known height. +// - Important: we generally don't know our row height until the end of the row, so Max.y will be incorrect in many situations. +// The only case where this is correct is if we provided a min_row_height to TableNextRow() and don't go below it, or in TableEndRow() when we locked that height. +// - Important: if ImGuiTableFlags_PadOuterX is set but ImGuiTableFlags_PadInnerX is not set, the outer-most left and right +// columns report a small offset so their CellBgRect can extend up to the outer border. +// FIXME: But the rendering code in TableEndRow() nullifies that with clamping required for scrolling. +ImRect ImGui::TableGetCellBgRect(const ImGuiTable* table, int column_n) +{ + const ImGuiTableColumn* column = &table->Columns[column_n]; + float x1 = column->MinX; + float x2 = column->MaxX; + //if (column->PrevEnabledColumn == -1) + // x1 -= table->OuterPaddingX; + //if (column->NextEnabledColumn == -1) + // x2 += table->OuterPaddingX; + x1 = ImMax(x1, table->WorkRect.Min.x); + x2 = ImMin(x2, table->WorkRect.Max.x); + return ImRect(x1, table->RowPosY1, x2, table->RowPosY2); +} + +// Return the resizing ID for the right-side of the given column. +ImGuiID ImGui::TableGetColumnResizeID(ImGuiTable* table, int column_n, int instance_no) +{ + IM_ASSERT(column_n >= 0 && column_n < table->ColumnsCount); + ImGuiID instance_id = TableGetInstanceID(table, instance_no); + return instance_id + 1 + column_n; // FIXME: #6140: still not ideal +} + +// Return -1 when table is not hovered. return columns_count if hovering the unused space at the right of the right-most visible column. +int ImGui::TableGetHoveredColumn() +{ + ImGuiContext& g = *GImGui; + ImGuiTable* table = g.CurrentTable; + if (!table) + return -1; + return (int)table->HoveredColumnBody; +} + +// Return -1 when table is not hovered. Return maxrow+1 if in table but below last submitted row. +// *IMPORTANT* Unlike TableGetHoveredColumn(), this has a one frame latency in updating the value. +// This difference with is the reason why this is not public yet. +int ImGui::TableGetHoveredRow() +{ + ImGuiContext& g = *GImGui; + ImGuiTable* table = g.CurrentTable; + if (!table) + return -1; + ImGuiTableInstanceData* table_instance = TableGetInstanceData(table, table->InstanceCurrent); + return (int)table_instance->HoveredRowLast; +} + +void ImGui::TableSetBgColor(ImGuiTableBgTarget target, ImU32 color, int column_n) +{ + ImGuiContext& g = *GImGui; + ImGuiTable* table = g.CurrentTable; + IM_ASSERT(target != ImGuiTableBgTarget_None); + + if (color == IM_COL32_DISABLE) + color = 0; + + // We cannot draw neither the cell or row background immediately as we don't know the row height at this point in time. + switch (target) + { + case ImGuiTableBgTarget_CellBg: + { + if (table->RowPosY1 > table->InnerClipRect.Max.y) // Discard + return; + if (column_n == -1) + column_n = table->CurrentColumn; + if (!IM_BITARRAY_TESTBIT(table->VisibleMaskByIndex, column_n)) + return; + if (table->RowCellDataCurrent < 0 || table->RowCellData[table->RowCellDataCurrent].Column != column_n) + table->RowCellDataCurrent++; + ImGuiTableCellData* cell_data = &table->RowCellData[table->RowCellDataCurrent]; + cell_data->BgColor = color; + cell_data->Column = (ImGuiTableColumnIdx)column_n; + break; + } + case ImGuiTableBgTarget_RowBg0: + case ImGuiTableBgTarget_RowBg1: + { + if (table->RowPosY1 > table->InnerClipRect.Max.y) // Discard + return; + IM_ASSERT(column_n == -1); + int bg_idx = (target == ImGuiTableBgTarget_RowBg1) ? 1 : 0; + table->RowBgColor[bg_idx] = color; + break; + } + default: + IM_ASSERT(0); + } +} + +//------------------------------------------------------------------------- +// [SECTION] Tables: Row changes +//------------------------------------------------------------------------- +// - TableGetRowIndex() +// - TableNextRow() +// - TableBeginRow() [Internal] +// - TableEndRow() [Internal] +//------------------------------------------------------------------------- + +// [Public] Note: for row coloring we use ->RowBgColorCounter which is the same value without counting header rows +int ImGui::TableGetRowIndex() +{ + ImGuiContext& g = *GImGui; + ImGuiTable* table = g.CurrentTable; + if (!table) + return 0; + return table->CurrentRow; +} + +// [Public] Starts into the first cell of a new row +void ImGui::TableNextRow(ImGuiTableRowFlags row_flags, float row_min_height) +{ + ImGuiContext& g = *GImGui; + ImGuiTable* table = g.CurrentTable; + + if (!table->IsLayoutLocked) + TableUpdateLayout(table); + if (table->IsInsideRow) + TableEndRow(table); + + table->LastRowFlags = table->RowFlags; + table->RowFlags = row_flags; + table->RowCellPaddingY = g.Style.CellPadding.y; + table->RowMinHeight = row_min_height; + TableBeginRow(table); + + // We honor min_row_height requested by user, but cannot guarantee per-row maximum height, + // because that would essentially require a unique clipping rectangle per-cell. + table->RowPosY2 += table->RowCellPaddingY * 2.0f; + table->RowPosY2 = ImMax(table->RowPosY2, table->RowPosY1 + row_min_height); + + // Disable output until user calls TableNextColumn() + table->InnerWindow->SkipItems = true; +} + +// [Internal] Only called by TableNextRow() +void ImGui::TableBeginRow(ImGuiTable* table) +{ + ImGuiWindow* window = table->InnerWindow; + IM_ASSERT(!table->IsInsideRow); + + // New row + table->CurrentRow++; + table->CurrentColumn = -1; + table->RowBgColor[0] = table->RowBgColor[1] = IM_COL32_DISABLE; + table->RowCellDataCurrent = -1; + table->IsInsideRow = true; + + // Begin frozen rows + float next_y1 = table->RowPosY2; + if (table->CurrentRow == 0 && table->FreezeRowsCount > 0) + next_y1 = window->DC.CursorPos.y = table->OuterRect.Min.y; + + table->RowPosY1 = table->RowPosY2 = next_y1; + table->RowTextBaseline = 0.0f; + table->RowIndentOffsetX = window->DC.Indent.x - table->HostIndentX; // Lock indent + + window->DC.PrevLineTextBaseOffset = 0.0f; + window->DC.CursorPosPrevLine = ImVec2(window->DC.CursorPos.x, window->DC.CursorPos.y + table->RowCellPaddingY); // This allows users to call SameLine() to share LineSize between columns. + window->DC.PrevLineSize = window->DC.CurrLineSize = ImVec2(0.0f, 0.0f); // This allows users to call SameLine() to share LineSize between columns, and to call it from first column too. + window->DC.IsSameLine = window->DC.IsSetPos = false; + window->DC.CursorMaxPos.y = next_y1; + + // Making the header BG color non-transparent will allow us to overlay it multiple times when handling smooth dragging. + if (table->RowFlags & ImGuiTableRowFlags_Headers) + { + TableSetBgColor(ImGuiTableBgTarget_RowBg0, GetColorU32(ImGuiCol_TableHeaderBg)); + if (table->CurrentRow == 0) + table->IsUsingHeaders = true; + } +} + +// [Internal] Called by TableNextRow() +void ImGui::TableEndRow(ImGuiTable* table) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + IM_ASSERT(window == table->InnerWindow); + IM_ASSERT(table->IsInsideRow); + + if (table->CurrentColumn != -1) + TableEndCell(table); + + // Logging + if (g.LogEnabled) + LogRenderedText(NULL, "|"); + + // Position cursor at the bottom of our row so it can be used for e.g. clipping calculation. However it is + // likely that the next call to TableBeginCell() will reposition the cursor to take account of vertical padding. + window->DC.CursorPos.y = table->RowPosY2; + + // Row background fill + const float bg_y1 = table->RowPosY1; + const float bg_y2 = table->RowPosY2; + const bool unfreeze_rows_actual = (table->CurrentRow + 1 == table->FreezeRowsCount); + const bool unfreeze_rows_request = (table->CurrentRow + 1 == table->FreezeRowsRequest); + ImGuiTableInstanceData* table_instance = TableGetInstanceData(table, table->InstanceCurrent); + if ((table->RowFlags & ImGuiTableRowFlags_Headers) && (table->CurrentRow == 0 || (table->LastRowFlags & ImGuiTableRowFlags_Headers))) + table_instance->LastTopHeadersRowHeight += bg_y2 - bg_y1; + + const bool is_visible = (bg_y2 >= table->InnerClipRect.Min.y && bg_y1 <= table->InnerClipRect.Max.y); + if (is_visible) + { + // Update data for TableGetHoveredRow() + if (table->HoveredColumnBody != -1 && g.IO.MousePos.y >= bg_y1 && g.IO.MousePos.y < bg_y2 && table_instance->HoveredRowNext < 0) + table_instance->HoveredRowNext = table->CurrentRow; + + // Decide of background color for the row + ImU32 bg_col0 = 0; + ImU32 bg_col1 = 0; + if (table->RowBgColor[0] != IM_COL32_DISABLE) + bg_col0 = table->RowBgColor[0]; + else if (table->Flags & ImGuiTableFlags_RowBg) + bg_col0 = GetColorU32((table->RowBgColorCounter & 1) ? ImGuiCol_TableRowBgAlt : ImGuiCol_TableRowBg); + if (table->RowBgColor[1] != IM_COL32_DISABLE) + bg_col1 = table->RowBgColor[1]; + + // Decide of top border color + ImU32 top_border_col = 0; + const float border_size = TABLE_BORDER_SIZE; + if (table->CurrentRow > 0 && (table->Flags & ImGuiTableFlags_BordersInnerH)) + top_border_col = (table->LastRowFlags & ImGuiTableRowFlags_Headers) ? table->BorderColorStrong : table->BorderColorLight; + + const bool draw_cell_bg_color = table->RowCellDataCurrent >= 0; + const bool draw_strong_bottom_border = unfreeze_rows_actual; + if ((bg_col0 | bg_col1 | top_border_col) != 0 || draw_strong_bottom_border || draw_cell_bg_color) + { + // In theory we could call SetWindowClipRectBeforeSetChannel() but since we know TableEndRow() is + // always followed by a change of clipping rectangle we perform the smallest overwrite possible here. + if ((table->Flags & ImGuiTableFlags_NoClip) == 0) + window->DrawList->_CmdHeader.ClipRect = table->Bg0ClipRectForDrawCmd.ToVec4(); + table->DrawSplitter->SetCurrentChannel(window->DrawList, TABLE_DRAW_CHANNEL_BG0); + } + + // Draw row background + // We soft/cpu clip this so all backgrounds and borders can share the same clipping rectangle + if (bg_col0 || bg_col1) + { + ImRect row_rect(table->WorkRect.Min.x, bg_y1, table->WorkRect.Max.x, bg_y2); + row_rect.ClipWith(table->BgClipRect); + if (bg_col0 != 0 && row_rect.Min.y < row_rect.Max.y) + window->DrawList->AddRectFilled(row_rect.Min, row_rect.Max, bg_col0); + if (bg_col1 != 0 && row_rect.Min.y < row_rect.Max.y) + window->DrawList->AddRectFilled(row_rect.Min, row_rect.Max, bg_col1); + } + + // Draw cell background color + if (draw_cell_bg_color) + { + ImGuiTableCellData* cell_data_end = &table->RowCellData[table->RowCellDataCurrent]; + for (ImGuiTableCellData* cell_data = &table->RowCellData[0]; cell_data <= cell_data_end; cell_data++) + { + // As we render the BG here we need to clip things (for layout we would not) + // FIXME: This cancels the OuterPadding addition done by TableGetCellBgRect(), need to keep it while rendering correctly while scrolling. + const ImGuiTableColumn* column = &table->Columns[cell_data->Column]; + ImRect cell_bg_rect = TableGetCellBgRect(table, cell_data->Column); + cell_bg_rect.ClipWith(table->BgClipRect); + cell_bg_rect.Min.x = ImMax(cell_bg_rect.Min.x, column->ClipRect.Min.x); // So that first column after frozen one gets clipped when scrolling + cell_bg_rect.Max.x = ImMin(cell_bg_rect.Max.x, column->MaxX); + if (cell_bg_rect.Min.y < cell_bg_rect.Max.y) + window->DrawList->AddRectFilled(cell_bg_rect.Min, cell_bg_rect.Max, cell_data->BgColor); + } + } + + // Draw top border + if (top_border_col && bg_y1 >= table->BgClipRect.Min.y && bg_y1 < table->BgClipRect.Max.y) + window->DrawList->AddLine(ImVec2(table->BorderX1, bg_y1), ImVec2(table->BorderX2, bg_y1), top_border_col, border_size); + + // Draw bottom border at the row unfreezing mark (always strong) + if (draw_strong_bottom_border && bg_y2 >= table->BgClipRect.Min.y && bg_y2 < table->BgClipRect.Max.y) + window->DrawList->AddLine(ImVec2(table->BorderX1, bg_y2), ImVec2(table->BorderX2, bg_y2), table->BorderColorStrong, border_size); + } + + // End frozen rows (when we are past the last frozen row line, teleport cursor and alter clipping rectangle) + // We need to do that in TableEndRow() instead of TableBeginRow() so the list clipper can mark end of row and + // get the new cursor position. + if (unfreeze_rows_request) + { + for (int column_n = 0; column_n < table->ColumnsCount; column_n++) + table->Columns[column_n].NavLayerCurrent = table->NavLayer; + const float y0 = ImMax(table->RowPosY2 + 1, table->InnerClipRect.Min.y); + table_instance->LastFrozenHeight = y0 - table->OuterRect.Min.y; + + if (unfreeze_rows_actual) + { + IM_ASSERT(table->IsUnfrozenRows == false); + table->IsUnfrozenRows = true; + + // BgClipRect starts as table->InnerClipRect, reduce it now and make BgClipRectForDrawCmd == BgClipRect + table->BgClipRect.Min.y = table->Bg2ClipRectForDrawCmd.Min.y = ImMin(y0, table->InnerClipRect.Max.y); + table->BgClipRect.Max.y = table->Bg2ClipRectForDrawCmd.Max.y = table->InnerClipRect.Max.y; + table->Bg2DrawChannelCurrent = table->Bg2DrawChannelUnfrozen; + IM_ASSERT(table->Bg2ClipRectForDrawCmd.Min.y <= table->Bg2ClipRectForDrawCmd.Max.y); + + float row_height = table->RowPosY2 - table->RowPosY1; + table->RowPosY2 = window->DC.CursorPos.y = table->WorkRect.Min.y + table->RowPosY2 - table->OuterRect.Min.y; + table->RowPosY1 = table->RowPosY2 - row_height; + for (int column_n = 0; column_n < table->ColumnsCount; column_n++) + { + ImGuiTableColumn* column = &table->Columns[column_n]; + column->DrawChannelCurrent = column->DrawChannelUnfrozen; + column->ClipRect.Min.y = table->Bg2ClipRectForDrawCmd.Min.y; + } + + // Update cliprect ahead of TableBeginCell() so clipper can access to new ClipRect->Min.y + SetWindowClipRectBeforeSetChannel(window, table->Columns[0].ClipRect); + table->DrawSplitter->SetCurrentChannel(window->DrawList, table->Columns[0].DrawChannelCurrent); + } + } + + if (!(table->RowFlags & ImGuiTableRowFlags_Headers)) + table->RowBgColorCounter++; + table->IsInsideRow = false; +} + +//------------------------------------------------------------------------- +// [SECTION] Tables: Columns changes +//------------------------------------------------------------------------- +// - TableGetColumnIndex() +// - TableSetColumnIndex() +// - TableNextColumn() +// - TableBeginCell() [Internal] +// - TableEndCell() [Internal] +//------------------------------------------------------------------------- + +int ImGui::TableGetColumnIndex() +{ + ImGuiContext& g = *GImGui; + ImGuiTable* table = g.CurrentTable; + if (!table) + return 0; + return table->CurrentColumn; +} + +// [Public] Append into a specific column +bool ImGui::TableSetColumnIndex(int column_n) +{ + ImGuiContext& g = *GImGui; + ImGuiTable* table = g.CurrentTable; + if (!table) + return false; + + if (table->CurrentColumn != column_n) + { + if (table->CurrentColumn != -1) + TableEndCell(table); + if ((column_n >= 0 && column_n < table->ColumnsCount) == false) + { + IM_ASSERT_USER_ERROR(column_n >= 0 && column_n < table->ColumnsCount, "TableSetColumnIndex() invalid column index!"); + return false; + } + TableBeginCell(table, column_n); + } + + // Return whether the column is visible. User may choose to skip submitting items based on this return value, + // however they shouldn't skip submitting for columns that may have the tallest contribution to row height. + return table->Columns[column_n].IsRequestOutput; +} + +// [Public] Append into the next column, wrap and create a new row when already on last column +bool ImGui::TableNextColumn() +{ + ImGuiContext& g = *GImGui; + ImGuiTable* table = g.CurrentTable; + if (!table) + return false; + + if (table->IsInsideRow && table->CurrentColumn + 1 < table->ColumnsCount) + { + if (table->CurrentColumn != -1) + TableEndCell(table); + TableBeginCell(table, table->CurrentColumn + 1); + } + else + { + TableNextRow(); + TableBeginCell(table, 0); + } + + // Return whether the column is visible. User may choose to skip submitting items based on this return value, + // however they shouldn't skip submitting for columns that may have the tallest contribution to row height. + return table->Columns[table->CurrentColumn].IsRequestOutput; +} + + +// [Internal] Called by TableSetColumnIndex()/TableNextColumn() +// This is called very frequently, so we need to be mindful of unnecessary overhead. +// FIXME-TABLE FIXME-OPT: Could probably shortcut some things for non-active or clipped columns. +void ImGui::TableBeginCell(ImGuiTable* table, int column_n) +{ + ImGuiContext& g = *GImGui; + ImGuiTableColumn* column = &table->Columns[column_n]; + ImGuiWindow* window = table->InnerWindow; + table->CurrentColumn = column_n; + + // Start position is roughly ~~ CellRect.Min + CellPadding + Indent + float start_x = column->WorkMinX; + if (column->Flags & ImGuiTableColumnFlags_IndentEnable) + start_x += table->RowIndentOffsetX; // ~~ += window.DC.Indent.x - table->HostIndentX, except we locked it for the row. + + window->DC.CursorPos.x = start_x; + window->DC.CursorPos.y = table->RowPosY1 + table->RowCellPaddingY; + window->DC.CursorMaxPos.x = window->DC.CursorPos.x; + window->DC.ColumnsOffset.x = start_x - window->Pos.x - window->DC.Indent.x; // FIXME-WORKRECT + window->DC.CursorPosPrevLine.x = window->DC.CursorPos.x; // PrevLine.y is preserved. This allows users to call SameLine() to share LineSize between columns. + window->DC.CurrLineTextBaseOffset = table->RowTextBaseline; + window->DC.NavLayerCurrent = (ImGuiNavLayer)column->NavLayerCurrent; + + // Note how WorkRect.Max.y is only set once during layout + window->WorkRect.Min.y = window->DC.CursorPos.y; + window->WorkRect.Min.x = column->WorkMinX; + window->WorkRect.Max.x = column->WorkMaxX; + window->DC.ItemWidth = column->ItemWidth; + + window->SkipItems = column->IsSkipItems; + if (column->IsSkipItems) + { + g.LastItemData.ID = 0; + g.LastItemData.StatusFlags = 0; + } + + if (table->Flags & ImGuiTableFlags_NoClip) + { + // FIXME: if we end up drawing all borders/bg in EndTable, could remove this and just assert that channel hasn't changed. + table->DrawSplitter->SetCurrentChannel(window->DrawList, TABLE_DRAW_CHANNEL_NOCLIP); + //IM_ASSERT(table->DrawSplitter._Current == TABLE_DRAW_CHANNEL_NOCLIP); + } + else + { + // FIXME-TABLE: Could avoid this if draw channel is dummy channel? + SetWindowClipRectBeforeSetChannel(window, column->ClipRect); + table->DrawSplitter->SetCurrentChannel(window->DrawList, column->DrawChannelCurrent); + } + + // Logging + if (g.LogEnabled && !column->IsSkipItems) + { + LogRenderedText(&window->DC.CursorPos, "|"); + g.LogLinePosY = FLT_MAX; + } +} + +// [Internal] Called by TableNextRow()/TableSetColumnIndex()/TableNextColumn() +void ImGui::TableEndCell(ImGuiTable* table) +{ + ImGuiTableColumn* column = &table->Columns[table->CurrentColumn]; + ImGuiWindow* window = table->InnerWindow; + + if (window->DC.IsSetPos) + ErrorCheckUsingSetCursorPosToExtendParentBoundaries(); + + // Report maximum position so we can infer content size per column. + float* p_max_pos_x; + if (table->RowFlags & ImGuiTableRowFlags_Headers) + p_max_pos_x = &column->ContentMaxXHeadersUsed; // Useful in case user submit contents in header row that is not a TableHeader() call + else + p_max_pos_x = table->IsUnfrozenRows ? &column->ContentMaxXUnfrozen : &column->ContentMaxXFrozen; + *p_max_pos_x = ImMax(*p_max_pos_x, window->DC.CursorMaxPos.x); + if (column->IsEnabled) + table->RowPosY2 = ImMax(table->RowPosY2, window->DC.CursorMaxPos.y + table->RowCellPaddingY); + column->ItemWidth = window->DC.ItemWidth; + + // Propagate text baseline for the entire row + // FIXME-TABLE: Here we propagate text baseline from the last line of the cell.. instead of the first one. + table->RowTextBaseline = ImMax(table->RowTextBaseline, window->DC.PrevLineTextBaseOffset); +} + +//------------------------------------------------------------------------- +// [SECTION] Tables: Columns width management +//------------------------------------------------------------------------- +// - TableGetMaxColumnWidth() [Internal] +// - TableGetColumnWidthAuto() [Internal] +// - TableSetColumnWidth() +// - TableSetColumnWidthAutoSingle() [Internal] +// - TableSetColumnWidthAutoAll() [Internal] +// - TableUpdateColumnsWeightFromWidth() [Internal] +//------------------------------------------------------------------------- +// Note that actual columns widths are computed in TableUpdateLayout(). +//------------------------------------------------------------------------- + +// Maximum column content width given current layout. Use column->MinX so this value differs on a per-column basis. +float ImGui::TableCalcMaxColumnWidth(const ImGuiTable* table, int column_n) +{ + const ImGuiTableColumn* column = &table->Columns[column_n]; + float max_width = FLT_MAX; + const float min_column_distance = table->MinColumnWidth + table->CellPaddingX * 2.0f + table->CellSpacingX1 + table->CellSpacingX2; + if (table->Flags & ImGuiTableFlags_ScrollX) + { + // Frozen columns can't reach beyond visible width else scrolling will naturally break. + // (we use DisplayOrder as within a set of multiple frozen column reordering is possible) + if (column->DisplayOrder < table->FreezeColumnsRequest) + { + max_width = (table->InnerClipRect.Max.x - (table->FreezeColumnsRequest - column->DisplayOrder) * min_column_distance) - column->MinX; + max_width = max_width - table->OuterPaddingX - table->CellPaddingX - table->CellSpacingX2; + } + } + else if ((table->Flags & ImGuiTableFlags_NoKeepColumnsVisible) == 0) + { + // If horizontal scrolling if disabled, we apply a final lossless shrinking of columns in order to make + // sure they are all visible. Because of this we also know that all of the columns will always fit in + // table->WorkRect and therefore in table->InnerRect (because ScrollX is off) + // FIXME-TABLE: This is solved incorrectly but also quite a difficult problem to fix as we also want ClipRect width to match. + // See "table_width_distrib" and "table_width_keep_visible" tests + max_width = table->WorkRect.Max.x - (table->ColumnsEnabledCount - column->IndexWithinEnabledSet - 1) * min_column_distance - column->MinX; + //max_width -= table->CellSpacingX1; + max_width -= table->CellSpacingX2; + max_width -= table->CellPaddingX * 2.0f; + max_width -= table->OuterPaddingX; + } + return max_width; +} + +// Note this is meant to be stored in column->WidthAuto, please generally use the WidthAuto field +float ImGui::TableGetColumnWidthAuto(ImGuiTable* table, ImGuiTableColumn* column) +{ + const float content_width_body = ImMax(column->ContentMaxXFrozen, column->ContentMaxXUnfrozen) - column->WorkMinX; + const float content_width_headers = column->ContentMaxXHeadersIdeal - column->WorkMinX; + float width_auto = content_width_body; + if (!(column->Flags & ImGuiTableColumnFlags_NoHeaderWidth)) + width_auto = ImMax(width_auto, content_width_headers); + + // Non-resizable fixed columns preserve their requested width + if ((column->Flags & ImGuiTableColumnFlags_WidthFixed) && column->InitStretchWeightOrWidth > 0.0f) + if (!(table->Flags & ImGuiTableFlags_Resizable) || (column->Flags & ImGuiTableColumnFlags_NoResize)) + width_auto = column->InitStretchWeightOrWidth; + + return ImMax(width_auto, table->MinColumnWidth); +} + +// 'width' = inner column width, without padding +void ImGui::TableSetColumnWidth(int column_n, float width) +{ + ImGuiContext& g = *GImGui; + ImGuiTable* table = g.CurrentTable; + IM_ASSERT(table != NULL && table->IsLayoutLocked == false); + IM_ASSERT(column_n >= 0 && column_n < table->ColumnsCount); + ImGuiTableColumn* column_0 = &table->Columns[column_n]; + float column_0_width = width; + + // Apply constraints early + // Compare both requested and actual given width to avoid overwriting requested width when column is stuck (minimum size, bounded) + IM_ASSERT(table->MinColumnWidth > 0.0f); + const float min_width = table->MinColumnWidth; + const float max_width = ImMax(min_width, column_0->WidthMax); // Don't use TableCalcMaxColumnWidth() here as it would rely on MinX from last instance (#7933) + column_0_width = ImClamp(column_0_width, min_width, max_width); + if (column_0->WidthGiven == column_0_width || column_0->WidthRequest == column_0_width) + return; + + //IMGUI_DEBUG_PRINT("TableSetColumnWidth(%d, %.1f->%.1f)\n", column_0_idx, column_0->WidthGiven, column_0_width); + ImGuiTableColumn* column_1 = (column_0->NextEnabledColumn != -1) ? &table->Columns[column_0->NextEnabledColumn] : NULL; + + // In this surprisingly not simple because of how we support mixing Fixed and multiple Stretch columns. + // - All fixed: easy. + // - All stretch: easy. + // - One or more fixed + one stretch: easy. + // - One or more fixed + more than one stretch: tricky. + // Qt when manual resize is enabled only supports a single _trailing_ stretch column, we support more cases here. + + // When forwarding resize from Wn| to Fn+1| we need to be considerate of the _NoResize flag on Fn+1. + // FIXME-TABLE: Find a way to rewrite all of this so interactions feel more consistent for the user. + // Scenarios: + // - F1 F2 F3 resize from F1| or F2| --> ok: alter ->WidthRequested of Fixed column. Subsequent columns will be offset. + // - F1 F2 F3 resize from F3| --> ok: alter ->WidthRequested of Fixed column. If active, ScrollX extent can be altered. + // - F1 F2 W3 resize from F1| or F2| --> ok: alter ->WidthRequested of Fixed column. If active, ScrollX extent can be altered, but it doesn't make much sense as the Stretch column will always be minimal size. + // - F1 F2 W3 resize from W3| --> ok: no-op (disabled by Resize Rule 1) + // - W1 W2 W3 resize from W1| or W2| --> ok + // - W1 W2 W3 resize from W3| --> ok: no-op (disabled by Resize Rule 1) + // - W1 F2 F3 resize from F3| --> ok: no-op (disabled by Resize Rule 1) + // - W1 F2 resize from F2| --> ok: no-op (disabled by Resize Rule 1) + // - W1 W2 F3 resize from W1| or W2| --> ok + // - W1 F2 W3 resize from W1| or F2| --> ok + // - F1 W2 F3 resize from W2| --> ok + // - F1 W3 F2 resize from W3| --> ok + // - W1 F2 F3 resize from W1| --> ok: equivalent to resizing |F2. F3 will not move. + // - W1 F2 F3 resize from F2| --> ok + // All resizes from a Wx columns are locking other columns. + + // Possible improvements: + // - W1 W2 W3 resize W1| --> to not be stuck, both W2 and W3 would stretch down. Seems possible to fix. Would be most beneficial to simplify resize of all-weighted columns. + // - W3 F1 F2 resize W3| --> to not be stuck past F1|, both F1 and F2 would need to stretch down, which would be lossy or ambiguous. Seems hard to fix. + + // [Resize Rule 1] Can't resize from right of right-most visible column if there is any Stretch column. Implemented in TableUpdateLayout(). + + // If we have all Fixed columns OR resizing a Fixed column that doesn't come after a Stretch one, we can do an offsetting resize. + // This is the preferred resize path + if (column_0->Flags & ImGuiTableColumnFlags_WidthFixed) + if (!column_1 || table->LeftMostStretchedColumn == -1 || table->Columns[table->LeftMostStretchedColumn].DisplayOrder >= column_0->DisplayOrder) + { + column_0->WidthRequest = column_0_width; + table->IsSettingsDirty = true; + return; + } + + // We can also use previous column if there's no next one (this is used when doing an auto-fit on the right-most stretch column) + if (column_1 == NULL) + column_1 = (column_0->PrevEnabledColumn != -1) ? &table->Columns[column_0->PrevEnabledColumn] : NULL; + if (column_1 == NULL) + return; + + // Resizing from right-side of a Stretch column before a Fixed column forward sizing to left-side of fixed column. + // (old_a + old_b == new_a + new_b) --> (new_a == old_a + old_b - new_b) + float column_1_width = ImMax(column_1->WidthRequest - (column_0_width - column_0->WidthRequest), min_width); + column_0_width = column_0->WidthRequest + column_1->WidthRequest - column_1_width; + IM_ASSERT(column_0_width > 0.0f && column_1_width > 0.0f); + column_0->WidthRequest = column_0_width; + column_1->WidthRequest = column_1_width; + if ((column_0->Flags | column_1->Flags) & ImGuiTableColumnFlags_WidthStretch) + TableUpdateColumnsWeightFromWidth(table); + table->IsSettingsDirty = true; +} + +// Disable clipping then auto-fit, will take 2 frames +// (we don't take a shortcut for unclipped columns to reduce inconsistencies when e.g. resizing multiple columns) +void ImGui::TableSetColumnWidthAutoSingle(ImGuiTable* table, int column_n) +{ + // Single auto width uses auto-fit + ImGuiTableColumn* column = &table->Columns[column_n]; + if (!column->IsEnabled) + return; + column->CannotSkipItemsQueue = (1 << 0); + table->AutoFitSingleColumn = (ImGuiTableColumnIdx)column_n; +} + +void ImGui::TableSetColumnWidthAutoAll(ImGuiTable* table) +{ + for (int column_n = 0; column_n < table->ColumnsCount; column_n++) + { + ImGuiTableColumn* column = &table->Columns[column_n]; + if (!column->IsEnabled && !(column->Flags & ImGuiTableColumnFlags_WidthStretch)) // Cannot reset weight of hidden stretch column + continue; + column->CannotSkipItemsQueue = (1 << 0); + column->AutoFitQueue = (1 << 1); + } +} + +void ImGui::TableUpdateColumnsWeightFromWidth(ImGuiTable* table) +{ + IM_ASSERT(table->LeftMostStretchedColumn != -1 && table->RightMostStretchedColumn != -1); + + // Measure existing quantities + float visible_weight = 0.0f; + float visible_width = 0.0f; + for (int column_n = 0; column_n < table->ColumnsCount; column_n++) + { + ImGuiTableColumn* column = &table->Columns[column_n]; + if (!column->IsEnabled || !(column->Flags & ImGuiTableColumnFlags_WidthStretch)) + continue; + IM_ASSERT(column->StretchWeight > 0.0f); + visible_weight += column->StretchWeight; + visible_width += column->WidthRequest; + } + IM_ASSERT(visible_weight > 0.0f && visible_width > 0.0f); + + // Apply new weights + for (int column_n = 0; column_n < table->ColumnsCount; column_n++) + { + ImGuiTableColumn* column = &table->Columns[column_n]; + if (!column->IsEnabled || !(column->Flags & ImGuiTableColumnFlags_WidthStretch)) + continue; + column->StretchWeight = (column->WidthRequest / visible_width) * visible_weight; + IM_ASSERT(column->StretchWeight > 0.0f); + } +} + +//------------------------------------------------------------------------- +// [SECTION] Tables: Drawing +//------------------------------------------------------------------------- +// - TablePushBackgroundChannel() [Internal] +// - TablePopBackgroundChannel() [Internal] +// - TableSetupDrawChannels() [Internal] +// - TableMergeDrawChannels() [Internal] +// - TableGetColumnBorderCol() [Internal] +// - TableDrawBorders() [Internal] +//------------------------------------------------------------------------- + +// Bg2 is used by Selectable (and possibly other widgets) to render to the background. +// Unlike our Bg0/1 channel which we uses for RowBg/CellBg/Borders and where we guarantee all shapes to be CPU-clipped, the Bg2 channel being widgets-facing will rely on regular ClipRect. +void ImGui::TablePushBackgroundChannel() +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + ImGuiTable* table = g.CurrentTable; + + // Optimization: avoid SetCurrentChannel() + PushClipRect() + table->HostBackupInnerClipRect = window->ClipRect; + SetWindowClipRectBeforeSetChannel(window, table->Bg2ClipRectForDrawCmd); + table->DrawSplitter->SetCurrentChannel(window->DrawList, table->Bg2DrawChannelCurrent); +} + +void ImGui::TablePopBackgroundChannel() +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + ImGuiTable* table = g.CurrentTable; + ImGuiTableColumn* column = &table->Columns[table->CurrentColumn]; + + // Optimization: avoid PopClipRect() + SetCurrentChannel() + SetWindowClipRectBeforeSetChannel(window, table->HostBackupInnerClipRect); + table->DrawSplitter->SetCurrentChannel(window->DrawList, column->DrawChannelCurrent); +} + +// Allocate draw channels. Called by TableUpdateLayout() +// - We allocate them following storage order instead of display order so reordering columns won't needlessly +// increase overall dormant memory cost. +// - We isolate headers draw commands in their own channels instead of just altering clip rects. +// This is in order to facilitate merging of draw commands. +// - After crossing FreezeRowsCount, all columns see their current draw channel changed to a second set of channels. +// - We only use the dummy draw channel so we can push a null clipping rectangle into it without affecting other +// channels, while simplifying per-row/per-cell overhead. It will be empty and discarded when merged. +// - We allocate 1 or 2 background draw channels. This is because we know TablePushBackgroundChannel() is only used for +// horizontal spanning. If we allowed vertical spanning we'd need one background draw channel per merge group (1-4). +// Draw channel allocation (before merging): +// - NoClip --> 2+D+1 channels: bg0/1 + bg2 + foreground (same clip rect == always 1 draw call) +// - Clip --> 2+D+N channels +// - FreezeRows --> 2+D+N*2 (unless scrolling value is zero) +// - FreezeRows || FreezeColunns --> 3+D+N*2 (unless scrolling value is zero) +// Where D is 1 if any column is clipped or hidden (dummy channel) otherwise 0. +void ImGui::TableSetupDrawChannels(ImGuiTable* table) +{ + const int freeze_row_multiplier = (table->FreezeRowsCount > 0) ? 2 : 1; + const int channels_for_row = (table->Flags & ImGuiTableFlags_NoClip) ? 1 : table->ColumnsEnabledCount; + const int channels_for_bg = 1 + 1 * freeze_row_multiplier; + const int channels_for_dummy = (table->ColumnsEnabledCount < table->ColumnsCount || (memcmp(table->VisibleMaskByIndex, table->EnabledMaskByIndex, ImBitArrayGetStorageSizeInBytes(table->ColumnsCount)) != 0)) ? +1 : 0; + const int channels_total = channels_for_bg + (channels_for_row * freeze_row_multiplier) + channels_for_dummy; + table->DrawSplitter->Split(table->InnerWindow->DrawList, channels_total); + table->DummyDrawChannel = (ImGuiTableDrawChannelIdx)((channels_for_dummy > 0) ? channels_total - 1 : -1); + table->Bg2DrawChannelCurrent = TABLE_DRAW_CHANNEL_BG2_FROZEN; + table->Bg2DrawChannelUnfrozen = (ImGuiTableDrawChannelIdx)((table->FreezeRowsCount > 0) ? 2 + channels_for_row : TABLE_DRAW_CHANNEL_BG2_FROZEN); + + int draw_channel_current = 2; + for (int column_n = 0; column_n < table->ColumnsCount; column_n++) + { + ImGuiTableColumn* column = &table->Columns[column_n]; + if (column->IsVisibleX && column->IsVisibleY) + { + column->DrawChannelFrozen = (ImGuiTableDrawChannelIdx)(draw_channel_current); + column->DrawChannelUnfrozen = (ImGuiTableDrawChannelIdx)(draw_channel_current + (table->FreezeRowsCount > 0 ? channels_for_row + 1 : 0)); + if (!(table->Flags & ImGuiTableFlags_NoClip)) + draw_channel_current++; + } + else + { + column->DrawChannelFrozen = column->DrawChannelUnfrozen = table->DummyDrawChannel; + } + column->DrawChannelCurrent = column->DrawChannelFrozen; + } + + // Initial draw cmd starts with a BgClipRect that matches the one of its host, to facilitate merge draw commands by default. + // All our cell highlight are manually clipped with BgClipRect. When unfreezing it will be made smaller to fit scrolling rect. + // (This technically isn't part of setting up draw channels, but is reasonably related to be done here) + table->BgClipRect = table->InnerClipRect; + table->Bg0ClipRectForDrawCmd = table->OuterWindow->ClipRect; + table->Bg2ClipRectForDrawCmd = table->HostClipRect; + IM_ASSERT(table->BgClipRect.Min.y <= table->BgClipRect.Max.y); +} + +// This function reorder draw channels based on matching clip rectangle, to facilitate merging them. Called by EndTable(). +// For simplicity we call it TableMergeDrawChannels() but in fact it only reorder channels + overwrite ClipRect, +// actual merging is done by table->DrawSplitter.Merge() which is called right after TableMergeDrawChannels(). +// +// Columns where the contents didn't stray off their local clip rectangle can be merged. To achieve +// this we merge their clip rect and make them contiguous in the channel list, so they can be merged +// by the call to DrawSplitter.Merge() following to the call to this function. +// We reorder draw commands by arranging them into a maximum of 4 distinct groups: +// +// 1 group: 2 groups: 2 groups: 4 groups: +// [ 0. ] no freeze [ 0. ] row freeze [ 01 ] col freeze [ 01 ] row+col freeze +// [ .. ] or no scroll [ 2. ] and v-scroll [ .. ] and h-scroll [ 23 ] and v+h-scroll +// +// Each column itself can use 1 channel (row freeze disabled) or 2 channels (row freeze enabled). +// When the contents of a column didn't stray off its limit, we move its channels into the corresponding group +// based on its position (within frozen rows/columns groups or not). +// At the end of the operation our 1-4 groups will each have a ImDrawCmd using the same ClipRect. +// This function assume that each column are pointing to a distinct draw channel, +// otherwise merge_group->ChannelsCount will not match set bit count of merge_group->ChannelsMask. +// +// Column channels will not be merged into one of the 1-4 groups in the following cases: +// - The contents stray off its clipping rectangle (we only compare the MaxX value, not the MinX value). +// Direct ImDrawList calls won't be taken into account by default, if you use them make sure the ImGui:: bounds +// matches, by e.g. calling SetCursorScreenPos(). +// - The channel uses more than one draw command itself. We drop all our attempt at merging stuff here.. +// we could do better but it's going to be rare and probably not worth the hassle. +// Columns for which the draw channel(s) haven't been merged with other will use their own ImDrawCmd. +// +// This function is particularly tricky to understand.. take a breath. +void ImGui::TableMergeDrawChannels(ImGuiTable* table) +{ + ImGuiContext& g = *GImGui; + ImDrawListSplitter* splitter = table->DrawSplitter; + const bool has_freeze_v = (table->FreezeRowsCount > 0); + const bool has_freeze_h = (table->FreezeColumnsCount > 0); + IM_ASSERT(splitter->_Current == 0); + + // Track which groups we are going to attempt to merge, and which channels goes into each group. + struct MergeGroup + { + ImRect ClipRect; + int ChannelsCount = 0; + ImBitArrayPtr ChannelsMask = NULL; + }; + int merge_group_mask = 0x00; + MergeGroup merge_groups[4]; + + // Use a reusable temp buffer for the merge masks as they are dynamically sized. + const int max_draw_channels = (4 + table->ColumnsCount * 2); + const int size_for_masks_bitarrays_one = (int)ImBitArrayGetStorageSizeInBytes(max_draw_channels); + g.TempBuffer.reserve(size_for_masks_bitarrays_one * 5); + memset(g.TempBuffer.Data, 0, size_for_masks_bitarrays_one * 5); + for (int n = 0; n < IM_ARRAYSIZE(merge_groups); n++) + merge_groups[n].ChannelsMask = (ImBitArrayPtr)(void*)(g.TempBuffer.Data + (size_for_masks_bitarrays_one * n)); + ImBitArrayPtr remaining_mask = (ImBitArrayPtr)(void*)(g.TempBuffer.Data + (size_for_masks_bitarrays_one * 4)); + + // 1. Scan channels and take note of those which can be merged + for (int column_n = 0; column_n < table->ColumnsCount; column_n++) + { + if (!IM_BITARRAY_TESTBIT(table->VisibleMaskByIndex, column_n)) + continue; + ImGuiTableColumn* column = &table->Columns[column_n]; + + const int merge_group_sub_count = has_freeze_v ? 2 : 1; + for (int merge_group_sub_n = 0; merge_group_sub_n < merge_group_sub_count; merge_group_sub_n++) + { + const int channel_no = (merge_group_sub_n == 0) ? column->DrawChannelFrozen : column->DrawChannelUnfrozen; + + // Don't attempt to merge if there are multiple draw calls within the column + ImDrawChannel* src_channel = &splitter->_Channels[channel_no]; + if (src_channel->_CmdBuffer.Size > 0 && src_channel->_CmdBuffer.back().ElemCount == 0 && src_channel->_CmdBuffer.back().UserCallback == NULL) // Equivalent of PopUnusedDrawCmd() + src_channel->_CmdBuffer.pop_back(); + if (src_channel->_CmdBuffer.Size != 1) + continue; + + // Find out the width of this merge group and check if it will fit in our column + // (note that we assume that rendering didn't stray on the left direction. we should need a CursorMinPos to detect it) + if (!(column->Flags & ImGuiTableColumnFlags_NoClip)) + { + float content_max_x; + if (!has_freeze_v) + content_max_x = ImMax(column->ContentMaxXUnfrozen, column->ContentMaxXHeadersUsed); // No row freeze + else if (merge_group_sub_n == 0) + content_max_x = ImMax(column->ContentMaxXFrozen, column->ContentMaxXHeadersUsed); // Row freeze: use width before freeze + else + content_max_x = column->ContentMaxXUnfrozen; // Row freeze: use width after freeze + if (content_max_x > column->ClipRect.Max.x) + continue; + } + + const int merge_group_n = (has_freeze_h && column_n < table->FreezeColumnsCount ? 0 : 1) + (has_freeze_v && merge_group_sub_n == 0 ? 0 : 2); + IM_ASSERT(channel_no < max_draw_channels); + MergeGroup* merge_group = &merge_groups[merge_group_n]; + if (merge_group->ChannelsCount == 0) + merge_group->ClipRect = ImRect(+FLT_MAX, +FLT_MAX, -FLT_MAX, -FLT_MAX); + ImBitArraySetBit(merge_group->ChannelsMask, channel_no); + merge_group->ChannelsCount++; + merge_group->ClipRect.Add(src_channel->_CmdBuffer[0].ClipRect); + merge_group_mask |= (1 << merge_group_n); + } + + // Invalidate current draw channel + // (we don't clear DrawChannelFrozen/DrawChannelUnfrozen solely to facilitate debugging/later inspection of data) + column->DrawChannelCurrent = (ImGuiTableDrawChannelIdx)-1; + } + + // [DEBUG] Display merge groups +#if 0 + if (g.IO.KeyShift) + for (int merge_group_n = 0; merge_group_n < IM_ARRAYSIZE(merge_groups); merge_group_n++) + { + MergeGroup* merge_group = &merge_groups[merge_group_n]; + if (merge_group->ChannelsCount == 0) + continue; + char buf[32]; + ImFormatString(buf, 32, "MG%d:%d", merge_group_n, merge_group->ChannelsCount); + ImVec2 text_pos = merge_group->ClipRect.Min + ImVec2(4, 4); + ImVec2 text_size = CalcTextSize(buf, NULL); + GetForegroundDrawList()->AddRectFilled(text_pos, text_pos + text_size, IM_COL32(0, 0, 0, 255)); + GetForegroundDrawList()->AddText(text_pos, IM_COL32(255, 255, 0, 255), buf, NULL); + GetForegroundDrawList()->AddRect(merge_group->ClipRect.Min, merge_group->ClipRect.Max, IM_COL32(255, 255, 0, 255)); + } +#endif + + // 2. Rewrite channel list in our preferred order + if (merge_group_mask != 0) + { + // We skip channel 0 (Bg0/Bg1) and 1 (Bg2 frozen) from the shuffling since they won't move - see channels allocation in TableSetupDrawChannels(). + const int LEADING_DRAW_CHANNELS = 2; + g.DrawChannelsTempMergeBuffer.resize(splitter->_Count - LEADING_DRAW_CHANNELS); // Use shared temporary storage so the allocation gets amortized + ImDrawChannel* dst_tmp = g.DrawChannelsTempMergeBuffer.Data; + ImBitArraySetBitRange(remaining_mask, LEADING_DRAW_CHANNELS, splitter->_Count); + ImBitArrayClearBit(remaining_mask, table->Bg2DrawChannelUnfrozen); + IM_ASSERT(has_freeze_v == false || table->Bg2DrawChannelUnfrozen != TABLE_DRAW_CHANNEL_BG2_FROZEN); + int remaining_count = splitter->_Count - (has_freeze_v ? LEADING_DRAW_CHANNELS + 1 : LEADING_DRAW_CHANNELS); + //ImRect host_rect = (table->InnerWindow == table->OuterWindow) ? table->InnerClipRect : table->HostClipRect; + ImRect host_rect = table->HostClipRect; + for (int merge_group_n = 0; merge_group_n < IM_ARRAYSIZE(merge_groups); merge_group_n++) + { + if (int merge_channels_count = merge_groups[merge_group_n].ChannelsCount) + { + MergeGroup* merge_group = &merge_groups[merge_group_n]; + ImRect merge_clip_rect = merge_group->ClipRect; + + // Extend outer-most clip limits to match those of host, so draw calls can be merged even if + // outer-most columns have some outer padding offsetting them from their parent ClipRect. + // The principal cases this is dealing with are: + // - On a same-window table (not scrolling = single group), all fitting columns ClipRect -> will extend and match host ClipRect -> will merge + // - Columns can use padding and have left-most ClipRect.Min.x and right-most ClipRect.Max.x != from host ClipRect -> will extend and match host ClipRect -> will merge + // FIXME-TABLE FIXME-WORKRECT: We are wasting a merge opportunity on tables without scrolling if column doesn't fit + // within host clip rect, solely because of the half-padding difference between window->WorkRect and window->InnerClipRect. + if ((merge_group_n & 1) == 0 || !has_freeze_h) + merge_clip_rect.Min.x = ImMin(merge_clip_rect.Min.x, host_rect.Min.x); + if ((merge_group_n & 2) == 0 || !has_freeze_v) + merge_clip_rect.Min.y = ImMin(merge_clip_rect.Min.y, host_rect.Min.y); + if ((merge_group_n & 1) != 0) + merge_clip_rect.Max.x = ImMax(merge_clip_rect.Max.x, host_rect.Max.x); + if ((merge_group_n & 2) != 0 && (table->Flags & ImGuiTableFlags_NoHostExtendY) == 0) + merge_clip_rect.Max.y = ImMax(merge_clip_rect.Max.y, host_rect.Max.y); + //GetForegroundDrawList()->AddRect(merge_group->ClipRect.Min, merge_group->ClipRect.Max, IM_COL32(255, 0, 0, 200), 0.0f, 0, 1.0f); // [DEBUG] + //GetForegroundDrawList()->AddLine(merge_group->ClipRect.Min, merge_clip_rect.Min, IM_COL32(255, 100, 0, 200)); + //GetForegroundDrawList()->AddLine(merge_group->ClipRect.Max, merge_clip_rect.Max, IM_COL32(255, 100, 0, 200)); + remaining_count -= merge_group->ChannelsCount; + for (int n = 0; n < (size_for_masks_bitarrays_one >> 2); n++) + remaining_mask[n] &= ~merge_group->ChannelsMask[n]; + for (int n = 0; n < splitter->_Count && merge_channels_count != 0; n++) + { + // Copy + overwrite new clip rect + if (!IM_BITARRAY_TESTBIT(merge_group->ChannelsMask, n)) + continue; + IM_BITARRAY_CLEARBIT(merge_group->ChannelsMask, n); + merge_channels_count--; + + ImDrawChannel* channel = &splitter->_Channels[n]; + IM_ASSERT(channel->_CmdBuffer.Size == 1 && merge_clip_rect.Contains(ImRect(channel->_CmdBuffer[0].ClipRect))); + channel->_CmdBuffer[0].ClipRect = merge_clip_rect.ToVec4(); + memcpy(dst_tmp++, channel, sizeof(ImDrawChannel)); + } + } + + // Make sure Bg2DrawChannelUnfrozen appears in the middle of our groups (whereas Bg0/Bg1 and Bg2 frozen are fixed to 0 and 1) + if (merge_group_n == 1 && has_freeze_v) + memcpy(dst_tmp++, &splitter->_Channels[table->Bg2DrawChannelUnfrozen], sizeof(ImDrawChannel)); + } + + // Append unmergeable channels that we didn't reorder at the end of the list + for (int n = 0; n < splitter->_Count && remaining_count != 0; n++) + { + if (!IM_BITARRAY_TESTBIT(remaining_mask, n)) + continue; + ImDrawChannel* channel = &splitter->_Channels[n]; + memcpy(dst_tmp++, channel, sizeof(ImDrawChannel)); + remaining_count--; + } + IM_ASSERT(dst_tmp == g.DrawChannelsTempMergeBuffer.Data + g.DrawChannelsTempMergeBuffer.Size); + memcpy(splitter->_Channels.Data + LEADING_DRAW_CHANNELS, g.DrawChannelsTempMergeBuffer.Data, (splitter->_Count - LEADING_DRAW_CHANNELS) * sizeof(ImDrawChannel)); + } +} + +static ImU32 TableGetColumnBorderCol(ImGuiTable* table, int order_n, int column_n) +{ + const bool is_hovered = (table->HoveredColumnBorder == column_n); + const bool is_resized = (table->ResizedColumn == column_n) && (table->InstanceInteracted == table->InstanceCurrent); + const bool is_frozen_separator = (table->FreezeColumnsCount == order_n + 1); + if (is_resized || is_hovered) + return ImGui::GetColorU32(is_resized ? ImGuiCol_SeparatorActive : ImGuiCol_SeparatorHovered); + if (is_frozen_separator || (table->Flags & (ImGuiTableFlags_NoBordersInBody | ImGuiTableFlags_NoBordersInBodyUntilResize))) + return table->BorderColorStrong; + return table->BorderColorLight; +} + +// FIXME-TABLE: This is a mess, need to redesign how we render borders (as some are also done in TableEndRow) +void ImGui::TableDrawBorders(ImGuiTable* table) +{ + ImGuiWindow* inner_window = table->InnerWindow; + if (!table->OuterWindow->ClipRect.Overlaps(table->OuterRect)) + return; + + ImDrawList* inner_drawlist = inner_window->DrawList; + table->DrawSplitter->SetCurrentChannel(inner_drawlist, TABLE_DRAW_CHANNEL_BG0); + inner_drawlist->PushClipRect(table->Bg0ClipRectForDrawCmd.Min, table->Bg0ClipRectForDrawCmd.Max, false); + + // Draw inner border and resizing feedback + ImGuiTableInstanceData* table_instance = TableGetInstanceData(table, table->InstanceCurrent); + const float border_size = TABLE_BORDER_SIZE; + const float draw_y1 = ImMax(table->InnerRect.Min.y, (table->FreezeRowsCount >= 1 ? table->InnerRect.Min.y : table->WorkRect.Min.y) + table->AngledHeadersHeight) + ((table->Flags & ImGuiTableFlags_BordersOuterH) ? 1.0f : 0.0f); + const float draw_y2_body = table->InnerRect.Max.y; + const float draw_y2_head = table->IsUsingHeaders ? ImMin(table->InnerRect.Max.y, (table->FreezeRowsCount >= 1 ? table->InnerRect.Min.y : table->WorkRect.Min.y) + table_instance->LastTopHeadersRowHeight) : draw_y1; + if (table->Flags & ImGuiTableFlags_BordersInnerV) + { + for (int order_n = 0; order_n < table->ColumnsCount; order_n++) + { + if (!IM_BITARRAY_TESTBIT(table->EnabledMaskByDisplayOrder, order_n)) + continue; + + const int column_n = table->DisplayOrderToIndex[order_n]; + ImGuiTableColumn* column = &table->Columns[column_n]; + const bool is_hovered = (table->HoveredColumnBorder == column_n); + const bool is_resized = (table->ResizedColumn == column_n) && (table->InstanceInteracted == table->InstanceCurrent); + const bool is_resizable = (column->Flags & (ImGuiTableColumnFlags_NoResize | ImGuiTableColumnFlags_NoDirectResize_)) == 0; + const bool is_frozen_separator = (table->FreezeColumnsCount == order_n + 1); + if (column->MaxX > table->InnerClipRect.Max.x && !is_resized) + continue; + + // Decide whether right-most column is visible + if (column->NextEnabledColumn == -1 && !is_resizable) + if ((table->Flags & ImGuiTableFlags_SizingMask_) != ImGuiTableFlags_SizingFixedSame || (table->Flags & ImGuiTableFlags_NoHostExtendX)) + continue; + if (column->MaxX <= column->ClipRect.Min.x) // FIXME-TABLE FIXME-STYLE: Assume BorderSize==1, this is problematic if we want to increase the border size.. + continue; + + // Draw in outer window so right-most column won't be clipped + // Always draw full height border when being resized/hovered, or on the delimitation of frozen column scrolling. + float draw_y2 = (is_hovered || is_resized || is_frozen_separator || (table->Flags & (ImGuiTableFlags_NoBordersInBody | ImGuiTableFlags_NoBordersInBodyUntilResize)) == 0) ? draw_y2_body : draw_y2_head; + if (draw_y2 > draw_y1) + inner_drawlist->AddLine(ImVec2(column->MaxX, draw_y1), ImVec2(column->MaxX, draw_y2), TableGetColumnBorderCol(table, order_n, column_n), border_size); + } + } + + // Draw outer border + // FIXME: could use AddRect or explicit VLine/HLine helper? + if (table->Flags & ImGuiTableFlags_BordersOuter) + { + // Display outer border offset by 1 which is a simple way to display it without adding an extra draw call + // (Without the offset, in outer_window it would be rendered behind cells, because child windows are above their + // parent. In inner_window, it won't reach out over scrollbars. Another weird solution would be to display part + // of it in inner window, and the part that's over scrollbars in the outer window..) + // Either solution currently won't allow us to use a larger border size: the border would clipped. + const ImRect outer_border = table->OuterRect; + const ImU32 outer_col = table->BorderColorStrong; + if ((table->Flags & ImGuiTableFlags_BordersOuter) == ImGuiTableFlags_BordersOuter) + { + inner_drawlist->AddRect(outer_border.Min, outer_border.Max, outer_col, 0.0f, 0, border_size); + } + else if (table->Flags & ImGuiTableFlags_BordersOuterV) + { + inner_drawlist->AddLine(outer_border.Min, ImVec2(outer_border.Min.x, outer_border.Max.y), outer_col, border_size); + inner_drawlist->AddLine(ImVec2(outer_border.Max.x, outer_border.Min.y), outer_border.Max, outer_col, border_size); + } + else if (table->Flags & ImGuiTableFlags_BordersOuterH) + { + inner_drawlist->AddLine(outer_border.Min, ImVec2(outer_border.Max.x, outer_border.Min.y), outer_col, border_size); + inner_drawlist->AddLine(ImVec2(outer_border.Min.x, outer_border.Max.y), outer_border.Max, outer_col, border_size); + } + } + if ((table->Flags & ImGuiTableFlags_BordersInnerH) && table->RowPosY2 < table->OuterRect.Max.y) + { + // Draw bottom-most row border between it is above outer border. + const float border_y = table->RowPosY2; + if (border_y >= table->BgClipRect.Min.y && border_y < table->BgClipRect.Max.y) + inner_drawlist->AddLine(ImVec2(table->BorderX1, border_y), ImVec2(table->BorderX2, border_y), table->BorderColorLight, border_size); + } + + inner_drawlist->PopClipRect(); +} + +//------------------------------------------------------------------------- +// [SECTION] Tables: Sorting +//------------------------------------------------------------------------- +// - TableGetSortSpecs() +// - TableFixColumnSortDirection() [Internal] +// - TableGetColumnNextSortDirection() [Internal] +// - TableSetColumnSortDirection() [Internal] +// - TableSortSpecsSanitize() [Internal] +// - TableSortSpecsBuild() [Internal] +//------------------------------------------------------------------------- + +// Return NULL if no sort specs (most often when ImGuiTableFlags_Sortable is not set) +// When 'sort_specs->SpecsDirty == true' you should sort your data. It will be true when sorting specs have +// changed since last call, or the first time. Make sure to set 'SpecsDirty = false' after sorting, +// else you may wastefully sort your data every frame! +// Lifetime: don't hold on this pointer over multiple frames or past any subsequent call to BeginTable()! +ImGuiTableSortSpecs* ImGui::TableGetSortSpecs() +{ + ImGuiContext& g = *GImGui; + ImGuiTable* table = g.CurrentTable; + IM_ASSERT(table != NULL); + + if (!(table->Flags & ImGuiTableFlags_Sortable)) + return NULL; + + // Require layout (in case TableHeadersRow() hasn't been called) as it may alter IsSortSpecsDirty in some paths. + if (!table->IsLayoutLocked) + TableUpdateLayout(table); + + TableSortSpecsBuild(table); + return &table->SortSpecs; +} + +static inline ImGuiSortDirection TableGetColumnAvailSortDirection(ImGuiTableColumn* column, int n) +{ + IM_ASSERT(n < column->SortDirectionsAvailCount); + return (ImGuiSortDirection)((column->SortDirectionsAvailList >> (n << 1)) & 0x03); +} + +// Fix sort direction if currently set on a value which is unavailable (e.g. activating NoSortAscending/NoSortDescending) +void ImGui::TableFixColumnSortDirection(ImGuiTable* table, ImGuiTableColumn* column) +{ + if (column->SortOrder == -1 || (column->SortDirectionsAvailMask & (1 << column->SortDirection)) != 0) + return; + column->SortDirection = (ImU8)TableGetColumnAvailSortDirection(column, 0); + table->IsSortSpecsDirty = true; +} + +// Calculate next sort direction that would be set after clicking the column +// - If the PreferSortDescending flag is set, we will default to a Descending direction on the first click. +// - Note that the PreferSortAscending flag is never checked, it is essentially the default and therefore a no-op. +IM_STATIC_ASSERT(ImGuiSortDirection_None == 0 && ImGuiSortDirection_Ascending == 1 && ImGuiSortDirection_Descending == 2); +ImGuiSortDirection ImGui::TableGetColumnNextSortDirection(ImGuiTableColumn* column) +{ + IM_ASSERT(column->SortDirectionsAvailCount > 0); + if (column->SortOrder == -1) + return TableGetColumnAvailSortDirection(column, 0); + for (int n = 0; n < 3; n++) + if (column->SortDirection == TableGetColumnAvailSortDirection(column, n)) + return TableGetColumnAvailSortDirection(column, (n + 1) % column->SortDirectionsAvailCount); + IM_ASSERT(0); + return ImGuiSortDirection_None; +} + +// Note that the NoSortAscending/NoSortDescending flags are processed in TableSortSpecsSanitize(), and they may change/revert +// the value of SortDirection. We could technically also do it here but it would be unnecessary and duplicate code. +void ImGui::TableSetColumnSortDirection(int column_n, ImGuiSortDirection sort_direction, bool append_to_sort_specs) +{ + ImGuiContext& g = *GImGui; + ImGuiTable* table = g.CurrentTable; + + if (!(table->Flags & ImGuiTableFlags_SortMulti)) + append_to_sort_specs = false; + if (!(table->Flags & ImGuiTableFlags_SortTristate)) + IM_ASSERT(sort_direction != ImGuiSortDirection_None); + + ImGuiTableColumnIdx sort_order_max = 0; + if (append_to_sort_specs) + for (int other_column_n = 0; other_column_n < table->ColumnsCount; other_column_n++) + sort_order_max = ImMax(sort_order_max, table->Columns[other_column_n].SortOrder); + + ImGuiTableColumn* column = &table->Columns[column_n]; + column->SortDirection = (ImU8)sort_direction; + if (column->SortDirection == ImGuiSortDirection_None) + column->SortOrder = -1; + else if (column->SortOrder == -1 || !append_to_sort_specs) + column->SortOrder = append_to_sort_specs ? sort_order_max + 1 : 0; + + for (int other_column_n = 0; other_column_n < table->ColumnsCount; other_column_n++) + { + ImGuiTableColumn* other_column = &table->Columns[other_column_n]; + if (other_column != column && !append_to_sort_specs) + other_column->SortOrder = -1; + TableFixColumnSortDirection(table, other_column); + } + table->IsSettingsDirty = true; + table->IsSortSpecsDirty = true; +} + +void ImGui::TableSortSpecsSanitize(ImGuiTable* table) +{ + IM_ASSERT(table->Flags & ImGuiTableFlags_Sortable); + + // Clear SortOrder from hidden column and verify that there's no gap or duplicate. + int sort_order_count = 0; + ImU64 sort_order_mask = 0x00; + for (int column_n = 0; column_n < table->ColumnsCount; column_n++) + { + ImGuiTableColumn* column = &table->Columns[column_n]; + if (column->SortOrder != -1 && !column->IsEnabled) + column->SortOrder = -1; + if (column->SortOrder == -1) + continue; + sort_order_count++; + sort_order_mask |= ((ImU64)1 << column->SortOrder); + IM_ASSERT(sort_order_count < (int)sizeof(sort_order_mask) * 8); + } + + const bool need_fix_linearize = ((ImU64)1 << sort_order_count) != (sort_order_mask + 1); + const bool need_fix_single_sort_order = (sort_order_count > 1) && !(table->Flags & ImGuiTableFlags_SortMulti); + if (need_fix_linearize || need_fix_single_sort_order) + { + ImU64 fixed_mask = 0x00; + for (int sort_n = 0; sort_n < sort_order_count; sort_n++) + { + // Fix: Rewrite sort order fields if needed so they have no gap or duplicate. + // (e.g. SortOrder 0 disappeared, SortOrder 1..2 exists --> rewrite then as SortOrder 0..1) + int column_with_smallest_sort_order = -1; + for (int column_n = 0; column_n < table->ColumnsCount; column_n++) + if ((fixed_mask & ((ImU64)1 << (ImU64)column_n)) == 0 && table->Columns[column_n].SortOrder != -1) + if (column_with_smallest_sort_order == -1 || table->Columns[column_n].SortOrder < table->Columns[column_with_smallest_sort_order].SortOrder) + column_with_smallest_sort_order = column_n; + IM_ASSERT(column_with_smallest_sort_order != -1); + fixed_mask |= ((ImU64)1 << column_with_smallest_sort_order); + table->Columns[column_with_smallest_sort_order].SortOrder = (ImGuiTableColumnIdx)sort_n; + + // Fix: Make sure only one column has a SortOrder if ImGuiTableFlags_MultiSortable is not set. + if (need_fix_single_sort_order) + { + sort_order_count = 1; + for (int column_n = 0; column_n < table->ColumnsCount; column_n++) + if (column_n != column_with_smallest_sort_order) + table->Columns[column_n].SortOrder = -1; + break; + } + } + } + + // Fallback default sort order (if no column with the ImGuiTableColumnFlags_DefaultSort flag) + if (sort_order_count == 0 && !(table->Flags & ImGuiTableFlags_SortTristate)) + for (int column_n = 0; column_n < table->ColumnsCount; column_n++) + { + ImGuiTableColumn* column = &table->Columns[column_n]; + if (column->IsEnabled && !(column->Flags & ImGuiTableColumnFlags_NoSort)) + { + sort_order_count = 1; + column->SortOrder = 0; + column->SortDirection = (ImU8)TableGetColumnAvailSortDirection(column, 0); + break; + } + } + + table->SortSpecsCount = (ImGuiTableColumnIdx)sort_order_count; +} + +void ImGui::TableSortSpecsBuild(ImGuiTable* table) +{ + bool dirty = table->IsSortSpecsDirty; + if (dirty) + { + TableSortSpecsSanitize(table); + table->SortSpecsMulti.resize(table->SortSpecsCount <= 1 ? 0 : table->SortSpecsCount); + table->SortSpecs.SpecsDirty = true; // Mark as dirty for user + table->IsSortSpecsDirty = false; // Mark as not dirty for us + } + + // Write output + // May be able to move all SortSpecs data from table (48 bytes) to ImGuiTableTempData if we decide to write it back on every BeginTable() + ImGuiTableColumnSortSpecs* sort_specs = (table->SortSpecsCount == 0) ? NULL : (table->SortSpecsCount == 1) ? &table->SortSpecsSingle : table->SortSpecsMulti.Data; + if (dirty && sort_specs != NULL) + for (int column_n = 0; column_n < table->ColumnsCount; column_n++) + { + ImGuiTableColumn* column = &table->Columns[column_n]; + if (column->SortOrder == -1) + continue; + IM_ASSERT(column->SortOrder < table->SortSpecsCount); + ImGuiTableColumnSortSpecs* sort_spec = &sort_specs[column->SortOrder]; + sort_spec->ColumnUserID = column->UserID; + sort_spec->ColumnIndex = (ImGuiTableColumnIdx)column_n; + sort_spec->SortOrder = (ImGuiTableColumnIdx)column->SortOrder; + sort_spec->SortDirection = (ImGuiSortDirection)column->SortDirection; + } + + table->SortSpecs.Specs = sort_specs; + table->SortSpecs.SpecsCount = table->SortSpecsCount; +} + +//------------------------------------------------------------------------- +// [SECTION] Tables: Headers +//------------------------------------------------------------------------- +// - TableGetHeaderRowHeight() [Internal] +// - TableGetHeaderAngledMaxLabelWidth() [Internal] +// - TableHeadersRow() +// - TableHeader() +// - TableAngledHeadersRow() +// - TableAngledHeadersRowEx() [Internal] +//------------------------------------------------------------------------- + +float ImGui::TableGetHeaderRowHeight() +{ + // Caring for a minor edge case: + // Calculate row height, for the unlikely case that some labels may be taller than others. + // If we didn't do that, uneven header height would highlight but smaller one before the tallest wouldn't catch input for all height. + // In your custom header row you may omit this all together and just call TableNextRow() without a height... + ImGuiContext& g = *GImGui; + ImGuiTable* table = g.CurrentTable; + float row_height = g.FontSize; + for (int column_n = 0; column_n < table->ColumnsCount; column_n++) + if (IM_BITARRAY_TESTBIT(table->EnabledMaskByIndex, column_n)) + if ((table->Columns[column_n].Flags & ImGuiTableColumnFlags_NoHeaderLabel) == 0) + row_height = ImMax(row_height, CalcTextSize(TableGetColumnName(table, column_n)).y); + return row_height + g.Style.CellPadding.y * 2.0f; +} + +float ImGui::TableGetHeaderAngledMaxLabelWidth() +{ + ImGuiContext& g = *GImGui; + ImGuiTable* table = g.CurrentTable; + float width = 0.0f; + for (int column_n = 0; column_n < table->ColumnsCount; column_n++) + if (IM_BITARRAY_TESTBIT(table->EnabledMaskByIndex, column_n)) + if (table->Columns[column_n].Flags & ImGuiTableColumnFlags_AngledHeader) + width = ImMax(width, CalcTextSize(TableGetColumnName(table, column_n), NULL, true).x); + return width + g.Style.CellPadding.y * 2.0f; // Swap padding +} + +// [Public] This is a helper to output TableHeader() calls based on the column names declared in TableSetupColumn(). +// The intent is that advanced users willing to create customized headers would not need to use this helper +// and can create their own! For example: TableHeader() may be preceded by Checkbox() or other custom widgets. +// See 'Demo->Tables->Custom headers' for a demonstration of implementing a custom version of this. +// This code is intentionally written to not make much use of internal functions, to give you better direction +// if you need to write your own. +// FIXME-TABLE: TableOpenContextMenu() and TableGetHeaderRowHeight() are not public. +void ImGui::TableHeadersRow() +{ + ImGuiContext& g = *GImGui; + ImGuiTable* table = g.CurrentTable; + if (table == NULL) + { + IM_ASSERT_USER_ERROR(table != NULL, "Call should only be done while in BeginTable() scope!"); + return; + } + + // Call layout if not already done. This is automatically done by TableNextRow: we do it here _only_ to make + // it easier to debug-step in TableUpdateLayout(). Your own version of this function doesn't need this. + if (!table->IsLayoutLocked) + TableUpdateLayout(table); + + // Open row + const float row_height = TableGetHeaderRowHeight(); + TableNextRow(ImGuiTableRowFlags_Headers, row_height); + const float row_y1 = GetCursorScreenPos().y; + if (table->HostSkipItems) // Merely an optimization, you may skip in your own code. + return; + + const int columns_count = TableGetColumnCount(); + for (int column_n = 0; column_n < columns_count; column_n++) + { + if (!TableSetColumnIndex(column_n)) + continue; + + // Push an id to allow empty/unnamed headers. This is also idiomatic as it ensure there is a consistent ID path to access columns (for e.g. automation) + const char* name = (TableGetColumnFlags(column_n) & ImGuiTableColumnFlags_NoHeaderLabel) ? "" : TableGetColumnName(column_n); + PushID(column_n); + TableHeader(name); + PopID(); + } + + // Allow opening popup from the right-most section after the last column. + ImVec2 mouse_pos = ImGui::GetMousePos(); + if (IsMouseReleased(1) && TableGetHoveredColumn() == columns_count) + if (mouse_pos.y >= row_y1 && mouse_pos.y < row_y1 + row_height) + TableOpenContextMenu(columns_count); // Will open a non-column-specific popup. +} + +// Emit a column header (text + optional sort order) +// We cpu-clip text here so that all columns headers can be merged into a same draw call. +// Note that because of how we cpu-clip and display sorting indicators, you _cannot_ use SameLine() after a TableHeader() +void ImGui::TableHeader(const char* label) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + if (window->SkipItems) + return; + + ImGuiTable* table = g.CurrentTable; + if (table == NULL) + { + IM_ASSERT_USER_ERROR(table != NULL, "Call should only be done while in BeginTable() scope!"); + return; + } + + IM_ASSERT(table->CurrentColumn != -1); + const int column_n = table->CurrentColumn; + ImGuiTableColumn* column = &table->Columns[column_n]; + + // Label + if (label == NULL) + label = ""; + const char* label_end = FindRenderedTextEnd(label); + ImVec2 label_size = CalcTextSize(label, label_end, true); + ImVec2 label_pos = window->DC.CursorPos; + + // If we already got a row height, there's use that. + // FIXME-TABLE: Padding problem if the correct outer-padding CellBgRect strays off our ClipRect? + ImRect cell_r = TableGetCellBgRect(table, column_n); + float label_height = ImMax(label_size.y, table->RowMinHeight - table->RowCellPaddingY * 2.0f); + + // Calculate ideal size for sort order arrow + float w_arrow = 0.0f; + float w_sort_text = 0.0f; + bool sort_arrow = false; + char sort_order_suf[4] = ""; + const float ARROW_SCALE = 0.65f; + if ((table->Flags & ImGuiTableFlags_Sortable) && !(column->Flags & ImGuiTableColumnFlags_NoSort)) + { + w_arrow = ImTrunc(g.FontSize * ARROW_SCALE + g.Style.FramePadding.x); + if (column->SortOrder != -1) + sort_arrow = true; + if (column->SortOrder > 0) + { + ImFormatString(sort_order_suf, IM_ARRAYSIZE(sort_order_suf), "%d", column->SortOrder + 1); + w_sort_text = g.Style.ItemInnerSpacing.x + CalcTextSize(sort_order_suf).x; + } + } + + // We feed our unclipped width to the column without writing on CursorMaxPos, so that column is still considered for merging. + float max_pos_x = label_pos.x + label_size.x + w_sort_text + w_arrow; + column->ContentMaxXHeadersUsed = ImMax(column->ContentMaxXHeadersUsed, sort_arrow ? cell_r.Max.x : ImMin(max_pos_x, cell_r.Max.x)); + column->ContentMaxXHeadersIdeal = ImMax(column->ContentMaxXHeadersIdeal, max_pos_x); + + // Keep header highlighted when context menu is open. + ImGuiID id = window->GetID(label); + ImRect bb(cell_r.Min.x, cell_r.Min.y, cell_r.Max.x, ImMax(cell_r.Max.y, cell_r.Min.y + label_height + g.Style.CellPadding.y * 2.0f)); + ItemSize(ImVec2(0.0f, label_height)); // Don't declare unclipped width, it'll be fed ContentMaxPosHeadersIdeal + if (!ItemAdd(bb, id)) + return; + + //GetForegroundDrawList()->AddRect(cell_r.Min, cell_r.Max, IM_COL32(255, 0, 0, 255)); // [DEBUG] + //GetForegroundDrawList()->AddRect(bb.Min, bb.Max, IM_COL32(255, 0, 0, 255)); // [DEBUG] + + // Using AllowOverlap mode because we cover the whole cell, and we want user to be able to submit subsequent items. + const bool highlight = (table->HighlightColumnHeader == column_n); + bool hovered, held; + bool pressed = ButtonBehavior(bb, id, &hovered, &held, ImGuiButtonFlags_AllowOverlap); + if (held || hovered || highlight) + { + const ImU32 col = GetColorU32(held ? ImGuiCol_HeaderActive : hovered ? ImGuiCol_HeaderHovered : ImGuiCol_Header); + //RenderFrame(bb.Min, bb.Max, col, false, 0.0f); + TableSetBgColor(ImGuiTableBgTarget_CellBg, col, table->CurrentColumn); + } + else + { + // Submit single cell bg color in the case we didn't submit a full header row + if ((table->RowFlags & ImGuiTableRowFlags_Headers) == 0) + TableSetBgColor(ImGuiTableBgTarget_CellBg, GetColorU32(ImGuiCol_TableHeaderBg), table->CurrentColumn); + } + RenderNavCursor(bb, id, ImGuiNavRenderCursorFlags_Compact | ImGuiNavRenderCursorFlags_NoRounding); + if (held) + table->HeldHeaderColumn = (ImGuiTableColumnIdx)column_n; + window->DC.CursorPos.y -= g.Style.ItemSpacing.y * 0.5f; + + // Drag and drop to re-order columns. + // FIXME-TABLE: Scroll request while reordering a column and it lands out of the scrolling zone. + if (held && (table->Flags & ImGuiTableFlags_Reorderable) && IsMouseDragging(0) && !g.DragDropActive) + { + // While moving a column it will jump on the other side of the mouse, so we also test for MouseDelta.x + table->ReorderColumn = (ImGuiTableColumnIdx)column_n; + table->InstanceInteracted = table->InstanceCurrent; + + // We don't reorder: through the frozen<>unfrozen line, or through a column that is marked with ImGuiTableColumnFlags_NoReorder. + if (g.IO.MouseDelta.x < 0.0f && g.IO.MousePos.x < cell_r.Min.x) + if (ImGuiTableColumn* prev_column = (column->PrevEnabledColumn != -1) ? &table->Columns[column->PrevEnabledColumn] : NULL) + if (!((column->Flags | prev_column->Flags) & ImGuiTableColumnFlags_NoReorder)) + if ((column->IndexWithinEnabledSet < table->FreezeColumnsRequest) == (prev_column->IndexWithinEnabledSet < table->FreezeColumnsRequest)) + table->ReorderColumnDir = -1; + if (g.IO.MouseDelta.x > 0.0f && g.IO.MousePos.x > cell_r.Max.x) + if (ImGuiTableColumn* next_column = (column->NextEnabledColumn != -1) ? &table->Columns[column->NextEnabledColumn] : NULL) + if (!((column->Flags | next_column->Flags) & ImGuiTableColumnFlags_NoReorder)) + if ((column->IndexWithinEnabledSet < table->FreezeColumnsRequest) == (next_column->IndexWithinEnabledSet < table->FreezeColumnsRequest)) + table->ReorderColumnDir = +1; + } + + // Sort order arrow + const float ellipsis_max = ImMax(cell_r.Max.x - w_arrow - w_sort_text, label_pos.x); + if ((table->Flags & ImGuiTableFlags_Sortable) && !(column->Flags & ImGuiTableColumnFlags_NoSort)) + { + if (column->SortOrder != -1) + { + float x = ImMax(cell_r.Min.x, cell_r.Max.x - w_arrow - w_sort_text); + float y = label_pos.y; + if (column->SortOrder > 0) + { + PushStyleColor(ImGuiCol_Text, GetColorU32(ImGuiCol_Text, 0.70f)); + RenderText(ImVec2(x + g.Style.ItemInnerSpacing.x, y), sort_order_suf); + PopStyleColor(); + x += w_sort_text; + } + RenderArrow(window->DrawList, ImVec2(x, y), GetColorU32(ImGuiCol_Text), column->SortDirection == ImGuiSortDirection_Ascending ? ImGuiDir_Up : ImGuiDir_Down, ARROW_SCALE); + } + + // Handle clicking on column header to adjust Sort Order + if (pressed && table->ReorderColumn != column_n) + { + ImGuiSortDirection sort_direction = TableGetColumnNextSortDirection(column); + TableSetColumnSortDirection(column_n, sort_direction, g.IO.KeyShift); + } + } + + // Render clipped label. Clipping here ensure that in the majority of situations, all our header cells will + // be merged into a single draw call. + //window->DrawList->AddCircleFilled(ImVec2(ellipsis_max, label_pos.y), 40, IM_COL32_WHITE); + RenderTextEllipsis(window->DrawList, label_pos, ImVec2(ellipsis_max, label_pos.y + label_height + g.Style.FramePadding.y), ellipsis_max, ellipsis_max, label, label_end, &label_size); + + const bool text_clipped = label_size.x > (ellipsis_max - label_pos.x); + if (text_clipped && hovered && g.ActiveId == 0) + SetItemTooltip("%.*s", (int)(label_end - label), label); + + // We don't use BeginPopupContextItem() because we want the popup to stay up even after the column is hidden + if (IsMouseReleased(1) && IsItemHovered()) + TableOpenContextMenu(column_n); +} + +// Unlike TableHeadersRow() it is not expected that you can reimplement or customize this with custom widgets. +// FIXME: No hit-testing/button on the angled header. +void ImGui::TableAngledHeadersRow() +{ + ImGuiContext& g = *GImGui; + ImGuiTable* table = g.CurrentTable; + ImGuiTableTempData* temp_data = table->TempData; + temp_data->AngledHeadersRequests.resize(0); + temp_data->AngledHeadersRequests.reserve(table->ColumnsEnabledCount); + + // Which column needs highlight? + const ImGuiID row_id = GetID("##AngledHeaders"); + ImGuiTableInstanceData* table_instance = TableGetInstanceData(table, table->InstanceCurrent); + int highlight_column_n = table->HighlightColumnHeader; + if (highlight_column_n == -1 && table->HoveredColumnBody != -1) + if (table_instance->HoveredRowLast == 0 && table->HoveredColumnBorder == -1 && (g.ActiveId == 0 || g.ActiveId == row_id || (table->IsActiveIdInTable || g.DragDropActive))) + highlight_column_n = table->HoveredColumnBody; + + // Build up request + ImU32 col_header_bg = GetColorU32(ImGuiCol_TableHeaderBg); + ImU32 col_text = GetColorU32(ImGuiCol_Text); + for (int order_n = 0; order_n < table->ColumnsCount; order_n++) + if (IM_BITARRAY_TESTBIT(table->EnabledMaskByDisplayOrder, order_n)) + { + const int column_n = table->DisplayOrderToIndex[order_n]; + ImGuiTableColumn* column = &table->Columns[column_n]; + if ((column->Flags & ImGuiTableColumnFlags_AngledHeader) == 0) // Note: can't rely on ImGuiTableColumnFlags_IsVisible test here. + continue; + ImGuiTableHeaderData request = { (ImGuiTableColumnIdx)column_n, col_text, col_header_bg, (column_n == highlight_column_n) ? GetColorU32(ImGuiCol_Header) : 0 }; + temp_data->AngledHeadersRequests.push_back(request); + } + + // Render row + TableAngledHeadersRowEx(row_id, g.Style.TableAngledHeadersAngle, 0.0f, temp_data->AngledHeadersRequests.Data, temp_data->AngledHeadersRequests.Size); +} + +// Important: data must be fed left to right +void ImGui::TableAngledHeadersRowEx(ImGuiID row_id, float angle, float max_label_width, const ImGuiTableHeaderData* data, int data_count) +{ + ImGuiContext& g = *GImGui; + ImGuiTable* table = g.CurrentTable; + ImGuiWindow* window = g.CurrentWindow; + ImDrawList* draw_list = window->DrawList; + if (table == NULL) + { + IM_ASSERT_USER_ERROR(table != NULL, "Call should only be done while in BeginTable() scope!"); + return; + } + IM_ASSERT(table->CurrentRow == -1 && "Must be first row"); + + if (max_label_width == 0.0f) + max_label_width = TableGetHeaderAngledMaxLabelWidth(); + + // Angle argument expressed in (-IM_PI/2 .. +IM_PI/2) as it is easier to think about for user. + const bool flip_label = (angle < 0.0f); + angle -= IM_PI * 0.5f; + const float cos_a = ImCos(angle); + const float sin_a = ImSin(angle); + const float label_cos_a = flip_label ? ImCos(angle + IM_PI) : cos_a; + const float label_sin_a = flip_label ? ImSin(angle + IM_PI) : sin_a; + const ImVec2 unit_right = ImVec2(cos_a, sin_a); + + // Calculate our base metrics and set angled headers data _before_ the first call to TableNextRow() + // FIXME-STYLE: Would it be better for user to submit 'max_label_width' or 'row_height' ? One can be derived from the other. + const float header_height = g.FontSize + g.Style.CellPadding.x * 2.0f; + const float row_height = ImTrunc(ImFabs(ImRotate(ImVec2(max_label_width, flip_label ? +header_height : -header_height), cos_a, sin_a).y)); + table->AngledHeadersHeight = row_height; + table->AngledHeadersSlope = (sin_a != 0.0f) ? (cos_a / sin_a) : 0.0f; + const ImVec2 header_angled_vector = unit_right * (row_height / -sin_a); // vector from bottom-left to top-left, and from bottom-right to top-right + + // Declare row, override and draw our own background + TableNextRow(ImGuiTableRowFlags_Headers, row_height); + TableNextColumn(); + const ImRect row_r(table->WorkRect.Min.x, table->BgClipRect.Min.y, table->WorkRect.Max.x, table->RowPosY2); + table->DrawSplitter->SetCurrentChannel(draw_list, TABLE_DRAW_CHANNEL_BG0); + float clip_rect_min_x = table->BgClipRect.Min.x; + if (table->FreezeColumnsCount > 0) + clip_rect_min_x = ImMax(clip_rect_min_x, table->Columns[table->FreezeColumnsCount - 1].MaxX); + TableSetBgColor(ImGuiTableBgTarget_RowBg0, 0); // Cancel + PushClipRect(table->BgClipRect.Min, table->BgClipRect.Max, false); // Span all columns + draw_list->AddRectFilled(ImVec2(table->BgClipRect.Min.x, row_r.Min.y), ImVec2(table->BgClipRect.Max.x, row_r.Max.y), GetColorU32(ImGuiCol_TableHeaderBg, 0.25f)); // FIXME-STYLE: Change row background with an arbitrary color. + PushClipRect(ImVec2(clip_rect_min_x, table->BgClipRect.Min.y), table->BgClipRect.Max, true); // Span all columns + + ButtonBehavior(row_r, row_id, NULL, NULL); + KeepAliveID(row_id); + + const float ascent_scaled = g.Font->Ascent * g.FontScale; // FIXME: Standardize those scaling factors better + const float line_off_for_ascent_x = (ImMax((g.FontSize - ascent_scaled) * 0.5f, 0.0f) / -sin_a) * (flip_label ? -1.0f : 1.0f); + const ImVec2 padding = g.Style.CellPadding; // We will always use swapped component + const ImVec2 align = g.Style.TableAngledHeadersTextAlign; + + // Draw background and labels in first pass, then all borders. + float max_x = -FLT_MAX; + for (int pass = 0; pass < 2; pass++) + for (int order_n = 0; order_n < data_count; order_n++) + { + const ImGuiTableHeaderData* request = &data[order_n]; + const int column_n = request->Index; + ImGuiTableColumn* column = &table->Columns[column_n]; + + ImVec2 bg_shape[4]; + bg_shape[0] = ImVec2(column->MaxX, row_r.Max.y); + bg_shape[1] = ImVec2(column->MinX, row_r.Max.y); + bg_shape[2] = bg_shape[1] + header_angled_vector; + bg_shape[3] = bg_shape[0] + header_angled_vector; + if (pass == 0) + { + // Draw shape + draw_list->AddQuadFilled(bg_shape[0], bg_shape[1], bg_shape[2], bg_shape[3], request->BgColor0); + draw_list->AddQuadFilled(bg_shape[0], bg_shape[1], bg_shape[2], bg_shape[3], request->BgColor1); // Optional highlight + max_x = ImMax(max_x, bg_shape[3].x); + + // Draw label + // - First draw at an offset where RenderTextXXX() function won't meddle with applying current ClipRect, then transform to final offset. + // - Handle multiple lines manually, as we want each lines to follow on the horizontal border, rather than see a whole block rotated. + const char* label_name = TableGetColumnName(table, column_n); + const char* label_name_end = FindRenderedTextEnd(label_name); + const float line_off_step_x = (g.FontSize / -sin_a); + const int label_lines = ImTextCountLines(label_name, label_name_end); + + // Left<>Right alignment + float line_off_curr_x = flip_label ? (label_lines - 1) * line_off_step_x : 0.0f; + float line_off_for_align_x = ImMax((((column->MaxX - column->MinX) - padding.x * 2.0f) - (label_lines * line_off_step_x)), 0.0f) * align.x; + line_off_curr_x += line_off_for_align_x - line_off_for_ascent_x; + + // Register header width + column->ContentMaxXHeadersUsed = column->ContentMaxXHeadersIdeal = column->WorkMinX + ImCeil(label_lines * line_off_step_x - line_off_for_align_x); + + while (label_name < label_name_end) + { + const char* label_name_eol = strchr(label_name, '\n'); + if (label_name_eol == NULL) + label_name_eol = label_name_end; + + // FIXME: Individual line clipping for right-most column is broken for negative angles. + ImVec2 label_size = CalcTextSize(label_name, label_name_eol); + float clip_width = max_label_width - padding.y; // Using padding.y*2.0f would be symmetrical but hide more text. + float clip_height = ImMin(label_size.y, column->ClipRect.Max.x - column->WorkMinX - line_off_curr_x); + ImRect clip_r(window->ClipRect.Min, window->ClipRect.Min + ImVec2(clip_width, clip_height)); + int vtx_idx_begin = draw_list->_VtxCurrentIdx; + PushStyleColor(ImGuiCol_Text, request->TextColor); + RenderTextEllipsis(draw_list, clip_r.Min, clip_r.Max, clip_r.Max.x, clip_r.Max.x, label_name, label_name_eol, &label_size); + PopStyleColor(); + int vtx_idx_end = draw_list->_VtxCurrentIdx; + + // Up<>Down alignment + const float available_space = ImMax(clip_width - label_size.x + ImAbs(padding.x * cos_a) * 2.0f - ImAbs(padding.y * sin_a) * 2.0f, 0.0f); + const float vertical_offset = available_space * align.y * (flip_label ? -1.0f : 1.0f); + + // Rotate and offset label + ImVec2 pivot_in = ImVec2(window->ClipRect.Min.x - vertical_offset, window->ClipRect.Min.y + label_size.y); + ImVec2 pivot_out = ImVec2(column->WorkMinX, row_r.Max.y); + line_off_curr_x += flip_label ? -line_off_step_x : line_off_step_x; + pivot_out += unit_right * padding.y; + if (flip_label) + pivot_out += unit_right * (clip_width - ImMax(0.0f, clip_width - label_size.x)); + pivot_out.x += flip_label ? line_off_curr_x + line_off_step_x : line_off_curr_x; + ShadeVertsTransformPos(draw_list, vtx_idx_begin, vtx_idx_end, pivot_in, label_cos_a, label_sin_a, pivot_out); // Rotate and offset + //if (g.IO.KeyShift) { ImDrawList* fg_dl = GetForegroundDrawList(); vtx_idx_begin = fg_dl->_VtxCurrentIdx; fg_dl->AddRect(clip_r.Min, clip_r.Max, IM_COL32(0, 255, 0, 255), 0.0f, 0, 1.0f); ShadeVertsTransformPos(fg_dl, vtx_idx_begin, fg_dl->_VtxCurrentIdx, pivot_in, label_cos_a, label_sin_a, pivot_out); } + + label_name = label_name_eol + 1; + } + } + if (pass == 1) + { + // Draw border + draw_list->AddLine(bg_shape[0], bg_shape[3], TableGetColumnBorderCol(table, order_n, column_n)); + } + } + PopClipRect(); + PopClipRect(); + table->TempData->AngledHeadersExtraWidth = ImMax(0.0f, max_x - table->Columns[table->RightMostEnabledColumn].MaxX); +} + +//------------------------------------------------------------------------- +// [SECTION] Tables: Context Menu +//------------------------------------------------------------------------- +// - TableOpenContextMenu() [Internal] +// - TableBeginContextMenuPopup() [Internal] +// - TableDrawDefaultContextMenu() [Internal] +//------------------------------------------------------------------------- + +// Use -1 to open menu not specific to a given column. +void ImGui::TableOpenContextMenu(int column_n) +{ + ImGuiContext& g = *GImGui; + ImGuiTable* table = g.CurrentTable; + if (column_n == -1 && table->CurrentColumn != -1) // When called within a column automatically use this one (for consistency) + column_n = table->CurrentColumn; + if (column_n == table->ColumnsCount) // To facilitate using with TableGetHoveredColumn() + column_n = -1; + IM_ASSERT(column_n >= -1 && column_n < table->ColumnsCount); + if (table->Flags & (ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable)) + { + table->IsContextPopupOpen = true; + table->ContextPopupColumn = (ImGuiTableColumnIdx)column_n; + table->InstanceInteracted = table->InstanceCurrent; + const ImGuiID context_menu_id = ImHashStr("##ContextMenu", 0, table->ID); + OpenPopupEx(context_menu_id, ImGuiPopupFlags_None); + } +} + +bool ImGui::TableBeginContextMenuPopup(ImGuiTable* table) +{ + if (!table->IsContextPopupOpen || table->InstanceCurrent != table->InstanceInteracted) + return false; + const ImGuiID context_menu_id = ImHashStr("##ContextMenu", 0, table->ID); + if (BeginPopupEx(context_menu_id, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoSavedSettings)) + return true; + table->IsContextPopupOpen = false; + return false; +} + +// Output context menu into current window (generally a popup) +// FIXME-TABLE: Ideally this should be writable by the user. Full programmatic access to that data? +// Sections to display are pulled from 'flags_for_section_to_display', which is typically == table->Flags. +// - ImGuiTableFlags_Resizable -> display Sizing menu items +// - ImGuiTableFlags_Reorderable -> display "Reset Order" +////- ImGuiTableFlags_Sortable -> display sorting options (disabled) +// - ImGuiTableFlags_Hideable -> display columns visibility menu items +// It means if you have a custom context menus you can call this section and omit some sections, and add your own. +void ImGui::TableDrawDefaultContextMenu(ImGuiTable* table, ImGuiTableFlags flags_for_section_to_display) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + if (window->SkipItems) + return; + + bool want_separator = false; + const int column_n = (table->ContextPopupColumn >= 0 && table->ContextPopupColumn < table->ColumnsCount) ? table->ContextPopupColumn : -1; + ImGuiTableColumn* column = (column_n != -1) ? &table->Columns[column_n] : NULL; + + // Sizing + if (flags_for_section_to_display & ImGuiTableFlags_Resizable) + { + if (column != NULL) + { + const bool can_resize = !(column->Flags & ImGuiTableColumnFlags_NoResize) && column->IsEnabled; + if (MenuItem(LocalizeGetMsg(ImGuiLocKey_TableSizeOne), NULL, false, can_resize)) // "###SizeOne" + TableSetColumnWidthAutoSingle(table, column_n); + } + + const char* size_all_desc; + if (table->ColumnsEnabledFixedCount == table->ColumnsEnabledCount && (table->Flags & ImGuiTableFlags_SizingMask_) != ImGuiTableFlags_SizingFixedSame) + size_all_desc = LocalizeGetMsg(ImGuiLocKey_TableSizeAllFit); // "###SizeAll" All fixed + else + size_all_desc = LocalizeGetMsg(ImGuiLocKey_TableSizeAllDefault); // "###SizeAll" All stretch or mixed + if (MenuItem(size_all_desc, NULL)) + TableSetColumnWidthAutoAll(table); + want_separator = true; + } + + // Ordering + if (flags_for_section_to_display & ImGuiTableFlags_Reorderable) + { + if (MenuItem(LocalizeGetMsg(ImGuiLocKey_TableResetOrder), NULL, false, !table->IsDefaultDisplayOrder)) + table->IsResetDisplayOrderRequest = true; + want_separator = true; + } + + // Reset all (should work but seems unnecessary/noisy to expose?) + //if (MenuItem("Reset all")) + // table->IsResetAllRequest = true; + + // Sorting + // (modify TableOpenContextMenu() to add _Sortable flag if enabling this) +#if 0 + if ((flags_for_section_to_display & ImGuiTableFlags_Sortable) && column != NULL && (column->Flags & ImGuiTableColumnFlags_NoSort) == 0) + { + if (want_separator) + Separator(); + want_separator = true; + + bool append_to_sort_specs = g.IO.KeyShift; + if (MenuItem("Sort in Ascending Order", NULL, column->SortOrder != -1 && column->SortDirection == ImGuiSortDirection_Ascending, (column->Flags & ImGuiTableColumnFlags_NoSortAscending) == 0)) + TableSetColumnSortDirection(table, column_n, ImGuiSortDirection_Ascending, append_to_sort_specs); + if (MenuItem("Sort in Descending Order", NULL, column->SortOrder != -1 && column->SortDirection == ImGuiSortDirection_Descending, (column->Flags & ImGuiTableColumnFlags_NoSortDescending) == 0)) + TableSetColumnSortDirection(table, column_n, ImGuiSortDirection_Descending, append_to_sort_specs); + } +#endif + + // Hiding / Visibility + if (flags_for_section_to_display & ImGuiTableFlags_Hideable) + { + if (want_separator) + Separator(); + want_separator = true; + + PushItemFlag(ImGuiItemFlags_AutoClosePopups, false); + for (int other_column_n = 0; other_column_n < table->ColumnsCount; other_column_n++) + { + ImGuiTableColumn* other_column = &table->Columns[other_column_n]; + if (other_column->Flags & ImGuiTableColumnFlags_Disabled) + continue; + + const char* name = TableGetColumnName(table, other_column_n); + if (name == NULL || name[0] == 0) + name = ""; + + // Make sure we can't hide the last active column + bool menu_item_active = (other_column->Flags & ImGuiTableColumnFlags_NoHide) ? false : true; + if (other_column->IsUserEnabled && table->ColumnsEnabledCount <= 1) + menu_item_active = false; + if (MenuItem(name, NULL, other_column->IsUserEnabled, menu_item_active)) + other_column->IsUserEnabledNextFrame = !other_column->IsUserEnabled; + } + PopItemFlag(); + } +} + +//------------------------------------------------------------------------- +// [SECTION] Tables: Settings (.ini data) +//------------------------------------------------------------------------- +// FIXME: The binding/finding/creating flow are too confusing. +//------------------------------------------------------------------------- +// - TableSettingsInit() [Internal] +// - TableSettingsCalcChunkSize() [Internal] +// - TableSettingsCreate() [Internal] +// - TableSettingsFindByID() [Internal] +// - TableGetBoundSettings() [Internal] +// - TableResetSettings() +// - TableSaveSettings() [Internal] +// - TableLoadSettings() [Internal] +// - TableSettingsHandler_ClearAll() [Internal] +// - TableSettingsHandler_ApplyAll() [Internal] +// - TableSettingsHandler_ReadOpen() [Internal] +// - TableSettingsHandler_ReadLine() [Internal] +// - TableSettingsHandler_WriteAll() [Internal] +// - TableSettingsInstallHandler() [Internal] +//------------------------------------------------------------------------- +// [Init] 1: TableSettingsHandler_ReadXXXX() Load and parse .ini file into TableSettings. +// [Main] 2: TableLoadSettings() When table is created, bind Table to TableSettings, serialize TableSettings data into Table. +// [Main] 3: TableSaveSettings() When table properties are modified, serialize Table data into bound or new TableSettings, mark .ini as dirty. +// [Main] 4: TableSettingsHandler_WriteAll() When .ini file is dirty (which can come from other source), save TableSettings into .ini file. +//------------------------------------------------------------------------- + +// Clear and initialize empty settings instance +static void TableSettingsInit(ImGuiTableSettings* settings, ImGuiID id, int columns_count, int columns_count_max) +{ + IM_PLACEMENT_NEW(settings) ImGuiTableSettings(); + ImGuiTableColumnSettings* settings_column = settings->GetColumnSettings(); + for (int n = 0; n < columns_count_max; n++, settings_column++) + IM_PLACEMENT_NEW(settings_column) ImGuiTableColumnSettings(); + settings->ID = id; + settings->ColumnsCount = (ImGuiTableColumnIdx)columns_count; + settings->ColumnsCountMax = (ImGuiTableColumnIdx)columns_count_max; + settings->WantApply = true; +} + +static size_t TableSettingsCalcChunkSize(int columns_count) +{ + return sizeof(ImGuiTableSettings) + (size_t)columns_count * sizeof(ImGuiTableColumnSettings); +} + +ImGuiTableSettings* ImGui::TableSettingsCreate(ImGuiID id, int columns_count) +{ + ImGuiContext& g = *GImGui; + ImGuiTableSettings* settings = g.SettingsTables.alloc_chunk(TableSettingsCalcChunkSize(columns_count)); + TableSettingsInit(settings, id, columns_count, columns_count); + return settings; +} + +// Find existing settings +ImGuiTableSettings* ImGui::TableSettingsFindByID(ImGuiID id) +{ + // FIXME-OPT: Might want to store a lookup map for this? + ImGuiContext& g = *GImGui; + for (ImGuiTableSettings* settings = g.SettingsTables.begin(); settings != NULL; settings = g.SettingsTables.next_chunk(settings)) + if (settings->ID == id) + return settings; + return NULL; +} + +// Get settings for a given table, NULL if none +ImGuiTableSettings* ImGui::TableGetBoundSettings(ImGuiTable* table) +{ + if (table->SettingsOffset != -1) + { + ImGuiContext& g = *GImGui; + ImGuiTableSettings* settings = g.SettingsTables.ptr_from_offset(table->SettingsOffset); + IM_ASSERT(settings->ID == table->ID); + if (settings->ColumnsCountMax >= table->ColumnsCount) + return settings; // OK + settings->ID = 0; // Invalidate storage, we won't fit because of a count change + } + return NULL; +} + +// Restore initial state of table (with or without saved settings) +void ImGui::TableResetSettings(ImGuiTable* table) +{ + table->IsInitializing = table->IsSettingsDirty = true; + table->IsResetAllRequest = false; + table->IsSettingsRequestLoad = false; // Don't reload from ini + table->SettingsLoadedFlags = ImGuiTableFlags_None; // Mark as nothing loaded so our initialized data becomes authoritative +} + +void ImGui::TableSaveSettings(ImGuiTable* table) +{ + table->IsSettingsDirty = false; + if (table->Flags & ImGuiTableFlags_NoSavedSettings) + return; + + // Bind or create settings data + ImGuiContext& g = *GImGui; + ImGuiTableSettings* settings = TableGetBoundSettings(table); + if (settings == NULL) + { + settings = TableSettingsCreate(table->ID, table->ColumnsCount); + table->SettingsOffset = g.SettingsTables.offset_from_ptr(settings); + } + settings->ColumnsCount = (ImGuiTableColumnIdx)table->ColumnsCount; + + // Serialize ImGuiTable/ImGuiTableColumn into ImGuiTableSettings/ImGuiTableColumnSettings + IM_ASSERT(settings->ID == table->ID); + IM_ASSERT(settings->ColumnsCount == table->ColumnsCount && settings->ColumnsCountMax >= settings->ColumnsCount); + ImGuiTableColumn* column = table->Columns.Data; + ImGuiTableColumnSettings* column_settings = settings->GetColumnSettings(); + + bool save_ref_scale = false; + settings->SaveFlags = ImGuiTableFlags_None; + for (int n = 0; n < table->ColumnsCount; n++, column++, column_settings++) + { + const float width_or_weight = (column->Flags & ImGuiTableColumnFlags_WidthStretch) ? column->StretchWeight : column->WidthRequest; + column_settings->WidthOrWeight = width_or_weight; + column_settings->Index = (ImGuiTableColumnIdx)n; + column_settings->DisplayOrder = column->DisplayOrder; + column_settings->SortOrder = column->SortOrder; + column_settings->SortDirection = column->SortDirection; + column_settings->IsEnabled = column->IsUserEnabled; + column_settings->IsStretch = (column->Flags & ImGuiTableColumnFlags_WidthStretch) ? 1 : 0; + if ((column->Flags & ImGuiTableColumnFlags_WidthStretch) == 0) + save_ref_scale = true; + + // We skip saving some data in the .ini file when they are unnecessary to restore our state. + // Note that fixed width where initial width was derived from auto-fit will always be saved as InitStretchWeightOrWidth will be 0.0f. + // FIXME-TABLE: We don't have logic to easily compare SortOrder to DefaultSortOrder yet so it's always saved when present. + if (width_or_weight != column->InitStretchWeightOrWidth) + settings->SaveFlags |= ImGuiTableFlags_Resizable; + if (column->DisplayOrder != n) + settings->SaveFlags |= ImGuiTableFlags_Reorderable; + if (column->SortOrder != -1) + settings->SaveFlags |= ImGuiTableFlags_Sortable; + if (column->IsUserEnabled != ((column->Flags & ImGuiTableColumnFlags_DefaultHide) == 0)) + settings->SaveFlags |= ImGuiTableFlags_Hideable; + } + settings->SaveFlags &= table->Flags; + settings->RefScale = save_ref_scale ? table->RefScale : 0.0f; + + MarkIniSettingsDirty(); +} + +void ImGui::TableLoadSettings(ImGuiTable* table) +{ + ImGuiContext& g = *GImGui; + table->IsSettingsRequestLoad = false; + if (table->Flags & ImGuiTableFlags_NoSavedSettings) + return; + + // Bind settings + ImGuiTableSettings* settings; + if (table->SettingsOffset == -1) + { + settings = TableSettingsFindByID(table->ID); + if (settings == NULL) + return; + if (settings->ColumnsCount != table->ColumnsCount) // Allow settings if columns count changed. We could otherwise decide to return... + table->IsSettingsDirty = true; + table->SettingsOffset = g.SettingsTables.offset_from_ptr(settings); + } + else + { + settings = TableGetBoundSettings(table); + } + + table->SettingsLoadedFlags = settings->SaveFlags; + table->RefScale = settings->RefScale; + + // Initialize default columns settings + for (int column_n = 0; column_n < table->ColumnsCount; column_n++) + { + ImGuiTableColumn* column = &table->Columns[column_n]; + TableInitColumnDefaults(table, column, ~0); + column->AutoFitQueue = 0x00; + } + + // Serialize ImGuiTableSettings/ImGuiTableColumnSettings into ImGuiTable/ImGuiTableColumn + ImGuiTableColumnSettings* column_settings = settings->GetColumnSettings(); + ImU64 display_order_mask = 0; + for (int data_n = 0; data_n < settings->ColumnsCount; data_n++, column_settings++) + { + int column_n = column_settings->Index; + if (column_n < 0 || column_n >= table->ColumnsCount) + continue; + + ImGuiTableColumn* column = &table->Columns[column_n]; + if (settings->SaveFlags & ImGuiTableFlags_Resizable) + { + if (column_settings->IsStretch) + column->StretchWeight = column_settings->WidthOrWeight; + else + column->WidthRequest = column_settings->WidthOrWeight; + } + if (settings->SaveFlags & ImGuiTableFlags_Reorderable) + column->DisplayOrder = column_settings->DisplayOrder; + display_order_mask |= (ImU64)1 << column->DisplayOrder; + if ((settings->SaveFlags & ImGuiTableFlags_Hideable) && column_settings->IsEnabled != -1) + column->IsUserEnabled = column->IsUserEnabledNextFrame = column_settings->IsEnabled == 1; + column->SortOrder = column_settings->SortOrder; + column->SortDirection = column_settings->SortDirection; + } + + // Validate and fix invalid display order data + const ImU64 expected_display_order_mask = (settings->ColumnsCount == 64) ? ~0 : ((ImU64)1 << settings->ColumnsCount) - 1; + if (display_order_mask != expected_display_order_mask) + for (int column_n = 0; column_n < table->ColumnsCount; column_n++) + table->Columns[column_n].DisplayOrder = (ImGuiTableColumnIdx)column_n; + + // Rebuild index + for (int column_n = 0; column_n < table->ColumnsCount; column_n++) + table->DisplayOrderToIndex[table->Columns[column_n].DisplayOrder] = (ImGuiTableColumnIdx)column_n; +} + +static void TableSettingsHandler_ClearAll(ImGuiContext* ctx, ImGuiSettingsHandler*) +{ + ImGuiContext& g = *ctx; + for (int i = 0; i != g.Tables.GetMapSize(); i++) + if (ImGuiTable* table = g.Tables.TryGetMapData(i)) + table->SettingsOffset = -1; + g.SettingsTables.clear(); +} + +// Apply to existing windows (if any) +static void TableSettingsHandler_ApplyAll(ImGuiContext* ctx, ImGuiSettingsHandler*) +{ + ImGuiContext& g = *ctx; + for (int i = 0; i != g.Tables.GetMapSize(); i++) + if (ImGuiTable* table = g.Tables.TryGetMapData(i)) + { + table->IsSettingsRequestLoad = true; + table->SettingsOffset = -1; + } +} + +static void* TableSettingsHandler_ReadOpen(ImGuiContext*, ImGuiSettingsHandler*, const char* name) +{ + ImGuiID id = 0; + int columns_count = 0; + if (sscanf(name, "0x%08X,%d", &id, &columns_count) < 2) + return NULL; + + if (ImGuiTableSettings* settings = ImGui::TableSettingsFindByID(id)) + { + if (settings->ColumnsCountMax >= columns_count) + { + TableSettingsInit(settings, id, columns_count, settings->ColumnsCountMax); // Recycle + return settings; + } + settings->ID = 0; // Invalidate storage, we won't fit because of a count change + } + return ImGui::TableSettingsCreate(id, columns_count); +} + +static void TableSettingsHandler_ReadLine(ImGuiContext*, ImGuiSettingsHandler*, void* entry, const char* line) +{ + // "Column 0 UserID=0x42AD2D21 Width=100 Visible=1 Order=0 Sort=0v" + ImGuiTableSettings* settings = (ImGuiTableSettings*)entry; + float f = 0.0f; + int column_n = 0, r = 0, n = 0; + + if (sscanf(line, "RefScale=%f", &f) == 1) { settings->RefScale = f; return; } + + if (sscanf(line, "Column %d%n", &column_n, &r) == 1) + { + if (column_n < 0 || column_n >= settings->ColumnsCount) + return; + line = ImStrSkipBlank(line + r); + char c = 0; + ImGuiTableColumnSettings* column = settings->GetColumnSettings() + column_n; + column->Index = (ImGuiTableColumnIdx)column_n; + if (sscanf(line, "UserID=0x%08X%n", (ImU32*)&n, &r)==1) { line = ImStrSkipBlank(line + r); column->UserID = (ImGuiID)n; } + if (sscanf(line, "Width=%d%n", &n, &r) == 1) { line = ImStrSkipBlank(line + r); column->WidthOrWeight = (float)n; column->IsStretch = 0; settings->SaveFlags |= ImGuiTableFlags_Resizable; } + if (sscanf(line, "Weight=%f%n", &f, &r) == 1) { line = ImStrSkipBlank(line + r); column->WidthOrWeight = f; column->IsStretch = 1; settings->SaveFlags |= ImGuiTableFlags_Resizable; } + if (sscanf(line, "Visible=%d%n", &n, &r) == 1) { line = ImStrSkipBlank(line + r); column->IsEnabled = (ImU8)n; settings->SaveFlags |= ImGuiTableFlags_Hideable; } + if (sscanf(line, "Order=%d%n", &n, &r) == 1) { line = ImStrSkipBlank(line + r); column->DisplayOrder = (ImGuiTableColumnIdx)n; settings->SaveFlags |= ImGuiTableFlags_Reorderable; } + if (sscanf(line, "Sort=%d%c%n", &n, &c, &r) == 2) { line = ImStrSkipBlank(line + r); column->SortOrder = (ImGuiTableColumnIdx)n; column->SortDirection = (c == '^') ? ImGuiSortDirection_Descending : ImGuiSortDirection_Ascending; settings->SaveFlags |= ImGuiTableFlags_Sortable; } + } +} + +static void TableSettingsHandler_WriteAll(ImGuiContext* ctx, ImGuiSettingsHandler* handler, ImGuiTextBuffer* buf) +{ + ImGuiContext& g = *ctx; + for (ImGuiTableSettings* settings = g.SettingsTables.begin(); settings != NULL; settings = g.SettingsTables.next_chunk(settings)) + { + if (settings->ID == 0) // Skip ditched settings + continue; + + // TableSaveSettings() may clear some of those flags when we establish that the data can be stripped + // (e.g. Order was unchanged) + const bool save_size = (settings->SaveFlags & ImGuiTableFlags_Resizable) != 0; + const bool save_visible = (settings->SaveFlags & ImGuiTableFlags_Hideable) != 0; + const bool save_order = (settings->SaveFlags & ImGuiTableFlags_Reorderable) != 0; + const bool save_sort = (settings->SaveFlags & ImGuiTableFlags_Sortable) != 0; + // We need to save the [Table] entry even if all the bools are false, since this records a table with "default settings". + + buf->reserve(buf->size() + 30 + settings->ColumnsCount * 50); // ballpark reserve + buf->appendf("[%s][0x%08X,%d]\n", handler->TypeName, settings->ID, settings->ColumnsCount); + if (settings->RefScale != 0.0f) + buf->appendf("RefScale=%g\n", settings->RefScale); + ImGuiTableColumnSettings* column = settings->GetColumnSettings(); + for (int column_n = 0; column_n < settings->ColumnsCount; column_n++, column++) + { + // "Column 0 UserID=0x42AD2D21 Width=100 Visible=1 Order=0 Sort=0v" + bool save_column = column->UserID != 0 || save_size || save_visible || save_order || (save_sort && column->SortOrder != -1); + if (!save_column) + continue; + buf->appendf("Column %-2d", column_n); + if (column->UserID != 0) { buf->appendf(" UserID=%08X", column->UserID); } + if (save_size && column->IsStretch) { buf->appendf(" Weight=%.4f", column->WidthOrWeight); } + if (save_size && !column->IsStretch) { buf->appendf(" Width=%d", (int)column->WidthOrWeight); } + if (save_visible) { buf->appendf(" Visible=%d", column->IsEnabled); } + if (save_order) { buf->appendf(" Order=%d", column->DisplayOrder); } + if (save_sort && column->SortOrder != -1) { buf->appendf(" Sort=%d%c", column->SortOrder, (column->SortDirection == ImGuiSortDirection_Ascending) ? 'v' : '^'); } + buf->append("\n"); + } + buf->append("\n"); + } +} + +void ImGui::TableSettingsAddSettingsHandler() +{ + ImGuiSettingsHandler ini_handler; + ini_handler.TypeName = "Table"; + ini_handler.TypeHash = ImHashStr("Table"); + ini_handler.ClearAllFn = TableSettingsHandler_ClearAll; + ini_handler.ReadOpenFn = TableSettingsHandler_ReadOpen; + ini_handler.ReadLineFn = TableSettingsHandler_ReadLine; + ini_handler.ApplyAllFn = TableSettingsHandler_ApplyAll; + ini_handler.WriteAllFn = TableSettingsHandler_WriteAll; + AddSettingsHandler(&ini_handler); +} + +//------------------------------------------------------------------------- +// [SECTION] Tables: Garbage Collection +//------------------------------------------------------------------------- +// - TableRemove() [Internal] +// - TableGcCompactTransientBuffers() [Internal] +// - TableGcCompactSettings() [Internal] +//------------------------------------------------------------------------- + +// Remove Table (currently only used by TestEngine) +void ImGui::TableRemove(ImGuiTable* table) +{ + //IMGUI_DEBUG_PRINT("TableRemove() id=0x%08X\n", table->ID); + ImGuiContext& g = *GImGui; + int table_idx = g.Tables.GetIndex(table); + //memset(table->RawData.Data, 0, table->RawData.size_in_bytes()); + //memset(table, 0, sizeof(ImGuiTable)); + g.Tables.Remove(table->ID, table); + g.TablesLastTimeActive[table_idx] = -1.0f; +} + +// Free up/compact internal Table buffers for when it gets unused +void ImGui::TableGcCompactTransientBuffers(ImGuiTable* table) +{ + //IMGUI_DEBUG_PRINT("TableGcCompactTransientBuffers() id=0x%08X\n", table->ID); + ImGuiContext& g = *GImGui; + IM_ASSERT(table->MemoryCompacted == false); + table->SortSpecs.Specs = NULL; + table->SortSpecsMulti.clear(); + table->IsSortSpecsDirty = true; // FIXME: In theory shouldn't have to leak into user performing a sort on resume. + table->ColumnsNames.clear(); + table->MemoryCompacted = true; + for (int n = 0; n < table->ColumnsCount; n++) + table->Columns[n].NameOffset = -1; + g.TablesLastTimeActive[g.Tables.GetIndex(table)] = -1.0f; +} + +void ImGui::TableGcCompactTransientBuffers(ImGuiTableTempData* temp_data) +{ + temp_data->DrawSplitter.ClearFreeMemory(); + temp_data->LastTimeActive = -1.0f; +} + +// Compact and remove unused settings data (currently only used by TestEngine) +void ImGui::TableGcCompactSettings() +{ + ImGuiContext& g = *GImGui; + int required_memory = 0; + for (ImGuiTableSettings* settings = g.SettingsTables.begin(); settings != NULL; settings = g.SettingsTables.next_chunk(settings)) + if (settings->ID != 0) + required_memory += (int)TableSettingsCalcChunkSize(settings->ColumnsCount); + if (required_memory == g.SettingsTables.Buf.Size) + return; + ImChunkStream new_chunk_stream; + new_chunk_stream.Buf.reserve(required_memory); + for (ImGuiTableSettings* settings = g.SettingsTables.begin(); settings != NULL; settings = g.SettingsTables.next_chunk(settings)) + if (settings->ID != 0) + memcpy(new_chunk_stream.alloc_chunk(TableSettingsCalcChunkSize(settings->ColumnsCount)), settings, TableSettingsCalcChunkSize(settings->ColumnsCount)); + g.SettingsTables.swap(new_chunk_stream); +} + + +//------------------------------------------------------------------------- +// [SECTION] Tables: Debugging +//------------------------------------------------------------------------- +// - DebugNodeTable() [Internal] +//------------------------------------------------------------------------- + +#ifndef IMGUI_DISABLE_DEBUG_TOOLS + +static const char* DebugNodeTableGetSizingPolicyDesc(ImGuiTableFlags sizing_policy) +{ + sizing_policy &= ImGuiTableFlags_SizingMask_; + if (sizing_policy == ImGuiTableFlags_SizingFixedFit) { return "FixedFit"; } + if (sizing_policy == ImGuiTableFlags_SizingFixedSame) { return "FixedSame"; } + if (sizing_policy == ImGuiTableFlags_SizingStretchProp) { return "StretchProp"; } + if (sizing_policy == ImGuiTableFlags_SizingStretchSame) { return "StretchSame"; } + return "N/A"; +} + +void ImGui::DebugNodeTable(ImGuiTable* table) +{ + ImGuiContext& g = *GImGui; + const bool is_active = (table->LastFrameActive >= g.FrameCount - 2); // Note that fully clipped early out scrolling tables will appear as inactive here. + if (!is_active) { PushStyleColor(ImGuiCol_Text, GetStyleColorVec4(ImGuiCol_TextDisabled)); } + bool open = TreeNode(table, "Table 0x%08X (%d columns, in '%s')%s", table->ID, table->ColumnsCount, table->OuterWindow->Name, is_active ? "" : " *Inactive*"); + if (!is_active) { PopStyleColor(); } + if (IsItemHovered()) + GetForegroundDrawList()->AddRect(table->OuterRect.Min, table->OuterRect.Max, IM_COL32(255, 255, 0, 255)); + if (IsItemVisible() && table->HoveredColumnBody != -1) + GetForegroundDrawList()->AddRect(GetItemRectMin(), GetItemRectMax(), IM_COL32(255, 255, 0, 255)); + if (!open) + return; + if (table->InstanceCurrent > 0) + Text("** %d instances of same table! Some data below will refer to last instance.", table->InstanceCurrent + 1); + if (g.IO.ConfigDebugIsDebuggerPresent) + { + if (DebugBreakButton("**DebugBreak**", "in BeginTable()")) + g.DebugBreakInTable = table->ID; + SameLine(); + } + + bool clear_settings = SmallButton("Clear settings"); + BulletText("OuterRect: Pos: (%.1f,%.1f) Size: (%.1f,%.1f) Sizing: '%s'", table->OuterRect.Min.x, table->OuterRect.Min.y, table->OuterRect.GetWidth(), table->OuterRect.GetHeight(), DebugNodeTableGetSizingPolicyDesc(table->Flags)); + BulletText("ColumnsGivenWidth: %.1f, ColumnsAutoFitWidth: %.1f, InnerWidth: %.1f%s", table->ColumnsGivenWidth, table->ColumnsAutoFitWidth, table->InnerWidth, table->InnerWidth == 0.0f ? " (auto)" : ""); + BulletText("CellPaddingX: %.1f, CellSpacingX: %.1f/%.1f, OuterPaddingX: %.1f", table->CellPaddingX, table->CellSpacingX1, table->CellSpacingX2, table->OuterPaddingX); + BulletText("HoveredColumnBody: %d, HoveredColumnBorder: %d", table->HoveredColumnBody, table->HoveredColumnBorder); + BulletText("ResizedColumn: %d, ReorderColumn: %d, HeldHeaderColumn: %d", table->ResizedColumn, table->ReorderColumn, table->HeldHeaderColumn); + for (int n = 0; n < table->InstanceCurrent + 1; n++) + { + ImGuiTableInstanceData* table_instance = TableGetInstanceData(table, n); + BulletText("Instance %d: HoveredRow: %d, LastOuterHeight: %.2f", n, table_instance->HoveredRowLast, table_instance->LastOuterHeight); + } + //BulletText("BgDrawChannels: %d/%d", 0, table->BgDrawChannelUnfrozen); + float sum_weights = 0.0f; + for (int n = 0; n < table->ColumnsCount; n++) + if (table->Columns[n].Flags & ImGuiTableColumnFlags_WidthStretch) + sum_weights += table->Columns[n].StretchWeight; + for (int n = 0; n < table->ColumnsCount; n++) + { + ImGuiTableColumn* column = &table->Columns[n]; + const char* name = TableGetColumnName(table, n); + char buf[512]; + ImFormatString(buf, IM_ARRAYSIZE(buf), + "Column %d order %d '%s': offset %+.2f to %+.2f%s\n" + "Enabled: %d, VisibleX/Y: %d/%d, RequestOutput: %d, SkipItems: %d, DrawChannels: %d,%d\n" + "WidthGiven: %.1f, Request/Auto: %.1f/%.1f, StretchWeight: %.3f (%.1f%%)\n" + "MinX: %.1f, MaxX: %.1f (%+.1f), ClipRect: %.1f to %.1f (+%.1f)\n" + "ContentWidth: %.1f,%.1f, HeadersUsed/Ideal %.1f/%.1f\n" + "Sort: %d%s, UserID: 0x%08X, Flags: 0x%04X: %s%s%s..", + n, column->DisplayOrder, name, column->MinX - table->WorkRect.Min.x, column->MaxX - table->WorkRect.Min.x, (n < table->FreezeColumnsRequest) ? " (Frozen)" : "", + column->IsEnabled, column->IsVisibleX, column->IsVisibleY, column->IsRequestOutput, column->IsSkipItems, column->DrawChannelFrozen, column->DrawChannelUnfrozen, + column->WidthGiven, column->WidthRequest, column->WidthAuto, column->StretchWeight, column->StretchWeight > 0.0f ? (column->StretchWeight / sum_weights) * 100.0f : 0.0f, + column->MinX, column->MaxX, column->MaxX - column->MinX, column->ClipRect.Min.x, column->ClipRect.Max.x, column->ClipRect.Max.x - column->ClipRect.Min.x, + column->ContentMaxXFrozen - column->WorkMinX, column->ContentMaxXUnfrozen - column->WorkMinX, column->ContentMaxXHeadersUsed - column->WorkMinX, column->ContentMaxXHeadersIdeal - column->WorkMinX, + column->SortOrder, (column->SortDirection == ImGuiSortDirection_Ascending) ? " (Asc)" : (column->SortDirection == ImGuiSortDirection_Descending) ? " (Des)" : "", column->UserID, column->Flags, + (column->Flags & ImGuiTableColumnFlags_WidthStretch) ? "WidthStretch " : "", + (column->Flags & ImGuiTableColumnFlags_WidthFixed) ? "WidthFixed " : "", + (column->Flags & ImGuiTableColumnFlags_NoResize) ? "NoResize " : ""); + Bullet(); + Selectable(buf); + if (IsItemHovered()) + { + ImRect r(column->MinX, table->OuterRect.Min.y, column->MaxX, table->OuterRect.Max.y); + GetForegroundDrawList()->AddRect(r.Min, r.Max, IM_COL32(255, 255, 0, 255)); + } + } + if (ImGuiTableSettings* settings = TableGetBoundSettings(table)) + DebugNodeTableSettings(settings); + if (clear_settings) + table->IsResetAllRequest = true; + TreePop(); +} + +void ImGui::DebugNodeTableSettings(ImGuiTableSettings* settings) +{ + if (!TreeNode((void*)(intptr_t)settings->ID, "Settings 0x%08X (%d columns)", settings->ID, settings->ColumnsCount)) + return; + BulletText("SaveFlags: 0x%08X", settings->SaveFlags); + BulletText("ColumnsCount: %d (max %d)", settings->ColumnsCount, settings->ColumnsCountMax); + for (int n = 0; n < settings->ColumnsCount; n++) + { + ImGuiTableColumnSettings* column_settings = &settings->GetColumnSettings()[n]; + ImGuiSortDirection sort_dir = (column_settings->SortOrder != -1) ? (ImGuiSortDirection)column_settings->SortDirection : ImGuiSortDirection_None; + BulletText("Column %d Order %d SortOrder %d %s Vis %d %s %7.3f UserID 0x%08X", + n, column_settings->DisplayOrder, column_settings->SortOrder, + (sort_dir == ImGuiSortDirection_Ascending) ? "Asc" : (sort_dir == ImGuiSortDirection_Descending) ? "Des" : "---", + column_settings->IsEnabled, column_settings->IsStretch ? "Weight" : "Width ", column_settings->WidthOrWeight, column_settings->UserID); + } + TreePop(); +} + +#else // #ifndef IMGUI_DISABLE_DEBUG_TOOLS + +void ImGui::DebugNodeTable(ImGuiTable*) {} +void ImGui::DebugNodeTableSettings(ImGuiTableSettings*) {} + +#endif + + +//------------------------------------------------------------------------- +// [SECTION] Columns, BeginColumns, EndColumns, etc. +// (This is a legacy API, prefer using BeginTable/EndTable!) +//------------------------------------------------------------------------- +// FIXME: sizing is lossy when columns width is very small (default width may turn negative etc.) +//------------------------------------------------------------------------- +// - SetWindowClipRectBeforeSetChannel() [Internal] +// - GetColumnIndex() +// - GetColumnsCount() +// - GetColumnOffset() +// - GetColumnWidth() +// - SetColumnOffset() +// - SetColumnWidth() +// - PushColumnClipRect() [Internal] +// - PushColumnsBackground() [Internal] +// - PopColumnsBackground() [Internal] +// - FindOrCreateColumns() [Internal] +// - GetColumnsID() [Internal] +// - BeginColumns() +// - NextColumn() +// - EndColumns() +// - Columns() +//------------------------------------------------------------------------- + +// [Internal] Small optimization to avoid calls to PopClipRect/SetCurrentChannel/PushClipRect in sequences, +// they would meddle many times with the underlying ImDrawCmd. +// Instead, we do a preemptive overwrite of clipping rectangle _without_ altering the command-buffer and let +// the subsequent single call to SetCurrentChannel() does it things once. +void ImGui::SetWindowClipRectBeforeSetChannel(ImGuiWindow* window, const ImRect& clip_rect) +{ + ImVec4 clip_rect_vec4 = clip_rect.ToVec4(); + window->ClipRect = clip_rect; + window->DrawList->_CmdHeader.ClipRect = clip_rect_vec4; + window->DrawList->_ClipRectStack.Data[window->DrawList->_ClipRectStack.Size - 1] = clip_rect_vec4; +} + +int ImGui::GetColumnIndex() +{ + ImGuiWindow* window = GetCurrentWindowRead(); + return window->DC.CurrentColumns ? window->DC.CurrentColumns->Current : 0; +} + +int ImGui::GetColumnsCount() +{ + ImGuiWindow* window = GetCurrentWindowRead(); + return window->DC.CurrentColumns ? window->DC.CurrentColumns->Count : 1; +} + +float ImGui::GetColumnOffsetFromNorm(const ImGuiOldColumns* columns, float offset_norm) +{ + return offset_norm * (columns->OffMaxX - columns->OffMinX); +} + +float ImGui::GetColumnNormFromOffset(const ImGuiOldColumns* columns, float offset) +{ + return offset / (columns->OffMaxX - columns->OffMinX); +} + +static const float COLUMNS_HIT_RECT_HALF_THICKNESS = 4.0f; + +static float GetDraggedColumnOffset(ImGuiOldColumns* columns, int column_index) +{ + // Active (dragged) column always follow mouse. The reason we need this is that dragging a column to the right edge of an auto-resizing + // window creates a feedback loop because we store normalized positions. So while dragging we enforce absolute positioning. + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + IM_ASSERT(column_index > 0); // We are not supposed to drag column 0. + IM_ASSERT(g.ActiveId == columns->ID + ImGuiID(column_index)); + + float x = g.IO.MousePos.x - g.ActiveIdClickOffset.x + ImTrunc(COLUMNS_HIT_RECT_HALF_THICKNESS * g.CurrentDpiScale) - window->Pos.x; + x = ImMax(x, ImGui::GetColumnOffset(column_index - 1) + g.Style.ColumnsMinSpacing); + if ((columns->Flags & ImGuiOldColumnFlags_NoPreserveWidths)) + x = ImMin(x, ImGui::GetColumnOffset(column_index + 1) - g.Style.ColumnsMinSpacing); + + return x; +} + +float ImGui::GetColumnOffset(int column_index) +{ + ImGuiWindow* window = GetCurrentWindowRead(); + ImGuiOldColumns* columns = window->DC.CurrentColumns; + if (columns == NULL) + return 0.0f; + + if (column_index < 0) + column_index = columns->Current; + IM_ASSERT(column_index < columns->Columns.Size); + + const float t = columns->Columns[column_index].OffsetNorm; + const float x_offset = ImLerp(columns->OffMinX, columns->OffMaxX, t); + return x_offset; +} + +static float GetColumnWidthEx(ImGuiOldColumns* columns, int column_index, bool before_resize = false) +{ + if (column_index < 0) + column_index = columns->Current; + + float offset_norm; + if (before_resize) + offset_norm = columns->Columns[column_index + 1].OffsetNormBeforeResize - columns->Columns[column_index].OffsetNormBeforeResize; + else + offset_norm = columns->Columns[column_index + 1].OffsetNorm - columns->Columns[column_index].OffsetNorm; + return ImGui::GetColumnOffsetFromNorm(columns, offset_norm); +} + +float ImGui::GetColumnWidth(int column_index) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + ImGuiOldColumns* columns = window->DC.CurrentColumns; + if (columns == NULL) + return GetContentRegionAvail().x; + + if (column_index < 0) + column_index = columns->Current; + return GetColumnOffsetFromNorm(columns, columns->Columns[column_index + 1].OffsetNorm - columns->Columns[column_index].OffsetNorm); +} + +void ImGui::SetColumnOffset(int column_index, float offset) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + ImGuiOldColumns* columns = window->DC.CurrentColumns; + IM_ASSERT(columns != NULL); + + if (column_index < 0) + column_index = columns->Current; + IM_ASSERT(column_index < columns->Columns.Size); + + const bool preserve_width = !(columns->Flags & ImGuiOldColumnFlags_NoPreserveWidths) && (column_index < columns->Count - 1); + const float width = preserve_width ? GetColumnWidthEx(columns, column_index, columns->IsBeingResized) : 0.0f; + + if (!(columns->Flags & ImGuiOldColumnFlags_NoForceWithinWindow)) + offset = ImMin(offset, columns->OffMaxX - g.Style.ColumnsMinSpacing * (columns->Count - column_index)); + columns->Columns[column_index].OffsetNorm = GetColumnNormFromOffset(columns, offset - columns->OffMinX); + + if (preserve_width) + SetColumnOffset(column_index + 1, offset + ImMax(g.Style.ColumnsMinSpacing, width)); +} + +void ImGui::SetColumnWidth(int column_index, float width) +{ + ImGuiWindow* window = GetCurrentWindowRead(); + ImGuiOldColumns* columns = window->DC.CurrentColumns; + IM_ASSERT(columns != NULL); + + if (column_index < 0) + column_index = columns->Current; + SetColumnOffset(column_index + 1, GetColumnOffset(column_index) + width); +} + +void ImGui::PushColumnClipRect(int column_index) +{ + ImGuiWindow* window = GetCurrentWindowRead(); + ImGuiOldColumns* columns = window->DC.CurrentColumns; + if (column_index < 0) + column_index = columns->Current; + + ImGuiOldColumnData* column = &columns->Columns[column_index]; + PushClipRect(column->ClipRect.Min, column->ClipRect.Max, false); +} + +// Get into the columns background draw command (which is generally the same draw command as before we called BeginColumns) +void ImGui::PushColumnsBackground() +{ + ImGuiWindow* window = GetCurrentWindowRead(); + ImGuiOldColumns* columns = window->DC.CurrentColumns; + if (columns->Count == 1) + return; + + // Optimization: avoid SetCurrentChannel() + PushClipRect() + columns->HostBackupClipRect = window->ClipRect; + SetWindowClipRectBeforeSetChannel(window, columns->HostInitialClipRect); + columns->Splitter.SetCurrentChannel(window->DrawList, 0); +} + +void ImGui::PopColumnsBackground() +{ + ImGuiWindow* window = GetCurrentWindowRead(); + ImGuiOldColumns* columns = window->DC.CurrentColumns; + if (columns->Count == 1) + return; + + // Optimization: avoid PopClipRect() + SetCurrentChannel() + SetWindowClipRectBeforeSetChannel(window, columns->HostBackupClipRect); + columns->Splitter.SetCurrentChannel(window->DrawList, columns->Current + 1); +} + +ImGuiOldColumns* ImGui::FindOrCreateColumns(ImGuiWindow* window, ImGuiID id) +{ + // We have few columns per window so for now we don't need bother much with turning this into a faster lookup. + for (int n = 0; n < window->ColumnsStorage.Size; n++) + if (window->ColumnsStorage[n].ID == id) + return &window->ColumnsStorage[n]; + + window->ColumnsStorage.push_back(ImGuiOldColumns()); + ImGuiOldColumns* columns = &window->ColumnsStorage.back(); + columns->ID = id; + return columns; +} + +ImGuiID ImGui::GetColumnsID(const char* str_id, int columns_count) +{ + ImGuiWindow* window = GetCurrentWindow(); + + // Differentiate column ID with an arbitrary prefix for cases where users name their columns set the same as another widget. + // In addition, when an identifier isn't explicitly provided we include the number of columns in the hash to make it uniquer. + PushID(0x11223347 + (str_id ? 0 : columns_count)); + ImGuiID id = window->GetID(str_id ? str_id : "columns"); + PopID(); + + return id; +} + +void ImGui::BeginColumns(const char* str_id, int columns_count, ImGuiOldColumnFlags flags) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = GetCurrentWindow(); + + IM_ASSERT(columns_count >= 1); + IM_ASSERT(window->DC.CurrentColumns == NULL); // Nested columns are currently not supported + + // Acquire storage for the columns set + ImGuiID id = GetColumnsID(str_id, columns_count); + ImGuiOldColumns* columns = FindOrCreateColumns(window, id); + IM_ASSERT(columns->ID == id); + columns->Current = 0; + columns->Count = columns_count; + columns->Flags = flags; + window->DC.CurrentColumns = columns; + window->DC.NavIsScrollPushableX = false; // Shortcut for NavUpdateCurrentWindowIsScrollPushableX(); + + columns->HostCursorPosY = window->DC.CursorPos.y; + columns->HostCursorMaxPosX = window->DC.CursorMaxPos.x; + columns->HostInitialClipRect = window->ClipRect; + columns->HostBackupParentWorkRect = window->ParentWorkRect; + window->ParentWorkRect = window->WorkRect; + + // Set state for first column + // We aim so that the right-most column will have the same clipping width as other after being clipped by parent ClipRect + const float column_padding = g.Style.ItemSpacing.x; + const float half_clip_extend_x = ImTrunc(ImMax(window->WindowPadding.x * 0.5f, window->WindowBorderSize)); + const float max_1 = window->WorkRect.Max.x + column_padding - ImMax(column_padding - window->WindowPadding.x, 0.0f); + const float max_2 = window->WorkRect.Max.x + half_clip_extend_x; + columns->OffMinX = window->DC.Indent.x - column_padding + ImMax(column_padding - window->WindowPadding.x, 0.0f); + columns->OffMaxX = ImMax(ImMin(max_1, max_2) - window->Pos.x, columns->OffMinX + 1.0f); + columns->LineMinY = columns->LineMaxY = window->DC.CursorPos.y; + + // Clear data if columns count changed + if (columns->Columns.Size != 0 && columns->Columns.Size != columns_count + 1) + columns->Columns.resize(0); + + // Initialize default widths + columns->IsFirstFrame = (columns->Columns.Size == 0); + if (columns->Columns.Size == 0) + { + columns->Columns.reserve(columns_count + 1); + for (int n = 0; n < columns_count + 1; n++) + { + ImGuiOldColumnData column; + column.OffsetNorm = n / (float)columns_count; + columns->Columns.push_back(column); + } + } + + for (int n = 0; n < columns_count; n++) + { + // Compute clipping rectangle + ImGuiOldColumnData* column = &columns->Columns[n]; + float clip_x1 = IM_ROUND(window->Pos.x + GetColumnOffset(n)); + float clip_x2 = IM_ROUND(window->Pos.x + GetColumnOffset(n + 1) - 1.0f); + column->ClipRect = ImRect(clip_x1, -FLT_MAX, clip_x2, +FLT_MAX); + column->ClipRect.ClipWithFull(window->ClipRect); + } + + if (columns->Count > 1) + { + columns->Splitter.Split(window->DrawList, 1 + columns->Count); + columns->Splitter.SetCurrentChannel(window->DrawList, 1); + PushColumnClipRect(0); + } + + // We don't generally store Indent.x inside ColumnsOffset because it may be manipulated by the user. + float offset_0 = GetColumnOffset(columns->Current); + float offset_1 = GetColumnOffset(columns->Current + 1); + float width = offset_1 - offset_0; + PushItemWidth(width * 0.65f); + window->DC.ColumnsOffset.x = ImMax(column_padding - window->WindowPadding.x, 0.0f); + window->DC.CursorPos.x = IM_TRUNC(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x); + window->WorkRect.Max.x = window->Pos.x + offset_1 - column_padding; + window->WorkRect.Max.y = window->ContentRegionRect.Max.y; +} + +void ImGui::NextColumn() +{ + ImGuiWindow* window = GetCurrentWindow(); + if (window->SkipItems || window->DC.CurrentColumns == NULL) + return; + + ImGuiContext& g = *GImGui; + ImGuiOldColumns* columns = window->DC.CurrentColumns; + + if (columns->Count == 1) + { + window->DC.CursorPos.x = IM_TRUNC(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x); + IM_ASSERT(columns->Current == 0); + return; + } + + // Next column + if (++columns->Current == columns->Count) + columns->Current = 0; + + PopItemWidth(); + + // Optimization: avoid PopClipRect() + SetCurrentChannel() + PushClipRect() + // (which would needlessly attempt to update commands in the wrong channel, then pop or overwrite them), + ImGuiOldColumnData* column = &columns->Columns[columns->Current]; + SetWindowClipRectBeforeSetChannel(window, column->ClipRect); + columns->Splitter.SetCurrentChannel(window->DrawList, columns->Current + 1); + + const float column_padding = g.Style.ItemSpacing.x; + columns->LineMaxY = ImMax(columns->LineMaxY, window->DC.CursorPos.y); + if (columns->Current > 0) + { + // Columns 1+ ignore IndentX (by canceling it out) + // FIXME-COLUMNS: Unnecessary, could be locked? + window->DC.ColumnsOffset.x = GetColumnOffset(columns->Current) - window->DC.Indent.x + column_padding; + } + else + { + // New row/line: column 0 honor IndentX. + window->DC.ColumnsOffset.x = ImMax(column_padding - window->WindowPadding.x, 0.0f); + window->DC.IsSameLine = false; + columns->LineMinY = columns->LineMaxY; + } + window->DC.CursorPos.x = IM_TRUNC(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x); + window->DC.CursorPos.y = columns->LineMinY; + window->DC.CurrLineSize = ImVec2(0.0f, 0.0f); + window->DC.CurrLineTextBaseOffset = 0.0f; + + // FIXME-COLUMNS: Share code with BeginColumns() - move code on columns setup. + float offset_0 = GetColumnOffset(columns->Current); + float offset_1 = GetColumnOffset(columns->Current + 1); + float width = offset_1 - offset_0; + PushItemWidth(width * 0.65f); + window->WorkRect.Max.x = window->Pos.x + offset_1 - column_padding; +} + +void ImGui::EndColumns() +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = GetCurrentWindow(); + ImGuiOldColumns* columns = window->DC.CurrentColumns; + IM_ASSERT(columns != NULL); + + PopItemWidth(); + if (columns->Count > 1) + { + PopClipRect(); + columns->Splitter.Merge(window->DrawList); + } + + const ImGuiOldColumnFlags flags = columns->Flags; + columns->LineMaxY = ImMax(columns->LineMaxY, window->DC.CursorPos.y); + window->DC.CursorPos.y = columns->LineMaxY; + if (!(flags & ImGuiOldColumnFlags_GrowParentContentsSize)) + window->DC.CursorMaxPos.x = columns->HostCursorMaxPosX; // Restore cursor max pos, as columns don't grow parent + + // Draw columns borders and handle resize + // The IsBeingResized flag ensure we preserve pre-resize columns width so back-and-forth are not lossy + bool is_being_resized = false; + if (!(flags & ImGuiOldColumnFlags_NoBorder) && !window->SkipItems) + { + // We clip Y boundaries CPU side because very long triangles are mishandled by some GPU drivers. + const float y1 = ImMax(columns->HostCursorPosY, window->ClipRect.Min.y); + const float y2 = ImMin(window->DC.CursorPos.y, window->ClipRect.Max.y); + int dragging_column = -1; + for (int n = 1; n < columns->Count; n++) + { + ImGuiOldColumnData* column = &columns->Columns[n]; + float x = window->Pos.x + GetColumnOffset(n); + const ImGuiID column_id = columns->ID + ImGuiID(n); + const float column_hit_hw = ImTrunc(COLUMNS_HIT_RECT_HALF_THICKNESS * g.CurrentDpiScale); + const ImRect column_hit_rect(ImVec2(x - column_hit_hw, y1), ImVec2(x + column_hit_hw, y2)); + if (!ItemAdd(column_hit_rect, column_id, NULL, ImGuiItemFlags_NoNav)) + continue; + + bool hovered = false, held = false; + if (!(flags & ImGuiOldColumnFlags_NoResize)) + { + ButtonBehavior(column_hit_rect, column_id, &hovered, &held); + if (hovered || held) + SetMouseCursor(ImGuiMouseCursor_ResizeEW); + if (held && !(column->Flags & ImGuiOldColumnFlags_NoResize)) + dragging_column = n; + } + + // Draw column + const ImU32 col = GetColorU32(held ? ImGuiCol_SeparatorActive : hovered ? ImGuiCol_SeparatorHovered : ImGuiCol_Separator); + const float xi = IM_TRUNC(x); + window->DrawList->AddLine(ImVec2(xi, y1 + 1.0f), ImVec2(xi, y2), col); + } + + // Apply dragging after drawing the column lines, so our rendered lines are in sync with how items were displayed during the frame. + if (dragging_column != -1) + { + if (!columns->IsBeingResized) + for (int n = 0; n < columns->Count + 1; n++) + columns->Columns[n].OffsetNormBeforeResize = columns->Columns[n].OffsetNorm; + columns->IsBeingResized = is_being_resized = true; + float x = GetDraggedColumnOffset(columns, dragging_column); + SetColumnOffset(dragging_column, x); + } + } + columns->IsBeingResized = is_being_resized; + + window->WorkRect = window->ParentWorkRect; + window->ParentWorkRect = columns->HostBackupParentWorkRect; + window->DC.CurrentColumns = NULL; + window->DC.ColumnsOffset.x = 0.0f; + window->DC.CursorPos.x = IM_TRUNC(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x); + NavUpdateCurrentWindowIsScrollPushableX(); +} + +void ImGui::Columns(int columns_count, const char* id, bool borders) +{ + ImGuiWindow* window = GetCurrentWindow(); + IM_ASSERT(columns_count >= 1); + + ImGuiOldColumnFlags flags = (borders ? 0 : ImGuiOldColumnFlags_NoBorder); + //flags |= ImGuiOldColumnFlags_NoPreserveWidths; // NB: Legacy behavior + ImGuiOldColumns* columns = window->DC.CurrentColumns; + if (columns != NULL && columns->Count == columns_count && columns->Flags == flags) + return; + + if (columns != NULL) + EndColumns(); + + if (columns_count != 1) + BeginColumns(id, columns_count, flags); +} + +//------------------------------------------------------------------------- + +#endif // #ifndef IMGUI_DISABLE diff --git a/imgui/imgui_widgets.cpp b/imgui/imgui_widgets.cpp index d9ca11e5b..0fd9cbb33 100644 --- a/imgui/imgui_widgets.cpp +++ b/imgui/imgui_widgets.cpp @@ -1,4 +1,4 @@ -// dear imgui, v1.73 +// dear imgui, v1.91b // (widgets code) /* @@ -18,6 +18,10 @@ Index of this file: // [SECTION] Widgets: ColorEdit, ColorPicker, ColorButton, etc. // [SECTION] Widgets: TreeNode, CollapsingHeader, etc. // [SECTION] Widgets: Selectable +// [SECTION] Widgets: Typing-Select support +// [SECTION] Widgets: Box-Select support +// [SECTION] Widgets: Multi-Select support +// [SECTION] Widgets: Multi-Select helpers // [SECTION] Widgets: ListBox // [SECTION] Widgets: PlotLines, PlotHistogram // [SECTION] Widgets: Value helpers @@ -28,57 +32,76 @@ Index of this file: */ -#ifdef DBG_NEW -#undef new -#endif - #if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS) #define _CRT_SECURE_NO_WARNINGS #endif -#include "imgui.h" #ifndef IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS #endif + +#include "imgui.h" +#ifndef IMGUI_DISABLE #include "imgui_internal.h" -#include // toupper -#if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier -#include // intptr_t -#else +// System includes #include // intptr_t -#endif -#include +//------------------------------------------------------------------------- +// Warnings +//------------------------------------------------------------------------- // Visual Studio warnings #ifdef _MSC_VER -#pragma warning (disable: 4127) // condition expression is constant -#pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen +#pragma warning (disable: 4127) // condition expression is constant +#pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen +#if defined(_MSC_VER) && _MSC_VER >= 1922 // MSVC 2019 16.2 or later +#pragma warning (disable: 5054) // operator '|': deprecated between enumerations of different types +#endif +#pragma warning (disable: 26451) // [Static Analyzer] Arithmetic overflow : Using operator 'xxx' on a 4 byte value and then casting the result to a 8 byte value. Cast the value to the wider type before calling operator 'xxx' to avoid overflow(io.2). +#pragma warning (disable: 26812) // [Static Analyzer] The enum type 'xxx' is unscoped. Prefer 'enum class' over 'enum' (Enum.3). #endif // Clang/GCC warnings with -Weverything #if defined(__clang__) -#pragma clang diagnostic ignored "-Wold-style-cast" // warning : use of old-style cast // yes, they are more terse. -#pragma clang diagnostic ignored "-Wfloat-equal" // warning : comparing floating point with == or != is unsafe // storing and comparing against same constants (typically 0.0f) is ok. -#pragma clang diagnostic ignored "-Wformat-nonliteral" // warning : format string is not a string literal // passing non-literal to vsnformat(). yes, user passing incorrect format strings can crash the code. -#pragma clang diagnostic ignored "-Wsign-conversion" // warning : implicit conversion changes signedness // -#if __has_warning("-Wzero-as-null-pointer-constant") -#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" // warning : zero as null pointer constant // some standard header variations use #define NULL 0 -#endif -#if __has_warning("-Wdouble-promotion") -#pragma clang diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function // using printf() is a misery with this as C++ va_arg ellipsis changes float to double. +#if __has_warning("-Wunknown-warning-option") +#pragma clang diagnostic ignored "-Wunknown-warning-option" // warning: unknown warning group 'xxx' // not all warnings are known by all Clang versions and they tend to be rename-happy.. so ignoring warnings triggers new warnings on some configuration. Great! #endif +#pragma clang diagnostic ignored "-Wunknown-pragmas" // warning: unknown warning group 'xxx' +#pragma clang diagnostic ignored "-Wold-style-cast" // warning: use of old-style cast // yes, they are more terse. +#pragma clang diagnostic ignored "-Wfloat-equal" // warning: comparing floating point with == or != is unsafe // storing and comparing against same constants (typically 0.0f) is ok. +#pragma clang diagnostic ignored "-Wformat" // warning: format specifies type 'int' but the argument has type 'unsigned int' +#pragma clang diagnostic ignored "-Wformat-nonliteral" // warning: format string is not a string literal // passing non-literal to vsnformat(). yes, user passing incorrect format strings can crash the code. +#pragma clang diagnostic ignored "-Wsign-conversion" // warning: implicit conversion changes signedness +#pragma clang diagnostic ignored "-Wunused-macros" // warning: macro is not used // we define snprintf/vsnprintf on Windows so they are available, but not always used. +#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" // warning: zero as null pointer constant // some standard header variations use #define NULL 0 +#pragma clang diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function // using printf() is a misery with this as C++ va_arg ellipsis changes float to double. +#pragma clang diagnostic ignored "-Wenum-enum-conversion" // warning: bitwise operation between different enumeration types ('XXXFlags_' and 'XXXFlagsPrivate_') +#pragma clang diagnostic ignored "-Wdeprecated-enum-enum-conversion"// warning: bitwise operation between different enumeration types ('XXXFlags_' and 'XXXFlagsPrivate_') is deprecated +#pragma clang diagnostic ignored "-Wimplicit-int-float-conversion" // warning: implicit conversion from 'xxx' to 'float' may lose precision +#pragma clang diagnostic ignored "-Wunsafe-buffer-usage" // warning: 'xxx' is an unsafe pointer used for buffer access +#pragma clang diagnostic ignored "-Wnontrivial-memaccess" // warning: first argument in call to 'memset' is a pointer to non-trivially copyable type +#pragma clang diagnostic ignored "-Wswitch-default" // warning: 'switch' missing 'default' label #elif defined(__GNUC__) -#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind -#pragma GCC diagnostic ignored "-Wformat-nonliteral" // warning: format not a string literal, format string not checked -#pragma GCC diagnostic ignored "-Wclass-memaccess" // [__GNUC__ >= 8] warning: 'memset/memcpy' clearing/writing an object of type 'xxxx' with no trivial copy-assignment; use assignment or value-initialization instead +#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind +#pragma GCC diagnostic ignored "-Wfloat-equal" // warning: comparing floating-point with '==' or '!=' is unsafe +#pragma GCC diagnostic ignored "-Wformat" // warning: format '%p' expects argument of type 'int'/'void*', but argument X has type 'unsigned int'/'ImGuiWindow*' +#pragma GCC diagnostic ignored "-Wformat-nonliteral" // warning: format not a string literal, format string not checked +#pragma GCC diagnostic ignored "-Wdeprecated-enum-enum-conversion" // warning: bitwise operation between different enumeration types ('XXXFlags_' and 'XXXFlagsPrivate_') is deprecated +#pragma GCC diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function +#pragma GCC diagnostic ignored "-Wstrict-overflow" // warning: assuming signed overflow does not occur when simplifying division / ..when changing X +- C1 cmp C2 to X cmp C2 -+ C1 +#pragma GCC diagnostic ignored "-Wclass-memaccess" // [__GNUC__ >= 8] warning: 'memset/memcpy' clearing/writing an object of type 'xxxx' with no trivial copy-assignment; use assignment or value-initialization instead +#pragma GCC diagnostic ignored "-Wcast-qual" // warning: cast from type 'const xxxx *' to type 'xxxx *' casts away qualifiers #endif //------------------------------------------------------------------------- // Data //------------------------------------------------------------------------- +// Widgets +static const float DRAGDROP_HOLD_TO_OPEN_TIMER = 0.70f; // Time for drag-hold to activate items accepting the ImGuiButtonFlags_PressedOnDragDropHold button behavior. +static const float DRAG_MOUSE_THRESHOLD_FACTOR = 0.50f; // Multiplier for the default value of io.MouseDragThreshold to make DragFloat/DragInt react faster to mouse drags. + // Those MIN/MAX values are not define because we need to point to them static const signed char IM_S8_MIN = -128; static const signed char IM_S8_MAX = 127; @@ -111,13 +134,14 @@ static const ImU64 IM_U64_MAX = (2ULL * 9223372036854775807LL + 1); //------------------------------------------------------------------------- // For InputTextEx() -static bool InputTextFilterCharacter(unsigned int* p_char, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data); -static int InputTextCalcTextLenAndLineCount(const char* text_begin, const char** out_text_end); -static ImVec2 InputTextCalcTextSizeW(const ImWchar* text_begin, const ImWchar* text_end, const ImWchar** remaining = NULL, ImVec2* out_offset = NULL, bool stop_on_new_line = false); +static bool InputTextFilterCharacter(ImGuiContext* ctx, unsigned int* p_char, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data, bool input_source_is_clipboard = false); +static int InputTextCalcTextLenAndLineCount(const char* text_begin, const char** out_text_end); +static ImVec2 InputTextCalcTextSize(ImGuiContext* ctx, const char* text_begin, const char* text_end, const char** remaining = NULL, ImVec2* out_offset = NULL, bool stop_on_new_line = false); //------------------------------------------------------------------------- // [SECTION] Widgets: Text, etc. //------------------------------------------------------------------------- +// - TextEx() [Internal] // - TextUnformatted() // - Text() // - TextV() @@ -138,17 +162,35 @@ void ImGui::TextEx(const char* text, const char* text_end, ImGuiTextFlags flags) ImGuiWindow* window = GetCurrentWindow(); if (window->SkipItems) return; - ImGuiContext& g = *GImGui; - IM_ASSERT(text != NULL); + + // Accept null ranges + if (text == text_end) + text = text_end = ""; + + // Calculate length const char* text_begin = text; if (text_end == NULL) - text_end = text + strlen(text); // FIXME-OPT + text_end = text + ImStrlen(text); // FIXME-OPT const ImVec2 text_pos(window->DC.CursorPos.x, window->DC.CursorPos.y + window->DC.CurrLineTextBaseOffset); const float wrap_pos_x = window->DC.TextWrapPos; const bool wrap_enabled = (wrap_pos_x >= 0.0f); - if (text_end - text > 2000 && !wrap_enabled) + if (text_end - text <= 2000 || wrap_enabled) + { + // Common case + const float wrap_width = wrap_enabled ? CalcWrapWidthForPos(window->DC.CursorPos, wrap_pos_x) : 0.0f; + const ImVec2 text_size = CalcTextSize(text_begin, text_end, false, wrap_width); + + ImRect bb(text_pos, text_pos + text_size); + ItemSize(text_size, 0.0f); + if (!ItemAdd(bb, 0)) + return; + + // Render (we don't hide text after ## in this end-user function) + RenderTextWrapped(bb.Min, text_begin, text_end, wrap_width); + } + else { // Long text! // Perform manual coarse clipping to optimize for long multi-line text @@ -157,7 +199,7 @@ void ImGui::TextEx(const char* text, const char* text_end, ImGuiTextFlags flags) // - We use memchr(), pay attention that well optimized versions of those str/mem functions are much faster than a casually written loop. const char* line = text; const float line_height = GetTextLineHeight(); - ImVec2 text_size(0,0); + ImVec2 text_size(0, 0); // Lines to skip (can't skip when logging text) ImVec2 pos = text_pos; @@ -169,7 +211,7 @@ void ImGui::TextEx(const char* text, const char* text_end, ImGuiTextFlags flags) int lines_skipped = 0; while (line < text_end && lines_skipped < lines_skippable) { - const char* line_end = (const char*)memchr(line, '\n', text_end - line); + const char* line_end = (const char*)ImMemchr(line, '\n', text_end - line); if (!line_end) line_end = text_end; if ((flags & ImGuiTextFlags_NoWidthForLargeClippedText) == 0) @@ -187,10 +229,10 @@ void ImGui::TextEx(const char* text, const char* text_end, ImGuiTextFlags flags) ImRect line_rect(pos, pos + ImVec2(FLT_MAX, line_height)); while (line < text_end) { - if (IsClippedEx(line_rect, 0, false)) + if (IsClippedEx(line_rect, 0)) break; - const char* line_end = (const char*)memchr(line, '\n', text_end - line); + const char* line_end = (const char*)ImMemchr(line, '\n', text_end - line); if (!line_end) line_end = text_end; text_size.x = ImMax(text_size.x, CalcTextSize(line, line_end).x); @@ -205,7 +247,7 @@ void ImGui::TextEx(const char* text, const char* text_end, ImGuiTextFlags flags) int lines_skipped = 0; while (line < text_end) { - const char* line_end = (const char*)memchr(line, '\n', text_end - line); + const char* line_end = (const char*)ImMemchr(line, '\n', text_end - line); if (!line_end) line_end = text_end; if ((flags & ImGuiTextFlags_NoWidthForLargeClippedText) == 0) @@ -218,22 +260,9 @@ void ImGui::TextEx(const char* text, const char* text_end, ImGuiTextFlags flags) text_size.y = (pos - text_pos).y; ImRect bb(text_pos, text_pos + text_size); - ItemSize(text_size); + ItemSize(text_size, 0.0f); ItemAdd(bb, 0); } - else - { - const float wrap_width = wrap_enabled ? CalcWrapWidthForPos(window->DC.CursorPos, wrap_pos_x) : 0.0f; - const ImVec2 text_size = CalcTextSize(text_begin, text_end, false, wrap_width); - - ImRect bb(text_pos, text_pos + text_size); - ItemSize(text_size); - if (!ItemAdd(bb, 0)) - return; - - // Render (we don't hide text after ## in this end-user function) - RenderTextWrapped(bb.Min, text_begin, text_end, wrap_width); - } } void ImGui::TextUnformatted(const char* text, const char* text_end) @@ -255,9 +284,9 @@ void ImGui::TextV(const char* fmt, va_list args) if (window->SkipItems) return; - ImGuiContext& g = *GImGui; - const char* text_end = g.TempBuffer + ImFormatStringV(g.TempBuffer, IM_ARRAYSIZE(g.TempBuffer), fmt, args); - TextEx(g.TempBuffer, text_end, ImGuiTextFlags_NoWidthForLargeClippedText); + const char* text, *text_end; + ImFormatStringToTempBufferV(&text, &text_end, fmt, args); + TextEx(text, text_end, ImGuiTextFlags_NoWidthForLargeClippedText); } void ImGui::TextColored(const ImVec4& col, const char* fmt, ...) @@ -285,7 +314,8 @@ void ImGui::TextDisabled(const char* fmt, ...) void ImGui::TextDisabledV(const char* fmt, va_list args) { - PushStyleColor(ImGuiCol_Text, GImGui->Style.Colors[ImGuiCol_TextDisabled]); + ImGuiContext& g = *GImGui; + PushStyleColor(ImGuiCol_Text, g.Style.Colors[ImGuiCol_TextDisabled]); TextV(fmt, args); PopStyleColor(); } @@ -300,8 +330,8 @@ void ImGui::TextWrapped(const char* fmt, ...) void ImGui::TextWrappedV(const char* fmt, va_list args) { - ImGuiWindow* window = GetCurrentWindow(); - bool need_backup = (window->DC.TextWrapPos < 0.0f); // Keep existing wrap position if one is already set + ImGuiContext& g = *GImGui; + const bool need_backup = (g.CurrentWindow->DC.TextWrapPos < 0.0f); // Keep existing wrap position if one is already set if (need_backup) PushTextWrapPos(0.0f); TextV(fmt, args); @@ -328,17 +358,20 @@ void ImGui::LabelTextV(const char* label, const char* fmt, va_list args) const ImGuiStyle& style = g.Style; const float w = CalcItemWidth(); + const char* value_text_begin, *value_text_end; + ImFormatStringToTempBufferV(&value_text_begin, &value_text_end, fmt, args); + const ImVec2 value_size = CalcTextSize(value_text_begin, value_text_end, false); const ImVec2 label_size = CalcTextSize(label, NULL, true); - const ImRect value_bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(w, label_size.y + style.FramePadding.y*2)); - const ImRect total_bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(w + (label_size.x > 0.0f ? style.ItemInnerSpacing.x : 0.0f), style.FramePadding.y*2) + label_size); + + const ImVec2 pos = window->DC.CursorPos; + const ImRect value_bb(pos, pos + ImVec2(w, value_size.y + style.FramePadding.y * 2)); + const ImRect total_bb(pos, pos + ImVec2(w + (label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f), ImMax(value_size.y, label_size.y) + style.FramePadding.y * 2)); ItemSize(total_bb, style.FramePadding.y); if (!ItemAdd(total_bb, 0)) return; // Render - const char* value_text_begin = &g.TempBuffer[0]; - const char* value_text_end = value_text_begin + ImFormatStringV(g.TempBuffer, IM_ARRAYSIZE(g.TempBuffer), fmt, args); - RenderTextClipped(value_bb.Min, value_bb.Max, value_text_begin, value_text_end, NULL, ImVec2(0.0f,0.5f)); + RenderTextClipped(value_bb.Min + style.FramePadding, value_bb.Max, value_text_begin, value_text_end, &value_size, ImVec2(0.0f, 0.0f)); if (label_size.x > 0.0f) RenderText(ImVec2(value_bb.Max.x + style.ItemInnerSpacing.x, value_bb.Min.y + style.FramePadding.y), label); } @@ -361,20 +394,21 @@ void ImGui::BulletTextV(const char* fmt, va_list args) ImGuiContext& g = *GImGui; const ImGuiStyle& style = g.Style; - const char* text_begin = g.TempBuffer; - const char* text_end = text_begin + ImFormatStringV(g.TempBuffer, IM_ARRAYSIZE(g.TempBuffer), fmt, args); + const char* text_begin, *text_end; + ImFormatStringToTempBufferV(&text_begin, &text_end, fmt, args); const ImVec2 label_size = CalcTextSize(text_begin, text_end, false); - const float text_base_offset_y = ImMax(0.0f, window->DC.CurrLineTextBaseOffset); // Latch before ItemSize changes it - const float line_height = ImMax(ImMin(window->DC.CurrLineSize.y, g.FontSize + g.Style.FramePadding.y*2), g.FontSize); - const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(g.FontSize + (label_size.x > 0.0f ? (label_size.x + style.FramePadding.x*2) : 0.0f), ImMax(line_height, label_size.y))); // Empty text doesn't add padding - ItemSize(bb); + const ImVec2 total_size = ImVec2(g.FontSize + (label_size.x > 0.0f ? (label_size.x + style.FramePadding.x * 2) : 0.0f), label_size.y); // Empty text doesn't add padding + ImVec2 pos = window->DC.CursorPos; + pos.y += window->DC.CurrLineTextBaseOffset; + ItemSize(total_size, 0.0f); + const ImRect bb(pos, pos + total_size); if (!ItemAdd(bb, 0)) return; // Render ImU32 text_col = GetColorU32(ImGuiCol_Text); - RenderBullet(window->DrawList, bb.Min + ImVec2(style.FramePadding.x + g.FontSize*0.5f, line_height*0.5f), text_col); - RenderText(bb.Min+ImVec2(g.FontSize + style.FramePadding.x*2, text_base_offset_y), text_begin, text_end, false); + RenderBullet(window->DrawList, bb.Min + ImVec2(style.FramePadding.x + g.FontSize * 0.5f, g.FontSize * 0.5f), text_col); + RenderText(bb.Min + ImVec2(g.FontSize + style.FramePadding.x * 2, 0.0f), text_begin, text_end, false); } //------------------------------------------------------------------------- @@ -387,15 +421,19 @@ void ImGui::BulletTextV(const char* fmt, va_list args) // - ArrowButton() // - CloseButton() [Internal] // - CollapseButton() [Internal] -// - ScrollbarEx() [Internal] +// - GetWindowScrollbarID() [Internal] +// - GetWindowScrollbarRect() [Internal] // - Scrollbar() [Internal] +// - ScrollbarEx() [Internal] // - Image() // - ImageButton() // - Checkbox() +// - CheckboxFlagsT() [Internal] // - CheckboxFlags() // - RadioButton() // - ProgressBar() // - Bullet() +// - Hyperlink() //------------------------------------------------------------------------- // The ButtonBehavior() function is key to many interactions and used by many/most widgets. @@ -441,7 +479,7 @@ void ImGui::BulletTextV(const char* fmt, va_list args) // - PressedOnDragDropHold can generally be associated with any flag. // - PressedOnDoubleClick can be associated by PressedOnClickRelease/PressedOnRelease, in which case the second release event won't be reported. //------------------------------------------------------------------------------------------------------------------------------------------------ -// The behavior of the return-value changes when ImGuiButtonFlags_Repeat is set: +// The behavior of the return-value changes when ImGuiItemFlags_ButtonRepeat is set: // Repeat+ Repeat+ Repeat+ Repeat+ // PressedOnClickRelease PressedOnClick PressedOnRelease PressedOnDoubleClick //------------------------------------------------------------------------------------------------------------------------------------------------- @@ -452,39 +490,46 @@ void ImGui::BulletTextV(const char* fmt, va_list args) // Frame N + RepeatDelay + RepeatRate*N true true - true //------------------------------------------------------------------------------------------------------------------------------------------------- +// - FIXME: For refactor we could output flags, incl mouse hovered vs nav keyboard vs nav triggered etc. +// And better standardize how widgets use 'GetColor32((held && hovered) ? ... : hovered ? ...)' vs 'GetColor32(held ? ... : hovered ? ...);' +// For mouse feedback we typically prefer the 'held && hovered' test, but for nav feedback not always. Outputting hovered=true on Activation may be misleading. +// - Since v1.91.2 (Sept 2024) we included io.ConfigDebugHighlightIdConflicts feature. +// One idiom which was previously valid which will now emit a warning is when using multiple overlayed ButtonBehavior() +// with same ID and different MouseButton (see #8030). You can fix it by: +// (1) switching to use a single ButtonBehavior() with multiple _MouseButton flags. +// or (2) surrounding those calls with PushItemFlag(ImGuiItemFlags_AllowDuplicateId, true); ... PopItemFlag() bool ImGui::ButtonBehavior(const ImRect& bb, ImGuiID id, bool* out_hovered, bool* out_held, ImGuiButtonFlags flags) { ImGuiContext& g = *GImGui; ImGuiWindow* window = GetCurrentWindow(); - if (flags & ImGuiButtonFlags_Disabled) - { - if (out_hovered) *out_hovered = false; - if (out_held) *out_held = false; - if (g.ActiveId == id) ClearActiveID(); - return false; - } + // Default behavior inherited from item flags + // Note that _both_ ButtonFlags and ItemFlags are valid sources, so copy one into the item_flags and only check that. + ImGuiItemFlags item_flags = (g.LastItemData.ID == id ? g.LastItemData.ItemFlags : g.CurrentItemFlags); + if (flags & ImGuiButtonFlags_AllowOverlap) + item_flags |= ImGuiItemFlags_AllowOverlap; - // Default behavior requires click+release on same spot - if ((flags & (ImGuiButtonFlags_PressedOnClickRelease | ImGuiButtonFlags_PressedOnClick | ImGuiButtonFlags_PressedOnRelease | ImGuiButtonFlags_PressedOnDoubleClick)) == 0) - flags |= ImGuiButtonFlags_PressedOnClickRelease; + // Default only reacts to left mouse button + if ((flags & ImGuiButtonFlags_MouseButtonMask_) == 0) + flags |= ImGuiButtonFlags_MouseButtonLeft; + + // Default behavior requires click + release inside bounding box + if ((flags & ImGuiButtonFlags_PressedOnMask_) == 0) + flags |= (item_flags & ImGuiItemFlags_ButtonRepeat) ? ImGuiButtonFlags_PressedOnClick : ImGuiButtonFlags_PressedOnDefault_; ImGuiWindow* backup_hovered_window = g.HoveredWindow; - const bool flatten_hovered_children = (flags & ImGuiButtonFlags_FlattenChildren) && g.HoveredRootWindow == window; + const bool flatten_hovered_children = (flags & ImGuiButtonFlags_FlattenChildren) && g.HoveredWindow && g.HoveredWindow->RootWindowDockTree == window->RootWindowDockTree; if (flatten_hovered_children) g.HoveredWindow = window; #ifdef IMGUI_ENABLE_TEST_ENGINE - if (id != 0 && window->DC.LastItemId != id) - ImGuiTestEngineHook_ItemAdd(&g, bb, id); + // Alternate registration spot, for when caller didn't use ItemAdd() + if (g.LastItemData.ID != id) + IMGUI_TEST_ENGINE_ITEM_ADD(id, bb, NULL); #endif bool pressed = false; - bool hovered = ItemHoverable(bb, id); - - // Drag source doesn't report as hovered - if (hovered && g.DragDropActive && g.DragDropPayload.SourceId == id && !(g.DragDropSourceFlags & ImGuiDragDropFlags_SourceNoDisableHover)) - hovered = false; + bool hovered = ItemHoverable(bb, id, item_flags); // Special mode for Drag and Drop where holding button pressed for a long time while dragging another item triggers the button if (g.DragDropActive && (flags & ImGuiButtonFlags_PressedOnDragDropHold) && !(g.DragDropSourceFlags & ImGuiDragDropFlags_SourceNoHoldToOpenOthers)) @@ -492,9 +537,10 @@ bool ImGui::ButtonBehavior(const ImRect& bb, ImGuiID id, bool* out_hovered, bool { hovered = true; SetHoveredID(id); - if (CalcTypematicPressedRepeatAmount(g.HoveredIdTimer + 0.0001f, g.HoveredIdTimer + 0.0001f - g.IO.DeltaTime, 0.01f, 0.70f)) // FIXME: Our formula for CalcTypematicPressedRepeatAmount() is fishy + if (g.HoveredIdTimer - g.IO.DeltaTime <= DRAGDROP_HOLD_TO_OPEN_TIMER && g.HoveredIdTimer >= DRAGDROP_HOLD_TO_OPEN_TIMER) { pressed = true; + g.DragDropHoldJustPressedId = id; FocusWindow(window); } } @@ -502,105 +548,173 @@ bool ImGui::ButtonBehavior(const ImRect& bb, ImGuiID id, bool* out_hovered, bool if (flatten_hovered_children) g.HoveredWindow = backup_hovered_window; - // AllowOverlap mode (rarely used) requires previous frame HoveredId to be null or to match. This allows using patterns where a later submitted widget overlaps a previous one. - if (hovered && (flags & ImGuiButtonFlags_AllowItemOverlap) && (g.HoveredIdPreviousFrame != id && g.HoveredIdPreviousFrame != 0)) - hovered = false; - - // Mouse + // Mouse handling + const ImGuiID test_owner_id = (flags & ImGuiButtonFlags_NoTestKeyOwner) ? ImGuiKeyOwner_Any : id; if (hovered) { - if (!(flags & ImGuiButtonFlags_NoKeyModifiers) || (!g.IO.KeyCtrl && !g.IO.KeyShift && !g.IO.KeyAlt)) + IM_ASSERT(id != 0); // Lazily check inside rare path. + + // Poll mouse buttons + // - 'mouse_button_clicked' is generally carried into ActiveIdMouseButton when setting ActiveId. + // - Technically we only need some values in one code path, but since this is gated by hovered test this is fine. + int mouse_button_clicked = -1; + int mouse_button_released = -1; + for (int button = 0; button < 3; button++) + if (flags & (ImGuiButtonFlags_MouseButtonLeft << button)) // Handle ImGuiButtonFlags_MouseButtonRight and ImGuiButtonFlags_MouseButtonMiddle here. + { + if (IsMouseClicked(button, ImGuiInputFlags_None, test_owner_id) && mouse_button_clicked == -1) { mouse_button_clicked = button; } + if (IsMouseReleased(button, test_owner_id) && mouse_button_released == -1) { mouse_button_released = button; } + } + + // Process initial action + const bool mods_ok = !(flags & ImGuiButtonFlags_NoKeyModsAllowed) || (!g.IO.KeyCtrl && !g.IO.KeyShift && !g.IO.KeyAlt); + if (mods_ok) { - if ((flags & ImGuiButtonFlags_PressedOnClickRelease) && g.IO.MouseClicked[0]) + if (mouse_button_clicked != -1 && g.ActiveId != id) { - SetActiveID(id, window); - if (!(flags & ImGuiButtonFlags_NoNavFocus)) - SetFocusID(id, window); - FocusWindow(window); - } - if (((flags & ImGuiButtonFlags_PressedOnClick) && g.IO.MouseClicked[0]) || ((flags & ImGuiButtonFlags_PressedOnDoubleClick) && g.IO.MouseDoubleClicked[0])) - { - pressed = true; - if (flags & ImGuiButtonFlags_NoHoldingActiveID) - ClearActiveID(); - else - SetActiveID(id, window); // Hold on ID - FocusWindow(window); - } - if ((flags & ImGuiButtonFlags_PressedOnRelease) && g.IO.MouseReleased[0]) - { - if (!((flags & ImGuiButtonFlags_Repeat) && g.IO.MouseDownDurationPrev[0] >= g.IO.KeyRepeatDelay)) // Repeat mode trumps + if (!(flags & ImGuiButtonFlags_NoSetKeyOwner)) + SetKeyOwner(MouseButtonToKey(mouse_button_clicked), id); + if (flags & (ImGuiButtonFlags_PressedOnClickRelease | ImGuiButtonFlags_PressedOnClickReleaseAnywhere)) + { + SetActiveID(id, window); + g.ActiveIdMouseButton = mouse_button_clicked; + if (!(flags & ImGuiButtonFlags_NoNavFocus)) + { + SetFocusID(id, window); + FocusWindow(window); + } + else + { + FocusWindow(window, ImGuiFocusRequestFlags_RestoreFocusedChild); // Still need to focus and bring to front, but try to avoid losing NavId when navigating a child + } + } + if ((flags & ImGuiButtonFlags_PressedOnClick) || ((flags & ImGuiButtonFlags_PressedOnDoubleClick) && g.IO.MouseClickedCount[mouse_button_clicked] == 2)) + { pressed = true; - ClearActiveID(); + if (flags & ImGuiButtonFlags_NoHoldingActiveId) + ClearActiveID(); + else + SetActiveID(id, window); // Hold on ID + g.ActiveIdMouseButton = mouse_button_clicked; + if (!(flags & ImGuiButtonFlags_NoNavFocus)) + { + SetFocusID(id, window); + FocusWindow(window); + } + else + { + FocusWindow(window, ImGuiFocusRequestFlags_RestoreFocusedChild); // Still need to focus and bring to front, but try to avoid losing NavId when navigating a child + } + } + } + if (flags & ImGuiButtonFlags_PressedOnRelease) + { + if (mouse_button_released != -1) + { + const bool has_repeated_at_least_once = (item_flags & ImGuiItemFlags_ButtonRepeat) && g.IO.MouseDownDurationPrev[mouse_button_released] >= g.IO.KeyRepeatDelay; // Repeat mode trumps on release behavior + if (!has_repeated_at_least_once) + pressed = true; + if (!(flags & ImGuiButtonFlags_NoNavFocus)) + SetFocusID(id, window); // FIXME: Lack of FocusWindow() call here is inconsistent with other paths. Research why. + ClearActiveID(); + } } // 'Repeat' mode acts when held regardless of _PressedOn flags (see table above). // Relies on repeat logic of IsMouseClicked() but we may as well do it ourselves if we end up exposing finer RepeatDelay/RepeatRate settings. - if ((flags & ImGuiButtonFlags_Repeat) && g.ActiveId == id && g.IO.MouseDownDuration[0] > 0.0f && IsMouseClicked(0, true)) - pressed = true; + if (g.ActiveId == id && (item_flags & ImGuiItemFlags_ButtonRepeat)) + if (g.IO.MouseDownDuration[g.ActiveIdMouseButton] > 0.0f && IsMouseClicked(g.ActiveIdMouseButton, ImGuiInputFlags_Repeat, test_owner_id)) + pressed = true; } - if (pressed) - g.NavDisableHighlight = true; + if (pressed && g.IO.ConfigNavCursorVisibleAuto) + g.NavCursorVisible = false; } - // Gamepad/Keyboard navigation - // We report navigated item as hovered but we don't set g.HoveredId to not interfere with mouse. - if (g.NavId == id && !g.NavDisableHighlight && g.NavDisableMouseHover && (g.ActiveId == 0 || g.ActiveId == id || g.ActiveId == window->MoveId)) - if (!(flags & ImGuiButtonFlags_NoHoveredOnNav)) + // Keyboard/Gamepad navigation handling + // We report navigated and navigation-activated items as hovered but we don't set g.HoveredId to not interfere with mouse. + if (g.NavId == id && g.NavCursorVisible && g.NavHighlightItemUnderNav) + if (!(flags & ImGuiButtonFlags_NoHoveredOnFocus)) hovered = true; - if (g.NavActivateDownId == id) { bool nav_activated_by_code = (g.NavActivateId == id); - bool nav_activated_by_inputs = IsNavInputPressed(ImGuiNavInput_Activate, (flags & ImGuiButtonFlags_Repeat) ? ImGuiInputReadMode_Repeat : ImGuiInputReadMode_Pressed); + bool nav_activated_by_inputs = (g.NavActivatePressedId == id); + if (!nav_activated_by_inputs && (item_flags & ImGuiItemFlags_ButtonRepeat)) + { + // Avoid pressing multiple keys from triggering excessive amount of repeat events + const ImGuiKeyData* key1 = GetKeyData(ImGuiKey_Space); + const ImGuiKeyData* key2 = GetKeyData(ImGuiKey_Enter); + const ImGuiKeyData* key3 = GetKeyData(ImGuiKey_NavGamepadActivate); + const float t1 = ImMax(ImMax(key1->DownDuration, key2->DownDuration), key3->DownDuration); + nav_activated_by_inputs = CalcTypematicRepeatAmount(t1 - g.IO.DeltaTime, t1, g.IO.KeyRepeatDelay, g.IO.KeyRepeatRate) > 0; + } if (nav_activated_by_code || nav_activated_by_inputs) - pressed = true; - if (nav_activated_by_code || nav_activated_by_inputs || g.ActiveId == id) { // Set active id so it can be queried by user via IsItemActive(), equivalent of holding the mouse button. - g.NavActivateId = id; // This is so SetActiveId assign a Nav source + pressed = true; SetActiveID(id, window); - if ((nav_activated_by_code || nav_activated_by_inputs) && !(flags & ImGuiButtonFlags_NoNavFocus)) + g.ActiveIdSource = g.NavInputSource; + if (!(flags & ImGuiButtonFlags_NoNavFocus) && !(g.NavActivateFlags & ImGuiActivateFlags_FromShortcut)) SetFocusID(id, window); - g.ActiveIdAllowNavDirFlags = (1 << ImGuiDir_Left) | (1 << ImGuiDir_Right) | (1 << ImGuiDir_Up) | (1 << ImGuiDir_Down); + if (g.NavActivateFlags & ImGuiActivateFlags_FromShortcut) + g.ActiveIdFromShortcut = true; } } + // Process while held bool held = false; if (g.ActiveId == id) { - if (pressed) - g.ActiveIdHasBeenPressedBefore = true; if (g.ActiveIdSource == ImGuiInputSource_Mouse) { if (g.ActiveIdIsJustActivated) g.ActiveIdClickOffset = g.IO.MousePos - bb.Min; - if (g.IO.MouseDown[0]) + + const int mouse_button = g.ActiveIdMouseButton; + if (mouse_button == -1) + { + // Fallback for the rare situation were g.ActiveId was set programmatically or from another widget (e.g. #6304). + ClearActiveID(); + } + else if (IsMouseDown(mouse_button, test_owner_id)) { held = true; } else { - if (hovered && (flags & ImGuiButtonFlags_PressedOnClickRelease) && !g.DragDropActive) + bool release_in = hovered && (flags & ImGuiButtonFlags_PressedOnClickRelease) != 0; + bool release_anywhere = (flags & ImGuiButtonFlags_PressedOnClickReleaseAnywhere) != 0; + if ((release_in || release_anywhere) && !g.DragDropActive) { - bool is_double_click_release = (flags & ImGuiButtonFlags_PressedOnDoubleClick) && g.IO.MouseDownWasDoubleClick[0]; - bool is_repeating_already = (flags & ImGuiButtonFlags_Repeat) && g.IO.MouseDownDurationPrev[0] >= g.IO.KeyRepeatDelay; // Repeat mode trumps - if (!is_double_click_release && !is_repeating_already) + // Report as pressed when releasing the mouse (this is the most common path) + bool is_double_click_release = (flags & ImGuiButtonFlags_PressedOnDoubleClick) && g.IO.MouseReleased[mouse_button] && g.IO.MouseClickedLastCount[mouse_button] == 2; + bool is_repeating_already = (item_flags & ImGuiItemFlags_ButtonRepeat) && g.IO.MouseDownDurationPrev[mouse_button] >= g.IO.KeyRepeatDelay; // Repeat mode trumps + bool is_button_avail_or_owned = TestKeyOwner(MouseButtonToKey(mouse_button), test_owner_id); + if (!is_double_click_release && !is_repeating_already && is_button_avail_or_owned) pressed = true; } ClearActiveID(); } - if (!(flags & ImGuiButtonFlags_NoNavFocus)) - g.NavDisableHighlight = true; + if (!(flags & ImGuiButtonFlags_NoNavFocus) && g.IO.ConfigNavCursorVisibleAuto) + g.NavCursorVisible = false; } - else if (g.ActiveIdSource == ImGuiInputSource_Nav) + else if (g.ActiveIdSource == ImGuiInputSource_Keyboard || g.ActiveIdSource == ImGuiInputSource_Gamepad) { - if (g.NavActivateDownId != id) + // When activated using Nav, we hold on the ActiveID until activation button is released + if (g.NavActivateDownId == id) + held = true; // hovered == true not true as we are already likely hovered on direct activation. + else ClearActiveID(); } + if (pressed) + g.ActiveIdHasBeenPressedBefore = true; } + // Activation highlight (this may be a remote activation) + if (g.NavHighlightActivatedId == id) + hovered = true; + if (out_hovered) *out_hovered = hovered; if (out_held) *out_held = held; @@ -628,28 +742,29 @@ bool ImGui::ButtonEx(const char* label, const ImVec2& size_arg, ImGuiButtonFlags if (!ItemAdd(bb, id)) return false; - if (window->DC.ItemFlags & ImGuiItemFlags_ButtonRepeat) - flags |= ImGuiButtonFlags_Repeat; bool hovered, held; bool pressed = ButtonBehavior(bb, id, &hovered, &held, flags); // Render const ImU32 col = GetColorU32((held && hovered) ? ImGuiCol_ButtonActive : hovered ? ImGuiCol_ButtonHovered : ImGuiCol_Button); - RenderNavHighlight(bb, id); + RenderNavCursor(bb, id); RenderFrame(bb.Min, bb.Max, col, true, style.FrameRounding); + + if (g.LogEnabled) + LogSetNextTextDecoration("[", "]"); RenderTextClipped(bb.Min + style.FramePadding, bb.Max - style.FramePadding, label, NULL, &label_size, style.ButtonTextAlign, &bb); // Automatically close popups //if (pressed && !(flags & ImGuiButtonFlags_DontClosePopups) && (window->Flags & ImGuiWindowFlags_Popup)) // CloseCurrentPopup(); - IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.LastItemStatusFlags); + IMGUI_TEST_ENGINE_ITEM_INFO(id, label, g.LastItemData.StatusFlags); return pressed; } bool ImGui::Button(const char* label, const ImVec2& size_arg) { - return ButtonEx(label, size_arg, 0); + return ButtonEx(label, size_arg, ImGuiButtonFlags_None); } // Small buttons fits within text without additional vertical spacing. @@ -665,8 +780,9 @@ bool ImGui::SmallButton(const char* label) // Tip: use ImGui::PushID()/PopID() to push indices or pointers in the ID stack. // Then you can keep 'str_id' empty or the same for all your buttons (instead of creating a string based on a non-string id) -bool ImGui::InvisibleButton(const char* str_id, const ImVec2& size_arg) +bool ImGui::InvisibleButton(const char* str_id, const ImVec2& size_arg, ImGuiButtonFlags flags) { + ImGuiContext& g = *GImGui; ImGuiWindow* window = GetCurrentWindow(); if (window->SkipItems) return false; @@ -678,110 +794,169 @@ bool ImGui::InvisibleButton(const char* str_id, const ImVec2& size_arg) ImVec2 size = CalcItemSize(size_arg, 0.0f, 0.0f); const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + size); ItemSize(size); - if (!ItemAdd(bb, id)) + if (!ItemAdd(bb, id, NULL, (flags & ImGuiButtonFlags_EnableNav) ? ImGuiItemFlags_None : ImGuiItemFlags_NoNav)) return false; bool hovered, held; - bool pressed = ButtonBehavior(bb, id, &hovered, &held); + bool pressed = ButtonBehavior(bb, id, &hovered, &held, flags); + RenderNavCursor(bb, id); + IMGUI_TEST_ENGINE_ITEM_INFO(id, str_id, g.LastItemData.StatusFlags); return pressed; } bool ImGui::ArrowButtonEx(const char* str_id, ImGuiDir dir, ImVec2 size, ImGuiButtonFlags flags) { + ImGuiContext& g = *GImGui; ImGuiWindow* window = GetCurrentWindow(); if (window->SkipItems) return false; - ImGuiContext& g = *GImGui; const ImGuiID id = window->GetID(str_id); const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + size); const float default_size = GetFrameHeight(); - ItemSize(size, (size.y >= default_size) ? g.Style.FramePadding.y : 0.0f); + ItemSize(size, (size.y >= default_size) ? g.Style.FramePadding.y : -1.0f); if (!ItemAdd(bb, id)) return false; - if (window->DC.ItemFlags & ImGuiItemFlags_ButtonRepeat) - flags |= ImGuiButtonFlags_Repeat; - bool hovered, held; bool pressed = ButtonBehavior(bb, id, &hovered, &held, flags); // Render const ImU32 bg_col = GetColorU32((held && hovered) ? ImGuiCol_ButtonActive : hovered ? ImGuiCol_ButtonHovered : ImGuiCol_Button); const ImU32 text_col = GetColorU32(ImGuiCol_Text); - RenderNavHighlight(bb, id); + RenderNavCursor(bb, id); RenderFrame(bb.Min, bb.Max, bg_col, true, g.Style.FrameRounding); RenderArrow(window->DrawList, bb.Min + ImVec2(ImMax(0.0f, (size.x - g.FontSize) * 0.5f), ImMax(0.0f, (size.y - g.FontSize) * 0.5f)), text_col, dir); + IMGUI_TEST_ENGINE_ITEM_INFO(id, str_id, g.LastItemData.StatusFlags); return pressed; } bool ImGui::ArrowButton(const char* str_id, ImGuiDir dir) { float sz = GetFrameHeight(); - return ArrowButtonEx(str_id, dir, ImVec2(sz, sz), 0); + return ArrowButtonEx(str_id, dir, ImVec2(sz, sz), ImGuiButtonFlags_None); } // Button to close a window -bool ImGui::CloseButton(ImGuiID id, const ImVec2& pos)//, float size) +bool ImGui::CloseButton(ImGuiID id, const ImVec2& pos) { ImGuiContext& g = *GImGui; ImGuiWindow* window = g.CurrentWindow; - // We intentionally allow interaction when clipped so that a mechanical Alt,Right,Validate sequence close a window. - // (this isn't the regular behavior of buttons, but it doesn't affect the user much because navigation tends to keep items visible). - const ImRect bb(pos, pos + ImVec2(g.FontSize, g.FontSize) + g.Style.FramePadding * 2.0f); - bool is_clipped = !ItemAdd(bb, id); + // Tweak 1: Shrink hit-testing area if button covers an abnormally large proportion of the visible region. That's in order to facilitate moving the window away. (#3825) + // This may better be applied as a general hit-rect reduction mechanism for all widgets to ensure the area to move window is always accessible? + const ImRect bb(pos, pos + ImVec2(g.FontSize, g.FontSize)); + ImRect bb_interact = bb; + const float area_to_visible_ratio = window->OuterRectClipped.GetArea() / bb.GetArea(); + if (area_to_visible_ratio < 1.5f) + bb_interact.Expand(ImTrunc(bb_interact.GetSize() * -0.25f)); + + // Tweak 2: We intentionally allow interaction when clipped so that a mechanical Alt,Right,Activate sequence can always close a window. + // (this isn't the common behavior of buttons, but it doesn't affect the user because navigation tends to keep items visible in scrolling layer). + bool is_clipped = !ItemAdd(bb_interact, id); bool hovered, held; - bool pressed = ButtonBehavior(bb, id, &hovered, &held); + bool pressed = ButtonBehavior(bb_interact, id, &hovered, &held); if (is_clipped) return pressed; // Render - ImU32 col = GetColorU32(held ? ImGuiCol_ButtonActive : ImGuiCol_ButtonHovered); - ImVec2 center = bb.GetCenter(); + ImU32 bg_col = GetColorU32(held ? ImGuiCol_ButtonActive : ImGuiCol_ButtonHovered); if (hovered) - window->DrawList->AddCircleFilled(center, ImMax(2.0f, g.FontSize * 0.5f + 1.0f), col, 12); - - float cross_extent = g.FontSize * 0.5f * 0.7071f - 1.0f; + window->DrawList->AddRectFilled(bb.Min, bb.Max, bg_col); + RenderNavCursor(bb, id, ImGuiNavRenderCursorFlags_Compact); ImU32 cross_col = GetColorU32(ImGuiCol_Text); - center -= ImVec2(0.5f, 0.5f); - window->DrawList->AddLine(center + ImVec2(+cross_extent,+cross_extent), center + ImVec2(-cross_extent,-cross_extent), cross_col, 1.0f); - window->DrawList->AddLine(center + ImVec2(+cross_extent,-cross_extent), center + ImVec2(-cross_extent,+cross_extent), cross_col, 1.0f); + ImVec2 cross_center = bb.GetCenter() - ImVec2(0.5f, 0.5f); + float cross_extent = g.FontSize * 0.5f * 0.7071f - 1.0f; + window->DrawList->AddLine(cross_center + ImVec2(+cross_extent, +cross_extent), cross_center + ImVec2(-cross_extent, -cross_extent), cross_col, 1.0f); + window->DrawList->AddLine(cross_center + ImVec2(+cross_extent, -cross_extent), cross_center + ImVec2(-cross_extent, +cross_extent), cross_col, 1.0f); return pressed; } -bool ImGui::CollapseButton(ImGuiID id, const ImVec2& pos) +// The Collapse button also functions as a Dock Menu button. +bool ImGui::CollapseButton(ImGuiID id, const ImVec2& pos, ImGuiDockNode* dock_node) { ImGuiContext& g = *GImGui; ImGuiWindow* window = g.CurrentWindow; - ImRect bb(pos, pos + ImVec2(g.FontSize, g.FontSize) + g.Style.FramePadding * 2.0f); - ItemAdd(bb, id); + ImRect bb(pos, pos + ImVec2(g.FontSize, g.FontSize)); + bool is_clipped = !ItemAdd(bb, id); bool hovered, held; bool pressed = ButtonBehavior(bb, id, &hovered, &held, ImGuiButtonFlags_None); + if (is_clipped) + return pressed; // Render + //bool is_dock_menu = (window->DockNodeAsHost && !window->Collapsed); ImU32 bg_col = GetColorU32((held && hovered) ? ImGuiCol_ButtonActive : hovered ? ImGuiCol_ButtonHovered : ImGuiCol_Button); ImU32 text_col = GetColorU32(ImGuiCol_Text); - ImVec2 center = bb.GetCenter(); if (hovered || held) - window->DrawList->AddCircleFilled(center/*+ ImVec2(0.0f, -0.5f)*/, g.FontSize * 0.5f + 1.0f, bg_col, 12); - RenderArrow(window->DrawList, bb.Min + g.Style.FramePadding, text_col, window->Collapsed ? ImGuiDir_Right : ImGuiDir_Down, 1.0f); + window->DrawList->AddRectFilled(bb.Min, bb.Max, bg_col); + RenderNavCursor(bb, id, ImGuiNavRenderCursorFlags_Compact); + + if (dock_node) + RenderArrowDockMenu(window->DrawList, bb.Min, g.FontSize, text_col); + else + RenderArrow(window->DrawList, bb.Min, text_col, window->Collapsed ? ImGuiDir_Right : ImGuiDir_Down, 1.0f); // Switch to moving the window after mouse is moved beyond the initial drag threshold - if (IsItemActive() && IsMouseDragging()) - StartMouseMovingWindow(window); + if (IsItemActive() && IsMouseDragging(0)) + StartMouseMovingWindowOrNode(window, dock_node, true); // Undock from window/collapse menu button return pressed; } -ImGuiID ImGui::GetScrollbarID(ImGuiWindow* window, ImGuiAxis axis) +ImGuiID ImGui::GetWindowScrollbarID(ImGuiWindow* window, ImGuiAxis axis) { - return window->GetIDNoKeepAlive(axis == ImGuiAxis_X ? "#SCROLLX" : "#SCROLLY"); + return window->GetID(axis == ImGuiAxis_X ? "#SCROLLX" : "#SCROLLY"); +} + +// Return scrollbar rectangle, must only be called for corresponding axis if window->ScrollbarX/Y is set. +ImRect ImGui::GetWindowScrollbarRect(ImGuiWindow* window, ImGuiAxis axis) +{ + ImGuiContext& g = *GImGui; + const ImRect outer_rect = window->Rect(); + const ImRect inner_rect = window->InnerRect; + const float scrollbar_size = window->ScrollbarSizes[axis ^ 1]; // (ScrollbarSizes.x = width of Y scrollbar; ScrollbarSizes.y = height of X scrollbar) + IM_ASSERT(scrollbar_size >= 0.0f); + const float border_size = IM_ROUND(window->WindowBorderSize * 0.5f); + const float border_top = (window->Flags & ImGuiWindowFlags_MenuBar) ? IM_ROUND(g.Style.FrameBorderSize * 0.5f) : 0.0f; + if (axis == ImGuiAxis_X) + return ImRect(inner_rect.Min.x + border_size, ImMax(outer_rect.Min.y + border_size, outer_rect.Max.y - border_size - scrollbar_size), inner_rect.Max.x - border_size, outer_rect.Max.y - border_size); + else + return ImRect(ImMax(outer_rect.Min.x, outer_rect.Max.x - border_size - scrollbar_size), inner_rect.Min.y + border_top, outer_rect.Max.x - border_size, inner_rect.Max.y - border_size); +} + +void ImGui::Scrollbar(ImGuiAxis axis) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + const ImGuiID id = GetWindowScrollbarID(window, axis); + + // Calculate scrollbar bounding box + ImRect bb = GetWindowScrollbarRect(window, axis); + ImDrawFlags rounding_corners = ImDrawFlags_RoundCornersNone; + if (axis == ImGuiAxis_X) + { + rounding_corners |= ImDrawFlags_RoundCornersBottomLeft; + if (!window->ScrollbarY) + rounding_corners |= ImDrawFlags_RoundCornersBottomRight; + } + else + { + if ((window->Flags & ImGuiWindowFlags_NoTitleBar) && !(window->Flags & ImGuiWindowFlags_MenuBar)) + rounding_corners |= ImDrawFlags_RoundCornersTopRight; + if (!window->ScrollbarX) + rounding_corners |= ImDrawFlags_RoundCornersBottomRight; + } + float size_visible = window->InnerRect.Max[axis] - window->InnerRect.Min[axis]; + float size_contents = window->ContentSize[axis] + window->WindowPadding[axis] * 2.0f; + ImS64 scroll = (ImS64)window->Scroll[axis]; + ScrollbarEx(bb, id, axis, &scroll, (ImS64)size_visible, (ImS64)size_contents, rounding_corners); + window->Scroll[axis] = (float)scroll; } // Vertical/Horizontal scrollbar @@ -790,7 +965,7 @@ ImGuiID ImGui::GetScrollbarID(ImGuiWindow* window, ImGuiAxis axis) // - We store values as normalized ratio and in a form that allows the window content to change while we are holding on a scrollbar // - We handle both horizontal and vertical scrollbars, which makes the terminology not ideal. // Still, the code should probably be made simpler.. -bool ImGui::ScrollbarEx(const ImRect& bb_frame, ImGuiID id, ImGuiAxis axis, float* p_scroll_v, float size_avail_v, float size_contents_v, ImDrawCornerFlags rounding_corners) +bool ImGui::ScrollbarEx(const ImRect& bb_frame, ImGuiID id, ImGuiAxis axis, ImS64* p_scroll_v, ImS64 size_visible_v, ImS64 size_contents_v, ImDrawFlags draw_rounding_flags) { ImGuiContext& g = *GImGui; ImGuiWindow* window = g.CurrentWindow; @@ -802,77 +977,89 @@ bool ImGui::ScrollbarEx(const ImRect& bb_frame, ImGuiID id, ImGuiAxis axis, floa if (bb_frame_width <= 0.0f || bb_frame_height <= 0.0f) return false; - // When we are too small, start hiding and disabling the grab (this reduce visual noise on very small window and facilitate using the resize grab) + // When we are too small, start hiding and disabling the grab (this reduce visual noise on very small window and facilitate using the window resize grab) float alpha = 1.0f; - if ((axis == ImGuiAxis_Y) && bb_frame_height < g.FontSize + g.Style.FramePadding.y * 2.0f) - alpha = ImSaturate((bb_frame_height - g.FontSize) / (g.Style.FramePadding.y * 2.0f)); + if ((axis == ImGuiAxis_Y) && bb_frame_height < bb_frame_width) + alpha = ImSaturate(bb_frame_height / ImMax(bb_frame_width * 2.0f, 1.0f)); if (alpha <= 0.0f) return false; const ImGuiStyle& style = g.Style; const bool allow_interaction = (alpha >= 1.0f); - const bool horizontal = (axis == ImGuiAxis_X); ImRect bb = bb_frame; - bb.Expand(ImVec2(-ImClamp((float)(int)((bb_frame_width - 2.0f) * 0.5f), 0.0f, 3.0f), -ImClamp((float)(int)((bb_frame_height - 2.0f) * 0.5f), 0.0f, 3.0f))); + bb.Expand(ImVec2(-ImClamp(IM_TRUNC((bb_frame_width - 2.0f) * 0.5f), 0.0f, 3.0f), -ImClamp(IM_TRUNC((bb_frame_height - 2.0f) * 0.5f), 0.0f, 3.0f))); // V denote the main, longer axis of the scrollbar (= height for a vertical scrollbar) - const float scrollbar_size_v = horizontal ? bb.GetWidth() : bb.GetHeight(); + const float scrollbar_size_v = (axis == ImGuiAxis_X) ? bb.GetWidth() : bb.GetHeight(); // Calculate the height of our grabbable box. It generally represent the amount visible (vs the total scrollable amount) // But we maintain a minimum size in pixel to allow for the user to still aim inside. - IM_ASSERT(ImMax(size_contents_v, size_avail_v) > 0.0f); // Adding this assert to check if the ImMax(XXX,1.0f) is still needed. PLEASE CONTACT ME if this triggers. - const float win_size_v = ImMax(ImMax(size_contents_v, size_avail_v), 1.0f); - const float grab_h_pixels = ImClamp(scrollbar_size_v * (size_avail_v / win_size_v), style.GrabMinSize, scrollbar_size_v); + IM_ASSERT(ImMax(size_contents_v, size_visible_v) > 0.0f); // Adding this assert to check if the ImMax(XXX,1.0f) is still needed. PLEASE CONTACT ME if this triggers. + const ImS64 win_size_v = ImMax(ImMax(size_contents_v, size_visible_v), (ImS64)1); + const float grab_h_minsize = ImMin(bb.GetSize()[axis], style.GrabMinSize); + const float grab_h_pixels = ImClamp(scrollbar_size_v * ((float)size_visible_v / (float)win_size_v), grab_h_minsize, scrollbar_size_v); const float grab_h_norm = grab_h_pixels / scrollbar_size_v; // Handle input right away. None of the code of Begin() is relying on scrolling position before calling Scrollbar(). bool held = false; bool hovered = false; + ItemAdd(bb_frame, id, NULL, ImGuiItemFlags_NoNav); ButtonBehavior(bb, id, &hovered, &held, ImGuiButtonFlags_NoNavFocus); - float scroll_max = ImMax(1.0f, size_contents_v - size_avail_v); - float scroll_ratio = ImSaturate(*p_scroll_v / scroll_max); - float grab_v_norm = scroll_ratio * (scrollbar_size_v - grab_h_pixels) / scrollbar_size_v; + const ImS64 scroll_max = ImMax((ImS64)1, size_contents_v - size_visible_v); + float scroll_ratio = ImSaturate((float)*p_scroll_v / (float)scroll_max); + float grab_v_norm = scroll_ratio * (scrollbar_size_v - grab_h_pixels) / scrollbar_size_v; // Grab position in normalized space if (held && allow_interaction && grab_h_norm < 1.0f) { - float scrollbar_pos_v = horizontal ? bb.Min.x : bb.Min.y; - float mouse_pos_v = horizontal ? g.IO.MousePos.x : g.IO.MousePos.y; + const float scrollbar_pos_v = bb.Min[axis]; + const float mouse_pos_v = g.IO.MousePos[axis]; // Click position in scrollbar normalized space (0.0f->1.0f) const float clicked_v_norm = ImSaturate((mouse_pos_v - scrollbar_pos_v) / scrollbar_size_v); - SetHoveredID(id); - bool seek_absolute = false; + const int held_dir = (clicked_v_norm < grab_v_norm) ? -1 : (clicked_v_norm > grab_v_norm + grab_h_norm) ? +1 : 0; if (g.ActiveIdIsJustActivated) { - // On initial click calculate the distance between mouse and the center of the grab - seek_absolute = (clicked_v_norm < grab_v_norm || clicked_v_norm > grab_v_norm + grab_h_norm); - if (seek_absolute) - g.ScrollbarClickDeltaToGrabCenter = 0.0f; - else - g.ScrollbarClickDeltaToGrabCenter = clicked_v_norm - grab_v_norm - grab_h_norm * 0.5f; + // On initial click when held_dir == 0 (clicked over grab): calculate the distance between mouse and the center of the grab + const bool scroll_to_clicked_location = (g.IO.ConfigScrollbarScrollByPage == false || g.IO.KeyShift || held_dir == 0); + g.ScrollbarSeekMode = scroll_to_clicked_location ? 0 : (short)held_dir; + g.ScrollbarClickDeltaToGrabCenter = (held_dir == 0 && !g.IO.KeyShift) ? clicked_v_norm - grab_v_norm - grab_h_norm * 0.5f : 0.0f; } - // Apply scroll + // Apply scroll (p_scroll_v will generally point on one member of window->Scroll) // It is ok to modify Scroll here because we are being called in Begin() after the calculation of ContentSize and before setting up our starting position - const float scroll_v_norm = ImSaturate((clicked_v_norm - g.ScrollbarClickDeltaToGrabCenter - grab_h_norm * 0.5f) / (1.0f - grab_h_norm)); - *p_scroll_v = (float)(int)(0.5f + scroll_v_norm * scroll_max);//(win_size_contents_v - win_size_v)); + if (g.ScrollbarSeekMode == 0) + { + // Absolute seeking + const float scroll_v_norm = ImSaturate((clicked_v_norm - g.ScrollbarClickDeltaToGrabCenter - grab_h_norm * 0.5f) / (1.0f - grab_h_norm)); + *p_scroll_v = (ImS64)(scroll_v_norm * scroll_max); + } + else + { + // Page by page + if (IsMouseClicked(ImGuiMouseButton_Left, ImGuiInputFlags_Repeat) && held_dir == g.ScrollbarSeekMode) + { + float page_dir = (g.ScrollbarSeekMode > 0.0f) ? +1.0f : -1.0f; + *p_scroll_v = ImClamp(*p_scroll_v + (ImS64)(page_dir * size_visible_v), (ImS64)0, scroll_max); + } + } // Update values for rendering - scroll_ratio = ImSaturate(*p_scroll_v / scroll_max); + scroll_ratio = ImSaturate((float)*p_scroll_v / (float)scroll_max); grab_v_norm = scroll_ratio * (scrollbar_size_v - grab_h_pixels) / scrollbar_size_v; - // Update distance to grab now that we have seeked and saturated - if (seek_absolute) - g.ScrollbarClickDeltaToGrabCenter = clicked_v_norm - grab_v_norm - grab_h_norm * 0.5f; + // Update distance to grab now that we have seek'ed and saturated + //if (seek_absolute) + // g.ScrollbarClickDeltaToGrabCenter = clicked_v_norm - grab_v_norm - grab_h_norm * 0.5f; } // Render - window->DrawList->AddRectFilled(bb_frame.Min, bb_frame.Max, GetColorU32(ImGuiCol_ScrollbarBg), window->WindowRounding, rounding_corners); + const ImU32 bg_col = GetColorU32(ImGuiCol_ScrollbarBg); const ImU32 grab_col = GetColorU32(held ? ImGuiCol_ScrollbarGrabActive : hovered ? ImGuiCol_ScrollbarGrabHovered : ImGuiCol_ScrollbarGrab, alpha); + window->DrawList->AddRectFilled(bb_frame.Min, bb_frame.Max, bg_col, window->WindowRounding, draw_rounding_flags); ImRect grab_rect; - if (horizontal) + if (axis == ImGuiAxis_X) grab_rect = ImRect(ImLerp(bb.Min.x, bb.Max.x, grab_v_norm), bb.Min.y, ImLerp(bb.Min.x, bb.Max.x, grab_v_norm) + grab_h_pixels, bb.Max.y); else grab_rect = ImRect(bb.Min.x, ImLerp(bb.Min.y, bb.Max.y, grab_v_norm), bb.Max.x, ImLerp(bb.Min.y, bb.Max.y, grab_v_norm) + grab_h_pixels); @@ -881,102 +1068,108 @@ bool ImGui::ScrollbarEx(const ImRect& bb_frame, ImGuiID id, ImGuiAxis axis, floa return held; } -void ImGui::Scrollbar(ImGuiAxis axis) +// - Read about ImTextureID here: https://github.com/ocornut/imgui/wiki/Image-Loading-and-Displaying-Examples +// - 'uv0' and 'uv1' are texture coordinates. Read about them from the same link above. +void ImGui::ImageWithBg(ImTextureID user_texture_id, const ImVec2& image_size, const ImVec2& uv0, const ImVec2& uv1, const ImVec4& bg_col, const ImVec4& tint_col) { ImGuiContext& g = *GImGui; - ImGuiWindow* window = g.CurrentWindow; - - const ImGuiID id = GetScrollbarID(window, axis); - KeepAliveID(id); - - // Calculate scrollbar bounding box - const ImRect outer_rect = window->Rect(); - const ImRect inner_rect = window->InnerRect; - const float border_size = window->WindowBorderSize; - const float scrollbar_size = window->ScrollbarSizes[axis ^ 1]; - IM_ASSERT(scrollbar_size > 0.0f); - const float other_scrollbar_size = window->ScrollbarSizes[axis]; - ImDrawCornerFlags rounding_corners = (other_scrollbar_size <= 0.0f) ? ImDrawCornerFlags_BotRight : 0; - ImRect bb; - if (axis == ImGuiAxis_X) - { - bb.Min = ImVec2(inner_rect.Min.x, ImMax(outer_rect.Min.y, outer_rect.Max.y - border_size - scrollbar_size)); - bb.Max = ImVec2(inner_rect.Max.x, outer_rect.Max.y); - rounding_corners |= ImDrawCornerFlags_BotLeft; - } - else - { - bb.Min = ImVec2(ImMax(outer_rect.Min.x, outer_rect.Max.x - border_size - scrollbar_size), inner_rect.Min.y); - bb.Max = ImVec2(outer_rect.Max.x, window->InnerRect.Max.y); - rounding_corners |= ((window->Flags & ImGuiWindowFlags_NoTitleBar) && !(window->Flags & ImGuiWindowFlags_MenuBar)) ? ImDrawCornerFlags_TopRight : 0; - } - ScrollbarEx(bb, id, axis, &window->Scroll[axis], inner_rect.Max[axis] - inner_rect.Min[axis], window->ContentSize[axis] + window->WindowPadding[axis] * 2.0f, rounding_corners); -} - -void ImGui::Image(ImTextureID user_texture_id, const ImVec2& size, const ImVec2& uv0, const ImVec2& uv1, const ImVec4& tint_col, const ImVec4& border_col) -{ ImGuiWindow* window = GetCurrentWindow(); if (window->SkipItems) return; - ImRect bb(window->DC.CursorPos, window->DC.CursorPos + size); - if (border_col.w > 0.0f) - bb.Max += ImVec2(2, 2); + const ImVec2 padding(g.Style.ImageBorderSize, g.Style.ImageBorderSize); + const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + image_size + padding * 2.0f); ItemSize(bb); if (!ItemAdd(bb, 0)) return; - if (border_col.w > 0.0f) - { - window->DrawList->AddRect(bb.Min, bb.Max, GetColorU32(border_col), 0.0f); - window->DrawList->AddImage(user_texture_id, bb.Min + ImVec2(1, 1), bb.Max - ImVec2(1, 1), uv0, uv1, GetColorU32(tint_col)); - } - else - { - window->DrawList->AddImage(user_texture_id, bb.Min, bb.Max, uv0, uv1, GetColorU32(tint_col)); - } + // Render + if (g.Style.ImageBorderSize > 0.0f) + window->DrawList->AddRect(bb.Min, bb.Max, GetColorU32(ImGuiCol_Border), 0.0f, ImDrawFlags_None, g.Style.ImageBorderSize); + if (bg_col.w > 0.0f) + window->DrawList->AddRectFilled(bb.Min + padding, bb.Max - padding, GetColorU32(bg_col)); + window->DrawList->AddImage(user_texture_id, bb.Min + padding, bb.Max - padding, uv0, uv1, GetColorU32(tint_col)); } -// frame_padding < 0: uses FramePadding from style (default) -// frame_padding = 0: no framing -// frame_padding > 0: set framing size -// The color used are the button colors. -bool ImGui::ImageButton(ImTextureID user_texture_id, const ImVec2& size, const ImVec2& uv0, const ImVec2& uv1, int frame_padding, const ImVec4& bg_col, const ImVec4& tint_col) +void ImGui::Image(ImTextureID user_texture_id, const ImVec2& image_size, const ImVec2& uv0, const ImVec2& uv1) { + ImageWithBg(user_texture_id, image_size, uv0, uv1); +} + +// 1.91.9 (February 2025) removed 'tint_col' and 'border_col' parameters, made border size not depend on color value. (#8131, #8238) +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS +void ImGui::Image(ImTextureID user_texture_id, const ImVec2& image_size, const ImVec2& uv0, const ImVec2& uv1, const ImVec4& tint_col, const ImVec4& border_col) +{ + ImGuiContext& g = *GImGui; + PushStyleVar(ImGuiStyleVar_ImageBorderSize, (border_col.w > 0.0f) ? ImMax(1.0f, g.Style.ImageBorderSize) : 0.0f); // Preserve legacy behavior where border is always visible when border_col's Alpha is >0.0f + PushStyleColor(ImGuiCol_Border, border_col); + ImageWithBg(user_texture_id, image_size, uv0, uv1, ImVec4(0, 0, 0, 0), tint_col); + PopStyleColor(); + PopStyleVar(); +} +#endif + +bool ImGui::ImageButtonEx(ImGuiID id, ImTextureID user_texture_id, const ImVec2& image_size, const ImVec2& uv0, const ImVec2& uv1, const ImVec4& bg_col, const ImVec4& tint_col, ImGuiButtonFlags flags) +{ + ImGuiContext& g = *GImGui; ImGuiWindow* window = GetCurrentWindow(); if (window->SkipItems) return false; - ImGuiContext& g = *GImGui; - const ImGuiStyle& style = g.Style; - - // Default to using texture ID as ID. User can still push string/integer prefixes. - // We could hash the size/uv to create a unique ID but that would prevent the user from animating UV. - PushID((void*)(intptr_t)user_texture_id); - const ImGuiID id = window->GetID("#image"); - PopID(); - - const ImVec2 padding = (frame_padding >= 0) ? ImVec2((float)frame_padding, (float)frame_padding) : style.FramePadding; - const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + size + padding * 2); - const ImRect image_bb(window->DC.CursorPos + padding, window->DC.CursorPos + padding + size); + const ImVec2 padding = g.Style.FramePadding; + const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + image_size + padding * 2.0f); ItemSize(bb); if (!ItemAdd(bb, id)) return false; bool hovered, held; - bool pressed = ButtonBehavior(bb, id, &hovered, &held); + bool pressed = ButtonBehavior(bb, id, &hovered, &held, flags); // Render const ImU32 col = GetColorU32((held && hovered) ? ImGuiCol_ButtonActive : hovered ? ImGuiCol_ButtonHovered : ImGuiCol_Button); - RenderNavHighlight(bb, id); - RenderFrame(bb.Min, bb.Max, col, true, ImClamp((float)ImMin(padding.x, padding.y), 0.0f, style.FrameRounding)); + RenderNavCursor(bb, id); + RenderFrame(bb.Min, bb.Max, col, true, ImClamp((float)ImMin(padding.x, padding.y), 0.0f, g.Style.FrameRounding)); if (bg_col.w > 0.0f) - window->DrawList->AddRectFilled(image_bb.Min, image_bb.Max, GetColorU32(bg_col)); - window->DrawList->AddImage(user_texture_id, image_bb.Min, image_bb.Max, uv0, uv1, GetColorU32(tint_col)); + window->DrawList->AddRectFilled(bb.Min + padding, bb.Max - padding, GetColorU32(bg_col)); + window->DrawList->AddImage(user_texture_id, bb.Min + padding, bb.Max - padding, uv0, uv1, GetColorU32(tint_col)); return pressed; } +// - ImageButton() adds style.FramePadding*2.0f to provided size. This is in order to facilitate fitting an image in a button. +// - ImageButton() draws a background based on regular Button() color + optionally an inner background if specified. (#8165) // FIXME: Maybe that's not the best design? +bool ImGui::ImageButton(const char* str_id, ImTextureID user_texture_id, const ImVec2& image_size, const ImVec2& uv0, const ImVec2& uv1, const ImVec4& bg_col, const ImVec4& tint_col) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + if (window->SkipItems) + return false; + + return ImageButtonEx(window->GetID(str_id), user_texture_id, image_size, uv0, uv1, bg_col, tint_col); +} + +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS +// Legacy API obsoleted in 1.89. Two differences with new ImageButton() +// - old ImageButton() used ImTextureID as item id (created issue with multiple buttons with same image, transient texture id values, opaque computation of ID) +// - new ImageButton() requires an explicit 'const char* str_id' +// - old ImageButton() had frame_padding' override argument. +// - new ImageButton() always use style.FramePadding. +/* +bool ImGui::ImageButton(ImTextureID user_texture_id, const ImVec2& size, const ImVec2& uv0, const ImVec2& uv1, int frame_padding, const ImVec4& bg_col, const ImVec4& tint_col) +{ + // Default to using texture ID as ID. User can still push string/integer prefixes. + PushID((ImTextureID)(intptr_t)user_texture_id); + if (frame_padding >= 0) + PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2((float)frame_padding, (float)frame_padding)); + bool ret = ImageButton("", user_texture_id, size, uv0, uv1, bg_col, tint_col); + if (frame_padding >= 0) + PopStyleVar(); + PopID(); + return ret; +} +*/ +#endif // #ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + bool ImGui::Checkbox(const char* label, bool* v) { ImGuiWindow* window = GetCurrentWindow(); @@ -992,57 +1185,113 @@ bool ImGui::Checkbox(const char* label, bool* v) const ImVec2 pos = window->DC.CursorPos; const ImRect total_bb(pos, pos + ImVec2(square_sz + (label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f), label_size.y + style.FramePadding.y * 2.0f)); ItemSize(total_bb, style.FramePadding.y); - if (!ItemAdd(total_bb, id)) - return false; + const bool is_visible = ItemAdd(total_bb, id); + const bool is_multi_select = (g.LastItemData.ItemFlags & ImGuiItemFlags_IsMultiSelect) != 0; + if (!is_visible) + if (!is_multi_select || !g.BoxSelectState.UnclipMode || !g.BoxSelectState.UnclipRect.Overlaps(total_bb)) // Extra layer of "no logic clip" for box-select support + { + IMGUI_TEST_ENGINE_ITEM_INFO(id, label, g.LastItemData.StatusFlags | ImGuiItemStatusFlags_Checkable | (*v ? ImGuiItemStatusFlags_Checked : 0)); + return false; + } + + // Range-Selection/Multi-selection support (header) + bool checked = *v; + if (is_multi_select) + MultiSelectItemHeader(id, &checked, NULL); bool hovered, held; bool pressed = ButtonBehavior(total_bb, id, &hovered, &held); - if (pressed) + + // Range-Selection/Multi-selection support (footer) + if (is_multi_select) + MultiSelectItemFooter(id, &checked, &pressed); + else if (pressed) + checked = !checked; + + if (*v != checked) { - *v = !(*v); + *v = checked; + pressed = true; // return value MarkItemEdited(id); } const ImRect check_bb(pos, pos + ImVec2(square_sz, square_sz)); - RenderNavHighlight(total_bb, id); - RenderFrame(check_bb.Min, check_bb.Max, GetColorU32((held && hovered) ? ImGuiCol_FrameBgActive : hovered ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg), true, style.FrameRounding); - ImU32 check_col = GetColorU32(ImGuiCol_CheckMark); - if (window->DC.ItemFlags & ImGuiItemFlags_MixedValue) + const bool mixed_value = (g.LastItemData.ItemFlags & ImGuiItemFlags_MixedValue) != 0; + if (is_visible) { - // Undocumented tristate/mixed/indeterminate checkbox (#2644) - ImVec2 pad(ImMax(1.0f, (float)(int)(square_sz / 3.6f)), ImMax(1.0f, (float)(int)(square_sz / 3.6f))); - window->DrawList->AddRectFilled(check_bb.Min + pad, check_bb.Max - pad, check_col, style.FrameRounding); + RenderNavCursor(total_bb, id); + RenderFrame(check_bb.Min, check_bb.Max, GetColorU32((held && hovered) ? ImGuiCol_FrameBgActive : hovered ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg), true, style.FrameRounding); + ImU32 check_col = GetColorU32(ImGuiCol_CheckMark); + if (mixed_value) + { + // Undocumented tristate/mixed/indeterminate checkbox (#2644) + // This may seem awkwardly designed because the aim is to make ImGuiItemFlags_MixedValue supported by all widgets (not just checkbox) + ImVec2 pad(ImMax(1.0f, IM_TRUNC(square_sz / 3.6f)), ImMax(1.0f, IM_TRUNC(square_sz / 3.6f))); + window->DrawList->AddRectFilled(check_bb.Min + pad, check_bb.Max - pad, check_col, style.FrameRounding); + } + else if (*v) + { + const float pad = ImMax(1.0f, IM_TRUNC(square_sz / 6.0f)); + RenderCheckMark(window->DrawList, check_bb.Min + ImVec2(pad, pad), check_col, square_sz - pad * 2.0f); + } } - else if (*v) - { - const float pad = ImMax(1.0f, (float)(int)(square_sz / 6.0f)); - RenderCheckMark(check_bb.Min + ImVec2(pad, pad), check_col, square_sz - pad*2.0f); - } - + const ImVec2 label_pos = ImVec2(check_bb.Max.x + style.ItemInnerSpacing.x, check_bb.Min.y + style.FramePadding.y); if (g.LogEnabled) - LogRenderedText(&total_bb.Min, *v ? "[x]" : "[ ]"); - if (label_size.x > 0.0f) - RenderText(ImVec2(check_bb.Max.x + style.ItemInnerSpacing.x, check_bb.Min.y + style.FramePadding.y), label); + LogRenderedText(&label_pos, mixed_value ? "[~]" : *v ? "[x]" : "[ ]"); + if (is_visible && label_size.x > 0.0f) + RenderText(label_pos, label); - IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.ItemFlags | ImGuiItemStatusFlags_Checkable | (*v ? ImGuiItemStatusFlags_Checked : 0)); + IMGUI_TEST_ENGINE_ITEM_INFO(id, label, g.LastItemData.StatusFlags | ImGuiItemStatusFlags_Checkable | (*v ? ImGuiItemStatusFlags_Checked : 0)); return pressed; } -bool ImGui::CheckboxFlags(const char* label, unsigned int* flags, unsigned int flags_value) +template +bool ImGui::CheckboxFlagsT(const char* label, T* flags, T flags_value) { - bool v = ((*flags & flags_value) == flags_value); - bool pressed = Checkbox(label, &v); + bool all_on = (*flags & flags_value) == flags_value; + bool any_on = (*flags & flags_value) != 0; + bool pressed; + if (!all_on && any_on) + { + ImGuiContext& g = *GImGui; + g.NextItemData.ItemFlags |= ImGuiItemFlags_MixedValue; + pressed = Checkbox(label, &all_on); + } + else + { + pressed = Checkbox(label, &all_on); + + } if (pressed) { - if (v) + if (all_on) *flags |= flags_value; else *flags &= ~flags_value; } - return pressed; } +bool ImGui::CheckboxFlags(const char* label, int* flags, int flags_value) +{ + return CheckboxFlagsT(label, flags, flags_value); +} + +bool ImGui::CheckboxFlags(const char* label, unsigned int* flags, unsigned int flags_value) +{ + return CheckboxFlagsT(label, flags, flags_value); +} + +bool ImGui::CheckboxFlags(const char* label, ImS64* flags, ImS64 flags_value) +{ + return CheckboxFlagsT(label, flags, flags_value); +} + +bool ImGui::CheckboxFlags(const char* label, ImU64* flags, ImU64 flags_value) +{ + return CheckboxFlagsT(label, flags, flags_value); +} + bool ImGui::RadioButton(const char* label, bool active) { ImGuiWindow* window = GetCurrentWindow(); @@ -1063,8 +1312,8 @@ bool ImGui::RadioButton(const char* label, bool active) return false; ImVec2 center = check_bb.GetCenter(); - center.x = (float)(int)center.x + 0.5f; - center.y = (float)(int)center.y + 0.5f; + center.x = IM_ROUND(center.x); + center.y = IM_ROUND(center.y); const float radius = (square_sz - 1.0f) * 0.5f; bool hovered, held; @@ -1072,25 +1321,28 @@ bool ImGui::RadioButton(const char* label, bool active) if (pressed) MarkItemEdited(id); - RenderNavHighlight(total_bb, id); - window->DrawList->AddCircleFilled(center, radius, GetColorU32((held && hovered) ? ImGuiCol_FrameBgActive : hovered ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg), 16); + RenderNavCursor(total_bb, id); + const int num_segment = window->DrawList->_CalcCircleAutoSegmentCount(radius); + window->DrawList->AddCircleFilled(center, radius, GetColorU32((held && hovered) ? ImGuiCol_FrameBgActive : hovered ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg), num_segment); if (active) { - const float pad = ImMax(1.0f, (float)(int)(square_sz / 6.0f)); - window->DrawList->AddCircleFilled(center, radius - pad, GetColorU32(ImGuiCol_CheckMark), 16); + const float pad = ImMax(1.0f, IM_TRUNC(square_sz / 6.0f)); + window->DrawList->AddCircleFilled(center, radius - pad, GetColorU32(ImGuiCol_CheckMark)); } if (style.FrameBorderSize > 0.0f) { - window->DrawList->AddCircle(center + ImVec2(1,1), radius, GetColorU32(ImGuiCol_BorderShadow), 16, style.FrameBorderSize); - window->DrawList->AddCircle(center, radius, GetColorU32(ImGuiCol_Border), 16, style.FrameBorderSize); + window->DrawList->AddCircle(center + ImVec2(1, 1), radius, GetColorU32(ImGuiCol_BorderShadow), num_segment, style.FrameBorderSize); + window->DrawList->AddCircle(center, radius, GetColorU32(ImGuiCol_Border), num_segment, style.FrameBorderSize); } + ImVec2 label_pos = ImVec2(check_bb.Max.x + style.ItemInnerSpacing.x, check_bb.Min.y + style.FramePadding.y); if (g.LogEnabled) - LogRenderedText(&total_bb.Min, active ? "(x)" : "( )"); + LogRenderedText(&label_pos, active ? "(x)" : "( )"); if (label_size.x > 0.0f) - RenderText(ImVec2(check_bb.Max.x + style.ItemInnerSpacing.x, check_bb.Min.y + style.FramePadding.y), label); + RenderText(label_pos, label); + IMGUI_TEST_ENGINE_ITEM_INFO(id, label, g.LastItemData.StatusFlags); return pressed; } @@ -1114,30 +1366,53 @@ void ImGui::ProgressBar(float fraction, const ImVec2& size_arg, const char* over const ImGuiStyle& style = g.Style; ImVec2 pos = window->DC.CursorPos; - ImVec2 size = CalcItemSize(size_arg, CalcItemWidth(), g.FontSize + style.FramePadding.y*2.0f); + ImVec2 size = CalcItemSize(size_arg, CalcItemWidth(), g.FontSize + style.FramePadding.y * 2.0f); ImRect bb(pos, pos + size); ItemSize(size, style.FramePadding.y); if (!ItemAdd(bb, 0)) return; - // Render - fraction = ImSaturate(fraction); - RenderFrame(bb.Min, bb.Max, GetColorU32(ImGuiCol_FrameBg), true, style.FrameRounding); - bb.Expand(ImVec2(-style.FrameBorderSize, -style.FrameBorderSize)); - const ImVec2 fill_br = ImVec2(ImLerp(bb.Min.x, bb.Max.x, fraction), bb.Max.y); - RenderRectFilledRangeH(window->DrawList, bb, GetColorU32(ImGuiCol_PlotHistogram), 0.0f, fraction, style.FrameRounding); + // Fraction < 0.0f will display an indeterminate progress bar animation + // The value must be animated along with time, so e.g. passing '-1.0f * ImGui::GetTime()' as fraction works. + const bool is_indeterminate = (fraction < 0.0f); + if (!is_indeterminate) + fraction = ImSaturate(fraction); - // Default displaying the fraction as percentage string, but user can override it - char overlay_buf[32]; - if (!overlay) + // Out of courtesy we accept a NaN fraction without crashing + float fill_n0 = 0.0f; + float fill_n1 = (fraction == fraction) ? fraction : 0.0f; + + if (is_indeterminate) { - ImFormatString(overlay_buf, IM_ARRAYSIZE(overlay_buf), "%.0f%%", fraction*100+0.01f); - overlay = overlay_buf; + const float fill_width_n = 0.2f; + fill_n0 = ImFmod(-fraction, 1.0f) * (1.0f + fill_width_n) - fill_width_n; + fill_n1 = ImSaturate(fill_n0 + fill_width_n); + fill_n0 = ImSaturate(fill_n0); } - ImVec2 overlay_size = CalcTextSize(overlay, NULL); - if (overlay_size.x > 0.0f) - RenderTextClipped(ImVec2(ImClamp(fill_br.x + style.ItemSpacing.x, bb.Min.x, bb.Max.x - overlay_size.x - style.ItemInnerSpacing.x), bb.Min.y), bb.Max, overlay, NULL, &overlay_size, ImVec2(0.0f,0.5f), &bb); + // Render + RenderFrame(bb.Min, bb.Max, GetColorU32(ImGuiCol_FrameBg), true, style.FrameRounding); + bb.Expand(ImVec2(-style.FrameBorderSize, -style.FrameBorderSize)); + RenderRectFilledRangeH(window->DrawList, bb, GetColorU32(ImGuiCol_PlotHistogram), fill_n0, fill_n1, style.FrameRounding); + + // Default displaying the fraction as percentage string, but user can override it + // Don't display text for indeterminate bars by default + char overlay_buf[32]; + if (!is_indeterminate || overlay != NULL) + { + if (!overlay) + { + ImFormatString(overlay_buf, IM_ARRAYSIZE(overlay_buf), "%.0f%%", fraction * 100 + 0.01f); + overlay = overlay_buf; + } + + ImVec2 overlay_size = CalcTextSize(overlay, NULL); + if (overlay_size.x > 0.0f) + { + float text_x = is_indeterminate ? (bb.Min.x + bb.Max.x - overlay_size.x) * 0.5f : ImLerp(bb.Min.x, bb.Max.x, fill_n1) + style.ItemSpacing.x; + RenderTextClipped(ImVec2(ImClamp(text_x, bb.Min.x, bb.Max.x - overlay_size.x - style.ItemInnerSpacing.x), bb.Min.y), bb.Max, overlay, NULL, &overlay_size, ImVec2(0.0f, 0.5f), &bb); + } + } } void ImGui::Bullet() @@ -1148,21 +1423,94 @@ void ImGui::Bullet() ImGuiContext& g = *GImGui; const ImGuiStyle& style = g.Style; - const float line_height = ImMax(ImMin(window->DC.CurrLineSize.y, g.FontSize + g.Style.FramePadding.y*2), g.FontSize); + const float line_height = ImMax(ImMin(window->DC.CurrLineSize.y, g.FontSize + style.FramePadding.y * 2), g.FontSize); const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(g.FontSize, line_height)); ItemSize(bb); if (!ItemAdd(bb, 0)) { - SameLine(0, style.FramePadding.x*2); + SameLine(0, style.FramePadding.x * 2); return; } // Render and stay on same line ImU32 text_col = GetColorU32(ImGuiCol_Text); - RenderBullet(window->DrawList, bb.Min + ImVec2(style.FramePadding.x + g.FontSize*0.5f, line_height*0.5f), text_col); + RenderBullet(window->DrawList, bb.Min + ImVec2(style.FramePadding.x + g.FontSize * 0.5f, line_height * 0.5f), text_col); SameLine(0, style.FramePadding.x * 2.0f); } +// This is provided as a convenience for being an often requested feature. +// FIXME-STYLE: we delayed adding as there is a larger plan to revamp the styling system. +// Because of this we currently don't provide many styling options for this widget +// (e.g. hovered/active colors are automatically inferred from a single color). +bool ImGui::TextLink(const char* label) +{ + ImGuiWindow* window = GetCurrentWindow(); + if (window->SkipItems) + return false; + + ImGuiContext& g = *GImGui; + const ImGuiID id = window->GetID(label); + const char* label_end = FindRenderedTextEnd(label); + + ImVec2 pos(window->DC.CursorPos.x, window->DC.CursorPos.y + window->DC.CurrLineTextBaseOffset); + ImVec2 size = CalcTextSize(label, label_end, true); + ImRect bb(pos, pos + size); + ItemSize(size, 0.0f); + if (!ItemAdd(bb, id)) + return false; + + bool hovered, held; + bool pressed = ButtonBehavior(bb, id, &hovered, &held); + RenderNavCursor(bb, id); + + if (hovered) + SetMouseCursor(ImGuiMouseCursor_Hand); + + ImVec4 text_colf = g.Style.Colors[ImGuiCol_TextLink]; + ImVec4 line_colf = text_colf; + { + // FIXME-STYLE: Read comments above. This widget is NOT written in the same style as some earlier widgets, + // as we are currently experimenting/planning a different styling system. + float h, s, v; + ColorConvertRGBtoHSV(text_colf.x, text_colf.y, text_colf.z, h, s, v); + if (held || hovered) + { + v = ImSaturate(v + (held ? 0.4f : 0.3f)); + h = ImFmod(h + 0.02f, 1.0f); + } + ColorConvertHSVtoRGB(h, s, v, text_colf.x, text_colf.y, text_colf.z); + v = ImSaturate(v - 0.20f); + ColorConvertHSVtoRGB(h, s, v, line_colf.x, line_colf.y, line_colf.z); + } + + float line_y = bb.Max.y + ImFloor(g.Font->Descent * g.FontScale * 0.20f); + window->DrawList->AddLine(ImVec2(bb.Min.x, line_y), ImVec2(bb.Max.x, line_y), GetColorU32(line_colf)); // FIXME-TEXT: Underline mode. + + PushStyleColor(ImGuiCol_Text, GetColorU32(text_colf)); + RenderText(bb.Min, label, label_end); + PopStyleColor(); + + IMGUI_TEST_ENGINE_ITEM_INFO(id, label, g.LastItemData.StatusFlags); + return pressed; +} + +void ImGui::TextLinkOpenURL(const char* label, const char* url) +{ + ImGuiContext& g = *GImGui; + if (url == NULL) + url = label; + if (TextLink(label)) + if (g.PlatformIO.Platform_OpenInShellFn != NULL) + g.PlatformIO.Platform_OpenInShellFn(&g, url); + SetItemTooltip(LocalizeGetMsg(ImGuiLocKey_OpenLink_s), url); // It is more reassuring for user to _always_ display URL when we same as label + if (BeginPopupContextItem()) + { + if (MenuItem(LocalizeGetMsg(ImGuiLocKey_CopyLink))) + SetClipboardText(url); + EndPopup(); + } +} + //------------------------------------------------------------------------- // [SECTION] Widgets: Low-level Layout helpers //------------------------------------------------------------------------- @@ -1181,7 +1529,7 @@ void ImGui::Spacing() ImGuiWindow* window = GetCurrentWindow(); if (window->SkipItems) return; - ItemSize(ImVec2(0,0)); + ItemSize(ImVec2(0, 0)); } void ImGui::Dummy(const ImVec2& size) @@ -1204,8 +1552,9 @@ void ImGui::NewLine() ImGuiContext& g = *GImGui; const ImGuiLayoutType backup_layout_type = window->DC.LayoutType; window->DC.LayoutType = ImGuiLayoutType_Vertical; + window->DC.IsSameLine = false; if (window->DC.CurrLineSize.y > 0.0f) // In the event that we are on a line with items that is smaller that FontSize high, we will preserve its height. - ItemSize(ImVec2(0,0)); + ItemSize(ImVec2(0, 0)); else ItemSize(ImVec2(0.0f, g.FontSize)); window->DC.LayoutType = backup_layout_type; @@ -1223,7 +1572,9 @@ void ImGui::AlignTextToFramePadding() } // Horizontal/vertical separating line -void ImGui::SeparatorEx(ImGuiSeparatorFlags flags) +// FIXME: Surprisingly, this seemingly trivial widget is a victim of many different legacy/tricky layout issues. +// Note how thickness == 1.0f is handled specifically as not moving CursorPos by 'thickness', but other values are. +void ImGui::SeparatorEx(ImGuiSeparatorFlags flags, float thickness) { ImGuiWindow* window = GetCurrentWindow(); if (window->SkipItems) @@ -1231,54 +1582,54 @@ void ImGui::SeparatorEx(ImGuiSeparatorFlags flags) ImGuiContext& g = *GImGui; IM_ASSERT(ImIsPowerOfTwo(flags & (ImGuiSeparatorFlags_Horizontal | ImGuiSeparatorFlags_Vertical))); // Check that only 1 option is selected + IM_ASSERT(thickness > 0.0f); - float thickness_draw = 1.0f; - float thickness_layout = 0.0f; if (flags & ImGuiSeparatorFlags_Vertical) { - // Vertical separator, for menu bars (use current line height). Not exposed because it is misleading and it doesn't have an effect on regular layout. + // Vertical separator, for menu bars (use current line height). float y1 = window->DC.CursorPos.y; float y2 = window->DC.CursorPos.y + window->DC.CurrLineSize.y; - const ImRect bb(ImVec2(window->DC.CursorPos.x, y1), ImVec2(window->DC.CursorPos.x + thickness_draw, y2)); - ItemSize(ImVec2(thickness_layout, 0.0f)); + const ImRect bb(ImVec2(window->DC.CursorPos.x, y1), ImVec2(window->DC.CursorPos.x + thickness, y2)); + ItemSize(ImVec2(thickness, 0.0f)); if (!ItemAdd(bb, 0)) return; // Draw - window->DrawList->AddLine(ImVec2(bb.Min.x, bb.Min.y), ImVec2(bb.Min.x, bb.Max.y), GetColorU32(ImGuiCol_Separator)); + window->DrawList->AddRectFilled(bb.Min, bb.Max, GetColorU32(ImGuiCol_Separator)); if (g.LogEnabled) LogText(" |"); } else if (flags & ImGuiSeparatorFlags_Horizontal) { // Horizontal Separator - float x1 = window->Pos.x; - float x2 = window->Pos.x + window->Size.x; - if (!window->DC.GroupStack.empty()) - x1 += window->DC.Indent.x; + float x1 = window->DC.CursorPos.x; + float x2 = window->WorkRect.Max.x; - ImGuiColumns* columns = (flags & ImGuiSeparatorFlags_SpanAllColumns) ? window->DC.CurrentColumns : NULL; + // Preserve legacy behavior inside Columns() + // Before Tables API happened, we relied on Separator() to span all columns of a Columns() set. + // We currently don't need to provide the same feature for tables because tables naturally have border features. + ImGuiOldColumns* columns = (flags & ImGuiSeparatorFlags_SpanAllColumns) ? window->DC.CurrentColumns : NULL; if (columns) - PushColumnsBackground(); - - // We don't provide our width to the layout so that it doesn't get feed back into AutoFit - const ImRect bb(ImVec2(x1, window->DC.CursorPos.y), ImVec2(x2, window->DC.CursorPos.y + thickness_draw)); - ItemSize(ImVec2(0.0f, thickness_layout)); - if (!ItemAdd(bb, 0)) { - if (columns) - { - PopColumnsBackground(); - columns->LineMinY = window->DC.CursorPos.y; - } - return; + x1 = window->Pos.x + window->DC.Indent.x; // Used to be Pos.x before 2023/10/03 + x2 = window->Pos.x + window->Size.x; + PushColumnsBackground(); } - // Draw - window->DrawList->AddLine(bb.Min, ImVec2(bb.Max.x, bb.Min.y), GetColorU32(ImGuiCol_Separator)); - if (g.LogEnabled) - LogRenderedText(&bb.Min, "--------------------------------"); + // We don't provide our width to the layout so that it doesn't get feed back into AutoFit + // FIXME: This prevents ->CursorMaxPos based bounding box evaluation from working (e.g. TableEndCell) + const float thickness_for_layout = (thickness == 1.0f) ? 0.0f : thickness; // FIXME: See 1.70/1.71 Separator() change: makes legacy 1-px separator not affect layout yet. Should change. + const ImRect bb(ImVec2(x1, window->DC.CursorPos.y), ImVec2(x2, window->DC.CursorPos.y + thickness)); + ItemSize(ImVec2(0.0f, thickness_for_layout)); + if (ItemAdd(bb, 0)) + { + // Draw + window->DrawList->AddRectFilled(bb.Min, bb.Max, GetColorU32(ImGuiCol_Separator)); + if (g.LogEnabled) + LogRenderedText(&bb.Min, "--------------------------------\n"); + + } if (columns) { PopColumnsBackground(); @@ -1294,40 +1645,113 @@ void ImGui::Separator() if (window->SkipItems) return; - // Those flags should eventually be overridable by the user + // Those flags should eventually be configurable by the user + // FIXME: We cannot g.Style.SeparatorTextBorderSize for thickness as it relates to SeparatorText() which is a decorated separator, not defaulting to 1.0f. ImGuiSeparatorFlags flags = (window->DC.LayoutType == ImGuiLayoutType_Horizontal) ? ImGuiSeparatorFlags_Vertical : ImGuiSeparatorFlags_Horizontal; - flags |= ImGuiSeparatorFlags_SpanAllColumns; - SeparatorEx(flags); + + // Only applies to legacy Columns() api as they relied on Separator() a lot. + if (window->DC.CurrentColumns) + flags |= ImGuiSeparatorFlags_SpanAllColumns; + + SeparatorEx(flags, 1.0f); +} + +void ImGui::SeparatorTextEx(ImGuiID id, const char* label, const char* label_end, float extra_w) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + ImGuiStyle& style = g.Style; + + const ImVec2 label_size = CalcTextSize(label, label_end, false); + const ImVec2 pos = window->DC.CursorPos; + const ImVec2 padding = style.SeparatorTextPadding; + + const float separator_thickness = style.SeparatorTextBorderSize; + const ImVec2 min_size(label_size.x + extra_w + padding.x * 2.0f, ImMax(label_size.y + padding.y * 2.0f, separator_thickness)); + const ImRect bb(pos, ImVec2(window->WorkRect.Max.x, pos.y + min_size.y)); + const float text_baseline_y = ImTrunc((bb.GetHeight() - label_size.y) * style.SeparatorTextAlign.y + 0.99999f); //ImMax(padding.y, ImTrunc((style.SeparatorTextSize - label_size.y) * 0.5f)); + ItemSize(min_size, text_baseline_y); + if (!ItemAdd(bb, id)) + return; + + const float sep1_x1 = pos.x; + const float sep2_x2 = bb.Max.x; + const float seps_y = ImTrunc((bb.Min.y + bb.Max.y) * 0.5f + 0.99999f); + + const float label_avail_w = ImMax(0.0f, sep2_x2 - sep1_x1 - padding.x * 2.0f); + const ImVec2 label_pos(pos.x + padding.x + ImMax(0.0f, (label_avail_w - label_size.x - extra_w) * style.SeparatorTextAlign.x), pos.y + text_baseline_y); // FIXME-ALIGN + + // This allows using SameLine() to position something in the 'extra_w' + window->DC.CursorPosPrevLine.x = label_pos.x + label_size.x; + + const ImU32 separator_col = GetColorU32(ImGuiCol_Separator); + if (label_size.x > 0.0f) + { + const float sep1_x2 = label_pos.x - style.ItemSpacing.x; + const float sep2_x1 = label_pos.x + label_size.x + extra_w + style.ItemSpacing.x; + if (sep1_x2 > sep1_x1 && separator_thickness > 0.0f) + window->DrawList->AddLine(ImVec2(sep1_x1, seps_y), ImVec2(sep1_x2, seps_y), separator_col, separator_thickness); + if (sep2_x2 > sep2_x1 && separator_thickness > 0.0f) + window->DrawList->AddLine(ImVec2(sep2_x1, seps_y), ImVec2(sep2_x2, seps_y), separator_col, separator_thickness); + if (g.LogEnabled) + LogSetNextTextDecoration("---", NULL); + RenderTextEllipsis(window->DrawList, label_pos, ImVec2(bb.Max.x, bb.Max.y + style.ItemSpacing.y), bb.Max.x, bb.Max.x, label, label_end, &label_size); + } + else + { + if (g.LogEnabled) + LogText("---"); + if (separator_thickness > 0.0f) + window->DrawList->AddLine(ImVec2(sep1_x1, seps_y), ImVec2(sep2_x2, seps_y), separator_col, separator_thickness); + } +} + +void ImGui::SeparatorText(const char* label) +{ + ImGuiWindow* window = GetCurrentWindow(); + if (window->SkipItems) + return; + + // The SeparatorText() vs SeparatorTextEx() distinction is designed to be considerate that we may want: + // - allow separator-text to be draggable items (would require a stable ID + a noticeable highlight) + // - this high-level entry point to allow formatting? (which in turns may require ID separate from formatted string) + // - because of this we probably can't turn 'const char* label' into 'const char* fmt, ...' + // Otherwise, we can decide that users wanting to drag this would layout a dedicated drag-item, + // and then we can turn this into a format function. + SeparatorTextEx(0, label, FindRenderedTextEnd(label), 0.0f); } // Using 'hover_visibility_delay' allows us to hide the highlight and mouse cursor for a short time, which can be convenient to reduce visual noise. -bool ImGui::SplitterBehavior(const ImRect& bb, ImGuiID id, ImGuiAxis axis, float* size1, float* size2, float min_size1, float min_size2, float hover_extend, float hover_visibility_delay) +bool ImGui::SplitterBehavior(const ImRect& bb, ImGuiID id, ImGuiAxis axis, float* size1, float* size2, float min_size1, float min_size2, float hover_extend, float hover_visibility_delay, ImU32 bg_col) { ImGuiContext& g = *GImGui; ImGuiWindow* window = g.CurrentWindow; - const ImGuiItemFlags item_flags_backup = window->DC.ItemFlags; - window->DC.ItemFlags |= ImGuiItemFlags_NoNav | ImGuiItemFlags_NoNavDefaultFocus; - bool item_add = ItemAdd(bb, id); - window->DC.ItemFlags = item_flags_backup; - if (!item_add) + if (!ItemAdd(bb, id, NULL, ImGuiItemFlags_NoNav)) return false; + // FIXME: AFAIK the only leftover reason for passing ImGuiButtonFlags_AllowOverlap here is + // to allow caller of SplitterBehavior() to call SetItemAllowOverlap() after the item. + // Nowadays we would instead want to use SetNextItemAllowOverlap() before the item. + ImGuiButtonFlags button_flags = ImGuiButtonFlags_FlattenChildren; +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + button_flags |= ImGuiButtonFlags_AllowOverlap; +#endif + bool hovered, held; ImRect bb_interact = bb; bb_interact.Expand(axis == ImGuiAxis_Y ? ImVec2(0.0f, hover_extend) : ImVec2(hover_extend, 0.0f)); - ButtonBehavior(bb_interact, id, &hovered, &held, ImGuiButtonFlags_FlattenChildren | ImGuiButtonFlags_AllowItemOverlap); - if (g.ActiveId != id) - SetItemAllowOverlap(); + ButtonBehavior(bb_interact, id, &hovered, &held, button_flags); + if (hovered) + g.LastItemData.StatusFlags |= ImGuiItemStatusFlags_HoveredRect; // for IsItemHovered(), because bb_interact is larger than bb - if (held || (g.HoveredId == id && g.HoveredIdPreviousFrame == id && g.HoveredIdTimer >= hover_visibility_delay)) + if (held || (hovered && g.HoveredIdPreviousFrame == id && g.HoveredIdTimer >= hover_visibility_delay)) SetMouseCursor(axis == ImGuiAxis_Y ? ImGuiMouseCursor_ResizeNS : ImGuiMouseCursor_ResizeEW); ImRect bb_render = bb; if (held) { - ImVec2 mouse_delta_2d = g.IO.MousePos - g.ActiveIdClickOffset - bb_interact.Min; - float mouse_delta = (axis == ImGuiAxis_Y) ? mouse_delta_2d.y : mouse_delta_2d.x; + float mouse_delta = (g.IO.MousePos - g.ActiveIdClickOffset - bb_interact.Min)[axis]; // Minimum pane size float size_1_maximum_delta = ImMax(0.0f, *size1 - min_size1); @@ -1340,20 +1764,18 @@ bool ImGui::SplitterBehavior(const ImRect& bb, ImGuiID id, ImGuiAxis axis, float // Apply resize if (mouse_delta != 0.0f) { - if (mouse_delta < 0.0f) - IM_ASSERT(*size1 + mouse_delta >= min_size1); - if (mouse_delta > 0.0f) - IM_ASSERT(*size2 - mouse_delta >= min_size2); - *size1 += mouse_delta; - *size2 -= mouse_delta; + *size1 = ImMax(*size1 + mouse_delta, min_size1); + *size2 = ImMax(*size2 - mouse_delta, min_size2); bb_render.Translate((axis == ImGuiAxis_X) ? ImVec2(mouse_delta, 0.0f) : ImVec2(0.0f, mouse_delta)); MarkItemEdited(id); } } - // Render + // Render at new position + if (bg_col & IM_COL32_A_MASK) + window->DrawList->AddRectFilled(bb_render.Min, bb_render.Max, bg_col, 0.0f); const ImU32 col = GetColorU32(held ? ImGuiCol_SeparatorActive : (hovered && g.HoveredIdTimer >= hover_visibility_delay) ? ImGuiCol_SeparatorHovered : ImGuiCol_Separator); - window->DrawList->AddRectFilled(bb_render.Min, bb_render.Max, col, g.Style.FrameRounding); + window->DrawList->AddRectFilled(bb_render.Min, bb_render.Max, col, 0.0f); return held; } @@ -1368,11 +1790,13 @@ static int IMGUI_CDECL ShrinkWidthItemComparer(const void* lhs, const void* rhs) } // Shrink excess width from a set of item, by removing width from the larger items first. +// Set items Width to -1.0f to disable shrinking this item. void ImGui::ShrinkWidths(ImGuiShrinkWidthItem* items, int count, float width_excess) { if (count == 1) { - items[0].Width = ImMax(items[0].Width - width_excess, 1.0f); + if (items[0].Width >= 0.0f) + items[0].Width = ImMax(items[0].Width - width_excess, 1.0f); return; } ImQsort(items, (size_t)count, sizeof(ImGuiShrinkWidthItem), ShrinkWidthItemComparer); @@ -1381,33 +1805,42 @@ void ImGui::ShrinkWidths(ImGuiShrinkWidthItem* items, int count, float width_exc { while (count_same_width < count && items[0].Width <= items[count_same_width].Width) count_same_width++; - float max_width_to_remove_per_item = (count_same_width < count) ? (items[0].Width - items[count_same_width].Width) : (items[0].Width - 1.0f); + float max_width_to_remove_per_item = (count_same_width < count && items[count_same_width].Width >= 0.0f) ? (items[0].Width - items[count_same_width].Width) : (items[0].Width - 1.0f); + if (max_width_to_remove_per_item <= 0.0f) + break; float width_to_remove_per_item = ImMin(width_excess / count_same_width, max_width_to_remove_per_item); for (int item_n = 0; item_n < count_same_width; item_n++) items[item_n].Width -= width_to_remove_per_item; width_excess -= width_to_remove_per_item * count_same_width; } - // Round width and redistribute remainder left-to-right (could make it an option of the function?) + // Round width and redistribute remainder // Ensure that e.g. the right-most tab of a shrunk tab-bar always reaches exactly at the same distance from the right-most edge of the tab bar separator. width_excess = 0.0f; for (int n = 0; n < count; n++) { - float width_rounded = ImFloor(items[n].Width); + float width_rounded = ImTrunc(items[n].Width); width_excess += items[n].Width - width_rounded; items[n].Width = width_rounded; } - if (width_excess > 0.0f) - for (int n = 0; n < count; n++) - if (items[n].Index < (int)(width_excess + 0.01f)) - items[n].Width += 1.0f; + while (width_excess > 0.0f) + for (int n = 0; n < count && width_excess > 0.0f; n++) + { + float width_to_add = ImMin(items[n].InitialWidth - items[n].Width, 1.0f); + items[n].Width += width_to_add; + width_excess -= width_to_add; + } } //------------------------------------------------------------------------- // [SECTION] Widgets: ComboBox //------------------------------------------------------------------------- +// - CalcMaxPopupHeightFromItemCount() [Internal] // - BeginCombo() +// - BeginComboPopup() [Internal] // - EndCombo() +// - BeginComboPreview() [Internal] +// - EndComboPreview() [Internal] // - Combo() //------------------------------------------------------------------------- @@ -1421,99 +1854,135 @@ static float CalcMaxPopupHeightFromItemCount(int items_count) bool ImGui::BeginCombo(const char* label, const char* preview_value, ImGuiComboFlags flags) { - // Always consume the SetNextWindowSizeConstraint() call in our early return paths ImGuiContext& g = *GImGui; - bool has_window_size_constraint = (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasSizeConstraint) != 0; - g.NextWindowData.Flags &= ~ImGuiNextWindowDataFlags_HasSizeConstraint; - ImGuiWindow* window = GetCurrentWindow(); + + ImGuiNextWindowDataFlags backup_next_window_data_flags = g.NextWindowData.HasFlags; + g.NextWindowData.ClearFlags(); // We behave like Begin() and need to consume those values if (window->SkipItems) return false; - IM_ASSERT((flags & (ImGuiComboFlags_NoArrowButton | ImGuiComboFlags_NoPreview)) != (ImGuiComboFlags_NoArrowButton | ImGuiComboFlags_NoPreview)); // Can't use both flags together - const ImGuiStyle& style = g.Style; const ImGuiID id = window->GetID(label); + IM_ASSERT((flags & (ImGuiComboFlags_NoArrowButton | ImGuiComboFlags_NoPreview)) != (ImGuiComboFlags_NoArrowButton | ImGuiComboFlags_NoPreview)); // Can't use both flags together + if (flags & ImGuiComboFlags_WidthFitPreview) + IM_ASSERT((flags & (ImGuiComboFlags_NoPreview | (ImGuiComboFlags)ImGuiComboFlags_CustomPreview)) == 0); const float arrow_size = (flags & ImGuiComboFlags_NoArrowButton) ? 0.0f : GetFrameHeight(); const ImVec2 label_size = CalcTextSize(label, NULL, true); - const float expected_w = CalcItemWidth(); - const float w = (flags & ImGuiComboFlags_NoPreview) ? arrow_size : expected_w; - const ImRect frame_bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(w, label_size.y + style.FramePadding.y*2.0f)); - const ImRect total_bb(frame_bb.Min, frame_bb.Max + ImVec2(label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f, 0.0f)); + const float preview_width = ((flags & ImGuiComboFlags_WidthFitPreview) && (preview_value != NULL)) ? CalcTextSize(preview_value, NULL, true).x : 0.0f; + const float w = (flags & ImGuiComboFlags_NoPreview) ? arrow_size : ((flags & ImGuiComboFlags_WidthFitPreview) ? (arrow_size + preview_width + style.FramePadding.x * 2.0f) : CalcItemWidth()); + const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(w, label_size.y + style.FramePadding.y * 2.0f)); + const ImRect total_bb(bb.Min, bb.Max + ImVec2(label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f, 0.0f)); ItemSize(total_bb, style.FramePadding.y); - if (!ItemAdd(total_bb, id, &frame_bb)) + if (!ItemAdd(total_bb, id, &bb)) return false; + // Open on click bool hovered, held; - bool pressed = ButtonBehavior(frame_bb, id, &hovered, &held); - bool popup_open = IsPopupOpen(id); + bool pressed = ButtonBehavior(bb, id, &hovered, &held); + const ImGuiID popup_id = ImHashStr("##ComboPopup", 0, id); + bool popup_open = IsPopupOpen(popup_id, ImGuiPopupFlags_None); + if (pressed && !popup_open) + { + OpenPopupEx(popup_id, ImGuiPopupFlags_None); + popup_open = true; + } + // Render shape const ImU32 frame_col = GetColorU32(hovered ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg); - const float value_x2 = ImMax(frame_bb.Min.x, frame_bb.Max.x - arrow_size); - RenderNavHighlight(frame_bb, id); + const float value_x2 = ImMax(bb.Min.x, bb.Max.x - arrow_size); + RenderNavCursor(bb, id); if (!(flags & ImGuiComboFlags_NoPreview)) - window->DrawList->AddRectFilled(frame_bb.Min, ImVec2(value_x2, frame_bb.Max.y), frame_col, style.FrameRounding, (flags & ImGuiComboFlags_NoArrowButton) ? ImDrawCornerFlags_All : ImDrawCornerFlags_Left); + window->DrawList->AddRectFilled(bb.Min, ImVec2(value_x2, bb.Max.y), frame_col, style.FrameRounding, (flags & ImGuiComboFlags_NoArrowButton) ? ImDrawFlags_RoundCornersAll : ImDrawFlags_RoundCornersLeft); if (!(flags & ImGuiComboFlags_NoArrowButton)) { ImU32 bg_col = GetColorU32((popup_open || hovered) ? ImGuiCol_ButtonHovered : ImGuiCol_Button); ImU32 text_col = GetColorU32(ImGuiCol_Text); - window->DrawList->AddRectFilled(ImVec2(value_x2, frame_bb.Min.y), frame_bb.Max, bg_col, style.FrameRounding, (w <= arrow_size) ? ImDrawCornerFlags_All : ImDrawCornerFlags_Right); - if (value_x2 + arrow_size - style.FramePadding.x <= frame_bb.Max.x) - RenderArrow(window->DrawList, ImVec2(value_x2 + style.FramePadding.y, frame_bb.Min.y + style.FramePadding.y), text_col, ImGuiDir_Down, 1.0f); + window->DrawList->AddRectFilled(ImVec2(value_x2, bb.Min.y), bb.Max, bg_col, style.FrameRounding, (w <= arrow_size) ? ImDrawFlags_RoundCornersAll : ImDrawFlags_RoundCornersRight); + if (value_x2 + arrow_size - style.FramePadding.x <= bb.Max.x) + RenderArrow(window->DrawList, ImVec2(value_x2 + style.FramePadding.y, bb.Min.y + style.FramePadding.y), text_col, ImGuiDir_Down, 1.0f); } - RenderFrameBorder(frame_bb.Min, frame_bb.Max, style.FrameRounding); - if (preview_value != NULL && !(flags & ImGuiComboFlags_NoPreview)) - RenderTextClipped(frame_bb.Min + style.FramePadding, ImVec2(value_x2, frame_bb.Max.y), preview_value, NULL, NULL, ImVec2(0.0f,0.0f)); - if (label_size.x > 0) - RenderText(ImVec2(frame_bb.Max.x + style.ItemInnerSpacing.x, frame_bb.Min.y + style.FramePadding.y), label); + RenderFrameBorder(bb.Min, bb.Max, style.FrameRounding); - if ((pressed || g.NavActivateId == id) && !popup_open) + // Custom preview + if (flags & ImGuiComboFlags_CustomPreview) { - if (window->DC.NavLayerCurrent == 0) - window->NavLastIds[0] = id; - OpenPopupEx(id); - popup_open = true; + g.ComboPreviewData.PreviewRect = ImRect(bb.Min.x, bb.Min.y, value_x2, bb.Max.y); + IM_ASSERT(preview_value == NULL || preview_value[0] == 0); + preview_value = NULL; } + // Render preview and label + if (preview_value != NULL && !(flags & ImGuiComboFlags_NoPreview)) + { + if (g.LogEnabled) + LogSetNextTextDecoration("{", "}"); + RenderTextClipped(bb.Min + style.FramePadding, ImVec2(value_x2, bb.Max.y), preview_value, NULL, NULL); + } + if (label_size.x > 0) + RenderText(ImVec2(bb.Max.x + style.ItemInnerSpacing.x, bb.Min.y + style.FramePadding.y), label); + if (!popup_open) return false; - if (has_window_size_constraint) + g.NextWindowData.HasFlags = backup_next_window_data_flags; + return BeginComboPopup(popup_id, bb, flags); +} + +bool ImGui::BeginComboPopup(ImGuiID popup_id, const ImRect& bb, ImGuiComboFlags flags) +{ + ImGuiContext& g = *GImGui; + if (!IsPopupOpen(popup_id, ImGuiPopupFlags_None)) + { + g.NextWindowData.ClearFlags(); + return false; + } + + // Set popup size + float w = bb.GetWidth(); + if (g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasSizeConstraint) { - g.NextWindowData.Flags |= ImGuiNextWindowDataFlags_HasSizeConstraint; g.NextWindowData.SizeConstraintRect.Min.x = ImMax(g.NextWindowData.SizeConstraintRect.Min.x, w); } else { if ((flags & ImGuiComboFlags_HeightMask_) == 0) flags |= ImGuiComboFlags_HeightRegular; - IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiComboFlags_HeightMask_)); // Only one + IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiComboFlags_HeightMask_)); // Only one int popup_max_height_in_items = -1; if (flags & ImGuiComboFlags_HeightRegular) popup_max_height_in_items = 8; else if (flags & ImGuiComboFlags_HeightSmall) popup_max_height_in_items = 4; else if (flags & ImGuiComboFlags_HeightLarge) popup_max_height_in_items = 20; - SetNextWindowSizeConstraints(ImVec2(w, 0.0f), ImVec2(FLT_MAX, CalcMaxPopupHeightFromItemCount(popup_max_height_in_items))); + ImVec2 constraint_min(0.0f, 0.0f), constraint_max(FLT_MAX, FLT_MAX); + if ((g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasSize) == 0 || g.NextWindowData.SizeVal.x <= 0.0f) // Don't apply constraints if user specified a size + constraint_min.x = w; + if ((g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasSize) == 0 || g.NextWindowData.SizeVal.y <= 0.0f) + constraint_max.y = CalcMaxPopupHeightFromItemCount(popup_max_height_in_items); + SetNextWindowSizeConstraints(constraint_min, constraint_max); } + // This is essentially a specialized version of BeginPopupEx() char name[16]; - ImFormatString(name, IM_ARRAYSIZE(name), "##Combo_%02d", g.BeginPopupStack.Size); // Recycle windows based on depth + ImFormatString(name, IM_ARRAYSIZE(name), "##Combo_%02d", g.BeginComboDepth); // Recycle windows based on depth - // Peak into expected window size so we can position it + // Set position given a custom constraint (peak into expected window size so we can position it) + // FIXME: This might be easier to express with an hypothetical SetNextWindowPosConstraints() function? + // FIXME: This might be moved to Begin() or at least around the same spot where Tooltips and other Popups are calling FindBestWindowPosForPopupEx()? if (ImGuiWindow* popup_window = FindWindowByName(name)) if (popup_window->WasActive) { - ImVec2 size_expected = CalcWindowExpectedSize(popup_window); - if (flags & ImGuiComboFlags_PopupAlignLeft) - popup_window->AutoPosLastDirection = ImGuiDir_Left; - ImRect r_outer = GetWindowAllowedExtentRect(popup_window); - ImVec2 pos = FindBestWindowPosForPopupEx(frame_bb.GetBL(), size_expected, &popup_window->AutoPosLastDirection, r_outer, frame_bb, ImGuiPopupPositionPolicy_ComboBox); + // Always override 'AutoPosLastDirection' to not leave a chance for a past value to affect us. + ImVec2 size_expected = CalcWindowNextAutoFitSize(popup_window); + popup_window->AutoPosLastDirection = (flags & ImGuiComboFlags_PopupAlignLeft) ? ImGuiDir_Left : ImGuiDir_Down; // Left = "Below, Toward Left", Down = "Below, Toward Right (default)" + ImRect r_outer = GetPopupAllowedExtentRect(popup_window); + ImVec2 pos = FindBestWindowPosForPopupEx(bb.GetBL(), size_expected, &popup_window->AutoPosLastDirection, r_outer, bb, ImGuiPopupPositionPolicy_ComboBox); SetNextWindowPos(pos); } - // Horizontally align ourselves with the framed text - ImGuiWindowFlags window_flags = ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_Popup | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoSavedSettings; - PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(style.FramePadding.x, style.WindowPadding.y)); + // We don't use BeginPopupEx() solely because we have a custom name string, which we could make an argument to BeginPopupEx() + ImGuiWindowFlags window_flags = ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_Popup | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoMove; + PushStyleVarX(ImGuiStyleVar_WindowPadding, g.Style.FramePadding.x); // Horizontally align ourselves with the framed text bool ret = Begin(name, NULL, window_flags); PopStyleVar(); if (!ret) @@ -1522,27 +1991,80 @@ bool ImGui::BeginCombo(const char* label, const char* preview_value, ImGuiComboF IM_ASSERT(0); // This should never happen as we tested for IsPopupOpen() above return false; } + g.BeginComboDepth++; return true; } void ImGui::EndCombo() { + ImGuiContext& g = *GImGui; EndPopup(); + g.BeginComboDepth--; } -// Getter for the old Combo() API: const char*[] -static bool Items_ArrayGetter(void* data, int idx, const char** out_text) +// Call directly after the BeginCombo/EndCombo block. The preview is designed to only host non-interactive elements +// (Experimental, see GitHub issues: #1658, #4168) +bool ImGui::BeginComboPreview() { - const char* const* items = (const char* const*)data; - if (out_text) - *out_text = items[idx]; + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + ImGuiComboPreviewData* preview_data = &g.ComboPreviewData; + + if (window->SkipItems || !(g.LastItemData.StatusFlags & ImGuiItemStatusFlags_Visible)) + return false; + IM_ASSERT(g.LastItemData.Rect.Min.x == preview_data->PreviewRect.Min.x && g.LastItemData.Rect.Min.y == preview_data->PreviewRect.Min.y); // Didn't call after BeginCombo/EndCombo block or forgot to pass ImGuiComboFlags_CustomPreview flag? + if (!window->ClipRect.Overlaps(preview_data->PreviewRect)) // Narrower test (optional) + return false; + + // FIXME: This could be contained in a PushWorkRect() api + preview_data->BackupCursorPos = window->DC.CursorPos; + preview_data->BackupCursorMaxPos = window->DC.CursorMaxPos; + preview_data->BackupCursorPosPrevLine = window->DC.CursorPosPrevLine; + preview_data->BackupPrevLineTextBaseOffset = window->DC.PrevLineTextBaseOffset; + preview_data->BackupLayout = window->DC.LayoutType; + window->DC.CursorPos = preview_data->PreviewRect.Min + g.Style.FramePadding; + window->DC.CursorMaxPos = window->DC.CursorPos; + window->DC.LayoutType = ImGuiLayoutType_Horizontal; + window->DC.IsSameLine = false; + PushClipRect(preview_data->PreviewRect.Min, preview_data->PreviewRect.Max, true); + return true; } -// Getter for the old Combo() API: "item1\0item2\0item3\0" -static bool Items_SingleStringGetter(void* data, int idx, const char** out_text) +void ImGui::EndComboPreview() +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + ImGuiComboPreviewData* preview_data = &g.ComboPreviewData; + + // FIXME: Using CursorMaxPos approximation instead of correct AABB which we will store in ImDrawCmd in the future + ImDrawList* draw_list = window->DrawList; + if (window->DC.CursorMaxPos.x < preview_data->PreviewRect.Max.x && window->DC.CursorMaxPos.y < preview_data->PreviewRect.Max.y) + if (draw_list->CmdBuffer.Size > 1) // Unlikely case that the PushClipRect() didn't create a command + { + draw_list->_CmdHeader.ClipRect = draw_list->CmdBuffer[draw_list->CmdBuffer.Size - 1].ClipRect = draw_list->CmdBuffer[draw_list->CmdBuffer.Size - 2].ClipRect; + draw_list->_TryMergeDrawCmds(); + } + PopClipRect(); + window->DC.CursorPos = preview_data->BackupCursorPos; + window->DC.CursorMaxPos = ImMax(window->DC.CursorMaxPos, preview_data->BackupCursorMaxPos); + window->DC.CursorPosPrevLine = preview_data->BackupCursorPosPrevLine; + window->DC.PrevLineTextBaseOffset = preview_data->BackupPrevLineTextBaseOffset; + window->DC.LayoutType = preview_data->BackupLayout; + window->DC.IsSameLine = false; + preview_data->PreviewRect = ImRect(); +} + +// Getter for the old Combo() API: const char*[] +static const char* Items_ArrayGetter(void* data, int idx) +{ + const char* const* items = (const char* const*)data; + return items[idx]; +} + +// Getter for the old Combo() API: "item1\0item2\0item3\0" +static const char* Items_SingleStringGetter(void* data, int idx) { - // FIXME-OPT: we could pre-compute the indices to fasten this. But only 1 active combo means the waste is limited. const char* items_separated_by_zeros = (const char*)data; int items_count = 0; const char* p = items_separated_by_zeros; @@ -1550,54 +2072,57 @@ static bool Items_SingleStringGetter(void* data, int idx, const char** out_text) { if (idx == items_count) break; - p += strlen(p) + 1; + p += ImStrlen(p) + 1; items_count++; } - if (!*p) - return false; - if (out_text) - *out_text = p; - return true; + return *p ? p : NULL; } // Old API, prefer using BeginCombo() nowadays if you can. -bool ImGui::Combo(const char* label, int* current_item, bool (*items_getter)(void*, int, const char**), void* data, int items_count, int popup_max_height_in_items) +bool ImGui::Combo(const char* label, int* current_item, const char* (*getter)(void* user_data, int idx), void* user_data, int items_count, int popup_max_height_in_items) { ImGuiContext& g = *GImGui; // Call the getter to obtain the preview string which is a parameter to BeginCombo() const char* preview_value = NULL; if (*current_item >= 0 && *current_item < items_count) - items_getter(data, *current_item, &preview_value); + preview_value = getter(user_data, *current_item); // The old Combo() API exposed "popup_max_height_in_items". The new more general BeginCombo() API doesn't have/need it, but we emulate it here. - if (popup_max_height_in_items != -1 && !(g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasSizeConstraint)) - SetNextWindowSizeConstraints(ImVec2(0,0), ImVec2(FLT_MAX, CalcMaxPopupHeightFromItemCount(popup_max_height_in_items))); + if (popup_max_height_in_items != -1 && !(g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasSizeConstraint)) + SetNextWindowSizeConstraints(ImVec2(0, 0), ImVec2(FLT_MAX, CalcMaxPopupHeightFromItemCount(popup_max_height_in_items))); if (!BeginCombo(label, preview_value, ImGuiComboFlags_None)) return false; // Display items - // FIXME-OPT: Use clipper (but we need to disable it on the appearing frame to make sure our call to SetItemDefaultFocus() is processed) bool value_changed = false; - for (int i = 0; i < items_count; i++) - { - PushID((void*)(intptr_t)i); - const bool item_selected = (i == *current_item); - const char* item_text; - if (!items_getter(data, i, &item_text)) - item_text = "*Unknown item*"; - if (Selectable(item_text, item_selected)) + ImGuiListClipper clipper; + clipper.Begin(items_count); + clipper.IncludeItemByIndex(*current_item); + while (clipper.Step()) + for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; i++) { - value_changed = true; - *current_item = i; + const char* item_text = getter(user_data, i); + if (item_text == NULL) + item_text = "*Unknown item*"; + + PushID(i); + const bool item_selected = (i == *current_item); + if (Selectable(item_text, item_selected) && *current_item != i) + { + value_changed = true; + *current_item = i; + } + if (item_selected) + SetItemDefaultFocus(); + PopID(); } - if (item_selected) - SetItemDefaultFocus(); - PopID(); - } EndCombo(); + if (value_changed) + MarkItemEdited(g.LastItemData.ID); + return value_changed; } @@ -1615,99 +2140,102 @@ bool ImGui::Combo(const char* label, int* current_item, const char* items_separa const char* p = items_separated_by_zeros; // FIXME-OPT: Avoid computing this, or at least only when combo is open while (*p) { - p += strlen(p) + 1; + p += ImStrlen(p) + 1; items_count++; } bool value_changed = Combo(label, current_item, Items_SingleStringGetter, (void*)items_separated_by_zeros, items_count, height_in_items); return value_changed; } +#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + +struct ImGuiGetNameFromIndexOldToNewCallbackData { void* UserData; bool (*OldCallback)(void*, int, const char**); }; +static const char* ImGuiGetNameFromIndexOldToNewCallback(void* user_data, int idx) +{ + ImGuiGetNameFromIndexOldToNewCallbackData* data = (ImGuiGetNameFromIndexOldToNewCallbackData*)user_data; + const char* s = NULL; + data->OldCallback(data->UserData, idx, &s); + return s; +} + +bool ImGui::ListBox(const char* label, int* current_item, bool (*old_getter)(void*, int, const char**), void* user_data, int items_count, int height_in_items) +{ + ImGuiGetNameFromIndexOldToNewCallbackData old_to_new_data = { user_data, old_getter }; + return ListBox(label, current_item, ImGuiGetNameFromIndexOldToNewCallback, &old_to_new_data, items_count, height_in_items); +} +bool ImGui::Combo(const char* label, int* current_item, bool (*old_getter)(void*, int, const char**), void* user_data, int items_count, int popup_max_height_in_items) +{ + ImGuiGetNameFromIndexOldToNewCallbackData old_to_new_data = { user_data, old_getter }; + return Combo(label, current_item, ImGuiGetNameFromIndexOldToNewCallback, &old_to_new_data, items_count, popup_max_height_in_items); +} + +#endif + //------------------------------------------------------------------------- // [SECTION] Data Type and Data Formatting Helpers [Internal] //------------------------------------------------------------------------- -// - PatchFormatStringFloatToInt() // - DataTypeGetInfo() // - DataTypeFormatString() // - DataTypeApplyOp() -// - DataTypeApplyOpFromText() +// - DataTypeApplyFromText() +// - DataTypeCompare() +// - DataTypeClamp() // - GetMinimumStepAtDecimalPrecision // - RoundScalarWithFormat<>() //------------------------------------------------------------------------- static const ImGuiDataTypeInfo GDataTypeInfo[] = { - { sizeof(char), "%d", "%d" }, // ImGuiDataType_S8 - { sizeof(unsigned char), "%u", "%u" }, - { sizeof(short), "%d", "%d" }, // ImGuiDataType_S16 - { sizeof(unsigned short), "%u", "%u" }, - { sizeof(int), "%d", "%d" }, // ImGuiDataType_S32 - { sizeof(unsigned int), "%u", "%u" }, + { sizeof(char), "S8", "%d", "%d" }, // ImGuiDataType_S8 + { sizeof(unsigned char), "U8", "%u", "%u" }, + { sizeof(short), "S16", "%d", "%d" }, // ImGuiDataType_S16 + { sizeof(unsigned short), "U16", "%u", "%u" }, + { sizeof(int), "S32", "%d", "%d" }, // ImGuiDataType_S32 + { sizeof(unsigned int), "U32", "%u", "%u" }, #ifdef _MSC_VER - { sizeof(ImS64), "%I64d","%I64d" }, // ImGuiDataType_S64 - { sizeof(ImU64), "%I64u","%I64u" }, + { sizeof(ImS64), "S64", "%I64d","%I64d" }, // ImGuiDataType_S64 + { sizeof(ImU64), "U64", "%I64u","%I64u" }, #else - { sizeof(ImS64), "%lld", "%lld" }, // ImGuiDataType_S64 - { sizeof(ImU64), "%llu", "%llu" }, + { sizeof(ImS64), "S64", "%lld", "%lld" }, // ImGuiDataType_S64 + { sizeof(ImU64), "U64", "%llu", "%llu" }, #endif - { sizeof(float), "%f", "%f" }, // ImGuiDataType_Float (float are promoted to double in va_arg) - { sizeof(double), "%f", "%lf" }, // ImGuiDataType_Double + { sizeof(float), "float", "%.3f","%f" }, // ImGuiDataType_Float (float are promoted to double in va_arg) + { sizeof(double), "double","%f", "%lf" }, // ImGuiDataType_Double + { sizeof(bool), "bool", "%d", "%d" }, // ImGuiDataType_Bool + { 0, "char*","%s", "%s" }, // ImGuiDataType_String }; IM_STATIC_ASSERT(IM_ARRAYSIZE(GDataTypeInfo) == ImGuiDataType_COUNT); -// FIXME-LEGACY: Prior to 1.61 our DragInt() function internally used floats and because of this the compile-time default value for format was "%.0f". -// Even though we changed the compile-time default, we expect users to have carried %f around, which would break the display of DragInt() calls. -// To honor backward compatibility we are rewriting the format string, unless IMGUI_DISABLE_OBSOLETE_FUNCTIONS is enabled. What could possibly go wrong?! -static const char* PatchFormatStringFloatToInt(const char* fmt) -{ - if (fmt[0] == '%' && fmt[1] == '.' && fmt[2] == '0' && fmt[3] == 'f' && fmt[4] == 0) // Fast legacy path for "%.0f" which is expected to be the most common case. - return "%d"; - const char* fmt_start = ImParseFormatFindStart(fmt); // Find % (if any, and ignore %%) - const char* fmt_end = ImParseFormatFindEnd(fmt_start); // Find end of format specifier, which itself is an exercise of confidence/recklessness (because snprintf is dependent on libc or user). - if (fmt_end > fmt_start && fmt_end[-1] == 'f') - { -#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS - if (fmt_start == fmt && fmt_end[0] == 0) - return "%d"; - ImGuiContext& g = *GImGui; - ImFormatString(g.TempBuffer, IM_ARRAYSIZE(g.TempBuffer), "%.*s%%d%s", (int)(fmt_start - fmt), fmt, fmt_end); // Honor leading and trailing decorations, but lose alignment/precision. - return g.TempBuffer; -#else - IM_ASSERT(0 && "DragInt(): Invalid format string!"); // Old versions used a default parameter of "%.0f", please replace with e.g. "%d" -#endif - } - return fmt; -} - const ImGuiDataTypeInfo* ImGui::DataTypeGetInfo(ImGuiDataType data_type) { IM_ASSERT(data_type >= 0 && data_type < ImGuiDataType_COUNT); return &GDataTypeInfo[data_type]; } -int ImGui::DataTypeFormatString(char* buf, int buf_size, ImGuiDataType data_type, const void* data_ptr, const char* format) +int ImGui::DataTypeFormatString(char* buf, int buf_size, ImGuiDataType data_type, const void* p_data, const char* format) { // Signedness doesn't matter when pushing integer arguments if (data_type == ImGuiDataType_S32 || data_type == ImGuiDataType_U32) - return ImFormatString(buf, buf_size, format, *(const ImU32*)data_ptr); + return ImFormatString(buf, buf_size, format, *(const ImU32*)p_data); if (data_type == ImGuiDataType_S64 || data_type == ImGuiDataType_U64) - return ImFormatString(buf, buf_size, format, *(const ImU64*)data_ptr); + return ImFormatString(buf, buf_size, format, *(const ImU64*)p_data); if (data_type == ImGuiDataType_Float) - return ImFormatString(buf, buf_size, format, *(const float*)data_ptr); + return ImFormatString(buf, buf_size, format, *(const float*)p_data); if (data_type == ImGuiDataType_Double) - return ImFormatString(buf, buf_size, format, *(const double*)data_ptr); + return ImFormatString(buf, buf_size, format, *(const double*)p_data); if (data_type == ImGuiDataType_S8) - return ImFormatString(buf, buf_size, format, *(const ImS8*)data_ptr); + return ImFormatString(buf, buf_size, format, *(const ImS8*)p_data); if (data_type == ImGuiDataType_U8) - return ImFormatString(buf, buf_size, format, *(const ImU8*)data_ptr); + return ImFormatString(buf, buf_size, format, *(const ImU8*)p_data); if (data_type == ImGuiDataType_S16) - return ImFormatString(buf, buf_size, format, *(const ImS16*)data_ptr); + return ImFormatString(buf, buf_size, format, *(const ImS16*)p_data); if (data_type == ImGuiDataType_U16) - return ImFormatString(buf, buf_size, format, *(const ImU16*)data_ptr); + return ImFormatString(buf, buf_size, format, *(const ImU16*)p_data); IM_ASSERT(0); return 0; } -void ImGui::DataTypeApplyOp(ImGuiDataType data_type, int op, void* output, void* arg1, const void* arg2) +void ImGui::DataTypeApplyOp(ImGuiDataType data_type, int op, void* output, const void* arg1, const void* arg2) { IM_ASSERT(op == '+' || op == '-'); switch (data_type) @@ -1759,105 +2287,116 @@ void ImGui::DataTypeApplyOp(ImGuiDataType data_type, int op, void* output, void* // User can input math operators (e.g. +100) to edit a numerical values. // NB: This is _not_ a full expression evaluator. We should probably add one and replace this dumb mess.. -bool ImGui::DataTypeApplyOpFromText(const char* buf, const char* initial_value_buf, ImGuiDataType data_type, void* data_ptr, const char* format) +bool ImGui::DataTypeApplyFromText(const char* buf, ImGuiDataType data_type, void* p_data, const char* format, void* p_data_when_empty) { + // Copy the value in an opaque buffer so we can compare at the end of the function if it changed at all. + const ImGuiDataTypeInfo* type_info = DataTypeGetInfo(data_type); + ImGuiDataTypeStorage data_backup; + memcpy(&data_backup, p_data, type_info->Size); + while (ImCharIsBlankA(*buf)) buf++; - - // We don't support '-' op because it would conflict with inputing negative value. - // Instead you can use +-100 to subtract from an existing value - char op = buf[0]; - if (op == '+' || op == '*' || op == '/') - { - buf++; - while (ImCharIsBlankA(*buf)) - buf++; - } - else - { - op = 0; - } if (!buf[0]) + { + if (p_data_when_empty != NULL) + { + memcpy(p_data, p_data_when_empty, type_info->Size); + return memcmp(&data_backup, p_data, type_info->Size) != 0; + } return false; + } - // Copy the value in an opaque buffer so we can compare at the end of the function if it changed at all. - IM_ASSERT(data_type < ImGuiDataType_COUNT); - int data_backup[2]; - const ImGuiDataTypeInfo* type_info = ImGui::DataTypeGetInfo(data_type); - IM_ASSERT(type_info->Size <= sizeof(data_backup)); - memcpy(data_backup, data_ptr, type_info->Size); - - if (format == NULL) + // Sanitize format + // - For float/double we have to ignore format with precision (e.g. "%.2f") because sscanf doesn't take them in, so force them into %f and %lf + // - In theory could treat empty format as using default, but this would only cover rare/bizarre case of using InputScalar() + integer + format string without %. + char format_sanitized[32]; + if (data_type == ImGuiDataType_Float || data_type == ImGuiDataType_Double) format = type_info->ScanFmt; - - // FIXME-LEGACY: The aim is to remove those operators and write a proper expression evaluator at some point.. - int arg1i = 0; - if (data_type == ImGuiDataType_S32) - { - int* v = (int*)data_ptr; - int arg0i = *v; - float arg1f = 0.0f; - if (op && sscanf(initial_value_buf, format, &arg0i) < 1) - return false; - // Store operand in a float so we can use fractional value for multipliers (*1.1), but constant always parsed as integer so we can fit big integers (e.g. 2000000003) past float precision - if (op == '+') { if (sscanf(buf, "%d", &arg1i)) *v = (int)(arg0i + arg1i); } // Add (use "+-" to subtract) - else if (op == '*') { if (sscanf(buf, "%f", &arg1f)) *v = (int)(arg0i * arg1f); } // Multiply - else if (op == '/') { if (sscanf(buf, "%f", &arg1f) && arg1f != 0.0f) *v = (int)(arg0i / arg1f); } // Divide - else { if (sscanf(buf, format, &arg1i) == 1) *v = arg1i; } // Assign constant - } - else if (data_type == ImGuiDataType_Float) - { - // For floats we have to ignore format with precision (e.g. "%.2f") because sscanf doesn't take them in - format = "%f"; - float* v = (float*)data_ptr; - float arg0f = *v, arg1f = 0.0f; - if (op && sscanf(initial_value_buf, format, &arg0f) < 1) - return false; - if (sscanf(buf, format, &arg1f) < 1) - return false; - if (op == '+') { *v = arg0f + arg1f; } // Add (use "+-" to subtract) - else if (op == '*') { *v = arg0f * arg1f; } // Multiply - else if (op == '/') { if (arg1f != 0.0f) *v = arg0f / arg1f; } // Divide - else { *v = arg1f; } // Assign constant - } - else if (data_type == ImGuiDataType_Double) - { - format = "%lf"; // scanf differentiate float/double unlike printf which forces everything to double because of ellipsis - double* v = (double*)data_ptr; - double arg0f = *v, arg1f = 0.0; - if (op && sscanf(initial_value_buf, format, &arg0f) < 1) - return false; - if (sscanf(buf, format, &arg1f) < 1) - return false; - if (op == '+') { *v = arg0f + arg1f; } // Add (use "+-" to subtract) - else if (op == '*') { *v = arg0f * arg1f; } // Multiply - else if (op == '/') { if (arg1f != 0.0f) *v = arg0f / arg1f; } // Divide - else { *v = arg1f; } // Assign constant - } - else if (data_type == ImGuiDataType_U32 || data_type == ImGuiDataType_S64 || data_type == ImGuiDataType_U64) - { - // All other types assign constant - // We don't bother handling support for legacy operators since they are a little too crappy. Instead we will later implement a proper expression evaluator in the future. - sscanf(buf, format, data_ptr); - } else + format = ImParseFormatSanitizeForScanning(format, format_sanitized, IM_ARRAYSIZE(format_sanitized)); + + // Small types need a 32-bit buffer to receive the result from scanf() + int v32 = 0; + if (sscanf(buf, format, type_info->Size >= 4 ? p_data : &v32) < 1) + return false; + if (type_info->Size < 4) { - // Small types need a 32-bit buffer to receive the result from scanf() - int v32; - sscanf(buf, format, &v32); if (data_type == ImGuiDataType_S8) - *(ImS8*)data_ptr = (ImS8)ImClamp(v32, (int)IM_S8_MIN, (int)IM_S8_MAX); + *(ImS8*)p_data = (ImS8)ImClamp(v32, (int)IM_S8_MIN, (int)IM_S8_MAX); else if (data_type == ImGuiDataType_U8) - *(ImU8*)data_ptr = (ImU8)ImClamp(v32, (int)IM_U8_MIN, (int)IM_U8_MAX); + *(ImU8*)p_data = (ImU8)ImClamp(v32, (int)IM_U8_MIN, (int)IM_U8_MAX); else if (data_type == ImGuiDataType_S16) - *(ImS16*)data_ptr = (ImS16)ImClamp(v32, (int)IM_S16_MIN, (int)IM_S16_MAX); + *(ImS16*)p_data = (ImS16)ImClamp(v32, (int)IM_S16_MIN, (int)IM_S16_MAX); else if (data_type == ImGuiDataType_U16) - *(ImU16*)data_ptr = (ImU16)ImClamp(v32, (int)IM_U16_MIN, (int)IM_U16_MAX); + *(ImU16*)p_data = (ImU16)ImClamp(v32, (int)IM_U16_MIN, (int)IM_U16_MAX); else IM_ASSERT(0); } - return memcmp(data_backup, data_ptr, type_info->Size) != 0; + return memcmp(&data_backup, p_data, type_info->Size) != 0; +} + +template +static int DataTypeCompareT(const T* lhs, const T* rhs) +{ + if (*lhs < *rhs) return -1; + if (*lhs > *rhs) return +1; + return 0; +} + +int ImGui::DataTypeCompare(ImGuiDataType data_type, const void* arg_1, const void* arg_2) +{ + switch (data_type) + { + case ImGuiDataType_S8: return DataTypeCompareT((const ImS8* )arg_1, (const ImS8* )arg_2); + case ImGuiDataType_U8: return DataTypeCompareT((const ImU8* )arg_1, (const ImU8* )arg_2); + case ImGuiDataType_S16: return DataTypeCompareT((const ImS16* )arg_1, (const ImS16* )arg_2); + case ImGuiDataType_U16: return DataTypeCompareT((const ImU16* )arg_1, (const ImU16* )arg_2); + case ImGuiDataType_S32: return DataTypeCompareT((const ImS32* )arg_1, (const ImS32* )arg_2); + case ImGuiDataType_U32: return DataTypeCompareT((const ImU32* )arg_1, (const ImU32* )arg_2); + case ImGuiDataType_S64: return DataTypeCompareT((const ImS64* )arg_1, (const ImS64* )arg_2); + case ImGuiDataType_U64: return DataTypeCompareT((const ImU64* )arg_1, (const ImU64* )arg_2); + case ImGuiDataType_Float: return DataTypeCompareT((const float* )arg_1, (const float* )arg_2); + case ImGuiDataType_Double: return DataTypeCompareT((const double*)arg_1, (const double*)arg_2); + case ImGuiDataType_COUNT: break; + } + IM_ASSERT(0); + return 0; +} + +template +static bool DataTypeClampT(T* v, const T* v_min, const T* v_max) +{ + // Clamp, both sides are optional, return true if modified + if (v_min && *v < *v_min) { *v = *v_min; return true; } + if (v_max && *v > *v_max) { *v = *v_max; return true; } + return false; +} + +bool ImGui::DataTypeClamp(ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max) +{ + switch (data_type) + { + case ImGuiDataType_S8: return DataTypeClampT((ImS8* )p_data, (const ImS8* )p_min, (const ImS8* )p_max); + case ImGuiDataType_U8: return DataTypeClampT((ImU8* )p_data, (const ImU8* )p_min, (const ImU8* )p_max); + case ImGuiDataType_S16: return DataTypeClampT((ImS16* )p_data, (const ImS16* )p_min, (const ImS16* )p_max); + case ImGuiDataType_U16: return DataTypeClampT((ImU16* )p_data, (const ImU16* )p_min, (const ImU16* )p_max); + case ImGuiDataType_S32: return DataTypeClampT((ImS32* )p_data, (const ImS32* )p_min, (const ImS32* )p_max); + case ImGuiDataType_U32: return DataTypeClampT((ImU32* )p_data, (const ImU32* )p_min, (const ImU32* )p_max); + case ImGuiDataType_S64: return DataTypeClampT((ImS64* )p_data, (const ImS64* )p_min, (const ImS64* )p_max); + case ImGuiDataType_U64: return DataTypeClampT((ImU64* )p_data, (const ImU64* )p_min, (const ImU64* )p_max); + case ImGuiDataType_Float: return DataTypeClampT((float* )p_data, (const float* )p_min, (const float* )p_max); + case ImGuiDataType_Double: return DataTypeClampT((double*)p_data, (const double*)p_min, (const double*)p_max); + case ImGuiDataType_COUNT: break; + } + IM_ASSERT(0); + return false; +} + +bool ImGui::DataTypeIsZero(ImGuiDataType data_type, const void* p_data) +{ + ImGuiContext& g = *GImGui; + return DataTypeCompare(data_type, p_data, &g.DataTypeZeroValue) == 0; } static float GetMinimumStepAtDecimalPrecision(int decimal_precision) @@ -1869,33 +2408,27 @@ static float GetMinimumStepAtDecimalPrecision(int decimal_precision) } template -static const char* ImAtoi(const char* src, TYPE* output) -{ - int negative = 0; - if (*src == '-') { negative = 1; src++; } - if (*src == '+') { src++; } - TYPE v = 0; - while (*src >= '0' && *src <= '9') - v = (v * 10) + (*src++ - '0'); - *output = negative ? -v : v; - return src; -} - -template TYPE ImGui::RoundScalarWithFormatT(const char* format, ImGuiDataType data_type, TYPE v) { + IM_UNUSED(data_type); + IM_ASSERT(data_type == ImGuiDataType_Float || data_type == ImGuiDataType_Double); const char* fmt_start = ImParseFormatFindStart(format); if (fmt_start[0] != '%' || fmt_start[1] == '%') // Don't apply if the value is not visible in the format string return v; + + // Sanitize format + char fmt_sanitized[32]; + ImParseFormatSanitizeForPrinting(fmt_start, fmt_sanitized, IM_ARRAYSIZE(fmt_sanitized)); + fmt_start = fmt_sanitized; + + // Format value with our rounding, and read back char v_str[64]; ImFormatString(v_str, IM_ARRAYSIZE(v_str), fmt_start, v); const char* p = v_str; while (*p == ' ') p++; - if (data_type == ImGuiDataType_Float || data_type == ImGuiDataType_Double) - v = (TYPE)ImAtof(p); - else - ImAtoi(p, (SIGNEDTYPE*)&v); + v = (TYPE)ImAtof(p); + return v; } @@ -1920,35 +2453,36 @@ TYPE ImGui::RoundScalarWithFormatT(const char* format, ImGuiDataType data_type, // This is called by DragBehavior() when the widget is active (held by mouse or being manipulated with Nav controls) template -bool ImGui::DragBehaviorT(ImGuiDataType data_type, TYPE* v, float v_speed, const TYPE v_min, const TYPE v_max, const char* format, float power, ImGuiDragFlags flags) +bool ImGui::DragBehaviorT(ImGuiDataType data_type, TYPE* v, float v_speed, const TYPE v_min, const TYPE v_max, const char* format, ImGuiSliderFlags flags) { ImGuiContext& g = *GImGui; - const ImGuiAxis axis = (flags & ImGuiDragFlags_Vertical) ? ImGuiAxis_Y : ImGuiAxis_X; - const bool is_decimal = (data_type == ImGuiDataType_Float) || (data_type == ImGuiDataType_Double); - const bool is_clamped = (v_min < v_max); - const bool is_power = (power != 1.0f && is_decimal && is_clamped && (v_max - v_min < FLT_MAX)); - const bool is_locked = (v_min > v_max); - if (is_locked) - return false; + const ImGuiAxis axis = (flags & ImGuiSliderFlags_Vertical) ? ImGuiAxis_Y : ImGuiAxis_X; + const bool is_bounded = (v_min < v_max) || ((v_min == v_max) && (v_min != 0.0f || (flags & ImGuiSliderFlags_ClampZeroRange))); + const bool is_wrapped = is_bounded && (flags & ImGuiSliderFlags_WrapAround); + const bool is_logarithmic = (flags & ImGuiSliderFlags_Logarithmic) != 0; + const bool is_floating_point = (data_type == ImGuiDataType_Float) || (data_type == ImGuiDataType_Double); // Default tweak speed - if (v_speed == 0.0f && is_clamped && (v_max - v_min < FLT_MAX)) + if (v_speed == 0.0f && is_bounded && (v_max - v_min < FLT_MAX)) v_speed = (float)((v_max - v_min) * g.DragSpeedDefaultRatio); // Inputs accumulates into g.DragCurrentAccum, which is flushed into the current value as soon as it makes a difference with our precision settings float adjust_delta = 0.0f; - if (g.ActiveIdSource == ImGuiInputSource_Mouse && IsMousePosValid() && g.IO.MouseDragMaxDistanceSqr[0] > 1.0f*1.0f) + if (g.ActiveIdSource == ImGuiInputSource_Mouse && IsMousePosValid() && IsMouseDragPastThreshold(0, g.IO.MouseDragThreshold * DRAG_MOUSE_THRESHOLD_FACTOR)) { adjust_delta = g.IO.MouseDelta[axis]; - if (g.IO.KeyAlt) + if (g.IO.KeyAlt && !(flags & ImGuiSliderFlags_NoSpeedTweaks)) adjust_delta *= 1.0f / 100.0f; - if (g.IO.KeyShift) + if (g.IO.KeyShift && !(flags & ImGuiSliderFlags_NoSpeedTweaks)) adjust_delta *= 10.0f; } - else if (g.ActiveIdSource == ImGuiInputSource_Nav) + else if (g.ActiveIdSource == ImGuiInputSource_Keyboard || g.ActiveIdSource == ImGuiInputSource_Gamepad) { - int decimal_precision = is_decimal ? ImParseFormatPrecision(format, 3) : 0; - adjust_delta = GetNavInputAmount2d(ImGuiNavDirSourceFlags_Keyboard | ImGuiNavDirSourceFlags_PadDPad, ImGuiInputReadMode_RepeatFast, 1.0f / 10.0f, 10.0f)[axis]; + const int decimal_precision = is_floating_point ? ImParseFormatPrecision(format, 3) : 0; + const bool tweak_slow = IsKeyDown((g.NavInputSource == ImGuiInputSource_Gamepad) ? ImGuiKey_NavGamepadTweakSlow : ImGuiKey_NavKeyboardTweakSlow); + const bool tweak_fast = IsKeyDown((g.NavInputSource == ImGuiInputSource_Gamepad) ? ImGuiKey_NavGamepadTweakFast : ImGuiKey_NavKeyboardTweakFast); + const float tweak_factor = (flags & ImGuiSliderFlags_NoSpeedTweaks) ? 1.0f : tweak_slow ? 1.0f / 10.0f : tweak_fast ? 10.0f : 1.0f; + adjust_delta = GetNavTweakPressedAmount(axis) * tweak_factor; v_speed = ImMax(v_speed, GetMinimumStepAtDecimalPrecision(decimal_precision)); } adjust_delta *= v_speed; @@ -1957,12 +2491,15 @@ bool ImGui::DragBehaviorT(ImGuiDataType data_type, TYPE* v, float v_speed, const if (axis == ImGuiAxis_Y) adjust_delta = -adjust_delta; + // For logarithmic use our range is effectively 0..1 so scale the delta into that range + if (is_logarithmic && (v_max - v_min < FLT_MAX) && ((v_max - v_min) > 0.000001f)) // Epsilon to avoid /0 + adjust_delta /= (float)(v_max - v_min); + // Clear current value on activation // Avoid altering values and clamping when we are _already_ past the limits and heading in the same direction, so e.g. if range is 0..255, current value is 300 and we are pushing to the right side, keep the 300. - bool is_just_activated = g.ActiveIdIsJustActivated; - bool is_already_past_limits_and_pushing_outward = is_clamped && ((*v >= v_max && adjust_delta > 0.0f) || (*v <= v_min && adjust_delta < 0.0f)); - bool is_drag_direction_change_with_power = is_power && ((adjust_delta < 0 && g.DragCurrentAccum > 0) || (adjust_delta > 0 && g.DragCurrentAccum < 0)); - if (is_just_activated || is_already_past_limits_and_pushing_outward || is_drag_direction_change_with_power) + const bool is_just_activated = g.ActiveIdIsJustActivated; + const bool is_already_past_limits_and_pushing_outward = is_bounded && !is_wrapped && ((*v >= v_max && adjust_delta > 0.0f) || (*v <= v_min && adjust_delta < 0.0f)); + if (is_just_activated || is_already_past_limits_and_pushing_outward) { g.DragCurrentAccum = 0.0f; g.DragCurrentAccumDirty = false; @@ -1979,13 +2516,19 @@ bool ImGui::DragBehaviorT(ImGuiDataType data_type, TYPE* v, float v_speed, const TYPE v_cur = *v; FLOATTYPE v_old_ref_for_accum_remainder = (FLOATTYPE)0.0f; - if (is_power) + float logarithmic_zero_epsilon = 0.0f; // Only valid when is_logarithmic is true + const float zero_deadzone_halfsize = 0.0f; // Drag widgets have no deadzone (as it doesn't make sense) + if (is_logarithmic) { - // Offset + round to user desired precision, with a curve on the v_min..v_max range to get more precision on one side of the range - FLOATTYPE v_old_norm_curved = ImPow((FLOATTYPE)(v_cur - v_min) / (FLOATTYPE)(v_max - v_min), (FLOATTYPE)1.0f / power); - FLOATTYPE v_new_norm_curved = v_old_norm_curved + (g.DragCurrentAccum / (v_max - v_min)); - v_cur = v_min + (SIGNEDTYPE)ImPow(ImSaturate((float)v_new_norm_curved), power) * (v_max - v_min); - v_old_ref_for_accum_remainder = v_old_norm_curved; + // When using logarithmic sliders, we need to clamp to avoid hitting zero, but our choice of clamp value greatly affects slider precision. We attempt to use the specified precision to estimate a good lower bound. + const int decimal_precision = is_floating_point ? ImParseFormatPrecision(format, 3) : 1; + logarithmic_zero_epsilon = ImPow(0.1f, (float)decimal_precision); + + // Convert to parametric space, apply delta, convert back + float v_old_parametric = ScaleRatioFromValueT(data_type, v_cur, v_min, v_max, is_logarithmic, logarithmic_zero_epsilon, zero_deadzone_halfsize); + float v_new_parametric = v_old_parametric + g.DragCurrentAccum; + v_cur = ScaleValueFromRatioT(data_type, v_new_parametric, v_min, v_max, is_logarithmic, logarithmic_zero_epsilon, zero_deadzone_halfsize); + v_old_ref_for_accum_remainder = v_old_parametric; } else { @@ -1993,14 +2536,16 @@ bool ImGui::DragBehaviorT(ImGuiDataType data_type, TYPE* v, float v_speed, const } // Round to user desired precision based on format string - v_cur = RoundScalarWithFormatT(format, data_type, v_cur); + if (is_floating_point && !(flags & ImGuiSliderFlags_NoRoundToFormat)) + v_cur = RoundScalarWithFormatT(format, data_type, v_cur); // Preserve remainder after rounding has been applied. This also allow slow tweaking of values. g.DragCurrentAccumDirty = false; - if (is_power) + if (is_logarithmic) { - FLOATTYPE v_cur_norm_curved = ImPow((FLOATTYPE)(v_cur - v_min) / (FLOATTYPE)(v_max - v_min), (FLOATTYPE)1.0f / power); - g.DragCurrentAccum -= (float)(v_cur_norm_curved - v_old_ref_for_accum_remainder); + // Convert to parametric space, apply delta, convert back + float v_new_parametric = ScaleRatioFromValueT(data_type, v_cur, v_min, v_max, is_logarithmic, logarithmic_zero_epsilon, zero_deadzone_halfsize); + g.DragCurrentAccum -= (float)(v_new_parametric - v_old_ref_for_accum_remainder); } else { @@ -2011,13 +2556,24 @@ bool ImGui::DragBehaviorT(ImGuiDataType data_type, TYPE* v, float v_speed, const if (v_cur == (TYPE)-0) v_cur = (TYPE)0; - // Clamp values (+ handle overflow/wrap-around for integer types) - if (*v != v_cur && is_clamped) + if (*v != v_cur && is_bounded) { - if (v_cur < v_min || (v_cur > *v && adjust_delta < 0.0f && !is_decimal)) - v_cur = v_min; - if (v_cur > v_max || (v_cur < *v && adjust_delta > 0.0f && !is_decimal)) - v_cur = v_max; + if (is_wrapped) + { + // Wrap values + if (v_cur < v_min) + v_cur += v_max - v_min + (is_floating_point ? 0 : 1); + if (v_cur > v_max) + v_cur -= v_max - v_min + (is_floating_point ? 0 : 1); + } + else + { + // Clamp values + handle overflow/wrap-around for integer types. + if (v_cur < v_min || (v_cur > *v && adjust_delta < 0.0f && !is_floating_point)) + v_cur = v_min; + if (v_cur > v_max || (v_cur < *v && adjust_delta > 0.0f && !is_floating_point)) + v_cur = v_max; + } } // Apply result @@ -2027,112 +2583,145 @@ bool ImGui::DragBehaviorT(ImGuiDataType data_type, TYPE* v, float v_speed, const return true; } -bool ImGui::DragBehavior(ImGuiID id, ImGuiDataType data_type, void* v, float v_speed, const void* v_min, const void* v_max, const char* format, float power, ImGuiDragFlags flags) +bool ImGui::DragBehavior(ImGuiID id, ImGuiDataType data_type, void* p_v, float v_speed, const void* p_min, const void* p_max, const char* format, ImGuiSliderFlags flags) { + // Read imgui.cpp "API BREAKING CHANGES" section for 1.78 if you hit this assert. + IM_ASSERT((flags == 1 || (flags & ImGuiSliderFlags_InvalidMask_) == 0) && "Invalid ImGuiSliderFlags flags! Has the legacy 'float power' argument been mistakenly cast to flags? Call function with ImGuiSliderFlags_Logarithmic flags instead."); + ImGuiContext& g = *GImGui; if (g.ActiveId == id) { + // Those are the things we can do easily outside the DragBehaviorT<> template, saves code generation. if (g.ActiveIdSource == ImGuiInputSource_Mouse && !g.IO.MouseDown[0]) ClearActiveID(); - else if (g.ActiveIdSource == ImGuiInputSource_Nav && g.NavActivatePressedId == id && !g.ActiveIdIsJustActivated) + else if ((g.ActiveIdSource == ImGuiInputSource_Keyboard || g.ActiveIdSource == ImGuiInputSource_Gamepad) && g.NavActivatePressedId == id && !g.ActiveIdIsJustActivated) ClearActiveID(); } if (g.ActiveId != id) return false; + if ((g.LastItemData.ItemFlags & ImGuiItemFlags_ReadOnly) || (flags & ImGuiSliderFlags_ReadOnly)) + return false; switch (data_type) { - case ImGuiDataType_S8: { ImS32 v32 = (ImS32)*(ImS8*)v; bool r = DragBehaviorT(ImGuiDataType_S32, &v32, v_speed, v_min ? *(const ImS8*) v_min : IM_S8_MIN, v_max ? *(const ImS8*)v_max : IM_S8_MAX, format, power, flags); if (r) *(ImS8*)v = (ImS8)v32; return r; } - case ImGuiDataType_U8: { ImU32 v32 = (ImU32)*(ImU8*)v; bool r = DragBehaviorT(ImGuiDataType_U32, &v32, v_speed, v_min ? *(const ImU8*) v_min : IM_U8_MIN, v_max ? *(const ImU8*)v_max : IM_U8_MAX, format, power, flags); if (r) *(ImU8*)v = (ImU8)v32; return r; } - case ImGuiDataType_S16: { ImS32 v32 = (ImS32)*(ImS16*)v; bool r = DragBehaviorT(ImGuiDataType_S32, &v32, v_speed, v_min ? *(const ImS16*)v_min : IM_S16_MIN, v_max ? *(const ImS16*)v_max : IM_S16_MAX, format, power, flags); if (r) *(ImS16*)v = (ImS16)v32; return r; } - case ImGuiDataType_U16: { ImU32 v32 = (ImU32)*(ImU16*)v; bool r = DragBehaviorT(ImGuiDataType_U32, &v32, v_speed, v_min ? *(const ImU16*)v_min : IM_U16_MIN, v_max ? *(const ImU16*)v_max : IM_U16_MAX, format, power, flags); if (r) *(ImU16*)v = (ImU16)v32; return r; } - case ImGuiDataType_S32: return DragBehaviorT(data_type, (ImS32*)v, v_speed, v_min ? *(const ImS32* )v_min : IM_S32_MIN, v_max ? *(const ImS32* )v_max : IM_S32_MAX, format, power, flags); - case ImGuiDataType_U32: return DragBehaviorT(data_type, (ImU32*)v, v_speed, v_min ? *(const ImU32* )v_min : IM_U32_MIN, v_max ? *(const ImU32* )v_max : IM_U32_MAX, format, power, flags); - case ImGuiDataType_S64: return DragBehaviorT(data_type, (ImS64*)v, v_speed, v_min ? *(const ImS64* )v_min : IM_S64_MIN, v_max ? *(const ImS64* )v_max : IM_S64_MAX, format, power, flags); - case ImGuiDataType_U64: return DragBehaviorT(data_type, (ImU64*)v, v_speed, v_min ? *(const ImU64* )v_min : IM_U64_MIN, v_max ? *(const ImU64* )v_max : IM_U64_MAX, format, power, flags); - case ImGuiDataType_Float: return DragBehaviorT(data_type, (float*)v, v_speed, v_min ? *(const float* )v_min : -FLT_MAX, v_max ? *(const float* )v_max : FLT_MAX, format, power, flags); - case ImGuiDataType_Double: return DragBehaviorT(data_type, (double*)v, v_speed, v_min ? *(const double*)v_min : -DBL_MAX, v_max ? *(const double*)v_max : DBL_MAX, format, power, flags); + case ImGuiDataType_S8: { ImS32 v32 = (ImS32)*(ImS8*)p_v; bool r = DragBehaviorT(ImGuiDataType_S32, &v32, v_speed, p_min ? *(const ImS8*) p_min : IM_S8_MIN, p_max ? *(const ImS8*)p_max : IM_S8_MAX, format, flags); if (r) *(ImS8*)p_v = (ImS8)v32; return r; } + case ImGuiDataType_U8: { ImU32 v32 = (ImU32)*(ImU8*)p_v; bool r = DragBehaviorT(ImGuiDataType_U32, &v32, v_speed, p_min ? *(const ImU8*) p_min : IM_U8_MIN, p_max ? *(const ImU8*)p_max : IM_U8_MAX, format, flags); if (r) *(ImU8*)p_v = (ImU8)v32; return r; } + case ImGuiDataType_S16: { ImS32 v32 = (ImS32)*(ImS16*)p_v; bool r = DragBehaviorT(ImGuiDataType_S32, &v32, v_speed, p_min ? *(const ImS16*)p_min : IM_S16_MIN, p_max ? *(const ImS16*)p_max : IM_S16_MAX, format, flags); if (r) *(ImS16*)p_v = (ImS16)v32; return r; } + case ImGuiDataType_U16: { ImU32 v32 = (ImU32)*(ImU16*)p_v; bool r = DragBehaviorT(ImGuiDataType_U32, &v32, v_speed, p_min ? *(const ImU16*)p_min : IM_U16_MIN, p_max ? *(const ImU16*)p_max : IM_U16_MAX, format, flags); if (r) *(ImU16*)p_v = (ImU16)v32; return r; } + case ImGuiDataType_S32: return DragBehaviorT(data_type, (ImS32*)p_v, v_speed, p_min ? *(const ImS32* )p_min : IM_S32_MIN, p_max ? *(const ImS32* )p_max : IM_S32_MAX, format, flags); + case ImGuiDataType_U32: return DragBehaviorT(data_type, (ImU32*)p_v, v_speed, p_min ? *(const ImU32* )p_min : IM_U32_MIN, p_max ? *(const ImU32* )p_max : IM_U32_MAX, format, flags); + case ImGuiDataType_S64: return DragBehaviorT(data_type, (ImS64*)p_v, v_speed, p_min ? *(const ImS64* )p_min : IM_S64_MIN, p_max ? *(const ImS64* )p_max : IM_S64_MAX, format, flags); + case ImGuiDataType_U64: return DragBehaviorT(data_type, (ImU64*)p_v, v_speed, p_min ? *(const ImU64* )p_min : IM_U64_MIN, p_max ? *(const ImU64* )p_max : IM_U64_MAX, format, flags); + case ImGuiDataType_Float: return DragBehaviorT(data_type, (float*)p_v, v_speed, p_min ? *(const float* )p_min : -FLT_MAX, p_max ? *(const float* )p_max : FLT_MAX, format, flags); + case ImGuiDataType_Double: return DragBehaviorT(data_type, (double*)p_v, v_speed, p_min ? *(const double*)p_min : -DBL_MAX, p_max ? *(const double*)p_max : DBL_MAX, format, flags); case ImGuiDataType_COUNT: break; } IM_ASSERT(0); return false; } -bool ImGui::DragScalar(const char* label, ImGuiDataType data_type, void* v, float v_speed, const void* v_min, const void* v_max, const char* format, float power) +// Note: p_data, p_min and p_max are _pointers_ to a memory address holding the data. For a Drag widget, p_min and p_max are optional. +// Read code of e.g. DragFloat(), DragInt() etc. or examples in 'Demo->Widgets->Data Types' to understand how to use this function directly. +bool ImGui::DragScalar(const char* label, ImGuiDataType data_type, void* p_data, float v_speed, const void* p_min, const void* p_max, const char* format, ImGuiSliderFlags flags) { ImGuiWindow* window = GetCurrentWindow(); if (window->SkipItems) return false; - if (power != 1.0f) - IM_ASSERT(v_min != NULL && v_max != NULL); // When using a power curve the drag needs to have known bounds - ImGuiContext& g = *GImGui; const ImGuiStyle& style = g.Style; const ImGuiID id = window->GetID(label); const float w = CalcItemWidth(); + const ImVec2 label_size = CalcTextSize(label, NULL, true); - const ImRect frame_bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(w, label_size.y + style.FramePadding.y*2.0f)); + const ImRect frame_bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(w, label_size.y + style.FramePadding.y * 2.0f)); const ImRect total_bb(frame_bb.Min, frame_bb.Max + ImVec2(label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f, 0.0f)); + const bool temp_input_allowed = (flags & ImGuiSliderFlags_NoInput) == 0; ItemSize(total_bb, style.FramePadding.y); - if (!ItemAdd(total_bb, id, &frame_bb)) + if (!ItemAdd(total_bb, id, &frame_bb, temp_input_allowed ? ImGuiItemFlags_Inputable : 0)) return false; // Default format string when passing NULL if (format == NULL) format = DataTypeGetInfo(data_type)->PrintFmt; - else if (data_type == ImGuiDataType_S32 && strcmp(format, "%d") != 0) // (FIXME-LEGACY: Patch old "%.0f" format string to use "%d", read function more details.) - format = PatchFormatStringFloatToInt(format); - // Tabbing or CTRL-clicking on Drag turns it into an input box - const bool hovered = ItemHoverable(frame_bb, id); - bool temp_input_is_active = TempInputTextIsActive(id); - bool temp_input_start = false; + const bool hovered = ItemHoverable(frame_bb, id, g.LastItemData.ItemFlags); + bool temp_input_is_active = temp_input_allowed && TempInputIsActive(id); if (!temp_input_is_active) { - const bool focus_requested = FocusableItemRegister(window, id); - const bool clicked = (hovered && g.IO.MouseClicked[0]); - const bool double_clicked = (hovered && g.IO.MouseDoubleClicked[0]); - if (focus_requested || clicked || double_clicked || g.NavActivateId == id || g.NavInputId == id) + // Tabbing or CTRL+click on Drag turns it into an InputText + const bool clicked = hovered && IsMouseClicked(0, ImGuiInputFlags_None, id); + const bool double_clicked = (hovered && g.IO.MouseClickedCount[0] == 2 && TestKeyOwner(ImGuiKey_MouseLeft, id)); + const bool make_active = (clicked || double_clicked || g.NavActivateId == id); + if (make_active && (clicked || double_clicked)) + SetKeyOwner(ImGuiKey_MouseLeft, id); + if (make_active && temp_input_allowed) + if ((clicked && g.IO.KeyCtrl) || double_clicked || (g.NavActivateId == id && (g.NavActivateFlags & ImGuiActivateFlags_PreferInput))) + temp_input_is_active = true; + + // (Optional) simple click (without moving) turns Drag into an InputText + if (g.IO.ConfigDragClickToInputText && temp_input_allowed && !temp_input_is_active) + if (g.ActiveId == id && hovered && g.IO.MouseReleased[0] && !IsMouseDragPastThreshold(0, g.IO.MouseDragThreshold * DRAG_MOUSE_THRESHOLD_FACTOR)) + { + g.NavActivateId = id; + g.NavActivateFlags = ImGuiActivateFlags_PreferInput; + temp_input_is_active = true; + } + + // Store initial value (not used by main lib but available as a convenience but some mods e.g. to revert) + if (make_active) + memcpy(&g.ActiveIdValueOnActivation, p_data, DataTypeGetInfo(data_type)->Size); + + if (make_active && !temp_input_is_active) { SetActiveID(id, window); SetFocusID(id, window); FocusWindow(window); - g.ActiveIdAllowNavDirFlags = (1 << ImGuiDir_Up) | (1 << ImGuiDir_Down); - if (focus_requested || (clicked && g.IO.KeyCtrl) || double_clicked || g.NavInputId == id) - { - temp_input_start = true; - FocusableItemUnregister(window); - } + g.ActiveIdUsingNavDirMask = (1 << ImGuiDir_Left) | (1 << ImGuiDir_Right); } } - if (temp_input_is_active || temp_input_start) - return TempInputTextScalar(frame_bb, id, label, data_type, v, format); + + if (temp_input_is_active) + { + // Only clamp CTRL+Click input when ImGuiSliderFlags_ClampOnInput is set (generally via ImGuiSliderFlags_AlwaysClamp) + bool clamp_enabled = false; + if ((flags & ImGuiSliderFlags_ClampOnInput) && (p_min != NULL || p_max != NULL)) + { + const int clamp_range_dir = (p_min != NULL && p_max != NULL) ? DataTypeCompare(data_type, p_min, p_max) : 0; // -1 when *p_min < *p_max, == 0 when *p_min == *p_max + if (p_min == NULL || p_max == NULL || clamp_range_dir < 0) + clamp_enabled = true; + else if (clamp_range_dir == 0) + clamp_enabled = DataTypeIsZero(data_type, p_min) ? ((flags & ImGuiSliderFlags_ClampZeroRange) != 0) : true; + } + return TempInputScalar(frame_bb, id, label, data_type, p_data, format, clamp_enabled ? p_min : NULL, clamp_enabled ? p_max : NULL); + } // Draw frame - const ImU32 frame_col = GetColorU32(g.ActiveId == id ? ImGuiCol_FrameBgActive : g.HoveredId == id ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg); - RenderNavHighlight(frame_bb, id); + const ImU32 frame_col = GetColorU32(g.ActiveId == id ? ImGuiCol_FrameBgActive : hovered ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg); + RenderNavCursor(frame_bb, id); RenderFrame(frame_bb.Min, frame_bb.Max, frame_col, true, style.FrameRounding); // Drag behavior - const bool value_changed = DragBehavior(id, data_type, v, v_speed, v_min, v_max, format, power, ImGuiDragFlags_None); + const bool value_changed = DragBehavior(id, data_type, p_data, v_speed, p_min, p_max, format, flags); if (value_changed) MarkItemEdited(id); // Display value using user-provided display format so user can add prefix/suffix/decorations to the value. char value_buf[64]; - const char* value_buf_end = value_buf + DataTypeFormatString(value_buf, IM_ARRAYSIZE(value_buf), data_type, v, format); + const char* value_buf_end = value_buf + DataTypeFormatString(value_buf, IM_ARRAYSIZE(value_buf), data_type, p_data, format); + if (g.LogEnabled) + LogSetNextTextDecoration("{", "}"); RenderTextClipped(frame_bb.Min, frame_bb.Max, value_buf, value_buf_end, NULL, ImVec2(0.5f, 0.5f)); if (label_size.x > 0.0f) RenderText(ImVec2(frame_bb.Max.x + style.ItemInnerSpacing.x, frame_bb.Min.y + style.FramePadding.y), label); - IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.ItemFlags); + IMGUI_TEST_ENGINE_ITEM_INFO(id, label, g.LastItemData.StatusFlags | (temp_input_allowed ? ImGuiItemStatusFlags_Inputable : 0)); return value_changed; } -bool ImGui::DragScalarN(const char* label, ImGuiDataType data_type, void* v, int components, float v_speed, const void* v_min, const void* v_max, const char* format, float power) +bool ImGui::DragScalarN(const char* label, ImGuiDataType data_type, void* p_data, int components, float v_speed, const void* p_min, const void* p_max, const char* format, ImGuiSliderFlags flags) { ImGuiWindow* window = GetCurrentWindow(); if (window->SkipItems) @@ -2149,10 +2738,10 @@ bool ImGui::DragScalarN(const char* label, ImGuiDataType data_type, void* v, int PushID(i); if (i > 0) SameLine(0, g.Style.ItemInnerSpacing.x); - value_changed |= DragScalar("", data_type, v, v_speed, v_min, v_max, format, power); + value_changed |= DragScalar("", data_type, p_data, v_speed, p_min, p_max, format, flags); PopID(); PopItemWidth(); - v = (void*)((char*)v + type_size); + p_data = (void*)((char*)p_data + type_size); } PopID(); @@ -2167,27 +2756,28 @@ bool ImGui::DragScalarN(const char* label, ImGuiDataType data_type, void* v, int return value_changed; } -bool ImGui::DragFloat(const char* label, float* v, float v_speed, float v_min, float v_max, const char* format, float power) +bool ImGui::DragFloat(const char* label, float* v, float v_speed, float v_min, float v_max, const char* format, ImGuiSliderFlags flags) { - return DragScalar(label, ImGuiDataType_Float, v, v_speed, &v_min, &v_max, format, power); + return DragScalar(label, ImGuiDataType_Float, v, v_speed, &v_min, &v_max, format, flags); } -bool ImGui::DragFloat2(const char* label, float v[2], float v_speed, float v_min, float v_max, const char* format, float power) +bool ImGui::DragFloat2(const char* label, float v[2], float v_speed, float v_min, float v_max, const char* format, ImGuiSliderFlags flags) { - return DragScalarN(label, ImGuiDataType_Float, v, 2, v_speed, &v_min, &v_max, format, power); + return DragScalarN(label, ImGuiDataType_Float, v, 2, v_speed, &v_min, &v_max, format, flags); } -bool ImGui::DragFloat3(const char* label, float v[3], float v_speed, float v_min, float v_max, const char* format, float power) +bool ImGui::DragFloat3(const char* label, float v[3], float v_speed, float v_min, float v_max, const char* format, ImGuiSliderFlags flags) { - return DragScalarN(label, ImGuiDataType_Float, v, 3, v_speed, &v_min, &v_max, format, power); + return DragScalarN(label, ImGuiDataType_Float, v, 3, v_speed, &v_min, &v_max, format, flags); } -bool ImGui::DragFloat4(const char* label, float v[4], float v_speed, float v_min, float v_max, const char* format, float power) +bool ImGui::DragFloat4(const char* label, float v[4], float v_speed, float v_min, float v_max, const char* format, ImGuiSliderFlags flags) { - return DragScalarN(label, ImGuiDataType_Float, v, 4, v_speed, &v_min, &v_max, format, power); + return DragScalarN(label, ImGuiDataType_Float, v, 4, v_speed, &v_min, &v_max, format, flags); } -bool ImGui::DragFloatRange2(const char* label, float* v_current_min, float* v_current_max, float v_speed, float v_min, float v_max, const char* format, const char* format_max, float power) +// NB: You likely want to specify the ImGuiSliderFlags_AlwaysClamp when using this. +bool ImGui::DragFloatRange2(const char* label, float* v_current_min, float* v_current_max, float v_speed, float v_min, float v_max, const char* format, const char* format_max, ImGuiSliderFlags flags) { ImGuiWindow* window = GetCurrentWindow(); if (window->SkipItems) @@ -2198,41 +2788,50 @@ bool ImGui::DragFloatRange2(const char* label, float* v_current_min, float* v_cu BeginGroup(); PushMultiItemsWidths(2, CalcItemWidth()); - bool value_changed = DragFloat("##min", v_current_min, v_speed, (v_min >= v_max) ? -FLT_MAX : v_min, (v_min >= v_max) ? *v_current_max : ImMin(v_max, *v_current_max), format, power); + float min_min = (v_min >= v_max) ? -FLT_MAX : v_min; + float min_max = (v_min >= v_max) ? *v_current_max : ImMin(v_max, *v_current_max); + ImGuiSliderFlags min_flags = flags | ((min_min == min_max) ? ImGuiSliderFlags_ReadOnly : 0); + bool value_changed = DragScalar("##min", ImGuiDataType_Float, v_current_min, v_speed, &min_min, &min_max, format, min_flags); PopItemWidth(); SameLine(0, g.Style.ItemInnerSpacing.x); - value_changed |= DragFloat("##max", v_current_max, v_speed, (v_min >= v_max) ? *v_current_min : ImMax(v_min, *v_current_min), (v_min >= v_max) ? FLT_MAX : v_max, format_max ? format_max : format, power); + + float max_min = (v_min >= v_max) ? *v_current_min : ImMax(v_min, *v_current_min); + float max_max = (v_min >= v_max) ? FLT_MAX : v_max; + ImGuiSliderFlags max_flags = flags | ((max_min == max_max) ? ImGuiSliderFlags_ReadOnly : 0); + value_changed |= DragScalar("##max", ImGuiDataType_Float, v_current_max, v_speed, &max_min, &max_max, format_max ? format_max : format, max_flags); PopItemWidth(); SameLine(0, g.Style.ItemInnerSpacing.x); TextEx(label, FindRenderedTextEnd(label)); EndGroup(); PopID(); + return value_changed; } // NB: v_speed is float to allow adjusting the drag speed with more precision -bool ImGui::DragInt(const char* label, int* v, float v_speed, int v_min, int v_max, const char* format) +bool ImGui::DragInt(const char* label, int* v, float v_speed, int v_min, int v_max, const char* format, ImGuiSliderFlags flags) { - return DragScalar(label, ImGuiDataType_S32, v, v_speed, &v_min, &v_max, format); + return DragScalar(label, ImGuiDataType_S32, v, v_speed, &v_min, &v_max, format, flags); } -bool ImGui::DragInt2(const char* label, int v[2], float v_speed, int v_min, int v_max, const char* format) +bool ImGui::DragInt2(const char* label, int v[2], float v_speed, int v_min, int v_max, const char* format, ImGuiSliderFlags flags) { - return DragScalarN(label, ImGuiDataType_S32, v, 2, v_speed, &v_min, &v_max, format); + return DragScalarN(label, ImGuiDataType_S32, v, 2, v_speed, &v_min, &v_max, format, flags); } -bool ImGui::DragInt3(const char* label, int v[3], float v_speed, int v_min, int v_max, const char* format) +bool ImGui::DragInt3(const char* label, int v[3], float v_speed, int v_min, int v_max, const char* format, ImGuiSliderFlags flags) { - return DragScalarN(label, ImGuiDataType_S32, v, 3, v_speed, &v_min, &v_max, format); + return DragScalarN(label, ImGuiDataType_S32, v, 3, v_speed, &v_min, &v_max, format, flags); } -bool ImGui::DragInt4(const char* label, int v[4], float v_speed, int v_min, int v_max, const char* format) +bool ImGui::DragInt4(const char* label, int v[4], float v_speed, int v_min, int v_max, const char* format, ImGuiSliderFlags flags) { - return DragScalarN(label, ImGuiDataType_S32, v, 4, v_speed, &v_min, &v_max, format); + return DragScalarN(label, ImGuiDataType_S32, v, 4, v_speed, &v_min, &v_max, format, flags); } -bool ImGui::DragIntRange2(const char* label, int* v_current_min, int* v_current_max, float v_speed, int v_min, int v_max, const char* format, const char* format_max) +// NB: You likely want to specify the ImGuiSliderFlags_AlwaysClamp when using this. +bool ImGui::DragIntRange2(const char* label, int* v_current_min, int* v_current_max, float v_speed, int v_min, int v_max, const char* format, const char* format_max, ImGuiSliderFlags flags) { ImGuiWindow* window = GetCurrentWindow(); if (window->SkipItems) @@ -2243,10 +2842,17 @@ bool ImGui::DragIntRange2(const char* label, int* v_current_min, int* v_current_ BeginGroup(); PushMultiItemsWidths(2, CalcItemWidth()); - bool value_changed = DragInt("##min", v_current_min, v_speed, (v_min >= v_max) ? INT_MIN : v_min, (v_min >= v_max) ? *v_current_max : ImMin(v_max, *v_current_max), format); + int min_min = (v_min >= v_max) ? INT_MIN : v_min; + int min_max = (v_min >= v_max) ? *v_current_max : ImMin(v_max, *v_current_max); + ImGuiSliderFlags min_flags = flags | ((min_min == min_max) ? ImGuiSliderFlags_ReadOnly : 0); + bool value_changed = DragInt("##min", v_current_min, v_speed, min_min, min_max, format, min_flags); PopItemWidth(); SameLine(0, g.Style.ItemInnerSpacing.x); - value_changed |= DragInt("##max", v_current_max, v_speed, (v_min >= v_max) ? *v_current_min : ImMax(v_min, *v_current_min), (v_min >= v_max) ? INT_MAX : v_max, format_max ? format_max : format); + + int max_min = (v_min >= v_max) ? *v_current_min : ImMax(v_min, *v_current_min); + int max_max = (v_min >= v_max) ? INT_MAX : v_max; + ImGuiSliderFlags max_flags = flags | ((max_min == max_max) ? ImGuiSliderFlags_ReadOnly : 0); + value_changed |= DragInt("##max", v_current_max, v_speed, max_min, max_max, format_max ? format_max : format, max_flags); PopItemWidth(); SameLine(0, g.Style.ItemInnerSpacing.x); @@ -2260,6 +2866,8 @@ bool ImGui::DragIntRange2(const char* label, int* v_current_min, int* v_current_ //------------------------------------------------------------------------- // [SECTION] Widgets: SliderScalar, SliderFloat, SliderInt, etc. //------------------------------------------------------------------------- +// - ScaleRatioFromValueT<> [Internal] +// - ScaleValueFromRatioT<> [Internal] // - SliderBehaviorT<>() [Internal] // - SliderBehavior() [Internal] // - SliderScalar() @@ -2278,67 +2886,161 @@ bool ImGui::DragIntRange2(const char* label, int* v_current_min, int* v_current_ // - VSliderInt() //------------------------------------------------------------------------- -template -float ImGui::SliderCalcRatioFromValueT(ImGuiDataType data_type, TYPE v, TYPE v_min, TYPE v_max, float power, float linear_zero_pos) +// Convert a value v in the output space of a slider into a parametric position on the slider itself (the logical opposite of ScaleValueFromRatioT) +template +float ImGui::ScaleRatioFromValueT(ImGuiDataType data_type, TYPE v, TYPE v_min, TYPE v_max, bool is_logarithmic, float logarithmic_zero_epsilon, float zero_deadzone_halfsize) { if (v_min == v_max) return 0.0f; + IM_UNUSED(data_type); - const bool is_power = (power != 1.0f) && (data_type == ImGuiDataType_Float || data_type == ImGuiDataType_Double); const TYPE v_clamped = (v_min < v_max) ? ImClamp(v, v_min, v_max) : ImClamp(v, v_max, v_min); - if (is_power) + if (is_logarithmic) { - if (v_clamped < 0.0f) + bool flipped = v_max < v_min; + + if (flipped) // Handle the case where the range is backwards + ImSwap(v_min, v_max); + + // Fudge min/max to avoid getting close to log(0) + FLOATTYPE v_min_fudged = (ImAbs((FLOATTYPE)v_min) < logarithmic_zero_epsilon) ? ((v_min < 0.0f) ? -logarithmic_zero_epsilon : logarithmic_zero_epsilon) : (FLOATTYPE)v_min; + FLOATTYPE v_max_fudged = (ImAbs((FLOATTYPE)v_max) < logarithmic_zero_epsilon) ? ((v_max < 0.0f) ? -logarithmic_zero_epsilon : logarithmic_zero_epsilon) : (FLOATTYPE)v_max; + + // Awkward special cases - we need ranges of the form (-100 .. 0) to convert to (-100 .. -epsilon), not (-100 .. epsilon) + if ((v_min == 0.0f) && (v_max < 0.0f)) + v_min_fudged = -logarithmic_zero_epsilon; + else if ((v_max == 0.0f) && (v_min < 0.0f)) + v_max_fudged = -logarithmic_zero_epsilon; + + float result; + if (v_clamped <= v_min_fudged) + result = 0.0f; // Workaround for values that are in-range but below our fudge + else if (v_clamped >= v_max_fudged) + result = 1.0f; // Workaround for values that are in-range but above our fudge + else if ((v_min * v_max) < 0.0f) // Range crosses zero, so split into two portions { - const float f = 1.0f - (float)((v_clamped - v_min) / (ImMin((TYPE)0, v_max) - v_min)); - return (1.0f - ImPow(f, 1.0f/power)) * linear_zero_pos; + float zero_point_center = (-(float)v_min) / ((float)v_max - (float)v_min); // The zero point in parametric space. There's an argument we should take the logarithmic nature into account when calculating this, but for now this should do (and the most common case of a symmetrical range works fine) + float zero_point_snap_L = zero_point_center - zero_deadzone_halfsize; + float zero_point_snap_R = zero_point_center + zero_deadzone_halfsize; + if (v == 0.0f) + result = zero_point_center; // Special case for exactly zero + else if (v < 0.0f) + result = (1.0f - (float)(ImLog(-(FLOATTYPE)v_clamped / logarithmic_zero_epsilon) / ImLog(-v_min_fudged / logarithmic_zero_epsilon))) * zero_point_snap_L; + else + result = zero_point_snap_R + ((float)(ImLog((FLOATTYPE)v_clamped / logarithmic_zero_epsilon) / ImLog(v_max_fudged / logarithmic_zero_epsilon)) * (1.0f - zero_point_snap_R)); } + else if ((v_min < 0.0f) || (v_max < 0.0f)) // Entirely negative slider + result = 1.0f - (float)(ImLog(-(FLOATTYPE)v_clamped / -v_max_fudged) / ImLog(-v_min_fudged / -v_max_fudged)); else + result = (float)(ImLog((FLOATTYPE)v_clamped / v_min_fudged) / ImLog(v_max_fudged / v_min_fudged)); + + return flipped ? (1.0f - result) : result; + } + else + { + // Linear slider + return (float)((FLOATTYPE)(SIGNEDTYPE)(v_clamped - v_min) / (FLOATTYPE)(SIGNEDTYPE)(v_max - v_min)); + } +} + +// Convert a parametric position on a slider into a value v in the output space (the logical opposite of ScaleRatioFromValueT) +template +TYPE ImGui::ScaleValueFromRatioT(ImGuiDataType data_type, float t, TYPE v_min, TYPE v_max, bool is_logarithmic, float logarithmic_zero_epsilon, float zero_deadzone_halfsize) +{ + // We special-case the extents because otherwise our logarithmic fudging can lead to "mathematically correct" + // but non-intuitive behaviors like a fully-left slider not actually reaching the minimum value. Also generally simpler. + if (t <= 0.0f || v_min == v_max) + return v_min; + if (t >= 1.0f) + return v_max; + + TYPE result = (TYPE)0; + if (is_logarithmic) + { + // Fudge min/max to avoid getting silly results close to zero + FLOATTYPE v_min_fudged = (ImAbs((FLOATTYPE)v_min) < logarithmic_zero_epsilon) ? ((v_min < 0.0f) ? -logarithmic_zero_epsilon : logarithmic_zero_epsilon) : (FLOATTYPE)v_min; + FLOATTYPE v_max_fudged = (ImAbs((FLOATTYPE)v_max) < logarithmic_zero_epsilon) ? ((v_max < 0.0f) ? -logarithmic_zero_epsilon : logarithmic_zero_epsilon) : (FLOATTYPE)v_max; + + const bool flipped = v_max < v_min; // Check if range is "backwards" + if (flipped) + ImSwap(v_min_fudged, v_max_fudged); + + // Awkward special case - we need ranges of the form (-100 .. 0) to convert to (-100 .. -epsilon), not (-100 .. epsilon) + if ((v_max == 0.0f) && (v_min < 0.0f)) + v_max_fudged = -logarithmic_zero_epsilon; + + float t_with_flip = flipped ? (1.0f - t) : t; // t, but flipped if necessary to account for us flipping the range + + if ((v_min * v_max) < 0.0f) // Range crosses zero, so we have to do this in two parts { - const float f = (float)((v_clamped - ImMax((TYPE)0, v_min)) / (v_max - ImMax((TYPE)0, v_min))); - return linear_zero_pos + ImPow(f, 1.0f/power) * (1.0f - linear_zero_pos); + float zero_point_center = (-(float)ImMin(v_min, v_max)) / ImAbs((float)v_max - (float)v_min); // The zero point in parametric space + float zero_point_snap_L = zero_point_center - zero_deadzone_halfsize; + float zero_point_snap_R = zero_point_center + zero_deadzone_halfsize; + if (t_with_flip >= zero_point_snap_L && t_with_flip <= zero_point_snap_R) + result = (TYPE)0.0f; // Special case to make getting exactly zero possible (the epsilon prevents it otherwise) + else if (t_with_flip < zero_point_center) + result = (TYPE)-(logarithmic_zero_epsilon * ImPow(-v_min_fudged / logarithmic_zero_epsilon, (FLOATTYPE)(1.0f - (t_with_flip / zero_point_snap_L)))); + else + result = (TYPE)(logarithmic_zero_epsilon * ImPow(v_max_fudged / logarithmic_zero_epsilon, (FLOATTYPE)((t_with_flip - zero_point_snap_R) / (1.0f - zero_point_snap_R)))); + } + else if ((v_min < 0.0f) || (v_max < 0.0f)) // Entirely negative slider + result = (TYPE)-(-v_max_fudged * ImPow(-v_min_fudged / -v_max_fudged, (FLOATTYPE)(1.0f - t_with_flip))); + else + result = (TYPE)(v_min_fudged * ImPow(v_max_fudged / v_min_fudged, (FLOATTYPE)t_with_flip)); + } + else + { + // Linear slider + const bool is_floating_point = (data_type == ImGuiDataType_Float) || (data_type == ImGuiDataType_Double); + if (is_floating_point) + { + result = ImLerp(v_min, v_max, t); + } + else if (t < 1.0) + { + // - For integer values we want the clicking position to match the grab box so we round above + // This code is carefully tuned to work with large values (e.g. high ranges of U64) while preserving this property.. + // - Not doing a *1.0 multiply at the end of a range as it tends to be lossy. While absolute aiming at a large s64/u64 + // range is going to be imprecise anyway, with this check we at least make the edge values matches expected limits. + FLOATTYPE v_new_off_f = (SIGNEDTYPE)(v_max - v_min) * t; + result = (TYPE)((SIGNEDTYPE)v_min + (SIGNEDTYPE)(v_new_off_f + (FLOATTYPE)(v_min > v_max ? -0.5 : 0.5))); } } - // Linear slider - return (float)((FLOATTYPE)(v_clamped - v_min) / (FLOATTYPE)(v_max - v_min)); + return result; } -// FIXME: Move some of the code into SliderBehavior(). Current responsability is larger than what the equivalent DragBehaviorT<> does, we also do some rendering, etc. +// FIXME: Try to move more of the code into shared SliderBehavior() template -bool ImGui::SliderBehaviorT(const ImRect& bb, ImGuiID id, ImGuiDataType data_type, TYPE* v, const TYPE v_min, const TYPE v_max, const char* format, float power, ImGuiSliderFlags flags, ImRect* out_grab_bb) +bool ImGui::SliderBehaviorT(const ImRect& bb, ImGuiID id, ImGuiDataType data_type, TYPE* v, const TYPE v_min, const TYPE v_max, const char* format, ImGuiSliderFlags flags, ImRect* out_grab_bb) { ImGuiContext& g = *GImGui; const ImGuiStyle& style = g.Style; const ImGuiAxis axis = (flags & ImGuiSliderFlags_Vertical) ? ImGuiAxis_Y : ImGuiAxis_X; - const bool is_decimal = (data_type == ImGuiDataType_Float) || (data_type == ImGuiDataType_Double); - const bool is_power = (power != 1.0f) && is_decimal; + const bool is_logarithmic = (flags & ImGuiSliderFlags_Logarithmic) != 0; + const bool is_floating_point = (data_type == ImGuiDataType_Float) || (data_type == ImGuiDataType_Double); + const float v_range_f = (float)(v_min < v_max ? v_max - v_min : v_min - v_max); // We don't need high precision for what we do with it. - const float grab_padding = 2.0f; + // Calculate bounds + const float grab_padding = 2.0f; // FIXME: Should be part of style. const float slider_sz = (bb.Max[axis] - bb.Min[axis]) - grab_padding * 2.0f; float grab_sz = style.GrabMinSize; - SIGNEDTYPE v_range = (v_min < v_max ? v_max - v_min : v_min - v_max); - if (!is_decimal && v_range >= 0) // v_range < 0 may happen on integer overflows - grab_sz = ImMax((float)(slider_sz / (v_range + 1)), style.GrabMinSize); // For integer sliders: if possible have the grab size represent 1 unit + if (!is_floating_point && v_range_f >= 0.0f) // v_range_f < 0 may happen on integer overflows + grab_sz = ImMax(slider_sz / (v_range_f + 1), style.GrabMinSize); // For integer sliders: if possible have the grab size represent 1 unit grab_sz = ImMin(grab_sz, slider_sz); const float slider_usable_sz = slider_sz - grab_sz; const float slider_usable_pos_min = bb.Min[axis] + grab_padding + grab_sz * 0.5f; const float slider_usable_pos_max = bb.Max[axis] - grab_padding - grab_sz * 0.5f; - // For power curve sliders that cross over sign boundary we want the curve to be symmetric around 0.0f - float linear_zero_pos; // 0.0->1.0f - if (is_power && v_min * v_max < 0.0f) + float logarithmic_zero_epsilon = 0.0f; // Only valid when is_logarithmic is true + float zero_deadzone_halfsize = 0.0f; // Only valid when is_logarithmic is true + if (is_logarithmic) { - // Different sign - const FLOATTYPE linear_dist_min_to_0 = ImPow(v_min >= 0 ? (FLOATTYPE)v_min : -(FLOATTYPE)v_min, (FLOATTYPE)1.0f / power); - const FLOATTYPE linear_dist_max_to_0 = ImPow(v_max >= 0 ? (FLOATTYPE)v_max : -(FLOATTYPE)v_max, (FLOATTYPE)1.0f / power); - linear_zero_pos = (float)(linear_dist_min_to_0 / (linear_dist_min_to_0 + linear_dist_max_to_0)); - } - else - { - // Same sign - linear_zero_pos = v_min < 0.0f ? 1.0f : 0.0f; + // When using logarithmic sliders, we need to clamp to avoid hitting zero, but our choice of clamp value greatly affects slider precision. We attempt to use the specified precision to estimate a good lower bound. + const int decimal_precision = is_floating_point ? ImParseFormatPrecision(format, 3) : 1; + logarithmic_zero_epsilon = ImPow(0.1f, (float)decimal_precision); + zero_deadzone_halfsize = (style.LogSliderDeadzone * 0.5f) / ImMax(slider_usable_sz, 1.0f); } // Process interacting with the slider @@ -2356,95 +3058,103 @@ bool ImGui::SliderBehaviorT(const ImRect& bb, ImGuiID id, ImGuiDataType data_typ else { const float mouse_abs_pos = g.IO.MousePos[axis]; - clicked_t = (slider_usable_sz > 0.0f) ? ImClamp((mouse_abs_pos - slider_usable_pos_min) / slider_usable_sz, 0.0f, 1.0f) : 0.0f; + if (g.ActiveIdIsJustActivated) + { + float grab_t = ScaleRatioFromValueT(data_type, *v, v_min, v_max, is_logarithmic, logarithmic_zero_epsilon, zero_deadzone_halfsize); + if (axis == ImGuiAxis_Y) + grab_t = 1.0f - grab_t; + const float grab_pos = ImLerp(slider_usable_pos_min, slider_usable_pos_max, grab_t); + const bool clicked_around_grab = (mouse_abs_pos >= grab_pos - grab_sz * 0.5f - 1.0f) && (mouse_abs_pos <= grab_pos + grab_sz * 0.5f + 1.0f); // No harm being extra generous here. + g.SliderGrabClickOffset = (clicked_around_grab && is_floating_point) ? mouse_abs_pos - grab_pos : 0.0f; + } + if (slider_usable_sz > 0.0f) + clicked_t = ImSaturate((mouse_abs_pos - g.SliderGrabClickOffset - slider_usable_pos_min) / slider_usable_sz); if (axis == ImGuiAxis_Y) clicked_t = 1.0f - clicked_t; set_new_value = true; } } - else if (g.ActiveIdSource == ImGuiInputSource_Nav) + else if (g.ActiveIdSource == ImGuiInputSource_Keyboard || g.ActiveIdSource == ImGuiInputSource_Gamepad) { - const ImVec2 delta2 = GetNavInputAmount2d(ImGuiNavDirSourceFlags_Keyboard | ImGuiNavDirSourceFlags_PadDPad, ImGuiInputReadMode_RepeatFast, 0.0f, 0.0f); - float delta = (axis == ImGuiAxis_X) ? delta2.x : -delta2.y; + if (g.ActiveIdIsJustActivated) + { + g.SliderCurrentAccum = 0.0f; // Reset any stored nav delta upon activation + g.SliderCurrentAccumDirty = false; + } + + float input_delta = (axis == ImGuiAxis_X) ? GetNavTweakPressedAmount(axis) : -GetNavTweakPressedAmount(axis); + if (input_delta != 0.0f) + { + const bool tweak_slow = IsKeyDown((g.NavInputSource == ImGuiInputSource_Gamepad) ? ImGuiKey_NavGamepadTweakSlow : ImGuiKey_NavKeyboardTweakSlow); + const bool tweak_fast = IsKeyDown((g.NavInputSource == ImGuiInputSource_Gamepad) ? ImGuiKey_NavGamepadTweakFast : ImGuiKey_NavKeyboardTweakFast); + const int decimal_precision = is_floating_point ? ImParseFormatPrecision(format, 3) : 0; + if (decimal_precision > 0) + { + input_delta /= 100.0f; // Keyboard/Gamepad tweak speeds in % of slider bounds + if (tweak_slow) + input_delta /= 10.0f; + } + else + { + if ((v_range_f >= -100.0f && v_range_f <= 100.0f && v_range_f != 0.0f) || tweak_slow) + input_delta = ((input_delta < 0.0f) ? -1.0f : +1.0f) / v_range_f; // Keyboard/Gamepad tweak speeds in integer steps + else + input_delta /= 100.0f; + } + if (tweak_fast) + input_delta *= 10.0f; + + g.SliderCurrentAccum += input_delta; + g.SliderCurrentAccumDirty = true; + } + + float delta = g.SliderCurrentAccum; if (g.NavActivatePressedId == id && !g.ActiveIdIsJustActivated) { ClearActiveID(); } - else if (delta != 0.0f) + else if (g.SliderCurrentAccumDirty) { - clicked_t = SliderCalcRatioFromValueT(data_type, *v, v_min, v_max, power, linear_zero_pos); - const int decimal_precision = is_decimal ? ImParseFormatPrecision(format, 3) : 0; - if ((decimal_precision > 0) || is_power) - { - delta /= 100.0f; // Gamepad/keyboard tweak speeds in % of slider bounds - if (IsNavInputDown(ImGuiNavInput_TweakSlow)) - delta /= 10.0f; - } - else - { - if ((v_range >= -100.0f && v_range <= 100.0f) || IsNavInputDown(ImGuiNavInput_TweakSlow)) - delta = ((delta < 0.0f) ? -1.0f : +1.0f) / (float)v_range; // Gamepad/keyboard tweak speeds in integer steps - else - delta /= 100.0f; - } - if (IsNavInputDown(ImGuiNavInput_TweakFast)) - delta *= 10.0f; - set_new_value = true; + clicked_t = ScaleRatioFromValueT(data_type, *v, v_min, v_max, is_logarithmic, logarithmic_zero_epsilon, zero_deadzone_halfsize); + if ((clicked_t >= 1.0f && delta > 0.0f) || (clicked_t <= 0.0f && delta < 0.0f)) // This is to avoid applying the saturation when already past the limits + { set_new_value = false; + g.SliderCurrentAccum = 0.0f; // If pushing up against the limits, don't continue to accumulate + } else + { + set_new_value = true; + float old_clicked_t = clicked_t; clicked_t = ImSaturate(clicked_t + delta); + + // Calculate what our "new" clicked_t will be, and thus how far we actually moved the slider, and subtract this from the accumulator + TYPE v_new = ScaleValueFromRatioT(data_type, clicked_t, v_min, v_max, is_logarithmic, logarithmic_zero_epsilon, zero_deadzone_halfsize); + if (is_floating_point && !(flags & ImGuiSliderFlags_NoRoundToFormat)) + v_new = RoundScalarWithFormatT(format, data_type, v_new); + float new_clicked_t = ScaleRatioFromValueT(data_type, v_new, v_min, v_max, is_logarithmic, logarithmic_zero_epsilon, zero_deadzone_halfsize); + + if (delta > 0) + g.SliderCurrentAccum -= ImMin(new_clicked_t - old_clicked_t, delta); + else + g.SliderCurrentAccum -= ImMax(new_clicked_t - old_clicked_t, delta); + } + + g.SliderCurrentAccumDirty = false; } } + if (set_new_value) + if ((g.LastItemData.ItemFlags & ImGuiItemFlags_ReadOnly) || (flags & ImGuiSliderFlags_ReadOnly)) + set_new_value = false; + if (set_new_value) { - TYPE v_new; - if (is_power) - { - // Account for power curve scale on both sides of the zero - if (clicked_t < linear_zero_pos) - { - // Negative: rescale to the negative range before powering - float a = 1.0f - (clicked_t / linear_zero_pos); - a = ImPow(a, power); - v_new = ImLerp(ImMin(v_max, (TYPE)0), v_min, a); - } - else - { - // Positive: rescale to the positive range before powering - float a; - if (ImFabs(linear_zero_pos - 1.0f) > 1.e-6f) - a = (clicked_t - linear_zero_pos) / (1.0f - linear_zero_pos); - else - a = clicked_t; - a = ImPow(a, power); - v_new = ImLerp(ImMax(v_min, (TYPE)0), v_max, a); - } - } - else - { - // Linear slider - if (is_decimal) - { - v_new = ImLerp(v_min, v_max, clicked_t); - } - else - { - // For integer values we want the clicking position to match the grab box so we round above - // This code is carefully tuned to work with large values (e.g. high ranges of U64) while preserving this property.. - FLOATTYPE v_new_off_f = (v_max - v_min) * clicked_t; - TYPE v_new_off_floor = (TYPE)(v_new_off_f); - TYPE v_new_off_round = (TYPE)(v_new_off_f + (FLOATTYPE)0.5); - if (!is_decimal && v_new_off_floor < v_new_off_round) - v_new = v_min + v_new_off_round; - else - v_new = v_min + v_new_off_floor; - } - } + TYPE v_new = ScaleValueFromRatioT(data_type, clicked_t, v_min, v_max, is_logarithmic, logarithmic_zero_epsilon, zero_deadzone_halfsize); // Round to user desired precision based on format string - v_new = RoundScalarWithFormatT(format, data_type, v_new); + if (is_floating_point && !(flags & ImGuiSliderFlags_NoRoundToFormat)) + v_new = RoundScalarWithFormatT(format, data_type, v_new); // Apply result if (*v != v_new) @@ -2462,7 +3172,7 @@ bool ImGui::SliderBehaviorT(const ImRect& bb, ImGuiID id, ImGuiDataType data_typ else { // Output grab position so it can be displayed by the caller - float grab_t = SliderCalcRatioFromValueT(data_type, *v, v_min, v_max, power, linear_zero_pos); + float grab_t = ScaleRatioFromValueT(data_type, *v, v_min, v_max, is_logarithmic, logarithmic_zero_epsilon, zero_deadzone_halfsize); if (axis == ImGuiAxis_Y) grab_t = 1.0f - grab_t; const float grab_pos = ImLerp(slider_usable_pos_min, slider_usable_pos_max, grab_t); @@ -2475,42 +3185,48 @@ bool ImGui::SliderBehaviorT(const ImRect& bb, ImGuiID id, ImGuiDataType data_typ return value_changed; } -// For 32-bits and larger types, slider bounds are limited to half the natural type range. +// For 32-bit and larger types, slider bounds are limited to half the natural type range. // So e.g. an integer Slider between INT_MAX-10 and INT_MAX will fail, but an integer Slider between INT_MAX/2-10 and INT_MAX/2 will be ok. // It would be possible to lift that limitation with some work but it doesn't seem to be worth it for sliders. -bool ImGui::SliderBehavior(const ImRect& bb, ImGuiID id, ImGuiDataType data_type, void* v, const void* v_min, const void* v_max, const char* format, float power, ImGuiSliderFlags flags, ImRect* out_grab_bb) +bool ImGui::SliderBehavior(const ImRect& bb, ImGuiID id, ImGuiDataType data_type, void* p_v, const void* p_min, const void* p_max, const char* format, ImGuiSliderFlags flags, ImRect* out_grab_bb) { + // Read imgui.cpp "API BREAKING CHANGES" section for 1.78 if you hit this assert. + IM_ASSERT((flags == 1 || (flags & ImGuiSliderFlags_InvalidMask_) == 0) && "Invalid ImGuiSliderFlags flags! Has the legacy 'float power' argument been mistakenly cast to flags? Call function with ImGuiSliderFlags_Logarithmic flags instead."); + IM_ASSERT((flags & ImGuiSliderFlags_WrapAround) == 0); // Not supported by SliderXXX(), only by DragXXX() + switch (data_type) { - case ImGuiDataType_S8: { ImS32 v32 = (ImS32)*(ImS8*)v; bool r = SliderBehaviorT(bb, id, ImGuiDataType_S32, &v32, *(const ImS8*)v_min, *(const ImS8*)v_max, format, power, flags, out_grab_bb); if (r) *(ImS8*)v = (ImS8)v32; return r; } - case ImGuiDataType_U8: { ImU32 v32 = (ImU32)*(ImU8*)v; bool r = SliderBehaviorT(bb, id, ImGuiDataType_U32, &v32, *(const ImU8*)v_min, *(const ImU8*)v_max, format, power, flags, out_grab_bb); if (r) *(ImU8*)v = (ImU8)v32; return r; } - case ImGuiDataType_S16: { ImS32 v32 = (ImS32)*(ImS16*)v; bool r = SliderBehaviorT(bb, id, ImGuiDataType_S32, &v32, *(const ImS16*)v_min, *(const ImS16*)v_max, format, power, flags, out_grab_bb); if (r) *(ImS16*)v = (ImS16)v32; return r; } - case ImGuiDataType_U16: { ImU32 v32 = (ImU32)*(ImU16*)v; bool r = SliderBehaviorT(bb, id, ImGuiDataType_U32, &v32, *(const ImU16*)v_min, *(const ImU16*)v_max, format, power, flags, out_grab_bb); if (r) *(ImU16*)v = (ImU16)v32; return r; } + case ImGuiDataType_S8: { ImS32 v32 = (ImS32)*(ImS8*)p_v; bool r = SliderBehaviorT(bb, id, ImGuiDataType_S32, &v32, *(const ImS8*)p_min, *(const ImS8*)p_max, format, flags, out_grab_bb); if (r) *(ImS8*)p_v = (ImS8)v32; return r; } + case ImGuiDataType_U8: { ImU32 v32 = (ImU32)*(ImU8*)p_v; bool r = SliderBehaviorT(bb, id, ImGuiDataType_U32, &v32, *(const ImU8*)p_min, *(const ImU8*)p_max, format, flags, out_grab_bb); if (r) *(ImU8*)p_v = (ImU8)v32; return r; } + case ImGuiDataType_S16: { ImS32 v32 = (ImS32)*(ImS16*)p_v; bool r = SliderBehaviorT(bb, id, ImGuiDataType_S32, &v32, *(const ImS16*)p_min, *(const ImS16*)p_max, format, flags, out_grab_bb); if (r) *(ImS16*)p_v = (ImS16)v32; return r; } + case ImGuiDataType_U16: { ImU32 v32 = (ImU32)*(ImU16*)p_v; bool r = SliderBehaviorT(bb, id, ImGuiDataType_U32, &v32, *(const ImU16*)p_min, *(const ImU16*)p_max, format, flags, out_grab_bb); if (r) *(ImU16*)p_v = (ImU16)v32; return r; } case ImGuiDataType_S32: - IM_ASSERT(*(const ImS32*)v_min >= IM_S32_MIN/2 && *(const ImS32*)v_max <= IM_S32_MAX/2); - return SliderBehaviorT(bb, id, data_type, (ImS32*)v, *(const ImS32*)v_min, *(const ImS32*)v_max, format, power, flags, out_grab_bb); + IM_ASSERT(*(const ImS32*)p_min >= IM_S32_MIN / 2 && *(const ImS32*)p_max <= IM_S32_MAX / 2); + return SliderBehaviorT(bb, id, data_type, (ImS32*)p_v, *(const ImS32*)p_min, *(const ImS32*)p_max, format, flags, out_grab_bb); case ImGuiDataType_U32: - IM_ASSERT(*(const ImU32*)v_max <= IM_U32_MAX/2); - return SliderBehaviorT(bb, id, data_type, (ImU32*)v, *(const ImU32*)v_min, *(const ImU32*)v_max, format, power, flags, out_grab_bb); + IM_ASSERT(*(const ImU32*)p_max <= IM_U32_MAX / 2); + return SliderBehaviorT(bb, id, data_type, (ImU32*)p_v, *(const ImU32*)p_min, *(const ImU32*)p_max, format, flags, out_grab_bb); case ImGuiDataType_S64: - IM_ASSERT(*(const ImS64*)v_min >= IM_S64_MIN/2 && *(const ImS64*)v_max <= IM_S64_MAX/2); - return SliderBehaviorT(bb, id, data_type, (ImS64*)v, *(const ImS64*)v_min, *(const ImS64*)v_max, format, power, flags, out_grab_bb); + IM_ASSERT(*(const ImS64*)p_min >= IM_S64_MIN / 2 && *(const ImS64*)p_max <= IM_S64_MAX / 2); + return SliderBehaviorT(bb, id, data_type, (ImS64*)p_v, *(const ImS64*)p_min, *(const ImS64*)p_max, format, flags, out_grab_bb); case ImGuiDataType_U64: - IM_ASSERT(*(const ImU64*)v_max <= IM_U64_MAX/2); - return SliderBehaviorT(bb, id, data_type, (ImU64*)v, *(const ImU64*)v_min, *(const ImU64*)v_max, format, power, flags, out_grab_bb); + IM_ASSERT(*(const ImU64*)p_max <= IM_U64_MAX / 2); + return SliderBehaviorT(bb, id, data_type, (ImU64*)p_v, *(const ImU64*)p_min, *(const ImU64*)p_max, format, flags, out_grab_bb); case ImGuiDataType_Float: - IM_ASSERT(*(const float*)v_min >= -FLT_MAX/2.0f && *(const float*)v_max <= FLT_MAX/2.0f); - return SliderBehaviorT(bb, id, data_type, (float*)v, *(const float*)v_min, *(const float*)v_max, format, power, flags, out_grab_bb); + IM_ASSERT(*(const float*)p_min >= -FLT_MAX / 2.0f && *(const float*)p_max <= FLT_MAX / 2.0f); + return SliderBehaviorT(bb, id, data_type, (float*)p_v, *(const float*)p_min, *(const float*)p_max, format, flags, out_grab_bb); case ImGuiDataType_Double: - IM_ASSERT(*(const double*)v_min >= -DBL_MAX/2.0f && *(const double*)v_max <= DBL_MAX/2.0f); - return SliderBehaviorT(bb, id, data_type, (double*)v, *(const double*)v_min, *(const double*)v_max, format, power, flags, out_grab_bb); + IM_ASSERT(*(const double*)p_min >= -DBL_MAX / 2.0f && *(const double*)p_max <= DBL_MAX / 2.0f); + return SliderBehaviorT(bb, id, data_type, (double*)p_v, *(const double*)p_min, *(const double*)p_max, format, flags, out_grab_bb); case ImGuiDataType_COUNT: break; } IM_ASSERT(0); return false; } -bool ImGui::SliderScalar(const char* label, ImGuiDataType data_type, void* v, const void* v_min, const void* v_max, const char* format, float power) +// Note: p_data, p_min and p_max are _pointers_ to a memory address holding the data. For a slider, they are all required. +// Read code of e.g. SliderFloat(), SliderInt() etc. or examples in 'Demo->Widgets->Data Types' to understand how to use this function directly. +bool ImGui::SliderScalar(const char* label, ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max, const char* format, ImGuiSliderFlags flags) { ImGuiWindow* window = GetCurrentWindow(); if (window->SkipItems) @@ -2522,51 +3238,59 @@ bool ImGui::SliderScalar(const char* label, ImGuiDataType data_type, void* v, co const float w = CalcItemWidth(); const ImVec2 label_size = CalcTextSize(label, NULL, true); - const ImRect frame_bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(w, label_size.y + style.FramePadding.y*2.0f)); + const ImRect frame_bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(w, label_size.y + style.FramePadding.y * 2.0f)); const ImRect total_bb(frame_bb.Min, frame_bb.Max + ImVec2(label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f, 0.0f)); + const bool temp_input_allowed = (flags & ImGuiSliderFlags_NoInput) == 0; ItemSize(total_bb, style.FramePadding.y); - if (!ItemAdd(total_bb, id, &frame_bb)) + if (!ItemAdd(total_bb, id, &frame_bb, temp_input_allowed ? ImGuiItemFlags_Inputable : 0)) return false; // Default format string when passing NULL if (format == NULL) format = DataTypeGetInfo(data_type)->PrintFmt; - else if (data_type == ImGuiDataType_S32 && strcmp(format, "%d") != 0) // (FIXME-LEGACY: Patch old "%.0f" format string to use "%d", read function more details.) - format = PatchFormatStringFloatToInt(format); - // Tabbing or CTRL-clicking on Slider turns it into an input box - const bool hovered = ItemHoverable(frame_bb, id); - bool temp_input_is_active = TempInputTextIsActive(id); - bool temp_input_start = false; + const bool hovered = ItemHoverable(frame_bb, id, g.LastItemData.ItemFlags); + bool temp_input_is_active = temp_input_allowed && TempInputIsActive(id); if (!temp_input_is_active) { - const bool focus_requested = FocusableItemRegister(window, id); - const bool clicked = (hovered && g.IO.MouseClicked[0]); - if (focus_requested || clicked || g.NavActivateId == id || g.NavInputId == id) + // Tabbing or CTRL+click on Slider turns it into an input box + const bool clicked = hovered && IsMouseClicked(0, ImGuiInputFlags_None, id); + const bool make_active = (clicked || g.NavActivateId == id); + if (make_active && clicked) + SetKeyOwner(ImGuiKey_MouseLeft, id); + if (make_active && temp_input_allowed) + if ((clicked && g.IO.KeyCtrl) || (g.NavActivateId == id && (g.NavActivateFlags & ImGuiActivateFlags_PreferInput))) + temp_input_is_active = true; + + // Store initial value (not used by main lib but available as a convenience but some mods e.g. to revert) + if (make_active) + memcpy(&g.ActiveIdValueOnActivation, p_data, DataTypeGetInfo(data_type)->Size); + + if (make_active && !temp_input_is_active) { SetActiveID(id, window); SetFocusID(id, window); FocusWindow(window); - g.ActiveIdAllowNavDirFlags = (1 << ImGuiDir_Up) | (1 << ImGuiDir_Down); - if (focus_requested || (clicked && g.IO.KeyCtrl) || g.NavInputId == id) - { - temp_input_start = true; - FocusableItemUnregister(window); - } + g.ActiveIdUsingNavDirMask |= (1 << ImGuiDir_Left) | (1 << ImGuiDir_Right); } } - if (temp_input_is_active || temp_input_start) - return TempInputTextScalar(frame_bb, id, label, data_type, v, format); + + if (temp_input_is_active) + { + // Only clamp CTRL+Click input when ImGuiSliderFlags_ClampOnInput is set (generally via ImGuiSliderFlags_AlwaysClamp) + const bool clamp_enabled = (flags & ImGuiSliderFlags_ClampOnInput) != 0; + return TempInputScalar(frame_bb, id, label, data_type, p_data, format, clamp_enabled ? p_min : NULL, clamp_enabled ? p_max : NULL); + } // Draw frame - const ImU32 frame_col = GetColorU32(g.ActiveId == id ? ImGuiCol_FrameBgActive : g.HoveredId == id ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg); - RenderNavHighlight(frame_bb, id); + const ImU32 frame_col = GetColorU32(g.ActiveId == id ? ImGuiCol_FrameBgActive : hovered ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg); + RenderNavCursor(frame_bb, id); RenderFrame(frame_bb.Min, frame_bb.Max, frame_col, true, g.Style.FrameRounding); // Slider behavior ImRect grab_bb; - const bool value_changed = SliderBehavior(frame_bb, id, data_type, v, v_min, v_max, format, power, ImGuiSliderFlags_None, &grab_bb); + const bool value_changed = SliderBehavior(frame_bb, id, data_type, p_data, p_min, p_max, format, flags, &grab_bb); if (value_changed) MarkItemEdited(id); @@ -2576,18 +3300,20 @@ bool ImGui::SliderScalar(const char* label, ImGuiDataType data_type, void* v, co // Display value using user-provided display format so user can add prefix/suffix/decorations to the value. char value_buf[64]; - const char* value_buf_end = value_buf + DataTypeFormatString(value_buf, IM_ARRAYSIZE(value_buf), data_type, v, format); - RenderTextClipped(frame_bb.Min, frame_bb.Max, value_buf, value_buf_end, NULL, ImVec2(0.5f,0.5f)); + const char* value_buf_end = value_buf + DataTypeFormatString(value_buf, IM_ARRAYSIZE(value_buf), data_type, p_data, format); + if (g.LogEnabled) + LogSetNextTextDecoration("{", "}"); + RenderTextClipped(frame_bb.Min, frame_bb.Max, value_buf, value_buf_end, NULL, ImVec2(0.5f, 0.5f)); if (label_size.x > 0.0f) RenderText(ImVec2(frame_bb.Max.x + style.ItemInnerSpacing.x, frame_bb.Min.y + style.FramePadding.y), label); - IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.ItemFlags); + IMGUI_TEST_ENGINE_ITEM_INFO(id, label, g.LastItemData.StatusFlags | (temp_input_allowed ? ImGuiItemStatusFlags_Inputable : 0)); return value_changed; } // Add multiple sliders on 1 line for compact edition of multiple components -bool ImGui::SliderScalarN(const char* label, ImGuiDataType data_type, void* v, int components, const void* v_min, const void* v_max, const char* format, float power) +bool ImGui::SliderScalarN(const char* label, ImGuiDataType data_type, void* v, int components, const void* v_min, const void* v_max, const char* format, ImGuiSliderFlags flags) { ImGuiWindow* window = GetCurrentWindow(); if (window->SkipItems) @@ -2604,7 +3330,7 @@ bool ImGui::SliderScalarN(const char* label, ImGuiDataType data_type, void* v, i PushID(i); if (i > 0) SameLine(0, g.Style.ItemInnerSpacing.x); - value_changed |= SliderScalar("", data_type, v, v_min, v_max, format, power); + value_changed |= SliderScalar("", data_type, v, v_min, v_max, format, flags); PopID(); PopItemWidth(); v = (void*)((char*)v + type_size); @@ -2622,57 +3348,58 @@ bool ImGui::SliderScalarN(const char* label, ImGuiDataType data_type, void* v, i return value_changed; } -bool ImGui::SliderFloat(const char* label, float* v, float v_min, float v_max, const char* format, float power) +bool ImGui::SliderFloat(const char* label, float* v, float v_min, float v_max, const char* format, ImGuiSliderFlags flags) { - return SliderScalar(label, ImGuiDataType_Float, v, &v_min, &v_max, format, power); + return SliderScalar(label, ImGuiDataType_Float, v, &v_min, &v_max, format, flags); } -bool ImGui::SliderFloat2(const char* label, float v[2], float v_min, float v_max, const char* format, float power) +bool ImGui::SliderFloat2(const char* label, float v[2], float v_min, float v_max, const char* format, ImGuiSliderFlags flags) { - return SliderScalarN(label, ImGuiDataType_Float, v, 2, &v_min, &v_max, format, power); + return SliderScalarN(label, ImGuiDataType_Float, v, 2, &v_min, &v_max, format, flags); } -bool ImGui::SliderFloat3(const char* label, float v[3], float v_min, float v_max, const char* format, float power) +bool ImGui::SliderFloat3(const char* label, float v[3], float v_min, float v_max, const char* format, ImGuiSliderFlags flags) { - return SliderScalarN(label, ImGuiDataType_Float, v, 3, &v_min, &v_max, format, power); + return SliderScalarN(label, ImGuiDataType_Float, v, 3, &v_min, &v_max, format, flags); } -bool ImGui::SliderFloat4(const char* label, float v[4], float v_min, float v_max, const char* format, float power) +bool ImGui::SliderFloat4(const char* label, float v[4], float v_min, float v_max, const char* format, ImGuiSliderFlags flags) { - return SliderScalarN(label, ImGuiDataType_Float, v, 4, &v_min, &v_max, format, power); + return SliderScalarN(label, ImGuiDataType_Float, v, 4, &v_min, &v_max, format, flags); } -bool ImGui::SliderAngle(const char* label, float* v_rad, float v_degrees_min, float v_degrees_max, const char* format) +bool ImGui::SliderAngle(const char* label, float* v_rad, float v_degrees_min, float v_degrees_max, const char* format, ImGuiSliderFlags flags) { if (format == NULL) format = "%.0f deg"; - float v_deg = (*v_rad) * 360.0f / (2*IM_PI); - bool value_changed = SliderFloat(label, &v_deg, v_degrees_min, v_degrees_max, format, 1.0f); - *v_rad = v_deg * (2*IM_PI) / 360.0f; + float v_deg = (*v_rad) * 360.0f / (2 * IM_PI); + bool value_changed = SliderFloat(label, &v_deg, v_degrees_min, v_degrees_max, format, flags); + if (value_changed) + *v_rad = v_deg * (2 * IM_PI) / 360.0f; return value_changed; } -bool ImGui::SliderInt(const char* label, int* v, int v_min, int v_max, const char* format) +bool ImGui::SliderInt(const char* label, int* v, int v_min, int v_max, const char* format, ImGuiSliderFlags flags) { - return SliderScalar(label, ImGuiDataType_S32, v, &v_min, &v_max, format); + return SliderScalar(label, ImGuiDataType_S32, v, &v_min, &v_max, format, flags); } -bool ImGui::SliderInt2(const char* label, int v[2], int v_min, int v_max, const char* format) +bool ImGui::SliderInt2(const char* label, int v[2], int v_min, int v_max, const char* format, ImGuiSliderFlags flags) { - return SliderScalarN(label, ImGuiDataType_S32, v, 2, &v_min, &v_max, format); + return SliderScalarN(label, ImGuiDataType_S32, v, 2, &v_min, &v_max, format, flags); } -bool ImGui::SliderInt3(const char* label, int v[3], int v_min, int v_max, const char* format) +bool ImGui::SliderInt3(const char* label, int v[3], int v_min, int v_max, const char* format, ImGuiSliderFlags flags) { - return SliderScalarN(label, ImGuiDataType_S32, v, 3, &v_min, &v_max, format); + return SliderScalarN(label, ImGuiDataType_S32, v, 3, &v_min, &v_max, format, flags); } -bool ImGui::SliderInt4(const char* label, int v[4], int v_min, int v_max, const char* format) +bool ImGui::SliderInt4(const char* label, int v[4], int v_min, int v_max, const char* format, ImGuiSliderFlags flags) { - return SliderScalarN(label, ImGuiDataType_S32, v, 4, &v_min, &v_max, format); + return SliderScalarN(label, ImGuiDataType_S32, v, 4, &v_min, &v_max, format, flags); } -bool ImGui::VSliderScalar(const char* label, const ImVec2& size, ImGuiDataType data_type, void* v, const void* v_min, const void* v_max, const char* format, float power) +bool ImGui::VSliderScalar(const char* label, const ImVec2& size, ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max, const char* format, ImGuiSliderFlags flags) { ImGuiWindow* window = GetCurrentWindow(); if (window->SkipItems) @@ -2693,26 +3420,27 @@ bool ImGui::VSliderScalar(const char* label, const ImVec2& size, ImGuiDataType d // Default format string when passing NULL if (format == NULL) format = DataTypeGetInfo(data_type)->PrintFmt; - else if (data_type == ImGuiDataType_S32 && strcmp(format, "%d") != 0) // (FIXME-LEGACY: Patch old "%.0f" format string to use "%d", read function more details.) - format = PatchFormatStringFloatToInt(format); - const bool hovered = ItemHoverable(frame_bb, id); - if ((hovered && g.IO.MouseClicked[0]) || g.NavActivateId == id || g.NavInputId == id) + const bool hovered = ItemHoverable(frame_bb, id, g.LastItemData.ItemFlags); + const bool clicked = hovered && IsMouseClicked(0, ImGuiInputFlags_None, id); + if (clicked || g.NavActivateId == id) { + if (clicked) + SetKeyOwner(ImGuiKey_MouseLeft, id); SetActiveID(id, window); SetFocusID(id, window); FocusWindow(window); - g.ActiveIdAllowNavDirFlags = (1 << ImGuiDir_Left) | (1 << ImGuiDir_Right); + g.ActiveIdUsingNavDirMask |= (1 << ImGuiDir_Up) | (1 << ImGuiDir_Down); } // Draw frame - const ImU32 frame_col = GetColorU32(g.ActiveId == id ? ImGuiCol_FrameBgActive : g.HoveredId == id ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg); - RenderNavHighlight(frame_bb, id); + const ImU32 frame_col = GetColorU32(g.ActiveId == id ? ImGuiCol_FrameBgActive : hovered ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg); + RenderNavCursor(frame_bb, id); RenderFrame(frame_bb.Min, frame_bb.Max, frame_col, true, g.Style.FrameRounding); // Slider behavior ImRect grab_bb; - const bool value_changed = SliderBehavior(frame_bb, id, data_type, v, v_min, v_max, format, power, ImGuiSliderFlags_Vertical, &grab_bb); + const bool value_changed = SliderBehavior(frame_bb, id, data_type, p_data, p_min, p_max, format, flags | ImGuiSliderFlags_Vertical, &grab_bb); if (value_changed) MarkItemEdited(id); @@ -2723,22 +3451,22 @@ bool ImGui::VSliderScalar(const char* label, const ImVec2& size, ImGuiDataType d // Display value using user-provided display format so user can add prefix/suffix/decorations to the value. // For the vertical slider we allow centered text to overlap the frame padding char value_buf[64]; - const char* value_buf_end = value_buf + DataTypeFormatString(value_buf, IM_ARRAYSIZE(value_buf), data_type, v, format); - RenderTextClipped(ImVec2(frame_bb.Min.x, frame_bb.Min.y + style.FramePadding.y), frame_bb.Max, value_buf, value_buf_end, NULL, ImVec2(0.5f,0.0f)); + const char* value_buf_end = value_buf + DataTypeFormatString(value_buf, IM_ARRAYSIZE(value_buf), data_type, p_data, format); + RenderTextClipped(ImVec2(frame_bb.Min.x, frame_bb.Min.y + style.FramePadding.y), frame_bb.Max, value_buf, value_buf_end, NULL, ImVec2(0.5f, 0.0f)); if (label_size.x > 0.0f) RenderText(ImVec2(frame_bb.Max.x + style.ItemInnerSpacing.x, frame_bb.Min.y + style.FramePadding.y), label); return value_changed; } -bool ImGui::VSliderFloat(const char* label, const ImVec2& size, float* v, float v_min, float v_max, const char* format, float power) +bool ImGui::VSliderFloat(const char* label, const ImVec2& size, float* v, float v_min, float v_max, const char* format, ImGuiSliderFlags flags) { - return VSliderScalar(label, size, ImGuiDataType_Float, v, &v_min, &v_max, format, power); + return VSliderScalar(label, size, ImGuiDataType_Float, v, &v_min, &v_max, format, flags); } -bool ImGui::VSliderInt(const char* label, const ImVec2& size, int* v, int v_min, int v_max, const char* format) +bool ImGui::VSliderInt(const char* label, const ImVec2& size, int* v, int v_min, int v_max, const char* format, ImGuiSliderFlags flags) { - return VSliderScalar(label, size, ImGuiDataType_S32, v, &v_min, &v_max, format); + return VSliderScalar(label, size, ImGuiDataType_S32, v, &v_min, &v_max, format, flags); } //------------------------------------------------------------------------- @@ -2747,6 +3475,8 @@ bool ImGui::VSliderInt(const char* label, const ImVec2& size, int* v, int v_min, // - ImParseFormatFindStart() [Internal] // - ImParseFormatFindEnd() [Internal] // - ImParseFormatTrimDecorations() [Internal] +// - ImParseFormatSanitizeForPrinting() [Internal] +// - ImParseFormatSanitizeForScanning() [Internal] // - ImParseFormatPrecision() [Internal] // - TempInputTextScalar() [Internal] // - InputScalar() @@ -2794,7 +3524,7 @@ const char* ImParseFormatFindEnd(const char* fmt) } // Extract the format out of a format string with leading or trailing decorations -// fmt = "blah blah" -> return fmt +// fmt = "blah blah" -> return "" // fmt = "%.3f" -> return fmt // fmt = "hello %.3f" -> return fmt + 6 // fmt = "%.3f hello" -> return buf written with "%.3f" @@ -2802,7 +3532,7 @@ const char* ImParseFormatTrimDecorations(const char* fmt, char* buf, size_t buf_ { const char* fmt_start = ImParseFormatFindStart(fmt); if (fmt_start[0] != '%') - return fmt; + return ""; const char* fmt_end = ImParseFormatFindEnd(fmt_start); if (fmt_end[0] == 0) // If we only have leading decoration, we don't need to copy the data. return fmt_start; @@ -2810,6 +3540,57 @@ const char* ImParseFormatTrimDecorations(const char* fmt, char* buf, size_t buf_ return buf; } +// Sanitize format +// - Zero terminate so extra characters after format (e.g. "%f123") don't confuse atof/atoi +// - stb_sprintf.h supports several new modifiers which format numbers in a way that also makes them incompatible atof/atoi. +void ImParseFormatSanitizeForPrinting(const char* fmt_in, char* fmt_out, size_t fmt_out_size) +{ + const char* fmt_end = ImParseFormatFindEnd(fmt_in); + IM_UNUSED(fmt_out_size); + IM_ASSERT((size_t)(fmt_end - fmt_in + 1) < fmt_out_size); // Format is too long, let us know if this happens to you! + while (fmt_in < fmt_end) + { + char c = *fmt_in++; + if (c != '\'' && c != '$' && c != '_') // Custom flags provided by stb_sprintf.h. POSIX 2008 also supports '. + *(fmt_out++) = c; + } + *fmt_out = 0; // Zero-terminate +} + +// - For scanning we need to remove all width and precision fields and flags "%+3.7f" -> "%f". BUT don't strip types like "%I64d" which includes digits. ! "%07I64d" -> "%I64d" +const char* ImParseFormatSanitizeForScanning(const char* fmt_in, char* fmt_out, size_t fmt_out_size) +{ + const char* fmt_end = ImParseFormatFindEnd(fmt_in); + const char* fmt_out_begin = fmt_out; + IM_UNUSED(fmt_out_size); + IM_ASSERT((size_t)(fmt_end - fmt_in + 1) < fmt_out_size); // Format is too long, let us know if this happens to you! + bool has_type = false; + while (fmt_in < fmt_end) + { + char c = *fmt_in++; + if (!has_type && ((c >= '0' && c <= '9') || c == '.' || c == '+' || c == '#')) + continue; + has_type |= ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')); // Stop skipping digits + if (c != '\'' && c != '$' && c != '_') // Custom flags provided by stb_sprintf.h. POSIX 2008 also supports '. + *(fmt_out++) = c; + } + *fmt_out = 0; // Zero-terminate + return fmt_out_begin; +} + +template +static const char* ImAtoi(const char* src, TYPE* output) +{ + int negative = 0; + if (*src == '-') { negative = 1; src++; } + if (*src == '+') { src++; } + TYPE v = 0; + while (*src >= '0' && *src <= '9') + v = (v * 10) + (*src++ - '0'); + *output = negative ? -v : v; + return src; +} + // Parse display precision back from the display format string // FIXME: This is still used by some navigation code path to infer a minimum tweak step, but we should aim to rework widgets so it isn't needed. int ImParseFormatPrecision(const char* fmt, int default_precision) @@ -2836,42 +3617,84 @@ int ImParseFormatPrecision(const char* fmt, int default_precision) // Create text input in place of another active widget (e.g. used when doing a CTRL+Click on drag/slider widgets) // FIXME: Facilitate using this in variety of other situations. -bool ImGui::TempInputTextScalar(const ImRect& bb, ImGuiID id, const char* label, ImGuiDataType data_type, void* data_ptr, const char* format) +// FIXME: Among other things, setting ImGuiItemFlags_AllowDuplicateId in LastItemData is currently correct but +// the expected relationship between TempInputXXX functions and LastItemData is a little fishy. +bool ImGui::TempInputText(const ImRect& bb, ImGuiID id, const char* label, char* buf, int buf_size, ImGuiInputTextFlags flags) { - ImGuiContext& g = *GImGui; - // On the first frame, g.TempInputTextId == 0, then on subsequent frames it becomes == id. // We clear ActiveID on the first frame to allow the InputText() taking it back. - const bool init = (g.TempInputTextId != id); + ImGuiContext& g = *GImGui; + const bool init = (g.TempInputId != id); if (init) ClearActiveID(); - char fmt_buf[32]; - char data_buf[32]; - format = ImParseFormatTrimDecorations(format, fmt_buf, IM_ARRAYSIZE(fmt_buf)); - DataTypeFormatString(data_buf, IM_ARRAYSIZE(data_buf), data_type, data_ptr, format); - ImStrTrimBlanks(data_buf); - g.CurrentWindow->DC.CursorPos = bb.Min; - ImGuiInputTextFlags flags = ImGuiInputTextFlags_AutoSelectAll | ImGuiInputTextFlags_NoMarkEdited; - flags |= ((data_type == ImGuiDataType_Float || data_type == ImGuiDataType_Double) ? ImGuiInputTextFlags_CharsScientific : ImGuiInputTextFlags_CharsDecimal); - bool value_changed = InputTextEx(label, NULL, data_buf, IM_ARRAYSIZE(data_buf), bb.GetSize(), flags); + g.LastItemData.ItemFlags |= ImGuiItemFlags_AllowDuplicateId; + bool value_changed = InputTextEx(label, NULL, buf, buf_size, bb.GetSize(), flags | ImGuiInputTextFlags_MergedItem); if (init) { // First frame we started displaying the InputText widget, we expect it to take the active id. IM_ASSERT(g.ActiveId == id); - g.TempInputTextId = g.ActiveId; + g.TempInputId = g.ActiveId; } - if (value_changed) + return value_changed; +} + +// Note that Drag/Slider functions are only forwarding the min/max values clamping values if the ImGuiSliderFlags_AlwaysClamp flag is set! +// This is intended: this way we allow CTRL+Click manual input to set a value out of bounds, for maximum flexibility. +// However this may not be ideal for all uses, as some user code may break on out of bound values. +bool ImGui::TempInputScalar(const ImRect& bb, ImGuiID id, const char* label, ImGuiDataType data_type, void* p_data, const char* format, const void* p_clamp_min, const void* p_clamp_max) +{ + // FIXME: May need to clarify display behavior if format doesn't contain %. + // "%d" -> "%d" / "There are %d items" -> "%d" / "items" -> "%d" (fallback). Also see #6405 + ImGuiContext& g = *GImGui; + const ImGuiDataTypeInfo* type_info = DataTypeGetInfo(data_type); + char fmt_buf[32]; + char data_buf[32]; + format = ImParseFormatTrimDecorations(format, fmt_buf, IM_ARRAYSIZE(fmt_buf)); + if (format[0] == 0) + format = type_info->PrintFmt; + DataTypeFormatString(data_buf, IM_ARRAYSIZE(data_buf), data_type, p_data, format); + ImStrTrimBlanks(data_buf); + + ImGuiInputTextFlags flags = ImGuiInputTextFlags_AutoSelectAll | (ImGuiInputTextFlags)ImGuiInputTextFlags_LocalizeDecimalPoint; + g.LastItemData.ItemFlags |= ImGuiItemFlags_NoMarkEdited; // Because TempInputText() uses ImGuiInputTextFlags_MergedItem it doesn't submit a new item, so we poke LastItemData. + bool value_changed = false; + if (TempInputText(bb, id, label, data_buf, IM_ARRAYSIZE(data_buf), flags)) { - value_changed = DataTypeApplyOpFromText(data_buf, g.InputTextState.InitialTextA.Data, data_type, data_ptr, NULL); + // Backup old value + size_t data_type_size = type_info->Size; + ImGuiDataTypeStorage data_backup; + memcpy(&data_backup, p_data, data_type_size); + + // Apply new value (or operations) then clamp + DataTypeApplyFromText(data_buf, data_type, p_data, format, NULL); + if (p_clamp_min || p_clamp_max) + { + if (p_clamp_min && p_clamp_max && DataTypeCompare(data_type, p_clamp_min, p_clamp_max) > 0) + ImSwap(p_clamp_min, p_clamp_max); + DataTypeClamp(data_type, p_data, p_clamp_min, p_clamp_max); + } + + // Only mark as edited if new value is different + g.LastItemData.ItemFlags &= ~ImGuiItemFlags_NoMarkEdited; + value_changed = memcmp(&data_backup, p_data, data_type_size) != 0; if (value_changed) MarkItemEdited(id); } return value_changed; } -bool ImGui::InputScalar(const char* label, ImGuiDataType data_type, void* data_ptr, const void* step, const void* step_fast, const char* format, ImGuiInputTextFlags flags) +void ImGui::SetNextItemRefVal(ImGuiDataType data_type, void* p_data) +{ + ImGuiContext& g = *GImGui; + g.NextItemData.HasFlags |= ImGuiNextItemDataFlags_HasRefVal; + memcpy(&g.NextItemData.RefVal, p_data, DataTypeGetInfo(data_type)->Size); +} + +// Note: p_data, p_step, p_step_fast are _pointers_ to a memory address holding the data. For an Input widget, p_step and p_step_fast are optional. +// Read code of e.g. InputFloat(), InputInt() etc. or examples in 'Demo->Widgets->Data Types' to understand how to use this function directly. +bool ImGui::InputScalar(const char* label, ImGuiDataType data_type, void* p_data, const void* p_step, const void* p_step_fast, const char* format, ImGuiInputTextFlags flags) { ImGuiWindow* window = GetCurrentWindow(); if (window->SkipItems) @@ -2879,20 +3702,31 @@ bool ImGui::InputScalar(const char* label, ImGuiDataType data_type, void* data_p ImGuiContext& g = *GImGui; ImGuiStyle& style = g.Style; + IM_ASSERT((flags & ImGuiInputTextFlags_EnterReturnsTrue) == 0); // Not supported by InputScalar(). Please open an issue if you this would be useful to you. Otherwise use IsItemDeactivatedAfterEdit()! if (format == NULL) format = DataTypeGetInfo(data_type)->PrintFmt; + void* p_data_default = (g.NextItemData.HasFlags & ImGuiNextItemDataFlags_HasRefVal) ? &g.NextItemData.RefVal : &g.DataTypeZeroValue; + char buf[64]; - DataTypeFormatString(buf, IM_ARRAYSIZE(buf), data_type, data_ptr, format); + if ((flags & ImGuiInputTextFlags_DisplayEmptyRefVal) && DataTypeCompare(data_type, p_data, p_data_default) == 0) + buf[0] = 0; + else + DataTypeFormatString(buf, IM_ARRAYSIZE(buf), data_type, p_data, format); + + // Disable the MarkItemEdited() call in InputText but keep ImGuiItemStatusFlags_Edited. + // We call MarkItemEdited() ourselves by comparing the actual data rather than the string. + g.NextItemData.ItemFlags |= ImGuiItemFlags_NoMarkEdited; + flags |= ImGuiInputTextFlags_AutoSelectAll | (ImGuiInputTextFlags)ImGuiInputTextFlags_LocalizeDecimalPoint; bool value_changed = false; - if ((flags & (ImGuiInputTextFlags_CharsHexadecimal | ImGuiInputTextFlags_CharsScientific)) == 0) - flags |= ImGuiInputTextFlags_CharsDecimal; - flags |= ImGuiInputTextFlags_AutoSelectAll; - flags |= ImGuiInputTextFlags_NoMarkEdited; // We call MarkItemEdited() ourselve by comparing the actual data rather than the string. - - if (step != NULL) + if (p_step == NULL) + { + if (InputText(label, buf, IM_ARRAYSIZE(buf), flags)) + value_changed = DataTypeApplyFromText(buf, data_type, p_data, format, (flags & ImGuiInputTextFlags_ParseEmptyRefVal) ? p_data_default : NULL); + } + else { const float button_size = GetFrameHeight(); @@ -2900,26 +3734,30 @@ bool ImGui::InputScalar(const char* label, ImGuiDataType data_type, void* data_p PushID(label); SetNextItemWidth(ImMax(1.0f, CalcItemWidth() - (button_size + style.ItemInnerSpacing.x) * 2)); if (InputText("", buf, IM_ARRAYSIZE(buf), flags)) // PushId(label) + "" gives us the expected ID from outside point of view - value_changed = DataTypeApplyOpFromText(buf, g.InputTextState.InitialTextA.Data, data_type, data_ptr, format); + value_changed = DataTypeApplyFromText(buf, data_type, p_data, format, (flags & ImGuiInputTextFlags_ParseEmptyRefVal) ? p_data_default : NULL); + IMGUI_TEST_ENGINE_ITEM_INFO(g.LastItemData.ID, label, g.LastItemData.StatusFlags | ImGuiItemStatusFlags_Inputable); // Step buttons const ImVec2 backup_frame_padding = style.FramePadding; style.FramePadding.x = style.FramePadding.y; - ImGuiButtonFlags button_flags = ImGuiButtonFlags_Repeat | ImGuiButtonFlags_DontClosePopups; if (flags & ImGuiInputTextFlags_ReadOnly) - button_flags |= ImGuiButtonFlags_Disabled; + BeginDisabled(); + PushItemFlag(ImGuiItemFlags_ButtonRepeat, true); SameLine(0, style.ItemInnerSpacing.x); - if (ButtonEx("-", ImVec2(button_size, button_size), button_flags)) + if (ButtonEx("-", ImVec2(button_size, button_size))) { - DataTypeApplyOp(data_type, '-', data_ptr, data_ptr, g.IO.KeyCtrl && step_fast ? step_fast : step); + DataTypeApplyOp(data_type, '-', p_data, p_data, g.IO.KeyCtrl && p_step_fast ? p_step_fast : p_step); value_changed = true; } SameLine(0, style.ItemInnerSpacing.x); - if (ButtonEx("+", ImVec2(button_size, button_size), button_flags)) + if (ButtonEx("+", ImVec2(button_size, button_size))) { - DataTypeApplyOp(data_type, '+', data_ptr, data_ptr, g.IO.KeyCtrl && step_fast ? step_fast : step); + DataTypeApplyOp(data_type, '+', p_data, p_data, g.IO.KeyCtrl && p_step_fast ? p_step_fast : p_step); value_changed = true; } + PopItemFlag(); + if (flags & ImGuiInputTextFlags_ReadOnly) + EndDisabled(); const char* label_end = FindRenderedTextEnd(label); if (label != label_end) @@ -2932,18 +3770,15 @@ bool ImGui::InputScalar(const char* label, ImGuiDataType data_type, void* data_p PopID(); EndGroup(); } - else - { - if (InputText(label, buf, IM_ARRAYSIZE(buf), flags)) - value_changed = DataTypeApplyOpFromText(buf, g.InputTextState.InitialTextA.Data, data_type, data_ptr, format); - } + + g.LastItemData.ItemFlags &= ~ImGuiItemFlags_NoMarkEdited; if (value_changed) - MarkItemEdited(window->DC.LastItemId); + MarkItemEdited(g.LastItemData.ID); return value_changed; } -bool ImGui::InputScalarN(const char* label, ImGuiDataType data_type, void* v, int components, const void* step, const void* step_fast, const char* format, ImGuiInputTextFlags flags) +bool ImGui::InputScalarN(const char* label, ImGuiDataType data_type, void* p_data, int components, const void* p_step, const void* p_step_fast, const char* format, ImGuiInputTextFlags flags) { ImGuiWindow* window = GetCurrentWindow(); if (window->SkipItems) @@ -2960,10 +3795,10 @@ bool ImGui::InputScalarN(const char* label, ImGuiDataType data_type, void* v, in PushID(i); if (i > 0) SameLine(0, g.Style.ItemInnerSpacing.x); - value_changed |= InputScalar("", data_type, v, step, step_fast, format, flags); + value_changed |= InputScalar("", data_type, p_data, p_step, p_step_fast, format, flags); PopID(); PopItemWidth(); - v = (void*)((char*)v + type_size); + p_data = (void*)((char*)p_data + type_size); } PopID(); @@ -2980,8 +3815,7 @@ bool ImGui::InputScalarN(const char* label, ImGuiDataType data_type, void* v, in bool ImGui::InputFloat(const char* label, float* v, float step, float step_fast, const char* format, ImGuiInputTextFlags flags) { - flags |= ImGuiInputTextFlags_CharsScientific; - return InputScalar(label, ImGuiDataType_Float, (void*)v, (void*)(step>0.0f ? &step : NULL), (void*)(step_fast>0.0f ? &step_fast : NULL), format, flags); + return InputScalar(label, ImGuiDataType_Float, (void*)v, (void*)(step > 0.0f ? &step : NULL), (void*)(step_fast > 0.0f ? &step_fast : NULL), format, flags); } bool ImGui::InputFloat2(const char* label, float v[2], const char* format, ImGuiInputTextFlags flags) @@ -2999,46 +3833,11 @@ bool ImGui::InputFloat4(const char* label, float v[4], const char* format, ImGui return InputScalarN(label, ImGuiDataType_Float, v, 4, NULL, NULL, format, flags); } -// Prefer using "const char* format" directly, which is more flexible and consistent with other API. -#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS -bool ImGui::InputFloat(const char* label, float* v, float step, float step_fast, int decimal_precision, ImGuiInputTextFlags flags) -{ - char format[16] = "%f"; - if (decimal_precision >= 0) - ImFormatString(format, IM_ARRAYSIZE(format), "%%.%df", decimal_precision); - return InputFloat(label, v, step, step_fast, format, flags); -} - -bool ImGui::InputFloat2(const char* label, float v[2], int decimal_precision, ImGuiInputTextFlags flags) -{ - char format[16] = "%f"; - if (decimal_precision >= 0) - ImFormatString(format, IM_ARRAYSIZE(format), "%%.%df", decimal_precision); - return InputScalarN(label, ImGuiDataType_Float, v, 2, NULL, NULL, format, flags); -} - -bool ImGui::InputFloat3(const char* label, float v[3], int decimal_precision, ImGuiInputTextFlags flags) -{ - char format[16] = "%f"; - if (decimal_precision >= 0) - ImFormatString(format, IM_ARRAYSIZE(format), "%%.%df", decimal_precision); - return InputScalarN(label, ImGuiDataType_Float, v, 3, NULL, NULL, format, flags); -} - -bool ImGui::InputFloat4(const char* label, float v[4], int decimal_precision, ImGuiInputTextFlags flags) -{ - char format[16] = "%f"; - if (decimal_precision >= 0) - ImFormatString(format, IM_ARRAYSIZE(format), "%%.%df", decimal_precision); - return InputScalarN(label, ImGuiDataType_Float, v, 4, NULL, NULL, format, flags); -} -#endif // IMGUI_DISABLE_OBSOLETE_FUNCTIONS - bool ImGui::InputInt(const char* label, int* v, int step, int step_fast, ImGuiInputTextFlags flags) { // Hexadecimal input provided as a convenience but the flag name is awkward. Typically you'd use InputText() to parse your own data, if you want to handle prefixes. const char* format = (flags & ImGuiInputTextFlags_CharsHexadecimal) ? "%08X" : "%d"; - return InputScalar(label, ImGuiDataType_S32, (void*)v, (void*)(step>0 ? &step : NULL), (void*)(step_fast>0 ? &step_fast : NULL), format, flags); + return InputScalar(label, ImGuiDataType_S32, (void*)v, (void*)(step > 0 ? &step : NULL), (void*)(step_fast > 0 ? &step_fast : NULL), format, flags); } bool ImGui::InputInt2(const char* label, int v[2], ImGuiInputTextFlags flags) @@ -3058,23 +3857,32 @@ bool ImGui::InputInt4(const char* label, int v[4], ImGuiInputTextFlags flags) bool ImGui::InputDouble(const char* label, double* v, double step, double step_fast, const char* format, ImGuiInputTextFlags flags) { - flags |= ImGuiInputTextFlags_CharsScientific; - return InputScalar(label, ImGuiDataType_Double, (void*)v, (void*)(step>0.0 ? &step : NULL), (void*)(step_fast>0.0 ? &step_fast : NULL), format, flags); + return InputScalar(label, ImGuiDataType_Double, (void*)v, (void*)(step > 0.0 ? &step : NULL), (void*)(step_fast > 0.0 ? &step_fast : NULL), format, flags); } //------------------------------------------------------------------------- // [SECTION] Widgets: InputText, InputTextMultiline, InputTextWithHint //------------------------------------------------------------------------- +// - imstb_textedit.h include // - InputText() // - InputTextWithHint() // - InputTextMultiline() +// - InputTextGetCharInfo() [Internal] +// - InputTextReindexLines() [Internal] +// - InputTextReindexLinesRange() [Internal] // - InputTextEx() [Internal] +// - DebugNodeInputTextState() [Internal] //------------------------------------------------------------------------- +namespace ImStb +{ +#include "imstb_textedit.h" +} + bool ImGui::InputText(const char* label, char* buf, size_t buf_size, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data) { IM_ASSERT(!(flags & ImGuiInputTextFlags_Multiline)); // call InputTextMultiline() - return InputTextEx(label, NULL, buf, (int)buf_size, ImVec2(0,0), flags, callback, user_data); + return InputTextEx(label, NULL, buf, (int)buf_size, ImVec2(0, 0), flags, callback, user_data); } bool ImGui::InputTextMultiline(const char* label, char* buf, size_t buf_size, const ImVec2& size, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data) @@ -3084,38 +3892,50 @@ bool ImGui::InputTextMultiline(const char* label, char* buf, size_t buf_size, co bool ImGui::InputTextWithHint(const char* label, const char* hint, char* buf, size_t buf_size, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data) { - IM_ASSERT(!(flags & ImGuiInputTextFlags_Multiline)); // call InputTextMultiline() + IM_ASSERT(!(flags & ImGuiInputTextFlags_Multiline)); // call InputTextMultiline() or InputTextEx() manually if you need multi-line + hint. return InputTextEx(label, hint, buf, (int)buf_size, ImVec2(0, 0), flags, callback, user_data); } +// This is only used in the path where the multiline widget is inactivate. static int InputTextCalcTextLenAndLineCount(const char* text_begin, const char** out_text_end) { int line_count = 0; const char* s = text_begin; - while (char c = *s++) // We are only matching for \n so we can ignore UTF-8 decoding - if (c == '\n') - line_count++; - s--; - if (s[0] != '\n' && s[0] != '\r') + while (true) + { + const char* s_eol = strchr(s, '\n'); line_count++; + if (s_eol == NULL) + { + s = s + ImStrlen(s); + break; + } + s = s_eol + 1; + } *out_text_end = s; return line_count; } -static ImVec2 InputTextCalcTextSizeW(const ImWchar* text_begin, const ImWchar* text_end, const ImWchar** remaining, ImVec2* out_offset, bool stop_on_new_line) +// FIXME: Ideally we'd share code with ImFont::CalcTextSizeA() +static ImVec2 InputTextCalcTextSize(ImGuiContext* ctx, const char* text_begin, const char* text_end, const char** remaining, ImVec2* out_offset, bool stop_on_new_line) { - ImGuiContext& g = *GImGui; + ImGuiContext& g = *ctx; ImFont* font = g.Font; const float line_height = g.FontSize; const float scale = line_height / font->FontSize; - ImVec2 text_size = ImVec2(0,0); + ImVec2 text_size = ImVec2(0, 0); float line_width = 0.0f; - const ImWchar* s = text_begin; + const char* s = text_begin; while (s < text_end) { - unsigned int c = (unsigned int)(*s++); + unsigned int c = (unsigned int)*s; + if (c < 0x80) + s += 1; + else + s += ImTextCharFromUtf8(&c, s, text_end); + if (c == '\n') { text_size.x = ImMax(text_size.x, line_width); @@ -3128,7 +3948,7 @@ static ImVec2 InputTextCalcTextSizeW(const ImWchar* text_begin, const ImWchar* t if (c == '\r') continue; - const float char_width = font->GetCharAdvance((ImWchar)c) * scale; + const float char_width = ((int)c < font->IndexAdvanceX.Size ? font->IndexAdvanceX.Data[c] : font->FallbackAdvanceX) * scale; line_width += char_width; } @@ -3148,19 +3968,21 @@ static ImVec2 InputTextCalcTextSizeW(const ImWchar* text_begin, const ImWchar* t } // Wrapper for stb_textedit.h to edit text (our wrapper is for: statically sized buffer, single-line, wchar characters. InputText converts between UTF-8 and wchar) +// With our UTF-8 use of stb_textedit: +// - STB_TEXTEDIT_GETCHAR is nothing more than a a "GETBYTE". It's only used to compare to ascii or to copy blocks of text so we are fine. +// - One exception is the STB_TEXTEDIT_IS_SPACE feature which would expect a full char in order to handle full-width space such as 0x3000 (see ImCharIsBlankW). +// - ...but we don't use that feature. namespace ImStb { - -static int STB_TEXTEDIT_STRINGLEN(const STB_TEXTEDIT_STRING* obj) { return obj->CurLenW; } -static ImWchar STB_TEXTEDIT_GETCHAR(const STB_TEXTEDIT_STRING* obj, int idx) { return obj->TextW[idx]; } -static float STB_TEXTEDIT_GETWIDTH(STB_TEXTEDIT_STRING* obj, int line_start_idx, int char_idx) { ImWchar c = obj->TextW[line_start_idx + char_idx]; if (c == '\n') return STB_TEXTEDIT_GETWIDTH_NEWLINE; ImGuiContext& g = *GImGui; return g.Font->GetCharAdvance(c) * (g.FontSize / g.Font->FontSize); } -static int STB_TEXTEDIT_KEYTOTEXT(int key) { return key >= 0x10000 ? 0 : key; } -static ImWchar STB_TEXTEDIT_NEWLINE = '\n'; -static void STB_TEXTEDIT_LAYOUTROW(StbTexteditRow* r, STB_TEXTEDIT_STRING* obj, int line_start_idx) +static int STB_TEXTEDIT_STRINGLEN(const ImGuiInputTextState* obj) { return obj->TextLen; } +static char STB_TEXTEDIT_GETCHAR(const ImGuiInputTextState* obj, int idx) { IM_ASSERT(idx <= obj->TextLen); return obj->TextSrc[idx]; } +static float STB_TEXTEDIT_GETWIDTH(ImGuiInputTextState* obj, int line_start_idx, int char_idx) { unsigned int c; ImTextCharFromUtf8(&c, obj->TextSrc + line_start_idx + char_idx, obj->TextSrc + obj->TextLen); if ((ImWchar)c == '\n') return IMSTB_TEXTEDIT_GETWIDTH_NEWLINE; ImGuiContext& g = *obj->Ctx; return g.Font->GetCharAdvance((ImWchar)c) * g.FontScale; } +static char STB_TEXTEDIT_NEWLINE = '\n'; +static void STB_TEXTEDIT_LAYOUTROW(StbTexteditRow* r, ImGuiInputTextState* obj, int line_start_idx) { - const ImWchar* text = obj->TextW.Data; - const ImWchar* text_remaining = NULL; - const ImVec2 size = InputTextCalcTextSizeW(text + line_start_idx, text + obj->CurLenW, &text_remaining, NULL, true); + const char* text = obj->TextSrc; + const char* text_remaining = NULL; + const ImVec2 size = InputTextCalcTextSize(obj->Ctx, text + line_start_idx, text + obj->TextLen, &text_remaining, NULL, true); r->x0 = 0.0f; r->x1 = size.x; r->baseline_y_delta = size.y; @@ -3169,60 +3991,137 @@ static void STB_TEXTEDIT_LAYOUTROW(StbTexteditRow* r, STB_TEXTEDIT_STRING* ob r->num_chars = (int)(text_remaining - (text + line_start_idx)); } -static bool is_separator(unsigned int c) { return ImCharIsBlankW(c) || c==',' || c==';' || c=='(' || c==')' || c=='{' || c=='}' || c=='[' || c==']' || c=='|'; } -static int is_word_boundary_from_right(STB_TEXTEDIT_STRING* obj, int idx) { return idx > 0 ? (is_separator( obj->TextW[idx-1] ) && !is_separator( obj->TextW[idx] ) ) : 1; } -static int STB_TEXTEDIT_MOVEWORDLEFT_IMPL(STB_TEXTEDIT_STRING* obj, int idx) { idx--; while (idx >= 0 && !is_word_boundary_from_right(obj, idx)) idx--; return idx < 0 ? 0 : idx; } -#ifdef __APPLE__ // FIXME: Move setting to IO structure -static int is_word_boundary_from_left(STB_TEXTEDIT_STRING* obj, int idx) { return idx > 0 ? (!is_separator( obj->TextW[idx-1] ) && is_separator( obj->TextW[idx] ) ) : 1; } -static int STB_TEXTEDIT_MOVEWORDRIGHT_IMPL(STB_TEXTEDIT_STRING* obj, int idx) { idx++; int len = obj->CurLenW; while (idx < len && !is_word_boundary_from_left(obj, idx)) idx++; return idx > len ? len : idx; } -#else -static int STB_TEXTEDIT_MOVEWORDRIGHT_IMPL(STB_TEXTEDIT_STRING* obj, int idx) { idx++; int len = obj->CurLenW; while (idx < len && !is_word_boundary_from_right(obj, idx)) idx++; return idx > len ? len : idx; } -#endif -#define STB_TEXTEDIT_MOVEWORDLEFT STB_TEXTEDIT_MOVEWORDLEFT_IMPL // They need to be #define for stb_textedit.h -#define STB_TEXTEDIT_MOVEWORDRIGHT STB_TEXTEDIT_MOVEWORDRIGHT_IMPL +#define IMSTB_TEXTEDIT_GETNEXTCHARINDEX IMSTB_TEXTEDIT_GETNEXTCHARINDEX_IMPL +#define IMSTB_TEXTEDIT_GETPREVCHARINDEX IMSTB_TEXTEDIT_GETPREVCHARINDEX_IMPL -static void STB_TEXTEDIT_DELETECHARS(STB_TEXTEDIT_STRING* obj, int pos, int n) +static int IMSTB_TEXTEDIT_GETNEXTCHARINDEX_IMPL(ImGuiInputTextState* obj, int idx) { - ImWchar* dst = obj->TextW.Data + pos; - - // We maintain our buffer length in both UTF-8 and wchar formats - obj->CurLenA -= ImTextCountUtf8BytesFromStr(dst, dst + n); - obj->CurLenW -= n; - - // Offset remaining text (FIXME-OPT: Use memmove) - const ImWchar* src = obj->TextW.Data + pos + n; - while (ImWchar c = *src++) - *dst++ = c; - *dst = '\0'; + if (idx >= obj->TextLen) + return obj->TextLen + 1; + unsigned int c; + return idx + ImTextCharFromUtf8(&c, obj->TextSrc + idx, obj->TextSrc + obj->TextLen); } -static bool STB_TEXTEDIT_INSERTCHARS(STB_TEXTEDIT_STRING* obj, int pos, const ImWchar* new_text, int new_text_len) +static int IMSTB_TEXTEDIT_GETPREVCHARINDEX_IMPL(ImGuiInputTextState* obj, int idx) { - const bool is_resizable = (obj->UserFlags & ImGuiInputTextFlags_CallbackResize) != 0; - const int text_len = obj->CurLenW; + if (idx <= 0) + return -1; + const char* p = ImTextFindPreviousUtf8Codepoint(obj->TextSrc, obj->TextSrc + idx); + return (int)(p - obj->TextSrc); +} + +static bool ImCharIsSeparatorW(unsigned int c) +{ + static const unsigned int separator_list[] = + { + ',', 0x3001, '.', 0x3002, ';', 0xFF1B, '(', 0xFF08, ')', 0xFF09, '{', 0xFF5B, '}', 0xFF5D, + '[', 0x300C, ']', 0x300D, '|', 0xFF5C, '!', 0xFF01, '\\', 0xFFE5, '/', 0x30FB, 0xFF0F, + '\n', '\r', + }; + for (unsigned int separator : separator_list) + if (c == separator) + return true; + return false; +} + +static int is_word_boundary_from_right(ImGuiInputTextState* obj, int idx) +{ + // When ImGuiInputTextFlags_Password is set, we don't want actions such as CTRL+Arrow to leak the fact that underlying data are blanks or separators. + if ((obj->Flags & ImGuiInputTextFlags_Password) || idx <= 0) + return 0; + + const char* curr_p = obj->TextSrc + idx; + const char* prev_p = ImTextFindPreviousUtf8Codepoint(obj->TextSrc, curr_p); + unsigned int curr_c; ImTextCharFromUtf8(&curr_c, curr_p, obj->TextSrc + obj->TextLen); + unsigned int prev_c; ImTextCharFromUtf8(&prev_c, prev_p, obj->TextSrc + obj->TextLen); + + bool prev_white = ImCharIsBlankW(prev_c); + bool prev_separ = ImCharIsSeparatorW(prev_c); + bool curr_white = ImCharIsBlankW(curr_c); + bool curr_separ = ImCharIsSeparatorW(curr_c); + return ((prev_white || prev_separ) && !(curr_separ || curr_white)) || (curr_separ && !prev_separ); +} +static int is_word_boundary_from_left(ImGuiInputTextState* obj, int idx) +{ + if ((obj->Flags & ImGuiInputTextFlags_Password) || idx <= 0) + return 0; + + const char* curr_p = obj->TextSrc + idx; + const char* prev_p = ImTextFindPreviousUtf8Codepoint(obj->TextSrc, curr_p); + unsigned int prev_c; ImTextCharFromUtf8(&prev_c, curr_p, obj->TextSrc + obj->TextLen); + unsigned int curr_c; ImTextCharFromUtf8(&curr_c, prev_p, obj->TextSrc + obj->TextLen); + + bool prev_white = ImCharIsBlankW(prev_c); + bool prev_separ = ImCharIsSeparatorW(prev_c); + bool curr_white = ImCharIsBlankW(curr_c); + bool curr_separ = ImCharIsSeparatorW(curr_c); + return ((prev_white) && !(curr_separ || curr_white)) || (curr_separ && !prev_separ); +} +static int STB_TEXTEDIT_MOVEWORDLEFT_IMPL(ImGuiInputTextState* obj, int idx) +{ + idx = IMSTB_TEXTEDIT_GETPREVCHARINDEX(obj, idx); + while (idx >= 0 && !is_word_boundary_from_right(obj, idx)) + idx = IMSTB_TEXTEDIT_GETPREVCHARINDEX(obj, idx); + return idx < 0 ? 0 : idx; +} +static int STB_TEXTEDIT_MOVEWORDRIGHT_MAC(ImGuiInputTextState* obj, int idx) +{ + int len = obj->TextLen; + idx = IMSTB_TEXTEDIT_GETNEXTCHARINDEX(obj, idx); + while (idx < len && !is_word_boundary_from_left(obj, idx)) + idx = IMSTB_TEXTEDIT_GETNEXTCHARINDEX(obj, idx); + return idx > len ? len : idx; +} +static int STB_TEXTEDIT_MOVEWORDRIGHT_WIN(ImGuiInputTextState* obj, int idx) +{ + idx = IMSTB_TEXTEDIT_GETNEXTCHARINDEX(obj, idx); + int len = obj->TextLen; + while (idx < len && !is_word_boundary_from_right(obj, idx)) + idx = IMSTB_TEXTEDIT_GETNEXTCHARINDEX(obj, idx); + return idx > len ? len : idx; +} +static int STB_TEXTEDIT_MOVEWORDRIGHT_IMPL(ImGuiInputTextState* obj, int idx) { ImGuiContext& g = *obj->Ctx; if (g.IO.ConfigMacOSXBehaviors) return STB_TEXTEDIT_MOVEWORDRIGHT_MAC(obj, idx); else return STB_TEXTEDIT_MOVEWORDRIGHT_WIN(obj, idx); } +#define STB_TEXTEDIT_MOVEWORDLEFT STB_TEXTEDIT_MOVEWORDLEFT_IMPL // They need to be #define for stb_textedit.h +#define STB_TEXTEDIT_MOVEWORDRIGHT STB_TEXTEDIT_MOVEWORDRIGHT_IMPL + +static void STB_TEXTEDIT_DELETECHARS(ImGuiInputTextState* obj, int pos, int n) +{ + // Offset remaining text (+ copy zero terminator) + IM_ASSERT(obj->TextSrc == obj->TextA.Data); + char* dst = obj->TextA.Data + pos; + char* src = obj->TextA.Data + pos + n; + memmove(dst, src, obj->TextLen - n - pos + 1); + obj->Edited = true; + obj->TextLen -= n; +} + +static bool STB_TEXTEDIT_INSERTCHARS(ImGuiInputTextState* obj, int pos, const char* new_text, int new_text_len) +{ + const bool is_resizable = (obj->Flags & ImGuiInputTextFlags_CallbackResize) != 0; + const int text_len = obj->TextLen; IM_ASSERT(pos <= text_len); - const int new_text_len_utf8 = ImTextCountUtf8BytesFromStr(new_text, new_text + new_text_len); - if (!is_resizable && (new_text_len_utf8 + obj->CurLenA + 1 > obj->BufCapacityA)) + if (!is_resizable && (new_text_len + obj->TextLen + 1 > obj->BufCapacity)) return false; // Grow internal buffer if needed - if (new_text_len + text_len + 1 > obj->TextW.Size) + IM_ASSERT(obj->TextSrc == obj->TextA.Data); + if (new_text_len + text_len + 1 > obj->TextA.Size) { if (!is_resizable) return false; - IM_ASSERT(text_len < obj->TextW.Size); - obj->TextW.resize(text_len + ImClamp(new_text_len * 4, 32, ImMax(256, new_text_len)) + 1); + obj->TextA.resize(text_len + ImClamp(new_text_len, 32, ImMax(256, new_text_len)) + 1); + obj->TextSrc = obj->TextA.Data; } - ImWchar* text = obj->TextW.Data; + char* text = obj->TextA.Data; if (pos != text_len) - memmove(text + pos + new_text_len, text + pos, (size_t)(text_len - pos) * sizeof(ImWchar)); - memcpy(text + pos, new_text, (size_t)new_text_len * sizeof(ImWchar)); + memmove(text + pos + new_text_len, text + pos, (size_t)(text_len - pos)); + memcpy(text + pos, new_text, (size_t)new_text_len); - obj->CurLenW += new_text_len; - obj->CurLenA += new_text_len_utf8; - obj->TextW[obj->CurLenW] = '\0'; + obj->Edited = true; + obj->TextLen += new_text_len; + obj->TextA[obj->TextLen] = '\0'; return true; } @@ -3242,38 +4141,95 @@ static bool STB_TEXTEDIT_INSERTCHARS(STB_TEXTEDIT_STRING* obj, int pos, const Im #define STB_TEXTEDIT_K_REDO 0x20000B // keyboard input to perform redo #define STB_TEXTEDIT_K_WORDLEFT 0x20000C // keyboard input to move cursor left one word #define STB_TEXTEDIT_K_WORDRIGHT 0x20000D // keyboard input to move cursor right one word +#define STB_TEXTEDIT_K_PGUP 0x20000E // keyboard input to move cursor up a page +#define STB_TEXTEDIT_K_PGDOWN 0x20000F // keyboard input to move cursor down a page #define STB_TEXTEDIT_K_SHIFT 0x400000 -#define STB_TEXTEDIT_IMPLEMENTATION +#define IMSTB_TEXTEDIT_IMPLEMENTATION +#define IMSTB_TEXTEDIT_memmove memmove #include "imstb_textedit.h" +// stb_textedit internally allows for a single undo record to do addition and deletion, but somehow, calling +// the stb_textedit_paste() function creates two separate records, so we perform it manually. (FIXME: Report to nothings/stb?) +static void stb_textedit_replace(ImGuiInputTextState* str, STB_TexteditState* state, const IMSTB_TEXTEDIT_CHARTYPE* text, int text_len) +{ + stb_text_makeundo_replace(str, state, 0, str->TextLen, text_len); + ImStb::STB_TEXTEDIT_DELETECHARS(str, 0, str->TextLen); + state->cursor = state->select_start = state->select_end = 0; + if (text_len <= 0) + return; + if (ImStb::STB_TEXTEDIT_INSERTCHARS(str, 0, text, text_len)) + { + state->cursor = state->select_start = state->select_end = text_len; + state->has_preferred_x = 0; + return; + } + IM_ASSERT(0); // Failed to insert character, normally shouldn't happen because of how we currently use stb_textedit_replace() +} + +} // namespace ImStb + +// We added an extra indirection where 'Stb' is heap-allocated, in order facilitate the work of bindings generators. +ImGuiInputTextState::ImGuiInputTextState() +{ + memset(this, 0, sizeof(*this)); + Stb = IM_NEW(ImStbTexteditState); + memset(Stb, 0, sizeof(*Stb)); +} + +ImGuiInputTextState::~ImGuiInputTextState() +{ + IM_DELETE(Stb); } void ImGuiInputTextState::OnKeyPressed(int key) { - stb_textedit_key(this, &Stb, key); + stb_textedit_key(this, Stb, key); CursorFollow = true; CursorAnimReset(); } +void ImGuiInputTextState::OnCharPressed(unsigned int c) +{ + // Convert the key to a UTF8 byte sequence. + // The changes we had to make to stb_textedit_key made it very much UTF-8 specific which is not too great. + char utf8[5]; + ImTextCharToUtf8(utf8, c); + stb_textedit_text(this, Stb, utf8, (int)ImStrlen(utf8)); + CursorFollow = true; + CursorAnimReset(); +} + +// Those functions are not inlined in imgui_internal.h, allowing us to hide ImStbTexteditState from that header. +void ImGuiInputTextState::CursorAnimReset() { CursorAnim = -0.30f; } // After a user-input the cursor stays on for a while without blinking +void ImGuiInputTextState::CursorClamp() { Stb->cursor = ImMin(Stb->cursor, TextLen); Stb->select_start = ImMin(Stb->select_start, TextLen); Stb->select_end = ImMin(Stb->select_end, TextLen); } +bool ImGuiInputTextState::HasSelection() const { return Stb->select_start != Stb->select_end; } +void ImGuiInputTextState::ClearSelection() { Stb->select_start = Stb->select_end = Stb->cursor; } +int ImGuiInputTextState::GetCursorPos() const { return Stb->cursor; } +int ImGuiInputTextState::GetSelectionStart() const { return Stb->select_start; } +int ImGuiInputTextState::GetSelectionEnd() const { return Stb->select_end; } +void ImGuiInputTextState::SelectAll() { Stb->select_start = 0; Stb->cursor = Stb->select_end = TextLen; Stb->has_preferred_x = 0; } +void ImGuiInputTextState::ReloadUserBufAndSelectAll() { WantReloadUserBuf = true; ReloadSelectionStart = 0; ReloadSelectionEnd = INT_MAX; } +void ImGuiInputTextState::ReloadUserBufAndKeepSelection() { WantReloadUserBuf = true; ReloadSelectionStart = Stb->select_start; ReloadSelectionEnd = Stb->select_end; } +void ImGuiInputTextState::ReloadUserBufAndMoveToEnd() { WantReloadUserBuf = true; ReloadSelectionStart = ReloadSelectionEnd = INT_MAX; } + ImGuiInputTextCallbackData::ImGuiInputTextCallbackData() { memset(this, 0, sizeof(*this)); } -// Public API to manipulate UTF-8 text -// We expose UTF-8 to the user (unlike the STB_TEXTEDIT_* functions which are manipulating wchar) +// Public API to manipulate UTF-8 text from within a callback. // FIXME: The existence of this rarely exercised code path is a bit of a nuisance. +// Historically they existed because STB_TEXTEDIT_INSERTCHARS() etc. worked on our ImWchar +// buffer, but nowadays they both work on UTF-8 data. Should aim to merge both. void ImGuiInputTextCallbackData::DeleteChars(int pos, int bytes_count) { IM_ASSERT(pos + bytes_count <= BufTextLen); char* dst = Buf + pos; const char* src = Buf + pos + bytes_count; - while (char c = *src++) - *dst++ = c; - *dst = '\0'; + memmove(dst, src, BufTextLen - bytes_count - pos + 1); - if (CursorPos + bytes_count >= pos) + if (CursorPos >= pos + bytes_count) CursorPos -= bytes_count; else if (CursorPos >= pos) CursorPos = pos; @@ -3284,22 +4240,27 @@ void ImGuiInputTextCallbackData::DeleteChars(int pos, int bytes_count) void ImGuiInputTextCallbackData::InsertChars(int pos, const char* new_text, const char* new_text_end) { + // Accept null ranges + if (new_text == new_text_end) + return; + + // Grow internal buffer if needed const bool is_resizable = (Flags & ImGuiInputTextFlags_CallbackResize) != 0; - const int new_text_len = new_text_end ? (int)(new_text_end - new_text) : (int)strlen(new_text); + const int new_text_len = new_text_end ? (int)(new_text_end - new_text) : (int)ImStrlen(new_text); if (new_text_len + BufTextLen >= BufSize) { if (!is_resizable) return; - // Contrary to STB_TEXTEDIT_INSERTCHARS() this is working in the UTF8 buffer, hence the midly similar code (until we remove the U16 buffer alltogether!) - ImGuiContext& g = *GImGui; + ImGuiContext& g = *Ctx; ImGuiInputTextState* edit_state = &g.InputTextState; IM_ASSERT(edit_state->ID != 0 && g.ActiveId == edit_state->ID); IM_ASSERT(Buf == edit_state->TextA.Data); int new_buf_size = BufTextLen + ImClamp(new_text_len * 4, 32, ImMax(256, new_text_len)) + 1; - edit_state->TextA.reserve(new_buf_size + 1); + edit_state->TextA.resize(new_buf_size + 1); + edit_state->TextSrc = edit_state->TextA.Data; Buf = edit_state->TextA.Data; - BufSize = edit_state->BufCapacityA = new_buf_size; + BufSize = edit_state->BufCapacity = new_buf_size; } if (BufTextLen != pos) @@ -3314,54 +4275,116 @@ void ImGuiInputTextCallbackData::InsertChars(int pos, const char* new_text, cons BufTextLen += new_text_len; } +void ImGui::PushPasswordFont() +{ + ImGuiContext& g = *GImGui; + ImFont* in_font = g.Font; + ImFont* out_font = &g.InputTextPasswordFont; + ImFontGlyph* glyph = in_font->FindGlyph('*'); + out_font->FontSize = in_font->FontSize; + out_font->Scale = in_font->Scale; + out_font->Ascent = in_font->Ascent; + out_font->Descent = in_font->Descent; + out_font->ContainerAtlas = in_font->ContainerAtlas; + out_font->FallbackGlyph = glyph; + out_font->FallbackAdvanceX = glyph->AdvanceX; + IM_ASSERT(out_font->Glyphs.Size == 0 && out_font->IndexAdvanceX.Size == 0 && out_font->IndexLookup.Size == 0); + PushFont(out_font); +} + // Return false to discard a character. -static bool InputTextFilterCharacter(unsigned int* p_char, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data) +static bool InputTextFilterCharacter(ImGuiContext* ctx, unsigned int* p_char, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data, bool input_source_is_clipboard) { unsigned int c = *p_char; // Filter non-printable (NB: isprint is unreliable! see #2467) + bool apply_named_filters = true; if (c < 0x20) { bool pass = false; - pass |= (c == '\n' && (flags & ImGuiInputTextFlags_Multiline)); - pass |= (c == '\t' && (flags & ImGuiInputTextFlags_AllowTabInput)); + pass |= (c == '\n') && (flags & ImGuiInputTextFlags_Multiline) != 0; // Note that an Enter KEY will emit \r and be ignored (we poll for KEY in InputText() code) + if (c == '\n' && input_source_is_clipboard && (flags & ImGuiInputTextFlags_Multiline) == 0) // In single line mode, replace \n with a space + { + c = *p_char = ' '; + pass = true; + } + pass |= (c == '\n') && (flags & ImGuiInputTextFlags_Multiline) != 0; + pass |= (c == '\t') && (flags & ImGuiInputTextFlags_AllowTabInput) != 0; if (!pass) return false; + apply_named_filters = false; // Override named filters below so newline and tabs can still be inserted. + } + + if (input_source_is_clipboard == false) + { + // We ignore Ascii representation of delete (emitted from Backspace on OSX, see #2578, #2817) + if (c == 127) + return false; + + // Filter private Unicode range. GLFW on OSX seems to send private characters for special keys like arrow keys (FIXME) + if (c >= 0xE000 && c <= 0xF8FF) + return false; } - // Filter private Unicode range. GLFW on OSX seems to send private characters for special keys like arrow keys (FIXME) - if (c >= 0xE000 && c <= 0xF8FF) + // Filter Unicode ranges we are not handling in this build + if (c > IM_UNICODE_CODEPOINT_MAX) return false; // Generic named filters - if (flags & (ImGuiInputTextFlags_CharsDecimal | ImGuiInputTextFlags_CharsHexadecimal | ImGuiInputTextFlags_CharsUppercase | ImGuiInputTextFlags_CharsNoBlank | ImGuiInputTextFlags_CharsScientific)) + if (apply_named_filters && (flags & (ImGuiInputTextFlags_CharsDecimal | ImGuiInputTextFlags_CharsHexadecimal | ImGuiInputTextFlags_CharsUppercase | ImGuiInputTextFlags_CharsNoBlank | ImGuiInputTextFlags_CharsScientific | (ImGuiInputTextFlags)ImGuiInputTextFlags_LocalizeDecimalPoint))) { + // The libc allows overriding locale, with e.g. 'setlocale(LC_NUMERIC, "de_DE.UTF-8");' which affect the output/input of printf/scanf to use e.g. ',' instead of '.'. + // The standard mandate that programs starts in the "C" locale where the decimal point is '.'. + // We don't really intend to provide widespread support for it, but out of empathy for people stuck with using odd API, we support the bare minimum aka overriding the decimal point. + // Change the default decimal_point with: + // ImGui::GetPlatformIO()->Platform_LocaleDecimalPoint = *localeconv()->decimal_point; + // Users of non-default decimal point (in particular ',') may be affected by word-selection logic (is_word_boundary_from_right/is_word_boundary_from_left) functions. + ImGuiContext& g = *ctx; + const unsigned c_decimal_point = (unsigned int)g.PlatformIO.Platform_LocaleDecimalPoint; + if (flags & (ImGuiInputTextFlags_CharsDecimal | ImGuiInputTextFlags_CharsScientific | (ImGuiInputTextFlags)ImGuiInputTextFlags_LocalizeDecimalPoint)) + if (c == '.' || c == ',') + c = c_decimal_point; + + // Full-width -> half-width conversion for numeric fields (https://en.wikipedia.org/wiki/Halfwidth_and_Fullwidth_Forms_(Unicode_block) + // While this is mostly convenient, this has the side-effect for uninformed users accidentally inputting full-width characters that they may + // scratch their head as to why it works in numerical fields vs in generic text fields it would require support in the font. + if (flags & (ImGuiInputTextFlags_CharsDecimal | ImGuiInputTextFlags_CharsScientific | ImGuiInputTextFlags_CharsHexadecimal)) + if (c >= 0xFF01 && c <= 0xFF5E) + c = c - 0xFF01 + 0x21; + + // Allow 0-9 . - + * / if (flags & ImGuiInputTextFlags_CharsDecimal) - if (!(c >= '0' && c <= '9') && (c != '.') && (c != '-') && (c != '+') && (c != '*') && (c != '/')) + if (!(c >= '0' && c <= '9') && (c != c_decimal_point) && (c != '-') && (c != '+') && (c != '*') && (c != '/')) return false; + // Allow 0-9 . - + * / e E if (flags & ImGuiInputTextFlags_CharsScientific) - if (!(c >= '0' && c <= '9') && (c != '.') && (c != '-') && (c != '+') && (c != '*') && (c != '/') && (c != 'e') && (c != 'E')) + if (!(c >= '0' && c <= '9') && (c != c_decimal_point) && (c != '-') && (c != '+') && (c != '*') && (c != '/') && (c != 'e') && (c != 'E')) return false; + // Allow 0-9 a-F A-F if (flags & ImGuiInputTextFlags_CharsHexadecimal) if (!(c >= '0' && c <= '9') && !(c >= 'a' && c <= 'f') && !(c >= 'A' && c <= 'F')) return false; + // Turn a-z into A-Z if (flags & ImGuiInputTextFlags_CharsUppercase) if (c >= 'a' && c <= 'z') - *p_char = (c += (unsigned int)('A'-'a')); + c += (unsigned int)('A' - 'a'); if (flags & ImGuiInputTextFlags_CharsNoBlank) if (ImCharIsBlankW(c)) return false; + + *p_char = c; } // Custom callback filter if (flags & ImGuiInputTextFlags_CallbackCharFilter) { + ImGuiContext& g = *GImGui; ImGuiInputTextCallbackData callback_data; - memset(&callback_data, 0, sizeof(ImGuiInputTextCallbackData)); + callback_data.Ctx = &g; callback_data.EventFlag = ImGuiInputTextFlags_CallbackCharFilter; callback_data.EventChar = (ImWchar)c; callback_data.Flags = flags; @@ -3376,6 +4399,57 @@ static bool InputTextFilterCharacter(unsigned int* p_char, ImGuiInputTextFlags f return true; } +// Find the shortest single replacement we can make to get from old_buf to new_buf +// Note that this doesn't directly alter state->TextA, state->TextLen. They are expected to be made valid separately. +// FIXME: Ideally we should transition toward (1) making InsertChars()/DeleteChars() update undo-stack (2) discourage (and keep reconcile) or obsolete (and remove reconcile) accessing buffer directly. +static void InputTextReconcileUndoState(ImGuiInputTextState* state, const char* old_buf, int old_length, const char* new_buf, int new_length) +{ + const int shorter_length = ImMin(old_length, new_length); + int first_diff; + for (first_diff = 0; first_diff < shorter_length; first_diff++) + if (old_buf[first_diff] != new_buf[first_diff]) + break; + if (first_diff == old_length && first_diff == new_length) + return; + + int old_last_diff = old_length - 1; + int new_last_diff = new_length - 1; + for (; old_last_diff >= first_diff && new_last_diff >= first_diff; old_last_diff--, new_last_diff--) + if (old_buf[old_last_diff] != new_buf[new_last_diff]) + break; + + const int insert_len = new_last_diff - first_diff + 1; + const int delete_len = old_last_diff - first_diff + 1; + if (insert_len > 0 || delete_len > 0) + if (IMSTB_TEXTEDIT_CHARTYPE* p = stb_text_createundo(&state->Stb->undostate, first_diff, delete_len, insert_len)) + for (int i = 0; i < delete_len; i++) + p[i] = old_buf[first_diff + i]; +} + +// As InputText() retain textual data and we currently provide a path for user to not retain it (via local variables) +// we need some form of hook to reapply data back to user buffer on deactivation frame. (#4714) +// It would be more desirable that we discourage users from taking advantage of the "user not retaining data" trick, +// but that more likely be attractive when we do have _NoLiveEdit flag available. +void ImGui::InputTextDeactivateHook(ImGuiID id) +{ + ImGuiContext& g = *GImGui; + ImGuiInputTextState* state = &g.InputTextState; + if (id == 0 || state->ID != id) + return; + g.InputTextDeactivatedState.ID = state->ID; + if (state->Flags & ImGuiInputTextFlags_ReadOnly) + { + g.InputTextDeactivatedState.TextA.resize(0); // In theory this data won't be used, but clear to be neat. + } + else + { + IM_ASSERT(state->TextA.Data != 0); + IM_ASSERT(state->TextA[state->TextLen] == 0); + g.InputTextDeactivatedState.TextA.resize(state->TextLen + 1); + memcpy(g.InputTextDeactivatedState.TextA.Data, state->TextA.Data, state->TextLen + 1); + } +} + // Edit a string of text // - buf_size account for the zero-terminator, so a buf_size of 6 can hold "Hello" but not "Hello!". // This is so we can easily call InputText() on static arrays using ARRAYSIZE() and to match @@ -3390,8 +4464,10 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_ if (window->SkipItems) return false; + IM_ASSERT(buf != NULL && buf_size >= 0); IM_ASSERT(!((flags & ImGuiInputTextFlags_CallbackHistory) && (flags & ImGuiInputTextFlags_Multiline))); // Can't use both together (they both use up/down keys) IM_ASSERT(!((flags & ImGuiInputTextFlags_CallbackCompletion) && (flags & ImGuiInputTextFlags_AllowTabInput))); // Can't use both together (they both use tab key) + IM_ASSERT(!((flags & ImGuiInputTextFlags_ElideLeft) && (flags & ImGuiInputTextFlags_Multiline))); // Multiline will not work with left-trimming ImGuiContext& g = *GImGui; ImGuiIO& io = g.IO; @@ -3399,6 +4475,82 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_ const bool RENDER_SELECTION_WHEN_INACTIVE = false; const bool is_multiline = (flags & ImGuiInputTextFlags_Multiline) != 0; + + if (is_multiline) // Open group before calling GetID() because groups tracks id created within their scope (including the scrollbar) + BeginGroup(); + const ImGuiID id = window->GetID(label); + const ImVec2 label_size = CalcTextSize(label, NULL, true); + const ImVec2 frame_size = CalcItemSize(size_arg, CalcItemWidth(), (is_multiline ? g.FontSize * 8.0f : label_size.y) + style.FramePadding.y * 2.0f); // Arbitrary default of 8 lines high for multi-line + const ImVec2 total_size = ImVec2(frame_size.x + (label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f), frame_size.y); + + const ImRect frame_bb(window->DC.CursorPos, window->DC.CursorPos + frame_size); + const ImRect total_bb(frame_bb.Min, frame_bb.Min + total_size); + + ImGuiWindow* draw_window = window; + ImVec2 inner_size = frame_size; + ImGuiLastItemData item_data_backup; + if (is_multiline) + { + ImVec2 backup_pos = window->DC.CursorPos; + ItemSize(total_bb, style.FramePadding.y); + if (!ItemAdd(total_bb, id, &frame_bb, ImGuiItemFlags_Inputable)) + { + EndGroup(); + return false; + } + item_data_backup = g.LastItemData; + window->DC.CursorPos = backup_pos; + + // Prevent NavActivation from Tabbing when our widget accepts Tab inputs: this allows cycling through widgets without stopping. + if (g.NavActivateId == id && (g.NavActivateFlags & ImGuiActivateFlags_FromTabbing) && (flags & ImGuiInputTextFlags_AllowTabInput)) + g.NavActivateId = 0; + + // Prevent NavActivate reactivating in BeginChild() when we are already active. + const ImGuiID backup_activate_id = g.NavActivateId; + if (g.ActiveId == id) // Prevent reactivation + g.NavActivateId = 0; + + // We reproduce the contents of BeginChildFrame() in order to provide 'label' so our window internal data are easier to read/debug. + PushStyleColor(ImGuiCol_ChildBg, style.Colors[ImGuiCol_FrameBg]); + PushStyleVar(ImGuiStyleVar_ChildRounding, style.FrameRounding); + PushStyleVar(ImGuiStyleVar_ChildBorderSize, style.FrameBorderSize); + PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0)); // Ensure no clip rect so mouse hover can reach FramePadding edges + bool child_visible = BeginChildEx(label, id, frame_bb.GetSize(), ImGuiChildFlags_Borders, ImGuiWindowFlags_NoMove); + g.NavActivateId = backup_activate_id; + PopStyleVar(3); + PopStyleColor(); + if (!child_visible) + { + EndChild(); + EndGroup(); + return false; + } + draw_window = g.CurrentWindow; // Child window + draw_window->DC.NavLayersActiveMaskNext |= (1 << draw_window->DC.NavLayerCurrent); // This is to ensure that EndChild() will display a navigation highlight so we can "enter" into it. + draw_window->DC.CursorPos += style.FramePadding; + inner_size.x -= draw_window->ScrollbarSizes.x; + } + else + { + // Support for internal ImGuiInputTextFlags_MergedItem flag, which could be redesigned as an ItemFlags if needed (with test performed in ItemAdd) + ItemSize(total_bb, style.FramePadding.y); + if (!(flags & ImGuiInputTextFlags_MergedItem)) + if (!ItemAdd(total_bb, id, &frame_bb, ImGuiItemFlags_Inputable)) + return false; + } + + // Ensure mouse cursor is set even after switching to keyboard/gamepad mode. May generalize further? (#6417) + bool hovered = ItemHoverable(frame_bb, id, g.LastItemData.ItemFlags | ImGuiItemFlags_NoNavDisableMouseHover); + if (hovered) + SetMouseCursor(ImGuiMouseCursor_TextInput); + if (hovered && g.NavHighlightItemUnderNav) + hovered = false; + + // We are only allowed to access the state if we are already the active widget. + ImGuiInputTextState* state = GetInputTextState(id); + + if (g.LastItemData.ItemFlags & ImGuiItemFlags_ReadOnly) + flags |= ImGuiInputTextFlags_ReadOnly; const bool is_readonly = (flags & ImGuiInputTextFlags_ReadOnly) != 0; const bool is_password = (flags & ImGuiInputTextFlags_Password) != 0; const bool is_undoable = (flags & ImGuiInputTextFlags_NoUndoRedo) == 0; @@ -3406,118 +4558,135 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_ if (is_resizable) IM_ASSERT(callback != NULL); // Must provide a callback if you set the ImGuiInputTextFlags_CallbackResize flag! - if (is_multiline) // Open group before calling GetID() because groups tracks id created within their scope, - BeginGroup(); - const ImGuiID id = window->GetID(label); - const ImVec2 label_size = CalcTextSize(label, NULL, true); - ImVec2 size = CalcItemSize(size_arg, CalcItemWidth(), (is_multiline ? g.FontSize * 8.0f : label_size.y) + style.FramePadding.y*2.0f); // Arbitrary default of 8 lines high for multi-line - const ImRect frame_bb(window->DC.CursorPos, window->DC.CursorPos + size); - const ImRect total_bb(frame_bb.Min, frame_bb.Max + ImVec2(label_size.x > 0.0f ? (style.ItemInnerSpacing.x + label_size.x) : 0.0f, 0.0f)); - - ImGuiWindow* draw_window = window; - if (is_multiline) - { - if (!ItemAdd(total_bb, id, &frame_bb)) - { - ItemSize(total_bb, style.FramePadding.y); - EndGroup(); - return false; - } - if (!BeginChildFrame(id, frame_bb.GetSize())) - { - EndChildFrame(); - EndGroup(); - return false; - } - draw_window = GetCurrentWindow(); - draw_window->DC.NavLayerActiveMaskNext |= draw_window->DC.NavLayerCurrentMask; // This is to ensure that EndChild() will display a navigation highlight - size.x -= draw_window->ScrollbarSizes.x; - } - else - { - ItemSize(total_bb, style.FramePadding.y); - if (!ItemAdd(total_bb, id, &frame_bb)) - return false; - } - const bool hovered = ItemHoverable(frame_bb, id); - if (hovered) - g.MouseCursor = ImGuiMouseCursor_TextInput; - - // NB: we are only allowed to access 'edit_state' if we are the active widget. - ImGuiInputTextState* state = NULL; - if (g.InputTextState.ID == id) - state = &g.InputTextState; - - const bool focus_requested = FocusableItemRegister(window, id); - const bool focus_requested_by_code = focus_requested && (g.FocusRequestCurrWindow == window && g.FocusRequestCurrCounterAll == window->DC.FocusCounterAll); - const bool focus_requested_by_tab = focus_requested && !focus_requested_by_code; + const bool input_requested_by_nav = (g.ActiveId != id) && ((g.NavActivateId == id) && ((g.NavActivateFlags & ImGuiActivateFlags_PreferInput) || (g.NavInputSource == ImGuiInputSource_Keyboard))); const bool user_clicked = hovered && io.MouseClicked[0]; - const bool user_nav_input_start = (g.ActiveId != id) && ((g.NavInputId == id) || (g.NavActivateId == id && g.NavInputSource == ImGuiInputSource_NavKeyboard)); - const bool user_scroll_finish = is_multiline && state != NULL && g.ActiveId == 0 && g.ActiveIdPreviousFrame == GetScrollbarID(draw_window, ImGuiAxis_Y); - const bool user_scroll_active = is_multiline && state != NULL && g.ActiveId == GetScrollbarID(draw_window, ImGuiAxis_Y); - + const bool user_scroll_finish = is_multiline && state != NULL && g.ActiveId == 0 && g.ActiveIdPreviousFrame == GetWindowScrollbarID(draw_window, ImGuiAxis_Y); + const bool user_scroll_active = is_multiline && state != NULL && g.ActiveId == GetWindowScrollbarID(draw_window, ImGuiAxis_Y); bool clear_active_id = false; - bool select_all = (g.ActiveId != id) && ((flags & ImGuiInputTextFlags_AutoSelectAll) != 0 || user_nav_input_start) && (!is_multiline); + bool select_all = false; - const bool init_make_active = (focus_requested || user_clicked || user_scroll_finish || user_nav_input_start); + float scroll_y = is_multiline ? draw_window->Scroll.y : FLT_MAX; + + const bool init_reload_from_user_buf = (state != NULL && state->WantReloadUserBuf); + const bool init_changed_specs = (state != NULL && state->Stb->single_line != !is_multiline); // state != NULL means its our state. + const bool init_make_active = (user_clicked || user_scroll_finish || input_requested_by_nav); const bool init_state = (init_make_active || user_scroll_active); - if (init_state && g.ActiveId != id) + if (init_reload_from_user_buf) + { + int new_len = (int)ImStrlen(buf); + IM_ASSERT(new_len + 1 <= buf_size && "Is your input buffer properly zero-terminated?"); + state->WantReloadUserBuf = false; + InputTextReconcileUndoState(state, state->TextA.Data, state->TextLen, buf, new_len); + state->TextA.resize(buf_size + 1); // we use +1 to make sure that .Data is always pointing to at least an empty string. + state->TextLen = new_len; + memcpy(state->TextA.Data, buf, state->TextLen + 1); + state->Stb->select_start = state->ReloadSelectionStart; + state->Stb->cursor = state->Stb->select_end = state->ReloadSelectionEnd; + state->CursorClamp(); + } + else if ((init_state && g.ActiveId != id) || init_changed_specs) { // Access state even if we don't own it yet. state = &g.InputTextState; state->CursorAnimReset(); - // Take a copy of the initial buffer value (both in original UTF-8 format and converted to wchar) - // From the moment we focused we are ignoring the content of 'buf' (unless we are in read-only mode) - const int buf_len = (int)strlen(buf); - state->InitialTextA.resize(buf_len + 1); // UTF-8. we use +1 to make sure that .Data is always pointing to at least an empty string. - memcpy(state->InitialTextA.Data, buf, buf_len + 1); + // Backup state of deactivating item so they'll have a chance to do a write to output buffer on the same frame they report IsItemDeactivatedAfterEdit (#4714) + InputTextDeactivateHook(state->ID); - // Start edition - const char* buf_end = NULL; - state->TextW.resize(buf_size + 1); // wchar count <= UTF-8 count. we use +1 to make sure that .Data is always pointing to at least an empty string. - state->TextA.resize(0); - state->TextAIsValid = false; // TextA is not valid yet (we will display buf until then) - state->CurLenW = ImTextStrFromUtf8(state->TextW.Data, buf_size, buf, NULL, &buf_end); - state->CurLenA = (int)(buf_end - buf); // We can't get the result from ImStrncpy() above because it is not UTF-8 aware. Here we'll cut off malformed UTF-8. + // Take a copy of the initial buffer value. + // From the moment we focused we are normally ignoring the content of 'buf' (unless we are in read-only mode) + const int buf_len = (int)ImStrlen(buf); + IM_ASSERT(buf_len + 1 <= buf_size && "Is your input buffer properly zero-terminated?"); + state->TextToRevertTo.resize(buf_len + 1); // UTF-8. we use +1 to make sure that .Data is always pointing to at least an empty string. + memcpy(state->TextToRevertTo.Data, buf, buf_len + 1); // Preserve cursor position and undo/redo stack if we come back to same widget - // FIXME: For non-readonly widgets we might be able to require that TextAIsValid && TextA == buf ? (untested) and discard undo stack if user buffer has changed. - const bool recycle_state = (state->ID == id); - if (recycle_state) + // FIXME: Since we reworked this on 2022/06, may want to differentiate recycle_cursor vs recycle_undostate? + bool recycle_state = (state->ID == id && !init_changed_specs); + if (recycle_state && (state->TextLen != buf_len || (state->TextA.Data == NULL || strncmp(state->TextA.Data, buf, buf_len) != 0))) + recycle_state = false; + + // Start edition + state->ID = id; + state->TextLen = buf_len; + if (!is_readonly) { - // Recycle existing cursor/selection/undo stack but clamp position - // Note a single mouse click will override the cursor/position immediately by calling stb_textedit_click handler. - state->CursorClamp(); + state->TextA.resize(buf_size + 1); // we use +1 to make sure that .Data is always pointing to at least an empty string. + memcpy(state->TextA.Data, buf, state->TextLen + 1); } + + // Find initial scroll position for right alignment + state->Scroll = ImVec2(0.0f, 0.0f); + if (flags & ImGuiInputTextFlags_ElideLeft) + state->Scroll.x += ImMax(0.0f, CalcTextSize(buf).x - frame_size.x + style.FramePadding.x * 2.0f); + + // Recycle existing cursor/selection/undo stack but clamp position + // Note a single mouse click will override the cursor/position immediately by calling stb_textedit_click handler. + if (recycle_state) + state->CursorClamp(); else + stb_textedit_initialize_state(state->Stb, !is_multiline); + + if (!is_multiline) { - state->ID = id; - state->ScrollX = 0.0f; - stb_textedit_initialize_state(&state->Stb, !is_multiline); - if (!is_multiline && focus_requested_by_code) + if (flags & ImGuiInputTextFlags_AutoSelectAll) + select_all = true; + if (input_requested_by_nav && (!recycle_state || !(g.NavActivateFlags & ImGuiActivateFlags_TryToPreserveState))) + select_all = true; + if (user_clicked && io.KeyCtrl) select_all = true; } - if (flags & ImGuiInputTextFlags_AlwaysInsertMode) - state->Stb.insert_mode = 1; - if (!is_multiline && (focus_requested_by_tab || (user_clicked && io.KeyCtrl))) - select_all = true; + + if (flags & ImGuiInputTextFlags_AlwaysOverwrite) + state->Stb->insert_mode = 1; // stb field name is indeed incorrect (see #2863) } + const bool is_osx = io.ConfigMacOSXBehaviors; if (g.ActiveId != id && init_make_active) { IM_ASSERT(state && state->ID == id); SetActiveID(id, window); SetFocusID(id, window); FocusWindow(window); - IM_ASSERT(ImGuiNavInput_COUNT < 32); - g.ActiveIdBlockNavInputFlags = (1 << ImGuiNavInput_Cancel); - if (flags & (ImGuiInputTextFlags_CallbackCompletion | ImGuiInputTextFlags_AllowTabInput)) // Disable keyboard tabbing out as we will use the \t character. - g.ActiveIdBlockNavInputFlags |= (1 << ImGuiNavInput_KeyTab_); - if (!is_multiline && !(flags & ImGuiInputTextFlags_CallbackHistory)) - g.ActiveIdAllowNavDirFlags = ((1 << ImGuiDir_Up) | (1 << ImGuiDir_Down)); } + if (g.ActiveId == id) + { + // Declare some inputs, the other are registered and polled via Shortcut() routing system. + // FIXME: The reason we don't use Shortcut() is we would need a routing flag to specify multiple mods, or to all mods combinaison into individual shortcuts. + const ImGuiKey always_owned_keys[] = { ImGuiKey_LeftArrow, ImGuiKey_RightArrow, ImGuiKey_Enter, ImGuiKey_KeypadEnter, ImGuiKey_Delete, ImGuiKey_Backspace, ImGuiKey_Home, ImGuiKey_End }; + for (ImGuiKey key : always_owned_keys) + SetKeyOwner(key, id); + if (user_clicked) + SetKeyOwner(ImGuiKey_MouseLeft, id); + g.ActiveIdUsingNavDirMask |= (1 << ImGuiDir_Left) | (1 << ImGuiDir_Right); + if (is_multiline || (flags & ImGuiInputTextFlags_CallbackHistory)) + { + g.ActiveIdUsingNavDirMask |= (1 << ImGuiDir_Up) | (1 << ImGuiDir_Down); + SetKeyOwner(ImGuiKey_UpArrow, id); + SetKeyOwner(ImGuiKey_DownArrow, id); + } + if (is_multiline) + { + SetKeyOwner(ImGuiKey_PageUp, id); + SetKeyOwner(ImGuiKey_PageDown, id); + } + // FIXME: May be a problem to always steal Alt on OSX, would ideally still allow an uninterrupted Alt down-up to toggle menu + if (is_osx) + SetKeyOwner(ImGuiMod_Alt, id); + + // Expose scroll in a manner that is agnostic to us using a child window + if (is_multiline && state != NULL) + state->Scroll.y = draw_window->Scroll.y; + + // Read-only mode always ever read from source buffer. Refresh TextLen when active. + if (is_readonly && state != NULL) + state->TextLen = (int)ImStrlen(buf); + //if (is_readonly && state != NULL) + // state->TextA.clear(); // Uncomment to facilitate debugging, but we otherwise prefer to keep/amortize th allocation. + } + if (state != NULL) + state->TextSrc = is_readonly ? buf : state->TextA.Data; // We have an edge case if ActiveId was set through another widget (e.g. widget being swapped), clear id immediately (don't wait until the end of the function) if (g.ActiveId == id && state == NULL) @@ -3528,117 +4697,127 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_ clear_active_id = true; // Lock the decision of whether we are going to take the path displaying the cursor or selection - const bool render_cursor = (g.ActiveId == id) || (state && user_scroll_active); - bool render_selection = state && state->HasSelection() && (RENDER_SELECTION_WHEN_INACTIVE || render_cursor); + bool render_cursor = (g.ActiveId == id) || (state && user_scroll_active); + bool render_selection = state && (state->HasSelection() || select_all) && (RENDER_SELECTION_WHEN_INACTIVE || render_cursor); bool value_changed = false; - bool enter_pressed = false; - - // When read-only we always use the live data passed to the function - // FIXME-OPT: Because our selection/cursor code currently needs the wide text we need to convert it when active, which is not ideal :( - if (is_readonly && state != NULL && (render_cursor || render_selection)) - { - const char* buf_end = NULL; - state->TextW.resize(buf_size + 1); - state->CurLenW = ImTextStrFromUtf8(state->TextW.Data, state->TextW.Size, buf, NULL, &buf_end); - state->CurLenA = (int)(buf_end - buf); - state->CursorClamp(); - render_selection &= state->HasSelection(); - } + bool validated = false; // Select the buffer to render. - const bool buf_display_from_state = (render_cursor || render_selection || g.ActiveId == id) && !is_readonly && state && state->TextAIsValid; - const bool is_displaying_hint = (hint != NULL && (buf_display_from_state ? state->TextA.Data : buf)[0] == 0); + const bool buf_display_from_state = (render_cursor || render_selection || g.ActiveId == id) && !is_readonly && state; + bool is_displaying_hint = (hint != NULL && (buf_display_from_state ? state->TextA.Data : buf)[0] == 0); // Password pushes a temporary font with only a fallback glyph if (is_password && !is_displaying_hint) - { - const ImFontGlyph* glyph = g.Font->FindGlyph('*'); - ImFont* password_font = &g.InputTextPasswordFont; - password_font->FontSize = g.Font->FontSize; - password_font->Scale = g.Font->Scale; - password_font->DisplayOffset = g.Font->DisplayOffset; - password_font->Ascent = g.Font->Ascent; - password_font->Descent = g.Font->Descent; - password_font->ContainerAtlas = g.Font->ContainerAtlas; - password_font->FallbackGlyph = glyph; - password_font->FallbackAdvanceX = glyph->AdvanceX; - IM_ASSERT(password_font->Glyphs.empty() && password_font->IndexAdvanceX.empty() && password_font->IndexLookup.empty()); - PushFont(password_font); - } + PushPasswordFont(); // Process mouse inputs and character inputs - int backup_current_text_length = 0; if (g.ActiveId == id) { IM_ASSERT(state != NULL); - backup_current_text_length = state->CurLenA; - state->BufCapacityA = buf_size; - state->UserFlags = flags; - state->UserCallback = callback; - state->UserCallbackData = callback_user_data; + state->Edited = false; + state->BufCapacity = buf_size; + state->Flags = flags; // Although we are active we don't prevent mouse from hovering other elements unless we are interacting right now with the widget. // Down the line we should have a cleaner library-wide concept of Selected vs Active. g.ActiveIdAllowOverlap = !io.MouseDown[0]; - g.WantTextInputNextFrame = 1; // Edit in progress - const float mouse_x = (io.MousePos.x - frame_bb.Min.x - style.FramePadding.x) + state->ScrollX; - const float mouse_y = (is_multiline ? (io.MousePos.y - draw_window->DC.CursorPos.y - style.FramePadding.y) : (g.FontSize*0.5f)); + const float mouse_x = (io.MousePos.x - frame_bb.Min.x - style.FramePadding.x) + state->Scroll.x; + const float mouse_y = (is_multiline ? (io.MousePos.y - draw_window->DC.CursorPos.y) : (g.FontSize * 0.5f)); - const bool is_osx = io.ConfigMacOSXBehaviors; - if (select_all || (hovered && !is_osx && io.MouseDoubleClicked[0])) + if (select_all) { state->SelectAll(); state->SelectedAllMouseLock = true; } - else if (hovered && is_osx && io.MouseDoubleClicked[0]) + else if (hovered && io.MouseClickedCount[0] >= 2 && !io.KeyShift) { - // Double-click select a word only, OS X style (by simulating keystrokes) - state->OnKeyPressed(STB_TEXTEDIT_K_WORDLEFT); - state->OnKeyPressed(STB_TEXTEDIT_K_WORDRIGHT | STB_TEXTEDIT_K_SHIFT); + stb_textedit_click(state, state->Stb, mouse_x, mouse_y); + const int multiclick_count = (io.MouseClickedCount[0] - 2); + if ((multiclick_count % 2) == 0) + { + // Double-click: Select word + // We always use the "Mac" word advance for double-click select vs CTRL+Right which use the platform dependent variant: + // FIXME: There are likely many ways to improve this behavior, but there's no "right" behavior (depends on use-case, software, OS) + const bool is_bol = (state->Stb->cursor == 0) || ImStb::STB_TEXTEDIT_GETCHAR(state, state->Stb->cursor - 1) == '\n'; + if (STB_TEXT_HAS_SELECTION(state->Stb) || !is_bol) + state->OnKeyPressed(STB_TEXTEDIT_K_WORDLEFT); + //state->OnKeyPressed(STB_TEXTEDIT_K_WORDRIGHT | STB_TEXTEDIT_K_SHIFT); + if (!STB_TEXT_HAS_SELECTION(state->Stb)) + ImStb::stb_textedit_prep_selection_at_cursor(state->Stb); + state->Stb->cursor = ImStb::STB_TEXTEDIT_MOVEWORDRIGHT_MAC(state, state->Stb->cursor); + state->Stb->select_end = state->Stb->cursor; + ImStb::stb_textedit_clamp(state, state->Stb); + } + else + { + // Triple-click: Select line + const bool is_eol = ImStb::STB_TEXTEDIT_GETCHAR(state, state->Stb->cursor) == '\n'; + state->OnKeyPressed(STB_TEXTEDIT_K_LINESTART); + state->OnKeyPressed(STB_TEXTEDIT_K_LINEEND | STB_TEXTEDIT_K_SHIFT); + state->OnKeyPressed(STB_TEXTEDIT_K_RIGHT | STB_TEXTEDIT_K_SHIFT); + if (!is_eol && is_multiline) + { + ImSwap(state->Stb->select_start, state->Stb->select_end); + state->Stb->cursor = state->Stb->select_end; + } + state->CursorFollow = false; + } + state->CursorAnimReset(); } else if (io.MouseClicked[0] && !state->SelectedAllMouseLock) { if (hovered) { - stb_textedit_click(state, &state->Stb, mouse_x, mouse_y); + if (io.KeyShift) + stb_textedit_drag(state, state->Stb, mouse_x, mouse_y); + else + stb_textedit_click(state, state->Stb, mouse_x, mouse_y); state->CursorAnimReset(); } } else if (io.MouseDown[0] && !state->SelectedAllMouseLock && (io.MouseDelta.x != 0.0f || io.MouseDelta.y != 0.0f)) { - stb_textedit_drag(state, &state->Stb, mouse_x, mouse_y); + stb_textedit_drag(state, state->Stb, mouse_x, mouse_y); state->CursorAnimReset(); state->CursorFollow = true; } if (state->SelectedAllMouseLock && !io.MouseDown[0]) state->SelectedAllMouseLock = false; - // It is ill-defined whether the back-end needs to send a \t character when pressing the TAB keys. - // Win32 and GLFW naturally do it but not SDL. - const bool ignore_char_inputs = (io.KeyCtrl && !io.KeyAlt) || (is_osx && io.KeySuper); - if ((flags & ImGuiInputTextFlags_AllowTabInput) && IsKeyPressedMap(ImGuiKey_Tab) && !ignore_char_inputs && !io.KeyShift && !is_readonly) - if (!io.InputQueueCharacters.contains('\t')) + // We expect backends to emit a Tab key but some also emit a Tab character which we ignore (#2467, #1336) + // (For Tab and Enter: Win32/SFML/Allegro are sending both keys and chars, GLFW and SDL are only sending keys. For Space they all send all threes) + if ((flags & ImGuiInputTextFlags_AllowTabInput) && !is_readonly) + { + if (Shortcut(ImGuiKey_Tab, ImGuiInputFlags_Repeat, id)) { unsigned int c = '\t'; // Insert TAB - if (InputTextFilterCharacter(&c, flags, callback, callback_user_data)) - state->OnKeyPressed((int)c); + if (InputTextFilterCharacter(&g, &c, flags, callback, callback_user_data)) + state->OnCharPressed(c); } + // FIXME: Implement Shift+Tab + /* + if (Shortcut(ImGuiKey_Tab | ImGuiMod_Shift, ImGuiInputFlags_Repeat, id)) + { + } + */ + } // Process regular text input (before we check for Return because using some IME will effectively send a Return?) // We ignore CTRL inputs, but need to allow ALT+CTRL as some keyboards (e.g. German) use AltGR (which _is_ Alt+Ctrl) to input certain characters. + const bool ignore_char_inputs = (io.KeyCtrl && !io.KeyAlt) || (is_osx && io.KeyCtrl); if (io.InputQueueCharacters.Size > 0) { - if (!ignore_char_inputs && !is_readonly && !user_nav_input_start) + if (!ignore_char_inputs && !is_readonly && !input_requested_by_nav) for (int n = 0; n < io.InputQueueCharacters.Size; n++) { // Insert character if they pass filtering unsigned int c = (unsigned int)io.InputQueueCharacters[n]; - if (c == '\t' && io.KeyShift) + if (c == '\t') // Skip Tab, see above. continue; - if (InputTextFilterCharacter(&c, flags, callback, callback_user_data)) - state->OnKeyPressed((int)c); + if (InputTextFilterCharacter(&g, &c, flags, callback, callback_user_data)) + state->OnCharPressed(c); } // Consume characters @@ -3647,67 +4826,110 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_ } // Process other shortcuts/key-presses - bool cancel_edit = false; + bool revert_edit = false; if (g.ActiveId == id && !g.ActiveIdIsJustActivated && !clear_active_id) { IM_ASSERT(state != NULL); + + const int row_count_per_page = ImMax((int)((inner_size.y - style.FramePadding.y) / g.FontSize), 1); + state->Stb->row_count_per_page = row_count_per_page; + const int k_mask = (io.KeyShift ? STB_TEXTEDIT_K_SHIFT : 0); - const bool is_osx = io.ConfigMacOSXBehaviors; - const bool is_shortcut_key = (is_osx ? (io.KeySuper && !io.KeyCtrl) : (io.KeyCtrl && !io.KeySuper)) && !io.KeyAlt && !io.KeyShift; // OS X style: Shortcuts using Cmd/Super instead of Ctrl - const bool is_osx_shift_shortcut = is_osx && io.KeySuper && io.KeyShift && !io.KeyCtrl && !io.KeyAlt; const bool is_wordmove_key_down = is_osx ? io.KeyAlt : io.KeyCtrl; // OS X style: Text editing cursor movement using Alt instead of Ctrl - const bool is_startend_key_down = is_osx && io.KeySuper && !io.KeyCtrl && !io.KeyAlt; // OS X style: Line/Text Start and End using Cmd+Arrows instead of Home/End - const bool is_ctrl_key_only = io.KeyCtrl && !io.KeyShift && !io.KeyAlt && !io.KeySuper; - const bool is_shift_key_only = io.KeyShift && !io.KeyCtrl && !io.KeyAlt && !io.KeySuper; + const bool is_startend_key_down = is_osx && io.KeyCtrl && !io.KeySuper && !io.KeyAlt; // OS X style: Line/Text Start and End using Cmd+Arrows instead of Home/End - const bool is_cut = ((is_shortcut_key && IsKeyPressedMap(ImGuiKey_X)) || (is_shift_key_only && IsKeyPressedMap(ImGuiKey_Delete))) && !is_readonly && !is_password && (!is_multiline || state->HasSelection()); - const bool is_copy = ((is_shortcut_key && IsKeyPressedMap(ImGuiKey_C)) || (is_ctrl_key_only && IsKeyPressedMap(ImGuiKey_Insert))) && !is_password && (!is_multiline || state->HasSelection()); - const bool is_paste = ((is_shortcut_key && IsKeyPressedMap(ImGuiKey_V)) || (is_shift_key_only && IsKeyPressedMap(ImGuiKey_Insert))) && !is_readonly; - const bool is_undo = ((is_shortcut_key && IsKeyPressedMap(ImGuiKey_Z)) && !is_readonly && is_undoable); - const bool is_redo = ((is_shortcut_key && IsKeyPressedMap(ImGuiKey_Y)) || (is_osx_shift_shortcut && IsKeyPressedMap(ImGuiKey_Z))) && !is_readonly && is_undoable; + // Using Shortcut() with ImGuiInputFlags_RouteFocused (default policy) to allow routing operations for other code (e.g. calling window trying to use CTRL+A and CTRL+B: former would be handled by InputText) + // Otherwise we could simply assume that we own the keys as we are active. + const ImGuiInputFlags f_repeat = ImGuiInputFlags_Repeat; + const bool is_cut = (Shortcut(ImGuiMod_Ctrl | ImGuiKey_X, f_repeat, id) || Shortcut(ImGuiMod_Shift | ImGuiKey_Delete, f_repeat, id)) && !is_readonly && !is_password && (!is_multiline || state->HasSelection()); + const bool is_copy = (Shortcut(ImGuiMod_Ctrl | ImGuiKey_C, 0, id) || Shortcut(ImGuiMod_Ctrl | ImGuiKey_Insert, 0, id)) && !is_password && (!is_multiline || state->HasSelection()); + const bool is_paste = (Shortcut(ImGuiMod_Ctrl | ImGuiKey_V, f_repeat, id) || Shortcut(ImGuiMod_Shift | ImGuiKey_Insert, f_repeat, id)) && !is_readonly; + const bool is_undo = (Shortcut(ImGuiMod_Ctrl | ImGuiKey_Z, f_repeat, id)) && !is_readonly && is_undoable; + const bool is_redo = (Shortcut(ImGuiMod_Ctrl | ImGuiKey_Y, f_repeat, id) || Shortcut(ImGuiMod_Ctrl | ImGuiMod_Shift | ImGuiKey_Z, f_repeat, id)) && !is_readonly && is_undoable; + const bool is_select_all = Shortcut(ImGuiMod_Ctrl | ImGuiKey_A, 0, id); - if (IsKeyPressedMap(ImGuiKey_LeftArrow)) { state->OnKeyPressed((is_startend_key_down ? STB_TEXTEDIT_K_LINESTART : is_wordmove_key_down ? STB_TEXTEDIT_K_WORDLEFT : STB_TEXTEDIT_K_LEFT) | k_mask); } - else if (IsKeyPressedMap(ImGuiKey_RightArrow)) { state->OnKeyPressed((is_startend_key_down ? STB_TEXTEDIT_K_LINEEND : is_wordmove_key_down ? STB_TEXTEDIT_K_WORDRIGHT : STB_TEXTEDIT_K_RIGHT) | k_mask); } - else if (IsKeyPressedMap(ImGuiKey_UpArrow) && is_multiline) { if (io.KeyCtrl) SetScrollY(draw_window, ImMax(draw_window->Scroll.y - g.FontSize, 0.0f)); else state->OnKeyPressed((is_startend_key_down ? STB_TEXTEDIT_K_TEXTSTART : STB_TEXTEDIT_K_UP) | k_mask); } - else if (IsKeyPressedMap(ImGuiKey_DownArrow) && is_multiline) { if (io.KeyCtrl) SetScrollY(draw_window, ImMin(draw_window->Scroll.y + g.FontSize, GetScrollMaxY())); else state->OnKeyPressed((is_startend_key_down ? STB_TEXTEDIT_K_TEXTEND : STB_TEXTEDIT_K_DOWN) | k_mask); } - else if (IsKeyPressedMap(ImGuiKey_Home)) { state->OnKeyPressed(io.KeyCtrl ? STB_TEXTEDIT_K_TEXTSTART | k_mask : STB_TEXTEDIT_K_LINESTART | k_mask); } - else if (IsKeyPressedMap(ImGuiKey_End)) { state->OnKeyPressed(io.KeyCtrl ? STB_TEXTEDIT_K_TEXTEND | k_mask : STB_TEXTEDIT_K_LINEEND | k_mask); } - else if (IsKeyPressedMap(ImGuiKey_Delete) && !is_readonly) { state->OnKeyPressed(STB_TEXTEDIT_K_DELETE | k_mask); } - else if (IsKeyPressedMap(ImGuiKey_Backspace) && !is_readonly) + // We allow validate/cancel with Nav source (gamepad) to makes it easier to undo an accidental NavInput press with no keyboard wired, but otherwise it isn't very useful. + const bool nav_gamepad_active = (io.ConfigFlags & ImGuiConfigFlags_NavEnableGamepad) != 0 && (io.BackendFlags & ImGuiBackendFlags_HasGamepad) != 0; + const bool is_enter_pressed = IsKeyPressed(ImGuiKey_Enter, true) || IsKeyPressed(ImGuiKey_KeypadEnter, true); + const bool is_gamepad_validate = nav_gamepad_active && (IsKeyPressed(ImGuiKey_NavGamepadActivate, false) || IsKeyPressed(ImGuiKey_NavGamepadInput, false)); + const bool is_cancel = Shortcut(ImGuiKey_Escape, f_repeat, id) || (nav_gamepad_active && Shortcut(ImGuiKey_NavGamepadCancel, f_repeat, id)); + + // FIXME: Should use more Shortcut() and reduce IsKeyPressed()+SetKeyOwner(), but requires modifiers combination to be taken account of. + // FIXME-OSX: Missing support for Alt(option)+Right/Left = go to end of line, or next line if already in end of line. + if (IsKeyPressed(ImGuiKey_LeftArrow)) { state->OnKeyPressed((is_startend_key_down ? STB_TEXTEDIT_K_LINESTART : is_wordmove_key_down ? STB_TEXTEDIT_K_WORDLEFT : STB_TEXTEDIT_K_LEFT) | k_mask); } + else if (IsKeyPressed(ImGuiKey_RightArrow)) { state->OnKeyPressed((is_startend_key_down ? STB_TEXTEDIT_K_LINEEND : is_wordmove_key_down ? STB_TEXTEDIT_K_WORDRIGHT : STB_TEXTEDIT_K_RIGHT) | k_mask); } + else if (IsKeyPressed(ImGuiKey_UpArrow) && is_multiline) { if (io.KeyCtrl) SetScrollY(draw_window, ImMax(draw_window->Scroll.y - g.FontSize, 0.0f)); else state->OnKeyPressed((is_startend_key_down ? STB_TEXTEDIT_K_TEXTSTART : STB_TEXTEDIT_K_UP) | k_mask); } + else if (IsKeyPressed(ImGuiKey_DownArrow) && is_multiline) { if (io.KeyCtrl) SetScrollY(draw_window, ImMin(draw_window->Scroll.y + g.FontSize, GetScrollMaxY())); else state->OnKeyPressed((is_startend_key_down ? STB_TEXTEDIT_K_TEXTEND : STB_TEXTEDIT_K_DOWN) | k_mask); } + else if (IsKeyPressed(ImGuiKey_PageUp) && is_multiline) { state->OnKeyPressed(STB_TEXTEDIT_K_PGUP | k_mask); scroll_y -= row_count_per_page * g.FontSize; } + else if (IsKeyPressed(ImGuiKey_PageDown) && is_multiline) { state->OnKeyPressed(STB_TEXTEDIT_K_PGDOWN | k_mask); scroll_y += row_count_per_page * g.FontSize; } + else if (IsKeyPressed(ImGuiKey_Home)) { state->OnKeyPressed(io.KeyCtrl ? STB_TEXTEDIT_K_TEXTSTART | k_mask : STB_TEXTEDIT_K_LINESTART | k_mask); } + else if (IsKeyPressed(ImGuiKey_End)) { state->OnKeyPressed(io.KeyCtrl ? STB_TEXTEDIT_K_TEXTEND | k_mask : STB_TEXTEDIT_K_LINEEND | k_mask); } + else if (IsKeyPressed(ImGuiKey_Delete) && !is_readonly && !is_cut) + { + if (!state->HasSelection()) + { + // OSX doesn't seem to have Super+Delete to delete until end-of-line, so we don't emulate that (as opposed to Super+Backspace) + if (is_wordmove_key_down) + state->OnKeyPressed(STB_TEXTEDIT_K_WORDRIGHT | STB_TEXTEDIT_K_SHIFT); + } + state->OnKeyPressed(STB_TEXTEDIT_K_DELETE | k_mask); + } + else if (IsKeyPressed(ImGuiKey_Backspace) && !is_readonly) { if (!state->HasSelection()) { if (is_wordmove_key_down) - state->OnKeyPressed(STB_TEXTEDIT_K_WORDLEFT|STB_TEXTEDIT_K_SHIFT); - else if (is_osx && io.KeySuper && !io.KeyAlt && !io.KeyCtrl) - state->OnKeyPressed(STB_TEXTEDIT_K_LINESTART|STB_TEXTEDIT_K_SHIFT); + state->OnKeyPressed(STB_TEXTEDIT_K_WORDLEFT | STB_TEXTEDIT_K_SHIFT); + else if (is_osx && io.KeyCtrl && !io.KeyAlt && !io.KeySuper) + state->OnKeyPressed(STB_TEXTEDIT_K_LINESTART | STB_TEXTEDIT_K_SHIFT); } state->OnKeyPressed(STB_TEXTEDIT_K_BACKSPACE | k_mask); } - else if (IsKeyPressedMap(ImGuiKey_Enter) || IsKeyPressedMap(ImGuiKey_KeyPadEnter)) + else if (is_enter_pressed || is_gamepad_validate) { + // Determine if we turn Enter into a \n character bool ctrl_enter_for_new_line = (flags & ImGuiInputTextFlags_CtrlEnterForNewLine) != 0; - if (!is_multiline || (ctrl_enter_for_new_line && !io.KeyCtrl) || (!ctrl_enter_for_new_line && io.KeyCtrl)) + if (!is_multiline || is_gamepad_validate || (ctrl_enter_for_new_line && !io.KeyCtrl) || (!ctrl_enter_for_new_line && io.KeyCtrl)) { - enter_pressed = clear_active_id = true; + validated = true; + if (io.ConfigInputTextEnterKeepActive && !is_multiline) + state->SelectAll(); // No need to scroll + else + clear_active_id = true; } else if (!is_readonly) { unsigned int c = '\n'; // Insert new line - if (InputTextFilterCharacter(&c, flags, callback, callback_user_data)) - state->OnKeyPressed((int)c); + if (InputTextFilterCharacter(&g, &c, flags, callback, callback_user_data)) + state->OnCharPressed(c); } } - else if (IsKeyPressedMap(ImGuiKey_Escape)) + else if (is_cancel) { - clear_active_id = cancel_edit = true; + if (flags & ImGuiInputTextFlags_EscapeClearsAll) + { + if (buf[0] != 0) + { + revert_edit = true; + } + else + { + render_cursor = render_selection = false; + clear_active_id = true; + } + } + else + { + clear_active_id = revert_edit = true; + render_cursor = render_selection = false; + } } else if (is_undo || is_redo) { state->OnKeyPressed(is_undo ? STB_TEXTEDIT_K_UNDO : STB_TEXTEDIT_K_REDO); state->ClearSelection(); } - else if (is_shortcut_key && IsKeyPressedMap(ImGuiKey_A)) + else if (is_select_all) { state->SelectAll(); state->CursorFollow = true; @@ -3715,22 +4937,22 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_ else if (is_cut || is_copy) { // Cut, Copy - if (io.SetClipboardTextFn) + if (g.PlatformIO.Platform_SetClipboardTextFn != NULL) { - const int ib = state->HasSelection() ? ImMin(state->Stb.select_start, state->Stb.select_end) : 0; - const int ie = state->HasSelection() ? ImMax(state->Stb.select_start, state->Stb.select_end) : state->CurLenW; - const int clipboard_data_len = ImTextCountUtf8BytesFromStr(state->TextW.Data + ib, state->TextW.Data + ie) + 1; - char* clipboard_data = (char*)IM_ALLOC(clipboard_data_len * sizeof(char)); - ImTextStrToUtf8(clipboard_data, clipboard_data_len, state->TextW.Data + ib, state->TextW.Data + ie); - SetClipboardText(clipboard_data); - MemFree(clipboard_data); + // SetClipboardText() only takes null terminated strings + state->TextSrc may point to read-only user buffer, so we need to make a copy. + const int ib = state->HasSelection() ? ImMin(state->Stb->select_start, state->Stb->select_end) : 0; + const int ie = state->HasSelection() ? ImMax(state->Stb->select_start, state->Stb->select_end) : state->TextLen; + g.TempBuffer.reserve(ie - ib + 1); + memcpy(g.TempBuffer.Data, state->TextSrc + ib, ie - ib); + g.TempBuffer.Data[ie - ib] = 0; + SetClipboardText(g.TempBuffer.Data); } if (is_cut) { if (!state->HasSelection()) state->SelectAll(); state->CursorFollow = true; - stb_textedit_cut(state, &state->Stb); + stb_textedit_cut(state, state->Stb); } } else if (is_paste) @@ -3738,26 +4960,28 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_ if (const char* clipboard = GetClipboardText()) { // Filter pasted buffer - const int clipboard_len = (int)strlen(clipboard); - ImWchar* clipboard_filtered = (ImWchar*)IM_ALLOC((clipboard_len+1) * sizeof(ImWchar)); - int clipboard_filtered_len = 0; - for (const char* s = clipboard; *s; ) + const int clipboard_len = (int)ImStrlen(clipboard); + ImVector clipboard_filtered; + clipboard_filtered.reserve(clipboard_len + 1); + for (const char* s = clipboard; *s != 0; ) { unsigned int c; - s += ImTextCharFromUtf8(&c, s, NULL); - if (c == 0) - break; - if (c >= 0x10000 || !InputTextFilterCharacter(&c, flags, callback, callback_user_data)) + int in_len = ImTextCharFromUtf8(&c, s, NULL); + s += in_len; + if (!InputTextFilterCharacter(&g, &c, flags, callback, callback_user_data, true)) continue; - clipboard_filtered[clipboard_filtered_len++] = (ImWchar)c; + char c_utf8[5]; + ImTextCharToUtf8(c_utf8, c); + int out_len = (int)ImStrlen(c_utf8); + clipboard_filtered.resize(clipboard_filtered.Size + out_len); + memcpy(clipboard_filtered.Data + clipboard_filtered.Size - out_len, c_utf8, out_len); } - clipboard_filtered[clipboard_filtered_len] = 0; - if (clipboard_filtered_len > 0) // If everything was filtered, ignore the pasting operation + if (clipboard_filtered.Size > 0) // If everything was filtered, ignore the pasting operation { - stb_textedit_paste(state, &state->Stb, clipboard_filtered, clipboard_filtered_len); + clipboard_filtered.push_back(0); + stb_textedit_paste(state, state->Stb, clipboard_filtered.Data, clipboard_filtered.Size - 1); state->CursorFollow = true; } - MemFree(clipboard_filtered); } } @@ -3766,156 +4990,193 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_ } // Process callbacks and apply result back to user's buffer. + const char* apply_new_text = NULL; + int apply_new_text_length = 0; if (g.ActiveId == id) { IM_ASSERT(state != NULL); - const char* apply_new_text = NULL; - int apply_new_text_length = 0; - if (cancel_edit) + if (revert_edit && !is_readonly) { - // Restore initial value. Only return true if restoring to the initial value changes the current buffer contents. - if (!is_readonly && strcmp(buf, state->InitialTextA.Data) != 0) + if (flags & ImGuiInputTextFlags_EscapeClearsAll) { - apply_new_text = state->InitialTextA.Data; - apply_new_text_length = state->InitialTextA.Size - 1; + // Clear input + IM_ASSERT(buf[0] != 0); + apply_new_text = ""; + apply_new_text_length = 0; + value_changed = true; + IMSTB_TEXTEDIT_CHARTYPE empty_string; + stb_textedit_replace(state, state->Stb, &empty_string, 0); + } + else if (strcmp(buf, state->TextToRevertTo.Data) != 0) + { + apply_new_text = state->TextToRevertTo.Data; + apply_new_text_length = state->TextToRevertTo.Size - 1; + + // Restore initial value. Only return true if restoring to the initial value changes the current buffer contents. + // Push records into the undo stack so we can CTRL+Z the revert operation itself + value_changed = true; + stb_textedit_replace(state, state->Stb, state->TextToRevertTo.Data, state->TextToRevertTo.Size - 1); } } - // When using 'ImGuiInputTextFlags_EnterReturnsTrue' as a special case we reapply the live buffer back to the input buffer before clearing ActiveId, even though strictly speaking it wasn't modified on this frame. - // If we didn't do that, code like InputInt() with ImGuiInputTextFlags_EnterReturnsTrue would fail. Also this allows the user to use InputText() with ImGuiInputTextFlags_EnterReturnsTrue without maintaining any user-side storage. - bool apply_edit_back_to_user_buffer = !cancel_edit || (enter_pressed && (flags & ImGuiInputTextFlags_EnterReturnsTrue) != 0); + // FIXME-OPT: We always reapply the live buffer back to the input buffer before clearing ActiveId, + // even though strictly speaking it wasn't modified on this frame. Should mark dirty state from the stb_textedit callbacks. + // If we do that, need to ensure that as special case, 'validated == true' also writes back. + // This also allows the user to use InputText() without maintaining any user-side storage. + // (please note that if you use this property along ImGuiInputTextFlags_CallbackResize you can end up with your temporary string object + // unnecessarily allocating once a frame, either store your string data, either if you don't then don't use ImGuiInputTextFlags_CallbackResize). + const bool apply_edit_back_to_user_buffer = true;// !revert_edit || (validated && (flags & ImGuiInputTextFlags_EnterReturnsTrue) != 0); if (apply_edit_back_to_user_buffer) { - // Apply new value immediately - copy modified buffer back + // Apply current edited text immediately. // Note that as soon as the input box is active, the in-widget value gets priority over any underlying modification of the input buffer - // FIXME: We actually always render 'buf' when calling DrawList->AddText, making the comment above incorrect. - // FIXME-OPT: CPU waste to do this every time the widget is active, should mark dirty state from the stb_textedit callbacks. - if (!is_readonly) - { - state->TextAIsValid = true; - state->TextA.resize(state->TextW.Size * 4 + 1); - ImTextStrToUtf8(state->TextA.Data, state->TextA.Size, state->TextW.Data, NULL); - } // User callback - if ((flags & (ImGuiInputTextFlags_CallbackCompletion | ImGuiInputTextFlags_CallbackHistory | ImGuiInputTextFlags_CallbackAlways)) != 0) + if ((flags & (ImGuiInputTextFlags_CallbackCompletion | ImGuiInputTextFlags_CallbackHistory | ImGuiInputTextFlags_CallbackEdit | ImGuiInputTextFlags_CallbackAlways)) != 0) { IM_ASSERT(callback != NULL); // The reason we specify the usage semantic (Completion/History) is that Completion needs to disable keyboard TABBING at the moment. ImGuiInputTextFlags event_flag = 0; - ImGuiKey event_key = ImGuiKey_COUNT; - if ((flags & ImGuiInputTextFlags_CallbackCompletion) != 0 && IsKeyPressedMap(ImGuiKey_Tab)) + ImGuiKey event_key = ImGuiKey_None; + if ((flags & ImGuiInputTextFlags_CallbackCompletion) != 0 && Shortcut(ImGuiKey_Tab, 0, id)) { event_flag = ImGuiInputTextFlags_CallbackCompletion; event_key = ImGuiKey_Tab; } - else if ((flags & ImGuiInputTextFlags_CallbackHistory) != 0 && IsKeyPressedMap(ImGuiKey_UpArrow)) + else if ((flags & ImGuiInputTextFlags_CallbackHistory) != 0 && IsKeyPressed(ImGuiKey_UpArrow)) { event_flag = ImGuiInputTextFlags_CallbackHistory; event_key = ImGuiKey_UpArrow; } - else if ((flags & ImGuiInputTextFlags_CallbackHistory) != 0 && IsKeyPressedMap(ImGuiKey_DownArrow)) + else if ((flags & ImGuiInputTextFlags_CallbackHistory) != 0 && IsKeyPressed(ImGuiKey_DownArrow)) { event_flag = ImGuiInputTextFlags_CallbackHistory; event_key = ImGuiKey_DownArrow; } + else if ((flags & ImGuiInputTextFlags_CallbackEdit) && state->Edited) + { + event_flag = ImGuiInputTextFlags_CallbackEdit; + } else if (flags & ImGuiInputTextFlags_CallbackAlways) + { event_flag = ImGuiInputTextFlags_CallbackAlways; + } if (event_flag) { ImGuiInputTextCallbackData callback_data; - memset(&callback_data, 0, sizeof(ImGuiInputTextCallbackData)); + callback_data.Ctx = &g; callback_data.EventFlag = event_flag; callback_data.Flags = flags; callback_data.UserData = callback_user_data; + // FIXME-OPT: Undo stack reconcile needs a backup of the data until we rework API, see #7925 + char* callback_buf = is_readonly ? buf : state->TextA.Data; + IM_ASSERT(callback_buf == state->TextSrc); + state->CallbackTextBackup.resize(state->TextLen + 1); + memcpy(state->CallbackTextBackup.Data, callback_buf, state->TextLen + 1); + callback_data.EventKey = event_key; - callback_data.Buf = state->TextA.Data; - callback_data.BufTextLen = state->CurLenA; - callback_data.BufSize = state->BufCapacityA; + callback_data.Buf = callback_buf; + callback_data.BufTextLen = state->TextLen; + callback_data.BufSize = state->BufCapacity; callback_data.BufDirty = false; - // We have to convert from wchar-positions to UTF-8-positions, which can be pretty slow (an incentive to ditch the ImWchar buffer, see https://github.com/nothings/stb/issues/188) - ImWchar* text = state->TextW.Data; - const int utf8_cursor_pos = callback_data.CursorPos = ImTextCountUtf8BytesFromStr(text, text + state->Stb.cursor); - const int utf8_selection_start = callback_data.SelectionStart = ImTextCountUtf8BytesFromStr(text, text + state->Stb.select_start); - const int utf8_selection_end = callback_data.SelectionEnd = ImTextCountUtf8BytesFromStr(text, text + state->Stb.select_end); + const int utf8_cursor_pos = callback_data.CursorPos = state->Stb->cursor; + const int utf8_selection_start = callback_data.SelectionStart = state->Stb->select_start; + const int utf8_selection_end = callback_data.SelectionEnd = state->Stb->select_end; // Call user code callback(&callback_data); // Read back what user may have modified - IM_ASSERT(callback_data.Buf == state->TextA.Data); // Invalid to modify those fields - IM_ASSERT(callback_data.BufSize == state->BufCapacityA); + callback_buf = is_readonly ? buf : state->TextA.Data; // Pointer may have been invalidated by a resize callback + IM_ASSERT(callback_data.Buf == callback_buf); // Invalid to modify those fields + IM_ASSERT(callback_data.BufSize == state->BufCapacity); IM_ASSERT(callback_data.Flags == flags); - if (callback_data.CursorPos != utf8_cursor_pos) { state->Stb.cursor = ImTextCountCharsFromUtf8(callback_data.Buf, callback_data.Buf + callback_data.CursorPos); state->CursorFollow = true; } - if (callback_data.SelectionStart != utf8_selection_start) { state->Stb.select_start = ImTextCountCharsFromUtf8(callback_data.Buf, callback_data.Buf + callback_data.SelectionStart); } - if (callback_data.SelectionEnd != utf8_selection_end) { state->Stb.select_end = ImTextCountCharsFromUtf8(callback_data.Buf, callback_data.Buf + callback_data.SelectionEnd); } - if (callback_data.BufDirty) + const bool buf_dirty = callback_data.BufDirty; + if (callback_data.CursorPos != utf8_cursor_pos || buf_dirty) { state->Stb->cursor = callback_data.CursorPos; state->CursorFollow = true; } + if (callback_data.SelectionStart != utf8_selection_start || buf_dirty) { state->Stb->select_start = (callback_data.SelectionStart == callback_data.CursorPos) ? state->Stb->cursor : callback_data.SelectionStart; } + if (callback_data.SelectionEnd != utf8_selection_end || buf_dirty) { state->Stb->select_end = (callback_data.SelectionEnd == callback_data.SelectionStart) ? state->Stb->select_start : callback_data.SelectionEnd; } + if (buf_dirty) { - IM_ASSERT(callback_data.BufTextLen == (int)strlen(callback_data.Buf)); // You need to maintain BufTextLen if you change the text! - if (callback_data.BufTextLen > backup_current_text_length && is_resizable) - state->TextW.resize(state->TextW.Size + (callback_data.BufTextLen - backup_current_text_length)); - state->CurLenW = ImTextStrFromUtf8(state->TextW.Data, state->TextW.Size, callback_data.Buf, NULL); - state->CurLenA = callback_data.BufTextLen; // Assume correct length and valid UTF-8 from user, saves us an extra strlen() + // Callback may update buffer and thus set buf_dirty even in read-only mode. + IM_ASSERT(callback_data.BufTextLen == (int)ImStrlen(callback_data.Buf)); // You need to maintain BufTextLen if you change the text! + InputTextReconcileUndoState(state, state->CallbackTextBackup.Data, state->CallbackTextBackup.Size - 1, callback_data.Buf, callback_data.BufTextLen); + state->TextLen = callback_data.BufTextLen; // Assume correct length and valid UTF-8 from user, saves us an extra strlen() state->CursorAnimReset(); } } } // Will copy result string if modified - if (!is_readonly && strcmp(state->TextA.Data, buf) != 0) + if (!is_readonly && strcmp(state->TextSrc, buf) != 0) { - apply_new_text = state->TextA.Data; - apply_new_text_length = state->CurLenA; + apply_new_text = state->TextSrc; + apply_new_text_length = state->TextLen; + value_changed = true; } } + } - // Copy result to user buffer - if (apply_new_text) + // Handle reapplying final data on deactivation (see InputTextDeactivateHook() for details) + if (g.InputTextDeactivatedState.ID == id) + { + if (g.ActiveId != id && IsItemDeactivatedAfterEdit() && !is_readonly && strcmp(g.InputTextDeactivatedState.TextA.Data, buf) != 0) { - IM_ASSERT(apply_new_text_length >= 0); - if (backup_current_text_length != apply_new_text_length && is_resizable) - { - ImGuiInputTextCallbackData callback_data; - callback_data.EventFlag = ImGuiInputTextFlags_CallbackResize; - callback_data.Flags = flags; - callback_data.Buf = buf; - callback_data.BufTextLen = apply_new_text_length; - callback_data.BufSize = ImMax(buf_size, apply_new_text_length + 1); - callback_data.UserData = callback_user_data; - callback(&callback_data); - buf = callback_data.Buf; - buf_size = callback_data.BufSize; - apply_new_text_length = ImMin(callback_data.BufTextLen, buf_size - 1); - IM_ASSERT(apply_new_text_length <= buf_size); - } - - // If the underlying buffer resize was denied or not carried to the next frame, apply_new_text_length+1 may be >= buf_size. - ImStrncpy(buf, apply_new_text, ImMin(apply_new_text_length + 1, buf_size)); + apply_new_text = g.InputTextDeactivatedState.TextA.Data; + apply_new_text_length = g.InputTextDeactivatedState.TextA.Size - 1; value_changed = true; + //IMGUI_DEBUG_LOG("InputText(): apply Deactivated data for 0x%08X: \"%.*s\".\n", id, apply_new_text_length, apply_new_text); } + g.InputTextDeactivatedState.ID = 0; + } - // Clear temporary user storage - state->UserFlags = 0; - state->UserCallback = NULL; - state->UserCallbackData = NULL; + // Copy result to user buffer. This can currently only happen when (g.ActiveId == id) + if (apply_new_text != NULL) + { + //// We cannot test for 'backup_current_text_length != apply_new_text_length' here because we have no guarantee that the size + //// of our owned buffer matches the size of the string object held by the user, and by design we allow InputText() to be used + //// without any storage on user's side. + IM_ASSERT(apply_new_text_length >= 0); + if (is_resizable) + { + ImGuiInputTextCallbackData callback_data; + callback_data.Ctx = &g; + callback_data.EventFlag = ImGuiInputTextFlags_CallbackResize; + callback_data.Flags = flags; + callback_data.Buf = buf; + callback_data.BufTextLen = apply_new_text_length; + callback_data.BufSize = ImMax(buf_size, apply_new_text_length + 1); + callback_data.UserData = callback_user_data; + callback(&callback_data); + buf = callback_data.Buf; + buf_size = callback_data.BufSize; + apply_new_text_length = ImMin(callback_data.BufTextLen, buf_size - 1); + IM_ASSERT(apply_new_text_length <= buf_size); + } + //IMGUI_DEBUG_PRINT("InputText(\"%s\"): apply_new_text length %d\n", label, apply_new_text_length); + + // If the underlying buffer resize was denied or not carried to the next frame, apply_new_text_length+1 may be >= buf_size. + ImStrncpy(buf, apply_new_text, ImMin(apply_new_text_length + 1, buf_size)); } // Release active ID at the end of the function (so e.g. pressing Return still does a final application of the value) - if (clear_active_id && g.ActiveId == id) + // Otherwise request text input ahead for next frame. + if (g.ActiveId == id && clear_active_id) ClearActiveID(); + else if (g.ActiveId == id) + g.WantTextInputNextFrame = 1; // Render frame if (!is_multiline) { - RenderNavHighlight(frame_bb, id); + RenderNavCursor(frame_bb, id); RenderFrame(frame_bb.Min, frame_bb.Max, GetColorU32(ImGuiCol_FrameBg), true, style.FrameRounding); } - const ImVec4 clip_rect(frame_bb.Min.x, frame_bb.Min.y, frame_bb.Min.x + size.x, frame_bb.Min.y + size.y); // Not using frame_bb.Max because we have adjusted size + const ImVec4 clip_rect(frame_bb.Min.x, frame_bb.Min.y, frame_bb.Min.x + inner_size.x, frame_bb.Min.y + inner_size.y); // Not using frame_bb.Max because we have adjusted size ImVec2 draw_pos = is_multiline ? draw_window->DC.CursorPos : frame_bb.Min + style.FramePadding; ImVec2 text_size(0.0f, 0.0f); @@ -3925,10 +5186,22 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_ const int buf_display_max_length = 2 * 1024 * 1024; const char* buf_display = buf_display_from_state ? state->TextA.Data : buf; //-V595 const char* buf_display_end = NULL; // We have specialized paths below for setting the length + + // Display hint when contents is empty + // At this point we need to handle the possibility that a callback could have modified the underlying buffer (#8368) + const bool new_is_displaying_hint = (hint != NULL && (buf_display_from_state ? state->TextA.Data : buf)[0] == 0); + if (new_is_displaying_hint != is_displaying_hint) + { + if (is_password && !is_displaying_hint) + PopFont(); + is_displaying_hint = new_is_displaying_hint; + if (is_password && !is_displaying_hint) + PushPasswordFont(); + } if (is_displaying_hint) { buf_display = hint; - buf_display_end = hint + strlen(hint); + buf_display_end = hint + ImStrlen(hint); } // Render text. We currently only render selection when the widget is active or while scrolling. @@ -3937,7 +5210,7 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_ { IM_ASSERT(state != NULL); if (!is_displaying_hint) - buf_display_end = buf_display + state->CurLenA; + buf_display_end = buf_display + state->TextLen; // Render text (with cursor and selection) // This is going to be messy. We need to: @@ -3946,57 +5219,45 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_ // - Measure text height (for scrollbar) // We are attempting to do most of that in **one main pass** to minimize the computation cost (non-negligible for large amount of text) + 2nd pass for selection rendering (we could merge them by an extra refactoring effort) // FIXME: This should occur on buf_display but we'd need to maintain cursor/select_start/select_end for UTF-8. - const ImWchar* text_begin = state->TextW.Data; + const char* text_begin = buf_display; + const char* text_end = text_begin + state->TextLen; ImVec2 cursor_offset, select_start_offset; { - // Find lines numbers straddling 'cursor' (slot 0) and 'select_start' (slot 1) positions. - const ImWchar* searches_input_ptr[2] = { NULL, NULL }; - int searches_result_line_no[2] = { -1000, -1000 }; - int searches_remaining = 0; - if (render_cursor) - { - searches_input_ptr[0] = text_begin + state->Stb.cursor; - searches_result_line_no[0] = -1; - searches_remaining++; - } - if (render_selection) - { - searches_input_ptr[1] = text_begin + ImMin(state->Stb.select_start, state->Stb.select_end); - searches_result_line_no[1] = -1; - searches_remaining++; - } + // Find lines numbers straddling cursor and selection min position + int cursor_line_no = render_cursor ? -1 : -1000; + int selmin_line_no = render_selection ? -1 : -1000; + const char* cursor_ptr = render_cursor ? text_begin + state->Stb->cursor : NULL; + const char* selmin_ptr = render_selection ? text_begin + ImMin(state->Stb->select_start, state->Stb->select_end) : NULL; - // Iterate all lines to find our line numbers - // In multi-line mode, we never exit the loop until all lines are counted, so add one extra to the searches_remaining counter. - searches_remaining += is_multiline ? 1 : 0; - int line_count = 0; - //for (const ImWchar* s = text_begin; (s = (const ImWchar*)wcschr((const wchar_t*)s, (wchar_t)'\n')) != NULL; s++) // FIXME-OPT: Could use this when wchar_t are 16-bits - for (const ImWchar* s = text_begin; *s != 0; s++) - if (*s == '\n') + // Count lines and find line number for cursor and selection ends + int line_count = 1; + if (is_multiline) + { + for (const char* s = text_begin; (s = (const char*)ImMemchr(s, '\n', (size_t)(text_end - s))) != NULL; s++) { + if (cursor_line_no == -1 && s >= cursor_ptr) { cursor_line_no = line_count; } + if (selmin_line_no == -1 && s >= selmin_ptr) { selmin_line_no = line_count; } line_count++; - if (searches_result_line_no[0] == -1 && s >= searches_input_ptr[0]) { searches_result_line_no[0] = line_count; if (--searches_remaining <= 0) break; } - if (searches_result_line_no[1] == -1 && s >= searches_input_ptr[1]) { searches_result_line_no[1] = line_count; if (--searches_remaining <= 0) break; } } - line_count++; - if (searches_result_line_no[0] == -1) - searches_result_line_no[0] = line_count; - if (searches_result_line_no[1] == -1) - searches_result_line_no[1] = line_count; + } + if (cursor_line_no == -1) + cursor_line_no = line_count; + if (selmin_line_no == -1) + selmin_line_no = line_count; // Calculate 2d position by finding the beginning of the line and measuring distance - cursor_offset.x = InputTextCalcTextSizeW(ImStrbolW(searches_input_ptr[0], text_begin), searches_input_ptr[0]).x; - cursor_offset.y = searches_result_line_no[0] * g.FontSize; - if (searches_result_line_no[1] >= 0) + cursor_offset.x = InputTextCalcTextSize(&g, ImStrbol(cursor_ptr, text_begin), cursor_ptr).x; + cursor_offset.y = cursor_line_no * g.FontSize; + if (selmin_line_no >= 0) { - select_start_offset.x = InputTextCalcTextSizeW(ImStrbolW(searches_input_ptr[1], text_begin), searches_input_ptr[1]).x; - select_start_offset.y = searches_result_line_no[1] * g.FontSize; + select_start_offset.x = InputTextCalcTextSize(&g, ImStrbol(selmin_ptr, text_begin), selmin_ptr).x; + select_start_offset.y = selmin_line_no * g.FontSize; } // Store text height (note that we haven't calculated text width at all, see GitHub issues #383, #1224) if (is_multiline) - text_size = ImVec2(size.x, line_count * g.FontSize); + text_size = ImVec2(inner_size.x, line_count * g.FontSize); } // Scroll @@ -4005,25 +5266,28 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_ // Horizontal scroll in chunks of quarter width if (!(flags & ImGuiInputTextFlags_NoHorizontalScroll)) { - const float scroll_increment_x = size.x * 0.25f; - if (cursor_offset.x < state->ScrollX) - state->ScrollX = (float)(int)ImMax(0.0f, cursor_offset.x - scroll_increment_x); - else if (cursor_offset.x - size.x >= state->ScrollX) - state->ScrollX = (float)(int)(cursor_offset.x - size.x + scroll_increment_x); + const float scroll_increment_x = inner_size.x * 0.25f; + const float visible_width = inner_size.x - style.FramePadding.x; + if (cursor_offset.x < state->Scroll.x) + state->Scroll.x = IM_TRUNC(ImMax(0.0f, cursor_offset.x - scroll_increment_x)); + else if (cursor_offset.x - visible_width >= state->Scroll.x) + state->Scroll.x = IM_TRUNC(cursor_offset.x - visible_width + scroll_increment_x); } else { - state->ScrollX = 0.0f; + state->Scroll.y = 0.0f; } // Vertical scroll if (is_multiline) { - float scroll_y = draw_window->Scroll.y; + // Test if cursor is vertically visible if (cursor_offset.y - g.FontSize < scroll_y) scroll_y = ImMax(0.0f, cursor_offset.y - g.FontSize); - else if (cursor_offset.y - size.y >= scroll_y) - scroll_y = cursor_offset.y - size.y; + else if (cursor_offset.y - (inner_size.y - style.FramePadding.y * 2.0f) >= scroll_y) + scroll_y = cursor_offset.y - inner_size.y + style.FramePadding.y * 2.0f; + const float scroll_max_y = ImMax((text_size.y + style.FramePadding.y * 2.0f) - inner_size.y, 0.0f); + scroll_y = ImClamp(scroll_y, 0.0f, scroll_max_y); draw_pos.y += (draw_window->Scroll.y - scroll_y); // Manipulate cursor pos immediately avoid a frame of lag draw_window->Scroll.y = scroll_y; } @@ -4032,43 +5296,41 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_ } // Draw selection - const ImVec2 draw_scroll = ImVec2(state->ScrollX, 0.0f); + const ImVec2 draw_scroll = ImVec2(state->Scroll.x, 0.0f); if (render_selection) { - const ImWchar* text_selected_begin = text_begin + ImMin(state->Stb.select_start, state->Stb.select_end); - const ImWchar* text_selected_end = text_begin + ImMax(state->Stb.select_start, state->Stb.select_end); + const char* text_selected_begin = text_begin + ImMin(state->Stb->select_start, state->Stb->select_end); + const char* text_selected_end = text_begin + ImMax(state->Stb->select_start, state->Stb->select_end); ImU32 bg_color = GetColorU32(ImGuiCol_TextSelectedBg, render_cursor ? 1.0f : 0.6f); // FIXME: current code flow mandate that render_cursor is always true here, we are leaving the transparent one for tests. float bg_offy_up = is_multiline ? 0.0f : -1.0f; // FIXME: those offsets should be part of the style? they don't play so well with multi-line selection. float bg_offy_dn = is_multiline ? 0.0f : 2.0f; ImVec2 rect_pos = draw_pos + select_start_offset - draw_scroll; - for (const ImWchar* p = text_selected_begin; p < text_selected_end; ) + for (const char* p = text_selected_begin; p < text_selected_end; ) { if (rect_pos.y > clip_rect.w + g.FontSize) break; if (rect_pos.y < clip_rect.y) { - //p = (const ImWchar*)wmemchr((const wchar_t*)p, '\n', text_selected_end - p); // FIXME-OPT: Could use this when wchar_t are 16-bits - //p = p ? p + 1 : text_selected_end; - while (p < text_selected_end) - if (*p++ == '\n') - break; + p = (const char*)ImMemchr((void*)p, '\n', text_selected_end - p); + p = p ? p + 1 : text_selected_end; } else { - ImVec2 rect_size = InputTextCalcTextSizeW(p, text_selected_end, &p, NULL, true); - if (rect_size.x <= 0.0f) rect_size.x = (float)(int)(g.Font->GetCharAdvance((ImWchar)' ') * 0.50f); // So we can see selected empty lines - ImRect rect(rect_pos + ImVec2(0.0f, bg_offy_up - g.FontSize), rect_pos +ImVec2(rect_size.x, bg_offy_dn)); + ImVec2 rect_size = InputTextCalcTextSize(&g, p, text_selected_end, &p, NULL, true); + if (rect_size.x <= 0.0f) rect_size.x = IM_TRUNC(g.Font->GetCharAdvance((ImWchar)' ') * 0.50f); // So we can see selected empty lines + ImRect rect(rect_pos + ImVec2(0.0f, bg_offy_up - g.FontSize), rect_pos + ImVec2(rect_size.x, bg_offy_dn)); rect.ClipWith(clip_rect); if (rect.Overlaps(clip_rect)) draw_window->DrawList->AddRectFilled(rect.Min, rect.Max, bg_color); + rect_pos.x = draw_pos.x - draw_scroll.x; } - rect_pos.x = draw_pos.x - draw_scroll.x; rect_pos.y += g.FontSize; } } // We test for 'buf_display_max_length' as a way to avoid some pathological cases (e.g. single-line 1 MB string) which would make ImDrawList crash. + // FIXME-OPT: Multiline could submit a smaller amount of contents to AddText() since we already iterated through it. if (is_multiline || (buf_display_end - buf_display) < buf_display_max_length) { ImU32 col = GetColorU32(is_displaying_hint ? ImGuiCol_TextDisabled : ImGuiCol_Text); @@ -4080,60 +5342,124 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_ { state->CursorAnim += io.DeltaTime; bool cursor_is_visible = (!g.IO.ConfigInputTextCursorBlink) || (state->CursorAnim <= 0.0f) || ImFmod(state->CursorAnim, 1.20f) <= 0.80f; - ImVec2 cursor_screen_pos = draw_pos + cursor_offset - draw_scroll; + ImVec2 cursor_screen_pos = ImTrunc(draw_pos + cursor_offset - draw_scroll); ImRect cursor_screen_rect(cursor_screen_pos.x, cursor_screen_pos.y - g.FontSize + 0.5f, cursor_screen_pos.x + 1.0f, cursor_screen_pos.y - 1.5f); if (cursor_is_visible && cursor_screen_rect.Overlaps(clip_rect)) draw_window->DrawList->AddLine(cursor_screen_rect.Min, cursor_screen_rect.GetBL(), GetColorU32(ImGuiCol_Text)); // Notify OS of text input position for advanced IME (-1 x offset so that Windows IME can cover our cursor. Bit of an extra nicety.) if (!is_readonly) - g.PlatformImePos = ImVec2(cursor_screen_pos.x - 1.0f, cursor_screen_pos.y - g.FontSize); + { + g.PlatformImeData.WantVisible = true; + g.PlatformImeData.InputPos = ImVec2(cursor_screen_pos.x - 1.0f, cursor_screen_pos.y - g.FontSize); + g.PlatformImeData.InputLineHeight = g.FontSize; + g.PlatformImeViewport = window->Viewport->ID; + } } } else { // Render text only (no selection, no cursor) if (is_multiline) - text_size = ImVec2(size.x, InputTextCalcTextLenAndLineCount(buf_display, &buf_display_end) * g.FontSize); // We don't need width + text_size = ImVec2(inner_size.x, InputTextCalcTextLenAndLineCount(buf_display, &buf_display_end) * g.FontSize); // We don't need width else if (!is_displaying_hint && g.ActiveId == id) - buf_display_end = buf_display + state->CurLenA; + buf_display_end = buf_display + state->TextLen; else if (!is_displaying_hint) - buf_display_end = buf_display + strlen(buf_display); + buf_display_end = buf_display + ImStrlen(buf_display); if (is_multiline || (buf_display_end - buf_display) < buf_display_max_length) { - ImU32 col = GetColorU32(is_displaying_hint ? ImGuiCol_TextDisabled : ImGuiCol_Text); - draw_window->DrawList->AddText(g.Font, g.FontSize, draw_pos, col, buf_display, buf_display_end, 0.0f, is_multiline ? NULL : &clip_rect); - } - } + // Find render position for right alignment + if (flags & ImGuiInputTextFlags_ElideLeft) + draw_pos.x = ImMin(draw_pos.x, frame_bb.Max.x - CalcTextSize(buf_display, NULL).x - style.FramePadding.x); - if (is_multiline) - { - Dummy(text_size + ImVec2(0.0f, g.FontSize)); // Always add room to scroll an extra line - EndChildFrame(); - EndGroup(); + const ImVec2 draw_scroll = /*state ? ImVec2(state->Scroll.x, 0.0f) :*/ ImVec2(0.0f, 0.0f); // Preserve scroll when inactive? + ImU32 col = GetColorU32(is_displaying_hint ? ImGuiCol_TextDisabled : ImGuiCol_Text); + draw_window->DrawList->AddText(g.Font, g.FontSize, draw_pos - draw_scroll, col, buf_display, buf_display_end, 0.0f, is_multiline ? NULL : &clip_rect); + } } if (is_password && !is_displaying_hint) PopFont(); + if (is_multiline) + { + // For focus requests to work on our multiline we need to ensure our child ItemAdd() call specifies the ImGuiItemFlags_Inputable (see #4761, #7870)... + Dummy(ImVec2(text_size.x, text_size.y + style.FramePadding.y)); + g.NextItemData.ItemFlags |= (ImGuiItemFlags)ImGuiItemFlags_Inputable | ImGuiItemFlags_NoTabStop; + EndChild(); + item_data_backup.StatusFlags |= (g.LastItemData.StatusFlags & ImGuiItemStatusFlags_HoveredWindow); + + // ...and then we need to undo the group overriding last item data, which gets a bit messy as EndGroup() tries to forward scrollbar being active... + // FIXME: This quite messy/tricky, should attempt to get rid of the child window. + EndGroup(); + if (g.LastItemData.ID == 0 || g.LastItemData.ID != GetWindowScrollbarID(draw_window, ImGuiAxis_Y)) + { + g.LastItemData.ID = id; + g.LastItemData.ItemFlags = item_data_backup.ItemFlags; + g.LastItemData.StatusFlags = item_data_backup.StatusFlags; + } + } + if (state) + state->TextSrc = NULL; + // Log as text - if (g.LogEnabled && !(is_password && !is_displaying_hint)) + if (g.LogEnabled && (!is_password || is_displaying_hint)) + { + LogSetNextTextDecoration("{", "}"); LogRenderedText(&draw_pos, buf_display, buf_display_end); + } if (label_size.x > 0) RenderText(ImVec2(frame_bb.Max.x + style.ItemInnerSpacing.x, frame_bb.Min.y + style.FramePadding.y), label); - if (value_changed && !(flags & ImGuiInputTextFlags_NoMarkEdited)) + if (value_changed) MarkItemEdited(id); - IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.ItemFlags); + IMGUI_TEST_ENGINE_ITEM_INFO(id, label, g.LastItemData.StatusFlags | ImGuiItemStatusFlags_Inputable); if ((flags & ImGuiInputTextFlags_EnterReturnsTrue) != 0) - return enter_pressed; + return validated; else return value_changed; } +void ImGui::DebugNodeInputTextState(ImGuiInputTextState* state) +{ +#ifndef IMGUI_DISABLE_DEBUG_TOOLS + ImGuiContext& g = *GImGui; + ImStb::STB_TexteditState* stb_state = state->Stb; + ImStb::StbUndoState* undo_state = &stb_state->undostate; + Text("ID: 0x%08X, ActiveID: 0x%08X", state->ID, g.ActiveId); + DebugLocateItemOnHover(state->ID); + Text("CurLenA: %d, Cursor: %d, Selection: %d..%d", state->TextLen, stb_state->cursor, stb_state->select_start, stb_state->select_end); + Text("BufCapacityA: %d", state->BufCapacity); + Text("(Internal Buffer: TextA Size: %d, Capacity: %d)", state->TextA.Size, state->TextA.Capacity); + Text("has_preferred_x: %d (%.2f)", stb_state->has_preferred_x, stb_state->preferred_x); + Text("undo_point: %d, redo_point: %d, undo_char_point: %d, redo_char_point: %d", undo_state->undo_point, undo_state->redo_point, undo_state->undo_char_point, undo_state->redo_char_point); + if (BeginChild("undopoints", ImVec2(0.0f, GetTextLineHeight() * 10), ImGuiChildFlags_Borders | ImGuiChildFlags_ResizeY)) // Visualize undo state + { + PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0, 0)); + for (int n = 0; n < IMSTB_TEXTEDIT_UNDOSTATECOUNT; n++) + { + ImStb::StbUndoRecord* undo_rec = &undo_state->undo_rec[n]; + const char undo_rec_type = (n < undo_state->undo_point) ? 'u' : (n >= undo_state->redo_point) ? 'r' : ' '; + if (undo_rec_type == ' ') + BeginDisabled(); + const int buf_preview_len = (undo_rec_type != ' ' && undo_rec->char_storage != -1) ? undo_rec->insert_length : 0; + const char* buf_preview_str = undo_state->undo_char + undo_rec->char_storage; + Text("%c [%02d] where %03d, insert %03d, delete %03d, char_storage %03d \"%.*s\"", + undo_rec_type, n, undo_rec->where, undo_rec->insert_length, undo_rec->delete_length, undo_rec->char_storage, buf_preview_len, buf_preview_str); + if (undo_rec_type == ' ') + EndDisabled(); + } + PopStyleVar(); + } + EndChild(); +#else + IM_UNUSED(state); +#endif +} + //------------------------------------------------------------------------- // [SECTION] Widgets: ColorEdit, ColorPicker, ColorButton, etc. //------------------------------------------------------------------------- @@ -4154,9 +5480,37 @@ bool ImGui::ColorEdit3(const char* label, float col[3], ImGuiColorEditFlags flag return ColorEdit4(label, col, flags | ImGuiColorEditFlags_NoAlpha); } +static void ColorEditRestoreH(const float* col, float* H) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(g.ColorEditCurrentID != 0); + if (g.ColorEditSavedID != g.ColorEditCurrentID || g.ColorEditSavedColor != ImGui::ColorConvertFloat4ToU32(ImVec4(col[0], col[1], col[2], 0))) + return; + *H = g.ColorEditSavedHue; +} + +// ColorEdit supports RGB and HSV inputs. In case of RGB input resulting color may have undefined hue and/or saturation. +// Since widget displays both RGB and HSV values we must preserve hue and saturation to prevent these values resetting. +static void ColorEditRestoreHS(const float* col, float* H, float* S, float* V) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(g.ColorEditCurrentID != 0); + if (g.ColorEditSavedID != g.ColorEditCurrentID || g.ColorEditSavedColor != ImGui::ColorConvertFloat4ToU32(ImVec4(col[0], col[1], col[2], 0))) + return; + + // When S == 0, H is undefined. + // When H == 1 it wraps around to 0. + if (*S == 0.0f || (*H == 0.0f && g.ColorEditSavedHue == 1)) + *H = g.ColorEditSavedHue; + + // When V == 0, S is undefined. + if (*V == 0.0f) + *S = g.ColorEditSavedSat; +} + // Edit colors components (each component in 0.0f..1.0f range). // See enum ImGuiColorEditFlags_ for available options. e.g. Only access 3 floats if ImGuiColorEditFlags_NoAlpha flag is set. -// With typical options: Left-click on colored square to open color picker. Right-click to open option menu. CTRL-Click over input fields to edit them and TAB to go to next item. +// With typical options: Left-click on color square to open color picker. Right-click to open option menu. CTRL+Click over input fields to edit them and TAB to go to next item. bool ImGui::ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flags) { ImGuiWindow* window = GetCurrentWindow(); @@ -4166,40 +5520,44 @@ bool ImGui::ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flag ImGuiContext& g = *GImGui; const ImGuiStyle& style = g.Style; const float square_sz = GetFrameHeight(); - const float w_full = CalcItemWidth(); - const float w_button = (flags & ImGuiColorEditFlags_NoSmallPreview) ? 0.0f : (square_sz + style.ItemInnerSpacing.x); - const float w_inputs = w_full - w_button; const char* label_display_end = FindRenderedTextEnd(label); + float w_full = CalcItemWidth(); g.NextItemData.ClearFlags(); BeginGroup(); PushID(label); + const bool set_current_color_edit_id = (g.ColorEditCurrentID == 0); + if (set_current_color_edit_id) + g.ColorEditCurrentID = window->IDStack.back(); // If we're not showing any slider there's no point in doing any HSV conversions const ImGuiColorEditFlags flags_untouched = flags; if (flags & ImGuiColorEditFlags_NoInputs) - flags = (flags & (~ImGuiColorEditFlags__DisplayMask)) | ImGuiColorEditFlags_DisplayRGB | ImGuiColorEditFlags_NoOptions; + flags = (flags & (~ImGuiColorEditFlags_DisplayMask_)) | ImGuiColorEditFlags_DisplayRGB | ImGuiColorEditFlags_NoOptions; // Context menu: display and modify options (before defaults are applied) if (!(flags & ImGuiColorEditFlags_NoOptions)) ColorEditOptionsPopup(col, flags); // Read stored options - if (!(flags & ImGuiColorEditFlags__DisplayMask)) - flags |= (g.ColorEditOptions & ImGuiColorEditFlags__DisplayMask); - if (!(flags & ImGuiColorEditFlags__DataTypeMask)) - flags |= (g.ColorEditOptions & ImGuiColorEditFlags__DataTypeMask); - if (!(flags & ImGuiColorEditFlags__PickerMask)) - flags |= (g.ColorEditOptions & ImGuiColorEditFlags__PickerMask); - if (!(flags & ImGuiColorEditFlags__InputMask)) - flags |= (g.ColorEditOptions & ImGuiColorEditFlags__InputMask); - flags |= (g.ColorEditOptions & ~(ImGuiColorEditFlags__DisplayMask | ImGuiColorEditFlags__DataTypeMask | ImGuiColorEditFlags__PickerMask | ImGuiColorEditFlags__InputMask)); - IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags__DisplayMask)); // Check that only 1 is selected - IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags__InputMask)); // Check that only 1 is selected + if (!(flags & ImGuiColorEditFlags_DisplayMask_)) + flags |= (g.ColorEditOptions & ImGuiColorEditFlags_DisplayMask_); + if (!(flags & ImGuiColorEditFlags_DataTypeMask_)) + flags |= (g.ColorEditOptions & ImGuiColorEditFlags_DataTypeMask_); + if (!(flags & ImGuiColorEditFlags_PickerMask_)) + flags |= (g.ColorEditOptions & ImGuiColorEditFlags_PickerMask_); + if (!(flags & ImGuiColorEditFlags_InputMask_)) + flags |= (g.ColorEditOptions & ImGuiColorEditFlags_InputMask_); + flags |= (g.ColorEditOptions & ~(ImGuiColorEditFlags_DisplayMask_ | ImGuiColorEditFlags_DataTypeMask_ | ImGuiColorEditFlags_PickerMask_ | ImGuiColorEditFlags_InputMask_)); + IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags_DisplayMask_)); // Check that only 1 is selected + IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags_InputMask_)); // Check that only 1 is selected const bool alpha = (flags & ImGuiColorEditFlags_NoAlpha) == 0; const bool hdr = (flags & ImGuiColorEditFlags_HDR) != 0; const int components = alpha ? 4 : 3; + const float w_button = (flags & ImGuiColorEditFlags_NoSmallPreview) ? 0.0f : (square_sz + style.ItemInnerSpacing.x); + const float w_inputs = ImMax(w_full - w_button, 1.0f); + w_full = w_inputs + w_button; // Convert to the formats we need float f[4] = { col[0], col[1], col[2], alpha ? col[3] : 1.0f }; @@ -4207,10 +5565,9 @@ bool ImGui::ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flag ColorConvertHSVtoRGB(f[0], f[1], f[2], f[0], f[1], f[2]); else if ((flags & ImGuiColorEditFlags_InputRGB) && (flags & ImGuiColorEditFlags_DisplayHSV)) { - // Hue is lost when converting from greyscale rgb (saturation=0). Restore it. + // Hue is lost when converting from grayscale rgb (saturation=0). Restore it. ColorConvertRGBtoHSV(f[0], f[1], f[2], f[0], f[1], f[2]); - if (f[1] == 0 && memcmp(g.ColorEditLastColor, col, sizeof(float) * 3) == 0) - f[0] = g.ColorEditLastHue; + ColorEditRestoreHS(col, &f[0], &f[1], &f[2]); } int i[4] = { IM_F32_TO_INT8_UNBOUND(f[0]), IM_F32_TO_INT8_UNBOUND(f[1]), IM_F32_TO_INT8_UNBOUND(f[2]), IM_F32_TO_INT8_UNBOUND(f[3]) }; @@ -4224,10 +5581,9 @@ bool ImGui::ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flag if ((flags & (ImGuiColorEditFlags_DisplayRGB | ImGuiColorEditFlags_DisplayHSV)) != 0 && (flags & ImGuiColorEditFlags_NoInputs) == 0) { // RGB/HSV 0..255 Sliders - const float w_item_one = ImMax(1.0f, (float)(int)((w_inputs - (style.ItemInnerSpacing.x) * (components-1)) / (float)components)); - const float w_item_last = ImMax(1.0f, (float)(int)(w_inputs - (w_item_one + style.ItemInnerSpacing.x) * (components-1))); + const float w_items = w_inputs - style.ItemInnerSpacing.x * (components - 1); - const bool hide_prefix = (w_item_one <= CalcTextSize((flags & ImGuiColorEditFlags_Float) ? "M:0.000" : "M:000").x); + const bool hide_prefix = (IM_TRUNC(w_items / components) <= CalcTextSize((flags & ImGuiColorEditFlags_Float) ? "M:0.000" : "M:000").x); static const char* ids[4] = { "##X", "##Y", "##Z", "##W" }; static const char* fmt_table_int[3][4] = { @@ -4243,25 +5599,27 @@ bool ImGui::ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flag }; const int fmt_idx = hide_prefix ? 0 : (flags & ImGuiColorEditFlags_DisplayHSV) ? 2 : 1; + float prev_split = 0.0f; for (int n = 0; n < components; n++) { if (n > 0) SameLine(0, style.ItemInnerSpacing.x); - SetNextItemWidth((n + 1 < components) ? w_item_one : w_item_last); + float next_split = IM_TRUNC(w_items * (n + 1) / components); + SetNextItemWidth(ImMax(next_split - prev_split, 1.0f)); + prev_split = next_split; - // Disable Hue edit when Saturation is zero - const bool disable_hue_edit = (n == 0 && (flags & ImGuiColorEditFlags_DisplayHSV) && i[1] == 0); + // FIXME: When ImGuiColorEditFlags_HDR flag is passed HS values snap in weird ways when SV values go below 0. if (flags & ImGuiColorEditFlags_Float) { - value_changed |= DragFloat(ids[n], &f[n], 1.0f/255.0f, disable_hue_edit ? +FLT_MAX : 0.0f, disable_hue_edit ? -FLT_MAX : hdr ? 0.0f : 1.0f, fmt_table_float[fmt_idx][n]); + value_changed |= DragFloat(ids[n], &f[n], 1.0f / 255.0f, 0.0f, hdr ? 0.0f : 1.0f, fmt_table_float[fmt_idx][n]); value_changed_as_float |= value_changed; } else { - value_changed |= DragInt(ids[n], &i[n], 1.0f, disable_hue_edit ? INT_MAX : 0, disable_hue_edit ? INT_MIN : hdr ? 0 : 255, fmt_table_int[fmt_idx][n]); + value_changed |= DragInt(ids[n], &i[n], 1.0f, 0, hdr ? 0 : 255, fmt_table_int[fmt_idx][n]); } if (!(flags & ImGuiColorEditFlags_NoOptions)) - OpenPopupOnItemClick("context"); + OpenPopupOnItemClick("context", ImGuiPopupFlags_MouseButtonRight); } } else if ((flags & ImGuiColorEditFlags_DisplayHex) != 0 && (flags & ImGuiColorEditFlags_NoInputs) == 0) @@ -4269,24 +5627,27 @@ bool ImGui::ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flag // RGB Hexadecimal Input char buf[64]; if (alpha) - ImFormatString(buf, IM_ARRAYSIZE(buf), "#%02X%02X%02X%02X", ImClamp(i[0],0,255), ImClamp(i[1],0,255), ImClamp(i[2],0,255), ImClamp(i[3],0,255)); + ImFormatString(buf, IM_ARRAYSIZE(buf), "#%02X%02X%02X%02X", ImClamp(i[0], 0, 255), ImClamp(i[1], 0, 255), ImClamp(i[2], 0, 255), ImClamp(i[3], 0, 255)); else - ImFormatString(buf, IM_ARRAYSIZE(buf), "#%02X%02X%02X", ImClamp(i[0],0,255), ImClamp(i[1],0,255), ImClamp(i[2],0,255)); + ImFormatString(buf, IM_ARRAYSIZE(buf), "#%02X%02X%02X", ImClamp(i[0], 0, 255), ImClamp(i[1], 0, 255), ImClamp(i[2], 0, 255)); SetNextItemWidth(w_inputs); - if (InputText("##Text", buf, IM_ARRAYSIZE(buf), ImGuiInputTextFlags_CharsHexadecimal | ImGuiInputTextFlags_CharsUppercase)) + if (InputText("##Text", buf, IM_ARRAYSIZE(buf), ImGuiInputTextFlags_CharsUppercase)) { value_changed = true; char* p = buf; while (*p == '#' || ImCharIsBlankA(*p)) p++; - i[0] = i[1] = i[2] = i[3] = 0; + i[0] = i[1] = i[2] = 0; + i[3] = 0xFF; // alpha default to 255 is not parsed by scanf (e.g. inputting #FFFFFF omitting alpha) + int r; if (alpha) - sscanf(p, "%02X%02X%02X%02X", (unsigned int*)&i[0], (unsigned int*)&i[1], (unsigned int*)&i[2], (unsigned int*)&i[3]); // Treat at unsigned (%X is unsigned) + r = sscanf(p, "%02X%02X%02X%02X", (unsigned int*)&i[0], (unsigned int*)&i[1], (unsigned int*)&i[2], (unsigned int*)&i[3]); // Treat at unsigned (%X is unsigned) else - sscanf(p, "%02X%02X%02X", (unsigned int*)&i[0], (unsigned int*)&i[1], (unsigned int*)&i[2]); + r = sscanf(p, "%02X%02X%02X", (unsigned int*)&i[0], (unsigned int*)&i[1], (unsigned int*)&i[2]); + IM_UNUSED(r); // Fixes C6031: Return value ignored: 'sscanf'. } if (!(flags & ImGuiColorEditFlags_NoOptions)) - OpenPopupOnItemClick("context"); + OpenPopupOnItemClick("context", ImGuiPopupFlags_MouseButtonRight); } ImGuiWindow* picker_active_window = NULL; @@ -4303,31 +5664,37 @@ bool ImGui::ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flag // Store current color and open a picker g.ColorPickerRef = col_v4; OpenPopup("picker"); - SetNextWindowPos(window->DC.LastItemRect.GetBL() + ImVec2(-1,style.ItemSpacing.y)); + SetNextWindowPos(g.LastItemData.Rect.GetBL() + ImVec2(0.0f, style.ItemSpacing.y)); } } if (!(flags & ImGuiColorEditFlags_NoOptions)) - OpenPopupOnItemClick("context"); + OpenPopupOnItemClick("context", ImGuiPopupFlags_MouseButtonRight); if (BeginPopup("picker")) { - picker_active_window = g.CurrentWindow; - if (label != label_display_end) + if (g.CurrentWindow->BeginCount == 1) { - TextEx(label, label_display_end); - Spacing(); + picker_active_window = g.CurrentWindow; + if (label != label_display_end) + { + TextEx(label, label_display_end); + Spacing(); + } + ImGuiColorEditFlags picker_flags_to_forward = ImGuiColorEditFlags_DataTypeMask_ | ImGuiColorEditFlags_PickerMask_ | ImGuiColorEditFlags_InputMask_ | ImGuiColorEditFlags_HDR | ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_AlphaBar; + ImGuiColorEditFlags picker_flags = (flags_untouched & picker_flags_to_forward) | ImGuiColorEditFlags_DisplayMask_ | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_AlphaPreviewHalf; + SetNextItemWidth(square_sz * 12.0f); // Use 256 + bar sizes? + value_changed |= ColorPicker4("##picker", col, picker_flags, &g.ColorPickerRef.x); } - ImGuiColorEditFlags picker_flags_to_forward = ImGuiColorEditFlags__DataTypeMask | ImGuiColorEditFlags__PickerMask | ImGuiColorEditFlags__InputMask | ImGuiColorEditFlags_HDR | ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_AlphaBar; - ImGuiColorEditFlags picker_flags = (flags_untouched & picker_flags_to_forward) | ImGuiColorEditFlags__DisplayMask | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_AlphaPreviewHalf; - SetNextItemWidth(square_sz * 12.0f); // Use 256 + bar sizes? - value_changed |= ColorPicker4("##picker", col, picker_flags, &g.ColorPickerRef.x); EndPopup(); } } if (label != label_display_end && !(flags & ImGuiColorEditFlags_NoLabel)) { - window->DC.CursorPos = ImVec2(pos.x + w_full + style.ItemInnerSpacing.x, pos.y + style.FramePadding.y); + // Position not necessarily next to last submitted button (e.g. if style.ColorButtonPosition == ImGuiDir_Left), + // but we need to use SameLine() to setup baseline correctly. Might want to refactor SameLine() to simplify this. + SameLine(0.0f, style.ItemInnerSpacing.x); + window->DC.CursorPos.x = pos.x + ((flags & ImGuiColorEditFlags_NoInputs) ? w_button : w_full + style.ItemInnerSpacing.x); TextEx(label, label_display_end); } @@ -4339,9 +5706,11 @@ bool ImGui::ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flag f[n] = i[n] / 255.0f; if ((flags & ImGuiColorEditFlags_DisplayHSV) && (flags & ImGuiColorEditFlags_InputRGB)) { - g.ColorEditLastHue = f[0]; + g.ColorEditSavedHue = f[0]; + g.ColorEditSavedSat = f[1]; ColorConvertHSVtoRGB(f[0], f[1], f[2], f[0], f[1], f[2]); - memcpy(g.ColorEditLastColor, f, sizeof(float) * 3); + g.ColorEditSavedID = g.ColorEditCurrentID; + g.ColorEditSavedColor = ColorConvertFloat4ToU32(ImVec4(f[0], f[1], f[2], 0)); } if ((flags & ImGuiColorEditFlags_DisplayRGB) && (flags & ImGuiColorEditFlags_InputHSV)) ColorConvertRGBtoHSV(f[0], f[1], f[2], f[0], f[1], f[2]); @@ -4353,17 +5722,19 @@ bool ImGui::ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flag col[3] = f[3]; } + if (set_current_color_edit_id) + g.ColorEditCurrentID = 0; PopID(); EndGroup(); // Drag and Drop Target // NB: The flag test is merely an optional micro-optimization, BeginDragDropTarget() does the same test. - if ((window->DC.LastItemStatusFlags & ImGuiItemStatusFlags_HoveredRect) && !(flags & ImGuiColorEditFlags_NoDragDrop) && BeginDragDropTarget()) + if ((g.LastItemData.StatusFlags & ImGuiItemStatusFlags_HoveredRect) && !(g.LastItemData.ItemFlags & ImGuiItemFlags_ReadOnly) && !(flags & ImGuiColorEditFlags_NoDragDrop) && BeginDragDropTarget()) { bool accepted_drag_drop = false; if (const ImGuiPayload* payload = AcceptDragDropPayload(IMGUI_PAYLOAD_TYPE_COLOR_3F)) { - memcpy((float*)col, payload->Data, sizeof(float) * 3); // Preserve alpha if any //-V512 + memcpy((float*)col, payload->Data, sizeof(float) * 3); // Preserve alpha if any //-V512 //-V1086 value_changed = accepted_drag_drop = true; } if (const ImGuiPayload* payload = AcceptDragDropPayload(IMGUI_PAYLOAD_TYPE_COLOR_4F)) @@ -4380,10 +5751,10 @@ bool ImGui::ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flag // When picker is being actively used, use its active id so IsItemActive() will function on ColorEdit4(). if (picker_active_window && g.ActiveId != 0 && g.ActiveIdWindow == picker_active_window) - window->DC.LastItemId = g.ActiveId; + g.LastItemData.ID = g.ActiveId; - if (value_changed) - MarkItemEdited(window->DC.LastItemId); + if (value_changed && g.LastItemData.ID != 0) // In case of ID collision, the second EndGroup() won't catch g.ActiveId + MarkItemEdited(g.LastItemData.ID); return value_changed; } @@ -4397,52 +5768,6 @@ bool ImGui::ColorPicker3(const char* label, float col[3], ImGuiColorEditFlags fl return true; } -static inline ImU32 ImAlphaBlendColor(ImU32 col_a, ImU32 col_b) -{ - float t = ((col_b >> IM_COL32_A_SHIFT) & 0xFF) / 255.f; - int r = ImLerp((int)(col_a >> IM_COL32_R_SHIFT) & 0xFF, (int)(col_b >> IM_COL32_R_SHIFT) & 0xFF, t); - int g = ImLerp((int)(col_a >> IM_COL32_G_SHIFT) & 0xFF, (int)(col_b >> IM_COL32_G_SHIFT) & 0xFF, t); - int b = ImLerp((int)(col_a >> IM_COL32_B_SHIFT) & 0xFF, (int)(col_b >> IM_COL32_B_SHIFT) & 0xFF, t); - return IM_COL32(r, g, b, 0xFF); -} - -// Helper for ColorPicker4() -// NB: This is rather brittle and will show artifact when rounding this enabled if rounded corners overlap multiple cells. Caller currently responsible for avoiding that. -// I spent a non reasonable amount of time trying to getting this right for ColorButton with rounding+anti-aliasing+ImGuiColorEditFlags_HalfAlphaPreview flag + various grid sizes and offsets, and eventually gave up... probably more reasonable to disable rounding alltogether. -void ImGui::RenderColorRectWithAlphaCheckerboard(ImVec2 p_min, ImVec2 p_max, ImU32 col, float grid_step, ImVec2 grid_off, float rounding, int rounding_corners_flags) -{ - ImGuiWindow* window = GetCurrentWindow(); - if (((col & IM_COL32_A_MASK) >> IM_COL32_A_SHIFT) < 0xFF) - { - ImU32 col_bg1 = GetColorU32(ImAlphaBlendColor(IM_COL32(204,204,204,255), col)); - ImU32 col_bg2 = GetColorU32(ImAlphaBlendColor(IM_COL32(128,128,128,255), col)); - window->DrawList->AddRectFilled(p_min, p_max, col_bg1, rounding, rounding_corners_flags); - - int yi = 0; - for (float y = p_min.y + grid_off.y; y < p_max.y; y += grid_step, yi++) - { - float y1 = ImClamp(y, p_min.y, p_max.y), y2 = ImMin(y + grid_step, p_max.y); - if (y2 <= y1) - continue; - for (float x = p_min.x + grid_off.x + (yi & 1) * grid_step; x < p_max.x; x += grid_step * 2.0f) - { - float x1 = ImClamp(x, p_min.x, p_max.x), x2 = ImMin(x + grid_step, p_max.x); - if (x2 <= x1) - continue; - int rounding_corners_flags_cell = 0; - if (y1 <= p_min.y) { if (x1 <= p_min.x) rounding_corners_flags_cell |= ImDrawCornerFlags_TopLeft; if (x2 >= p_max.x) rounding_corners_flags_cell |= ImDrawCornerFlags_TopRight; } - if (y2 >= p_max.y) { if (x1 <= p_min.x) rounding_corners_flags_cell |= ImDrawCornerFlags_BotLeft; if (x2 >= p_max.x) rounding_corners_flags_cell |= ImDrawCornerFlags_BotRight; } - rounding_corners_flags_cell &= rounding_corners_flags; - window->DrawList->AddRectFilled(ImVec2(x1,y1), ImVec2(x2,y2), col_bg2, rounding_corners_flags_cell ? rounding : 0.0f, rounding_corners_flags_cell); - } - } - } - else - { - window->DrawList->AddRectFilled(p_min, p_max, col, rounding, rounding_corners_flags); - } -} - // Helper for ColorPicker4() static void RenderArrowsForVerticalBar(ImDrawList* draw_list, ImVec2 pos, ImVec2 half_sz, float bar_w, float alpha) { @@ -4469,9 +5794,13 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl ImGuiIO& io = g.IO; const float width = CalcItemWidth(); + const bool is_readonly = ((g.NextItemData.ItemFlags | g.CurrentItemFlags) & ImGuiItemFlags_ReadOnly) != 0; g.NextItemData.ClearFlags(); PushID(label); + const bool set_current_color_edit_id = (g.ColorEditCurrentID == 0); + if (set_current_color_edit_id) + g.ColorEditCurrentID = window->IDStack.back(); BeginGroup(); if (!(flags & ImGuiColorEditFlags_NoSidePreview)) @@ -4482,12 +5811,12 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl ColorPickerOptionsPopup(col, flags); // Read stored options - if (!(flags & ImGuiColorEditFlags__PickerMask)) - flags |= ((g.ColorEditOptions & ImGuiColorEditFlags__PickerMask) ? g.ColorEditOptions : ImGuiColorEditFlags__OptionsDefault) & ImGuiColorEditFlags__PickerMask; - if (!(flags & ImGuiColorEditFlags__InputMask)) - flags |= ((g.ColorEditOptions & ImGuiColorEditFlags__InputMask) ? g.ColorEditOptions : ImGuiColorEditFlags__OptionsDefault) & ImGuiColorEditFlags__InputMask; - IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags__PickerMask)); // Check that only 1 is selected - IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags__InputMask)); // Check that only 1 is selected + if (!(flags & ImGuiColorEditFlags_PickerMask_)) + flags |= ((g.ColorEditOptions & ImGuiColorEditFlags_PickerMask_) ? g.ColorEditOptions : ImGuiColorEditFlags_DefaultOptions_) & ImGuiColorEditFlags_PickerMask_; + if (!(flags & ImGuiColorEditFlags_InputMask_)) + flags |= ((g.ColorEditOptions & ImGuiColorEditFlags_InputMask_) ? g.ColorEditOptions : ImGuiColorEditFlags_DefaultOptions_) & ImGuiColorEditFlags_InputMask_; + IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags_PickerMask_)); // Check that only 1 is selected + IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags_InputMask_)); // Check that only 1 is selected if (!(flags & ImGuiColorEditFlags_NoOptions)) flags |= (g.ColorEditOptions & ImGuiColorEditFlags_AlphaBar); @@ -4500,7 +5829,7 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl float sv_picker_size = ImMax(bars_width * 1, width - (alpha_bar ? 2 : 1) * (bars_width + style.ItemInnerSpacing.x)); // Saturation/Value picking box float bar0_pos_x = picker_pos.x + sv_picker_size + style.ItemInnerSpacing.x; float bar1_pos_x = bar0_pos_x + bars_width + style.ItemInnerSpacing.x; - float bars_triangles_half_sz = (float)(int)(bars_width * 0.20f); + float bars_triangles_half_sz = IM_TRUNC(bars_width * 0.20f); float backup_initial_col[4]; memcpy(backup_initial_col, col, components * sizeof(float)); @@ -4508,7 +5837,7 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl float wheel_thickness = sv_picker_size * 0.08f; float wheel_r_outer = sv_picker_size * 0.50f; float wheel_r_inner = wheel_r_outer - wheel_thickness; - ImVec2 wheel_center(picker_pos.x + (sv_picker_size + bars_width)*0.5f, picker_pos.y + sv_picker_size*0.5f); + ImVec2 wheel_center(picker_pos.x + (sv_picker_size + bars_width)*0.5f, picker_pos.y + sv_picker_size * 0.5f); // Note: the triangle is displayed rotated with triangle_pa pointing to Hue, but most coordinates stays unrotated for logic. float triangle_r = wheel_r_inner - (int)(sv_picker_size * 0.027f); @@ -4520,10 +5849,9 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl float R = col[0], G = col[1], B = col[2]; if (flags & ImGuiColorEditFlags_InputRGB) { - // Hue is lost when converting from greyscale rgb (saturation=0). Restore it. + // Hue is lost when converting from grayscale rgb (saturation=0). Restore it. ColorConvertRGBtoHSV(R, G, B, H, S, V); - if (S == 0 && memcmp(g.ColorEditLastColor, col, sizeof(float) * 3) == 0) - H = g.ColorEditLastHue; + ColorEditRestoreHS(col, &H, &S, &V); } else if (flags & ImGuiColorEditFlags_InputHSV) { @@ -4537,15 +5865,15 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl { // Hue wheel + SV triangle logic InvisibleButton("hsv", ImVec2(sv_picker_size + style.ItemInnerSpacing.x + bars_width, sv_picker_size)); - if (IsItemActive()) + if (IsItemActive() && !is_readonly) { ImVec2 initial_off = g.IO.MouseClickedPos[0] - wheel_center; ImVec2 current_off = g.IO.MousePos - wheel_center; float initial_dist2 = ImLengthSqr(initial_off); - if (initial_dist2 >= (wheel_r_inner-1)*(wheel_r_inner-1) && initial_dist2 <= (wheel_r_outer+1)*(wheel_r_outer+1)) + if (initial_dist2 >= (wheel_r_inner - 1) * (wheel_r_inner - 1) && initial_dist2 <= (wheel_r_outer + 1) * (wheel_r_outer + 1)) { // Interactive with Hue wheel - H = ImAtan2(current_off.y, current_off.x) / IM_PI*0.5f; + H = ImAtan2(current_off.y, current_off.x) / IM_PI * 0.5f; if (H < 0.0f) H += 1.0f; value_changed = value_changed_h = true; @@ -4566,27 +5894,28 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl } } if (!(flags & ImGuiColorEditFlags_NoOptions)) - OpenPopupOnItemClick("context"); + OpenPopupOnItemClick("context", ImGuiPopupFlags_MouseButtonRight); } else if (flags & ImGuiColorEditFlags_PickerHueBar) { // SV rectangle logic InvisibleButton("sv", ImVec2(sv_picker_size, sv_picker_size)); - if (IsItemActive()) + if (IsItemActive() && !is_readonly) { - S = ImSaturate((io.MousePos.x - picker_pos.x) / (sv_picker_size-1)); - V = 1.0f - ImSaturate((io.MousePos.y - picker_pos.y) / (sv_picker_size-1)); + S = ImSaturate((io.MousePos.x - picker_pos.x) / (sv_picker_size - 1)); + V = 1.0f - ImSaturate((io.MousePos.y - picker_pos.y) / (sv_picker_size - 1)); + ColorEditRestoreH(col, &H); // Greatly reduces hue jitter and reset to 0 when hue == 255 and color is rapidly modified using SV square. value_changed = value_changed_sv = true; } if (!(flags & ImGuiColorEditFlags_NoOptions)) - OpenPopupOnItemClick("context"); + OpenPopupOnItemClick("context", ImGuiPopupFlags_MouseButtonRight); // Hue bar logic SetCursorScreenPos(ImVec2(bar0_pos_x, picker_pos.y)); InvisibleButton("hue", ImVec2(bars_width, sv_picker_size)); - if (IsItemActive()) + if (IsItemActive() && !is_readonly) { - H = ImSaturate((io.MousePos.y - picker_pos.y) / (sv_picker_size-1)); + H = ImSaturate((io.MousePos.y - picker_pos.y) / (sv_picker_size - 1)); value_changed = value_changed_h = true; } } @@ -4598,7 +5927,7 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl InvisibleButton("alpha", ImVec2(bars_width, sv_picker_size)); if (IsItemActive()) { - col[3] = 1.0f - ImSaturate((io.MousePos.y - picker_pos.y) / (sv_picker_size-1)); + col[3] = 1.0f - ImSaturate((io.MousePos.y - picker_pos.y) / (sv_picker_size - 1)); value_changed = true; } } @@ -4628,7 +5957,7 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl if ((flags & ImGuiColorEditFlags_NoLabel)) Text("Current"); - ImGuiColorEditFlags sub_flags_to_forward = ImGuiColorEditFlags__InputMask | ImGuiColorEditFlags_HDR | ImGuiColorEditFlags_AlphaPreview | ImGuiColorEditFlags_AlphaPreviewHalf | ImGuiColorEditFlags_NoTooltip; + ImGuiColorEditFlags sub_flags_to_forward = ImGuiColorEditFlags_InputMask_ | ImGuiColorEditFlags_HDR | ImGuiColorEditFlags_AlphaMask_ | ImGuiColorEditFlags_NoTooltip; ColorButton("##current", col_v4, (flags & sub_flags_to_forward), ImVec2(square_sz * 3, square_sz * 2)); if (ref_col != NULL) { @@ -4649,9 +5978,11 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl { if (flags & ImGuiColorEditFlags_InputRGB) { - ColorConvertHSVtoRGB(H >= 1.0f ? H - 10 * 1e-6f : H, S > 0.0f ? S : 10*1e-6f, V > 0.0f ? V : 1e-6f, col[0], col[1], col[2]); - g.ColorEditLastHue = H; - memcpy(g.ColorEditLastColor, col, sizeof(float) * 3); + ColorConvertHSVtoRGB(H, S, V, col[0], col[1], col[2]); + g.ColorEditSavedHue = H; + g.ColorEditSavedSat = S; + g.ColorEditSavedID = g.ColorEditCurrentID; + g.ColorEditSavedColor = ColorConvertFloat4ToU32(ImVec4(col[0], col[1], col[2], 0)); } else if (flags & ImGuiColorEditFlags_InputHSV) { @@ -4666,19 +5997,19 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl if ((flags & ImGuiColorEditFlags_NoInputs) == 0) { PushItemWidth((alpha_bar ? bar1_pos_x : bar0_pos_x) + bars_width - picker_pos.x); - ImGuiColorEditFlags sub_flags_to_forward = ImGuiColorEditFlags__DataTypeMask | ImGuiColorEditFlags__InputMask | ImGuiColorEditFlags_HDR | ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_NoOptions | ImGuiColorEditFlags_NoSmallPreview | ImGuiColorEditFlags_AlphaPreview | ImGuiColorEditFlags_AlphaPreviewHalf; + ImGuiColorEditFlags sub_flags_to_forward = ImGuiColorEditFlags_DataTypeMask_ | ImGuiColorEditFlags_InputMask_ | ImGuiColorEditFlags_HDR | ImGuiColorEditFlags_AlphaMask_ | ImGuiColorEditFlags_NoOptions | ImGuiColorEditFlags_NoTooltip | ImGuiColorEditFlags_NoSmallPreview; ImGuiColorEditFlags sub_flags = (flags & sub_flags_to_forward) | ImGuiColorEditFlags_NoPicker; - if (flags & ImGuiColorEditFlags_DisplayRGB || (flags & ImGuiColorEditFlags__DisplayMask) == 0) + if (flags & ImGuiColorEditFlags_DisplayRGB || (flags & ImGuiColorEditFlags_DisplayMask_) == 0) if (ColorEdit4("##rgb", col, sub_flags | ImGuiColorEditFlags_DisplayRGB)) { - // FIXME: Hackily differenciating using the DragInt (ActiveId != 0 && !ActiveIdAllowOverlap) vs. using the InputText or DropTarget. + // FIXME: Hackily differentiating using the DragInt (ActiveId != 0 && !ActiveIdAllowOverlap) vs. using the InputText or DropTarget. // For the later we don't want to run the hue-wrap canceling code. If you are well versed in HSV picker please provide your input! (See #2050) value_changed_fix_hue_wrap = (g.ActiveId != 0 && !g.ActiveIdAllowOverlap); value_changed = true; } - if (flags & ImGuiColorEditFlags_DisplayHSV || (flags & ImGuiColorEditFlags__DisplayMask) == 0) + if (flags & ImGuiColorEditFlags_DisplayHSV || (flags & ImGuiColorEditFlags_DisplayMask_) == 0) value_changed |= ColorEdit4("##hsv", col, sub_flags | ImGuiColorEditFlags_DisplayHSV); - if (flags & ImGuiColorEditFlags_DisplayHex || (flags & ImGuiColorEditFlags__DisplayMask) == 0) + if (flags & ImGuiColorEditFlags_DisplayHex || (flags & ImGuiColorEditFlags_DisplayMask_) == 0) value_changed |= ColorEdit4("##hex", col, sub_flags | ImGuiColorEditFlags_DisplayHex); PopItemWidth(); } @@ -4705,8 +6036,7 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl G = col[1]; B = col[2]; ColorConvertRGBtoHSV(R, G, B, H, S, V); - if (S == 0 && memcmp(g.ColorEditLastColor, col, sizeof(float) * 3) == 0) // Fix local Hue as display below will use it immediately. - H = g.ColorEditLastHue; + ColorEditRestoreHS(col, &H, &S, &V); // Fix local Hue as display below will use it immediately. } else if (flags & ImGuiColorEditFlags_InputHSV) { @@ -4740,23 +6070,23 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl const float a1 = (n+1.0f)/6.0f * 2.0f * IM_PI + aeps; const int vert_start_idx = draw_list->VtxBuffer.Size; draw_list->PathArcTo(wheel_center, (wheel_r_inner + wheel_r_outer)*0.5f, a0, a1, segment_per_arc); - draw_list->PathStroke(col_white, false, wheel_thickness); + draw_list->PathStroke(col_white, 0, wheel_thickness); const int vert_end_idx = draw_list->VtxBuffer.Size; // Paint colors over existing vertices ImVec2 gradient_p0(wheel_center.x + ImCos(a0) * wheel_r_inner, wheel_center.y + ImSin(a0) * wheel_r_inner); ImVec2 gradient_p1(wheel_center.x + ImCos(a1) * wheel_r_inner, wheel_center.y + ImSin(a1) * wheel_r_inner); - ShadeVertsLinearColorGradientKeepAlpha(draw_list, vert_start_idx, vert_end_idx, gradient_p0, gradient_p1, col_hues[n], col_hues[n+1]); + ShadeVertsLinearColorGradientKeepAlpha(draw_list, vert_start_idx, vert_end_idx, gradient_p0, gradient_p1, col_hues[n], col_hues[n + 1]); } // Render Cursor + preview on Hue Wheel float cos_hue_angle = ImCos(H * 2.0f * IM_PI); float sin_hue_angle = ImSin(H * 2.0f * IM_PI); - ImVec2 hue_cursor_pos(wheel_center.x + cos_hue_angle * (wheel_r_inner+wheel_r_outer)*0.5f, wheel_center.y + sin_hue_angle * (wheel_r_inner+wheel_r_outer)*0.5f); + ImVec2 hue_cursor_pos(wheel_center.x + cos_hue_angle * (wheel_r_inner + wheel_r_outer) * 0.5f, wheel_center.y + sin_hue_angle * (wheel_r_inner + wheel_r_outer) * 0.5f); float hue_cursor_rad = value_changed_h ? wheel_thickness * 0.65f : wheel_thickness * 0.55f; - int hue_cursor_segments = ImClamp((int)(hue_cursor_rad / 1.4f), 9, 32); + int hue_cursor_segments = draw_list->_CalcCircleAutoSegmentCount(hue_cursor_rad); // Lock segment count so the +1 one matches others. draw_list->AddCircleFilled(hue_cursor_pos, hue_cursor_rad, hue_color32, hue_cursor_segments); - draw_list->AddCircle(hue_cursor_pos, hue_cursor_rad+1, col_midgrey, hue_cursor_segments); + draw_list->AddCircle(hue_cursor_pos, hue_cursor_rad + 1, col_midgrey, hue_cursor_segments); draw_list->AddCircle(hue_cursor_pos, hue_cursor_rad, col_white, hue_cursor_segments); // Render SV triangle (rotated according to hue) @@ -4764,13 +6094,10 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl ImVec2 trb = wheel_center + ImRotate(triangle_pb, cos_hue_angle, sin_hue_angle); ImVec2 trc = wheel_center + ImRotate(triangle_pc, cos_hue_angle, sin_hue_angle); ImVec2 uv_white = GetFontTexUvWhitePixel(); - draw_list->PrimReserve(6, 6); + draw_list->PrimReserve(3, 3); draw_list->PrimVtx(tra, uv_white, hue_color32); - draw_list->PrimVtx(trb, uv_white, hue_color32); + draw_list->PrimVtx(trb, uv_white, col_black); draw_list->PrimVtx(trc, uv_white, col_white); - draw_list->PrimVtx(tra, uv_white, 0); - draw_list->PrimVtx(trb, uv_white, col_white); - draw_list->PrimVtx(trc, uv_white, 0); draw_list->AddTriangle(tra, trb, trc, col_midgrey, 1.5f); sv_cursor_pos = ImLerp(ImLerp(trc, tra, ImSaturate(S)), trb, ImSaturate(1 - V)); } @@ -4780,31 +6107,32 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl draw_list->AddRectFilledMultiColor(picker_pos, picker_pos + ImVec2(sv_picker_size, sv_picker_size), col_white, hue_color32, hue_color32, col_white); draw_list->AddRectFilledMultiColor(picker_pos, picker_pos + ImVec2(sv_picker_size, sv_picker_size), 0, 0, col_black, col_black); RenderFrameBorder(picker_pos, picker_pos + ImVec2(sv_picker_size, sv_picker_size), 0.0f); - sv_cursor_pos.x = ImClamp((float)(int)(picker_pos.x + ImSaturate(S) * sv_picker_size + 0.5f), picker_pos.x + 2, picker_pos.x + sv_picker_size - 2); // Sneakily prevent the circle to stick out too much - sv_cursor_pos.y = ImClamp((float)(int)(picker_pos.y + ImSaturate(1 - V) * sv_picker_size + 0.5f), picker_pos.y + 2, picker_pos.y + sv_picker_size - 2); + sv_cursor_pos.x = ImClamp(IM_ROUND(picker_pos.x + ImSaturate(S) * sv_picker_size), picker_pos.x + 2, picker_pos.x + sv_picker_size - 2); // Sneakily prevent the circle to stick out too much + sv_cursor_pos.y = ImClamp(IM_ROUND(picker_pos.y + ImSaturate(1 - V) * sv_picker_size), picker_pos.y + 2, picker_pos.y + sv_picker_size - 2); // Render Hue Bar for (int i = 0; i < 6; ++i) draw_list->AddRectFilledMultiColor(ImVec2(bar0_pos_x, picker_pos.y + i * (sv_picker_size / 6)), ImVec2(bar0_pos_x + bars_width, picker_pos.y + (i + 1) * (sv_picker_size / 6)), col_hues[i], col_hues[i], col_hues[i + 1], col_hues[i + 1]); - float bar0_line_y = (float)(int)(picker_pos.y + H * sv_picker_size + 0.5f); + float bar0_line_y = IM_ROUND(picker_pos.y + H * sv_picker_size); RenderFrameBorder(ImVec2(bar0_pos_x, picker_pos.y), ImVec2(bar0_pos_x + bars_width, picker_pos.y + sv_picker_size), 0.0f); RenderArrowsForVerticalBar(draw_list, ImVec2(bar0_pos_x - 1, bar0_line_y), ImVec2(bars_triangles_half_sz + 1, bars_triangles_half_sz), bars_width + 2.0f, style.Alpha); } // Render cursor/preview circle (clamp S/V within 0..1 range because floating points colors may lead HSV values to be out of range) - float sv_cursor_rad = value_changed_sv ? 10.0f : 6.0f; - draw_list->AddCircleFilled(sv_cursor_pos, sv_cursor_rad, user_col32_striped_of_alpha, 12); - draw_list->AddCircle(sv_cursor_pos, sv_cursor_rad+1, col_midgrey, 12); - draw_list->AddCircle(sv_cursor_pos, sv_cursor_rad, col_white, 12); + float sv_cursor_rad = value_changed_sv ? wheel_thickness * 0.55f : wheel_thickness * 0.40f; + int sv_cursor_segments = draw_list->_CalcCircleAutoSegmentCount(sv_cursor_rad); // Lock segment count so the +1 one matches others. + draw_list->AddCircleFilled(sv_cursor_pos, sv_cursor_rad, user_col32_striped_of_alpha, sv_cursor_segments); + draw_list->AddCircle(sv_cursor_pos, sv_cursor_rad + 1, col_midgrey, sv_cursor_segments); + draw_list->AddCircle(sv_cursor_pos, sv_cursor_rad, col_white, sv_cursor_segments); // Render alpha bar if (alpha_bar) { float alpha = ImSaturate(col[3]); ImRect bar1_bb(bar1_pos_x, picker_pos.y, bar1_pos_x + bars_width, picker_pos.y + sv_picker_size); - RenderColorRectWithAlphaCheckerboard(bar1_bb.Min, bar1_bb.Max, 0, bar1_bb.GetWidth() / 2.0f, ImVec2(0.0f, 0.0f)); + RenderColorRectWithAlphaCheckerboard(draw_list, bar1_bb.Min, bar1_bb.Max, 0, bar1_bb.GetWidth() / 2.0f, ImVec2(0.0f, 0.0f)); draw_list->AddRectFilledMultiColor(bar1_bb.Min, bar1_bb.Max, user_col32_striped_of_alpha, user_col32_striped_of_alpha, user_col32_striped_of_alpha & ~IM_COL32_A_MASK, user_col32_striped_of_alpha & ~IM_COL32_A_MASK); - float bar1_line_y = (float)(int)(picker_pos.y + (1.0f - alpha) * sv_picker_size + 0.5f); + float bar1_line_y = IM_ROUND(picker_pos.y + (1.0f - alpha) * sv_picker_size); RenderFrameBorder(bar1_bb.Min, bar1_bb.Max, 0.0f); RenderArrowsForVerticalBar(draw_list, ImVec2(bar1_pos_x - 1, bar1_line_y), ImVec2(bars_triangles_half_sz + 1, bars_triangles_half_sz), bars_width + 2.0f, style.Alpha); } @@ -4813,19 +6141,21 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl if (value_changed && memcmp(backup_initial_col, col, components * sizeof(float)) == 0) value_changed = false; - if (value_changed) - MarkItemEdited(window->DC.LastItemId); + if (value_changed && g.LastItemData.ID != 0) // In case of ID collision, the second EndGroup() won't catch g.ActiveId + MarkItemEdited(g.LastItemData.ID); + if (set_current_color_edit_id) + g.ColorEditCurrentID = 0; PopID(); return value_changed; } -// A little colored square. Return true when clicked. +// A little color square. Return true when clicked. // FIXME: May want to display/ignore the alpha component in the color display? Yet show it in the tooltip. // 'desc_id' is not called 'label' because we don't display it next to the button, but only in the tooltip. // Note that 'col' may be encoded in HSV if ImGuiColorEditFlags_InputHSV is set. -bool ImGui::ColorButton(const char* desc_id, const ImVec4& col, ImGuiColorEditFlags flags, ImVec2 size) +bool ImGui::ColorButton(const char* desc_id, const ImVec4& col, ImGuiColorEditFlags flags, const ImVec2& size_arg) { ImGuiWindow* window = GetCurrentWindow(); if (window->SkipItems) @@ -4833,11 +6163,8 @@ bool ImGui::ColorButton(const char* desc_id, const ImVec4& col, ImGuiColorEditFl ImGuiContext& g = *GImGui; const ImGuiID id = window->GetID(desc_id); - float default_size = GetFrameHeight(); - if (size.x == 0.0f) - size.x = default_size; - if (size.y == 0.0f) - size.y = default_size; + const float default_size = GetFrameHeight(); + const ImVec2 size(size_arg.x == 0.0f ? default_size : size_arg.x, size_arg.y == 0.0f ? default_size : size_arg.y); const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + size); ItemSize(bb, (size.y >= default_size) ? g.Style.FramePadding.y : 0.0f); if (!ItemAdd(bb, id)) @@ -4846,8 +6173,8 @@ bool ImGui::ColorButton(const char* desc_id, const ImVec4& col, ImGuiColorEditFl bool hovered, held; bool pressed = ButtonBehavior(bb, id, &hovered, &held); - if (flags & ImGuiColorEditFlags_NoAlpha) - flags &= ~(ImGuiColorEditFlags_AlphaPreview | ImGuiColorEditFlags_AlphaPreviewHalf); + if (flags & (ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_AlphaOpaque)) + flags &= ~(ImGuiColorEditFlags_AlphaNoBg | ImGuiColorEditFlags_AlphaPreviewHalf); ImVec4 col_rgb = col; if (flags & ImGuiColorEditFlags_InputHSV) @@ -4857,28 +6184,38 @@ bool ImGui::ColorButton(const char* desc_id, const ImVec4& col, ImGuiColorEditFl float grid_step = ImMin(size.x, size.y) / 2.99f; float rounding = ImMin(g.Style.FrameRounding, grid_step * 0.5f); ImRect bb_inner = bb; - float off = -0.75f; // The border (using Col_FrameBg) tends to look off when color is near-opaque and rounding is enabled. This offset seemed like a good middle ground to reduce those artifacts. - bb_inner.Expand(off); + float off = 0.0f; + if ((flags & ImGuiColorEditFlags_NoBorder) == 0) + { + off = -0.75f; // The border (using Col_FrameBg) tends to look off when color is near-opaque and rounding is enabled. This offset seemed like a good middle ground to reduce those artifacts. + bb_inner.Expand(off); + } if ((flags & ImGuiColorEditFlags_AlphaPreviewHalf) && col_rgb.w < 1.0f) { - float mid_x = (float)(int)((bb_inner.Min.x + bb_inner.Max.x) * 0.5f + 0.5f); - RenderColorRectWithAlphaCheckerboard(ImVec2(bb_inner.Min.x + grid_step, bb_inner.Min.y), bb_inner.Max, GetColorU32(col_rgb), grid_step, ImVec2(-grid_step + off, off), rounding, ImDrawCornerFlags_TopRight| ImDrawCornerFlags_BotRight); - window->DrawList->AddRectFilled(bb_inner.Min, ImVec2(mid_x, bb_inner.Max.y), GetColorU32(col_rgb_without_alpha), rounding, ImDrawCornerFlags_TopLeft|ImDrawCornerFlags_BotLeft); + float mid_x = IM_ROUND((bb_inner.Min.x + bb_inner.Max.x) * 0.5f); + if ((flags & ImGuiColorEditFlags_AlphaNoBg) == 0) + RenderColorRectWithAlphaCheckerboard(window->DrawList, ImVec2(bb_inner.Min.x + grid_step, bb_inner.Min.y), bb_inner.Max, GetColorU32(col_rgb), grid_step, ImVec2(-grid_step + off, off), rounding, ImDrawFlags_RoundCornersRight); + else + window->DrawList->AddRectFilled(ImVec2(bb_inner.Min.x + grid_step, bb_inner.Min.y), bb_inner.Max, GetColorU32(col_rgb), rounding, ImDrawFlags_RoundCornersRight); + window->DrawList->AddRectFilled(bb_inner.Min, ImVec2(mid_x, bb_inner.Max.y), GetColorU32(col_rgb_without_alpha), rounding, ImDrawFlags_RoundCornersLeft); } else { // Because GetColorU32() multiplies by the global style Alpha and we don't want to display a checkerboard if the source code had no alpha - ImVec4 col_source = (flags & ImGuiColorEditFlags_AlphaPreview) ? col_rgb : col_rgb_without_alpha; - if (col_source.w < 1.0f) - RenderColorRectWithAlphaCheckerboard(bb_inner.Min, bb_inner.Max, GetColorU32(col_source), grid_step, ImVec2(off, off), rounding); + ImVec4 col_source = (flags & ImGuiColorEditFlags_AlphaOpaque) ? col_rgb_without_alpha : col_rgb; + if (col_source.w < 1.0f && (flags & ImGuiColorEditFlags_AlphaNoBg) == 0) + RenderColorRectWithAlphaCheckerboard(window->DrawList, bb_inner.Min, bb_inner.Max, GetColorU32(col_source), grid_step, ImVec2(off, off), rounding); else - window->DrawList->AddRectFilled(bb_inner.Min, bb_inner.Max, GetColorU32(col_source), rounding, ImDrawCornerFlags_All); + window->DrawList->AddRectFilled(bb_inner.Min, bb_inner.Max, GetColorU32(col_source), rounding); + } + RenderNavCursor(bb, id); + if ((flags & ImGuiColorEditFlags_NoBorder) == 0) + { + if (g.Style.FrameBorderSize > 0.0f) + RenderFrameBorder(bb.Min, bb.Max, rounding); + else + window->DrawList->AddRect(bb.Min, bb.Max, GetColorU32(ImGuiCol_FrameBg), rounding); // Color buttons are often in need of some sort of border } - RenderNavHighlight(bb, id); - if (g.Style.FrameBorderSize > 0.0f) - RenderFrameBorder(bb.Min, bb.Max, rounding); - else - window->DrawList->AddRect(bb.Min, bb.Max, GetColorU32(ImGuiCol_FrameBg), rounding); // Color button are often in need of some sort of border // Drag and Drop Source // NB: The ActiveId test is merely an optional micro-optimization, BeginDragDropSource() does the same test. @@ -4895,8 +6232,8 @@ bool ImGui::ColorButton(const char* desc_id, const ImVec4& col, ImGuiColorEditFl } // Tooltip - if (!(flags & ImGuiColorEditFlags_NoTooltip) && hovered) - ColorTooltip(desc_id, &col.x, flags & (ImGuiColorEditFlags__InputMask | ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_AlphaPreview | ImGuiColorEditFlags_AlphaPreviewHalf)); + if (!(flags & ImGuiColorEditFlags_NoTooltip) && hovered && IsItemHovered(ImGuiHoveredFlags_ForTooltip)) + ColorTooltip(desc_id, &col.x, flags & (ImGuiColorEditFlags_InputMask_ | ImGuiColorEditFlags_AlphaMask_)); return pressed; } @@ -4905,18 +6242,18 @@ bool ImGui::ColorButton(const char* desc_id, const ImVec4& col, ImGuiColorEditFl void ImGui::SetColorEditOptions(ImGuiColorEditFlags flags) { ImGuiContext& g = *GImGui; - if ((flags & ImGuiColorEditFlags__DisplayMask) == 0) - flags |= ImGuiColorEditFlags__OptionsDefault & ImGuiColorEditFlags__DisplayMask; - if ((flags & ImGuiColorEditFlags__DataTypeMask) == 0) - flags |= ImGuiColorEditFlags__OptionsDefault & ImGuiColorEditFlags__DataTypeMask; - if ((flags & ImGuiColorEditFlags__PickerMask) == 0) - flags |= ImGuiColorEditFlags__OptionsDefault & ImGuiColorEditFlags__PickerMask; - if ((flags & ImGuiColorEditFlags__InputMask) == 0) - flags |= ImGuiColorEditFlags__OptionsDefault & ImGuiColorEditFlags__InputMask; - IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags__DisplayMask)); // Check only 1 option is selected - IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags__DataTypeMask)); // Check only 1 option is selected - IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags__PickerMask)); // Check only 1 option is selected - IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags__InputMask)); // Check only 1 option is selected + if ((flags & ImGuiColorEditFlags_DisplayMask_) == 0) + flags |= ImGuiColorEditFlags_DefaultOptions_ & ImGuiColorEditFlags_DisplayMask_; + if ((flags & ImGuiColorEditFlags_DataTypeMask_) == 0) + flags |= ImGuiColorEditFlags_DefaultOptions_ & ImGuiColorEditFlags_DataTypeMask_; + if ((flags & ImGuiColorEditFlags_PickerMask_) == 0) + flags |= ImGuiColorEditFlags_DefaultOptions_ & ImGuiColorEditFlags_PickerMask_; + if ((flags & ImGuiColorEditFlags_InputMask_) == 0) + flags |= ImGuiColorEditFlags_DefaultOptions_ & ImGuiColorEditFlags_InputMask_; + IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags_DisplayMask_)); // Check only 1 option is selected + IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags_DataTypeMask_)); // Check only 1 option is selected + IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags_PickerMask_)); // Check only 1 option is selected + IM_ASSERT(ImIsPowerOfTwo(flags & ImGuiColorEditFlags_InputMask_)); // Check only 1 option is selected g.ColorEditOptions = flags; } @@ -4925,7 +6262,8 @@ void ImGui::ColorTooltip(const char* text, const float* col, ImGuiColorEditFlags { ImGuiContext& g = *GImGui; - BeginTooltipEx(0, true); + if (!BeginTooltipEx(ImGuiTooltipFlags_OverridePrevious, ImGuiWindowFlags_None)) + return; const char* text_end = text ? FindRenderedTextEnd(text, NULL) : text; if (text_end > text) { @@ -4936,9 +6274,10 @@ void ImGui::ColorTooltip(const char* text, const float* col, ImGuiColorEditFlags ImVec2 sz(g.FontSize * 3 + g.Style.FramePadding.y * 2, g.FontSize * 3 + g.Style.FramePadding.y * 2); ImVec4 cf(col[0], col[1], col[2], (flags & ImGuiColorEditFlags_NoAlpha) ? 1.0f : col[3]); int cr = IM_F32_TO_INT8_SAT(col[0]), cg = IM_F32_TO_INT8_SAT(col[1]), cb = IM_F32_TO_INT8_SAT(col[2]), ca = (flags & ImGuiColorEditFlags_NoAlpha) ? 255 : IM_F32_TO_INT8_SAT(col[3]); - ColorButton("##preview", cf, (flags & (ImGuiColorEditFlags__InputMask | ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_AlphaPreview | ImGuiColorEditFlags_AlphaPreviewHalf)) | ImGuiColorEditFlags_NoTooltip, sz); + ImGuiColorEditFlags flags_to_forward = ImGuiColorEditFlags_InputMask_ | ImGuiColorEditFlags_AlphaMask_; + ColorButton("##preview", cf, (flags & flags_to_forward) | ImGuiColorEditFlags_NoTooltip, sz); SameLine(); - if ((flags & ImGuiColorEditFlags_InputRGB) || !(flags & ImGuiColorEditFlags__InputMask)) + if ((flags & ImGuiColorEditFlags_InputRGB) || !(flags & ImGuiColorEditFlags_InputMask_)) { if (flags & ImGuiColorEditFlags_NoAlpha) Text("#%02X%02X%02X\nR: %d, G: %d, B: %d\n(%.3f, %.3f, %.3f)", cr, cg, cb, cr, cg, cb, col[0], col[1], col[2]); @@ -4957,28 +6296,30 @@ void ImGui::ColorTooltip(const char* text, const float* col, ImGuiColorEditFlags void ImGui::ColorEditOptionsPopup(const float* col, ImGuiColorEditFlags flags) { - bool allow_opt_inputs = !(flags & ImGuiColorEditFlags__DisplayMask); - bool allow_opt_datatype = !(flags & ImGuiColorEditFlags__DataTypeMask); + bool allow_opt_inputs = !(flags & ImGuiColorEditFlags_DisplayMask_); + bool allow_opt_datatype = !(flags & ImGuiColorEditFlags_DataTypeMask_); if ((!allow_opt_inputs && !allow_opt_datatype) || !BeginPopup("context")) return; + ImGuiContext& g = *GImGui; + PushItemFlag(ImGuiItemFlags_NoMarkEdited, true); ImGuiColorEditFlags opts = g.ColorEditOptions; if (allow_opt_inputs) { - if (RadioButton("RGB", (opts & ImGuiColorEditFlags_DisplayRGB) != 0)) opts = (opts & ~ImGuiColorEditFlags__DisplayMask) | ImGuiColorEditFlags_DisplayRGB; - if (RadioButton("HSV", (opts & ImGuiColorEditFlags_DisplayHSV) != 0)) opts = (opts & ~ImGuiColorEditFlags__DisplayMask) | ImGuiColorEditFlags_DisplayHSV; - if (RadioButton("Hex", (opts & ImGuiColorEditFlags_DisplayHex) != 0)) opts = (opts & ~ImGuiColorEditFlags__DisplayMask) | ImGuiColorEditFlags_DisplayHex; + if (RadioButton("RGB", (opts & ImGuiColorEditFlags_DisplayRGB) != 0)) opts = (opts & ~ImGuiColorEditFlags_DisplayMask_) | ImGuiColorEditFlags_DisplayRGB; + if (RadioButton("HSV", (opts & ImGuiColorEditFlags_DisplayHSV) != 0)) opts = (opts & ~ImGuiColorEditFlags_DisplayMask_) | ImGuiColorEditFlags_DisplayHSV; + if (RadioButton("Hex", (opts & ImGuiColorEditFlags_DisplayHex) != 0)) opts = (opts & ~ImGuiColorEditFlags_DisplayMask_) | ImGuiColorEditFlags_DisplayHex; } if (allow_opt_datatype) { if (allow_opt_inputs) Separator(); - if (RadioButton("0..255", (opts & ImGuiColorEditFlags_Uint8) != 0)) opts = (opts & ~ImGuiColorEditFlags__DataTypeMask) | ImGuiColorEditFlags_Uint8; - if (RadioButton("0.00..1.00", (opts & ImGuiColorEditFlags_Float) != 0)) opts = (opts & ~ImGuiColorEditFlags__DataTypeMask) | ImGuiColorEditFlags_Float; + if (RadioButton("0..255", (opts & ImGuiColorEditFlags_Uint8) != 0)) opts = (opts & ~ImGuiColorEditFlags_DataTypeMask_) | ImGuiColorEditFlags_Uint8; + if (RadioButton("0.00..1.00", (opts & ImGuiColorEditFlags_Float) != 0)) opts = (opts & ~ImGuiColorEditFlags_DataTypeMask_) | ImGuiColorEditFlags_Float; } if (allow_opt_inputs || allow_opt_datatype) Separator(); - if (Button("Copy as..", ImVec2(-1,0))) + if (Button("Copy as..", ImVec2(-1, 0))) OpenPopup("Copy"); if (BeginPopup("Copy")) { @@ -4990,26 +6331,32 @@ void ImGui::ColorEditOptionsPopup(const float* col, ImGuiColorEditFlags flags) ImFormatString(buf, IM_ARRAYSIZE(buf), "(%d,%d,%d,%d)", cr, cg, cb, ca); if (Selectable(buf)) SetClipboardText(buf); - if (flags & ImGuiColorEditFlags_NoAlpha) - ImFormatString(buf, IM_ARRAYSIZE(buf), "0x%02X%02X%02X", cr, cg, cb); - else - ImFormatString(buf, IM_ARRAYSIZE(buf), "0x%02X%02X%02X%02X", cr, cg, cb, ca); + ImFormatString(buf, IM_ARRAYSIZE(buf), "#%02X%02X%02X", cr, cg, cb); if (Selectable(buf)) SetClipboardText(buf); + if (!(flags & ImGuiColorEditFlags_NoAlpha)) + { + ImFormatString(buf, IM_ARRAYSIZE(buf), "#%02X%02X%02X%02X", cr, cg, cb, ca); + if (Selectable(buf)) + SetClipboardText(buf); + } EndPopup(); } g.ColorEditOptions = opts; + PopItemFlag(); EndPopup(); } void ImGui::ColorPickerOptionsPopup(const float* ref_col, ImGuiColorEditFlags flags) { - bool allow_opt_picker = !(flags & ImGuiColorEditFlags__PickerMask); + bool allow_opt_picker = !(flags & ImGuiColorEditFlags_PickerMask_); bool allow_opt_alpha_bar = !(flags & ImGuiColorEditFlags_NoAlpha) && !(flags & ImGuiColorEditFlags_AlphaBar); if ((!allow_opt_picker && !allow_opt_alpha_bar) || !BeginPopup("context")) return; + ImGuiContext& g = *GImGui; + PushItemFlag(ImGuiItemFlags_NoMarkEdited, true); if (allow_opt_picker) { ImVec2 picker_size(g.FontSize * 8, ImMax(g.FontSize * 8 - (GetFrameHeight() + g.Style.ItemInnerSpacing.x), 1.0f)); // FIXME: Picker size copied from main picker function @@ -5019,16 +6366,16 @@ void ImGui::ColorPickerOptionsPopup(const float* ref_col, ImGuiColorEditFlags fl // Draw small/thumbnail version of each picker type (over an invisible button for selection) if (picker_type > 0) Separator(); PushID(picker_type); - ImGuiColorEditFlags picker_flags = ImGuiColorEditFlags_NoInputs|ImGuiColorEditFlags_NoOptions|ImGuiColorEditFlags_NoLabel|ImGuiColorEditFlags_NoSidePreview|(flags & ImGuiColorEditFlags_NoAlpha); + ImGuiColorEditFlags picker_flags = ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoOptions | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_NoSidePreview | (flags & ImGuiColorEditFlags_NoAlpha); if (picker_type == 0) picker_flags |= ImGuiColorEditFlags_PickerHueBar; if (picker_type == 1) picker_flags |= ImGuiColorEditFlags_PickerHueWheel; ImVec2 backup_pos = GetCursorScreenPos(); if (Selectable("##selectable", false, 0, picker_size)) // By default, Selectable() is closing popup - g.ColorEditOptions = (g.ColorEditOptions & ~ImGuiColorEditFlags__PickerMask) | (picker_flags & ImGuiColorEditFlags__PickerMask); + g.ColorEditOptions = (g.ColorEditOptions & ~ImGuiColorEditFlags_PickerMask_) | (picker_flags & ImGuiColorEditFlags_PickerMask_); SetCursorScreenPos(backup_pos); - ImVec4 dummy_ref_col; - memcpy(&dummy_ref_col, ref_col, sizeof(float) * ((picker_flags & ImGuiColorEditFlags_NoAlpha) ? 3 : 4)); - ColorPicker4("##dummypicker", &dummy_ref_col.x, picker_flags); + ImVec4 previewing_ref_col; + memcpy(&previewing_ref_col, ref_col, sizeof(float) * ((picker_flags & ImGuiColorEditFlags_NoAlpha) ? 3 : 4)); + ColorPicker4("##previewing_picker", &previewing_ref_col.x, picker_flags); PopID(); } PopItemWidth(); @@ -5036,8 +6383,9 @@ void ImGui::ColorPickerOptionsPopup(const float* ref_col, ImGuiColorEditFlags fl if (allow_opt_alpha_bar) { if (allow_opt_picker) Separator(); - CheckboxFlags("Alpha Bar", (unsigned int*)&g.ColorEditOptions, ImGuiColorEditFlags_AlphaBar); + CheckboxFlags("Alpha Bar", &g.ColorEditOptions, ImGuiColorEditFlags_AlphaBar); } + PopItemFlag(); EndPopup(); } @@ -5079,7 +6427,8 @@ bool ImGui::TreeNode(const char* label) ImGuiWindow* window = GetCurrentWindow(); if (window->SkipItems) return false; - return TreeNodeBehavior(window->GetID(label), 0, label, NULL); + ImGuiID id = window->GetID(label); + return TreeNodeBehavior(id, ImGuiTreeNodeFlags_None, label, NULL); } bool ImGui::TreeNodeV(const char* str_id, const char* fmt, va_list args) @@ -5097,8 +6446,8 @@ bool ImGui::TreeNodeEx(const char* label, ImGuiTreeNodeFlags flags) ImGuiWindow* window = GetCurrentWindow(); if (window->SkipItems) return false; - - return TreeNodeBehavior(window->GetID(label), flags, label, NULL); + ImGuiID id = window->GetID(label); + return TreeNodeBehavior(id, flags, label, NULL); } bool ImGui::TreeNodeEx(const char* str_id, ImGuiTreeNodeFlags flags, const char* fmt, ...) @@ -5125,9 +6474,10 @@ bool ImGui::TreeNodeExV(const char* str_id, ImGuiTreeNodeFlags flags, const char if (window->SkipItems) return false; - ImGuiContext& g = *GImGui; - const char* label_end = g.TempBuffer + ImFormatStringV(g.TempBuffer, IM_ARRAYSIZE(g.TempBuffer), fmt, args); - return TreeNodeBehavior(window->GetID(str_id), flags, g.TempBuffer, label_end); + ImGuiID id = window->GetID(str_id); + const char* label, *label_end; + ImFormatStringToTempBufferV(&label, &label_end, fmt, args); + return TreeNodeBehavior(id, flags, label, label_end); } bool ImGui::TreeNodeExV(const void* ptr_id, ImGuiTreeNodeFlags flags, const char* fmt, va_list args) @@ -5136,37 +6486,52 @@ bool ImGui::TreeNodeExV(const void* ptr_id, ImGuiTreeNodeFlags flags, const char if (window->SkipItems) return false; - ImGuiContext& g = *GImGui; - const char* label_end = g.TempBuffer + ImFormatStringV(g.TempBuffer, IM_ARRAYSIZE(g.TempBuffer), fmt, args); - return TreeNodeBehavior(window->GetID(ptr_id), flags, g.TempBuffer, label_end); + ImGuiID id = window->GetID(ptr_id); + const char* label, *label_end; + ImFormatStringToTempBufferV(&label, &label_end, fmt, args); + return TreeNodeBehavior(id, flags, label, label_end); } -bool ImGui::TreeNodeBehaviorIsOpen(ImGuiID id, ImGuiTreeNodeFlags flags) +bool ImGui::TreeNodeGetOpen(ImGuiID storage_id) +{ + ImGuiContext& g = *GImGui; + ImGuiStorage* storage = g.CurrentWindow->DC.StateStorage; + return storage->GetInt(storage_id, 0) != 0; +} + +void ImGui::TreeNodeSetOpen(ImGuiID storage_id, bool open) +{ + ImGuiContext& g = *GImGui; + ImGuiStorage* storage = g.CurrentWindow->DC.StateStorage; + storage->SetInt(storage_id, open ? 1 : 0); +} + +bool ImGui::TreeNodeUpdateNextOpen(ImGuiID storage_id, ImGuiTreeNodeFlags flags) { if (flags & ImGuiTreeNodeFlags_Leaf) return true; - // We only write to the tree storage if the user clicks (or explicitly use the SetNextItemOpen function) + // We only write to the tree storage if the user clicks, or explicitly use the SetNextItemOpen function ImGuiContext& g = *GImGui; ImGuiWindow* window = g.CurrentWindow; ImGuiStorage* storage = window->DC.StateStorage; bool is_open; - if (g.NextItemData.Flags & ImGuiNextItemDataFlags_HasOpen) + if (g.NextItemData.HasFlags & ImGuiNextItemDataFlags_HasOpen) { if (g.NextItemData.OpenCond & ImGuiCond_Always) { is_open = g.NextItemData.OpenVal; - storage->SetInt(id, is_open); + TreeNodeSetOpen(storage_id, is_open); } else { // We treat ImGuiCond_Once and ImGuiCond_FirstUseEver the same because tree node state are not saved persistently. - const int stored_value = storage->GetInt(id, -1); + const int stored_value = storage->GetInt(storage_id, -1); if (stored_value == -1) { is_open = g.NextItemData.OpenVal; - storage->SetInt(id, is_open); + TreeNodeSetOpen(storage_id, is_open); } else { @@ -5176,7 +6541,7 @@ bool ImGui::TreeNodeBehaviorIsOpen(ImGuiID id, ImGuiTreeNodeFlags flags) } else { - is_open = storage->GetInt(id, (flags & ImGuiTreeNodeFlags_DefaultOpen) ? 1 : 0) != 0; + is_open = storage->GetInt(storage_id, (flags & ImGuiTreeNodeFlags_DefaultOpen) ? 1 : 0) != 0; } // When logging is enabled, we automatically expand tree nodes (but *NOT* collapsing headers.. seems like sensible behavior). @@ -5187,6 +6552,23 @@ bool ImGui::TreeNodeBehaviorIsOpen(ImGuiID id, ImGuiTreeNodeFlags flags) return is_open; } +// Store ImGuiTreeNodeStackData for just submitted node. +// Currently only supports 32 level deep and we are fine with (1 << Depth) overflowing into a zero, easy to increase. +static void TreeNodeStoreStackData(ImGuiTreeNodeFlags flags) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + + g.TreeNodeStack.resize(g.TreeNodeStack.Size + 1); + ImGuiTreeNodeStackData* tree_node_data = &g.TreeNodeStack.back(); + tree_node_data->ID = g.LastItemData.ID; + tree_node_data->TreeFlags = flags; + tree_node_data->ItemFlags = g.LastItemData.ItemFlags; + tree_node_data->NavRect = g.LastItemData.NavRect; + window->DC.TreeHasStackDataDepthMask |= (1 << window->DC.TreeDepth); +} + +// When using public API, currently 'id == storage_id' is always true, but we separate the values to facilitate advanced user code doing storage queries outside of UI loop. bool ImGui::TreeNodeBehavior(ImGuiID id, ImGuiTreeNodeFlags flags, const char* label, const char* label_end) { ImGuiWindow* window = GetCurrentWindow(); @@ -5196,166 +6578,258 @@ bool ImGui::TreeNodeBehavior(ImGuiID id, ImGuiTreeNodeFlags flags, const char* l ImGuiContext& g = *GImGui; const ImGuiStyle& style = g.Style; const bool display_frame = (flags & ImGuiTreeNodeFlags_Framed) != 0; - const ImVec2 padding = (display_frame || (flags & ImGuiTreeNodeFlags_FramePadding)) ? style.FramePadding : ImVec2(style.FramePadding.x, 0.0f); + const ImVec2 padding = (display_frame || (flags & ImGuiTreeNodeFlags_FramePadding)) ? style.FramePadding : ImVec2(style.FramePadding.x, ImMin(window->DC.CurrLineTextBaseOffset, style.FramePadding.y)); if (!label_end) label_end = FindRenderedTextEnd(label); const ImVec2 label_size = CalcTextSize(label, label_end, false); + const float text_offset_x = g.FontSize + (display_frame ? padding.x * 3 : padding.x * 2); // Collapsing arrow width + Spacing + const float text_offset_y = ImMax(padding.y, window->DC.CurrLineTextBaseOffset); // Latch before ItemSize changes it + const float text_width = g.FontSize + label_size.x + padding.x * 2; // Include collapsing arrow + // We vertically grow up to current line height up the typical widget height. - const float frame_height = ImMax(ImMin(window->DC.CurrLineSize.y, g.FontSize + style.FramePadding.y*2), label_size.y + padding.y*2); + const float frame_height = ImMax(ImMin(window->DC.CurrLineSize.y, g.FontSize + style.FramePadding.y * 2), label_size.y + padding.y * 2); + const bool span_all_columns = (flags & ImGuiTreeNodeFlags_SpanAllColumns) != 0 && (g.CurrentTable != NULL); + const bool span_all_columns_label = (flags & ImGuiTreeNodeFlags_LabelSpanAllColumns) != 0 && (g.CurrentTable != NULL); ImRect frame_bb; - frame_bb.Min.x = (flags & ImGuiTreeNodeFlags_SpanFullWidth) ? window->WorkRect.Min.x : window->DC.CursorPos.x; + frame_bb.Min.x = span_all_columns ? window->ParentWorkRect.Min.x : (flags & ImGuiTreeNodeFlags_SpanFullWidth) ? window->WorkRect.Min.x : window->DC.CursorPos.x; frame_bb.Min.y = window->DC.CursorPos.y; - frame_bb.Max.x = window->WorkRect.Max.x; + frame_bb.Max.x = span_all_columns ? window->ParentWorkRect.Max.x : (flags & ImGuiTreeNodeFlags_SpanLabelWidth) ? window->DC.CursorPos.x + text_width + padding.x : window->WorkRect.Max.x; frame_bb.Max.y = window->DC.CursorPos.y + frame_height; if (display_frame) { - // Framed header expand a little outside the default padding, to the edge of InnerClipRect - // (FIXME: May remove this at some point and make InnerClipRect align with WindowPadding.x instead of WindowPadding.x*0.5f) - frame_bb.Min.x -= (float)(int)(window->WindowPadding.x * 0.5f - 1.0f); - frame_bb.Max.x += (float)(int)(window->WindowPadding.x * 0.5f); + const float outer_extend = IM_TRUNC(window->WindowPadding.x * 0.5f); // Framed header expand a little outside of current limits + frame_bb.Min.x -= outer_extend; + frame_bb.Max.x += outer_extend; } - const float text_offset_x = g.FontSize + (display_frame ? padding.x*3 : padding.x*2); // Collapser arrow width + Spacing - const float text_offset_y = ImMax(padding.y, window->DC.CurrLineTextBaseOffset); // Latch before ItemSize changes it - const float text_width = g.FontSize + (label_size.x > 0.0f ? label_size.x + padding.x*2 : 0.0f); // Include collapser ImVec2 text_pos(window->DC.CursorPos.x + text_offset_x, window->DC.CursorPos.y + text_offset_y); - ItemSize(ImVec2(text_width, frame_height), text_offset_y); + ItemSize(ImVec2(text_width, frame_height), padding.y); // For regular tree nodes, we arbitrary allow to click past 2 worth of ItemSpacing ImRect interact_bb = frame_bb; - if (!display_frame && (flags & (ImGuiTreeNodeFlags_SpanAvailWidth | ImGuiTreeNodeFlags_SpanFullWidth)) == 0) - interact_bb.Max.x = frame_bb.Min.x + text_width + style.ItemSpacing.x * 2.0f; - - // Store a flag for the current depth to tell if we will allow closing this node when navigating one of its child. - // For this purpose we essentially compare if g.NavIdIsAlive went from 0 to 1 between TreeNode() and TreePop(). - // This is currently only support 32 level deep and we are fine with (1 << Depth) overflowing into a zero. - const bool is_leaf = (flags & ImGuiTreeNodeFlags_Leaf) != 0; - bool is_open = TreeNodeBehaviorIsOpen(id, flags); - if (is_open && !g.NavIdIsAlive && (flags & ImGuiTreeNodeFlags_NavLeftJumpsBackHere) && !(flags & ImGuiTreeNodeFlags_NoTreePushOnOpen)) - window->DC.TreeMayJumpToParentOnPopMask |= (1 << window->DC.TreeDepth); + if ((flags & (ImGuiTreeNodeFlags_Framed | ImGuiTreeNodeFlags_SpanAvailWidth | ImGuiTreeNodeFlags_SpanFullWidth | ImGuiTreeNodeFlags_SpanLabelWidth | ImGuiTreeNodeFlags_SpanAllColumns)) == 0) + interact_bb.Max.x = frame_bb.Min.x + text_width + (label_size.x > 0.0f ? style.ItemSpacing.x * 2.0f : 0.0f); - bool item_add = ItemAdd(interact_bb, id); - window->DC.LastItemStatusFlags |= ImGuiItemStatusFlags_HasDisplayRect; - window->DC.LastItemDisplayRect = frame_bb; + // Compute open and multi-select states before ItemAdd() as it clear NextItem data. + ImGuiID storage_id = (g.NextItemData.HasFlags & ImGuiNextItemDataFlags_HasStorageID) ? g.NextItemData.StorageId : id; + bool is_open = TreeNodeUpdateNextOpen(storage_id, flags); - if (!item_add) + bool is_visible; + if (span_all_columns || span_all_columns_label) { + // Modify ClipRect for the ItemAdd(), faster than doing a PushColumnsBackground/PushTableBackgroundChannel for every Selectable.. + const float backup_clip_rect_min_x = window->ClipRect.Min.x; + const float backup_clip_rect_max_x = window->ClipRect.Max.x; + window->ClipRect.Min.x = window->ParentWorkRect.Min.x; + window->ClipRect.Max.x = window->ParentWorkRect.Max.x; + is_visible = ItemAdd(interact_bb, id); + window->ClipRect.Min.x = backup_clip_rect_min_x; + window->ClipRect.Max.x = backup_clip_rect_max_x; + } + else + { + is_visible = ItemAdd(interact_bb, id); + } + g.LastItemData.StatusFlags |= ImGuiItemStatusFlags_HasDisplayRect; + g.LastItemData.DisplayRect = frame_bb; + + // If a NavLeft request is happening and ImGuiTreeNodeFlags_NavLeftJumpsBackHere enabled: + // Store data for the current depth to allow returning to this node from any child item. + // For this purpose we essentially compare if g.NavIdIsAlive went from 0 to 1 between TreeNode() and TreePop(). + // It will become tempting to enable ImGuiTreeNodeFlags_NavLeftJumpsBackHere by default or move it to ImGuiStyle. + bool store_tree_node_stack_data = false; + if (!(flags & ImGuiTreeNodeFlags_NoTreePushOnOpen)) + { + if ((flags & ImGuiTreeNodeFlags_NavLeftJumpsBackHere) && is_open && !g.NavIdIsAlive) + if (g.NavMoveDir == ImGuiDir_Left && g.NavWindow == window && NavMoveRequestButNoResultYet()) + store_tree_node_stack_data = true; + } + + const bool is_leaf = (flags & ImGuiTreeNodeFlags_Leaf) != 0; + if (!is_visible) + { + if (store_tree_node_stack_data && is_open) + TreeNodeStoreStackData(flags); // Call before TreePushOverrideID() if (is_open && !(flags & ImGuiTreeNodeFlags_NoTreePushOnOpen)) TreePushOverrideID(id); - IMGUI_TEST_ENGINE_ITEM_INFO(window->DC.LastItemId, label, window->DC.ItemFlags | (is_leaf ? 0 : ImGuiItemStatusFlags_Openable) | (is_open ? ImGuiItemStatusFlags_Opened : 0)); + IMGUI_TEST_ENGINE_ITEM_INFO(g.LastItemData.ID, label, g.LastItemData.StatusFlags | (is_leaf ? 0 : ImGuiItemStatusFlags_Openable) | (is_open ? ImGuiItemStatusFlags_Opened : 0)); return is_open; } - // Flags that affects opening behavior: - // - 0 (default) .................... single-click anywhere to open - // - OpenOnDoubleClick .............. double-click anywhere to open - // - OpenOnArrow .................... single-click on arrow to open - // - OpenOnDoubleClick|OpenOnArrow .. single-click on arrow or double-click anywhere to open - ImGuiButtonFlags button_flags = ImGuiButtonFlags_NoKeyModifiers; - if (flags & ImGuiTreeNodeFlags_AllowItemOverlap) - button_flags |= ImGuiButtonFlags_AllowItemOverlap; - if (flags & ImGuiTreeNodeFlags_OpenOnDoubleClick) - button_flags |= ImGuiButtonFlags_PressedOnDoubleClick | ((flags & ImGuiTreeNodeFlags_OpenOnArrow) ? ImGuiButtonFlags_PressedOnClickRelease : 0); + if (span_all_columns || span_all_columns_label) + { + TablePushBackgroundChannel(); + g.LastItemData.StatusFlags |= ImGuiItemStatusFlags_HasClipRect; + g.LastItemData.ClipRect = window->ClipRect; + } + + ImGuiButtonFlags button_flags = ImGuiTreeNodeFlags_None; + if ((flags & ImGuiTreeNodeFlags_AllowOverlap) || (g.LastItemData.ItemFlags & ImGuiItemFlags_AllowOverlap)) + button_flags |= ImGuiButtonFlags_AllowOverlap; if (!is_leaf) button_flags |= ImGuiButtonFlags_PressedOnDragDropHold; + // We allow clicking on the arrow section with keyboard modifiers held, in order to easily + // allow browsing a tree while preserving selection with code implementing multi-selection patterns. + // When clicking on the rest of the tree node we always disallow keyboard modifiers. + const float arrow_hit_x1 = (text_pos.x - text_offset_x) - style.TouchExtraPadding.x; + const float arrow_hit_x2 = (text_pos.x - text_offset_x) + (g.FontSize + padding.x * 2.0f) + style.TouchExtraPadding.x; + const bool is_mouse_x_over_arrow = (g.IO.MousePos.x >= arrow_hit_x1 && g.IO.MousePos.x < arrow_hit_x2); + + const bool is_multi_select = (g.LastItemData.ItemFlags & ImGuiItemFlags_IsMultiSelect) != 0; + if (is_multi_select) // We absolutely need to distinguish open vs select so _OpenOnArrow comes by default + flags |= (flags & ImGuiTreeNodeFlags_OpenOnMask_) == 0 ? ImGuiTreeNodeFlags_OpenOnArrow | ImGuiTreeNodeFlags_OpenOnDoubleClick : ImGuiTreeNodeFlags_OpenOnArrow; + + // Open behaviors can be altered with the _OpenOnArrow and _OnOnDoubleClick flags. + // Some alteration have subtle effects (e.g. toggle on MouseUp vs MouseDown events) due to requirements for multi-selection and drag and drop support. + // - Single-click on label = Toggle on MouseUp (default, when _OpenOnArrow=0) + // - Single-click on arrow = Toggle on MouseDown (when _OpenOnArrow=0) + // - Single-click on arrow = Toggle on MouseDown (when _OpenOnArrow=1) + // - Double-click on label = Toggle on MouseDoubleClick (when _OpenOnDoubleClick=1) + // - Double-click on arrow = Toggle on MouseDoubleClick (when _OpenOnDoubleClick=1 and _OpenOnArrow=0) + // It is rather standard that arrow click react on Down rather than Up. + // We set ImGuiButtonFlags_PressedOnClickRelease on OpenOnDoubleClick because we want the item to be active on the initial MouseDown in order for drag and drop to work. + if (is_mouse_x_over_arrow) + button_flags |= ImGuiButtonFlags_PressedOnClick; + else if (flags & ImGuiTreeNodeFlags_OpenOnDoubleClick) + button_flags |= ImGuiButtonFlags_PressedOnClickRelease | ImGuiButtonFlags_PressedOnDoubleClick; + else + button_flags |= ImGuiButtonFlags_PressedOnClickRelease; + bool selected = (flags & ImGuiTreeNodeFlags_Selected) != 0; const bool was_selected = selected; + // Multi-selection support (header) + if (is_multi_select) + { + // Handle multi-select + alter button flags for it + MultiSelectItemHeader(id, &selected, &button_flags); + if (is_mouse_x_over_arrow) + button_flags = (button_flags | ImGuiButtonFlags_PressedOnClick) & ~ImGuiButtonFlags_PressedOnClickRelease; + } + else + { + if (window != g.HoveredWindow || !is_mouse_x_over_arrow) + button_flags |= ImGuiButtonFlags_NoKeyModsAllowed; + } + bool hovered, held; bool pressed = ButtonBehavior(interact_bb, id, &hovered, &held, button_flags); bool toggled = false; if (!is_leaf) { - if (pressed) + if (pressed && g.DragDropHoldJustPressedId != id) { - toggled = !(flags & (ImGuiTreeNodeFlags_OpenOnArrow | ImGuiTreeNodeFlags_OpenOnDoubleClick)) || (g.NavActivateId == id); + if ((flags & ImGuiTreeNodeFlags_OpenOnMask_) == 0 || (g.NavActivateId == id && !is_multi_select)) + toggled = true; // Single click if (flags & ImGuiTreeNodeFlags_OpenOnArrow) - toggled |= IsMouseHoveringRect(interact_bb.Min, ImVec2(interact_bb.Min.x + text_offset_x, interact_bb.Max.y)) && (!g.NavDisableMouseHover); - if (flags & ImGuiTreeNodeFlags_OpenOnDoubleClick) - toggled |= g.IO.MouseDoubleClicked[0]; - if (g.DragDropActive && is_open) // When using Drag and Drop "hold to open" we keep the node highlighted after opening, but never close it again. - toggled = false; + toggled |= is_mouse_x_over_arrow && !g.NavHighlightItemUnderNav; // Lightweight equivalent of IsMouseHoveringRect() since ButtonBehavior() already did the job + if ((flags & ImGuiTreeNodeFlags_OpenOnDoubleClick) && g.IO.MouseClickedCount[0] == 2) + toggled = true; // Double click + } + else if (pressed && g.DragDropHoldJustPressedId == id) + { + IM_ASSERT(button_flags & ImGuiButtonFlags_PressedOnDragDropHold); + if (!is_open) // When using Drag and Drop "hold to open" we keep the node highlighted after opening, but never close it again. + toggled = true; + else + pressed = false; // Cancel press so it doesn't trigger selection. } - if (g.NavId == id && g.NavMoveRequest && g.NavMoveDir == ImGuiDir_Left && is_open) + if (g.NavId == id && g.NavMoveDir == ImGuiDir_Left && is_open) { toggled = true; + NavClearPreferredPosForAxis(ImGuiAxis_X); NavMoveRequestCancel(); } - if (g.NavId == id && g.NavMoveRequest && g.NavMoveDir == ImGuiDir_Right && !is_open) // If there's something upcoming on the line we may want to give it the priority? + if (g.NavId == id && g.NavMoveDir == ImGuiDir_Right && !is_open) // If there's something upcoming on the line we may want to give it the priority? { toggled = true; + NavClearPreferredPosForAxis(ImGuiAxis_X); NavMoveRequestCancel(); } if (toggled) { is_open = !is_open; - window->DC.StateStorage->SetInt(id, is_open); + window->DC.StateStorage->SetInt(storage_id, is_open); + g.LastItemData.StatusFlags |= ImGuiItemStatusFlags_ToggledOpen; } } - if (flags & ImGuiTreeNodeFlags_AllowItemOverlap) - SetItemAllowOverlap(); - // In this branch, TreeNodeBehavior() cannot toggle the selection so this will never trigger. - if (selected != was_selected) //-V547 - window->DC.LastItemStatusFlags |= ImGuiItemStatusFlags_ToggledSelection; + // Multi-selection support (footer) + if (is_multi_select) + { + bool pressed_copy = pressed && !toggled; + MultiSelectItemFooter(id, &selected, &pressed_copy); + if (pressed) + SetNavID(id, window->DC.NavLayerCurrent, g.CurrentFocusScopeId, interact_bb); + } + + if (selected != was_selected) + g.LastItemData.StatusFlags |= ImGuiItemStatusFlags_ToggledSelection; // Render - const ImU32 text_col = GetColorU32(ImGuiCol_Text); - ImGuiNavHighlightFlags nav_highlight_flags = ImGuiNavHighlightFlags_TypeThin; - if (display_frame) { - // Framed type - const ImU32 bg_col = GetColorU32((held && hovered) ? ImGuiCol_HeaderActive : hovered ? ImGuiCol_HeaderHovered : ImGuiCol_Header); - RenderFrame(frame_bb.Min, frame_bb.Max, bg_col, true, style.FrameRounding); - RenderNavHighlight(frame_bb, id, nav_highlight_flags); - if (flags & ImGuiTreeNodeFlags_Bullet) - RenderBullet(window->DrawList, ImVec2(text_pos.x - text_offset_x * 0.60f, text_pos.y + g.FontSize * 0.5f), text_col); - else if (!is_leaf) - RenderArrow(window->DrawList, ImVec2(text_pos.x - text_offset_x + padding.x, text_pos.y), text_col, is_open ? ImGuiDir_Down : ImGuiDir_Right, 1.0f); - else // Leaf without bullet, left-adjusted text - text_pos.x -= text_offset_x; - if (flags & ImGuiTreeNodeFlags_ClipLabelForTrailingButton) - frame_bb.Max.x -= g.FontSize + style.FramePadding.x; - if (g.LogEnabled) + const ImU32 text_col = GetColorU32(ImGuiCol_Text); + ImGuiNavRenderCursorFlags nav_render_cursor_flags = ImGuiNavRenderCursorFlags_Compact; + if (is_multi_select) + nav_render_cursor_flags |= ImGuiNavRenderCursorFlags_AlwaysDraw; // Always show the nav rectangle + if (display_frame) { - // NB: '##' is normally used to hide text (as a library-wide feature), so we need to specify the text range to make sure the ## aren't stripped out here. - const char log_prefix[] = "\n##"; - const char log_suffix[] = "##"; - LogRenderedText(&text_pos, log_prefix, log_prefix+3); - RenderTextClipped(text_pos, frame_bb.Max, label, label_end, &label_size); - LogRenderedText(&text_pos, log_suffix, log_suffix+2); + // Framed type + const ImU32 bg_col = GetColorU32((held && hovered) ? ImGuiCol_HeaderActive : hovered ? ImGuiCol_HeaderHovered : ImGuiCol_Header); + RenderFrame(frame_bb.Min, frame_bb.Max, bg_col, true, style.FrameRounding); + RenderNavCursor(frame_bb, id, nav_render_cursor_flags); + if (flags & ImGuiTreeNodeFlags_Bullet) + RenderBullet(window->DrawList, ImVec2(text_pos.x - text_offset_x * 0.60f, text_pos.y + g.FontSize * 0.5f), text_col); + else if (!is_leaf) + RenderArrow(window->DrawList, ImVec2(text_pos.x - text_offset_x + padding.x, text_pos.y), text_col, is_open ? ((flags & ImGuiTreeNodeFlags_UpsideDownArrow) ? ImGuiDir_Up : ImGuiDir_Down) : ImGuiDir_Right, 1.0f); + else // Leaf without bullet, left-adjusted text + text_pos.x -= text_offset_x - padding.x; + if (flags & ImGuiTreeNodeFlags_ClipLabelForTrailingButton) + frame_bb.Max.x -= g.FontSize + style.FramePadding.x; + if (g.LogEnabled) + LogSetNextTextDecoration("###", "###"); } else { + // Unframed typed for tree nodes + if (hovered || selected) + { + const ImU32 bg_col = GetColorU32((held && hovered) ? ImGuiCol_HeaderActive : hovered ? ImGuiCol_HeaderHovered : ImGuiCol_Header); + RenderFrame(frame_bb.Min, frame_bb.Max, bg_col, false); + } + RenderNavCursor(frame_bb, id, nav_render_cursor_flags); + if (flags & ImGuiTreeNodeFlags_Bullet) + RenderBullet(window->DrawList, ImVec2(text_pos.x - text_offset_x * 0.5f, text_pos.y + g.FontSize * 0.5f), text_col); + else if (!is_leaf) + RenderArrow(window->DrawList, ImVec2(text_pos.x - text_offset_x + padding.x, text_pos.y + g.FontSize * 0.15f), text_col, is_open ? ((flags & ImGuiTreeNodeFlags_UpsideDownArrow) ? ImGuiDir_Up : ImGuiDir_Down) : ImGuiDir_Right, 0.70f); + if (g.LogEnabled) + LogSetNextTextDecoration(">", NULL); + } + + if (span_all_columns && !span_all_columns_label) + TablePopBackgroundChannel(); + + // Label + if (display_frame) RenderTextClipped(text_pos, frame_bb.Max, label, label_end, &label_size); - } - } - else - { - // Unframed typed for tree nodes - if (hovered || selected) - { - const ImU32 bg_col = GetColorU32((held && hovered) ? ImGuiCol_HeaderActive : hovered ? ImGuiCol_HeaderHovered : ImGuiCol_Header); - RenderFrame(frame_bb.Min, frame_bb.Max, bg_col, false); - RenderNavHighlight(frame_bb, id, nav_highlight_flags); - } - if (flags & ImGuiTreeNodeFlags_Bullet) - RenderBullet(window->DrawList, ImVec2(text_pos.x - text_offset_x * 0.5f, text_pos.y + g.FontSize * 0.5f), text_col); - else if (!is_leaf) - RenderArrow(window->DrawList, ImVec2(text_pos.x - text_offset_x + padding.x, text_pos.y + g.FontSize * 0.15f), text_col, is_open ? ImGuiDir_Down : ImGuiDir_Right, 0.70f); - if (g.LogEnabled) - LogRenderedText(&text_pos, ">"); - RenderText(text_pos, label, label_end, false); + else + RenderText(text_pos, label, label_end, false); + + if (span_all_columns_label) + TablePopBackgroundChannel(); } + if (store_tree_node_stack_data && is_open) + TreeNodeStoreStackData(flags); // Call before TreePushOverrideID() if (is_open && !(flags & ImGuiTreeNodeFlags_NoTreePushOnOpen)) - TreePushOverrideID(id); - IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.ItemFlags | (is_leaf ? 0 : ImGuiItemStatusFlags_Openable) | (is_open ? ImGuiItemStatusFlags_Opened : 0)); + TreePushOverrideID(id); // Could use TreePush(label) but this avoid computing twice + + IMGUI_TEST_ENGINE_ITEM_INFO(id, label, g.LastItemData.StatusFlags | (is_leaf ? 0 : ImGuiItemStatusFlags_Openable) | (is_open ? ImGuiItemStatusFlags_Opened : 0)); return is_open; } @@ -5364,7 +6838,7 @@ void ImGui::TreePush(const char* str_id) ImGuiWindow* window = GetCurrentWindow(); Indent(); window->DC.TreeDepth++; - PushID(str_id ? str_id : "#TreePush"); + PushID(str_id); } void ImGui::TreePush(const void* ptr_id) @@ -5372,15 +6846,16 @@ void ImGui::TreePush(const void* ptr_id) ImGuiWindow* window = GetCurrentWindow(); Indent(); window->DC.TreeDepth++; - PushID(ptr_id ? ptr_id : (const void*)"#TreePush"); + PushID(ptr_id); } void ImGui::TreePushOverrideID(ImGuiID id) { - ImGuiWindow* window = GetCurrentWindow(); + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; Indent(); window->DC.TreeDepth++; - window->IDStack.push_back(id); + PushOverrideID(id); } void ImGui::TreePop() @@ -5392,14 +6867,19 @@ void ImGui::TreePop() window->DC.TreeDepth--; ImU32 tree_depth_mask = (1 << window->DC.TreeDepth); - // Handle Left arrow to move to parent tree node (when ImGuiTreeNodeFlags_NavLeftJumpsBackHere is enabled) - if (g.NavMoveDir == ImGuiDir_Left && g.NavWindow == window && NavMoveRequestButNoResultYet()) - if (g.NavIdIsAlive && (window->DC.TreeMayJumpToParentOnPopMask & tree_depth_mask)) + if (window->DC.TreeHasStackDataDepthMask & tree_depth_mask) // Only set during request + { + ImGuiTreeNodeStackData* data = &g.TreeNodeStack.back(); + IM_ASSERT(data->ID == window->IDStack.back()); + if (data->TreeFlags & ImGuiTreeNodeFlags_NavLeftJumpsBackHere) { - SetNavID(window->IDStack.back(), g.NavLayer); - NavMoveRequestCancel(); + // Handle Left arrow to move to parent tree node (when ImGuiTreeNodeFlags_NavLeftJumpsBackHere is enabled) + if (g.NavIdIsAlive && g.NavMoveDir == ImGuiDir_Left && g.NavWindow == window && NavMoveRequestButNoResultYet()) + NavMoveRequestResolveWithPastTreeNode(&g.NavMoveResultLocal, data); } - window->DC.TreeMayJumpToParentOnPopMask &= tree_depth_mask - 1; + g.TreeNodeStack.pop_back(); + window->DC.TreeHasStackDataDepthMask &= ~tree_depth_mask; + } IM_ASSERT(window->IDStack.Size > 1); // There should always be 1 element in the IDStack (pushed during window creation). If this triggers you called TreePop/PopID too much. PopID(); @@ -5418,9 +6898,19 @@ void ImGui::SetNextItemOpen(bool is_open, ImGuiCond cond) ImGuiContext& g = *GImGui; if (g.CurrentWindow->SkipItems) return; - g.NextItemData.Flags |= ImGuiNextItemDataFlags_HasOpen; + g.NextItemData.HasFlags |= ImGuiNextItemDataFlags_HasOpen; g.NextItemData.OpenVal = is_open; - g.NextItemData.OpenCond = cond ? cond : ImGuiCond_Always; + g.NextItemData.OpenCond = (ImU8)(cond ? cond : ImGuiCond_Always); +} + +// Set next TreeNode/CollapsingHeader storage id. +void ImGui::SetNextItemStorageID(ImGuiID storage_id) +{ + ImGuiContext& g = *GImGui; + if (g.CurrentWindow->SkipItems) + return; + g.NextItemData.HasFlags |= ImGuiNextItemDataFlags_HasStorageID; + g.NextItemData.StorageId = storage_id; } // CollapsingHeader returns true when opened but do not indent nor push into the ID stack (because of the ImGuiTreeNodeFlags_NoTreePushOnOpen flag). @@ -5430,35 +6920,42 @@ bool ImGui::CollapsingHeader(const char* label, ImGuiTreeNodeFlags flags) ImGuiWindow* window = GetCurrentWindow(); if (window->SkipItems) return false; - - return TreeNodeBehavior(window->GetID(label), flags | ImGuiTreeNodeFlags_CollapsingHeader, label); + ImGuiID id = window->GetID(label); + return TreeNodeBehavior(id, flags | ImGuiTreeNodeFlags_CollapsingHeader, label); } -bool ImGui::CollapsingHeader(const char* label, bool* p_open, ImGuiTreeNodeFlags flags) +// p_visible == NULL : regular collapsing header +// p_visible != NULL && *p_visible == true : show a small close button on the corner of the header, clicking the button will set *p_visible = false +// p_visible != NULL && *p_visible == false : do not show the header at all +// Do not mistake this with the Open state of the header itself, which you can adjust with SetNextItemOpen() or ImGuiTreeNodeFlags_DefaultOpen. +bool ImGui::CollapsingHeader(const char* label, bool* p_visible, ImGuiTreeNodeFlags flags) { ImGuiWindow* window = GetCurrentWindow(); if (window->SkipItems) return false; - if (p_open && !*p_open) + if (p_visible && !*p_visible) return false; ImGuiID id = window->GetID(label); - flags |= ImGuiTreeNodeFlags_CollapsingHeader | (p_open ? ImGuiTreeNodeFlags_AllowItemOverlap | ImGuiTreeNodeFlags_ClipLabelForTrailingButton : 0); + flags |= ImGuiTreeNodeFlags_CollapsingHeader; + if (p_visible) + flags |= ImGuiTreeNodeFlags_AllowOverlap | (ImGuiTreeNodeFlags)ImGuiTreeNodeFlags_ClipLabelForTrailingButton; bool is_open = TreeNodeBehavior(id, flags, label); - if (p_open) + if (p_visible != NULL) { // Create a small overlapping close button // FIXME: We can evolve this into user accessible helpers to add extra buttons on title bars, headers, etc. // FIXME: CloseButton can overlap into text, need find a way to clip the text somehow. ImGuiContext& g = *GImGui; - ImGuiItemHoveredDataBackup last_item_backup; + ImGuiLastItemData last_item_backup = g.LastItemData; float button_size = g.FontSize; - float button_x = ImMax(window->DC.LastItemRect.Min.x, window->DC.LastItemRect.Max.x - g.Style.FramePadding.x * 2.0f - button_size); - float button_y = window->DC.LastItemRect.Min.y; - if (CloseButton(window->GetID((void*)((intptr_t)id + 1)), ImVec2(button_x, button_y))) - *p_open = false; - last_item_backup.Restore(); + float button_x = ImMax(g.LastItemData.Rect.Min.x, g.LastItemData.Rect.Max.x - g.Style.FramePadding.x - button_size); + float button_y = g.LastItemData.Rect.Min.y + g.Style.FramePadding.y; + ImGuiID close_button_id = GetIDWithSeed("#CLOSE", NULL, id); + if (CloseButton(close_button_id, ImVec2(button_x, button_y))) + *p_visible = false; + g.LastItemData = last_item_backup; } return is_open; @@ -5470,8 +6967,10 @@ bool ImGui::CollapsingHeader(const char* label, bool* p_open, ImGuiTreeNodeFlags // - Selectable() //------------------------------------------------------------------------- -// Tip: pass a non-visible label (e.g. "##dummy") then you can use the space to draw other text or image. +// Tip: pass a non-visible label (e.g. "##hello") then you can use the space to draw other text or image. // But you need to make sure the ID is unique, e.g. enclose calls in PushID/PopID or use ##unique_id. +// With this scheme, ImGuiSelectableFlags_SpanAllColumns and ImGuiSelectableFlags_AllowOverlap are also frequently used flags. +// FIXME: Selectable() with (size.x == 0.0f) and (SelectableTextAlign.x > 0.0f) followed by SameLine() is currently not supported. bool ImGui::Selectable(const char* label, bool selected, ImGuiSelectableFlags flags, const ImVec2& size_arg) { ImGuiWindow* window = GetCurrentWindow(); @@ -5481,116 +6980,176 @@ bool ImGui::Selectable(const char* label, bool selected, ImGuiSelectableFlags fl ImGuiContext& g = *GImGui; const ImGuiStyle& style = g.Style; - if ((flags & ImGuiSelectableFlags_SpanAllColumns) && window->DC.CurrentColumns) // FIXME-OPT: Avoid if vertically clipped. - PushColumnsBackground(); - + // Submit label or explicit size to ItemSize(), whereas ItemAdd() will submit a larger/spanning rectangle. ImGuiID id = window->GetID(label); ImVec2 label_size = CalcTextSize(label, NULL, true); ImVec2 size(size_arg.x != 0.0f ? size_arg.x : label_size.x, size_arg.y != 0.0f ? size_arg.y : label_size.y); ImVec2 pos = window->DC.CursorPos; pos.y += window->DC.CurrLineTextBaseOffset; - ImRect bb_inner(pos, pos + size); - ItemSize(size); + ItemSize(size, 0.0f); - // Fill horizontal space. - ImVec2 window_padding = window->WindowPadding; - float max_x = (flags & ImGuiSelectableFlags_SpanAllColumns) ? GetWindowContentRegionMax().x : GetContentRegionMax().x; - float w_draw = ImMax(label_size.x, window->Pos.x + max_x - window_padding.x - pos.x); - ImVec2 size_draw((size_arg.x != 0 && !(flags & ImGuiSelectableFlags_DrawFillAvailWidth)) ? size_arg.x : w_draw, size_arg.y != 0.0f ? size_arg.y : size.y); - ImRect bb(pos, pos + size_draw); - if (size_arg.x == 0.0f || (flags & ImGuiSelectableFlags_DrawFillAvailWidth)) - bb.Max.x += window_padding.x; + // Fill horizontal space + // We don't support (size < 0.0f) in Selectable() because the ItemSpacing extension would make explicitly right-aligned sizes not visibly match other widgets. + const bool span_all_columns = (flags & ImGuiSelectableFlags_SpanAllColumns) != 0; + const float min_x = span_all_columns ? window->ParentWorkRect.Min.x : pos.x; + const float max_x = span_all_columns ? window->ParentWorkRect.Max.x : window->WorkRect.Max.x; + if (size_arg.x == 0.0f || (flags & ImGuiSelectableFlags_SpanAvailWidth)) + size.x = ImMax(label_size.x, max_x - min_x); - // Selectables are tightly packed together so we extend the box to cover spacing between selectable. - const float spacing_x = style.ItemSpacing.x; - const float spacing_y = style.ItemSpacing.y; - const float spacing_L = (float)(int)(spacing_x * 0.50f); - const float spacing_U = (float)(int)(spacing_y * 0.50f); - bb.Min.x -= spacing_L; - bb.Min.y -= spacing_U; - bb.Max.x += (spacing_x - spacing_L); - bb.Max.y += (spacing_y - spacing_U); - - bool item_add; - if (flags & ImGuiSelectableFlags_Disabled) + // Selectables are meant to be tightly packed together with no click-gap, so we extend their box to cover spacing between selectable. + // FIXME: Not part of layout so not included in clipper calculation, but ItemSize currently doesn't allow offsetting CursorPos. + ImRect bb(min_x, pos.y, min_x + size.x, pos.y + size.y); + if ((flags & ImGuiSelectableFlags_NoPadWithHalfSpacing) == 0) { - ImGuiItemFlags backup_item_flags = window->DC.ItemFlags; - window->DC.ItemFlags |= ImGuiItemFlags_Disabled | ImGuiItemFlags_NoNavDefaultFocus; - item_add = ItemAdd(bb, id); - window->DC.ItemFlags = backup_item_flags; + const float spacing_x = span_all_columns ? 0.0f : style.ItemSpacing.x; + const float spacing_y = style.ItemSpacing.y; + const float spacing_L = IM_TRUNC(spacing_x * 0.50f); + const float spacing_U = IM_TRUNC(spacing_y * 0.50f); + bb.Min.x -= spacing_L; + bb.Min.y -= spacing_U; + bb.Max.x += (spacing_x - spacing_L); + bb.Max.y += (spacing_y - spacing_U); + } + //if (g.IO.KeyCtrl) { GetForegroundDrawList()->AddRect(bb.Min, bb.Max, IM_COL32(0, 255, 0, 255)); } + + const bool disabled_item = (flags & ImGuiSelectableFlags_Disabled) != 0; + const ImGuiItemFlags extra_item_flags = disabled_item ? (ImGuiItemFlags)ImGuiItemFlags_Disabled : ImGuiItemFlags_None; + bool is_visible; + if (span_all_columns) + { + // Modify ClipRect for the ItemAdd(), faster than doing a PushColumnsBackground/PushTableBackgroundChannel for every Selectable.. + const float backup_clip_rect_min_x = window->ClipRect.Min.x; + const float backup_clip_rect_max_x = window->ClipRect.Max.x; + window->ClipRect.Min.x = window->ParentWorkRect.Min.x; + window->ClipRect.Max.x = window->ParentWorkRect.Max.x; + is_visible = ItemAdd(bb, id, NULL, extra_item_flags); + window->ClipRect.Min.x = backup_clip_rect_min_x; + window->ClipRect.Max.x = backup_clip_rect_max_x; } else { - item_add = ItemAdd(bb, id); + is_visible = ItemAdd(bb, id, NULL, extra_item_flags); } - if (!item_add) + + const bool is_multi_select = (g.LastItemData.ItemFlags & ImGuiItemFlags_IsMultiSelect) != 0; + if (!is_visible) + if (!is_multi_select || !g.BoxSelectState.UnclipMode || !g.BoxSelectState.UnclipRect.Overlaps(bb)) // Extra layer of "no logic clip" for box-select support (would be more overhead to add to ItemAdd) + return false; + + const bool disabled_global = (g.CurrentItemFlags & ImGuiItemFlags_Disabled) != 0; + if (disabled_item && !disabled_global) // Only testing this as an optimization + BeginDisabled(); + + // FIXME: We can standardize the behavior of those two, we could also keep the fast path of override ClipRect + full push on render only, + // which would be advantageous since most selectable are not selected. + if (span_all_columns) { - if ((flags & ImGuiSelectableFlags_SpanAllColumns) && window->DC.CurrentColumns) - PopColumnsBackground(); - return false; + if (g.CurrentTable) + TablePushBackgroundChannel(); + else if (window->DC.CurrentColumns) + PushColumnsBackground(); + g.LastItemData.StatusFlags |= ImGuiItemStatusFlags_HasClipRect; + g.LastItemData.ClipRect = window->ClipRect; } // We use NoHoldingActiveID on menus so user can click and _hold_ on a menu then drag to browse child entries ImGuiButtonFlags button_flags = 0; - if (flags & ImGuiSelectableFlags_NoHoldingActiveID) button_flags |= ImGuiButtonFlags_NoHoldingActiveID; - if (flags & ImGuiSelectableFlags_PressedOnClick) button_flags |= ImGuiButtonFlags_PressedOnClick; - if (flags & ImGuiSelectableFlags_PressedOnRelease) button_flags |= ImGuiButtonFlags_PressedOnRelease; - if (flags & ImGuiSelectableFlags_Disabled) button_flags |= ImGuiButtonFlags_Disabled; - if (flags & ImGuiSelectableFlags_AllowDoubleClick) button_flags |= ImGuiButtonFlags_PressedOnClickRelease | ImGuiButtonFlags_PressedOnDoubleClick; - if (flags & ImGuiSelectableFlags_AllowItemOverlap) button_flags |= ImGuiButtonFlags_AllowItemOverlap; - - if (flags & ImGuiSelectableFlags_Disabled) - selected = false; + if (flags & ImGuiSelectableFlags_NoHoldingActiveID) { button_flags |= ImGuiButtonFlags_NoHoldingActiveId; } + if (flags & ImGuiSelectableFlags_NoSetKeyOwner) { button_flags |= ImGuiButtonFlags_NoSetKeyOwner; } + if (flags & ImGuiSelectableFlags_SelectOnClick) { button_flags |= ImGuiButtonFlags_PressedOnClick; } + if (flags & ImGuiSelectableFlags_SelectOnRelease) { button_flags |= ImGuiButtonFlags_PressedOnRelease; } + if (flags & ImGuiSelectableFlags_AllowDoubleClick) { button_flags |= ImGuiButtonFlags_PressedOnClickRelease | ImGuiButtonFlags_PressedOnDoubleClick; } + if ((flags & ImGuiSelectableFlags_AllowOverlap) || (g.LastItemData.ItemFlags & ImGuiItemFlags_AllowOverlap)) { button_flags |= ImGuiButtonFlags_AllowOverlap; } + // Multi-selection support (header) const bool was_selected = selected; + if (is_multi_select) + { + // Handle multi-select + alter button flags for it + MultiSelectItemHeader(id, &selected, &button_flags); + } + bool hovered, held; bool pressed = ButtonBehavior(bb, id, &hovered, &held, button_flags); - // Update NavId when clicking or when Hovering (this doesn't happen on most widgets), so navigation can be resumed with gamepad/keyboard + // Multi-selection support (footer) + if (is_multi_select) + { + MultiSelectItemFooter(id, &selected, &pressed); + } + else + { + // Auto-select when moved into + // - This will be more fully fleshed in the range-select branch + // - This is not exposed as it won't nicely work with some user side handling of shift/control + // - We cannot do 'if (g.NavJustMovedToId != id) { selected = false; pressed = was_selected; }' for two reasons + // - (1) it would require focus scope to be set, need exposing PushFocusScope() or equivalent (e.g. BeginSelection() calling PushFocusScope()) + // - (2) usage will fail with clipped items + // The multi-select API aim to fix those issues, e.g. may be replaced with a BeginSelection() API. + if ((flags & ImGuiSelectableFlags_SelectOnNav) && g.NavJustMovedToId != 0 && g.NavJustMovedToFocusScopeId == g.CurrentFocusScopeId) + if (g.NavJustMovedToId == id) + selected = pressed = true; + } + + // Update NavId when clicking or when Hovering (this doesn't happen on most widgets), so navigation can be resumed with keyboard/gamepad if (pressed || (hovered && (flags & ImGuiSelectableFlags_SetNavIdOnHover))) { - if (!g.NavDisableMouseHover && g.NavWindow == window && g.NavLayer == window->DC.NavLayerCurrent) + if (!g.NavHighlightItemUnderNav && g.NavWindow == window && g.NavLayer == window->DC.NavLayerCurrent) { - g.NavDisableHighlight = true; - SetNavID(id, window->DC.NavLayerCurrent); + SetNavID(id, window->DC.NavLayerCurrent, g.CurrentFocusScopeId, WindowRectAbsToRel(window, bb)); // (bb == NavRect) + if (g.IO.ConfigNavCursorVisibleAuto) + g.NavCursorVisible = false; } } if (pressed) MarkItemEdited(id); - if (flags & ImGuiSelectableFlags_AllowItemOverlap) - SetItemAllowOverlap(); - - // In this branch, Selectable() cannot toggle the selection so this will never trigger. - if (selected != was_selected) //-V547 - window->DC.LastItemStatusFlags |= ImGuiItemStatusFlags_ToggledSelection; + if (selected != was_selected) + g.LastItemData.StatusFlags |= ImGuiItemStatusFlags_ToggledSelection; // Render - if (held && (flags & ImGuiSelectableFlags_DrawHoveredWhenHeld)) - hovered = true; - if (hovered || selected) + if (is_visible) { - const ImU32 col = GetColorU32((held && hovered) ? ImGuiCol_HeaderActive : hovered ? ImGuiCol_HeaderHovered : ImGuiCol_Header); - RenderFrame(bb.Min, bb.Max, col, false, 0.0f); - RenderNavHighlight(bb, id, ImGuiNavHighlightFlags_TypeThin | ImGuiNavHighlightFlags_NoRounding); + const bool highlighted = hovered || (flags & ImGuiSelectableFlags_Highlight); + if (highlighted || selected) + { + // Between 1.91.0 and 1.91.4 we made selected Selectable use an arbitrary lerp between _Header and _HeaderHovered. Removed that now. (#8106) + ImU32 col = GetColorU32((held && highlighted) ? ImGuiCol_HeaderActive : highlighted ? ImGuiCol_HeaderHovered : ImGuiCol_Header); + RenderFrame(bb.Min, bb.Max, col, false, 0.0f); + } + if (g.NavId == id) + { + ImGuiNavRenderCursorFlags nav_render_cursor_flags = ImGuiNavRenderCursorFlags_Compact | ImGuiNavRenderCursorFlags_NoRounding; + if (is_multi_select) + nav_render_cursor_flags |= ImGuiNavRenderCursorFlags_AlwaysDraw; // Always show the nav rectangle + RenderNavCursor(bb, id, nav_render_cursor_flags); + } } - if ((flags & ImGuiSelectableFlags_SpanAllColumns) && window->DC.CurrentColumns) + if (span_all_columns) { - PopColumnsBackground(); - bb.Max.x -= (GetContentRegionMax().x - max_x); + if (g.CurrentTable) + TablePopBackgroundChannel(); + else if (window->DC.CurrentColumns) + PopColumnsBackground(); } - if (flags & ImGuiSelectableFlags_Disabled) PushStyleColor(ImGuiCol_Text, style.Colors[ImGuiCol_TextDisabled]); - RenderTextClipped(bb_inner.Min, bb_inner.Max, label, NULL, &label_size, style.SelectableTextAlign, &bb); - if (flags & ImGuiSelectableFlags_Disabled) PopStyleColor(); + // Text stays at the submission position. Alignment/clipping extents ignore SpanAllColumns. + if (is_visible) + RenderTextClipped(pos, ImVec2(ImMin(pos.x + size.x, window->WorkRect.Max.x), pos.y + size.y), label, NULL, &label_size, style.SelectableTextAlign, &bb); // Automatically close popups - if (pressed && (window->Flags & ImGuiWindowFlags_Popup) && !(flags & ImGuiSelectableFlags_DontClosePopups) && !(window->DC.ItemFlags & ImGuiItemFlags_SelectableDontClosePopup)) + if (pressed && (window->Flags & ImGuiWindowFlags_Popup) && !(flags & ImGuiSelectableFlags_NoAutoClosePopups) && (g.LastItemData.ItemFlags & ImGuiItemFlags_AutoClosePopups)) CloseCurrentPopup(); - IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.ItemFlags); - return pressed; + if (disabled_item && !disabled_global) + EndDisabled(); + + // Selectable() always returns a pressed state! + // Users of BeginMultiSelect()/EndMultiSelect() scope: you may call ImGui::IsItemToggledSelection() to retrieve + // selection toggle, only useful if you need that state updated (e.g. for rendering purpose) before reaching EndMultiSelect(). + IMGUI_TEST_ENGINE_ITEM_INFO(id, label, g.LastItemData.StatusFlags); + return pressed; //-V1020 } bool ImGui::Selectable(const char* label, bool* p_selected, ImGuiSelectableFlags flags, const ImVec2& size_arg) @@ -5603,21 +7162,1145 @@ bool ImGui::Selectable(const char* label, bool* p_selected, ImGuiSelectableFlags return false; } + +//------------------------------------------------------------------------- +// [SECTION] Widgets: Typing-Select support +//------------------------------------------------------------------------- + +// [Experimental] Currently not exposed in public API. +// Consume character inputs and return search request, if any. +// This would typically only be called on the focused window or location you want to grab inputs for, e.g. +// if (ImGui::IsWindowFocused(...)) +// if (ImGuiTypingSelectRequest* req = ImGui::GetTypingSelectRequest()) +// focus_idx = ImGui::TypingSelectFindMatch(req, my_items.size(), [](void*, int n) { return my_items[n]->Name; }, &my_items, -1); +// However the code is written in a way where calling it from multiple locations is safe (e.g. to obtain buffer). +ImGuiTypingSelectRequest* ImGui::GetTypingSelectRequest(ImGuiTypingSelectFlags flags) +{ + ImGuiContext& g = *GImGui; + ImGuiTypingSelectState* data = &g.TypingSelectState; + ImGuiTypingSelectRequest* out_request = &data->Request; + + // Clear buffer + const float TYPING_SELECT_RESET_TIMER = 1.80f; // FIXME: Potentially move to IO config. + const int TYPING_SELECT_SINGLE_CHAR_COUNT_FOR_LOCK = 4; // Lock single char matching when repeating same char 4 times + if (data->SearchBuffer[0] != 0) + { + bool clear_buffer = false; + clear_buffer |= (g.NavFocusScopeId != data->FocusScope); + clear_buffer |= (data->LastRequestTime + TYPING_SELECT_RESET_TIMER < g.Time); + clear_buffer |= g.NavAnyRequest; + clear_buffer |= g.ActiveId != 0 && g.NavActivateId == 0; // Allow temporary SPACE activation to not interfere + clear_buffer |= IsKeyPressed(ImGuiKey_Escape) || IsKeyPressed(ImGuiKey_Enter); + clear_buffer |= IsKeyPressed(ImGuiKey_Backspace) && (flags & ImGuiTypingSelectFlags_AllowBackspace) == 0; + //if (clear_buffer) { IMGUI_DEBUG_LOG("GetTypingSelectRequest(): Clear SearchBuffer.\n"); } + if (clear_buffer) + data->Clear(); + } + + // Append to buffer + const int buffer_max_len = IM_ARRAYSIZE(data->SearchBuffer) - 1; + int buffer_len = (int)ImStrlen(data->SearchBuffer); + bool select_request = false; + for (ImWchar w : g.IO.InputQueueCharacters) + { + const int w_len = ImTextCountUtf8BytesFromStr(&w, &w + 1); + if (w < 32 || (buffer_len == 0 && ImCharIsBlankW(w)) || (buffer_len + w_len > buffer_max_len)) // Ignore leading blanks + continue; + char w_buf[5]; + ImTextCharToUtf8(w_buf, (unsigned int)w); + if (data->SingleCharModeLock && w_len == out_request->SingleCharSize && memcmp(w_buf, data->SearchBuffer, w_len) == 0) + { + select_request = true; // Same character: don't need to append to buffer. + continue; + } + if (data->SingleCharModeLock) + { + data->Clear(); // Different character: clear + buffer_len = 0; + } + memcpy(data->SearchBuffer + buffer_len, w_buf, w_len + 1); // Append + buffer_len += w_len; + select_request = true; + } + g.IO.InputQueueCharacters.resize(0); + + // Handle backspace + if ((flags & ImGuiTypingSelectFlags_AllowBackspace) && IsKeyPressed(ImGuiKey_Backspace, ImGuiInputFlags_Repeat)) + { + char* p = (char*)(void*)ImTextFindPreviousUtf8Codepoint(data->SearchBuffer, data->SearchBuffer + buffer_len); + *p = 0; + buffer_len = (int)(p - data->SearchBuffer); + } + + // Return request if any + if (buffer_len == 0) + return NULL; + if (select_request) + { + data->FocusScope = g.NavFocusScopeId; + data->LastRequestFrame = g.FrameCount; + data->LastRequestTime = (float)g.Time; + } + out_request->Flags = flags; + out_request->SearchBufferLen = buffer_len; + out_request->SearchBuffer = data->SearchBuffer; + out_request->SelectRequest = (data->LastRequestFrame == g.FrameCount); + out_request->SingleCharMode = false; + out_request->SingleCharSize = 0; + + // Calculate if buffer contains the same character repeated. + // - This can be used to implement a special search mode on first character. + // - Performed on UTF-8 codepoint for correctness. + // - SingleCharMode is always set for first input character, because it usually leads to a "next". + if (flags & ImGuiTypingSelectFlags_AllowSingleCharMode) + { + const char* buf_begin = out_request->SearchBuffer; + const char* buf_end = out_request->SearchBuffer + out_request->SearchBufferLen; + const int c0_len = ImTextCountUtf8BytesFromChar(buf_begin, buf_end); + const char* p = buf_begin + c0_len; + for (; p < buf_end; p += c0_len) + if (memcmp(buf_begin, p, (size_t)c0_len) != 0) + break; + const int single_char_count = (p == buf_end) ? (out_request->SearchBufferLen / c0_len) : 0; + out_request->SingleCharMode = (single_char_count > 0 || data->SingleCharModeLock); + out_request->SingleCharSize = (ImS8)c0_len; + data->SingleCharModeLock |= (single_char_count >= TYPING_SELECT_SINGLE_CHAR_COUNT_FOR_LOCK); // From now on we stop search matching to lock to single char mode. + } + + return out_request; +} + +static int ImStrimatchlen(const char* s1, const char* s1_end, const char* s2) +{ + int match_len = 0; + while (s1 < s1_end && ImToUpper(*s1++) == ImToUpper(*s2++)) + match_len++; + return match_len; +} + +// Default handler for finding a result for typing-select. You may implement your own. +// You might want to display a tooltip to visualize the current request SearchBuffer +// When SingleCharMode is set: +// - it is better to NOT display a tooltip of other on-screen display indicator. +// - the index of the currently focused item is required. +// if your SetNextItemSelectionUserData() values are indices, you can obtain it from ImGuiMultiSelectIO::NavIdItem, otherwise from g.NavLastValidSelectionUserData. +int ImGui::TypingSelectFindMatch(ImGuiTypingSelectRequest* req, int items_count, const char* (*get_item_name_func)(void*, int), void* user_data, int nav_item_idx) +{ + if (req == NULL || req->SelectRequest == false) // Support NULL parameter so both calls can be done from same spot. + return -1; + int idx = -1; + if (req->SingleCharMode && (req->Flags & ImGuiTypingSelectFlags_AllowSingleCharMode)) + idx = TypingSelectFindNextSingleCharMatch(req, items_count, get_item_name_func, user_data, nav_item_idx); + else + idx = TypingSelectFindBestLeadingMatch(req, items_count, get_item_name_func, user_data); + if (idx != -1) + SetNavCursorVisibleAfterMove(); + return idx; +} + +// Special handling when a single character is repeated: perform search on a single letter and goes to next. +int ImGui::TypingSelectFindNextSingleCharMatch(ImGuiTypingSelectRequest* req, int items_count, const char* (*get_item_name_func)(void*, int), void* user_data, int nav_item_idx) +{ + // FIXME: Assume selection user data is index. Would be extremely practical. + //if (nav_item_idx == -1) + // nav_item_idx = (int)g.NavLastValidSelectionUserData; + + int first_match_idx = -1; + bool return_next_match = false; + for (int idx = 0; idx < items_count; idx++) + { + const char* item_name = get_item_name_func(user_data, idx); + if (ImStrimatchlen(req->SearchBuffer, req->SearchBuffer + req->SingleCharSize, item_name) < req->SingleCharSize) + continue; + if (return_next_match) // Return next matching item after current item. + return idx; + if (first_match_idx == -1 && nav_item_idx == -1) // Return first match immediately if we don't have a nav_item_idx value. + return idx; + if (first_match_idx == -1) // Record first match for wrapping. + first_match_idx = idx; + if (nav_item_idx == idx) // Record that we encountering nav_item so we can return next match. + return_next_match = true; + } + return first_match_idx; // First result +} + +int ImGui::TypingSelectFindBestLeadingMatch(ImGuiTypingSelectRequest* req, int items_count, const char* (*get_item_name_func)(void*, int), void* user_data) +{ + int longest_match_idx = -1; + int longest_match_len = 0; + for (int idx = 0; idx < items_count; idx++) + { + const char* item_name = get_item_name_func(user_data, idx); + const int match_len = ImStrimatchlen(req->SearchBuffer, req->SearchBuffer + req->SearchBufferLen, item_name); + if (match_len <= longest_match_len) + continue; + longest_match_idx = idx; + longest_match_len = match_len; + if (match_len == req->SearchBufferLen) + break; + } + return longest_match_idx; +} + +void ImGui::DebugNodeTypingSelectState(ImGuiTypingSelectState* data) +{ +#ifndef IMGUI_DISABLE_DEBUG_TOOLS + Text("SearchBuffer = \"%s\"", data->SearchBuffer); + Text("SingleCharMode = %d, Size = %d, Lock = %d", data->Request.SingleCharMode, data->Request.SingleCharSize, data->SingleCharModeLock); + Text("LastRequest = time: %.2f, frame: %d", data->LastRequestTime, data->LastRequestFrame); +#else + IM_UNUSED(data); +#endif +} + +//------------------------------------------------------------------------- +// [SECTION] Widgets: Box-Select support +// This has been extracted away from Multi-Select logic in the hope that it could eventually be used elsewhere, but hasn't been yet. +//------------------------------------------------------------------------- +// Extra logic in MultiSelectItemFooter() and ImGuiListClipper::Step() +//------------------------------------------------------------------------- +// - BoxSelectPreStartDrag() [Internal] +// - BoxSelectActivateDrag() [Internal] +// - BoxSelectDeactivateDrag() [Internal] +// - BoxSelectScrollWithMouseDrag() [Internal] +// - BeginBoxSelect() [Internal] +// - EndBoxSelect() [Internal] +//------------------------------------------------------------------------- + +// Call on the initial click. +static void BoxSelectPreStartDrag(ImGuiID id, ImGuiSelectionUserData clicked_item) +{ + ImGuiContext& g = *GImGui; + ImGuiBoxSelectState* bs = &g.BoxSelectState; + bs->ID = id; + bs->IsStarting = true; // Consider starting box-select. + bs->IsStartedFromVoid = (clicked_item == ImGuiSelectionUserData_Invalid); + bs->IsStartedSetNavIdOnce = bs->IsStartedFromVoid; + bs->KeyMods = g.IO.KeyMods; + bs->StartPosRel = bs->EndPosRel = ImGui::WindowPosAbsToRel(g.CurrentWindow, g.IO.MousePos); + bs->ScrollAccum = ImVec2(0.0f, 0.0f); +} + +static void BoxSelectActivateDrag(ImGuiBoxSelectState* bs, ImGuiWindow* window) +{ + ImGuiContext& g = *GImGui; + IMGUI_DEBUG_LOG_SELECTION("[selection] BeginBoxSelect() 0X%08X: Activate\n", bs->ID); + bs->IsActive = true; + bs->Window = window; + bs->IsStarting = false; + ImGui::SetActiveID(bs->ID, window); + ImGui::SetActiveIdUsingAllKeyboardKeys(); + if (bs->IsStartedFromVoid && (bs->KeyMods & (ImGuiMod_Ctrl | ImGuiMod_Shift)) == 0) + bs->RequestClear = true; +} + +static void BoxSelectDeactivateDrag(ImGuiBoxSelectState* bs) +{ + ImGuiContext& g = *GImGui; + bs->IsActive = bs->IsStarting = false; + if (g.ActiveId == bs->ID) + { + IMGUI_DEBUG_LOG_SELECTION("[selection] BeginBoxSelect() 0X%08X: Deactivate\n", bs->ID); + ImGui::ClearActiveID(); + } + bs->ID = 0; +} + +static void BoxSelectScrollWithMouseDrag(ImGuiBoxSelectState* bs, ImGuiWindow* window, const ImRect& inner_r) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(bs->Window == window); + for (int n = 0; n < 2; n++) // each axis + { + const float mouse_pos = g.IO.MousePos[n]; + const float dist = (mouse_pos > inner_r.Max[n]) ? mouse_pos - inner_r.Max[n] : (mouse_pos < inner_r.Min[n]) ? mouse_pos - inner_r.Min[n] : 0.0f; + const float scroll_curr = window->Scroll[n]; + if (dist == 0.0f || (dist < 0.0f && scroll_curr < 0.0f) || (dist > 0.0f && scroll_curr >= window->ScrollMax[n])) + continue; + + const float speed_multiplier = ImLinearRemapClamp(g.FontSize, g.FontSize * 5.0f, 1.0f, 4.0f, ImAbs(dist)); // x1 to x4 depending on distance + const float scroll_step = g.FontSize * 35.0f * speed_multiplier * ImSign(dist) * g.IO.DeltaTime; + bs->ScrollAccum[n] += scroll_step; + + // Accumulate into a stored value so we can handle high-framerate + const float scroll_step_i = ImFloor(bs->ScrollAccum[n]); + if (scroll_step_i == 0.0f) + continue; + if (n == 0) + ImGui::SetScrollX(window, scroll_curr + scroll_step_i); + else + ImGui::SetScrollY(window, scroll_curr + scroll_step_i); + bs->ScrollAccum[n] -= scroll_step_i; + } +} + +bool ImGui::BeginBoxSelect(const ImRect& scope_rect, ImGuiWindow* window, ImGuiID box_select_id, ImGuiMultiSelectFlags ms_flags) +{ + ImGuiContext& g = *GImGui; + ImGuiBoxSelectState* bs = &g.BoxSelectState; + KeepAliveID(box_select_id); + if (bs->ID != box_select_id) + return false; + + // IsStarting is set by MultiSelectItemFooter() when considering a possible box-select. We validate it here and lock geometry. + bs->UnclipMode = false; + bs->RequestClear = false; + if (bs->IsStarting && IsMouseDragPastThreshold(0)) + BoxSelectActivateDrag(bs, window); + else if ((bs->IsStarting || bs->IsActive) && g.IO.MouseDown[0] == false) + BoxSelectDeactivateDrag(bs); + if (!bs->IsActive) + return false; + + // Current frame absolute prev/current rectangles are used to toggle selection. + // They are derived from positions relative to scrolling space. + ImVec2 start_pos_abs = WindowPosRelToAbs(window, bs->StartPosRel); + ImVec2 prev_end_pos_abs = WindowPosRelToAbs(window, bs->EndPosRel); // Clamped already + ImVec2 curr_end_pos_abs = g.IO.MousePos; + if (ms_flags & ImGuiMultiSelectFlags_ScopeWindow) // Box-select scrolling only happens with ScopeWindow + curr_end_pos_abs = ImClamp(curr_end_pos_abs, scope_rect.Min, scope_rect.Max); + bs->BoxSelectRectPrev.Min = ImMin(start_pos_abs, prev_end_pos_abs); + bs->BoxSelectRectPrev.Max = ImMax(start_pos_abs, prev_end_pos_abs); + bs->BoxSelectRectCurr.Min = ImMin(start_pos_abs, curr_end_pos_abs); + bs->BoxSelectRectCurr.Max = ImMax(start_pos_abs, curr_end_pos_abs); + + // Box-select 2D mode detects horizontal changes (vertical ones are already picked by Clipper) + // Storing an extra rect used by widgets supporting box-select. + if (ms_flags & ImGuiMultiSelectFlags_BoxSelect2d) + if (bs->BoxSelectRectPrev.Min.x != bs->BoxSelectRectCurr.Min.x || bs->BoxSelectRectPrev.Max.x != bs->BoxSelectRectCurr.Max.x) + { + bs->UnclipMode = true; + bs->UnclipRect = bs->BoxSelectRectPrev; // FIXME-OPT: UnclipRect x coordinates could be intersection of Prev and Curr rect on X axis. + bs->UnclipRect.Add(bs->BoxSelectRectCurr); + } + + //GetForegroundDrawList()->AddRect(bs->UnclipRect.Min, bs->UnclipRect.Max, IM_COL32(255,0,0,200), 0.0f, 0, 3.0f); + //GetForegroundDrawList()->AddRect(bs->BoxSelectRectPrev.Min, bs->BoxSelectRectPrev.Max, IM_COL32(255,0,0,200), 0.0f, 0, 3.0f); + //GetForegroundDrawList()->AddRect(bs->BoxSelectRectCurr.Min, bs->BoxSelectRectCurr.Max, IM_COL32(0,255,0,200), 0.0f, 0, 1.0f); + return true; +} + +void ImGui::EndBoxSelect(const ImRect& scope_rect, ImGuiMultiSelectFlags ms_flags) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + ImGuiBoxSelectState* bs = &g.BoxSelectState; + IM_ASSERT(bs->IsActive); + bs->UnclipMode = false; + + // Render selection rectangle + bs->EndPosRel = WindowPosAbsToRel(window, ImClamp(g.IO.MousePos, scope_rect.Min, scope_rect.Max)); // Clamp stored position according to current scrolling view + ImRect box_select_r = bs->BoxSelectRectCurr; + box_select_r.ClipWith(scope_rect); + window->DrawList->AddRectFilled(box_select_r.Min, box_select_r.Max, GetColorU32(ImGuiCol_SeparatorHovered, 0.30f)); // FIXME-MULTISELECT: Styling + window->DrawList->AddRect(box_select_r.Min, box_select_r.Max, GetColorU32(ImGuiCol_NavCursor)); // FIXME-MULTISELECT: Styling + + // Scroll + const bool enable_scroll = (ms_flags & ImGuiMultiSelectFlags_ScopeWindow) && (ms_flags & ImGuiMultiSelectFlags_BoxSelectNoScroll) == 0; + if (enable_scroll) + { + ImRect scroll_r = scope_rect; + scroll_r.Expand(-g.FontSize); + //GetForegroundDrawList()->AddRect(scroll_r.Min, scroll_r.Max, IM_COL32(0, 255, 0, 255)); + if (!scroll_r.Contains(g.IO.MousePos)) + BoxSelectScrollWithMouseDrag(bs, window, scroll_r); + } +} + +//------------------------------------------------------------------------- +// [SECTION] Widgets: Multi-Select support +//------------------------------------------------------------------------- +// - DebugLogMultiSelectRequests() [Internal] +// - CalcScopeRect() [Internal] +// - BeginMultiSelect() +// - EndMultiSelect() +// - SetNextItemSelectionUserData() +// - MultiSelectItemHeader() [Internal] +// - MultiSelectItemFooter() [Internal] +// - DebugNodeMultiSelectState() [Internal] +//------------------------------------------------------------------------- + +static void DebugLogMultiSelectRequests(const char* function, const ImGuiMultiSelectIO* io) +{ + ImGuiContext& g = *GImGui; + IM_UNUSED(function); + for (const ImGuiSelectionRequest& req : io->Requests) + { + if (req.Type == ImGuiSelectionRequestType_SetAll) IMGUI_DEBUG_LOG_SELECTION("[selection] %s: Request: SetAll %d (= %s)\n", function, req.Selected, req.Selected ? "SelectAll" : "Clear"); + if (req.Type == ImGuiSelectionRequestType_SetRange) IMGUI_DEBUG_LOG_SELECTION("[selection] %s: Request: SetRange %" IM_PRId64 "..%" IM_PRId64 " (0x%" IM_PRIX64 "..0x%" IM_PRIX64 ") = %d (dir %d)\n", function, req.RangeFirstItem, req.RangeLastItem, req.RangeFirstItem, req.RangeLastItem, req.Selected, req.RangeDirection); + } +} + +static ImRect CalcScopeRect(ImGuiMultiSelectTempData* ms, ImGuiWindow* window) +{ + ImGuiContext& g = *GImGui; + if (ms->Flags & ImGuiMultiSelectFlags_ScopeRect) + { + // Warning: this depends on CursorMaxPos so it means to be called by EndMultiSelect() only + return ImRect(ms->ScopeRectMin, ImMax(window->DC.CursorMaxPos, ms->ScopeRectMin)); + } + else + { + // When a table, pull HostClipRect, which allows us to predict ClipRect before first row/layout is performed. (#7970) + ImRect scope_rect = window->InnerClipRect; + if (g.CurrentTable != NULL) + scope_rect = g.CurrentTable->HostClipRect; + + // Add inner table decoration (#7821) // FIXME: Why not baking in InnerClipRect? + scope_rect.Min = ImMin(scope_rect.Min + ImVec2(window->DecoInnerSizeX1, window->DecoInnerSizeY1), scope_rect.Max); + return scope_rect; + } +} + +// Return ImGuiMultiSelectIO structure. +// Lifetime: don't hold on ImGuiMultiSelectIO* pointers over multiple frames or past any subsequent call to BeginMultiSelect() or EndMultiSelect(). +// Passing 'selection_size' and 'items_count' parameters is currently optional. +// - 'selection_size' is useful to disable some shortcut routing: e.g. ImGuiMultiSelectFlags_ClearOnEscape won't claim Escape key when selection_size 0, +// allowing a first press to clear selection THEN the second press to leave child window and return to parent. +// - 'items_count' is stored in ImGuiMultiSelectIO which makes it a convenient way to pass the information to your ApplyRequest() handler (but you may pass it differently). +// - If they are costly for you to compute (e.g. external intrusive selection without maintaining size), you may avoid them and pass -1. +// - If you can easily tell if your selection is empty or not, you may pass 0/1, or you may enable ImGuiMultiSelectFlags_ClearOnEscape flag dynamically. +ImGuiMultiSelectIO* ImGui::BeginMultiSelect(ImGuiMultiSelectFlags flags, int selection_size, int items_count) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + + if (++g.MultiSelectTempDataStacked > g.MultiSelectTempData.Size) + g.MultiSelectTempData.resize(g.MultiSelectTempDataStacked, ImGuiMultiSelectTempData()); + ImGuiMultiSelectTempData* ms = &g.MultiSelectTempData[g.MultiSelectTempDataStacked - 1]; + IM_STATIC_ASSERT(offsetof(ImGuiMultiSelectTempData, IO) == 0); // Clear() relies on that. + g.CurrentMultiSelect = ms; + if ((flags & (ImGuiMultiSelectFlags_ScopeWindow | ImGuiMultiSelectFlags_ScopeRect)) == 0) + flags |= ImGuiMultiSelectFlags_ScopeWindow; + if (flags & ImGuiMultiSelectFlags_SingleSelect) + flags &= ~(ImGuiMultiSelectFlags_BoxSelect2d | ImGuiMultiSelectFlags_BoxSelect1d); + if (flags & ImGuiMultiSelectFlags_BoxSelect2d) + flags &= ~ImGuiMultiSelectFlags_BoxSelect1d; + + // FIXME: Workaround to the fact we override CursorMaxPos, meaning size measurement are lost. (#8250) + // They should perhaps be stacked properly? + if (ImGuiTable* table = g.CurrentTable) + if (table->CurrentColumn != -1) + TableEndCell(table); // This is currently safe to call multiple time. If that properly is lost we can extract the "save measurement" part of it. + + // FIXME: BeginFocusScope() + const ImGuiID id = window->IDStack.back(); + ms->Clear(); + ms->FocusScopeId = id; + ms->Flags = flags; + ms->IsFocused = (ms->FocusScopeId == g.NavFocusScopeId); + ms->BackupCursorMaxPos = window->DC.CursorMaxPos; + ms->ScopeRectMin = window->DC.CursorMaxPos = window->DC.CursorPos; + PushFocusScope(ms->FocusScopeId); + if (flags & ImGuiMultiSelectFlags_ScopeWindow) // Mark parent child window as navigable into, with highlight. Assume user will always submit interactive items. + window->DC.NavLayersActiveMask |= 1 << ImGuiNavLayer_Main; + + // Use copy of keyboard mods at the time of the request, otherwise we would requires mods to be held for an extra frame. + ms->KeyMods = g.NavJustMovedToId ? (g.NavJustMovedToIsTabbing ? 0 : g.NavJustMovedToKeyMods) : g.IO.KeyMods; + if (flags & ImGuiMultiSelectFlags_NoRangeSelect) + ms->KeyMods &= ~ImGuiMod_Shift; + + // Bind storage + ImGuiMultiSelectState* storage = g.MultiSelectStorage.GetOrAddByKey(id); + storage->ID = id; + storage->LastFrameActive = g.FrameCount; + storage->LastSelectionSize = selection_size; + storage->Window = window; + ms->Storage = storage; + + // Output to user + ms->IO.Requests.resize(0); + ms->IO.RangeSrcItem = storage->RangeSrcItem; + ms->IO.NavIdItem = storage->NavIdItem; + ms->IO.NavIdSelected = (storage->NavIdSelected == 1) ? true : false; + ms->IO.ItemsCount = items_count; + + // Clear when using Navigation to move within the scope + // (we compare FocusScopeId so it possible to use multiple selections inside a same window) + bool request_clear = false; + bool request_select_all = false; + if (g.NavJustMovedToId != 0 && g.NavJustMovedToFocusScopeId == ms->FocusScopeId && g.NavJustMovedToHasSelectionData) + { + if (ms->KeyMods & ImGuiMod_Shift) + ms->IsKeyboardSetRange = true; + if (ms->IsKeyboardSetRange) + IM_ASSERT(storage->RangeSrcItem != ImGuiSelectionUserData_Invalid); // Not ready -> could clear? + if ((ms->KeyMods & (ImGuiMod_Ctrl | ImGuiMod_Shift)) == 0 && (flags & (ImGuiMultiSelectFlags_NoAutoClear | ImGuiMultiSelectFlags_NoAutoSelect)) == 0) + request_clear = true; + } + else if (g.NavJustMovedFromFocusScopeId == ms->FocusScopeId) + { + // Also clear on leaving scope (may be optional?) + if ((ms->KeyMods & (ImGuiMod_Ctrl | ImGuiMod_Shift)) == 0 && (flags & (ImGuiMultiSelectFlags_NoAutoClear | ImGuiMultiSelectFlags_NoAutoSelect)) == 0) + request_clear = true; + } + + // Box-select handling: update active state. + ImGuiBoxSelectState* bs = &g.BoxSelectState; + if (flags & (ImGuiMultiSelectFlags_BoxSelect1d | ImGuiMultiSelectFlags_BoxSelect2d)) + { + ms->BoxSelectId = GetID("##BoxSelect"); + if (BeginBoxSelect(CalcScopeRect(ms, window), window, ms->BoxSelectId, flags)) + request_clear |= bs->RequestClear; + } + + if (ms->IsFocused) + { + // Shortcut: Clear selection (Escape) + // - Only claim shortcut if selection is not empty, allowing further presses on Escape to e.g. leave current child window. + // - Box select also handle Escape and needs to pass an id to bypass ActiveIdUsingAllKeyboardKeys lock. + if (flags & ImGuiMultiSelectFlags_ClearOnEscape) + { + if (selection_size != 0 || bs->IsActive) + if (Shortcut(ImGuiKey_Escape, ImGuiInputFlags_None, bs->IsActive ? bs->ID : 0)) + { + request_clear = true; + if (bs->IsActive) + BoxSelectDeactivateDrag(bs); + } + } + + // Shortcut: Select all (CTRL+A) + if (!(flags & ImGuiMultiSelectFlags_SingleSelect) && !(flags & ImGuiMultiSelectFlags_NoSelectAll)) + if (Shortcut(ImGuiMod_Ctrl | ImGuiKey_A)) + request_select_all = true; + } + + if (request_clear || request_select_all) + { + MultiSelectAddSetAll(ms, request_select_all); + if (!request_select_all) + storage->LastSelectionSize = 0; + } + ms->LoopRequestSetAll = request_select_all ? 1 : request_clear ? 0 : -1; + ms->LastSubmittedItem = ImGuiSelectionUserData_Invalid; + + if (g.DebugLogFlags & ImGuiDebugLogFlags_EventSelection) + DebugLogMultiSelectRequests("BeginMultiSelect", &ms->IO); + + return &ms->IO; +} + +// Return updated ImGuiMultiSelectIO structure. +// Lifetime: don't hold on ImGuiMultiSelectIO* pointers over multiple frames or past any subsequent call to BeginMultiSelect() or EndMultiSelect(). +ImGuiMultiSelectIO* ImGui::EndMultiSelect() +{ + ImGuiContext& g = *GImGui; + ImGuiMultiSelectTempData* ms = g.CurrentMultiSelect; + ImGuiMultiSelectState* storage = ms->Storage; + ImGuiWindow* window = g.CurrentWindow; + IM_ASSERT_USER_ERROR(ms->FocusScopeId == g.CurrentFocusScopeId, "EndMultiSelect() FocusScope mismatch!"); + IM_ASSERT(g.CurrentMultiSelect != NULL && storage->Window == g.CurrentWindow); + IM_ASSERT(g.MultiSelectTempDataStacked > 0 && &g.MultiSelectTempData[g.MultiSelectTempDataStacked - 1] == g.CurrentMultiSelect); + + ImRect scope_rect = CalcScopeRect(ms, window); + if (ms->IsFocused) + { + // We currently don't allow user code to modify RangeSrcItem by writing to BeginIO's version, but that would be an easy change here. + if (ms->IO.RangeSrcReset || (ms->RangeSrcPassedBy == false && ms->IO.RangeSrcItem != ImGuiSelectionUserData_Invalid)) // Can't read storage->RangeSrcItem here -> we want the state at begining of the scope (see tests for easy failure) + { + IMGUI_DEBUG_LOG_SELECTION("[selection] EndMultiSelect: Reset RangeSrcItem.\n"); // Will set be to NavId. + storage->RangeSrcItem = ImGuiSelectionUserData_Invalid; + } + if (ms->NavIdPassedBy == false && storage->NavIdItem != ImGuiSelectionUserData_Invalid) + { + IMGUI_DEBUG_LOG_SELECTION("[selection] EndMultiSelect: Reset NavIdItem.\n"); + storage->NavIdItem = ImGuiSelectionUserData_Invalid; + storage->NavIdSelected = -1; + } + + if ((ms->Flags & (ImGuiMultiSelectFlags_BoxSelect1d | ImGuiMultiSelectFlags_BoxSelect2d)) && GetBoxSelectState(ms->BoxSelectId)) + EndBoxSelect(scope_rect, ms->Flags); + } + + if (ms->IsEndIO == false) + ms->IO.Requests.resize(0); + + // Clear selection when clicking void? + // We specifically test for IsMouseDragPastThreshold(0) == false to allow box-selection! + // The InnerRect test is necessary for non-child/decorated windows. + bool scope_hovered = IsWindowHovered() && window->InnerRect.Contains(g.IO.MousePos); + if (scope_hovered && (ms->Flags & ImGuiMultiSelectFlags_ScopeRect)) + scope_hovered &= scope_rect.Contains(g.IO.MousePos); + if (scope_hovered && g.HoveredId == 0 && g.ActiveId == 0) + { + if (ms->Flags & (ImGuiMultiSelectFlags_BoxSelect1d | ImGuiMultiSelectFlags_BoxSelect2d)) + { + if (!g.BoxSelectState.IsActive && !g.BoxSelectState.IsStarting && g.IO.MouseClickedCount[0] == 1) + { + BoxSelectPreStartDrag(ms->BoxSelectId, ImGuiSelectionUserData_Invalid); + FocusWindow(window, ImGuiFocusRequestFlags_UnlessBelowModal); + SetHoveredID(ms->BoxSelectId); + if (ms->Flags & ImGuiMultiSelectFlags_ScopeRect) + SetNavID(0, ImGuiNavLayer_Main, ms->FocusScopeId, ImRect(g.IO.MousePos, g.IO.MousePos)); // Automatically switch FocusScope for initial click from void to box-select. + } + } + + if (ms->Flags & ImGuiMultiSelectFlags_ClearOnClickVoid) + if (IsMouseReleased(0) && IsMouseDragPastThreshold(0) == false && g.IO.KeyMods == ImGuiMod_None) + MultiSelectAddSetAll(ms, false); + } + + // Courtesy nav wrapping helper flag + if (ms->Flags & ImGuiMultiSelectFlags_NavWrapX) + { + IM_ASSERT(ms->Flags & ImGuiMultiSelectFlags_ScopeWindow); // Only supported at window scope + ImGui::NavMoveRequestTryWrapping(ImGui::GetCurrentWindow(), ImGuiNavMoveFlags_WrapX); + } + + // Unwind + window->DC.CursorMaxPos = ImMax(ms->BackupCursorMaxPos, window->DC.CursorMaxPos); + PopFocusScope(); + + if (g.DebugLogFlags & ImGuiDebugLogFlags_EventSelection) + DebugLogMultiSelectRequests("EndMultiSelect", &ms->IO); + + ms->FocusScopeId = 0; + ms->Flags = ImGuiMultiSelectFlags_None; + g.CurrentMultiSelect = (--g.MultiSelectTempDataStacked > 0) ? &g.MultiSelectTempData[g.MultiSelectTempDataStacked - 1] : NULL; + + return &ms->IO; +} + +void ImGui::SetNextItemSelectionUserData(ImGuiSelectionUserData selection_user_data) +{ + // Note that flags will be cleared by ItemAdd(), so it's only useful for Navigation code! + // This designed so widgets can also cheaply set this before calling ItemAdd(), so we are not tied to MultiSelect api. + ImGuiContext& g = *GImGui; + g.NextItemData.SelectionUserData = selection_user_data; + g.NextItemData.FocusScopeId = g.CurrentFocusScopeId; + + if (ImGuiMultiSelectTempData* ms = g.CurrentMultiSelect) + { + // Auto updating RangeSrcPassedBy for cases were clipper is not used (done before ItemAdd() clipping) + g.NextItemData.ItemFlags |= ImGuiItemFlags_HasSelectionUserData | ImGuiItemFlags_IsMultiSelect; + if (ms->IO.RangeSrcItem == selection_user_data) + ms->RangeSrcPassedBy = true; + } + else + { + g.NextItemData.ItemFlags |= ImGuiItemFlags_HasSelectionUserData; + } +} + +// In charge of: +// - Applying SetAll for submitted items. +// - Applying SetRange for submitted items and record end points. +// - Altering button behavior flags to facilitate use with drag and drop. +void ImGui::MultiSelectItemHeader(ImGuiID id, bool* p_selected, ImGuiButtonFlags* p_button_flags) +{ + ImGuiContext& g = *GImGui; + ImGuiMultiSelectTempData* ms = g.CurrentMultiSelect; + + bool selected = *p_selected; + if (ms->IsFocused) + { + ImGuiMultiSelectState* storage = ms->Storage; + ImGuiSelectionUserData item_data = g.NextItemData.SelectionUserData; + IM_ASSERT(g.NextItemData.FocusScopeId == g.CurrentFocusScopeId && "Forgot to call SetNextItemSelectionUserData() prior to item, required in BeginMultiSelect()/EndMultiSelect() scope"); + + // Apply SetAll (Clear/SelectAll) requests requested by BeginMultiSelect(). + // This is only useful if the user hasn't processed them already, and this only works if the user isn't using the clipper. + // If you are using a clipper you need to process the SetAll request after calling BeginMultiSelect() + if (ms->LoopRequestSetAll != -1) + selected = (ms->LoopRequestSetAll == 1); + + // When using SHIFT+Nav: because it can incur scrolling we cannot afford a frame of lag with the selection highlight (otherwise scrolling would happen before selection) + // For this to work, we need someone to set 'RangeSrcPassedBy = true' at some point (either clipper either SetNextItemSelectionUserData() function) + if (ms->IsKeyboardSetRange) + { + IM_ASSERT(id != 0 && (ms->KeyMods & ImGuiMod_Shift) != 0); + const bool is_range_dst = (ms->RangeDstPassedBy == false) && g.NavJustMovedToId == id; // Assume that g.NavJustMovedToId is not clipped. + if (is_range_dst) + ms->RangeDstPassedBy = true; + if (is_range_dst && storage->RangeSrcItem == ImGuiSelectionUserData_Invalid) // If we don't have RangeSrc, assign RangeSrc = RangeDst + { + storage->RangeSrcItem = item_data; + storage->RangeSelected = selected ? 1 : 0; + } + const bool is_range_src = storage->RangeSrcItem == item_data; + if (is_range_src || is_range_dst || ms->RangeSrcPassedBy != ms->RangeDstPassedBy) + { + // Apply range-select value to visible items + IM_ASSERT(storage->RangeSrcItem != ImGuiSelectionUserData_Invalid && storage->RangeSelected != -1); + selected = (storage->RangeSelected != 0); + } + else if ((ms->KeyMods & ImGuiMod_Ctrl) == 0 && (ms->Flags & ImGuiMultiSelectFlags_NoAutoClear) == 0) + { + // Clear other items + selected = false; + } + } + *p_selected = selected; + } + + // Alter button behavior flags + // To handle drag and drop of multiple items we need to avoid clearing selection on click. + // Enabling this test makes actions using CTRL+SHIFT delay their effect on MouseUp which is annoying, but it allows drag and drop of multiple items. + if (p_button_flags != NULL) + { + ImGuiButtonFlags button_flags = *p_button_flags; + button_flags |= ImGuiButtonFlags_NoHoveredOnFocus; + if ((!selected || (g.ActiveId == id && g.ActiveIdHasBeenPressedBefore)) && !(ms->Flags & ImGuiMultiSelectFlags_SelectOnClickRelease)) + button_flags = (button_flags | ImGuiButtonFlags_PressedOnClick) & ~ImGuiButtonFlags_PressedOnClickRelease; + else + button_flags |= ImGuiButtonFlags_PressedOnClickRelease; + *p_button_flags = button_flags; + } +} + +// In charge of: +// - Auto-select on navigation. +// - Box-select toggle handling. +// - Right-click handling. +// - Altering selection based on Ctrl/Shift modifiers, both for keyboard and mouse. +// - Record current selection state for RangeSrc +// This is all rather complex, best to run and refer to "widgets_multiselect_xxx" tests in imgui_test_suite. +void ImGui::MultiSelectItemFooter(ImGuiID id, bool* p_selected, bool* p_pressed) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + + bool selected = *p_selected; + bool pressed = *p_pressed; + ImGuiMultiSelectTempData* ms = g.CurrentMultiSelect; + ImGuiMultiSelectState* storage = ms->Storage; + if (pressed) + ms->IsFocused = true; + + bool hovered = false; + if (g.LastItemData.StatusFlags & ImGuiItemStatusFlags_HoveredRect) + hovered = IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup); + if (!ms->IsFocused && !hovered) + return; + + ImGuiSelectionUserData item_data = g.NextItemData.SelectionUserData; + + ImGuiMultiSelectFlags flags = ms->Flags; + const bool is_singleselect = (flags & ImGuiMultiSelectFlags_SingleSelect) != 0; + bool is_ctrl = (ms->KeyMods & ImGuiMod_Ctrl) != 0; + bool is_shift = (ms->KeyMods & ImGuiMod_Shift) != 0; + + bool apply_to_range_src = false; + + if (g.NavId == id && storage->RangeSrcItem == ImGuiSelectionUserData_Invalid) + apply_to_range_src = true; + if (ms->IsEndIO == false) + { + ms->IO.Requests.resize(0); + ms->IsEndIO = true; + } + + // Auto-select as you navigate a list + if (g.NavJustMovedToId == id) + { + if ((flags & ImGuiMultiSelectFlags_NoAutoSelect) == 0) + { + if (is_ctrl && is_shift) + pressed = true; + else if (!is_ctrl) + selected = pressed = true; + } + else + { + // With NoAutoSelect, using Shift+keyboard performs a write/copy + if (is_shift) + pressed = true; + else if (!is_ctrl) + apply_to_range_src = true; // Since if (pressed) {} main block is not running we update this + } + } + + if (apply_to_range_src) + { + storage->RangeSrcItem = item_data; + storage->RangeSelected = selected; // Will be updated at the end of this function anyway. + } + + // Box-select toggle handling + if (ms->BoxSelectId != 0) + if (ImGuiBoxSelectState* bs = GetBoxSelectState(ms->BoxSelectId)) + { + const bool rect_overlap_curr = bs->BoxSelectRectCurr.Overlaps(g.LastItemData.Rect); + const bool rect_overlap_prev = bs->BoxSelectRectPrev.Overlaps(g.LastItemData.Rect); + if ((rect_overlap_curr && !rect_overlap_prev && !selected) || (rect_overlap_prev && !rect_overlap_curr)) + { + if (storage->LastSelectionSize <= 0 && bs->IsStartedSetNavIdOnce) + { + pressed = true; // First item act as a pressed: code below will emit selection request and set NavId (whatever we emit here will be overridden anyway) + bs->IsStartedSetNavIdOnce = false; + } + else + { + selected = !selected; + MultiSelectAddSetRange(ms, selected, +1, item_data, item_data); + } + storage->LastSelectionSize = ImMax(storage->LastSelectionSize + 1, 1); + } + } + + // Right-click handling. + // FIXME-MULTISELECT: Currently filtered out by ImGuiMultiSelectFlags_NoAutoSelect but maybe should be moved to Selectable(). See https://github.com/ocornut/imgui/pull/5816 + if (hovered && IsMouseClicked(1) && (flags & ImGuiMultiSelectFlags_NoAutoSelect) == 0) + { + if (g.ActiveId != 0 && g.ActiveId != id) + ClearActiveID(); + SetFocusID(id, window); + if (!pressed && !selected) + { + pressed = true; + is_ctrl = is_shift = false; + } + } + + // Unlike Space, Enter doesn't alter selection (but can still return a press) unless current item is not selected. + // The later, "unless current item is not select", may become optional? It seems like a better default if Enter doesn't necessarily open something + // (unlike e.g. Windows explorer). For use case where Enter always open something, we might decide to make this optional? + const bool enter_pressed = pressed && (g.NavActivateId == id) && (g.NavActivateFlags & ImGuiActivateFlags_PreferInput); + + // Alter selection + if (pressed && (!enter_pressed || !selected)) + { + // Box-select + ImGuiInputSource input_source = (g.NavJustMovedToId == id || g.NavActivateId == id) ? g.NavInputSource : ImGuiInputSource_Mouse; + if (flags & (ImGuiMultiSelectFlags_BoxSelect1d | ImGuiMultiSelectFlags_BoxSelect2d)) + if (selected == false && !g.BoxSelectState.IsActive && !g.BoxSelectState.IsStarting && input_source == ImGuiInputSource_Mouse && g.IO.MouseClickedCount[0] == 1) + BoxSelectPreStartDrag(ms->BoxSelectId, item_data); + + //---------------------------------------------------------------------------------------- + // ACTION | Begin | Pressed/Activated | End + //---------------------------------------------------------------------------------------- + // Keys Navigated: | Clear | Src=item, Sel=1 SetRange 1 + // Keys Navigated: Ctrl | n/a | n/a + // Keys Navigated: Shift | n/a | Dst=item, Sel=1, => Clear + SetRange 1 + // Keys Navigated: Ctrl+Shift | n/a | Dst=item, Sel=Src => Clear + SetRange Src-Dst + // Keys Activated: | n/a | Src=item, Sel=1 => Clear + SetRange 1 + // Keys Activated: Ctrl | n/a | Src=item, Sel=!Sel => SetSange 1 + // Keys Activated: Shift | n/a | Dst=item, Sel=1 => Clear + SetSange 1 + //---------------------------------------------------------------------------------------- + // Mouse Pressed: | n/a | Src=item, Sel=1, => Clear + SetRange 1 + // Mouse Pressed: Ctrl | n/a | Src=item, Sel=!Sel => SetRange 1 + // Mouse Pressed: Shift | n/a | Dst=item, Sel=1, => Clear + SetRange 1 + // Mouse Pressed: Ctrl+Shift | n/a | Dst=item, Sel=!Sel => SetRange Src-Dst + //---------------------------------------------------------------------------------------- + + if ((flags & ImGuiMultiSelectFlags_NoAutoClear) == 0) + { + bool request_clear = false; + if (is_singleselect) + request_clear = true; + else if ((input_source == ImGuiInputSource_Mouse || g.NavActivateId == id) && !is_ctrl) + request_clear = (flags & ImGuiMultiSelectFlags_NoAutoClearOnReselect) ? !selected : true; + else if ((input_source == ImGuiInputSource_Keyboard || input_source == ImGuiInputSource_Gamepad) && is_shift && !is_ctrl) + request_clear = true; // With is_shift==false the RequestClear was done in BeginIO, not necessary to do again. + if (request_clear) + MultiSelectAddSetAll(ms, false); + } + + int range_direction; + bool range_selected; + if (is_shift && !is_singleselect) + { + //IM_ASSERT(storage->HasRangeSrc && storage->HasRangeValue); + if (storage->RangeSrcItem == ImGuiSelectionUserData_Invalid) + storage->RangeSrcItem = item_data; + if ((flags & ImGuiMultiSelectFlags_NoAutoSelect) == 0) + { + // Shift+Arrow always select + // Ctrl+Shift+Arrow copy source selection state (already stored by BeginMultiSelect() in storage->RangeSelected) + range_selected = (is_ctrl && storage->RangeSelected != -1) ? (storage->RangeSelected != 0) : true; + } + else + { + // Shift+Arrow copy source selection state + // Shift+Click always copy from target selection state + if (ms->IsKeyboardSetRange) + range_selected = (storage->RangeSelected != -1) ? (storage->RangeSelected != 0) : true; + else + range_selected = !selected; + } + range_direction = ms->RangeSrcPassedBy ? +1 : -1; + } + else + { + // Ctrl inverts selection, otherwise always select + if ((flags & ImGuiMultiSelectFlags_NoAutoSelect) == 0) + selected = is_ctrl ? !selected : true; + else + selected = !selected; + storage->RangeSrcItem = item_data; + range_selected = selected; + range_direction = +1; + } + MultiSelectAddSetRange(ms, range_selected, range_direction, storage->RangeSrcItem, item_data); + } + + // Update/store the selection state of the Source item (used by CTRL+SHIFT, when Source is unselected we perform a range unselect) + if (storage->RangeSrcItem == item_data) + storage->RangeSelected = selected ? 1 : 0; + + // Update/store the selection state of focused item + if (g.NavId == id) + { + storage->NavIdItem = item_data; + storage->NavIdSelected = selected ? 1 : 0; + } + if (storage->NavIdItem == item_data) + ms->NavIdPassedBy = true; + ms->LastSubmittedItem = item_data; + + *p_selected = selected; + *p_pressed = pressed; +} + +void ImGui::MultiSelectAddSetAll(ImGuiMultiSelectTempData* ms, bool selected) +{ + ImGuiSelectionRequest req = { ImGuiSelectionRequestType_SetAll, selected, 0, ImGuiSelectionUserData_Invalid, ImGuiSelectionUserData_Invalid }; + ms->IO.Requests.resize(0); // Can always clear previous requests + ms->IO.Requests.push_back(req); // Add new request +} + +void ImGui::MultiSelectAddSetRange(ImGuiMultiSelectTempData* ms, bool selected, int range_dir, ImGuiSelectionUserData first_item, ImGuiSelectionUserData last_item) +{ + // Merge contiguous spans into same request (unless NoRangeSelect is set which guarantees single-item ranges) + if (ms->IO.Requests.Size > 0 && first_item == last_item && (ms->Flags & ImGuiMultiSelectFlags_NoRangeSelect) == 0) + { + ImGuiSelectionRequest* prev = &ms->IO.Requests.Data[ms->IO.Requests.Size - 1]; + if (prev->Type == ImGuiSelectionRequestType_SetRange && prev->RangeLastItem == ms->LastSubmittedItem && prev->Selected == selected) + { + prev->RangeLastItem = last_item; + return; + } + } + + ImGuiSelectionRequest req = { ImGuiSelectionRequestType_SetRange, selected, (ImS8)range_dir, (range_dir > 0) ? first_item : last_item, (range_dir > 0) ? last_item : first_item }; + ms->IO.Requests.push_back(req); // Add new request +} + +void ImGui::DebugNodeMultiSelectState(ImGuiMultiSelectState* storage) +{ +#ifndef IMGUI_DISABLE_DEBUG_TOOLS + const bool is_active = (storage->LastFrameActive >= GetFrameCount() - 2); // Note that fully clipped early out scrolling tables will appear as inactive here. + if (!is_active) { PushStyleColor(ImGuiCol_Text, GetStyleColorVec4(ImGuiCol_TextDisabled)); } + bool open = TreeNode((void*)(intptr_t)storage->ID, "MultiSelect 0x%08X in '%s'%s", storage->ID, storage->Window ? storage->Window->Name : "N/A", is_active ? "" : " *Inactive*"); + if (!is_active) { PopStyleColor(); } + if (!open) + return; + Text("RangeSrcItem = %" IM_PRId64 " (0x%" IM_PRIX64 "), RangeSelected = %d", storage->RangeSrcItem, storage->RangeSrcItem, storage->RangeSelected); + Text("NavIdItem = %" IM_PRId64 " (0x%" IM_PRIX64 "), NavIdSelected = %d", storage->NavIdItem, storage->NavIdItem, storage->NavIdSelected); + Text("LastSelectionSize = %d", storage->LastSelectionSize); // Provided by user + TreePop(); +#else + IM_UNUSED(storage); +#endif +} + +//------------------------------------------------------------------------- +// [SECTION] Widgets: Multi-Select helpers +//------------------------------------------------------------------------- +// - ImGuiSelectionBasicStorage +// - ImGuiSelectionExternalStorage +//------------------------------------------------------------------------- + +ImGuiSelectionBasicStorage::ImGuiSelectionBasicStorage() +{ + Size = 0; + PreserveOrder = false; + UserData = NULL; + AdapterIndexToStorageId = [](ImGuiSelectionBasicStorage*, int idx) { return (ImGuiID)idx; }; + _SelectionOrder = 1; // Always >0 +} + +void ImGuiSelectionBasicStorage::Clear() +{ + Size = 0; + _SelectionOrder = 1; // Always >0 + _Storage.Data.resize(0); +} + +void ImGuiSelectionBasicStorage::Swap(ImGuiSelectionBasicStorage& r) +{ + ImSwap(Size, r.Size); + ImSwap(_SelectionOrder, r._SelectionOrder); + _Storage.Data.swap(r._Storage.Data); +} + +bool ImGuiSelectionBasicStorage::Contains(ImGuiID id) const +{ + return _Storage.GetInt(id, 0) != 0; +} + +static int IMGUI_CDECL PairComparerByValueInt(const void* lhs, const void* rhs) +{ + int lhs_v = ((const ImGuiStoragePair*)lhs)->val_i; + int rhs_v = ((const ImGuiStoragePair*)rhs)->val_i; + return (lhs_v > rhs_v ? +1 : lhs_v < rhs_v ? -1 : 0); +} + +// GetNextSelectedItem() is an abstraction allowing us to change our underlying actual storage system without impacting user. +// (e.g. store unselected vs compact down, compact down on demand, use raw ImVector instead of ImGuiStorage...) +bool ImGuiSelectionBasicStorage::GetNextSelectedItem(void** opaque_it, ImGuiID* out_id) +{ + ImGuiStoragePair* it = (ImGuiStoragePair*)*opaque_it; + ImGuiStoragePair* it_end = _Storage.Data.Data + _Storage.Data.Size; + if (PreserveOrder && it == NULL && it_end != NULL) + ImQsort(_Storage.Data.Data, (size_t)_Storage.Data.Size, sizeof(ImGuiStoragePair), PairComparerByValueInt); // ~ImGuiStorage::BuildSortByValueInt() + if (it == NULL) + it = _Storage.Data.Data; + IM_ASSERT(it >= _Storage.Data.Data && it <= it_end); + if (it != it_end) + while (it->val_i == 0 && it < it_end) + it++; + const bool has_more = (it != it_end); + *opaque_it = has_more ? (void**)(it + 1) : (void**)(it); + *out_id = has_more ? it->key : 0; + if (PreserveOrder && !has_more) + _Storage.BuildSortByKey(); + return has_more; +} + +void ImGuiSelectionBasicStorage::SetItemSelected(ImGuiID id, bool selected) +{ + int* p_int = _Storage.GetIntRef(id, 0); + if (selected && *p_int == 0) { *p_int = _SelectionOrder++; Size++; } + else if (!selected && *p_int != 0) { *p_int = 0; Size--; } +} + +// Optimized for batch edits (with same value of 'selected') +static void ImGuiSelectionBasicStorage_BatchSetItemSelected(ImGuiSelectionBasicStorage* selection, ImGuiID id, bool selected, int size_before_amends, int selection_order) +{ + ImGuiStorage* storage = &selection->_Storage; + ImGuiStoragePair* it = ImLowerBound(storage->Data.Data, storage->Data.Data + size_before_amends, id); + const bool is_contained = (it != storage->Data.Data + size_before_amends) && (it->key == id); + if (selected == (is_contained && it->val_i != 0)) + return; + if (selected && !is_contained) + storage->Data.push_back(ImGuiStoragePair(id, selection_order)); // Push unsorted at end of vector, will be sorted in SelectionMultiAmendsFinish() + else if (is_contained) + it->val_i = selected ? selection_order : 0; // Modify in-place. + selection->Size += selected ? +1 : -1; +} + +static void ImGuiSelectionBasicStorage_BatchFinish(ImGuiSelectionBasicStorage* selection, bool selected, int size_before_amends) +{ + ImGuiStorage* storage = &selection->_Storage; + if (selected && selection->Size != size_before_amends) + storage->BuildSortByKey(); // When done selecting: sort everything +} + +// Apply requests coming from BeginMultiSelect() and EndMultiSelect(). +// - Enable 'Demo->Tools->Debug Log->Selection' to see selection requests as they happen. +// - Honoring SetRange requests requires that you can iterate/interpolate between RangeFirstItem and RangeLastItem. +// - In this demo we often submit indices to SetNextItemSelectionUserData() + store the same indices in persistent selection. +// - Your code may do differently. If you store pointers or objects ID in ImGuiSelectionUserData you may need to perform +// a lookup in order to have some way to iterate/interpolate between two items. +// - A full-featured application is likely to allow search/filtering which is likely to lead to using indices +// and constructing a view index <> object id/ptr data structure anyway. +// WHEN YOUR APPLICATION SETTLES ON A CHOICE, YOU WILL PROBABLY PREFER TO GET RID OF THIS UNNECESSARY 'ImGuiSelectionBasicStorage' INDIRECTION LOGIC. +// Notice that with the simplest adapter (using indices everywhere), all functions return their parameters. +// The most simple implementation (using indices everywhere) would look like: +// for (ImGuiSelectionRequest& req : ms_io->Requests) +// { +// if (req.Type == ImGuiSelectionRequestType_SetAll) { Clear(); if (req.Selected) { for (int n = 0; n < items_count; n++) { SetItemSelected(n, true); } } +// if (req.Type == ImGuiSelectionRequestType_SetRange) { for (int n = (int)ms_io->RangeFirstItem; n <= (int)ms_io->RangeLastItem; n++) { SetItemSelected(n, ms_io->Selected); } } +// } +void ImGuiSelectionBasicStorage::ApplyRequests(ImGuiMultiSelectIO* ms_io) +{ + // For convenience we obtain ItemsCount as passed to BeginMultiSelect(), which is optional. + // It makes sense when using ImGuiSelectionBasicStorage to simply pass your items count to BeginMultiSelect(). + // Other scheme may handle SetAll differently. + IM_ASSERT(ms_io->ItemsCount != -1 && "Missing value for items_count in BeginMultiSelect() call!"); + IM_ASSERT(AdapterIndexToStorageId != NULL); + + // This is optimized/specialized to cope with very large selections (e.g. 100k+ items) + // - A simpler version could call SetItemSelected() directly instead of ImGuiSelectionBasicStorage_BatchSetItemSelected() + ImGuiSelectionBasicStorage_BatchFinish(). + // - Optimized select can append unsorted, then sort in a second pass. Optimized unselect can clear in-place then compact in a second pass. + // - A more optimal version wouldn't even use ImGuiStorage but directly a ImVector to reduce bandwidth, but this is a reasonable trade off to reuse code. + // - There are many ways this could be better optimized. The worse case scenario being: using BoxSelect2d in a grid, box-select scrolling down while wiggling + // left and right: it affects coarse clipping + can emit multiple SetRange with 1 item each.) + // FIXME-OPT: For each block of consecutive SetRange request: + // - add all requests to a sorted list, store ID, selected, offset in ImGuiStorage. + // - rewrite sorted storage a single time. + for (ImGuiSelectionRequest& req : ms_io->Requests) + { + if (req.Type == ImGuiSelectionRequestType_SetAll) + { + Clear(); + if (req.Selected) + { + _Storage.Data.reserve(ms_io->ItemsCount); + const int size_before_amends = _Storage.Data.Size; + for (int idx = 0; idx < ms_io->ItemsCount; idx++, _SelectionOrder++) + ImGuiSelectionBasicStorage_BatchSetItemSelected(this, GetStorageIdFromIndex(idx), req.Selected, size_before_amends, _SelectionOrder); + ImGuiSelectionBasicStorage_BatchFinish(this, req.Selected, size_before_amends); + } + } + else if (req.Type == ImGuiSelectionRequestType_SetRange) + { + const int selection_changes = (int)req.RangeLastItem - (int)req.RangeFirstItem + 1; + //ImGuiContext& g = *GImGui; IMGUI_DEBUG_LOG_SELECTION("Req %d/%d: set %d to %d\n", ms_io->Requests.index_from_ptr(&req), ms_io->Requests.Size, selection_changes, req.Selected); + if (selection_changes == 1 || (selection_changes < Size / 100)) + { + // Multiple sorted insertion + copy likely to be faster. + // Technically we could do a single copy with a little more work (sort sequential SetRange requests) + for (int idx = (int)req.RangeFirstItem; idx <= (int)req.RangeLastItem; idx++) + SetItemSelected(GetStorageIdFromIndex(idx), req.Selected); + } + else + { + // Append insertion + single sort likely be faster. + // Use req.RangeDirection to set order field so that shift+clicking from 1 to 5 is different than shift+clicking from 5 to 1 + const int size_before_amends = _Storage.Data.Size; + int selection_order = _SelectionOrder + ((req.RangeDirection < 0) ? selection_changes - 1 : 0); + for (int idx = (int)req.RangeFirstItem; idx <= (int)req.RangeLastItem; idx++, selection_order += req.RangeDirection) + ImGuiSelectionBasicStorage_BatchSetItemSelected(this, GetStorageIdFromIndex(idx), req.Selected, size_before_amends, selection_order); + if (req.Selected) + _SelectionOrder += selection_changes; + ImGuiSelectionBasicStorage_BatchFinish(this, req.Selected, size_before_amends); + } + } + } +} + +//------------------------------------------------------------------------- + +ImGuiSelectionExternalStorage::ImGuiSelectionExternalStorage() +{ + UserData = NULL; + AdapterSetItemSelected = NULL; +} + +// Apply requests coming from BeginMultiSelect() and EndMultiSelect(). +// We also pull 'ms_io->ItemsCount' as passed for BeginMultiSelect() for consistency with ImGuiSelectionBasicStorage +// This makes no assumption about underlying storage. +void ImGuiSelectionExternalStorage::ApplyRequests(ImGuiMultiSelectIO* ms_io) +{ + IM_ASSERT(AdapterSetItemSelected); + for (ImGuiSelectionRequest& req : ms_io->Requests) + { + if (req.Type == ImGuiSelectionRequestType_SetAll) + for (int idx = 0; idx < ms_io->ItemsCount; idx++) + AdapterSetItemSelected(this, idx, req.Selected); + if (req.Type == ImGuiSelectionRequestType_SetRange) + for (int idx = (int)req.RangeFirstItem; idx <= (int)req.RangeLastItem; idx++) + AdapterSetItemSelected(this, idx, req.Selected); + } +} + //------------------------------------------------------------------------- // [SECTION] Widgets: ListBox //------------------------------------------------------------------------- +// - BeginListBox() +// - EndListBox() // - ListBox() -// - ListBoxHeader() -// - ListBoxFooter() -//------------------------------------------------------------------------- -// FIXME: This is an old API. We should redesign some of it, rename ListBoxHeader->BeginListBox, ListBoxFooter->EndListBox -// and promote using them over existing ListBox() functions, similarly to change with combo boxes. //------------------------------------------------------------------------- -// FIXME: In principle this function should be called BeginListBox(). We should rename it after re-evaluating if we want to keep the same signature. -// Helper to calculate the size of a listbox and display a label on the right. -// Tip: To have a list filling the entire window width, PushItemWidth(-1) and pass an non-visible label e.g. "##empty" -bool ImGui::ListBoxHeader(const char* label, const ImVec2& size_arg) +// This is essentially a thin wrapper to using BeginChild/EndChild with the ImGuiChildFlags_FrameStyle flag for stylistic changes + displaying a label. +// This handle some subtleties with capturing info from the label. +// If you don't need a label you can pretty much directly use ImGui::BeginChild() with ImGuiChildFlags_FrameStyle. +// Tip: To have a list filling the entire window width, use size.x = -FLT_MIN and pass an non-visible label e.g. "##empty" +// Tip: If your vertical size is calculated from an item count (e.g. 10 * item_height) consider adding a fractional part to facilitate seeing scrolling boundaries (e.g. 10.5f * item_height). +bool ImGui::BeginListBox(const char* label, const ImVec2& size_arg) { ImGuiContext& g = *GImGui; ImGuiWindow* window = GetCurrentWindow(); @@ -5628,63 +8311,45 @@ bool ImGui::ListBoxHeader(const char* label, const ImVec2& size_arg) const ImGuiID id = GetID(label); const ImVec2 label_size = CalcTextSize(label, NULL, true); - // Size default to hold ~7 items. Fractional number of items helps seeing that we can scroll down/up without looking at scrollbar. - ImVec2 size = CalcItemSize(size_arg, CalcItemWidth(), GetTextLineHeightWithSpacing() * 7.4f + style.ItemSpacing.y); + // Size default to hold ~7.25 items. + // Fractional number of items helps seeing that we can scroll down/up without looking at scrollbar. + ImVec2 size = ImTrunc(CalcItemSize(size_arg, CalcItemWidth(), GetTextLineHeightWithSpacing() * 7.25f + style.FramePadding.y * 2.0f)); ImVec2 frame_size = ImVec2(size.x, ImMax(size.y, label_size.y)); ImRect frame_bb(window->DC.CursorPos, window->DC.CursorPos + frame_size); ImRect bb(frame_bb.Min, frame_bb.Max + ImVec2(label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f, 0.0f)); - window->DC.LastItemRect = bb; // Forward storage for ListBoxFooter.. dodgy. g.NextItemData.ClearFlags(); if (!IsRectVisible(bb.Min, bb.Max)) { ItemSize(bb.GetSize(), style.FramePadding.y); ItemAdd(bb, 0, &frame_bb); + g.NextWindowData.ClearFlags(); // We behave like Begin() and need to consume those values return false; } + // FIXME-OPT: We could omit the BeginGroup() if label_size.x == 0.0f but would need to omit the EndGroup() as well. BeginGroup(); - if (label_size.x > 0) - RenderText(ImVec2(frame_bb.Max.x + style.ItemInnerSpacing.x, frame_bb.Min.y + style.FramePadding.y), label); + if (label_size.x > 0.0f) + { + ImVec2 label_pos = ImVec2(frame_bb.Max.x + style.ItemInnerSpacing.x, frame_bb.Min.y + style.FramePadding.y); + RenderText(label_pos, label); + window->DC.CursorMaxPos = ImMax(window->DC.CursorMaxPos, label_pos + label_size); + AlignTextToFramePadding(); + } - BeginChildFrame(id, frame_bb.GetSize()); + BeginChild(id, frame_bb.GetSize(), ImGuiChildFlags_FrameStyle); return true; } -// FIXME: In principle this function should be called EndListBox(). We should rename it after re-evaluating if we want to keep the same signature. -bool ImGui::ListBoxHeader(const char* label, int items_count, int height_in_items) +void ImGui::EndListBox() { - // Size default to hold ~7.25 items. - // We add +25% worth of item height to allow the user to see at a glance if there are more items up/down, without looking at the scrollbar. - // We don't add this extra bit if items_count <= height_in_items. It is slightly dodgy, because it means a dynamic list of items will make the widget resize occasionally when it crosses that size. - // I am expecting that someone will come and complain about this behavior in a remote future, then we can advise on a better solution. - if (height_in_items < 0) - height_in_items = ImMin(items_count, 7); - const ImGuiStyle& style = GetStyle(); - float height_in_items_f = (height_in_items < items_count) ? (height_in_items + 0.25f) : (height_in_items + 0.00f); + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + IM_ASSERT((window->Flags & ImGuiWindowFlags_ChildWindow) && "Mismatched BeginListBox/EndListBox calls. Did you test the return value of BeginListBox?"); + IM_UNUSED(window); - // We include ItemSpacing.y so that a list sized for the exact number of items doesn't make a scrollbar appears. We could also enforce that by passing a flag to BeginChild(). - ImVec2 size; - size.x = 0.0f; - size.y = ImFloor(GetTextLineHeightWithSpacing() * height_in_items_f + style.FramePadding.y * 2.0f); - return ListBoxHeader(label, size); -} - -// FIXME: In principle this function should be called EndListBox(). We should rename it after re-evaluating if we want to keep the same signature. -void ImGui::ListBoxFooter() -{ - ImGuiWindow* parent_window = GetCurrentWindow()->ParentWindow; - const ImRect bb = parent_window->DC.LastItemRect; - const ImGuiStyle& style = GetStyle(); - - EndChildFrame(); - - // Redeclare item size so that it includes the label (we have stored the full size in LastItemRect) - // We call SameLine() to restore DC.CurrentLine* data - SameLine(); - parent_window->DC.CursorPos = bb.Min; - ItemSize(bb, style.FramePadding.y); - EndGroup(); + EndChild(); + EndGroup(); // This is only required to be able to do IsItemXXX query on the whole ListBox including label } bool ImGui::ListBox(const char* label, int* current_item, const char* const items[], int items_count, int height_items) @@ -5693,24 +8358,36 @@ bool ImGui::ListBox(const char* label, int* current_item, const char* const item return value_changed; } -bool ImGui::ListBox(const char* label, int* current_item, bool (*items_getter)(void*, int, const char**), void* data, int items_count, int height_in_items) +// This is merely a helper around BeginListBox(), EndListBox(). +// Considering using those directly to submit custom data or store selection differently. +bool ImGui::ListBox(const char* label, int* current_item, const char* (*getter)(void* user_data, int idx), void* user_data, int items_count, int height_in_items) { - if (!ListBoxHeader(label, items_count, height_in_items)) + ImGuiContext& g = *GImGui; + + // Calculate size from "height_in_items" + if (height_in_items < 0) + height_in_items = ImMin(items_count, 7); + float height_in_items_f = height_in_items + 0.25f; + ImVec2 size(0.0f, ImTrunc(GetTextLineHeightWithSpacing() * height_in_items_f + g.Style.FramePadding.y * 2.0f)); + + if (!BeginListBox(label, size)) return false; - // Assume all items have even height (= 1 line of text). If you need items of different or variable sizes you can create a custom version of ListBox() in your code without using the clipper. - ImGuiContext& g = *GImGui; + // Assume all items have even height (= 1 line of text). If you need items of different height, + // you can create a custom version of ListBox() in your code without using the clipper. bool value_changed = false; - ImGuiListClipper clipper(items_count, GetTextLineHeightWithSpacing()); // We know exactly our line height here so we pass it as a minor optimization, but generally you don't need to. + ImGuiListClipper clipper; + clipper.Begin(items_count, GetTextLineHeightWithSpacing()); // We know exactly our line height here so we pass it as a minor optimization, but generally you don't need to. + clipper.IncludeItemByIndex(*current_item); while (clipper.Step()) for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; i++) { - const bool item_selected = (i == *current_item); - const char* item_text; - if (!items_getter(data, i, &item_text)) + const char* item_text = getter(user_data, i); + if (item_text == NULL) item_text = "*Unknown item*"; PushID(i); + const bool item_selected = (i == *current_item); if (Selectable(item_text, item_selected)) { *current_item = i; @@ -5720,9 +8397,10 @@ bool ImGui::ListBox(const char* label, int* current_item, bool (*items_getter)(v SetItemDefaultFocus(); PopID(); } - ListBoxFooter(); + EndListBox(); + if (value_changed) - MarkItemEdited(g.CurrentWindow->DC.LastItemId); + MarkItemEdited(g.LastItemData.ID); return value_changed; } @@ -5734,30 +8412,33 @@ bool ImGui::ListBox(const char* label, int* current_item, bool (*items_getter)(v // - PlotLines() // - PlotHistogram() //------------------------------------------------------------------------- +// Plot/Graph widgets are not very good. +// Consider writing your own, or using a third-party one, see: +// - ImPlot https://github.com/epezent/implot +// - others https://github.com/ocornut/imgui/wiki/Useful-Extensions +//------------------------------------------------------------------------- -void ImGui::PlotEx(ImGuiPlotType plot_type, const char* label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 frame_size) +int ImGui::PlotEx(ImGuiPlotType plot_type, const char* label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_offset, const char* overlay_text, float scale_min, float scale_max, const ImVec2& size_arg) { + ImGuiContext& g = *GImGui; ImGuiWindow* window = GetCurrentWindow(); if (window->SkipItems) - return; + return -1; - ImGuiContext& g = *GImGui; const ImGuiStyle& style = g.Style; const ImGuiID id = window->GetID(label); const ImVec2 label_size = CalcTextSize(label, NULL, true); - if (frame_size.x == 0.0f) - frame_size.x = CalcItemWidth(); - if (frame_size.y == 0.0f) - frame_size.y = label_size.y + (style.FramePadding.y * 2); + const ImVec2 frame_size = CalcItemSize(size_arg, CalcItemWidth(), label_size.y + style.FramePadding.y * 2.0f); const ImRect frame_bb(window->DC.CursorPos, window->DC.CursorPos + frame_size); const ImRect inner_bb(frame_bb.Min + style.FramePadding, frame_bb.Max - style.FramePadding); const ImRect total_bb(frame_bb.Min, frame_bb.Max + ImVec2(label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f, 0)); ItemSize(total_bb, style.FramePadding.y); - if (!ItemAdd(total_bb, 0, &frame_bb)) - return; - const bool hovered = ItemHoverable(frame_bb, id); + if (!ItemAdd(total_bb, id, &frame_bb, ImGuiItemFlags_NoNav)) + return -1; + bool hovered; + ButtonBehavior(frame_bb, id, &hovered, NULL); // Determine scale from values if not specified if (scale_min == FLT_MAX || scale_max == FLT_MAX) @@ -5781,13 +8462,13 @@ void ImGui::PlotEx(ImGuiPlotType plot_type, const char* label, float (*values_ge RenderFrame(frame_bb.Min, frame_bb.Max, GetColorU32(ImGuiCol_FrameBg), true, style.FrameRounding); const int values_count_min = (plot_type == ImGuiPlotType_Lines) ? 2 : 1; + int idx_hovered = -1; if (values_count >= values_count_min) { int res_w = ImMin((int)frame_size.x, values_count) + ((plot_type == ImGuiPlotType_Lines) ? -1 : 0); int item_count = values_count + ((plot_type == ImGuiPlotType_Lines) ? -1 : 0); // Tooltip on hover - int v_hovered = -1; if (hovered && inner_bb.Contains(g.IO.MousePos)) { const float t = ImClamp((g.IO.MousePos.x - inner_bb.Min.x) / (inner_bb.Max.x - inner_bb.Min.x), 0.0f, 0.9999f); @@ -5797,10 +8478,10 @@ void ImGui::PlotEx(ImGuiPlotType plot_type, const char* label, float (*values_ge const float v0 = values_getter(data, (v_idx + values_offset) % values_count); const float v1 = values_getter(data, (v_idx + 1 + values_offset) % values_count); if (plot_type == ImGuiPlotType_Lines) - SetTooltip("%d: %8.4g\n%d: %8.4g", v_idx, v0, v_idx+1, v1); + SetTooltip("%d: %8.4g\n%d: %8.4g", v_idx, v0, v_idx + 1, v1); else if (plot_type == ImGuiPlotType_Histogram) SetTooltip("%d: %8.4g", v_idx, v0); - v_hovered = v_idx; + idx_hovered = v_idx; } const float t_step = 1.0f / (float)res_w; @@ -5809,7 +8490,7 @@ void ImGui::PlotEx(ImGuiPlotType plot_type, const char* label, float (*values_ge float v0 = values_getter(data, (0 + values_offset) % values_count); float t0 = 0.0f; ImVec2 tp0 = ImVec2( t0, 1.0f - ImSaturate((v0 - scale_min) * inv_scale) ); // Point in the normalized space of our target rectangle - float histogram_zero_line_t = (scale_min * scale_max < 0.0f) ? (-scale_min * inv_scale) : (scale_min < 0.0f ? 0.0f : 1.0f); // Where does the zero line stands + float histogram_zero_line_t = (scale_min * scale_max < 0.0f) ? (1 + scale_min * inv_scale) : (scale_min < 0.0f ? 0.0f : 1.0f); // Where does the zero line stands const ImU32 col_base = GetColorU32((plot_type == ImGuiPlotType_Lines) ? ImGuiCol_PlotLines : ImGuiCol_PlotHistogram); const ImU32 col_hovered = GetColorU32((plot_type == ImGuiPlotType_Lines) ? ImGuiCol_PlotLinesHovered : ImGuiCol_PlotHistogramHovered); @@ -5827,13 +8508,13 @@ void ImGui::PlotEx(ImGuiPlotType plot_type, const char* label, float (*values_ge ImVec2 pos1 = ImLerp(inner_bb.Min, inner_bb.Max, (plot_type == ImGuiPlotType_Lines) ? tp1 : ImVec2(tp1.x, histogram_zero_line_t)); if (plot_type == ImGuiPlotType_Lines) { - window->DrawList->AddLine(pos0, pos1, v_hovered == v1_idx ? col_hovered : col_base); + window->DrawList->AddLine(pos0, pos1, idx_hovered == v1_idx ? col_hovered : col_base); } else if (plot_type == ImGuiPlotType_Histogram) { if (pos1.x >= pos0.x + 2.0f) pos1.x -= 1.0f; - window->DrawList->AddRectFilled(pos0, pos1, v_hovered == v1_idx ? col_hovered : col_base); + window->DrawList->AddRectFilled(pos0, pos1, idx_hovered == v1_idx ? col_hovered : col_base); } t0 = t1; @@ -5843,10 +8524,14 @@ void ImGui::PlotEx(ImGuiPlotType plot_type, const char* label, float (*values_ge // Text overlay if (overlay_text) - RenderTextClipped(ImVec2(frame_bb.Min.x, frame_bb.Min.y + style.FramePadding.y), frame_bb.Max, overlay_text, NULL, NULL, ImVec2(0.5f,0.0f)); + RenderTextClipped(ImVec2(frame_bb.Min.x, frame_bb.Min.y + style.FramePadding.y), frame_bb.Max, overlay_text, NULL, NULL, ImVec2(0.5f, 0.0f)); if (label_size.x > 0.0f) RenderText(ImVec2(frame_bb.Max.x + style.ItemInnerSpacing.x, inner_bb.Min.y), label); + + // Return hovered index or -1 if none are hovered. + // This is currently not exposed in the public API because we need a larger redesign of the whole thing, but in the short-term we are making it available in PlotEx(). + return idx_hovered; } struct ImGuiPlotArrayGetterData @@ -5926,89 +8611,57 @@ void ImGui::Value(const char* prefix, float v, const char* float_format) // [SECTION] MenuItem, BeginMenu, EndMenu, etc. //------------------------------------------------------------------------- // - ImGuiMenuColumns [Internal] -// - BeginMainMenuBar() -// - EndMainMenuBar() // - BeginMenuBar() // - EndMenuBar() +// - BeginMainMenuBar() +// - EndMainMenuBar() // - BeginMenu() // - EndMenu() +// - MenuItemEx() [Internal] // - MenuItem() //------------------------------------------------------------------------- // Helpers for internal use -ImGuiMenuColumns::ImGuiMenuColumns() +void ImGuiMenuColumns::Update(float spacing, bool window_reappearing) { - Spacing = Width = NextWidth = 0.0f; - memset(Pos, 0, sizeof(Pos)); - memset(NextWidths, 0, sizeof(NextWidths)); + if (window_reappearing) + memset(Widths, 0, sizeof(Widths)); + Spacing = (ImU16)spacing; + CalcNextTotalWidth(true); + memset(Widths, 0, sizeof(Widths)); + TotalWidth = NextTotalWidth; + NextTotalWidth = 0; } -void ImGuiMenuColumns::Update(int count, float spacing, bool clear) +void ImGuiMenuColumns::CalcNextTotalWidth(bool update_offsets) { - IM_ASSERT(count == IM_ARRAYSIZE(Pos)); - IM_UNUSED(count); - Width = NextWidth = 0.0f; - Spacing = spacing; - if (clear) - memset(NextWidths, 0, sizeof(NextWidths)); - for (int i = 0; i < IM_ARRAYSIZE(Pos); i++) + ImU16 offset = 0; + bool want_spacing = false; + for (int i = 0; i < IM_ARRAYSIZE(Widths); i++) { - if (i > 0 && NextWidths[i] > 0.0f) - Width += Spacing; - Pos[i] = (float)(int)Width; - Width += NextWidths[i]; - NextWidths[i] = 0.0f; + ImU16 width = Widths[i]; + if (want_spacing && width > 0) + offset += Spacing; + want_spacing |= (width > 0); + if (update_offsets) + { + if (i == 1) { OffsetLabel = offset; } + if (i == 2) { OffsetShortcut = offset; } + if (i == 3) { OffsetMark = offset; } + } + offset += width; } + NextTotalWidth = offset; } -float ImGuiMenuColumns::DeclColumns(float w0, float w1, float w2) // not using va_arg because they promote float to double +float ImGuiMenuColumns::DeclColumns(float w_icon, float w_label, float w_shortcut, float w_mark) { - NextWidth = 0.0f; - NextWidths[0] = ImMax(NextWidths[0], w0); - NextWidths[1] = ImMax(NextWidths[1], w1); - NextWidths[2] = ImMax(NextWidths[2], w2); - for (int i = 0; i < IM_ARRAYSIZE(Pos); i++) - NextWidth += NextWidths[i] + ((i > 0 && NextWidths[i] > 0.0f) ? Spacing : 0.0f); - return ImMax(Width, NextWidth); -} - -float ImGuiMenuColumns::CalcExtraSpace(float avail_w) -{ - return ImMax(0.0f, avail_w - Width); -} - -// For the main menu bar, which cannot be moved, we honor g.Style.DisplaySafeAreaPadding to ensure text can be visible on a TV set. -bool ImGui::BeginMainMenuBar() -{ - ImGuiContext& g = *GImGui; - g.NextWindowData.MenuBarOffsetMinVal = ImVec2(g.Style.DisplaySafeAreaPadding.x, ImMax(g.Style.DisplaySafeAreaPadding.y - g.Style.FramePadding.y, 0.0f)); - SetNextWindowPos(ImVec2(0.0f, 0.0f)); - SetNextWindowSize(ImVec2(g.IO.DisplaySize.x, g.NextWindowData.MenuBarOffsetMinVal.y + g.FontBaseSize + g.Style.FramePadding.y)); - PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f); - PushStyleVar(ImGuiStyleVar_WindowMinSize, ImVec2(0,0)); - ImGuiWindowFlags window_flags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_MenuBar; - bool is_open = Begin("##MainMenuBar", NULL, window_flags) && BeginMenuBar(); - PopStyleVar(2); - g.NextWindowData.MenuBarOffsetMinVal = ImVec2(0.0f, 0.0f); - if (!is_open) - { - End(); - return false; - } - return true; //-V1020 -} - -void ImGui::EndMainMenuBar() -{ - EndMenuBar(); - - // When the user has left the menu layer (typically: closed menus through activation of an item), we restore focus to the previous window - // FIXME: With this strategy we won't be able to restore a NULL focus. - ImGuiContext& g = *GImGui; - if (g.CurrentWindow == g.NavWindow && g.NavLayer == 0 && !g.NavAnyRequest) - FocusTopMostWindowUnderOne(g.NavWindow, NULL); - - End(); + Widths[0] = ImMax(Widths[0], (ImU16)w_icon); + Widths[1] = ImMax(Widths[1], (ImU16)w_label); + Widths[2] = ImMax(Widths[2], (ImU16)w_shortcut); + Widths[3] = ImMax(Widths[3], (ImU16)w_mark); + CalcNextTotalWidth(false); + return (float)ImMax(TotalWidth, NextTotalWidth); } // FIXME: Provided a rectangle perhaps e.g. a BeginMenuBarEx() could be used anywhere.. @@ -6025,19 +8678,22 @@ bool ImGui::BeginMenuBar() IM_ASSERT(!window->DC.MenuBarAppending); BeginGroup(); // Backup position on layer 0 // FIXME: Misleading to use a group for that backup/restore - PushID("##menubar"); + PushID("##MenuBar"); // We don't clip with current window clipping rectangle as it is already set to the area below. However we clip with window full rect. // We remove 1 worth of rounding to Max.x to that text in long menus and small windows don't tend to display over the lower-right rounded area, which looks particularly glitchy. + const float border_top = ImMax(IM_ROUND(window->WindowBorderSize * 0.5f - window->TitleBarHeight), 0.0f); + const float border_half = IM_ROUND(window->WindowBorderSize * 0.5f); ImRect bar_rect = window->MenuBarRect(); - ImRect clip_rect(ImFloor(bar_rect.Min.x + 0.5f), ImFloor(bar_rect.Min.y + window->WindowBorderSize + 0.5f), ImFloor(ImMax(bar_rect.Min.x, bar_rect.Max.x - window->WindowRounding) + 0.5f), ImFloor(bar_rect.Max.y + 0.5f)); + ImRect clip_rect(ImFloor(bar_rect.Min.x + border_half), ImFloor(bar_rect.Min.y + border_top), ImFloor(ImMax(bar_rect.Min.x, bar_rect.Max.x - ImMax(window->WindowRounding, border_half))), ImFloor(bar_rect.Max.y)); clip_rect.ClipWith(window->OuterRectClipped); PushClipRect(clip_rect.Min, clip_rect.Max, false); - window->DC.CursorPos = ImVec2(bar_rect.Min.x + window->DC.MenuBarOffset.x, bar_rect.Min.y + window->DC.MenuBarOffset.y); + // We overwrite CursorMaxPos because BeginGroup sets it to CursorPos (essentially the .EmitItem hack in EndMenuBar() would need something analogous here, maybe a BeginGroupEx() with flags). + window->DC.CursorPos = window->DC.CursorMaxPos = ImVec2(bar_rect.Min.x + window->DC.MenuBarOffset.x, bar_rect.Min.y + window->DC.MenuBarOffset.y); window->DC.LayoutType = ImGuiLayoutType_Horizontal; + window->DC.IsSameLine = false; window->DC.NavLayerCurrent = ImGuiNavLayer_Menu; - window->DC.NavLayerCurrentMask = (1 << ImGuiNavLayer_Menu); window->DC.MenuBarAppending = true; AlignTextToFramePadding(); return true; @@ -6050,41 +8706,165 @@ void ImGui::EndMenuBar() return; ImGuiContext& g = *GImGui; + IM_MSVC_WARNING_SUPPRESS(6011); // Static Analysis false positive "warning C6011: Dereferencing NULL pointer 'window'" + IM_ASSERT(window->Flags & ImGuiWindowFlags_MenuBar); + IM_ASSERT(window->DC.MenuBarAppending); + // Nav: When a move request within one of our child menu failed, capture the request to navigate among our siblings. if (NavMoveRequestButNoResultYet() && (g.NavMoveDir == ImGuiDir_Left || g.NavMoveDir == ImGuiDir_Right) && (g.NavWindow->Flags & ImGuiWindowFlags_ChildMenu)) { + // Try to find out if the request is for one of our child menu ImGuiWindow* nav_earliest_child = g.NavWindow; while (nav_earliest_child->ParentWindow && (nav_earliest_child->ParentWindow->Flags & ImGuiWindowFlags_ChildMenu)) nav_earliest_child = nav_earliest_child->ParentWindow; - if (nav_earliest_child->ParentWindow == window && nav_earliest_child->DC.ParentLayoutType == ImGuiLayoutType_Horizontal && g.NavMoveRequestForward == ImGuiNavForward_None) + if (nav_earliest_child->ParentWindow == window && nav_earliest_child->DC.ParentLayoutType == ImGuiLayoutType_Horizontal && (g.NavMoveFlags & ImGuiNavMoveFlags_Forwarded) == 0) { // To do so we claim focus back, restore NavId and then process the movement request for yet another frame. - // This involve a one-frame delay which isn't very problematic in this situation. We could remove it by scoring in advance for multiple window (probably not worth the hassle/cost) + // This involve a one-frame delay which isn't very problematic in this situation. We could remove it by scoring in advance for multiple window (probably not worth bothering) const ImGuiNavLayer layer = ImGuiNavLayer_Menu; - IM_ASSERT(window->DC.NavLayerActiveMaskNext & (1 << layer)); // Sanity check + IM_ASSERT(window->DC.NavLayersActiveMaskNext & (1 << layer)); // Sanity check (FIXME: Seems unnecessary) FocusWindow(window); - SetNavIDWithRectRel(window->NavLastIds[layer], layer, window->NavRectRel[layer]); - g.NavLayer = layer; - g.NavDisableHighlight = true; // Hide highlight for the current frame so we don't see the intermediary selection. - g.NavMoveRequestForward = ImGuiNavForward_ForwardQueued; - NavMoveRequestCancel(); + SetNavID(window->NavLastIds[layer], layer, 0, window->NavRectRel[layer]); + // FIXME-NAV: How to deal with this when not using g.IO.ConfigNavCursorVisibleAuto? + if (g.NavCursorVisible) + { + g.NavCursorVisible = false; // Hide nav cursor for the current frame so we don't see the intermediary selection. Will be set again + g.NavCursorHideFrames = 2; + } + g.NavHighlightItemUnderNav = g.NavMousePosDirty = true; + NavMoveRequestForward(g.NavMoveDir, g.NavMoveClipDir, g.NavMoveFlags, g.NavMoveScrollFlags); // Repeat } } - IM_ASSERT(window->Flags & ImGuiWindowFlags_MenuBar); - IM_ASSERT(window->DC.MenuBarAppending); PopClipRect(); PopID(); - window->DC.MenuBarOffset.x = window->DC.CursorPos.x - window->MenuBarRect().Min.x; // Save horizontal position so next append can reuse it. This is kinda equivalent to a per-layer CursorPos. - window->DC.GroupStack.back().EmitItem = false; - EndGroup(); // Restore position on layer 0 + window->DC.MenuBarOffset.x = window->DC.CursorPos.x - window->Pos.x; // Save horizontal position so next append can reuse it. This is kinda equivalent to a per-layer CursorPos. + + // FIXME: Extremely confusing, cleanup by (a) working on WorkRect stack system (b) not using a Group confusingly here. + ImGuiGroupData& group_data = g.GroupStack.back(); + group_data.EmitItem = false; + ImVec2 restore_cursor_max_pos = group_data.BackupCursorMaxPos; + window->DC.IdealMaxPos.x = ImMax(window->DC.IdealMaxPos.x, window->DC.CursorMaxPos.x - window->Scroll.x); // Convert ideal extents for scrolling layer equivalent. + EndGroup(); // Restore position on layer 0 // FIXME: Misleading to use a group for that backup/restore window->DC.LayoutType = ImGuiLayoutType_Vertical; + window->DC.IsSameLine = false; window->DC.NavLayerCurrent = ImGuiNavLayer_Main; - window->DC.NavLayerCurrentMask = (1 << ImGuiNavLayer_Main); window->DC.MenuBarAppending = false; + window->DC.CursorMaxPos = restore_cursor_max_pos; } -bool ImGui::BeginMenu(const char* label, bool enabled) +// Important: calling order matters! +// FIXME: Somehow overlapping with docking tech. +// FIXME: The "rect-cut" aspect of this could be formalized into a lower-level helper (rect-cut: https://halt.software/dead-simple-layouts) +bool ImGui::BeginViewportSideBar(const char* name, ImGuiViewport* viewport_p, ImGuiDir dir, float axis_size, ImGuiWindowFlags window_flags) +{ + IM_ASSERT(dir != ImGuiDir_None); + + ImGuiWindow* bar_window = FindWindowByName(name); + ImGuiViewportP* viewport = (ImGuiViewportP*)(void*)(viewport_p ? viewport_p : GetMainViewport()); + if (bar_window == NULL || bar_window->BeginCount == 0) + { + // Calculate and set window size/position + ImRect avail_rect = viewport->GetBuildWorkRect(); + ImGuiAxis axis = (dir == ImGuiDir_Up || dir == ImGuiDir_Down) ? ImGuiAxis_Y : ImGuiAxis_X; + ImVec2 pos = avail_rect.Min; + if (dir == ImGuiDir_Right || dir == ImGuiDir_Down) + pos[axis] = avail_rect.Max[axis] - axis_size; + ImVec2 size = avail_rect.GetSize(); + size[axis] = axis_size; + SetNextWindowPos(pos); + SetNextWindowSize(size); + + // Report our size into work area (for next frame) using actual window size + if (dir == ImGuiDir_Up || dir == ImGuiDir_Left) + viewport->BuildWorkInsetMin[axis] += axis_size; + else if (dir == ImGuiDir_Down || dir == ImGuiDir_Right) + viewport->BuildWorkInsetMax[axis] += axis_size; + } + + window_flags |= ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDocking; + SetNextWindowViewport(viewport->ID); // Enforce viewport so we don't create our own viewport when ImGuiConfigFlags_ViewportsNoMerge is set. + PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f); + PushStyleVar(ImGuiStyleVar_WindowMinSize, ImVec2(0, 0)); // Lift normal size constraint + bool is_open = Begin(name, NULL, window_flags); + PopStyleVar(2); + + return is_open; +} + +bool ImGui::BeginMainMenuBar() +{ + ImGuiContext& g = *GImGui; + ImGuiViewportP* viewport = (ImGuiViewportP*)(void*)GetMainViewport(); + + // Notify of viewport change so GetFrameHeight() can be accurate in case of DPI change + SetCurrentViewport(NULL, viewport); + + // For the main menu bar, which cannot be moved, we honor g.Style.DisplaySafeAreaPadding to ensure text can be visible on a TV set. + // FIXME: This could be generalized as an opt-in way to clamp window->DC.CursorStartPos to avoid SafeArea? + // FIXME: Consider removing support for safe area down the line... it's messy. Nowadays consoles have support for TV calibration in OS settings. + g.NextWindowData.MenuBarOffsetMinVal = ImVec2(g.Style.DisplaySafeAreaPadding.x, ImMax(g.Style.DisplaySafeAreaPadding.y - g.Style.FramePadding.y, 0.0f)); + ImGuiWindowFlags window_flags = ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_MenuBar; + float height = GetFrameHeight(); + bool is_open = BeginViewportSideBar("##MainMenuBar", viewport, ImGuiDir_Up, height, window_flags); + g.NextWindowData.MenuBarOffsetMinVal = ImVec2(0.0f, 0.0f); + if (!is_open) + { + End(); + return false; + } + + // Temporarily disable _NoSavedSettings, in the off-chance that tables or child windows submitted within the menu-bar may want to use settings. (#8356) + g.CurrentWindow->Flags &= ~ImGuiWindowFlags_NoSavedSettings; + BeginMenuBar(); + return is_open; +} + +void ImGui::EndMainMenuBar() +{ + ImGuiContext& g = *GImGui; + if (!g.CurrentWindow->DC.MenuBarAppending) + { + IM_ASSERT_USER_ERROR(0, "Calling EndMainMenuBar() not from a menu-bar!"); // Not technically testing that it is the main menu bar + return; + } + + EndMenuBar(); + g.CurrentWindow->Flags |= ImGuiWindowFlags_NoSavedSettings; // Restore _NoSavedSettings (#8356) + + // When the user has left the menu layer (typically: closed menus through activation of an item), we restore focus to the previous window + // FIXME: With this strategy we won't be able to restore a NULL focus. + if (g.CurrentWindow == g.NavWindow && g.NavLayer == ImGuiNavLayer_Main && !g.NavAnyRequest && g.ActiveId == 0) + FocusTopMostWindowUnderOne(g.NavWindow, NULL, NULL, ImGuiFocusRequestFlags_UnlessBelowModal | ImGuiFocusRequestFlags_RestoreFocusedChild); + + End(); +} + +static bool IsRootOfOpenMenuSet() +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + if ((g.OpenPopupStack.Size <= g.BeginPopupStack.Size) || (window->Flags & ImGuiWindowFlags_ChildMenu)) + return false; + + // Initially we used 'upper_popup->OpenParentId == window->IDStack.back()' to differentiate multiple menu sets from each others + // (e.g. inside menu bar vs loose menu items) based on parent ID. + // This would however prevent the use of e.g. PushID() user code submitting menus. + // Previously this worked between popup and a first child menu because the first child menu always had the _ChildWindow flag, + // making hovering on parent popup possible while first child menu was focused - but this was generally a bug with other side effects. + // Instead we don't treat Popup specifically (in order to consistently support menu features in them), maybe the first child menu of a Popup + // doesn't have the _ChildWindow flag, and we rely on this IsRootOfOpenMenuSet() check to allow hovering between root window/popup and first child menu. + // In the end, lack of ID check made it so we could no longer differentiate between separate menu sets. To compensate for that, we at least check parent window nav layer. + // This fixes the most common case of menu opening on hover when moving between window content and menu bar. Multiple different menu sets in same nav layer would still + // open on hover, but that should be a lesser problem, because if such menus are close in proximity in window content then it won't feel weird and if they are far apart + // it likely won't be a problem anyone runs into. + const ImGuiPopupData* upper_popup = &g.OpenPopupStack[g.BeginPopupStack.Size]; + if (window->DC.NavLayerCurrent != upper_popup->ParentNavLayer) + return false; + return upper_popup->Window && (upper_popup->Window->Flags & ImGuiWindowFlags_ChildMenu) && ImGui::IsWindowChildOf(upper_popup->Window, window, true, false); +} + +bool ImGui::BeginMenuEx(const char* label, const char* icon, bool enabled) { ImGuiWindow* window = GetCurrentWindow(); if (window->SkipItems) @@ -6093,88 +8873,137 @@ bool ImGui::BeginMenu(const char* label, bool enabled) ImGuiContext& g = *GImGui; const ImGuiStyle& style = g.Style; const ImGuiID id = window->GetID(label); + bool menu_is_open = IsPopupOpen(id, ImGuiPopupFlags_None); + + // Sub-menus are ChildWindow so that mouse can be hovering across them (otherwise top-most popup menu would steal focus and not allow hovering on parent menu) + // The first menu in a hierarchy isn't so hovering doesn't get across (otherwise e.g. resizing borders with ImGuiButtonFlags_FlattenChildren would react), but top-most BeginMenu() will bypass that limitation. + ImGuiWindowFlags window_flags = ImGuiWindowFlags_ChildMenu | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoNavFocus; + if (window->Flags & ImGuiWindowFlags_ChildMenu) + window_flags |= ImGuiWindowFlags_ChildWindow; + + // If a menu with same the ID was already submitted, we will append to it, matching the behavior of Begin(). + // We are relying on a O(N) search - so O(N log N) over the frame - which seems like the most efficient for the expected small amount of BeginMenu() calls per frame. + // If somehow this is ever becoming a problem we can switch to use e.g. ImGuiStorage mapping key to last frame used. + if (g.MenusIdSubmittedThisFrame.contains(id)) + { + if (menu_is_open) + menu_is_open = BeginPopupMenuEx(id, label, window_flags); // menu_is_open can be 'false' when the popup is completely clipped (e.g. zero size display) + else + g.NextWindowData.ClearFlags(); // we behave like Begin() and need to consume those values + return menu_is_open; + } + + // Tag menu as used. Next time BeginMenu() with same ID is called it will append to existing menu + g.MenusIdSubmittedThisFrame.push_back(id); ImVec2 label_size = CalcTextSize(label, NULL, true); - bool pressed; - bool menu_is_open = IsPopupOpen(id); - bool menuset_is_open = !(window->Flags & ImGuiWindowFlags_Popup) && (g.OpenPopupStack.Size > g.BeginPopupStack.Size && g.OpenPopupStack[g.BeginPopupStack.Size].OpenParentId == window->IDStack.back()); - ImGuiWindow* backed_nav_window = g.NavWindow; + // Odd hack to allow hovering across menus of a same menu-set (otherwise we wouldn't be able to hover parent without always being a Child window) + // This is only done for items for the menu set and not the full parent window. + const bool menuset_is_open = IsRootOfOpenMenuSet(); if (menuset_is_open) - g.NavWindow = window; // Odd hack to allow hovering across menus of a same menu-set (otherwise we wouldn't be able to hover parent) + PushItemFlag(ImGuiItemFlags_NoWindowHoverableCheck, true); // The reference position stored in popup_pos will be used by Begin() to find a suitable position for the child menu, - // However the final position is going to be different! It is choosen by FindBestWindowPosForPopup(). + // However the final position is going to be different! It is chosen by FindBestWindowPosForPopup(). // e.g. Menus tend to overlap each other horizontally to amplify relative Z-ordering. ImVec2 popup_pos, pos = window->DC.CursorPos; + PushID(label); + if (!enabled) + BeginDisabled(); + const ImGuiMenuColumns* offsets = &window->DC.MenuColumns; + bool pressed; + + // We use ImGuiSelectableFlags_NoSetKeyOwner to allow down on one menu item, move, up on another. + const ImGuiSelectableFlags selectable_flags = ImGuiSelectableFlags_NoHoldingActiveID | ImGuiSelectableFlags_NoSetKeyOwner | ImGuiSelectableFlags_SelectOnClick | ImGuiSelectableFlags_NoAutoClosePopups; if (window->DC.LayoutType == ImGuiLayoutType_Horizontal) { - // Menu inside an horizontal menu bar + // Menu inside a horizontal menu bar // Selectable extend their highlight by half ItemSpacing in each direction. // For ChildMenu, the popup position will be overwritten by the call to FindBestWindowPosForPopup() in Begin() - popup_pos = ImVec2(pos.x - 1.0f - (float)(int)(style.ItemSpacing.x * 0.5f), pos.y - style.FramePadding.y + window->MenuBarHeight()); - window->DC.CursorPos.x += (float)(int)(style.ItemSpacing.x * 0.5f); - PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(style.ItemSpacing.x * 2.0f, style.ItemSpacing.y)); + popup_pos = ImVec2(pos.x - 1.0f - IM_TRUNC(style.ItemSpacing.x * 0.5f), pos.y - style.FramePadding.y + window->MenuBarHeight); + window->DC.CursorPos.x += IM_TRUNC(style.ItemSpacing.x * 0.5f); + PushStyleVarX(ImGuiStyleVar_ItemSpacing, style.ItemSpacing.x * 2.0f); float w = label_size.x; - pressed = Selectable(label, menu_is_open, ImGuiSelectableFlags_NoHoldingActiveID | ImGuiSelectableFlags_PressedOnClick | ImGuiSelectableFlags_DontClosePopups | (!enabled ? ImGuiSelectableFlags_Disabled : 0), ImVec2(w, 0.0f)); + ImVec2 text_pos(window->DC.CursorPos.x + offsets->OffsetLabel, window->DC.CursorPos.y + window->DC.CurrLineTextBaseOffset); + pressed = Selectable("", menu_is_open, selectable_flags, ImVec2(w, label_size.y)); + LogSetNextTextDecoration("[", "]"); + RenderText(text_pos, label); PopStyleVar(); - window->DC.CursorPos.x += (float)(int)(style.ItemSpacing.x * (-1.0f + 0.5f)); // -1 spacing to compensate the spacing added when Selectable() did a SameLine(). It would also work to call SameLine() ourselves after the PopStyleVar(). + window->DC.CursorPos.x += IM_TRUNC(style.ItemSpacing.x * (-1.0f + 0.5f)); // -1 spacing to compensate the spacing added when Selectable() did a SameLine(). It would also work to call SameLine() ourselves after the PopStyleVar(). } else { - // Menu inside a menu + // Menu inside a regular/vertical menu + // (In a typical menu window where all items are BeginMenu() or MenuItem() calls, extra_w will always be 0.0f. + // Only when they are other items sticking out we're going to add spacing, yet only register minimum width into the layout system. popup_pos = ImVec2(pos.x, pos.y - style.WindowPadding.y); - float w = window->MenuColumns.DeclColumns(label_size.x, 0.0f, (float)(int)(g.FontSize * 1.20f)); // Feedback to next frame - float extra_w = ImMax(0.0f, GetContentRegionAvail().x - w); - pressed = Selectable(label, menu_is_open, ImGuiSelectableFlags_NoHoldingActiveID | ImGuiSelectableFlags_PressedOnClick | ImGuiSelectableFlags_DontClosePopups | ImGuiSelectableFlags_DrawFillAvailWidth | (!enabled ? ImGuiSelectableFlags_Disabled : 0), ImVec2(w, 0.0f)); - ImU32 text_col = GetColorU32(enabled ? ImGuiCol_Text : ImGuiCol_TextDisabled); - RenderArrow(window->DrawList, pos + ImVec2(window->MenuColumns.Pos[2] + extra_w + g.FontSize * 0.30f, 0.0f), text_col, ImGuiDir_Right); + float icon_w = (icon && icon[0]) ? CalcTextSize(icon, NULL).x : 0.0f; + float checkmark_w = IM_TRUNC(g.FontSize * 1.20f); + float min_w = window->DC.MenuColumns.DeclColumns(icon_w, label_size.x, 0.0f, checkmark_w); // Feedback to next frame + float extra_w = ImMax(0.0f, GetContentRegionAvail().x - min_w); + ImVec2 text_pos(window->DC.CursorPos.x + offsets->OffsetLabel, window->DC.CursorPos.y + window->DC.CurrLineTextBaseOffset); + pressed = Selectable("", menu_is_open, selectable_flags | ImGuiSelectableFlags_SpanAvailWidth, ImVec2(min_w, label_size.y)); + LogSetNextTextDecoration("", ">"); + RenderText(text_pos, label); + if (icon_w > 0.0f) + RenderText(pos + ImVec2(offsets->OffsetIcon, 0.0f), icon); + RenderArrow(window->DrawList, pos + ImVec2(offsets->OffsetMark + extra_w + g.FontSize * 0.30f, 0.0f), GetColorU32(ImGuiCol_Text), ImGuiDir_Right); } + if (!enabled) + EndDisabled(); - const bool hovered = enabled && ItemHoverable(window->DC.LastItemRect, id); + const bool hovered = (g.HoveredId == id) && enabled && !g.NavHighlightItemUnderNav; if (menuset_is_open) - g.NavWindow = backed_nav_window; + PopItemFlag(); bool want_open = false; + bool want_open_nav_init = false; bool want_close = false; if (window->DC.LayoutType == ImGuiLayoutType_Vertical) // (window->Flags & (ImGuiWindowFlags_Popup|ImGuiWindowFlags_ChildMenu)) { // Close menu when not hovering it anymore unless we are moving roughly in the direction of the menu // Implement http://bjk5.com/post/44698559168/breaking-down-amazons-mega-dropdown to avoid using timers, so menus feels more reactive. - bool moving_toward_other_child_menu = false; - - ImGuiWindow* child_menu_window = (g.BeginPopupStack.Size < g.OpenPopupStack.Size && g.OpenPopupStack[g.BeginPopupStack.Size].SourceWindow == window) ? g.OpenPopupStack[g.BeginPopupStack.Size].Window : NULL; - if (g.HoveredWindow == window && child_menu_window != NULL && !(window->Flags & ImGuiWindowFlags_MenuBar)) + bool moving_toward_child_menu = false; + ImGuiPopupData* child_popup = (g.BeginPopupStack.Size < g.OpenPopupStack.Size) ? &g.OpenPopupStack[g.BeginPopupStack.Size] : NULL; // Popup candidate (testing below) + ImGuiWindow* child_menu_window = (child_popup && child_popup->Window && child_popup->Window->ParentWindow == window) ? child_popup->Window : NULL; + if (g.HoveredWindow == window && child_menu_window != NULL) { - // FIXME-DPI: Values should be derived from a master "scale" factor. - ImRect next_window_rect = child_menu_window->Rect(); - ImVec2 ta = g.IO.MousePos - g.IO.MouseDelta; - ImVec2 tb = (window->Pos.x < child_menu_window->Pos.x) ? next_window_rect.GetTL() : next_window_rect.GetTR(); - ImVec2 tc = (window->Pos.x < child_menu_window->Pos.x) ? next_window_rect.GetBL() : next_window_rect.GetBR(); - float extra = ImClamp(ImFabs(ta.x - tb.x) * 0.30f, 5.0f, 30.0f); // add a bit of extra slack. - ta.x += (window->Pos.x < child_menu_window->Pos.x) ? -0.5f : +0.5f; // to avoid numerical issues - tb.y = ta.y + ImMax((tb.y - extra) - ta.y, -100.0f); // triangle is maximum 200 high to limit the slope and the bias toward large sub-menus // FIXME: Multiply by fb_scale? - tc.y = ta.y + ImMin((tc.y + extra) - ta.y, +100.0f); - moving_toward_other_child_menu = ImTriangleContainsPoint(ta, tb, tc, g.IO.MousePos); - //GetForegroundDrawList()->AddTriangleFilled(ta, tb, tc, moving_within_opened_triangle ? IM_COL32(0,128,0,128) : IM_COL32(128,0,0,128)); // [DEBUG] + const float ref_unit = g.FontSize; // FIXME-DPI + const float child_dir = (window->Pos.x < child_menu_window->Pos.x) ? 1.0f : -1.0f; + const ImRect next_window_rect = child_menu_window->Rect(); + ImVec2 ta = (g.IO.MousePos - g.IO.MouseDelta); + ImVec2 tb = (child_dir > 0.0f) ? next_window_rect.GetTL() : next_window_rect.GetTR(); + ImVec2 tc = (child_dir > 0.0f) ? next_window_rect.GetBL() : next_window_rect.GetBR(); + const float pad_farmost_h = ImClamp(ImFabs(ta.x - tb.x) * 0.30f, ref_unit * 0.5f, ref_unit * 2.5f); // Add a bit of extra slack. + ta.x += child_dir * -0.5f; + tb.x += child_dir * ref_unit; + tc.x += child_dir * ref_unit; + tb.y = ta.y + ImMax((tb.y - pad_farmost_h) - ta.y, -ref_unit * 8.0f); // Triangle has maximum height to limit the slope and the bias toward large sub-menus + tc.y = ta.y + ImMin((tc.y + pad_farmost_h) - ta.y, +ref_unit * 8.0f); + moving_toward_child_menu = ImTriangleContainsPoint(ta, tb, tc, g.IO.MousePos); + //GetForegroundDrawList()->AddTriangleFilled(ta, tb, tc, moving_toward_child_menu ? IM_COL32(0,128,0,128) : IM_COL32(128,0,0,128)); // [DEBUG] } - if (menu_is_open && !hovered && g.HoveredWindow == window && g.HoveredIdPreviousFrame != 0 && g.HoveredIdPreviousFrame != id && !moving_toward_other_child_menu) + + // The 'HovereWindow == window' check creates an inconsistency (e.g. moving away from menu slowly tends to hit same window, whereas moving away fast does not) + // But we also need to not close the top-menu menu when moving over void. Perhaps we should extend the triangle check to a larger polygon. + // (Remember to test this on BeginPopup("A")->BeginMenu("B") sequence which behaves slightly differently as B isn't a Child of A and hovering isn't shared.) + if (menu_is_open && !hovered && g.HoveredWindow == window && !moving_toward_child_menu && !g.NavHighlightItemUnderNav && g.ActiveId == 0) want_close = true; - if (!menu_is_open && hovered && pressed) // Click to open + // Open + // (note: at this point 'hovered' actually includes the NavDisableMouseHover == false test) + if (!menu_is_open && pressed) // Click/activate to open want_open = true; - else if (!menu_is_open && hovered && !moving_toward_other_child_menu) // Hover to open + else if (!menu_is_open && hovered && !moving_toward_child_menu) // Hover to open want_open = true; - - if (g.NavActivateId == id) + else if (!menu_is_open && hovered && g.HoveredIdTimer >= 0.30f && g.MouseStationaryTimer >= 0.30f) // Hover to open (timer fallback) + want_open = true; + if (g.NavId == id && g.NavMoveDir == ImGuiDir_Right) // Nav-Right to open { - want_close = menu_is_open; - want_open = !menu_is_open; - } - if (g.NavId == id && g.NavMoveRequest && g.NavMoveDir == ImGuiDir_Right) // Nav-Right to open - { - want_open = true; + want_open = want_open_nav_init = true; NavMoveRequestCancel(); + SetNavCursorVisibleAfterMove(); } } else @@ -6189,7 +9018,7 @@ bool ImGui::BeginMenu(const char* label, bool enabled) { want_open = true; } - else if (g.NavId == id && g.NavMoveRequest && g.NavMoveDir == ImGuiDir_Down) // Nav-Down to open + else if (g.NavId == id && g.NavMoveDir == ImGuiDir_Down) // Nav-Down to open { want_open = true; NavMoveRequestCancel(); @@ -6198,52 +9027,79 @@ bool ImGui::BeginMenu(const char* label, bool enabled) if (!enabled) // explicitly close if an open menu becomes disabled, facilitate users code a lot in pattern such as 'if (BeginMenu("options", has_object)) { ..use object.. }' want_close = true; - if (want_close && IsPopupOpen(id)) + if (want_close && IsPopupOpen(id, ImGuiPopupFlags_None)) ClosePopupToLevel(g.BeginPopupStack.Size, true); - IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.ItemFlags | ImGuiItemStatusFlags_Openable | (menu_is_open ? ImGuiItemStatusFlags_Opened : 0)); + IMGUI_TEST_ENGINE_ITEM_INFO(id, label, g.LastItemData.StatusFlags | ImGuiItemStatusFlags_Openable | (menu_is_open ? ImGuiItemStatusFlags_Opened : 0)); + PopID(); - if (!menu_is_open && want_open && g.OpenPopupStack.Size > g.BeginPopupStack.Size) + if (want_open && !menu_is_open && g.OpenPopupStack.Size > g.BeginPopupStack.Size) { - // Don't recycle same menu level in the same frame, first close the other menu and yield for a frame. + // Don't reopen/recycle same menu level in the same frame if it is a different menu ID, first close the other menu and yield for a frame. OpenPopup(label); - return false; } - - menu_is_open |= want_open; - if (want_open) - OpenPopup(label); + else if (want_open) + { + menu_is_open = true; + OpenPopup(label, ImGuiPopupFlags_NoReopen);// | (want_open_nav_init ? ImGuiPopupFlags_NoReopenAlwaysNavInit : 0)); + } if (menu_is_open) { - // Sub-menus are ChildWindow so that mouse can be hovering across them (otherwise top-most popup menu would steal focus and not allow hovering on parent menu) - SetNextWindowPos(popup_pos, ImGuiCond_Always); - ImGuiWindowFlags flags = ImGuiWindowFlags_ChildMenu | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoNavFocus; - if (window->Flags & (ImGuiWindowFlags_Popup|ImGuiWindowFlags_ChildMenu)) - flags |= ImGuiWindowFlags_ChildWindow; - menu_is_open = BeginPopupEx(id, flags); // menu_is_open can be 'false' when the popup is completely clipped (e.g. zero size display) + ImGuiLastItemData last_item_in_parent = g.LastItemData; + SetNextWindowPos(popup_pos, ImGuiCond_Always); // Note: misleading: the value will serve as reference for FindBestWindowPosForPopup(), not actual pos. + PushStyleVar(ImGuiStyleVar_ChildRounding, style.PopupRounding); // First level will use _PopupRounding, subsequent will use _ChildRounding + menu_is_open = BeginPopupMenuEx(id, label, window_flags); // menu_is_open may be 'false' when the popup is completely clipped (e.g. zero size display) + PopStyleVar(); + if (menu_is_open) + { + // Implement what ImGuiPopupFlags_NoReopenAlwaysNavInit would do: + // Perform an init request in the case the popup was already open (via a previous mouse hover) + if (want_open && want_open_nav_init && !g.NavInitRequest) + { + FocusWindow(g.CurrentWindow, ImGuiFocusRequestFlags_UnlessBelowModal); + NavInitWindow(g.CurrentWindow, false); + } + + // Restore LastItemData so IsItemXXXX functions can work after BeginMenu()/EndMenu() + // (This fixes using IsItemClicked() and IsItemHovered(), but IsItemHovered() also relies on its support for ImGuiItemFlags_NoWindowHoverableCheck) + g.LastItemData = last_item_in_parent; + if (g.HoveredWindow == window) + g.LastItemData.StatusFlags |= ImGuiItemStatusFlags_HoveredWindow; + } + } + else + { + g.NextWindowData.ClearFlags(); // We behave like Begin() and need to consume those values } return menu_is_open; } +bool ImGui::BeginMenu(const char* label, bool enabled) +{ + return BeginMenuEx(label, NULL, enabled); +} + void ImGui::EndMenu() { - // Nav: When a left move request _within our child menu_ failed, close ourselves (the _parent_ menu). - // A menu doesn't close itself because EndMenuBar() wants the catch the last Left<>Right inputs. - // However, it means that with the current code, a BeginMenu() from outside another menu or a menu-bar won't be closable with the Left direction. + // Nav: When a left move request our menu failed, close ourselves. ImGuiContext& g = *GImGui; ImGuiWindow* window = g.CurrentWindow; - if (g.NavWindow && g.NavWindow->ParentWindow == window && g.NavMoveDir == ImGuiDir_Left && NavMoveRequestButNoResultYet() && window->DC.LayoutType == ImGuiLayoutType_Vertical) - { - ClosePopupToLevel(g.BeginPopupStack.Size, true); - NavMoveRequestCancel(); - } + IM_ASSERT(window->Flags & ImGuiWindowFlags_Popup); // Mismatched BeginMenu()/EndMenu() calls + ImGuiWindow* parent_window = window->ParentWindow; // Should always be != NULL is we passed assert. + if (window->BeginCount == window->BeginCountPreviousFrame) + if (g.NavMoveDir == ImGuiDir_Left && NavMoveRequestButNoResultYet()) + if (g.NavWindow && (g.NavWindow->RootWindowForNav == window) && parent_window->DC.LayoutType == ImGuiLayoutType_Vertical) + { + ClosePopupToLevel(g.BeginPopupStack.Size - 1, true); + NavMoveRequestCancel(); + } EndPopup(); } -bool ImGui::MenuItem(const char* label, const char* shortcut, bool selected, bool enabled) +bool ImGui::MenuItemEx(const char* label, const char* icon, const char* shortcut, bool selected, bool enabled) { ImGuiWindow* window = GetCurrentWindow(); if (window->SkipItems) @@ -6254,44 +9110,80 @@ bool ImGui::MenuItem(const char* label, const char* shortcut, bool selected, boo ImVec2 pos = window->DC.CursorPos; ImVec2 label_size = CalcTextSize(label, NULL, true); + // See BeginMenuEx() for comments about this. + const bool menuset_is_open = IsRootOfOpenMenuSet(); + if (menuset_is_open) + PushItemFlag(ImGuiItemFlags_NoWindowHoverableCheck, true); + // We've been using the equivalent of ImGuiSelectableFlags_SetNavIdOnHover on all Selectable() since early Nav system days (commit 43ee5d73), // but I am unsure whether this should be kept at all. For now moved it to be an opt-in feature used by menus only. - ImGuiSelectableFlags flags = ImGuiSelectableFlags_PressedOnRelease | ImGuiSelectableFlags_SetNavIdOnHover | (enabled ? 0 : ImGuiSelectableFlags_Disabled); bool pressed; + PushID(label); + if (!enabled) + BeginDisabled(); + + // We use ImGuiSelectableFlags_NoSetKeyOwner to allow down on one menu item, move, up on another. + const ImGuiSelectableFlags selectable_flags = ImGuiSelectableFlags_SelectOnRelease | ImGuiSelectableFlags_NoSetKeyOwner | ImGuiSelectableFlags_SetNavIdOnHover; + const ImGuiMenuColumns* offsets = &window->DC.MenuColumns; if (window->DC.LayoutType == ImGuiLayoutType_Horizontal) { // Mimic the exact layout spacing of BeginMenu() to allow MenuItem() inside a menu bar, which is a little misleading but may be useful - // Note that in this situation we render neither the shortcut neither the selected tick mark + // Note that in this situation: we don't render the shortcut, we render a highlight instead of the selected tick mark. float w = label_size.x; - window->DC.CursorPos.x += (float)(int)(style.ItemSpacing.x * 0.5f); - PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(style.ItemSpacing.x * 2.0f, style.ItemSpacing.y)); - pressed = Selectable(label, false, flags, ImVec2(w, 0.0f)); + window->DC.CursorPos.x += IM_TRUNC(style.ItemSpacing.x * 0.5f); + ImVec2 text_pos(window->DC.CursorPos.x + offsets->OffsetLabel, window->DC.CursorPos.y + window->DC.CurrLineTextBaseOffset); + PushStyleVarX(ImGuiStyleVar_ItemSpacing, style.ItemSpacing.x * 2.0f); + pressed = Selectable("", selected, selectable_flags, ImVec2(w, 0.0f)); PopStyleVar(); - window->DC.CursorPos.x += (float)(int)(style.ItemSpacing.x * (-1.0f + 0.5f)); // -1 spacing to compensate the spacing added when Selectable() did a SameLine(). It would also work to call SameLine() ourselves after the PopStyleVar(). + if (g.LastItemData.StatusFlags & ImGuiItemStatusFlags_Visible) + RenderText(text_pos, label); + window->DC.CursorPos.x += IM_TRUNC(style.ItemSpacing.x * (-1.0f + 0.5f)); // -1 spacing to compensate the spacing added when Selectable() did a SameLine(). It would also work to call SameLine() ourselves after the PopStyleVar(). } else { - ImVec2 shortcut_size = shortcut ? CalcTextSize(shortcut, NULL) : ImVec2(0.0f, 0.0f); - float w = window->MenuColumns.DeclColumns(label_size.x, shortcut_size.x, (float)(int)(g.FontSize * 1.20f)); // Feedback for next frame - float extra_w = ImMax(0.0f, GetContentRegionAvail().x - w); - pressed = Selectable(label, false, flags | ImGuiSelectableFlags_DrawFillAvailWidth, ImVec2(w, 0.0f)); - if (shortcut_size.x > 0.0f) + // Menu item inside a vertical menu + // (In a typical menu window where all items are BeginMenu() or MenuItem() calls, extra_w will always be 0.0f. + // Only when they are other items sticking out we're going to add spacing, yet only register minimum width into the layout system. + float icon_w = (icon && icon[0]) ? CalcTextSize(icon, NULL).x : 0.0f; + float shortcut_w = (shortcut && shortcut[0]) ? CalcTextSize(shortcut, NULL).x : 0.0f; + float checkmark_w = IM_TRUNC(g.FontSize * 1.20f); + float min_w = window->DC.MenuColumns.DeclColumns(icon_w, label_size.x, shortcut_w, checkmark_w); // Feedback for next frame + float stretch_w = ImMax(0.0f, GetContentRegionAvail().x - min_w); + pressed = Selectable("", false, selectable_flags | ImGuiSelectableFlags_SpanAvailWidth, ImVec2(min_w, label_size.y)); + if (g.LastItemData.StatusFlags & ImGuiItemStatusFlags_Visible) { - PushStyleColor(ImGuiCol_Text, g.Style.Colors[ImGuiCol_TextDisabled]); - RenderText(pos + ImVec2(window->MenuColumns.Pos[1] + extra_w, 0.0f), shortcut, NULL, false); - PopStyleColor(); + RenderText(pos + ImVec2(offsets->OffsetLabel, 0.0f), label); + if (icon_w > 0.0f) + RenderText(pos + ImVec2(offsets->OffsetIcon, 0.0f), icon); + if (shortcut_w > 0.0f) + { + PushStyleColor(ImGuiCol_Text, style.Colors[ImGuiCol_TextDisabled]); + LogSetNextTextDecoration("(", ")"); + RenderText(pos + ImVec2(offsets->OffsetShortcut + stretch_w, 0.0f), shortcut, NULL, false); + PopStyleColor(); + } + if (selected) + RenderCheckMark(window->DrawList, pos + ImVec2(offsets->OffsetMark + stretch_w + g.FontSize * 0.40f, g.FontSize * 0.134f * 0.5f), GetColorU32(ImGuiCol_Text), g.FontSize * 0.866f); } - if (selected) - RenderCheckMark(pos + ImVec2(window->MenuColumns.Pos[2] + extra_w + g.FontSize * 0.40f, g.FontSize * 0.134f * 0.5f), GetColorU32(enabled ? ImGuiCol_Text : ImGuiCol_TextDisabled), g.FontSize * 0.866f); } + IMGUI_TEST_ENGINE_ITEM_INFO(g.LastItemData.ID, label, g.LastItemData.StatusFlags | ImGuiItemStatusFlags_Checkable | (selected ? ImGuiItemStatusFlags_Checked : 0)); + if (!enabled) + EndDisabled(); + PopID(); + if (menuset_is_open) + PopItemFlag(); - IMGUI_TEST_ENGINE_ITEM_INFO(window->DC.LastItemId, label, window->DC.ItemFlags | ImGuiItemStatusFlags_Checkable | (selected ? ImGuiItemStatusFlags_Checked : 0)); return pressed; } +bool ImGui::MenuItem(const char* label, const char* shortcut, bool selected, bool enabled) +{ + return MenuItemEx(label, NULL, shortcut, selected, enabled); +} + bool ImGui::MenuItem(const char* label, const char* shortcut, bool* p_selected, bool enabled) { - if (MenuItem(label, shortcut, p_selected ? *p_selected : false, enabled)) + if (MenuItemEx(label, NULL, shortcut, p_selected ? *p_selected : false, enabled)) { if (p_selected) *p_selected = !*p_selected; @@ -6303,9 +9195,6 @@ bool ImGui::MenuItem(const char* label, const char* shortcut, bool* p_selected, //------------------------------------------------------------------------- // [SECTION] Widgets: BeginTabBar, EndTabBar, etc. //------------------------------------------------------------------------- -// [BETA API] API may evolve! This code has been extracted out of the Docking branch, -// and some of the construct which are not used in Master may be left here to facilitate merging. -//------------------------------------------------------------------------- // - BeginTabBar() // - BeginTabBarEx() [Internal] // - EndTabBar() @@ -6313,46 +9202,71 @@ bool ImGui::MenuItem(const char* label, const char* shortcut, bool* p_selected, // - TabBarCalcTabID() [Internal] // - TabBarCalcMaxTabWidth() [Internal] // - TabBarFindTabById() [Internal] +// - TabBarFindTabByOrder() [Internal] +// - TabBarFindMostRecentlySelectedTabForActiveWindow() [Internal] +// - TabBarGetCurrentTab() [Internal] +// - TabBarGetTabName() [Internal] +// - TabBarAddTab() [Internal] // - TabBarRemoveTab() [Internal] // - TabBarCloseTab() [Internal] -// - TabBarScrollClamp()v +// - TabBarScrollClamp() [Internal] // - TabBarScrollToTab() [Internal] -// - TabBarQueueChangeTabOrder() [Internal] +// - TabBarQueueFocus() [Internal] +// - TabBarQueueReorder() [Internal] +// - TabBarProcessReorderFromMousePos() [Internal] +// - TabBarProcessReorder() [Internal] // - TabBarScrollingButtons() [Internal] // - TabBarTabListPopupButton() [Internal] //------------------------------------------------------------------------- +struct ImGuiTabBarSection +{ + int TabCount; // Number of tabs in this section. + float Width; // Sum of width of tabs in this section (after shrinking down) + float Spacing; // Horizontal spacing at the end of the section. + + ImGuiTabBarSection() { memset(this, 0, sizeof(*this)); } +}; + namespace ImGui { static void TabBarLayout(ImGuiTabBar* tab_bar); - static ImU32 TabBarCalcTabID(ImGuiTabBar* tab_bar, const char* label); + static ImU32 TabBarCalcTabID(ImGuiTabBar* tab_bar, const char* label, ImGuiWindow* docked_window); static float TabBarCalcMaxTabWidth(); static float TabBarScrollClamp(ImGuiTabBar* tab_bar, float scrolling); - static void TabBarScrollToTab(ImGuiTabBar* tab_bar, ImGuiTabItem* tab); + static void TabBarScrollToTab(ImGuiTabBar* tab_bar, ImGuiID tab_id, ImGuiTabBarSection* sections); static ImGuiTabItem* TabBarScrollingButtons(ImGuiTabBar* tab_bar); static ImGuiTabItem* TabBarTabListPopupButton(ImGuiTabBar* tab_bar); } ImGuiTabBar::ImGuiTabBar() { - ID = 0; - SelectedTabId = NextSelectedTabId = VisibleTabId = 0; + memset(this, 0, sizeof(*this)); CurrFrameVisible = PrevFrameVisible = -1; - LastTabContentHeight = 0.0f; - OffsetMax = OffsetMaxIdeal = OffsetNextTab = 0.0f; - ScrollingAnim = ScrollingTarget = ScrollingTargetDistToVisibility = ScrollingSpeed = 0.0f; - Flags = ImGuiTabBarFlags_None; - ReorderRequestTabId = 0; - ReorderRequestDir = 0; - WantLayout = VisibleTabWasSubmitted = false; LastTabItemIdx = -1; } -static int IMGUI_CDECL TabItemComparerByVisibleOffset(const void* lhs, const void* rhs) +static inline int TabItemGetSectionIdx(const ImGuiTabItem* tab) +{ + return (tab->Flags & ImGuiTabItemFlags_Leading) ? 0 : (tab->Flags & ImGuiTabItemFlags_Trailing) ? 2 : 1; +} + +static int IMGUI_CDECL TabItemComparerBySection(const void* lhs, const void* rhs) { const ImGuiTabItem* a = (const ImGuiTabItem*)lhs; const ImGuiTabItem* b = (const ImGuiTabItem*)rhs; - return (int)(a->Offset - b->Offset); + const int a_section = TabItemGetSectionIdx(a); + const int b_section = TabItemGetSectionIdx(b); + if (a_section != b_section) + return a_section - b_section; + return (int)(a->IndexDuringLayout - b->IndexDuringLayout); +} + +static int IMGUI_CDECL TabItemComparerByBeginOrder(const void* lhs, const void* rhs) +{ + const ImGuiTabItem* a = (const ImGuiTabItem*)lhs; + const ImGuiTabItem* b = (const ImGuiTabItem*)rhs; + return (int)(a->BeginOrder - b->BeginOrder); } static ImGuiTabBar* GetTabBarFromTabBarRef(const ImGuiPtrOrIndex& ref) @@ -6380,7 +9294,11 @@ bool ImGui::BeginTabBar(const char* str_id, ImGuiTabBarFlags flags) ImGuiTabBar* tab_bar = g.TabBars.GetOrAddByKey(id); ImRect tab_bar_bb = ImRect(window->DC.CursorPos.x, window->DC.CursorPos.y, window->WorkRect.Max.x, window->DC.CursorPos.y + g.FontSize + g.Style.FramePadding.y * 2); tab_bar->ID = id; - return BeginTabBarEx(tab_bar, tab_bar_bb, flags | ImGuiTabBarFlags_IsFocused); + tab_bar->SeparatorMinX = tab_bar->BarRect.Min.x - IM_TRUNC(window->WindowPadding.x * 0.5f); + tab_bar->SeparatorMaxX = tab_bar->BarRect.Max.x + IM_TRUNC(window->WindowPadding.x * 0.5f); + //if (g.NavWindow && IsWindowChildOf(g.NavWindow, window, false, false)) + flags |= ImGuiTabBarFlags_IsFocused; + return BeginTabBarEx(tab_bar, tab_bar_bb, flags); } bool ImGui::BeginTabBarEx(ImGuiTabBar* tab_bar, const ImRect& tab_bar_bb, ImGuiTabBarFlags flags) @@ -6390,24 +9308,29 @@ bool ImGui::BeginTabBarEx(ImGuiTabBar* tab_bar, const ImRect& tab_bar_bb, ImG if (window->SkipItems) return false; + IM_ASSERT(tab_bar->ID != 0); if ((flags & ImGuiTabBarFlags_DockNode) == 0) PushOverrideID(tab_bar->ID); // Add to stack g.CurrentTabBarStack.push_back(GetTabBarRefFromTabBar(tab_bar)); g.CurrentTabBar = tab_bar; + tab_bar->Window = window; + // Append with multiple BeginTabBar()/EndTabBar() pairs. + tab_bar->BackupCursorPos = window->DC.CursorPos; if (tab_bar->CurrFrameVisible == g.FrameCount) { - //IMGUI_DEBUG_LOG("BeginTabBarEx already called this frame\n", g.FrameCount); - IM_ASSERT(0); + window->DC.CursorPos = ImVec2(tab_bar->BarRect.Min.x, tab_bar->BarRect.Max.y + tab_bar->ItemSpacingY); + tab_bar->BeginCount++; return true; } - // When toggling back from ordered to manually-reorderable, shuffle tabs to enforce the last visible order. - // Otherwise, the most recently inserted tabs would move at the end of visible list which can be a little too confusing or magic for the user. - if ((flags & ImGuiTabBarFlags_Reorderable) && !(tab_bar->Flags & ImGuiTabBarFlags_Reorderable) && tab_bar->Tabs.Size > 1 && tab_bar->PrevFrameVisible != -1) - ImQsort(tab_bar->Tabs.Data, tab_bar->Tabs.Size, sizeof(ImGuiTabItem), TabItemComparerByVisibleOffset); + // Ensure correct ordering when toggling ImGuiTabBarFlags_Reorderable flag, or when a new tab was added while being not reorderable + if ((flags & ImGuiTabBarFlags_Reorderable) != (tab_bar->Flags & ImGuiTabBarFlags_Reorderable) || (tab_bar->TabsAddedNew && !(flags & ImGuiTabBarFlags_Reorderable))) + if ((flags & ImGuiTabBarFlags_DockNode) == 0) // FIXME: TabBar with DockNode can now be hybrid + ImQsort(tab_bar->Tabs.Data, tab_bar->Tabs.Size, sizeof(ImGuiTabItem), TabItemComparerByBeginOrder); + tab_bar->TabsAddedNew = false; // Flags if ((flags & ImGuiTabBarFlags_FittingPolicyMask_) == 0) @@ -6418,19 +9341,24 @@ bool ImGui::BeginTabBarEx(ImGuiTabBar* tab_bar, const ImRect& tab_bar_bb, ImG tab_bar->WantLayout = true; // Layout will be done on the first call to ItemTab() tab_bar->PrevFrameVisible = tab_bar->CurrFrameVisible; tab_bar->CurrFrameVisible = g.FrameCount; + tab_bar->PrevTabsContentsHeight = tab_bar->CurrTabsContentsHeight; + tab_bar->CurrTabsContentsHeight = 0.0f; + tab_bar->ItemSpacingY = g.Style.ItemSpacing.y; tab_bar->FramePadding = g.Style.FramePadding; + tab_bar->TabsActiveCount = 0; + tab_bar->LastTabItemIdx = -1; + tab_bar->BeginCount = 1; - // Layout - ItemSize(ImVec2(tab_bar->OffsetMaxIdeal, tab_bar->BarRect.GetHeight())); - window->DC.CursorPos.x = tab_bar->BarRect.Min.x; + // Set cursor pos in a way which only be used in the off-chance the user erroneously submits item before BeginTabItem(): items will overlap + window->DC.CursorPos = ImVec2(tab_bar->BarRect.Min.x, tab_bar->BarRect.Max.y + tab_bar->ItemSpacingY); // Draw separator - const ImU32 col = GetColorU32((flags & ImGuiTabBarFlags_IsFocused) ? ImGuiCol_TabActive : ImGuiCol_TabUnfocusedActive); - const float y = tab_bar->BarRect.Max.y - 1.0f; + // (it would be misleading to draw this in EndTabBar() suggesting that it may be drawn over tabs, as tab bar are appendable) + const ImU32 col = GetColorU32((flags & ImGuiTabBarFlags_IsFocused) ? ImGuiCol_TabSelected : ImGuiCol_TabDimmedSelected); + if (g.Style.TabBarBorderSize > 0.0f) { - const float separator_min_x = tab_bar->BarRect.Min.x - ImFloor(window->WindowPadding.x * 0.5f); - const float separator_max_x = tab_bar->BarRect.Max.x + ImFloor(window->WindowPadding.x * 0.5f); - window->DrawList->AddLine(ImVec2(separator_min_x, y), ImVec2(separator_max_x, y), col, 1.0f); + const float y = tab_bar->BarRect.Max.y; + window->DrawList->AddRectFilled(ImVec2(tab_bar->SeparatorMinX, y - g.Style.TabBarBorderSize), ImVec2(tab_bar->SeparatorMaxX, y), col); } return true; } @@ -6445,19 +9373,29 @@ void ImGui::EndTabBar() ImGuiTabBar* tab_bar = g.CurrentTabBar; if (tab_bar == NULL) { - IM_ASSERT(tab_bar != NULL && "Mismatched BeginTabBar()/EndTabBar()!"); - return; // FIXME-ERRORHANDLING + IM_ASSERT_USER_ERROR(tab_bar != NULL, "Mismatched BeginTabBar()/EndTabBar()!"); + return; } + + // Fallback in case no TabItem have been submitted if (tab_bar->WantLayout) TabBarLayout(tab_bar); // Restore the last visible height if no tab is visible, this reduce vertical flicker/movement when a tabs gets removed without calling SetTabItemClosed(). const bool tab_bar_appearing = (tab_bar->PrevFrameVisible + 1 < g.FrameCount); if (tab_bar->VisibleTabWasSubmitted || tab_bar->VisibleTabId == 0 || tab_bar_appearing) - tab_bar->LastTabContentHeight = ImMax(window->DC.CursorPos.y - tab_bar->BarRect.Max.y, 0.0f); + { + tab_bar->CurrTabsContentsHeight = ImMax(window->DC.CursorPos.y - tab_bar->BarRect.Max.y, tab_bar->CurrTabsContentsHeight); + window->DC.CursorPos.y = tab_bar->BarRect.Max.y + tab_bar->CurrTabsContentsHeight; + } else - window->DC.CursorPos.y = tab_bar->BarRect.Max.y + tab_bar->LastTabContentHeight; + { + window->DC.CursorPos.y = tab_bar->BarRect.Max.y + tab_bar->PrevTabsContentsHeight; + } + if (tab_bar->BeginCount > 1) + window->DC.CursorPos = tab_bar->BackupCursorPos; + tab_bar->LastTabItemIdx = -1; if ((tab_bar->Flags & ImGuiTabBarFlags_DockNode) == 0) PopID(); @@ -6465,6 +9403,12 @@ void ImGui::EndTabBar() g.CurrentTabBar = g.CurrentTabBarStack.empty() ? NULL : GetTabBarFromTabBarRef(g.CurrentTabBarStack.back()); } +// Scrolling happens only in the central section (leading/trailing sections are not scrolling) +static float TabBarCalcScrollableWidth(ImGuiTabBar* tab_bar, ImGuiTabBarSection* sections) +{ + return tab_bar->BarRect.GetWidth() - sections[0].Width - sections[2].Width - sections[1].Spacing; +} + // This is called only once a frame before by the first call to ItemTab() // The reason we're not calling it in BeginTabBar() is to leave a chance to the user to call the SetTabItemClosed() functions. static void ImGui::TabBarLayout(ImGuiTabBar* tab_bar) @@ -6472,149 +9416,222 @@ static void ImGui::TabBarLayout(ImGuiTabBar* tab_bar) ImGuiContext& g = *GImGui; tab_bar->WantLayout = false; - // Garbage collect + // Garbage collect by compacting list + // Detect if we need to sort out tab list (e.g. in rare case where a tab changed section) int tab_dst_n = 0; + bool need_sort_by_section = false; + ImGuiTabBarSection sections[3]; // Layout sections: Leading, Central, Trailing for (int tab_src_n = 0; tab_src_n < tab_bar->Tabs.Size; tab_src_n++) { ImGuiTabItem* tab = &tab_bar->Tabs[tab_src_n]; - if (tab->LastFrameVisible < tab_bar->PrevFrameVisible) + if (tab->LastFrameVisible < tab_bar->PrevFrameVisible || tab->WantClose) { - if (tab->ID == tab_bar->SelectedTabId) - tab_bar->SelectedTabId = 0; + // Remove tab + if (tab_bar->VisibleTabId == tab->ID) { tab_bar->VisibleTabId = 0; } + if (tab_bar->SelectedTabId == tab->ID) { tab_bar->SelectedTabId = 0; } + if (tab_bar->NextSelectedTabId == tab->ID) { tab_bar->NextSelectedTabId = 0; } continue; } if (tab_dst_n != tab_src_n) tab_bar->Tabs[tab_dst_n] = tab_bar->Tabs[tab_src_n]; + + tab = &tab_bar->Tabs[tab_dst_n]; + tab->IndexDuringLayout = (ImS16)tab_dst_n; + + // We will need sorting if tabs have changed section (e.g. moved from one of Leading/Central/Trailing to another) + int curr_tab_section_n = TabItemGetSectionIdx(tab); + if (tab_dst_n > 0) + { + ImGuiTabItem* prev_tab = &tab_bar->Tabs[tab_dst_n - 1]; + int prev_tab_section_n = TabItemGetSectionIdx(prev_tab); + if (curr_tab_section_n == 0 && prev_tab_section_n != 0) + need_sort_by_section = true; + if (prev_tab_section_n == 2 && curr_tab_section_n != 2) + need_sort_by_section = true; + } + + sections[curr_tab_section_n].TabCount++; tab_dst_n++; } if (tab_bar->Tabs.Size != tab_dst_n) tab_bar->Tabs.resize(tab_dst_n); + if (need_sort_by_section) + ImQsort(tab_bar->Tabs.Data, tab_bar->Tabs.Size, sizeof(ImGuiTabItem), TabItemComparerBySection); + + // Calculate spacing between sections + sections[0].Spacing = sections[0].TabCount > 0 && (sections[1].TabCount + sections[2].TabCount) > 0 ? g.Style.ItemInnerSpacing.x : 0.0f; + sections[1].Spacing = sections[1].TabCount > 0 && sections[2].TabCount > 0 ? g.Style.ItemInnerSpacing.x : 0.0f; + // Setup next selected tab - ImGuiID scroll_track_selected_tab_id = 0; + ImGuiID scroll_to_tab_id = 0; if (tab_bar->NextSelectedTabId) { tab_bar->SelectedTabId = tab_bar->NextSelectedTabId; tab_bar->NextSelectedTabId = 0; - scroll_track_selected_tab_id = tab_bar->SelectedTabId; + scroll_to_tab_id = tab_bar->SelectedTabId; } // Process order change request (we could probably process it when requested but it's just saner to do it in a single spot). if (tab_bar->ReorderRequestTabId != 0) { - if (ImGuiTabItem* tab1 = TabBarFindTabByID(tab_bar, tab_bar->ReorderRequestTabId)) - { - //IM_ASSERT(tab_bar->Flags & ImGuiTabBarFlags_Reorderable); // <- this may happen when using debug tools - int tab2_order = tab_bar->GetTabOrder(tab1) + tab_bar->ReorderRequestDir; - if (tab2_order >= 0 && tab2_order < tab_bar->Tabs.Size) - { - ImGuiTabItem* tab2 = &tab_bar->Tabs[tab2_order]; - ImGuiTabItem item_tmp = *tab1; - *tab1 = *tab2; - *tab2 = item_tmp; - if (tab2->ID == tab_bar->SelectedTabId) - scroll_track_selected_tab_id = tab2->ID; - tab1 = tab2 = NULL; - } - if (tab_bar->Flags & ImGuiTabBarFlags_SaveSettings) - MarkIniSettingsDirty(); - } + if (TabBarProcessReorder(tab_bar)) + if (tab_bar->ReorderRequestTabId == tab_bar->SelectedTabId) + scroll_to_tab_id = tab_bar->ReorderRequestTabId; tab_bar->ReorderRequestTabId = 0; } // Tab List Popup (will alter tab_bar->BarRect and therefore the available width!) const bool tab_list_popup_button = (tab_bar->Flags & ImGuiTabBarFlags_TabListPopupButton) != 0; if (tab_list_popup_button) - if (ImGuiTabItem* tab_to_select = TabBarTabListPopupButton(tab_bar)) // NB: Will alter BarRect.Max.x! - scroll_track_selected_tab_id = tab_bar->SelectedTabId = tab_to_select->ID; + if (ImGuiTabItem* tab_to_select = TabBarTabListPopupButton(tab_bar)) // NB: Will alter BarRect.Min.x! + scroll_to_tab_id = tab_bar->SelectedTabId = tab_to_select->ID; - // Compute ideal widths + // Leading/Trailing tabs will be shrink only if central one aren't visible anymore, so layout the shrink data as: leading, trailing, central + // (whereas our tabs are stored as: leading, central, trailing) + int shrink_buffer_indexes[3] = { 0, sections[0].TabCount + sections[2].TabCount, sections[0].TabCount }; g.ShrinkWidthBuffer.resize(tab_bar->Tabs.Size); - float width_total_contents = 0.0f; + + // Compute ideal tabs widths + store them into shrink buffer ImGuiTabItem* most_recently_selected_tab = NULL; + int curr_section_n = -1; bool found_selected_tab_id = false; for (int tab_n = 0; tab_n < tab_bar->Tabs.Size; tab_n++) { ImGuiTabItem* tab = &tab_bar->Tabs[tab_n]; IM_ASSERT(tab->LastFrameVisible >= tab_bar->PrevFrameVisible); - if (most_recently_selected_tab == NULL || most_recently_selected_tab->LastFrameSelected < tab->LastFrameSelected) + if ((most_recently_selected_tab == NULL || most_recently_selected_tab->LastFrameSelected < tab->LastFrameSelected) && !(tab->Flags & ImGuiTabItemFlags_Button)) most_recently_selected_tab = tab; if (tab->ID == tab_bar->SelectedTabId) found_selected_tab_id = true; + if (scroll_to_tab_id == 0 && g.NavJustMovedToId == tab->ID) + scroll_to_tab_id = tab->ID; // Refresh tab width immediately, otherwise changes of style e.g. style.FramePadding.x would noticeably lag in the tab bar. // Additionally, when using TabBarAddTab() to manipulate tab bar order we occasionally insert new tabs that don't have a width yet, // and we cannot wait for the next BeginTabItem() call. We cannot compute this width within TabBarAddTab() because font size depends on the active window. - const char* tab_name = tab_bar->GetTabName(tab); - const bool has_close_button = (tab->Flags & ImGuiTabItemFlags_NoCloseButton) ? false : true; - tab->WidthContents = TabItemCalcSize(tab_name, has_close_button).x; + const char* tab_name = TabBarGetTabName(tab_bar, tab); + const bool has_close_button_or_unsaved_marker = (tab->Flags & ImGuiTabItemFlags_NoCloseButton) == 0 || (tab->Flags & ImGuiTabItemFlags_UnsavedDocument); + tab->ContentWidth = (tab->RequestedWidth >= 0.0f) ? tab->RequestedWidth : TabItemCalcSize(tab_name, has_close_button_or_unsaved_marker).x; - width_total_contents += (tab_n > 0 ? g.Style.ItemInnerSpacing.x : 0.0f) + tab->WidthContents; + int section_n = TabItemGetSectionIdx(tab); + ImGuiTabBarSection* section = §ions[section_n]; + section->Width += tab->ContentWidth + (section_n == curr_section_n ? g.Style.ItemInnerSpacing.x : 0.0f); + curr_section_n = section_n; // Store data so we can build an array sorted by width if we need to shrink tabs down - g.ShrinkWidthBuffer[tab_n].Index = tab_n; - g.ShrinkWidthBuffer[tab_n].Width = tab->WidthContents; + IM_MSVC_WARNING_SUPPRESS(6385); + ImGuiShrinkWidthItem* shrink_width_item = &g.ShrinkWidthBuffer[shrink_buffer_indexes[section_n]++]; + shrink_width_item->Index = tab_n; + shrink_width_item->Width = shrink_width_item->InitialWidth = tab->ContentWidth; + tab->Width = ImMax(tab->ContentWidth, 1.0f); } - // Compute width - const float initial_offset_x = 0.0f; // g.Style.ItemInnerSpacing.x; - const float width_avail = ImMax(tab_bar->BarRect.GetWidth() - initial_offset_x, 0.0f); - float width_excess = (width_avail < width_total_contents) ? (width_total_contents - width_avail) : 0.0f; - if (width_excess > 0.0f && (tab_bar->Flags & ImGuiTabBarFlags_FittingPolicyResizeDown)) - { - // If we don't have enough room, resize down the largest tabs first - ShrinkWidths(g.ShrinkWidthBuffer.Data, g.ShrinkWidthBuffer.Size, width_excess); - for (int tab_n = 0; tab_n < tab_bar->Tabs.Size; tab_n++) - tab_bar->Tabs[g.ShrinkWidthBuffer[tab_n].Index].Width = (float)(int)g.ShrinkWidthBuffer[tab_n].Width; - } - else - { - const float tab_max_width = TabBarCalcMaxTabWidth(); - for (int tab_n = 0; tab_n < tab_bar->Tabs.Size; tab_n++) + // Compute total ideal width (used for e.g. auto-resizing a window) + tab_bar->WidthAllTabsIdeal = 0.0f; + for (int section_n = 0; section_n < 3; section_n++) + tab_bar->WidthAllTabsIdeal += sections[section_n].Width + sections[section_n].Spacing; + + // Horizontal scrolling buttons + // (note that TabBarScrollButtons() will alter BarRect.Max.x) + if ((tab_bar->WidthAllTabsIdeal > tab_bar->BarRect.GetWidth() && tab_bar->Tabs.Size > 1) && !(tab_bar->Flags & ImGuiTabBarFlags_NoTabListScrollingButtons) && (tab_bar->Flags & ImGuiTabBarFlags_FittingPolicyScroll)) + if (ImGuiTabItem* scroll_and_select_tab = TabBarScrollingButtons(tab_bar)) { - ImGuiTabItem* tab = &tab_bar->Tabs[tab_n]; - tab->Width = ImMin(tab->WidthContents, tab_max_width); - IM_ASSERT(tab->Width > 0.0f); + scroll_to_tab_id = scroll_and_select_tab->ID; + if ((scroll_and_select_tab->Flags & ImGuiTabItemFlags_Button) == 0) + tab_bar->SelectedTabId = scroll_to_tab_id; + } + + // Shrink widths if full tabs don't fit in their allocated space + float section_0_w = sections[0].Width + sections[0].Spacing; + float section_1_w = sections[1].Width + sections[1].Spacing; + float section_2_w = sections[2].Width + sections[2].Spacing; + bool central_section_is_visible = (section_0_w + section_2_w) < tab_bar->BarRect.GetWidth(); + float width_excess; + if (central_section_is_visible) + width_excess = ImMax(section_1_w - (tab_bar->BarRect.GetWidth() - section_0_w - section_2_w), 0.0f); // Excess used to shrink central section + else + width_excess = (section_0_w + section_2_w) - tab_bar->BarRect.GetWidth(); // Excess used to shrink leading/trailing section + + // With ImGuiTabBarFlags_FittingPolicyScroll policy, we will only shrink leading/trailing if the central section is not visible anymore + if (width_excess >= 1.0f && ((tab_bar->Flags & ImGuiTabBarFlags_FittingPolicyResizeDown) || !central_section_is_visible)) + { + int shrink_data_count = (central_section_is_visible ? sections[1].TabCount : sections[0].TabCount + sections[2].TabCount); + int shrink_data_offset = (central_section_is_visible ? sections[0].TabCount + sections[2].TabCount : 0); + ShrinkWidths(g.ShrinkWidthBuffer.Data + shrink_data_offset, shrink_data_count, width_excess); + + // Apply shrunk values into tabs and sections + for (int tab_n = shrink_data_offset; tab_n < shrink_data_offset + shrink_data_count; tab_n++) + { + ImGuiTabItem* tab = &tab_bar->Tabs[g.ShrinkWidthBuffer[tab_n].Index]; + float shrinked_width = IM_TRUNC(g.ShrinkWidthBuffer[tab_n].Width); + if (shrinked_width < 0.0f) + continue; + + shrinked_width = ImMax(1.0f, shrinked_width); + int section_n = TabItemGetSectionIdx(tab); + sections[section_n].Width -= (tab->Width - shrinked_width); + tab->Width = shrinked_width; } } // Layout all active tabs - float offset_x = initial_offset_x; - float offset_x_ideal = offset_x; - tab_bar->OffsetNextTab = offset_x; // This is used by non-reorderable tab bar where the submission order is always honored. - for (int tab_n = 0; tab_n < tab_bar->Tabs.Size; tab_n++) + int section_tab_index = 0; + float tab_offset = 0.0f; + tab_bar->WidthAllTabs = 0.0f; + for (int section_n = 0; section_n < 3; section_n++) { - ImGuiTabItem* tab = &tab_bar->Tabs[tab_n]; - tab->Offset = offset_x; - if (scroll_track_selected_tab_id == 0 && g.NavJustMovedToId == tab->ID) - scroll_track_selected_tab_id = tab->ID; - offset_x += tab->Width + g.Style.ItemInnerSpacing.x; - offset_x_ideal += tab->WidthContents + g.Style.ItemInnerSpacing.x; - } - tab_bar->OffsetMax = ImMax(offset_x - g.Style.ItemInnerSpacing.x, 0.0f); - tab_bar->OffsetMaxIdeal = ImMax(offset_x_ideal - g.Style.ItemInnerSpacing.x, 0.0f); + ImGuiTabBarSection* section = §ions[section_n]; + if (section_n == 2) + tab_offset = ImMin(ImMax(0.0f, tab_bar->BarRect.GetWidth() - section->Width), tab_offset); - // Horizontal scrolling buttons - const bool scrolling_buttons = (tab_bar->OffsetMax > tab_bar->BarRect.GetWidth() && tab_bar->Tabs.Size > 1) && !(tab_bar->Flags & ImGuiTabBarFlags_NoTabListScrollingButtons) && (tab_bar->Flags & ImGuiTabBarFlags_FittingPolicyScroll); - if (scrolling_buttons) - if (ImGuiTabItem* tab_to_select = TabBarScrollingButtons(tab_bar)) // NB: Will alter BarRect.Max.x! - scroll_track_selected_tab_id = tab_bar->SelectedTabId = tab_to_select->ID; + for (int tab_n = 0; tab_n < section->TabCount; tab_n++) + { + ImGuiTabItem* tab = &tab_bar->Tabs[section_tab_index + tab_n]; + tab->Offset = tab_offset; + tab->NameOffset = -1; + tab_offset += tab->Width + (tab_n < section->TabCount - 1 ? g.Style.ItemInnerSpacing.x : 0.0f); + } + tab_bar->WidthAllTabs += ImMax(section->Width + section->Spacing, 0.0f); + tab_offset += section->Spacing; + section_tab_index += section->TabCount; + } + + // Clear name buffers + tab_bar->TabsNames.Buf.resize(0); // If we have lost the selected tab, select the next most recently active one if (found_selected_tab_id == false) tab_bar->SelectedTabId = 0; if (tab_bar->SelectedTabId == 0 && tab_bar->NextSelectedTabId == 0 && most_recently_selected_tab != NULL) - scroll_track_selected_tab_id = tab_bar->SelectedTabId = most_recently_selected_tab->ID; + scroll_to_tab_id = tab_bar->SelectedTabId = most_recently_selected_tab->ID; // Lock in visible tab tab_bar->VisibleTabId = tab_bar->SelectedTabId; tab_bar->VisibleTabWasSubmitted = false; + // CTRL+TAB can override visible tab temporarily + if (g.NavWindowingTarget != NULL && g.NavWindowingTarget->DockNode && g.NavWindowingTarget->DockNode->TabBar == tab_bar) + tab_bar->VisibleTabId = scroll_to_tab_id = g.NavWindowingTarget->TabId; + + // Apply request requests + if (scroll_to_tab_id != 0) + TabBarScrollToTab(tab_bar, scroll_to_tab_id, sections); + else if ((tab_bar->Flags & ImGuiTabBarFlags_FittingPolicyScroll) && IsMouseHoveringRect(tab_bar->BarRect.Min, tab_bar->BarRect.Max, true) && IsWindowContentHoverable(g.CurrentWindow)) + { + const float wheel = g.IO.MouseWheelRequestAxisSwap ? g.IO.MouseWheel : g.IO.MouseWheelH; + const ImGuiKey wheel_key = g.IO.MouseWheelRequestAxisSwap ? ImGuiKey_MouseWheelY : ImGuiKey_MouseWheelX; + if (TestKeyOwner(wheel_key, tab_bar->ID) && wheel != 0.0f) + { + const float scroll_step = wheel * TabBarCalcScrollableWidth(tab_bar, sections) / 3.0f; + tab_bar->ScrollingTargetDistToVisibility = 0.0f; + tab_bar->ScrollingTarget = TabBarScrollClamp(tab_bar, tab_bar->ScrollingTarget - scroll_step); + } + SetKeyOwner(wheel_key, tab_bar->ID); + } + // Update scrolling - if (scroll_track_selected_tab_id) - if (ImGuiTabItem* scroll_track_selected_tab = TabBarFindTabByID(tab_bar, scroll_track_selected_tab_id)) - TabBarScrollToTab(tab_bar, scroll_track_selected_tab); tab_bar->ScrollingAnim = TabBarScrollClamp(tab_bar, tab_bar->ScrollingAnim); tab_bar->ScrollingTarget = TabBarScrollClamp(tab_bar, tab_bar->ScrollingTarget); if (tab_bar->ScrollingAnim != tab_bar->ScrollingTarget) @@ -6630,18 +9647,24 @@ static void ImGui::TabBarLayout(ImGuiTabBar* tab_bar) { tab_bar->ScrollingSpeed = 0.0f; } + tab_bar->ScrollingRectMinX = tab_bar->BarRect.Min.x + sections[0].Width + sections[0].Spacing; + tab_bar->ScrollingRectMaxX = tab_bar->BarRect.Max.x - sections[2].Width - sections[1].Spacing; - // Clear name buffers - if ((tab_bar->Flags & ImGuiTabBarFlags_DockNode) == 0) - tab_bar->TabsNames.Buf.resize(0); + // Actual layout in host window (we don't do it in BeginTabBar() so as not to waste an extra frame) + ImGuiWindow* window = g.CurrentWindow; + window->DC.CursorPos = tab_bar->BarRect.Min; + ItemSize(ImVec2(tab_bar->WidthAllTabs, tab_bar->BarRect.GetHeight()), tab_bar->FramePadding.y); + window->DC.IdealMaxPos.x = ImMax(window->DC.IdealMaxPos.x, tab_bar->BarRect.Min.x + tab_bar->WidthAllTabsIdeal); } -// Dockables uses Name/ID in the global namespace. Non-dockable items use the ID stack. -static ImU32 ImGui::TabBarCalcTabID(ImGuiTabBar* tab_bar, const char* label) +// Dockable windows uses Name/ID in the global namespace. Non-dockable items use the ID stack. +static ImU32 ImGui::TabBarCalcTabID(ImGuiTabBar* tab_bar, const char* label, ImGuiWindow* docked_window) { - if (tab_bar->Flags & ImGuiTabBarFlags_DockNode) + if (docked_window != NULL) { - ImGuiID id = ImHashStr(label); + IM_UNUSED(tab_bar); + IM_ASSERT(tab_bar->Flags & ImGuiTabBarFlags_DockNode); + ImGuiID id = docked_window->TabId; KeepAliveID(id); return id; } @@ -6667,7 +9690,67 @@ ImGuiTabItem* ImGui::TabBarFindTabByID(ImGuiTabBar* tab_bar, ImGuiID tab_id) return NULL; } -// The *TabId fields be already set by the docking system _before_ the actual TabItem was created, so we clear them regardless. +// Order = visible order, not submission order! (which is tab->BeginOrder) +ImGuiTabItem* ImGui::TabBarFindTabByOrder(ImGuiTabBar* tab_bar, int order) +{ + if (order < 0 || order >= tab_bar->Tabs.Size) + return NULL; + return &tab_bar->Tabs[order]; +} + +// FIXME: See references to #2304 in TODO.txt +ImGuiTabItem* ImGui::TabBarFindMostRecentlySelectedTabForActiveWindow(ImGuiTabBar* tab_bar) +{ + ImGuiTabItem* most_recently_selected_tab = NULL; + for (int tab_n = 0; tab_n < tab_bar->Tabs.Size; tab_n++) + { + ImGuiTabItem* tab = &tab_bar->Tabs[tab_n]; + if (most_recently_selected_tab == NULL || most_recently_selected_tab->LastFrameSelected < tab->LastFrameSelected) + if (tab->Window && tab->Window->WasActive) + most_recently_selected_tab = tab; + } + return most_recently_selected_tab; +} + +ImGuiTabItem* ImGui::TabBarGetCurrentTab(ImGuiTabBar* tab_bar) +{ + if (tab_bar->LastTabItemIdx < 0 || tab_bar->LastTabItemIdx >= tab_bar->Tabs.Size) + return NULL; + return &tab_bar->Tabs[tab_bar->LastTabItemIdx]; +} + +const char* ImGui::TabBarGetTabName(ImGuiTabBar* tab_bar, ImGuiTabItem* tab) +{ + if (tab->Window) + return tab->Window->Name; + if (tab->NameOffset == -1) + return "N/A"; + IM_ASSERT(tab->NameOffset < tab_bar->TabsNames.Buf.Size); + return tab_bar->TabsNames.Buf.Data + tab->NameOffset; +} + +// The purpose of this call is to register tab in advance so we can control their order at the time they appear. +// Otherwise calling this is unnecessary as tabs are appending as needed by the BeginTabItem() function. +void ImGui::TabBarAddTab(ImGuiTabBar* tab_bar, ImGuiTabItemFlags tab_flags, ImGuiWindow* window) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(TabBarFindTabByID(tab_bar, window->TabId) == NULL); + IM_ASSERT(g.CurrentTabBar != tab_bar); // Can't work while the tab bar is active as our tab doesn't have an X offset yet, in theory we could/should test something like (tab_bar->CurrFrameVisible < g.FrameCount) but we'd need to solve why triggers the commented early-out assert in BeginTabBarEx() (probably dock node going from implicit to explicit in same frame) + + if (!window->HasCloseButton) + tab_flags |= ImGuiTabItemFlags_NoCloseButton; // Set _NoCloseButton immediately because it will be used for first-frame width calculation. + + ImGuiTabItem new_tab; + new_tab.ID = window->TabId; + new_tab.Flags = tab_flags; + new_tab.LastFrameVisible = tab_bar->CurrFrameVisible; // Required so BeginTabBar() doesn't ditch the tab + if (new_tab.LastFrameVisible == -1) + new_tab.LastFrameVisible = g.FrameCount - 1; + new_tab.Window = window; // Required so tab bar layout can compute the tab width before tab submission + tab_bar->Tabs.push_back(new_tab); +} + +// The *TabId fields are already set by the docking system _before_ the actual TabItem was created, so we clear them regardless. void ImGui::TabBarRemoveTab(ImGuiTabBar* tab_bar, ImGuiID tab_id) { if (ImGuiTabItem* tab = TabBarFindTabByID(tab_bar, tab_id)) @@ -6680,52 +9763,153 @@ void ImGui::TabBarRemoveTab(ImGuiTabBar* tab_bar, ImGuiID tab_id) // Called on manual closure attempt void ImGui::TabBarCloseTab(ImGuiTabBar* tab_bar, ImGuiTabItem* tab) { - if ((tab_bar->VisibleTabId == tab->ID) && !(tab->Flags & ImGuiTabItemFlags_UnsavedDocument)) + if (tab->Flags & ImGuiTabItemFlags_Button) + return; // A button appended with TabItemButton(). + + if ((tab->Flags & (ImGuiTabItemFlags_UnsavedDocument | ImGuiTabItemFlags_NoAssumedClosure)) == 0) { // This will remove a frame of lag for selecting another tab on closure. // However we don't run it in the case where the 'Unsaved' flag is set, so user gets a chance to fully undo the closure - tab->LastFrameVisible = -1; - tab_bar->SelectedTabId = tab_bar->NextSelectedTabId = 0; + tab->WantClose = true; + if (tab_bar->VisibleTabId == tab->ID) + { + tab->LastFrameVisible = -1; + tab_bar->SelectedTabId = tab_bar->NextSelectedTabId = 0; + } } - else if ((tab_bar->VisibleTabId != tab->ID) && (tab->Flags & ImGuiTabItemFlags_UnsavedDocument)) + else { - // Actually select before expecting closure - tab_bar->NextSelectedTabId = tab->ID; + // Actually select before expecting closure attempt (on an UnsavedDocument tab user is expect to e.g. show a popup) + if (tab_bar->VisibleTabId != tab->ID) + TabBarQueueFocus(tab_bar, tab); } } static float ImGui::TabBarScrollClamp(ImGuiTabBar* tab_bar, float scrolling) { - scrolling = ImMin(scrolling, tab_bar->OffsetMax - tab_bar->BarRect.GetWidth()); + scrolling = ImMin(scrolling, tab_bar->WidthAllTabs - tab_bar->BarRect.GetWidth()); return ImMax(scrolling, 0.0f); } -static void ImGui::TabBarScrollToTab(ImGuiTabBar* tab_bar, ImGuiTabItem* tab) +// Note: we may scroll to tab that are not selected! e.g. using keyboard arrow keys +static void ImGui::TabBarScrollToTab(ImGuiTabBar* tab_bar, ImGuiID tab_id, ImGuiTabBarSection* sections) { + ImGuiTabItem* tab = TabBarFindTabByID(tab_bar, tab_id); + if (tab == NULL) + return; + if (tab->Flags & ImGuiTabItemFlags_SectionMask_) + return; + ImGuiContext& g = *GImGui; float margin = g.FontSize * 1.0f; // When to scroll to make Tab N+1 visible always make a bit of N visible to suggest more scrolling area (since we don't have a scrollbar) - int order = tab_bar->GetTabOrder(tab); - float tab_x1 = tab->Offset + (order > 0 ? -margin : 0.0f); - float tab_x2 = tab->Offset + tab->Width + (order + 1 < tab_bar->Tabs.Size ? margin : 1.0f); + int order = TabBarGetTabOrder(tab_bar, tab); + + // Scrolling happens only in the central section (leading/trailing sections are not scrolling) + float scrollable_width = TabBarCalcScrollableWidth(tab_bar, sections); + + // We make all tabs positions all relative Sections[0].Width to make code simpler + float tab_x1 = tab->Offset - sections[0].Width + (order > sections[0].TabCount - 1 ? -margin : 0.0f); + float tab_x2 = tab->Offset - sections[0].Width + tab->Width + (order + 1 < tab_bar->Tabs.Size - sections[2].TabCount ? margin : 1.0f); tab_bar->ScrollingTargetDistToVisibility = 0.0f; - if (tab_bar->ScrollingTarget > tab_x1 || (tab_x2 - tab_x1 >= tab_bar->BarRect.GetWidth())) + if (tab_bar->ScrollingTarget > tab_x1 || (tab_x2 - tab_x1 >= scrollable_width)) { + // Scroll to the left tab_bar->ScrollingTargetDistToVisibility = ImMax(tab_bar->ScrollingAnim - tab_x2, 0.0f); tab_bar->ScrollingTarget = tab_x1; } - else if (tab_bar->ScrollingTarget < tab_x2 - tab_bar->BarRect.GetWidth()) + else if (tab_bar->ScrollingTarget < tab_x2 - scrollable_width) { - tab_bar->ScrollingTargetDistToVisibility = ImMax((tab_x1 - tab_bar->BarRect.GetWidth()) - tab_bar->ScrollingAnim, 0.0f); - tab_bar->ScrollingTarget = tab_x2 - tab_bar->BarRect.GetWidth(); + // Scroll to the right + tab_bar->ScrollingTargetDistToVisibility = ImMax((tab_x1 - scrollable_width) - tab_bar->ScrollingAnim, 0.0f); + tab_bar->ScrollingTarget = tab_x2 - scrollable_width; } } -void ImGui::TabBarQueueChangeTabOrder(ImGuiTabBar* tab_bar, const ImGuiTabItem* tab, int dir) +void ImGui::TabBarQueueFocus(ImGuiTabBar* tab_bar, ImGuiTabItem* tab) { - IM_ASSERT(dir == -1 || dir == +1); + tab_bar->NextSelectedTabId = tab->ID; +} + +void ImGui::TabBarQueueFocus(ImGuiTabBar* tab_bar, const char* tab_name) +{ + IM_ASSERT((tab_bar->Flags & ImGuiTabBarFlags_DockNode) == 0); // Only supported for manual/explicit tab bars + ImGuiID tab_id = TabBarCalcTabID(tab_bar, tab_name, NULL); + tab_bar->NextSelectedTabId = tab_id; +} + +void ImGui::TabBarQueueReorder(ImGuiTabBar* tab_bar, ImGuiTabItem* tab, int offset) +{ + IM_ASSERT(offset != 0); IM_ASSERT(tab_bar->ReorderRequestTabId == 0); tab_bar->ReorderRequestTabId = tab->ID; - tab_bar->ReorderRequestDir = (ImS8)dir; + tab_bar->ReorderRequestOffset = (ImS16)offset; +} + +void ImGui::TabBarQueueReorderFromMousePos(ImGuiTabBar* tab_bar, ImGuiTabItem* src_tab, ImVec2 mouse_pos) +{ + ImGuiContext& g = *GImGui; + IM_ASSERT(tab_bar->ReorderRequestTabId == 0); + if ((tab_bar->Flags & ImGuiTabBarFlags_Reorderable) == 0) + return; + + const bool is_central_section = (src_tab->Flags & ImGuiTabItemFlags_SectionMask_) == 0; + const float bar_offset = tab_bar->BarRect.Min.x - (is_central_section ? tab_bar->ScrollingTarget : 0); + + // Count number of contiguous tabs we are crossing over + const int dir = (bar_offset + src_tab->Offset) > mouse_pos.x ? -1 : +1; + const int src_idx = tab_bar->Tabs.index_from_ptr(src_tab); + int dst_idx = src_idx; + for (int i = src_idx; i >= 0 && i < tab_bar->Tabs.Size; i += dir) + { + // Reordered tabs must share the same section + const ImGuiTabItem* dst_tab = &tab_bar->Tabs[i]; + if (dst_tab->Flags & ImGuiTabItemFlags_NoReorder) + break; + if ((dst_tab->Flags & ImGuiTabItemFlags_SectionMask_) != (src_tab->Flags & ImGuiTabItemFlags_SectionMask_)) + break; + dst_idx = i; + + // Include spacing after tab, so when mouse cursor is between tabs we would not continue checking further tabs that are not hovered. + const float x1 = bar_offset + dst_tab->Offset - g.Style.ItemInnerSpacing.x; + const float x2 = bar_offset + dst_tab->Offset + dst_tab->Width + g.Style.ItemInnerSpacing.x; + //GetForegroundDrawList()->AddRect(ImVec2(x1, tab_bar->BarRect.Min.y), ImVec2(x2, tab_bar->BarRect.Max.y), IM_COL32(255, 0, 0, 255)); + if ((dir < 0 && mouse_pos.x > x1) || (dir > 0 && mouse_pos.x < x2)) + break; + } + + if (dst_idx != src_idx) + TabBarQueueReorder(tab_bar, src_tab, dst_idx - src_idx); +} + +bool ImGui::TabBarProcessReorder(ImGuiTabBar* tab_bar) +{ + ImGuiTabItem* tab1 = TabBarFindTabByID(tab_bar, tab_bar->ReorderRequestTabId); + if (tab1 == NULL || (tab1->Flags & ImGuiTabItemFlags_NoReorder)) + return false; + + //IM_ASSERT(tab_bar->Flags & ImGuiTabBarFlags_Reorderable); // <- this may happen when using debug tools + int tab2_order = TabBarGetTabOrder(tab_bar, tab1) + tab_bar->ReorderRequestOffset; + if (tab2_order < 0 || tab2_order >= tab_bar->Tabs.Size) + return false; + + // Reordered tabs must share the same section + // (Note: TabBarQueueReorderFromMousePos() also has a similar test but since we allow direct calls to TabBarQueueReorder() we do it here too) + ImGuiTabItem* tab2 = &tab_bar->Tabs[tab2_order]; + if (tab2->Flags & ImGuiTabItemFlags_NoReorder) + return false; + if ((tab1->Flags & ImGuiTabItemFlags_SectionMask_) != (tab2->Flags & ImGuiTabItemFlags_SectionMask_)) + return false; + + ImGuiTabItem item_tmp = *tab1; + ImGuiTabItem* src_tab = (tab_bar->ReorderRequestOffset > 0) ? tab1 + 1 : tab2; + ImGuiTabItem* dst_tab = (tab_bar->ReorderRequestOffset > 0) ? tab1 : tab2 + 1; + const int move_count = (tab_bar->ReorderRequestOffset > 0) ? tab_bar->ReorderRequestOffset : -tab_bar->ReorderRequestOffset; + memmove(dst_tab, src_tab, move_count * sizeof(ImGuiTabItem)); + *tab2 = item_tmp; + + if (tab_bar->Flags & ImGuiTabBarFlags_SaveSettings) + MarkIniSettingsDirty(); + return true; } static ImGuiTabItem* ImGui::TabBarScrollingButtons(ImGuiTabBar* tab_bar) @@ -6739,47 +9923,56 @@ static ImGuiTabItem* ImGui::TabBarScrollingButtons(ImGuiTabBar* tab_bar) const ImVec2 backup_cursor_pos = window->DC.CursorPos; //window->DrawList->AddRect(ImVec2(tab_bar->BarRect.Max.x - scrolling_buttons_width, tab_bar->BarRect.Min.y), ImVec2(tab_bar->BarRect.Max.x, tab_bar->BarRect.Max.y), IM_COL32(255,0,0,255)); - const ImRect avail_bar_rect = tab_bar->BarRect; - bool want_clip_rect = !avail_bar_rect.Contains(ImRect(window->DC.CursorPos, window->DC.CursorPos + ImVec2(scrolling_buttons_width, 0.0f))); - if (want_clip_rect) - PushClipRect(tab_bar->BarRect.Min, tab_bar->BarRect.Max + ImVec2(g.Style.ItemInnerSpacing.x, 0.0f), true); - - ImGuiTabItem* tab_to_select = NULL; - int select_dir = 0; ImVec4 arrow_col = g.Style.Colors[ImGuiCol_Text]; arrow_col.w *= 0.5f; PushStyleColor(ImGuiCol_Text, arrow_col); PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0)); + PushItemFlag(ImGuiItemFlags_ButtonRepeat, true); const float backup_repeat_delay = g.IO.KeyRepeatDelay; const float backup_repeat_rate = g.IO.KeyRepeatRate; g.IO.KeyRepeatDelay = 0.250f; g.IO.KeyRepeatRate = 0.200f; - window->DC.CursorPos = ImVec2(tab_bar->BarRect.Max.x - scrolling_buttons_width, tab_bar->BarRect.Min.y); - if (ArrowButtonEx("##<", ImGuiDir_Left, arrow_button_size, ImGuiButtonFlags_PressedOnClick | ImGuiButtonFlags_Repeat)) + float x = ImMax(tab_bar->BarRect.Min.x, tab_bar->BarRect.Max.x - scrolling_buttons_width); + window->DC.CursorPos = ImVec2(x, tab_bar->BarRect.Min.y); + if (ArrowButtonEx("##<", ImGuiDir_Left, arrow_button_size, ImGuiButtonFlags_PressedOnClick)) select_dir = -1; - window->DC.CursorPos = ImVec2(tab_bar->BarRect.Max.x - scrolling_buttons_width + arrow_button_size.x, tab_bar->BarRect.Min.y); - if (ArrowButtonEx("##>", ImGuiDir_Right, arrow_button_size, ImGuiButtonFlags_PressedOnClick | ImGuiButtonFlags_Repeat)) + window->DC.CursorPos = ImVec2(x + arrow_button_size.x, tab_bar->BarRect.Min.y); + if (ArrowButtonEx("##>", ImGuiDir_Right, arrow_button_size, ImGuiButtonFlags_PressedOnClick)) select_dir = +1; + PopItemFlag(); PopStyleColor(2); g.IO.KeyRepeatRate = backup_repeat_rate; g.IO.KeyRepeatDelay = backup_repeat_delay; - if (want_clip_rect) - PopClipRect(); - + ImGuiTabItem* tab_to_scroll_to = NULL; if (select_dir != 0) if (ImGuiTabItem* tab_item = TabBarFindTabByID(tab_bar, tab_bar->SelectedTabId)) { - int selected_order = tab_bar->GetTabOrder(tab_item); + int selected_order = TabBarGetTabOrder(tab_bar, tab_item); int target_order = selected_order + select_dir; - tab_to_select = &tab_bar->Tabs[(target_order >= 0 && target_order < tab_bar->Tabs.Size) ? target_order : selected_order]; // If we are at the end of the list, still scroll to make our tab visible + + // Skip tab item buttons until another tab item is found or end is reached + while (tab_to_scroll_to == NULL) + { + // If we are at the end of the list, still scroll to make our tab visible + tab_to_scroll_to = &tab_bar->Tabs[(target_order >= 0 && target_order < tab_bar->Tabs.Size) ? target_order : selected_order]; + + // Cross through buttons + // (even if first/last item is a button, return it so we can update the scroll) + if (tab_to_scroll_to->Flags & ImGuiTabItemFlags_Button) + { + target_order += select_dir; + selected_order += select_dir; + tab_to_scroll_to = (target_order < 0 || target_order >= tab_bar->Tabs.Size) ? tab_to_scroll_to : NULL; + } + } } window->DC.CursorPos = backup_cursor_pos; tab_bar->BarRect.Max.x -= scrolling_buttons_width + 1.0f; - return tab_to_select; + return tab_to_scroll_to; } static ImGuiTabItem* ImGui::TabBarTabListPopupButton(ImGuiTabBar* tab_bar) @@ -6797,7 +9990,7 @@ static ImGuiTabItem* ImGui::TabBarTabListPopupButton(ImGuiTabBar* tab_bar) arrow_col.w *= 0.5f; PushStyleColor(ImGuiCol_Text, arrow_col); PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0)); - bool open = BeginCombo("##v", NULL, ImGuiComboFlags_NoPreview); + bool open = BeginCombo("##v", NULL, ImGuiComboFlags_NoPreview | ImGuiComboFlags_HeightLargest); PopStyleColor(2); ImGuiTabItem* tab_to_select = NULL; @@ -6806,7 +9999,10 @@ static ImGuiTabItem* ImGui::TabBarTabListPopupButton(ImGuiTabBar* tab_bar) for (int tab_n = 0; tab_n < tab_bar->Tabs.Size; tab_n++) { ImGuiTabItem* tab = &tab_bar->Tabs[tab_n]; - const char* tab_name = tab_bar->GetTabName(tab); + if (tab->Flags & ImGuiTabItemFlags_Button) + continue; + + const char* tab_name = TabBarGetTabName(tab_bar, tab); if (Selectable(tab_name, tab_bar->SelectedTabId == tab->ID)) tab_to_select = tab; } @@ -6820,11 +10016,9 @@ static ImGuiTabItem* ImGui::TabBarTabListPopupButton(ImGuiTabBar* tab_bar) //------------------------------------------------------------------------- // [SECTION] Widgets: BeginTabItem, EndTabItem, etc. //------------------------------------------------------------------------- -// [BETA API] API may evolve! This code has been extracted out of the Docking branch, -// and some of the construct which are not used in Master may be left here to facilitate merging. -//------------------------------------------------------------------------- // - BeginTabItem() // - EndTabItem() +// - TabItemButton() // - TabItemEx() [Internal] // - SetTabItemClosed() // - TabItemCalcSize() [Internal] @@ -6842,10 +10036,12 @@ bool ImGui::BeginTabItem(const char* label, bool* p_open, ImGuiTabItemFlags f ImGuiTabBar* tab_bar = g.CurrentTabBar; if (tab_bar == NULL) { - IM_ASSERT(tab_bar && "Needs to be called between BeginTabBar() and EndTabBar()!"); - return false; // FIXME-ERRORHANDLING + IM_ASSERT_USER_ERROR(tab_bar, "Needs to be called between BeginTabBar() and EndTabBar()!"); + return false; } - bool ret = TabItemEx(tab_bar, label, p_open, flags); + IM_ASSERT((flags & ImGuiTabItemFlags_Button) == 0); // BeginTabItem() Can't be used with button flags, use TabItemButton() instead! + + bool ret = TabItemEx(tab_bar, label, p_open, flags, NULL); if (ret && !(flags & ImGuiTabItemFlags_NoPushId)) { ImGuiTabItem* tab = &tab_bar->Tabs[tab_bar->LastTabItemIdx]; @@ -6864,40 +10060,82 @@ void ImGui::EndTabItem() ImGuiTabBar* tab_bar = g.CurrentTabBar; if (tab_bar == NULL) { - IM_ASSERT(tab_bar != NULL && "Needs to be called between BeginTabBar() and EndTabBar()!"); + IM_ASSERT_USER_ERROR(tab_bar != NULL, "Needs to be called between BeginTabBar() and EndTabBar()!"); return; } IM_ASSERT(tab_bar->LastTabItemIdx >= 0); ImGuiTabItem* tab = &tab_bar->Tabs[tab_bar->LastTabItemIdx]; if (!(tab->Flags & ImGuiTabItemFlags_NoPushId)) - window->IDStack.pop_back(); + PopID(); } -bool ImGui::TabItemEx(ImGuiTabBar* tab_bar, const char* label, bool* p_open, ImGuiTabItemFlags flags) +bool ImGui::TabItemButton(const char* label, ImGuiTabItemFlags flags) { - // Layout whole tab bar if not already done - if (tab_bar->WantLayout) - TabBarLayout(tab_bar); - ImGuiContext& g = *GImGui; ImGuiWindow* window = g.CurrentWindow; if (window->SkipItems) return false; - const ImGuiStyle& style = g.Style; - const ImGuiID id = TabBarCalcTabID(tab_bar, label); + ImGuiTabBar* tab_bar = g.CurrentTabBar; + if (tab_bar == NULL) + { + IM_ASSERT_USER_ERROR(tab_bar != NULL, "Needs to be called between BeginTabBar() and EndTabBar()!"); + return false; + } + return TabItemEx(tab_bar, label, NULL, flags | ImGuiTabItemFlags_Button | ImGuiTabItemFlags_NoReorder, NULL); +} - // If the user called us with *p_open == false, we early out and don't render. We make a dummy call to ItemAdd() so that attempts to use a contextual popup menu with an implicit ID won't use an older ID. +void ImGui::TabItemSpacing(const char* str_id, ImGuiTabItemFlags flags, float width) +{ + ImGuiContext& g = *GImGui; + ImGuiWindow* window = g.CurrentWindow; + if (window->SkipItems) + return; + + ImGuiTabBar* tab_bar = g.CurrentTabBar; + if (tab_bar == NULL) + { + IM_ASSERT_USER_ERROR(tab_bar != NULL, "Needs to be called between BeginTabBar() and EndTabBar()!"); + return; + } + SetNextItemWidth(width); + TabItemEx(tab_bar, str_id, NULL, flags | ImGuiTabItemFlags_Button | ImGuiTabItemFlags_NoReorder | ImGuiTabItemFlags_Invisible, NULL); +} + +bool ImGui::TabItemEx(ImGuiTabBar* tab_bar, const char* label, bool* p_open, ImGuiTabItemFlags flags, ImGuiWindow* docked_window) +{ + // Layout whole tab bar if not already done + ImGuiContext& g = *GImGui; + if (tab_bar->WantLayout) + { + ImGuiNextItemData backup_next_item_data = g.NextItemData; + TabBarLayout(tab_bar); + g.NextItemData = backup_next_item_data; + } + ImGuiWindow* window = g.CurrentWindow; + if (window->SkipItems) + return false; + + const ImGuiStyle& style = g.Style; + const ImGuiID id = TabBarCalcTabID(tab_bar, label, docked_window); + + // If the user called us with *p_open == false, we early out and don't render. + // We make a call to ItemAdd() so that attempts to use a contextual popup menu with an implicit ID won't use an older ID. + IMGUI_TEST_ENGINE_ITEM_INFO(id, label, g.LastItemData.StatusFlags); if (p_open && !*p_open) { - PushItemFlag(ImGuiItemFlags_NoNav | ImGuiItemFlags_NoNavDefaultFocus, true); - ItemAdd(ImRect(), id); - PopItemFlag(); + ItemAdd(ImRect(), id, NULL, ImGuiItemFlags_NoNav); return false; } - // Calculate tab contents size - ImVec2 size = TabItemCalcSize(label, p_open != NULL); + IM_ASSERT(!p_open || !(flags & ImGuiTabItemFlags_Button)); + IM_ASSERT((flags & (ImGuiTabItemFlags_Leading | ImGuiTabItemFlags_Trailing)) != (ImGuiTabItemFlags_Leading | ImGuiTabItemFlags_Trailing)); // Can't use both Leading and Trailing + + // Store into ImGuiTabItemFlags_NoCloseButton, also honor ImGuiTabItemFlags_NoCloseButton passed by user (although not documented) + if (flags & ImGuiTabItemFlags_NoCloseButton) + p_open = NULL; + else if (p_open == NULL) + flags |= ImGuiTabItemFlags_NoCloseButton; // Acquire tab data ImGuiTabItem* tab = TabBarFindTabByID(tab_bar, id); @@ -6907,55 +10145,70 @@ bool ImGui::TabItemEx(ImGuiTabBar* tab_bar, const char* label, bool* p_open, tab_bar->Tabs.push_back(ImGuiTabItem()); tab = &tab_bar->Tabs.back(); tab->ID = id; - tab->Width = size.x; - tab_is_new = true; + tab_bar->TabsAddedNew = tab_is_new = true; } - tab_bar->LastTabItemIdx = (short)tab_bar->Tabs.index_from_ptr(tab); - tab->WidthContents = size.x; + tab_bar->LastTabItemIdx = (ImS16)tab_bar->Tabs.index_from_ptr(tab); - if (p_open == NULL) - flags |= ImGuiTabItemFlags_NoCloseButton; + // Calculate tab contents size + ImVec2 size = TabItemCalcSize(label, (p_open != NULL) || (flags & ImGuiTabItemFlags_UnsavedDocument)); + tab->RequestedWidth = -1.0f; + if (g.NextItemData.HasFlags & ImGuiNextItemDataFlags_HasWidth) + size.x = tab->RequestedWidth = g.NextItemData.Width; + if (tab_is_new) + tab->Width = ImMax(1.0f, size.x); + tab->ContentWidth = size.x; + tab->BeginOrder = tab_bar->TabsActiveCount++; const bool tab_bar_appearing = (tab_bar->PrevFrameVisible + 1 < g.FrameCount); const bool tab_bar_focused = (tab_bar->Flags & ImGuiTabBarFlags_IsFocused) != 0; const bool tab_appearing = (tab->LastFrameVisible + 1 < g.FrameCount); + const bool tab_just_unsaved = (flags & ImGuiTabItemFlags_UnsavedDocument) && !(tab->Flags & ImGuiTabItemFlags_UnsavedDocument); + const bool is_tab_button = (flags & ImGuiTabItemFlags_Button) != 0; tab->LastFrameVisible = g.FrameCount; tab->Flags = flags; + tab->Window = docked_window; - // Append name with zero-terminator - tab->NameOffset = tab_bar->TabsNames.size(); - tab_bar->TabsNames.append(label, label + strlen(label) + 1); - - // If we are not reorderable, always reset offset based on submission order. - // (We already handled layout and sizing using the previous known order, but sizing is not affected by order!) - if (!tab_appearing && !(tab_bar->Flags & ImGuiTabBarFlags_Reorderable)) + // Append name _WITH_ the zero-terminator + // (regular tabs are permitted in a DockNode tab bar, but window tabs not permitted in a non-DockNode tab bar) + if (docked_window != NULL) { - tab->Offset = tab_bar->OffsetNextTab; - tab_bar->OffsetNextTab += tab->Width + g.Style.ItemInnerSpacing.x; + IM_ASSERT(tab_bar->Flags & ImGuiTabBarFlags_DockNode); + tab->NameOffset = -1; + } + else + { + tab->NameOffset = (ImS32)tab_bar->TabsNames.size(); + tab_bar->TabsNames.append(label, label + ImStrlen(label) + 1); } // Update selected tab - if (tab_appearing && (tab_bar->Flags & ImGuiTabBarFlags_AutoSelectNewTabs) && tab_bar->NextSelectedTabId == 0) - if (!tab_bar_appearing || tab_bar->SelectedTabId == 0) - tab_bar->NextSelectedTabId = id; // New tabs gets activated - if ((flags & ImGuiTabItemFlags_SetSelected) && (tab_bar->SelectedTabId != id)) // SetSelected can only be passed on explicit tab bar - tab_bar->NextSelectedTabId = id; + if (!is_tab_button) + { + if (tab_appearing && (tab_bar->Flags & ImGuiTabBarFlags_AutoSelectNewTabs) && tab_bar->NextSelectedTabId == 0) + if (!tab_bar_appearing || tab_bar->SelectedTabId == 0) + TabBarQueueFocus(tab_bar, tab); // New tabs gets activated + if ((flags & ImGuiTabItemFlags_SetSelected) && (tab_bar->SelectedTabId != id)) // _SetSelected can only be passed on explicit tab bar + TabBarQueueFocus(tab_bar, tab); + } // Lock visibility + // (Note: tab_contents_visible != tab_selected... because CTRL+TAB operations may preview some tabs without selecting them!) bool tab_contents_visible = (tab_bar->VisibleTabId == id); if (tab_contents_visible) tab_bar->VisibleTabWasSubmitted = true; // On the very first frame of a tab bar we let first tab contents be visible to minimize appearing glitches - if (!tab_contents_visible && tab_bar->SelectedTabId == 0 && tab_bar_appearing) + if (!tab_contents_visible && tab_bar->SelectedTabId == 0 && tab_bar_appearing && docked_window == NULL) if (tab_bar->Tabs.Size == 1 && !(tab_bar->Flags & ImGuiTabBarFlags_AutoSelectNewTabs)) tab_contents_visible = true; - if (tab_appearing && !(tab_bar_appearing && !tab_is_new)) + // Note that tab_is_new is not necessarily the same as tab_appearing! When a tab bar stops being submitted + // and then gets submitted again, the tabs will have 'tab_appearing=true' but 'tab_is_new=false'. + if (tab_appearing && (!tab_bar_appearing || tab_is_new)) { - PushItemFlag(ImGuiItemFlags_NoNav | ImGuiItemFlags_NoNavDefaultFocus, true); - ItemAdd(ImRect(), id); - PopItemFlag(); + ItemAdd(ImRect(), id, NULL, ImGuiItemFlags_NoNav); + if (is_tab_button) + return false; return tab_contents_visible; } @@ -6966,15 +10219,19 @@ bool ImGui::TabItemEx(ImGuiTabBar* tab_bar, const char* label, bool* p_open, const ImVec2 backup_main_cursor_pos = window->DC.CursorPos; // Layout + const bool is_central_section = (tab->Flags & ImGuiTabItemFlags_SectionMask_) == 0; size.x = tab->Width; - window->DC.CursorPos = tab_bar->BarRect.Min + ImVec2((float)(int)tab->Offset - tab_bar->ScrollingAnim, 0.0f); + if (is_central_section) + window->DC.CursorPos = tab_bar->BarRect.Min + ImVec2(IM_TRUNC(tab->Offset - tab_bar->ScrollingAnim), 0.0f); + else + window->DC.CursorPos = tab_bar->BarRect.Min + ImVec2(tab->Offset, 0.0f); ImVec2 pos = window->DC.CursorPos; ImRect bb(pos, pos + size); // We don't have CPU clipping primitives to clip the CloseButton (until it becomes a texture), so need to add an extra draw call (temporary in the case of vertical animation) - bool want_clip_rect = (bb.Min.x < tab_bar->BarRect.Min.x) || (bb.Max.x > tab_bar->BarRect.Max.x); + const bool want_clip_rect = is_central_section && (bb.Min.x < tab_bar->ScrollingRectMinX || bb.Max.x > tab_bar->ScrollingRectMaxX); if (want_clip_rect) - PushClipRect(ImVec2(ImMax(bb.Min.x, tab_bar->BarRect.Min.x), bb.Min.y - 1), ImVec2(tab_bar->BarRect.Max.x, bb.Max.y), true); + PushClipRect(ImVec2(ImMax(bb.Min.x, tab_bar->ScrollingRectMinX), bb.Min.y - 1), ImVec2(tab_bar->ScrollingRectMaxX, bb.Max.y), true); ImVec2 backup_cursor_max_pos = window->DC.CursorMaxPos; ItemSize(bb.GetSize(), style.FramePadding.y); @@ -6989,69 +10246,156 @@ bool ImGui::TabItemEx(ImGuiTabBar* tab_bar, const char* label, bool* p_open, } // Click to Select a tab - ImGuiButtonFlags button_flags = (ImGuiButtonFlags_PressedOnClick | ImGuiButtonFlags_AllowItemOverlap); - if (g.DragDropActive) + ImGuiButtonFlags button_flags = ((is_tab_button ? ImGuiButtonFlags_PressedOnClickRelease : ImGuiButtonFlags_PressedOnClick) | ImGuiButtonFlags_AllowOverlap); + if (g.DragDropActive && !g.DragDropPayload.IsDataType(IMGUI_PAYLOAD_TYPE_WINDOW)) // FIXME: May be an opt-in property of the payload to disable this button_flags |= ImGuiButtonFlags_PressedOnDragDropHold; - bool hovered, held; - bool pressed = ButtonBehavior(bb, id, &hovered, &held, button_flags); - if (pressed) - tab_bar->NextSelectedTabId = id; - hovered |= (g.HoveredId == id); + bool hovered, held, pressed; + if (flags & ImGuiTabItemFlags_Invisible) + hovered = held = pressed = false; + else + pressed = ButtonBehavior(bb, id, &hovered, &held, button_flags); + if (pressed && !is_tab_button) + TabBarQueueFocus(tab_bar, tab); - // Allow the close button to overlap unless we are dragging (in which case we don't want any overlapping tabs to be hovered) - if (!held) - SetItemAllowOverlap(); + // Transfer active id window so the active id is not owned by the dock host (as StartMouseMovingWindow() + // will only do it on the drag). This allows FocusWindow() to be more conservative in how it clears active id. + if (held && docked_window && g.ActiveId == id && g.ActiveIdIsJustActivated) + g.ActiveIdWindow = docked_window; - // Drag and drop: re-order tabs - if (held && !tab_appearing && IsMouseDragging(0)) + // Drag and drop a single floating window node moves it + ImGuiDockNode* node = docked_window ? docked_window->DockNode : NULL; + const bool single_floating_window_node = node && node->IsFloatingNode() && (node->Windows.Size == 1); + if (held && single_floating_window_node && IsMouseDragging(0, 0.0f)) { - if (!g.DragDropActive && (tab_bar->Flags & ImGuiTabBarFlags_Reorderable)) + // Move + StartMouseMovingWindow(docked_window); + } + else if (held && !tab_appearing && IsMouseDragging(0)) + { + // Drag and drop: re-order tabs + int drag_dir = 0; + float drag_distance_from_edge_x = 0.0f; + if (!g.DragDropActive && ((tab_bar->Flags & ImGuiTabBarFlags_Reorderable) || (docked_window != NULL))) { // While moving a tab it will jump on the other side of the mouse, so we also test for MouseDelta.x if (g.IO.MouseDelta.x < 0.0f && g.IO.MousePos.x < bb.Min.x) { - if (tab_bar->Flags & ImGuiTabBarFlags_Reorderable) - TabBarQueueChangeTabOrder(tab_bar, tab, -1); + drag_dir = -1; + drag_distance_from_edge_x = bb.Min.x - g.IO.MousePos.x; + TabBarQueueReorderFromMousePos(tab_bar, tab, g.IO.MousePos); } else if (g.IO.MouseDelta.x > 0.0f && g.IO.MousePos.x > bb.Max.x) { - if (tab_bar->Flags & ImGuiTabBarFlags_Reorderable) - TabBarQueueChangeTabOrder(tab_bar, tab, +1); + drag_dir = +1; + drag_distance_from_edge_x = g.IO.MousePos.x - bb.Max.x; + TabBarQueueReorderFromMousePos(tab_bar, tab, g.IO.MousePos); + } + } + + // Extract a Dockable window out of it's tab bar + const bool can_undock = docked_window != NULL && !(docked_window->Flags & ImGuiWindowFlags_NoMove) && !(node->MergedFlags & ImGuiDockNodeFlags_NoUndocking); + if (can_undock) + { + // We use a variable threshold to distinguish dragging tabs within a tab bar and extracting them out of the tab bar + bool undocking_tab = (g.DragDropActive && g.DragDropPayload.SourceId == id); + if (!undocking_tab) //&& (!g.IO.ConfigDockingWithShift || g.IO.KeyShift) + { + float threshold_base = g.FontSize; + float threshold_x = (threshold_base * 2.2f); + float threshold_y = (threshold_base * 1.5f) + ImClamp((ImFabs(g.IO.MouseDragMaxDistanceAbs[0].x) - threshold_base * 2.0f) * 0.20f, 0.0f, threshold_base * 4.0f); + //GetForegroundDrawList()->AddRect(ImVec2(bb.Min.x - threshold_x, bb.Min.y - threshold_y), ImVec2(bb.Max.x + threshold_x, bb.Max.y + threshold_y), IM_COL32_WHITE); // [DEBUG] + + float distance_from_edge_y = ImMax(bb.Min.y - g.IO.MousePos.y, g.IO.MousePos.y - bb.Max.y); + if (distance_from_edge_y >= threshold_y) + undocking_tab = true; + if (drag_distance_from_edge_x > threshold_x) + if ((drag_dir < 0 && TabBarGetTabOrder(tab_bar, tab) == 0) || (drag_dir > 0 && TabBarGetTabOrder(tab_bar, tab) == tab_bar->Tabs.Size - 1)) + undocking_tab = true; + } + + if (undocking_tab) + { + // Undock + // FIXME: refactor to share more code with e.g. StartMouseMovingWindow + DockContextQueueUndockWindow(&g, docked_window); + g.MovingWindow = docked_window; + SetActiveID(g.MovingWindow->MoveId, g.MovingWindow); + g.ActiveIdClickOffset -= g.MovingWindow->Pos - bb.Min; + g.ActiveIdNoClearOnFocusLoss = true; + SetActiveIdUsingAllKeyboardKeys(); } } } #if 0 - if (hovered && g.HoveredIdNotActiveTimer > 0.50f && bb.GetWidth() < tab->WidthContents) + if (hovered && g.HoveredIdNotActiveTimer > TOOLTIP_DELAY && bb.GetWidth() < tab->ContentWidth) { // Enlarge tab display when hovering - bb.Max.x = bb.Min.x + (float)(int)ImLerp(bb.GetWidth(), tab->WidthContents, ImSaturate((g.HoveredIdNotActiveTimer - 0.40f) * 6.0f)); + bb.Max.x = bb.Min.x + IM_TRUNC(ImLerp(bb.GetWidth(), tab->ContentWidth, ImSaturate((g.HoveredIdNotActiveTimer - 0.40f) * 6.0f))); display_draw_list = GetForegroundDrawList(window); TabItemBackground(display_draw_list, bb, flags, GetColorU32(ImGuiCol_TitleBgActive)); } #endif // Render tab shape - ImDrawList* display_draw_list = window->DrawList; - const ImU32 tab_col = GetColorU32((held || hovered) ? ImGuiCol_TabHovered : tab_contents_visible ? (tab_bar_focused ? ImGuiCol_TabActive : ImGuiCol_TabUnfocusedActive) : (tab_bar_focused ? ImGuiCol_Tab : ImGuiCol_TabUnfocused)); - TabItemBackground(display_draw_list, bb, flags, tab_col); - RenderNavHighlight(bb, id); - - // Select with right mouse button. This is so the common idiom for context menu automatically highlight the current widget. - const bool hovered_unblocked = IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup); - if (hovered_unblocked && (IsMouseClicked(1) || IsMouseReleased(1))) - tab_bar->NextSelectedTabId = id; - - if (tab_bar->Flags & ImGuiTabBarFlags_NoCloseWithMiddleMouseButton) - flags |= ImGuiTabItemFlags_NoCloseWithMiddleMouseButton; - - // Render tab label, process close button - const ImGuiID close_button_id = p_open ? window->GetID((void*)((intptr_t)id + 1)) : 0; - bool just_closed = TabItemLabelAndCloseButton(display_draw_list, bb, flags, tab_bar->FramePadding, label, id, close_button_id); - if (just_closed && p_open != NULL) + const bool is_visible = (g.LastItemData.StatusFlags & ImGuiItemStatusFlags_Visible) && !(flags & ImGuiTabItemFlags_Invisible); + if (is_visible) { - *p_open = false; - TabBarCloseTab(tab_bar, tab); + ImDrawList* display_draw_list = window->DrawList; + const ImU32 tab_col = GetColorU32((held || hovered) ? ImGuiCol_TabHovered : tab_contents_visible ? (tab_bar_focused ? ImGuiCol_TabSelected : ImGuiCol_TabDimmedSelected) : (tab_bar_focused ? ImGuiCol_Tab : ImGuiCol_TabDimmed)); + TabItemBackground(display_draw_list, bb, flags, tab_col); + if (tab_contents_visible && (tab_bar->Flags & ImGuiTabBarFlags_DrawSelectedOverline) && style.TabBarOverlineSize > 0.0f) + { + // Might be moved to TabItemBackground() ? + ImVec2 tl = bb.GetTL() + ImVec2(0, 1.0f * g.CurrentDpiScale); + ImVec2 tr = bb.GetTR() + ImVec2(0, 1.0f * g.CurrentDpiScale); + ImU32 overline_col = GetColorU32(tab_bar_focused ? ImGuiCol_TabSelectedOverline : ImGuiCol_TabDimmedSelectedOverline); + if (style.TabRounding > 0.0f) + { + float rounding = style.TabRounding; + display_draw_list->PathArcToFast(tl + ImVec2(+rounding, +rounding), rounding, 7, 9); + display_draw_list->PathArcToFast(tr + ImVec2(-rounding, +rounding), rounding, 9, 11); + display_draw_list->PathStroke(overline_col, 0, style.TabBarOverlineSize); + } + else + { + display_draw_list->AddLine(tl - ImVec2(0.5f, 0.5f), tr - ImVec2(0.5f, 0.5f), overline_col, style.TabBarOverlineSize); + } + } + RenderNavCursor(bb, id); + + // Select with right mouse button. This is so the common idiom for context menu automatically highlight the current widget. + const bool hovered_unblocked = IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup); + if (tab_bar->SelectedTabId != tab->ID && hovered_unblocked && (IsMouseClicked(1) || IsMouseReleased(1)) && !is_tab_button) + TabBarQueueFocus(tab_bar, tab); + + if (tab_bar->Flags & ImGuiTabBarFlags_NoCloseWithMiddleMouseButton) + flags |= ImGuiTabItemFlags_NoCloseWithMiddleMouseButton; + + // Render tab label, process close button + const ImGuiID close_button_id = p_open ? GetIDWithSeed("#CLOSE", NULL, docked_window ? docked_window->ID : id) : 0; + bool just_closed; + bool text_clipped; + TabItemLabelAndCloseButton(display_draw_list, bb, tab_just_unsaved ? (flags & ~ImGuiTabItemFlags_UnsavedDocument) : flags, tab_bar->FramePadding, label, id, close_button_id, tab_contents_visible, &just_closed, &text_clipped); + if (just_closed && p_open != NULL) + { + *p_open = false; + TabBarCloseTab(tab_bar, tab); + } + + // Forward Hovered state so IsItemHovered() after Begin() can work (even though we are technically hovering our parent) + // That state is copied to window->DockTabItemStatusFlags by our caller. + if (docked_window && (hovered || g.HoveredId == close_button_id)) + g.LastItemData.StatusFlags |= ImGuiItemStatusFlags_HoveredWindow; + + // Tooltip + // (Won't work over the close button because ItemOverlap systems messes up with HoveredIdTimer-> seems ok) + // (We test IsItemHovered() to discard e.g. when another item is active or drag and drop over the tab bar, which g.HoveredId ignores) + // FIXME: This is a mess. + // FIXME: We may want disabled tab to still display the tooltip? + if (text_clipped && g.HoveredId == id && !held) + if (!(tab_bar->Flags & ImGuiTabBarFlags_NoTooltip) && !(tab->Flags & ImGuiTabItemFlags_NoTooltip)) + SetItemTooltip("%.*s", (int)(FindRenderedTextEnd(label) - label), label); } // Restore main window position so user can draw there @@ -7059,17 +10403,15 @@ bool ImGui::TabItemEx(ImGuiTabBar* tab_bar, const char* label, bool* p_open, PopClipRect(); window->DC.CursorPos = backup_main_cursor_pos; - // Tooltip (FIXME: Won't work over the close button because ItemOverlap systems messes up with HoveredIdTimer) - // We test IsItemHovered() to discard e.g. when another item is active or drag and drop over the tab bar (which g.HoveredId ignores) - if (g.HoveredId == id && !held && g.HoveredIdNotActiveTimer > 0.50f && IsItemHovered()) - if (!(tab_bar->Flags & ImGuiTabBarFlags_NoTooltip)) - SetTooltip("%.*s", (int)(FindRenderedTextEnd(label) - label), label); - + IM_ASSERT(!is_tab_button || !(tab_bar->SelectedTabId == tab->ID && is_tab_button)); // TabItemButton should not be selected + if (is_tab_button) + return pressed; return tab_contents_visible; } // [Public] This is call is 100% optional but it allows to remove some one-frame glitches when a tab has been unexpectedly removed. -// To use it to need to call the function SetTabItemClosed() after BeginTabBar() and before any call to BeginTabItem() +// To use it to need to call the function SetTabItemClosed() between BeginTabBar() and EndTabBar(). +// Tabs closed by the close button will automatically be flagged to avoid this issue. void ImGui::SetTabItemClosed(const char* label) { ImGuiContext& g = *GImGui; @@ -7077,24 +10419,39 @@ void ImGui::SetTabItemClosed(const char* label) if (is_within_manual_tab_bar) { ImGuiTabBar* tab_bar = g.CurrentTabBar; - IM_ASSERT(tab_bar->WantLayout); // Needs to be called AFTER BeginTabBar() and BEFORE the first call to BeginTabItem() - ImGuiID tab_id = TabBarCalcTabID(tab_bar, label); - TabBarRemoveTab(tab_bar, tab_id); + ImGuiID tab_id = TabBarCalcTabID(tab_bar, label, NULL); + if (ImGuiTabItem* tab = TabBarFindTabByID(tab_bar, tab_id)) + tab->WantClose = true; // Will be processed by next call to TabBarLayout() + } + else if (ImGuiWindow* window = FindWindowByName(label)) + { + if (window->DockIsActive) + if (ImGuiDockNode* node = window->DockNode) + { + ImGuiID tab_id = TabBarCalcTabID(node->TabBar, label, window); + TabBarRemoveTab(node->TabBar, tab_id); + window->DockTabWantClose = true; + } } } -ImVec2 ImGui::TabItemCalcSize(const char* label, bool has_close_button) +ImVec2 ImGui::TabItemCalcSize(const char* label, bool has_close_button_or_unsaved_marker) { ImGuiContext& g = *GImGui; ImVec2 label_size = CalcTextSize(label, NULL, true); ImVec2 size = ImVec2(label_size.x + g.Style.FramePadding.x, label_size.y + g.Style.FramePadding.y * 2.0f); - if (has_close_button) + if (has_close_button_or_unsaved_marker) size.x += g.Style.FramePadding.x + (g.Style.ItemInnerSpacing.x + g.FontSize); // We use Y intentionally to fit the close button circle. else size.x += g.Style.FramePadding.x + 1.0f; return ImVec2(ImMin(size.x, TabBarCalcMaxTabWidth()), size.y); } +ImVec2 ImGui::TabItemCalcSize(ImGuiWindow* window) +{ + return TabItemCalcSize(window->Name, window->HasCloseButton || (window->Flags & ImGuiWindowFlags_UnsavedDocument)); +} + void ImGui::TabItemBackground(ImDrawList* draw_list, const ImRect& bb, ImGuiTabItemFlags flags, ImU32 col) { // While rendering tabs, we trim 1 pixel off the top of our bounding box so they can fit within a regular frame height while looking "detached" from it. @@ -7102,9 +10459,9 @@ void ImGui::TabItemBackground(ImDrawList* draw_list, const ImRect& bb, ImGuiTabI const float width = bb.GetWidth(); IM_UNUSED(flags); IM_ASSERT(width > 0.0f); - const float rounding = ImMax(0.0f, ImMin(g.Style.TabRounding, width * 0.5f - 1.0f)); + const float rounding = ImMax(0.0f, ImMin((flags & ImGuiTabItemFlags_Button) ? g.Style.FrameRounding : g.Style.TabRounding, width * 0.5f - 1.0f)); const float y1 = bb.Min.y + 1.0f; - const float y2 = bb.Max.y - 1.0f; + const float y2 = bb.Max.y - g.Style.TabBarBorderSize; draw_list->PathLineTo(ImVec2(bb.Min.x, y2)); draw_list->PathArcToFast(ImVec2(bb.Min.x + rounding, y1 + rounding), rounding, 6, 9); draw_list->PathArcToFast(ImVec2(bb.Max.x - rounding, y1 + rounding), rounding, 9, 12); @@ -7116,512 +10473,137 @@ void ImGui::TabItemBackground(ImDrawList* draw_list, const ImRect& bb, ImGuiTabI draw_list->PathArcToFast(ImVec2(bb.Min.x + rounding + 0.5f, y1 + rounding + 0.5f), rounding, 6, 9); draw_list->PathArcToFast(ImVec2(bb.Max.x - rounding - 0.5f, y1 + rounding + 0.5f), rounding, 9, 12); draw_list->PathLineTo(ImVec2(bb.Max.x - 0.5f, y2)); - draw_list->PathStroke(GetColorU32(ImGuiCol_Border), false, g.Style.TabBorderSize); + draw_list->PathStroke(GetColorU32(ImGuiCol_Border), 0, g.Style.TabBorderSize); } } // Render text label (with custom clipping) + Unsaved Document marker + Close Button logic // We tend to lock style.FramePadding for a given tab-bar, hence the 'frame_padding' parameter. -bool ImGui::TabItemLabelAndCloseButton(ImDrawList* draw_list, const ImRect& bb, ImGuiTabItemFlags flags, ImVec2 frame_padding, const char* label, ImGuiID tab_id, ImGuiID close_button_id) +void ImGui::TabItemLabelAndCloseButton(ImDrawList* draw_list, const ImRect& bb, ImGuiTabItemFlags flags, ImVec2 frame_padding, const char* label, ImGuiID tab_id, ImGuiID close_button_id, bool is_contents_visible, bool* out_just_closed, bool* out_text_clipped) { ImGuiContext& g = *GImGui; ImVec2 label_size = CalcTextSize(label, NULL, true); + + if (out_just_closed) + *out_just_closed = false; + if (out_text_clipped) + *out_text_clipped = false; + if (bb.GetWidth() <= 1.0f) - return false; + return; + + // In Style V2 we'll have full override of all colors per state (e.g. focused, selected) + // But right now if you want to alter text color of tabs this is what you need to do. +#if 0 + const float backup_alpha = g.Style.Alpha; + if (!is_contents_visible) + g.Style.Alpha *= 0.7f; +#endif // Render text label (with clipping + alpha gradient) + unsaved marker - const char* TAB_UNSAVED_MARKER = "*"; ImRect text_pixel_clip_bb(bb.Min.x + frame_padding.x, bb.Min.y + frame_padding.y, bb.Max.x - frame_padding.x, bb.Max.y); - if (flags & ImGuiTabItemFlags_UnsavedDocument) - { - text_pixel_clip_bb.Max.x -= CalcTextSize(TAB_UNSAVED_MARKER, NULL, false).x; - ImVec2 unsaved_marker_pos(ImMin(bb.Min.x + frame_padding.x + label_size.x + 2, text_pixel_clip_bb.Max.x), bb.Min.y + frame_padding.y + (float)(int)(-g.FontSize * 0.25f)); - RenderTextClippedEx(draw_list, unsaved_marker_pos, bb.Max - frame_padding, TAB_UNSAVED_MARKER, NULL, NULL); - } ImRect text_ellipsis_clip_bb = text_pixel_clip_bb; - // Close Button + // Return clipped state ignoring the close button + if (out_text_clipped) + { + *out_text_clipped = (text_ellipsis_clip_bb.Min.x + label_size.x) > text_pixel_clip_bb.Max.x; + //draw_list->AddCircle(text_ellipsis_clip_bb.Min, 3.0f, *out_text_clipped ? IM_COL32(255, 0, 0, 255) : IM_COL32(0, 255, 0, 255)); + } + + const float button_sz = g.FontSize; + const ImVec2 button_pos(ImMax(bb.Min.x, bb.Max.x - frame_padding.x - button_sz), bb.Min.y + frame_padding.y); + + // Close Button & Unsaved Marker // We are relying on a subtle and confusing distinction between 'hovered' and 'g.HoveredId' which happens because we are using ImGuiButtonFlags_AllowOverlapMode + SetItemAllowOverlap() // 'hovered' will be true when hovering the Tab but NOT when hovering the close button // 'g.HoveredId==id' will be true when hovering the Tab including when hovering the close button // 'g.ActiveId==close_button_id' will be true when we are holding on the close button, in which case both hovered booleans are false bool close_button_pressed = false; bool close_button_visible = false; + bool is_hovered = g.HoveredId == tab_id || g.HoveredId == close_button_id || g.ActiveId == tab_id || g.ActiveId == close_button_id; // Any interaction account for this too. + if (close_button_id != 0) - if (g.HoveredId == tab_id || g.HoveredId == close_button_id || g.ActiveId == close_button_id) - close_button_visible = true; - if (close_button_visible) { - ImGuiItemHoveredDataBackup last_item_backup; - const float close_button_sz = g.FontSize; - PushStyleVar(ImGuiStyleVar_FramePadding, frame_padding); - if (CloseButton(close_button_id, ImVec2(bb.Max.x - frame_padding.x * 2.0f - close_button_sz, bb.Min.y))) + if (is_contents_visible) + close_button_visible = (g.Style.TabCloseButtonMinWidthSelected < 0.0f) ? true : (is_hovered && bb.GetWidth() >= ImMax(button_sz, g.Style.TabCloseButtonMinWidthSelected)); + else + close_button_visible = (g.Style.TabCloseButtonMinWidthUnselected < 0.0f) ? true : (is_hovered && bb.GetWidth() >= ImMax(button_sz, g.Style.TabCloseButtonMinWidthUnselected)); + } + + // When tabs/document is unsaved, the unsaved marker takes priority over the close button. + const bool unsaved_marker_visible = (flags & ImGuiTabItemFlags_UnsavedDocument) != 0 && (button_pos.x + button_sz <= bb.Max.x) && (!close_button_visible || !is_hovered); + if (unsaved_marker_visible) + { + const ImRect bullet_bb(button_pos, button_pos + ImVec2(button_sz, button_sz)); + RenderBullet(draw_list, bullet_bb.GetCenter(), GetColorU32(ImGuiCol_Text)); + } + else if (close_button_visible) + { + ImGuiLastItemData last_item_backup = g.LastItemData; + if (CloseButton(close_button_id, button_pos)) close_button_pressed = true; - PopStyleVar(); - last_item_backup.Restore(); + g.LastItemData = last_item_backup; // Close with middle mouse button - if (!(flags & ImGuiTabItemFlags_NoCloseWithMiddleMouseButton) && IsMouseClicked(2)) + if (is_hovered && !(flags & ImGuiTabItemFlags_NoCloseWithMiddleMouseButton) && IsMouseClicked(2)) close_button_pressed = true; - - text_pixel_clip_bb.Max.x -= close_button_sz; } + // This is all rather complicated + // (the main idea is that because the close button only appears on hover, we don't want it to alter the ellipsis position) + // FIXME: if FramePadding is noticeably large, ellipsis_max_x will be wrong here (e.g. #3497), maybe for consistency that parameter of RenderTextEllipsis() shouldn't exist.. float ellipsis_max_x = close_button_visible ? text_pixel_clip_bb.Max.x : bb.Max.x - 1.0f; + if (close_button_visible || unsaved_marker_visible) + { + text_pixel_clip_bb.Max.x -= close_button_visible ? (button_sz) : (button_sz * 0.80f); + text_ellipsis_clip_bb.Max.x -= unsaved_marker_visible ? (button_sz * 0.80f) : 0.0f; + ellipsis_max_x = text_pixel_clip_bb.Max.x; + } + LogSetNextTextDecoration("/", "\\"); RenderTextEllipsis(draw_list, text_ellipsis_clip_bb.Min, text_ellipsis_clip_bb.Max, text_pixel_clip_bb.Max.x, ellipsis_max_x, label, NULL, &label_size); - return close_button_pressed; +#if 0 + if (!is_contents_visible) + g.Style.Alpha = backup_alpha; +#endif + + if (out_just_closed) + *out_just_closed = close_button_pressed; } //------------------------------------------------------------------------- -// [SECTION] Widgets: Columns, BeginColumns, EndColumns, etc. -// In the current version, Columns are very weak. Needs to be replaced with a more full-featured system. -//------------------------------------------------------------------------- -// - GetColumnIndex() -// - GetColumnCount() -// - GetColumnOffset() -// - GetColumnWidth() -// - SetColumnOffset() -// - SetColumnWidth() -// - PushColumnClipRect() [Internal] -// - PushColumnsBackground() [Internal] -// - PopColumnsBackground() [Internal] -// - FindOrCreateColumns() [Internal] -// - GetColumnsID() [Internal] -// - BeginColumns() -// - NextColumn() -// - EndColumns() -// - Columns() -//------------------------------------------------------------------------- - -int ImGui::GetColumnIndex() -{ - ImGuiWindow* window = GetCurrentWindowRead(); - return window->DC.CurrentColumns ? window->DC.CurrentColumns->Current : 0; -} - -int ImGui::GetColumnsCount() -{ - ImGuiWindow* window = GetCurrentWindowRead(); - return window->DC.CurrentColumns ? window->DC.CurrentColumns->Count : 1; -} - -float ImGui::GetColumnOffsetFromNorm(const ImGuiColumns* columns, float offset_norm) -{ - return offset_norm * (columns->OffMaxX - columns->OffMinX); -} - -float ImGui::GetColumnNormFromOffset(const ImGuiColumns* columns, float offset) -{ - return offset / (columns->OffMaxX - columns->OffMinX); -} - -static const float COLUMNS_HIT_RECT_HALF_WIDTH = 4.0f; - -static float GetDraggedColumnOffset(ImGuiColumns* columns, int column_index) -{ - // Active (dragged) column always follow mouse. The reason we need this is that dragging a column to the right edge of an auto-resizing - // window creates a feedback loop because we store normalized positions. So while dragging we enforce absolute positioning. - ImGuiContext& g = *GImGui; - ImGuiWindow* window = g.CurrentWindow; - IM_ASSERT(column_index > 0); // We are not supposed to drag column 0. - IM_ASSERT(g.ActiveId == columns->ID + ImGuiID(column_index)); - - float x = g.IO.MousePos.x - g.ActiveIdClickOffset.x + COLUMNS_HIT_RECT_HALF_WIDTH - window->Pos.x; - x = ImMax(x, ImGui::GetColumnOffset(column_index - 1) + g.Style.ColumnsMinSpacing); - if ((columns->Flags & ImGuiColumnsFlags_NoPreserveWidths)) - x = ImMin(x, ImGui::GetColumnOffset(column_index + 1) - g.Style.ColumnsMinSpacing); - - return x; -} - -float ImGui::GetColumnOffset(int column_index) -{ - ImGuiWindow* window = GetCurrentWindowRead(); - ImGuiColumns* columns = window->DC.CurrentColumns; - if (columns == NULL) - return 0.0f; - - if (column_index < 0) - column_index = columns->Current; - IM_ASSERT(column_index < columns->Columns.Size); - - const float t = columns->Columns[column_index].OffsetNorm; - const float x_offset = ImLerp(columns->OffMinX, columns->OffMaxX, t); - return x_offset; -} - -static float GetColumnWidthEx(ImGuiColumns* columns, int column_index, bool before_resize = false) -{ - if (column_index < 0) - column_index = columns->Current; - - float offset_norm; - if (before_resize) - offset_norm = columns->Columns[column_index + 1].OffsetNormBeforeResize - columns->Columns[column_index].OffsetNormBeforeResize; - else - offset_norm = columns->Columns[column_index + 1].OffsetNorm - columns->Columns[column_index].OffsetNorm; - return ImGui::GetColumnOffsetFromNorm(columns, offset_norm); -} - -float ImGui::GetColumnWidth(int column_index) -{ - ImGuiContext& g = *GImGui; - ImGuiWindow* window = g.CurrentWindow; - ImGuiColumns* columns = window->DC.CurrentColumns; - if (columns == NULL) - return GetContentRegionAvail().x; - - if (column_index < 0) - column_index = columns->Current; - return GetColumnOffsetFromNorm(columns, columns->Columns[column_index + 1].OffsetNorm - columns->Columns[column_index].OffsetNorm); -} - -void ImGui::SetColumnOffset(int column_index, float offset) -{ - ImGuiContext& g = *GImGui; - ImGuiWindow* window = g.CurrentWindow; - ImGuiColumns* columns = window->DC.CurrentColumns; - IM_ASSERT(columns != NULL); - - if (column_index < 0) - column_index = columns->Current; - IM_ASSERT(column_index < columns->Columns.Size); - - const bool preserve_width = !(columns->Flags & ImGuiColumnsFlags_NoPreserveWidths) && (column_index < columns->Count-1); - const float width = preserve_width ? GetColumnWidthEx(columns, column_index, columns->IsBeingResized) : 0.0f; - - if (!(columns->Flags & ImGuiColumnsFlags_NoForceWithinWindow)) - offset = ImMin(offset, columns->OffMaxX - g.Style.ColumnsMinSpacing * (columns->Count - column_index)); - columns->Columns[column_index].OffsetNorm = GetColumnNormFromOffset(columns, offset - columns->OffMinX); - - if (preserve_width) - SetColumnOffset(column_index + 1, offset + ImMax(g.Style.ColumnsMinSpacing, width)); -} - -void ImGui::SetColumnWidth(int column_index, float width) -{ - ImGuiWindow* window = GetCurrentWindowRead(); - ImGuiColumns* columns = window->DC.CurrentColumns; - IM_ASSERT(columns != NULL); - - if (column_index < 0) - column_index = columns->Current; - SetColumnOffset(column_index + 1, GetColumnOffset(column_index) + width); -} - -void ImGui::PushColumnClipRect(int column_index) -{ - ImGuiWindow* window = GetCurrentWindowRead(); - ImGuiColumns* columns = window->DC.CurrentColumns; - if (column_index < 0) - column_index = columns->Current; - - ImGuiColumnData* column = &columns->Columns[column_index]; - PushClipRect(column->ClipRect.Min, column->ClipRect.Max, false); -} - -// Get into the columns background draw command (which is generally the same draw command as before we called BeginColumns) -void ImGui::PushColumnsBackground() -{ - ImGuiWindow* window = GetCurrentWindowRead(); - ImGuiColumns* columns = window->DC.CurrentColumns; - if (columns->Count == 1) - return; - window->DrawList->ChannelsSetCurrent(0); - int cmd_size = window->DrawList->CmdBuffer.Size; - PushClipRect(columns->HostClipRect.Min, columns->HostClipRect.Max, false); - IM_UNUSED(cmd_size); - IM_ASSERT(cmd_size == window->DrawList->CmdBuffer.Size); // Being in channel 0 this should not have created an ImDrawCmd -} - -void ImGui::PopColumnsBackground() -{ - ImGuiWindow* window = GetCurrentWindowRead(); - ImGuiColumns* columns = window->DC.CurrentColumns; - if (columns->Count == 1) - return; - window->DrawList->ChannelsSetCurrent(columns->Current + 1); - PopClipRect(); -} - -ImGuiColumns* ImGui::FindOrCreateColumns(ImGuiWindow* window, ImGuiID id) -{ - // We have few columns per window so for now we don't need bother much with turning this into a faster lookup. - for (int n = 0; n < window->ColumnsStorage.Size; n++) - if (window->ColumnsStorage[n].ID == id) - return &window->ColumnsStorage[n]; - - window->ColumnsStorage.push_back(ImGuiColumns()); - ImGuiColumns* columns = &window->ColumnsStorage.back(); - columns->ID = id; - return columns; -} - -ImGuiID ImGui::GetColumnsID(const char* str_id, int columns_count) -{ - ImGuiWindow* window = GetCurrentWindow(); - - // Differentiate column ID with an arbitrary prefix for cases where users name their columns set the same as another widget. - // In addition, when an identifier isn't explicitly provided we include the number of columns in the hash to make it uniquer. - PushID(0x11223347 + (str_id ? 0 : columns_count)); - ImGuiID id = window->GetID(str_id ? str_id : "columns"); - PopID(); - - return id; -} - -void ImGui::BeginColumns(const char* str_id, int columns_count, ImGuiColumnsFlags flags) -{ - ImGuiContext& g = *GImGui; - ImGuiWindow* window = GetCurrentWindow(); - - IM_ASSERT(columns_count >= 1); - IM_ASSERT(window->DC.CurrentColumns == NULL); // Nested columns are currently not supported - - // Acquire storage for the columns set - ImGuiID id = GetColumnsID(str_id, columns_count); - ImGuiColumns* columns = FindOrCreateColumns(window, id); - IM_ASSERT(columns->ID == id); - columns->Current = 0; - columns->Count = columns_count; - columns->Flags = flags; - window->DC.CurrentColumns = columns; - - columns->HostCursorPosY = window->DC.CursorPos.y; - columns->HostCursorMaxPosX = window->DC.CursorMaxPos.x; - columns->HostClipRect = window->ClipRect; - columns->HostWorkRect = window->WorkRect; - - // Set state for first column - // We aim so that the right-most column will have the same clipping width as other after being clipped by parent ClipRect - const float column_padding = g.Style.ItemSpacing.x; - const float half_clip_extend_x = ImFloor(ImMax(window->WindowPadding.x * 0.5f, window->WindowBorderSize)); - const float max_1 = window->WorkRect.Max.x + column_padding - ImMax(column_padding - window->WindowPadding.x, 0.0f); - const float max_2 = window->WorkRect.Max.x + half_clip_extend_x; - columns->OffMinX = window->DC.Indent.x - column_padding + ImMax(column_padding - window->WindowPadding.x, 0.0f); - columns->OffMaxX = ImMax(ImMin(max_1, max_2) - window->Pos.x, columns->OffMinX + 1.0f); - columns->LineMinY = columns->LineMaxY = window->DC.CursorPos.y; - - // Clear data if columns count changed - if (columns->Columns.Size != 0 && columns->Columns.Size != columns_count + 1) - columns->Columns.resize(0); - - // Initialize default widths - columns->IsFirstFrame = (columns->Columns.Size == 0); - if (columns->Columns.Size == 0) - { - columns->Columns.reserve(columns_count + 1); - for (int n = 0; n < columns_count + 1; n++) - { - ImGuiColumnData column; - column.OffsetNorm = n / (float)columns_count; - columns->Columns.push_back(column); - } - } - - for (int n = 0; n < columns_count; n++) - { - // Compute clipping rectangle - ImGuiColumnData* column = &columns->Columns[n]; - float clip_x1 = ImFloor(0.5f + window->Pos.x + GetColumnOffset(n)); - float clip_x2 = ImFloor(0.5f + window->Pos.x + GetColumnOffset(n + 1) - 1.0f); - column->ClipRect = ImRect(clip_x1, -FLT_MAX, clip_x2, +FLT_MAX); - column->ClipRect.ClipWith(window->ClipRect); - } - - if (columns->Count > 1) - { - window->DrawList->ChannelsSplit(1 + columns->Count); - window->DrawList->ChannelsSetCurrent(1); - PushColumnClipRect(0); - } - - // We don't generally store Indent.x inside ColumnsOffset because it may be manipulated by the user. - float offset_0 = GetColumnOffset(columns->Current); - float offset_1 = GetColumnOffset(columns->Current + 1); - float width = offset_1 - offset_0; - PushItemWidth(width * 0.65f); - window->DC.ColumnsOffset.x = ImMax(column_padding - window->WindowPadding.x, 0.0f); - window->DC.CursorPos.x = (float)(int)(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x); - window->WorkRect.Max.x = window->Pos.x + offset_1 - column_padding; -} - -void ImGui::NextColumn() -{ - ImGuiWindow* window = GetCurrentWindow(); - if (window->SkipItems || window->DC.CurrentColumns == NULL) - return; - - ImGuiContext& g = *GImGui; - ImGuiColumns* columns = window->DC.CurrentColumns; - - if (columns->Count == 1) - { - window->DC.CursorPos.x = (float)(int)(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x); - IM_ASSERT(columns->Current == 0); - return; - } - PopItemWidth(); - PopClipRect(); - - const float column_padding = g.Style.ItemSpacing.x; - columns->LineMaxY = ImMax(columns->LineMaxY, window->DC.CursorPos.y); - if (++columns->Current < columns->Count) - { - // Columns 1+ ignore IndentX (by canceling it out) - // FIXME-COLUMNS: Unnecessary, could be locked? - window->DC.ColumnsOffset.x = GetColumnOffset(columns->Current) - window->DC.Indent.x + column_padding; - window->DrawList->ChannelsSetCurrent(columns->Current + 1); - } - else - { - // New row/line - // Column 0 honor IndentX - window->DC.ColumnsOffset.x = ImMax(column_padding - window->WindowPadding.x, 0.0f); - window->DrawList->ChannelsSetCurrent(1); - columns->Current = 0; - columns->LineMinY = columns->LineMaxY; - } - window->DC.CursorPos.x = (float)(int)(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x); - window->DC.CursorPos.y = columns->LineMinY; - window->DC.CurrLineSize = ImVec2(0.0f, 0.0f); - window->DC.CurrLineTextBaseOffset = 0.0f; - - PushColumnClipRect(columns->Current); // FIXME-COLUMNS: Could it be an overwrite? - - // FIXME-COLUMNS: Share code with BeginColumns() - move code on columns setup. - float offset_0 = GetColumnOffset(columns->Current); - float offset_1 = GetColumnOffset(columns->Current + 1); - float width = offset_1 - offset_0; - PushItemWidth(width * 0.65f); - window->WorkRect.Max.x = window->Pos.x + offset_1 - column_padding; -} - -void ImGui::EndColumns() -{ - ImGuiContext& g = *GImGui; - ImGuiWindow* window = GetCurrentWindow(); - ImGuiColumns* columns = window->DC.CurrentColumns; - IM_ASSERT(columns != NULL); - - PopItemWidth(); - if (columns->Count > 1) - { - PopClipRect(); - window->DrawList->ChannelsMerge(); - } - - const ImGuiColumnsFlags flags = columns->Flags; - columns->LineMaxY = ImMax(columns->LineMaxY, window->DC.CursorPos.y); - window->DC.CursorPos.y = columns->LineMaxY; - if (!(flags & ImGuiColumnsFlags_GrowParentContentsSize)) - window->DC.CursorMaxPos.x = columns->HostCursorMaxPosX; // Restore cursor max pos, as columns don't grow parent - - // Draw columns borders and handle resize - // The IsBeingResized flag ensure we preserve pre-resize columns width so back-and-forth are not lossy - bool is_being_resized = false; - if (!(flags & ImGuiColumnsFlags_NoBorder) && !window->SkipItems) - { - // We clip Y boundaries CPU side because very long triangles are mishandled by some GPU drivers. - const float y1 = ImMax(columns->HostCursorPosY, window->ClipRect.Min.y); - const float y2 = ImMin(window->DC.CursorPos.y, window->ClipRect.Max.y); - int dragging_column = -1; - for (int n = 1; n < columns->Count; n++) - { - ImGuiColumnData* column = &columns->Columns[n]; - float x = window->Pos.x + GetColumnOffset(n); - const ImGuiID column_id = columns->ID + ImGuiID(n); - const float column_hit_hw = COLUMNS_HIT_RECT_HALF_WIDTH; - const ImRect column_hit_rect(ImVec2(x - column_hit_hw, y1), ImVec2(x + column_hit_hw, y2)); - KeepAliveID(column_id); - if (IsClippedEx(column_hit_rect, column_id, false)) - continue; - - bool hovered = false, held = false; - if (!(flags & ImGuiColumnsFlags_NoResize)) - { - ButtonBehavior(column_hit_rect, column_id, &hovered, &held); - if (hovered || held) - g.MouseCursor = ImGuiMouseCursor_ResizeEW; - if (held && !(column->Flags & ImGuiColumnsFlags_NoResize)) - dragging_column = n; - } - - // Draw column - const ImU32 col = GetColorU32(held ? ImGuiCol_SeparatorActive : hovered ? ImGuiCol_SeparatorHovered : ImGuiCol_Separator); - const float xi = (float)(int)x; - window->DrawList->AddLine(ImVec2(xi, y1 + 1.0f), ImVec2(xi, y2), col); - } - - // Apply dragging after drawing the column lines, so our rendered lines are in sync with how items were displayed during the frame. - if (dragging_column != -1) - { - if (!columns->IsBeingResized) - for (int n = 0; n < columns->Count + 1; n++) - columns->Columns[n].OffsetNormBeforeResize = columns->Columns[n].OffsetNorm; - columns->IsBeingResized = is_being_resized = true; - float x = GetDraggedColumnOffset(columns, dragging_column); - SetColumnOffset(dragging_column, x); - } - } - columns->IsBeingResized = is_being_resized; - - window->WorkRect = columns->HostWorkRect; - window->DC.CurrentColumns = NULL; - window->DC.ColumnsOffset.x = 0.0f; - window->DC.CursorPos.x = (float)(int)(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x); -} - -// [2018-03: This is currently the only public API, while we are working on making BeginColumns/EndColumns user-facing] -void ImGui::Columns(int columns_count, const char* id, bool border) -{ - ImGuiWindow* window = GetCurrentWindow(); - IM_ASSERT(columns_count >= 1); - - ImGuiColumnsFlags flags = (border ? 0 : ImGuiColumnsFlags_NoBorder); - //flags |= ImGuiColumnsFlags_NoPreserveWidths; // NB: Legacy behavior - ImGuiColumns* columns = window->DC.CurrentColumns; - if (columns != NULL && columns->Count == columns_count && columns->Flags == flags) - return; - - if (columns != NULL) - EndColumns(); - - if (columns_count != 1) - BeginColumns(id, columns_count, flags); -} - -//------------------------------------------------------------------------- - +// MaSzyna additions // by zfedoran, https://github.com/ocornut/imgui/issues/1901 +//------------------------------------------------------------------------- -bool ImGui::BufferingBar( const char* label, float value, const ImVec2& size_arg, const ImU32& bg_col, const ImU32& fg_col ) { +bool ImGui::BufferingBar(const char* label, float value, const ImVec2& size_arg, const ImU32& bg_col, const ImU32& fg_col) +{ ImGuiWindow* window = GetCurrentWindow(); - if( window->SkipItems ) + if (window->SkipItems) return false; ImGuiContext& g = *GImGui; const ImGuiStyle& style = g.Style; - const ImGuiID id = window->GetID( label ); + const ImGuiID id = window->GetID(label); ImVec2 pos = window->DC.CursorPos; ImVec2 size = size_arg; size.x -= style.FramePadding.x * 2; - const ImRect bb( pos, ImVec2( pos.x + size.x, pos.y + size.y ) ); - ItemSize( bb, style.FramePadding.y ); - if( !ItemAdd( bb, id ) ) + const ImRect bb(pos, ImVec2(pos.x + size.x, pos.y + size.y)); + ItemSize(bb, style.FramePadding.y); + if (!ItemAdd(bb, id)) return false; // Render - const float circleStart = std::max( size.x * 0.7f, size.x - 30.f ); + const float circleStart = ImMax(size.x * 0.7f, size.x - 30.f); const float circleEnd = size.x; const float circleWidth = circleEnd - circleStart; - window->DrawList->AddRectFilled( bb.Min, ImVec2( pos.x + circleStart, bb.Max.y ), bg_col ); - window->DrawList->AddRectFilled( bb.Min, ImVec2( pos.x + circleStart * value, bb.Max.y ), fg_col ); + window->DrawList->AddRectFilled(bb.Min, ImVec2(pos.x + circleStart, bb.Max.y), bg_col); + window->DrawList->AddRectFilled(bb.Min, ImVec2(pos.x + circleStart * value, bb.Max.y), fg_col); const float t = g.FrameCount * 0.1f; // g.Time; const float r = size.y / 2; @@ -7631,54 +10613,58 @@ bool ImGui::BufferingBar( const char* label, float value, const ImVec2& size_arg const float b = speed * 0.333f; const float c = speed * 0.666f; - const float o1 = ( circleWidth + r ) * ( t + a - speed * (int)( ( t + a ) / speed ) ) / speed; - const float o2 = ( circleWidth + r ) * ( t + b - speed * (int)( ( t + b ) / speed ) ) / speed; - const float o3 = ( circleWidth + r ) * ( t + c - speed * (int)( ( t + c ) / speed ) ) / speed; + const float o1 = (circleWidth + r) * (t + a - speed * (int)((t + a) / speed)) / speed; + const float o2 = (circleWidth + r) * (t + b - speed * (int)((t + b) / speed)) / speed; + const float o3 = (circleWidth + r) * (t + c - speed * (int)((t + c) / speed)) / speed; - window->DrawList->AddCircleFilled( ImVec2( pos.x + circleEnd - o1, bb.Min.y + r ), r, bg_col ); - window->DrawList->AddCircleFilled( ImVec2( pos.x + circleEnd - o2, bb.Min.y + r ), r, bg_col ); - window->DrawList->AddCircleFilled( ImVec2( pos.x + circleEnd - o3, bb.Min.y + r ), r, bg_col ); + window->DrawList->AddCircleFilled(ImVec2(pos.x + circleEnd - o1, bb.Min.y + r), r, bg_col); + window->DrawList->AddCircleFilled(ImVec2(pos.x + circleEnd - o2, bb.Min.y + r), r, bg_col); + window->DrawList->AddCircleFilled(ImVec2(pos.x + circleEnd - o3, bb.Min.y + r), r, bg_col); return true; } -bool ImGui::Spinner( const char* label, float radius, int thickness, const ImU32& color ) { +bool ImGui::Spinner(const char* label, float radius, int thickness, const ImU32& color) +{ ImGuiWindow* window = GetCurrentWindow(); - if( window->SkipItems ) + if (window->SkipItems) return false; ImGuiContext& g = *GImGui; const ImGuiStyle& style = g.Style; - const ImGuiID id = window->GetID( label ); + const ImGuiID id = window->GetID(label); ImVec2 pos = window->DC.CursorPos; - ImVec2 size( ( radius ) * 2, ( radius + style.FramePadding.y ) * 2 ); + ImVec2 size((radius) * 2, (radius + style.FramePadding.y) * 2); - const ImRect bb( pos, ImVec2( pos.x + size.x, pos.y + size.y ) ); - ItemSize( bb, style.FramePadding.y ); - if( !ItemAdd( bb, id ) ) + const ImRect bb(pos, ImVec2(pos.x + size.x, pos.y + size.y)); + ItemSize(bb, style.FramePadding.y); + if (!ItemAdd(bb, id)) return false; // Render window->DrawList->PathClear(); - auto progress { g.FrameCount * 0.1f }; + float const progress = g.FrameCount * 0.1f; int num_segments = 30; - int start = abs( ImSin( progress * 1.8f )*( num_segments - 5 ) ); + int start = (int)ImFabs(ImSin(progress * 1.8f) * (num_segments - 5)); - const float a_min = IM_PI * 2.0f * ( (float)start ) / (float)num_segments; - const float a_max = IM_PI * 2.0f * ( (float)num_segments - 3 ) / (float)num_segments; + const float a_min = IM_PI * 2.0f * ((float)start) / (float)num_segments; + const float a_max = IM_PI * 2.0f * ((float)num_segments - 3) / (float)num_segments; - const ImVec2 centre = ImVec2( pos.x + radius, pos.y + radius + style.FramePadding.y ); + const ImVec2 centre = ImVec2(pos.x + radius, pos.y + radius + style.FramePadding.y); - for( int i = 0; i < num_segments; i++ ) { - const float a = a_min + ( (float)i / (float)num_segments ) * ( a_max - a_min ); - window->DrawList->PathLineTo( ImVec2( centre.x + ImCos( a + progress * 8 ) * radius, - centre.y + ImSin( a + progress * 8 ) * radius ) ); + for (int i = 0; i < num_segments; i++) + { + const float a = a_min + ((float)i / (float)num_segments) * (a_max - a_min); + window->DrawList->PathLineTo(ImVec2(centre.x + ImCos(a + progress * 8) * radius, centre.y + ImSin(a + progress * 8) * radius)); } - window->DrawList->PathStroke( color, false, thickness ); + window->DrawList->PathStroke(color, 0, (float)thickness); return true; } + + +#endif // #ifndef IMGUI_DISABLE diff --git a/imgui/imstb_rectpack.h b/imgui/imstb_rectpack.h index ff2a85df4..f6917e7a6 100644 --- a/imgui/imstb_rectpack.h +++ b/imgui/imstb_rectpack.h @@ -1,15 +1,19 @@ // [DEAR IMGUI] -// This is a slightly modified version of stb_rect_pack.h 1.00. -// Those changes would need to be pushed into nothings/stb: -// - Added STBRP__CDECL +// This is a slightly modified version of stb_rect_pack.h 1.01. // Grep for [DEAR IMGUI] to find the changes. - -// stb_rect_pack.h - v1.00 - public domain - rectangle packing +// +// stb_rect_pack.h - v1.01 - public domain - rectangle packing // Sean Barrett 2014 // // Useful for e.g. packing rectangular textures into an atlas. // Does not do rotation. // +// Before #including, +// +// #define STB_RECT_PACK_IMPLEMENTATION +// +// in the file that you want to have the implementation. +// // Not necessarily the awesomest packing method, but better than // the totally naive one in stb_truetype (which is primarily what // this is meant to replace). @@ -34,13 +38,14 @@ // Minor features // Martins Mozeiko // github:IntellectualKitty -// +// // Bugfixes / warning fixes // Jeremy Jaussaud // Fabian Giesen // // Version history: // +// 1.01 (2021-07-11) always use large rect mode, expose STBRP__MAXVAL in public section // 1.00 (2019-02-25) avoid small space waste; gracefully fail too-wide rectangles // 0.99 (2019-02-07) warning fixes // 0.11 (2017-03-03) return packing success/fail result @@ -81,11 +86,10 @@ typedef struct stbrp_context stbrp_context; typedef struct stbrp_node stbrp_node; typedef struct stbrp_rect stbrp_rect; -#ifdef STBRP_LARGE_RECTS typedef int stbrp_coord; -#else -typedef unsigned short stbrp_coord; -#endif + +#define STBRP__MAXVAL 0x7fffffff +// Mostly for internal use, but this is the maximum supported coordinate value. STBRP_DEF int stbrp_pack_rects (stbrp_context *context, stbrp_rect *rects, int num_rects); // Assign packed locations to rectangles. The rectangles are of type @@ -213,10 +217,9 @@ struct stbrp_context #define STBRP_ASSERT assert #endif -// [DEAR IMGUI] Added STBRP__CDECL #ifdef _MSC_VER #define STBRP__NOTUSED(v) (void)(v) -#define STBRP__CDECL __cdecl +#define STBRP__CDECL __cdecl #else #define STBRP__NOTUSED(v) (void)sizeof(v) #define STBRP__CDECL @@ -262,9 +265,6 @@ STBRP_DEF void stbrp_setup_allow_out_of_mem(stbrp_context *context, int allow_ou STBRP_DEF void stbrp_init_target(stbrp_context *context, int width, int height, stbrp_node *nodes, int num_nodes) { int i; -#ifndef STBRP_LARGE_RECTS - STBRP_ASSERT(width <= 0xffff && height <= 0xffff); -#endif for (i=0; i < num_nodes-1; ++i) nodes[i].next = &nodes[i+1]; @@ -283,11 +283,7 @@ STBRP_DEF void stbrp_init_target(stbrp_context *context, int width, int height, context->extra[0].y = 0; context->extra[0].next = &context->extra[1]; context->extra[1].x = (stbrp_coord) width; -#ifdef STBRP_LARGE_RECTS context->extra[1].y = (1<<30); -#else - context->extra[1].y = 65535; -#endif context->extra[1].next = NULL; } @@ -433,7 +429,7 @@ static stbrp__findresult stbrp__skyline_find_best_pos(stbrp_context *c, int widt if (y <= best_y) { if (y < best_y || waste < best_waste || (waste==best_waste && xpos < best_x)) { best_x = xpos; - STBRP_ASSERT(y <= best_y); + //STBRP_ASSERT(y <= best_y); [DEAR IMGUI] best_y = y; best_waste = waste; best = prev; @@ -441,7 +437,7 @@ static stbrp__findresult stbrp__skyline_find_best_pos(stbrp_context *c, int widt } } tail = tail->next; - } + } } fr.prev_link = best; @@ -529,7 +525,6 @@ static stbrp__findresult stbrp__skyline_pack_rectangle(stbrp_context *context, i return res; } -// [DEAR IMGUI] Added STBRP__CDECL static int STBRP__CDECL rect_height_compare(const void *a, const void *b) { const stbrp_rect *p = (const stbrp_rect *) a; @@ -541,7 +536,6 @@ static int STBRP__CDECL rect_height_compare(const void *a, const void *b) return (p->w > q->w) ? -1 : (p->w < q->w); } -// [DEAR IMGUI] Added STBRP__CDECL static int STBRP__CDECL rect_original_order(const void *a, const void *b) { const stbrp_rect *p = (const stbrp_rect *) a; @@ -549,12 +543,6 @@ static int STBRP__CDECL rect_original_order(const void *a, const void *b) return (p->was_packed < q->was_packed) ? -1 : (p->was_packed > q->was_packed); } -#ifdef STBRP_LARGE_RECTS -#define STBRP__MAXVAL 0xffffffff -#else -#define STBRP__MAXVAL 0xffff -#endif - STBRP_DEF int stbrp_pack_rects(stbrp_context *context, stbrp_rect *rects, int num_rects) { int i, all_rects_packed = 1; @@ -602,38 +590,38 @@ This software is available under 2 licenses -- choose whichever you prefer. ------------------------------------------------------------------------------ ALTERNATIVE A - MIT License Copyright (c) 2017 Sean Barrett -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------------------------------------------------------------------------------ ALTERNATIVE B - Public Domain (www.unlicense.org) This is free and unencumbered software released into the public domain. -Anyone is free to copy, modify, publish, use, compile, sell, or distribute this -software, either in source code form or as a compiled binary, for any purpose, +Anyone is free to copy, modify, publish, use, compile, sell, or distribute this +software, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means. -In jurisdictions that recognize copyright laws, the author or authors of this -software dedicate any and all copyright interest in the software to the public -domain. We make this dedication for the benefit of the public at large and to -the detriment of our heirs and successors. We intend this dedication to be an -overt act of relinquishment in perpetuity of all present and future rights to +In jurisdictions that recognize copyright laws, the author or authors of this +software dedicate any and all copyright interest in the software to the public +domain. We make this dedication for the benefit of the public at large and to +the detriment of our heirs and successors. We intend this dedication to be an +overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------------------------------------------------------------------------------ */ diff --git a/imgui/imstb_textedit.h b/imgui/imstb_textedit.h index d7fcbd624..b7a761c85 100644 --- a/imgui/imstb_textedit.h +++ b/imgui/imstb_textedit.h @@ -1,10 +1,14 @@ -// [DEAR IMGUI] -// This is a slightly modified version of stb_textedit.h 1.13. +// [DEAR IMGUI] +// This is a slightly modified version of stb_textedit.h 1.14. // Those changes would need to be pushed into nothings/stb: // - Fix in stb_textedit_discard_redo (see https://github.com/nothings/stb/issues/321) +// - Fix in stb_textedit_find_charpos to handle last line (see https://github.com/ocornut/imgui/issues/6000 + #6783) +// - Added name to struct or it may be forward declared in our code. +// - Added UTF-8 support (see https://github.com/nothings/stb/issues/188 + https://github.com/ocornut/imgui/pull/7925) // Grep for [DEAR IMGUI] to find the changes. +// - Also renamed macros used or defined outside of IMSTB_TEXTEDIT_IMPLEMENTATION block from STB_TEXTEDIT_* to IMSTB_TEXTEDIT_* -// stb_textedit.h - v1.13 - public domain - Sean Barrett +// stb_textedit.h - v1.14 - public domain - Sean Barrett // Development of this library was sponsored by RAD Game Tools // // This C header file implements the guts of a multi-line text-editing @@ -19,7 +23,7 @@ // texts, as its performance does not scale and it has limited undo). // // Non-trivial behaviors are modelled after Windows text controls. -// +// // // LICENSE // @@ -29,16 +33,17 @@ // DEPENDENCIES // // Uses the C runtime function 'memmove', which you can override -// by defining STB_TEXTEDIT_memmove before the implementation. +// by defining IMSTB_TEXTEDIT_memmove before the implementation. // Uses no other functions. Performs no runtime allocations. // // // VERSION HISTORY // +// 1.14 (2021-07-11) page up/down, various fixes // 1.13 (2019-02-07) fix bug in undo size management // 1.12 (2018-01-29) user can change STB_TEXTEDIT_KEYTYPE, fix redo to avoid crash // 1.11 (2017-03-03) fix HOME on last line, dragging off single-line textfield -// 1.10 (2016-10-25) supress warnings about casting away const with -Wcast-qual +// 1.10 (2016-10-25) suppress warnings about casting away const with -Wcast-qual // 1.9 (2016-08-27) customizable move-by-word // 1.8 (2016-04-02) better keyboard handling when mouse button is down // 1.7 (2015-09-13) change y range handling in case baseline is non-0 @@ -58,6 +63,7 @@ // Ulf Winklemann: move-by-word in 1.1 // Fabian Giesen: secondary key inputs in 1.5 // Martins Mozeiko: STB_TEXTEDIT_memmove in 1.6 +// Louis Schnellbach: page up/down in 1.14 // // Bugfixes: // Scott Graham @@ -93,8 +99,8 @@ // moderate sizes. The undo system does no memory allocations, so // it grows STB_TexteditState by the worst-case storage which is (in bytes): // -// [4 + 3 * sizeof(STB_TEXTEDIT_POSITIONTYPE)] * STB_TEXTEDIT_UNDOSTATE_COUNT -// + sizeof(STB_TEXTEDIT_CHARTYPE) * STB_TEXTEDIT_UNDOCHAR_COUNT +// [4 + 3 * sizeof(STB_TEXTEDIT_POSITIONTYPE)] * STB_TEXTEDIT_UNDOSTATECOUNT +// + sizeof(STB_TEXTEDIT_CHARTYPE) * STB_TEXTEDIT_UNDOCHARCOUNT // // // Implementation mode: @@ -148,6 +154,8 @@ // STB_TEXTEDIT_K_RIGHT keyboard input to move cursor right // STB_TEXTEDIT_K_UP keyboard input to move cursor up // STB_TEXTEDIT_K_DOWN keyboard input to move cursor down +// STB_TEXTEDIT_K_PGUP keyboard input to move cursor up a page +// STB_TEXTEDIT_K_PGDOWN keyboard input to move cursor down a page // STB_TEXTEDIT_K_LINESTART keyboard input to move cursor to start of line // e.g. HOME // STB_TEXTEDIT_K_LINEEND keyboard input to move cursor to end of line // e.g. END // STB_TEXTEDIT_K_TEXTSTART keyboard input to move cursor to start of text // e.g. ctrl-HOME @@ -170,14 +178,10 @@ // STB_TEXTEDIT_K_TEXTSTART2 secondary keyboard input to move cursor to start of text // STB_TEXTEDIT_K_TEXTEND2 secondary keyboard input to move cursor to end of text // -// Todo: -// STB_TEXTEDIT_K_PGUP keyboard input to move cursor up a page -// STB_TEXTEDIT_K_PGDOWN keyboard input to move cursor down a page -// // Keyboard input must be encoded as a single integer value; e.g. a character code // and some bitflags that represent shift states. to simplify the interface, SHIFT must // be a bitflag, so we can test the shifted state of cursor movements to allow selection, -// i.e. (STB_TEXTED_K_RIGHT|STB_TEXTEDIT_K_SHIFT) should be shifted right-arrow. +// i.e. (STB_TEXTEDIT_K_RIGHT|STB_TEXTEDIT_K_SHIFT) should be shifted right-arrow. // // You can encode other things, such as CONTROL or ALT, in additional bits, and // then test for their presence in e.g. STB_TEXTEDIT_K_WORDLEFT. For example, @@ -207,6 +211,7 @@ // int stb_textedit_cut(STB_TEXTEDIT_STRING *str, STB_TexteditState *state) // int stb_textedit_paste(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, STB_TEXTEDIT_CHARTYPE *text, int len) // void stb_textedit_key(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, STB_TEXEDIT_KEYTYPE key) +// void stb_textedit_text(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, STB_TEXTEDIT_CHARTYPE *text, int text_len) // // Each of these functions potentially updates the string and updates the // state. @@ -219,20 +224,20 @@ // call this with the mouse x,y on a mouse down; it will update the cursor // and reset the selection start/end to the cursor point. the x,y must // be relative to the text widget, with (0,0) being the top left. -// +// // drag: // call this with the mouse x,y on a mouse drag/up; it will update the // cursor and the selection end point -// +// // cut: // call this to delete the current selection; returns true if there was // one. you should FIRST copy the current selection to the system paste buffer. // (To copy, just copy the current selection out of the string yourself.) -// +// // paste: // call this to paste text at the current cursor point or over the current // selection if there is one. -// +// // key: // call this for keyboard inputs sent to the textfield. you can use it // for "key down" events or for "translated" key events. if you need to @@ -241,9 +246,14 @@ // various definitions like STB_TEXTEDIT_K_LEFT have the is-key-event bit // set, and make STB_TEXTEDIT_KEYTOCHAR check that the is-key-event bit is // clear. STB_TEXTEDIT_KEYTYPE defaults to int, but you can #define it to -// anything other type you wante before including. +// anything other type you want before including. +// if the STB_TEXTEDIT_KEYTOTEXT function is defined, selected keys are +// transformed into text and stb_textedit_text() is automatically called. +// +// text: [DEAR IMGUI] added 2024-09 +// call this to text inputs sent to the textfield. +// // -// // When rendering, you can read the cursor position and selection state from // the STB_TexteditState. // @@ -273,8 +283,8 @@ //// //// -#ifndef INCLUDE_STB_TEXTEDIT_H -#define INCLUDE_STB_TEXTEDIT_H +#ifndef INCLUDE_IMSTB_TEXTEDIT_H +#define INCLUDE_IMSTB_TEXTEDIT_H //////////////////////////////////////////////////////////////////////// // @@ -285,38 +295,38 @@ // and undo state. // -#ifndef STB_TEXTEDIT_UNDOSTATECOUNT -#define STB_TEXTEDIT_UNDOSTATECOUNT 99 +#ifndef IMSTB_TEXTEDIT_UNDOSTATECOUNT +#define IMSTB_TEXTEDIT_UNDOSTATECOUNT 99 #endif -#ifndef STB_TEXTEDIT_UNDOCHARCOUNT -#define STB_TEXTEDIT_UNDOCHARCOUNT 999 +#ifndef IMSTB_TEXTEDIT_UNDOCHARCOUNT +#define IMSTB_TEXTEDIT_UNDOCHARCOUNT 999 #endif -#ifndef STB_TEXTEDIT_CHARTYPE -#define STB_TEXTEDIT_CHARTYPE int +#ifndef IMSTB_TEXTEDIT_CHARTYPE +#define IMSTB_TEXTEDIT_CHARTYPE int #endif -#ifndef STB_TEXTEDIT_POSITIONTYPE -#define STB_TEXTEDIT_POSITIONTYPE int +#ifndef IMSTB_TEXTEDIT_POSITIONTYPE +#define IMSTB_TEXTEDIT_POSITIONTYPE int #endif typedef struct { // private data - STB_TEXTEDIT_POSITIONTYPE where; - STB_TEXTEDIT_POSITIONTYPE insert_length; - STB_TEXTEDIT_POSITIONTYPE delete_length; + IMSTB_TEXTEDIT_POSITIONTYPE where; + IMSTB_TEXTEDIT_POSITIONTYPE insert_length; + IMSTB_TEXTEDIT_POSITIONTYPE delete_length; int char_storage; } StbUndoRecord; typedef struct { // private data - StbUndoRecord undo_rec [STB_TEXTEDIT_UNDOSTATECOUNT]; - STB_TEXTEDIT_CHARTYPE undo_char[STB_TEXTEDIT_UNDOCHARCOUNT]; + StbUndoRecord undo_rec [IMSTB_TEXTEDIT_UNDOSTATECOUNT]; + IMSTB_TEXTEDIT_CHARTYPE undo_char[IMSTB_TEXTEDIT_UNDOCHARCOUNT]; short undo_point, redo_point; int undo_char_point, redo_char_point; } StbUndoState; -typedef struct +typedef struct STB_TexteditState { ///////////////////// // @@ -337,6 +347,10 @@ typedef struct // each textfield keeps its own insert mode state. to keep an app-wide // insert mode, copy this value in/out of the app state + int row_count_per_page; + // page size in number of row. + // this value MUST be set to >0 for pageup or pagedown in multilines documents. + ///////////////////// // // private data @@ -366,7 +380,7 @@ typedef struct float ymin,ymax; // height of row above and below baseline int num_chars; } StbTexteditRow; -#endif //INCLUDE_STB_TEXTEDIT_H +#endif //INCLUDE_IMSTB_TEXTEDIT_H //////////////////////////////////////////////////////////////////////////// @@ -379,11 +393,11 @@ typedef struct // implementation isn't include-guarded, since it might have indirectly // included just the "header" portion -#ifdef STB_TEXTEDIT_IMPLEMENTATION +#ifdef IMSTB_TEXTEDIT_IMPLEMENTATION -#ifndef STB_TEXTEDIT_memmove +#ifndef IMSTB_TEXTEDIT_memmove #include -#define STB_TEXTEDIT_memmove memmove +#define IMSTB_TEXTEDIT_memmove memmove #endif @@ -393,7 +407,7 @@ typedef struct // // traverse the layout to locate the nearest character to a display position -static int stb_text_locate_coord(STB_TEXTEDIT_STRING *str, float x, float y) +static int stb_text_locate_coord(IMSTB_TEXTEDIT_STRING *str, float x, float y) { StbTexteditRow r; int n = STB_TEXTEDIT_STRINGLEN(str); @@ -432,13 +446,13 @@ static int stb_text_locate_coord(STB_TEXTEDIT_STRING *str, float x, float y) if (x < r.x1) { // search characters in row for one that straddles 'x' prev_x = r.x0; - for (k=0; k < r.num_chars; ++k) { + for (k=0; k < r.num_chars; k = IMSTB_TEXTEDIT_GETNEXTCHARINDEX(str, i + k) - i) { float w = STB_TEXTEDIT_GETWIDTH(str, i, k); if (x < prev_x+w) { if (x < prev_x+w/2) return k+i; else - return k+i+1; + return IMSTB_TEXTEDIT_GETNEXTCHARINDEX(str, i + k); } prev_x += w; } @@ -453,7 +467,7 @@ static int stb_text_locate_coord(STB_TEXTEDIT_STRING *str, float x, float y) } // API click: on mouse down, move the cursor to the clicked location, and reset the selection -static void stb_textedit_click(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, float x, float y) +static void stb_textedit_click(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *state, float x, float y) { // In single-line mode, just always make y = 0. This lets the drag keep working if the mouse // goes off the top or bottom of the text @@ -471,7 +485,7 @@ static void stb_textedit_click(STB_TEXTEDIT_STRING *str, STB_TexteditState *stat } // API drag: on mouse drag, move the cursor and selection endpoint to the clicked location -static void stb_textedit_drag(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, float x, float y) +static void stb_textedit_drag(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *state, float x, float y) { int p = 0; @@ -497,11 +511,11 @@ static void stb_textedit_drag(STB_TEXTEDIT_STRING *str, STB_TexteditState *state // // forward declarations -static void stb_text_undo(STB_TEXTEDIT_STRING *str, STB_TexteditState *state); -static void stb_text_redo(STB_TEXTEDIT_STRING *str, STB_TexteditState *state); -static void stb_text_makeundo_delete(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, int where, int length); +static void stb_text_undo(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *state); +static void stb_text_redo(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *state); +static void stb_text_makeundo_delete(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *state, int where, int length); static void stb_text_makeundo_insert(STB_TexteditState *state, int where, int length); -static void stb_text_makeundo_replace(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, int where, int old_length, int new_length); +static void stb_text_makeundo_replace(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *state, int where, int old_length, int new_length); typedef struct { @@ -513,36 +527,21 @@ typedef struct // find the x/y location of a character, and remember info about the previous row in // case we get a move-up event (for page up, we'll have to rescan) -static void stb_textedit_find_charpos(StbFindState *find, STB_TEXTEDIT_STRING *str, int n, int single_line) +static void stb_textedit_find_charpos(StbFindState *find, IMSTB_TEXTEDIT_STRING *str, int n, int single_line) { StbTexteditRow r; int prev_start = 0; int z = STB_TEXTEDIT_STRINGLEN(str); int i=0, first; - if (n == z) { - // if it's at the end, then find the last line -- simpler than trying to - // explicitly handle this case in the regular code - if (single_line) { - STB_TEXTEDIT_LAYOUTROW(&r, str, 0); - find->y = 0; - find->first_char = 0; - find->length = z; - find->height = r.ymax - r.ymin; - find->x = r.x1; - } else { - find->y = 0; - find->x = 0; - find->height = 1; - while (i < z) { - STB_TEXTEDIT_LAYOUTROW(&r, str, i); - prev_start = i; - i += r.num_chars; - } - find->first_char = i; - find->length = 0; - find->prev_first = prev_start; - } + if (n == z && single_line) { + // special case if it's at the end (may not be needed?) + STB_TEXTEDIT_LAYOUTROW(&r, str, 0); + find->y = 0; + find->first_char = 0; + find->length = z; + find->height = r.ymax - r.ymin; + find->x = r.x1; return; } @@ -553,9 +552,16 @@ static void stb_textedit_find_charpos(StbFindState *find, STB_TEXTEDIT_STRING *s STB_TEXTEDIT_LAYOUTROW(&r, str, i); if (n < i + r.num_chars) break; + if (i + r.num_chars == z && z > 0 && STB_TEXTEDIT_GETCHAR(str, z - 1) != STB_TEXTEDIT_NEWLINE) // [DEAR IMGUI] special handling for last line + break; // [DEAR IMGUI] prev_start = i; i += r.num_chars; find->y += r.baseline_y_delta; + if (i == z) // [DEAR IMGUI] + { + r.num_chars = 0; // [DEAR IMGUI] + break; // [DEAR IMGUI] + } } find->first_char = first = i; @@ -565,14 +571,14 @@ static void stb_textedit_find_charpos(StbFindState *find, STB_TEXTEDIT_STRING *s // now scan to find xpos find->x = r.x0; - for (i=0; first+i < n; ++i) + for (i=0; first+i < n; i = IMSTB_TEXTEDIT_GETNEXTCHARINDEX(str, first + i) - first) find->x += STB_TEXTEDIT_GETWIDTH(str, first, i); } #define STB_TEXT_HAS_SELECTION(s) ((s)->select_start != (s)->select_end) // make the selection/cursor state valid if client altered the string -static void stb_textedit_clamp(STB_TEXTEDIT_STRING *str, STB_TexteditState *state) +static void stb_textedit_clamp(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *state) { int n = STB_TEXTEDIT_STRINGLEN(str); if (STB_TEXT_HAS_SELECTION(state)) { @@ -586,7 +592,7 @@ static void stb_textedit_clamp(STB_TEXTEDIT_STRING *str, STB_TexteditState *stat } // delete characters while updating undo -static void stb_textedit_delete(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, int where, int len) +static void stb_textedit_delete(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *state, int where, int len) { stb_text_makeundo_delete(str, state, where, len); STB_TEXTEDIT_DELETECHARS(str, where, len); @@ -594,7 +600,7 @@ static void stb_textedit_delete(STB_TEXTEDIT_STRING *str, STB_TexteditState *sta } // delete the section -static void stb_textedit_delete_selection(STB_TEXTEDIT_STRING *str, STB_TexteditState *state) +static void stb_textedit_delete_selection(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *state) { stb_textedit_clamp(str, state); if (STB_TEXT_HAS_SELECTION(state)) { @@ -631,7 +637,7 @@ static void stb_textedit_move_to_first(STB_TexteditState *state) } // move cursor to last character of selection -static void stb_textedit_move_to_last(STB_TEXTEDIT_STRING *str, STB_TexteditState *state) +static void stb_textedit_move_to_last(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *state) { if (STB_TEXT_HAS_SELECTION(state)) { stb_textedit_sortselection(state); @@ -642,14 +648,25 @@ static void stb_textedit_move_to_last(STB_TEXTEDIT_STRING *str, STB_TexteditStat } } +// [DEAR IMGUI] +// Functions must be implemented for UTF8 support +// Code in this file that uses those functions is modified for [DEAR IMGUI] and deviates from the original stb_textedit. +// There is not necessarily a '[DEAR IMGUI]' at the usage sites. +#ifndef IMSTB_TEXTEDIT_GETPREVCHARINDEX +#define IMSTB_TEXTEDIT_GETPREVCHARINDEX(obj, idx) (idx - 1) +#endif +#ifndef IMSTB_TEXTEDIT_GETNEXTCHARINDEX +#define IMSTB_TEXTEDIT_GETNEXTCHARINDEX(obj, idx) (idx + 1) +#endif + #ifdef STB_TEXTEDIT_IS_SPACE -static int is_word_boundary( STB_TEXTEDIT_STRING *str, int idx ) +static int is_word_boundary( IMSTB_TEXTEDIT_STRING *str, int idx ) { return idx > 0 ? (STB_TEXTEDIT_IS_SPACE( STB_TEXTEDIT_GETCHAR(str,idx-1) ) && !STB_TEXTEDIT_IS_SPACE( STB_TEXTEDIT_GETCHAR(str, idx) ) ) : 1; } #ifndef STB_TEXTEDIT_MOVEWORDLEFT -static int stb_textedit_move_to_word_previous( STB_TEXTEDIT_STRING *str, int c ) +static int stb_textedit_move_to_word_previous( IMSTB_TEXTEDIT_STRING *str, int c ) { --c; // always move at least one character while( c >= 0 && !is_word_boundary( str, c ) ) @@ -664,7 +681,7 @@ static int stb_textedit_move_to_word_previous( STB_TEXTEDIT_STRING *str, int c ) #endif #ifndef STB_TEXTEDIT_MOVEWORDRIGHT -static int stb_textedit_move_to_word_next( STB_TEXTEDIT_STRING *str, int c ) +static int stb_textedit_move_to_word_next( IMSTB_TEXTEDIT_STRING *str, int c ) { const int len = STB_TEXTEDIT_STRINGLEN(str); ++c; // always move at least one character @@ -691,7 +708,7 @@ static void stb_textedit_prep_selection_at_cursor(STB_TexteditState *state) } // API cut: delete selection -static int stb_textedit_cut(STB_TEXTEDIT_STRING *str, STB_TexteditState *state) +static int stb_textedit_cut(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *state) { if (STB_TEXT_HAS_SELECTION(state)) { stb_textedit_delete_selection(str,state); // implicitly clamps @@ -702,7 +719,7 @@ static int stb_textedit_cut(STB_TEXTEDIT_STRING *str, STB_TexteditState *state) } // API paste: replace existing selection with passed-in text -static int stb_textedit_paste_internal(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, STB_TEXTEDIT_CHARTYPE *text, int len) +static int stb_textedit_paste_internal(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *state, IMSTB_TEXTEDIT_CHARTYPE *text, int len) { // if there's a selection, the paste should delete it stb_textedit_clamp(str, state); @@ -714,9 +731,7 @@ static int stb_textedit_paste_internal(STB_TEXTEDIT_STRING *str, STB_TexteditSta state->has_preferred_x = 0; return 1; } - // remove the undo since we didn't actually insert the characters - if (state->undostate.undo_point) - --state->undostate.undo_point; + // note: paste failure will leave deleted selection, may be restored with an undo (see https://github.com/nothings/stb/issues/734 for details) return 0; } @@ -724,36 +739,44 @@ static int stb_textedit_paste_internal(STB_TEXTEDIT_STRING *str, STB_TexteditSta #define STB_TEXTEDIT_KEYTYPE int #endif +// [DEAR IMGUI] Added stb_textedit_text(), extracted out and called by stb_textedit_key() for backward compatibility. +static void stb_textedit_text(IMSTB_TEXTEDIT_STRING* str, STB_TexteditState* state, const IMSTB_TEXTEDIT_CHARTYPE* text, int text_len) +{ + // can't add newline in single-line mode + if (text[0] == '\n' && state->single_line) + return; + + if (state->insert_mode && !STB_TEXT_HAS_SELECTION(state) && state->cursor < STB_TEXTEDIT_STRINGLEN(str)) { + stb_text_makeundo_replace(str, state, state->cursor, 1, 1); + STB_TEXTEDIT_DELETECHARS(str, state->cursor, 1); + if (STB_TEXTEDIT_INSERTCHARS(str, state->cursor, text, text_len)) { + state->cursor += text_len; + state->has_preferred_x = 0; + } + } + else { + stb_textedit_delete_selection(str, state); // implicitly clamps + if (STB_TEXTEDIT_INSERTCHARS(str, state->cursor, text, text_len)) { + stb_text_makeundo_insert(state, state->cursor, text_len); + state->cursor += text_len; + state->has_preferred_x = 0; + } + } +} + // API key: process a keyboard input -static void stb_textedit_key(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, STB_TEXTEDIT_KEYTYPE key) +static void stb_textedit_key(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *state, STB_TEXTEDIT_KEYTYPE key) { retry: switch (key) { default: { +#ifdef STB_TEXTEDIT_KEYTOTEXT int c = STB_TEXTEDIT_KEYTOTEXT(key); if (c > 0) { - STB_TEXTEDIT_CHARTYPE ch = (STB_TEXTEDIT_CHARTYPE) c; - - // can't add newline in single-line mode - if (c == '\n' && state->single_line) - break; - - if (state->insert_mode && !STB_TEXT_HAS_SELECTION(state) && state->cursor < STB_TEXTEDIT_STRINGLEN(str)) { - stb_text_makeundo_replace(str, state, state->cursor, 1, 1); - STB_TEXTEDIT_DELETECHARS(str, state->cursor, 1); - if (STB_TEXTEDIT_INSERTCHARS(str, state->cursor, &ch, 1)) { - ++state->cursor; - state->has_preferred_x = 0; - } - } else { - stb_textedit_delete_selection(str,state); // implicitly clamps - if (STB_TEXTEDIT_INSERTCHARS(str, state->cursor, &ch, 1)) { - stb_text_makeundo_insert(state, state->cursor, 1); - ++state->cursor; - state->has_preferred_x = 0; - } - } + IMSTB_TEXTEDIT_CHARTYPE ch = (IMSTB_TEXTEDIT_CHARTYPE)c; + stb_textedit_text(str, state, &ch, 1); } +#endif break; } @@ -762,7 +785,7 @@ retry: state->insert_mode = !state->insert_mode; break; #endif - + case STB_TEXTEDIT_K_UNDO: stb_text_undo(str, state); state->has_preferred_x = 0; @@ -777,9 +800,9 @@ retry: // if currently there's a selection, move cursor to start of selection if (STB_TEXT_HAS_SELECTION(state)) stb_textedit_move_to_first(state); - else + else if (state->cursor > 0) - --state->cursor; + state->cursor = IMSTB_TEXTEDIT_GETPREVCHARINDEX(str, state->cursor); state->has_preferred_x = 0; break; @@ -788,7 +811,7 @@ retry: if (STB_TEXT_HAS_SELECTION(state)) stb_textedit_move_to_last(str, state); else - ++state->cursor; + state->cursor = IMSTB_TEXTEDIT_GETNEXTCHARINDEX(str, state->cursor); stb_textedit_clamp(str, state); state->has_preferred_x = 0; break; @@ -798,7 +821,7 @@ retry: stb_textedit_prep_selection_at_cursor(state); // move selection left if (state->select_end > 0) - --state->select_end; + state->select_end = IMSTB_TEXTEDIT_GETPREVCHARINDEX(str, state->select_end); state->cursor = state->select_end; state->has_preferred_x = 0; break; @@ -826,7 +849,7 @@ retry: #ifdef STB_TEXTEDIT_MOVEWORDRIGHT case STB_TEXTEDIT_K_WORDRIGHT: - if (STB_TEXT_HAS_SELECTION(state)) + if (STB_TEXT_HAS_SELECTION(state)) stb_textedit_move_to_last(str, state); else { state->cursor = STB_TEXTEDIT_MOVEWORDRIGHT(str, state->cursor); @@ -848,19 +871,23 @@ retry: case STB_TEXTEDIT_K_RIGHT | STB_TEXTEDIT_K_SHIFT: stb_textedit_prep_selection_at_cursor(state); // move selection right - ++state->select_end; + state->select_end = IMSTB_TEXTEDIT_GETNEXTCHARINDEX(str, state->select_end); stb_textedit_clamp(str, state); state->cursor = state->select_end; state->has_preferred_x = 0; break; case STB_TEXTEDIT_K_DOWN: - case STB_TEXTEDIT_K_DOWN | STB_TEXTEDIT_K_SHIFT: { + case STB_TEXTEDIT_K_DOWN | STB_TEXTEDIT_K_SHIFT: + case STB_TEXTEDIT_K_PGDOWN: + case STB_TEXTEDIT_K_PGDOWN | STB_TEXTEDIT_K_SHIFT: { StbFindState find; StbTexteditRow row; - int i, sel = (key & STB_TEXTEDIT_K_SHIFT) != 0; + int i, j, sel = (key & STB_TEXTEDIT_K_SHIFT) != 0; + int is_page = (key & ~STB_TEXTEDIT_K_SHIFT) == STB_TEXTEDIT_K_PGDOWN; + int row_count = is_page ? state->row_count_per_page : 1; - if (state->single_line) { + if (!is_page && state->single_line) { // on windows, up&down in single-line behave like left&right key = STB_TEXTEDIT_K_RIGHT | (key & STB_TEXTEDIT_K_SHIFT); goto retry; @@ -869,30 +896,38 @@ retry: if (sel) stb_textedit_prep_selection_at_cursor(state); else if (STB_TEXT_HAS_SELECTION(state)) - stb_textedit_move_to_last(str,state); + stb_textedit_move_to_last(str, state); // compute current position of cursor point stb_textedit_clamp(str, state); stb_textedit_find_charpos(&find, str, state->cursor, state->single_line); - // now find character position down a row - if (find.length) { - float goal_x = state->has_preferred_x ? state->preferred_x : find.x; - float x; + for (j = 0; j < row_count; ++j) { + float x, goal_x = state->has_preferred_x ? state->preferred_x : find.x; int start = find.first_char + find.length; + + if (find.length == 0) + break; + + // [DEAR IMGUI] + // going down while being on the last line shouldn't bring us to that line end + if (STB_TEXTEDIT_GETCHAR(str, find.first_char + find.length - 1) != STB_TEXTEDIT_NEWLINE) + break; + + // now find character position down a row state->cursor = start; STB_TEXTEDIT_LAYOUTROW(&row, str, state->cursor); x = row.x0; for (i=0; i < row.num_chars; ++i) { float dx = STB_TEXTEDIT_GETWIDTH(str, start, i); - #ifdef STB_TEXTEDIT_GETWIDTH_NEWLINE - if (dx == STB_TEXTEDIT_GETWIDTH_NEWLINE) + #ifdef IMSTB_TEXTEDIT_GETWIDTH_NEWLINE + if (dx == IMSTB_TEXTEDIT_GETWIDTH_NEWLINE) break; #endif x += dx; if (x > goal_x) break; - ++state->cursor; + state->cursor = IMSTB_TEXTEDIT_GETNEXTCHARINDEX(str, state->cursor); } stb_textedit_clamp(str, state); @@ -901,17 +936,25 @@ retry: if (sel) state->select_end = state->cursor; + + // go to next line + find.first_char = find.first_char + find.length; + find.length = row.num_chars; } break; } - + case STB_TEXTEDIT_K_UP: - case STB_TEXTEDIT_K_UP | STB_TEXTEDIT_K_SHIFT: { + case STB_TEXTEDIT_K_UP | STB_TEXTEDIT_K_SHIFT: + case STB_TEXTEDIT_K_PGUP: + case STB_TEXTEDIT_K_PGUP | STB_TEXTEDIT_K_SHIFT: { StbFindState find; StbTexteditRow row; - int i, sel = (key & STB_TEXTEDIT_K_SHIFT) != 0; + int i, j, prev_scan, sel = (key & STB_TEXTEDIT_K_SHIFT) != 0; + int is_page = (key & ~STB_TEXTEDIT_K_SHIFT) == STB_TEXTEDIT_K_PGUP; + int row_count = is_page ? state->row_count_per_page : 1; - if (state->single_line) { + if (!is_page && state->single_line) { // on windows, up&down become left&right key = STB_TEXTEDIT_K_LEFT | (key & STB_TEXTEDIT_K_SHIFT); goto retry; @@ -926,24 +969,27 @@ retry: stb_textedit_clamp(str, state); stb_textedit_find_charpos(&find, str, state->cursor, state->single_line); - // can only go up if there's a previous row - if (find.prev_first != find.first_char) { + for (j = 0; j < row_count; ++j) { + float x, goal_x = state->has_preferred_x ? state->preferred_x : find.x; + + // can only go up if there's a previous row + if (find.prev_first == find.first_char) + break; + // now find character position up a row - float goal_x = state->has_preferred_x ? state->preferred_x : find.x; - float x; state->cursor = find.prev_first; STB_TEXTEDIT_LAYOUTROW(&row, str, state->cursor); x = row.x0; for (i=0; i < row.num_chars; ++i) { float dx = STB_TEXTEDIT_GETWIDTH(str, find.prev_first, i); - #ifdef STB_TEXTEDIT_GETWIDTH_NEWLINE - if (dx == STB_TEXTEDIT_GETWIDTH_NEWLINE) + #ifdef IMSTB_TEXTEDIT_GETWIDTH_NEWLINE + if (dx == IMSTB_TEXTEDIT_GETWIDTH_NEWLINE) break; #endif x += dx; if (x > goal_x) break; - ++state->cursor; + state->cursor = IMSTB_TEXTEDIT_GETNEXTCHARINDEX(str, state->cursor); } stb_textedit_clamp(str, state); @@ -952,6 +998,14 @@ retry: if (sel) state->select_end = state->cursor; + + // go to previous line + // (we need to scan previous line the hard way. maybe we could expose this as a new API function?) + prev_scan = find.prev_first > 0 ? find.prev_first - 1 : 0; + while (prev_scan > 0 && STB_TEXTEDIT_GETCHAR(str, prev_scan - 1) != STB_TEXTEDIT_NEWLINE) + --prev_scan; + find.first_char = find.prev_first; + find.prev_first = prev_scan; } break; } @@ -963,7 +1017,7 @@ retry: else { int n = STB_TEXTEDIT_STRINGLEN(str); if (state->cursor < n) - stb_textedit_delete(str, state, state->cursor, 1); + stb_textedit_delete(str, state, state->cursor, IMSTB_TEXTEDIT_GETNEXTCHARINDEX(str, state->cursor) - state->cursor); } state->has_preferred_x = 0; break; @@ -975,13 +1029,14 @@ retry: else { stb_textedit_clamp(str, state); if (state->cursor > 0) { - stb_textedit_delete(str, state, state->cursor-1, 1); - --state->cursor; + int prev = IMSTB_TEXTEDIT_GETPREVCHARINDEX(str, state->cursor); + stb_textedit_delete(str, state, prev, state->cursor - prev); + state->cursor = prev; } } state->has_preferred_x = 0; break; - + #ifdef STB_TEXTEDIT_K_TEXTSTART2 case STB_TEXTEDIT_K_TEXTSTART2: #endif @@ -998,7 +1053,7 @@ retry: state->select_start = state->select_end = 0; state->has_preferred_x = 0; break; - + #ifdef STB_TEXTEDIT_K_TEXTSTART2 case STB_TEXTEDIT_K_TEXTSTART2 | STB_TEXTEDIT_K_SHIFT: #endif @@ -1075,10 +1130,6 @@ retry: state->has_preferred_x = 0; break; } - -// @TODO: -// STB_TEXTEDIT_K_PGUP - move cursor up a page -// STB_TEXTEDIT_K_PGDOWN - move cursor down a page } } @@ -1090,8 +1141,8 @@ retry: static void stb_textedit_flush_redo(StbUndoState *state) { - state->redo_point = STB_TEXTEDIT_UNDOSTATECOUNT; - state->redo_char_point = STB_TEXTEDIT_UNDOCHARCOUNT; + state->redo_point = IMSTB_TEXTEDIT_UNDOSTATECOUNT; + state->redo_char_point = IMSTB_TEXTEDIT_UNDOCHARCOUNT; } // discard the oldest entry in the undo list @@ -1103,13 +1154,13 @@ static void stb_textedit_discard_undo(StbUndoState *state) int n = state->undo_rec[0].insert_length, i; // delete n characters from all other records state->undo_char_point -= n; - STB_TEXTEDIT_memmove(state->undo_char, state->undo_char + n, (size_t) (state->undo_char_point*sizeof(STB_TEXTEDIT_CHARTYPE))); + IMSTB_TEXTEDIT_memmove(state->undo_char, state->undo_char + n, (size_t) (state->undo_char_point*sizeof(IMSTB_TEXTEDIT_CHARTYPE))); for (i=0; i < state->undo_point; ++i) if (state->undo_rec[i].char_storage >= 0) state->undo_rec[i].char_storage -= n; // @OPTIMIZE: get rid of char_storage and infer it } --state->undo_point; - STB_TEXTEDIT_memmove(state->undo_rec, state->undo_rec+1, (size_t) (state->undo_point*sizeof(state->undo_rec[0]))); + IMSTB_TEXTEDIT_memmove(state->undo_rec, state->undo_rec+1, (size_t) (state->undo_point*sizeof(state->undo_rec[0]))); } } @@ -1119,7 +1170,7 @@ static void stb_textedit_discard_undo(StbUndoState *state) // fill up even though the undo buffer didn't static void stb_textedit_discard_redo(StbUndoState *state) { - int k = STB_TEXTEDIT_UNDOSTATECOUNT-1; + int k = IMSTB_TEXTEDIT_UNDOSTATECOUNT-1; if (state->redo_point <= k) { // if the k'th undo state has characters, clean those up @@ -1127,20 +1178,20 @@ static void stb_textedit_discard_redo(StbUndoState *state) int n = state->undo_rec[k].insert_length, i; // move the remaining redo character data to the end of the buffer state->redo_char_point += n; - STB_TEXTEDIT_memmove(state->undo_char + state->redo_char_point, state->undo_char + state->redo_char_point-n, (size_t) ((STB_TEXTEDIT_UNDOCHARCOUNT - state->redo_char_point)*sizeof(STB_TEXTEDIT_CHARTYPE))); + IMSTB_TEXTEDIT_memmove(state->undo_char + state->redo_char_point, state->undo_char + state->redo_char_point-n, (size_t) ((IMSTB_TEXTEDIT_UNDOCHARCOUNT - state->redo_char_point)*sizeof(IMSTB_TEXTEDIT_CHARTYPE))); // adjust the position of all the other records to account for above memmove for (i=state->redo_point; i < k; ++i) if (state->undo_rec[i].char_storage >= 0) state->undo_rec[i].char_storage += n; } // now move all the redo records towards the end of the buffer; the first one is at 'redo_point' - // {DEAR IMGUI] - size_t move_size = (size_t)((STB_TEXTEDIT_UNDOSTATECOUNT - state->redo_point - 1) * sizeof(state->undo_rec[0])); + // [DEAR IMGUI] + size_t move_size = (size_t)((IMSTB_TEXTEDIT_UNDOSTATECOUNT - state->redo_point - 1) * sizeof(state->undo_rec[0])); const char* buf_begin = (char*)state->undo_rec; (void)buf_begin; const char* buf_end = (char*)state->undo_rec + sizeof(state->undo_rec); (void)buf_end; IM_ASSERT(((char*)(state->undo_rec + state->redo_point)) >= buf_begin); IM_ASSERT(((char*)(state->undo_rec + state->redo_point + 1) + move_size) <= buf_end); - STB_TEXTEDIT_memmove(state->undo_rec + state->redo_point+1, state->undo_rec + state->redo_point, move_size); + IMSTB_TEXTEDIT_memmove(state->undo_rec + state->redo_point+1, state->undo_rec + state->redo_point, move_size); // now move redo_point to point to the new one ++state->redo_point; @@ -1154,32 +1205,32 @@ static StbUndoRecord *stb_text_create_undo_record(StbUndoState *state, int numch // if we have no free records, we have to make room, by sliding the // existing records down - if (state->undo_point == STB_TEXTEDIT_UNDOSTATECOUNT) + if (state->undo_point == IMSTB_TEXTEDIT_UNDOSTATECOUNT) stb_textedit_discard_undo(state); // if the characters to store won't possibly fit in the buffer, we can't undo - if (numchars > STB_TEXTEDIT_UNDOCHARCOUNT) { + if (numchars > IMSTB_TEXTEDIT_UNDOCHARCOUNT) { state->undo_point = 0; state->undo_char_point = 0; return NULL; } // if we don't have enough free characters in the buffer, we have to make room - while (state->undo_char_point + numchars > STB_TEXTEDIT_UNDOCHARCOUNT) + while (state->undo_char_point + numchars > IMSTB_TEXTEDIT_UNDOCHARCOUNT) stb_textedit_discard_undo(state); return &state->undo_rec[state->undo_point++]; } -static STB_TEXTEDIT_CHARTYPE *stb_text_createundo(StbUndoState *state, int pos, int insert_len, int delete_len) +static IMSTB_TEXTEDIT_CHARTYPE *stb_text_createundo(StbUndoState *state, int pos, int insert_len, int delete_len) { StbUndoRecord *r = stb_text_create_undo_record(state, insert_len); if (r == NULL) return NULL; r->where = pos; - r->insert_length = (STB_TEXTEDIT_POSITIONTYPE) insert_len; - r->delete_length = (STB_TEXTEDIT_POSITIONTYPE) delete_len; + r->insert_length = (IMSTB_TEXTEDIT_POSITIONTYPE) insert_len; + r->delete_length = (IMSTB_TEXTEDIT_POSITIONTYPE) delete_len; if (insert_len == 0) { r->char_storage = -1; @@ -1191,7 +1242,7 @@ static STB_TEXTEDIT_CHARTYPE *stb_text_createundo(StbUndoState *state, int pos, } } -static void stb_text_undo(STB_TEXTEDIT_STRING *str, STB_TexteditState *state) +static void stb_text_undo(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *state) { StbUndoState *s = &state->undostate; StbUndoRecord u, *r; @@ -1218,7 +1269,7 @@ static void stb_text_undo(STB_TEXTEDIT_STRING *str, STB_TexteditState *state) // characters stored for *undoing* don't leave room for redo // if the last is true, we have to bail - if (s->undo_char_point + u.delete_length >= STB_TEXTEDIT_UNDOCHARCOUNT) { + if (s->undo_char_point + u.delete_length >= IMSTB_TEXTEDIT_UNDOCHARCOUNT) { // the undo records take up too much character space; there's no space to store the redo characters r->insert_length = 0; } else { @@ -1227,7 +1278,7 @@ static void stb_text_undo(STB_TEXTEDIT_STRING *str, STB_TexteditState *state) // there's definitely room to store the characters eventually while (s->undo_char_point + u.delete_length > s->redo_char_point) { // should never happen: - if (s->redo_point == STB_TEXTEDIT_UNDOSTATECOUNT) + if (s->redo_point == IMSTB_TEXTEDIT_UNDOSTATECOUNT) return; // there's currently not enough room, so discard a redo record stb_textedit_discard_redo(s); @@ -1259,11 +1310,11 @@ static void stb_text_undo(STB_TEXTEDIT_STRING *str, STB_TexteditState *state) s->redo_point--; } -static void stb_text_redo(STB_TEXTEDIT_STRING *str, STB_TexteditState *state) +static void stb_text_redo(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *state) { StbUndoState *s = &state->undostate; StbUndoRecord *u, r; - if (s->redo_point == STB_TEXTEDIT_UNDOSTATECOUNT) + if (s->redo_point == IMSTB_TEXTEDIT_UNDOSTATECOUNT) return; // we need to do two things: apply the redo record, and create an undo record @@ -1315,20 +1366,20 @@ static void stb_text_makeundo_insert(STB_TexteditState *state, int where, int le stb_text_createundo(&state->undostate, where, 0, length); } -static void stb_text_makeundo_delete(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, int where, int length) +static void stb_text_makeundo_delete(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *state, int where, int length) { int i; - STB_TEXTEDIT_CHARTYPE *p = stb_text_createundo(&state->undostate, where, length, 0); + IMSTB_TEXTEDIT_CHARTYPE *p = stb_text_createundo(&state->undostate, where, length, 0); if (p) { for (i=0; i < length; ++i) p[i] = STB_TEXTEDIT_GETCHAR(str, where+i); } } -static void stb_text_makeundo_replace(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, int where, int old_length, int new_length) +static void stb_text_makeundo_replace(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *state, int where, int old_length, int new_length) { int i; - STB_TEXTEDIT_CHARTYPE *p = stb_text_createundo(&state->undostate, where, old_length, new_length); + IMSTB_TEXTEDIT_CHARTYPE *p = stb_text_createundo(&state->undostate, where, old_length, new_length); if (p) { for (i=0; i < old_length; ++i) p[i] = STB_TEXTEDIT_GETCHAR(str, where+i); @@ -1340,8 +1391,8 @@ static void stb_textedit_clear_state(STB_TexteditState *state, int is_single_lin { state->undostate.undo_point = 0; state->undostate.undo_char_point = 0; - state->undostate.redo_point = STB_TEXTEDIT_UNDOSTATECOUNT; - state->undostate.redo_char_point = STB_TEXTEDIT_UNDOCHARCOUNT; + state->undostate.redo_point = IMSTB_TEXTEDIT_UNDOSTATECOUNT; + state->undostate.redo_char_point = IMSTB_TEXTEDIT_UNDOCHARCOUNT; state->select_end = state->select_start = 0; state->cursor = 0; state->has_preferred_x = 0; @@ -1350,6 +1401,7 @@ static void stb_textedit_clear_state(STB_TexteditState *state, int is_single_lin state->initialized = 1; state->single_line = (unsigned char) is_single_line; state->insert_mode = 0; + state->row_count_per_page = 0; } // API initialize @@ -1363,16 +1415,16 @@ static void stb_textedit_initialize_state(STB_TexteditState *state, int is_singl #pragma GCC diagnostic ignored "-Wcast-qual" #endif -static int stb_textedit_paste(STB_TEXTEDIT_STRING *str, STB_TexteditState *state, STB_TEXTEDIT_CHARTYPE const *ctext, int len) +static int stb_textedit_paste(IMSTB_TEXTEDIT_STRING *str, STB_TexteditState *state, IMSTB_TEXTEDIT_CHARTYPE const *ctext, int len) { - return stb_textedit_paste_internal(str, state, (STB_TEXTEDIT_CHARTYPE *) ctext, len); + return stb_textedit_paste_internal(str, state, (IMSTB_TEXTEDIT_CHARTYPE *) ctext, len); } #if defined(__GNUC__) || defined(__clang__) #pragma GCC diagnostic pop #endif -#endif//STB_TEXTEDIT_IMPLEMENTATION +#endif//IMSTB_TEXTEDIT_IMPLEMENTATION /* ------------------------------------------------------------------------------ @@ -1380,38 +1432,38 @@ This software is available under 2 licenses -- choose whichever you prefer. ------------------------------------------------------------------------------ ALTERNATIVE A - MIT License Copyright (c) 2017 Sean Barrett -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------------------------------------------------------------------------------ ALTERNATIVE B - Public Domain (www.unlicense.org) This is free and unencumbered software released into the public domain. -Anyone is free to copy, modify, publish, use, compile, sell, or distribute this -software, either in source code form or as a compiled binary, for any purpose, +Anyone is free to copy, modify, publish, use, compile, sell, or distribute this +software, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means. -In jurisdictions that recognize copyright laws, the author or authors of this -software dedicate any and all copyright interest in the software to the public -domain. We make this dedication for the benefit of the public at large and to -the detriment of our heirs and successors. We intend this dedication to be an -overt act of relinquishment in perpetuity of all present and future rights to +In jurisdictions that recognize copyright laws, the author or authors of this +software dedicate any and all copyright interest in the software to the public +domain. We make this dedication for the benefit of the public at large and to +the detriment of our heirs and successors. We intend this dedication to be an +overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------------------------------------------------------------------------------ */ diff --git a/imgui/imstb_truetype.h b/imgui/imstb_truetype.h index c1cdb1806..976f09cb9 100644 --- a/imgui/imstb_truetype.h +++ b/imgui/imstb_truetype.h @@ -1,10 +1,19 @@ -// [DEAR IMGUI] -// This is a slightly modified version of stb_truetype.h 1.20. +// [DEAR IMGUI] +// This is a slightly modified version of stb_truetype.h 1.26. // Mostly fixing for compiler and static analyzer warnings. // Grep for [DEAR IMGUI] to find the changes. -// stb_truetype.h - v1.20 - public domain -// authored from 2009-2016 by Sean Barrett / RAD Game Tools +// stb_truetype.h - v1.26 - public domain +// authored from 2009-2021 by Sean Barrett / RAD Game Tools +// +// ======================================================================= +// +// NO SECURITY GUARANTEE -- DO NOT USE THIS ON UNTRUSTED FONT FILES +// +// This library does no range checking of the offsets found in the file, +// meaning an attacker can use it to read arbitrary memory. +// +// ======================================================================= // // This library processes TrueType files: // parse files @@ -37,11 +46,11 @@ // Daniel Ribeiro Maciel // // Bug/warning reports/fixes: -// "Zer" on mollyrocket Fabian "ryg" Giesen -// Cass Everitt Martins Mozeiko -// stoiko (Haemimont Games) Cap Petschulat -// Brian Hook Omar Cornut -// Walter van Niftrik github:aloucks +// "Zer" on mollyrocket Fabian "ryg" Giesen github:NiLuJe +// Cass Everitt Martins Mozeiko github:aloucks +// stoiko (Haemimont Games) Cap Petschulat github:oyvindjam +// Brian Hook Omar Cornut github:vassvik +// Walter van Niftrik Ryan Griege // David Gow Peter LaValle // David Given Sergey Popov // Ivan-Assen Ivanov Giumo X. Clanjor @@ -49,11 +58,17 @@ // Johan Duparc Thomas Fields // Hou Qiming Derek Vinyard // Rob Loach Cort Stratton -// Kenney Phillis Jr. github:oyvindjam -// Brian Costabile github:vassvik -// +// Kenney Phillis Jr. Brian Costabile +// Ken Voskuil (kaesve) +// // VERSION HISTORY // +// 1.26 (2021-08-28) fix broken rasterizer +// 1.25 (2021-07-11) many fixes +// 1.24 (2020-02-05) fix warning +// 1.23 (2020-02-02) query SVG data for glyphs; query whole kerning table (but only kern not GPOS) +// 1.22 (2019-08-11) minimize missing-glyph duplication; fix kerning if both 'GPOS' and 'kern' are defined +// 1.21 (2019-02-25) fix warning // 1.20 (2019-02-07) PackFontRange skips missing codepoints; GetScaleFontVMetrics() // 1.19 (2018-02-11) GPOS kerning, STBTT_fmod // 1.18 (2018-01-29) add missing function @@ -212,7 +227,7 @@ // // Advancing for the next character: // Call GlyphHMetrics, and compute 'current_point += SF * advance'. -// +// // // ADVANCED USAGE // @@ -248,19 +263,6 @@ // recommend it. // // -// SOURCE STATISTICS (based on v0.6c, 2050 LOC) -// -// Documentation & header file 520 LOC \___ 660 LOC documentation -// Sample code 140 LOC / -// Truetype parsing 620 LOC ---- 620 LOC TrueType -// Software rasterization 240 LOC \. -// Curve tessellation 120 LOC \__ 550 LOC Bitmap creation -// Bitmap management 100 LOC / -// Baked bitmap interface 70 LOC / -// Font name matching & access 150 LOC ---- 150 -// C runtime library abstraction 60 LOC ---- 60 -// -// // PERFORMANCE MEASUREMENTS FOR 1.06: // // 32-bit 64-bit @@ -275,8 +277,8 @@ //// SAMPLE PROGRAMS //// // -// Incomplete text-in-3d-api example, which draws quads properly aligned to be lossless -// +// Incomplete text-in-3d-api example, which draws quads properly aligned to be lossless. +// See "tests/truetype_demo_win32.c" for a complete version. #if 0 #define STB_TRUETYPE_IMPLEMENTATION // force following include to generate implementation #include "stb_truetype.h" @@ -302,6 +304,8 @@ void my_stbtt_initfont(void) void my_stbtt_print(float x, float y, char *text) { // assume orthographic projection with units = screen pixels, origin at top left + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glEnable(GL_TEXTURE_2D); glBindTexture(GL_TEXTURE_2D, ftex); glBegin(GL_QUADS); @@ -309,10 +313,10 @@ void my_stbtt_print(float x, float y, char *text) if (*text >= 32 && *text < 128) { stbtt_aligned_quad q; stbtt_GetBakedQuad(cdata, 512,512, *text-32, &x,&y,&q,1);//1=opengl & d3d10+,0=d3d9 - glTexCoord2f(q.s0,q.t1); glVertex2f(q.x0,q.y0); - glTexCoord2f(q.s1,q.t1); glVertex2f(q.x1,q.y0); - glTexCoord2f(q.s1,q.t0); glVertex2f(q.x1,q.y1); - glTexCoord2f(q.s0,q.t0); glVertex2f(q.x0,q.y1); + glTexCoord2f(q.s0,q.t0); glVertex2f(q.x0,q.y0); + glTexCoord2f(q.s1,q.t0); glVertex2f(q.x1,q.y0); + glTexCoord2f(q.s1,q.t1); glVertex2f(q.x1,q.y1); + glTexCoord2f(q.s0,q.t1); glVertex2f(q.x0,q.y1); } ++text; } @@ -350,7 +354,7 @@ int main(int argc, char **argv) } return 0; } -#endif +#endif // // Output: // @@ -364,9 +368,9 @@ int main(int argc, char **argv) // :@@. M@M // @@@o@@@@ // :M@@V:@@. -// +// ////////////////////////////////////////////////////////////////////////////// -// +// // Complete program: print "Hello World!" banner, with bugs // #if 0 @@ -652,7 +656,7 @@ STBTT_DEF void stbtt_PackSetOversampling(stbtt_pack_context *spc, unsigned int h STBTT_DEF void stbtt_PackSetSkipMissingCodepoints(stbtt_pack_context *spc, int skip); // If skip != 0, this tells stb_truetype to skip any codepoints for which // there is no corresponding glyph. If skip=0, which is the default, then -// codepoints without a glyph recived the font's "missing character" glyph, +// codepoints without a glyph received the font's "missing character" glyph, // typically an empty box by convention. STBTT_DEF void stbtt_GetPackedQuad(const stbtt_packedchar *chardata, int pw, int ph, // same data as above @@ -667,7 +671,7 @@ STBTT_DEF int stbtt_PackFontRangesRenderIntoRects(stbtt_pack_context *spc, cons // Calling these functions in sequence is roughly equivalent to calling // stbtt_PackFontRanges(). If you more control over the packing of multiple // fonts, or if you want to pack custom data into a font texture, take a look -// at the source to of stbtt_PackFontRanges() and create a custom version +// at the source to of stbtt_PackFontRanges() and create a custom version // using these functions, e.g. call GatherRects multiple times, // building up a single array of rects, then call PackRects once, // then call RenderIntoRects repeatedly. This may result in a @@ -719,7 +723,7 @@ struct stbtt_fontinfo int numGlyphs; // number of glyphs, needed for range checking - int loca,head,glyf,hhea,hmtx,kern,gpos; // table locations as offset from start of .ttf + int loca,head,glyf,hhea,hmtx,kern,gpos,svg; // table locations as offset from start of .ttf int index_map; // a cmap mapping for our chosen character encoding int indexToLocFormat; // format needed to map from glyph index to glyph @@ -802,6 +806,18 @@ STBTT_DEF int stbtt_GetGlyphKernAdvance(const stbtt_fontinfo *info, int glyph1, STBTT_DEF int stbtt_GetGlyphBox(const stbtt_fontinfo *info, int glyph_index, int *x0, int *y0, int *x1, int *y1); // as above, but takes one or more glyph indices for greater efficiency +typedef struct stbtt_kerningentry +{ + int glyph1; // use stbtt_FindGlyphIndex + int glyph2; + int advance; +} stbtt_kerningentry; + +STBTT_DEF int stbtt_GetKerningTableLength(const stbtt_fontinfo *info); +STBTT_DEF int stbtt_GetKerningTable(const stbtt_fontinfo *info, stbtt_kerningentry* table, int table_length); +// Retrieves a complete list of all of the kerning pairs provided by the font +// stbtt_GetKerningTable never writes more than table_length entries and returns how many entries it did write. +// The table will be sorted by (a.glyph1 == b.glyph1)?(a.glyph2 < b.glyph2):(a.glyph1 < b.glyph1) ////////////////////////////////////////////////////////////////////////////// // @@ -846,6 +862,12 @@ STBTT_DEF int stbtt_GetGlyphShape(const stbtt_fontinfo *info, int glyph_index, s STBTT_DEF void stbtt_FreeShape(const stbtt_fontinfo *info, stbtt_vertex *vertices); // frees the data allocated above +STBTT_DEF unsigned char *stbtt_FindSVGDoc(const stbtt_fontinfo *info, int gl); +STBTT_DEF int stbtt_GetCodepointSVG(const stbtt_fontinfo *info, int unicode_codepoint, const char **svg); +STBTT_DEF int stbtt_GetGlyphSVG(const stbtt_fontinfo *info, int gl, const char **svg); +// fills svg with the character's SVG data. +// returns data size or 0 if SVG not found. + ////////////////////////////////////////////////////////////////////////////// // // BITMAP RENDERING @@ -975,7 +997,7 @@ STBTT_DEF unsigned char * stbtt_GetCodepointSDF(const stbtt_fontinfo *info, floa // and computing from that can allow drop-out prevention). // // The algorithm has not been optimized at all, so expect it to be slow -// if computing lots of characters or very large sizes. +// if computing lots of characters or very large sizes. @@ -1347,6 +1369,22 @@ static stbtt__buf stbtt__get_subrs(stbtt__buf cff, stbtt__buf fontdict) return stbtt__cff_get_index(&cff); } +// since most people won't use this, find this table the first time it's needed +static int stbtt__get_svg(stbtt_fontinfo *info) +{ + stbtt_uint32 t; + if (info->svg < 0) { + t = stbtt__find_table(info->data, info->fontstart, "SVG "); + if (t) { + stbtt_uint32 offset = ttULONG(info->data + t + 2); + info->svg = t + offset; + } else { + info->svg = 0; + } + } + return info->svg; +} + static int stbtt_InitFont_internal(stbtt_fontinfo *info, unsigned char *data, int fontstart) { stbtt_uint32 cmap, t; @@ -1426,6 +1464,8 @@ static int stbtt_InitFont_internal(stbtt_fontinfo *info, unsigned char *data, in else info->numGlyphs = 0xffff; + info->svg = -1; + // find a cmap encoding table we understand *now* to avoid searching // later. (todo: could make this installable) // the same regardless of glyph. @@ -1509,12 +1549,12 @@ STBTT_DEF int stbtt_FindGlyphIndex(const stbtt_fontinfo *info, int unicode_codep search += 2; { - stbtt_uint16 offset, start; + stbtt_uint16 offset, start, last; stbtt_uint16 item = (stbtt_uint16) ((search - endCount) >> 1); - STBTT_assert(unicode_codepoint <= ttUSHORT(data + endCount + 2*item)); start = ttUSHORT(data + index_map + 14 + segcount*2 + 2 + 2*item); - if (unicode_codepoint < start) + last = ttUSHORT(data + endCount + 2*item); + if (unicode_codepoint < start || unicode_codepoint > last) return 0; offset = ttUSHORT(data + index_map + 14 + segcount*6 + 2 + 2*item); @@ -1732,7 +1772,7 @@ static int stbtt__GetGlyphShapeTT(const stbtt_fontinfo *info, int glyph_index, s if (i != 0) num_vertices = stbtt__close_shape(vertices, num_vertices, was_off, start_off, sx,sy,scx,scy,cx,cy); - // now start the new one + // now start the new one start_off = !(flags & 1); if (start_off) { // if we start off with an off-curve point, then when we need to find a point on the curve @@ -1774,7 +1814,7 @@ static int stbtt__GetGlyphShapeTT(const stbtt_fontinfo *info, int glyph_index, s } } num_vertices = stbtt__close_shape(vertices, num_vertices, was_off, start_off, sx,sy,scx,scy,cx,cy); - } else if (numberOfContours == -1) { + } else if (numberOfContours < 0) { // Compound shapes. int more = 1; stbtt_uint8 *comp = data + g + 10; @@ -1785,7 +1825,7 @@ static int stbtt__GetGlyphShapeTT(const stbtt_fontinfo *info, int glyph_index, s int comp_num_verts = 0, i; stbtt_vertex *comp_verts = 0, *tmp = 0; float mtx[6] = {1,0,0,1,0,0}, m, n; - + flags = ttSHORT(comp); comp+=2; gidx = ttSHORT(comp); comp+=2; @@ -1815,7 +1855,7 @@ static int stbtt__GetGlyphShapeTT(const stbtt_fontinfo *info, int glyph_index, s mtx[2] = ttSHORT(comp)/16384.0f; comp+=2; mtx[3] = ttSHORT(comp)/16384.0f; comp+=2; } - + // Find transformation scales. m = (float) STBTT_sqrt(mtx[0]*mtx[0] + mtx[1]*mtx[1]); n = (float) STBTT_sqrt(mtx[2]*mtx[2] + mtx[3]*mtx[3]); @@ -1841,7 +1881,7 @@ static int stbtt__GetGlyphShapeTT(const stbtt_fontinfo *info, int glyph_index, s if (comp_verts) STBTT_free(comp_verts, info->userdata); return 0; } - if (num_vertices > 0) STBTT_memcpy(tmp, vertices, num_vertices*sizeof(stbtt_vertex)); //-V595 + if (num_vertices > 0 && vertices) STBTT_memcpy(tmp, vertices, num_vertices*sizeof(stbtt_vertex)); STBTT_memcpy(tmp+num_vertices, comp_verts, comp_num_verts*sizeof(stbtt_vertex)); if (vertices) STBTT_free(vertices, info->userdata); vertices = tmp; @@ -1851,9 +1891,6 @@ static int stbtt__GetGlyphShapeTT(const stbtt_fontinfo *info, int glyph_index, s // More components ? more = flags & (1<<5); } - } else if (numberOfContours < 0) { - // @TODO other compound variations? - STBTT_assert(0); } else { // numberOfCounters == 0, do nothing } @@ -1971,7 +2008,7 @@ static stbtt__buf stbtt__cid_get_glyph_subrs(const stbtt_fontinfo *info, int gly start = end; } } - if (fdselector == -1) stbtt__new_buf(NULL, 0); + if (fdselector == -1) return stbtt__new_buf(NULL, 0); // [DEAR IMGUI] fixed, see #6007 and nothings/stb#1422 return stbtt__get_subrs(info->cff, stbtt__cff_index_get(info->fontdicts, fdselector)); } @@ -2107,7 +2144,7 @@ static int stbtt__run_charstring(const stbtt_fontinfo *info, int glyph_index, st subrs = stbtt__cid_get_glyph_subrs(info, glyph_index); has_subrs = 1; } - // fallthrough + // FALLTHROUGH case 0x1D: // callgsubr if (sp < 1) return STBTT__CSERR("call(g|)subr stack"); v = (int) s[--sp]; @@ -2212,7 +2249,7 @@ static int stbtt__run_charstring(const stbtt_fontinfo *info, int glyph_index, st } break; default: - if (b0 != 255 && b0 != 28 && (b0 < 32 || b0 > 254)) //-V560 + if (b0 != 255 && b0 != 28 && b0 < 32) return STBTT__CSERR("reserved operator"); // push immediate @@ -2282,7 +2319,49 @@ STBTT_DEF void stbtt_GetGlyphHMetrics(const stbtt_fontinfo *info, int glyph_inde } } -static int stbtt__GetGlyphKernInfoAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2) +STBTT_DEF int stbtt_GetKerningTableLength(const stbtt_fontinfo *info) +{ + stbtt_uint8 *data = info->data + info->kern; + + // we only look at the first table. it must be 'horizontal' and format 0. + if (!info->kern) + return 0; + if (ttUSHORT(data+2) < 1) // number of tables, need at least 1 + return 0; + if (ttUSHORT(data+8) != 1) // horizontal flag must be set in format + return 0; + + return ttUSHORT(data+10); +} + +STBTT_DEF int stbtt_GetKerningTable(const stbtt_fontinfo *info, stbtt_kerningentry* table, int table_length) +{ + stbtt_uint8 *data = info->data + info->kern; + int k, length; + + // we only look at the first table. it must be 'horizontal' and format 0. + if (!info->kern) + return 0; + if (ttUSHORT(data+2) < 1) // number of tables, need at least 1 + return 0; + if (ttUSHORT(data+8) != 1) // horizontal flag must be set in format + return 0; + + length = ttUSHORT(data+10); + if (table_length < length) + length = table_length; + + for (k = 0; k < length; k++) + { + table[k].glyph1 = ttUSHORT(data+18+(k*6)); + table[k].glyph2 = ttUSHORT(data+20+(k*6)); + table[k].advance = ttSHORT(data+22+(k*6)); + } + + return length; +} + +static int stbtt__GetGlyphKernInfoAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2) { stbtt_uint8 *data = info->data + info->kern; stbtt_uint32 needle, straw; @@ -2312,245 +2391,225 @@ static int stbtt__GetGlyphKernInfoAdvance(const stbtt_fontinfo *info, int glyph return 0; } -static stbtt_int32 stbtt__GetCoverageIndex(stbtt_uint8 *coverageTable, int glyph) +static stbtt_int32 stbtt__GetCoverageIndex(stbtt_uint8 *coverageTable, int glyph) { - stbtt_uint16 coverageFormat = ttUSHORT(coverageTable); - switch(coverageFormat) { - case 1: { - stbtt_uint16 glyphCount = ttUSHORT(coverageTable + 2); + stbtt_uint16 coverageFormat = ttUSHORT(coverageTable); + switch (coverageFormat) { + case 1: { + stbtt_uint16 glyphCount = ttUSHORT(coverageTable + 2); - // Binary search. - stbtt_int32 l=0, r=glyphCount-1, m; - int straw, needle=glyph; - while (l <= r) { - stbtt_uint8 *glyphArray = coverageTable + 4; - stbtt_uint16 glyphID; - m = (l + r) >> 1; - glyphID = ttUSHORT(glyphArray + 2 * m); - straw = glyphID; - if (needle < straw) - r = m - 1; - else if (needle > straw) - l = m + 1; - else { - return m; - } + // Binary search. + stbtt_int32 l=0, r=glyphCount-1, m; + int straw, needle=glyph; + while (l <= r) { + stbtt_uint8 *glyphArray = coverageTable + 4; + stbtt_uint16 glyphID; + m = (l + r) >> 1; + glyphID = ttUSHORT(glyphArray + 2 * m); + straw = glyphID; + if (needle < straw) + r = m - 1; + else if (needle > straw) + l = m + 1; + else { + return m; } - } break; + } + break; + } - case 2: { - stbtt_uint16 rangeCount = ttUSHORT(coverageTable + 2); - stbtt_uint8 *rangeArray = coverageTable + 4; + case 2: { + stbtt_uint16 rangeCount = ttUSHORT(coverageTable + 2); + stbtt_uint8 *rangeArray = coverageTable + 4; - // Binary search. - stbtt_int32 l=0, r=rangeCount-1, m; - int strawStart, strawEnd, needle=glyph; - while (l <= r) { - stbtt_uint8 *rangeRecord; - m = (l + r) >> 1; - rangeRecord = rangeArray + 6 * m; - strawStart = ttUSHORT(rangeRecord); - strawEnd = ttUSHORT(rangeRecord + 2); - if (needle < strawStart) - r = m - 1; - else if (needle > strawEnd) - l = m + 1; - else { - stbtt_uint16 startCoverageIndex = ttUSHORT(rangeRecord + 4); - return startCoverageIndex + glyph - strawStart; - } + // Binary search. + stbtt_int32 l=0, r=rangeCount-1, m; + int strawStart, strawEnd, needle=glyph; + while (l <= r) { + stbtt_uint8 *rangeRecord; + m = (l + r) >> 1; + rangeRecord = rangeArray + 6 * m; + strawStart = ttUSHORT(rangeRecord); + strawEnd = ttUSHORT(rangeRecord + 2); + if (needle < strawStart) + r = m - 1; + else if (needle > strawEnd) + l = m + 1; + else { + stbtt_uint16 startCoverageIndex = ttUSHORT(rangeRecord + 4); + return startCoverageIndex + glyph - strawStart; } - } break; + } + break; + } - default: { - // There are no other cases. - STBTT_assert(0); - } break; - } + default: return -1; // unsupported + } - return -1; + return -1; } static stbtt_int32 stbtt__GetGlyphClass(stbtt_uint8 *classDefTable, int glyph) { - stbtt_uint16 classDefFormat = ttUSHORT(classDefTable); - switch(classDefFormat) - { - case 1: { - stbtt_uint16 startGlyphID = ttUSHORT(classDefTable + 2); - stbtt_uint16 glyphCount = ttUSHORT(classDefTable + 4); - stbtt_uint8 *classDef1ValueArray = classDefTable + 6; + stbtt_uint16 classDefFormat = ttUSHORT(classDefTable); + switch (classDefFormat) + { + case 1: { + stbtt_uint16 startGlyphID = ttUSHORT(classDefTable + 2); + stbtt_uint16 glyphCount = ttUSHORT(classDefTable + 4); + stbtt_uint8 *classDef1ValueArray = classDefTable + 6; - if (glyph >= startGlyphID && glyph < startGlyphID + glyphCount) - return (stbtt_int32)ttUSHORT(classDef1ValueArray + 2 * (glyph - startGlyphID)); + if (glyph >= startGlyphID && glyph < startGlyphID + glyphCount) + return (stbtt_int32)ttUSHORT(classDef1ValueArray + 2 * (glyph - startGlyphID)); + break; + } - // [DEAR IMGUI] Commented to fix static analyzer warning - //classDefTable = classDef1ValueArray + 2 * glyphCount; - } break; + case 2: { + stbtt_uint16 classRangeCount = ttUSHORT(classDefTable + 2); + stbtt_uint8 *classRangeRecords = classDefTable + 4; - case 2: { - stbtt_uint16 classRangeCount = ttUSHORT(classDefTable + 2); - stbtt_uint8 *classRangeRecords = classDefTable + 4; + // Binary search. + stbtt_int32 l=0, r=classRangeCount-1, m; + int strawStart, strawEnd, needle=glyph; + while (l <= r) { + stbtt_uint8 *classRangeRecord; + m = (l + r) >> 1; + classRangeRecord = classRangeRecords + 6 * m; + strawStart = ttUSHORT(classRangeRecord); + strawEnd = ttUSHORT(classRangeRecord + 2); + if (needle < strawStart) + r = m - 1; + else if (needle > strawEnd) + l = m + 1; + else + return (stbtt_int32)ttUSHORT(classRangeRecord + 4); + } + break; + } - // Binary search. - stbtt_int32 l=0, r=classRangeCount-1, m; - int strawStart, strawEnd, needle=glyph; - while (l <= r) { - stbtt_uint8 *classRangeRecord; - m = (l + r) >> 1; - classRangeRecord = classRangeRecords + 6 * m; - strawStart = ttUSHORT(classRangeRecord); - strawEnd = ttUSHORT(classRangeRecord + 2); - if (needle < strawStart) - r = m - 1; - else if (needle > strawEnd) - l = m + 1; - else - return (stbtt_int32)ttUSHORT(classRangeRecord + 4); - } + default: + return -1; // Unsupported definition type, return an error. + } - // [DEAR IMGUI] Commented to fix static analyzer warning - //classDefTable = classRangeRecords + 6 * classRangeCount; - } break; - - default: { - // There are no other cases. - STBTT_assert(0); - } break; - } - - return -1; + // "All glyphs not assigned to a class fall into class 0". (OpenType spec) + return 0; } // Define to STBTT_assert(x) if you want to break on unimplemented formats. #define STBTT_GPOS_TODO_assert(x) -static stbtt_int32 stbtt__GetGlyphGPOSInfoAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2) +static stbtt_int32 stbtt__GetGlyphGPOSInfoAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2) { - stbtt_uint16 lookupListOffset; - stbtt_uint8 *lookupList; - stbtt_uint16 lookupCount; - stbtt_uint8 *data; - stbtt_int32 i; + stbtt_uint16 lookupListOffset; + stbtt_uint8 *lookupList; + stbtt_uint16 lookupCount; + stbtt_uint8 *data; + stbtt_int32 i, sti; - if (!info->gpos) return 0; + if (!info->gpos) return 0; - data = info->data + info->gpos; + data = info->data + info->gpos; - if (ttUSHORT(data+0) != 1) return 0; // Major version 1 - if (ttUSHORT(data+2) != 0) return 0; // Minor version 0 + if (ttUSHORT(data+0) != 1) return 0; // Major version 1 + if (ttUSHORT(data+2) != 0) return 0; // Minor version 0 - lookupListOffset = ttUSHORT(data+8); - lookupList = data + lookupListOffset; - lookupCount = ttUSHORT(lookupList); + lookupListOffset = ttUSHORT(data+8); + lookupList = data + lookupListOffset; + lookupCount = ttUSHORT(lookupList); - for (i=0; i= pairSetCount) return 0; - // Binary search. - while (l <= r) { - stbtt_uint16 secondGlyph; - stbtt_uint8 *pairValue; - m = (l + r) >> 1; - pairValue = pairValueArray + (2 + valueRecordPairSizeInBytes) * m; - secondGlyph = ttUSHORT(pairValue); - straw = secondGlyph; - if (needle < straw) - r = m - 1; - else if (needle > straw) - l = m + 1; - else { - stbtt_int16 xAdvance = ttSHORT(pairValue + 2); - return xAdvance; - } - } - } break; + needle=glyph2; + r=pairValueCount-1; + l=0; - case 2: { - stbtt_uint16 valueFormat1 = ttUSHORT(table + 4); - stbtt_uint16 valueFormat2 = ttUSHORT(table + 6); + // Binary search. + while (l <= r) { + stbtt_uint16 secondGlyph; + stbtt_uint8 *pairValue; + m = (l + r) >> 1; + pairValue = pairValueArray + (2 + valueRecordPairSizeInBytes) * m; + secondGlyph = ttUSHORT(pairValue); + straw = secondGlyph; + if (needle < straw) + r = m - 1; + else if (needle > straw) + l = m + 1; + else { + stbtt_int16 xAdvance = ttSHORT(pairValue + 2); + return xAdvance; + } + } + } else + return 0; + break; + } - stbtt_uint16 classDef1Offset = ttUSHORT(table + 8); - stbtt_uint16 classDef2Offset = ttUSHORT(table + 10); - int glyph1class = stbtt__GetGlyphClass(table + classDef1Offset, glyph1); - int glyph2class = stbtt__GetGlyphClass(table + classDef2Offset, glyph2); + case 2: { + stbtt_uint16 valueFormat1 = ttUSHORT(table + 4); + stbtt_uint16 valueFormat2 = ttUSHORT(table + 6); + if (valueFormat1 == 4 && valueFormat2 == 0) { // Support more formats? + stbtt_uint16 classDef1Offset = ttUSHORT(table + 8); + stbtt_uint16 classDef2Offset = ttUSHORT(table + 10); + int glyph1class = stbtt__GetGlyphClass(table + classDef1Offset, glyph1); + int glyph2class = stbtt__GetGlyphClass(table + classDef2Offset, glyph2); - stbtt_uint16 class1Count = ttUSHORT(table + 12); - stbtt_uint16 class2Count = ttUSHORT(table + 14); - STBTT_assert(glyph1class < class1Count); - STBTT_assert(glyph2class < class2Count); + stbtt_uint16 class1Count = ttUSHORT(table + 12); + stbtt_uint16 class2Count = ttUSHORT(table + 14); + stbtt_uint8 *class1Records, *class2Records; + stbtt_int16 xAdvance; - // TODO: Support more formats. - STBTT_GPOS_TODO_assert(valueFormat1 == 4); - if (valueFormat1 != 4) return 0; - STBTT_GPOS_TODO_assert(valueFormat2 == 0); - if (valueFormat2 != 0) return 0; + if (glyph1class < 0 || glyph1class >= class1Count) return 0; // malformed + if (glyph2class < 0 || glyph2class >= class2Count) return 0; // malformed - if (glyph1class >= 0 && glyph1class < class1Count && glyph2class >= 0 && glyph2class < class2Count) { - stbtt_uint8 *class1Records = table + 16; - stbtt_uint8 *class2Records = class1Records + 2 * (glyph1class * class2Count); - stbtt_int16 xAdvance = ttSHORT(class2Records + 2 * glyph2class); - return xAdvance; - } - } break; - - default: { - // There are no other cases. - STBTT_assert(0); - break; - }; - } - } - break; - }; + class1Records = table + 16; + class2Records = class1Records + 2 * (glyph1class * class2Count); + xAdvance = ttSHORT(class2Records + 2 * glyph2class); + return xAdvance; + } else + return 0; + break; + } default: - // TODO: Implement other stuff. - break; - } - } + return 0; // Unsupported position format + } + } + } - return 0; + return 0; } STBTT_DEF int stbtt_GetGlyphKernAdvance(const stbtt_fontinfo *info, int g1, int g2) @@ -2559,8 +2618,7 @@ STBTT_DEF int stbtt_GetGlyphKernAdvance(const stbtt_fontinfo *info, int g1, int if (info->gpos) xAdvance += stbtt__GetGlyphGPOSInfoAdvance(info, g1, g2); - - if (info->kern) + else if (info->kern) xAdvance += stbtt__GetGlyphKernInfoAdvance(info, g1, g2); return xAdvance; @@ -2621,6 +2679,45 @@ STBTT_DEF void stbtt_FreeShape(const stbtt_fontinfo *info, stbtt_vertex *v) STBTT_free(v, info->userdata); } +STBTT_DEF stbtt_uint8 *stbtt_FindSVGDoc(const stbtt_fontinfo *info, int gl) +{ + int i; + stbtt_uint8 *data = info->data; + stbtt_uint8 *svg_doc_list = data + stbtt__get_svg((stbtt_fontinfo *) info); + + int numEntries = ttUSHORT(svg_doc_list); + stbtt_uint8 *svg_docs = svg_doc_list + 2; + + for(i=0; i= ttUSHORT(svg_doc)) && (gl <= ttUSHORT(svg_doc + 2))) + return svg_doc; + } + return 0; +} + +STBTT_DEF int stbtt_GetGlyphSVG(const stbtt_fontinfo *info, int gl, const char **svg) +{ + stbtt_uint8 *data = info->data; + stbtt_uint8 *svg_doc; + + if (info->svg == 0) + return 0; + + svg_doc = stbtt_FindSVGDoc(info, gl); + if (svg_doc != NULL) { + *svg = (char *) data + info->svg + ttULONG(svg_doc + 4); + return ttULONG(svg_doc + 8); + } else { + return 0; + } +} + +STBTT_DEF int stbtt_GetCodepointSVG(const stbtt_fontinfo *info, int unicode_codepoint, const char **svg) +{ + return stbtt_GetGlyphSVG(info, stbtt_FindGlyphIndex(info, unicode_codepoint), svg); +} + ////////////////////////////////////////////////////////////////////////////// // // antialiasing software rasterizer @@ -2746,7 +2843,7 @@ static stbtt__active_edge *stbtt__new_active(stbtt__hheap *hh, stbtt__edge *e, i float dxdy = (e->x1 - e->x0) / (e->y1 - e->y0); STBTT_assert(z != NULL); if (!z) return z; - + // round dx down to avoid overshooting if (dxdy < 0) z->dx = -STBTT_ifloor(STBTT_FIX * -dxdy); @@ -2824,7 +2921,7 @@ static void stbtt__fill_active_edges(unsigned char *scanline, int len, stbtt__ac } } } - + e = e->next; } } @@ -2970,6 +3067,23 @@ static void stbtt__handle_clipped_edge(float *scanline, int x, stbtt__active_edg } } +static float stbtt__sized_trapezoid_area(float height, float top_width, float bottom_width) +{ + STBTT_assert(top_width >= 0); + STBTT_assert(bottom_width >= 0); + return (top_width + bottom_width) / 2.0f * height; +} + +static float stbtt__position_trapezoid_area(float height, float tx0, float tx1, float bx0, float bx1) +{ + return stbtt__sized_trapezoid_area(height, tx1 - tx0, bx1 - bx0); +} + +static float stbtt__sized_triangle_area(float height, float width) +{ + return height * width / 2; +} + static void stbtt__fill_active_edges_new(float *scanline, float *scanline_fill, int len, stbtt__active_edge *e, float y_top) { float y_bottom = y_top+1; @@ -3024,13 +3138,13 @@ static void stbtt__fill_active_edges_new(float *scanline, float *scanline_fill, float height; // simple case, only spans one pixel int x = (int) x_top; - height = sy1 - sy0; + height = (sy1 - sy0) * e->direction; STBTT_assert(x >= 0 && x < len); - scanline[x] += e->direction * (1-((x_top - x) + (x_bottom-x))/2) * height; - scanline_fill[x] += e->direction * height; // everything right of this pixel is filled + scanline[x] += stbtt__position_trapezoid_area(height, x_top, x+1.0f, x_bottom, x+1.0f); + scanline_fill[x] += height; // everything right of this pixel is filled } else { int x,x1,x2; - float y_crossing, step, sign, area; + float y_crossing, y_final, step, sign, area; // covers 2+ pixels if (x_top > x_bottom) { // flip scanline vertically; signed area is the same @@ -3042,32 +3156,83 @@ static void stbtt__fill_active_edges_new(float *scanline, float *scanline_fill, dx = -dx; dy = -dy; t = x0, x0 = xb, xb = t; - // [DEAR IMGUI] Fix static analyzer warning - (void)dx; // [ImGui: fix static analyzer warning] } + STBTT_assert(dy >= 0); + STBTT_assert(dx >= 0); x1 = (int) x_top; x2 = (int) x_bottom; // compute intersection with y axis at x1+1 - y_crossing = (x1+1 - x0) * dy + y_top; + y_crossing = y_top + dy * (x1+1 - x0); + + // compute intersection with y axis at x2 + y_final = y_top + dy * (x2 - x0); + + // x1 x_top x2 x_bottom + // y_top +------|-----+------------+------------+--------|---+------------+ + // | | | | | | + // | | | | | | + // sy0 | Txxxxx|............|............|............|............| + // y_crossing | *xxxxx.......|............|............|............| + // | | xxxxx..|............|............|............| + // | | /- xx*xxxx........|............|............| + // | | dy < | xxxxxx..|............|............| + // y_final | | \- | xx*xxx.........|............| + // sy1 | | | | xxxxxB...|............| + // | | | | | | + // | | | | | | + // y_bottom +------------+------------+------------+------------+------------+ + // + // goal is to measure the area covered by '.' in each pixel + + // if x2 is right at the right edge of x1, y_crossing can blow up, github #1057 + // @TODO: maybe test against sy1 rather than y_bottom? + if (y_crossing > y_bottom) + y_crossing = y_bottom; sign = e->direction; - // area of the rectangle covered from y0..y_crossing - area = sign * (y_crossing-sy0); - // area of the triangle (x_top,y0), (x+1,y0), (x+1,y_crossing) - scanline[x1] += area * (1-((x_top - x1)+(x1+1-x1))/2); - step = sign * dy; + // area of the rectangle covered from sy0..y_crossing + area = sign * (y_crossing-sy0); + + // area of the triangle (x_top,sy0), (x1+1,sy0), (x1+1,y_crossing) + scanline[x1] += stbtt__sized_triangle_area(area, x1+1 - x_top); + + // check if final y_crossing is blown up; no test case for this + if (y_final > y_bottom) { + int denom = (x2 - (x1+1)); + y_final = y_bottom; + if (denom != 0) { // [DEAR IMGUI] Avoid div by zero (https://github.com/nothings/stb/issues/1316) + dy = (y_final - y_crossing ) / denom; // if denom=0, y_final = y_crossing, so y_final <= y_bottom + } + } + + // in second pixel, area covered by line segment found in first pixel + // is always a rectangle 1 wide * the height of that line segment; this + // is exactly what the variable 'area' stores. it also gets a contribution + // from the line segment within it. the THIRD pixel will get the first + // pixel's rectangle contribution, the second pixel's rectangle contribution, + // and its own contribution. the 'own contribution' is the same in every pixel except + // the leftmost and rightmost, a trapezoid that slides down in each pixel. + // the second pixel's contribution to the third pixel will be the + // rectangle 1 wide times the height change in the second pixel, which is dy. + + step = sign * dy * 1; // dy is dy/dx, change in y for every 1 change in x, + // which multiplied by 1-pixel-width is how much pixel area changes for each step in x + // so the area advances by 'step' every time + for (x = x1+1; x < x2; ++x) { - scanline[x] += area + step/2; + scanline[x] += area + step/2; // area of trapezoid is 1*step/2 area += step; } - y_crossing += dy * (x2 - (x1+1)); + STBTT_assert(STBTT_fabs(area) <= 1.01f); // accumulated error from area += step unless we round step down + STBTT_assert(sy1 > y_final-0.01f); - STBTT_assert(STBTT_fabs(area) <= 1.01f); - - scanline[x2] += area + sign * (1-((x2-x2)+(x_bottom-x2))/2) * (sy1-y_crossing); + // area covered in the last pixel is the rectangle from all the pixels to the left, + // plus the trapezoid filled by the line segment in this pixel all the way to the right edge + scanline[x2] += area + sign * stbtt__position_trapezoid_area(sy1-y_final, (float) x2, x2+1.0f, x_bottom, x2+1.0f); + // the rest of the line is filled based on the total height of the line segment in this pixel scanline_fill[x2] += sign * (sy1-sy0); } } else { @@ -3075,6 +3240,9 @@ static void stbtt__fill_active_edges_new(float *scanline, float *scanline_fill, // clipping logic. since this does not match the intended use // of this library, we use a different, very slow brute // force implementation + // note though that this does happen some of the time because + // x_top and x_bottom can be extrapolated at the top & bottom of + // the shape and actually lie outside the bounding box int x; for (x=0; x < len; ++x) { // cases: @@ -3554,7 +3722,7 @@ STBTT_DEF unsigned char *stbtt_GetGlyphBitmapSubpixel(const stbtt_fontinfo *info { int ix0,iy0,ix1,iy1; stbtt__bitmap gbm; - stbtt_vertex *vertices; + stbtt_vertex *vertices; int num_verts = stbtt_GetGlyphShape(info, glyph, &vertices); if (scale_x == 0) scale_x = scale_y; @@ -3577,7 +3745,7 @@ STBTT_DEF unsigned char *stbtt_GetGlyphBitmapSubpixel(const stbtt_fontinfo *info if (height) *height = gbm.h; if (xoff ) *xoff = ix0; if (yoff ) *yoff = iy0; - + if (gbm.w && gbm.h) { gbm.pixels = (unsigned char *) STBTT_malloc(gbm.w * gbm.h, info->userdata); if (gbm.pixels) { @@ -3588,7 +3756,7 @@ STBTT_DEF unsigned char *stbtt_GetGlyphBitmapSubpixel(const stbtt_fontinfo *info } STBTT_free(vertices, info->userdata); return gbm.pixels; -} +} STBTT_DEF unsigned char *stbtt_GetGlyphBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int glyph, int *width, int *height, int *xoff, int *yoff) { @@ -3600,7 +3768,7 @@ STBTT_DEF void stbtt_MakeGlyphBitmapSubpixel(const stbtt_fontinfo *info, unsigne int ix0,iy0; stbtt_vertex *vertices; int num_verts = stbtt_GetGlyphShape(info, glyph, &vertices); - stbtt__bitmap gbm; + stbtt__bitmap gbm; stbtt_GetGlyphBitmapBoxSubpixel(info, glyph, scale_x, scale_y, shift_x, shift_y, &ix0,&iy0,0,0); gbm.pixels = output; @@ -3622,7 +3790,7 @@ STBTT_DEF void stbtt_MakeGlyphBitmap(const stbtt_fontinfo *info, unsigned char * STBTT_DEF unsigned char *stbtt_GetCodepointBitmapSubpixel(const stbtt_fontinfo *info, float scale_x, float scale_y, float shift_x, float shift_y, int codepoint, int *width, int *height, int *xoff, int *yoff) { return stbtt_GetGlyphBitmapSubpixel(info, scale_x, scale_y,shift_x,shift_y, stbtt_FindGlyphIndex(info,codepoint), width,height,xoff,yoff); -} +} STBTT_DEF void stbtt_MakeCodepointBitmapSubpixelPrefilter(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int oversample_x, int oversample_y, float *sub_x, float *sub_y, int codepoint) { @@ -3637,7 +3805,7 @@ STBTT_DEF void stbtt_MakeCodepointBitmapSubpixel(const stbtt_fontinfo *info, uns STBTT_DEF unsigned char *stbtt_GetCodepointBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int codepoint, int *width, int *height, int *xoff, int *yoff) { return stbtt_GetCodepointBitmapSubpixel(info, scale_x, scale_y, 0.0f,0.0f, codepoint, width,height,xoff,yoff); -} +} STBTT_DEF void stbtt_MakeCodepointBitmap(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, int codepoint) { @@ -3762,7 +3930,7 @@ static void stbrp_init_target(stbrp_context *con, int pw, int ph, stbrp_node *no con->y = 0; con->bottom_y = 0; STBTT__NOTUSED(nodes); - STBTT__NOTUSED(num_nodes); + STBTT__NOTUSED(num_nodes); } static void stbrp_pack_rects(stbrp_context *con, stbrp_rect *rects, int num_rects) @@ -3989,6 +4157,7 @@ static float stbtt__oversample_shift(int oversample) STBTT_DEF int stbtt_PackFontRangesGatherRects(stbtt_pack_context *spc, const stbtt_fontinfo *info, stbtt_pack_range *ranges, int num_ranges, stbrp_rect *rects) { int i,j,k; + int missing_glyph_added = 0; k=0; for (i=0; i < num_ranges; ++i) { @@ -4000,7 +4169,7 @@ STBTT_DEF int stbtt_PackFontRangesGatherRects(stbtt_pack_context *spc, const stb int x0,y0,x1,y1; int codepoint = ranges[i].array_of_unicode_codepoints == NULL ? ranges[i].first_unicode_codepoint_in_range + j : ranges[i].array_of_unicode_codepoints[j]; int glyph = stbtt_FindGlyphIndex(info, codepoint); - if (glyph == 0 && spc->skip_missing) { + if (glyph == 0 && (spc->skip_missing || missing_glyph_added)) { rects[k].w = rects[k].h = 0; } else { stbtt_GetGlyphBitmapBoxSubpixel(info,glyph, @@ -4010,6 +4179,8 @@ STBTT_DEF int stbtt_PackFontRangesGatherRects(stbtt_pack_context *spc, const stb &x0,&y0,&x1,&y1); rects[k].w = (stbrp_coord) (x1-x0 + spc->padding + spc->h_oversample-1); rects[k].h = (stbrp_coord) (y1-y0 + spc->padding + spc->v_oversample-1); + if (glyph == 0) + missing_glyph_added = 1; } ++k; } @@ -4044,7 +4215,7 @@ STBTT_DEF void stbtt_MakeGlyphBitmapSubpixelPrefilter(const stbtt_fontinfo *info // rects array must be big enough to accommodate all characters in the given ranges STBTT_DEF int stbtt_PackFontRangesRenderIntoRects(stbtt_pack_context *spc, const stbtt_fontinfo *info, stbtt_pack_range *ranges, int num_ranges, stbrp_rect *rects) { - int i,j,k, return_value = 1; + int i,j,k, missing_glyph = -1, return_value = 1; // save current values int old_h_over = spc->h_oversample; @@ -4109,6 +4280,13 @@ STBTT_DEF int stbtt_PackFontRangesRenderIntoRects(stbtt_pack_context *spc, const bc->yoff = (float) y0 * recip_v + sub_y; bc->xoff2 = (x0 + r->w) * recip_h + sub_x; bc->yoff2 = (y0 + r->h) * recip_v + sub_y; + + if (glyph == 0) + missing_glyph = j; + } else if (spc->skip_missing) { + return_value = 0; + } else if (r->was_packed && r->w == 0 && r->h == 0 && missing_glyph >= 0) { + ranges[i].chardata_for_range[j] = ranges[i].chardata_for_range[missing_glyph]; } else { return_value = 0; // if any fail, report failure } @@ -4132,7 +4310,7 @@ STBTT_DEF void stbtt_PackFontRangesPackRects(stbtt_pack_context *spc, stbrp_rect STBTT_DEF int stbtt_PackFontRanges(stbtt_pack_context *spc, const unsigned char *fontdata, int font_index, stbtt_pack_range *ranges, int num_ranges) { stbtt_fontinfo info; - int i,j,n, return_value = 1; + int i, j, n, return_value; // [DEAR IMGUI] removed = 1; //stbrp_context *context = (stbrp_context *) spc->pack_info; stbrp_rect *rects; @@ -4147,7 +4325,7 @@ STBTT_DEF int stbtt_PackFontRanges(stbtt_pack_context *spc, const unsigned char n = 0; for (i=0; i < num_ranges; ++i) n += ranges[i].num_chars; - + rects = (stbrp_rect *) STBTT_malloc(sizeof(*rects) * n, spc->user_allocator_context); if (rects == NULL) return 0; @@ -4158,7 +4336,7 @@ STBTT_DEF int stbtt_PackFontRanges(stbtt_pack_context *spc, const unsigned char n = stbtt_PackFontRangesGatherRects(spc, &info, ranges, num_ranges, rects); stbtt_PackFontRangesPackRects(spc, rects, n); - + return_value = stbtt_PackFontRangesRenderIntoRects(spc, &info, ranges, num_ranges, rects); STBTT_free(rects, spc->user_allocator_context); @@ -4301,15 +4479,14 @@ static int stbtt__compute_crossings_x(float x, float y, int nverts, stbtt_vertex float y_frac; int winding = 0; - orig[0] = x; - //orig[1] = y; // [DEAR IMGUI] commmented double assignment - // make sure y never passes through a vertex of the shape y_frac = (float) STBTT_fmod(y, 1.0f); if (y_frac < 0.01f) y += 0.01f; else if (y_frac > 0.99f) y -= 0.01f; + + orig[0] = x; orig[1] = y; // test a ray from (-infinity,y) to (x,y) @@ -4319,7 +4496,7 @@ static int stbtt__compute_crossings_x(float x, float y, int nverts, stbtt_vertex int x1 = (int) verts[i ].x, y1 = (int) verts[i ].y; if (y > STBTT_min(y0,y1) && y < STBTT_max(y0,y1) && x > STBTT_min(x0,x1)) { float x_inter = (y - y0) / (y1 - y0) * (x1-x0) + x0; - if (x_inter < x) + if (x_inter < x) winding += (y0 < y1) ? 1 : -1; } } @@ -4345,7 +4522,7 @@ static int stbtt__compute_crossings_x(float x, float y, int nverts, stbtt_vertex y1 = (int)verts[i ].y; if (y > STBTT_min(y0,y1) && y < STBTT_max(y0,y1) && x > STBTT_min(x0,x1)) { float x_inter = (y - y0) / (y1 - y0) * (x1-x0) + x0; - if (x_inter < x) + if (x_inter < x) winding += (y0 < y1) ? 1 : -1; } } else { @@ -4357,7 +4534,7 @@ static int stbtt__compute_crossings_x(float x, float y, int nverts, stbtt_vertex if (hits[1][0] < 0) winding += (hits[1][1] < 0 ? -1 : 1); } - } + } } } return winding; @@ -4371,35 +4548,35 @@ static float stbtt__cuberoot( float x ) return (float) STBTT_pow( x,1.0f/3.0f); } -// x^3 + c*x^2 + b*x + a = 0 +// x^3 + a*x^2 + b*x + c = 0 static int stbtt__solve_cubic(float a, float b, float c, float* r) { - float s = -a / 3; - float p = b - a*a / 3; - float q = a * (2*a*a - 9*b) / 27 + c; + float s = -a / 3; + float p = b - a*a / 3; + float q = a * (2*a*a - 9*b) / 27 + c; float p3 = p*p*p; - float d = q*q + 4*p3 / 27; - if (d >= 0) { - float z = (float) STBTT_sqrt(d); - float u = (-q + z) / 2; - float v = (-q - z) / 2; - u = stbtt__cuberoot(u); - v = stbtt__cuberoot(v); - r[0] = s + u + v; - return 1; - } else { - float u = (float) STBTT_sqrt(-p/3); - float v = (float) STBTT_acos(-STBTT_sqrt(-27/p3) * q / 2) / 3; // p3 must be negative, since d is negative - float m = (float) STBTT_cos(v); + float d = q*q + 4*p3 / 27; + if (d >= 0) { + float z = (float) STBTT_sqrt(d); + float u = (-q + z) / 2; + float v = (-q - z) / 2; + u = stbtt__cuberoot(u); + v = stbtt__cuberoot(v); + r[0] = s + u + v; + return 1; + } else { + float u = (float) STBTT_sqrt(-p/3); + float v = (float) STBTT_acos(-STBTT_sqrt(-27/p3) * q / 2) / 3; // p3 must be negative, since d is negative + float m = (float) STBTT_cos(v); float n = (float) STBTT_cos(v-3.141592/2)*1.732050808f; - r[0] = s + u * 2 * m; - r[1] = s - u * (m + n); - r[2] = s - u * (m - n); + r[0] = s + u * 2 * m; + r[1] = s - u * (m + n); + r[2] = s - u * (m - n); //STBTT_assert( STBTT_fabs(((r[0]+a)*r[0]+b)*r[0]+c) < 0.05f); // these asserts may not be safe at all scales, though they're in bezier t parameter units so maybe? //STBTT_assert( STBTT_fabs(((r[1]+a)*r[1]+b)*r[1]+c) < 0.05f); //STBTT_assert( STBTT_fabs(((r[2]+a)*r[2]+b)*r[2]+c) < 0.05f); - return 3; + return 3; } } @@ -4410,12 +4587,7 @@ STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float sc int w,h; unsigned char *data; - // if one scale is 0, use same scale for both - if (scale_x == 0) scale_x = scale_y; - if (scale_y == 0) { - if (scale_x == 0) return NULL; // if both scales are 0, return NULL - scale_y = scale_x; - } + if (scale == 0) return NULL; stbtt_GetGlyphBitmapBoxSubpixel(info, glyph, scale, scale, 0.0f,0.0f, &ix0,&iy0,&ix1,&iy1); @@ -4438,7 +4610,7 @@ STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float sc // invert for y-downwards bitmaps scale_y = -scale_y; - + { int x,y,i,j; float *precompute; @@ -4481,18 +4653,17 @@ STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float sc for (i=0; i < num_verts; ++i) { float x0 = verts[i].x*scale_x, y0 = verts[i].y*scale_y; - // check against every point here rather than inside line/curve primitives -- @TODO: wrong if multiple 'moves' in a row produce a garbage point, and given culling, probably more efficient to do within line/curve - float dist2 = (x0-sx)*(x0-sx) + (y0-sy)*(y0-sy); - if (dist2 < min_dist*min_dist) - min_dist = (float) STBTT_sqrt(dist2); - - if (verts[i].type == STBTT_vline) { + if (verts[i].type == STBTT_vline && precompute[i] != 0.0f) { float x1 = verts[i-1].x*scale_x, y1 = verts[i-1].y*scale_y; + float dist,dist2 = (x0-sx)*(x0-sx) + (y0-sy)*(y0-sy); + if (dist2 < min_dist*min_dist) + min_dist = (float) STBTT_sqrt(dist2); + // coarse culling against bbox //if (sx > STBTT_min(x0,x1)-min_dist && sx < STBTT_max(x0,x1)+min_dist && // sy > STBTT_min(y0,y1)-min_dist && sy < STBTT_max(y0,y1)+min_dist) - float dist = (float) STBTT_fabs((x1-x0)*(y0-sy) - (y1-y0)*(x0-sx)) * precompute[i]; + dist = (float) STBTT_fabs((x1-x0)*(y0-sy) - (y1-y0)*(x0-sx)) * precompute[i]; STBTT_assert(i != 0); if (dist < min_dist) { // check position along line @@ -4519,7 +4690,8 @@ STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float sc float ax = x1-x0, ay = y1-y0; float bx = x0 - 2*x1 + x2, by = y0 - 2*y1 + y2; float mx = x0 - sx, my = y0 - sy; - float res[3],px,py,t,it; + float res[3] = {0.f,0.f,0.f}; + float px,py,t,it,dist2; float a_inv = precompute[i]; if (a_inv == 0.0) { // if a_inv is 0, it's 2nd degree so use quadratic formula float a = 3*(ax*bx + ay*by); @@ -4546,6 +4718,10 @@ STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float sc float d = (mx*ax+my*ay) * a_inv; num = stbtt__solve_cubic(b, c, d, res); } + dist2 = (x0-sx)*(x0-sx) + (y0-sy)*(y0-sy); + if (dist2 < min_dist*min_dist) + min_dist = (float) STBTT_sqrt(dist2); + if (num >= 1 && res[0] >= 0.0f && res[0] <= 1.0f) { t = res[0], it = 1.0f - t; px = it*it*x0 + 2*t*it*x1 + t*t*x2; @@ -4587,7 +4763,7 @@ STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float sc STBTT_free(verts, info->userdata); } return data; -} +} STBTT_DEF unsigned char * stbtt_GetCodepointSDF(const stbtt_fontinfo *info, float scale, int codepoint, int padding, unsigned char onedge_value, float pixel_dist_scale, int *width, int *height, int *xoff, int *yoff) { @@ -4605,7 +4781,7 @@ STBTT_DEF void stbtt_FreeSDF(unsigned char *bitmap, void *userdata) // // check if a utf8 string contains a prefix which is the utf16 string; if so return length of matching utf8 string -static stbtt_int32 stbtt__CompareUTF8toUTF16_bigendian_prefix(stbtt_uint8 *s1, stbtt_int32 len1, stbtt_uint8 *s2, stbtt_int32 len2) +static stbtt_int32 stbtt__CompareUTF8toUTF16_bigendian_prefix(stbtt_uint8 *s1, stbtt_int32 len1, stbtt_uint8 *s2, stbtt_int32 len2) { stbtt_int32 i=0; @@ -4644,7 +4820,7 @@ static stbtt_int32 stbtt__CompareUTF8toUTF16_bigendian_prefix(stbtt_uint8 *s1, s return i; } -static int stbtt_CompareUTF8toUTF16_bigendian_internal(char *s1, int len1, char *s2, int len2) +static int stbtt_CompareUTF8toUTF16_bigendian_internal(char *s1, int len1, char *s2, int len2) { return len1 == stbtt__CompareUTF8toUTF16_bigendian_prefix((stbtt_uint8*) s1, len1, (stbtt_uint8*) s2, len2); } @@ -4773,7 +4949,7 @@ STBTT_DEF int stbtt_BakeFontBitmap(const unsigned char *data, int offset, STBTT_DEF int stbtt_GetFontOffsetForIndex(const unsigned char *data, int index) { - return stbtt_GetFontOffsetForIndex_internal((unsigned char *) data, index); + return stbtt_GetFontOffsetForIndex_internal((unsigned char *) data, index); } STBTT_DEF int stbtt_GetNumberOfFonts(const unsigned char *data) @@ -4805,6 +4981,12 @@ STBTT_DEF int stbtt_CompareUTF8toUTF16_bigendian(const char *s1, int len1, const // FULL VERSION HISTORY // +// 1.25 (2021-07-11) many fixes +// 1.24 (2020-02-05) fix warning +// 1.23 (2020-02-02) query SVG data for glyphs; query whole kerning table (but only kern not GPOS) +// 1.22 (2019-08-11) minimize missing-glyph duplication; fix kerning if both 'GPOS' and 'kern' are defined +// 1.21 (2019-02-25) fix warning +// 1.20 (2019-02-07) PackFontRange skips missing codepoints; GetScaleFontVMetrics() // 1.19 (2018-02-11) OpenType GPOS kerning (horizontal only), STBTT_fmod // 1.18 (2018-01-29) add missing function // 1.17 (2017-07-23) make more arguments const; doc fix @@ -4866,38 +5048,38 @@ This software is available under 2 licenses -- choose whichever you prefer. ------------------------------------------------------------------------------ ALTERNATIVE A - MIT License Copyright (c) 2017 Sean Barrett -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------------------------------------------------------------------------------ ALTERNATIVE B - Public Domain (www.unlicense.org) This is free and unencumbered software released into the public domain. -Anyone is free to copy, modify, publish, use, compile, sell, or distribute this -software, either in source code form or as a compiled binary, for any purpose, +Anyone is free to copy, modify, publish, use, compile, sell, or distribute this +software, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means. -In jurisdictions that recognize copyright laws, the author or authors of this -software dedicate any and all copyright interest in the software to the public -domain. We make this dedication for the benefit of the public at large and to -the detriment of our heirs and successors. We intend this dedication to be an -overt act of relinquishment in perpetuity of all present and future rights to +In jurisdictions that recognize copyright laws, the author or authors of this +software dedicate any and all copyright interest in the software to the public +domain. We make this dedication for the benefit of the public at large and to +the detriment of our heirs and successors. We intend this dedication to be an +overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------------------------------------------------------------------------------ */ diff --git a/launcher/keymapper.cpp b/launcher/keymapper.cpp index 6ec882bdf..a2486c9fb 100644 --- a/launcher/keymapper.cpp +++ b/launcher/keymapper.cpp @@ -81,7 +81,7 @@ void ui::keymapper_panel::render_contents() label += "##" + std::to_string((int)binding.first); - ImGui::SameLine(ImGui::GetContentRegionAvailWidth() - 150); + ImGui::SameLine(ImGui::GetContentRegionAvail().x - 150); if (ImGui::Button(label.c_str(), ImVec2(150, 0))) { if (bind_active == binding.first) bind_active = user_command::none; diff --git a/launcher/scenery_list.cpp b/launcher/scenery_list.cpp index 0baf2f05b..d95c962b5 100644 --- a/launcher/scenery_list.cpp +++ b/launcher/scenery_list.cpp @@ -105,10 +105,10 @@ void ui::scenerylist_panel::draw_scenery_image() tex.create(); if (tex.get_is_ready()) { - float avail_width = ImGui::GetContentRegionAvailWidth(); + float avail_width = ImGui::GetContentRegionAvail().x; float height = avail_width / tex.get_width() * tex.get_height(); - ImGui::Image(reinterpret_cast(tex.get_id()), ImVec2(avail_width, height), ImVec2(0, 1), ImVec2(1, 0)); + ImGui::Image((ImTextureID)(intptr_t)(tex.get_id()), ImVec2(avail_width, height), ImVec2(0, 1), ImVec2(1, 0)); } } } @@ -194,7 +194,8 @@ void ui::scenerylist_panel::add_replace_entry(const trainset_desc &trainset) void ui::scenerylist_panel::draw_trainset_box() { - ImGuiListClipper clipper(selected_scenery->trainsets.size()); + ImGuiListClipper clipper; + clipper.Begin(selected_scenery->trainsets.size()); while (clipper.Step()) for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; i++) draw_trainset(selected_scenery->trainsets[i]); } diff --git a/launcher/scenery_wizard.cpp b/launcher/scenery_wizard.cpp index 19a2d07f4..d22438b2c 100644 --- a/launcher/scenery_wizard.cpp +++ b/launcher/scenery_wizard.cpp @@ -171,7 +171,7 @@ void ui::scenerywizard_panel::render_map(glm::vec2 const &Size) drawlist->PushClipRect(origin, ImVec2(origin.x + Size.x, origin.y + Size.y), true); drawlist->AddRectFilled(origin, ImVec2(origin.x + Size.x, origin.y + Size.y), IM_COL32(200, 214, 222, 255)); if (m_texture != 0) - drawlist->AddImage(reinterpret_cast(static_cast(m_texture)), to_screen({m_image_low.x, m_image_high.y}), to_screen({m_image_high.x, m_image_low.y})); + drawlist->AddImage((ImTextureID)(static_cast(m_texture)), to_screen({m_image_low.x, m_image_high.y}), to_screen({m_image_high.x, m_image_low.y})); if (m_picked) { auto const at{to_screen(m_point)}; diff --git a/launcher/vehicle_picker.cpp b/launcher/vehicle_picker.cpp index 9fe0a29a0..0ab862f08 100644 --- a/launcher/vehicle_picker.cpp +++ b/launcher/vehicle_picker.cpp @@ -78,7 +78,8 @@ void ui::vehiclepicker_panel::render_contents() } if (ImGui::BeginChild("box2")) { - ImGuiListClipper clipper(model_list.size()); + ImGuiListClipper clipper; + clipper.Begin(model_list.size()); while (clipper.Step()) for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; i++) { auto group = model_list[i]; @@ -109,7 +110,8 @@ void ui::vehiclepicker_panel::render_contents() } if (ImGui::BeginChild("box2")) { - ImGuiListClipper clipper(model_list.size()); + ImGuiListClipper clipper; + clipper.Begin(model_list.size()); while (clipper.Step()) for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; i++) { auto &desc = model_list[i]; @@ -141,7 +143,8 @@ void ui::vehiclepicker_panel::render_contents() skinset_list.end()); if (ImGui::BeginChild("box3")) { - ImGuiListClipper clipper(skinset_list.size()); + ImGuiListClipper clipper; + clipper.Begin(skinset_list.size()); while (clipper.Step()) for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; i++) { auto skin = skinset_list[i]; diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index 7b9c434c3..3e57c44ee 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -722,8 +722,8 @@ void opengl33_renderer::draw_debug_ui() ImGui::SliderFloat("in_cutoff", &conf.in_cutoff, 0.9f, 1.1f); ImGui::SliderFloat("out_cutoff", &conf.out_cutoff, 0.9f, 1.1f); - ImGui::SliderFloat("falloff_linear", &conf.falloff_linear, 0.0f, 1.0f, "%.3f", 2.0f); - ImGui::SliderFloat("falloff_quadratic", &conf.falloff_quadratic, 0.0f, 1.0f, "%.3f", 2.0f); + ImGui::SliderFloat("falloff_linear", &conf.falloff_linear, 0.0f, 1.0f, "%.3f", ImGuiSliderFlags_Logarithmic); + ImGui::SliderFloat("falloff_quadratic", &conf.falloff_quadratic, 0.0f, 1.0f, "%.3f", ImGuiSliderFlags_Logarithmic); ImGui::SliderFloat("ambient", &conf.ambient, 0.0f, 3.0f); ImGui::SliderFloat("intensity", &conf.intensity, 0.0f, 10.0f); diff --git a/widgets/map.cpp b/widgets/map.cpp index 25beb7944..575fbf21e 100644 --- a/widgets/map.cpp +++ b/widgets/map.cpp @@ -308,13 +308,16 @@ void ui::map_panel::render_contents() ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.0f, 0.0f, 0.0f, 0.0f)); ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0.0f, 0.0f, 0.0f, 0.0f)); ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(0.0f, 0.0f, 0.0f, 0.0f)); - ImGui::ImageButton((ImTextureID)(intptr_t)(m_tex->id), + // imgui 1.89+ takes the frame padding of the image button from the style + ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0.0f, 0.0f)); + ImGui::ImageButton("##map", + (ImTextureID)(intptr_t)(m_tex->id), surface_size_im, ImVec2(0, surface_size.y / fb_size), ImVec2(surface_size.x / fb_size, 0), - 0, ImVec4(0.0f, 0.0f, 0.0f, 0.0f), ImVec4(1.0f, 1.0f, 1.0f, Global.UIBgOpacity)); + ImGui::PopStyleVar(); ImGui::PopStyleColor(3); if (ImGui::IsItemHovered()) diff --git a/widgets/vehicleparams.cpp b/widgets/vehicleparams.cpp index 51ad7a073..14ca9923c 100644 --- a/widgets/vehicleparams.cpp +++ b/widgets/vehicleparams.cpp @@ -60,7 +60,7 @@ void ui::vehicleparams_panel::draw_mini(const TMoverParameters &mover) if (ImGui::BeginChild("mini", ImVec2(x, y))) { - ImGui::Image(reinterpret_cast(tex.get_id()), ImVec2(x, y), ImVec2(0, 1), ImVec2(1, 0)); + ImGui::Image((ImTextureID)(intptr_t)(tex.get_id()), ImVec2(x, y), ImVec2(0, 1), ImVec2(1, 0)); if (mover.Pantographs[end::rear].is_active) draw_infobutton("╨╨╨", ImVec2(126, 10)); @@ -129,7 +129,7 @@ void ui::vehicleparams_panel::render_contents() ImVec2 size = ImGui::GetContentRegionAvail(); - ImGui::Image(reinterpret_cast(entry.rt->shared_tex), size, ImVec2(uv0.x, uv0.y), ImVec2(uv1.x, uv1.y)); + ImGui::Image((ImTextureID)(intptr_t)(entry.rt->shared_tex), size, ImVec2(uv0.x, uv0.y), ImVec2(uv1.x, uv1.y)); } ImGui::End(); } From 476f3bf1b7b4382f571330719b7fbe63a38f8e0e Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Thu, 8 Oct 2026 21:04:58 +0200 Subject: [PATCH 171/430] feat(ui): panels can be docked together and dragged out of the simulator window into windows of their own (imgui multi-viewports, ui.viewports yes by default, off where the renderer or the platform can't do it, e.g. wayland); imgui coordinates kept relative to the main window by the glfw backend, so the overlays, picking and gizmo of the editor work unchanged; overlays of the 3d view drawn on the main viewport; keys pressed in the separate windows passed on to the simulator, so the shortcuts of the editor work there too --- application/editormode.cpp | 2 +- application/editormodeinfra.cpp | 2 +- application/editormodejoints.cpp | 2 +- application/editormodelineside.cpp | 4 +-- application/editormodeparallel.cpp | 2 +- application/editormodeprofile.cpp | 2 +- application/editormoderoad.cpp | 2 +- application/editormodesignal.cpp | 2 +- application/editormodespeed.cpp | 2 +- application/editormodesweep.cpp | 8 ++--- application/editormodetrack.cpp | 14 ++++----- application/editormodetrackux.cpp | 10 +++--- application/editormodeturntable.cpp | 4 +-- application/editormodevehicle.cpp | 2 +- application/uilayer.cpp | 49 +++++++++++++++++++++++++++-- application/uilayer.h | 3 ++ editor/editorOrthophoto.cpp | 2 +- imgui/imgui_impl_glfw.cpp | 44 +++++++++++++++++++++----- utilities/Globals.cpp | 7 +++++ utilities/Globals.h | 1 + 20 files changed, 125 insertions(+), 39 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index cc7a1bee0..adfb13408 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -3190,7 +3190,7 @@ void editor_mode::draw_area_fill_outline() const }; float constexpr nearw = 0.1f; - ImDrawList *drawlist = ImGui::GetBackgroundDrawList(); + ImDrawList *drawlist = ImGui::GetBackgroundDrawList(ImGui::GetMainViewport()); ImU32 const edgecolor = IM_COL32(255, 200, 40, 230); ImU32 const closingcolor = IM_COL32(255, 200, 40, 110); diff --git a/application/editormodeinfra.cpp b/application/editormodeinfra.cpp index 86ae5389f..1e18d0425 100644 --- a/application/editormodeinfra.cpp +++ b/application/editormodeinfra.cpp @@ -1633,7 +1633,7 @@ void editor_mode::draw_infra_overlay() const return; Live.refresh(); screen_projection const projection; - ImDrawList *drawlist{ImGui::GetBackgroundDrawList()}; + ImDrawList *drawlist{ImGui::GetBackgroundDrawList(ImGui::GetMainViewport())}; auto const camera{GfxRenderer->Camera_Position()}; auto const draw = [&](infra::binding const &Binding, ImU32 const Colour, float const Size) { if (Binding.anchors.empty() || glm::distance(Binding.anchors.front().foot, camera) > 2000.0) diff --git a/application/editormodejoints.cpp b/application/editormodejoints.cpp index acb9e8f2e..c50d9d825 100644 --- a/application/editormodejoints.cpp +++ b/application/editormodejoints.cpp @@ -504,7 +504,7 @@ void editor_mode::draw_joints_overlay() const if (false == state.open || state.issues.empty()) return; screen_projection const projection; - auto *drawlist{ImGui::GetBackgroundDrawList()}; + auto *drawlist{ImGui::GetBackgroundDrawList(ImGui::GetMainViewport())}; glm::dvec3 const camera{Global.pCamera.Pos}; for (int i = 0; i < static_cast(state.issues.size()); ++i) { diff --git a/application/editormodelineside.cpp b/application/editormodelineside.cpp index 37d793d31..f28ff72a5 100644 --- a/application/editormodelineside.cpp +++ b/application/editormodelineside.cpp @@ -688,7 +688,7 @@ void editor_mode::draw_hekto_overlay() const if (false == tool.open || tool.track == nullptr) return; screen_projection const projection; - auto *drawlist{ImGui::GetBackgroundDrawList()}; + auto *drawlist{ImGui::GetBackgroundDrawList(ImGui::GetMainViewport())}; glm::dvec3 const camera{Global.pCamera.Pos}; for (auto const &post : tool.posts) { @@ -955,7 +955,7 @@ void editor_mode::draw_fouling_overlay() const if (false == tool.open) return; screen_projection const projection; - auto *drawlist{ImGui::GetBackgroundDrawList()}; + auto *drawlist{ImGui::GetBackgroundDrawList(ImGui::GetMainViewport())}; glm::dvec3 const camera{Global.pCamera.Pos}; for (auto const &point : tool.points) { diff --git a/application/editormodeparallel.cpp b/application/editormodeparallel.cpp index 7eaa92f43..47222bb7e 100644 --- a/application/editormodeparallel.cpp +++ b/application/editormodeparallel.cpp @@ -215,7 +215,7 @@ void editor_mode::draw_parallel_preview() const if (false == tool.open || tool.pieces.empty() || selected_track() != tool.built_for) return; screen_projection const projection; - auto *drawlist{ImGui::GetBackgroundDrawList()}; + auto *drawlist{ImGui::GetBackgroundDrawList(ImGui::GetMainViewport())}; for (auto const &piece : tool.pieces) { bezier const curve{piece}; diff --git a/application/editormodeprofile.cpp b/application/editormodeprofile.cpp index e1976b2d6..974482cbc 100644 --- a/application/editormodeprofile.cpp +++ b/application/editormodeprofile.cpp @@ -1885,7 +1885,7 @@ void editor_mode::draw_profile_overlay() const if (false == state.open || state.samples.size() < 2) return; screen_projection const projection; - ImDrawList *drawlist{ImGui::GetBackgroundDrawList()}; + ImDrawList *drawlist{ImGui::GetBackgroundDrawList(ImGui::GetMainViewport())}; auto const &samples{state.samples}; glm::dvec3 previous{samples.front().position}; glm::dvec3 designedprevious{previous.x, profile::elevation(state.line, 0.0), previous.z}; diff --git a/application/editormoderoad.cpp b/application/editormoderoad.cpp index e9e134956..d66b6bcb2 100644 --- a/application/editormoderoad.cpp +++ b/application/editormoderoad.cpp @@ -2505,7 +2505,7 @@ void editor_mode::draw_road_overlay() const return; screen_projection projection; - ImDrawList *drawlist = ImGui::GetBackgroundDrawList(); + ImDrawList *drawlist = ImGui::GetBackgroundDrawList(ImGui::GetMainViewport()); glm::dvec3 const camera{Global.pCamera.Pos}; // pieces of a line needed to draw a path: one for a straight, more the longer a bend is and the nearer it is auto const pieces = [&camera](segment_data const &Path, glm::dvec3 const &Location) { diff --git a/application/editormodesignal.cpp b/application/editormodesignal.cpp index d071f942f..538406117 100644 --- a/application/editormodesignal.cpp +++ b/application/editormodesignal.cpp @@ -947,7 +947,7 @@ void editor_mode::draw_signal_overlay() const { auto const &tool{m_signal}; screen_projection const projection; - auto *drawlist{ImGui::GetBackgroundDrawList()}; + auto *drawlist{ImGui::GetBackgroundDrawList(ImGui::GetMainViewport())}; glm::dvec3 const camera{Global.pCamera.Pos}; auto const arrow = [&](glm::dvec3 const &From, glm::dvec2 const &Direction, ImU32 const Colour) { glm::dvec3 const tip{From.x + Direction.x * 6.0, From.y, From.z + Direction.y * 6.0}; diff --git a/application/editormodespeed.cpp b/application/editormodespeed.cpp index 52b39f46b..9843c7b0e 100644 --- a/application/editormodespeed.cpp +++ b/application/editormodespeed.cpp @@ -349,7 +349,7 @@ void editor_mode::draw_speed_overlay() const if (false == state.open || state.results.empty()) return; screen_projection const projection; - auto *drawlist{ImGui::GetBackgroundDrawList()}; + auto *drawlist{ImGui::GetBackgroundDrawList(ImGui::GetMainViewport())}; glm::dvec3 const camera{Global.pCamera.Pos}; for (int i = 0; i < static_cast(state.results.size()); ++i) { diff --git a/application/editormodesweep.cpp b/application/editormodesweep.cpp index ed5e10dcb..b5fed5098 100644 --- a/application/editormodesweep.cpp +++ b/application/editormodesweep.cpp @@ -986,7 +986,7 @@ void editor_mode::draw_sweep_overlay() const if (false == tool.open || tool.outline.size() < 2) return; screen_projection const projection; - auto *drawlist{ImGui::GetBackgroundDrawList()}; + auto *drawlist{ImGui::GetBackgroundDrawList(ImGui::GetMainViewport())}; auto const &settings{tool.settings}; auto const from{std::max(0.0, settings.from)}; auto const to{settings.to < 0.0 ? tool.curve_length : std::min(settings.to, tool.curve_length)}; @@ -1820,7 +1820,7 @@ void editor_mode::draw_bend_overlay() const if (false == tool.label.empty()) { auto const &io{ImGui::GetIO()}; - auto *foreground{ImGui::GetForegroundDrawList()}; + auto *foreground{ImGui::GetForegroundDrawList(ImGui::GetMainViewport())}; auto const labelsize{ImGui::CalcTextSize(tool.label.c_str())}; auto const detailsize{tool.details.empty() ? ImVec2(0.0f, 0.0f) : ImGui::CalcTextSize(tool.details.c_str())}; ImVec2 const size{std::max(labelsize.x, detailsize.x), labelsize.y + (tool.details.empty() ? 0.0f : detailsize.y + 4.0f)}; @@ -1839,7 +1839,7 @@ void editor_mode::draw_bend_overlay() const if (projection.project(model->location(), at)) { auto const text{format(STR_C("B: bend along %s"), tool.tracks.front().first->name().c_str())}; - auto *foreground{ImGui::GetForegroundDrawList()}; + auto *foreground{ImGui::GetForegroundDrawList(ImGui::GetMainViewport())}; auto const size{ImGui::CalcTextSize(text.c_str())}; foreground->AddRectFilled(ImVec2(at.x + 10.0f, at.y - size.y - 14.0f), ImVec2(at.x + size.x + 22.0f, at.y - 6.0f), IM_COL32(0, 0, 0, 150), 4.0f); foreground->AddText(ImVec2(at.x + 16.0f, at.y - size.y - 10.0f), IM_COL32(40, 220, 255, 255), text.c_str()); @@ -1856,7 +1856,7 @@ void editor_mode::draw_bend_overlay() const ImVec2 screen; if (false == projection.project(marker, screen)) return; - auto *drawlist{ImGui::GetBackgroundDrawList()}; + auto *drawlist{ImGui::GetBackgroundDrawList(ImGui::GetMainViewport())}; if (tool.over_marker || tool.dragging != 0) drawlist->AddCircleFilled(screen, 9.0f, IM_COL32(40, 220, 255, 120), 16); drawlist->AddCircle(screen, 9.0f, IM_COL32(40, 220, 255, 255), 16, 2.5f); diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index ee91503e7..761b36abe 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -269,7 +269,7 @@ void editor_mode::draw_track_overlay() const return; screen_projection const projection; - ImDrawList *drawlist = ImGui::GetBackgroundDrawList(); + ImDrawList *drawlist = ImGui::GetBackgroundDrawList(ImGui::GetMainViewport()); bool const trackmode = ui()->mode() == nodebank_panel::TRACK; ImU32 const coursecolor = IM_COL32(40, 220, 255, 220); @@ -2042,7 +2042,7 @@ void editor_mode::draw_route_overlay() const auto const &design{route.design}; auto const &result{route.result}; screen_projection const projection; - ImDrawList *drawlist = ImGui::GetBackgroundDrawList(); + ImDrawList *drawlist = ImGui::GetBackgroundDrawList(ImGui::GetMainViewport()); auto const &start{result.valid ? result.start : design.start}; auto const &end{result.valid ? result.end : design.end}; @@ -2415,7 +2415,7 @@ editor_track::straight const &editor_mode::current_straight() void editor_mode::draw_straights_overlay() const { screen_projection const projection; - ImDrawList *drawlist = ImGui::GetBackgroundDrawList(); + ImDrawList *drawlist = ImGui::GetBackgroundDrawList(ImGui::GetMainViewport()); glm::dvec3 const camera{Global.pCamera.Pos}; auto const nearby = [&](editor_track::straight const &Line) { auto const offset{camera - Line.start}; @@ -3641,7 +3641,7 @@ std::string editor_mode::track_readout() const void editor_mode::draw_track_hints() { ImGuiIO const &io = ImGui::GetIO(); - auto *drawlist{ImGui::GetBackgroundDrawList()}; + auto *drawlist{ImGui::GetBackgroundDrawList(ImGui::GetMainViewport())}; float const margin{12.0f}; float const gap{14.0f}; float const pad{4.0f}; @@ -3698,7 +3698,7 @@ void editor_mode::draw_track_hints() readout += (readout.empty() ? "" : "\n") + std::string{"= "} + m_typed + "_ " + STR(meaning); if (readout.empty() || ImGui::GetIO().WantCaptureMouse) return; - auto *foreground{ImGui::GetForegroundDrawList()}; + auto *foreground{ImGui::GetForegroundDrawList(ImGui::GetMainViewport())}; auto const size{ImGui::CalcTextSize(readout.c_str())}; ImVec2 at{io.MousePos.x + 20.0f, io.MousePos.y + 20.0f}; at.x = std::min(at.x, io.DisplaySize.x - size.x - 10.0f); @@ -3873,7 +3873,7 @@ editor_track::snap_target editor_mode::snap_free_end(glm::dvec3 const &Near, glm void editor_mode::draw_free_ends(TTrack const *Self, int const Category, std::vector const &Exclude) const { screen_projection const projection; - auto *drawlist{ImGui::GetBackgroundDrawList()}; + auto *drawlist{ImGui::GetBackgroundDrawList(ImGui::GetMainViewport())}; auto const &display{ImGui::GetIO().DisplaySize}; auto const reach{Global.EditorOrtho ? std::max(kJointRange, static_cast(Global.EditorOrthoExtent) * 2.0) : kJointRange}; for (auto const &candidate : editor_track::free_ends(Self, Category, glm::dvec3{Global.pCamera.Pos}, reach, Exclude)) @@ -4971,7 +4971,7 @@ bool editor_mode::place_switch_on_straight(editor_track::straight const &Line, e void editor_mode::draw_build_overlay() const { screen_projection const projection; - ImDrawList *drawlist = ImGui::GetBackgroundDrawList(); + ImDrawList *drawlist = ImGui::GetBackgroundDrawList(ImGui::GetMainViewport()); auto const drawpath = [&](segment_data const &Path, ImU32 const Color) { auto previous{bezier{Path}.point(0.0)}; for (int i = 1; i <= 24; ++i) diff --git a/application/editormodetrackux.cpp b/application/editormodetrackux.cpp index 0de31ee49..f9c523cc4 100644 --- a/application/editormodetrackux.cpp +++ b/application/editormodetrackux.cpp @@ -173,7 +173,7 @@ void editor_mode::draw_track_hover() const screen_projection const projection; if (track != selected_track()) { - auto *drawlist{ImGui::GetBackgroundDrawList()}; + auto *drawlist{ImGui::GetBackgroundDrawList(ImGui::GetMainViewport())}; for (int i = 0; i < static_cast(track->m_paths.size()); ++i) { bezier const curve{track->m_paths[i]}; @@ -489,7 +489,7 @@ void editor_mode::draw_track_intent() const if (intent.what == kind::none || intent.what == kind::gizmo || io.WantCaptureMouse) return; screen_projection const projection; - auto *drawlist{ImGui::GetBackgroundDrawList()}; + auto *drawlist{ImGui::GetBackgroundDrawList(ImGui::GetMainViewport())}; ImVec2 at; if (projection.project(intent.position, at)) { @@ -528,7 +528,7 @@ void editor_mode::draw_track_intent() const auto const velocity{editor_track::velocity(*track)}; details += velocity > 0.0 ? format(" V %.0f km/h", velocity) : std::string{}; } - auto *foreground{ImGui::GetForegroundDrawList()}; + auto *foreground{ImGui::GetForegroundDrawList(ImGui::GetMainViewport())}; auto const actionsize{ImGui::CalcTextSize(intent.action.c_str())}; auto const detailsize{details.empty() ? ImVec2(0.0f, 0.0f) : ImGui::CalcTextSize(details.c_str())}; ImVec2 const size{std::max(actionsize.x, detailsize.x), actionsize.y + (details.empty() ? 0.0f : detailsize.y + 4.0f)}; @@ -1074,7 +1074,7 @@ void editor_mode::draw_track_spread() const if (m_intent.what != track_intent::kind::spread || m_spread.from == nullptr) return; screen_projection const projection; - auto *drawlist{ImGui::GetBackgroundDrawList()}; + auto *drawlist{ImGui::GetBackgroundDrawList(ImGui::GetMainViewport())}; auto const removing{in_track_set(m_spread.from)}; auto const colour{removing ? IM_COL32(255, 90, 70, 220) : IM_COL32(90, 220, 255, 220)}; for (auto const *track : m_spread.preview) @@ -1099,7 +1099,7 @@ void editor_mode::draw_track_spread() const void editor_mode::draw_track_set() const { screen_projection const projection; - auto *drawlist{ImGui::GetBackgroundDrawList()}; + auto *drawlist{ImGui::GetBackgroundDrawList(ImGui::GetMainViewport())}; if (m_track_box.active) { auto const &io{ImGui::GetIO()}; diff --git a/application/editormodeturntable.cpp b/application/editormodeturntable.cpp index f92b1b15d..4cd20a8fc 100644 --- a/application/editormodeturntable.cpp +++ b/application/editormodeturntable.cpp @@ -180,7 +180,7 @@ void label(screen_projection const &Projection, glm::dvec3 const &Point, std::st ImVec2 at; if (false == Projection.project(Point, at)) return; - auto *drawlist{ImGui::GetForegroundDrawList()}; + auto *drawlist{ImGui::GetForegroundDrawList(ImGui::GetMainViewport())}; auto const size{ImGui::CalcTextSize(Text.c_str())}; drawlist->AddRectFilled(ImVec2(at.x + 8.f, at.y - 4.f), ImVec2(at.x + 16.f + size.x, at.y + size.y + 4.f), IM_COL32(0, 0, 0, 170), 4.f); drawlist->AddText(ImVec2(at.x + 12.f, at.y), IM_COL32(255, 255, 255, 235), Text.c_str()); @@ -946,7 +946,7 @@ void editor_mode::draw_turntable_overlay() const using kind = track_intent::kind; auto const &tool{m_turntable}; screen_projection const projection; - auto *drawlist{ImGui::GetBackgroundDrawList()}; + auto *drawlist{ImGui::GetBackgroundDrawList(ImGui::GetMainViewport())}; auto const camera{glm::dvec3{Global.pCamera.Pos}}; for (auto *track : simulation::Paths.sequence()) { diff --git a/application/editormodevehicle.cpp b/application/editormodevehicle.cpp index 4abc7ce2f..58562caab 100644 --- a/application/editormodevehicle.cpp +++ b/application/editormodevehicle.cpp @@ -298,7 +298,7 @@ void editor_mode::draw_vehicle_marker() const ImVec2 screen; if (false == projection.project(tool.point, screen)) return; - auto *drawlist{ImGui::GetBackgroundDrawList()}; + auto *drawlist{ImGui::GetBackgroundDrawList(ImGui::GetMainViewport())}; auto const colour{IM_COL32(255, 220, 60, 235)}; drawlist->AddCircle(screen, 9.0f, colour, 16, 2.5f); if (tool.track->m_editorremoved || tool.track->m_paths.empty()) diff --git a/application/uilayer.cpp b/application/uilayer.cpp index 621ece2e0..4f9490545 100644 --- a/application/uilayer.cpp +++ b/application/uilayer.cpp @@ -23,6 +23,7 @@ http://mozilla.org/MPL/2.0/. #include "imgui/imgui_impl_glfw.h" GLFWwindow *ui_layer::m_window{nullptr}; +GLFWwindow *ui_layer::m_keywindow{nullptr}; ImGuiIO *ui_layer::m_imguiio{nullptr}; GLint ui_layer::m_textureunit{GL_TEXTURE0}; bool ui_layer::m_cursorvisible; @@ -108,7 +109,7 @@ ui_layer::~ui_layer() {} bool ui_layer::key_callback(int key, int scancode, int action, int mods) { - ImGui_ImplGlfw_KeyCallback(m_window, key, scancode, action, mods); + ImGui_ImplGlfw_KeyCallback(m_keywindow != nullptr ? m_keywindow : m_window, key, scancode, action, mods); return m_imguiio->WantCaptureKeyboard; } @@ -152,6 +153,27 @@ void ui_layer::focus_callback(int focused) ImGui_ImplGlfw_WindowFocusCallback(m_window, focused); } +void ui_layer::viewport_key_callback(GLFWwindow *Window, int key, int scancode, int action, int mods) +{ + // imgui gets the key with the window it came from (the state of modifiers is read from it), the simulator gets it unless imgui takes it + m_keywindow = Window; + Application.on_key(key, scancode, action, mods); + m_keywindow = nullptr; +} + +namespace +{ +// window creation of the glfw backend, wrapped to give the new windows the key callback of the simulator +void (*imgui_create_window)(ImGuiViewport *Viewport){nullptr}; + +void create_viewport_window(ImGuiViewport *Viewport) +{ + imgui_create_window(Viewport); + if (Viewport->PlatformHandle != nullptr) + glfwSetKeyCallback(static_cast(Viewport->PlatformHandle), ui_layer::viewport_key_callback); +} +} // namespace + void ui_layer::imgui_style() { // palette shared with the MaSzyna starter: flat dark panels, thin borders, green accents @@ -341,6 +363,20 @@ bool ui_layer::init(GLFWwindow *Window) return false; } + // panels can be docked together, and dragged out of the simulator window into windows of their own (e.g. on another monitor) + // when both backends can do it. glfw can't place windows under wayland. both flags have to be set before the first frame + m_imguiio->ConfigFlags |= ImGuiConfigFlags_DockingEnable; + auto const viewportsupport{(m_imguiio->BackendFlags & ImGuiBackendFlags_PlatformHasViewports) && (m_imguiio->BackendFlags & ImGuiBackendFlags_RendererHasViewports) && + glfwGetPlatform() != GLFW_PLATFORM_WAYLAND}; + if (Global.ui_viewports && viewportsupport) + { + m_imguiio->ConfigFlags |= ImGuiConfigFlags_ViewportsEnable; + auto &platformio{ImGui::GetPlatformIO()}; + imgui_create_window = platformio.Platform_CreateWindow; + platformio.Platform_CreateWindow = create_viewport_window; + } + WriteLog(std::string("ui: panels in separate windows ") + ((m_imguiio->ConfigFlags & ImGuiConfigFlags_ViewportsEnable) ? "enabled" : (viewportsupport ? "disabled in settings" : "not supported here"))); + return true; } @@ -440,6 +476,15 @@ void ui_layer::render_internal() { ImGui::Render(); GfxRenderer->GetImguiRenderer()->Render(); + + if (m_imguiio->ConfigFlags & ImGuiConfigFlags_ViewportsEnable) + { + // panels outside of the main window are drawn in their own windows, whose gl contexts are shared with the main one + auto *context{glfwGetCurrentContext()}; + ImGui::UpdatePlatformWindows(); + ImGui::RenderPlatformWindowsDefault(); + glfwMakeContextCurrent(context); + } } void ui_layer::begin_ui_frame() @@ -670,5 +715,5 @@ void ui_layer::render_background() ImVec2 end_position(start_position.x + image_size.x, start_position.y + image_size.y); // obrazek jest odwrócony w pionie – odwracamy UV - ImGui::GetBackgroundDrawList()->AddImage((ImTextureID)(intptr_t)(tex.get_id()), start_position, end_position, ImVec2(0, 1), ImVec2(1, 0)); + ImGui::GetBackgroundDrawList(ImGui::GetMainViewport())->AddImage((ImTextureID)(intptr_t)(tex.get_id()), start_position, end_position, ImVec2(0, 1), ImVec2(1, 0)); } diff --git a/application/uilayer.h b/application/uilayer.h index 139664c92..975c1c773 100644 --- a/application/uilayer.h +++ b/application/uilayer.h @@ -122,6 +122,8 @@ public: static void cursor_pos_callback(double x, double y); static void cursor_enter_callback(int entered); static void focus_callback(int focused); + // key presses in windows of the ui outside of the main window, passed on to the simulator like those of the main window + static void viewport_key_callback(GLFWwindow *Window, int key, int scancode, int action, int mods); static ImFont *font_default; static ImFont *font_mono; @@ -130,6 +132,7 @@ public: protected: // members static GLFWwindow *m_window; + static GLFWwindow *m_keywindow; // window of the key event being handled static ImGuiIO *m_imguiio; static bool m_cursorvisible; diff --git a/editor/editorOrthophoto.cpp b/editor/editorOrthophoto.cpp index cee41d42b..f9374261a 100644 --- a/editor/editorOrthophoto.cpp +++ b/editor/editorOrthophoto.cpp @@ -1338,7 +1338,7 @@ void editor_orthophoto::draw(glm::mat4 const &ViewProjection, glm::dvec3 const & if (!m_enabled || m_config.in_scene || m_config.opacity <= 0.0f || ScreenWidth <= 0.0f || ScreenHeight <= 0.0f) return; - ImDrawList *drawlist = ImGui::GetBackgroundDrawList(); + ImDrawList *drawlist = ImGui::GetBackgroundDrawList(ImGui::GetMainViewport()); // without vertex offset support in the backend the whole list has to fit 16-bit indices std::size_t const vertexbudget = (ImGui::GetIO().BackendFlags & ImGuiBackendFlags_RendererHasVtxOffset) ? vertex_budget * 8 : vertex_budget; ImU32 const color = IM_COL32(255, 255, 255, static_cast(m_config.opacity * 255.0f + 0.5f)); diff --git a/imgui/imgui_impl_glfw.cpp b/imgui/imgui_impl_glfw.cpp index a3d545491..35040b5da 100644 --- a/imgui/imgui_impl_glfw.cpp +++ b/imgui/imgui_impl_glfw.cpp @@ -181,6 +181,7 @@ struct ImGui_ImplGlfw_Data bool MouseIgnoreButtonUpWaitForFocusLoss; bool MouseIgnoreButtonUp; ImVec2 LastValidMousePos; + ImVec2 MainWindowOrigin; // MaSzyna: desktop position of the main window, see ImGui_ImplGlfw_UpdateMainWindowOrigin() GLFWwindow* KeyOwnerWindows[GLFW_KEY_LAST]; bool InstalledCallbacks; bool CallbacksChainForAllWindows; @@ -219,6 +220,7 @@ static ImGui_ImplGlfw_Data* ImGui_ImplGlfw_GetBackendData() // Forward Declarations static void ImGui_ImplGlfw_UpdateMonitors(); static void ImGui_ImplGlfw_InitMultiViewportSupport(); +static void ImGui_ImplGlfw_UpdateMainWindowOrigin(); static void ImGui_ImplGlfw_ShutdownMultiViewportSupport(); // Functions @@ -483,8 +485,8 @@ void ImGui_ImplGlfw_CursorPosCallback(GLFWwindow* window, double x, double y) { int window_x, window_y; glfwGetWindowPos(window, &window_x, &window_y); - x += window_x; - y += window_y; + x += window_x - bd->MainWindowOrigin.x; + y += window_y - bd->MainWindowOrigin.y; } io.AddMousePosEvent((float)x, (float)y); bd->LastValidMousePos = ImVec2((float)x, (float)y); @@ -802,8 +804,8 @@ static void ImGui_ImplGlfw_UpdateMouseData() // Multi-viewport mode: mouse position in OS absolute coordinates (io.MousePos is (0,0) when the mouse is on the upper-left of the primary monitor) int window_x, window_y; glfwGetWindowPos(window, &window_x, &window_y); - mouse_x += window_x; - mouse_y += window_y; + mouse_x += window_x - bd->MainWindowOrigin.x; + mouse_y += window_y - bd->MainWindowOrigin.y; } bd->LastValidMousePos = ImVec2((float)mouse_x, (float)mouse_y); io.AddMousePosEvent((float)mouse_x, (float)mouse_y); @@ -919,6 +921,7 @@ static void ImGui_ImplGlfw_UpdateGamepads() static void ImGui_ImplGlfw_UpdateMonitors() { + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO(); int monitors_count = 0; @@ -954,6 +957,9 @@ static void ImGui_ImplGlfw_UpdateMonitors() continue; // Some accessibility applications are declaring virtual monitors with a DPI of 0, see #7902. monitor.DpiScale = x_scale; #endif + // MaSzyna: monitors in imgui space as well + monitor.MainPos = ImVec2(monitor.MainPos.x - bd->MainWindowOrigin.x, monitor.MainPos.y - bd->MainWindowOrigin.y); + monitor.WorkPos = ImVec2(monitor.WorkPos.x - bd->MainWindowOrigin.x, monitor.WorkPos.y - bd->MainWindowOrigin.y); monitor.PlatformHandle = (void*)glfw_monitors[n]; // [...] GLFW doc states: "guaranteed to be valid only until the monitor configuration changes" platform_io.Monitors.push_back(monitor); } @@ -973,6 +979,7 @@ void ImGui_ImplGlfw_NewFrame() io.DisplaySize = ImVec2((float)w, (float)h); if (w > 0 && h > 0) io.DisplayFramebufferScale = ImVec2((float)display_w / (float)w, (float)display_h / (float)h); + ImGui_ImplGlfw_UpdateMainWindowOrigin(); ImGui_ImplGlfw_UpdateMonitors(); // Setup time step @@ -1148,7 +1155,7 @@ static void ImGui_ImplGlfw_CreateWindow(ImGuiViewport* viewport) #elif defined(__APPLE__) viewport->PlatformHandleRaw = (void*)glfwGetCocoaWindow(vd->Window); #endif - glfwSetWindowPos(vd->Window, (int)viewport->Pos.x, (int)viewport->Pos.y); + glfwSetWindowPos(vd->Window, (int)(viewport->Pos.x + bd->MainWindowOrigin.x), (int)(viewport->Pos.y + bd->MainWindowOrigin.y)); // Install GLFW callbacks for secondary viewports glfwSetWindowFocusCallback(vd->Window, ImGui_ImplGlfw_WindowFocusCallback); @@ -1234,17 +1241,40 @@ static void ImGui_ImplGlfw_ShowWindow(ImGuiViewport* viewport) static ImVec2 ImGui_ImplGlfw_GetWindowPos(ImGuiViewport* viewport) { + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); ImGui_ImplGlfw_ViewportData* vd = (ImGui_ImplGlfw_ViewportData*)viewport->PlatformUserData; int x = 0, y = 0; glfwGetWindowPos(vd->Window, &x, &y); - return ImVec2((float)x, (float)y); + return ImVec2((float)x - bd->MainWindowOrigin.x, (float)y - bd->MainWindowOrigin.y); } static void ImGui_ImplGlfw_SetWindowPos(ImGuiViewport* viewport, ImVec2 pos) { + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); ImGui_ImplGlfw_ViewportData* vd = (ImGui_ImplGlfw_ViewportData*)viewport->PlatformUserData; vd->IgnoreWindowPosEventFrame = ImGui::GetFrameCount(); - glfwSetWindowPos(vd->Window, (int)pos.x, (int)pos.y); + glfwSetWindowPos(vd->Window, (int)(pos.x + bd->MainWindowOrigin.x), (int)(pos.y + bd->MainWindowOrigin.y)); +} + +// MaSzyna: with multi-viewports imgui positions are given relative to the main window of the simulator instead of the desktop, +// so the main viewport stays at (0,0) as it was without them: the simulator draws its overlays and reads the mouse in the +// coordinates of its window. When the main window moves, the windows of the other viewports are read again in the new space. +static void ImGui_ImplGlfw_UpdateMainWindowOrigin() +{ + ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); + ImVec2 origin(0.0f, 0.0f); + if (ImGui::GetIO().ConfigFlags & ImGuiConfigFlags_ViewportsEnable) + { + int x = 0, y = 0; + glfwGetWindowPos(bd->Window, &x, &y); + origin = ImVec2((float)x, (float)y); + } + if (origin.x == bd->MainWindowOrigin.x && origin.y == bd->MainWindowOrigin.y) + return; + bd->MainWindowOrigin = origin; + ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO(); + for (int i = 1; i < platform_io.Viewports.Size; i++) + platform_io.Viewports[i]->PlatformRequestMove = true; } static ImVec2 ImGui_ImplGlfw_GetWindowSize(ImGuiViewport* viewport) diff --git a/utilities/Globals.cpp b/utilities/Globals.cpp index 2cf5235c5..b4f2e14be 100644 --- a/utilities/Globals.cpp +++ b/utilities/Globals.cpp @@ -784,6 +784,12 @@ bool global_settings::ConfigParseUI(cParser& Parser, const std::string& token) return true; } + if (token == "ui.viewports") + { + ParseOne(Parser, ui_viewports, 1); + return true; + } + if (token == "gui.defaultwindows") { ParseOne(Parser, gui_defaultwindows, 1); @@ -1670,6 +1676,7 @@ global_settings::export_as_text( std::ostream &Output ) const { << UITextColor.g * 255 << " " << UITextColor.b * 255 << "\n"; export_as_text( Output, "ui.bg.opacity", UIBgOpacity ); + export_as_text( Output, "ui.viewports", ui_viewports ); export_as_text( Output, "input.gamepad", InputGamepad ); #ifdef WITH_UART if( uart_conf.enable ) { diff --git a/utilities/Globals.h b/utilities/Globals.h index f65fbc2cc..08707d8c3 100644 --- a/utilities/Globals.h +++ b/utilities/Globals.h @@ -306,6 +306,7 @@ struct global_settings { float ui_fontsize = 13.0f; float ui_scale = 1.0f; + bool ui_viewports = true; // panels of the ui can be dragged out of the simulator window, into windows of their own float map_highlight_distance = 3000.0f; From c186b82e5a7af19e248d133254d60a8d0f3d6181 Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 8 Oct 2026 21:05:16 +0200 Subject: [PATCH 172/430] lay track - better visual info about curvature --- application/editormodetrack.cpp | 79 +++++++++++++++++++++++++++++++-- lang/editor_pl.po | 6 +++ 2 files changed, 82 insertions(+), 3 deletions(-) diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 74e7d8f08..53a9b8662 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -47,6 +47,21 @@ using geometry::signed_angle; using geometry::turned; using geometry::arc_pieces; +double piece_plan_radius(segment_data const &Path) +{ + if (std::abs(Path.radius) > 0.5f) + return std::abs(Path.radius); + bezier const curve{Path}; + auto const begin{plan_of(curve.first(0.0))}; + auto const finish{plan_of(curve.first(1.0))}; + if (glm::length(begin) < 1e-9 || glm::length(finish) < 1e-9) + return 0.0; + auto const turn{std::abs(signed_angle(begin, finish))}; + if (turn < 1e-4) + return 0.0; + return curve.plan_length() / turn; +} + std::string describe(editor_track::straight const &Line) { return format("L %.2f m az %.4f deg i %.2f per mille %zu paths", Line.length, Line.azimuth, Line.grade * 1000.0, Line.tracks.size()); @@ -3436,7 +3451,7 @@ std::vector editor_mode::track_key_hints(bool const All) hints = {{"LMB", "start of the new track, on the ground or at a free end"}, {"Drag from a free end", "straight along it, to another free end: a curve joining them"}, {"Esc", "stop laying"}}; else { - hints = {{"LMB", "next point, a curve goes at it"}, {"LMB on a free end", "join and lay"}, {"Enter", "lay up to the cursor"}, {"Backspace", "take back the point"}, {"Esc", "cancel"}}; + hints = {{"LMB", m_lay.points.size() == 1 ? "end of the straight, or a vertex of a curve" : "next vertex of the curve"}, {"LMB on a free end", "join and lay"}, {"Enter", "lay up to the cursor"}, {"Backspace", "take back the point"}, {"Esc", "cancel"}}; if (glm::dvec2 heading; lay_heading(heading)) hints.insert(hints.begin() + 1, {"Shift", "straight on in the direction of the track"}); } @@ -3572,7 +3587,22 @@ std::string editor_mode::track_readout() const if (lay.points.empty()) text = lay.mouse_snap.track != nullptr ? "starts at the end of " + name(lay.mouse_snap.track) : "start"; else if (false == lay.preview.empty()) - text = format("L %.1f m R %.0f m %zu paths", lay.preview_length, lay.radius, lay.preview.size()); + { + double radius{0.0}; + bool straight{false}; + for (auto const &piece : lay.preview) + { + auto const r{piece_plan_radius(piece)}; + if (r < 0.5) + straight = true; + else if (radius == 0.0 || r < radius) + radius = r; + } + if (radius > 0.0) + text = straight ? format("L %.1f m %s + R %.0f m", lay.preview_length, STR_C("straight"), radius) : format("L %.1f m R %.0f m", lay.preview_length, radius); + else + text = format("L %.1f m %s", lay.preview_length, STR_C("straight")); + } if (false == lay.points.empty() && lay.mouse_snap.track != nullptr) text += "\njoins " + name(lay.mouse_snap.track); if (false == lay.preview_error.empty()) @@ -5025,8 +5055,51 @@ void editor_mode::draw_build_overlay() const if (m_lay.active) { auto const &lay{m_lay}; + auto const piece_colour = [&](segment_data const &Path) { + if (false == lay.preview_error.empty()) + return overlay_color::invalid; + return piece_plan_radius(Path) < 0.5 ? IM_COL32(255, 255, 255, 230) : overlay_color::marked; + }; for (auto const &piece : lay.preview) - drawpath(piece, lay.preview_error.empty() ? overlay_color::marked : overlay_color::grip); + drawpath(piece, piece_colour(piece)); + for (std::size_t i = 0, n = lay.preview.size(); i < n;) + { + auto const radius{piece_plan_radius(lay.preview[i])}; + bool const curved{radius >= 0.5}; + std::size_t j{i + 1}; + double length{bezier{lay.preview[i]}.plan_length()}; + double sharpest{radius}; + for (; j < n; ++j) + { + auto const next{piece_plan_radius(lay.preview[j])}; + if ((next >= 0.5) != curved) + break; + length += bezier{lay.preview[j]}.plan_length(); + if (curved && next < sharpest) + sharpest = next; + } + double along{0.0}; + glm::dvec3 middle{bezier{lay.preview[i]}.point(0.5)}; + for (std::size_t k = i; k < j; ++k) + { + auto const piece{bezier{lay.preview[k]}.plan_length()}; + if (along + piece >= length * 0.5) + { + middle = bezier{lay.preview[k]}.point(piece > 1e-6 ? std::clamp((length * 0.5 - along) / piece, 0.0, 1.0) : 0.5); + break; + } + along += piece; + } + ImVec2 screen; + if (projection.project(middle, screen)) + { + auto const label{curved ? format("R %.0f", sharpest) : std::string{STR_C("straight")}}; + auto const size{ImGui::CalcTextSize(label.c_str())}; + drawlist->AddRectFilled(ImVec2(screen.x + 6.0f, screen.y - 8.0f), ImVec2(screen.x + 14.0f + size.x, screen.y + 8.0f), IM_COL32(0, 0, 0, 180), 3.0f); + drawlist->AddText(ImVec2(screen.x + 10.0f, screen.y - 8.0f), curved ? overlay_color::marked : overlay_color::highlight, label.c_str()); + } + i = j; + } for (std::size_t i = 0; i + 1 < lay.points.size(); ++i) projection.line(drawlist, lay.points[i], lay.points[i + 1], IM_COL32(255, 255, 255, 90), 1.0f); for (auto const &point : lay.points) diff --git a/lang/editor_pl.po b/lang/editor_pl.po index 510d5c9b1..ab86dfc64 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -29,6 +29,12 @@ msgstr "Pokaż inspektor" msgid "The curve can't be read from this path, edit it as a single path" msgstr "Z tego odcinka nie da się odczytać łuku, edytuj go jako pojedynczy odcinek" +msgid "end of the straight, or a vertex of a curve" +msgstr "koniec prostej albo wierzchołek łuku" + +msgid "next vertex of the curve" +msgstr "kolejny wierzchołek łuku" + msgid "Laying track: LMB adds the points" msgstr "Układanie toru: LPM dodaje punkty" From 60c7250683b00d541c0f868231a2a82bc21b4c82 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Thu, 8 Oct 2026 21:39:31 +0200 Subject: [PATCH 173/430] feat(editor): docked layout: windows of the editor docked around the 3d view (dockspace over the main window, default layout built when there's none or on Mode windows > Reset window layout), menu shown all the time, toolbar with the edit modes, track and road windows, gizmo operations and the top view, status bar with the outcome of the last operation and the selected node; dockspace submitted also when the frame was started by the ui of another mode, so docked windows don't come undocked on the change of mode; stable ids of the editor windows, no auto resize of the dockable ones; hints of the track and road tools placed in the part of the window the 3d view is seen in; Polish translation --- application/editormode.cpp | 52 ++++++++++++++++- application/editormode.h | 2 + application/editormodegauge.cpp | 2 +- application/editormoderoad.cpp | 3 +- application/editormodetrack.cpp | 12 ++-- application/editoruilayer.cpp | 99 +++++++++++++++++++++++++++++++++ application/editoruilayer.h | 22 ++++++++ application/editoruipanels.cpp | 2 +- application/uilayer.cpp | 16 +++++- application/uilayer.h | 4 ++ lang/editor_pl.po | 6 ++ 11 files changed, 205 insertions(+), 15 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index adfb13408..73493be03 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -487,6 +487,7 @@ editor_mode::editor_mode() { // the area fill settings live in the node bank window, in the tab of the fill mode ui()->set_fill_options([this]() { render_area_fill(); }); ui()->set_gizmo_options([this]() { render_gizmo_options(); }); + ui()->set_toolbar_options([this]() { render_toolbar(); }); ui()->set_array_options([this]() { render_array(); }); ui()->set_bend_options([this]() { render_bend(); }); ui()->set_file_actions([this]() { save(); }, [this]() { export_scenery(); }); @@ -1423,7 +1424,7 @@ bool editor_mode::update() void editor_mode::render_settings() { - ImGui::Begin(STR_C("Editor Settings"), &m_settings_open, ImGuiWindowFlags_AlwaysAutoResize); + ImGui::Begin((std::string(STR_C("Editor Settings")) + "###editorsettings").c_str(), &m_settings_open); if (ImGui::BeginTabBar("##editorsettings")) { @@ -2964,7 +2965,7 @@ void editor_mode::render_orthophoto_window() if (false == m_orthophoto_window) return; ImGui::SetNextWindowSize(ImVec2(430.0f, 0.0f), ImGuiCond_FirstUseEver); - if (ImGui::Begin(STR_C("Orthophoto##window"), &m_orthophoto_window, ImGuiWindowFlags_AlwaysAutoResize)) + if (ImGui::Begin((std::string(STR_C("Orthophoto##window")) + "###orthophoto").c_str(), &m_orthophoto_window)) render_orthophoto_ui(); ImGui::End(); } @@ -3623,6 +3624,51 @@ void editor_mode::render_array() ImGui::PopID(); } +void editor_mode::render_toolbar() +{ + // edit modes of the node bank, each of them takes the mouse over from the track window + std::pair const modes[] = { + {STR_C("Select"), nodebank_panel::MODIFY}, {STR_C("Insert"), nodebank_panel::ADD}, {STR_C("Brush"), nodebank_panel::BRUSH}, {STR_C("Area fill"), nodebank_panel::FILL}, {STR_C("Copy to bank"), nodebank_panel::COPY}}; + for (auto const &mode : modes) + { + if (ImGui::MenuItem(mode.first, nullptr, ui()->mode() == mode.second)) + { + m_track_window_open = false; + ui()->set_mode(mode.second); + } + } + ImGui::Separator(); + if (ImGui::MenuItem(STR_C("Tracks"), nullptr, m_track_window_open)) + { + if (m_track_window_open) + m_track_window_open = false; + else + show_track_tab(m_track_tab); + } + if (ImGui::MenuItem("Roads", nullptr, m_roadtool.window)) + { + m_roadtool.window = !m_roadtool.window; + if (m_roadtool.window) + m_track_window_open = false; + } + ImGui::Separator(); + if (m_gizmo_enabled) + { + std::pair const operations[] = { + {STR_C("Translate (Q)"), gizmo_operation::translate}, {STR_C("Rotate (W)"), gizmo_operation::rotate}, {STR_C("Scale (E)"), gizmo_operation::scale}}; + for (auto const &operation : operations) + { + if (ImGui::MenuItem(operation.first, nullptr, m_gizmo_op == operation.second)) + m_gizmo_op = operation.second; + } + if (m_gizmo_op != gizmo_operation::scale && ImGui::MenuItem(STR_C("Local space (R)"), nullptr, m_gizmo_local)) + m_gizmo_local = !m_gizmo_local; + ImGui::Separator(); + } + if (ImGui::MenuItem(STR_C("Top view, orthographic (O)"), nullptr, Global.EditorOrtho)) + toggle_ortho(); +} + void editor_mode::render_gizmo_options() { if (ImGui::Button(Global.EditorOrtho ? "3D view (O)" : "Top view, orthographic (O)")) @@ -4585,7 +4631,7 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const void editor_mode::render_change_history(){ - ImGui::Begin(STR_C("Editor History"), &m_change_history, ImGuiWindowFlags_AlwaysAutoResize); + ImGui::Begin((std::string(STR_C("Editor History")) + "###editorhistory").c_str(), &m_change_history); int maxsize = m_max_history_size; if (ImGui::InputInt(STR_C("Max history size"), &maxsize)) { diff --git a/application/editormode.h b/application/editormode.h index 95e9bc8fc..9e14f293a 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -425,6 +425,8 @@ class editor_mode : public application_mode, private editor_track::observer void render_gizmo(); // gizmo settings, drawn in the toolset window void render_gizmo_options(); + // edit modes, editor windows and gizmo settings in the toolbar under the menu + void render_toolbar(); bool m_gizmo_enabled{true}; // master switch for the in-viewport gizmo bool m_gizmo_using{false}; // tracks an ongoing drag, so a single undo snapshot is taken per drag bool m_gizmo_local{false}; // manipulate in the object's local space instead of world space diff --git a/application/editormodegauge.cpp b/application/editormodegauge.cpp index 2f64fb42d..6d6883a0a 100644 --- a/application/editormodegauge.cpp +++ b/application/editormodegauge.cpp @@ -708,7 +708,7 @@ void editor_mode::render_gauge_window() if (false == m_gauge.open) return; ImGui::SetNextWindowSize(ImVec2(380.0f, 420.0f), ImGuiCond_FirstUseEver); - if (false == ImGui::Begin(STR_C("Structure gauge"), &m_gauge.open)) + if (false == ImGui::Begin((std::string(STR_C("Structure gauge")) + "###structuregauge").c_str(), &m_gauge.open)) { ImGui::End(); return; diff --git a/application/editormoderoad.cpp b/application/editormoderoad.cpp index d66b6bcb2..c7e7051c9 100644 --- a/application/editormoderoad.cpp +++ b/application/editormoderoad.cpp @@ -2834,8 +2834,7 @@ void editor_mode::draw_road_overlay() const "LMB: select a piece, a junction, a point (white dot) or a marker"; } // shown above the place the track tools put their hints at - ImGuiIO const &io = ImGui::GetIO(); - ImVec2 const position{12.0f, io.DisplaySize.y - 56.0f}; + ImVec2 const position{editor_ui::view_min().x + 12.0f, editor_ui::view_max().y - 56.0f}; auto const size{ImGui::CalcTextSize(hint.c_str())}; drawlist->AddRectFilled(ImVec2(position.x - 6.0f, position.y - 4.0f), ImVec2(position.x + size.x + 6.0f, position.y + size.y + 4.0f), IM_COL32(0, 0, 0, 150), 4.0f); drawlist->AddText(position, IM_COL32(255, 255, 255, 230), hint.c_str()); diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 761b36abe..8d9f8a725 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -3657,8 +3657,10 @@ void editor_mode::draw_track_hints() auto hints{track_key_hints(false)}; if (hints.size() > 4) hints.resize(4); - auto const bottom{io.DisplaySize.y}; - auto const available{io.DisplaySize.x * 0.6f - 2.0f * margin}; + // in the part of the window the 3d view is seen in, between the docked windows + auto const left{editor_ui::view_min().x + margin}; + auto const bottom{editor_ui::view_max().y}; + auto const available{(editor_ui::view_max().x - editor_ui::view_min().x) * 0.6f - 2.0f * margin}; auto const mode{track_mode_name()}; std::vector> lines(1); float used{ImGui::CalcTextSize(mode.c_str()).x + 2.0f * pad + gap}; @@ -3679,13 +3681,13 @@ void editor_mode::draw_track_hints() float width{i == 0 ? ImGui::CalcTextSize(mode.c_str()).x + 2.0f * pad : 0.0f}; for (auto const *hint : lines[i]) width += (width > 0.0f ? gap : 0.0f) + width_of(*hint); - drawlist->AddRectFilled(ImVec2(margin - 6.0f, y - pad - 2.0f), ImVec2(margin + width + 6.0f, y + lineheight - pad - 2.0f), IM_COL32(0, 0, 0, 160), 4.0f); - auto x{margin}; + drawlist->AddRectFilled(ImVec2(left - 6.0f, y - pad - 2.0f), ImVec2(left + width + 6.0f, y + lineheight - pad - 2.0f), IM_COL32(0, 0, 0, 160), 4.0f); + auto x{left}; if (i == 0) x += chip(ImVec2(x, y), mode.c_str(), IM_COL32(60, 140, 230, 235), IM_COL32(255, 255, 255, 255)); for (auto const *hint : lines[i]) { - if (x > margin) + if (x > left) x += gap; x += chip(ImVec2(x, y), hint->key, IM_COL32(255, 210, 60, 220), IM_COL32(20, 20, 20, 255)) + 5.0f; drawlist->AddText(ImVec2(x, y), IM_COL32(255, 255, 255, 230), hint->action.c_str()); diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index 4f7ede62c..dc38b282e 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -16,6 +16,10 @@ http://mozilla.org/MPL/2.0/. #include "scene/scenelayers.h" #include "rendering/renderer.h" #include "utilities/translation.h" +#include "imgui/imgui_internal.h" + +glm::vec2 editor_ui::m_viewmin{0.0f}; +glm::vec2 editor_ui::m_viewmax{0.0f}; editor_ui::editor_ui() { @@ -29,6 +33,98 @@ editor_ui::editor_ui() m_nodebankpanel.mode_options = [this](nodebank_panel::edit_mode const Mode) { render_mode_options(Mode); }; m_nodebankpanel.header_sections = [this]() { render_header_sections(); }; + // the menu is a part of the layout of the editor, not a pop-up as in the driver mode + m_menu_always = true; +} + +void editor_ui::render_dockspace() +{ + // windows of the editor are docked around the 3d view, which is left free in the middle + auto *viewport{ImGui::GetMainViewport()}; + auto const dockspace{ImGui::GetID("###editordockspace")}; + if (m_layoutreset || ImGui::DockBuilderGetNode(dockspace) == nullptr) + { + m_layoutreset = false; + build_default_layout(dockspace); + } + ImGui::DockSpaceOverViewport(dockspace, viewport, ImGuiDockNodeFlags_PassthruCentralNode); + if (auto const *central{ImGui::DockBuilderGetCentralNode(dockspace)}; central != nullptr) + { + m_viewmin = {central->Pos.x, central->Pos.y}; + m_viewmax = {central->Pos.x + central->Size.x, central->Pos.y + central->Size.y}; + } + else + { + m_viewmin = {viewport->WorkPos.x, viewport->WorkPos.y}; + m_viewmax = {viewport->WorkPos.x + viewport->WorkSize.x, viewport->WorkPos.y + viewport->WorkSize.y}; + } +} + +void editor_ui::build_default_layout(unsigned int const Dockspace) +{ + auto *viewport{ImGui::GetMainViewport()}; + ImGui::DockBuilderRemoveNode(Dockspace); + ImGui::DockBuilderAddNode(Dockspace, ImGuiDockNodeFlags_DockSpace | ImGuiDockNodeFlags_PassthruCentralNode); + ImGui::DockBuilderSetNodePos(Dockspace, viewport->WorkPos); + ImGui::DockBuilderSetNodeSize(Dockspace, viewport->WorkSize); + // widths in pixels the current windows need, as parts of the room there is + auto const width{std::max(viewport->WorkSize.x, 1.0f)}; + auto const height{std::max(viewport->WorkSize.y, 1.0f)}; + auto const left_width{std::min(440.0f * Global.ui_scale, width * 0.3f)}; + auto const right_width{std::min(460.0f * Global.ui_scale, width * 0.3f)}; + auto const bottom_height{std::min(300.0f * Global.ui_scale, height * 0.35f)}; + ImGuiID center{Dockspace}; + auto const left{ImGui::DockBuilderSplitNode(center, ImGuiDir_Left, left_width / width, nullptr, ¢er)}; + auto const right{ImGui::DockBuilderSplitNode(center, ImGuiDir_Right, right_width / (width - left_width), nullptr, ¢er)}; + auto const bottom{ImGui::DockBuilderSplitNode(center, ImGuiDir_Down, bottom_height / height, nullptr, ¢er)}; + // windows are found by the stable part of their names, after ### + for (auto const *window : {"###Toolset", "###Layers", "###scenehierarchy"}) + ImGui::DockBuilderDockWindow(window, left); + for (auto const *window : {"###trackinspector", "###roadeditor", "###editorsettings", "###Include database", "###orthophoto", "###structuregauge"}) + ImGui::DockBuilderDockWindow(window, right); + for (auto const *window : {"###profilestrip", "###editorhistory", "###modelsets"}) + ImGui::DockBuilderDockWindow(window, bottom); + ImGui::DockBuilderFinish(Dockspace); +} + +void editor_ui::render_() +{ + auto *viewport{ImGui::GetMainViewport()}; + auto const flags{ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_MenuBar}; + // toolbar under the menu: the tools of the editor mode + if (ImGui::BeginViewportSideBar("##editortoolbar", viewport, ImGuiDir_Up, ImGui::GetFrameHeight(), flags)) + { + if (ImGui::BeginMenuBar()) + { + if (m_toolbaroptions) + m_toolbaroptions(); + ImGui::EndMenuBar(); + } + } + ImGui::End(); + // status bar: the outcome of the last operation, and the selected node + if (ImGui::BeginViewportSideBar("##editorstatusbar", viewport, ImGuiDir_Down, ImGui::GetFrameHeight(), flags)) + { + if (ImGui::BeginMenuBar()) + { + if (false == m_layerspanel.status.empty()) + { + if (m_layerspanel.status_error) + ImGui::TextColored(ImVec4(1.0f, 0.45f, 0.4f, 1.0f), "%s", m_layerspanel.status.c_str()); + else + ImGui::TextUnformatted(m_layerspanel.status.c_str()); + } + if (m_node != nullptr) + { + auto const name{m_node->name().empty() ? std::string{"(none)"} : m_node->name()}; + auto const label{std::string{STR_C("Selected:")} + " " + name}; + ImGui::SameLine(std::max(ImGui::GetCursorPosX(), ImGui::GetWindowWidth() - ImGui::CalcTextSize(label.c_str()).x - ImGui::GetStyle().ItemSpacing.x * 2.0f)); + ImGui::TextUnformatted(label.c_str()); + } + ImGui::EndMenuBar(); + } + } + ImGui::End(); } // updates state of UI elements @@ -157,6 +253,9 @@ void editor_ui::render_menu_contents() if (ImGui::BeginMenu(STR_C("Mode windows"))) { + if (ImGui::MenuItem(STR_C("Reset window layout"))) + m_layoutreset = true; + ImGui::Separator(); ImGui::MenuItem(STR_C("Toolset"), nullptr, &m_nodebankpanel.is_open); ImGui::MenuItem(STR_C("Layers"), nullptr, &m_layerspanel.is_open); ImGui::MenuItem(STR_C("Include database"), nullptr, &m_includespanel.is_open); diff --git a/application/editoruilayer.h b/application/editoruilayer.h index f390d9324..a1d4cd351 100644 --- a/application/editoruilayer.h +++ b/application/editoruilayer.h @@ -61,6 +61,11 @@ class editor_ui : public ui_layer { m_menuoptions = std::move(Renderer); } + // draws the tools of the editor mode in the toolbar under the menu + void set_toolbar_options(std::function Renderer) + { + m_toolbaroptions = std::move(Renderer); + } // draws the gizmo settings in the toolset window (the gizmo state lives in the editor mode) void set_gizmo_options(std::function Renderer) { @@ -83,6 +88,15 @@ class editor_ui : public ui_layer void set_file_actions(std::function Save, std::function Export); void set_new_scenery(std::function New) { m_newscenery = std::move(New); } void set_open_scenery(std::function Open) { m_openscenery = std::move(Open); } + // part of the main window between the docked windows, where the 3d view is seen; for the overlays placed in it + static glm::vec2 view_min() + { + return m_viewmin; + } + static glm::vec2 view_max() + { + return m_viewmax; + } // shows outcome of an operation in the layers window void set_status(std::string const &Status, bool const Error = false); @@ -91,6 +105,10 @@ class editor_ui : public ui_layer void render_mode_options(nodebank_panel::edit_mode const Mode); void render_header_sections(); void render_menu_contents() override; + void render_dockspace() override; + void render_() override; + // docks the windows of the editor in their default places + void build_default_layout(unsigned int const Dockspace); // members itemproperties_panel m_itempropertiespanel{"Node Properties", true}; // not a window of its own, drawn in the toolset window functions_panel m_functionspanel{"Functions", true}; // not a window of its own, its settings are drawn in the toolset tabs @@ -106,6 +124,10 @@ class editor_ui : public ui_layer model_set_ref m_insertset; std::function m_filloptions; std::function m_menuoptions; + std::function m_toolbaroptions; + bool m_layoutreset{false}; // the default layout is to be built again on the next frame + static glm::vec2 m_viewmin; + static glm::vec2 m_viewmax; std::function m_gizmooptions; std::function m_arrayoptions; std::function m_bendoptions; diff --git a/application/editoruipanels.cpp b/application/editoruipanels.cpp index 6eae78db1..a36072eda 100644 --- a/application/editoruipanels.cpp +++ b/application/editoruipanels.cpp @@ -892,7 +892,7 @@ void nodebank_panel::open_sets_window(int const Setid) void nodebank_panel::render_sets_window() { ImGui::SetNextWindowSize(ImVec2S(600, 380), ImGuiCond_FirstUseEver); - if (false == ImGui::Begin(STR_C("Model sets"), &m_setsopen, ImGuiWindowFlags_NoCollapse)) + if (false == ImGui::Begin((std::string(STR_C("Model sets")) + "###modelsets").c_str(), &m_setsopen, ImGuiWindowFlags_NoCollapse)) { ImGui::End(); return; diff --git a/application/uilayer.cpp b/application/uilayer.cpp index 4f9490545..0d99ae53b 100644 --- a/application/uilayer.cpp +++ b/application/uilayer.cpp @@ -460,6 +460,13 @@ void ui_layer::update() void ui_layer::render() { + // the frame may have been started by the ui of another mode, when the mode changes; the windows docked in the dockspace + // of this one would come undocked if they were drawn in a frame without it + if (m_dockspaceframe != ImGui::GetFrameCount()) + { + render_dockspace(); + m_dockspaceframe = ImGui::GetFrameCount(); + } render_background(); render_panels(); render_tooltip(); @@ -490,6 +497,8 @@ void ui_layer::render_internal() void ui_layer::begin_ui_frame() { begin_ui_frame_internal(); + render_dockspace(); + m_dockspaceframe = ImGui::GetFrameCount(); } void ui_layer::begin_ui_frame_internal() @@ -520,8 +529,9 @@ void ui_layer::render_hierarchy(){ if(!m_editor_hierarchy) return; - ImGui::SetNextWindowSize(ImVec2(0, 0)); - ImGui::Begin(STR_C("Scene Hierarchy"), &m_editor_hierarchy, ImGuiWindowFlags_AlwaysAutoResize); + // fitted to the contents when it first appears; no auto resize, which a docked window can't do + ImGui::SetNextWindowSize(ImVec2(0, 0), ImGuiCond_FirstUseEver); + ImGui::Begin((std::string(STR_C("Scene Hierarchy")) + "###scenehierarchy").c_str(), &m_editor_hierarchy); ImGui::Text("Registered nodes: %zu", scene::Hierarchy.size()); ImGui::BeginChild("hierarchy_list", ImVec2(500, 300), true); @@ -683,7 +693,7 @@ void ui_layer::render_menu() { glm::dvec2 mousepos = Global.cursor_pos; - if (!((Global.ControlPicking && mousepos.y < 50.0f) || m_imguiio->WantCaptureMouse) || m_suppress_menu) + if (m_suppress_menu || (false == m_menu_always && !((Global.ControlPicking && mousepos.y < 50.0f) || m_imguiio->WantCaptureMouse))) return; if (ImGui::BeginMainMenuBar()) diff --git a/application/uilayer.h b/application/uilayer.h index 975c1c773..96cd407b9 100644 --- a/application/uilayer.h +++ b/application/uilayer.h @@ -139,6 +139,8 @@ protected: virtual void render_menu_contents(); ui_log_panel m_logpanel { "Log", true }; bool m_suppress_menu = false; // if `true`, the menu at the top of the window will not be present + bool m_menu_always = false; // if `true`, the menu is shown all the time, not only when the mouse is at the top of the window + int m_dockspaceframe{-1}; // frame the dockspace was last submitted in // progress bar config float m_progress { 0.0f }; // percentage of filled progres bar, to indicate lengthy operations. float m_subtaskprogress{ 0.0f }; // percentage of filled progres bar, to indicate lengthy operations. @@ -148,6 +150,8 @@ protected: // methods // render() subclass details virtual void render_() {} + // submitted right after the start of the frame, before any window that may be docked in it + virtual void render_dockspace() {} // draws background quad with specified earlier texture void render_background(); void render_tooltip(); diff --git a/lang/editor_pl.po b/lang/editor_pl.po index 03c7c4b6a..75c50c410 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -4593,3 +4593,9 @@ msgstr "Głowica na bramkę wisi nad osią toru tak wysoko nad główkami szyn" msgid " not read" msgstr " nieodczytywany" + +msgid "Reset window layout" +msgstr "Przywróć układ okien" + +msgid "Selected:" +msgstr "Zaznaczono:" From 4d7f5f0f0cacb08b707538a96be5833260a48209 Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 8 Oct 2026 21:56:28 +0200 Subject: [PATCH 174/430] move parallel track to lay and selection --- application/editormode.cpp | 2 +- application/editormode.h | 9 ++ application/editormodeparallel.cpp | 174 +++++++++++++++++++++++++++-- application/editormodetrack.cpp | 7 +- application/editormodetrackux.cpp | 8 +- lang/editor_pl.po | 52 ++++++++- 6 files changed, 233 insertions(+), 19 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 98dfd14b5..1ad547512 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -1361,9 +1361,9 @@ bool editor_mode::update() signal_move_update(); draw_signal_overlay(); } + draw_parallel_preview(); if (m_track_tab == track_tab::lineside) { - draw_parallel_preview(); draw_hekto_overlay(); draw_fouling_overlay(); draw_vehicle_marker(); diff --git a/application/editormode.h b/application/editormode.h index 95e9bc8fc..dd36eff4f 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -1022,6 +1022,9 @@ class editor_mode : public application_mode, private editor_track::observer int built_side{0}; int built_scope{-1}; std::size_t built_history{0}; + TTrack *pair_src{nullptr}; + TTrack *pair_dst{nullptr}; + double measured{0.0}; std::vector pieces; std::vector styles; double length{0.0}; @@ -1029,9 +1032,15 @@ class editor_mode : public application_mode, private editor_track::observer std::string status; }; parallel_tool m_parallel; + TTrack *parallel_source() const; + TTrack *parallel_target() const; void parallel_update(); + void render_parallel_controls(bool const Scope = true); void render_parallel_ui(); + void render_parallel_set_ui(); void parallel_build(); + void parallel_apply(); + bool parallel_preview_visible() const; void draw_parallel_preview() const; // scenery templates standing by the track, placed and checked by the editor diff --git a/application/editormodeparallel.cpp b/application/editormodeparallel.cpp index 7eaa92f43..a905c45de 100644 --- a/application/editormodeparallel.cpp +++ b/application/editormodeparallel.cpp @@ -34,6 +34,11 @@ using geometry::plan_of; double const kParallelReach{5000.0}; // m each way along the line double const kSpacings[] = {3.5, 4.0, 4.5, 4.75, 5.0, 6.0}; +std::string name_of(TTrack const &Track) +{ + return Track.name().empty() ? std::string{"(noname)"} : Track.name(); +} + segment_data reversed(segment_data const &Path) { segment_data result{Path}; @@ -78,12 +83,61 @@ glm::dvec2 direction(segment_data const &Path, bool const Atend) return glm::length(along) > 1e-9 ? glm::normalize(along) : glm::dvec2{0.0, 1.0}; } +glm::dvec3 midpoint(TTrack const &Track) +{ + if (Track.m_paths.empty()) + return Track.location(); + bezier const curve{Track.m_paths.front()}; + return curve.point(0.5); +} + +// signed offset of Dst from Src, along Src's left normal; positive is the Left radio +double lateral_of(TTrack const &Src, TTrack const &Dst) +{ + if (Src.m_paths.empty()) + return 0.0; + auto const heading{direction(Src.m_paths.front(), false)}; + glm::dvec2 const left{-heading.y, heading.x}; + return glm::dot(plan_of(midpoint(Dst)) - plan_of(Src.m_paths.front().points[segment_data::point::start]), left); +} + } // namespace +TTrack *editor_mode::parallel_source() const +{ + if (m_track_set.size() >= 2) + return m_track_set.front(); + return selected_track(); +} + +TTrack *editor_mode::parallel_target() const +{ + if (m_track_set.size() != 2) + return nullptr; + return m_track_set.back() != m_track_set.front() ? m_track_set.back() : nullptr; +} + void editor_mode::parallel_update() { auto &tool{m_parallel}; - auto *track{selected_track()}; + auto *track{parallel_source()}; + auto *target{parallel_target()}; + if (track != tool.pair_src || target != tool.pair_dst) + { + tool.pair_src = track; + tool.pair_dst = target; + if (track != nullptr && target != nullptr) + { + auto const lateral{lateral_of(*track, *target)}; + tool.side = lateral >= 0.0 ? 1 : -1; + tool.measured = std::abs(lateral); + } + else + tool.measured = 0.0; + } + else if (track != nullptr && target != nullptr) + tool.measured = std::abs(lateral_of(*track, *target)); + if (track == tool.built_for && tool.spacing == tool.built_spacing && tool.side == tool.built_side && tool.scope == tool.built_scope && m_history.size() == tool.built_history) return; tool.built_for = track; @@ -176,13 +230,59 @@ void editor_mode::parallel_build() tool.built_for = nullptr; } -void editor_mode::render_parallel_ui() +void editor_mode::parallel_apply() { auto &tool{m_parallel}; - ImGui::TextDisabled("%s", STR_C("Second track alongside, curves included: radius R minus or plus the spacing,\nthe same transitions and cant, heights on the plane of the cant")); - ImGui::RadioButton(STR_C("This path"), &tool.scope, 0); - ImGui::SameLine(); - ImGui::RadioButton(STR_C("The line, up to the switches"), &tool.scope, 1); + auto *target{parallel_target()}; + parallel_update(); + if (target == nullptr || tool.pieces.empty()) + return; + if (tool.pieces.size() != 1) + { + tool.error = STR_C("Two selected paths: set the scope to this path, so the other takes its shape at the spacing"); + return; + } + std::string reason; + if (false == editor_track::can_edit_geometry(*target, reason)) + { + tool.error = reason; + return; + } + auto const joints{editor_track::joints(*target)}; + std::vector> states; + auto const remember = [&](TTrack *Track) { + if (Track == nullptr) + return; + if (std::any_of(states.begin(), states.end(), [&](auto const &Entry) { return Entry.first == Track; })) + return; + states.emplace_back(Track, editor_track::capture(*Track)); + }; + remember(target); + for (auto const &joint : joints) + remember(joint.other); + target->m_paths.front() = tool.pieces.front(); + editor_track::follow(*target, joints); + std::vector committed{target}; + for (auto const &joint : joints) + if (joint.other != nullptr) + committed.push_back(joint.other); + editor_track::commit(committed); + push_track_snapshot(std::move(states)); + tool.status = format(STR_C("%s set parallel to %s, %.2f m away; Ctrl+Z takes it back"), name_of(*target).c_str(), name_of(*parallel_source()).c_str(), tool.spacing); + WriteLog("Editor: " + tool.status, logtype::generic); + tool.built_for = nullptr; + straight_refresh(); +} + +void editor_mode::render_parallel_controls(bool const Scope) +{ + auto &tool{m_parallel}; + if (Scope) + { + ImGui::RadioButton(STR_C("This path"), &tool.scope, 0); + ImGui::SameLine(); + ImGui::RadioButton(STR_C("The line, up to the switches"), &tool.scope, 1); + } ImGui::RadioButton(STR_C("Left"), &tool.side, -1); ImGui::SameLine(); ImGui::RadioButton(STR_C("Right"), &tool.side, 1); @@ -197,23 +297,73 @@ void editor_mode::render_parallel_ui() if (ImGui::SmallButton(format("%.2f", spacing).c_str())) tool.spacing = spacing; } +} + +void editor_mode::render_parallel_ui() +{ + auto &tool{m_parallel}; + ImGui::TextDisabled("%s", STR_C("First select a straight path (LMB). Then a second track is laid beside it.\nAlong the line the curves are included: R minus or plus the spacing, same transitions and cant.")); + if (parallel_target() != nullptr) + ImGui::TextDisabled("%s", STR_C("Two paths selected: set the spacing of the other in Select. The first must be a straight.")); + else if (auto *source{parallel_source()}; source == nullptr) + ImGui::TextColored(ImVec4(1.0f, 0.8f, 0.3f, 1.0f), "%s", STR_C("First select a straight path in the view.")); + else if (source->eType != tt_Normal || false == editor_track::is_straight(*source, m_straights.tolerance)) + ImGui::TextColored(ImVec4(1.0f, 0.8f, 0.3f, 1.0f), "%s", STR_C("The selected path isn't a straight. Select a straight first.")); + render_parallel_controls(); parallel_update(); if (false == tool.error.empty()) ImGui::TextColored(ImVec4(1.0f, 0.5f, 0.3f, 1.0f), "%s", tool.error.c_str()); else if (false == tool.pieces.empty()) { - if (ImGui::Button(format(STR_C("Build %zu paths, %.1f m"), tool.pieces.size(), tool.length).c_str())) + if (ImGui::Button(format(STR_C("Lay %zu paths, %.1f m"), tool.pieces.size(), tool.length).c_str())) parallel_build(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("First select a straight. Creates a new track beside it; the selected path stays.")); } if (false == tool.status.empty()) ImGui::TextWrapped("%s", tool.status.c_str()); } +void editor_mode::render_parallel_set_ui() +{ + auto &tool{m_parallel}; + auto *source{parallel_source()}; + auto *target{parallel_target()}; + if (source == nullptr || target == nullptr) + return; + if (false == ImGui::CollapsingHeader(STR_C("Make parallel"), ImGuiTreeNodeFlags_DefaultOpen)) + return; + ImGui::TextWrapped("%s", STR_C("First selected must be a straight. It stays; the other is moved to this spacing.")); + ImGui::TextWrapped("%s", format(STR_C("%s stays. %s is moved to this spacing, taking its curves."), name_of(*source).c_str(), name_of(*target).c_str()).c_str()); + if (tool.measured > 0.05) + ImGui::TextDisabled("%s", format(lateral_of(*source, *target) >= 0.0 ? STR_C("Now %.2f m on the right") : STR_C("Now %.2f m on the left"), tool.measured).c_str()); + tool.scope = 0; + render_parallel_controls(false); + parallel_update(); + if (false == tool.error.empty()) + ImGui::TextColored(ImVec4(1.0f, 0.5f, 0.3f, 1.0f), "%s", tool.error.c_str()); + else if (false == tool.pieces.empty() && ImGui::Button(format(STR_C("Set %s to %.2f m"), name_of(*target).c_str(), tool.spacing).c_str())) + parallel_apply(); + if (false == tool.status.empty()) + ImGui::TextWrapped("%s", tool.status.c_str()); +} + +bool editor_mode::parallel_preview_visible() const +{ + if (m_parallel.pieces.empty() || parallel_source() != m_parallel.built_for) + return false; + if (m_track_tab == track_tab::lay) + return m_lay.points.empty(); + if (m_track_tab == track_tab::path) + return true; + return m_track_tab == track_tab::lineside && m_parallel.open; +} + void editor_mode::draw_parallel_preview() const { - auto const &tool{m_parallel}; - if (false == tool.open || tool.pieces.empty() || selected_track() != tool.built_for) + if (false == parallel_preview_visible()) return; + auto const &tool{m_parallel}; screen_projection const projection; auto *drawlist{ImGui::GetBackgroundDrawList()}; for (auto const &piece : tool.pieces) @@ -230,5 +380,11 @@ void editor_mode::draw_parallel_preview() const } ImVec2 screen; if (projection.project(tool.pieces.front().points[segment_data::point::start], screen)) + { drawlist->AddCircleFilled(screen, 5.0f, IM_COL32(90, 255, 120, 230)); + auto const label{format("%.2f m", tool.spacing)}; + auto const size{ImGui::CalcTextSize(label.c_str())}; + drawlist->AddRectFilled(ImVec2(screen.x + 8.0f, screen.y - 8.0f), ImVec2(screen.x + 16.0f + size.x, screen.y + 8.0f), IM_COL32(0, 0, 0, 180), 3.0f); + drawlist->AddText(ImVec2(screen.x + 12.0f, screen.y - 8.0f), IM_COL32(90, 255, 120, 255), label.c_str()); + } } diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 53a9b8662..59241a48b 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -586,7 +586,7 @@ std::array const &editor_mode::track_modes() {"Straight", "G", track_tab::straights, "The whole straight through the selected path: drag its ends or the middle, break it, shift it"}, {"Curve", "C", track_tab::route, "The line through the path, switch to switch: vertices with the radii, transitions and cant of the curves"}, {"Signals", "H", track_tab::signals, "Signals by the track, from the templates of the scenery, with the event the train reads them by"}, - {"Objects", "B", track_tab::lineside, "Along the track: hectometre posts, fouling point markers, a parallel track, a vehicle to drive"}, + {"Objects", "B", track_tab::lineside, "Along the track: hectometre posts, fouling point markers, a vehicle to drive"}, {"Profile", "P", track_tab::profile, "Vertical profile (grade line) along the line"}, {"Speed", "V", track_tab::speed, "Speed limits of the paths against the speed their geometry allows"}, {"Joints", "J", track_tab::joints, "Ends of the paths which almost meet, steps, kinks, jumps of the cant and of the grade at the joints"}, @@ -3448,7 +3448,7 @@ std::vector editor_mode::track_key_hints(bool const All) if (m_lay.active) { if (m_lay.points.empty()) - hints = {{"LMB", "start of the new track, on the ground or at a free end"}, {"Drag from a free end", "straight along it, to another free end: a curve joining them"}, {"Esc", "stop laying"}}; + hints = {{"LMB", "start of the new track, on the ground or at a free end"}, {"Drag from a free end", "straight along it, to another free end: a curve joining them"}, {"Parallel", "first select a straight, then a second track beside it in the panel"}, {"Esc", "stop laying"}}; else { hints = {{"LMB", m_lay.points.size() == 1 ? "end of the straight, or a vertex of a curve" : "next vertex of the curve"}, {"LMB on a free end", "join and lay"}, {"Enter", "lay up to the cursor"}, {"Backspace", "take back the point"}, {"Esc", "cancel"}}; @@ -4517,6 +4517,9 @@ void editor_mode::render_lay_ui() if (editor_track::can_edit_geometry(*track, reason)) render_extend_ui(); } + if (ImGui::CollapsingHeader(STR_C("Parallel track"), ImGuiTreeNodeFlags_DefaultOpen)) + render_parallel_ui(); + ImGui::Separator(); ImGui::PushItemWidth(120.0f); ImGui::DragScalar(STR_C("Curve radius (m)"), ImGuiDataType_Double, &tool.radius, 5.0f, nullptr, nullptr, "%.0f"); item_tooltip("Drag to change, Ctrl+click to type the value"); diff --git a/application/editormodetrackux.cpp b/application/editormodetrackux.cpp index 0de31ee49..cc1ab3633 100644 --- a/application/editormodetrackux.cpp +++ b/application/editormodetrackux.cpp @@ -627,11 +627,8 @@ void editor_mode::render_track_context() show_track_tab(track_tab::straights); if (ImGui::MenuItem(STR_C("Curve"), "C", false, normal)) show_track_tab(track_tab::route); - if (ImGui::MenuItem(STR_C("Parallel track"), nullptr, false, normal)) - { - show_track_tab(track_tab::lineside); - m_parallel.expand = true; - } + if (ImGui::MenuItem(STR_C("Parallel track"), "L", false, normal)) + show_track_tab(track_tab::lay); if (ImGui::MenuItem(STR_C("Place a vehicle here"))) { show_track_tab(track_tab::lineside); @@ -1209,6 +1206,7 @@ void editor_mode::render_track_set_ui() return; } ImGui::TextDisabled("%s", STR_C("The gizmo moves them together; Shift+LMB adds or takes out a path")); + render_parallel_set_ui(); if (ImGui::SmallButton(STR_C("Grow by the neighbours"))) track_set_grow(); if (ImGui::IsItemHovered()) diff --git a/lang/editor_pl.po b/lang/editor_pl.po index ab86dfc64..8a20acf36 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -2230,6 +2230,54 @@ msgstr "Nic nie dało się naprawić: to rozjazdy albo odcinki w plikach, który msgid "Parallel track" msgstr "Tor równoległy" +msgid "Parallel" +msgstr "Równoległy" + +msgid "First select a straight path (LMB). Then a second track is laid beside it.\nAlong the line the curves are included: R minus or plus the spacing, same transitions and cant." +msgstr "Najpierw zaznacz odcinek prosty (LPM). Potem drugi tor kładzie się obok.\nWzdłuż linii łuki wchodzą: R minus albo plus rozstaw, te same krzywe przejściowe i przechyłka." + +msgid "First select a straight path in the view." +msgstr "Najpierw zaznacz odcinek prosty w widoku." + +msgid "The selected path isn't a straight. Select a straight first." +msgstr "Zaznaczony odcinek nie jest prostą. Najpierw zaznacz prostą." + +msgid "First select a straight. Creates a new track beside it; the selected path stays." +msgstr "Najpierw zaznacz prostą. Tworzy nowy tor obok; zaznaczony odcinek zostaje." + +msgid "Two paths selected: set the spacing of the other in Select. The first must be a straight." +msgstr "Dwa odcinki zaznaczone: rozstaw drugiego ustawiasz w Wyborze. Pierwszy musi być prostą." + +msgid "First selected must be a straight. It stays; the other is moved to this spacing." +msgstr "Pierwszy zaznaczony musi być prostą. On zostaje; drugi jest przestawiany na ten rozstaw." + +msgid "Lay %zu paths, %.1f m" +msgstr "Ułóż %zu odcinków, %.1f m" + +msgid "first select a straight, then a second track beside it in the panel" +msgstr "najpierw zaznacz prostą, potem drugi tor obok niej w panelu" + +msgid "Make parallel" +msgstr "Ustaw równolegle" + +msgid "%s stays. %s is moved to this spacing, taking its curves." +msgstr "%s zostaje. %s jest przestawiany na ten rozstaw, z jego łukami." + +msgid "Now %.2f m on the right" +msgstr "Teraz %.2f m po prawej" + +msgid "Now %.2f m on the left" +msgstr "Teraz %.2f m po lewej" + +msgid "Set %s to %.2f m" +msgstr "Ustaw %s na %.2f m" + +msgid "%s set parallel to %s, %.2f m away; Ctrl+Z takes it back" +msgstr "%s ustawiony równolegle do %s, rozstaw %.2f m; Ctrl+Z cofa" + +msgid "Two selected paths: set the scope to this path, so the other takes its shape at the spacing" +msgstr "Dwa zaznaczone odcinki: zakres na ten odcinek, wtedy drugi bierze jego kształt w rozstawie" + msgid "Parallel track of %zu paths, %.1f m, %.2f m away; Ctrl+Z takes it back" msgstr "Tor równoległy z %zu odcinków, %.1f m, w rozstawie %.2f m; Ctrl+Z cofa" @@ -2674,8 +2722,8 @@ msgstr "Parzyste hektometry po prawej, nieparzyste po lewej" msgid "Objects" msgstr "Obiekty" -msgid "Along the track: hectometre posts, fouling point markers, a parallel track, a vehicle to drive" -msgstr "Przy torze: słupki hektometrowe, wskaźniki ukresu, tor równoległy, pojazd do jazdy" +msgid "Along the track: hectometre posts, fouling point markers, a vehicle to drive" +msgstr "Przy torze: słupki hektometrowe, wskaźniki ukresu, pojazd do jazdy" msgid "Model along the track: release where it ends" msgstr "Model wzdłuż toru: puść tam, gdzie się kończy" From 7618dcda594435cb08fd9a2f92fd6649c85feb0a Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 8 Oct 2026 21:59:36 +0200 Subject: [PATCH 175/430] hint parallel snap while shifting a straight --- application/editormode.h | 10 ++++ application/editormodetrack.cpp | 76 +++++++++++++++++++++++++------ application/editormodetrackux.cpp | 10 ++++ lang/editor_pl.po | 21 +++++++++ 4 files changed, 103 insertions(+), 14 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index dd36eff4f..8e459bdc5 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -617,6 +617,16 @@ class editor_mode : public application_mode, private editor_track::observer void apply_detour(); std::vector detour_outline() const; void find_neighbour_straights(); + // listed spacing of a neighbouring straight the line can snap to, if it is close enough + struct parallel_offer + { + bool near{false}; + bool snaps{false}; + double spacing{0.0}; + double distance{0.0}; + editor_track::straight const *neighbour{nullptr}; + }; + parallel_offer straight_parallel_offer(editor_track::straight const &Line, glm::dvec3 const &Offset) const; glm::dvec3 snap_straight_offset(editor_track::straight const &Line, glm::dvec3 const &Offset) const; glm::dvec3 snap_straight_direction(glm::dvec3 const &Pivot, glm::dvec3 const &Moved) const; straights_state m_straights; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 59241a48b..b59ff0f7c 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -2527,9 +2527,23 @@ void editor_mode::draw_straights_overlay() const drawlist->AddCircle(screen, 12.0f, overlay_color::highlight, 16, 2.5f); } } - auto const &line{m_straights.current}; - if (line.tracks.empty() || m_straights.dragging) + auto line{m_straights.dragging ? m_straights.drag_line : m_straights.current}; + if (line.tracks.empty()) return; + glm::dvec3 const offset{m_straights.dragging ? m_straights.preview_start - m_straights.drag_line.start : glm::dvec3{}}; + if (m_straights.dragging) + { + line.start = m_straights.preview_start; + line.end = m_straights.preview_end; + auto const planar{plan_of(line.end - line.start)}; + auto const length{glm::length(planar)}; + if (length > 1e-6) + { + line.direction = planar / length; + line.length = length; + } + } + auto const offer{straight_parallel_offer(m_straights.dragging ? m_straights.drag_line : m_straights.current, offset)}; glm::dvec2 const normal{-line.direction.y, line.direction.x}; for (auto const &other : m_straights.neighbours) { @@ -2544,16 +2558,19 @@ void editor_mode::draw_straights_overlay() const auto const lateral{across(other.start) + (across(other.end) - across(other.start)) * fraction}; glm::dvec3 const foot{line.start.x + line.direction.x * middle, line.start.y + line.grade * middle, line.start.z + line.direction.y * middle}; glm::dvec3 const target{foot.x + normal.x * lateral, foot.y, foot.z + normal.y * lateral}; - projection.line(drawlist, foot, target, IM_COL32(255, 230, 120, 230), 1.5f); + bool const highlighted{offer.near && offer.neighbour == &other}; + auto const tick{highlighted ? (offer.snaps ? IM_COL32(80, 230, 255, 255) : IM_COL32(255, 210, 60, 255)) : IM_COL32(255, 230, 120, 230)}; + projection.line(drawlist, foot, target, tick, highlighted ? 2.5f : 1.5f); ImVec2 screen; if (projection.project((foot + target) * 0.5, screen)) { auto const angle{glm::degrees(std::abs(std::asin(std::clamp(line.direction.x * other.direction.y - line.direction.y * other.direction.x, -1.0, 1.0))))}; - auto const text{angle > 0.001 ? format("%.3f m %.3f deg", std::abs(lateral), angle) : format("%.3f m", std::abs(lateral))}; + auto const text{highlighted ? (offer.snaps ? format(STR_C("parallel %.2f m"), offer.spacing) : format("%.3f m → %.2f m", std::abs(lateral), offer.spacing)) : + (angle > 0.001 ? format("%.3f m %.3f deg", std::abs(lateral), angle) : format("%.3f m", std::abs(lateral)))}; auto const *label{text.c_str()}; auto const size{ImGui::CalcTextSize(label)}; drawlist->AddRectFilled(ImVec2(screen.x - 3.0f, screen.y - 2.0f), ImVec2(screen.x + size.x + 3.0f, screen.y + size.y + 2.0f), IM_COL32(0, 0, 0, 170), 3.0f); - drawlist->AddText(screen, IM_COL32(255, 230, 120, 255), label); + drawlist->AddText(screen, highlighted ? tick : IM_COL32(255, 230, 120, 255), label); } } } @@ -2594,27 +2611,45 @@ void editor_mode::find_neighbour_straights() } } -glm::dvec3 editor_mode::snap_straight_offset(editor_track::straight const &Line, glm::dvec3 const &Offset) const +editor_mode::parallel_offer editor_mode::straight_parallel_offer(editor_track::straight const &Line, glm::dvec3 const &Offset) const { + parallel_offer offer; glm::dvec2 const normal{-Line.direction.y, Line.direction.x}; auto const middle{(Line.start + Line.end) * 0.5 + Offset}; - double best{0.2}; - double correction{0.0}; + double best{2.0}; for (auto const &other : m_straights.neighbours) { - if (std::abs(Line.direction.x * other.direction.y - Line.direction.y * other.direction.x) > std::sin(glm::radians(0.5))) + auto const sine{std::abs(Line.direction.x * other.direction.y - Line.direction.y * other.direction.x)}; + if (sine > std::sin(glm::radians(10.0))) continue; auto const distance{glm::dot(plan_of(other.start - middle), normal)}; for (auto const spacing : m_straights.spacings) { - auto const error{std::abs(distance) - spacing}; - if (std::abs(error) < best) + auto const error{std::abs(std::abs(distance) - spacing)}; + if (error < best) { - best = std::abs(error); - correction = distance > 0.0 ? error : -error; + best = error; + offer.near = true; + offer.snaps = error < 0.2 && sine <= std::sin(glm::radians(0.5)); + offer.spacing = spacing; + offer.distance = std::abs(distance); + offer.neighbour = &other; } } } + return offer; +} + +glm::dvec3 editor_mode::snap_straight_offset(editor_track::straight const &Line, glm::dvec3 const &Offset) const +{ + auto const offer{straight_parallel_offer(Line, Offset)}; + if (false == offer.snaps || offer.neighbour == nullptr) + return Offset; + glm::dvec2 const normal{-Line.direction.y, Line.direction.x}; + auto const middle{(Line.start + Line.end) * 0.5 + Offset}; + auto const distance{glm::dot(plan_of(offer.neighbour->start - middle), normal)}; + auto const error{std::abs(distance) - offer.spacing}; + auto const correction{distance > 0.0 ? error : -error}; return Offset + glm::dvec3{normal.x, 0.0, normal.y} * correction; } @@ -3508,6 +3543,14 @@ std::vector editor_mode::track_key_hints(bool const All) hints = {{"LMB on the straight", "where it breaks, then drag the handle to turn the rest"}, {"Esc", "cancel"}}; else if (m_track_tab == track_tab::straights && m_straights.tool == 2) hints = {{"LMB on the straight", "where the shift starts, then drag the handle: sideways the shift, along its length"}, {"Esc", "cancel"}}; + else if (m_track_tab == track_tab::straights && m_straights.dragging && m_straights.handle == 2) + { + auto const offer{straight_parallel_offer(m_straights.drag_line, m_straights.preview_start - m_straights.drag_line.start)}; + if (offer.near) + hints = {{offer.snaps ? "Release" : "Near another straight", format(offer.snaps ? STR_C("snaps parallel at %.2f m") : STR_C("keep shifting: snaps parallel at %.2f m"), offer.spacing)}, {"Esc", "cancel"}}; + else + hints = {{"Drag the diamond", "shifts the straight sideways"}, {"Esc", "cancel"}}; + } else if (m_track_tab == track_tab::straights && m_straights.current.tracks.empty()) hints = {{"LMB on a straight track", "selects the whole straight"}}; else if (m_track_tab == track_tab::straights) @@ -3640,7 +3683,12 @@ std::string editor_mode::track_readout() const if (state.handle == 2) { glm::dvec2 const normal{-grabbed.direction.y, grabbed.direction.x}; - return format("shift %+.3f m", glm::dot(plan_of(state.preview_start - grabbed.start), normal)); + auto const offset{state.preview_start - grabbed.start}; + auto text{format("shift %+.3f m", glm::dot(plan_of(offset), normal))}; + auto const offer{straight_parallel_offer(grabbed, offset)}; + if (offer.near) + text += "\n" + format(offer.snaps ? STR_C("snaps parallel at %.2f m") : STR_C("close: parallel snap at %.2f m"), offer.spacing); + return text; } return format("L %.3f m (%+.3f) azimuth %.4f deg", plan_distance(state.preview_start, state.preview_end), plan_distance(state.preview_start, state.preview_end) - grabbed.length, azimuth(state.preview_start, state.preview_end)); diff --git a/application/editormodetrackux.cpp b/application/editormodetrackux.cpp index cc1ab3633..1d29a4e02 100644 --- a/application/editormodetrackux.cpp +++ b/application/editormodetrackux.cpp @@ -325,6 +325,16 @@ editor_mode::track_intent editor_mode::track_intent_at(int const Mods) glm::dvec3 const handles[] = {line.start, line.end, (line.start + line.end) * 0.5}; intent.index = hit; intent.position = handles[hit]; + if (hit == 2) + { + auto const offer{straight_parallel_offer(line, {})}; + if (offer.near) + { + intent.action = format(offer.snaps ? STR_C("Drag: shift the straight sideways — snaps parallel at %.2f m") : STR_C("Drag: shift the straight sideways — close: parallel snap at %.2f m"), offer.spacing); + intent.what = kind::straight_handle; + return intent; + } + } return make(kind::straight_handle, hit == 2 ? "Drag: shift the straight sideways" : "Drag: move this end, the curves at it follow"); } } diff --git a/lang/editor_pl.po b/lang/editor_pl.po index 8a20acf36..36a55c79f 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -1542,6 +1542,27 @@ msgstr "Ciągnij romb" msgid "shifts the straight sideways" msgstr "przesuwa prostą w bok" +msgid "Near another straight" +msgstr "Przy innej prostej" + +msgid "keep shifting: snaps parallel at %.2f m" +msgstr "ciągnij dalej: przyleganie równoległe na %.2f m" + +msgid "snaps parallel at %.2f m" +msgstr "przyleganie równoległe na %.2f m" + +msgid "close: parallel snap at %.2f m" +msgstr "blisko: przyleganie równoległe na %.2f m" + +msgid "parallel %.2f m" +msgstr "równolegle %.2f m" + +msgid "Drag: shift the straight sideways — close: parallel snap at %.2f m" +msgstr "Ciągnij: przesuń prostą w bok — blisko: przyleganie równoległe na %.2f m" + +msgid "Drag: shift the straight sideways — snaps parallel at %.2f m" +msgstr "Ciągnij: przesuń prostą w bok — przyleganie równoległe na %.2f m" + msgid "Ctrl+drag" msgstr "Ctrl+ciągnij" From 95d4581da2494df330c1a037b8679153591c0d52 Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 8 Oct 2026 22:00:04 +0200 Subject: [PATCH 176/430] pan ortho view with middle mouse --- application/editormode.cpp | 46 ++++++++++++++++++++++++++++++++- application/editormode.h | 4 +++ application/editormodetrack.cpp | 2 ++ lang/editor_pl.po | 15 +++++++++++ 4 files changed, 66 insertions(+), 1 deletion(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 1ad547512..d833fdf59 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -30,6 +30,7 @@ extern char **environ; #include "editor/editorGeometry.hpp" #include "utilities/translation.h" #include "utilities/Globals.h" +#include "utilities/glmHelpers.h" #include "simulation/simulation.h" #include "simulation/simulationtime.h" #include "simulation/simulationenvironment.h" @@ -1212,6 +1213,8 @@ bool editor_mode::update() m_input.mouse.button(GLFW_MOUSE_BUTTON_RIGHT, GLFW_RELEASE); Application.set_cursor(GLFW_CURSOR_NORMAL); } + if (m_ortho_pan && !ImGui::GetIO().MouseDown[2]) + ortho_pan_stop(); // same for the left button (brush / sculpt / click placement). the UI filter in the application // uses io.WantCaptureMouse from the previous frame, so a press on a panel the cursor has just @@ -3631,11 +3634,15 @@ void editor_mode::render_gizmo_options() { if (ImGui::Button(Global.EditorOrtho ? "3D view (O)" : "Top view, orthographic (O)")) toggle_ortho(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", Global.EditorOrtho ? STR_C("Wheel zooms. Hold the wheel and drag to pan.") : STR_C("Top-down orthographic view")); if (Global.EditorOrtho) { ImGui::SameLine(); ImGui::SetNextItemWidth(120.0f); - ImGui::SliderFloat(STR_C("Extent (m), wheel"), &Global.EditorOrthoExtent, 5.0f, 5000.0f, "%.0f", 3.0f); + ImGui::SliderFloat(STR_C("Extent (m), wheel / MMB pan"), &Global.EditorOrthoExtent, 5.0f, 5000.0f, "%.0f", 3.0f); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Wheel zooms. Hold the wheel and drag to pan.")); } ImGui::Checkbox(STR_C("Enabled"), &m_gizmo_enabled); if (!m_gizmo_enabled) @@ -3938,9 +3945,32 @@ void editor_mode::toggle_ortho() else { Camera.Angle.x = m_ortho_pitch; + ortho_pan_stop(); } } +void editor_mode::ortho_pan_to(double const Horizontal, double const Vertical) +{ + auto const &io{ImGui::GetIO()}; + if (io.DisplaySize.y <= 0.0f) + return; + auto const dx{Horizontal - m_ortho_pan_cursor.x}; + auto const dy{Vertical - m_ortho_pan_cursor.y}; + m_ortho_pan_cursor = {Horizontal, Vertical}; + auto const scale{2.0 * static_cast(Global.EditorOrthoExtent) / static_cast(io.DisplaySize.y)}; + auto const world{RotateY(glm::dvec3{dx * scale, 0.0, dy * scale}, static_cast(Camera.Angle.y))}; + Camera.Pos.x -= world.x; + Camera.Pos.z -= world.z; + Camera.Velocity = {}; + m_focus_active = false; + Global.pCamera = Camera; +} + +void editor_mode::ortho_pan_stop() +{ + m_ortho_pan = false; +} + void editor_mode::on_scroll(double const Xoffset, double const Yoffset) { if (false == Global.EditorOrtho || ImGui::GetIO().WantCaptureMouse) @@ -4367,6 +4397,8 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in void editor_mode::on_cursor_pos(double const Horizontal, double const Vertical) { + if (m_ortho_pan) + ortho_pan_to(Horizontal, Vertical); // object transforms are handled by the gizmo now; here we only forward the cursor to the // mouse input, which rotates the camera while the right mouse button is held (panning mode) m_input.mouse.position(Horizontal, Vertical); @@ -4582,6 +4614,18 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const // game-engine style look: hide & grab the cursor while flying, restore it on release Application.set_cursor(is_press(Action) ? GLFW_CURSOR_DISABLED : GLFW_CURSOR_NORMAL); } + else if (Button == GLFW_MOUSE_BUTTON_MIDDLE && Global.EditorOrtho) + { + if (is_press(Action)) + { + m_ortho_pan = true; + m_ortho_pan_cursor = m_input.mouse.position(); + m_focus_active = false; + Camera.Velocity = {}; + } + else if (is_release(Action)) + ortho_pan_stop(); + } m_input.mouse.button(Button, Action); } diff --git a/application/editormode.h b/application/editormode.h index 8e459bdc5..3d256a910 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -209,6 +209,10 @@ class editor_mode : public application_mode, private editor_track::observer static bool m_settings_open; double m_ortho_pitch{0.0}; + bool m_ortho_pan{false}; + glm::dvec2 m_ortho_pan_cursor{0.0}; + void ortho_pan_to(double const Horizontal, double const Vertical); + void ortho_pan_stop(); // camera fly-mode (right mouse button held); used to flush motion when it's released command_relay m_camera_relay; bool m_camera_flying{false}; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index b59ff0f7c..af0d41628 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -3584,6 +3584,8 @@ std::vector editor_mode::track_key_hints(bool const All) hints.push_back({"Ctrl", format("gizmo snaps by %.2f m", m_gizmo_snap)}); hints.push_back({"K", "split the path under the cursor"}); hints.push_back({"O", "top view"}); + if (Global.EditorOrtho) + hints.push_back({"Hold the wheel", "pans the view"}); hints.push_back({"Ctrl+Z", "undo"}); hints.push_back({"Ctrl+Y", "redo"}); hints.push_back({"L T G C B P V J I", "modes: lay, switch, straight, curve, objects, profile, speed, joints, infra"}); diff --git a/lang/editor_pl.po b/lang/editor_pl.po index 36a55c79f..c27ec30d5 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -4243,6 +4243,21 @@ msgstr "Zaznacz model, z którego ma powstać tablica" msgid "Extent (m), wheel" msgstr "Zasięg (m), kółko" +msgid "Extent (m), wheel / MMB pan" +msgstr "Zasięg (m), kółko / przesuwanie kółkiem" + +msgid "Wheel zooms. Hold the wheel and drag to pan." +msgstr "Kółko przybliża. Wciśnij kółko i przeciągnij, żeby przesunąć widok." + +msgid "Top-down orthographic view" +msgstr "Widok z góry, rzut prostokątny" + +msgid "Hold the wheel" +msgstr "Przytrzymaj kółko" + +msgid "pans the view" +msgstr "przesuwa widok" + msgid "Enabled" msgstr "Włączone" From 5d075e75fe921cbb506d6d2128455875e1b18567 Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 8 Oct 2026 22:00:19 +0200 Subject: [PATCH 177/430] show compass in ortho view --- application/editormode.cpp | 46 ++++++++++++++++++++++++++++++++++++++ application/editormode.h | 1 + 2 files changed, 47 insertions(+) diff --git a/application/editormode.cpp b/application/editormode.cpp index d833fdf59..b2e2a963b 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -1408,6 +1408,7 @@ bool editor_mode::update() // --- area fill: outline overlay while the mode is active (its settings are drawn in the node bank window) --- if (ui()->mode() == nodebank_panel::FILL) draw_area_fill_outline(); + draw_ortho_compass(); render_orthophoto_window(); render_new_scenery_popup(); @@ -1862,6 +1863,51 @@ void editor_mode::draw_orthophoto() m_orthophoto.draw(editor_mode::projection_matrix(aspect) * view, Camera.Pos, io.DisplaySize.x, io.DisplaySize.y); } +void editor_mode::draw_ortho_compass() const +{ + if (false == Global.EditorOrtho) + return; + screen_projection const projection; + ImVec2 north_from, north_to, east_from, east_to; + glm::dvec3 const eye{Camera.Pos}; + if (false == projection.project(eye + glm::dvec3{0.0, 0.0, -80.0}, north_from) || false == projection.project(eye + glm::dvec3{0.0, 0.0, 80.0}, north_to) || + false == projection.project(eye + glm::dvec3{80.0, 0.0, 0.0}, east_from) || false == projection.project(eye + glm::dvec3{-80.0, 0.0, 0.0}, east_to)) + return; + auto const dir = [](ImVec2 const From, ImVec2 const To) { + ImVec2 const d{To.x - From.x, To.y - From.y}; + auto const length{std::sqrt(d.x * d.x + d.y * d.y)}; + return length > 1e-3f ? ImVec2{d.x / length, d.y / length} : ImVec2{0.0f, -1.0f}; + }; + auto const north{dir(north_from, north_to)}; + auto const east{dir(east_from, east_to)}; + ImVec2 const south{-north.x, -north.y}; + ImVec2 const west{-east.x, -east.y}; + + ImGuiIO const &io = ImGui::GetIO(); + float const radius{36.0f}; + float const margin{16.0f}; + ImVec2 const center{io.DisplaySize.x - margin - radius, margin + radius}; + auto *drawlist{ImGui::GetForegroundDrawList()}; + drawlist->AddCircleFilled(center, radius + 14.0f, IM_COL32(0, 0, 0, 180), 48); + drawlist->AddCircle(center, radius - 6.0f, IM_COL32(255, 255, 255, 50), 48, 1.2f); + drawlist->AddCircleFilled(center, 3.0f, IM_COL32(255, 255, 255, 200), 12); + + auto const at = [&](ImVec2 const Unit, float const Length) { return ImVec2{center.x + Unit.x * Length, center.y + Unit.y * Length}; }; + ImVec2 const side{-north.y * 5.0f, north.x * 5.0f}; + drawlist->AddTriangleFilled(at(north, radius - 14.0f), ImVec2{center.x + side.x, center.y + side.y}, ImVec2{center.x - side.x, center.y - side.y}, IM_COL32(230, 70, 55, 255)); + drawlist->AddTriangleFilled(at(south, radius - 18.0f), ImVec2{center.x + side.x, center.y + side.y}, ImVec2{center.x - side.x, center.y - side.y}, IM_COL32(210, 210, 210, 210)); + + auto const letter = [&](char const *Text, ImVec2 const Unit, ImU32 const Color) { + auto const size{ImGui::CalcTextSize(Text)}; + auto const p{at(Unit, radius + 2.0f)}; + drawlist->AddText(ImVec2(p.x - size.x * 0.5f, p.y - size.y * 0.5f), Color, Text); + }; + letter("N", north, IM_COL32(255, 90, 70, 255)); + letter("E", east, IM_COL32(230, 230, 230, 230)); + letter("S", south, IM_COL32(190, 190, 190, 180)); + letter("W", west, IM_COL32(230, 230, 230, 230)); +} + editor_terrain *editor_mode::terrain_at(double X, double Z) { for (auto &terrain : m_terrains) diff --git a/application/editormode.h b/application/editormode.h index 3d256a910..64b56453d 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -338,6 +338,7 @@ class editor_mode : public application_mode, private editor_track::observer std::string m_georeference_line; void read_georeference(); void draw_orthophoto(); + void draw_ortho_compass() const; // picks up the stored settings and the origin of the current scenery void load_orthophoto_settings(); void save_orthophoto_settings(); From c3dc7511e130fbd6aa1d832b66df84003d26dc6a Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 8 Oct 2026 22:17:48 +0200 Subject: [PATCH 178/430] widen parallel snap and show 4 / 4.5 / 4.75 m --- application/editormode.h | 2 ++ application/editormodetrack.cpp | 59 ++++++++++++++++++++----------- application/editormodetrackux.cpp | 2 +- lang/editor_pl.po | 21 +++++++++++ 4 files changed, 62 insertions(+), 22 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index 64b56453d..b888a2d1c 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -629,6 +629,8 @@ class editor_mode : public application_mode, private editor_track::observer bool snaps{false}; double spacing{0.0}; double distance{0.0}; + double angle{0.0}; // deg between the two straights + double correction{0.0}; // m along the line normal to reach the spacing editor_track::straight const *neighbour{nullptr}; }; parallel_offer straight_parallel_offer(editor_track::straight const &Line, glm::dvec3 const &Offset) const; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index af0d41628..1fc69fe95 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -47,6 +47,11 @@ using geometry::signed_angle; using geometry::turned; using geometry::arc_pieces; +double constexpr kParallelFindAngle{15.0}; // deg, neighbours counted as beside the straight +double constexpr kParallelSnapAngle{5.0}; // deg, close enough to snap parallel +double constexpr kParallelSnapWindow{0.45}; // m from 4.00 / 4.50 / 4.75 m +double constexpr kParallelHintWindow{1.25}; // m, hint before the snap takes + double piece_plan_radius(segment_data const &Path) { if (std::abs(Path.radius) > 0.5f) @@ -2560,19 +2565,26 @@ void editor_mode::draw_straights_overlay() const glm::dvec3 const target{foot.x + normal.x * lateral, foot.y, foot.z + normal.y * lateral}; bool const highlighted{offer.near && offer.neighbour == &other}; auto const tick{highlighted ? (offer.snaps ? IM_COL32(80, 230, 255, 255) : IM_COL32(255, 210, 60, 255)) : IM_COL32(255, 230, 120, 230)}; - projection.line(drawlist, foot, target, tick, highlighted ? 2.5f : 1.5f); + if (highlighted) + projection.line(drawlist, other.start, other.end, tick, 3.0f); + projection.line(drawlist, foot, target, tick, highlighted ? 3.0f : 1.5f); ImVec2 screen; if (projection.project((foot + target) * 0.5, screen)) { auto const angle{glm::degrees(std::abs(std::asin(std::clamp(line.direction.x * other.direction.y - line.direction.y * other.direction.x, -1.0, 1.0))))}; - auto const text{highlighted ? (offer.snaps ? format(STR_C("parallel %.2f m"), offer.spacing) : format("%.3f m → %.2f m", std::abs(lateral), offer.spacing)) : - (angle > 0.001 ? format("%.3f m %.3f deg", std::abs(lateral), angle) : format("%.3f m", std::abs(lateral)))}; + auto const text{highlighted ? (offer.snaps ? format(STR_C("parallel %.2f m"), offer.spacing) : format("%.2f → %.2f m %.1f°", std::abs(lateral), offer.spacing, offer.angle)) : + (angle > 0.05 ? format("%.2f m %.1f°", std::abs(lateral), angle) : format("%.2f m", std::abs(lateral)))}; auto const *label{text.c_str()}; auto const size{ImGui::CalcTextSize(label)}; - drawlist->AddRectFilled(ImVec2(screen.x - 3.0f, screen.y - 2.0f), ImVec2(screen.x + size.x + 3.0f, screen.y + size.y + 2.0f), IM_COL32(0, 0, 0, 170), 3.0f); + drawlist->AddRectFilled(ImVec2(screen.x - 4.0f, screen.y - 2.0f), ImVec2(screen.x + size.x + 4.0f, screen.y + size.y + 2.0f), IM_COL32(0, 0, 0, 190), 3.0f); drawlist->AddText(screen, highlighted ? tick : IM_COL32(255, 230, 120, 255), label); } } + if (offer.near && false == offer.snaps && std::abs(offer.correction) > 0.02) + { + auto const shift{glm::dvec3{normal.x, 0.0, normal.y} * offer.correction}; + projection.line(drawlist, line.start + shift, line.end + shift, IM_COL32(80, 230, 255, 210), 3.5f); + } } void editor_mode::find_neighbour_straights() @@ -2596,7 +2608,7 @@ void editor_mode::find_neighbour_straights() continue; auto other{editor_track::find_straight(*track, state.tolerance)}; visited.insert(visited.end(), other.tracks.begin(), other.tracks.end()); - if (other.tracks.empty() || std::abs(line.direction.x * other.direction.y - line.direction.y * other.direction.x) > std::sin(glm::radians(10.0))) + if (other.tracks.empty() || std::abs(line.direction.x * other.direction.y - line.direction.y * other.direction.x) > std::sin(glm::radians(kParallelFindAngle))) continue; auto const offset{glm::dvec2{(other.start + other.end).x * 0.5 - line.start.x, (other.start + other.end).z * 0.5 - line.start.z}}; if (std::abs(glm::dot(offset, normal)) > 60.0) @@ -2616,13 +2628,14 @@ editor_mode::parallel_offer editor_mode::straight_parallel_offer(editor_track::s parallel_offer offer; glm::dvec2 const normal{-Line.direction.y, Line.direction.x}; auto const middle{(Line.start + Line.end) * 0.5 + Offset}; - double best{2.0}; + double best{kParallelHintWindow}; for (auto const &other : m_straights.neighbours) { auto const sine{std::abs(Line.direction.x * other.direction.y - Line.direction.y * other.direction.x)}; - if (sine > std::sin(glm::radians(10.0))) + if (sine > std::sin(glm::radians(kParallelFindAngle))) continue; auto const distance{glm::dot(plan_of(other.start - middle), normal)}; + auto const angle{glm::degrees(std::abs(std::asin(std::clamp(sine, 0.0, 1.0))))}; for (auto const spacing : m_straights.spacings) { auto const error{std::abs(std::abs(distance) - spacing)}; @@ -2630,9 +2643,11 @@ editor_mode::parallel_offer editor_mode::straight_parallel_offer(editor_track::s { best = error; offer.near = true; - offer.snaps = error < 0.2 && sine <= std::sin(glm::radians(0.5)); + offer.snaps = error < kParallelSnapWindow && angle <= kParallelSnapAngle; offer.spacing = spacing; offer.distance = std::abs(distance); + offer.angle = angle; + offer.correction = distance > 0.0 ? std::abs(distance) - spacing : spacing - std::abs(distance); offer.neighbour = &other; } } @@ -2643,14 +2658,10 @@ editor_mode::parallel_offer editor_mode::straight_parallel_offer(editor_track::s glm::dvec3 editor_mode::snap_straight_offset(editor_track::straight const &Line, glm::dvec3 const &Offset) const { auto const offer{straight_parallel_offer(Line, Offset)}; - if (false == offer.snaps || offer.neighbour == nullptr) + if (false == offer.snaps) return Offset; glm::dvec2 const normal{-Line.direction.y, Line.direction.x}; - auto const middle{(Line.start + Line.end) * 0.5 + Offset}; - auto const distance{glm::dot(plan_of(offer.neighbour->start - middle), normal)}; - auto const error{std::abs(distance) - offer.spacing}; - auto const correction{distance > 0.0 ? error : -error}; - return Offset + glm::dvec3{normal.x, 0.0, normal.y} * correction; + return Offset + glm::dvec3{normal.x, 0.0, normal.y} * offer.correction; } glm::dvec3 editor_mode::snap_straight_direction(glm::dvec3 const &Pivot, glm::dvec3 const &Moved) const @@ -2663,7 +2674,7 @@ glm::dvec3 editor_mode::snap_straight_direction(glm::dvec3 const &Pivot, glm::dv for (auto const &other : m_straights.neighbours) { auto const sine{direction.x * other.direction.y - direction.y * other.direction.x}; - if (std::abs(sine) > std::sin(glm::radians(0.5))) + if (std::abs(sine) > std::sin(glm::radians(kParallelSnapAngle))) continue; auto const aligned{other.direction * (glm::dot(direction, other.direction) < 0.0 ? -1.0 : 1.0)}; return {Pivot.x + aligned.x * length, Moved.y, Pivot.z + aligned.y * length}; @@ -2732,6 +2743,8 @@ void editor_mode::render_straight_ui() return; } ImGui::TextUnformatted(describe(line).c_str()); + if (false == m_straights.neighbours.empty()) + ImGui::TextDisabled("%s", STR_C("Nearby straight: the diamond snaps parallel at 4.00 / 4.50 / 4.75 m")); auto const toolbutton = [&](char const *Label, int const Tool, char const *Tooltip) { bool const active{state.tool == Tool}; @@ -3546,16 +3559,18 @@ std::vector editor_mode::track_key_hints(bool const All) else if (m_track_tab == track_tab::straights && m_straights.dragging && m_straights.handle == 2) { auto const offer{straight_parallel_offer(m_straights.drag_line, m_straights.preview_start - m_straights.drag_line.start)}; - if (offer.near) - hints = {{offer.snaps ? "Release" : "Near another straight", format(offer.snaps ? STR_C("snaps parallel at %.2f m") : STR_C("keep shifting: snaps parallel at %.2f m"), offer.spacing)}, {"Esc", "cancel"}}; + if (offer.snaps) + hints = {{"Release", format(STR_C("parallel at %.2f m"), offer.spacing)}, {"Esc", "cancel"}}; + else if (offer.near) + hints = {{"Near another straight", format(STR_C("snap at %.2f m (%.1f°)"), offer.spacing, offer.angle)}, {"Esc", "cancel"}}; else - hints = {{"Drag the diamond", "shifts the straight sideways"}, {"Esc", "cancel"}}; + hints = {{"Drag the diamond", "snaps parallel at 4.00 / 4.50 / 4.75 m"}, {"Esc", "cancel"}}; } else if (m_track_tab == track_tab::straights && m_straights.current.tracks.empty()) hints = {{"LMB on a straight track", "selects the whole straight"}}; else if (m_track_tab == track_tab::straights) { - hints = {{"Drag a square", "moves an end, the curves at it follow"}, {"Drag the diamond", "shifts the straight sideways"}, {"Ctrl+drag", "breaks the straight"}, {"Shift+click x4", "shifts a piece around an obstacle"}, {"Alt+click", "adds another straight to move together"}}; + hints = {{"Drag a square", "moves an end, the curves at it follow"}, {"Drag the diamond", "shifts sideways; close: snaps parallel at 4.00 / 4.50 / 4.75 m"}, {"Ctrl+drag", "breaks the straight"}, {"Shift+click x4", "shifts a piece around an obstacle"}, {"Alt+click", "adds another straight to move together"}}; gizmo = true; } else if (m_track_tab == track_tab::route && m_route.chain.tracks.empty()) @@ -3688,8 +3703,10 @@ std::string editor_mode::track_readout() const auto const offset{state.preview_start - grabbed.start}; auto text{format("shift %+.3f m", glm::dot(plan_of(offset), normal))}; auto const offer{straight_parallel_offer(grabbed, offset)}; - if (offer.near) - text += "\n" + format(offer.snaps ? STR_C("snaps parallel at %.2f m") : STR_C("close: parallel snap at %.2f m"), offer.spacing); + if (offer.snaps) + text += "\n" + format(STR_C("parallel %.2f m"), offer.spacing); + else if (offer.near) + text += "\n" + format(STR_C("close: %.2f m %.1f°"), offer.spacing, offer.angle); return text; } return format("L %.3f m (%+.3f) azimuth %.4f deg", plan_distance(state.preview_start, state.preview_end), plan_distance(state.preview_start, state.preview_end) - grabbed.length, diff --git a/application/editormodetrackux.cpp b/application/editormodetrackux.cpp index 1d29a4e02..a98ec27ee 100644 --- a/application/editormodetrackux.cpp +++ b/application/editormodetrackux.cpp @@ -330,7 +330,7 @@ editor_mode::track_intent editor_mode::track_intent_at(int const Mods) auto const offer{straight_parallel_offer(line, {})}; if (offer.near) { - intent.action = format(offer.snaps ? STR_C("Drag: shift the straight sideways — snaps parallel at %.2f m") : STR_C("Drag: shift the straight sideways — close: parallel snap at %.2f m"), offer.spacing); + intent.action = format(offer.snaps ? STR_C("Drag: shift the straight sideways — snaps parallel at %.2f m") : STR_C("Drag: shift the straight sideways — close: %.2f m %.1f°"), offer.spacing, offer.angle); intent.what = kind::straight_handle; return intent; } diff --git a/lang/editor_pl.po b/lang/editor_pl.po index c27ec30d5..a24e69dbf 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -1557,9 +1557,30 @@ msgstr "blisko: przyleganie równoległe na %.2f m" msgid "parallel %.2f m" msgstr "równolegle %.2f m" +msgid "parallel at %.2f m" +msgstr "równolegle na %.2f m" + +msgid "snap at %.2f m (%.1f°)" +msgstr "przyleganie na %.2f m (%.1f°)" + +msgid "snaps parallel at 4.00 / 4.50 / 4.75 m" +msgstr "łapie równolegle na 4.00 / 4.50 / 4.75 m" + +msgid "shifts sideways; close: snaps parallel at 4.00 / 4.50 / 4.75 m" +msgstr "przesuwa w bok; blisko: łapie równolegle na 4.00 / 4.50 / 4.75 m" + +msgid "Nearby straight: the diamond snaps parallel at 4.00 / 4.50 / 4.75 m" +msgstr "Sąsiednia prosta: romb łapie równolegle na 4.00 / 4.50 / 4.75 m" + +msgid "close: %.2f m %.1f°" +msgstr "blisko: %.2f m %.1f°" + msgid "Drag: shift the straight sideways — close: parallel snap at %.2f m" msgstr "Ciągnij: przesuń prostą w bok — blisko: przyleganie równoległe na %.2f m" +msgid "Drag: shift the straight sideways — close: %.2f m %.1f°" +msgstr "Ciągnij: przesuń prostą w bok — blisko: %.2f m %.1f°" + msgid "Drag: shift the straight sideways — snaps parallel at %.2f m" msgstr "Ciągnij: przesuń prostą w bok — przyleganie równoległe na %.2f m" From 4e69d8f86ccaa05859cdc8f889c305bae96ee0ca Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Thu, 8 Oct 2026 22:41:51 +0200 Subject: [PATCH 179/430] feat(editor): fields of work chosen in the toolbar, one at a time: edit modes, tracks, signals, vehicle, roads, terrain; Toolset split into Tool options (tools of the field of work and the gizmo), Inspector (what it has selected: node with array and bend, path, road) and Node bank (list only); Scene window with the models of the scenery by layer and group, filtered by name or uuid, a click selects, a double click flies the camera to it; track window replaced by a palette of the track tools in groups (build, by the track, checks) with the tools under it, the selected path in the inspector, results of the speed, joints and infrastructure checks in a docked window; road window split into the tools in tool options and the selection in the inspector; terrain tools moved out of the editor settings into tool options together with the orthophoto settings (map menu opens them), leaving the terrain puts sculpting and chunk editing away; default layout: tool options and scene on the left, inspector on the right, node bank and checks at the bottom; Polish translation --- application/editormode.cpp | 121 ++++++++++--- application/editormode.h | 17 +- application/editormodeprofile.cpp | 8 +- application/editormoderoad.cpp | 45 ++--- application/editormodetrack.cpp | 173 +++++++++--------- application/editoruilayer.cpp | 279 ++++++++++++++++++++++++++---- application/editoruilayer.h | 61 ++++++- application/editoruipanels.cpp | 31 +--- application/editoruipanels.h | 5 - lang/editor_pl.po | 52 +++++- 10 files changed, 590 insertions(+), 202 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 73493be03..de441f6a0 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -488,6 +488,24 @@ editor_mode::editor_mode() { ui()->set_fill_options([this]() { render_area_fill(); }); ui()->set_gizmo_options([this]() { render_gizmo_options(); }); ui()->set_toolbar_options([this]() { render_toolbar(); }); + ui()->set_track_options([this]() { render_track_tool_options(); }, [this]() { render_track_selection(); }); + ui()->set_workspace_options(editor_ui::workspace::roads, [this]() { render_road_tool_options(); }, [this]() { render_road_selection(); }); + ui()->set_workspace_options(editor_ui::workspace::terrain, [this]() { render_terrain_tool_options(); }); + // a node picked in the scene window is selected as if clicked in the view; a double click flies the camera to it + ui()->set_scene_select([this](scene::basic_node *Node, bool const Focus) { + if (Focus) + start_focus(Node); + std::string reason; + if (Node->from_template() || false == scene::Layers.editable(Node, &reason)) + { + ui()->set_status("\"" + (Node->name().empty() ? std::string{"(unnamed node)"} : Node->name()) + "\" can't be edited: " + reason, true); + return; + } + m_track_window_open = false; + ui()->set_mode(nodebank_panel::MODIFY); + m_node = Node; + ui()->set_node(m_node); + }); ui()->set_array_options([this]() { render_array(); }); ui()->set_bend_options([this]() { render_bend(); }); ui()->set_file_actions([this]() { save(); }, [this]() { export_scenery(); }); @@ -1398,7 +1416,8 @@ bool editor_mode::update() // roads: trajectories of the lanes, and the tools of the road window update_road_tool(); draw_road_overlay(); - render_road_window(); + // the roads and the terrain are fields of work, their tools are drawn in the tool options window in place of the edit mode ones + ui()->set_workspace(m_terrain_open ? editor_ui::workspace::terrain : m_roadtool.window ? editor_ui::workspace::roads : editor_ui::workspace::none); // --- array: the one made last is kept in line with its settings --- update_array(); @@ -1407,7 +1426,6 @@ bool editor_mode::update() if (ui()->mode() == nodebank_panel::FILL) draw_area_fill_outline(); - render_orthophoto_window(); render_new_scenery_popup(); render_open_scenery_popup(); @@ -1446,13 +1464,6 @@ void editor_mode::render_settings() ImGui::Checkbox(STR_C("Transform gizmo (ImGuizmo)"), &m_gizmo_enabled); ImGui::EndTabItem(); } - bool const terrainwanted = m_terrain_tab_wanted; - m_terrain_tab_wanted = false; - if (ImGui::BeginTabItem(STR_C("Terrain"), nullptr, terrainwanted ? ImGuiTabItemFlags_SetSelected : 0)) - { - render_terrain_ui(); - ImGui::EndTabItem(); - } ImGui::EndTabBar(); } @@ -2810,7 +2821,14 @@ void editor_mode::render_map_menu() m_orthophoto.enabled(false == enabled); if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", STR_C("Aerial imagery of geoportal.gov.pl under the scenery, laid out by the origin of the scenery")); - ImGui::MenuItem(STR_C("Orthophoto settings..."), nullptr, &m_orthophoto_window); + // the settings are a part of the terrain tools + if (ImGui::MenuItem(STR_C("Orthophoto settings..."), nullptr, m_terrain_open)) + { + m_track_window_open = false; + m_roadtool.window = false; + terrain_workspace(true); + m_orthophoto_expand = true; + } ImGui::EndMenu(); } @@ -2960,14 +2978,27 @@ void editor_mode::render_open_scenery_popup() ImGui::EndPopup(); } -void editor_mode::render_orthophoto_window() +void editor_mode::terrain_workspace(bool const Open) { - if (false == m_orthophoto_window) - return; - ImGui::SetNextWindowSize(ImVec2(430.0f, 0.0f), ImGuiCond_FirstUseEver); - if (ImGui::Begin((std::string(STR_C("Orthophoto##window")) + "###orthophoto").c_str(), &m_orthophoto_window)) + m_terrain_open = Open; + if (false == Open) + m_terrain_sculpt = m_chunk_edit = false; +} + +void editor_mode::render_terrain_tool_options() +{ + render_terrain_ui(); + bool const expand{m_orthophoto_expand}; + m_orthophoto_expand = false; + if (expand) + ImGui::SetNextItemOpen(true); + if (ImGui::CollapsingHeader(STR_C("Orthophoto"))) + { + // opened from the map menu: brought into sight, the terrain tools above them take the most of the window + if (expand) + ImGui::SetScrollHereY(0.0f); render_orthophoto_ui(); - ImGui::End(); + } } void editor_mode::render_object_menu() @@ -3629,27 +3660,71 @@ void editor_mode::render_toolbar() // edit modes of the node bank, each of them takes the mouse over from the track window std::pair const modes[] = { {STR_C("Select"), nodebank_panel::MODIFY}, {STR_C("Insert"), nodebank_panel::ADD}, {STR_C("Brush"), nodebank_panel::BRUSH}, {STR_C("Area fill"), nodebank_panel::FILL}, {STR_C("Copy to bank"), nodebank_panel::COPY}}; + // the fields of work: an edit mode, or the tracks, signals, vehicle, roads or terrain, one at a time + bool const workspace{m_roadtool.window || m_terrain_open}; for (auto const &mode : modes) { - if (ImGui::MenuItem(mode.first, nullptr, ui()->mode() == mode.second)) + if (ImGui::MenuItem(mode.first, nullptr, false == workspace && ui()->mode() == mode.second)) { m_track_window_open = false; + m_roadtool.window = false; + terrain_workspace(false); ui()->set_mode(mode.second); } } ImGui::Separator(); - if (ImGui::MenuItem(STR_C("Tracks"), nullptr, m_track_window_open)) + bool const tracks{m_track_window_open && false == m_terrain_open}; + bool const vehicle{tracks && m_track_tab == track_tab::lineside && m_vehicle.open}; + if (ImGui::MenuItem(STR_C("Tracks"), nullptr, tracks && m_track_tab != track_tab::signals && false == vehicle)) { - if (m_track_window_open) + if (tracks && m_track_tab != track_tab::signals && false == vehicle) m_track_window_open = false; else - show_track_tab(m_track_tab); + { + terrain_workspace(false); + show_track_tab(m_track_tab == track_tab::signals || vehicle ? track_tab::path : m_track_tab); + } } - if (ImGui::MenuItem("Roads", nullptr, m_roadtool.window)) + // the signals are a tool of the track mode, but a field of work of their own + if (ImGui::MenuItem(STR_C("Signals"), nullptr, tracks && m_track_tab == track_tab::signals)) { - m_roadtool.window = !m_roadtool.window; - if (m_roadtool.window) + if (tracks && m_track_tab == track_tab::signals) m_track_window_open = false; + else + { + terrain_workspace(false); + show_track_tab(track_tab::signals); + } + } + // so is the vehicle to drive, put on a track by the objects along the track + if (ImGui::MenuItem(STR_C("Vehicle"), nullptr, vehicle)) + { + if (vehicle) + m_track_window_open = false; + else + { + terrain_workspace(false); + show_track_tab(track_tab::lineside); + m_vehicle.expand = true; + } + } + if (ImGui::MenuItem("Roads", nullptr, m_roadtool.window && false == m_terrain_open)) + { + m_roadtool.window = !(m_roadtool.window && false == m_terrain_open); + if (m_roadtool.window) + { + m_track_window_open = false; + terrain_workspace(false); + } + } + if (ImGui::MenuItem(STR_C("Terrain"), nullptr, m_terrain_open)) + { + terrain_workspace(false == m_terrain_open); + if (m_terrain_open) + { + m_track_window_open = false; + m_roadtool.window = false; + } } ImGui::Separator(); if (m_gizmo_enabled) diff --git a/application/editormode.h b/application/editormode.h index 9e14f293a..e8d99caec 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -231,6 +231,10 @@ class editor_mode : public application_mode, private editor_track::observer // editable terrain patches created in the editor void render_terrain_ui(); + // the terrain as a field of work of its own: the terrain tools and the orthophoto in the tool options window + void render_terrain_tool_options(); + // opens or leaves the terrain; leaving it puts the sculpting and the chunk editing away, so the mouse doesn't stay with them + void terrain_workspace(bool const Open); // creates a large terrain as a grid of adjacent chunks (each its own editable patch) void create_chunked_terrain(); // manual grid-aligned chunks: add/remove single chunks for fine control @@ -289,7 +293,7 @@ class editor_mode : public application_mode, private editor_track::observer std::map, std::unique_ptr> m_grid_chunks; bool m_terrain_sculpt{false}; // when true, LMB sculpts terrain instead of picking bool m_terrain_brush_smooth{false}; // the brush evens the ground out instead of raising or lowering it - bool m_terrain_tab_wanted{false}; // the settings window brings the terrain tab forward the next time it's drawn + bool m_terrain_open{false}; // the terrain is the field of work, chosen in the toolbar bool m_chunk_edit{false}; // when true, LMB adds/removes whole chunks int m_terrain_cells{32}; // grid resolution (quads per side) int m_terrain_chunks{4}; // chunks per side for a chunked terrain @@ -311,7 +315,6 @@ class editor_mode : public application_mode, private editor_track::observer // geoportal orthophoto layer drawn under the other viewport overlays void render_orthophoto_ui(); void render_map_menu(); - void render_orthophoto_window(); bool m_newscenery_asked{false}; void render_new_scenery_popup(); bool restart_for_new_scenery(); @@ -326,7 +329,7 @@ class editor_mode : public application_mode, private editor_track::observer std::vector m_openscenery_list; std::string m_openscenery_choice; void render_open_scenery_popup(); - bool m_orthophoto_window{false}; + bool m_orthophoto_expand{false}; // the orthophoto settings of the terrain tools are opened the next time they're drawn // origin of the scenery in PUWG 1992 the scenery file gives in its //$g line, if it does bool m_georeference_read{false}; bool m_georeference{false}; @@ -834,7 +837,10 @@ class editor_mode : public application_mode, private editor_track::observer bool m_track_window_open{false}; // the inspector is pinned to the right edge of the screen, the profile strip to the bottom one, both resized from the inner edge void render_track_inspector(); - void render_track_modes(TTrack *Track); + // the track tools in the tool options window, and the selected path in the inspector + void render_track_tool_options(); + void render_track_selection(); + void render_track_modes(); void show_track_tab(track_tab const Tab); bool track_analysis_tab() const { return m_track_tab == track_tab::profile || m_track_tab == track_tab::speed || m_track_tab == track_tab::joints || m_track_tab == track_tab::infra; } bool track_shortcut(int const Key); @@ -1746,7 +1752,8 @@ class editor_mode : public application_mode, private editor_track::observer char islandtext[128]{"none"}; }; void render_road_menu(); - void render_road_window(); + void render_road_tool_options(); + void render_road_selection(); bool render_road_layout(road_node::state &State); bool render_road_material(char const *Label, char *Buffer, std::size_t const Size, std::string &Value); void render_junction_layout(junction_node &Junction); diff --git a/application/editormodeprofile.cpp b/application/editormodeprofile.cpp index 974482cbc..9c23bd566 100644 --- a/application/editormodeprofile.cpp +++ b/application/editormodeprofile.cpp @@ -852,13 +852,11 @@ void editor_mode::render_profile_earthworks() } if (false == active_terrains().empty()) { + // the terrain tools take the tool options window over, the profile stays open under them if (ImGui::Button(STR_C("Sculpting..."))) - { - set_settings_open(true); - m_terrain_tab_wanted = true; - } + terrain_workspace(true); if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("Opens the terrain tab of the editor settings: raising, lowering and smoothing with a brush")); + ImGui::SetTooltip("%s", STR_C("Opens the terrain tools: raising, lowering and smoothing with a brush")); } ImGui::TreePop(); } diff --git a/application/editormoderoad.cpp b/application/editormoderoad.cpp index c7e7051c9..1a57ed30b 100644 --- a/application/editormoderoad.cpp +++ b/application/editormoderoad.cpp @@ -221,7 +221,10 @@ void editor_mode::render_road_menu() if (ImGui::BeginMenu("Roads")) { if (ImGui::MenuItem("Road editor", nullptr, &m_roadtool.window) && m_roadtool.window) + { m_track_window_open = false; + terrain_workspace(false); + } ImGui::MenuItem("Show lanes", nullptr, &m_roadtool.lanes); ImGui::EndMenu(); } @@ -2258,17 +2261,10 @@ bool editor_mode::render_road_layout(road_node::state &State) return changed; } -void editor_mode::render_road_window() +// the road tools and what the next pieces get, in the tool options window; the selection is drawn in the inspector by render_road_selection() +void editor_mode::render_road_tool_options() { auto &tool{m_roadtool}; - if (false == tool.window) - return; - ImGui::SetNextWindowSize(ImVec2(440.0f, 620.0f), ImGuiCond_FirstUseEver); - if (false == ImGui::Begin("Roads###roadeditor", &tool.window)) - { - ImGui::End(); - return; - } std::string reason; if (false == editor_road::available(&reason)) ImGui::TextColored(ImVec4(1.0f, 0.4f, 0.4f, 1.0f), "%s", reason.c_str()); @@ -2296,11 +2292,6 @@ void editor_mode::render_road_window() ImGui::SameLine(); ImGui::Checkbox("Show lanes", &tool.lanes); - // typed values are taken when confirmed, so nothing is made anew with each digit - auto const number = [](char const *Label, float &Value, float const Step, char const *Format) { - ImGui::SetNextItemWidth(120.0f); - return ImGui::InputFloat(Label, &Value, Step, Step * 4.0f, Format, ImGuiInputTextFlags_EnterReturnsTrue); - }; if (tool.tool == 1) { if (ImGui::Checkbox("Roundabout", &tool.ring)) @@ -2378,6 +2369,26 @@ void editor_mode::render_road_window() placing.kind = point_kind(tool.placekind); render_roadpoint_layout(placing, nullptr); } + else + ImGui::TextDisabled("The selected road is set up in the inspector"); + if (false == tool.status.empty()) + { + ImGui::Separator(); + ImGui::TextWrapped("%s", tool.status.c_str()); + } +} + +// what the select tool of the roads picked, in the inspector +void editor_mode::render_road_selection() +{ + auto &tool{m_roadtool}; + // typed values are taken when confirmed, so nothing is made anew with each digit + auto const number = [](char const *Label, float &Value, float const Step, char const *Format) { + ImGui::SetNextItemWidth(120.0f); + return ImGui::InputFloat(Label, &Value, Step, Step * 4.0f, Format, ImGuiInputTextFlags_EnterReturnsTrue); + }; + if (tool.tool != 0) + ImGui::TextDisabled("The select tool shows the road picked in the view here"); else if (tool.marker != nullptr) { auto &point{*tool.marker}; @@ -2490,12 +2501,6 @@ void editor_mode::render_road_window() ImGui::TextDisabled("LMB: select a road piece, a junction, a point where pieces meet,"); ImGui::TextDisabled("a level crossing or a traffic point"); } - if (false == tool.status.empty()) - { - ImGui::Separator(); - ImGui::TextWrapped("%s", tool.status.c_str()); - } - ImGui::End(); } void editor_mode::draw_road_overlay() const diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 8d9f8a725..3fcd91db4 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -745,104 +745,119 @@ void editor_mode::render_track_inspector() return; } - auto *track{selected_track()}; m_route_tab = m_track_tab != track_tab::path; - ImGui::SetNextWindowPos(ImVec2(io.DisplaySize.x - 460.0f, ImGui::GetFrameHeight() + 8.0f), ImGuiCond_FirstUseEver); - ImGui::SetNextWindowSize(ImVec2(440.0f, std::min(720.0f, io.DisplaySize.y - 80.0f)), ImGuiCond_FirstUseEver); - std::string title{STR_C("Tracks")}; - if (track != nullptr && m_track_tab != track_tab::lay && false == track_analysis_tab()) - title += ": " + (track->name().empty() ? std::string{"(noname)"} : track->name()); - title += "###trackinspector"; - if (ImGui::Begin(title.c_str(), &m_track_window_open, ImGuiWindowFlags_NoCollapse)) + // the tools of the mode are drawn in the tool options window and the selected path in the inspector, see + // render_track_tool_options() and render_track_selection(); the checks list what they find in a window of their own + if (m_track_tab == track_tab::speed || m_track_tab == track_tab::joints || m_track_tab == track_tab::infra) { - render_track_modes(track); - ImGui::BeginChild("##trackmode"); - switch (m_track_tab) + auto const *title{m_track_tab == track_tab::speed ? STR_C("Speed check") : m_track_tab == track_tab::joints ? STR_C("Joints") : STR_C("Infrastructure")}; + ImGui::SetNextWindowSize(ImVec2(600.0f, std::min(320.0f, io.DisplaySize.y - 80.0f)), ImGuiCond_FirstUseEver); + if (ImGui::Begin((std::string{title} + "###trackanalysis").c_str(), nullptr, ImGuiWindowFlags_NoCollapse)) { - case track_tab::lay: - render_lay_ui(); - break; - case track_tab::turnout: - if (track != nullptr && track->eType == tt_Switch) - render_turnout_ui(); - else - render_switch_ui(); - break; - case track_tab::straights: - render_straight_ui(); - if (ImGui::CollapsingHeader(STR_C("Straights in the scenery"))) - render_straights_ui(); - break; - case track_tab::route: - render_route_ui(); - break; - case track_tab::profile: render_profile_body(); break; - case track_tab::speed: render_speed_body(); break; - case track_tab::joints: render_joints_body(); break; - case track_tab::lineside: render_lineside_ui(); break; - case track_tab::signals: render_signal_ui(); break; - case track_tab::infra: render_infra_body(); break; - case track_tab::turntable: render_turntable_ui(); break; - default: - render_track_set_ui(); - render_track_spread_ui(); - if (track != nullptr) - render_path_ui(); - else - ImGui::TextDisabled("%s", STR_C("LMB on a path in the view selects it")); - break; + switch (m_track_tab) + { + case track_tab::speed: render_speed_body(); break; + case track_tab::joints: render_joints_body(); break; + default: render_infra_body(); break; + } } - ImGui::EndChild(); + ImGui::End(); } - ImGui::End(); - if (false == m_track_window_open) - ui()->set_track(false); if (m_track_tab == track_tab::profile && m_track_window_open && false == m_profile.route.spans.empty()) render_profile_strip(); } -void editor_mode::render_track_modes(TTrack *Track) +void editor_mode::render_track_tool_options() { - auto const &modes{track_modes()}; - auto const row = [&](char const *Label, int const From, int const To) { - ImGui::AlignTextToFramePadding(); - ImGui::TextDisabled("%s", STR_C(Label)); - for (int i = From; i < To; ++i) - { - auto const &mode{modes[i]}; - auto const label{std::string{STR_C(mode.label)} + "###trackmode" + std::to_string(i)}; - // the buttons which don't fit go on to the next line, under the first one - auto const width{ImGui::GetFrameHeight() + ImGui::GetStyle().ItemInnerSpacing.x + ImGui::CalcTextSize(STR_C(mode.label)).x}; - if (i == From) - ImGui::SameLine(72.0f); - else if (ImGui::GetItemRectMax().x + ImGui::GetStyle().ItemSpacing.x + width > ImGui::GetWindowPos().x + ImGui::GetWindowContentRegionMax().x) - ImGui::SetCursorPosX(72.0f); - else - ImGui::SameLine(); - if (ImGui::RadioButton(label.c_str(), m_track_tab == mode.tab)) - show_track_tab(mode.tab); - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s [%s]", STR_C(mode.tooltip), mode.key); - } - }; - row("Edit", 0, 7); - row("Analysis", 7, static_cast(modes.size())); - ImGui::SameLine(); - ImGui::Checkbox(STR_C("Structure gauge"), &m_gauge.open); - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("Checks which models enter the structure gauge of the tracks and the clearance over the roads (skrajnia budowli)")); + auto *track{selected_track()}; + render_track_modes(); render_track_search(); ImGui::Spacing(); render_track_guide(); - if (Track != nullptr && m_track_tab != track_tab::lay && false == track_analysis_tab()) + switch (m_track_tab) { - char const *type = Track->eType == tt_Normal ? "normal" : Track->eType == tt_Switch ? "switch" : Track->eType == tt_Cross ? "cross" : Track->eType == tt_Table ? "turntable" : Track->eType == tt_Tributary ? "tributary" : "unknown"; - ImGui::TextDisabled("%s, %.2f m", STR_C(type), Track->Length()); + case track_tab::lay: + render_lay_ui(); + break; + case track_tab::turnout: + if (track != nullptr && track->eType == tt_Switch) + render_turnout_ui(); + else + render_switch_ui(); + break; + case track_tab::straights: + render_straight_ui(); + if (ImGui::CollapsingHeader(STR_C("Straights in the scenery"))) + render_straights_ui(); + break; + case track_tab::route: + render_route_ui(); + break; + case track_tab::profile: render_profile_body(); break; + case track_tab::speed: + case track_tab::joints: + case track_tab::infra: + ImGui::TextDisabled("%s", STR_C("What the check finds is listed in its window")); + break; + case track_tab::lineside: render_lineside_ui(); break; + case track_tab::signals: render_signal_ui(); break; + case track_tab::turntable: render_turntable_ui(); break; + default: + render_track_set_ui(); + render_track_spread_ui(); + break; } } +void editor_mode::render_track_selection() +{ + auto *track{selected_track()}; + if (track == nullptr) + { + ImGui::TextDisabled("%s", STR_C("LMB on a path in the view selects it")); + return; + } + char const *type = track->eType == tt_Normal ? "normal" : track->eType == tt_Switch ? "switch" : track->eType == tt_Cross ? "cross" : track->eType == tt_Table ? "turntable" : track->eType == tt_Tributary ? "tributary" : "unknown"; + ImGui::TextUnformatted((track->name().empty() ? std::string{"(noname)"} : track->name()).c_str()); + ImGui::TextDisabled("%s, %.2f m", STR_C(type), track->Length()); + // the parameters of the path belong to the select tool, the other tools show the path they work with + if (m_track_tab == track_tab::path) + render_path_ui(); +} + +void editor_mode::render_track_modes() +{ + auto const &modes{track_modes()}; + // the tools in groups: building the track, what goes by it, the checks + auto const group = [&](char const *Label, std::initializer_list const Tabs) { + ImGui::SeparatorText(STR_C(Label)); + if (false == ImGui::BeginTable(Label, 3, ImGuiTableFlags_SizingStretchSame)) + return; + for (auto const tab : Tabs) + { + auto const found{std::find_if(modes.begin(), modes.end(), [&](track_mode const &Mode) { return Mode.tab == tab; })}; + if (found == modes.end()) + continue; + ImGui::TableNextColumn(); + auto const index{static_cast(found - modes.begin())}; + auto const label{std::string{STR_C(found->label)} + "###trackmode" + std::to_string(index)}; + if (ImGui::Selectable(label.c_str(), m_track_tab == tab)) + show_track_tab(tab); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s [%s]", STR_C(found->tooltip), found->key); + } + ImGui::EndTable(); + }; + group("Build", {track_tab::path, track_tab::lay, track_tab::turnout, track_tab::straights, track_tab::route, track_tab::turntable}); + group("By the track", {track_tab::signals, track_tab::lineside}); + group("Checks", {track_tab::profile, track_tab::speed, track_tab::joints, track_tab::infra}); + ImGui::Checkbox(STR_C("Structure gauge"), &m_gauge.open); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Checks which models enter the structure gauge of the tracks and the clearance over the roads (skrajnia budowli)")); +} + void editor_mode::render_track_guide() { auto const hints{track_key_hints(false)}; diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index dc38b282e..bc7fc7571 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -14,6 +14,7 @@ http://mozilla.org/MPL/2.0/. #include "utilities/utilities.h" #include "scene/scenenode.h" #include "scene/scenelayers.h" +#include "scene/scene.h" #include "rendering/renderer.h" #include "utilities/translation.h" #include "imgui/imgui_internal.h" @@ -31,8 +32,6 @@ editor_ui::editor_ui() add_external_panel(&m_layerspanel); add_external_panel(&m_includespanel); - m_nodebankpanel.mode_options = [this](nodebank_panel::edit_mode const Mode) { render_mode_options(Mode); }; - m_nodebankpanel.header_sections = [this]() { render_header_sections(); }; // the menu is a part of the layout of the editor, not a pop-up as in the driver mode m_menu_always = true; } @@ -67,22 +66,26 @@ void editor_ui::build_default_layout(unsigned int const Dockspace) ImGui::DockBuilderAddNode(Dockspace, ImGuiDockNodeFlags_DockSpace | ImGuiDockNodeFlags_PassthruCentralNode); ImGui::DockBuilderSetNodePos(Dockspace, viewport->WorkPos); ImGui::DockBuilderSetNodeSize(Dockspace, viewport->WorkSize); - // widths in pixels the current windows need, as parts of the room there is + // widths in pixels the windows need, as parts of the room there is auto const width{std::max(viewport->WorkSize.x, 1.0f)}; auto const height{std::max(viewport->WorkSize.y, 1.0f)}; - auto const left_width{std::min(440.0f * Global.ui_scale, width * 0.3f)}; + auto const left_width{std::min(400.0f * Global.ui_scale, width * 0.3f)}; auto const right_width{std::min(460.0f * Global.ui_scale, width * 0.3f)}; - auto const bottom_height{std::min(300.0f * Global.ui_scale, height * 0.35f)}; + auto const bottom_height{std::min(280.0f * Global.ui_scale, height * 0.35f)}; ImGuiID center{Dockspace}; - auto const left{ImGui::DockBuilderSplitNode(center, ImGuiDir_Left, left_width / width, nullptr, ¢er)}; - auto const right{ImGui::DockBuilderSplitNode(center, ImGuiDir_Right, right_width / (width - left_width), nullptr, ¢er)}; + auto const right{ImGui::DockBuilderSplitNode(center, ImGuiDir_Right, right_width / width, nullptr, ¢er)}; + auto const left{ImGui::DockBuilderSplitNode(center, ImGuiDir_Left, left_width / (width - right_width), nullptr, ¢er)}; auto const bottom{ImGui::DockBuilderSplitNode(center, ImGuiDir_Down, bottom_height / height, nullptr, ¢er)}; + // left: settings of the tool in use above, the scenery below + ImGuiID lefttop{left}; + auto const leftbottom{ImGui::DockBuilderSplitNode(lefttop, ImGuiDir_Down, 0.5f, nullptr, &lefttop)}; // windows are found by the stable part of their names, after ### - for (auto const *window : {"###Toolset", "###Layers", "###scenehierarchy"}) - ImGui::DockBuilderDockWindow(window, left); - for (auto const *window : {"###trackinspector", "###roadeditor", "###editorsettings", "###Include database", "###orthophoto", "###structuregauge"}) + ImGui::DockBuilderDockWindow("###tooloptions", lefttop); + for (auto const *window : {"###scenetree", "###Layers", "###scenehierarchy"}) + ImGui::DockBuilderDockWindow(window, leftbottom); + for (auto const *window : {"###inspector", "###editorsettings", "###Include database"}) ImGui::DockBuilderDockWindow(window, right); - for (auto const *window : {"###profilestrip", "###editorhistory", "###modelsets"}) + for (auto const *window : {"###Node bank", "###profilestrip", "###trackanalysis", "###structuregauge", "###editorhistory", "###modelsets"}) ImGui::DockBuilderDockWindow(window, bottom); ImGui::DockBuilderFinish(Dockspace); } @@ -102,6 +105,9 @@ void editor_ui::render_() } } ImGui::End(); + render_tool_options(); + render_inspector(); + render_scene(); // status bar: the outcome of the last operation, and the selected node if (ImGui::BeginViewportSideBar("##editorstatusbar", viewport, ImGuiDir_Down, ImGui::GetFrameHeight(), flags)) { @@ -186,34 +192,245 @@ void editor_ui::render_mode_options(nodebank_panel::edit_mode const Mode) } } -void editor_ui::render_header_sections() +void editor_ui::render_tool_options() { - if (ImGui::CollapsingHeader(STR_C("Gizmo"), ImGuiTreeNodeFlags_DefaultOpen)) + if (false == m_tooloptionsopen) + return; + ImGui::SetNextWindowSize(ImVec2S(400, 300), ImGuiCond_FirstUseEver); + auto const current{mode()}; + auto const active{m_workspace == workspace::terrain || (m_workspace == workspace::roads && current != nodebank_panel::TRACK) ? m_workspace : workspace::none}; + // a change of the mode brings the window forward, in case it shares its dock with another one + auto const shown{active != workspace::none ? 100 + static_cast(active) : static_cast(current)}; + if (shown != m_toolmode) { - if (m_gizmooptions) - m_gizmooptions(); + m_toolmode = shown; + ImGui::SetNextWindowFocus(); } - if (ImGui::CollapsingHeader(STR_C("Node properties"), ImGuiTreeNodeFlags_DefaultOpen)) + if (ImGui::Begin((std::string(STR_C("Tool options")) + "###tooloptions").c_str(), &m_tooloptionsopen, ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoCollapse)) { - ImGui::Indent(); - m_itempropertiespanel.render_body(); - ImGui::Unindent(); + char const *name{STR_C("Select")}; + switch (current) + { + case nodebank_panel::ADD: + name = STR_C("Insert"); + break; + case nodebank_panel::BRUSH: + name = STR_C("Brush"); + break; + case nodebank_panel::FILL: + name = STR_C("Area fill"); + break; + case nodebank_panel::COPY: + name = STR_C("Copy to bank"); + break; + case nodebank_panel::TRACK: + name = STR_C("Tracks"); + break; + default: + break; + } + if (active == workspace::roads) + name = "Roads"; + else if (active == workspace::terrain) + name = STR_C("Terrain"); + ImGui::SeparatorText(name); + if (active != workspace::none) + { + auto const &tools{m_workspacetools[static_cast(active)]}; + if (tools) + tools(); + } + else if (current == nodebank_panel::TRACK) + { + if (m_tracktools) + m_tracktools(); + } + else + render_mode_options(current); + if (ImGui::CollapsingHeader(STR_C("Gizmo"), ImGuiTreeNodeFlags_DefaultOpen)) + { + if (m_gizmooptions) + m_gizmooptions(); + } } - if (ImGui::CollapsingHeader(STR_C("Array"))) + ImGui::End(); +} + +void editor_ui::render_inspector() +{ + if (false == m_inspectoropen) + return; + ImGui::SetNextWindowSize(ImVec2S(420, 480), ImGuiCond_FirstUseEver); + if (ImGui::Begin((std::string(STR_C("Inspector")) + "###inspector").c_str(), &m_inspectoropen, ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoCollapse)) { - if (m_arrayoptions) - m_arrayoptions(); + if (mode() == nodebank_panel::TRACK) + { + // in the track mode the selection is a path + if (m_trackselection) + m_trackselection(); + ImGui::End(); + return; + } + if (auto const &selection{m_workspaceselection[static_cast(m_workspace)]}) + { + selection(); + ImGui::End(); + return; + } + if (ImGui::CollapsingHeader(STR_C("Node properties"), ImGuiTreeNodeFlags_DefaultOpen)) + { + ImGui::Indent(); + m_itempropertiespanel.render_body(); + ImGui::Unindent(); + } + if (ImGui::CollapsingHeader(STR_C("Array"))) + { + if (m_arrayoptions) + m_arrayoptions(); + } + if (m_bendexpand) + { + ImGui::SetNextItemOpen(true); + m_bendexpand = false; + } + if (ImGui::CollapsingHeader(STR_C("Bend along the track"))) + { + if (m_bendoptions) + m_bendoptions(); + } } - if (m_bendexpand) + ImGui::End(); +} + +void editor_ui::scene_rebuild() +{ + m_sceneentries.clear(); + m_sceneentries.reserve(scene::Hierarchy.size()); + for (auto const &entry : scene::Hierarchy) { - ImGui::SetNextItemOpen(true); - m_bendexpand = false; + if (entry.second == nullptr) + continue; + m_sceneentries.push_back({entry.first, entry.second->layer(), entry.second->group(), entry.second->name()}); } - if (ImGui::CollapsingHeader(STR_C("Bend along the track"))) + std::sort(m_sceneentries.begin(), m_sceneentries.end(), [](scene_entry const &Left, scene_entry const &Right) { + if (Left.layer != Right.layer) + return Left.layer < Right.layer; + if (Left.group != Right.group) + return Left.group < Right.group; + return Left.name < Right.name; + }); + m_scenesize = scene::Hierarchy.size(); + m_scenefilterused = "\x01"; // matches are found again +} + +void editor_ui::scene_row(std::size_t const Entry) +{ + auto const &entry{m_sceneentries[Entry]}; + // the node is looked up again, it may have been removed since the list was made + auto const lookup{scene::Hierarchy.find(entry.uuid)}; + auto *node{lookup != scene::Hierarchy.end() ? lookup->second : nullptr}; + if (node == nullptr) { - if (m_bendoptions) - m_bendoptions(); + ImGui::TextDisabled("%s", entry.name.c_str()); + return; } + auto const label{(node->name().empty() ? std::string{"(none)"} : node->name()) + "##" + entry.uuid}; + if (ImGui::Selectable(label.c_str(), node == m_node, ImGuiSelectableFlags_AllowDoubleClick) && m_sceneselect) + m_sceneselect(node, ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left)); + if (ImGui::IsItemHovered()) + { + auto const location{node->location()}; + ImGui::SetTooltip("%s\n%.1f, %.1f, %.1f\n%s", entry.uuid.c_str(), location.x, location.y, location.z, STR_C("Double click: fly to it")); + } +} + +void editor_ui::render_scene() +{ + if (false == m_sceneopen) + return; + ImGui::SetNextWindowSize(ImVec2S(400, 420), ImGuiCond_FirstUseEver); + if (ImGui::Begin((std::string(STR_C("Scene")) + "###scenetree").c_str(), &m_sceneopen, ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoCollapse)) + { + if (m_scenesize != scene::Hierarchy.size()) + scene_rebuild(); + if (ImGui::Button(STR_C("Refresh"))) + scene_rebuild(); + ImGui::SameLine(); + ImGui::SetNextItemWidth(-FLT_MIN); + ImGui::InputTextWithHint("##scenefilter", STR_C("Filter: name or uuid"), m_scenefilter, IM_ARRAYSIZE(m_scenefilter)); + ImGui::TextDisabled(STR_C("%zu models"), m_sceneentries.size()); + if (ImGui::BeginChild("##scenelist", ImVec2(0.0f, 0.0f), ImGuiChildFlags_Borders)) + { + std::string const filter{m_scenefilter}; + if (false == filter.empty()) + { + // a flat list of what matches the filter + if (filter != m_scenefilterused) + { + m_scenematches.clear(); + for (std::size_t idx = 0; idx < m_sceneentries.size(); ++idx) + if (contains(m_sceneentries[idx].name, filter) || contains(m_sceneentries[idx].uuid, filter)) + m_scenematches.push_back(idx); + m_scenefilterused = filter; + } + ImGuiListClipper clipper; + clipper.Begin(static_cast(m_scenematches.size())); + while (clipper.Step()) + for (int row = clipper.DisplayStart; row < clipper.DisplayEnd; ++row) + scene_row(m_scenematches[row]); + } + else + { + // layers, in them the groups (made by the includes), in these the models + std::size_t layerstart{0}; + while (layerstart < m_sceneentries.size()) + { + auto const layer{m_sceneentries[layerstart].layer}; + auto layerend{layerstart}; + while (layerend < m_sceneentries.size() && m_sceneentries[layerend].layer == layer) + ++layerend; + auto const layername{scene::Layers.valid(layer) ? scene::Layers.layer(layer).name : std::string{STR_C("(no layer)")}}; + auto const layerlabel{layername + " (" + std::to_string(layerend - layerstart) + ")##layer" + std::to_string(layer)}; + if (ImGui::TreeNodeEx(layerlabel.c_str(), m_sceneentries.size() == layerend - layerstart ? ImGuiTreeNodeFlags_DefaultOpen : 0)) + { + auto groupstart{layerstart}; + while (groupstart < layerend) + { + auto const group{m_sceneentries[groupstart].group}; + auto groupend{groupstart}; + while (groupend < layerend && m_sceneentries[groupend].group == group) + ++groupend; + auto const rows = [&](std::size_t const From, std::size_t const To) { + ImGuiListClipper clipper; + clipper.Begin(static_cast(To - From)); + while (clipper.Step()) + for (int row = clipper.DisplayStart; row < clipper.DisplayEnd; ++row) + scene_row(From + row); + }; + if (group == null_handle) + { + rows(groupstart, groupend); + } + else + { + auto const grouplabel{std::string{STR_C("Group")} + " " + std::to_string(group) + " (" + std::to_string(groupend - groupstart) + ")##group" + std::to_string(group)}; + if (ImGui::TreeNode(grouplabel.c_str())) + { + rows(groupstart, groupend); + ImGui::TreePop(); + } + } + groupstart = groupend; + } + ImGui::TreePop(); + } + layerstart = layerend; + } + } + } + ImGui::EndChild(); + } + ImGui::End(); } void editor_ui::render_menu_contents() @@ -256,7 +473,10 @@ void editor_ui::render_menu_contents() if (ImGui::MenuItem(STR_C("Reset window layout"))) m_layoutreset = true; ImGui::Separator(); - ImGui::MenuItem(STR_C("Toolset"), nullptr, &m_nodebankpanel.is_open); + ImGui::MenuItem(STR_C("Tool options"), nullptr, &m_tooloptionsopen); + ImGui::MenuItem(STR_C("Inspector"), nullptr, &m_inspectoropen); + ImGui::MenuItem(STR_C("Scene"), nullptr, &m_sceneopen); + ImGui::MenuItem(STR_C("Node bank"), nullptr, &m_nodebankpanel.is_open); ImGui::MenuItem(STR_C("Layers"), nullptr, &m_layerspanel.is_open); ImGui::MenuItem(STR_C("Include database"), nullptr, &m_includespanel.is_open); ImGui::EndMenu(); @@ -330,7 +550,6 @@ nodebank_panel::edit_mode editor_ui::mode() } void editor_ui::set_mode(nodebank_panel::edit_mode const Mode) { - m_nodebankpanel.requested_mode = Mode; m_nodebankpanel.mode = Mode; m_nodebankpanel.is_open = true; } diff --git a/application/editoruilayer.h b/application/editoruilayer.h index a1d4cd351..f28484dd6 100644 --- a/application/editoruilayer.h +++ b/application/editoruilayer.h @@ -97,13 +97,47 @@ class editor_ui : public ui_layer { return m_viewmax; } + // tools of the track mode in the tool options window, the selected path in the inspector + void set_track_options(std::function Tools, std::function Selection) + { + m_tracktools = std::move(Tools); + m_trackselection = std::move(Selection); + } + // fields of work of the editor mode besides the edit modes, chosen in its toolbar: their tools are drawn in the tool options window, + // what they have selected in the inspector. the terrain is shown over the track mode, the roads give way to it + enum class workspace + { + none, + roads, + terrain, + count_ + }; + void set_workspace(workspace const Workspace) + { + m_workspace = Workspace; + } + void set_workspace_options(workspace const Workspace, std::function Tools, std::function Selection = {}) + { + m_workspacetools[static_cast(Workspace)] = std::move(Tools); + m_workspaceselection[static_cast(Workspace)] = std::move(Selection); + } + // selection of a node in the scene window; Focus is set when the camera is to fly to it + void set_scene_select(std::function Select) + { + m_sceneselect = std::move(Select); + } // shows outcome of an operation in the layers window void set_status(std::string const &Status, bool const Error = false); private: // methods void render_mode_options(nodebank_panel::edit_mode const Mode); - void render_header_sections(); + // windows of the editor drawn by the user interface itself + void render_tool_options(); + void render_inspector(); + void render_scene(); + void scene_rebuild(); + void scene_row(std::size_t const Entry); void render_menu_contents() override; void render_dockspace() override; void render_() override; @@ -112,7 +146,7 @@ class editor_ui : public ui_layer // members itemproperties_panel m_itempropertiespanel{"Node Properties", true}; // not a window of its own, drawn in the toolset window functions_panel m_functionspanel{"Functions", true}; // not a window of its own, its settings are drawn in the toolset tabs - nodebank_panel m_nodebankpanel{"Toolset", true}; // main editor window: gizmo, node properties, edit modes and the node bank + nodebank_panel m_nodebankpanel{"Node bank", true}; // templates to insert, paint or fill with layers_panel m_layerspanel{"Layers", true}; includes_panel m_includespanel{"Include database", false}; std::function m_save; @@ -126,6 +160,29 @@ class editor_ui : public ui_layer std::function m_menuoptions; std::function m_toolbaroptions; bool m_layoutreset{false}; // the default layout is to be built again on the next frame + bool m_tooloptionsopen{true}; + bool m_inspectoropen{true}; + bool m_sceneopen{true}; + std::function m_sceneselect; + std::function m_tracktools; + std::function m_trackselection; + int m_toolmode{-1}; // edit mode or field of work the tool options were drawn for the last time + workspace m_workspace{workspace::none}; + std::array, static_cast(workspace::count_)> m_workspacetools; + std::array, static_cast(workspace::count_)> m_workspaceselection; + // scene window: the models of the scenery by layer and group, rebuilt when their number changes + struct scene_entry + { + std::string uuid; // key in scene::Hierarchy, the node is looked up by it when drawn + scene::layer_handle layer; + scene::group_handle group; + std::string name; + }; + std::vector m_sceneentries; + std::size_t m_scenesize{static_cast(-1)}; + char m_scenefilter[64]{}; + std::string m_scenefilterused; + std::vector m_scenematches; static glm::vec2 m_viewmin; static glm::vec2 m_viewmax; std::function m_gizmooptions; diff --git a/application/editoruipanels.cpp b/application/editoruipanels.cpp index a36072eda..2381d40f1 100644 --- a/application/editoruipanels.cpp +++ b/application/editoruipanels.cpp @@ -598,8 +598,7 @@ void nodebank_panel::render() } else { - // mode settings are drawn above the list, so start with a window tall enough for both - ImGui::SetNextWindowSize(ImVec2S(440, 640), ImGuiCond_FirstUseEver); + ImGui::SetNextWindowSize(ImVec2S(440, 400), ImGuiCond_FirstUseEver); } if (size_min.x > 0) { @@ -619,32 +618,8 @@ void nodebank_panel::render() m_setsopen = !m_setsopen; } - if (header_sections) - { - header_sections(); - } - - // edit modes as tabs, each with its own settings - std::pair const modes[] = {{STR_C("Select"), MODIFY}, {STR_C("Insert"), ADD}, {STR_C("Brush"), BRUSH}, {STR_C("Area fill"), FILL}, {STR_C("Copy to bank"), COPY}}; - if (ImGui::BeginTabBar("##editmodes", ImGuiTabBarFlags_FittingPolicyResizeDown)) - { - for (auto const &tab : modes) - { - if (false == ImGui::BeginTabItem(tab.first, nullptr, requested_mode == tab.second ? ImGuiTabItemFlags_SetSelected : 0)) - { - continue; - } - mode = tab.second; - if (mode_options) - { - mode_options(mode); - } - ImGui::EndTabItem(); - } - ImGui::EndTabBar(); - requested_mode = -1; - } - + // the edit modes are chosen in the toolbar and set up in the tool options window, the gizmo and the node + // properties are in the inspector: what's left here is the node bank itself ImGui::Separator(); ImGui::PushItemWidth(-1); ImGui::InputTextWithHint(STR_C("Search"), STR_C("Search node bank"), m_nodesearch, IM_ARRAYSIZE(m_nodesearch)); diff --git a/application/editoruipanels.h b/application/editoruipanels.h index 7da838700..85d862b3a 100644 --- a/application/editoruipanels.h +++ b/application/editoruipanels.h @@ -132,7 +132,6 @@ class nodebank_panel : public ui_panel TRACK }; edit_mode mode = MODIFY; - int requested_mode{-1}; // tab brought forward on the next frame nodebank_panel(std::string const &Name, bool const Isopen); void nodebank_reload(); @@ -157,10 +156,6 @@ class nodebank_panel : public ui_panel // shows the set manager window, optionally with specified user set selected void open_sets_window(int const Setid = 0); - // draws settings of the active edit mode inside its tab - std::function mode_options; - // draws sections attached above the mode tabs (gizmo, node properties) - std::function header_sections; private: // methods: diff --git a/lang/editor_pl.po b/lang/editor_pl.po index 75c50c410..f632bc85d 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -2027,8 +2027,8 @@ msgstr "Długość, na której skarpa przechodzi w koronę i w teren; 0: ostre k msgid "Sculpting..." msgstr "Rzeźbienie..." -msgid "Opens the terrain tab of the editor settings: raising, lowering and smoothing with a brush" -msgstr "Otwiera zakładkę terenu w ustawieniach edytora: podnoszenie, obniżanie i wygładzanie pędzlem" +msgid "Opens the terrain tools: raising, lowering and smoothing with a brush" +msgstr "Otwiera narzędzia terenu: podnoszenie, obniżanie i wygładzanie pędzlem" # scenery editor: track editor, selection, joints, parallel track, hectometre posts, fouling points @@ -2458,9 +2458,6 @@ msgstr "Ortofotomapa" msgid "Orthophoto settings..." msgstr "Ustawienia ortofotomapy..." -msgid "Orthophoto##window" -msgstr "Ortofotomapa##window" - msgid "Aerial imagery of geoportal.gov.pl under the scenery, laid out by the origin of the scenery" msgstr "Zdjęcia lotnicze z geoportal.gov.pl pod scenerią, ułożone według punktu odniesienia scenerii" @@ -4599,3 +4596,48 @@ msgstr "Przywróć układ okien" msgid "Selected:" msgstr "Zaznaczono:" + +msgid "Tool options" +msgstr "Opcje narzędzia" + +msgid "Inspector" +msgstr "Inspektor" + +msgid "Scene" +msgstr "Scena" + +msgid "Node bank" +msgstr "Bank obiektów" + +msgid "Refresh" +msgstr "Odśwież" + +msgid "Filter: name or uuid" +msgstr "Filtr: nazwa lub uuid" + +msgid "%zu models" +msgstr "modeli: %zu" + +msgid "(no layer)" +msgstr "(bez warstwy)" + +msgid "Group" +msgstr "Grupa" + +msgid "Double click: fly to it" +msgstr "Dwuklik: kamera leci do niego" + +msgid "By the track" +msgstr "Przy torze" + +msgid "Checks" +msgstr "Kontrola" + +msgid "Infrastructure" +msgstr "Infrastruktura" + +msgid "Speed check" +msgstr "Kontrola prędkości" + +msgid "What the check finds is listed in its window" +msgstr "Wyniki kontroli są w jej oknie" From aa03cb3235db65625b3515bd45109ba5a5af211c Mon Sep 17 00:00:00 2001 From: maj00r Date: Thu, 8 Oct 2026 22:44:41 +0200 Subject: [PATCH 180/430] move bended model alongside track --- application/editormodesweep.cpp | 43 +++++++++++++++++++++++++-------- lang/editor_pl.po | 15 ++++++++++++ 2 files changed, 48 insertions(+), 10 deletions(-) diff --git a/application/editormodesweep.cpp b/application/editormodesweep.cpp index ed5e10dcb..ea194bda8 100644 --- a/application/editormodesweep.cpp +++ b/application/editormodesweep.cpp @@ -1656,6 +1656,12 @@ void editor_mode::render_bend() state.height = overhead + kRailTop; changed = true; } + double along{sweep->distance_at(bend_fixed(*sweep, state.point))}; + if (ImGui::InputDouble(STR_C("along the track (m)"), &along, 0.1, 1.0, "%.2f")) + { + bend_stretch(*sweep, along, stretch, state.point, state); + changed = true; + } double length{stretch}; if (ImGui::InputDouble(STR_C("length (m)"), &length, 0.5, 5.0, "%.2f") && length > 0.1) { @@ -1708,6 +1714,7 @@ void editor_mode::render_bend() ImGui::SetTooltip("%s", STR_C("Puts the edge facing the track at the distance chosen from its axis, set back by the widening of the gauge in the curves.\n" "Stands on the plane of the rail heads carried on to its edge: lower on the inner side of a canted curve,\n" "higher on the outer one; on the inner side also set back by the cant times the height of the edge / 1.5")); + ImGui::TextDisabled("%s", STR_C("In the view: drag the blue cross along the track and aside; Shift: height; Ctrl: only along")); if (changed) bend_edit(state); if (ImGui::Button(STR_C("Done"))) @@ -1876,7 +1883,7 @@ bool editor_mode::bend_drag_start(int const Mods) if (false == projection.project(marker, screen)) return false; auto const &mouse{ImGui::GetIO().MousePos}; - if ((mouse.x - screen.x) * (mouse.x - screen.x) + (mouse.y - screen.y) * (mouse.y - screen.y) > 14.0f * 14.0f) + if ((mouse.x - screen.x) * (mouse.x - screen.x) + (mouse.y - screen.y) * (mouse.y - screen.y) > 18.0f * 18.0f) return false; tool.dragging = (Mods & GLFW_MOD_SHIFT) != 0 ? 2 : (Mods & GLFW_MOD_CONTROL) != 0 ? 3 : 1; tool.drag_state = sweep->definition(); @@ -1912,8 +1919,8 @@ void editor_mode::bend_drag_update() } if (tool.over_marker) { - tool.label = STR("Drag: offset from the track"); - tool.details = STR("Shift: height Ctrl: along the track"); + tool.label = STR("Drag: along the track and aside"); + tool.details = STR("Shift: height Ctrl: only along the track"); } else if (ui()->mode() == nodebank_panel::MODIFY && m_input.mouse.button(GLFW_MOUSE_BUTTON_RIGHT) != GLFW_PRESS) { @@ -1957,6 +1964,26 @@ void editor_mode::bend_drag_update() auto const step{0.01}; auto const snap = [&](double const Value) { return std::round(Value / step) * step; }; auto state{tool.drag_state}; + auto const slide = [&](double const Shift) { + auto const span{(tool.drag_state.to < 0.0 ? sweep->length() : tool.drag_state.to) - tool.drag_state.from}; + auto from{tool.drag_state.from + Shift}; + auto to{from + span}; + if (span > 0.1 && span <= sweep->length() + 1e-6) + { + if (from < 0.0) + { + to -= from; + from = 0.0; + } + if (to > sweep->length()) + { + from = std::max(0.0, sweep->length() - span); + to = from + span; + } + } + state.from = from; + state.to = to; + }; if (tool.dragging == 2) { glm::dvec3 origin, direction; @@ -1979,22 +2006,18 @@ void editor_mode::bend_drag_update() return; double lateral; auto const station{sweep->project(point, lateral)}; + auto const shift{snap(station - tool.drag_station)}; + slide(shift); if (tool.dragging == 1) { auto const at{sweep->frame_at(station)}; state.lateral = snap(lateral - sweep->setback(at)); if (std::abs(state.lateral) < step) state.lateral = std::copysign(step, tool.drag_state.lateral); - tool.drag_label = format(STR_C("%.2f m from the track axis"), std::abs(state.lateral)); + tool.drag_label = format(STR_C("%.2f m from the track, %+.2f m along"), std::abs(state.lateral), shift); } else - { - auto const shift{snap(station - tool.drag_station)}; - state.from = tool.drag_state.from + shift; - if (tool.drag_state.to >= 0.0) - state.to = tool.drag_state.to + shift; tool.drag_label = format(STR_C("%+.2f m along the track"), shift); - } } if (false == (state == sweep->definition())) sweep->define(state); diff --git a/lang/editor_pl.po b/lang/editor_pl.po index a24e69dbf..50d2c535b 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -3638,6 +3638,9 @@ msgstr "od osi toru (m, + w prawo)" msgid "over the rail head (m)" msgstr "nad główką szyny (m)" +msgid "along the track (m)" +msgstr "wzdłuż toru (m)" + msgid "length (m)" msgstr "długość (m)" @@ -3686,6 +3689,18 @@ msgstr "Zapisz i otwórz" msgid "In the view: drag the blue cross sideways to set the offset, with Shift up and down, with Ctrl along the track" msgstr "W widoku: przeciągnij niebieski celownik w bok, żeby ustawić odsunięcie, z Shift w górę i w dół, z Ctrl wzdłuż toru" +msgid "In the view: drag the blue cross along the track and aside; Shift: height; Ctrl: only along" +msgstr "W widoku: przeciągnij niebieski celownik wzdłuż toru i w bok; Shift: wysokość; Ctrl: tylko wzdłuż" + +msgid "Drag: along the track and aside" +msgstr "Przeciągnij: wzdłuż toru i w bok" + +msgid "Shift: height Ctrl: only along the track" +msgstr "Shift: wysokość Ctrl: tylko wzdłuż toru" + +msgid "%.2f m from the track, %+.2f m along" +msgstr "%.2f m od toru, %+.2f m wzdłuż" + msgid "Drag: offset from the track; Shift: height; Ctrl: along the track" msgstr "Przeciągnij: odsunięcie od toru; Shift: wysokość; Ctrl: wzdłuż toru" From 4b451622de1c680544da3664c2d5c7a594e45f5d Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Thu, 8 Oct 2026 23:27:17 +0200 Subject: [PATCH 181/430] feat(editor): pins of the docks: an unpinned dock hides its windows in a strip at the edge of the main window, a tab of the strip shows its window over the 3d view when pointed at for a moment or clicked, and it goes back when the cursor leaves it or on a click elsewhere, but not while it's in use (button held, popup open, typing, drag); pin in the tab bar of each dock, or Unpin in its window menu where the tabs leave no room; pin in the title of the shown window, or docking it by hand, puts the dock back next to the docks at that edge; Ctrl+Space (also in Mode windows) unpins all docks for the most of the view, or pins them back the way they were; unpinned docks kept in imgui.ini, cleared by Reset window layout; Polish translation --- application/editormode.cpp | 8 + application/editoruilayer.cpp | 498 ++++++++++++++++++++++++++++++++++ application/editoruilayer.h | 42 +++ application/uilayer.cpp | 3 + lang/editor_pl.po | 15 + 5 files changed, 566 insertions(+) diff --git a/application/editormode.cpp b/application/editormode.cpp index de441f6a0..5bdab443b 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -4283,6 +4283,14 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in return; } + // all docks unpinned and hidden at the edges, for the most of the view, or pinned back + if (Global.ctrlState && false == Global.shiftState && Key == GLFW_KEY_SPACE) + { + if (is_press(Action)) + ui()->toggle_docks(); + return; + } + // save; checked ahead of the camera keys, which have S bound to moving back if (Global.ctrlState && false == Global.shiftState && Key == GLFW_KEY_S) { diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index bc7fc7571..84a9c3c0f 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -19,6 +19,9 @@ http://mozilla.org/MPL/2.0/. #include "utilities/translation.h" #include "imgui/imgui_internal.h" +#include +#include + glm::vec2 editor_ui::m_viewmin{0.0f}; glm::vec2 editor_ui::m_viewmax{0.0f}; @@ -34,6 +37,8 @@ editor_ui::editor_ui() // the menu is a part of the layout of the editor, not a pop-up as in the driver mode m_menu_always = true; + // the window menu of the docks can unpin them + GImGui->DockNodeWindowMenuHandler = &editor_ui::autohide_menu; } void editor_ui::render_dockspace() @@ -41,11 +46,17 @@ void editor_ui::render_dockspace() // windows of the editor are docked around the 3d view, which is left free in the middle auto *viewport{ImGui::GetMainViewport()}; auto const dockspace{ImGui::GetID("###editordockspace")}; + m_dockspace = dockspace; if (m_layoutreset || ImGui::DockBuilderGetNode(dockspace) == nullptr) { m_layoutreset = false; + // the windows go to their default docks, none is left unpinned + m_autohide.clear(); + m_autohideshown = 0; + ImGui::MarkIniSettingsDirty(); build_default_layout(dockspace); } + autohide_begin(); ImGui::DockSpaceOverViewport(dockspace, viewport, ImGuiDockNodeFlags_PassthruCentralNode); if (auto const *central{ImGui::DockBuilderGetCentralNode(dockspace)}; central != nullptr) { @@ -57,6 +68,7 @@ void editor_ui::render_dockspace() m_viewmin = {viewport->WorkPos.x, viewport->WorkPos.y}; m_viewmax = {viewport->WorkPos.x + viewport->WorkSize.x, viewport->WorkPos.y + viewport->WorkSize.y}; } + autohide_place(); } void editor_ui::build_default_layout(unsigned int const Dockspace) @@ -90,6 +102,485 @@ void editor_ui::build_default_layout(unsigned int const Dockspace) ImGui::DockBuilderFinish(Dockspace); } +// unpinned docks. imgui has no auto-hide of its own: the windows of an unpinned dock are undocked, kept hidden while they aren't shown, +// and the one shown is placed over the edge of the 3d view its dock was at. a window docked again by hand is pinned again +std::vector editor_ui::m_autohide; +unsigned int editor_ui::m_dockspace{0}; + +namespace +{ + +// imgui math operators aren't defined here, imgui.h is included before imgui_internal.h asks for them +ImVec2 vec_add(ImVec2 const A, ImVec2 const B) +{ + return {A.x + B.x, A.y + B.y}; +} +ImVec2 vec_sub(ImVec2 const A, ImVec2 const B) +{ + return {A.x - B.x, A.y - B.y}; +} +ImVec2 vec_mul(ImVec2 const A, float const B) +{ + return {A.x * B, A.y * B}; +} + +bool autohide_vertical(int const Edge) +{ + return Edge == ImGuiDir_Left || Edge == ImGuiDir_Right; +} + +// leaf nodes of the dockspace which hold windows, the central node aside +void autohide_leaves(ImGuiDockNode *Node, std::vector &Leaves) +{ + if (Node == nullptr) + return; + if (Node->IsLeafNode()) + { + if (false == Node->IsCentralNode() && Node->Windows.Size > 0) + Leaves.push_back(Node); + return; + } + autohide_leaves(Node->ChildNodes[0], Leaves); + autohide_leaves(Node->ChildNodes[1], Leaves); +} + +// edge of the central node the node lies at +int autohide_edge(ImGuiDockNode const *Node, ImGuiDockNode const *Central) +{ + if (Central == nullptr) + return ImGuiDir_Left; + auto const center{vec_add(Node->Pos, vec_mul(Node->Size, 0.5f))}; + if (center.x < Central->Pos.x) + return ImGuiDir_Left; + if (center.x > Central->Pos.x + Central->Size.x) + return ImGuiDir_Right; + if (center.y > Central->Pos.y + Central->Size.y) + return ImGuiDir_Down; + return ImGuiDir_Up; +} + +// pin drawn with primitives, there's no icon font; a pinned one stands, an unpinned one lies +void autohide_draw_pin(ImDrawList *List, ImRect const &Rect, bool const Pinned, bool const Hovered) +{ + auto const color{ImGui::GetColorU32(ImGuiCol_Text)}; + if (Hovered) + List->AddRectFilled(Rect.Min, Rect.Max, ImGui::GetColorU32(ImGuiCol_ButtonHovered), 2.0f); + auto const center{Rect.GetCenter()}; + auto const s{Rect.GetWidth()}; + // along the pin: from the head to the point, and across it + ImVec2 const along{Pinned ? ImVec2(0.0f, 1.0f) : ImVec2(-1.0f, 0.0f)}; + ImVec2 const across{along.y, -along.x}; + auto const head{vec_sub(center, vec_mul(along, s * 0.30f))}; + auto const collar{vec_add(center, vec_mul(along, s * 0.05f))}; + auto const point{vec_add(center, vec_mul(along, s * 0.40f))}; + auto const half{vec_mul(across, s * 0.16f)}; + auto const guard{vec_mul(across, s * 0.30f)}; + // the head and the collar the needle comes out of + List->AddQuadFilled(vec_sub(head, half), vec_add(head, half), vec_add(collar, half), vec_sub(collar, half), color); + List->AddLine(vec_sub(collar, guard), vec_add(collar, guard), color, 1.5f); + List->AddLine(collar, point, color, 1.0f); +} + +// text turned to read from the top down, for the strips at the sides +void autohide_vertical_text(ImDrawList *List, ImVec2 const Position, ImU32 const Color, char const *Begin, char const *End) +{ + auto const height{ImGui::GetFontSize()}; + auto const first{List->VtxBuffer.Size}; + // the glyphs are laid out across first, from the left edge of the main window: out of the clip rectangle or the screen + // they'd be left out, as they would at the right edge + ImVec2 const origin{ImGui::GetMainViewport()->Pos.x, Position.y}; + List->PushClipRectFullScreen(); + List->AddText(origin, Color, Begin, End); + List->PopClipRect(); + for (auto index = first; index < List->VtxBuffer.Size; ++index) + { + auto &position{List->VtxBuffer[index].pos}; + auto const offset{vec_sub(position, origin)}; + position = ImVec2(Position.x + height - offset.y, Position.y + offset.x); + } +} + +} // namespace + +std::size_t editor_ui::autohide_group_of(unsigned int const Window) +{ + for (std::size_t index = 0; index < m_autohide.size(); ++index) + if (std::find(m_autohide[index].windows.begin(), m_autohide[index].windows.end(), Window) != m_autohide[index].windows.end()) + return index; + return static_cast(-1); +} + +void editor_ui::autohide_node(ImGuiDockNode *Node) +{ + if (Node == nullptr || Node->Windows.Size == 0 || Node->IsCentralNode()) + return; + autohide_group group; + group.edge = autohide_edge(Node, ImGui::DockNodeGetRootNode(Node)->CentralNode); + group.size = autohide_vertical(group.edge) ? Node->Size.x : Node->Size.y; + // place in the column of docks at that edge; a dock alone there goes back before the one which comes back to it + auto const along{autohide_vertical(group.edge) ? ImGuiAxis_Y : ImGuiAxis_X}; + group.first = true; + if (auto const *parent{Node->ParentNode}; parent != nullptr && parent->SplitAxis == along) + { + group.first = parent->ChildNodes[0] == Node; + group.share = along == ImGuiAxis_Y ? Node->Size.y / std::max(parent->Size.y, 1.0f) : Node->Size.x / std::max(parent->Size.x, 1.0f); + } + // docks split along the edge make one column; the docks put back all at once are put back from the outer columns in, + // so each spans as far as it did + auto const *column{Node}; + while (column->ParentNode != nullptr && column->ParentNode->SplitAxis == along) + column = column->ParentNode; + for (auto const *parent{column->ParentNode}; parent != nullptr; parent = parent->ParentNode) + ++group.depth; + for (auto *window : Node->Windows) + { + group.windows.push_back(window->ID); + // carried out at the start of the next frame + ImGui::DockContextQueueUndockWindow(GImGui, window); + } + m_autohide.push_back(std::move(group)); + ImGui::MarkIniSettingsDirty(); +} + +void editor_ui::autohide_pin(std::size_t const Group) +{ + if (Group >= m_autohide.size()) + return; + auto &group{m_autohide[Group]}; + auto *central{ImGui::DockBuilderGetCentralNode(m_dockspace)}; + ImGuiID target{0}; + if (central != nullptr) + { + // the node went with its last window, and its id may have been given to another one since: another dock at that edge + // gets split, so that docks taken there one by one come back the way they were, or the room of the view does + std::vector leaves; + autohide_leaves(ImGui::DockBuilderGetNode(m_dockspace), leaves); + ImGuiDockNode *neighbour{nullptr}; + for (auto *leaf : leaves) + if (autohide_edge(leaf, central) == group.edge) + neighbour = leaf; + ImGuiID rest{0}; + if (neighbour != nullptr) + { + auto const vertical{autohide_vertical(group.edge)}; + auto const direction{vertical ? (group.first ? ImGuiDir_Up : ImGuiDir_Down) : (group.first ? ImGuiDir_Left : ImGuiDir_Right)}; + target = ImGui::DockBuilderSplitNode(neighbour->ID, direction, std::clamp(group.share, 0.15f, 0.85f), nullptr, &rest); + } + else + { + auto const room{std::max(autohide_vertical(group.edge) ? central->Size.x : central->Size.y, 1.0f)}; + target = ImGui::DockBuilderSplitNode(central->ID, static_cast(group.edge), std::clamp(group.size / room, 0.1f, 0.45f), nullptr, &rest); + } + } + if (target == 0) + return; + for (auto const id : group.windows) + if (auto const *window{ImGui::FindWindowByID(id)}; window != nullptr) + ImGui::DockBuilderDockWindow(window->Name, target); + ImGui::DockBuilderFinish(m_dockspace); + ImGui::MarkIniSettingsDirty(); +} + +void editor_ui::autohide_show(unsigned int const Window, bool const Focus) +{ + m_autohideshown = Window; + m_autohideappear = true; + m_autohidefocus = Focus; + m_autohideleft = -1.0; +} + +void editor_ui::autohide_begin() +{ + auto &g{*GImGui}; + // all docks unpinned, or all pinned back when none is left. the unpinned ones are undocked at the start of the next frame + auto unpinall{false}; + if (m_dockstoggle) + { + m_dockstoggle = false; + std::vector leaves; + autohide_leaves(ImGui::DockBuilderGetNode(m_dockspace), leaves); + unpinall = false == leaves.empty(); + if (false == unpinall) + { + for (std::size_t index = 0; index < m_autohide.size(); ++index) + m_autohidepin.push_back(index); + std::stable_sort(m_autohidepin.begin(), m_autohidepin.end(), [](std::size_t const Left, std::size_t const Right) { return m_autohide[Left].depth < m_autohide[Right].depth; }); + } + } + for (auto const index : m_autohidepin) + autohide_pin(index); + m_autohidepin.clear(); + // windows docked again, by the pin or by hand, are pinned + auto changed{false}; + for (auto &group : m_autohide) + { + auto const count{group.windows.size()}; + std::erase_if(group.windows, [](unsigned int const Id) { + auto const *window{ImGui::FindWindowByID(Id)}; + return window != nullptr && window->DockId != 0; + }); + changed |= group.windows.size() != count; + } + std::erase_if(m_autohide, [](autohide_group const &Group) { return Group.windows.empty(); }); + if (changed) + ImGui::MarkIniSettingsDirty(); + if (autohide_group_of(m_autohideshown) == static_cast(-1)) + m_autohideshown = 0; + + // the shown window goes back when the cursor has been away from it for a while, or at once on a click elsewhere; + // it stays while it's in use: a button held, a field being typed in, a popup open, a drag + if (auto *shown{m_autohideshown != 0 ? ImGui::FindWindowByID(m_autohideshown) : nullptr}; shown != nullptr && false == m_autohideappear) + { + auto const &io{ImGui::GetIO()}; + auto area{shown->Rect()}; + area.Expand(8.0f); + auto const over{area.Contains(io.MousePos) || m_autohidestrip}; + auto const popup{ImGui::IsPopupOpen("", ImGuiPopupFlags_AnyPopupId | ImGuiPopupFlags_AnyPopupLevel)}; + auto const typing{io.WantTextInput && g.ActiveIdWindow != nullptr && g.ActiveIdWindow->RootWindow == shown}; + auto const busy{ImGui::IsAnyMouseDown() || g.MovingWindow != nullptr || popup || typing || ImGui::IsDragDropActive()}; + if (false == over && false == popup && (ImGui::IsMouseClicked(ImGuiMouseButton_Left) || ImGui::IsMouseClicked(ImGuiMouseButton_Right))) + m_autohideshown = 0; + else if (over || busy) + m_autohideleft = -1.0; + else if (m_autohideleft < 0.0) + m_autohideleft = ImGui::GetTime(); + else if (ImGui::GetTime() - m_autohideleft > 0.5) + m_autohideshown = 0; + } + // the rest stay hidden. the count goes down in Begin before it's checked, so it's set to 2 to hide the window in this frame + for (auto const &group : m_autohide) + for (auto const id : group.windows) + if (id != m_autohideshown) + if (auto *window{ImGui::FindWindowByID(id)}; window != nullptr) + window->HiddenFramesCanSkipItems = static_cast(std::max(window->HiddenFramesCanSkipItems, 2)); + // after the check above, the windows are still docked until the next frame + if (unpinall) + { + std::vector leaves; + autohide_leaves(ImGui::DockBuilderGetNode(m_dockspace), leaves); + for (auto *leaf : leaves) + autohide_node(leaf); + } +} + +void editor_ui::autohide_place() +{ + auto *shown{m_autohideshown != 0 ? ImGui::FindWindowByID(m_autohideshown) : nullptr}; + if (shown == nullptr) + return; + auto &group{m_autohide[autohide_group_of(m_autohideshown)]}; + auto const vertical{autohide_vertical(group.edge)}; + // the size the user gave it by dragging its edge is kept for the next time + if (false == m_autohideappear) + group.size = vertical ? shown->SizeFull.x : shown->SizeFull.y; + auto const room{vertical ? m_viewmax.x - m_viewmin.x : m_viewmax.y - m_viewmin.y}; + auto const size{std::clamp(group.size, std::min(120.0f, room), std::max(room * 0.85f, 1.0f))}; + ImVec2 position{m_viewmin.x, m_viewmin.y}; + ImVec2 extent{vertical ? size : m_viewmax.x - m_viewmin.x, vertical ? m_viewmax.y - m_viewmin.y : size}; + if (group.edge == ImGuiDir_Right) + position.x = m_viewmax.x - size; + else if (group.edge == ImGuiDir_Down) + position.y = m_viewmax.y - size; + ImGui::SetWindowCollapsed(shown, false, ImGuiCond_Always); + ImGui::SetWindowSize(shown, extent, ImGuiCond_Always); + // dragged by its title it may be docked somewhere, it's left to go + if (GImGui->MovingWindow != shown) + ImGui::SetWindowPos(shown, position, ImGuiCond_Always); + if (m_autohideappear) + { + m_autohideappear = false; + ImGui::BringWindowToDisplayFront(shown); + if (m_autohidefocus) + ImGui::FocusWindow(shown); + } +} + +void editor_ui::autohide_strips() +{ + auto *viewport{ImGui::GetMainViewport()}; + auto const &style{ImGui::GetStyle()}; + auto const thickness{ImGui::GetFrameHeight()}; + auto const padding{style.FramePadding.x}; + auto hovered{false}; + m_autohidestrip = false; + for (auto const edge : {ImGuiDir_Left, ImGuiDir_Right, ImGuiDir_Up, ImGuiDir_Down}) + { + std::vector windows; + for (auto const &group : m_autohide) + { + if (group.edge != edge) + continue; + for (auto const id : group.windows) + if (auto *window{ImGui::FindWindowByID(id)}; window != nullptr && window->Active) + windows.push_back(window); + } + if (windows.empty()) + continue; + auto const vertical{autohide_vertical(edge)}; + ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f)); + ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f); + auto const name{std::string{"##autohidestrip"} + std::to_string(static_cast(edge))}; + if (ImGui::BeginViewportSideBar(name.c_str(), viewport, edge, thickness, ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoFocusOnAppearing)) + { + auto *list{ImGui::GetWindowDrawList()}; + auto position{vec_add(ImGui::GetCursorScreenPos(), vertical ? ImVec2(0.0f, 4.0f) : ImVec2(4.0f, 0.0f))}; + for (auto *window : windows) + { + auto const *end{ImGui::FindRenderedTextEnd(window->Name)}; + auto const text{ImGui::CalcTextSize(window->Name, end)}; + ImVec2 const size{vertical ? ImVec2(thickness, text.x + padding * 2.0f) : ImVec2(text.x + padding * 2.0f, thickness)}; + ImGui::SetCursorScreenPos(position); + ImGui::PushID(static_cast(window->ID)); + ImGui::InvisibleButton("##tab", size); + ImGui::PopID(); + auto const over{ImGui::IsItemHovered()}; + auto const id{window->ID}; + auto const color{m_autohideshown == id ? ImGuiCol_TabSelected : over ? ImGuiCol_TabHovered : ImGuiCol_Tab}; + list->AddRectFilled(position, vec_add(position, size), ImGui::GetColorU32(color), style.TabRounding); + if (vertical) + autohide_vertical_text(list, vec_add(position, ImVec2((thickness - ImGui::GetFontSize()) * 0.5f, padding)), ImGui::GetColorU32(ImGuiCol_Text), window->Name, end); + else + list->AddText(vec_add(position, ImVec2(padding, style.FramePadding.y)), ImGui::GetColorU32(ImGuiCol_Text), window->Name, end); + // a click shows the window and gives it the focus, or puts it away; pointing at the tab for a while shows it too + if (ImGui::IsItemClicked(ImGuiMouseButton_Left)) + { + // shown by pointing at it, the click keeps it out and gives it the focus + if (m_autohideshown == id && m_autohidefocus) + m_autohideshown = 0; + else + autohide_show(id, true); + m_autohidehovered = id; + m_autohidehovertime = std::numeric_limits::max(); + } + else if (over && false == ImGui::IsAnyMouseDown()) + { + if (m_autohidehovered != id) + { + m_autohidehovered = id; + m_autohidehovertime = ImGui::GetTime(); + } + else if (m_autohideshown != id && ImGui::GetTime() - m_autohidehovertime >= 0.25) + autohide_show(id, false); + } + if (over) + { + hovered = true; + m_autohidestrip = true; + } + position = vec_add(position, vertical ? ImVec2(0.0f, size.y + 4.0f) : ImVec2(size.x + 4.0f, 0.0f)); + } + } + ImGui::End(); + ImGui::PopStyleVar(2); + } + if (false == hovered) + m_autohidehovered = 0; +} + +void editor_ui::autohide_pins() +{ + auto &g{*GImGui}; + auto const &style{g.Style}; + auto const size{g.FontSize}; + auto const popup{ImGui::IsPopupOpen("", ImGuiPopupFlags_AnyPopupId | ImGuiPopupFlags_AnyPopupLevel)}; + // pins of the docks, in their tab bars by the close button, where the tabs leave room for them; the window menu of a dock + // (the arrow at the left of its tabs) unpins it too + std::vector leaves; + autohide_leaves(ImGui::DockBuilderGetNode(m_dockspace), leaves); + for (auto *node : leaves) + { + if (node->HostWindow == nullptr || false == node->IsVisible || node->IsHiddenTabBar() || node->IsNoTabBar() || node->TabBar == nullptr) + continue; + auto const x{node->Pos.x + node->Size.x - style.WindowBorderSize - style.FramePadding.x - (node->HasCloseButton ? size + style.ItemInnerSpacing.x : 0.0f) - size}; + if (node->TabBar->BarRect.Min.x + node->TabBar->WidthAllTabsIdeal + style.ItemInnerSpacing.x > x) + continue; + ImRect const rect{ImVec2(x, node->Pos.y + style.FramePadding.y), ImVec2(x + size, node->Pos.y + style.FramePadding.y + size)}; + auto const over{false == popup && g.HoveredWindow != nullptr && g.HoveredWindow->RootWindowDockTree == node->HostWindow->RootWindowDockTree && ImGui::IsMouseHoveringRect(rect.Min, rect.Max, false)}; + auto *list{node->HostWindow->DrawList}; + list->PushClipRect(node->Pos, vec_add(node->Pos, node->Size), false); + autohide_draw_pin(list, rect, true, over); + list->PopClipRect(); + if (over) + { + ImGui::SetTooltip("%s", STR_C("Unpin: the dock hides at the edge of the window, its tabs show it over the view (Ctrl+Space: all docks)")); + if (ImGui::IsMouseClicked(ImGuiMouseButton_Left)) + autohide_node(node); + } + } + // the pin of the shown window puts its dock back + auto *shown{m_autohideshown != 0 ? ImGui::FindWindowByID(m_autohideshown) : nullptr}; + if (shown == nullptr || false == shown->Active || shown->Hidden || shown->DockIsActive || (shown->Flags & ImGuiWindowFlags_NoTitleBar) != 0) + return; + auto const title{shown->TitleBarRect()}; + auto const x{title.Max.x - style.FramePadding.x - (shown->HasCloseButton ? size + style.ItemInnerSpacing.x : 0.0f) - size}; + ImRect const rect{ImVec2(x, title.Min.y + style.FramePadding.y), ImVec2(x + size, title.Min.y + style.FramePadding.y + size)}; + auto const over{false == popup && g.HoveredWindow == shown && ImGui::IsMouseHoveringRect(rect.Min, rect.Max, false)}; + shown->DrawList->PushClipRect(title.Min, title.Max, false); + autohide_draw_pin(shown->DrawList, rect, false, over); + shown->DrawList->PopClipRect(); + if (over) + { + ImGui::SetTooltip("%s", STR_C("Pin: the dock goes back to its place")); + if (ImGui::IsMouseClicked(ImGuiMouseButton_Left)) + m_autohidepin.push_back(autohide_group_of(m_autohideshown)); + } +} + +void editor_ui::autohide_menu(ImGuiContext *Context, ImGuiDockNode *Node, ImGuiTabBar *TabBar) +{ + ImGui::DockNodeWindowMenuHandler_Default(Context, Node, TabBar); + if (m_dockspace == 0 || Node == nullptr || Node->IsCentralNode() || ImGui::DockNodeGetRootNode(Node)->ID != m_dockspace) + return; + ImGui::Separator(); + if (ImGui::MenuItem(STR_C("Unpin (hide at the edge)"))) + autohide_node(Node); +} + +void editor_ui::register_settings() +{ + ImGuiSettingsHandler handler; + handler.TypeName = "MaSzynaAutoHide"; + handler.TypeHash = ImHashStr(handler.TypeName); + handler.ClearAllFn = [](ImGuiContext *, ImGuiSettingsHandler *) { m_autohide.clear(); }; + handler.ReadOpenFn = [](ImGuiContext *, ImGuiSettingsHandler *, char const *) -> void * { + m_autohide.emplace_back(); + return &m_autohide.back(); + }; + handler.ReadLineFn = [](ImGuiContext *, ImGuiSettingsHandler *, void *Entry, char const *Line) { + auto &group{*static_cast(Entry)}; + int edge{0}; + unsigned int id{0}; + // whole numbers only, the decimal point of the locale doesn't matter then + if (std::sscanf(Line, "Edge=%d", &edge) == 1) + group.edge = std::clamp(edge, static_cast(ImGuiDir_Left), static_cast(ImGuiDir_Down)); + else if (std::sscanf(Line, "Size=%d", &edge) == 1) + group.size = static_cast(edge); + else if (std::sscanf(Line, "First=%d", &edge) == 1) + group.first = edge != 0; + else if (std::sscanf(Line, "Share=%d", &edge) == 1) + group.share = edge / 1000.0f; + else if (std::sscanf(Line, "Depth=%d", &edge) == 1) + group.depth = edge; + else if (std::sscanf(Line, "Window=0x%X", &id) == 1) + group.windows.push_back(id); + }; + handler.ApplyAllFn = [](ImGuiContext *, ImGuiSettingsHandler *) { + std::erase_if(m_autohide, [](autohide_group const &Group) { return Group.windows.empty(); }); + }; + handler.WriteAllFn = [](ImGuiContext *, ImGuiSettingsHandler *Handler, ImGuiTextBuffer *Buffer) { + for (auto const &group : m_autohide) + { + if (group.windows.empty()) + continue; + Buffer->appendf("[%s][Dock]\nEdge=%d\nSize=%d\nFirst=%d\nShare=%d\nDepth=%d\n", Handler->TypeName, group.edge, static_cast(group.size), group.first ? 1 : 0, static_cast(group.share * 1000.0f), group.depth); + for (auto const id : group.windows) + Buffer->appendf("Window=0x%08X\n", id); + Buffer->append("\n"); + } + }; + ImGui::AddSettingsHandler(&handler); +} + void editor_ui::render_() { auto *viewport{ImGui::GetMainViewport()}; @@ -131,6 +622,9 @@ void editor_ui::render_() } } ImGui::End(); + // strips of the unpinned docks, inside the toolbar and the status bar; the pins over the tab bars drawn by now + autohide_strips(); + autohide_pins(); } // updates state of UI elements @@ -472,6 +966,10 @@ void editor_ui::render_menu_contents() { if (ImGui::MenuItem(STR_C("Reset window layout"))) m_layoutreset = true; + std::vector pinned; + autohide_leaves(ImGui::DockBuilderGetNode(m_dockspace), pinned); + if (ImGui::MenuItem(pinned.empty() ? STR_C("Pin the docks back") : STR_C("Unpin all docks"), "Ctrl+Space", false, false == pinned.empty() || false == m_autohide.empty())) + toggle_docks(); ImGui::Separator(); ImGui::MenuItem(STR_C("Tool options"), nullptr, &m_tooloptionsopen); ImGui::MenuItem(STR_C("Inspector"), nullptr, &m_inspectoropen); diff --git a/application/editoruilayer.h b/application/editoruilayer.h index f28484dd6..2cc566b69 100644 --- a/application/editoruilayer.h +++ b/application/editoruilayer.h @@ -19,6 +19,9 @@ class basic_node; } +struct ImGuiDockNode; +struct ImGuiTabBar; + class editor_ui : public ui_layer { @@ -126,6 +129,14 @@ class editor_ui : public ui_layer { m_sceneselect = std::move(Select); } + // pins of the docks: an unpinned dock hides its windows in a strip at the edge of the main window, and they come out over the 3d view + // when their tab in the strip is pointed at or clicked. the shortcut unpins all docks, or pins them back + void toggle_docks() + { + m_dockstoggle = true; + } + // the unpinned docks are kept in imgui.ini along with the layout; the handler has to be there before the file is read + static void register_settings(); // shows outcome of an operation in the layers window void set_status(std::string const &Status, bool const Error = false); @@ -143,6 +154,16 @@ class editor_ui : public ui_layer void render_() override; // docks the windows of the editor in their default places void build_default_layout(unsigned int const Dockspace); + // unpinned docks: at the start of the frame the windows are hidden, docked back or placed over the view, at its end the strips and pins are drawn + void autohide_begin(); + void autohide_place(); + void autohide_strips(); + void autohide_pins(); + void autohide_show(unsigned int const Window, bool const Focus); + void autohide_pin(std::size_t const Group); + static void autohide_node(ImGuiDockNode *Node); + static std::size_t autohide_group_of(unsigned int const Window); + static void autohide_menu(ImGuiContext *Context, ImGuiDockNode *Node, ImGuiTabBar *TabBar); // members itemproperties_panel m_itempropertiespanel{"Node Properties", true}; // not a window of its own, drawn in the toolset window functions_panel m_functionspanel{"Functions", true}; // not a window of its own, its settings are drawn in the toolset tabs @@ -191,4 +212,25 @@ class editor_ui : public ui_layer bool m_bendexpand{false}; scene::basic_node *m_node{nullptr}; // currently bound scene node, if any bool m_track{false}; + // windows of an unpinned dock, and the edge they're hidden at + struct autohide_group + { + int edge{0}; // ImGuiDir + float size{300.0f}; // width of the side docks, height of the top and bottom ones, in pixels + bool first{false}; // the node was above or left of the other one in its split, and took this share of it + float share{0.5f}; + int depth{0}; // of the column of docks the node was in, in the tree of the dockspace; outer docks are put back first + std::vector windows; + }; + static std::vector m_autohide; + static unsigned int m_dockspace; + unsigned int m_autohideshown{0}; // window of an unpinned dock shown over the view + bool m_autohideappear{false}; // the shown window is to be brought forward + bool m_autohidefocus{false}; // and given the focus, it was clicked in the strip + unsigned int m_autohidehovered{0}; // tab in the strips under the cursor, and since when + double m_autohidehovertime{0.0}; + double m_autohideleft{-1.0}; // when the cursor left the shown window, -1 while it's over it + bool m_autohidestrip{false}; // the cursor was over a tab of the strips in the last frame + std::vector m_autohidepin; // groups to be docked back at the start of the next frame + bool m_dockstoggle{false}; }; diff --git a/application/uilayer.cpp b/application/uilayer.cpp index 0d99ae53b..b99a215b3 100644 --- a/application/uilayer.cpp +++ b/application/uilayer.cpp @@ -19,6 +19,7 @@ http://mozilla.org/MPL/2.0/. #include "utilities/translation.h" #include "application/application.h" #include "application/editormode.h" +#include "application/editoruilayer.h" #include "imgui/imgui_impl_glfw.h" @@ -269,6 +270,8 @@ bool ui_layer::init(GLFWwindow *Window) IMGUI_CHECKVERSION(); ImGui::CreateContext(); m_imguiio = &ImGui::GetIO(); + // imgui.ini is read with the first frame, which may be of another mode than the editor + editor_ui::register_settings(); m_imguiio->ConfigFlags |= ImGuiConfigFlags_NoMouseCursorChange; // m_imguiio->ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard; diff --git a/lang/editor_pl.po b/lang/editor_pl.po index f632bc85d..4c663b452 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -4641,3 +4641,18 @@ msgstr "Kontrola prędkości" msgid "What the check finds is listed in its window" msgstr "Wyniki kontroli są w jej oknie" + +msgid "Unpin: the dock hides at the edge of the window, its tabs show it over the view (Ctrl+Space: all docks)" +msgstr "Odepnij: dok chowa się przy krawędzi okna, jego zakładki wysuwają go nad widok (Ctrl+Spacja: wszystkie doki)" + +msgid "Pin: the dock goes back to its place" +msgstr "Przypnij: dok wraca na swoje miejsce" + +msgid "Unpin (hide at the edge)" +msgstr "Odepnij (schowaj przy krawędzi)" + +msgid "Unpin all docks" +msgstr "Odepnij wszystkie doki" + +msgid "Pin the docks back" +msgstr "Przypnij doki z powrotem" From 9b0e88db7a26507f7117ebcac11938d7a50b6bec Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Thu, 8 Oct 2026 23:55:56 +0200 Subject: [PATCH 182/430] feat(editor): node bank shows the entries as cards with the previews of their models (Previews, size of the cards 48-256 px, kept in eu07_editor.ini), in the groups and with the search as the list; images found by the names the preview generator gives them, worked out by the same code now (editor/editorPreviews: path of the model and skin, numbers of entries with the same ones in the order of nodebank.txt), read and scaled down in a thread of their own, uploaded a few in a frame, at most 512 kept, read anew on Reload node bank; images of the user interface made by the gl renderers (Create_Image/Release_Image of the imgui renderer, srgb in the modern one); Polish translation --- CMakeLists.txt | 1 + application/editoruipanels.cpp | 185 ++++++++++++++++- application/editoruipanels.h | 9 + editor/editorPreviews.cpp | 345 +++++++++++++++++++++++++++++++ editor/editorPreviews.hpp | 94 +++++++++ editor/editorSettings.cpp | 6 + editor/editorSettings.hpp | 8 + lang/editor_pl.po | 18 ++ nodebank_previews_standalone.cpp | 72 +------ rendering/opengl33renderer.cpp | 30 +++ rendering/opengl33renderer.h | 2 + rendering/openglrenderer.cpp | 26 +++ rendering/openglrenderer.h | 2 + rendering/renderer.h | 7 + 14 files changed, 737 insertions(+), 68 deletions(-) create mode 100644 editor/editorPreviews.cpp create mode 100644 editor/editorPreviews.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f90db3ba..9f52e7857 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -184,6 +184,7 @@ set(SOURCES "editor/editorInfra.cpp" "editor/editorTerrainStreamer.cpp" "editor/editorOrthophoto.cpp" +"editor/editorPreviews.cpp" "application/editormode.cpp" "application/editormodetrack.cpp" "application/editormodetrackux.cpp" diff --git a/application/editoruipanels.cpp b/application/editoruipanels.cpp index 2381d40f1..b7f8d803c 100644 --- a/application/editoruipanels.cpp +++ b/application/editoruipanels.cpp @@ -23,6 +23,11 @@ http://mozilla.org/MPL/2.0/. #include "simulation/simulation.h" #include "editor/editorModelSets.hpp" #include "editor/editorFormat.hpp" +#include "editor/editorSettings.hpp" +#include "imgui/imgui_internal.h" + +#include +#include namespace { @@ -544,6 +549,7 @@ nodebank_panel::nodebank_panel(std::string const &Name, bool const Isopen) : ui_ m_nodebank.push_back({label, std::make_shared(nodedata)}); } + index_previews(); // sort alphabetically content of each group auto groupbegin{m_nodebank.begin()}; auto groupend{groupbegin}; @@ -557,6 +563,11 @@ nodebank_panel::nodebank_panel(std::string const &Name, bool const Isopen) : ui_ void nodebank_panel::nodebank_reload() { m_nodebank.clear(); + // images made since are read anew + if (m_previews) + { + m_previews->clear(); + } std::ifstream file; file.open("nodebank.txt", std::ios_base::in | std::ios_base::binary); std::string line; @@ -572,6 +583,7 @@ void nodebank_panel::nodebank_reload() m_nodebank.push_back({label, std::make_shared(nodedata)}); } + index_previews(); // sort alphabetically content of each group auto groupbegin{m_nodebank.begin()}; auto groupend{groupbegin}; @@ -583,6 +595,110 @@ void nodebank_panel::nodebank_reload() } } +void nodebank_panel::index_previews() +{ + m_previewpaths.clear(); + std::error_code error; + m_previewfolder = std::filesystem::is_directory(editor_previews::folder, error); + // entries with the same model and skin are numbered in the order of the file, the way the generator numbers them + std::set taken; + for (auto const &entry : m_nodebank) + { + if (entry.second->empty()) + { + continue; + } + auto const path{editor_previews::entry_preview_path(*entry.second)}; + if (path.empty()) + { + continue; + } + auto const name{editor_previews::variant(path, taken)}; + taken.insert(name); + m_previewpaths[entry.second.get()] = name + ".png"; + } +} + +void nodebank_panel::render_cards(std::vector> const *> const &Entries) +{ + auto const &style{ImGui::GetStyle()}; + auto const card{std::max(16.0f, EditorSettings.nodebank_card() * Global.ui_scale)}; + auto const labelheight{ImGui::GetTextLineHeight()}; + ImVec2 const cell{card, card + labelheight + style.FramePadding.y * 2.0f}; + auto const columns{std::max(1, static_cast((ImGui::GetContentRegionAvail().x + style.ItemSpacing.x) / (cell.x + style.ItemSpacing.x)))}; + auto const rows{(static_cast(Entries.size()) + columns - 1) / columns}; + ImGuiListClipper clipper; + clipper.Begin(rows, cell.y + style.ItemSpacing.y); + while (clipper.Step()) + { + for (int row = clipper.DisplayStart; row < clipper.DisplayEnd; ++row) + { + for (int column = 0; column < columns; ++column) + { + auto const index{static_cast(row * columns + column)}; + if (index >= Entries.size()) + { + break; + } + auto const &entry{*Entries[index]}; + if (column > 0) + { + ImGui::SameLine(); + } + ImGui::PushID(entry.second.get()); + auto const position{ImGui::GetCursorScreenPos()}; + if (ImGui::InvisibleButton("##card", cell)) + { + m_selectedtemplate = entry.second; + } + auto const hovered{ImGui::IsItemHovered()}; + auto const selected{entry.second == m_selectedtemplate}; + auto *list{ImGui::GetWindowDrawList()}; + ImVec2 const end{position.x + cell.x, position.y + cell.y}; + list->AddRectFilled(position, end, ImGui::GetColorU32(selected ? ImGuiCol_Header : hovered ? ImGuiCol_HeaderHovered : ImGuiCol_FrameBg), style.FrameRounding); + // the image fills the square of the card; without one, what's missing is said in its place + ImVec2 const imagemin{position.x + 2.0f, position.y + 2.0f}; + ImVec2 const imagemax{position.x + card - 2.0f, position.y + card - 2.0f}; + auto const lookup{m_previewpaths.find(entry.second.get())}; + std::uint64_t texture{0}; + char const *placeholder{STR_C("not a model")}; + if (lookup != m_previewpaths.end()) + { + texture = m_previews->image(lookup->second); + placeholder = (m_previews->missing(lookup->second) ? STR_C("no preview") : "..."); + } + if (texture != 0) + { + list->AddImage(static_cast(texture), imagemin, imagemax); + } + else + { + list->AddRect(imagemin, imagemax, ImGui::GetColorU32(ImGuiCol_Border), style.FrameRounding); + auto const size{ImGui::CalcTextSize(placeholder)}; + list->PushClipRect(imagemin, imagemax, true); + list->AddText(ImVec2(imagemin.x + std::max(0.0f, (imagemax.x - imagemin.x - size.x) * 0.5f), imagemin.y + (imagemax.y - imagemin.y - size.y) * 0.5f), ImGui::GetColorU32(ImGuiCol_TextDisabled), placeholder); + list->PopClipRect(); + } + // the label under the image, cut short with an ellipsis; the whole of it in the tooltip + auto const *label{entry.first.c_str()}; + while (*label == ' ') + { + ++label; + } + ImVec2 const labelmin{position.x + style.FramePadding.x, position.y + card + style.FramePadding.y}; + ImVec2 const labelmax{end.x - style.FramePadding.x, end.y}; + ImGui::RenderTextEllipsis(list, labelmin, labelmax, labelmax.x, labelmax.x, label, nullptr, nullptr); + if (hovered) + { + ImGui::SetTooltip("%s", label); + } + ImGui::PopID(); + } + } + } + clipper.End(); +} + void nodebank_panel::render() { if (false == is_open) @@ -617,6 +733,28 @@ void nodebank_panel::render() { m_setsopen = !m_setsopen; } + // cards with the previews of the models, or the list + ImGui::SameLine(); + auto previews{EditorSettings.nodebank_previews()}; + if (ImGui::Checkbox(STR_C("Previews"), &previews)) + { + EditorSettings.nodebank_previews(previews); + EditorSettings.save(); + } + if (previews) + { + ImGui::SameLine(); + auto card{EditorSettings.nodebank_card()}; + ImGui::SetNextItemWidth(std::min(ImGui::GetContentRegionAvail().x, 120.0f * Global.ui_scale)); + if (ImGui::SliderInt("##cardsize", &card, 48, 256, STR_C("%d px"))) + { + EditorSettings.nodebank_card(card); + } + if (ImGui::IsItemDeactivatedAfterEdit()) + { + EditorSettings.save(); + } + } // the edit modes are chosen in the toolbar and set up in the tool options window, the gizmo and the node // properties are in the inspector: what's left here is the node bank itself @@ -625,7 +763,52 @@ void nodebank_panel::render() ImGui::InputTextWithHint(STR_C("Search"), STR_C("Search node bank"), m_nodesearch, IM_ARRAYSIZE(m_nodesearch)); // the list takes the rest of the window, but keeps a usable height when the sections above are expanded (the window scrolls then) auto const listheight{std::max(ImGui::GetContentRegionAvail().y, ImGui::GetTextLineHeightWithSpacing() * 10.0f)}; - if (ImGui::BeginListBox("##nodebank", ImVec2(-1, listheight))) + if (previews) + { + if (m_previews == nullptr) + { + m_previews = std::make_unique(); + } + m_previews->update(); + if (false == m_previewfolder) + { + ImGui::TextDisabled("%s", STR_C("No previews yet: they're made by eu07 -generate-nodebank-previews")); + } + } + if (previews && ImGui::BeginChild("##nodebankcards", ImVec2(-1, listheight), ImGuiChildFlags_Borders)) + { + // the groups as in the list, the entries of an open one as cards + auto isvisible{false}; + auto const searchfilter{std::string(m_nodesearch)}; + std::vector> const *> cards; + for (auto const &entry : m_nodebank) + { + if (entry.second->empty()) + { + if (false == cards.empty()) + { + render_cards(cards); + cards.clear(); + } + isvisible = ImGui::CollapsingHeader(entry.first.c_str()); + } + else if (isvisible && (searchfilter.empty() || contains(entry.first, searchfilter))) + { + cards.push_back(&entry); + } + } + if (false == cards.empty()) + { + render_cards(cards); + } + ImGui::Separator(); + ImGui::TextDisabled("%s", STR_C("Scenery templates (.inc) are listed with the previews off")); + } + if (previews) + { + ImGui::EndChild(); + } + else if (ImGui::BeginListBox("##nodebank", ImVec2(-1, listheight))) { auto idx{0}; auto isvisible{false}; diff --git a/application/editoruipanels.h b/application/editoruipanels.h index 85d862b3a..e2b081aac 100644 --- a/application/editoruipanels.h +++ b/application/editoruipanels.h @@ -12,6 +12,7 @@ http://mozilla.org/MPL/2.0/. #include "application/uilayer.h" #include "utilities/Classes.h" #include "editor/editorIncludeInfo.hpp" +#include "editor/editorPreviews.hpp" #include /* @@ -161,12 +162,20 @@ class nodebank_panel : public ui_panel // methods: std::string generate_node_label(std::string Input) const; void render_sets_window(); + // finds the preview images of the entries, in the order of the file, as the generator names them + void index_previews(); + // entries of a group as cards with their previews, in rows as many as fit the width + void render_cards(std::vector> const *> const &Entries); // true if the node bank selection is a definition of a node, which the hand-made lists and the model sets can take bool node_selected() const; // members: std::vector>> m_nodebank; char m_nodesearch[128]; std::shared_ptr m_selectedtemplate; + // previews of the models: image of each node definition, by its address, and the images read so far + std::unordered_map m_previewpaths; + std::unique_ptr m_previews; + bool m_previewfolder{false}; // the generator was run, there's the folder of the images // set manager window bool m_setsopen{false}; int m_setsselected{0}; // id of the user set being edited diff --git a/editor/editorPreviews.cpp b/editor/editorPreviews.cpp new file mode 100644 index 000000000..67588930b --- /dev/null +++ b/editor/editorPreviews.cpp @@ -0,0 +1,345 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "editor/editorPreviews.hpp" + +#include "rendering/renderer.h" +#include "utilities/Globals.h" +#include "utilities/parser.h" +#include "utilities/utilities.h" +#include "stb/stb_image.h" + +#include +#include + +namespace editor_previews +{ + +std::string const folder{"textures/previews/nodebank/"}; + +std::string file_name_part(std::string Text) +{ + for (auto &character : Text) + { + auto const c{static_cast(character)}; + if ((false == std::isalnum(c)) && (c != '_') && (c != '-') && (c != '.') && (c != '+') && (c != '(') && (c != ')')) + { + character = '_'; + } + } + if ((Text.empty()) || (Text == ".") || (Text == "..")) + { + Text = "_"; + } + return Text; +} + +std::string preview_path(std::string Model, std::string const &Skin) +{ + replace_slashes(Model); + erase_extension(Model); + std::string path; + std::size_t start{0}; + while (start <= Model.size()) + { + auto end{Model.find('/', start)}; + if (end == std::string::npos) + { + end = Model.size(); + } + if (end > start) + { + if (false == path.empty()) + { + path += '/'; + } + path += file_name_part(Model.substr(start, end - start)); + } + start = end + 1; + } + if ((false == Skin.empty()) && (Skin != "none")) + { + auto skin{Skin}; + replace_slashes(skin); + erase_extension(skin); + std::replace(skin.begin(), skin.end(), '/', '_'); + path += '@' + file_name_part(skin); + } + return folder + path; +} + +std::string entry_preview_path(std::string const &Entry) +{ + auto const nodestart{Entry.find("node")}; + if (nodestart == std::string::npos) + { + return {}; + } + auto const entry{Entry.substr(nodestart)}; + // node + cParser parser(entry, cParser::buffer_TEXT); + parser.getTokens(5); + std::string type; + for (int index = 0; index < 5; ++index) + { + parser >> type; + } + if (type != "model") + { + return {}; + } + // the model and skin are the first two tokens after the location and rotation, read as the generator reads them + cParser names(entry, cParser::buffer_TEXT); + names.getTokens(9, false); + auto const model{names.getToken()}; + auto const skin{names.getToken(false)}; + if (model.empty()) + { + return {}; + } + return preview_path(model, skin); +} + +std::string variant(std::string const &Path, std::set const &Taken) +{ + if (false == Taken.contains(Path)) + { + return Path; + } + auto number{2}; + while (Taken.contains(Path + "~" + std::to_string(number))) + { + ++number; + } + return Path + "~" + std::to_string(number); +} + +namespace +{ + +// images kept at most; at 128 pixels that's 32 MB +std::size_t const image_limit{512}; +// uploaded in a frame at most +int const uploads_per_frame{8}; + +} // namespace + +image_cache::image_cache() +{ + // at a bigger ui the images are drawn bigger too + m_size = std::clamp(static_cast(128.0f * std::max(1.0f, Global.ui_scale)), 128, 256); + m_thread = std::thread(&image_cache::work, this); +} + +image_cache::~image_cache() +{ + { + std::lock_guard lock(m_lock); + m_quit = true; + } + m_wake.notify_all(); + if (m_thread.joinable()) + { + m_thread.join(); + } + // the textures aren't released: the cache goes when the simulator closes, and the gl context may be gone by then +} + +std::uint64_t image_cache::image(std::string const &Path) +{ + auto &entry{m_entries[Path]}; + entry.used = m_frame; + if (entry.texture != 0 || entry.missing || entry.pending) + { + return entry.texture; + } + entry.pending = true; + { + std::lock_guard lock(m_lock); + m_queue.push_front(Path); + } + m_wake.notify_one(); + return 0; +} + +bool image_cache::missing(std::string const &Path) const +{ + auto const lookup{m_entries.find(Path)}; + return lookup != m_entries.end() && lookup->second.missing; +} + +void image_cache::update() +{ + ++m_frame; + std::vector done; + { + std::lock_guard lock(m_lock); + // the queue keeps only what was asked for lately; the rest is asked for again when it's scrolled back into sight + while (m_queue.size() > image_limit / 2) + { + auto const lookup{m_entries.find(m_queue.back())}; + if (lookup != m_entries.end()) + { + lookup->second.pending = false; + } + m_queue.pop_back(); + } + auto const count{std::min(m_done.size(), uploads_per_frame)}; + done.assign(std::make_move_iterator(m_done.begin()), std::make_move_iterator(m_done.begin() + count)); + m_done.erase(m_done.begin(), m_done.begin() + count); + } + auto *renderer{GfxRenderer ? GfxRenderer->GetImguiRenderer() : nullptr}; + for (auto &image : done) + { + if (image.generation != m_generation) + { + continue; + } + auto const lookup{m_entries.find(image.path)}; + if (lookup == m_entries.end()) + { + continue; + } + auto &entry{lookup->second}; + entry.pending = false; + if (image.rgba.empty()) + { + entry.missing = true; + continue; + } + entry.texture = (renderer != nullptr ? renderer->Create_Image(image.rgba.data(), image.width, image.height) : 0); + // a renderer which can't show them gets no more requests + entry.missing = (entry.texture == 0); + } + // over the limit, the images not asked for the longest are dropped + std::size_t textures{0}; + for (auto const &entry : m_entries) + { + textures += (entry.second.texture != 0 ? 1 : 0); + } + if (textures <= image_limit) + { + return; + } + std::vector> loaded; + loaded.reserve(textures); + for (auto const &entry : m_entries) + { + if (entry.second.texture != 0) + { + loaded.emplace_back(entry.second.used, &entry.first); + } + } + std::sort(loaded.begin(), loaded.end()); + std::vector dropped; + for (std::size_t index = 0; index < textures - image_limit; ++index) + { + dropped.push_back(*loaded[index].second); + } + for (auto const &path : dropped) + { + auto const lookup{m_entries.find(path)}; + release(lookup->second); + m_entries.erase(lookup); + } +} + +void image_cache::clear() +{ + { + std::lock_guard lock(m_lock); + m_queue.clear(); + m_done.clear(); + ++m_generation; + } + for (auto &entry : m_entries) + { + release(entry.second); + } + m_entries.clear(); +} + +void image_cache::release(entry &Entry) +{ + if (Entry.texture != 0 && GfxRenderer && GfxRenderer->GetImguiRenderer() != nullptr) + { + GfxRenderer->GetImguiRenderer()->Release_Image(Entry.texture); + } + Entry.texture = 0; +} + +void image_cache::work() +{ + // the texture loader turns its images upside down for all threads; these are read as they are + stbi_set_flip_vertically_on_load_thread(0); + while (true) + { + decoded image; + { + std::unique_lock lock(m_lock); + m_wake.wait(lock, [this]() { return m_quit || false == m_queue.empty(); }); + if (m_quit) + { + return; + } + image.path = m_queue.front(); + image.generation = m_generation; + m_queue.pop_front(); + } + int width{0}, height{0}, components{0}; + auto *pixels{stbi_load(image.path.c_str(), &width, &height, &components, 4)}; + if (pixels != nullptr && width > 0 && height > 0) + { + // scaled down by the average of the pixels which make each one, the longer side to the size of the cache + auto const scale{std::max(1.0f, static_cast(std::max(width, height)) / m_size)}; + image.width = std::max(1, static_cast(width / scale)); + image.height = std::max(1, static_cast(height / scale)); + image.rgba.resize(static_cast(image.width) * image.height * 4); + for (int y = 0; y < image.height; ++y) + { + auto const y0{static_cast(y * scale)}; + auto const y1{std::max(y0 + 1, std::min(height, static_cast((y + 1) * scale)))}; + for (int x = 0; x < image.width; ++x) + { + auto const x0{static_cast(x * scale)}; + auto const x1{std::max(x0 + 1, std::min(width, static_cast((x + 1) * scale)))}; + std::uint32_t sum[4]{0, 0, 0, 0}; + for (int sy = y0; sy < y1; ++sy) + { + auto const *row{pixels + (static_cast(sy) * width + x0) * 4}; + for (int sx = x0; sx < x1; ++sx, row += 4) + { + sum[0] += row[0]; + sum[1] += row[1]; + sum[2] += row[2]; + sum[3] += row[3]; + } + } + auto const count{static_cast((y1 - y0) * (x1 - x0))}; + auto *target{image.rgba.data() + (static_cast(y) * image.width + x) * 4}; + for (int channel = 0; channel < 4; ++channel) + { + target[channel] = static_cast(sum[channel] / count); + } + } + } + } + if (pixels != nullptr) + { + stbi_image_free(pixels); + } + { + std::lock_guard lock(m_lock); + m_done.emplace_back(std::move(image)); + } + } +} + +} // namespace editor_previews diff --git a/editor/editorPreviews.hpp b/editor/editorPreviews.hpp new file mode 100644 index 000000000..98c4a5a0c --- /dev/null +++ b/editor/editorPreviews.hpp @@ -0,0 +1,94 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// preview images of the models of the node bank: made by -generate-nodebank-previews, shown by the node bank of the editor. +// both find an image by the same name, made here +namespace editor_previews +{ + +// folder of the images, under the folder of the simulator +extern std::string const folder; + +// characters which can be safely used in a file name, the others replaced by _ +std::string file_name_part(std::string Text); +// path of the image of the node with specified model and skin, without the extension: the path of the model in the preview folder, +// the skin added to the name +std::string preview_path(std::string Model, std::string const &Skin); +// path of the image of a node bank entry ("node ... model ..."), without the extension; +// empty if the entry isn't a model +std::string entry_preview_path(std::string const &Entry); +// name given to another entry with the same model and skin (other lights or angles): ~2, ~3... added in the order of the +// node bank, after the names already Taken +std::string variant(std::string const &Path, std::set const &Taken); + +// images of the node bank as textures of the user interface, small and kept for a while: the files are read and scaled down +// in a thread of their own, and uploaded in the main thread, a few in a frame +class image_cache +{ + public: + image_cache(); + ~image_cache(); + image_cache(image_cache const &) = delete; + image_cache &operator=(image_cache const &) = delete; + + // texture of the image at specified path (with the extension), 0 while it's being read or when there's no such image. + // an image not asked for longer than others is dropped when there are too many + std::uint64_t image(std::string const &Path); + // true if there's no image at specified path + bool missing(std::string const &Path) const; + // to be called once in a frame: uploads the images read since the last frame + void update(); + // drops all images, so that they're read again (e.g. after new ones were generated) + void clear(); + + private: + struct entry + { + std::uint64_t texture{0}; + bool missing{false}; + bool pending{false}; // waits in the queue or is being read + std::uint64_t used{0}; // frame it was asked for in the last time + }; + struct decoded + { + std::string path; + int width{0}; + int height{0}; + std::vector rgba; // empty if there's no such image + unsigned int generation{0}; + }; + void work(); + void release(entry &Entry); + // members + std::unordered_map m_entries; + std::uint64_t m_frame{0}; + int m_size{128}; // pixels of the longer side of the images + // shared with the thread + std::mutex m_lock; + std::condition_variable m_wake; + std::deque m_queue; // the image asked for in the last is read first, it's the one on the screen + std::vector m_done; + unsigned int m_generation{0}; // images read before the last clear() are thrown away + bool m_quit{false}; + std::thread m_thread; +}; + +} // namespace editor_previews diff --git a/editor/editorSettings.cpp b/editor/editorSettings.cpp index 99d6a4607..de62f90a5 100644 --- a/editor/editorSettings.cpp +++ b/editor/editorSettings.cpp @@ -96,6 +96,10 @@ bool editorSettings::load() parse(value, m_platform_edge); else if (key == "signal_offset") parse(value, m_signal_offset); + else if (key == "nodebank_previews") + m_nodebank_previews = (value == "1"); + else if (key == "nodebank_card") + parse(value, m_nodebank_card); else if (key.rfind(origin_prefix, 0) == 0) { // northing;easting @@ -136,6 +140,8 @@ bool editorSettings::save() stream << "ortho_in_scene " << (m_orthophoto.in_scene ? 1 : 0) << "\n"; stream << "platform_edge " << m_platform_edge << "\n"; stream << "signal_offset " << m_signal_offset << "\n"; + stream << "nodebank_previews " << (m_nodebank_previews ? 1 : 0) << "\n"; + stream << "nodebank_card " << m_nodebank_card << "\n"; stream << std::fixed << std::setprecision(3); for (auto const &origin : m_orthophoto_origins) stream << origin.first << " " << origin.second.first << ";" << origin.second.second << "\n"; diff --git a/editor/editorSettings.hpp b/editor/editorSettings.hpp index 87be836f3..48b150f6b 100644 --- a/editor/editorSettings.hpp +++ b/editor/editorSettings.hpp @@ -44,12 +44,20 @@ public: double signal_offset() const { return m_signal_offset; } void signal_offset(double Distance) { m_signal_offset = Distance; } + // node bank: cards with the previews of the models or a list, and the size of the cards in pixels + bool nodebank_previews() const { return m_nodebank_previews; } + void nodebank_previews(bool Previews) { m_nodebank_previews = Previews; } + int nodebank_card() const { return m_nodebank_card; } + void nodebank_card(int Size) { m_nodebank_card = Size; } + private: movement_scheme m_movement{movement_scheme::wsad}; orthophoto_settings m_orthophoto; std::map> m_orthophoto_origins; double m_platform_edge{1.725}; double m_signal_offset{2.25}; + bool m_nodebank_previews{true}; + int m_nodebank_card{96}; }; // global editor settings instance diff --git a/lang/editor_pl.po b/lang/editor_pl.po index 4c663b452..26e086a99 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -4656,3 +4656,21 @@ msgstr "Odepnij wszystkie doki" msgid "Pin the docks back" msgstr "Przypnij doki z powrotem" + +msgid "Previews" +msgstr "Podglądy" + +msgid "%d px" +msgstr "%d px" + +msgid "No previews yet: they're made by eu07 -generate-nodebank-previews" +msgstr "Brak podglądów: tworzy je eu07 -generate-nodebank-previews" + +msgid "Scenery templates (.inc) are listed with the previews off" +msgstr "Szablony scenerii (.inc) są na liście przy wyłączonych podglądach" + +msgid "not a model" +msgstr "to nie model" + +msgid "no preview" +msgstr "brak podglądu" diff --git a/nodebank_previews_standalone.cpp b/nodebank_previews_standalone.cpp index 8a1716897..39884fd38 100644 --- a/nodebank_previews_standalone.cpp +++ b/nodebank_previews_standalone.cpp @@ -7,6 +7,7 @@ #include "utilities/Logs.h" #include "utilities/parser.h" #include "utilities/utilities.h" +#include "editor/editorPreviews.hpp" #include #include @@ -17,8 +18,6 @@ namespace { -std::string const preview_folder{"textures/previews/nodebank/"}; - struct preview_settings { std::vector entries; // node definitions to draw. the whole node bank if empty @@ -183,59 +182,6 @@ GLFWwindow *create_context(bool const Software) return window; } -// characters which can be safely used in a file name -std::string file_name_part(std::string Text) -{ - for (auto &character : Text) - { - auto const c{static_cast(character)}; - if ((false == std::isalnum(c)) && (c != '_') && (c != '-') && (c != '.') && (c != '+') && (c != '(') && (c != ')')) - { - character = '_'; - } - } - if ((Text.empty()) || (Text == ".") || (Text == "..")) - { - Text = "_"; - } - return Text; -} - -// path of the image of the node with specified model and skin: the path of the model in the preview folder, the skin added to the name -std::string preview_path(std::string Model, std::string const &Skin) -{ - replace_slashes(Model); - erase_extension(Model); - std::string path; - std::size_t start{0}; - while (start <= Model.size()) - { - auto end{Model.find('/', start)}; - if (end == std::string::npos) - { - end = Model.size(); - } - if (end > start) - { - if (false == path.empty()) - { - path += '/'; - } - path += file_name_part(Model.substr(start, end - start)); - } - start = end + 1; - } - if ((false == Skin.empty()) && (Skin != "none")) - { - auto skin{Skin}; - replace_slashes(skin); - erase_extension(skin); - std::replace(skin.begin(), skin.end(), '/', '_'); - path += '@' + file_name_part(skin); - } - return preview_folder + path; -} - bool save_png(std::string const &Path, std::vector const &Image, int const Size) { std::error_code error; @@ -295,17 +241,9 @@ bool generate_preview(std::string const &Definition, preview_settings const &Set names.getTokens(9, false); auto const model{names.getToken()}; auto const skin{names.getToken(false)}; - auto path{preview_path(model, skin)}; - if (Saved.contains(path)) - { - // another entry with the same model and skin, but other lights or angles - auto variant{2}; - while (Saved.contains(path + "~" + std::to_string(variant))) - { - ++variant; - } - path += "~" + std::to_string(variant); - } + // another entry with the same model and skin, but other lights or angles, gets a number; the node bank of the editor + // counts the entries the same way to find the image + auto path{editor_previews::variant(editor_previews::preview_path(model, skin), Saved)}; path += ".png"; std::vector image; @@ -446,7 +384,7 @@ int generate_nodebank_previews(int Argc, char *Argv[]) } report("[" + std::to_string(idx + 1) + "/" + std::to_string(entries.size()) + "] " + entries[idx] + (success ? " -> " : ": ") + outcome, (false == success)); } - report(std::to_string(saved.size()) + " previews saved in " + preview_folder + (failures > 0 ? ", " + std::to_string(failures) + " entries failed" : "")); + report(std::to_string(saved.size()) + " previews saved in " + editor_previews::folder + (failures > 0 ? ", " + std::to_string(failures) + " entries failed" : "")); return finish(failures > 0 ? 1 : 0); } diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index 3e57c44ee..d5d403f8b 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -6282,3 +6282,33 @@ void opengl33_renderer::opengl33_imgui_renderer::Render() ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData()); } +std::uint64_t opengl33_renderer::opengl33_imgui_renderer::Create_Image(std::uint8_t const *Rgba, int const Width, int const Height) +{ + // the ui colours are made linear in its shaders, the image is too, by sampling it as srgb. the bindings the renderer + // keeps track of are put back as they were + GLint texture{0}, unpack{0}, alignment{4}; + glGetIntegerv(GL_TEXTURE_BINDING_2D, &texture); + glGetIntegerv(GL_PIXEL_UNPACK_BUFFER_BINDING, &unpack); + glGetIntegerv(GL_UNPACK_ALIGNMENT, &alignment); + glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); + glPixelStorei(GL_UNPACK_ALIGNMENT, 1); + GLuint image{0}; + glGenTextures(1, &image); + glBindTexture(GL_TEXTURE_2D, image); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB8_ALPHA8, Width, Height, 0, GL_RGBA, GL_UNSIGNED_BYTE, Rgba); + glBindTexture(GL_TEXTURE_2D, static_cast(texture)); + glBindBuffer(GL_PIXEL_UNPACK_BUFFER, static_cast(unpack)); + glPixelStorei(GL_UNPACK_ALIGNMENT, alignment); + return image; +} + +void opengl33_renderer::opengl33_imgui_renderer::Release_Image(std::uint64_t const Image) +{ + auto const image{static_cast(Image)}; + glDeleteTextures(1, &image); +} + diff --git a/rendering/opengl33renderer.h b/rendering/opengl33renderer.h index 78684ae49..6d16cb2fb 100644 --- a/rendering/opengl33renderer.h +++ b/rendering/opengl33renderer.h @@ -579,6 +579,8 @@ class opengl33_renderer : public gfx_renderer { virtual void Shutdown() override; virtual void BeginFrame() override; virtual void Render() override; + virtual std::uint64_t Create_Image(std::uint8_t const *Rgba, int const Width, int const Height) override; + virtual void Release_Image(std::uint64_t const Image) override; } m_imgui_renderer; virtual imgui_renderer* GetImguiRenderer() override { diff --git a/rendering/openglrenderer.cpp b/rendering/openglrenderer.cpp index 27c94da86..b8a73cfb4 100644 --- a/rendering/openglrenderer.cpp +++ b/rendering/openglrenderer.cpp @@ -4565,3 +4565,29 @@ void opengl_renderer::opengl_imgui_renderer::Render() ImGui_ImplOpenGL2_RenderDrawData(ImGui::GetDrawData()); } +std::uint64_t opengl_renderer::opengl_imgui_renderer::Create_Image(std::uint8_t const *Rgba, int const Width, int const Height) +{ + // the ui of this renderer works on srgb colours as they are. the binding the renderer keeps track of is put back as it was + GLint texture{0}, alignment{4}; + glGetIntegerv(GL_TEXTURE_BINDING_2D, &texture); + glGetIntegerv(GL_UNPACK_ALIGNMENT, &alignment); + glPixelStorei(GL_UNPACK_ALIGNMENT, 1); + GLuint image{0}; + glGenTextures(1, &image); + glBindTexture(GL_TEXTURE_2D, image); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, Width, Height, 0, GL_RGBA, GL_UNSIGNED_BYTE, Rgba); + glBindTexture(GL_TEXTURE_2D, static_cast(texture)); + glPixelStorei(GL_UNPACK_ALIGNMENT, alignment); + return image; +} + +void opengl_renderer::opengl_imgui_renderer::Release_Image(std::uint64_t const Image) +{ + auto const image{static_cast(Image)}; + glDeleteTextures(1, &image); +} + diff --git a/rendering/openglrenderer.h b/rendering/openglrenderer.h index 83dca483a..78fffa40b 100644 --- a/rendering/openglrenderer.h +++ b/rendering/openglrenderer.h @@ -385,6 +385,8 @@ private: virtual void Shutdown() override; virtual void BeginFrame() override; virtual void Render() override; + virtual std::uint64_t Create_Image(std::uint8_t const *Rgba, int const Width, int const Height) override; + virtual void Release_Image(std::uint64_t const Image) override; } m_imgui_renderer; virtual imgui_renderer *GetImguiRenderer() override diff --git a/rendering/renderer.h b/rendering/renderer.h index e02959ff4..6e8e7d464 100644 --- a/rendering/renderer.h +++ b/rendering/renderer.h @@ -121,6 +121,13 @@ class imgui_renderer virtual void Shutdown() = 0; virtual void BeginFrame() = 0; virtual void Render() = 0; + // images of the user interface itself (e.g. the previews of the node bank), apart from the textures of the scene: rgba, rows + // from the top, in srgb. returns: id for ImGui::Image, 0 if the renderer can't make them + virtual std::uint64_t Create_Image(std::uint8_t const *Rgba, int const Width, int const Height) + { + return 0; + } + virtual void Release_Image(std::uint64_t const Image) {} }; extern std::unique_ptr GfxRenderer; From f184ce7a6af53e2302ab86afb24c66e4f032994a Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Fri, 9 Oct 2026 00:15:14 +0200 Subject: [PATCH 183/430] feat(editor): colours of the editor: amber accents on grey panels as in the design of the layout, the rest of the simulator stays green (colours of the ui chosen by the ui of the mode drawn; Editor Settings > General, kept in eu07_editor.ini), docking preview in the accent colour in both; keys 1-5 choose the edit modes in the order of the toolbar, shown in its tooltips; Mode windows merged into Windows: the windows of the editor, model sets among them, window layout reset and unpinning of the docks; Polish translation --- application/editormode.cpp | 37 ++++++++++++++++++++++------ application/editormode.h | 2 ++ application/editoruilayer.cpp | 45 +++++++++++++++++++++-------------- application/editoruilayer.h | 2 ++ application/uilayer.cpp | 40 +++++++++++++++++++++---------- application/uilayer.h | 10 ++++++++ editor/editorSettings.cpp | 3 +++ editor/editorSettings.hpp | 5 ++++ lang/editor_pl.po | 9 +++++++ 9 files changed, 116 insertions(+), 37 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 5bdab443b..3198308f5 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -1462,6 +1462,16 @@ void editor_mode::render_settings() ImGui::Separator(); ImGui::Checkbox(STR_C("Transform gizmo (ImGuizmo)"), &m_gizmo_enabled); + + ImGui::Separator(); + ImGui::TextUnformatted(STR_C("Colours of the editor")); + const char *palettes[] = {STR_C("Green, as the rest of the simulator"), STR_C("Amber, of the editor")}; + int palette = std::clamp(EditorSettings.palette(), 0, 1); + if (ImGui::Combo("##palette", &palette, palettes, IM_ARRAYSIZE(palettes))) + { + EditorSettings.palette(palette); + EditorSettings.save(); + } ImGui::EndTabItem(); } ImGui::EndTabBar(); @@ -3655,6 +3665,15 @@ void editor_mode::render_array() ImGui::PopID(); } +void editor_mode::choose_edit_mode(nodebank_panel::edit_mode const Mode) +{ + // an edit mode is the field of work instead of the tracks, roads or terrain + m_track_window_open = false; + m_roadtool.window = false; + terrain_workspace(false); + ui()->set_mode(Mode); +} + void editor_mode::render_toolbar() { // edit modes of the node bank, each of them takes the mouse over from the track window @@ -3662,15 +3681,13 @@ void editor_mode::render_toolbar() {STR_C("Select"), nodebank_panel::MODIFY}, {STR_C("Insert"), nodebank_panel::ADD}, {STR_C("Brush"), nodebank_panel::BRUSH}, {STR_C("Area fill"), nodebank_panel::FILL}, {STR_C("Copy to bank"), nodebank_panel::COPY}}; // the fields of work: an edit mode, or the tracks, signals, vehicle, roads or terrain, one at a time bool const workspace{m_roadtool.window || m_terrain_open}; - for (auto const &mode : modes) + for (std::size_t index = 0; index < std::size(modes); ++index) { + auto const &mode{modes[index]}; if (ImGui::MenuItem(mode.first, nullptr, false == workspace && ui()->mode() == mode.second)) - { - m_track_window_open = false; - m_roadtool.window = false; - terrain_workspace(false); - ui()->set_mode(mode.second); - } + choose_edit_mode(mode.second); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s (%d)", mode.first, static_cast(index + 1)); } ImGui::Separator(); bool const tracks{m_track_window_open && false == m_terrain_open}; @@ -4277,6 +4294,12 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in case GLFW_KEY_E: m_gizmo_op = gizmo_operation::scale; break; case GLFW_KEY_R: m_gizmo_local = !m_gizmo_local; break; case GLFW_KEY_B: handled = ui()->mode() != nodebank_panel::TRACK && bend_shortcut(); break; + // the edit modes in the order of the toolbar; in the track mode the digits typed as a value were taken already + case GLFW_KEY_1: choose_edit_mode(nodebank_panel::MODIFY); break; + case GLFW_KEY_2: choose_edit_mode(nodebank_panel::ADD); break; + case GLFW_KEY_3: choose_edit_mode(nodebank_panel::BRUSH); break; + case GLFW_KEY_4: choose_edit_mode(nodebank_panel::FILL); break; + case GLFW_KEY_5: choose_edit_mode(nodebank_panel::COPY); break; default: handled = false; break; } if (handled) diff --git a/application/editormode.h b/application/editormode.h index e8d99caec..7f72e006c 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -430,6 +430,8 @@ class editor_mode : public application_mode, private editor_track::observer void render_gizmo_options(); // edit modes, editor windows and gizmo settings in the toolbar under the menu void render_toolbar(); + // an edit mode of the node bank as the field of work, from the toolbar or its key (1-5) + void choose_edit_mode(nodebank_panel::edit_mode const Mode); bool m_gizmo_enabled{true}; // master switch for the in-viewport gizmo bool m_gizmo_using{false}; // tracks an ongoing drag, so a single undo snapshot is taken per drag bool m_gizmo_local{false}; // manipulate in the object's local space instead of world space diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index 84a9c3c0f..863f1b568 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -18,6 +18,7 @@ http://mozilla.org/MPL/2.0/. #include "rendering/renderer.h" #include "utilities/translation.h" #include "imgui/imgui_internal.h" +#include "editor/editorSettings.hpp" #include #include @@ -962,28 +963,36 @@ void editor_ui::render_menu_contents() ui_layer::render_menu_contents(); - if (ImGui::BeginMenu(STR_C("Mode windows"))) - { - if (ImGui::MenuItem(STR_C("Reset window layout"))) - m_layoutreset = true; - std::vector pinned; - autohide_leaves(ImGui::DockBuilderGetNode(m_dockspace), pinned); - if (ImGui::MenuItem(pinned.empty() ? STR_C("Pin the docks back") : STR_C("Unpin all docks"), "Ctrl+Space", false, false == pinned.empty() || false == m_autohide.empty())) - toggle_docks(); - ImGui::Separator(); - ImGui::MenuItem(STR_C("Tool options"), nullptr, &m_tooloptionsopen); - ImGui::MenuItem(STR_C("Inspector"), nullptr, &m_inspectoropen); - ImGui::MenuItem(STR_C("Scene"), nullptr, &m_sceneopen); - ImGui::MenuItem(STR_C("Node bank"), nullptr, &m_nodebankpanel.is_open); - ImGui::MenuItem(STR_C("Layers"), nullptr, &m_layerspanel.is_open); - ImGui::MenuItem(STR_C("Include database"), nullptr, &m_includespanel.is_open); - ImGui::EndMenu(); - } - if (m_menuoptions) m_menuoptions(); } +// the windows of the editor and their layout, in the windows menu after the common ones (log, hierarchy, history, settings) +void editor_ui::render_windows_menu() +{ + ImGui::Separator(); + ImGui::MenuItem(STR_C("Tool options"), nullptr, &m_tooloptionsopen); + ImGui::MenuItem(STR_C("Inspector"), nullptr, &m_inspectoropen); + ImGui::MenuItem(STR_C("Scene"), nullptr, &m_sceneopen); + ImGui::MenuItem(STR_C("Node bank"), nullptr, &m_nodebankpanel.is_open); + if (ImGui::MenuItem(STR_C("Model sets"))) + m_nodebankpanel.open_sets_window(); + ImGui::MenuItem(STR_C("Layers"), nullptr, &m_layerspanel.is_open); + ImGui::MenuItem(STR_C("Include database"), nullptr, &m_includespanel.is_open); + ImGui::Separator(); + if (ImGui::MenuItem(STR_C("Reset window layout"))) + m_layoutreset = true; + std::vector pinned; + autohide_leaves(ImGui::DockBuilderGetNode(m_dockspace), pinned); + if (ImGui::MenuItem(pinned.empty() ? STR_C("Pin the docks back") : STR_C("Unpin all docks"), "Ctrl+Space", false, false == pinned.empty() || false == m_autohide.empty())) + toggle_docks(); +} + +int editor_ui::palette() const +{ + return EditorSettings.palette(); +} + void editor_ui::set_file_actions(std::function Save, std::function Export) { m_save = Save; diff --git a/application/editoruilayer.h b/application/editoruilayer.h index 2cc566b69..2ab2f8d4c 100644 --- a/application/editoruilayer.h +++ b/application/editoruilayer.h @@ -150,6 +150,8 @@ class editor_ui : public ui_layer void scene_rebuild(); void scene_row(std::size_t const Entry); void render_menu_contents() override; + void render_windows_menu() override; + int palette() const override; void render_dockspace() override; void render_() override; // docks the windows of the editor in their default places diff --git a/application/uilayer.cpp b/application/uilayer.cpp index b99a215b3..84fe0906e 100644 --- a/application/uilayer.cpp +++ b/application/uilayer.cpp @@ -28,6 +28,7 @@ GLFWwindow *ui_layer::m_keywindow{nullptr}; ImGuiIO *ui_layer::m_imguiio{nullptr}; GLint ui_layer::m_textureunit{GL_TEXTURE0}; bool ui_layer::m_cursorvisible; +int ui_layer::m_palette{0}; ImFont *ui_layer::font_default{nullptr}; ImFont *ui_layer::font_mono{nullptr}; ImFont *ui_layer::font_loading{nullptr}; @@ -175,25 +176,28 @@ void create_viewport_window(ImGuiViewport *Viewport) } } // namespace -void ui_layer::imgui_style() +void ui_layer::imgui_colors(int const Palette) { - // palette shared with the MaSzyna starter: flat dark panels, thin borders, green accents + m_palette = Palette; auto const rgb = [](int const Color, float const Alpha = 1.0f) { return ImVec4(((Color >> 16) & 0xff) / 255.0f, ((Color >> 8) & 0xff) / 255.0f, (Color & 0xff) / 255.0f, Alpha); }; - int constexpr panel{0x1e2327}; // window background - int constexpr base{0x15171b}; // darker background, between panels - int constexpr header{0x2a3036}; // section headers, hovered items - int constexpr border{0x3a424a}; - int constexpr field{0x121517}; // input fields, combos - int constexpr accent{0x177f00}; // selection, active elements - int constexpr accentbright{0x41c400}; // marks: checkmarks, active tab underline - int constexpr accentdim{0x164b0e}; + auto const editor{Palette == 1}; + // palette shared with the MaSzyna starter: flat dark panels, thin borders, green accents; the one of the editor + // has amber accents on cooler grey panels + int const panel{editor ? 0x1f2226 : 0x1e2327}; // window background + int const base{editor ? 0x1b1d21 : 0x15171b}; // darker background, between panels + int const header{editor ? 0x2c3036 : 0x2a3036}; // section headers, hovered items + int const border{editor ? 0x3a3f47 : 0x3a424a}; + int const field{editor ? 0x15171a : 0x121517}; // input fields, combos + int const accent{editor ? 0xb07a1c : 0x177f00}; // selection, active elements + int const accentbright{editor ? 0xe5a73a : 0x41c400}; // marks: checkmarks, active tab underline + int const accentdim{editor ? 0x5a4319 : 0x164b0e}; ImVec4 *colors = ImGui::GetStyle().Colors; - colors[ImGuiCol_Text] = rgb(0xffffff); - colors[ImGuiCol_TextDisabled] = rgb(0xa0a0a2); + colors[ImGuiCol_Text] = rgb(editor ? 0xe6e8eb : 0xffffff); + colors[ImGuiCol_TextDisabled] = rgb(editor ? 0x8a929c : 0xa0a0a2); colors[ImGuiCol_WindowBg] = rgb(panel, Global.UIBgOpacity); // ui.bg.opacity from config file colors[ImGuiCol_ChildBg] = ImVec4(0.00f, 0.00f, 0.00f, 0.00f); colors[ImGuiCol_PopupBg] = rgb(base, 0.98f); @@ -244,6 +248,14 @@ void ui_layer::imgui_style() colors[ImGuiCol_NavWindowingHighlight] = ImVec4(1.00f, 1.00f, 1.00f, 0.70f); colors[ImGuiCol_NavWindowingDimBg] = ImVec4(0.80f, 0.80f, 0.80f, 0.20f); colors[ImGuiCol_ModalWindowDimBg] = rgb(base, 0.60f); + // where a dragged window would be docked, and an empty dock node + colors[ImGuiCol_DockingPreview] = rgb(accentbright, 0.70f); + colors[ImGuiCol_DockingEmptyBg] = rgb(base); +} + +void ui_layer::imgui_style() +{ + imgui_colors(0); // flat, square elements with thin borders auto &style = ImGui::GetStyle(); @@ -499,6 +511,9 @@ void ui_layer::render_internal() void ui_layer::begin_ui_frame() { + // the colours follow the ui of the mode drawn + if (palette() != m_palette) + imgui_colors(palette()); begin_ui_frame_internal(); render_dockspace(); m_dockspaceframe = ImGui::GetFrameCount(); @@ -688,6 +703,7 @@ void ui_layer::render_menu_contents() editor_mode::set_settings_open(settings_open); } } + render_windows_menu(); ImGui::EndMenu(); } } diff --git a/application/uilayer.h b/application/uilayer.h index 96cd407b9..dbd49f1f7 100644 --- a/application/uilayer.h +++ b/application/uilayer.h @@ -78,6 +78,8 @@ public: // methods static bool init( GLFWwindow *Window ); static void imgui_style(); + // colours of the user interface: 0 the green ones shared with the starter, 1 the amber ones of the editor + static void imgui_colors(int const Palette); // assign texturing hardware unit static void set_unit( GLint const Textureunit ) { m_textureunit = GL_TEXTURE0 + Textureunit; } @@ -137,6 +139,14 @@ protected: static bool m_cursorvisible; virtual void render_menu_contents(); + // items of the windows menu which belong to the ui of a mode, after the common ones + virtual void render_windows_menu() {} + // colours this ui is drawn in, see imgui_colors() + virtual int palette() const + { + return 0; + } + static int m_palette; // colours set at the moment ui_log_panel m_logpanel { "Log", true }; bool m_suppress_menu = false; // if `true`, the menu at the top of the window will not be present bool m_menu_always = false; // if `true`, the menu is shown all the time, not only when the mouse is at the top of the window diff --git a/editor/editorSettings.cpp b/editor/editorSettings.cpp index de62f90a5..2fd580cc4 100644 --- a/editor/editorSettings.cpp +++ b/editor/editorSettings.cpp @@ -100,6 +100,8 @@ bool editorSettings::load() m_nodebank_previews = (value == "1"); else if (key == "nodebank_card") parse(value, m_nodebank_card); + else if (key == "palette") + parse(value, m_palette); else if (key.rfind(origin_prefix, 0) == 0) { // northing;easting @@ -142,6 +144,7 @@ bool editorSettings::save() stream << "signal_offset " << m_signal_offset << "\n"; stream << "nodebank_previews " << (m_nodebank_previews ? 1 : 0) << "\n"; stream << "nodebank_card " << m_nodebank_card << "\n"; + stream << "palette " << m_palette << "\n"; stream << std::fixed << std::setprecision(3); for (auto const &origin : m_orthophoto_origins) stream << origin.first << " " << origin.second.first << ";" << origin.second.second << "\n"; diff --git a/editor/editorSettings.hpp b/editor/editorSettings.hpp index 48b150f6b..6a6dfa881 100644 --- a/editor/editorSettings.hpp +++ b/editor/editorSettings.hpp @@ -50,6 +50,10 @@ public: int nodebank_card() const { return m_nodebank_card; } void nodebank_card(int Size) { m_nodebank_card = Size; } + // colours of the editor: 1 amber, its own; 0 green, as the rest of the simulator + int palette() const { return m_palette; } + void palette(int Palette) { m_palette = Palette; } + private: movement_scheme m_movement{movement_scheme::wsad}; orthophoto_settings m_orthophoto; @@ -58,6 +62,7 @@ private: double m_signal_offset{2.25}; bool m_nodebank_previews{true}; int m_nodebank_card{96}; + int m_palette{1}; }; // global editor settings instance diff --git a/lang/editor_pl.po b/lang/editor_pl.po index 26e086a99..b03aa4105 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -4674,3 +4674,12 @@ msgstr "to nie model" msgid "no preview" msgstr "brak podglądu" + +msgid "Colours of the editor" +msgstr "Kolory edytora" + +msgid "Green, as the rest of the simulator" +msgstr "Zielone, jak reszta symulatora" + +msgid "Amber, of the editor" +msgstr "Bursztynowe, edytora" From 791d5d052cc9f14ae72189d20842ac8acd552767 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Fri, 9 Oct 2026 00:42:17 +0200 Subject: [PATCH 184/430] feat(editor): fields of work in a row of their own over the toolbar (surroundings, tracks, roads, terrain), twice as high, with bigger bold text, and the tools of the one chosen in the toolbar under it: the edit modes of the node bank, the track tools in groups with the vehicle and the structure gauge, the road tools with what the place tool puts, the terrain tools (sculpt, smooth, chunks, orthophoto); the tool options window keeps the settings of the tool; the node bank shows a big preview of the entry pointed at for a moment, with its model and skin; the green colours by default again; Polish translation --- application/editormode.cpp | 213 ++++++++++++++++++++++---------- application/editormode.h | 19 ++- application/editormoderoad.cpp | 80 +++++++----- application/editormodetrack.cpp | 56 +++++---- application/editoruilayer.cpp | 14 ++- application/editoruilayer.h | 6 + application/editoruipanels.cpp | 57 ++++++++- application/editoruipanels.h | 3 + application/uilayer.cpp | 9 ++ application/uilayer.h | 2 + editor/editorPreviews.cpp | 38 +++--- editor/editorPreviews.hpp | 6 +- editor/editorSettings.cpp | 4 +- editor/editorSettings.hpp | 4 +- lang/editor_pl.po | 39 ++++++ 15 files changed, 407 insertions(+), 143 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 3198308f5..05e1c7367 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -488,6 +488,7 @@ editor_mode::editor_mode() { ui()->set_fill_options([this]() { render_area_fill(); }); ui()->set_gizmo_options([this]() { render_gizmo_options(); }); ui()->set_toolbar_options([this]() { render_toolbar(); }); + ui()->set_workspace_bar([this]() { render_workspaces(); }); ui()->set_track_options([this]() { render_track_tool_options(); }, [this]() { render_track_selection(); }); ui()->set_workspace_options(editor_ui::workspace::roads, [this]() { render_road_tool_options(); }, [this]() { render_road_selection(); }); ui()->set_workspace_options(editor_ui::workspace::terrain, [this]() { render_terrain_tool_options(); }); @@ -3674,77 +3675,157 @@ void editor_mode::choose_edit_mode(nodebank_panel::edit_mode const Mode) ui()->set_mode(Mode); } +editor_mode::work_area editor_mode::current_work_area() const +{ + // the terrain is shown over the tracks, see the tool options window + if (m_terrain_open) + return work_area::terrain; + if (m_track_window_open) + return work_area::tracks; + if (m_roadtool.window) + return work_area::roads; + return work_area::surroundings; +} + +void editor_mode::choose_work_area(work_area const Area) +{ + switch (Area) + { + case work_area::surroundings: + // the edit mode used last + choose_edit_mode(ui()->nodebank().mode); + break; + case work_area::tracks: + terrain_workspace(false); + show_track_tab(m_track_tab); + break; + case work_area::roads: + m_track_window_open = false; + terrain_workspace(false); + m_roadtool.window = true; + break; + case work_area::terrain: + m_track_window_open = false; + m_roadtool.window = false; + terrain_workspace(true); + break; + } +} + +void editor_mode::render_workspaces() +{ + struct area + { + char const *label; + work_area which; + char const *tooltip; + }; + area const areas[] = { + {STR_C("Surroundings"), work_area::surroundings, STR_C("Models around the line: select, insert, brush, area fill, copy to the node bank")}, + {STR_C("Tracks"), work_area::tracks, STR_C("Tracks and switches, signals, objects along the track, checks of the line")}, + {STR_C("Roads"), work_area::roads, STR_C("Roads and junctions, level crossings, the points where the traffic comes and goes")}, + {STR_C("Terrain"), work_area::terrain, STR_C("Terrain patches and chunks, sculpting, streaming, orthophoto")}, + }; + auto const current{current_work_area()}; + auto const &style{ImGui::GetStyle()}; + auto *list{ImGui::GetWindowDrawList()}; + // bigger and bold, with the font made for it if there's one, or drawn twice a pixel apart + auto *font{ui_layer::font_bold != nullptr ? ui_layer::font_bold : ImGui::GetFont()}; + auto const fontsize{ui_layer::font_bold != nullptr ? ui_layer::font_bold->FontSize : ImGui::GetFontSize() * 1.25f}; + auto const height{ImGui::GetWindowHeight()}; + auto const padding{style.FramePadding.x * 3.0f}; + ImGui::SetCursorPos(ImVec2(style.ItemSpacing.x, 0.0f)); + for (auto const &entry : areas) + { + auto const text{font->CalcTextSizeA(fontsize, FLT_MAX, 0.0f, entry.label)}; + ImVec2 const size{text.x + padding * 2.0f, height}; + auto const position{ImGui::GetCursorScreenPos()}; + ImGui::PushID(static_cast(entry.which)); + if (ImGui::InvisibleButton("##area", size)) + choose_work_area(entry.which); + ImGui::PopID(); + auto const hovered{ImGui::IsItemHovered()}; + auto const chosen{entry.which == current}; + ImVec2 const end{position.x + size.x, position.y + size.y}; + if (chosen || hovered) + list->AddRectFilled(position, end, ImGui::GetColorU32(chosen ? ImGuiCol_Header : ImGuiCol_HeaderHovered)); + if (chosen) + list->AddRectFilled(ImVec2(position.x, end.y - 3.0f), end, ImGui::GetColorU32(ImGuiCol_CheckMark)); + ImVec2 const textposition{position.x + padding, position.y + (height - text.y) * 0.5f}; + auto const color{ImGui::GetColorU32(chosen ? ImGuiCol_Text : ImGuiCol_TextDisabled)}; + list->AddText(font, fontsize, textposition, color, entry.label); + if (ui_layer::font_bold == nullptr) + list->AddText(font, fontsize, ImVec2(textposition.x + 1.0f, textposition.y), color, entry.label); + if (hovered) + ImGui::SetTooltip("%s", entry.tooltip); + ImGui::SameLine(0.0f, style.ItemSpacing.x); + } +} + +void editor_mode::render_terrain_toolbar() +{ + // what the left button does on the terrain: picks the models as it does elsewhere, raises and lowers, evens out, adds chunks + struct tool + { + char const *label; + bool chosen; + bool sculpt; + bool smooth; + bool chunks; + char const *tooltip; + }; + tool const tools[] = { + {STR_C("Select"), false == m_terrain_sculpt && false == m_chunk_edit, false, m_terrain_brush_smooth, false, STR_C("LMB picks the models, as in the surroundings")}, + {STR_C("Sculpt"), m_terrain_sculpt && false == m_terrain_brush_smooth, true, false, false, STR_C("LMB raises the terrain under the brush, Shift+LMB lowers it")}, + {STR_C("Smooth"), m_terrain_sculpt && m_terrain_brush_smooth, true, true, false, STR_C("LMB evens the terrain out under the brush")}, + {STR_C("Chunks"), m_chunk_edit, false, m_terrain_brush_smooth, true, STR_C("LMB adds a chunk next to the clicked one, Shift+LMB deletes it")}, + }; + for (auto const &entry : tools) + { + if (ImGui::MenuItem(entry.label, nullptr, entry.chosen)) + { + m_terrain_sculpt = entry.sculpt; + m_terrain_brush_smooth = entry.smooth; + m_chunk_edit = entry.chunks; + } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", entry.tooltip); + } + ImGui::Separator(); + auto const orthophoto{m_orthophoto.enabled()}; + if (ImGui::MenuItem(STR_C("Orthophoto"), nullptr, orthophoto)) + m_orthophoto.enabled(false == orthophoto); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Aerial imagery of geoportal.gov.pl under the scenery, laid out by the origin of the scenery")); +} + void editor_mode::render_toolbar() { - // edit modes of the node bank, each of them takes the mouse over from the track window - std::pair const modes[] = { - {STR_C("Select"), nodebank_panel::MODIFY}, {STR_C("Insert"), nodebank_panel::ADD}, {STR_C("Brush"), nodebank_panel::BRUSH}, {STR_C("Area fill"), nodebank_panel::FILL}, {STR_C("Copy to bank"), nodebank_panel::COPY}}; - // the fields of work: an edit mode, or the tracks, signals, vehicle, roads or terrain, one at a time - bool const workspace{m_roadtool.window || m_terrain_open}; - for (std::size_t index = 0; index < std::size(modes); ++index) + auto const area{current_work_area()}; + switch (area) { - auto const &mode{modes[index]}; - if (ImGui::MenuItem(mode.first, nullptr, false == workspace && ui()->mode() == mode.second)) - choose_edit_mode(mode.second); - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s (%d)", mode.first, static_cast(index + 1)); + case work_area::surroundings: + { + // edit modes of the node bank + std::pair const modes[] = { + {STR_C("Select"), nodebank_panel::MODIFY}, {STR_C("Insert"), nodebank_panel::ADD}, {STR_C("Brush"), nodebank_panel::BRUSH}, {STR_C("Area fill"), nodebank_panel::FILL}, {STR_C("Copy to bank"), nodebank_panel::COPY}}; + for (std::size_t index = 0; index < std::size(modes); ++index) + { + auto const &mode{modes[index]}; + if (ImGui::MenuItem(mode.first, nullptr, ui()->mode() == mode.second)) + choose_edit_mode(mode.second); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s (%d)", mode.first, static_cast(index + 1)); + } + break; + } + case work_area::tracks: render_track_toolbar(); break; + case work_area::roads: render_road_toolbar(); break; + case work_area::terrain: render_terrain_toolbar(); break; } ImGui::Separator(); - bool const tracks{m_track_window_open && false == m_terrain_open}; - bool const vehicle{tracks && m_track_tab == track_tab::lineside && m_vehicle.open}; - if (ImGui::MenuItem(STR_C("Tracks"), nullptr, tracks && m_track_tab != track_tab::signals && false == vehicle)) - { - if (tracks && m_track_tab != track_tab::signals && false == vehicle) - m_track_window_open = false; - else - { - terrain_workspace(false); - show_track_tab(m_track_tab == track_tab::signals || vehicle ? track_tab::path : m_track_tab); - } - } - // the signals are a tool of the track mode, but a field of work of their own - if (ImGui::MenuItem(STR_C("Signals"), nullptr, tracks && m_track_tab == track_tab::signals)) - { - if (tracks && m_track_tab == track_tab::signals) - m_track_window_open = false; - else - { - terrain_workspace(false); - show_track_tab(track_tab::signals); - } - } - // so is the vehicle to drive, put on a track by the objects along the track - if (ImGui::MenuItem(STR_C("Vehicle"), nullptr, vehicle)) - { - if (vehicle) - m_track_window_open = false; - else - { - terrain_workspace(false); - show_track_tab(track_tab::lineside); - m_vehicle.expand = true; - } - } - if (ImGui::MenuItem("Roads", nullptr, m_roadtool.window && false == m_terrain_open)) - { - m_roadtool.window = !(m_roadtool.window && false == m_terrain_open); - if (m_roadtool.window) - { - m_track_window_open = false; - terrain_workspace(false); - } - } - if (ImGui::MenuItem(STR_C("Terrain"), nullptr, m_terrain_open)) - { - terrain_workspace(false == m_terrain_open); - if (m_terrain_open) - { - m_track_window_open = false; - m_roadtool.window = false; - } - } - ImGui::Separator(); - if (m_gizmo_enabled) + // the gizmo moves the models and the tracks; on the terrain the mouse is the brush's + if (m_gizmo_enabled && area != work_area::terrain) { std::pair const operations[] = { {STR_C("Translate (Q)"), gizmo_operation::translate}, {STR_C("Rotate (W)"), gizmo_operation::rotate}, {STR_C("Scale (E)"), gizmo_operation::scale}}; diff --git a/application/editormode.h b/application/editormode.h index 7f72e006c..4251a36c1 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -233,6 +233,8 @@ class editor_mode : public application_mode, private editor_track::observer void render_terrain_ui(); // the terrain as a field of work of its own: the terrain tools and the orthophoto in the tool options window void render_terrain_tool_options(); + // tools of the terrain in the toolbar: picking, sculpting, smoothing, chunks, orthophoto + void render_terrain_toolbar(); // opens or leaves the terrain; leaving it puts the sculpting and the chunk editing away, so the mouse doesn't stay with them void terrain_workspace(bool const Open); // creates a large terrain as a grid of adjacent chunks (each its own editable patch) @@ -432,6 +434,17 @@ class editor_mode : public application_mode, private editor_track::observer void render_toolbar(); // an edit mode of the node bank as the field of work, from the toolbar or its key (1-5) void choose_edit_mode(nodebank_panel::edit_mode const Mode); + // fields of work of the editor, in the row above the toolbar: the models around, the tracks, the roads, the terrain + enum class work_area + { + surroundings, + tracks, + roads, + terrain + }; + work_area current_work_area() const; + void choose_work_area(work_area const Area); + void render_workspaces(); bool m_gizmo_enabled{true}; // master switch for the in-viewport gizmo bool m_gizmo_using{false}; // tracks an ongoing drag, so a single undo snapshot is taken per drag bool m_gizmo_local{false}; // manipulate in the object's local space instead of world space @@ -842,7 +855,8 @@ class editor_mode : public application_mode, private editor_track::observer // the track tools in the tool options window, and the selected path in the inspector void render_track_tool_options(); void render_track_selection(); - void render_track_modes(); + // tools of the track mode in the toolbar, in groups: building, by the track, checks + void render_track_toolbar(); void show_track_tab(track_tab const Tab); bool track_analysis_tab() const { return m_track_tab == track_tab::profile || m_track_tab == track_tab::speed || m_track_tab == track_tab::joints || m_track_tab == track_tab::infra; } bool track_shortcut(int const Key); @@ -1755,6 +1769,9 @@ class editor_mode : public application_mode, private editor_track::observer }; void render_road_menu(); void render_road_tool_options(); + // tools of the roads in the toolbar, and the change of the tool + void render_road_toolbar(); + void road_choose_tool(int const Tool); void render_road_selection(); bool render_road_layout(road_node::state &State); bool render_road_material(char const *Label, char *Buffer, std::size_t const Size, std::string &Value); diff --git a/application/editormoderoad.cpp b/application/editormoderoad.cpp index 1a57ed30b..5e0f3bff9 100644 --- a/application/editormoderoad.cpp +++ b/application/editormoderoad.cpp @@ -2261,6 +2261,57 @@ bool editor_mode::render_road_layout(road_node::state &State) return changed; } +void editor_mode::road_choose_tool(int const Tool) +{ + auto &tool{m_roadtool}; + if (Tool == tool.tool) + return; + tool.tool = Tool; + road_cancel(); + if (tool.tool != 0) + { + tool.junction = nullptr; + tool.points.clear(); + tool.marker = nullptr; + // the fields for the names of materials show the layout for the roads to be built again + road_select(nullptr); + } +} + +void editor_mode::render_road_toolbar() +{ + auto &tool{m_roadtool}; + struct entry + { + char const *label; + char const *tooltip; + }; + entry const tools[] = {{"Select", "LMB: a road piece, a junction, a point where pieces meet, a level crossing or a traffic point"}, + {"Build", "LMB: start a road, then each next point; on a loose end, the side of a road or a junction it's joined to them"}, + {"Place", "Level crossings, and the points where vehicles appear on the roads or are taken off them"}}; + for (int index = 0; index < static_cast(std::size(tools)); ++index) + { + if (ImGui::MenuItem(tools[index].label, nullptr, tool.tool == index)) + road_choose_tool(index); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", tools[index].tooltip); + } + if (tool.tool == 2) + { + // what the place tool puts + ImGui::Separator(); + char const *const kinds[] = {"Level crossing", "Spawn point", "Removal point", "Pedestrian crossing"}; + for (int index = 0; index < static_cast(std::size(kinds)); ++index) + { + if (ImGui::MenuItem(kinds[index], nullptr, tool.placekind == index)) + tool.placekind = index; + } + } + ImGui::Separator(); + if (ImGui::MenuItem("Show lanes", nullptr, tool.lanes)) + tool.lanes = !tool.lanes; +} + // the road tools and what the next pieces get, in the tool options window; the selection is drawn in the inspector by render_road_selection() void editor_mode::render_road_tool_options() { @@ -2269,28 +2320,7 @@ void editor_mode::render_road_tool_options() if (false == editor_road::available(&reason)) ImGui::TextColored(ImVec4(1.0f, 0.4f, 0.4f, 1.0f), "%s", reason.c_str()); - auto const previoustool{tool.tool}; - ImGui::RadioButton("Select", &tool.tool, 0); - ImGui::SameLine(); - ImGui::RadioButton("Build", &tool.tool, 1); - ImGui::SameLine(); - ImGui::RadioButton("Place", &tool.tool, 2); - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", "Level crossings, and the points where vehicles appear on the roads or are taken off them"); - if (tool.tool != previoustool) - { - road_cancel(); - if (tool.tool != 0) - { - tool.junction = nullptr; - tool.points.clear(); - tool.marker = nullptr; - // the fields for the names of materials show the layout for the roads to be built again - road_select(nullptr); - } - } - ImGui::SameLine(); - ImGui::Checkbox("Show lanes", &tool.lanes); + // the tools and what the place tool puts are chosen in the toolbar if (tool.tool == 1) { @@ -2338,12 +2368,6 @@ void editor_mode::render_road_tool_options() } else if (tool.tool == 2) { - ImGui::RadioButton("Level crossing", &tool.placekind, 0); - ImGui::SameLine(); - ImGui::RadioButton("Spawn point", &tool.placekind, 1); - ImGui::SameLine(); - ImGui::RadioButton("Removal point", &tool.placekind, 2); - ImGui::RadioButton("Pedestrian crossing", &tool.placekind, 3); tool.placekind = std::clamp(tool.placekind, 0, 3); switch (tool.placekind) { diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 3fcd91db4..689ee15f9 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -772,7 +772,7 @@ void editor_mode::render_track_inspector() void editor_mode::render_track_tool_options() { auto *track{selected_track()}; - render_track_modes(); + // the tools themselves are in the toolbar render_track_search(); ImGui::Spacing(); render_track_guide(); @@ -827,33 +827,41 @@ void editor_mode::render_track_selection() render_path_ui(); } -void editor_mode::render_track_modes() +void editor_mode::render_track_toolbar() { auto const &modes{track_modes()}; - // the tools in groups: building the track, what goes by it, the checks - auto const group = [&](char const *Label, std::initializer_list const Tabs) { - ImGui::SeparatorText(STR_C(Label)); - if (false == ImGui::BeginTable(Label, 3, ImGuiTableFlags_SizingStretchSame)) + auto const vehicle{m_track_tab == track_tab::lineside && m_vehicle.open}; + // a tool chosen again gives way to the select one + auto const tool = [&](track_tab const Tab) { + auto const found{std::find_if(modes.begin(), modes.end(), [&](track_mode const &Mode) { return Mode.tab == Tab; })}; + if (found == modes.end()) return; - for (auto const tab : Tabs) - { - auto const found{std::find_if(modes.begin(), modes.end(), [&](track_mode const &Mode) { return Mode.tab == tab; })}; - if (found == modes.end()) - continue; - ImGui::TableNextColumn(); - auto const index{static_cast(found - modes.begin())}; - auto const label{std::string{STR_C(found->label)} + "###trackmode" + std::to_string(index)}; - if (ImGui::Selectable(label.c_str(), m_track_tab == tab)) - show_track_tab(tab); - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s [%s]", STR_C(found->tooltip), found->key); - } - ImGui::EndTable(); + auto const chosen{m_track_tab == Tab && false == (Tab == track_tab::lineside && vehicle)}; + auto const label{std::string{STR_C(found->label)} + "###tracktool" + std::to_string(static_cast(found - modes.begin()))}; + if (ImGui::MenuItem(label.c_str(), nullptr, chosen)) + show_track_tab(chosen ? track_tab::path : Tab); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s [%s]", STR_C(found->tooltip), found->key); }; - group("Build", {track_tab::path, track_tab::lay, track_tab::turnout, track_tab::straights, track_tab::route, track_tab::turntable}); - group("By the track", {track_tab::signals, track_tab::lineside}); - group("Checks", {track_tab::profile, track_tab::speed, track_tab::joints, track_tab::infra}); - ImGui::Checkbox(STR_C("Structure gauge"), &m_gauge.open); + // building the track, what goes by it, the checks + for (auto const tab : {track_tab::path, track_tab::lay, track_tab::turnout, track_tab::straights, track_tab::route, track_tab::turntable}) + tool(tab); + ImGui::Separator(); + tool(track_tab::signals); + tool(track_tab::lineside); + // the vehicle to drive is one of the objects along the track + if (ImGui::MenuItem(STR_C("Vehicle"), nullptr, vehicle)) + { + show_track_tab(vehicle ? track_tab::path : track_tab::lineside); + m_vehicle.expand = false == vehicle; + } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("A vehicle to drive, put on the selected track; it isn't written to the scenery files")); + ImGui::Separator(); + for (auto const tab : {track_tab::profile, track_tab::speed, track_tab::joints, track_tab::infra}) + tool(tab); + if (ImGui::MenuItem(STR_C("Structure gauge"), nullptr, m_gauge.open)) + m_gauge.open = !m_gauge.open; if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", STR_C("Checks which models enter the structure gauge of the tracks and the clearance over the roads (skrajnia budowli)")); } diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index 863f1b568..8fc55fc99 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -586,7 +586,19 @@ void editor_ui::render_() { auto *viewport{ImGui::GetMainViewport()}; auto const flags{ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_MenuBar}; - // toolbar under the menu: the tools of the editor mode + // the fields of work of the editor under the menu, in a row twice as high; the tools of the one chosen in the toolbar under it + if (m_workspacebar) + { + ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f)); + ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0.0f, 0.0f)); + if (ImGui::BeginViewportSideBar("##editorworkspaces", viewport, ImGuiDir_Up, ImGui::GetFrameHeight() * 2.0f, ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoScrollWithMouse)) + { + m_workspacebar(); + } + ImGui::End(); + ImGui::PopStyleVar(2); + } + // toolbar under them: the tools of the field of work if (ImGui::BeginViewportSideBar("##editortoolbar", viewport, ImGuiDir_Up, ImGui::GetFrameHeight(), flags)) { if (ImGui::BeginMenuBar()) diff --git a/application/editoruilayer.h b/application/editoruilayer.h index 2ab2f8d4c..f95af4c29 100644 --- a/application/editoruilayer.h +++ b/application/editoruilayer.h @@ -69,6 +69,11 @@ class editor_ui : public ui_layer { m_toolbaroptions = std::move(Renderer); } + // draws the fields of work of the editor mode in a row above the toolbar + void set_workspace_bar(std::function Renderer) + { + m_workspacebar = std::move(Renderer); + } // draws the gizmo settings in the toolset window (the gizmo state lives in the editor mode) void set_gizmo_options(std::function Renderer) { @@ -182,6 +187,7 @@ class editor_ui : public ui_layer std::function m_filloptions; std::function m_menuoptions; std::function m_toolbaroptions; + std::function m_workspacebar; bool m_layoutreset{false}; // the default layout is to be built again on the next frame bool m_tooloptionsopen{true}; bool m_inspectoropen{true}; diff --git a/application/editoruipanels.cpp b/application/editoruipanels.cpp index b7f8d803c..bc157b80c 100644 --- a/application/editoruipanels.cpp +++ b/application/editoruipanels.cpp @@ -568,6 +568,10 @@ void nodebank_panel::nodebank_reload() { m_previews->clear(); } + if (m_largepreviews) + { + m_largepreviews->clear(); + } std::ifstream file; file.open("nodebank.txt", std::ios_base::in | std::ios_base::binary); std::string line; @@ -619,6 +623,52 @@ void nodebank_panel::index_previews() } } +void nodebank_panel::preview_popup(std::pair> const &Entry) +{ + if (false == ImGui::IsItemHovered(ImGuiHoveredFlags_DelayNormal | ImGuiHoveredFlags_NoSharedDelay)) + { + return; + } + // the generator makes the images 1024 pixels big; they're shown half as big, as much as the window has room for + auto const size{std::clamp(static_cast(512.0f * Global.ui_scale), 256, 1024)}; + if (m_largepreviews == nullptr) + { + m_largepreviews = std::make_unique(size, 16); + } + auto const *label{Entry.first.c_str()}; + while (*label == ' ') + { + ++label; + } + ImGui::BeginTooltip(); + ImGui::TextUnformatted(label); + std::string model, skin; + if (editor_previews::entry_model(*Entry.second, model, skin)) + { + ImGui::TextDisabled("%s%s%s", model.c_str(), (skin.empty() || skin == "none") ? "" : " ", (skin.empty() || skin == "none") ? "" : skin.c_str()); + } + auto const lookup{m_previewpaths.find(Entry.second.get())}; + if (lookup != m_previewpaths.end()) + { + auto const side{std::min(static_cast(size), ImGui::GetMainViewport()->WorkSize.y * 0.6f)}; + auto texture{m_largepreviews->image(lookup->second)}; + if (texture == 0 && m_previews) + { + // the small image, until the big one is read + texture = m_previews->image(lookup->second); + } + if (texture != 0) + { + ImGui::Image(static_cast(texture), ImVec2(side, side)); + } + else + { + ImGui::TextDisabled("%s", m_largepreviews->missing(lookup->second) ? STR_C("no preview") : "..."); + } + } + ImGui::EndTooltip(); +} + void nodebank_panel::render_cards(std::vector> const *> const &Entries) { auto const &style{ImGui::GetStyle()}; @@ -690,7 +740,7 @@ void nodebank_panel::render_cards(std::vectorupdate(); + } if (ImGui::Button(STR_C("Reload node bank"))) { nodebank_reload(); @@ -833,6 +887,7 @@ void nodebank_panel::render() auto const label{" " + entry.first + "##" + std::to_string(idx)}; if (list_item(label.c_str(), entry.second == m_selectedtemplate)) m_selectedtemplate = entry.second; + preview_popup(entry); ++idx; } } diff --git a/application/editoruipanels.h b/application/editoruipanels.h index e2b081aac..a826d5b46 100644 --- a/application/editoruipanels.h +++ b/application/editoruipanels.h @@ -166,6 +166,8 @@ class nodebank_panel : public ui_panel void index_previews(); // entries of a group as cards with their previews, in rows as many as fit the width void render_cards(std::vector> const *> const &Entries); + // the entry pointed at for a moment: a popup with its preview, big, and the model and skin it shows + void preview_popup(std::pair> const &Entry); // true if the node bank selection is a definition of a node, which the hand-made lists and the model sets can take bool node_selected() const; // members: @@ -175,6 +177,7 @@ class nodebank_panel : public ui_panel // previews of the models: image of each node definition, by its address, and the images read so far std::unordered_map m_previewpaths; std::unique_ptr m_previews; + std::unique_ptr m_largepreviews; // a few, for the popup bool m_previewfolder{false}; // the generator was run, there's the folder of the images // set manager window bool m_setsopen{false}; diff --git a/application/uilayer.cpp b/application/uilayer.cpp index 84fe0906e..29bbb06c1 100644 --- a/application/uilayer.cpp +++ b/application/uilayer.cpp @@ -32,6 +32,7 @@ int ui_layer::m_palette{0}; ImFont *ui_layer::font_default{nullptr}; ImFont *ui_layer::font_mono{nullptr}; ImFont *ui_layer::font_loading{nullptr}; +ImFont *ui_layer::font_bold{nullptr}; ui_panel::ui_panel(std::string Identifier, bool const Isopen) : is_open(Isopen), m_name(std::move(Identifier)) {} @@ -340,6 +341,14 @@ bool ui_layer::init(GLFWwindow *Window) } } } + for (auto const *bold : {"fonts/dejavusans-bold.ttf", "fonts/DejaVuSans-Bold.ttf"}) + { + if (font_bold == nullptr && FileExists(bold)) + { + ImFontConfig bold_config; + font_bold = m_imguiio->Fonts->AddFontFromFileTTF(bold, Global.ui_fontsize * 1.25f, &bold_config, &ranges[0]); + } + } if (FileExists("fonts/bahnschrift.ttf")) { ImFontConfig loading_config; font_loading = m_imguiio->Fonts->AddFontFromFileTTF("fonts/bahnschrift.ttf", 48, &loading_config, &ranges[0]); diff --git a/application/uilayer.h b/application/uilayer.h index dbd49f1f7..7b68646fb 100644 --- a/application/uilayer.h +++ b/application/uilayer.h @@ -130,6 +130,8 @@ public: static ImFont *font_default; static ImFont *font_mono; static ImFont *font_loading; + // bigger and bold, for headings like the fields of work of the editor; nullptr if the font isn't there + static ImFont *font_bold; protected: // members diff --git a/editor/editorPreviews.cpp b/editor/editorPreviews.cpp index 67588930b..27f84a9fe 100644 --- a/editor/editorPreviews.cpp +++ b/editor/editorPreviews.cpp @@ -76,11 +76,21 @@ std::string preview_path(std::string Model, std::string const &Skin) } std::string entry_preview_path(std::string const &Entry) +{ + std::string model, skin; + if (false == entry_model(Entry, model, skin)) + { + return {}; + } + return preview_path(model, skin); +} + +bool entry_model(std::string const &Entry, std::string &Model, std::string &Skin) { auto const nodestart{Entry.find("node")}; if (nodestart == std::string::npos) { - return {}; + return false; } auto const entry{Entry.substr(nodestart)}; // node @@ -93,18 +103,14 @@ std::string entry_preview_path(std::string const &Entry) } if (type != "model") { - return {}; + return false; } // the model and skin are the first two tokens after the location and rotation, read as the generator reads them cParser names(entry, cParser::buffer_TEXT); names.getTokens(9, false); - auto const model{names.getToken()}; - auto const skin{names.getToken(false)}; - if (model.empty()) - { - return {}; - } - return preview_path(model, skin); + Model = names.getToken(); + Skin = names.getToken(false); + return false == Model.empty(); } std::string variant(std::string const &Path, std::set const &Taken) @@ -124,17 +130,15 @@ std::string variant(std::string const &Path, std::set const &Taken) namespace { -// images kept at most; at 128 pixels that's 32 MB -std::size_t const image_limit{512}; // uploaded in a frame at most int const uploads_per_frame{8}; } // namespace -image_cache::image_cache() +image_cache::image_cache(int const Size, std::size_t const Limit) : m_limit{std::max(Limit, 2)} { - // at a bigger ui the images are drawn bigger too - m_size = std::clamp(static_cast(128.0f * std::max(1.0f, Global.ui_scale)), 128, 256); + // at a bigger ui the cards are drawn bigger too; 512 of them at 128 pixels take 32 MB + m_size = (Size > 0 ? Size : std::clamp(static_cast(128.0f * std::max(1.0f, Global.ui_scale)), 128, 256)); m_thread = std::thread(&image_cache::work, this); } @@ -182,7 +186,7 @@ void image_cache::update() { std::lock_guard lock(m_lock); // the queue keeps only what was asked for lately; the rest is asked for again when it's scrolled back into sight - while (m_queue.size() > image_limit / 2) + while (m_queue.size() > m_limit / 2) { auto const lookup{m_entries.find(m_queue.back())}; if (lookup != m_entries.end()) @@ -224,7 +228,7 @@ void image_cache::update() { textures += (entry.second.texture != 0 ? 1 : 0); } - if (textures <= image_limit) + if (textures <= m_limit) { return; } @@ -239,7 +243,7 @@ void image_cache::update() } std::sort(loaded.begin(), loaded.end()); std::vector dropped; - for (std::size_t index = 0; index < textures - image_limit; ++index) + for (std::size_t index = 0; index < textures - m_limit; ++index) { dropped.push_back(*loaded[index].second); } diff --git a/editor/editorPreviews.hpp b/editor/editorPreviews.hpp index 98c4a5a0c..4e61738e8 100644 --- a/editor/editorPreviews.hpp +++ b/editor/editorPreviews.hpp @@ -35,6 +35,8 @@ std::string preview_path(std::string Model, std::string const &Skin); // path of the image of a node bank entry ("node ... model ..."), without the extension; // empty if the entry isn't a model std::string entry_preview_path(std::string const &Entry); +// model and skin of a node bank entry, as above. returns: false if the entry isn't a model +bool entry_model(std::string const &Entry, std::string &Model, std::string &Skin); // name given to another entry with the same model and skin (other lights or angles): ~2, ~3... added in the order of the // node bank, after the names already Taken std::string variant(std::string const &Path, std::set const &Taken); @@ -44,7 +46,8 @@ std::string variant(std::string const &Path, std::set const &Taken) class image_cache { public: - image_cache(); + // Size: pixels of the longer side of the images, 0 for the size of the cards of the node bank; Limit: images kept at most + explicit image_cache(int const Size = 0, std::size_t const Limit = 512); ~image_cache(); image_cache(image_cache const &) = delete; image_cache &operator=(image_cache const &) = delete; @@ -81,6 +84,7 @@ class image_cache std::unordered_map m_entries; std::uint64_t m_frame{0}; int m_size{128}; // pixels of the longer side of the images + std::size_t m_limit{512}; // shared with the thread std::mutex m_lock; std::condition_variable m_wake; diff --git a/editor/editorSettings.cpp b/editor/editorSettings.cpp index 2fd580cc4..4b2421324 100644 --- a/editor/editorSettings.cpp +++ b/editor/editorSettings.cpp @@ -100,7 +100,7 @@ bool editorSettings::load() m_nodebank_previews = (value == "1"); else if (key == "nodebank_card") parse(value, m_nodebank_card); - else if (key == "palette") + else if (key == "colours") parse(value, m_palette); else if (key.rfind(origin_prefix, 0) == 0) { @@ -144,7 +144,7 @@ bool editorSettings::save() stream << "signal_offset " << m_signal_offset << "\n"; stream << "nodebank_previews " << (m_nodebank_previews ? 1 : 0) << "\n"; stream << "nodebank_card " << m_nodebank_card << "\n"; - stream << "palette " << m_palette << "\n"; + stream << "colours " << m_palette << "\n"; stream << std::fixed << std::setprecision(3); for (auto const &origin : m_orthophoto_origins) stream << origin.first << " " << origin.second.first << ";" << origin.second.second << "\n"; diff --git a/editor/editorSettings.hpp b/editor/editorSettings.hpp index 6a6dfa881..7bfb1d366 100644 --- a/editor/editorSettings.hpp +++ b/editor/editorSettings.hpp @@ -50,7 +50,7 @@ public: int nodebank_card() const { return m_nodebank_card; } void nodebank_card(int Size) { m_nodebank_card = Size; } - // colours of the editor: 1 amber, its own; 0 green, as the rest of the simulator + // colours of the editor: 0 green, as the rest of the simulator; 1 amber int palette() const { return m_palette; } void palette(int Palette) { m_palette = Palette; } @@ -62,7 +62,7 @@ private: double m_signal_offset{2.25}; bool m_nodebank_previews{true}; int m_nodebank_card{96}; - int m_palette{1}; + int m_palette{0}; }; // global editor settings instance diff --git a/lang/editor_pl.po b/lang/editor_pl.po index b03aa4105..c16a20aed 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -4683,3 +4683,42 @@ msgstr "Zielone, jak reszta symulatora" msgid "Amber, of the editor" msgstr "Bursztynowe, edytora" + +msgid "Surroundings" +msgstr "Otoczenie" + +msgid "Roads" +msgstr "Drogi" + +msgid "Sculpt" +msgstr "Rzeźbienie" + +msgid "Chunks" +msgstr "Kafle" + +msgid "Models around the line: select, insert, brush, area fill, copy to the node bank" +msgstr "Modele wokół linii: zaznaczanie, wstawianie, pędzel, wypełnianie obszaru, kopiowanie do banku" + +msgid "Tracks and switches, signals, objects along the track, checks of the line" +msgstr "Tory i rozjazdy, sygnalizatory, obiekty wzdłuż toru, kontrole linii" + +msgid "Roads and junctions, level crossings, the points where the traffic comes and goes" +msgstr "Drogi i skrzyżowania, przejazdy, punkty pojawiania się i znikania ruchu" + +msgid "Terrain patches and chunks, sculpting, streaming, orthophoto" +msgstr "Płaty i kafle terenu, rzeźbienie, strumieniowanie, ortofotomapa" + +msgid "LMB picks the models, as in the surroundings" +msgstr "LPM zaznacza modele, jak w otoczeniu" + +msgid "LMB raises the terrain under the brush, Shift+LMB lowers it" +msgstr "LPM podnosi teren pod pędzlem, Shift+LPM go obniża" + +msgid "LMB evens the terrain out under the brush" +msgstr "LPM wyrównuje teren pod pędzlem" + +msgid "LMB adds a chunk next to the clicked one, Shift+LMB deletes it" +msgstr "LPM dodaje kafel obok klikniętego, Shift+LPM go usuwa" + +msgid "A vehicle to drive, put on the selected track; it isn't written to the scenery files" +msgstr "Pojazd do jazdy, stawiany na zaznaczonym torze; nie trafia do plików scenerii" From f94100ffe74e810bdd22a7acb73279c1b5ad9824 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Fri, 9 Oct 2026 01:12:46 +0200 Subject: [PATCH 185/430] feat(editor): more models selected at once (Shift+LMB), moved and turned by the gizmo together, undone in one step; Ctrl+C / Ctrl+V copy the selected models with their groups and paste them at the cursor; Ctrl+G groups the selection, Ctrl+Shift+G takes a group apart, groups written to the scenery as group ... endgroup and loaded as groups of their own; End drops each model of the selection and of their groups onto the ground; menu of the selection at the cursor on Ctrl+RMB; Edit menu with undo, redo, the clipboard, grouping, deleting; Help > Keyboard shortcuts (F1) with the keys of every field of work, F2-F5 choose the fields of work, the tracks menu lists the track tools with their keys, the keys and descriptions in the menus and tooltips; self-test commands for the selection; Polish translation --- CMakeLists.txt | 1 + application/editormode.cpp | 420 +++++++++++++++++++---- application/editormode.h | 51 ++- application/editormoderoad.cpp | 6 +- application/editormodeselection.cpp | 362 +++++++++++++++++++ application/editormodeselftest.cpp | 66 ++++ application/editormodetrack.cpp | 28 +- application/editoruilayer.cpp | 2 + application/editoruilayer.h | 6 + lang/editor_pl.po | 267 ++++++++++++++ scene/scenelayerssave.cpp | 96 +++++- scene/scenenodegroups.cpp | 96 +++++- scene/scenenodegroups.h | 28 +- simulation/simulationstateserializer.cpp | 3 +- 14 files changed, 1354 insertions(+), 78 deletions(-) create mode 100644 application/editormodeselection.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f52e7857..818849fbb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -197,6 +197,7 @@ set(SOURCES "application/editormodeparallel.cpp" "application/editormodelineside.cpp" "application/editormodevehicle.cpp" +"application/editormodeselection.cpp" "application/editormodesignal.cpp" "application/editormodesweep.cpp" "application/editormodeturntable.cpp" diff --git a/application/editormode.cpp b/application/editormode.cpp index 05e1c7367..0bec52a78 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -13,6 +13,7 @@ http://mozilla.org/MPL/2.0/. #include #include #include "application/editormode.h" +#include "scene/scenenodegroups.h" #include "application/editoruilayer.h" #ifndef _WIN32 #include @@ -512,11 +513,13 @@ editor_mode::editor_mode() { ui()->set_file_actions([this]() { save(); }, [this]() { export_scenery(); }); ui()->set_new_scenery([this]() { m_newscenery_asked = true; }); ui()->set_open_scenery([this]() { m_openscenery_asked = true; }); + ui()->set_edit_menu([this]() { render_edit_menu(); }); ui()->set_menu_options([this]() { render_object_menu(); render_track_menu(); render_road_menu(); render_map_menu(); + render_help_menu(); }); m_roadtool.settings.normalize(); road_select(nullptr); @@ -672,7 +675,7 @@ void editor_mode::start_focus(scene::basic_node *node, double duration) m_focus_duration = duration; } -void editor_mode::snap_to_ground(scene::basic_node *node) +void editor_mode::snap_to_ground(scene::basic_node *node, bool const Alone, bool const Joined) { if (!node || !simulation::Region) return; @@ -762,8 +765,19 @@ void editor_mode::snap_to_ground(scene::basic_node *node) return; push_snapshot(node, EditorSnapshot::Action::Move); + if (false == m_history.empty()) + m_history.back().joined = Joined; glm::dvec3 target = origin; target.y = bestY; + if (auto *model = dynamic_cast(node); Alone && model != nullptr && node->group() > 1) + { + // the model of a group goes down by itself, the rest of the group stays + simulation::Region->erase(model); + model->location(target); + simulation::Region->insert(model); + model->mark_dirty(); + return; + } m_editor.translate(node, target, true); // true == apply the computed Y (free vertical move) } @@ -924,6 +938,9 @@ void editor_mode::nullify_history_pointers(scene::basic_node *node) // deleted nodes also drop out of the "undo last fill" set m_fill_last.erase(std::remove(m_fill_last.begin(), m_fill_last.end(), node), m_fill_last.end()); + // and out of the selection and their group + m_selection.erase(std::remove(m_selection.begin(), m_selection.end(), node), m_selection.end()); + scene::Groups.remove(node); // an array no longer follows its settings once the model it was made of is gone if (m_array.base == node) @@ -931,6 +948,28 @@ void editor_mode::nullify_history_pointers(scene::basic_node *node) } void editor_mode::undo_last() +{ + // the changes made together are taken back together, and their models are the selection again + std::vector touched; + while (false == m_history.empty()) + { + auto const joined{m_history.back().joined}; + undo_one(); + if (m_node != nullptr && std::find(touched.begin(), touched.end(), m_node) == touched.end()) + touched.push_back(m_node); + if (false == joined) + break; + } + if (touched.size() > 1) + { + // the one with the gizmo was recorded first, so it's taken back last + m_node = touched.back(); + m_selection.assign(touched.begin(), touched.end() - 1); + ui()->set_node(m_node); + } +} + +void editor_mode::undo_one() { if (m_history.empty()) return; @@ -998,6 +1037,7 @@ void editor_mode::undo_last() redoSnap.node_ptr = nullptr; redoSnap.uuid = snap.uuid; redoSnap.layer = snap.layer; + redoSnap.joined = snap.joined; g_redo.push_back(std::move(redoSnap)); TAnimModel *created = simulation::State.create_model(snap.serialized, snap.node_name, snap.position); @@ -1022,6 +1062,7 @@ void editor_mode::undo_last() EditorSnapshot current; current.action = snap.action; + current.joined = snap.joined; current.node_name = snap.node_name; current.node_ptr = target; current.layer = target->layer(); @@ -1065,6 +1106,24 @@ void editor_mode::undo_last() } void editor_mode::redo_last() +{ + // the first of the changes made together is on the top, the others follow it + std::vector touched; + do + { + redo_one(); + if (m_node != nullptr && std::find(touched.begin(), touched.end(), m_node) == touched.end()) + touched.push_back(m_node); + } while (false == g_redo.empty() && g_redo.back().joined); + if (touched.size() > 1) + { + m_node = touched.front(); + m_selection.assign(touched.begin() + 1, touched.end()); + ui()->set_node(m_node); + } +} + +void editor_mode::redo_one() { if (g_redo.empty()) return; @@ -1131,6 +1190,7 @@ void editor_mode::redo_last() hist.position = snap.position; hist.uuid = snap.uuid; hist.layer = snap.layer; + hist.joined = snap.joined; m_history.push_back(std::move(hist)); // NOTE: located the way other steps do it, as the name alone doesn't lead to a node which has none @@ -1153,6 +1213,7 @@ void editor_mode::redo_last() EditorSnapshot hist; hist.action = snap.action; + hist.joined = snap.joined; hist.node_name = snap.node_name; hist.node_ptr = target; @@ -1429,6 +1490,9 @@ bool editor_mode::update() render_new_scenery_popup(); render_open_scenery_popup(); + render_shortcuts_window(); + draw_selection_overlay(); + render_context_menu(); // --- ImGui: Editor Settings & History windows --- if(m_settings_open) @@ -3672,6 +3736,8 @@ void editor_mode::choose_edit_mode(nodebank_panel::edit_mode const Mode) m_track_window_open = false; m_roadtool.window = false; terrain_workspace(false); + if (Mode != nodebank_panel::MODIFY) + m_selection.clear(); ui()->set_mode(Mode); } @@ -3726,6 +3792,7 @@ void editor_mode::render_workspaces() {STR_C("Roads"), work_area::roads, STR_C("Roads and junctions, level crossings, the points where the traffic comes and goes")}, {STR_C("Terrain"), work_area::terrain, STR_C("Terrain patches and chunks, sculpting, streaming, orthophoto")}, }; + char const *const keys[] = {"F2", "F3", "F4", "F5"}; auto const current{current_work_area()}; auto const &style{ImGui::GetStyle()}; auto *list{ImGui::GetWindowDrawList()}; @@ -3757,7 +3824,7 @@ void editor_mode::render_workspaces() if (ui_layer::font_bold == nullptr) list->AddText(font, fontsize, ImVec2(textposition.x + 1.0f, textposition.y), color, entry.label); if (hovered) - ImGui::SetTooltip("%s", entry.tooltip); + ImGui::SetTooltip("%s [%s]", entry.tooltip, keys[static_cast(entry.which)]); ImGui::SameLine(0.0f, style.ItemSpacing.x); } } @@ -3833,13 +3900,170 @@ void editor_mode::render_toolbar() { if (ImGui::MenuItem(operation.first, nullptr, m_gizmo_op == operation.second)) m_gizmo_op = operation.second; + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("What the handles of the gizmo on the selection do when dragged; Ctrl held snaps the values")); } if (m_gizmo_op != gizmo_operation::scale && ImGui::MenuItem(STR_C("Local space (R)"), nullptr, m_gizmo_local)) m_gizmo_local = !m_gizmo_local; + if (m_gizmo_op != gizmo_operation::scale && ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("The handles along the axes of the selected model instead of the axes of the world")); ImGui::Separator(); } if (ImGui::MenuItem(STR_C("Top view, orthographic (O)"), nullptr, Global.EditorOrtho)) toggle_ortho(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("The view straight down without perspective, as on a map; again for the camera as it was")); +} + +void editor_mode::render_edit_menu() +{ + if (false == ImGui::BeginMenu(STR_C("Edit"))) + return; + if (ImGui::MenuItem(STR_C("Undo"), "Ctrl+Z", false, false == m_history.empty())) + undo_last(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Takes the last change back")); + if (ImGui::MenuItem(STR_C("Redo"), "Ctrl+Y", false, false == g_redo.empty())) + redo_last(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Makes the change taken back again")); + ImGui::Separator(); + auto const selected{m_node != nullptr}; + if (ImGui::MenuItem(STR_C("Delete"), STR_C("Del"), false, selected || m_instance != 0)) + delete_selected(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Deletes what's selected: a model, tracks, a road piece or point, a signal, an include of a scenery template")); + auto const models{dynamic_cast(m_node) != nullptr && ui()->mode() != nodebank_panel::TRACK}; + if (ImGui::MenuItem(STR_C("Copy"), "Ctrl+C", false, models)) + copy_selection(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Copies the selected models with their groups")); + if (ImGui::MenuItem(STR_C("Paste"), "Ctrl+V", false, false == m_clipboard.empty())) + paste_clipboard(cursor_ground()); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Puts the copied models at the cursor, around it as they were around the selected one; Ctrl+RMB in the view pastes them where it was clicked")); + ImGui::Separator(); + if (ImGui::MenuItem(STR_C("Group"), "Ctrl+G", false, models && selected_nodes().size() > 1)) + group_selection(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("The selected models move together from now on; a click on one selects them all. Shift+LMB adds a model to the selection")); + if (ImGui::MenuItem(STR_C("Ungroup"), "Ctrl+Shift+G", false, selected && m_node->group() > 1)) + ungroup_selection(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("The models of the group move each by itself again")); + if (ImGui::MenuItem(STR_C("Drop to the ground"), STR_C("End"), false, selected)) + drop_selection_to_ground(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Puts each selected model, also each model of their groups, down onto the terrain or the object under it")); + if (ImGui::MenuItem(STR_C("Fly to the selected"), "F", false, selected)) + start_focus(m_node, 0.6); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("The camera flies to the selected model and looks at it")); + if (ImGui::MenuItem(STR_C("Bend along the track"), "B", false, ui()->mode() != nodebank_panel::TRACK)) + bend_shortcut(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Bends the selected model, e.g. a platform edge or a fence, along the nearest track; the settings are in the inspector")); + ImGui::EndMenu(); +} + +void editor_mode::render_help_menu() +{ + if (false == ImGui::BeginMenu(STR_C("Help"))) + return; + ImGui::MenuItem(STR_C("Keyboard shortcuts"), "F1", &m_shortcuts_open); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("The keys of the editor, for each field of work")); + ImGui::EndMenu(); +} + +void editor_mode::render_shortcuts_window() +{ + if (false == m_shortcuts_open) + return; + struct shortcut + { + char const *keys; + char const *action; + }; + struct group + { + char const *title; + std::vector shortcuts; + }; + static std::vector const groups{ + {"General", + {{"F1", "This list of shortcuts"}, + {"Ctrl+S", "Save the scenery"}, + {"Ctrl+Z / Ctrl+Y", "Undo / redo"}, + {"Ctrl+Space", "Unpin all docks for the most of the view, or pin them back"}, + {"F9", "Log"}, + {"PrtScr", "Screenshot"}, + {"Ctrl+Shift+F11", "Export scenery dump"}, + {"F11", "Leave the editor"}, + {"F10", "Quit"}}}, + {"Fields of work", {{"F2", "Surroundings"}, {"F3", "Tracks"}, {"F4", "Roads"}, {"F5", "Terrain"}}}, + {"Camera", + {{"RMB held, mouse", "Look around"}, + {"RMB held, W S A D", "Fly forwards, back, left, right (arrows in the legacy scheme)"}, + {"RMB held, E / Q", "Fly up / down (Page Up / Page Down in the legacy scheme)"}, + {"F", "Fly to the selected"}, + {"O", "Top view, orthographic"}}}, + {"Gizmo", + {{"Q / W / E", "Translate / rotate / scale"}, {"R", "Local space"}, {"Ctrl held while dragging", "Snap to the step set in the gizmo settings"}}}, + {"Surroundings", + {{"1 2 3 4 5", "Select, insert, brush, area fill, copy to bank"}, + {"LMB", "Select a model, or place one in the insert and brush modes"}, + {"Shift+LMB", "Add a model to the selection, or take it out"}, + {"Ctrl+RMB", "Menu of the selection at the cursor"}, + {"Ctrl+C / Ctrl+V", "Copy the selected models / paste them at the cursor"}, + {"Ctrl+G / Ctrl+Shift+G", "Group the selected models / take their group apart"}, + {"End", "Drop the selected onto the ground, each model of a group by itself"}, + {"Del", "Delete the selected"}, + {"B", "Bend the selected along the track"}, + {"Backspace", "Area fill: take the last point of the outline back"}}}, + {"Tracks", + {{"Esc", "Select tool; cancels what's going on first"}, + {"L / T / U", "Lay track / switch / turntable"}, + {"G / C", "Straight / curve"}, + {"H / B", "Signals / objects along the track"}, + {"P / V / J / I", "Profile / speed / joints / infrastructure"}, + {"Ctrl+F", "Find a track by its name"}, + {"Shift+LMB", "Add a track to the selection, drag: a box"}, + {"RMB on a track", "What can be done with it"}, + {"K", "Split the selected track at the cursor"}, + {"Enter / Backspace", "Laying track: finish / take the last point back"}, + {"Del", "Delete the selected tracks"}}}, + {"Roads", + {{"Esc", "Finish the road being built"}, + {"Ctrl held", "Build: straight ahead"}, + {"Shift+LMB", "Select: add a point, or take it out"}, + {"K", "Split the road at the cursor, or make a point there"}, + {"Del", "Delete the selected"}}}, + {"Terrain", {{"LMB", "Sculpt: raise; smooth: even out; chunks: add one"}, {"Shift+LMB", "Sculpt: lower; chunks: delete one"}}}, + }; + ImGui::SetNextWindowSize(ImVec2(620.0f * Global.ui_scale, 560.0f * Global.ui_scale), ImGuiCond_FirstUseEver); + // it floats over the view, read better on a solid background + ImGui::SetNextWindowBgAlpha(0.97f); + if (ImGui::Begin((std::string(STR_C("Keyboard shortcuts")) + "###shortcuts").c_str(), &m_shortcuts_open, ImGuiWindowFlags_NoCollapse)) + { + for (auto const &entry : groups) + { + ImGui::SeparatorText(STR_C(entry.title)); + if (false == ImGui::BeginTable(entry.title, 2, ImGuiTableFlags_RowBg | ImGuiTableFlags_SizingStretchProp)) + continue; + ImGui::TableSetupColumn("##keys", ImGuiTableColumnFlags_WidthFixed, 190.0f * Global.ui_scale); + ImGui::TableSetupColumn("##action", ImGuiTableColumnFlags_WidthStretch); + for (auto const &item : entry.shortcuts) + { + ImGui::TableNextColumn(); + ImGui::TextColored(ImGui::GetStyleColorVec4(ImGuiCol_CheckMark), "%s", STR_C(item.keys)); + ImGui::TableNextColumn(); + ImGui::TextWrapped("%s", STR_C(item.action)); + } + ImGui::EndTable(); + } + } + ImGui::End(); } void editor_mode::render_gizmo_options() @@ -4004,7 +4228,8 @@ void editor_mode::render_gizmo() // record a single undo snapshot at the start of the drag if (!m_gizmo_using) { - push_snapshot(m_node, action); + // the models selected along with it and their groups go into the same step of the history + selection_snapshots(action); m_gizmo_using = true; } @@ -4015,7 +4240,9 @@ void editor_mode::render_gizmo() { // apply the rotation delta relative to the model's current orientation glm::vec3 const newangles(newrotation[0], newrotation[1], newrotation[2]); - m_editor.rotate(model, newangles - model->Angles(), 0.0f); + auto const turned{newangles - model->Angles()}; + m_editor.rotate(model, turned, 0.0f); + selection_follow(glm::dvec3(0.0), turned, model->location()); } else if (operation == ImGuizmo::SCALE && model) { @@ -4025,7 +4252,9 @@ void editor_mode::render_gizmo() { glm::dvec3 const newworldpos = camerapos + glm::dvec3(newtranslation[0], newtranslation[1], newtranslation[2]); // pass Snaptoground == true so the gizmo's Y component is applied (free 3D move) + auto const before{m_node->location()}; m_editor.translate(m_node, newworldpos, true); + selection_follow(m_node->location() - before, glm::vec3(0.0f), m_node->location()); } } else @@ -4331,6 +4560,76 @@ void editor_mode::exit() } } +void editor_mode::delete_model(TAnimModel *model, bool const Joined) +{ + // record deletion for undo (serialize full node) + std::string as_text; + + model->export_as_text(as_text); + std::string debug = "Deleting node: " + as_text + "\nSerialized data:\n"; + push_snapshot(model, EditorSnapshot::Action::Delete, as_text); + if (false == m_history.empty()) + m_history.back().joined = Joined; + WriteLog(debug, logtype::generic); + + // clear history pointers referencing this model before actually deleting it + nullify_history_pointers(model); + remove_from_hierarchy(model); + + if (m_node == model) + { + m_node = nullptr; + m_dragging = false; + ui()->set_node(nullptr); + } + simulation::State.delete_model(model); +} + +void editor_mode::delete_selected() +{ + // what's selected: a road piece or point, a signal, an include of a scenery template, a model, tracks + if (road_delete()) + return; + if (m_instance != 0 && signal_delete(m_instance)) + return; + if (m_instance != 0) + { + // include of a scenery template. what it shows goes out of sight, the directive is erased on save + scene::Layers.removed(m_instance, true); + EditorSnapshot snap; + snap.instance = m_instance; + snap.node_name = *scene::Layers.instance(m_instance).file; + m_history.push_back(std::move(snap)); + g_redo.clear(); + ui()->set_status("Include of \"" + *scene::Layers.instance(m_instance).file + "\" removed, Ctrl+Z brings it back. Its directive is erased when the scenery is saved."); + select_include(0); + return; + } + TAnimModel *model = dynamic_cast(m_node); + if (model) + { + // the models of the selection go together, one step of the history + auto joined{false}; + for (auto *node : selected_nodes()) + { + if (auto *selected = dynamic_cast(node)) + { + delete_model(selected, joined); + joined = true; + } + } + m_selection.clear(); + } + else if (ui()->mode() == nodebank_panel::TRACK && m_track_tab == track_tab::path && m_track_set.size() >= 2) + { + track_set_delete(); + } + else if (selected_track() != nullptr) + { + delete_selected_track(); + } +} + void editor_mode::on_key(int const Key, int const Scancode, int const Action, int const Mods) { #ifndef __unix__ @@ -4375,6 +4674,12 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in case GLFW_KEY_E: m_gizmo_op = gizmo_operation::scale; break; case GLFW_KEY_R: m_gizmo_local = !m_gizmo_local; break; case GLFW_KEY_B: handled = ui()->mode() != nodebank_panel::TRACK && bend_shortcut(); break; + case GLFW_KEY_F1: m_shortcuts_open = !m_shortcuts_open; break; + // the fields of work in the order of their row + case GLFW_KEY_F2: choose_work_area(work_area::surroundings); break; + case GLFW_KEY_F3: choose_work_area(work_area::tracks); break; + case GLFW_KEY_F4: choose_work_area(work_area::roads); break; + case GLFW_KEY_F5: choose_work_area(work_area::terrain); break; // the edit modes in the order of the toolbar; in the track mode the digits typed as a value were taken already case GLFW_KEY_1: choose_edit_mode(nodebank_panel::MODIFY); break; case GLFW_KEY_2: choose_edit_mode(nodebank_panel::ADD); break; @@ -4395,6 +4700,23 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in return; } + // the selection: copy, paste at the cursor, group and ungroup. ahead of the camera keys, the letters may be bound there + if (Global.ctrlState && (Key == GLFW_KEY_C || Key == GLFW_KEY_V || Key == GLFW_KEY_G) && ui()->mode() != nodebank_panel::TRACK && false == m_roadtool.window) + { + if (is_press(Action)) + { + if (Key == GLFW_KEY_C) + copy_selection(); + else if (Key == GLFW_KEY_V) + paste_clipboard(cursor_ground()); + else if (Global.shiftState) + ungroup_selection(); + else + group_selection(); + } + return; + } + // save; checked ahead of the camera keys, which have S bound to moving back if (Global.ctrlState && false == Global.shiftState && Key == GLFW_KEY_S) { @@ -4459,58 +4781,8 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in break; case GLFW_KEY_DELETE: - if (is_press(Action) && road_delete()) - { - break; - } - if (is_press(Action) && m_instance != 0 && signal_delete(m_instance)) - { - break; - } - if (is_press(Action) && m_instance != 0) - { - // include of a scenery template. what it shows goes out of sight, the directive is erased on save - scene::Layers.removed(m_instance, true); - EditorSnapshot snap; - snap.instance = m_instance; - snap.node_name = *scene::Layers.instance(m_instance).file; - m_history.push_back(std::move(snap)); - g_redo.clear(); - ui()->set_status("Include of \"" + *scene::Layers.instance(m_instance).file + "\" removed, Ctrl+Z brings it back. Its directive is erased when the scenery is saved."); - select_include(0); - break; - } if (is_press(Action)) - { - TAnimModel *model = dynamic_cast(m_node); - if (model) - { - // record deletion for undo (serialize full node) - std::string as_text; - - model->export_as_text(as_text); - std::string debug = "Deleting node: " + as_text + "\nSerialized data:\n"; - push_snapshot(model, EditorSnapshot::Action::Delete, as_text); - WriteLog(debug, logtype::generic); - - // clear history pointers referencing this model before actually deleting it - nullify_history_pointers(model); - remove_from_hierarchy(model); - - m_node = nullptr; - m_dragging = false; - ui()->set_node(nullptr); - simulation::State.delete_model(model); - } - else if (ui()->mode() == nodebank_panel::TRACK && m_track_tab == track_tab::path && m_track_set.size() >= 2) - { - track_set_delete(); - } - else if (selected_track() != nullptr) - { - delete_selected_track(); - } - } + delete_selected(); break; case GLFW_KEY_ESCAPE: @@ -4569,11 +4841,8 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in break; case GLFW_KEY_F: - if (is_press(Action)) + if (is_press(Action) && m_node) { - if(!m_node) - break; - // start smooth focus camera on selected node start_focus(m_node, 0.6); } @@ -4585,7 +4854,7 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in // Unreal-style "snap to floor": drop the selected node onto the surface below it. // works against triangle geometry (shape_node terrain / opaque shapes); once a proper // editable terrain mesh exists, dropping onto it works without further changes here. - snap_to_ground(m_node); + drop_selection_to_ground(); } break; @@ -4689,12 +4958,15 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const // delegate node picking behaviour depending on current panel mode. // NOTE: the pick is resolved a few frames later, often after the button was already released, // so the callback mustn't depend on the button still being held + // Shift+LMB adds a model to the selection, or takes it out + auto const additive{mode == nodebank_panel::MODIFY && (Mods & GLFW_MOD_SHIFT) != 0}; GfxRenderer->Pick_Node_Callback( - [this, mode, rotation_mode, fixed_rotation_value](scene::basic_node *node) { + [this, mode, rotation_mode, fixed_rotation_value, additive](scene::basic_node *node) { // the press turned out to be meant for the UI if (!viewport_click()) return; + auto *const previous{m_node}; m_node = nullptr; select_include(0); @@ -4721,12 +4993,17 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const if (node) { double const dist = glm::distance(node->location(), glm::dvec3{Global.pCamera.Pos}); if (dist > static_cast(kMaxPlacementDistance)) + { + if (additive) + m_node = previous; return; + } } if (mode == nodebank_panel::MODIFY) { - m_node = node; - ui()->set_node(m_node); + if (additive) + m_node = previous; + select_node(node, additive); } else if (mode == nodebank_panel::COPY) { @@ -4801,6 +5078,23 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const } else if (Button == GLFW_MOUSE_BUTTON_RIGHT) { + // Ctrl+RMB: the menu at the cursor, for the model under it or the selection; RMB alone turns the camera + if ((Mods & GLFW_MOD_CONTROL) != 0 && ui()->mode() != nodebank_panel::TRACK) + { + if (is_press(Action)) + { + m_contextpoint = cursor_ground(); + GfxRenderer->Pick_Node_Callback([this](scene::basic_node *node) { + if (!viewport_click()) + return; + auto const selection{selected_nodes()}; + if (node != nullptr && false == node->from_template() && scene::Layers.editable(node) && std::find(selection.begin(), selection.end(), node) == selection.end()) + select_node(node, false); + m_contextopen = true; + }); + } + return; + } if (ui()->mode() == nodebank_panel::TRACK) { if (is_press(Action)) diff --git a/application/editormode.h b/application/editormode.h index 4251a36c1..45847a918 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -96,6 +96,7 @@ class editor_mode : public application_mode, private editor_track::observer } void on_event_poll() override; bool is_command_processor() const override; + // takes the last change back; changes made together (e.g. to the models of a selection) are taken back together void undo_last(); static bool focus_active(); static void set_focus_active(bool isActive); @@ -166,6 +167,7 @@ class editor_mode : public application_mode, private editor_track::observer bool profiles{false}; // the stored grade line designs changed too, these were the ones before std::vector profile_library; std::vector copies; // models an array added to the one it was made of + bool joined{false}; // undone and redone together with the change before it }; void push_snapshot(scene::basic_node *node, EditorSnapshot::Action Action = EditorSnapshot::Action::Move, std::string const &Serialized = std::string()); @@ -176,6 +178,9 @@ class editor_mode : public application_mode, private editor_track::observer editor_ui *ui() const; void redo_last(); + // a single step of the history, see undo_last() + void undo_one(); + void redo_one(); void handle_brush_mouse_hold(int Action, int Button); void apply_rotation_for_new_node(scene::basic_node *node, int rotation_mode, float fixed_rotation_value); // members @@ -222,12 +227,54 @@ class editor_mode : public application_mode, private editor_track::observer // puts every instance of the model the selected node shows on the ground under it void drop_model_instances(); void render_object_menu(); + // undo, redo and what can be done with the selection, with their keys + void render_edit_menu(); + // the list of the keyboard shortcuts, opened from the help menu or by F1 + void render_help_menu(); + void render_shortcuts_window(); + bool m_shortcuts_open{false}; + // deletes what's selected: a road piece or point, a signal, an include of a scenery template, a model, tracks (Del) + void delete_selected(); + void delete_model(TAnimModel *Model, bool const Joined); + + // more models selected at once, in the surroundings: m_node is the one the gizmo is on, the others are in m_selection. + // Shift+LMB adds a model or takes it out; a model of a group stands for the whole group + std::vector m_selection; + std::vector selected_nodes() const; // m_node first + std::vector selection_with_groups() const; // and the other models of their groups + void select_node(scene::basic_node *Node, bool const Additive); + void draw_selection_overlay(); + // the other models of the selection follow m_node moved or turned by the gizmo + void selection_snapshots(EditorSnapshot::Action const Action); + void selection_follow(glm::dvec3 const &Moved, glm::vec3 const &Turned, glm::dvec3 const &Pivot); + // clipboard (Ctrl+C, Ctrl+V): definitions of the models, placed around the cursor as they were around the selected one + struct clipboard_entry + { + std::string definition; + glm::dvec3 offset{0.0}; + glm::vec3 angles{0.0f}; + glm::vec3 scale{1.0f}; + int group{-1}; // models copied with their group are grouped again, each group anew + }; + std::vector m_clipboard; + void copy_selection(); + void paste_clipboard(glm::dvec3 const &Location); + glm::dvec3 cursor_ground(); // the point of the ground under the cursor + // groups (Ctrl+G, Ctrl+Shift+G), written to the scenery as group ... endgroup + void group_selection(); + void ungroup_selection(); + void drop_selection_to_ground(); + // menu at the cursor, Ctrl+RMB + bool m_contextopen{false}; + glm::dvec3 m_contextpoint{0.0}; + void render_context_menu(); // focus camera smoothly on specified node void start_focus(scene::basic_node *node, double duration = 0.6); - // drops the node straight down onto the nearest surface below (terrain or another object) - void snap_to_ground(scene::basic_node *node); + // drops the node straight down onto the nearest surface below (terrain or another object). its group goes along with it, + // unless Alone: then the node goes by itself. Joined: undone together with the change before + void snap_to_ground(scene::basic_node *node, bool const Alone = false, bool const Joined = false); // editable terrain patches created in the editor void render_terrain_ui(); diff --git a/application/editormoderoad.cpp b/application/editormoderoad.cpp index 5e0f3bff9..0ff5ef675 100644 --- a/application/editormoderoad.cpp +++ b/application/editormoderoad.cpp @@ -220,12 +220,16 @@ void editor_mode::render_road_menu() { if (ImGui::BeginMenu("Roads")) { - if (ImGui::MenuItem("Road editor", nullptr, &m_roadtool.window) && m_roadtool.window) + if (ImGui::MenuItem("Road editor", "F4", &m_roadtool.window) && m_roadtool.window) { m_track_window_open = false; terrain_workspace(false); } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "The roads as the field of work: their tools in the toolbar, their settings in the tool options"); ImGui::MenuItem("Show lanes", nullptr, &m_roadtool.lanes); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "Draws the lanes of the roads with the ways the vehicles take through the junctions"); ImGui::EndMenu(); } } diff --git a/application/editormodeselection.cpp b/application/editormodeselection.cpp new file mode 100644 index 000000000..a8c845339 --- /dev/null +++ b/application/editormodeselection.cpp @@ -0,0 +1,362 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +// more models selected at once, the clipboard, groups and the menu at the cursor of the scenery editor + +#include "stdafx.h" +#include "application/editormode.h" +#include "application/editoruilayer.h" +#include "application/editorprojection.h" +#include "editor/editorFormat.hpp" + +#include "model/AnimModel.h" +#include "rendering/renderer.h" +#include "scene/scenelayers.h" +#include "scene/scenenodegroups.h" +#include "simulation/simulation.h" +#include "utilities/Globals.h" +#include "utilities/translation.h" +#include "imgui/imgui.h" + +#include +#include +#include + +namespace +{ + +// the models of the selection can be grouped, copied and dropped onto the ground; tracks and other nodes are left out +TAnimModel *as_model(scene::basic_node *Node) +{ + return Node != nullptr ? dynamic_cast(Node) : nullptr; +} + +} // namespace + +std::vector editor_mode::selected_nodes() const +{ + std::vector nodes; + if (m_node == nullptr) + return nodes; + nodes.push_back(m_node); + // the selection of more models is a thing of the surroundings + if (ui()->mode() != nodebank_panel::MODIFY) + return nodes; + for (auto *node : m_selection) + if (node != nullptr && std::find(nodes.begin(), nodes.end(), node) == nodes.end()) + nodes.push_back(node); + return nodes; +} + +std::vector editor_mode::selection_with_groups() const +{ + auto nodes{selected_nodes()}; + auto const count{nodes.size()}; + for (std::size_t index = 0; index < count; ++index) + { + // NOTE: the groups up to the first one stand for no group, see scene::basic_editor + if (nodes[index]->group() <= 1) + continue; + for (auto *member : scene::Groups.group(nodes[index]->group()).nodes) + if (std::find(nodes.begin(), nodes.end(), member) == nodes.end()) + nodes.push_back(member); + } + return nodes; +} + +void editor_mode::select_node(scene::basic_node *Node, bool const Additive) +{ + if (false == Additive) + { + m_selection.clear(); + m_node = Node; + ui()->set_node(m_node); + return; + } + if (Node == nullptr) + return; + if (m_node == nullptr) + { + m_node = Node; + } + else if (Node == m_node) + { + // taken out; the one selected before it takes the gizmo + if (m_selection.empty()) + { + m_node = nullptr; + } + else + { + m_node = m_selection.back(); + m_selection.pop_back(); + } + } + else if (auto const found{std::find(m_selection.begin(), m_selection.end(), Node)}; found != m_selection.end()) + { + m_selection.erase(found); + } + else + { + // the model selected last gets the gizmo + m_selection.push_back(m_node); + m_node = Node; + } + ui()->set_node(m_node); + auto const count{selected_nodes().size()}; + if (count > 1) + ui()->set_status(format(STR_C("%zu models selected; Shift+LMB adds or takes one out"), count)); +} + +void editor_mode::draw_selection_overlay() +{ + if (ui()->mode() != nodebank_panel::MODIFY || m_node == nullptr) + return; + auto const nodes{selection_with_groups()}; + if (nodes.size() < 2) + return; + // a ring around each model of the selection, the one with the gizmo brighter, the models of their groups dimmer + screen_projection const projection; + auto *drawlist{ImGui::GetBackgroundDrawList(ImGui::GetMainViewport())}; + auto const direct{selected_nodes()}; + for (auto *node : nodes) + { + ImVec2 point; + if (false == projection.project(node->location(), point)) + continue; + auto const chosen{std::find(direct.begin(), direct.end(), node) != direct.end()}; + auto const color{node == m_node ? overlay_color::highlight : chosen ? overlay_color::selected : overlay_color::marked}; + drawlist->AddCircle(point, node == m_node ? 9.0f : 7.0f, color, 16, 2.0f); + } +} + +void editor_mode::selection_snapshots(EditorSnapshot::Action const Action) +{ + // one step of the history for all of them + auto joined{false}; + for (auto *node : selection_with_groups()) + { + push_snapshot(node, Action); + if (false == m_history.empty()) + m_history.back().joined = joined; + joined = true; + } +} + +void editor_mode::selection_follow(glm::dvec3 const &Moved, glm::vec3 const &Turned, glm::dvec3 const &Pivot) +{ + // a group is moved by any of its models, once; the one of m_node is moved with it already + std::vector moved; + if (m_node != nullptr && m_node->group() > 1) + moved.push_back(m_node->group()); + for (auto *node : selected_nodes()) + { + if (node == m_node) + continue; + if (node->group() > 1) + { + if (std::find(moved.begin(), moved.end(), node->group()) != moved.end()) + continue; + moved.push_back(node->group()); + } + if (Turned != glm::vec3(0.0f)) + { + // turned in place, then carried around the turning point + m_editor.rotate(node, Turned, 0.0f); + auto const location{Pivot + glm::rotateY(node->location() - Pivot, glm::radians(Turned.y))}; + m_editor.translate(node, location, true); + } + if (Moved != glm::dvec3(0.0)) + m_editor.translate(node, node->location() + Moved, true); + } +} + +glm::dvec3 editor_mode::cursor_ground() +{ + return placement_on_ground(Camera.Pos + clamp_mouse_offset_to_max(GfxRenderer->Mouse_Position())); +} + +void editor_mode::copy_selection() +{ + auto const nodes{selection_with_groups()}; + auto const *anchor{as_model(m_node)}; + if (anchor == nullptr) + { + ui()->set_status(STR("Select a model to copy"), true); + return; + } + m_clipboard.clear(); + std::map groups; + for (auto *node : nodes) + { + auto *model{as_model(node)}; + if (model == nullptr) + continue; + clipboard_entry entry; + model->export_as_text(entry.definition); + entry.offset = model->location() - anchor->location(); + entry.angles = model->Angles(); + entry.scale = model->Scale(); + if (model->group() > 1) + entry.group = groups.emplace(model->group(), static_cast(groups.size())).first->second; + m_clipboard.push_back(std::move(entry)); + } + ui()->set_status(format(STR_C("%zu models copied; Ctrl+V puts them at the cursor"), m_clipboard.size())); +} + +void editor_mode::paste_clipboard(glm::dvec3 const &Location) +{ + if (m_clipboard.empty()) + { + ui()->set_status(STR("Nothing copied yet; Ctrl+C copies the selected models"), true); + return; + } + // one step of the history, the way an array is: the copies are taken out together + EditorSnapshot snap; + snap.action = EditorSnapshot::Action::Array; + std::vector made; + std::map> groups; + for (auto const &entry : m_clipboard) + { + // NOTE: no names for the copies, same as with the brush and the array + auto *model{simulation::State.create_model(entry.definition, std::string{}, Location + entry.offset)}; + if (model == nullptr) + continue; + model->location(Location + entry.offset); + model->Angles(entry.angles); + model->Scale(entry.scale); + add_to_hierarchy(model); + EditorSnapshot::array_copy copy; + copy.model = model; + copy.uuid = model->uuid; + snap.copies.push_back(std::move(copy)); + snap.layer = model->layer(); + made.push_back(model); + if (entry.group >= 0) + groups[entry.group].push_back(model); + } + if (made.empty()) + return; + m_history.push_back(std::move(snap)); + g_redo.clear(); + for (auto const &group : groups) + if (group.second.size() > 1) + scene::Groups.make(group.second); + // the copies are the selection now + m_selection.assign(made.begin() + 1, made.end()); + m_node = made.front(); + ui()->set_node(m_node); + ui()->set_status(format(STR_C("%zu models pasted; Ctrl+Z takes them back"), made.size())); +} + +void editor_mode::group_selection() +{ + auto nodes{selection_with_groups()}; + nodes.erase(std::remove_if(nodes.begin(), nodes.end(), [](scene::basic_node *Node) { return as_model(Node) == nullptr; }), nodes.end()); + if (nodes.size() < 2) + { + ui()->set_status(STR("Select two models or more to group them: Shift+LMB adds one to the selection"), true); + return; + } + for (auto *node : nodes) + { + std::string reason; + if (node->from_template() || false == scene::Layers.editable(node, &reason)) + { + ui()->set_status("\"" + (node->name().empty() ? std::string{"(unnamed node)"} : node->name()) + "\" can't be grouped: " + reason, true); + return; + } + } + // a group is written to the scenery as one block, in the layer of the model with the gizmo + for (auto *node : nodes) + if (node->layer() != m_node->layer()) + scene::Layers.move(node, m_node->layer()); + scene::Groups.make(nodes); + m_selection.clear(); + ui()->set_status(format(STR_C("%zu models grouped: a click on one selects them all; Ctrl+Shift+G takes the group apart"), nodes.size())); +} + +void editor_mode::ungroup_selection() +{ + std::vector groups; + for (auto *node : selected_nodes()) + { + if (node->group() <= 1 || std::find(groups.begin(), groups.end(), node->group()) != groups.end()) + continue; + // the groups of the scenery templates are their includes, they can't be taken apart here + auto const &members{scene::Groups.group(node->group()).nodes}; + if (std::any_of(members.begin(), members.end(), [](scene::basic_node const *Member) { return Member->from_template(); })) + continue; + groups.push_back(node->group()); + } + if (groups.empty()) + { + ui()->set_status(STR("The selected model isn't in a group"), true); + return; + } + for (auto const group : groups) + scene::Groups.dissolve(group); + ui()->set_status(format(STR_C("%zu groups taken apart"), groups.size())); +} + +void editor_mode::drop_selection_to_ground() +{ + // each model by itself, a group follows the ground under its models + auto joined{false}; + for (auto *node : selection_with_groups()) + { + auto const size{m_history.size()}; + snap_to_ground(node, true, joined); + joined = joined || m_history.size() != size; + } +} + +void editor_mode::render_context_menu() +{ + if (m_contextopen) + { + ImGui::OpenPopup("##editorcontext"); + m_contextopen = false; + } + if (false == ImGui::BeginPopup("##editorcontext")) + return; + auto const selected{m_node != nullptr}; + auto const model{as_model(m_node) != nullptr}; + auto const count{selected_nodes().size()}; + if (count > 1) + ImGui::TextDisabled(STR_C("%zu models selected"), count); + else if (selected) + ImGui::TextDisabled("%s", m_node->name().empty() ? "(unnamed node)" : m_node->name().c_str()); + else + ImGui::TextDisabled("%s", STR_C("Nothing selected")); + ImGui::Separator(); + auto const item = [](char const *Label, char const *Keys, bool const Enabled, char const *Tooltip) { + auto const chosen{ImGui::MenuItem(Label, Keys, false, Enabled)}; + if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled)) + ImGui::SetTooltip("%s", Tooltip); + return chosen; + }; + if (item(STR_C("Copy"), "Ctrl+C", model, STR_C("Copies the selected models with their groups"))) + copy_selection(); + if (item(STR_C("Paste here"), "Ctrl+V", false == m_clipboard.empty(), STR_C("Puts the copied models here, around this point as they were around the selected one"))) + paste_clipboard(m_contextpoint); + ImGui::Separator(); + if (item(STR_C("Group"), "Ctrl+G", model && count > 1, STR_C("The selected models move together from now on; a click on one selects them all"))) + group_selection(); + if (item(STR_C("Ungroup"), "Ctrl+Shift+G", selected && m_node->group() > 1, STR_C("The models of the group move each by itself again"))) + ungroup_selection(); + if (item(STR_C("Drop to the ground"), STR_C("End"), selected, STR_C("Puts each selected model, also each model of their groups, down onto the terrain or the object under it"))) + drop_selection_to_ground(); + ImGui::Separator(); + if (item(STR_C("Fly to the selected"), "F", selected, STR_C("The camera flies to the selected model and looks at it"))) + start_focus(m_node, 0.6); + if (item(STR_C("Delete"), STR_C("Del"), selected, STR_C("Deletes the selected models"))) + delete_selected(); + ImGui::EndPopup(); +} diff --git a/application/editormodeselftest.cpp b/application/editormodeselftest.cpp index 8bb4f2a51..a2281e6c0 100644 --- a/application/editormodeselftest.cpp +++ b/application/editormodeselftest.cpp @@ -53,6 +53,11 @@ http://mozilla.org/MPL/2.0/. // middle, point), height (origin, bottom, top, edge, point), point=,,, // pick=,, (a point of the scene picked as the reference point), go (0, 1) // selectinclude the include placed nearest the point +// addmodel the model instance nearest the point added to the selection, or taken out (Shift+LMB) +// selection logs the selected models, with the models of their groups +// moveselection the selection moved by the offset, as the gizmo moves it +// turnselection the selection turned around the model with the gizmo +// copy, paste , group, ungroup, drop, delete as the keys of the selection do them // bendset =... the bent model being edited: length, lateral, height, along, side, height // bendprobe logs the bent model being edited // undo, redo @@ -626,6 +631,67 @@ void editor_mode::selftest_step() ui()->set_node(m_node); WriteLog("SELFTEST selectmodel: " + (nearest != nullptr ? format("%s at %.2f %.2f %.2f", nearest->name().c_str(), nearest->location().x, nearest->location().y, nearest->location().z) : std::string{"none"})); } + else if (command == "addmodel") + { + glm::dvec3 point{0.0}; + words >> point.x >> point.z; + TAnimModel *nearest{nullptr}; + auto best{50.0}; + for (auto *model : simulation::Instances.sequence()) + { + if (model == nullptr) + continue; + auto const distance{glm::length(glm::dvec2{model->location().x - point.x, model->location().z - point.z})}; + if (distance < best) + { + best = distance; + nearest = model; + } + } + select_node(nearest, true); + WriteLog("SELFTEST addmodel: " + (nearest != nullptr ? format("%s at %.2f %.2f %.2f", nearest->name().c_str(), nearest->location().x, nearest->location().y, nearest->location().z) : std::string{"none"})); + } + else if (command == "selection") + { + std::string text; + for (auto *node : selection_with_groups()) + text += format(" [%s %.2f %.2f %.2f group %d]", node->name().c_str(), node->location().x, node->location().y, node->location().z, static_cast(node->group())); + WriteLog("SELFTEST selection:" + text); + } + else if (command == "moveselection" && m_node != nullptr) + { + glm::dvec3 offset{0.0}; + words >> offset.x >> offset.y >> offset.z; + selection_snapshots(EditorSnapshot::Action::Move); + auto const before{m_node->location()}; + m_editor.translate(m_node, before + offset, true); + selection_follow(m_node->location() - before, glm::vec3(0.0f), m_node->location()); + } + else if (command == "turnselection" && m_node != nullptr) + { + float degrees{0.0f}; + words >> degrees; + selection_snapshots(EditorSnapshot::Action::Rotate); + glm::vec3 const turned{0.0f, degrees, 0.0f}; + m_editor.rotate(m_node, turned, 0.0f); + selection_follow(glm::dvec3(0.0), turned, m_node->location()); + } + else if (command == "copy") + copy_selection(); + else if (command == "paste") + { + glm::dvec3 point{0.0}; + words >> point.x >> point.y >> point.z; + paste_clipboard(point); + } + else if (command == "group") + group_selection(); + else if (command == "ungroup") + ungroup_selection(); + else if (command == "drop") + drop_selection_to_ground(); + else if (command == "delete") + delete_selected(); else if (command == "selectinclude") { glm::dvec3 point{0.0}; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 689ee15f9..89d3b3e10 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -582,15 +582,31 @@ std::array const &editor_mode::track_modes() void editor_mode::render_track_menu() { - if (ImGui::MenuItem(STR_C("Tracks"), nullptr, m_track_window_open)) + // the tools of the tracks with their keys, as in the toolbar of the field of work + if (false == ImGui::BeginMenu(STR_C("Tracks"))) + return; + for (auto const &mode : track_modes()) { - if (m_track_window_open) - m_track_window_open = false; - else - show_track_tab(m_track_tab); + if (ImGui::MenuItem(STR_C(mode.label), mode.key, m_track_window_open && m_track_tab == mode.tab)) + { + terrain_workspace(false); + show_track_tab(mode.tab); + } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C(mode.tooltip)); } + ImGui::Separator(); + if (ImGui::MenuItem(STR_C("Find a track by its name"), "Ctrl+F")) + { + terrain_workspace(false); + show_track_tab(m_track_window_open ? m_track_tab : track_tab::path); + m_track_search.focus = true; + } + if (ImGui::MenuItem(STR_C("Structure gauge"), nullptr, m_gauge.open)) + m_gauge.open = !m_gauge.open; if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("Track editor: the window with its modes opens or closes")); + ImGui::SetTooltip("%s", STR_C("Checks which models enter the structure gauge of the tracks and the clearance over the roads (skrajnia budowli)")); + ImGui::EndMenu(); } void editor_mode::show_track_tab(track_tab const Tab) diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index 8fc55fc99..79c265df9 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -972,6 +972,8 @@ void editor_ui::render_menu_contents() } ImGui::EndMenu(); } + if (m_editmenu) + m_editmenu(); ui_layer::render_menu_contents(); diff --git a/application/editoruilayer.h b/application/editoruilayer.h index f95af4c29..deb58bfb5 100644 --- a/application/editoruilayer.h +++ b/application/editoruilayer.h @@ -69,6 +69,11 @@ class editor_ui : public ui_layer { m_toolbaroptions = std::move(Renderer); } + // draws the edit menu of the editor mode, next to the file menu + void set_edit_menu(std::function Renderer) + { + m_editmenu = std::move(Renderer); + } // draws the fields of work of the editor mode in a row above the toolbar void set_workspace_bar(std::function Renderer) { @@ -188,6 +193,7 @@ class editor_ui : public ui_layer std::function m_menuoptions; std::function m_toolbaroptions; std::function m_workspacebar; + std::function m_editmenu; bool m_layoutreset{false}; // the default layout is to be built again on the next frame bool m_tooloptionsopen{true}; bool m_inspectoropen{true}; diff --git a/lang/editor_pl.po b/lang/editor_pl.po index c16a20aed..bec33efc4 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -4722,3 +4722,270 @@ msgstr "LPM dodaje kafel obok klikniętego, Shift+LPM go usuwa" msgid "A vehicle to drive, put on the selected track; it isn't written to the scenery files" msgstr "Pojazd do jazdy, stawiany na zaznaczonym torze; nie trafia do plików scenerii" + +msgid "%zu groups taken apart" +msgstr "Rozgrupowano grup: %zu" + +msgid "%zu models copied; Ctrl+V puts them at the cursor" +msgstr "Skopiowano modeli: %zu; Ctrl+V wstawia je przy kursorze" + +msgid "%zu models grouped: a click on one selects them all; Ctrl+Shift+G takes the group apart" +msgstr "Zgrupowano modeli: %zu; klik na jednym zaznacza wszystkie, Ctrl+Shift+G rozgrupowuje" + +msgid "%zu models pasted; Ctrl+Z takes them back" +msgstr "Wklejono modeli: %zu; Ctrl+Z cofa" + +msgid "%zu models selected" +msgstr "Zaznaczono modeli: %zu" + +msgid "%zu models selected; Shift+LMB adds or takes one out" +msgstr "Zaznaczono modeli: %zu; Shift+LPM dodaje lub odejmuje model" + +msgid "Add a model to the selection, or take it out" +msgstr "Dodaje model do zaznaczenia albo go odejmuje" + +msgid "Add a track to the selection, drag: a box" +msgstr "Dodaje tor do zaznaczenia, przeciąganie: ramka" + +msgid "Area fill: take the last point of the outline back" +msgstr "Wypełnianie obszaru: cofnij ostatni punkt obrysu" + +msgid "Bend the selected along the track" +msgstr "Wygnij zaznaczony wzdłuż toru" + +msgid "Bends the selected model, e.g. a platform edge or a fence, along the nearest track; the settings are in the inspector" +msgstr "Wygina zaznaczony model, np. krawędź peronu albo płot, wzdłuż najbliższego toru; ustawienia są w inspektorze" + +msgid "Build: straight ahead" +msgstr "Budowa: prosto przed siebie" + +msgid "Camera" +msgstr "Kamera" + +msgid "Copies the selected models with their groups" +msgstr "Kopiuje zaznaczone modele razem z ich grupami" + +msgid "Copy" +msgstr "Kopiuj" + +msgid "Copy the selected models / paste them at the cursor" +msgstr "Kopiuj zaznaczone modele / wklej je przy kursorze" + +msgid "Ctrl held" +msgstr "Ctrl wciśnięty" + +msgid "Ctrl held while dragging" +msgstr "Ctrl wciśnięty przy przeciąganiu" + +msgid "Ctrl+RMB" +msgstr "Ctrl+PPM" + +msgid "Delete the selected" +msgstr "Usuń zaznaczone" + +msgid "Delete the selected tracks" +msgstr "Usuń zaznaczone tory" + +msgid "Deletes the selected models" +msgstr "Usuwa zaznaczone modele" + +msgid "Deletes what's selected: a model, tracks, a road piece or point, a signal, an include of a scenery template" +msgstr "Usuwa to, co zaznaczone: model, tory, kawałek lub punkt drogi, sygnalizator, include szablonu scenerii" + +msgid "Drop the selected onto the ground, each model of a group by itself" +msgstr "Opuść zaznaczone na ziemię, każdy model grupy osobno" + +msgid "Drop to the ground" +msgstr "Opuść na ziemię" + +msgid "Enter / Backspace" +msgstr "Enter / Backspace" + +msgid "Fields of work" +msgstr "Tryby pracy" + +msgid "Find a track by its name" +msgstr "Znajdź tor po nazwie" + +msgid "Finish the road being built" +msgstr "Zakończ budowaną drogę" + +msgid "Fly forwards, back, left, right (arrows in the legacy scheme)" +msgstr "Lot do przodu, do tyłu, w lewo, w prawo (strzałki w starym układzie)" + +msgid "Fly to the selected" +msgstr "Leć do zaznaczonego" + +msgid "Fly up / down (Page Up / Page Down in the legacy scheme)" +msgstr "Lot w górę / w dół (Page Up / Page Down w starym układzie)" + +msgid "Group the selected models / take their group apart" +msgstr "Grupuj zaznaczone modele / rozgrupuj ich grupę" + +msgid "Help" +msgstr "Pomoc" + +msgid "Keyboard shortcuts" +msgstr "Skróty klawiszowe" + +msgid "Lay track / switch / turntable" +msgstr "Układanie toru / rozjazd / obrotnica" + +msgid "Laying track: finish / take the last point back" +msgstr "Układanie toru: zakończ / cofnij ostatni punkt" + +msgid "Leave the editor" +msgstr "Wyjście z edytora" + +msgid "Local space" +msgstr "Lokalne osie" + +msgid "Log" +msgstr "Log" + +msgid "Look around" +msgstr "Rozglądanie się" + +msgid "Makes the change taken back again" +msgstr "Przywraca cofniętą zmianę" + +msgid "Menu of the selection at the cursor" +msgstr "Menu zaznaczenia przy kursorze" + +msgid "Nothing copied yet; Ctrl+C copies the selected models" +msgstr "Nic jeszcze nie skopiowano; Ctrl+C kopiuje zaznaczone modele" + +msgid "Nothing selected" +msgstr "Nic nie zaznaczono" + +msgid "Paste" +msgstr "Wklej" + +msgid "Paste here" +msgstr "Wklej tutaj" + +msgid "Profile / speed / joints / infrastructure" +msgstr "Profil / prędkość / styki / infrastruktura" + +msgid "Puts each selected model, also each model of their groups, down onto the terrain or the object under it" +msgstr "Opuszcza każdy zaznaczony model, także każdy model ich grup, na teren albo obiekt pod nim" + +msgid "Puts the copied models at the cursor, around it as they were around the selected one; Ctrl+RMB in the view pastes them where it was clicked" +msgstr "Wstawia skopiowane modele przy kursorze, rozłożone wokół niego tak jak wokół zaznaczonego; Ctrl+PPM w widoku wkleja je w klikniętym miejscu" + +msgid "Puts the copied models here, around this point as they were around the selected one" +msgstr "Wstawia skopiowane modele tutaj, rozłożone wokół tego punktu tak jak wokół zaznaczonego" + +msgid "Quit" +msgstr "Wyjście" + +msgid "RMB held, E / Q" +msgstr "PPM wciśnięty, E / Q" + +msgid "RMB held, W S A D" +msgstr "PPM wciśnięty, W S A D" + +msgid "RMB held, mouse" +msgstr "PPM wciśnięty, mysz" + +msgid "Redo" +msgstr "Ponów" + +msgid "Save the scenery" +msgstr "Zapisz scenerię" + +msgid "Screenshot" +msgstr "Zrzut ekranu" + +msgid "Sculpt: lower; chunks: delete one" +msgstr "Rzeźbienie: obniżanie; kafle: usunięcie kafla" + +msgid "Sculpt: raise; smooth: even out; chunks: add one" +msgstr "Rzeźbienie: podnoszenie; wygładzanie: wyrównanie; kafle: dodanie kafla" + +msgid "Select a model to copy" +msgstr "Zaznacz model do skopiowania" + +msgid "Select a model, or place one in the insert and brush modes" +msgstr "Zaznacz model albo postaw go w trybach wstawiania i pędzla" + +msgid "Select tool; cancels what's going on first" +msgstr "Narzędzie zaznaczania; najpierw przerywa to, co trwa" + +msgid "Select two models or more to group them: Shift+LMB adds one to the selection" +msgstr "Zaznacz co najmniej dwa modele, by je zgrupować: Shift+LPM dodaje model do zaznaczenia" + +msgid "Select, insert, brush, area fill, copy to bank" +msgstr "Zaznaczanie, wstawianie, pędzel, wypełnianie obszaru, kopiowanie do banku" + +msgid "Select: add a point, or take it out" +msgstr "Zaznaczanie: dodaj punkt albo go odejmij" + +msgid "Signals / objects along the track" +msgstr "Sygnalizatory / obiekty wzdłuż toru" + +msgid "Snap to the step set in the gizmo settings" +msgstr "Przyciąganie do kroku z ustawień gizma" + +msgid "Split the road at the cursor, or make a point there" +msgstr "Podziel drogę przy kursorze albo zrób tam punkt" + +msgid "Split the selected track at the cursor" +msgstr "Podziel zaznaczony tor przy kursorze" + +msgid "Straight / curve" +msgstr "Prosta / łuk" + +msgid "Takes the last change back" +msgstr "Cofa ostatnią zmianę" + +msgid "The camera flies to the selected model and looks at it" +msgstr "Kamera leci do zaznaczonego modelu i na niego patrzy" + +msgid "The handles along the axes of the selected model instead of the axes of the world" +msgstr "Uchwyty wzdłuż osi zaznaczonego modelu zamiast osi świata" + +msgid "The keys of the editor, for each field of work" +msgstr "Klawisze edytora w każdym trybie pracy" + +msgid "The models of the group move each by itself again" +msgstr "Modele grupy znów poruszają się osobno" + +msgid "The selected model isn't in a group" +msgstr "Zaznaczony model nie jest w grupie" + +msgid "The selected models move together from now on; a click on one selects them all" +msgstr "Zaznaczone modele poruszają się odtąd razem; klik na jednym zaznacza wszystkie" + +msgid "The selected models move together from now on; a click on one selects them all. Shift+LMB adds a model to the selection" +msgstr "Zaznaczone modele poruszają się odtąd razem; klik na jednym zaznacza wszystkie. Shift+LPM dodaje model do zaznaczenia" + +msgid "The view straight down without perspective, as on a map; again for the camera as it was" +msgstr "Widok z góry bez perspektywy, jak na mapie; ponownie: kamera jak była" + +msgid "This list of shortcuts" +msgstr "Ta lista skrótów" + +msgid "Top view, orthographic" +msgstr "Widok z góry, ortogonalny" + +msgid "Translate / rotate / scale" +msgstr "Przesuwanie / obrót / skala" + +msgid "Undo" +msgstr "Cofnij" + +msgid "Undo / redo" +msgstr "Cofnij / ponów" + +msgid "Ungroup" +msgstr "Rozgrupuj" + +msgid "Unpin all docks for the most of the view, or pin them back" +msgstr "Odepnij wszystkie doki dla większego widoku albo przypnij je z powrotem" + +msgid "What can be done with it" +msgstr "Co można z nim zrobić" + +msgid "What the handles of the gizmo on the selection do when dragged; Ctrl held snaps the values" +msgstr "Co robią uchwyty gizma na zaznaczeniu przy przeciąganiu; z Ctrl wartości są przyciągane" diff --git a/scene/scenelayerssave.cpp b/scene/scenelayerssave.cpp index b6b4ae17b..15197b163 100644 --- a/scene/scenelayerssave.cpp +++ b/scene/scenelayerssave.cpp @@ -16,6 +16,7 @@ http://mozilla.org/MPL/2.0/. #include "simulation/simulation.h" #include "model/AnimModel.h" +#include "scene/scenenodegroups.h" #include "world/MemCell.h" #include "world/Traction.h" #include "world/EvLaunch.h" @@ -688,6 +689,11 @@ save_result node_layers::save(std::vector const &Rootstatements, st { return true; } + if (Model != nullptr && Groups.relocating(Node)) + { + // written anew along with its group, below + return true; + } auto const location{Node->location()}; auto const angles{Model != nullptr ? Model->Angles() : glm::vec3{0.f}}; auto const scale{Model != nullptr ? Model->Scale() : glm::vec3{1.f}}; @@ -806,6 +812,87 @@ save_result node_layers::save(std::vector const &Rootstatements, st return fail(state.error); } } + // models grouped or ungrouped in the editor: their definitions are taken out of where they are and written anew, a group + // as one block between group and endgroup in the layer of its first model, a model of a dissolved group on its own + std::set relocated; + auto const relocate = [&](TAnimModel const *Model, layer_handle const Target, std::vector> &Output) { + if (auto const lookup{m_sources.find(Model)}; lookup != m_sources.end()) + { + auto const &source{lookup->second}; + if (false == writable(source.layer)) + { + // one definition stands for more than one node, it stays where it is + return true; + } + if (false == load(source.layer)) + { + return false; + } + file_patch::edit edit; + edit.begin = source.span.begin; + edit.end = source.span.end; + state.patches[source.layer].edits.emplace_back(std::move(edit)); + rewritten.emplace(Model); + } + std::string text; + Model->export_as_text(text); + text.erase(text.find_last_not_of(" \t\r\n") + 1); + auto const &context{layer(Target).context_insert()}; + if (false == context.matches(layer_context())) + { + model_placement placement; + placement.rotation = context.rotation; + placement.location = context.to_local(Model->location()); + placement.angles = Model->Angles(); + placement.scale = Model->Scale() / context.scale; + std::string error; + if (false == patch_model(text, placement, error)) + { + state.error = error + " of \"" + Model->name() + "\""; + return false; + } + } + Output.emplace_back(Model, std::move(text)); + relocated.emplace(Model); + return true; + }; + for (auto *node : Groups.loose()) + { + auto const *model{dynamic_cast(node)}; + if (model == nullptr || model->from_template() || false == is_output(resolve(node->layer()))) + { + continue; + } + if (false == relocate(model, resolve(node->layer()), created[resolve(node->layer())])) + { + return fail(state.error); + } + } + for (auto const group : Groups.rewritten()) + { + auto const &nodes{Groups.group(group).nodes}; + if (nodes.empty() || false == is_output(resolve(nodes.front()->layer()))) + { + continue; + } + auto const target{resolve(nodes.front()->layer())}; + auto &output{created[target]}; + // NOTE: lines with no node are written as they are, without a place in the bookkeeping + output.emplace_back(nullptr, "group"); + for (auto const *node : nodes) + { + auto const *model{dynamic_cast(node)}; + if (model == nullptr || model->from_template()) + { + continue; + } + if (false == relocate(model, target, output)) + { + return fail(state.error); + } + } + output.emplace_back(nullptr, "endgroup"); + } auto const push_edit = [&](layer_handle const Layer, source_span const &Span, std::string Text, basic_node const *Node) { file_patch::edit edit; edit.begin = Span.begin; @@ -1448,7 +1535,10 @@ save_result node_layers::save(std::vector const &Rootstatements, st { ensure_newline(added.text, eol); auto const offset{static_cast(added.text.size())}; - added.nodes.push_back({definition.first, {offset, offset + static_cast(definition.second.size())}, true}); + if (definition.first != nullptr) + { + added.nodes.push_back({definition.first, {offset, offset + static_cast(definition.second.size())}, true}); + } added.text += definition.second + eol; } } @@ -1620,6 +1710,7 @@ save_result node_layers::save(std::vector const &Rootstatements, st } // the scenery files now match the scene, update the bookkeeping to reflect it + Groups.saved(); auto removedterrain{false}; for (auto const output : outputs) { @@ -1629,7 +1720,8 @@ save_result node_layers::save(std::vector const &Rootstatements, st auto const isnew{source.layer == null_handle}; source.layer = output; source.span = place.span; - if (isnew) + // a definition written anew elsewhere is in the placement of the place it went to, as a new one is + if (isnew || relocated.count(place.node) != 0) { source.context = layer(output).context_insert(); } diff --git a/scene/scenenodegroups.cpp b/scene/scenenodegroups.cpp index 3ed357f33..781287806 100644 --- a/scene/scenenodegroups.cpp +++ b/scene/scenenodegroups.cpp @@ -22,9 +22,20 @@ node_groups Groups; // requests creation of a new node group. returns: handle to the group scene::group_handle -node_groups::create() { +node_groups::create( bool const Separate ) { - m_activegroup.push( create_handle() ); + if( false == Separate ) { + m_activegroup.push( create_handle() ); + return handle(); + } + // a handle no other group has, see make() + auto group { std::max( 2, static_cast( m_groupmap.size() + 1 ) ) }; + while( m_groupmap.find( group ) != m_groupmap.end() ) { + ++group; + } + // NOTE: registered before the nodes come, so that a group nested in this one doesn't get the same handle + m_groupmap[ group ]; + m_activegroup.push( group ); return handle(); } @@ -334,6 +345,87 @@ node_groups::erase( group_map::const_iterator Group ) { m_groupmap.erase( Group ); } +group_handle +node_groups::make( std::vector const &Nodes ) { + + // a handle no other group has, past the first one, which the editor treats as no group at all + auto handle { std::max( 2, static_cast( m_groupmap.size() + 1 ) ) }; + while( m_groupmap.find( handle ) != m_groupmap.end() ) { + ++handle; + } + for( auto *node : Nodes ) { + leave( node ); + m_loose.erase( node ); + insert( handle, node ); + } + m_rewrite.insert( handle ); + return handle; +} + +void +node_groups::dissolve( scene::group_handle const Group ) { + + auto const lookup { m_groupmap.find( Group ) }; + if( lookup == m_groupmap.end() ) { return; } + for( auto *node : lookup->second.nodes ) { + m_loose.insert( node ); + } + m_rewrite.erase( Group ); + erase( lookup ); +} + +void +node_groups::remove( scene::basic_node *Node ) { + + leave( Node ); + m_loose.erase( Node ); +} + +void +node_groups::leave( scene::basic_node *Node ) { + + auto const group { Node->group() }; + Node->group( null_handle ); + auto const lookup { m_groupmap.find( group ) }; + if( lookup == m_groupmap.end() ) { return; } + auto &nodes { lookup->second.nodes }; + nodes.erase( std::remove( std::begin( nodes ), std::end( nodes ), Node ), std::end( nodes ) ); + if( nodes.empty() && lookup->second.events.empty() ) { + // a group made in the editor goes with its last node + m_rewrite.erase( group ); + m_groupmap.erase( lookup ); + } +} + +bool +node_groups::relocating( scene::basic_node const *Node ) const { + + return ( m_loose.count( Node ) != 0 ) || ( m_rewrite.count( Node->group() ) != 0 ); +} + +std::vector +node_groups::rewritten() const { + + return { std::begin( m_rewrite ), std::end( m_rewrite ) }; +} + +std::vector +node_groups::loose() const { + + std::vector nodes; + for( auto const *node : m_loose ) { + nodes.emplace_back( const_cast( node ) ); + } + return nodes; +} + +void +node_groups::saved() { + + m_rewrite.clear(); + m_loose.clear(); +} + // creates handle for a new group group_handle node_groups::create_handle() { diff --git a/scene/scenenodegroups.h b/scene/scenenodegroups.h index 350fa3d3f..fb7ea95f4 100644 --- a/scene/scenenodegroups.h +++ b/scene/scenenodegroups.h @@ -29,8 +29,9 @@ public: node_groups() = default; // methods // requests creation of a new node group. returns: handle to the group + // nested groups are flattened into the outer one, unless Separate: then the group stands by itself (group ... endgroup) group_handle - create(); + create( bool const Separate = false ); // indicates creation of current group ended. returns: handle to the parent group or null_handle if group stack is empty group_handle close(); @@ -50,6 +51,26 @@ public: scene::basic_group & group( scene::group_handle const Group ) { return m_groupmap[ Group ]; } + // groups made in the scenery editor. the nodes leave the groups they were in. returns: handle to the new group + group_handle + make( std::vector const &Nodes ); + // the nodes of the group are left on their own + void + dissolve( scene::group_handle const Group ); + // the node, about to be deleted, leaves its group + void + remove( scene::basic_node *Node ); + // groups made or dissolved in the editor are written anew when the scenery is saved: the definitions of their nodes are + // taken out of where they are, a group's written as one block between group and endgroup, a dissolved one's nodes each on its own + bool + relocating( scene::basic_node const *Node ) const; + std::vector + rewritten() const; + std::vector + loose() const; + // the scenery files match the groups now + void + saved(); // sends basic content of the class in legacy (text) format to provided stream void export_as_text( std::ostream &Output, bool const Dirty ) const; @@ -66,9 +87,14 @@ private: create_handle(); bool assign_cross_switch(map::track_switch&sw, std::string &sw_name, const std::string &id, size_t idx); + // the node leaves the group it's in + void + leave( scene::basic_node *Node ); // members group_map m_groupmap; // map of established node groups std::stack m_activegroup; // helper, group to be assigned to newly created nodes + std::set m_rewrite; // groups made in the editor, to be written as blocks on save + std::set m_loose; // nodes of groups dissolved in the editor, to be written on their own on save }; extern node_groups Groups; diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index f73f913c6..2c80eada7 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -471,7 +471,8 @@ void state_serializer::init_time() { void state_serializer::deserialize_group( cParser &Input, scene::scratch_data &Scratchpad ) { - scene::Groups.create(); + // a group of the scenery stands by itself, rather than being a part of the file it's in (e.g. made in the editor) + scene::Groups.create( true ); } void From 96c07c63f17f6e5845415b4243f7407b0cfaef85 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Fri, 9 Oct 2026 01:23:42 +0200 Subject: [PATCH 186/430] Change default experimental renderer compilation flag --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 818849fbb..300427ac8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,7 +77,7 @@ option(WITH_ZMQ "Compile with cppzmq" OFF) option(WITH_CRASHPAD "Compile with crashpad" OFF) option(WITH_DISCORD_RPC "Compile with DISCORD RICH PRESENCE" ON) option(USE_LTO "Use link-time optimization" OFF) -option(WITH_BETTER_RENDERER "Experimental multi-backend renderer based on NVRHI" ON) +option(WITH_BETTER_RENDERER "Experimental multi-backend renderer based on NVRHI" OFF) option(GENERATE_PDB "Generate executable with program debugging symbols" ON) option(ENABLE_MCC "Enable multicore compilation" ON) option(WITHDUMPGEN "Enable generating DMP files on crash" ON) From f2e73812d905926fed7c06ed28adfbab6c28e94d Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Fri, 9 Oct 2026 11:46:42 +0200 Subject: [PATCH 187/430] feat(editor): View menu with the top view, the lanes of the roads, the structure gauge and a window of the weather and time (time of day, day of the year, visibility, clouds, air temperature, seen in the editor only); the orthophoto settings in a window of their own again; the tracks and roads menus left out, their tools being in the row of the field of work; End drops the models onto the same ground the insert puts them on, the terrain tile models and the terrain patches of the editor included; the loading screen kept in the main window; Polish translation --- application/editormode.cpp | 215 ++++++++++++++------------ application/editormode.h | 10 +- application/editormoderoad.cpp | 18 --- application/editormodetrack.cpp | 29 ---- application/editoruilayer.cpp | 2 +- application/scenarioloaderuilayer.cpp | 2 + lang/editor_pl.po | 35 +++++ 7 files changed, 159 insertions(+), 152 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 0bec52a78..5f99a52ab 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -516,8 +516,7 @@ editor_mode::editor_mode() { ui()->set_edit_menu([this]() { render_edit_menu(); }); ui()->set_menu_options([this]() { render_object_menu(); - render_track_menu(); - render_road_menu(); + render_view_menu(); render_map_menu(); render_help_menu(); }); @@ -684,91 +683,16 @@ void editor_mode::snap_to_ground(scene::basic_node *node, bool const Alone, bool if (!simulation::Region->point_inside(origin)) return; - // small tolerance so a node already resting on a surface still snaps cleanly to it - double const epsilon = 0.05; - double bestY = -std::numeric_limits::max(); - bool found = false; - - // record the highest surface that is at or below the node's current position at its (x,z) - auto consider_triangle = [&](glm::dvec3 const &a, glm::dvec3 const &b, glm::dvec3 const &c) { - double y; - if (triangle_height_at(a, b, c, origin.x, origin.z, y) && y <= origin.y + epsilon && y > bestY) - { - bestY = y; - found = true; - } - }; - - auto consider_shapes = [&](std::vector const &shapes) { - for (auto const &shape : shapes) - { - // quick reject: skip shapes whose bounding circle doesn't cover our (x,z) column - auto const &sdata = shape.data(); - double const sdx = origin.x - sdata.area.center.x; - double const sdz = origin.z - sdata.area.center.z; - if (sdx * sdx + sdz * sdz > static_cast(sdata.area.radius) * sdata.area.radius) - continue; - - auto const &verts = sdata.vertices; - for (std::size_t i = 0; i + 2 < verts.size(); i += 3) - consider_triangle(verts[i].position, verts[i + 1].position, verts[i + 2].position); - } - }; - - scene::basic_section &sec = simulation::Region->section(origin); - // section level holds the large opaque geometry, including legacy terrain - consider_shapes(sec.m_shapes); - - // scan a 3x3 neighbourhood of cells for smaller geometry and other model instances below us - for (int dz = -1; dz <= 1; ++dz) - for (int dx = -1; dx <= 1; ++dx) - { - scene::basic_cell &cell = sec.cell(origin, glm::ivec2(dx, dz)); - consider_shapes(cell.m_shapesopaque); - consider_shapes(cell.m_shapestranslucent); - - // other instances are approximated by their bounding sphere, so a node can rest on top of them - for (auto *inst : cell.m_instancesopaque) - { - if (!inst || inst == node) - continue; - glm::dvec3 const ic = inst->location(); - double const r = static_cast(inst->radius()); - double const idx = origin.x - ic.x, idz = origin.z - ic.z; - double const horiz2 = idx * idx + idz * idz; - if (horiz2 < r * r) - { - double const ytop = ic.y + std::sqrt(r * r - horiz2); - if (ytop <= origin.y + epsilon && ytop > bestY) - { - bestY = ytop; - found = true; - } - } - } - } - - // editable terrain patches keep their heightmap on the CPU, so query them directly - for (editor_terrain *terrain : active_terrains()) - { - if (!terrain->contains(origin.x, origin.z)) - continue; - double const y = terrain->height_at(origin.x, origin.z); - if (y <= origin.y + epsilon && y > bestY) - { - bestY = y; - found = true; - } - } - - if (!found) + // the same ground the models are put on when they're inserted: the terrain shapes, the terrain tile models and the terrain + // patches of the editor, under the node, or over it when it went under the ground. the shapes alone and the spheres of the + // models around, which were asked about before, missed the ground of the sceneries made of terrain tile models + glm::dvec3 const target = placement_on_ground(origin); + if (std::abs(target.y - origin.y) < 1e-4) return; push_snapshot(node, EditorSnapshot::Action::Move); if (false == m_history.empty()) m_history.back().joined = Joined; - glm::dvec3 target = origin; - target.y = bestY; if (auto *model = dynamic_cast(node); Alone && model != nullptr && node->group() > 1) { // the model of a group goes down by itself, the rest of the group stays @@ -1491,6 +1415,8 @@ bool editor_mode::update() render_new_scenery_popup(); render_open_scenery_popup(); render_shortcuts_window(); + render_orthophoto_window(); + render_environment_window(); draw_selection_overlay(); render_context_menu(); @@ -2896,17 +2822,107 @@ void editor_mode::render_map_menu() m_orthophoto.enabled(false == enabled); if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", STR_C("Aerial imagery of geoportal.gov.pl under the scenery, laid out by the origin of the scenery")); - // the settings are a part of the terrain tools - if (ImGui::MenuItem(STR_C("Orthophoto settings..."), nullptr, m_terrain_open)) - { - m_track_window_open = false; - m_roadtool.window = false; - terrain_workspace(true); - m_orthophoto_expand = true; - } + ImGui::MenuItem(STR_C("Orthophoto settings..."), nullptr, &m_orthophoto_window); ImGui::EndMenu(); } +void editor_mode::render_orthophoto_window() +{ + if (false == m_orthophoto_window) + return; + ImGui::SetNextWindowSize(ImVec2(430.0f, 0.0f), ImGuiCond_FirstUseEver); + if (ImGui::Begin((std::string(STR_C("Orthophoto")) + "###orthophoto").c_str(), &m_orthophoto_window)) + render_orthophoto_ui(); + ImGui::End(); +} + +void editor_mode::render_view_menu() +{ + if (false == ImGui::BeginMenu(STR_C("View"))) + return; + if (ImGui::MenuItem(STR_C("Top view, orthographic"), "O", Global.EditorOrtho)) + toggle_ortho(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("The view straight down without perspective, as on a map; again for the camera as it was")); + ImGui::MenuItem("Show lanes", nullptr, &m_roadtool.lanes); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", "Draws the lanes of the roads with the ways the vehicles take through the junctions"); + if (ImGui::MenuItem(STR_C("Structure gauge"), nullptr, m_gauge.open)) + m_gauge.open = !m_gauge.open; + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Checks which models enter the structure gauge of the tracks and the clearance over the roads (skrajnia budowli)")); + ImGui::Separator(); + ImGui::MenuItem(STR_C("Weather and time"), nullptr, &m_environment_open); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Time of day, day of the year, visibility, clouds and air temperature, as the scenery is seen in the editor")); + ImGui::EndMenu(); +} + +void editor_mode::render_environment_window() +{ + if (false == m_environment_open) + return; + ImGui::SetNextWindowSize(ImVec2(420.0f * Global.ui_scale, 0.0f), ImGuiCond_FirstUseEver); + if (ImGui::Begin((std::string(STR_C("Weather and time")) + "###environment").c_str(), &m_environment_open, ImGuiWindowFlags_NoCollapse)) + { + // what the setdatetime, setweather and settemperature commands do in the driver mode; the editor doesn't take commands + auto const set_date_time = [](int const Yearday, int const Minute) { + simulation::Time.set_time(Yearday, Minute); + auto const weather{Global.Weather}; + simulation::Environment.compute_season(Yearday); + if (weather != Global.Weather) + { + // HACK: force re-calculation of precipitation, as the command does + Global.Overcast = std::clamp(Global.Overcast - 0.0001f, 0.0f, 2.0f); + } + simulation::Environment.update_moon(); + }; + // the names of the period, season and weather end with a colon, being keys of other lookups + auto const name = [](std::string Text) { + if (false == Text.empty() && Text.back() == ':') + Text.pop_back(); + return Text; + }; + auto const &time{simulation::Time.data()}; + auto minute{time.wHour * 60 + time.wMinute}; + auto const clock{format("%02d:%02d (%s)", time.wHour, time.wMinute, name(Global.Period).c_str())}; + if (ImGui::SliderInt((std::string(STR_C("Time of day")) + "###timeofday").c_str(), &minute, 0, 1439, clock.c_str())) + set_date_time(static_cast(std::round(Global.fMoveLight)), std::clamp(minute, 0, 1439)); + auto yearday{Global.fMoveLight}; + auto const day{format("%.0f (%s)", Global.fMoveLight, name(Global.Season).c_str())}; + if (ImGui::SliderFloat((std::string(STR_C("Day of the year")) + "###dayofyear").c_str(), &yearday, 0.0f, 364.0f, day.c_str())) + set_date_time(static_cast(std::round(std::clamp(yearday, 0.0f, 365.0f))), time.wHour * 60 + time.wMinute); + ImGui::Separator(); + auto visibility{std::log(Global.fFogEnd)}; + auto const fog{format("%.0f m", Global.fFogEnd)}; + if (ImGui::SliderFloat((std::string(STR_C("Visibility")) + "###visibility").c_str(), &visibility, std::log(10.0f), std::log(50000.0f), fog.c_str())) + { + Global.fFogEnd = std::clamp(std::exp(visibility), 10.0f, 50000.0f); + simulation::Environment.compute_weather(); + } + auto overcast{Global.Overcast}; + auto const clouds{format("%.2f (%s)", Global.Overcast, name(Global.Weather).c_str())}; + if (ImGui::SliderFloat((std::string(STR_C("Clouds")) + "###overcast").c_str(), &overcast, 0.0f, 2.0f, clouds.c_str())) + { + Global.Overcast = std::clamp(overcast, 0.0f, 2.0f); + simulation::Environment.compute_weather(); + } + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Up to 1 the sky clouds over, past it rain or snow falls, by the air temperature")); + auto temperature{Global.AirTemperature}; + auto const air{format("%.1f deg C", Global.AirTemperature)}; + if (ImGui::SliderFloat((std::string(STR_C("Air temperature")) + "###airtemperature").c_str(), &temperature, -35.0f, 40.0f, air.c_str())) + { + Global.AirTemperature = std::clamp(temperature, -35.0f, 40.0f); + simulation::Environment.compute_weather(); + } + ImGui::PushStyleColor(ImGuiCol_Text, ImGui::GetStyleColorVec4(ImGuiCol_TextDisabled)); + ImGui::TextWrapped("%s", STR_C("Seen in the editor only; the scenery keeps its own time and weather")); + ImGui::PopStyleColor(); + } + ImGui::End(); +} + void editor_mode::render_new_scenery_popup() { if (m_newscenery_asked) @@ -3062,18 +3078,8 @@ void editor_mode::terrain_workspace(bool const Open) void editor_mode::render_terrain_tool_options() { + // the orthophoto has a window of its own, see render_orthophoto_window() render_terrain_ui(); - bool const expand{m_orthophoto_expand}; - m_orthophoto_expand = false; - if (expand) - ImGui::SetNextItemOpen(true); - if (ImGui::CollapsingHeader(STR_C("Orthophoto"))) - { - // opened from the map menu: brought into sight, the terrain tools above them take the most of the window - if (expand) - ImGui::SetScrollHereY(0.0f); - render_orthophoto_ui(); - } } void editor_mode::render_object_menu() @@ -3864,6 +3870,7 @@ void editor_mode::render_terrain_toolbar() m_orthophoto.enabled(false == orthophoto); if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", STR_C("Aerial imagery of geoportal.gov.pl under the scenery, laid out by the origin of the scenery")); + ImGui::MenuItem(STR_C("Orthophoto settings..."), nullptr, &m_orthophoto_window); } void editor_mode::render_toolbar() @@ -3959,6 +3966,12 @@ void editor_mode::render_edit_menu() start_focus(m_node, 0.6); if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", STR_C("The camera flies to the selected model and looks at it")); + if (ImGui::MenuItem(STR_C("Find a track by its name"), "Ctrl+F")) + { + terrain_workspace(false); + show_track_tab(m_track_window_open ? m_track_tab : track_tab::path); + m_track_search.focus = true; + } if (ImGui::MenuItem(STR_C("Bend along the track"), "B", false, ui()->mode() != nodebank_panel::TRACK)) bend_shortcut(); if (ImGui::IsItemHovered()) diff --git a/application/editormode.h b/application/editormode.h index 45847a918..25ee84510 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -378,7 +378,13 @@ class editor_mode : public application_mode, private editor_track::observer std::vector m_openscenery_list; std::string m_openscenery_choice; void render_open_scenery_popup(); - bool m_orthophoto_expand{false}; // the orthophoto settings of the terrain tools are opened the next time they're drawn + bool m_orthophoto_window{false}; + void render_orthophoto_window(); + // view menu: the top view, the lanes of the roads, the structure gauge, the environment + void render_view_menu(); + // time of day, day of the year, visibility, clouds and air temperature, as the scenery is seen in the editor + void render_environment_window(); + bool m_environment_open{false}; // origin of the scenery in PUWG 1992 the scenery file gives in its //$g line, if it does bool m_georeference_read{false}; bool m_georeference{false}; @@ -894,7 +900,6 @@ class editor_mode : public application_mode, private editor_track::observer // the objects along the track: a tab for each tool int m_lineside_tab{0}; void render_lineside_ui(); - void render_track_menu(); void arm_switch(); bool m_track_window_open{false}; // the inspector is pinned to the right edge of the screen, the profile strip to the bottom one, both resized from the inner edge @@ -1814,7 +1819,6 @@ class editor_mode : public application_mode, private editor_track::observer char banktext[128]{}; char islandtext[128]{"none"}; }; - void render_road_menu(); void render_road_tool_options(); // tools of the roads in the toolbar, and the change of the tool void render_road_toolbar(); diff --git a/application/editormoderoad.cpp b/application/editormoderoad.cpp index 0ff5ef675..8c800d900 100644 --- a/application/editormoderoad.cpp +++ b/application/editormoderoad.cpp @@ -216,24 +216,6 @@ glm::dvec3 path_direction(segment_data const &Path, double const T) } -void editor_mode::render_road_menu() -{ - if (ImGui::BeginMenu("Roads")) - { - if (ImGui::MenuItem("Road editor", "F4", &m_roadtool.window) && m_roadtool.window) - { - m_track_window_open = false; - terrain_workspace(false); - } - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", "The roads as the field of work: their tools in the toolbar, their settings in the tool options"); - ImGui::MenuItem("Show lanes", nullptr, &m_roadtool.lanes); - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", "Draws the lanes of the roads with the ways the vehicles take through the junctions"); - ImGui::EndMenu(); - } -} - void editor_mode::update_road_tool() { auto &tool{m_roadtool}; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 89d3b3e10..0172fbe9a 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -580,35 +580,6 @@ std::array const &editor_mode::track_modes() return modes; } -void editor_mode::render_track_menu() -{ - // the tools of the tracks with their keys, as in the toolbar of the field of work - if (false == ImGui::BeginMenu(STR_C("Tracks"))) - return; - for (auto const &mode : track_modes()) - { - if (ImGui::MenuItem(STR_C(mode.label), mode.key, m_track_window_open && m_track_tab == mode.tab)) - { - terrain_workspace(false); - show_track_tab(mode.tab); - } - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C(mode.tooltip)); - } - ImGui::Separator(); - if (ImGui::MenuItem(STR_C("Find a track by its name"), "Ctrl+F")) - { - terrain_workspace(false); - show_track_tab(m_track_window_open ? m_track_tab : track_tab::path); - m_track_search.focus = true; - } - if (ImGui::MenuItem(STR_C("Structure gauge"), nullptr, m_gauge.open)) - m_gauge.open = !m_gauge.open; - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("Checks which models enter the structure gauge of the tracks and the clearance over the roads (skrajnia budowli)")); - ImGui::EndMenu(); -} - void editor_mode::show_track_tab(track_tab const Tab) { m_track_window_open = true; diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index 79c265df9..b5d7f4621 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -96,7 +96,7 @@ void editor_ui::build_default_layout(unsigned int const Dockspace) ImGui::DockBuilderDockWindow("###tooloptions", lefttop); for (auto const *window : {"###scenetree", "###Layers", "###scenehierarchy"}) ImGui::DockBuilderDockWindow(window, leftbottom); - for (auto const *window : {"###inspector", "###editorsettings", "###Include database"}) + for (auto const *window : {"###inspector", "###editorsettings", "###Include database", "###orthophoto", "###environment"}) ImGui::DockBuilderDockWindow(window, right); for (auto const *window : {"###Node bank", "###profilestrip", "###trackanalysis", "###structuregauge", "###editorhistory", "###modelsets"}) ImGui::DockBuilderDockWindow(window, bottom); diff --git a/application/scenarioloaderuilayer.cpp b/application/scenarioloaderuilayer.cpp index de0d4e643..207a1756e 100644 --- a/application/scenarioloaderuilayer.cpp +++ b/application/scenarioloaderuilayer.cpp @@ -193,6 +193,8 @@ void scenarioloader_ui::render_() ImVec2 screen_size(Global.window_size.x, Global.window_size.y); ImGui::SetNextWindowPos(ImVec2(-padding, -padding)); ImGui::SetNextWindowSize(ImVec2(Global.window_size.x + padding * 2, Global.window_size.y + padding * 2)); + // it reaches past the edges of the main window, which would make it a window of its own with the panels able to leave the main one + ImGui::SetNextWindowViewport(ImGui::GetMainViewport()->ID); ImGui::Begin("Neo Loading Screen", nullptr, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoBackground); ImDrawList* draw_list = ImGui::GetWindowDrawList(); ImGui::PushFont(font_loading); diff --git a/lang/editor_pl.po b/lang/editor_pl.po index bec33efc4..e8b593bef 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -4989,3 +4989,38 @@ msgstr "Co można z nim zrobić" msgid "What the handles of the gizmo on the selection do when dragged; Ctrl held snaps the values" msgstr "Co robią uchwyty gizma na zaznaczeniu przy przeciąganiu; z Ctrl wartości są przyciągane" + +# scenery editor: view menu, weather and time + +msgid "View" +msgstr "Widok" + +msgid "Weather and time" +msgstr "Pogoda i czas" + +msgid "Time of day, day of the year, visibility, clouds and air temperature, as the scenery is seen in the editor" +msgstr "Godzina, dzień roku, widoczność, zachmurzenie i temperatura powietrza, z jakimi sceneria jest widoczna w edytorze" + +msgid "Time of day" +msgstr "Godzina" + +msgid "Day of the year" +msgstr "Dzień roku" + +msgid "Visibility" +msgstr "Widoczność" + +msgid "Clouds" +msgstr "Zachmurzenie" + +msgid "Up to 1 the sky clouds over, past it rain or snow falls, by the air temperature" +msgstr "Do 1 niebo się chmurzy, powyżej pada deszcz albo śnieg, zależnie od temperatury powietrza" + +msgid "Air temperature" +msgstr "Temperatura powietrza" + +msgid "Seen in the editor only; the scenery keeps its own time and weather" +msgstr "Widoczne tylko w edytorze; sceneria zachowuje własny czas i pogodę" + +msgid "Top view, orthographic (O)" +msgstr "Widok z góry, ortogonalny (O)" From 645a54a7399538d8db90e46906d31cc60f5a7d6c Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Fri, 9 Oct 2026 11:54:47 +0200 Subject: [PATCH 188/430] feat(editor): icons over the 3d view: the tools of the field of work along its left edge (the edit modes of the surroundings, the track tools, the road tools with the lanes, the terrain tools with the orthophoto), the modes of the gizmo at its top, the axes of the world as the camera sees them in its top right corner, a click on one looking along it, with the top view under them; the icons drawn by editor/icons/editor_icons.py into a png which CMake writes out as an array built into the executable; the gizmo modes and the top view left out of the toolbar; Polish translation --- CMakeLists.txt | 10 + application/editormode.cpp | 26 +- application/editormode.h | 8 + application/editormodeviewport.cpp | 398 +++++++++++++++++++++++++++++ editor/editorIcons.cpp | 176 +++++++++++++ editor/editorIcons.hpp | 61 +++++ editor/icons/editor_icons.png | Bin 0 -> 44886 bytes editor/icons/editor_icons.py | 364 ++++++++++++++++++++++++++ lang/editor_pl.po | 29 +++ 9 files changed, 1049 insertions(+), 23 deletions(-) create mode 100644 application/editormodeviewport.cpp create mode 100644 editor/editorIcons.cpp create mode 100644 editor/editorIcons.hpp create mode 100644 editor/icons/editor_icons.png create mode 100644 editor/icons/editor_icons.py diff --git a/CMakeLists.txt b/CMakeLists.txt index 300427ac8..332dd8328 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -185,6 +185,7 @@ set(SOURCES "editor/editorTerrainStreamer.cpp" "editor/editorOrthophoto.cpp" "editor/editorPreviews.cpp" +"editor/editorIcons.cpp" "application/editormode.cpp" "application/editormodetrack.cpp" "application/editormodetrackux.cpp" @@ -198,6 +199,7 @@ set(SOURCES "application/editormodelineside.cpp" "application/editormodevehicle.cpp" "application/editormodeselection.cpp" +"application/editormodeviewport.cpp" "application/editormodesignal.cpp" "application/editormodesweep.cpp" "application/editormodeturntable.cpp" @@ -381,6 +383,14 @@ endif() configure_file("${CMAKE_SOURCE_DIR}/version_info.h.in" "${CMAKE_BINARY_DIR}/geninc/version_info.h") +# the icons of the editor are built into the executable: the png is written out as the bytes of an array, see editor/editorIcons.cpp +set(EDITOR_ICONS "${CMAKE_SOURCE_DIR}/editor/icons/editor_icons.png") +set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${EDITOR_ICONS}") +file(READ "${EDITOR_ICONS}" EDITOR_ICONS_HEX HEX) +string(REGEX REPLACE "(................................)" "\\1\n" EDITOR_ICONS_HEX "${EDITOR_ICONS_HEX}") +string(REGEX REPLACE "([0-9a-f][0-9a-f])" "0x\\1," EDITOR_ICONS_HEX "${EDITOR_ICONS_HEX}") +file(CONFIGURE OUTPUT "${CMAKE_BINARY_DIR}/geninc/editor_icons_png.inc" CONTENT "${EDITOR_ICONS_HEX}\n") + set (PREFIX "") set (SUFFIX "") diff --git a/application/editormode.cpp b/application/editormode.cpp index 5f99a52ab..0d2b6acc6 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -1344,6 +1344,8 @@ bool editor_mode::update() // --- ImGuizmo: in-viewport transform gizmo for the selected node --- render_gizmo(); + // the tools, the gizmo modes and the axes over the 3d view + render_viewport_overlays(); render_track_inspector(); if (selected_track()) @@ -3897,29 +3899,7 @@ void editor_mode::render_toolbar() case work_area::roads: render_road_toolbar(); break; case work_area::terrain: render_terrain_toolbar(); break; } - ImGui::Separator(); - // the gizmo moves the models and the tracks; on the terrain the mouse is the brush's - if (m_gizmo_enabled && area != work_area::terrain) - { - std::pair const operations[] = { - {STR_C("Translate (Q)"), gizmo_operation::translate}, {STR_C("Rotate (W)"), gizmo_operation::rotate}, {STR_C("Scale (E)"), gizmo_operation::scale}}; - for (auto const &operation : operations) - { - if (ImGui::MenuItem(operation.first, nullptr, m_gizmo_op == operation.second)) - m_gizmo_op = operation.second; - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("What the handles of the gizmo on the selection do when dragged; Ctrl held snaps the values")); - } - if (m_gizmo_op != gizmo_operation::scale && ImGui::MenuItem(STR_C("Local space (R)"), nullptr, m_gizmo_local)) - m_gizmo_local = !m_gizmo_local; - if (m_gizmo_op != gizmo_operation::scale && ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("The handles along the axes of the selected model instead of the axes of the world")); - ImGui::Separator(); - } - if (ImGui::MenuItem(STR_C("Top view, orthographic (O)"), nullptr, Global.EditorOrtho)) - toggle_ortho(); - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("The view straight down without perspective, as on a map; again for the camera as it was")); + // the modes of the gizmo and the top view are over the 3d view, see render_viewport_overlays() } void editor_mode::render_edit_menu() diff --git a/application/editormode.h b/application/editormode.h index 25ee84510..edc45daa4 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -385,6 +385,14 @@ class editor_mode : public application_mode, private editor_track::observer // time of day, day of the year, visibility, clouds and air temperature, as the scenery is seen in the editor void render_environment_window(); bool m_environment_open{false}; + // over the 3d view: the tools of the field of work along its left edge, the modes of the gizmo at its top, the axes of the + // world and the top view in its top right corner + void render_viewport_overlays(); + void render_viewport_tools(); + void render_viewport_gizmo(); + void render_view_axes(); + // the camera looking along an axis of the world (0: x, 1: y, 2: z) from its positive or negative side + void look_along_axis(int const Axis, bool const Positive); // origin of the scenery in PUWG 1992 the scenery file gives in its //$g line, if it does bool m_georeference_read{false}; bool m_georeference{false}; diff --git a/application/editormodeviewport.cpp b/application/editormodeviewport.cpp new file mode 100644 index 000000000..174346520 --- /dev/null +++ b/application/editormodeviewport.cpp @@ -0,0 +1,398 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +// over the 3d view: the tools of the field of work along its left edge, the modes of the gizmo at its top, the axes of the +// world and the top view in its top right corner + +#include "stdafx.h" +#include "application/editormode.h" +#include "application/editoruilayer.h" +#include "editor/editorIcons.hpp" +#include "rendering/renderer.h" +#include "utilities/Globals.h" +#include "utilities/translation.h" +#include "imgui/imgui.h" + +#include +#include +#include +#include +#include + +namespace +{ + +using editor_icons::icon; + +struct tool_button +{ + icon picture; + char const *label; + char const *key; // nullptr if there's none + char const *tooltip; // nullptr if the label says enough + bool chosen; + std::function action; + bool group{false}; // a gap before it, it starts another group + bool enabled{true}; +}; + +float scale() +{ + return std::max(1.0f, Global.ui_scale); +} + +// side of a button, the icon with some room around it +float button_side() +{ + return editor_icons::size() + 10.0f * scale(); +} + +// a window of no looks of its own, for the buttons over the 3d view; it takes the mouse only where it lies +bool begin_overlay(char const *Name, ImVec2 const &Position, ImVec2 const &Size) +{ + ImGui::SetNextWindowViewport(ImGui::GetMainViewport()->ID); + ImGui::SetNextWindowPos(Position); + ImGui::SetNextWindowSize(Size); + ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f)); + ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f); + ImGui::PushStyleVar(ImGuiStyleVar_WindowMinSize, ImVec2(1.0f, 1.0f)); + auto const flags{ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoDocking | ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoNav | + ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoScrollWithMouse}; + auto const open{ImGui::Begin(Name, nullptr, flags)}; + ImGui::PopStyleVar(3); + return open; +} + +// the button with the icon at the place; the label stands in for the icon if the renderer can't show images +void icon_button(tool_button const &Button, ImVec2 const &Position, int const Id) +{ + auto const side{button_side()}; + ImGui::SetCursorScreenPos(Position); + ImGui::PushID(Id); + auto const clicked{ImGui::InvisibleButton("##tool", ImVec2(side, side))}; + ImGui::PopID(); + auto const hovered{ImGui::IsItemHovered()}; + auto *list{ImGui::GetWindowDrawList()}; + ImVec2 const end{Position.x + side, Position.y + side}; + auto const rounding{4.0f * scale()}; + auto const background{Button.chosen ? ImGui::GetColorU32(ImGuiCol_ButtonActive) : + hovered && Button.enabled ? ImGui::GetColorU32(ImGuiCol_ButtonHovered) : + IM_COL32(24, 26, 30, 200)}; + list->AddRectFilled(Position, end, background, rounding); + if (Button.chosen) + list->AddRect(Position, end, ImGui::GetColorU32(ImGuiCol_CheckMark), rounding, 0, 1.5f * scale()); + auto const color{Button.enabled ? (Button.chosen || hovered ? IM_COL32(255, 255, 255, 255) : IM_COL32(215, 220, 225, 235)) : IM_COL32(150, 150, 150, 110)}; + ImVec2 const center{Position.x + side * 0.5f, Position.y + side * 0.5f}; + if (false == editor_icons::draw(list, Button.picture, center, color)) + { + char const text[]{Button.label[0], (Button.label[0] != '\0' ? Button.label[1] : '\0'), '\0'}; + auto const size{ImGui::CalcTextSize(text)}; + list->AddText(ImVec2(center.x - size.x * 0.5f, center.y - size.y * 0.5f), color, text); + } + if (hovered) + { + std::string tip{Button.label}; + if (Button.key != nullptr) + tip += std::string{" ["} + Button.key + "]"; + if (Button.tooltip != nullptr) + tip += std::string{"\n"} + Button.tooltip; + ImGui::SetTooltip("%s", tip.c_str()); + } + if (clicked && Button.enabled && Button.action) + Button.action(); +} + +} // namespace + +void editor_mode::render_viewport_overlays() +{ + auto const width{editor_ui::view_max().x - editor_ui::view_min().x}; + auto const height{editor_ui::view_max().y - editor_ui::view_min().y}; + // a view squeezed between the docks has no room for them + if (width < 8.0f * button_side() || height < 6.0f * button_side()) + return; + render_viewport_tools(); + render_viewport_gizmo(); + render_view_axes(); +} + +void editor_mode::render_viewport_tools() +{ + // the tools of the field of work, as in the toolbar + std::vector buttons; + buttons.reserve(16); + auto const area{current_work_area()}; + switch (area) + { + case work_area::surroundings: + { + struct mode + { + icon picture; + char const *label; + char const *key; + nodebank_panel::edit_mode which; + }; + mode const modes[] = {{icon::select, STR_C("Select"), "1", nodebank_panel::MODIFY}, + {icon::insert, STR_C("Insert"), "2", nodebank_panel::ADD}, + {icon::brush, STR_C("Brush"), "3", nodebank_panel::BRUSH}, + {icon::area_fill, STR_C("Area fill"), "4", nodebank_panel::FILL}, + {icon::copy_to_bank, STR_C("Copy to bank"), "5", nodebank_panel::COPY}}; + for (auto const &entry : modes) + buttons.push_back({entry.picture, entry.label, entry.key, nullptr, ui()->mode() == entry.which, [this, which = entry.which]() { choose_edit_mode(which); }}); + break; + } + case work_area::tracks: + { + auto const vehicle{m_track_tab == track_tab::lineside && m_vehicle.open}; + auto const add = [&](track_tab const Tab, icon const Picture, bool const Group) { + auto const &modes{track_modes()}; + auto const found{std::find_if(modes.begin(), modes.end(), [&](track_mode const &Mode) { return Mode.tab == Tab; })}; + if (found == modes.end()) + return; + // a tool chosen again gives way to the select one, as in the toolbar + auto const chosen{m_track_tab == Tab && false == (Tab == track_tab::lineside && vehicle)}; + buttons.push_back({Picture, STR_C(found->label), found->key, STR_C(found->tooltip), chosen, [this, Tab, chosen]() { show_track_tab(chosen ? track_tab::path : Tab); }, Group}); + }; + add(track_tab::path, icon::select, false); + add(track_tab::lay, icon::lay_track, false); + add(track_tab::turnout, icon::turnout, false); + add(track_tab::straights, icon::straight, false); + add(track_tab::route, icon::curve, false); + add(track_tab::turntable, icon::turntable, false); + add(track_tab::signals, icon::signal, true); + add(track_tab::lineside, icon::objects, false); + buttons.push_back({icon::vehicle, STR_C("Vehicle"), nullptr, STR_C("A vehicle to drive, put on the selected track; it isn't written to the scenery files"), vehicle, [this, vehicle]() { + show_track_tab(vehicle ? track_tab::path : track_tab::lineside); + m_vehicle.expand = false == vehicle; + }}); + add(track_tab::profile, icon::profile, true); + add(track_tab::speed, icon::speed, false); + add(track_tab::joints, icon::joints, false); + add(track_tab::infra, icon::infra, false); + buttons.push_back({icon::gauge, STR_C("Structure gauge"), nullptr, STR_C("Checks which models enter the structure gauge of the tracks and the clearance over the roads (skrajnia budowli)"), m_gauge.open, + [this]() { m_gauge.open = !m_gauge.open; }}); + break; + } + case work_area::roads: + { + auto &tool{m_roadtool}; + buttons.push_back({icon::select, STR_C("Select"), nullptr, STR_C("LMB: a road piece, a junction, a point where pieces meet, a level crossing or a traffic point"), tool.tool == 0, [this]() { road_choose_tool(0); }}); + buttons.push_back({icon::road, STR_C("Build"), nullptr, STR_C("LMB: start a road, then each next point; on a loose end, the side of a road or a junction it's joined to them"), tool.tool == 1, [this]() { road_choose_tool(1); }}); + buttons.push_back({icon::place, STR_C("Place"), nullptr, STR_C("Level crossings, and the points where vehicles appear on the roads or are taken off them"), tool.tool == 2, [this]() { road_choose_tool(2); }}); + buttons.push_back({icon::lanes, STR_C("Show lanes"), nullptr, STR_C("The lanes of the roads drawn as the paths the vehicles take"), tool.lanes, [&tool]() { tool.lanes = !tool.lanes; }, true}); + break; + } + case work_area::terrain: + { + // what the left button does on the terrain, as in the toolbar + auto const choose = [this](bool const Sculpt, bool const Smooth, bool const Chunks) { + return [this, Sculpt, Smooth, Chunks]() { + m_terrain_sculpt = Sculpt; + m_terrain_brush_smooth = Smooth; + m_chunk_edit = Chunks; + }; + }; + buttons.push_back({icon::select, STR_C("Select"), nullptr, STR_C("LMB picks the models, as in the surroundings"), false == m_terrain_sculpt && false == m_chunk_edit, choose(false, m_terrain_brush_smooth, false)}); + buttons.push_back({icon::sculpt, STR_C("Sculpt"), nullptr, STR_C("LMB raises the terrain under the brush, Shift+LMB lowers it"), m_terrain_sculpt && false == m_terrain_brush_smooth, choose(true, false, false)}); + buttons.push_back({icon::smooth, STR_C("Smooth"), nullptr, STR_C("LMB evens the terrain out under the brush"), m_terrain_sculpt && m_terrain_brush_smooth, choose(true, true, false)}); + buttons.push_back({icon::chunks, STR_C("Chunks"), nullptr, STR_C("LMB adds a chunk next to the clicked one, Shift+LMB deletes it"), m_chunk_edit, choose(false, m_terrain_brush_smooth, true)}); + auto const orthophoto{m_orthophoto.enabled()}; + buttons.push_back({icon::orthophoto, STR_C("Orthophoto"), nullptr, STR_C("Aerial imagery of geoportal.gov.pl under the scenery, laid out by the origin of the scenery"), orthophoto, + [this, orthophoto]() { m_orthophoto.enabled(false == orthophoto); }, true}); + break; + } + } + if (buttons.empty()) + return; + + // down the left edge, in more columns if the view is too low for them; the bottom is left to the hints of the tools + auto const side{button_side()}; + auto const gap{2.0f * scale()}; + auto const groupgap{8.0f * scale()}; + auto const margin{8.0f * scale()}; + ImVec2 const origin{editor_ui::view_min().x + margin, editor_ui::view_min().y + margin}; + auto const bottom{std::max(origin.y + 4.0f * side, editor_ui::view_max().y - 130.0f * scale())}; + std::vector places; + places.reserve(buttons.size()); + ImVec2 place{origin}; + for (auto const &button : buttons) + { + if (button.group && place.y > origin.y) + place.y += groupgap - gap; + if (place.y > origin.y && place.y + side > bottom) + place = ImVec2(place.x + side + gap, origin.y); + places.push_back(place); + place.y += side + gap; + } + ImVec2 extent{0.0f, 0.0f}; + for (auto const &at : places) + extent = ImVec2(std::max(extent.x, at.x + side - origin.x), std::max(extent.y, at.y + side - origin.y)); + auto const pad{3.0f * scale()}; + if (begin_overlay("##viewporttools", ImVec2(origin.x - pad, origin.y - pad), ImVec2(extent.x + 2.0f * pad, extent.y + 2.0f * pad))) + { + ImGui::GetWindowDrawList()->AddRectFilled(ImVec2(origin.x - pad, origin.y - pad), ImVec2(origin.x + extent.x + pad, origin.y + extent.y + pad), IM_COL32(16, 18, 21, 140), 6.0f * scale()); + for (std::size_t index = 0; index < buttons.size(); ++index) + icon_button(buttons[index], places[index], static_cast(index)); + } + ImGui::End(); +} + +void editor_mode::render_viewport_gizmo() +{ + // the gizmo moves the models and the tracks; on the terrain the mouse is the brush's + if (false == m_gizmo_enabled || current_work_area() == work_area::terrain) + return; + auto const tooltip{STR_C("What the handles of the gizmo on the selection do when dragged; Ctrl held snaps the values")}; + std::array const buttons{{ + {icon::translate, STR_C("Translate"), "Q", tooltip, m_gizmo_op == gizmo_operation::translate, [this]() { m_gizmo_op = gizmo_operation::translate; }}, + {icon::rotate, STR_C("Rotate"), "W", tooltip, m_gizmo_op == gizmo_operation::rotate, [this]() { m_gizmo_op = gizmo_operation::rotate; }}, + {icon::scale, STR_C("Scale"), "E", tooltip, m_gizmo_op == gizmo_operation::scale, [this]() { m_gizmo_op = gizmo_operation::scale; }}, + // the gizmo always scales along the axes of the model + {icon::local_space, STR_C("Local space"), "R", STR_C("The handles along the axes of the selected model instead of the axes of the world"), m_gizmo_local || m_gizmo_op == gizmo_operation::scale, + [this]() { m_gizmo_local = !m_gizmo_local; }, true, m_gizmo_op != gizmo_operation::scale}, + }}; + // in a row at the top, in the middle + auto const side{button_side()}; + auto const gap{2.0f * scale()}; + auto const groupgap{8.0f * scale()}; + auto const margin{8.0f * scale()}; + auto const pad{3.0f * scale()}; + auto const width{4.0f * side + 2.0f * gap + groupgap}; + ImVec2 const origin{std::round((editor_ui::view_min().x + editor_ui::view_max().x - width) * 0.5f), editor_ui::view_min().y + margin}; + if (begin_overlay("##viewportgizmo", ImVec2(origin.x - pad, origin.y - pad), ImVec2(width + 2.0f * pad, side + 2.0f * pad))) + { + ImGui::GetWindowDrawList()->AddRectFilled(ImVec2(origin.x - pad, origin.y - pad), ImVec2(origin.x + width + pad, origin.y + side + pad), IM_COL32(16, 18, 21, 140), 6.0f * scale()); + auto x{origin.x}; + for (std::size_t index = 0; index < buttons.size(); ++index) + { + if (buttons[index].group) + x += groupgap - gap; + icon_button(buttons[index], ImVec2(x, origin.y), static_cast(index)); + x += side + gap; + } + } + ImGui::End(); +} + +void editor_mode::render_view_axes() +{ + // the axes of the world as the camera sees them, as in blender: a click on one looks along it + auto const s{scale()}; + auto const radius{40.0f * s}; + auto const margin{8.0f * s}; + auto const side{button_side()}; + auto const size{2.0f * radius}; + ImVec2 const origin{editor_ui::view_max().x - margin - size, editor_ui::view_min().y + margin}; + if (begin_overlay("##viewaxes", origin, ImVec2(size, size + 6.0f * s + side))) + { + auto *list{ImGui::GetWindowDrawList()}; + ImVec2 const center{origin.x + radius, origin.y + radius}; + ImGui::SetCursorScreenPos(origin); + ImGui::InvisibleButton("##axes", ImVec2(size, size)); + auto const hovered{ImGui::IsItemHovered()}; + auto const clicked{ImGui::IsItemClicked(ImGuiMouseButton_Left)}; + if (hovered) + list->AddCircleFilled(center, radius, IM_COL32(255, 255, 255, 28), 48); + // the view matrix is of the camera turned only, the axes go through it as they are + glm::mat3 const view{GfxRenderer->Camera_View_Matrix()}; + struct end + { + int axis; + bool positive; + glm::vec3 seen; + }; + std::array ends; + for (int axis = 0; axis < 3; ++axis) + { + glm::vec3 direction{0.0f}; + direction[axis] = 1.0f; + auto const seen{view * direction}; + ends[axis * 2] = {axis, true, seen}; + ends[axis * 2 + 1] = {axis, false, -seen}; + } + // the farther ones first, the nearer ones over them + std::sort(ends.begin(), ends.end(), [](end const &Left, end const &Right) { return Left.seen.z < Right.seen.z; }); + ImU32 const colors[]{IM_COL32(230, 70, 80, 255), IM_COL32(130, 200, 40, 255), IM_COL32(60, 135, 235, 255)}; + char const *const names[]{"X", "Y", "Z"}; + auto const reach{radius - 10.0f * s}; + auto const mouse{ImGui::GetIO().MousePos}; + end const *pointed{nullptr}; + auto const place = [&](end const &End) { return ImVec2(center.x + End.seen.x * reach, center.y - End.seen.y * reach); }; + for (auto const &entry : ends) + { + auto const at{place(entry)}; + auto const dot{(entry.positive ? 8.0f : 6.0f) * s}; + if (hovered && (mouse.x - at.x) * (mouse.x - at.x) + (mouse.y - at.y) * (mouse.y - at.y) <= (dot + 2.0f * s) * (dot + 2.0f * s)) + pointed = &entry; // the nearest one under the mouse, as it's drawn over the others + } + for (auto const &entry : ends) + { + auto const at{place(entry)}; + auto const color{colors[entry.axis]}; + if (entry.positive) + { + list->AddLine(center, at, color, 2.0f * s); + list->AddCircleFilled(at, 8.0f * s, color, 24); + auto const text{ImGui::CalcTextSize(names[entry.axis])}; + list->AddText(ImVec2(at.x - text.x * 0.5f, at.y - text.y * 0.5f), IM_COL32(20, 20, 20, 255), names[entry.axis]); + } + else + { + list->AddCircleFilled(at, 6.0f * s, (color & ~IM_COL32_A_MASK) | IM_COL32(0, 0, 0, 90), 24); + list->AddCircle(at, 6.0f * s, color, 24, 1.5f * s); + } + if (&entry == pointed) + list->AddCircle(at, (entry.positive ? 9.5f : 7.5f) * s, IM_COL32(255, 255, 255, 255), 24, 1.5f * s); + } + if (pointed != nullptr) + { + ImGui::SetTooltip(STR_C("Look along %s%s; from over the scenery it's the top view"), pointed->positive ? "-" : "+", names[pointed->axis]); + if (clicked) + look_along_axis(pointed->axis, pointed->positive); + } + // the top view, under the axes + tool_button const ortho{Global.EditorOrtho ? icon::ortho : icon::perspective, + STR_C("Top view, orthographic"), + "O", + STR_C("The view straight down without perspective, as on a map; again for the camera as it was"), + Global.EditorOrtho, + [this]() { toggle_ortho(); }}; + icon_button(ortho, ImVec2(std::round(center.x - side * 0.5f), origin.y + size + 6.0f * s), 0); + } + ImGui::End(); +} + +void editor_mode::look_along_axis(int const Axis, bool const Positive) +{ + m_focus_active = false; + if (Axis == 1) + { + if (Positive) + { + // from over the scenery: the top view + if (false == Global.EditorOrtho) + toggle_ortho(); + return; + } + if (Global.EditorOrtho) + toggle_ortho(); + Camera.Angle.x = M_PI_2; + Camera.Angle.z = 0.0; + return; + } + if (Global.EditorOrtho) + toggle_ortho(); + // from the side of the axis the camera's on, towards the other one; the yaw as the camera works it out of where it looks + glm::dvec3 where{0.0}; + where[Axis] = Positive ? -1.0 : 1.0; + Camera.Angle.y = std::atan2(-where.x, -where.z); + Camera.Angle.x = 0.0; + Camera.Angle.z = 0.0; +} diff --git a/editor/editorIcons.cpp b/editor/editorIcons.cpp new file mode 100644 index 000000000..6056763fd --- /dev/null +++ b/editor/editorIcons.cpp @@ -0,0 +1,176 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "editor/editorIcons.hpp" + +#include "rendering/renderer.h" +#include "utilities/Globals.h" +#include "stb/stb_image.h" + +#include +#include +#include +#include +#include + +namespace editor_icons +{ + +namespace +{ + +// editor_icons.png, written out by CMake +unsigned char const png[] = { +#include "editor_icons_png.inc" +}; + +int const cell{64}; // pixels of an icon in the png +int const columns{8}; +int const rows{(static_cast(icon::count) + columns - 1) / columns}; + +// the coverage of the icons, a byte a pixel, as they're in the png. empty if it couldn't be read +std::vector const &coverage() +{ + static std::vector const pixels = []() { + std::vector result; + // read in a thread of its own: the texture loader turns the images upside down for the threads which don't say otherwise, + // and what a thread says stays with it + std::thread reader([&result]() { + stbi_set_flip_vertically_on_load_thread(0); + int width{0}, height{0}, components{0}; + auto *rgba{stbi_load_from_memory(png, static_cast(sizeof(png)), &width, &height, &components, 4)}; + if (rgba == nullptr) + return; + if (width == columns * cell && height >= rows * cell) + { + result.resize(static_cast(width) * height); + for (std::size_t index = 0; index < result.size(); ++index) + result[index] = rgba[index * 4 + 3]; + } + stbi_image_free(rgba); + }); + reader.join(); + return result; + }(); + return pixels; +} + +// the icons scaled down to the size they're drawn at, each with a pixel of empty space around it, so that the filtering +// doesn't pick up a neighbour +struct atlas +{ + std::uint64_t texture{0}; + int size{0}; // pixels of an icon + bool failed{false}; +}; +atlas g_atlas; + +int stride(int const Size) +{ + return Size + 2; +} + +// part of the source pixel Pixel the target pixel Target of the size Scale covers +float overlap(int const Target, float const Scale, int const Pixel) +{ + auto const start{std::max(Target * Scale, static_cast(Pixel))}; + auto const end{std::min((Target + 1) * Scale, static_cast(Pixel + 1))}; + return std::max(0.0f, end - start); +} + +std::vector scaled(int const Size) +{ + auto const &source{coverage()}; + auto const width{columns * stride(Size)}; + auto const height{rows * stride(Size)}; + std::vector rgba(static_cast(width) * height * 4, 255); + for (std::size_t index = 3; index < rgba.size(); index += 4) + rgba[index] = 0; + // each target pixel the average of the source pixels under it, the ones under its edges by the part they're under it + auto const scale{static_cast(cell) / Size}; + std::vector across(static_cast(Size) * cell); + for (int index = 0; index < static_cast(icon::count); ++index) + { + auto const sourcex{(index % columns) * cell}; + auto const sourcey{(index / columns) * cell}; + for (int y = 0; y < cell; ++y) + { + for (int x = 0; x < Size; ++x) + { + float sum{0.0f}; + for (int pixel = static_cast(x * scale); pixel < std::min(cell, static_cast(std::ceil((x + 1) * scale))); ++pixel) + sum += overlap(x, scale, pixel) * source[static_cast(sourcey + y) * columns * cell + sourcex + pixel]; + across[static_cast(y) * Size + x] = sum / scale; + } + } + auto const targetx{(index % columns) * stride(Size) + 1}; + auto const targety{(index / columns) * stride(Size) + 1}; + for (int y = 0; y < Size; ++y) + { + for (int x = 0; x < Size; ++x) + { + float sum{0.0f}; + for (int pixel = static_cast(y * scale); pixel < std::min(cell, static_cast(std::ceil((y + 1) * scale))); ++pixel) + sum += overlap(y, scale, pixel) * across[static_cast(pixel) * Size + x]; + rgba[(static_cast(targety + y) * width + targetx + x) * 4 + 3] = static_cast(std::clamp(sum / scale + 0.5f, 0.0f, 255.0f)); + } + } + } + return rgba; +} + +// the texture of the icons at the size, made again when the size changes +bool prepare(int const Size) +{ + if (g_atlas.failed) + return false; + if (g_atlas.texture != 0 && g_atlas.size == Size) + return true; + auto *renderer{GfxRenderer ? GfxRenderer->GetImguiRenderer() : nullptr}; + if (renderer == nullptr || coverage().empty()) + { + g_atlas.failed = true; + return false; + } + if (g_atlas.texture != 0) + renderer->Release_Image(g_atlas.texture); + auto const rgba{scaled(Size)}; + g_atlas.texture = renderer->Create_Image(rgba.data(), columns * stride(Size), rows * stride(Size)); + g_atlas.size = Size; + // a renderer which can't show them gets no more requests + g_atlas.failed = (g_atlas.texture == 0); + return false == g_atlas.failed; +} + +} // namespace + +float size() +{ + return std::round(20.0f * std::max(1.0f, Global.ui_scale)); +} + +bool draw(ImDrawList *List, icon const Icon, ImVec2 const &Center, ImU32 const Color) +{ + // all at the one size, the texture is made for it + auto const pixels{static_cast(size())}; + if (List == nullptr || Icon >= icon::count || false == prepare(pixels)) + return false; + auto const index{static_cast(Icon)}; + auto const width{static_cast(columns * stride(pixels))}; + auto const height{static_cast(rows * stride(pixels))}; + ImVec2 const uv0{((index % columns) * stride(pixels) + 1) / width, ((index / columns) * stride(pixels) + 1) / height}; + ImVec2 const uv1{uv0.x + pixels / width, uv0.y + pixels / height}; + // on whole pixels, the icon was scaled for them + ImVec2 const min{std::round(Center.x - pixels * 0.5f), std::round(Center.y - pixels * 0.5f)}; + List->AddImage(static_cast(g_atlas.texture), min, ImVec2(min.x + pixels, min.y + pixels), uv0, uv1, Color); + return true; +} + +} // namespace editor_icons diff --git a/editor/editorIcons.hpp b/editor/editorIcons.hpp new file mode 100644 index 000000000..3734d4653 --- /dev/null +++ b/editor/editorIcons.hpp @@ -0,0 +1,61 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "imgui/imgui.h" + +// icons of the scenery editor. they're drawn by editor/icons/editor_icons.py into editor_icons.png, which CMake writes out +// as the bytes of an array built into the executable, so they're there without any file of the simulator +namespace editor_icons +{ + +// in the order of the cells of editor_icons.png +enum class icon +{ + select, + insert, + brush, + area_fill, + copy_to_bank, + translate, + rotate, + scale, + local_space, + ortho, + perspective, + sculpt, + smooth, + chunks, + orthophoto, + road, + place, + lanes, + lay_track, + turnout, + straight, + curve, + signal, + objects, + vehicle, + profile, + speed, + joints, + infra, + gauge, + turntable, + count +}; + +// pixels of the side of an icon, at the scale of the user interface +float size(); +// draws the icon in the colour given, centred on the point. returns: false if the renderer can't show images +bool draw(ImDrawList *List, icon const Icon, ImVec2 const &Center, ImU32 const Color); + +} // namespace editor_icons diff --git a/editor/icons/editor_icons.png b/editor/icons/editor_icons.png new file mode 100644 index 0000000000000000000000000000000000000000..80b7013b1d6941acdfa1e00a8bac910d91eb69ee GIT binary patch literal 44886 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 Date: Fri, 9 Oct 2026 12:01:00 +0200 Subject: [PATCH 189/430] feat(editor): the node bank in two panes, as the assets of unity: its groups on the left with the scenery templates, the entries of the chosen one on the right, as cards or a list, a search going through all of them; the models dragged from the node bank onto a model set, the templates of a set or the list of the brush or the area fill; the templates of the model sets shown with their previews; the model sets docked by the node bank by default; Polish translation --- application/editoruilayer.cpp | 8 +- application/editoruipanels.cpp | 475 ++++++++++++++++++++++++--------- application/editoruipanels.h | 16 ++ lang/editor_pl.po | 10 +- 4 files changed, 379 insertions(+), 130 deletions(-) diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index b5d7f4621..ee203ddae 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -98,8 +98,12 @@ void editor_ui::build_default_layout(unsigned int const Dockspace) ImGui::DockBuilderDockWindow(window, leftbottom); for (auto const *window : {"###inspector", "###editorsettings", "###Include database", "###orthophoto", "###environment"}) ImGui::DockBuilderDockWindow(window, right); - for (auto const *window : {"###Node bank", "###profilestrip", "###trackanalysis", "###structuregauge", "###editorhistory", "###modelsets"}) - ImGui::DockBuilderDockWindow(window, bottom); + // bottom: the node bank, and the model sets by its side, the models are dragged from the one to the other + ImGuiID bottomleft{bottom}; + auto const bottomright{ImGui::DockBuilderSplitNode(bottomleft, ImGuiDir_Right, 0.45f, nullptr, &bottomleft)}; + for (auto const *window : {"###Node bank", "###profilestrip", "###trackanalysis", "###structuregauge", "###editorhistory"}) + ImGui::DockBuilderDockWindow(window, bottomleft); + ImGui::DockBuilderDockWindow("###modelsets", bottomright); ImGui::DockBuilderFinish(Dockspace); } diff --git a/application/editoruipanels.cpp b/application/editoruipanels.cpp index bc157b80c..2e177f427 100644 --- a/application/editoruipanels.cpp +++ b/application/editoruipanels.cpp @@ -59,6 +59,71 @@ bool list_item(char const *Label, bool const Selected) ImGui::PopStyleColor(); return clicked; } + +// name of the payload of a node definition dragged out of the node bank +char const *const template_payload{"EU07_NODEBANK_ENTRY"}; + +// a node definition of the node bank dropped on the item drawn last. returns: true if one was, with its text +bool dropped_template(std::string &Template) +{ + auto dropped{false}; + if (ImGui::BeginDragDropTarget()) + { + if (auto const *payload{ImGui::AcceptDragDropPayload(template_payload)}; payload != nullptr && payload->DataSize > 0) + { + Template.assign(static_cast(payload->Data), static_cast(payload->DataSize)); + dropped = true; + } + ImGui::EndDragDropTarget(); + } + return dropped; +} + +// a card: the image fills its square, or what's missing is said in its place, and the label is under it, cut short with an +// ellipsis. returns: true if it was clicked; the card is the item drawn last +bool card(ImVec2 const &Cell, float const Side, std::uint64_t const Texture, char const *Placeholder, char const *Label, bool const Selected) +{ + auto const &style{ImGui::GetStyle()}; + auto const position{ImGui::GetCursorScreenPos()}; + auto const clicked{ImGui::InvisibleButton("##card", Cell)}; + auto const hovered{ImGui::IsItemHovered()}; + auto *list{ImGui::GetWindowDrawList()}; + ImVec2 const end{position.x + Cell.x, position.y + Cell.y}; + list->AddRectFilled(position, end, ImGui::GetColorU32(Selected ? ImGuiCol_Header : hovered ? ImGuiCol_HeaderHovered : ImGuiCol_FrameBg), style.FrameRounding); + ImVec2 const imagemin{position.x + 2.0f, position.y + 2.0f}; + ImVec2 const imagemax{position.x + Side - 2.0f, position.y + Side - 2.0f}; + if (Texture != 0) + { + list->AddImage(static_cast(Texture), imagemin, imagemax); + } + else + { + list->AddRect(imagemin, imagemax, ImGui::GetColorU32(ImGuiCol_Border), style.FrameRounding); + auto const size{ImGui::CalcTextSize(Placeholder)}; + list->PushClipRect(imagemin, imagemax, true); + list->AddText(ImVec2(imagemin.x + std::max(0.0f, (imagemax.x - imagemin.x - size.x) * 0.5f), imagemin.y + (imagemax.y - imagemin.y - size.y) * 0.5f), ImGui::GetColorU32(ImGuiCol_TextDisabled), Placeholder); + list->PopClipRect(); + } + while (*Label == ' ') + { + ++Label; + } + ImVec2 const labelmin{position.x + style.FramePadding.x, position.y + Side + style.FramePadding.y}; + ImVec2 const labelmax{end.x - style.FramePadding.x, end.y}; + ImGui::RenderTextEllipsis(list, labelmin, labelmax, labelmax.x, labelmax.x, Label, nullptr, nullptr); + return clicked; +} + +// cells of the cards of the side, and how many of them fit the width in a row +ImVec2 card_cell(float const Side) +{ + return ImVec2(Side, Side + ImGui::GetTextLineHeight() + ImGui::GetStyle().FramePadding.y * 2.0f); +} +int card_columns(ImVec2 const &Cell) +{ + auto const &style{ImGui::GetStyle()}; + return std::max(1, static_cast((ImGui::GetContentRegionAvail().x + style.ItemSpacing.x) / (Cell.x + style.ItemSpacing.x))); +} } // namespace void itemproperties_panel::update(scene::basic_node *Node) @@ -602,6 +667,7 @@ void nodebank_panel::nodebank_reload() void nodebank_panel::index_previews() { m_previewpaths.clear(); + m_templatepreviews.clear(); std::error_code error; m_previewfolder = std::filesystem::is_directory(editor_previews::folder, error); // entries with the same model and skin are numbered in the order of the file, the way the generator numbers them @@ -620,12 +686,14 @@ void nodebank_panel::index_previews() auto const name{editor_previews::variant(path, taken)}; taken.insert(name); m_previewpaths[entry.second.get()] = name + ".png"; + m_templatepreviews.try_emplace(*entry.second, name + ".png"); } } void nodebank_panel::preview_popup(std::pair> const &Entry) { - if (false == ImGui::IsItemHovered(ImGuiHoveredFlags_DelayNormal | ImGuiHoveredFlags_NoSharedDelay)) + // not while something's dragged, the tooltip of the drag is there then + if (false == ImGui::IsItemHovered(ImGuiHoveredFlags_DelayNormal | ImGuiHoveredFlags_NoSharedDelay) || ImGui::GetDragDropPayload() != nullptr) { return; } @@ -669,13 +737,62 @@ void nodebank_panel::preview_popup(std::pairimage(Path)}; + Placeholder = (m_previews->missing(Path) ? STR_C("no preview") : "..."); + return texture; +} + +std::string const &nodebank_panel::template_preview(std::string const &Template) const +{ + static std::string const none; + auto const lookup{m_templatepreviews.find(Template)}; + return lookup != m_templatepreviews.end() ? lookup->second : none; +} + +void nodebank_panel::drag_entry(std::pair> const &Entry) +{ + // the scenery templates are placed with include directives, the lists of the models have no use for them + if (Entry.second->empty() || Entry.second->starts_with(editor_includes::directive_mark)) + { + return; + } + if (false == ImGui::BeginDragDropSource()) + { + return; + } + ImGui::SetDragDropPayload(template_payload, Entry.second->data(), Entry.second->size()); + auto const lookup{m_previewpaths.find(Entry.second.get())}; + if (lookup != m_previewpaths.end() && m_previews != nullptr) + { + if (auto const texture{m_previews->image(lookup->second)}; texture != 0) + { + auto const side{64.0f * std::max(1.0f, Global.ui_scale)}; + ImGui::Image(static_cast(texture), ImVec2(side, side)); + } + } + auto const *label{Entry.first.c_str()}; + while (*label == ' ') + { + ++label; + } + ImGui::TextUnformatted(label); + ImGui::TextDisabled("%s", STR_C("Drop it on a model set, or on the list of the brush or the area fill")); + ImGui::EndDragDropSource(); +} + void nodebank_panel::render_cards(std::vector> const *> const &Entries) { auto const &style{ImGui::GetStyle()}; - auto const card{std::max(16.0f, EditorSettings.nodebank_card() * Global.ui_scale)}; - auto const labelheight{ImGui::GetTextLineHeight()}; - ImVec2 const cell{card, card + labelheight + style.FramePadding.y * 2.0f}; - auto const columns{std::max(1, static_cast((ImGui::GetContentRegionAvail().x + style.ItemSpacing.x) / (cell.x + style.ItemSpacing.x)))}; + auto const side{std::max(16.0f, EditorSettings.nodebank_card() * Global.ui_scale)}; + auto const cell{card_cell(side)}; + auto const columns{card_columns(cell)}; auto const rows{(static_cast(Entries.size()) + columns - 1) / columns}; ImGuiListClipper clipper; clipper.Begin(rows, cell.y + style.ItemSpacing.y); @@ -696,49 +813,15 @@ void nodebank_panel::render_cards(std::vectorsecond : std::string{}, placeholder)}; + if (card(cell, side, texture, placeholder, entry.first.c_str(), entry.second == m_selectedtemplate)) { m_selectedtemplate = entry.second; } - auto const hovered{ImGui::IsItemHovered()}; - auto const selected{entry.second == m_selectedtemplate}; - auto *list{ImGui::GetWindowDrawList()}; - ImVec2 const end{position.x + cell.x, position.y + cell.y}; - list->AddRectFilled(position, end, ImGui::GetColorU32(selected ? ImGuiCol_Header : hovered ? ImGuiCol_HeaderHovered : ImGuiCol_FrameBg), style.FrameRounding); - // the image fills the square of the card; without one, what's missing is said in its place - ImVec2 const imagemin{position.x + 2.0f, position.y + 2.0f}; - ImVec2 const imagemax{position.x + card - 2.0f, position.y + card - 2.0f}; - auto const lookup{m_previewpaths.find(entry.second.get())}; - std::uint64_t texture{0}; - char const *placeholder{STR_C("not a model")}; - if (lookup != m_previewpaths.end()) - { - texture = m_previews->image(lookup->second); - placeholder = (m_previews->missing(lookup->second) ? STR_C("no preview") : "..."); - } - if (texture != 0) - { - list->AddImage(static_cast(texture), imagemin, imagemax); - } - else - { - list->AddRect(imagemin, imagemax, ImGui::GetColorU32(ImGuiCol_Border), style.FrameRounding); - auto const size{ImGui::CalcTextSize(placeholder)}; - list->PushClipRect(imagemin, imagemax, true); - list->AddText(ImVec2(imagemin.x + std::max(0.0f, (imagemax.x - imagemin.x - size.x) * 0.5f), imagemin.y + (imagemax.y - imagemin.y - size.y) * 0.5f), ImGui::GetColorU32(ImGuiCol_TextDisabled), placeholder); - list->PopClipRect(); - } - // the label under the image, cut short with an ellipsis; the whole of it in the tooltip - auto const *label{entry.first.c_str()}; - while (*label == ' ') - { - ++label; - } - ImVec2 const labelmin{position.x + style.FramePadding.x, position.y + card + style.FramePadding.y}; - ImVec2 const labelmax{end.x - style.FramePadding.x, end.y}; - ImGui::RenderTextEllipsis(list, labelmin, labelmax, labelmax.x, labelmax.x, label, nullptr, nullptr); - if (hovered) + drag_entry(entry); + if (ImGui::IsItemHovered()) { preview_popup(entry); } @@ -749,6 +832,87 @@ void nodebank_panel::render_cards(std::vector> const *> const &Entries) +{ + for (auto const *entry : Entries) + { + ImGui::PushID(entry->second.get()); + auto const label{" " + entry->first}; + if (list_item(label.c_str(), entry->second == m_selectedtemplate)) + { + m_selectedtemplate = entry->second; + } + drag_entry(*entry); + preview_popup(*entry); + ImGui::PopID(); + } +} + +void nodebank_panel::render_templates_list(std::string const &Filter) +{ + if (false == EditorIncludes.scanned()) + { + EditorIncludes.scan(); + } + auto const &templates{EditorIncludes.entries()}; + std::string const *category{nullptr}; + auto listed{0}; + for (auto const entryidx : EditorIncludes.ready()) + { + auto const &entry{templates[entryidx]}; + if (false == Filter.empty() && false == contains(entry.name, Filter) && false == contains(entry.file, Filter) && false == contains(entry.category, Filter)) + { + continue; + } + if (false == entry.category.empty() && (category == nullptr || *category != entry.category)) + { + ImGui::TextDisabled(" %s", entry.category.c_str()); + } + category = &entry.category; + auto const label{(entry.category.empty() ? " " : " ") + entry.name + " (" + Bezogonkow(entry.file) + ")##inc" + std::to_string(entryidx)}; + if (list_item(label.c_str(), entry.statement == m_selectedtemplate)) + m_selectedtemplate = entry.statement; + ++listed; + } + if (listed == 0) + { + ImGui::TextDisabled(EditorIncludes.ready().empty() ? " (none yet, describe the templates in the Include database window)" : " (no match)"); + } +} + +void nodebank_panel::render_set_cards(int const Setid) +{ + auto const *set{EditorModelSets.find(Setid)}; + if (set == nullptr) + { + return; + } + // a bit smaller than in the node bank, the window of the sets is the smaller one + auto const side{std::max(48.0f, EditorSettings.nodebank_card() * Global.ui_scale * 0.75f)}; + auto const cell{card_cell(side)}; + auto const columns{card_columns(cell)}; + for (int index = 0; index < static_cast(set->templates.size()); ++index) + { + if (index % columns != 0) + { + ImGui::SameLine(); + } + ImGui::PushID(index); + char const *placeholder{nullptr}; + auto const texture{preview_texture(template_preview(set->templates[index]), placeholder)}; + auto const &label{index < static_cast(set->labels.size()) ? set->labels[index] : set->templates[index]}; + if (card(cell, side, texture, placeholder, label.c_str(), index == m_setsentry)) + { + m_setsentry = index; + } + if (ImGui::IsItemHovered()) + { + ImGui::SetTooltip("%s", label.c_str()); + } + ImGui::PopID(); + } +} + void nodebank_panel::render() { if (false == is_open) @@ -829,101 +993,132 @@ void nodebank_panel::render() ImGui::TextDisabled("%s", STR_C("No previews yet: they're made by eu07 -generate-nodebank-previews")); } } - if (previews && ImGui::BeginChild("##nodebankcards", ImVec2(-1, listheight), ImGuiChildFlags_Borders)) + // two panes: the groups of the node bank on the left, like folders, and the entries of the chosen one on the right. + // a search goes through all of them + struct category { - // the groups as in the list, the entries of an open one as cards - auto isvisible{false}; - auto const searchfilter{std::string(m_nodesearch)}; - std::vector> const *> cards; - for (auto const &entry : m_nodebank) + std::string const *name; + std::vector> const *> entries; + int matches{0}; + }; + static std::string const ungrouped{"(ungrouped)"}; + auto const searchfilter{std::string(m_nodesearch)}; + std::vector categories; + for (auto const &entry : m_nodebank) + { + if (entry.second->empty()) { - if (entry.second->empty()) - { - if (false == cards.empty()) - { - render_cards(cards); - cards.clear(); - } - isvisible = ImGui::CollapsingHeader(entry.first.c_str()); - } - else if (isvisible && (searchfilter.empty() || contains(entry.first, searchfilter))) - { - cards.push_back(&entry); - } + categories.push_back({&entry.first, {}}); + continue; } - if (false == cards.empty()) + if (categories.empty()) { - render_cards(cards); + // templates listed before the first header, as group_names() has them + categories.push_back({&ungrouped, {}}); + } + auto &group{categories.back()}; + group.entries.push_back(&entry); + if (false == searchfilter.empty() && contains(entry.first, searchfilter)) + { + ++group.matches; } - ImGui::Separator(); - ImGui::TextDisabled("%s", STR_C("Scenery templates (.inc) are listed with the previews off")); } - if (previews) + auto const templates{Global.editor_session}; + if (m_category >= static_cast(categories.size()) || (m_category == scenery_templates && false == templates) || m_category < scenery_templates) { + m_category = 0; + } + // the panes of the height of the table, inside the padding of its cells + auto const paneheight{listheight - 2.0f * ImGui::GetStyle().CellPadding.y - 1.0f}; + if (ImGui::BeginTable("##nodebankpanes", 2, ImGuiTableFlags_Resizable | ImGuiTableFlags_BordersInnerV, ImVec2(-1, listheight))) + { + ImGui::TableSetupColumn("##groups", ImGuiTableColumnFlags_WidthFixed, 170.0f * Global.ui_scale); + ImGui::TableSetupColumn("##entries", ImGuiTableColumnFlags_WidthStretch); + ImGui::TableNextRow(); + ImGui::TableSetColumnIndex(0); + if (ImGui::BeginChild("##groups", ImVec2(0, paneheight))) + { + auto const searching{false == searchfilter.empty()}; + for (int index = 0; index < static_cast(categories.size()); ++index) + { + auto const &group{categories[index]}; + auto const count{searching ? group.matches : static_cast(group.entries.size())}; + auto const label{*group.name + " (" + std::to_string(count) + ")##group" + std::to_string(index)}; + if (searching && count == 0) + { + ImGui::PushStyleColor(ImGuiCol_Text, ImGui::GetStyleColorVec4(ImGuiCol_TextDisabled)); + } + // a group chosen while searching is shown whole, the search is done + if (list_item(label.c_str(), false == searching && index == m_category)) + { + m_category = index; + m_nodesearch[0] = '\0'; + } + if (searching && count == 0) + { + ImGui::PopStyleColor(); + } + } + if (templates) + { + ImGui::Separator(); + if (list_item(STR_C("Scenery templates (.inc)"), m_category == scenery_templates)) + { + m_category = scenery_templates; + } + } + } ImGui::EndChild(); - } - else if (ImGui::BeginListBox("##nodebank", ImVec2(-1, listheight))) - { - auto idx{0}; - auto isvisible{false}; - auto const searchfilter{std::string(m_nodesearch)}; - for (auto const &entry : m_nodebank) + ImGui::TableSetColumnIndex(1); + if (ImGui::BeginChild("##entries", ImVec2(0, paneheight))) { - if (entry.second->empty()) + if (m_category == scenery_templates) { - // special case, header indicator - isvisible = ImGui::CollapsingHeader(entry.first.c_str()); + render_templates_list(searchfilter); } - else + else if (false == searchfilter.empty()) { - if (false == isvisible) + // what was found, under the names of the groups + std::vector> const *> found; + for (auto const &group : categories) { - continue; + if (group.matches == 0) + { + continue; + } + found.clear(); + for (auto const *entry : group.entries) + { + if (contains(entry->first, searchfilter)) + { + found.push_back(entry); + } + } + ImGui::SeparatorText(group.name->c_str()); + if (previews) + { + render_cards(found); + } + else + { + render_list(found); + } } - if (false == searchfilter.empty() && false == contains(entry.first, searchfilter)) + } + else if (false == categories.empty()) + { + if (previews) { - continue; + render_cards(categories[m_category].entries); + } + else + { + render_list(categories[m_category].entries); } - auto const label{" " + entry.first + "##" + std::to_string(idx)}; - if (list_item(label.c_str(), entry.second == m_selectedtemplate)) - m_selectedtemplate = entry.second; - preview_popup(entry); - ++idx; } } - // scenery templates. placing one adds an include directive to a scenery file, so they take scenery opened for editing - if (Global.editor_session && ImGui::CollapsingHeader(STR_C("Scenery templates (.inc)"))) - { - if (false == EditorIncludes.scanned()) - { - EditorIncludes.scan(); - } - auto const &templates{EditorIncludes.entries()}; - std::string const *category{nullptr}; - auto listed{0}; - for (auto const entryidx : EditorIncludes.ready()) - { - auto const &entry{templates[entryidx]}; - if (false == searchfilter.empty() && false == contains(entry.name, searchfilter) && false == contains(entry.file, searchfilter) && false == contains(entry.category, searchfilter)) - { - continue; - } - if (false == entry.category.empty() && (category == nullptr || *category != entry.category)) - { - ImGui::TextDisabled(" %s", entry.category.c_str()); - } - category = &entry.category; - auto const label{(entry.category.empty() ? " " : " ") + entry.name + " (" + Bezogonkow(entry.file) + ")##inc" + std::to_string(entryidx)}; - if (list_item(label.c_str(), entry.statement == m_selectedtemplate)) - m_selectedtemplate = entry.statement; - ++listed; - } - if (listed == 0) - { - ImGui::TextDisabled(EditorIncludes.ready().empty() ? " (none yet, describe the templates in the Include database window)" : " (no match)"); - } - } - ImGui::EndListBox(); + ImGui::EndChild(); + ImGui::EndTable(); } ImGui::PopItemWidth(); } @@ -999,6 +1194,11 @@ void nodebank_panel::manual_list(char const *Id, std::vector &List, } ImGui::EndListBox(); } + // a model dragged from the node bank onto the list goes to its end + if (std::string dropped; dropped_template(dropped)) + { + List.push_back(dropped); + } if (ImGui::Button(STR_C("Add selected"))) { if (node_selected()) @@ -1121,7 +1321,8 @@ void nodebank_panel::render_sets_window() // left side: the sets auto const buttonsheight{ImGui::GetFrameHeightWithSpacing()}; ImGui::BeginGroup(); - ImGui::BeginChild("##setlist", ImVec2(190 * Global.ui_scale, -buttonsheight), true); + // the list of the sets takes up to a part of a narrow window, the templates of the set need the room + ImGui::BeginChild("##setlist", ImVec2(std::min(190.0f * Global.ui_scale, ImGui::GetContentRegionAvail().x * 0.4f), -buttonsheight), true); for (auto const &set : sets) { auto const label{set.name + " (" + std::to_string(set.templates.size()) + ")##set" + std::to_string(set.id)}; @@ -1130,6 +1331,13 @@ void nodebank_panel::render_sets_window() m_setsselected = set.id; m_setsentry = -1; } + // a model dragged from the node bank onto a set goes to its end + if (std::string dropped; dropped_template(dropped)) + { + EditorModelSets.add(set.id, {dropped}); + m_setsselected = set.id; + m_setsentry = -1; + } } if (sets.empty()) { @@ -1201,17 +1409,30 @@ void nodebank_panel::render_sets_window() } ImGui::BeginChild("##setentries", ImVec2(0, -buttonsheight * 2), true); - for (int idx = 0; idx < static_cast(edited->labels.size()); ++idx) + // with the previews of the models, as in the node bank + if (EditorSettings.nodebank_previews() && m_previews != nullptr) { - auto const label{edited->labels[idx] + "##entry" + std::to_string(idx)}; - if (list_item(label.c_str(), idx == m_setsentry)) - m_setsentry = idx; + render_set_cards(edited->id); + } + else + { + for (int idx = 0; idx < static_cast(edited->labels.size()); ++idx) + { + auto const label{edited->labels[idx] + "##entry" + std::to_string(idx)}; + if (list_item(label.c_str(), idx == m_setsentry)) + m_setsentry = idx; + } } if (edited->templates.empty()) { ImGui::TextDisabled(STR_C("(empty) select a template in the node bank and press \"Add selected\"")); + ImGui::TextDisabled("%s", STR_C("or drag models here from the node bank")); } ImGui::EndChild(); + if (std::string dropped; dropped_template(dropped)) + { + EditorModelSets.add(edited->id, {dropped}); + } auto const setid{edited->id}; if (ImGui::Button(STR_C("Add selected"))) diff --git a/application/editoruipanels.h b/application/editoruipanels.h index a826d5b46..dbb3f8bc8 100644 --- a/application/editoruipanels.h +++ b/application/editoruipanels.h @@ -166,6 +166,18 @@ class nodebank_panel : public ui_panel void index_previews(); // entries of a group as cards with their previews, in rows as many as fit the width void render_cards(std::vector> const *> const &Entries); + // the same entries as a list, for when the previews are off + void render_list(std::vector> const *> const &Entries); + // the scenery templates (.inc), as a list; they're placed with include directives, so they take a scenery opened for editing + void render_templates_list(std::string const &Filter); + // the entry dragged from the item drawn last, to drop it on a list of the model sets or of a tool + void drag_entry(std::pair> const &Entry); + // image of a node definition as the node bank has it, or an empty string + std::string const &template_preview(std::string const &Template) const; + // texture of the small preview of the image, 0 if there's none (yet) + std::uint64_t preview_texture(std::string const &Path, char const *&Placeholder); + // the templates of the edited model set as cards with their previews + void render_set_cards(int const Setid); // the entry pointed at for a moment: a popup with its preview, big, and the model and skin it shows void preview_popup(std::pair> const &Entry); // true if the node bank selection is a definition of a node, which the hand-made lists and the model sets can take @@ -179,6 +191,10 @@ class nodebank_panel : public ui_panel std::unique_ptr m_previews; std::unique_ptr m_largepreviews; // a few, for the popup bool m_previewfolder{false}; // the generator was run, there's the folder of the images + std::unordered_map m_templatepreviews; // images of the node definitions by their text, for the model sets + // the group of the node bank shown, by its place among the groups; scenery_templates for the scenery templates + static int constexpr scenery_templates{-1}; + int m_category{0}; // set manager window bool m_setsopen{false}; int m_setsselected{0}; // id of the user set being edited diff --git a/lang/editor_pl.po b/lang/editor_pl.po index 1c3dd20cd..b043f4e21 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -3860,7 +3860,7 @@ msgid "Not for the node bank yet: %s." msgstr "Jeszcze nie do banku węzłów: %s." msgid "A template placed from the node bank gets the cursor location in the pos.* parameters, the rotation set in the\nInsert tab in rot.y, and a unique name (the default value followed by a random suffix) in the name parameter.\nThe other parameters receive their default values." -msgstr "Szablon wstawiony z banku węzłów dostaje położenie kursora w parametrach pos.*, obrót ustawiony w zakładce\nWstaw w rot.y, a w parametrze name niepowtarzalną nazwę (wartość domyślna z losowym przyrostkiem).\nPozostałe parametry dostają wartości domyślne." +msgstr "Szablon wstawiony z banku obiektów dostaje położenie kursora w parametrach pos.*, obrót ustawiony w zakładce\nWstaw w rot.y, a w parametrze name niepowtarzalną nazwę (wartość domyślna z losowym przyrostkiem).\nPozostałe parametry dostają wartości domyślne." msgid "Suggest roles" msgstr "Podpowiedz role" @@ -5053,3 +5053,11 @@ msgstr "LPM: początek drogi, potem każdy kolejny punkt; na wolnym końcu, boku msgid "Level crossings, and the points where vehicles appear on the roads or are taken off them" msgstr "Przejazdy kolejowe oraz punkty, w których pojazdy pojawiają się na drogach albo są z nich zdejmowane" + +# scenery editor: node bank in two panes, models dragged to the sets + +msgid "Drop it on a model set, or on the list of the brush or the area fill" +msgstr "Upuść go na zestaw modeli albo na listę pędzla lub wypełniania obszaru" + +msgid "or drag models here from the node bank" +msgstr "albo przeciągnij tu modele z banku obiektów" From 3e3317d26f6b4cc21072801398403c8ed0495f9e Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Fri, 9 Oct 2026 12:49:45 +0200 Subject: [PATCH 190/430] feat(editor): the toolbar as buttons with icons and names, the chosen tool standing out as the chosen field of work does, the names left out when the row is too narrow for them; the fields of work with icons of their own (surroundings, tracks, roads, terrain) and both rows captioned at their left end (work modes, tools); the tools of the toolbar and of the left edge of the 3d view from one list; Polish translation --- application/editormode.cpp | 81 ++--------- application/editormode.h | 17 ++- application/editormoderoad.cpp | 34 ----- application/editormodetrack.cpp | 39 ----- application/editormodeviewport.cpp | 226 +++++++++++++++++++++++------ application/editoruilayer.cpp | 23 +-- editor/editorIcons.hpp | 5 + editor/icons/editor_icons.png | Bin 44886 -> 52589 bytes editor/icons/editor_icons.py | 57 +++++++- lang/editor_pl.po | 20 +++ 10 files changed, 299 insertions(+), 203 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 0d2b6acc6..c7d36c8b6 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -29,6 +29,7 @@ extern char **environ; #include "editor/editorGroundMesh.hpp" #include "editor/editorFormat.hpp" #include "editor/editorGeometry.hpp" +#include "editor/editorIcons.hpp" #include "utilities/translation.h" #include "utilities/Globals.h" #include "simulation/simulation.h" @@ -3792,13 +3793,14 @@ void editor_mode::render_workspaces() { char const *label; work_area which; + editor_icons::icon picture; char const *tooltip; }; area const areas[] = { - {STR_C("Surroundings"), work_area::surroundings, STR_C("Models around the line: select, insert, brush, area fill, copy to the node bank")}, - {STR_C("Tracks"), work_area::tracks, STR_C("Tracks and switches, signals, objects along the track, checks of the line")}, - {STR_C("Roads"), work_area::roads, STR_C("Roads and junctions, level crossings, the points where the traffic comes and goes")}, - {STR_C("Terrain"), work_area::terrain, STR_C("Terrain patches and chunks, sculpting, streaming, orthophoto")}, + {STR_C("Surroundings"), work_area::surroundings, editor_icons::icon::work_surroundings, STR_C("Models around the line: select, insert, brush, area fill, copy to the node bank")}, + {STR_C("Tracks"), work_area::tracks, editor_icons::icon::work_tracks, STR_C("Tracks and switches, signals, objects along the track, checks of the line")}, + {STR_C("Roads"), work_area::roads, editor_icons::icon::work_roads, STR_C("Roads and junctions, level crossings, the points where the traffic comes and goes")}, + {STR_C("Terrain"), work_area::terrain, editor_icons::icon::work_terrain, STR_C("Terrain patches and chunks, sculpting, streaming, orthophoto")}, }; char const *const keys[] = {"F2", "F3", "F4", "F5"}; auto const current{current_work_area()}; @@ -3809,11 +3811,14 @@ void editor_mode::render_workspaces() auto const fontsize{ui_layer::font_bold != nullptr ? ui_layer::font_bold->FontSize : ImGui::GetFontSize() * 1.25f}; auto const height{ImGui::GetWindowHeight()}; auto const padding{style.FramePadding.x * 3.0f}; - ImGui::SetCursorPos(ImVec2(style.ItemSpacing.x, 0.0f)); + // the icon of the field of work before its name + auto const iconside{editor_icons::size()}; + auto const spacing{style.ItemInnerSpacing.x * 1.5f}; + render_toolbar_caption(STR_C("Work modes")); for (auto const &entry : areas) { auto const text{font->CalcTextSizeA(fontsize, FLT_MAX, 0.0f, entry.label)}; - ImVec2 const size{text.x + padding * 2.0f, height}; + ImVec2 const size{text.x + iconside + spacing + padding * 2.0f, height}; auto const position{ImGui::GetCursorScreenPos()}; ImGui::PushID(static_cast(entry.which)); if (ImGui::InvisibleButton("##area", size)) @@ -3826,8 +3831,9 @@ void editor_mode::render_workspaces() list->AddRectFilled(position, end, ImGui::GetColorU32(chosen ? ImGuiCol_Header : ImGuiCol_HeaderHovered)); if (chosen) list->AddRectFilled(ImVec2(position.x, end.y - 3.0f), end, ImGui::GetColorU32(ImGuiCol_CheckMark)); - ImVec2 const textposition{position.x + padding, position.y + (height - text.y) * 0.5f}; + ImVec2 const textposition{position.x + padding + iconside + spacing, position.y + (height - text.y) * 0.5f}; auto const color{ImGui::GetColorU32(chosen ? ImGuiCol_Text : ImGuiCol_TextDisabled)}; + editor_icons::draw(list, entry.picture, ImVec2(position.x + padding + iconside * 0.5f, position.y + height * 0.5f), color); list->AddText(font, fontsize, textposition, color, entry.label); if (ui_layer::font_bold == nullptr) list->AddText(font, fontsize, ImVec2(textposition.x + 1.0f, textposition.y), color, entry.label); @@ -3837,69 +3843,10 @@ void editor_mode::render_workspaces() } } -void editor_mode::render_terrain_toolbar() -{ - // what the left button does on the terrain: picks the models as it does elsewhere, raises and lowers, evens out, adds chunks - struct tool - { - char const *label; - bool chosen; - bool sculpt; - bool smooth; - bool chunks; - char const *tooltip; - }; - tool const tools[] = { - {STR_C("Select"), false == m_terrain_sculpt && false == m_chunk_edit, false, m_terrain_brush_smooth, false, STR_C("LMB picks the models, as in the surroundings")}, - {STR_C("Sculpt"), m_terrain_sculpt && false == m_terrain_brush_smooth, true, false, false, STR_C("LMB raises the terrain under the brush, Shift+LMB lowers it")}, - {STR_C("Smooth"), m_terrain_sculpt && m_terrain_brush_smooth, true, true, false, STR_C("LMB evens the terrain out under the brush")}, - {STR_C("Chunks"), m_chunk_edit, false, m_terrain_brush_smooth, true, STR_C("LMB adds a chunk next to the clicked one, Shift+LMB deletes it")}, - }; - for (auto const &entry : tools) - { - if (ImGui::MenuItem(entry.label, nullptr, entry.chosen)) - { - m_terrain_sculpt = entry.sculpt; - m_terrain_brush_smooth = entry.smooth; - m_chunk_edit = entry.chunks; - } - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", entry.tooltip); - } - ImGui::Separator(); - auto const orthophoto{m_orthophoto.enabled()}; - if (ImGui::MenuItem(STR_C("Orthophoto"), nullptr, orthophoto)) - m_orthophoto.enabled(false == orthophoto); - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("Aerial imagery of geoportal.gov.pl under the scenery, laid out by the origin of the scenery")); - ImGui::MenuItem(STR_C("Orthophoto settings..."), nullptr, &m_orthophoto_window); -} - void editor_mode::render_toolbar() { - auto const area{current_work_area()}; - switch (area) - { - case work_area::surroundings: - { - // edit modes of the node bank - std::pair const modes[] = { - {STR_C("Select"), nodebank_panel::MODIFY}, {STR_C("Insert"), nodebank_panel::ADD}, {STR_C("Brush"), nodebank_panel::BRUSH}, {STR_C("Area fill"), nodebank_panel::FILL}, {STR_C("Copy to bank"), nodebank_panel::COPY}}; - for (std::size_t index = 0; index < std::size(modes); ++index) - { - auto const &mode{modes[index]}; - if (ImGui::MenuItem(mode.first, nullptr, ui()->mode() == mode.second)) - choose_edit_mode(mode.second); - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s (%d)", mode.first, static_cast(index + 1)); - } - break; - } - case work_area::tracks: render_track_toolbar(); break; - case work_area::roads: render_road_toolbar(); break; - case work_area::terrain: render_terrain_toolbar(); break; - } // the modes of the gizmo and the top view are over the 3d view, see render_viewport_overlays() + render_toolbar_tools(); } void editor_mode::render_edit_menu() diff --git a/application/editormode.h b/application/editormode.h index edc45daa4..6c7b97764 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -38,6 +38,8 @@ http://mozilla.org/MPL/2.0/. #include class TAnimModel; +// a tool of a field of work of the editor, a button in the toolbar and over the 3d view +struct editor_tool_button; class TTrack; namespace ui { @@ -280,8 +282,6 @@ class editor_mode : public application_mode, private editor_track::observer void render_terrain_ui(); // the terrain as a field of work of its own: the terrain tools and the orthophoto in the tool options window void render_terrain_tool_options(); - // tools of the terrain in the toolbar: picking, sculpting, smoothing, chunks, orthophoto - void render_terrain_toolbar(); // opens or leaves the terrain; leaving it puts the sculpting and the chunk editing away, so the mouse doesn't stay with them void terrain_workspace(bool const Open); // creates a large terrain as a grid of adjacent chunks (each its own editable patch) @@ -389,6 +389,12 @@ class editor_mode : public application_mode, private editor_track::observer // world and the top view in its top right corner void render_viewport_overlays(); void render_viewport_tools(); + // the tools of the field of work, in the order of the toolbar + void work_area_tools(std::vector &Buttons); + // the tools of the field of work in the toolbar, as icons with their names + void render_toolbar_tools(); + // what the row of the toolbar holds, written at its left end: the fields of work, the tools + static void render_toolbar_caption(char const *Text); void render_viewport_gizmo(); void render_view_axes(); // the camera looking along an axis of the world (0: x, 1: y, 2: z) from its positive or negative side @@ -491,7 +497,7 @@ class editor_mode : public application_mode, private editor_track::observer void render_gizmo(); // gizmo settings, drawn in the toolset window void render_gizmo_options(); - // edit modes, editor windows and gizmo settings in the toolbar under the menu + // the tools of the field of work in the toolbar under the menu void render_toolbar(); // an edit mode of the node bank as the field of work, from the toolbar or its key (1-5) void choose_edit_mode(nodebank_panel::edit_mode const Mode); @@ -915,8 +921,6 @@ class editor_mode : public application_mode, private editor_track::observer // the track tools in the tool options window, and the selected path in the inspector void render_track_tool_options(); void render_track_selection(); - // tools of the track mode in the toolbar, in groups: building, by the track, checks - void render_track_toolbar(); void show_track_tab(track_tab const Tab); bool track_analysis_tab() const { return m_track_tab == track_tab::profile || m_track_tab == track_tab::speed || m_track_tab == track_tab::joints || m_track_tab == track_tab::infra; } bool track_shortcut(int const Key); @@ -1828,8 +1832,7 @@ class editor_mode : public application_mode, private editor_track::observer char islandtext[128]{"none"}; }; void render_road_tool_options(); - // tools of the roads in the toolbar, and the change of the tool - void render_road_toolbar(); + // the change of the road tool void road_choose_tool(int const Tool); void render_road_selection(); bool render_road_layout(road_node::state &State); diff --git a/application/editormoderoad.cpp b/application/editormoderoad.cpp index 8c800d900..a07da795f 100644 --- a/application/editormoderoad.cpp +++ b/application/editormoderoad.cpp @@ -2264,40 +2264,6 @@ void editor_mode::road_choose_tool(int const Tool) } } -void editor_mode::render_road_toolbar() -{ - auto &tool{m_roadtool}; - struct entry - { - char const *label; - char const *tooltip; - }; - entry const tools[] = {{"Select", "LMB: a road piece, a junction, a point where pieces meet, a level crossing or a traffic point"}, - {"Build", "LMB: start a road, then each next point; on a loose end, the side of a road or a junction it's joined to them"}, - {"Place", "Level crossings, and the points where vehicles appear on the roads or are taken off them"}}; - for (int index = 0; index < static_cast(std::size(tools)); ++index) - { - if (ImGui::MenuItem(tools[index].label, nullptr, tool.tool == index)) - road_choose_tool(index); - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", tools[index].tooltip); - } - if (tool.tool == 2) - { - // what the place tool puts - ImGui::Separator(); - char const *const kinds[] = {"Level crossing", "Spawn point", "Removal point", "Pedestrian crossing"}; - for (int index = 0; index < static_cast(std::size(kinds)); ++index) - { - if (ImGui::MenuItem(kinds[index], nullptr, tool.placekind == index)) - tool.placekind = index; - } - } - ImGui::Separator(); - if (ImGui::MenuItem("Show lanes", nullptr, tool.lanes)) - tool.lanes = !tool.lanes; -} - // the road tools and what the next pieces get, in the tool options window; the selection is drawn in the inspector by render_road_selection() void editor_mode::render_road_tool_options() { diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 0172fbe9a..0dc68a751 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -814,45 +814,6 @@ void editor_mode::render_track_selection() render_path_ui(); } -void editor_mode::render_track_toolbar() -{ - auto const &modes{track_modes()}; - auto const vehicle{m_track_tab == track_tab::lineside && m_vehicle.open}; - // a tool chosen again gives way to the select one - auto const tool = [&](track_tab const Tab) { - auto const found{std::find_if(modes.begin(), modes.end(), [&](track_mode const &Mode) { return Mode.tab == Tab; })}; - if (found == modes.end()) - return; - auto const chosen{m_track_tab == Tab && false == (Tab == track_tab::lineside && vehicle)}; - auto const label{std::string{STR_C(found->label)} + "###tracktool" + std::to_string(static_cast(found - modes.begin()))}; - if (ImGui::MenuItem(label.c_str(), nullptr, chosen)) - show_track_tab(chosen ? track_tab::path : Tab); - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s [%s]", STR_C(found->tooltip), found->key); - }; - // building the track, what goes by it, the checks - for (auto const tab : {track_tab::path, track_tab::lay, track_tab::turnout, track_tab::straights, track_tab::route, track_tab::turntable}) - tool(tab); - ImGui::Separator(); - tool(track_tab::signals); - tool(track_tab::lineside); - // the vehicle to drive is one of the objects along the track - if (ImGui::MenuItem(STR_C("Vehicle"), nullptr, vehicle)) - { - show_track_tab(vehicle ? track_tab::path : track_tab::lineside); - m_vehicle.expand = false == vehicle; - } - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("A vehicle to drive, put on the selected track; it isn't written to the scenery files")); - ImGui::Separator(); - for (auto const tab : {track_tab::profile, track_tab::speed, track_tab::joints, track_tab::infra}) - tool(tab); - if (ImGui::MenuItem(STR_C("Structure gauge"), nullptr, m_gauge.open)) - m_gauge.open = !m_gauge.open; - if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("Checks which models enter the structure gauge of the tracks and the clearance over the roads (skrajnia budowli)")); -} - void editor_mode::render_track_guide() { auto const hints{track_key_hints(false)}; diff --git a/application/editormodeviewport.cpp b/application/editormodeviewport.cpp index 174346520..7c9a3491d 100644 --- a/application/editormodeviewport.cpp +++ b/application/editormodeviewport.cpp @@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/. */ // over the 3d view: the tools of the field of work along its left edge, the modes of the gizmo at its top, the axes of the -// world and the top view in its top right corner +// world and the top view in its top right corner. the same tools in the toolbar under the menu, with their names #include "stdafx.h" #include "application/editormode.h" @@ -25,14 +25,9 @@ http://mozilla.org/MPL/2.0/. #include #include -namespace +struct editor_tool_button { - -using editor_icons::icon; - -struct tool_button -{ - icon picture; + editor_icons::icon picture; // icon::count if it has none: then it's only in the toolbar, as its name char const *label; char const *key; // nullptr if there's none char const *tooltip; // nullptr if the label says enough @@ -42,6 +37,12 @@ struct tool_button bool enabled{true}; }; +namespace +{ + +using editor_icons::icon; +using tool_button = editor_tool_button; + float scale() { return std::max(1.0f, Global.ui_scale); @@ -69,6 +70,27 @@ bool begin_overlay(char const *Name, ImVec2 const &Position, ImVec2 const &Size) return open; } +// the name of the tool with its key, and what it does +void button_tooltip(tool_button const &Button) +{ + std::string tip{Button.label}; + if (Button.key != nullptr) + tip += std::string{" ["} + Button.key + "]"; + if (Button.tooltip != nullptr) + tip += std::string{"\n"} + Button.tooltip; + ImGui::SetTooltip("%s", tip.c_str()); +} + +// the first letters of the label in place of the icon, if the renderer can't show images +void icon_or_letters(ImDrawList *List, tool_button const &Button, ImVec2 const &Center, ImU32 const Color) +{ + if (editor_icons::draw(List, Button.picture, Center, Color)) + return; + char const text[]{Button.label[0], (Button.label[0] != '\0' ? Button.label[1] : '\0'), '\0'}; + auto const size{ImGui::CalcTextSize(text)}; + List->AddText(ImVec2(Center.x - size.x * 0.5f, Center.y - size.y * 0.5f), Color, text); +} + // the button with the icon at the place; the label stands in for the icon if the renderer can't show images void icon_button(tool_button const &Button, ImVec2 const &Position, int const Id) { @@ -88,22 +110,9 @@ void icon_button(tool_button const &Button, ImVec2 const &Position, int const Id if (Button.chosen) list->AddRect(Position, end, ImGui::GetColorU32(ImGuiCol_CheckMark), rounding, 0, 1.5f * scale()); auto const color{Button.enabled ? (Button.chosen || hovered ? IM_COL32(255, 255, 255, 255) : IM_COL32(215, 220, 225, 235)) : IM_COL32(150, 150, 150, 110)}; - ImVec2 const center{Position.x + side * 0.5f, Position.y + side * 0.5f}; - if (false == editor_icons::draw(list, Button.picture, center, color)) - { - char const text[]{Button.label[0], (Button.label[0] != '\0' ? Button.label[1] : '\0'), '\0'}; - auto const size{ImGui::CalcTextSize(text)}; - list->AddText(ImVec2(center.x - size.x * 0.5f, center.y - size.y * 0.5f), color, text); - } + icon_or_letters(list, Button, ImVec2(Position.x + side * 0.5f, Position.y + side * 0.5f), color); if (hovered) - { - std::string tip{Button.label}; - if (Button.key != nullptr) - tip += std::string{" ["} + Button.key + "]"; - if (Button.tooltip != nullptr) - tip += std::string{"\n"} + Button.tooltip; - ImGui::SetTooltip("%s", tip.c_str()); - } + button_tooltip(Button); if (clicked && Button.enabled && Button.action) Button.action(); } @@ -122,13 +131,9 @@ void editor_mode::render_viewport_overlays() render_view_axes(); } -void editor_mode::render_viewport_tools() +void editor_mode::work_area_tools(std::vector &Buttons) { - // the tools of the field of work, as in the toolbar - std::vector buttons; - buttons.reserve(16); - auto const area{current_work_area()}; - switch (area) + switch (current_work_area()) { case work_area::surroundings: { @@ -145,7 +150,7 @@ void editor_mode::render_viewport_tools() {icon::area_fill, STR_C("Area fill"), "4", nodebank_panel::FILL}, {icon::copy_to_bank, STR_C("Copy to bank"), "5", nodebank_panel::COPY}}; for (auto const &entry : modes) - buttons.push_back({entry.picture, entry.label, entry.key, nullptr, ui()->mode() == entry.which, [this, which = entry.which]() { choose_edit_mode(which); }}); + Buttons.push_back({entry.picture, entry.label, entry.key, nullptr, ui()->mode() == entry.which, [this, which = entry.which]() { choose_edit_mode(which); }}); break; } case work_area::tracks: @@ -156,9 +161,9 @@ void editor_mode::render_viewport_tools() auto const found{std::find_if(modes.begin(), modes.end(), [&](track_mode const &Mode) { return Mode.tab == Tab; })}; if (found == modes.end()) return; - // a tool chosen again gives way to the select one, as in the toolbar + // a tool chosen again gives way to the select one auto const chosen{m_track_tab == Tab && false == (Tab == track_tab::lineside && vehicle)}; - buttons.push_back({Picture, STR_C(found->label), found->key, STR_C(found->tooltip), chosen, [this, Tab, chosen]() { show_track_tab(chosen ? track_tab::path : Tab); }, Group}); + Buttons.push_back({Picture, STR_C(found->label), found->key, STR_C(found->tooltip), chosen, [this, Tab, chosen]() { show_track_tab(chosen ? track_tab::path : Tab); }, Group}); }; add(track_tab::path, icon::select, false); add(track_tab::lay, icon::lay_track, false); @@ -168,7 +173,7 @@ void editor_mode::render_viewport_tools() add(track_tab::turntable, icon::turntable, false); add(track_tab::signals, icon::signal, true); add(track_tab::lineside, icon::objects, false); - buttons.push_back({icon::vehicle, STR_C("Vehicle"), nullptr, STR_C("A vehicle to drive, put on the selected track; it isn't written to the scenery files"), vehicle, [this, vehicle]() { + Buttons.push_back({icon::vehicle, STR_C("Vehicle"), nullptr, STR_C("A vehicle to drive, put on the selected track; it isn't written to the scenery files"), vehicle, [this, vehicle]() { show_track_tab(vehicle ? track_tab::path : track_tab::lineside); m_vehicle.expand = false == vehicle; }}); @@ -176,22 +181,29 @@ void editor_mode::render_viewport_tools() add(track_tab::speed, icon::speed, false); add(track_tab::joints, icon::joints, false); add(track_tab::infra, icon::infra, false); - buttons.push_back({icon::gauge, STR_C("Structure gauge"), nullptr, STR_C("Checks which models enter the structure gauge of the tracks and the clearance over the roads (skrajnia budowli)"), m_gauge.open, + Buttons.push_back({icon::gauge, STR_C("Structure gauge"), nullptr, STR_C("Checks which models enter the structure gauge of the tracks and the clearance over the roads (skrajnia budowli)"), m_gauge.open, [this]() { m_gauge.open = !m_gauge.open; }}); break; } case work_area::roads: { auto &tool{m_roadtool}; - buttons.push_back({icon::select, STR_C("Select"), nullptr, STR_C("LMB: a road piece, a junction, a point where pieces meet, a level crossing or a traffic point"), tool.tool == 0, [this]() { road_choose_tool(0); }}); - buttons.push_back({icon::road, STR_C("Build"), nullptr, STR_C("LMB: start a road, then each next point; on a loose end, the side of a road or a junction it's joined to them"), tool.tool == 1, [this]() { road_choose_tool(1); }}); - buttons.push_back({icon::place, STR_C("Place"), nullptr, STR_C("Level crossings, and the points where vehicles appear on the roads or are taken off them"), tool.tool == 2, [this]() { road_choose_tool(2); }}); - buttons.push_back({icon::lanes, STR_C("Show lanes"), nullptr, STR_C("The lanes of the roads drawn as the paths the vehicles take"), tool.lanes, [&tool]() { tool.lanes = !tool.lanes; }, true}); + Buttons.push_back({icon::select, STR_C("Select"), nullptr, STR_C("LMB: a road piece, a junction, a point where pieces meet, a level crossing or a traffic point"), tool.tool == 0, [this]() { road_choose_tool(0); }}); + Buttons.push_back({icon::road, STR_C("Build"), nullptr, STR_C("LMB: start a road, then each next point; on a loose end, the side of a road or a junction it's joined to them"), tool.tool == 1, [this]() { road_choose_tool(1); }}); + Buttons.push_back({icon::place, STR_C("Place"), nullptr, STR_C("Level crossings, and the points where vehicles appear on the roads or are taken off them"), tool.tool == 2, [this]() { road_choose_tool(2); }}); + if (tool.tool == 2) + { + // what the place tool puts + char const *const kinds[] = {STR_C("Level crossing"), STR_C("Spawn point"), STR_C("Removal point"), STR_C("Pedestrian crossing")}; + for (int index = 0; index < static_cast(std::size(kinds)); ++index) + Buttons.push_back({icon::count, kinds[index], nullptr, nullptr, tool.placekind == index, [&tool, index]() { tool.placekind = index; }, index == 0}); + } + Buttons.push_back({icon::lanes, STR_C("Show lanes"), nullptr, STR_C("The lanes of the roads drawn as the paths the vehicles take"), tool.lanes, [&tool]() { tool.lanes = !tool.lanes; }, true}); break; } case work_area::terrain: { - // what the left button does on the terrain, as in the toolbar + // what the left button does on the terrain auto const choose = [this](bool const Sculpt, bool const Smooth, bool const Chunks) { return [this, Sculpt, Smooth, Chunks]() { m_terrain_sculpt = Sculpt; @@ -199,16 +211,26 @@ void editor_mode::render_viewport_tools() m_chunk_edit = Chunks; }; }; - buttons.push_back({icon::select, STR_C("Select"), nullptr, STR_C("LMB picks the models, as in the surroundings"), false == m_terrain_sculpt && false == m_chunk_edit, choose(false, m_terrain_brush_smooth, false)}); - buttons.push_back({icon::sculpt, STR_C("Sculpt"), nullptr, STR_C("LMB raises the terrain under the brush, Shift+LMB lowers it"), m_terrain_sculpt && false == m_terrain_brush_smooth, choose(true, false, false)}); - buttons.push_back({icon::smooth, STR_C("Smooth"), nullptr, STR_C("LMB evens the terrain out under the brush"), m_terrain_sculpt && m_terrain_brush_smooth, choose(true, true, false)}); - buttons.push_back({icon::chunks, STR_C("Chunks"), nullptr, STR_C("LMB adds a chunk next to the clicked one, Shift+LMB deletes it"), m_chunk_edit, choose(false, m_terrain_brush_smooth, true)}); + Buttons.push_back({icon::select, STR_C("Select"), nullptr, STR_C("LMB picks the models, as in the surroundings"), false == m_terrain_sculpt && false == m_chunk_edit, choose(false, m_terrain_brush_smooth, false)}); + Buttons.push_back({icon::sculpt, STR_C("Sculpt"), nullptr, STR_C("LMB raises the terrain under the brush, Shift+LMB lowers it"), m_terrain_sculpt && false == m_terrain_brush_smooth, choose(true, false, false)}); + Buttons.push_back({icon::smooth, STR_C("Smooth"), nullptr, STR_C("LMB evens the terrain out under the brush"), m_terrain_sculpt && m_terrain_brush_smooth, choose(true, true, false)}); + Buttons.push_back({icon::chunks, STR_C("Chunks"), nullptr, STR_C("LMB adds a chunk next to the clicked one, Shift+LMB deletes it"), m_chunk_edit, choose(false, m_terrain_brush_smooth, true)}); auto const orthophoto{m_orthophoto.enabled()}; - buttons.push_back({icon::orthophoto, STR_C("Orthophoto"), nullptr, STR_C("Aerial imagery of geoportal.gov.pl under the scenery, laid out by the origin of the scenery"), orthophoto, + Buttons.push_back({icon::orthophoto, STR_C("Orthophoto"), nullptr, STR_C("Aerial imagery of geoportal.gov.pl under the scenery, laid out by the origin of the scenery"), orthophoto, [this, orthophoto]() { m_orthophoto.enabled(false == orthophoto); }, true}); + Buttons.push_back({icon::count, STR_C("Orthophoto settings..."), nullptr, nullptr, m_orthophoto_window, [this]() { m_orthophoto_window = !m_orthophoto_window; }}); break; } } +} + +void editor_mode::render_viewport_tools() +{ + // the tools of the field of work which have icons, as in the toolbar + std::vector buttons; + buttons.reserve(24); + work_area_tools(buttons); + std::erase_if(buttons, [](tool_button const &Button) { return Button.picture == icon::count; }); if (buttons.empty()) return; @@ -244,6 +266,122 @@ void editor_mode::render_viewport_tools() ImGui::End(); } +void editor_mode::render_toolbar_caption(char const *Text) +{ + // as wide in both rows, so the buttons of the rows start one under the other. the rows are drawn with no spacing of items + auto const margin{std::round(ImGui::GetFontSize() * 0.75f)}; + auto const width{std::max(ImGui::CalcTextSize(STR_C("Work modes")).x, ImGui::CalcTextSize(STR_C("Tools")).x) + 2.0f * margin}; + auto const position{ImGui::GetWindowPos()}; + auto const height{ImGui::GetWindowHeight()}; + auto *list{ImGui::GetWindowDrawList()}; + auto const text{ImGui::CalcTextSize(Text)}; + list->AddText(ImVec2(position.x + margin, std::round(position.y + (height - text.y) * 0.5f)), ImGui::GetColorU32(ImGuiCol_TextDisabled), Text); + list->AddLine(ImVec2(position.x + width, position.y + height * 0.2f), ImVec2(position.x + width, position.y + height * 0.8f), ImGui::GetColorU32(ImGuiCol_Separator)); + ImGui::SetCursorScreenPos(position); + ImGui::Dummy(ImVec2(width + margin * 0.5f, height)); + ImGui::SameLine(0.0f, 0.0f); +} + +void editor_mode::render_toolbar_tools() +{ + render_toolbar_caption(STR_C("Tools")); + std::vector buttons; + buttons.reserve(24); + work_area_tools(buttons); + if (buttons.empty()) + return; + + auto const s{scale()}; + auto const iconside{editor_icons::size()}; + auto const height{ImGui::GetWindowHeight()}; + auto const margin{3.0f * s}; // over and under the buttons + auto const pad{7.0f * s}; // inside the button, at its ends + auto const spacing{5.0f * s}; // between the icon and the name + auto const gap{3.0f * s}; + auto const groupgap{15.0f * s}; + auto const buttonheight{height - 2.0f * margin}; + auto const left{ImGui::GetCursorScreenPos().x}; + auto const top{ImGui::GetWindowPos().y + margin}; + auto const right{ImGui::GetWindowPos().x + ImGui::GetWindowWidth() - 4.0f * s}; + // the names next to the icons if there's room for them; if there isn't, the name of the chosen tool only, or none + enum class names + { + all, + chosen, + none + }; + auto const named = [](tool_button const &Button, names const Names) { + return Button.picture == icon::count || Names == names::all || (Names == names::chosen && Button.chosen); + }; + auto const width = [&](tool_button const &Button, names const Names) { + if (false == named(Button, Names)) + return std::max(buttonheight, iconside + pad); + auto result{2.0f * pad + ImGui::CalcTextSize(Button.label).x}; + if (Button.picture != icon::count) + result += iconside + spacing; + return result; + }; + auto const total = [&](names const Names) { + auto result{0.0f}; + for (std::size_t index = 0; index < buttons.size(); ++index) + result += width(buttons[index], Names) + (index == 0 ? 0.0f : buttons[index].group ? groupgap : gap); + return result; + }; + auto shown{names::none}; + for (auto const option : {names::all, names::chosen}) + if (left + total(option) <= right) + { + shown = option; + break; + } + + auto *list{ImGui::GetWindowDrawList()}; + auto const rounding{3.0f * s}; + auto x{left}; + for (std::size_t index = 0; index < buttons.size(); ++index) + { + auto const &button{buttons[index]}; + if (index > 0) + { + x += button.group ? groupgap : gap; + if (button.group) + list->AddLine(ImVec2(std::round(x - groupgap * 0.5f), top + buttonheight * 0.15f), ImVec2(std::round(x - groupgap * 0.5f), top + buttonheight * 0.85f), ImGui::GetColorU32(ImGuiCol_Separator)); + } + auto const size{ImVec2(width(button, shown), buttonheight)}; + ImVec2 const position{x, top}; + ImGui::SetCursorScreenPos(position); + ImGui::PushID(static_cast(index)); + auto const clicked{ImGui::InvisibleButton("##tool", size)}; + ImGui::PopID(); + auto const hovered{ImGui::IsItemHovered()}; + ImVec2 const end{position.x + size.x, position.y + size.y}; + // the chosen one stands out as the chosen field of work does, the others as buttons + auto const background{button.chosen ? ImGui::GetColorU32(ImGuiCol_Header) : hovered && button.enabled ? ImGui::GetColorU32(ImGuiCol_HeaderHovered) : ImGui::GetColorU32(ImGuiCol_FrameBg)}; + list->AddRectFilled(position, end, background, rounding); + if (button.chosen) + list->AddRectFilled(ImVec2(position.x, end.y - 2.0f * s), end, ImGui::GetColorU32(ImGuiCol_CheckMark), rounding, ImDrawFlags_RoundCornersBottom); + auto const color{button.enabled ? ImGui::GetColorU32(ImGuiCol_Text, button.chosen || hovered ? 1.0f : 0.85f) : ImGui::GetColorU32(ImGuiCol_TextDisabled)}; + auto const center{position.y + size.y * 0.5f}; + if (named(button, shown)) + { + auto textx{position.x + pad}; + if (button.picture != icon::count) + { + editor_icons::draw(list, button.picture, ImVec2(textx + iconside * 0.5f, center), color); + textx += iconside + spacing; + } + list->AddText(ImVec2(textx, std::round(center - ImGui::GetFontSize() * 0.5f)), color, button.label); + } + else + icon_or_letters(list, button, ImVec2(position.x + size.x * 0.5f, center), color); + if (hovered) + button_tooltip(button); + if (clicked && button.enabled && button.action) + button.action(); + x = end.x; + } +} + void editor_mode::render_viewport_gizmo() { // the gizmo moves the models and the tracks; on the terrain the mouse is the brush's diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index ee203ddae..7a7c4332f 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -19,6 +19,7 @@ http://mozilla.org/MPL/2.0/. #include "utilities/translation.h" #include "imgui/imgui_internal.h" #include "editor/editorSettings.hpp" +#include "editor/editorIcons.hpp" #include #include @@ -602,16 +603,16 @@ void editor_ui::render_() ImGui::End(); ImGui::PopStyleVar(2); } - // toolbar under them: the tools of the field of work - if (ImGui::BeginViewportSideBar("##editortoolbar", viewport, ImGuiDir_Up, ImGui::GetFrameHeight(), flags)) - { - if (ImGui::BeginMenuBar()) - { - if (m_toolbaroptions) - m_toolbaroptions(); - ImGui::EndMenuBar(); - } - } + // toolbar under them: the tools of the field of work, as buttons with their icons, high enough for them. + // the buttons are laid out by hand, the padding is given back for their tooltips + ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f)); + ImGui::PushStyleColor(ImGuiCol_WindowBg, ImGui::GetStyleColorVec4(ImGuiCol_MenuBarBg)); + auto const toolbarheight{std::max(ImGui::GetFrameHeight(), editor_icons::size() + 12.0f * std::max(1.0f, Global.ui_scale))}; + auto const toolbar{ImGui::BeginViewportSideBar("##editortoolbar", viewport, ImGuiDir_Up, toolbarheight, ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoScrollWithMouse)}; + ImGui::PopStyleColor(); + ImGui::PopStyleVar(); + if (toolbar && m_toolbaroptions) + m_toolbaroptions(); ImGui::End(); render_tool_options(); render_inspector(); @@ -1094,4 +1095,4 @@ float editor_ui::rot_val() bool editor_ui::rot_from_last() { return m_functionspanel.rot_from_last; -} \ No newline at end of file +} \ No newline at end of file diff --git a/editor/editorIcons.hpp b/editor/editorIcons.hpp index 3734d4653..91c9a5f3d 100644 --- a/editor/editorIcons.hpp +++ b/editor/editorIcons.hpp @@ -50,6 +50,11 @@ enum class icon infra, gauge, turntable, + // the fields of work + work_surroundings, + work_tracks, + work_roads, + work_terrain, count }; diff --git a/editor/icons/editor_icons.png b/editor/icons/editor_icons.png index 80b7013b1d6941acdfa1e00a8bac910d91eb69ee..50878092d771399b35673dff962b91e6b053b04e 100644 GIT binary patch delta 47669 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 delay parameter table (apply/release for passenger and freight). -typedef double TBrakeDelayTable[4]; +using TBrakeDelayTable = double[4]; /// One row of the brake pressure / pipe pressure / flow-speed table for a brake handle position. struct TBrakePressure @@ -780,7 +780,7 @@ struct TBrakePressure }; /// Brake pressure table indexed by handle position. -typedef std::map TBrakePressureTable; +using TBrakePressureTable = std::map; /// Engine / drive type. enum class TEngineType @@ -989,11 +989,11 @@ struct TTransducer struct TPowerParameters { /// Maximum source voltage [V]. - double MaxVoltage; + double MaxVoltage{0.0}; /// Maximum source current [A]. - double MaxCurrent; + double MaxCurrent{0.0}; /// Internal resistance [Ω]. - double IntR; + double IntR{0.001}; /// Type of source (selects which union member is meaningful). TPowerSource SourceType; union @@ -1028,10 +1028,7 @@ struct TPowerParameters }; }; inline TPowerParameters() - { - MaxVoltage = 0.0; - MaxCurrent = 0.0; - IntR = 0.001; + { SourceType = TPowerSource::NotDefined; PowerType = TPowerType::NoPower; RPowerCable.PowerTrans = TPowerType::NoPower; @@ -1048,7 +1045,7 @@ struct TScheme bool AutoSwitch = false; /*czy dana pozycja nastawniana jest recznie czy autom.*/ int ScndAct = 0; /*jesli ma bocznik w nastawniku, to ktory bocznik na ktorej pozycji*/ }; -typedef TScheme TSchemeTable[ResArraySize + 1]; /*tablica rezystorow rozr.*/ +using TSchemeTable = TScheme[ResArraySize + 1]; /*tablica rezystorow rozr.*/ struct TDEScheme { double RPM = 0.0; /*obroty diesla*/ @@ -1056,13 +1053,13 @@ struct TDEScheme double Umax = 0.0; /*napiecie maksymalne*/ double Imax = 0.0; /*prad maksymalny*/ }; -typedef TDEScheme TDESchemeTable[33]; /*tablica WWList dla silnikow spalinowych*/ +using TDESchemeTable = TDEScheme[33]; /*tablica WWList dla silnikow spalinowych*/ struct TFFScheme { double v = 0.0; // parametr wejsciowy double freq = 0.0; // wyjscie: czestotliwosc falownika }; -typedef TFFScheme TFFSchemeTable[33]; +using TFFSchemeTable = TFFScheme[33]; struct TWiperScheme { @@ -1071,7 +1068,7 @@ struct TWiperScheme double interval = 0.0; // interwal pracy wycieraczki double outBackDelay = 0.0; // czas po jakim wycieraczka zacznie wracac z konca do poczatku }; -typedef TWiperScheme TWiperSchemeTable[16]; +using TWiperSchemeTable = TWiperScheme[16]; struct TShuntScheme { @@ -1080,33 +1077,23 @@ struct TShuntScheme double Pmin = 0.0; double Pmax = 0.0; }; -typedef TShuntScheme TShuntSchemeTable[33]; +using TShuntSchemeTable = TShuntScheme[33]; struct TMPTRelay { /*lista przekaznikow bocznikowania*/ double Iup = 0.0; double Idown = 0.0; }; -typedef TMPTRelay TMPTRelayTable[MotorParametersArraySize + 1]; // indexed like MotorParam +using TMPTRelayTable = TMPTRelay[MotorParametersArraySize + 1]; // indexed like MotorParam struct TMotorParameters { - double mfi; - double mIsat; - double mfi0; // aproksymacja M(I) silnika} {dla dizla mIsat=przekladnia biegu - double fi; - double Isat; - double fi0; // aproksymacja E(n)=fi*n} {dla dizla fi, mfi: predkosci przelozenia biegu <-> - bool AutoSwitch; - TMotorParameters() - { - mfi = 0.0; - mIsat = 0.0; - mfi0 = 0.0; - fi = 0.0; - Isat = 0.0; - fi0 = 0.0; - AutoSwitch = false; - } + double mfi{0.0}; + double mIsat{0.0}; + double mfi0{0.0}; // aproksymacja M(I) silnika} {dla dizla mIsat=przekladnia biegu + double fi{0.0}; + double Isat{0.0}; + double fi0{0.0}; // aproksymacja E(n)=fi*n} {dla dizla fi, mfi: predkosci przelozenia biegu <-> + bool AutoSwitch{false}; }; struct TUniversalCtrl @@ -1240,7 +1227,7 @@ struct TCoupling { return adapter_type != TCouplerType::NoCoupler; } - inline TCouplerType const type() const + inline TCouplerType type() const { return adapter_type == TCouplerType::NoCoupler ? CouplerType : adapter_type; } @@ -1465,7 +1452,8 @@ class TMoverParameters { float temp_min{-1}; // lowest accepted temperature float temp_max{-1}; // highest accepted temperature - } config; + }; + heater_config_t config; // ld inputs bool breaker{false}; // device is allowed to operate bool is_enabled{false}; // device is requested to operate @@ -1500,12 +1488,17 @@ class TMoverParameters float temp_cooling{-1}; // active cooling activation point float temp_flow{-1}; // fluid flow activation point bool shutters{false}; // the radiator has shutters to assist the cooling - } config; + }; + circuit_config_t config; bool is_cold{false}; // fluid is too cold bool is_warm{false}; // fluid is too hot bool is_hot{false}; // fluid temperature crossed cooling threshold bool is_flowing{false}; // fluid is being pushed through the circuit - } water, water_aux, oil, engine; + }; + fluid_circuit_t water; + fluid_circuit_t water_aux; + fluid_circuit_t oil; + fluid_circuit_t engine; // output, state of affected devices bool PA{false}; // malfunction flag float rpmw{0.0}; // current main circuit fan revolutions @@ -1889,9 +1882,9 @@ class TMoverParameters double MED_Vmin = 0; // predkosc minimalna dla obliczen chwilowej sily hamowania EP w MED double MED_Vref = 0; // predkosc referencyjna dla obliczen dostepnej sily hamowania EP w MED double MED_amax{9.81}; // maksymalne opoznienie hamowania sluzbowego MED - bool MED_EPVC = 0; // czy korekcja sily hamowania EP, gdy nie ma dostepnego ED + bool MED_EPVC = false; // czy korekcja sily hamowania EP, gdy nie ma dostepnego ED double MED_EPVC_Time = 7; // czas korekcji sily hamowania EP, gdy nie ma dostepnego ED - bool MED_Ncor = 0; // czy korekcja sily hamowania z uwzglednieniem nacisku + bool MED_Ncor = false; // czy korekcja sily hamowania z uwzglednieniem nacisku double MED_MinBrakeReqED = 0; // minimalne zadanie sily hamowania uruchamiajace ED - ponizej tylko EP double MED_FrED_factor = 1; // mnoznik sily hamowania ED do korekty blendingu double MED_ED_Delay1 = 0; // opoznienie wdrazania hamowania ED (pierwszy raz) @@ -2099,7 +2092,7 @@ class TMoverParameters int CabActive = 0; // numer kabiny, z której jest sterowanie: 1 lub -1; w przeciwnym razie brak sterowania - rozrzad int CabOccupied = 0; // numer kabiny, w ktorej jest obsada (zwykle jedna na skład) // TODO: move to TController bool CabMaster = false; // czy pojazd jest nadrzędny w składzie - inline bool IsCabMaster() + inline bool IsCabMaster() const { return CabActive == CabOccupied && CabMaster; } // czy aktualna kabina jest na pewno tą, z której można sterować @@ -2294,8 +2287,7 @@ class TMoverParameters bool AIHintPantUpIfIdle{true}; // whether raise both pantographs if idling for a while double AIHintLocalBrakeAccFactor{1.05}; // suggested acceleration weight for local brake operation - public: - TMoverParameters(double VelInitial, std::string TypeNameInit, std::string NameInit, int Cab); + TMoverParameters(double VelInitial, std::string const &TypeNameInit, std::string const &NameInit, int Cab); // obsługa sprzęgów static double CouplerDist(TMoverParameters const *Left, TMoverParameters const *Right); static double Distance(const TLocation &Loc1, const TLocation &Loc2, const TDimension &Dim1, const TDimension &Dim2); @@ -2307,7 +2299,7 @@ class TMoverParameters bool DirectionForward(); bool DirectionBackward(void); /*! kierunek ruchu*/ bool EIMDirectionChangeAllow(void) const; - inline double IsVehicleEIMBrakingFactor() + inline double IsVehicleEIMBrakingFactor() const { return DynamicBrakeFlag && ResistorsFlag ? 0.0 : eimv[eimv_Ipoj] < 0 ? -1.0 : 1.0; } @@ -2319,32 +2311,32 @@ class TMoverParameters bool CurrentSwitch(bool const State); bool IsMotorOverloadRelayHighThresholdOn() const; void UpdateBatteryVoltage(double dt); - double ComputeMovement(double dt, double dt1, const TTrackShape &Shape, TTrackParam &Track, TTractionParam &ElectricTraction, TLocation const &NewLoc, + double ComputeMovement(double dt, double dt1, const TTrackShape &Shape, TTrackParam const &Track, TTractionParam const &ElectricTraction, TLocation const &NewLoc, TRotation const &NewRot); // oblicza przesuniecie pojazdu double FastComputeMovement(double dt, const TTrackShape &Shape, TTrackParam &Track, TLocation const &NewLoc, TRotation const &NewRot); // oblicza przesuniecie pojazdu - wersja zoptymalizowana void compute_movement_(double const Deltatime); - double ShowEngineRotation(int VehN); + double ShowEngineRotation(int VehN) const; // Q ******************************************************************************************* double GetTrainsetVoltage(int const Coupling = coupling::heating | coupling::highvoltage) const; double GetTrainsetHighVoltage() const; bool switch_physics(bool const State); - double LocalBrakeRatio(void); - double ManualBrakeRatio(void); - double PipeRatio(void); /*ile napelniac*/ - double RealPipeRatio(void); /*jak szybko*/ + double LocalBrakeRatio(void) const; + double ManualBrakeRatio(void) const; + double PipeRatio(void) const; /*ile napelniac*/ + double RealPipeRatio(void) const; /*jak szybko*/ double BrakeVP(void) const; double EngineRPMRatio() const; // returns current engine revolutions as percentage of max engine revolutions, in range 0-1 double EngineIdleRPM() const; double EngineMaxRPM() const; /*! przesylanie komend sterujacych*/ - bool SendCtrlToNext(std::string const CtrlCommand, double const ctrlvalue, double const dir, int const Couplertype = coupling::control); - bool SetInternalCommand(std::string NewCommand, double NewValue1, double NewValue2, int const Couplertype = coupling::control); - double GetExternalCommand(std::string &Command); - bool RunCommand(std::string Command, double CValue1, double CValue2, int const Couplertype = coupling::control); + bool SendCtrlToNext(std::string const &CtrlCommand, double const ctrlvalue, double const dir, int const Couplertype = coupling::control); + bool SetInternalCommand(std::string const &NewCommand, double NewValue1, double NewValue2, int const Couplertype = coupling::control); + double GetExternalCommand(std::string &Command) const; + bool RunCommand(std::string const &Command, double CValue1, double CValue2, int const Couplertype = coupling::control); bool RunInternalCommand(); - void PutCommand(std::string NewCommand, double NewValue1, double NewValue2, const TLocation &NewLocation); + void PutCommand(std::string const &NewCommand, double NewValue1, double NewValue2, const TLocation &NewLocation); bool CabActivisation(bool const Enforce = false); bool CabDeactivisation(bool const Enforce = false); bool CabActivisationAuto(bool const Enforce = false); @@ -2363,7 +2355,7 @@ class TMoverParameters /*! pomocniczy nastawnik:*/ bool IncScndCtrl(int CtrlSpeed); bool DecScndCtrl(int CtrlSpeed); - int GetVirtualScndPos(); + int GetVirtualScndPos() const; bool IsScndCtrlNoPowerPos() const; bool IsScndCtrlMaxPowerPos() const; @@ -2430,7 +2422,7 @@ class TMoverParameters double TractionForce(double dt); double FrictionForce() const; double BrakeForceR(double ratio, double velocity); - double BrakeForceP(double press, double velocity); + double BrakeForceP(double press, double velocity) const; double BrakeForce(const TTrackParam &Track); double CouplerForce(int const End, double dt); void CollisionDetect(int const End, double const dt); @@ -2488,8 +2480,8 @@ class TMoverParameters /*funkcje uzalezniajace sile pociagowa od predkosci: v2n, n2r, current, momentum*/ double v2n(void); double Current(double n, double U); - double Momentum(double I); - double MomentumF(double I, double Iw, int SCP); + double Momentum(double I) const; + double MomentumF(double I, double Iw, int SCP) const; bool CutOffEngine(void); // odlaczenie udszkodzonych silnikow /*funkcje automatycznego rozruchu np EN57*/ @@ -2526,7 +2518,7 @@ class TMoverParameters /* funckje dla wagonow*/ bool AssignLoad(std::string const &Name, float const Amount = 0.f); - bool LoadingDone(double LSpeed, std::string const &Loadname); + bool LoadingDone(double LSpeed, std::string_view Loadname); bool PermitDoors(side const Door, bool const State = true, range_t const Notify = range_t::consist); void PermitDoors_(side const Door, bool const State = true); bool ChangeDoorPermitPreset(int const Change, range_t const Notify = range_t::consist); @@ -2541,7 +2533,7 @@ class TMoverParameters bool ChangeOffsetH(double DeltaOffset); /*funkcje ladujace pliki opisujace pojazd*/ - bool LoadFIZ(std::string chkpath); // Q 20160717 bool LoadChkFile(std::string chkpath); + bool LoadFIZ(std::string const &chkpath); // Q 20160717 bool LoadChkFile(std::string chkpath); bool CheckLocomotiveParameters(bool ReadyFlag, int Dir); std::string EngineDescription(int what) const; @@ -2577,10 +2569,10 @@ class TMoverParameters void LoadFIZ_LightsList(std::string const &Input); void LoadFIZ_DimmerList(std::string const &Input); void LoadFIZ_CompressorList(std::string const &Input); - void LoadFIZ_PowerParamsDecode(TPowerParameters &Powerparameters, std::string const Prefix, std::string const &Input); - TPowerType LoadFIZ_PowerDecode(std::string const &Power); - TPowerSource LoadFIZ_SourceDecode(std::string const &Source); - TEngineType LoadFIZ_EngineDecode(std::string const &Engine); + void LoadFIZ_PowerParamsDecode(TPowerParameters &Powerparameters, std::string const &Prefix, std::string const &Input); + TPowerType LoadFIZ_PowerDecode(std::string const &Power) const; + TPowerSource LoadFIZ_SourceDecode(std::string const &Source) const; + TEngineType LoadFIZ_EngineDecode(std::string const &Engine) const; bool readMPT0(std::string const &line); bool readMPT(std::string const &line); // Q 20160717 bool readMPTElectricSeries(std::string const &line); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index ff60c27cb..16fe30667 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -256,7 +256,7 @@ void TSecuritySystem::load(std::string const &line, double Vmax) double TableInterpolation(std::map &Map, double Parameter) { - if (Map.size() == 0) + if (Map.empty()) return 0.0; if (Map.size() == 1) return Map.begin()->second; @@ -289,8 +289,11 @@ double TMoverParameters::Current(double n, double U) // a takze wywala bezpiecznik nadmiarowy gdy za duzy prad lub za male napiecie // jest takze mozliwosc uszkodzenia silnika wskutek nietypowych parametrow - double R, MotorCurrent; - double Rz, Delta, Isf; + double R; + double MotorCurrent; + double Rz; + double Delta; + double Isf; double Mn; // przujmuje int, ale dla poprawnosci obliczeń double Bn; int SP = 0; @@ -347,7 +350,6 @@ double TMoverParameters::Current(double n, double U) Mn = RList[MainCtrlActualPos].Mn * RList[MainCtrlActualPos].Bn; if (RList[MainCtrlActualPos].Bn > 1) { - Bn = 1; R = CircuitRes; } } @@ -429,7 +431,6 @@ double TMoverParameters::Current(double n, double U) if (DynamicBrakeType == dbrake_switch && (BrakePress > 2.0 || PipePress < 3.6)) { Im = 0; - MotorCurrent = 0; // Im:=0; Itot = 0; } @@ -443,17 +444,13 @@ double TMoverParameters::Current(double n, double U) if (MotorCurrent > 0) { - if (FuzzyLogic(abs(n), nmax * 1.1, p_elengproblem)) - if (MainSwitch(false)) - EventFlag = true; /*zbyt duze obroty - wywalanie wskutek ognia okreznego*/ - if (TestFlag(DamageFlag, dtrain_engine)) - if (FuzzyLogic(MotorCurrent, (double)ImaxLo / 10.0, p_elengproblem)) - if (MainSwitch(false)) - EventFlag = true; /*uszkodzony silnik (uplywy)*/ - if (FuzzyLogic(abs(Im), Imax * 2, p_elengproblem) || FuzzyLogic(abs(n), nmax * 1.11, p_elengproblem)) - /* or FuzzyLogic(Abs(U/Mn),2*NominalVoltage,1)) then */ /*poprawic potem*/ - if (SetFlag(DamageFlag, dtrain_engine)) - EventFlag = true; + if (FuzzyLogic(abs(n), nmax * 1.1, p_elengproblem) && MainSwitch(false)) + EventFlag = true; /*zbyt duze obroty - wywalanie wskutek ognia okreznego*/ + if (TestFlag(DamageFlag, dtrain_engine) && FuzzyLogic(MotorCurrent, (double)ImaxLo / 10.0, p_elengproblem) && MainSwitch(false)) + EventFlag = true; /*uszkodzony silnik (uplywy)*/ + /* or FuzzyLogic(Abs(U/Mn),2*NominalVoltage,1)) then */ /*poprawic potem*/ + if ((FuzzyLogic(abs(Im), Imax * 2, p_elengproblem) || FuzzyLogic(abs(n), nmax * 1.11, p_elengproblem)) && SetFlag(DamageFlag, dtrain_engine)) + EventFlag = true; /*! dorobic grzanie oporow rozruchowych i silnika*/ } @@ -463,36 +460,37 @@ double TMoverParameters::Current(double n, double U) // ************************************************************************************************* // główny konstruktor // ************************************************************************************************* -TMoverParameters::TMoverParameters(double VelInitial, std::string TypeNameInit, std::string NameInit, int Cab) : TypeName(TypeNameInit), Name(NameInit), CabOccupied(Cab) +TMoverParameters::TMoverParameters(double VelInitial, std::string const &TypeNameInit, std::string const &NameInit, int Cab) : TypeName(TypeNameInit), Name(NameInit), CabOccupied(Cab) { WriteLog("------------------------------------------------------"); WriteLog("init default physic values for " + NameInit + ", [" + TypeNameInit + "]"); - Dim = TDimension(); // BrakeLevelSet(-2); //Pascal ustawia na 0, przestawimy na odcięcie (CHK jest jeszcze nie wczytane!) iLights[0] = 0; iLights[1] = 0; // światła zgaszone // inicjalizacja stalych - for (int b = 0; b < ResArraySize + 1; ++b) + for (auto &scheme : RList) { - RList[b] = TScheme(); + scheme = TScheme(); } RlistSize = 0; - for (int b = 0; b < MotorParametersArraySize + 1; ++b) + for (auto &motorparam : MotorParam) { - MotorParam[b] = TMotorParameters(); + motorparam = TMotorParameters(); } - for (int b = 0; b < 2; ++b) + for (auto &cablights : Lights) for (int k = 0; k < 17; ++k) - Lights[b][k] = 0; + cablights[k] = 0; - for (int b = 0; b < 4; ++b) + for (auto &compressorrow : CompressorList) for (int k = 1; k < 9; ++k) - CompressorList[b][k] = 0; + compressorrow[k] = 0; CompressorList[0][0] = 0.0; - CompressorList[1][0] = CompressorList[2][0] = CompressorList[3][0] = 1.0; + CompressorList[1][0] = 1.0; + CompressorList[2][0] = 1.0; + CompressorList[3][0] = 1.0; for (int b = -1; b <= MainBrakeMaxPos; ++b) { @@ -506,9 +504,9 @@ TMoverParameters::TMoverParameters(double VelInitial, std::string TypeNameInit, BrakePressureTable[-2].BrakePressureVal = -1.0; BrakePressureTable[-2].FlowSpeedVal = 0.0; } - for (int b = 0; b < 4; ++b) + for (auto &delay : BrakeDelay) { - BrakeDelay[b] = 0.0; + delay = 0.0; } for (int b = 0; b < 2; ++b) // Ra: kto tu zrobił "for b:=1 to 2 do" ??? @@ -521,40 +519,40 @@ TMoverParameters::TMoverParameters(double VelInitial, std::string TypeNameInit, Couplers[b].DmaxC = 0.1; Couplers[b].FmaxC = 1000.0; } - for (int b = 0; b < 3; ++b) + for (auto &cylindermult : BrakeCylMult) { - BrakeCylMult[b] = 0.0; + cylindermult = 0.0; } - for (int b = 0; b < 26; ++b) + for (auto &eimcvalue : eimc) { - eimc[b] = 0.0; + eimcvalue = 0.0; } eimc[eimc_p_eped] = 1.5; - for (int b = 0; b < 2; ++b) + for (auto &couplerentry : Couplers) { - Couplers[b].AllowedFlag = 3; // domyślnie hak i hamulec, inne trzeba włączyć jawnie w FIZ - Couplers[b].CouplingFlag = 0; - Couplers[b].Connected = nullptr; - Couplers[b].ConnectedNr = 0; // Ra: to nie ma znaczenia jak nie podłączony - Couplers[b].Render = false; - Couplers[b].CForce = 0.0; - Couplers[b].Dist = 0.0; - Couplers[b].CheckCollision = false; + couplerentry.AllowedFlag = 3; // domyślnie hak i hamulec, inne trzeba włączyć jawnie w FIZ + couplerentry.CouplingFlag = 0; + couplerentry.Connected = nullptr; + couplerentry.ConnectedNr = 0; // Ra: to nie ma znaczenia jak nie podłączony + couplerentry.Render = false; + couplerentry.CForce = 0.0; + couplerentry.Dist = 0.0; + couplerentry.CheckCollision = false; } - for (int b = 0; b < 5; ++b) + for (auto &brakepress : MaxBrakePress) { - MaxBrakePress[b] = 0.0; + brakepress = 0.0; } Vel = abs(VelInitial); V = VelInitial / 3.6; - for (int b = 0; b < 21; b++) + for (auto &eimvvalue : eimv) { - eimv[b] = 0.0; + eimvvalue = 0.0; } RunningShape.Len = 1.0; @@ -592,30 +590,29 @@ bool TMoverParameters::Attach(int ConnectNo, int ConnectToNr, TMoverParameters * return false; } - auto &coupler{Couplers[ConnectNo]}; - auto &othercoupler = ConnectTo->Couplers[(ConnectToNr != 2 ? ConnectToNr : coupler.ConnectedNr)]; - auto const distance{CouplerDist(this, ConnectTo) - (coupler.adapter_length + othercoupler.adapter_length)}; + auto &thiscoupler{Couplers[ConnectNo]}; + auto &othercoupler = ConnectTo->Couplers[ConnectToNr != 2 ? ConnectToNr : thiscoupler.ConnectedNr]; + auto const distance{CouplerDist(this, ConnectTo) - (thiscoupler.adapter_length + othercoupler.adapter_length)}; - auto const couplercheck{Enforce || (distance <= dEpsilon && coupler.type() != TCouplerType::NoCoupler && coupler.type() == othercoupler.type())}; - if (false == couplercheck) + if (auto const couplercheck{Enforce || (distance <= dEpsilon && thiscoupler.type() != TCouplerType::NoCoupler && thiscoupler.type() == othercoupler.type())}; false == couplercheck) { return false; } // stykaja sie zderzaki i kompatybilne typy sprzegow, chyba że łączenie na starcie - if (coupler.CouplingFlag == coupling::faux) + if (thiscoupler.CouplingFlag == coupling::faux) { // jeśli wcześniej nie było połączone, ustalenie z której strony rysować sprzęg - coupler.Render = true; // tego rysować + thiscoupler.Render = true; // tego rysować othercoupler.Render = false; // a tego nie - }; - auto const couplingchange{CouplingType ^ coupler.CouplingFlag}; - coupler.Connected = ConnectTo; - coupler.CouplingFlag = CouplingType; // ustawienie typu sprzęgu + } + auto const couplingchange{CouplingType ^ thiscoupler.CouplingFlag}; + thiscoupler.Connected = ConnectTo; + thiscoupler.CouplingFlag = CouplingType; // ustawienie typu sprzęgu if (ConnectToNr != 2) { - coupler.ConnectedNr = ConnectToNr; // 2=nic nie podłączone + thiscoupler.ConnectedNr = ConnectToNr; // 2=nic nie podłączone } othercoupler.Connected = this; othercoupler.CouplingFlag = CouplingType; @@ -628,14 +625,14 @@ bool TMoverParameters::Attach(int ConnectNo, int ConnectToNr, TMoverParameters * std::vector> const soundmappings = {{coupling::coupler, sound::attachcoupler}, {coupling::brakehose, sound::attachbrakehose}, {coupling::mainhose, sound::attachmainhose}, {coupling::control, sound::attachcontrol}, {coupling::gangway, sound::attachgangway}, {coupling::heating, sound::attachheating}}; - for (auto const &soundmapping : soundmappings) + for (auto const &[mappingcoupling, mappingsound] : soundmappings) { - if ((couplingchange & soundmapping.first) != 0) + if ((couplingchange & mappingcoupling) != 0) { - soundflag |= soundmapping.second; + soundflag |= mappingsound; } } - SetFlag(coupler.sounds, soundflag); + SetFlag(thiscoupler.sounds, soundflag); } return true; @@ -659,44 +656,44 @@ int TMoverParameters::DettachStatus(int ConnectNo) bool TMoverParameters::Dettach(int ConnectNo) { // rozlaczanie - auto &coupler{Couplers[ConnectNo]}; - auto &othervehicle{coupler.Connected}; - auto &othercoupler{othervehicle->Couplers[coupler.ConnectedNr]}; + auto &thiscoupler{Couplers[ConnectNo]}; + auto &othervehicle{thiscoupler.Connected}; + auto &othercoupler{othervehicle->Couplers[thiscoupler.ConnectedNr]}; if (othervehicle == nullptr) { return true; } // nie ma nic, to odczepiono - auto couplingchange{coupler.CouplingFlag}; // presume we'll uncouple all active flags + auto couplingchange{thiscoupler.CouplingFlag}; // presume we'll uncouple all active flags auto const couplingstate{DettachStatus(ConnectNo)}; // stan sprzęgu if (couplingstate < 0) { // gdy scisniete zderzaki, chyba ze zerwany sprzeg (wirtualnego nie odpinamy z drugiej strony) - std::tie(coupler.Connected, coupler.ConnectedNr, coupler.CouplingFlag) = std::tie(othercoupler.Connected, othercoupler.ConnectedNr, othercoupler.CouplingFlag) = - std::make_tuple(nullptr, -1, coupling::faux); + std::tie(othercoupler.Connected, othercoupler.ConnectedNr, othercoupler.CouplingFlag) = std::make_tuple(nullptr, -1, coupling::faux); + std::tie(thiscoupler.Connected, thiscoupler.ConnectedNr, thiscoupler.CouplingFlag) = std::make_tuple(nullptr, -1, coupling::faux); } else if (couplingstate > 0) { // odłączamy węże i resztę, pozostaje sprzęg fizyczny, który wymaga dociśnięcia (z wirtualnym nic) - coupler.CouplingFlag &= coupling::coupler; + thiscoupler.CouplingFlag &= coupling::coupler; othercoupler.CouplingFlag &= coupling::coupler; } // set sound event flag - couplingchange ^= coupler.CouplingFlag; // remaining bits were removed from coupling + couplingchange ^= thiscoupler.CouplingFlag; // remaining bits were removed from coupling if (couplingchange != 0) { int soundflag{sound::detach}; // HACK: use detach flag to indicate removal of listed coupling std::vector> const soundmappings = {{coupling::coupler, sound::attachcoupler}, {coupling::brakehose, sound::attachbrakehose}, {coupling::mainhose, sound::attachmainhose}, {coupling::control, sound::attachcontrol}, {coupling::gangway, sound::attachgangway}, {coupling::heating, sound::attachheating}}; - for (auto const &soundmapping : soundmappings) + for (auto const &[mappingcoupling, mappingsound] : soundmappings) { - if ((couplingchange & soundmapping.first) != 0) + if ((couplingchange & mappingcoupling) != 0) { - soundflag |= soundmapping.second; + soundflag |= mappingsound; } } - SetFlag(coupler.sounds, soundflag); + SetFlag(thiscoupler.sounds, soundflag); } return couplingstate < 0; @@ -735,7 +732,7 @@ void TMoverParameters::BrakeLevelSet(double b) fBrakeCtrlPos = Handle->GetPos(bh_MAX); // TODO: verify whether BrakeCtrlPosR and fBrakeCtrlPos can be rolled into single variable BrakeCtrlPosR = fBrakeCtrlPos; - int x = static_cast(std::floor(fBrakeCtrlPos)); // jeśli odwołujemy się do BrakeCtrlPos w pośrednich, to musi być + auto x = static_cast(std::floor(fBrakeCtrlPos)); // jeśli odwołujemy się do BrakeCtrlPos w pośrednich, to musi być // obcięte a nie zaokrągone while (x > BrakeCtrlPos && BrakeCtrlPos < BrakeCtrlPosNo) // jeśli zwiększyło się o 1 if (!IncBrakeLevelOld()) // T_MoverParameters:: @@ -936,8 +933,11 @@ void TMoverParameters::UpdatePantVolume(double dt) void TMoverParameters::UpdateBatteryVoltage(double dt) { // przeliczenie obciążenia baterii - double sn1 = 0.0, sn2 = 0.0, sn3 = 0.0, sn4 = 0.0, - sn5 = 0.0; // Ra: zrobić z tego amperomierz NN + double sn1 = 0.0; + double sn2 = 0.0; + double sn3 = 0.0; + double sn4 = 0.0; + double sn5 = 0.0; // Ra: zrobić z tego amperomierz NN if (BatteryVoltage > 0 && EngineType != TEngineType::DieselEngine && EngineType != TEngineType::WheelsDriven && NominalBatteryVoltage > 0) { @@ -968,7 +968,7 @@ void TMoverParameters::UpdateBatteryVoltage(double dt) sn5 = dt * 0.001; else sn5 = 0; - }; + } if (NominalBatteryVoltage / BatteryVoltage >= 1.22 && Battery) { // 90V if (PantCompFlag) @@ -991,7 +991,7 @@ void TMoverParameters::UpdateBatteryVoltage(double dt) sn5 = dt * 0.0010; else sn5 = 0; - }; + } if (!Battery) { if (NominalBatteryVoltage / BatteryVoltage < 1.22) @@ -1002,11 +1002,10 @@ void TMoverParameters::UpdateBatteryVoltage(double dt) sn3 = dt * 0.000001; sn4 = dt * 0.000001; sn5 = dt * 0.000001; // bardzo powolny spadek przy wyłączonych bateriach - }; + } BatteryVoltage -= sn1 + sn2 + sn3 + sn4 + sn5; - if (NominalBatteryVoltage / BatteryVoltage > 1.57) - if (MainSwitch(false) && EngineType != TEngineType::DieselEngine && EngineType != TEngineType::WheelsDriven) - EventFlag = true; // wywalanie szybkiego z powodu zbyt niskiego napiecia + if (NominalBatteryVoltage / BatteryVoltage > 1.57 && MainSwitch(false) && EngineType != TEngineType::DieselEngine && EngineType != TEngineType::WheelsDriven) + EventFlag = true; // wywalanie szybkiego z powodu zbyt niskiego napiecia if (BatteryVoltage > NominalBatteryVoltage) BatteryVoltage = NominalBatteryVoltage; // wstrzymanie ładowania pow. 110V if (BatteryVoltage < 0.01) @@ -1062,7 +1061,7 @@ ZN //masa // Q: 20160714 // Oblicza iloraz aktualnej pozycji do maksymalnej hamulca pomocnicznego // ***************************************************************************** -double TMoverParameters::LocalBrakeRatio(void) +double TMoverParameters::LocalBrakeRatio(void) const { double LBR; if (BrakeHandle == TBrakeHandle::MHZ_EN57) @@ -1086,7 +1085,7 @@ double TMoverParameters::LocalBrakeRatio(void) // Q: 20160714 // Oblicza iloraz aktualnej pozycji do maksymalnej hamulca ręcznego // ***************************************************************************** -double TMoverParameters::ManualBrakeRatio(void) +double TMoverParameters::ManualBrakeRatio(void) const { double MBR; @@ -1113,7 +1112,7 @@ double TMoverParameters::BrakeVP(void) const // Q: 20160713 // Zwraca iloraz różnicy między przewodem kontrolnym i głównym oraz DeltaPipePress // ***************************************************************************** -double TMoverParameters::RealPipeRatio(void) +double TMoverParameters::RealPipeRatio(void) const { double rpp; @@ -1128,7 +1127,7 @@ double TMoverParameters::RealPipeRatio(void) // Q: 20160713 // Zwraca iloraz ciśnienia w przewodzie do DeltaPipePress // ***************************************************************************** -double TMoverParameters::PipeRatio(void) +double TMoverParameters::PipeRatio(void) const { double pr; @@ -1188,27 +1187,27 @@ void TMoverParameters::CollisionDetect(int const End, double const dt) return; } // shouldn't normally happen but, eh - auto &coupler{Couplers[End]}; + auto const &thiscoupler{Couplers[End]}; auto *othervehicle{Neighbours[End].vehicle->MoverParameters}; auto const otherend{Neighbours[End].vehicle_end}; - auto &othercoupler{othervehicle->Couplers[otherend]}; + auto const &othercoupler{othervehicle->Couplers[otherend]}; auto velocity{V}; auto othervehiclevelocity{othervehicle->V}; // calculate collision force and new velocities for involved vehicles - auto const VirtualCoupling{(coupler.CouplingFlag == coupling::faux)}; + auto const VirtualCoupling{(thiscoupler.CouplingFlag == coupling::faux)}; auto CCF{0.0}; switch (End) { case 0: { - CCF = ComputeCollision(velocity, othervehiclevelocity, TotalMass, othervehicle->TotalMass, (coupler.beta + othercoupler.beta) / 2.0, VirtualCoupling) / dt; + CCF = ComputeCollision(velocity, othervehiclevelocity, TotalMass, othervehicle->TotalMass, (thiscoupler.beta + othercoupler.beta) / 2.0, VirtualCoupling) / dt; break; // yB: ej ej ej, a po } case 1: { - CCF = ComputeCollision(othervehiclevelocity, velocity, othervehicle->TotalMass, TotalMass, (coupler.beta + othercoupler.beta) / 2.0, VirtualCoupling) / dt; + CCF = ComputeCollision(othervehiclevelocity, velocity, othervehicle->TotalMass, TotalMass, (thiscoupler.beta + othercoupler.beta) / 2.0, VirtualCoupling) / dt; break; } default: @@ -1219,13 +1218,13 @@ void TMoverParameters::CollisionDetect(int const End, double const dt) if (Global.crash_damage) { - if (-coupler.Dist >= coupler.DmaxB && FuzzyLogic(std::abs(CCF), 5.0 * (coupler.FmaxC + 1.0), p_coupldmg)) + if (-thiscoupler.Dist >= thiscoupler.DmaxB && FuzzyLogic(std::abs(CCF), 5.0 * (thiscoupler.FmaxC + 1.0), p_coupldmg)) { // small chance to smash the coupler if it's hit with excessive force damage_coupler(End); } - if (coupler.CouplingFlag == coupling::faux || true == TestFlag(othervehicle->DamageFlag, dtrain_out)) + if (thiscoupler.CouplingFlag == coupling::faux || true == TestFlag(othervehicle->DamageFlag, dtrain_out)) { // HACK: limit excessive speed derailment checks to vehicles which aren't part of the same consist auto const safevelocitylimit{15.0}; auto const velocitydifference{glm::length(glm::angleAxis(Rot.Rz, glm::dvec3{0, 1, 0}) * V - glm::angleAxis(othervehicle->Rot.Rz, glm::dvec3{0, 1, 0}) * othervehicle->V) * @@ -1276,9 +1275,9 @@ void TMoverParameters::CollisionDetect(int const End, double const dt) void TMoverParameters::damage_coupler(int const End) { - auto &coupler{Couplers[End]}; + auto &thiscoupler{Couplers[End]}; - if (coupler.type() == TCouplerType::Articulated) + if (thiscoupler.type() == TCouplerType::Articulated) { return; } // HACK: don't break articulated couplings no matter what @@ -1286,27 +1285,27 @@ void TMoverParameters::damage_coupler(int const End) if (SetFlag(DamageFlag, dtrain_coupling)) EventFlag = true; - if ((coupler.CouplingFlag & coupling::brakehose) == coupling::brakehose) + if ((thiscoupler.CouplingFlag & coupling::brakehose) == coupling::brakehose) { // hamowanie nagle - zerwanie przewodow hamulcowych AlarmChainFlag = true; } - coupler.CouplingFlag = 0; + thiscoupler.CouplingFlag = 0; - if (coupler.Connected != nullptr) + if (thiscoupler.Connected != nullptr) { switch (End) { // break connection with other vehicle, if there's any case 0: { - coupler.Connected->Couplers[end::rear].CouplingFlag = coupling::faux; + thiscoupler.Connected->Couplers[end::rear].CouplingFlag = coupling::faux; break; } case 1: { - coupler.Connected->Couplers[end::front].CouplingFlag = coupling::faux; + thiscoupler.Connected->Couplers[end::front].CouplingFlag = coupling::faux; break; } default: @@ -1353,10 +1352,8 @@ void TMoverParameters::Derail(DerailReason const Reason) // ************************************************************************************************* // Oblicza przemieszczenie taboru // ************************************************************************************************* -double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShape &Shape, TTrackParam &Track, TTractionParam &ElectricTraction, TLocation const &NewLoc, TRotation const &NewRot) +double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShape &Shape, TTrackParam const &Track, TTractionParam const &ElectricTraction, TLocation const &NewLoc, TRotation const &NewRot) { - const double Vepsilon = 1e-5; - const double Aepsilon = 1e-3; // ASBSpeed=0.8; if (!TestFlag(DamageFlag, dtrain_out)) { // Ra: to przepisywanie tu jest bez sensu @@ -1377,12 +1374,11 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap if (CategoryFlag == 4) OffsetTrackV = TotalMass / (Dim.L * Dim.W * 1000.0); - else if (TestFlag(CategoryFlag, 1) && TestFlag(RunningTrack.CategoryFlag, 1)) - if (TestFlag(DamageFlag, dtrain_out)) - { - OffsetTrackV = -0.2; - OffsetTrackH = Sign(RunningShape.R) * 0.2; - } + else if (TestFlag(CategoryFlag, 1) && TestFlag(RunningTrack.CategoryFlag, 1) && TestFlag(DamageFlag, dtrain_out)) + { + OffsetTrackV = -0.2; + OffsetTrackH = Sign(RunningShape.R) * 0.2; + } // TODO: investigate, seems supplied NewRot is always 0 although the code here suggests some actual values are expected Loc = NewLoc; @@ -1477,9 +1473,8 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap // Oblicza przemieszczenie taboru - uproszczona wersja // ************************************************************************************************* -double TMoverParameters::FastComputeMovement(double dt, const TTrackShape &Shape, TTrackParam &Track, TLocation const &NewLoc, TRotation const &NewRot) +double TMoverParameters::FastComputeMovement(double dt, const TTrackShape & /*Shape*/, TTrackParam & /*Track*/, TLocation const &NewLoc, TRotation const &NewRot) { - int b; // T_MoverParameters::FastComputeMovement(dt, Shape, Track, NewLoc, NewRot); Loc = NewLoc; @@ -1520,7 +1515,7 @@ double TMoverParameters::FastComputeMovement(double dt, const TTrackShape &Shape dL = (3.0 * V - Vprev) * dt / 2.0; // metoda Adamsa-Bashfortha // ale jesli jest kolizja (zas. zach. pedu) to... - for (b = 0; b < 2; b++) + for (int b = 0; b < 2; b++) if (Couplers[b].CheckCollision) CollisionDetect(b, dt); // zmienia niejawnie AccS, V !!! } // liczone dL, predkosc i przyspieszenie @@ -1548,24 +1543,21 @@ void TMoverParameters::compute_movement_(double const Deltatime) RunInternalCommand(); // relay settings - if (EngineType == TEngineType::ElectricSeriesMotor) + // adjust motor overload relay threshold + if (EngineType == TEngineType::ElectricSeriesMotor && ImaxHi > ImaxLo) { - // adjust motor overload relay threshold - if (ImaxHi > ImaxLo) - { - if (MotorOverloadRelayHighThreshold) - { // set high threshold - if (TrainType != dt_ET42 ? RList[MainCtrlPos].Bn < 2 : MainCtrlPos == 0) - { - Imax = ImaxHi; - } + if (MotorOverloadRelayHighThreshold) + { // set high threshold + if (TrainType != dt_ET42 ? RList[MainCtrlPos].Bn < 2 : MainCtrlPos == 0) + { + Imax = ImaxHi; } - else - { // set low threshold - if (TrainType != dt_ET42 || MainCtrlPos == 0) - { - Imax = ImaxLo; - } + } + else + { // set low threshold + if (TrainType != dt_ET42 || MainCtrlPos == 0) + { + Imax = ImaxLo; } } } @@ -1573,10 +1565,9 @@ void TMoverParameters::compute_movement_(double const Deltatime) // Uproszczona symulacja wentylatorow rezystora hamowania // Prad oddawany na rezystor - double Irh = abs(eimv[eimv_Pe]) - abs(eimv[eimv_Ipoj]); // Wlacz wentylator jesli prad rekuperacji przekroczy maksymalny dla pasywnego chlodzenia rezystora - if (Irh > Imaxrpc && eimv[eimv_Ipoj] < 0) + if (double Irh = abs(eimv[eimv_Pe]) - abs(eimv[eimv_Ipoj]); Irh > Imaxrpc && eimv[eimv_Ipoj] < 0) { BRVtimer = 0; BRVentilators = true; @@ -1589,20 +1580,14 @@ void TMoverParameters::compute_movement_(double const Deltatime) } // automatyczny rozruch - if (EngineType == TEngineType::ElectricSeriesMotor) + if (EngineType == TEngineType::ElectricSeriesMotor && AutoRelayCheck()) { - if (AutoRelayCheck()) - { - SetFlag(SoundFlag, sound::relay); - } + SetFlag(SoundFlag, sound::relay); } - if (EngineType == TEngineType::DieselEngine || EngineType == TEngineType::DieselElectric) + if ((EngineType == TEngineType::DieselEngine || EngineType == TEngineType::DieselElectric) && dizel_Update(Deltatime)) { - if (dizel_Update(Deltatime)) - { - SetFlag(SoundFlag, sound::relay); - } + SetFlag(SoundFlag, sound::relay); } // TODO: gather and move current calculations to dedicated method @@ -1624,7 +1609,7 @@ void TMoverParameters::compute_movement_(double const Deltatime) { Compressor = 0; CompressorFlag = false; - }; + } if (VeselVolume > 0.0) { // sprężarka musi mieć jakąś niezerową wydajność żeby rozważać jej załączenie i pracę @@ -1725,14 +1710,12 @@ void TMoverParameters::MainsCheck(double const Deltatime) } } -void TMoverParameters::LowVoltagePowerCheck(double const Deltatime) +void TMoverParameters::LowVoltagePowerCheck(double const /*Deltatime*/) { auto const lowvoltagepower{Power24vIsAvailable || Power110vIsAvailable}; - switch (EngineType) - { - case TEngineType::ElectricSeriesMotor: + if (EngineType == TEngineType::ElectricSeriesMotor) { GroundRelay &= lowvoltagepower; if (GroundRelayStart != start_t::manual) @@ -1741,16 +1724,10 @@ void TMoverParameters::LowVoltagePowerCheck(double const Deltatime) // TODO: generic check method which takes these into account GroundRelay |= lowvoltagepower; } - break; - } - default: - { - break; - } } } -void TMoverParameters::PowerCouplersCheck(double const Deltatime, coupling const Coupling) +void TMoverParameters::PowerCouplersCheck(double const /*Deltatime*/, coupling const Coupling) { if (Coupling != coupling::highvoltage && Coupling != coupling::power110v && Coupling != coupling::power24v) { @@ -1795,17 +1772,9 @@ void TMoverParameters::PowerCouplersCheck(double const Deltatime, coupling const } } // high voltage power sources - switch (EnginePowerSource.SourceType) - { - case TPowerSource::CurrentCollector: + if (EnginePowerSource.SourceType == TPowerSource::CurrentCollector) { localvoltage = std::max(localvoltage, PantographVoltage); - break; - } - default: - { - break; - } } break; } @@ -1845,9 +1814,9 @@ void TMoverParameters::PowerCouplersCheck(double const Deltatime, coupling const for (auto side = 0; side < 2; ++side) { - auto &coupler{Couplers[side]}; + auto const &thiscoupler{Couplers[side]}; // NOTE: in the loop we actually update the state of the coupler on the opposite end of the vehicle - auto &oppositecoupler{Couplers[(side == end::front ? end::rear : end::front)]}; + auto &oppositecoupler{Couplers[side == end::front ? end::rear : end::front]}; bool oppositecouplingispresent; bool localpowerexportisenabled; @@ -1885,9 +1854,9 @@ void TMoverParameters::PowerCouplersCheck(double const Deltatime, coupling const } } - auto const *coupling = Coupling == coupling::highvoltage ? &coupler.power_high : - Coupling == coupling::power110v ? &coupler.power_110v : - Coupling == coupling::power24v ? &coupler.power_24v : + auto const *coupling = Coupling == coupling::highvoltage ? &thiscoupler.power_high : + Coupling == coupling::power110v ? &thiscoupler.power_110v : + Coupling == coupling::power24v ? &thiscoupler.power_24v : nullptr; auto *oppositecoupling = Coupling == coupling::highvoltage ? &oppositecoupler.power_high : Coupling == coupling::power110v ? &oppositecoupler.power_110v : @@ -1899,9 +1868,9 @@ void TMoverParameters::PowerCouplersCheck(double const Deltatime, coupling const oppositecoupling->is_live = false; oppositecoupling->is_local = localpowersource; // indicate power source // draw from external source - if (coupler.Connected != nullptr) + if (thiscoupler.Connected != nullptr) { - auto const &connectedcoupler{coupler.Connected->Couplers[coupler.ConnectedNr]}; + auto const &connectedcoupler{thiscoupler.Connected->Couplers[thiscoupler.ConnectedNr]}; auto const *connectedcoupling = Coupling == coupling::highvoltage ? &connectedcoupler.power_high : Coupling == coupling::power110v ? &connectedcoupler.power_110v : Coupling == coupling::power24v ? &connectedcoupler.power_24v : @@ -1924,17 +1893,17 @@ void TMoverParameters::PowerCouplersCheck(double const Deltatime, coupling const { case coupling::highvoltage: { - couplervoltage = Couplers[end::front].power_high.voltage + Couplers[end::rear].power_high.voltage; + couplervoltage = static_cast(Couplers[end::front].power_high.voltage + Couplers[end::rear].power_high.voltage); break; } case coupling::power110v: { - couplervoltage = Couplers[end::front].power_110v.voltage + Couplers[end::rear].power_110v.voltage; + couplervoltage = static_cast(Couplers[end::front].power_110v.voltage + Couplers[end::rear].power_110v.voltage); break; } case coupling::power24v: { - couplervoltage = Couplers[end::front].power_24v.voltage + Couplers[end::rear].power_24v.voltage; + couplervoltage = static_cast(Couplers[end::front].power_24v.voltage + Couplers[end::rear].power_24v.voltage); break; } default: @@ -1948,23 +1917,21 @@ void TMoverParameters::PowerCouplersCheck(double const Deltatime, coupling const Coupling == coupling::power24v ? &PowerCircuits[0].second : nullptr; - for (auto side = 0; side < 2; ++side) + for (auto &thiscoupler : Couplers) { - - auto &coupler{Couplers[side]}; - auto *coupling = Coupling == coupling::highvoltage ? &coupler.power_high : - Coupling == coupling::power110v ? &coupler.power_110v : - Coupling == coupling::power24v ? &coupler.power_24v : + auto *coupling = Coupling == coupling::highvoltage ? &thiscoupler.power_high : + Coupling == coupling::power110v ? &thiscoupler.power_110v : + Coupling == coupling::power24v ? &thiscoupler.power_24v : nullptr; coupling->current = 0.0; - if (coupler.Connected == nullptr) + if (thiscoupler.Connected == nullptr) { continue; } - auto const &connectedothercoupler{coupler.Connected->Couplers[(coupler.ConnectedNr == end::front ? end::rear : end::front)]}; + auto const &connectedothercoupler{thiscoupler.Connected->Couplers[thiscoupler.ConnectedNr == end::front ? end::rear : end::front]}; auto const *connectedothercoupling = Coupling == coupling::highvoltage ? &connectedothercoupler.power_high : Coupling == coupling::power110v ? &connectedothercoupler.power_110v : Coupling == coupling::power24v ? &connectedothercoupler.power_24v : @@ -1994,7 +1961,7 @@ void TMoverParameters::PowerCouplersCheck(double const Deltatime, coupling const } } -double TMoverParameters::ShowEngineRotation(int VehN) +double TMoverParameters::ShowEngineRotation(int VehN) const { // Zwraca wartość prędkości obrotowej silnika wybranego pojazdu. Do 3 pojazdów (3×SN61). int b; switch (VehN) @@ -2003,19 +1970,17 @@ double TMoverParameters::ShowEngineRotation(int VehN) return std::abs(enrot); case 2: for (b = 0; b <= 1; ++b) - if (TestFlag(Couplers[b].CouplingFlag, coupling::control)) - if (Couplers[b].Connected->Power > 0.01) - return fabs(Couplers[b].Connected->enrot); + if (TestFlag(Couplers[b].CouplingFlag, coupling::control) && Couplers[b].Connected->Power > 0.01) + return fabs(Couplers[b].Connected->enrot); break; case 3: // to nie uwzględnia ewentualnego odwrócenia pojazdu w środku for (b = 0; b <= 1; ++b) - if (TestFlag(Couplers[b].CouplingFlag, coupling::control)) - if (Couplers[b].Connected->Power > 0.01) - if (TestFlag(Couplers[b].Connected->Couplers[b].CouplingFlag, coupling::control)) - if (Couplers[b].Connected->Couplers[b].Connected->Power > 0.01) - return fabs(Couplers[b].Connected->Couplers[b].Connected->enrot); + if (TestFlag(Couplers[b].CouplingFlag, coupling::control) && Couplers[b].Connected->Power > 0.01 && TestFlag(Couplers[b].Connected->Couplers[b].CouplingFlag, coupling::control) && Couplers[b].Connected->Couplers[b].Connected->Power > 0.01) + return fabs(Couplers[b].Connected->Couplers[b].Connected->enrot); break; - }; + default: + break; + } return 0.0; }; @@ -2080,14 +2045,12 @@ void TMoverParameters::ConverterCheck(double const Timestep) }; // heating system status check -void TMoverParameters::HeatingCheck(double const Timestep) +void TMoverParameters::HeatingCheck(double const /*Timestep*/) { // update heating devices // TBD, TODO: move this to a separate method? - switch (HeatingPowerSource.SourceType) - { - case TPowerSource::Generator: + if (HeatingPowerSource.SourceType == TPowerSource::Generator) { if (HeatingPowerSource.EngineGenerator.engine_revolutions != nullptr && HeatingPowerSource.EngineGenerator.revolutions_max > 0) { @@ -2106,12 +2069,6 @@ void TMoverParameters::HeatingCheck(double const Timestep) std::clamp((absrevolutions - generator.revolutions_min) / (generator.revolutions_max - generator.revolutions_min), 0.0, 1.0))) * sign(generator.revolutions); } - break; - } - default: - { - break; - } } // quick check first to avoid unnecessary calls... @@ -2166,7 +2123,7 @@ void TMoverParameters::HeatingCheck(double const Timestep) } // water pump status check -void TMoverParameters::WaterPumpCheck(double const Timestep) +void TMoverParameters::WaterPumpCheck(double const /*Timestep*/) { // NOTE: breaker override with start type is sm42 specific hack, replace with ability to define the presence of the breaker WaterPump.is_active = true == (Power24vIsAvailable || Power110vIsAvailable) && true == WaterPump.breaker && false == WaterPump.is_disabled && @@ -2174,7 +2131,7 @@ void TMoverParameters::WaterPumpCheck(double const Timestep) } // water heater status check -void TMoverParameters::WaterHeaterCheck(double const Timestep) +void TMoverParameters::WaterHeaterCheck(double const /*Timestep*/) { WaterHeater.is_active = false == WaterHeater.is_damaged && true == (Power24vIsAvailable || Power110vIsAvailable) && true == WaterHeater.is_enabled && true == WaterHeater.breaker && @@ -2189,13 +2146,14 @@ void TMoverParameters::WaterHeaterCheck(double const Timestep) } // fuel pump status update -void TMoverParameters::FuelPumpCheck(double const Timestep) +void TMoverParameters::FuelPumpCheck(double const /*Timestep*/) { + using enum start_t; FuelPump.is_active = true == (Power24vIsAvailable || Power110vIsAvailable) && false == FuelPump.is_disabled && - (FuelPump.is_active || (FuelPump.start_type == start_t::manual ? FuelPump.is_enabled : - FuelPump.start_type == start_t::automatic ? dizel_startup || Mains : - FuelPump.start_type == start_t::manualwithautofallback ? FuelPump.is_enabled || dizel_startup || Mains : + (FuelPump.is_active || (FuelPump.start_type == manual ? FuelPump.is_enabled : + FuelPump.start_type == automatic ? dizel_startup || Mains : + FuelPump.start_type == manualwithautofallback ? FuelPump.is_enabled || dizel_startup || Mains : false)); // shouldn't ever get this far but, eh } @@ -2218,11 +2176,11 @@ void TMoverParameters::OilPumpCheck(double const Timestep) if (OilPump.pressure < OilPump.pressure_target) { // TODO: scale change rate from 0.01-0.05 with oil/engine temperature/idle time - OilPump.pressure = std::min(OilPump.pressure_target, OilPump.pressure + (enrot > 5.0 ? 0.05 : 0.035) * Timestep); + OilPump.pressure = std::min(OilPump.pressure_target, static_cast(OilPump.pressure + (enrot > 5.0 ? 0.05 : 0.035) * Timestep)); } if (OilPump.pressure > OilPump.pressure_target) { - OilPump.pressure = std::max(OilPump.pressure_target, OilPump.pressure - (enrot > 5.0 ? 0.05 : 0.035) * 0.5 * Timestep); + OilPump.pressure = std::max(OilPump.pressure_target, static_cast(OilPump.pressure - (enrot > 5.0 ? 0.05 : 0.035) * 0.5 * Timestep)); } OilPump.pressure = std::clamp(OilPump.pressure, 0.f, 1.5f); } @@ -2239,7 +2197,7 @@ void TMoverParameters::MotorBlowersCheck(double const Timestep) { if (stop) { - blower.stop_timer += Timestep; + blower.stop_timer += static_cast(Timestep); if (blower.stop_timer > blower.sustain_time) { disable = true; @@ -2279,23 +2237,24 @@ void TMoverParameters::MotorBlowersCheck(double const Timestep) if (revolutionstarget > 0.f) { auto const speedincreasecap{std::max(50.f, fan.speed * 0.05f * -1)}; // 5% of fixed revolution speed, or 50 - fan.revolutions += std::clamp(revolutionstarget - fan.revolutions, speedincreasecap * -2, speedincreasecap) * Timestep; + fan.revolutions += static_cast(std::clamp(revolutionstarget - fan.revolutions, speedincreasecap * -2, speedincreasecap) * Timestep); } else { - fan.revolutions *= std::max(0.0, 1.0 - Timestep); + fan.revolutions *= static_cast(std::max(0.0, 1.0 - Timestep)); } } } -void TMoverParameters::PantographsCheck(double const Timestep) +void TMoverParameters::PantographsCheck(double const /*Timestep*/) { + using enum start_t; { - auto &valve{PantsValve}; + auto const &valve{PantsValve}; auto const lowvoltagepower{valve.solenoid ? Power24vIsAvailable || Power110vIsAvailable : true}; - auto const autostart{valve.start_type == start_t::automatic || valve.start_type == start_t::manualwithautofallback}; - auto const manualcontrol{valve.start_type == start_t::manual || valve.start_type == start_t::manualwithautofallback}; + auto const autostart{valve.start_type == automatic || valve.start_type == manualwithautofallback}; + auto const manualcontrol{valve.start_type == manual || valve.start_type == manualwithautofallback}; PantsValve.is_active = (valve.spring ? lowvoltagepower : true) // spring actuator needs power to maintain non-default state && (manualcontrol && lowvoltagepower ? false == valve.is_disabled : true) // needs power to change state @@ -2310,8 +2269,8 @@ void TMoverParameters::PantographsCheck(double const Timestep) auto &valve{pantograph.valve}; auto const lowvoltagepower{valve.solenoid ? Power24vIsAvailable || Power110vIsAvailable : true}; - auto const autostart{valve.start_type == start_t::automatic || valve.start_type == start_t::manualwithautofallback}; - auto const manualcontrol{valve.start_type == start_t::manual || valve.start_type == start_t::manualwithautofallback}; + auto const autostart{valve.start_type == automatic || valve.start_type == manualwithautofallback}; + auto const manualcontrol{valve.start_type == manual || valve.start_type == manualwithautofallback}; valve.is_active = (valve.spring ? lowvoltagepower : true) // spring actuator needs power to maintain non-default state && (manualcontrol && lowvoltagepower ? false == valve.is_disabled : true) // needs power to change state, without it just pass through @@ -2326,7 +2285,7 @@ void TMoverParameters::PantographsCheck(double const Timestep) } } -void TMoverParameters::LightsCheck(double const Timestep) +void TMoverParameters::LightsCheck(double const /*Timestep*/) { auto &light{CompartmentLights}; @@ -2437,7 +2396,6 @@ bool TMoverParameters::IncMainCtrl(int CtrlSpeed) while (RList[MainCtrlPos].R > 0.0 && IncMainCtrl(1)) { // all work is done in the loop header - ; } OK = false; // shouldn't this be part of the loop above? // if (TrainType=dt_ET40) then @@ -2449,21 +2407,18 @@ bool TMoverParameters::IncMainCtrl(int CtrlSpeed) { // CtrlSpeed == 1 ++MainCtrlPos; OK = true; - if (Imax == ImaxHi) + if (Imax == ImaxHi && RList[MainCtrlPos].Bn > 1) { - if (RList[MainCtrlPos].Bn > 1) + /* NOTE: disabled, relay configuration was moved to compute_movement_ + if( true == MaxCurrentSwitch( false )) { + // wylaczanie wysokiego rozruchu + SetFlag( SoundFlag, sound::relay ); + } + */ + if (TrainType == dt_ET42) { - /* NOTE: disabled, relay configuration was moved to compute_movement_ - if( true == MaxCurrentSwitch( false )) { - // wylaczanie wysokiego rozruchu - SetFlag( SoundFlag, sound::relay ); - } - */ - if (TrainType == dt_ET42) - { - --MainCtrlPos; - OK = false; - } + --MainCtrlPos; + OK = false; } } // @@ -2476,13 +2431,10 @@ bool TMoverParameters::IncMainCtrl(int CtrlSpeed) //} } - if (TrainType == dt_ET42 && true == DynamicBrakeFlag) + if (TrainType == dt_ET42 && true == DynamicBrakeFlag && MainCtrlPos > 20) { - if (MainCtrlPos > 20) - { - MainCtrlPos = 20; - OK = false; - } + MainCtrlPos = 20; + OK = false; } break; } @@ -2493,7 +2445,7 @@ bool TMoverParameters::IncMainCtrl(int CtrlSpeed) { while (MainCtrlPos < MainCtrlPosNo && IncMainCtrl(1)) { - ; + // all work is done in the loop header } } else @@ -2510,6 +2462,8 @@ bool TMoverParameters::IncMainCtrl(int CtrlSpeed) OK = AddPulseForce(CtrlSpeed); break; } + default: + break; } // switch EngineType of } else @@ -2644,6 +2598,8 @@ bool TMoverParameters::DecMainCtrl(int CtrlSpeed) } break; } + default: + break; } // switch EngineType } } @@ -2776,9 +2732,8 @@ bool TMoverParameters::IncScndCtrl(int CtrlSpeed) OK = false; // if OK then LastRelayTime:=0; // hunter-101012: poprawka - if (OK) - if (LastRelayTime > CtrlDelay) - LastRelayTime = 0; + if (OK && LastRelayTime > CtrlDelay) + LastRelayTime = 0; if (OK && EngineType == TEngineType::ElectricInductionMotor && ScndCtrlPosNo == 1 && MainCtrlPos > 0) { @@ -2793,7 +2748,7 @@ bool TMoverParameters::IncScndCtrl(int CtrlSpeed) if (OK && SpeedCtrl && ScndCtrlPos == 1 && EngineType == TEngineType::DieselEngine) { // NOTE: round() already adds 0.5, are the ones added here as well correct? - SpeedCtrlValue = Round(Vel); + SpeedCtrlValue = static_cast(Round(Vel)); SpeedCtrlUnit.IsActive = true; } @@ -2839,9 +2794,8 @@ bool TMoverParameters::DecScndCtrl(int CtrlSpeed) OK = false; // if OK then LastRelayTime:=0; // hunter-101012: poprawka - if (OK) - if (LastRelayTime > CtrlDownDelay) - LastRelayTime = 0; + if (OK && LastRelayTime > CtrlDownDelay) + LastRelayTime = 0; if (OK && EngineType == TEngineType::ElectricInductionMotor && ScndCtrlPosNo == 1) { @@ -2866,13 +2820,10 @@ bool TMoverParameters::DecScndCtrl(int CtrlSpeed) return OK; } -int TMoverParameters::GetVirtualScndPos() +int TMoverParameters::GetVirtualScndPos() const { - if (TrainType == dt_ET42) - { - if (DynamicBrakeFlag && !ScndCtrlPos) - return -1; - } + if (TrainType == dt_ET42 && DynamicBrakeFlag && !ScndCtrlPos) + return -1; return ScndCtrlPos; } @@ -3032,8 +2983,7 @@ bool TMoverParameters::SandboxManual(bool const State, range_t const Notify) bool TMoverParameters::SandboxAuto(bool const State, range_t const Notify) { bool result{false}; - bool NewState = State && SandDoseAutoAllow; - if (SandDoseAuto != NewState) + if (bool NewState = State && SandDoseAutoAllow; SandDoseAuto != NewState) { if (SandDoseAuto == false) { @@ -3155,6 +3105,7 @@ void TMoverParameters::SecuritySystemCheck(double dt) // ************************************************************************************************* bool TMoverParameters::BatterySwitch(bool State, range_t const Notify) { + using enum range_t; auto const initialstate{Battery}; // Ra: ukrotnienie załączania baterii jest jakąś fikcją... @@ -3164,10 +3115,10 @@ bool TMoverParameters::BatterySwitch(bool State, range_t const Notify) } // switching batteries does not require activation - if (Notify != range_t::local) + if (Notify != local) { - SendCtrlToNext("BatterySwitch", State ? 1 : 0, 1, Notify == range_t::unit ? coupling::control | coupling::permanent : coupling::control); - SendCtrlToNext("BatterySwitch", State ? 1 : 0, -1, Notify == range_t::unit ? coupling::control | coupling::permanent : coupling::control); + SendCtrlToNext("BatterySwitch", State ? 1 : 0, 1, Notify == unit ? coupling::control | coupling::permanent : coupling::control); + SendCtrlToNext("BatterySwitch", State ? 1 : 0, -1, Notify == unit ? coupling::control | coupling::permanent : coupling::control); } return Battery != initialstate; @@ -3250,11 +3201,10 @@ bool TMoverParameters::DirectionBackward(void) return false; } - if (DirActive == 1 && MainCtrlPos == 0 && TrainType == dt_EZT && EngineType != TEngineType::ElectricInductionMotor) - if (MinCurrentSwitch(false)) - { - return true; - } + if (DirActive == 1 && MainCtrlPos == 0 && TrainType == dt_EZT && EngineType != TEngineType::ElectricInductionMotor && MinCurrentSwitch(false)) + { + return true; + } if (MainCtrlPosNo > 0 && DirActive > -1 && (CabActive != 0 || (InactiveCabFlag & activation::neutraldirection) == 0)) { if (EngineType == TEngineType::WheelsDriven) @@ -3662,6 +3612,7 @@ void TMoverParameters::MainSwitch_(bool const State) bool TMoverParameters::MainSwitchCheck() const { + using enum TEngineType; // prevent the switch from working if there's no power // TODO: consider whether it makes sense for diesel engines and such @@ -3669,15 +3620,15 @@ bool TMoverParameters::MainSwitchCheck() const switch (EngineType) { - case TEngineType::DieselElectric: - case TEngineType::DieselEngine: - case TEngineType::Dumb: + case DieselElectric: + case DieselEngine: + case Dumb: { powerisavailable = Power24vIsAvailable; break; } - case TEngineType::ElectricSeriesMotor: - case TEngineType::ElectricInductionMotor: + case ElectricSeriesMotor: + case ElectricInductionMotor: { // TODO: check whether we can simplify this check and skip the outer EngineType switch powerisavailable = EnginePowerSourceVoltage() > 0.5 * EnginePowerSource.MaxVoltage; @@ -3689,7 +3640,7 @@ bool TMoverParameters::MainSwitchCheck() const } } - return powerisavailable && (ScndCtrlPos == 0 || EngineType == TEngineType::ElectricInductionMotor) && MainsInitTimeCountdown <= 0.0 && + return powerisavailable && (ScndCtrlPos == 0 || EngineType == ElectricInductionMotor) && MainsInitTimeCountdown <= 0.0 && (ConvOvldFlag == false || ConverterOverloadRelayOffWhenMainIsOff) && true == GroundRelay && true == NoVoltRelay && true == OvervoltageRelay && LastSwitchingTime > CtrlDelay && (HasCamshaft ? IsMainCtrlActualNoPowerPos() : LineBreakerClosesOnlyAtNoPowerPos ? IsMainCtrlNoPowerPos() : @@ -3947,8 +3898,7 @@ double TMoverParameters::DynamicBrakeRatio(void) const bool TMoverParameters::DynamicBrakeAvailable(void) const { double const vh0{eimc[eimc_p_Vh0]}; - double const vh1{eimc[eimc_p_Vh1]}; - if (vh1 <= 0.001) + if (double const vh1{eimc[eimc_p_Vh1]}; vh1 <= 0.001) { // brak zdefiniowanej strefy - ED dziala zawsze return true; @@ -4012,10 +3962,10 @@ bool TMoverParameters::DynamicBrakeSwitch(bool Switch) { DynamicBrakeFlag = Switch; DBS = true; - for (int b = 0; b < 2; b++) + for (auto &thiscoupler : Couplers) // with Couplers[b] do - if (TestFlag(Couplers[b].CouplingFlag, coupling::control)) - Couplers[b].Connected->DynamicBrakeFlag = Switch; + if (TestFlag(thiscoupler.CouplingFlag, coupling::control)) + thiscoupler.Connected->DynamicBrakeFlag = Switch; // end; // if (DynamicBrakeType=dbrake_passive) and (TrainType=dt_ET42) then // begin @@ -4345,7 +4295,7 @@ void TMoverParameters::CompressorCheck(double dt) EmergencyValveOpen = Compressor > (EmergencyValveOpen ? EmergencyValveOff : EmergencyValveOn); if (EmergencyValveOpen) { - float dV = PF(0, Compressor, EmergencyValveArea) * dt; + auto dV = static_cast(PF(0, Compressor, EmergencyValveArea) * dt); CompressedVolume -= dV; } @@ -4357,9 +4307,8 @@ void TMoverParameters::CompressorCheck(double dt) auto const MaxCompressorF{CompressorList[TCompressorList::cl_MaxFactor][CompressorListPos] * MaxCompressor}; auto const MinCompressorF{CompressorList[TCompressorList::cl_MinFactor][CompressorListPos] * MinCompressor}; auto const CompressorSpeedF{CompressorList[TCompressorList::cl_SpeedFactor][CompressorListPos] * CompressorSpeed}; - auto const AllowFactor{CompressorList[TCompressorList::cl_Allow][CompressorListPos]}; // checking the impact on the compressor allowance - if (AllowFactor > 0.5) + if (auto const AllowFactor{CompressorList[TCompressorList::cl_Allow][CompressorListPos]}; AllowFactor > 0.5) { CompressorAllow = AllowFactor > 1.5; } @@ -4419,21 +4368,16 @@ void TMoverParameters::CompressorCheck(double dt) } // working compressor adds air to the air reservoir - switch (CompressorPower) - { - case 3: + if (CompressorPower == 3) { // the compressor is coupled with the diesel engine, engine revolutions affect the output CompressedVolume += CompressorSpeedF * (2.0 * MaxCompressorF - Compressor) / MaxCompressorF * EngineRPMRatio() * dt * (CompressorGovernorLock ? 0.0 : 1.0); // with the lock active air is vented out - break; } - default: + else { // the compressor is a stand-alone device, working at steady pace CompressedVolume += CompressorSpeedF * (2.0 * MaxCompressorF - Compressor) / MaxCompressorF * dt; - break; - } } if (pressureistoohigh && (false == governorlockispresent || CompressorPower == 3)) @@ -4451,14 +4395,11 @@ void TMoverParameters::CompressorCheck(double dt) // tymczasowo tylko obciążenie sprężarki, tak z 5A na sprężarkę // TODO: draw power from proper high- or low voltage circuit - switch (CompressorPower) - { - case 3: + if (CompressorPower == 3) { // diesel-powered compressor doesn't draw power - break; } - default: + else { // TODO: drain power from 110v circuit /* @@ -4466,8 +4407,6 @@ void TMoverParameters::CompressorCheck(double dt) compressorowner->TotalCurrent += 0.0015 * compressorowner->PantographVoltage; } */ - break; - } } } @@ -4483,8 +4422,6 @@ void TMoverParameters::UpdatePipePressure(double dt) Pipe->Act(); } - const double LBDelay = 100; - const double kL = 0.5; // double dV; // TMoverParameters *c; // T_MoverParameters double temp; @@ -4575,6 +4512,7 @@ void TMoverParameters::UpdatePipePressure(double dt) } if (dpMainValve < 0) // && (PipePressureVal > 0.01) //50 + { if (Compressor > ScndPipePress) { CompressedVolume = CompressedVolume + dpMainValve / 1500.0; @@ -4582,12 +4520,12 @@ void TMoverParameters::UpdatePipePressure(double dt) } else Pipe2->Flow(dpMainValve); + } } // ulepszony hamulec bezp. EmergencyValveFlow = 0.0; - auto const lowvoltagepower{Power24vIsAvailable || Power110vIsAvailable}; // EngDmgFlag 32 (load destroyed) used to trigger this too; dropped, it has nothing to do with // the emergency brake (a broken coupler sets AlarmChainFlag instead) @@ -4640,11 +4578,11 @@ void TMoverParameters::UpdatePipePressure(double dt) { LocBrakePress = LocHandle->GetCP(); - for (int b = 0; b < 2; b++) - if ((TrainType & (dt_ET41 | dt_ET42)) != 0 && Couplers[b].Connected != nullptr) // nie podoba mi się to rozwiązanie, chyba trzeba - // dodać jakiś wpis do fizyki na to - if ((Couplers[b].Connected->TrainType & (dt_ET41 | dt_ET42)) != 0 && (Couplers[b].CouplingFlag & 36) == 36) - LocBrakePress = std::max(Couplers[b].Connected->LocHandle->GetCP(), LocBrakePress); + for (auto const &couplerentry : Couplers) + // nie podoba mi się to rozwiązanie, chyba trzeba + // dodać jakiś wpis do fizyki na to + if ((TrainType & (dt_ET41 | dt_ET42)) != 0 && couplerentry.Connected != nullptr && (couplerentry.Connected->TrainType & (dt_ET41 | dt_ET42)) != 0 && (couplerentry.CouplingFlag & 36) == 36) + LocBrakePress = std::max(couplerentry.Connected->LocHandle->GetCP(), LocBrakePress); // if ((DynamicBrakeFlag) && (EngineType == ElectricInductionMotor)) //{ @@ -4657,10 +4595,12 @@ void TMoverParameters::UpdatePipePressure(double dt) //(Hamulec as TLSt).SetLBP(LocBrakePress); Hamulec->SetLBP(LocBrakePress); if (BrakeValve == TBrakeValve::EStED) + { if (MBPM < 2) Hamulec->PLC(MaxBrakePress[LoadFlag]); else Hamulec->PLC(TotalMass - Mred); + } break; } @@ -4732,7 +4672,7 @@ void TMoverParameters::UpdatePipePressure(double dt) if (DCEMUED_EP_min_Im > 0.001 && abs(Im) > DCEMUED_EP_min_Im && DynamicBrakeEMUStatus) temp1 = 0; Hamulec->SetEPS(temp1); - TUHEX_StageActual = EpForce; + TUHEX_StageActual = static_cast(EpForce); TUHEX_Active = TUHEX_StageActual > 0; // Ra 2014-11: na tym się wysypuje, ale nie wiem, w jakich warunkach SendCtrlToNext("Brake", EpForce, CabActive); @@ -4782,7 +4722,9 @@ void TMoverParameters::UpdateScndPipePressure(double dt) const double Spz = 0.5067; TMoverParameters *c; - double dv1, dv2, dV; + double dv1; + double dv2; + double dV; UpdateSpringBrake(dt); @@ -4790,32 +4732,29 @@ void TMoverParameters::UpdateScndPipePressure(double dt) dv2 = 0; // sprzeg 1 - if (Couplers[0].Connected != nullptr) - if (TestFlag(Couplers[0].CouplingFlag, ctrain_scndpneumatic)) - { - c = Couplers[0].Connected; // skrot - dv1 = 0.5 * dt * PF(ScndPipePress, c->ScndPipePress, Spz * 0.75); - if (dv1 * dv1 > 0.00000000000001) - c->switch_physics(true); - c->Pipe2->Flow(-dv1); - } + if (Couplers[0].Connected != nullptr && TestFlag(Couplers[0].CouplingFlag, ctrain_scndpneumatic)) + { + c = Couplers[0].Connected; // skrot + dv1 = 0.5 * dt * PF(ScndPipePress, c->ScndPipePress, Spz * 0.75); + if (dv1 * dv1 > 0.00000000000001) + c->switch_physics(true); + c->Pipe2->Flow(-dv1); + } // sprzeg 2 - if (Couplers[1].Connected != nullptr) - if (TestFlag(Couplers[1].CouplingFlag, ctrain_scndpneumatic)) - { - c = Couplers[1].Connected; // skrot - dv2 = 0.5 * dt * PF(ScndPipePress, c->ScndPipePress, Spz * 0.75); - if (dv2 * dv2 > 0.00000000000001) - c->switch_physics(true); - c->Pipe2->Flow(-dv2); - } - if (Couplers[1].Connected != nullptr && Couplers[0].Connected != nullptr) - if (TestFlag(Couplers[0].CouplingFlag, ctrain_scndpneumatic) && TestFlag(Couplers[1].CouplingFlag, ctrain_scndpneumatic)) - { - dV = 0.00025 * dt * PF(Couplers[0].Connected->ScndPipePress, Couplers[1].Connected->ScndPipePress, Spz * 0.25); - Couplers[0].Connected->Pipe2->Flow(+dV); - Couplers[1].Connected->Pipe2->Flow(-dV); - } + if (Couplers[1].Connected != nullptr && TestFlag(Couplers[1].CouplingFlag, ctrain_scndpneumatic)) + { + c = Couplers[1].Connected; // skrot + dv2 = 0.5 * dt * PF(ScndPipePress, c->ScndPipePress, Spz * 0.75); + if (dv2 * dv2 > 0.00000000000001) + c->switch_physics(true); + c->Pipe2->Flow(-dv2); + } + if (Couplers[1].Connected != nullptr && Couplers[0].Connected != nullptr && TestFlag(Couplers[0].CouplingFlag, ctrain_scndpneumatic) && TestFlag(Couplers[1].CouplingFlag, ctrain_scndpneumatic)) + { + dV = 0.00025 * dt * PF(Couplers[0].Connected->ScndPipePress, Couplers[1].Connected->ScndPipePress, Spz * 0.25); + Couplers[0].Connected->Pipe2->Flow(+dV); + Couplers[1].Connected->Pipe2->Flow(-dV); + } Pipe2->Flow(Hamulec->GetHPFlow(ScndPipePress, dt)); // NOTE: condition disabled to allow the air flow from the main hose to the main tank as well @@ -4841,7 +4780,7 @@ void TMoverParameters::UpdateScndPipePressure(double dt) // yB: 20190906 // Aktualizacja ciśnienia w hamulcu sprezynowym // ************************************************************************************************* -void TMoverParameters::UpdateSpringBrake(double dt) +void TMoverParameters::UpdateSpringBrake(double /*dt*/) { double BP = SpringBrake.PNBrakeConnection ? BrakePress : 0; double MSP = SpringBrake.ShuttOff ? 0 : SpringBrake.MaxSetPressure; @@ -4875,30 +4814,29 @@ double TMoverParameters::GetDVc(double dt) { // T_MoverParameters *c; TMoverParameters *c; - double dv1, dv2; // , dV; + double dv1; + double dv2; // , dV; dv1 = 0; dv2 = 0; // sprzeg 1 - if (Couplers[0].Connected != nullptr) - if (TestFlag(Couplers[0].CouplingFlag, ctrain_pneumatic)) - { //*0.85 - c = Couplers[0].Connected; // skrot //0.08 //e/D * L/D = e/D^2 * L - dv1 = 0.5 * dt * PF(PipePress, c->PipePress, Spg / (1.0 + 0.015 / Spg * Dim.L)); - if (dv1 * dv1 > 0.00000000000001) - c->switch_physics(true); - c->Pipe->Flow(-dv1); - } + if (Couplers[0].Connected != nullptr && TestFlag(Couplers[0].CouplingFlag, ctrain_pneumatic)) + { //*0.85 + c = Couplers[0].Connected; // skrot //0.08 //e/D * L/D = e/D^2 * L + dv1 = 0.5 * dt * PF(PipePress, c->PipePress, Spg / (1.0 + 0.015 / Spg * Dim.L)); + if (dv1 * dv1 > 0.00000000000001) + c->switch_physics(true); + c->Pipe->Flow(-dv1); + } // sprzeg 2 - if (Couplers[1].Connected != nullptr) - if (TestFlag(Couplers[1].CouplingFlag, ctrain_pneumatic)) - { - c = Couplers[1].Connected; // skrot - dv2 = 0.5 * dt * PF(PipePress, c->PipePress, Spg / (1.0 + 0.015 / Spg * Dim.L)); - if (dv2 * dv2 > 0.00000000000001) - c->switch_physics(true); - c->Pipe->Flow(-dv2); - } + if (Couplers[1].Connected != nullptr && TestFlag(Couplers[1].CouplingFlag, ctrain_pneumatic)) + { + c = Couplers[1].Connected; // skrot + dv2 = 0.5 * dt * PF(PipePress, c->PipePress, Spg / (1.0 + 0.015 / Spg * Dim.L)); + if (dv2 * dv2 > 0.00000000000001) + c->switch_physics(true); + c->Pipe->Flow(-dv2); + } // if ((Couplers[1].Connected != NULL) && (Couplers[0].Connected != NULL)) // if ((TestFlag(Couplers[0].CouplingFlag, ctrain_pneumatic)) && // (TestFlag(Couplers[1].CouplingFlag, ctrain_pneumatic))) @@ -4919,11 +4857,13 @@ double TMoverParameters::GetDVc(double dt) // ************************************************************************************************* void TMoverParameters::ComputeConstans(void) { - double BearingF, RollF, HideModifier; + double BearingF; + double RollF; + double HideModifier; double Curvature; // Ra 2014-07: odwrotność promienia TotalMassxg = TotalMass * g; // TotalMass*g - BearingF = DamageFlag & dtrain_bearing > 0 ? 2.0 : 0; + BearingF = (DamageFlag & dtrain_bearing) != 0 ? 2.0 : 0; HideModifier = 0; // int(Couplers[0].CouplingFlag>0)+int(Couplers[1].CouplingFlag>0); @@ -4948,7 +4888,7 @@ void TMoverParameters::ComputeConstans(void) // drag calculation { // NOTE: draft effect of previous vehicle is simplified and doesn't have much to do with reality - auto const *previousvehicle{Couplers[(V >= 0.0 ? end::front : end::rear)].Connected}; + auto const *previousvehicle{Couplers[V >= 0.0 ? end::front : end::rear].Connected}; auto dragarea{Dim.W * Dim.H}; if (previousvehicle) { @@ -5177,7 +5117,7 @@ double TMoverParameters::BrakeForceR(double ratio, double velocity) return BrakeForceP(press * ratio, velocity); } -double TMoverParameters::BrakeForceP(double press, double velocity) +double TMoverParameters::BrakeForceP(double press, double velocity) const { double BFP = 0; double K = ((press * P2FTrans - BrakeCylSpring) * BrakeCylMult[0] - BrakeSlckAdj) * BrakeRigEff; @@ -5190,10 +5130,11 @@ double TMoverParameters::BrakeForceP(double press, double velocity) // Q: 20160713 // oblicza siłę na styku koła i szyny // ************************************************************************************************* -double TMoverParameters::BrakeForce(TTrackParam const &Track) +double TMoverParameters::BrakeForce(TTrackParam const & /*Track*/) { - double K{0}, Fb{0}, sm{0}; + double K{0}; + double brakeforce{0}; switch (LocalBrake) { @@ -5250,11 +5191,11 @@ double TMoverParameters::BrakeForce(TTrackParam const &Track) // Fb:=UnitBrakeForce*NBpA {ham. reczny dziala na jedna os} // else //yB: to nie do konca ma sens, ponieważ ręczny w wagonie działa na jeden cylinder // hamulcowy/wózek, dlatego potrzebne są oddzielnie liczone osie - Fb = UnitBrakeForce * NBrakeAxles * std::max(1, NBpA); + brakeforce = UnitBrakeForce * NBrakeAxles * std::max(1, NBpA); // u:=((BrakePress*P2FTrans)-BrakeCylSpring*BrakeCylMult[BCMFlag]/BrakeCylNo-0.83*BrakeSlckAdj/(BrakeCylNo))*BrakeCylNo; // { end; } - return Fb; + return brakeforce; } // ************************************************************************************************* @@ -5334,7 +5275,7 @@ double TMoverParameters::Adhesive(double staticfriction) const double TMoverParameters::CouplerForce(int const End, double dt) { - auto &coupler{Couplers[End]}; + auto &thiscoupler{Couplers[End]}; auto *othervehicle{Neighbours[End].vehicle->MoverParameters}; auto const otherend{Neighbours[End].vehicle_end}; auto &othercoupler{othervehicle->Couplers[otherend]}; @@ -5349,81 +5290,81 @@ double TMoverParameters::CouplerForce(int const End, double dt) auto const absdV{std::abs(dV)}; // potentially generate sounds on clash or stretch - if (newdistance < 0.0 && coupler.Dist > newdistance && dV < -0.1 && false == coupler.has_adapter()) + if (newdistance < 0.0 && thiscoupler.Dist > newdistance && dV < -0.1 && false == thiscoupler.has_adapter()) { // HACK: with adapter present we presume buffers won't clash // 090503: dzwieki pracy zderzakow - SetFlag(coupler.sounds, absdV > 5.0 ? sound::bufferclash | sound::loud : sound::bufferclash); + SetFlag(thiscoupler.sounds, absdV > 5.0 ? sound::bufferclash | sound::loud : sound::bufferclash); } - else if (coupler.CouplingFlag != coupling::faux && newdistance > 0.001 && coupler.Dist <= 0.001 && absdV > 0.005 && Vel > 1.0) + else if (thiscoupler.CouplingFlag != coupling::faux && newdistance > 0.001 && thiscoupler.Dist <= 0.001 && absdV > 0.005 && Vel > 1.0) { // 090503: dzwieki pracy sprzegu - SetFlag(coupler.sounds, absdV > 0.035 ? sound::couplerstretch | sound::loud : sound::couplerstretch); + SetFlag(thiscoupler.sounds, absdV > 0.035 ? sound::couplerstretch | sound::loud : sound::couplerstretch); } - coupler.CheckCollision = false; - coupler.Dist = 0.0; + thiscoupler.CheckCollision = false; + thiscoupler.Dist = 0.0; double CF{0.0}; - if (coupler.CouplingFlag == coupling::faux && initialdistance > 0.05) + if (thiscoupler.CouplingFlag == coupling::faux && initialdistance > 0.05) { // arbitrary distance // potentially reset auto coupling lock - coupler.AutomaticCouplingAllowed = true; + thiscoupler.AutomaticCouplingAllowed = true; } - if (coupler.CouplingFlag != coupling::faux || initialdistance < 0) + if (thiscoupler.CouplingFlag != coupling::faux || initialdistance < 0) { - coupler.Dist = std::clamp(newdistance, coupler.has_adapter() ? 0 : -coupler.DmaxB, coupler.DmaxC); + thiscoupler.Dist = std::clamp(newdistance, thiscoupler.has_adapter() ? 0 : -thiscoupler.DmaxB, thiscoupler.DmaxC); double BetaAvg = 0; double Fmax = 0; - if (coupler.CouplingFlag == coupling::faux) + if (thiscoupler.CouplingFlag == coupling::faux) { - BetaAvg = coupler.beta; - Fmax = (coupler.FmaxC + coupler.FmaxB) * CouplerTune; + BetaAvg = thiscoupler.beta; + Fmax = (thiscoupler.FmaxC + thiscoupler.FmaxB) * CouplerTune; } else { // usrednij bo wspolny sprzeg - BetaAvg = 0.5 * (coupler.beta + othercoupler.beta); - Fmax = 0.5 * (coupler.FmaxC + coupler.FmaxB + othercoupler.FmaxC + othercoupler.FmaxB) * CouplerTune; + BetaAvg = 0.5 * (thiscoupler.beta + othercoupler.beta); + Fmax = 0.5 * (thiscoupler.FmaxC + thiscoupler.FmaxB + othercoupler.FmaxC + othercoupler.FmaxB) * CouplerTune; } - auto const distDelta{std::abs(newdistance) - std::abs(coupler.Dist)}; // McZapkie-191103: poprawka na histereze + auto const distDelta{std::abs(newdistance) - std::abs(thiscoupler.Dist)}; // McZapkie-191103: poprawka na histereze if (newdistance > 0) { if (distDelta > 0) { - CF = -(coupler.SpringKC + othercoupler.SpringKC) * coupler.Dist / 2.0 * DirF(End) - Fmax * dV * BetaAvg; + CF = -(thiscoupler.SpringKC + othercoupler.SpringKC) * thiscoupler.Dist / 2.0 * DirF(End) - Fmax * dV * BetaAvg; } else { - CF = -(coupler.SpringKC + othercoupler.SpringKC) * coupler.Dist / 2.0 * DirF(End) * BetaAvg - Fmax * dV * BetaAvg; + CF = -(thiscoupler.SpringKC + othercoupler.SpringKC) * thiscoupler.Dist / 2.0 * DirF(End) * BetaAvg - Fmax * dV * BetaAvg; } // liczenie sily ze sprezystosci sprzegu - if (newdistance > coupler.DmaxC + othercoupler.DmaxC) + if (newdistance > thiscoupler.DmaxC + othercoupler.DmaxC) { // zderzenie - coupler.CheckCollision = true; + thiscoupler.CheckCollision = true; } - if (std::abs(CF) > coupler.FmaxC) + if (std::abs(CF) > thiscoupler.FmaxC) { // coupler is stretched with excessive force, may break - coupler.stretch_duration += dt; + thiscoupler.stretch_duration += static_cast(dt); // give coupler 1 sec of leeway to account for simulation glitches, before checking whether it breaks // (arbitrary) chance to break grows from 10-100% over 10 sec period - if (Global.crash_damage && coupler.stretch_duration > 1.f && Random() < coupler.stretch_duration * 0.1f * dt) + if (Global.crash_damage && thiscoupler.stretch_duration > 1.f && Random() < thiscoupler.stretch_duration * 0.1f * dt) { damage_coupler(End); } } else { - coupler.stretch_duration = 0.f; + thiscoupler.stretch_duration = 0.f; } } if (newdistance < 0) @@ -5431,52 +5372,49 @@ double TMoverParameters::CouplerForce(int const End, double dt) if (distDelta > 0) { - CF = -(coupler.SpringKB + othercoupler.SpringKB) * coupler.Dist / 2.0 * DirF(End) - Fmax * dV * BetaAvg; + CF = -(thiscoupler.SpringKB + othercoupler.SpringKB) * thiscoupler.Dist / 2.0 * DirF(End) - Fmax * dV * BetaAvg; } else { - CF = -(coupler.SpringKB + othercoupler.SpringKB) * coupler.Dist / 2.0 * DirF(End) * BetaAvg - Fmax * dV * BetaAvg; + CF = -(thiscoupler.SpringKB + othercoupler.SpringKB) * thiscoupler.Dist / 2.0 * DirF(End) * BetaAvg - Fmax * dV * BetaAvg; } // liczenie sily ze sprezystosci zderzaka - auto const collisiondistance{(coupler.has_adapter() || othercoupler.has_adapter() ? - std::min(coupler.DmaxB, othercoupler.DmaxB) : // HACK: only take into account buffering ability of automatic coupler - coupler.DmaxB + othercoupler.DmaxB)}; + auto const collisiondistance{(thiscoupler.has_adapter() || othercoupler.has_adapter() ? + std::min(thiscoupler.DmaxB, othercoupler.DmaxB) : // HACK: only take into account buffering ability of automatic coupler + thiscoupler.DmaxB + othercoupler.DmaxB)}; if (-newdistance > collisiondistance) { // zderzenie - coupler.CheckCollision = true; + thiscoupler.CheckCollision = true; } - if (-newdistance >= std::min(collisiondistance, dEpsilon)) - { - if (coupler.type() == TCouplerType::Automatic && coupler.type() == othercoupler.type() && coupler.CouplingFlag == coupling::faux && - coupler.AutomaticCouplingAllowed && + if (-newdistance >= std::min(collisiondistance, dEpsilon) && thiscoupler.type() == TCouplerType::Automatic && thiscoupler.type() == othercoupler.type() && thiscoupler.CouplingFlag == coupling::faux && + thiscoupler.AutomaticCouplingAllowed && othercoupler.AutomaticCouplingAllowed) + { + // sprzeganie wagonow z samoczynnymi sprzegami + auto couplingtype{thiscoupler.AutomaticCouplingFlag & othercoupler.AutomaticCouplingFlag}; + // potentially exclude incompatible control coupling + if (thiscoupler.control_type != othercoupler.control_type) { - // sprzeganie wagonow z samoczynnymi sprzegami - auto couplingtype{coupler.AutomaticCouplingFlag & othercoupler.AutomaticCouplingFlag}; - // potentially exclude incompatible control coupling - if (coupler.control_type != othercoupler.control_type) - { - couplingtype &= ~coupling::control; - } - - if (Attach(End, otherend, othervehicle, couplingtype)) - { - // HACK: we're reusing sound enum to mark whether vehicle was connected to another - SetFlag(AIFlag, sound::attachcoupler); - coupler.AutomaticCouplingAllowed = false; - othercoupler.AutomaticCouplingAllowed = false; - } - /* - coupler.CouplingFlag = ( coupler.AutomaticCouplingFlag & othercoupler.AutomaticCouplingFlag ); - SetFlag( coupler.sounds, sound::attachcoupler ); - */ + couplingtype &= ~coupling::control; } + + if (Attach(End, otherend, othervehicle, couplingtype)) + { + // HACK: we're reusing sound enum to mark whether vehicle was connected to another + SetFlag(AIFlag, sound::attachcoupler); + thiscoupler.AutomaticCouplingAllowed = false; + othercoupler.AutomaticCouplingAllowed = false; + } + /* + coupler.CouplingFlag = ( coupler.AutomaticCouplingFlag & othercoupler.AutomaticCouplingFlag ); + SetFlag( coupler.sounds, sound::attachcoupler ); + */ } } } - if (coupler.CouplingFlag != coupling::faux) + if (thiscoupler.CouplingFlag != coupling::faux) { // uzgadnianie prawa Newtona othervehicle->Couplers[1 - End].CForce = -CF; @@ -5491,7 +5429,10 @@ double TMoverParameters::CouplerForce(int const End, double dt) // ************************************************************************************************* double TMoverParameters::TractionForce(double dt) { - double PosRatio, dmoment, dtrans, tmp; + double PosRatio; + double dmoment; + double dtrans; + double tmp; Ft = 0; dtrans = 0; @@ -5507,7 +5448,7 @@ double TMoverParameters::TractionForce(double dt) if (EIMCtrlType > 0) // sterowanie cyfrowe tmp = (DElist[0].RPM + (DElist[MainCtrlPosNo].RPM - DElist[0].RPM) * std::max(0.0, eimic_real)) / 60.0; else - tmp = DElist[(ControlPressureSwitch ? MainCtrlNoPowerPos() : MainCtrlPos)].RPM / 60.0; + tmp = DElist[ControlPressureSwitch ? MainCtrlNoPowerPos() : MainCtrlPos].RPM / 60.0; if (true == HeatingAllow && HeatingPower > 0 && EngineHeatingRPM > 0) { @@ -5628,14 +5569,14 @@ double TMoverParameters::TractionForce(double dt) { // TBD, TODO: currently ignores RVentType, fix this? RventRot += std::clamp(enrot - RventRot, -100.0, 50.0) * dt; - dizel_heat.rpmw += std::clamp(dizel_heat.rpmwz - dizel_heat.rpmw, -100.f, 50.f) * dt; - dizel_heat.rpmw2 += std::clamp(dizel_heat.rpmwz2 - dizel_heat.rpmw2, -100.f, 50.f) * dt; + dizel_heat.rpmw += static_cast(std::clamp(dizel_heat.rpmwz - dizel_heat.rpmw, -100.f, 50.f) * dt); + dizel_heat.rpmw2 += static_cast(std::clamp(dizel_heat.rpmwz2 - dizel_heat.rpmw2, -100.f, 50.f) * dt); } else { RventRot *= std::max(0.0, 1.0 - RVentSpeed * dt); - dizel_heat.rpmw *= std::max(0.0, 1.0 - dizel_heat.rpmw * dt); - dizel_heat.rpmw2 *= std::max(0.0, 1.0 - dizel_heat.rpmw2 * dt); + dizel_heat.rpmw *= static_cast(std::max(0.0, 1.0 - dizel_heat.rpmw * dt)); + dizel_heat.rpmw2 *= static_cast(std::max(0.0, 1.0 - dizel_heat.rpmw2 * dt)); } break; } @@ -5645,13 +5586,13 @@ double TMoverParameters::TractionForce(double dt) // NOTE: we update only radiator fans, as vehicles with diesel engine don't have other ventilators if (true == Mains) { - dizel_heat.rpmw += std::clamp(dizel_heat.rpmwz - dizel_heat.rpmw, -100.f, 50.f) * dt; - dizel_heat.rpmw2 += std::clamp(dizel_heat.rpmwz2 - dizel_heat.rpmw2, -100.f, 50.f) * dt; + dizel_heat.rpmw += static_cast(std::clamp(dizel_heat.rpmwz - dizel_heat.rpmw, -100.f, 50.f) * dt); + dizel_heat.rpmw2 += static_cast(std::clamp(dizel_heat.rpmwz2 - dizel_heat.rpmw2, -100.f, 50.f) * dt); } else { - dizel_heat.rpmw *= std::max(0.0, 1.0 - dizel_heat.rpmw * dt); - dizel_heat.rpmw2 *= std::max(0.0, 1.0 - dizel_heat.rpmw2 * dt); + dizel_heat.rpmw *= static_cast(std::max(0.0, 1.0 - dizel_heat.rpmw * dt)); + dizel_heat.rpmw2 *= static_cast(std::max(0.0, 1.0 - dizel_heat.rpmw2 * dt)); } break; } @@ -5711,14 +5652,11 @@ double TMoverParameters::TractionForce(double dt) case TEngineType::ElectricInductionMotor: { // TODO: check if we can use instead the code for electricseriesmotor - if (Mains) + // nie wchodzić w funkcję bez potrzeby + if (Mains && (std::max(GetTrainsetHighVoltage(), PantographVoltage) < EnginePowerSource.CollectorParameters.MinV || + std::max(GetTrainsetHighVoltage(), PantographVoltage) > EnginePowerSource.CollectorParameters.MaxV + 200)) { - // nie wchodzić w funkcję bez potrzeby - if (std::max(GetTrainsetHighVoltage(), PantographVoltage) < EnginePowerSource.CollectorParameters.MinV || - std::max(GetTrainsetHighVoltage(), PantographVoltage) > EnginePowerSource.CollectorParameters.MaxV + 200) - { - MainSwitch(false, TrainType == dt_EZT ? range_t::unit : range_t::local); // TODO: check whether we need to send this EMU-wide - } + MainSwitch(false, TrainType == dt_EZT ? range_t::unit : range_t::local); // TODO: check whether we need to send this EMU-wide } break; } @@ -5765,9 +5703,8 @@ double TMoverParameters::TractionForce(double dt) case TEngineType::WheelsDriven: { - if (EnginePowerSource.SourceType == TPowerSource::InternalSource) - if (EnginePowerSource.PowerType == TPowerType::BioPower) - Ft = Sign(sin(eAngle)) * PulseForce * Transmision.Ratio; + if (EnginePowerSource.SourceType == TPowerSource::InternalSource && EnginePowerSource.PowerType == TPowerType::BioPower) + Ft = Sign(sin(eAngle)) * PulseForce * Transmision.Ratio; PulseForceTimer = PulseForceTimer + dt; if (PulseForceTimer > CtrlDelay) { @@ -5936,7 +5873,6 @@ double TMoverParameters::TractionForce(double dt) auto power = Power; tempImax = DElist[MainCtrlPos].Imax; tempUmax = DElist[MainCtrlPos].Umax; - tempPmax = DElist[MainCtrlPos].GenPower; if (true == Heating) { power -= HeatingPower; @@ -6193,24 +6129,21 @@ double TMoverParameters::TractionForce(double dt) } } // malenie - if (MainCtrlPos < 12 && ScndCtrlPos > 0) + if (MainCtrlPos < 12 && ScndCtrlPos > 0 && Vel < 50.0) { - if (Vel < 50.0) + // above 50 km/h already active shunt field can be maintained until lower controller setting + if (ScndCtrlPos % 2 == 0) { - // above 50 km/h already active shunt field can be maintained until lower controller setting - if (ScndCtrlPos % 2 == 0) + if (MPTRelay[ScndCtrlPos].Idown < Im) { - if (MPTRelay[ScndCtrlPos].Idown < Im) - { - --ScndCtrlPos; - } + --ScndCtrlPos; } - else + } + else + { + if (MPTRelay[ScndCtrlPos + 1].Idown < Im && MPTRelay[ScndCtrlPos].Idown > Vel) { - if (MPTRelay[ScndCtrlPos + 1].Idown < Im && MPTRelay[ScndCtrlPos].Idown > Vel) - { - --ScndCtrlPos; - } + --ScndCtrlPos; } } } @@ -6244,7 +6177,7 @@ double TMoverParameters::TractionForce(double dt) if (true == Mains && !SecuritySystem.is_engine_blocked()) { double ActiveInverters = 0.0; - for (auto &inv : Inverters) + for (auto const &inv : Inverters) { if (inv.IsActive) ActiveInverters += 1.0; @@ -6296,6 +6229,8 @@ double TMoverParameters::TractionForce(double dt) SpeedCtrlValue = Vmax; SpeedCtrlTimer = 10; break; + default: + break; } } else if (ScndCtrlPosNo > 1) @@ -6311,7 +6246,7 @@ double TMoverParameters::TractionForce(double dt) SpeedCtrlTimer += dt; if (SpeedCtrlTimer > SpeedCtrlDelay) { - int NewSCAP = (float)ScndCtrlPos / (float)ScndCtrlPosNo * Vmax; + auto NewSCAP = static_cast((float)ScndCtrlPos / (float)ScndCtrlPosNo * Vmax); if (NewSCAP != SpeedCtrlValue) { SpeedCtrlValue = NewSCAP; @@ -6350,7 +6285,7 @@ double TMoverParameters::TractionForce(double dt) { PosRatio = 0; } - PosRatio = Round(20.0 * PosRatio) / 20.0; // stopniowanie PN/ED + PosRatio = static_cast(Round(20.0 * PosRatio)) / 20.0; // stopniowanie PN/ED if (PosRatio < 19.5 / 20.0) PosRatio *= 0.9; Hamulec->SetED(std::max(0.0, std::min(PosRatio, 1.0))); // ustalenie stopnia zmniejszenia ciśnienia @@ -6397,7 +6332,6 @@ double TMoverParameters::TractionForce(double dt) // (Hamulec as TLSt).SetLBP(LocBrakePress); tmp = 4; // szybkie malenie, powolne wzrastanie } - dmoment = eimv[eimv_Fful]; // NOTE: the commands to operate the sandbox are likely to conflict with other similar ai decisions // TODO: gather these in single place so they can be resolved together if (SlippingWheels) @@ -6501,9 +6435,8 @@ double TMoverParameters::TractionForce(double dt) auto const tmpV{std::abs(eimv[eimv_fp])}; auto const useFFEDList = FFEDListSize > 0 && DynamicBrakeFlag; auto const list = useFFEDList ? FFEDlist : FFlist; - auto const listSize = useFFEDList ? FFEDListSize : FFListSize; - if (listSize > 0 && std::abs(eimv[eimv_If]) > 1.0 && tmpV > 0.0001) + if (auto const listSize = useFFEDList ? FFEDListSize : FFListSize; listSize > 0 && std::abs(eimv[eimv_If]) > 1.0 && tmpV > 0.0001) { int i = 0; @@ -6540,8 +6473,8 @@ double TMoverParameters::TractionForce(double dt) eimv_pr = 0.0; EnginePower = 0.0; { - for (int i = 0; i < 21; ++i) - eimv[i] = 0.0; + for (auto &eimvvalue : eimv) + eimvvalue = 0.0; } Hamulec->SetED(0.0); InverterFrequency = 0.0; //(Hamulec as TLSt).SetLBP(LocBrakePress); @@ -6556,18 +6489,10 @@ double TMoverParameters::TractionForce(double dt) } } // case EngineType - switch (EngineType) - { - case TEngineType::DieselElectric: + if (EngineType == TEngineType::DieselElectric) { // rough approximation of extra effort to overcome friction etc EnginePower += EngineRPMRatio() * 0.15 * DElist[MainCtrlPosNo].GenPower; - break; - } - default: - { - break; - } } return Ft; @@ -6579,7 +6504,8 @@ double TMoverParameters::TractionForce(double dt) // ************************************************************************************************* double TMoverParameters::ComputeRotatingWheel(double WForce, double dt, double n) const { - double newn = 0, eps = 0; + double newn = 0; + double eps = 0; if (n == 0 && WForce * Sign(V) < 0) newn = 0; else @@ -6604,10 +6530,9 @@ bool TMoverParameters::FuseFlagCheck(void) const if (Power > 0.01) FFC = FuseFlag; else // pobor pradu jezeli niema mocy - for (int b = 0; b < 2; b++) - if (TestFlag(Couplers[b].CouplingFlag, coupling::control)) - if (Couplers[b].Connected->Power > 0.01) - FFC = Couplers[b].Connected->FuseFlagCheck(); + for (auto &thiscoupler : Couplers) + if (TestFlag(thiscoupler.CouplingFlag, coupling::control) && thiscoupler.Connected->Power > 0.01) + FFC = thiscoupler.Connected->FuseFlagCheck(); return FFC; } @@ -6641,8 +6566,7 @@ void TMoverParameters::FuseOff(void) bool TMoverParameters::UniversalResetButton(int const Button, range_t const Notify) { - auto const lowvoltagepower{Power24vIsAvailable || Power110vIsAvailable}; - if (false == lowvoltagepower) + if (auto const lowvoltagepower{Power24vIsAvailable || Power110vIsAvailable}; false == lowvoltagepower) { return false; } @@ -6665,43 +6589,34 @@ bool TMoverParameters::RelayReset(int const Relays, range_t const Notify) auto const lowvoltagepower{Power24vIsAvailable || Power110vIsAvailable}; bool reset{false}; - if (TestFlag(Relays, relay_t::maincircuitground)) - { - if ((EngineType == TEngineType::ElectricSeriesMotor || EngineType == TEngineType::DieselElectric) && + if (TestFlag(Relays, relay_t::maincircuitground) && (EngineType == TEngineType::ElectricSeriesMotor || EngineType == TEngineType::DieselElectric) && (GroundRelayStart == start_t::manual || GroundRelayStart == start_t::manualwithautofallback) && IsMainCtrlNoPowerPos() && ScndCtrlPos == 0 && DirActive != 0 && !TestFlag(EngDmgFlag, 1)) - { - // NOTE: true means the relay is operational - reset |= !GroundRelay && lowvoltagepower; - GroundRelay |= lowvoltagepower; - } + { + // NOTE: true means the relay is operational + reset |= !GroundRelay && lowvoltagepower; + GroundRelay |= lowvoltagepower; } - if (TestFlag(Relays, relay_t::tractionnmotoroverload)) - { - if ((EngineType == TEngineType::ElectricSeriesMotor || EngineType == TEngineType::DieselElectric) && IsMainCtrlNoPowerPos() && ScndCtrlPos == 0 && DirActive != 0 && + if (TestFlag(Relays, relay_t::tractionnmotoroverload) && (EngineType == TEngineType::ElectricSeriesMotor || EngineType == TEngineType::DieselElectric) && IsMainCtrlNoPowerPos() && ScndCtrlPos == 0 && DirActive != 0 && !TestFlag(EngDmgFlag, 1)) - { - // NOTE: false means the relay is operational - // TODO: cleanup, flip the FuseFlag code to match other relays - // TODO: check whether the power is required, TBD, TODO: make it configurable? - reset |= FuseFlag && lowvoltagepower; - FuseFlag &= !lowvoltagepower; - } + { + // NOTE: false means the relay is operational + // TODO: cleanup, flip the FuseFlag code to match other relays + // TODO: check whether the power is required, TBD, TODO: make it configurable? + reset |= FuseFlag && lowvoltagepower; + FuseFlag &= !lowvoltagepower; } - if (TestFlag(Relays, relay_t::primaryconverteroverload)) - { - if (ConverterOverloadRelayStart == start_t::manual + if (TestFlag(Relays, relay_t::primaryconverteroverload) && ConverterOverloadRelayStart == start_t::manual // && ( false == Mains ) && false == ConverterAllow) - { - // NOTE: false means the relay is operational - // TODO: cleanup, flip the FuseFlag code to match other relays - // TODO: check whether the power is required, TBD, TODO: make it configurable? - reset |= ConvOvldFlag && lowvoltagepower; - ConvOvldFlag &= !lowvoltagepower; - } + { + // NOTE: false means the relay is operational + // TODO: cleanup, flip the FuseFlag code to match other relays + // TODO: check whether the power is required, TBD, TODO: make it configurable? + reset |= ConvOvldFlag && lowvoltagepower; + ConvOvldFlag &= !lowvoltagepower; } if (reset) @@ -6725,7 +6640,8 @@ double TMoverParameters::v2n(void) { // przelicza predkosc liniowa na obrotowa const double dmgn = 0.5; - double n, deltan = 0; + double n; + double deltan = 0; n = V / (M_PI * WheelDiameter); // predkosc obrotowa wynikajaca z liniowej [obr/s] deltan = n - nrot; //"pochodna" prędkości obrotowej @@ -6734,14 +6650,10 @@ double TMoverParameters::v2n(void) SlippingWheels = false; // wygaszenie poslizgu */ //poslizg jest w innym miejscu wygaszany też if (SlippingWheels) // nie ma zwiazku z predkoscia liniowa V { // McZapkie-221103: uszkodzenia kol podczas poslizgu - if (deltan > dmgn) - if (FuzzyLogic(deltan, dmgn, p_slippdmg)) - if (SetFlag(DamageFlag, dtrain_wheelwear)) // podkucie - EventFlag = true; - if (deltan < -dmgn) - if (FuzzyLogic(-deltan, dmgn, p_slippdmg)) - if (SetFlag(DamageFlag, dtrain_thinwheel)) // wycieranie sie obreczy - EventFlag = true; + if (deltan > dmgn && FuzzyLogic(deltan, dmgn, p_slippdmg) && SetFlag(DamageFlag, dtrain_wheelwear)) // podkucie + EventFlag = true; + if (deltan < -dmgn && FuzzyLogic(-deltan, dmgn, p_slippdmg) && SetFlag(DamageFlag, dtrain_thinwheel)) // wycieranie sie obreczy + EventFlag = true; n = nrot; // predkosc obrotowa nie zalezy od predkosci liniowej } return n; @@ -6751,15 +6663,14 @@ double TMoverParameters::v2n(void) // Q: 20160714 // Oblicza moment siły wytwarzany przez silnik // ************************************************************************************************* -double TMoverParameters::Momentum(double I) +double TMoverParameters::Momentum(double I) const { // liczy moment sily wytwarzany przez silnik elektryczny} int SP; SP = ScndCtrlActualPos; - if (ScndInMain) - if (!(RList[MainCtrlActualPos].ScndAct == 255)) - SP = RList[MainCtrlActualPos].ScndAct; + if (ScndInMain && !(RList[MainCtrlActualPos].ScndAct == 255)) + SP = RList[MainCtrlActualPos].ScndAct; // Momentum:=mfi*I*(1-1.0/(Abs(I)/mIsat+1)); return motor_param(SP).mfi * I * (abs(I) / (abs(I) + motor_param(SP).mIsat) - motor_param(SP).mfi0); @@ -6769,7 +6680,7 @@ double TMoverParameters::Momentum(double I) // Q: 20160714 // Oblicza moment siły do sterowania wzbudzeniem // ************************************************************************************************* -double TMoverParameters::MomentumF(double I, double Iw, int SCP) +double TMoverParameters::MomentumF(double I, double Iw, int SCP) const { // umozliwia dokladne sterowanie wzbudzeniem @@ -6783,13 +6694,10 @@ double TMoverParameters::MomentumF(double I, double Iw, int SCP) bool TMoverParameters::CutOffEngine(void) { bool COE = false; // Ra: wartość domyślna, sprawdzić to trzeba - if (NPoweredAxles > 0 && CabActive == 0 && EngineType == TEngineType::ElectricSeriesMotor) + if (NPoweredAxles > 0 && CabActive == 0 && EngineType == TEngineType::ElectricSeriesMotor && SetFlag(DamageFlag, -dtrain_engine)) { - if (SetFlag(DamageFlag, -dtrain_engine)) - { - NPoweredAxles = NPoweredAxles / 2; // bylo div czyli mod? - COE = true; - } + NPoweredAxles = NPoweredAxles / 2; // bylo div czyli mod? + COE = true; } return COE; } @@ -6852,10 +6760,9 @@ bool TMoverParameters::ResistorsFlagCheck(void) const RFC = ResistorsFlag; else // pobor pradu jezeli niema mocy { - for (int b = 0; b < 2; b++) - if (TestFlag(Couplers[b].CouplingFlag, coupling::control)) - if (Couplers[b].Connected->Power > 0.01) - RFC = Couplers[b].Connected->ResistorsFlagCheck(); + for (auto &thiscoupler : Couplers) + if (TestFlag(thiscoupler.CouplingFlag, coupling::control) && thiscoupler.Connected->Power > 0.01) + RFC = thiscoupler.Connected->ResistorsFlagCheck(); } return RFC; } @@ -6887,7 +6794,6 @@ bool TMoverParameters::AutoRelaySwitch(bool State) bool TMoverParameters::AutoRelayCheck(void) { bool OK = false; // b:int; - bool ARC = false; auto const motorconnectorsoff{false == MotorConnectorsCheck()}; @@ -6944,16 +6850,13 @@ bool TMoverParameters::AutoRelayCheck(void) } else { // zmieniaj mainctrlactualpos - if (DirActive < 0 && TrainType != dt_PseudoDiesel) + if (DirActive < 0 && TrainType != dt_PseudoDiesel && RList[MainCtrlActualPos + 1].Bn > BackwardsBranchesAllowed) { - if (RList[MainCtrlActualPos + 1].Bn > BackwardsBranchesAllowed) - { - return false; // nie poprawiamy przy konwersji - // return ARC;// bbylo exit; //Ra: to powoduje, że EN57 nie wyłącza się przy IminLo - } + return false; // nie poprawiamy przy konwersji + // return ARC;// bbylo exit; //Ra: to powoduje, że EN57 nie wyłącza się przy IminLo } // main bez samoczynnego rozruchu - if (MainCtrlActualPos < sizeof(RList) / sizeof(TScheme) - 1 // crude guard against running out of current fixed table + if (MainCtrlActualPos < std::size(RList) - 1 // crude guard against running out of current fixed table && (RList[MainCtrlActualPos].Relay < MainCtrlPos || (RList[MainCtrlActualPos + 1].Relay == MainCtrlPos && MainCtrlActualPos < RlistSize) || (TrainType == dt_ET22 && DelayCtrlFlag))) { @@ -7048,12 +6951,12 @@ bool TMoverParameters::AutoRelayCheck(void) --MainCtrlActualPos; OK = true; } - if (MainCtrlActualPos > 0) // hunter-111211: poprawki - if (RList[MainCtrlActualPos].R == 0) - { - // dzwieki schodzenia z bezoporowej} - SetFlag(SoundFlag, sound::parallel); - } + // hunter-111211: poprawki + if (MainCtrlActualPos > 0 && RList[MainCtrlActualPos].R == 0) + { + // dzwieki schodzenia z bezoporowej} + SetFlag(SoundFlag, sound::parallel); + } } } else if (RList[MainCtrlActualPos].R > 0 && ScndCtrlActualPos > 0) @@ -7205,40 +7108,41 @@ bool TMoverParameters::OperatePantographsValve(operation_t const State, range_t switch (State) { - case operation_t::none: + using enum operation_t; + case none: { valve.is_enabled = false; valve.is_disabled = false; break; } - case operation_t::enable: + case enable: { valve.is_enabled = true; valve.is_disabled = false; break; } - case operation_t::disable: + case disable: { valve.is_enabled = false; valve.is_disabled = true; break; } - case operation_t::enable_on: + case enable_on: { valve.is_enabled = true; break; } - case operation_t::enable_off: + case enable_off: { valve.is_enabled = false; break; } - case operation_t::disable_on: + case disable_on: { valve.is_disabled = true; break; } - case operation_t::disable_off: + case disable_off: { valve.is_disabled = false; break; @@ -7264,40 +7168,41 @@ bool TMoverParameters::OperatePantographValve(end const End, operation_t const S switch (State) { - case operation_t::none: + using enum operation_t; + case none: { valve.is_enabled = false; valve.is_disabled = false; break; } - case operation_t::enable: + case enable: { valve.is_enabled = true; valve.is_disabled = false; break; } - case operation_t::disable: + case disable: { valve.is_enabled = false; valve.is_disabled = true; break; } - case operation_t::enable_on: + case enable_on: { valve.is_enabled = true; break; } - case operation_t::enable_off: + case enable_off: { valve.is_enabled = false; break; } - case operation_t::disable_on: + case disable_on: { valve.is_disabled = true; break; } - case operation_t::disable_off: + case disable_off: { valve.is_disabled = false; break; @@ -7390,6 +7295,8 @@ void TMoverParameters::CheckEIMIC(double dt) case 7: // TMax eimic += std::clamp(1.0 - eimic, 0.0, dt * 0.14); // dodawaj do 1, max break; + default: + break; } if (MainCtrlPos >= 3 && eimic < 0) eimic = 0; @@ -7419,6 +7326,8 @@ void TMoverParameters::CheckEIMIC(double dt) if (eimic < 0) eimic = 0; break; + default: + break; } } if (MainCtrlActualPos == MainCtrlPos) @@ -7537,11 +7446,8 @@ void TMoverParameters::CheckSpeedCtrl(double dt) { SpeedCtrlUnit.Standby = false; } - if (!SpeedCtrlUnit.BrakeIntervention) - { - if (Hamulec->GetEDBCP() > 0.4 || PipePress < HighPipePress - 0.2) - SpeedCtrlUnit.Standby = true; - } + if (!SpeedCtrlUnit.BrakeIntervention && (Hamulec->GetEDBCP() > 0.4 || PipePress < HighPipePress - 0.2)) + SpeedCtrlUnit.Standby = true; if (EIMCtrlType >= 3 && UniCtrlList[MainCtrlPos].SpeedUp <= 0) { accfactor = 0.0; @@ -7554,11 +7460,8 @@ void TMoverParameters::CheckSpeedCtrl(double dt) { if (!SpeedCtrlUnit.Standby) { - if (SpeedCtrlUnit.ManualStateOverride) - { - if (eimic > 0.0009) - eimic = 1.0; - } + if (SpeedCtrlUnit.ManualStateOverride && eimic > 0.0009) + eimic = 1.0; double error = std::max(SpeedCtrlValue + SpeedCtrlUnit.Offset, 0.0) - Vel; double factorP = error > 0 ? SpeedCtrlUnit.FactorPpos : SpeedCtrlUnit.FactorPneg; double eSCP = std::clamp(factorP * error, -1.2, 1.0); // P module @@ -7965,7 +7868,7 @@ double TMoverParameters::dizel_fillcheck(int mcp, double dt) else dizel_nreg_min = dizel_nmin; } - if (dizel_vel2nmax_Table.size() > 0 && !hydro_TC_Lockup) + if (!dizel_vel2nmax_Table.empty() && !hydro_TC_Lockup) { dizel_nreg_max = std::min(std::min(dizel_nreg_max, enrot) + dizel_nreg_acc * dt, TableInterpolation(dizel_vel2nmax_Table, Vel)); } @@ -8034,30 +7937,36 @@ double TMoverParameters::dizel_fillcheck(int mcp, double dt) // Q: 20160715 // Oblicza moment siły wytwarzany przez silnik spalinowy // ************************************************************************************************* -double TMoverParameters::dizel_Momentum(double dizel_fill, double n, double dt) +double TMoverParameters::dizel_Momentum(double Fill, double n, double dt) { // liczy moment sily wytwarzany przez silnik spalinowy} - double Moment = 0, enMoment = 0, gearMoment = 0, eps = 0, newn = 0, friction = 0, neps = 0; - double TorqueH = 0, TorqueL = 0, TorqueC = 0; + double Moment = 0; + double enMoment = 0; + double gearMoment = 0; + double eps = 0; + double newn = 0; + double friction = 0; + double TorqueH = 0; + double TorqueL = 0; + double TorqueC = 0; n = n * CabActive; if (motor_param(ScndCtrlActualPos).mIsat < 0.001 || DirActive == 0) n = enrot; friction = dizel_engagefriction; hydro_TC_nIn = enrot; // wal wejsciowy przetwornika momentu hydro_TC_nOut = dizel_n_old; // wal wyjsciowy przetwornika momentu - neps = (n - dizel_n_old) / dt; // przyspieszenie katowe walu wejsciowego skrzyni biegow if (enrot > 0) { if (dizel_Momentum_Table.size() > 1) { - Moment = TableInterpolation(dizel_Momentum_Table, enrot) * dizel_fill - dizel_Mstand; + Moment = TableInterpolation(dizel_Momentum_Table, enrot) * Fill - dizel_Mstand; } else { - Moment = (dizel_Mmax - (dizel_Mmax - dizel_Mnmax) * square((enrot - dizel_nMmax) / (dizel_nMmax - dizel_nmax))) * dizel_fill - dizel_Mstand; + Moment = (dizel_Mmax - (dizel_Mmax - dizel_Mnmax) * square((enrot - dizel_nMmax) / (dizel_nMmax - dizel_nmax))) * Fill - dizel_Mstand; } Mm = Moment; - dizel_FuelConsumptionActual = dizel_FuelConsumption * enrot * dizel_fill; + dizel_FuelConsumptionActual = dizel_FuelConsumption * enrot * Fill; dizel_FuelConsumptedTotal += dizel_FuelConsumptionActual * dt / 3600.0; if (hydro_R && hydro_R_Placement == 2) Moment -= dizel_MomentumRetarder(enrot, dt); @@ -8188,7 +8097,6 @@ double TMoverParameters::dizel_Momentum(double dizel_fill, double n, double dt) { dizel_engagedeltaomega = 0; gearMoment = Moment; - enMoment = 0; double enrot_min = enrot - (std::min(TorqueC, TorqueL + abs(hydro_TC_TorqueIn)) - Moment) / dizel_AIM * dt; double enrot_max = enrot + (std::min(TorqueC, TorqueL + abs(hydro_TC_TorqueIn)) + Moment) / dizel_AIM * dt; enrot = safe_clamp(n, enrot_min, enrot_max); @@ -8244,8 +8152,7 @@ double TMoverParameters::dizel_MomentumRetarder(double n, double dt) } double Moment = hydro_R_MaxTorque; - double pwr = Moment * std::abs(n) * M_PI * 2 * 0.001; - if (pwr > hydro_R_MaxPower) + if (double pwr = Moment * std::abs(n) * M_PI * 2 * 0.001; pwr > hydro_R_MaxPower) Moment = Moment * hydro_R_MaxPower / pwr; double moment_in = n * n * hydro_R_TorqueInIn; Moment = std::min(moment_in, Moment * hydro_R_Fill); @@ -8259,8 +8166,16 @@ double TMoverParameters::dizel_MomentumRetarder(double n, double dt) void TMoverParameters::dizel_HeatSet(float const Value) { - dizel_heat.Te = // TODO: don't include ambient temperature, pull it from environment data instead - dizel_heat.Ts = dizel_heat.To = dizel_heat.Tsr = dizel_heat.Twy = dizel_heat.Tsr2 = dizel_heat.Twy2 = dizel_heat.temperatura1 = dizel_heat.temperatura2 = Value; + // TODO: don't include ambient temperature, pull it from environment data instead + dizel_heat.Te = Value; + dizel_heat.Ts = Value; + dizel_heat.To = Value; + dizel_heat.Tsr = Value; + dizel_heat.Twy = Value; + dizel_heat.Tsr2 = Value; + dizel_heat.Twy2 = Value; + dizel_heat.temperatura1 = Value; + dizel_heat.temperatura2 = Value; } // calculates diesel engine temperature and heat transfers @@ -8314,13 +8229,13 @@ void TMoverParameters::dizel_Heat(double const dt) // silnik oddaje czesc ciepla do wody chlodzacej, a takze pewna niewielka czesc do otoczenia, modyfikowane przez okienko auto const Qs{(Qd - dizel_heat.kfs * (dizel_heat.Ts - dizel_heat.Tsr) - dizel_heat.kfe * /* ( 0.3 + 0.7 * ( dizel_heat.okienko ? 1 : 0 ) ) * */ (dizel_heat.Ts - dizel_heat.Te))}; auto const dTss{Qs / Cs}; - dizel_heat.Ts += dTss * dt; + dizel_heat.Ts += static_cast(dTss * dt); // oil heat transfers // olej oddaje cieplo do wody gdy krazy przez wymiennik ciepla == wlaczona pompka lub silnik auto const dTo{(dizel_heat.auxiliary_water_circuit ? (dizel_heat.kfo * (dizel_heat.Ts - dizel_heat.To) - dizel_heat.kfo2 * (dizel_heat.To - dizel_heat.Tsr2)) / (gwO * Co) : (dizel_heat.kfo * (dizel_heat.Ts - dizel_heat.To) - dizel_heat.kfo2 * (dizel_heat.To - dizel_heat.Tsr)) / (gwO * Co))}; - dizel_heat.To += dTo * dt; + dizel_heat.To += static_cast(dTo * dt); // heater /* @@ -8339,7 +8254,7 @@ void TMoverParameters::dizel_Heat(double const dt) (true == Mains && BatteryVoltage > 0.75 * NominalBatteryVoltage /* && !bezpompy && !awaria_chlodzenia && !WS10 */ && dizel_heat.water_aux.config.temp_cooling > 0 && dizel_heat.temperatura2 > dizel_heat.water_aux.config.temp_cooling - (dizel_heat.water_aux.is_warm ? 8 : 0)); auto const PTC2{(dizel_heat.water_aux.is_warm /*or PTC2p*/ ? 1 : 0)}; - dizel_heat.rpmwz2 = PTC2 * (dizel_heat.fan_speed >= 0 ? rpm * dizel_heat.fan_speed : dizel_heat.fan_speed * -1); + dizel_heat.rpmwz2 = static_cast(PTC2 * (dizel_heat.fan_speed >= 0 ? rpm * dizel_heat.fan_speed : dizel_heat.fan_speed * -1)); dizel_heat.zaluzje2 = dizel_heat.water_aux.config.shutters ? PTC2 == 1 : true; // no shutters is an equivalent to having them open auto const zaluzje2{(dizel_heat.zaluzje2 ? 1 : 0)}; // auxiliary water circuit heat transfer values @@ -8351,8 +8266,8 @@ void TMoverParameters::dizel_Heat(double const dt) // auxiliary water circuit heat transfers finalization // NOTE: since primary circuit doesn't read data from the auxiliary one, we can pretty safely finalize auxiliary updates before touching the primary circuit auto const Twe2{dizel_heat.Twy2 + dTch2 * dt}; - dizel_heat.Twy2 = Twe2 + dTs2 * dt; - dizel_heat.Tsr2 = 0.5 * (dizel_heat.Twy2 + Twe2); + dizel_heat.Twy2 = static_cast(Twe2 + dTs2 * dt); + dizel_heat.Tsr2 = static_cast(0.5 * (dizel_heat.Twy2 + Twe2)); dizel_heat.temperatura2 = dizel_heat.Twy2; } // primary water circuit setup @@ -8362,7 +8277,7 @@ void TMoverParameters::dizel_Heat(double const dt) true == dizel_heat.cooling || (true == Mains && BatteryVoltage > 0.75 * NominalBatteryVoltage /* && !bezpompy && !awaria_chlodzenia && !WS10 */ && dizel_heat.water.config.temp_cooling > 0 && dizel_heat.temperatura1 > dizel_heat.water.config.temp_cooling - (dizel_heat.water.is_warm ? 8 : 0)); auto const PTC1{(dizel_heat.water.is_warm /*or PTC1p*/ ? 1 : 0)}; - dizel_heat.rpmwz = PTC1 * (dizel_heat.fan_speed >= 0 ? rpm * dizel_heat.fan_speed : dizel_heat.fan_speed * -1); + dizel_heat.rpmwz = static_cast(PTC1 * (dizel_heat.fan_speed >= 0 ? rpm * dizel_heat.fan_speed : dizel_heat.fan_speed * -1)); dizel_heat.zaluzje1 = dizel_heat.water.config.shutters ? PTC1 == 1 : true; // no shutters is an equivalent to having them open auto const zaluzje1{(dizel_heat.zaluzje1 ? 1 : 0)}; // primary water circuit heat transfer values @@ -8373,8 +8288,8 @@ void TMoverParameters::dizel_Heat(double const dt) auto const dTch{Qch / (gw * Cw)}; // primary water circuit heat transfers finalization auto const Twe{dizel_heat.Twy + dTch * dt}; - dizel_heat.Twy = Twe + dTs * dt; - dizel_heat.Tsr = 0.5 * (dizel_heat.Twy + Twe); + dizel_heat.Twy = static_cast(Twe + dTs * dt); + dizel_heat.Tsr = static_cast(0.5 * (dizel_heat.Twy + Twe)); dizel_heat.temperatura1 = dizel_heat.Twy; /* fuelConsumed = fuelConsumed + ( Ge * 0.5 ); @@ -8422,10 +8337,10 @@ void TMoverParameters::dizel_Heat(double const dt) */ } -bool TMoverParameters::AssignLoad(std::string const &Name, float const Amount) +bool TMoverParameters::AssignLoad(std::string const &Loadname, float const Amount) { - if (Name == "pantstate") + if (Loadname == "pantstate") { if (EnginePowerSource.SourceType == TPowerSource::CurrentCollector) { @@ -8465,40 +8380,38 @@ bool TMoverParameters::AssignLoad(std::string const &Name, float const Amount) } } - if (Name.empty()) + if (Loadname.empty()) { // empty the vehicle if requested - LoadTypeChange = LoadType.name != Name; + LoadTypeChange = LoadType.name != Loadname; LoadType = load_attributes(); LoadAmount = 0.f; return true; } // can't mix load types, at least for the time being - if (LoadAmount > 0 && LoadType.name != Name) + if (LoadAmount > 0 && LoadType.name != Loadname) { return false; } - for (auto const &loadattributes : LoadAttributes) + auto const loadattributes = std::ranges::find_if(LoadAttributes, [&](auto const &attributes) { return attributes.name == Loadname; }); + if (loadattributes == std::end(LoadAttributes)) { - if (Name == loadattributes.name) - { - LoadTypeChange = LoadType.name != Name; - LoadType = loadattributes; - LoadAmount = std::clamp(Amount, 0.f, MaxLoad); - ComputeMass(); - return true; - } + // didn't find matching load configuration, this type is unsupported + return false; } - // didn't find matching load configuration, this type is unsupported - return false; + LoadTypeChange = LoadType.name != Loadname; + LoadType = *loadattributes; + LoadAmount = std::clamp(Amount, 0.f, MaxLoad); + ComputeMass(); + return true; } // ************************************************************************************************* // Q: 20160713 // Test zakończenia załadunku / rozładunku // ************************************************************************************************* -bool TMoverParameters::LoadingDone(double const LSpeed, std::string const &Loadname) +bool TMoverParameters::LoadingDone(double const LSpeed, std::string_view Loadname) { if (LSpeed == 0.0) @@ -8555,7 +8468,7 @@ bool TMoverParameters::LoadingDone(double const LSpeed, std::string const &Loadn if (LoadAmount >= MaxLoad * (1.0 + OverLoadFactor) || CommandIn.Value1 <= 0) { LoadStatus = 4; // skończony załadunek - LoadAmount = std::min(MaxLoad * (1.0 + OverLoadFactor), LoadAmount); + LoadAmount = std::min(static_cast(MaxLoad * (1.0 + OverLoadFactor)), LoadAmount); } ComputeMass(); } @@ -8794,10 +8707,10 @@ void TMoverParameters::update_doors(double const Deltatime) if (false == door.step_unfolding // no wait if no doorstep || Doors.step_type == 2) { // no wait for rotating doorstep - door.open_delay += Deltatime; + door.open_delay += static_cast(Deltatime); if (door.open_delay > Doors.open_delay) { - door.position = std::min(Doors.range, door.position + Doors.open_rate * Deltatime); + door.position = std::min(Doors.range, static_cast(door.position + Doors.open_rate * Deltatime)); } } door.close_delay = 0.f; @@ -8805,10 +8718,10 @@ void TMoverParameters::update_doors(double const Deltatime) if (true == door.is_closing) { // close door - door.close_delay += Deltatime; + door.close_delay += static_cast(Deltatime); if (door.close_delay > Doors.close_delay) { - door.position = std::max(0.f, door.position - Doors.close_rate * Deltatime); + door.position = std::max(0.f, static_cast(door.position - Doors.close_rate * Deltatime)); } door.open_delay = 0.f; } @@ -8816,7 +8729,7 @@ void TMoverParameters::update_doors(double const Deltatime) if (door.step_unfolding) { // unfold left doorstep - door.step_position = std::min(1.f, door.step_position + Doors.step_rate * Deltatime); + door.step_position = std::min(1.f, static_cast(door.step_position + Doors.step_rate * Deltatime)); } if (door.step_folding) { @@ -8826,12 +8739,12 @@ void TMoverParameters::update_doors(double const Deltatime) // multi-unit vehicles typically fold the doorstep only after closing the door if (door.position <= 0.f) { - door.step_position = std::max(0.f, door.step_position - Doors.step_rate * Deltatime); + door.step_position = std::max(0.f, static_cast(door.step_position - Doors.step_rate * Deltatime)); } } else { - door.step_position = std::max(0.f, door.step_position - Doors.step_rate * Deltatime); + door.step_position = std::max(0.f, static_cast(door.step_position - Doors.step_rate * Deltatime)); } } } @@ -8854,7 +8767,7 @@ void TMoverParameters::update_doors(double const Deltatime) if (door.auto_timer > 0.f) { - door.auto_timer -= Deltatime; + door.auto_timer -= static_cast(Deltatime); } // if there's load exchange in progress, reset the timer(s) for already open doors if (door.auto_timer != -1.f && (LoadStatus & (2 | 1)) != 0) @@ -8908,9 +8821,7 @@ bool TMoverParameters::ChangeOffsetH(double DeltaOffset) std::string TMoverParameters::EngineDescription(int what) const { std::string outstr{"OK"}; - switch (what) - { - case 0: + if (what == 0) { if (DamageFlag == 255) { @@ -8960,13 +8871,10 @@ std::string TMoverParameters::EngineDescription(int what) const outstr = "DERAILED"; } } - break; } - default: + else { outstr = "Invalid qualifier"; - break; - } } return outstr; } @@ -8978,22 +8886,21 @@ std::string TMoverParameters::EngineDescription(int what) const double TMoverParameters::GetTrainsetVoltage(int const Coupling) const { // ABu: funkcja zwracajaca napiecie dla calego skladu, przydatna dla EZT // TBD, TODO: call once per vehicle update, return cached results? - double voltages[] = {0.0, 0.0}; + std::array voltages{0.0, 0.0}; for (int end = end::front; end <= end::rear; ++end) { if (Couplers[end].Connected == nullptr) { continue; } - auto const &coupler{Couplers[end]}; - auto const fullcoupling{coupler.CouplingFlag | (TestFlag(coupler.CouplingFlag, coupler.PowerCoupling) ? coupler.PowerFlag : 0)}; - if ((fullcoupling & Coupling) == 0) + auto const &thiscoupler{Couplers[end]}; + if (auto const fullcoupling{thiscoupler.CouplingFlag | (TestFlag(thiscoupler.CouplingFlag, thiscoupler.PowerCoupling) ? thiscoupler.PowerFlag : 0)}; (fullcoupling & Coupling) == 0) { continue; } - auto *connectedpowercoupling = (Coupling & (coupling::highvoltage | coupling::heating)) != 0 ? &coupler.Connected->Couplers[coupler.ConnectedNr].power_high : - (Coupling & coupling::power110v) != 0 ? &coupler.Connected->Couplers[coupler.ConnectedNr].power_110v : - (Coupling & coupling::power24v) != 0 ? &coupler.Connected->Couplers[coupler.ConnectedNr].power_24v : + auto const *connectedpowercoupling = (Coupling & (coupling::highvoltage | coupling::heating)) != 0 ? &thiscoupler.Connected->Couplers[thiscoupler.ConnectedNr].power_high : + (Coupling & coupling::power110v) != 0 ? &thiscoupler.Connected->Couplers[thiscoupler.ConnectedNr].power_110v : + (Coupling & coupling::power24v) != 0 ? &thiscoupler.Connected->Couplers[thiscoupler.ConnectedNr].power_24v : nullptr; if (connectedpowercoupling != nullptr && connectedpowercoupling->is_live) { @@ -9032,15 +8939,25 @@ bool TMoverParameters::switch_physics(bool const State) // DO PRZETLUMACZENIA NA // FUNKCJE PARSERA WCZYTYWANIA PLIKU FIZYKI POJAZDU // ************************************************************************************************* bool startBPT; -bool startMPT, startMPT0; -bool startRLIST, startUCLIST; -bool startDIZELMOMENTUMLIST, startDIZELV2NMAXLIST, startHYDROTCLIST, startPMAXLIST; -bool startDLIST, startFFLIST, startWWLIST, startWiperList, startDimmerList, startFFEDLIST; +bool startMPT; +bool startMPT0; +bool startRLIST; +bool startUCLIST; +bool startDIZELMOMENTUMLIST; +bool startDIZELV2NMAXLIST; +bool startHYDROTCLIST; +bool startPMAXLIST; +bool startDLIST; +bool startFFLIST; +bool startWWLIST; +bool startWiperList; +bool startDimmerList; +bool startFFEDLIST; bool startLIGHTSLIST; bool startCOMPRESSORLIST; int LISTLINE; -bool issection(std::string const &Name, std::string const &Input) +bool issection(std::string_view Name, std::string_view Input) { return Input.compare(0, Name.size(), Name) == 0; @@ -9050,10 +8967,10 @@ int s2NPW(std::string s) { // wylicza ilosc osi napednych z opisu ukladu osi const char A = 64; int NPW = 0; - for (std::size_t k = 0; k < s.size(); ++k) + for (char const chentry : s) { - if (s[k] >= (char)65 && s[k] <= (char)90) - NPW += s[k] - A; + if (chentry >= (char)65 && chentry <= (char)90) + NPW += chentry - A; } return NPW; } @@ -9062,10 +8979,10 @@ int s2NNW(std::string s) { // wylicza ilosc osi nienapedzanych z opisu ukladu osi const char Zero = 48; int NNW = 0; - for (std::size_t k = 0; k < s.size(); ++k) + for (char const ch : s) { - if (s[k] >= (char)49 && s[k] <= (char)57) - NNW += s[k] - Zero; + if (ch >= (char)49 && ch <= (char)57) + NNW += ch - Zero; } return NNW; } @@ -9101,18 +9018,13 @@ bool TMoverParameters::readMPT0(std::string const &line) { return false; } - switch (EngineType) - { - case TEngineType::DieselEngine: + if (EngineType == TEngineType::DieselEngine) { parser >> MotorParam[idx].mIsat >> MotorParam[idx].fi0 >> MotorParam[idx].fi >> MotorParam[idx].mfi0 >> MotorParam[idx].mfi >> MotorParam[idx].Isat; - break; } - default: + else { parser >> MotorParam[idx].mfi >> MotorParam[idx].mIsat >> MotorParam[idx].mfi0 >> MotorParam[idx].fi >> MotorParam[idx].Isat >> MotorParam[idx].fi0; - break; - } } if (true == parser.getTokens(1, false)) { @@ -9274,7 +9186,7 @@ bool TMoverParameters::readRList(std::string const &Input) return false; } auto idx = LISTLINE++; - if (idx >= sizeof(RList) / sizeof(TScheme)) + if (idx >= std::size(RList)) { WriteLog("Read RList: number of entries exceeded capacity of the data table"); return false; @@ -9299,7 +9211,7 @@ bool TMoverParameters::readUCList(std::string const &line) cParser parser(line); parser.getTokens(10, false); auto idx = LISTLINE++; - if (idx >= sizeof(UniCtrlList) / sizeof(TUniversalCtrl)) + if (idx >= std::size(UniCtrlList)) { WriteLog("Read UCList: number of entries exceeded capacity of the data table"); return false; @@ -9317,7 +9229,7 @@ bool TMoverParameters::readDList(std::string const &line) cParser parser(line); parser.getTokens(3, false); auto idx = LISTLINE++; - if (idx >= sizeof(RList) / sizeof(TScheme)) + if (idx >= std::size(RList)) { WriteLog("Read DList: number of entries exceeded capacity of the data table"); return false; @@ -9337,7 +9249,7 @@ bool TMoverParameters::readDMList(std::string const &line) WriteLog("Read DMList: arguments missing in line " + std::to_string(LISTLINE + 1)); return false; } - auto idx = LISTLINE++; + ++LISTLINE; double x = 0.0; double y = 0.0; parser >> x >> y; @@ -9357,7 +9269,7 @@ bool TMoverParameters::readV2NMAXList(std::string const &line) WriteLog("Read V2nmaxList: arguments missing in line " + std::to_string(LISTLINE + 1)); return false; } - auto idx = LISTLINE++; + ++LISTLINE; double x = 0.0; double y = 0.0; parser >> x >> y; @@ -9377,7 +9289,7 @@ bool TMoverParameters::readHTCList(std::string const &line) WriteLog("Read HTCList: arguments missing in line " + std::to_string(LISTLINE + 1)); return false; } - auto idx = LISTLINE++; + ++LISTLINE; double x = 0.0; double y = 0.0; parser >> x >> y; @@ -9397,7 +9309,7 @@ bool TMoverParameters::readPmaxList(std::string const &line) WriteLog("Read PmaxList: arguments missing in line " + std::to_string(LISTLINE + 1)); return false; } - auto idx = LISTLINE++; + ++LISTLINE; double x = 0.0; double y = 0.0; parser >> x >> y; @@ -9417,7 +9329,7 @@ bool TMoverParameters::readFFList(std::string const &line) return false; } int idx = LISTLINE++; - if (idx >= sizeof(FFlist) / sizeof(TFFScheme)) + if (idx >= std::size(FFlist)) { WriteLog("Read FList: number of entries exceeded capacity of the data table"); return false; @@ -9437,7 +9349,7 @@ bool TMoverParameters::readFFEDList(std::string const &line) return false; } int idx = LISTLINE++; - if (idx >= sizeof(FFEDlist) / sizeof(TFFScheme)) + if (idx >= std::size(FFEDlist)) { WriteLog("Read FList: number of entries exceeded capacity of the data table"); return false; @@ -9457,7 +9369,7 @@ bool TMoverParameters::readWiperList(std::string const &line) return false; } int idx = LISTLINE++; - if (idx >= sizeof(WiperList) / sizeof(TWiperScheme)) + if (idx >= std::size(WiperList)) { WriteLog("Read WiperList: number of entries exceeded capacity of the data table"); return false; @@ -9474,7 +9386,7 @@ bool TMoverParameters::readDimmerList(std::string const &line) WriteLog("Read DimmerList: arguments missing in line " + std::to_string(LISTLINE + 1)); return false; } - int idx = LISTLINE++; + ++LISTLINE; dimPosition dps; parser >> dps.isHighBeam >> dps.isDimmed >> dps.isOff; @@ -9493,7 +9405,7 @@ bool TMoverParameters::readWWList(std::string const &line) return false; } int idx = LISTLINE++; - if (idx >= sizeof(DElist) / sizeof(TDEScheme)) + if (idx >= std::size(DElist)) { WriteLog("Read WWList: number of entries exceeded capacity of the data table"); return false; @@ -9557,42 +9469,43 @@ bool TMoverParameters::readCompressorList(std::string const &Input) // ************************************************************************************************* void TMoverParameters::BrakeValveDecode(std::string const &Valve) { + using enum TBrakeValve; - std::map valvetypes{{"W", TBrakeValve::W}, - {"W_Lu_L", TBrakeValve::W_Lu_L}, - {"W_Lu_XR", TBrakeValve::W_Lu_XR}, - {"W_Lu_VI", TBrakeValve::W_Lu_VI}, - {"K", TBrakeValve::K}, - {"Kg", TBrakeValve::Kg}, - {"Kp", TBrakeValve::Kp}, - {"Kss", TBrakeValve::Kss}, - {"Kkg", TBrakeValve::Kkg}, - {"Kkp", TBrakeValve::Kkp}, - {"Kks", TBrakeValve::Kks}, - {"Hikp1", TBrakeValve::Hikp1}, - {"Hikss", TBrakeValve::Hikss}, - {"Hikg1", TBrakeValve::Hikg1}, - {"KE", TBrakeValve::KE}, - {"SW", TBrakeValve::SW}, - {"EStED", TBrakeValve::EStED}, - {"NESt3", TBrakeValve::NESt3}, - {"ESt3", TBrakeValve::ESt3}, - {"LSt", TBrakeValve::LSt}, - {"ESt4", TBrakeValve::ESt4}, - {"ESt3AL2", TBrakeValve::ESt3AL2}, - {"EP1", TBrakeValve::EP1}, - {"EP2", TBrakeValve::EP2}, - {"M483", TBrakeValve::M483}, - {"CV1_L_TR", TBrakeValve::CV1_L_TR}, - {"CV1", TBrakeValve::CV1}, - {"CV1_R", TBrakeValve::CV1_R}}; + std::map> valvetypes{{"W", W}, + {"W_Lu_L", W_Lu_L}, + {"W_Lu_XR", W_Lu_XR}, + {"W_Lu_VI", W_Lu_VI}, + {"K", K}, + {"Kg", Kg}, + {"Kp", Kp}, + {"Kss", Kss}, + {"Kkg", Kkg}, + {"Kkp", Kkp}, + {"Kks", Kks}, + {"Hikp1", Hikp1}, + {"Hikss", Hikss}, + {"Hikg1", Hikg1}, + {"KE", KE}, + {"SW", SW}, + {"EStED", EStED}, + {"NESt3", NESt3}, + {"ESt3", ESt3}, + {"LSt", LSt}, + {"ESt4", ESt4}, + {"ESt3AL2", ESt3AL2}, + {"EP1", EP1}, + {"EP2", EP2}, + {"M483", M483}, + {"CV1_L_TR", CV1_L_TR}, + {"CV1", CV1}, + {"CV1_R", CV1_R}}; auto lookup = valvetypes.find(Valve); - BrakeValve = lookup != valvetypes.end() ? lookup->second : TBrakeValve::Other; + BrakeValve = lookup != valvetypes.end() ? lookup->second : Other; - if (BrakeValve == TBrakeValve::Other && contains(Valve, "ESt")) + if (BrakeValve == Other && contains(Valve, "ESt")) { - BrakeValve = TBrakeValve::ESt3; + BrakeValve = ESt3; } } @@ -9601,32 +9514,36 @@ void TMoverParameters::BrakeValveDecode(std::string const &Valve) // ************************************************************************************************* void TMoverParameters::BrakeSubsystemDecode() { - BrakeSubsystem = TBrakeSubSystem::ss_None; + using enum TBrakeSubSystem; + BrakeSubsystem = ss_None; switch (BrakeValve) { - case TBrakeValve::W: - case TBrakeValve::W_Lu_L: - case TBrakeValve::W_Lu_VI: - case TBrakeValve::W_Lu_XR: - BrakeSubsystem = TBrakeSubSystem::ss_W; + using enum TBrakeValve; + case W: + case W_Lu_L: + case W_Lu_VI: + case W_Lu_XR: + BrakeSubsystem = ss_W; break; - case TBrakeValve::ESt3: - case TBrakeValve::ESt3AL2: - case TBrakeValve::ESt4: - case TBrakeValve::EP2: - case TBrakeValve::EP1: - BrakeSubsystem = TBrakeSubSystem::ss_ESt; + case ESt3: + case ESt3AL2: + case ESt4: + case EP2: + case EP1: + BrakeSubsystem = ss_ESt; break; - case TBrakeValve::KE: - BrakeSubsystem = TBrakeSubSystem::ss_KE; + case KE: + BrakeSubsystem = ss_KE; break; - case TBrakeValve::CV1: - case TBrakeValve::CV1_L_TR: - BrakeSubsystem = TBrakeSubSystem::ss_Dako; + case CV1: + case CV1_L_TR: + BrakeSubsystem = ss_Dako; break; - case TBrakeValve::LSt: - case TBrakeValve::EStED: - BrakeSubsystem = TBrakeSubSystem::ss_LSt; + case LSt: + case EStED: + BrakeSubsystem = ss_LSt; + break; + default: break; } } @@ -9637,12 +9554,9 @@ void TMoverParameters::BrakeSubsystemDecode() // TDynamicObject::Init() // Po niej wykonywana jest CreateBrakeSys(), ktora jest odpowiednikiem CheckLocomotiveParameters() // ************************************************************************************************* -bool TMoverParameters::LoadFIZ(std::string chkpath) +bool TMoverParameters::LoadFIZ(std::string const &chkpath) { chkPath = chkpath; // assign class path for reloading - const int param_ok = 1; - const int wheels_ok = 2; - const int dimensions_ok = 4; ConversionError = 666; LISTLINE = 0; @@ -9810,7 +9724,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) if (issection("Param.", inputline)) { startBPT = false; - fizlines.emplace("Param", inputline); + fizlines.try_emplace("Param", inputline); LoadFIZ_Param(inputline); continue; } @@ -9818,7 +9732,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) if (issection("Load:", inputline)) { startBPT = false; - fizlines.emplace("Load", inputline); + fizlines.try_emplace("Load", inputline); LoadFIZ_Load(inputline); continue; } @@ -9826,7 +9740,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) if (issection("Dimensions:", inputline)) { startBPT = false; - fizlines.emplace("Dimensions", inputline); + fizlines.try_emplace("Dimensions", inputline); LoadFIZ_Dimensions(inputline); continue; } @@ -9834,7 +9748,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) if (issection("Wheels:", inputline)) { startBPT = false; - fizlines.emplace("Wheels", inputline); + fizlines.try_emplace("Wheels", inputline); LoadFIZ_Wheels(inputline); continue; } @@ -9842,7 +9756,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) if (issection("Brake:", inputline)) { startBPT = false; - fizlines.emplace("Brake", inputline); + fizlines.try_emplace("Brake", inputline); LoadFIZ_Brake(inputline); continue; } @@ -9851,7 +9765,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) { startBPT = false; - fizlines.emplace("Doors", inputline); + fizlines.try_emplace("Doors", inputline); LoadFIZ_Doors(inputline); continue; } @@ -9860,7 +9774,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) { startBPT = false; - fizlines.emplace("BuffCoupl", inputline); + fizlines.try_emplace("BuffCoupl", inputline); LoadFIZ_BuffCoupl(inputline, 0); continue; } @@ -9869,7 +9783,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) { startBPT = false; - fizlines.emplace("BuffCoupl1", inputline); + fizlines.try_emplace("BuffCoupl1", inputline); LoadFIZ_BuffCoupl(inputline, 1); continue; } @@ -9878,7 +9792,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) { startBPT = false; - fizlines.emplace("BuffCoupl2", inputline); + fizlines.try_emplace("BuffCoupl2", inputline); LoadFIZ_BuffCoupl(inputline, 2); continue; } @@ -9887,7 +9801,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) { startBPT = false; - fizlines.emplace("TurboPos", inputline); + fizlines.try_emplace("TurboPos", inputline); LoadFIZ_TurboPos(inputline); continue; } @@ -9897,7 +9811,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) startBPT = true; LISTLINE = 0; - fizlines.emplace("Cntrl", inputline); + fizlines.try_emplace("Cntrl", inputline); LoadFIZ_Cntrl(inputline); continue; } @@ -9905,7 +9819,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) if (issection("Headlights:", inputline)) { startBPT = false; - fizlines.emplace("Headlights", inputline); + fizlines.try_emplace("Headlights", inputline); LoadFIZ_Headlights(inputline); continue; } @@ -9915,7 +9829,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) startBPT = false; LISTLINE = 0; - fizlines.emplace("Blending", inputline); + fizlines.try_emplace("Blending", inputline); LoadFIZ_Blending(inputline); continue; } @@ -9925,7 +9839,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) startBPT = false; LISTLINE = 0; - fizlines.emplace("DCEMUED", inputline); + fizlines.try_emplace("DCEMUED", inputline); LoadFIZ_DCEMUED(inputline); continue; } @@ -9935,7 +9849,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) startBPT = false; LISTLINE = 0; - fizlines.emplace("SpringBrake", inputline); + fizlines.try_emplace("SpringBrake", inputline); LoadFIZ_SpringBrake(inputline); continue; } @@ -9944,7 +9858,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) { startBPT = false; - fizlines.emplace("Light", inputline); + fizlines.try_emplace("Light", inputline); LoadFIZ_Light(inputline); continue; } @@ -9952,7 +9866,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) if (issection("Security:", inputline)) { startBPT = false; - fizlines.emplace("Security", inputline); + fizlines.try_emplace("Security", inputline); SecuritySystem.load(inputline, Vmax); extract_value(EmergencyBrakeWarningSignal, "EmergencyBrakeWarningSignal", inputline, ""); continue; @@ -9962,7 +9876,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) { startBPT = false; - fizlines.emplace("Clima", inputline); + fizlines.try_emplace("Clima", inputline); LoadFIZ_Clima(inputline); continue; } @@ -9970,7 +9884,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) if (issection("Power:", inputline)) { startBPT = false; - fizlines.emplace("Power", inputline); + fizlines.try_emplace("Power", inputline); LoadFIZ_Power(inputline); continue; } @@ -9978,7 +9892,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) if (issection("SpeedControl:", inputline)) { startBPT = false; - fizlines.emplace("SpeedControl", inputline); + fizlines.try_emplace("SpeedControl", inputline); LoadFIZ_SpeedControl(inputline); continue; } @@ -9986,7 +9900,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) if (issection("Engine:", inputline)) { startBPT = false; - fizlines.emplace("Engine", inputline); + fizlines.try_emplace("Engine", inputline); LoadFIZ_Engine(inputline); continue; } @@ -9994,7 +9908,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) if (issection("Switches:", inputline)) { startBPT = false; - fizlines.emplace("Switches", inputline); + fizlines.try_emplace("Switches", inputline); LoadFIZ_Switches(inputline); continue; } @@ -10004,7 +9918,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) startBPT = false; startMPT = true; LISTLINE = 0; - fizlines.emplace("MotorParamTable", inputline); + fizlines.try_emplace("MotorParamTable", inputline); LoadFIZ_MotorParamTable(inputline); continue; } @@ -10020,7 +9934,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) if (issection("Circuit:", inputline)) { startBPT = false; - fizlines.emplace("Circuit", inputline); + fizlines.try_emplace("Circuit", inputline); LoadFIZ_Circuit(inputline); continue; } @@ -10028,7 +9942,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) if (issection("AI:", inputline)) { startBPT = false; - fizlines.emplace("AI", inputline); + fizlines.try_emplace("AI", inputline); LoadFIZ_AI(inputline); continue; } @@ -10036,7 +9950,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) if (issection("RList:", inputline)) { startBPT = false; - fizlines.emplace("RList", inputline); + fizlines.try_emplace("RList", inputline); startRLIST = true; LISTLINE = 0; LoadFIZ_RList(inputline); @@ -10046,7 +9960,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) if (issection("UCList:", inputline)) { startBPT = false; - fizlines.emplace("UCList", inputline); + fizlines.try_emplace("UCList", inputline); startUCLIST = true; LISTLINE = 0; LoadFIZ_UCList(inputline); @@ -10056,7 +9970,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) if (issection("DList:", inputline)) { startBPT = false; - fizlines.emplace("DList", inputline); + fizlines.try_emplace("DList", inputline); startDLIST = true; LISTLINE = 0; LoadFIZ_DList(inputline); @@ -10066,7 +9980,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) if (issection("DMList:", inputline)) { startBPT = false; - fizlines.emplace("DMList", inputline); + fizlines.try_emplace("DMList", inputline); startDIZELMOMENTUMLIST = true; LISTLINE = 0; continue; @@ -10075,7 +9989,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) if (issection("HTCList:", inputline)) { startBPT = false; - fizlines.emplace("HTCList", inputline); + fizlines.try_emplace("HTCList", inputline); startHYDROTCLIST = true; LISTLINE = 0; continue; @@ -10084,7 +9998,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) if (issection("PmaxList:", inputline)) { startBPT = false; - fizlines.emplace("PmaxList", inputline); + fizlines.try_emplace("PmaxList", inputline); startPMAXLIST = true; LISTLINE = 0; continue; @@ -10093,7 +10007,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) if (issection("V2NList:", inputline)) { startBPT = false; - fizlines.emplace("V2NList", inputline); + fizlines.try_emplace("V2NList", inputline); startDIZELV2NMAXLIST = true; LISTLINE = 0; continue; @@ -10129,7 +10043,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) if (issection("WiperList:", inputline)) { startBPT = false; - fizlines.emplace("WiperList", inputline); + fizlines.try_emplace("WiperList", inputline); startWiperList = true; LISTLINE = 0; LoadFIZ_WiperList(inputline); @@ -10142,7 +10056,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) dimPositions.clear(); // uzywamy customowej listy startBPT = false; startDimmerList = true; - fizlines.emplace("DimmerList", inputline); + fizlines.try_emplace("DimmerList", inputline); LoadFIZ_DimmerList(inputline); continue; } @@ -10150,7 +10064,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) if (issection("LightsList:", inputline)) { startBPT = false; - fizlines.emplace("LightsList", inputline); + fizlines.try_emplace("LightsList", inputline); startLIGHTSLIST = true; LISTLINE = 0; LoadFIZ_LightsList(inputline); @@ -10160,7 +10074,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) if (issection("CompressorList:", inputline)) { startBPT = false; - fizlines.emplace("CompressorList", inputline); + fizlines.try_emplace("CompressorList", inputline); startCOMPRESSORLIST = true; LISTLINE = 0; LoadFIZ_CompressorList(inputline); @@ -10288,7 +10202,7 @@ void TMoverParameters::LoadFIZ_Param(std::string const &line) extract_value(LightPower, "LightP", line, "0"); { - std::map categories{{"train", 1}, {"road", 2}, {"unimog", 3}, {"ship", 4}, {"airplane,", 8}}; + std::map> categories{{"train", 1}, {"road", 2}, {"unimog", 3}, {"ship", 4}, {"airplane,", 8}}; std::string category; extract_value(category, "Category", line, "none"); auto lookup = categories.find(category); @@ -10300,7 +10214,7 @@ void TMoverParameters::LoadFIZ_Param(std::string const &line) } { - std::map types{ + std::map> types{ {"pseudodiesel", dt_PseudoDiesel}, {"ezt", dt_EZT}, {"dmu", dt_DMU}, @@ -10383,7 +10297,7 @@ void TMoverParameters::LoadFIZ_Dimensions(std::string const &line) if (Dim.H <= 2.0) { // gdyby nie było parametru, lepsze to niż zero - Floor = Dim.H; + Floor = static_cast(Dim.H); } else { @@ -10485,7 +10399,7 @@ void TMoverParameters::LoadFIZ_Brake(std::string const &line) extract_value(BrakeVVolume, "BVV", line, ""); { - std::map brakemethods{{"P10-Bg", bp_P10Bg}, {"P10-Bgu", bp_P10Bgu}, {"FR513", bp_FR513}, {"FR510", bp_FR510}, {"Cosid", bp_Cosid}, + std::map> brakemethods{{"P10-Bg", bp_P10Bg}, {"P10-Bgu", bp_P10Bgu}, {"FR513", bp_FR513}, {"FR510", bp_FR510}, {"Cosid", bp_Cosid}, {"P10yBg", bp_P10yBg}, {"P10yBgu", bp_P10yBgu}, {"Disk1", bp_D1}, {"Disk1+Mg", bp_D1 + bp_MHS}, {"Disk2", bp_D2}}; auto lookup = brakemethods.find(extract_value("BM", line)); BrakeMethod = lookup != brakemethods.end() ? lookup->second : 0; @@ -10529,7 +10443,7 @@ void TMoverParameters::LoadFIZ_Brake(std::string const &line) extract_value(HandleUnlock, "HandlePipeUnlockPos", line, "-3"); extract_value(EmergencyCutsOffHandle, "EmergencyCutsOffHandle", line, ""); { - std::map compressorpowers{ + std::map> compressorpowers{ {"Main", 0}, // 1: default, powered by converter, with manual state control {"Converter", 2}, @@ -10572,7 +10486,7 @@ void TMoverParameters::LoadFIZ_Brake(std::string const &line) void TMoverParameters::LoadFIZ_Doors(std::string const &line) { - std::map doorcontrols{ + std::map> doorcontrols{ {"Passenger", control_t::passenger}, {"AutomaticCtrl", control_t::autonomous}, {"DriverCtrl", control_t::driver}, {"Conductor", control_t::conductor}, {"Mixed", control_t::mixed}}; // opening method { @@ -10600,7 +10514,7 @@ void TMoverParameters::LoadFIZ_Doors(std::string const &line) { // HACK: legacy position indices start from 1, so we deduct 1 to arrive at proper index into the array extract_value(Doors.permit_preset, "DoorPermitListDefault", line, "1"); - Doors.permit_preset = std::min(Doors.permit_presets.size(), Doors.permit_preset) - 1; + Doors.permit_preset = std::min(static_cast(Doors.permit_presets.size()), Doors.permit_preset) - 1; } } @@ -10612,7 +10526,7 @@ void TMoverParameters::LoadFIZ_Doors(std::string const &line) extract_value(Doors.range, "DoorMaxShiftR", line, ""); extract_value(Doors.range_out, "DoorMaxShiftPlug", line, ""); - std::map doortypes{ + std::map> doortypes{ {"Shift", 1}, {"Rotate", 2}, {"Fold", 3}, @@ -10654,59 +10568,59 @@ void TMoverParameters::LoadFIZ_Doors(std::string const &line) void TMoverParameters::LoadFIZ_BuffCoupl(std::string const &line, int const Index) { - TCoupling *coupler; + TCoupling *thiscoupler; if (Index == 2) { - coupler = &Couplers[1]; + thiscoupler = &Couplers[1]; } else { - coupler = &Couplers[0]; + thiscoupler = &Couplers[0]; } - std::map couplertypes{ + std::map> couplertypes{ {"Automatic", TCouplerType::Automatic}, {"Screw", TCouplerType::Screw}, {"Chain", TCouplerType::Chain}, {"Bare", TCouplerType::Bare}, {"Articulated", TCouplerType::Articulated}, }; auto lookup = couplertypes.find(extract_value("CType", line)); - coupler->CouplerType = lookup != couplertypes.end() ? lookup->second : TCouplerType::NoCoupler; + thiscoupler->CouplerType = lookup != couplertypes.end() ? lookup->second : TCouplerType::NoCoupler; - extract_value(coupler->SpringKC, "kC", line, ""); - extract_value(coupler->DmaxC, "DmaxC", line, ""); - extract_value(coupler->FmaxC, "FmaxC", line, ""); - extract_value(coupler->SpringKB, "kB", line, ""); - extract_value(coupler->DmaxB, "DmaxB", line, ""); - extract_value(coupler->FmaxB, "FmaxB", line, ""); - extract_value(coupler->beta, "beta", line, ""); - extract_value(coupler->AutomaticCouplingFlag, "AutomaticFlag", line, ""); - extract_value(coupler->AllowedFlag, "AllowedFlag", line, ""); - if (coupler->AllowedFlag < 0) + extract_value(thiscoupler->SpringKC, "kC", line, ""); + extract_value(thiscoupler->DmaxC, "DmaxC", line, ""); + extract_value(thiscoupler->FmaxC, "FmaxC", line, ""); + extract_value(thiscoupler->SpringKB, "kB", line, ""); + extract_value(thiscoupler->DmaxB, "DmaxB", line, ""); + extract_value(thiscoupler->FmaxB, "FmaxB", line, ""); + extract_value(thiscoupler->beta, "beta", line, ""); + extract_value(thiscoupler->AutomaticCouplingFlag, "AutomaticFlag", line, ""); + extract_value(thiscoupler->AllowedFlag, "AllowedFlag", line, ""); + if (thiscoupler->AllowedFlag < 0) { - coupler->AllowedFlag = -coupler->AllowedFlag | coupling::permanent; + thiscoupler->AllowedFlag = -thiscoupler->AllowedFlag | coupling::permanent; } - extract_value(coupler->PowerCoupling, "PowerCoupling", line, ""); - extract_value(coupler->PowerFlag, "PowerFlag", line, ""); - extract_value(coupler->control_type, "ControlType", line, ""); + extract_value(thiscoupler->PowerCoupling, "PowerCoupling", line, ""); + extract_value(thiscoupler->PowerFlag, "PowerFlag", line, ""); + extract_value(thiscoupler->control_type, "ControlType", line, ""); - if (coupler->CouplerType != TCouplerType::NoCoupler && coupler->CouplerType != TCouplerType::Bare && coupler->CouplerType != TCouplerType::Articulated) + if (thiscoupler->CouplerType != TCouplerType::NoCoupler && thiscoupler->CouplerType != TCouplerType::Bare && thiscoupler->CouplerType != TCouplerType::Articulated) { - coupler->SpringKC *= 1000; - coupler->FmaxC *= 1000; - coupler->SpringKB *= 1000; - coupler->FmaxB *= 1000; + thiscoupler->SpringKC *= 1000; + thiscoupler->FmaxC *= 1000; + thiscoupler->SpringKB *= 1000; + thiscoupler->FmaxB *= 1000; } - else if (coupler->CouplerType == TCouplerType::Bare) + else if (thiscoupler->CouplerType == TCouplerType::Bare) { - coupler->SpringKC = 50.0 * Mass + Ftmax / 0.05; - coupler->DmaxC = 0.05; - coupler->FmaxC = 100.0 * Mass + 2 * Ftmax; - coupler->SpringKB = 60.0 * Mass + Ftmax / 0.05; - coupler->DmaxB = 0.05; - coupler->FmaxB = 50.0 * Mass + 2.0 * Ftmax; - coupler->beta = 0.3; + thiscoupler->SpringKC = 50.0 * Mass + Ftmax / 0.05; + thiscoupler->DmaxC = 0.05; + thiscoupler->FmaxC = 100.0 * Mass + 2 * Ftmax; + thiscoupler->SpringKB = 60.0 * Mass + Ftmax / 0.05; + thiscoupler->DmaxB = 0.05; + thiscoupler->FmaxB = 50.0 * Mass + 2.0 * Ftmax; + thiscoupler->beta = 0.3; } - else if (coupler->CouplerType == TCouplerType::Articulated) + else if (thiscoupler->CouplerType == TCouplerType::Articulated) { /* coupler->SpringKC = 60.0 * Mass + 1000; @@ -10717,13 +10631,13 @@ void TMoverParameters::LoadFIZ_BuffCoupl(std::string const &line, int const Inde coupler->FmaxB = 4000000.0 + 2.0 * Ftmax; coupler->beta = 0.55; */ - coupler->SpringKC = 4500 * 1000; - coupler->DmaxC = 0.05; - coupler->FmaxC = 850 * 1000; - coupler->SpringKB = 9200 * 1000; - coupler->DmaxB = 0.05; - coupler->FmaxB = 320 * 1000; - coupler->beta = 0.55; + thiscoupler->SpringKC = 4500 * 1000; + thiscoupler->DmaxC = 0.05; + thiscoupler->FmaxC = 850 * 1000; + thiscoupler->SpringKB = 9200 * 1000; + thiscoupler->DmaxB = 0.05; + thiscoupler->FmaxB = 320 * 1000; + thiscoupler->beta = 0.55; } if (Index == 0) @@ -10743,12 +10657,14 @@ void TMoverParameters::LoadFIZ_Cntrl(std::string const &line) { { - std::map brakesystems{{"Pneumatic", TBrakeSystem::Pneumatic}, {"ElectroPneumatic", TBrakeSystem::ElectroPneumatic}}; + using enum TBrakeSystem; + std::map> brakesystems{{"Pneumatic", Pneumatic}, {"ElectroPneumatic", ElectroPneumatic}}; auto lookup = brakesystems.find(extract_value("BrakeSystem", line)); - BrakeSystem = lookup != brakesystems.end() ? lookup->second : TBrakeSystem::Individual; + BrakeSystem = lookup != brakesystems.end() ? lookup->second : Individual; } if (BrakeSystem != TBrakeSystem::Individual) { + using enum TBrakeHandle; extract_value(BrakeCtrlPosNo, "BCPN", line, ""); for (int idx = 0; idx < 4; ++idx) @@ -10758,7 +10674,7 @@ void TMoverParameters::LoadFIZ_Cntrl(std::string const &line) } // brakedelays, brakedelayflag { - std::map brakedelays{{"GPR", bdelay_G + bdelay_P + bdelay_R}, + std::map> brakedelays{{"GPR", bdelay_G + bdelay_P + bdelay_R}, {"PR", bdelay_P + bdelay_R}, {"GP", bdelay_G + bdelay_P}, {"R", bdelay_R}, @@ -10766,7 +10682,7 @@ void TMoverParameters::LoadFIZ_Cntrl(std::string const &line) {"G", bdelay_G}, {"GPR+Mg", bdelay_G + bdelay_P + bdelay_R + bdelay_M}, {"PR+Mg", bdelay_P + bdelay_R + bdelay_M}}; - std::map brakedelayflags{{"R", bdelay_R}, {"P", bdelay_P}, {"G", bdelay_G}}; + std::map> brakedelayflags{{"R", bdelay_R}, {"P", bdelay_P}, {"G", bdelay_G}}; std::string brakedelay; extract_value(brakedelay, "BrakeDelays", line, ""); auto lookup = brakedelays.find(brakedelay); @@ -10776,18 +10692,18 @@ void TMoverParameters::LoadFIZ_Cntrl(std::string const &line) } // brakeopmode { - std::map brakeopmodes{{"PN", bom_PS + bom_PN}, {"PNEP", bom_PS + bom_PN + bom_EP}, {"PNEPMED", bom_PS + bom_PN + bom_EP + bom_MED}}; + std::map> brakeopmodes{{"PN", bom_PS + bom_PN}, {"PNEP", bom_PS + bom_PN + bom_EP}, {"PNEPMED", bom_PS + bom_PN + bom_EP + bom_MED}}; auto lookup = brakeopmodes.find(extract_value("BrakeOpModes", line)); BrakeOpModes = lookup != brakeopmodes.end() ? lookup->second : 0; } // brakehandle { - std::map brakehandles{ - {"FV4a", TBrakeHandle::FV4a}, {"test", TBrakeHandle::testH}, {"D2", TBrakeHandle::D2}, {"MHZ_EN57", TBrakeHandle::MHZ_EN57}, {"MHZ_K5P", TBrakeHandle::MHZ_K5P}, - {"MHZ_K8P", TBrakeHandle::MHZ_K8P}, {"MHZ_6P", TBrakeHandle::MHZ_6P}, {"M394", TBrakeHandle::M394}, {"Knorr", TBrakeHandle::Knorr}, {"Westinghouse", TBrakeHandle::West}, - {"FVel6", TBrakeHandle::FVel6}, {"FVE408", TBrakeHandle::FVE408}, {"St113", TBrakeHandle::St113}}; + std::map> brakehandles{ + {"FV4a", FV4a}, {"test", testH}, {"D2", D2}, {"MHZ_EN57", MHZ_EN57}, {"MHZ_K5P", MHZ_K5P}, + {"MHZ_K8P", MHZ_K8P}, {"MHZ_6P", MHZ_6P}, {"M394", M394}, {"Knorr", Knorr}, {"Westinghouse", West}, + {"FVel6", FVel6}, {"FVE408", FVE408}, {"St113", St113}}; auto lookup = brakehandles.find(extract_value("BrakeHandle", line)); - BrakeHandle = lookup != brakehandles.end() ? lookup->second : TBrakeHandle::NoHandle; + BrakeHandle = lookup != brakehandles.end() ? lookup->second : NoHandle; } extract_value(Handle_AutomaticOverload, "HAO", line, ""); extract_value(Handle_ManualOverload, "HMO", line, ""); @@ -10797,9 +10713,9 @@ void TMoverParameters::LoadFIZ_Cntrl(std::string const &line) extract_value(Handle_OverloadPressureDecrease, "OPD", line, ""); // brakelochandle { - std::map locbrakehandles{{"FD1", TBrakeHandle::FD1}, {"Knorr", TBrakeHandle::Knorr}, {"Westinghouse", TBrakeHandle::West}}; + std::map> locbrakehandles{{"FD1", FD1}, {"Knorr", Knorr}, {"Westinghouse", West}}; auto lookup = locbrakehandles.find(extract_value("LocBrakeHandle", line)); - BrakeLocHandle = lookup != locbrakehandles.end() ? lookup->second : TBrakeHandle::NoHandle; + BrakeLocHandle = lookup != locbrakehandles.end() ? lookup->second : NoHandle; } // mbpm @@ -10839,9 +10755,10 @@ void TMoverParameters::LoadFIZ_Cntrl(std::string const &line) // localbrake { - std::map localbrakes{{"ManualBrake", TLocalBrake::ManualBrake}, {"PneumaticBrake", TLocalBrake::PneumaticBrake}, {"HydraulicBrake", TLocalBrake::HydraulicBrake}}; + using enum TLocalBrake; + std::map> localbrakes{{"ManualBrake", ManualBrake}, {"PneumaticBrake", PneumaticBrake}, {"HydraulicBrake", HydraulicBrake}}; auto lookup = localbrakes.find(extract_value("LocalBrake", line)); - LocalBrake = lookup != localbrakes.end() ? lookup->second : TLocalBrake::NoBrake; + LocalBrake = lookup != localbrakes.end() ? lookup->second : NoBrake; } // mbrake extract_value(MBrake, "ManualBrake", line, ""); @@ -10851,7 +10768,7 @@ void TMoverParameters::LoadFIZ_Cntrl(std::string const &line) // dynamicbrake { - std::map dynamicbrakes{{"Passive", dbrake_passive}, {"Switch", dbrake_switch}, {"Reversal", dbrake_reversal}, {"Automatic", dbrake_automatic}}; + std::map> dynamicbrakes{{"Passive", dbrake_passive}, {"Switch", dbrake_switch}, {"Reversal", dbrake_reversal}, {"Automatic", dbrake_automatic}}; auto lookup = dynamicbrakes.find(extract_value("DynamicBrake", line)); DynamicBrakeType = lookup != dynamicbrakes.end() ? lookup->second : dbrake_none; extract_value(DynamicBrakeAmpmeters, "DBAM", line, ""); @@ -10874,8 +10791,7 @@ void TMoverParameters::LoadFIZ_Cntrl(std::string const &line) extract_value(ScndInMain, "SCIM", line, ""); extract_value(MainCtrlMaxDirChangePos, "DirChangeMaxPos", line, ""); - auto const autorelay{ToLower(extract_value("AutoRelay", line))}; - if (autorelay == "optional") + if (auto const autorelay{ToLower(extract_value("AutoRelay", line))}; autorelay == "optional") { AutoRelayType = 2; } @@ -10925,7 +10841,7 @@ void TMoverParameters::LoadFIZ_Cntrl(std::string const &line) extract_value(shouldHoldBatteryButton, "SBBBH", line, ""); extract_value(BatteryButtonHoldTime, "BBHT", line, ""); - std::map starts{{"Disabled", start_t::disabled}, {"Manual", start_t::manual}, {"Automatic", start_t::automatic}, {"Mixed", start_t::manualwithautofallback}, + std::map> starts{{"Disabled", start_t::disabled}, {"Manual", start_t::manual}, {"Automatic", start_t::automatic}, {"Mixed", start_t::manualwithautofallback}, {"Battery", start_t::battery}, {"Converter", start_t::converter}, {"Direction", start_t::direction}}; // main circuit @@ -10998,7 +10914,8 @@ void TMoverParameters::LoadFIZ_Cntrl(std::string const &line) // traction motor fans { auto lookup = starts.find(extract_value("MotorBlowersStart", line)); - MotorBlowers[end::front].start_type = MotorBlowers[end::rear].start_type = lookup != starts.end() ? lookup->second : start_t::manual; + MotorBlowers[end::rear].start_type = lookup != starts.end() ? lookup->second : start_t::manual; + MotorBlowers[end::front].start_type = MotorBlowers[end::rear].start_type; } // compartment lights { @@ -11078,7 +10995,7 @@ void TMoverParameters::LoadFIZ_Light(std::string const &line) extract_value(NominalVoltage, "Volt", line, ""); extract_value(BatteryVoltage, "LMaxVoltage", line, ""); - NominalBatteryVoltage = BatteryVoltage; + NominalBatteryVoltage = static_cast(BatteryVoltage); } void TMoverParameters::LoadFIZ_Clima(std::string const &line) @@ -11156,8 +11073,7 @@ void TMoverParameters::LoadFIZ_Engine(std::string const &Input) EngineType = LoadFIZ_EngineDecode(extract_value("EngineType", Input)); - std::string transmission = extract_value("Trans", Input); - if (false == transmission.empty()) + if (std::string transmission = extract_value("Trans", Input); false == transmission.empty()) { // transmission type. moved here because more than one engine type has this entry auto ratios = Split(transmission, ':'); // e.g. 18:79 @@ -11422,7 +11338,7 @@ void TMoverParameters::LoadFIZ_Switches(std::string const &Input) { auto &presets{PantsPreset.first}; extract_value(presets, "PantographPresets", Input, "0|1|3|2"); - presets.erase(std::remove(std::begin(presets), std::end(presets), '|'), std::end(presets)); + std::erase(presets, '|'); } } @@ -11481,8 +11397,7 @@ void TMoverParameters::LoadFIZ_RList(std::string const &Input) extract_value(RlistSize, "Size", Input, ""); - auto const venttype{ToLower(extract_value("RVent", Input))}; - if (venttype == "automatic") + if (auto const venttype{ToLower(extract_value("RVent", Input))}; venttype == "automatic") { RVentType = 2; @@ -11579,7 +11494,7 @@ void TMoverParameters::LoadFIZ_CompressorList(std::string const &Input) extract_value(CompressorListDefPos, "Default", Input, ""); } -void TMoverParameters::LoadFIZ_PowerParamsDecode(TPowerParameters &Powerparameters, std::string const Prefix, std::string const &Line) +void TMoverParameters::LoadFIZ_PowerParamsDecode(TPowerParameters &Powerparameters, std::string const &Prefix, std::string const &Line) { switch (Powerparameters.SourceType) @@ -11603,8 +11518,7 @@ void TMoverParameters::LoadFIZ_PowerParamsDecode(TPowerParameters &Powerparamete // prime mover for the generator auto &generatorparameters{Powerparameters.EngineGenerator}; - auto const enginetype{LoadFIZ_EngineDecode(extract_value(Prefix + "GeneratorEngine", Line))}; - if (enginetype == TEngineType::Main) + if (auto const enginetype{LoadFIZ_EngineDecode(extract_value(Prefix + "GeneratorEngine", Line))}; enginetype == TEngineType::Main) { generatorparameters.engine_revolutions = &enrot; } @@ -11700,51 +11614,53 @@ void TMoverParameters::LoadFIZ_PowerParamsDecode(TPowerParameters &Powerparamete } } -TPowerType TMoverParameters::LoadFIZ_PowerDecode(std::string const &Power) +TPowerType TMoverParameters::LoadFIZ_PowerDecode(std::string const &Powertype) const { + using enum TPowerType; - std::map powertypes{ - {"BioPower", TPowerType::BioPower}, {"MechPower", TPowerType::MechPower}, {"ElectricPower", TPowerType::ElectricPower}, {"SteamPower", TPowerType::SteamPower}}; - auto lookup = powertypes.find(Power); - return lookup != powertypes.end() ? lookup->second : TPowerType::NoPower; + std::map> powertypes{ + {"BioPower", BioPower}, {"MechPower", MechPower}, {"ElectricPower", ElectricPower}, {"SteamPower", SteamPower}}; + auto lookup = powertypes.find(Powertype); + return lookup != powertypes.end() ? lookup->second : NoPower; } -TPowerSource TMoverParameters::LoadFIZ_SourceDecode(std::string const &Source) +TPowerSource TMoverParameters::LoadFIZ_SourceDecode(std::string const &Source) const { + using enum TPowerSource; - std::map powersources{{"Transducer", TPowerSource::Transducer}, {"Generator", TPowerSource::Generator}, - {"Accu", TPowerSource::Accumulator}, // legacy compatibility leftover. TODO: check if we can get rid of it - {"Accumulator", TPowerSource::Accumulator}, {"CurrentCollector", TPowerSource::CurrentCollector}, - {"PowerCable", TPowerSource::PowerCable}, {"Heater", TPowerSource::Heater}, - {"Internal", TPowerSource::InternalSource}, {"Main", TPowerSource::Main}}; + std::map> powersources{{"Transducer", Transducer}, {"Generator", Generator}, + {"Accu", Accumulator}, // legacy compatibility leftover. TODO: check if we can get rid of it + {"Accumulator", Accumulator}, {"CurrentCollector", CurrentCollector}, + {"PowerCable", PowerCable}, {"Heater", Heater}, + {"Internal", InternalSource}, {"Main", Main}}; auto lookup = powersources.find(Source); - return lookup != powersources.end() ? lookup->second : TPowerSource::NotDefined; + return lookup != powersources.end() ? lookup->second : NotDefined; } -TEngineType TMoverParameters::LoadFIZ_EngineDecode(std::string const &Engine) +TEngineType TMoverParameters::LoadFIZ_EngineDecode(std::string const &Engine) const { + using enum TEngineType; - std::map enginetypes{{"ElectricSeriesMotor", TEngineType::ElectricSeriesMotor}, - {"DieselEngine", TEngineType::DieselEngine}, - {"SteamEngine", TEngineType::SteamEngine}, - {"WheelsDriven", TEngineType::WheelsDriven}, - {"Dumb", TEngineType::Dumb}, - {"DieselElectric", TEngineType::DieselElectric}, - {"DumbDE", TEngineType::DieselElectric}, - {"ElectricInductionMotor", TEngineType::ElectricInductionMotor}, - {"Main", TEngineType::Main}}; + std::map> enginetypes{{"ElectricSeriesMotor", ElectricSeriesMotor}, + {"DieselEngine", DieselEngine}, + {"SteamEngine", SteamEngine}, + {"WheelsDriven", WheelsDriven}, + {"Dumb", Dumb}, + {"DieselElectric", DieselElectric}, + {"DumbDE", DieselElectric}, + {"ElectricInductionMotor", ElectricInductionMotor}, + {"Main", Main}}; auto lookup = enginetypes.find(Engine); - return lookup != enginetypes.end() ? lookup->second : TEngineType::None; + return lookup != enginetypes.end() ? lookup->second : None; } // ************************************************************************************************* // Q: 20160717 // ************************************************************************************************* -bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) +bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int /*Dir*/) { WriteLog("check locomotive parameters..."); - int b; bool OK = true; AutoRelayFlag = AutoRelayType == 1; @@ -11779,9 +11695,8 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) // WriteLogSS("aa ok", BoolToYN(OK)); } - if (BrakeSystem == TBrakeSystem::Individual) - if (BrakeSubsystem != TBrakeSubSystem::ss_None) - OK = false; //! + if (BrakeSystem == TBrakeSystem::Individual && BrakeSubsystem != TBrakeSubSystem::ss_None) + OK = false; //! if (BrakeVVolume == 0 && MaxBrakePress[3] > 0 && BrakeSystem != TBrakeSystem::Individual) { @@ -11890,35 +11805,36 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) switch (BrakeHandle) { - case TBrakeHandle::FV4a: + using enum TBrakeHandle; + case FV4a: Handle = std::make_shared(); break; - case TBrakeHandle::MHZ_EN57: - case TBrakeHandle::MHZ_K8P: + case MHZ_EN57: + case MHZ_K8P: Handle = std::make_shared(); break; - case TBrakeHandle::FVel6: + case FVel6: Handle = std::make_shared(); break; - case TBrakeHandle::FVE408: + case FVE408: Handle = std::make_shared(); break; - case TBrakeHandle::testH: + case testH: Handle = std::make_shared(); break; - case TBrakeHandle::M394: + case M394: Handle = std::make_shared(); break; - case TBrakeHandle::Knorr: + case Knorr: Handle = std::make_shared(); break; - case TBrakeHandle::St113: + case St113: Handle = std::make_shared(); break; - case TBrakeHandle::MHZ_K5P: + case MHZ_K5P: Handle = std::make_shared(); break; - case TBrakeHandle::MHZ_6P: + case MHZ_6P: Handle = std::make_shared(); break; default: @@ -12094,9 +12010,9 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) BrakeOpModeFlag = bom_PN; // yB: jesli pojazdy nie maja zadeklarowanych czasow, to wsadz z przepisow +-16,(6)% - int DefBrakeTable[8] = {15, 4, 25, 25, 13, 3, 12, 2}; + std::array const DefBrakeTable{15, 4, 25, 25, 13, 3, 12, 2}; - for (b = 1; b < 4; b++) + for (int b = 1; b < 4; b++) { if (BrakeDelay[b] == 0) BrakeDelay[b] = DefBrakeTable[b]; @@ -12137,7 +12053,7 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) // Q: 20160714 // Wstawia komendę z parametrem, od sprzęgu i w lokalizacji do pojazdu // ************************************************************************************************* -void TMoverParameters::PutCommand(std::string NewCommand, double NewValue1, double NewValue2, const TLocation &NewLocation) +void TMoverParameters::PutCommand(std::string const &NewCommand, double NewValue1, double NewValue2, const TLocation &NewLocation) { CommandLast = NewCommand; // zapamiętanie komendy @@ -12152,7 +12068,7 @@ void TMoverParameters::PutCommand(std::string NewCommand, double NewValue1, doub // Q: 20160714 // Pobiera komendę z parametru funkcji oraz wartość zmiennej jako return // ************************************************************************************************* -double TMoverParameters::GetExternalCommand(std::string &Command) +double TMoverParameters::GetExternalCommand(std::string &Command) const { Command = CommandOut; return ValueOut; @@ -12162,7 +12078,7 @@ double TMoverParameters::GetExternalCommand(std::string &Command) // Q: 20160714 // Ustawienie komendy wraz z parametrami // ************************************************************************************************* -bool TMoverParameters::SetInternalCommand(std::string NewCommand, double NewValue1, double NewValue2, int const Couplertype) +bool TMoverParameters::SetInternalCommand(std::string const &NewCommand, double NewValue1, double NewValue2, int const Couplertype) { bool SIC; if (CommandIn.Command == NewCommand && CommandIn.Value1 == NewValue1 && CommandIn.Value2 == NewValue2 && CommandIn.Coupling == Couplertype) @@ -12184,7 +12100,7 @@ bool TMoverParameters::SetInternalCommand(std::string NewCommand, double NewValu // Q: 20160714 // wysyłanie komendy w kierunku dir (1=przód, -1=tył) do kolejnego pojazdu (jednego) // ************************************************************************************************* -bool TMoverParameters::SendCtrlToNext(std::string const CtrlCommand, double const ctrlvalue, double const dir, int const Couplertype) +bool TMoverParameters::SendCtrlToNext(std::string const &CtrlCommand, double const ctrlvalue, double const dir, int const Couplertype) { bool OK; int d; // numer sprzęgu w kierunku którego wysyłamy @@ -12193,24 +12109,21 @@ bool TMoverParameters::SendCtrlToNext(std::string const CtrlCommand, double cons // Ra: problem jest również, jeśli AI będzie na końcu składu OK = true; // ( dir != 0 ); // experimentally disabled d = (1 + static_cast(Sign(dir))) / 2; // dir=-1=>d=0, dir=1=>d=1 - wysyłanie tylko w tył - if (OK) + // musi być wybrana niezerowa kabina + if (OK && Couplers[d].Connected != nullptr && TestFlag(Couplers[d].CouplingFlag, Couplertype)) { - // musi być wybrana niezerowa kabina - if (Couplers[d].Connected != nullptr && TestFlag(Couplers[d].CouplingFlag, Couplertype)) - { - if (Couplers[d].ConnectedNr != d) - { - // jeśli ten nastpęny jest zgodny z aktualnym - if (Couplers[d].Connected->SetInternalCommand(CtrlCommand, ctrlvalue, dir, Couplertype)) - OK = Couplers[d].Connected->RunInternalCommand() && OK; // tu jest rekurencja - } - else - { - // jeśli następny jest ustawiony przeciwnie, zmieniamy kierunek - if (Couplers[d].Connected->SetInternalCommand(CtrlCommand, ctrlvalue, -dir, Couplertype)) - OK = Couplers[d].Connected->RunInternalCommand() && OK; // tu jest rekurencja - } + if (Couplers[d].ConnectedNr != d) + { + // jeśli ten nastpęny jest zgodny z aktualnym + if (Couplers[d].Connected->SetInternalCommand(CtrlCommand, ctrlvalue, dir, Couplertype)) + OK = Couplers[d].Connected->RunInternalCommand() && OK; // tu jest rekurencja + } + else + { + // jeśli następny jest ustawiony przeciwnie, zmieniamy kierunek + if (Couplers[d].Connected->SetInternalCommand(CtrlCommand, ctrlvalue, -dir, Couplertype)) + OK = Couplers[d].Connected->RunInternalCommand() && OK; // tu jest rekurencja } } return OK; @@ -12227,7 +12140,7 @@ bool TMoverParameters::SendCtrlToNext(std::string const CtrlCommand, double cons // Komenda musi być zdefiniowana tutaj, a jeśli się wywołuje funkcję, to ona nie może // sama przesyłać do kolejnych pojazdów. Należy też się zastanowić, czy dla uzyskania // jakiejś zmiany (np. IncMainCtrl) lepiej wywołać funkcję, czy od razu wysłać komendę. -bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CValue2, int const Couplertype) +bool TMoverParameters::RunCommand(std::string const &Command, double CValue1, double CValue2, int const Couplertype) { bool OK{false}; @@ -12279,7 +12192,7 @@ bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CV if (DCEMUED_EP_min_Im > 0.001 && abs(Im) > DCEMUED_EP_min_Im && DynamicBrakeEMUStatus) temp1 = 0; Hamulec->SetEPS(temp1); - TUHEX_StageActual = CValue1; + TUHEX_StageActual = static_cast(CValue1); TUHEX_Active = TUHEX_StageActual > 0; if (CValue1 < 0.001) DynamicBrakeEMUStatus = true; @@ -12289,7 +12202,7 @@ bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CV } // youby - odluzniacz hamulcow, przyda sie else if (Command == "BrakeReleaser") { - OK = BrakeReleaser(Round(CValue1)); // samo się przesyła dalej + OK = BrakeReleaser(static_cast(Round(CValue1))); // samo się przesyła dalej // OK:=SendCtrlToNext(command,CValue1,CValue2); //to robiło kaskadę 2^n } else if (Command == "WaterPumpBreakerSwitch") @@ -12500,7 +12413,7 @@ bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CV } else if (Command == "RelayReset") { - RelayReset(CValue1, range_t::local); + RelayReset(static_cast(CValue1), range_t::local); OK = SendCtrlToNext(Command, CValue1, CValue2, Couplertype); } else if (Command == "ConverterSwitch") /*NBMX*/ @@ -12538,14 +12451,13 @@ bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CV else if (Command == "DoorPermit") { - auto const left{CValue2 > 0 ? 1 : 2}; - auto const right{3 - left}; + auto const leftside{CValue2 > 0 ? 1 : 2}; - if (std::abs(static_cast(CValue1)) & right) + if (auto const rightside{3 - leftside}; std::abs(static_cast(CValue1)) & rightside) { PermitDoors_(side::right, CValue1 > 0); } - if (std::abs(static_cast(CValue1)) & left) + if (std::abs(static_cast(CValue1)) & leftside) { PermitDoors_(side::left, CValue1 > 0); } @@ -12554,50 +12466,42 @@ bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CV } else if (Command == "DoorOpen") /*NBMX*/ { // Ra: uwzględnić trzeba jeszcze zgodność sprzęgów - if (Doors.open_control == control_t::conductor || Doors.open_control == control_t::driver || Doors.open_control == control_t::mixed) + // ignore remote command if the door is only operated locally + if ((Doors.open_control == control_t::conductor || Doors.open_control == control_t::driver || Doors.open_control == control_t::mixed) && (Power24vIsAvailable || Power110vIsAvailable)) { - // ignore remote command if the door is only operated locally - if (Power24vIsAvailable || Power110vIsAvailable) + + auto const leftside{CValue2 > 0 ? 1 : 2}; + + if (auto const rightside{3 - leftside}; static_cast(CValue1) & rightside) { - - auto const left{CValue2 > 0 ? 1 : 2}; - auto const right{3 - left}; - - if (static_cast(CValue1) & right) - { - Doors.instances[side::right].remote_open = true; - Doors.instances[side::right].remote_close = false; - } - if (static_cast(CValue1) & left) - { - Doors.instances[side::left].remote_open = true; - Doors.instances[side::left].remote_close = false; - } + Doors.instances[side::right].remote_open = true; + Doors.instances[side::right].remote_close = false; + } + if (static_cast(CValue1) & leftside) + { + Doors.instances[side::left].remote_open = true; + Doors.instances[side::left].remote_close = false; } } OK = SendCtrlToNext(Command, CValue1, CValue2, Couplertype); } else if (Command == "DoorClose") /*NBMX*/ { // Ra: uwzględnić trzeba jeszcze zgodność sprzęgów - if (Doors.close_control == control_t::conductor || Doors.close_control == control_t::driver || Doors.close_control == control_t::mixed) + // ignore remote command if the door is only operated locally + if ((Doors.close_control == control_t::conductor || Doors.close_control == control_t::driver || Doors.close_control == control_t::mixed) && (Power24vIsAvailable || Power110vIsAvailable)) { - // ignore remote command if the door is only operated locally - if (Power24vIsAvailable || Power110vIsAvailable) + + auto const leftside{CValue2 > 0 ? 1 : 2}; + + if (auto const rightside{3 - leftside}; static_cast(CValue1) & rightside) { - - auto const left{CValue2 > 0 ? 1 : 2}; - auto const right{3 - left}; - - if (static_cast(CValue1) & right) - { - Doors.instances[side::right].remote_close = true; - Doors.instances[side::right].remote_open = false; - } - if (static_cast(CValue1) & left) - { - Doors.instances[side::left].remote_close = true; - Doors.instances[side::left].remote_open = false; - } + Doors.instances[side::right].remote_close = true; + Doors.instances[side::right].remote_open = false; + } + if (static_cast(CValue1) & leftside) + { + Doors.instances[side::left].remote_close = true; + Doors.instances[side::left].remote_open = false; } } OK = SendCtrlToNext(Command, CValue1, CValue2, Couplertype); @@ -12628,9 +12532,8 @@ bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CV auto const inputcab{(static_cast(CValue1) & 0x40) != 0 ? 1 : 0}; auto const inputoperation{static_cast(CValue1) & ~(0x80 | 0x40)}; auto const noswap{TrainType == dt_EZT || TrainType == dt_ET41}; - auto swap{false == noswap && TestFlag(Couplers[(CValue2 == -1 ? end::rear : end::front)].CouplingFlag, coupling::control)}; - auto const reversed{inputcab != (CabActive != -1 ? 1 : 0)}; - if (reversed) + auto swap{false == noswap && TestFlag(Couplers[CValue2 == -1 ? end::rear : end::front].CouplingFlag, coupling::control)}; + if (auto const reversed{inputcab != (CabActive != -1 ? 1 : 0)}; reversed) { swap = !swap; } // TODO: check whether this part has RL equivalent @@ -12673,8 +12576,7 @@ bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CV } else if (Command == "BrakeDelay") { - auto const brakesetting = static_cast(std::floor(CValue1)); - if (true == Hamulec->SetBDF(brakesetting)) + if (auto const brakesetting = static_cast(std::floor(CValue1)); true == Hamulec->SetBDF(brakesetting)) { BrakeDelayFlag = brakesetting; OK = true; @@ -12795,7 +12697,7 @@ bool TMoverParameters::RunInternalCommand() // ************************************************************************************************* double TMoverParameters::ShowCurrentP(int AmpN) const { - int b, Bn; + int Bn; bool Grupowy; // ClearPendingExceptions; @@ -12819,11 +12721,10 @@ double TMoverParameters::ShowCurrentP(int AmpN) const else // pobor pradu jezeli niema mocy { int current = 0; - for (b = 0; b < 2; b++) + for (int b = 0; b < 2; b++) // with Couplers[b] do - if (TestFlag(Couplers[b].CouplingFlag, coupling::control)) - if (Couplers[b].Connected->Power > 0.01) - current = static_cast(Couplers[b].Connected->ShowCurrent(AmpN)); + if (TestFlag(Couplers[b].CouplingFlag, coupling::control) && Couplers[b].Connected->Power > 0.01) + current = static_cast(Couplers[b].Connected->ShowCurrent(AmpN)); return current; } } @@ -12833,8 +12734,7 @@ bool TMoverParameters::reload_FIZ() WriteLog("[DEV] Reloading FIZ for " + Name); // pause simulation Global.iPause |= 0b1000; - bool result = LoadFIZ(chkPath); - if (result == true) + if (bool result = LoadFIZ(chkPath); result == true) { // jesli sie udalo przeladowac FIZ Global.iPause &= 0b0111; diff --git a/McZapkie/Oerlikon_ESt.cpp b/McZapkie/Oerlikon_ESt.cpp index 9559d3052..17fa79ee7 100644 --- a/McZapkie/Oerlikon_ESt.cpp +++ b/McZapkie/Oerlikon_ESt.cpp @@ -211,7 +211,7 @@ double TNESt3::GetPF( double const PP, double const dt, double const Vel ) // pr double dV{ 0.0 }; double dV1{ 0.0 }; - double const nastG = static_cast(BrakeDelayFlag & bdelay_G); + auto const nastG = static_cast(BrakeDelayFlag & bdelay_G); // sprawdzanie stanu CheckState(BCP, dV1); @@ -294,8 +294,9 @@ double TNESt3::GetPF( double const PP, double const dt, double const Vel ) // pr return dV - dV1; } -void TNESt3::EStParams( double const i_crc ) // parametry charakterystyczne dla ESt +void TNESt3::EStParams( double const /*i_crc*/ ) const // parametry charakterystyczne dla ESt { + // no effect for this device type } void TNESt3::Init( double const PP, double const HPP, double const LPP, double const BP, int const BDF ) @@ -318,7 +319,9 @@ void TNESt3::Init( double const PP, double const HPP, double const LPP, double c Zamykajacy = false; - if ( typeid(*FM) == typeid(TDisk1) || typeid(*FM) == typeid(TDisk2) ) // jesli zeliwo to schodz + auto const &frictionmaterial { *FM }; + auto const &frictionmaterialtype { typeid( frictionmaterial ) }; + if ( frictionmaterialtype == typeid(TDisk1) || frictionmaterialtype == typeid(TDisk2) ) // jesli zeliwo to schodz RapidStaly = true; else RapidStaly = false; @@ -331,9 +334,8 @@ double TNESt3::GetCRP() // return Miedzypoj.P; } -void TNESt3::CheckState(double const BCP, double &dV1) // glowny przyrzad rozrzadczy +void TNESt3::CheckState(double const BCP, double & /*dV1*/) // glowny przyrzad rozrzadczy { - double const BVP{ BrakeRes->P() }; //-> tu ma byc komora rozprezna double const VVP{ ValveRes->P() }; double const CVP{ CntrlRes->P() }; double const MPP{ Miedzypoj->P() }; @@ -355,14 +357,14 @@ void TNESt3::CheckState(double const BCP, double &dV1) // glowny przyrzad rozrza if( ( BrakeStatus & b_hld ) == 0 ) SoundFlag |= sf_CylU; - if (VVP + 0.10 < CVP && BCP < 0.25) // poczatek hamowania - if (false == Przys_blok) - { - ValveRes->CreatePress(0.1 * VVP); - SoundFlag |= sf_Acc; - ValveRes->Act(); - Przys_blok = true; - } + // poczatek hamowania + if (VVP + 0.10 < CVP && BCP < 0.25 && false == Przys_blok) + { + ValveRes->CreatePress(0.1 * VVP); + SoundFlag |= sf_Acc; + ValveRes->Act(); + Przys_blok = true; + } if (BCP > 0.5) Zamykajacy = true; @@ -384,7 +386,7 @@ void TNESt3::CheckReleaser(double const dt) // odluzniacz } } -double TNESt3::CVs(double const BP) // napelniacz sterujacego +double TNESt3::CVs(double const /*BP*/) const // napelniacz sterujacego { double const CVP{ CntrlRes->P() }; double const MPP{ Miedzypoj->P() }; @@ -398,7 +400,7 @@ double TNESt3::CVs(double const BP) // napelniacz sterujacego return Nozzles[dSm]; } -double TNESt3::BVs(double const BCP) // napelniacz pomocniczego +double TNESt3::BVs(double const BCP) const // napelniacz pomocniczego { double const CVP{ CntrlRes->P() }; double const MPP{ Miedzypoj->P() }; @@ -637,9 +639,9 @@ void TNESt3::SetSize( int const size, std::string const ¶ms ) // ustawianie Nozzles[dSm] = 0.9; // przeliczanie z mm^2 na l/m - for (int i = 0; i < dMAX; ++i) + for (auto &nozzle : Nozzles) { - Nozzles[i] = d2A(Nozzles[i]); //(/1000^2*pi/4*1000) + nozzle = d2A(nozzle); //(/1000^2*pi/4*1000) } for (int i = 1; i < 4; ++i) { diff --git a/McZapkie/Oerlikon_ESt.h b/McZapkie/Oerlikon_ESt.h index c12691851..224ffecdc 100644 --- a/McZapkie/Oerlikon_ESt.h +++ b/McZapkie/Oerlikon_ESt.h @@ -70,38 +70,32 @@ static int const P_ed = 5; class TPrzekladnik : public TReservoir // przekladnik (powtarzacz) { - private: public: std::shared_ptr BrakeRes; std::shared_ptr Next; - TPrzekladnik() : TReservoir() {}; + using TReservoir::TReservoir; virtual void Update(double dt); }; class TRura : public TPrzekladnik // nieprzekladnik, rura laczaca { - private: public: - TRura() : TPrzekladnik() {}; - virtual double P(void) /*override*/; - virtual void Update(double dt) /*override*/; + using TPrzekladnik::TPrzekladnik; + double P(void) override; + void Update(double dt) override; }; class TPrzeciwposlizg : public TRura // przy napelnianiu - rura, przy poslizgu - upust { private: - bool Poslizg; + bool Poslizg{false}; public: void SetPoslizg(bool flag); - void Update(double dt) /*override*/; - inline TPrzeciwposlizg() : TRura() - { - Poslizg = false; - } + void Update(double dt) override; }; // przekladnik dwustopniowy @@ -117,10 +111,8 @@ class TRapid : public TPrzekladnik { public: void SetRapidParams(double mult, double size); void SetRapidStatus(bool rs); - void Update(double dt) /*override*/; - inline TRapid() : - TPrzekladnik() - {} + void Update(double dt) override; + using TPrzekladnik::TPrzekladnik; }; // AL2 @@ -131,10 +123,8 @@ class TPrzekCiagly : public TPrzekladnik { public: void SetMult(double m); - void Update(double dt) /*override*/; - inline TPrzekCiagly() : - TPrzekladnik() - {} + void Update(double dt) override; + using TPrzekladnik::TPrzekladnik; }; // podwojny zawor zwrotny @@ -145,20 +135,15 @@ class TPrzek_PZZ : public TPrzekladnik { public: void SetLBP(double P); - void Update(double dt) /*override*/; - inline TPrzek_PZZ() : - TPrzekladnik() - {} + void Update(double dt) override; + using TPrzekladnik::TPrzekladnik; }; class TPrzekZalamany : public TPrzekladnik // Knicksventil { - private: public: - TPrzekZalamany() : - TPrzekladnik() - {} + using TPrzekladnik::TPrzekladnik; }; // przy napelnianiu - rura, przy hamowaniu - upust @@ -169,10 +154,8 @@ class TPrzekED : public TRura { public: void SetP(double P); - void Update(double dt) /*override*/; - inline TPrzekED() : - TRura() - {} + void Update(double dt) override; + using TRura::TRura; }; class TNESt3 : public TBrake { @@ -206,22 +189,20 @@ class TNESt3 : public TBrake { double LBP = 0.0; // cisnienie hamulca pomocniczego public: - inline TNESt3(double i_mbp, double i_bcr, double i_bcd, double i_brc, int i_bcn, int i_BD, int i_mat, int i_ba, int i_nbpa) : - TBrake( i_mbp, i_bcr, i_bcd, i_brc, i_bcn, i_BD, i_mat, i_ba, i_nbpa) - {} - void Init( double const PP, double const HPP, double const LPP, double const BP, int const BDF ) /*override*/; - virtual double GetPF( double const PP, double const dt, double const Vel ) /*override*/; // przeplyw miedzy komora wstepna i PG - void EStParams(double i_crc); // parametry charakterystyczne dla ESt - virtual double GetCRP() /*override*/; + using TBrake::TBrake; + void Init( double const PP, double const HPP, double const LPP, double const BP, int const BDF ) override; + double GetPF( double const PP, double const dt, double const Vel ) override; // przeplyw miedzy komora wstepna i PG + void EStParams(double i_crc) const; // parametry charakterystyczne dla ESt + double GetCRP() override; void CheckState(double const BCP, double &dV1); // glowny przyrzad rozrzadczy void CheckReleaser(double const dt); // odluzniacz - double CVs(double const BP); // napelniacz sterujacego - double BVs(double const BCP); // napelniacz pomocniczego + double CVs(double const BP) const; // napelniacz sterujacego + double BVs(double const BCP) const; // napelniacz pomocniczego void SetSize( int const size, std::string const ¶ms ); // ustawianie dysz (rozmiaru ZR), przekladniki - void PLC(double const mass); // wspolczynnik cisnienia przystawki wazacej - void SetLP(double const TM, double const LM, double const TBP); // parametry przystawki wazacej - virtual void ForceEmptiness() /*override*/; // wymuszenie bycia pustym - void SetLBP(double const P); // cisnienie z hamulca pomocniczego + void PLC(double const mass) override; // wspolczynnik cisnienia przystawki wazacej + void SetLP(double const TM, double const LM, double const TBP) override; // parametry przystawki wazacej + void ForceEmptiness() override; // wymuszenie bycia pustym + void SetLBP(double const P) override; // cisnienie z hamulca pomocniczego }; extern double d2A( double const d ); diff --git a/McZapkie/friction.h b/McZapkie/friction.h index 067a61b97..c58895a9b 100644 --- a/McZapkie/friction.h +++ b/McZapkie/friction.h @@ -41,6 +41,7 @@ class TFricMat public: virtual double GetFC(double N, double Vel); + virtual ~TFricMat() = default; }; @@ -49,7 +50,7 @@ class TP10Bg: public TFricMat { public: - double GetFC(double N, double Vel)/*override*/; + double GetFC(double N, double Vel) override; }; @@ -59,7 +60,7 @@ class TP10Bgu: public TFricMat { public: - double GetFC(double N, double Vel)/*override*/; + double GetFC(double N, double Vel) override; }; @@ -69,7 +70,7 @@ class TP10yBg: public TFricMat { public: - double GetFC(double N, double Vel)/*override*/; + double GetFC(double N, double Vel) override; }; @@ -79,7 +80,7 @@ class TP10yBgu: public TFricMat { public: - double GetFC(double N, double Vel)/*override*/; + double GetFC(double N, double Vel) override; }; @@ -89,7 +90,7 @@ class TP10: public TFricMat { public: - double GetFC(double N, double Vel)/*override*/; + double GetFC(double N, double Vel) override; }; @@ -99,7 +100,7 @@ class TFR513: public TFricMat { public: - double GetFC(double N, double Vel)/*override*/; + double GetFC(double N, double Vel) override; }; @@ -109,7 +110,7 @@ class TFR510: public TFricMat { public: - double GetFC(double N, double Vel)/*override*/; + double GetFC(double N, double Vel) override; }; @@ -119,7 +120,7 @@ class TCosid: public TFricMat { public: - double GetFC(double N, double Vel)/*override*/; + double GetFC(double N, double Vel) override; }; @@ -129,7 +130,7 @@ class TDisk1: public TFricMat { public: - double GetFC(double N, double Vel)/*override*/; + double GetFC(double N, double Vel) override; }; @@ -139,7 +140,7 @@ class TDisk2: public TFricMat { public: - double GetFC(double N, double Vel)/*override*/; + double GetFC(double N, double Vel) override; }; diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp index 64a7fb85c..c0a7d2a0e 100644 --- a/McZapkie/hamulce.cpp +++ b/McZapkie/hamulce.cpp @@ -357,21 +357,14 @@ end ; */ /// Friction material id (bp_* constant, optionally OR'ed with bp_MHS). /// Number of braked axles. /// Number of blocks per axle. -TBrake::TBrake(double i_mbp, double i_bcr, double i_bcd, double i_brc, int i_bcn, int i_BD, int i_mat, int i_ba, int i_nbpa) +TBrake::TBrake(double i_mbp, double i_bcr, double i_bcd, double i_brc, int i_bcn, int i_BD, int i_mat, int i_ba, int i_nbpa) : + BCN(i_bcn), BCM(1), BCA(i_bcn * i_bcr * i_bcr * M_PI), BrakeDelays(i_BD), MaxBP(i_mbp), BA(i_ba), NBpA(i_nbpa), SizeBR(i_brc * 0.0128) { // inherited:: Create; - MaxBP = i_mbp; - BCN = i_bcn; - BCM = 1; - BCA = i_bcn * i_bcr * i_bcr * M_PI; - BA = i_ba; - NBpA = i_nbpa; - BrakeDelays = i_BD; BrakeDelayFlag = bdelay_P; // 210.88 // SizeBR:=i_bcn*i_bcr*i_bcr*i_bcd*40.17*MaxBP/(5-MaxBP); //objetosc ZP w stosunku do cylindra // 14" i cisnienia 4.2 atm - SizeBR = i_brc * 0.0128; SizeBC = i_bcn * i_bcr * i_bcr * i_bcd * 210.88 * MaxBP / 4.2; // objetosc CH w stosunku do cylindra 14" i cisnienia 4.2 atm BrakeCyl = std::make_shared(); @@ -450,7 +443,7 @@ double TBrake::GetFC(double const Vel, double const N) /// Returns the gauge pressure inside the brake cylinder. // cisnienie cylindra hamulcowego -double TBrake::GetBCP() +double TBrake::GetBCP() const { return BrakeCyl->P(); } @@ -464,14 +457,14 @@ double TBrake::GetEDBCP() /// Returns the auxiliary reservoir (ZP) pressure. // cisnienie zbiornika pomocniczego -double TBrake::GetBRP() +double TBrake::GetBRP() const { return BrakeRes->P(); } /// Returns the valve pre-chamber pressure. // cisnienie komory wstepnej -double TBrake::GetVRP() +double TBrake::GetVRP() const { return ValveRes->P(); } @@ -516,7 +509,7 @@ double TBrake::GetHPFlow(double const HP, double const dt) /// /// Returns the piston force from the cylinder pressure (BCA * 100 * P). /// -double TBrake::GetBCF() +double TBrake::GetBCF() const { return BCA * 100 * BrakeCyl->P(); } @@ -558,7 +551,7 @@ bool TBrake::Releaser() const /// support the EP brake (TWest, TEStEP1/2, ...). /// /// EP intensity. -void TBrake::SetEPS(double const nEPS) {} +void TBrake::SetEPS(double const nEPS) { /* no effect for this device type */ } /// /// Sets the anti-slip brake state flags. Bit 1 of @@ -572,7 +565,7 @@ void TBrake::ASB(int const state) } /// Returns the raw BrakeStatus bitfield. -int TBrake::GetStatus() +int TBrake::GetStatus() const { return BrakeStatus; } @@ -674,14 +667,14 @@ double TWest::GetPF(double const PP, double const dt, double const Vel) BCP = BrakeCyl->P(); if ((BrakeStatus & b_hld) == b_hld) + { if (VVP + 0.03 < BVP) BrakeStatus |= b_on; else if (VVP > BVP + 0.1) BrakeStatus &= ~(b_on | b_hld); else if (VVP > BVP) BrakeStatus &= ~b_on; - else - ; + } else if (VVP + 0.25 < BVP) BrakeStatus |= b_on | b_hld; @@ -707,7 +700,6 @@ double TWest::GetPF(double const PP, double const dt, double const Vel) temp = BVP * int(EPS > 0); dv = PF(temp, LBP, 0.0015) * dt * EPS * EPS * int(LBP * EPS < MaxBP * LoadC); LBP = LBP - dv; - dv = 0; // przeplyw ZP <-> silowniki if ((BrakeStatus & b_on) == b_on && (TareBP < 0.1 || BCP < MaxBP * LoadC)) @@ -781,20 +773,15 @@ void TWest::SetLBP(double const P) /// New EP intensity. void TWest::SetEPS(double const nEPS) { - double BCP; - BCP = BrakeCyl->P(); if (nEPS > 0) DCV = true; - else if (nEPS == 0) + else if (nEPS == 0 && EPS != 0) { - if (EPS != 0) - { - if (LBP > 0.4) - LBP = BrakeCyl->P(); - if (LBP < 0.15) - LBP = 0; - } + if (LBP > 0.4) + LBP = BrakeCyl->P(); + if (LBP < 0.15) + LBP = 0; } EPS = nEPS; } @@ -838,12 +825,14 @@ void TESt::CheckReleaser(double const dt) // odluzniacz if ((BrakeStatus & b_rls) == b_rls) + { if (CVP - VVP < 0) BrakeStatus &= ~b_rls; else { CntrlRes->Flow(+PF(CVP, 0, 0.1) * dt); } + } } /// @@ -854,11 +843,10 @@ void TESt::CheckReleaser(double const dt) /// /// Brake cylinder (or impulse-chamber) pressure. /// In/out brake-pipe flow correction (unused in this base impl). -void TESt::CheckState(double const BCP, double &dV1) +void TESt::CheckState(double const BCP, double & /*dV1*/) { double const VVP{ValveRes->P()}; - double const BVP{BrakeRes->P()}; double const CVP{CntrlRes->P()}; // sprawdzanie stanu @@ -927,7 +915,7 @@ void TESt::CheckState(double const BCP, double &dV1) /// /// Brake cylinder (or impulse) pressure. /// Opening coefficient (0 closed, 1 fully open). -double TESt::CVs(double const BP) +double TESt::CVs(double const BP) const { double VVP; double BVP; @@ -958,7 +946,7 @@ double TESt::CVs(double const BP) /// /// Brake cylinder pressure. /// Opening coefficient. -double TESt::BVs(double const BCP) +double TESt::BVs(double const BCP) const { double VVP; double BVP; @@ -1000,11 +988,8 @@ double TESt::GetPF(double const PP, double const dt, double const Vel) double CVP; BVP = BrakeRes->P(); - VVP = ValveRes->P(); BCP = BrakeCyl->P(); - CVP = CntrlRes->P() - 0.0; - dv = 0; dV1 = 0; // sprawdzanie stanu @@ -1086,7 +1071,7 @@ void TESt::Init(double const PP, double const HPP, double const LPP, double cons /// derived variants and currently a no-op. /// /// Characteristic value. -void TESt::EStParams(double const i_crc) {} +void TESt::EStParams(double const /*i_crc*/) const { /* no effect for this device type */ } /// Returns the control reservoir (ZS) pressure. double TESt::GetCRP() @@ -1160,7 +1145,6 @@ double TEStEP2::GetPF(double const PP, double const dt, double const Vel) BCP = ImplsRes->P(); CVP = CntrlRes->P(); // 110115 - konsultacje warszawa1 - dv = 0; dV1 = 0; // odluzniacz @@ -1168,14 +1152,14 @@ double TEStEP2::GetPF(double const PP, double const dt, double const Vel) // sprawdzanie stanu if ((BrakeStatus & b_hld) == b_hld && BCP > 0.25) + { if (VVP + 0.003 + BCP / BVM < CVP - 0.12) BrakeStatus |= b_on; // hamowanie stopniowe; else if (VVP - 0.003 + BCP / BVM > CVP - 0.12) BrakeStatus &= ~(b_on | b_hld); // luzowanie; else if (VVP + BCP / BVM > CVP - 0.12) BrakeStatus &= ~b_on; // zatrzymanie napelaniania; - else - ; + } else if (VVP + 0.10 < CVP - 0.12 && BCP < 0.25) // poczatek hamowania { // if ((BrakeStatus & 1) == 0) @@ -1343,9 +1327,9 @@ void TEStEP1::SetEPS(double const nEPS) double TESt3::GetPF(double const PP, double const dt, double const Vel) { double BVP{BrakeRes->P()}; - double VVP{ValveRes->P()}; + double VVP; double BCP{BrakeCyl->P()}; - double CVP{CntrlRes->P() - 0.0}; + double CVP; double dv{0.0}; double dV1{0.0}; @@ -1420,11 +1404,8 @@ double TESt4R::GetPF(double const PP, double const dt, double const Vel) double CVP; BVP = BrakeRes->P(); - VVP = ValveRes->P(); BCP = ImplsRes->P(); - CVP = CntrlRes->P(); - dv = 0; dV1 = 0; // sprawdzanie stanu @@ -1543,11 +1524,9 @@ double TESt3AL2::GetPF(double const PP, double const dt, double const Vel) double CVP; BVP = BrakeRes->P(); - VVP = ValveRes->P(); BCP = ImplsRes->P(); CVP = CntrlRes->P() - 0.0; - dv = 0; dV1 = 0; // sprawdzanie stanu @@ -1715,8 +1694,7 @@ double TLSt::GetPF(double const PP, double const dt, double const Vel) SoundFlag |= sf_CylU; } // equivalent of checkreleaser() in the base class? - bool is_releasing = BrakeStatus & b_rls || UniversalFlag & TUniversalBrake::ub_Release; - if (is_releasing) + if (bool is_releasing = BrakeStatus & b_rls || UniversalFlag & TUniversalBrake::ub_Release; is_releasing) { if (CVP < 0.0) { @@ -1934,14 +1912,14 @@ double TEStED::GetPF(double const PP, double const dt, double const Vel) else if (VVP + (BCP - 0.1) / BVM < CVP - 0.05 && BCP > 0.25) // zatrzymanie luzowania BrakeStatus |= b_hld; - if (VVP + 0.10 < CVP && BCP < 0.25) // poczatek hamowania - if (!Przys_blok) - { - ValveRes->CreatePress(0.75 * VVP); - SoundFlag |= sf_Acc; - ValveRes->Act(); - Przys_blok = true; - } + // poczatek hamowania + if (VVP + 0.10 < CVP && BCP < 0.25 && !Przys_blok) + { + ValveRes->CreatePress(0.75 * VVP); + SoundFlag |= sf_Acc; + ValveRes->Act(); + Przys_blok = true; + } if (BCP > 0.5) Zamykajacy = true; @@ -2069,7 +2047,6 @@ double TEStED::GetPF(double const PP, double const dt, double const Vel) void TEStED::Init(double const PP, double const HPP, double const LPP, double const BP, int const BDF) { TLSt::Init(PP, HPP, LPP, BP, BDF); - int i; ValveRes->CreatePress(PP); BrakeCyl->CreatePress(BP); @@ -2104,7 +2081,7 @@ void TEStED::Init(double const PP, double const HPP, double const LPP, double co Nozzles[6] = 0.9; { - for (i = 0; i < 11; ++i) + for (int i = 0; i < 11; ++i) { Nozzles[i] = Nozzles[i] * Nozzles[i] * 3.14159 / 4000; } @@ -2165,14 +2142,14 @@ void TCV1::CheckState(double const BCP, double &dV1) // sprawdzanie stanu if ((BrakeStatus & b_hld) == b_hld) + { if (VVP + 0.003 + BCP / BVM < CVP) BrakeStatus |= b_on; // hamowanie stopniowe; else if (VVP - 0.003 + BCP * 1.0 / BVM > CVP) BrakeStatus &= ~(b_on | b_hld); // luzowanie; else if (VVP + BCP * 1.0 / BVM > CVP) BrakeStatus &= ~b_on; // zatrzymanie napelaniania; - else - ; + } else if (VVP + 0.10 < CVP && BCP < 0.1) // poczatek hamowania { BrakeStatus |= b_on | b_hld; @@ -2188,7 +2165,7 @@ void TCV1::CheckState(double const BCP, double &dV1) /// /// Cylinder pressure. /// Opening coefficient. -double TCV1::CVs(double const BP) +double TCV1::CVs(double const BP) const { // przeplyw ZS <-> PG if (BP > 0.05) @@ -2204,7 +2181,7 @@ double TCV1::CVs(double const BP) /// /// Cylinder pressure. /// Opening coefficient. -double TCV1::BVs(double const BCP) +double TCV1::BVs(double const BCP) const { double VVP; double BVP; @@ -2243,11 +2220,9 @@ double TCV1::GetPF(double const PP, double const dt, double const Vel) double CVP; BVP = BrakeRes->P(); - VVP = std::min(ValveRes->P(), BVP + 0.05); BCP = BrakeCyl->P(); CVP = CntrlRes->P(); - dv = 0; dV1 = 0; // sprawdzanie stanu @@ -2402,11 +2377,9 @@ double TCV1L_TR::GetPF(double const PP, double const dt, double const Vel) double CVP; BVP = BrakeRes->P(); - VVP = std::min(ValveRes->P(), BVP + 0.05); BCP = ImplsRes->P(); CVP = CntrlRes->P(); - dv = 0; dV1 = 0; // sprawdzanie stanu @@ -2488,10 +2461,12 @@ void TKE::CheckReleaser(double const dt) // odluzniacz if (true == ((BrakeStatus & b_rls) == b_rls)) + { if (CVP - VVP < 0) BrakeStatus &= ~b_rls; else CntrlRes->Flow(+PF(CVP, 0, 0.1) * dt); + } } /// @@ -2502,13 +2477,11 @@ void TKE::CheckReleaser(double const dt) /// /// Cylinder (or impulse-chamber) pressure. /// In/out brake-pipe flow correction (unused here). -void TKE::CheckState(double const BCP, double &dV1) +void TKE::CheckState(double const BCP, double & /*dV1*/) { double VVP; - double BVP; double CVP; - BVP = BrakeRes->P(); VVP = ValveRes->P(); CVP = CntrlRes->P(); @@ -2578,13 +2551,11 @@ void TKE::CheckState(double const BCP, double &dV1) /// /// Cylinder (or impulse) pressure. /// Opening coefficient. -double TKE::CVs(double const BP) +double TKE::CVs(double const BP) const { double VVP; - double BVP; double CVP; - BVP = BrakeRes->P(); CVP = CntrlRes->P(); VVP = ValveRes->P(); @@ -2604,7 +2575,7 @@ double TKE::CVs(double const BP) /// /// Impulse-chamber pressure. /// Opening coefficient. -double TKE::BVs(double const BCP) +double TKE::BVs(double const /*BCP*/) const { double VVP; double BVP; @@ -2651,7 +2622,6 @@ double TKE::GetPF(double const PP, double const dt, double const Vel) IMP = ImplsRes->P(); CVP = CntrlRes->P(); - dv = 0; dV1 = 0; // sprawdzanie stanu @@ -2694,7 +2664,8 @@ double TKE::GetPF(double const PP, double const dt, double const Vel) ImplsRes->Flow(-dv); // rapid - if (!(typeid(*FM) == typeid(TDisk1) || typeid(*FM) == typeid(TDisk2))) // jesli zeliwo to schodz + auto const &frictionmaterial{*FM}; + if (auto const &frictionmaterialtype{typeid(frictionmaterial)}; !(frictionmaterialtype == typeid(TDisk1) || frictionmaterialtype == typeid(TDisk2))) // jesli zeliwo to schodz RapidStatus = (BrakeDelayFlag & bdelay_R) == bdelay_R && (RV < 0 || (Vel > RV && RapidStatus) || Vel > RV + 20); else // jesli tarczowki, to zostan RapidStatus = (BrakeDelayFlag & bdelay_R) == bdelay_R; @@ -2872,7 +2843,7 @@ void TDriverHandle::Init(double Press) /// Default reductor adjustment — no-op. /// Pressure correction. -void TDriverHandle::SetReductor(double nAdj) {} +void TDriverHandle::SetReductor(double nAdj) { /* no effect for this device type */ } /// Default cab-gauge pressure — 0. double TDriverHandle::GetCP() @@ -2969,9 +2940,8 @@ double TFV4a::GetPF(double i_bcp, double PP, double HP, double dt, double ep) if (lround(i_bcp) == -1) { CP = CP + 5 * std::min(std::abs(LimPP - CP), 0.2) * PR(CP, LimPP) * dt / 2; - if (CP < RP + 0.03) - if (TP < 5) - TP = TP + dt; + if (CP < RP + 0.03 && TP < 5) + TP = TP + dt; // if(cp+0.03<5.4)then if (RP + 0.03 < 5.4 || CP + 0.03 < 5.4) // fala dpMainValve = PF(std::min(HP, 17.1), PP, ActFlowSpeed / LBDelay) * dt; @@ -3037,11 +3007,10 @@ double TFV4aM::GetPF(double i_bcp, double PP, double HP, double dt, double ep) int const LBDelay{100}; double const xpM{0.3}; // mnoznik membrany komory pod - ep = PP / 2.0 * 1.5 + ep / 2.0 * 0.5; // SPKS!! - for (int idx = 0; idx < 5; ++idx) + for (auto &soundvalue : Sounds) { - Sounds[idx] = 0; + soundvalue = 0; } // na wszelki wypadek, zeby nie wyszlo poza zakres @@ -3134,13 +3103,9 @@ double TFV4aM::GetPF(double i_bcp, double PP, double HP, double dt, double ep) } } - if (EQ(i_bcp, 0)) + if (EQ(i_bcp, 0) && TP > 2) { - - if (TP > 2) - { - dpMainValve *= 1.5; - } + dpMainValve *= 1.5; } ep = dpPipe; @@ -3239,16 +3204,16 @@ double TFV4aM::GetRP() /// /// Continuous handle position. /// Interpolated target pressure [bar]. -double TFV4aM::LPP_RP(double pos) // cisnienie z zaokraglonej pozycji; +double TFV4aM::LPP_RP(double pos) const // cisnienie z zaokraglonej pozycji; { - int const i_pos = 2 + std::floor(pos); // zaokraglone w dol + auto const i_pos = static_cast(2 + std::floor(pos)); // zaokraglone w dol return BPT[i_pos][1] + (BPT[i_pos + 1][1] - BPT[i_pos][1]) * (pos + 2 - i_pos); // interpolacja liniowa } /// Returns true if pos is within ±0.5 of i_pos (detent test). /// Continuous handle position. /// Detent centre. -bool TFV4aM::EQ(double pos, double i_pos) +bool TFV4aM::EQ(double pos, double i_pos) const { return pos <= i_pos + 0.5 && pos > i_pos - 0.5; } @@ -3279,12 +3244,11 @@ double TMHZ_EN57::GetPF(double i_bcp, double PP, double HP, double dt, double ep double DP; double pom; - for (int idx = 0; idx < 5; ++idx) + for (auto &soundvalue : Sounds) { - Sounds[idx] = 0; + soundvalue = 0; } - DP = 0; i_bcp = std::clamp(i_bcp, -0.999, 9.999); // na wszelki wypadek, zeby nie wyszlo poza zakres @@ -3425,7 +3389,7 @@ double TMHZ_EN57::GetEP(double pos) /// /// Continuous handle position. /// Target brake-pipe pressure [bar]. -double TMHZ_EN57::LPP_RP(double pos) // cisnienie z zaokraglonej pozycji; +double TMHZ_EN57::LPP_RP(double pos) const // cisnienie z zaokraglonej pozycji; { if (pos > 8.5) return 5.0 - 0.15 * pos - 0.35; @@ -3456,7 +3420,7 @@ void TMHZ_EN57::SetParams(bool AO, bool MO, double OverP, double, double OMP, do } /// Returns true if pos is within ±0.5 of i_pos (detent test). -bool TMHZ_EN57::EQ(double pos, double i_pos) +bool TMHZ_EN57::EQ(double pos, double i_pos) const { return pos <= i_pos + 0.5 && pos > i_pos - 0.5; } @@ -3484,14 +3448,12 @@ double TMHZ_K5P::GetPF(double i_bcp, double PP, double HP, double dt, double ep) double dpMainValve; double ActFlowSpeed; double DP; - double pom; - for (int idx = 0; idx < 5; ++idx) + for (auto &soundvalue : Sounds) { - Sounds[idx] = 0; + soundvalue = 0; } - DP = 0; i_bcp = std::clamp(i_bcp, -0.999, 2.999); // na wszelki wypadek, zeby nie wyszlo poza zakres @@ -3512,7 +3474,6 @@ double TMHZ_K5P::GetPF(double i_bcp, double PP, double HP, double dt, double ep) LimCP = 3.4; else // luzowanie LimCP = 5.0; - pom = CP; LimCP = std::min(LimCP, HP); // pozycja + czasowy lub zasilanie ActFlowSpeed = 4; @@ -3636,7 +3597,7 @@ void TMHZ_K5P::SetParams(bool AO, bool MO, double OverP, double FSF, double OMP, } /// Returns true if pos is within ±0.5 of i_pos (detent test). -bool TMHZ_K5P::EQ(double pos, double i_pos) +bool TMHZ_K5P::EQ(double pos, double i_pos) const { return pos <= i_pos + 0.5 && pos > i_pos - 0.5; } @@ -3663,14 +3624,12 @@ double TMHZ_6P::GetPF(double i_bcp, double PP, double HP, double dt, double ep) double dpMainValve; double ActFlowSpeed; double DP; - double pom; - for (int idx = 0; idx < 5; ++idx) + for (auto &soundvalue : Sounds) { - Sounds[idx] = 0; + soundvalue = 0; } - DP = 0; i_bcp = std::clamp(i_bcp, -0.999, 3.999); // na wszelki wypadek, zeby nie wyszlo poza zakres @@ -3691,7 +3650,6 @@ double TMHZ_6P::GetPF(double i_bcp, double PP, double HP, double dt, double ep) LimCP = 3.4; else // luzowanie LimCP = 5.0; - pom = CP; LimCP = std::min(LimCP, HP); // pozycja + czasowy lub zasilanie ActFlowSpeed = 4; @@ -3815,7 +3773,7 @@ void TMHZ_6P::SetParams(bool AO, bool MO, double OverP, double FSF, double OMP, } /// Returns true if pos is within ±0.5 of i_pos (detent test). -bool TMHZ_6P::EQ(double pos, double i_pos) +bool TMHZ_6P::EQ(double pos, double i_pos) const { return pos <= i_pos + 0.5 && pos > i_pos - 0.5; } @@ -3844,7 +3802,7 @@ double TM394::GetPF(double i_bcp, double PP, double HP, double dt, double ep) double ActFlowSpeed; int BCP; - BCP = lround(i_bcp); + BCP = static_cast(lround(i_bcp)); if (BCP < -1) BCP = 1; @@ -3855,6 +3813,7 @@ double TM394::GetPF(double i_bcp, double PP, double HP, double dt, double ep) if (BCP == 0) LimPP = LimPP + RedAdj; if (BCP != 2) + { if (CP < LimPP) CP = CP + 4 * std::min(abs(LimPP - CP), 0.05) * PR(CP, LimPP) * dt; // zbiornik sterujacy // cp:=cp+6*(2+int(bcp<0))*std::min(abs(Limpp-cp),0.05)*PR(cp,Limpp)*dt //zbiornik @@ -3863,6 +3822,7 @@ double TM394::GetPF(double i_bcp, double PP, double HP, double dt, double ep) CP = CP - 0.2 * dt / 100; else CP = CP + 4 * (1 + int(BCP != 3) + int(BCP > 4)) * std::min(abs(LimPP - CP), 0.05) * PR(CP, LimPP) * dt; // zbiornik sterujacy + } LimPP = CP; dpPipe = std::min(HP, LimPP); @@ -3937,7 +3897,7 @@ double TH14K1::GetPF(double i_bcp, double PP, double HP, double dt, double ep) //{ (10, 0), (4, 1), (0, 1), (4, 0), (4, -1), (15, -1) }; double const NomPress = 5.0; - int BCP = std::lround(i_bcp); + auto BCP = static_cast(std::lround(i_bcp)); if (i_bcp < -1) { BCP = 1; @@ -4034,7 +3994,7 @@ double TSt113::GetPF(double i_bcp, double PP, double HP, double dt, double ep) CP = PP; - BCP = lround(i_bcp); + BCP = static_cast(lround(i_bcp)); EPS = BEP_K[BCP + 1]; diff --git a/McZapkie/hamulce.h b/McZapkie/hamulce.h index a05a36359..3074a2e7e 100644 --- a/McZapkie/hamulce.h +++ b/McZapkie/hamulce.h @@ -272,10 +272,11 @@ class TReservoir /// Default constructor — creates a 1 L reservoir at zero pressure. TReservoir() = default; + virtual ~TReservoir() = default; }; /// Pointer typedef for a reservoir instance. -typedef TReservoir *PReservoir; +using PReservoir = TReservoir *; /// /// Brake cylinder reservoir — overrides pressure functions to model the @@ -290,15 +291,15 @@ class TBrakeCyl : public TReservoir /// Returns absolute pressure inside the brake cylinder (P() * 0.1). /// /// Absolute cylinder pressure. - virtual double pa() /*override*/; + double pa() override; /// /// Returns gauge pressure inside the brake cylinder, modelling the /// piston-stroke pressure curve (dead volume, linear stroke, fully extended). /// /// Cylinder pressure in bar. - virtual double P() /*override*/; + double P() override; /// Default constructor. - TBrakeCyl() : TReservoir() {}; + using TReservoir::TReservoir; }; /// @@ -399,7 +400,7 @@ class TBrake /// Returns the piston force produced by the brake cylinder pressure. /// /// Force in arbitrary engine units (BCA * 100 * P). - double GetBCF(); // sila tlokowa z tloka + double GetBCF() const; // sila tlokowa z tloka /// /// Computes the airflow drawn from the high-pressure (8 bar / main) line for one step. /// @@ -408,16 +409,16 @@ class TBrake /// Net flow from the high-pressure line. virtual double GetHPFlow(double const HP, double const dt); // przeplyw - 8 bar /// Returns brake cylinder gauge pressure [bar]. - double GetBCP(); // cisnienie cylindrow hamulcowych + double GetBCP() const; // cisnienie cylindrow hamulcowych /// /// Returns brake cylinder pressure originating only from the pneumatic /// (main) brake — used to drive the ED (electrodynamic) brake e.g. in EP09. /// virtual double GetEDBCP(); // cisnienie tylko z hamulca zasadniczego, uzywane do hamulca ED w EP09 /// Returns auxiliary reservoir (ZP) pressure [bar]. - double GetBRP(); // cisnienie zbiornika pomocniczego + double GetBRP() const; // cisnienie zbiornika pomocniczego /// Returns valve pre-chamber pressure [bar]. - double GetVRP(); // cisnienie komory wstepnej rozdzielacza + double GetVRP() const; // cisnienie komory wstepnej rozdzielacza /// Returns control reservoir (ZS) pressure [bar]; defaults to the auxiliary reservoir for valves without a dedicated ZS. virtual double GetCRP(); // cisnienie zbiornika sterujacego /// @@ -441,7 +442,7 @@ class TBrake virtual void SetEPS(double const nEPS); // hamulec EP /// Sets the rapid step ratio. Default no-op; overridden where supported. /// Rapid ratio. - virtual void SetRM(double const RMR) {}; // ustalenie przelozenia rapida + virtual void SetRM(double const RMR) { /* no effect for this device type */ } // ustalenie przelozenia rapida /// Sets the velocity threshold for the rapid step. /// Velocity threshold (same unit as Vel passed to GetPF). virtual void SetRV(double const RVR) @@ -455,20 +456,20 @@ class TBrake /// Tare (empty) mass. /// Loaded mass. /// Brake cylinder pressure for the tare mass. - virtual void SetLP(double const TM, double const LM, double const TBP) {}; // parametry przystawki wazacej + virtual void SetLP(double const TM, double const LM, double const TBP) { /* no effect for this device type */ } // parametry przystawki wazacej /// Sets the auxiliary (local) brake target pressure. /// Local brake pressure [bar]. - virtual void SetLBP(double const P) {}; // cisnienie z hamulca pomocniczego + virtual void SetLBP(double const P) { /* no effect for this device type */ } // cisnienie z hamulca pomocniczego /// Updates the load-weighing pressure coefficient based on current vehicle mass. /// Current vehicle mass. - virtual void PLC(double const mass) {}; // wspolczynnik cisnienia przystawki wazacej + virtual void PLC(double const mass) { /* no effect for this device type */ } // wspolczynnik cisnienia przystawki wazacej /// /// Engages the anti-slip brake function (set hold and/or release flags). /// /// Two-bit value: bit1 = hold (b_asb), bit0 = release (b_asb_unbrake). void ASB(int state); // hamulec przeciwposlizgowy /// Returns the raw BrakeStatus flags (for sound/visual cues). - int GetStatus(); // flaga statusu, moze sie przydac do odglosow + int GetStatus() const; // flaga statusu, moze sie przydac do odglosow /// Sets the anti-slip target pressure. /// Pressure [bar]. void SetASBP(double const Press); // ustalenie cisnienia pp @@ -497,13 +498,14 @@ class TBrake /// brake when ED braking is sufficient. Default no-op; overridden where supported. /// /// ED brake intensity (0..1). - virtual void SetED(double const EDstate) {}; // stan hamulca ED do luzowania + virtual void SetED(double const EDstate) { /* no effect for this device type */ } // stan hamulca ED do luzowania /// Sets the universal-button flags (see TUniversalBrake). /// Combined ub_* flags. virtual void SetUniversalFlag(int flag) { UniversalFlag = flag; } // przycisk uniwersalny + virtual ~TBrake() = default; }; /// @@ -537,26 +539,26 @@ class TWest : public TBrake /// Low pressure. /// Initial cylinder pressure. /// Initial brake delay flag. - void Init(double const PP, double const HPP, double const LPP, double const BP, int const BDF) /*override*/; + void Init(double const PP, double const HPP, double const LPP, double const BP, int const BDF) override; /// Sets the auxiliary brake target pressure and engages the DCV when above cylinder. /// Pressure [bar]. - void SetLBP(double const P); // cisnienie z hamulca pomocniczego + void SetLBP(double const P) override; // cisnienie z hamulca pomocniczego /// One-step distributor advance (Westinghouse logic). /// Net flow exchanged with the brake pipe. - double GetPF(double const PP, double const dt, double const Vel) /*override*/; // przeplyw miedzy komora wstepna i PG + double GetPF(double const PP, double const dt, double const Vel) override; // przeplyw miedzy komora wstepna i PG /// Returns the high-pressure flow drawn during the last GetPF step. - double GetHPFlow(double const HP, double const dt) /*override*/; + double GetHPFlow(double const HP, double const dt) override; /// Recomputes the load-weighing pressure coefficient for the current mass. /// Vehicle mass. - void PLC(double const mass); // wspolczynnik cisnienia przystawki wazacej + void PLC(double const mass) override; // wspolczynnik cisnienia przystawki wazacej /// Sets the EP brake state and toggles the DCV / latches LBP from cylinder pressure on release. /// New EP intensity. - void SetEPS(double const nEPS) /*override*/; // stan hamulca EP + void SetEPS(double const nEPS) override; // stan hamulca EP /// Stores the load-weighing parameters (TareM, LoadM, TareBP). - void SetLP(double const TM, double const LM, double const TBP); // parametry przystawki wazacej + void SetLP(double const TM, double const LM, double const TBP) override; // parametry przystawki wazacej /// Constructs the distributor by forwarding all parameters to TBrake. - inline TWest(double i_mbp, double i_bcr, double i_bcd, double i_brc, int i_bcn, int i_BD, int i_mat, int i_ba, int i_nbpa) : TBrake(i_mbp, i_bcr, i_bcd, i_brc, i_bcn, i_BD, i_mat, i_ba, i_nbpa) {} + using TBrake::TBrake; }; /// @@ -567,7 +569,6 @@ class TWest : public TBrake class TESt : public TBrake { - private: protected: /// Control reservoir (ZS) — long-term reference pressure. std::shared_ptr CntrlRes; // zbiornik sterujący @@ -576,15 +577,15 @@ class TESt : public TBrake public: /// Initialises the ESt distributor; sizes the control reservoir (15 l) and computes BVM. - void Init(double const PP, double const HPP, double const LPP, double const BP, int const BDF) /*override*/; + void Init(double const PP, double const HPP, double const LPP, double const BP, int const BDF) override; /// One-step distributor advance for the ESt baseline. /// Net flow exchanged with the brake pipe. - double GetPF(double const PP, double const dt, double const Vel) /*override*/; // przeplyw miedzy komora wstepna i PG + double GetPF(double const PP, double const dt, double const Vel) override; // przeplyw miedzy komora wstepna i PG /// Sets ESt-specific characteristic parameters (placeholder; used by some variants). /// Characteristic value. - void EStParams(double i_crc); // parametry charakterystyczne dla ESt + void EStParams(double i_crc) const; // parametry charakterystyczne dla ESt /// Returns the control reservoir (ZS) pressure. - double GetCRP() /*override*/; + double GetCRP() override; /// /// Updates BrakeStatus (b_on/b_hld) according to the relations between /// pre-chamber, cylinder and control reservoir pressures (the main slide valve). @@ -602,16 +603,16 @@ class TESt : public TBrake /// /// Cylinder pressure (or impulse-chamber pressure). /// Dimensionless opening coefficient. - double CVs(double BP); // napelniacz sterujacego + double CVs(double BP) const; // napelniacz sterujacego /// /// Returns the effective opening factor of the auxiliary-reservoir filling /// slide valve (ZP <-> pre-chamber path). /// /// Brake cylinder pressure. /// Dimensionless opening coefficient. - double BVs(double BCP); // napelniacz pomocniczego + double BVs(double BCP) const; // napelniacz pomocniczego /// Vents the valve, brake and control reservoirs to zero. - void ForceEmptiness() /*override*/; // wymuszenie bycia pustym + void ForceEmptiness() override; // wymuszenie bycia pustym /// Constructs the ESt distributor and creates the control reservoir. inline TESt(double i_mbp, double i_bcr, double i_bcd, double i_brc, int i_bcn, int i_BD, int i_mat, int i_ba, int i_nbpa) : TBrake(i_mbp, i_bcr, i_bcd, i_brc, i_bcn, i_BD, i_mat, i_ba, i_nbpa) @@ -627,16 +628,15 @@ class TESt : public TBrake class TESt3 : public TESt { - private: // double CylFlowSpeed[2][2]; //zmienna nie uzywana public: /// One-step distributor advance for ESt3 (G/P-dependent fill/release curves). /// Net flow exchanged with the brake pipe. - double GetPF(double const PP, double const dt, double const Vel) /*override*/; // przeplyw miedzy komora wstepna i PG + double GetPF(double const PP, double const dt, double const Vel) override; // przeplyw miedzy komora wstepna i PG /// Constructs the ESt3 distributor. - inline TESt3(double i_mbp, double i_bcr, double i_bcd, double i_brc, int i_bcn, int i_BD, int i_mat, int i_ba, int i_nbpa) : TESt(i_mbp, i_bcr, i_bcd, i_brc, i_bcn, i_BD, i_mat, i_ba, i_nbpa) {} + using TESt::TESt; }; /// @@ -660,13 +660,13 @@ class TESt3AL2 : public TESt3 public: /// Initialises the impulse chamber on top of the ESt initialisation. - void Init(double const PP, double const HPP, double const LPP, double const BP, int const BDF) /*override*/; + void Init(double const PP, double const HPP, double const LPP, double const BP, int const BDF) override; /// One-step distributor advance for ESt3/AL2 with load-weighing relay. - double GetPF(double const PP, double const dt, double const Vel) /*override*/; // przeplyw miedzy komora wstepna i PG + double GetPF(double const PP, double const dt, double const Vel) override; // przeplyw miedzy komora wstepna i PG /// Recomputes LoadC for the current vehicle mass. - void PLC(double const mass); // wspolczynnik cisnienia przystawki wazacej + void PLC(double const mass) override; // wspolczynnik cisnienia przystawki wazacej /// Stores the load-weighing parameters. - void SetLP(double const TM, double const LM, double const TBP); // parametry przystawki wazacej + void SetLP(double const TM, double const LM, double const TBP) override; // parametry przystawki wazacej /// Constructs the distributor and creates the impulse chamber. inline TESt3AL2(double i_mbp, double i_bcr, double i_bcd, double i_brc, int i_bcn, int i_BD, int i_mat, int i_ba, int i_nbpa) : TESt3(i_mbp, i_bcr, i_bcd, i_brc, i_bcn, i_BD, i_mat, i_ba, i_nbpa) @@ -695,9 +695,9 @@ class TESt4R : public TESt public: /// Initialises the ESt4R; sizes the impulse chamber and selects the R delay. - void Init(double const PP, double const HPP, double const LPP, double const BP, int const BDF) /*override*/; + void Init(double const PP, double const HPP, double const LPP, double const BP, int const BDF) override; /// One-step distributor advance for ESt4R (rapid step active above velocity threshold). - double GetPF(double const PP, double const dt, double const Vel) /*override*/; // przeplyw miedzy komora wstepna i PG + double GetPF(double const PP, double const dt, double const Vel) override; // przeplyw miedzy komora wstepna i PG /// Constructs the distributor and creates the impulse chamber. inline TESt4R(double i_mbp, double i_bcr, double i_bcd, double i_brc, int i_bcn, int i_BD, int i_mat, int i_ba, int i_nbpa) : TESt(i_mbp, i_bcr, i_bcd, i_brc, i_bcn, i_BD, i_mat, i_ba, i_nbpa) @@ -713,7 +713,6 @@ class TESt4R : public TESt class TLSt : public TESt4R { - private: // double CylFlowSpeed[2][2]; // zmienna nie używana protected: @@ -726,24 +725,24 @@ class TLSt : public TESt4R public: /// Initialises the LSt; resizes the valve and impulse reservoirs and presets pressures. - void Init(double const PP, double const HPP, double const LPP, double const BP, int const BDF) /*override*/; + void Init(double const PP, double const HPP, double const LPP, double const BP, int const BDF) override; /// Sets the auxiliary brake target pressure for the DCV. - void SetLBP(double const P); // cisnienie z hamulca pomocniczego + void SetLBP(double const P) override; // cisnienie z hamulca pomocniczego /// Sets the rapid step ratio (RM = 1 - RMR). /// Reduction ratio (0 disables rapid, > 0 enables). - void SetRM(double const RMR); // ustalenie przelozenia rapida + void SetRM(double const RMR) override; // ustalenie przelozenia rapida /// One-step distributor advance for LSt (DCV + rapid + ED release). - double GetPF(double const PP, double const dt, double const Vel) /*override*/; // przeplyw miedzy komora wstepna i PG + double GetPF(double const PP, double const dt, double const Vel) override; // przeplyw miedzy komora wstepna i PG /// Computes the high-pressure inflow (replenishes the auxiliary reservoir from the main line). - double GetHPFlow(double const HP, double const dt) /*override*/; // przeplyw - 8 bar + double GetHPFlow(double const HP, double const dt) override; // przeplyw - 8 bar /// Returns the brake-cylinder reference pressure used by the ED brake controller (CVP-BCP * BVM). - virtual double GetEDBCP(); // cisnienie tylko z hamulca zasadniczego, uzywane do hamulca ED w EP09 + double GetEDBCP() override; // cisnienie tylko z hamulca zasadniczego, uzywane do hamulca ED w EP09 /// Sets the ED brake state used to relax the pneumatic brake. /// ED intensity (0..1). - virtual void SetED(double const EDstate); // stan hamulca ED do luzowania + void SetED(double const EDstate) override; // stan hamulca ED do luzowania /// Constructs the LSt distributor. - inline TLSt(double i_mbp, double i_bcr, double i_bcd, double i_brc, int i_bcn, int i_BD, int i_mat, int i_ba, int i_nbpa) : TESt4R(i_mbp, i_bcr, i_bcd, i_brc, i_bcn, i_BD, i_mat, i_ba, i_nbpa) {} + using TESt4R::TESt4R; }; /// @@ -774,15 +773,15 @@ class TEStED : public TLSt public: /// Initialises the EStED — sets up Miedzypoj, ImplsRes and the nozzle characteristics. - void Init(double const PP, double const HPP, double const LPP, double const BP, int const BDF) /*override*/; + void Init(double const PP, double const HPP, double const LPP, double const BP, int const BDF) override; /// One-step distributor advance for EStED (full EP09 logic with intermediate reservoir). - double GetPF(double const PP, double const dt, double const Vel) /*override*/; // przeplyw miedzy komora wstepna i PG + double GetPF(double const PP, double const dt, double const Vel) override; // przeplyw miedzy komora wstepna i PG /// Returns ED-brake reference pressure (ImplsRes pressure scaled by load coefficient). - double GetEDBCP() /*override*/; // cisnienie tylko z hamulca zasadniczego, uzywane do hamulca ED + double GetEDBCP() override; // cisnienie tylko z hamulca zasadniczego, uzywane do hamulca ED /// Recomputes LoadC for the current vehicle mass. - void PLC(double const mass); // wspolczynnik cisnienia przystawki wazacej + void PLC(double const mass) override; // wspolczynnik cisnienia przystawki wazacej /// Stores the load-weighing parameters. - void SetLP(double const TM, double const LM, double const TBP); // parametry przystawki wazacej + void SetLP(double const TM, double const LM, double const TBP) override; // parametry przystawki wazacej /// Constructs the distributor and creates the intermediate reservoir. inline TEStED(double i_mbp, double i_bcr, double i_bcd, double i_brc, int i_bcn, int i_BD, int i_mat, int i_ba, int i_nbpa) : TLSt(i_mbp, i_bcr, i_bcd, i_brc, i_bcn, i_BD, i_mat, i_ba, i_nbpa) @@ -812,21 +811,21 @@ class TEStEP2 : public TLSt public: /// Initialises the EP2-equipped distributor (impulse chamber, P delay). - void Init(double const PP, double const HPP, double const LPP, double const BP, int const BDF) /*override*/; // inicjalizacja + void Init(double const PP, double const HPP, double const LPP, double const BP, int const BDF) override; // inicjalizacja /// One-step distributor advance with EP2 EP brake logic. - double GetPF(double const PP, double const dt, double const Vel) /*override*/; // przeplyw miedzy komora wstepna i PG + double GetPF(double const PP, double const dt, double const Vel) override; // przeplyw miedzy komora wstepna i PG /// Recomputes LoadC for the current vehicle mass. - void PLC(double const mass); // wspolczynnik cisnienia przystawki wazacej + void PLC(double const mass) override; // wspolczynnik cisnienia przystawki wazacej /// Sets EP intensity; if EP is active and LBP < cylinder pressure, latches LBP from cylinder. - void SetEPS(double const nEPS) /*override*/; // stan hamulca EP + void SetEPS(double const nEPS) override; // stan hamulca EP /// Stores the load-weighing parameters. - void SetLP(double const TM, double const LM, double const TBP); // parametry przystawki wazacej + void SetLP(double const TM, double const LM, double const TBP) override; // parametry przystawki wazacej /// EP brake flow integration step. Override in EP1 for proportional control. /// Time step [s]. void virtual EPCalc(double dt); /// Constructs the EP2 distributor. - inline TEStEP2(double i_mbp, double i_bcr, double i_bcd, double i_brc, int i_bcn, int i_BD, int i_mat, int i_ba, int i_nbpa) : TLSt(i_mbp, i_bcr, i_bcd, i_brc, i_bcn, i_BD, i_mat, i_ba, i_nbpa) {} + using TLSt::TLSt; }; /// @@ -839,15 +838,13 @@ class TEStEP1 : public TEStEP2 public: /// Proportional EP flow integration step (uses fractional part of EPS as the EP target). - void EPCalc(double dt); + void EPCalc(double dt) override; /// Stores the EP intensity. /// Target EP value (integer part = direction, fractional part = magnitude). void SetEPS(double const nEPS) override; // stan hamulca EP /// Constructs the EP1 distributor. - inline TEStEP1(double i_mbp, double i_bcr, double i_bcd, double i_brc, int i_bcn, int i_BD, int i_mat, int i_ba, int i_nbpa) : TEStEP2(i_mbp, i_bcr, i_bcd, i_brc, i_bcn, i_BD, i_mat, i_ba, i_nbpa) - { - } + using TEStEP2::TEStEP2; }; /// @@ -867,21 +864,21 @@ class TCV1 : public TBrake public: /// Initialises the CV1 distributor (sizes ZS, sets pressures, computes BVM). - void Init(double const PP, double const HPP, double const LPP, double const BP, int const BDF) /*override*/; + void Init(double const PP, double const HPP, double const LPP, double const BP, int const BDF) override; /// One-step distributor advance for the CV1 baseline. - double GetPF(double const PP, double const dt, double const Vel) /*override*/; // przeplyw miedzy komora wstepna i PG + double GetPF(double const PP, double const dt, double const Vel) override; // przeplyw miedzy komora wstepna i PG /// Returns the control reservoir (ZS) pressure. - double GetCRP() /*override*/; + double GetCRP() override; /// Updates BrakeStatus based on pre-chamber/cylinder/control reservoir relations and the releaser. /// Cylinder (or impulse) pressure. /// In/out brake pipe flow correction. void CheckState(double const BCP, double &dV1); /// Returns the ZS-filling slide valve opening factor for the given cylinder pressure. - double CVs(double const BP); + double CVs(double const BP) const; /// Returns the ZP-filling slide valve opening factor for the given cylinder pressure. - double BVs(double const BCP); + double BVs(double const BCP) const; /// Vents valve, brake and control reservoirs to zero. - void ForceEmptiness() /*override*/; // wymuszenie bycia pustym + void ForceEmptiness() override; // wymuszenie bycia pustym /// Constructs the CV1 distributor and creates the control reservoir. inline TCV1(double i_mbp, double i_bcr, double i_bcd, double i_brc, int i_bcn, int i_BD, int i_mat, int i_ba, int i_nbpa) : TBrake(i_mbp, i_bcr, i_bcd, i_brc, i_bcn, i_BD, i_mat, i_ba, i_nbpa) @@ -922,13 +919,13 @@ class TCV1L_TR : public TCV1 public: /// Initialises the CV1-L-TR (sizes the impulse chamber on top of CV1::Init). - void Init(double const PP, double const HPP, double const LPP, double const BP, int const BDF) /*override*/; + void Init(double const PP, double const HPP, double const LPP, double const BP, int const BDF) override; /// One-step distributor advance for CV1-L-TR (impulse chamber + DCV). - double GetPF(double const PP, double const dt, double const Vel) /*override*/; // przeplyw miedzy komora wstepna i PG + double GetPF(double const PP, double const dt, double const Vel) override; // przeplyw miedzy komora wstepna i PG /// Sets the auxiliary brake target pressure for the DCV. - void SetLBP(double const P); // cisnienie z hamulca pomocniczego + void SetLBP(double const P) override; // cisnienie z hamulca pomocniczego /// Computes the high-pressure (8 bar) inflow used to replenish the auxiliary reservoir. - double GetHPFlow(double const HP, double const dt) /*override*/; // przeplyw - 8 bar + double GetHPFlow(double const HP, double const dt) override; // przeplyw - 8 bar /// Constructs the CV1-L-TR and creates the impulse chamber. inline TCV1L_TR(double i_mbp, double i_bcr, double i_bcd, double i_brc, int i_bcn, int i_BD, int i_mat, int i_ba, int i_nbpa) : TCV1(i_mbp, i_bcr, i_bcd, i_brc, i_bcn, i_BD, i_mat, i_ba, i_nbpa) @@ -971,31 +968,31 @@ class TKE : public TBrake public: /// Initialises the KE distributor (control / impulse / auxiliary reservoirs and BVM). - void Init(double const PP, double const HPP, double const LPP, double const BP, int const BDF) /*override*/; + void Init(double const PP, double const HPP, double const LPP, double const BP, int const BDF) override; /// Sets the rapid step ratio (RM = 1 - RMR). - void SetRM(double const RMR); // ustalenie przelozenia rapida + void SetRM(double const RMR) override; // ustalenie przelozenia rapida /// One-step distributor advance for the KE distributor. - double GetPF(double const PP, double const dt, double const Vel) /*override*/; // przeplyw miedzy komora wstepna i PG + double GetPF(double const PP, double const dt, double const Vel) override; // przeplyw miedzy komora wstepna i PG /// Computes the high-pressure (8 bar) inflow used to replenish the auxiliary reservoir. - double GetHPFlow(double const HP, double const dt) /*override*/; // przeplyw - 8 bar + double GetHPFlow(double const HP, double const dt) override; // przeplyw - 8 bar /// Returns the control reservoir (ZS) pressure. - double GetCRP() /*override*/; + double GetCRP() override; /// Updates BrakeStatus from cylinder/pre-chamber/control reservoir pressures (KE-specific thresholds). void CheckState(double const BCP, double &dV1); /// Drives the releaser logic for KE — bleeds the control reservoir while engaged. void CheckReleaser(double const dt); // odluzniacz /// ZS-filling slide valve opening factor for the given cylinder pressure. - double CVs(double const BP); // napelniacz sterujacego + double CVs(double const BP) const; // napelniacz sterujacego /// ZP-filling slide valve opening factor for the given cylinder pressure. - double BVs(double const BCP); // napelniacz pomocniczego + double BVs(double const BCP) const; // napelniacz pomocniczego /// Recomputes LoadC for the current vehicle mass. - void PLC(double const mass); // wspolczynnik cisnienia przystawki wazacej + void PLC(double const mass) override; // wspolczynnik cisnienia przystawki wazacej /// Stores the load-weighing parameters. - void SetLP(double const TM, double const LM, double const TBP); // parametry przystawki wazacej + void SetLP(double const TM, double const LM, double const TBP) override; // parametry przystawki wazacej /// Sets the auxiliary brake target pressure for the DCV. - void SetLBP(double const P); // cisnienie z hamulca pomocniczego + void SetLBP(double const P) override; // cisnienie z hamulca pomocniczego /// Vents valve, brake, control, impulse and secondary auxiliary reservoirs to zero. - void ForceEmptiness() /*override*/; // wymuszenie bycia pustym + void ForceEmptiness() override; // wymuszenie bycia pustym /// Constructs the KE distributor and creates the control / impulse / secondary reservoirs. inline TKE(double i_mbp, double i_bcr, double i_bcd, double i_brc, int i_bcn, int i_BD, int i_mat, int i_ba, int i_nbpa) : TBrake(i_mbp, i_bcr, i_bcd, i_brc, i_bcn, i_BD, i_mat, i_ba, i_nbpa) @@ -1077,7 +1074,7 @@ class TDriverHandle /// Unbrake over-pressure [bar]. /// Overload (assimilation) max pressure [bar]. /// Overload pressure decay rate [bar/s]. - virtual void SetParams(bool AO, bool MO, double, double, double OMP, double OPD) {}; // ustawianie jakichs parametrow dla zaworu + virtual void SetParams(bool AO, bool MO, double, double, double OMP, double OPD) { /* no effect for this device type */ } // ustawianie jakichs parametrow dla zaworu /// Sets the manual overcharge button state. /// True while the button is pressed. virtual void OvrldButton(bool Active); // przycisk recznego przeladowania/asymilacji @@ -1089,6 +1086,7 @@ class TDriverHandle { memset(Sounds, 0, sizeof(Sounds)); } + virtual ~TDriverHandle() = default; }; /// @@ -1107,12 +1105,12 @@ class TFV4a : public TDriverHandle public: /// Computes brake pipe flow for the FV4a handle (uses BPT[] table). - double GetPF(double i_bcp, double PP, double HP, double dt, double ep) /*override*/; + double GetPF(double i_bcp, double PP, double HP, double dt, double ep) override; /// Initialises CP and RP to the supplied pressure. - void Init(double Press) /*override*/; + void Init(double Press) override; /// Default constructor. - inline TFV4a() : TDriverHandle() {} + using TDriverHandle::TDriverHandle; }; /// @@ -1143,27 +1141,27 @@ class TFV4aM : public TDriverHandle /// Returns the brake pipe pressure target interpolated from BPT[] for the given handle position. /// /// Handle position. - double LPP_RP(double pos); + double LPP_RP(double pos) const; /// Returns true if pos is within ±0.5 of i_pos (detent comparison). - bool EQ(double pos, double i_pos); + bool EQ(double pos, double i_pos) const; public: /// Computes brake pipe flow for the FV4a/M handle (interpolated BPT, wave modelling, accelerator). - double GetPF(double i_bcp, double PP, double HP, double dt, double ep) /*override*/; + double GetPF(double i_bcp, double PP, double HP, double dt, double ep) override; /// Initialises CP and RP. - void Init(double Press) /*override*/; + void Init(double Press) override; /// Sets the reductor adjustment offset. - void SetReductor(double nAdj) /*override*/; + void SetReductor(double nAdj) override; /// Returns Sounds[i] (or 0 if i > 4). - double GetSound(int i) /*override*/; + double GetSound(int i) override; /// Returns pos_table[i]. - double GetPos(int i) /*override*/; + double GetPos(int i) override; /// Returns the time chamber pressure (TP). - double GetCP(); + double GetCP() override; /// Returns the regulator pressure (5 + TP*0.08 + RedAdj). - double GetRP(); + double GetRP() override; /// Default constructor. - inline TFV4aM() : TDriverHandle() {} + using TDriverHandle::TDriverHandle; }; /// @@ -1193,32 +1191,31 @@ class TMHZ_EN57 : public TDriverHandle static double const pos_table[11]; //= { -2, 10, -1, 0, 0, 2, 9, 10, 0, 0, 0 }; /// Returns the brake pipe pressure target for the given handle position (piecewise). - double LPP_RP(double pos); + double LPP_RP(double pos) const; /// Returns true if pos is within ±0.5 of i_pos. - bool EQ(double pos, double i_pos); + bool EQ(double pos, double i_pos) const; public: /// Computes brake pipe flow for MHZ_EN57 (covers handle positions -1..10 with EP/pneumatic mix). - double GetPF(double i_bcp, double PP, double HP, double dt, double ep) /*override*/; + double GetPF(double i_bcp, double PP, double HP, double dt, double ep) override; /// Initialises CP. - void Init(double Press) /*override*/; + void Init(double Press) override; /// Sets the reductor adjustment offset. - void SetReductor(double nAdj) /*override*/; + void SetReductor(double nAdj) override; /// Returns Sounds[i] (or 0 if i > 4). - double GetSound(int i) /*override*/; + double GetSound(int i) override; /// Returns pos_table[i]. - double GetPos(int i) /*override*/; + double GetPos(int i) override; /// Returns the regulator pressure (RP). - double GetCP() /*override*/; + double GetCP() override; /// Returns the regulator target (5 + RedAdj). - double GetRP() /*override*/; + double GetRP() override; /// Returns EP brake intensity for the given handle position. - double GetEP(double pos); + double GetEP(double pos) override; /// Configures handle parameters (auto/manual overcharge, over-pressure, overcharge dynamics). - void SetParams(bool AO, bool MO, double OverP, double, double OMP, double OPD); + void SetParams(bool AO, bool MO, double OverP, double, double OMP, double OPD) override; /// Default constructor. - inline TMHZ_EN57(void) : TDriverHandle() {} -}; + using TDriverHandle::TDriverHandle;}; /// /// MHZ_K5P — Knorr 5-position combined brake handle. @@ -1232,7 +1229,6 @@ class TMHZ_K5P : public TDriverHandle /// Time chamber pressure [bar]. double TP = 0.0; // zbiornik czasowy /// Reductor reservoir pressure [bar]. - double RP = 0.0; // zbiornik redukcyjny /// Reductor adjustment offset. double RedAdj = 0.0; // dostosowanie reduktora cisnienia (krecenie kapturkiem) /// True while filling-stroke / release wave is active. @@ -1249,29 +1245,28 @@ class TMHZ_K5P : public TDriverHandle static double const pos_table[11]; //= { -2, 10, -1, 0, 0, 2, 9, 10, 0, 0, 0 }; /// Returns true if pos is within ±0.5 of i_pos. - bool EQ(double pos, double i_pos); + bool EQ(double pos, double i_pos) const; public: /// Computes brake pipe flow for the K5P 5-position handle (release / cut-off / brake / emergency). - double GetPF(double i_bcp, double PP, double HP, double dt, double ep) /*override*/; + double GetPF(double i_bcp, double PP, double HP, double dt, double ep) override; /// Initialises CP and enables the time chambers. - void Init(double Press) /*override*/; + void Init(double Press) override; /// Sets the reductor adjustment offset. - void SetReductor(double nAdj) /*override*/; + void SetReductor(double nAdj) override; /// Returns Sounds[i] (or 0 if i > 4). - double GetSound(int i) /*override*/; + double GetSound(int i) override; /// Returns pos_table[i]. - double GetPos(int i) /*override*/; + double GetPos(int i) override; /// Returns CP. - double GetCP() /*override*/; + double GetCP() override; /// Returns the regulator target (5 + TP + RedAdj). - double GetRP() /*override*/; + double GetRP() override; /// Configures handle parameters (auto/manual overcharge, over-pressure, filling-stroke factor, overcharge dynamics). - void SetParams(bool AO, bool MO, double, double, double OMP, double OPD); /*ovveride*/ + void SetParams(bool AO, bool MO, double, double, double OMP, double OPD) override; /// Default constructor. - inline TMHZ_K5P(void) : TDriverHandle() {} -}; + using TDriverHandle::TDriverHandle;}; /// /// MHZ_6P — 6-position combined brake handle (similar logic to K5P with one more detent). @@ -1285,7 +1280,6 @@ class TMHZ_6P : public TDriverHandle /// Time chamber pressure [bar]. double TP = 0.0; // zbiornik czasowy /// Reductor reservoir pressure [bar]. - double RP = 0.0; // zbiornik redukcyjny /// Reductor adjustment offset. double RedAdj = 0.0; // dostosowanie reduktora cisnienia (krecenie kapturkiem) /// True while filling-stroke / release wave is active. @@ -1302,29 +1296,28 @@ class TMHZ_6P : public TDriverHandle static double const pos_table[11]; //= { -2, 10, -1, 0, 0, 2, 9, 10, 0, 0, 0 }; /// Returns true if pos is within ±0.5 of i_pos. - bool EQ(double pos, double i_pos); + bool EQ(double pos, double i_pos) const; public: /// Computes brake pipe flow for the 6P handle. - double GetPF(double i_bcp, double PP, double HP, double dt, double ep) /*override*/; + double GetPF(double i_bcp, double PP, double HP, double dt, double ep) override; /// Initialises CP and enables the time chambers. - void Init(double Press) /*override*/; + void Init(double Press) override; /// Sets the reductor adjustment offset. - void SetReductor(double nAdj) /*override*/; + void SetReductor(double nAdj) override; /// Returns Sounds[i] (or 0 if i > 4). - double GetSound(int i) /*override*/; + double GetSound(int i) override; /// Returns pos_table[i]. - double GetPos(int i) /*override*/; + double GetPos(int i) override; /// Returns CP. - double GetCP() /*override*/; + double GetCP() override; /// Returns the regulator target (5 + TP + RedAdj). - double GetRP() /*override*/; + double GetRP() override; /// Configures handle parameters (auto/manual overcharge, over-pressure, filling-stroke factor, overcharge dynamics). - void SetParams(bool AO, bool MO, double, double, double OMP, double OPD); /*ovveride*/ + void SetParams(bool AO, bool MO, double, double, double OMP, double OPD) override; /// Default constructor. - inline TMHZ_6P(void) : TDriverHandle() {} -}; + using TDriverHandle::TDriverHandle;}; /* FBS2= class(TTDriverHandle) private @@ -1372,17 +1365,17 @@ class TM394 : public TDriverHandle public: /// Computes brake pipe flow for the M394 handle (uses BPT_394). - double GetPF(double i_bcp, double PP, double HP, double dt, double ep) /*override*/; + double GetPF(double i_bcp, double PP, double HP, double dt, double ep) override; /// Initialises CP and enables the time chamber. - void Init(double Press) /*override*/; + void Init(double Press) override; /// Sets the reductor adjustment offset. - void SetReductor(double nAdj) /*override*/; + void SetReductor(double nAdj) override; /// Returns CP. - double GetCP() /*override*/; + double GetCP() override; /// Returns max(5, CP) + RedAdj. - double GetRP() /*override*/; + double GetRP() override; /// Returns pos_table[i]. - double GetPos(int i) /*override*/; + double GetPos(int i) override; /// Default constructor — sets the maximum handle position to 5. inline TM394(void) : TDriverHandle() @@ -1411,17 +1404,17 @@ class TH14K1 : public TDriverHandle public: /// Computes brake pipe flow for the H14K1 handle. - double GetPF(double i_bcp, double PP, double HP, double dt, double ep) /*override*/; + double GetPF(double i_bcp, double PP, double HP, double dt, double ep) override; /// Initialises CP and enables the time chambers. - void Init(double Press) /*override*/; + void Init(double Press) override; /// Sets the reductor adjustment offset. - void SetReductor(double nAdj) /*override*/; + void SetReductor(double nAdj) override; /// Returns CP. - double GetCP() /*override*/; + double GetCP() override; /// Returns the regulator target (5 + RedAdj). - double GetRP() /*override*/; + double GetRP() override; /// Returns pos_table[i]. - double GetPos(int i) /*override*/; + double GetPos(int i) override; /// Default constructor — sets the maximum handle position to 4. inline TH14K1(void) : TDriverHandle() @@ -1450,21 +1443,20 @@ class TSt113 : public TH14K1 public: /// Computes brake pipe flow for the St113 handle (with EP). - double GetPF(double i_bcp, double PP, double HP, double dt, double ep) /*override*/; + double GetPF(double i_bcp, double PP, double HP, double dt, double ep) override; /// Returns CP. - double GetCP() /*override*/; + double GetCP() override; /// Returns the regulator target (5 + RedAdj). - double GetRP() /*override*/; + double GetRP() override; /// Returns the current EP intensity. - double GetEP() /*override*/; + double GetEP() override; /// Returns pos_table[i]. - double GetPos(int i) /*override*/; + double GetPos(int i) override; /// Enables the time chambers (no pressure init). - void Init(double Press) /*override*/; + void Init(double Press) override; /// Default constructor. - inline TSt113(void) : TH14K1() {} -}; + using TH14K1::TH14K1;}; /// /// Test handle — minimal implementation used during development for verifying @@ -1479,13 +1471,12 @@ class Ttest : public TDriverHandle public: /// Computes brake pipe flow using the FV4a-style BPT table for testing. - double GetPF(double i_bcp, double PP, double HP, double dt, double ep) /*override*/; + double GetPF(double i_bcp, double PP, double HP, double dt, double ep) override; /// Initialises CP. - void Init(double Press) /*override*/; + void Init(double Press) override; /// Default constructor. - inline Ttest(void) : TDriverHandle() {} -}; + using TDriverHandle::TDriverHandle;}; /// /// FD1 auxiliary brake handle — directly drives the cylinder pressure between @@ -1505,18 +1496,17 @@ class TFD1 : public TDriverHandle double Speed = 0.0; // szybkosc dzialania /// Computes the auxiliary brake outflow for this step. - double GetPF(double i_bcp, double PP, double HP, double dt, double ep) /*override*/; + double GetPF(double i_bcp, double PP, double HP, double dt, double ep) override; /// Initialises MaxBP and the action speed. - void Init(double Press) /*override*/; + void Init(double Press) override; /// Returns the currently commanded cylinder pressure (BP). - double GetCP() /*override*/; + double GetCP() override; /// Sets the action speed multiplier. void SetSpeed(double nSpeed); // procedure Init(press: real; MaxBP: real); overload; /// Default constructor. - inline TFD1(void) : TDriverHandle() {} -}; + using TDriverHandle::TDriverHandle;}; /// /// H1405 — Knorr auxiliary brake handle (continuous, independent brake). @@ -1532,16 +1522,15 @@ class TH1405 : public TDriverHandle public: /// Computes the auxiliary brake outflow for this step (proportional to handle deflection). - double GetPF(double i_bcp, double PP, double HP, double dt, double ep) /*override*/; + double GetPF(double i_bcp, double PP, double HP, double dt, double ep) override; /// Initialises MaxBP and enables the time chamber. - void Init(double Press) /*override*/; + void Init(double Press) override; /// Returns the currently commanded cylinder pressure (BP). - double GetCP() /*override*/; + double GetCP() override; // procedure Init(press: real; MaxBP: real); overload; /// Default constructor. - inline TH1405(void) : TDriverHandle() {} -}; + using TDriverHandle::TDriverHandle;}; /// /// FVel6 — combined EP + pneumatic brake handle (Czech, 6+1 positions). @@ -1559,23 +1548,22 @@ class TFVel6 : public TDriverHandle public: /// Computes brake pipe flow for FVel6 (continuous EP brake plus pneumatic emergency). - double GetPF(double i_bcp, double PP, double HP, double dt, double ep) /*override*/; + double GetPF(double i_bcp, double PP, double HP, double dt, double ep) override; /// Returns CP. - double GetCP() /*override*/; + double GetCP() override; /// Returns the regulator target (constant 5 bar). - double GetRP() /*override*/; + double GetRP() override; /// Returns the current EP intensity. - double GetEP() /*override*/; + double GetEP() override; /// Returns pos_table[i]. - double GetPos(int i) /*override*/; + double GetPos(int i) override; /// Returns Sounds[i] (or 0 if i > 2). - double GetSound(int i) /*override*/; + double GetSound(int i) override; /// Enables the time chambers. - void Init(double Press) /*override*/; + void Init(double Press) override; /// Default constructor. - inline TFVel6(void) : TDriverHandle() {} -}; + using TDriverHandle::TDriverHandle;}; /// /// FVE408 — newer combined EP + pneumatic brake handle (10 positions). @@ -1594,23 +1582,22 @@ class TFVE408 : public TDriverHandle public: /// Computes brake pipe flow for the FVE408 handle. - double GetPF(double i_bcp, double PP, double HP, double dt, double ep) /*override*/; + double GetPF(double i_bcp, double PP, double HP, double dt, double ep) override; /// Returns CP. - double GetCP() /*override*/; + double GetCP() override; /// Returns the current EP intensity. - double GetEP() /*override*/; + double GetEP() override; /// Returns the regulator target (constant 5 bar). - double GetRP() /*override*/; + double GetRP() override; /// Returns pos_table[i]. - double GetPos(int i) /*override*/; + double GetPos(int i) override; /// Returns Sounds[i] (or 0 if i > 2). - double GetSound(int i) /*override*/; + double GetSound(int i) override; /// Enables the time chamber, disables the EP-time chamber. - void Init(double Press) /*override*/; + void Init(double Press) override; /// Default constructor. - inline TFVE408(void) : TDriverHandle() {} -}; + using TDriverHandle::TDriverHandle;}; /// /// Pneumatic flow rate from one pressure to another through an orifice of area S. diff --git a/application/applicationmode.h b/application/applicationmode.h index feea3bdb6..4f32fc5f9 100644 --- a/application/applicationmode.h +++ b/application/applicationmode.h @@ -25,19 +25,19 @@ public: virtual bool update() = 0; // draws mode-specific user interface inline - void render_ui() { + void render_ui() const { if( m_userinterface != nullptr ) { m_userinterface->render(); } } inline - void begin_ui_frame() { + void begin_ui_frame() const { if( m_userinterface != nullptr ) { m_userinterface->begin_ui_frame(); } } inline - void set_progress( float const Progress = 0.f, float const Subtaskprogress = 0.f ) { + void set_progress( float const Progress = 0.f, float const Subtaskprogress = 0.f ) const { if( m_userinterface != nullptr ) { m_userinterface->set_progress( Progress, Subtaskprogress ); } } inline - void set_tooltip( std::string const &Tooltip ) { + void set_tooltip( std::string const &Tooltip ) const { if( m_userinterface != nullptr ) { m_userinterface->set_tooltip( Tooltip ); } } // maintenance method, called when the mode is activated diff --git a/application/driverhints.cpp b/application/driverhints.cpp index afa654cfd..bcfd7dbd0 100644 --- a/application/driverhints.cpp +++ b/application/driverhints.cpp @@ -38,7 +38,7 @@ void TController::remove_hint( driver_hint const Value ) { m_hints.remove_if( - [=]( auto const &Hint ) { + [Value]( auto const &Hint ) { return std::get(Hint) == Value; } ); } @@ -87,7 +87,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::batteryoff ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvOccupied->BatteryStart != start_t::manual || mvOccupied->Power24vIsAvailable == true; } ); break; } @@ -98,7 +98,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::batteryon ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvOccupied->BatteryStart != start_t::manual || mvOccupied->Power24vIsAvailable == false; } ); break; } @@ -111,7 +111,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::cabdeactivation ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvOccupied->AutomaticCabActivation || mvOccupied->IsCabMaster(); } ); break; } @@ -122,7 +122,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::cabactivation ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvOccupied->AutomaticCabActivation || (mvOccupied->CabMaster == false && mvOccupied->CabActive == 0); } ); break; } @@ -134,7 +134,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::radiooff ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvOccupied->Radio == true; } ); break; } @@ -144,7 +144,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) } hint( Action, - [this](float const Parameter) -> bool { + [this](float const Parameter) { return iRadioChannel == static_cast(Parameter); }, Actionparameter ); break; @@ -156,7 +156,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::radioon ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvOccupied->Radio == false; } ); break; } @@ -168,7 +168,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::oilpumpoff ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { auto const &device { mvOccupied->OilPump }; return device.start_type != start_t::manual || device.is_enabled == true || device.is_active == true || mvOccupied->Mains; } ); break; @@ -180,7 +180,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::oilpumpon ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { auto const &device { mvOccupied->OilPump }; return device.start_type != start_t::manual || (device.is_enabled == false && device.is_active == false); } ); break; @@ -193,7 +193,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::fuelpumpoff ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { auto const &device { mvOccupied->FuelPump }; return device.start_type != start_t::manual || device.is_enabled == true || device.is_active == true; } ); break; @@ -205,7 +205,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::fuelpumpon ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { auto const &device { mvOccupied->FuelPump }; return device.start_type != start_t::manual || (device.is_enabled == false && device.is_active == false); } ); break; @@ -218,7 +218,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::pantographairsourcesetauxiliary ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvPantographUnit->bPantKurek3 == true; } ); break; } @@ -229,7 +229,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::pantographcompressoron ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvPantographUnit->bPantKurek3 == false; } ); break; } @@ -240,7 +240,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::pantographcompressoroff ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvPantographUnit->PantCompFlag == true; } ); break; } @@ -251,7 +251,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::pantographcompressoron ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvPantographUnit->PantCompFlag == false; } ); break; } @@ -262,7 +262,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::pantographsvalveoff ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvPantographUnit->PantsValve.is_active == true; } ); break; } @@ -273,7 +273,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::frontpantographvalveoff ); hint( Action, - [ this ]( float const Parameter ) -> bool { + [ this ]( float const Parameter ) { return mvPantographUnit->Pantographs[end::front].valve.is_active == true || (Parameter > 0 && mvOccupied->Vel > Parameter); }, Actionparameter ); break; @@ -285,7 +285,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::frontpantographvalveon ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvPantographUnit->Pantographs[end::front].valve.is_active == false; } ); break; } @@ -296,7 +296,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::rearpantographvalveoff ); hint( Action, - [ this ]( float const Parameter ) -> bool { + [ this ]( float const Parameter ) { return mvPantographUnit->Pantographs[end::rear].valve.is_active == true || (Parameter > 0 && mvOccupied->Vel > Parameter); }, Actionparameter ); break; @@ -308,7 +308,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::rearpantographvalveon ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvPantographUnit->Pantographs[end::rear].valve.is_active == false; } ); break; } @@ -320,7 +320,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::converteroff ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return IsAnyConverterEnabled == true; } ); break; } @@ -331,7 +331,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::converteron ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return IsAnyConverterExplicitlyEnabled == false; } ); break; } @@ -342,7 +342,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) } hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvOccupied->ConverterOverloadRelayStart != start_t::manual || mvOccupied->ConvOvldFlag == false; } ); break; } @@ -352,7 +352,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) } hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvOccupied->GroundRelayStart != start_t::manual || mvOccupied->GroundRelay == true; } ); break; } @@ -362,7 +362,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) } hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvOccupied->FuseFlag == false; } ); break; } @@ -374,7 +374,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::linebreakeropen ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return IsAnyLineBreakerOpen == false; } ); break; } @@ -385,7 +385,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::linebreakerclose ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { // TBD, TODO: replace with consist-wide flag set true if any line breaker is closed? return mvControlling->Mains == false; } ); break; @@ -398,7 +398,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::compressoroff ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return IsAnyCompressorEnabled == true; } ); break; } @@ -409,7 +409,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::compressoron ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return IsAnyCompressorExplicitlyEnabled == false; } ); break; } @@ -421,7 +421,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::frontmotorblowersoff ); hint( Action, - [this]( float const Parameter ) -> bool { + [this]( float const /*Parameter*/ ) { auto const &device { mvOccupied->MotorBlowers[ end::front ] }; return device.start_type != start_t::manual || (device.is_enabled == true && device.is_disabled == false); } ); break; @@ -434,7 +434,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::rearmotorblowersoff ); hint( Action, - [this]( float const Parameter ) -> bool { + [this]( float const /*Parameter*/ ) { auto const &device { mvOccupied->MotorBlowers[ end::rear ] }; return device.start_type != start_t::manual || (device.is_enabled == true && device.is_disabled == false); } ); break; @@ -447,7 +447,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::springbrakeoff ); hint( Action, - [this]( float const Parameter ) -> bool { + [this]( float const /*Parameter*/ ) { return mvOccupied->SpringBrake.Activate == true; } ); break; } @@ -458,7 +458,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::springbrakeon ); hint( Action, - [this]( float const Parameter ) -> bool { + [this]( float const /*Parameter*/ ) { return mvOccupied->SpringBrake.Activate == false; } ); break; } @@ -470,7 +470,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::manualbrakoff ); hint( Action, - [this]( float const Parameter ) -> bool { + [this]( float const /*Parameter*/ ) { return mvOccupied->LocalBrake != TLocalBrake::ManualBrake || mvOccupied->MBrake == false || mvOccupied->ManualBrakePos == ManualBrakePosNo; } ); break; } @@ -481,7 +481,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::manualbrakon ); hint( Action, - [this]( float const Parameter ) -> bool { + [this]( float const /*Parameter*/ ) { return mvOccupied->LocalBrake != TLocalBrake::ManualBrake || mvOccupied->MBrake == false || mvOccupied->ManualBrakePos == 0; } ); break; } @@ -490,33 +490,31 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) if( AIControllFlag ) { while( mvControlling->RList[mvControlling->MainCtrlPos].Mn == 0 && mvControlling->IncMainCtrl(1) ) { - ; + // all work is done in the loop header } } remove_master_controller_hints(); hint( Action, - [this]( float const Parameter ) -> bool { + [this]( float const /*Parameter*/ ) { return mvControlling->RList[mvControlling->MainCtrlPos].Mn > 0; } ); break; } case driver_hint::mastercontrollersetseriesmode: { - if( AIControllFlag ) { - if( mvControlling->RList[ mvControlling->MainCtrlPos ].Bn > 1 ) { - // limit yourself to series mode - if( mvControlling->ScndCtrlPos ) { - mvControlling->DecScndCtrl( 2 ); - } - while( mvControlling->RList[mvControlling->MainCtrlPos].Bn > 1 - && mvControlling->DecMainCtrl(1) ) { - ; // all work is performed in the header - } + if (AIControllFlag && mvControlling->RList[ mvControlling->MainCtrlPos ].Bn > 1) { + // limit yourself to series mode + if( mvControlling->ScndCtrlPos ) { + mvControlling->DecScndCtrl( 2 ); + } + while( mvControlling->RList[mvControlling->MainCtrlPos].Bn > 1 + && mvControlling->DecMainCtrl(1) ) { + // all work is performed in the header } } remove_master_controller_hints(); hint( Action, - [this]( float const Parameter ) -> bool { + [this]( float const /*Parameter*/ ) { return mvControlling->RList[mvControlling->MainCtrlPos].Bn < 2; } ); break; } @@ -527,7 +525,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_master_controller_hints(); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvControlling->IsMainCtrlNoPowerPos() && mvControlling->IsScndCtrlNoPowerPos(); } ); break; } @@ -535,15 +533,15 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) if( AIControllFlag ) { while( false == mvControlling->EIMDirectionChangeAllow() && mvControlling->DecMainCtrl(1) ) { - ; + // all work is done in the loop header } } remove_master_controller_hints(); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvControlling->EIMDirectionChangeAllow(); }, - mvControlling->MainCtrlMaxDirChangePos ); + static_cast(mvControlling->MainCtrlMaxDirChangePos) ); break; } case driver_hint::tractiveforcedecrease: { @@ -553,13 +551,13 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_master_controller_hints(); hint( Action, - [this](float const Parameter) -> bool { + [this](float const Parameter) { return std::abs(mvControlling->Ft) <= Parameter; }, - std::min( + static_cast(std::min( 0.0, std::max( std::abs( mvControlling->Ft ) * 0.95, - std::abs( mvControlling->Ft ) - 5.0 ) ) ); + std::abs( mvControlling->Ft ) - 5.0 ) )) ); break; } case driver_hint::tractiveforceincrease: { @@ -575,21 +573,19 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) } hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return AccDesired <= EU07_AI_NOACCELERATION || (false == Ready && false == mvOccupied->ShuntMode) || AccDesired - AbsAccS <= 0.05 || (mvOccupied->EIMCtrlType > 0 ? mvControlling->eimic_real >= 1.0 : mvControlling->IsScndCtrlMaxPowerPos() && mvControlling->IsMainCtrlMaxPowerPos()); } ); break; } case driver_hint::bufferscompress: { - if( AIControllFlag ) { - if( std::abs( mvControlling->Ft ) < 50000.0 ) { - IncSpeed(); - } + if (AIControllFlag && std::abs( mvControlling->Ft ) < 50000.0) { + IncSpeed(); } remove_master_controller_hints(); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return std::abs(mvControlling->Ft) > 30.0 || (OrderCurrentGet() & Disconnect) == 0; } ); break; } @@ -601,7 +597,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_master_controller_hints(); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvControlling->IsScndCtrlNoPowerPos(); } ); break; } @@ -613,7 +609,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::waterpumpoff ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { auto const &device { mvControlling->WaterPump }; return device.start_type != start_t::manual || (device.is_enabled == true && device.is_disabled == false) || device.is_active == true; } ); break; @@ -625,7 +621,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::waterpumpon ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { auto const &device { mvControlling->WaterPump }; return device.start_type != start_t::manual || (device.is_enabled == false && device.is_active == false); } ); break; @@ -637,7 +633,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::waterpumpbreakeroff ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { auto const &device { mvControlling->WaterPump }; return device.breaker == true; } ); break; @@ -649,7 +645,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::waterpumpbreakeron ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { auto const &device { mvControlling->WaterPump }; return device.breaker == false; } ); break; @@ -661,7 +657,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::waterheateroff ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { auto const &device { mvControlling->WaterHeater }; return device.is_enabled == true; } ); break; @@ -673,7 +669,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::waterheateron ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { auto const &device { mvControlling->WaterHeater }; return device.is_enabled == false; } ); break; @@ -685,7 +681,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::waterheaterbreakeroff ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { auto const &device { mvControlling->WaterHeater }; return device.breaker == true; } ); break; @@ -697,7 +693,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::waterheaterbreakeron ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { auto const &device { mvControlling->WaterHeater }; return device.breaker == false; } ); break; @@ -709,7 +705,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::watercircuitslinkoff ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvControlling->dizel_heat.auxiliary_water_circuit == false || mvControlling->WaterCircuitsLink == true; } ); break; } @@ -720,7 +716,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::watercircuitslinkon ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvControlling->dizel_heat.auxiliary_water_circuit == false || mvControlling->WaterCircuitsLink == false; } ); break; } @@ -728,7 +724,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) // NOTE: this action doesn't have AI component hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return false == IsHeatingTemperatureTooLow; } ); break; } @@ -736,7 +732,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) // NOTE: this action doesn't have AI component hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvControlling->ScndPipePress > 4.5 || mvControlling->VeselVolume == 0.0; } ); break; } @@ -744,7 +740,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) // NOTE: this action doesn't have AI component hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvPantographUnit->PantPress >= (is_emu() ? (mvPantographUnit->PantPressLockActive ? 4.6 : 2.6) : 4.2); } ); break; } @@ -752,7 +748,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) // NOTE: this action doesn't have AI component hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return ExchangeTime <= 0; } ); break; } @@ -760,7 +756,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) // NOTE: this action doesn't have AI component hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return IsAtPassengerStop == false; } ); break; } @@ -773,19 +769,16 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) // driver_hint_brakingforcesetzero // driver_hint_brakingforcelap case driver_hint::trainbrakesetpipeunlock: { - if( AIControllFlag ) { - if( mvOccupied->HandleUnlock != -3 ) { - while( BrakeCtrlPosition >= mvOccupied->HandleUnlock - && BrakeLevelAdd(-1) ) { - // all work is done in the header - ; - } + if (AIControllFlag && mvOccupied->HandleUnlock != -3) { + while( BrakeCtrlPosition >= mvOccupied->HandleUnlock + && BrakeLevelAdd(-1) ) { + // all work is done in the header } } remove_train_brake_hints(); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvOccupied->HandleUnlock == -3 || BrakeCtrlPosition == mvOccupied->HandleUnlock; } ); break; } @@ -797,7 +790,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_train_brake_hints(); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return is_equal(mvOccupied->fBrakeCtrlPos, mvOccupied->Handle->GetPos(bh_RP), 0.2) || (mvOccupied->Handle->Time && mvOccupied->Handle->GetCP() > mvOccupied->HighPipePress - 0.05); } ); // return ( BrakeCtrlPosition == gbh_RP ); } ); break; @@ -815,7 +808,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_train_brake_hints(); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return IsConsistBraked /*|| ( ( OrderCurrentGet() & Disconnect ) == 0 ) */; } ); break; } @@ -830,9 +823,9 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_train_brake_hints(); hint( Action, - [this](float const Parameter) -> bool { + [this](float const Parameter) { return std::abs(mvControlling->Fb) <= Parameter; }, - std::min( 0.0, 0.95 * std::abs( mvControlling->Fb ) ) ); // keep hint until 5% decrease + static_cast(std::min( 0.0, 0.95 * std::abs( mvControlling->Fb ) )) ); // keep hint until 5% decrease break; } case driver_hint::brakingforceincrease: { @@ -846,23 +839,25 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_train_brake_hints(); hint( Action, - [this](float const Parameter) -> bool { + [this](float const Parameter) { return std::abs(mvControlling->Fb) > Parameter || is_equal(mvOccupied->fBrakeCtrlPos, mvOccupied->Handle->GetPos(bh_EB), 0.2); }, - std::max( + static_cast(std::max( 0.0, std::max( std::abs( mvControlling->Fb ) * 1.05, - std::abs( mvControlling->Fb ) + 5.0 ) ) ); + std::abs( mvControlling->Fb ) + 5.0 ) )) ); break; } case driver_hint::brakingforcesetzero: { // releases both train and independent brake if( AIControllFlag ) { - while( true == DecBrake() ) { ; } + while( true == DecBrake() ) { + // all work is done in the loop condition + } } remove_train_brake_hints(); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return Ready && fReady < 0.4 && is_equal(mvOccupied->fBrakeCtrlPos, mvOccupied->Handle->GetPos(bh_RP), 0.2); } ); break; } @@ -877,18 +872,16 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) } // independent brake case driver_hint::independentbrakeapply: { - if( AIControllFlag ) { - if( mvOccupied->LocalBrakePosA < 1.0 ) { - mvOccupied->IncLocalBrakeLevel( LocalBrakePosNo ); - if (mvOccupied->EIMCtrlEmergency) { - mvOccupied->DecLocalBrakeLevel(1); + if (AIControllFlag && mvOccupied->LocalBrakePosA < 1.0) { + mvOccupied->IncLocalBrakeLevel( LocalBrakePosNo ); + if (mvOccupied->EIMCtrlEmergency) { + mvOccupied->DecLocalBrakeLevel(1); } - } } remove_hint( driver_hint::independentbrakerelease ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const Parameter) { return mvOccupied->LocalBrakePosA >= Parameter; }, ( LocalBrakePosNo - ( mvOccupied->EIMCtrlEmergency ? 1 : 0 ) ) / LocalBrakePosNo ); break; @@ -900,7 +893,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::independentbrakeapply ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvOccupied->LocalBrakePosA < 0.05; } ); break; } @@ -912,7 +905,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_reverser_hints(); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvOccupied->DirActive * mvOccupied->CabActive > 0; } ); break; } @@ -923,7 +916,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_reverser_hints(); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvOccupied->DirActive * mvOccupied->CabActive < 0; } ); break; } @@ -936,7 +929,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_reverser_hints(); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return iDirection == iDirectionOrder; } ); break; } @@ -947,7 +940,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_reverser_hints(); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvOccupied->DirActive == 0; } ); break; } @@ -959,7 +952,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::sandingoff ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvControlling->Sand == 0 || mvControlling->SandDose == true || mvControlling->SlippingWheels == false; } ); break; } @@ -970,7 +963,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::sandingon ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvControlling->Sand == 0 || mvControlling->SandDose == false; } ); break; } @@ -980,7 +973,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) } hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvControlling->ASBType != 1 || (mvControlling->Hamulec->GetBrakeStatus() & b_asb) != 0 || mvControlling->SlippingWheels == false; } ); break; } @@ -992,7 +985,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::hornoff ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { // NOTE: we provide slightly larger horn activation window for human driver return fWarningDuration + 5.0 < 0.05 || mvOccupied->WarningSignal != 0; } ); break; @@ -1019,7 +1012,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) // TODO: remove other door lock hints hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvOccupied->Doors.has_lock == false || mvOccupied->Doors.lock_enabled == true; } ); break; } @@ -1031,7 +1024,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::departuresignaloff ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvOccupied->Doors.has_warning == false || mvOccupied->Doors.has_autowarning == true || mvOccupied->DepartureSignal == true || mvOccupied->Vel > 5.0; } ); break; } @@ -1042,7 +1035,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::departuresignalon ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvOccupied->Doors.has_warning == false || mvOccupied->Doors.has_autowarning == true || mvOccupied->DepartureSignal == false; } ); break; } @@ -1055,7 +1048,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::doorrightclose ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return IsAnyDoorOpen[side::right] == true; } ); break; } @@ -1067,7 +1060,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::doorrightopen ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return IsAnyDoorOpen[side::right] == false; } ); break; } @@ -1079,7 +1072,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::doorleftclose ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return IsAnyDoorOpen[side::left] == true; } ); break; } @@ -1091,7 +1084,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::doorleftopen ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return IsAnyDoorOpen[side::left] == false; } ); break; } @@ -1102,7 +1095,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::doorrightpermitoff ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return IsAnyDoorPermitActive[side::right] == true; } ); break; } @@ -1113,7 +1106,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::doorrightpermiton ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return IsAnyDoorPermitActive[side::right] == false; } ); break; } @@ -1124,7 +1117,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::doorleftpermitoff ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return IsAnyDoorPermitActive[side::left] == true; } ); break; } @@ -1135,7 +1128,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::doorleftpermiton ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return IsAnyDoorPermitActive[side::left] == false; } ); break; } @@ -1148,7 +1141,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::consistlightsoff ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { auto const &device { mvOccupied->CompartmentLights }; return Global.fLuminance * ConsistShade > 0.40 || device.start_type != start_t::manual || (device.is_enabled == true && device.is_disabled == false) || device.is_active == true; } ); break; @@ -1161,7 +1154,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::consistlightson ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { auto const &device { mvOccupied->CompartmentLights }; return Global.fLuminance * ConsistShade < 0.35 || device.start_type != start_t::manual || (device.is_enabled == false && device.is_active == false); } ); break; @@ -1174,7 +1167,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::consistheatingoff ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvOccupied->HeatingAllow == true; } ); break; } @@ -1185,52 +1178,48 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::consistheatingon ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return mvOccupied->HeatingAllow == false; } ); break; } case driver_hint::securitysystemreset: { - if( AIControllFlag ) { - if (mvOccupied->SecuritySystem.is_blinking()) - mvOccupied->SecuritySystemReset(); - } + if (AIControllFlag && mvOccupied->SecuritySystem.is_blinking()) + mvOccupied->SecuritySystemReset(); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return !mvOccupied->SecuritySystem.is_vigilance_blinking(); } ); break; } case driver_hint::shpsystemreset: { - if( AIControllFlag ) { - if (mvOccupied->SecuritySystem.is_cabsignal_blinking()) - mvOccupied->SecuritySystem.cabsignal_reset(); - } + if (AIControllFlag && mvOccupied->SecuritySystem.is_cabsignal_blinking()) + mvOccupied->SecuritySystem.cabsignal_reset(); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return !mvOccupied->SecuritySystem.is_cabsignal_blinking(); } ); break; } case driver_hint::couplingadapterattach: { // TODO: run also for potential settings-based virtual assistant if( AIControllFlag ) { - pVehicles[ end::front ]->attach_coupler_adapter( Actionparameter ); + pVehicles[ end::front ]->attach_coupler_adapter( static_cast(Actionparameter) ); } hint( Action, - [this](float const Parameter) -> bool { + [this](float const Parameter) { auto const &device { pVehicles[ end::front ]->MoverParameters->Couplers[ static_cast( Parameter ) ] }; return device.type() == TCouplerType::Automatic; } ); break; } case driver_hint::couplingadapterremove: { if( AIControllFlag || Global.AITrainman ) { - pVehicles[ end::front ]->remove_coupler_adapter( Actionparameter ); + pVehicles[ end::front ]->remove_coupler_adapter( static_cast(Actionparameter) ); } hint( Action, - [this](float const Parameter) -> bool { + [this](float const Parameter) { auto const &device { pVehicles[ end::front ]->MoverParameters->Couplers[ static_cast( Parameter ) ] }; return false == device.has_adapter(); } ); break; @@ -1245,7 +1234,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::lightsoff ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return pVehicles[end::front]->has_signal_pc1_on(); } ); break; } @@ -1258,7 +1247,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::lightsoff ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return pVehicles[end::front]->has_signal_pc2_on(); } ); break; } @@ -1275,7 +1264,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::lightsoff ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { auto const activeend { mvOccupied->CabActive >= 0 ? end::front : end::rear }; auto const consistfront { mvOccupied->DirActive >= 0 ? end::front : end::rear }; return pVehicles[consistfront]->has_signal_on(activeend, light::headlight_right) && pVehicles[1 - consistfront]->has_signal_on(1 - activeend, light::headlight_left); } ); @@ -1290,7 +1279,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::lightsoff ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return pVehicles[end::rear]->has_signal_pc5_on(); } ); break; } @@ -1304,7 +1293,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::headcodetb1 ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { auto const activeend { mvOccupied->CabActive >= 0 ? end::front : end::rear }; auto const consistfront { mvOccupied->DirActive >= 0 ? end::front : end::rear }; return pVehicles[consistfront]->has_signal_on(activeend, 0) && pVehicles[1 - consistfront]->has_signal_on(1 - activeend, 0); } ); @@ -1318,7 +1307,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::releaseroff ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return true == mvOccupied->Hamulec->Releaser(); } ); break; } @@ -1329,7 +1318,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::releaseron ); hint( Action, - [this](float const Parameter) -> bool { + [this](float const /*Parameter*/) { return false == mvOccupied->Hamulec->Releaser(); } ); break; } diff --git a/application/driverhints.h b/application/driverhints.h index 7b6130c25..140fe5f98 100644 --- a/application/driverhints.h +++ b/application/driverhints.h @@ -12,7 +12,7 @@ enum class driver_hint { #ifdef DRIVER_HINT_CONTENT #define DRIVER_HINT_DEF(a, b) b, -const char *driver_hints_texts[] = +const char *const driver_hints_texts[] = { #include "application/driverhints_def.h" }; diff --git a/application/driveruipanels.cpp b/application/driveruipanels.cpp index 729b854c0..e318d3563 100644 --- a/application/driveruipanels.cpp +++ b/application/driveruipanels.cpp @@ -52,7 +52,7 @@ drivingaid_panel::update() { || controlled->Mechanik == nullptr ) { return; } auto const *mover = controlled->MoverParameters; - auto const *driver = controlled->Mechanik; + auto const *vehicledriver = controlled->Mechanik; auto const *owner = controlled->ctOwner != nullptr ? controlled->ctOwner : controlled->Mechanik; { // throttle, velocity, speed limits and grade @@ -61,8 +61,7 @@ drivingaid_panel::update() { // grade std::string gradetext; auto const reverser { ( mover->DirActive > 0 ? 1 : -1 ) }; - auto const grade { controlled->VectorFront().y * 100 * ( controlled->DirectionGet() == reverser ? 1 : -1 ) * reverser }; - if( std::abs( grade ) >= 0.25 ) { + if( auto const grade { controlled->VectorFront().y * 100 * ( controlled->DirectionGet() == reverser ? 1 : -1 ) * reverser }; std::abs( grade ) >= 0.25 ) { std::snprintf( m_buffer.data(), m_buffer.size(), STR_C(" Grade: %.1f%%%%"), @@ -87,8 +86,7 @@ drivingaid_panel::update() { // then take into account speed change ahead, compare it with speed after potentially clearing last limit // lower of these two takes priority; otherwise limit lasts at least until potential last limit is cleared auto const noactivespeedlimit { owner->VelLimitLastDist.second < 0 }; - auto const speedatproximitydistance { min_speed( schedulespeedlimit, static_cast( owner->VelNext ) ) }; - if( speedatproximitydistance == nextspeedlimit ) { + if( auto const speedatproximitydistance { min_speed( schedulespeedlimit, static_cast( owner->VelNext ) ) }; speedatproximitydistance == nextspeedlimit ) { if( noactivespeedlimit ) { nextspeedlimit = speedatproximitydistance; nextspeedlimitdistance = owner->ActualProximityDist; @@ -142,8 +140,8 @@ drivingaid_panel::update() { std::snprintf( m_buffer.data(), m_buffer.size(), STR_C("Throttle: %3d+%d %c%s"), - mover->EIMCtrlType > 0 ? std::max(0, static_cast(100.4 * mover->eimic_real)) : driver->Controlling()->MainCtrlPos, - mover->EIMCtrlType > 0 ? driver->Controlling()->MainCtrlPos : driver->Controlling()->ScndCtrlPos, + mover->EIMCtrlType > 0 ? std::max(0, static_cast(100.4 * mover->eimic_real)) : vehicledriver->Controlling()->MainCtrlPos, + mover->EIMCtrlType > 0 ? vehicledriver->Controlling()->MainCtrlPos : vehicledriver->Controlling()->ScndCtrlPos, mover->SpeedCtrlUnit.IsActive ? 'T' : mover->DirActive > 0 ? 'D' : mover->DirActive < 0 ? 'R' : @@ -253,12 +251,7 @@ scenario_panel::render() { if( size_min.x > 0 ) { ImGui::SetNextWindowSizeConstraints( ImVec2S( size_min.x, size_min.y ), ImVec2S( size_max.x, size_max.y ) ); } - auto const panelname { ( - title.empty() ? - m_name : - title ) - + "###" + m_name }; - if( true == ImGui::Begin( panelname.c_str(), &is_open, flags ) ) { + if( auto const panelname { ( title.empty() ? m_name : title ) + "###" + m_name }; true == ImGui::Begin( panelname.c_str(), &is_open, flags ) ) { // potential assignment section auto const *owner { ( m_nearest->Mechanik != nullptr && m_nearest->Mechanik->primary() ? @@ -274,21 +267,19 @@ scenario_panel::render() { } // current task for( auto const &line : text_lines ) { - ImGui::TextColored( ImVec4( line.color.r, line.color.g, line.color.b, line.color.a ), line.data.c_str() ); + ImGui::TextColored( ImVec4( line.color.r, line.color.g, line.color.b, line.color.a ), "%s", line.data.c_str() ); } // hints - if( owner != nullptr ) { - if( true == ImGui::CollapsingHeader( STR_C("Hints"), ImGuiTreeNodeFlags_DefaultOpen ) ) { - for( auto const &hint : owner->m_hints ) { - auto const isdone { std::get( hint )( std::get( hint ) ) }; - auto const hintcolor{ ( - isdone ? - colors::uitextgreen : - Global.UITextColor ) }; - ImGui::PushStyleColor( ImGuiCol_Text, { hintcolor.r, hintcolor.g, hintcolor.b, hintcolor.a } ); - ImGui::TextWrapped( Translations.lookup_c(driver_hints_texts[(size_t)std::get( hint )], true), std::get( hint ) ); - ImGui::PopStyleColor(); - } + if (owner != nullptr && true == ImGui::CollapsingHeader( STR_C("Hints"), ImGuiTreeNodeFlags_DefaultOpen )) { + for( auto const &hint : owner->m_hints ) { + auto const isdone { std::get( hint )( std::get( hint ) ) }; + auto const hintcolor{ ( + isdone ? + colors::uitextgreen : + Global.UITextColor ) }; + ImGui::PushStyleColor( ImGuiCol_Text, { hintcolor.r, hintcolor.g, hintcolor.b, hintcolor.a } ); + ImGui::TextWrapped( Translations.lookup_c(driver_hints_texts[(size_t)std::get( hint )], true), std::get( hint ) ); + ImGui::PopStyleColor(); } } } @@ -364,8 +355,7 @@ timetable_panel::update() { //odejmij lokomotywy czynne, a przynajmniej aktualną consistmass -= owner->pVehicle->MoverParameters->TotalMass; // subtract potential other half of a two-part vehicle - auto const *previous { owner->pVehicle->Prev( coupling::permanent ) }; - if( previous != nullptr ) { consistmass -= previous->MoverParameters->TotalMass; } + if( auto const *previous { owner->pVehicle->Prev( coupling::permanent ) }; previous != nullptr ) { consistmass -= previous->MoverParameters->TotalMass; } auto const *next { owner->pVehicle->Next( coupling::permanent ) }; if( next != nullptr ) { consistmass -= next->MoverParameters->TotalMass; } } @@ -428,13 +418,13 @@ timetable_panel::update() { && i < table.StationIndex && ( tableline->Ah < 0 // pass-through, always valid || tableline->is_maintenance // maintenance stop, always valid - || time.wHour * 60 + time.wMinute + time.wSecond * 0.0167 >= tableline->Dh * 60 + tableline->Dm ) ) }; + || time.wHour * 60 + time.wMinute + time.wSecond * 0.0167 >= static_cast(tableline->Dh * 60) + tableline->Dm ) ) }; auto const loadchangeinprogress { ( static_cast(std::ceil(-1.0 * owner->fStopTime)) > 0 ) }; auto const isatpassengerstop { true == owner->IsAtPassengerStop && vehicle->MoverParameters->Vel < 1.0 }; auto const traveltime { ( i < 2 ? " " : - tableline->Ah >= 0 ? to_minutes_str( CompareTime( table.TimeTable[ i - 1 ].Dh, table.TimeTable[ i - 1 ].Dm, tableline->Ah, tableline->Am ), false, 3 ) : - to_minutes_str( std::max( 0.0, CompareTime( table.TimeTable[ i - 1 ].Dh, table.TimeTable[ i - 1 ].Dm, tableline->Dh, tableline->Dm ) - 0.5 ), false, 3 ) ) }; + tableline->Ah >= 0 ? to_minutes_str( static_cast(CompareTime( table.TimeTable[ i - 1 ].Dh, table.TimeTable[ i - 1 ].Dm, tableline->Ah, tableline->Am )), false, 3 ) : + to_minutes_str( static_cast(std::max( 0.0, CompareTime( table.TimeTable[ i - 1 ].Dh, table.TimeTable[ i - 1 ].Dm, tableline->Dh, tableline->Dm ) - 0.5 )), false, 3 ) ) }; auto const linecolor { ( i != table.StationStart ? Global.UITextColor : loadchangeinprogress ? colors::uitextred : @@ -486,19 +476,14 @@ timetable_panel::render() { if( size_min.x > 0 ) { ImGui::SetNextWindowSizeConstraints( ImVec2S( size_min.x * horizontalScale, size_min.y ), ImVec2S( size_max.x * horizontalScale, size_max.y ) ); } - auto const panelname { ( - title.empty() ? - m_name : - title ) - + "###" + m_name }; - if( true == ImGui::Begin( panelname.c_str(), &is_open, flags ) ) { + if( auto const panelname { ( title.empty() ? m_name : title ) + "###" + m_name }; true == ImGui::Begin( panelname.c_str(), &is_open, flags ) ) { for( auto const &line : text_lines ) { - ImGui::TextColored( ImVec4( line.color.r, line.color.g, line.color.b, line.color.a ), line.data.c_str() ); + ImGui::TextColored( ImVec4( line.color.r, line.color.g, line.color.b, line.color.a ), "%s", line.data.c_str() ); } if( is_expanded ) { ImGui::PushStyleVar( ImGuiStyleVar_ItemSpacing, ImVec2( 1, 0 ) ); for( auto const &line : m_tablelines ) { - ImGui::TextColored( ImVec4( line.color.r, line.color.g, line.color.b, line.color.a ), line.data.c_str() ); + ImGui::TextColored( ImVec4( line.color.r, line.color.g, line.color.b, line.color.a ), "%s", line.data.c_str() ); } ImGui::PopStyleVar(); } @@ -576,25 +561,16 @@ debug_panel::render() { if( size_min.x > 0 ) { ImGui::SetNextWindowSizeConstraints( ImVec2S( size_min.x, size_min.y ), ImVec2S( size_max.x, size_max.y ) ); } - auto const panelname { ( - title.empty() ? - m_name : - title ) - + "###" + m_name }; - if( true == ImGui::Begin( panelname.c_str(), &is_open, flags ) ) { + if( auto const panelname { ( title.empty() ? m_name : title ) + "###" + m_name }; true == ImGui::Begin( panelname.c_str(), &is_open, flags ) ) { // header section for( auto const &line : text_lines ) { - ImGui::TextColored( ImVec4( line.color.r, line.color.g, line.color.b, line.color.a ), line.data.c_str() ); + ImGui::TextColored( ImVec4( line.color.r, line.color.g, line.color.b, line.color.a ), "%s", line.data.c_str() ); } // sections ImGui::Separator(); - if( true == render_section( "Vehicle", m_vehiclelines ) ) { - if( DebugModeFlag && m_input.mover && m_input.mover->DamageFlag != 0 ) { - if( true == ImGui::Button( "Stop and repair consist" ) ) { - command_relay relay; - relay.post(user_command::resetconsist, 0.0, 0.0, GLFW_PRESS, 0, glm::vec3(0.0f), &m_input.vehicle->name()); - } - } + if (true == render_section( "Vehicle", m_vehiclelines ) && DebugModeFlag && m_input.mover && m_input.mover->DamageFlag != 0 && true == ImGui::Button( "Stop and repair consist" )) { + command_relay commandrelay; + commandrelay.post(user_command::resetconsist, 0.0, 0.0, GLFW_PRESS, 0, glm::vec3(0.0f), &m_input.vehicle->name()); } render_section( "Vehicle Engine", m_enginelines ); render_section( "Vehicle AI", m_ailines ); @@ -611,13 +587,13 @@ debug_panel::render() { render_section_developer(); // Developer tools #ifdef WITH_UART if(true == render_section( "UART", m_uartlines)) { - int ports_num = UartStatus.available_ports.size(); - char **avlports = new char*[ports_num]; + auto ports_num = static_cast(UartStatus.available_ports.size()); + auto avlports = new char*[ports_num]; for (int i=0; i < ports_num; i++) { avlports[i] = (char *) UartStatus.available_ports[i].c_str(); } ImGui::Combo("Port", &UartStatus.selected_port_index, avlports, ports_num); - ImGui::Combo("Baud", &UartStatus.selected_baud_index, uart_baudrates_list, uart_baudrates_list_num); + ImGui::Combo("Baud", &UartStatus.selected_baud_index, uart_baudrates_list, static_cast(uart_baudrates_list_num)); ImGui::Checkbox("Enabled", &UartStatus.enabled); } #endif @@ -625,8 +601,8 @@ debug_panel::render() { ImGui::Separator(); bool flag = DebugModeFlag; if (ImGui::Checkbox("Debug Mode", &flag)) { - command_relay relay; - relay.post(user_command::debugtoggle, 0.0, 0.0, GLFW_RELEASE, 0); + command_relay commandrelay; + commandrelay.post(user_command::debugtoggle, 0.0, 0.0, GLFW_RELEASE, 0); } } @@ -647,8 +623,8 @@ debug_panel::render_section_scenario() { auto fogrange = std::log( Global.fFogEnd ); if( ImGui::SliderFloat( ( to_string( std::exp( fogrange ), 0, 5 ) + " m###fogend" ).c_str(), &fogrange, std::log( 10.0f ), std::log( 50000.0f ), "Fog distance" ) ) { - command_relay relay; - relay.post( + command_relay commandrelay; + commandrelay.post( user_command::setweather, std::clamp( std::exp( fogrange ), 10.0f, 50000.0f ), Global.Overcast, @@ -661,8 +637,8 @@ debug_panel::render_section_scenario() { (to_string(Airtemperature, 1) + " deg C###Airtemperature").c_str(), &Airtemperature, -35.0f, 40.0f, "Air Temperature")) { - command_relay relay; - relay.post( + command_relay commandrelay; + commandrelay.post( user_command::settemperature, std::clamp(Airtemperature, -35.0f, 40.0f), Global.Overcast, @@ -673,8 +649,8 @@ debug_panel::render_section_scenario() { { if( ImGui::SliderFloat( ( to_string( Global.Overcast, 2, 5 ) + " (" + Global.Weather + ")###overcast" ).c_str(), &Global.Overcast, 0.0f, 2.0f, "Cloud cover" ) ) { - command_relay relay; - relay.post( + command_relay commandrelay; + commandrelay.post( user_command::setweather, Global.fFogEnd, std::clamp( Global.Overcast, 0.0f, 2.0f ), @@ -685,8 +661,8 @@ debug_panel::render_section_scenario() { { if( ImGui::SliderFloat( ( to_string( Global.fMoveLight, 0, 5 ) + " (" + Global.Season + ")###movelight" ).c_str(), &Global.fMoveLight, 0.0f, 364.0f, "Day of year" ) ) { - command_relay relay; - relay.post( + command_relay commandrelay; + commandrelay.post( user_command::setdatetime, std::clamp( Global.fMoveLight, 0.0f, 365.0f ), simulation::Time.data().wHour * 60 + simulation::Time.data().wMinute, @@ -695,10 +671,8 @@ debug_panel::render_section_scenario() { } // dynamic material update checkbox ImGui::Checkbox( "Update Item Materials", &Global.UpdateMaterials ); - if( DebugModeFlag ) { - if( ImGui::Checkbox( "Force Daylight", &Global.FakeLight ) ) { - simulation::Environment.on_daylight_change(); - } + if (DebugModeFlag && ImGui::Checkbox( "Force Daylight", &Global.FakeLight )) { + simulation::Environment.on_daylight_change(); } // advanced options, only visible in debug mode if( DebugModeFlag ) { @@ -713,8 +687,8 @@ debug_panel::render_section_scenario() { + ":" + std::string( std::to_string( int( 100 + simulation::Time.data().wMinute ) ).substr( 1, 2 ) ) ) }; if( ImGui::SliderInt( ( timestring + " (" + Global.Period + ")###simulationtime" ).c_str(), &time, 0, 1439, "Time of day" ) ) { - command_relay relay; - relay.post( + command_relay commandrelay; + commandrelay.post( user_command::setdatetime, Global.fMoveLight, std::clamp( time, 0, 1439 ), @@ -903,7 +877,7 @@ debug_panel::update_section_vehicle( std::vector &Output ) { mover.LoadFlag, mover.LocalBrakePosA, mover.LocalBrakePosAEIM, - mover.ManualBrakePos / static_cast(ManualBrakePosNo), + static_cast(mover.ManualBrakePos) / static_cast(ManualBrakePosNo), mover.SpringBrake.Activate ? 1.f : 0.f, // cylinders mover.BrakePress, @@ -981,11 +955,11 @@ debug_panel::update_section_vehicle( std::vector &Output ) { if (!std::isnan(last_time)) { double dt = Timer::GetTime() - last_time; - AccN_jerk_graph.update((mover.AccN - last_AccN) / dt); - AccN_acc_graph.update(mover.AccN); + AccN_jerk_graph.update(static_cast((mover.AccN - last_AccN) / dt)); + AccN_acc_graph.update(static_cast(mover.AccN)); } - last_AccN = mover.AccN; + last_AccN = static_cast(mover.AccN); last_time = Timer::GetTime(); } @@ -1002,7 +976,7 @@ void debug_panel::graph_data::update(float val) { void debug_panel::graph_data::render() { ImGui::PushID(this); ImGui::SliderFloat(STR_C("##Range"), &range, 0.5f, 60.0f, "%.1f"); - ImGui::PlotLines("##plot", data.data(), data.size(), pos, nullptr, 0.0f, range, ImVec2(0, 100)); + ImGui::PlotLines("##plot", data.data(), static_cast(data.size()), static_cast(pos), nullptr, 0.0f, range, ImVec2(0, 100)); ImGui::PopID(); } @@ -1047,9 +1021,9 @@ debug_panel::update_vehicle_brake() const { { bdelay_R, "R" }, { bdelay_M, "+Mg" } }; - for( auto const &delay : delays ) { - if( ( mover.BrakeDelayFlag & delay.first ) == delay.first ) { - brakedelay += delay.second; + for( auto const &[delayflag, delayname] : delays ) { + if( ( mover.BrakeDelayFlag & delayflag ) == delayflag ) { + brakedelay += delayname; } } @@ -1057,7 +1031,7 @@ debug_panel::update_vehicle_brake() const { } void -debug_panel::update_section_engine( std::vector &Output ) { +debug_panel::update_section_engine( std::vector &Output ) const { if( m_input.vehicle == nullptr ) { return; } if( m_input.mover == nullptr ) { return; } @@ -1072,9 +1046,9 @@ debug_panel::update_section_engine( std::vector &Output ) { for( int i = 0; i <= 20; ++i ) { std::string parameters = - mover.eimc_labels[ i ] + to_string( mover.eimc[ i ], 2, 9 ) + TMoverParameters::eimc_labels[ i ] + to_string( mover.eimc[ i ], 2, 9 ) + " | " - + mover.eimv_labels[ i ] + to_string( mover.eimv[ i ], 2, 9 ); + + TMoverParameters::eimv_labels[ i ] + to_string( mover.eimv[ i ], 2, 9 ); if( i < 10 ) { parameters += @@ -1084,7 +1058,7 @@ debug_panel::update_section_engine( std::vector &Output ) { parameters += " med:"; } else if( i >= 13 ) { - parameters += " | " + vehicle.MED_labels[ i - 13 ] + to_string( vehicle.MED[ 0 ][ i - 13 ], 2, 9 ); + parameters += " | " + TDynamicObject::MED_labels[ i - 13 ] + to_string( vehicle.MED[ 0 ][ i - 13 ], 2, 9 ); } Output.emplace_back( parameters, Global.UITextColor ); @@ -1112,8 +1086,8 @@ debug_panel::update_section_engine( std::vector &Output ) { { "cdesi: ", mover.dizel_engagestate }, { "cdelt: ", mover.dizel_engagedeltaomega }, { "gears: ", mover.dizel_automaticgearstatus} }; - for( auto const ¶meter : paramvalues ) { - parameterstext += "\n" + parameter.first + to_string( parameter.second, 2, 9 ); + for( auto const &[parametername, parametervalue] : paramvalues ) { + parameterstext += "\n" + parametername + to_string( parametervalue, 2, 9 ); } Output.emplace_back( parameterstext, Global.UITextColor ); @@ -1130,15 +1104,15 @@ debug_panel::update_section_engine( std::vector &Output ) { { "hRtTq: ", mover.hydro_R_Torque } }; - for( auto const ¶meter : hydrovalues ) { - parameterstext += "\n" + parameter.first + to_string( parameter.second, 2, 9 ); + for( auto const &[parametername, parametervalue] : hydrovalues ) { + parameterstext += "\n" + parametername + to_string( parametervalue, 2, 9 ); } Output.emplace_back( parameterstext, Global.UITextColor ); } } void -debug_panel::update_section_ai( std::vector &Output ) { +debug_panel::update_section_ai( std::vector &Output ) const { if( m_input.mover == nullptr ) { return; } if( m_input.mechanik == nullptr ) { return; } @@ -1202,14 +1176,14 @@ debug_panel::update_section_ai( std::vector &Output ) { { mover.RunningTrack.Velmax, "track" } }; std::string restrictionstext; - for( auto const &restriction : restrictions ) { - if( restriction.first < 0.0 ) { continue; } + for( auto const &[restrictionspeed, restrictionsource] : restrictions ) { + if( restrictionspeed < 0.0 ) { continue; } if( false == restrictionstext.empty() ) { restrictionstext += ", "; } restrictionstext += - to_string( restriction.first, 0 ) - + " (" + restriction.second + ")"; + to_string( restrictionspeed, 0 ) + + " (" + restrictionsource + ")"; } if( false == restrictionstext.empty() ) { @@ -1262,7 +1236,7 @@ debug_panel::update_section_ai( std::vector &Output ) { } void -debug_panel::update_section_scantable( std::vector &Output ) { +debug_panel::update_section_scantable( std::vector &Output ) const { if( m_input.mechanik == nullptr ) { return; } @@ -1284,8 +1258,8 @@ debug_panel::update_section_scantable( std::vector &Output ) { #ifdef WITH_UART void -debug_panel::update_section_uart( std::vector &Output ) { - uart_status *status = &UartStatus; +debug_panel::update_section_uart( std::vector &Output ) const { + uart_status const *status = &UartStatus; Output.emplace_back( ("Port: " + status->port_name).c_str(), @@ -1312,7 +1286,7 @@ debug_panel::update_section_uart( std::vector &Output ) { #endif void -debug_panel::update_section_scenario( std::vector &Output ) { +debug_panel::update_section_scenario( std::vector &Output ) const { auto textline = "vehicles: " + to_string( Timer::subsystem.sim_dynamics.average(), 2 ) + " msec" @@ -1326,7 +1300,7 @@ debug_panel::update_section_scenario( std::vector &Output ) { + to_string( simulation::Environment.wind_azimuth(), 0 ) // ma być azymut, czyli 0 na północy i rośnie na wschód + " " + std::string( "N NEE SES SWW NW" ) - .substr( 0 + 2 * std::floor( std::fmod( 8 + ( glm::radians( simulation::Environment.wind_azimuth() ) + 0.5 * M_PI_4 ) / M_PI_4, 8 ) ), 2 ) + .substr( static_cast( 2 * std::floor( std::fmod( 8 + ( glm::radians( simulation::Environment.wind_azimuth() ) + 0.5 * M_PI_4 ) / M_PI_4, 8 ) ) ), 2 ) + ", " + to_string( glm::length( simulation::Environment.wind() ), 1 ) + " m/s"; textline += "\nAir temperature: " + to_string( Global.AirTemperature, 1 ) + " deg C"; @@ -1340,36 +1314,36 @@ debug_panel::update_section_eventqueue( std::vector &Output ) { // current event queue auto const time { Timer::GetTime() }; - auto const *event { simulation::Events.begin() }; + auto const *queuedevent { simulation::Events.begin() }; auto const searchfilter { std::string( m_eventsearch.data() ) }; Output.emplace_back( "Delay: Event:", Global.UITextColor ); - while( event != nullptr + while( queuedevent != nullptr && Output.size() < 30 ) { - if( false == event->m_ignored - && false == event->m_passive + if( false == queuedevent->m_ignored + && false == queuedevent->m_passive && ( false == m_eventqueueactivevehicleonly - || event->m_activator == m_input.vehicle ) ) { + || queuedevent->m_activator == m_input.vehicle ) ) { - auto const label { event->m_name + ( event->m_activator ? " (by: " + event->m_activator->asName + ")" : "" ) }; + auto const label { queuedevent->m_name + ( queuedevent->m_activator ? " (by: " + queuedevent->m_activator->asName + ")" : "" ) }; if( false == searchfilter.empty() && false == contains(label, searchfilter) ) { - event = event->m_next; + queuedevent = queuedevent->m_next; continue; } - auto const delay { " " + to_string( std::max( 0.0, event->m_launchtime - time ), 1 ) }; + auto const delay { " " + to_string( std::max( 0.0, queuedevent->m_launchtime - time ), 1 ) }; textline = delay.substr( delay.length() - 6 ) + " " - + label + ( event->m_sibling ? " (joint event)" : "" ); + + label + ( queuedevent->m_sibling ? " (joint event)" : "" ); Output.emplace_back( textline, Global.UITextColor ); } - event = event->m_next; + queuedevent = queuedevent->m_next; } if( Output.size() == 1 ) { // event queue can be empty either because no event got through active filters, or because it is genuinely empty @@ -1378,7 +1352,7 @@ debug_panel::update_section_eventqueue( std::vector &Output ) { } void -debug_panel::update_section_powergrid( std::vector &Output ) { +debug_panel::update_section_powergrid( std::vector &Output ) const { auto const lowpowercolor { glm::vec4( 164.0f / 255.0f, 132.0f / 255.0f, 84.0f / 255.0f, 1.f ) }; auto const nopowercolor { glm::vec4( 164.0f / 255.0f, 84.0f / 255.0f, 84.0f / 255.0f, 1.f ) }; @@ -1420,7 +1394,7 @@ debug_panel::update_section_powergrid( std::vector &Output ) { } void -debug_panel::update_section_camera( std::vector &Output ) { +debug_panel::update_section_camera( std::vector &Output ) const { if( m_input.camera == nullptr ) { return; } @@ -1440,13 +1414,13 @@ debug_panel::update_section_camera( std::vector &Output ) { + to_string( 180.0 - glm::degrees( camera.Angle.y ), 0 ) // ma być azymut, czyli 0 na północy i rośnie na wschód + " " + std::string( "S SEE NEN NWW SW" ) - .substr( 0 + 2 * floor( fmod( 8 + ( camera.Angle.y + 0.5 * M_PI_4 ) / M_PI_4, 8 ) ), 2 ); + .substr( static_cast( 2 * floor( fmod( 8 + ( camera.Angle.y + 0.5 * M_PI_4 ) / M_PI_4, 8 ) ) ), 2 ); Output.emplace_back( textline, Global.UITextColor ); } void -debug_panel::update_section_renderer( std::vector &Output ) { +debug_panel::update_section_renderer( std::vector &Output ) const { // gfx renderer data auto textline = @@ -1526,7 +1500,7 @@ debug_panel::render_section( std::string const &Header, std::vector c } bool -debug_panel::render_section( std::vector const &Lines ) { +debug_panel::render_section( std::vector const &Lines ) const { for( auto const &line : Lines ) { ImGui::PushStyleColor( ImGuiCol_Text, { line.color.r, line.color.g, line.color.b, line.color.a } ); @@ -1537,7 +1511,7 @@ debug_panel::render_section( std::vector const &Lines ) { return true; } -bool debug_panel::render_section_developer() +bool debug_panel::render_section_developer() const { if (false == ImGui::CollapsingHeader("Developer tools")) return false; @@ -1553,7 +1527,7 @@ bool debug_panel::render_section_developer() } bool -debug_panel::render_section_settings() { +debug_panel::render_section_settings() const { if( false == ImGui::CollapsingHeader( "Settings" ) ) { return false; } @@ -1563,9 +1537,9 @@ debug_panel::render_section_settings() { // reflection fidelity ImGui::SliderInt( ( std::to_string( Global.reflectiontune.fidelity ) + "###reflectionfidelity" ).c_str(), &Global.reflectiontune.fidelity, 0, 2, "Reflection fidelity" ); ImGui::SliderInt( ( std::to_string( Global.gfx_shadow_rank_cutoff ) + "###shadowrankcutoff" ).c_str(), &Global.gfx_shadow_rank_cutoff, 1, 3, "Shadow ranks" ); - if( ImGui::SliderFloat( ( to_string( std::abs( Global.gfx_shadow_angle_min ), 2 ) + "###shadowanglecutoff" ).c_str(), &Global.gfx_shadow_angle_min, -1.0, -0.2, "Shadow angle cutoff" ) ) { + if( ImGui::SliderFloat( ( to_string( std::abs( Global.gfx_shadow_angle_min ), 2 ) + "###shadowanglecutoff" ).c_str(), &Global.gfx_shadow_angle_min, -1.0, -0.2f, "Shadow angle cutoff" ) ) { Global.gfx_shadow_angle_min = quantize( Global.gfx_shadow_angle_min, 0.05f ); - }; + } if( DebugModeFlag ) { // sky sliders { @@ -1595,8 +1569,8 @@ debug_panel::render_section_settings() { if (simulation::Train) { float val = simulation::Train->get_radiovolume(); if( ImGui::SliderFloat( ( std::to_string( static_cast( val * 100 ) ) + "%###volumeradio" ).c_str(), &val, 0.0f, 1.0f, "Vehicle radio volume" ) ) { - command_relay relay; - relay.post(user_command::radiovolumeset, val, 0.0, GLFW_PRESS, 0); + command_relay commandrelay; + commandrelay.post(user_command::radiovolumeset, val, 0.0, GLFW_PRESS, 0); } } @@ -1635,12 +1609,7 @@ transcripts_panel::render() { if( size_min.x > 0 ) { ImGui::SetNextWindowSizeConstraints( ImVec2S( size_min.x, size_min.y ), ImVec2S( size_max.x, size_max.y ) ); } - auto const panelname { ( - title.empty() ? - m_name : - title ) - + "###" + m_name }; - if( true == ImGui::Begin( panelname.c_str(), &is_open, flags ) ) { + if( auto const panelname { ( title.empty() ? m_name : title ) + "###" + m_name }; true == ImGui::Begin( panelname.c_str(), &is_open, flags ) ) { // header section for( auto const &line : text_lines ) { ImGui::TextWrapped( "%s", line.data.c_str() ); diff --git a/application/driveruipanels.h b/application/driveruipanels.h index da4cad879..96b9ac1c7 100644 --- a/application/driveruipanels.h +++ b/application/driveruipanels.h @@ -54,7 +54,6 @@ public: private: // members - std::array m_buffer; TDynamicObject const *m_nearest { nullptr }; }; @@ -81,42 +80,41 @@ private: // methods // generate and send section data to provided output void update_section_vehicle( std::vector &Output ); - void update_section_engine( std::vector &Output ); - void update_section_ai( std::vector &Output ); - void update_section_scantable( std::vector &Output ); - void update_section_scenario( std::vector &Output ); + void update_section_engine( std::vector &Output ) const; + void update_section_ai( std::vector &Output ) const; + void update_section_scantable( std::vector &Output ) const; + void update_section_scenario( std::vector &Output ) const; void update_section_eventqueue( std::vector &Output ); - void update_section_powergrid( std::vector &Output ); - void update_section_camera( std::vector &Output ); - void update_section_renderer( std::vector &Output ); + void update_section_powergrid( std::vector &Output ) const; + void update_section_camera( std::vector &Output ) const; + void update_section_renderer( std::vector &Output ) const; #ifdef WITH_UART - void update_section_uart( std::vector &Output ); + void update_section_uart( std::vector &Output ) const; #endif // section update helpers std::string update_vehicle_coupler( int const Side ); std::string update_vehicle_brake() const; // renders provided lines, under specified collapsing header bool render_section( std::string const &Header, std::vector const &Lines ); - bool render_section( std::vector const &Lines ); + bool render_section( std::vector const &Lines ) const; bool render_section_scenario(); bool render_section_eventqueue(); - bool render_section_settings(); - bool render_section_developer(); + bool render_section_settings() const; + bool render_section_developer() const; // members std::array m_buffer; std::array m_eventsearch; input_data m_input; - std::vector - m_vehiclelines, - m_enginelines, - m_ailines, - m_scantablelines, - m_cameralines, - m_scenariolines, - m_eventqueuelines, - m_powergridlines, - m_rendererlines, - m_uartlines; + std::vector m_vehiclelines; + std::vector m_enginelines; + std::vector m_ailines; + std::vector m_scantablelines; + std::vector m_cameralines; + std::vector m_scenariolines; + std::vector m_eventqueuelines; + std::vector m_powergridlines; + std::vector m_rendererlines; + std::vector m_uartlines; double last_time = std::numeric_limits::quiet_NaN(); @@ -134,8 +132,6 @@ private: graph_data AccN_acc_graph; float last_AccN; - std::array queue_event_buf = { 0 }; - std::array queue_event_activator_buf = { 0 }; bool m_eventqueueactivevehicleonly { false }; }; diff --git a/application/uitranscripts.cpp b/application/uitranscripts.cpp index c9780e101..7ce360530 100644 --- a/application/uitranscripts.cpp +++ b/application/uitranscripts.cpp @@ -11,13 +11,13 @@ TTranscripts Transcripts; // dodanie linii do tabeli, (show) i (hide) w [s] od aktualnego czasu void -TTranscripts::AddLine( std::string const &txt, float show, float hide, bool it ) { +TTranscripts::AddLine( std::string_view txt, float show, float hide, bool it ) { if( show == hide ) { return; } // komentarz jest ignorowany // TODO: replace the timeangledeg mess with regular time points math - show = Global.fTimeAngleDeg + show / 240.0; // jeśli doba to 360, to 1s będzie równe 1/240 - hide = Global.fTimeAngleDeg + hide / 240.0; + show = static_cast(Global.fTimeAngleDeg + show / 240.0); // jeśli doba to 360, to 1s będzie równe 1/240 + hide = static_cast(Global.fTimeAngleDeg + hide / 240.0); TTranscript transcript; transcript.asText = txt; @@ -34,7 +34,7 @@ TTranscripts::AddLine( std::string const &txt, float show, float hide, bool it ) // dodanie tekstów, długość dźwięku, czy istotne void -TTranscripts::Add( std::string const &txt, bool backgorund ) { +TTranscripts::Add( std::string const &txt, bool /*backgorund*/ ) { if( true == txt.empty() ) { return; } @@ -42,20 +42,21 @@ TTranscripts::Add( std::string const &txt, bool backgorund ) { cParser parser( asciitext ); while( true == parser.getTokens( 3, false, "[]\n" ) ) { - float begin{ 0.f }, end{ 0.f }; + float begin{ 0.f }; + float end{ 0.f }; std::string transcript; parser >> begin >> end >> transcript; - AddLine( transcript, 0.10 * begin, 0.12 * end, false ); + AddLine( transcript, static_cast(0.10 * begin), static_cast(0.12 * end), false ); } // try to handle malformed(?) cases with no show/hide times std::string transcript; parser >> transcript; while( false == transcript.empty() ) { // WriteLog( "Transcript text with no display/hide times: \"" + transcript + "\"" ); - AddLine( transcript, 0.0, 0.12 * transcript.size(), false ); + AddLine( transcript, 0.0, static_cast(0.12 * static_cast(transcript.size())), false ); transcript = ""; parser >> transcript; } } diff --git a/application/uitranscripts.h b/application/uitranscripts.h index 7db201a14..4c24ffe4b 100644 --- a/application/uitranscripts.h +++ b/application/uitranscripts.h @@ -22,7 +22,7 @@ public: // constructors TTranscripts() = default; // methods - void AddLine( std::string const &txt, float show, float hide, bool it ); + void AddLine( std::string_view txt, float show, float hide, bool it ); // dodanie tekstów, długość dźwięku, czy istotne void Add( std::string const &txt, bool background = false ); // usuwanie niepotrzebnych (ok. 10 razy na sekundę) diff --git a/audio/sound.cpp b/audio/sound.cpp index 0ff2eff9f..785b976f5 100644 --- a/audio/sound.cpp +++ b/audio/sound.cpp @@ -47,19 +47,18 @@ sound_source::deserialize( cParser &Input, sound_type const Legacytype, int cons if( Input.peek() == "{" ) { // block type config while( true == deserialize_mapping( Input ) ) { - ; // all work done by while() + // all work done by while() } if( false == m_soundchunks.empty() ) { // arrange loaded sound chunks in requested order - std::sort( - std::begin( m_soundchunks ), std::end( m_soundchunks ), - []( soundchunk_pair const &Left, soundchunk_pair const &Right ) { + std::ranges::sort( + m_soundchunks, []( soundchunk_pair const &Left, soundchunk_pair const &Right ) { return Left.second.threshold < Right.second.threshold; } ); // calculate and cache full range points for each chunk, including crossfade sections: // on the far end the crossfade section extends to the threshold point of the next chunk... for( std::size_t idx = 0; idx < m_soundchunks.size() - 1; ++idx ) { - m_soundchunks[ idx ].second.fadeout = m_soundchunks[ idx + 1 ].second.threshold; + m_soundchunks[ idx ].second.fadeout = static_cast(m_soundchunks[ idx + 1 ].second.threshold); /* m_soundchunks[ idx ].second.fadeout = interpolate( @@ -69,11 +68,11 @@ sound_source::deserialize( cParser &Input, sound_type const Legacytype, int cons */ } // ...and on the other end from the threshold point back into the range of previous chunk - m_soundchunks.front().second.fadein = std::max( 0, m_soundchunks.front().second.threshold ); + m_soundchunks.front().second.fadein = static_cast(std::max( 0, m_soundchunks.front().second.threshold )); // m_soundchunks.front().second.fadein = m_soundchunks.front().second.threshold; for( std::size_t idx = 1; idx < m_soundchunks.size(); ++idx ) { auto const previouschunkwidth { m_soundchunks[ idx ].second.threshold - m_soundchunks[ idx - 1 ].second.threshold }; - m_soundchunks[ idx ].second.fadein = m_soundchunks[ idx ].second.threshold - 0.01f * m_crossfaderange * previouschunkwidth; + m_soundchunks[ idx ].second.fadein = static_cast(m_soundchunks[ idx ].second.threshold) - 0.01f * static_cast(m_crossfaderange) * static_cast(previouschunkwidth); /* m_soundchunks[ idx ].second.fadein = interpolate( @@ -82,11 +81,11 @@ sound_source::deserialize( cParser &Input, sound_type const Legacytype, int cons m_crossfaderange * 0.01f ); */ } - m_soundchunks.back().second.fadeout = std::max( Chunkrange, m_soundchunks.back().second.threshold ); + m_soundchunks.back().second.fadeout = static_cast(std::max( Chunkrange, m_soundchunks.back().second.threshold )); // m_soundchunks.back().second.fadeout = m_soundchunks.back().second.threshold; // test if the chunk table contains any actual samples while at it - for( auto &soundchunk : m_soundchunks ) { - if( soundchunk.first.buffer != null_handle ) { + for( auto &[chunkbuffer, chunkdata] : m_soundchunks ) { + if( chunkbuffer.buffer != null_handle ) { m_soundchunksempty = false; break; } @@ -117,24 +116,18 @@ sound_source::deserialize( cParser &Input, sound_type const Legacytype, int cons } } - if( Legacyparameters & sound_parameters::range ) { - if( Input.getTokens( 1, false ) ) { - Input >> m_range; - } + if (Legacyparameters & sound_parameters::range && Input.getTokens( 1, false )) { + Input >> m_range; } - if( Legacyparameters & sound_parameters::amplitude ) { - if( Input.getTokens( 2, false ) ) { - Input - >> m_amplitudefactor - >> m_amplitudeoffset; - } + if (Legacyparameters & sound_parameters::amplitude && Input.getTokens( 2, false )) { + Input + >> m_amplitudefactor + >> m_amplitudeoffset; } - if( Legacyparameters & sound_parameters::frequency ) { - if( Input.getTokens( 2, false ) ) { - Input - >> m_frequencyfactor - >> m_frequencyoffset; - } + if (Legacyparameters & sound_parameters::frequency && Input.getTokens( 2, false )) { + Input + >> m_frequencyfactor + >> m_frequencyoffset; } } // restore parser behaviour @@ -225,9 +218,9 @@ sound_source::deserialize_mapping( cParser &Input ) { if( indexstart != std::string::npos ) { auto const index { std::stoi( key.substr( indexstart, indexend - indexstart ) ) }; auto const pitch { Input.getToken( false, "\n\r\t ,;" ) }; - for( auto &chunk : m_soundchunks ) { - if( chunk.second.threshold == index ) { - chunk.second.pitch = pitch > 0.f ? pitch : 1.f; + for( auto &[chunkbuffer, chunkdata] : m_soundchunks ) { + if( chunkdata.threshold == index ) { + chunkdata.pitch = pitch > 0.f ? pitch : 1.f; break; } } @@ -240,13 +233,14 @@ sound_source::deserialize_mapping( cParser &Input ) { m_crossfaderange = std::clamp( m_crossfaderange, 0, 100 ); } else if( key == "placement:" ) { + using enum sound_placement; auto const value { Input.getToken( true, "\n\r\t ,;" ) }; - std::map const placements { - { "internal", sound_placement::internal }, - { "engine", sound_placement::engine }, - { "external", sound_placement::external }, - { "custom", sound_placement::custom }, - { "general", sound_placement::general } }; + std::map> const placements { + { "internal", internal }, + { "engine", engine }, + { "external", external }, + { "custom", custom }, + { "general", general } }; auto lookup{ placements.find( value ) }; if( lookup != placements.end() ) { m_placement = lookup->second; @@ -262,7 +256,7 @@ sound_source::deserialize_mapping( cParser &Input ) { } else { // floating point properties - std::map const properties { + std::map> const properties { { "frequencyfactor:", m_frequencyfactor }, { "frequencyoffset:", m_frequencyoffset }, { "amplitudefactor:", m_amplitudefactor }, @@ -339,8 +333,8 @@ sound_source::copy_sounds( sound_source const &Source ) { for( auto &sound : m_sounds ) { sound.playing = 0; } - for( auto &sound : m_soundchunks ) { - sound.first.playing = 0; + for( auto &[chunkbuffer, chunkdata] : m_soundchunks ) { + chunkbuffer.playing = 0; } return *this; } @@ -400,7 +394,7 @@ sound_source::play_basic() { // dispatch appropriate sound if( true == m_playbeginning && sound(sound_id::begin).buffer != null_handle) { - std::vector sounds { sound_id::begin, sound_id::main }; + std::vector sounds { sound_id::begin, sound_id::main }; insert( std::begin( sounds ), std::end( sounds ) ); m_playbeginning = false; } @@ -424,14 +418,14 @@ sound_source::play_combined() { auto const soundpoint { compute_combined_point() }; for( std::uint32_t idx = 0; idx < m_soundchunks.size(); ++idx ) { - auto const &soundchunk { m_soundchunks[ idx ] }; + auto const &[chunkbuffer, chunkdata]{ m_soundchunks[ idx ] }; // a chunk covers range from fade in point, where it starts rising in volume over crossfade distance, // lasts until fadeout - crossfade distance point, past which it grows quiet until fade out point where it ends - if( soundpoint < soundchunk.second.fadein ) { break; } - if( soundpoint >= soundchunk.second.fadeout ) { continue; } + if( soundpoint < chunkdata.fadein ) { break; } + if( soundpoint >= chunkdata.fadeout ) { continue; } - if( soundchunk.first.buffer == null_handle || ( (m_flags & (sound_flags::exclusive | sound_flags::looping)) != 0 - && soundchunk.first.playing > 0 ) ) { + if( chunkbuffer.buffer == null_handle || ( (m_flags & (sound_flags::exclusive | sound_flags::looping)) != 0 + && chunkbuffer.playing > 0 ) ) { // combined sounds only play looped, single copy of each activated chunk continue; } @@ -675,9 +669,9 @@ sound_source::update_combined( audio::openal_source &Source ) { // for sound chunks, test whether the chunk should still be active given current value of the controlling variable if( ( m_flags & ( sound_flags::exclusive | sound_flags::looping ) ) != 0 ) { auto const soundpoint { compute_combined_point() }; - auto const &soundchunk { m_soundchunks[ soundhandle ^ sound_id::chunk ] }; - if( soundpoint < soundchunk.second.fadein - || soundpoint >= soundchunk.second.fadeout ) { + auto const &[chunkbuffer, chunkdata]{ m_soundchunks[ soundhandle ^ sound_id::chunk ] }; + if( soundpoint < chunkdata.fadein + || soundpoint >= chunkdata.fadeout ) { Source.stop(); update_counter( soundhandle, -1 ); return; @@ -761,7 +755,7 @@ sound_source::update_crossfade( sound_handle const Chunk ) { // relative pitch adjustment // pitch of each chunk is modified based on ratio of the chunk's pitch to that of its neighbour - if( soundpoint < chunkdata.threshold ) { + if( soundpoint < static_cast(chunkdata.threshold) ) { if( chunkindex > 0 ) { // interpolate between the pitch of previous chunk and this chunk's base pitch, @@ -772,7 +766,7 @@ sound_source::update_crossfade( sound_handle const Chunk ) { previouschunkdata.pitch / chunkdata.pitch, 1.f, std::clamp( - ( soundpoint - previouschunkdata.threshold ) / ( chunkdata.threshold - previouschunkdata.threshold ), + ( soundpoint - static_cast(previouschunkdata.threshold) ) / ( static_cast(chunkdata.threshold - previouschunkdata.threshold) ), 0.f, 1.f ) ); } } @@ -787,7 +781,7 @@ sound_source::update_crossfade( sound_handle const Chunk ) { 1.f, nextchunkdata.pitch / chunkdata.pitch, std::clamp( - ( soundpoint - chunkdata.threshold ) / ( nextchunkdata.threshold - chunkdata.threshold ), + ( soundpoint - static_cast(chunkdata.threshold) ) / ( static_cast(nextchunkdata.threshold - chunkdata.threshold) ), 0.f, 1.f ) ); } else { @@ -801,7 +795,7 @@ sound_source::update_crossfade( sound_handle const Chunk ) { if( chunkindex > 0 ) { // chunks other than the first can have fadein auto const fadeinwidth { chunkdata.threshold - chunkdata.fadein }; - if( soundpoint < chunkdata.threshold ) { + if( soundpoint < static_cast(chunkdata.threshold) ) { float lineargain = std::lerp( 0.f, 1.f, @@ -809,8 +803,8 @@ sound_source::update_crossfade( sound_handle const Chunk ) { ( soundpoint - chunkdata.fadein ) / fadeinwidth, 0.f, 1.f ) ); m_properties.gain *= - lineargain / - (1 + (1 - lineargain) * -0.57); // approximation of logarytmic fade in + static_cast(lineargain / + (1 + (1 - lineargain) * -0.57)); // approximation of logarytmic fade in return; } } @@ -828,8 +822,8 @@ sound_source::update_crossfade( sound_handle const Chunk ) { std::clamp( ( soundpoint - fadeoutstart ) / fadeoutwidth, 0.f, 1.f ) ); - m_properties.gain *= (-lineargain + 1) / - (1 + lineargain * -0.57); // approximation of logarytmic fade out + m_properties.gain *= static_cast((-lineargain + 1) / + (1 + lineargain * -0.57)); // approximation of logarytmic fade out return; } } @@ -867,14 +861,14 @@ sound_source::empty() const { // returns true if the source is emitting any sound bool -sound_source::is_playing( bool const Includesoundends ) const { +sound_source::is_playing( bool const /*Includesoundends*/ ) const { auto isplaying { sound(sound_id::begin).playing > 0 || sound(sound_id::main).playing > 0 }; if( false == isplaying && false == m_soundchunks.empty() ) { // for emitters with sample tables check also if any of the chunks is active - for( auto const &soundchunk : m_soundchunks ) { - if( soundchunk.first.playing > 0 ) { + for( auto const &[chunkbuffer, chunkdata] : m_soundchunks ) { + if( chunkbuffer.playing > 0 ) { isplaying = true; break; // one will do } @@ -905,7 +899,7 @@ sound_source::has_bookends() const { } // returns location of the sound source in simulation region space -glm::dvec3 const +glm::dvec3 sound_source::location() const { if( m_owner == nullptr ) { @@ -927,7 +921,7 @@ sound_source::range( float const Range ) { } // returns defined range of the sound -float const +float sound_source::range() const { return m_range; @@ -1016,7 +1010,7 @@ sound_source::update_soundproofing() { void sound_source::insert( sound_handle const Sound ) { - std::vector sounds { Sound }; + std::vector sounds { Sound }; return insert( std::begin( sounds ), std::end( sounds ) ); } diff --git a/audio/sound.h b/audio/sound.h index c0f14513f..e9957be00 100644 --- a/audio/sound.h +++ b/audio/sound.h @@ -108,7 +108,7 @@ public: offset() const; // sound source name setter/getter void - name( std::string Name ); + name( std::string const &Name ); std::string const & name() const; // playback starting point shift setter/getter @@ -137,12 +137,12 @@ public: bool has_bookends() const; // returns location of the sound source in simulation region space - glm::dvec3 const + glm::dvec3 location() const; // returns defined range of the sound void range( float const Range ); - float const + float range() const; // members @@ -252,7 +252,7 @@ inline TDynamicObject const * sound_source::owner() const { return m_owner; } inline void sound_source::offset( glm::vec3 const Offset ) { m_offset = Offset; } inline glm::vec3 const & sound_source::offset() const { return m_offset; } // sound source name setter/getter -inline void sound_source::name( std::string Name ) { m_name = Name; } +inline void sound_source::name( std::string const &Name ) { m_name = Name; } inline std::string const & sound_source::name() const { return m_name; } // playback starting point shift setter/getter inline void sound_source::start( float const Offset ) { m_startoffset = Offset; } diff --git a/environment/moon.cpp b/environment/moon.cpp index 0cd4ce7d2..302e5d8e8 100644 --- a/environment/moon.cpp +++ b/environment/moon.cpp @@ -15,9 +15,7 @@ cMoon::cMoon() { m_observer.temp = 15.0; // ambient dry-bulb temperature, degrees C } -cMoon::~cMoon() { - -} +cMoon::~cMoon() = default; void cMoon::init() { @@ -74,8 +72,8 @@ float cMoon::getIntensity() { void cMoon::setLocation( float const Longitude, float const Latitude ) { // convert fraction from geographical base of 6o minutes - m_observer.longitude = (int)Longitude + (Longitude - (int)Longitude) * 100.0 / 60.0; - m_observer.latitude = (int)Latitude + (Latitude - (int)Latitude) * 100.0 / 60.0 ; + m_observer.longitude = (int)Longitude + (Longitude - static_cast((int)Longitude)) * 100.0 / 60.0; + m_observer.latitude = (int)Latitude + (Latitude - static_cast((int)Latitude)) * 100.0 / 60.0 ; } // sets current time, overriding one acquired from the system clock @@ -103,9 +101,9 @@ void cMoon::move() { SYSTEMTIME localtime = simulation::Time.data(); // time for the calculation - if( m_observer.hour >= 0 ) { localtime.wHour = m_observer.hour; } - if( m_observer.minute >= 0 ) { localtime.wMinute = m_observer.minute; } - if( m_observer.second >= 0 ) { localtime.wSecond = m_observer.second; } + if( m_observer.hour >= 0 ) { localtime.wHour = static_cast(m_observer.hour); } + if( m_observer.minute >= 0 ) { localtime.wMinute = static_cast(m_observer.minute); } + if( m_observer.second >= 0 ) { localtime.wSecond = static_cast(m_observer.second); } double localut = localtime.wHour @@ -158,7 +156,6 @@ void cMoon::move() { double const yeclip = m_body.distance * ( std::sin( degtorad * longascnode ) * std::cos( vpluswinrad ) + std::cos( degtorad * longascnode ) * std::sin( vpluswinrad ) * std::cos( degtorad * inclination ) ); double const zeclip = m_body.distance * std::sin( vpluswinrad ) * std::sin( degtorad * inclination ); // ecliptic coordinates - double ecliplat = radtodeg * std::atan2( zeclip, std::sqrt( xeclip*xeclip + yeclip*yeclip ) ); m_body.eclong = clamp_circular( radtodeg * std::atan2( yeclip, xeclip ) ); // distance m_body.distance = std::sqrt( xeclip*xeclip + yeclip*yeclip + zeclip*zeclip ); @@ -174,17 +171,13 @@ void cMoon::move() { m_body.mnlong = clamp_circular( longascnode + perigeearg + m_body.mnanom ); // Moon's mean elongation: D = Lm - Ls double const mnelong = clamp_circular( m_body.mnlong - sunmnlong ); - // Moon's argument of latitude: F = Lm - N - double const arglat = clamp_circular( m_body.mnlong - longascnode ); // longitude perturbations double const pertevection = -1.274 * std::sin( degtorad * ( m_body.mnanom - 2.0 * mnelong ) ); // Evection double const pertvariation = +0.658 * std::sin( degtorad * ( 2.0 * mnelong ) ); // Variation double const pertyearlyeqt = -0.186 * std::sin( degtorad * sunmnanom ); // Yearly equation // latitude perturbations - double const pertlat = -0.173 * std::sin( degtorad * ( arglat - 2.0 * mnelong ) ); m_body.eclong += pertevection + pertvariation + pertyearlyeqt; - ecliplat += pertlat; // declination m_body.declin = radtodeg * std::asin( std::sin (m_body.oblecl * degtorad) * std::sin(m_body.eclong * degtorad) ); @@ -267,7 +260,6 @@ void cMoon::refract() { void cMoon::irradiance() { - static double radtodeg = 57.295779513; // converts from radians to degrees static double degtorad = 0.0174532925; // converts from degrees to radians m_body.dayang = ( simulation::Time.year_day() - 1 ) * 360.0 / 365.0; @@ -299,7 +291,7 @@ cMoon::phase() { m_phase = 50; else { // calculate moon's age in days from new moon - float ip = normalize( ( simulation::Time.julian_day() - 2451550.1f ) / 29.530588853f ); + float ip = normalize( ( static_cast(simulation::Time.julian_day()) - 2451550.1f ) / 29.530588853f ); m_phase = ip * 29.53f; } } @@ -308,7 +300,7 @@ cMoon::phase() { float cMoon::normalize( const float Value ) const { - float value = Value - floor( Value ); + auto value = static_cast(Value - floor( Value )); if( value < 0.f ) { ++value; } return value; diff --git a/environment/skydome.cpp b/environment/skydome.cpp index 830eb145e..654b3a345 100644 --- a/environment/skydome.cpp +++ b/environment/skydome.cpp @@ -53,8 +53,7 @@ CSkyDome::CSkyDome (int const Tesselation) : Generate(); } -CSkyDome::~CSkyDome() { -} +CSkyDome::~CSkyDome() = default; //******************************************************************************// @@ -71,13 +70,13 @@ void CSkyDome::Generate() { for( int i = 0; i <= latitudes; ++i ) { - float const latitude = M_PI * ( -0.5f + (float)i / latitudes / 2 ); // half-sphere only + auto const latitude = static_cast(M_PI * ( -0.5f + (float)i / static_cast(latitudes) / 2 )); // half-sphere only float const z = std::sin( latitude ); float const zr = std::cos( latitude ); for( int j = 0; j <= longitudes; ++j ) { - float const longitude = 2.0 * M_PI * (float)j / longitudes; + auto const longitude = static_cast(2.0 * M_PI * (float)j / longitudes); float const x = std::cos( longitude ); float const y = std::sin( longitude ); /* @@ -147,7 +146,7 @@ void CSkyDome::SetOvercastFactor( float const Overcast ) { m_overcast = std::clamp( Overcast, 0.0f, 1.0f ) * 0.75f; // going above 0.65 makes the model go pretty bad, appearance-wise } -void CSkyDome::GetPerez( float *Perez, float Distribution[ 5 ][ 2 ], const float Turbidity ) { +void CSkyDome::GetPerez( float *Perez, float Distribution[ 5 ][ 2 ], const float Turbidity ) const { Perez[ 0 ] = Distribution[ 0 ][ 0 ] * Turbidity + Distribution[ 0 ][ 1 ]; Perez[ 1 ] = Distribution[ 1 ][ 0 ] * Turbidity + Distribution[ 1 ][ 1 ]; @@ -156,7 +155,7 @@ void CSkyDome::GetPerez( float *Perez, float Distribution[ 5 ][ 2 ], const float Perez[ 4 ] = Distribution[ 4 ][ 0 ] * Turbidity + Distribution[ 4 ][ 1 ]; } -float CSkyDome::GetZenith( float Zenithmatrix[ 3 ][ 4 ], const float Theta, const float Turbidity ) { +float CSkyDome::GetZenith( float Zenithmatrix[ 3 ][ 4 ], const float Theta, const float Turbidity ) const { const float theta2 = Theta*Theta; const float theta3 = Theta*theta2; @@ -167,15 +166,15 @@ float CSkyDome::GetZenith( float Zenithmatrix[ 3 ][ 4 ], const float Theta, cons } -float CSkyDome::PerezFunctionO1( float Perezcoeffs[ 5 ], const float Thetasun, const float Zenithval ) { +float CSkyDome::PerezFunctionO1( float const Perezcoeffs[ 5 ], const float Thetasun, const float Zenithval ) const { - const float val = ( 1.0f + Perezcoeffs[ 0 ] * std::exp( Perezcoeffs[ 1 ] ) ) * - ( 1.0f + Perezcoeffs[ 2 ] * std::exp( Perezcoeffs[ 3 ] * Thetasun ) + Perezcoeffs[ 4 ] * std::pow( std::cos( Thetasun ), 2 ) ); + const auto val = static_cast(( 1.0f + Perezcoeffs[ 0 ] * std::exp( Perezcoeffs[ 1 ] ) ) * + ( 1.0f + Perezcoeffs[ 2 ] * std::exp( Perezcoeffs[ 3 ] * Thetasun ) + Perezcoeffs[ 4 ] * std::pow( std::cos( Thetasun ), 2 ) )); return Zenithval / val; } -float CSkyDome::PerezFunctionO2( float Perezcoeffs[ 5 ], const float Icostheta, const float Gamma, const float Cosgamma2, const float Zenithval ) { +float CSkyDome::PerezFunctionO2( float const Perezcoeffs[ 5 ], const float Icostheta, const float Gamma, const float Cosgamma2, const float Zenithval ) const { // iCosTheta = 1.0f / cosf(theta) // cosGamma2 = SQR( cosf( gamma ) ) return Zenithval * ( 1.0f + Perezcoeffs[ 0 ] * std::exp( Perezcoeffs[ 1 ] * Icostheta ) ) * @@ -188,7 +187,7 @@ void CSkyDome::RebuildColors() { auto gammacorrection = glm::mix( glm::vec3( 1.0f ), glm::vec3( 0.45f ), twilightfactor ); // get zenith luminance - float const chi = ( 4.0f / 9.0f - m_turbidity / 120.0f ) * ( M_PI - 2.0f * m_thetasun ); + auto const chi = static_cast(( 4.0f / 9.0f - m_turbidity / 120.0f ) * ( M_PI - 2.0f * m_thetasun )); float zenithluminance = ( 4.0453f * m_turbidity - 4.9710f ) * std::tan( chi ) - 0.2155f * m_turbidity + 2.4192f; // get x / y zenith @@ -196,22 +195,26 @@ void CSkyDome::RebuildColors() { float zenithy = GetZenith( m_zenithymatrix, m_thetasun, m_turbidity ); // get perez function parametrs - float perezluminance[5], perezx[5], perezy[5]; - GetPerez( perezluminance, m_distributionluminance, m_turbidity ); - GetPerez( perezx, m_distributionxcomp, m_turbidity ); - GetPerez( perezy, m_distributionycomp, m_turbidity ); + std::array perezluminance{}; + std::array perezx{}; + std::array perezy{}; + GetPerez( perezluminance.data(), m_distributionluminance, m_turbidity ); + GetPerez( perezx.data(), m_distributionxcomp, m_turbidity ); + GetPerez( perezy.data(), m_distributionycomp, m_turbidity ); // make some precalculation - zenithx = PerezFunctionO1( perezx, m_thetasun, zenithx ); - zenithy = PerezFunctionO1( perezy, m_thetasun, zenithy ); - zenithluminance = PerezFunctionO1( perezluminance, m_thetasun, zenithluminance ); + zenithx = PerezFunctionO1( perezx.data(), m_thetasun, zenithx ); + zenithy = PerezFunctionO1( perezy.data(), m_thetasun, zenithy ); + zenithluminance = PerezFunctionO1( perezluminance.data(), m_thetasun, zenithluminance ); // start with fresh average for the new pass - glm::vec3 averagecolor, averagehorizoncolor; + glm::vec3 averagecolor; + glm::vec3 averagehorizoncolor; // trough all vertices glm::vec3 vertex; - glm::vec3 color, colorconverter; + glm::vec3 color; + glm::vec3 colorconverter; for ( unsigned int i = 0; i < m_vertices.size(); ++i ) { // grab it @@ -235,14 +238,14 @@ void CSkyDome::RebuildColors() { // = 1.0f / cosf( arccos( vertex.y ) ); // = 1.0f / vertex.y; float const icostheta = 1.0f / vertex.y; - float const cosgamma2 = std::pow( std::cos( gamma ), 2 ); + auto const cosgamma2 = static_cast(std::pow( std::cos( gamma ), 2 )); // Compute x,y values - float const x = PerezFunctionO2( perezx, icostheta, gamma, cosgamma2, zenithx ); - float const y = PerezFunctionO2( perezy, icostheta, gamma, cosgamma2, zenithy ); + float const x = PerezFunctionO2( perezx.data(), icostheta, gamma, cosgamma2, zenithx ); + float const y = PerezFunctionO2( perezy.data(), icostheta, gamma, cosgamma2, zenithy ); // luminance(Y) for clear & overcast sky - float const yclear = std::max( 0.01f, PerezFunctionO2( perezluminance, icostheta, gamma, cosgamma2, zenithluminance ) ); + float const yclear = std::max( 0.01f, PerezFunctionO2( perezluminance.data(), icostheta, gamma, cosgamma2, zenithluminance ) ); float const yover = std::max( 0.01f, zenithluminance * ( 1.0f + 2.0f * vertex.y ) / 3.0f ); float const Y = std::lerp( yclear, yover, m_overcast ); @@ -271,7 +274,7 @@ void CSkyDome::RebuildColors() { // override the hue, based on sun height above the horizon. crude way to deal with model shortcomings // correction begins when the sun is higher than 10 degrees above the horizon, and fully in effect at 10+15 degrees - float const degreesabovehorizon = 90.0f - m_thetasun * ( 180.0f / M_PI ); + auto const degreesabovehorizon = static_cast(90.0f - m_thetasun * ( 180.0f / M_PI )); auto const sunbasedphase = std::clamp( 1.0f / 15.0f * ( degreesabovehorizon - 10.0f ), 0.0f, 1.0f ); // correction is applied in linear manner from the bottom, becomes fully in effect for vertices with y = 0.50 auto const heightbasedphase = std::clamp( vertex.y * 2.0f, 0.0f, 1.0f ); diff --git a/environment/skydome.h b/environment/skydome.h index 74d024d1f..bc22f9c71 100644 --- a/environment/skydome.h +++ b/environment/skydome.h @@ -5,7 +5,7 @@ class CSkyDome { public: - CSkyDome( int const Tesselation = 54 ); + explicit CSkyDome( int const Tesselation = 54 ); ~CSkyDome(); void Generate(); void RebuildColors(); @@ -20,8 +20,8 @@ public: void Update( glm::vec3 const &Sun ); // retrieves average colour of the sky dome - glm::vec3 GetAverageColor() { return m_averagecolour * 8.f / 6.f; } - glm::vec3 GetAverageHorizonColor() { return m_averagehorizoncolour; } + glm::vec3 GetAverageColor() const { return m_averagecolour * 8.f / 6.f; } + glm::vec3 GetAverageHorizonColor() const { return m_averagehorizoncolour; } std::vector const & vertices() const { return m_vertices; } @@ -35,7 +35,8 @@ public: private: // shading parametrs glm::vec3 m_sundirection; - float m_thetasun, m_phisun; + float m_thetasun; + float m_phisun; float m_turbidity; bool m_linearexpcontrol; float m_expfactor; @@ -59,9 +60,9 @@ private: static float m_zenithymatrix[ 3 ][ 4 ]; // coloring - void GetPerez( float *Perez, float Distribution[ 5 ][ 2 ], const float Turbidity ); - float GetZenith( float Zenithmatrix[ 3 ][ 4 ], const float Theta, const float Turbidity ); - float PerezFunctionO1( float Perezcoeffs[ 5 ], const float Thetasun, const float Zenithval ); - float PerezFunctionO2( float Perezcoeffs[ 5 ], const float Icostheta, const float Gamma, const float Cosgamma2, const float Zenithval ); + void GetPerez( float *Perez, float Distribution[ 5 ][ 2 ], const float Turbidity ) const; + float GetZenith( float Zenithmatrix[ 3 ][ 4 ], const float Theta, const float Turbidity ) const; + float PerezFunctionO1( float const Perezcoeffs[ 5 ], const float Thetasun, const float Zenithval ) const; + float PerezFunctionO2( float const Perezcoeffs[ 5 ], const float Icostheta, const float Gamma, const float Cosgamma2, const float Zenithval ) const; }; diff --git a/environment/sun.cpp b/environment/sun.cpp index 1ecd94ed4..c85fcacb2 100644 --- a/environment/sun.cpp +++ b/environment/sun.cpp @@ -15,10 +15,7 @@ cSun::cSun() { m_observer.temp = 15.0; // ambient dry-bulb temperature, degrees C } -cSun::~cSun() -{ - -} +cSun::~cSun() = default; void cSun::init() { @@ -79,8 +76,8 @@ float cSun::getIntensity() { void cSun::setLocation( float const Longitude, float const Latitude ) { // convert fraction from geographical base of 6o minutes - m_observer.longitude = (int)Longitude + (Longitude - (int)Longitude) * 100.0 / 60.0; - m_observer.latitude = (int)Latitude + (Latitude - (int)Latitude) * 100.0 / 60.0 ; + m_observer.longitude = (int)Longitude + (Longitude - static_cast((int)Longitude)) * 100.0 / 60.0; + m_observer.latitude = (int)Latitude + (Latitude - static_cast((int)Latitude)) * 100.0 / 60.0 ; } // sets current time, overriding one acquired from the system clock @@ -108,9 +105,9 @@ void cSun::move() { SYSTEMTIME localtime = simulation::Time.data(); // time for the calculation - if( m_observer.hour >= 0 ) { localtime.wHour = m_observer.hour; } - if( m_observer.minute >= 0 ) { localtime.wMinute = m_observer.minute; } - if( m_observer.second >= 0 ) { localtime.wSecond = m_observer.second; } + if( m_observer.hour >= 0 ) { localtime.wHour = static_cast(m_observer.hour); } + if( m_observer.minute >= 0 ) { localtime.wMinute = static_cast(m_observer.minute); } + if( m_observer.second >= 0 ) { localtime.wSecond = static_cast(m_observer.second); } double localut = localtime.wHour diff --git a/extras/piped_proc.cpp b/extras/piped_proc.cpp index f7e4e67c4..816849579 100644 --- a/extras/piped_proc.cpp +++ b/extras/piped_proc.cpp @@ -7,7 +7,7 @@ #include "utilities/Logs.h" #ifdef __unix__ -piped_proc::piped_proc(std::string cmd, bool write) +piped_proc::piped_proc(std::string const &cmd, bool write) { file = popen(cmd.c_str(), write ? "w" : "r"); } @@ -26,7 +26,7 @@ size_t piped_proc::read(unsigned char *buf, size_t len) return fread(buf, 1, len, file); } -size_t piped_proc::write(unsigned char *buf, size_t len) +size_t piped_proc::write(unsigned char const *buf, size_t len) { if (!file) return 0; @@ -34,7 +34,7 @@ size_t piped_proc::write(unsigned char *buf, size_t len) return fwrite(buf, 1, len, file); } #elif _WIN32 -piped_proc::piped_proc(std::string cmd, bool write) +piped_proc::piped_proc(std::string const &cmd, bool write) { PROCESS_INFORMATION process; STARTUPINFO siStartInfo; @@ -97,7 +97,7 @@ size_t piped_proc::read(unsigned char *buf, size_t len) return read; } -size_t piped_proc::write(unsigned char *buf, size_t len) +size_t piped_proc::write(unsigned char const *buf, size_t len) { if (!pipe_wr) return 0; diff --git a/extras/piped_proc.h b/extras/piped_proc.h index b16c6b3d6..0e2cb31aa 100644 --- a/extras/piped_proc.h +++ b/extras/piped_proc.h @@ -23,8 +23,8 @@ HANDLE pipe_wr = nullptr; #endif public: - piped_proc(std::string cmd, bool write = false); + explicit piped_proc(std::string const &cmd, bool write = false); size_t read(unsigned char *buf, size_t len); - size_t write(unsigned char *buf, size_t len); + size_t write(unsigned char const *buf, size_t len); ~piped_proc(); }; diff --git a/gl/buffer.cpp b/gl/buffer.cpp index b80cee3e9..2ac6dbfbd 100644 --- a/gl/buffer.cpp +++ b/gl/buffer.cpp @@ -3,7 +3,7 @@ GLenum gl::buffer::glenum_target(gl::buffer::targets target) { - static GLenum mapping[13] = + static std::array const mapping = { GL_ARRAY_BUFFER, GL_ATOMIC_COUNTER_BUFFER, @@ -22,7 +22,7 @@ GLenum gl::buffer::glenum_target(gl::buffer::targets target) return mapping[target]; } -void gl::buffer::bind(targets target) +void gl::buffer::bind(targets target) const { if (binding_points[target] == *this) return; @@ -31,7 +31,7 @@ void gl::buffer::bind(targets target) binding_points[target] = *this; } -void gl::buffer::bind_base(targets target, GLuint index) +void gl::buffer::bind_base(targets target, GLuint index) const { glBindBufferBase(glenum_target(target), index, *this); binding_points[target] = *this; @@ -47,7 +47,7 @@ void gl::buffer::unbind(targets target) void gl::buffer::unbind() { - for (size_t i = 0; i < sizeof(binding_points) / sizeof(GLuint); i++) + for (size_t i = 0; i < std::size(binding_points); i++) unbind((targets)i); } @@ -87,7 +87,7 @@ void gl::buffer::download(targets target, void *data, int offset, GLsizeiptr siz } else { - void *glbuf = glMapBufferRange(glenum_target(target), offset, size, GL_MAP_READ_BIT); + void const *glbuf = glMapBufferRange(glenum_target(target), offset, size, GL_MAP_READ_BIT); memcpy(data, glbuf, size); glUnmapBuffer(glenum_target(target)); } diff --git a/gl/buffer.h b/gl/buffer.h index 8b4e7d9c1..3e66b5164 100644 --- a/gl/buffer.h +++ b/gl/buffer.h @@ -34,8 +34,8 @@ namespace gl buffer(); ~buffer(); - void bind(targets target); - void bind_base(targets target, GLuint index); + void bind(targets target) const; + void bind_base(targets target, GLuint index) const; static void unbind(targets target); static void unbind(); diff --git a/gl/cubemap.cpp b/gl/cubemap.cpp index ca0e6c085..07aa1b1c8 100644 --- a/gl/cubemap.cpp +++ b/gl/cubemap.cpp @@ -15,7 +15,7 @@ gl::cubemap::~cubemap() glDeleteTextures(1, *this); } -void gl::cubemap::alloc(GLint format, int width, int height, GLenum components, GLenum type) +void gl::cubemap::alloc(GLint format, int width, int height, GLenum components, GLenum type) const { glBindTexture(GL_TEXTURE_CUBE_MAP, *this); for (GLuint tgt = GL_TEXTURE_CUBE_MAP_POSITIVE_X; tgt <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z; tgt++) @@ -29,13 +29,13 @@ void gl::cubemap::alloc(GLint format, int width, int height, GLenum components, glBindTexture(GL_TEXTURE_CUBE_MAP, 0); } -void gl::cubemap::bind(int unit) +void gl::cubemap::bind(int unit) const { glActiveTexture(unit); glBindTexture(GL_TEXTURE_CUBE_MAP, *this); } -void gl::cubemap::generate_mipmaps() +void gl::cubemap::generate_mipmaps() const { glBindTexture(GL_TEXTURE_CUBE_MAP, *this); glGenerateMipmap(GL_TEXTURE_CUBE_MAP); diff --git a/gl/cubemap.h b/gl/cubemap.h index e874c221a..f5706b65c 100644 --- a/gl/cubemap.h +++ b/gl/cubemap.h @@ -12,8 +12,8 @@ namespace gl cubemap(); ~cubemap(); - void alloc(GLint format, int width, int height, GLenum components, GLenum type); - void bind(int unit); - void generate_mipmaps(); + void alloc(GLint format, int width, int height, GLenum components, GLenum type) const; + void bind(int unit) const; + void generate_mipmaps() const; }; } diff --git a/gl/framebuffer.cpp b/gl/framebuffer.cpp index af1f63de6..207a0ea98 100644 --- a/gl/framebuffer.cpp +++ b/gl/framebuffer.cpp @@ -80,7 +80,7 @@ void gl::framebuffer::blit_from(framebuffer *other, int w, int h, GLbitfield mas blit(other, this, 0, 0, w, h, mask, attachment); } -void gl::framebuffer::blit(framebuffer *src, framebuffer *dst, int sx, int sy, int w, int h, GLbitfield mask, GLenum attachment) +void gl::framebuffer::blit(framebuffer const *src, framebuffer const *dst, int sx, int sy, int w, int h, GLbitfield mask, GLenum attachment) { glBindFramebuffer(GL_READ_FRAMEBUFFER, src ? *src : 0); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, dst ? *dst : 0); @@ -90,17 +90,17 @@ void gl::framebuffer::blit(framebuffer *src, framebuffer *dst, int sx, int sy, i int attachment_n = attachment - GL_COLOR_ATTACHMENT0; { - GLenum outputs[8] = { GL_NONE }; - outputs[attachment_n] = src != 0 ? attachment : GL_BACK_LEFT; + std::array outputs{ GL_NONE }; + outputs[attachment_n] = src != nullptr ? attachment : GL_BACK_LEFT; glReadBuffer(attachment); } { - GLenum outputs[8] = { GL_NONE }; - outputs[attachment_n] = dst != 0 ? attachment : GL_BACK_LEFT; + std::array outputs{ GL_NONE }; + outputs[attachment_n] = dst != nullptr ? attachment : GL_BACK_LEFT; - glDrawBuffers(attachment_n + 1, outputs); + glDrawBuffers(attachment_n + 1, outputs.data()); } } diff --git a/gl/framebuffer.h b/gl/framebuffer.h index e5dccf57e..f8bee46a2 100644 --- a/gl/framebuffer.h +++ b/gl/framebuffer.h @@ -26,7 +26,7 @@ namespace gl void blit_to(framebuffer *other, int w, int h, GLbitfield mask, GLenum attachment); void blit_from(framebuffer *other, int w, int h, GLbitfield mask, GLenum attachment); - static void blit(framebuffer *src, framebuffer *dst, int sx, int sy, int w, int h, GLbitfield mask, GLenum attachment); + static void blit(framebuffer const *src, framebuffer const *dst, int sx, int sy, int w, int h, GLbitfield mask, GLenum attachment); using bindable::bind; static void bind(GLuint id); diff --git a/gl/object.h b/gl/object.h index eb2008897..7bb954634 100644 --- a/gl/object.h +++ b/gl/object.h @@ -15,12 +15,12 @@ namespace gl return id; } - inline operator GLuint* const() + inline operator GLuint*() { return &id; } - inline operator const GLuint* const() const + inline operator const GLuint*() const { return &id; } diff --git a/gl/pbo.cpp b/gl/pbo.cpp index 6923e09d8..4cad2c9d0 100644 --- a/gl/pbo.cpp +++ b/gl/pbo.cpp @@ -12,7 +12,7 @@ void gl::pbo::request_read(int x, int y, int lx, int ly, int pixsize, GLenum for sync.reset(); bind(PIXEL_PACK_BUFFER); - glReadPixels(x, y, lx, ly, format, type, 0); + glReadPixels(x, y, lx, ly, format, type, nullptr); unbind(PIXEL_PACK_BUFFER); sync.emplace(); diff --git a/gl/postfx.h b/gl/postfx.h index cc0c54503..9ea4b7191 100644 --- a/gl/postfx.h +++ b/gl/postfx.h @@ -15,8 +15,8 @@ namespace gl static std::shared_ptr vao; public: - postfx(const std::string &s); - postfx(const shader &s); + explicit postfx(const std::string &s); + explicit postfx(const shader &s); void attach(); void apply(opengl_texture &src, framebuffer *dst); diff --git a/gl/query.cpp b/gl/query.cpp index 3f3b56af9..8e4456128 100644 --- a/gl/query.cpp +++ b/gl/query.cpp @@ -49,9 +49,9 @@ std::optional gl::query::result() return std::nullopt; } -GLenum gl::query::glenum_target(targets target) +GLenum gl::query::glenum_target(targets Target) const { - static GLenum mapping[6] = + static std::array const mapping = { GL_SAMPLES_PASSED, GL_ANY_SAMPLES_PASSED, @@ -60,7 +60,7 @@ GLenum gl::query::glenum_target(targets target) GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, GL_TIME_ELAPSED }; - return mapping[target]; + return mapping[Target]; } thread_local gl::query* gl::query::active_queries[6]; diff --git a/gl/query.h b/gl/query.h index 831140927..124457905 100644 --- a/gl/query.h +++ b/gl/query.h @@ -22,10 +22,10 @@ private: thread_local static query* active_queries[6]; protected: - GLenum glenum_target(targets target); + GLenum glenum_target(targets target) const; public: - query(targets target); + explicit query(targets target); ~query(); void begin(); diff --git a/gl/shader.cpp b/gl/shader.cpp index 5d8188331..9160a2c97 100644 --- a/gl/shader.cpp +++ b/gl/shader.cpp @@ -7,7 +7,7 @@ #include "glsl_common.h" #include "utilities/Logs.h" -inline bool strcend(std::string const &value, std::string const &ending) +inline bool strcend(std::string_view value, std::string_view ending) { if (ending.size() > value.size()) return false; @@ -41,7 +41,7 @@ bool has_gl_extension(char const *name) { GLint count = 0; glGetIntegerv(GL_NUM_EXTENSIONS, &count); for (GLint i = 0; i < count; ++i) { - char const *ext = reinterpret_cast(glGetStringi(GL_EXTENSIONS, i)); + auto ext = reinterpret_cast(glGetStringi(GL_EXTENSIONS, i)); if (ext != nullptr && std::strcmp(ext, name) == 0) { return true; } @@ -52,7 +52,7 @@ bool has_gl_extension(char const *name) { } // anonymous namespace -std::string gl::shader::read_file(const std::string &filename) +std::string gl::shader::read_file(const std::string &filename) const { std::stringstream stream; std::ifstream f; @@ -73,11 +73,11 @@ void gl::shader::expand_includes(std::string &str, const std::string &basedir) size_t start_pos = 0; std::string magic = "#include"; - while ((start_pos = str.find(magic, start_pos)) != str.npos) + while ((start_pos = str.find(magic, start_pos)) != std::string::npos) { size_t fp = str.find('<', start_pos); size_t fe = str.find('>', start_pos); - if (fp == str.npos || fe == str.npos) + if (fp == std::string::npos || fe == std::string::npos) return; std::string filename = str.substr(fp + 1, fe - fp - 1); @@ -154,8 +154,7 @@ std::pair gl::shader::process_source(const std::string &fil // the driver advertises support (see desktop comment above). // (Glad config doesn't generate GLAD_GL_EXT_gpu_shader5 -- query // the live extension string the same way.) - static bool const have_gpu_shader5 = has_gl_extension("GL_EXT_gpu_shader5"); - if (have_gpu_shader5) + if (static bool const have_gpu_shader5 = has_gl_extension("GL_EXT_gpu_shader5"); have_gpu_shader5) str += "#extension GL_EXT_gpu_shader5 : enable\n"; if (type == GL_GEOMETRY_SHADER) str += "#extension GL_EXT_geometry_shader : require\n"; @@ -189,17 +188,17 @@ void gl::shader::parse_texture_entries(std::string &str) size_t start_pos = 0; std::string magic = "#texture"; - while ((start_pos = str.find(magic, start_pos)) != str.npos) + while ((start_pos = str.find(magic, start_pos)) != std::string::npos) { size_t fp = str.find('(', start_pos); size_t fe = str.find(')', start_pos); - if (fp == str.npos || fe == str.npos) + if (fp == std::string::npos || fe == std::string::npos) return; std::istringstream ss(str.substr(fp + 1, fe - fp - 1)); std::string token; - std::string name; + std::string uniformname; texture_entry conf; size_t arg = 0; @@ -207,14 +206,14 @@ void gl::shader::parse_texture_entries(std::string &str) { std::istringstream token_ss(token); if (arg == 0) - token_ss >> name; + token_ss >> uniformname; else if (arg == 1) token_ss >> conf.id; else if (arg == 2) { std::string comp; token_ss >> comp; - if (components_mapping.find(comp) == components_mapping.end()) + if (!components_mapping.contains(comp)) log_error("unknown components: " + comp); else conf.components = components_mapping[comp]; @@ -224,12 +223,12 @@ void gl::shader::parse_texture_entries(std::string &str) if (arg == 3) { - if (name.empty()) + if (uniformname.empty()) log_error("empty name"); else if (conf.id >= gl::MAX_TEXTURES) log_error("invalid texture binding: " + std::to_string(conf.id)); else - texture_conf.emplace(std::make_pair(name, conf)); + texture_conf.try_emplace(uniformname, conf); } else log_error("invalid argument count to #texture"); @@ -243,17 +242,17 @@ void gl::shader::parse_param_entries(std::string &str) size_t start_pos = 0; std::string magic = "#param"; - while ((start_pos = str.find(magic, start_pos)) != str.npos) + while ((start_pos = str.find(magic, start_pos)) != std::string::npos) { size_t fp = str.find('(', start_pos); size_t fe = str.find(')', start_pos); - if (fp == str.npos || fe == str.npos) + if (fp == std::string::npos || fe == std::string::npos) return; std::istringstream ss(str.substr(fp + 1, fe - fp - 1)); std::string token; - std::string name; + std::string uniformname; param_entry conf; size_t arg = 0; @@ -261,7 +260,7 @@ void gl::shader::parse_param_entries(std::string &str) { std::istringstream token_ss(token); if (arg == 0) - token_ss >> name; + token_ss >> uniformname; else if (arg == 1) token_ss >> conf.location; else if (arg == 2) @@ -272,7 +271,7 @@ void gl::shader::parse_param_entries(std::string &str) { std::string tok; token_ss >> tok; - if (defaultparams_mapping.find(tok) == defaultparams_mapping.end()) + if (!defaultparams_mapping.contains(tok)) log_error("unknown param default: " + tok); conf.defaultparam = defaultparams_mapping[tok]; } @@ -281,7 +280,7 @@ void gl::shader::parse_param_entries(std::string &str) if (arg == 5) { - if (name.empty()) + if (uniformname.empty()) log_error("empty name"); else if (conf.location >= gl::MAX_PARAMS) log_error("invalid param binding: " + std::to_string(conf.location)); @@ -290,7 +289,7 @@ void gl::shader::parse_param_entries(std::string &str) else if (conf.offset + conf.size > 4) log_error("invalid size: " + std::to_string(conf.size)); else - param_conf.emplace(std::make_pair(name, conf)); + param_conf.try_emplace(uniformname, conf); } else log_error("invalid argument count to #param"); @@ -299,32 +298,31 @@ void gl::shader::parse_param_entries(std::string &str) } } -void gl::shader::log_error(const std::string &str) +void gl::shader::log_error(const std::string &str) const { ErrorLog("bad shader: " + name + ": " + str, logtype::shader); } -gl::shader::shader(const std::string &filename) +gl::shader::shader(const std::string &filename) : name(filename) { - name = filename; - std::pair source = process_source(filename, "shaders/"); + auto [shadertype, shadersource] = process_source(filename, "shaders/"); - const GLchar *cstr = source.second.c_str(); + const GLchar *cstr = shadersource.c_str(); - **this = glCreateShader(source.first); - glShaderSource(*this, 1, &cstr, 0); + **this = glCreateShader(shadertype); + glShaderSource(*this, 1, &cstr, nullptr); glCompileShader(*this); GLint status; glGetShaderiv(*this, GL_COMPILE_STATUS, &status); if (!status) { - GLchar info[512]; - glGetShaderInfoLog(*this, 512, 0, info); - log_error(std::string(info)); + std::array info{}; + glGetShaderInfoLog(*this, static_cast(info.size()), nullptr, info.data()); + log_error(std::string(info.data())); - throw shader_exception("failed to compile " + filename + ": " + std::string(info)); + throw shader_exception("failed to compile " + filename + ": " + std::string(info.data())); } } @@ -339,11 +337,11 @@ void gl::program::init() { bind(); - for (auto it : texture_conf) + for (auto const &[texturename, textureentry] : texture_conf) { - shader::texture_entry &e = it.second; - GLuint loc = glGetUniformLocation(*this, it.first.c_str()); - glUniform1i(loc, e.id); + shader::texture_entry const &e = textureentry; + GLuint loc = glGetUniformLocation(*this, texturename.c_str()); + glUniform1i(loc, static_cast(e.id)); } glUniform1i(glGetUniformLocation(*this, "shadowmap"), gl::SHADOW_TEX); @@ -370,7 +368,7 @@ gl::program::program() **this = glCreateProgram(); } -gl::program::program(std::vector> shaders) : program() +gl::program::program(std::vector> const &shaders) : program() { for (const gl::shader &s : shaders) attach(s); @@ -379,10 +377,10 @@ gl::program::program(std::vector> shade void gl::program::attach(const gl::shader &s) { - for (auto it : s.texture_conf) - texture_conf.emplace(std::make_pair(it.first, std::move(it.second))); - for (auto it : s.param_conf) - param_conf.emplace(std::make_pair(it.first, std::move(it.second))); + for (auto [texturename, textureentry] : s.texture_conf) + texture_conf.try_emplace(texturename, std::move(textureentry)); + for (auto [paramname, paramentry] : s.param_conf) + param_conf.try_emplace(paramname, std::move(paramentry)); glAttachShader(*this, *s); } @@ -394,9 +392,9 @@ void gl::program::link() glGetProgramiv(*this, GL_LINK_STATUS, &status); if (!status) { - GLchar info[512]; - glGetProgramInfoLog(*this, 512, 0, info); - throw shader_exception("failed to link program: " + std::string(info)); + std::array info{}; + glGetProgramInfoLog(*this, static_cast(info.size()), nullptr, info.data()); + throw shader_exception("failed to link program: " + std::string(info.data())); } init(); diff --git a/gl/shader.h b/gl/shader.h index 4cd25f07a..f1735a0e9 100644 --- a/gl/shader.h +++ b/gl/shader.h @@ -21,7 +21,7 @@ namespace gl #ifdef SHADERVALIDATOR_STANDALONE shader() = default; #endif - shader(const std::string &filename); + explicit shader(const std::string &filename); ~shader(); enum class components_e @@ -73,19 +73,19 @@ namespace gl void parse_texture_entries(std::string &str); void parse_param_entries(std::string &str); - std::string read_file(const std::string &filename); + std::string read_file(const std::string &filename) const; static std::unordered_map components_mapping; static std::unordered_map defaultparams_mapping; - void log_error(const std::string &str); + void log_error(const std::string &str) const; }; class program : public object, public bindable { public: program(); - program(std::vector>); + explicit program(std::vector> const &); ~program(); using bindable::bind; diff --git a/gl/ubo.cpp b/gl/ubo.cpp index cecf84f0d..ad6f16119 100644 --- a/gl/ubo.cpp +++ b/gl/ubo.cpp @@ -1,10 +1,9 @@ #include "stdafx.h" #include "ubo.h" -gl::ubo::ubo(size_t size, int idx, GLenum hint) +gl::ubo::ubo(size_t size, int idx, GLenum hint) : index(idx) { allocate(buffer::UNIFORM_BUFFER, size, hint); - index = idx; bind_uniform(); } diff --git a/gl/ubo.h b/gl/ubo.h index e4cb7c00a..d5335b21d 100644 --- a/gl/ubo.h +++ b/gl/ubo.h @@ -29,7 +29,7 @@ namespace gl void update(const uint8_t *data, int offset, GLsizeiptr size); template void update(const T &data, size_t offset = 0) { - update(reinterpret_cast(&data), offset, sizeof(data)); + update(reinterpret_cast(&data), static_cast(offset), sizeof(data)); } }; diff --git a/gl/vao.cpp b/gl/vao.cpp index 6d1e055d2..e984ea3bf 100644 --- a/gl/vao.cpp +++ b/gl/vao.cpp @@ -31,7 +31,7 @@ void gl::vao::setup_attrib(gl::buffer &buffer, int attrib, int size, int type, i else { if (attrib == 0) params.clear(); - params.push_back({buffer, attrib, size, type, stride, offset}); + params.emplace_back(buffer, attrib, size, type, stride, offset); active = nullptr; } } @@ -60,14 +60,14 @@ void gl::vao::bind() glBindVertexArray(*this); } else { - for (attrib_params ¶m : params) { + for (attrib_params const ¶m : params) { param.buffer.bind(gl::buffer::ARRAY_BUFFER); glVertexAttribPointer(param.attrib, param.size, param.type, GL_FALSE, param.stride, reinterpret_cast(param.offset)); glEnableVertexAttribArray(param.attrib); } for (size_t i = params.size(); i < 5; i++) - glDisableVertexAttribArray(i); + glDisableVertexAttribArray(static_cast(i)); if (ebo) ebo->bind(gl::buffer::ELEMENT_ARRAY_BUFFER); @@ -84,6 +84,6 @@ void gl::vao::unbind() } else { for (size_t i = 0; i < 4; i++) - glDisableVertexAttribArray(i); + glDisableVertexAttribArray(static_cast(i)); } } diff --git a/gl/vao.h b/gl/vao.h index a4415d030..0c0170323 100644 --- a/gl/vao.h +++ b/gl/vao.h @@ -6,7 +6,7 @@ namespace gl { - class vao : object, public bindable + class vao : private object, public bindable { struct attrib_params { // TBD: should be shared_ptr? (when buffer is destroyed by owner VAO could still potentially exist) diff --git a/global_include/interfaces/IMaterial.h b/global_include/interfaces/IMaterial.h index eaf7268f0..c6f3d1237 100644 --- a/global_include/interfaces/IMaterial.h +++ b/global_include/interfaces/IMaterial.h @@ -19,42 +19,44 @@ struct IMaterial virtual texture_handle GetTexture(int slot) const = 0; static IMaterial *null_material() { - static struct NullMaterial : public IMaterial + struct NullMaterial : public IMaterial { - virtual void finalize(bool Loadnow) override {} - virtual bool update() override + void finalize(bool Loadnow) override { /* null implementation, nothing to do */ } + bool update() override { return false; } - virtual float get_or_guess_opacity() const override + float get_or_guess_opacity() const override { return 1.f; } - virtual bool is_translucent() const override + bool is_translucent() const override { return false; } - virtual glm::vec2 GetSize() const override + glm::vec2 GetSize() const override { return {-1.f, -1.f}; } - virtual std::string GetName() const override + std::string GetName() const override { return ""; } - virtual std::optional GetSelfillum() const override + std::optional GetSelfillum() const override { return std::nullopt; } - virtual int GetShadowRank() const override + int GetShadowRank() const override { return 0; } - virtual texture_handle GetTexture(int slot) const override + texture_handle GetTexture(int slot) const override { return 0; } - } null_material{}; + }; + static NullMaterial null_material{}; return &null_material; } + virtual ~IMaterial() = default; }; \ No newline at end of file diff --git a/global_include/interfaces/ITexture.h b/global_include/interfaces/ITexture.h index 8a1a6796b..ce123829f 100644 --- a/global_include/interfaces/ITexture.h +++ b/global_include/interfaces/ITexture.h @@ -1,6 +1,6 @@ #pragma once -typedef int texture_handle; +using texture_handle = int; #define null_handle (0) @@ -23,54 +23,56 @@ struct ITexture virtual void update_from_memory(size_t width, size_t height, const uint8_t *data) = 0; static ITexture *null_texture() { - static struct NullTexture : public ITexture + struct NullTexture : public ITexture { - virtual bool create(bool Static = false) override + bool create(bool Static = false) override { return false; } - virtual bool is_stub() const override + bool is_stub() const override { return false; } - virtual int get_width() const override + int get_width() const override { return 1; } - virtual int get_height() const override + int get_height() const override { return 1; } - virtual size_t get_id() const override + size_t get_id() const override { return 0; } - virtual void release() override {} - virtual void make_stub() override {} - virtual std::string_view get_traits() const override + void release() override { /* null implementation, nothing to do */ } + void make_stub() override { /* null implementation, nothing to do */ } + std::string_view get_traits() const override { return ""; } - virtual std::string_view get_name() const override + std::string_view get_name() const override { return ""; } - virtual std::string_view get_type() const override + std::string_view get_type() const override { return ""; } - virtual bool get_has_alpha() const override + bool get_has_alpha() const override { return false; } - virtual bool get_is_ready() const override + bool get_is_ready() const override { return false; } - virtual void set_components_hint(int hint) override {} - virtual void make_from_memory(size_t width, size_t height, const uint8_t *data) override {} - virtual void update_from_memory(size_t width, size_t height, const uint8_t *data) override {} - } null_texture{}; + void set_components_hint(int hint) override { /* null implementation, nothing to do */ } + void make_from_memory(size_t width, size_t height, const uint8_t *data) override { /* null implementation, nothing to do */ } + void update_from_memory(size_t width, size_t height, const uint8_t *data) override { /* null implementation, nothing to do */ } + }; + static NullTexture null_texture{}; return &null_texture; } + virtual ~ITexture() = default; }; \ No newline at end of file diff --git a/input/command.cpp b/input/command.cpp index 9a373fef4..d7966f37d 100644 --- a/input/command.cpp +++ b/input/command.cpp @@ -408,7 +408,7 @@ commanddescription_sequence Commands_descriptions = { }; // Maps of command and coresponding strings -std::unordered_map commandMap = { +std::unordered_map const commandMap = { {"aidriverdisable", user_command::aidriverdisable}, {"jointcontrollerset", user_command::jointcontrollerset}, {"mastercontrollerincrease", user_command::mastercontrollerincrease}, @@ -796,12 +796,12 @@ std::unordered_map commandMap = { void command_queue::update() { double delta = Timer::GetDeltaTime(); - for (auto c : m_active_continuous) + for (auto [activecommand, activerecipient] : m_active_continuous) { - command_data data({c.first, GLFW_REPEAT, 0.0, 0.0, delta, false, glm::vec3()}); // todo: improve - auto lookup = m_commands.emplace( c.second, commanddata_sequence() ); + command_data data({activecommand, GLFW_REPEAT, 0.0, 0.0, delta, false, glm::vec3()}); // todo: improve + auto [queueiterator, queueinserted] = m_commands.try_emplace( activerecipient, commanddata_sequence() ); // recipient stack was either located or created, so we can add to it quite safely - lookup.first->second.emplace_back( data ); + queueiterator->second.emplace_back( data ); } } @@ -809,16 +809,15 @@ void command_queue::update() void command_queue::push( command_data const &Command, uint32_t const Recipient ) { if (is_network_target(Recipient)) { - auto lookup = m_intercept_queue.emplace(Recipient, commanddata_sequence()); - lookup.first->second.emplace_back(Command); + auto [queueiterator, queueinserted] = m_intercept_queue.try_emplace(Recipient, commanddata_sequence()); + queueiterator->second.emplace_back(Command); } else { push_direct(Command, Recipient); } } void command_queue::push_direct(const command_data &Command, const uint32_t Recipient) { - auto const &desc = simulation::Commands_descriptions[ static_cast( Command.command ) ]; - if (desc.mode == command_mode::continuous) + if (auto const &desc = simulation::Commands_descriptions[ static_cast( Command.command ) ]; desc.mode == command_mode::continuous) { if (Command.action == GLFW_PRESS) m_active_continuous.emplace(std::make_pair(Command.command, Recipient)); @@ -828,9 +827,9 @@ void command_queue::push_direct(const command_data &Command, const uint32_t Reci return; } - auto lookup = m_commands.emplace( Recipient, commanddata_sequence() ); + auto [queueiterator, queueinserted] = m_commands.try_emplace( Recipient, commanddata_sequence() ); // recipient stack was either located or created, so we can add to it quite safely - lookup.first->second.emplace_back( Command ); + queueiterator->second.emplace_back( Command ); } // retrieves oldest posted command for specified recipient, if any. returns: true on retrieval, false if there's nothing to retrieve @@ -854,10 +853,9 @@ command_queue::pop( command_data &Command, uint32_t const Recipient ) { return true; } -bool command_queue::is_network_target(uint32_t const Recipient) { - const command_target target = (command_target)(Recipient & ~0xffff); +bool command_queue::is_network_target(uint32_t const Recipient) const { - if (target == command_target::entity) + if (const auto target = (command_target)(Recipient & ~0xffff); target == command_target::entity) return false; return true; @@ -870,9 +868,9 @@ command_queue::commands_map command_queue::pop_intercept_queue() { } void command_queue::push_commands(const commands_map &commands) { - for (auto const &kv : commands) - for (command_data const &data : kv.second) - push_direct(data, kv.first); + for (auto const &[recipient, sequence] : commands) + for (command_data const &data : sequence) + push_direct(data, recipient); } void diff --git a/input/command.h b/input/command.h index 7ff5b272f..e03622a9f 100644 --- a/input/command.h +++ b/input/command.h @@ -455,8 +455,8 @@ class command_queue { public: // types - typedef std::deque commanddata_sequence; - typedef std::unordered_map commands_map; + using commanddata_sequence = std::deque; + using commands_map = std::unordered_map; // methods // posts specified command for specified recipient into m_intercept_queue void @@ -469,7 +469,7 @@ public: update(); // checks if given command must be scheduled on server bool - is_network_target(const uint32_t Recipient); + is_network_target(const uint32_t Recipient) const; // pops commands from intercept queue commands_map pop_intercept_queue(); @@ -511,13 +511,13 @@ void add_to_dequemap(std::unordered_map> &lhs, const std::unord // but realistically it's not like we're going to run more than one simulation at a time namespace simulation { -typedef std::vector commanddescription_sequence; +using commanddescription_sequence = std::vector; extern command_queue Commands; // TODO: add name to command map, and wrap these two into helper object extern commanddescription_sequence Commands_descriptions; -extern std::unordered_map commandMap; +extern std::unordered_map const commandMap; } // command_relay: composite class component, passes specified command to appropriate command stack @@ -530,7 +530,6 @@ public: void post(user_command const Command, double const Param1, double const Param2, int const Action, uint16_t Recipient, glm::vec3 Position = glm::vec3(0.0f) , const std::string *Payload = nullptr) const; -private: // types // members }; diff --git a/input/driverkeyboardinput.cpp b/input/driverkeyboardinput.cpp index 48c8c1fc5..e7e636b31 100644 --- a/input/driverkeyboardinput.cpp +++ b/input/driverkeyboardinput.cpp @@ -22,276 +22,277 @@ driverkeyboard_input::init() { void driverkeyboard_input::default_bindings() { + using enum user_command; m_bindingsetups = { - { user_command::aidriverenable, {GLFW_KEY_Q | keymodifier::shift, ""} }, - { user_command::aidriverdisable, {GLFW_KEY_Q, ""} }, + { aidriverenable, {GLFW_KEY_Q | keymodifier::shift, ""} }, + { aidriverdisable, {GLFW_KEY_Q, ""} }, // jointcontrollerset, - { user_command::mastercontrollerincrease, {GLFW_KEY_KP_ADD, ""} }, - { user_command::mastercontrollerincreasefast, {GLFW_KEY_KP_ADD | keymodifier::shift, ""} }, - { user_command::mastercontrollerdecrease, {GLFW_KEY_KP_SUBTRACT, ""} }, - { user_command::mastercontrollerdecreasefast, {GLFW_KEY_KP_SUBTRACT | keymodifier::shift, ""} }, + { mastercontrollerincrease, {GLFW_KEY_KP_ADD, ""} }, + { mastercontrollerincreasefast, {GLFW_KEY_KP_ADD | keymodifier::shift, ""} }, + { mastercontrollerdecrease, {GLFW_KEY_KP_SUBTRACT, ""} }, + { mastercontrollerdecreasefast, {GLFW_KEY_KP_SUBTRACT | keymodifier::shift, ""} }, // mastercontrollerset, - { user_command::dynamicbrakecontrollerincrease, {GLFW_KEY_KP_3 | keymodifier::control, ""} }, - { user_command::dynamicbrakecontrollerdecrease, {GLFW_KEY_KP_9 | keymodifier::control, ""} }, + { dynamicbrakecontrollerincrease, {GLFW_KEY_KP_3 | keymodifier::control, ""} }, + { dynamicbrakecontrollerdecrease, {GLFW_KEY_KP_9 | keymodifier::control, ""} }, // mastercontrollerset, - { user_command::dynamicbrakecontrollerincreasefast, {GLFW_KEY_KP_3 | keymodifier::control | keymodifier::shift, ""} }, - { user_command::dynamicbrakecontrollerdecreasefast, {GLFW_KEY_KP_9 | keymodifier::control | keymodifier::shift, ""} }, + { dynamicbrakecontrollerincreasefast, {GLFW_KEY_KP_3 | keymodifier::control | keymodifier::shift, ""} }, + { dynamicbrakecontrollerdecreasefast, {GLFW_KEY_KP_9 | keymodifier::control | keymodifier::shift, ""} }, - { user_command::secondcontrollerincrease, {GLFW_KEY_KP_DIVIDE, ""} }, - { user_command::secondcontrollerincreasefast, {GLFW_KEY_KP_DIVIDE | keymodifier::shift, ""} }, - { user_command::secondcontrollerdecrease, {GLFW_KEY_KP_MULTIPLY, ""} }, - { user_command::secondcontrollerdecreasefast, {GLFW_KEY_KP_MULTIPLY | keymodifier::shift, ""} }, + { secondcontrollerincrease, {GLFW_KEY_KP_DIVIDE, ""} }, + { secondcontrollerincreasefast, {GLFW_KEY_KP_DIVIDE | keymodifier::shift, ""} }, + { secondcontrollerdecrease, {GLFW_KEY_KP_MULTIPLY, ""} }, + { secondcontrollerdecreasefast, {GLFW_KEY_KP_MULTIPLY | keymodifier::shift, ""} }, // secondcontrollerset, - { user_command::mucurrentindicatorothersourceactivate, {GLFW_KEY_Z | keymodifier::shift, ""} }, - { user_command::independentbrakeincrease, {GLFW_KEY_KP_1, ""} }, - { user_command::independentbrakeincreasefast, {GLFW_KEY_KP_1 | keymodifier::shift, ""} }, - { user_command::independentbrakedecrease, {GLFW_KEY_KP_7, ""} }, - { user_command::independentbrakedecreasefast, {GLFW_KEY_KP_7 | keymodifier::shift, ""} }, + { mucurrentindicatorothersourceactivate, {GLFW_KEY_Z | keymodifier::shift, ""} }, + { independentbrakeincrease, {GLFW_KEY_KP_1, ""} }, + { independentbrakeincreasefast, {GLFW_KEY_KP_1 | keymodifier::shift, ""} }, + { independentbrakedecrease, {GLFW_KEY_KP_7, ""} }, + { independentbrakedecreasefast, {GLFW_KEY_KP_7 | keymodifier::shift, ""} }, // independentbrakeset, - { user_command::independentbrakebailoff, {GLFW_KEY_KP_4, ""} }, + { independentbrakebailoff, {GLFW_KEY_KP_4, ""} }, // universalbrakebutton1, // universalbrakebutton2, // universalbrakebutton3, - { user_command::trainbrakeincrease, {GLFW_KEY_KP_3, ""} }, - { user_command::trainbrakedecrease, {GLFW_KEY_KP_9, ""} }, + { trainbrakeincrease, {GLFW_KEY_KP_3, ""} }, + { trainbrakedecrease, {GLFW_KEY_KP_9, ""} }, // trainbrakeset, - { user_command::trainbrakecharging, {GLFW_KEY_KP_DECIMAL, ""} }, - { user_command::trainbrakerelease, {GLFW_KEY_KP_6, ""} }, - { user_command::trainbrakefirstservice, {GLFW_KEY_KP_8, ""} }, - { user_command::trainbrakeservice, {GLFW_KEY_KP_5, ""} }, - { user_command::trainbrakefullservice, {GLFW_KEY_KP_2, ""} }, - { user_command::trainbrakehandleoff, {GLFW_KEY_KP_5 | keymodifier::control, ""} }, - { user_command::trainbrakeemergency, {GLFW_KEY_KP_0, ""} }, - { user_command::trainbrakebasepressureincrease, {GLFW_KEY_KP_3 | keymodifier::control, ""} }, - { user_command::trainbrakebasepressuredecrease, {GLFW_KEY_KP_9 | keymodifier::control, ""} }, - { user_command::trainbrakebasepressurereset, {GLFW_KEY_KP_6 | keymodifier::control, ""} }, - { user_command::trainbrakeoperationtoggle, {GLFW_KEY_KP_4 | keymodifier::control, ""} }, - { user_command::manualbrakeincrease, {GLFW_KEY_KP_1 | keymodifier::control, ""} }, - { user_command::manualbrakedecrease, {GLFW_KEY_KP_7 | keymodifier::control, ""} }, - { user_command::alarmchaintoggle, {GLFW_KEY_B | keymodifier::shift | keymodifier::control, ""} }, + { trainbrakecharging, {GLFW_KEY_KP_DECIMAL, ""} }, + { trainbrakerelease, {GLFW_KEY_KP_6, ""} }, + { trainbrakefirstservice, {GLFW_KEY_KP_8, ""} }, + { trainbrakeservice, {GLFW_KEY_KP_5, ""} }, + { trainbrakefullservice, {GLFW_KEY_KP_2, ""} }, + { trainbrakehandleoff, {GLFW_KEY_KP_5 | keymodifier::control, ""} }, + { trainbrakeemergency, {GLFW_KEY_KP_0, ""} }, + { trainbrakebasepressureincrease, {GLFW_KEY_KP_3 | keymodifier::control, ""} }, + { trainbrakebasepressuredecrease, {GLFW_KEY_KP_9 | keymodifier::control, ""} }, + { trainbrakebasepressurereset, {GLFW_KEY_KP_6 | keymodifier::control, ""} }, + { trainbrakeoperationtoggle, {GLFW_KEY_KP_4 | keymodifier::control, ""} }, + { manualbrakeincrease, {GLFW_KEY_KP_1 | keymodifier::control, ""} }, + { manualbrakedecrease, {GLFW_KEY_KP_7 | keymodifier::control, ""} }, + { alarmchaintoggle, {GLFW_KEY_B | keymodifier::shift | keymodifier::control, ""} }, // alarmchainenable, // alarmchaindisable, - { user_command::wheelspinbrakeactivate, {GLFW_KEY_KP_ENTER, ""} }, - { user_command::sandboxactivate, {GLFW_KEY_S | keymodifier::shift, ""} }, + { wheelspinbrakeactivate, {GLFW_KEY_KP_ENTER, ""} }, + { sandboxactivate, {GLFW_KEY_S | keymodifier::shift, ""} }, // autosandboxtoggle, // autosandboxactivate, // autosandboxdeactivate, - { user_command::reverserincrease, {GLFW_KEY_D, ""} }, - { user_command::reverserdecrease, {GLFW_KEY_R, ""} }, + { reverserincrease, {GLFW_KEY_D, ""} }, + { reverserdecrease, {GLFW_KEY_R, ""} }, // reverserforwardhigh, // reverserforward, // reverserneutral, // reverserbackward, - { user_command::waterpumpbreakertoggle, {GLFW_KEY_W | keymodifier::control, ""} }, + { waterpumpbreakertoggle, {GLFW_KEY_W | keymodifier::control, ""} }, // waterpumpbreakerclose, // waterpumpbreakeropen, - { user_command::waterpumptoggle, {GLFW_KEY_W, ""} }, + { waterpumptoggle, {GLFW_KEY_W, ""} }, // waterpumpenable, // waterpumpdisable, - { user_command::waterheaterbreakertoggle, {GLFW_KEY_W | keymodifier::control | keymodifier::shift, ""} }, + { waterheaterbreakertoggle, {GLFW_KEY_W | keymodifier::control | keymodifier::shift, ""} }, // waterheaterbreakerclose, // waterheaterbreakeropen, - { user_command::waterheatertoggle, {GLFW_KEY_W | keymodifier::shift, ""} }, + { waterheatertoggle, {GLFW_KEY_W | keymodifier::shift, ""} }, // waterheaterenable, // waterheaterdisable, - { user_command::watercircuitslinktoggle, {GLFW_KEY_H | keymodifier::shift, ""} }, + { watercircuitslinktoggle, {GLFW_KEY_H | keymodifier::shift, ""} }, // watercircuitslinkenable, // watercircuitslinkdisable, - { user_command::fuelpumptoggle, {GLFW_KEY_F, ""} }, + { fuelpumptoggle, {GLFW_KEY_F, ""} }, // fuelpumpenable, // fuelpumpdisable, - { user_command::oilpumptoggle, {GLFW_KEY_F | keymodifier::shift, ""} }, + { oilpumptoggle, {GLFW_KEY_F | keymodifier::shift, ""} }, // oilpumpenable, // oilpumpdisable, - { user_command::linebreakertoggle, {GLFW_KEY_M, ""} }, + { linebreakertoggle, {GLFW_KEY_M, ""} }, // linebreakeropen, // linebreakerclose, - { user_command::convertertoggle, {GLFW_KEY_X, ""} }, + { convertertoggle, {GLFW_KEY_X, ""} }, // converterenable, // converterdisable, - { user_command::convertertogglelocal, {GLFW_KEY_X | keymodifier::shift, ""} }, - { user_command::converteroverloadrelayreset, {GLFW_KEY_N | keymodifier::control, ""} }, - { user_command::compressortoggle, {GLFW_KEY_C, ""} }, + { convertertogglelocal, {GLFW_KEY_X | keymodifier::shift, ""} }, + { converteroverloadrelayreset, {GLFW_KEY_N | keymodifier::control, ""} }, + { compressortoggle, {GLFW_KEY_C, ""} }, // compressorenable, // compressordisable, - { user_command::compressortogglelocal, {GLFW_KEY_C | keymodifier::shift, ""} }, + { compressortogglelocal, {GLFW_KEY_C | keymodifier::shift, ""} }, // compressorpresetactivatenext, // compressorpresetactivateprevious, // compressorpresetactivatedefault, - { user_command::motoroverloadrelaythresholdtoggle, {GLFW_KEY_F | keymodifier::control, ""} }, + { motoroverloadrelaythresholdtoggle, {GLFW_KEY_F | keymodifier::control, ""} }, // motoroverloadrelaythresholdsetlow, // motoroverloadrelaythresholdsethigh, - { user_command::motoroverloadrelayreset, {GLFW_KEY_N, ""} }, + { motoroverloadrelayreset, {GLFW_KEY_N, ""} }, // universalrelayreset1, // universalrelayreset2, // universalrelayreset3, - { user_command::notchingrelaytoggle, {GLFW_KEY_G, ""} }, - { user_command::epbrakecontroltoggle, {GLFW_KEY_Z | keymodifier::control, ""} }, + { notchingrelaytoggle, {GLFW_KEY_G, ""} }, + { epbrakecontroltoggle, {GLFW_KEY_Z | keymodifier::control, ""} }, // epbrakecontrolenable // epbrakecontroldisable - { user_command::trainbrakeoperationmodeincrease, {GLFW_KEY_KP_2 | keymodifier::control, ""} }, - { user_command::trainbrakeoperationmodedecrease, {GLFW_KEY_KP_8 | keymodifier::control, ""} }, - { user_command::brakeactingspeedincrease, {GLFW_KEY_B | keymodifier::shift, ""} }, - { user_command::brakeactingspeeddecrease, {GLFW_KEY_B, ""} }, + { trainbrakeoperationmodeincrease, {GLFW_KEY_KP_2 | keymodifier::control, ""} }, + { trainbrakeoperationmodedecrease, {GLFW_KEY_KP_8 | keymodifier::control, ""} }, + { brakeactingspeedincrease, {GLFW_KEY_B | keymodifier::shift, ""} }, + { brakeactingspeeddecrease, {GLFW_KEY_B, ""} }, // brakeactingspeedsetcargo, // brakeactingspeedsetpassenger, // brakeactingspeedsetrapid, - { user_command::brakeloadcompensationincrease, {GLFW_KEY_H | keymodifier::shift | keymodifier::control, ""} }, - { user_command::brakeloadcompensationdecrease, {GLFW_KEY_H | keymodifier::control, ""} }, - { user_command::mubrakingindicatortoggle, {GLFW_KEY_L | keymodifier::shift, ""} }, - { user_command::alerteracknowledge, {GLFW_KEY_SPACE, ""} }, - { user_command::hornlowactivate, {GLFW_KEY_A, ""} }, - { user_command::hornhighactivate, {GLFW_KEY_S, ""} }, - { user_command::whistleactivate, {GLFW_KEY_Z, ""} }, - { user_command::radiotoggle, {GLFW_KEY_R | keymodifier::control, ""} }, + { brakeloadcompensationincrease, {GLFW_KEY_H | keymodifier::shift | keymodifier::control, ""} }, + { brakeloadcompensationdecrease, {GLFW_KEY_H | keymodifier::control, ""} }, + { mubrakingindicatortoggle, {GLFW_KEY_L | keymodifier::shift, ""} }, + { alerteracknowledge, {GLFW_KEY_SPACE, ""} }, + { hornlowactivate, {GLFW_KEY_A, ""} }, + { hornhighactivate, {GLFW_KEY_S, ""} }, + { whistleactivate, {GLFW_KEY_Z, ""} }, + { radiotoggle, {GLFW_KEY_R | keymodifier::control, ""} }, // radioenable // radiodisable - { user_command::radiochannelincrease, {GLFW_KEY_EQUAL, ""} }, - { user_command::radiochanneldecrease, {GLFW_KEY_MINUS, ""} }, + { radiochannelincrease, {GLFW_KEY_EQUAL, ""} }, + { radiochanneldecrease, {GLFW_KEY_MINUS, ""} }, // radiochannelset - { user_command::radiostopsend, {GLFW_KEY_PAUSE | keymodifier::shift | keymodifier::control, ""} }, + { radiostopsend, {GLFW_KEY_PAUSE | keymodifier::shift | keymodifier::control, ""} }, // radiostopenable // radiostopdisable - { user_command::radiostoptest, {GLFW_KEY_R | keymodifier::shift | keymodifier::control, ""} }, - { user_command::radiocall3send, {GLFW_KEY_BACKSPACE, ""} }, + { radiostoptest, {GLFW_KEY_R | keymodifier::shift | keymodifier::control, ""} }, + { radiocall3send, {GLFW_KEY_BACKSPACE, ""} }, // radiovolumeincrease, // radiovolumedecrease, // radiovolumeset, - { user_command::cabchangeforward, {GLFW_KEY_HOME, ""} }, - { user_command::cabchangebackward, {GLFW_KEY_END, ""} }, + { cabchangeforward, {GLFW_KEY_HOME, ""} }, + { cabchangebackward, {GLFW_KEY_END, ""} }, // viewturn, // movehorizontal, // movehorizontalfast, // movevertical, // moveverticalfast, - { user_command::moveleft, {GLFW_KEY_LEFT, "Move left"} }, - { user_command::moveright, {GLFW_KEY_RIGHT, "Move right"} }, - { user_command::moveforward, {GLFW_KEY_UP, "Move forwards"} }, - { user_command::moveback, {GLFW_KEY_DOWN, "Move backwards"} }, - { user_command::moveup, {GLFW_KEY_PAGE_UP, "Move up"} }, - { user_command::movedown, {GLFW_KEY_PAGE_DOWN, "Move down"} }, - { user_command::nearestcarcouplingincrease, {GLFW_KEY_INSERT, ""} }, - { user_command::nearestcarcouplingdisconnect, {GLFW_KEY_DELETE, ""} }, - { user_command::nearestcarcoupleradapterattach, {GLFW_KEY_INSERT | keymodifier::control, ""} }, - { user_command::nearestcarcoupleradapterremove, {GLFW_KEY_DELETE | keymodifier::control, ""} }, - { user_command::occupiedcarcouplingdisconnect, {GLFW_KEY_DELETE | keymodifier::shift, ""} }, - { user_command::doortoggleleft, {GLFW_KEY_COMMA, ""} }, - { user_command::doortoggleright, {GLFW_KEY_PERIOD, ""} }, - { user_command::doorpermitleft, {GLFW_KEY_COMMA | keymodifier::shift, ""} }, - { user_command::doorpermitright, {GLFW_KEY_PERIOD | keymodifier::shift, ""} }, - { user_command::doorpermitpresetactivatenext, {GLFW_KEY_PERIOD | keymodifier::shift | keymodifier::control, ""} }, - { user_command::doorpermitpresetactivateprevious, {GLFW_KEY_COMMA | keymodifier::shift | keymodifier::control, ""} }, + { moveleft, {GLFW_KEY_LEFT, "Move left"} }, + { moveright, {GLFW_KEY_RIGHT, "Move right"} }, + { moveforward, {GLFW_KEY_UP, "Move forwards"} }, + { moveback, {GLFW_KEY_DOWN, "Move backwards"} }, + { moveup, {GLFW_KEY_PAGE_UP, "Move up"} }, + { movedown, {GLFW_KEY_PAGE_DOWN, "Move down"} }, + { nearestcarcouplingincrease, {GLFW_KEY_INSERT, ""} }, + { nearestcarcouplingdisconnect, {GLFW_KEY_DELETE, ""} }, + { nearestcarcoupleradapterattach, {GLFW_KEY_INSERT | keymodifier::control, ""} }, + { nearestcarcoupleradapterremove, {GLFW_KEY_DELETE | keymodifier::control, ""} }, + { occupiedcarcouplingdisconnect, {GLFW_KEY_DELETE | keymodifier::shift, ""} }, + { doortoggleleft, {GLFW_KEY_COMMA, ""} }, + { doortoggleright, {GLFW_KEY_PERIOD, ""} }, + { doorpermitleft, {GLFW_KEY_COMMA | keymodifier::shift, ""} }, + { doorpermitright, {GLFW_KEY_PERIOD | keymodifier::shift, ""} }, + { doorpermitpresetactivatenext, {GLFW_KEY_PERIOD | keymodifier::shift | keymodifier::control, ""} }, + { doorpermitpresetactivateprevious, {GLFW_KEY_COMMA | keymodifier::shift | keymodifier::control, ""} }, // dooropenleft, // dooropenright, - { user_command::dooropenall, {GLFW_KEY_SLASH | keymodifier::shift, ""} }, + { dooropenall, {GLFW_KEY_SLASH | keymodifier::shift, ""} }, // doorcloseleft, // doorcloseright, - { user_command::doorcloseall, {GLFW_KEY_SLASH | keymodifier::control, ""} }, + { doorcloseall, {GLFW_KEY_SLASH | keymodifier::control, ""} }, // doorsteptoggle, - { user_command::doormodetoggle, {GLFW_KEY_SLASH | keymodifier::shift | keymodifier::control, ""} }, + { doormodetoggle, {GLFW_KEY_SLASH | keymodifier::shift | keymodifier::control, ""} }, // mirrorstoggle, - { user_command::departureannounce, {GLFW_KEY_SLASH, ""} }, - { user_command::doorlocktoggle, {GLFW_KEY_S | keymodifier::control, ""} }, - { user_command::pantographcompressorvalvetoggle, {GLFW_KEY_V | keymodifier::control, ""} }, + { departureannounce, {GLFW_KEY_SLASH, ""} }, + { doorlocktoggle, {GLFW_KEY_S | keymodifier::control, ""} }, + { pantographcompressorvalvetoggle, {GLFW_KEY_V | keymodifier::control, ""} }, // pantographcompressorvalveenable, // pantographcompressorvalvedisable, - { user_command::pantographcompressoractivate, {GLFW_KEY_V | keymodifier::shift, ""} }, - { user_command::pantographtogglefront, {GLFW_KEY_P, ""} }, - { user_command::pantographtogglerear, {GLFW_KEY_O, ""} }, + { pantographcompressoractivate, {GLFW_KEY_V | keymodifier::shift, ""} }, + { pantographtogglefront, {GLFW_KEY_P, ""} }, + { pantographtogglerear, {GLFW_KEY_O, ""} }, // pantographraisefront, // pantographraiserear, // pantographlowerfront, // pantographlowerrear, - { user_command::pantographlowerall, {GLFW_KEY_P | keymodifier::control, ""} }, - { user_command::pantographselectnext, {GLFW_KEY_P | keymodifier::shift, ""} }, - { user_command::pantographselectprevious, {GLFW_KEY_O | keymodifier::shift, ""} }, - { user_command::pantographtoggleselected, {GLFW_KEY_O | keymodifier::shift | keymodifier::control, ""} }, + { pantographlowerall, {GLFW_KEY_P | keymodifier::control, ""} }, + { pantographselectnext, {GLFW_KEY_P | keymodifier::shift, ""} }, + { pantographselectprevious, {GLFW_KEY_O | keymodifier::shift, ""} }, + { pantographtoggleselected, {GLFW_KEY_O | keymodifier::shift | keymodifier::control, ""} }, // pantographraiseselected, // pantographlowerselected, // pantographvalvesupdate, // pantographvalvesoff, - { user_command::heatingtoggle, {GLFW_KEY_H, ""} }, + { heatingtoggle, {GLFW_KEY_H, ""} }, // heatingenable, // heatingdisable, - { user_command::lightspresetactivatenext, {GLFW_KEY_T | keymodifier::shift, ""} }, - { user_command::lightspresetactivateprevious, {GLFW_KEY_T, ""} }, - { user_command::headlighttoggleleft, {GLFW_KEY_Y, ""} }, + { lightspresetactivatenext, {GLFW_KEY_T | keymodifier::shift, ""} }, + { lightspresetactivateprevious, {GLFW_KEY_T, ""} }, + { headlighttoggleleft, {GLFW_KEY_Y, ""} }, // headlightenableleft, // headlightdisableleft, - { user_command::headlighttoggleright, {GLFW_KEY_I, ""} }, + { headlighttoggleright, {GLFW_KEY_I, ""} }, // headlightenableright, // headlightdisableright, - { user_command::headlighttoggleupper, {GLFW_KEY_U, ""} }, + { headlighttoggleupper, {GLFW_KEY_U, ""} }, // headlightenableupper, // headlightdisableupper, - { user_command::redmarkertoggleleft, {GLFW_KEY_Y | keymodifier::shift, ""} }, + { redmarkertoggleleft, {GLFW_KEY_Y | keymodifier::shift, ""} }, // redmarkerenableleft, // redmarkerdisableleft, - { user_command::redmarkertoggleright, {GLFW_KEY_I | keymodifier::shift, ""} }, + { redmarkertoggleright, {GLFW_KEY_I | keymodifier::shift, ""} }, // redmarkerenableright, // redmarkerdisableright, - { user_command::headlighttogglerearleft, {GLFW_KEY_Y | keymodifier::control, ""} }, + { headlighttogglerearleft, {GLFW_KEY_Y | keymodifier::control, ""} }, // headlightenablerearleft // headlightdisablerearleft - { user_command::headlighttogglerearright, {GLFW_KEY_I | keymodifier::control, ""} }, + { headlighttogglerearright, {GLFW_KEY_I | keymodifier::control, ""} }, // headlightenablerearright // headlightdisablerearright - { user_command::headlighttogglerearupper, {GLFW_KEY_U | keymodifier::control, ""} }, + { headlighttogglerearupper, {GLFW_KEY_U | keymodifier::control, ""} }, // headlightenablerearupper // headlightdisablerearupper - { user_command::redmarkertogglerearleft, {GLFW_KEY_Y | keymodifier::control | keymodifier::shift, ""} }, + { redmarkertogglerearleft, {GLFW_KEY_Y | keymodifier::control | keymodifier::shift, ""} }, // redmarkerenablerearleft // redmarkerdisablerearleft - { user_command::redmarkertogglerearright, {GLFW_KEY_I | keymodifier::control | keymodifier::shift, ""} }, + { redmarkertogglerearright, {GLFW_KEY_I | keymodifier::control | keymodifier::shift, ""} }, // redmarkerenablerearright // redmarkerdisablerearright - { user_command::redmarkerstoggle, {GLFW_KEY_E | keymodifier::shift, ""} }, - { user_command::endsignalstoggle, {GLFW_KEY_E, ""} }, - { user_command::headlightsdimtoggle, {GLFW_KEY_L | keymodifier::control, ""} }, + { redmarkerstoggle, {GLFW_KEY_E | keymodifier::shift, ""} }, + { endsignalstoggle, {GLFW_KEY_E, ""} }, + { headlightsdimtoggle, {GLFW_KEY_L | keymodifier::control, ""} }, // headlightsdimenable, // headlightsdimdisable, - { user_command::motorconnectorsopen, {GLFW_KEY_L, ""} }, + { motorconnectorsopen, {GLFW_KEY_L, ""} }, // motorconnectorsclose, - { user_command::motordisconnect, {GLFW_KEY_E | keymodifier::control, ""} }, - { user_command::interiorlighttoggle, {GLFW_KEY_APOSTROPHE, ""} }, + { motordisconnect, {GLFW_KEY_E | keymodifier::control, ""} }, + { interiorlighttoggle, {GLFW_KEY_APOSTROPHE, ""} }, // interiorlightenable, // interiorlightdisable, - { user_command::interiorlightdimtoggle, {GLFW_KEY_APOSTROPHE | keymodifier::control, ""} }, + { interiorlightdimtoggle, {GLFW_KEY_APOSTROPHE | keymodifier::control, ""} }, // interiorlightdimenable, // interiorlightdimdisable, // compartmentlightstoggle, // compartmentlightsenable, // compartmentlightsdisable, - { user_command::instrumentlighttoggle, {GLFW_KEY_SEMICOLON, ""} }, + { instrumentlighttoggle, {GLFW_KEY_SEMICOLON, ""} }, // instrumentlightenable, // instrumentlightdisable, - { user_command::dashboardlighttoggle, {GLFW_KEY_SEMICOLON | keymodifier::shift, ""} }, + { dashboardlighttoggle, {GLFW_KEY_SEMICOLON | keymodifier::shift, ""} }, // dashboardlightenable // dashboardlightdisable - { user_command::timetablelighttoggle, {GLFW_KEY_APOSTROPHE | keymodifier::shift, ""} }, + { timetablelighttoggle, {GLFW_KEY_APOSTROPHE | keymodifier::shift, ""} }, // timetablelightenable // timetablelightdisable - { user_command::generictoggle0, {GLFW_KEY_0, ""} }, - { user_command::generictoggle1, {GLFW_KEY_1, ""} }, - { user_command::generictoggle2, {GLFW_KEY_2, ""} }, - { user_command::generictoggle3, {GLFW_KEY_3, ""} }, - { user_command::generictoggle4, {GLFW_KEY_4, ""} }, - { user_command::generictoggle5, {GLFW_KEY_5, ""} }, - { user_command::generictoggle6, {GLFW_KEY_6, ""} }, - { user_command::generictoggle7, {GLFW_KEY_7, ""} }, - { user_command::generictoggle8, {GLFW_KEY_8, ""} }, - { user_command::generictoggle9, {GLFW_KEY_9, ""} }, - { user_command::batterytoggle, {GLFW_KEY_J, ""} }, + { generictoggle0, {GLFW_KEY_0, ""} }, + { generictoggle1, {GLFW_KEY_1, ""} }, + { generictoggle2, {GLFW_KEY_2, ""} }, + { generictoggle3, {GLFW_KEY_3, ""} }, + { generictoggle4, {GLFW_KEY_4, ""} }, + { generictoggle5, {GLFW_KEY_5, ""} }, + { generictoggle6, {GLFW_KEY_6, ""} }, + { generictoggle7, {GLFW_KEY_7, ""} }, + { generictoggle8, {GLFW_KEY_8, ""} }, + { generictoggle9, {GLFW_KEY_9, ""} }, + { batterytoggle, {GLFW_KEY_J, ""} }, // batteryenable, // batterydisable, // cabactivationtoggle, // cabactivationenable, // cabactivationdisable, - { user_command::motorblowerstogglefront, {GLFW_KEY_N | keymodifier::shift, ""} }, - { user_command::motorblowerstogglerear, {GLFW_KEY_M | keymodifier::shift, ""} }, - { user_command::motorblowersdisableall, {GLFW_KEY_M | keymodifier::control, ""} }, + { motorblowerstogglefront, {GLFW_KEY_N | keymodifier::shift, ""} }, + { motorblowerstogglerear, {GLFW_KEY_M | keymodifier::shift, ""} }, + { motorblowersdisableall, {GLFW_KEY_M | keymodifier::control, ""} }, // coolingfanstoggle, // tempomattoggle, // springbraketoggle, @@ -317,14 +318,14 @@ driverkeyboard_input::default_bindings() { // speedcontrolbutton8, // speedcontrolbutton9, // admin_timejump, - { user_command::timejumplarge, {GLFW_KEY_F1 | keymodifier::control, "Big time jump (Debug Mode only)"} }, - { user_command::timejumpsmall, {GLFW_KEY_F1 | keymodifier::shift, "Small time jump (Debug Mode only)"} }, + { timejumplarge, {GLFW_KEY_F1 | keymodifier::control, "Big time jump (Debug Mode only)"} }, + { timejumpsmall, {GLFW_KEY_F1 | keymodifier::shift, "Small time jump (Debug Mode only)"} }, // admin_vehiclemove, - { user_command::vehiclemoveforwards, {GLFW_KEY_LEFT_BRACKET | keymodifier::control, "Move the train forwards (Debug Mode only)"} }, - { user_command::vehiclemovebackwards, {GLFW_KEY_RIGHT_BRACKET | keymodifier::control, "Move the train backwards (Debug Mode only)"} }, - { user_command::vehicleboost, {GLFW_KEY_TAB | keymodifier::control, "Boost the train (Debug Mode only)"} }, - { user_command::debugtoggle, {GLFW_KEY_F12 | keymodifier::control | keymodifier::shift, "Toggle Debug Mode"} }, - { user_command::pausetoggle, {GLFW_KEY_ESCAPE, "Pause the game"} } + { vehiclemoveforwards, {GLFW_KEY_LEFT_BRACKET | keymodifier::control, "Move the train forwards (Debug Mode only)"} }, + { vehiclemovebackwards, {GLFW_KEY_RIGHT_BRACKET | keymodifier::control, "Move the train backwards (Debug Mode only)"} }, + { vehicleboost, {GLFW_KEY_TAB | keymodifier::control, "Boost the train (Debug Mode only)"} }, + { debugtoggle, {GLFW_KEY_F12 | keymodifier::control | keymodifier::shift, "Toggle Debug Mode"} }, + { pausetoggle, {GLFW_KEY_ESCAPE, "Pause the game"} } }; } diff --git a/input/driverkeyboardinput.h b/input/driverkeyboardinput.h index 1e3f11b14..7ebf2cc58 100644 --- a/input/driverkeyboardinput.h +++ b/input/driverkeyboardinput.h @@ -21,7 +21,7 @@ public: protected: // methods void - default_bindings(); + default_bindings() override; }; //--------------------------------------------------------------------------- diff --git a/input/drivermouseinput.cpp b/input/drivermouseinput.cpp index 2d5f3d242..ab3d0aaf8 100644 --- a/input/drivermouseinput.cpp +++ b/input/drivermouseinput.cpp @@ -32,14 +32,15 @@ mouse_slider::bind( user_command const &Command ) { auto const *train { simulation::Train }; TMoverParameters const *vehicle { nullptr }; switch( m_command ) { - case user_command::jointcontrollerset: - case user_command::mastercontrollerset: - case user_command::secondcontrollerset: { + using enum user_command; + case jointcontrollerset: + case mastercontrollerset: + case secondcontrollerset: { vehicle = train ? train->Controlled() : nullptr; break; } - case user_command::trainbrakeset: - case user_command::independentbrakeset: { + case trainbrakeset: + case independentbrakeset: { vehicle = train ? train->Occupied() : nullptr; break; } @@ -61,7 +62,6 @@ mouse_slider::bind( user_command const &Command ) { vehicle->MainCtrlPosNo + vehicle->ScndCtrlPosNo : vehicle->MainCtrlPosNo ) }; // for simplicity upper half of the range controls power, lower controls brakes - auto const brakerangemultiplier { powerrange / LocalBrakePosNo }; m_valuerange = 1.0; m_value = @@ -133,7 +133,7 @@ mouse_slider::release() { } void -mouse_slider::on_move( double const Mousex, double const Mousey ) { +mouse_slider::on_move( double const /*Mousex*/, double const Mousey ) { auto const controlsize { Global.window_size.y * EU07_CONTROLLER_MOUSESLIDERSIZE }; auto const controledge { Global.window_size.y * 0.5 + controlsize * 0.5 }; @@ -171,11 +171,10 @@ drivermouse_input::recall_bindings() { std::string filePath = "eu07_input-mouse.ini"; - fs::path appPath = user_config_path("eu07_input-mouse.ini"); - if (!appPath.empty() && fs::exists(appPath)) + if (fs::path appPath = user_config_path("eu07_input-mouse.ini"); !appPath.empty() && fs::exists(appPath)) filePath = appPath.string(); - cParser bindingparser(filePath.c_str(), cParser::buffer_FILE); + cParser bindingparser(filePath, cParser::buffer_FILE); if (false == bindingparser.ok()) { return false; @@ -185,7 +184,7 @@ drivermouse_input::recall_bindings() { std::unordered_map nametocommandmap; std::size_t commandid = 0; for( auto const &description : simulation::Commands_descriptions ) { - nametocommandmap.emplace( + nametocommandmap.try_emplace( description.name, static_cast( commandid ) ); ++commandid; @@ -211,7 +210,7 @@ drivermouse_input::recall_bindings() { } // TODO: binding targets for mouse buttons - for( auto &bindingtarget : bindingtargets ) { + for( auto const &bindingtarget : bindingtargets ) { // grab command(s) associated with the input pin auto const bindingcommandname{ entryparser.getToken() }; if( true == bindingcommandname.empty() ) { @@ -276,7 +275,7 @@ drivermouse_input::move( double Mousex, double Mousey ) { } void -drivermouse_input::scroll( double const Xoffset, double const Yoffset ) { +drivermouse_input::scroll( double const /*Xoffset*/, double const Yoffset ) { if( Global.ctrlState ) { // ctrl + scroll wheel adjusts fov @@ -314,15 +313,13 @@ drivermouse_input::button( int const Button, int const Action ) { if( true == FreeFlyModeFlag ) { // freefly mode // left mouse button launches on_click event associated with to the node - if( Button == GLFW_MOUSE_BUTTON_LEFT ) { - if( Action == GLFW_PRESS ) { - GfxRenderer->Pick_Node_Callback( - [this](scene::basic_node *node) { - if( node == nullptr - || typeid(*node) != typeid(TAnimModel) ) - return; - simulation::Region->on_click( static_cast( node ) ); } ); - } + if (Button == GLFW_MOUSE_BUTTON_LEFT && Action == GLFW_PRESS) { + GfxRenderer->Pick_Node_Callback( + [](scene::basic_node const *node) { + if( node == nullptr + || typeid(*node) != typeid(TAnimModel) ) + return; + simulation::Region->on_click( static_cast( node ) ); } ); } // right button controls panning if( Button == GLFW_MOUSE_BUTTON_RIGHT ) { @@ -343,11 +340,9 @@ drivermouse_input::button( int const Button, int const Action ) { } else { m_pickwaiting = false; - if( Button == GLFW_MOUSE_BUTTON_LEFT ) { - if( m_slider.command() != user_command::none ) { - m_relay.post( m_slider.command(), 0, 0, Action, 0 ); - m_slider.release(); - } + if (Button == GLFW_MOUSE_BUTTON_LEFT && m_slider.command() != user_command::none) { + m_relay.post( m_slider.command(), 0, 0, Action, 0 ); + m_slider.release(); } // if it's the right mouse button that got released and we had no command active, we were potentially in view panning mode; stop it if( Button == GLFW_MOUSE_BUTTON_RIGHT ) { @@ -361,23 +356,24 @@ drivermouse_input::button( int const Button, int const Action ) { // if not release then it's press m_pickwaiting = true; GfxRenderer->Pick_Control_Callback( - [this, Button, Action, &mousecommand](TSubModel const *control, const glm::vec2 pos) { + [this, Button, Action, &mousecommand](TSubModel const *controlsubmodel, const glm::vec2 pos) { + using enum user_command; bool pickwaiting = m_pickwaiting; m_pickwaiting = false; // click on python screen if (Button == GLFW_MOUSE_BUTTON_LEFT - && control && control->screen_touch_list) { + && controlsubmodel && controlsubmodel->screen_touch_list) { - control->screen_touch_list->emplace_back(pos); + controlsubmodel->screen_touch_list->emplace_back(pos); } - auto const controlbindings { bindings( simulation::Train->GetLabel( control ) ) }; + auto const [leftbinding, rightbinding]{ bindings( simulation::Train->GetLabel( controlsubmodel ) ) }; // if the recognized element under the cursor has a command associated with the pressed button, notify the recipient - mousecommand = Button == GLFW_MOUSE_BUTTON_LEFT ? controlbindings.first : controlbindings.second; + mousecommand = Button == GLFW_MOUSE_BUTTON_LEFT ? leftbinding : rightbinding; - if( mousecommand == user_command::none ) { + if( mousecommand == none ) { // if we don't have any recognized element under the cursor and the right button was pressed, enter view panning mode if( Button == GLFW_MOUSE_BUTTON_RIGHT ) { m_pickmodepanning = true; @@ -387,38 +383,38 @@ drivermouse_input::button( int const Button, int const Action ) { // check manually for commands which have 'fast' variants launched with shift modifier if( Global.shiftState ) { switch( mousecommand ) { - case user_command::mastercontrollerincrease: { mousecommand = user_command::mastercontrollerincreasefast; break; } - case user_command::mastercontrollerdecrease: { mousecommand = user_command::mastercontrollerdecreasefast; break; } - case user_command::secondcontrollerincrease: { mousecommand = user_command::secondcontrollerincreasefast; break; } - case user_command::secondcontrollerdecrease: { mousecommand = user_command::secondcontrollerdecreasefast; break; } - case user_command::independentbrakeincrease: { mousecommand = user_command::independentbrakeincreasefast; break; } - case user_command::independentbrakedecrease: { mousecommand = user_command::independentbrakedecreasefast; break; } + case mastercontrollerincrease: { mousecommand = mastercontrollerincreasefast; break; } + case mastercontrollerdecrease: { mousecommand = mastercontrollerdecreasefast; break; } + case secondcontrollerincrease: { mousecommand = secondcontrollerincreasefast; break; } + case secondcontrollerdecrease: { mousecommand = secondcontrollerdecreasefast; break; } + case independentbrakeincrease: { mousecommand = independentbrakeincreasefast; break; } + case independentbrakedecrease: { mousecommand = independentbrakedecreasefast; break; } default: { break; } } } switch( mousecommand ) { - case user_command::mastercontrollerincrease: - case user_command::mastercontrollerdecrease: - case user_command::secondcontrollerincrease: - case user_command::secondcontrollerdecrease: - case user_command::trainbrakeincrease: - case user_command::trainbrakedecrease: - case user_command::independentbrakeincrease: - case user_command::independentbrakedecrease: { + case mastercontrollerincrease: + case mastercontrollerdecrease: + case secondcontrollerincrease: + case secondcontrollerdecrease: + case trainbrakeincrease: + case trainbrakedecrease: + case independentbrakeincrease: + case independentbrakedecrease: { // these commands trigger varying repeat rate mode, // which scales the rate based on the distance of the cursor from its point when the command was first issued m_varyingpollrateorigin = m_cursorposition; m_varyingpollrate = true; break; } - case user_command::jointcontrollerset: - case user_command::mastercontrollerset: - case user_command::secondcontrollerset: - case user_command::trainbrakeset: - case user_command::independentbrakeset: { + case jointcontrollerset: + case mastercontrollerset: + case secondcontrollerset: + case trainbrakeset: + case independentbrakeset: { m_slider.bind( mousecommand ); - mousecommand = user_command::none; + mousecommand = none; return; } default: { @@ -492,641 +488,643 @@ drivermouse_input::bindings( std::string const &Control ) const { void drivermouse_input::default_bindings() { + using enum user_command; // pierwsza komenda jest od zwiekszania a druga od zmniejszania - ewentualnie kolejno lewy i prawy przycisk m_buttonbindings = { { "jointctrl:", { - user_command::jointcontrollerset, - user_command::none } }, + jointcontrollerset, + none } }, { "mainctrl:", { - user_command::mastercontrollerset, - user_command::none } }, + mastercontrollerset, + none } }, { "dynamicbrakectrl:", { - user_command::dynamicbrakecontrollerset, - user_command::none } }, + dynamicbrakecontrollerset, + none } }, { "scndctrl:", { - user_command::secondcontrollerset, - user_command::none } }, + secondcontrollerset, + none } }, { "shuntmodepower:", { - user_command::secondcontrollerincrease, - user_command::secondcontrollerdecrease } }, + secondcontrollerincrease, + secondcontrollerdecrease } }, { "tempomat_sw:", { - user_command::tempomattoggle, - user_command::none } }, + tempomattoggle, + none } }, { "tempomatoff_sw:", { - user_command::tempomattoggle, - user_command::none } }, + tempomattoggle, + none } }, { "dirkey:", { - user_command::reverserincrease, - user_command::reverserdecrease } }, + reverserincrease, + reverserdecrease } }, { "dirforward_bt:", { - user_command::reverserforward, - user_command::none } }, + reverserforward, + none } }, { "dirneutral_bt:", { - user_command::reverserneutral, - user_command::none } }, + reverserneutral, + none } }, { "dirbackward_bt:", { - user_command::reverserbackward, - user_command::none } }, + reverserbackward, + none } }, { "brakectrl:", { - user_command::trainbrakeset, - user_command::none } }, + trainbrakeset, + none } }, { "localbrake:", { - user_command::independentbrakeset, - user_command::none } }, + independentbrakeset, + none } }, { "manualbrake:", { - user_command::manualbrakeincrease, - user_command::manualbrakedecrease } }, + manualbrakeincrease, + manualbrakedecrease } }, { "alarmchain:", { - user_command::alarmchaintoggle, - user_command::none } }, + alarmchaintoggle, + none } }, { "alarmchainon:", { - user_command::alarmchainenable, - user_command::none} }, + alarmchainenable, + none} }, { "alarmchainoff:", { - user_command::alarmchainenable, - user_command::none} }, + alarmchainenable, + none} }, { "brakeprofile_sw:", { - user_command::brakeactingspeedincrease, - user_command::brakeactingspeeddecrease } }, + brakeactingspeedincrease, + brakeactingspeeddecrease } }, // TODO: dedicated methods for braking speed switches { "brakeprofileg_sw:", { - user_command::brakeactingspeedsetcargo, - user_command::brakeactingspeedsetpassenger } }, + brakeactingspeedsetcargo, + brakeactingspeedsetpassenger } }, { "brakeprofiler_sw:", { - user_command::brakeactingspeedsetrapid, - user_command::brakeactingspeedsetpassenger } }, + brakeactingspeedsetrapid, + brakeactingspeedsetpassenger } }, { "brakeopmode_sw:", { - user_command::trainbrakeoperationmodeincrease, - user_command::trainbrakeoperationmodedecrease } }, + trainbrakeoperationmodeincrease, + trainbrakeoperationmodedecrease } }, { "maxcurrent_sw:", { - user_command::motoroverloadrelaythresholdtoggle, - user_command::none } }, + motoroverloadrelaythresholdtoggle, + none } }, { "waterpumpbreaker_sw:", { - user_command::waterpumpbreakertoggle, - user_command::none } }, + waterpumpbreakertoggle, + none } }, { "waterpump_sw:", { - user_command::waterpumptoggle, - user_command::none } }, + waterpumptoggle, + none } }, { "waterheaterbreaker_sw:", { - user_command::waterheaterbreakertoggle, - user_command::none } }, + waterheaterbreakertoggle, + none } }, { "waterheater_sw:", { - user_command::waterheatertoggle, - user_command::none } }, + waterheatertoggle, + none } }, { "fuelpump_sw:", { - user_command::fuelpumptoggle, - user_command::none } }, + fuelpumptoggle, + none } }, { "oilpump_sw:", { - user_command::oilpumptoggle, - user_command::none } }, + oilpumptoggle, + none } }, { "motorblowersfront_sw:", { - user_command::motorblowerstogglefront, - user_command::none } }, + motorblowerstogglefront, + none } }, { "motorblowersrear_sw:", { - user_command::motorblowerstogglerear, - user_command::none } }, + motorblowerstogglerear, + none } }, { "motorblowersalloff_sw:", { - user_command::motorblowersdisableall, - user_command::none } }, + motorblowersdisableall, + none } }, { "coolingfans_sw:", { - user_command::coolingfanstoggle, - user_command::none } }, + coolingfanstoggle, + none } }, { "main_off_bt:", { - user_command::linebreakeropen, - user_command::none } }, + linebreakeropen, + none } }, { "main_on_bt:",{ - user_command::linebreakerclose, - user_command::none } }, + linebreakerclose, + none } }, { "security_reset_bt:", { - user_command::alerteracknowledge, - user_command::none } }, + alerteracknowledge, + none } }, { "shp_reset_bt:", { - user_command::cabsignalacknowledge, - user_command::none } }, + cabsignalacknowledge, + none } }, { "releaser_bt:", { - user_command::independentbrakebailoff, - user_command::none } }, + independentbrakebailoff, + none } }, { "springbraketoggle_bt:",{ - user_command::springbraketoggle, - user_command::none } }, + springbraketoggle, + none } }, { "springbrakeon_bt:",{ - user_command::springbrakeenable, - user_command::none } }, + springbrakeenable, + none } }, { "springbrakeoff_bt:",{ - user_command::springbrakedisable, - user_command::none } }, + springbrakedisable, + none } }, { "universalbrake1_bt:",{ - user_command::universalbrakebutton1, - user_command::none } }, + universalbrakebutton1, + none } }, { "universalbrake2_bt:",{ - user_command::universalbrakebutton2, - user_command::none } }, + universalbrakebutton2, + none } }, { "universalbrake3_bt:",{ - user_command::universalbrakebutton3, - user_command::none } }, + universalbrakebutton3, + none } }, { "epbrake_bt:",{ - user_command::epbrakecontroltoggle, - user_command::none } }, + epbrakecontroltoggle, + none } }, { "epbrakeon_bt:",{ - user_command::epbrakecontrolenable, - user_command::none } }, + epbrakecontrolenable, + none } }, { "epbrakeoff_bt:",{ - user_command::epbrakecontroldisable, - user_command::none } }, + epbrakecontroldisable, + none } }, { "sand_bt:", { - user_command::sandboxactivate, - user_command::none } }, + sandboxactivate, + none } }, { "antislip_bt:", { - user_command::wheelspinbrakeactivate, - user_command::none } }, + wheelspinbrakeactivate, + none } }, { "horn_bt:", { - user_command::hornhighactivate, - user_command::hornlowactivate } }, + hornhighactivate, + hornlowactivate } }, { "hornlow_bt:", { - user_command::hornlowactivate, - user_command::none } }, + hornlowactivate, + none } }, { "hornhigh_bt:", { - user_command::hornhighactivate, - user_command::none } }, + hornhighactivate, + none } }, { "whistle_bt:", { - user_command::whistleactivate, - user_command::none } }, + whistleactivate, + none } }, { "fuse_bt:", { - user_command::motoroverloadrelayreset, - user_command::none } }, + motoroverloadrelayreset, + none } }, { "converterfuse_bt:", { - user_command::converteroverloadrelayreset, - user_command::none } }, + converteroverloadrelayreset, + none } }, { "relayreset1_bt:", { - user_command::universalrelayreset1, - user_command::none } }, + universalrelayreset1, + none } }, { "relayreset2_bt:", { - user_command::universalrelayreset2, - user_command::none } }, + universalrelayreset2, + none } }, { "relayreset3_bt:", { - user_command::universalrelayreset3, - user_command::none } }, + universalrelayreset3, + none } }, { "stlinoff_bt:", { - user_command::motorconnectorsopen, - user_command::none } }, + motorconnectorsopen, + none } }, { "doorleftpermit_sw:", { - user_command::doorpermitleft, - user_command::none } }, + doorpermitleft, + none } }, { "doorrightpermit_sw:", { - user_command::doorpermitright, - user_command::none } }, + doorpermitright, + none } }, { "doorpermitpreset_sw:", { - user_command::doorpermitpresetactivatenext, - user_command::doorpermitpresetactivateprevious } }, + doorpermitpresetactivatenext, + doorpermitpresetactivateprevious } }, { "door_left_sw:", { - user_command::doortoggleleft, - user_command::none } }, + doortoggleleft, + none } }, { "door_right_sw:", { - user_command::doortoggleright, - user_command::none } }, + doortoggleright, + none } }, { "doorlefton_sw:", { - user_command::dooropenleft, - user_command::none } }, + dooropenleft, + none } }, { "doorrighton_sw:", { - user_command::dooropenright, - user_command::none } }, + dooropenright, + none } }, { "doorleftoff_sw:", { - user_command::doorcloseleft, - user_command::none } }, + doorcloseleft, + none } }, { "doorrightoff_sw:", { - user_command::doorcloseright, - user_command::none } }, + doorcloseright, + none } }, { "doorallon_sw:", { - user_command::dooropenall, - user_command::none } }, + dooropenall, + none } }, { "dooralloff_sw:", { - user_command::doorcloseall, - user_command::none } }, + doorcloseall, + none } }, { "doorstep_sw:", { - user_command::doorsteptoggle, - user_command::none } }, + doorsteptoggle, + none } }, { "doormode_sw:", { - user_command::doormodetoggle, - user_command::none } }, + doormodetoggle, + none } }, { "mirrors_sw:", { - user_command::mirrorstoggle, - user_command::none } }, + mirrorstoggle, + none } }, { "departure_signal_bt:", { - user_command::departureannounce, - user_command::none } }, + departureannounce, + none } }, { "upperlight_sw:", { - user_command::headlighttoggleupper, - user_command::none } }, + headlighttoggleupper, + none } }, { "leftlight_sw:", { - user_command::headlighttoggleleft, - user_command::none } }, + headlighttoggleleft, + none } }, { "rightlight_sw:", { - user_command::headlighttoggleright, - user_command::none } }, + headlighttoggleright, + none } }, { "dimheadlights_sw:", { - user_command::headlightsdimtoggle, - user_command::none } }, + headlightsdimtoggle, + none } }, {"moderndimmer_sw:", { - user_command::modernlightdimmerincrease, - user_command::modernlightdimmerdecrease } }, + modernlightdimmerincrease, + modernlightdimmerdecrease } }, { "leftend_sw:", { - user_command::redmarkertoggleleft, - user_command::none } }, + redmarkertoggleleft, + none } }, { "rightend_sw:", { - user_command::redmarkertoggleright, - user_command::none } }, + redmarkertoggleright, + none } }, { "lights_sw:", { - user_command::lightspresetactivatenext, - user_command::lightspresetactivateprevious } }, + lightspresetactivatenext, + lightspresetactivateprevious } }, { "rearupperlight_sw:", { - user_command::headlighttogglerearupper, - user_command::none } }, + headlighttogglerearupper, + none } }, { "rearleftlight_sw:", { - user_command::headlighttogglerearleft, - user_command::none } }, + headlighttogglerearleft, + none } }, { "rearrightlight_sw:", { - user_command::headlighttogglerearright, - user_command::none } }, + headlighttogglerearright, + none } }, { "rearleftend_sw:", { - user_command::redmarkertogglerearleft, - user_command::none } }, + redmarkertogglerearleft, + none } }, { "rearrightend_sw:", { - user_command::redmarkertogglerearright, - user_command::none } }, + redmarkertogglerearright, + none } }, { "compressor_sw:", { - user_command::compressortoggle, - user_command::none } }, + compressortoggle, + none } }, { "compressorlocal_sw:", { - user_command::compressortogglelocal, - user_command::none } }, + compressortogglelocal, + none } }, { "compressorlist_sw:", { - user_command::compressorpresetactivatenext, - user_command::compressorpresetactivateprevious } }, + compressorpresetactivatenext, + compressorpresetactivateprevious } }, { "converter_sw:", { - user_command::convertertoggle, - user_command::none } }, + convertertoggle, + none } }, { "converterlocal_sw:", { - user_command::convertertogglelocal, - user_command::none } }, + convertertogglelocal, + none } }, { "converteroff_sw:", { - user_command::convertertoggle, - user_command::none } }, // TODO: dedicated converter shutdown command + convertertoggle, + none } }, // TODO: dedicated converter shutdown command { "main_sw:", { - user_command::linebreakertoggle, - user_command::none } }, + linebreakertoggle, + none } }, { "radio_sw:", { - user_command::radiotoggle, - user_command::none } }, + radiotoggle, + none } }, { "radioon_sw:", { - user_command::radioenable, - user_command::none } }, + radioenable, + none } }, { "radiooff_sw:", { - user_command::radiodisable, - user_command::none } }, + radiodisable, + none } }, { "radiochannel_sw:", { - user_command::radiochannelincrease, - user_command::radiochanneldecrease } }, + radiochannelincrease, + radiochanneldecrease } }, { "radiochannelprev_sw:", { - user_command::radiochanneldecrease, - user_command::none } }, + radiochanneldecrease, + none } }, { "radiochannelnext_sw:", { - user_command::radiochannelincrease, - user_command::none } }, + radiochannelincrease, + none } }, { "radiostop_sw:", { - user_command::radiostopsend, - user_command::none } }, + radiostopsend, + none } }, { "radiostopon_sw:", { - user_command::radiostopenable, - user_command::none } }, + radiostopenable, + none } }, { "radiostopoff_sw:", { - user_command::radiostopdisable, - user_command::none } }, + radiostopdisable, + none } }, { "radiotest_sw:", { - user_command::radiostoptest, - user_command::none } }, + radiostoptest, + none } }, { "radiocall1_sw:", { - user_command::radiocall1send, - user_command::none } }, + radiocall1send, + none } }, { "radiocall3_sw:", { - user_command::radiocall3send, - user_command::none } }, + radiocall3send, + none } }, { "radiovolume_sw:",{ - user_command::radiovolumeincrease, - user_command::radiovolumedecrease } }, + radiovolumeincrease, + radiovolumedecrease } }, { "radiovolumeprev_sw:",{ - user_command::radiovolumedecrease, - user_command::none } }, + radiovolumedecrease, + none } }, { "radiovolumenext_sw:",{ - user_command::radiovolumeincrease, - user_command::none } }, + radiovolumeincrease, + none } }, { "pantfront_sw:", { - user_command::pantographtogglefront, - user_command::none } }, + pantographtogglefront, + none } }, { "pantrear_sw:", { - user_command::pantographtogglerear, - user_command::none } }, + pantographtogglerear, + none } }, { "pantfrontoff_sw:", { - user_command::pantographlowerfront, - user_command::none } }, + pantographlowerfront, + none } }, { "pantrearoff_sw:", { - user_command::pantographlowerrear, - user_command::none } }, + pantographlowerrear, + none } }, { "pantalloff_sw:", { - user_command::pantographlowerall, - user_command::none } }, + pantographlowerall, + none } }, { "pantselected_sw:", { - user_command::pantographtoggleselected, - user_command::none } }, // TBD: bind lowerselected in case of toggle switch + pantographtoggleselected, + none } }, // TBD: bind lowerselected in case of toggle switch { "pantselectedoff_sw:", { - user_command::pantographlowerselected, - user_command::none } }, + pantographlowerselected, + none } }, { "pantselect_sw:", { - user_command::pantographselectnext, - user_command::pantographselectprevious } }, + pantographselectnext, + pantographselectprevious } }, { "pantvalves_sw:", { - user_command::pantographvalvesupdate, - user_command::pantographvalvesoff } }, + pantographvalvesupdate, + pantographvalvesoff } }, { "pantvalvesupdate_bt:", { - user_command::pantographvalvesupdate, - user_command::none}}, + pantographvalvesupdate, + none}}, { "pantvalvesoff_bt:", { - user_command::pantographvalvesoff, - user_command::none}}, + pantographvalvesoff, + none}}, { "pantcompressor_sw:", { - user_command::pantographcompressoractivate, - user_command::none } }, + pantographcompressoractivate, + none } }, { "pantcompressorvalve_sw:", { - user_command::pantographcompressorvalvetoggle, - user_command::none } }, + pantographcompressorvalvetoggle, + none } }, { "trainheating_sw:", { - user_command::heatingtoggle, - user_command::none } }, + heatingtoggle, + none } }, { "signalling_sw:", { - user_command::mubrakingindicatortoggle, - user_command::none } }, + mubrakingindicatortoggle, + none } }, { "door_signalling_sw:", { - user_command::doorlocktoggle, - user_command::none } }, + doorlocktoggle, + none } }, { "nextcurrent_sw:", { - user_command::mucurrentindicatorothersourceactivate, - user_command::none } }, + mucurrentindicatorothersourceactivate, + none } }, { "distancecounter_sw:", { - user_command::distancecounteractivate, - user_command::none } }, + distancecounteractivate, + none } }, { "instrumentlight_sw:", { - user_command::instrumentlighttoggle, - user_command::none } }, + instrumentlighttoggle, + none } }, { "dashboardlight_sw:", { - user_command::dashboardlighttoggle, - user_command::none } }, + dashboardlighttoggle, + none } }, { "dashboardlighton_sw:", { - user_command::dashboardlightenable, - user_command::none } }, + dashboardlightenable, + none } }, { "dashboardlightoff_sw:", { - user_command::dashboardlightdisable, - user_command::none } }, + dashboardlightdisable, + none } }, { "timetablelight_sw:", { - user_command::timetablelighttoggle, - user_command::none } }, + timetablelighttoggle, + none } }, { "timetablelighton_sw:", { - user_command::timetablelightenable, - user_command::none } }, + timetablelightenable, + none } }, { "timetablelightoff_sw:", { - user_command::timetablelightdisable, - user_command::none } }, + timetablelightdisable, + none } }, { "cablight_sw:", { - user_command::interiorlighttoggle, - user_command::none } }, + interiorlighttoggle, + none } }, { "cablightdim_sw:", { - user_command::interiorlightdimtoggle, - user_command::none } }, + interiorlightdimtoggle, + none } }, { "compartmentlights_sw:", { - user_command::compartmentlightstoggle, - user_command::none } }, + compartmentlightstoggle, + none } }, { "compartmentlightson_sw:", { - user_command::compartmentlightsenable, - user_command::none } }, + compartmentlightsenable, + none } }, { "compartmentlightsoff_sw:", { - user_command::compartmentlightsdisable, - user_command::none } }, + compartmentlightsdisable, + none } }, { "battery_sw:", { - user_command::batterytoggle, - user_command::none } }, + batterytoggle, + none } }, { "batteryon_sw:", { - user_command::batteryenable, - user_command::none } }, + batteryenable, + none } }, { "batteryoff_sw:", { - user_command::batterydisable, - user_command::none } }, + batterydisable, + none } }, { "cabactivation_sw:", { - user_command::cabactivationtoggle, - user_command::none } }, + cabactivationtoggle, + none } }, { "couplingdisconnect_sw:",{ - user_command::occupiedcarcouplingdisconnect, - user_command::none } }, + occupiedcarcouplingdisconnect, + none } }, { "couplingdisconnectback_sw:",{ - user_command::occupiedcarcouplingdisconnectback, - user_command::none } }, - {"universal0:", {user_command::generictoggle0, user_command::none}}, - {"universal1:", {user_command::generictoggle1, user_command::none}}, - {"universal2:", {user_command::generictoggle2, user_command::none}}, - {"universal3:", {user_command::generictoggle3, user_command::none}}, - {"universal4:", {user_command::generictoggle4, user_command::none}}, - {"universal5:", {user_command::generictoggle5, user_command::none}}, - {"universal6:", {user_command::generictoggle6, user_command::none}}, - {"universal7:", {user_command::generictoggle7, user_command::none}}, - {"universal8:", {user_command::generictoggle8, user_command::none}}, - {"universal9:", {user_command::generictoggle9, user_command::none}}, - {"universal10:", {user_command::generictoggle10, user_command::none}}, - {"universal11:", {user_command::generictoggle11, user_command::none}}, - {"universal12:", {user_command::generictoggle12, user_command::none}}, - {"universal13:", {user_command::generictoggle13, user_command::none}}, - {"universal14:", {user_command::generictoggle14, user_command::none}}, - {"universal15:", {user_command::generictoggle15, user_command::none}}, - {"universal16:", {user_command::generictoggle16, user_command::none}}, - {"universal17:", {user_command::generictoggle17, user_command::none}}, - {"universal18:", {user_command::generictoggle18, user_command::none}}, - {"universal19:", {user_command::generictoggle19, user_command::none}}, - {"universal20:", {user_command::generictoggle20, user_command::none}}, - {"universal21:", {user_command::generictoggle21, user_command::none}}, - {"universal22:", {user_command::generictoggle22, user_command::none}}, - {"universal23:", {user_command::generictoggle23, user_command::none}}, - {"universal24:", {user_command::generictoggle24, user_command::none}}, - {"universal25:", {user_command::generictoggle25, user_command::none}}, - {"universal26:", {user_command::generictoggle26, user_command::none}}, - {"universal27:", {user_command::generictoggle27, user_command::none}}, - {"universal28:", {user_command::generictoggle28, user_command::none}}, - {"universal29:", {user_command::generictoggle29, user_command::none}}, + occupiedcarcouplingdisconnectback, + none } }, + {"universal0:", {generictoggle0, none}}, + {"universal1:", {generictoggle1, none}}, + {"universal2:", {generictoggle2, none}}, + {"universal3:", {generictoggle3, none}}, + {"universal4:", {generictoggle4, none}}, + {"universal5:", {generictoggle5, none}}, + {"universal6:", {generictoggle6, none}}, + {"universal7:", {generictoggle7, none}}, + {"universal8:", {generictoggle8, none}}, + {"universal9:", {generictoggle9, none}}, + {"universal10:", {generictoggle10, none}}, + {"universal11:", {generictoggle11, none}}, + {"universal12:", {generictoggle12, none}}, + {"universal13:", {generictoggle13, none}}, + {"universal14:", {generictoggle14, none}}, + {"universal15:", {generictoggle15, none}}, + {"universal16:", {generictoggle16, none}}, + {"universal17:", {generictoggle17, none}}, + {"universal18:", {generictoggle18, none}}, + {"universal19:", {generictoggle19, none}}, + {"universal20:", {generictoggle20, none}}, + {"universal21:", {generictoggle21, none}}, + {"universal22:", {generictoggle22, none}}, + {"universal23:", {generictoggle23, none}}, + {"universal24:", {generictoggle24, none}}, + {"universal25:", {generictoggle25, none}}, + {"universal26:", {generictoggle26, none}}, + {"universal27:", {generictoggle27, none}}, + {"universal28:", {generictoggle28, none}}, + {"universal29:", {generictoggle29, none}}, { "speedinc_bt:",{ - user_command::speedcontrolincrease, - user_command::none } }, + speedcontrolincrease, + none } }, { "speeddec_bt:",{ - user_command::speedcontroldecrease, - user_command::none } }, + speedcontroldecrease, + none } }, { "speedctrlpowerinc_bt:",{ - user_command::speedcontrolpowerincrease, - user_command::none } }, + speedcontrolpowerincrease, + none } }, { "speedctrlpowerdec_bt:",{ - user_command::speedcontrolpowerdecrease, - user_command::none } }, + speedcontrolpowerdecrease, + none } }, { "speedbutton0:",{ - user_command::speedcontrolbutton0, - user_command::none } }, + speedcontrolbutton0, + none } }, { "speedbutton1:",{ - user_command::speedcontrolbutton1, - user_command::none } }, + speedcontrolbutton1, + none } }, { "speedbutton2:",{ - user_command::speedcontrolbutton2, - user_command::none } }, + speedcontrolbutton2, + none } }, { "speedbutton3:",{ - user_command::speedcontrolbutton3, - user_command::none } }, + speedcontrolbutton3, + none } }, { "speedbutton4:",{ - user_command::speedcontrolbutton4, - user_command::none } }, + speedcontrolbutton4, + none } }, { "speedbutton5:",{ - user_command::speedcontrolbutton5, - user_command::none } }, + speedcontrolbutton5, + none } }, { "speedbutton6:",{ - user_command::speedcontrolbutton6, - user_command::none } }, + speedcontrolbutton6, + none } }, { "speedbutton7:",{ - user_command::speedcontrolbutton7, - user_command::none } }, + speedcontrolbutton7, + none } }, { "speedbutton8:",{ - user_command::speedcontrolbutton8, - user_command::none } }, + speedcontrolbutton8, + none } }, { "speedbutton9:",{ - user_command::speedcontrolbutton9, - user_command::none } }, + speedcontrolbutton9, + none } }, { "inverterenable1_bt:",{ - user_command::inverterenable1, - user_command::none } }, + inverterenable1, + none } }, { "inverterenable2_bt:",{ - user_command::inverterenable2, - user_command::none } }, + inverterenable2, + none } }, { "inverterenable3_bt:",{ - user_command::inverterenable3, - user_command::none } }, + inverterenable3, + none } }, { "inverterenable4_bt:",{ - user_command::inverterenable4, - user_command::none } }, + inverterenable4, + none } }, { "inverterenable5_bt:",{ - user_command::inverterenable5, - user_command::none } }, + inverterenable5, + none } }, { "inverterenable6_bt:",{ - user_command::inverterenable6, - user_command::none } }, + inverterenable6, + none } }, { "inverterenable7_bt:",{ - user_command::inverterenable7, - user_command::none } }, + inverterenable7, + none } }, { "inverterenable8_bt:",{ - user_command::inverterenable8, - user_command::none } }, + inverterenable8, + none } }, { "inverterenable9_bt:",{ - user_command::inverterenable9, - user_command::none } }, + inverterenable9, + none } }, { "inverterenable10_bt:",{ - user_command::inverterenable10, - user_command::none } }, + inverterenable10, + none } }, { "inverterenable11_bt:",{ - user_command::inverterenable11, - user_command::none } }, + inverterenable11, + none } }, { "inverterenable12_bt:",{ - user_command::inverterenable12, - user_command::none } }, + inverterenable12, + none } }, { "inverterdisable1_bt:",{ - user_command::inverterdisable1, - user_command::none } }, + inverterdisable1, + none } }, { "inverterdisable2_bt:",{ - user_command::inverterdisable2, - user_command::none } }, + inverterdisable2, + none } }, { "inverterdisable3_bt:",{ - user_command::inverterdisable3, - user_command::none } }, + inverterdisable3, + none } }, { "inverterdisable4_bt:",{ - user_command::inverterdisable4, - user_command::none } }, + inverterdisable4, + none } }, { "inverterdisable5_bt:",{ - user_command::inverterdisable5, - user_command::none } }, + inverterdisable5, + none } }, { "inverterdisable6_bt:",{ - user_command::inverterdisable6, - user_command::none } }, + inverterdisable6, + none } }, { "inverterdisable7_bt:",{ - user_command::inverterdisable7, - user_command::none } }, + inverterdisable7, + none } }, { "inverterdisable8_bt:",{ - user_command::inverterdisable8, - user_command::none } }, + inverterdisable8, + none } }, { "inverterdisable9_bt:",{ - user_command::inverterdisable9, - user_command::none } }, + inverterdisable9, + none } }, { "inverterdisable10_bt:",{ - user_command::inverterdisable10, - user_command::none } }, + inverterdisable10, + none } }, { "inverterdisable11_bt:",{ - user_command::inverterdisable11, - user_command::none } }, + inverterdisable11, + none } }, { "inverterdisable12_bt:",{ - user_command::inverterdisable12, - user_command::none } }, + inverterdisable12, + none } }, { "invertertoggle1_bt:",{ - user_command::invertertoggle1, - user_command::none } }, + invertertoggle1, + none } }, { "invertertoggle2_bt:",{ - user_command::invertertoggle2, - user_command::none } }, + invertertoggle2, + none } }, { "invertertoggle3_bt:",{ - user_command::invertertoggle3, - user_command::none } }, + invertertoggle3, + none } }, { "invertertoggle4_bt:",{ - user_command::invertertoggle4, - user_command::none } }, + invertertoggle4, + none } }, { "invertertoggle5_bt:",{ - user_command::invertertoggle5, - user_command::none } }, + invertertoggle5, + none } }, { "invertertoggle6_bt:",{ - user_command::invertertoggle6, - user_command::none } }, + invertertoggle6, + none } }, { "invertertoggle7_bt:",{ - user_command::invertertoggle7, - user_command::none } }, + invertertoggle7, + none } }, { "invertertoggle8_bt:",{ - user_command::invertertoggle8, - user_command::none } }, + invertertoggle8, + none } }, { "invertertoggle9_bt:",{ - user_command::invertertoggle9, - user_command::none } }, + invertertoggle9, + none } }, { "invertertoggle10_bt:",{ - user_command::invertertoggle10, - user_command::none } }, + invertertoggle10, + none } }, { "invertertoggle11_bt:",{ - user_command::invertertoggle11, - user_command::none } }, + invertertoggle11, + none } }, { "invertertoggle12_bt:",{ - user_command::invertertoggle12, - user_command::none } }, + invertertoggle12, + none } }, { "wipers_sw:",{ - user_command::wiperswitchincrease, - user_command::wiperswitchdecrease + wiperswitchincrease, + wiperswitchdecrease } }, }; } user_command -drivermouse_input::adjust_command( user_command Command ) { +drivermouse_input::adjust_command( user_command Command ) const { + using enum user_command; if( true == Global.shiftState - && Command != user_command::none ) { + && Command != none ) { switch( Command ) { - case user_command::mastercontrollerincrease: { Command = user_command::mastercontrollerincreasefast; break; } - case user_command::mastercontrollerdecrease: { Command = user_command::mastercontrollerdecreasefast; break; } - case user_command::secondcontrollerincrease: { Command = user_command::secondcontrollerincreasefast; break; } - case user_command::secondcontrollerdecrease: { Command = user_command::secondcontrollerdecreasefast; break; } - case user_command::independentbrakeincrease: { Command = user_command::independentbrakeincreasefast; break; } - case user_command::independentbrakedecrease: { Command = user_command::independentbrakedecreasefast; break; } + case mastercontrollerincrease: { Command = mastercontrollerincreasefast; break; } + case mastercontrollerdecrease: { Command = mastercontrollerdecreasefast; break; } + case secondcontrollerincrease: { Command = secondcontrollerincreasefast; break; } + case secondcontrollerdecrease: { Command = secondcontrollerdecreasefast; break; } + case independentbrakeincrease: { Command = independentbrakeincreasefast; break; } + case independentbrakedecrease: { Command = independentbrakedecreasefast; break; } default: { break; } } } diff --git a/input/drivermouseinput.h b/input/drivermouseinput.h index 142ef99c8..180e0335c 100644 --- a/input/drivermouseinput.h +++ b/input/drivermouseinput.h @@ -84,14 +84,14 @@ private: user_command down; }; - typedef std::unordered_map buttonbindings_map; + using buttonbindings_map = std::unordered_map; // methods void default_bindings(); // potentially replaces supplied command with a more relevant one user_command - adjust_command( user_command Command ); + adjust_command( user_command Command ) const; // members command_relay m_relay; diff --git a/input/editorkeyboardinput.cpp b/input/editorkeyboardinput.cpp index 209ca65a8..7f5a03a1c 100644 --- a/input/editorkeyboardinput.cpp +++ b/input/editorkeyboardinput.cpp @@ -31,25 +31,26 @@ editorkeyboard_input::apply_scheme() { void editorkeyboard_input::default_bindings() { + using enum user_command; if (EditorSettings.movement() == editorSettings::movement_scheme::legacy) { m_bindingsetups = { - { user_command::moveleft, {GLFW_KEY_LEFT, "Move left"} }, - { user_command::moveright, {GLFW_KEY_RIGHT, "Move right"} }, - { user_command::moveforward, {GLFW_KEY_UP, "Move forwards"} }, - { user_command::moveback, {GLFW_KEY_DOWN, "Move backwards"} }, - { user_command::moveup, {GLFW_KEY_PAGE_UP, "Move up"} }, - { user_command::movedown, {GLFW_KEY_PAGE_DOWN, "Move down"} }, + { moveleft, {GLFW_KEY_LEFT, "Move left"} }, + { moveright, {GLFW_KEY_RIGHT, "Move right"} }, + { moveforward, {GLFW_KEY_UP, "Move forwards"} }, + { moveback, {GLFW_KEY_DOWN, "Move backwards"} }, + { moveup, {GLFW_KEY_PAGE_UP, "Move up"} }, + { movedown, {GLFW_KEY_PAGE_DOWN, "Move down"} }, }; } else { m_bindingsetups = { - { user_command::moveleft, {GLFW_KEY_A, "Move left"} }, - { user_command::moveright, {GLFW_KEY_D, "Move right"} }, - { user_command::moveforward, {GLFW_KEY_W, "Move forwards"} }, - { user_command::moveback, {GLFW_KEY_S, "Move backwards"} }, - { user_command::moveup, {GLFW_KEY_E, "Move up"} }, - { user_command::movedown, {GLFW_KEY_Q, "Move down"} }, + { moveleft, {GLFW_KEY_A, "Move left"} }, + { moveright, {GLFW_KEY_D, "Move right"} }, + { moveforward, {GLFW_KEY_W, "Move forwards"} }, + { moveback, {GLFW_KEY_S, "Move backwards"} }, + { moveup, {GLFW_KEY_E, "Move up"} }, + { movedown, {GLFW_KEY_Q, "Move down"} }, }; } } diff --git a/input/gamepadinput.cpp b/input/gamepadinput.cpp index ac819b823..c4e537b2c 100644 --- a/input/gamepadinput.cpp +++ b/input/gamepadinput.cpp @@ -51,8 +51,7 @@ gamepad_input::init() { m_inputbuttons.clear(); // NOTE: we're only checking for joystick_1 and rely for it to stay connected throughout. // not exactly flexible, but for quick hack it'll do - auto const name = glfwGetJoystickName( GLFW_JOYSTICK_1 ); - if( name != nullptr ) { + if( auto const name = glfwGetJoystickName( GLFW_JOYSTICK_1 ); name != nullptr ) { WriteLog( "Connected gamepad: " + std::string( name ) ); m_deviceid = GLFW_JOYSTICK_1; } @@ -94,7 +93,7 @@ gamepad_input::poll() { if( button.state != buttons[ idx ] ) { // button pressed or released, both are important on_button( - idx, + static_cast(idx), buttons[idx] == 1 ? GLFW_PRESS : GLFW_RELEASE); } else { @@ -102,7 +101,7 @@ gamepad_input::poll() { if( button.state == GLFW_PRESS ) { on_button( - idx, + static_cast(idx), GLFW_REPEAT ); } } @@ -125,9 +124,9 @@ gamepad_input::poll() { } void -gamepad_input::bind( std::vector< std::reference_wrapper > &Targets, cParser &Input, std::unordered_map const &Translator, std::string const Point ) { +gamepad_input::bind( std::vector< std::reference_wrapper > const &Targets, cParser &Input, std::unordered_map const &Translator, std::string const &Point ) const { - for( auto &bindingtarget : Targets ) { + for( auto const &bindingtarget : Targets ) { // grab command(s) associated with the input pin auto const bindingcommandname{ Input.getToken() }; if( true == bindingcommandname.empty() ) { @@ -154,12 +153,11 @@ bool gamepad_input::recall_bindings() { std::string filePath = "eu07_input-gamepad.ini"; - fs::path appPath = user_config_path("eu07_input-gamepad.ini"); - if (!appPath.empty() && fs::exists(appPath)) + if (fs::path appPath = user_config_path("eu07_input-gamepad.ini"); !appPath.empty() && fs::exists(appPath)) filePath = appPath.string(); // bindingparser tworzony zawsze, z wybran� �cie�k� - cParser bindingparser(filePath.c_str(), cParser::buffer_FILE); + cParser bindingparser(filePath, cParser::buffer_FILE); if( false == bindingparser.ok() ) { return false; @@ -169,7 +167,7 @@ gamepad_input::recall_bindings() { std::unordered_map nametocommandmap; std::size_t commandid = 0; for( auto const &description : simulation::Commands_descriptions ) { - nametocommandmap.emplace( + nametocommandmap.try_emplace( description.name, static_cast( commandid ) ); ++commandid; @@ -191,16 +189,16 @@ gamepad_input::recall_bindings() { std::string bindingpoint {}; entryparser >> bindingpoint; - auto const splitbindingpoint { split_string_and_number( bindingpoint ) }; + auto const [pointtype, pointindex]{ split_string_and_number( bindingpoint ) }; - if( splitbindingpoint.first == "axis" ) { + if( pointtype == "axis" ) { // one or more sets of: [modeIDX] input type, parameters // [optional] modeIDX associates the set with control mode IDX // input types: // -- range commandname IDX; axis value is passed as paramIDX of commandname // -- 3state commandname commandname; positive axis value issues first commandname, negative value issues second commandname - auto const axisindex { splitbindingpoint.second }; + auto const axisindex { pointindex }; // sanity check, connected gamepad isn't guaranteed to have that many axes if( axisindex >= m_inputaxes.size() ) { continue; } @@ -211,8 +209,7 @@ gamepad_input::recall_bindings() { std::string key {}; entryparser >> key; // check for potential mode indicator - auto const splitkey { split_string_and_number( key ) }; - if( splitkey.first == "mode" ) { + if( auto const splitkey { split_string_and_number( key ) }; splitkey.first == "mode" ) { // indicate we'll be processing specified mode controlmode = splitkey.second; continue; @@ -231,12 +228,13 @@ gamepad_input::recall_bindings() { std::get<0>( m_inputaxes[ axisindex ].bindings[ controlmode ] ) = bindingtype; // retrieve regular commands associated with the axis and mode switch( bindingtype ) { - case input_type::value: - case input_type::value_invert: { + using enum gamepad_input::input_type; + case value: + case value_invert: { bindingtargets.emplace_back( std::ref( std::get<1>( m_inputaxes[ axisindex ].bindings[ controlmode ] ) ) ); break; } - case input_type::threestate: { + case threestate: { bindingtargets.emplace_back( std::ref( std::get<1>( m_inputaxes[ axisindex ].bindings[ controlmode ] ) ) ); bindingtargets.emplace_back( std::ref( std::get<2>( m_inputaxes[ axisindex ].bindings[ controlmode ] ) ) ); break; @@ -267,9 +265,9 @@ gamepad_input::recall_bindings() { } } } - else if( splitbindingpoint.first == "button" ) { + else if( pointtype == "button" ) { - auto const buttonindex { splitbindingpoint.second }; + auto const buttonindex { pointindex }; // sanity check, connected gamepad isn't guaranteed to have that many buttons if( buttonindex >= m_inputbuttons.size() ) { continue; } @@ -345,7 +343,8 @@ void gamepad_input::process_axes() { input_type inputtype; - user_command boundcommand1, boundcommand2; + user_command boundcommand1; + user_command boundcommand2; auto binding { std::tie( inputtype, boundcommand1, boundcommand2 ) }; // since some commands can potentially collect values from two different axes we can't post them directly @@ -369,20 +368,18 @@ gamepad_input::process_axes() { auto const deltatime { Timer::GetDeltaTime() * 15.0 }; if( axis.state >= 0.0f ) { // first bound command selected - if( axis.accumulator < 0.0f ) { - // we were issuing the other command, post notification that's no longer the case - if( boundcommand2 != user_command::none ) { - m_relay.post( - boundcommand2, - 0, 0, - GLFW_RELEASE, - 0 ); - axis.accumulator = 0.0f; - } + // we were issuing the other command, post notification that's no longer the case + if (axis.accumulator < 0.0f && boundcommand2 != user_command::none) { + m_relay.post( + boundcommand2, + 0, 0, + GLFW_RELEASE, + 0 ); + axis.accumulator = 0.0f; } if( boundcommand1 != user_command::none ) { if( axis.state > m_deadzone ) { - axis.accumulator += ( axis.state - m_deadzone ) / ( 1.0 - m_deadzone ) * deltatime; + axis.accumulator += static_cast(( axis.state - m_deadzone ) / ( 1.0 - m_deadzone ) * deltatime); // we're making sure there's always a positive charge left in the accumulator, // to more reliably decect when the stick goes from active to dead zone, below while( axis.accumulator > 1.0f ) { @@ -409,20 +406,18 @@ gamepad_input::process_axes() { } else { // second bound command selected - if( axis.accumulator > 0.0f ) { - // we were issuing the other command, post notification that's no longer the case - if( boundcommand1 != user_command::none ) { - m_relay.post( - boundcommand1, - 0, 0, - GLFW_RELEASE, - 0 ); - axis.accumulator = 0.0f; - } + // we were issuing the other command, post notification that's no longer the case + if (axis.accumulator > 0.0f && boundcommand1 != user_command::none) { + m_relay.post( + boundcommand1, + 0, 0, + GLFW_RELEASE, + 0 ); + axis.accumulator = 0.0f; } if( boundcommand1 != user_command::none ) { if( axis.state < -m_deadzone ) { - axis.accumulator += ( axis.state + m_deadzone ) / ( 1.0 - m_deadzone ) * deltatime; + axis.accumulator += static_cast(( axis.state + m_deadzone ) / ( 1.0 - m_deadzone ) * deltatime); // we're making sure there's always a positive charge left in the accumulator, // to more reliably decect when the stick goes from active to dead zone, below while( axis.accumulator < -1.0f ) { @@ -464,19 +459,18 @@ gamepad_input::process_axes() { else { param = param > 0.0 ? (param - m_deadzone) / (1.0 - m_deadzone) : (param + m_deadzone) / (1.0 - m_deadzone); } - if( param != 0.0 ) { - if( inputtype == input_type::value_invert ) { - param *= -1.0; - } + if (param != 0.0 && inputtype == input_type::value_invert) { + param *= -1.0; } // scale passed value according to command type switch( boundcommand1 ) { - case user_command::viewturn: { + using enum user_command; + case viewturn: { param *= 10.0 * ( Timer::GetDeltaRenderTime() * 60.0 ); break; } - case user_command::movehorizontal: - case user_command::movehorizontalfast: { + case movehorizontal: + case movehorizontalfast: { // these expect value in -1:1 range break; } @@ -494,17 +488,17 @@ gamepad_input::process_axes() { } } // issue remaining, assembled commands - for( auto const &command : commands ) { - auto const param1 { std::get<0>( command.second ) }; - auto const param2 { std::get<1>( command.second ) }; - auto &lastparams { m_lastcommandparams[ command.first ] }; + for( auto const &[commandid, commandparams] : commands ) { + auto const param1 { std::get<0>( commandparams ) }; + auto const param2 { std::get<1>( commandparams ) }; + auto &lastparams { m_lastcommandparams[ commandid ] }; if( param1 != 0.0 || std::get<0>(lastparams) != 0.0 || param2 != 0.0 || std::get<1>(lastparams) != 0.0 ) { m_relay.post( - command.first, + commandid, param1, param2, - std::get<2>( command.second ), + std::get<2>( commandparams ), // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 // TODO: pass correct entity id once the missing systems are in place 0 ); diff --git a/input/gamepadinput.h b/input/gamepadinput.h index ba8d4e38e..6f411601f 100644 --- a/input/gamepadinput.h +++ b/input/gamepadinput.h @@ -77,7 +77,7 @@ private: using inputaxis_sequence = std::vector; // methods bool recall_bindings(); - void bind( std::vector< std::reference_wrapper > &Targets, cParser &Input, std::unordered_map const &Translator, std::string const Point ); + void bind( std::vector< std::reference_wrapper > const &Targets, cParser &Input, std::unordered_map const &Translator, std::string const &Point ) const; void on_button( int const Button, int const Action ); void process_axes(); diff --git a/input/keyboardinput.cpp b/input/keyboardinput.cpp index 0279f0558..4c2fdf8f0 100644 --- a/input/keyboardinput.cpp +++ b/input/keyboardinput.cpp @@ -136,7 +136,7 @@ keyboard_input::recall_bindings() { // Fallback � plik w folderze symulatora path = "eu07_input-keyboard.ini"; } - cParser bindingparser(path.c_str(), cParser::buffer_FILE); + cParser bindingparser(path, cParser::buffer_FILE); bindingparser.skipComments = false; if( false == bindingparser.ok() ) { @@ -147,7 +147,7 @@ keyboard_input::recall_bindings() { std::unordered_map nametocommandmap; std::size_t commandid = 0; for( auto const &description : simulation::Commands_descriptions ) { - nametocommandmap.emplace( + nametocommandmap.try_emplace( description.name, static_cast( commandid ) ); ++commandid; @@ -155,7 +155,7 @@ keyboard_input::recall_bindings() { std::unordered_map nametokeymap; for (const std::pair &key : keytonamemap) { - nametokeymap.emplace(key.second, key.first); + nametokeymap.try_emplace(key.second, key.first); } // NOTE: to simplify things we expect one entry per line, and whole entry in one line @@ -225,7 +225,7 @@ keyboard_input::recall_bindings() { return true; } -void keyboard_input::dump_bindings() +void keyboard_input::dump_bindings() const { std::fstream stream("eu07_input-keyboard.ini", std::ios_base::binary | std::ios_base::trunc | std::ios_base::out); @@ -239,8 +239,7 @@ void keyboard_input::dump_bindings() stream << simulation::Commands_descriptions[static_cast(binding.first)].name << ' '; int keycode = std::get(binding.second); - auto it = keytonamemap.find(keycode & 0xFFFF); - if (it != keytonamemap.end()) { + if (auto it = keytonamemap.find(keycode & 0xFFFF); it != keytonamemap.end()) { if (keycode & keymodifier::control) stream << "ctrl "; if (keycode & keymodifier::shift) @@ -284,7 +283,7 @@ keyboard_input::key( int const Key, int const Action ) { if( Key == -1 ) { return false; } // store key state - input::keys[ Key ] = Action; + input::keys[ Key ] = static_cast( Action ); if( true == is_movement_key( Key ) ) { // if the received key was one of movement keys, it's been handled and we don't need to bother further @@ -298,8 +297,7 @@ keyboard_input::key( int const Key, int const Action ) { | ( modifier ? 0 : input::key_ctrl ? keymodifier::control : 0 ); if( Action == GLFW_RELEASE ) { - auto const stored = m_modsforkeys.find( Key ); - if( stored != m_modsforkeys.end() ) { + if( auto const stored = m_modsforkeys.find( Key ); stored != m_modsforkeys.end() ) { key = stored->second; } m_modsforkeys.erase( Key ); @@ -330,28 +328,29 @@ keyboard_input::key( int const Key ) const { void keyboard_input::bind() { + using enum user_command; m_bindings.clear(); - for( auto const &bindingsetup : m_bindingsetups ) { + for( auto const &[setupcommand, setupbinding] : m_bindingsetups ) { - m_bindings[ std::get(bindingsetup.second) ] = bindingsetup.first; + m_bindings[ std::get(setupbinding) ] = setupcommand; } // cache movement key bindings - m_bindingscache.forward = binding( user_command::moveforward ); - m_bindingscache.back = binding( user_command::moveback ); - m_bindingscache.left = binding( user_command::moveleft ); - m_bindingscache.right = binding( user_command::moveright ); - m_bindingscache.up = binding( user_command::moveup ); - m_bindingscache.down = binding( user_command::movedown ); + m_bindingscache.forward = binding( moveforward ); + m_bindingscache.back = binding( moveback ); + m_bindingscache.left = binding( moveleft ); + m_bindingscache.right = binding( moveright ); + m_bindingscache.up = binding( moveup ); + m_bindingscache.down = binding( movedown ); } int keyboard_input::binding( user_command const Command ) const { - for( auto const &binding : m_bindings ) { - if( binding.second == Command ) { - return binding.first; + for( auto const &[bindingkey, bindingcommand] : m_bindings ) { + if( bindingcommand == Command ) { + return bindingkey; } } return -1; @@ -413,7 +412,7 @@ keyboard_input::poll() { m_movementvertical = movementvertical; } -std::unordered_map keytonamemap = { +std::unordered_map const keytonamemap = { { GLFW_KEY_0, "0" }, { GLFW_KEY_1, "1" }, { GLFW_KEY_2, "2" }, { GLFW_KEY_3, "3" }, { GLFW_KEY_4, "4" }, { GLFW_KEY_5, "5" }, { GLFW_KEY_6, "6" }, { GLFW_KEY_7, "7" }, { GLFW_KEY_8, "8" }, { GLFW_KEY_9, "9" }, { GLFW_KEY_MINUS, "-" }, { GLFW_KEY_EQUAL, "=" }, diff --git a/input/keyboardinput.h b/input/keyboardinput.h index 1c1b5f2a3..1611c9a3c 100644 --- a/input/keyboardinput.h +++ b/input/keyboardinput.h @@ -56,7 +56,7 @@ public: void poll(); inline - user_command const + user_command command() const { return m_command; } bindingsetup_sequence& @@ -67,7 +67,7 @@ public: std::string binding_hint( user_command const Command ) const; void - dump_bindings(); + dump_bindings() const; // members static std::unordered_map keytonamemap; diff --git a/input/messaging.cpp b/input/messaging.cpp index 36ed853c6..66a39e7d5 100644 --- a/input/messaging.cpp +++ b/input/messaging.cpp @@ -32,7 +32,7 @@ namespace multiplayer { std::uint32_t const EU07_MESSAGEHEADER { MAKE_ID4( 'E','U','0','7' ) }; void -Navigate(std::string const &ClassName, UINT Msg, WPARAM wParam, LPARAM lParam) { +Navigate([[maybe_unused]] std::string const &ClassName, [[maybe_unused]] UINT Msg, [[maybe_unused]] WPARAM wParam, [[maybe_unused]] LPARAM lParam) { #ifdef _WIN32 // wysłanie komunikatu do sterującego HWND h = FindWindow(ClassName.c_str(), 0); // można by to zapamiętać @@ -43,7 +43,7 @@ Navigate(std::string const &ClassName, UINT Msg, WPARAM wParam, LPARAM lParam) { } void -OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) +OnCommandGet(multiplayer::DaneRozkaz const *pRozkaz) { // odebranie komunikatu z serwera if (pRozkaz->iSygn == EU07_MESSAGEHEADER ) switch (pRozkaz->iComm) @@ -62,15 +62,13 @@ OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) std::string( pRozkaz->cString + 1, (unsigned)pRozkaz->cString[0] ) + " rcvd" ); if( Global.iMultiplayer ) { - auto *event = simulation::Events.FindEvent( std::string( pRozkaz->cString + 1, (unsigned)pRozkaz->cString[0] ) ); - if( event != nullptr ) { - if( typeid(*event) == typeid(multi_event) - || typeid(*event) == typeid(lights_event) - || event->m_sibling != 0 ) { - // tylko jawne albo niejawne Multiple - command_relay relay; - relay.post(user_command::queueevent, 0.0, 0.0, GLFW_PRESS, 0, glm::vec3(0.0f), &event->name()); - } + auto const *foundevent = simulation::Events.FindEvent( std::string( pRozkaz->cString + 1, (unsigned)pRozkaz->cString[0] ) ); + if (foundevent != nullptr && (typeid(*foundevent) == typeid(multi_event) + || typeid(*foundevent) == typeid(lights_event) + || foundevent->m_sibling != nullptr)) { + // tylko jawne albo niejawne Multiple + command_relay commandrelay; + commandrelay.post(user_command::queueevent, 0.0, 0.0, GLFW_PRESS, 0, glm::vec3(0.0f), &foundevent->name()); } } break; @@ -78,7 +76,7 @@ OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) case 3: // rozkaz dla AI if (Global.iMultiplayer) { - int i = int(pRozkaz->cString[8]); // długość pierwszego łańcucha (z przodu dwa floaty) + auto i = int(pRozkaz->cString[8]); // długość pierwszego łańcucha (z przodu dwa floaty) CommLog( Now() + " " + std::to_string(pRozkaz->iComm) + " " + std::string(pRozkaz->cString + 11 + i, (unsigned)pRozkaz->cString[10 + i]) + @@ -110,21 +108,21 @@ OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) break; case 5: // ustawienie parametrów { - CommLog(Now() + " " + std::to_string(pRozkaz->iComm) + " params " + std::to_string(*pRozkaz->iPar) + " rcvd"); - if (*pRozkaz->iPar == 0) // sprawdzenie czasu - if (*pRozkaz->iPar & 1) // ustawienie czasu - { - auto t = pRozkaz->fPar[1]; - simulation::Time.data().wDay = std::floor(t); // niby nie powinno być dnia, ale... - if (Global.fMoveLight >= 0) - Global.fMoveLight = t; // trzeba by deklinację Słońca przeliczyć - simulation::Time.data().wHour = std::floor(24 * t) - 24.0 * simulation::Time.data().wDay; - simulation::Time.data().wMinute = std::floor(60 * 24 * t) - 60.0 * (24.0 * simulation::Time.data().wDay + simulation::Time.data().wHour); - simulation::Time.data().wSecond = std::floor( 60 * 60 * 24 * t ) - 60.0 * ( 60.0 * ( 24.0 * simulation::Time.data().wDay + simulation::Time.data().wHour ) + simulation::Time.data().wMinute ); - } - if (*pRozkaz->iPar & 2) + CommLog(Now() + " " + std::to_string(pRozkaz->iComm) + " params " + std::to_string(pRozkaz->iPar[0]) + " rcvd"); + // sprawdzenie czasu + if (pRozkaz->iPar[0] == 0 && pRozkaz->iPar[0] & 1) // ustawienie czasu + { + auto t = pRozkaz->fPar[1]; + simulation::Time.data().wDay = static_cast(std::floor(t)); // niby nie powinno być dnia, ale... + if (Global.fMoveLight >= 0) + Global.fMoveLight = t; // trzeba by deklinację Słońca przeliczyć + simulation::Time.data().wHour = static_cast(std::floor(24 * t) - 24.0 * simulation::Time.data().wDay); + simulation::Time.data().wMinute = static_cast(std::floor(60 * 24 * t) - 60.0 * (24.0 * simulation::Time.data().wDay + simulation::Time.data().wHour)); + simulation::Time.data().wSecond = static_cast(std::floor( 60 * 60 * 24 * t ) - 60.0 * ( 60.0 * ( 24.0 * simulation::Time.data().wDay + simulation::Time.data().wHour ) + simulation::Time.data().wMinute )); + } + if (pRozkaz->iPar[0] & 2) { // ustawienie flag zapauzowania - Global.iPause = pRozkaz->fPar[2]; // zakładamy, że wysyłający wie, co robi + Global.iPause = static_cast(pRozkaz->fPar[2]); // zakładamy, że wysyłający wie, co robi } } break; @@ -138,7 +136,7 @@ OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) + " rcvd" ); if (pRozkaz->cString[0]) { // jeśli długość nazwy jest niezerowa szukamy pierwszego pojazdu o takiej nazwie i odsyłamy parametry ramką #7 - auto *vehicle = pRozkaz->cString[1] == '*' ? simulation::Train->Dynamic() : simulation::Vehicles.find(std::string{pRozkaz->cString + 1, (unsigned)pRozkaz->cString[0]}); + auto const *vehicle = pRozkaz->cString[1] == '*' ? simulation::Train->Dynamic() : simulation::Vehicles.find(std::string{pRozkaz->cString + 1, (unsigned)pRozkaz->cString[0]}); if( vehicle != nullptr ) { WyslijNamiary( vehicle ); // wysłanie informacji o pojeździe } @@ -189,7 +187,7 @@ OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) d->Damage( pRozkaz->cString[ 0 ] ); d = d->Prev(); // w drugą stronę też } - WyslijUszkodzenia( lookup->asName, lookup->MoverParameters->EngDmgFlag ); // zwrot informacji o pojeździe + WyslijUszkodzenia( lookup->asName, static_cast(lookup->MoverParameters->EngDmgFlag) ); // zwrot informacji o pojeździe } break; default: @@ -198,7 +196,7 @@ OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) } void -WyslijEvent(const std::string &e, const std::string &d) +WyslijEvent([[maybe_unused]] const std::string &e, [[maybe_unused]] const std::string &d) { // Ra: jeszcze do wyczyszczenia #ifdef _WIN32 DaneRozkaz r; @@ -219,7 +217,7 @@ WyslijEvent(const std::string &e, const std::string &d) } void -WyslijUszkodzenia(const std::string &t, char fl) +WyslijUszkodzenia([[maybe_unused]] const std::string &t, [[maybe_unused]] char fl) { // wysłanie informacji w postaci pojedynczego tekstu #ifdef _WIN32 DaneRozkaz r; @@ -239,7 +237,7 @@ WyslijUszkodzenia(const std::string &t, char fl) } void -WyslijString(const std::string &t, int n) +WyslijString([[maybe_unused]] const std::string &t, [[maybe_unused]] int n) { // wysłanie informacji w postaci pojedynczego tekstu #ifdef _WIN32 DaneRozkaz r; @@ -264,7 +262,7 @@ WyslijWolny(const std::string &t) } void -WyslijNamiary(TDynamicObject const *Vehicle) +WyslijNamiary([[maybe_unused]] TDynamicObject const *Vehicle) { // wysłanie informacji o pojeździe - (float), długość ramki będzie zwiększana w miarę potrzeby #ifdef _WIN32 DaneRozkaz r; @@ -395,7 +393,7 @@ WyslijObsadzone() } void -WyslijParam(int nr, int fl) +WyslijParam([[maybe_unused]] int nr, [[maybe_unused]] int fl) { // wysłanie parametrów symulacji w ramce (nr) z flagami (fl) #ifdef _WIN32 DaneRozkaz r; diff --git a/input/messaging.h b/input/messaging.h index f3592b27c..40434db2c 100644 --- a/input/messaging.h +++ b/input/messaging.h @@ -38,7 +38,7 @@ struct DaneRozkaz2 { // struktura komunikacji z EU07.EXE void Navigate( std::string const &ClassName, UINT Msg, WPARAM wParam, LPARAM lParam ); -void OnCommandGet( multiplayer::DaneRozkaz *pRozkaz ); +void OnCommandGet( multiplayer::DaneRozkaz const *pRozkaz ); void WyslijEvent( const std::string &e, const std::string &d ); void WyslijString( const std::string &t, int n ); diff --git a/launcher/deferred_image.h b/launcher/deferred_image.h index 855822640..58850fb03 100644 --- a/launcher/deferred_image.h +++ b/launcher/deferred_image.h @@ -11,11 +11,11 @@ public: static constexpr GLuint invalid_id { std::numeric_limits::max() }; deferred_image() = default; - deferred_image(const std::string &p) : path(p) { } + explicit deferred_image(const std::string &p) : path(p) { } deferred_image(const deferred_image&) = delete; deferred_image(deferred_image&&) = default; deferred_image &operator=(deferred_image&&) = default; - operator bool() const + explicit operator bool() const { return image != null_handle || !path.empty(); } @@ -33,7 +33,7 @@ public: tex.create(); if (tex.get_is_ready()) - return tex.get_id(); + return static_cast(tex.get_id()); } return invalid_id; @@ -42,7 +42,7 @@ public: glm::ivec2 size() const { if (image != null_handle) { - auto &tex = GfxRenderer->Texture(image); + auto const &tex = GfxRenderer->Texture(image); return glm::ivec2(tex.get_width(), tex.get_height()); } return glm::ivec2(); diff --git a/launcher/launchermode.cpp b/launcher/launchermode.cpp index 08c4c101f..5059fa379 100644 --- a/launcher/launchermode.cpp +++ b/launcher/launchermode.cpp @@ -29,7 +29,7 @@ void launcher_mode::enter() void launcher_mode::exit() { - + // nothing to do } void launcher_mode::on_key(const int Key, const int Scancode, const int Action, const int Mods) diff --git a/launcher/launchermode.h b/launcher/launchermode.h index 53a65f4dc..0a9475e39 100644 --- a/launcher/launchermode.h +++ b/launcher/launchermode.h @@ -27,10 +27,10 @@ public: void exit() override; // input handlers void on_key( int Key, int Scancode, int Action, int Mods ) override; - void on_cursor_pos( double const Horizontal, double const Vertical ) override { ; } - void on_mouse_button( int const Button, int const Action, int const Mods ) override { ; } - void on_scroll( double const Xoffset, double const Yoffset ) override { ; } + void on_cursor_pos( double const Horizontal, double const Vertical ) override { /* not handled by the launcher */ } + void on_mouse_button( int const Button, int const Action, int const Mods ) override { /* not handled by the launcher */ } + void on_scroll( double const Xoffset, double const Yoffset ) override { /* not handled by the launcher */ } void on_window_resize( int w, int h ) override; - void on_event_poll() override { ; } + void on_event_poll() override { /* not handled by the launcher */ } bool is_command_processor() const override { return false; } }; diff --git a/launcher/textures_scanner.cpp b/launcher/textures_scanner.cpp index 201ff9671..524a23ca6 100644 --- a/launcher/textures_scanner.cpp +++ b/launcher/textures_scanner.cpp @@ -47,7 +47,7 @@ void ui::vehicles_bank::parse_entry(const std::string &line) if (line[0] == '!') parse_category_entry(param); - else if (line[0] == '*' && line[1] == '*') + else if (line.starts_with("**")) parse_texture_rule(target.substr(2), param); else if (line[0] == '*') parse_coupling_rule(target.substr(1), param); @@ -60,23 +60,24 @@ void ui::vehicles_bank::parse_entry(const std::string &line) void ui::vehicles_bank::parse_category_entry(const std::string ¶m) { + using enum ui::vehicle_type; static std::unordered_map type_map = { - { 'e', vehicle_type::electric_loco }, - { 's', vehicle_type::diesel_loco }, - { 'p', vehicle_type::steam_loco }, - { 'a', vehicle_type::railcar }, - { 'z', vehicle_type::emu }, - { 'r', vehicle_type::utility }, - { 'd', vehicle_type::draisine }, - { 't', vehicle_type::tram }, - { 'c', vehicle_type::truck }, - { 'b', vehicle_type::bus }, - { 'o', vehicle_type::car }, - { 'h', vehicle_type::man }, - { 'f', vehicle_type::animal }, + { 'e', electric_loco }, + { 's', diesel_loco }, + { 'p', steam_loco }, + { 'a', railcar }, + { 'z', emu }, + { 'r', utility }, + { 'd', draisine }, + { 't', tram }, + { 'c', truck }, + { 'b', bus }, + { 'o', car }, + { 'h', man }, + { 'f', animal }, }; - ctx_type = vehicle_type::unknown; + ctx_type = unknown; std::istringstream stream(param); @@ -86,16 +87,15 @@ void ui::vehicles_bank::parse_category_entry(const std::string ¶m) if (tok.size() < 1) return; - auto it = type_map.find(tok[0]); - if (it != type_map.end()) + if (auto it = type_map.find(tok[0]); it != type_map.end()) ctx_type = it->second; else if (tok[0] >= 'A' && tok[0] <= 'Z') - ctx_type = vehicle_type::carriage; + ctx_type = carriage; std::string mini; std::getline(stream, mini, ','); - category_icons.emplace(ctx_type, "textures/mini/" + ToLower(mini) + ".bmp"); + category_icons.try_emplace(ctx_type, "textures/mini/" + ToLower(mini) + ".bmp"); } void ui::vehicles_bank::parse_controllable_entry(const std::string &target, const std::string ¶m) @@ -108,7 +108,9 @@ void ui::vehicles_bank::parse_texture_info(const std::string &target, const std: { std::istringstream stream(param); - std::string model, mini, miniplus; + std::string model; + std::string mini; + std::string miniplus; std::getline(stream, model, ','); std::getline(stream, mini, ','); @@ -122,12 +124,12 @@ void ui::vehicles_bank::parse_texture_info(const std::string &target, const std: set.meta = meta; if (!mini.empty()) - group_icons.emplace(mini, std::move(deferred_image("textures/mini/" + ToLower(mini) + ".bmp"))); + group_icons.try_emplace(mini, deferred_image("textures/mini/" + ToLower(mini) + ".bmp")); if (!miniplus.empty()) - set.mini = std::move(deferred_image("textures/mini/" + ToLower(miniplus) + ".bmp")); + set.mini = deferred_image("textures/mini/" + ToLower(miniplus) + ".bmp"); else if (!mini.empty()) - set.mini = std::move(deferred_image("textures/mini/" + ToLower(mini) + ".bmp")); + set.mini = deferred_image("textures/mini/" + ToLower(mini) + ".bmp"); set.skin = ToLower(target); erase_extension(set.skin); @@ -143,7 +145,7 @@ void ui::vehicles_bank::parse_texture_info(const std::string &target, const std: vehicle->matching_skinsets.push_back(std::make_shared(std::move(set))); } -std::shared_ptr ui::vehicles_bank::parse_meta(const std::string &str) +std::shared_ptr ui::vehicles_bank::parse_meta(const std::string &str) const { std::istringstream stream(str); @@ -171,19 +173,20 @@ std::shared_ptr ui::vehicles_bank::parse_meta(const std::string & ToLower("n:" + meta->name + ":i:" + meta->short_id + ":d:" + meta->location + ":r:" + meta->rev_date + ":c:" + meta->rev_company + ":t:" + meta->texture_author + ":p:" + meta->photo_author); - std::replace(std::begin(meta->location), std::end(meta->location), '_', ' '); - std::replace(std::begin(meta->rev_company), std::end(meta->rev_company), '_', ' '); - std::replace(std::begin(meta->texture_author), std::end(meta->texture_author), '_', ' '); - std::replace(std::begin(meta->photo_author), std::end(meta->photo_author), '_', ' '); + std::ranges::replace(meta->location, '_', ' '); + std::ranges::replace(meta->rev_company, '_', ' '); + std::ranges::replace(meta->texture_author, '_', ' '); + std::ranges::replace(meta->photo_author, '_', ' '); if (!meta->rev_date.empty() && meta->rev_date != "?") { - std::istringstream stream(meta->rev_date); - std::string day, month; + std::istringstream datestream(meta->rev_date); + std::string day; + std::string month; - std::getline(stream, day, '.'); - std::getline(stream, month, '.'); + std::getline(datestream, day, '.'); + std::getline(datestream, month, '.'); - stream >> meta->rev_year; + datestream >> meta->rev_year; } return meta; @@ -205,7 +208,8 @@ void ui::vehicles_bank::parse_coupling_rule(const std::string &target, const std std::string connected; std::getline(stream, connected, ','); - std::string param1, param2; + std::string param1; + std::string param2; std::getline(stream, param1, ','); std::getline(stream, param2, ','); @@ -232,7 +236,8 @@ void ui::vehicles_bank::parse_texture_rule(const std::string &target, const std: std::istringstream rule_stream(replace_rule); - std::string src, dst; + std::string src; + std::string dst; std::getline(rule_stream, src, '-'); std::getline(rule_stream, dst, '-'); @@ -257,7 +262,7 @@ std::shared_ptr ui::vehicles_bank::get_vehicle(const std::stri auto desc = std::make_shared(); desc->type = ctx_type; desc->path = path; - vehicles.emplace(path, desc); + vehicles.try_emplace(path, desc); return desc; } } diff --git a/launcher/textures_scanner.h b/launcher/textures_scanner.h index affa0b946..5f4cb0847 100644 --- a/launcher/textures_scanner.h +++ b/launcher/textures_scanner.h @@ -87,7 +87,7 @@ private: void parse_texture_rule(const std::string &target, const std::string ¶m); void parse_texture_info(const std::string &target, const std::string ¶m, std::shared_ptr meta); - std::shared_ptr parse_meta(const std::string &str); + std::shared_ptr parse_meta(const std::string &str) const; std::shared_ptr get_vehicle(const std::string &name); vehicle_type ctx_type = vehicle_type::unknown; diff --git a/model/MdlMngr.cpp b/model/MdlMngr.cpp index 9ead97163..680f67c42 100644 --- a/model/MdlMngr.cpp +++ b/model/MdlMngr.cpp @@ -47,11 +47,11 @@ TModelsManager::LoadModel(std::string const &Name, std::string const &virtualNam m_models.emplace_back(); auto model = m_models.back().LoadModel( Name, dynamic ); if( model != nullptr ) { - m_modelsmap.emplace( virtualName, m_models.size() - 1 ); + m_modelsmap.try_emplace( virtualName, m_models.size() - 1 ); } else { m_models.pop_back(); - m_modelsmap.emplace( virtualName, null_handle ); + m_modelsmap.try_emplace( virtualName, null_handle ); } return model; } @@ -95,17 +95,16 @@ TModelsManager::GetModel(std::string const &Name, bool const Dynamic, bool const postfix = "^^" + std::to_string(uid); // see if we have it in the databank - auto banklookup { find_in_databank( filename + postfix ) }; - TModel3d *model { banklookup.second }; - if( true == banklookup.first ) { + auto [banklookupfound, banklookupmodel]{ find_in_databank( filename + postfix ) }; + TModel3d *model { banklookupmodel }; + if( true == banklookupfound ) { Global.asCurrentTexturePath = buftp; return model; } // first load attempt, check if it's on disk - std::string disklookup { find_on_disk( filename ) }; - if( false == disklookup.empty() ) { + if( std::string disklookup { find_on_disk( filename ) }; false == disklookup.empty() ) { model = LoadModel( disklookup, disklookup + postfix, Dynamic ); // model nie znaleziony, to wczytać } else { @@ -114,7 +113,7 @@ TModelsManager::GetModel(std::string const &Name, bool const Dynamic, bool const ErrorLog( "Bad file: failed to locate 3d model file \"" + filename + "\"", logtype::file ); } // ...and link it with the error model slot - m_modelsmap.emplace( filename + postfix, null_handle ); + m_modelsmap.try_emplace( filename + postfix, null_handle ); } Global.asCurrentTexturePath = buftp; // odtworzenie ścieżki do tekstur return model; // NULL jeśli błąd diff --git a/model/MdlMngr.h b/model/MdlMngr.h index 94baf3d4e..fb255f2ef 100644 --- a/model/MdlMngr.h +++ b/model/MdlMngr.h @@ -12,7 +12,6 @@ http://mozilla.org/MPL/2.0/. class TMdlContainer { friend class TModelsManager; -private: TModel3d *LoadModel( std::string const &Name, bool const Dynamic ); std::shared_ptr Model { nullptr }; std::string m_name; @@ -26,8 +25,8 @@ public: private: // types: - typedef std::deque modelcontainer_sequence; - typedef std::unordered_map stringmodelcontainerindex_map; + using modelcontainer_sequence = std::deque; + using stringmodelcontainerindex_map = std::unordered_map; // members: static modelcontainer_sequence m_models; static stringmodelcontainerindex_map m_modelsmap; diff --git a/model/vertex.h b/model/vertex.h index 4c2ff2adc..3bcc7bd51 100644 --- a/model/vertex.h +++ b/model/vertex.h @@ -19,7 +19,7 @@ struct world_vertex { static world_vertex lerp(world_vertex const &a, world_vertex const &b, double factor) { - return static_cast(a * (1.0f - factor) + b * factor); + return a * (1.0f - factor) + b * factor; } // overloads diff --git a/network/backend/asio.cpp b/network/backend/asio.cpp index c2d1364d8..f0400518f 100644 --- a/network/backend/asio.cpp +++ b/network/backend/asio.cpp @@ -37,8 +37,7 @@ void network::tcp::connection::connected() void network::tcp::connection::read_header() { asio::async_read(m_socket, asio::buffer(m_header_buffer), - std::bind(&connection::handle_header, this, - std::placeholders::_1, std::placeholders::_2)); + std::bind_front(&connection::handle_header, this)); } void network::tcp::connection::handle_header(const asio::error_code &err, size_t bytes_transferred) @@ -54,8 +53,7 @@ void network::tcp::connection::handle_header(const asio::error_code &err, size_t return; } - uint32_t sig = sn_utils::ld_uint32(header); - if (sig != NETWORK_MAGIC) { + if (uint32_t sig = sn_utils::ld_uint32(header); sig != NETWORK_MAGIC) { disconnect(); return; } @@ -68,7 +66,7 @@ void network::tcp::connection::handle_header(const asio::error_code &err, size_t } asio::async_read(m_socket, asio::buffer(m_body_buffer), - std::bind(&connection::handle_data, this, std::placeholders::_1, std::placeholders::_2)); + std::bind_front(&connection::handle_data, this)); } void network::tcp::connection::handle_data(const asio::error_code &err, size_t bytes_transferred) @@ -91,9 +89,9 @@ void network::tcp::connection::handle_data(const asio::error_code &err, size_t b read_header(); } -void network::tcp::connection::write_message(const message &msg, std::ostream &stream) +void network::tcp::connection::write_message(const message &msg, std::ostream &stream) const { - size_t beg = (size_t)stream.tellp(); + auto beg = (size_t)stream.tellp(); sn_utils::ls_uint32(stream, NETWORK_MAGIC); sn_utils::ls_uint32(stream, 0); @@ -106,14 +104,14 @@ void network::tcp::connection::write_message(const message &msg, std::ostream &s return; } stream.seekp(beg + 4, std::ios_base::beg); - sn_utils::ls_uint32(stream, size); + sn_utils::ls_uint32(stream, static_cast(size)); stream.seekp(0, std::ios_base::end); } void network::tcp::connection::send_messages(const std::vector > &messages) { - if (messages.size() == 0) + if (messages.empty()) return; std::ostringstream stream; @@ -138,7 +136,7 @@ void network::tcp::connection::send_message(const message &msg) network::tcp::server::server(std::shared_ptr buf, asio::io_context &io_ctx, const std::string &host, uint32_t port) : network::server(buf), m_acceptor(io_ctx), m_io_ctx(io_ctx) { - auto endpoint = asio::ip::tcp::endpoint(asio::ip::make_address(host), port); + auto endpoint = asio::ip::tcp::endpoint(asio::ip::make_address(host), static_cast(port)); m_acceptor.open(endpoint.protocol()); m_acceptor.set_option(asio::socket_base::reuse_address(true)); m_acceptor.set_option(asio::ip::tcp::no_delay(true)); @@ -150,10 +148,10 @@ network::tcp::server::server(std::shared_ptr buf, asio::io_context void network::tcp::server::accept_conn() { - std::shared_ptr conn = std::make_shared(m_io_ctx); - conn->set_handler(std::bind(&server::handle_message, this, conn, std::placeholders::_1)); + auto conn = std::make_shared(m_io_ctx); + conn->set_handler(std::bind_front(&server::handle_message, this, conn)); - m_acceptor.async_accept(conn->m_socket, std::bind(&server::handle_accept, this, conn, std::placeholders::_1)); + m_acceptor.async_accept(conn->m_socket, std::bind_front(&server::handle_accept, this, conn)); } void network::tcp::server::handle_accept(std::shared_ptr conn, const asio::error_code &err) @@ -175,7 +173,7 @@ void network::tcp::server::handle_accept(std::shared_ptr conn, const // ------------------ network::tcp::client::client(asio::io_context &io_ctxx, const std::string &hostarg, uint32_t portarg) - : host(hostarg), port(portarg), io_ctx(io_ctxx) + : io_ctx(io_ctxx), host(hostarg), port(portarg) { } @@ -184,21 +182,21 @@ void network::tcp::client::connect() if (this->conn) return; - std::shared_ptr conn = std::make_shared(io_ctx, true, resume_frame_counter); - conn->set_handler(std::bind(&client::handle_message, this, conn, std::placeholders::_1)); + auto newconnection = std::make_shared(io_ctx, true, resume_frame_counter); + newconnection->set_handler(std::bind_front(&client::handle_message, this, newconnection)); asio::ip::tcp::endpoint endpoint( - asio::ip::make_address(host), port); - conn->m_socket.open(endpoint.protocol()); - conn->m_socket.set_option(asio::ip::tcp::no_delay(true)); - conn->m_socket.async_connect(endpoint, - std::bind(&client::handle_accept, this, std::placeholders::_1)); + asio::ip::make_address(host), static_cast(port)); + newconnection->m_socket.open(endpoint.protocol()); + newconnection->m_socket.set_option(asio::ip::tcp::no_delay(true)); + newconnection->m_socket.async_connect(endpoint, + std::bind_front(&client::handle_accept, this)); - this->conn = conn; + this->conn = newconnection; } -void network::tcp::client::handle_accept(const asio::error_code &err) +void network::tcp::client::handle_accept(const asio::error_code &err) const { if (!err) { @@ -212,7 +210,7 @@ void network::tcp::client::handle_accept(const asio::error_code &err) } network::tcp::asio_manager::asio_manager() { - backend_list().emplace("tcp", this); + backend_list().try_emplace("tcp", this); } std::shared_ptr network::tcp::asio_manager::create_server(std::shared_ptr backbuffer, const std::string &conf) { diff --git a/network/backend/asio.h b/network/backend/asio.h index 47e731c71..2bc4fc6b3 100644 --- a/network/backend/asio.h +++ b/network/backend/asio.h @@ -18,13 +18,13 @@ namespace network::tcp friend class client; public: - connection(asio::io_context &io_ctx, bool client = false, size_t counter = 0); + explicit connection(asio::io_context &io_ctx, bool client = false, size_t counter = 0); ~connection(); - virtual void connected() override; - virtual void disconnect() override; - virtual void send_messages(const std::vector > &messages) override; - virtual void send_message(const message &msg) override; + void connected() override; + void disconnect() override; + void send_messages(const std::vector > &messages) override; + void send_message(const message &msg) override; asio::ip::tcp::socket m_socket; @@ -32,7 +32,7 @@ namespace network::tcp std::string m_header_buffer; std::string m_body_buffer; - void write_message(const message &msg, std::ostream &stream); + void write_message(const message &msg, std::ostream &stream) const; void send_data(std::shared_ptr buffer); void read_header(); void handle_header(const asio::error_code &err, size_t bytes_transferred); @@ -55,13 +55,13 @@ namespace network::tcp class client : public network::client { private: - void handle_accept(const asio::error_code &err); + void handle_accept(const asio::error_code &err) const; asio::io_context &io_ctx; std::string host; uint32_t port; protected: - virtual void connect() override; + void connect() override; public: client(asio::io_context &io_ctx, const std::string &host, uint32_t port); @@ -73,9 +73,9 @@ namespace network::tcp public: asio_manager(); - virtual std::shared_ptr create_server(std::shared_ptr, const std::string &conf) override; - virtual std::shared_ptr create_client(const std::string &conf) override; - virtual void update() override; + std::shared_ptr create_server(std::shared_ptr, const std::string &conf) override; + std::shared_ptr create_client(const std::string &conf) override; + void update() override; }; asio_manager manager; diff --git a/network/manager.cpp b/network/manager.cpp index 37d724014..932f9b083 100644 --- a/network/manager.cpp +++ b/network/manager.cpp @@ -17,7 +17,7 @@ network::server_manager::server_manager() backbuffer = std::make_shared("backbuffer.bin", std::ios::out | std::ios::in | std::ios::trunc | std::ios::binary); } -command_queue::commands_map network::server_manager::pop_commands() +command_queue::commands_map network::server_manager::pop_commands() const { command_queue::commands_map map; @@ -27,7 +27,7 @@ command_queue::commands_map network::server_manager::pop_commands() return map; } -void network::server_manager::push_delta(double render_dt, double dt, double sync, const command_queue::commands_map &commands) +void network::server_manager::push_delta(double render_dt, double dt, double sync, const command_queue::commands_map &commands) const { if (dt == 0.0 && commands.empty()) return; @@ -55,14 +55,12 @@ void network::server_manager::create_server(const std::string &backend, const st servers.emplace_back(it->second->create_server(backbuffer, conf)); } -network::manager::manager() -{ -} +network::manager::manager() = default; void network::manager::update() { - for (auto &backend : backend_list()) - backend.second->update(); + for (auto const &[backendname, backendinstance] : backend_list()) + backendinstance->update(); if (client) client->update(); diff --git a/network/manager.h b/network/manager.h index 572a8c6b3..85f39d6c0 100644 --- a/network/manager.h +++ b/network/manager.h @@ -14,8 +14,8 @@ namespace network public: server_manager(); - void push_delta(double render_dt, double dt, double sync, const command_queue::commands_map &commands); - command_queue::commands_map pop_commands(); + void push_delta(double render_dt, double dt, double sync, const command_queue::commands_map &commands) const; + command_queue::commands_map pop_commands() const; void create_server(const std::string &backend, const std::string &conf); }; diff --git a/network/message.cpp b/network/message.cpp index 126099051..a87269cd8 100644 --- a/network/message.cpp +++ b/network/message.cpp @@ -32,12 +32,12 @@ void network::server_hello::deserialize(std::istream &stream) void ::network::request_command::serialize(std::ostream &stream) const { - sn_utils::ls_uint32(stream, commands.size()); - for (auto const &kv : commands) + sn_utils::ls_uint32(stream, static_cast(commands.size())); + for (auto const &[recipient, sequence] : commands) { - sn_utils::ls_uint32(stream, kv.first); - sn_utils::ls_uint32(stream, kv.second.size()); - for (command_data const &data : kv.second) + sn_utils::ls_uint32(stream, recipient); + sn_utils::ls_uint32(stream, static_cast(sequence.size())); + for (command_data const &data : sequence) { sn_utils::ls_uint32(stream, (uint32_t)data.command); sn_utils::ls_int32(stream, data.action); @@ -62,7 +62,7 @@ void network::request_command::deserialize(std::istream &stream) uint32_t sequence_size = sn_utils::ld_uint32(stream); command_queue::commanddata_sequence sequence; - for (uint32_t i = 0; i < sequence_size; i++) + for (uint32_t j = 0; j < sequence_size; j++) { command_data data; data.command = (user_command)sn_utils::ld_uint32(stream); @@ -79,7 +79,7 @@ void network::request_command::deserialize(std::istream &stream) sequence.emplace_back(data); } - commands.emplace(recipient, sequence); + commands.try_emplace(recipient, sequence); } } @@ -103,7 +103,7 @@ void network::frame_info::deserialize(std::istream &stream) std::shared_ptr network::deserialize_message(std::istream &stream) { - message::type_e type = (message::type_e)sn_utils::ld_uint16(stream); + auto type = (message::type_e)sn_utils::ld_uint16(stream); std::shared_ptr msg; diff --git a/network/message.h b/network/message.h index 5aa07d78e..38a16c007 100644 --- a/network/message.h +++ b/network/message.h @@ -18,17 +18,18 @@ struct message type_e type; - message(type_e t) : type(t) {} - virtual void serialize(std::ostream &stream) const {} - virtual void deserialize(std::istream &stream) {} + explicit message(type_e t) : type(t) {} + virtual void serialize(std::ostream &stream) const { /* message carries no payload */ } + virtual void deserialize(std::istream &stream) { /* message carries no payload */ } + virtual ~message() = default; }; struct client_hello : public message { client_hello() : message(CLIENT_HELLO) {} - virtual void serialize(std::ostream &stream) const override; - virtual void deserialize(std::istream &stream) override; + void serialize(std::ostream &stream) const override; + void deserialize(std::istream &stream) override; int32_t version{0}; uint32_t start_packet{0}; @@ -43,19 +44,19 @@ struct server_hello : public message int64_t config{0}; std::string scenario; - virtual void serialize(std::ostream &stream) const override; - virtual void deserialize(std::istream &stream) override; + void serialize(std::ostream &stream) const override; + void deserialize(std::istream &stream) override; }; struct request_command : public message { - request_command(type_e type) : message(type) {} + using message::message; request_command() : message(REQUEST_COMMAND) {} command_queue::commands_map commands; - virtual void serialize(std::ostream &stream) const override; - virtual void deserialize(std::istream &stream) override; + void serialize(std::ostream &stream) const override; + void deserialize(std::istream &stream) override; }; struct frame_info : public request_command @@ -66,8 +67,8 @@ struct frame_info : public request_command double dt{0.0}; double sync{0.0}; - virtual void serialize(std::ostream &stream) const override; - virtual void deserialize(std::istream &stream) override; + void serialize(std::ostream &stream) const override; + void deserialize(std::istream &stream) override; }; std::shared_ptr deserialize_message(std::istream &stream); diff --git a/network/network.cpp b/network/network.cpp index ae83bf785..b5eeced42 100644 --- a/network/network.cpp +++ b/network/network.cpp @@ -30,9 +30,7 @@ void network::connection::set_handler(std::function hand message_handler = handler; } -network::connection::connection(bool client, size_t counter) { - packet_counter = counter; - is_client = client; +network::connection::connection(bool client, size_t counter) : is_client(client), packet_counter(counter) { state = AWAITING_HELLO; } @@ -43,7 +41,7 @@ void network::connection::connected() if (is_client) { client_hello msg; msg.version = EU07_NETWORK_VERSION; - msg.start_packet = packet_counter; + msg.start_packet = static_cast(packet_counter); send_message(msg); } } @@ -79,7 +77,7 @@ void network::connection::catch_up() send_messages(messages); } -void network::connection::send_complete(std::shared_ptr buf) +void network::connection::send_complete(std::shared_ptr /*buf*/) { if (!is_client && state == CATCHING_UP) { catch_up(); @@ -151,7 +149,7 @@ void network::server::handle_message(std::shared_ptr conn, const mes const auto& cmd = dynamic_cast(msg); for (auto const &kv : cmd.commands) - client_commands_queue.emplace(kv); + client_commands_queue.try_emplace(kv.first, kv.second); } } @@ -188,9 +186,9 @@ std::tuple network::client::get_nex } - float size = delta_queue.size() - consume_counter; + float size = static_cast(delta_queue.size()) - consume_counter; const auto& entry = delta_queue.front(); - float mult = entry.render_dt / std::chrono::duration_cast>(frame_time).count(); + auto mult = static_cast(entry.render_dt / std::chrono::duration_cast>(frame_time).count()); if (counter == 1 && size < MAX_BUFFER_SIZE * 2.0f) { last_target = last_target * TARGET_MIX + @@ -220,7 +218,7 @@ std::tuple network::client::get_nex } } -void network::client::send_commands(command_queue::commands_map commands) +void network::client::send_commands(command_queue::commands_map const &commands) const { if (!conn || conn->state == connection::DEAD || commands.empty()) return; @@ -232,17 +230,17 @@ void network::client::send_commands(command_queue::commands_map commands) conn->send_message(msg); } -void network::client::handle_message(std::shared_ptr conn, const message &msg) +void network::client::handle_message(std::shared_ptr Connection, const message &msg) { if (msg.type >= message::TYPE_MAX) { - conn->disconnect(); + Connection->disconnect(); return; } if (msg.type == message::SERVER_HELLO) { const auto& cmd = dynamic_cast(msg); - conn->state = connection::ACTIVE; + Connection->state = connection::ACTIVE; if (!Global.ready_to_load) { Global.random_seed = cmd.seed; @@ -253,14 +251,14 @@ void network::client::handle_message(std::shared_ptr conn, const mes Global.ready_to_load = true; } else if (Global.random_seed != cmd.seed) { ErrorLog("net: seed mismatch", logtype::net); - conn->disconnect(); + Connection->disconnect(); return; } WriteLog("net: accept received", logtype::net); } - if (conn->state != connection::ACTIVE) + if (Connection->state != connection::ACTIVE) return; if (msg.type == message::FRAME_INFO) { diff --git a/network/network.h b/network/network.h index 1ce802be7..e1d7ec577 100644 --- a/network/network.h +++ b/network/network.h @@ -35,7 +35,7 @@ namespace network virtual void send_message(const message &msg) = 0; virtual void send_messages(const std::vector> &messages) = 0; - connection(bool client = false, size_t counter = 0); + explicit connection(bool client = false, size_t counter = 0); void set_handler(std::function handler); virtual void disconnect() = 0; @@ -47,6 +47,7 @@ namespace network DEAD }; peer_state state; + virtual ~connection() = default; }; class server @@ -62,7 +63,7 @@ namespace network command_queue::commands_map client_commands_queue; public: - server(std::shared_ptr buf); + explicit server(std::shared_ptr buf); void push_delta(const frame_info &msg); command_queue::commands_map pop_commands(); }; @@ -97,13 +98,14 @@ namespace network public: void update(); std::tuple get_next_delta(int counter); - void send_commands(command_queue::commands_map commands); - int get_frame_counter() { - return resume_frame_counter; + void send_commands(command_queue::commands_map const &commands) const; + int get_frame_counter() const { + return static_cast(resume_frame_counter); } - int get_awaiting_frames() { - return delta_queue.size(); + int get_awaiting_frames() const { + return static_cast(delta_queue.size()); } + virtual ~client() = default; }; class backend_manager @@ -112,6 +114,7 @@ namespace network virtual std::shared_ptr create_server(std::shared_ptr, const std::string &conf) = 0; virtual std::shared_ptr create_client(const std::string &conf) = 0; virtual void update() = 0; + virtual ~backend_manager() = default; }; // HACK: static initialization order fiasco fix diff --git a/rendering/flip-s3tc.h b/rendering/flip-s3tc.h index a529add43..ee05b73fd 100644 --- a/rendering/flip-s3tc.h +++ b/rendering/flip-s3tc.h @@ -14,39 +14,43 @@ namespace flip_s3tc struct dxt1_block { - uint16_t c0, c1; - uint8_t dcba, - hgfe, - lkji, - ponm; + uint16_t c0; + uint16_t c1; + uint8_t dcba; + uint8_t hgfe; + uint8_t lkji; + uint8_t ponm; }; struct dxt23_block { - uint16_t adacabaa, - ahagafae, - alakajai, - apaoanam; - uint16_t c0, c1; - uint8_t dcba, - hgfe, - lkji, - ponm; + uint16_t adacabaa; + uint16_t ahagafae; + uint16_t alakajai; + uint16_t apaoanam; + uint16_t c0; + uint16_t c1; + uint8_t dcba; + uint8_t hgfe; + uint8_t lkji; + uint8_t ponm; }; struct dxt45_block { - uint8_t a0, a1; + uint8_t a0; + uint8_t a1; struct { uint8_t alpha[3]; } ahagafaeadacabaa, apaoanamalakajai; - uint16_t c0, c1; - uint8_t dcba, - hgfe, - lkji, - ponm; + uint16_t c0; + uint16_t c1; + uint8_t dcba; + uint8_t hgfe; + uint8_t lkji; + uint8_t ponm; }; #pragma pack(pop) @@ -123,16 +127,16 @@ void flip_dxt45_block(struct dxt45_block *block) */ void flip_dxt1_image(void *data, int width, int height) { - int x, y; - struct dxt1_block temp1, temp2; - struct dxt1_block *blocks = (struct dxt1_block *)data; + struct dxt1_block temp1; + struct dxt1_block temp2; + auto blocks = (struct dxt1_block *)data; width = (width + 3) / 4; height = (height + 3) / 4; - for (y = 0; y < height / 2; ++y) + for (int y = 0; y < height / 2; ++y) { - for (x = 0; x < width; ++x) + for (int x = 0; x < width; ++x) { temp1 = blocks[y * width + x]; temp2 = blocks[(height - y - 1) * width + x]; @@ -152,16 +156,16 @@ void flip_dxt1_image(void *data, int width, int height) */ void flip_dxt23_image(void *data, int width, int height) { - int x, y; - struct dxt23_block temp1, temp2; - struct dxt23_block *blocks = (struct dxt23_block *)data; + struct dxt23_block temp1; + struct dxt23_block temp2; + auto blocks = (struct dxt23_block *)data; width = (width + 3) / 4; height = (height + 3) / 4; - for (y = 0; y < height / 2; ++y) + for (int y = 0; y < height / 2; ++y) { - for (x = 0; x < width; ++x) + for (int x = 0; x < width; ++x) { temp1 = blocks[y * width + x]; temp2 = blocks[(height - y - 1) * width + x]; @@ -181,16 +185,16 @@ void flip_dxt23_image(void *data, int width, int height) */ void flip_dxt45_image(void *data, int width, int height) { - int x, y; - struct dxt45_block temp1, temp2; - struct dxt45_block *blocks = (struct dxt45_block *)data; + struct dxt45_block temp1; + struct dxt45_block temp2; + auto blocks = (struct dxt45_block *)data; width = (width + 3) / 4; height = (height + 3) / 4; - for (y = 0; y < height / 2; ++y) + for (int y = 0; y < height / 2; ++y) { - for (x = 0; x < width; ++x) + for (int x = 0; x < width; ++x) { temp1 = blocks[y * width + x]; temp2 = blocks[(height - y - 1) * width + x]; diff --git a/rendering/frustum.cpp b/rendering/frustum.cpp index f46770657..68349a5fd 100644 --- a/rendering/frustum.cpp +++ b/rendering/frustum.cpp @@ -24,7 +24,7 @@ cFrustum::calculate( glm::mat4 const &Projection, glm::mat4 const &Modelview ) { // multiply the matrices to retrieve clipping planes (column-major, same layout as the old float[16] form) auto const clipmatrix { Projection * Modelview }; - float clip[ 16 ]; + std::array clip{}; for( int column = 0; column < 4; ++column ) { for( int row = 0; row < 4; ++row ) { clip[ column * 4 + row ] = clipmatrix[ column ][ row ]; @@ -73,16 +73,11 @@ bool cFrustum::point_inside( float const X, float const Y, float const Z ) const { // cycle through the sides of the frustum, checking if the point is behind them - for( int idx = 0; idx < 6; ++idx ) { - if( m_frustum[ idx ][ plane_A ] * X - + m_frustum[ idx ][ plane_B ] * Y - + m_frustum[ idx ][ plane_C ] * Z - + m_frustum[ idx ][ plane_D ] <= 0 ) - return false; - } - - // the point is in front of each frustum plane, i.e. inside of the frustum - return true; + return std::ranges::all_of( m_frustum, [&]( auto const &frustumplane ) { + return frustumplane[ plane_A ] * X + + frustumplane[ plane_B ] * Y + + frustumplane[ plane_C ] * Z + + frustumplane[ plane_D ] > 0; } ); } float @@ -90,12 +85,12 @@ cFrustum::sphere_inside( float const X, float const Y, float const Z, float cons float distance; // go through all the sides of the frustum. bail out as soon as possible - for( int idx = 0; idx < 6; ++idx ) { + for (auto &frustumplane : m_frustum) { distance = - m_frustum[ idx ][ plane_A ] * X - + m_frustum[ idx ][ plane_B ] * Y - + m_frustum[ idx ][ plane_C ] * Z - + m_frustum[ idx ][ plane_D ]; + frustumplane[ plane_A ] * X + + frustumplane[ plane_B ] * Y + + frustumplane[ plane_C ] * Z + + frustumplane[ plane_D ]; if( distance <= -Radius ) return 0.0f; } @@ -105,52 +100,50 @@ cFrustum::sphere_inside( float const X, float const Y, float const Z, float cons bool cFrustum::cube_inside( float const X, float const Y, float const Z, float const Size ) const { - for( int idx = 0; idx < 6; ++idx ) { - if( m_frustum[ idx ][ plane_A ] * ( X - Size ) - + m_frustum[ idx ][ plane_B ] * ( Y - Size ) - + m_frustum[ idx ][ plane_C ] * ( Z - Size ) - + m_frustum[ idx ][ plane_D ] > 0 ) - continue; - if( m_frustum[ idx ][ plane_A ] * ( X + Size ) - + m_frustum[ idx ][ plane_B ] * ( Y - Size ) - + m_frustum[ idx ][ plane_C ] * ( Z - Size ) - + m_frustum[ idx ][ plane_D ] > 0 ) - continue; - if( m_frustum[ idx ][ plane_A ] * ( X - Size ) - + m_frustum[ idx ][ plane_B ] * ( Y + Size ) - + m_frustum[ idx ][ plane_C ] * ( Z - Size ) - + m_frustum[ idx ][ plane_D ] > 0 ) - continue; - if( m_frustum[ idx ][ plane_A ] * ( X + Size ) - + m_frustum[ idx ][ plane_B ] * ( Y + Size ) - + m_frustum[ idx ][ plane_C ] * ( Z - Size ) - + m_frustum[ idx ][ plane_D ] > 0 ) - continue; - if( m_frustum[ idx ][ plane_A ] * ( X - Size ) - + m_frustum[ idx ][ plane_B ] * ( Y - Size ) - + m_frustum[ idx ][ plane_C ] * ( Z + Size ) - + m_frustum[ idx ][ plane_D ] > 0 ) - continue; - if( m_frustum[ idx ][ plane_A ] * ( X + Size ) - + m_frustum[ idx ][ plane_B ] * ( Y - Size ) - + m_frustum[ idx ][ plane_C ] * ( Z + Size ) - + m_frustum[ idx ][ plane_D ] > 0 ) - continue; - if( m_frustum[ idx ][ plane_A ] * ( X - Size ) - + m_frustum[ idx ][ plane_B ] * ( Y + Size ) - + m_frustum[ idx ][ plane_C ] * ( Z + Size ) - + m_frustum[ idx ][ plane_D ] > 0 ) - continue; - if( m_frustum[ idx ][ plane_A ] * ( X + Size ) - + m_frustum[ idx ][ plane_B ] * ( Y + Size ) - + m_frustum[ idx ][ plane_C ] * ( Z + Size ) - + m_frustum[ idx ][ plane_D ] > 0 ) - continue; + // the cube is inside unless all of its corners lie behind one of the frustum planes + return std::ranges::all_of( m_frustum, [&]( auto const &frustumplane ) { + if( frustumplane[ plane_A ] * ( X - Size ) + + frustumplane[ plane_B ] * ( Y - Size ) + + frustumplane[ plane_C ] * ( Z - Size ) + + frustumplane[ plane_D ] > 0 ) + return true; + if( frustumplane[ plane_A ] * ( X + Size ) + + frustumplane[ plane_B ] * ( Y - Size ) + + frustumplane[ plane_C ] * ( Z - Size ) + + frustumplane[ plane_D ] > 0 ) + return true; + if( frustumplane[ plane_A ] * ( X - Size ) + + frustumplane[ plane_B ] * ( Y + Size ) + + frustumplane[ plane_C ] * ( Z - Size ) + + frustumplane[ plane_D ] > 0 ) + return true; + if( frustumplane[ plane_A ] * ( X + Size ) + + frustumplane[ plane_B ] * ( Y + Size ) + + frustumplane[ plane_C ] * ( Z - Size ) + + frustumplane[ plane_D ] > 0 ) + return true; + if( frustumplane[ plane_A ] * ( X - Size ) + + frustumplane[ plane_B ] * ( Y - Size ) + + frustumplane[ plane_C ] * ( Z + Size ) + + frustumplane[ plane_D ] > 0 ) + return true; + if( frustumplane[ plane_A ] * ( X + Size ) + + frustumplane[ plane_B ] * ( Y - Size ) + + frustumplane[ plane_C ] * ( Z + Size ) + + frustumplane[ plane_D ] > 0 ) + return true; + if( frustumplane[ plane_A ] * ( X - Size ) + + frustumplane[ plane_B ] * ( Y + Size ) + + frustumplane[ plane_C ] * ( Z + Size ) + + frustumplane[ plane_D ] > 0 ) + return true; + if( frustumplane[ plane_A ] * ( X + Size ) + + frustumplane[ plane_B ] * ( Y + Size ) + + frustumplane[ plane_C ] * ( Z + Size ) + + frustumplane[ plane_D ] > 0 ) + return true; - return false; - } - - return true; + return false; } ); } void cFrustum::normalize_plane( cFrustum::side const Side ) { diff --git a/rendering/lightarray.cpp b/rendering/lightarray.cpp index 41bff1597..15020894b 100644 --- a/rendering/lightarray.cpp +++ b/rendering/lightarray.cpp @@ -29,12 +29,7 @@ light_array::insert( TDynamicObject const *Owner ) { void light_array::remove( TDynamicObject const *Owner ) { - data.erase( - std::remove_if( - data.begin(), - data.end(), - [=]( light_record const &light ){ return light.owner == Owner; } ), - data.end() ); + std::erase_if( data, [=]( light_record const &light ){ return light.owner == Owner; } ); } // updates records in the collection @@ -75,13 +70,13 @@ light_array::update() { light.intensity = std::max(0.0f, std::log((float)light.count + 1.0f)); if (light.owner->DimHeadlights && !light.owner->HighBeamLights && isEnabled) // tylko przyciemnione - light.intensity *= light.owner->MoverParameters->dimMultiplier; + light.intensity *= static_cast(light.owner->MoverParameters->dimMultiplier); else if (!light.owner->DimHeadlights && !light.owner->HighBeamLights && isEnabled) // normalne - light.intensity *= light.owner->MoverParameters->normMultiplier; + light.intensity *= static_cast(light.owner->MoverParameters->normMultiplier); else if (light.owner->DimHeadlights && light.owner->HighBeamLights && isEnabled) // przyciemnione dlugie - light.intensity *= light.owner->MoverParameters->highDimMultiplier; + light.intensity *= static_cast(light.owner->MoverParameters->highDimMultiplier); else if (!light.owner->DimHeadlights && light.owner->HighBeamLights && isEnabled) // dlugie zwykle - light.intensity *= light.owner->MoverParameters->highMultiplier; + light.intensity *= static_cast(light.owner->MoverParameters->highMultiplier); else if (!isEnabled) { light.intensity = 0.0f; diff --git a/rendering/lightarray.h b/rendering/lightarray.h index d7459fe92..a136dfbc0 100644 --- a/rendering/lightarray.h +++ b/rendering/lightarray.h @@ -36,7 +36,7 @@ public: update(); // types - typedef std::vector lightrecord_array; + using lightrecord_array = std::vector; // members lightrecord_array data; diff --git a/rendering/nullrenderer.cpp b/rendering/nullrenderer.cpp index a37eddb93..332d357c7 100644 --- a/rendering/nullrenderer.cpp +++ b/rendering/nullrenderer.cpp @@ -3,7 +3,7 @@ std::unique_ptr null_renderer::create_func() { - return std::unique_ptr(new null_renderer()); + return std::make_unique(); } bool null_renderer::renderer_register = gfx_renderer_factory::get_instance()->register_backend("null", null_renderer::create_func); diff --git a/rendering/nullrenderer.h b/rendering/nullrenderer.h index 69839f114..0b21580b9 100644 --- a/rendering/nullrenderer.h +++ b/rendering/nullrenderer.h @@ -17,22 +17,22 @@ public: // constructors: null_geometrybank() = default; // destructor - ~null_geometrybank() {}; + ~null_geometrybank() = default; private: // methods: // create() subclass details void - create_( gfx::geometry_handle const &Geometry ) override {} + create_( gfx::geometry_handle const &Geometry ) override { /* null implementation, nothing to do */ } // replace() subclass details void - replace_( gfx::geometry_handle const &Geometry ) override {} + replace_( gfx::geometry_handle const &Geometry ) override { /* null implementation, nothing to do */ } // draw() subclass details auto draw_( gfx::geometry_handle const &Geometry, gfx::stream_units const &Units, unsigned int const Streams ) -> std::size_t override { return 0; } // release() subclass details void - release_() override {} + release_() override { /* null implementation, nothing to do */ } }; // bare-bones render controller, in lack of anything better yet @@ -43,7 +43,7 @@ public: // constructors null_renderer() = default; // destructor - ~null_renderer() { } + ~null_renderer() = default; // methods bool Init( GLFWwindow *Window ) override { return true; } @@ -51,14 +51,14 @@ public: bool Render() override { return true; } void - SwapBuffers() override {} + SwapBuffers() override { /* null implementation, nothing to do */ } inline float Framerate() override { return 10.0f; } bool AddViewport(const global_settings::extraviewport_config &conf) override { return false; } bool Debug_Ui_State(std::optional) override { return false; } - void Shutdown() override {} + void Shutdown() override { /* null implementation, nothing to do */ } // geometry methods // NOTE: hands-on geometry management is exposed as a temporary measure; ultimately all visualization data should be generated/handled automatically by the renderer itself @@ -100,10 +100,10 @@ public: Fetch_Material( std::string const &Filename, bool const Loadnow = true ) override { m_materials.push_back(std::make_shared()); m_materials.back()->name = Filename; - return m_materials.size(); + return static_cast(m_materials.size()); } void - Bind_Material( material_handle const Material, TSubModel const *sm = nullptr, lighting_data const *lighting = nullptr ) override {} + Bind_Material( material_handle const Material, TSubModel const *sm = nullptr, lighting_data const *lighting = nullptr ) override { /* null implementation, nothing to do */ } IMaterial const * Material( material_handle const Material ) const override { return m_materials.at(Material - 1).get(); } // shader methods @@ -112,18 +112,18 @@ public: texture_handle Fetch_Texture( std::string const &Filename, bool const Loadnow = true, GLint format_hint = GL_SRGB_ALPHA ) override { throw std::runtime_error("not impl"); } void - Bind_Texture( texture_handle const Texture ) override {} + Bind_Texture( texture_handle const Texture ) override { /* null implementation, nothing to do */ } void - Bind_Texture( std::size_t const Unit, texture_handle const Texture ) override {} + Bind_Texture( std::size_t const Unit, texture_handle const Texture ) override { /* null implementation, nothing to do */ } opengl_texture & Texture( texture_handle const Texture ) override { throw std::runtime_error("not impl"); } opengl_texture const & Texture( texture_handle const Texture ) const override { throw std::runtime_error("not impl"); } // utility methods void - Pick_Control_Callback( std::function Callback ) override {} + Pick_Control_Callback( std::function Callback ) override { /* null implementation, nothing to do */ } void - Pick_Node_Callback( std::function Callback ) override {} + Pick_Node_Callback( std::function Callback ) override { /* null implementation, nothing to do */ } TSubModel const * Pick_Control() const override { return nullptr; } scene::basic_node const * @@ -132,11 +132,11 @@ public: Mouse_Position() const override { return glm::dvec3(); } // maintenance methods void - Update( double const Deltatime ) override {} + Update( double const Deltatime ) override { /* null implementation, nothing to do */ } void - Update_Pick_Control() override {} + Update_Pick_Control() override { /* null implementation, nothing to do */ } void - Update_Pick_Node() override {} + Update_Pick_Node() override { /* null implementation, nothing to do */ } glm::dvec3 Update_Mouse_Position() override { return glm::dvec3(); } // debug methods @@ -144,13 +144,13 @@ public: info_times() const override { return empty_str; } std::string const & info_stats() const override { return empty_str; } - void MakeScreenshot() override {} + void MakeScreenshot() override { /* null implementation, nothing to do */ } static std::unique_ptr create_func(); static bool renderer_register; - virtual imgui_renderer *GetImguiRenderer() + imgui_renderer *GetImguiRenderer() override { return nullptr; } diff --git a/rendering/opengl33light.cpp b/rendering/opengl33light.cpp index ea1baf781..dddb3236c 100644 --- a/rendering/opengl33light.cpp +++ b/rendering/opengl33light.cpp @@ -16,7 +16,7 @@ void opengl33_light::apply_intensity(float const Factor) { factor = Factor; } -void opengl33_light::apply_angle() {} +void opengl33_light::apply_angle() const { /* nothing to do */ } //--------------------------------------------------------------------------- diff --git a/rendering/opengl33light.h b/rendering/opengl33light.h index b87564aa6..b36bad978 100644 --- a/rendering/opengl33light.h +++ b/rendering/opengl33light.h @@ -18,7 +18,7 @@ struct opengl33_light : public basic_light { float factor; void apply_intensity(float const Factor = 1.0f); - void apply_angle(); + void apply_angle() const; opengl33_light &operator=(basic_light const &Right) { basic_light::operator=(Right); diff --git a/rendering/opengl33particles.cpp b/rendering/opengl33particles.cpp index b869012bb..8ff82b953 100644 --- a/rendering/opengl33particles.cpp +++ b/rendering/opengl33particles.cpp @@ -49,19 +49,19 @@ opengl33_particles::update( opengl_camera const &Camera ) { // build billboard data for particles from visible sources auto const camerarotation { glm::mat3( Camera.modelview() ) }; particle_vertex vertex; - for( auto const &source : sources ) { + for( auto const &[sourcekey, sourcedata] : sources ) { auto const particlecolor { glm::clamp( - source.second.color() + sourcedata.color() * ( glm::vec3 { Global.DayLight.ambient } + 0.35f * glm::vec3{ Global.DayLight.diffuse } ) * simulation::Environment.light_intensity(), glm::vec3{ 0.f }, glm::vec3{ 1.f } ) }; - auto const &particles { source.second.sequence() }; + auto const &particles { sourcedata.sequence() }; // TODO: put sanity cap on the overall amount of particles that can be drawn auto const sizestep { 256.0 * billboard_vertices.size() }; m_particlevertices.reserve( - sizestep * std::ceil( m_particlevertices.size() + ( particles.size() * billboard_vertices.size() ) / sizestep ) ); + static_cast( sizestep * std::ceil( static_cast(m_particlevertices.size()) + ( static_cast(particles.size() * billboard_vertices.size()) ) / sizestep ) ) ); for( auto const &particle : particles ) { // TODO: particle color support vertex.color[ 0 ] = particlecolor.r; @@ -72,9 +72,9 @@ opengl33_particles::update( opengl_camera const &Camera ) { auto const offset { glm::vec3{ particle.position - Camera.position() } }; auto const rotation { glm::angleAxis( particle.rotation, glm::vec3{ 0.f, 0.f, 1.f } ) }; - for( auto const &billboardvertex : billboard_vertices ) { - vertex.position = offset + ( rotation * billboardvertex.first * particle.size ) * camerarotation; - vertex.texture = billboardvertex.second; + for( auto const &[billboardoffset, billboardtexture] : billboard_vertices ) { + vertex.position = offset + ( rotation * billboardoffset * particle.size ) * camerarotation; + vertex.texture = billboardtexture; m_particlevertices.emplace_back( vertex ); } @@ -113,14 +113,14 @@ opengl33_particles::render() { m_vao->setup_attrib(*m_buffer, 1, 4, GL_FLOAT, sizeof(particle_vertex), 12); m_vao->setup_attrib(*m_buffer, 2, 2, GL_FLOAT, sizeof(particle_vertex), 28); - m_buffer->unbind(gl::buffer::ARRAY_BUFFER); - m_vao->unbind(); + gl::buffer::unbind(gl::buffer::ARRAY_BUFFER); + gl::vao::unbind(); } if (!m_shader) { gl::shader vert("smoke.vert"); gl::shader frag("smoke.frag"); - gl::program *prog = new gl::program({vert, frag}); + auto prog = new gl::program({vert, frag}); m_shader = std::unique_ptr(prog); } @@ -128,11 +128,11 @@ opengl33_particles::render() { m_shader->bind(); m_vao->bind(); - glDrawArrays(GL_TRIANGLES, 0, m_particlevertices.size()); + glDrawArrays(GL_TRIANGLES, 0, static_cast(m_particlevertices.size())); - m_shader->unbind(); - m_vao->unbind(); - m_buffer->unbind(gl::buffer::ARRAY_BUFFER); + gl::program::unbind(); + gl::vao::unbind(); + gl::buffer::unbind(gl::buffer::ARRAY_BUFFER); return m_particlevertices.size() / 6; } diff --git a/rendering/opengl33precipitation.cpp b/rendering/opengl33precipitation.cpp index e31eb25f3..308248b75 100644 --- a/rendering/opengl33precipitation.cpp +++ b/rendering/opengl33precipitation.cpp @@ -36,7 +36,7 @@ opengl33_precipitation::create( int const Tesselation ) { std::uint16_t index = 0; // auto const radius { 25.f }; // cylinder radius - std::vector radii { 25.f, 10.f, 5.f, 1.f }; + std::vector radii { 25.f, 10.f, 5.f, 1.f }; for( auto radius : radii ) { for( int i = 0; i <= latitudes; ++i ) { @@ -121,7 +121,7 @@ opengl33_precipitation::update() { m_indexbuffer->upload(gl::buffer::ELEMENT_ARRAY_BUFFER, m_indices.data(), 0, m_indices.size() * sizeof( unsigned short )); m_vao->setup_ebo(*m_indexbuffer); - m_vao->unbind(); + gl::vao::unbind(); // NOTE: vertex and index source data is superfluous past this point, but, eh } @@ -155,5 +155,5 @@ opengl33_precipitation::render() { ::glDrawElements( GL_TRIANGLES, static_cast( m_indices.size() ), GL_UNSIGNED_SHORT, reinterpret_cast( 0 ) ); - m_vao->unbind(); + gl::vao::unbind(); } diff --git a/rendering/opengl33skydome.cpp b/rendering/opengl33skydome.cpp index 35e1d8c04..cbceeed48 100644 --- a/rendering/opengl33skydome.cpp +++ b/rendering/opengl33skydome.cpp @@ -44,15 +44,13 @@ void opengl33_skydome::update() { m_indexbuffer->upload(gl::buffer::ELEMENT_ARRAY_BUFFER, skydome.indices().data(), 0, skydome.indices().size() * sizeof( unsigned short )); m_vao->setup_ebo(*m_indexbuffer); - m_vao->unbind(); + gl::vao::unbind(); } // ship the current dynamic data to the gpu - if( true == skydome.is_dirty() ) { - if( m_coloursbuffer ) { - // the colour buffer was already initialized, so on this run we update its content - m_coloursbuffer->upload( gl::buffer::ARRAY_BUFFER, skydome.colors().data(), 0, skydome.colors().size() * sizeof( glm::vec3 ) ); - skydome.is_dirty() = false; - } + if (true == skydome.is_dirty() && m_coloursbuffer) { + // the colour buffer was already initialized, so on this run we update its content + m_coloursbuffer->upload( gl::buffer::ARRAY_BUFFER, skydome.colors().data(), 0, skydome.colors().size() * sizeof( glm::vec3 ) ); + skydome.is_dirty() = false; } } diff --git a/rendering/opengl33skydome.h b/rendering/opengl33skydome.h index 425c276b2..287ac5116 100644 --- a/rendering/opengl33skydome.h +++ b/rendering/opengl33skydome.h @@ -19,7 +19,7 @@ public: // constructors opengl33_skydome() = default; // destructor - ~opengl33_skydome() {;} + ~opengl33_skydome() = default; // methods // updates data stores on the opengl end. NOTE: unbinds buffers void update(); diff --git a/rendering/openglcamera.cpp b/rendering/openglcamera.cpp index 97891e639..418a120d6 100644 --- a/rendering/openglcamera.cpp +++ b/rendering/openglcamera.cpp @@ -38,7 +38,7 @@ opengl_camera::visible( TDynamicObject const *Dynamic ) const { // sphere test is faster than AABB, so we'll use it here // we're giving vehicles some extra padding, to allow for things like shared bogeys extending past the main body - return ( m_frustum.sphere_inside( Dynamic->GetPosition(), Dynamic->radius() * 1.25 ) > 0.0f ); + return ( m_frustum.sphere_inside( Dynamic->GetPosition(), static_cast(Dynamic->radius() * 1.25) ) > 0.0f ); } // debug helper, draws shape of frustum in world space diff --git a/rendering/openglcamera.h b/rendering/openglcamera.h index 569a798c4..ad223cbdd 100644 --- a/rendering/openglcamera.h +++ b/rendering/openglcamera.h @@ -24,7 +24,7 @@ public: update_frustum() { update_frustum( m_projection, m_modelview ); } inline void - update_frustum(glm::mat4 frustumtest_proj) { + update_frustum(glm::mat4 const &frustumtest_proj) { update_frustum(frustumtest_proj, m_modelview); } void update_frustum( glm::mat4 const &Projection, glm::mat4 const &Modelview ); diff --git a/rendering/openglgeometrybank.cpp b/rendering/openglgeometrybank.cpp index ec950c0f2..d020bb56e 100644 --- a/rendering/openglgeometrybank.cpp +++ b/rendering/openglgeometrybank.cpp @@ -90,23 +90,23 @@ opengl_vbogeometrybank::draw_( gfx::geometry_handle const &Geometry, gfx::stream } ::glDrawRangeElementsBaseVertex( chunk.type, - 0, chunkrecord.vertex_count, - chunkrecord.index_count, GL_UNSIGNED_INT, reinterpret_cast( chunkrecord.index_offset * sizeof( gfx::basic_index ) ), - chunkrecord.vertex_offset ); + 0, static_cast(chunkrecord.vertex_count), + static_cast(chunkrecord.index_count), GL_UNSIGNED_INT, reinterpret_cast( chunkrecord.index_offset * sizeof( gfx::basic_index ) ), + static_cast(chunkrecord.vertex_offset) ); } else { bind_streams( Units, Streams, chunkrecord.vertex_offset ); ::glDrawRangeElements( chunk.type, - 0, chunkrecord.vertex_count, - chunkrecord.index_count, GL_UNSIGNED_INT, reinterpret_cast( chunkrecord.index_offset * sizeof( gfx::basic_index ) ) ); + 0, static_cast(chunkrecord.vertex_count), + static_cast(chunkrecord.index_count), GL_UNSIGNED_INT, reinterpret_cast( chunkrecord.index_offset * sizeof( gfx::basic_index ) ) ); } } else { if( m_activestreams != Streams ) { bind_streams( Units, Streams ); } - ::glDrawArrays( chunk.type, chunkrecord.vertex_offset, chunkrecord.vertex_count ); + ::glDrawArrays( chunk.type, static_cast(chunkrecord.vertex_offset), static_cast(chunkrecord.vertex_count) ); } // ...post-render cleanup /* @@ -139,9 +139,8 @@ opengl_vbogeometrybank::setup_buffer() { // may be better to initiate upload earlier (during update phase) and trust this effort won't go to waste if( true == m_chunks.empty() ) { return; } - std::size_t - vertexcount{ 0 }, - indexcount{ 0 }; + std::size_t vertexcount{ 0 }; + std::size_t indexcount{ 0 }; auto chunkiterator = m_chunks.cbegin(); for( auto &chunkrecord : m_chunkrecords ) { // fill records for all chunks, based on the chunk data @@ -195,7 +194,7 @@ opengl_vbogeometrybank::setup_buffer() { } void -opengl_vbogeometrybank::bind_buffer() { +opengl_vbogeometrybank::bind_buffer() const { ::glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, m_indexbuffer ); ::glBindBuffer( GL_ARRAY_BUFFER, m_vertexbuffer ); diff --git a/rendering/openglgeometrybank.h b/rendering/openglgeometrybank.h index ec6bdd898..7d260a82d 100644 --- a/rendering/openglgeometrybank.h +++ b/rendering/openglgeometrybank.h @@ -58,7 +58,7 @@ private: void setup_buffer(); void - bind_buffer(); + bind_buffer() const; void delete_buffer(); static @@ -87,7 +87,7 @@ public: opengl_dlgeometrybank() = default; // destructor: ~opengl_dlgeometrybank() { - for( auto &chunkrecord : m_chunkrecords ) { + for( auto const &chunkrecord : m_chunkrecords ) { ::glDeleteLists( chunkrecord.list, 1 ); } } private: diff --git a/rendering/openglmatrixstack.h b/rendering/openglmatrixstack.h index 9ba2fa41f..ea3be535d 100644 --- a/rendering/openglmatrixstack.h +++ b/rendering/openglmatrixstack.h @@ -90,7 +90,7 @@ private: }; enum stack_mode { gl_modelview = 0, gl_projection = 1, gl_texture = 2 }; -typedef std::vector openglstack_array; +using openglstack_array = std::vector; public: // constructors: diff --git a/rendering/openglparticles.cpp b/rendering/openglparticles.cpp index 54db2ddf7..3b8de9469 100644 --- a/rendering/openglparticles.cpp +++ b/rendering/openglparticles.cpp @@ -47,19 +47,19 @@ opengl_particles::update( opengl_camera const &Camera ) { // build billboard data for particles from visible sources auto const camerarotation { glm::mat3( Camera.modelview() ) }; particle_vertex vertex; - for( auto const &source : sources ) { + for( auto const &[sourcekey, sourcedata] : sources ) { auto const particlecolor { glm::clamp( - source.second.color() + sourcedata.color() * ( glm::vec3 { Global.DayLight.ambient } + 0.35f * glm::vec3{ Global.DayLight.diffuse } ) * 255.f, glm::vec3{ 0.f }, glm::vec3{ 255.f } ) }; - auto const &particles { source.second.sequence() }; + auto const &particles { sourcedata.sequence() }; // TODO: put sanity cap on the overall amount of particles that can be drawn auto const sizestep { 256.0 * billboard_vertices.size() }; m_particlevertices.reserve( - sizestep * std::ceil( m_particlevertices.size() + ( particles.size() * billboard_vertices.size() ) / sizestep ) ); + static_cast( sizestep * std::ceil( static_cast(m_particlevertices.size()) + ( static_cast(particles.size() * billboard_vertices.size()) ) / sizestep ) ) ); for( auto const &particle : particles ) { // TODO: particle color support vertex.color[ 0 ] = static_cast( particlecolor.r ); @@ -70,9 +70,9 @@ opengl_particles::update( opengl_camera const &Camera ) { auto const offset { glm::vec3{ particle.position - Camera.position() } }; auto const rotation { glm::angleAxis( particle.rotation, glm::vec3{ 0.f, 0.f, 1.f } ) }; - for( auto const &billboardvertex : billboard_vertices ) { - vertex.position = offset + ( rotation * billboardvertex.first * particle.size ) * camerarotation; - vertex.texture = billboardvertex.second; + for( auto const &[billboardoffset, billboardtexture] : billboard_vertices ) { + vertex.position = offset + ( rotation * billboardoffset * particle.size ) * camerarotation; + vertex.texture = billboardtexture; m_particlevertices.emplace_back( vertex ); } @@ -147,7 +147,7 @@ opengl_particles::render( GLint const Textureunit ) { ::glTexCoordPointer( 2, GL_FLOAT, sizeof( particle_vertex ), reinterpret_cast( sizeof( float ) * 3 + sizeof( std::uint8_t ) * 4 ) ); ::glEnableClientState( GL_TEXTURE_COORD_ARRAY ); // ...draw... - ::glDrawArrays( GL_QUADS, 0, m_particlevertices.size() ); + ::glDrawArrays( GL_QUADS, 0, static_cast(m_particlevertices.size()) ); // ...and cleanup ::glPopClientAttrib(); ::glBindBuffer( GL_ARRAY_BUFFER, 0 ); diff --git a/rendering/openglprecipitation.cpp b/rendering/openglprecipitation.cpp index fc93b2a92..acf246876 100644 --- a/rendering/openglprecipitation.cpp +++ b/rendering/openglprecipitation.cpp @@ -39,7 +39,7 @@ opengl_precipitation::create( int const Tesselation ) { std::uint16_t index = 0; // auto const radius { 25.f }; // cylinder radius - std::vector radii { 25.f, 10.f, 5.f, 1.f }; + std::vector radii { 25.f, 10.f, 5.f, 1.f }; for( auto radius : radii ) { for( int i = 0; i <= latitudes; ++i ) { diff --git a/rendering/openglskydome.cpp b/rendering/openglskydome.cpp index 58951f170..6506482bc 100644 --- a/rendering/openglskydome.cpp +++ b/rendering/openglskydome.cpp @@ -54,20 +54,18 @@ void opengl_skydome::update() { } // ship the current dynamic data to the gpu // TODO: ship the data if it changed since the last update - if( true == skydome.is_dirty() ) { - if( ( m_coloursbuffer > 0 ) && ( m_coloursbuffer != (GLuint)-1 ) ) { - ::glBindBuffer( GL_ARRAY_BUFFER, m_coloursbuffer ); - auto &colors{ skydome.colors() }; - /* - float twilightfactor = std::clamp( -simulation::Environment.sun().getAngle(), 0.0f, 18.0f ) / 18.0f; - auto gamma = std::lerp( glm::vec3( 0.45f ), glm::vec3( 1.0f ), twilightfactor ); - for( auto & color : colors ) { - color = glm::pow( color, gamma ); - } - */ - ::glBufferSubData( GL_ARRAY_BUFFER, 0, colors.size() * sizeof( glm::vec3 ), colors.data() ); - skydome.is_dirty() = false; + if (true == skydome.is_dirty() && ( m_coloursbuffer > 0 ) && ( m_coloursbuffer != (GLuint)-1 )) { + ::glBindBuffer( GL_ARRAY_BUFFER, m_coloursbuffer ); + auto &colors{ skydome.colors() }; + /* + float twilightfactor = std::clamp( -simulation::Environment.sun().getAngle(), 0.0f, 18.0f ) / 18.0f; + auto gamma = std::lerp( glm::vec3( 0.45f ), glm::vec3( 1.0f ), twilightfactor ); + for( auto & color : colors ) { + color = glm::pow( color, gamma ); } + */ + ::glBufferSubData( GL_ARRAY_BUFFER, 0, colors.size() * sizeof( glm::vec3 ), colors.data() ); + skydome.is_dirty() = false; } // cleanup ::glPopClientAttrib(); diff --git a/rendering/particles.cpp b/rendering/particles.cpp index eb02bf416..5f7158e0c 100644 --- a/rendering/particles.cpp +++ b/rendering/particles.cpp @@ -56,7 +56,7 @@ smoke_source::particle_emitter::deserialize( cParser &Input ) { } void -smoke_source::particle_emitter::initialize( smoke_particle &Particle ) { +smoke_source::particle_emitter::initialize( smoke_particle &Particle ) const { auto const polarangle { glm::radians( LocalRandom( inclination[ value_limit::min ], inclination[ value_limit::max ] ) ) }; // theta auto const azimuthalangle { glm::radians( LocalRandom( -180, 180 ) ) }; // phi @@ -69,9 +69,9 @@ smoke_source::particle_emitter::initialize( smoke_particle &Particle ) { Particle.velocity = launchvector * launchvelocity; - Particle.rotation = glm::radians( LocalRandom( 0, 360 ) ); - Particle.size = LocalRandom( size[ value_limit::min ], size[ value_limit::max ] ); - Particle.opacity = LocalRandom( opacity[ value_limit::min ], opacity[ value_limit::max ] ) / Global.SmokeFidelity; + Particle.rotation = static_cast(glm::radians( LocalRandom( 0, 360 ) )); + Particle.size = static_cast(LocalRandom( size[ value_limit::min ], size[ value_limit::max ] )); + Particle.opacity = static_cast(LocalRandom( opacity[ value_limit::min ], opacity[ value_limit::max ] ) / Global.SmokeFidelity); Particle.age = 0; } @@ -81,7 +81,7 @@ smoke_source::deserialize( cParser &Input ) { if( false == Input.ok() ) { return false; } while( true == deserialize_mapping( Input ) ) { - ; // all work done by while() + // all work done by while() } return true; @@ -166,8 +166,8 @@ smoke_source::update( double const Timedelta, bool const Onlydespawn ) { ( ( false == Global.Smoke ) || ( true == Onlydespawn ) ) ? 0.f : std::min( - m_spawncount + ( m_spawnrate * Timedelta * Global.SmokeFidelity ), - m_max_particles ) ); + static_cast(m_spawncount + ( m_spawnrate * Timedelta * Global.SmokeFidelity )), + static_cast(m_max_particles) ) ); // consider special spawn rate cases if( m_ownertype == owner_type::vehicle ) { @@ -183,7 +183,7 @@ smoke_source::update( double const Timedelta, bool const Onlydespawn ) { 0.f : std::min( // m_spawncount + ( m_spawnrate * Timedelta * Global.SmokeFidelity ), - m_spawncount +(m_spawnrate * Timedelta * Global.SmokeFidelity * (((m_owner.vehicle->MoverParameters->enrot) / 4 ) * 0.01)), m_max_particles); + static_cast(m_spawncount +(m_spawnrate * Timedelta * Global.SmokeFidelity * (((m_owner.vehicle->MoverParameters->enrot) / 4 ) * 0.01))), static_cast(m_max_particles)); } else { @@ -195,7 +195,7 @@ smoke_source::update( double const Timedelta, bool const Onlydespawn ) { 0.f : std::min( // m_spawncount + ( m_spawnrate * Timedelta * Global.SmokeFidelity ), - m_spawncount + (m_spawnrate * Timedelta * Global.SmokeFidelity * ((((m_owner.vehicle->MoverParameters->DElist[m_owner.vehicle->MoverParameters->MainCtrlPosNo].RPM -m_owner.vehicle->MoverParameters->enrot) /60) *0.02) *(m_owner.vehicle->MoverParameters->EnginePower * 0.005))), m_max_particles); + static_cast(m_spawncount + (m_spawnrate * Timedelta * Global.SmokeFidelity * ((((m_owner.vehicle->MoverParameters->DElist[m_owner.vehicle->MoverParameters->MainCtrlPosNo].RPM -m_owner.vehicle->MoverParameters->enrot) /60) *0.02) *(m_owner.vehicle->MoverParameters->EnginePower * 0.005)))), static_cast(m_max_particles)); } else { @@ -205,7 +205,7 @@ smoke_source::update( double const Timedelta, bool const Onlydespawn ) { 0.f : std::min( // m_spawncount + ( m_spawnrate * Timedelta * Global.SmokeFidelity ), - m_spawncount + (m_spawnrate * Timedelta * Global.SmokeFidelity * ((((m_owner.vehicle->MoverParameters->DElist[m_owner.vehicle->MoverParameters->MainCtrlPosNo].RPM -m_owner.vehicle->MoverParameters->enrot) /60) * (sqrt(m_owner.vehicle->MoverParameters->Im) * 0.01) * 0.02) *(m_owner.vehicle->MoverParameters->EnginePower * 0.005))), m_max_particles); + static_cast(m_spawncount + (m_spawnrate * Timedelta * Global.SmokeFidelity * ((((m_owner.vehicle->MoverParameters->DElist[m_owner.vehicle->MoverParameters->MainCtrlPosNo].RPM -m_owner.vehicle->MoverParameters->enrot) /60) * (sqrt(m_owner.vehicle->MoverParameters->Im) * 0.01) * 0.02) *(m_owner.vehicle->MoverParameters->EnginePower * 0.005)))), static_cast(m_max_particles)); } } } @@ -254,10 +254,8 @@ smoke_source::update( double const Timedelta, bool const Onlydespawn ) { // if we still have pending requests after filling entire container replace older particles if( m_spawncount >= 1.f ) { // sort all particles from most to least transparent, oldest to youngest if it's a tie - std::sort( - std::begin( m_particles ), - std::end( m_particles ), - []( smoke_particle const &Left, smoke_particle const &Right ) { + std::ranges::sort( + m_particles, []( smoke_particle const &Left, smoke_particle const &Right ) { return ( Left.opacity != Right.opacity ? Left.opacity < Right.opacity : Left.age > Right.age ); } ); @@ -283,7 +281,7 @@ smoke_source::update( double const Timedelta, bool const Onlydespawn ) { // determine bounding area from calculated bounding box if( false == m_particles.empty() ) { m_area.center = glm::mix(boundingbox[value_limit::min], boundingbox[value_limit::max], 0.5); - m_area.radius = 0.5 * ( glm::length( boundingbox[ value_limit::max ] - boundingbox[ value_limit::min ] ) ); + m_area.radius = static_cast(0.5 * ( glm::length( boundingbox[ value_limit::max ] - boundingbox[ value_limit::min ] ) )); } else { m_area.center = location(); @@ -331,10 +329,9 @@ smoke_source::initialize( smoke_particle &Particle ) { Particle.position = location(); if( m_ownertype == owner_type::vehicle ) { - Particle.opacity *= m_owner.vehicle->MoverParameters->dizel_fill; - auto const enginerevolutionsfactor { 1.5f }; // high engine revolutions increase initial particle velocity - switch( m_owner.vehicle->MoverParameters->EngineType ) { - case TEngineType::DieselElectric: { + Particle.opacity *= static_cast(m_owner.vehicle->MoverParameters->dizel_fill); + if (m_owner.vehicle->MoverParameters->EngineType == TEngineType::DieselElectric) + { if (m_owner.vehicle->MoverParameters->dizel_spinup == true) { Particle.velocity *= 0.38*(((m_owner.vehicle->MoverParameters->enrot)/2)*0.5); // / m_owner.vehicle->MoverParameters->dizel_fill *0.01)) ; @@ -347,11 +344,6 @@ smoke_source::initialize( smoke_particle &Particle ) { //Particle.velocity *= m_owner.vehicle->GetVelocity(); // / m_owner.vehicle->MoverParameters->dizel_fill *0.01)) ; } - break; - } - default: { - break; - } } } } @@ -368,28 +360,23 @@ smoke_source::update( smoke_particle &Particle, bounding_box &Boundingbox, doubl // crude smoke dispersion simulation // http://www.auburn.edu/academic/forestry_wildlife/fire/smoke_guide/smoke_dispersion.htm - switch (m_ownertype) + if (m_ownertype == owner_type::vehicle) { - case owner_type::vehicle: + Particle.velocity.y += static_cast(( 0.025 * Particle.velocity.y ) * std::min( 0.f, Global.AirTemperature - 90 ) * Timedelta); // decelerate faster in cold weather + Particle.velocity.y -= static_cast(( (0.05 * (pow(m_owner.vehicle->GetVelocity()*1,0.4))) * Particle.velocity.y ) * Global.Overcast * Timedelta); // decelerate faster with high air humidity and/or precipitation + } + else { - Particle.velocity.y += ( 0.025 * Particle.velocity.y ) * std::min( 0.f, Global.AirTemperature - 90 ) * Timedelta; // decelerate faster in cold weather - Particle.velocity.y -= ( (0.05 * (pow(m_owner.vehicle->GetVelocity()*1,0.4))) * Particle.velocity.y ) * Global.Overcast * Timedelta; // decelerate faster with high air humidity and/or precipitation - break; - } - default: - { - Particle.velocity.y += ( 0.005 * Particle.velocity.y ) * std::min( 0.f, Global.AirTemperature - 10 ) * Timedelta; // decelerate faster in cold weather - Particle.velocity.y -= ( 0.050 * Particle.velocity.y ) * Global.Overcast * Timedelta; // decelerate faster with high air humidity and/or precipitation - Particle.velocity.y = std::max( 0.25 * ( 2.f - Global.Overcast ), Particle.velocity.y ); // put a cap on deceleration - break; - } - } + Particle.velocity.y += static_cast(( 0.005 * Particle.velocity.y ) * std::min( 0.f, Global.AirTemperature - 10 ) * Timedelta); // decelerate faster in cold weather + Particle.velocity.y -= static_cast(( 0.050 * Particle.velocity.y ) * Global.Overcast * Timedelta); // decelerate faster with high air humidity and/or precipitation + Particle.velocity.y = std::max( static_cast(0.25 * ( 2.f - Global.Overcast )), Particle.velocity.y ); // put a cap on deceleration + } Particle.position += Particle.velocity * static_cast( Timedelta ); Particle.position += 0.1f * Particle.age * simulation::Environment.wind() * static_cast( Timedelta ); // m_velocitymodifier.update( Particle.velocity, Timedelta ); - Particle.age += Timedelta; + Particle.age += static_cast(Timedelta); // update bounding box Boundingbox[ value_limit::min ] = glm::min( Boundingbox[ value_limit::min ], Particle.position - glm::dvec3{ Particle.size } ); @@ -467,21 +454,19 @@ particle_manager::find( std::string const &Template ) { auto const templatename { ToLower( Template ) }; // try to locate specified rail profile... - auto const lookup { m_sourcetemplates.find( templatename ) }; - if( lookup != m_sourcetemplates.end() ) { + if( auto const lookup { m_sourcetemplates.find( templatename ) }; lookup != m_sourcetemplates.end() ) { // ...if it works, we're done... return &(lookup->second); } // ... and if it fails try to add the template to the database from a data file smoke_source source; - cParser parser(templatepath + templatename + ".txt", cParser::buffer_FILE); - if (source.deserialize(parser)) + if (cParser parser(templatepath + templatename + ".txt", cParser::buffer_FILE); source.deserialize(parser)) { // if deserialization didn't fail finish source setup... source.m_opacitymodifier.bind( &Global.SmokeFidelity ); // ...then cache the source as template for future instances - m_sourcetemplates.emplace( templatename, source ); + m_sourcetemplates.try_emplace( templatename, source ); // should be 'safe enough' to return lookup result directly afterwards return &( m_sourcetemplates.find( templatename )->second ); } diff --git a/rendering/particles.h b/rendering/particles.h index 5ee44230f..1d225e54c 100644 --- a/rendering/particles.h +++ b/rendering/particles.h @@ -56,7 +56,7 @@ public: return ( m_valuechangemodifier == nullptr ? m_valuechange : - m_valuechange / *( m_valuechangemodifier ) ); } + m_valuechange / *m_valuechangemodifier ); } private: //types @@ -122,7 +122,7 @@ private: glm::vec3 color { 16.f / 255.f }; void deserialize( cParser &Input ); - void initialize( smoke_particle &Particle ); + void initialize( smoke_particle &Particle ) const; }; using bounding_box = glm::dvec3[ 2 ]; // bounding box of owned particles @@ -212,7 +212,7 @@ fixedstep_modifier::update( Type_ &Variable, double const Timedelta ) con auto const valuechange { ( m_valuechangemodifier == nullptr ? m_valuechange : - m_valuechange / *( m_valuechangemodifier ) ) }; + m_valuechange / *m_valuechangemodifier ) }; Variable += ( valuechange * static_cast( Timedelta ) ); // clamp down to allowed value range Variable = glm::max( Variable, m_valuelimits[ value_limit::min ] ); diff --git a/rendering/screenshot.cpp b/rendering/screenshot.cpp index eb7e7aac0..880917038 100644 --- a/rendering/screenshot.cpp +++ b/rendering/screenshot.cpp @@ -29,9 +29,9 @@ void screenshot_manager::screenshot_save_thread( char *img, int w, int h ) stride = -w * 3; } - char datetime[64]; + std::array datetime{}; std::tm const tm_info = local_tm(std::time(nullptr)); - strftime(datetime, 64, "%Y-%m-%d_%H-%M-%S", &tm_info); + strftime(datetime.data(), datetime.size(), "%Y-%m-%d_%H-%M-%S", &tm_info); uint64_t perf; #ifdef _WIN32 @@ -42,7 +42,7 @@ void screenshot_manager::screenshot_save_thread( char *img, int w, int h ) perf = ts.tv_nsec; #endif - std::string filename = Global.screenshot_dir + "/" + std::string(datetime) + + std::string filename = Global.screenshot_dir + "/" + std::string(datetime.data()) + "_" + std::to_string(perf) + ".png"; if (png_image_write_to_file(&png, filename.c_str(), 0, img, stride, nullptr) == 1) @@ -55,7 +55,7 @@ void screenshot_manager::screenshot_save_thread( char *img, int w, int h ) void screenshot_manager::make_screenshot() { - char *img = new char[Global.fb_size.x * Global.fb_size.y * 4]; + auto img = new char[Global.fb_size.x * Global.fb_size.y * 4]; glReadPixels(0, 0, Global.fb_size.x, Global.fb_size.y, Global.gfx_usegles ? GL_RGBA : GL_RGB, GL_UNSIGNED_BYTE, (GLvoid*)img); //m7t: use pbo diff --git a/scene/sceneeditor.cpp b/scene/sceneeditor.cpp index 4516425d2..5d56e9156 100644 --- a/scene/sceneeditor.cpp +++ b/scene/sceneeditor.cpp @@ -50,9 +50,8 @@ basic_editor::translate( scene::basic_node *Node, glm::dvec3 const &Location, bo // TODO: contextual switch between group and item translation // TODO: translation of affected/relevant events auto &nodegroup { scene::Groups.group( Node->group() ).nodes }; - std::for_each( - std::begin( nodegroup ), std::end( nodegroup ), - [&]( auto *node ) { + std::ranges::for_each( + nodegroup, [&]( auto *node ) { translate_node( node, node->location() + translation ); } ); } } @@ -72,9 +71,8 @@ basic_editor::translate( scene::basic_node *Node, float const Offset ) { // TODO: contextual switch between group and item translation // TODO: translation of affected/relevant events auto &nodegroup { scene::Groups.group( Node->group() ).nodes }; - std::for_each( - std::begin( nodegroup ), std::end( nodegroup ), - [&]( auto *node ) { + std::ranges::for_each( + nodegroup, [&]( auto *node ) { translate_node( node, offset ); } ); } } @@ -102,7 +100,7 @@ basic_editor::translate_node( scene::basic_node *Node, float const Offset ) { } void -basic_editor::translate_instance( TAnimModel *Instance, glm::dvec3 const &Location ) { +basic_editor::translate_instance( TAnimModel *Instance, glm::dvec3 const &Location ) const { simulation::Region->erase( Instance ); Instance->location( Location ); @@ -110,7 +108,7 @@ basic_editor::translate_instance( TAnimModel *Instance, glm::dvec3 const &Locati } void -basic_editor::translate_instance( TAnimModel *Instance, float const Offset ) { +basic_editor::translate_instance( TAnimModel *Instance, float const Offset ) const { auto location { Instance->location() }; location.y += Offset; @@ -118,7 +116,7 @@ basic_editor::translate_instance( TAnimModel *Instance, float const Offset ) { } void -basic_editor::translate_memorycell( TMemCell *Memorycell, glm::dvec3 const &Location ) { +basic_editor::translate_memorycell( TMemCell *Memorycell, glm::dvec3 const &Location ) const { simulation::Region->erase( Memorycell ); Memorycell->location( Location ); @@ -126,7 +124,7 @@ basic_editor::translate_memorycell( TMemCell *Memorycell, glm::dvec3 const &Loca } void -basic_editor::translate_memorycell( TMemCell *Memorycell, float const Offset ) { +basic_editor::translate_memorycell( TMemCell *Memorycell, float const Offset ) const { auto location { Memorycell->location() }; location.y += Offset; @@ -161,9 +159,8 @@ basic_editor::rotate( scene::basic_node *Node, glm::vec3 const &Angle, float con // TODO: translation of affected/relevant events auto const &rotationcenter { Node->location() }; auto const &nodegroup { scene::Groups.group( Node->group() ).nodes }; - std::for_each( - std::begin( nodegroup ), std::end( nodegroup ), - [&]( auto *node ) { + std::ranges::for_each( + nodegroup, [&]( auto *node ) { rotate_node( node, rotation ); if( node != Node ) { translate_node( @@ -184,7 +181,7 @@ basic_editor::rotate_node( scene::basic_node *Node, glm::vec3 const &Angle ) { } void -basic_editor::rotate_instance( TAnimModel *Instance, glm::vec3 const &Angle ) { +basic_editor::rotate_instance( TAnimModel *Instance, glm::vec3 const &Angle ) const { auto targetangle { Instance->Angles() + Angle }; diff --git a/scene/sceneeditor.h b/scene/sceneeditor.h index bcff58b66..2b5418fe8 100644 --- a/scene/sceneeditor.h +++ b/scene/sceneeditor.h @@ -19,14 +19,13 @@ struct node_snapshot { scene::basic_node *node; std::string data; - node_snapshot( scene::basic_node *Node ) : + explicit node_snapshot( scene::basic_node *Node ) : node( Node ) { if( Node != nullptr ) { Node->export_as_text( data ); } }; }; inline bool operator==( node_snapshot const &Left, node_snapshot const &Right ) { return Left.node == Right.node && Left.data == Right.data; } -inline bool operator!=( node_snapshot const &Left, node_snapshot const &Right ) { return !(Left == Right); } class basic_editor { @@ -46,17 +45,17 @@ private: void translate_node( scene::basic_node *Node, float const Offset ); void - translate_instance( TAnimModel *Instance, glm::dvec3 const &Location ); + translate_instance( TAnimModel *Instance, glm::dvec3 const &Location ) const; void - translate_instance( TAnimModel *Instance, float const Offset ); + translate_instance( TAnimModel *Instance, float const Offset ) const; void - translate_memorycell( TMemCell *Memorycell, glm::dvec3 const &Location ); + translate_memorycell( TMemCell *Memorycell, glm::dvec3 const &Location ) const; void - translate_memorycell( TMemCell *Memorycell, float const Offset ); + translate_memorycell( TMemCell *Memorycell, float const Offset ) const; void rotate_node( scene::basic_node *Node, glm::vec3 const &Angle ); void - rotate_instance( TAnimModel *Instance, glm::vec3 const &Angle ); + rotate_instance( TAnimModel *Instance, glm::vec3 const &Angle ) const; }; } // scene diff --git a/scene/sn_utils.cpp b/scene/sn_utils.cpp index 08825d91c..b6a3f7c32 100644 --- a/scene/sn_utils.cpp +++ b/scene/sn_utils.cpp @@ -16,17 +16,17 @@ static_assert(-1 == ~0, "Two's complement required"); // deserialize little endian uint16 uint16_t sn_utils::ld_uint16(std::istream &s) { - uint8_t buf[2]; - s.read((char*)buf, 2); - uint16_t v = buf[1] << 8 | buf[0]; + std::array buf{}; + s.read(reinterpret_cast(buf.data()), buf.size()); + auto v = static_cast(buf[1] << 8 | buf[0]); return v; } // deserialize little endian uint32 uint32_t sn_utils::ld_uint32(std::istream &s) { - uint8_t buf[4]; - s.read((char*)buf, 4); + std::array buf{}; + s.read(reinterpret_cast(buf.data()), buf.size()); uint32_t v = buf[3] << 24 | buf[2] << 16 | buf[1] << 8 | buf[0]; return v; } @@ -34,8 +34,8 @@ uint32_t sn_utils::ld_uint32(std::istream &s) // deserialize little endian int32 int32_t sn_utils::ld_int32(std::istream &s) { - uint8_t buf[4]; - s.read((char*)buf, 4); + std::array buf{}; + s.read(reinterpret_cast(buf.data()), buf.size()); uint32_t v = buf[3] << 24 | buf[2] << 16 | buf[1] << 8 | buf[0]; return static_cast(v); } @@ -43,8 +43,8 @@ int32_t sn_utils::ld_int32(std::istream &s) // deserialize little endian uint64 uint64_t sn_utils::ld_uint64(std::istream &s) { - uint8_t buf[8]; - s.read((char*)buf, 8); + std::array buf{}; + s.read(reinterpret_cast(buf.data()), buf.size()); uint64_t v = (uint64_t)buf[7] << 56 | (uint64_t)buf[6] << 48 | (uint64_t)buf[5] << 40 | (uint64_t)buf[4] << 32 | (uint64_t)buf[3] << 24 | (uint64_t)buf[2] << 16 | @@ -55,8 +55,8 @@ uint64_t sn_utils::ld_uint64(std::istream &s) // deserialize little endian int64 int64_t sn_utils::ld_int64(std::istream &s) { - uint8_t buf[8]; - s.read((char*)buf, 8); + std::array buf{}; + s.read(reinterpret_cast(buf.data()), buf.size()); uint64_t v = (uint64_t)buf[7] << 56 | (uint64_t)buf[6] << 48 | (uint64_t)buf[5] << 40 | (uint64_t)buf[4] << 32 | (uint64_t)buf[3] << 24 | (uint64_t)buf[2] << 16 | @@ -67,8 +67,8 @@ int64_t sn_utils::ld_int64(std::istream &s) // deserialize little endian ieee754 float32 float sn_utils::ld_float32(std::istream &s) { - uint8_t buf[4]; - s.read((char*)buf, 4); + std::array buf{}; + s.read(reinterpret_cast(buf.data()), buf.size()); uint32_t v = buf[3] << 24 | buf[2] << 16 | buf[1] << 8 | buf[0]; return std::bit_cast(v); } @@ -76,8 +76,8 @@ float sn_utils::ld_float32(std::istream &s) // deserialize little endian ieee754 float64 double sn_utils::ld_float64(std::istream &s) { - uint8_t buf[8]; - s.read((char*)buf, 8); + std::array buf{}; + s.read(reinterpret_cast(buf.data()), buf.size()); uint64_t v = (uint64_t)buf[7] << 56 | (uint64_t)buf[6] << 48 | (uint64_t)buf[5] << 40 | (uint64_t)buf[4] << 32 | (uint64_t)buf[3] << 24 | (uint64_t)buf[2] << 16 | @@ -90,13 +90,13 @@ std::string sn_utils::d_str(std::istream &s) { std::string r; r.reserve(32); - char buf[1]; + char c{}; while (true) { - s.read(buf, 1); - if (buf[0] == 0) + s.read(&c, 1); + if (c == 0) break; - r.push_back(buf[0]); + r.push_back(c); } return r; } @@ -141,84 +141,84 @@ uint8_t sn_utils::d_uint8( std::istream& s ) { void sn_utils::ls_uint16(std::ostream &s, uint16_t v) { - uint8_t buf[2]; - buf[0] = v; + std::array buf{}; + buf[0] = static_cast(v); buf[1] = v >> 8; - s.write((char*)buf, 2); + s.write(reinterpret_cast(buf.data()), buf.size()); } void sn_utils::ls_uint32(std::ostream &s, uint32_t v) { - uint8_t buf[4]; - buf[0] = v; - buf[1] = v >> 8; - buf[2] = v >> 16; + std::array buf{}; + buf[0] = static_cast(v); + buf[1] = static_cast(v >> 8); + buf[2] = static_cast(v >> 16); buf[3] = v >> 24; - s.write((char*)buf, 4); + s.write(reinterpret_cast(buf.data()), buf.size()); } void sn_utils::ls_int32(std::ostream &s, int32_t v) { - uint8_t buf[4]; - buf[0] = v; - buf[1] = v >> 8; - buf[2] = v >> 16; + std::array buf{}; + buf[0] = static_cast(v); + buf[1] = static_cast(v >> 8); + buf[2] = static_cast(v >> 16); buf[3] = v >> 24; - s.write((char*)buf, 4); + s.write(reinterpret_cast(buf.data()), buf.size()); } void sn_utils::ls_uint64(std::ostream &s, uint64_t v) { - uint8_t buf[8]; - buf[0] = v; - buf[1] = v >> 8; - buf[2] = v >> 16; - buf[3] = v >> 24; - buf[4] = v >> 32; - buf[5] = v >> 40; - buf[6] = v >> 48; + std::array buf{}; + buf[0] = static_cast(v); + buf[1] = static_cast(v >> 8); + buf[2] = static_cast(v >> 16); + buf[3] = static_cast(v >> 24); + buf[4] = static_cast(v >> 32); + buf[5] = static_cast(v >> 40); + buf[6] = static_cast(v >> 48); buf[7] = v >> 56; - s.write((char*)buf, 8); + s.write(reinterpret_cast(buf.data()), buf.size()); } void sn_utils::ls_int64(std::ostream &s, int64_t v) { - uint8_t buf[8]; - buf[0] = v; - buf[1] = v >> 8; - buf[2] = v >> 16; - buf[3] = v >> 24; - buf[4] = v >> 32; - buf[5] = v >> 40; - buf[6] = v >> 48; + std::array buf{}; + buf[0] = static_cast(v); + buf[1] = static_cast(v >> 8); + buf[2] = static_cast(v >> 16); + buf[3] = static_cast(v >> 24); + buf[4] = static_cast(v >> 32); + buf[5] = static_cast(v >> 40); + buf[6] = static_cast(v >> 48); buf[7] = v >> 56; - s.write((char*)buf, 8); + s.write(reinterpret_cast(buf.data()), buf.size()); } void sn_utils::ls_float32(std::ostream &s, float t) { - uint32_t v = std::bit_cast(t); - uint8_t buf[4]; - buf[0] = v; - buf[1] = v >> 8; - buf[2] = v >> 16; + auto v = std::bit_cast(t); + std::array buf{}; + buf[0] = static_cast(v); + buf[1] = static_cast(v >> 8); + buf[2] = static_cast(v >> 16); buf[3] = v >> 24; - s.write((char*)buf, 4); + s.write(reinterpret_cast(buf.data()), buf.size()); } void sn_utils::ls_float64(std::ostream &s, double t) { - uint64_t v = std::bit_cast(t); - uint8_t buf[8]; - buf[0] = v; - buf[1] = v >> 8; - buf[2] = v >> 16; - buf[3] = v >> 24; - buf[4] = v >> 32; - buf[5] = v >> 40; - buf[6] = v >> 48; + auto v = std::bit_cast(t); + std::array buf{}; + buf[0] = static_cast(v); + buf[1] = static_cast(v >> 8); + buf[2] = static_cast(v >> 16); + buf[3] = static_cast(v >> 24); + buf[4] = static_cast(v >> 32); + buf[5] = static_cast(v >> 40); + buf[6] = static_cast(v >> 48); buf[7] = v >> 56; - s.write((char*)buf, 8); + s.write(reinterpret_cast(buf.data()), buf.size()); } void sn_utils::s_uint8(std::ostream &s, uint8_t v) @@ -226,7 +226,7 @@ void sn_utils::s_uint8(std::ostream &s, uint8_t v) s.write((char*)&v, 1); } -void sn_utils::s_str(std::ostream &s, std::string v) +void sn_utils::s_str(std::ostream &s, std::string const &v) { const char* buf = v.c_str(); s.write(buf, v.size() + 1); diff --git a/scene/sn_utils.h b/scene/sn_utils.h index 54005c6c5..4212ac29a 100644 --- a/scene/sn_utils.h +++ b/scene/sn_utils.h @@ -29,7 +29,7 @@ public: static void ls_float32(std::ostream&, float); static void ls_float64(std::ostream&, double); static void s_uint8(std::ostream&, uint8_t); - static void s_str(std::ostream&, std::string); + static void s_str(std::ostream&, std::string const &); static void s_bool(std::ostream&, bool); static void s_dvec3(std::ostream&, glm::dvec3 const &); static void s_vec3(std::ostream&, glm::vec3 const &); diff --git a/scripting/PyInt.cpp b/scripting/PyInt.cpp index fbbd0b80d..666609b0e 100644 --- a/scripting/PyInt.cpp +++ b/scripting/PyInt.cpp @@ -30,36 +30,36 @@ void render_task::run() cancel(); return; } - for (auto const &datapair : m_input->floats) + for (auto const &[dataname, datavalue] : m_input->floats) { - auto *value{PyGetFloat(datapair.second)}; + auto *value{PyGetFloat(datavalue)}; if (value == nullptr) { PyErr_Clear(); continue; } - PyDict_SetItemString(input, datapair.first.c_str(), value); + PyDict_SetItemString(input, dataname.c_str(), value); Py_DECREF(value); } - for (auto const &datapair : m_input->integers) + for (auto const &[dataname, datavalue] : m_input->integers) { - auto *value{PyLong_FromLong(datapair.second)}; + auto *value{PyLong_FromLong(datavalue)}; if (value == nullptr) { PyErr_Clear(); continue; } - PyDict_SetItemString(input, datapair.first.c_str(), value); + PyDict_SetItemString(input, dataname.c_str(), value); Py_DECREF(value); } - for (auto const &datapair : m_input->bools) + for (auto const &[dataname, datavalue] : m_input->bools) { // Py_True / Py_False sa niesmiertelne, ale PyDict_SetItemString i tak // pobiera wlasna referencje - nie zwalniamy - auto *value{PyGetBool(datapair.second)}; - PyDict_SetItemString(input, datapair.first.c_str(), value); + auto *value{PyGetBool(datavalue)}; + PyDict_SetItemString(input, dataname.c_str(), value); } - for (auto const &datapair : m_input->strings) + for (auto const &[dataname, datavalue] : m_input->strings) { // Nazwy scenerii/wagonow (asName, SceneryFile, asCarName, cCode...) moga // byc albo w UTF-8, albo w starym kodowaniu Windows-1250. PyUnicode_FromString @@ -68,8 +68,8 @@ void render_task::run() // // Strategia: najpierw probujemy UTF-8 (strict). Jesli sie nie uda - probujemy // cp1250. Jesli oba zawioda - pomijamy klucz, ale nie wywracamy symulatora. - char const *const str{datapair.second.c_str()}; - Py_ssize_t const len{static_cast(datapair.second.size())}; + char const *const str{datavalue.c_str()}; + Py_ssize_t const len{static_cast(datavalue.size())}; auto *value{PyUnicode_DecodeUTF8(str, len, "strict")}; if (value == nullptr) @@ -82,16 +82,16 @@ void render_task::run() PyErr_Clear(); continue; } - PyDict_SetItemString(input, datapair.first.c_str(), value); + PyDict_SetItemString(input, dataname.c_str(), value); Py_DECREF(value); } - for (auto const &datapair : m_input->vec2_lists) + for (auto const &[dataname, datavalue] : m_input->vec2_lists) { - PyObject *list = PyList_New(datapair.second.size()); + PyObject *list = PyList_New(datavalue.size()); - for (size_t i = 0; i < datapair.second.size(); i++) + for (size_t i = 0; i < datavalue.size(); i++) { - auto const &vec = datapair.second[i]; + auto const &vec = datavalue[i]; WriteLog("passing " + glm::to_string(vec)); PyObject *tuple = PyTuple_New(2); @@ -101,24 +101,24 @@ void render_task::run() PyList_SetItem(list, i, tuple); // steals ref } - PyDict_SetItemString(input, datapair.first.c_str(), list); + PyDict_SetItemString(input, dataname.c_str(), list); Py_DECREF(list); } m_input = nullptr; // call the renderer - auto *output{PyObject_CallMethod(m_renderer, const_cast("render"), const_cast("O"), input)}; + auto *output{PyObject_CallMethod(m_renderer, "render", "O", input)}; Py_DECREF(input); if (output != nullptr) { - auto *outputWidth = PyObject_CallMethod(m_renderer, const_cast("get_width"), nullptr); - auto *outputHeight = PyObject_CallMethod(m_renderer, const_cast("get_height"), nullptr); + auto *outputWidth = PyObject_CallMethod(m_renderer, "get_width", nullptr); + auto *outputHeight = PyObject_CallMethod(m_renderer, "get_height", nullptr); if (outputWidth != nullptr && outputHeight != nullptr && m_target != nullptr) { - const int screenWidth = static_cast(PyLong_AsLong(outputWidth)); - const int screenHeight = static_cast(PyLong_AsLong(outputHeight)); + const auto screenWidth = static_cast(PyLong_AsLong(outputWidth)); + const auto screenHeight = static_cast(PyLong_AsLong(outputHeight)); const bool useRgb = false && !Global.gfx_usegles; @@ -166,7 +166,7 @@ void render_task::run() } // get commands from renderer - auto *commandsPO = PyObject_CallMethod(m_renderer, const_cast("getCommands"), nullptr); + auto *commandsPO = PyObject_CallMethod(m_renderer, "getCommands", nullptr); if (commandsPO != nullptr) { std::vector commands = python_external_utils::PyObjectToStringArray(commandsPO); @@ -178,10 +178,10 @@ void render_task::run() for (const auto &cmd : commands) { std::string baseCmd; - int p1 = 0, p2 = 0; + int p1 = 0; + int p2 = 0; - size_t pos1 = cmd.find(';'); - if (pos1 == std::string::npos) + if (size_t pos1 = cmd.find(';'); pos1 == std::string::npos) { baseCmd = cmd; } @@ -224,7 +224,7 @@ void render_task::run() } } -void render_task::upload() +void render_task::upload() const { if (Global.python_uploadmain && m_target && m_target->shared_tex) { @@ -232,7 +232,7 @@ void render_task::upload() } } -void render_task::cancel() {} +void render_task::cancel() const { /* nothing to do */ } // initializes the module. returns true on success auto python_taskqueue::init() -> bool @@ -310,7 +310,7 @@ auto python_taskqueue::init() -> bool stringiomodule = PyImport_ImportModule("io"); stringioclassname = stringiomodule != nullptr ? PyObject_GetAttrString(stringiomodule, "StringIO") : nullptr; stringioobject = stringioclassname != nullptr ? PyObject_CallObject(stringioclassname, nullptr) : nullptr; - m_stderr = {(stringioobject == nullptr ? nullptr : PySys_SetObject(const_cast("stderr"), stringioobject) != 0 ? nullptr : stringioobject)}; + m_stderr = {(stringioobject == nullptr ? nullptr : PySys_SetObject("stderr", stringioobject) != 0 ? nullptr : stringioobject)}; if (false == run_file("abstractscreenrenderer")) { @@ -362,23 +362,23 @@ void python_taskqueue::exit() // document intent. clearing the deque also actually releases the tasks, // which the previous code did not do (cancel() is a no-op stub). { - std::lock_guard lock(m_tasks.mutex); - for (auto &task : m_tasks.data) + std::scoped_lock lock(m_tasks.mutex); + for (auto const &task : m_tasks.data) { task->cancel(); } m_tasks.data.clear(); } { - std::lock_guard lock(m_uploadtasks.mutex); + std::scoped_lock lock(m_uploadtasks.mutex); m_uploadtasks.data.clear(); } // reclaim cached python objects while the interpreter is still alive, // so no Py_DECREF lands on a finalized interpreter during later teardown acquire_lock(); - for (auto &entry : m_renderers) + for (auto const &[renderername, rendererobject] : m_renderers) { - Py_XDECREF(entry.second); + Py_XDECREF(rendererobject); } m_renderers.clear(); Py_XDECREF(m_stderr); @@ -394,7 +394,7 @@ void python_taskqueue::exit() auto python_taskqueue::insert(task_request const &Task) -> bool { - if (!m_initialized || false == Global.python_enabled || Task.renderer.empty() || Task.input == nullptr || Task.target == 0) + if (!m_initialized || false == Global.python_enabled || Task.renderer.empty() || Task.input == nullptr || Task.target == nullptr) { return false; } @@ -409,7 +409,7 @@ auto python_taskqueue::insert(task_request const &Task) -> bool bool newtaskinserted{false}; // acquire a lock on the task queue and add the new task { - std::lock_guard lock(m_tasks.mutex); + std::scoped_lock lock(m_tasks.mutex); // check the task list for a pending request with the same target for (auto &task : m_tasks.data) { @@ -437,13 +437,13 @@ auto python_taskqueue::insert(task_request const &Task) -> bool auto python_taskqueue::run_file(std::string const &File, std::string const &Path) -> bool { - auto const lookup{FileExists({Path + File, "python/local/" + File}, {".py"})}; - if (lookup.first.empty()) + auto const [filepath, fileextension]{FileExists({Path + File, "python/local/" + File}, {".py"})}; + if (filepath.empty()) { return false; } - std::ifstream inputfile{lookup.first + lookup.second}; + std::ifstream inputfile{filepath + fileextension}; std::string input; input.assign(std::istreambuf_iterator(inputfile), std::istreambuf_iterator()); @@ -464,17 +464,16 @@ void python_taskqueue::acquire_lock() } // releases the python gil and swaps the main thread out -void python_taskqueue::release_lock() +void python_taskqueue::release_lock() const { PyEval_SaveThread(); } -auto python_taskqueue::fetch_renderer(std::string const Renderer) -> PyObject * +auto python_taskqueue::fetch_renderer(std::string const &Renderer) -> PyObject * { - auto const lookup{m_renderers.find(Renderer)}; - if (lookup != std::end(m_renderers)) + if (auto const lookup{m_renderers.find(Renderer)}; lookup != std::end(m_renderers)) { return lookup->second; } @@ -510,7 +509,7 @@ auto python_taskqueue::fetch_renderer(std::string const Renderer) -> PyObject * } renderer = PyObject_CallObject(renderername, rendererarguments); - PyObject_CallMethod(renderer, const_cast("manul_set_format"), const_cast("(s)"), "RGBA"); + PyObject_CallMethod(renderer, "manul_set_format", "(s)", "RGBA"); if (PyErr_Occurred() != nullptr) { @@ -527,11 +526,11 @@ auto python_taskqueue::fetch_renderer(std::string const Renderer) -> PyObject * } release_lock(); // cache the failures as well so we don't try again on subsequent requests - m_renderers.emplace(Renderer, renderer); + m_renderers.try_emplace(Renderer, renderer); return renderer; } -void python_taskqueue::run(GLFWwindow *Context, rendertask_sequence &Tasks, uploadtask_sequence &Upload_Tasks, threading::condition_variable &Condition, std::atomic &Exit) +void python_taskqueue::run(GLFWwindow *Context, rendertask_sequence &Tasks, uploadtask_sequence &Upload_Tasks, threading::condition_variable &Condition, std::atomic const &Exit) { if (Context) @@ -554,7 +553,7 @@ void python_taskqueue::run(GLFWwindow *Context, rendertask_sequence &Tasks, uplo task = nullptr; // acquire a lock on the task queue and potentially grab a task from it { - std::lock_guard lock(Tasks.mutex); + std::scoped_lock lock(Tasks.mutex); if (false == Tasks.data.empty()) { // fifo @@ -573,7 +572,7 @@ void python_taskqueue::run(GLFWwindow *Context, rendertask_sequence &Tasks, uplo task->upload(); else { - std::lock_guard lock(Upload_Tasks.mutex); + std::scoped_lock lock(Upload_Tasks.mutex); Upload_Tasks.data.push_back(task); } if (PyErr_Occurred() != nullptr) @@ -608,9 +607,9 @@ void python_taskqueue::run(GLFWwindow *Context, rendertask_sequence &Tasks, uplo void python_taskqueue::update() { - std::lock_guard lock(m_uploadtasks.mutex); + std::scoped_lock lock(m_uploadtasks.mutex); - for (auto &task : m_uploadtasks.data) + for (auto const &task : m_uploadtasks.data) task->upload(); m_uploadtasks.data.clear(); @@ -622,21 +621,21 @@ void python_taskqueue::error() { // std err pythona jest buforowane PyErr_Print(); - auto *errortext{PyObject_CallMethod(m_stderr, const_cast("getvalue"), nullptr)}; - if (errortext != nullptr) + if (auto *errortext{PyObject_CallMethod(m_stderr, "getvalue", nullptr)}; errortext != nullptr) { - const char *errstr = PyUnicode_AsUTF8(errortext); - if (errstr != nullptr) + if (const char *errstr = PyUnicode_AsUTF8(errortext); errstr != nullptr) ErrorLog(errstr); Py_DECREF(errortext); } - PyObject_CallMethod(m_stderr, const_cast("truncate"), const_cast("L"), (long long)0); - PyObject_CallMethod(m_stderr, const_cast("seek"), const_cast("L"), (long long)0); + PyObject_CallMethod(m_stderr, "truncate", "L", (long long)0); + PyObject_CallMethod(m_stderr, "seek", "L", (long long)0); } else { // nie dziala buffor pythona - PyObject *type, *value, *traceback; + PyObject *type; + PyObject *value; + PyObject *traceback; PyErr_Fetch(&type, &value, &traceback); if (type == nullptr) { @@ -647,11 +646,9 @@ void python_taskqueue::error() { ErrorLog("Python Interpreter: don't know how to handle null exception"); } - auto *typetext{PyObject_Str(type)}; - if (typetext != nullptr) + if (auto *typetext{PyObject_Str(type)}; typetext != nullptr) { - const char *s = PyUnicode_AsUTF8(typetext); - if (s) + if (const char *s = PyUnicode_AsUTF8(typetext); s) ErrorLog(s); Py_DECREF(typetext); } @@ -660,8 +657,7 @@ void python_taskqueue::error() auto *valuetext{PyObject_Str(value)}; if (valuetext != nullptr) { - const char *s = PyUnicode_AsUTF8(valuetext); - if (s) + if (const char *s = PyUnicode_AsUTF8(valuetext); s) ErrorLog(s); Py_DECREF(valuetext); } @@ -669,8 +665,7 @@ void python_taskqueue::error() auto *tracebacktext{PyObject_Str(traceback)}; if (tracebacktext != nullptr) { - const char *s = PyUnicode_AsUTF8(tracebacktext); - if (s) + if (const char *s = PyUnicode_AsUTF8(tracebacktext); s) ErrorLog(s); Py_DECREF(tracebacktext); } @@ -709,7 +704,7 @@ std::vector python_external_utils::PyObjectToStringArray(PyObject * return emptyIfError; } - result.push_back(std::string(str)); + result.emplace_back(str); Py_DECREF(item); // Decrease reference count for the item } diff --git a/scripting/PyInt.h b/scripting/PyInt.h index 1f1511a08..c8c410397 100644 --- a/scripting/PyInt.h +++ b/scripting/PyInt.h @@ -80,8 +80,8 @@ class render_task render_task(PyObject *Renderer, std::shared_ptr Input, std::shared_ptr Target) : m_renderer(Renderer), m_input(Input), m_target(Target) {} // methods void run(); - void upload(); - void cancel(); + void upload() const; + void cancel() const; auto target() const -> std::shared_ptr { return m_target; @@ -120,7 +120,7 @@ class python_taskqueue // acquires the python gil and sets the main thread as current void acquire_lock(); // releases the python gil and swaps the main thread out - void release_lock(); + void release_lock() const; void update(); @@ -131,8 +131,8 @@ class python_taskqueue using rendertask_sequence = threading::lockable>>; using uploadtask_sequence = threading::lockable>>; // methods - auto fetch_renderer(std::string const Renderer) -> PyObject *; - void run(GLFWwindow *Context, rendertask_sequence &Tasks, uploadtask_sequence &Upload_Tasks, threading::condition_variable &Condition, std::atomic &Exit); + auto fetch_renderer(std::string const &Renderer) -> PyObject *; + void run(GLFWwindow *Context, rendertask_sequence &Tasks, uploadtask_sequence &Upload_Tasks, threading::condition_variable &Condition, std::atomic const &Exit); void error(); // members diff --git a/scripting/ladderlogic.cpp b/scripting/ladderlogic.cpp index b86aba6f0..5a0873d4a 100644 --- a/scripting/ladderlogic.cpp +++ b/scripting/ladderlogic.cpp @@ -67,7 +67,7 @@ basic_controller::output( element_handle const Element ) const -> int { } auto -basic_controller::load( std::string const &Filename ) -> bool { +basic_controller::load( std::string_view Filename) -> bool { m_program.clear(); m_updateaccumulator = 0.0; @@ -111,7 +111,7 @@ basic_controller::update( double const Timestep ) -> int { return run(); } -std::map const basic_controller::m_operationcodemap = { +std::map> const basic_controller::m_operationcodemap = { { "ld", opcode_e::op_ld }, { "ldi", opcode_e::op_ldi }, { "and", opcode_e::op_and }, { "ani", opcode_e::op_ani }, { "anb", opcode_e::op_anb }, { "or", opcode_e::op_or }, { "ori", opcode_e::op_ori }, { "orb", opcode_e::op_orb }, @@ -130,10 +130,9 @@ basic_controller::deserialize_operation( cParser &Input ) -> bool { cParser operationparser( operationdata, cParser::buffer_TEXT ); // HACK: operation potentially contains 1-2 parameters so we try to grab the whole set operationparser.getTokens( 3, "\t " ); - std::string - operationname, - operationelement, - operationparameter; + std::string operationname; + std::string operationelement; + std::string operationparameter; operationparser >> operationname >> operationelement @@ -142,7 +141,7 @@ basic_controller::deserialize_operation( cParser &Input ) -> bool { auto const lookup { m_operationcodemap.find( operationname ) }; operation.code = lookup != m_operationcodemap.end() ? lookup->second : opcode_e::op_nop; if( lookup == m_operationcodemap.end() ) { - log_error( "contains unknown command \"" + operationname + "\"", Input.Line() - 1 ); + log_error( "contains unknown command \"" + operationname + "\"", static_cast(Input.Line() - 1) ); } if( operation.code == opcode_e::op_nop ) { return true; } @@ -155,8 +154,8 @@ basic_controller::deserialize_operation( cParser &Input ) -> bool { } if( false == operationparameter.empty() ) { - auto const parameter{ split_string_and_number( operationparameter ) }; - operation.parameter1 = static_cast( parameter.second ); + auto const [parametertype, parameterindex]{ split_string_and_number( operationparameter ) }; + operation.parameter1 = static_cast( parameterindex ); } m_program.emplace_back( operation ); @@ -165,7 +164,7 @@ basic_controller::deserialize_operation( cParser &Input ) -> bool { } auto -basic_controller::insert( std::string const Name, basic_element Element ) -> element_handle { +basic_controller::insert( std::string const &Name, basic_element Element ) -> element_handle { m_elements.push_back( Element ); m_elementnames.push_back( Name ); @@ -301,6 +300,8 @@ basic_controller::run() -> int { } break; } + default: + break; } // accumulator was published at least once, next ld(i) operation will start a new rung m_popstack = true; @@ -316,7 +317,6 @@ basic_controller::run() -> int { break; } auto &target { element( operation.element ) }; - auto const initialstate { target.input() }; target.input() = m_accumulator.back(); // additional operations for advanced element types switch( (basic_element::type_e)target.data.index() ) { @@ -334,6 +334,8 @@ basic_controller::run() -> int { */ break; } + default: + break; } // accumulator was published at least once, next ld(i) operation will start a new rung m_popstack = true; @@ -356,11 +358,16 @@ basic_controller::run() -> int { std::get(target.data).count_value = 0; break; } + default: + break; } // accumulator was published at least once, next ld(i) operation will start a new rung m_popstack = true; break; } + default: { + break; + } } ++programline; } @@ -381,17 +388,18 @@ basic_controller::log_error( std::string const &Error, int const Line ) const { auto basic_controller::guess_element_type_from_name( std::string const &Name ) const -> basic_element::type_e { + using enum plc::basic_element::type_e; - auto const name { split_string_and_number( Name ) }; + auto const [nametype, nameindex]{ split_string_and_number( Name ) }; - if( name.first == "t" || name.first == "ton" || name.first.find("timer.") == 0 ) { - return basic_element::type_e::timer; + if( nametype == "t" || nametype == "ton" || nametype.find("timer.") == 0 ) { + return timer; } - if( name.first == "c" || name.first.find("counter.") == 0 ) { - return basic_element::type_e::counter; + if( nametype == "c" || nametype.find("counter.") == 0 ) { + return counter; } - return basic_element::type_e::variable; + return variable; } } // plc diff --git a/scripting/ladderlogic.h b/scripting/ladderlogic.h index 075e4b0dd..545456aba 100644 --- a/scripting/ladderlogic.h +++ b/scripting/ladderlogic.h @@ -27,7 +27,7 @@ public: }; // constructors template - basic_element( basic_element::type_e Type = basic_element::type_e::variable, Args_ ...Args ); + explicit basic_element( basic_element::type_e Type = basic_element::type_e::variable, Args_ ...Args ); // methods // data access auto input() -> int &; @@ -60,7 +60,7 @@ class basic_controller { public: // methods - auto load( std::string const &Filename ) -> bool; + auto load( std::string_view Filename) -> bool; auto update( double const Timestep ) -> int; // finds element with specified name, potentially creating new element of specified type initialized with provided arguments. returns: handle to the element template @@ -100,7 +100,7 @@ private: // methods auto deserialize_operation( cParser &Input ) -> bool; // adds provided item to the collection. returns: true if there's no duplicate with the same name, false otherwise - auto insert( std::string const Name, basic_element Element ) -> element_handle; + auto insert( std::string const &Name, basic_element Element ) -> element_handle; // runs one cycle of current program. returns: error code or 0 if there's no error auto run() -> int; void log_error( std::string const &Error, int const Line = -1 ) const; @@ -110,13 +110,13 @@ private: return Value == 0 ? 1 : 0; } // element access inline - auto element( element_handle const Element ) const -> basic_element const { + auto element( element_handle const Element ) const -> basic_element { return m_elements[ Element - 1 ]; } inline auto element( element_handle const Element ) -> basic_element & { return m_elements[ Element - 1 ]; } // members - static std::map const m_operationcodemap; + static std::map> const m_operationcodemap; element_sequence m_elements; // collection of elements accessed by the plc program name_sequence m_elementnames; handle_sequence m_timerhandles; // indices of timer elements, timer update optimization helper @@ -158,7 +158,7 @@ auto basic_controller::find_or_insert( std::string const &Name, basic_element::t auto index { 1 }; for( auto const &name : m_elementnames ) { if( name == Name ) { - return index; + return static_cast(index); } ++index; } diff --git a/scripting/lua.cpp b/scripting/lua.cpp index 58cdd41a0..14ecbb75d 100644 --- a/scripting/lua.cpp +++ b/scripting/lua.cpp @@ -145,10 +145,10 @@ int lua::scriptapi_event_create(lua_State *L) int lua::scriptapi_event_find(lua_State *L) { std::string name = lua_tostring(L, 1); - basic_event *event = simulation::Events.FindEvent(name); - if (event) + basic_event *foundevent = simulation::Events.FindEvent(name); + if (foundevent) { - lua_pushlightuserdata(L, event); + lua_pushlightuserdata(L, foundevent); return 1; } ErrorLog("lua: missing event: " + name); @@ -158,8 +158,8 @@ int lua::scriptapi_event_find(lua_State *L) int lua::scriptapi_event_exists(lua_State *L) { std::string name = lua_tostring(L, 1); - basic_event *event = simulation::Events.FindEvent(name); - lua_pushboolean(L, event != nullptr); + basic_event *foundevent = simulation::Events.FindEvent(name); + lua_pushboolean(L, foundevent != nullptr); return 1; } @@ -189,9 +189,9 @@ int lua::scriptapi_event_dispatch_n(lua_State *L) std::string name = lua_tostring(L, 1); auto *activator = static_cast(lua_touserdata(L, 2)); double delay = lua_tonumber(L, 3); - basic_event *event = simulation::Events.FindEvent(name); - if (event) - simulation::Events.AddToQuery(event, activator, delay); + basic_event *foundevent = simulation::Events.FindEvent(name); + if (foundevent) + simulation::Events.AddToQuery(foundevent, activator, delay); else ErrorLog("lua: missing event: " + name); return 0; diff --git a/scripting/pythonscreenviewer.cpp b/scripting/pythonscreenviewer.cpp index fa15e9fa9..4da50151e 100644 --- a/scripting/pythonscreenviewer.cpp +++ b/scripting/pythonscreenviewer.cpp @@ -7,32 +7,31 @@ void texture_window_resize(GLFWwindow *win, int w, int h) { - python_screen_viewer *texwindow = (python_screen_viewer*)glfwGetWindowUserPointer(win); + auto texwindow = (python_screen_viewer*)glfwGetWindowUserPointer(win); texwindow->notify_window_size(win, w, h); } void texture_window_fb_resize(GLFWwindow *win, int w, int h) { - python_screen_viewer *texwindow = (python_screen_viewer*)glfwGetWindowUserPointer(win); + auto texwindow = (python_screen_viewer*)glfwGetWindowUserPointer(win); texwindow->notify_window_fb_size(win, w, h); } -void texture_window_mouse_button(GLFWwindow *win, int button, int action, int mods) +void texture_window_mouse_button(GLFWwindow *win, int button, int action, int /*mods*/) { - python_screen_viewer *texwindow = (python_screen_viewer*)glfwGetWindowUserPointer(win); + auto texwindow = (python_screen_viewer*)glfwGetWindowUserPointer(win); texwindow->notify_click(win, button, action); } void texture_window_cursor_pos(GLFWwindow *win, double x, double y) { - python_screen_viewer *texwindow = (python_screen_viewer*)glfwGetWindowUserPointer(win); + auto texwindow = (python_screen_viewer*)glfwGetWindowUserPointer(win); texwindow->notify_cursor_pos(win, x, y); } -python_screen_viewer::python_screen_viewer(std::shared_ptr rt, std::shared_ptr> touchlist, std::string surfacename) +python_screen_viewer::python_screen_viewer(std::shared_ptr rt, std::shared_ptr> touchlist, std::string const &surfacename) + : m_rt(rt), m_touchlist(touchlist) { - m_rt = rt; - m_touchlist = touchlist; for (const auto &viewport : Global.python_viewports) { if (viewport.surface == surfacename) { @@ -49,7 +48,8 @@ python_screen_viewer::python_screen_viewer(std::shared_ptr rt, std::s monitor, false, Global.python_sharectx); { - int w, h; + int w; + int h; glfwGetWindowSize(conf->window, &w, &h); conf->window_size = glm::ivec2(w, h); glfwGetFramebufferSize(conf->window, &w, &h); @@ -79,7 +79,7 @@ python_screen_viewer::~python_screen_viewer() void python_screen_viewer::threadfunc() { - for (auto &window : m_windows) { + for (auto const &window : m_windows) { glfwMakeContextCurrent(window->window); glfwSwapInterval(Global.python_vsync ? 1 : 0); @@ -90,7 +90,7 @@ void python_screen_viewer::threadfunc() glActiveTexture(GL_TEXTURE0); if (Global.python_sharectx) { - glBindTexture(GL_TEXTURE_2D, m_rt->shared_tex->get_id()); + glBindTexture(GL_TEXTURE_2D, static_cast(m_rt->shared_tex->get_id())); } else { GLuint tex; @@ -115,13 +115,16 @@ void python_screen_viewer::threadfunc() { auto start_time = std::chrono::high_resolution_clock::now(); - for (auto &window : m_windows) { + for (auto const &window : m_windows) { unsigned char *image = nullptr; - int format, components, width, height; + int format; + int components; + int width; + int height; if (!Global.python_sharectx) { - std::lock_guard guard(m_rt->mutex); + std::scoped_lock guard(m_rt->mutex); if (window->timestamp == m_rt->timestamp) continue; @@ -185,9 +188,9 @@ void python_screen_viewer::threadfunc() } } -void python_screen_viewer::notify_window_fb_size(GLFWwindow *window, int w, int h) +void python_screen_viewer::notify_window_fb_size(GLFWwindow const *window, int w, int h) const { - for (auto &conf : m_windows) { + for (auto const &conf : m_windows) { if (conf->window == window) { conf->fb_size.x = w; conf->fb_size.y = h; @@ -196,9 +199,9 @@ void python_screen_viewer::notify_window_fb_size(GLFWwindow *window, int w, int } } -void python_screen_viewer::notify_window_size(GLFWwindow *window, int w, int h) +void python_screen_viewer::notify_window_size(GLFWwindow const *window, int w, int h) const { - for (auto &conf : m_windows) { + for (auto const &conf : m_windows) { if (conf->window == window) { conf->window_size.x = w; conf->window_size.y = h; @@ -207,23 +210,23 @@ void python_screen_viewer::notify_window_size(GLFWwindow *window, int w, int h) } } -void python_screen_viewer::notify_cursor_pos(GLFWwindow *window, double x, double y) +void python_screen_viewer::notify_cursor_pos(GLFWwindow const *window, double x, double y) const { - for (auto &conf : m_windows) { + for (auto const &conf : m_windows) { if (conf->window == window) { - conf->cursor_pos.x = x; - conf->cursor_pos.y = y; + conf->cursor_pos.x = static_cast(x); + conf->cursor_pos.y = static_cast(y); return; } } } -void python_screen_viewer::notify_click(GLFWwindow *window, int button, int action) +void python_screen_viewer::notify_click(GLFWwindow const *window, int button, int action) const { if (button != GLFW_MOUSE_BUTTON_LEFT || action != GLFW_PRESS) return; - for (auto &conf : m_windows) { + for (auto const &conf : m_windows) { if (conf->window == window) { auto pos = glm::vec2(conf->cursor_pos) / glm::vec2(conf->window_size); pos.y = 1.0f - pos.y; diff --git a/scripting/pythonscreenviewer.h b/scripting/pythonscreenviewer.h index bd0634c33..ccd78f0ef 100644 --- a/scripting/pythonscreenviewer.h +++ b/scripting/pythonscreenviewer.h @@ -35,11 +35,11 @@ class python_screen_viewer void threadfunc(); public: - python_screen_viewer(std::shared_ptr rt, std::shared_ptr> touchlist, std::string name); + python_screen_viewer(std::shared_ptr rt, std::shared_ptr> touchlist, std::string const &name); ~python_screen_viewer(); - void notify_window_size(GLFWwindow *window, int w, int h); - void notify_window_fb_size(GLFWwindow *window, int w, int h); - void notify_cursor_pos(GLFWwindow *window, double x, double y); - void notify_click(GLFWwindow *window, int button, int action); + void notify_window_size(GLFWwindow const *window, int w, int h) const; + void notify_window_fb_size(GLFWwindow const *window, int w, int h) const; + void notify_cursor_pos(GLFWwindow const *window, double x, double y) const; + void notify_click(GLFWwindow const *window, int button, int action) const; }; diff --git a/simulation/simulationenvironment.cpp b/simulation/simulationenvironment.cpp index 6c4061c40..14ad2353c 100644 --- a/simulation/simulationenvironment.cpp +++ b/simulation/simulationenvironment.cpp @@ -46,11 +46,10 @@ world_environment::compute_season( int const Yearday ) { { 341, "autumn:" }, { 366, "winter:" } }; auto const lookup = - std::lower_bound( - std::begin( seasonsequence ), std::end( seasonsequence ), + std::ranges::lower_bound( + seasonsequence, std::clamp( Yearday, 1, seasonsequence.back().first ), - []( dayseasonpair const &Left, const int Right ) { - return Left.first < Right; } ); + {}, &dayseasonpair::first ); Global.Season = lookup->second; // season can affect the weather so if it changes, re-calculate weather as well @@ -59,7 +58,7 @@ world_environment::compute_season( int const Yearday ) { // calculates current weather void -world_environment::compute_weather() { +world_environment::compute_weather() const { Global.Weather = Global.Overcast <= 0.10 ? "clear:" : Global.Overcast <= 0.50 ? "scattered:" : @@ -196,7 +195,7 @@ world_environment::update() { if( true == (FreeFlyModeFlag || Global.CabWindowOpen) && Global.Weather == "rain:" ) { if( m_rainsound.is_combined() ) { - m_rainsound.pitch( Global.Overcast - 1.0 ); + m_rainsound.pitch( static_cast(Global.Overcast - 1.0) ); } m_rainsound .gain( m_rainsound.m_amplitudeoffset + m_rainsound.m_amplitudefactor * 1.f ) @@ -228,12 +227,12 @@ world_environment::update_wind() { m_wind.change_time -= timedelta; if( m_wind.change_time < 0 ) { - m_wind.change_time = Random( 5, 15 ); - m_wind.velocity_change = Random( -0.2, 0.2 ); + m_wind.change_time = static_cast(Random( 5, 15 )); + m_wind.velocity_change = static_cast(Random( -0.2, 0.2 )); if( Random() < 0.05 ) { // changes in wind direction should be less frequent than changes in wind speed // TBD, TODO: configuration-driven direction change frequency - m_wind.azimuth_change = Random( -5, 5 ); + m_wind.azimuth_change = static_cast(Random( -5, 5 )); } else { // keep direction change periods short, to avoid too drastic changes in direction diff --git a/simulation/simulationenvironment.h b/simulation/simulationenvironment.h index f4114d53f..218a2d18c 100644 --- a/simulation/simulationenvironment.h +++ b/simulation/simulationenvironment.h @@ -38,7 +38,7 @@ public: // calculates current season of the year based on set simulation date void compute_season( int const Yearday ); // calculates current weather - void compute_weather(); + void compute_weather() const; // data access inline auto const & sun() const { diff --git a/simulation/simulationtime.cpp b/simulation/simulationtime.cpp index f1683c534..6f9f87a5f 100644 --- a/simulation/simulationtime.cpp +++ b/simulation/simulationtime.cpp @@ -27,20 +27,20 @@ scenario_time::init(std::time_t timestamp) { ::memcpy( m_monthdaycounts, monthdaycounts, sizeof( monthdaycounts ) ); // potentially adjust scenario clock - auto const requestedtime { clamp_circular( m_time.wHour * 60 + m_time.wMinute + Global.ScenarioTimeOffset * 60, 24 * 60 ) }; + auto const requestedtime { clamp_circular( static_cast(m_time.wHour * 60 + m_time.wMinute + Global.ScenarioTimeOffset * 60), 24 * 60 ) }; auto const requestedhour { requestedtime / 60 % 24 }; auto const requestedminute { requestedtime % 60 }; // cache requested elements, if any std::tm const tm = utc_tm(timestamp); std::tm const *tms = &tm; - m_time.wYear = tms->tm_year + 1900; - m_time.wMonth = tms->tm_mon + 1; - m_time.wDayOfWeek = tms->tm_wday; - m_time.wDay = tms->tm_mday; - m_time.wHour = tms->tm_hour; - m_time.wMinute = tms->tm_min; - m_time.wSecond = tms->tm_sec; + m_time.wYear = static_cast(tms->tm_year + 1900); + m_time.wMonth = static_cast(tms->tm_mon + 1); + m_time.wDayOfWeek = static_cast(tms->tm_wday); + m_time.wDay = static_cast(tms->tm_mday); + m_time.wHour = static_cast(tms->tm_hour); + m_time.wMinute = static_cast(tms->tm_min); + m_time.wSecond = static_cast(tms->tm_sec); m_time.wMilliseconds = 0; if( Global.fMoveLight > 0.0 ) { @@ -67,7 +67,8 @@ scenario_time::init(std::time_t timestamp) { long DaylightBias; SYSTEMTIME StandardDate; SYSTEMTIME DaylightDate; - } timezoneinfo = { -60, 0, -60, { 0, 10, 0, 5, 3, 0, 0, 0 }, { 0, 3, 0, 5, 2, 0, 0, 0 } }; + }; + registry_time_zone_info timezoneinfo = { -60, 0, -60, { 0, 10, 0, 5, 3, 0, 0, 0 }, { 0, 3, 0, 5, 2, 0, 0, 0 } }; convert_transition_time( timezoneinfo.StandardDate ); convert_transition_time( timezoneinfo.DaylightDate ); @@ -83,7 +84,7 @@ scenario_time::init(std::time_t timestamp) { zonebias += timezoneinfo.StandardBias; } - m_timezonebias = zonebias / 60.0; + m_timezonebias = static_cast(zonebias) / 60.0; } void @@ -95,7 +96,7 @@ scenario_time::update( double const Deltatime ) { ++m_time.wSecond; m_milliseconds -= 1000.0; } - m_time.wMilliseconds = std::floor( m_milliseconds ); + m_time.wMilliseconds = static_cast(std::floor( m_milliseconds )); while( m_time.wSecond >= 60 ) { ++m_time.wMinute; @@ -133,10 +134,10 @@ scenario_time::update( double const Deltatime ) { int scenario_time::year_day( int Day, const int Month, const int Year ) const { - char const daytab[ 2 ][ 13 ] = { + std::array, 2> const daytab = {{ { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, { 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } - }; + }}; int const leap { is_leap( Year ) }; for( int i = 1; i < Month; ++i ) @@ -146,12 +147,12 @@ scenario_time::year_day( int Day, const int Month, const int Year ) const { } void -scenario_time::daymonth( WORD &Day, WORD &Month, WORD const Year, WORD const Yearday ) { +scenario_time::daymonth( WORD &Day, WORD &Month, WORD const Year, WORD const Yearday ) const { - WORD daytab[ 2 ][ 13 ] = { + std::array, 2> const daytab = {{ { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 }, { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 } - }; + }}; int const leap { is_leap( Year ) }; WORD idx = 1; @@ -166,20 +167,19 @@ scenario_time::daymonth( WORD &Day, WORD &Month, WORD const Year, WORD const Yea int scenario_time::julian_day() const { - int yy = ( m_time.wYear < 0 ? m_time.wYear + 1 : m_time.wYear ) - std::floor( ( 12 - m_time.wMonth ) / 10.f ); + auto yy = static_cast( m_time.wYear - std::floor( ( 12 - m_time.wMonth ) / 10.f )); int mm = m_time.wMonth + 9; if( mm >= 12 ) { mm -= 12; } - int K1 = std::floor( 365.25 * ( yy + 4712 ) ); - int K2 = std::floor( 30.6 * mm + 0.5 ); + auto K1 = static_cast(std::floor( 365.25 * ( yy + 4712 ) )); + auto K2 = static_cast(std::floor( 30.6 * mm + 0.5 )); // for dates in Julian calendar int JD = K1 + K2 + m_time.wDay + 59; // for dates in Gregorian calendar; 2299160 is October 15th, 1582 - const int gregorianswitchday = 2299160; - if( JD > gregorianswitchday ) { + if( const int gregorianswitchday = 2299160; JD > gregorianswitchday ) { - int K3 = std::floor( std::floor( yy * 0.01 + 49 ) * 0.75 ) - 38; + auto K3 = static_cast(std::floor( std::floor( yy * 0.01 + 49 ) * 0.75 ) - 38); JD -= K3; } @@ -188,8 +188,8 @@ scenario_time::julian_day() const { void scenario_time::set_time(int yearday, int minute) { m_yearday = yearday; - daymonth(m_time.wDay, m_time.wMonth, m_time.wYear, m_yearday); - m_time.wHour = minute / 60; + daymonth(m_time.wDay, m_time.wMonth, m_time.wYear, static_cast(m_yearday)); + m_time.wHour = static_cast(minute / 60); m_time.wMinute = minute % 60; } @@ -219,10 +219,10 @@ scenario_time::day_of_month( int const Week, int const Weekday, int const Month, if( Week == 5 ) { // 5th week potentially indicates last week in the month, not necessarily actual 5th - char const daytab[ 2 ][ 13 ] = { + std::array, 2> const daytab = {{ { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, { 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } - }; + }}; int const leap { is_leap( Year ) }; while( day > daytab[ leap ][ Month ] ) { @@ -246,7 +246,7 @@ void scenario_time::convert_transition_time( SYSTEMTIME &Time ) const { // NOTE: windows uses 0-6 range for days of week numbering, our methods use 1-7 - Time.wDay = day_of_month( Time.wDay, Time.wDayOfWeek + 1, Time.wMonth, m_time.wYear ); + Time.wDay = static_cast(day_of_month( Time.wDay, Time.wDayOfWeek + 1, Time.wMonth, m_time.wYear )); } bool diff --git a/simulation/simulationtime.h b/simulation/simulationtime.h index 49e1a012d..aae98ee82 100644 --- a/simulation/simulationtime.h +++ b/simulation/simulationtime.h @@ -56,7 +56,7 @@ private: convert_transition_time( SYSTEMTIME &Time ) const; // calculates day and month from given day of year void - daymonth( WORD &Day, WORD &Month, WORD const Year, WORD const Yearday ); + daymonth( WORD &Day, WORD &Month, WORD const Year, WORD const Yearday ) const; // calculates day of year from given date int year_day( int Day, int const Month, int const Year ) const; diff --git a/utilities/Float3d.cpp b/utilities/Float3d.cpp index 29a634562..a1e4f0db4 100644 --- a/utilities/Float3d.cpp +++ b/utilities/Float3d.cpp @@ -15,27 +15,33 @@ http://mozilla.org/MPL/2.0/. void float4x4::deserialize_float32(std::istream &s) { - for (size_t i = 0; i < 16; i++) - e[i] = sn_utils::ld_float32(s); + for (auto &elemententry : e) + elemententry = sn_utils::ld_float32(s); } void float4x4::deserialize_float64(std::istream &s) { - for (size_t i = 0; i < 16; i++) - e[i] = (float)sn_utils::ld_float64(s); + for (auto &elemententry : e) + elemententry = (float)sn_utils::ld_float64(s); } -void float4x4::serialize_float32(std::ostream &s) +void float4x4::serialize_float32(std::ostream &s) const { - for (size_t i = 0; i < 16; i++) - sn_utils::ls_float32(s, e[i]); + for (auto &element : e) + sn_utils::ls_float32(s, element); } -void float4x4::Quaternion(float4 *q) +void float4x4::Quaternion(float4 const *q) { // konwersja kwaternionu obrotu na macierz obrotu - float xx = q->x * q->x, yy = q->y * q->y, zz = q->z * q->z; - float xy = q->x * q->y, xz = q->x * q->z, yz = q->y * q->z; - float wx = q->w * q->x, wy = q->w * q->y, wz = q->w * q->z; + float xx = q->x * q->x; + float yy = q->y * q->y; + float zz = q->z * q->z; + float xy = q->x * q->y; + float xz = q->x * q->z; + float yz = q->y * q->z; + float wx = q->w * q->x; + float wy = q->w * q->y; + float wz = q->w * q->z; e[0] = 1.0f - yy - yy - zz - zz; e[1] = xy + xy + wz + wz; e[2] = xz + xz - wy - wy; diff --git a/utilities/Float3d.h b/utilities/Float3d.h index 1e5e98928..027d4e89b 100644 --- a/utilities/Float3d.h +++ b/utilities/Float3d.h @@ -15,14 +15,11 @@ http://mozilla.org/MPL/2.0/. class float3 { // wapółrzędne wierchołka 3D o pojedynczej precyzji public: - float x, y, z; - float3(void){}; - float3(float a, float b, float c) - { - x = a; - y = b; - z = c; - }; + float x; + float y; + float z; + float3() = default; + float3(float a, float b, float c) : x(a), y(b), z(c) {} float Length() const; float LengthSquared() const; @@ -74,7 +71,11 @@ inline float3 SafeNormalize(const float3 &v) auto const l = v.Length(); float3 retVal; if (l == 0) - retVal.x = retVal.y = retVal.z = 0; + { + retVal.x = 0; + retVal.y = 0; + retVal.z = 0; + } else retVal = v / l; return retVal; @@ -96,26 +97,19 @@ inline float3 Interpolate( float3 const &First, float3 const &Second, float cons class float4 { // kwaternion obrotu public: - float x, y, z, w; - float4() - { - x = y = z = 0.f; - w = 1.f; - }; - float4(float a, float b, float c, float d) - { - x = a; - y = b; - z = c; - w = d; - }; + float x; + float y; + float z; + float w; + float4() : x(0.f), y(0.f), z(0.f), w(1.f) {} + float4(float a, float b, float c, float d) : x(a), y(b), z(c), w(d) {} float inline LengthSquared() const { return x * x + y * y + z * z + w * w; }; float inline Length() const { - return sqrt(x * x + y * y + z * z + w * w); + return static_cast(sqrt(x * x + y * y + z * z + w * w)); }; }; inline float4 operator*(const float4 &q1, const float4 &q2) @@ -177,7 +171,8 @@ inline float4 Slerp(const float4 &q0, const float4 &q1, float t) new_q1.w = -new_q1.w; cosOmega = -cosOmega; } - float k0, k1; + float k0; + float k1; if (cosOmega > 0.9999f) { // jeśli jesteśmy z (t) na maksimum kosinusa, to tam prawie liniowo jest k0 = 1.0f - t; @@ -188,8 +183,8 @@ inline float4 Slerp(const float4 &q0, const float4 &q1, float t) auto const sinOmega = std::sqrt(1.0f - cosOmega * cosOmega); // sinus z jedynki tryg. auto const omega = std::atan2(sinOmega, cosOmega); // wyznaczenie kąta auto const oneOverSinOmega = 1.0f / sinOmega; // odwrotność sinusa, bo sinus w mianowniku - k0 = sin((1.0f - t) * omega) * oneOverSinOmega; - k1 = sin(t * omega) * oneOverSinOmega; + k0 = static_cast(sin((1.0f - t) * omega) * oneOverSinOmega); + k1 = static_cast(sin(t * omega) * oneOverSinOmega); } return float4(q0.x * k0 + new_q1.x * k1, q0.y * k0 + new_q1.y * k1, q0.z * k0 + new_q1.z * k1, q0.w * k0 + new_q1.w * k1); @@ -200,7 +195,8 @@ struct float8 public: float3 Point; float3 Normal; - float tu, tv; + float tu; + float tv; }; class float4x4 @@ -210,9 +206,9 @@ public: void deserialize_float32(std::istream&); void deserialize_float64(std::istream&); - void serialize_float32(std::ostream&); - float4x4(void){}; - float4x4(const float f[16]) + void serialize_float32(std::ostream&) const; + float4x4() = default; + explicit float4x4(const float f[16]) { for (int i = 0; i < 16; ++i) e[i] = f[i]; @@ -227,9 +223,12 @@ public: } void Identity() { - for (int i = 0; i < 16; ++i) - e[i] = 0; - e[0] = e[5] = e[10] = e[15] = 1.0f; + for (auto &element : e) + element = 0; + e[0] = 1.0f; + e[5] = 1.0f; + e[10] = 1.0f; + e[15] = 1.0f; } const float *operator[](int i) const { @@ -246,15 +245,15 @@ public: e[i + 2] = f; // zamiana Y i Z } }; - inline float4x4 &Rotation(float const angle, float3 const &axis); - inline bool IdentityIs() + float4x4 &Rotation(float const angle, float3 const &axis); + inline bool IdentityIs() const { // sprawdzenie jednostkowości for (int i = 0; i < 16; ++i) if (e[i] != (i % 5 ? 0.0 : 1.0)) // jedynki tylko na 0, 5, 10 i 15 return false; return true; } - void Quaternion(float4 *q); + void Quaternion(float4 const *q); inline float3 *TranslationGet() { return (float3 *)(e + 12); @@ -345,10 +344,22 @@ inline float Det3x3(float a1, float a2, float a3, float b1, float b2, float b3, inline float Det(const float4x4 &m) { // obliczenie wyznacznika macierzy 4×4 - float a1 = m[0][0], a2 = m[1][0], a3 = m[2][0], a4 = m[3][0]; - float b1 = m[0][1], b2 = m[1][1], b3 = m[2][1], b4 = m[3][1]; - float c1 = m[0][2], c2 = m[1][2], c3 = m[2][2], c4 = m[3][2]; - float d1 = m[0][3], d2 = m[1][3], d3 = m[2][3], d4 = m[3][3]; + float a1 = m[0][0]; + float a2 = m[1][0]; + float a3 = m[2][0]; + float a4 = m[3][0]; + float b1 = m[0][1]; + float b2 = m[1][1]; + float b3 = m[2][1]; + float b4 = m[3][1]; + float c1 = m[0][2]; + float c2 = m[1][2]; + float c3 = m[2][2]; + float c4 = m[3][2]; + float d1 = m[0][3]; + float d2 = m[1][3]; + float d3 = m[2][3]; + float d4 = m[3][3]; return +a1 * Det3x3(b2, b3, b4, c2, c3, c4, d2, d3, d4) - b1 * Det3x3(a2, a3, a4, c2, c3, c4, d2, d3, d4) + c1 * Det3x3(a2, a3, a4, b2, b3, b4, d2, d3, d4) - diff --git a/utilities/Logs.cpp b/utilities/Logs.cpp index 5b4d1d9aa..38f8062b9 100644 --- a/utilities/Logs.cpp +++ b/utilities/Logs.cpp @@ -10,6 +10,8 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "utilities/Logs.h" +#include + #include "utilities/Globals.h" #include "winheaders.h" #include "utilities/utilities.h" @@ -19,9 +21,8 @@ http://mozilla.org/MPL/2.0/. std::ofstream output; // standardowy "log.txt", można go wyłączyć std::ofstream errors; // lista błędów "errors.txt", zawsze działa std::ofstream comms; // lista komunikatow "comms.txt", można go wyłączyć -char logbuffer[ 256 ]; -char endstring[10] = "\n"; +char const endstring[10] = "\n"; std::deque log_scrollback; @@ -33,30 +34,26 @@ std::string filename_date() { clock_gettime(CLOCK_REALTIME, &ts); std::tm const tm = local_tm(ts.tv_sec); std::tm const *tms = &tm; - st.wYear = tms->tm_year; - st.wMonth = tms->tm_mon; - st.wDayOfWeek = tms->tm_wday; - st.wDay = tms->tm_mday; - st.wHour = tms->tm_hour; - st.wMinute = tms->tm_min; - st.wSecond = tms->tm_sec; - st.wMilliseconds = ts.tv_nsec / 1000000; + st.wYear = static_cast(tms->tm_year); + st.wMonth = static_cast(tms->tm_mon); + st.wDayOfWeek = static_cast(tms->tm_wday); + st.wDay = static_cast(tms->tm_mday); + st.wHour = static_cast(tms->tm_hour); + st.wMinute = static_cast(tms->tm_min); + st.wSecond = static_cast(tms->tm_sec); + st.wMilliseconds = static_cast(ts.tv_nsec / 1000000); #elif _WIN32 ::GetLocalTime( &st ); #endif - std::snprintf( - logbuffer, - sizeof(logbuffer), - "%d%02d%02d_%02d%02d%03d", + return std::format( + "{}{:02}{:02}_{:02}{:02}{:03}", st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wMilliseconds); - - return std::string( logbuffer ); } std::string filename_scenery() { @@ -174,8 +171,8 @@ void WriteLog(std::string_view str, logtype type, bool isError) const auto message = FormatLogMessage(str); - std::lock_guard lock(logMutex); - InfoStack.push_back({message, isError}); + std::scoped_lock lock(logMutex); + InfoStack.emplace_back(message, isError); } void ErrorLog(std::string_view str, logtype type) @@ -185,7 +182,7 @@ void ErrorLog(std::string_view str, logtype type) const auto message = FormatLogMessage(str); - std::lock_guard lock(logMutex); + std::scoped_lock lock(logMutex); ErrorStack.push_back(message); } @@ -206,14 +203,14 @@ void ErrorLog(const char* str, logtype type) } -void Error(const std::string &asMessage, bool box) +void Error(const std::string &asMessage, bool /*box*/) { // if (box) // MessageBox(NULL, asMessage.c_str(), string("EU07 " + Global.asRelease).c_str(), MB_OK); - ErrorLog(asMessage.c_str()); + ErrorLog(asMessage); } -void Error(const char *&asMessage, bool box) +void Error(const char *&asMessage, bool /*box*/) { // if (box) // MessageBox(NULL, asMessage, string("EU07 " + Global.asRelease).c_str(), MB_OK); diff --git a/utilities/Timer.cpp b/utilities/Timer.cpp index 5cc9f93ac..0b877f2b4 100644 --- a/utilities/Timer.cpp +++ b/utilities/Timer.cpp @@ -16,7 +16,8 @@ namespace Timer { subsystem_stopwatches subsystem; -double DeltaTime = 0.0, DeltaRenderTime = 0.0; +double DeltaTime = 0.0; +double DeltaRenderTime = 0.0; double fFPS{ 0.0f }; double fLastTime{ 0.0f }; DWORD dwFrames{ 0 }; @@ -59,7 +60,9 @@ void ResetTimers() DeltaRenderTime = 0.0; } -uint64_t fr, count, oldCount; +uint64_t fr; +uint64_t count; +uint64_t oldCount; void UpdateTimers(bool pause) { @@ -92,7 +95,7 @@ void UpdateTimers(bool pause) oldCount = count; // Keep track of the time lapse and frame count #if __unix__ - double fTime = (double)(count / 1000000000); + auto fTime = (double)(count / 1000000000); #elif _WIN32_WINNT >= _WIN32_WINNT_VISTA double fTime = ::GetTickCount64() * 0.001f; // Get current time in seconds #elif _WIN32 diff --git a/utilities/Timer.h b/utilities/Timer.h index 0e47e14c3..32e170a46 100644 --- a/utilities/Timer.h +++ b/utilities/Timer.h @@ -35,7 +35,7 @@ public: std::chrono::duration stop() { m_last = std::chrono::duration_cast( std::chrono::steady_clock::now() - m_start ); - m_accumulator = 0.95f * m_accumulator + m_last.count() / 1000.f; + m_accumulator = 0.95f * m_accumulator + static_cast(m_last.count()) / 1000.f; return m_last; } float average() const { diff --git a/utilities/color.h b/utilities/color.h index 76aecf166..be853a3d4 100644 --- a/utilities/color.h +++ b/utilities/color.h @@ -59,10 +59,10 @@ RGBtoHSV( glm::vec3 const &RGB ) { else hsv.x = 4.f + ( RGB.r - RGB.g ) / delta; // between magenta & cyan - hsv.x *= 60.0; // degrees + hsv.x *= 60.0f; // degrees if( hsv.x < 0.0 ) - hsv.x += 360.0; + hsv.x += 360.0f; return hsv; } @@ -81,9 +81,9 @@ HSVtoRGB( glm::vec3 const &HSV ) { } float hh = HSV.x; if( hh >= 360.0 ) hh = 0.0; - hh /= 60.0; - int const i = (int)hh; - float const ff = hh - i; + hh /= 60.0f; + auto const i = (int)hh; + float const ff = hh - static_cast(i); float const p = HSV.z * ( 1.f - HSV.y ); float const q = HSV.z * ( 1.f - HSV.y * ff ); float const t = HSV.z * ( 1.f - HSV.y * (1.f - ff) ); diff --git a/utilities/comparison.h b/utilities/comparison.h index 84f797a5e..f0fc5d0af 100644 --- a/utilities/comparison.h +++ b/utilities/comparison.h @@ -27,12 +27,13 @@ enum class comparison_pass { template bool compare( Type_ const Left, Type_ const Right, comparison_operator const Operator ) { switch( Operator ) { - case comparison_operator::equal: { return Left == Right; } - case comparison_operator::not_equal: { return Left != Right; } - case comparison_operator::lt: { return Left < Right; } - case comparison_operator::gt: { return Left > Right; } - case comparison_operator::lt_eq: { return Left <= Right; } - case comparison_operator::gt_eq: { return Left >= Right; } + using enum comparison_operator; + case equal: { return Left == Right; } + case not_equal: { return Left != Right; } + case lt: { return Left < Right; } + case gt: { return Left > Right; } + case lt_eq: { return Left <= Right; } + case gt_eq: { return Left >= Right; } default: { return false; } } } @@ -41,37 +42,40 @@ inline std::string to_string( comparison_operator const Operator ) { switch( Operator ) { - case comparison_operator::equal: { return "=="; } - case comparison_operator::not_equal: { return "!="; } - case comparison_operator::lt: { return "<"; } - case comparison_operator::gt: { return ">"; } - case comparison_operator::lt_eq: { return "<="; } - case comparison_operator::gt_eq: { return ">"; } + using enum comparison_operator; + case equal: { return "=="; } + case not_equal: { return "!="; } + case lt: { return "<"; } + case gt: { return ">"; } + case lt_eq: { return "<="; } + case gt_eq: { return ">"; } default: { return "??"; } } } inline comparison_pass -comparison_pass_from_string( std::string const Input ) { - if( Input == "all" ) { return comparison_pass::all; } - else if( Input == "any" ) { return comparison_pass::any; } - else if( Input == "none" ) { return comparison_pass::none; } +comparison_pass_from_string( std::string const &Input ) { + using enum comparison_pass; + if( Input == "all" ) { return all; } + else if( Input == "any" ) { return any; } + else if( Input == "none" ) { return none; } - return comparison_pass::all; // legacy default + return all; // legacy default } inline comparison_operator -comparison_operator_from_string( std::string const Input ) { - if( Input == "==" ) { return comparison_operator::equal; } - else if( Input == "!=" ) { return comparison_operator::not_equal; } - else if( Input == "<" ) { return comparison_operator::lt; } - else if( Input == ">" ) { return comparison_operator::gt; } - else if( Input == "<=" ) { return comparison_operator::lt_eq; } - else if( Input == ">=" ) { return comparison_operator::gt_eq; } +comparison_operator_from_string( std::string const &Input ) { + using enum comparison_operator; + if( Input == "==" ) { return equal; } + else if( Input == "!=" ) { return not_equal; } + else if( Input == "<" ) { return lt; } + else if( Input == ">" ) { return gt; } + else if( Input == "<=" ) { return lt_eq; } + else if( Input == ">=" ) { return gt_eq; } - return comparison_operator::equal; // legacy default + return equal; // legacy default } //--------------------------------------------------------------------------- diff --git a/utilities/dictionary.h b/utilities/dictionary.h index 1532b4926..f45545838 100644 --- a/utilities/dictionary.h +++ b/utilities/dictionary.h @@ -23,11 +23,11 @@ struct dictionary_source { keyvaluepair_sequence> vec2_lists; // constructors dictionary_source() = default; - dictionary_source( std::string const &Input ); + explicit dictionary_source( std::string const &Input ); // methods inline void insert( std::string const &Key, double const Value ) { floats.emplace_back( Key, Value ); } inline void insert( std::string const &Key, int const Value ) { integers.emplace_back( Key, Value ); } inline void insert( std::string const &Key, bool const Value ) { bools.emplace_back( Key, Value ); } - inline void insert( std::string const &Key, std::string const Value ) { strings.emplace_back( Key, Value ); } - inline void insert( std::string const &Key, std::vector const Value ) { vec2_lists.emplace_back( Key, Value ); } + inline void insert( std::string const &Key, std::string const &Value ) { strings.emplace_back( Key, Value ); } + inline void insert( std::string const &Key, std::vector const &Value ) { vec2_lists.emplace_back( Key, Value ); } }; diff --git a/utilities/headtrack.cpp b/utilities/headtrack.cpp index caf62bee3..b6085bc1c 100644 --- a/utilities/headtrack.cpp +++ b/utilities/headtrack.cpp @@ -2,19 +2,16 @@ #include "utilities/headtrack.h" #include "utilities/Globals.h" -headtrack::headtrack() -{ - -} +headtrack::headtrack() = default; void headtrack::find_joy() { for (size_t i = GLFW_JOYSTICK_1; i <= GLFW_JOYSTICK_LAST; i++) { - if (!glfwJoystickPresent(i)) + if (!glfwJoystickPresent(static_cast(i))) continue; - std::string name(glfwGetJoystickName(i)); + std::string name(glfwGetJoystickName(static_cast(i))); if (name == Global.headtrack_conf.joy) { - joy_id = i; + joy_id = static_cast(i); return; } } @@ -22,7 +19,7 @@ void headtrack::find_joy() { joy_id = -1; } -float headtrack::get_axis(const float *data, int count, int axis, float mul) { +float headtrack::get_axis(const float *data, int count, int axis, float mul) const { if (axis < 0) return 0.0f; if (axis >= count) diff --git a/utilities/headtrack.h b/utilities/headtrack.h index e22cbe79d..65d804d2c 100644 --- a/utilities/headtrack.h +++ b/utilities/headtrack.h @@ -5,7 +5,7 @@ class headtrack int joy_id = -1; void find_joy(); - float get_axis(const float *data, int count, int axis, float mul); + float get_axis(const float *data, int count, int axis, float mul) const; public: headtrack(); diff --git a/utilities/motiontelemetry.cpp b/utilities/motiontelemetry.cpp index 473970d72..b0dd02dc1 100644 --- a/utilities/motiontelemetry.cpp +++ b/utilities/motiontelemetry.cpp @@ -28,7 +28,8 @@ motiontelemetry::motiontelemetry() throw std::runtime_error("failed to init winsock"); #endif - struct addrinfo hints, *res; + struct addrinfo hints; + struct addrinfo *res; memset(&hints, 0, sizeof(hints)); hints.ai_family = AF_UNSPEC; @@ -72,9 +73,9 @@ void motiontelemetry::update() double dt = Timer::GetDeltaTime(); - glm::dvec3 front = t->Dynamic()->VectorFront(); + glm::dvec3 frontvector = t->Dynamic()->VectorFront(); glm::dvec3 up = t->Dynamic()->VectorUp(); - glm::dvec3 left = t->Dynamic()->VectorLeft(); + glm::dvec3 leftvector = t->Dynamic()->VectorLeft(); glm::dvec3 pos = t->Dynamic()->GetPosition(); glm::dvec3 vel = (pos - last_pos) / dt; @@ -85,18 +86,18 @@ void motiontelemetry::update() if (conf.includegravity) { glm::dvec3 gravity(0.0, 9.81, 0.0); - local_acc = glm::dvec3(-glm::dot(gravity, left), glm::dot(gravity, up), glm::dot(gravity, front)); + local_acc = glm::dvec3(-glm::dot(gravity, leftvector), glm::dot(gravity, up), glm::dot(gravity, frontvector)); } if (conf.latposbased) - local_acc.x -= glm::dot(acc, left); + local_acc.x -= glm::dot(acc, leftvector); else local_acc.x -= t->Occupied()->AccN; local_acc.y += glm::dot(acc, up) + t->Occupied()->AccVert * conf.axlebumpscale; if (conf.fwdposbased) - local_acc.z += glm::dot(acc, front); + local_acc.z += glm::dot(acc, frontvector); else local_acc.z += t->Occupied()->AccSVBased; @@ -105,16 +106,16 @@ void motiontelemetry::update() // roll calculation, maybe too complicated? // transform to left-handed - front.z *= -1; + frontvector.z *= -1; up.z *= -1; // make sure that vectors are orthonormal - glm::dvec3 oright = glm::normalize(glm::cross(up, front)); - glm::dvec3 oup = glm::cross(front, oright); + glm::dvec3 oright = glm::normalize(glm::cross(up, frontvector)); + glm::dvec3 oup = glm::cross(frontvector, oright); // right and up vector without roll - glm::dvec3 right0 = glm::normalize(glm::cross(glm::dvec3(0.0, 1.0, 0.0), front)); - glm::dvec3 up0 = glm::cross(front, right0); + glm::dvec3 right0 = glm::normalize(glm::cross(glm::dvec3(0.0, 1.0, 0.0), frontvector)); + glm::dvec3 up0 = glm::cross(frontvector, right0); double cosroll = glm::dot(up0, oup); double sinroll; @@ -126,7 +127,7 @@ void motiontelemetry::update() else sinroll = (up0.z * cosroll - oup.z) / right0.z; - glm::dvec3 rot(asin(-front.y), atan2(front.x, front.z), asin(sinroll)); + glm::dvec3 rot(asin(-frontvector.y), atan2(frontvector.x, frontvector.z), asin(sinroll)); double velocity = t->Occupied()->V; double yaw_vel = (rot.y - last_yaw) / dt; @@ -144,18 +145,18 @@ void motiontelemetry::update() rot *= -1; } - float buffer[12] = { 0 }; - buffer[0] = Timer::GetTime(); - buffer[1] = velocity; - buffer[2] = local_acc.y; - buffer[3] = local_acc.z; - buffer[4] = local_acc.x; - buffer[5] = glm::degrees(rot.x); - buffer[6] = glm::degrees(rot.z); - buffer[7] = glm::degrees(rot.y); - buffer[8] = yaw_vel; + std::array buffer{}; + buffer[0] = static_cast(Timer::GetTime()); + buffer[1] = static_cast(velocity); + buffer[2] = static_cast(local_acc.y); + buffer[3] = static_cast(local_acc.z); + buffer[4] = static_cast(local_acc.x); + buffer[5] = static_cast(glm::degrees(rot.x)); + buffer[6] = static_cast(glm::degrees(rot.z)); + buffer[7] = static_cast(glm::degrees(rot.y)); + buffer[8] = static_cast(yaw_vel); buffer[9] = 1.0f; - if (send(sock, (char*)buffer, sizeof(buffer), 0) == -1) + if (send(sock, reinterpret_cast(buffer.data()), sizeof(buffer), 0) == -1) WriteLog("motiontelemetry: socket send failed"); } diff --git a/utilities/uart.cpp b/utilities/uart.cpp index ab5060fab..632c2b4c6 100644 --- a/utilities/uart.cpp +++ b/utilities/uart.cpp @@ -10,7 +10,7 @@ #include "simulation/simulationtime.h" #include "application/application.h" -const char* uart_baudrates_list[] = { +const char* const uart_baudrates_list[] = { "300", "1200", "2400", @@ -28,7 +28,7 @@ const char* uart_baudrates_list[] = { "2000000" }; -const size_t uart_baudrates_list_num = sizeof(uart_baudrates_list) / sizeof(uart_baudrates_list[0]); +const size_t uart_baudrates_list_num = std::size(uart_baudrates_list); void uart_status::reset_stats() { packets_sent = 0; @@ -193,10 +193,9 @@ uart_input::recall_bindings() { m_inputbindings.clear(); std::string filePath = "eu07_input-uart.ini"; - fs::path appPath = user_config_path("eu07_input-uart.ini"); - if (!appPath.empty() && fs::exists(appPath)) + if (fs::path appPath = user_config_path("eu07_input-uart.ini"); !appPath.empty() && fs::exists(appPath)) filePath = appPath.string(); - cParser bindingparser(filePath.c_str(), cParser::buffer_FILE); + cParser bindingparser(filePath, cParser::buffer_FILE); if (false == bindingparser.ok()) { return false; @@ -206,7 +205,7 @@ uart_input::recall_bindings() { std::unordered_map nametocommandmap; std::size_t commandid = 0; for( auto const &description : simulation::Commands_descriptions ) { - nametocommandmap.emplace( + nametocommandmap.try_emplace( description.name, static_cast( commandid ) ); ++commandid; @@ -275,7 +274,7 @@ void uart_input::poll() /* handle baud change */ if(status->active_baud_index != status->selected_baud_index) { - status->baud = std::stoul(uart_baudrates_list[status->selected_baud_index]); + status->baud = static_cast(std::stoul(uart_baudrates_list[status->selected_baud_index])); status->active_baud_index = status->selected_baud_index; status->reset_stats(); status->is_connected = false; @@ -283,7 +282,7 @@ void uart_input::poll() } /* handle port change */ - if(status->available_ports.size() > 0 && status->selected_port_index >= 0 && status->active_port_index != status->selected_port_index) { + if(!status->available_ports.empty() && status->selected_port_index >= 0 && status->active_port_index != status->selected_port_index) { status->port_name = status->available_ports[status->selected_port_index]; status->active_port_index = status->selected_port_index; status->reset_stats(); @@ -467,7 +466,7 @@ void uart_input::poll() } if( true == conf.trainenable ) { // train brake - double const position { (float)( ( (uint16_t)buffer[ 8 ] | (uint16_t)buffer[9] << 8 ) - conf.mainbrakemin ) / ( conf.mainbrakemax - conf.mainbrakemin ) }; + double const position { ( ( (uint16_t)buffer[ 8 ] | (uint16_t)buffer[9] << 8 ) - conf.mainbrakemin ) / ( conf.mainbrakemax - conf.mainbrakemin ) }; relay.post( user_command::trainbrakeset, position, @@ -478,7 +477,7 @@ void uart_input::poll() } if( true == conf.localenable ) { // independent brake - double const position { (float)( ( (uint16_t)buffer[ 10 ] | (uint16_t)buffer[11] << 8 ) - conf.localbrakemin ) / ( conf.localbrakemax - conf.localbrakemin ) }; + double const position { ( ( (uint16_t)buffer[ 10 ] | (uint16_t)buffer[11] << 8 ) - conf.localbrakemin ) / ( conf.localbrakemax - conf.localbrakemin ) }; relay.post( user_command::independentbrakeset, position, @@ -497,7 +496,7 @@ void uart_input::poll() ); } if( true == conf.radiovolumeenable ) { - int8_t requested_volume = static_cast((buffer[12] & 0xF0) >> 4); + auto requested_volume = static_cast((buffer[12] & 0xF0) >> 4); relay.post( user_command::radiovolumeset, requested_volume == 0xF ? 1.0 : requested_volume * (1.0 / 15.0), @@ -509,7 +508,7 @@ void uart_input::poll() if (true == conf.dynamicenable) { // dynamic brake 8 bit - double const position{(float)(buffer[13] - conf.dynamicbrakemin) / (conf.dynamicbrakemax - conf.dynamicbrakemin)}; + double const position{(buffer[13] - conf.dynamicbrakemin) / (conf.dynamicbrakemax - conf.dynamicbrakemin)}; relay.post( user_command::dynamicbrakecontrollerset, @@ -534,17 +533,17 @@ void uart_input::poll() auto const trainstate = t->get_state(); SYSTEMTIME time = simulation::Time.data(); - uint16_t tacho = Global.iPause ? 0 : trainstate.velocity * conf.tachoscale; - uint16_t tank_press = (uint16_t)std::min(conf.tankuart, trainstate.reservoir_pressure * 0.1f / conf.tankmax * conf.tankuart); - uint16_t pipe_press = (uint16_t)std::min(conf.pipeuart, trainstate.pipe_pressure * 0.1f / conf.pipemax * conf.pipeuart); - uint16_t brake_press = (uint16_t)std::min(conf.brakeuart, trainstate.brake_pressure * 0.1f / conf.brakemax * conf.brakeuart); - uint16_t pantograph_press = (uint16_t)std::min(conf.pantographuart, trainstate.pantograph_pressure * 0.1f / conf.pantographmax * conf.pantographuart ); - uint16_t hv_voltage = (uint16_t)std::min(conf.hvuart, trainstate.hv_voltage / conf.hvmax * conf.hvuart); - uint16_t current1 = (uint16_t)std::min(conf.currentuart, trainstate.hv_current[0] / conf.currentmax * conf.currentuart); - uint16_t current2 = (uint16_t)std::min(conf.currentuart, trainstate.hv_current[1] / conf.currentmax * conf.currentuart); - uint16_t current3 = (uint16_t)std::min(conf.currentuart, trainstate.hv_current[2] / conf.currentmax * conf.currentuart); - uint32_t odometer = trainstate.distance * 10000.0; - uint16_t lv_voltage = (uint16_t)std::min( conf.lvuart, trainstate.lv_voltage / conf.lvmax * conf.lvuart ); + uint16_t tacho = Global.iPause ? 0 : static_cast(trainstate.velocity * conf.tachoscale); + auto tank_press = (uint16_t)std::min(conf.tankuart, trainstate.reservoir_pressure * 0.1f / conf.tankmax * conf.tankuart); + auto pipe_press = (uint16_t)std::min(conf.pipeuart, trainstate.pipe_pressure * 0.1f / conf.pipemax * conf.pipeuart); + auto brake_press = (uint16_t)std::min(conf.brakeuart, trainstate.brake_pressure * 0.1f / conf.brakemax * conf.brakeuart); + auto pantograph_press = (uint16_t)std::min(conf.pantographuart, trainstate.pantograph_pressure * 0.1f / conf.pantographmax * conf.pantographuart ); + auto hv_voltage = (uint16_t)std::min(conf.hvuart, trainstate.hv_voltage / conf.hvmax * conf.hvuart); + auto current1 = (uint16_t)std::min(conf.currentuart, trainstate.hv_current[0] / conf.currentmax * conf.currentuart); + auto current2 = (uint16_t)std::min(conf.currentuart, trainstate.hv_current[1] / conf.currentmax * conf.currentuart); + auto current3 = (uint16_t)std::min(conf.currentuart, trainstate.hv_current[2] / conf.currentmax * conf.currentuart); + uint32_t odometer = static_cast(trainstate.distance * 10000.0); + auto lv_voltage = (uint16_t)std::min( conf.lvuart, trainstate.lv_voltage / conf.lvmax * conf.lvuart ); if( trainstate.cab > 0 ) { // NOTE: moving from a cab to engine room doesn't change cab indicator m_trainstatecab = trainstate.cab - 1; diff --git a/utilities/uart.h b/utilities/uart.h index 1a0f344b2..cee227d10 100644 --- a/utilities/uart.h +++ b/utilities/uart.h @@ -3,7 +3,7 @@ #include #include "input/command.h" -extern const char* uart_baudrates_list[]; +extern const char* const uart_baudrates_list[]; extern const size_t uart_baudrates_list_num; class uart_status { diff --git a/utilities/utilities.cpp b/utilities/utilities.cpp index 804ca66c0..ebeae5b3f 100644 --- a/utilities/utilities.cpp +++ b/utilities/utilities.cpp @@ -17,6 +17,7 @@ Copyright (C) 2007-2014 Maciej Cierniak //#include #include #include +#include //#ifndef WIN32 //#include //#endif @@ -127,14 +128,14 @@ bool ClearFlag(int &Flag, int const Value) double Random(double min, double max) { if (max < min) { std::swap(min, max); } // std::uniform_real_distribution requires min <= max (inverted bounds are UB) - std::uniform_real_distribution dist(min, max); + std::uniform_real_distribution dist(min, max); return dist(Global.random_engine); } int Random(int min, int max) { if (max < min) { std::swap(min, max); } // std::uniform_int_distribution requires min <= max (inverted bounds are UB) - std::uniform_int_distribution dist(min, max); + std::uniform_int_distribution dist(min, max); return dist(Global.random_engine); } @@ -178,7 +179,7 @@ std::uint32_t seed_of(std::string const &Text) std::string generate_uuid_v4() { - std::uniform_int_distribution dist(0, 255); + std::uniform_int_distribution dist(0, 255); std::array bytes; for (auto &b : bytes) @@ -188,22 +189,18 @@ std::string generate_uuid_v4() bytes[6] = bytes[6] & 0x0F | 0x40; bytes[8] = bytes[8] & 0x3F | 0x80; - char buf[37]; // 36 znaków + \0 - std::snprintf(buf, sizeof(buf), - "%02x%02x%02x%02x-" - "%02x%02x-" - "%02x%02x-" - "%02x%02x-" - "%02x%02x%02x%02x%02x%02x", - bytes[0], bytes[1], bytes[2], bytes[3], bytes[4], bytes[5], bytes[6], bytes[7], bytes[8], bytes[9], bytes[10], bytes[11], bytes[12], bytes[13], bytes[14], bytes[15]); - - return std::string(buf); + return std::format("{:02x}{:02x}{:02x}{:02x}-" + "{:02x}{:02x}-" + "{:02x}{:02x}-" + "{:02x}{:02x}-" + "{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}", + bytes[0], bytes[1], bytes[2], bytes[3], bytes[4], bytes[5], bytes[6], bytes[7], bytes[8], bytes[9], bytes[10], bytes[11], bytes[12], bytes[13], bytes[14], bytes[15]); } double LocalRandom(double a, double b) { if (b < a) { std::swap(a, b); } // std::uniform_real_distribution requires a <= b (inverted bounds are UB) - std::uniform_real_distribution dist(a, b); + std::uniform_real_distribution dist(a, b); return dist(Global.local_random_engine); } @@ -252,23 +249,18 @@ std::string to_string(int Value, int width) std::string to_string(double Value, int precision) { - std::ostringstream o; - o << std::fixed << std::setprecision(precision) << Value; - return std::move(o).str(); + return std::format("{:.{}f}", Value, precision); }; std::string to_string(double const Value, int const Precision, int const Width) { - std::ostringstream o; - o << std::setw(Width) << std::fixed << std::setprecision(Precision) << Value; - return std::move(o).str(); + return std::format("{:>{}.{}f}", Value, Width, Precision); }; std::string to_hex_str(int const Value, int const Width) { - std::ostringstream o; - o << "0x" << std::uppercase << std::setfill('0') << std::setw(Width) << std::hex << Value; - return o.str(); + // iostreams print negative values in hex as their unsigned representation + return std::format("0x{:0{}X}", static_cast(Value), Width); }; std::string const fractionlabels[] = {U8(" "), U8("¹"), U8("²"), U8("³"), U8("⁴"), U8("⁵"), U8("⁶"), U8("⁷"), U8("⁸"), U8("⁹")}; @@ -297,7 +289,7 @@ std::string ToLower(std::string const &text) { auto lowercase{text}; - std::transform(std::begin(text), std::end(text), std::begin(lowercase), [](unsigned char c) { return std::tolower(c); }); + std::ranges::transform(text, std::begin(lowercase), [](unsigned char c) { return std::tolower(c); }); return lowercase; } @@ -305,7 +297,7 @@ std::string ToUpper(std::string const &text) { auto uppercase{text}; - std::transform(std::begin(text), std::end(text), std::begin(uppercase), [](unsigned char c) { return std::toupper(c); }); + std::ranges::transform(text, std::begin(uppercase), [](unsigned char c) { return std::toupper(c); }); return uppercase; } @@ -421,7 +413,7 @@ void win1250_to_utf32(std::string const &Text, std::u32string &Output) } // Ra: tymczasowe rozwiązanie kwestii zagranicznych (czeskich) napisów -char charsetconversiontable[] = "E?,?\"_++?%Sstzz" +char const charsetconversiontable[] = "E?,?\"_++?%Sstzz" " ^^L$A|S^CS<--RZo±,l'uP.,as>L\"lz" "RAAAALCCCEEEEIIDDNNOOOOxRUUUUYTB" "raaaalccceeeeiiddnnoooo-ruuuuyt?"; @@ -607,7 +599,7 @@ std::string deserialize_random_set(cParser &Input, char const *Break) { auto token{Input.getToken(true, Break)}; - std::replace(token.begin(), token.end(), '\\', '/'); + std::ranges::replace(token, '\\', '/'); if (token != "[") { // simple case, single token @@ -622,7 +614,7 @@ std::string deserialize_random_set(cParser &Input, char const *Break) } if (false == tokens.empty()) { - std::shuffle(std::begin(tokens), std::end(tokens), Global.random_engine); + std::ranges::shuffle(tokens, Global.random_engine); return tokens.front(); } else diff --git a/utilities/utilities.h b/utilities/utilities.h index 6b8111e33..5392ba6c5 100644 --- a/utilities/utilities.h +++ b/utilities/utilities.h @@ -100,7 +100,7 @@ inline double LocalRandom(double b) inline double BorlandTime() { auto timesinceepoch = std::time(nullptr); - return timesinceepoch / (24.0 * 60 * 60); + return static_cast(timesinceepoch) / (24.0 * 60 * 60); /* // std alternative auto timesinceepoch = std::chrono::system_clock::now().time_since_epoch(); @@ -176,8 +176,7 @@ inline std::string extract_value(std::string const &Key, std::string const &Inpu // NOTE, HACK: the leading space allows to uniformly look for " variable=" substring std::string const input{" " + Input}; std::string value; - auto lookup = input.find(" " + Key + "="); - if (lookup != std::string::npos) + if (auto lookup = input.find(" " + Key + "="); lookup != std::string::npos) { value = input.substr(input.find_first_not_of(' ', lookup + Key.size() + 2)); lookup = value.find(' '); @@ -315,7 +314,7 @@ template T clamp_power_of_two(T Value, T const Min = T(1), T const template Type_ quantize(Type_ const Value, Type_ const Step) { - return Step * std::round(Value / Step); + return static_cast(Step * std::round(Value / Step)); } template T min_speed(T const Left, T const Right) @@ -427,12 +426,12 @@ class condition_variable // methods void wait() { - std::unique_lock lock(m_mutex); + std::unique_lock lock(m_mutex); m_condition.wait(lock, [this]() { return m_spurious == false; }); } template void wait_for(const std::chrono::duration &Time) { - std::unique_lock lock(m_mutex); + std::unique_lock lock(m_mutex); m_condition.wait_for(lock, Time, [this]() { return m_spurious == false; }); } void notify_one() @@ -447,7 +446,7 @@ class condition_variable } void spurious(bool const Spurious) { - std::lock_guard lock(m_mutex); + std::scoped_lock lock(m_mutex); m_spurious = Spurious; } diff --git a/vehicle/AirCoupler.cpp b/vehicle/AirCoupler.cpp index 81253d603..cf6b3bc51 100644 --- a/vehicle/AirCoupler.cpp +++ b/vehicle/AirCoupler.cpp @@ -18,16 +18,14 @@ AirCoupler::AirCoupler() Clear(); } -AirCoupler::~AirCoupler() -{ -} +AirCoupler::~AirCoupler() = default; /** * \return 1 when \(straight\) TModel3d \c only ModelOn exists * \return 2 when \(slanted\) TModel3d \c ModelxOn exists * \return 0 when neither of them exist */ -int AirCoupler::GetStatus() +int AirCoupler::GetStatus() const { if (ModelxOn) return 2; @@ -51,7 +49,7 @@ void AirCoupler::Clear() /** * Looks for submodels in the model and updates pointers. */ -void AirCoupler::Init(std::string const &asName, TModel3d *Model) +void AirCoupler::Init(std::string const &asName, TModel3d const *Model) { if (!Model) return; diff --git a/vehicle/AirCoupler.h b/vehicle/AirCoupler.h index 3f860e639..2de380fad 100644 --- a/vehicle/AirCoupler.h +++ b/vehicle/AirCoupler.h @@ -14,7 +14,9 @@ http://mozilla.org/MPL/2.0/. class AirCoupler { private: - TSubModel *ModelOn, *ModelOff, *ModelxOn; + TSubModel *ModelOn; + TSubModel *ModelOff; + TSubModel *ModelxOn; bool On; bool xOn; void Update(); @@ -25,10 +27,10 @@ public: ///Reset members. void Clear(); ///Looks for submodels. - void Init(std::string const &asName, TModel3d *Model); + void Init(std::string const &asName, TModel3d const *Model); ///Loads info about coupler. void Load(cParser *Parser, TModel3d *Model); - int GetStatus(); + int GetStatus() const; inline void TurnOn() ///Turns on straight coupler. { On = true; diff --git a/vehicle/Button.cpp b/vehicle/Button.cpp index d4d31877a..bdd579a39 100644 --- a/vehicle/Button.cpp +++ b/vehicle/Button.cpp @@ -51,7 +51,7 @@ void TButton::Load( cParser &Parser, TDynamicObject const *Owner ) { // TODO: rework the base part into yaml-compatible flow style mapping submodelname = Parser.getToken( false ); while( true == Load_mapping( Parser ) ) { - ; // all work done by while() + // all work done by while() } } @@ -123,9 +123,8 @@ TButton::Turn( bool const State ) { void TButton::Update( bool const Power ) { // TODO: remove passing manually power state when LD is in place - auto const state { Power && ( bData ? *bData : m_state ) }; - if( state != m_state ) { + if( auto const state { Power && ( bData ? *bData : m_state ) }; state != m_state ) { m_state = state; play(); diff --git a/vehicle/Button.h b/vehicle/Button.h index e2eb38cb2..691915b52 100644 --- a/vehicle/Button.h +++ b/vehicle/Button.h @@ -27,7 +27,7 @@ public: bool GetValue() const { return m_state; } inline - bool Active() { + bool Active() const { return pModelOn != nullptr || pModelOff != nullptr; } void Update( bool const Power = true ); bool Init( std::string const &asName, TModel3d const *pModel, bool bNewOn = false ); @@ -36,7 +36,7 @@ public: // returns offset of submodel associated with the button from the model centre glm::vec3 model_offset() const; void gain(float new_volume); - inline uint8_t b() { return m_state ? 1 : 0; }; + inline uint8_t b() const { return m_state ? 1 : 0; }; private: // methods @@ -48,9 +48,8 @@ private: play(); // members - TSubModel - *pModelOn { nullptr }, - *pModelOff { nullptr }; // submodel dla stanu załączonego i wyłączonego + TSubModel *pModelOn { nullptr }; + TSubModel *pModelOff { nullptr }; // submodel dla stanu załączonego i wyłączonego bool m_state { false }; bool const *bData { nullptr }; int iFeedbackBit { 0 }; // Ra: bit informacji zwrotnej, do wyprowadzenia na pulpit diff --git a/vehicle/Camera.cpp b/vehicle/Camera.cpp index 3186030e7..e2fe58464 100644 --- a/vehicle/Camera.cpp +++ b/vehicle/Camera.cpp @@ -40,8 +40,8 @@ void TCamera::Reset() { void TCamera::OnCursorMove(double x, double y) { - m_rotationoffsets.x += y; - m_rotationoffsets.y += x; + m_rotationoffsets.x += static_cast(y); + m_rotationoffsets.y += static_cast(x); } static double ComputeAxisSpeed(double param, double walkspeed, double maxspeed, double threshold) { @@ -142,13 +142,13 @@ void TCamera::Update() // update rotation auto const rotationfactor { std::min( 1.0, 20 * deltatime ) }; - Angle.y -= m_rotationoffsets.y * rotationfactor; - m_rotationoffsets.y *= 1.0 - rotationfactor; - Angle.y = std::remainder(Angle.y, 2.0 * M_PI); + Angle.y -= static_cast(m_rotationoffsets.y * rotationfactor); + m_rotationoffsets.y *= static_cast(1.0 - rotationfactor); + Angle.y = static_cast(std::remainder(Angle.y, 2.0 * M_PI)); // Limit the camera pitch to +/- 90°. - Angle.x = std::clamp(Angle.x - m_rotationoffsets.x * rotationfactor, -M_PI_2, M_PI_2); - m_rotationoffsets.x *= 1.0 - rotationfactor; + Angle.x = static_cast(std::clamp(Angle.x - m_rotationoffsets.x * rotationfactor, -M_PI_2, M_PI_2)); + m_rotationoffsets.x *= static_cast(1.0 - rotationfactor); // update position if( m_owner == nullptr @@ -172,11 +172,7 @@ void TCamera::Update() // attached movement position update auto movement { Velocity * -2.0 }; movement.y = -movement.y; - auto const *owner { ( - m_owner->Mechanik ? - m_owner->Mechanik : - m_owner->ctOwner ) }; - if( owner && owner->Occupied() + if( auto const *owner { ( m_owner->Mechanik ? m_owner->Mechanik : m_owner->ctOwner ) }; owner && owner->Occupied() && owner->Occupied()->CabOccupied < 0 ) { movement *= -1.f; movement.y = -movement.y; @@ -194,7 +190,7 @@ void TCamera::Update() } } -bool TCamera::SetMatrix( glm::dmat4 &Matrix ) { +bool TCamera::SetMatrix( glm::dmat4 &Matrix ) const { Matrix = glm::rotate(Matrix, -(double)Angle.x, glm::dvec3(1, 0, 0)); Matrix = glm::rotate(Matrix, -(double)Angle.y, glm::dvec3(0, 1, 0)); // w zewnętrznym widoku: kierunek patrzenia @@ -215,12 +211,12 @@ void TCamera::RaLook() { // zmiana kierunku patrzenia - przelicza Yaw auto where = LookAt - Pos /*+ Math3D::vector3(0, 3, 0)*/; // trochę w górę od szyn if( where.x != 0.0 || where.z != 0.0 ) { - Angle.y = atan2( -where.x, -where.z ); // kąt horyzontalny + Angle.y = static_cast(atan2( -where.x, -where.z )); // kąt horyzontalny m_rotationoffsets.y = 0.0; } double l = glm::length(where); if( l > 0.0 ) { - Angle.x = asin( where.y / l ); // kąt w pionie + Angle.x = static_cast(asin( where.y / l )); // kąt w pionie m_rotationoffsets.x = 0.0; } }; diff --git a/vehicle/Camera.h b/vehicle/Camera.h index 4b91caf26..5e2f72810 100644 --- a/vehicle/Camera.h +++ b/vehicle/Camera.h @@ -22,7 +22,7 @@ class TCamera { void OnCursorMove(double const x, double const y); bool OnCommand( command_data const &Command ); void Update(); - bool SetMatrix(glm::dmat4 &Matrix); + bool SetMatrix(glm::dmat4 &Matrix) const; void RaLook(); glm::vec3 Angle; // pitch, yaw, roll diff --git a/vehicle/Gauge.cpp b/vehicle/Gauge.cpp index 63c042d39..d7a41062e 100644 --- a/vehicle/Gauge.cpp +++ b/vehicle/Gauge.cpp @@ -76,7 +76,7 @@ void TGauge::Init(TSubModel *Submodel, TSubModel *Submodelon, TGaugeAnimation Ty auto const nulloffset { glm::vec3{} }; auto const offset { model_offset() }; { - std::vector soundfxs = { + std::vector soundfxs = { &m_soundfxincrease, &m_soundfxdecrease, &m_soundfxon, @@ -88,17 +88,22 @@ void TGauge::Init(TSubModel *Submodel, TSubModel *Submodelon, TGaugeAnimation Ty } } } - for( auto &soundfx : m_soundfxvalues ) { - if( soundfx.second.offset() == nulloffset ) { - soundfx.second.offset( offset ); + for( auto &[soundfxkey, soundfxsource] : m_soundfxvalues ) { + if( soundfxsource.offset() == nulloffset ) { + soundfxsource.offset( offset ); } } }; void TGauge::Load( cParser &Parser, TDynamicObject const *Owner, double const mul ) { - std::string submodelname, gaugetypename; - float scale, endscale, endvalue, offset, friction; + std::string submodelname; + std::string gaugetypename; + float scale; + float endscale; + float endvalue; + float offset; + float friction; endscale = -1; endvalue = -1; bool interpolatescale { false }; @@ -144,7 +149,7 @@ void TGauge::Load( cParser &Parser, TDynamicObject const *Owner, double const mu { scratch_data scratchpad; while( true == Load_mapping( Parser, scratchpad ) ) { - ; // all work done by while() + // all work done by while() } // post-deserialization cleanup // set provided custom soundproofing to assigned sounds (for sounds without their own custom soundproofing) @@ -161,9 +166,9 @@ void TGauge::Load( cParser &Parser, TDynamicObject const *Owner, double const mu if( !m_soundfxoff.soundproofing() ) { m_soundfxoff.soundproofing() = scratchpad.soundproofing; } - for( auto &soundfxrecord : m_soundfxvalues ) { - if( !soundfxrecord.second.soundproofing() ) { - soundfxrecord.second.soundproofing() = scratchpad.soundproofing; + for( auto &[soundfxkey, soundfxsource] : m_soundfxvalues ) { + if( !soundfxsource.soundproofing() ) { + soundfxsource.soundproofing() = scratchpad.soundproofing; } } } @@ -175,13 +180,13 @@ void TGauge::Load( cParser &Parser, TDynamicObject const *Owner, double const mu m_soundfxdecrease.owner( Owner ); m_soundfxon.owner( Owner ); m_soundfxoff.owner( Owner ); - for( auto &soundfxrecord : m_soundfxvalues ) { - soundfxrecord.second.owner( Owner ); + for( auto &[soundfxkey, soundfxsource] : m_soundfxvalues ) { + soundfxsource.owner( Owner ); } - scale *= mul; + scale *= static_cast(mul); if( interpolatescale ) { - endscale *= mul; + endscale *= static_cast(mul); } TSubModel *submodel { nullptr }; std::array sources { Owner->mdKabina, Owner->mdLowPolyInt }; @@ -211,7 +216,7 @@ void TGauge::Load( cParser &Parser, TDynamicObject const *Owner, double const mu } } - std::map gaugetypes { + std::map> gaugetypes { { "rot", TGaugeAnimation::gt_Rotate }, { "rotvar", TGaugeAnimation::gt_Rotate }, { "mov", TGaugeAnimation::gt_Move }, @@ -235,13 +240,14 @@ TGauge::Load_mapping( cParser &Input, TGauge::scratch_data &Scratchpad ) { if( true == key.empty() || key == "}" ) { return false; } // if not block end then the key is followed by assigned value or sub-block if( key == "type:" ) { + using enum TGaugeType; auto const gaugetype { Input.getToken( true, "\n\r\t ,;" ) }; - m_type = gaugetype == "push" ? TGaugeType::push : - gaugetype == "impulse" ? TGaugeType::push : - gaugetype == "return" ? TGaugeType::push : - gaugetype == "delayed" ? TGaugeType::push_delayed : - gaugetype == "pushtoggle" ? TGaugeType::pushtoggle : - TGaugeType::toggle; // "toggle" and default + m_type = gaugetype == "push" ? push : + gaugetype == "impulse" ? push : + gaugetype == "return" ? push : + gaugetype == "delayed" ? push_delayed : + gaugetype == "pushtoggle" ? pushtoggle : + toggle; // "toggle" and default } else if( key == "soundinc:" ) { m_soundfxincrease.deserialize( Input, sound_type::single ); @@ -273,7 +279,7 @@ TGauge::Load_mapping( cParser &Input, TGauge::scratch_data &Scratchpad ) { auto const indexstart { key.find_first_of( "-1234567890" ) }; auto const indexend { key.find_first_not_of( "-1234567890", indexstart ) }; if( indexstart != std::string::npos ) { - m_soundfxvalues.emplace( + m_soundfxvalues.try_emplace( std::stoi( key.substr( indexstart, indexend - indexstart ) ), sound_source( m_soundtemplate ).deserialize( Input, sound_type::single ) ); } @@ -285,11 +291,9 @@ TGauge::Load_mapping( cParser &Input, TGauge::scratch_data &Scratchpad ) { bool TGauge::UpdateValue( float fNewDesired, std::optional &Fallbacksound ) { - if( false == UpdateValue( fNewDesired ) ) { - if( Fallbacksound ) { - Fallbacksound->play( m_soundtype ); - return true; - } + if (false == UpdateValue( fNewDesired ) && Fallbacksound) { + Fallbacksound->play( m_soundtype ); + return true; } return false; } @@ -304,8 +308,7 @@ TGauge::UpdateValue( float fNewDesired ) { m_targetvalue = fNewDesired; // if there's any sound associated with new requested value, play it // check value-specific table first... - auto const fullinteger { desiredtimes100 % 100 == 0 }; - if( fullinteger ) { + if( auto const fullinteger { desiredtimes100 % 100 == 0 }; fullinteger ) { // filter out values other than full integers auto const lookup = m_soundfxvalues.find( desiredtimes100 / 100 ); if( lookup != m_soundfxvalues.end() ) { @@ -318,9 +321,8 @@ TGauge::UpdateValue( float fNewDesired ) { m_soundtype = sound_flags::exclusive; } // ...and if there isn't any, fall back on the basic set... - auto const currentvalue = GetValue(); // HACK: crude way to discern controls with continuous and quantized value range - if( currentvalue < fNewDesired ) { + if( auto const currentvalue = GetValue(); currentvalue < fNewDesired ) { // shift up if( false == m_soundfxincrease.empty() ) { m_soundfxincrease.play( m_soundtype ); @@ -357,7 +359,7 @@ void TGauge::Update( bool const Power ) { // update value // TODO: remove passing manually power state when LD is in place if( m_value != m_targetvalue ) { - float dt = Timer::GetDeltaTime(); + auto dt = static_cast(Timer::GetDeltaTime()); if( m_friction > 0 && dt < 0.5 * m_friction ) { // McZapkie-281102: zabezpieczenie przed oscylacjami dla dlugich czasow m_value += dt * ( m_targetvalue - m_value ) / m_friction; @@ -424,11 +426,11 @@ void TGauge::UpdateValue() break; } case 'd': { - UpdateValue( *dData ); + UpdateValue( static_cast(*dData) ); break; } case 'i': { - UpdateValue( *iData ); + UpdateValue( static_cast(*iData) ); break; } case 'b': { @@ -452,13 +454,13 @@ float TGauge::GetScaledValue() const { } void -TGauge::UpdateAnimation( TSubModel *Submodel ) { +TGauge::UpdateAnimation( TSubModel *Submodel ) const { if( Submodel == nullptr ) { return; } switch (m_animation) { case TGaugeAnimation::gt_Rotate: { - Submodel->SetRotate( float3( 0, 1, 0 ), GetScaledValue() * 360.0 ); + Submodel->SetRotate( float3( 0, 1, 0 ), static_cast(GetScaledValue() * 360.0) ); break; } case TGaugeAnimation::gt_Move: { @@ -467,13 +469,12 @@ TGauge::UpdateAnimation( TSubModel *Submodel ) { } case TGaugeAnimation::gt_Wiper: { auto const scaledvalue { GetScaledValue() }; - Submodel->SetRotate( float3( 0, 1, 0 ), scaledvalue * 360.0 ); - auto *sm = Submodel->ChildGet(); - if( sm ) { - sm->SetRotate( float3( 0, 1, 0 ), scaledvalue * 360.0 ); + Submodel->SetRotate( float3( 0, 1, 0 ), static_cast(scaledvalue * 360.0) ); + if( auto *sm = Submodel->ChildGet(); sm ) { + sm->SetRotate( float3( 0, 1, 0 ), static_cast(scaledvalue * 360.0) ); sm = sm->ChildGet(); if( sm ) - sm->SetRotate( float3( 0, 1, 0 ), scaledvalue * 360.0 ); + sm->SetRotate( float3( 0, 1, 0 ), static_cast(scaledvalue * 360.0) ); } break; } @@ -488,7 +489,7 @@ TGauge::UpdateAnimation( TSubModel *Submodel ) { && std::isdigit(sm->pName[0]) ) { sm->SetRotate( float3( 0, 1, 0 ), - -36.0 * ( n[ '0' + 9 - sm->pName[ 0 ] ] - '0' ) ); + static_cast(-36.0 * ( n[ '0' + 9 - sm->pName[ 0 ] ] - '0' )) ); } sm = sm->NextGet(); } while( sm ); diff --git a/vehicle/Gauge.h b/vehicle/Gauge.h index bf0f83c31..fdef9c58e 100644 --- a/vehicle/Gauge.h +++ b/vehicle/Gauge.h @@ -67,8 +67,8 @@ public: bool is_delayed() const { return ( static_cast( type() ) & static_cast( TGaugeType::delayed ) ) != 0; } // members - TSubModel *SubModel { nullptr }, // McZapkie-310302: zeby mozna bylo sprawdzac czy zainicjowany poprawnie - *SubModelOn { nullptr }; // optional submodel visible when the state input is set + TSubModel *SubModel { nullptr }; // McZapkie-310302: zeby mozna bylo sprawdzac czy zainicjowany poprawnie + TSubModel *SubModelOn { nullptr }; // optional submodel visible when the state input is set private: // types @@ -82,7 +82,7 @@ private: float GetScaledValue() const; void - UpdateAnimation( TSubModel *Submodel ); + UpdateAnimation( TSubModel *Submodel ) const; // members TGaugeAnimation m_animation { TGaugeAnimation::gt_Unknown }; // typ ruchu diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index a77c5749c..f0b2367f7 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -52,11 +52,11 @@ void control_mapper::insert(TGauge const &Gauge, std::string const &Label) if (Gauge.SubModel != nullptr) { - m_controlnames.emplace(Gauge.SubModel, Label); + m_controlnames.try_emplace(Gauge.SubModel, Label); } if (Gauge.SubModelOn != nullptr) { - m_controlnames.emplace(Gauge.SubModelOn, Label); + m_controlnames.try_emplace(Gauge.SubModelOn, Label); } m_names.emplace(Label); @@ -76,10 +76,10 @@ std::string control_mapper::find(TSubModel const *Control) const } } -bool control_mapper::contains(std::string const Control) const +bool control_mapper::contains(std::string const &Control) const { - return m_names.find(Control) != m_names.end(); + return m_names.contains(Control); } void TTrain::screen_entry::deserialize(cParser &Input) @@ -87,7 +87,7 @@ void TTrain::screen_entry::deserialize(cParser &Input) while (true == deserialize_mapping(Input)) { - ; // all work done by while() + // all work done by while() } } @@ -155,7 +155,7 @@ void TCab::Load(cParser &Parser) Parser.getTokens(); Parser >> token; } - CabPos1.x = std::stod(token); + CabPos1.x = static_cast(std::stod(token)); Parser.getTokens(5, false); Parser >> CabPos1.y >> CabPos1.z >> CabPos2.x >> CabPos2.y >> CabPos2.z; @@ -585,20 +585,11 @@ std::vector const TTrain::fPress_labels = { TTrain::TTrain() { - ShowNextCurrent = false; // McZapkie-240302 - przyda sie do tachometru - fTachoVelocity = 0; - fTachoCount = 0; - fPPress = fNPress = 0; // asMessage=""; - pMechOffset = glm::dvec3(0, 0, 0); - fBlinkTimer = 0; - fHaslerTimer = 0; DynamicSet(nullptr); // ustawia wszystkie mv* //----- - pMechSittingPosition = glm::dvec3(0, 0, 0); // ABu: 180404 - fTachoTimer = 0.0; // włączenie skoków wskazań prędkościomierza // for (int i = 0; i < 8; i++) @@ -626,13 +617,14 @@ TTrain::TTrain() for (int i = 0; i < 20; ++i) { - for (int j = 0; j < 7; ++j) - fPress[i][j] = 0.0; - bBrakes[i][0] = bBrakes[i][1] = false; + for (auto &press : fPress[i]) + press = 0.0; + bBrakes[i][0] = false; + bBrakes[i][1] = false; } } -TTrain::~TTrain() {} +TTrain::~TTrain() = default; bool TTrain::Init(TDynamicObject *NewDynamicObject, bool e3d) { // powiązanie ręcznego sterowania kabiną z pojazdem @@ -765,7 +757,8 @@ std::shared_ptr TTrain::GetTrainState(dictionary_source const bool const bEP = mvControlled->LocHandle->GetCP() > 0.2 || fEIMParams[0][5] > 0.01; dict->insert("dir_brake", bEP); bool bPN{false}; - if (typeid(*mvOccupied->Hamulec) == typeid(TLSt) || typeid(*mvOccupied->Hamulec) == typeid(TEStED)) + auto const &brakevalve{*mvOccupied->Hamulec}; + if (auto const &brakevalvetype{typeid(brakevalve)}; brakevalvetype == typeid(TLSt) || brakevalvetype == typeid(TEStED)) { TBrake *temp_ham = mvOccupied->Hamulec.get(); @@ -812,10 +805,10 @@ std::shared_ptr TTrain::GetTrainState(dictionary_source const dict->insert("power_returned", mvOccupied->EnergyMeter.second); // induction motor state data - char const *TXTT[10] = {"fd", "fdt", "fdb", "pd", "pdt", "pdb", "itothv", "1", "2", "3"}; - char const *TXTC[10] = {"fr", "frt", "frb", "pr", "prt", "prb", "im", "vm", "ihv", "uhv"}; - char const *TXTD[10] = {"enrot", "nrot", "fill_des", "fill_real", "clutch_des", "clutch_real", "water_temp", "oil_press", "engine_temp", "retarder_fill"}; - char const *TXTP[7] = {"bc", "bp", "sp", "cp", "rp", "mass", "spring"}; + std::array const TXTT{"fd", "fdt", "fdb", "pd", "pdt", "pdb", "itothv", "1", "2", "3"}; + std::array const TXTC{"fr", "frt", "frb", "pr", "prt", "prb", "im", "vm", "ihv", "uhv"}; + std::array const TXTD{"enrot", "nrot", "fill_des", "fill_real", "clutch_des", "clutch_real", "water_temp", "oil_press", "engine_temp", "retarder_fill"}; + std::array const TXTP{"bc", "bp", "sp", "cp", "rp", "mass", "spring"}; char const *TXTB[2] = {"spring_active", "spring_shutoff"}; for (int j = 0; j < 10; ++j) dict->insert("eimp_t_" + std::string(TXTT[j]), fEIMParams[0][j]); @@ -898,19 +891,19 @@ std::shared_ptr TTrain::GetTrainState(dictionary_source const dict->insert("slip_" + caridx, bSlip[i]); } // ai state data - auto const *driver{(DynamicObject->ctOwner != nullptr ? DynamicObject->ctOwner : DynamicObject->Mechanik)}; + auto const *vehicledriver{(DynamicObject->ctOwner != nullptr ? DynamicObject->ctOwner : DynamicObject->Mechanik)}; - dict->insert("velocity_desired", driver->VelDesired); - dict->insert("velroad", driver->VelRoad); - dict->insert("vellimitlast", driver->VelLimitLast); - dict->insert("velsignallast", driver->VelSignalLast); - dict->insert("velsignalnext", driver->VelSignalNext); - dict->insert("velnext", driver->VelNext); - dict->insert("actualproximitydist", driver->ActualProximityDist); + dict->insert("velocity_desired", vehicledriver->VelDesired); + dict->insert("velroad", vehicledriver->VelRoad); + dict->insert("vellimitlast", vehicledriver->VelLimitLast); + dict->insert("velsignallast", vehicledriver->VelSignalLast); + dict->insert("velsignalnext", vehicledriver->VelSignalNext); + dict->insert("velnext", vehicledriver->VelNext); + dict->insert("actualproximitydist", vehicledriver->ActualProximityDist); // train data - driver->TrainTimetable().serialize(dict.get()); - dict->insert("train_atpassengerstop", driver->IsAtPassengerStop); - dict->insert("train_length", driver->fLength); + vehicledriver->TrainTimetable().serialize(dict.get()); + dict->insert("train_atpassengerstop", vehicledriver->IsAtPassengerStop); + dict->insert("train_length", vehicledriver->fLength); // world state data dict->insert("scenario", Global.SceneryFile); dict->insert("hours", static_cast(simulation::Time.data().wHour)); @@ -983,7 +976,7 @@ bool TTrain::is_eztoer() const void TTrain::set_master_controller(double const Position) { - auto positionchange{std::min(Position, mvControlled->CoupledCtrl ? mvControlled->MainCtrlPosNo + mvControlled->ScndCtrlPosNo : mvControlled->MainCtrlPosNo) - + auto positionchange{std::min(static_cast(Position), mvControlled->CoupledCtrl ? mvControlled->MainCtrlPosNo + mvControlled->ScndCtrlPosNo : mvControlled->MainCtrlPosNo) - (mvControlled->CoupledCtrl ? mvControlled->MainCtrlPos + mvControlled->ScndCtrlPos : mvControlled->MainCtrlPos)}; while (positionchange < 0 && true == mvControlled->DecMainCtrl(1)) { @@ -1007,21 +1000,19 @@ void TTrain::set_train_brake(double const Position) return; } - if (true == is_eztoer() && false == ((originalbrakeposition / 100 == 0 || originalbrakeposition / 100 >= 5) && (mvOccupied->BrakeCtrlPos == 0 || mvOccupied->BrakeCtrlPos >= 5))) + // sound feedback if the lever movement activates one of the switches + if (true == is_eztoer() && false == ((originalbrakeposition / 100 == 0 || originalbrakeposition / 100 >= 5) && (mvOccupied->BrakeCtrlPos == 0 || mvOccupied->BrakeCtrlPos >= 5)) && dsbPneumaticSwitch) { - // sound feedback if the lever movement activates one of the switches - if (dsbPneumaticSwitch) - { - dsbPneumaticSwitch->play(); - } + dsbPneumaticSwitch->play(); } } void TTrain::zero_charging_train_brake() { + using enum TBrakeHandle; if (mvOccupied->BrakeCtrlPos == -1 && DynamicObject->Controller != AIdriver && Global.iFeedbackMode < 3 && - (mvOccupied->BrakeHandle == TBrakeHandle::FVel6 || mvOccupied->BrakeHandle == TBrakeHandle::MHZ_EN57 || mvOccupied->BrakeHandle == TBrakeHandle::MHZ_K8P)) + (mvOccupied->BrakeHandle == FVel6 || mvOccupied->BrakeHandle == MHZ_EN57 || mvOccupied->BrakeHandle == MHZ_K8P)) { // Odskakiwanie hamulce EP set_train_brake(0); @@ -1031,24 +1022,21 @@ void TTrain::zero_charging_train_brake() void TTrain::set_train_brake_speed(TDynamicObject *Vehicle, int const Speed) { - if (true == Vehicle->MoverParameters->BrakeDelaySwitch(Speed)) + // visual feedback + // TODO: add setting indicator to vehicle class, for external lever/indicator + if (true == Vehicle->MoverParameters->BrakeDelaySwitch(Speed) && Vehicle == DynamicObject) { - // visual feedback - // TODO: add setting indicator to vehicle class, for external lever/indicator - if (Vehicle == DynamicObject) + if (ggBrakeProfileCtrl.SubModel != nullptr) { - if (ggBrakeProfileCtrl.SubModel != nullptr) - { - ggBrakeProfileCtrl.UpdateValue((mvOccupied->BrakeDelayFlag & bdelay_R) != 0 ? 2.0 : mvOccupied->BrakeDelayFlag - 1, dsbSwitch); - } - if (ggBrakeProfileG.SubModel != nullptr) - { - ggBrakeProfileG.UpdateValue(mvOccupied->BrakeDelayFlag == bdelay_G ? 1.0 : 0.0, dsbSwitch); - } - if (ggBrakeProfileR.SubModel != nullptr) - { - ggBrakeProfileR.UpdateValue((mvOccupied->BrakeDelayFlag & bdelay_R) != 0 ? 1.0 : 0.0, dsbSwitch); - } + ggBrakeProfileCtrl.UpdateValue((mvOccupied->BrakeDelayFlag & bdelay_R) != 0 ? 2.0 : static_cast(mvOccupied->BrakeDelayFlag - 1), dsbSwitch); + } + if (ggBrakeProfileG.SubModel != nullptr) + { + ggBrakeProfileG.UpdateValue(mvOccupied->BrakeDelayFlag == bdelay_G ? 1.0 : 0.0, dsbSwitch); + } + if (ggBrakeProfileR.SubModel != nullptr) + { + ggBrakeProfileR.UpdateValue((mvOccupied->BrakeDelayFlag & bdelay_R) != 0 ? 1.0 : 0.0, dsbSwitch); } } } @@ -1077,10 +1065,10 @@ TDynamicObject *TTrain::find_nearest_consist_vehicle(bool freefly, glm::vec3 pos if (!freefly) return DynamicObject; - auto coupler{-2}; // scan for vehicle, not any specific coupler - auto *vehicle{DynamicObject->ABuScanNearestObject(pos, DynamicObject->GetTrack(), 1, 1500, coupler)}; + auto couplerindex{-2}; // scan for vehicle, not any specific coupler + auto *vehicle{DynamicObject->ABuScanNearestObject(pos, DynamicObject->GetTrack(), 1, 1500, couplerindex)}; if (vehicle == nullptr) - vehicle = DynamicObject->ABuScanNearestObject(pos, DynamicObject->GetTrack(), -1, 1500, coupler); + vehicle = DynamicObject->ABuScanNearestObject(pos, DynamicObject->GetTrack(), -1, 1500, couplerindex); // TBD, TODO: perform owner test for the located vehicle return vehicle; } @@ -1109,13 +1097,9 @@ void TTrain::OnCommand_aidriverenable(TTrain *Train, command_data const &Command void TTrain::OnCommand_aidriverdisable(TTrain *Train, command_data const &Command) { - if (Command.action == GLFW_PRESS) - { - // on press - - if (Train->DynamicObject->Mechanik) - Train->DynamicObject->Mechanik->TakeControl(false); - } + // on press + if (Command.action == GLFW_PRESS && Train->DynamicObject->Mechanik) + Train->DynamicObject->Mechanik->TakeControl(false); } auto const EU07_CONTROLLER_BASERETURNDELAY{0.5f}; @@ -1624,13 +1608,10 @@ void TTrain::OnCommand_secondcontrollerdecrease(TTrain *Train, command_data cons if (Train->ggScndCtrl.is_push()) { // basic push control can't decrease state, but pushtoggle can - if (true == Train->ggScndCtrl.is_toggle()) + if (true == Train->ggScndCtrl.is_toggle() && Command.action == GLFW_PRESS) { - if (Command.action == GLFW_PRESS) - { - // activate on press - Train->mvControlled->DecScndCtrl(1); - } + // activate on press + Train->mvControlled->DecScndCtrl(1); } } // toggle control type @@ -1683,7 +1664,7 @@ void TTrain::OnCommand_secondcontrollerdecreasefast(TTrain *Train, command_data void TTrain::OnCommand_secondcontrollerset(TTrain *Train, command_data const &Command) { - auto const targetposition{std::min(Command.param1, Train->mvControlled->ScndCtrlPosNo)}; + auto const targetposition{std::min(static_cast(Command.param1), Train->mvControlled->ScndCtrlPosNo)}; // HACK: potentially animate push or pushtoggle control if (Train->ggScndCtrl.is_push()) { @@ -1703,12 +1684,10 @@ void TTrain::OnCommand_secondcontrollerset(TTrain *Train, command_data const &Co while (targetposition < Train->mvControlled->GetVirtualScndPos() && true == Train->mvControlled->DecScndCtrl(1)) { // all work is done in the header - ; } while (targetposition > Train->mvControlled->GetVirtualScndPos() && true == Train->mvControlled->IncScndCtrl(1)) { // all work is done in the header - ; } } } @@ -1731,7 +1710,7 @@ void TTrain::OnCommand_independentbrakeincrease(TTrain *Train, command_data cons } else { - Train->mvOccupied->IncLocalBrakeLevel(useStepped ? 1 : Global.brake_speed * Command.time_delta * LocalBrakePosNo); + Train->mvOccupied->IncLocalBrakeLevel(useStepped ? 1 : static_cast(Global.brake_speed * Command.time_delta * LocalBrakePosNo)); if (useStepped) { Train->m_mastercontrollerinuse = true; @@ -1786,7 +1765,7 @@ void TTrain::OnCommand_independentbrakedecrease(TTrain *Train, command_data cons } else { - Train->mvOccupied->DecLocalBrakeLevel(useStepped ? 1 : Global.brake_speed * Command.time_delta * LocalBrakePosNo); + Train->mvOccupied->DecLocalBrakeLevel(useStepped ? 1 : static_cast(Global.brake_speed * Command.time_delta * LocalBrakePosNo)); if (useStepped) { Train->m_mastercontrollerinuse = true; @@ -2082,18 +2061,13 @@ void TTrain::OnCommand_trainbrakebasepressureincrease(TTrain *Train, command_dat if (Command.action != GLFW_RELEASE) { - switch (Train->mvOccupied->BrakeHandle) - { - case TBrakeHandle::FV4a: + if (Train->mvOccupied->BrakeHandle == TBrakeHandle::FV4a) { Train->mvOccupied->BrakeCtrlPos2 = std::clamp(Train->mvOccupied->BrakeCtrlPos2 - 0.01, -1.5, 2.0); - break; } - default: + else { Train->mvOccupied->BrakeLevelAdd(0.01); - break; - } } } } @@ -2104,18 +2078,13 @@ void TTrain::OnCommand_trainbrakebasepressuredecrease(TTrain *Train, command_dat if (Command.action != GLFW_RELEASE) { - switch (Train->mvOccupied->BrakeHandle) - { - case TBrakeHandle::FV4a: + if (Train->mvOccupied->BrakeHandle == TBrakeHandle::FV4a) { Train->mvOccupied->BrakeCtrlPos2 = std::clamp(Train->mvOccupied->BrakeCtrlPos2 + 0.01, -1.5, 2.0); - break; } - default: + else { Train->mvOccupied->BrakeLevelAdd(-0.01); - break; - } } } } @@ -2136,7 +2105,7 @@ void TTrain::OnCommand_trainbrakeoperationtoggle(TTrain *Train, command_data con if (Command.action == GLFW_PRESS) { - auto *vehicle{Train->find_nearest_consist_vehicle(Command.freefly, Command.location)}; + auto const *vehicle{Train->find_nearest_consist_vehicle(Command.freefly, Command.location)}; if (vehicle == nullptr) { return; @@ -2350,20 +2319,17 @@ void TTrain::OnCommand_autosandboxdeactivate(TTrain *Train, command_data const & void TTrain::OnCommand_epbrakecontrolenable(TTrain *Train, command_data const &Command) { auto const istoggle{(static_cast(Train->ggEPFuseButton.type()) & static_cast(TGaugeType::toggle)) != 0}; - if (Command.action == GLFW_PRESS) + // command only works for bistable switch + if (Command.action == GLFW_PRESS && istoggle) { - // command only works for bistable switch - if (istoggle) + if (Train->mvOccupied->EpFuseSwitch(true)) { - if (Train->mvOccupied->EpFuseSwitch(true)) + // audio feedback + if (Train->dsbPneumaticSwitch) { - // audio feedback - if (Train->dsbPneumaticSwitch) - { - Train->dsbPneumaticSwitch->play(); - } - Train->ggEPFuseButton.UpdateValue(1.0f, Train->dsbSwitch); - }; + Train->dsbPneumaticSwitch->play(); + } + Train->ggEPFuseButton.UpdateValue(1.0f, Train->dsbSwitch); } } } @@ -2371,15 +2337,12 @@ void TTrain::OnCommand_epbrakecontrolenable(TTrain *Train, command_data const &C void TTrain::OnCommand_epbrakecontroldisable(TTrain *Train, command_data const &Command) { auto const istoggle{(static_cast(Train->ggEPFuseButton.type()) & static_cast(TGaugeType::toggle)) != 0}; - if (Command.action == GLFW_PRESS) + // command only works for bistable switch + if (Command.action == GLFW_PRESS && istoggle) { - // command only works for bistable switch - if (istoggle) + if (Train->mvOccupied->EpFuseSwitch(false)) { - if (Train->mvOccupied->EpFuseSwitch(false)) - { - Train->ggEPFuseButton.UpdateValue(0.0f, Train->dsbSwitch); - }; + Train->ggEPFuseButton.UpdateValue(0.0f, Train->dsbSwitch); } } } @@ -2403,14 +2366,11 @@ void TTrain::OnCommand_epbrakecontroltoggle(TTrain *Train, command_data const &C if (false == Train->mvOccupied->EpFuse) { // turn on - if (Train->mvOccupied->EpFuseSwitch(true)) + // audio feedback + if (Train->mvOccupied->EpFuseSwitch(true) && Train->dsbPneumaticSwitch) { - // audio feedback - if (Train->dsbPneumaticSwitch) - { - Train->dsbPneumaticSwitch->play(); - } - }; + Train->dsbPneumaticSwitch->play(); + } } else { @@ -2421,14 +2381,11 @@ void TTrain::OnCommand_epbrakecontroltoggle(TTrain *Train, command_data const &C else if (ispush) { // potentially turn on - if (Train->mvOccupied->EpFuseSwitch(true)) + // audio feedback + if (Train->mvOccupied->EpFuseSwitch(true) && Train->dsbPneumaticSwitch) { - // audio feedback - if (Train->dsbPneumaticSwitch) - { - Train->dsbPneumaticSwitch->play(); - } - }; + Train->dsbPneumaticSwitch->play(); + } } // visual feedback Train->ggEPFuseButton.UpdateValue(ispush ? 1.0f : // push or pushtoggle @@ -2436,45 +2393,36 @@ void TTrain::OnCommand_epbrakecontroltoggle(TTrain *Train, command_data const &C 0.0f, // toggle Train->dsbSwitch); } - else if (Command.action == GLFW_RELEASE) + else if (Command.action == GLFW_RELEASE && ispush) { - if (ispush) - { - // return the switch to neutral position - Train->ggEPFuseButton.UpdateValue(0.0f, Train->dsbSwitch); - } + // return the switch to neutral position + Train->ggEPFuseButton.UpdateValue(0.0f, Train->dsbSwitch); } } void TTrain::OnCommand_trainbrakeoperationmodeincrease(TTrain *Train, command_data const &Command) { - if (Command.action == GLFW_PRESS) + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if (Command.action == GLFW_PRESS && (Train->mvOccupied->BrakeOpModeFlag << 1 & Train->mvOccupied->BrakeOpModes) != 0) { - // only reacting to press, so the switch doesn't flip back and forth if key is held down - if ((Train->mvOccupied->BrakeOpModeFlag << 1 & Train->mvOccupied->BrakeOpModes) != 0) - { - // next mode - Train->mvOccupied->BrakeOpModeFlag <<= 1; - // visual feedback - Train->ggBrakeOperationModeCtrl.UpdateValue(Train->mvOccupied->BrakeOpModeFlag > 0 ? std::log2(Train->mvOccupied->BrakeOpModeFlag) : 0); // audio fallback - } + // next mode + Train->mvOccupied->BrakeOpModeFlag <<= 1; + // visual feedback + Train->ggBrakeOperationModeCtrl.UpdateValue(Train->mvOccupied->BrakeOpModeFlag > 0 ? static_cast(std::log2(Train->mvOccupied->BrakeOpModeFlag)) : 0); // audio fallback } } void TTrain::OnCommand_trainbrakeoperationmodedecrease(TTrain *Train, command_data const &Command) { - if (Command.action == GLFW_PRESS) + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if (Command.action == GLFW_PRESS && (Train->mvOccupied->BrakeOpModeFlag >> 1 & Train->mvOccupied->BrakeOpModes) != 0) { - // only reacting to press, so the switch doesn't flip back and forth if key is held down - if ((Train->mvOccupied->BrakeOpModeFlag >> 1 & Train->mvOccupied->BrakeOpModes) != 0) - { - // previous mode - Train->mvOccupied->BrakeOpModeFlag >>= 1; - // visual feedback - Train->ggBrakeOperationModeCtrl.UpdateValue(Train->mvOccupied->BrakeOpModeFlag > 0 ? std::log2(Train->mvOccupied->BrakeOpModeFlag) : 0); - } + // previous mode + Train->mvOccupied->BrakeOpModeFlag >>= 1; + // visual feedback + Train->ggBrakeOperationModeCtrl.UpdateValue(Train->mvOccupied->BrakeOpModeFlag > 0 ? static_cast(std::log2(Train->mvOccupied->BrakeOpModeFlag)) : 0); } } @@ -2644,7 +2592,7 @@ void TTrain::OnCommand_wiperswitchincrease(TTrain *Train, command_data const &Co Train->mvOccupied->wiperSwitchPos = Train->mvOccupied->WiperListSize - 1; // Visual feedback - Train->ggWiperSw.UpdateValue(Train->mvOccupied->wiperSwitchPos, Train->dsbSwitch); + Train->ggWiperSw.UpdateValue(static_cast(Train->mvOccupied->wiperSwitchPos), Train->dsbSwitch); } } void TTrain::OnCommand_wiperswitchdecrease(TTrain *Train, command_data const &Command) @@ -2656,7 +2604,7 @@ void TTrain::OnCommand_wiperswitchdecrease(TTrain *Train, command_data const &Co Train->mvOccupied->wiperSwitchPos = 0; // visual feedback - Train->ggWiperSw.UpdateValue(Train->mvOccupied->wiperSwitchPos, Train->dsbSwitch); + Train->ggWiperSw.UpdateValue(static_cast(Train->mvOccupied->wiperSwitchPos), Train->dsbSwitch); } } @@ -2673,14 +2621,11 @@ void TTrain::OnCommand_reverserincrease(TTrain *Train, command_data const &Comma return; } - if (Train->mvOccupied->DirectionForward()) + // aktualizacja skrajnych pojazdów w składzie + if (Train->mvOccupied->DirectionForward() && Train->mvOccupied->DirActive && Train->DynamicObject->Mechanik) { - // aktualizacja skrajnych pojazdów w składzie - if (Train->mvOccupied->DirActive && Train->DynamicObject->Mechanik) - { - Train->DynamicObject->Mechanik->DirectionChange(); - } + Train->DynamicObject->Mechanik->DirectionChange(); } } } @@ -2698,15 +2643,11 @@ void TTrain::OnCommand_reverserdecrease(TTrain *Train, command_data const &Comma return; } - if (Train->mvOccupied->DirectionBackward()) + // aktualizacja skrajnych pojazdów w składzie + if (Train->mvOccupied->DirectionBackward() && Train->mvOccupied->DirActive && Train->DynamicObject->Mechanik) { - // aktualizacja skrajnych pojazdów w składzie - if (Train->mvOccupied->DirActive && Train->DynamicObject->Mechanik) - { - Train->DynamicObject->Mechanik->DirectionChange(); - ; - } + Train->DynamicObject->Mechanik->DirectionChange(); } } } @@ -3112,13 +3053,10 @@ void TTrain::OnCommand_cabactivationenable(TTrain *Train, command_data const &Co Train->Dynamic()->SetLights(); } } - else if (Command.action == GLFW_RELEASE) + else if (Command.action == GLFW_RELEASE && Train->ggCabActivationButton.type() == TGaugeType::push) { - if (Train->ggCabActivationButton.type() == TGaugeType::push) - { - // return the switch to neutral position - Train->ggCabActivationButton.UpdateValue(0.5f); - } + // return the switch to neutral position + Train->ggCabActivationButton.UpdateValue(0.5f); } } @@ -3139,13 +3077,10 @@ void TTrain::OnCommand_cabactivationdisable(TTrain *Train, command_data const &C Train->Dynamic()->SetLights(); } } - else if (Command.action == GLFW_RELEASE) + else if (Command.action == GLFW_RELEASE && Train->ggCabActivationButton.type() == TGaugeType::push) { - if (Train->ggCabActivationButton.type() == TGaugeType::push) - { - // return the switch to neutral position - Train->ggCabActivationButton.UpdateValue(0.5f); - } + // return the switch to neutral position + Train->ggCabActivationButton.UpdateValue(0.5f); } } @@ -3515,17 +3450,18 @@ void TTrain::OnCommand_pantographlowerselected(TTrain *Train, command_data const void TTrain::update_pantograph_valves() { + using enum operation_t; auto const &presets{mvOccupied->PantsPreset.first}; - auto &selection{mvOccupied->PantsPreset.second[cab_to_end()]}; + auto const &selection{mvOccupied->PantsPreset.second[cab_to_end()]}; auto const preset{presets[selection] - '0'}; auto const swapends{cab_to_end() != end::front}; // check desired states for both pantographs; value: whether the pantograph should be raised auto const frontstate{preset & (swapends ? 2 : 1)}; auto const rearstate{preset & (swapends ? 1 : 2)}; - mvOccupied->OperatePantographValve(end::front, frontstate ? operation_t::enable : operation_t::disable); - mvOccupied->OperatePantographValve(end::rear, rearstate ? operation_t::enable : operation_t::disable); + mvOccupied->OperatePantographValve(end::front, frontstate ? enable : disable); + mvOccupied->OperatePantographValve(end::rear, rearstate ? enable : disable); } void TTrain::change_pantograph_selection(int const Change) @@ -3534,7 +3470,7 @@ void TTrain::change_pantograph_selection(int const Change) auto const &presets{mvOccupied->PantsPreset.first}; auto &selection{mvOccupied->PantsPreset.second[cab_to_end()]}; auto const initialstate{selection}; - selection = std::clamp(selection + Change, 0, std::max(presets.size() - 1, 0)); + selection = std::clamp(selection + Change, 0, std::max(static_cast(presets.size() - 1), 0)); if (selection == initialstate) { @@ -3642,9 +3578,8 @@ void TTrain::OnCommand_pantographcompressorvalvetoggle(TTrain *Train, command_da void TTrain::OnCommand_pantographcompressorvalveenable(TTrain *Train, command_data const &Command) { - auto const valveispresent{Train->ggPantCompressorValve.SubModel != nullptr || (Train->mvOccupied == Train->mvPantographUnit && Train->iCabn == 0)}; - if (false == valveispresent) + if (auto const valveispresent{Train->ggPantCompressorValve.SubModel != nullptr || (Train->mvOccupied == Train->mvPantographUnit && Train->iCabn == 0)}; false == valveispresent) { // tylko w maszynowym, unless actual device is present return; @@ -3663,9 +3598,8 @@ void TTrain::OnCommand_pantographcompressorvalveenable(TTrain *Train, command_da void TTrain::OnCommand_pantographcompressorvalvedisable(TTrain *Train, command_data const &Command) { - auto const valveispresent{Train->ggPantCompressorValve.SubModel != nullptr || (Train->mvOccupied == Train->mvPantographUnit && Train->iCabn == 0)}; - if (false == valveispresent) + if (auto const valveispresent{Train->ggPantCompressorValve.SubModel != nullptr || (Train->mvOccupied == Train->mvPantographUnit && Train->iCabn == 0)}; false == valveispresent) { // tylko w maszynowym, unless actual device is present return; @@ -3685,8 +3619,7 @@ void TTrain::OnCommand_pantographcompressoractivate(TTrain *Train, command_data { // tylko w maszynowym, unless actual device is present - auto const switchispresent{Train->m_controlmapper.contains("pantcompressor_sw:") || (Train->mvOccupied == Train->mvPantographUnit && Train->iCabn == 0)}; - if (false == switchispresent) + if (auto const switchispresent{Train->m_controlmapper.contains("pantcompressor_sw:") || (Train->mvOccupied == Train->mvPantographUnit && Train->iCabn == 0)}; false == switchispresent) { return; } @@ -3841,12 +3774,9 @@ void TTrain::OnCommand_linebreakerclose(TTrain *Train, command_data const &Comma // setup with two separate switches Train->ggMainOnButton.UpdateValue(0.0, Train->dsbSwitch); } - else if (Train->ggMainButton.SubModel != nullptr) + else if (Train->ggMainButton.SubModel != nullptr && Train->ggMainButton.type() != TGaugeType::toggle) { - if (Train->ggMainButton.type() != TGaugeType::toggle) - { - Train->ggMainButton.UpdateValue(0.5, Train->dsbSwitch); - } + Train->ggMainButton.UpdateValue(0.5, Train->dsbSwitch); } if (Train->m_linebreakerstate == 1) @@ -3854,16 +3784,13 @@ void TTrain::OnCommand_linebreakerclose(TTrain *Train, command_data const &Comma return; } // already in the desired state - if (Train->m_linebreakerstate == 2) + // we don't need to start the diesel twice, but the other types (with impulse switch setup) still need to be launched + // NOTE: this behaviour should depend on MainOnButton presence and type_delayed + // TODO: change it when/if vehicle definition files get their proper switch types + if (Train->m_linebreakerstate == 2 && Train->mvControlled->EngineType == TEngineType::ElectricSeriesMotor) { - // we don't need to start the diesel twice, but the other types (with impulse switch setup) still need to be launched - // NOTE: this behaviour should depend on MainOnButton presence and type_delayed - // TODO: change it when/if vehicle definition files get their proper switch types - if (Train->mvControlled->EngineType == TEngineType::ElectricSeriesMotor) - { - // try to finalize state change of the line breaker, set the state based on the outcome - Train->m_linebreakerstate = Train->mvControlled->MainSwitch(true) ? 1 : 0; - } + // try to finalize state change of the line breaker, set the state based on the outcome + Train->m_linebreakerstate = Train->mvControlled->MainSwitch(true) ? 1 : 0; } // on button release reset the closing timer Train->fMainRelayTimer = 0.0f; @@ -4677,7 +4604,7 @@ void TTrain::OnCommand_compressorpresetactivatenext(TTrain *Train, command_data Train->mvOccupied->ChangeCompressorPreset(Command.action == GLFW_PRESS ? Train->mvOccupied->CompressorListDefPos + 1 : Train->mvOccupied->CompressorListDefPos); // visual feedback - Train->ggCompressorListButton.UpdateValue(Train->mvOccupied->CompressorListPos - 1, Train->dsbSwitch); + Train->ggCompressorListButton.UpdateValue(static_cast(Train->mvOccupied->CompressorListPos - 1), Train->dsbSwitch); } else { @@ -4692,7 +4619,7 @@ void TTrain::OnCommand_compressorpresetactivatenext(TTrain *Train, command_data // active light preset is stored as value in range 1-LigthPosNo Train->mvOccupied->ChangeCompressorPreset(Train->mvOccupied->CompressorListPos < Train->mvOccupied->CompressorListPosNo ? Train->mvOccupied->CompressorListPos + 1 : 1); // wrap mode // visual feedback - Train->ggCompressorListButton.UpdateValue(Train->mvOccupied->CompressorListPos - 1, Train->dsbSwitch); + Train->ggCompressorListButton.UpdateValue(static_cast(Train->mvOccupied->CompressorListPos - 1), Train->dsbSwitch); } } } @@ -4723,7 +4650,7 @@ void TTrain::OnCommand_compressorpresetactivateprevious(TTrain *Train, command_d // visual feedback if (Train->ggCompressorListButton.SubModel != nullptr) { - Train->ggCompressorListButton.UpdateValue(Train->mvOccupied->CompressorListPos - 1, Train->dsbSwitch); + Train->ggCompressorListButton.UpdateValue(static_cast(Train->mvOccupied->CompressorListPos - 1), Train->dsbSwitch); } } } @@ -4745,7 +4672,7 @@ void TTrain::OnCommand_compressorpresetactivatedefault(TTrain *Train, command_da // visual feedback if (Train->ggCompressorListButton.SubModel != nullptr) { - Train->ggCompressorListButton.UpdateValue(Train->mvOccupied->CompressorListPos - 1, Train->dsbSwitch); + Train->ggCompressorListButton.UpdateValue(static_cast(Train->mvOccupied->CompressorListPos - 1), Train->dsbSwitch); } } @@ -5219,11 +5146,11 @@ void TTrain::OnCommand_lightspresetactivatenext(TTrain *Train, command_data cons // HACK: skip submodel animation when restarting cycle, since it plays in the 'wrong' direction if (false == restartcycle) { - Train->ggLightsButton.UpdateValue(Train->mvOccupied->LightsPos - 1, Train->dsbSwitch); + Train->ggLightsButton.UpdateValue(static_cast(Train->mvOccupied->LightsPos - 1), Train->dsbSwitch); } else { - Train->ggLightsButton.PutValue(Train->mvOccupied->LightsPos - 1); + Train->ggLightsButton.PutValue(static_cast(Train->mvOccupied->LightsPos - 1)); } } } @@ -5256,11 +5183,11 @@ void TTrain::OnCommand_lightspresetactivateprevious(TTrain *Train, command_data // HACK: skip submodel animation when restarting cycle, since it plays in the 'wrong' direction if (false == restartcycle) { - Train->ggLightsButton.UpdateValue(Train->mvOccupied->LightsPos - 1, Train->dsbSwitch); + Train->ggLightsButton.UpdateValue(static_cast(Train->mvOccupied->LightsPos - 1), Train->dsbSwitch); } else { - Train->ggLightsButton.PutValue(Train->mvOccupied->LightsPos - 1); + Train->ggLightsButton.PutValue(static_cast(Train->mvOccupied->LightsPos - 1)); } } } @@ -5290,8 +5217,8 @@ void TTrain::OnCommand_headlighttoggleleft(TTrain *Train, command_data const &Co void TTrain::OnCommand_lightsset(TTrain *Train, command_data const &Command) { // set custom item in Lights inventory - Train->mvOccupied->Lights[end::front][17] = Command.param1; - Train->mvOccupied->Lights[end::rear][17] = Command.param2; + Train->mvOccupied->Lights[end::front][17] = static_cast(Command.param1); + Train->mvOccupied->Lights[end::rear][17] = static_cast(Command.param2); Train->mvOccupied->LightsPos = 18; // nasza custom pozycja Train->Dynamic()->SetLights(); } @@ -5894,8 +5821,7 @@ void TTrain::OnCommand_modernlightdimmerincrease(TTrain *Train, command_data con // update modern dimmer state auto &dimPos = Train->mvOccupied->modernDimmerPosition; - auto dimCount = Train->mvOccupied->dimPositions.size(); - if (dimPos + 1 < dimCount) + if (auto dimCount = Train->mvOccupied->dimPositions.size(); dimPos + 1 < dimCount) dimPos++; else if (Train->mvOccupied->modernDimmerCanCycle) dimPos = 0; // return to 0 @@ -5907,7 +5833,7 @@ void TTrain::OnCommand_modernlightdimmerincrease(TTrain *Train, command_data con // visual feedback if (Train->ggModernLightDimSw.SubModel != nullptr) - Train->ggModernLightDimSw.UpdateValue(dimPos, Train->dsbSwitch); + Train->ggModernLightDimSw.UpdateValue(static_cast(dimPos), Train->dsbSwitch); } } void TTrain::OnCommand_modernlightdimmerdecrease(TTrain *Train, command_data const &Command) @@ -5934,7 +5860,7 @@ void TTrain::OnCommand_modernlightdimmerdecrease(TTrain *Train, command_data con Train->Dynamic()->SetLightDimmings(); if (Train->ggModernLightDimSw.SubModel != nullptr) - Train->ggModernLightDimSw.UpdateValue(dimPos, Train->dsbSwitch); + Train->ggModernLightDimSw.UpdateValue(static_cast(dimPos), Train->dsbSwitch); } } @@ -6075,7 +6001,7 @@ void TTrain::OnCommand_redmarkerdisablerearright(TTrain *Train, command_data con } } -void TTrain::OnCommand_redmarkerstoggle(TTrain *Train, command_data const &Command) +void TTrain::OnCommand_redmarkerstoggle(TTrain * /*Train*/, command_data const &Command) { if (true == Command.freefly && Command.action == GLFW_PRESS) @@ -6101,7 +6027,7 @@ void TTrain::OnCommand_redmarkerstoggle(TTrain *Train, command_data const &Comma } } -void TTrain::OnCommand_endsignalstoggle(TTrain *Train, command_data const &Command) +void TTrain::OnCommand_endsignalstoggle(TTrain * /*Train*/, command_data const &Command) { if (true == Command.freefly && Command.action == GLFW_PRESS) @@ -6405,15 +6331,12 @@ void TTrain::OnCommand_compartmentlightsenable(TTrain *Train, command_data const } else if (Command.action == GLFW_RELEASE) { - if (Train->m_controlmapper.contains("compartmentlights_sw:")) + if (Train->m_controlmapper.contains("compartmentlights_sw:") && Train->ggCompartmentLightsButton.type() == TGaugeType::push) { - if (Train->ggCompartmentLightsButton.type() == TGaugeType::push) - { - // return the switch to neutral position - Train->mvOccupied->CompartmentLightsSwitch(false); - Train->mvOccupied->CompartmentLightsSwitchOff(false); - Train->ggCompartmentLightsButton.UpdateValue(0.5f); - } + // return the switch to neutral position + Train->mvOccupied->CompartmentLightsSwitch(false); + Train->mvOccupied->CompartmentLightsSwitchOff(false); + Train->ggCompartmentLightsButton.UpdateValue(0.5f); } if (Train->m_controlmapper.contains("compartmentlightson_sw:")) { @@ -6449,15 +6372,12 @@ void TTrain::OnCommand_compartmentlightsdisable(TTrain *Train, command_data cons } else if (Command.action == GLFW_RELEASE) { - if (Train->m_controlmapper.contains("compartmentlights_sw:")) + if (Train->m_controlmapper.contains("compartmentlights_sw:") && Train->ggCompartmentLightsButton.type() == TGaugeType::push) { - if (Train->ggCompartmentLightsButton.type() == TGaugeType::push) - { - // return the switch to neutral position - Train->mvOccupied->CompartmentLightsSwitch(false); - Train->mvOccupied->CompartmentLightsSwitchOff(false); - Train->ggCompartmentLightsButton.UpdateValue(0.5f); - } + // return the switch to neutral position + Train->mvOccupied->CompartmentLightsSwitch(false); + Train->mvOccupied->CompartmentLightsSwitchOff(false); + Train->ggCompartmentLightsButton.UpdateValue(0.5f); } if (Train->m_controlmapper.contains("compartmentlightsoff_sw:")) { @@ -6685,15 +6605,11 @@ void TTrain::OnCommand_heatingtoggle(TTrain *Train, command_data const &Command) OnCommand_heatingdisable(Train, Command); } } - else if (Command.action == GLFW_RELEASE) + else if (Command.action == GLFW_RELEASE && Train->ggTrainHeatingButton.type() == TGaugeType::push) { - - if (Train->ggTrainHeatingButton.type() == TGaugeType::push) - { - // impulse switch - // visual feedback - Train->ggTrainHeatingButton.UpdateValue(0.0, Train->dsbSwitch); - } + // impulse switch + // visual feedback + Train->ggTrainHeatingButton.UpdateValue(0.0, Train->dsbSwitch); } } @@ -6762,16 +6678,12 @@ void TTrain::OnCommand_generictoggle(TTrain *Train, command_data const &Command) } } } - else if (Command.action == GLFW_RELEASE) + else if (Command.action == GLFW_RELEASE && item.type() == TGaugeType::push) { - - if (item.type() == TGaugeType::push) - { - // impulse switch - // turn off - // visual feedback - item.UpdateValue(0.0); - } + // impulse switch + // turn off + // visual feedback + item.UpdateValue(0.0); } } @@ -6879,8 +6791,7 @@ void TTrain::OnCommand_springbrakerelease(TTrain *Train, command_data const &Com { // only reacting to press, so the switch doesn't flip back and forth if key is held down - auto *vehicle{Train->find_nearest_consist_vehicle(Command.freefly, Command.location)}; - if (vehicle == nullptr) + if (auto const *vehicle{Train->find_nearest_consist_vehicle(Command.freefly, Command.location)}; vehicle == nullptr) { return; } @@ -6960,7 +6871,6 @@ void TTrain::OnCommand_speedcontrolbutton(TTrain *Train, command_data const &Com { auto const itemindex = static_cast(Command.command) - static_cast(user_command::speedcontrolbutton0); - auto &item = Train->ggSpeedCtrlButtons[itemindex]; if (Command.action == GLFW_PRESS) { @@ -7233,17 +7143,13 @@ void TTrain::OnCommand_doorpermitleft(TTrain *Train, command_data const &Command Train->ggDoorLeftPermitButton.UpdateValue(newstate ? 1.0 : 0.0, Train->dsbSwitch); } } - else if (Command.action == GLFW_RELEASE) + else if (Command.action == GLFW_RELEASE && Train->ggDoorLeftPermitButton.is_push()) { - - if (Train->ggDoorLeftPermitButton.is_push()) - { - // impulse switch - // visual feedback - Train->ggDoorLeftPermitButton.UpdateValue(0.0, Train->dsbSwitch); - // reset potential remote door control timer - Train->m_doorpermittimers[side] = -1.f; - } + // impulse switch + // visual feedback + Train->ggDoorLeftPermitButton.UpdateValue(0.0, Train->dsbSwitch); + // reset potential remote door control timer + Train->m_doorpermittimers[side] = -1.f; } } @@ -7283,17 +7189,13 @@ void TTrain::OnCommand_doorpermitright(TTrain *Train, command_data const &Comman Train->ggDoorRightPermitButton.UpdateValue(newstate ? 1.0 : 0.0, Train->dsbSwitch); } } - else if (Command.action == GLFW_RELEASE) + else if (Command.action == GLFW_RELEASE && Train->ggDoorRightPermitButton.type() == TGaugeType::push) { - - if (Train->ggDoorRightPermitButton.type() == TGaugeType::push) - { - // impulse switch - // visual feedback - Train->ggDoorRightPermitButton.UpdateValue(0.0, Train->dsbSwitch); - // reset potential remote door control timer - Train->m_doorpermittimers[side] = -1.f; - } + // impulse switch + // visual feedback + Train->ggDoorRightPermitButton.UpdateValue(0.0, Train->dsbSwitch); + // reset potential remote door control timer + Train->m_doorpermittimers[side] = -1.f; } } @@ -7305,7 +7207,7 @@ void TTrain::OnCommand_doorpermitpresetactivatenext(TTrain *Train, command_data Train->mvOccupied->ChangeDoorPermitPreset(1); // visual feedback - Train->ggDoorPermitPresetButton.UpdateValue(Train->mvOccupied->Doors.permit_preset, Train->dsbSwitch); + Train->ggDoorPermitPresetButton.UpdateValue(static_cast(Train->mvOccupied->Doors.permit_preset), Train->dsbSwitch); } } @@ -7317,16 +7219,15 @@ void TTrain::OnCommand_doorpermitpresetactivateprevious(TTrain *Train, command_d Train->mvOccupied->ChangeDoorPermitPreset(-1); // visual feedback - Train->ggDoorPermitPresetButton.UpdateValue(Train->mvOccupied->Doors.permit_preset, Train->dsbSwitch); + Train->ggDoorPermitPresetButton.UpdateValue(static_cast(Train->mvOccupied->Doors.permit_preset), Train->dsbSwitch); } } void TTrain::OnCommand_dooropenleft(TTrain *Train, command_data const &Command) { - auto const remoteopencontrol{Train->mvOccupied->Doors.open_control == control_t::driver || Train->mvOccupied->Doors.open_control == control_t::mixed}; - if (false == remoteopencontrol) + if (auto const remoteopencontrol{Train->mvOccupied->Doors.open_control == control_t::driver || Train->mvOccupied->Doors.open_control == control_t::mixed}; false == remoteopencontrol) { return; } @@ -7366,9 +7267,8 @@ void TTrain::OnCommand_dooropenleft(TTrain *Train, command_data const &Command) void TTrain::OnCommand_doorcloseleft(TTrain *Train, command_data const &Command) { - auto const remoteclosecontrol{Train->mvOccupied->Doors.close_control == control_t::driver || Train->mvOccupied->Doors.close_control == control_t::mixed}; - if (false == remoteclosecontrol) + if (auto const remoteclosecontrol{Train->mvOccupied->Doors.close_control == control_t::driver || Train->mvOccupied->Doors.close_control == control_t::mixed}; false == remoteclosecontrol) { return; } @@ -7499,9 +7399,8 @@ void TTrain::OnCommand_doortoggleright(TTrain *Train, command_data const &Comman void TTrain::OnCommand_dooropenright(TTrain *Train, command_data const &Command) { - auto const remoteopencontrol{Train->mvOccupied->Doors.open_control == control_t::driver || Train->mvOccupied->Doors.open_control == control_t::mixed}; - if (false == remoteopencontrol) + if (auto const remoteopencontrol{Train->mvOccupied->Doors.open_control == control_t::driver || Train->mvOccupied->Doors.open_control == control_t::mixed}; false == remoteopencontrol) { return; } @@ -7542,9 +7441,8 @@ void TTrain::OnCommand_dooropenright(TTrain *Train, command_data const &Command) void TTrain::OnCommand_doorcloseright(TTrain *Train, command_data const &Command) { - auto const remoteclosecontrol{Train->mvOccupied->Doors.close_control == control_t::driver || Train->mvOccupied->Doors.close_control == control_t::mixed}; - if (false == remoteclosecontrol) + if (auto const remoteclosecontrol{Train->mvOccupied->Doors.close_control == control_t::driver || Train->mvOccupied->Doors.close_control == control_t::mixed}; false == remoteclosecontrol) { return; } @@ -7599,9 +7497,8 @@ void TTrain::OnCommand_doorcloseright(TTrain *Train, command_data const &Command void TTrain::OnCommand_dooropenall(TTrain *Train, command_data const &Command) { - auto const remoteopencontrol{Train->mvOccupied->Doors.open_control == control_t::driver || Train->mvOccupied->Doors.open_control == control_t::mixed}; - if (false == remoteopencontrol) + if (auto const remoteopencontrol{Train->mvOccupied->Doors.open_control == control_t::driver || Train->mvOccupied->Doors.open_control == control_t::mixed}; false == remoteopencontrol) { return; } @@ -7634,9 +7531,8 @@ void TTrain::OnCommand_dooropenall(TTrain *Train, command_data const &Command) void TTrain::OnCommand_doorcloseall(TTrain *Train, command_data const &Command) { - auto const remoteclosecontrol{Train->mvOccupied->Doors.close_control == control_t::driver || Train->mvOccupied->Doors.close_control == control_t::mixed}; - if (false == remoteclosecontrol) + if (auto const remoteclosecontrol{Train->mvOccupied->Doors.close_control == control_t::driver || Train->mvOccupied->Doors.close_control == control_t::mixed}; false == remoteclosecontrol) { return; } @@ -7754,15 +7650,15 @@ void TTrain::OnCommand_nearestcarcouplingincrease(TTrain *Train, command_data co if (true == Command.freefly && Command.action == GLFW_PRESS) { // tryb freefly, press only - auto coupler{-1}; - auto *vehicle{Train->DynamicObject->ABuScanNearestObject(Command.location, Train->DynamicObject->GetTrack(), 1, 1500, coupler)}; + auto couplerindex{-1}; + auto *vehicle{Train->DynamicObject->ABuScanNearestObject(Command.location, Train->DynamicObject->GetTrack(), 1, 1500, couplerindex)}; if (vehicle == nullptr) - vehicle = Train->DynamicObject->ABuScanNearestObject(Command.location, Train->DynamicObject->GetTrack(), -1, 1500, coupler); + vehicle = Train->DynamicObject->ABuScanNearestObject(Command.location, Train->DynamicObject->GetTrack(), -1, 1500, couplerindex); - if (coupler != -1 && vehicle != nullptr) + if (couplerindex != -1 && vehicle != nullptr) { - vehicle->couple(coupler); + vehicle->couple(couplerindex); } if (Train->DynamicObject->Mechanik) { @@ -7778,15 +7674,15 @@ void TTrain::OnCommand_nearestcarcouplingdisconnect(TTrain *Train, command_data if (true == Command.freefly && Command.action == GLFW_PRESS) { // tryb freefly, press only - auto coupler{-1}; - auto *vehicle{Train->DynamicObject->ABuScanNearestObject(Command.location, Train->DynamicObject->GetTrack(), 1, 1500, coupler)}; + auto couplerindex{-1}; + auto *vehicle{Train->DynamicObject->ABuScanNearestObject(Command.location, Train->DynamicObject->GetTrack(), 1, 1500, couplerindex)}; if (vehicle == nullptr) - vehicle = Train->DynamicObject->ABuScanNearestObject(Command.location, Train->DynamicObject->GetTrack(), -1, 1500, coupler); + vehicle = Train->DynamicObject->ABuScanNearestObject(Command.location, Train->DynamicObject->GetTrack(), -1, 1500, couplerindex); - if (coupler != -1 && vehicle != nullptr) + if (couplerindex != -1 && vehicle != nullptr) { - vehicle->uncouple(coupler); + vehicle->uncouple(couplerindex); } if (Train->DynamicObject->Mechanik) { @@ -7796,7 +7692,7 @@ void TTrain::OnCommand_nearestcarcouplingdisconnect(TTrain *Train, command_data } } -void TTrain::OnCommand_nearestcarcoupleradapterattach(TTrain *Train, command_data const &Command) +void TTrain::OnCommand_nearestcarcoupleradapterattach(TTrain * /*Train*/, command_data const &Command) { if (true == Command.freefly && Command.action == GLFW_PRESS) @@ -7808,14 +7704,14 @@ void TTrain::OnCommand_nearestcarcoupleradapterattach(TTrain *Train, command_dat return; } - auto const coupler = + auto const couplerindex = glm::length2(glm::vec3{vehicle->CouplerPosition(end::front)} - Command.location) < glm::length2(glm::vec3{vehicle->CouplerPosition(end::rear)} - Command.location) ? end::front : end::rear; - vehicle->attach_coupler_adapter(coupler); + vehicle->attach_coupler_adapter(couplerindex); } } -void TTrain::OnCommand_nearestcarcoupleradapterremove(TTrain *Train, command_data const &Command) +void TTrain::OnCommand_nearestcarcoupleradapterremove(TTrain * /*Train*/, command_data const &Command) { if (true == Command.freefly && Command.action == GLFW_PRESS) @@ -7827,10 +7723,10 @@ void TTrain::OnCommand_nearestcarcoupleradapterremove(TTrain *Train, command_dat return; } - auto const coupler = + auto const couplerindex = glm::length2(glm::vec3{vehicle->CouplerPosition(end::front)} - Command.location) < glm::length2(glm::vec3{vehicle->CouplerPosition(end::rear)} - Command.location) ? end::front : end::rear; - vehicle->remove_coupler_adapter(coupler); + vehicle->remove_coupler_adapter(couplerindex); } } @@ -8144,7 +8040,7 @@ void TTrain::OnCommand_radiochannelset(TTrain *Train, command_data const &Comman { // on press or hold Train->RadioChannel() = std::clamp((int)Command.param1, 1, 10); - Train->ggRadioChannelSelector.UpdateValue(Train->RadioChannel() - 1); + Train->ggRadioChannelSelector.UpdateValue(static_cast(Train->RadioChannel() - 1)); } } @@ -8284,7 +8180,7 @@ void TTrain::OnCommand_radiovolumeset(TTrain *Train, command_data const &Command if (Command.action != GLFW_RELEASE) { // on press or hold - Train->m_radiovolume = std::clamp(Command.param1, 0.0, 1.0); + Train->m_radiovolume = static_cast(std::clamp(Command.param1, 0.0, 1.0)); Train->ggRadioVolumeSelector.UpdateValue(Train->m_radiovolume); audio::event_volume_change = true; } @@ -8295,9 +8191,7 @@ void TTrain::OnCommand_cabchangeforward(TTrain *Train, command_data const &Comma if (Command.action == GLFW_PRESS) { - auto const *owner{(Train->DynamicObject->ctOwner != nullptr ? Train->DynamicObject->ctOwner : Train->DynamicObject->Mechanik)}; - auto const movedirection{1}; - if (false == Train->CabChange(movedirection)) + if (auto const movedirection{1}; false == Train->CabChange(movedirection)) { auto const exitdirection{(movedirection > 0 ? end::front : end::rear)}; if (TestFlag(Train->mvOccupied->Couplers[exitdirection].CouplingFlag, coupling::gangway)) @@ -8326,9 +8220,7 @@ void TTrain::OnCommand_cabchangebackward(TTrain *Train, command_data const &Comm if (Command.action == GLFW_PRESS) { - auto const *owner{(Train->DynamicObject->ctOwner != nullptr ? Train->DynamicObject->ctOwner : Train->DynamicObject->Mechanik)}; - auto const movedirection{-1}; - if (false == Train->CabChange(movedirection)) + if (auto const movedirection{-1}; false == Train->CabChange(movedirection)) { // current vehicle doesn't extend any farther in this direction, check if we there's one connected we can move to auto const exitdirection{(movedirection > 0 ? end::front : end::rear)}; @@ -8401,15 +8293,11 @@ void TTrain::UpdateCab() // Ra: przesiadka, jeśli AI zmieniło kabinę (a człon?)... if (DynamicObject->Mechanik // może nie być? - && DynamicObject->Mechanik->AIControllFlag) + && DynamicObject->Mechanik->AIControllFlag && iCabn != ( // numer kabiny (-1: kabina B) + mvOccupied->CabOccupied == -1 ? 2 : mvOccupied->CabOccupied)) { - if (iCabn != ( // numer kabiny (-1: kabina B) - mvOccupied->CabOccupied == -1 ? 2 : mvOccupied->CabOccupied)) - { - - InitializeCab(mvOccupied->CabOccupied, mvOccupied->TypeName + ".mmd"); - } + InitializeCab(mvOccupied->CabOccupied, mvOccupied->TypeName + ".mmd"); } iCabn = mvOccupied->CabOccupied == -1 ? 2 : mvOccupied->CabOccupied; } @@ -8418,22 +8306,16 @@ bool TTrain::Update(double const Deltatime) { // train state update // line breaker: - if (m_linebreakerstate == 0) + if (m_linebreakerstate == 0 && true == mvControlled->Mains) { - if (true == mvControlled->Mains) - { - // crude way to sync state of the linebreaker with ai-issued commands - m_linebreakerstate = 1; - } + // crude way to sync state of the linebreaker with ai-issued commands + m_linebreakerstate = 1; } - if (m_linebreakerstate == 1) + if (m_linebreakerstate == 1 && false == (mvControlled->Mains || mvControlled->dizel_startup)) { - if (false == (mvControlled->Mains || mvControlled->dizel_startup)) - { - // crude way to catch cases where the main was knocked out - // because the state of the line breaker isn't changed to match, we need to do it here manually - m_linebreakerstate = 0; - } + // crude way to catch cases where the main was knocked out + // because the state of the line breaker isn't changed to match, we need to do it here manually + m_linebreakerstate = 0; } if ((ggMainButton.SubModel != nullptr && ggMainButton.GetDesiredValue() > 0.95) || @@ -8443,7 +8325,7 @@ bool TTrain::Update(double const Deltatime) // keep track of period the line breaker button is held down, to determine when/if circuit closes if (mvControlled->MainSwitchCheck()) { - fMainRelayTimer += Deltatime; + fMainRelayTimer += static_cast(Deltatime); } } else @@ -8456,24 +8338,18 @@ bool TTrain::Update(double const Deltatime) // if the button disconnecting the line breaker is down prevent the timer from accumulating fMainRelayTimer = 0.0f; } - if (m_linebreakerstate == 0) + if (m_linebreakerstate == 0 && fMainRelayTimer > mvControlled->InitialCtrlDelay) { - if (fMainRelayTimer > mvControlled->InitialCtrlDelay) - { - // wlaczanie WSa z opoznieniem - // mark the line breaker as ready to close; for electric series vehicles with impulse switch the setup is completed on button release - m_linebreakerstate = 2; - } + // wlaczanie WSa z opoznieniem + // mark the line breaker as ready to close; for electric series vehicles with impulse switch the setup is completed on button release + m_linebreakerstate = 2; } - if (m_linebreakerstate == 2) + // for diesels and/or vehicles with toggle switch setup we complete the engine start here + // TODO: make it a test for main_on_bt of type push_delayed instead + if (m_linebreakerstate == 2 && (ggMainOnButton.SubModel == nullptr || mvControlled->EngineType != TEngineType::ElectricSeriesMotor)) { - // for diesels and/or vehicles with toggle switch setup we complete the engine start here - // TODO: make it a test for main_on_bt of type push_delayed instead - if (ggMainOnButton.SubModel == nullptr || mvControlled->EngineType != TEngineType::ElectricSeriesMotor) - { - // try to finalize state change of the line breaker, set the state based on the outcome - m_linebreakerstate = mvControlled->MainSwitch(true) ? 1 : 0; - } + // try to finalize state change of the line breaker, set the state based on the outcome + m_linebreakerstate = mvControlled->MainSwitch(true) ? 1 : 0; } // door permits for (auto idx = 0; idx < 2; ++idx) @@ -8483,7 +8359,7 @@ bool TTrain::Update(double const Deltatime) { continue; } - doorpermittimer -= Deltatime; + doorpermittimer -= static_cast(Deltatime); if (doorpermittimer < 0.f) { mvOccupied->OperateDoors(static_cast(idx), true); @@ -8493,7 +8369,7 @@ bool TTrain::Update(double const Deltatime) // train measurement timer if (trainLenghtMeasureTimer >= 0.f) { - trainLenghtMeasureTimer -= Deltatime; + trainLenghtMeasureTimer -= static_cast(Deltatime); if (trainLenghtMeasureTimer < 0.f) trainLenghtMeasureTimer = -1.f; } @@ -8501,7 +8377,7 @@ bool TTrain::Update(double const Deltatime) // battery timer if (fBatteryTimer >= 0.f) { - fBatteryTimer -= Deltatime; + fBatteryTimer -= static_cast(Deltatime); if (fBatteryTimer < 0.f) fBatteryTimer = -1.f; } @@ -8511,14 +8387,14 @@ bool TTrain::Update(double const Deltatime) { m_doors = DynamicObject->Mechanik->IsAnyDoorOpen[side::right] || DynamicObject->Mechanik->IsAnyDoorOpen[side::left]; m_doorpermits = DynamicObject->Mechanik->IsAnyDoorPermitActive[side::right] || DynamicObject->Mechanik->IsAnyDoorPermitActive[side::left]; - m_doorspermitleft = mvOccupied->Doors.instances[(cab_to_end() == end::front ? side::left : side::right)].open_permit && + m_doorspermitleft = mvOccupied->Doors.instances[cab_to_end() == end::front ? side::left : side::right].open_permit && (simulation::Time.data().wSecond % 2 < 1 || mvOccupied->DoorsPermitLightBlinking < 1 || - mvOccupied->DoorsPermitLightBlinking < 2 && DynamicObject->Mechanik->IsAnyDoorOpen[(cab_to_end() == end::front ? side::left : side::right)] || - (mvOccupied->DoorsPermitLightBlinking < 3 && DynamicObject->Mechanik->IsAnyDoorOnlyOpen[(cab_to_end() == end::front ? side::left : side::right)])); - m_doorspermitright = mvOccupied->Doors.instances[(cab_to_end() == end::front ? side::right : side::left)].open_permit && + mvOccupied->DoorsPermitLightBlinking < 2 && DynamicObject->Mechanik->IsAnyDoorOpen[cab_to_end() == end::front ? side::left : side::right] || + (mvOccupied->DoorsPermitLightBlinking < 3 && DynamicObject->Mechanik->IsAnyDoorOnlyOpen[cab_to_end() == end::front ? side::left : side::right])); + m_doorspermitright = mvOccupied->Doors.instances[cab_to_end() == end::front ? side::right : side::left].open_permit && (simulation::Time.data().wSecond % 2 < 1 || mvOccupied->DoorsPermitLightBlinking < 1 || - mvOccupied->DoorsPermitLightBlinking < 2 && DynamicObject->Mechanik->IsAnyDoorOpen[(cab_to_end() == end::front ? side::right : side::left)] || - (mvOccupied->DoorsPermitLightBlinking < 3 && DynamicObject->Mechanik->IsAnyDoorOnlyOpen[(cab_to_end() == end::front ? side::right : side::left)])); + mvOccupied->DoorsPermitLightBlinking < 2 && DynamicObject->Mechanik->IsAnyDoorOpen[cab_to_end() == end::front ? side::right : side::left] || + (mvOccupied->DoorsPermitLightBlinking < 3 && DynamicObject->Mechanik->IsAnyDoorOnlyOpen[cab_to_end() == end::front ? side::right : side::left])); } m_dirforward = mvControlled->DirActive > 0; m_dirneutral = mvControlled->DirActive == 0; @@ -8547,34 +8423,31 @@ bool TTrain::Update(double const Deltatime) UpdateCab(); - if (DynamicObject->Mechanik != nullptr && false == DynamicObject->Mechanik->AIControllFlag) + // nie blokujemy AI + if (DynamicObject->Mechanik != nullptr && false == DynamicObject->Mechanik->AIControllFlag && (mvOccupied->TrainType == dt_ET40 || mvOccupied->TrainType == dt_EP05 || mvOccupied->HasCamshaft)) { - // nie blokujemy AI - if (mvOccupied->TrainType == dt_ET40 || mvOccupied->TrainType == dt_EP05 || mvOccupied->HasCamshaft) + // dla ET40 i EU05 automatyczne cofanie nastawnika - i tak nie będzie to działać dobrze... + // TODO: use deltatime to stabilize speed + /* + if( false == ( + ( input::command == user_command::mastercontrollerset ) + || ( input::command == user_command::mastercontrollerincrease ) + || ( input::command == user_command::mastercontrollerdecrease ) ) ) { + */ + if (false == (m_mastercontrollerinuse || Global.ctrlState)) { - // dla ET40 i EU05 automatyczne cofanie nastawnika - i tak nie będzie to działać dobrze... - // TODO: use deltatime to stabilize speed - /* - if( false == ( - ( input::command == user_command::mastercontrollerset ) - || ( input::command == user_command::mastercontrollerincrease ) - || ( input::command == user_command::mastercontrollerdecrease ) ) ) { - */ - if (false == (m_mastercontrollerinuse || Global.ctrlState)) + m_mastercontrollerreturndelay -= static_cast(Deltatime); + if (m_mastercontrollerreturndelay < 0.f) { - m_mastercontrollerreturndelay -= Deltatime; - if (m_mastercontrollerreturndelay < 0.f) + m_mastercontrollerreturndelay = EU07_CONTROLLER_BASERETURNDELAY; + if (mvOccupied->MainCtrlPos > mvOccupied->MainCtrlActualPos) { - m_mastercontrollerreturndelay = EU07_CONTROLLER_BASERETURNDELAY; - if (mvOccupied->MainCtrlPos > mvOccupied->MainCtrlActualPos) - { - mvOccupied->DecMainCtrl(1); - } - else if (mvOccupied->MainCtrlPos < mvOccupied->MainCtrlActualPos) - { - // Ra 15-01: a to nie miało być tylko cofanie? - mvOccupied->IncMainCtrl(1); - } + mvOccupied->DecMainCtrl(1); + } + else if (mvOccupied->MainCtrlPos < mvOccupied->MainCtrlActualPos) + { + // Ra 15-01: a to nie miało być tylko cofanie? + mvOccupied->IncMainCtrl(1); } } } @@ -8595,9 +8468,9 @@ bool TTrain::Update(double const Deltatime) if (ff != fTachoTimer) // jesli w tej sekundzie nie zmienial { if (fTachoVelocity >= 5) // jedzie - fTachoVelocityJump = fTachoVelocity + (2.0 - LocalRandom(3) + LocalRandom(3)) * 0.5; + fTachoVelocityJump = static_cast(fTachoVelocity + (2.0 - LocalRandom(3) + LocalRandom(3)) * 0.5); else if (fTachoVelocity < 5 && fTachoVelocity > 1) - fTachoVelocityJump = Random(0, 4); // tu ma sie bujac jak wariat i zatrzymac na jakiejs predkosci + fTachoVelocityJump = static_cast(Random(0, 4)); // tu ma sie bujac jak wariat i zatrzymac na jakiejs predkosci // fTachoVelocityJump = 0; // stoi fTachoTimer = ff; // juz zmienil } @@ -8605,43 +8478,48 @@ bool TTrain::Update(double const Deltatime) if (fTachoVelocity > 1) // McZapkie-270503: podkrecanie tachometru { // szybciej zacznij stukac - fTachoCount = std::min(maxtacho, fTachoCount + Deltatime * 3); + fTachoCount = static_cast(std::min(maxtacho, fTachoCount + Deltatime * 3)); } else if (fTachoCount > 0) { // schodz powoli - niektore haslery to ze 4 sekundy potrafia stukac - fTachoCount = std::max(0.0, fTachoCount - Deltatime * 0.66); + fTachoCount = static_cast(std::max(0.0, fTachoCount - Deltatime * 0.66)); } // Ra 2014-09: napięcia i prądy muszą być ustalone najpierw, bo wysyłane są ewentualnie na PoKeys if (mvControlled->EngineType != TEngineType::DieselElectric && mvControlled->EngineType != TEngineType::ElectricInductionMotor) { // Ra 2014-09: czy taki rozdzia? ma sens? - fHVoltage = std::max(mvControlled->PantographVoltage, - mvControlled->GetTrainsetHighVoltage()); // Winger czy to nie jest zle? + fHVoltage = static_cast(std::max(mvControlled->PantographVoltage, + mvControlled->GetTrainsetHighVoltage())); // Winger czy to nie jest zle? } // *mvControlled->Mains); else { - fHVoltage = mvControlled->EngineVoltage; + fHVoltage = static_cast(mvControlled->EngineVoltage); } if (ShowNextCurrent) { // jeśli pokazywać drugi człon if (mvSecond) { // o ile jest ten drugi - fHCurrent[0] = mvSecond->ShowCurrent(0) * 1.05; - fHCurrent[1] = mvSecond->ShowCurrent(1) * 1.05; - fHCurrent[2] = mvSecond->ShowCurrent(2) * 1.05; - fHCurrent[3] = mvSecond->ShowCurrent(3) * 1.05; + fHCurrent[0] = static_cast(mvSecond->ShowCurrent(0) * 1.05); + fHCurrent[1] = static_cast(mvSecond->ShowCurrent(1) * 1.05); + fHCurrent[2] = static_cast(mvSecond->ShowCurrent(2) * 1.05); + fHCurrent[3] = static_cast(mvSecond->ShowCurrent(3) * 1.05); } else - fHCurrent[0] = fHCurrent[1] = fHCurrent[2] = fHCurrent[3] = 0.0; // gdy nie ma człona + { + fHCurrent[0] = 0.0; // gdy nie ma człona + fHCurrent[1] = 0.0; + fHCurrent[2] = 0.0; + fHCurrent[3] = 0.0; + } } else { // normalne pokazywanie - fHCurrent[0] = mvControlled->ShowCurrent(0); - fHCurrent[1] = mvControlled->ShowCurrent(1); - fHCurrent[2] = mvControlled->ShowCurrent(2); - fHCurrent[3] = mvControlled->ShowCurrent(3); + fHCurrent[0] = static_cast(mvControlled->ShowCurrent(0)); + fHCurrent[1] = static_cast(mvControlled->ShowCurrent(1)); + fHCurrent[2] = static_cast(mvControlled->ShowCurrent(2)); + fHCurrent[3] = static_cast(mvControlled->ShowCurrent(3)); } bool kier = DynamicObject->DirectionGet() * mvOccupied->CabOccupied > 0; @@ -8672,13 +8550,13 @@ bool TTrain::Update(double const Deltatime) { if (p) { - fPress[i][0] = p->MoverParameters->BrakePress; - fPress[i][1] = p->MoverParameters->PipePress; - fPress[i][2] = p->MoverParameters->ScndPipePress; - fPress[i][3] = p->MoverParameters->CntrlPipePress; - fPress[i][4] = p->MoverParameters->Hamulec->GetBRP(); - fPress[i][5] = (p->MoverParameters->TotalMass - p->MoverParameters->Mred) * 0.001; - fPress[i][6] = p->MoverParameters->SpringBrake.SBP; + fPress[i][0] = static_cast(p->MoverParameters->BrakePress); + fPress[i][1] = static_cast(p->MoverParameters->PipePress); + fPress[i][2] = static_cast(p->MoverParameters->ScndPipePress); + fPress[i][3] = static_cast(p->MoverParameters->CntrlPipePress); + fPress[i][4] = static_cast(p->MoverParameters->Hamulec->GetBRP()); + fPress[i][5] = static_cast((p->MoverParameters->TotalMass - p->MoverParameters->Mred) * 0.001); + fPress[i][6] = static_cast(p->MoverParameters->SpringBrake.SBP); bBrakes[i][0] = p->MoverParameters->SpringBrake.IsActive; bBrakes[i][1] = p->MoverParameters->SpringBrake.ShuttOff; bDoors[i][1] = p->MoverParameters->Doors.instances[side::left].position > 0.f; @@ -8711,19 +8589,19 @@ bool TTrain::Update(double const Deltatime) bSlip[i] = p->MoverParameters->SlippingWheels; if (in < 8 && p->MoverParameters->eimc[eimc_p_Pmax] > 1) { - fEIMParams[1 + in][0] = p->MoverParameters->eimv[eimv_Fmax]; + fEIMParams[1 + in][0] = static_cast(p->MoverParameters->eimv[eimv_Fmax]); fEIMParams[1 + in][1] = std::max(fEIMParams[1 + in][0], 0.f); fEIMParams[1 + in][2] = -std::min(fEIMParams[1 + in][0], 0.f); - fEIMParams[1 + in][3] = p->MoverParameters->eimv[eimv_Fmax] / std::max(p->MoverParameters->eimv[eimv_Fful], 1.); + fEIMParams[1 + in][3] = static_cast(p->MoverParameters->eimv[eimv_Fmax] / std::max(p->MoverParameters->eimv[eimv_Fful], 1.)); fEIMParams[1 + in][4] = std::max(fEIMParams[1 + in][3], 0.f); fEIMParams[1 + in][5] = -std::min(fEIMParams[1 + in][3], 0.f); - fEIMParams[1 + in][6] = p->MoverParameters->eimv[eimv_If]; - fEIMParams[1 + in][7] = p->MoverParameters->eimv[eimv_U]; - fEIMParams[1 + in][8] = p->MoverParameters->Itot; // p->MoverParameters->eimv[eimv_Ipoj]; - fEIMParams[1 + in][9] = p->MoverParameters->EngineVoltage; + fEIMParams[1 + in][6] = static_cast(p->MoverParameters->eimv[eimv_If]); + fEIMParams[1 + in][7] = static_cast(p->MoverParameters->eimv[eimv_U]); + fEIMParams[1 + in][8] = static_cast(p->MoverParameters->Itot); // p->MoverParameters->eimv[eimv_Ipoj]; + fEIMParams[1 + in][9] = static_cast(p->MoverParameters->EngineVoltage); fEIMParams[0][6] += fEIMParams[1 + in][8]; bMains[in] = p->MoverParameters->Mains; - fCntVol[in] = p->MoverParameters->BatteryVoltage; + fCntVol[in] = static_cast(p->MoverParameters->BatteryVoltage); bFuse[in] = p->MoverParameters->FuseFlag; bBatt[in] = p->MoverParameters->Battery; bConv[in] = p->MoverParameters->ConverterFlag; @@ -8735,18 +8613,18 @@ bool TTrain::Update(double const Deltatime) } if (in < 8 && (p->MoverParameters->EngineType == TEngineType::DieselEngine || p->MoverParameters->EngineType == TEngineType::DieselElectric)) { - fDieselParams[1 + in][0] = p->MoverParameters->enrot * 60; - fDieselParams[1 + in][1] = p->MoverParameters->nrot; - fDieselParams[1 + in][2] = p->MoverParameters->RList[p->MoverParameters->MainCtrlPos].R; - fDieselParams[1 + in][3] = p->MoverParameters->dizel_fill; - fDieselParams[1 + in][4] = p->MoverParameters->RList[p->MoverParameters->MainCtrlPos].Mn; - fDieselParams[1 + in][5] = p->MoverParameters->dizel_engage; + fDieselParams[1 + in][0] = static_cast(p->MoverParameters->enrot * 60); + fDieselParams[1 + in][1] = static_cast(p->MoverParameters->nrot); + fDieselParams[1 + in][2] = static_cast(p->MoverParameters->RList[p->MoverParameters->MainCtrlPos].R); + fDieselParams[1 + in][3] = static_cast(p->MoverParameters->dizel_fill); + fDieselParams[1 + in][4] = static_cast(p->MoverParameters->RList[p->MoverParameters->MainCtrlPos].Mn); + fDieselParams[1 + in][5] = static_cast(p->MoverParameters->dizel_engage); fDieselParams[1 + in][6] = p->MoverParameters->dizel_heat.Twy; fDieselParams[1 + in][7] = p->MoverParameters->OilPump.pressure; fDieselParams[1 + in][8] = p->MoverParameters->dizel_heat.Ts; - fDieselParams[1 + in][9] = p->MoverParameters->hydro_R_Fill; + fDieselParams[1 + in][9] = static_cast(p->MoverParameters->hydro_R_Fill); bMains[in] = p->MoverParameters->Mains; - fCntVol[in] = p->MoverParameters->BatteryVoltage; + fCntVol[in] = static_cast(p->MoverParameters->BatteryVoltage); bFuse[in] = p->MoverParameters->FuseFlag; bBatt[in] = p->MoverParameters->Battery; bConv[in] = p->MoverParameters->ConverterFlag; @@ -8761,9 +8639,19 @@ bool TTrain::Update(double const Deltatime) } else { - fPress[i][0] = fPress[i][1] = fPress[i][2] = fPress[i][3] = fPress[i][4] = fPress[i][5] = 0; - bDoors[i][0] = bDoors[i][1] = bDoors[i][2] = bDoors[i][3] = bDoors[i][4] = false; - bBrakes[i][0] = bBrakes[i][1] = false; + fPress[i][0] = 0; + fPress[i][1] = 0; + fPress[i][2] = 0; + fPress[i][3] = 0; + fPress[i][4] = 0; + fPress[i][5] = 0; + bDoors[i][0] = false; + bDoors[i][1] = false; + bDoors[i][2] = false; + bDoors[i][3] = false; + bDoors[i][4] = false; + bBrakes[i][0] = false; + bBrakes[i][1] = false; bSlip[i] = false; iUnits[i] = 0; cCode[i] = 0; //'0'; @@ -8776,11 +8664,11 @@ bool TTrain::Update(double const Deltatime) // else // fEIMParams[0][3] = // mvControlled->eimv[eimv_Fzad] - mvOccupied->LocalBrakeRatio(); // procent zadany - fEIMParams[0][3] = mvOccupied->eimic_real; + fEIMParams[0][3] = static_cast(mvOccupied->eimic_real); fEIMParams[0][4] = std::max(fEIMParams[0][3], 0.f); fEIMParams[0][5] = -std::min(fEIMParams[0][3], 0.f); - fEIMParams[0][1] = fEIMParams[0][4] * mvControlled->eimv[eimv_Fful]; - fEIMParams[0][2] = fEIMParams[0][5] * mvControlled->eimv[eimv_Fful]; + fEIMParams[0][1] = static_cast(fEIMParams[0][4] * mvControlled->eimv[eimv_Fful]); + fEIMParams[0][2] = static_cast(fEIMParams[0][5] * mvControlled->eimv[eimv_Fful]); fEIMParams[0][0] = fEIMParams[0][1] - fEIMParams[0][2]; fEIMParams[0][7] = 0; fEIMParams[0][8] = 0; @@ -8819,7 +8707,7 @@ bool TTrain::Update(double const Deltatime) // Ra 15-01: to musi stąd wylecieć - zależności nie mogą być w kabinie if (mvControlled->ConverterFlag == true) { - fConverterTimer += Deltatime; + fConverterTimer += static_cast(Deltatime); if (mvControlled->CompressorFlag == true && mvControlled->CompressorPower == 1 && (mvControlled->EngineType == TEngineType::ElectricSeriesMotor || mvControlled->TrainType == dt_EZT) && DynamicObject->Controller == Humandriver // hunter-110212: poprawka dla EZT && false == DynamicObject->Mechanik->AIControllFlag) @@ -8844,47 +8732,42 @@ bool TTrain::Update(double const Deltatime) // youBy - prad w drugim czlonie: galaz lub calosc { - TDynamicObject *tmp{nullptr}; - if (DynamicObject->NextConnected()) - if (TestFlag(mvControlled->Couplers[end::rear].CouplingFlag, coupling::control) && mvOccupied->CabOccupied == 1) - tmp = DynamicObject->NextConnected(); - if (DynamicObject->PrevConnected()) - if (TestFlag(mvControlled->Couplers[end::front].CouplingFlag, coupling::control) && mvOccupied->CabOccupied == -1) - tmp = DynamicObject->PrevConnected(); - if (tmp) + TDynamicObject const *tmp{nullptr}; + if (DynamicObject->NextConnected() && TestFlag(mvControlled->Couplers[end::rear].CouplingFlag, coupling::control) && mvOccupied->CabOccupied == 1) + tmp = DynamicObject->NextConnected(); + if (DynamicObject->PrevConnected() && TestFlag(mvControlled->Couplers[end::front].CouplingFlag, coupling::control) && mvOccupied->CabOccupied == -1) + tmp = DynamicObject->PrevConnected(); + if (tmp && tmp->MoverParameters->Power > 0) { - if (tmp->MoverParameters->Power > 0) + if (ggI1B.SubModel) { - if (ggI1B.SubModel) - { - ggI1B.UpdateValue(tmp->MoverParameters->ShowCurrent(1)); - ggI1B.Update(); - } - if (ggI2B.SubModel) - { - ggI2B.UpdateValue(tmp->MoverParameters->ShowCurrent(2)); - ggI2B.Update(); - } - if (ggI3B.SubModel) - { - ggI3B.UpdateValue(tmp->MoverParameters->ShowCurrent(3)); - ggI3B.Update(); - } - if (ggItotalB.SubModel) - { - ggItotalB.UpdateValue(tmp->MoverParameters->ShowCurrent(0)); - ggItotalB.Update(); - } - if (ggWater1TempB.SubModel) - { - ggWater1TempB.UpdateValue(tmp->MoverParameters->dizel_heat.temperatura1); - ggWater1TempB.Update(); - } - if (ggOilPressB.SubModel) - { - ggOilPressB.UpdateValue(tmp->MoverParameters->OilPump.pressure); - ggOilPressB.Update(); - } + ggI1B.UpdateValue(static_cast(tmp->MoverParameters->ShowCurrent(1))); + ggI1B.Update(); + } + if (ggI2B.SubModel) + { + ggI2B.UpdateValue(static_cast(tmp->MoverParameters->ShowCurrent(2))); + ggI2B.Update(); + } + if (ggI3B.SubModel) + { + ggI3B.UpdateValue(static_cast(tmp->MoverParameters->ShowCurrent(3))); + ggI3B.Update(); + } + if (ggItotalB.SubModel) + { + ggItotalB.UpdateValue(static_cast(tmp->MoverParameters->ShowCurrent(0))); + ggItotalB.Update(); + } + if (ggWater1TempB.SubModel) + { + ggWater1TempB.UpdateValue(tmp->MoverParameters->dizel_heat.temperatura1); + ggWater1TempB.Update(); + } + if (ggOilPressB.SubModel) + { + ggOilPressB.UpdateValue(tmp->MoverParameters->OilPump.pressure); + ggOilPressB.Update(); } } } @@ -8895,7 +8778,7 @@ bool TTrain::Update(double const Deltatime) ggClockSInd.Update(); ggClockMInd.UpdateValue(simulation::Time.data().wMinute); ggClockMInd.Update(); - ggClockHInd.UpdateValue(simulation::Time.data().wHour + simulation::Time.data().wMinute / 60.0); + ggClockHInd.UpdateValue(static_cast(simulation::Time.data().wHour + simulation::Time.data().wMinute / 60.0)); ggClockHInd.Update(); } @@ -8915,7 +8798,7 @@ bool TTrain::Update(double const Deltatime) { if (mvControlled->DynamicBrakeFlag) { - ggEngineVoltage.UpdateValue(std::abs(mvControlled->Im * 5)); + ggEngineVoltage.UpdateValue(static_cast(std::abs(mvControlled->Im * 5))); } else { @@ -8926,8 +8809,8 @@ bool TTrain::Update(double const Deltatime) x = 2; if (mvControlled->RList[mvControlled->MainCtrlActualPos].Mn > 0 && std::abs(mvControlled->Im) > 0) { - ggEngineVoltage.UpdateValue(x * (std::abs(mvControlled->EngineVoltage) - mvControlled->RList[mvControlled->MainCtrlActualPos].R * std::abs(mvControlled->Im)) / - mvControlled->RList[mvControlled->MainCtrlActualPos].Mn); + ggEngineVoltage.UpdateValue(static_cast(x * (std::abs(mvControlled->EngineVoltage) - mvControlled->RList[mvControlled->MainCtrlActualPos].R * std::abs(mvControlled->Im)) / + mvControlled->RList[mvControlled->MainCtrlActualPos].Mn)); } else { @@ -8942,25 +8825,25 @@ bool TTrain::Update(double const Deltatime) { // NOTE: since we don't have functional converter object, we're faking it here by simple check whether converter is on // TODO: implement object-based circuits and power systems model so we can have this working more properly - ggLVoltage.UpdateValue(std::max(mvOccupied->Power110vIsAvailable ? mvOccupied->NominalBatteryVoltage : 0.0, mvOccupied->Power24vIsAvailable ? mvOccupied->BatteryVoltage : 0.0)); + ggLVoltage.UpdateValue(static_cast(std::max(mvOccupied->Power110vIsAvailable ? mvOccupied->NominalBatteryVoltage : 0.0, mvOccupied->Power24vIsAvailable ? mvOccupied->BatteryVoltage : 0.0))); ggLVoltage.Update(); } if (mvControlled->EngineType == TEngineType::DieselElectric) { // ustawienie zmiennych dla silnika spalinowego - fEngine[1] = mvControlled->ShowEngineRotation(1); - fEngine[2] = mvControlled->ShowEngineRotation(2); + fEngine[1] = static_cast(mvControlled->ShowEngineRotation(1)); + fEngine[2] = static_cast(mvControlled->ShowEngineRotation(2)); } else if (mvControlled->EngineType == TEngineType::DieselEngine) { // albo dla innego spalinowego - fEngine[1] = mvControlled->ShowEngineRotation(1); - fEngine[2] = mvControlled->ShowEngineRotation(2); - fEngine[3] = mvControlled->ShowEngineRotation(3); + fEngine[1] = static_cast(mvControlled->ShowEngineRotation(1)); + fEngine[2] = static_cast(mvControlled->ShowEngineRotation(2)); + fEngine[3] = static_cast(mvControlled->ShowEngineRotation(3)); if (ggMainGearStatus.SubModel) { if (mvControlled->Mains) - ggMainGearStatus.UpdateValue(1.1 - std::abs(mvControlled->dizel_automaticgearstatus)); + ggMainGearStatus.UpdateValue(static_cast(1.1 - std::abs(mvControlled->dizel_automaticgearstatus))); else ggMainGearStatus.UpdateValue(0.0); ggMainGearStatus.Update(); @@ -8978,13 +8861,10 @@ bool TTrain::Update(double const Deltatime) { // Ra 2014-12: lokomotywy 181/182 dostają SlippingWheels po zahamowaniu powyżej 2.85 bara i buczały double veldiff = (DynamicObject->GetVelocity() - fTachoVelocity) / mvControlled->Vmax; - if (veldiff < -0.01) + // 1% Vmax rezerwy, żeby 181/182 nie buczały po zahamowaniu, ale to proteza + if (veldiff < -0.01 && std::abs(mvControlled->Im) > 10.0) { - // 1% Vmax rezerwy, żeby 181/182 nie buczały po zahamowaniu, ale to proteza - if (std::abs(mvControlled->Im) > 10.0) - { - btLampkaPoslizg.Turn(true); - } + btLampkaPoslizg.Turn(true); } } else @@ -9132,8 +9012,8 @@ bool TTrain::Update(double const Deltatime) // NBMX wrzesien 2003 - drzwi oraz sygnał odjazdu if (DynamicObject->Mechanik != nullptr) { - btLampkaDoorLeft.Turn(DynamicObject->Mechanik->IsAnyDoorOpen[(cab_to_end() == end::front ? side::left : side::right)]); - btLampkaDoorRight.Turn(DynamicObject->Mechanik->IsAnyDoorOpen[(cab_to_end() == end::front ? side::right : side::left)]); + btLampkaDoorLeft.Turn(DynamicObject->Mechanik->IsAnyDoorOpen[cab_to_end() == end::front ? side::left : side::right]); + btLampkaDoorRight.Turn(DynamicObject->Mechanik->IsAnyDoorOpen[cab_to_end() == end::front ? side::right : side::left]); } btLampkaBlokadaDrzwi.Turn(mvOccupied->Doors.is_locked); btLampkaDoorLockOff.Turn(false == mvOccupied->Doors.lock_enabled); @@ -9278,7 +9158,7 @@ bool TTrain::Update(double const Deltatime) } { // yB - wskazniki drugiego czlonu - TDynamicObject *tmp{nullptr}; //=mvControlled->mvSecond; //Ra 2014-07: trzeba to jeszcze wyjąć z kabiny... + TDynamicObject const *tmp{nullptr}; //=mvControlled->mvSecond; //Ra 2014-07: trzeba to jeszcze wyjąć z kabiny... // Ra 2014-07: no nie ma potrzeby szukać tego w każdej klatce if (TestFlag(mvControlled->Couplers[1].CouplingFlag, coupling::control) && mvOccupied->CabOccupied > 0) tmp = DynamicObject->NextConnected(); @@ -9384,9 +9264,9 @@ bool TTrain::Update(double const Deltatime) (mvControlled->DynamicBrakeCtrlPos > 0.0 ? mvControlled->DynamicBrakeCtrlPos * mvControlled->DynamicBrakeCtrlPosNo * -1 * brakerangemultiplier : 0.0) : mvOccupied->LocalBrakePosA > 0.0 ? mvOccupied->LocalBrakePosA * LocalBrakePosNo * -1 * brakerangemultiplier : 0.0}; - ggJointCtrl.UpdateValue(negativePart < 0.0 ? negativePart : - mvControlled->CoupledCtrl ? double(mvControlled->MainCtrlPos + mvControlled->ScndCtrlPos) : - double(mvControlled->MainCtrlPos), + ggJointCtrl.UpdateValue(negativePart < 0.0 ? static_cast(negativePart) : + mvControlled->CoupledCtrl ? static_cast(double(mvControlled->MainCtrlPos + mvControlled->ScndCtrlPos)) : + static_cast(double(mvControlled->MainCtrlPos)), dsbNastawnikJazdy); ggJointCtrl.Update(); } @@ -9405,20 +9285,20 @@ bool TTrain::Update(double const Deltatime) if (mvControlled->CoupledCtrl) { - ggMainCtrl.UpdateValue(double(mvControlled->MainCtrlPos + mvControlled->ScndCtrlPos), dsbNastawnikJazdy); + ggMainCtrl.UpdateValue(static_cast(double(mvControlled->MainCtrlPos + mvControlled->ScndCtrlPos)), dsbNastawnikJazdy); } else { - ggMainCtrl.UpdateValue(double(mvControlled->MainCtrlPos), dsbNastawnikJazdy); + ggMainCtrl.UpdateValue(static_cast(double(mvControlled->MainCtrlPos)), dsbNastawnikJazdy); } ggMainCtrl.Update(); } if (ggMainCtrlAct.SubModel != nullptr) { if (mvControlled->CoupledCtrl) - ggMainCtrlAct.UpdateValue(double(mvControlled->MainCtrlActualPos + mvControlled->ScndCtrlActualPos)); + ggMainCtrlAct.UpdateValue(static_cast(double(mvControlled->MainCtrlActualPos + mvControlled->ScndCtrlActualPos))); else - ggMainCtrlAct.UpdateValue(double(mvControlled->MainCtrlActualPos)); + ggMainCtrlAct.UpdateValue(static_cast(double(mvControlled->MainCtrlActualPos))); ggMainCtrlAct.Update(); } if (ggScndCtrl.SubModel != nullptr) @@ -9426,7 +9306,7 @@ bool TTrain::Update(double const Deltatime) // Ra: od byte odejmowane boolean i konwertowane potem na double? if (false == ggScndCtrl.is_push()) { - ggScndCtrl.UpdateValue(double(mvControlled->ScndCtrlPos - (mvControlled->TrainType == dt_ET42 && mvControlled->DynamicBrakeFlag)), dsbNastawnikBocz); + ggScndCtrl.UpdateValue(static_cast(double(mvControlled->ScndCtrlPos - (mvControlled->TrainType == dt_ET42 && mvControlled->DynamicBrakeFlag))), dsbNastawnikBocz); } ggScndCtrl.Update(); } @@ -9450,11 +9330,11 @@ bool TTrain::Update(double const Deltatime) { if (mvControlled->TrainType != dt_EZT) { - ggDirKey.UpdateValue(double(mvControlled->DirActive), dsbReverserKey); + ggDirKey.UpdateValue(static_cast(double(mvControlled->DirActive)), dsbReverserKey); } else { - ggDirKey.UpdateValue(double(mvControlled->DirActive) + double(mvControlled->Imin == mvControlled->IminHi), dsbReverserKey); + ggDirKey.UpdateValue(static_cast(double(mvControlled->DirActive) + double(mvControlled->Imin == mvControlled->IminHi)), dsbReverserKey); } ggDirKey.Update(); } @@ -9495,7 +9375,7 @@ bool TTrain::Update(double const Deltatime) { // else //standardowa prodedura z kranem powiązanym z klawiaturą // ggBrakeCtrl.UpdateValue(double(mvOccupied->BrakeCtrlPos)); - ggBrakeCtrl.UpdateValue(mvOccupied->fBrakeCtrlPos); + ggBrakeCtrl.UpdateValue(static_cast(mvOccupied->fBrakeCtrlPos)); ggBrakeCtrl.Update(); } } @@ -9516,7 +9396,7 @@ bool TTrain::Update(double const Deltatime) #endif { // standardowa prodedura z kranem powiązanym z klawiaturą - ggLocalBrake.UpdateValue(mvOccupied->LocalBrakePosA * LocalBrakePosNo); + ggLocalBrake.UpdateValue(static_cast(mvOccupied->LocalBrakePosA * LocalBrakePosNo)); } ggLocalBrake.Update(); } @@ -9647,7 +9527,7 @@ bool TTrain::Update(double const Deltatime) ggWhistleButton.Update(); if (DynamicObject->Mechanik != nullptr) { - ggHelperButton.UpdateValue(DynamicObject->Mechanik->HelperState); + ggHelperButton.UpdateValue(static_cast(DynamicObject->Mechanik->HelperState)); } ggHelperButton.Update(); @@ -9737,12 +9617,9 @@ bool TTrain::Update(double const Deltatime) } // anti slip system activation, maintained while the control button is down - if (mvOccupied->BrakeSystem != TBrakeSystem::ElectroPneumatic) + if (mvOccupied->BrakeSystem != TBrakeSystem::ElectroPneumatic && ggAntiSlipButton.GetDesiredValue() > 0.95) { - if (ggAntiSlipButton.GetDesiredValue() > 0.95) - { - mvControlled->AntiSlippingBrake(); - } + mvControlled->AntiSlippingBrake(); } // screens @@ -9798,22 +9675,22 @@ void TTrain::update_sounds(double const Deltatime) { // calculate rate of pressure drop in local brake cylinder, once it's been initialized auto const brakepressuredifference{mvOccupied->LocBrakePress - m_lastlocalbrakepressure}; - m_localbrakepressurechange = std::lerp(m_localbrakepressurechange, 10 * (brakepressuredifference / Deltatime), 0.1f); + m_localbrakepressurechange = static_cast(std::lerp(m_localbrakepressurechange, 10 * (brakepressuredifference / Deltatime), 0.1f)); } - m_lastlocalbrakepressure = mvOccupied->LocBrakePress; + m_lastlocalbrakepressure = static_cast(mvOccupied->LocBrakePress); // local brake, release if (rsSBHiss) { if (m_localbrakepressurechange < -0.05f && mvOccupied->LocBrakePress > mvOccupied->BrakePress - 0.05) { - rsSBHiss->gain(std::clamp(rsSBHiss->m_amplitudeoffset + rsSBHiss->m_amplitudefactor * -m_localbrakepressurechange * 0.05, 0.0, 1.5)); + rsSBHiss->gain(static_cast(std::clamp(rsSBHiss->m_amplitudeoffset + rsSBHiss->m_amplitudefactor * -m_localbrakepressurechange * 0.05, 0.0, 1.5))); rsSBHiss->play(sound_flags::exclusive | sound_flags::looping); } else { // don't stop the sound too abruptly volume = std::max(0.0, rsSBHiss->gain() - 0.1 * Deltatime); - rsSBHiss->gain(volume); + rsSBHiss->gain(static_cast(volume)); if (volume < 0.05) { rsSBHiss->stop(); @@ -9825,14 +9702,14 @@ void TTrain::update_sounds(double const Deltatime) { if (m_localbrakepressurechange > 0.05f) { - rsSBHissU->gain(std::clamp(rsSBHissU->m_amplitudeoffset + rsSBHissU->m_amplitudefactor * m_localbrakepressurechange * 0.05, 0.0, 1.5)); + rsSBHissU->gain(static_cast(std::clamp(rsSBHissU->m_amplitudeoffset + rsSBHissU->m_amplitudefactor * m_localbrakepressurechange * 0.05, 0.0, 1.5))); rsSBHissU->play(sound_flags::exclusive | sound_flags::looping); } else { // don't stop the sound too abruptly volume = std::max(0.0, rsSBHissU->gain() - 0.1 * Deltatime); - rsSBHissU->gain(volume); + rsSBHissU->gain(static_cast(volume)); if (volume < 0.05) { rsSBHissU->stop(); @@ -9851,7 +9728,7 @@ void TTrain::update_sounds(double const Deltatime) volume = fPPress > 0 ? rsHiss->m_amplitudefactor * fPPress * 0.25 + rsHiss->m_amplitudeoffset : 0; if (volume * brakevolumescale > 0.05) { - rsHiss->gain(volume * brakevolumescale); + rsHiss->gain(static_cast(volume * brakevolumescale)); rsHiss->play(sound_flags::exclusive | sound_flags::looping); } else @@ -9866,7 +9743,7 @@ void TTrain::update_sounds(double const Deltatime) volume = fNPress > 0 ? rsHissU->m_amplitudefactor * fNPress + rsHissU->m_amplitudeoffset : 0; if (volume * brakevolumescale > 0.05) { - rsHissU->gain(volume * brakevolumescale); + rsHissU->gain(static_cast(volume * brakevolumescale)); rsHissU->play(sound_flags::exclusive | sound_flags::looping); } else @@ -9880,7 +9757,7 @@ void TTrain::update_sounds(double const Deltatime) volume = mvOccupied->Handle->GetSound(s_fv4a_e) * rsHissE->m_amplitudefactor + rsHissE->m_amplitudeoffset; if (volume * brakevolumescale > 0.05) { - rsHissE->gain(volume * brakevolumescale); + rsHissE->gain(static_cast(volume * brakevolumescale)); rsHissE->play(sound_flags::exclusive | sound_flags::looping); } else @@ -9894,7 +9771,7 @@ void TTrain::update_sounds(double const Deltatime) volume = mvOccupied->Handle->GetSound(s_fv4a_x) * rsHissX->m_amplitudefactor + rsHissX->m_amplitudeoffset; if (volume * brakevolumescale > 0.05) { - rsHissX->gain(volume * brakevolumescale); + rsHissX->gain(static_cast(volume * brakevolumescale)); rsHissX->play(sound_flags::exclusive | sound_flags::looping); } else @@ -9908,7 +9785,7 @@ void TTrain::update_sounds(double const Deltatime) volume = mvOccupied->Handle->GetSound(s_fv4a_t) * rsHissT->m_amplitudefactor + +rsHissT->m_amplitudeoffset; if (volume * brakevolumescale > 0.05) { - rsHissT->gain(volume * brakevolumescale); + rsHissT->gain(static_cast(volume * brakevolumescale)); rsHissT->play(sound_flags::exclusive | sound_flags::looping); } else @@ -9923,11 +9800,11 @@ void TTrain::update_sounds(double const Deltatime) // upuszczanie z PG if (rsHiss) { - fPPress = (4.0f * fPPress + std::max(0.0, mvOccupied->dpMainValve)) / (4.0f + 1.0f); + fPPress = static_cast((4.0f * fPPress + std::max(0.0, mvOccupied->dpMainValve)) / (4.0f + 1.0f)); volume = fPPress > 0.0f ? 2.0 * rsHiss->m_amplitudefactor * fPPress + rsHiss->m_amplitudeoffset : 0.0; if (volume > 0.05) { - rsHiss->gain(volume); + rsHiss->gain(static_cast(volume)); rsHiss->play(sound_flags::exclusive | sound_flags::looping); } else @@ -9938,11 +9815,11 @@ void TTrain::update_sounds(double const Deltatime) // napelnianie PG if (rsHissU) { - fNPress = (4.0f * fNPress + std::min(0.0, mvOccupied->dpMainValve)) / (4.0f + 1.0f); + fNPress = static_cast((4.0f * fNPress + std::min(0.0, mvOccupied->dpMainValve)) / (4.0f + 1.0f)); volume = fNPress < 0.0f ? -1.0 * rsHissU->m_amplitudefactor * fNPress + rsHissU->m_amplitudeoffset : 0.0; if (volume > 0.01) { - rsHissU->gain(volume); + rsHissU->gain(static_cast(volume)); rsHissU->play(sound_flags::exclusive | sound_flags::looping); } else @@ -9962,8 +9839,8 @@ void TTrain::update_sounds(double const Deltatime) std::clamp(mvOccupied->UnitBrakeForce / std::max(1.0, mvOccupied->BrakeForceR(1.0, mvOccupied->Vel) / (mvOccupied->NAxles * std::max(1, mvOccupied->NBpA))), 0.0, 1.0)}; // HACK: in external view mute the sound rather than stop it, in case there's an opening bookend it'd (re)play on sound restart after returning inside volume = FreeFlyModeFlag ? 0.0 : rsBrake->m_amplitudeoffset + std::sqrt(brakeforceratio * std::lerp(0.4, 1.0, mvOccupied->Vel / (1 + mvOccupied->Vmax))) * rsBrake->m_amplitudefactor; - rsBrake->pitch(rsBrake->m_frequencyoffset + mvOccupied->Vel * rsBrake->m_frequencyfactor); - rsBrake->gain(volume); + rsBrake->pitch(static_cast(rsBrake->m_frequencyoffset + mvOccupied->Vel * rsBrake->m_frequencyfactor)); + rsBrake->gain(static_cast(volume)); rsBrake->play(sound_flags::exclusive | sound_flags::looping); } else @@ -10038,7 +9915,7 @@ void TTrain::update_sounds(double const Deltatime) auto const huntingamount = std::lerp( 0.0, 1.0, std::clamp((mvOccupied->Vel - DynamicObject->HuntingShake.fadein_begin) / (DynamicObject->HuntingShake.fadein_end - DynamicObject->HuntingShake.fadein_begin), 0.0, 1.0)); - rsHuntingNoise->gain(rsHuntingNoise->gain() * huntingamount); + rsHuntingNoise->gain(static_cast(rsHuntingNoise->gain() * huntingamount)); } else { @@ -10053,7 +9930,7 @@ void TTrain::update_sounds(double const Deltatime) { if (m_rainsound->is_combined()) { - m_rainsound->pitch(Global.Overcast - 1.0); + m_rainsound->pitch(static_cast(Global.Overcast - 1.0)); } m_rainsound->gain(m_rainsound->m_amplitudeoffset + m_rainsound->m_amplitudefactor * 1.f); m_rainsound->play(sound_flags::exclusive | sound_flags::looping); @@ -10068,8 +9945,8 @@ void TTrain::update_sounds(double const Deltatime) { if (fTachoCount >= 3.f) { - auto const frequency{(true == dsbHasler->is_combined() ? fTachoVelocity * 0.01 : dsbHasler->m_frequencyoffset + dsbHasler->m_frequencyfactor)}; - dsbHasler->pitch(frequency); + auto const soundfrequency{(true == dsbHasler->is_combined() ? fTachoVelocity * 0.01 : dsbHasler->m_frequencyoffset + dsbHasler->m_frequencyfactor)}; + dsbHasler->pitch(static_cast(soundfrequency)); dsbHasler->gain(dsbHasler->m_amplitudeoffset + dsbHasler->m_amplitudefactor); dsbHasler->play(sound_flags::exclusive | sound_flags::looping); } @@ -10143,23 +10020,18 @@ void TTrain::update_sounds(double const Deltatime) else { // stop power-reliant sounds if power is cut - if (dsbBuzzer) + if (dsbBuzzer && true == dsbBuzzer->is_playing()) { - if (true == dsbBuzzer->is_playing()) - { - dsbBuzzer->stop(); + dsbBuzzer->stop(); #ifdef _WIN32 - Console::BitsClear(1 << 14); // ustawienie bitu 16 na PoKeys + Console::BitsClear(1 << 14); // ustawienie bitu 16 na PoKeys #endif - } } if (dsbBuzzerShp && dsbBuzzerShp->is_playing()) { dsbBuzzerShp->stop(); } - { - } if (m_distancecounterclear) { @@ -10170,18 +10042,18 @@ void TTrain::update_sounds(double const Deltatime) update_sounds_radio(); } -void TTrain::update_sounds_resonancenoise(sound_source &Sound) +void TTrain::update_sounds_resonancenoise(sound_source &Sound) const { // frequency calculation auto const normalizer{mvOccupied->Vmax * 0.01f}; - auto const frequency{Sound.m_frequencyoffset + Sound.m_frequencyfactor * mvOccupied->Vel * normalizer}; + auto const soundfrequency{Sound.m_frequencyoffset + Sound.m_frequencyfactor * mvOccupied->Vel * normalizer}; // volume calculation auto volume = Sound.m_amplitudeoffset + Sound.m_amplitudefactor * std::lerp(mvOccupied->Vel / (1 + mvOccupied->Vmax), 1.0, 0.5); // scale base volume between 0.5-1.0 if (volume > 0.05) { - Sound.pitch(frequency).gain(volume).play(sound_flags::exclusive | sound_flags::looping); + Sound.pitch(static_cast(soundfrequency)).gain(static_cast(volume)).play(sound_flags::exclusive | sound_flags::looping); } else { @@ -10193,7 +10065,7 @@ void TTrain::update_sounds_runningnoise(sound_source &Sound) { // frequency calculation auto const normalizer{(true == Sound.is_combined() ? mvOccupied->Vmax * 0.01f : 1.f)}; - auto const frequency{Sound.m_frequencyoffset + Sound.m_frequencyfactor * mvOccupied->Vel * normalizer}; + auto const soundfrequency{Sound.m_frequencyoffset + Sound.m_frequencyfactor * mvOccupied->Vel * normalizer}; // volume calculation auto volume = Sound.m_amplitudeoffset + Sound.m_amplitudefactor * std::lerp(mvOccupied->Vel / (1 + mvOccupied->Vmax), 1.0, @@ -10216,7 +10088,7 @@ void TTrain::update_sounds_runningnoise(sound_source &Sound) if (volume > 0.05) { - Sound.pitch(frequency).gain(volume).play(sound_flags::exclusive | sound_flags::looping); + Sound.pitch(static_cast(soundfrequency)).gain(static_cast(volume)).play(sound_flags::exclusive | sound_flags::looping); } else { @@ -10231,16 +10103,15 @@ void TTrain::update_sounds_radio() if (false == m_radiomessages.empty()) { // erase completed radio messages from the list - m_radiomessages.erase(std::remove_if(std::begin(m_radiomessages), std::end(m_radiomessages), [](auto const &source) { return false == source.second->is_playing(); }), - std::end(m_radiomessages)); + std::erase_if(m_radiomessages, [](auto const &source) { return false == source.second->is_playing(); }); } // adjust audibility of remaining messages based on current radio conditions auto const radioenabled{true == mvOccupied->Radio && (mvOccupied->Power24vIsAvailable || mvOccupied->Power110vIsAvailable)}; - for (auto &message : m_radiomessages) + for (auto const &[messagechannel, messagesound] : m_radiomessages) { - auto const volume{true == radioenabled && Dynamic()->Mechanik != nullptr && message.first == RadioChannel() ? m_radiovolume : 0.0}; - message.second->gain(volume); - radio_message_played |= true == radioenabled && Dynamic()->Mechanik != nullptr && message.first == RadioChannel(); + auto const volume{true == radioenabled && Dynamic()->Mechanik != nullptr && messagechannel == RadioChannel() ? m_radiovolume : 0.0}; + messagesound->gain(static_cast(volume)); + radio_message_played |= true == radioenabled && Dynamic()->Mechanik != nullptr && messagechannel == RadioChannel(); } // radiostop if (m_radiostop) @@ -10289,7 +10160,7 @@ void TTrain::add_distance(double const Distance) if (true == meterenabled) { - m_distancecounter += Distance * Occupied()->CabOccupied; + m_distancecounter += static_cast(Distance * Occupied()->CabOccupied); } else { @@ -10310,15 +10181,12 @@ bool TTrain::CabChange(int iDirection) else { // jeśli pojazd prowadzony ręcznie albo wcale (wagon) mvOccupied->CabDeactivisationAuto(); - if (mvOccupied->ChangeCab(iDirection)) + if (mvOccupied->ChangeCab(iDirection) && InitializeCab(mvOccupied->CabOccupied, mvOccupied->TypeName + ".mmd")) { - if (InitializeCab(mvOccupied->CabOccupied, mvOccupied->TypeName + ".mmd")) - { - // zmiana kabiny w ramach tego samego pojazdu - mvOccupied->CabActivisationAuto(); // załączenie rozrządu (wirtualne kabiny) - DynamicObject->Mechanik->DirectionChange(); - return true; // udało się zmienić kabinę - } + // zmiana kabiny w ramach tego samego pojazdu + mvOccupied->CabActivisationAuto(); // załączenie rozrządu (wirtualne kabiny) + DynamicObject->Mechanik->DirectionChange(); + return true; // udało się zmienić kabinę } // aktywizacja poprzedniej, bo jeszcze nie wiadomo, czy jakiś pojazd jest mvOccupied->CabActivisationAuto(); @@ -10330,37 +10198,39 @@ bool TTrain::CabChange(int iDirection) // wczytywanie pliku z danymi multimedialnymi (dzwieki, kontrolki, kabiny) bool TTrain::LoadMMediaFile(std::string const &asFileName) { + using enum sound_placement; + using enum sound_type; // initialize sounds so potential entries from previous vehicle don't stick around std::unordered_map &, sound_placement, float, sound_type, int, double>> internalsounds = { - {"ctrl:", {dsbNastawnikJazdy, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, 0, 100.0}}, - {"ctrlscnd:", {dsbNastawnikBocz, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, 0, 100.0}}, - {"reverserkey:", {dsbReverserKey, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, 0, 100.0}}, - {"buzzer:", {dsbBuzzer, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, 0, 100.0}}, - {"buzzershp:", {dsbBuzzerShp, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, 0, 100.0}}, - {"radiostop:", {m_radiostop, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, 0, 100.0}}, - {"slipalarm:", {dsbSlipAlarm, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, 0, 100.0}}, - {"distancecounter:", {m_distancecounterclear, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, 0, 100.0}}, - {"tachoclock:", {dsbHasler, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, 0, 100.0}}, - {"switch:", {dsbSwitch, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, 0, 100.0}}, - {"pneumaticswitch:", {dsbPneumaticSwitch, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, 0, 100.0}}, - {"airsound:", {rsHiss, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, sound_parameters::amplitude, 100.0}}, - {"airsound2:", {rsHissU, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, sound_parameters::amplitude, 100.0}}, - {"airsound3:", {rsHissE, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, sound_parameters::amplitude, 100.0}}, - {"airsound4:", {rsHissX, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, sound_parameters::amplitude, 100.0}}, - {"airsound5:", {rsHissT, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, sound_parameters::amplitude, 100.0}}, - {"localbrakesound:", {rsSBHiss, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, sound_parameters::amplitude, 100.0}}, - {"localbrakesound2:", {rsSBHissU, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, sound_parameters::amplitude, 100.0}}, - {"brakesound:", {rsBrake, sound_placement::internal, -1, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency, 100.0}}, - {"fadesound:", {rsFadeSound, sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, sound_type::single, 0, 100.0}}, - {"runningnoise:", {rsRunningNoise, sound_placement::internal, EU07_SOUND_GLOBALRANGE, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency, mvOccupied->Vmax}}, - {"resonancenoise:", {rsResonanceNoise, sound_placement::internal, EU07_SOUND_GLOBALRANGE, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency, mvOccupied->Vmax}}, - {"windsound:", {rsWindSound, sound_placement::internal, EU07_SOUND_GLOBALRANGE, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency, mvOccupied->Vmax}}, - {"huntingnoise:", {rsHuntingNoise, sound_placement::internal, EU07_SOUND_GLOBALRANGE, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency, mvOccupied->Vmax}}, - {"rainsound:", {m_rainsound, sound_placement::internal, -1, sound_type::single, 0, 100.0}}, + {"ctrl:", {dsbNastawnikJazdy, internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, single, 0, 100.0}}, + {"ctrlscnd:", {dsbNastawnikBocz, internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, single, 0, 100.0}}, + {"reverserkey:", {dsbReverserKey, internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, single, 0, 100.0}}, + {"buzzer:", {dsbBuzzer, internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, single, 0, 100.0}}, + {"buzzershp:", {dsbBuzzerShp, internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, single, 0, 100.0}}, + {"radiostop:", {m_radiostop, internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, single, 0, 100.0}}, + {"slipalarm:", {dsbSlipAlarm, internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, single, 0, 100.0}}, + {"distancecounter:", {m_distancecounterclear, internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, single, 0, 100.0}}, + {"tachoclock:", {dsbHasler, internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, single, 0, 100.0}}, + {"switch:", {dsbSwitch, internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, single, 0, 100.0}}, + {"pneumaticswitch:", {dsbPneumaticSwitch, internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, single, 0, 100.0}}, + {"airsound:", {rsHiss, internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, single, sound_parameters::amplitude, 100.0}}, + {"airsound2:", {rsHissU, internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, single, sound_parameters::amplitude, 100.0}}, + {"airsound3:", {rsHissE, internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, single, sound_parameters::amplitude, 100.0}}, + {"airsound4:", {rsHissX, internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, single, sound_parameters::amplitude, 100.0}}, + {"airsound5:", {rsHissT, internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, single, sound_parameters::amplitude, 100.0}}, + {"localbrakesound:", {rsSBHiss, internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, single, sound_parameters::amplitude, 100.0}}, + {"localbrakesound2:", {rsSBHissU, internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, single, sound_parameters::amplitude, 100.0}}, + {"brakesound:", {rsBrake, internal, -1, single, sound_parameters::amplitude | sound_parameters::frequency, 100.0}}, + {"fadesound:", {rsFadeSound, internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE, single, 0, 100.0}}, + {"runningnoise:", {rsRunningNoise, internal, EU07_SOUND_GLOBALRANGE, single, sound_parameters::amplitude | sound_parameters::frequency, mvOccupied->Vmax}}, + {"resonancenoise:", {rsResonanceNoise, internal, EU07_SOUND_GLOBALRANGE, single, sound_parameters::amplitude | sound_parameters::frequency, mvOccupied->Vmax}}, + {"windsound:", {rsWindSound, internal, EU07_SOUND_GLOBALRANGE, single, sound_parameters::amplitude | sound_parameters::frequency, mvOccupied->Vmax}}, + {"huntingnoise:", {rsHuntingNoise, internal, EU07_SOUND_GLOBALRANGE, single, sound_parameters::amplitude | sound_parameters::frequency, mvOccupied->Vmax}}, + {"rainsound:", {m_rainsound, internal, -1, single, 0, 100.0}}, }; - for (auto &soundconfig : internalsounds) + for (auto &[soundname, soundsource] : internalsounds) { - std::get &>(soundconfig.second).reset(); + std::get &>(soundsource).reset(); } // NOTE: since radiosound is an incomplete template not using std::optional it gets a special treatment m_radiosound.owner(DynamicObject); @@ -10394,7 +10264,7 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) auto const soundconfig{lookup->second}; sound_source sound{std::get(soundconfig), std::get(soundconfig)}; - sound.deserialize(parser, std::get(soundconfig), std::get(soundconfig), std::get(soundconfig)); + sound.deserialize(parser, std::get(soundconfig), std::get(soundconfig), static_cast(std::get(soundconfig))); sound.owner(DynamicObject); std::get &>(soundconfig) = sound; } while (token != ""); @@ -10403,7 +10273,7 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) if (!m_rainsound) { sound_source rainsound; - rainsound.deserialize("rainsound_default", sound_type::single); + rainsound.deserialize("rainsound_default", single); rainsound.owner(DynamicObject); m_rainsound = rainsound; } @@ -10419,26 +10289,25 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) } if (rsBrake) { - rsBrake->m_frequencyfactor /= 1 + mvOccupied->Vmax; + rsBrake->m_frequencyfactor /= static_cast(1 + mvOccupied->Vmax); } if (rsResonanceNoise) { - rsResonanceNoise->m_frequencyfactor /= 1 + mvOccupied->Vmax; + rsResonanceNoise->m_frequencyfactor /= static_cast(1 + mvOccupied->Vmax); } if (rsWindSound) { - rsWindSound->m_frequencyfactor /= 1 + mvOccupied->Vmax; + rsWindSound->m_frequencyfactor /= static_cast(1 + mvOccupied->Vmax); } if (rsRunningNoise) { - rsRunningNoise->m_frequencyfactor /= 1 + mvOccupied->Vmax; + rsRunningNoise->m_frequencyfactor /= static_cast(1 + mvOccupied->Vmax); } if (rsHuntingNoise) { - rsHuntingNoise->m_frequencyfactor /= 1 + mvOccupied->Vmax; + rsHuntingNoise->m_frequencyfactor /= static_cast(1 + mvOccupied->Vmax); } } - auto const nullvector{glm::vec3()}; std::vector>> sounds = { dsbReverserKey, dsbNastawnikJazdy, dsbNastawnikBocz, dsbSwitch, dsbPneumaticSwitch, rsHiss, rsHissU, rsHissE, rsHissX, rsHissT, rsSBHiss, rsSBHissU, rsFadeSound, rsRunningNoise, rsResonanceNoise, rsWindSound, rsHuntingNoise, dsbHasler, dsbBuzzer, dsbBuzzerShp, dsbSlipAlarm, m_distancecounterclear, @@ -10465,7 +10334,7 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) dsbReverserKey, dsbNastawnikJazdy, dsbNastawnikBocz, dsbSwitch, dsbPneumaticSwitch, rsHiss, rsHissU, rsHissE, rsHissX, rsHissT, rsSBHiss, rsSBHissU, rsFadeSound, rsRunningNoise, rsResonanceNoise, rsWindSound, rsHuntingNoise, dsbHasler, dsbBuzzer, dsbBuzzerShp, dsbSlipAlarm, m_distancecounterclear, m_rainsound, m_radiostop}; - for (auto &sound : sounds) + for (auto const &sound : sounds) { if (sound.get()) { @@ -10473,11 +10342,11 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) } } m_radiosound.offset(nullvector); - for (auto &sound : CabSoundLocations) + for (auto const &[soundsource, soundoffset] : CabSoundLocations) { - if (sound.first.get() && sound.first.get()->offset() == nullvector) + if (soundsource.get() && soundsource.get()->offset() == nullvector) { - sound.first.get()->offset(sound.second); + soundsource.get()->offset(soundoffset); } } // reset view angles @@ -10499,6 +10368,8 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) case 0: cabindex = 0; break; + default: + break; } iCabn = cabindex; @@ -10583,7 +10454,7 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) // model kabiny parser.getTokens(); parser >> token; - std::replace(token.begin(), token.end(), '\\', '/'); + std::ranges::replace(token, '\\', '/'); if (token != "none") { // bieżąca sciezka do tekstur to dynamic/... @@ -10766,19 +10637,19 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) {m_rainsound, caboffset}, {m_radiostop, m_radiosound.offset()}, }; - for (auto &sound : soundlocations) + for (auto const &[soundsource, soundoffset] : soundlocations) { - if (sound.first.get() && sound.first.get()->offset() == nullvector) + if (soundsource.get() && soundsource.get()->offset() == nullvector) { - sound.first.get()->offset(sound.second); + soundsource.get()->offset(soundoffset); } } // second pass, in case some items received no positioning due to missing submodels etc - for (auto &sound : soundlocations) + for (auto const &[soundsource, soundoffset] : soundlocations) { - if (sound.first.get() && sound.first.get()->offset() == nullvector) + if (soundsource.get() && soundsource.get()->offset() == nullvector) { - sound.first.get()->offset(caboffset); + soundsource.get()->offset(caboffset); } } @@ -10822,7 +10693,8 @@ void TTrain::DynamicSet(TDynamicObject *d) // jeździć dobrze // również hamowanie wykonuje się zaworem w członie, a nie w silnikowym... DynamicObject = d; // jedyne miejsce zmiany - mvOccupied = mvControlled = d ? DynamicObject->MoverParameters : nullptr; // albo silnikowy w EZT + mvControlled = d ? DynamicObject->MoverParameters : nullptr; // albo silnikowy w EZT + mvOccupied = mvControlled; if (DynamicObject == nullptr) { @@ -10832,18 +10704,20 @@ void TTrain::DynamicSet(TDynamicObject *d) mvControlled = DynamicObject->FindPowered()->MoverParameters; mvSecond = nullptr; // gdyby się nic nie znalazło if (mvOccupied->Power > 1.0) // dwuczłonowe lub ukrotnienia, żeby nie szukać każdorazowo + { if (mvOccupied->Couplers[1].Connected ? mvOccupied->Couplers[1].AllowedFlag & coupling::control : false) { // gdy jest człon od sprzęgu 1, a sprzęg łączony // warsztatowo (powiedzmy) if (mvOccupied->Couplers[1].Connected->Power > 1.0) // ten drugi ma moc - mvSecond = (TMoverParameters *)mvOccupied->Couplers[1].Connected; // wskaźnik na drugiego + mvSecond = mvOccupied->Couplers[1].Connected; // wskaźnik na drugiego } else if (mvOccupied->Couplers[0].Connected ? mvOccupied->Couplers[0].AllowedFlag & coupling::control : false) { // gdy jest człon od sprzęgu 0, a sprzęg łączony // warsztatowo (powiedzmy) if (mvOccupied->Couplers[0].Connected->Power > 1.0) // ale ten drugi ma moc - mvSecond = (TMoverParameters *)mvOccupied->Couplers[0].Connected; // wskaźnik na drugiego + mvSecond = mvOccupied->Couplers[0].Connected; // wskaźnik na drugiego } + } // cache nearest unit equipped with pantographs { auto *lookup{DynamicObject->FindPantographCarrier()}; @@ -11010,8 +10884,7 @@ const TTrain::screenentry_sequence &TTrain::get_screens() void TTrain::radio_message(sound_source *Message, int const Channel) { - auto const soundrange{Message->range()}; - if (soundrange > 0 && glm::length2(Message->location() - glm::dvec3{DynamicObject->GetPosition()}) > sq(soundrange)) + if (auto const soundrange{Message->range()}; soundrange > 0 && glm::length2(Message->location() - glm::dvec3{DynamicObject->GetPosition()}) > sq(soundrange)) { // skip message playback if the receiver is outside of the emitter's range return; @@ -11022,7 +10895,7 @@ void TTrain::radio_message(sound_source *Message, int const Channel) auto &message = *m_radiomessages.back().second.get(); auto const radioenabled{true == mvOccupied->Radio && (mvOccupied->Power24vIsAvailable || mvOccupied->Power110vIsAvailable)}; auto const volume{true == radioenabled && Dynamic()->Mechanik != nullptr && Channel == RadioChannel() ? 1.0 : 0.0}; - message.copy_sounds(*Message).gain(volume).play(); + message.copy_sounds(*Message).gain(static_cast(volume)).play(); } // clears state of all cabin controls @@ -11330,7 +11203,7 @@ void TTrain::set_cab_controls(int const Cab) if (ggModernLightDimSw.SubModel != nullptr) { mvOccupied->modernDimmerPosition = mvOccupied->modernDimmerDefaultPosition; - ggModernLightDimSw.PutValue(mvOccupied->modernDimmerDefaultPosition); + ggModernLightDimSw.PutValue(static_cast(mvOccupied->modernDimmerDefaultPosition)); } // Init separate buttons @@ -11346,7 +11219,7 @@ void TTrain::set_cab_controls(int const Cab) // motor connectors ggStLinOffButton.PutValue(mvControlled->StLinSwitchOff ? 1.f : 0.f); // radio - ggRadioChannelSelector.PutValue((Dynamic()->Mechanik ? Dynamic()->Mechanik->iRadioChannel : 1) - 1); + ggRadioChannelSelector.PutValue(static_cast((Dynamic()->Mechanik ? Dynamic()->Mechanik->iRadioChannel : 1) - 1)); // pantographs /* if( mvOccupied->PantSwitchType != "impulse" ) { @@ -11411,11 +11284,11 @@ void TTrain::set_cab_controls(int const Cab) // compressor ggCompressorButton.PutValue(mvControlled->CompressorAllow ? 1.f : 0.f); ggCompressorLocalButton.PutValue(mvControlled->CompressorAllowLocal ? 1.f : 0.f); - ggCompressorListButton.PutValue(mvOccupied->CompressorListPos - 1); + ggCompressorListButton.PutValue(static_cast(mvOccupied->CompressorListPos - 1)); // motor overload relay threshold / shunt mode ggMaxCurrentCtrl.PutValue(true == mvControlled->ShuntModeAllow ? (true == mvControlled->ShuntMode ? 1.f : 0.f) : mvControlled->MotorOverloadRelayHighThreshold ? 1.f : 0.f); // lights - ggLightsButton.PutValue(mvOccupied->LightsPos - 1); + ggLightsButton.PutValue(static_cast(mvOccupied->LightsPos - 1)); auto const vehicleend{cab_to_end(Cab)}; @@ -11455,7 +11328,7 @@ void TTrain::set_cab_controls(int const Cab) } if (1 == DynamicObject->MoverParameters->modernDimmerPosition) { - ggDimHeadlightsButton.PutValue(DynamicObject->MoverParameters->modernDimmerPosition); + ggDimHeadlightsButton.PutValue(static_cast(DynamicObject->MoverParameters->modernDimmerPosition)); } // cab lights if (true == Cabine[Cab].bLightDim) @@ -11471,16 +11344,16 @@ void TTrain::set_cab_controls(int const Cab) // doors permits if (false == ggDoorLeftPermitButton.is_push()) { - ggDoorLeftPermitButton.PutValue(mvOccupied->Doors.instances[(cab_to_end() == end::front ? side::left : side::right)].open_permit ? 1.f : 0.f); + ggDoorLeftPermitButton.PutValue(mvOccupied->Doors.instances[cab_to_end() == end::front ? side::left : side::right].open_permit ? 1.f : 0.f); } if (false == ggDoorRightPermitButton.is_push()) { - ggDoorRightPermitButton.PutValue(mvOccupied->Doors.instances[(cab_to_end() == end::front ? side::right : side::left)].open_permit ? 1.f : 0.f); + ggDoorRightPermitButton.PutValue(mvOccupied->Doors.instances[cab_to_end() == end::front ? side::right : side::left].open_permit ? 1.f : 0.f); } - ggDoorPermitPresetButton.PutValue(mvOccupied->Doors.permit_preset); + ggDoorPermitPresetButton.PutValue(static_cast(mvOccupied->Doors.permit_preset)); // door controls - ggDoorLeftButton.PutValue(mvOccupied->Doors.instances[(cab_to_end() == end::front ? side::left : side::right)].is_closed ? 0.f : 1.f); - ggDoorRightButton.PutValue(mvOccupied->Doors.instances[(cab_to_end() == end::front ? side::right : side::left)].is_closed ? 0.f : 1.f); + ggDoorLeftButton.PutValue(mvOccupied->Doors.instances[cab_to_end() == end::front ? side::left : side::right].is_closed ? 0.f : 1.f); + ggDoorRightButton.PutValue(mvOccupied->Doors.instances[cab_to_end() == end::front ? side::right : side::left].is_closed ? 0.f : 1.f); // door lock ggDoorSignallingButton.PutValue(mvOccupied->Doors.lock_enabled ? 1.f : 0.f); // door step @@ -11496,7 +11369,7 @@ void TTrain::set_cab_controls(int const Cab) // brake acting time if (ggBrakeProfileCtrl.SubModel != nullptr) { - ggBrakeProfileCtrl.PutValue((mvOccupied->BrakeDelayFlag & bdelay_R) != 0 ? 2.f : mvOccupied->BrakeDelayFlag - 1); + ggBrakeProfileCtrl.PutValue((mvOccupied->BrakeDelayFlag & bdelay_R) != 0 ? 2.f : static_cast(mvOccupied->BrakeDelayFlag - 1)); } if (ggBrakeProfileG.SubModel != nullptr) { @@ -11509,12 +11382,12 @@ void TTrain::set_cab_controls(int const Cab) if (ggWiperSw.SubModel != nullptr) { - ggWiperSw.PutValue(mvOccupied->wiperSwitchPos); + ggWiperSw.PutValue(static_cast(mvOccupied->wiperSwitchPos)); } if (ggBrakeOperationModeCtrl.SubModel != nullptr) { - ggBrakeOperationModeCtrl.PutValue(mvOccupied->BrakeOpModeFlag > 0 ? std::log2(mvOccupied->BrakeOpModeFlag) : 0); + ggBrakeOperationModeCtrl.PutValue(mvOccupied->BrakeOpModeFlag > 0 ? static_cast(std::log2(mvOccupied->BrakeOpModeFlag)) : 0); } // alarm chain ggAlarmChain.PutValue(mvControlled->AlarmChainFlag ? 1.f : 0.f); @@ -11578,7 +11451,7 @@ void TTrain::set_cab_controls(int const Cab) bool kier = DynamicObject->DirectionGet() * mvOccupied->CabOccupied > 0; int flag = DynamicObject->MoverParameters->InverterControlCouplerFlag; int itemstart = 0; - for (auto &item : ggInverterToggleButtons) // for each button + for ([[maybe_unused]] auto const &item : ggInverterToggleButtons) // for each button { int itemindex = itemstart; itemstart++; @@ -12147,7 +12020,8 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con else if (Label == "eimscreen:") { // amperomierz calkowitego pradu - int i, j; + int i; + int j; Parser.getTokens(2, false); Parser >> i >> j; auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka @@ -12157,7 +12031,8 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con else if (Label == "brakes:") { // specified pipe pressure of specified consist vehicle - int i, j; + int i; + int j; Parser.getTokens(2, false); Parser >> i >> j; auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka @@ -12281,15 +12156,12 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con else if (Label == "clock:") { // zegar analogowy - if (Parser.getToken() == "analog") + if (Parser.getToken() == "analog" && DynamicObject->mdKabina) { - if (DynamicObject->mdKabina) - { - // McZapkie-300302: zegarek - ggClockSInd.Init(DynamicObject->mdKabina->GetFromName("ClockShand"), nullptr, TGaugeAnimation::gt_Rotate, 1.0 / 60.0); - ggClockMInd.Init(DynamicObject->mdKabina->GetFromName("ClockMhand"), nullptr, TGaugeAnimation::gt_Rotate, 1.0 / 60.0); - ggClockHInd.Init(DynamicObject->mdKabina->GetFromName("ClockHhand"), nullptr, TGaugeAnimation::gt_Rotate, 1.0 / 12.0); - } + // McZapkie-300302: zegarek + ggClockSInd.Init(DynamicObject->mdKabina->GetFromName("ClockShand"), nullptr, TGaugeAnimation::gt_Rotate, static_cast(1.0 / 60.0)); + ggClockMInd.Init(DynamicObject->mdKabina->GetFromName("ClockMhand"), nullptr, TGaugeAnimation::gt_Rotate, static_cast(1.0 / 60.0)); + ggClockHInd.Init(DynamicObject->mdKabina->GetFromName("ClockHhand"), nullptr, TGaugeAnimation::gt_Rotate, static_cast(1.0 / 12.0)); } } else if (Label == "clock_seconds:") diff --git a/vehicle/Train.h b/vehicle/Train.h index 7627bbf81..4fc11dc2c 100644 --- a/vehicle/Train.h +++ b/vehicle/Train.h @@ -59,7 +59,7 @@ private: }; class control_mapper { - typedef std::unordered_map< TSubModel const *, std::string> submodelstring_map; + using submodelstring_map = std::unordered_map< TSubModel const *, std::string>; submodelstring_map m_controlnames; using stringset = std::unordered_set; stringset m_names; // names of registered controls @@ -71,7 +71,7 @@ public: std::string find( TSubModel const *Control ) const; bool - contains( std::string const Control ) const; + contains( std::string const &Control ) const; }; class TTrain { @@ -142,11 +142,11 @@ class TTrain { bool deserialize_mapping( cParser &Input ); }; - typedef std::vector screenentry_sequence; + using screenentry_sequence = std::vector; // methods bool CabChange(int iDirection); - bool ShowNextCurrent; // pokaz przd w podlaczonej lokomotywie (ET41) + bool ShowNextCurrent{false}; // pokaz przd w podlaczonej lokomotywie (ET41) bool InitializeCab(int NewCabNo, std::string const &asFileName); TTrain(); ~TTrain(); @@ -181,8 +181,8 @@ class TTrain { private: // types - typedef void( *command_handler )( TTrain *Train, command_data const &Command ); - typedef std::unordered_map commandhandler_map; + using command_handler = void (*)( TTrain *Train, command_data const &Command ); + using commandhandler_map = std::unordered_map; // methods // clears state of all cabin controls void clear_cab_controls(); @@ -214,7 +214,7 @@ class TTrain { // update function subroutines void update_sounds( double const Deltatime ); void update_sounds_runningnoise( sound_source &Sound ); - void update_sounds_resonancenoise( sound_source &Sound ); + void update_sounds_resonancenoise( sound_source &Sound ) const; void update_sounds_radio(); inline end cab_to_end( int const End ) const { @@ -817,31 +817,31 @@ public: // reszta może by?publiczna TButton btHaslerBrakes; // ciśnienie w cylindrach TButton btHaslerCurrent; // prąd na silnikach - std::optional - dsbNastawnikJazdy, - dsbNastawnikBocz, - dsbReverserKey, - dsbBuzzer, dsbBuzzerShp, - m_radiostop, - dsbSlipAlarm, - m_distancecounterclear, - dsbHasler, - dsbSwitch, - dsbPneumaticSwitch, - rsHiss, - rsHissU, - rsHissE, - rsHissX, - rsHissT, - rsSBHiss, - rsSBHissU, - rsBrake, - rsFadeSound, - rsRunningNoise, - rsResonanceNoise, - rsWindSound, - rsHuntingNoise, - m_rainsound; + std::optional dsbNastawnikJazdy; + std::optional dsbNastawnikBocz; + std::optional dsbReverserKey; + std::optional dsbBuzzer; + std::optional dsbBuzzerShp; + std::optional m_radiostop; + std::optional dsbSlipAlarm; + std::optional m_distancecounterclear; + std::optional dsbHasler; + std::optional dsbSwitch; + std::optional dsbPneumaticSwitch; + std::optional rsHiss; + std::optional rsHissU; + std::optional rsHissE; + std::optional rsHissX; + std::optional rsHissT; + std::optional rsSBHiss; + std::optional rsSBHissU; + std::optional rsBrake; + std::optional rsFadeSound; + std::optional rsRunningNoise; + std::optional rsResonanceNoise; + std::optional rsWindSound; + std::optional rsHuntingNoise; + std::optional m_rainsound; sound_source m_radiosound { sound_placement::internal, 2 * EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // cached template for radio messages std::vector>> m_radiomessages; // list of currently played radio messages std::vector>, glm::vec3>> CabSoundLocations; // list of offsets for manually located sounds; @@ -857,14 +857,14 @@ public: // reszta może by?publiczna int iCabn { 0 }; // 0: mid, 1: front, 2: rear bool is_cab_initialized { false }; // McZapkie: do poruszania sie po kabinie - glm::dvec3 pMechSittingPosition; // ABu 180404 + glm::dvec3 pMechSittingPosition{0.0}; // ABu 180404 glm::dvec3 MirrorPosition(bool lewe); - glm::dvec3 pMechOffset; // base position of the driver in the cab + glm::dvec3 pMechOffset{0.0}; // base position of the driver in the cab glm::vec2 pMechViewAngle { 0.0, 0.0 }; // camera pitch and yaw values, preserved while in external view private: - double fBlinkTimer; - float fHaslerTimer; + double fBlinkTimer{0.0}; + float fHaslerTimer{0.0f}; float fConverterTimer; // hunter-261211: dla przekaznika float fMainRelayTimer; // hunter-141211: zalaczanie WSa z opoznieniem float fBatteryTimer = {-1.f}; // Hirek: zalaczanie baterii z opoznieniem (tylko gdy zdefiniowano takie zachowanie w fiz) @@ -879,7 +879,9 @@ private: float fHVoltage{ 0.0f }; // napi?cie dla dynamicznych ga?ek float fHCurrent[ 4 ] = { 0.0f, 0.0f, 0.0f, 0.0f }; // pr?dy: suma i amperomierze 1,2,3 float fEngine[ 4 ] = { 0.0f, 0.0f, 0.0f, 0.0f }; // obroty te? trzeba pobra? - int iCarNo, iPowerNo, iUnitNo; // liczba pojazdow, czlonow napednych i jednostek spiętych ze sobą + int iCarNo; + int iPowerNo; + int iUnitNo; // liczba pojazdow, czlonow napednych i jednostek spiętych ze sobą bool bDoors[20][5]; // drzwi dla wszystkich czlonow; left+right, left, right, step_left, step_right int iUnits[20]; // numer jednostki int iDoorNo[20]; // liczba drzwi @@ -896,7 +898,8 @@ private: std::vector> bCompressors; bool bHeat[8]; // grzanie // McZapkie: do syczenia - float fPPress, fNPress; + float fPPress{0.0f}; + float fNPress{0.0f}; bool m_mastercontrollerinuse { false }; float m_mastercontrollerreturndelay { 0.f }; screenentry_sequence m_screens; @@ -926,7 +929,7 @@ private: // plays provided sound from position of the radio bool radio_message_played; void radio_message( sound_source *Message, int const Channel ); - inline auto const RadioChannel() const { return Dynamic()->Mechanik ? Dynamic()->Mechanik->iRadioChannel : 1; } + inline auto RadioChannel() const { return Dynamic()->Mechanik ? Dynamic()->Mechanik->iRadioChannel : 1; } inline auto &RadioChannel() { return Dynamic()->Mechanik->iRadioChannel; } inline TDynamicObject *Dynamic() { return DynamicObject; }; inline TDynamicObject const *Dynamic() const { return DynamicObject; }; diff --git a/vr/vr_interface.cpp b/vr/vr_interface.cpp index 9f9ff4e40..c46bce56e 100644 --- a/vr/vr_interface.cpp +++ b/vr/vr_interface.cpp @@ -12,8 +12,7 @@ bool vr_interface_factory::register_backend(const std::string &backend, vr_inter std::unique_ptr vr_interface_factory::create(const std::string &backend) { - auto it = backends.find(backend); - if (it != backends.end()) + if (auto it = backends.find(backend); it != backends.end()) return it->second(); ErrorLog("vr backend \"" + backend + "\" not found!"); diff --git a/widgets/cameraview_extcam.cpp b/widgets/cameraview_extcam.cpp index 80deddbee..0b7c1c415 100644 --- a/widgets/cameraview_extcam.cpp +++ b/widgets/cameraview_extcam.cpp @@ -62,8 +62,7 @@ void ui::cameraview_panel::render() ImGui::SetNextWindowSizeConstraints(ImVec2(200, 200), ImVec2(2500, 2500), cameraview_window_callback); - auto const panelname{(title.empty() ? m_name : title) + "###" + m_name}; - if (ImGui::Begin(panelname.c_str(), &is_open)) { + if (auto const panelname{(title.empty() ? m_name : title) + "###" + m_name}; ImGui::Begin(panelname.c_str(), &is_open)) { render_contents(); } @@ -90,7 +89,7 @@ void ui::cameraview_panel::render_contents() texture->bind(0); { - std::lock_guard lock(mutex); + std::scoped_lock lock(mutex); if (image_ptr) { glActiveTexture(GL_TEXTURE0); @@ -123,8 +122,8 @@ void ui::cameraview_panel::capture_func() piped_proc proc(cmdline); size_t frame_size = Global.extcam_res.x * Global.extcam_res.y * 3; - uint8_t *read_buffer = new uint8_t[frame_size]; - uint8_t *active_buffer = new uint8_t[frame_size]; + auto read_buffer = new uint8_t[frame_size]; + auto active_buffer = new uint8_t[frame_size]; size_t bufpos = 0; @@ -142,7 +141,7 @@ void ui::cameraview_panel::capture_func() bufpos = 0; - std::lock_guard lock(mutex); + std::scoped_lock lock(mutex); image_ptr = read_buffer; read_buffer = active_buffer; active_buffer = image_ptr; @@ -151,7 +150,7 @@ void ui::cameraview_panel::capture_func() notify_var.notify_one(); } - std::lock_guard lock(mutex); + std::scoped_lock lock(mutex); image_ptr = nullptr; delete[] read_buffer; delete[] active_buffer; @@ -165,15 +164,15 @@ void ui::cameraview_panel::record_func() if (!rec_name.empty()) { const std::string magic{"{RECORD}"}; - size_t pos = cmdline.find(magic); - if (pos != -1) - cmdline.replace(pos, magic.size(), rec_name); + size_t magicpos = cmdline.find(magic); + if (magicpos != -1) + cmdline.replace(magicpos, magic.size(), rec_name); } piped_proc proc(cmdline, true); size_t frame_size = Global.extcam_res.x * Global.extcam_res.y * 3; - uint8_t *read_buffer = new uint8_t[frame_size]; + auto read_buffer = new uint8_t[frame_size]; uint32_t last_cnt = 0; size_t bufpos = frame_size; @@ -181,7 +180,7 @@ void ui::cameraview_panel::record_func() while (record_state == RUNNING) { if (bufpos == frame_size) { - std::unique_lock lock(mutex); + std::unique_lock lock(mutex); auto r = notify_var.wait_for(lock, std::chrono::milliseconds(50), [this, last_cnt]{return last_cnt != frame_cnt;}); last_cnt = frame_cnt; if (!image_ptr || !r) diff --git a/widgets/map_objects.cpp b/widgets/map_objects.cpp index d67c73f5c..af5bd2bc5 100644 --- a/widgets/map_objects.cpp +++ b/widgets/map_objects.cpp @@ -5,7 +5,7 @@ map::objects map::Objects; -map::sorted_object_list map::objects::find_in_range(glm::vec3 from, float distance) +map::sorted_object_list map::objects::find_in_range(glm::vec3 from, float distance) const { sorted_object_list items; @@ -25,7 +25,7 @@ map::sorted_object_list map::objects::find_in_range(glm::vec3 from, float distan float dist = glm::distance2(entry_location, search_point); if (dist < max_distance2) { - items.emplace(dist, entry); + items.try_emplace(dist, entry); } } @@ -48,7 +48,7 @@ map::sorted_object_list map::objects::find_in_range(glm::vec3 from, float distan auto entry = std::make_shared(); entry->dynobj = dynobj; entry->name = dynobj->name(); - items.emplace(dist, std::move(entry)); + items.try_emplace(dist, std::move(entry)); } } diff --git a/widgets/map_objects.h b/widgets/map_objects.h index f5d07ebfd..3754a1465 100644 --- a/widgets/map_objects.h +++ b/widgets/map_objects.h @@ -29,7 +29,7 @@ struct semaphore : public map_object std::vector events; TMemCell *memcell = nullptr; - virtual gfx::basic_vertex vertex() override { + gfx::basic_vertex vertex() override { bool stop_signal = memcell->IsVelocity() && (memcell->Value1() == 0.0); return gfx::basic_vertex(location, glm::vec3(), (!stop_signal) ? glm::vec2(0.0f, 0.2f) : glm::vec2(0.2f, 0.4f)); @@ -45,9 +45,10 @@ struct launcher : public map_object enum type_e { track_switch, level_crossing - } type; + }; + type_e type; - virtual gfx::basic_vertex vertex() { + gfx::basic_vertex vertex() override { return gfx::basic_vertex(location, glm::vec3(), type == track_switch ? glm::vec2(0.4f, 0.6f) : glm::vec2(0.6f, 0.8f)); } @@ -60,7 +61,7 @@ struct track_switch : public map_object std::array preview; std::array track = { nullptr }; - virtual gfx::basic_vertex vertex() { + gfx::basic_vertex vertex() override { return gfx::basic_vertex(location, glm::vec3(), glm::vec2(0.4f, 0.6f)); } }; @@ -70,7 +71,7 @@ struct obstacle : public map_object { std::string model_name; - virtual gfx::basic_vertex vertex() { + gfx::basic_vertex vertex() override { return gfx::basic_vertex(location, glm::vec3(), glm::vec2(0.8f, 1.0f)); } }; @@ -87,7 +88,7 @@ struct objects bool poi_dirty = true; // returns objects in range from vec3, NaN in Y ignores it - sorted_object_list find_in_range(glm::vec3 from, float distance); + sorted_object_list find_in_range(glm::vec3 from, float distance) const; }; extern objects Objects; diff --git a/widgets/perfgraphs.cpp b/widgets/perfgraphs.cpp index 574cc7ef2..041a25134 100644 --- a/widgets/perfgraphs.cpp +++ b/widgets/perfgraphs.cpp @@ -19,7 +19,7 @@ void perfgraph_panel::render_contents() { ImGui::EndCombo(); } - Timer::stopwatch *stopwatch = nullptr; + Timer::stopwatch const *stopwatch = nullptr; if (current_timer == gfx_total) stopwatch = &Timer::subsystem.gfx_total; @@ -49,7 +49,7 @@ void perfgraph_panel::render_contents() { if (!stopwatch) return; - history[pos] = stopwatch->last().count() / 1000.0; + history[pos] = static_cast(static_cast(stopwatch->last().count()) / 1000.0); const std::string label = std::to_string(history[pos]) + "ms"; pos++; @@ -57,5 +57,5 @@ void perfgraph_panel::render_contents() { pos = 0; ImGui::SliderFloat(STR_C("Range"), &max, 0.1f, 250.0f); - ImGui::PlotLines("##timer", &history[0], history.size(), pos, label.c_str(), 0.0f, max, ImVec2(500, 200)); + ImGui::PlotLines("##timer", &history[0], static_cast(history.size()), static_cast(pos), label.c_str(), 0.0f, max, ImVec2(500, 200)); } diff --git a/widgets/popup.cpp b/widgets/popup.cpp index 75633c38b..64f7a6342 100644 --- a/widgets/popup.cpp +++ b/widgets/popup.cpp @@ -3,7 +3,7 @@ ui::popup::popup(ui_panel &panel) : m_parent(panel) {} -ui::popup::~popup() {} +ui::popup::~popup() = default; bool ui::popup::render() { diff --git a/widgets/popup.h b/widgets/popup.h index 82c3f258d..d91b9f8b2 100644 --- a/widgets/popup.h +++ b/widgets/popup.h @@ -11,7 +11,7 @@ class popup static int id; public: - popup(ui_panel &panel); + explicit popup(ui_panel &panel); virtual ~popup(); virtual bool render(); diff --git a/widgets/time.cpp b/widgets/time.cpp index d299d17bf..6cf89b62d 100644 --- a/widgets/time.cpp +++ b/widgets/time.cpp @@ -18,15 +18,16 @@ void ui::time_panel::render_contents() if (ImGui::Button(STR_C("Apply"))) { - m_relay.post(user_command::setdatetime, (double)yearday, time * 60.0, 1, 0); - m_relay.post(user_command::setweather, fog, overcast, 1, 0); - m_relay.post(user_command::settemperature, temperature, overcast, 1, 0); + using enum user_command; + m_relay.post(setdatetime, (double)yearday, time * 60.0, 1, 0); + m_relay.post(setweather, fog, overcast, 1, 0); + m_relay.post(settemperature, temperature, overcast, 1, 0); } } void ui::time_panel::open() { - auto &data = simulation::Time.data(); + auto const &data = simulation::Time.data(); time = (float)data.wHour + (float)data.wMinute / 60.0f; yearday = simulation::Time.year_day(); diff --git a/widgets/trainingcard.cpp b/widgets/trainingcard.cpp index 27fb0965d..b261a5d4d 100644 --- a/widgets/trainingcard.cpp +++ b/widgets/trainingcard.cpp @@ -63,16 +63,16 @@ void trainingcard_panel::save_thread_func() if (in_line.compare(0, magic.size(), magic) == 0) { temp << "
Miejsce: " << (std::string(place.c_str())) << "

" << std::endl; - temp << "
Data: " << (date) << "

" << std::endl; - temp << "
Czas: " << (from) << " - " << (to) << "

" << std::endl; - temp << "
Imię (imiona) i nazwisko szkolonego: " << (trainee_name) << "

" << std::endl; - temp << "
Data urodzenia: " << (trainee_birthdate) << "

" << std::endl; - temp << "
Firma: " << (trainee_company) << "

" << std::endl; - temp << "
Imię i nazwisko instruktora: " << (instructor_name) << "

" << std::endl; - temp << "
Odcinek trasy: " << (track_segment) << "

" << std::endl; + temp << "
Data: " << date << "

" << std::endl; + temp << "
Czas: " << from << " - " << to << "

" << std::endl; + temp << "
Imię (imiona) i nazwisko szkolonego: " << trainee_name << "

" << std::endl; + temp << "
Data urodzenia: " << trainee_birthdate << "

" << std::endl; + temp << "
Firma: " << trainee_company << "

" << std::endl; + temp << "
Imię i nazwisko instruktora: " << instructor_name << "

" << std::endl; + temp << "
Odcinek trasy: " << track_segment << "

" << std::endl; if (distance > 0.0f) temp << "
Przebyta odległość: " << std::round(distance) << " km

" << std::endl; - temp << "
Uwagi:
" << (remarks) << "
" << std::endl; + temp << "
Uwagi:
" << remarks << "
" << std::endl; } else { @@ -119,7 +119,7 @@ void trainingcard_panel::render_contents() ImGui::EndPopup(); } - if (start_time_wall) + if (start_time_wall.has_value()) { std::tm const tm = local_tm(*start_time_wall); std::string rep = "Czas rozpoczęcia: " + std::to_string(tm.tm_year + 1900) + "-" + std::to_string(tm.tm_mon + 1) + "-" + std::to_string(tm.tm_mday) + " " + std::to_string(tm.tm_hour) + @@ -154,7 +154,7 @@ void trainingcard_panel::render_contents() ImGui::TextUnformatted("Uwagi"); ImGui::InputTextMultiline("##remarks", &remarks[0], remarks.size(), ImVec2(-1.0f, 200.0f)); - if (!start_time_wall) + if (!start_time_wall.has_value()) { if (ImGui::Button("Rozpocznij szkolenie")) { @@ -177,7 +177,7 @@ void trainingcard_panel::render_contents() { state.store(2); if (simulation::Trains.sequence().size() > 0) - distance = simulation::Trains.sequence()[0]->Dynamic()->MoverParameters->DistCounter; + distance = static_cast(simulation::Trains.sequence()[0]->Dynamic()->MoverParameters->DistCounter); if (save_thread.joinable()) save_thread.join(); @@ -187,9 +187,9 @@ void trainingcard_panel::render_contents() } } -const std::string *trainingcard_panel::is_recording() +const std::string *trainingcard_panel::is_recording() const { - if (!start_time_wall) + if (!start_time_wall.has_value()) return nullptr; return &recording_timestamp; diff --git a/widgets/trainingcard.h b/widgets/trainingcard.h index 9e4eafe9b..c485e79cf 100644 --- a/widgets/trainingcard.h +++ b/widgets/trainingcard.h @@ -31,7 +31,7 @@ class trainingcard_panel : public ui_panel ~trainingcard_panel(); void render_contents() override; - const std::string *is_recording(); + const std::string *is_recording() const; std::string recording_timestamp; }; diff --git a/widgets/vehiclelist.cpp b/widgets/vehiclelist.cpp index e8ee1e127..45293fa1d 100644 --- a/widgets/vehiclelist.cpp +++ b/widgets/vehiclelist.cpp @@ -12,7 +12,7 @@ ui::vehiclelist_panel::vehiclelist_panel(ui_layer &parent) void ui::vehiclelist_panel::render_contents() { if (m_first_show && Global.gui_trainingdefault) { - for (TDynamicObject *vehicle : simulation::Vehicles.sequence()) + for (TDynamicObject const *vehicle : simulation::Vehicles.sequence()) { if (!vehicle->Mechanik || vehicle->name() != ToLower(Global.local_start_vehicle)) continue; @@ -26,7 +26,7 @@ void ui::vehiclelist_panel::render_contents() return; } - for (TDynamicObject *vehicle : simulation::Vehicles.sequence()) + for (TDynamicObject const *vehicle : simulation::Vehicles.sequence()) { if (!vehicle->Mechanik) continue; @@ -37,7 +37,7 @@ void ui::vehiclelist_panel::render_contents() if (vehicle->Mechanik) timetable = vehicle->Mechanik->TrainName() + ", "; - std::string label = std::string(name + ", " + timetable + std::to_string(speed) + " km/h###"); + auto label = std::string(name + ", " + timetable + std::to_string(speed) + " km/h###"); ImGui::PushID(vehicle); if (ImGui::Button(label.c_str())) { diff --git a/widgets/vehiclelist.h b/widgets/vehiclelist.h index b1dd509aa..b2143b940 100644 --- a/widgets/vehiclelist.h +++ b/widgets/vehiclelist.h @@ -8,7 +8,7 @@ class vehiclelist_panel : public ui_panel bool m_first_show = true; public: - vehiclelist_panel(ui_layer &parent); + explicit vehiclelist_panel(ui_layer &parent); void render_contents() override; }; diff --git a/world/EvLaunch.cpp b/world/EvLaunch.cpp index 29c3104f8..22cfa4137 100644 --- a/world/EvLaunch.cpp +++ b/world/EvLaunch.cpp @@ -34,14 +34,14 @@ int vk_to_glfw_key( int const Keycode ) { char key = 0; if (Keycode < 'A') { - key = Keycode; + key = static_cast(Keycode); } else if (Keycode <= 'Z') { - key = Keycode; + key = static_cast(Keycode); modifier = GLFW_MOD_SHIFT; } else if (Keycode < 'a') { - key = Keycode; + key = static_cast(Keycode); } else if (Keycode <= 'z') { - key = Keycode - 32; + key = static_cast(Keycode - 32); } else { ErrorLog("unknown key: " + std::to_string(Keycode)); } @@ -66,7 +66,7 @@ bool TEventLauncher::Load(cParser *parser) } else { // this launcher may be activated by radio message - std::map messages { + std::map> messages { { "radio_call1", radio_message::call1 }, { "radio_call3", radio_message::call3 } }; @@ -138,8 +138,7 @@ bool TEventLauncher::Load(cParser *parser) iHour = int( DeltaTime - iMinute ) / 100; // godzina to setki DeltaTime = 0; // bez powtórzeń // potentially shift the provided time by requested offset - auto const timeoffset{ static_cast( Global.ScenarioTimeOffset * 60 ) }; - if( timeoffset != 0 ) { + if( auto const timeoffset{ static_cast( Global.ScenarioTimeOffset * 60 ) }; timeoffset != 0 ) { auto const adjustedtime{ clamp_circular( iHour * 60 + iMinute + timeoffset, 24 * 60 ) }; iHour = adjustedtime / 60 % 24; iMinute = adjustedtime % 60; @@ -156,7 +155,7 @@ bool TEventLauncher::Load(cParser *parser) return true; } -bool TEventLauncher::check_activation_key() { +bool TEventLauncher::check_activation_key() const { if (iKey <= 0) return false; @@ -164,7 +163,7 @@ bool TEventLauncher::check_activation_key() { bool result = Console::Pressed(key); - char modifier = iKey >> 8; + auto modifier = static_cast(iKey >> 8); if (modifier & GLFW_MOD_SHIFT) result &= Global.shiftState; if (modifier & GLFW_MOD_CONTROL) @@ -195,12 +194,10 @@ bool TEventLauncher::check_activation() { else { // jeśli nie cykliczny, to sprawdzić czas if( simulation::Time.data().wHour == iHour ) { - if( simulation::Time.data().wMinute == iMinute ) { - // zgodność czasu uruchomienia - if( UpdatedTime < 10 ) { - UpdatedTime = 20; // czas do kolejnego wyzwolenia? - bCond = true; - } + // zgodność czasu uruchomienia + if (simulation::Time.data().wMinute == iMinute && UpdatedTime < 10) { + UpdatedTime = 20; // czas do kolejnego wyzwolenia? + bCond = true; } } else { @@ -211,7 +208,7 @@ bool TEventLauncher::check_activation() { return bCond; } -bool TEventLauncher::check_conditions() { +bool TEventLauncher::check_conditions() const { auto bCond { true }; @@ -239,7 +236,7 @@ bool TEventLauncher::IsRadioActivated() const { float TEventLauncher::radius_() { - return std::sqrt( dRadius ); + return static_cast(std::sqrt( dRadius )); } // serialize() subclass details, sends content of the subclass to provided stream @@ -271,9 +268,8 @@ TEventLauncher::export_as_text_( std::ostream &Output ) const { // activation key if( iKey != 0 ) { auto key { iKey & 0xff }; - auto const modifier { iKey >> 8 }; - if (key >= 'A' && key <= 'Z' && !(modifier & GLFW_MOD_SHIFT)) + if (auto const modifier { iKey >> 8 }; key >= 'A' && key <= 'Z' && !(modifier & GLFW_MOD_SHIFT)) key += 32; Output << (char)key; diff --git a/world/EvLaunch.h b/world/EvLaunch.h index a38e9e4a7..4756c72b7 100644 --- a/world/EvLaunch.h +++ b/world/EvLaunch.h @@ -30,10 +30,10 @@ public: // methods bool Load( cParser *parser ); - bool check_activation_key(); + bool check_activation_key() const; bool check_activation(); // checks conditions associated with the event. returns: true if the conditions are met - bool check_conditions(); + bool check_conditions() const; inline auto key() const { return iKey; } @@ -53,13 +53,13 @@ public: private: // methods // radius() subclass details, calculates node's bounding radius - float radius_(); + float radius_() override; // serialize() subclass details, sends content of the subclass to provided stream - void serialize_( std::ostream &Output ) const; + void serialize_( std::ostream &Output ) const override; // deserialize() subclass details, restores content of the subclass from provided stream - void deserialize_( std::istream &Input ); + void deserialize_( std::istream &Input ) override; // export() subclass details, sends basic content of the class in legacy (text) format to provided stream - void export_as_text_( std::ostream &Output ) const; + void export_as_text_( std::ostream &Output ) const override; // members int iKey { 0 }; diff --git a/world/MemCell.cpp b/world/MemCell.cpp index 76e9e4f17..dd2fa2418 100644 --- a/world/MemCell.cpp +++ b/world/MemCell.cpp @@ -25,7 +25,7 @@ http://mozilla.org/MPL/2.0/. TMemCell::TMemCell( scene::node_data const &Nodedata ) : basic_node( Nodedata ) {} -void TMemCell::UpdateValues( std::string const &szNewText, double const fNewValue1, double const fNewValue2, int const CheckMask ) +void TMemCell::UpdateValues( std::string_view szNewText, double const fNewValue1, double const fNewValue2, int const CheckMask ) { if (CheckMask & basic_event::flags::mode_add) { // dodawanie wartości @@ -51,48 +51,49 @@ void TMemCell::UpdateValues( std::string const &szNewText, double const fNewValu TCommandType TMemCell::CommandCheck() { // rozpoznanie komendy + using enum TCommandType; if( szText == "SetVelocity" ) // najpopularniejsze { - eCommand = TCommandType::cm_SetVelocity; + eCommand = cm_SetVelocity; bCommand = false; // ta komenda nie jest wysyłana } else if( szText == "ShuntVelocity" ) // w tarczach manewrowych { - eCommand = TCommandType::cm_ShuntVelocity; + eCommand = cm_ShuntVelocity; bCommand = false; // ta komenda nie jest wysyłana } else if( szText == "Change_direction" ) // zdarza się { - eCommand = TCommandType::cm_ChangeDirection; + eCommand = cm_ChangeDirection; bCommand = true; // do wysłania } else if( szText == "OutsideStation" ) // zdarza się { - eCommand = TCommandType::cm_OutsideStation; + eCommand = cm_OutsideStation; bCommand = false; // tego nie powinno być w komórce } else if( szText.starts_with("PassengerStopPoint:") ) // porównanie początków { - eCommand = TCommandType::cm_PassengerStopPoint; + eCommand = cm_PassengerStopPoint; bCommand = false; // tego nie powinno być w komórce } else if( szText == "SetProximityVelocity" ) // nie powinno tego być { - eCommand = TCommandType::cm_SetProximityVelocity; + eCommand = cm_SetProximityVelocity; bCommand = false; // ta komenda nie jest wysyłana } else if( szText == "Emergency_brake" ) { - eCommand = TCommandType::cm_EmergencyBrake; + eCommand = cm_EmergencyBrake; bCommand = false; } else if( szText == "CabSignal" ) { - eCommand = TCommandType::cm_SecuritySystemMagnet; + eCommand = cm_SecuritySystemMagnet; bCommand = false; } else { - eCommand = TCommandType::cm_Unknown; // ciąg nierozpoznany (nie jest komendą) + eCommand = cm_Unknown; // ciąg nierozpoznany (nie jest komendą) bCommand = true; // do wysłania } return eCommand; @@ -157,11 +158,11 @@ bool TMemCell::Compare( std::string const &szTestText, double const fTestValue1, if( TestFlag( CheckMask, basic_event::flags::text ) ) { // porównać teksty - auto range = szTestText.find( '*' ); + auto wildcardpos = szTestText.find( '*' ); auto const result { ( - range == std::string::npos ? + wildcardpos == std::string::npos ? compare( szText, szTestText, TextOperator ) : - compare( szText.substr( 0, range ), szTestText.substr( 0, range ), TextOperator ) ) }; + compare( szText.substr( 0, wildcardpos ), szTestText.substr( 0, wildcardpos ), TextOperator ) ) }; checkpassed |= result; checkfailed |= !result; } @@ -177,20 +178,22 @@ bool TMemCell::Compare( std::string const &szTestText, double const fTestValue1, } switch( Pass ) { - case comparison_pass::all: { return checkfailed == false; } - case comparison_pass::any: { return checkpassed == true; } - case comparison_pass::none: { return checkpassed == false; } + using enum comparison_pass; + case all: { return checkfailed == false; } + case any: { return checkpassed == true; } + case none: { return checkpassed == false; } default: { return false; } } }; bool TMemCell::IsVelocity() const { // sprawdzenie, czy event odczytu tej komórki ma być do skanowania, czy do kolejkowania - if (eCommand == TCommandType::cm_SetVelocity) + using enum TCommandType; + if (eCommand == cm_SetVelocity) return true; - if (eCommand == TCommandType::cm_ShuntVelocity) + if (eCommand == cm_ShuntVelocity) return true; - return eCommand == TCommandType::cm_SetProximityVelocity; + return eCommand == cm_SetProximityVelocity; }; void TMemCell::StopCommandSent() @@ -258,7 +261,7 @@ TMemCell::export_as_text_( std::ostream &Output ) const { // legacy method, initializes traction after deserialization from scenario file void -memory_table::InitCells() { +memory_table::InitCells() const { for( auto *cell : m_items ) { // Ra: eventy komórek pamięci, wykonywane po wysłaniu komendy do zatrzymanego pojazdu @@ -275,9 +278,9 @@ memory_table::InitCells() { // legacy method, sends content of all cells to the log void -memory_table::log_all() { +memory_table::log_all() const { - for( auto *cell : m_items ) { + for( auto const *cell : m_items ) { cell->LogValues(); } } diff --git a/world/MemCell.h b/world/MemCell.h index c2960f275..ff1781ce3 100644 --- a/world/MemCell.h +++ b/world/MemCell.h @@ -21,7 +21,7 @@ public: explicit TMemCell( scene::node_data const &Nodedata ); // methods void - UpdateValues( std::string const &szNewText, double const fNewValue1, double const fNewValue2, int const CheckMask ); + UpdateValues( std::string_view szNewText, double const fNewValue1, double const fNewValue2, int const CheckMask ); bool Load(cParser *parser); void @@ -61,11 +61,11 @@ public: private: // methods // serialize() subclass details, sends content of the subclass to provided stream - void serialize_( std::ostream &Output ) const; + void serialize_( std::ostream &Output ) const override; // deserialize() subclass details, restores content of the subclass from provided stream - void deserialize_( std::istream &Input ); + void deserialize_( std::istream &Input ) override; // export() subclass details, sends basic content of the class in legacy (text) format to provided stream - void export_as_text_( std::ostream &Output ) const; + void export_as_text_( std::ostream &Output ) const override; // members // content @@ -85,10 +85,10 @@ class memory_table : public basic_table { public: // legacy method, initializes traction after deserialization from scenario file void - InitCells(); + InitCells() const; // legacy method, sends content of all cells to the log void - log_all(); + log_all() const; }; //--------------------------------------------------------------------------- diff --git a/world/Segment.cpp b/world/Segment.cpp index c963922a4..34683b039 100644 --- a/world/Segment.cpp +++ b/world/Segment.cpp @@ -67,8 +67,8 @@ bool TSegment::Init(glm::dvec3 &NewPoint1, glm::dvec3 NewCPointOut, glm::dvec3 N CPointIn = NewCPointIn; Point2 = NewPoint2; // poprawienie przechyłki - fRoll1 = glm::radians(fNewRoll1); // Ra: przeliczone jest bardziej przydatne do obliczeń - fRoll2 = glm::radians(fNewRoll2); + fRoll1 = static_cast(glm::radians(fNewRoll1)); // Ra: przeliczone jest bardziej przydatne do obliczeń + fRoll2 = static_cast(glm::radians(fNewRoll2)); bCurve = bIsCurve; if (Global.bRollFix) { // Ra: poprawianie przechyłki @@ -85,7 +85,7 @@ bool TSegment::Init(glm::dvec3 &NewPoint1, glm::dvec3 NewCPointOut, glm::dvec3 N Point1.y += w1; // modyfikacja musi być przed policzeniem dalszych parametrów if (bCurve) CPointOut.y += w1; // prosty ma wektory jednostkowe - pOwner->MovedUp1(w1); // zwrócić trzeba informację o podwyższeniu podsypki + pOwner->MovedUp1(static_cast(w1)); // zwrócić trzeba informację o podwyższeniu podsypki } if (fRoll2 != 0.f) { @@ -125,7 +125,7 @@ bool TSegment::Init(glm::dvec3 &NewPoint1, glm::dvec3 NewCPointOut, glm::dvec3 N fStep = fLength / ( 3.0 * Global.SplineFidelity ); } // iSegCount = static_cast( std::ceil( fLength / fStep ) ); // potrzebne do VBO - iSegCount = pOwner->eType == tt_Switch ? 6 * Global.SplineFidelity : static_cast(std::ceil(fLength / fStep)); // potrzebne do VBO + iSegCount = pOwner->eType == tt_Switch ? static_cast(6 * Global.SplineFidelity) : static_cast(std::ceil(fLength / fStep)); // potrzebne do VBO fStep = fLength / iSegCount; // update step to equalize size of individual pieces @@ -242,7 +242,7 @@ double TSegment::FastGetTFromS(double const s) const double const h01 = -2.0 * u3 + 3.0 * u2; double const t = ( ( 1.0 - h01 ) * fTsBuffer[ i ] + ( u3 - 2.0 * u2 + u ) * fTsSlope [ i ] + - ( h01 ) * fTsBuffer[ i + 1 ] + + h01 * fTsBuffer[ i + 1 ] + ( u3 - u2 ) * fTsSlope [ i + 1 ] ); return t; } @@ -263,10 +263,11 @@ double TSegment::ComputeLength() const // McZapkie-150503: dlugosc miedzy punkta // Ra: koniec rekurencji jeśli po podziale suma długości nie różni się więcej niż 0.5mm od // poprzedniej // Ra: ewentualnie rozpoznać łuk okręgu płaskiego i liczyć ze wzoru na długość łuku - double t, l = 0; + double t; + double l = 0; glm::dvec3 last{0, 0, 0}; // długość liczona po przesunięciu odcinka do początku układu glm::dvec3 tmp = Point2 - Point1; - int m = 20.0 * glm::length(tmp); // było zawsze do 10000, teraz jest liczone odcinkami po około 5cm + auto m = static_cast(20.0 * glm::length(tmp)); // było zawsze do 10000, teraz jest liczone odcinkami po około 5cm for (int i = 1; i <= m; i++) { t = double(i) / double(m); // wyznaczenie parametru na krzywej z przedziału (0,1> @@ -334,7 +335,7 @@ glm::dvec3 TSegment::GetDirection(double const fDistance) const return FastGetPoint(t2) - FastGetPoint(t1); } -glm::dvec3 TSegment::FastGetDirection(double fDistance, double fOffset) +glm::dvec3 TSegment::FastGetDirection(double fDistance, double fOffset) const { // takie toporne liczenie pochodnej dla parametru 0.0÷1.0 double t1 = fDistance - fOffset; if (t1 <= 0.0) @@ -371,22 +372,22 @@ void TSegment::RaPositionGet(double const fDistance, glm::dvec3 &position, glm:: auto const t = FastGetTFromS(fDistance); // aproksymacja dystansu na krzywej Beziera na parametr (t) position = FastGetPoint( t ); // przechyłka w danym miejscu (zmienia się liniowo) - rotation.x = std::lerp( fRoll1, fRoll2, t ); + rotation.x = static_cast(std::lerp( fRoll1, fRoll2, t )); // pochodna auto const tangent = GetFirstDerivative( t ); // pochylenie krzywej (w pionie) - rotation.y = std::atan( tangent.y ); + rotation.y = static_cast(std::atan( tangent.y )); // kierunek krzywej w planie - rotation.z = -std::atan2( tangent.x, tangent.z ); + rotation.z = static_cast(-std::atan2( tangent.x, tangent.z )); } else { // wyliczenie dla odcinka prostego jest prostsze auto const t = fDistance / fLength; // zerowych torów nie ma position = FastGetPoint( t ); // przechyłka w danym miejscu (zmienia się liniowo) - rotation.x = std::lerp( fRoll1, fRoll2, t ); - rotation.y = fStoop; // pochylenie toru prostego - rotation.z = fDirection; // kierunek toru w planie + rotation.x = static_cast(std::lerp( fRoll1, fRoll2, t )); + rotation.y = static_cast(fStoop); // pochylenie toru prostego + rotation.z = static_cast(fDirection); // kierunek toru w planie } }; @@ -404,20 +405,35 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, glm::dvec3 const &Origin, if( fTsBuffer.empty() ) return false; // prowizoryczne zabezpieczenie przed wysypem - ustalić faktyczną przyczynę - glm::vec3 pos1, pos2, dir, parallel1, parallel2, pt, norm; - float s, step, fOffset, tv1, tv2, t, fEnd; + glm::vec3 pos1; + glm::vec3 pos2; + glm::vec3 dir; + glm::vec3 parallel1; + glm::vec3 parallel2; + glm::vec3 pt; + glm::vec3 norm; + float s; + float step; + float fOffset; + float tv1; + float tv2; + float t; + float fEnd; auto const iNumShapePoints = Transition ? ShapePoints.size() / 2 : ShapePoints.size(); - float const texturelength = fTextureLength * Texturescale; - float const texturescale = Texturescale; + auto const texturelength = static_cast(fTextureLength * Texturescale); + auto const texturescale = static_cast(Texturescale); - float m1, jmm1, m2, jmm2; // pozycje względne na odcinku 0...1 (ale nie parametr Beziera) - step = fStep; + float m1; + float jmm1; + float m2; + float jmm2; // pozycje względne na odcinku 0...1 (ale nie parametr Beziera) + step = static_cast(fStep); tv1 = 1.0; // Ra: to by można było wyliczać dla odcinka, wyglądało by lepiej - s = fStep * iSkip; // iSkip - ile odcinków z początku pominąć + s = static_cast(fStep * iSkip); // iSkip - ile odcinków z początku pominąć int i = iSkip; // domyślnie 0 - t = fTsBuffer[ i ]; // tabela wattości t dla segmentów + t = static_cast(fTsBuffer[ i ]); // tabela wattości t dla segmentów // BUG: length of spline can be 0, we should skip geometry generation for such cases - fOffset = 0.1 / fLength; // pierwsze 10cm + fOffset = static_cast(0.1 / fLength); // pierwsze 10cm pos1 = glm::dvec3{ FastGetPoint( t ) - Origin }; // wektor początku segmentu dir = glm::dvec3{ FastGetDirection( t, fOffset ) }; // wektor kierunku parallel1 = glm::vec3{ -dir.z, 0.f, dir.x }; // wektor poprzeczny @@ -428,11 +444,11 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, glm::dvec3 const &Origin, parallel1 = glm::normalize( parallel1 ); if( iEnd == 0 ) iEnd = iSegCount; - fEnd = fLength * double( iEnd ) / double( iSegCount ); + fEnd = static_cast(fLength * double( iEnd ) / double( iSegCount )); /* m2 = s / fEnd; */ - m2 = static_cast( i - iSkip ) / ( iEnd - iSkip ); + m2 = static_cast( i - iSkip ) / ( static_cast(iEnd - iSkip) ); jmm2 = 1.f - m2; @@ -445,7 +461,7 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, glm::dvec3 const &Origin, /* m2 = s / fEnd; */ - m2 = static_cast( i - iSkip ) / ( iEnd - iSkip ); + m2 = static_cast( i - iSkip ) / ( static_cast(iEnd - iSkip) ); jmm2 = 1.f - m2; // nowa pozycja if( i == iEnd ) { // gdy przekroczyliśmy koniec - stąd dziury w torach... @@ -462,7 +478,7 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, glm::dvec3 const &Origin, tv1 = clamp_circular( tv1, 1.0f ); tv2 = tv1 - step / texturelength; // mapowanie na końcu segmentu - t = fTsBuffer[ i ]; // szybsze od GetTFromS(s); + t = static_cast(fTsBuffer[ i ]); // szybsze od GetTFromS(s); pos2 = glm::dvec3{ FastGetPoint( t ) - Origin }; dir = glm::dvec3{ FastGetDirection( t, fOffset ) }; // nowy wektor kierunku parallel2 = glm::vec3{ -dir.z, 0.f, dir.x }; // wektor poprzeczny @@ -486,13 +502,12 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, glm::dvec3 const &Origin, glm::normalize( norm ), glm::vec2 { ( jmm1 * ShapePoints[ j ].texture.x + m1 * ShapePoints[ j + iNumShapePoints ].texture.x ) / texturescale, tv1 } ); } - if( p ) // jeśli jest wskaźnik do tablicy - if( *p ) - if( !j ) // to dla pierwszego punktu - { - **p = pt; - ( *p )++; - } // zapamiętanie brzegu jezdni + // jeśli jest wskaźnik do tablicy + if (p && *p && !j) // to dla pierwszego punktu + { + **p = pt; + ( *p )++; + } // zapamiętanie brzegu jezdni // dla trapezu drugi koniec ma inne współrzędne pt = parallel2 * ( jmm2 * ( ShapePoints[ j ].position.x - fOffsetX.first ) + m2 * ( ShapePoints[ j + iNumShapePoints ].position.x - fOffsetX.second ) ) + pos2; pt.y += jmm2 * ShapePoints[ j ].position.y + m2 * ShapePoints[ j + iNumShapePoints ].position.y; @@ -505,13 +520,12 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, glm::dvec3 const &Origin, glm::normalize( norm ), glm::vec2 { ( jmm2 * ShapePoints[ j ].texture.x + m2 * ShapePoints[ j + iNumShapePoints ].texture.x ) / texturescale, tv2 } ); } - if( p ) // jeśli jest wskaźnik do tablicy - if( *p ) - if( !j ) // to dla pierwszego punktu - if( i == iSegCount ) { - **p = pt; - ( *p )++; - } // zapamiętanie brzegu jezdni + // jeśli jest wskaźnik do tablicy + // to dla pierwszego punktu + if (p && *p && !j && i == iSegCount) { + **p = pt; + ( *p )++; + } // zapamiętanie brzegu jezdni } } else { @@ -549,39 +563,38 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, glm::dvec3 const &Origin, void TSegment::render_lines(std::vector &out, float quality) const { - float step = 1.0f / iSegCount / quality; + float step = 1.0f / static_cast(iSegCount) / quality; - float x; glm::vec3 previous = FastGetPoint(0.0); - for (x = step; x <= 1.0f; x += step) { - out.push_back(gfx::basic_vertex(previous, glm::vec3(0.0f), glm::vec2(0.0f))); + for (int i = 1; static_cast(i) * step <= 1.0f; ++i) { + float const x = static_cast(i) * step; + out.emplace_back(previous, glm::vec3(0.0f), glm::vec2(0.0f)); previous = glm::vec3(FastGetPoint(x)); - out.push_back(gfx::basic_vertex(previous, glm::vec3(0.0f), glm::vec2(0.0f))); + out.emplace_back(previous, glm::vec3(0.0f), glm::vec2(0.0f)); } - out.push_back(gfx::basic_vertex(previous, glm::vec3(0.0f), glm::vec2(0.0f))); + out.emplace_back(previous, glm::vec3(0.0f), glm::vec2(0.0f)); previous = glm::vec3(FastGetPoint(1.0)); - out.push_back(gfx::basic_vertex(previous, glm::vec3(0.0f), glm::vec2(0.0f))); + out.emplace_back(previous, glm::vec3(0.0f), glm::vec2(0.0f)); } glm::vec3 TSegment::get_nearest_point(const glm::dvec3 &point, float quality) const { - float step = 1.0f / iSegCount / quality; + float step = 1.0f / static_cast(iSegCount) / quality; - float x; glm::vec3 nearest; float min = std::numeric_limits::max(); - for (x = step; x <= 1.0f; x += step) { + for (int i = 1; static_cast(i) * step <= 1.0f; ++i) { + float const x = static_cast(i) * step; glm::vec3 p1 = FastGetPoint(x); - glm::vec3 p2 = FastGetPoint(glm::min(1.0f, x + step)); - if (p1 != p2) { + if (glm::vec3 p2 = FastGetPoint(glm::min(1.0f, x + step)); p1 != p2) { float l2 = glm::distance2(p1, p2); float t = glm::max(0.0f, glm::min(1.0f, glm::dot((glm::vec3)point - p1, p2 - p1) / l2)); glm::vec3 proj = p1 + t * (p2 - p1); diff --git a/world/Segment.h b/world/Segment.h index 645e5663b..a3c83ade7 100644 --- a/world/Segment.h +++ b/world/Segment.h @@ -41,10 +41,12 @@ struct segment_data { class TSegment { // aproksymacja toru (zwrotnica ma dwa takie, jeden z nich jest aktywny) private: - glm::dvec3 Point1, CPointOut, CPointIn, Point2; - float - fRoll1 { 0.f }, - fRoll2 { 0.f }; // przechyłka na końcach + glm::dvec3 Point1; + glm::dvec3 CPointOut; + glm::dvec3 CPointIn; + glm::dvec3 Point2; + float fRoll1 { 0.f }; + float fRoll2 { 0.f }; // przechyłka na końcach double fLength { -1.0 }; // długość policzona std::vector fTsBuffer; // wartości parametru krzywej t dla równych odcinków s std::vector fTsSlope; // nachylenie dt/du (= dt/ds * fStep) w tych samych punktach @@ -52,7 +54,9 @@ class TSegment int iSegCount = 0; // ilość odcinków do rysowania krzywej double fDirection = 0.0; // Ra: kąt prostego w planie; dla łuku kąt od Point1 double fStoop = 0.0; // Ra: kąt wzniesienia; dla łuku od Point1 - glm::dvec3 vA, vB, vC; // współczynniki wielomianów trzeciego stopnia vD==Point1 + glm::dvec3 vA; + glm::dvec3 vB; + glm::dvec3 vC; // współczynniki wielomianów trzeciego stopnia vD==Point1 TTrack *pOwner = nullptr; // wskaźnik na właściciela glm::dvec3 GetFirstDerivative(double const fTime) const; @@ -66,7 +70,7 @@ class TSegment public: bool bCurve = false; - TSegment(TTrack *owner); + explicit TSegment(TTrack *owner); bool Init(glm::dvec3 NewPoint1, glm::dvec3 NewPoint2, double fNewStep, double fNewRoll1 = 0, double fNewRoll2 = 0); bool Init(glm::dvec3 &NewPoint1, glm::dvec3 NewCPointOut, glm::dvec3 NewCPointIn, glm::dvec3 &NewPoint2, double fNewStep, double fNewRoll1 = 0, double fNewRoll2 = 0, bool bIsCurve = true); double @@ -89,7 +93,7 @@ public: GetDirection() const { return CPointOut; }; glm::dvec3 - FastGetDirection(double const fDistance, double const fOffset); + FastGetDirection(double const fDistance, double const fOffset) const; /* Math3D::vector3 GetPoint(double const fDistance) const; diff --git a/world/Spring.cpp b/world/Spring.cpp index b58d88591..56bcb8455 100644 --- a/world/Spring.cpp +++ b/world/Spring.cpp @@ -13,19 +13,18 @@ http://mozilla.org/MPL/2.0/. void TSpring::Init(double nKs, double nKd) { Ks = nKs; Kd = nKd; - ks = Ks; - kd = Kd; + ks = static_cast(Ks); + kd = static_cast(Kd); } -glm::dvec3 TSpring::ComputateForces(glm::dvec3 const &pPosition1, glm::dvec3 const &pPosition2) { +glm::dvec3 TSpring::ComputateForces(glm::dvec3 const &pPosition1, glm::dvec3 const &pPosition2) const { glm::vec3 springForce; // p1 = &system[spring->p1]; // p2 = &system[spring->p2]; // VectorDifference(&p1->pos,&p2->pos,&deltaP); // Vector distance auto deltaP = pPosition1 - pPosition2; // dist = VectorLength(&deltaP); // Magnitude of deltaP - auto dist = glm::length(deltaP); - if( dist > restLen ) { + if( auto dist = glm::length(deltaP); dist > restLen ) { // Hterm = (dist - spring->restLen) * spring->Ks; // Ks * (dist - rest) auto Hterm = ( dist - restLen ) * Ks; // Ks * (dist - rest) diff --git a/world/Spring.h b/world/Spring.h index 6800ba29b..9e4ce6856 100644 --- a/world/Spring.h +++ b/world/Spring.h @@ -27,7 +27,7 @@ public: // void Init(TParticnp1, TParticle *np2, double nKs= 0.5f, double nKd= 0.002f, // double nrestLen= -1.0f); void Init(double nKs = 0.5f, double nKd = 0.002f); - glm::dvec3 ComputateForces(glm::dvec3 const &pPosition1, glm::dvec3 const &pPosition2); + glm::dvec3 ComputateForces(glm::dvec3 const &pPosition1, glm::dvec3 const &pPosition2) const; //private: // members double restLen { 0.01 }; // LENGTH OF SPRING AT REST diff --git a/world/Traction.cpp b/world/Traction.cpp index ef0c85bd1..b9e47d5b9 100644 --- a/world/Traction.cpp +++ b/world/Traction.cpp @@ -114,10 +114,9 @@ TTraction::Load( cParser *parser, glm::dvec3 const &pOrigin ) { // SKB70-C, CuCd70-2C, KB95-2C, C95-C, C95-2C, YC95-2C, YpC95-2C, YC120-2C // YpC120-2C, YzC120-2C, YwsC120-2C, YC150-C150, YC150-2C150, C150-C150 // C120-2C, 2C120-2C, 2C120-2C-1, 2C120-2C-2, 2C120-2C-3, 2C120-2C-4 - auto const material = parser->getToken(); // 1=miedziana, rysuje się na zielono albo czerwono // 2=aluminiowa, rysuje się na czarno - if( material == "none" ) { Material = 0; } + if( auto const material = parser->getToken(); material == "none" ) { Material = 0; } else if( material == "al" ) { Material = 2; } else { Material = 1; } parser->getTokens( 2 ); @@ -131,7 +130,7 @@ TTraction::Load( cParser *parser, glm::dvec3 const &pOrigin ) { auto const minheight { parser->getToken() }; fHeightDifference = ( pPoint3.y - pPoint1.y + pPoint4.y - pPoint2.y ) * 0.5 - minheight; auto const segmentlength { parser->getToken() }; - iNumSections = segmentlength ? glm::length(pPoint1 - pPoint2) / segmentlength : 0; + iNumSections = segmentlength != 0.0 ? static_cast(glm::length(pPoint1 - pPoint2) / segmentlength) : 0; parser->getTokens( 2 ); *parser >> Wires @@ -164,7 +163,7 @@ TTraction::endpoints() const { } std::size_t -TTraction::create_geometry( gfx::geometrybank_handle const &Bank ) { +TTraction::create_geometry( gfx::geometrybank_handle const &Geometrybank ) { if( m_geometry != null_handle ) { return GfxRenderer->Vertices( m_geometry ).size() / 2; } @@ -175,7 +174,8 @@ TTraction::create_geometry( gfx::geometrybank_handle const &Bank ) { if( Wires == 2 ) WireOffset = 0; // jezdny - gfx::basic_vertex startvertex, endvertex; + gfx::basic_vertex startvertex; + gfx::basic_vertex endvertex; startvertex.position = glm::vec3( pPoint1.x - ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - m_origin.x, @@ -189,7 +189,12 @@ TTraction::create_geometry( gfx::geometrybank_handle const &Bank ) { vertices.emplace_back( startvertex ); vertices.emplace_back( endvertex ); // Nie wiem co 'Marcin - glm::dvec3 pt1, pt2, pt3, pt4, v1, v2; + glm::dvec3 pt1; + glm::dvec3 pt2; + glm::dvec3 pt3; + glm::dvec3 pt4; + glm::dvec3 v1; + glm::dvec3 v2; v1 = pPoint4 - pPoint3; v2 = pPoint2 - pPoint1; float step = 0; @@ -207,7 +212,7 @@ TTraction::create_geometry( gfx::geometrybank_handle const &Bank ) { pPoint3.z - m_origin.z ); for( int i = 0; i < iNumSections - 1; ++i ) { pt3 = pPoint3 + v1 * f; - t = 1 - std::fabs(f - mid) * 2; + t = static_cast(1 - std::fabs(f - mid) * 2); if( Wires < 4 || ( i != 0 && i != iNumSections - 2 ) ) { @@ -256,7 +261,7 @@ TTraction::create_geometry( gfx::geometrybank_handle const &Bank ) { pPoint3.z - m_origin.z ); for( int i = 0; i < iNumSections - 1; ++i ) { pt3 = pPoint3 + v1 * f; - t = 1 - std::fabs(f - mid) * 2; + t = static_cast(1 - std::fabs(f - mid) * 2); endvertex.position = glm::vec3( pt3.x - m_origin.x, @@ -288,7 +293,7 @@ TTraction::create_geometry( gfx::geometrybank_handle const &Bank ) { for( int i = 0; i < iNumSections - 1; ++i ) { pt3 = pPoint3 + v1 * f; pt4 = pPoint1 + v2 * f; - t = 1 - std::fabs(f - mid) * 2; + t = static_cast(1 - std::fabs(f - mid) * 2); if( i % 2 == 0 ) { startvertex.position = glm::vec3( @@ -338,12 +343,12 @@ TTraction::create_geometry( gfx::geometrybank_handle const &Bank ) { auto const elementcount = vertices.size() / 2; gfx::userdata_array empty_userdata{}; - m_geometry = GfxRenderer->Insert( vertices, empty_userdata, Bank, GL_LINES ); + m_geometry = GfxRenderer->Insert( vertices, empty_userdata, Geometrybank, GL_LINES ); return elementcount; } -int TTraction::TestPoint(glm::dvec3 const &Point) +int TTraction::TestPoint(glm::dvec3 const &Point) const { // sprawdzanie, czy przęsła można połączyć if( hvNext[0] == nullptr && glm::all(glm::epsilonEqual(Point, pPoint1, 0.025)) ) { @@ -410,7 +415,8 @@ void TTraction::ResistanceCalc(int d, double r, TTractionPowerSource *ps) { //(this) jest przęsłem zasilanym, o rezystancji (r), policzyć rezystancję zastępczą sąsiednich if (d >= 0) { // podążanie we wskazanym kierunku - TTraction *t = hvNext[d], *p; + TTraction *t = hvNext[d]; + TTraction const *p; if (ps) psPower[d ^ 1] = ps; // podłączenie podanego else @@ -432,7 +438,7 @@ void TTraction::ResistanceCalc(int d, double r, TTractionPowerSource *ps) } } t->psPower[d] = ps; // skopiowanie wskaźnika zasilacza od danej strony - t->fResistance[d] = r; // wpisanie rezystancji w kierunku tego zasilacza + t->fResistance[d] = static_cast(r); // wpisanie rezystancji w kierunku tego zasilacza r += t->fResistivity * glm::length(t->vParametric); // doliczenie oporu kolejnego odcinka p = t; // zapamiętanie dotychczasowego t = p->hvNext[d ^ 1]; // podążanie w tę samą stronę @@ -457,17 +463,18 @@ void TTraction::PowerSet(TTractionPowerSource *ps) else { // ustalenie punktu zasilania (nie ma jeszcze połączeń między przęsłami) psPowered = ps; // ustawienie bezpośredniego zasilania dla przęsła - psPower[0] = psPower[1] = ps; // a to chyba nie jest dobry pomysł, bo nawet zasilane przęsło + psPower[0] = ps; // a to chyba nie jest dobry pomysł, bo nawet zasilane przęsło + psPower[1] = ps; // powinno mieć wskazania na inne - fResistance[0] = fResistance[1] = 0.0; // a liczy się tylko rezystancja zasilacza + fResistance[0] = 0.0; // a liczy się tylko rezystancja zasilacza + fResistance[1] = 0.0; } }; double TTraction::VoltageGet(double u, double i) { // pobranie napięcia na przęśle po podłączeniu do niego rezystancji (res) - na razie jest to prąd - if (!psSection) - if (!psPowered) - return NominalVoltage; // jak nie ma zasilacza, to napięcie podane w przęśle + if (!psSection && !psPowered) + return NominalVoltage; // jak nie ma zasilacza, to napięcie podane w przęśle // na początek można założyć, że wszystkie podstacje mają to samo napięcie i nie płynie prąd // pomiędzy nimi // dla danego przęsła mamy 3 źródła zasilania @@ -485,8 +492,12 @@ double TTraction::VoltageGet(double u, double i) return 0.0; } - double r0t, r1t, r0g, r1g; - double i0, i1; + double r0t; + double r1t; + double r0g; + double r1g; + double i0; + double i1; r0t = fResistance[0]; //średni pomysł, ale lepsze niż nic r1t = fResistance[1]; // bo nie uwzględnia spadków z innych pojazdów if (psPower[0] && psPower[1]) @@ -729,29 +740,25 @@ traction_table::InitTraction() { break; } } - if( traction->hvNext[ 0 ] ) { - // jeśli został podłączony - if( traction->psSection != nullptr - && matchingtraction->psSection != nullptr ) { - // tylko przęsło z izolatorem może nie mieć zasilania, bo ma 2, trzeba sprawdzać sąsiednie - if( traction->psSection != matchingtraction->psSection ) { - // połączone odcinki mają różne zasilacze - // to może być albo podłączenie podstacji lub kabiny sekcyjnej do sekcji, albo błąd - if( true == traction->psSection->bSection - && false == matchingtraction->psSection->bSection ) { - //(tmp->psSection) jest podstacją, a (Traction->psSection) nazwą sekcji - matchingtraction->PowerSet( traction->psSection ); // zastąpienie wskazaniem sekcji - } - else if( false == traction->psSection->bSection - && true == matchingtraction->psSection->bSection ) { - //(Traction->psSection) jest podstacją, a (tmp->psSection) nazwą sekcji - traction->PowerSet( matchingtraction->psSection ); // zastąpienie wskazaniem sekcji - } - else { - // jeśli obie to sekcje albo obie podstacje, to będzie błąd - ErrorLog( "Bad scenario: faulty traction power connection at location " + to_string( traction->pPoint1 ) ); - } - } + // jeśli został podłączony + // tylko przęsło z izolatorem może nie mieć zasilania, bo ma 2, trzeba sprawdzać sąsiednie + if (traction->hvNext[ 0 ] && traction->psSection != nullptr + && matchingtraction->psSection != nullptr && traction->psSection != matchingtraction->psSection) { + // połączone odcinki mają różne zasilacze + // to może być albo podłączenie podstacji lub kabiny sekcyjnej do sekcji, albo błąd + if( true == traction->psSection->bSection + && false == matchingtraction->psSection->bSection ) { + //(tmp->psSection) jest podstacją, a (Traction->psSection) nazwą sekcji + matchingtraction->PowerSet( traction->psSection ); // zastąpienie wskazaniem sekcji + } + else if( false == traction->psSection->bSection + && true == matchingtraction->psSection->bSection ) { + //(Traction->psSection) jest podstacją, a (tmp->psSection) nazwą sekcji + traction->PowerSet( matchingtraction->psSection ); // zastąpienie wskazaniem sekcji + } + else { + // jeśli obie to sekcje albo obie podstacje, to będzie błąd + ErrorLog( "Bad scenario: faulty traction power connection at location " + to_string( traction->pPoint1 ) ); } } } @@ -768,28 +775,24 @@ traction_table::InitTraction() { break; } } - if( traction->hvNext[ 1 ] ) { - // jeśli został podłączony - if( traction->psSection != nullptr - && matchingtraction->psSection != nullptr ) { - // tylko przęsło z izolatorem może nie mieć zasilania, bo ma 2, trzeba sprawdzać sąsiednie - if( traction->psSection != matchingtraction->psSection ) { - // to może być albo podłączenie podstacji lub kabiny sekcyjnej do sekcji, albo błąd - if( true == traction->psSection->bSection - && false == matchingtraction->psSection->bSection ) { - //(tmp->psSection) jest podstacją, a (Traction->psSection) nazwą sekcji - matchingtraction->PowerSet( traction->psSection ); // zastąpienie wskazaniem sekcji - } - else if( false == traction->psSection->bSection - && true == matchingtraction->psSection->bSection ) { - //(Traction->psSection) jest podstacją, a (tmp->psSection) nazwą sekcji - traction->PowerSet( matchingtraction->psSection ); // zastąpienie wskazaniem sekcji - } - else { - // jeśli obie to sekcje albo obie podstacje, to będzie błąd - ErrorLog( "Bad scenario: faulty traction power connection at location " + to_string( traction->pPoint2 ) ); - } - } + // jeśli został podłączony + // tylko przęsło z izolatorem może nie mieć zasilania, bo ma 2, trzeba sprawdzać sąsiednie + if (traction->hvNext[ 1 ] && traction->psSection != nullptr + && matchingtraction->psSection != nullptr && traction->psSection != matchingtraction->psSection) { + // to może być albo podłączenie podstacji lub kabiny sekcyjnej do sekcji, albo błąd + if( true == traction->psSection->bSection + && false == matchingtraction->psSection->bSection ) { + //(tmp->psSection) jest podstacją, a (Traction->psSection) nazwą sekcji + matchingtraction->PowerSet( traction->psSection ); // zastąpienie wskazaniem sekcji + } + else if( false == traction->psSection->bSection + && true == matchingtraction->psSection->bSection ) { + //(Traction->psSection) jest podstacją, a (tmp->psSection) nazwą sekcji + traction->PowerSet( matchingtraction->psSection ); // zastąpienie wskazaniem sekcji + } + else { + // jeśli obie to sekcje albo obie podstacje, to będzie błąd + ErrorLog( "Bad scenario: faulty traction power connection at location " + to_string( traction->pPoint2 ) ); } } } @@ -822,8 +825,7 @@ traction_table::InitTraction() { } else if( traction->hvParallel == nullptr ) { // jeśli jeszcze nie został włączony w kółko - auto *nTemp = find( traction->asParallel ); - if( nTemp != nullptr ) { + if( auto *nTemp = find( traction->asParallel ); nTemp != nullptr ) { // o ile zostanie znalezione przęsło o takiej nazwie if( nTemp->hvParallel == nullptr ) { // jeśli tamten jeszcze nie ma wskaźnika bieżni wspólnej diff --git a/world/Traction.h b/world/Traction.h index 638f46b04..6506dfb38 100644 --- a/world/Traction.h +++ b/world/Traction.h @@ -29,8 +29,10 @@ class TTraction : public scene::basic_node TTraction *hvNext[ 2 ] { nullptr, nullptr }; //łączenie drutów w sieć int iNext[ 2 ] { 0, 0 }; // do którego końca się łączy int iLast { 0 }; //że niby ostatni drut // ustawiony bit 0, jeśli jest ostatnim drutem w sekcji; bit1 - przedostatni - public: - glm::dvec3 pPoint1, pPoint2, pPoint3, pPoint4; + glm::dvec3 pPoint1; + glm::dvec3 pPoint2; + glm::dvec3 pPoint3; + glm::dvec3 pPoint4; glm::dvec3 vParametric; // współczynniki równania parametrycznego odcinka double fHeightDifference { 0.0 }; int iNumSections { 0 }; @@ -66,7 +68,7 @@ class TTraction : public scene::basic_node // creates geometry data in specified geometry bank. returns: number of created elements, or NULL // NOTE: deleting nodes doesn't currently release geometry data owned by the node. TODO: implement erasing individual geometry chunks and banks std::size_t create_geometry( gfx::geometrybank_handle const &Bank ); - int TestPoint(glm::dvec3 const &Point); + int TestPoint(glm::dvec3 const &Point) const; void Connect(int my, TTraction *with, int to); void Init(); bool WhereIs(); @@ -78,13 +80,13 @@ private: // methods glm::vec3 wire_color() const; // radius() subclass details, calculates node's bounding radius - float radius_(); + float radius_() override; // serialize() subclass details, sends content of the subclass to provided stream - void serialize_( std::ostream &Output ) const; + void serialize_( std::ostream &Output ) const override; // deserialize() subclass details, restores content of the subclass from provided stream - void deserialize_( std::istream &Input ); + void deserialize_( std::istream &Input ) override; // export() subclass details, sends basic content of the class in legacy (text) format to provided stream - void export_as_text_( std::ostream &Output ) const; + void export_as_text_( std::ostream &Output ) const override; }; diff --git a/world/TractionPower.cpp b/world/TractionPower.cpp index 7d816e215..540c32fc6 100644 --- a/world/TractionPower.cpp +++ b/world/TractionPower.cpp @@ -125,7 +125,7 @@ double TTractionPowerSource::CurrentGet(double res) } if (res > 0 || (res < 0 && (Recuperation || true))) TotalAdmitance += 1.0 / res; // połączenie równoległe rezystancji jest równoważne sumie admitancji - float NomVolt = TotalPreviousAdmitance < 0 ? NominalVoltage * 1.083 : NominalVoltage; + float NomVolt = TotalPreviousAdmitance < 0 ? static_cast(NominalVoltage * 1.083) : static_cast(NominalVoltage); TotalCurrent = TotalPreviousAdmitance != 0.0 ? NomVolt / (InternalRes + 1.0 / TotalPreviousAdmitance) : 0.0; // napięcie dzielone przez sumę rezystancji wewnętrznej i obciążenia diff --git a/world/TractionPower.h b/world/TractionPower.h index d1faa037e..61127ae06 100644 --- a/world/TractionPower.h +++ b/world/TractionPower.h @@ -19,7 +19,7 @@ class TTractionPowerSource : public scene::basic_node { public: // constructor - TTractionPowerSource( scene::node_data const &Nodedata ); + explicit TTractionPowerSource( scene::node_data const &Nodedata ); // methods void Init(double const u, double const i); bool Load(cParser *parser); @@ -38,11 +38,11 @@ public: private: // methods // serialize() subclass details, sends content of the subclass to provided stream - void serialize_( std::ostream &Output ) const; + void serialize_( std::ostream &Output ) const override; // deserialize() subclass details, restores content of the subclass from provided stream - void deserialize_( std::istream &Input ); + void deserialize_( std::istream &Input ) override; // export() subclass details, sends basic content of the class in legacy (text) format to provided stream - void export_as_text_( std::ostream &Output ) const; + void export_as_text_( std::ostream &Output ) const override; // members double NominalVoltage = 0.0; diff --git a/world/mtable.cpp b/world/mtable.cpp index cec54f870..b69cacfb9 100644 --- a/world/mtable.cpp +++ b/world/mtable.cpp @@ -14,7 +14,7 @@ http://mozilla.org/MPL/2.0/. #include "utilities/dictionary.h" #include "utilities/utilities.h" -double TTrainParameters::CheckTrainLatency() +double TTrainParameters::CheckTrainLatency() const { if (LastStationLatency > 1.0 || LastStationLatency < 0) return LastStationLatency; /*spoznienie + lub do przodu - z tolerancja 1 min*/ @@ -22,7 +22,7 @@ double TTrainParameters::CheckTrainLatency() return 0; } -double TTrainParameters::WatchMTable(double DistCounter) +double TTrainParameters::WatchMTable(double DistCounter) const { // zwraca odleglość do najblizszej stacji z zatrzymaniem double dist; @@ -105,7 +105,7 @@ bool TTrainParameters::UpdateMTable( scenario_time const &Time, std::string cons return UpdateMTable( Time.data().wHour, Time.data().wMinute + Time.data().wSecond * 0.0167, NewName ); } -bool TTrainParameters::UpdateMTable(double hh, double mm, std::string const &NewName) +bool TTrainParameters::UpdateMTable(double hh, double mm, std::string_view NewName) /*odfajkowanie dojechania do stacji (NewName) i przeliczenie opóźnienia*/ { bool OK; @@ -163,7 +163,7 @@ void TTrainParameters::StationIndexInc() ++StationIndex; } -bool TTrainParameters::IsTimeToGo(double hh, double mm) +bool TTrainParameters::IsTimeToGo(double hh, double mm) const // sprawdzenie, czy można już odjechać z aktualnego zatrzymania // StationIndex to numer następnego po dodarciu do aktualnego { @@ -205,7 +205,7 @@ TTrainParameters::TTrainParameters(std::string const &NewTrainName) NewName(NewTrainName); } -void TTrainParameters::NewName(std::string const &NewTrainName) +void TTrainParameters::NewName(std::string_view NewTrainName) /*wstępne ustawienie parametrów rozkładu jazdy*/ { TrainName = NewTrainName; @@ -217,9 +217,9 @@ void TTrainParameters::NewName(std::string const &NewTrainName) Direction = 1; Relation1 = ""; Relation2 = ""; - for (int i = 0; i < MaxTTableSize + 1; ++i) + for (auto &tableline : TimeTable) { - TimeTable[ i ] = TMTableLine(); + tableline = TMTableLine(); } TTVmax = 100; /*wykasowac*/ BrakeRatio = 0; @@ -227,7 +227,7 @@ void TTrainParameters::NewName(std::string const &NewTrainName) LocLoad = 0; } -void TTrainParameters::UpdateVelocity(int StationCount, double vActual) +void TTrainParameters::UpdateVelocity(int /*Stationcount*/, double vActual) // zapisywanie prędkości maksymalnej do wcześniejszych odcinków // wywoływane z numerem ostatniego przetworzonego przystanku { @@ -235,7 +235,7 @@ void TTrainParameters::UpdateVelocity(int StationCount, double vActual) // TTVmax:=vActual; {PROWIZORKA!!!} while (i >= 0 && TimeTable[i].vmax == -1) { - TimeTable[i].vmax = vActual; // prędkość dojazdu do przystanku i + TimeTable[i].vmax = static_cast(vActual); // prędkość dojazdu do przystanku i --i; // ewentualnie do poprzedniego też } } @@ -245,7 +245,7 @@ void TTrainParameters::UpdateVelocity(int StationCount, double vActual) // return false; //} -bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax) +bool TTrainParameters::LoadTTfile(std::string const &scnpath, int iPlus, double vmax) // wczytanie pliku-tabeli z rozkładem przesuniętym o (fPlus); (vMax) nie ma znaczenia { std::string lines; @@ -254,7 +254,7 @@ bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax) bool EndTable; double vActual; - int ConversionError = 0; + int conversionerror = 0; EndTable = false; if (TrainName == "") { // jeśli pusty rozkład @@ -262,7 +262,6 @@ bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax) } else { - ConversionError = 666; vActual = -1; s = scnpath + TrainName + ".txt"; replace_slashes(s); @@ -278,15 +277,15 @@ bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax) { TTVmax = vmax; // Ra 2014-07: zamiast rozkładu można podać Vmax UpdateVelocity(StationCount, vmax); // ograniczenie do prędkości startowej - ConversionError = 0; + conversionerror = 0; } else - ConversionError = -8; /*Ra: ten błąd jest niepotrzebny*/ + conversionerror = -8; /*Ra: ten błąd jest niepotrzebny*/ } else { /*analiza rozkładu jazdy*/ - ConversionError = 0; - while (fin.good() && !(ConversionError != 0 || EndTable)) + conversionerror = 0; + while (fin.good() && !(conversionerror != 0 || EndTable)) { std::getline(fin, lines); /*wczytanie linii*/ if (contains( lines, "___________________") ) /*linia pozioma górna*/ @@ -354,7 +353,7 @@ bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax) win1250_to_ascii( Relation1 ); } else - ConversionError = -5; + conversionerror = -5; while (fin >> s || !fin.bad()) { if (s == "Relacja") @@ -409,10 +408,10 @@ bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax) if (s == "[") fin >> s; else - ConversionError = -4; + conversionerror = -4; if (false == contains( s,"|") ) { - record->km = atof(s.c_str()); + record->km = static_cast(atof(s.c_str())); fin >> s; } if (contains( s,"|_____|")) /*zmiana predkosci szlakowej*/ @@ -439,12 +438,12 @@ bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax) if (contains( s, hrsd) ) { record->Ah = atoi( s.substr(0, s.find(hrsd)).c_str()); // godzina przyjazdu - record->Am = atof(s.substr(s.find(hrsd) + 1, s.length()).c_str()); // minuta przyjazdu + record->Am = static_cast(atof(s.substr(s.find(hrsd) + 1, s.length()).c_str())); // minuta przyjazdu } else { record->Ah = TimeTable[StationCount - 1].Ah; // godzina z poprzedniej pozycji - record->Am = atof(s.c_str()); // bo tylko minuty podane + record->Am = static_cast(atof(s.c_str())); // bo tylko minuty podane } } do @@ -452,7 +451,7 @@ bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax) fin >> s; } while (!(s != "|" || fin.bad())); if (s != "]") - record->tm = atof(s.c_str()); + record->tm = static_cast(atof(s.c_str())); do { fin >> s; @@ -490,10 +489,10 @@ bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax) if( entry.front() != 'R' ) { continue; } - auto const entrysplit { split_string_and_number( entry ) }; - if( entrysplit.first == "R" - && entrysplit.second <= 10 ) { - auto const radiochannel { entrysplit.second }; + auto const [entrytype, entrynumber]{ split_string_and_number( entry ) }; + if( entrytype == "R" + && entrynumber <= 10 ) { + auto const radiochannel { entrynumber }; if( record->radio_channel == -1 || radiochannel != activeradiochannel ) { // if the station has more than one radiochannel listed, @@ -514,12 +513,12 @@ bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax) if (contains( s, hrsd) ) { record->Dh = atoi(s.substr(0, s.find(hrsd)).c_str()); // godzina odjazdu - record->Dm = atof(s.substr(s.find(hrsd) + 1, s.length()).c_str()); // minuta odjazdu + record->Dm = static_cast(atof(s.substr(s.find(hrsd) + 1, s.length()).c_str())); // minuta odjazdu } else { record->Dh = TimeTable[StationCount - 1].Dh; // godzina z poprzedniej pozycji - record->Dm = atof(s.c_str()); // bo tylko minuty podane + record->Dm = static_cast(atof(s.c_str())); // bo tylko minuty podane } } else @@ -532,7 +531,7 @@ bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax) fin >> s; } while (!(s != "|" || fin.bad())); if (s != "]") - record->tm = atof(s.c_str()); + record->tm = static_cast(atof(s.c_str())); do { fin >> s; @@ -565,20 +564,16 @@ bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax) fin.close(); } } - if (ConversionError == 0) - { - if (TimeTable[1].StationName == Relation1) // jeśli nazwa pierwszego zgodna z relacją - if (TimeTable[1].Ah < 0) // a nie podany czas przyjazdu - { // to mamy zatrzymanie na pierwszym, a nie przelot - TimeTable[1].Ah = TimeTable[1].Dh; - TimeTable[1].Am = TimeTable[1].Dm; - } + // jeśli nazwa pierwszego zgodna z relacją + if (conversionerror == 0 && TimeTable[1].StationName == Relation1 && TimeTable[1].Ah < 0) // a nie podany czas przyjazdu + { // to mamy zatrzymanie na pierwszym, a nie przelot + TimeTable[1].Ah = TimeTable[1].Dh; + TimeTable[1].Am = TimeTable[1].Dm; } // load_sounds(); // potentially offset table times - auto const timeoffset { static_cast( Global.ScenarioTimeOffset * 60 ) + iPlus }; - if( timeoffset != 0 ) // jeżeli jest przesunięcie rozkładu + if( auto const timeoffset { static_cast( Global.ScenarioTimeOffset * 60 ) + iPlus }; timeoffset != 0 ) // jeżeli jest przesunięcie rozkładu { long i_end = StationCount + 1; float adjustedtime; // do zwiększania czasu @@ -586,19 +581,19 @@ bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax) { if (TimeTable[i].Ah >= 0) { - adjustedtime = clamp_circular( TimeTable[i].Ah * 60 + TimeTable[i].Am + timeoffset, 24 * 60 ); // nowe minuty + adjustedtime = clamp_circular( static_cast(TimeTable[i].Ah * 60) + TimeTable[i].Am + static_cast(timeoffset), 24 * 60 ); // nowe minuty TimeTable[i].Am = int(60 * adjustedtime) % 3600 / 60.f; TimeTable[i].Ah = int(adjustedtime / 60) % 24; } if (TimeTable[i].Dh >= 0) { - adjustedtime = clamp_circular( TimeTable[i].Dh * 60 + TimeTable[i].Dm + timeoffset, 24 * 60 ); // nowe minuty + adjustedtime = clamp_circular( static_cast(TimeTable[i].Dh * 60) + TimeTable[i].Dm + static_cast(timeoffset), 24 * 60 ); // nowe minuty TimeTable[i].Dm = int(60 * adjustedtime) % 3600 / 60.f; TimeTable[i].Dh = int(adjustedtime / 60) % 24; } } } - return ConversionError == 0; + return conversionerror == 0; } void @@ -615,26 +610,26 @@ TTrainParameters::load_sounds() { station.StationName.substr( 0, station.StationName.size() - 3 ) : station.StationName ) }; - auto const lookup { + auto const [filepath, fileextension]{ FileExists( { Global.asCurrentSceneryPath + stationname, std::string{ paths::sounds } + "sip/" + stationname }, { ".ogg", ".flac", ".wav" } ) }; - if( lookup.first.empty() ) { + if( filepath.empty() ) { continue; } // wczytanie dźwięku odjazdu w wersji radiowej (słychać tylko w kabinie) station.name_sound = sound_source{ sound_placement::engine, EU07_SOUND_CABANNOUNCEMENTCUTOFFRANGE } - .deserialize( lookup.first + lookup.second, sound_type::single ); + .deserialize( filepath + fileextension, sound_type::single ); } } -bool TTrainParameters::DirectionChange() +bool TTrainParameters::DirectionChange() const // sprawdzenie, czy po zatrzymaniu wykonać kolejne komendy { - if (StationIndex > 0 && StationIndex < StationCount) // dla ostatniej stacji nie - if (contains( TimeTable[StationIndex].StationWare, '@') ) - return true; + // dla ostatniej stacji nie + if (StationIndex > 0 && StationIndex < StationCount && contains( TimeTable[StationIndex].StationWare, '@')) + return true; return false; } diff --git a/world/mtable.h b/world/mtable.h index c58d120ff..44cda7311 100644 --- a/world/mtable.h +++ b/world/mtable.h @@ -18,7 +18,7 @@ namespace Mtable { static int const MaxTTableSize = 100; // można by to robić dynamicznie -static char const *hrsd = "."; +static char const *const hrsd = "."; // Ra: pozycja zerowa rozkładu chyba nie ma sensu // Ra: numeracja przystanków jest 1..StationCount @@ -42,7 +42,7 @@ struct TMTableLine sound_source name_sound{ sound_placement::engine }; }; -typedef TMTableLine TMTable[MaxTTableSize + 1]; +using TMTable = TMTableLine[MaxTTableSize + 1]; // typedef TTrainParameters *PTrainParameters; @@ -65,27 +65,27 @@ class TTrainParameters std::string NextStationName; double LastStationLatency; int Direction; /*kierunek jazdy w/g kilometrazu*/ - double CheckTrainLatency(); + double CheckTrainLatency() const; /*todo: str hh:mm to int i z powrotem*/ std::string ShowRelation() const; - double WatchMTable(double DistCounter); + double WatchMTable(double DistCounter) const; std::string NextStop() const; sound_source next_stop_sound() const; sound_source last_stop_sound() const; bool IsStop() const; bool IsLastStop() const; bool IsMaintenance() const; - bool IsTimeToGo(double hh, double mm); + bool IsTimeToGo(double hh, double mm) const; // returns: difference between specified time and scheduled departure from current stop, in seconds double seconds_until_departure( double const Hour, double const Minute ) const; - bool UpdateMTable(double hh, double mm, std::string const &NewName); + bool UpdateMTable(double hh, double mm, std::string_view NewName); bool UpdateMTable( scenario_time const &Time, std::string const &NewName ); bool RewindTimeTable( std::string actualStationName ); - TTrainParameters( std::string const &NewTrainName = "none" ); - void NewName(std::string const &NewTrainName); + explicit TTrainParameters( std::string const &NewTrainName = "none" ); + void NewName(std::string_view NewTrainName); void UpdateVelocity(int StationCount, double vActual); - bool LoadTTfile(std::string scnpath, int iPlus, double vmax); - bool DirectionChange(); + bool LoadTTfile(std::string const &scnpath, int iPlus, double vmax); + bool DirectionChange() const; void StationIndexInc(); void serialize( dictionary_source *Output ) const; // returns: radio channel associated with current station, or -1 diff --git a/world/station.cpp b/world/station.cpp index eae81d9ef..90b443e86 100644 --- a/world/station.cpp +++ b/world/station.cpp @@ -22,7 +22,7 @@ basic_station Station; // exchanges load with consist attached to specified vehicle, operating on specified schedule double -basic_station::update_load( TDynamicObject *First, Mtable::TTrainParameters &Schedule, int const Platform ) { +basic_station::update_load( TDynamicObject *First, Mtable::TTrainParameters &Schedule, int const Platform ) const { // TODO: filter out maintenance stops when determining first and last stop auto const firststop { Schedule.StationIndex == 1 }; @@ -63,7 +63,7 @@ basic_station::update_load( TDynamicObject *First, Mtable::TTrainParameters &Sch maintenancestop ? 0 : std::min( parameters.LoadAmount, - Random( parameters.MaxLoad * 0.15f * stationsizemodifier ) ) ); + static_cast(Random( parameters.MaxLoad * 0.15f * stationsizemodifier )) ) ); auto loadcount = static_cast( TestFlag( parameters.DamageFlag, dtrain_out ) ? 0 : laststop ? 0 : diff --git a/world/station.h b/world/station.h index ecc609927..5c4a9507f 100644 --- a/world/station.h +++ b/world/station.h @@ -18,7 +18,7 @@ public: // methods // exchanges load with consist attached to specified vehicle, operating on specified schedule; returns: time needed for exchange, in seconds double - update_load( TDynamicObject *First, Mtable::TTrainParameters &Schedule, int const Platform ); + update_load( TDynamicObject *First, Mtable::TTrainParameters &Schedule, int const Platform ) const; }; namespace simulation { From 81251666905f6d137286e846fdfff6e8a9558b16 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 11 Oct 2026 15:31:45 +0200 Subject: [PATCH 206/430] Fix/sonar reliability security (#205) * fix(sonar): addressing reliability/security issues * fix(sonar): addressing reliability/security issues * fix(sonar): addressing reliability/security issues * fix(sonar): addressing last reliability/security issues * fix(sonar): addressing last reliability/security issues * fix(sonar): addressing last reliability/security issues * refactor(sonar): imgui update * refactor(sonar): hasChar revert --- application/application.cpp | 5 +- .../renderer/source/imgui_nvrhi.cpp | 5 +- rendering/opengl33renderer.cpp | 4 +- utilities/utilities.cpp | 3 +- world/Segment.cpp | 21 ++-- world/Track.cpp | 108 ++++++++++-------- 6 files changed, 78 insertions(+), 68 deletions(-) diff --git a/application/application.cpp b/application/application.cpp index a7d098140..8afd50db2 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -569,7 +569,7 @@ int eu07_application::run() if (m_network && m_network->client) { // verify sync - if (sync != slave_sync) // NOSONAR + if (sync != slave_sync) // NOSONAR slave_sync is initialised, the PR analysis keeps a stale report of the old declaration { WriteLog("net: desync! calculated: " + std::to_string(sync) + ", received: " + std::to_string(slave_sync), logtype::net); @@ -1464,7 +1464,8 @@ int eu07_application::init_data() int eu07_application::init_modes() { - Global.local_random_engine.seed(static_cast(true_random_seed())); + // local cosmetics only (sound pitch, editor placement), never security related + Global.local_random_engine.seed(static_cast(true_random_seed())); // NOSONAR if ((!Global.network_servers.empty() || Global.network_client) && Global.SceneryFile.empty()) { diff --git a/betterRenderer/renderer/source/imgui_nvrhi.cpp b/betterRenderer/renderer/source/imgui_nvrhi.cpp index 70757c1f0..f1ed4d614 100644 --- a/betterRenderer/renderer/source/imgui_nvrhi.cpp +++ b/betterRenderer/renderer/source/imgui_nvrhi.cpp @@ -92,7 +92,8 @@ bool ImGui_NVRHI::createFontTexture(nvrhi::ICommandList* commandList) commandList->setPermanentTextureState(fontTexture, nvrhi::ResourceStates::ShaderResource); commandList->commitBarriers(); - io.Fonts->TexID = fontTexture; + // since imgui 1.91 ImTextureID is an integer, not a pointer + io.Fonts->TexID = static_cast(reinterpret_cast(fontTexture.Get())); } { @@ -371,7 +372,7 @@ bool ImGui_NVRHI::render(nvrhi::IFramebuffer* framebuffer) { pCmd->UserCallback(cmdList, pCmd); } else { - drawState.bindings = { getBindingSet(pCmd->TextureId) }; + drawState.bindings = { getBindingSet(reinterpret_cast(static_cast(pCmd->GetTexID()))) }; assert(drawState.bindings[0]); drawState.viewport.scissorRects[0] = nvrhi::Rect(int(pCmd->ClipRect.x), diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index 9421c200d..d20454c35 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -216,7 +216,7 @@ bool opengl33_renderer::Init(GLFWwindow *Window) // Generate hemisphere kernel (z > 0 = toward surface normal) std::uniform_real_distribution rnd(0.0f, 1.0f); - std::default_random_engine gen(42); // fixed seed for consistency + std::default_random_engine gen(42); // NOSONAR fixed seed on purpose, SSAO kernel has to be identical every run for (int i = 0; i < 32; i++) { glm::vec3 s(rnd(gen)*2.0f-1.0f, rnd(gen)*2.0f-1.0f, rnd(gen)); s = glm::normalize(s) * rnd(gen); @@ -1532,7 +1532,7 @@ glm::mat4 opengl33_renderer::perspective_projection_raw(float fovy, float aspect { if (GLAD_GL_ARB_clip_control || GLAD_GL_EXT_clip_control) { - const float f = 1.0f / tan(fovy / 2.0f); + const float f = 1.0f / std::tan(fovy / 2.0f); // when clip_control available, use projection matrix with 1..0 Z range and infinite zfar return glm::mat4( // diff --git a/utilities/utilities.cpp b/utilities/utilities.cpp index ebeae5b3f..02608262b 100644 --- a/utilities/utilities.cpp +++ b/utilities/utilities.cpp @@ -614,7 +614,8 @@ std::string deserialize_random_set(cParser &Input, char const *Break) } if (false == tokens.empty()) { - std::ranges::shuffle(tokens, Global.random_engine); + // scenery random set: must replay from the shared run seed, not a security concern + std::shuffle(std::begin(tokens), std::end(tokens), Global.random_engine); // NOSONAR return tokens.front(); } else diff --git a/world/Segment.cpp b/world/Segment.cpp index 34683b039..69886f42c 100644 --- a/world/Segment.cpp +++ b/world/Segment.cpp @@ -317,8 +317,7 @@ TSegment::find_nearest_point( glm::dvec3 const &Point ) const { distance = segmentdistance; } } - // - return nearest; + return nearest; // NOSONAR initialised above, the PR analysis keeps a stale report of the old declaration } } @@ -563,14 +562,14 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, glm::dvec3 const &Origin, void TSegment::render_lines(std::vector &out, float quality) const { - float step = 1.0f / static_cast(iSegCount) / quality; - + float step = 1.0f / iSegCount / quality; + auto const stepcount = static_cast(static_cast(iSegCount) * quality); glm::vec3 previous = FastGetPoint(0.0); - for (int i = 1; static_cast(i) * step <= 1.0f; ++i) { - float const x = static_cast(i) * step; - out.emplace_back(previous, glm::vec3(0.0f), glm::vec2(0.0f)); + for (int i = 1; i <= stepcount; ++i) { + float const x = std::min(1.0f, static_cast(i) * step); + out.push_back(gfx::basic_vertex(previous, glm::vec3(0.0f), glm::vec2(0.0f))); previous = glm::vec3(FastGetPoint(x)); out.emplace_back(previous, glm::vec3(0.0f), glm::vec2(0.0f)); @@ -584,14 +583,14 @@ void TSegment::render_lines(std::vector &out, float quality) glm::vec3 TSegment::get_nearest_point(const glm::dvec3 &point, float quality) const { - float step = 1.0f / static_cast(iSegCount) / quality; - + float step = 1.0f / iSegCount / quality; + auto const stepcount = static_cast(static_cast(iSegCount) * quality); glm::vec3 nearest; float min = std::numeric_limits::max(); - for (int i = 1; static_cast(i) * step <= 1.0f; ++i) { - float const x = static_cast(i) * step; + for (int i = 1; i <= stepcount; ++i) { + float const x = std::min(1.0f, static_cast(i) * step); glm::vec3 p1 = FastGetPoint(x); if (glm::vec3 p2 = FastGetPoint(glm::min(1.0f, x + step)); p1 != p2) { diff --git a/world/Track.cpp b/world/Track.cpp index aa5445ebe..f1a29798c 100644 --- a/world/Track.cpp +++ b/world/Track.cpp @@ -3720,6 +3720,58 @@ std::vector sleeper_segments_for( TTrack const &Track ) } return out; } + +// Local-space transform (relative to Origin) of the sleeper at distance S along the Segment, +// or none at a degenerate spot (e.g. zero-length sub-segment) where no tangent can be taken. +// Eps is the half-span of the central difference used to extract the tangent. +std::optional sleeper_transform( TSegment const &Segment, double const S, double const Eps, glm::dvec3 const &Origin, glm::vec3 const &Offset ) +{ + glm::dvec3 pos; + glm::vec3 angles; + Segment.RaPositionGet( S, pos, angles ); + + // tangent direction via central difference (clamped to the segment endpoints) + glm::dvec3 p_back; + glm::dvec3 p_fwd; + glm::vec3 dummy; + Segment.RaPositionGet( std::max( 0.0, S - Eps ), p_back, dummy ); + Segment.RaPositionGet( std::min( Segment.GetLength(), S + Eps ), p_fwd, dummy ); + auto tangent = glm::vec3( p_fwd - p_back ); + if( glm::length2( tangent ) < 1e-8f ) { + // skip this position rather than emit a junk transform with NaN normals. + return std::nullopt; + } + tangent = glm::normalize( tangent ); + + // build an orthonormal basis around the tangent. world up is the reference; if the + // track is almost vertical we fall back to world X so cross() doesn't collapse. + glm::vec3 up_ref { 0.f, 1.f, 0.f }; + if( std::abs( glm::dot( tangent, up_ref ) ) > 0.999f ) { up_ref = glm::vec3( 1.f, 0.f, 0.f ); } + glm::vec3 side = glm::normalize( glm::cross( up_ref, tangent ) ); + glm::vec3 up = glm::cross( tangent, side ); + + // apply track roll (banking) around the tangent / forward axis. + if( float const roll = angles.x; roll != 0.f ) { + auto const roll_mat = glm::rotate( glm::mat4( 1.f ), roll, tangent ); + side = glm::vec3( roll_mat * glm::vec4( side, 0.f ) ); + up = glm::vec3( roll_mat * glm::vec4( up, 0.f ) ); + } + + // assemble local transform: columns are (right, up, forward, translation). + // a sleeper modelled with X = sideways, Y = up, Z = along-track now ends up + // correctly oriented along the path tangent regardless of curve direction. + auto const localpos = glm::vec3( pos - Origin ); + glm::mat4 m { 1.f }; + m[ 0 ] = glm::vec4( side, 0.f ); + m[ 1 ] = glm::vec4( up, 0.f ); + m[ 2 ] = glm::vec4( tangent, 0.f ); + m[ 3 ] = glm::vec4( localpos, 1.f ); + + if( Offset != glm::vec3( 0.f ) ) { + m = glm::translate( m, Offset ); + } + return m; +} } // anonymous namespace // Resolves the sleeper model + (optional) replacable skin via the global model/material @@ -3764,13 +3816,12 @@ void TTrack::build_sleeper_transforms() // at the segment endpoints. Sampling positions directly is robust for both straight // segments and bezier curves, and it costs us two extra evaluations per sleeper. double const eps = std::min( 0.1, spacing * 0.25 ); - glm::vec3 const world_up { 0.f, 1.f, 0.f }; // user offset is (left/right, forward/back, up/down) in the local frame established by // the basis below (x=right, y=up, z=forward). swap y<->z to match the documented axes. glm::vec3 const local_offset { m_sleeper_offset.x, m_sleeper_offset.z, m_sleeper_offset.y }; - for( auto *segment : segments ) { + for( auto const *segment : segments ) { auto const length = segment->GetLength(); if( length <= 0.0 ) { continue; } // start half a frequency in so the first sleeper doesn't sit on the joint. @@ -3778,55 +3829,12 @@ void TTrack::build_sleeper_transforms() auto const expected = static_cast( std::max( 0.0, ( length - start ) / spacing ) ) + 1u; m_sleeper_local_transforms.reserve( m_sleeper_local_transforms.size() + expected ); - for( double s = start; s < length; s += spacing ) { - glm::dvec3 pos; - glm::vec3 angles; - segment->RaPositionGet( s, pos, angles ); - - // tangent direction via central difference (clamped to the segment endpoints) - auto const s_back = std::max( 0.0, s - eps ); - auto const s_fwd = std::min( length, s + eps ); - glm::dvec3 p_back, p_fwd; - glm::vec3 dummy; - segment->RaPositionGet( s_back, p_back, dummy ); - segment->RaPositionGet( s_fwd, p_fwd, dummy ); - auto tangent = glm::vec3( p_fwd - p_back ); - if( glm::length2( tangent ) < 1e-8f ) { - // degenerate sample (e.g. zero-length sub-segment); skip this position rather - // than emit a junk transform with NaN normals. - continue; + for( std::size_t sleeperidx = 0;; ++sleeperidx ) { + auto const s = start + static_cast( sleeperidx ) * spacing; + if( s >= length ) { break; } + if( auto const transform = sleeper_transform( *segment, s, eps, m_origin, local_offset ) ) { + m_sleeper_local_transforms.emplace_back( *transform ); } - tangent = glm::normalize( tangent ); - - // build an orthonormal basis around the tangent. world up is the reference; if the - // track is almost vertical we fall back to world X so cross() doesn't collapse. - glm::vec3 up_ref = world_up; - if( std::abs( glm::dot( tangent, up_ref ) ) > 0.999f ) { up_ref = glm::vec3( 1.f, 0.f, 0.f ); } - glm::vec3 right = glm::normalize( glm::cross( up_ref, tangent ) ); - glm::vec3 up = glm::cross( tangent, right ); - - // apply track roll (banking) around the tangent / forward axis. - float const roll = angles.x; - if( roll != 0.f ) { - auto const roll_mat = glm::rotate( glm::mat4( 1.f ), roll, tangent ); - right = glm::vec3( roll_mat * glm::vec4( right, 0.f ) ); - up = glm::vec3( roll_mat * glm::vec4( up, 0.f ) ); - } - - // assemble local transform: columns are (right, up, forward, translation). - // a sleeper modelled with X = sideways, Y = up, Z = along-track now ends up - // correctly oriented along the path tangent regardless of curve direction. - auto const localpos = glm::vec3( pos - m_origin ); - glm::mat4 m { 1.f }; - m[ 0 ] = glm::vec4( right, 0.f ); - m[ 1 ] = glm::vec4( up, 0.f ); - m[ 2 ] = glm::vec4( tangent, 0.f ); - m[ 3 ] = glm::vec4( localpos, 1.f ); - - if( local_offset != glm::vec3( 0.f ) ) { - m = glm::translate( m, local_offset ); - } - m_sleeper_local_transforms.emplace_back( m ); } } } From 3ed864812fe1b00f854286fbdf112d4e15d776a2 Mon Sep 17 00:00:00 2001 From: combolek <4743344+combolek@users.noreply.github.com> Date: Sun, 11 Oct 2026 11:42:09 -0700 Subject: [PATCH 207/430] Fix line endings (#211) There where some extra CRs introduced in a recent commit. --- McZapkie/MOVER.h | 4 ++-- McZapkie/Oerlikon_ESt.h | 2 +- application/editoruilayer.cpp | 2 +- application/editoruipanels.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 228834b40..5176eb15b 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1028,7 +1028,7 @@ struct TPowerParameters }; }; inline TPowerParameters() - { + { SourceType = TPowerSource::NotDefined; PowerType = TPowerType::NoPower; RPowerCable.PowerTrans = TPowerType::NoPower; @@ -1093,7 +1093,7 @@ struct TMotorParameters double fi{0.0}; double Isat{0.0}; double fi0{0.0}; // aproksymacja E(n)=fi*n} {dla dizla fi, mfi: predkosci przelozenia biegu <-> - bool AutoSwitch{false}; + bool AutoSwitch{false}; }; struct TUniversalCtrl diff --git a/McZapkie/Oerlikon_ESt.h b/McZapkie/Oerlikon_ESt.h index 224ffecdc..dca531568 100644 --- a/McZapkie/Oerlikon_ESt.h +++ b/McZapkie/Oerlikon_ESt.h @@ -95,7 +95,7 @@ class TPrzeciwposlizg : public TRura // przy napelnianiu - rura, przy poslizgu - public: void SetPoslizg(bool flag); - void Update(double dt) override; + void Update(double dt) override; }; // przekladnik dwustopniowy diff --git a/application/editoruilayer.cpp b/application/editoruilayer.cpp index 7a7c4332f..ee1a7edcf 100644 --- a/application/editoruilayer.cpp +++ b/application/editoruilayer.cpp @@ -1095,4 +1095,4 @@ float editor_ui::rot_val() bool editor_ui::rot_from_last() { return m_functionspanel.rot_from_last; -} \ No newline at end of file +} diff --git a/application/editoruipanels.h b/application/editoruipanels.h index f79946b4b..6ebf21aa3 100644 --- a/application/editoruipanels.h +++ b/application/editoruipanels.h @@ -304,4 +304,4 @@ class functions_panel : public ui_panel scene::group_handle m_grouphandle{null_handle}; // scene group bound to the panel std::string m_groupprefix; std::vector m_grouplines; -}; \ No newline at end of file +}; From 746399c771368300396517af34a62fd6356d4204 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 11 Oct 2026 22:46:31 +0200 Subject: [PATCH 208/430] fix(ui): panels dragged out of the simulator window get no taskbar or alt+tab entries of their own and are owned by the main window on windows (always over it, minimized with it); ctrl+tab of imgui (window switcher, on even without keyboard navigation since 1.91) switched off, it took the key of the boost of the train --- application/uilayer.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/application/uilayer.cpp b/application/uilayer.cpp index 29bbb06c1..2dd771bdd 100644 --- a/application/uilayer.cpp +++ b/application/uilayer.cpp @@ -22,6 +22,7 @@ http://mozilla.org/MPL/2.0/. #include "application/editoruilayer.h" #include "imgui/imgui_impl_glfw.h" +#include "imgui/imgui_internal.h" GLFWwindow *ui_layer::m_window{nullptr}; GLFWwindow *ui_layer::m_keywindow{nullptr}; @@ -174,6 +175,10 @@ void create_viewport_window(ImGuiViewport *Viewport) imgui_create_window(Viewport); if (Viewport->PlatformHandle != nullptr) glfwSetKeyCallback(static_cast(Viewport->PlatformHandle), ui_layer::viewport_key_callback); +#ifdef _WIN32 + if (Viewport->PlatformHandleRaw != nullptr) + ::SetWindowLongPtr(static_cast(Viewport->PlatformHandleRaw), GWLP_HWNDPARENT, reinterpret_cast(ImGui::GetMainViewport()->PlatformHandleRaw)); +#endif } } // namespace @@ -283,6 +288,8 @@ bool ui_layer::init(GLFWwindow *Window) IMGUI_CHECKVERSION(); ImGui::CreateContext(); m_imguiio = &ImGui::GetIO(); + ImGui::GetCurrentContext()->ConfigNavWindowingKeyNext = ImGuiKey_None; + ImGui::GetCurrentContext()->ConfigNavWindowingKeyPrev = ImGuiKey_None; // imgui.ini is read with the first frame, which may be of another mode than the editor editor_ui::register_settings(); @@ -395,6 +402,7 @@ bool ui_layer::init(GLFWwindow *Window) if (Global.ui_viewports && viewportsupport) { m_imguiio->ConfigFlags |= ImGuiConfigFlags_ViewportsEnable; + m_imguiio->ConfigViewportsNoTaskBarIcon = true; auto &platformio{ImGui::GetPlatformIO()}; imgui_create_window = platformio.Platform_CreateWindow; platformio.Platform_CreateWindow = create_viewport_window; From eaf7e787b8561fd54d6c0b7d42dfc11f8516702d Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 11 Oct 2026 23:20:08 +0200 Subject: [PATCH 209/430] fix(gfx): targetfps off by default again, draw range stays at heightbase instead of being driven by measured fps (with vsync on a 60 Hz monitor it sank to half); targetfps in eu07.ini still turns the regulator on --- utilities/Globals.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/Globals.h b/utilities/Globals.h index 8f5748c34..ad216cd96 100644 --- a/utilities/Globals.h +++ b/utilities/Globals.h @@ -144,7 +144,7 @@ struct global_settings { float ShakingMultiplierRL {1.f}; // mnożnik bujania kamera lewo/prawo float ShakingMultiplierUD {1.f}; // mnożnik bujania kamera gora/dol float fDistanceFactor{ 1.f }; // baza do przeliczania odległości dla LoD - float targetfps{ 60.0f }; + float targetfps{ 0.0f }; bool bFullScreen{ false }; bool VSync{ false }; bool bWireFrame{ false }; From 71a19f32fb101e987917c6fe75ad04ee04d26245 Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Mon, 12 Oct 2026 06:54:17 +0200 Subject: [PATCH 210/430] Compare the brake force with 10 kN directly --- vehicle/Driver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 4b6d81ffb..2f40b2e11 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -5906,7 +5906,7 @@ TController::determine_consist_state() { isbraking || bp > 0.4 : // ensure the brakes are sufficiently released when starting to move // once in motion a brake down to 0.4 bar counts as released (UIC), even if its distributor // is still in the lap position while the brake pipe recharges - ( isbraking && bp > 0.4 ) || vehicle->Fb * 0.001 > 10.0 ) { + ( isbraking && bp > 0.4 ) || vehicle->Fb > 10000.0 ) { // 10 kN Ready = false; } // Ra: odluźnianie przeładowanych lokomotyw, ciągniętych na zimno - prowizorka... From be3af9a34d675377206f5dbfc057c12635ffa621 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Wed, 14 Oct 2026 20:15:45 +0200 Subject: [PATCH 211/430] Add dds BC7 algorithm --- model/Texture.cpp | 220 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 212 insertions(+), 8 deletions(-) diff --git a/model/Texture.cpp b/model/Texture.cpp index f5b57ebb7..136846a33 100644 --- a/model/Texture.cpp +++ b/model/Texture.cpp @@ -30,6 +30,17 @@ http://mozilla.org/MPL/2.0/. #define EU07_DEFERRED_TEXTURE_UPLOAD +#ifndef FOURCC_DX10 +#define FOURCC_DX10 (MAKEFOURCC('D','X','1','0')) +#endif +// BC7, core since GL 4.2 (ARB_texture_compression_bptc), the bundled glad is generated for 3.3 +#ifndef GL_COMPRESSED_RGBA_BPTC_UNORM +#define GL_COMPRESSED_RGBA_BPTC_UNORM 0x8E8C +#endif +#ifndef GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM +#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM 0x8E8D +#endif + // texture data read by a worker thread. the texture itself is only touched by the main thread, // which takes the data over when the texture is created on the gl side struct texture_request { @@ -156,6 +167,142 @@ private: bool m_stop { false }; }; +// dxgi formats and alpha modes of the dds dx10 extended header +constexpr std::uint32_t dxgi_format_bc7_typeless { 97 }; +constexpr std::uint32_t dxgi_format_bc7_unorm { 98 }; +constexpr std::uint32_t dxgi_format_bc7_unorm_srgb { 99 }; +constexpr std::uint32_t dds_alpha_mode_unknown { 0 }; +constexpr std::uint32_t dds_alpha_mode_opaque { 3 }; + +// returns Count bits starting at bit Offset of a 128-bit BC7 block +std::uint32_t bc7_bits( unsigned char const *Block, int const Offset, int const Count ) { + std::uint32_t result { 0 }; + for( int bit = 0; bit < Count; ++bit ) { + auto const idx { Offset + bit }; + result |= ( ( Block[ idx >> 3 ] >> ( idx & 7 ) ) & 1u ) << bit; + } + return result; } + +// expands a BC7 endpoint of given precision to 8 bits +std::uint32_t bc7_expand( std::uint32_t const Value, int const Bits ) { + return ( Value << ( 8 - Bits ) ) | ( Value >> ( 2 * Bits - 8 ) ); } + +// checks whether any texel of a BC7 block can come out noticeably translucent. +// it looks at the endpoints the alpha is interpolated between, so a translucent block is never reported as opaque +bool bc7_block_has_alpha( unsigned char const *Block ) { + // encoders sharing p-bits between colour and alpha (modes 6 and 7) can leave opaque alpha at 254 or 251 + constexpr std::uint32_t opaque { 250 }; + if( Block[ 0 ] == 0 ) { + // reserved mode, decodes to transparent black + return true; + } + int mode { 0 }; + while( ( Block[ 0 ] & ( 1 << mode ) ) == 0 ) { + ++mode; + } + switch( mode ) { + case 4: + case 5: { + // single subset with separate alpha endpoints. rotation swaps alpha with one of the colour channels + auto const rotation { static_cast( bc7_bits( Block, mode + 1, 2 ) ) }; + auto const colourbits { mode == 4 ? 5 : 7 }; + auto const alphabits { mode == 4 ? 6 : 8 }; + auto const bits { rotation == 0 ? alphabits : colourbits }; + auto const start { rotation == 0 ? 8 + 6 * colourbits : 8 + 2 * colourbits * ( rotation - 1 ) }; + for( int endpoint = 0; endpoint < 2; ++endpoint ) { + if( bc7_expand( bc7_bits( Block, start + endpoint * bits, bits ), bits ) < opaque ) { + return true; + } + } + return false; + } + case 6: { + // 7-bit alpha endpoints, each extended with its own p-bit + for( int endpoint = 0; endpoint < 2; ++endpoint ) { + auto const alpha { ( bc7_bits( Block, 49 + endpoint * 7, 7 ) << 1 ) | bc7_bits( Block, 63 + endpoint, 1 ) }; + if( alpha < opaque ) { + return true; + } + } + return false; + } + case 7: { + // two subsets, 5-bit alpha endpoints extended with their p-bits to 6 bits + for( int endpoint = 0; endpoint < 4; ++endpoint ) { + auto const alpha { ( bc7_bits( Block, 74 + endpoint * 5, 5 ) << 1 ) | bc7_bits( Block, 94 + endpoint, 1 ) }; + if( bc7_expand( alpha, 6 ) < opaque ) { + return true; + } + } + return false; + } + default: { + // modes 0-3 don't store alpha + return false; + } + } } + +// picks data components of a BC7 texture. a BC7 file doesn't tell whether alpha is used the way DXT1/DXT5 do, +// so unless the dx10 header states the alpha mode, a small mipmap is checked for translucent texels. +// the mipmap is always read from the file, so the result doesn't depend on whether the texture data is streamed +GLint bc7_components( std::istream &File, std::streamoff const Start, std::size_t const Datasize, unsigned int Width, unsigned int Height, unsigned int const Mapcount, std::uint32_t const Alphamode ) { + + if( Alphamode == dds_alpha_mode_opaque ) { return GL_RGB; } + if( Alphamode != dds_alpha_mode_unknown ) { return GL_RGBA; } + + // up to 256x256, small enough to read quickly while translucent areas a few texels wide still show in it + auto const blocks = [ & ]() { return static_cast( ( Width + 3 ) / 4 ) * ( ( Height + 3 ) / 4 ); }; + std::size_t offset { 0 }; + for( unsigned int level = 1; ( level < Mapcount ) && ( std::max( Width, Height ) > 256 ); ++level ) { + offset += blocks() * 16; + Width = std::max( Width / 2, 1u ); + Height = std::max( Height / 2, 1u ); + } + std::vector probe( blocks() * 16 ); + if( offset + probe.size() > Datasize ) { + // malformed file, err on the side of translucency like DXT5 does + return GL_RGBA; + } + auto const position { File.tellg() }; + File.seekg( Start + static_cast( offset ) ); + File.read( reinterpret_cast( probe.data() ), probe.size() ); + auto const readok { File.good() }; + File.clear(); + File.seekg( position ); + if( false == readok ) { + return GL_RGBA; + } + for( std::size_t block = 0; block < probe.size(); block += 16 ) { + if( bc7_block_has_alpha( &probe[ block ] ) ) { + return GL_RGBA; + } + } + return GL_RGB; } + +// BC7 is core since GL 4.2, older contexts and GLES need the extension. requires current gl context +bool bptc_supported() { + static bool const supported = []() { + if( ( false == Global.gfx_usegles ) + && ( ( GLVersion.major > 4 ) || ( ( GLVersion.major == 4 ) && ( GLVersion.minor >= 2 ) ) ) ) { + return true; + } + GLint count { 0 }; + ::glGetIntegerv( GL_NUM_EXTENSIONS, &count ); + for( GLint idx = 0; idx < count; ++idx ) { + auto const *extension { reinterpret_cast( ::glGetStringi( GL_EXTENSIONS, idx ) ) }; + if( extension == nullptr ) { + continue; + } + std::string_view const name { extension }; + if( ( name == "GL_ARB_texture_compression_bptc" ) + || ( name == "GL_EXT_texture_compression_bptc" ) ) { + return true; + } + } + return false; + }(); + return supported; } + } // namespace std::array opengl_texture::units = { 0 }; @@ -171,6 +318,8 @@ std::unordered_map opengl_texture::precompressed_formats = { GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, 8 }, { GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, 16 }, { GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, 16 }, + { GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM, 16 }, + { GL_COMPRESSED_RGBA_BPTC_UNORM, 16 }, }; std::unordered_map opengl_texture::drivercompressed_formats = @@ -210,6 +359,12 @@ std::unordered_map> opengl_texture::mapp { GL_RGB, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT }, { GL_RG, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT }, { GL_RED, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT } } }, + { GL_COMPRESSED_RGBA_BPTC_UNORM, { { GL_SRGB_ALPHA, GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM }, + { GL_SRGB, GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM }, + { GL_RGBA, GL_COMPRESSED_RGBA_BPTC_UNORM }, + { GL_RGB, GL_COMPRESSED_RGBA_BPTC_UNORM }, + { GL_RG, GL_COMPRESSED_RGBA_BPTC_UNORM }, + { GL_RED, GL_COMPRESSED_RGBA_BPTC_UNORM } } }, { GL_RGBA, { { GL_SRGB_ALPHA, GL_SRGB8_ALPHA8 }, { GL_SRGB, GL_SRGB8 }, { GL_RGBA, GL_RGBA8 }, @@ -651,9 +806,26 @@ opengl_texture::load_DDS() { DDSURFACEDESC2 ddsd = deserialize_ddsd(file); filesize -= 124; + // formats without a legacy fourcc code (BC7) are described by the dx10 extended header + std::uint32_t dxgiformat { 0 }; + std::uint32_t alphamode { dds_alpha_mode_unknown }; + if( ddsd.ddpfPixelFormat.dwFourCC == FOURCC_DX10 ) { + dxgiformat = sn_utils::ld_uint32( file ); + sn_utils::ld_uint32( file ); // resource dimension + sn_utils::ld_uint32( file ); // misc flags + auto const arraysize { sn_utils::ld_uint32( file ) }; + alphamode = sn_utils::ld_uint32( file ) & 0x7; // misc flags 2, the lowest bits hold the alpha mode + filesize -= 20; + if( arraysize > 1 ) { + WriteLog( "Bad texture: texture arrays aren't supported, in file \"" + name + "\"", logtype::texture ); + data_state = resource_state::failed; + return; + } + } + // - // This .dds loader supports the loading of compressed formats DXT1, DXT3 - // and DXT5. + // This .dds loader supports the loading of compressed formats DXT1, DXT3, + // DXT5 and BC7. // switch (ddsd.ddpfPixelFormat.dwFourCC) @@ -673,6 +845,17 @@ opengl_texture::load_DDS() { data_format = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT; break; + case FOURCC_DX10: + if( ( dxgiformat != dxgi_format_bc7_typeless ) + && ( dxgiformat != dxgi_format_bc7_unorm ) + && ( dxgiformat != dxgi_format_bc7_unorm_srgb ) ) { + data_state = resource_state::failed; + return; + } + // BC7's compression ratio is 4:1. srgb is picked by the material, same as for DXTn + data_format = GL_COMPRESSED_RGBA_BPTC_UNORM; + break; + default: data_state = resource_state::failed; return; @@ -709,13 +892,26 @@ opengl_texture::load_DDS() { data_state = resource_state::failed; return; } + // dds data with top-left origin is flipped block by block. BC7 blocks can't be flipped that way, + // BC7 textures have to be stored with bottom-left origin regardless of the setting + bool const flip { Global.dds_upper_origin && ( data_format != GL_COMPRESSED_RGBA_BPTC_UNORM ) }; + if( Global.dds_upper_origin && ( false == flip ) ) { + WriteLog( "Warning: BC7 texture \"" + name + "\" can't be flipped for ddsupperorigin, it's loaded as stored", logtype::texture ); + } + GLint const components { ( + data_format == GL_COMPRESSED_RGBA_BPTC_UNORM ? + bc7_components( file, static_cast( file.tellg() ) + offset, datasize, data_width, data_height, data_mapcount, alphamode ) : + ddsd.ddpfPixelFormat.dwFourCC == FOURCC_DXT1 ? + GL_RGB : + GL_RGBA ) }; + if( true == Global.gfx_texture_streaming ) { // the data is read by a worker thread, everything else about the texture is known already request = std::make_shared(); request->file = name + type; request->offset = static_cast( file.tellg() ) + offset; request->size = datasize; - request->flip = Global.dds_upper_origin; + request->flip = flip; request->fourcc = ddsd.ddpfPixelFormat.dwFourCC; request->width = data_width; request->height = data_height; @@ -723,8 +919,7 @@ opengl_texture::load_DDS() { request->blocksize = blockSize; texture_loader::instance().submit( request ); - data_components = - ddsd.ddpfPixelFormat.dwFourCC == FOURCC_DXT1 ? GL_RGB : GL_RGBA; + data_components = components; data_state = resource_state::loading; @@ -744,7 +939,7 @@ opengl_texture::load_DDS() { // we're storing texture data internally with bottom-left origin, // while DDS stores it with top-left origin. we need to flip it. - if (Global.dds_upper_origin) + if (flip) { char *mipmap = (char*)&data[0]; int mapcount = data_mapcount, @@ -766,8 +961,7 @@ opengl_texture::load_DDS() { } } - data_components = - ddsd.ddpfPixelFormat.dwFourCC == FOURCC_DXT1 ? GL_RGB : GL_RGBA; + data_components = components; data_state = resource_state::good; @@ -1099,6 +1293,16 @@ opengl_texture::create( bool const Static ) { return false; } + if( ( data_format == GL_COMPRESSED_RGBA_BPTC_UNORM ) + && ( false == bptc_supported() ) ) { + ErrorLog( "Bad texture: \"" + name + "\" uses BC7 compression, which the graphics driver doesn't support", logtype::texture ); + data = std::vector(); + data_state = resource_state::failed; + // NOTE: temporary workaround for texture assignment errors, same as in load() + id = 0; + return false; + } + // TODO: consider creating and storing low-res version of the texture if it's ever unloaded from the gfx card, // as a placeholder until it can be loaded again if( id == -1 ) { From b400255dae1287af57baf4cbed11a6aefff08a91 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Thu, 15 Oct 2026 17:56:41 +0200 Subject: [PATCH 212/430] Test/physics unit tests (#213) * build: doctest 2.4.11 in ref/ Single header test framework (MIT), vendored like the other libraries in ref/ so the tests need nothing extra installed on the CI runners. * refactor(physics): read vehicle definitions from text as well as files TMoverParameters::LoadFIZ(path) opens the file and hands the parser over to LoadFIZ_Parse(), which holds what LoadFIZ() did with it before. The new LoadFIZ_Text() reads the same format from a string, so a definition can be made up in memory, e.g. by a unit test. No change in behaviour for files. * build: the simulation core as a library the game links The vehicle physics (McZapkie), the vehicle definition parser and the helpers they use build as eu07_core, a static library the game links, so the unit tests to come can link the very same objects instead of compiling their own copy with their own settings. The game's build settings (include dirs, definitions, compile options, libraries) move from the executable to eu07_settings, an interface target the library links publicly, so the game, the library and later the tests all build with the same ones. What only the executable needs stays with it: /MAP, /LARGEADDRESSAWARE, output dirs, the precompiled header, runtime DLL copying, the crash reporter and the experimental renderer. No change in what the game builds or links. * test: unit tests of the simulation core, run as part of the build eu07_unit_tests: C++ tests (doctest) of the simulation, which set up the conditions, run the code and check the outcome. No game data, no window. - the code under test is the core library (eu07_core), the very objects the game links, built with the game's settings; engine_stubs.cpp stands in for the logs, settings and scenery layers the library reaches for. python gets linked with the settings but isn't needed to run the tests - test vehicles are JSON definitions in tests/unit/data, with the sections and keys of the game's vehicle definitions (tables as "rows", _keys are comments), changed by the tests where needed and loaded from memory by the game's own loader; an unknown section is an error rather than silently skipped - test::vehicle creates the mover the way TDynamicObject::Init() does and steps it the way the simulation loop does, on a straight track of given friction and gradient, optionally holding the brake pipe pressure the way a coupled locomotive would - the random numbers of the simulation are reseeded before every test case, so a test gives the same result alone (IDE) or among the others - building the game runs the tests at the end, once the game is linked, and prints a one line summary ("Unit tests: 11/11 passed (80 checks)"). A failure prints the full report and fails the build, in CI and locally alike, and removes the game binary so the next build reruns them. A change of the tests alone relinks the game so they run (Ninja and Makefile generators). -DWITH_TESTS=OFF leaves them out - first tests: definitions reach the vehicle, KE service application and release, deeper reduction brakes harder, every implemented distributor valve charges/applies/releases, service braking stops a moving wagon * test: stub basic_node::radius_() for GCC and Clang The Linux build failed to link the unit tests: undefined reference to scene::basic_node::radius_() from basic_node's vtable in engine_stubs.o. basic_node has no key function for the Itanium C++ ABI (tooltip() is declared plain but defined inline in the header), so GCC and Clang emit its vtable in every unit using scenenode.h, and the vtable needs radius_(), defined in scenenode.cpp, which the tests don't link. MSVC emits vtables differently, so the Windows build linked. * test: test vehicle definitions load with GCC and Clang All the tests reading a definition failed on Linux with "unknown vehicle definition section 0": the parsed definition was brace-initialised (auto const json{parse(...)}), which GCC and Clang take for the initializer list constructor of nlohmann::json, making an array holding the definition, while MSVC copies it. Initialise it with =, and require the definition to be a JSON object. * test: SonarCloud issues of the unit tests - test::definition_error for unusable test vehicle definitions instead of std::runtime_error (S112) - the rows of a table section written by a function of their own, less nesting in definition::text() (S134) - std::less<> for the section table (S6045) - comments in the empty methods of the reseeding listener and stub (S1186) - NOSONAR where the engine's headers fix the stubs: the extern globals and the member function signatures (S5421, S5817, S1238) - NOSONAR on LoadFIZ_Parse(): the cognitive complexity is the former body of LoadFIZ(), moved as it was (S3776) - a comment Sonar took for code reworded (S125) --- CMakeLists.txt | 128 +- McZapkie/MOVER.h | 4 + McZapkie/Mover.cpp | 48 +- ref/doctest/LICENSE.txt | 21 + ref/doctest/doctest.h | 7106 ++++++++++++++++++++++++++++++++ tests/unit/CMakeLists.txt | 31 + tests/unit/README.md | 68 + tests/unit/data/wagon.json | 12 + tests/unit/engine_stubs.cpp | 81 + tests/unit/main.cpp | 40 + tests/unit/run_tests.cmake | 27 + tests/unit/test_brakes.cpp | 93 + tests/unit/test_definition.cpp | 45 + tests/unit/vehicle.cpp | 187 + tests/unit/vehicle.h | 71 + 15 files changed, 7899 insertions(+), 63 deletions(-) create mode 100644 ref/doctest/LICENSE.txt create mode 100644 ref/doctest/doctest.h create mode 100644 tests/unit/CMakeLists.txt create mode 100644 tests/unit/README.md create mode 100644 tests/unit/data/wagon.json create mode 100644 tests/unit/engine_stubs.cpp create mode 100644 tests/unit/main.cpp create mode 100644 tests/unit/run_tests.cmake create mode 100644 tests/unit/test_brakes.cpp create mode 100644 tests/unit/test_definition.cpp create mode 100644 tests/unit/vehicle.cpp create mode 100644 tests/unit/vehicle.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 62b41aa55..22982e64d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,6 +77,7 @@ option(WITH_ZMQ "Compile with cppzmq" OFF) option(WITH_CRASHPAD "Compile with crashpad" OFF) option(WITH_DISCORD_RPC "Compile with DISCORD RICH PRESENCE" ON) option(USE_LTO "Use link-time optimization" OFF) +option(WITH_TESTS "Build and run the unit tests with the game, a failing test fails the build" ON) option(WITH_BETTER_RENDERER "Experimental multi-backend renderer based on NVRHI" OFF) option(GENERATE_PDB "Generate executable with program debugging symbols" ON) option(ENABLE_MCC "Enable multicore compilation" ON) @@ -119,15 +120,10 @@ set(SOURCES "vehicle/Gauge.cpp" "utilities/Globals.cpp" "utilities/Logs.cpp" -"McZapkie/friction.cpp" -"McZapkie/hamulce.cpp" -"McZapkie/Mover.cpp" -"McZapkie/Oerlikon_ESt.cpp" "model/MdlMngr.cpp" "world/MemCell.cpp" "model/Model3d.cpp" "world/mtable.cpp" -"utilities/parser.cpp" "rendering/nullrenderer.cpp" "rendering/renderer.cpp" "model/ResourceManager.cpp" @@ -159,7 +155,6 @@ set(SOURCES "audio/audio.cpp" "audio/audiorenderer.cpp" "utilities/motiontelemetry.cpp" -"utilities/utilities.cpp" "application/uitranscripts.cpp" "world/station.cpp" "application/application.cpp" @@ -223,7 +218,6 @@ set(SOURCES "utilities/dictionary.cpp" "rendering/particles.cpp" "utilities/headtrack.cpp" -"scripting/ladderlogic.cpp" "rendering/geometrybank.cpp" "rendering/openglcolor.cpp" "simulation/simulationsounds.cpp" @@ -453,11 +447,33 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC) add_compile_options("/utf-8") endif() +# the build settings of the game: include dirs, definitions, compile options and libraries. the game, +# its core library and the unit tests all build with the same ones +add_library(eu07_settings INTERFACE) + +# the parts of the simulation the game shares with the unit tests: the vehicle physics, the vehicle +# definition parser and the helpers they use. built once, and tested as the game uses them +set(CORE_SOURCES +"McZapkie/friction.cpp" +"McZapkie/hamulce.cpp" +"McZapkie/Mover.cpp" +"McZapkie/Oerlikon_ESt.cpp" +"utilities/parser.cpp" +"utilities/utilities.cpp" +"scripting/ladderlogic.cpp" +) +add_library(eu07_core STATIC ${CORE_SOURCES}) +target_link_libraries(eu07_core PUBLIC eu07_settings) +set_target_properties(eu07_core PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + FOLDER "libraries") + add_executable(${PROJECT_NAME} ${SOURCES} ${HEADERS}) +target_link_libraries(${PROJECT_NAME} eu07_core) -target_compile_definitions(${PROJECT_NAME} PRIVATE ${DEFINITIONS}) +target_compile_definitions(eu07_settings INTERFACE ${DEFINITIONS}) -target_include_directories(${PROJECT_NAME} PRIVATE +target_include_directories(eu07_settings INTERFACE "." "Console" "McZapkie" @@ -478,7 +494,7 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC) # /wd4996: disable "deprecation" warnings # /wd4244: disable warnings for conversion with possible loss of data # /wd5033: disable because it is all over Python headers - set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/wd4996 /wd4244 /wd5033") + target_compile_options(eu07_settings INTERFACE /wd4996 /wd4244 /wd5033) set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "/LARGEADDRESSAWARE") endif() @@ -494,7 +510,7 @@ set_target_properties( ${PROJECT_NAME} check_cxx_symbol_exists(__GNUC__ "" COMPILER_HAVE_GNUC) if (COMPILER_HAVE_GNUC) - set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-fvisibility=hidden") + target_compile_options(eu07_settings INTERFACE -fvisibility=hidden) endif() if(NOT ${CMAKE_VERSION} VERSION_LESS "3.16.0") @@ -502,6 +518,7 @@ if(NOT ${CMAKE_VERSION} VERSION_LESS "3.16.0") if (USE_PCH) target_precompile_headers(${PROJECT_NAME} PRIVATE "$<$:${CMAKE_CURRENT_SOURCE_DIR}/stdafx.h>") + target_precompile_headers(eu07_core PRIVATE "$<$:${CMAKE_CURRENT_SOURCE_DIR}/stdafx.h>") set_source_files_properties("/glad/src/glad.c" "ref/dds-ktx/src/dds-ktx.c" "ref/zstd/zstd.c" "stb/stb_image.c" "imgui/imgui.cpp" "imgui/imgui_demo.cpp" "imgui/imgui_draw.cpp" "imgui/imgui_widgets.cpp" "imgui/imgui_tables.cpp" "imgui/imgui_impl_glfw.cpp" "imgui/ImGuizmo.cpp" PROPERTIES SKIP_PRECOMPILE_HEADERS TRUE) @@ -509,12 +526,12 @@ if(NOT ${CMAKE_VERSION} VERSION_LESS "3.16.0") endif() if (USE_LTO) - set_property(TARGET ${PROJECT_NAME} PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) + set_property(TARGET ${PROJECT_NAME} eu07_core PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) endif() if (WITH_OPENVR) - target_include_directories(${PROJECT_NAME} PRIVATE ${OPENVR_INCLUDE_DIR}) - target_link_libraries(${PROJECT_NAME} ${OPENVR_LIBRARY}) + target_include_directories(eu07_settings INTERFACE ${OPENVR_INCLUDE_DIR}) + target_link_libraries(eu07_settings INTERFACE ${OPENVR_LIBRARY}) endif() if (WITH_CRASHPAD) @@ -529,12 +546,12 @@ if (WITH_CRASHPAD) endif() endif() -target_link_libraries(${PROJECT_NAME} glfw) +target_link_libraries(eu07_settings INTERFACE glfw) if(WITH_PYTHON) find_package(Python3 3.14 REQUIRED COMPONENTS Development) - target_include_directories(${PROJECT_NAME} PRIVATE ${Python3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} ${Python3_LIBRARIES}) + target_include_directories(eu07_settings INTERFACE ${Python3_INCLUDE_DIRS}) + target_link_libraries(eu07_settings INTERFACE ${Python3_LIBRARIES}) if(WIN32) # Python3_ROOT_DIR is only an input hint and is not populated by @@ -552,78 +569,78 @@ endif() if (NOT WIN32) find_package(PNG 1.6 REQUIRED) - target_link_libraries(${PROJECT_NAME} PNG::PNG) + target_link_libraries(eu07_settings INTERFACE PNG::PNG) else() include_directories(${PNG_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} ${PNG_LIBRARIES}) + target_link_libraries(eu07_settings INTERFACE ${PNG_LIBRARIES}) endif() find_package(Threads REQUIRED) -target_link_libraries(${PROJECT_NAME} Threads::Threads) +target_link_libraries(eu07_settings INTERFACE Threads::Threads) find_package(GLM REQUIRED) -target_include_directories(${PROJECT_NAME} PRIVATE ${GLM_INCLUDE_DIR}) +target_include_directories(eu07_settings INTERFACE ${GLM_INCLUDE_DIR}) # JSON lib add_subdirectory(ref/json) -target_link_libraries(${PROJECT_NAME} nlohmann_json::nlohmann_json) -target_include_directories(${PROJECT_NAME} PRIVATE ${NLOHMANN_JSON_INCLUDE_INSTALL_DIR}) +target_link_libraries(eu07_settings INTERFACE nlohmann_json::nlohmann_json) +target_include_directories(eu07_settings INTERFACE ${NLOHMANN_JSON_INCLUDE_INSTALL_DIR}) if (WITH_DISCORD_RPC) add_subdirectory(ref/discord-rpc) set_target_properties(discord-rpc PROPERTIES FOLDER "libraries") - target_link_libraries(${PROJECT_NAME} discord-rpc) + target_link_libraries(eu07_settings INTERFACE discord-rpc) # Add the include directory so the compiler can find discord_rpc.h - target_include_directories(${PROJECT_NAME} PUBLIC + target_include_directories(eu07_settings INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/ref/discord-rpc/include" ) - target_compile_definitions(${PROJECT_NAME} PUBLIC WITH_DISCORD_RPC=1) + target_compile_definitions(eu07_settings INTERFACE WITH_DISCORD_RPC=1) else() - target_compile_definitions(${PROJECT_NAME} PUBLIC WITH_DISCORD_RPC=0) + target_compile_definitions(eu07_settings INTERFACE WITH_DISCORD_RPC=0) endif() find_package(OpenAL REQUIRED) if (TARGET OpenAL::OpenAL) - target_link_libraries(${PROJECT_NAME} OpenAL::OpenAL) + target_link_libraries(eu07_settings INTERFACE OpenAL::OpenAL) else() - target_include_directories(${PROJECT_NAME} PRIVATE ${OPENAL_INCLUDE_DIR}) - target_link_libraries(${PROJECT_NAME} ${OPENAL_LIBRARY}) + target_include_directories(eu07_settings INTERFACE ${OPENAL_INCLUDE_DIR}) + target_link_libraries(eu07_settings INTERFACE ${OPENAL_LIBRARY}) endif() find_package(SndFile REQUIRED) -target_link_libraries(${PROJECT_NAME} SndFile::sndfile) +target_link_libraries(eu07_settings INTERFACE SndFile::sndfile) if (WITH_LUA) find_package(LuaJIT REQUIRED) - target_include_directories(${PROJECT_NAME} PRIVATE ${LUAJIT_INCLUDE_DIR}) - target_link_libraries(${PROJECT_NAME} ${LUAJIT_LIBRARIES}) + target_include_directories(eu07_settings INTERFACE ${LUAJIT_INCLUDE_DIR}) + target_link_libraries(eu07_settings INTERFACE ${LUAJIT_LIBRARIES}) endif() if (WITH_UART) find_package(libserialport REQUIRED) - target_include_directories(${PROJECT_NAME} PRIVATE ${libserialport_INCLUDE_DIR}) - target_link_libraries(${PROJECT_NAME} ${libserialport_LIBRARY}) + target_include_directories(eu07_settings INTERFACE ${libserialport_INCLUDE_DIR}) + target_link_libraries(eu07_settings INTERFACE ${libserialport_LIBRARY}) endif() find_package(ASIO REQUIRED) -target_link_libraries(${PROJECT_NAME} asio::asio) +target_link_libraries(eu07_settings INTERFACE asio::asio) if (WIN32) - target_link_libraries(${PROJECT_NAME} ws2_32) + target_link_libraries(eu07_settings INTERFACE ws2_32) endif() # http client of the editor's geoportal orthophoto layer: WinHTTP on Windows, libcurl elsewhere when available if (WIN32) - target_link_libraries(${PROJECT_NAME} winhttp) + target_link_libraries(eu07_settings INTERFACE winhttp) else() find_package(CURL QUIET) if (CURL_FOUND) - target_link_libraries(${PROJECT_NAME} CURL::libcurl) - target_compile_definitions(${PROJECT_NAME} PRIVATE EU07_WITH_CURL) + target_link_libraries(eu07_settings INTERFACE CURL::libcurl) + target_compile_definitions(eu07_settings INTERFACE EU07_WITH_CURL) else() message(STATUS "libcurl not found: the editor's orthophoto layer will only show cached tiles") endif() @@ -631,8 +648,8 @@ endif() if (WITH_ZMQ) find_package(cppzmq REQUIRED) - target_include_directories(${PROJECT_NAME} PRIVATE ${cppzmq_INCLUDE_DIR}) - target_link_libraries(${PROJECT_NAME} ${cppzmq_LIBRARY}) + target_include_directories(eu07_settings INTERFACE ${cppzmq_INCLUDE_DIR}) + target_link_libraries(eu07_settings INTERFACE ${cppzmq_LIBRARY}) endif() if (WIN32) @@ -663,7 +680,7 @@ endif () if (NOT TARGET yaml-cpp) add_subdirectory("betterRenderer/thirdparty/yaml-cpp" "${CMAKE_CURRENT_BINARY_DIR}/yaml-cpp" EXCLUDE_FROM_ALL) endif () -target_link_libraries(${PROJECT_NAME} yaml-cpp) +target_link_libraries(eu07_settings INTERFACE yaml-cpp) # Enable compiling with debug symbols @@ -678,7 +695,7 @@ if(GENERATE_PDB) add_link_options(/DEBUG /MAP) # Ensure that the PCH is built with the correct runtime library for each configuration - set_target_properties(${PROJECT_NAME} PROPERTIES + set_target_properties(${PROJECT_NAME} eu07_core PROPERTIES COMPILE_OPTIONS "$<$:/MDd>$<$:/MD>") else() # GCC/Clang (ensure -g is set for all configurations) @@ -694,8 +711,27 @@ endif() if(ENABLE_AVX2) message(STATUS "Enabling AVX2 instruction set.") if (MSVC) - target_compile_options(${PROJECT_NAME} PRIVATE /arch:AVX2) + target_compile_options(eu07_settings INTERFACE /arch:AVX2) else() - target_compile_options(${PROJECT_NAME} PRIVATE -mavx2) + target_compile_options(eu07_settings INTERFACE -mavx2) endif() +endif() + +if(WITH_TESTS) + enable_testing() + add_subdirectory(tests/unit) + # the unit tests run at the end of building the game, once it's linked: a failing one fails the build + # (and removes the game binary, so the next build links it again and reruns them) + add_dependencies(${PROJECT_NAME} eu07_unit_tests) + add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD + COMMAND ${CMAKE_COMMAND} + -DTESTS=$ + -DGAME=$ + -P "${CMAKE_CURRENT_SOURCE_DIR}/tests/unit/run_tests.cmake" + COMMENT "Running the unit tests" + VERBATIM) + # a change of the tests alone links the game again, so they run (Ninja and Makefile generators; + # Visual Studio builds rerun them with the next change of the game) + set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY LINK_DEPENDS + $ ${UNIT_TEST_DATA} "${CMAKE_CURRENT_SOURCE_DIR}/tests/unit/run_tests.cmake") endif() \ No newline at end of file diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 5176eb15b..29b3e75cd 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -13,6 +13,8 @@ http://mozilla.org/MPL/2.0/. #include #include "hamulce.h" #include "scripting/ladderlogic.h" + +class cParser; /* MaSzyna EU07 locomotive simulator Copyright (C) 2001-2004 Maciej Czapkiewicz and others @@ -2534,10 +2536,12 @@ class TMoverParameters /*funkcje ladujace pliki opisujace pojazd*/ bool LoadFIZ(std::string const &chkpath); // Q 20160717 bool LoadChkFile(std::string chkpath); + bool LoadFIZ_Text(std::string const &Text); // the same, from text in the .fiz format bool CheckLocomotiveParameters(bool ReadyFlag, int Dir); std::string EngineDescription(int what) const; private: + bool LoadFIZ_Parse(cParser &Parser); // reads the definition from either of the above void LoadFIZ_Param(std::string const &line); void LoadFIZ_Load(std::string const &line); void LoadFIZ_Dimensions(std::string const &line); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 16fe30667..3b5b62153 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -9559,6 +9559,37 @@ bool TMoverParameters::LoadFIZ(std::string const &chkpath) chkPath = chkpath; // assign class path for reloading ConversionError = 666; + std::string file = TypeName + ".fiz"; + + WriteLog("LOAD FIZ FROM " + file); + /* + std::ifstream in(file); + if (!in.is_open()) + { + WriteLog("E8 - FIZ FILE NOT EXIST."); + return false; + } + */ + cParser fizparser(file, cParser::buffer_FILE, chkpath); + if (false == fizparser.ok()) + { + WriteLog("E8 - FIZ FILE NOT EXIST."); + return false; + } + + return LoadFIZ_Parse(fizparser); +} + +// reads the vehicle definition from text in the .fiz format, e.g. one made up by a unit test +bool TMoverParameters::LoadFIZ_Text(std::string const &Text) +{ + ConversionError = 666; + cParser fizparser(Text, cParser::buffer_TEXT); + return LoadFIZ_Parse(fizparser); +} + +bool TMoverParameters::LoadFIZ_Parse(cParser &fizparser) // NOSONAR the former body of LoadFIZ(), moved as it was; splitting it up is a change of its own +{ LISTLINE = 0; startBPT = false; startMPT = false; @@ -9577,23 +9608,6 @@ bool TMoverParameters::LoadFIZ(std::string const &chkpath) startDimmerList = false; startLIGHTSLIST = false; startCOMPRESSORLIST = false; - std::string file = TypeName + ".fiz"; - - WriteLog("LOAD FIZ FROM " + file); - /* - std::ifstream in(file); - if (!in.is_open()) - { - WriteLog("E8 - FIZ FILE NOT EXIST."); - return false; - } - */ - cParser fizparser(file, cParser::buffer_FILE, chkpath); - if (false == fizparser.ok()) - { - WriteLog("E8 - FIZ FILE NOT EXIST."); - return false; - } ConversionError = 0; diff --git a/ref/doctest/LICENSE.txt b/ref/doctest/LICENSE.txt new file mode 100644 index 000000000..5ae0eb105 --- /dev/null +++ b/ref/doctest/LICENSE.txt @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2016-2023 Viktor Kirilov + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/ref/doctest/doctest.h b/ref/doctest/doctest.h new file mode 100644 index 000000000..5c754cde0 --- /dev/null +++ b/ref/doctest/doctest.h @@ -0,0 +1,7106 @@ +// ====================================================================== lgtm [cpp/missing-header-guard] +// == DO NOT MODIFY THIS FILE BY HAND - IT IS AUTO GENERATED BY CMAKE! == +// ====================================================================== +// +// doctest.h - the lightest feature-rich C++ single-header testing framework for unit tests and TDD +// +// Copyright (c) 2016-2023 Viktor Kirilov +// +// Distributed under the MIT Software License +// See accompanying file LICENSE.txt or copy at +// https://opensource.org/licenses/MIT +// +// The documentation can be found at the library's page: +// https://github.com/doctest/doctest/blob/master/doc/markdown/readme.md +// +// ================================================================================================= +// ================================================================================================= +// ================================================================================================= +// +// The library is heavily influenced by Catch - https://github.com/catchorg/Catch2 +// which uses the Boost Software License - Version 1.0 +// see here - https://github.com/catchorg/Catch2/blob/master/LICENSE.txt +// +// The concept of subcases (sections in Catch) and expression decomposition are from there. +// Some parts of the code are taken directly: +// - stringification - the detection of "ostream& operator<<(ostream&, const T&)" and StringMaker<> +// - the Approx() helper class for floating point comparison +// - colors in the console +// - breaking into a debugger +// - signal / SEH handling +// - timer +// - XmlWriter class - thanks to Phil Nash for allowing the direct reuse (AKA copy/paste) +// +// The expression decomposing templates are taken from lest - https://github.com/martinmoene/lest +// which uses the Boost Software License - Version 1.0 +// see here - https://github.com/martinmoene/lest/blob/master/LICENSE.txt +// +// ================================================================================================= +// ================================================================================================= +// ================================================================================================= + +#ifndef DOCTEST_LIBRARY_INCLUDED +#define DOCTEST_LIBRARY_INCLUDED + +// ================================================================================================= +// == VERSION ====================================================================================== +// ================================================================================================= + +#define DOCTEST_VERSION_MAJOR 2 +#define DOCTEST_VERSION_MINOR 4 +#define DOCTEST_VERSION_PATCH 11 + +// util we need here +#define DOCTEST_TOSTR_IMPL(x) #x +#define DOCTEST_TOSTR(x) DOCTEST_TOSTR_IMPL(x) + +#define DOCTEST_VERSION_STR \ + DOCTEST_TOSTR(DOCTEST_VERSION_MAJOR) "." \ + DOCTEST_TOSTR(DOCTEST_VERSION_MINOR) "." \ + DOCTEST_TOSTR(DOCTEST_VERSION_PATCH) + +#define DOCTEST_VERSION \ + (DOCTEST_VERSION_MAJOR * 10000 + DOCTEST_VERSION_MINOR * 100 + DOCTEST_VERSION_PATCH) + +// ================================================================================================= +// == COMPILER VERSION ============================================================================= +// ================================================================================================= + +// ideas for the version stuff are taken from here: https://github.com/cxxstuff/cxx_detect + +#ifdef _MSC_VER +#define DOCTEST_CPLUSPLUS _MSVC_LANG +#else +#define DOCTEST_CPLUSPLUS __cplusplus +#endif + +#define DOCTEST_COMPILER(MAJOR, MINOR, PATCH) ((MAJOR)*10000000 + (MINOR)*100000 + (PATCH)) + +// GCC/Clang and GCC/MSVC are mutually exclusive, but Clang/MSVC are not because of clang-cl... +#if defined(_MSC_VER) && defined(_MSC_FULL_VER) +#if _MSC_VER == _MSC_FULL_VER / 10000 +#define DOCTEST_MSVC DOCTEST_COMPILER(_MSC_VER / 100, _MSC_VER % 100, _MSC_FULL_VER % 10000) +#else // MSVC +#define DOCTEST_MSVC \ + DOCTEST_COMPILER(_MSC_VER / 100, (_MSC_FULL_VER / 100000) % 100, _MSC_FULL_VER % 100000) +#endif // MSVC +#endif // MSVC +#if defined(__clang__) && defined(__clang_minor__) && defined(__clang_patchlevel__) +#define DOCTEST_CLANG DOCTEST_COMPILER(__clang_major__, __clang_minor__, __clang_patchlevel__) +#elif defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__) && \ + !defined(__INTEL_COMPILER) +#define DOCTEST_GCC DOCTEST_COMPILER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) +#endif // GCC +#if defined(__INTEL_COMPILER) +#define DOCTEST_ICC DOCTEST_COMPILER(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, 0) +#endif // ICC + +#ifndef DOCTEST_MSVC +#define DOCTEST_MSVC 0 +#endif // DOCTEST_MSVC +#ifndef DOCTEST_CLANG +#define DOCTEST_CLANG 0 +#endif // DOCTEST_CLANG +#ifndef DOCTEST_GCC +#define DOCTEST_GCC 0 +#endif // DOCTEST_GCC +#ifndef DOCTEST_ICC +#define DOCTEST_ICC 0 +#endif // DOCTEST_ICC + +// ================================================================================================= +// == COMPILER WARNINGS HELPERS ==================================================================== +// ================================================================================================= + +#if DOCTEST_CLANG && !DOCTEST_ICC +#define DOCTEST_PRAGMA_TO_STR(x) _Pragma(#x) +#define DOCTEST_CLANG_SUPPRESS_WARNING_PUSH _Pragma("clang diagnostic push") +#define DOCTEST_CLANG_SUPPRESS_WARNING(w) DOCTEST_PRAGMA_TO_STR(clang diagnostic ignored w) +#define DOCTEST_CLANG_SUPPRESS_WARNING_POP _Pragma("clang diagnostic pop") +#define DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH(w) \ + DOCTEST_CLANG_SUPPRESS_WARNING_PUSH DOCTEST_CLANG_SUPPRESS_WARNING(w) +#else // DOCTEST_CLANG +#define DOCTEST_CLANG_SUPPRESS_WARNING_PUSH +#define DOCTEST_CLANG_SUPPRESS_WARNING(w) +#define DOCTEST_CLANG_SUPPRESS_WARNING_POP +#define DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH(w) +#endif // DOCTEST_CLANG + +#if DOCTEST_GCC +#define DOCTEST_PRAGMA_TO_STR(x) _Pragma(#x) +#define DOCTEST_GCC_SUPPRESS_WARNING_PUSH _Pragma("GCC diagnostic push") +#define DOCTEST_GCC_SUPPRESS_WARNING(w) DOCTEST_PRAGMA_TO_STR(GCC diagnostic ignored w) +#define DOCTEST_GCC_SUPPRESS_WARNING_POP _Pragma("GCC diagnostic pop") +#define DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH(w) \ + DOCTEST_GCC_SUPPRESS_WARNING_PUSH DOCTEST_GCC_SUPPRESS_WARNING(w) +#else // DOCTEST_GCC +#define DOCTEST_GCC_SUPPRESS_WARNING_PUSH +#define DOCTEST_GCC_SUPPRESS_WARNING(w) +#define DOCTEST_GCC_SUPPRESS_WARNING_POP +#define DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH(w) +#endif // DOCTEST_GCC + +#if DOCTEST_MSVC +#define DOCTEST_MSVC_SUPPRESS_WARNING_PUSH __pragma(warning(push)) +#define DOCTEST_MSVC_SUPPRESS_WARNING(w) __pragma(warning(disable : w)) +#define DOCTEST_MSVC_SUPPRESS_WARNING_POP __pragma(warning(pop)) +#define DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(w) \ + DOCTEST_MSVC_SUPPRESS_WARNING_PUSH DOCTEST_MSVC_SUPPRESS_WARNING(w) +#else // DOCTEST_MSVC +#define DOCTEST_MSVC_SUPPRESS_WARNING_PUSH +#define DOCTEST_MSVC_SUPPRESS_WARNING(w) +#define DOCTEST_MSVC_SUPPRESS_WARNING_POP +#define DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(w) +#endif // DOCTEST_MSVC + +// ================================================================================================= +// == COMPILER WARNINGS ============================================================================ +// ================================================================================================= + +// both the header and the implementation suppress all of these, +// so it only makes sense to aggregate them like so +#define DOCTEST_SUPPRESS_COMMON_WARNINGS_PUSH \ + DOCTEST_CLANG_SUPPRESS_WARNING_PUSH \ + DOCTEST_CLANG_SUPPRESS_WARNING("-Wunknown-pragmas") \ + DOCTEST_CLANG_SUPPRESS_WARNING("-Wweak-vtables") \ + DOCTEST_CLANG_SUPPRESS_WARNING("-Wpadded") \ + DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-prototypes") \ + DOCTEST_CLANG_SUPPRESS_WARNING("-Wc++98-compat") \ + DOCTEST_CLANG_SUPPRESS_WARNING("-Wc++98-compat-pedantic") \ + \ + DOCTEST_GCC_SUPPRESS_WARNING_PUSH \ + DOCTEST_GCC_SUPPRESS_WARNING("-Wunknown-pragmas") \ + DOCTEST_GCC_SUPPRESS_WARNING("-Wpragmas") \ + DOCTEST_GCC_SUPPRESS_WARNING("-Weffc++") \ + DOCTEST_GCC_SUPPRESS_WARNING("-Wstrict-overflow") \ + DOCTEST_GCC_SUPPRESS_WARNING("-Wstrict-aliasing") \ + DOCTEST_GCC_SUPPRESS_WARNING("-Wmissing-declarations") \ + DOCTEST_GCC_SUPPRESS_WARNING("-Wuseless-cast") \ + DOCTEST_GCC_SUPPRESS_WARNING("-Wnoexcept") \ + \ + DOCTEST_MSVC_SUPPRESS_WARNING_PUSH \ + /* these 4 also disabled globally via cmake: */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(4514) /* unreferenced inline function has been removed */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(4571) /* SEH related */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(4710) /* function not inlined */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(4711) /* function selected for inline expansion*/ \ + /* common ones */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(4616) /* invalid compiler warning */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(4619) /* invalid compiler warning */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(4996) /* The compiler encountered a deprecated declaration */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(4706) /* assignment within conditional expression */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(4512) /* 'class' : assignment operator could not be generated */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(4127) /* conditional expression is constant */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(4820) /* padding */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(4625) /* copy constructor was implicitly deleted */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(4626) /* assignment operator was implicitly deleted */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(5027) /* move assignment operator implicitly deleted */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(5026) /* move constructor was implicitly deleted */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(4640) /* construction of local static object not thread-safe */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(5045) /* Spectre mitigation for memory load */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(5264) /* 'variable-name': 'const' variable is not used */ \ + /* static analysis */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(26439) /* Function may not throw. Declare it 'noexcept' */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(26495) /* Always initialize a member variable */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(26451) /* Arithmetic overflow ... */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(26444) /* Avoid unnamed objects with custom ctor and dtor... */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(26812) /* Prefer 'enum class' over 'enum' */ + +#define DOCTEST_SUPPRESS_COMMON_WARNINGS_POP \ + DOCTEST_CLANG_SUPPRESS_WARNING_POP \ + DOCTEST_GCC_SUPPRESS_WARNING_POP \ + DOCTEST_MSVC_SUPPRESS_WARNING_POP + +DOCTEST_SUPPRESS_COMMON_WARNINGS_PUSH + +DOCTEST_CLANG_SUPPRESS_WARNING_PUSH +DOCTEST_CLANG_SUPPRESS_WARNING("-Wnon-virtual-dtor") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wdeprecated") + +DOCTEST_GCC_SUPPRESS_WARNING_PUSH +DOCTEST_GCC_SUPPRESS_WARNING("-Wctor-dtor-privacy") +DOCTEST_GCC_SUPPRESS_WARNING("-Wnon-virtual-dtor") +DOCTEST_GCC_SUPPRESS_WARNING("-Wsign-promo") + +DOCTEST_MSVC_SUPPRESS_WARNING_PUSH +DOCTEST_MSVC_SUPPRESS_WARNING(4623) // default constructor was implicitly defined as deleted + +#define DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN \ + DOCTEST_MSVC_SUPPRESS_WARNING_PUSH \ + DOCTEST_MSVC_SUPPRESS_WARNING(4548) /* before comma no effect; expected side - effect */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(4265) /* virtual functions, but destructor is not virtual */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(4986) /* exception specification does not match previous */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(4350) /* 'member1' called instead of 'member2' */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(4668) /* not defined as a preprocessor macro */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(4365) /* signed/unsigned mismatch */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(4774) /* format string not a string literal */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(4820) /* padding */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(4625) /* copy constructor was implicitly deleted */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(4626) /* assignment operator was implicitly deleted */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(5027) /* move assignment operator implicitly deleted */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(5026) /* move constructor was implicitly deleted */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(4623) /* default constructor was implicitly deleted */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(5039) /* pointer to pot. throwing function passed to extern C */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(5045) /* Spectre mitigation for memory load */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(5105) /* macro producing 'defined' has undefined behavior */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(4738) /* storing float result in memory, loss of performance */ \ + DOCTEST_MSVC_SUPPRESS_WARNING(5262) /* implicit fall-through */ + +#define DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_END DOCTEST_MSVC_SUPPRESS_WARNING_POP + +// ================================================================================================= +// == FEATURE DETECTION ============================================================================ +// ================================================================================================= + +// general compiler feature support table: https://en.cppreference.com/w/cpp/compiler_support +// MSVC C++11 feature support table: https://msdn.microsoft.com/en-us/library/hh567368.aspx +// GCC C++11 feature support table: https://gcc.gnu.org/projects/cxx-status.html +// MSVC version table: +// https://en.wikipedia.org/wiki/Microsoft_Visual_C%2B%2B#Internal_version_numbering +// MSVC++ 14.3 (17) _MSC_VER == 1930 (Visual Studio 2022) +// MSVC++ 14.2 (16) _MSC_VER == 1920 (Visual Studio 2019) +// MSVC++ 14.1 (15) _MSC_VER == 1910 (Visual Studio 2017) +// MSVC++ 14.0 _MSC_VER == 1900 (Visual Studio 2015) +// MSVC++ 12.0 _MSC_VER == 1800 (Visual Studio 2013) +// MSVC++ 11.0 _MSC_VER == 1700 (Visual Studio 2012) +// MSVC++ 10.0 _MSC_VER == 1600 (Visual Studio 2010) +// MSVC++ 9.0 _MSC_VER == 1500 (Visual Studio 2008) +// MSVC++ 8.0 _MSC_VER == 1400 (Visual Studio 2005) + +// Universal Windows Platform support +#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) +#define DOCTEST_CONFIG_NO_WINDOWS_SEH +#endif // WINAPI_FAMILY +#if DOCTEST_MSVC && !defined(DOCTEST_CONFIG_WINDOWS_SEH) +#define DOCTEST_CONFIG_WINDOWS_SEH +#endif // MSVC +#if defined(DOCTEST_CONFIG_NO_WINDOWS_SEH) && defined(DOCTEST_CONFIG_WINDOWS_SEH) +#undef DOCTEST_CONFIG_WINDOWS_SEH +#endif // DOCTEST_CONFIG_NO_WINDOWS_SEH + +#if !defined(_WIN32) && !defined(__QNX__) && !defined(DOCTEST_CONFIG_POSIX_SIGNALS) && \ + !defined(__EMSCRIPTEN__) && !defined(__wasi__) +#define DOCTEST_CONFIG_POSIX_SIGNALS +#endif // _WIN32 +#if defined(DOCTEST_CONFIG_NO_POSIX_SIGNALS) && defined(DOCTEST_CONFIG_POSIX_SIGNALS) +#undef DOCTEST_CONFIG_POSIX_SIGNALS +#endif // DOCTEST_CONFIG_NO_POSIX_SIGNALS + +#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS +#if !defined(__cpp_exceptions) && !defined(__EXCEPTIONS) && !defined(_CPPUNWIND) \ + || defined(__wasi__) +#define DOCTEST_CONFIG_NO_EXCEPTIONS +#endif // no exceptions +#endif // DOCTEST_CONFIG_NO_EXCEPTIONS + +#ifdef DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS +#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS +#define DOCTEST_CONFIG_NO_EXCEPTIONS +#endif // DOCTEST_CONFIG_NO_EXCEPTIONS +#endif // DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS + +#if defined(DOCTEST_CONFIG_NO_EXCEPTIONS) && !defined(DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS) +#define DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS +#endif // DOCTEST_CONFIG_NO_EXCEPTIONS && !DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS + +#ifdef __wasi__ +#define DOCTEST_CONFIG_NO_MULTITHREADING +#endif + +#if defined(DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN) && !defined(DOCTEST_CONFIG_IMPLEMENT) +#define DOCTEST_CONFIG_IMPLEMENT +#endif // DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN + +#if defined(_WIN32) || defined(__CYGWIN__) +#if DOCTEST_MSVC +#define DOCTEST_SYMBOL_EXPORT __declspec(dllexport) +#define DOCTEST_SYMBOL_IMPORT __declspec(dllimport) +#else // MSVC +#define DOCTEST_SYMBOL_EXPORT __attribute__((dllexport)) +#define DOCTEST_SYMBOL_IMPORT __attribute__((dllimport)) +#endif // MSVC +#else // _WIN32 +#define DOCTEST_SYMBOL_EXPORT __attribute__((visibility("default"))) +#define DOCTEST_SYMBOL_IMPORT +#endif // _WIN32 + +#ifdef DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL +#ifdef DOCTEST_CONFIG_IMPLEMENT +#define DOCTEST_INTERFACE DOCTEST_SYMBOL_EXPORT +#else // DOCTEST_CONFIG_IMPLEMENT +#define DOCTEST_INTERFACE DOCTEST_SYMBOL_IMPORT +#endif // DOCTEST_CONFIG_IMPLEMENT +#else // DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL +#define DOCTEST_INTERFACE +#endif // DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL + +// needed for extern template instantiations +// see https://github.com/fmtlib/fmt/issues/2228 +#if DOCTEST_MSVC +#define DOCTEST_INTERFACE_DECL +#define DOCTEST_INTERFACE_DEF DOCTEST_INTERFACE +#else // DOCTEST_MSVC +#define DOCTEST_INTERFACE_DECL DOCTEST_INTERFACE +#define DOCTEST_INTERFACE_DEF +#endif // DOCTEST_MSVC + +#define DOCTEST_EMPTY + +#if DOCTEST_MSVC +#define DOCTEST_NOINLINE __declspec(noinline) +#define DOCTEST_UNUSED +#define DOCTEST_ALIGNMENT(x) +#elif DOCTEST_CLANG && DOCTEST_CLANG < DOCTEST_COMPILER(3, 5, 0) +#define DOCTEST_NOINLINE +#define DOCTEST_UNUSED +#define DOCTEST_ALIGNMENT(x) +#else +#define DOCTEST_NOINLINE __attribute__((noinline)) +#define DOCTEST_UNUSED __attribute__((unused)) +#define DOCTEST_ALIGNMENT(x) __attribute__((aligned(x))) +#endif + +#ifdef DOCTEST_CONFIG_NO_CONTRADICTING_INLINE +#define DOCTEST_INLINE_NOINLINE inline +#else +#define DOCTEST_INLINE_NOINLINE inline DOCTEST_NOINLINE +#endif + +#ifndef DOCTEST_NORETURN +#if DOCTEST_MSVC && (DOCTEST_MSVC < DOCTEST_COMPILER(19, 0, 0)) +#define DOCTEST_NORETURN +#else // DOCTEST_MSVC +#define DOCTEST_NORETURN [[noreturn]] +#endif // DOCTEST_MSVC +#endif // DOCTEST_NORETURN + +#ifndef DOCTEST_NOEXCEPT +#if DOCTEST_MSVC && (DOCTEST_MSVC < DOCTEST_COMPILER(19, 0, 0)) +#define DOCTEST_NOEXCEPT +#else // DOCTEST_MSVC +#define DOCTEST_NOEXCEPT noexcept +#endif // DOCTEST_MSVC +#endif // DOCTEST_NOEXCEPT + +#ifndef DOCTEST_CONSTEXPR +#if DOCTEST_MSVC && (DOCTEST_MSVC < DOCTEST_COMPILER(19, 0, 0)) +#define DOCTEST_CONSTEXPR const +#define DOCTEST_CONSTEXPR_FUNC inline +#else // DOCTEST_MSVC +#define DOCTEST_CONSTEXPR constexpr +#define DOCTEST_CONSTEXPR_FUNC constexpr +#endif // DOCTEST_MSVC +#endif // DOCTEST_CONSTEXPR + +#ifndef DOCTEST_NO_SANITIZE_INTEGER +#if DOCTEST_CLANG >= DOCTEST_COMPILER(3, 7, 0) +#define DOCTEST_NO_SANITIZE_INTEGER __attribute__((no_sanitize("integer"))) +#else +#define DOCTEST_NO_SANITIZE_INTEGER +#endif +#endif // DOCTEST_NO_SANITIZE_INTEGER + +// ================================================================================================= +// == FEATURE DETECTION END ======================================================================== +// ================================================================================================= + +#define DOCTEST_DECLARE_INTERFACE(name) \ + virtual ~name(); \ + name() = default; \ + name(const name&) = delete; \ + name(name&&) = delete; \ + name& operator=(const name&) = delete; \ + name& operator=(name&&) = delete; + +#define DOCTEST_DEFINE_INTERFACE(name) \ + name::~name() = default; + +// internal macros for string concatenation and anonymous variable name generation +#define DOCTEST_CAT_IMPL(s1, s2) s1##s2 +#define DOCTEST_CAT(s1, s2) DOCTEST_CAT_IMPL(s1, s2) +#ifdef __COUNTER__ // not standard and may be missing for some compilers +#define DOCTEST_ANONYMOUS(x) DOCTEST_CAT(x, __COUNTER__) +#else // __COUNTER__ +#define DOCTEST_ANONYMOUS(x) DOCTEST_CAT(x, __LINE__) +#endif // __COUNTER__ + +#ifndef DOCTEST_CONFIG_ASSERTION_PARAMETERS_BY_VALUE +#define DOCTEST_REF_WRAP(x) x& +#else // DOCTEST_CONFIG_ASSERTION_PARAMETERS_BY_VALUE +#define DOCTEST_REF_WRAP(x) x +#endif // DOCTEST_CONFIG_ASSERTION_PARAMETERS_BY_VALUE + +// not using __APPLE__ because... this is how Catch does it +#ifdef __MAC_OS_X_VERSION_MIN_REQUIRED +#define DOCTEST_PLATFORM_MAC +#elif defined(__IPHONE_OS_VERSION_MIN_REQUIRED) +#define DOCTEST_PLATFORM_IPHONE +#elif defined(_WIN32) +#define DOCTEST_PLATFORM_WINDOWS +#elif defined(__wasi__) +#define DOCTEST_PLATFORM_WASI +#else // DOCTEST_PLATFORM +#define DOCTEST_PLATFORM_LINUX +#endif // DOCTEST_PLATFORM + +namespace doctest { namespace detail { + static DOCTEST_CONSTEXPR int consume(const int*, int) noexcept { return 0; } +}} + +#define DOCTEST_GLOBAL_NO_WARNINGS(var, ...) \ + DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wglobal-constructors") \ + static const int var = doctest::detail::consume(&var, __VA_ARGS__); \ + DOCTEST_CLANG_SUPPRESS_WARNING_POP + +#ifndef DOCTEST_BREAK_INTO_DEBUGGER +// should probably take a look at https://github.com/scottt/debugbreak +#ifdef DOCTEST_PLATFORM_LINUX +#if defined(__GNUC__) && (defined(__i386) || defined(__x86_64)) +// Break at the location of the failing check if possible +#define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("int $3\n" : :) // NOLINT(hicpp-no-assembler) +#else +#include +#define DOCTEST_BREAK_INTO_DEBUGGER() raise(SIGTRAP) +#endif +#elif defined(DOCTEST_PLATFORM_MAC) +#if defined(__x86_64) || defined(__x86_64__) || defined(__amd64__) || defined(__i386) +#define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("int $3\n" : :) // NOLINT(hicpp-no-assembler) +#elif defined(__ppc__) || defined(__ppc64__) +// https://www.cocoawithlove.com/2008/03/break-into-debugger.html +#define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("li r0, 20\nsc\nnop\nli r0, 37\nli r4, 2\nsc\nnop\n": : : "memory","r0","r3","r4") // NOLINT(hicpp-no-assembler) +#else +#define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("brk #0"); // NOLINT(hicpp-no-assembler) +#endif +#elif DOCTEST_MSVC +#define DOCTEST_BREAK_INTO_DEBUGGER() __debugbreak() +#elif defined(__MINGW32__) +DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wredundant-decls") +extern "C" __declspec(dllimport) void __stdcall DebugBreak(); +DOCTEST_GCC_SUPPRESS_WARNING_POP +#define DOCTEST_BREAK_INTO_DEBUGGER() ::DebugBreak() +#else // linux +#define DOCTEST_BREAK_INTO_DEBUGGER() (static_cast(0)) +#endif // linux +#endif // DOCTEST_BREAK_INTO_DEBUGGER + +// this is kept here for backwards compatibility since the config option was changed +#ifdef DOCTEST_CONFIG_USE_IOSFWD +#ifndef DOCTEST_CONFIG_USE_STD_HEADERS +#define DOCTEST_CONFIG_USE_STD_HEADERS +#endif +#endif // DOCTEST_CONFIG_USE_IOSFWD + +// for clang - always include ciso646 (which drags some std stuff) because +// we want to check if we are using libc++ with the _LIBCPP_VERSION macro in +// which case we don't want to forward declare stuff from std - for reference: +// https://github.com/doctest/doctest/issues/126 +// https://github.com/doctest/doctest/issues/356 +#if DOCTEST_CLANG +#include +#endif // clang + +#ifdef _LIBCPP_VERSION +#ifndef DOCTEST_CONFIG_USE_STD_HEADERS +#define DOCTEST_CONFIG_USE_STD_HEADERS +#endif +#endif // _LIBCPP_VERSION + +#ifdef DOCTEST_CONFIG_USE_STD_HEADERS +#ifndef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS +#define DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS +#endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS +DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN +#include +#include +#include +DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_END +#else // DOCTEST_CONFIG_USE_STD_HEADERS + +// Forward declaring 'X' in namespace std is not permitted by the C++ Standard. +DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4643) + +namespace std { // NOLINT(cert-dcl58-cpp) +typedef decltype(nullptr) nullptr_t; // NOLINT(modernize-use-using) +typedef decltype(sizeof(void*)) size_t; // NOLINT(modernize-use-using) +template +struct char_traits; +template <> +struct char_traits; +template +class basic_ostream; // NOLINT(fuchsia-virtual-inheritance) +typedef basic_ostream> ostream; // NOLINT(modernize-use-using) +template +// NOLINTNEXTLINE +basic_ostream& operator<<(basic_ostream&, const char*); +template +class basic_istream; +typedef basic_istream> istream; // NOLINT(modernize-use-using) +template +class tuple; +#if DOCTEST_MSVC >= DOCTEST_COMPILER(19, 20, 0) +// see this issue on why this is needed: https://github.com/doctest/doctest/issues/183 +template +class allocator; +template +class basic_string; +using string = basic_string, allocator>; +#endif // VS 2019 +} // namespace std + +DOCTEST_MSVC_SUPPRESS_WARNING_POP + +#endif // DOCTEST_CONFIG_USE_STD_HEADERS + +#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS +#include +#endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS + +namespace doctest { + +using std::size_t; + +DOCTEST_INTERFACE extern bool is_running_in_test; + +#ifndef DOCTEST_CONFIG_STRING_SIZE_TYPE +#define DOCTEST_CONFIG_STRING_SIZE_TYPE unsigned +#endif + +// A 24 byte string class (can be as small as 17 for x64 and 13 for x86) that can hold strings with length +// of up to 23 chars on the stack before going on the heap - the last byte of the buffer is used for: +// - "is small" bit - the highest bit - if "0" then it is small - otherwise its "1" (128) +// - if small - capacity left before going on the heap - using the lowest 5 bits +// - if small - 2 bits are left unused - the second and third highest ones +// - if small - acts as a null terminator if strlen() is 23 (24 including the null terminator) +// and the "is small" bit remains "0" ("as well as the capacity left") so its OK +// Idea taken from this lecture about the string implementation of facebook/folly - fbstring +// https://www.youtube.com/watch?v=kPR8h4-qZdk +// TODO: +// - optimizations - like not deleting memory unnecessarily in operator= and etc. +// - resize/reserve/clear +// - replace +// - back/front +// - iterator stuff +// - find & friends +// - push_back/pop_back +// - assign/insert/erase +// - relational operators as free functions - taking const char* as one of the params +class DOCTEST_INTERFACE String +{ +public: + using size_type = DOCTEST_CONFIG_STRING_SIZE_TYPE; + +private: + static DOCTEST_CONSTEXPR size_type len = 24; //!OCLINT avoid private static members + static DOCTEST_CONSTEXPR size_type last = len - 1; //!OCLINT avoid private static members + + struct view // len should be more than sizeof(view) - because of the final byte for flags + { + char* ptr; + size_type size; + size_type capacity; + }; + + union + { + char buf[len]; // NOLINT(*-avoid-c-arrays) + view data; + }; + + char* allocate(size_type sz); + + bool isOnStack() const noexcept { return (buf[last] & 128) == 0; } + void setOnHeap() noexcept; + void setLast(size_type in = last) noexcept; + void setSize(size_type sz) noexcept; + + void copy(const String& other); + +public: + static DOCTEST_CONSTEXPR size_type npos = static_cast(-1); + + String() noexcept; + ~String(); + + // cppcheck-suppress noExplicitConstructor + String(const char* in); + String(const char* in, size_type in_size); + + String(std::istream& in, size_type in_size); + + String(const String& other); + String& operator=(const String& other); + + String& operator+=(const String& other); + + String(String&& other) noexcept; + String& operator=(String&& other) noexcept; + + char operator[](size_type i) const; + char& operator[](size_type i); + + // the only functions I'm willing to leave in the interface - available for inlining + const char* c_str() const { return const_cast(this)->c_str(); } // NOLINT + char* c_str() { + if (isOnStack()) { + return reinterpret_cast(buf); + } + return data.ptr; + } + + size_type size() const; + size_type capacity() const; + + String substr(size_type pos, size_type cnt = npos) &&; + String substr(size_type pos, size_type cnt = npos) const &; + + size_type find(char ch, size_type pos = 0) const; + size_type rfind(char ch, size_type pos = npos) const; + + int compare(const char* other, bool no_case = false) const; + int compare(const String& other, bool no_case = false) const; + +friend DOCTEST_INTERFACE std::ostream& operator<<(std::ostream& s, const String& in); +}; + +DOCTEST_INTERFACE String operator+(const String& lhs, const String& rhs); + +DOCTEST_INTERFACE bool operator==(const String& lhs, const String& rhs); +DOCTEST_INTERFACE bool operator!=(const String& lhs, const String& rhs); +DOCTEST_INTERFACE bool operator<(const String& lhs, const String& rhs); +DOCTEST_INTERFACE bool operator>(const String& lhs, const String& rhs); +DOCTEST_INTERFACE bool operator<=(const String& lhs, const String& rhs); +DOCTEST_INTERFACE bool operator>=(const String& lhs, const String& rhs); + +class DOCTEST_INTERFACE Contains { +public: + explicit Contains(const String& string); + + bool checkWith(const String& other) const; + + String string; +}; + +DOCTEST_INTERFACE String toString(const Contains& in); + +DOCTEST_INTERFACE bool operator==(const String& lhs, const Contains& rhs); +DOCTEST_INTERFACE bool operator==(const Contains& lhs, const String& rhs); +DOCTEST_INTERFACE bool operator!=(const String& lhs, const Contains& rhs); +DOCTEST_INTERFACE bool operator!=(const Contains& lhs, const String& rhs); + +namespace Color { + enum Enum + { + None = 0, + White, + Red, + Green, + Blue, + Cyan, + Yellow, + Grey, + + Bright = 0x10, + + BrightRed = Bright | Red, + BrightGreen = Bright | Green, + LightGrey = Bright | Grey, + BrightWhite = Bright | White + }; + + DOCTEST_INTERFACE std::ostream& operator<<(std::ostream& s, Color::Enum code); +} // namespace Color + +namespace assertType { + enum Enum + { + // macro traits + + is_warn = 1, + is_check = 2 * is_warn, + is_require = 2 * is_check, + + is_normal = 2 * is_require, + is_throws = 2 * is_normal, + is_throws_as = 2 * is_throws, + is_throws_with = 2 * is_throws_as, + is_nothrow = 2 * is_throws_with, + + is_false = 2 * is_nothrow, + is_unary = 2 * is_false, // not checked anywhere - used just to distinguish the types + + is_eq = 2 * is_unary, + is_ne = 2 * is_eq, + + is_lt = 2 * is_ne, + is_gt = 2 * is_lt, + + is_ge = 2 * is_gt, + is_le = 2 * is_ge, + + // macro types + + DT_WARN = is_normal | is_warn, + DT_CHECK = is_normal | is_check, + DT_REQUIRE = is_normal | is_require, + + DT_WARN_FALSE = is_normal | is_false | is_warn, + DT_CHECK_FALSE = is_normal | is_false | is_check, + DT_REQUIRE_FALSE = is_normal | is_false | is_require, + + DT_WARN_THROWS = is_throws | is_warn, + DT_CHECK_THROWS = is_throws | is_check, + DT_REQUIRE_THROWS = is_throws | is_require, + + DT_WARN_THROWS_AS = is_throws_as | is_warn, + DT_CHECK_THROWS_AS = is_throws_as | is_check, + DT_REQUIRE_THROWS_AS = is_throws_as | is_require, + + DT_WARN_THROWS_WITH = is_throws_with | is_warn, + DT_CHECK_THROWS_WITH = is_throws_with | is_check, + DT_REQUIRE_THROWS_WITH = is_throws_with | is_require, + + DT_WARN_THROWS_WITH_AS = is_throws_with | is_throws_as | is_warn, + DT_CHECK_THROWS_WITH_AS = is_throws_with | is_throws_as | is_check, + DT_REQUIRE_THROWS_WITH_AS = is_throws_with | is_throws_as | is_require, + + DT_WARN_NOTHROW = is_nothrow | is_warn, + DT_CHECK_NOTHROW = is_nothrow | is_check, + DT_REQUIRE_NOTHROW = is_nothrow | is_require, + + DT_WARN_EQ = is_normal | is_eq | is_warn, + DT_CHECK_EQ = is_normal | is_eq | is_check, + DT_REQUIRE_EQ = is_normal | is_eq | is_require, + + DT_WARN_NE = is_normal | is_ne | is_warn, + DT_CHECK_NE = is_normal | is_ne | is_check, + DT_REQUIRE_NE = is_normal | is_ne | is_require, + + DT_WARN_GT = is_normal | is_gt | is_warn, + DT_CHECK_GT = is_normal | is_gt | is_check, + DT_REQUIRE_GT = is_normal | is_gt | is_require, + + DT_WARN_LT = is_normal | is_lt | is_warn, + DT_CHECK_LT = is_normal | is_lt | is_check, + DT_REQUIRE_LT = is_normal | is_lt | is_require, + + DT_WARN_GE = is_normal | is_ge | is_warn, + DT_CHECK_GE = is_normal | is_ge | is_check, + DT_REQUIRE_GE = is_normal | is_ge | is_require, + + DT_WARN_LE = is_normal | is_le | is_warn, + DT_CHECK_LE = is_normal | is_le | is_check, + DT_REQUIRE_LE = is_normal | is_le | is_require, + + DT_WARN_UNARY = is_normal | is_unary | is_warn, + DT_CHECK_UNARY = is_normal | is_unary | is_check, + DT_REQUIRE_UNARY = is_normal | is_unary | is_require, + + DT_WARN_UNARY_FALSE = is_normal | is_false | is_unary | is_warn, + DT_CHECK_UNARY_FALSE = is_normal | is_false | is_unary | is_check, + DT_REQUIRE_UNARY_FALSE = is_normal | is_false | is_unary | is_require, + }; +} // namespace assertType + +DOCTEST_INTERFACE const char* assertString(assertType::Enum at); +DOCTEST_INTERFACE const char* failureString(assertType::Enum at); +DOCTEST_INTERFACE const char* skipPathFromFilename(const char* file); + +struct DOCTEST_INTERFACE TestCaseData +{ + String m_file; // the file in which the test was registered (using String - see #350) + unsigned m_line; // the line where the test was registered + const char* m_name; // name of the test case + const char* m_test_suite; // the test suite in which the test was added + const char* m_description; + bool m_skip; + bool m_no_breaks; + bool m_no_output; + bool m_may_fail; + bool m_should_fail; + int m_expected_failures; + double m_timeout; +}; + +struct DOCTEST_INTERFACE AssertData +{ + // common - for all asserts + const TestCaseData* m_test_case; + assertType::Enum m_at; + const char* m_file; + int m_line; + const char* m_expr; + bool m_failed; + + // exception-related - for all asserts + bool m_threw; + String m_exception; + + // for normal asserts + String m_decomp; + + // for specific exception-related asserts + bool m_threw_as; + const char* m_exception_type; + + class DOCTEST_INTERFACE StringContains { + private: + Contains content; + bool isContains; + + public: + StringContains(const String& str) : content(str), isContains(false) { } + StringContains(Contains cntn) : content(static_cast(cntn)), isContains(true) { } + + bool check(const String& str) { return isContains ? (content == str) : (content.string == str); } + + operator const String&() const { return content.string; } + + const char* c_str() const { return content.string.c_str(); } + } m_exception_string; + + AssertData(assertType::Enum at, const char* file, int line, const char* expr, + const char* exception_type, const StringContains& exception_string); +}; + +struct DOCTEST_INTERFACE MessageData +{ + String m_string; + const char* m_file; + int m_line; + assertType::Enum m_severity; +}; + +struct DOCTEST_INTERFACE SubcaseSignature +{ + String m_name; + const char* m_file; + int m_line; + + bool operator==(const SubcaseSignature& other) const; + bool operator<(const SubcaseSignature& other) const; +}; + +struct DOCTEST_INTERFACE IContextScope +{ + DOCTEST_DECLARE_INTERFACE(IContextScope) + virtual void stringify(std::ostream*) const = 0; +}; + +namespace detail { + struct DOCTEST_INTERFACE TestCase; +} // namespace detail + +struct ContextOptions //!OCLINT too many fields +{ + std::ostream* cout = nullptr; // stdout stream + String binary_name; // the test binary name + + const detail::TestCase* currentTest = nullptr; + + // == parameters from the command line + String out; // output filename + String order_by; // how tests should be ordered + unsigned rand_seed; // the seed for rand ordering + + unsigned first; // the first (matching) test to be executed + unsigned last; // the last (matching) test to be executed + + int abort_after; // stop tests after this many failed assertions + int subcase_filter_levels; // apply the subcase filters for the first N levels + + bool success; // include successful assertions in output + bool case_sensitive; // if filtering should be case sensitive + bool exit; // if the program should be exited after the tests are ran/whatever + bool duration; // print the time duration of each test case + bool minimal; // minimal console output (only test failures) + bool quiet; // no console output + bool no_throw; // to skip exceptions-related assertion macros + bool no_exitcode; // if the framework should return 0 as the exitcode + bool no_run; // to not run the tests at all (can be done with an "*" exclude) + bool no_intro; // to not print the intro of the framework + bool no_version; // to not print the version of the framework + bool no_colors; // if output to the console should be colorized + bool force_colors; // forces the use of colors even when a tty cannot be detected + bool no_breaks; // to not break into the debugger + bool no_skip; // don't skip test cases which are marked to be skipped + bool gnu_file_line; // if line numbers should be surrounded with :x: and not (x): + bool no_path_in_filenames; // if the path to files should be removed from the output + bool no_line_numbers; // if source code line numbers should be omitted from the output + bool no_debug_output; // no output in the debug console when a debugger is attached + bool no_skipped_summary; // don't print "skipped" in the summary !!! UNDOCUMENTED !!! + bool no_time_in_output; // omit any time/timestamps from output !!! UNDOCUMENTED !!! + + bool help; // to print the help + bool version; // to print the version + bool count; // if only the count of matching tests is to be retrieved + bool list_test_cases; // to list all tests matching the filters + bool list_test_suites; // to list all suites matching the filters + bool list_reporters; // lists all registered reporters +}; + +namespace detail { + namespace types { +#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS + using namespace std; +#else + template + struct enable_if { }; + + template + struct enable_if { using type = T; }; + + struct true_type { static DOCTEST_CONSTEXPR bool value = true; }; + struct false_type { static DOCTEST_CONSTEXPR bool value = false; }; + + template struct remove_reference { using type = T; }; + template struct remove_reference { using type = T; }; + template struct remove_reference { using type = T; }; + + template struct is_rvalue_reference : false_type { }; + template struct is_rvalue_reference : true_type { }; + + template struct remove_const { using type = T; }; + template struct remove_const { using type = T; }; + + // Compiler intrinsics + template struct is_enum { static DOCTEST_CONSTEXPR bool value = __is_enum(T); }; + template struct underlying_type { using type = __underlying_type(T); }; + + template struct is_pointer : false_type { }; + template struct is_pointer : true_type { }; + + template struct is_array : false_type { }; + // NOLINTNEXTLINE(*-avoid-c-arrays) + template struct is_array : true_type { }; +#endif + } + + // + template + T&& declval(); + + template + DOCTEST_CONSTEXPR_FUNC T&& forward(typename types::remove_reference::type& t) DOCTEST_NOEXCEPT { + return static_cast(t); + } + + template + DOCTEST_CONSTEXPR_FUNC T&& forward(typename types::remove_reference::type&& t) DOCTEST_NOEXCEPT { + return static_cast(t); + } + + template + struct deferred_false : types::false_type { }; + +// MSVS 2015 :( +#if !DOCTEST_CLANG && defined(_MSC_VER) && _MSC_VER <= 1900 + template + struct has_global_insertion_operator : types::false_type { }; + + template + struct has_global_insertion_operator(), declval()), void())> : types::true_type { }; + + template + struct has_insertion_operator { static DOCTEST_CONSTEXPR bool value = has_global_insertion_operator::value; }; + + template + struct insert_hack; + + template + struct insert_hack { + static void insert(std::ostream& os, const T& t) { ::operator<<(os, t); } + }; + + template + struct insert_hack { + static void insert(std::ostream& os, const T& t) { operator<<(os, t); } + }; + + template + using insert_hack_t = insert_hack::value>; +#else + template + struct has_insertion_operator : types::false_type { }; +#endif + + template + struct has_insertion_operator(), declval()), void())> : types::true_type { }; + + template + struct should_stringify_as_underlying_type { + static DOCTEST_CONSTEXPR bool value = detail::types::is_enum::value && !doctest::detail::has_insertion_operator::value; + }; + + DOCTEST_INTERFACE std::ostream* tlssPush(); + DOCTEST_INTERFACE String tlssPop(); + + template + struct StringMakerBase { + template + static String convert(const DOCTEST_REF_WRAP(T)) { +#ifdef DOCTEST_CONFIG_REQUIRE_STRINGIFICATION_FOR_ALL_USED_TYPES + static_assert(deferred_false::value, "No stringification detected for type T. See string conversion manual"); +#endif + return "{?}"; + } + }; + + template + struct filldata; + + template + void filloss(std::ostream* stream, const T& in) { + filldata::fill(stream, in); + } + + template + void filloss(std::ostream* stream, const T (&in)[N]) { // NOLINT(*-avoid-c-arrays) + // T[N], T(&)[N], T(&&)[N] have same behaviour. + // Hence remove reference. + filloss::type>(stream, in); + } + + template + String toStream(const T& in) { + std::ostream* stream = tlssPush(); + filloss(stream, in); + return tlssPop(); + } + + template <> + struct StringMakerBase { + template + static String convert(const DOCTEST_REF_WRAP(T) in) { + return toStream(in); + } + }; +} // namespace detail + +template +struct StringMaker : public detail::StringMakerBase< + detail::has_insertion_operator::value || detail::types::is_pointer::value || detail::types::is_array::value> +{}; + +#ifndef DOCTEST_STRINGIFY +#ifdef DOCTEST_CONFIG_DOUBLE_STRINGIFY +#define DOCTEST_STRINGIFY(...) toString(toString(__VA_ARGS__)) +#else +#define DOCTEST_STRINGIFY(...) toString(__VA_ARGS__) +#endif +#endif + +template +String toString() { +#if DOCTEST_CLANG == 0 && DOCTEST_GCC == 0 && DOCTEST_ICC == 0 + String ret = __FUNCSIG__; // class doctest::String __cdecl doctest::toString(void) + String::size_type beginPos = ret.find('<'); + return ret.substr(beginPos + 1, ret.size() - beginPos - static_cast(sizeof(">(void)"))); +#else + String ret = __PRETTY_FUNCTION__; // doctest::String toString() [with T = TYPE] + String::size_type begin = ret.find('=') + 2; + return ret.substr(begin, ret.size() - begin - 1); +#endif +} + +template ::value, bool>::type = true> +String toString(const DOCTEST_REF_WRAP(T) value) { + return StringMaker::convert(value); +} + +#ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING +DOCTEST_INTERFACE String toString(const char* in); +#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING + +#if DOCTEST_MSVC >= DOCTEST_COMPILER(19, 20, 0) +// see this issue on why this is needed: https://github.com/doctest/doctest/issues/183 +DOCTEST_INTERFACE String toString(const std::string& in); +#endif // VS 2019 + +DOCTEST_INTERFACE String toString(String in); + +DOCTEST_INTERFACE String toString(std::nullptr_t); + +DOCTEST_INTERFACE String toString(bool in); + +DOCTEST_INTERFACE String toString(float in); +DOCTEST_INTERFACE String toString(double in); +DOCTEST_INTERFACE String toString(double long in); + +DOCTEST_INTERFACE String toString(char in); +DOCTEST_INTERFACE String toString(char signed in); +DOCTEST_INTERFACE String toString(char unsigned in); +DOCTEST_INTERFACE String toString(short in); +DOCTEST_INTERFACE String toString(short unsigned in); +DOCTEST_INTERFACE String toString(signed in); +DOCTEST_INTERFACE String toString(unsigned in); +DOCTEST_INTERFACE String toString(long in); +DOCTEST_INTERFACE String toString(long unsigned in); +DOCTEST_INTERFACE String toString(long long in); +DOCTEST_INTERFACE String toString(long long unsigned in); + +template ::value, bool>::type = true> +String toString(const DOCTEST_REF_WRAP(T) value) { + using UT = typename detail::types::underlying_type::type; + return (DOCTEST_STRINGIFY(static_cast(value))); +} + +namespace detail { + template + struct filldata + { + static void fill(std::ostream* stream, const T& in) { +#if defined(_MSC_VER) && _MSC_VER <= 1900 + insert_hack_t::insert(*stream, in); +#else + operator<<(*stream, in); +#endif + } + }; + +DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4866) +// NOLINTBEGIN(*-avoid-c-arrays) + template + struct filldata { + static void fill(std::ostream* stream, const T(&in)[N]) { + *stream << "["; + for (size_t i = 0; i < N; i++) { + if (i != 0) { *stream << ", "; } + *stream << (DOCTEST_STRINGIFY(in[i])); + } + *stream << "]"; + } + }; +// NOLINTEND(*-avoid-c-arrays) +DOCTEST_MSVC_SUPPRESS_WARNING_POP + + // Specialized since we don't want the terminating null byte! +// NOLINTBEGIN(*-avoid-c-arrays) + template + struct filldata { + static void fill(std::ostream* stream, const char (&in)[N]) { + *stream << String(in, in[N - 1] ? N : N - 1); + } // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) + }; +// NOLINTEND(*-avoid-c-arrays) + + template <> + struct filldata { + static void fill(std::ostream* stream, const void* in); + }; + + template + struct filldata { +DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4180) + static void fill(std::ostream* stream, const T* in) { +DOCTEST_MSVC_SUPPRESS_WARNING_POP +DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wmicrosoft-cast") + filldata::fill(stream, +#if DOCTEST_GCC == 0 || DOCTEST_GCC >= DOCTEST_COMPILER(4, 9, 0) + reinterpret_cast(in) +#else + *reinterpret_cast(&in) +#endif + ); +DOCTEST_CLANG_SUPPRESS_WARNING_POP + } + }; +} + +struct DOCTEST_INTERFACE Approx +{ + Approx(double value); + + Approx operator()(double value) const; + +#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS + template + explicit Approx(const T& value, + typename detail::types::enable_if::value>::type* = + static_cast(nullptr)) { + *this = static_cast(value); + } +#endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS + + Approx& epsilon(double newEpsilon); + +#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS + template + typename std::enable_if::value, Approx&>::type epsilon( + const T& newEpsilon) { + m_epsilon = static_cast(newEpsilon); + return *this; + } +#endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS + + Approx& scale(double newScale); + +#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS + template + typename std::enable_if::value, Approx&>::type scale( + const T& newScale) { + m_scale = static_cast(newScale); + return *this; + } +#endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS + + // clang-format off + DOCTEST_INTERFACE friend bool operator==(double lhs, const Approx & rhs); + DOCTEST_INTERFACE friend bool operator==(const Approx & lhs, double rhs); + DOCTEST_INTERFACE friend bool operator!=(double lhs, const Approx & rhs); + DOCTEST_INTERFACE friend bool operator!=(const Approx & lhs, double rhs); + DOCTEST_INTERFACE friend bool operator<=(double lhs, const Approx & rhs); + DOCTEST_INTERFACE friend bool operator<=(const Approx & lhs, double rhs); + DOCTEST_INTERFACE friend bool operator>=(double lhs, const Approx & rhs); + DOCTEST_INTERFACE friend bool operator>=(const Approx & lhs, double rhs); + DOCTEST_INTERFACE friend bool operator< (double lhs, const Approx & rhs); + DOCTEST_INTERFACE friend bool operator< (const Approx & lhs, double rhs); + DOCTEST_INTERFACE friend bool operator> (double lhs, const Approx & rhs); + DOCTEST_INTERFACE friend bool operator> (const Approx & lhs, double rhs); + +#ifdef DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS +#define DOCTEST_APPROX_PREFIX \ + template friend typename std::enable_if::value, bool>::type + + DOCTEST_APPROX_PREFIX operator==(const T& lhs, const Approx& rhs) { return operator==(static_cast(lhs), rhs); } + DOCTEST_APPROX_PREFIX operator==(const Approx& lhs, const T& rhs) { return operator==(rhs, lhs); } + DOCTEST_APPROX_PREFIX operator!=(const T& lhs, const Approx& rhs) { return !operator==(lhs, rhs); } + DOCTEST_APPROX_PREFIX operator!=(const Approx& lhs, const T& rhs) { return !operator==(rhs, lhs); } + DOCTEST_APPROX_PREFIX operator<=(const T& lhs, const Approx& rhs) { return static_cast(lhs) < rhs.m_value || lhs == rhs; } + DOCTEST_APPROX_PREFIX operator<=(const Approx& lhs, const T& rhs) { return lhs.m_value < static_cast(rhs) || lhs == rhs; } + DOCTEST_APPROX_PREFIX operator>=(const T& lhs, const Approx& rhs) { return static_cast(lhs) > rhs.m_value || lhs == rhs; } + DOCTEST_APPROX_PREFIX operator>=(const Approx& lhs, const T& rhs) { return lhs.m_value > static_cast(rhs) || lhs == rhs; } + DOCTEST_APPROX_PREFIX operator< (const T& lhs, const Approx& rhs) { return static_cast(lhs) < rhs.m_value && lhs != rhs; } + DOCTEST_APPROX_PREFIX operator< (const Approx& lhs, const T& rhs) { return lhs.m_value < static_cast(rhs) && lhs != rhs; } + DOCTEST_APPROX_PREFIX operator> (const T& lhs, const Approx& rhs) { return static_cast(lhs) > rhs.m_value && lhs != rhs; } + DOCTEST_APPROX_PREFIX operator> (const Approx& lhs, const T& rhs) { return lhs.m_value > static_cast(rhs) && lhs != rhs; } +#undef DOCTEST_APPROX_PREFIX +#endif // DOCTEST_CONFIG_INCLUDE_TYPE_TRAITS + + // clang-format on + + double m_epsilon; + double m_scale; + double m_value; +}; + +DOCTEST_INTERFACE String toString(const Approx& in); + +DOCTEST_INTERFACE const ContextOptions* getContextOptions(); + +template +struct DOCTEST_INTERFACE_DECL IsNaN +{ + F value; bool flipped; + IsNaN(F f, bool flip = false) : value(f), flipped(flip) { } + IsNaN operator!() const { return { value, !flipped }; } + operator bool() const; +}; +#ifndef __MINGW32__ +extern template struct DOCTEST_INTERFACE_DECL IsNaN; +extern template struct DOCTEST_INTERFACE_DECL IsNaN; +extern template struct DOCTEST_INTERFACE_DECL IsNaN; +#endif +DOCTEST_INTERFACE String toString(IsNaN in); +DOCTEST_INTERFACE String toString(IsNaN in); +DOCTEST_INTERFACE String toString(IsNaN in); + +#ifndef DOCTEST_CONFIG_DISABLE + +namespace detail { + // clang-format off +#ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING + template struct decay_array { using type = T; }; + template struct decay_array { using type = T*; }; + template struct decay_array { using type = T*; }; + + template struct not_char_pointer { static DOCTEST_CONSTEXPR int value = 1; }; + template<> struct not_char_pointer { static DOCTEST_CONSTEXPR int value = 0; }; + template<> struct not_char_pointer { static DOCTEST_CONSTEXPR int value = 0; }; + + template struct can_use_op : public not_char_pointer::type> {}; +#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING + // clang-format on + + struct DOCTEST_INTERFACE TestFailureException + { + }; + + DOCTEST_INTERFACE bool checkIfShouldThrow(assertType::Enum at); + +#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS + DOCTEST_NORETURN +#endif // DOCTEST_CONFIG_NO_EXCEPTIONS + DOCTEST_INTERFACE void throwException(); + + struct DOCTEST_INTERFACE Subcase + { + SubcaseSignature m_signature; + bool m_entered = false; + + Subcase(const String& name, const char* file, int line); + Subcase(const Subcase&) = delete; + Subcase(Subcase&&) = delete; + Subcase& operator=(const Subcase&) = delete; + Subcase& operator=(Subcase&&) = delete; + ~Subcase(); + + operator bool() const; + + private: + bool checkFilters(); + }; + + template + String stringifyBinaryExpr(const DOCTEST_REF_WRAP(L) lhs, const char* op, + const DOCTEST_REF_WRAP(R) rhs) { + return (DOCTEST_STRINGIFY(lhs)) + op + (DOCTEST_STRINGIFY(rhs)); + } + +#if DOCTEST_CLANG && DOCTEST_CLANG < DOCTEST_COMPILER(3, 6, 0) +DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wunused-comparison") +#endif + +// This will check if there is any way it could find a operator like member or friend and uses it. +// If not it doesn't find the operator or if the operator at global scope is defined after +// this template, the template won't be instantiated due to SFINAE. Once the template is not +// instantiated it can look for global operator using normal conversions. +#ifdef __NVCC__ +#define SFINAE_OP(ret,op) ret +#else +#define SFINAE_OP(ret,op) decltype((void)(doctest::detail::declval() op doctest::detail::declval()),ret{}) +#endif + +#define DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(op, op_str, op_macro) \ + template \ + DOCTEST_NOINLINE SFINAE_OP(Result,op) operator op(R&& rhs) { \ + bool res = op_macro(doctest::detail::forward(lhs), doctest::detail::forward(rhs)); \ + if(m_at & assertType::is_false) \ + res = !res; \ + if(!res || doctest::getContextOptions()->success) \ + return Result(res, stringifyBinaryExpr(lhs, op_str, rhs)); \ + return Result(res); \ + } + + // more checks could be added - like in Catch: + // https://github.com/catchorg/Catch2/pull/1480/files + // https://github.com/catchorg/Catch2/pull/1481/files +#define DOCTEST_FORBIT_EXPRESSION(rt, op) \ + template \ + rt& operator op(const R&) { \ + static_assert(deferred_false::value, \ + "Expression Too Complex Please Rewrite As Binary Comparison!"); \ + return *this; \ + } + + struct DOCTEST_INTERFACE Result // NOLINT(*-member-init) + { + bool m_passed; + String m_decomp; + + Result() = default; // TODO: Why do we need this? (To remove NOLINT) + Result(bool passed, const String& decomposition = String()); + + // forbidding some expressions based on this table: https://en.cppreference.com/w/cpp/language/operator_precedence + DOCTEST_FORBIT_EXPRESSION(Result, &) + DOCTEST_FORBIT_EXPRESSION(Result, ^) + DOCTEST_FORBIT_EXPRESSION(Result, |) + DOCTEST_FORBIT_EXPRESSION(Result, &&) + DOCTEST_FORBIT_EXPRESSION(Result, ||) + DOCTEST_FORBIT_EXPRESSION(Result, ==) + DOCTEST_FORBIT_EXPRESSION(Result, !=) + DOCTEST_FORBIT_EXPRESSION(Result, <) + DOCTEST_FORBIT_EXPRESSION(Result, >) + DOCTEST_FORBIT_EXPRESSION(Result, <=) + DOCTEST_FORBIT_EXPRESSION(Result, >=) + DOCTEST_FORBIT_EXPRESSION(Result, =) + DOCTEST_FORBIT_EXPRESSION(Result, +=) + DOCTEST_FORBIT_EXPRESSION(Result, -=) + DOCTEST_FORBIT_EXPRESSION(Result, *=) + DOCTEST_FORBIT_EXPRESSION(Result, /=) + DOCTEST_FORBIT_EXPRESSION(Result, %=) + DOCTEST_FORBIT_EXPRESSION(Result, <<=) + DOCTEST_FORBIT_EXPRESSION(Result, >>=) + DOCTEST_FORBIT_EXPRESSION(Result, &=) + DOCTEST_FORBIT_EXPRESSION(Result, ^=) + DOCTEST_FORBIT_EXPRESSION(Result, |=) + }; + +#ifndef DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION + + DOCTEST_CLANG_SUPPRESS_WARNING_PUSH + DOCTEST_CLANG_SUPPRESS_WARNING("-Wsign-conversion") + DOCTEST_CLANG_SUPPRESS_WARNING("-Wsign-compare") + //DOCTEST_CLANG_SUPPRESS_WARNING("-Wdouble-promotion") + //DOCTEST_CLANG_SUPPRESS_WARNING("-Wconversion") + //DOCTEST_CLANG_SUPPRESS_WARNING("-Wfloat-equal") + + DOCTEST_GCC_SUPPRESS_WARNING_PUSH + DOCTEST_GCC_SUPPRESS_WARNING("-Wsign-conversion") + DOCTEST_GCC_SUPPRESS_WARNING("-Wsign-compare") + //DOCTEST_GCC_SUPPRESS_WARNING("-Wdouble-promotion") + //DOCTEST_GCC_SUPPRESS_WARNING("-Wconversion") + //DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal") + + DOCTEST_MSVC_SUPPRESS_WARNING_PUSH + // https://stackoverflow.com/questions/39479163 what's the difference between 4018 and 4389 + DOCTEST_MSVC_SUPPRESS_WARNING(4388) // signed/unsigned mismatch + DOCTEST_MSVC_SUPPRESS_WARNING(4389) // 'operator' : signed/unsigned mismatch + DOCTEST_MSVC_SUPPRESS_WARNING(4018) // 'expression' : signed/unsigned mismatch + //DOCTEST_MSVC_SUPPRESS_WARNING(4805) // 'operation' : unsafe mix of type 'type' and type 'type' in operation + +#endif // DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION + + // clang-format off +#ifndef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING +#define DOCTEST_COMPARISON_RETURN_TYPE bool +#else // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING +#define DOCTEST_COMPARISON_RETURN_TYPE typename types::enable_if::value || can_use_op::value, bool>::type + inline bool eq(const char* lhs, const char* rhs) { return String(lhs) == String(rhs); } + inline bool ne(const char* lhs, const char* rhs) { return String(lhs) != String(rhs); } + inline bool lt(const char* lhs, const char* rhs) { return String(lhs) < String(rhs); } + inline bool gt(const char* lhs, const char* rhs) { return String(lhs) > String(rhs); } + inline bool le(const char* lhs, const char* rhs) { return String(lhs) <= String(rhs); } + inline bool ge(const char* lhs, const char* rhs) { return String(lhs) >= String(rhs); } +#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING + // clang-format on + +#define DOCTEST_RELATIONAL_OP(name, op) \ + template \ + DOCTEST_COMPARISON_RETURN_TYPE name(const DOCTEST_REF_WRAP(L) lhs, \ + const DOCTEST_REF_WRAP(R) rhs) { \ + return lhs op rhs; \ + } + + DOCTEST_RELATIONAL_OP(eq, ==) + DOCTEST_RELATIONAL_OP(ne, !=) + DOCTEST_RELATIONAL_OP(lt, <) + DOCTEST_RELATIONAL_OP(gt, >) + DOCTEST_RELATIONAL_OP(le, <=) + DOCTEST_RELATIONAL_OP(ge, >=) + +#ifndef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING +#define DOCTEST_CMP_EQ(l, r) l == r +#define DOCTEST_CMP_NE(l, r) l != r +#define DOCTEST_CMP_GT(l, r) l > r +#define DOCTEST_CMP_LT(l, r) l < r +#define DOCTEST_CMP_GE(l, r) l >= r +#define DOCTEST_CMP_LE(l, r) l <= r +#else // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING +#define DOCTEST_CMP_EQ(l, r) eq(l, r) +#define DOCTEST_CMP_NE(l, r) ne(l, r) +#define DOCTEST_CMP_GT(l, r) gt(l, r) +#define DOCTEST_CMP_LT(l, r) lt(l, r) +#define DOCTEST_CMP_GE(l, r) ge(l, r) +#define DOCTEST_CMP_LE(l, r) le(l, r) +#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING + + template + // cppcheck-suppress copyCtorAndEqOperator + struct Expression_lhs + { + L lhs; + assertType::Enum m_at; + + explicit Expression_lhs(L&& in, assertType::Enum at) + : lhs(static_cast(in)) + , m_at(at) {} + + DOCTEST_NOINLINE operator Result() { +// this is needed only for MSVC 2015 +DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4800) // 'int': forcing value to bool + bool res = static_cast(lhs); +DOCTEST_MSVC_SUPPRESS_WARNING_POP + if(m_at & assertType::is_false) { //!OCLINT bitwise operator in conditional + res = !res; + } + + if(!res || getContextOptions()->success) { + return { res, (DOCTEST_STRINGIFY(lhs)) }; + } + return { res }; + } + + /* This is required for user-defined conversions from Expression_lhs to L */ + operator L() const { return lhs; } + + // clang-format off + DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(==, " == ", DOCTEST_CMP_EQ) //!OCLINT bitwise operator in conditional + DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(!=, " != ", DOCTEST_CMP_NE) //!OCLINT bitwise operator in conditional + DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(>, " > ", DOCTEST_CMP_GT) //!OCLINT bitwise operator in conditional + DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(<, " < ", DOCTEST_CMP_LT) //!OCLINT bitwise operator in conditional + DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(>=, " >= ", DOCTEST_CMP_GE) //!OCLINT bitwise operator in conditional + DOCTEST_DO_BINARY_EXPRESSION_COMPARISON(<=, " <= ", DOCTEST_CMP_LE) //!OCLINT bitwise operator in conditional + // clang-format on + + // forbidding some expressions based on this table: https://en.cppreference.com/w/cpp/language/operator_precedence + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, &) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, ^) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, |) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, &&) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, ||) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, =) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, +=) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, -=) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, *=) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, /=) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, %=) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, <<=) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, >>=) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, &=) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, ^=) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, |=) + // these 2 are unfortunate because they should be allowed - they have higher precedence over the comparisons, but the + // ExpressionDecomposer class uses the left shift operator to capture the left operand of the binary expression... + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, <<) + DOCTEST_FORBIT_EXPRESSION(Expression_lhs, >>) + }; + +#ifndef DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION + + DOCTEST_CLANG_SUPPRESS_WARNING_POP + DOCTEST_MSVC_SUPPRESS_WARNING_POP + DOCTEST_GCC_SUPPRESS_WARNING_POP + +#endif // DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION + +#if DOCTEST_CLANG && DOCTEST_CLANG < DOCTEST_COMPILER(3, 6, 0) +DOCTEST_CLANG_SUPPRESS_WARNING_POP +#endif + + struct DOCTEST_INTERFACE ExpressionDecomposer + { + assertType::Enum m_at; + + ExpressionDecomposer(assertType::Enum at); + + // The right operator for capturing expressions is "<=" instead of "<<" (based on the operator precedence table) + // but then there will be warnings from GCC about "-Wparentheses" and since "_Pragma()" is problematic this will stay for now... + // https://github.com/catchorg/Catch2/issues/870 + // https://github.com/catchorg/Catch2/issues/565 + template + Expression_lhs operator<<(L&& operand) { + return Expression_lhs(static_cast(operand), m_at); + } + + template ::value,void >::type* = nullptr> + Expression_lhs operator<<(const L &operand) { + return Expression_lhs(operand, m_at); + } + }; + + struct DOCTEST_INTERFACE TestSuite + { + const char* m_test_suite = nullptr; + const char* m_description = nullptr; + bool m_skip = false; + bool m_no_breaks = false; + bool m_no_output = false; + bool m_may_fail = false; + bool m_should_fail = false; + int m_expected_failures = 0; + double m_timeout = 0; + + TestSuite& operator*(const char* in); + + template + TestSuite& operator*(const T& in) { + in.fill(*this); + return *this; + } + }; + + using funcType = void (*)(); + + struct DOCTEST_INTERFACE TestCase : public TestCaseData + { + funcType m_test; // a function pointer to the test case + + String m_type; // for templated test cases - gets appended to the real name + int m_template_id; // an ID used to distinguish between the different versions of a templated test case + String m_full_name; // contains the name (only for templated test cases!) + the template type + + TestCase(funcType test, const char* file, unsigned line, const TestSuite& test_suite, + const String& type = String(), int template_id = -1); + + TestCase(const TestCase& other); + TestCase(TestCase&&) = delete; + + DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(26434) // hides a non-virtual function + TestCase& operator=(const TestCase& other); + DOCTEST_MSVC_SUPPRESS_WARNING_POP + + TestCase& operator=(TestCase&&) = delete; + + TestCase& operator*(const char* in); + + template + TestCase& operator*(const T& in) { + in.fill(*this); + return *this; + } + + bool operator<(const TestCase& other) const; + + ~TestCase() = default; + }; + + // forward declarations of functions used by the macros + DOCTEST_INTERFACE int regTest(const TestCase& tc); + DOCTEST_INTERFACE int setTestSuite(const TestSuite& ts); + DOCTEST_INTERFACE bool isDebuggerActive(); + + template + int instantiationHelper(const T&) { return 0; } + + namespace binaryAssertComparison { + enum Enum + { + eq = 0, + ne, + gt, + lt, + ge, + le + }; + } // namespace binaryAssertComparison + + // clang-format off + template struct RelationalComparator { bool operator()(const DOCTEST_REF_WRAP(L), const DOCTEST_REF_WRAP(R) ) const { return false; } }; + +#define DOCTEST_BINARY_RELATIONAL_OP(n, op) \ + template struct RelationalComparator { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return op(lhs, rhs); } }; + // clang-format on + + DOCTEST_BINARY_RELATIONAL_OP(0, doctest::detail::eq) + DOCTEST_BINARY_RELATIONAL_OP(1, doctest::detail::ne) + DOCTEST_BINARY_RELATIONAL_OP(2, doctest::detail::gt) + DOCTEST_BINARY_RELATIONAL_OP(3, doctest::detail::lt) + DOCTEST_BINARY_RELATIONAL_OP(4, doctest::detail::ge) + DOCTEST_BINARY_RELATIONAL_OP(5, doctest::detail::le) + + struct DOCTEST_INTERFACE ResultBuilder : public AssertData + { + ResultBuilder(assertType::Enum at, const char* file, int line, const char* expr, + const char* exception_type = "", const String& exception_string = ""); + + ResultBuilder(assertType::Enum at, const char* file, int line, const char* expr, + const char* exception_type, const Contains& exception_string); + + void setResult(const Result& res); + + template + DOCTEST_NOINLINE bool binary_assert(const DOCTEST_REF_WRAP(L) lhs, + const DOCTEST_REF_WRAP(R) rhs) { + m_failed = !RelationalComparator()(lhs, rhs); + if (m_failed || getContextOptions()->success) { + m_decomp = stringifyBinaryExpr(lhs, ", ", rhs); + } + return !m_failed; + } + + template + DOCTEST_NOINLINE bool unary_assert(const DOCTEST_REF_WRAP(L) val) { + m_failed = !val; + + if (m_at & assertType::is_false) { //!OCLINT bitwise operator in conditional + m_failed = !m_failed; + } + + if (m_failed || getContextOptions()->success) { + m_decomp = (DOCTEST_STRINGIFY(val)); + } + + return !m_failed; + } + + void translateException(); + + bool log(); + void react() const; + }; + + namespace assertAction { + enum Enum + { + nothing = 0, + dbgbreak = 1, + shouldthrow = 2 + }; + } // namespace assertAction + + DOCTEST_INTERFACE void failed_out_of_a_testing_context(const AssertData& ad); + + DOCTEST_INTERFACE bool decomp_assert(assertType::Enum at, const char* file, int line, + const char* expr, const Result& result); + +#define DOCTEST_ASSERT_OUT_OF_TESTS(decomp) \ + do { \ + if(!is_running_in_test) { \ + if(failed) { \ + ResultBuilder rb(at, file, line, expr); \ + rb.m_failed = failed; \ + rb.m_decomp = decomp; \ + failed_out_of_a_testing_context(rb); \ + if(isDebuggerActive() && !getContextOptions()->no_breaks) \ + DOCTEST_BREAK_INTO_DEBUGGER(); \ + if(checkIfShouldThrow(at)) \ + throwException(); \ + } \ + return !failed; \ + } \ + } while(false) + +#define DOCTEST_ASSERT_IN_TESTS(decomp) \ + ResultBuilder rb(at, file, line, expr); \ + rb.m_failed = failed; \ + if(rb.m_failed || getContextOptions()->success) \ + rb.m_decomp = decomp; \ + if(rb.log()) \ + DOCTEST_BREAK_INTO_DEBUGGER(); \ + if(rb.m_failed && checkIfShouldThrow(at)) \ + throwException() + + template + DOCTEST_NOINLINE bool binary_assert(assertType::Enum at, const char* file, int line, + const char* expr, const DOCTEST_REF_WRAP(L) lhs, + const DOCTEST_REF_WRAP(R) rhs) { + bool failed = !RelationalComparator()(lhs, rhs); + + // ################################################################################### + // IF THE DEBUGGER BREAKS HERE - GO 1 LEVEL UP IN THE CALLSTACK FOR THE FAILING ASSERT + // THIS IS THE EFFECT OF HAVING 'DOCTEST_CONFIG_SUPER_FAST_ASSERTS' DEFINED + // ################################################################################### + DOCTEST_ASSERT_OUT_OF_TESTS(stringifyBinaryExpr(lhs, ", ", rhs)); + DOCTEST_ASSERT_IN_TESTS(stringifyBinaryExpr(lhs, ", ", rhs)); + return !failed; + } + + template + DOCTEST_NOINLINE bool unary_assert(assertType::Enum at, const char* file, int line, + const char* expr, const DOCTEST_REF_WRAP(L) val) { + bool failed = !val; + + if(at & assertType::is_false) //!OCLINT bitwise operator in conditional + failed = !failed; + + // ################################################################################### + // IF THE DEBUGGER BREAKS HERE - GO 1 LEVEL UP IN THE CALLSTACK FOR THE FAILING ASSERT + // THIS IS THE EFFECT OF HAVING 'DOCTEST_CONFIG_SUPER_FAST_ASSERTS' DEFINED + // ################################################################################### + DOCTEST_ASSERT_OUT_OF_TESTS((DOCTEST_STRINGIFY(val))); + DOCTEST_ASSERT_IN_TESTS((DOCTEST_STRINGIFY(val))); + return !failed; + } + + struct DOCTEST_INTERFACE IExceptionTranslator + { + DOCTEST_DECLARE_INTERFACE(IExceptionTranslator) + virtual bool translate(String&) const = 0; + }; + + template + class ExceptionTranslator : public IExceptionTranslator //!OCLINT destructor of virtual class + { + public: + explicit ExceptionTranslator(String (*translateFunction)(T)) + : m_translateFunction(translateFunction) {} + + bool translate(String& res) const override { +#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS + try { + throw; // lgtm [cpp/rethrow-no-exception] + // cppcheck-suppress catchExceptionByValue + } catch(const T& ex) { + res = m_translateFunction(ex); //!OCLINT parameter reassignment + return true; + } catch(...) {} //!OCLINT - empty catch statement +#endif // DOCTEST_CONFIG_NO_EXCEPTIONS + static_cast(res); // to silence -Wunused-parameter + return false; + } + + private: + String (*m_translateFunction)(T); + }; + + DOCTEST_INTERFACE void registerExceptionTranslatorImpl(const IExceptionTranslator* et); + + // ContextScope base class used to allow implementing methods of ContextScope + // that don't depend on the template parameter in doctest.cpp. + struct DOCTEST_INTERFACE ContextScopeBase : public IContextScope { + ContextScopeBase(const ContextScopeBase&) = delete; + + ContextScopeBase& operator=(const ContextScopeBase&) = delete; + ContextScopeBase& operator=(ContextScopeBase&&) = delete; + + ~ContextScopeBase() override = default; + + protected: + ContextScopeBase(); + ContextScopeBase(ContextScopeBase&& other) noexcept; + + void destroy(); + bool need_to_destroy{true}; + }; + + template class ContextScope : public ContextScopeBase + { + L lambda_; + + public: + explicit ContextScope(const L &lambda) : lambda_(lambda) {} + explicit ContextScope(L&& lambda) : lambda_(static_cast(lambda)) { } + + ContextScope(const ContextScope&) = delete; + ContextScope(ContextScope&&) noexcept = default; + + ContextScope& operator=(const ContextScope&) = delete; + ContextScope& operator=(ContextScope&&) = delete; + + void stringify(std::ostream* s) const override { lambda_(s); } + + ~ContextScope() override { + if (need_to_destroy) { + destroy(); + } + } + }; + + struct DOCTEST_INTERFACE MessageBuilder : public MessageData + { + std::ostream* m_stream; + bool logged = false; + + MessageBuilder(const char* file, int line, assertType::Enum severity); + + MessageBuilder(const MessageBuilder&) = delete; + MessageBuilder(MessageBuilder&&) = delete; + + MessageBuilder& operator=(const MessageBuilder&) = delete; + MessageBuilder& operator=(MessageBuilder&&) = delete; + + ~MessageBuilder(); + + // the preferred way of chaining parameters for stringification +DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4866) + template + MessageBuilder& operator,(const T& in) { + *m_stream << (DOCTEST_STRINGIFY(in)); + return *this; + } +DOCTEST_MSVC_SUPPRESS_WARNING_POP + + // kept here just for backwards-compatibility - the comma operator should be preferred now + template + MessageBuilder& operator<<(const T& in) { return this->operator,(in); } + + // the `,` operator has the lowest operator precedence - if `<<` is used by the user then + // the `,` operator will be called last which is not what we want and thus the `*` operator + // is used first (has higher operator precedence compared to `<<`) so that we guarantee that + // an operator of the MessageBuilder class is called first before the rest of the parameters + template + MessageBuilder& operator*(const T& in) { return this->operator,(in); } + + bool log(); + void react(); + }; + + template + ContextScope MakeContextScope(const L &lambda) { + return ContextScope(lambda); + } +} // namespace detail + +#define DOCTEST_DEFINE_DECORATOR(name, type, def) \ + struct name \ + { \ + type data; \ + name(type in = def) \ + : data(in) {} \ + void fill(detail::TestCase& state) const { state.DOCTEST_CAT(m_, name) = data; } \ + void fill(detail::TestSuite& state) const { state.DOCTEST_CAT(m_, name) = data; } \ + } + +DOCTEST_DEFINE_DECORATOR(test_suite, const char*, ""); +DOCTEST_DEFINE_DECORATOR(description, const char*, ""); +DOCTEST_DEFINE_DECORATOR(skip, bool, true); +DOCTEST_DEFINE_DECORATOR(no_breaks, bool, true); +DOCTEST_DEFINE_DECORATOR(no_output, bool, true); +DOCTEST_DEFINE_DECORATOR(timeout, double, 0); +DOCTEST_DEFINE_DECORATOR(may_fail, bool, true); +DOCTEST_DEFINE_DECORATOR(should_fail, bool, true); +DOCTEST_DEFINE_DECORATOR(expected_failures, int, 0); + +template +int registerExceptionTranslator(String (*translateFunction)(T)) { + DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wexit-time-destructors") + static detail::ExceptionTranslator exceptionTranslator(translateFunction); + DOCTEST_CLANG_SUPPRESS_WARNING_POP + detail::registerExceptionTranslatorImpl(&exceptionTranslator); + return 0; +} + +} // namespace doctest + +// in a separate namespace outside of doctest because the DOCTEST_TEST_SUITE macro +// introduces an anonymous namespace in which getCurrentTestSuite gets overridden +namespace doctest_detail_test_suite_ns { +DOCTEST_INTERFACE doctest::detail::TestSuite& getCurrentTestSuite(); +} // namespace doctest_detail_test_suite_ns + +namespace doctest { +#else // DOCTEST_CONFIG_DISABLE +template +int registerExceptionTranslator(String (*)(T)) { + return 0; +} +#endif // DOCTEST_CONFIG_DISABLE + +namespace detail { + using assert_handler = void (*)(const AssertData&); + struct ContextState; +} // namespace detail + +class DOCTEST_INTERFACE Context +{ + detail::ContextState* p; + + void parseArgs(int argc, const char* const* argv, bool withDefaults = false); + +public: + explicit Context(int argc = 0, const char* const* argv = nullptr); + + Context(const Context&) = delete; + Context(Context&&) = delete; + + Context& operator=(const Context&) = delete; + Context& operator=(Context&&) = delete; + + ~Context(); // NOLINT(performance-trivially-destructible) + + void applyCommandLine(int argc, const char* const* argv); + + void addFilter(const char* filter, const char* value); + void clearFilters(); + void setOption(const char* option, bool value); + void setOption(const char* option, int value); + void setOption(const char* option, const char* value); + + bool shouldExit(); + + void setAsDefaultForAssertsOutOfTestCases(); + + void setAssertHandler(detail::assert_handler ah); + + void setCout(std::ostream* out); + + int run(); +}; + +namespace TestCaseFailureReason { + enum Enum + { + None = 0, + AssertFailure = 1, // an assertion has failed in the test case + Exception = 2, // test case threw an exception + Crash = 4, // a crash... + TooManyFailedAsserts = 8, // the abort-after option + Timeout = 16, // see the timeout decorator + ShouldHaveFailedButDidnt = 32, // see the should_fail decorator + ShouldHaveFailedAndDid = 64, // see the should_fail decorator + DidntFailExactlyNumTimes = 128, // see the expected_failures decorator + FailedExactlyNumTimes = 256, // see the expected_failures decorator + CouldHaveFailedAndDid = 512 // see the may_fail decorator + }; +} // namespace TestCaseFailureReason + +struct DOCTEST_INTERFACE CurrentTestCaseStats +{ + int numAssertsCurrentTest; + int numAssertsFailedCurrentTest; + double seconds; + int failure_flags; // use TestCaseFailureReason::Enum + bool testCaseSuccess; +}; + +struct DOCTEST_INTERFACE TestCaseException +{ + String error_string; + bool is_crash; +}; + +struct DOCTEST_INTERFACE TestRunStats +{ + unsigned numTestCases; + unsigned numTestCasesPassingFilters; + unsigned numTestSuitesPassingFilters; + unsigned numTestCasesFailed; + int numAsserts; + int numAssertsFailed; +}; + +struct QueryData +{ + const TestRunStats* run_stats = nullptr; + const TestCaseData** data = nullptr; + unsigned num_data = 0; +}; + +struct DOCTEST_INTERFACE IReporter +{ + // The constructor has to accept "const ContextOptions&" as a single argument + // which has most of the options for the run + a pointer to the stdout stream + // Reporter(const ContextOptions& in) + + // called when a query should be reported (listing test cases, printing the version, etc.) + virtual void report_query(const QueryData&) = 0; + + // called when the whole test run starts + virtual void test_run_start() = 0; + // called when the whole test run ends (caching a pointer to the input doesn't make sense here) + virtual void test_run_end(const TestRunStats&) = 0; + + // called when a test case is started (safe to cache a pointer to the input) + virtual void test_case_start(const TestCaseData&) = 0; + // called when a test case is reentered because of unfinished subcases (safe to cache a pointer to the input) + virtual void test_case_reenter(const TestCaseData&) = 0; + // called when a test case has ended + virtual void test_case_end(const CurrentTestCaseStats&) = 0; + + // called when an exception is thrown from the test case (or it crashes) + virtual void test_case_exception(const TestCaseException&) = 0; + + // called whenever a subcase is entered (don't cache pointers to the input) + virtual void subcase_start(const SubcaseSignature&) = 0; + // called whenever a subcase is exited (don't cache pointers to the input) + virtual void subcase_end() = 0; + + // called for each assert (don't cache pointers to the input) + virtual void log_assert(const AssertData&) = 0; + // called for each message (don't cache pointers to the input) + virtual void log_message(const MessageData&) = 0; + + // called when a test case is skipped either because it doesn't pass the filters, has a skip decorator + // or isn't in the execution range (between first and last) (safe to cache a pointer to the input) + virtual void test_case_skipped(const TestCaseData&) = 0; + + DOCTEST_DECLARE_INTERFACE(IReporter) + + // can obtain all currently active contexts and stringify them if one wishes to do so + static int get_num_active_contexts(); + static const IContextScope* const* get_active_contexts(); + + // can iterate through contexts which have been stringified automatically in their destructors when an exception has been thrown + static int get_num_stringified_contexts(); + static const String* get_stringified_contexts(); +}; + +namespace detail { + using reporterCreatorFunc = IReporter* (*)(const ContextOptions&); + + DOCTEST_INTERFACE void registerReporterImpl(const char* name, int prio, reporterCreatorFunc c, bool isReporter); + + template + IReporter* reporterCreator(const ContextOptions& o) { + return new Reporter(o); + } +} // namespace detail + +template +int registerReporter(const char* name, int priority, bool isReporter) { + detail::registerReporterImpl(name, priority, detail::reporterCreator, isReporter); + return 0; +} +} // namespace doctest + +#ifdef DOCTEST_CONFIG_ASSERTS_RETURN_VALUES +#define DOCTEST_FUNC_EMPTY [] { return false; }() +#else +#define DOCTEST_FUNC_EMPTY (void)0 +#endif + +// if registering is not disabled +#ifndef DOCTEST_CONFIG_DISABLE + +#ifdef DOCTEST_CONFIG_ASSERTS_RETURN_VALUES +#define DOCTEST_FUNC_SCOPE_BEGIN [&] +#define DOCTEST_FUNC_SCOPE_END () +#define DOCTEST_FUNC_SCOPE_RET(v) return v +#else +#define DOCTEST_FUNC_SCOPE_BEGIN do +#define DOCTEST_FUNC_SCOPE_END while(false) +#define DOCTEST_FUNC_SCOPE_RET(v) (void)0 +#endif + +// common code in asserts - for convenience +#define DOCTEST_ASSERT_LOG_REACT_RETURN(b) \ + if(b.log()) DOCTEST_BREAK_INTO_DEBUGGER(); \ + b.react(); \ + DOCTEST_FUNC_SCOPE_RET(!b.m_failed) + +#ifdef DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS +#define DOCTEST_WRAP_IN_TRY(x) x; +#else // DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS +#define DOCTEST_WRAP_IN_TRY(x) \ + try { \ + x; \ + } catch(...) { DOCTEST_RB.translateException(); } +#endif // DOCTEST_CONFIG_NO_TRY_CATCH_IN_ASSERTS + +#ifdef DOCTEST_CONFIG_VOID_CAST_EXPRESSIONS +#define DOCTEST_CAST_TO_VOID(...) \ + DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wuseless-cast") \ + static_cast(__VA_ARGS__); \ + DOCTEST_GCC_SUPPRESS_WARNING_POP +#else // DOCTEST_CONFIG_VOID_CAST_EXPRESSIONS +#define DOCTEST_CAST_TO_VOID(...) __VA_ARGS__; +#endif // DOCTEST_CONFIG_VOID_CAST_EXPRESSIONS + +// registers the test by initializing a dummy var with a function +#define DOCTEST_REGISTER_FUNCTION(global_prefix, f, decorators) \ + global_prefix DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(DOCTEST_ANON_VAR_), /* NOLINT */ \ + doctest::detail::regTest( \ + doctest::detail::TestCase( \ + f, __FILE__, __LINE__, \ + doctest_detail_test_suite_ns::getCurrentTestSuite()) * \ + decorators)) + +#define DOCTEST_IMPLEMENT_FIXTURE(der, base, func, decorators) \ + namespace { /* NOLINT */ \ + struct der : public base \ + { \ + void f(); \ + }; \ + static DOCTEST_INLINE_NOINLINE void func() { \ + der v; \ + v.f(); \ + } \ + DOCTEST_REGISTER_FUNCTION(DOCTEST_EMPTY, func, decorators) \ + } \ + DOCTEST_INLINE_NOINLINE void der::f() // NOLINT(misc-definitions-in-headers) + +#define DOCTEST_CREATE_AND_REGISTER_FUNCTION(f, decorators) \ + static void f(); \ + DOCTEST_REGISTER_FUNCTION(DOCTEST_EMPTY, f, decorators) \ + static void f() + +#define DOCTEST_CREATE_AND_REGISTER_FUNCTION_IN_CLASS(f, proxy, decorators) \ + static doctest::detail::funcType proxy() { return f; } \ + DOCTEST_REGISTER_FUNCTION(inline, proxy(), decorators) \ + static void f() + +// for registering tests +#define DOCTEST_TEST_CASE(decorators) \ + DOCTEST_CREATE_AND_REGISTER_FUNCTION(DOCTEST_ANONYMOUS(DOCTEST_ANON_FUNC_), decorators) + +// for registering tests in classes - requires C++17 for inline variables! +#if DOCTEST_CPLUSPLUS >= 201703L +#define DOCTEST_TEST_CASE_CLASS(decorators) \ + DOCTEST_CREATE_AND_REGISTER_FUNCTION_IN_CLASS(DOCTEST_ANONYMOUS(DOCTEST_ANON_FUNC_), \ + DOCTEST_ANONYMOUS(DOCTEST_ANON_PROXY_), \ + decorators) +#else // DOCTEST_TEST_CASE_CLASS +#define DOCTEST_TEST_CASE_CLASS(...) \ + TEST_CASES_CAN_BE_REGISTERED_IN_CLASSES_ONLY_IN_CPP17_MODE_OR_WITH_VS_2017_OR_NEWER +#endif // DOCTEST_TEST_CASE_CLASS + +// for registering tests with a fixture +#define DOCTEST_TEST_CASE_FIXTURE(c, decorators) \ + DOCTEST_IMPLEMENT_FIXTURE(DOCTEST_ANONYMOUS(DOCTEST_ANON_CLASS_), c, \ + DOCTEST_ANONYMOUS(DOCTEST_ANON_FUNC_), decorators) + +// for converting types to strings without the header and demangling +#define DOCTEST_TYPE_TO_STRING_AS(str, ...) \ + namespace doctest { \ + template <> \ + inline String toString<__VA_ARGS__>() { \ + return str; \ + } \ + } \ + static_assert(true, "") + +#define DOCTEST_TYPE_TO_STRING(...) DOCTEST_TYPE_TO_STRING_AS(#__VA_ARGS__, __VA_ARGS__) + +#define DOCTEST_TEST_CASE_TEMPLATE_DEFINE_IMPL(dec, T, iter, func) \ + template \ + static void func(); \ + namespace { /* NOLINT */ \ + template \ + struct iter; \ + template \ + struct iter> \ + { \ + iter(const char* file, unsigned line, int index) { \ + doctest::detail::regTest(doctest::detail::TestCase(func, file, line, \ + doctest_detail_test_suite_ns::getCurrentTestSuite(), \ + doctest::toString(), \ + int(line) * 1000 + index) \ + * dec); \ + iter>(file, line, index + 1); \ + } \ + }; \ + template <> \ + struct iter> \ + { \ + iter(const char*, unsigned, int) {} \ + }; \ + } \ + template \ + static void func() + +#define DOCTEST_TEST_CASE_TEMPLATE_DEFINE(dec, T, id) \ + DOCTEST_TEST_CASE_TEMPLATE_DEFINE_IMPL(dec, T, DOCTEST_CAT(id, ITERATOR), \ + DOCTEST_ANONYMOUS(DOCTEST_ANON_TMP_)) + +#define DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(id, anon, ...) \ + DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_CAT(anon, DUMMY), /* NOLINT(cert-err58-cpp, fuchsia-statically-constructed-objects) */ \ + doctest::detail::instantiationHelper( \ + DOCTEST_CAT(id, ITERATOR)<__VA_ARGS__>(__FILE__, __LINE__, 0))) + +#define DOCTEST_TEST_CASE_TEMPLATE_INVOKE(id, ...) \ + DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(id, DOCTEST_ANONYMOUS(DOCTEST_ANON_TMP_), std::tuple<__VA_ARGS__>) \ + static_assert(true, "") + +#define DOCTEST_TEST_CASE_TEMPLATE_APPLY(id, ...) \ + DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(id, DOCTEST_ANONYMOUS(DOCTEST_ANON_TMP_), __VA_ARGS__) \ + static_assert(true, "") + +#define DOCTEST_TEST_CASE_TEMPLATE_IMPL(dec, T, anon, ...) \ + DOCTEST_TEST_CASE_TEMPLATE_DEFINE_IMPL(dec, T, DOCTEST_CAT(anon, ITERATOR), anon); \ + DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE_IMPL(anon, anon, std::tuple<__VA_ARGS__>) \ + template \ + static void anon() + +#define DOCTEST_TEST_CASE_TEMPLATE(dec, T, ...) \ + DOCTEST_TEST_CASE_TEMPLATE_IMPL(dec, T, DOCTEST_ANONYMOUS(DOCTEST_ANON_TMP_), __VA_ARGS__) + +// for subcases +#define DOCTEST_SUBCASE(name) \ + if(const doctest::detail::Subcase & DOCTEST_ANONYMOUS(DOCTEST_ANON_SUBCASE_) DOCTEST_UNUSED = \ + doctest::detail::Subcase(name, __FILE__, __LINE__)) + +// for grouping tests in test suites by using code blocks +#define DOCTEST_TEST_SUITE_IMPL(decorators, ns_name) \ + namespace ns_name { namespace doctest_detail_test_suite_ns { \ + static DOCTEST_NOINLINE doctest::detail::TestSuite& getCurrentTestSuite() noexcept { \ + DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4640) \ + DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wexit-time-destructors") \ + DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wmissing-field-initializers") \ + static doctest::detail::TestSuite data{}; \ + static bool inited = false; \ + DOCTEST_MSVC_SUPPRESS_WARNING_POP \ + DOCTEST_CLANG_SUPPRESS_WARNING_POP \ + DOCTEST_GCC_SUPPRESS_WARNING_POP \ + if(!inited) { \ + data* decorators; \ + inited = true; \ + } \ + return data; \ + } \ + } \ + } \ + namespace ns_name + +#define DOCTEST_TEST_SUITE(decorators) \ + DOCTEST_TEST_SUITE_IMPL(decorators, DOCTEST_ANONYMOUS(DOCTEST_ANON_SUITE_)) + +// for starting a testsuite block +#define DOCTEST_TEST_SUITE_BEGIN(decorators) \ + DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(DOCTEST_ANON_VAR_), /* NOLINT(cert-err58-cpp) */ \ + doctest::detail::setTestSuite(doctest::detail::TestSuite() * decorators)) \ + static_assert(true, "") + +// for ending a testsuite block +#define DOCTEST_TEST_SUITE_END \ + DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(DOCTEST_ANON_VAR_), /* NOLINT(cert-err58-cpp) */ \ + doctest::detail::setTestSuite(doctest::detail::TestSuite() * "")) \ + using DOCTEST_ANONYMOUS(DOCTEST_ANON_FOR_SEMICOLON_) = int + +// for registering exception translators +#define DOCTEST_REGISTER_EXCEPTION_TRANSLATOR_IMPL(translatorName, signature) \ + inline doctest::String translatorName(signature); \ + DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(DOCTEST_ANON_TRANSLATOR_), /* NOLINT(cert-err58-cpp) */ \ + doctest::registerExceptionTranslator(translatorName)) \ + doctest::String translatorName(signature) + +#define DOCTEST_REGISTER_EXCEPTION_TRANSLATOR(signature) \ + DOCTEST_REGISTER_EXCEPTION_TRANSLATOR_IMPL(DOCTEST_ANONYMOUS(DOCTEST_ANON_TRANSLATOR_), \ + signature) + +// for registering reporters +#define DOCTEST_REGISTER_REPORTER(name, priority, reporter) \ + DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(DOCTEST_ANON_REPORTER_), /* NOLINT(cert-err58-cpp) */ \ + doctest::registerReporter(name, priority, true)) \ + static_assert(true, "") + +// for registering listeners +#define DOCTEST_REGISTER_LISTENER(name, priority, reporter) \ + DOCTEST_GLOBAL_NO_WARNINGS(DOCTEST_ANONYMOUS(DOCTEST_ANON_REPORTER_), /* NOLINT(cert-err58-cpp) */ \ + doctest::registerReporter(name, priority, false)) \ + static_assert(true, "") + +// clang-format off +// for logging - disabling formatting because it's important to have these on 2 separate lines - see PR #557 +#define DOCTEST_INFO(...) \ + DOCTEST_INFO_IMPL(DOCTEST_ANONYMOUS(DOCTEST_CAPTURE_), \ + DOCTEST_ANONYMOUS(DOCTEST_CAPTURE_OTHER_), \ + __VA_ARGS__) +// clang-format on + +#define DOCTEST_INFO_IMPL(mb_name, s_name, ...) \ + auto DOCTEST_ANONYMOUS(DOCTEST_CAPTURE_) = doctest::detail::MakeContextScope( \ + [&](std::ostream* s_name) { \ + doctest::detail::MessageBuilder mb_name(__FILE__, __LINE__, doctest::assertType::is_warn); \ + mb_name.m_stream = s_name; \ + mb_name * __VA_ARGS__; \ + }) + +#define DOCTEST_CAPTURE(x) DOCTEST_INFO(#x " := ", x) + +#define DOCTEST_ADD_AT_IMPL(type, file, line, mb, ...) \ + DOCTEST_FUNC_SCOPE_BEGIN { \ + doctest::detail::MessageBuilder mb(file, line, doctest::assertType::type); \ + mb * __VA_ARGS__; \ + if(mb.log()) \ + DOCTEST_BREAK_INTO_DEBUGGER(); \ + mb.react(); \ + } DOCTEST_FUNC_SCOPE_END + +// clang-format off +#define DOCTEST_ADD_MESSAGE_AT(file, line, ...) DOCTEST_ADD_AT_IMPL(is_warn, file, line, DOCTEST_ANONYMOUS(DOCTEST_MESSAGE_), __VA_ARGS__) +#define DOCTEST_ADD_FAIL_CHECK_AT(file, line, ...) DOCTEST_ADD_AT_IMPL(is_check, file, line, DOCTEST_ANONYMOUS(DOCTEST_MESSAGE_), __VA_ARGS__) +#define DOCTEST_ADD_FAIL_AT(file, line, ...) DOCTEST_ADD_AT_IMPL(is_require, file, line, DOCTEST_ANONYMOUS(DOCTEST_MESSAGE_), __VA_ARGS__) +// clang-format on + +#define DOCTEST_MESSAGE(...) DOCTEST_ADD_MESSAGE_AT(__FILE__, __LINE__, __VA_ARGS__) +#define DOCTEST_FAIL_CHECK(...) DOCTEST_ADD_FAIL_CHECK_AT(__FILE__, __LINE__, __VA_ARGS__) +#define DOCTEST_FAIL(...) DOCTEST_ADD_FAIL_AT(__FILE__, __LINE__, __VA_ARGS__) + +#define DOCTEST_TO_LVALUE(...) __VA_ARGS__ // Not removed to keep backwards compatibility. + +#ifndef DOCTEST_CONFIG_SUPER_FAST_ASSERTS + +#define DOCTEST_ASSERT_IMPLEMENT_2(assert_type, ...) \ + DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Woverloaded-shift-op-parentheses") \ + /* NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) */ \ + doctest::detail::ResultBuilder DOCTEST_RB(doctest::assertType::assert_type, __FILE__, \ + __LINE__, #__VA_ARGS__); \ + DOCTEST_WRAP_IN_TRY(DOCTEST_RB.setResult( \ + doctest::detail::ExpressionDecomposer(doctest::assertType::assert_type) \ + << __VA_ARGS__)) /* NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) */ \ + DOCTEST_ASSERT_LOG_REACT_RETURN(DOCTEST_RB) \ + DOCTEST_CLANG_SUPPRESS_WARNING_POP + +#define DOCTEST_ASSERT_IMPLEMENT_1(assert_type, ...) \ + DOCTEST_FUNC_SCOPE_BEGIN { \ + DOCTEST_ASSERT_IMPLEMENT_2(assert_type, __VA_ARGS__); \ + } DOCTEST_FUNC_SCOPE_END // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) + +#define DOCTEST_BINARY_ASSERT(assert_type, comp, ...) \ + DOCTEST_FUNC_SCOPE_BEGIN { \ + doctest::detail::ResultBuilder DOCTEST_RB(doctest::assertType::assert_type, __FILE__, \ + __LINE__, #__VA_ARGS__); \ + DOCTEST_WRAP_IN_TRY( \ + DOCTEST_RB.binary_assert( \ + __VA_ARGS__)) \ + DOCTEST_ASSERT_LOG_REACT_RETURN(DOCTEST_RB); \ + } DOCTEST_FUNC_SCOPE_END + +#define DOCTEST_UNARY_ASSERT(assert_type, ...) \ + DOCTEST_FUNC_SCOPE_BEGIN { \ + doctest::detail::ResultBuilder DOCTEST_RB(doctest::assertType::assert_type, __FILE__, \ + __LINE__, #__VA_ARGS__); \ + DOCTEST_WRAP_IN_TRY(DOCTEST_RB.unary_assert(__VA_ARGS__)) \ + DOCTEST_ASSERT_LOG_REACT_RETURN(DOCTEST_RB); \ + } DOCTEST_FUNC_SCOPE_END + +#else // DOCTEST_CONFIG_SUPER_FAST_ASSERTS + +// necessary for _MESSAGE +#define DOCTEST_ASSERT_IMPLEMENT_2 DOCTEST_ASSERT_IMPLEMENT_1 + +#define DOCTEST_ASSERT_IMPLEMENT_1(assert_type, ...) \ + DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Woverloaded-shift-op-parentheses") \ + doctest::detail::decomp_assert( \ + doctest::assertType::assert_type, __FILE__, __LINE__, #__VA_ARGS__, \ + doctest::detail::ExpressionDecomposer(doctest::assertType::assert_type) \ + << __VA_ARGS__) DOCTEST_CLANG_SUPPRESS_WARNING_POP + +#define DOCTEST_BINARY_ASSERT(assert_type, comparison, ...) \ + doctest::detail::binary_assert( \ + doctest::assertType::assert_type, __FILE__, __LINE__, #__VA_ARGS__, __VA_ARGS__) + +#define DOCTEST_UNARY_ASSERT(assert_type, ...) \ + doctest::detail::unary_assert(doctest::assertType::assert_type, __FILE__, __LINE__, \ + #__VA_ARGS__, __VA_ARGS__) + +#endif // DOCTEST_CONFIG_SUPER_FAST_ASSERTS + +#define DOCTEST_WARN(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_WARN, __VA_ARGS__) +#define DOCTEST_CHECK(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_CHECK, __VA_ARGS__) +#define DOCTEST_REQUIRE(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_REQUIRE, __VA_ARGS__) +#define DOCTEST_WARN_FALSE(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_WARN_FALSE, __VA_ARGS__) +#define DOCTEST_CHECK_FALSE(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_CHECK_FALSE, __VA_ARGS__) +#define DOCTEST_REQUIRE_FALSE(...) DOCTEST_ASSERT_IMPLEMENT_1(DT_REQUIRE_FALSE, __VA_ARGS__) + +// clang-format off +#define DOCTEST_WARN_MESSAGE(cond, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_WARN, cond); } DOCTEST_FUNC_SCOPE_END +#define DOCTEST_CHECK_MESSAGE(cond, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_CHECK, cond); } DOCTEST_FUNC_SCOPE_END +#define DOCTEST_REQUIRE_MESSAGE(cond, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_REQUIRE, cond); } DOCTEST_FUNC_SCOPE_END +#define DOCTEST_WARN_FALSE_MESSAGE(cond, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_WARN_FALSE, cond); } DOCTEST_FUNC_SCOPE_END +#define DOCTEST_CHECK_FALSE_MESSAGE(cond, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_CHECK_FALSE, cond); } DOCTEST_FUNC_SCOPE_END +#define DOCTEST_REQUIRE_FALSE_MESSAGE(cond, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_ASSERT_IMPLEMENT_2(DT_REQUIRE_FALSE, cond); } DOCTEST_FUNC_SCOPE_END +// clang-format on + +#define DOCTEST_WARN_EQ(...) DOCTEST_BINARY_ASSERT(DT_WARN_EQ, eq, __VA_ARGS__) +#define DOCTEST_CHECK_EQ(...) DOCTEST_BINARY_ASSERT(DT_CHECK_EQ, eq, __VA_ARGS__) +#define DOCTEST_REQUIRE_EQ(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_EQ, eq, __VA_ARGS__) +#define DOCTEST_WARN_NE(...) DOCTEST_BINARY_ASSERT(DT_WARN_NE, ne, __VA_ARGS__) +#define DOCTEST_CHECK_NE(...) DOCTEST_BINARY_ASSERT(DT_CHECK_NE, ne, __VA_ARGS__) +#define DOCTEST_REQUIRE_NE(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_NE, ne, __VA_ARGS__) +#define DOCTEST_WARN_GT(...) DOCTEST_BINARY_ASSERT(DT_WARN_GT, gt, __VA_ARGS__) +#define DOCTEST_CHECK_GT(...) DOCTEST_BINARY_ASSERT(DT_CHECK_GT, gt, __VA_ARGS__) +#define DOCTEST_REQUIRE_GT(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_GT, gt, __VA_ARGS__) +#define DOCTEST_WARN_LT(...) DOCTEST_BINARY_ASSERT(DT_WARN_LT, lt, __VA_ARGS__) +#define DOCTEST_CHECK_LT(...) DOCTEST_BINARY_ASSERT(DT_CHECK_LT, lt, __VA_ARGS__) +#define DOCTEST_REQUIRE_LT(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_LT, lt, __VA_ARGS__) +#define DOCTEST_WARN_GE(...) DOCTEST_BINARY_ASSERT(DT_WARN_GE, ge, __VA_ARGS__) +#define DOCTEST_CHECK_GE(...) DOCTEST_BINARY_ASSERT(DT_CHECK_GE, ge, __VA_ARGS__) +#define DOCTEST_REQUIRE_GE(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_GE, ge, __VA_ARGS__) +#define DOCTEST_WARN_LE(...) DOCTEST_BINARY_ASSERT(DT_WARN_LE, le, __VA_ARGS__) +#define DOCTEST_CHECK_LE(...) DOCTEST_BINARY_ASSERT(DT_CHECK_LE, le, __VA_ARGS__) +#define DOCTEST_REQUIRE_LE(...) DOCTEST_BINARY_ASSERT(DT_REQUIRE_LE, le, __VA_ARGS__) + +#define DOCTEST_WARN_UNARY(...) DOCTEST_UNARY_ASSERT(DT_WARN_UNARY, __VA_ARGS__) +#define DOCTEST_CHECK_UNARY(...) DOCTEST_UNARY_ASSERT(DT_CHECK_UNARY, __VA_ARGS__) +#define DOCTEST_REQUIRE_UNARY(...) DOCTEST_UNARY_ASSERT(DT_REQUIRE_UNARY, __VA_ARGS__) +#define DOCTEST_WARN_UNARY_FALSE(...) DOCTEST_UNARY_ASSERT(DT_WARN_UNARY_FALSE, __VA_ARGS__) +#define DOCTEST_CHECK_UNARY_FALSE(...) DOCTEST_UNARY_ASSERT(DT_CHECK_UNARY_FALSE, __VA_ARGS__) +#define DOCTEST_REQUIRE_UNARY_FALSE(...) DOCTEST_UNARY_ASSERT(DT_REQUIRE_UNARY_FALSE, __VA_ARGS__) + +#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS + +#define DOCTEST_ASSERT_THROWS_AS(expr, assert_type, message, ...) \ + DOCTEST_FUNC_SCOPE_BEGIN { \ + if(!doctest::getContextOptions()->no_throw) { \ + doctest::detail::ResultBuilder DOCTEST_RB(doctest::assertType::assert_type, __FILE__, \ + __LINE__, #expr, #__VA_ARGS__, message); \ + try { \ + DOCTEST_CAST_TO_VOID(expr) \ + } catch(const typename doctest::detail::types::remove_const< \ + typename doctest::detail::types::remove_reference<__VA_ARGS__>::type>::type&) {\ + DOCTEST_RB.translateException(); \ + DOCTEST_RB.m_threw_as = true; \ + } catch(...) { DOCTEST_RB.translateException(); } \ + DOCTEST_ASSERT_LOG_REACT_RETURN(DOCTEST_RB); \ + } else { /* NOLINT(*-else-after-return) */ \ + DOCTEST_FUNC_SCOPE_RET(false); \ + } \ + } DOCTEST_FUNC_SCOPE_END + +#define DOCTEST_ASSERT_THROWS_WITH(expr, expr_str, assert_type, ...) \ + DOCTEST_FUNC_SCOPE_BEGIN { \ + if(!doctest::getContextOptions()->no_throw) { \ + doctest::detail::ResultBuilder DOCTEST_RB(doctest::assertType::assert_type, __FILE__, \ + __LINE__, expr_str, "", __VA_ARGS__); \ + try { \ + DOCTEST_CAST_TO_VOID(expr) \ + } catch(...) { DOCTEST_RB.translateException(); } \ + DOCTEST_ASSERT_LOG_REACT_RETURN(DOCTEST_RB); \ + } else { /* NOLINT(*-else-after-return) */ \ + DOCTEST_FUNC_SCOPE_RET(false); \ + } \ + } DOCTEST_FUNC_SCOPE_END + +#define DOCTEST_ASSERT_NOTHROW(assert_type, ...) \ + DOCTEST_FUNC_SCOPE_BEGIN { \ + doctest::detail::ResultBuilder DOCTEST_RB(doctest::assertType::assert_type, __FILE__, \ + __LINE__, #__VA_ARGS__); \ + try { \ + DOCTEST_CAST_TO_VOID(__VA_ARGS__) \ + } catch(...) { DOCTEST_RB.translateException(); } \ + DOCTEST_ASSERT_LOG_REACT_RETURN(DOCTEST_RB); \ + } DOCTEST_FUNC_SCOPE_END + +// clang-format off +#define DOCTEST_WARN_THROWS(...) DOCTEST_ASSERT_THROWS_WITH((__VA_ARGS__), #__VA_ARGS__, DT_WARN_THROWS, "") +#define DOCTEST_CHECK_THROWS(...) DOCTEST_ASSERT_THROWS_WITH((__VA_ARGS__), #__VA_ARGS__, DT_CHECK_THROWS, "") +#define DOCTEST_REQUIRE_THROWS(...) DOCTEST_ASSERT_THROWS_WITH((__VA_ARGS__), #__VA_ARGS__, DT_REQUIRE_THROWS, "") + +#define DOCTEST_WARN_THROWS_AS(expr, ...) DOCTEST_ASSERT_THROWS_AS(expr, DT_WARN_THROWS_AS, "", __VA_ARGS__) +#define DOCTEST_CHECK_THROWS_AS(expr, ...) DOCTEST_ASSERT_THROWS_AS(expr, DT_CHECK_THROWS_AS, "", __VA_ARGS__) +#define DOCTEST_REQUIRE_THROWS_AS(expr, ...) DOCTEST_ASSERT_THROWS_AS(expr, DT_REQUIRE_THROWS_AS, "", __VA_ARGS__) + +#define DOCTEST_WARN_THROWS_WITH(expr, ...) DOCTEST_ASSERT_THROWS_WITH(expr, #expr, DT_WARN_THROWS_WITH, __VA_ARGS__) +#define DOCTEST_CHECK_THROWS_WITH(expr, ...) DOCTEST_ASSERT_THROWS_WITH(expr, #expr, DT_CHECK_THROWS_WITH, __VA_ARGS__) +#define DOCTEST_REQUIRE_THROWS_WITH(expr, ...) DOCTEST_ASSERT_THROWS_WITH(expr, #expr, DT_REQUIRE_THROWS_WITH, __VA_ARGS__) + +#define DOCTEST_WARN_THROWS_WITH_AS(expr, message, ...) DOCTEST_ASSERT_THROWS_AS(expr, DT_WARN_THROWS_WITH_AS, message, __VA_ARGS__) +#define DOCTEST_CHECK_THROWS_WITH_AS(expr, message, ...) DOCTEST_ASSERT_THROWS_AS(expr, DT_CHECK_THROWS_WITH_AS, message, __VA_ARGS__) +#define DOCTEST_REQUIRE_THROWS_WITH_AS(expr, message, ...) DOCTEST_ASSERT_THROWS_AS(expr, DT_REQUIRE_THROWS_WITH_AS, message, __VA_ARGS__) + +#define DOCTEST_WARN_NOTHROW(...) DOCTEST_ASSERT_NOTHROW(DT_WARN_NOTHROW, __VA_ARGS__) +#define DOCTEST_CHECK_NOTHROW(...) DOCTEST_ASSERT_NOTHROW(DT_CHECK_NOTHROW, __VA_ARGS__) +#define DOCTEST_REQUIRE_NOTHROW(...) DOCTEST_ASSERT_NOTHROW(DT_REQUIRE_NOTHROW, __VA_ARGS__) + +#define DOCTEST_WARN_THROWS_MESSAGE(expr, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_WARN_THROWS(expr); } DOCTEST_FUNC_SCOPE_END +#define DOCTEST_CHECK_THROWS_MESSAGE(expr, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_CHECK_THROWS(expr); } DOCTEST_FUNC_SCOPE_END +#define DOCTEST_REQUIRE_THROWS_MESSAGE(expr, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_REQUIRE_THROWS(expr); } DOCTEST_FUNC_SCOPE_END +#define DOCTEST_WARN_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_WARN_THROWS_AS(expr, ex); } DOCTEST_FUNC_SCOPE_END +#define DOCTEST_CHECK_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_CHECK_THROWS_AS(expr, ex); } DOCTEST_FUNC_SCOPE_END +#define DOCTEST_REQUIRE_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_REQUIRE_THROWS_AS(expr, ex); } DOCTEST_FUNC_SCOPE_END +#define DOCTEST_WARN_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_WARN_THROWS_WITH(expr, with); } DOCTEST_FUNC_SCOPE_END +#define DOCTEST_CHECK_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_CHECK_THROWS_WITH(expr, with); } DOCTEST_FUNC_SCOPE_END +#define DOCTEST_REQUIRE_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_REQUIRE_THROWS_WITH(expr, with); } DOCTEST_FUNC_SCOPE_END +#define DOCTEST_WARN_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_WARN_THROWS_WITH_AS(expr, with, ex); } DOCTEST_FUNC_SCOPE_END +#define DOCTEST_CHECK_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_CHECK_THROWS_WITH_AS(expr, with, ex); } DOCTEST_FUNC_SCOPE_END +#define DOCTEST_REQUIRE_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_REQUIRE_THROWS_WITH_AS(expr, with, ex); } DOCTEST_FUNC_SCOPE_END +#define DOCTEST_WARN_NOTHROW_MESSAGE(expr, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_WARN_NOTHROW(expr); } DOCTEST_FUNC_SCOPE_END +#define DOCTEST_CHECK_NOTHROW_MESSAGE(expr, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_CHECK_NOTHROW(expr); } DOCTEST_FUNC_SCOPE_END +#define DOCTEST_REQUIRE_NOTHROW_MESSAGE(expr, ...) DOCTEST_FUNC_SCOPE_BEGIN { DOCTEST_INFO(__VA_ARGS__); DOCTEST_REQUIRE_NOTHROW(expr); } DOCTEST_FUNC_SCOPE_END +// clang-format on + +#endif // DOCTEST_CONFIG_NO_EXCEPTIONS + +// ================================================================================================= +// == WHAT FOLLOWS IS VERSIONS OF THE MACROS THAT DO NOT DO ANY REGISTERING! == +// == THIS CAN BE ENABLED BY DEFINING DOCTEST_CONFIG_DISABLE GLOBALLY! == +// ================================================================================================= +#else // DOCTEST_CONFIG_DISABLE + +#define DOCTEST_IMPLEMENT_FIXTURE(der, base, func, name) \ + namespace /* NOLINT */ { \ + template \ + struct der : public base \ + { void f(); }; \ + } \ + template \ + inline void der::f() + +#define DOCTEST_CREATE_AND_REGISTER_FUNCTION(f, name) \ + template \ + static inline void f() + +// for registering tests +#define DOCTEST_TEST_CASE(name) \ + DOCTEST_CREATE_AND_REGISTER_FUNCTION(DOCTEST_ANONYMOUS(DOCTEST_ANON_FUNC_), name) + +// for registering tests in classes +#define DOCTEST_TEST_CASE_CLASS(name) \ + DOCTEST_CREATE_AND_REGISTER_FUNCTION(DOCTEST_ANONYMOUS(DOCTEST_ANON_FUNC_), name) + +// for registering tests with a fixture +#define DOCTEST_TEST_CASE_FIXTURE(x, name) \ + DOCTEST_IMPLEMENT_FIXTURE(DOCTEST_ANONYMOUS(DOCTEST_ANON_CLASS_), x, \ + DOCTEST_ANONYMOUS(DOCTEST_ANON_FUNC_), name) + +// for converting types to strings without the header and demangling +#define DOCTEST_TYPE_TO_STRING_AS(str, ...) static_assert(true, "") +#define DOCTEST_TYPE_TO_STRING(...) static_assert(true, "") + +// for typed tests +#define DOCTEST_TEST_CASE_TEMPLATE(name, type, ...) \ + template \ + inline void DOCTEST_ANONYMOUS(DOCTEST_ANON_TMP_)() + +#define DOCTEST_TEST_CASE_TEMPLATE_DEFINE(name, type, id) \ + template \ + inline void DOCTEST_ANONYMOUS(DOCTEST_ANON_TMP_)() + +#define DOCTEST_TEST_CASE_TEMPLATE_INVOKE(id, ...) static_assert(true, "") +#define DOCTEST_TEST_CASE_TEMPLATE_APPLY(id, ...) static_assert(true, "") + +// for subcases +#define DOCTEST_SUBCASE(name) + +// for a testsuite block +#define DOCTEST_TEST_SUITE(name) namespace // NOLINT + +// for starting a testsuite block +#define DOCTEST_TEST_SUITE_BEGIN(name) static_assert(true, "") + +// for ending a testsuite block +#define DOCTEST_TEST_SUITE_END using DOCTEST_ANONYMOUS(DOCTEST_ANON_FOR_SEMICOLON_) = int + +#define DOCTEST_REGISTER_EXCEPTION_TRANSLATOR(signature) \ + template \ + static inline doctest::String DOCTEST_ANONYMOUS(DOCTEST_ANON_TRANSLATOR_)(signature) + +#define DOCTEST_REGISTER_REPORTER(name, priority, reporter) +#define DOCTEST_REGISTER_LISTENER(name, priority, reporter) + +#define DOCTEST_INFO(...) (static_cast(0)) +#define DOCTEST_CAPTURE(x) (static_cast(0)) +#define DOCTEST_ADD_MESSAGE_AT(file, line, ...) (static_cast(0)) +#define DOCTEST_ADD_FAIL_CHECK_AT(file, line, ...) (static_cast(0)) +#define DOCTEST_ADD_FAIL_AT(file, line, ...) (static_cast(0)) +#define DOCTEST_MESSAGE(...) (static_cast(0)) +#define DOCTEST_FAIL_CHECK(...) (static_cast(0)) +#define DOCTEST_FAIL(...) (static_cast(0)) + +#if defined(DOCTEST_CONFIG_EVALUATE_ASSERTS_EVEN_WHEN_DISABLED) \ + && defined(DOCTEST_CONFIG_ASSERTS_RETURN_VALUES) + +#define DOCTEST_WARN(...) [&] { return __VA_ARGS__; }() +#define DOCTEST_CHECK(...) [&] { return __VA_ARGS__; }() +#define DOCTEST_REQUIRE(...) [&] { return __VA_ARGS__; }() +#define DOCTEST_WARN_FALSE(...) [&] { return !(__VA_ARGS__); }() +#define DOCTEST_CHECK_FALSE(...) [&] { return !(__VA_ARGS__); }() +#define DOCTEST_REQUIRE_FALSE(...) [&] { return !(__VA_ARGS__); }() + +#define DOCTEST_WARN_MESSAGE(cond, ...) [&] { return cond; }() +#define DOCTEST_CHECK_MESSAGE(cond, ...) [&] { return cond; }() +#define DOCTEST_REQUIRE_MESSAGE(cond, ...) [&] { return cond; }() +#define DOCTEST_WARN_FALSE_MESSAGE(cond, ...) [&] { return !(cond); }() +#define DOCTEST_CHECK_FALSE_MESSAGE(cond, ...) [&] { return !(cond); }() +#define DOCTEST_REQUIRE_FALSE_MESSAGE(cond, ...) [&] { return !(cond); }() + +namespace doctest { +namespace detail { +#define DOCTEST_RELATIONAL_OP(name, op) \ + template \ + bool name(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs op rhs; } + + DOCTEST_RELATIONAL_OP(eq, ==) + DOCTEST_RELATIONAL_OP(ne, !=) + DOCTEST_RELATIONAL_OP(lt, <) + DOCTEST_RELATIONAL_OP(gt, >) + DOCTEST_RELATIONAL_OP(le, <=) + DOCTEST_RELATIONAL_OP(ge, >=) +} // namespace detail +} // namespace doctest + +#define DOCTEST_WARN_EQ(...) [&] { return doctest::detail::eq(__VA_ARGS__); }() +#define DOCTEST_CHECK_EQ(...) [&] { return doctest::detail::eq(__VA_ARGS__); }() +#define DOCTEST_REQUIRE_EQ(...) [&] { return doctest::detail::eq(__VA_ARGS__); }() +#define DOCTEST_WARN_NE(...) [&] { return doctest::detail::ne(__VA_ARGS__); }() +#define DOCTEST_CHECK_NE(...) [&] { return doctest::detail::ne(__VA_ARGS__); }() +#define DOCTEST_REQUIRE_NE(...) [&] { return doctest::detail::ne(__VA_ARGS__); }() +#define DOCTEST_WARN_LT(...) [&] { return doctest::detail::lt(__VA_ARGS__); }() +#define DOCTEST_CHECK_LT(...) [&] { return doctest::detail::lt(__VA_ARGS__); }() +#define DOCTEST_REQUIRE_LT(...) [&] { return doctest::detail::lt(__VA_ARGS__); }() +#define DOCTEST_WARN_GT(...) [&] { return doctest::detail::gt(__VA_ARGS__); }() +#define DOCTEST_CHECK_GT(...) [&] { return doctest::detail::gt(__VA_ARGS__); }() +#define DOCTEST_REQUIRE_GT(...) [&] { return doctest::detail::gt(__VA_ARGS__); }() +#define DOCTEST_WARN_LE(...) [&] { return doctest::detail::le(__VA_ARGS__); }() +#define DOCTEST_CHECK_LE(...) [&] { return doctest::detail::le(__VA_ARGS__); }() +#define DOCTEST_REQUIRE_LE(...) [&] { return doctest::detail::le(__VA_ARGS__); }() +#define DOCTEST_WARN_GE(...) [&] { return doctest::detail::ge(__VA_ARGS__); }() +#define DOCTEST_CHECK_GE(...) [&] { return doctest::detail::ge(__VA_ARGS__); }() +#define DOCTEST_REQUIRE_GE(...) [&] { return doctest::detail::ge(__VA_ARGS__); }() +#define DOCTEST_WARN_UNARY(...) [&] { return __VA_ARGS__; }() +#define DOCTEST_CHECK_UNARY(...) [&] { return __VA_ARGS__; }() +#define DOCTEST_REQUIRE_UNARY(...) [&] { return __VA_ARGS__; }() +#define DOCTEST_WARN_UNARY_FALSE(...) [&] { return !(__VA_ARGS__); }() +#define DOCTEST_CHECK_UNARY_FALSE(...) [&] { return !(__VA_ARGS__); }() +#define DOCTEST_REQUIRE_UNARY_FALSE(...) [&] { return !(__VA_ARGS__); }() + +#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS + +#define DOCTEST_WARN_THROWS_WITH(expr, with, ...) [] { static_assert(false, "Exception translation is not available when doctest is disabled."); return false; }() +#define DOCTEST_CHECK_THROWS_WITH(expr, with, ...) DOCTEST_WARN_THROWS_WITH(,,) +#define DOCTEST_REQUIRE_THROWS_WITH(expr, with, ...) DOCTEST_WARN_THROWS_WITH(,,) +#define DOCTEST_WARN_THROWS_WITH_AS(expr, with, ex, ...) DOCTEST_WARN_THROWS_WITH(,,) +#define DOCTEST_CHECK_THROWS_WITH_AS(expr, with, ex, ...) DOCTEST_WARN_THROWS_WITH(,,) +#define DOCTEST_REQUIRE_THROWS_WITH_AS(expr, with, ex, ...) DOCTEST_WARN_THROWS_WITH(,,) + +#define DOCTEST_WARN_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_WARN_THROWS_WITH(,,) +#define DOCTEST_CHECK_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_WARN_THROWS_WITH(,,) +#define DOCTEST_REQUIRE_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_WARN_THROWS_WITH(,,) +#define DOCTEST_WARN_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_WARN_THROWS_WITH(,,) +#define DOCTEST_CHECK_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_WARN_THROWS_WITH(,,) +#define DOCTEST_REQUIRE_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_WARN_THROWS_WITH(,,) + +#define DOCTEST_WARN_THROWS(...) [&] { try { __VA_ARGS__; return false; } catch (...) { return true; } }() +#define DOCTEST_CHECK_THROWS(...) [&] { try { __VA_ARGS__; return false; } catch (...) { return true; } }() +#define DOCTEST_REQUIRE_THROWS(...) [&] { try { __VA_ARGS__; return false; } catch (...) { return true; } }() +#define DOCTEST_WARN_THROWS_AS(expr, ...) [&] { try { expr; } catch (__VA_ARGS__) { return true; } catch (...) { } return false; }() +#define DOCTEST_CHECK_THROWS_AS(expr, ...) [&] { try { expr; } catch (__VA_ARGS__) { return true; } catch (...) { } return false; }() +#define DOCTEST_REQUIRE_THROWS_AS(expr, ...) [&] { try { expr; } catch (__VA_ARGS__) { return true; } catch (...) { } return false; }() +#define DOCTEST_WARN_NOTHROW(...) [&] { try { __VA_ARGS__; return true; } catch (...) { return false; } }() +#define DOCTEST_CHECK_NOTHROW(...) [&] { try { __VA_ARGS__; return true; } catch (...) { return false; } }() +#define DOCTEST_REQUIRE_NOTHROW(...) [&] { try { __VA_ARGS__; return true; } catch (...) { return false; } }() + +#define DOCTEST_WARN_THROWS_MESSAGE(expr, ...) [&] { try { __VA_ARGS__; return false; } catch (...) { return true; } }() +#define DOCTEST_CHECK_THROWS_MESSAGE(expr, ...) [&] { try { __VA_ARGS__; return false; } catch (...) { return true; } }() +#define DOCTEST_REQUIRE_THROWS_MESSAGE(expr, ...) [&] { try { __VA_ARGS__; return false; } catch (...) { return true; } }() +#define DOCTEST_WARN_THROWS_AS_MESSAGE(expr, ex, ...) [&] { try { expr; } catch (__VA_ARGS__) { return true; } catch (...) { } return false; }() +#define DOCTEST_CHECK_THROWS_AS_MESSAGE(expr, ex, ...) [&] { try { expr; } catch (__VA_ARGS__) { return true; } catch (...) { } return false; }() +#define DOCTEST_REQUIRE_THROWS_AS_MESSAGE(expr, ex, ...) [&] { try { expr; } catch (__VA_ARGS__) { return true; } catch (...) { } return false; }() +#define DOCTEST_WARN_NOTHROW_MESSAGE(expr, ...) [&] { try { __VA_ARGS__; return true; } catch (...) { return false; } }() +#define DOCTEST_CHECK_NOTHROW_MESSAGE(expr, ...) [&] { try { __VA_ARGS__; return true; } catch (...) { return false; } }() +#define DOCTEST_REQUIRE_NOTHROW_MESSAGE(expr, ...) [&] { try { __VA_ARGS__; return true; } catch (...) { return false; } }() + +#endif // DOCTEST_CONFIG_NO_EXCEPTIONS + +#else // DOCTEST_CONFIG_EVALUATE_ASSERTS_EVEN_WHEN_DISABLED + +#define DOCTEST_WARN(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_CHECK(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_REQUIRE(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_WARN_FALSE(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_CHECK_FALSE(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_REQUIRE_FALSE(...) DOCTEST_FUNC_EMPTY + +#define DOCTEST_WARN_MESSAGE(cond, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_CHECK_MESSAGE(cond, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_REQUIRE_MESSAGE(cond, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_WARN_FALSE_MESSAGE(cond, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_CHECK_FALSE_MESSAGE(cond, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_REQUIRE_FALSE_MESSAGE(cond, ...) DOCTEST_FUNC_EMPTY + +#define DOCTEST_WARN_EQ(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_CHECK_EQ(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_REQUIRE_EQ(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_WARN_NE(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_CHECK_NE(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_REQUIRE_NE(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_WARN_GT(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_CHECK_GT(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_REQUIRE_GT(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_WARN_LT(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_CHECK_LT(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_REQUIRE_LT(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_WARN_GE(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_CHECK_GE(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_REQUIRE_GE(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_WARN_LE(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_CHECK_LE(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_REQUIRE_LE(...) DOCTEST_FUNC_EMPTY + +#define DOCTEST_WARN_UNARY(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_CHECK_UNARY(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_REQUIRE_UNARY(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_WARN_UNARY_FALSE(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_CHECK_UNARY_FALSE(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_REQUIRE_UNARY_FALSE(...) DOCTEST_FUNC_EMPTY + +#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS + +#define DOCTEST_WARN_THROWS(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_CHECK_THROWS(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_REQUIRE_THROWS(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_WARN_THROWS_AS(expr, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_CHECK_THROWS_AS(expr, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_REQUIRE_THROWS_AS(expr, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_WARN_THROWS_WITH(expr, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_CHECK_THROWS_WITH(expr, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_REQUIRE_THROWS_WITH(expr, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_WARN_THROWS_WITH_AS(expr, with, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_CHECK_THROWS_WITH_AS(expr, with, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_REQUIRE_THROWS_WITH_AS(expr, with, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_WARN_NOTHROW(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_CHECK_NOTHROW(...) DOCTEST_FUNC_EMPTY +#define DOCTEST_REQUIRE_NOTHROW(...) DOCTEST_FUNC_EMPTY + +#define DOCTEST_WARN_THROWS_MESSAGE(expr, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_CHECK_THROWS_MESSAGE(expr, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_REQUIRE_THROWS_MESSAGE(expr, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_WARN_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_CHECK_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_REQUIRE_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_WARN_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_CHECK_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_REQUIRE_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_WARN_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_CHECK_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_REQUIRE_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_WARN_NOTHROW_MESSAGE(expr, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_CHECK_NOTHROW_MESSAGE(expr, ...) DOCTEST_FUNC_EMPTY +#define DOCTEST_REQUIRE_NOTHROW_MESSAGE(expr, ...) DOCTEST_FUNC_EMPTY + +#endif // DOCTEST_CONFIG_NO_EXCEPTIONS + +#endif // DOCTEST_CONFIG_EVALUATE_ASSERTS_EVEN_WHEN_DISABLED + +#endif // DOCTEST_CONFIG_DISABLE + +#ifdef DOCTEST_CONFIG_NO_EXCEPTIONS + +#ifdef DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS +#define DOCTEST_EXCEPTION_EMPTY_FUNC DOCTEST_FUNC_EMPTY +#else // DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS +#define DOCTEST_EXCEPTION_EMPTY_FUNC [] { static_assert(false, "Exceptions are disabled! " \ + "Use DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS if you want to compile with exceptions disabled."); return false; }() + +#undef DOCTEST_REQUIRE +#undef DOCTEST_REQUIRE_FALSE +#undef DOCTEST_REQUIRE_MESSAGE +#undef DOCTEST_REQUIRE_FALSE_MESSAGE +#undef DOCTEST_REQUIRE_EQ +#undef DOCTEST_REQUIRE_NE +#undef DOCTEST_REQUIRE_GT +#undef DOCTEST_REQUIRE_LT +#undef DOCTEST_REQUIRE_GE +#undef DOCTEST_REQUIRE_LE +#undef DOCTEST_REQUIRE_UNARY +#undef DOCTEST_REQUIRE_UNARY_FALSE + +#define DOCTEST_REQUIRE DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_REQUIRE_FALSE DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_REQUIRE_MESSAGE DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_REQUIRE_FALSE_MESSAGE DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_REQUIRE_EQ DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_REQUIRE_NE DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_REQUIRE_GT DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_REQUIRE_LT DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_REQUIRE_GE DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_REQUIRE_LE DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_REQUIRE_UNARY DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_REQUIRE_UNARY_FALSE DOCTEST_EXCEPTION_EMPTY_FUNC + +#endif // DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS + +#define DOCTEST_WARN_THROWS(...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_CHECK_THROWS(...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_REQUIRE_THROWS(...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_WARN_THROWS_AS(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_CHECK_THROWS_AS(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_REQUIRE_THROWS_AS(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_WARN_THROWS_WITH(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_CHECK_THROWS_WITH(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_REQUIRE_THROWS_WITH(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_WARN_THROWS_WITH_AS(expr, with, ...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_CHECK_THROWS_WITH_AS(expr, with, ...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_REQUIRE_THROWS_WITH_AS(expr, with, ...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_WARN_NOTHROW(...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_CHECK_NOTHROW(...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_REQUIRE_NOTHROW(...) DOCTEST_EXCEPTION_EMPTY_FUNC + +#define DOCTEST_WARN_THROWS_MESSAGE(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_CHECK_THROWS_MESSAGE(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_REQUIRE_THROWS_MESSAGE(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_WARN_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_CHECK_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_REQUIRE_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_WARN_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_CHECK_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_REQUIRE_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_WARN_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_CHECK_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_REQUIRE_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_WARN_NOTHROW_MESSAGE(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_CHECK_NOTHROW_MESSAGE(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC +#define DOCTEST_REQUIRE_NOTHROW_MESSAGE(expr, ...) DOCTEST_EXCEPTION_EMPTY_FUNC + +#endif // DOCTEST_CONFIG_NO_EXCEPTIONS + +// clang-format off +// KEPT FOR BACKWARDS COMPATIBILITY - FORWARDING TO THE RIGHT MACROS +#define DOCTEST_FAST_WARN_EQ DOCTEST_WARN_EQ +#define DOCTEST_FAST_CHECK_EQ DOCTEST_CHECK_EQ +#define DOCTEST_FAST_REQUIRE_EQ DOCTEST_REQUIRE_EQ +#define DOCTEST_FAST_WARN_NE DOCTEST_WARN_NE +#define DOCTEST_FAST_CHECK_NE DOCTEST_CHECK_NE +#define DOCTEST_FAST_REQUIRE_NE DOCTEST_REQUIRE_NE +#define DOCTEST_FAST_WARN_GT DOCTEST_WARN_GT +#define DOCTEST_FAST_CHECK_GT DOCTEST_CHECK_GT +#define DOCTEST_FAST_REQUIRE_GT DOCTEST_REQUIRE_GT +#define DOCTEST_FAST_WARN_LT DOCTEST_WARN_LT +#define DOCTEST_FAST_CHECK_LT DOCTEST_CHECK_LT +#define DOCTEST_FAST_REQUIRE_LT DOCTEST_REQUIRE_LT +#define DOCTEST_FAST_WARN_GE DOCTEST_WARN_GE +#define DOCTEST_FAST_CHECK_GE DOCTEST_CHECK_GE +#define DOCTEST_FAST_REQUIRE_GE DOCTEST_REQUIRE_GE +#define DOCTEST_FAST_WARN_LE DOCTEST_WARN_LE +#define DOCTEST_FAST_CHECK_LE DOCTEST_CHECK_LE +#define DOCTEST_FAST_REQUIRE_LE DOCTEST_REQUIRE_LE + +#define DOCTEST_FAST_WARN_UNARY DOCTEST_WARN_UNARY +#define DOCTEST_FAST_CHECK_UNARY DOCTEST_CHECK_UNARY +#define DOCTEST_FAST_REQUIRE_UNARY DOCTEST_REQUIRE_UNARY +#define DOCTEST_FAST_WARN_UNARY_FALSE DOCTEST_WARN_UNARY_FALSE +#define DOCTEST_FAST_CHECK_UNARY_FALSE DOCTEST_CHECK_UNARY_FALSE +#define DOCTEST_FAST_REQUIRE_UNARY_FALSE DOCTEST_REQUIRE_UNARY_FALSE + +#define DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE(id, ...) DOCTEST_TEST_CASE_TEMPLATE_INVOKE(id,__VA_ARGS__) +// clang-format on + +// BDD style macros +// clang-format off +#define DOCTEST_SCENARIO(name) DOCTEST_TEST_CASE(" Scenario: " name) +#define DOCTEST_SCENARIO_CLASS(name) DOCTEST_TEST_CASE_CLASS(" Scenario: " name) +#define DOCTEST_SCENARIO_TEMPLATE(name, T, ...) DOCTEST_TEST_CASE_TEMPLATE(" Scenario: " name, T, __VA_ARGS__) +#define DOCTEST_SCENARIO_TEMPLATE_DEFINE(name, T, id) DOCTEST_TEST_CASE_TEMPLATE_DEFINE(" Scenario: " name, T, id) + +#define DOCTEST_GIVEN(name) DOCTEST_SUBCASE(" Given: " name) +#define DOCTEST_WHEN(name) DOCTEST_SUBCASE(" When: " name) +#define DOCTEST_AND_WHEN(name) DOCTEST_SUBCASE("And when: " name) +#define DOCTEST_THEN(name) DOCTEST_SUBCASE(" Then: " name) +#define DOCTEST_AND_THEN(name) DOCTEST_SUBCASE(" And: " name) +// clang-format on + +// == SHORT VERSIONS OF THE MACROS +#ifndef DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES + +#define TEST_CASE(name) DOCTEST_TEST_CASE(name) +#define TEST_CASE_CLASS(name) DOCTEST_TEST_CASE_CLASS(name) +#define TEST_CASE_FIXTURE(x, name) DOCTEST_TEST_CASE_FIXTURE(x, name) +#define TYPE_TO_STRING_AS(str, ...) DOCTEST_TYPE_TO_STRING_AS(str, __VA_ARGS__) +#define TYPE_TO_STRING(...) DOCTEST_TYPE_TO_STRING(__VA_ARGS__) +#define TEST_CASE_TEMPLATE(name, T, ...) DOCTEST_TEST_CASE_TEMPLATE(name, T, __VA_ARGS__) +#define TEST_CASE_TEMPLATE_DEFINE(name, T, id) DOCTEST_TEST_CASE_TEMPLATE_DEFINE(name, T, id) +#define TEST_CASE_TEMPLATE_INVOKE(id, ...) DOCTEST_TEST_CASE_TEMPLATE_INVOKE(id, __VA_ARGS__) +#define TEST_CASE_TEMPLATE_APPLY(id, ...) DOCTEST_TEST_CASE_TEMPLATE_APPLY(id, __VA_ARGS__) +#define SUBCASE(name) DOCTEST_SUBCASE(name) +#define TEST_SUITE(decorators) DOCTEST_TEST_SUITE(decorators) +#define TEST_SUITE_BEGIN(name) DOCTEST_TEST_SUITE_BEGIN(name) +#define TEST_SUITE_END DOCTEST_TEST_SUITE_END +#define REGISTER_EXCEPTION_TRANSLATOR(signature) DOCTEST_REGISTER_EXCEPTION_TRANSLATOR(signature) +#define REGISTER_REPORTER(name, priority, reporter) DOCTEST_REGISTER_REPORTER(name, priority, reporter) +#define REGISTER_LISTENER(name, priority, reporter) DOCTEST_REGISTER_LISTENER(name, priority, reporter) +#define INFO(...) DOCTEST_INFO(__VA_ARGS__) +#define CAPTURE(x) DOCTEST_CAPTURE(x) +#define ADD_MESSAGE_AT(file, line, ...) DOCTEST_ADD_MESSAGE_AT(file, line, __VA_ARGS__) +#define ADD_FAIL_CHECK_AT(file, line, ...) DOCTEST_ADD_FAIL_CHECK_AT(file, line, __VA_ARGS__) +#define ADD_FAIL_AT(file, line, ...) DOCTEST_ADD_FAIL_AT(file, line, __VA_ARGS__) +#define MESSAGE(...) DOCTEST_MESSAGE(__VA_ARGS__) +#define FAIL_CHECK(...) DOCTEST_FAIL_CHECK(__VA_ARGS__) +#define FAIL(...) DOCTEST_FAIL(__VA_ARGS__) +#define TO_LVALUE(...) DOCTEST_TO_LVALUE(__VA_ARGS__) + +#define WARN(...) DOCTEST_WARN(__VA_ARGS__) +#define WARN_FALSE(...) DOCTEST_WARN_FALSE(__VA_ARGS__) +#define WARN_THROWS(...) DOCTEST_WARN_THROWS(__VA_ARGS__) +#define WARN_THROWS_AS(expr, ...) DOCTEST_WARN_THROWS_AS(expr, __VA_ARGS__) +#define WARN_THROWS_WITH(expr, ...) DOCTEST_WARN_THROWS_WITH(expr, __VA_ARGS__) +#define WARN_THROWS_WITH_AS(expr, with, ...) DOCTEST_WARN_THROWS_WITH_AS(expr, with, __VA_ARGS__) +#define WARN_NOTHROW(...) DOCTEST_WARN_NOTHROW(__VA_ARGS__) +#define CHECK(...) DOCTEST_CHECK(__VA_ARGS__) +#define CHECK_FALSE(...) DOCTEST_CHECK_FALSE(__VA_ARGS__) +#define CHECK_THROWS(...) DOCTEST_CHECK_THROWS(__VA_ARGS__) +#define CHECK_THROWS_AS(expr, ...) DOCTEST_CHECK_THROWS_AS(expr, __VA_ARGS__) +#define CHECK_THROWS_WITH(expr, ...) DOCTEST_CHECK_THROWS_WITH(expr, __VA_ARGS__) +#define CHECK_THROWS_WITH_AS(expr, with, ...) DOCTEST_CHECK_THROWS_WITH_AS(expr, with, __VA_ARGS__) +#define CHECK_NOTHROW(...) DOCTEST_CHECK_NOTHROW(__VA_ARGS__) +#define REQUIRE(...) DOCTEST_REQUIRE(__VA_ARGS__) +#define REQUIRE_FALSE(...) DOCTEST_REQUIRE_FALSE(__VA_ARGS__) +#define REQUIRE_THROWS(...) DOCTEST_REQUIRE_THROWS(__VA_ARGS__) +#define REQUIRE_THROWS_AS(expr, ...) DOCTEST_REQUIRE_THROWS_AS(expr, __VA_ARGS__) +#define REQUIRE_THROWS_WITH(expr, ...) DOCTEST_REQUIRE_THROWS_WITH(expr, __VA_ARGS__) +#define REQUIRE_THROWS_WITH_AS(expr, with, ...) DOCTEST_REQUIRE_THROWS_WITH_AS(expr, with, __VA_ARGS__) +#define REQUIRE_NOTHROW(...) DOCTEST_REQUIRE_NOTHROW(__VA_ARGS__) + +#define WARN_MESSAGE(cond, ...) DOCTEST_WARN_MESSAGE(cond, __VA_ARGS__) +#define WARN_FALSE_MESSAGE(cond, ...) DOCTEST_WARN_FALSE_MESSAGE(cond, __VA_ARGS__) +#define WARN_THROWS_MESSAGE(expr, ...) DOCTEST_WARN_THROWS_MESSAGE(expr, __VA_ARGS__) +#define WARN_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_WARN_THROWS_AS_MESSAGE(expr, ex, __VA_ARGS__) +#define WARN_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_WARN_THROWS_WITH_MESSAGE(expr, with, __VA_ARGS__) +#define WARN_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_WARN_THROWS_WITH_AS_MESSAGE(expr, with, ex, __VA_ARGS__) +#define WARN_NOTHROW_MESSAGE(expr, ...) DOCTEST_WARN_NOTHROW_MESSAGE(expr, __VA_ARGS__) +#define CHECK_MESSAGE(cond, ...) DOCTEST_CHECK_MESSAGE(cond, __VA_ARGS__) +#define CHECK_FALSE_MESSAGE(cond, ...) DOCTEST_CHECK_FALSE_MESSAGE(cond, __VA_ARGS__) +#define CHECK_THROWS_MESSAGE(expr, ...) DOCTEST_CHECK_THROWS_MESSAGE(expr, __VA_ARGS__) +#define CHECK_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_CHECK_THROWS_AS_MESSAGE(expr, ex, __VA_ARGS__) +#define CHECK_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_CHECK_THROWS_WITH_MESSAGE(expr, with, __VA_ARGS__) +#define CHECK_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_CHECK_THROWS_WITH_AS_MESSAGE(expr, with, ex, __VA_ARGS__) +#define CHECK_NOTHROW_MESSAGE(expr, ...) DOCTEST_CHECK_NOTHROW_MESSAGE(expr, __VA_ARGS__) +#define REQUIRE_MESSAGE(cond, ...) DOCTEST_REQUIRE_MESSAGE(cond, __VA_ARGS__) +#define REQUIRE_FALSE_MESSAGE(cond, ...) DOCTEST_REQUIRE_FALSE_MESSAGE(cond, __VA_ARGS__) +#define REQUIRE_THROWS_MESSAGE(expr, ...) DOCTEST_REQUIRE_THROWS_MESSAGE(expr, __VA_ARGS__) +#define REQUIRE_THROWS_AS_MESSAGE(expr, ex, ...) DOCTEST_REQUIRE_THROWS_AS_MESSAGE(expr, ex, __VA_ARGS__) +#define REQUIRE_THROWS_WITH_MESSAGE(expr, with, ...) DOCTEST_REQUIRE_THROWS_WITH_MESSAGE(expr, with, __VA_ARGS__) +#define REQUIRE_THROWS_WITH_AS_MESSAGE(expr, with, ex, ...) DOCTEST_REQUIRE_THROWS_WITH_AS_MESSAGE(expr, with, ex, __VA_ARGS__) +#define REQUIRE_NOTHROW_MESSAGE(expr, ...) DOCTEST_REQUIRE_NOTHROW_MESSAGE(expr, __VA_ARGS__) + +#define SCENARIO(name) DOCTEST_SCENARIO(name) +#define SCENARIO_CLASS(name) DOCTEST_SCENARIO_CLASS(name) +#define SCENARIO_TEMPLATE(name, T, ...) DOCTEST_SCENARIO_TEMPLATE(name, T, __VA_ARGS__) +#define SCENARIO_TEMPLATE_DEFINE(name, T, id) DOCTEST_SCENARIO_TEMPLATE_DEFINE(name, T, id) +#define GIVEN(name) DOCTEST_GIVEN(name) +#define WHEN(name) DOCTEST_WHEN(name) +#define AND_WHEN(name) DOCTEST_AND_WHEN(name) +#define THEN(name) DOCTEST_THEN(name) +#define AND_THEN(name) DOCTEST_AND_THEN(name) + +#define WARN_EQ(...) DOCTEST_WARN_EQ(__VA_ARGS__) +#define CHECK_EQ(...) DOCTEST_CHECK_EQ(__VA_ARGS__) +#define REQUIRE_EQ(...) DOCTEST_REQUIRE_EQ(__VA_ARGS__) +#define WARN_NE(...) DOCTEST_WARN_NE(__VA_ARGS__) +#define CHECK_NE(...) DOCTEST_CHECK_NE(__VA_ARGS__) +#define REQUIRE_NE(...) DOCTEST_REQUIRE_NE(__VA_ARGS__) +#define WARN_GT(...) DOCTEST_WARN_GT(__VA_ARGS__) +#define CHECK_GT(...) DOCTEST_CHECK_GT(__VA_ARGS__) +#define REQUIRE_GT(...) DOCTEST_REQUIRE_GT(__VA_ARGS__) +#define WARN_LT(...) DOCTEST_WARN_LT(__VA_ARGS__) +#define CHECK_LT(...) DOCTEST_CHECK_LT(__VA_ARGS__) +#define REQUIRE_LT(...) DOCTEST_REQUIRE_LT(__VA_ARGS__) +#define WARN_GE(...) DOCTEST_WARN_GE(__VA_ARGS__) +#define CHECK_GE(...) DOCTEST_CHECK_GE(__VA_ARGS__) +#define REQUIRE_GE(...) DOCTEST_REQUIRE_GE(__VA_ARGS__) +#define WARN_LE(...) DOCTEST_WARN_LE(__VA_ARGS__) +#define CHECK_LE(...) DOCTEST_CHECK_LE(__VA_ARGS__) +#define REQUIRE_LE(...) DOCTEST_REQUIRE_LE(__VA_ARGS__) +#define WARN_UNARY(...) DOCTEST_WARN_UNARY(__VA_ARGS__) +#define CHECK_UNARY(...) DOCTEST_CHECK_UNARY(__VA_ARGS__) +#define REQUIRE_UNARY(...) DOCTEST_REQUIRE_UNARY(__VA_ARGS__) +#define WARN_UNARY_FALSE(...) DOCTEST_WARN_UNARY_FALSE(__VA_ARGS__) +#define CHECK_UNARY_FALSE(...) DOCTEST_CHECK_UNARY_FALSE(__VA_ARGS__) +#define REQUIRE_UNARY_FALSE(...) DOCTEST_REQUIRE_UNARY_FALSE(__VA_ARGS__) + +// KEPT FOR BACKWARDS COMPATIBILITY +#define FAST_WARN_EQ(...) DOCTEST_FAST_WARN_EQ(__VA_ARGS__) +#define FAST_CHECK_EQ(...) DOCTEST_FAST_CHECK_EQ(__VA_ARGS__) +#define FAST_REQUIRE_EQ(...) DOCTEST_FAST_REQUIRE_EQ(__VA_ARGS__) +#define FAST_WARN_NE(...) DOCTEST_FAST_WARN_NE(__VA_ARGS__) +#define FAST_CHECK_NE(...) DOCTEST_FAST_CHECK_NE(__VA_ARGS__) +#define FAST_REQUIRE_NE(...) DOCTEST_FAST_REQUIRE_NE(__VA_ARGS__) +#define FAST_WARN_GT(...) DOCTEST_FAST_WARN_GT(__VA_ARGS__) +#define FAST_CHECK_GT(...) DOCTEST_FAST_CHECK_GT(__VA_ARGS__) +#define FAST_REQUIRE_GT(...) DOCTEST_FAST_REQUIRE_GT(__VA_ARGS__) +#define FAST_WARN_LT(...) DOCTEST_FAST_WARN_LT(__VA_ARGS__) +#define FAST_CHECK_LT(...) DOCTEST_FAST_CHECK_LT(__VA_ARGS__) +#define FAST_REQUIRE_LT(...) DOCTEST_FAST_REQUIRE_LT(__VA_ARGS__) +#define FAST_WARN_GE(...) DOCTEST_FAST_WARN_GE(__VA_ARGS__) +#define FAST_CHECK_GE(...) DOCTEST_FAST_CHECK_GE(__VA_ARGS__) +#define FAST_REQUIRE_GE(...) DOCTEST_FAST_REQUIRE_GE(__VA_ARGS__) +#define FAST_WARN_LE(...) DOCTEST_FAST_WARN_LE(__VA_ARGS__) +#define FAST_CHECK_LE(...) DOCTEST_FAST_CHECK_LE(__VA_ARGS__) +#define FAST_REQUIRE_LE(...) DOCTEST_FAST_REQUIRE_LE(__VA_ARGS__) + +#define FAST_WARN_UNARY(...) DOCTEST_FAST_WARN_UNARY(__VA_ARGS__) +#define FAST_CHECK_UNARY(...) DOCTEST_FAST_CHECK_UNARY(__VA_ARGS__) +#define FAST_REQUIRE_UNARY(...) DOCTEST_FAST_REQUIRE_UNARY(__VA_ARGS__) +#define FAST_WARN_UNARY_FALSE(...) DOCTEST_FAST_WARN_UNARY_FALSE(__VA_ARGS__) +#define FAST_CHECK_UNARY_FALSE(...) DOCTEST_FAST_CHECK_UNARY_FALSE(__VA_ARGS__) +#define FAST_REQUIRE_UNARY_FALSE(...) DOCTEST_FAST_REQUIRE_UNARY_FALSE(__VA_ARGS__) + +#define TEST_CASE_TEMPLATE_INSTANTIATE(id, ...) DOCTEST_TEST_CASE_TEMPLATE_INSTANTIATE(id, __VA_ARGS__) + +#endif // DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES + +#ifndef DOCTEST_CONFIG_DISABLE + +// this is here to clear the 'current test suite' for the current translation unit - at the top +DOCTEST_TEST_SUITE_END(); + +#endif // DOCTEST_CONFIG_DISABLE + +DOCTEST_CLANG_SUPPRESS_WARNING_POP +DOCTEST_MSVC_SUPPRESS_WARNING_POP +DOCTEST_GCC_SUPPRESS_WARNING_POP + +DOCTEST_SUPPRESS_COMMON_WARNINGS_POP + +#endif // DOCTEST_LIBRARY_INCLUDED + +#ifndef DOCTEST_SINGLE_HEADER +#define DOCTEST_SINGLE_HEADER +#endif // DOCTEST_SINGLE_HEADER + +#if defined(DOCTEST_CONFIG_IMPLEMENT) || !defined(DOCTEST_SINGLE_HEADER) + +#ifndef DOCTEST_SINGLE_HEADER +#include "doctest_fwd.h" +#endif // DOCTEST_SINGLE_HEADER + +DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wunused-macros") + +#ifndef DOCTEST_LIBRARY_IMPLEMENTATION +#define DOCTEST_LIBRARY_IMPLEMENTATION + +DOCTEST_CLANG_SUPPRESS_WARNING_POP + +DOCTEST_SUPPRESS_COMMON_WARNINGS_PUSH + +DOCTEST_CLANG_SUPPRESS_WARNING_PUSH +DOCTEST_CLANG_SUPPRESS_WARNING("-Wglobal-constructors") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wexit-time-destructors") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wsign-conversion") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wshorten-64-to-32") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-variable-declarations") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wswitch") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wswitch-enum") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wcovered-switch-default") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-noreturn") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wdisabled-macro-expansion") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-braces") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wmissing-field-initializers") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wunused-member-function") +DOCTEST_CLANG_SUPPRESS_WARNING("-Wnonportable-system-include-path") + +DOCTEST_GCC_SUPPRESS_WARNING_PUSH +DOCTEST_GCC_SUPPRESS_WARNING("-Wconversion") +DOCTEST_GCC_SUPPRESS_WARNING("-Wsign-conversion") +DOCTEST_GCC_SUPPRESS_WARNING("-Wmissing-field-initializers") +DOCTEST_GCC_SUPPRESS_WARNING("-Wmissing-braces") +DOCTEST_GCC_SUPPRESS_WARNING("-Wswitch") +DOCTEST_GCC_SUPPRESS_WARNING("-Wswitch-enum") +DOCTEST_GCC_SUPPRESS_WARNING("-Wswitch-default") +DOCTEST_GCC_SUPPRESS_WARNING("-Wunsafe-loop-optimizations") +DOCTEST_GCC_SUPPRESS_WARNING("-Wold-style-cast") +DOCTEST_GCC_SUPPRESS_WARNING("-Wunused-function") +DOCTEST_GCC_SUPPRESS_WARNING("-Wmultiple-inheritance") +DOCTEST_GCC_SUPPRESS_WARNING("-Wsuggest-attribute") + +DOCTEST_MSVC_SUPPRESS_WARNING_PUSH +DOCTEST_MSVC_SUPPRESS_WARNING(4267) // 'var' : conversion from 'x' to 'y', possible loss of data +DOCTEST_MSVC_SUPPRESS_WARNING(4530) // C++ exception handler used, but unwind semantics not enabled +DOCTEST_MSVC_SUPPRESS_WARNING(4577) // 'noexcept' used with no exception handling mode specified +DOCTEST_MSVC_SUPPRESS_WARNING(4774) // format string expected in argument is not a string literal +DOCTEST_MSVC_SUPPRESS_WARNING(4365) // conversion from 'int' to 'unsigned', signed/unsigned mismatch +DOCTEST_MSVC_SUPPRESS_WARNING(5039) // pointer to potentially throwing function passed to extern C +DOCTEST_MSVC_SUPPRESS_WARNING(4800) // forcing value to bool 'true' or 'false' (performance warning) +DOCTEST_MSVC_SUPPRESS_WARNING(5245) // unreferenced function with internal linkage has been removed + +DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_BEGIN + +// required includes - will go only in one translation unit! +#include +#include +#include +// borland (Embarcadero) compiler requires math.h and not cmath - https://github.com/doctest/doctest/pull/37 +#ifdef __BORLANDC__ +#include +#endif // __BORLANDC__ +#include +#include +#include +#include +#include +#include +#include +#include +#ifndef DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM +#include +#endif // DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM +#include +#include +#include +#ifndef DOCTEST_CONFIG_NO_MULTITHREADING +#include +#include +#define DOCTEST_DECLARE_MUTEX(name) std::mutex name; +#define DOCTEST_DECLARE_STATIC_MUTEX(name) static DOCTEST_DECLARE_MUTEX(name) +#define DOCTEST_LOCK_MUTEX(name) std::lock_guard DOCTEST_ANONYMOUS(DOCTEST_ANON_LOCK_)(name); +#else // DOCTEST_CONFIG_NO_MULTITHREADING +#define DOCTEST_DECLARE_MUTEX(name) +#define DOCTEST_DECLARE_STATIC_MUTEX(name) +#define DOCTEST_LOCK_MUTEX(name) +#endif // DOCTEST_CONFIG_NO_MULTITHREADING +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef DOCTEST_PLATFORM_MAC +#include +#include +#include +#endif // DOCTEST_PLATFORM_MAC + +#ifdef DOCTEST_PLATFORM_WINDOWS + +// defines for a leaner windows.h +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#define DOCTEST_UNDEF_WIN32_LEAN_AND_MEAN +#endif // WIN32_LEAN_AND_MEAN +#ifndef NOMINMAX +#define NOMINMAX +#define DOCTEST_UNDEF_NOMINMAX +#endif // NOMINMAX + +// not sure what AfxWin.h is for - here I do what Catch does +#ifdef __AFXDLL +#include +#else +#include +#endif +#include + +#else // DOCTEST_PLATFORM_WINDOWS + +#include +#include + +#endif // DOCTEST_PLATFORM_WINDOWS + +// this is a fix for https://github.com/doctest/doctest/issues/348 +// https://mail.gnome.org/archives/xml/2012-January/msg00000.html +#if !defined(HAVE_UNISTD_H) && !defined(STDOUT_FILENO) +#define STDOUT_FILENO fileno(stdout) +#endif // HAVE_UNISTD_H + +DOCTEST_MAKE_STD_HEADERS_CLEAN_FROM_WARNINGS_ON_WALL_END + +// counts the number of elements in a C array +#define DOCTEST_COUNTOF(x) (sizeof(x) / sizeof(x[0])) + +#ifdef DOCTEST_CONFIG_DISABLE +#define DOCTEST_BRANCH_ON_DISABLED(if_disabled, if_not_disabled) if_disabled +#else // DOCTEST_CONFIG_DISABLE +#define DOCTEST_BRANCH_ON_DISABLED(if_disabled, if_not_disabled) if_not_disabled +#endif // DOCTEST_CONFIG_DISABLE + +#ifndef DOCTEST_CONFIG_OPTIONS_PREFIX +#define DOCTEST_CONFIG_OPTIONS_PREFIX "dt-" +#endif + +#ifndef DOCTEST_THREAD_LOCAL +#if defined(DOCTEST_CONFIG_NO_MULTITHREADING) || DOCTEST_MSVC && (DOCTEST_MSVC < DOCTEST_COMPILER(19, 0, 0)) +#define DOCTEST_THREAD_LOCAL +#else // DOCTEST_MSVC +#define DOCTEST_THREAD_LOCAL thread_local +#endif // DOCTEST_MSVC +#endif // DOCTEST_THREAD_LOCAL + +#ifndef DOCTEST_MULTI_LANE_ATOMICS_THREAD_LANES +#define DOCTEST_MULTI_LANE_ATOMICS_THREAD_LANES 32 +#endif + +#ifndef DOCTEST_MULTI_LANE_ATOMICS_CACHE_LINE_SIZE +#define DOCTEST_MULTI_LANE_ATOMICS_CACHE_LINE_SIZE 64 +#endif + +#ifdef DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS +#define DOCTEST_OPTIONS_PREFIX_DISPLAY DOCTEST_CONFIG_OPTIONS_PREFIX +#else +#define DOCTEST_OPTIONS_PREFIX_DISPLAY "" +#endif + +#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) +#define DOCTEST_CONFIG_NO_MULTI_LANE_ATOMICS +#endif + +#ifndef DOCTEST_CDECL +#define DOCTEST_CDECL __cdecl +#endif + +namespace doctest { + +bool is_running_in_test = false; + +namespace { + using namespace detail; + + template + DOCTEST_NORETURN void throw_exception(Ex const& e) { +#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS + throw e; +#else // DOCTEST_CONFIG_NO_EXCEPTIONS +#ifdef DOCTEST_CONFIG_HANDLE_EXCEPTION + DOCTEST_CONFIG_HANDLE_EXCEPTION(e); +#else // DOCTEST_CONFIG_HANDLE_EXCEPTION +#ifndef DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM + std::cerr << "doctest will terminate because it needed to throw an exception.\n" + << "The message was: " << e.what() << '\n'; +#endif // DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM +#endif // DOCTEST_CONFIG_HANDLE_EXCEPTION + std::terminate(); +#endif // DOCTEST_CONFIG_NO_EXCEPTIONS + } + +#ifndef DOCTEST_INTERNAL_ERROR +#define DOCTEST_INTERNAL_ERROR(msg) \ + throw_exception(std::logic_error( \ + __FILE__ ":" DOCTEST_TOSTR(__LINE__) ": Internal doctest error: " msg)) +#endif // DOCTEST_INTERNAL_ERROR + + // case insensitive strcmp + int stricmp(const char* a, const char* b) { + for(;; a++, b++) { + const int d = tolower(*a) - tolower(*b); + if(d != 0 || !*a) + return d; + } + } + + struct Endianness + { + enum Arch + { + Big, + Little + }; + + static Arch which() { + int x = 1; + // casting any data pointer to char* is allowed + auto ptr = reinterpret_cast(&x); + if(*ptr) + return Little; + return Big; + } + }; +} // namespace + +namespace detail { + DOCTEST_THREAD_LOCAL class + { + std::vector stack; + std::stringstream ss; + + public: + std::ostream* push() { + stack.push_back(ss.tellp()); + return &ss; + } + + String pop() { + if (stack.empty()) + DOCTEST_INTERNAL_ERROR("TLSS was empty when trying to pop!"); + + std::streampos pos = stack.back(); + stack.pop_back(); + unsigned sz = static_cast(ss.tellp() - pos); + ss.rdbuf()->pubseekpos(pos, std::ios::in | std::ios::out); + return String(ss, sz); + } + } g_oss; + + std::ostream* tlssPush() { + return g_oss.push(); + } + + String tlssPop() { + return g_oss.pop(); + } + +#ifndef DOCTEST_CONFIG_DISABLE + +namespace timer_large_integer +{ + +#if defined(DOCTEST_PLATFORM_WINDOWS) + using type = ULONGLONG; +#else // DOCTEST_PLATFORM_WINDOWS + using type = std::uint64_t; +#endif // DOCTEST_PLATFORM_WINDOWS +} + +using ticks_t = timer_large_integer::type; + +#ifdef DOCTEST_CONFIG_GETCURRENTTICKS + ticks_t getCurrentTicks() { return DOCTEST_CONFIG_GETCURRENTTICKS(); } +#elif defined(DOCTEST_PLATFORM_WINDOWS) + ticks_t getCurrentTicks() { + static LARGE_INTEGER hz = { {0} }, hzo = { {0} }; + if(!hz.QuadPart) { + QueryPerformanceFrequency(&hz); + QueryPerformanceCounter(&hzo); + } + LARGE_INTEGER t; + QueryPerformanceCounter(&t); + return ((t.QuadPart - hzo.QuadPart) * LONGLONG(1000000)) / hz.QuadPart; + } +#else // DOCTEST_PLATFORM_WINDOWS + ticks_t getCurrentTicks() { + timeval t; + gettimeofday(&t, nullptr); + return static_cast(t.tv_sec) * 1000000 + static_cast(t.tv_usec); + } +#endif // DOCTEST_PLATFORM_WINDOWS + + struct Timer + { + void start() { m_ticks = getCurrentTicks(); } + unsigned int getElapsedMicroseconds() const { + return static_cast(getCurrentTicks() - m_ticks); + } + //unsigned int getElapsedMilliseconds() const { + // return static_cast(getElapsedMicroseconds() / 1000); + //} + double getElapsedSeconds() const { return static_cast(getCurrentTicks() - m_ticks) / 1000000.0; } + + private: + ticks_t m_ticks = 0; + }; + +#ifdef DOCTEST_CONFIG_NO_MULTITHREADING + template + using Atomic = T; +#else // DOCTEST_CONFIG_NO_MULTITHREADING + template + using Atomic = std::atomic; +#endif // DOCTEST_CONFIG_NO_MULTITHREADING + +#if defined(DOCTEST_CONFIG_NO_MULTI_LANE_ATOMICS) || defined(DOCTEST_CONFIG_NO_MULTITHREADING) + template + using MultiLaneAtomic = Atomic; +#else // DOCTEST_CONFIG_NO_MULTI_LANE_ATOMICS + // Provides a multilane implementation of an atomic variable that supports add, sub, load, + // store. Instead of using a single atomic variable, this splits up into multiple ones, + // each sitting on a separate cache line. The goal is to provide a speedup when most + // operations are modifying. It achieves this with two properties: + // + // * Multiple atomics are used, so chance of congestion from the same atomic is reduced. + // * Each atomic sits on a separate cache line, so false sharing is reduced. + // + // The disadvantage is that there is a small overhead due to the use of TLS, and load/store + // is slower because all atomics have to be accessed. + template + class MultiLaneAtomic + { + struct CacheLineAlignedAtomic + { + Atomic atomic{}; + char padding[DOCTEST_MULTI_LANE_ATOMICS_CACHE_LINE_SIZE - sizeof(Atomic)]; + }; + CacheLineAlignedAtomic m_atomics[DOCTEST_MULTI_LANE_ATOMICS_THREAD_LANES]; + + static_assert(sizeof(CacheLineAlignedAtomic) == DOCTEST_MULTI_LANE_ATOMICS_CACHE_LINE_SIZE, + "guarantee one atomic takes exactly one cache line"); + + public: + T operator++() DOCTEST_NOEXCEPT { return fetch_add(1) + 1; } + + T operator++(int) DOCTEST_NOEXCEPT { return fetch_add(1); } + + T fetch_add(T arg, std::memory_order order = std::memory_order_seq_cst) DOCTEST_NOEXCEPT { + return myAtomic().fetch_add(arg, order); + } + + T fetch_sub(T arg, std::memory_order order = std::memory_order_seq_cst) DOCTEST_NOEXCEPT { + return myAtomic().fetch_sub(arg, order); + } + + operator T() const DOCTEST_NOEXCEPT { return load(); } + + T load(std::memory_order order = std::memory_order_seq_cst) const DOCTEST_NOEXCEPT { + auto result = T(); + for(auto const& c : m_atomics) { + result += c.atomic.load(order); + } + return result; + } + + T operator=(T desired) DOCTEST_NOEXCEPT { // lgtm [cpp/assignment-does-not-return-this] + store(desired); + return desired; + } + + void store(T desired, std::memory_order order = std::memory_order_seq_cst) DOCTEST_NOEXCEPT { + // first value becomes desired", all others become 0. + for(auto& c : m_atomics) { + c.atomic.store(desired, order); + desired = {}; + } + } + + private: + // Each thread has a different atomic that it operates on. If more than NumLanes threads + // use this, some will use the same atomic. So performance will degrade a bit, but still + // everything will work. + // + // The logic here is a bit tricky. The call should be as fast as possible, so that there + // is minimal to no overhead in determining the correct atomic for the current thread. + // + // 1. A global static counter laneCounter counts continuously up. + // 2. Each successive thread will use modulo operation of that counter so it gets an atomic + // assigned in a round-robin fashion. + // 3. This tlsLaneIdx is stored in the thread local data, so it is directly available with + // little overhead. + Atomic& myAtomic() DOCTEST_NOEXCEPT { + static Atomic laneCounter; + DOCTEST_THREAD_LOCAL size_t tlsLaneIdx = + laneCounter++ % DOCTEST_MULTI_LANE_ATOMICS_THREAD_LANES; + + return m_atomics[tlsLaneIdx].atomic; + } + }; +#endif // DOCTEST_CONFIG_NO_MULTI_LANE_ATOMICS + + // this holds both parameters from the command line and runtime data for tests + struct ContextState : ContextOptions, TestRunStats, CurrentTestCaseStats + { + MultiLaneAtomic numAssertsCurrentTest_atomic; + MultiLaneAtomic numAssertsFailedCurrentTest_atomic; + + std::vector> filters = decltype(filters)(9); // 9 different filters + + std::vector reporters_currently_used; + + assert_handler ah = nullptr; + + Timer timer; + + std::vector stringifiedContexts; // logging from INFO() due to an exception + + // stuff for subcases + bool reachedLeaf; + std::vector subcaseStack; + std::vector nextSubcaseStack; + std::unordered_set fullyTraversedSubcases; + size_t currentSubcaseDepth; + Atomic shouldLogCurrentException; + + void resetRunData() { + numTestCases = 0; + numTestCasesPassingFilters = 0; + numTestSuitesPassingFilters = 0; + numTestCasesFailed = 0; + numAsserts = 0; + numAssertsFailed = 0; + numAssertsCurrentTest = 0; + numAssertsFailedCurrentTest = 0; + } + + void finalizeTestCaseData() { + seconds = timer.getElapsedSeconds(); + + // update the non-atomic counters + numAsserts += numAssertsCurrentTest_atomic; + numAssertsFailed += numAssertsFailedCurrentTest_atomic; + numAssertsCurrentTest = numAssertsCurrentTest_atomic; + numAssertsFailedCurrentTest = numAssertsFailedCurrentTest_atomic; + + if(numAssertsFailedCurrentTest) + failure_flags |= TestCaseFailureReason::AssertFailure; + + if(Approx(currentTest->m_timeout).epsilon(DBL_EPSILON) != 0 && + Approx(seconds).epsilon(DBL_EPSILON) > currentTest->m_timeout) + failure_flags |= TestCaseFailureReason::Timeout; + + if(currentTest->m_should_fail) { + if(failure_flags) { + failure_flags |= TestCaseFailureReason::ShouldHaveFailedAndDid; + } else { + failure_flags |= TestCaseFailureReason::ShouldHaveFailedButDidnt; + } + } else if(failure_flags && currentTest->m_may_fail) { + failure_flags |= TestCaseFailureReason::CouldHaveFailedAndDid; + } else if(currentTest->m_expected_failures > 0) { + if(numAssertsFailedCurrentTest == currentTest->m_expected_failures) { + failure_flags |= TestCaseFailureReason::FailedExactlyNumTimes; + } else { + failure_flags |= TestCaseFailureReason::DidntFailExactlyNumTimes; + } + } + + bool ok_to_fail = (TestCaseFailureReason::ShouldHaveFailedAndDid & failure_flags) || + (TestCaseFailureReason::CouldHaveFailedAndDid & failure_flags) || + (TestCaseFailureReason::FailedExactlyNumTimes & failure_flags); + + // if any subcase has failed - the whole test case has failed + testCaseSuccess = !(failure_flags && !ok_to_fail); + if(!testCaseSuccess) + numTestCasesFailed++; + } + }; + + ContextState* g_cs = nullptr; + + // used to avoid locks for the debug output + // TODO: figure out if this is indeed necessary/correct - seems like either there still + // could be a race or that there wouldn't be a race even if using the context directly + DOCTEST_THREAD_LOCAL bool g_no_colors; + +#endif // DOCTEST_CONFIG_DISABLE +} // namespace detail + +char* String::allocate(size_type sz) { + if (sz <= last) { + buf[sz] = '\0'; + setLast(last - sz); + return buf; + } else { + setOnHeap(); + data.size = sz; + data.capacity = data.size + 1; + data.ptr = new char[data.capacity]; + data.ptr[sz] = '\0'; + return data.ptr; + } +} + +void String::setOnHeap() noexcept { *reinterpret_cast(&buf[last]) = 128; } +void String::setLast(size_type in) noexcept { buf[last] = char(in); } +void String::setSize(size_type sz) noexcept { + if (isOnStack()) { buf[sz] = '\0'; setLast(last - sz); } + else { data.ptr[sz] = '\0'; data.size = sz; } +} + +void String::copy(const String& other) { + if(other.isOnStack()) { + memcpy(buf, other.buf, len); + } else { + memcpy(allocate(other.data.size), other.data.ptr, other.data.size); + } +} + +String::String() noexcept { + buf[0] = '\0'; + setLast(); +} + +String::~String() { + if(!isOnStack()) + delete[] data.ptr; +} // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) + +String::String(const char* in) + : String(in, strlen(in)) {} + +String::String(const char* in, size_type in_size) { + memcpy(allocate(in_size), in, in_size); +} + +String::String(std::istream& in, size_type in_size) { + in.read(allocate(in_size), in_size); +} + +String::String(const String& other) { copy(other); } + +String& String::operator=(const String& other) { + if(this != &other) { + if(!isOnStack()) + delete[] data.ptr; + + copy(other); + } + + return *this; +} + +String& String::operator+=(const String& other) { + const size_type my_old_size = size(); + const size_type other_size = other.size(); + const size_type total_size = my_old_size + other_size; + if(isOnStack()) { + if(total_size < len) { + // append to the current stack space + memcpy(buf + my_old_size, other.c_str(), other_size + 1); + // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) + setLast(last - total_size); + } else { + // alloc new chunk + char* temp = new char[total_size + 1]; + // copy current data to new location before writing in the union + memcpy(temp, buf, my_old_size); // skip the +1 ('\0') for speed + // update data in union + setOnHeap(); + data.size = total_size; + data.capacity = data.size + 1; + data.ptr = temp; + // transfer the rest of the data + memcpy(data.ptr + my_old_size, other.c_str(), other_size + 1); + } + } else { + if(data.capacity > total_size) { + // append to the current heap block + data.size = total_size; + memcpy(data.ptr + my_old_size, other.c_str(), other_size + 1); + } else { + // resize + data.capacity *= 2; + if(data.capacity <= total_size) + data.capacity = total_size + 1; + // alloc new chunk + char* temp = new char[data.capacity]; + // copy current data to new location before releasing it + memcpy(temp, data.ptr, my_old_size); // skip the +1 ('\0') for speed + // release old chunk + delete[] data.ptr; + // update the rest of the union members + data.size = total_size; + data.ptr = temp; + // transfer the rest of the data + memcpy(data.ptr + my_old_size, other.c_str(), other_size + 1); + } + } + + return *this; +} + +String::String(String&& other) noexcept { + memcpy(buf, other.buf, len); + other.buf[0] = '\0'; + other.setLast(); +} + +String& String::operator=(String&& other) noexcept { + if(this != &other) { + if(!isOnStack()) + delete[] data.ptr; + memcpy(buf, other.buf, len); + other.buf[0] = '\0'; + other.setLast(); + } + return *this; +} + +char String::operator[](size_type i) const { + return const_cast(this)->operator[](i); +} + +char& String::operator[](size_type i) { + if(isOnStack()) + return reinterpret_cast(buf)[i]; + return data.ptr[i]; +} + +DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wmaybe-uninitialized") +String::size_type String::size() const { + if(isOnStack()) + return last - (size_type(buf[last]) & 31); // using "last" would work only if "len" is 32 + return data.size; +} +DOCTEST_GCC_SUPPRESS_WARNING_POP + +String::size_type String::capacity() const { + if(isOnStack()) + return len; + return data.capacity; +} + +String String::substr(size_type pos, size_type cnt) && { + cnt = std::min(cnt, size() - 1 - pos); + char* cptr = c_str(); + memmove(cptr, cptr + pos, cnt); + setSize(cnt); + return std::move(*this); +} + +String String::substr(size_type pos, size_type cnt) const & { + cnt = std::min(cnt, size() - 1 - pos); + return String{ c_str() + pos, cnt }; +} + +String::size_type String::find(char ch, size_type pos) const { + const char* begin = c_str(); + const char* end = begin + size(); + const char* it = begin + pos; + for (; it < end && *it != ch; it++); + if (it < end) { return static_cast(it - begin); } + else { return npos; } +} + +String::size_type String::rfind(char ch, size_type pos) const { + const char* begin = c_str(); + const char* it = begin + std::min(pos, size() - 1); + for (; it >= begin && *it != ch; it--); + if (it >= begin) { return static_cast(it - begin); } + else { return npos; } +} + +int String::compare(const char* other, bool no_case) const { + if(no_case) + return doctest::stricmp(c_str(), other); + return std::strcmp(c_str(), other); +} + +int String::compare(const String& other, bool no_case) const { + return compare(other.c_str(), no_case); +} + +String operator+(const String& lhs, const String& rhs) { return String(lhs) += rhs; } + +bool operator==(const String& lhs, const String& rhs) { return lhs.compare(rhs) == 0; } +bool operator!=(const String& lhs, const String& rhs) { return lhs.compare(rhs) != 0; } +bool operator< (const String& lhs, const String& rhs) { return lhs.compare(rhs) < 0; } +bool operator> (const String& lhs, const String& rhs) { return lhs.compare(rhs) > 0; } +bool operator<=(const String& lhs, const String& rhs) { return (lhs != rhs) ? lhs.compare(rhs) < 0 : true; } +bool operator>=(const String& lhs, const String& rhs) { return (lhs != rhs) ? lhs.compare(rhs) > 0 : true; } + +std::ostream& operator<<(std::ostream& s, const String& in) { return s << in.c_str(); } + +Contains::Contains(const String& str) : string(str) { } + +bool Contains::checkWith(const String& other) const { + return strstr(other.c_str(), string.c_str()) != nullptr; +} + +String toString(const Contains& in) { + return "Contains( " + in.string + " )"; +} + +bool operator==(const String& lhs, const Contains& rhs) { return rhs.checkWith(lhs); } +bool operator==(const Contains& lhs, const String& rhs) { return lhs.checkWith(rhs); } +bool operator!=(const String& lhs, const Contains& rhs) { return !rhs.checkWith(lhs); } +bool operator!=(const Contains& lhs, const String& rhs) { return !lhs.checkWith(rhs); } + +namespace { + void color_to_stream(std::ostream&, Color::Enum) DOCTEST_BRANCH_ON_DISABLED({}, ;) +} // namespace + +namespace Color { + std::ostream& operator<<(std::ostream& s, Color::Enum code) { + color_to_stream(s, code); + return s; + } +} // namespace Color + +// clang-format off +const char* assertString(assertType::Enum at) { + DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4061) // enum 'x' in switch of enum 'y' is not explicitly handled + #define DOCTEST_GENERATE_ASSERT_TYPE_CASE(assert_type) case assertType::DT_ ## assert_type: return #assert_type + #define DOCTEST_GENERATE_ASSERT_TYPE_CASES(assert_type) \ + DOCTEST_GENERATE_ASSERT_TYPE_CASE(WARN_ ## assert_type); \ + DOCTEST_GENERATE_ASSERT_TYPE_CASE(CHECK_ ## assert_type); \ + DOCTEST_GENERATE_ASSERT_TYPE_CASE(REQUIRE_ ## assert_type) + switch(at) { + DOCTEST_GENERATE_ASSERT_TYPE_CASE(WARN); + DOCTEST_GENERATE_ASSERT_TYPE_CASE(CHECK); + DOCTEST_GENERATE_ASSERT_TYPE_CASE(REQUIRE); + + DOCTEST_GENERATE_ASSERT_TYPE_CASES(FALSE); + + DOCTEST_GENERATE_ASSERT_TYPE_CASES(THROWS); + + DOCTEST_GENERATE_ASSERT_TYPE_CASES(THROWS_AS); + + DOCTEST_GENERATE_ASSERT_TYPE_CASES(THROWS_WITH); + + DOCTEST_GENERATE_ASSERT_TYPE_CASES(THROWS_WITH_AS); + + DOCTEST_GENERATE_ASSERT_TYPE_CASES(NOTHROW); + + DOCTEST_GENERATE_ASSERT_TYPE_CASES(EQ); + DOCTEST_GENERATE_ASSERT_TYPE_CASES(NE); + DOCTEST_GENERATE_ASSERT_TYPE_CASES(GT); + DOCTEST_GENERATE_ASSERT_TYPE_CASES(LT); + DOCTEST_GENERATE_ASSERT_TYPE_CASES(GE); + DOCTEST_GENERATE_ASSERT_TYPE_CASES(LE); + + DOCTEST_GENERATE_ASSERT_TYPE_CASES(UNARY); + DOCTEST_GENERATE_ASSERT_TYPE_CASES(UNARY_FALSE); + + default: DOCTEST_INTERNAL_ERROR("Tried stringifying invalid assert type!"); + } + DOCTEST_MSVC_SUPPRESS_WARNING_POP +} +// clang-format on + +const char* failureString(assertType::Enum at) { + if(at & assertType::is_warn) //!OCLINT bitwise operator in conditional + return "WARNING"; + if(at & assertType::is_check) //!OCLINT bitwise operator in conditional + return "ERROR"; + if(at & assertType::is_require) //!OCLINT bitwise operator in conditional + return "FATAL ERROR"; + return ""; +} + +DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wnull-dereference") +DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wnull-dereference") +// depending on the current options this will remove the path of filenames +const char* skipPathFromFilename(const char* file) { +#ifndef DOCTEST_CONFIG_DISABLE + if(getContextOptions()->no_path_in_filenames) { + auto back = std::strrchr(file, '\\'); + auto forward = std::strrchr(file, '/'); + if(back || forward) { + if(back > forward) + forward = back; + return forward + 1; + } + } +#endif // DOCTEST_CONFIG_DISABLE + return file; +} +DOCTEST_CLANG_SUPPRESS_WARNING_POP +DOCTEST_GCC_SUPPRESS_WARNING_POP + +bool SubcaseSignature::operator==(const SubcaseSignature& other) const { + return m_line == other.m_line + && std::strcmp(m_file, other.m_file) == 0 + && m_name == other.m_name; +} + +bool SubcaseSignature::operator<(const SubcaseSignature& other) const { + if(m_line != other.m_line) + return m_line < other.m_line; + if(std::strcmp(m_file, other.m_file) != 0) + return std::strcmp(m_file, other.m_file) < 0; + return m_name.compare(other.m_name) < 0; +} + +DOCTEST_DEFINE_INTERFACE(IContextScope) + +namespace detail { + void filldata::fill(std::ostream* stream, const void* in) { + if (in) { *stream << in; } + else { *stream << "nullptr"; } + } + + template + String toStreamLit(T t) { + std::ostream* os = tlssPush(); + os->operator<<(t); + return tlssPop(); + } +} + +#ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING +String toString(const char* in) { return String("\"") + (in ? in : "{null string}") + "\""; } +#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING + +#if DOCTEST_MSVC >= DOCTEST_COMPILER(19, 20, 0) +// see this issue on why this is needed: https://github.com/doctest/doctest/issues/183 +String toString(const std::string& in) { return in.c_str(); } +#endif // VS 2019 + +String toString(String in) { return in; } + +String toString(std::nullptr_t) { return "nullptr"; } + +String toString(bool in) { return in ? "true" : "false"; } + +String toString(float in) { return toStreamLit(in); } +String toString(double in) { return toStreamLit(in); } +String toString(double long in) { return toStreamLit(in); } + +String toString(char in) { return toStreamLit(static_cast(in)); } +String toString(char signed in) { return toStreamLit(static_cast(in)); } +String toString(char unsigned in) { return toStreamLit(static_cast(in)); } +String toString(short in) { return toStreamLit(in); } +String toString(short unsigned in) { return toStreamLit(in); } +String toString(signed in) { return toStreamLit(in); } +String toString(unsigned in) { return toStreamLit(in); } +String toString(long in) { return toStreamLit(in); } +String toString(long unsigned in) { return toStreamLit(in); } +String toString(long long in) { return toStreamLit(in); } +String toString(long long unsigned in) { return toStreamLit(in); } + +Approx::Approx(double value) + : m_epsilon(static_cast(std::numeric_limits::epsilon()) * 100) + , m_scale(1.0) + , m_value(value) {} + +Approx Approx::operator()(double value) const { + Approx approx(value); + approx.epsilon(m_epsilon); + approx.scale(m_scale); + return approx; +} + +Approx& Approx::epsilon(double newEpsilon) { + m_epsilon = newEpsilon; + return *this; +} +Approx& Approx::scale(double newScale) { + m_scale = newScale; + return *this; +} + +bool operator==(double lhs, const Approx& rhs) { + // Thanks to Richard Harris for his help refining this formula + return std::fabs(lhs - rhs.m_value) < + rhs.m_epsilon * (rhs.m_scale + std::max(std::fabs(lhs), std::fabs(rhs.m_value))); +} +bool operator==(const Approx& lhs, double rhs) { return operator==(rhs, lhs); } +bool operator!=(double lhs, const Approx& rhs) { return !operator==(lhs, rhs); } +bool operator!=(const Approx& lhs, double rhs) { return !operator==(rhs, lhs); } +bool operator<=(double lhs, const Approx& rhs) { return lhs < rhs.m_value || lhs == rhs; } +bool operator<=(const Approx& lhs, double rhs) { return lhs.m_value < rhs || lhs == rhs; } +bool operator>=(double lhs, const Approx& rhs) { return lhs > rhs.m_value || lhs == rhs; } +bool operator>=(const Approx& lhs, double rhs) { return lhs.m_value > rhs || lhs == rhs; } +bool operator<(double lhs, const Approx& rhs) { return lhs < rhs.m_value && lhs != rhs; } +bool operator<(const Approx& lhs, double rhs) { return lhs.m_value < rhs && lhs != rhs; } +bool operator>(double lhs, const Approx& rhs) { return lhs > rhs.m_value && lhs != rhs; } +bool operator>(const Approx& lhs, double rhs) { return lhs.m_value > rhs && lhs != rhs; } + +String toString(const Approx& in) { + return "Approx( " + doctest::toString(in.m_value) + " )"; +} +const ContextOptions* getContextOptions() { return DOCTEST_BRANCH_ON_DISABLED(nullptr, g_cs); } + +DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4738) +template +IsNaN::operator bool() const { + return std::isnan(value) ^ flipped; +} +DOCTEST_MSVC_SUPPRESS_WARNING_POP +template struct DOCTEST_INTERFACE_DEF IsNaN; +template struct DOCTEST_INTERFACE_DEF IsNaN; +template struct DOCTEST_INTERFACE_DEF IsNaN; +template +String toString(IsNaN in) { return String(in.flipped ? "! " : "") + "IsNaN( " + doctest::toString(in.value) + " )"; } +String toString(IsNaN in) { return toString(in); } +String toString(IsNaN in) { return toString(in); } +String toString(IsNaN in) { return toString(in); } + +} // namespace doctest + +#ifdef DOCTEST_CONFIG_DISABLE +namespace doctest { +Context::Context(int, const char* const*) {} +Context::~Context() = default; +void Context::applyCommandLine(int, const char* const*) {} +void Context::addFilter(const char*, const char*) {} +void Context::clearFilters() {} +void Context::setOption(const char*, bool) {} +void Context::setOption(const char*, int) {} +void Context::setOption(const char*, const char*) {} +bool Context::shouldExit() { return false; } +void Context::setAsDefaultForAssertsOutOfTestCases() {} +void Context::setAssertHandler(detail::assert_handler) {} +void Context::setCout(std::ostream*) {} +int Context::run() { return 0; } + +int IReporter::get_num_active_contexts() { return 0; } +const IContextScope* const* IReporter::get_active_contexts() { return nullptr; } +int IReporter::get_num_stringified_contexts() { return 0; } +const String* IReporter::get_stringified_contexts() { return nullptr; } + +int registerReporter(const char*, int, IReporter*) { return 0; } + +} // namespace doctest +#else // DOCTEST_CONFIG_DISABLE + +#if !defined(DOCTEST_CONFIG_COLORS_NONE) +#if !defined(DOCTEST_CONFIG_COLORS_WINDOWS) && !defined(DOCTEST_CONFIG_COLORS_ANSI) +#ifdef DOCTEST_PLATFORM_WINDOWS +#define DOCTEST_CONFIG_COLORS_WINDOWS +#else // linux +#define DOCTEST_CONFIG_COLORS_ANSI +#endif // platform +#endif // DOCTEST_CONFIG_COLORS_WINDOWS && DOCTEST_CONFIG_COLORS_ANSI +#endif // DOCTEST_CONFIG_COLORS_NONE + +namespace doctest_detail_test_suite_ns { +// holds the current test suite +doctest::detail::TestSuite& getCurrentTestSuite() { + static doctest::detail::TestSuite data{}; + return data; +} +} // namespace doctest_detail_test_suite_ns + +namespace doctest { +namespace { + // the int (priority) is part of the key for automatic sorting - sadly one can register a + // reporter with a duplicate name and a different priority but hopefully that won't happen often :| + using reporterMap = std::map, reporterCreatorFunc>; + + reporterMap& getReporters() { + static reporterMap data; + return data; + } + reporterMap& getListeners() { + static reporterMap data; + return data; + } +} // namespace +namespace detail { +#define DOCTEST_ITERATE_THROUGH_REPORTERS(function, ...) \ + for(auto& curr_rep : g_cs->reporters_currently_used) \ + curr_rep->function(__VA_ARGS__) + + bool checkIfShouldThrow(assertType::Enum at) { + if(at & assertType::is_require) //!OCLINT bitwise operator in conditional + return true; + + if((at & assertType::is_check) //!OCLINT bitwise operator in conditional + && getContextOptions()->abort_after > 0 && + (g_cs->numAssertsFailed + g_cs->numAssertsFailedCurrentTest_atomic) >= + getContextOptions()->abort_after) + return true; + + return false; + } + +#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS + DOCTEST_NORETURN void throwException() { + g_cs->shouldLogCurrentException = false; + throw TestFailureException(); // NOLINT(hicpp-exception-baseclass) + } +#else // DOCTEST_CONFIG_NO_EXCEPTIONS + void throwException() {} +#endif // DOCTEST_CONFIG_NO_EXCEPTIONS +} // namespace detail + +namespace { + using namespace detail; + // matching of a string against a wildcard mask (case sensitivity configurable) taken from + // https://www.codeproject.com/Articles/1088/Wildcard-string-compare-globbing + int wildcmp(const char* str, const char* wild, bool caseSensitive) { + const char* cp = str; + const char* mp = wild; + + while((*str) && (*wild != '*')) { + if((caseSensitive ? (*wild != *str) : (tolower(*wild) != tolower(*str))) && + (*wild != '?')) { + return 0; + } + wild++; + str++; + } + + while(*str) { + if(*wild == '*') { + if(!*++wild) { + return 1; + } + mp = wild; + cp = str + 1; + } else if((caseSensitive ? (*wild == *str) : (tolower(*wild) == tolower(*str))) || + (*wild == '?')) { + wild++; + str++; + } else { + wild = mp; //!OCLINT parameter reassignment + str = cp++; //!OCLINT parameter reassignment + } + } + + while(*wild == '*') { + wild++; + } + return !*wild; + } + + // checks if the name matches any of the filters (and can be configured what to do when empty) + bool matchesAny(const char* name, const std::vector& filters, bool matchEmpty, + bool caseSensitive) { + if (filters.empty() && matchEmpty) + return true; + for (auto& curr : filters) + if (wildcmp(name, curr.c_str(), caseSensitive)) + return true; + return false; + } + + DOCTEST_NO_SANITIZE_INTEGER + unsigned long long hash(unsigned long long a, unsigned long long b) { + return (a << 5) + b; + } + + // C string hash function (djb2) - taken from http://www.cse.yorku.ca/~oz/hash.html + DOCTEST_NO_SANITIZE_INTEGER + unsigned long long hash(const char* str) { + unsigned long long hash = 5381; + char c; + while ((c = *str++)) + hash = ((hash << 5) + hash) + c; // hash * 33 + c + return hash; + } + + unsigned long long hash(const SubcaseSignature& sig) { + return hash(hash(hash(sig.m_file), hash(sig.m_name.c_str())), sig.m_line); + } + + unsigned long long hash(const std::vector& sigs, size_t count) { + unsigned long long running = 0; + auto end = sigs.begin() + count; + for (auto it = sigs.begin(); it != end; it++) { + running = hash(running, hash(*it)); + } + return running; + } + + unsigned long long hash(const std::vector& sigs) { + unsigned long long running = 0; + for (const SubcaseSignature& sig : sigs) { + running = hash(running, hash(sig)); + } + return running; + } +} // namespace +namespace detail { + bool Subcase::checkFilters() { + if (g_cs->subcaseStack.size() < size_t(g_cs->subcase_filter_levels)) { + if (!matchesAny(m_signature.m_name.c_str(), g_cs->filters[6], true, g_cs->case_sensitive)) + return true; + if (matchesAny(m_signature.m_name.c_str(), g_cs->filters[7], false, g_cs->case_sensitive)) + return true; + } + return false; + } + + Subcase::Subcase(const String& name, const char* file, int line) + : m_signature({name, file, line}) { + if (!g_cs->reachedLeaf) { + if (g_cs->nextSubcaseStack.size() <= g_cs->subcaseStack.size() + || g_cs->nextSubcaseStack[g_cs->subcaseStack.size()] == m_signature) { + // Going down. + if (checkFilters()) { return; } + + g_cs->subcaseStack.push_back(m_signature); + g_cs->currentSubcaseDepth++; + m_entered = true; + DOCTEST_ITERATE_THROUGH_REPORTERS(subcase_start, m_signature); + } + } else { + if (g_cs->subcaseStack[g_cs->currentSubcaseDepth] == m_signature) { + // This subcase is reentered via control flow. + g_cs->currentSubcaseDepth++; + m_entered = true; + DOCTEST_ITERATE_THROUGH_REPORTERS(subcase_start, m_signature); + } else if (g_cs->nextSubcaseStack.size() <= g_cs->currentSubcaseDepth + && g_cs->fullyTraversedSubcases.find(hash(hash(g_cs->subcaseStack, g_cs->currentSubcaseDepth), hash(m_signature))) + == g_cs->fullyTraversedSubcases.end()) { + if (checkFilters()) { return; } + // This subcase is part of the one to be executed next. + g_cs->nextSubcaseStack.clear(); + g_cs->nextSubcaseStack.insert(g_cs->nextSubcaseStack.end(), + g_cs->subcaseStack.begin(), g_cs->subcaseStack.begin() + g_cs->currentSubcaseDepth); + g_cs->nextSubcaseStack.push_back(m_signature); + } + } + } + + DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4996) // std::uncaught_exception is deprecated in C++17 + DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations") + DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations") + + Subcase::~Subcase() { + if (m_entered) { + g_cs->currentSubcaseDepth--; + + if (!g_cs->reachedLeaf) { + // Leaf. + g_cs->fullyTraversedSubcases.insert(hash(g_cs->subcaseStack)); + g_cs->nextSubcaseStack.clear(); + g_cs->reachedLeaf = true; + } else if (g_cs->nextSubcaseStack.empty()) { + // All children are finished. + g_cs->fullyTraversedSubcases.insert(hash(g_cs->subcaseStack)); + } + +#if defined(__cpp_lib_uncaught_exceptions) && __cpp_lib_uncaught_exceptions >= 201411L && (!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) + if(std::uncaught_exceptions() > 0 +#else + if(std::uncaught_exception() +#endif + && g_cs->shouldLogCurrentException) { + DOCTEST_ITERATE_THROUGH_REPORTERS( + test_case_exception, {"exception thrown in subcase - will translate later " + "when the whole test case has been exited (cannot " + "translate while there is an active exception)", + false}); + g_cs->shouldLogCurrentException = false; + } + + DOCTEST_ITERATE_THROUGH_REPORTERS(subcase_end, DOCTEST_EMPTY); + } + } + + DOCTEST_CLANG_SUPPRESS_WARNING_POP + DOCTEST_GCC_SUPPRESS_WARNING_POP + DOCTEST_MSVC_SUPPRESS_WARNING_POP + + Subcase::operator bool() const { return m_entered; } + + Result::Result(bool passed, const String& decomposition) + : m_passed(passed) + , m_decomp(decomposition) {} + + ExpressionDecomposer::ExpressionDecomposer(assertType::Enum at) + : m_at(at) {} + + TestSuite& TestSuite::operator*(const char* in) { + m_test_suite = in; + return *this; + } + + TestCase::TestCase(funcType test, const char* file, unsigned line, const TestSuite& test_suite, + const String& type, int template_id) { + m_file = file; + m_line = line; + m_name = nullptr; // will be later overridden in operator* + m_test_suite = test_suite.m_test_suite; + m_description = test_suite.m_description; + m_skip = test_suite.m_skip; + m_no_breaks = test_suite.m_no_breaks; + m_no_output = test_suite.m_no_output; + m_may_fail = test_suite.m_may_fail; + m_should_fail = test_suite.m_should_fail; + m_expected_failures = test_suite.m_expected_failures; + m_timeout = test_suite.m_timeout; + + m_test = test; + m_type = type; + m_template_id = template_id; + } + + TestCase::TestCase(const TestCase& other) + : TestCaseData() { + *this = other; + } + + DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(26434) // hides a non-virtual function + TestCase& TestCase::operator=(const TestCase& other) { + TestCaseData::operator=(other); + m_test = other.m_test; + m_type = other.m_type; + m_template_id = other.m_template_id; + m_full_name = other.m_full_name; + + if(m_template_id != -1) + m_name = m_full_name.c_str(); + return *this; + } + DOCTEST_MSVC_SUPPRESS_WARNING_POP + + TestCase& TestCase::operator*(const char* in) { + m_name = in; + // make a new name with an appended type for templated test case + if(m_template_id != -1) { + m_full_name = String(m_name) + "<" + m_type + ">"; + // redirect the name to point to the newly constructed full name + m_name = m_full_name.c_str(); + } + return *this; + } + + bool TestCase::operator<(const TestCase& other) const { + // this will be used only to differentiate between test cases - not relevant for sorting + if(m_line != other.m_line) + return m_line < other.m_line; + const int name_cmp = strcmp(m_name, other.m_name); + if(name_cmp != 0) + return name_cmp < 0; + const int file_cmp = m_file.compare(other.m_file); + if(file_cmp != 0) + return file_cmp < 0; + return m_template_id < other.m_template_id; + } + + // all the registered tests + std::set& getRegisteredTests() { + static std::set data; + return data; + } +} // namespace detail +namespace { + using namespace detail; + // for sorting tests by file/line + bool fileOrderComparator(const TestCase* lhs, const TestCase* rhs) { + // this is needed because MSVC gives different case for drive letters + // for __FILE__ when evaluated in a header and a source file + const int res = lhs->m_file.compare(rhs->m_file, bool(DOCTEST_MSVC)); + if(res != 0) + return res < 0; + if(lhs->m_line != rhs->m_line) + return lhs->m_line < rhs->m_line; + return lhs->m_template_id < rhs->m_template_id; + } + + // for sorting tests by suite/file/line + bool suiteOrderComparator(const TestCase* lhs, const TestCase* rhs) { + const int res = std::strcmp(lhs->m_test_suite, rhs->m_test_suite); + if(res != 0) + return res < 0; + return fileOrderComparator(lhs, rhs); + } + + // for sorting tests by name/suite/file/line + bool nameOrderComparator(const TestCase* lhs, const TestCase* rhs) { + const int res = std::strcmp(lhs->m_name, rhs->m_name); + if(res != 0) + return res < 0; + return suiteOrderComparator(lhs, rhs); + } + + DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations") + void color_to_stream(std::ostream& s, Color::Enum code) { + static_cast(s); // for DOCTEST_CONFIG_COLORS_NONE or DOCTEST_CONFIG_COLORS_WINDOWS + static_cast(code); // for DOCTEST_CONFIG_COLORS_NONE +#ifdef DOCTEST_CONFIG_COLORS_ANSI + if(g_no_colors || + (isatty(STDOUT_FILENO) == false && getContextOptions()->force_colors == false)) + return; + + auto col = ""; + // clang-format off + switch(code) { //!OCLINT missing break in switch statement / unnecessary default statement in covered switch statement + case Color::Red: col = "[0;31m"; break; + case Color::Green: col = "[0;32m"; break; + case Color::Blue: col = "[0;34m"; break; + case Color::Cyan: col = "[0;36m"; break; + case Color::Yellow: col = "[0;33m"; break; + case Color::Grey: col = "[1;30m"; break; + case Color::LightGrey: col = "[0;37m"; break; + case Color::BrightRed: col = "[1;31m"; break; + case Color::BrightGreen: col = "[1;32m"; break; + case Color::BrightWhite: col = "[1;37m"; break; + case Color::Bright: // invalid + case Color::None: + case Color::White: + default: col = "[0m"; + } + // clang-format on + s << "\033" << col; +#endif // DOCTEST_CONFIG_COLORS_ANSI + +#ifdef DOCTEST_CONFIG_COLORS_WINDOWS + if(g_no_colors || + (_isatty(_fileno(stdout)) == false && getContextOptions()->force_colors == false)) + return; + + static struct ConsoleHelper { + HANDLE stdoutHandle; + WORD origFgAttrs; + WORD origBgAttrs; + + ConsoleHelper() { + stdoutHandle = GetStdHandle(STD_OUTPUT_HANDLE); + CONSOLE_SCREEN_BUFFER_INFO csbiInfo; + GetConsoleScreenBufferInfo(stdoutHandle, &csbiInfo); + origFgAttrs = csbiInfo.wAttributes & ~(BACKGROUND_GREEN | BACKGROUND_RED | + BACKGROUND_BLUE | BACKGROUND_INTENSITY); + origBgAttrs = csbiInfo.wAttributes & ~(FOREGROUND_GREEN | FOREGROUND_RED | + FOREGROUND_BLUE | FOREGROUND_INTENSITY); + } + } ch; + +#define DOCTEST_SET_ATTR(x) SetConsoleTextAttribute(ch.stdoutHandle, x | ch.origBgAttrs) + + // clang-format off + switch (code) { + case Color::White: DOCTEST_SET_ATTR(FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE); break; + case Color::Red: DOCTEST_SET_ATTR(FOREGROUND_RED); break; + case Color::Green: DOCTEST_SET_ATTR(FOREGROUND_GREEN); break; + case Color::Blue: DOCTEST_SET_ATTR(FOREGROUND_BLUE); break; + case Color::Cyan: DOCTEST_SET_ATTR(FOREGROUND_BLUE | FOREGROUND_GREEN); break; + case Color::Yellow: DOCTEST_SET_ATTR(FOREGROUND_RED | FOREGROUND_GREEN); break; + case Color::Grey: DOCTEST_SET_ATTR(0); break; + case Color::LightGrey: DOCTEST_SET_ATTR(FOREGROUND_INTENSITY); break; + case Color::BrightRed: DOCTEST_SET_ATTR(FOREGROUND_INTENSITY | FOREGROUND_RED); break; + case Color::BrightGreen: DOCTEST_SET_ATTR(FOREGROUND_INTENSITY | FOREGROUND_GREEN); break; + case Color::BrightWhite: DOCTEST_SET_ATTR(FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE); break; + case Color::None: + case Color::Bright: // invalid + default: DOCTEST_SET_ATTR(ch.origFgAttrs); + } + // clang-format on +#endif // DOCTEST_CONFIG_COLORS_WINDOWS + } + DOCTEST_CLANG_SUPPRESS_WARNING_POP + + std::vector& getExceptionTranslators() { + static std::vector data; + return data; + } + + String translateActiveException() { +#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS + String res; + auto& translators = getExceptionTranslators(); + for(auto& curr : translators) + if(curr->translate(res)) + return res; + // clang-format off + DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wcatch-value") + try { + throw; + } catch(std::exception& ex) { + return ex.what(); + } catch(std::string& msg) { + return msg.c_str(); + } catch(const char* msg) { + return msg; + } catch(...) { + return "unknown exception"; + } + DOCTEST_GCC_SUPPRESS_WARNING_POP +// clang-format on +#else // DOCTEST_CONFIG_NO_EXCEPTIONS + return ""; +#endif // DOCTEST_CONFIG_NO_EXCEPTIONS + } +} // namespace + +namespace detail { + // used by the macros for registering tests + int regTest(const TestCase& tc) { + getRegisteredTests().insert(tc); + return 0; + } + + // sets the current test suite + int setTestSuite(const TestSuite& ts) { + doctest_detail_test_suite_ns::getCurrentTestSuite() = ts; + return 0; + } + +#ifdef DOCTEST_IS_DEBUGGER_ACTIVE + bool isDebuggerActive() { return DOCTEST_IS_DEBUGGER_ACTIVE(); } +#else // DOCTEST_IS_DEBUGGER_ACTIVE +#ifdef DOCTEST_PLATFORM_LINUX + class ErrnoGuard { + public: + ErrnoGuard() : m_oldErrno(errno) {} + ~ErrnoGuard() { errno = m_oldErrno; } + private: + int m_oldErrno; + }; + // See the comments in Catch2 for the reasoning behind this implementation: + // https://github.com/catchorg/Catch2/blob/v2.13.1/include/internal/catch_debugger.cpp#L79-L102 + bool isDebuggerActive() { + ErrnoGuard guard; + std::ifstream in("/proc/self/status"); + for(std::string line; std::getline(in, line);) { + static const int PREFIX_LEN = 11; + if(line.compare(0, PREFIX_LEN, "TracerPid:\t") == 0) { + return line.length() > PREFIX_LEN && line[PREFIX_LEN] != '0'; + } + } + return false; + } +#elif defined(DOCTEST_PLATFORM_MAC) + // The following function is taken directly from the following technical note: + // https://developer.apple.com/library/archive/qa/qa1361/_index.html + // Returns true if the current process is being debugged (either + // running under the debugger or has a debugger attached post facto). + bool isDebuggerActive() { + int mib[4]; + kinfo_proc info; + size_t size; + // Initialize the flags so that, if sysctl fails for some bizarre + // reason, we get a predictable result. + info.kp_proc.p_flag = 0; + // Initialize mib, which tells sysctl the info we want, in this case + // we're looking for information about a specific process ID. + mib[0] = CTL_KERN; + mib[1] = KERN_PROC; + mib[2] = KERN_PROC_PID; + mib[3] = getpid(); + // Call sysctl. + size = sizeof(info); + if(sysctl(mib, DOCTEST_COUNTOF(mib), &info, &size, 0, 0) != 0) { + std::cerr << "\nCall to sysctl failed - unable to determine if debugger is active **\n"; + return false; + } + // We're being debugged if the P_TRACED flag is set. + return ((info.kp_proc.p_flag & P_TRACED) != 0); + } +#elif DOCTEST_MSVC || defined(__MINGW32__) || defined(__MINGW64__) + bool isDebuggerActive() { return ::IsDebuggerPresent() != 0; } +#else + bool isDebuggerActive() { return false; } +#endif // Platform +#endif // DOCTEST_IS_DEBUGGER_ACTIVE + + void registerExceptionTranslatorImpl(const IExceptionTranslator* et) { + if(std::find(getExceptionTranslators().begin(), getExceptionTranslators().end(), et) == + getExceptionTranslators().end()) + getExceptionTranslators().push_back(et); + } + + DOCTEST_THREAD_LOCAL std::vector g_infoContexts; // for logging with INFO() + + ContextScopeBase::ContextScopeBase() { + g_infoContexts.push_back(this); + } + + ContextScopeBase::ContextScopeBase(ContextScopeBase&& other) noexcept { + if (other.need_to_destroy) { + other.destroy(); + } + other.need_to_destroy = false; + g_infoContexts.push_back(this); + } + + DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4996) // std::uncaught_exception is deprecated in C++17 + DOCTEST_GCC_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations") + DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wdeprecated-declarations") + + // destroy cannot be inlined into the destructor because that would mean calling stringify after + // ContextScope has been destroyed (base class destructors run after derived class destructors). + // Instead, ContextScope calls this method directly from its destructor. + void ContextScopeBase::destroy() { +#if defined(__cpp_lib_uncaught_exceptions) && __cpp_lib_uncaught_exceptions >= 201411L && (!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) + if(std::uncaught_exceptions() > 0) { +#else + if(std::uncaught_exception()) { +#endif + std::ostringstream s; + this->stringify(&s); + g_cs->stringifiedContexts.push_back(s.str().c_str()); + } + g_infoContexts.pop_back(); + } + + DOCTEST_CLANG_SUPPRESS_WARNING_POP + DOCTEST_GCC_SUPPRESS_WARNING_POP + DOCTEST_MSVC_SUPPRESS_WARNING_POP +} // namespace detail +namespace { + using namespace detail; + +#if !defined(DOCTEST_CONFIG_POSIX_SIGNALS) && !defined(DOCTEST_CONFIG_WINDOWS_SEH) + struct FatalConditionHandler + { + static void reset() {} + static void allocateAltStackMem() {} + static void freeAltStackMem() {} + }; +#else // DOCTEST_CONFIG_POSIX_SIGNALS || DOCTEST_CONFIG_WINDOWS_SEH + + void reportFatal(const std::string&); + +#ifdef DOCTEST_PLATFORM_WINDOWS + + struct SignalDefs + { + DWORD id; + const char* name; + }; + // There is no 1-1 mapping between signals and windows exceptions. + // Windows can easily distinguish between SO and SigSegV, + // but SigInt, SigTerm, etc are handled differently. + SignalDefs signalDefs[] = { + {static_cast(EXCEPTION_ILLEGAL_INSTRUCTION), + "SIGILL - Illegal instruction signal"}, + {static_cast(EXCEPTION_STACK_OVERFLOW), "SIGSEGV - Stack overflow"}, + {static_cast(EXCEPTION_ACCESS_VIOLATION), + "SIGSEGV - Segmentation violation signal"}, + {static_cast(EXCEPTION_INT_DIVIDE_BY_ZERO), "Divide by zero error"}, + }; + + struct FatalConditionHandler + { + static LONG CALLBACK handleException(PEXCEPTION_POINTERS ExceptionInfo) { + // Multiple threads may enter this filter/handler at once. We want the error message to be printed on the + // console just once no matter how many threads have crashed. + DOCTEST_DECLARE_STATIC_MUTEX(mutex) + static bool execute = true; + { + DOCTEST_LOCK_MUTEX(mutex) + if(execute) { + bool reported = false; + for(size_t i = 0; i < DOCTEST_COUNTOF(signalDefs); ++i) { + if(ExceptionInfo->ExceptionRecord->ExceptionCode == signalDefs[i].id) { + reportFatal(signalDefs[i].name); + reported = true; + break; + } + } + if(reported == false) + reportFatal("Unhandled SEH exception caught"); + if(isDebuggerActive() && !g_cs->no_breaks) + DOCTEST_BREAK_INTO_DEBUGGER(); + } + execute = false; + } + std::exit(EXIT_FAILURE); + } + + static void allocateAltStackMem() {} + static void freeAltStackMem() {} + + FatalConditionHandler() { + isSet = true; + // 32k seems enough for doctest to handle stack overflow, + // but the value was found experimentally, so there is no strong guarantee + guaranteeSize = 32 * 1024; + // Register an unhandled exception filter + previousTop = SetUnhandledExceptionFilter(handleException); + // Pass in guarantee size to be filled + SetThreadStackGuarantee(&guaranteeSize); + + // On Windows uncaught exceptions from another thread, exceptions from + // destructors, or calls to std::terminate are not a SEH exception + + // The terminal handler gets called when: + // - std::terminate is called FROM THE TEST RUNNER THREAD + // - an exception is thrown from a destructor FROM THE TEST RUNNER THREAD + original_terminate_handler = std::get_terminate(); + std::set_terminate([]() DOCTEST_NOEXCEPT { + reportFatal("Terminate handler called"); + if(isDebuggerActive() && !g_cs->no_breaks) + DOCTEST_BREAK_INTO_DEBUGGER(); + std::exit(EXIT_FAILURE); // explicitly exit - otherwise the SIGABRT handler may be called as well + }); + + // SIGABRT is raised when: + // - std::terminate is called FROM A DIFFERENT THREAD + // - an exception is thrown from a destructor FROM A DIFFERENT THREAD + // - an uncaught exception is thrown FROM A DIFFERENT THREAD + prev_sigabrt_handler = std::signal(SIGABRT, [](int signal) DOCTEST_NOEXCEPT { + if(signal == SIGABRT) { + reportFatal("SIGABRT - Abort (abnormal termination) signal"); + if(isDebuggerActive() && !g_cs->no_breaks) + DOCTEST_BREAK_INTO_DEBUGGER(); + std::exit(EXIT_FAILURE); + } + }); + + // The following settings are taken from google test, and more + // specifically from UnitTest::Run() inside of gtest.cc + + // the user does not want to see pop-up dialogs about crashes + prev_error_mode_1 = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOALIGNMENTFAULTEXCEPT | + SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX); + // This forces the abort message to go to stderr in all circumstances. + prev_error_mode_2 = _set_error_mode(_OUT_TO_STDERR); + // In the debug version, Visual Studio pops up a separate dialog + // offering a choice to debug the aborted program - we want to disable that. + prev_abort_behavior = _set_abort_behavior(0x0, _WRITE_ABORT_MSG | _CALL_REPORTFAULT); + // In debug mode, the Windows CRT can crash with an assertion over invalid + // input (e.g. passing an invalid file descriptor). The default handling + // for these assertions is to pop up a dialog and wait for user input. + // Instead ask the CRT to dump such assertions to stderr non-interactively. + prev_report_mode = _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG); + prev_report_file = _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR); + } + + static void reset() { + if(isSet) { + // Unregister handler and restore the old guarantee + SetUnhandledExceptionFilter(previousTop); + SetThreadStackGuarantee(&guaranteeSize); + std::set_terminate(original_terminate_handler); + std::signal(SIGABRT, prev_sigabrt_handler); + SetErrorMode(prev_error_mode_1); + _set_error_mode(prev_error_mode_2); + _set_abort_behavior(prev_abort_behavior, _WRITE_ABORT_MSG | _CALL_REPORTFAULT); + static_cast(_CrtSetReportMode(_CRT_ASSERT, prev_report_mode)); + static_cast(_CrtSetReportFile(_CRT_ASSERT, prev_report_file)); + isSet = false; + } + } + + ~FatalConditionHandler() { reset(); } + + private: + static UINT prev_error_mode_1; + static int prev_error_mode_2; + static unsigned int prev_abort_behavior; + static int prev_report_mode; + static _HFILE prev_report_file; + static void (DOCTEST_CDECL *prev_sigabrt_handler)(int); + static std::terminate_handler original_terminate_handler; + static bool isSet; + static ULONG guaranteeSize; + static LPTOP_LEVEL_EXCEPTION_FILTER previousTop; + }; + + UINT FatalConditionHandler::prev_error_mode_1; + int FatalConditionHandler::prev_error_mode_2; + unsigned int FatalConditionHandler::prev_abort_behavior; + int FatalConditionHandler::prev_report_mode; + _HFILE FatalConditionHandler::prev_report_file; + void (DOCTEST_CDECL *FatalConditionHandler::prev_sigabrt_handler)(int); + std::terminate_handler FatalConditionHandler::original_terminate_handler; + bool FatalConditionHandler::isSet = false; + ULONG FatalConditionHandler::guaranteeSize = 0; + LPTOP_LEVEL_EXCEPTION_FILTER FatalConditionHandler::previousTop = nullptr; + +#else // DOCTEST_PLATFORM_WINDOWS + + struct SignalDefs + { + int id; + const char* name; + }; + SignalDefs signalDefs[] = {{SIGINT, "SIGINT - Terminal interrupt signal"}, + {SIGILL, "SIGILL - Illegal instruction signal"}, + {SIGFPE, "SIGFPE - Floating point error signal"}, + {SIGSEGV, "SIGSEGV - Segmentation violation signal"}, + {SIGTERM, "SIGTERM - Termination request signal"}, + {SIGABRT, "SIGABRT - Abort (abnormal termination) signal"}}; + + struct FatalConditionHandler + { + static bool isSet; + static struct sigaction oldSigActions[DOCTEST_COUNTOF(signalDefs)]; + static stack_t oldSigStack; + static size_t altStackSize; + static char* altStackMem; + + static void handleSignal(int sig) { + const char* name = ""; + for(std::size_t i = 0; i < DOCTEST_COUNTOF(signalDefs); ++i) { + SignalDefs& def = signalDefs[i]; + if(sig == def.id) { + name = def.name; + break; + } + } + reset(); + reportFatal(name); + raise(sig); + } + + static void allocateAltStackMem() { + altStackMem = new char[altStackSize]; + } + + static void freeAltStackMem() { + delete[] altStackMem; + } + + FatalConditionHandler() { + isSet = true; + stack_t sigStack; + sigStack.ss_sp = altStackMem; + sigStack.ss_size = altStackSize; + sigStack.ss_flags = 0; + sigaltstack(&sigStack, &oldSigStack); + struct sigaction sa = {}; + sa.sa_handler = handleSignal; + sa.sa_flags = SA_ONSTACK; + for(std::size_t i = 0; i < DOCTEST_COUNTOF(signalDefs); ++i) { + sigaction(signalDefs[i].id, &sa, &oldSigActions[i]); + } + } + + ~FatalConditionHandler() { reset(); } + static void reset() { + if(isSet) { + // Set signals back to previous values -- hopefully nobody overwrote them in the meantime + for(std::size_t i = 0; i < DOCTEST_COUNTOF(signalDefs); ++i) { + sigaction(signalDefs[i].id, &oldSigActions[i], nullptr); + } + // Return the old stack + sigaltstack(&oldSigStack, nullptr); + isSet = false; + } + } + }; + + bool FatalConditionHandler::isSet = false; + struct sigaction FatalConditionHandler::oldSigActions[DOCTEST_COUNTOF(signalDefs)] = {}; + stack_t FatalConditionHandler::oldSigStack = {}; + size_t FatalConditionHandler::altStackSize = 4 * SIGSTKSZ; + char* FatalConditionHandler::altStackMem = nullptr; + +#endif // DOCTEST_PLATFORM_WINDOWS +#endif // DOCTEST_CONFIG_POSIX_SIGNALS || DOCTEST_CONFIG_WINDOWS_SEH + +} // namespace + +namespace { + using namespace detail; + +#ifdef DOCTEST_PLATFORM_WINDOWS +#define DOCTEST_OUTPUT_DEBUG_STRING(text) ::OutputDebugStringA(text) +#else + // TODO: integration with XCode and other IDEs +#define DOCTEST_OUTPUT_DEBUG_STRING(text) +#endif // Platform + + void addAssert(assertType::Enum at) { + if((at & assertType::is_warn) == 0) //!OCLINT bitwise operator in conditional + g_cs->numAssertsCurrentTest_atomic++; + } + + void addFailedAssert(assertType::Enum at) { + if((at & assertType::is_warn) == 0) //!OCLINT bitwise operator in conditional + g_cs->numAssertsFailedCurrentTest_atomic++; + } + +#if defined(DOCTEST_CONFIG_POSIX_SIGNALS) || defined(DOCTEST_CONFIG_WINDOWS_SEH) + void reportFatal(const std::string& message) { + g_cs->failure_flags |= TestCaseFailureReason::Crash; + + DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_exception, {message.c_str(), true}); + + while (g_cs->subcaseStack.size()) { + g_cs->subcaseStack.pop_back(); + DOCTEST_ITERATE_THROUGH_REPORTERS(subcase_end, DOCTEST_EMPTY); + } + + g_cs->finalizeTestCaseData(); + + DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_end, *g_cs); + + DOCTEST_ITERATE_THROUGH_REPORTERS(test_run_end, *g_cs); + } +#endif // DOCTEST_CONFIG_POSIX_SIGNALS || DOCTEST_CONFIG_WINDOWS_SEH +} // namespace + +AssertData::AssertData(assertType::Enum at, const char* file, int line, const char* expr, + const char* exception_type, const StringContains& exception_string) + : m_test_case(g_cs->currentTest), m_at(at), m_file(file), m_line(line), m_expr(expr), + m_failed(true), m_threw(false), m_threw_as(false), m_exception_type(exception_type), + m_exception_string(exception_string) { +#if DOCTEST_MSVC + if (m_expr[0] == ' ') // this happens when variadic macros are disabled under MSVC + ++m_expr; +#endif // MSVC +} + +namespace detail { + ResultBuilder::ResultBuilder(assertType::Enum at, const char* file, int line, const char* expr, + const char* exception_type, const String& exception_string) + : AssertData(at, file, line, expr, exception_type, exception_string) { } + + ResultBuilder::ResultBuilder(assertType::Enum at, const char* file, int line, const char* expr, + const char* exception_type, const Contains& exception_string) + : AssertData(at, file, line, expr, exception_type, exception_string) { } + + void ResultBuilder::setResult(const Result& res) { + m_decomp = res.m_decomp; + m_failed = !res.m_passed; + } + + void ResultBuilder::translateException() { + m_threw = true; + m_exception = translateActiveException(); + } + + bool ResultBuilder::log() { + if(m_at & assertType::is_throws) { //!OCLINT bitwise operator in conditional + m_failed = !m_threw; + } else if((m_at & assertType::is_throws_as) && (m_at & assertType::is_throws_with)) { //!OCLINT + m_failed = !m_threw_as || !m_exception_string.check(m_exception); + } else if(m_at & assertType::is_throws_as) { //!OCLINT bitwise operator in conditional + m_failed = !m_threw_as; + } else if(m_at & assertType::is_throws_with) { //!OCLINT bitwise operator in conditional + m_failed = !m_exception_string.check(m_exception); + } else if(m_at & assertType::is_nothrow) { //!OCLINT bitwise operator in conditional + m_failed = m_threw; + } + + if(m_exception.size()) + m_exception = "\"" + m_exception + "\""; + + if(is_running_in_test) { + addAssert(m_at); + DOCTEST_ITERATE_THROUGH_REPORTERS(log_assert, *this); + + if(m_failed) + addFailedAssert(m_at); + } else if(m_failed) { + failed_out_of_a_testing_context(*this); + } + + return m_failed && isDebuggerActive() && !getContextOptions()->no_breaks && + (g_cs->currentTest == nullptr || !g_cs->currentTest->m_no_breaks); // break into debugger + } + + void ResultBuilder::react() const { + if(m_failed && checkIfShouldThrow(m_at)) + throwException(); + } + + void failed_out_of_a_testing_context(const AssertData& ad) { + if(g_cs->ah) + g_cs->ah(ad); + else + std::abort(); + } + + bool decomp_assert(assertType::Enum at, const char* file, int line, const char* expr, + const Result& result) { + bool failed = !result.m_passed; + + // ################################################################################### + // IF THE DEBUGGER BREAKS HERE - GO 1 LEVEL UP IN THE CALLSTACK FOR THE FAILING ASSERT + // THIS IS THE EFFECT OF HAVING 'DOCTEST_CONFIG_SUPER_FAST_ASSERTS' DEFINED + // ################################################################################### + DOCTEST_ASSERT_OUT_OF_TESTS(result.m_decomp); + DOCTEST_ASSERT_IN_TESTS(result.m_decomp); + return !failed; + } + + MessageBuilder::MessageBuilder(const char* file, int line, assertType::Enum severity) { + m_stream = tlssPush(); + m_file = file; + m_line = line; + m_severity = severity; + } + + MessageBuilder::~MessageBuilder() { + if (!logged) + tlssPop(); + } + + DOCTEST_DEFINE_INTERFACE(IExceptionTranslator) + + bool MessageBuilder::log() { + if (!logged) { + m_string = tlssPop(); + logged = true; + } + + DOCTEST_ITERATE_THROUGH_REPORTERS(log_message, *this); + + const bool isWarn = m_severity & assertType::is_warn; + + // warn is just a message in this context so we don't treat it as an assert + if(!isWarn) { + addAssert(m_severity); + addFailedAssert(m_severity); + } + + return isDebuggerActive() && !getContextOptions()->no_breaks && !isWarn && + (g_cs->currentTest == nullptr || !g_cs->currentTest->m_no_breaks); // break into debugger + } + + void MessageBuilder::react() { + if(m_severity & assertType::is_require) //!OCLINT bitwise operator in conditional + throwException(); + } +} // namespace detail +namespace { + using namespace detail; + + // clang-format off + +// ================================================================================================= +// The following code has been taken verbatim from Catch2/include/internal/catch_xmlwriter.h/cpp +// This is done so cherry-picking bug fixes is trivial - even the style/formatting is untouched. +// ================================================================================================= + + class XmlEncode { + public: + enum ForWhat { ForTextNodes, ForAttributes }; + + XmlEncode( std::string const& str, ForWhat forWhat = ForTextNodes ); + + void encodeTo( std::ostream& os ) const; + + friend std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode ); + + private: + std::string m_str; + ForWhat m_forWhat; + }; + + class XmlWriter { + public: + + class ScopedElement { + public: + ScopedElement( XmlWriter* writer ); + + ScopedElement( ScopedElement&& other ) DOCTEST_NOEXCEPT; + ScopedElement& operator=( ScopedElement&& other ) DOCTEST_NOEXCEPT; + + ~ScopedElement(); + + ScopedElement& writeText( std::string const& text, bool indent = true ); + + template + ScopedElement& writeAttribute( std::string const& name, T const& attribute ) { + m_writer->writeAttribute( name, attribute ); + return *this; + } + + private: + mutable XmlWriter* m_writer = nullptr; + }; + +#ifndef DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM + XmlWriter( std::ostream& os = std::cout ); +#else // DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM + XmlWriter( std::ostream& os ); +#endif // DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM + ~XmlWriter(); + + XmlWriter( XmlWriter const& ) = delete; + XmlWriter& operator=( XmlWriter const& ) = delete; + + XmlWriter& startElement( std::string const& name ); + + ScopedElement scopedElement( std::string const& name ); + + XmlWriter& endElement(); + + XmlWriter& writeAttribute( std::string const& name, std::string const& attribute ); + + XmlWriter& writeAttribute( std::string const& name, const char* attribute ); + + XmlWriter& writeAttribute( std::string const& name, bool attribute ); + + template + XmlWriter& writeAttribute( std::string const& name, T const& attribute ) { + std::stringstream rss; + rss << attribute; + return writeAttribute( name, rss.str() ); + } + + XmlWriter& writeText( std::string const& text, bool indent = true ); + + //XmlWriter& writeComment( std::string const& text ); + + //void writeStylesheetRef( std::string const& url ); + + //XmlWriter& writeBlankLine(); + + void ensureTagClosed(); + + void writeDeclaration(); + + private: + + void newlineIfNecessary(); + + bool m_tagIsOpen = false; + bool m_needsNewline = false; + std::vector m_tags; + std::string m_indent; + std::ostream& m_os; + }; + +// ================================================================================================= +// The following code has been taken verbatim from Catch2/include/internal/catch_xmlwriter.h/cpp +// This is done so cherry-picking bug fixes is trivial - even the style/formatting is untouched. +// ================================================================================================= + +using uchar = unsigned char; + +namespace { + + size_t trailingBytes(unsigned char c) { + if ((c & 0xE0) == 0xC0) { + return 2; + } + if ((c & 0xF0) == 0xE0) { + return 3; + } + if ((c & 0xF8) == 0xF0) { + return 4; + } + DOCTEST_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered"); + } + + uint32_t headerValue(unsigned char c) { + if ((c & 0xE0) == 0xC0) { + return c & 0x1F; + } + if ((c & 0xF0) == 0xE0) { + return c & 0x0F; + } + if ((c & 0xF8) == 0xF0) { + return c & 0x07; + } + DOCTEST_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered"); + } + + void hexEscapeChar(std::ostream& os, unsigned char c) { + std::ios_base::fmtflags f(os.flags()); + os << "\\x" + << std::uppercase << std::hex << std::setfill('0') << std::setw(2) + << static_cast(c); + os.flags(f); + } + +} // anonymous namespace + + XmlEncode::XmlEncode( std::string const& str, ForWhat forWhat ) + : m_str( str ), + m_forWhat( forWhat ) + {} + + void XmlEncode::encodeTo( std::ostream& os ) const { + // Apostrophe escaping not necessary if we always use " to write attributes + // (see: https://www.w3.org/TR/xml/#syntax) + + for( std::size_t idx = 0; idx < m_str.size(); ++ idx ) { + uchar c = m_str[idx]; + switch (c) { + case '<': os << "<"; break; + case '&': os << "&"; break; + + case '>': + // See: https://www.w3.org/TR/xml/#syntax + if (idx > 2 && m_str[idx - 1] == ']' && m_str[idx - 2] == ']') + os << ">"; + else + os << c; + break; + + case '\"': + if (m_forWhat == ForAttributes) + os << """; + else + os << c; + break; + + default: + // Check for control characters and invalid utf-8 + + // Escape control characters in standard ascii + // see https://stackoverflow.com/questions/404107/why-are-control-characters-illegal-in-xml-1-0 + if (c < 0x09 || (c > 0x0D && c < 0x20) || c == 0x7F) { + hexEscapeChar(os, c); + break; + } + + // Plain ASCII: Write it to stream + if (c < 0x7F) { + os << c; + break; + } + + // UTF-8 territory + // Check if the encoding is valid and if it is not, hex escape bytes. + // Important: We do not check the exact decoded values for validity, only the encoding format + // First check that this bytes is a valid lead byte: + // This means that it is not encoded as 1111 1XXX + // Or as 10XX XXXX + if (c < 0xC0 || + c >= 0xF8) { + hexEscapeChar(os, c); + break; + } + + auto encBytes = trailingBytes(c); + // Are there enough bytes left to avoid accessing out-of-bounds memory? + if (idx + encBytes - 1 >= m_str.size()) { + hexEscapeChar(os, c); + break; + } + // The header is valid, check data + // The next encBytes bytes must together be a valid utf-8 + // This means: bitpattern 10XX XXXX and the extracted value is sane (ish) + bool valid = true; + uint32_t value = headerValue(c); + for (std::size_t n = 1; n < encBytes; ++n) { + uchar nc = m_str[idx + n]; + valid &= ((nc & 0xC0) == 0x80); + value = (value << 6) | (nc & 0x3F); + } + + if ( + // Wrong bit pattern of following bytes + (!valid) || + // Overlong encodings + (value < 0x80) || + ( value < 0x800 && encBytes > 2) || // removed "0x80 <= value &&" because redundant + (0x800 < value && value < 0x10000 && encBytes > 3) || + // Encoded value out of range + (value >= 0x110000) + ) { + hexEscapeChar(os, c); + break; + } + + // If we got here, this is in fact a valid(ish) utf-8 sequence + for (std::size_t n = 0; n < encBytes; ++n) { + os << m_str[idx + n]; + } + idx += encBytes - 1; + break; + } + } + } + + std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode ) { + xmlEncode.encodeTo( os ); + return os; + } + + XmlWriter::ScopedElement::ScopedElement( XmlWriter* writer ) + : m_writer( writer ) + {} + + XmlWriter::ScopedElement::ScopedElement( ScopedElement&& other ) DOCTEST_NOEXCEPT + : m_writer( other.m_writer ){ + other.m_writer = nullptr; + } + XmlWriter::ScopedElement& XmlWriter::ScopedElement::operator=( ScopedElement&& other ) DOCTEST_NOEXCEPT { + if ( m_writer ) { + m_writer->endElement(); + } + m_writer = other.m_writer; + other.m_writer = nullptr; + return *this; + } + + + XmlWriter::ScopedElement::~ScopedElement() { + if( m_writer ) + m_writer->endElement(); + } + + XmlWriter::ScopedElement& XmlWriter::ScopedElement::writeText( std::string const& text, bool indent ) { + m_writer->writeText( text, indent ); + return *this; + } + + XmlWriter::XmlWriter( std::ostream& os ) : m_os( os ) + { + // writeDeclaration(); // called explicitly by the reporters that use the writer class - see issue #627 + } + + XmlWriter::~XmlWriter() { + while( !m_tags.empty() ) + endElement(); + } + + XmlWriter& XmlWriter::startElement( std::string const& name ) { + ensureTagClosed(); + newlineIfNecessary(); + m_os << m_indent << '<' << name; + m_tags.push_back( name ); + m_indent += " "; + m_tagIsOpen = true; + return *this; + } + + XmlWriter::ScopedElement XmlWriter::scopedElement( std::string const& name ) { + ScopedElement scoped( this ); + startElement( name ); + return scoped; + } + + XmlWriter& XmlWriter::endElement() { + newlineIfNecessary(); + m_indent = m_indent.substr( 0, m_indent.size()-2 ); + if( m_tagIsOpen ) { + m_os << "/>"; + m_tagIsOpen = false; + } + else { + m_os << m_indent << ""; + } + m_os << std::endl; + m_tags.pop_back(); + return *this; + } + + XmlWriter& XmlWriter::writeAttribute( std::string const& name, std::string const& attribute ) { + if( !name.empty() && !attribute.empty() ) + m_os << ' ' << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << '"'; + return *this; + } + + XmlWriter& XmlWriter::writeAttribute( std::string const& name, const char* attribute ) { + if( !name.empty() && attribute && attribute[0] != '\0' ) + m_os << ' ' << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << '"'; + return *this; + } + + XmlWriter& XmlWriter::writeAttribute( std::string const& name, bool attribute ) { + m_os << ' ' << name << "=\"" << ( attribute ? "true" : "false" ) << '"'; + return *this; + } + + XmlWriter& XmlWriter::writeText( std::string const& text, bool indent ) { + if( !text.empty() ){ + bool tagWasOpen = m_tagIsOpen; + ensureTagClosed(); + if( tagWasOpen && indent ) + m_os << m_indent; + m_os << XmlEncode( text ); + m_needsNewline = true; + } + return *this; + } + + //XmlWriter& XmlWriter::writeComment( std::string const& text ) { + // ensureTagClosed(); + // m_os << m_indent << ""; + // m_needsNewline = true; + // return *this; + //} + + //void XmlWriter::writeStylesheetRef( std::string const& url ) { + // m_os << "\n"; + //} + + //XmlWriter& XmlWriter::writeBlankLine() { + // ensureTagClosed(); + // m_os << '\n'; + // return *this; + //} + + void XmlWriter::ensureTagClosed() { + if( m_tagIsOpen ) { + m_os << ">" << std::endl; + m_tagIsOpen = false; + } + } + + void XmlWriter::writeDeclaration() { + m_os << "\n"; + } + + void XmlWriter::newlineIfNecessary() { + if( m_needsNewline ) { + m_os << std::endl; + m_needsNewline = false; + } + } + +// ================================================================================================= +// End of copy-pasted code from Catch +// ================================================================================================= + + // clang-format on + + struct XmlReporter : public IReporter + { + XmlWriter xml; + DOCTEST_DECLARE_MUTEX(mutex) + + // caching pointers/references to objects of these types - safe to do + const ContextOptions& opt; + const TestCaseData* tc = nullptr; + + XmlReporter(const ContextOptions& co) + : xml(*co.cout) + , opt(co) {} + + void log_contexts() { + int num_contexts = get_num_active_contexts(); + if(num_contexts) { + auto contexts = get_active_contexts(); + std::stringstream ss; + for(int i = 0; i < num_contexts; ++i) { + contexts[i]->stringify(&ss); + xml.scopedElement("Info").writeText(ss.str()); + ss.str(""); + } + } + } + + unsigned line(unsigned l) const { return opt.no_line_numbers ? 0 : l; } + + void test_case_start_impl(const TestCaseData& in) { + bool open_ts_tag = false; + if(tc != nullptr) { // we have already opened a test suite + if(std::strcmp(tc->m_test_suite, in.m_test_suite) != 0) { + xml.endElement(); + open_ts_tag = true; + } + } + else { + open_ts_tag = true; // first test case ==> first test suite + } + + if(open_ts_tag) { + xml.startElement("TestSuite"); + xml.writeAttribute("name", in.m_test_suite); + } + + tc = ∈ + xml.startElement("TestCase") + .writeAttribute("name", in.m_name) + .writeAttribute("filename", skipPathFromFilename(in.m_file.c_str())) + .writeAttribute("line", line(in.m_line)) + .writeAttribute("description", in.m_description); + + if(Approx(in.m_timeout) != 0) + xml.writeAttribute("timeout", in.m_timeout); + if(in.m_may_fail) + xml.writeAttribute("may_fail", true); + if(in.m_should_fail) + xml.writeAttribute("should_fail", true); + } + + // ========================================================================================= + // WHAT FOLLOWS ARE OVERRIDES OF THE VIRTUAL METHODS OF THE REPORTER INTERFACE + // ========================================================================================= + + void report_query(const QueryData& in) override { + test_run_start(); + if(opt.list_reporters) { + for(auto& curr : getListeners()) + xml.scopedElement("Listener") + .writeAttribute("priority", curr.first.first) + .writeAttribute("name", curr.first.second); + for(auto& curr : getReporters()) + xml.scopedElement("Reporter") + .writeAttribute("priority", curr.first.first) + .writeAttribute("name", curr.first.second); + } else if(opt.count || opt.list_test_cases) { + for(unsigned i = 0; i < in.num_data; ++i) { + xml.scopedElement("TestCase").writeAttribute("name", in.data[i]->m_name) + .writeAttribute("testsuite", in.data[i]->m_test_suite) + .writeAttribute("filename", skipPathFromFilename(in.data[i]->m_file.c_str())) + .writeAttribute("line", line(in.data[i]->m_line)) + .writeAttribute("skipped", in.data[i]->m_skip); + } + xml.scopedElement("OverallResultsTestCases") + .writeAttribute("unskipped", in.run_stats->numTestCasesPassingFilters); + } else if(opt.list_test_suites) { + for(unsigned i = 0; i < in.num_data; ++i) + xml.scopedElement("TestSuite").writeAttribute("name", in.data[i]->m_test_suite); + xml.scopedElement("OverallResultsTestCases") + .writeAttribute("unskipped", in.run_stats->numTestCasesPassingFilters); + xml.scopedElement("OverallResultsTestSuites") + .writeAttribute("unskipped", in.run_stats->numTestSuitesPassingFilters); + } + xml.endElement(); + } + + void test_run_start() override { + xml.writeDeclaration(); + + // remove .exe extension - mainly to have the same output on UNIX and Windows + std::string binary_name = skipPathFromFilename(opt.binary_name.c_str()); +#ifdef DOCTEST_PLATFORM_WINDOWS + if(binary_name.rfind(".exe") != std::string::npos) + binary_name = binary_name.substr(0, binary_name.length() - 4); +#endif // DOCTEST_PLATFORM_WINDOWS + + xml.startElement("doctest").writeAttribute("binary", binary_name); + if(opt.no_version == false) + xml.writeAttribute("version", DOCTEST_VERSION_STR); + + // only the consequential ones (TODO: filters) + xml.scopedElement("Options") + .writeAttribute("order_by", opt.order_by.c_str()) + .writeAttribute("rand_seed", opt.rand_seed) + .writeAttribute("first", opt.first) + .writeAttribute("last", opt.last) + .writeAttribute("abort_after", opt.abort_after) + .writeAttribute("subcase_filter_levels", opt.subcase_filter_levels) + .writeAttribute("case_sensitive", opt.case_sensitive) + .writeAttribute("no_throw", opt.no_throw) + .writeAttribute("no_skip", opt.no_skip); + } + + void test_run_end(const TestRunStats& p) override { + if(tc) // the TestSuite tag - only if there has been at least 1 test case + xml.endElement(); + + xml.scopedElement("OverallResultsAsserts") + .writeAttribute("successes", p.numAsserts - p.numAssertsFailed) + .writeAttribute("failures", p.numAssertsFailed); + + xml.startElement("OverallResultsTestCases") + .writeAttribute("successes", + p.numTestCasesPassingFilters - p.numTestCasesFailed) + .writeAttribute("failures", p.numTestCasesFailed); + if(opt.no_skipped_summary == false) + xml.writeAttribute("skipped", p.numTestCases - p.numTestCasesPassingFilters); + xml.endElement(); + + xml.endElement(); + } + + void test_case_start(const TestCaseData& in) override { + test_case_start_impl(in); + xml.ensureTagClosed(); + } + + void test_case_reenter(const TestCaseData&) override {} + + void test_case_end(const CurrentTestCaseStats& st) override { + xml.startElement("OverallResultsAsserts") + .writeAttribute("successes", + st.numAssertsCurrentTest - st.numAssertsFailedCurrentTest) + .writeAttribute("failures", st.numAssertsFailedCurrentTest) + .writeAttribute("test_case_success", st.testCaseSuccess); + if(opt.duration) + xml.writeAttribute("duration", st.seconds); + if(tc->m_expected_failures) + xml.writeAttribute("expected_failures", tc->m_expected_failures); + xml.endElement(); + + xml.endElement(); + } + + void test_case_exception(const TestCaseException& e) override { + DOCTEST_LOCK_MUTEX(mutex) + + xml.scopedElement("Exception") + .writeAttribute("crash", e.is_crash) + .writeText(e.error_string.c_str()); + } + + void subcase_start(const SubcaseSignature& in) override { + xml.startElement("SubCase") + .writeAttribute("name", in.m_name) + .writeAttribute("filename", skipPathFromFilename(in.m_file)) + .writeAttribute("line", line(in.m_line)); + xml.ensureTagClosed(); + } + + void subcase_end() override { xml.endElement(); } + + void log_assert(const AssertData& rb) override { + if(!rb.m_failed && !opt.success) + return; + + DOCTEST_LOCK_MUTEX(mutex) + + xml.startElement("Expression") + .writeAttribute("success", !rb.m_failed) + .writeAttribute("type", assertString(rb.m_at)) + .writeAttribute("filename", skipPathFromFilename(rb.m_file)) + .writeAttribute("line", line(rb.m_line)); + + xml.scopedElement("Original").writeText(rb.m_expr); + + if(rb.m_threw) + xml.scopedElement("Exception").writeText(rb.m_exception.c_str()); + + if(rb.m_at & assertType::is_throws_as) + xml.scopedElement("ExpectedException").writeText(rb.m_exception_type); + if(rb.m_at & assertType::is_throws_with) + xml.scopedElement("ExpectedExceptionString").writeText(rb.m_exception_string.c_str()); + if((rb.m_at & assertType::is_normal) && !rb.m_threw) + xml.scopedElement("Expanded").writeText(rb.m_decomp.c_str()); + + log_contexts(); + + xml.endElement(); + } + + void log_message(const MessageData& mb) override { + DOCTEST_LOCK_MUTEX(mutex) + + xml.startElement("Message") + .writeAttribute("type", failureString(mb.m_severity)) + .writeAttribute("filename", skipPathFromFilename(mb.m_file)) + .writeAttribute("line", line(mb.m_line)); + + xml.scopedElement("Text").writeText(mb.m_string.c_str()); + + log_contexts(); + + xml.endElement(); + } + + void test_case_skipped(const TestCaseData& in) override { + if(opt.no_skipped_summary == false) { + test_case_start_impl(in); + xml.writeAttribute("skipped", "true"); + xml.endElement(); + } + } + }; + + DOCTEST_REGISTER_REPORTER("xml", 0, XmlReporter); + + void fulltext_log_assert_to_stream(std::ostream& s, const AssertData& rb) { + if((rb.m_at & (assertType::is_throws_as | assertType::is_throws_with)) == + 0) //!OCLINT bitwise operator in conditional + s << Color::Cyan << assertString(rb.m_at) << "( " << rb.m_expr << " ) " + << Color::None; + + if(rb.m_at & assertType::is_throws) { //!OCLINT bitwise operator in conditional + s << (rb.m_threw ? "threw as expected!" : "did NOT throw at all!") << "\n"; + } else if((rb.m_at & assertType::is_throws_as) && + (rb.m_at & assertType::is_throws_with)) { //!OCLINT + s << Color::Cyan << assertString(rb.m_at) << "( " << rb.m_expr << ", \"" + << rb.m_exception_string.c_str() + << "\", " << rb.m_exception_type << " ) " << Color::None; + if(rb.m_threw) { + if(!rb.m_failed) { + s << "threw as expected!\n"; + } else { + s << "threw a DIFFERENT exception! (contents: " << rb.m_exception << ")\n"; + } + } else { + s << "did NOT throw at all!\n"; + } + } else if(rb.m_at & + assertType::is_throws_as) { //!OCLINT bitwise operator in conditional + s << Color::Cyan << assertString(rb.m_at) << "( " << rb.m_expr << ", " + << rb.m_exception_type << " ) " << Color::None + << (rb.m_threw ? (rb.m_threw_as ? "threw as expected!" : + "threw a DIFFERENT exception: ") : + "did NOT throw at all!") + << Color::Cyan << rb.m_exception << "\n"; + } else if(rb.m_at & + assertType::is_throws_with) { //!OCLINT bitwise operator in conditional + s << Color::Cyan << assertString(rb.m_at) << "( " << rb.m_expr << ", \"" + << rb.m_exception_string.c_str() + << "\" ) " << Color::None + << (rb.m_threw ? (!rb.m_failed ? "threw as expected!" : + "threw a DIFFERENT exception: ") : + "did NOT throw at all!") + << Color::Cyan << rb.m_exception << "\n"; + } else if(rb.m_at & assertType::is_nothrow) { //!OCLINT bitwise operator in conditional + s << (rb.m_threw ? "THREW exception: " : "didn't throw!") << Color::Cyan + << rb.m_exception << "\n"; + } else { + s << (rb.m_threw ? "THREW exception: " : + (!rb.m_failed ? "is correct!\n" : "is NOT correct!\n")); + if(rb.m_threw) + s << rb.m_exception << "\n"; + else + s << " values: " << assertString(rb.m_at) << "( " << rb.m_decomp << " )\n"; + } + } + + // TODO: + // - log_message() + // - respond to queries + // - honor remaining options + // - more attributes in tags + struct JUnitReporter : public IReporter + { + XmlWriter xml; + DOCTEST_DECLARE_MUTEX(mutex) + Timer timer; + std::vector deepestSubcaseStackNames; + + struct JUnitTestCaseData + { + static std::string getCurrentTimestamp() { + // Beware, this is not reentrant because of backward compatibility issues + // Also, UTC only, again because of backward compatibility (%z is C++11) + time_t rawtime; + std::time(&rawtime); + auto const timeStampSize = sizeof("2017-01-16T17:06:45Z"); + + std::tm timeInfo; +#ifdef DOCTEST_PLATFORM_WINDOWS + gmtime_s(&timeInfo, &rawtime); +#else // DOCTEST_PLATFORM_WINDOWS + gmtime_r(&rawtime, &timeInfo); +#endif // DOCTEST_PLATFORM_WINDOWS + + char timeStamp[timeStampSize]; + const char* const fmt = "%Y-%m-%dT%H:%M:%SZ"; + + std::strftime(timeStamp, timeStampSize, fmt, &timeInfo); + return std::string(timeStamp); + } + + struct JUnitTestMessage + { + JUnitTestMessage(const std::string& _message, const std::string& _type, const std::string& _details) + : message(_message), type(_type), details(_details) {} + + JUnitTestMessage(const std::string& _message, const std::string& _details) + : message(_message), type(), details(_details) {} + + std::string message, type, details; + }; + + struct JUnitTestCase + { + JUnitTestCase(const std::string& _classname, const std::string& _name) + : classname(_classname), name(_name), time(0), failures() {} + + std::string classname, name; + double time; + std::vector failures, errors; + }; + + void add(const std::string& classname, const std::string& name) { + testcases.emplace_back(classname, name); + } + + void appendSubcaseNamesToLastTestcase(std::vector nameStack) { + for(auto& curr: nameStack) + if(curr.size()) + testcases.back().name += std::string("/") + curr.c_str(); + } + + void addTime(double time) { + if(time < 1e-4) + time = 0; + testcases.back().time = time; + totalSeconds += time; + } + + void addFailure(const std::string& message, const std::string& type, const std::string& details) { + testcases.back().failures.emplace_back(message, type, details); + ++totalFailures; + } + + void addError(const std::string& message, const std::string& details) { + testcases.back().errors.emplace_back(message, details); + ++totalErrors; + } + + std::vector testcases; + double totalSeconds = 0; + int totalErrors = 0, totalFailures = 0; + }; + + JUnitTestCaseData testCaseData; + + // caching pointers/references to objects of these types - safe to do + const ContextOptions& opt; + const TestCaseData* tc = nullptr; + + JUnitReporter(const ContextOptions& co) + : xml(*co.cout) + , opt(co) {} + + unsigned line(unsigned l) const { return opt.no_line_numbers ? 0 : l; } + + // ========================================================================================= + // WHAT FOLLOWS ARE OVERRIDES OF THE VIRTUAL METHODS OF THE REPORTER INTERFACE + // ========================================================================================= + + void report_query(const QueryData&) override { + xml.writeDeclaration(); + } + + void test_run_start() override { + xml.writeDeclaration(); + } + + void test_run_end(const TestRunStats& p) override { + // remove .exe extension - mainly to have the same output on UNIX and Windows + std::string binary_name = skipPathFromFilename(opt.binary_name.c_str()); +#ifdef DOCTEST_PLATFORM_WINDOWS + if(binary_name.rfind(".exe") != std::string::npos) + binary_name = binary_name.substr(0, binary_name.length() - 4); +#endif // DOCTEST_PLATFORM_WINDOWS + xml.startElement("testsuites"); + xml.startElement("testsuite").writeAttribute("name", binary_name) + .writeAttribute("errors", testCaseData.totalErrors) + .writeAttribute("failures", testCaseData.totalFailures) + .writeAttribute("tests", p.numAsserts); + if(opt.no_time_in_output == false) { + xml.writeAttribute("time", testCaseData.totalSeconds); + xml.writeAttribute("timestamp", JUnitTestCaseData::getCurrentTimestamp()); + } + if(opt.no_version == false) + xml.writeAttribute("doctest_version", DOCTEST_VERSION_STR); + + for(const auto& testCase : testCaseData.testcases) { + xml.startElement("testcase") + .writeAttribute("classname", testCase.classname) + .writeAttribute("name", testCase.name); + if(opt.no_time_in_output == false) + xml.writeAttribute("time", testCase.time); + // This is not ideal, but it should be enough to mimic gtest's junit output. + xml.writeAttribute("status", "run"); + + for(const auto& failure : testCase.failures) { + xml.scopedElement("failure") + .writeAttribute("message", failure.message) + .writeAttribute("type", failure.type) + .writeText(failure.details, false); + } + + for(const auto& error : testCase.errors) { + xml.scopedElement("error") + .writeAttribute("message", error.message) + .writeText(error.details); + } + + xml.endElement(); + } + xml.endElement(); + xml.endElement(); + } + + void test_case_start(const TestCaseData& in) override { + testCaseData.add(skipPathFromFilename(in.m_file.c_str()), in.m_name); + timer.start(); + } + + void test_case_reenter(const TestCaseData& in) override { + testCaseData.addTime(timer.getElapsedSeconds()); + testCaseData.appendSubcaseNamesToLastTestcase(deepestSubcaseStackNames); + deepestSubcaseStackNames.clear(); + + timer.start(); + testCaseData.add(skipPathFromFilename(in.m_file.c_str()), in.m_name); + } + + void test_case_end(const CurrentTestCaseStats&) override { + testCaseData.addTime(timer.getElapsedSeconds()); + testCaseData.appendSubcaseNamesToLastTestcase(deepestSubcaseStackNames); + deepestSubcaseStackNames.clear(); + } + + void test_case_exception(const TestCaseException& e) override { + DOCTEST_LOCK_MUTEX(mutex) + testCaseData.addError("exception", e.error_string.c_str()); + } + + void subcase_start(const SubcaseSignature& in) override { + deepestSubcaseStackNames.push_back(in.m_name); + } + + void subcase_end() override {} + + void log_assert(const AssertData& rb) override { + if(!rb.m_failed) // report only failures & ignore the `success` option + return; + + DOCTEST_LOCK_MUTEX(mutex) + + std::ostringstream os; + os << skipPathFromFilename(rb.m_file) << (opt.gnu_file_line ? ":" : "(") + << line(rb.m_line) << (opt.gnu_file_line ? ":" : "):") << std::endl; + + fulltext_log_assert_to_stream(os, rb); + log_contexts(os); + testCaseData.addFailure(rb.m_decomp.c_str(), assertString(rb.m_at), os.str()); + } + + void log_message(const MessageData& mb) override { + if(mb.m_severity & assertType::is_warn) // report only failures + return; + + DOCTEST_LOCK_MUTEX(mutex) + + std::ostringstream os; + os << skipPathFromFilename(mb.m_file) << (opt.gnu_file_line ? ":" : "(") + << line(mb.m_line) << (opt.gnu_file_line ? ":" : "):") << std::endl; + + os << mb.m_string.c_str() << "\n"; + log_contexts(os); + + testCaseData.addFailure(mb.m_string.c_str(), + mb.m_severity & assertType::is_check ? "FAIL_CHECK" : "FAIL", os.str()); + } + + void test_case_skipped(const TestCaseData&) override {} + + void log_contexts(std::ostringstream& s) { + int num_contexts = get_num_active_contexts(); + if(num_contexts) { + auto contexts = get_active_contexts(); + + s << " logged: "; + for(int i = 0; i < num_contexts; ++i) { + s << (i == 0 ? "" : " "); + contexts[i]->stringify(&s); + s << std::endl; + } + } + } + }; + + DOCTEST_REGISTER_REPORTER("junit", 0, JUnitReporter); + + struct Whitespace + { + int nrSpaces; + explicit Whitespace(int nr) + : nrSpaces(nr) {} + }; + + std::ostream& operator<<(std::ostream& out, const Whitespace& ws) { + if(ws.nrSpaces != 0) + out << std::setw(ws.nrSpaces) << ' '; + return out; + } + + struct ConsoleReporter : public IReporter + { + std::ostream& s; + bool hasLoggedCurrentTestStart; + std::vector subcasesStack; + size_t currentSubcaseLevel; + DOCTEST_DECLARE_MUTEX(mutex) + + // caching pointers/references to objects of these types - safe to do + const ContextOptions& opt; + const TestCaseData* tc; + + ConsoleReporter(const ContextOptions& co) + : s(*co.cout) + , opt(co) {} + + ConsoleReporter(const ContextOptions& co, std::ostream& ostr) + : s(ostr) + , opt(co) {} + + // ========================================================================================= + // WHAT FOLLOWS ARE HELPERS USED BY THE OVERRIDES OF THE VIRTUAL METHODS OF THE INTERFACE + // ========================================================================================= + + void separator_to_stream() { + s << Color::Yellow + << "===============================================================================" + "\n"; + } + + const char* getSuccessOrFailString(bool success, assertType::Enum at, + const char* success_str) { + if(success) + return success_str; + return failureString(at); + } + + Color::Enum getSuccessOrFailColor(bool success, assertType::Enum at) { + return success ? Color::BrightGreen : + (at & assertType::is_warn) ? Color::Yellow : Color::Red; + } + + void successOrFailColoredStringToStream(bool success, assertType::Enum at, + const char* success_str = "SUCCESS") { + s << getSuccessOrFailColor(success, at) + << getSuccessOrFailString(success, at, success_str) << ": "; + } + + void log_contexts() { + int num_contexts = get_num_active_contexts(); + if(num_contexts) { + auto contexts = get_active_contexts(); + + s << Color::None << " logged: "; + for(int i = 0; i < num_contexts; ++i) { + s << (i == 0 ? "" : " "); + contexts[i]->stringify(&s); + s << "\n"; + } + } + + s << "\n"; + } + + // this was requested to be made virtual so users could override it + virtual void file_line_to_stream(const char* file, int line, + const char* tail = "") { + s << Color::LightGrey << skipPathFromFilename(file) << (opt.gnu_file_line ? ":" : "(") + << (opt.no_line_numbers ? 0 : line) // 0 or the real num depending on the option + << (opt.gnu_file_line ? ":" : "):") << tail; + } + + void logTestStart() { + if(hasLoggedCurrentTestStart) + return; + + separator_to_stream(); + file_line_to_stream(tc->m_file.c_str(), tc->m_line, "\n"); + if(tc->m_description) + s << Color::Yellow << "DESCRIPTION: " << Color::None << tc->m_description << "\n"; + if(tc->m_test_suite && tc->m_test_suite[0] != '\0') + s << Color::Yellow << "TEST SUITE: " << Color::None << tc->m_test_suite << "\n"; + if(strncmp(tc->m_name, " Scenario:", 11) != 0) + s << Color::Yellow << "TEST CASE: "; + s << Color::None << tc->m_name << "\n"; + + for(size_t i = 0; i < currentSubcaseLevel; ++i) { + if(subcasesStack[i].m_name[0] != '\0') + s << " " << subcasesStack[i].m_name << "\n"; + } + + if(currentSubcaseLevel != subcasesStack.size()) { + s << Color::Yellow << "\nDEEPEST SUBCASE STACK REACHED (DIFFERENT FROM THE CURRENT ONE):\n" << Color::None; + for(size_t i = 0; i < subcasesStack.size(); ++i) { + if(subcasesStack[i].m_name[0] != '\0') + s << " " << subcasesStack[i].m_name << "\n"; + } + } + + s << "\n"; + + hasLoggedCurrentTestStart = true; + } + + void printVersion() { + if(opt.no_version == false) + s << Color::Cyan << "[doctest] " << Color::None << "doctest version is \"" + << DOCTEST_VERSION_STR << "\"\n"; + } + + void printIntro() { + if(opt.no_intro == false) { + printVersion(); + s << Color::Cyan << "[doctest] " << Color::None + << "run with \"--" DOCTEST_OPTIONS_PREFIX_DISPLAY "help\" for options\n"; + } + } + + void printHelp() { + int sizePrefixDisplay = static_cast(strlen(DOCTEST_OPTIONS_PREFIX_DISPLAY)); + printVersion(); + // clang-format off + s << Color::Cyan << "[doctest]\n" << Color::None; + s << Color::Cyan << "[doctest] " << Color::None; + s << "boolean values: \"1/on/yes/true\" or \"0/off/no/false\"\n"; + s << Color::Cyan << "[doctest] " << Color::None; + s << "filter values: \"str1,str2,str3\" (comma separated strings)\n"; + s << Color::Cyan << "[doctest]\n" << Color::None; + s << Color::Cyan << "[doctest] " << Color::None; + s << "filters use wildcards for matching strings\n"; + s << Color::Cyan << "[doctest] " << Color::None; + s << "something passes a filter if any of the strings in a filter matches\n"; +#ifndef DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS + s << Color::Cyan << "[doctest]\n" << Color::None; + s << Color::Cyan << "[doctest] " << Color::None; + s << "ALL FLAGS, OPTIONS AND FILTERS ALSO AVAILABLE WITH A \"" DOCTEST_CONFIG_OPTIONS_PREFIX "\" PREFIX!!!\n"; +#endif + s << Color::Cyan << "[doctest]\n" << Color::None; + s << Color::Cyan << "[doctest] " << Color::None; + s << "Query flags - the program quits after them. Available:\n\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "?, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "help, -" DOCTEST_OPTIONS_PREFIX_DISPLAY "h " + << Whitespace(sizePrefixDisplay*0) << "prints this message\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "v, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "version " + << Whitespace(sizePrefixDisplay*1) << "prints the version\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "c, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "count " + << Whitespace(sizePrefixDisplay*1) << "prints the number of matching tests\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "ltc, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "list-test-cases " + << Whitespace(sizePrefixDisplay*1) << "lists all matching tests by name\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "lts, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "list-test-suites " + << Whitespace(sizePrefixDisplay*1) << "lists all matching test suites\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "lr, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "list-reporters " + << Whitespace(sizePrefixDisplay*1) << "lists all registered reporters\n\n"; + // ================================================================================== << 79 + s << Color::Cyan << "[doctest] " << Color::None; + s << "The available / options/filters are:\n\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "tc, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "test-case= " + << Whitespace(sizePrefixDisplay*1) << "filters tests by their name\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "tce, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "test-case-exclude= " + << Whitespace(sizePrefixDisplay*1) << "filters OUT tests by their name\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "sf, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "source-file= " + << Whitespace(sizePrefixDisplay*1) << "filters tests by their file\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "sfe, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "source-file-exclude= " + << Whitespace(sizePrefixDisplay*1) << "filters OUT tests by their file\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "ts, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "test-suite= " + << Whitespace(sizePrefixDisplay*1) << "filters tests by their test suite\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "tse, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "test-suite-exclude= " + << Whitespace(sizePrefixDisplay*1) << "filters OUT tests by their test suite\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "sc, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "subcase= " + << Whitespace(sizePrefixDisplay*1) << "filters subcases by their name\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "sce, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "subcase-exclude= " + << Whitespace(sizePrefixDisplay*1) << "filters OUT subcases by their name\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "r, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "reporters= " + << Whitespace(sizePrefixDisplay*1) << "reporters to use (console is default)\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "o, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "out= " + << Whitespace(sizePrefixDisplay*1) << "output filename\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "ob, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "order-by= " + << Whitespace(sizePrefixDisplay*1) << "how the tests should be ordered\n"; + s << Whitespace(sizePrefixDisplay*3) << " - [file/suite/name/rand/none]\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "rs, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "rand-seed= " + << Whitespace(sizePrefixDisplay*1) << "seed for random ordering\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "f, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "first= " + << Whitespace(sizePrefixDisplay*1) << "the first test passing the filters to\n"; + s << Whitespace(sizePrefixDisplay*3) << " execute - for range-based execution\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "l, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "last= " + << Whitespace(sizePrefixDisplay*1) << "the last test passing the filters to\n"; + s << Whitespace(sizePrefixDisplay*3) << " execute - for range-based execution\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "aa, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "abort-after= " + << Whitespace(sizePrefixDisplay*1) << "stop after failed assertions\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "scfl,--" DOCTEST_OPTIONS_PREFIX_DISPLAY "subcase-filter-levels= " + << Whitespace(sizePrefixDisplay*1) << "apply filters for the first levels\n"; + s << Color::Cyan << "\n[doctest] " << Color::None; + s << "Bool options - can be used like flags and true is assumed. Available:\n\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "s, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "success= " + << Whitespace(sizePrefixDisplay*1) << "include successful assertions in output\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "cs, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "case-sensitive= " + << Whitespace(sizePrefixDisplay*1) << "filters being treated as case sensitive\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "e, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "exit= " + << Whitespace(sizePrefixDisplay*1) << "exits after the tests finish\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "d, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "duration= " + << Whitespace(sizePrefixDisplay*1) << "prints the time duration of each test\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "m, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "minimal= " + << Whitespace(sizePrefixDisplay*1) << "minimal console output (only failures)\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "q, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "quiet= " + << Whitespace(sizePrefixDisplay*1) << "no console output\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "nt, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-throw= " + << Whitespace(sizePrefixDisplay*1) << "skips exceptions-related assert checks\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "ne, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-exitcode= " + << Whitespace(sizePrefixDisplay*1) << "returns (or exits) always with success\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "nr, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-run= " + << Whitespace(sizePrefixDisplay*1) << "skips all runtime doctest operations\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "ni, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-intro= " + << Whitespace(sizePrefixDisplay*1) << "omit the framework intro in the output\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "nv, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-version= " + << Whitespace(sizePrefixDisplay*1) << "omit the framework version in the output\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "nc, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-colors= " + << Whitespace(sizePrefixDisplay*1) << "disables colors in output\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "fc, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "force-colors= " + << Whitespace(sizePrefixDisplay*1) << "use colors even when not in a tty\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "nb, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-breaks= " + << Whitespace(sizePrefixDisplay*1) << "disables breakpoints in debuggers\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "ns, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-skip= " + << Whitespace(sizePrefixDisplay*1) << "don't skip test cases marked as skip\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "gfl, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "gnu-file-line= " + << Whitespace(sizePrefixDisplay*1) << ":n: vs (n): for line numbers in output\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "npf, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-path-filenames= " + << Whitespace(sizePrefixDisplay*1) << "only filenames and no paths in output\n"; + s << " -" DOCTEST_OPTIONS_PREFIX_DISPLAY "nln, --" DOCTEST_OPTIONS_PREFIX_DISPLAY "no-line-numbers= " + << Whitespace(sizePrefixDisplay*1) << "0 instead of real line numbers in output\n"; + // ================================================================================== << 79 + // clang-format on + + s << Color::Cyan << "\n[doctest] " << Color::None; + s << "for more information visit the project documentation\n\n"; + } + + void printRegisteredReporters() { + printVersion(); + auto printReporters = [this] (const reporterMap& reporters, const char* type) { + if(reporters.size()) { + s << Color::Cyan << "[doctest] " << Color::None << "listing all registered " << type << "\n"; + for(auto& curr : reporters) + s << "priority: " << std::setw(5) << curr.first.first + << " name: " << curr.first.second << "\n"; + } + }; + printReporters(getListeners(), "listeners"); + printReporters(getReporters(), "reporters"); + } + + // ========================================================================================= + // WHAT FOLLOWS ARE OVERRIDES OF THE VIRTUAL METHODS OF THE REPORTER INTERFACE + // ========================================================================================= + + void report_query(const QueryData& in) override { + if(opt.version) { + printVersion(); + } else if(opt.help) { + printHelp(); + } else if(opt.list_reporters) { + printRegisteredReporters(); + } else if(opt.count || opt.list_test_cases) { + if(opt.list_test_cases) { + s << Color::Cyan << "[doctest] " << Color::None + << "listing all test case names\n"; + separator_to_stream(); + } + + for(unsigned i = 0; i < in.num_data; ++i) + s << Color::None << in.data[i]->m_name << "\n"; + + separator_to_stream(); + + s << Color::Cyan << "[doctest] " << Color::None + << "unskipped test cases passing the current filters: " + << g_cs->numTestCasesPassingFilters << "\n"; + + } else if(opt.list_test_suites) { + s << Color::Cyan << "[doctest] " << Color::None << "listing all test suites\n"; + separator_to_stream(); + + for(unsigned i = 0; i < in.num_data; ++i) + s << Color::None << in.data[i]->m_test_suite << "\n"; + + separator_to_stream(); + + s << Color::Cyan << "[doctest] " << Color::None + << "unskipped test cases passing the current filters: " + << g_cs->numTestCasesPassingFilters << "\n"; + s << Color::Cyan << "[doctest] " << Color::None + << "test suites with unskipped test cases passing the current filters: " + << g_cs->numTestSuitesPassingFilters << "\n"; + } + } + + void test_run_start() override { + if(!opt.minimal) + printIntro(); + } + + void test_run_end(const TestRunStats& p) override { + if(opt.minimal && p.numTestCasesFailed == 0) + return; + + separator_to_stream(); + s << std::dec; + + auto totwidth = int(std::ceil(log10(static_cast(std::max(p.numTestCasesPassingFilters, static_cast(p.numAsserts))) + 1))); + auto passwidth = int(std::ceil(log10(static_cast(std::max(p.numTestCasesPassingFilters - p.numTestCasesFailed, static_cast(p.numAsserts - p.numAssertsFailed))) + 1))); + auto failwidth = int(std::ceil(log10(static_cast(std::max(p.numTestCasesFailed, static_cast(p.numAssertsFailed))) + 1))); + const bool anythingFailed = p.numTestCasesFailed > 0 || p.numAssertsFailed > 0; + s << Color::Cyan << "[doctest] " << Color::None << "test cases: " << std::setw(totwidth) + << p.numTestCasesPassingFilters << " | " + << ((p.numTestCasesPassingFilters == 0 || anythingFailed) ? Color::None : + Color::Green) + << std::setw(passwidth) << p.numTestCasesPassingFilters - p.numTestCasesFailed << " passed" + << Color::None << " | " << (p.numTestCasesFailed > 0 ? Color::Red : Color::None) + << std::setw(failwidth) << p.numTestCasesFailed << " failed" << Color::None << " |"; + if(opt.no_skipped_summary == false) { + const int numSkipped = p.numTestCases - p.numTestCasesPassingFilters; + s << " " << (numSkipped == 0 ? Color::None : Color::Yellow) << numSkipped + << " skipped" << Color::None; + } + s << "\n"; + s << Color::Cyan << "[doctest] " << Color::None << "assertions: " << std::setw(totwidth) + << p.numAsserts << " | " + << ((p.numAsserts == 0 || anythingFailed) ? Color::None : Color::Green) + << std::setw(passwidth) << (p.numAsserts - p.numAssertsFailed) << " passed" << Color::None + << " | " << (p.numAssertsFailed > 0 ? Color::Red : Color::None) << std::setw(failwidth) + << p.numAssertsFailed << " failed" << Color::None << " |\n"; + s << Color::Cyan << "[doctest] " << Color::None + << "Status: " << (p.numTestCasesFailed > 0 ? Color::Red : Color::Green) + << ((p.numTestCasesFailed > 0) ? "FAILURE!" : "SUCCESS!") << Color::None << std::endl; + } + + void test_case_start(const TestCaseData& in) override { + hasLoggedCurrentTestStart = false; + tc = ∈ + subcasesStack.clear(); + currentSubcaseLevel = 0; + } + + void test_case_reenter(const TestCaseData&) override { + subcasesStack.clear(); + } + + void test_case_end(const CurrentTestCaseStats& st) override { + if(tc->m_no_output) + return; + + // log the preamble of the test case only if there is something + // else to print - something other than that an assert has failed + if(opt.duration || + (st.failure_flags && st.failure_flags != static_cast(TestCaseFailureReason::AssertFailure))) + logTestStart(); + + if(opt.duration) + s << Color::None << std::setprecision(6) << std::fixed << st.seconds + << " s: " << tc->m_name << "\n"; + + if(st.failure_flags & TestCaseFailureReason::Timeout) + s << Color::Red << "Test case exceeded time limit of " << std::setprecision(6) + << std::fixed << tc->m_timeout << "!\n"; + + if(st.failure_flags & TestCaseFailureReason::ShouldHaveFailedButDidnt) { + s << Color::Red << "Should have failed but didn't! Marking it as failed!\n"; + } else if(st.failure_flags & TestCaseFailureReason::ShouldHaveFailedAndDid) { + s << Color::Yellow << "Failed as expected so marking it as not failed\n"; + } else if(st.failure_flags & TestCaseFailureReason::CouldHaveFailedAndDid) { + s << Color::Yellow << "Allowed to fail so marking it as not failed\n"; + } else if(st.failure_flags & TestCaseFailureReason::DidntFailExactlyNumTimes) { + s << Color::Red << "Didn't fail exactly " << tc->m_expected_failures + << " times so marking it as failed!\n"; + } else if(st.failure_flags & TestCaseFailureReason::FailedExactlyNumTimes) { + s << Color::Yellow << "Failed exactly " << tc->m_expected_failures + << " times as expected so marking it as not failed!\n"; + } + if(st.failure_flags & TestCaseFailureReason::TooManyFailedAsserts) { + s << Color::Red << "Aborting - too many failed asserts!\n"; + } + s << Color::None; // lgtm [cpp/useless-expression] + } + + void test_case_exception(const TestCaseException& e) override { + DOCTEST_LOCK_MUTEX(mutex) + if(tc->m_no_output) + return; + + logTestStart(); + + file_line_to_stream(tc->m_file.c_str(), tc->m_line, " "); + successOrFailColoredStringToStream(false, e.is_crash ? assertType::is_require : + assertType::is_check); + s << Color::Red << (e.is_crash ? "test case CRASHED: " : "test case THREW exception: ") + << Color::Cyan << e.error_string << "\n"; + + int num_stringified_contexts = get_num_stringified_contexts(); + if(num_stringified_contexts) { + auto stringified_contexts = get_stringified_contexts(); + s << Color::None << " logged: "; + for(int i = num_stringified_contexts; i > 0; --i) { + s << (i == num_stringified_contexts ? "" : " ") + << stringified_contexts[i - 1] << "\n"; + } + } + s << "\n" << Color::None; + } + + void subcase_start(const SubcaseSignature& subc) override { + subcasesStack.push_back(subc); + ++currentSubcaseLevel; + hasLoggedCurrentTestStart = false; + } + + void subcase_end() override { + --currentSubcaseLevel; + hasLoggedCurrentTestStart = false; + } + + void log_assert(const AssertData& rb) override { + if((!rb.m_failed && !opt.success) || tc->m_no_output) + return; + + DOCTEST_LOCK_MUTEX(mutex) + + logTestStart(); + + file_line_to_stream(rb.m_file, rb.m_line, " "); + successOrFailColoredStringToStream(!rb.m_failed, rb.m_at); + + fulltext_log_assert_to_stream(s, rb); + + log_contexts(); + } + + void log_message(const MessageData& mb) override { + if(tc->m_no_output) + return; + + DOCTEST_LOCK_MUTEX(mutex) + + logTestStart(); + + file_line_to_stream(mb.m_file, mb.m_line, " "); + s << getSuccessOrFailColor(false, mb.m_severity) + << getSuccessOrFailString(mb.m_severity & assertType::is_warn, mb.m_severity, + "MESSAGE") << ": "; + s << Color::None << mb.m_string << "\n"; + log_contexts(); + } + + void test_case_skipped(const TestCaseData&) override {} + }; + + DOCTEST_REGISTER_REPORTER("console", 0, ConsoleReporter); + +#ifdef DOCTEST_PLATFORM_WINDOWS + struct DebugOutputWindowReporter : public ConsoleReporter + { + DOCTEST_THREAD_LOCAL static std::ostringstream oss; + + DebugOutputWindowReporter(const ContextOptions& co) + : ConsoleReporter(co, oss) {} + +#define DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(func, type, arg) \ + void func(type arg) override { \ + bool with_col = g_no_colors; \ + g_no_colors = false; \ + ConsoleReporter::func(arg); \ + if(oss.tellp() != std::streampos{}) { \ + DOCTEST_OUTPUT_DEBUG_STRING(oss.str().c_str()); \ + oss.str(""); \ + } \ + g_no_colors = with_col; \ + } + + DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(test_run_start, DOCTEST_EMPTY, DOCTEST_EMPTY) + DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(test_run_end, const TestRunStats&, in) + DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(test_case_start, const TestCaseData&, in) + DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(test_case_reenter, const TestCaseData&, in) + DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(test_case_end, const CurrentTestCaseStats&, in) + DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(test_case_exception, const TestCaseException&, in) + DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(subcase_start, const SubcaseSignature&, in) + DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(subcase_end, DOCTEST_EMPTY, DOCTEST_EMPTY) + DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(log_assert, const AssertData&, in) + DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(log_message, const MessageData&, in) + DOCTEST_DEBUG_OUTPUT_REPORTER_OVERRIDE(test_case_skipped, const TestCaseData&, in) + }; + + DOCTEST_THREAD_LOCAL std::ostringstream DebugOutputWindowReporter::oss; +#endif // DOCTEST_PLATFORM_WINDOWS + + // the implementation of parseOption() + bool parseOptionImpl(int argc, const char* const* argv, const char* pattern, String* value) { + // going from the end to the beginning and stopping on the first occurrence from the end + for(int i = argc; i > 0; --i) { + auto index = i - 1; + auto temp = std::strstr(argv[index], pattern); + if(temp && (value || strlen(temp) == strlen(pattern))) { //!OCLINT prefer early exits and continue + // eliminate matches in which the chars before the option are not '-' + bool noBadCharsFound = true; + auto curr = argv[index]; + while(curr != temp) { + if(*curr++ != '-') { + noBadCharsFound = false; + break; + } + } + if(noBadCharsFound && argv[index][0] == '-') { + if(value) { + // parsing the value of an option + temp += strlen(pattern); + const unsigned len = strlen(temp); + if(len) { + *value = temp; + return true; + } + } else { + // just a flag - no value + return true; + } + } + } + } + return false; + } + + // parses an option and returns the string after the '=' character + bool parseOption(int argc, const char* const* argv, const char* pattern, String* value = nullptr, + const String& defaultVal = String()) { + if(value) + *value = defaultVal; +#ifndef DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS + // offset (normally 3 for "dt-") to skip prefix + if(parseOptionImpl(argc, argv, pattern + strlen(DOCTEST_CONFIG_OPTIONS_PREFIX), value)) + return true; +#endif // DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS + return parseOptionImpl(argc, argv, pattern, value); + } + + // locates a flag on the command line + bool parseFlag(int argc, const char* const* argv, const char* pattern) { + return parseOption(argc, argv, pattern); + } + + // parses a comma separated list of words after a pattern in one of the arguments in argv + bool parseCommaSepArgs(int argc, const char* const* argv, const char* pattern, + std::vector& res) { + String filtersString; + if(parseOption(argc, argv, pattern, &filtersString)) { + // tokenize with "," as a separator, unless escaped with backslash + std::ostringstream s; + auto flush = [&s, &res]() { + auto string = s.str(); + if(string.size() > 0) { + res.push_back(string.c_str()); + } + s.str(""); + }; + + bool seenBackslash = false; + const char* current = filtersString.c_str(); + const char* end = current + strlen(current); + while(current != end) { + char character = *current++; + if(seenBackslash) { + seenBackslash = false; + if(character == ',' || character == '\\') { + s.put(character); + continue; + } + s.put('\\'); + } + if(character == '\\') { + seenBackslash = true; + } else if(character == ',') { + flush(); + } else { + s.put(character); + } + } + + if(seenBackslash) { + s.put('\\'); + } + flush(); + return true; + } + return false; + } + + enum optionType + { + option_bool, + option_int + }; + + // parses an int/bool option from the command line + bool parseIntOption(int argc, const char* const* argv, const char* pattern, optionType type, + int& res) { + String parsedValue; + if(!parseOption(argc, argv, pattern, &parsedValue)) + return false; + + if(type) { + // integer + // TODO: change this to use std::stoi or something else! currently it uses undefined behavior - assumes '0' on failed parse... + int theInt = std::atoi(parsedValue.c_str()); + if (theInt != 0) { + res = theInt; //!OCLINT parameter reassignment + return true; + } + } else { + // boolean + const char positive[][5] = { "1", "true", "on", "yes" }; // 5 - strlen("true") + 1 + const char negative[][6] = { "0", "false", "off", "no" }; // 6 - strlen("false") + 1 + + // if the value matches any of the positive/negative possibilities + for (unsigned i = 0; i < 4; i++) { + if (parsedValue.compare(positive[i], true) == 0) { + res = 1; //!OCLINT parameter reassignment + return true; + } + if (parsedValue.compare(negative[i], true) == 0) { + res = 0; //!OCLINT parameter reassignment + return true; + } + } + } + return false; + } +} // namespace + +Context::Context(int argc, const char* const* argv) + : p(new detail::ContextState) { + parseArgs(argc, argv, true); + if(argc) + p->binary_name = argv[0]; +} + +Context::~Context() { + if(g_cs == p) + g_cs = nullptr; + delete p; +} + +void Context::applyCommandLine(int argc, const char* const* argv) { + parseArgs(argc, argv); + if(argc) + p->binary_name = argv[0]; +} + +// parses args +void Context::parseArgs(int argc, const char* const* argv, bool withDefaults) { + using namespace detail; + + // clang-format off + parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "source-file=", p->filters[0]); + parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "sf=", p->filters[0]); + parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "source-file-exclude=",p->filters[1]); + parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "sfe=", p->filters[1]); + parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "test-suite=", p->filters[2]); + parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "ts=", p->filters[2]); + parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "test-suite-exclude=", p->filters[3]); + parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "tse=", p->filters[3]); + parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "test-case=", p->filters[4]); + parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "tc=", p->filters[4]); + parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "test-case-exclude=", p->filters[5]); + parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "tce=", p->filters[5]); + parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "subcase=", p->filters[6]); + parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "sc=", p->filters[6]); + parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "subcase-exclude=", p->filters[7]); + parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "sce=", p->filters[7]); + parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "reporters=", p->filters[8]); + parseCommaSepArgs(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "r=", p->filters[8]); + // clang-format on + + int intRes = 0; + String strRes; + +#define DOCTEST_PARSE_AS_BOOL_OR_FLAG(name, sname, var, default) \ + if(parseIntOption(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX name "=", option_bool, intRes) || \ + parseIntOption(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX sname "=", option_bool, intRes)) \ + p->var = static_cast(intRes); \ + else if(parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX name) || \ + parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX sname)) \ + p->var = true; \ + else if(withDefaults) \ + p->var = default + +#define DOCTEST_PARSE_INT_OPTION(name, sname, var, default) \ + if(parseIntOption(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX name "=", option_int, intRes) || \ + parseIntOption(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX sname "=", option_int, intRes)) \ + p->var = intRes; \ + else if(withDefaults) \ + p->var = default + +#define DOCTEST_PARSE_STR_OPTION(name, sname, var, default) \ + if(parseOption(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX name "=", &strRes, default) || \ + parseOption(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX sname "=", &strRes, default) || \ + withDefaults) \ + p->var = strRes + + // clang-format off + DOCTEST_PARSE_STR_OPTION("out", "o", out, ""); + DOCTEST_PARSE_STR_OPTION("order-by", "ob", order_by, "file"); + DOCTEST_PARSE_INT_OPTION("rand-seed", "rs", rand_seed, 0); + + DOCTEST_PARSE_INT_OPTION("first", "f", first, 0); + DOCTEST_PARSE_INT_OPTION("last", "l", last, UINT_MAX); + + DOCTEST_PARSE_INT_OPTION("abort-after", "aa", abort_after, 0); + DOCTEST_PARSE_INT_OPTION("subcase-filter-levels", "scfl", subcase_filter_levels, INT_MAX); + + DOCTEST_PARSE_AS_BOOL_OR_FLAG("success", "s", success, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("case-sensitive", "cs", case_sensitive, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("exit", "e", exit, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("duration", "d", duration, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("minimal", "m", minimal, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("quiet", "q", quiet, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-throw", "nt", no_throw, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-exitcode", "ne", no_exitcode, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-run", "nr", no_run, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-intro", "ni", no_intro, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-version", "nv", no_version, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-colors", "nc", no_colors, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("force-colors", "fc", force_colors, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-breaks", "nb", no_breaks, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-skip", "ns", no_skip, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("gnu-file-line", "gfl", gnu_file_line, !bool(DOCTEST_MSVC)); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-path-filenames", "npf", no_path_in_filenames, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-line-numbers", "nln", no_line_numbers, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-debug-output", "ndo", no_debug_output, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-skipped-summary", "nss", no_skipped_summary, false); + DOCTEST_PARSE_AS_BOOL_OR_FLAG("no-time-in-output", "ntio", no_time_in_output, false); + // clang-format on + + if(withDefaults) { + p->help = false; + p->version = false; + p->count = false; + p->list_test_cases = false; + p->list_test_suites = false; + p->list_reporters = false; + } + if(parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "help") || + parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "h") || + parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "?")) { + p->help = true; + p->exit = true; + } + if(parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "version") || + parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "v")) { + p->version = true; + p->exit = true; + } + if(parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "count") || + parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "c")) { + p->count = true; + p->exit = true; + } + if(parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "list-test-cases") || + parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "ltc")) { + p->list_test_cases = true; + p->exit = true; + } + if(parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "list-test-suites") || + parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "lts")) { + p->list_test_suites = true; + p->exit = true; + } + if(parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "list-reporters") || + parseFlag(argc, argv, DOCTEST_CONFIG_OPTIONS_PREFIX "lr")) { + p->list_reporters = true; + p->exit = true; + } +} + +// allows the user to add procedurally to the filters from the command line +void Context::addFilter(const char* filter, const char* value) { setOption(filter, value); } + +// allows the user to clear all filters from the command line +void Context::clearFilters() { + for(auto& curr : p->filters) + curr.clear(); +} + +// allows the user to override procedurally the bool options from the command line +void Context::setOption(const char* option, bool value) { + setOption(option, value ? "true" : "false"); +} + +// allows the user to override procedurally the int options from the command line +void Context::setOption(const char* option, int value) { + setOption(option, toString(value).c_str()); +} + +// allows the user to override procedurally the string options from the command line +void Context::setOption(const char* option, const char* value) { + auto argv = String("-") + option + "=" + value; + auto lvalue = argv.c_str(); + parseArgs(1, &lvalue); +} + +// users should query this in their main() and exit the program if true +bool Context::shouldExit() { return p->exit; } + +void Context::setAsDefaultForAssertsOutOfTestCases() { g_cs = p; } + +void Context::setAssertHandler(detail::assert_handler ah) { p->ah = ah; } + +void Context::setCout(std::ostream* out) { p->cout = out; } + +static class DiscardOStream : public std::ostream +{ +private: + class : public std::streambuf + { + private: + // allowing some buffering decreases the amount of calls to overflow + char buf[1024]; + + protected: + std::streamsize xsputn(const char_type*, std::streamsize count) override { return count; } + + int_type overflow(int_type ch) override { + setp(std::begin(buf), std::end(buf)); + return traits_type::not_eof(ch); + } + } discardBuf; + +public: + DiscardOStream() + : std::ostream(&discardBuf) {} +} discardOut; + +// the main function that does all the filtering and test running +int Context::run() { + using namespace detail; + + // save the old context state in case such was setup - for using asserts out of a testing context + auto old_cs = g_cs; + // this is the current contest + g_cs = p; + is_running_in_test = true; + + g_no_colors = p->no_colors; + p->resetRunData(); + + std::fstream fstr; + if(p->cout == nullptr) { + if(p->quiet) { + p->cout = &discardOut; + } else if(p->out.size()) { + // to a file if specified + fstr.open(p->out.c_str(), std::fstream::out); + p->cout = &fstr; + } else { +#ifndef DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM + // stdout by default + p->cout = &std::cout; +#else // DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM + return EXIT_FAILURE; +#endif // DOCTEST_CONFIG_NO_INCLUDE_IOSTREAM + } + } + + FatalConditionHandler::allocateAltStackMem(); + + auto cleanup_and_return = [&]() { + FatalConditionHandler::freeAltStackMem(); + + if(fstr.is_open()) + fstr.close(); + + // restore context + g_cs = old_cs; + is_running_in_test = false; + + // we have to free the reporters which were allocated when the run started + for(auto& curr : p->reporters_currently_used) + delete curr; + p->reporters_currently_used.clear(); + + if(p->numTestCasesFailed && !p->no_exitcode) + return EXIT_FAILURE; + return EXIT_SUCCESS; + }; + + // setup default reporter if none is given through the command line + if(p->filters[8].empty()) + p->filters[8].push_back("console"); + + // check to see if any of the registered reporters has been selected + for(auto& curr : getReporters()) { + if(matchesAny(curr.first.second.c_str(), p->filters[8], false, p->case_sensitive)) + p->reporters_currently_used.push_back(curr.second(*g_cs)); + } + + // TODO: check if there is nothing in reporters_currently_used + + // prepend all listeners + for(auto& curr : getListeners()) + p->reporters_currently_used.insert(p->reporters_currently_used.begin(), curr.second(*g_cs)); + +#ifdef DOCTEST_PLATFORM_WINDOWS + if(isDebuggerActive() && p->no_debug_output == false) + p->reporters_currently_used.push_back(new DebugOutputWindowReporter(*g_cs)); +#endif // DOCTEST_PLATFORM_WINDOWS + + // handle version, help and no_run + if(p->no_run || p->version || p->help || p->list_reporters) { + DOCTEST_ITERATE_THROUGH_REPORTERS(report_query, QueryData()); + + return cleanup_and_return(); + } + + std::vector testArray; + for(auto& curr : getRegisteredTests()) + testArray.push_back(&curr); + p->numTestCases = testArray.size(); + + // sort the collected records + if(!testArray.empty()) { + if(p->order_by.compare("file", true) == 0) { + std::sort(testArray.begin(), testArray.end(), fileOrderComparator); + } else if(p->order_by.compare("suite", true) == 0) { + std::sort(testArray.begin(), testArray.end(), suiteOrderComparator); + } else if(p->order_by.compare("name", true) == 0) { + std::sort(testArray.begin(), testArray.end(), nameOrderComparator); + } else if(p->order_by.compare("rand", true) == 0) { + std::srand(p->rand_seed); + + // random_shuffle implementation + const auto first = &testArray[0]; + for(size_t i = testArray.size() - 1; i > 0; --i) { + int idxToSwap = std::rand() % (i + 1); + + const auto temp = first[i]; + + first[i] = first[idxToSwap]; + first[idxToSwap] = temp; + } + } else if(p->order_by.compare("none", true) == 0) { + // means no sorting - beneficial for death tests which call into the executable + // with a specific test case in mind - we don't want to slow down the startup times + } + } + + std::set testSuitesPassingFilt; + + bool query_mode = p->count || p->list_test_cases || p->list_test_suites; + std::vector queryResults; + + if(!query_mode) + DOCTEST_ITERATE_THROUGH_REPORTERS(test_run_start, DOCTEST_EMPTY); + + // invoke the registered functions if they match the filter criteria (or just count them) + for(auto& curr : testArray) { + const auto& tc = *curr; + + bool skip_me = false; + if(tc.m_skip && !p->no_skip) + skip_me = true; + + if(!matchesAny(tc.m_file.c_str(), p->filters[0], true, p->case_sensitive)) + skip_me = true; + if(matchesAny(tc.m_file.c_str(), p->filters[1], false, p->case_sensitive)) + skip_me = true; + if(!matchesAny(tc.m_test_suite, p->filters[2], true, p->case_sensitive)) + skip_me = true; + if(matchesAny(tc.m_test_suite, p->filters[3], false, p->case_sensitive)) + skip_me = true; + if(!matchesAny(tc.m_name, p->filters[4], true, p->case_sensitive)) + skip_me = true; + if(matchesAny(tc.m_name, p->filters[5], false, p->case_sensitive)) + skip_me = true; + + if(!skip_me) + p->numTestCasesPassingFilters++; + + // skip the test if it is not in the execution range + if((p->last < p->numTestCasesPassingFilters && p->first <= p->last) || + (p->first > p->numTestCasesPassingFilters)) + skip_me = true; + + if(skip_me) { + if(!query_mode) + DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_skipped, tc); + continue; + } + + // do not execute the test if we are to only count the number of filter passing tests + if(p->count) + continue; + + // print the name of the test and don't execute it + if(p->list_test_cases) { + queryResults.push_back(&tc); + continue; + } + + // print the name of the test suite if not done already and don't execute it + if(p->list_test_suites) { + if((testSuitesPassingFilt.count(tc.m_test_suite) == 0) && tc.m_test_suite[0] != '\0') { + queryResults.push_back(&tc); + testSuitesPassingFilt.insert(tc.m_test_suite); + p->numTestSuitesPassingFilters++; + } + continue; + } + + // execute the test if it passes all the filtering + { + p->currentTest = &tc; + + p->failure_flags = TestCaseFailureReason::None; + p->seconds = 0; + + // reset atomic counters + p->numAssertsFailedCurrentTest_atomic = 0; + p->numAssertsCurrentTest_atomic = 0; + + p->fullyTraversedSubcases.clear(); + + DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_start, tc); + + p->timer.start(); + + bool run_test = true; + + do { + // reset some of the fields for subcases (except for the set of fully passed ones) + p->reachedLeaf = false; + // May not be empty if previous subcase exited via exception. + p->subcaseStack.clear(); + p->currentSubcaseDepth = 0; + + p->shouldLogCurrentException = true; + + // reset stuff for logging with INFO() + p->stringifiedContexts.clear(); + +#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS + try { +#endif // DOCTEST_CONFIG_NO_EXCEPTIONS +// MSVC 2015 diagnoses fatalConditionHandler as unused (because reset() is a static method) +DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4101) // unreferenced local variable + FatalConditionHandler fatalConditionHandler; // Handle signals + // execute the test + tc.m_test(); + fatalConditionHandler.reset(); +DOCTEST_MSVC_SUPPRESS_WARNING_POP +#ifndef DOCTEST_CONFIG_NO_EXCEPTIONS + } catch(const TestFailureException&) { + p->failure_flags |= TestCaseFailureReason::AssertFailure; + } catch(...) { + DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_exception, + {translateActiveException(), false}); + p->failure_flags |= TestCaseFailureReason::Exception; + } +#endif // DOCTEST_CONFIG_NO_EXCEPTIONS + + // exit this loop if enough assertions have failed - even if there are more subcases + if(p->abort_after > 0 && + p->numAssertsFailed + p->numAssertsFailedCurrentTest_atomic >= p->abort_after) { + run_test = false; + p->failure_flags |= TestCaseFailureReason::TooManyFailedAsserts; + } + + if(!p->nextSubcaseStack.empty() && run_test) + DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_reenter, tc); + if(p->nextSubcaseStack.empty()) + run_test = false; + } while(run_test); + + p->finalizeTestCaseData(); + + DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_end, *g_cs); + + p->currentTest = nullptr; + + // stop executing tests if enough assertions have failed + if(p->abort_after > 0 && p->numAssertsFailed >= p->abort_after) + break; + } + } + + if(!query_mode) { + DOCTEST_ITERATE_THROUGH_REPORTERS(test_run_end, *g_cs); + } else { + QueryData qdata; + qdata.run_stats = g_cs; + qdata.data = queryResults.data(); + qdata.num_data = unsigned(queryResults.size()); + DOCTEST_ITERATE_THROUGH_REPORTERS(report_query, qdata); + } + + return cleanup_and_return(); +} + +DOCTEST_DEFINE_INTERFACE(IReporter) + +int IReporter::get_num_active_contexts() { return detail::g_infoContexts.size(); } +const IContextScope* const* IReporter::get_active_contexts() { + return get_num_active_contexts() ? &detail::g_infoContexts[0] : nullptr; +} + +int IReporter::get_num_stringified_contexts() { return detail::g_cs->stringifiedContexts.size(); } +const String* IReporter::get_stringified_contexts() { + return get_num_stringified_contexts() ? &detail::g_cs->stringifiedContexts[0] : nullptr; +} + +namespace detail { + void registerReporterImpl(const char* name, int priority, reporterCreatorFunc c, bool isReporter) { + if(isReporter) + getReporters().insert(reporterMap::value_type(reporterMap::key_type(priority, name), c)); + else + getListeners().insert(reporterMap::value_type(reporterMap::key_type(priority, name), c)); + } +} // namespace detail + +} // namespace doctest + +#endif // DOCTEST_CONFIG_DISABLE + +#ifdef DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN +DOCTEST_MSVC_SUPPRESS_WARNING_WITH_PUSH(4007) // 'function' : must be 'attribute' - see issue #182 +int main(int argc, char** argv) { return doctest::Context(argc, argv).run(); } +DOCTEST_MSVC_SUPPRESS_WARNING_POP +#endif // DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN + +DOCTEST_CLANG_SUPPRESS_WARNING_POP +DOCTEST_MSVC_SUPPRESS_WARNING_POP +DOCTEST_GCC_SUPPRESS_WARNING_POP + +DOCTEST_SUPPRESS_COMMON_WARNINGS_POP + +#endif // DOCTEST_LIBRARY_IMPLEMENTATION +#endif // DOCTEST_CONFIG_IMPLEMENT + +#ifdef DOCTEST_UNDEF_WIN32_LEAN_AND_MEAN +#undef WIN32_LEAN_AND_MEAN +#undef DOCTEST_UNDEF_WIN32_LEAN_AND_MEAN +#endif // DOCTEST_UNDEF_WIN32_LEAN_AND_MEAN + +#ifdef DOCTEST_UNDEF_NOMINMAX +#undef NOMINMAX +#undef DOCTEST_UNDEF_NOMINMAX +#endif // DOCTEST_UNDEF_NOMINMAX diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt new file mode 100644 index 000000000..7bb624106 --- /dev/null +++ b/tests/unit/CMakeLists.txt @@ -0,0 +1,31 @@ +# Unit tests of the simulation, built and run without the game data: the test vehicles are JSON +# definitions in data/ (see vehicle.h), loaded from memory by the game's own vehicle loader. The code +# under test is the game's core library (eu07_core), the very objects the game links; the rest of the +# engine it reaches for is replaced with stubs (engine_stubs.cpp). They run as part of the build, +# from the IDE, or with ctest. + +set(UNIT_TESTS_NAME eu07_unit_tests) + +# a new test_*.cpp file or data/*.json definition is picked up on its own +file(GLOB UNIT_TEST_CASES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/test_*.cpp") +file(GLOB UNIT_TEST_DATA CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/data/*.json") + +add_executable(${UNIT_TESTS_NAME} + main.cpp + vehicle.cpp + engine_stubs.cpp + ${UNIT_TEST_CASES}) + +# the core library brings the game's build settings along +target_link_libraries(${UNIT_TESTS_NAME} PRIVATE eu07_core) +target_include_directories(${UNIT_TESTS_NAME} PRIVATE "${DEPS_DIR}/doctest") +target_compile_definitions(${UNIT_TESTS_NAME} PRIVATE EU07_UNIT_TESTS_DATA="${CMAKE_CURRENT_SOURCE_DIR}/data") +if (MSVC) + target_compile_options(${UNIT_TESTS_NAME} PRIVATE /bigobj) +endif() +set_target_properties(${UNIT_TESTS_NAME} PROPERTIES FOLDER "tests") + +add_test(NAME ${UNIT_TESTS_NAME} COMMAND ${UNIT_TESTS_NAME}) + +# for running the tests at the end of building the game, see the main CMakeLists.txt +set(UNIT_TEST_DATA ${UNIT_TEST_DATA} PARENT_SCOPE) diff --git a/tests/unit/README.md b/tests/unit/README.md new file mode 100644 index 000000000..5eebe563e --- /dev/null +++ b/tests/unit/README.md @@ -0,0 +1,68 @@ +# Unit tests + +C++ tests of the simulation logic: set up the conditions, run the code, check the outcome. They run +as part of every build of the game, in CI and locally alike, and from the IDE. They need no game +data and no window: the test vehicles are JSON definitions in `data/`, loaded from memory by the +game's own vehicle loader. + +The code under test is `eu07_core`, the library of the simulation parts the game links as well +(physics, vehicle definition loader, ...): built once, with the game's settings, and tested as the +game uses it. The python library gets linked along with the game's settings, but the tests don't +use it and run without it. + +## Running + +- **With the build**: building the game (`WITH_TESTS`, on by default) runs them at the end, once the + game is linked, and prints `Unit tests: 11/11 passed (80 checks)`. A failing test prints the full + report and fails the build; the game binary gets removed, so the next build links it again and + reruns them. They also run when only the tests, a definition in `data/` or `run_tests.cmake` + changed (Ninja and Makefile generators). `-DWITH_TESTS=OFF` builds the game without them. +- **From the IDE**: run or debug the `eu07_unit_tests` target. CLion recognises doctest and lists the + test cases, so a single one can be run or debugged from the gutter. +- **By hand**: `ctest --test-dir --build-config Release`, or the binary itself, which takes + [doctest options](https://github.com/doctest/doctest/blob/master/doc/markdown/commandline.md), e.g. + `eu07_unit_tests -tc="brakes*"`. `EU07_UNIT_TESTS_LOG=1` shows the engine log, quiet otherwise. + +## Writing a test + +Add a `test_.cpp` here, it's picked up on its own. + +```cpp +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" + +TEST_CASE("brakes: service braking stops a heavier wagon too") { + // conditions: the wagon from data/wagon.json, heavier, running at 40 km/h + test::vehicle wagon{test::definition::load("wagon").set("Param", "M", 60000), 40.0 /* km/h */}; + // action: full service application, as a coupled locomotive would make it + wagon.hold_brake_pipe(3.5); // bar + wagon.run(40.0 /* s */, test::track{0.15 /* friction */, 0.0 /* gradient */}); + // outcome + CHECK(std::abs(wagon.speed()) < 0.1); +} +``` + +- `definition::load("")` reads `data/.json`, with the sections and keys of the game's + vehicle definitions; `set()` and `remove()` change it for the test. Table sections give their + rows as `"rows": [[...], ...]`, keys starting with `_` are comments. A section the loader doesn't + know is an error (the table of them is in `vehicle.cpp`); a misspelt key isn't caught, so check + in the test that the value the test is about made it to the vehicle. Keep the definitions + physically sensible: some parts need keys others don't (the ESt brake valves need `Brake.Size`), + and a test on a half-defined vehicle tests the definition rather than the simulation. +- The random numbers of the simulation are reseeded before every test case, so a test gives the + same result alone or among the others. +- `vehicle` creates the vehicle the way `TDynamicObject::Init()` does and steps it the way the + simulation loop does, on a straight track of the given friction and gradient. Coupled vehicles + aren't supported yet. +- Check behaviour (speeds, pressures, states the player sees) rather than internal flags, and make + the test check its own preconditions (`REQUIRE` that the braking skidded, before checking what a + skid leads to). + +## Code to test, and when the tests fail to link + +A source joins the tested code by moving from `SOURCES` to `CORE_SOURCES` in the main +`CMakeLists.txt`; the game links it from the library from then on. The library reaches for a little +of the rest of the engine, which `engine_stubs.cpp` stands in for in the tests (logs, settings, +scenery layers). If a change makes it use something new, either move the real source into the +library too, when it stands on its own, or add a stub to `engine_stubs.cpp`. diff --git a/tests/unit/data/wagon.json b/tests/unit/data/wagon.json new file mode 100644 index 000000000..8fac72bb3 --- /dev/null +++ b/tests/unit/data/wagon.json @@ -0,0 +1,12 @@ +{ + "_comment": "Passenger wagon with a KE distributor valve, made after a real one so the defaults make physical sense. Sections and keys are those of the game's vehicle definitions; tests change only the keys they're about.", + "Param": { "Category": "train", "M": 42200, "Vmax": 120 }, + "Dimensions": { "L": 26.8, "H": 4.7, "W": 2.88, "Cx": 0.15 }, + "Wheels": { "D": 0.96, "Tw": 1.435, "Axle": "2'2'", "Ad": 2.5, "Bd": 19.5, "Rmin": 80, "BearingType": "Roll" }, + "Brake": { + "BrakeValve": "KE", "NBpA": 6, "MBF": 15, "MaxBP": 3.8, "TareMaxBP": 2.3, + "BCN": 12, "BCR": 0.127, "BCD": 0.04, "BCM": 1.5, "BCS": 1.2, "BSA": 0, "BM": "Disk1", "BVV": 125 + }, + "BuffCoupl": { "CType": "Screw", "kB": 9200, "DmaxB": 0.11, "FmaxB": 320, "kC": 4500, "DmaxC": 0.1, "FmaxC": 850, "beta": 0.58, "AllowedFlag": 115 }, + "Cntrl": { "BrakeSystem": "Pneumatic", "LocalBrake": "ManualBrake", "BrakeDelays": "P", "MaxBPMass": 63 } +} diff --git a/tests/unit/engine_stubs.cpp b/tests/unit/engine_stubs.cpp new file mode 100644 index 000000000..96760f439 --- /dev/null +++ b/tests/unit/engine_stubs.cpp @@ -0,0 +1,81 @@ +// stand-ins for the parts of the engine which the core library (eu07_core) links against, but which the +// unit tests don't exercise. when a change makes the library use something new from the engine and the +// test build fails to link, either move the real source into the library (CORE_SOURCES in the main +// CMakeLists.txt, if it stands on its own) or add a stub here. + +#include "stdafx.h" +#include "utilities/Globals.h" +#include "utilities/Logs.h" +#include "scene/scenenodegroups.h" +#include "scene/scenelayers.h" + +#include +#include + +// settings --------------------------------------------------------------------------------------- + +global_settings &GetGlobalSettings() { + // defaults, as before reading eu07.ini + static global_settings settings; + return settings; +} + +// logs: quiet, unless EU07_UNIT_TESTS_LOG is set -------------------------------------------------- + +namespace { +bool log_enabled() { + static bool const enabled{std::getenv("EU07_UNIT_TESTS_LOG") != nullptr}; + return enabled; +} +} // namespace + +void WriteLog(const char *str, logtype const, bool const isError) { + if (log_enabled() && str != nullptr) { + (isError ? std::cerr : std::cout) << str << "\n"; + } +} + +void WriteLog(const std::string &str, logtype const Type) { + WriteLog(str.c_str(), Type, false); +} + +void ErrorLog(const std::string &str, logtype const Type) { + WriteLog(str.c_str(), Type, true); +} + +// scenery structure, which the parser reports include directives to -------------------------------- +// the declarations come from the engine's headers, the stubs can't change them (hence the NOSONARs) + +namespace scene { + +node_groups Groups; // NOSONAR the engine's extern global, scene/scenenodegroups.h +node_layers Layers; // NOSONAR the engine's extern global, scene/scenelayers.h + +group_handle node_groups::create(bool const) { // NOSONAR signature from scene/scenenodegroups.h + return null_handle; +} + +group_handle node_groups::close() { // NOSONAR signature from scene/scenenodegroups.h + return null_handle; +} + +layer_handle node_layers::open(std::string const &, include_site) { // NOSONAR signature from scene/scenelayers.h + return null_handle; +} + +layer_handle node_layers::close() { // NOSONAR signature from scene/scenelayers.h + return null_handle; +} + +void node_layers::instance_begin(std::string const &, source_span const &) { // NOSONAR signature from scene/scenelayers.h + // no layers in the tests, so nothing to keep track of +} + +// basic_node has no key function for the Itanium C++ ABI (tooltip() is declared plain but defined inline), so +// GCC and Clang emit its vtable wherever scenenode.h is used, here too, and the vtable wants radius_(). +// the same as the game's, in scene/scenenode.cpp +float basic_node::radius_() { + return 0.f; +} + +} // namespace scene diff --git a/tests/unit/main.cpp b/tests/unit/main.cpp new file mode 100644 index 000000000..451dd4c7b --- /dev/null +++ b/tests/unit/main.cpp @@ -0,0 +1,40 @@ +#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN +#include "stdafx.h" +#include "doctest.h" + +#include "utilities/Globals.h" + +namespace { + +// the simulation draws random numbers (brake delays, pressures, wheel damage) from engines shared by +// everything. reseeding them before every run of a test case, subcases included, gives each test the +// same numbers whether it runs alone from the IDE or among all the others +class deterministic_random : public doctest::IReporter { +public: + explicit deterministic_random(doctest::ContextOptions const &) {} + + void test_case_start(doctest::TestCaseData const &) override { reseed(); } + void test_case_reenter(doctest::TestCaseData const &) override { reseed(); } + + // the rest of doctest's reporter interface: a listener reports nothing, the console reporter does that + void report_query(doctest::QueryData const &) override { /* nothing to report */ } + void test_run_start() override { /* nothing to report */ } + void test_run_end(doctest::TestRunStats const &) override { /* nothing to report */ } + void test_case_end(doctest::CurrentTestCaseStats const &) override { /* nothing to report */ } + void test_case_exception(doctest::TestCaseException const &) override { /* nothing to report */ } + void subcase_start(doctest::SubcaseSignature const &) override { /* nothing to report */ } + void subcase_end() override { /* nothing to report */ } + void log_assert(doctest::AssertData const &) override { /* nothing to report */ } + void log_message(doctest::MessageData const &) override { /* nothing to report */ } + void test_case_skipped(doctest::TestCaseData const &) override { /* nothing to report */ } + +private: + static void reseed() { + Global.random_engine.seed(1); + Global.local_random_engine.seed(1); + } +}; + +} // namespace + +DOCTEST_REGISTER_LISTENER("deterministic_random", 1, deterministic_random); diff --git a/tests/unit/run_tests.cmake b/tests/unit/run_tests.cmake new file mode 100644 index 000000000..6cf6f508e --- /dev/null +++ b/tests/unit/run_tests.cmake @@ -0,0 +1,27 @@ +# runs the unit tests at the end of building the game: cmake -DTESTS= -DGAME= -P run_tests.cmake +# prints a one line summary when they pass, the full report when they don't. a failure fails the build and +# removes the game binary, so the next build links it again and reruns the tests + +execute_process( + COMMAND "${TESTS}" --no-intro --no-version + RESULT_VARIABLE result + OUTPUT_VARIABLE report + ERROR_VARIABLE report) + +string(REGEX MATCH "test cases: *([0-9]+) *\\| *([0-9]+) passed *\\| *([0-9]+) failed" _ "${report}") +set(cases "${CMAKE_MATCH_1}") +set(passed "${CMAKE_MATCH_2}") +set(failed "${CMAKE_MATCH_3}") +string(REGEX MATCH "assertions: *([0-9]+)" _ "${report}") +set(checks "${CMAKE_MATCH_1}") + +if(result EQUAL 0) + message("Unit tests: ${passed}/${cases} passed (${checks} checks)") +else() + message("${report}") + file(REMOVE "${GAME}") + if(cases STREQUAL "") + message(FATAL_ERROR "Unit tests: didn't run (${result}), see above. -DWITH_TESTS=OFF builds the game without them") + endif() + message(FATAL_ERROR "Unit tests: ${failed} of ${cases} FAILED, see above. -DWITH_TESTS=OFF builds the game without them") +endif() diff --git a/tests/unit/test_brakes.cpp b/tests/unit/test_brakes.cpp new file mode 100644 index 000000000..834168074 --- /dev/null +++ b/tests/unit/test_brakes.cpp @@ -0,0 +1,93 @@ +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" + +using test::definition; +using test::vehicle; + +// the brake pipe of a lone wagon is held at a pressure the way a coupled locomotive would hold it. +// pressures are in bar, the brake pipe runs at 5.0, a 1.5 bar reduction is a full service application. + +TEST_CASE("brakes: KE wagon applies up to its tare limit on a service application and releases again") { + vehicle wagon{definition::load("wagon")}; // empty wagon, TareMaxBP=2.3 + + wagon.hold_brake_pipe(5.0); + wagon.run(60.0); + CHECK(wagon->BrakePress < 0.1); + CHECK(wagon->Hamulec->GetBRP() > 4.5); // auxiliary reservoir charged + + wagon.hold_brake_pipe(3.5); + wagon.run(10.0); + CHECK(wagon->BrakePress == doctest::Approx(2.3).epsilon(0.05)); + + wagon.hold_brake_pipe(5.0); + wagon.run(60.0); + CHECK(wagon->BrakePress < 0.1); +} + +TEST_CASE("brakes: a deeper brake pipe reduction brakes harder") { + auto applied = [](double Pipe) { + vehicle wagon{definition::load("wagon").set("Brake", "TareMaxBP", 3.8)}; // no tare limit in the way + wagon.hold_brake_pipe(5.0); + wagon.run(60.0); + wagon.hold_brake_pipe(Pipe); + wagon.run(20.0); + return wagon->BrakePress; + }; + auto const light{applied(4.6)}; + auto const medium{applied(4.2)}; + auto const full{applied(3.5)}; + CHECK(light > 0.1); + CHECK(light < medium); + CHECK(medium < full); + CHECK(full <= 3.8 + 0.1); // MaxBP +} + +// every distributor valve the engine implements goes through the same cycle; the ESt family needs the size +// of its reservoirs, as in the real .fiz files using it +TEST_CASE("brakes: every implemented distributor valve charges, applies and releases") { + for (auto const *valve : {"W", "K", "KE", "ESt", "ESt3", "NESt3", "ESt4", "ESt3AL2", "LSt", "EStED", "EP1", "EP2", "CV1"}) { + CAPTURE(valve); + vehicle wagon{definition::load("wagon").set("Brake", "BrakeValve", valve).set("Brake", "Size", 16)}; + wagon.hold_brake_pipe(5.0); + wagon.run(90.0); + CHECK(wagon->BrakePress < 0.1); + wagon.hold_brake_pipe(3.5); + wagon.run(20.0); + CHECK(wagon->BrakePress > 1.0); + CHECK(wagon->BrakePress <= 3.8 + 0.1); // MaxBP + wagon.hold_brake_pipe(5.0); + wagon.run(90.0); + CHECK(wagon->BrakePress < 0.1); + } +} + +TEST_CASE("brakes: service braking stops a wagon running at 60 km/h and keeps it stopped") { + vehicle wagon{definition::load("wagon"), 60.0}; + wagon.hold_brake_pipe(5.0); + wagon.run(10.0); + REQUIRE(wagon.speed() > 50.0); // still running before the braking + + wagon.hold_brake_pipe(3.5); + wagon.run(30.0); + CHECK(std::abs(wagon.speed()) < 0.1); + wagon.run(30.0); + CHECK(std::abs(wagon.speed()) < 0.1); +} + +TEST_CASE("brakes: a released wagon rolls on") { + vehicle wagon{definition::load("wagon"), 60.0}; + wagon.hold_brake_pipe(5.0); + wagon.run(30.0); + CHECK(wagon.speed() > 50.0); + CHECK(wagon.speed() < 60.0); // running resistance slows it down a little +} + +// the example in README.md +TEST_CASE("brakes: service braking stops a heavier wagon too") { + // the default wagon, with the keys the test is about changed + test::vehicle wagon{test::definition::load("wagon").set("Param", "M", 60000), 40.0 /* km/h */}; + wagon.hold_brake_pipe(3.5); // bar, as a coupled locomotive would hold it + wagon.run(40.0 /* s */, test::track{0.15 /* friction */, 0.0 /* gradient */}); + CHECK(std::abs(wagon.speed()) < 0.1); +} diff --git a/tests/unit/test_definition.cpp b/tests/unit/test_definition.cpp new file mode 100644 index 000000000..6b2d446c0 --- /dev/null +++ b/tests/unit/test_definition.cpp @@ -0,0 +1,45 @@ +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" + +using test::definition; +using test::vehicle; + +TEST_CASE("definition: the wagon from data/wagon.json loads with its values") { + vehicle wagon{definition::load("wagon")}; + + CHECK(wagon->Mass == doctest::Approx(42200.0)); + CHECK(wagon->Vmax == doctest::Approx(120.0)); + CHECK(wagon->Dim.L == doctest::Approx(26.8)); + CHECK(wagon->WheelDiameter == doctest::Approx(0.96)); + CHECK(wagon->NAxles == 4); + CHECK(wagon->MaxBrakePress[3] == doctest::Approx(3.8)); + CHECK(wagon->BrakeSystem == TBrakeSystem::Pneumatic); +} + +TEST_CASE("definition: keys set by the test reach the vehicle") { + vehicle heavy{definition::load("wagon").set("Param", "M", 60000).set("Wheels", "D", 1.0)}; + + CHECK(heavy->Mass == doctest::Approx(60000.0)); + CHECK(heavy->WheelDiameter == doctest::Approx(1.0)); +} + +TEST_CASE("definition: an unknown test vehicle is an error, not a silently empty one") { + CHECK_THROWS(definition::load("no such vehicle")); +} + +TEST_CASE("definition: a misspelt section is an error, not silently skipped by the loader") { + CHECK_THROWS(definition::load("wagon").set("Brakes", "MBF", 30)); +} + +TEST_CASE("definition: rows of a table section reach the vehicle") { + auto const pc1{light::headlight_left | light::headlight_upper | light::headlight_right}; + vehicle wagon{definition::load("wagon") + .set("LightsList", "Size", 2) + .set("LightsList", "Default", 1) + .set("LightsList", "rows", {{0, 0}, {pc1, 0}})}; + + CHECK(wagon->LightsPosNo == 2); + CHECK(wagon->LightsPos == 1); + CHECK(wagon->Lights[end::front][1] == pc1); +} diff --git a/tests/unit/vehicle.cpp b/tests/unit/vehicle.cpp new file mode 100644 index 000000000..135c5c2fb --- /dev/null +++ b/tests/unit/vehicle.cpp @@ -0,0 +1,187 @@ +#include "stdafx.h" +#include "vehicle.h" + +#include +#include + +namespace test { + +namespace { + +struct section_format { + char separator; // the game's definitions end section names with either '.' or ':' + char const *table_end{nullptr}; // the line closing the rows of a table section +}; + +// the sections TMoverParameters::LoadFIZ() reads, see its issection() calls. a section missing here +// would be silently skipped by the loader, and the test would run on the defaults instead +std::map> const sections{ + {"Param", {'.'}}, + {"Load", {':'}}, + {"Dimensions", {':'}}, + {"Wheels", {':'}}, + {"Brake", {':'}}, + {"Doors", {':'}}, + {"BuffCoupl", {'.'}}, + {"BuffCoupl1", {'.'}}, + {"BuffCoupl2", {'.'}}, + {"TurboPos", {':'}}, + {"Cntrl", {'.'}}, + {"Blending", {':'}}, + {"DCEMUED", {':'}}, + {"SpringBrake", {':'}}, + {"Light", {':'}}, + {"Headlights", {':'}}, + {"Clima", {':'}}, + {"Power", {':'}}, + {"SpeedControl", {':'}}, + {"Engine", {':'}}, + {"Switches", {':'}}, + {"Security", {':'}}, + {"Circuit", {':'}}, + {"AI", {':'}}, + {"LightsList", {':', "endL"}}, + {"DimmerList", {':', "endDimmerList"}}, + {"WiperList", {':', "endwl"}}, + {"CompressorList", {':', "endCL"}}, +}; + +section_format const &format_of(std::string const &Section) { + auto const lookup{sections.find(Section)}; + if (lookup == sections.end()) { + throw definition_error("unknown vehicle definition section " + Section + ", see tests/unit/vehicle.cpp"); + } + return lookup->second; +} + +std::string value_text(nlohmann::ordered_json const &Value) { + if (Value.is_string()) { + return Value.get(); + } + if (Value.is_boolean()) { + return Value.get() ? "Yes" : "No"; + } + return Value.dump(); +} + +// the rows of a table section, each a list of values, and the line closing them +std::string table_text(std::string const &Section, section_format const &Format, nlohmann::ordered_json const &Rows) { + if (Format.table_end == nullptr) { + throw definition_error("vehicle definition section " + Section + " has no rows"); + } + std::string text; + for (auto const &row : Rows) { + for (auto const &value : row) { + text += value_text(value) + " "; + } + text += "\n"; + } + return text + Format.table_end + "\n"; +} + +} // namespace + +definition definition::load(std::string const &Name) { + auto const path{std::string{EU07_UNIT_TESTS_DATA} + "/" + Name + ".json"}; + std::ifstream file(path); + if (false == file.is_open()) { + throw definition_error("no test vehicle definition " + path); + } + definition result; + // not brace-initialised: json{other} makes an array of other with GCC and Clang (the initializer list constructor wins) + auto const json = nlohmann::ordered_json::parse(file, nullptr, true, true); + if (false == json.is_object()) { + throw definition_error("test vehicle definition " + path + " isn't a JSON object"); + } + for (auto const &[section, keys] : json.items()) { + // keys starting with _ are comments + if (section.starts_with('_')) { + continue; + } + format_of(section); + result.m_sections[section] = keys; + } + return result; +} + +definition &definition::set(std::string const &Section, std::string const &Key, nlohmann::ordered_json const &Value) { + format_of(Section); + m_sections[Section][Key] = Value; + return *this; +} + +definition &definition::remove(std::string const &Section) { + m_sections.erase(Section); + return *this; +} + +definition &definition::remove(std::string const &Section, std::string const &Key) { + if (m_sections.contains(Section)) { + m_sections[Section].erase(Key); + } + return *this; +} + +std::string definition::text() const { + std::string text; + for (auto const &[section, keys] : m_sections.items()) { + auto const &format{format_of(section)}; + text += section + format.separator; + for (auto const &[key, value] : keys.items()) { + if (key != "rows") { + text += " " + key + "=" + value_text(value); + } + } + text += "\n"; + if (keys.contains("rows")) { + text += table_text(section, format, keys["rows"]); + } + } + return text; +} + +vehicle::vehicle(definition const &Definition, double Velocity, std::string const &Name) { + // the same steps as TDynamicObject::Init() + m_mover = std::make_unique(Velocity, Name, Name, 0); + if (false == m_mover->LoadFIZ_Text(Definition.text())) { + throw definition_error("the test vehicle definition didn't load"); + } + m_mover->AssignLoad("", 0.f); + m_mover->ComputeMass(); + auto const driveractive{Velocity != 0.0}; + if (false == m_mover->CheckLocomotiveParameters(driveractive, Velocity >= 0.0 ? 1 : -1)) { + throw definition_error("parameters mismatch in the test vehicle definition"); + } + m_mover->MainCtrlPos = m_mover->MainCtrlNoPowerPos(); + m_mover->LocalBrakePosA = 0.0; + m_mover->BrakeCtrlPos = static_cast(std::floor(m_mover->Handle->GetPos(driveractive ? bh_RP : bh_NP))); + m_mover->BrakeLevelSet(m_mover->BrakeCtrlPos); +} + +void vehicle::step(track const &Track, double Dt) { + TTrackShape shape; + shape.Len = 1000.0; + shape.dHtrack = Track.gradient; + TTrackParam param; + param.Width = 1.435; + param.friction = Track.friction; + param.CategoryFlag = 1; + TTractionParam const traction; + TLocation const location{0.0, 0.0, 0.0}; + TRotation const rotation{0.0, 0.0, 0.0}; + if (m_pipepressure >= 0.0) { + m_mover->Pipe->CreatePress(m_pipepressure); + } + m_mover->ComputeTotalForce(Dt); + m_mover->ComputeMovement(Dt, Dt, shape, param, traction, location, rotation); +} + +void vehicle::run(double Seconds, track const &Track, double Dt) { + // whole steps: summing up Dt would make the step count depend on the rounding + auto const steps{std::lround(Seconds / Dt)}; + for (long i = 0; i < steps; ++i) { + step(Track, Dt); + } +} + +} // namespace test diff --git a/tests/unit/vehicle.h b/tests/unit/vehicle.h new file mode 100644 index 000000000..ad036839e --- /dev/null +++ b/tests/unit/vehicle.h @@ -0,0 +1,71 @@ +#pragma once + +#include +#include +#include + +#include + +#include "McZapkie/MOVER.h" + +namespace test { + +// thrown for a test vehicle definition which can't be used: missing, malformed, or not taken by the loader +class definition_error : public std::runtime_error { +public: + using std::runtime_error::runtime_error; +}; + +// definition of a test vehicle: one of the JSON files in tests/unit/data, with the sections and keys +// of the game's vehicle definitions, changed by the test where it needs to: +// auto heavy = definition::load("wagon").set("Param", "M", 60000).set("Brake", "BrakeValve", "ESt3"); +class definition { +public: + // tests/unit/data/.json + static definition load(std::string const &Name); + + // sets the key of the section, adding either one when it's missing + definition &set(std::string const &Section, std::string const &Key, nlohmann::ordered_json const &Value); + // drops the whole section, or one key of it + definition &remove(std::string const &Section); + definition &remove(std::string const &Section, std::string const &Key); + + // the definition in the form the game's vehicle loader reads + std::string text() const; + +private: + nlohmann::ordered_json m_sections; +}; + +// conditions the vehicle runs in: straight track of the given friction and gradient (rise/run) +struct track { + double friction{0.15}; + double gradient{0.0}; +}; + +// one vehicle created the way TDynamicObject::Init() creates it, from the given definition +class vehicle { +public: + explicit vehicle(definition const &Definition, double Velocity = 0.0, std::string const &Name = "test"); + + TMoverParameters &mover() { return *m_mover; } + TMoverParameters *operator->() { return m_mover.get(); } + + // keeps the brake pipe at the given pressure [bar], as a locomotive coupled to the vehicle would; + // a negative value leaves the pipe alone + void hold_brake_pipe(double Pressure) { m_pipepressure = Pressure; } + + // advances the physics by one step of Dt, the way the simulation loop does + void step(track const &Track = {}, double Dt = 0.01); + // advances the physics by Seconds in steps of Dt + void run(double Seconds, track const &Track = {}, double Dt = 0.01); + + // vehicle speed in kilometres per hour, negative when moving backwards + double speed() const { return m_mover->V * 3.6; } + +private: + std::unique_ptr m_mover; + double m_pipepressure{-1.0}; +}; + +} // namespace test From c7f979638732a03610765893bf82a240085787dc Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Fri, 16 Oct 2026 14:44:30 +0200 Subject: [PATCH 213/430] fix(ai): release horn when human driver takes over from AI (#210) * fix(ai): release what the AI was holding when the player takes over * fix(ai): keep the light selector lookup within its table, Sonar findings of the handover - the light selector size comes from the vehicle definition (LightsList Size) and isn't limited, while the table holds 18 positions; a bigger selector read past the table, and so did a table index other than the front or rear one. Only the positions the table holds are looked at now, and the selector stays where it is for a bad table index (cpp:S2259), - the lambdas of the handover capture what they use explicitly (cpp:S3608), - the chained assignments resetting the headlight state on the AI taking over are split (cpp:S1121). --- CMakeLists.txt | 1 + tests/unit/README.md | 3 + tests/unit/data/cab_vehicle.json | 34 +++++++ tests/unit/test_handover.cpp | 169 +++++++++++++++++++++++++++++++ vehicle/Driver.cpp | 73 ++++++++++++- vehicle/Driver.h | 2 + vehicle/handover.cpp | 76 ++++++++++++++ vehicle/handover.h | 33 ++++++ 8 files changed, 390 insertions(+), 1 deletion(-) create mode 100644 tests/unit/data/cab_vehicle.json create mode 100644 tests/unit/test_handover.cpp create mode 100644 vehicle/handover.cpp create mode 100644 vehicle/handover.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 22982e64d..477f584e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -461,6 +461,7 @@ set(CORE_SOURCES "utilities/parser.cpp" "utilities/utilities.cpp" "scripting/ladderlogic.cpp" +"vehicle/handover.cpp" ) add_library(eu07_core STATIC ${CORE_SOURCES}) target_link_libraries(eu07_core PUBLIC eu07_settings) diff --git a/tests/unit/README.md b/tests/unit/README.md index 5eebe563e..bca46e83b 100644 --- a/tests/unit/README.md +++ b/tests/unit/README.md @@ -52,6 +52,9 @@ TEST_CASE("brakes: service braking stops a heavier wagon too") { and a test on a half-defined vehicle tests the definition rather than the simulation. - The random numbers of the simulation are reseeded before every test case, so a test gives the same result alone or among the others. +- Logic which lives in classes too big to set up in a test (the AI driver, the cab) goes into free + functions on the vehicle state the class calls, and the test calls them the same way: see + `vehicle/handover.h`, which `TController::TakeControl()` uses, and `test_handover.cpp`. - `vehicle` creates the vehicle the way `TDynamicObject::Init()` does and steps it the way the simulation loop does, on a straight track of the given friction and gradient. Coupled vehicles aren't supported yet. diff --git a/tests/unit/data/cab_vehicle.json b/tests/unit/data/cab_vehicle.json new file mode 100644 index 000000000..7bb324216 --- /dev/null +++ b/tests/unit/data/cab_vehicle.json @@ -0,0 +1,34 @@ +{ + "_comment": "The wagon with the cab devices the driver uses: sandbox, light preset selector and modern headlight dimmer, both tables made after the Vectron's. No traction: enough for the logic of the cab controls.", + "Param": { "Category": "train", "M": 42200, "Vmax": 120, "SandCap": 500 }, + "Dimensions": { "L": 26.8, "H": 4.7, "W": 2.88, "Cx": 0.15 }, + "Wheels": { "D": 0.96, "Tw": 1.435, "Axle": "2'2'", "Ad": 2.5, "Bd": 19.5, "Rmin": 80, "BearingType": "Roll" }, + "Brake": { + "BrakeValve": "KE", "NBpA": 6, "MBF": 15, "MaxBP": 3.8, "TareMaxBP": 2.3, + "BCN": 12, "BCR": 0.127, "BCD": 0.04, "BCM": 1.5, "BCS": 1.2, "BSA": 0, "BM": "Disk1", "BVV": 125 + }, + "BuffCoupl": { "CType": "Screw", "kB": 9200, "DmaxB": 0.11, "FmaxB": 320, "kC": 4500, "DmaxC": 0.1, "FmaxC": 850, "beta": 0.58, "AllowedFlag": 115 }, + "Cntrl": { "BrakeSystem": "Pneumatic", "LocalBrake": "ManualBrake", "BrakeDelays": "P", "MaxBPMass": 63 }, + "Switches": { "ModernDimmer": "Yes" }, + "_lights": "light bits: 1 headlight left, 2 red marker left, 4 headlight upper, 16 headlight right, 32 red marker right", + "LightsList": { + "Size": 4, "Wrap": "No", "Default": 1, + "rows": [ + [0, 0], + [21, 34], + [34, 0], + [17, 0] + ] + }, + "_dimmer": "rows: high beam, dimmed, off", + "DimmerList": { + "Size": 5, "Cycle": "no", "DefaultPos": 3, + "rows": [ + ["yes", "no", "no"], + ["yes", "yes", "no"], + ["no", "no", "yes"], + ["no", "no", "no"], + ["no", "yes", "no"] + ] + } +} diff --git a/tests/unit/test_handover.cpp b/tests/unit/test_handover.cpp new file mode 100644 index 000000000..ff4a0df82 --- /dev/null +++ b/tests/unit/test_handover.cpp @@ -0,0 +1,169 @@ +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" + +#include "vehicle/handover.h" + +using test::definition; +using test::vehicle; + +// what the human driver gets when taking a vehicle over from the AI (Q key). the AI operates some controls +// directly and only the AI ever released them, so the player inherited e.g. a horn blowing forever. + +namespace { + +int const pc1{light::headlight_left | light::headlight_upper | light::headlight_right}; +int const allheadlights{pc1 | light::redmarker_left | light::redmarker_right}; + +vehicle cab_vehicle() { + vehicle cab{definition::load("cab_vehicle")}; + cab->DirActive = 1; // the AI drives: reverser set + return cab; +} + +} // namespace + +TEST_CASE("handover: the horn the AI was sounding goes quiet (eu07/maszyna#511)") { + auto cab{cab_vehicle()}; + SUBCASE("low tone") { cab->WarningSignal = 1; } + SUBCASE("high tone") { cab->WarningSignal = 2; } + SUBCASE("both tones") { cab->WarningSignal = 1 | 2; } + REQUIRE(cab->WarningSignal != 0); + + handover::release_ai_controls(cab.mover(), cab.mover()); + + CHECK(cab->WarningSignal == 0); +} + +TEST_CASE("handover: sanding the AI started stops") { + auto cab{cab_vehicle()}; + cab->Sandbox(true); // the way the AI sands, bypassing the sanding button + REQUIRE(cab->SandDose); + + handover::release_ai_controls(cab.mover(), cab.mover()); + + CHECK_FALSE(cab->SandDose); +} + +TEST_CASE("handover: sanding the player or the automatic system asked for goes on") { + auto cab{cab_vehicle()}; + SUBCASE("sanding button held") { cab->SandboxManual(true); } + SUBCASE("automatic sanding") { + cab->SandboxAutoAllow(true); + cab->SandboxAuto(true); + } + REQUIRE(cab->SandDose); + + handover::release_ai_controls(cab.mover(), cab.mover()); + + CHECK(cab->SandDose); +} + +TEST_CASE("handover: the departure signal the AI was giving stops") { + auto cab{cab_vehicle()}; + cab->signal_departure(true); + REQUIRE(cab->DepartureSignal); + + handover::release_ai_controls(cab.mover(), cab.mover()); + + CHECK_FALSE(cab->DepartureSignal); +} + +TEST_CASE("handover: the brake releaser the AI was holding lets go") { + auto cab{cab_vehicle()}; + cab->BrakeReleaser(1); + REQUIRE(cab->Hamulec->Releaser()); + + handover::release_ai_controls(cab.mover(), cab.mover()); + + CHECK_FALSE(cab->Hamulec->Releaser()); +} + +TEST_CASE("handover: nothing the AI didn't latch changes") { + auto cab{cab_vehicle()}; + + handover::release_ai_controls(cab.mover(), cab.mover()); + + CHECK(cab->WarningSignal == 0); + CHECK_FALSE(cab->SandDose); + CHECK_FALSE(cab->DepartureSignal); + CHECK_FALSE(cab->Hamulec->Releaser()); +} + +TEST_CASE("handover: the light selector moves to the position giving the head lights the AI has set") { + auto cab{cab_vehicle()}; + REQUIRE(cab->LightsPos == 1); // untouched selector: lights off + + SUBCASE("Pc1") { + CHECK(handover::light_selector_position(cab.mover(), end::front, pc1, allheadlights) == 2); + } + SUBCASE("lights off") { + CHECK(handover::light_selector_position(cab.mover(), end::front, 0, allheadlights) == 1); + } + SUBCASE("vehicle without the upper headlight, which the AI's Pc1 can't light") { + auto const inventory{allheadlights & ~light::headlight_upper}; + CHECK(handover::light_selector_position(cab.mover(), end::front, pc1 & inventory, inventory) == 2); + } + SUBCASE("no position matches: the selector stays") { + CHECK(handover::light_selector_position(cab.mover(), end::front, light::headlight_left, allheadlights) == 1); + } +} + +TEST_CASE("handover: the light selector stays within its table") { + auto cab{cab_vehicle()}; + + SUBCASE("selector bigger than the table, as a vehicle definition can declare") { + // only the positions the table holds are looked at, the rest can't match + for (auto &table : cab->Lights) { + std::fill(std::begin(table) + cab->LightsPosNo, std::end(table), 0); + } + cab->LightsPosNo = 100; + CHECK(handover::light_selector_position(cab.mover(), end::front, pc1, allheadlights) == 2); + CHECK(handover::light_selector_position(cab.mover(), end::front, light::headlight_left, allheadlights) == 1); + } + SUBCASE("table other than the front or rear one: the selector stays") { + CHECK(handover::light_selector_position(cab.mover(), -1, pc1, allheadlights) == 1); + CHECK(handover::light_selector_position(cab.mover(), 2, pc1, allheadlights) == 1); + } +} + +TEST_CASE("handover: the light selector already matching the lights stays") { + auto cab{cab_vehicle()}; + cab->LightsPos = 2; // Pc1 + + CHECK(handover::light_selector_position(cab.mover(), end::front, pc1, allheadlights) == 2); +} + +TEST_CASE("handover: the headlight dimmer leaves the off position when the head lights are lit") { + auto cab{cab_vehicle()}; + REQUIRE(cab->enableModernDimmer); + REQUIRE(cab->dimPositions.size() == 5); + cab->modernDimmerPosition = 2; // off, left there by the player before the AI took over + + SUBCASE("to the default position") { + CHECK(handover::dimmer_position(cab.mover(), true) == 3); + } + SUBCASE("to the first regular position, when the default one is off as well") { + cab->modernDimmerDefaultPosition = 2; + CHECK(handover::dimmer_position(cab.mover(), true) == 3); + } + SUBCASE("unless the head lights are off anyway") { + CHECK(handover::dimmer_position(cab.mover(), false) == 2); + } +} + +TEST_CASE("handover: the headlight dimmer in any other position stays") { + auto cab{cab_vehicle()}; + for (auto const position : {0, 1, 3, 4}) { + CAPTURE(position); + cab->modernDimmerPosition = position; + CHECK(handover::dimmer_position(cab.mover(), true) == position); + } +} + +TEST_CASE("handover: a vehicle without the modern dimmer keeps its dimmer state") { + vehicle wagon{definition::load("wagon")}; + REQUIRE_FALSE(wagon->enableModernDimmer); + + CHECK(handover::dimmer_position(wagon.mover(), true) == wagon->modernDimmerPosition); +} diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 75bbb29e4..5bbaa80e3 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -19,6 +19,7 @@ http://mozilla.org/MPL/2.0/. #include "utilities/translation.h" #include "utilities/Logs.h" #include "vehicle/Train.h" +#include "vehicle/handover.h" #include "world/mtable.h" #include "vehicle/DynObj.h" #include "world/Event.h" @@ -5561,6 +5562,12 @@ void TController::TakeControl( bool const Aidriver, bool const Forcevehiclecheck { // teraz AI prowadzi AIControllFlag = AIdriver; pVehicle->Controller = AIdriver; + // the AI doesn't operate the headlight dimmer, drop the state left by the human driver + // so the lights set by the AI aren't hidden (dimmer in off position) or dimmed + pVehicle->HeadlightsAoff = false; + pVehicle->HeadlightsBoff = false; + pVehicle->DimHeadlights = false; + pVehicle->HighBeamLights = false; control_lights(); // reinicjalizacja swiatel mvOccupied->CabActivisation(true); iDirection = 0; // kierunek jazdy trzeba dopiero zgadnąć @@ -5598,10 +5605,23 @@ void TController::TakeControl( bool const Aidriver, bool const Forcevehiclecheck } else { // a teraz użytkownik - if (!is_train() || !is_car()) // gasimy swiatla jesli przejmujemy odstawione + if (eAction == TAction::actSleep || OrderCurrentGet() == Wait_for_orders) // gasimy swiatla jesli przejmujemy odstawione pVehicle->RaLightsSet(0, 0); + auto const aiwasdriving { AIControllFlag == AIdriver }; + if( aiwasdriving ) { + // the horn, sandbox, departure signal and brake releaser the AI may have latched are momentary for the human driver + handover::release_ai_controls( *mvOccupied, *mvControlling ); + fWarningDuration = 0.0; + remove_hint( driver_hint::hornon ); + // the AI sets the lights directly, leave the selector in matching position so it doesn't revert them later + sync_lights_selector(); + } AIControllFlag = Humandriver; pVehicle->Controller = Humandriver; + if( aiwasdriving ) { + // same with the headlight dimmer, which is only applied for the human driver + sync_lights_dimmer(); + } if( eAction == TAction::actSleep ) { eAction = TAction::actUnknown; } @@ -6329,6 +6349,57 @@ TController::control_handles() { } } // enginetype } +// moves the light preset selector to the position matching the lights set directly by the AI, +// otherwise the next SetLights() call (e.g. from CheckVehicles()) reverts them to the untouched selector position +void +TController::sync_lights_selector() { + + if( mvOccupied->LightsPosNo <= 0 ) { return; } + + auto const *headvehicle { pVehicles[ end::front ] }; + if( headvehicle == nullptr ) { return; } + // same choice of the light table as in TDynamicObject::SetLights() + auto const lightstable { ( mvOccupied->CabOccupied * pVehicle->DirectionGet() >= 0 ? end::front : end::rear ) }; + // same choice of the lit vehicle end as in TDynamicObject::RaLightsSet() + auto const headend { ( headvehicle->iDirection > 0 ? end::front : end::rear ) }; + auto const position { handover::light_selector_position( + *mvOccupied, lightstable, headvehicle->MoverParameters->iLights[ headend ], headvehicle->LightList( headend ) ) }; + if( position == mvOccupied->LightsPos ) { return; } + + mvOccupied->LightsPos = position; + // visual feedback + auto *train { simulation::Trains.find( pVehicle->name() ) }; + if( train != nullptr ) { + train->ggLightsButton.PutValue( static_cast( position - 1 ) ); + } +} + +// re-applies the headlight dimmer state after the AI handed the vehicle over to the human driver, +// moving the dimmer out of the off position if it'd hide the head lights set by the AI +void +TController::sync_lights_dimmer() { + + if( mvOccupied->dimPositions.empty() ) { return; } + + auto const *headvehicle { pVehicles[ end::front ] }; + auto const headend { ( headvehicle != nullptr && headvehicle->iDirection > 0 ? end::front : end::rear ) }; + auto const headlightson { + headvehicle != nullptr + && ( headvehicle->MoverParameters->iLights[ headend ] & ( light::headlight_left | light::headlight_right | light::headlight_upper ) ) != 0 }; + + auto const position { handover::dimmer_position( *mvOccupied, headlightson ) }; + if( position != mvOccupied->modernDimmerPosition ) { + mvOccupied->modernDimmerPosition = position; + // visual feedback + auto *train { simulation::Trains.find( pVehicle->name() ) }; + if( train != nullptr ) { + train->ggModernLightDimSw.PutValue( static_cast( position ) ); + } + } + if( position < 0 || position >= static_cast( mvOccupied->dimPositions.size() ) ) { return; } // SetLightDimmings() doesn't check the range + pVehicle->SetLightDimmings(); +} + // activate consist lamp codes void TController::control_lights() { diff --git a/vehicle/Driver.h b/vehicle/Driver.h index da14b1b34..f88e115ac 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -324,6 +324,8 @@ private: void control_security_system( double const Timedelta ); void control_handles(); void control_lights(); + void sync_lights_selector(); + void sync_lights_dimmer(); void control_compartment_lights(); void control_doors(); void UpdateCommand(); diff --git a/vehicle/handover.cpp b/vehicle/handover.cpp new file mode 100644 index 000000000..a36ccde81 --- /dev/null +++ b/vehicle/handover.cpp @@ -0,0 +1,76 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "vehicle/handover.h" + +#include "McZapkie/MOVER.h" + +namespace handover { + +void release_ai_controls(TMoverParameters &Occupied, TMoverParameters &Controlling) { + // the AI's hornoff action touches the horn only while the AI drives + Occupied.WarningSignal = 0; + // the AI drives the sandbox directly, bypassing the manual and automatic sanding states + if (Controlling.SandDose && false == (Controlling.SandDoseManual || Controlling.SandDoseAuto)) { + Controlling.Sandbox(false); + } + if (Occupied.DepartureSignal) { + Occupied.signal_departure(false); + } + if (Occupied.Hamulec->Releaser()) { + Occupied.BrakeReleaser(0); + } +} + +int light_selector_position(TMoverParameters const &Occupied, int const Lightstable, int const Headlights, int const Inventory) { + // the selector size comes from the vehicle definition, the table holds a fixed number of positions + auto const positioncount{std::min(Occupied.LightsPosNo, static_cast(std::size(Occupied.Lights[0])))}; + if (positioncount <= 0 || Lightstable < 0 || Lightstable >= static_cast(std::size(Occupied.Lights))) { + return Occupied.LightsPos; + } + auto const &lights{Occupied.Lights[Lightstable]}; + auto const lightsmatch{[&lights, Inventory, Headlights](int const Position) { return (lights[Position - 1] & Inventory) == Headlights; }}; + if (Occupied.LightsPos >= 1 && Occupied.LightsPos <= positioncount && lightsmatch(Occupied.LightsPos)) { + return Occupied.LightsPos; + } + for (auto position = 1; position <= positioncount; ++position) { + if (lightsmatch(position)) { + return position; + } + } + return Occupied.LightsPos; +} + +int dimmer_position(TMoverParameters const &Occupied, bool const Headlightson) { + auto const &positions{Occupied.dimPositions}; + auto const current{Occupied.modernDimmerPosition}; + auto const count{static_cast(positions.size())}; + auto const isoff{[&positions, count](int const Position) { return Position < 0 || Position >= count || positions[Position].isOff; }}; + + if (false == Occupied.enableModernDimmer || false == Headlightson || false == isoff(current)) { + return current; + } + if (false == isoff(Occupied.modernDimmerDefaultPosition)) { + return Occupied.modernDimmerDefaultPosition; + } + for (auto position = 0; position < count; ++position) { + if (false == (positions[position].isOff || positions[position].isDimmed || positions[position].isHighBeam)) { + return position; + } + } + for (auto position = 0; position < count; ++position) { + if (false == positions[position].isOff) { + return position; + } + } + return current; +} + +} // namespace handover diff --git a/vehicle/handover.h b/vehicle/handover.h new file mode 100644 index 000000000..32ed57d0a --- /dev/null +++ b/vehicle/handover.h @@ -0,0 +1,33 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +class TMoverParameters; + +// what changes about a vehicle when the AI hands it over to the human driver. the AI operates some +// controls directly, bypassing the cab controls a human uses, and only the AI ever releases them; +// the human gets them in the state matching the cab controls instead. +namespace handover { + +// releases what the AI latches, but which is held only while pressed for the human driver: +// the horn, the sandbox, the departure signal and the brake releaser +void release_ai_controls(TMoverParameters &Occupied, TMoverParameters &Controlling); + +// position of the light preset selector [1..LightsPosNo] for the human driver: the current one when it +// gives the head lights the AI has set, else the first one which does, else the current one. +// Lightstable is the end of the selector's table in use, Inventory the lights the head end has +int light_selector_position(TMoverParameters const &Occupied, int Lightstable, int Headlights, int Inventory); + +// position of the headlight dimmer for the human driver: the current one, unless it's the off position +// which would hide the head lights the AI has lit. then the default one, else the first regular one, +// else any other than off +int dimmer_position(TMoverParameters const &Occupied, bool Headlightson); + +} // namespace handover From 04af7d57581cea610f89ed392df68931a619e0e1 Mon Sep 17 00:00:00 2001 From: maj00r Date: Wed, 21 Oct 2026 21:11:38 +0200 Subject: [PATCH 214/430] fix(python): stop python workers before destroying windows on exit --- application/application.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/application.cpp b/application/application.cpp index 8afd50db2..119cb021e 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -701,11 +701,12 @@ void eu07_application::exit() ui_layer::shutdown(); + // the python workers detach their GL context on the way out, so they have to be done before the windows they use are destroyed + m_taskqueue.exit(); for (auto *window : m_windows) { glfwDestroyWindow(window); } - m_taskqueue.exit(); glfwPollEvents(); // TODO: This fixes a segfault on Wayland when closing. Remove after updating glfw to 3.5. glfwTerminate(); From 86069c5eaba8700ff7f8b38bf4ee562421e85889 Mon Sep 17 00:00:00 2001 From: Sebastian Krzyszkowiak Date: Tue, 7 Jul 2026 01:45:05 +0200 Subject: [PATCH 215/430] utilities: XYZtoRGB: Use sRGB colorspace It used Adobe RGB matrix depite of nothing else using Adobe RGB in the pipeline. --- utilities/color.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utilities/color.h b/utilities/color.h index be853a3d4..bbf17e096 100644 --- a/utilities/color.h +++ b/utilities/color.h @@ -15,9 +15,9 @@ glm::vec3 XYZtoRGB( glm::vec3 const &XYZ ) { // M^-1 for Adobe RGB from http://www.brucelindbloom.com/Eqn_RGB_XYZ_Matrix.html - float const mi[ 3 ][ 3 ] = { 2.041369f, -0.969266f, 0.0134474f, -0.5649464f, 1.8760108f, -0.1183897f, -0.3446944f, 0.041556f, 1.0154096f }; +// float const mi[ 3 ][ 3 ] = { 2.041369f, -0.969266f, 0.0134474f, -0.5649464f, 1.8760108f, -0.1183897f, -0.3446944f, 0.041556f, 1.0154096f }; // m^-1 for sRGB: -// float const mi[ 3 ][ 3 ] = { 3.240479f, -0.969256f, 0.055648f, -1.53715f, 1.875991f, -0.204043f, -0.49853f, 0.041556f, 1.057311f }; + float const mi[ 3 ][ 3 ] = { 3.240479f, -0.969256f, 0.055648f, -1.53715f, 1.875991f, -0.204043f, -0.49853f, 0.041556f, 1.057311f }; return glm::vec3{ XYZ.x*mi[ 0 ][ 0 ] + XYZ.y*mi[ 1 ][ 0 ] + XYZ.z*mi[ 2 ][ 0 ], From 842b768803c0499048360680ae5f6d6437c98609 Mon Sep 17 00:00:00 2001 From: Sebastian Krzyszkowiak Date: Tue, 7 Jul 2026 01:45:59 +0200 Subject: [PATCH 216/430] simulationenvironment: Adjust turbidity values Turbidity 3 breaks the model at night. Adjust the values to have them work well all the time and to maximize variation between cloud states. --- simulation/simulationenvironment.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/simulation/simulationenvironment.cpp b/simulation/simulationenvironment.cpp index 14ad2353c..0c1ec44b4 100644 --- a/simulation/simulationenvironment.cpp +++ b/simulation/simulationenvironment.cpp @@ -68,15 +68,15 @@ world_environment::compute_weather() const { Global.AirTemperature > 1 ? "rain:" : "snow:"; - Global.fTurbidity = Global.Overcast <= 0.10 ? 3 : + Global.fTurbidity = Global.Overcast <= 0.10 ? 4 : Global.Overcast <= 0.20 ? 4 : Global.Overcast <= 0.30 ? 5 : Global.Overcast <= 0.40 ? 5 : - Global.Overcast <= 0.50 ? 5 : - Global.Overcast <= 0.60 ? 5 : - Global.Overcast <= 0.70 ? 6 : - Global.Overcast <= 0.80 ? 7 : - Global.Overcast <= 0.90 ? 8 : + Global.Overcast <= 0.50 ? 6 : + Global.Overcast <= 0.60 ? 6 : + Global.Overcast <= 0.70 ? 7 : + Global.Overcast <= 0.80 ? 8 : + Global.Overcast <= 0.90 ? 9 : 9; } From ba405858e16a88ec5c0c9acb4dc0086dad13bfdd Mon Sep 17 00:00:00 2001 From: Sebastian Krzyszkowiak Date: Tue, 27 Oct 2026 01:00:52 +0100 Subject: [PATCH 217/430] opengl33renderer: Fix up the sizes of Sun and Moon Although the used value makes some physical sense, it fails to take FoV effect into account, leading to both Sun and Moon becoming comically tiny. Revert the sizes to the ones used by the legacy renderer, which makes them appear much more plausible. --- rendering/opengl33renderer.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index d20454c35..9d4318981 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -2028,12 +2028,12 @@ bool opengl33_renderer::Render(world_environment *Environment) glm::vec4 color(suncolor.x, suncolor.y, suncolor.z, std::clamp(1.5f - Global.Overcast, 0.f, 1.f) * fogfactor); auto const sunvector = Environment->m_sun.getDirection(); - /*float const size = std::lerp( // TODO: expose distance/scale factor from the moon object + float const size = std::lerp( // TODO: expose distance/scale factor from the moon object 0.0325f, 0.0275f, - std::clamp( Environment->m_sun.getAngle(), 0.f, 90.f ) / 90.f );*/ + std::clamp( Environment->m_sun.getAngle(), 0.f, 90.f ) / 90.f ); model_ubs.param[0] = color; - model_ubs.param[1] = glm::vec4(glm::vec3(modelview * glm::vec4(sunvector, 1.0f)), 0.00463f /* size */); + model_ubs.param[1] = glm::vec4(glm::vec3(modelview * glm::vec4(sunvector, 1.0f)), size); model_ubs.param[2] = glm::vec4(0.0f, 1.0f, 1.0f, 0.0f); model_ubo->update(model_ubs); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); @@ -2104,14 +2104,13 @@ bool opengl33_renderer::Render(world_environment *Environment) moonu = 0.0f; } - /* float const size = std::lerp( // TODO: expose distance/scale factor from the moon object 0.0160f, 0.0135f, - std::clamp( Environment->m_moon.getAngle(), 0.f, 90.f ) / 90.f );*/ + std::clamp( Environment->m_moon.getAngle(), 0.f, 90.f ) / 90.f ); model_ubs.param[0] = color; - model_ubs.param[1] = glm::vec4(glm::vec3(modelview * glm::vec4(moonvector, 1.0f)), 0.00451f /* size */); + model_ubs.param[1] = glm::vec4(glm::vec3(modelview * glm::vec4(moonvector, 1.0f)), size); model_ubs.param[2] = glm::vec4(moonu, moonv, 0.333f, 0.0f); model_ubo->update(model_ubs); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); From 5fa03304eff805ca5bbe4dce8dfeebdd40c0250a Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 31 Oct 2026 00:45:46 +0100 Subject: [PATCH 218/430] fix(ui): keep panels in the main window when resizing them at the screen edge Pulling a panel's grip into the corner of the screen pushed it a couple of pixels past the main window, and ImGui gave it an OS window of its own. Now a panel only comes out when dragged with the cursor outside the main window. A panel that stays in the main window needs its grips in reach, so a resize stops at the edge, and a panel left past the edge or too big for the window is moved back and shrunk to fit. This is a new io.ConfigViewportsNoAutoDetach option in our copy of ImGui, so it has to be carried over when ImGui gets updated. ImGui itself has no option for this, as of 1.93.1. --- application/uilayer.cpp | 2 ++ imgui/imgui.cpp | 58 +++++++++++++++++++++++++++++++++++++++-- imgui/imgui.h | 1 + 3 files changed, 59 insertions(+), 2 deletions(-) diff --git a/application/uilayer.cpp b/application/uilayer.cpp index 2dd771bdd..893b84e92 100644 --- a/application/uilayer.cpp +++ b/application/uilayer.cpp @@ -403,6 +403,8 @@ bool ui_layer::init(GLFWwindow *Window) { m_imguiio->ConfigFlags |= ImGuiConfigFlags_ViewportsEnable; m_imguiio->ConfigViewportsNoTaskBarIcon = true; + // only dragging a panel with the cursor past the main window takes it out, not resizing it or placing it at the edge + m_imguiio->ConfigViewportsNoAutoDetach = true; auto &platformio{ImGui::GetPlatformIO()}; imgui_create_window = platformio.Platform_CreateWindow; platformio.Platform_CreateWindow = create_viewport_window; diff --git a/imgui/imgui.cpp b/imgui/imgui.cpp index 573efe244..a9026b408 100644 --- a/imgui/imgui.cpp +++ b/imgui/imgui.cpp @@ -1294,6 +1294,7 @@ static void WindowSelectViewport(ImGuiWindow* window); static void WindowSyncOwnedViewport(ImGuiWindow* window, ImGuiWindow* parent_window_in_stack); static bool UpdateTryMergeWindowIntoHostViewport(ImGuiWindow* window, ImGuiViewportP* host_viewport); static bool UpdateTryMergeWindowIntoHostViewports(ImGuiWindow* window); +static bool WindowStaysInHostViewport(ImGuiWindow* window, ImGuiViewportP* viewport); // MaSzyna addition static bool GetWindowAlwaysWantOwnViewport(ImGuiWindow* window); static int FindPlatformMonitorForPos(const ImVec2& pos); static int FindPlatformMonitorForRect(const ImRect& r); @@ -1489,6 +1490,7 @@ ImGuiIO::ImGuiIO() ConfigViewportsNoTaskBarIcon = false; ConfigViewportsNoDecoration = true; ConfigViewportsNoDefaultParent = false; + ConfigViewportsNoAutoDetach = false; // Miscellaneous options MouseDrawCursor = false; @@ -6845,6 +6847,11 @@ static int ImGui::UpdateWindowManualResize(ImGuiWindow* window, const ImVec2& si ImVec2 pos_target(FLT_MAX, FLT_MAX); ImVec2 size_target(FLT_MAX, FLT_MAX); + // MaSzyna addition: a resize stops at the edge of the host viewport, so the grips and borders can still be reached + ImRect resize_limit_rect(-FLT_MAX, -FLT_MAX, +FLT_MAX, +FLT_MAX); + if (!window->ViewportOwned && WindowStaysInHostViewport(window, window->Viewport)) + resize_limit_rect = window->Viewport->GetWorkRect(); + // Clip mouse interaction rectangles within the viewport rectangle (in practice the narrowing is going to happen most of the time). // - Not narrowing would mostly benefit the situation where OS windows _without_ decoration have a threshold for hovering when outside their limits. // This is however not the case with current backends under Win32, but a custom borderless window implementation would benefit from it. @@ -6892,6 +6899,7 @@ static int ImGui::UpdateWindowManualResize(ImGuiWindow* window, const ImVec2& si ImVec2 clamp_max = ImVec2(def.CornerPosN.x == 0.0f ? clamp_rect.Max.x : +FLT_MAX, def.CornerPosN.y == 0.0f ? clamp_rect.Max.y : +FLT_MAX); ImVec2 corner_target = g.IO.MousePos - g.ActiveIdClickOffset + ImLerp(def.InnerDir * grip_hover_outer_size, def.InnerDir * -grip_hover_inner_size, def.CornerPosN); // Corner of the window corresponding to our corner grip corner_target = ImClamp(corner_target, clamp_min, clamp_max); + corner_target = ImClamp(corner_target, resize_limit_rect.Min, resize_limit_rect.Max); CalcResizePosSizeFromAnyCorner(window, corner_target, def.CornerPosN, &pos_target, &size_target); } @@ -6971,6 +6979,7 @@ static int ImGui::UpdateWindowManualResize(ImGuiWindow* window, const ImVec2& si ImVec2 clamp_min(border_n == ImGuiDir_Right ? clamp_rect.Min.x : -FLT_MAX, border_n == ImGuiDir_Down || (border_n == ImGuiDir_Up && window_move_from_title_bar) ? clamp_rect.Min.y : -FLT_MAX); ImVec2 clamp_max(border_n == ImGuiDir_Left ? clamp_rect.Max.x : +FLT_MAX, border_n == ImGuiDir_Up ? clamp_rect.Max.y : +FLT_MAX); border_target = ImClamp(border_target, clamp_min, clamp_max); + border_target[axis] = ImClamp(border_target[axis], resize_limit_rect.Min[axis], resize_limit_rect.Max[axis]); if (flags & ImGuiWindowFlags_ChildWindow) // Clamp resizing of childs within parent { ImGuiWindow* parent_window = window->ParentWindow; @@ -7056,6 +7065,30 @@ static inline void ClampWindowPos(ImGuiWindow* window, const ImRect& visibility_ window->Pos = ImClamp(window->Pos, visibility_rect.Min - size_for_clamping, visibility_rect.Max); } +// MaSzyna addition: see io.ConfigViewportsNoAutoDetach +static inline bool IsWindowBeingMoved(ImGuiWindow* window) +{ + ImGuiContext& g = *GImGui; + return g.MovingWindow != NULL && g.MovingWindow->RootWindowDockTree == window->RootWindowDockTree; +} + +// MaSzyna addition: a window left past the edge of its host viewport would have its grips and borders out of reach +static inline void KeepWindowInsideRect(ImGuiWindow* window, const ImRect& rect) +{ + if (rect.GetWidth() <= 0.0f || rect.GetHeight() <= 0.0f) + return; + + if (!(window->Flags & (ImGuiWindowFlags_NoResize | ImGuiWindowFlags_AlwaysAutoResize))) + { + const ImVec2 size_full = ImMin(window->SizeFull, rect.GetSize()); + if (size_full.x != window->SizeFull.x || size_full.y != window->SizeFull.y) + ImGui::MarkIniSettingsDirty(window); + window->SizeFull = size_full; + window->Size = ImMin(window->Size, rect.GetSize()); + } + window->Pos = ImMax(ImMin(window->Pos, rect.Max - window->Size), rect.Min); +} + static void RenderWindowOuterSingleBorder(ImGuiWindow* window, int border_n, ImU32 border_col, float border_size) { const ImGuiResizeBorderDef& def = resize_border_def[border_n]; @@ -7828,7 +7861,7 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags) // Late create viewport if we don't fit within our current host viewport. if (window->ViewportAllowPlatformMonitorExtend >= 0 && !window->ViewportOwned && !(window->Viewport->Flags & ImGuiViewportFlags_IsMinimized)) - if (!window->Viewport->GetMainRect().Contains(window->Rect())) + if (!window->Viewport->GetMainRect().Contains(window->Rect()) && !WindowStaysInHostViewport(window, window->Viewport)) { // This is based on the assumption that the DPI will be known ahead (same as the DPI of the selection done in UpdateSelectWindowViewport) //ImGuiViewport* old_viewport = window->Viewport; @@ -7878,6 +7911,11 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags) ClampWindowPos(window, visibility_rect); } } + + // MaSzyna addition: the host window of a floating dock node has its position set through the api, it's free to move all the same + if (!window->ViewportOwned && !IsWindowBeingMoved(window) && (!window_pos_set_by_api || (flags & ImGuiWindowFlags_DockNodeHost)) && WindowStaysInHostViewport(window, window->Viewport)) + KeepWindowInsideRect(window, viewport_work_rect); + window->Pos = ImTrunc(window->Pos); // Lock window rounding for the frame (so that altering them doesn't cause inconsistencies) @@ -15780,6 +15818,22 @@ static bool ImGui::GetWindowAlwaysWantOwnViewport(ImGuiWindow* window) return false; } +// MaSzyna addition: see io.ConfigViewportsNoAutoDetach +static bool ImGui::WindowStaysInHostViewport(ImGuiWindow* window, ImGuiViewportP* viewport) +{ + ImGuiContext& g = *GImGui; + if (!g.IO.ConfigViewportsNoAutoDetach) + return false; + + const ImGuiWindowFlags not_affected_flags = ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_Popup | ImGuiWindowFlags_Tooltip; + if (window->Flags & not_affected_flags) + return false; + + if (!IsWindowBeingMoved(window) || !IsMousePosValid()) + return true; + return viewport->GetMainRect().Contains(g.IO.MousePos); +} + static bool ImGui::UpdateTryMergeWindowIntoHostViewport(ImGuiWindow* window, ImGuiViewportP* viewport) { ImGuiContext& g = *GImGui; @@ -16323,7 +16377,7 @@ static void ImGui::WindowSelectViewport(ImGuiWindow* window) // Fallback: merge in default viewport if z-order matches, otherwise create a new viewport if (window->Viewport == NULL) if (!UpdateTryMergeWindowIntoHostViewport(window, main_viewport)) - window->Viewport = AddUpdateViewport(window, window->ID, window->Pos, window->Size, ImGuiViewportFlags_None); + window->Viewport = WindowStaysInHostViewport(window, main_viewport) ? main_viewport : AddUpdateViewport(window, window->ID, window->Pos, window->Size, ImGuiViewportFlags_None); // Mark window as allowed to protrude outside of its viewport and into the current monitor if (!lock_viewport) diff --git a/imgui/imgui.h b/imgui/imgui.h index bafe97ff8..6bbc42dec 100644 --- a/imgui/imgui.h +++ b/imgui/imgui.h @@ -2360,6 +2360,7 @@ struct ImGuiIO bool ConfigViewportsNoTaskBarIcon; // = false // Disable default OS task bar icon flag for secondary viewports. When a viewport doesn't want a task bar icon, ImGuiViewportFlags_NoTaskBarIcon will be set on it. bool ConfigViewportsNoDecoration; // = true // Disable default OS window decoration flag for secondary viewports. When a viewport doesn't want window decorations, ImGuiViewportFlags_NoDecoration will be set on it. Enabling decoration can create subsequent issues at OS levels (e.g. minimum window size). bool ConfigViewportsNoDefaultParent; // = false // Disable default OS parenting to main viewport for secondary viewports. By default, viewports are marked with ParentViewportId = , expecting the platform backend to setup a parent/child relationship between the OS windows (some backend may ignore this). Set to true if you want the default to be 0, then all viewports will be top-level OS windows. + bool ConfigViewportsNoAutoDetach; // = false // MaSzyna addition: a floating window stays inside its host viewport: a resize stops at its edge, and a window left past it, or too big for it, is moved and shrunk to fit. It gets a viewport of its own only when dragged with the mouse cursor past the host viewport. Popups and tooltips are not affected. // Miscellaneous options // (you can visualize and interact with all options in 'Demo->Configuration') From e5266e1e6b025e5b7c53c8e02083b0e747acaebf Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 31 Oct 2026 15:47:10 +0100 Subject: [PATCH 219/430] feat(track): track unevenness declared in the track entry Usage, optional attributes of a track entry, before endtrack: uneven peak deviation of a rail on a 10 m chord, 0-100; normal and switch unevenup up and down alone, instead of uneven; normal and switch unevenside sideways alone, instead of uneven; normal and switch unevencross cross level alone, instead of uneven; normal only jointdip depth of the dip at rail joints, every sound distance; normal only, default 0.4 of the up and down component Values of uneven follow PLK Id-14 appendix 1: 6 mm is the limit at 160 km/h, 10 at 120, 18 at 80, 35 at 40; half of it for a track in a good state. Example: uneven 18 unevencross 25 jointdip 6 endtrack The same fields are in the editor, track panel, section Ride and sound. See track_uneven_doc.md. The unevenness is a displacement field over the plan of the scenery, with no random numbers: one place strays the same every time, and joined tracks, the paths of a switch, sleepermodel and axles at one place move together. Tracks meet at a joint at the lower of their values. Joined switches take the lowest of theirs, the tracks joined to them come to it, and a track with none of a component keeps the switch to its design in it. The clatter comes from the dipping joints. Curve radius and grade for the physics stay as designed. Tracks with it get geometry every 2 m on straights: 4x the vertices on Baltyk with all tracks flagged, 0.2 ms more per frame on td.scn. --- application/editormodetrack.cpp | 30 ++++- editor/editorTrack.cpp | 20 +++ editor/editorTrack.hpp | 5 + lang/editor_pl.po | 24 ++++ tests/unit/test_track_uneven.cpp | 152 ++++++++++++++++++++++ track_uneven_doc.md | 81 ++++++++++++ vehicle/DynObj.cpp | 23 +++- vehicle/DynObj.h | 1 + world/Segment.cpp | 54 ++++++++ world/Segment.h | 14 +++ world/Track.cpp | 208 +++++++++++++++++++++++++++++++ world/Track.h | 32 +++++ world/TrackUneven.h | 125 +++++++++++++++++++ world/TrkFoll.cpp | 5 + world/TrkFoll.h | 4 + 15 files changed, 774 insertions(+), 4 deletions(-) create mode 100644 tests/unit/test_track_uneven.cpp create mode 100644 track_uneven_doc.md create mode 100644 world/TrackUneven.h diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 0b264b784..5b048396f 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -1159,7 +1159,35 @@ void editor_mode::render_path_parameters(TTrack &Track) finish_edit(rebuild::none); ImGui::InputFloat(STR_C("Sound distance"), &track->fSoundDistance, 0.0f, 0.0f, "%.1f"); item_tooltip("Distance between the rail joints in metres, sets the rhythm of the wheel clatter; -1: the default"); - finish_edit(rebuild::none); + finish_edit(rebuild::parameters); + if ((track->eType == tt_Normal || track->eType == tt_Switch) && (track->iCategoryFlag & 15) == 1) + { + if (ImGui::InputFloat(STR_C("Unevenness (mm)"), &track->m_uneven, 0.0f, 0.0f, "%.1f")) + track->m_uneven = std::clamp(track->m_uneven, 0.f, track_uneven::most); + item_tooltip("Peak deviation of a rail on a 10 m chord. Id-14 limits: 6 mm at 160 km/h, 10 at 120, 18 at 80, 35 at 40.\nWith a sound distance set, the rails also dip at the joints. Joined switches use the lowest of their values"); + finish_edit(rebuild::parameters); + struct component + { + char const *label; + float *value; + }; + for (auto const &part : {component{"Up and down (mm)", &track->m_unevenup}, component{"Sideways (mm)", &track->m_unevenside}, component{"Cross level (mm)", &track->m_unevencross}}) + { + if (part.value == &track->m_unevencross && track->eType != tt_Normal) + continue; + if (ImGui::InputFloat(STR_C(part.label), part.value, 0.0f, 0.0f, "%.1f")) + *part.value = *part.value < 0.f ? -1.f : std::min(*part.value, track_uneven::most); + item_tooltip("Set apart from the unevenness, mm. Negative: the unevenness"); + finish_edit(rebuild::parameters); + } + } + if (track->eType == tt_Normal && (track->iCategoryFlag & 15) == 1) + { + if (ImGui::InputFloat(STR_C("Dip at rail joints (mm)"), &track->m_jointdip, 0.0f, 0.0f, "%.1f")) + track->m_jointdip = track->m_jointdip < 0.f ? -1.f : std::min(track->m_jointdip, track_uneven::most); + item_tooltip("Depth of the dip at each rail joint, every sound distance. Works with unevenness at 0. Negative: 0.4 of the unevenness"); + finish_edit(rebuild::parameters); + } ImGui::InputInt(STR_C("Quality"), &track->iQualityFlag, 0); item_tooltip("Quality of the track, 20 is the nominal one; lower values give a rougher ride"); finish_edit(rebuild::none); diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index 418d908fe..cbe7c26b6 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -152,6 +152,11 @@ editor_track::state editor_track::capture(TTrack const &Track) for (auto const *isolated : Track.Isolated) result.isolated.push_back(isolated->asName); result.overhead = Track.fOverhead; + result.uneven = Track.m_uneven; + result.unevenup = Track.m_unevenup; + result.unevenside = Track.m_unevenside; + result.unevencross = Track.m_unevencross; + result.jointdip = Track.m_jointdip; result.sleepers = Track.m_sleeper_enabled; result.sleeper_frequency = Track.m_sleeper_frequency; result.sleeper_model = Track.m_sleeper_model_name; @@ -250,6 +255,11 @@ void editor_track::apply(TTrack &Track, state const &State) Track.fTexSlope = State.texslope; isolated(Track, State.isolated); overhead(Track, State.overhead); + Track.m_uneven = State.uneven; + Track.m_unevenup = State.unevenup; + Track.m_unevenside = State.unevenside; + Track.m_unevencross = State.unevencross; + Track.m_jointdip = State.jointdip; Track.m_sleeper_enabled = State.sleepers; Track.m_sleeper_frequency = State.sleeper_frequency; Track.m_sleeper_model_name = State.sleeper_model; @@ -2350,6 +2360,16 @@ void write_ending(std::ostream &Text, TTrack const &Style) { if ((Style.iCategoryFlag & 15) == 1 && false == Style.m_profile1.first.empty()) Text << "railprofile " << Style.m_profile1.first << ' '; + if (Style.m_uneven > 0.f) + Text << "uneven " << Style.m_uneven << ' '; + if (Style.m_unevenup >= 0.f) + Text << "unevenup " << Style.m_unevenup << ' '; + if (Style.m_unevenside >= 0.f) + Text << "unevenside " << Style.m_unevenside << ' '; + if (Style.m_unevencross >= 0.f) + Text << "unevencross " << Style.m_unevencross << ' '; + if (Style.m_jointdip >= 0.f) + Text << "jointdip " << Style.m_jointdip << ' '; // a piece of the track made from another one stays in its track circuit and under the same overhead line for (auto const *isolated : Style.Isolated) Text << "isolated " << isolated->asName << ' '; diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index 43d42762d..b6137bd8d 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -55,6 +55,11 @@ class editor_track float texslope{0.9f}; std::vector isolated; float overhead{-1.f}; + float uneven{0.f}; + float unevenup{-1.f}; + float unevenside{-1.f}; + float unevencross{-1.f}; + float jointdip{-1.f}; bool sleepers{false}; float sleeper_frequency{0.6f}; std::string sleeper_model; diff --git a/lang/editor_pl.po b/lang/editor_pl.po index 58b301095..a9c61b83b 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -861,6 +861,30 @@ msgstr "Odstęp stuków" msgid "Quality" msgstr "Jakość" +msgid "Unevenness (mm)" +msgstr "Nierówności toru (mm)" + +msgid "Peak deviation of a rail on a 10 m chord. Id-14 limits: 6 mm at 160 km/h, 10 at 120, 18 at 80, 35 at 40.\nWith a sound distance set, the rails also dip at the joints. Joined switches use the lowest of their values" +msgstr "Największa odchyłka toku szynowego na cięciwie 10 m. Limity Id-14: 6 mm przy 160 km/h, 10 przy 120, 18 przy 80, 35 przy 40.\nPrzy podanym odstępie styków szyny zapadają się też na stykach. Połączone rozjazdy mają najmniejszą ze swoich wartości" + +msgid "Up and down (mm)" +msgstr "W pionie (mm)" + +msgid "Sideways (mm)" +msgstr "W poziomie (mm)" + +msgid "Cross level (mm)" +msgstr "Przechyłka (mm)" + +msgid "Set apart from the unevenness, mm. Negative: the unevenness" +msgstr "Osobno od nierówności, mm. Ujemna: wartość nierówności" + +msgid "Dip at rail joints (mm)" +msgstr "Zapadnięcie na stykach szyn (mm)" + +msgid "Depth of the dip at each rail joint, every sound distance. Works with unevenness at 0. Negative: 0.4 of the unevenness" +msgstr "Głębokość zapadnięcia na każdym styku szyn, co odstęp styków. Działa też przy nierównościach 0. Ujemna: 0,4 nierówności" + msgid "Damage flags" msgstr "Flagi uszkodzeń" diff --git a/tests/unit/test_track_uneven.cpp b/tests/unit/test_track_uneven.cpp new file mode 100644 index 000000000..6333b6ab2 --- /dev/null +++ b/tests/unit/test_track_uneven.cpp @@ -0,0 +1,152 @@ +#include "stdafx.h" +#include "doctest.h" +#include "world/TrackUneven.h" + +#include +#include + +namespace { + +double deviation(std::vector const &Values) +{ + auto mean{0.0}; + for (auto const value : Values) + mean += value; + mean /= Values.size(); + auto sum{0.0}; + for (auto const value : Values) + sum += (value - mean) * (value - mean); + return std::sqrt(sum / Values.size()); +} + +double peak(std::vector Values) +{ + for (auto &value : Values) + value = std::abs(value); + std::sort(Values.begin(), Values.end()); + return Values[static_cast(0.999 * Values.size())]; +} + +void add_chord(std::vector &Output, std::vector const &Line, int const Half) +{ + for (int i = Half; i + Half < static_cast(Line.size()); ++i) + Output.push_back(Line[i] - 0.5 * (Line[i - Half] + Line[i + Half])); +} + +} // namespace + +TEST_CASE("uneven track: measures as the Id-14 limits for its value") +{ + // appendix 1, class C at 80 km/h: 18 mm vertically, 17 mm sideways, 16 mm of twist on 5 m, gauge +10/-8 mm, 20 mm of cross level, J = 5.3 + auto const amplitude{track_uneven::stray_per_mm * 18.0 * 1000.0}; // mm + double const gauge{1.435}; + double const step{0.5}; + int const steps{4000}; + int const base{10}; // 5 m + int const lines{36}; + double vertical{0.0}, horizontal{0.0}, twist{0.0}, wander{0.0}, level{0.0}, j{0.0}, away{0.0}; + for (int line = 0; line < lines; ++line) + { + auto const heading{glm::pi() * (line + 0.37) / lines}; + glm::dvec3 const start{7919.0 * std::sin(line * 1.7), 0.0, 6577.0 * std::cos(line * 2.3)}; + glm::dvec3 const along{std::cos(heading), 0.0, std::sin(heading)}; + glm::dvec3 const across{-along.z, 0.0, along.x}; + std::vector up[2], side[2], middle; + for (int i = 0; i < steps; ++i) + { + auto const point{start + along * (i * step)}; + for (int rail = 0; rail < 2; ++rail) + { + auto const sign{rail == 0 ? 1.0 : -1.0}; + auto const stray{track_uneven::field(point + across * (sign * 0.5 * gauge))}; + up[rail].push_back((stray.y - sign * 0.5 * track_uneven::level(point)) * amplitude); + side[rail].push_back(glm::dot(stray, across) * amplitude); + } + middle.push_back(track_uneven::field(point).y * amplitude); + } + std::vector verticals, horizontals, twists, gauges, levels; + for (int rail = 0; rail < 2; ++rail) + { + add_chord(verticals, up[rail], base); + add_chord(horizontals, side[rail], base); + } + for (int i = 0; i + base < steps; ++i) + twists.push_back((up[0][i + base] - up[1][i + base]) - (up[0][i] - up[1][i])); + for (int i = 0; i < steps; ++i) + { + gauges.push_back(side[0][i] - side[1][i]); + levels.push_back(up[0][i] - up[1][i]); + } + vertical += peak(verticals) / lines; + horizontal += peak(horizontals) / lines; + twist += peak(twists) / lines; + wander += peak(gauges) / lines; + level += peak(levels) / lines; + away += peak(middle) / lines; + j += (deviation(verticals) + deviation(horizontals) + deviation(twists) + 0.5 * deviation(gauges)) / 3.5 / lines; + } + CHECK(vertical == doctest::Approx(18.0).epsilon(0.1)); + CHECK(horizontal == doctest::Approx(17.0).epsilon(0.2)); + CHECK(twist == doctest::Approx(16.0).epsilon(0.2)); + CHECK(wander == doctest::Approx(10.0).epsilon(0.2)); + CHECK(level == doctest::Approx(20.0).epsilon(0.1)); + CHECK(j == doctest::Approx(5.3).epsilon(0.2)); + CHECK(away < 25.0); // appendix 1a: 15 mm off the survey marks +} + +TEST_CASE("uneven track: a place strays the same every time") +{ + // no random numbers: changing these changes how every uneven track in every scenery looks + glm::dvec3 const place{1234.5, 0.0, -678.9}; + auto const stray{track_uneven::field(place)}; + CHECK(stray.x == doctest::Approx(0.309777548158).epsilon(1e-9)); + CHECK(stray.y == doctest::Approx(-0.295557487607).epsilon(1e-9)); + CHECK(stray.z == doctest::Approx(-0.328429734019).epsilon(1e-9)); + CHECK(track_uneven::level(place) == doctest::Approx(0.6 * -0.178598957983).epsilon(1e-9)); +} + +TEST_CASE("uneven track: the field stays within its bound") +{ + auto most{0.0}; + for (int i = 0; i < 20000; ++i) + { + auto const stray{track_uneven::field({i * 3.7 - 30000.0, 0.0, i * -2.9 + 41000.0})}; + most = std::max({most, std::abs(stray.x), std::abs(stray.y), std::abs(stray.z)}); + } + CHECK(most <= 1.0); + CHECK(most > 0.5); +} + +TEST_CASE("uneven track: the value along a track meets its neighbours exactly") +{ + double const length{500.0}; + CHECK(track_uneven::along(20.0, 5.0, 7.0, 0.0, length) == doctest::Approx(5.0)); + CHECK(track_uneven::along(20.0, 5.0, 7.0, length, length) == doctest::Approx(7.0)); + CHECK(track_uneven::along(20.0, 5.0, 7.0, 0.5 * length, length) == doctest::Approx(20.0)); + // equal values stay constant + CHECK(track_uneven::along(20.0, 20.0, 20.0, 3.0, length) == doctest::Approx(20.0)); + // a short track between ends of no value hardly strays + CHECK(track_uneven::along(20.0, 0.0, 0.0, 2.5, 5.0) < 1.0); + // a switch of more than the track: the track starts at the value of the switch + CHECK(track_uneven::along(18.0, 35.0, 18.0, 0.0, length) == doctest::Approx(35.0)); + CHECK(track_uneven::along(18.0, 35.0, 18.0, track_uneven::fade, length) == doctest::Approx(18.0)); + // the short piece inside a slip goes with its switches + CHECK(track_uneven::along(18.0, 35.0, 35.0, 0.25, 0.5) == doctest::Approx(35.0).epsilon(0.01)); + // no jump anywhere + auto last{track_uneven::along(18.0, 35.0, 0.0, 0.0, length)}; + for (auto distance{0.25}; distance <= length; distance += 0.25) + { + auto const value{track_uneven::along(18.0, 35.0, 0.0, distance, length)}; + REQUIRE(std::abs(value - last) < 0.5); + last = value; + } +} + +TEST_CASE("uneven track: the rails dip around a joint") +{ + CHECK(track_uneven::dip(0.0) == doctest::Approx(1.0)); + CHECK(track_uneven::dip(1.0) == doctest::Approx(0.75).epsilon(0.01)); // the worst case for rings 2 m apart + CHECK(track_uneven::dip(track_uneven::dip_reach) == doctest::Approx(0.0)); + CHECK(track_uneven::rail_phase(26.0, 25.0) == doctest::Approx(1.0)); + CHECK(track_uneven::rail_phase(-1.0, 25.0) == doctest::Approx(24.0)); +} diff --git a/track_uneven_doc.md b/track_uneven_doc.md new file mode 100644 index 000000000..8cb443ac4 --- /dev/null +++ b/track_uneven_doc.md @@ -0,0 +1,81 @@ +# Nierówności toru + +Opcjonalne atrybuty wpisu toru, przed `endtrack`: + +``` +node -1 0 tor1 track normal 100.0 1.435 0.15 25.0 20 0 flat vis +rail_screw_used1 6 1435mm/tpbps-new2 0.2 0.5 1.1 +0.0 0.2 0.0 0.0 +0.0 0.0 0.0 +0.0 0.0 0.0 +0.0 0.2 100.0 0.0 +0.0 +uneven 18 +unevencross 25 +jointdip 6 +endtrack +``` + +| atrybut | dotyczy | opis | +|-------------------|-----------------------|---------------------------------------------------------------------------------------| +| `uneven ` | `normal`, `switch` | największa odchyłka toku szynowego na cięciwie 10 m; 0-100, domyślnie 0 | +| `unevenup ` | `normal`, `switch` | składowa w pionie, osobno od `uneven` | +| `unevenside ` | `normal`, `switch` | składowa w poziomie, osobno od `uneven` | +| `unevencross `| `normal` | składowa przechyłki, osobno od `uneven`; rozjazd jej nie ma | +| `jointdip ` | `normal` | głębokość zapadnięcia na styku szyn; 0-100, domyślnie 0,4 składowej w pionie | + +Składowa niepodana przyjmuje wartość `uneven`. Na przykład sam bok to `unevenside 30`, a same zapadnięcia na stykach to `jointdip 6`. + +Wszystkie są też w edytorze, w panelu toru, w sekcji „Ride and sound”. Na drogach, rzekach i obrotnicach są ignorowane. + +## Jaką wartość wybrać + +`uneven` odpowiada kolumnie „nierówności pionowe” z instrukcji PLK Id-14, załącznik 1 (klasa C): + +| prędkość [km/h] | 20 | 40 | 60 | 80 | 100 | 120 | 160 | +|-----------------|----|----|----|----|-----|-----|-----| +| `uneven` [mm] | 50 | 35 | 25 | 18 | 14 | 10 | 6 | + +Tor w dobrym stanie to według instrukcji połowa tej wartości (klasa A), w dostatecznym 3/4 (klasa B). + +Tor z `uneven 18` mierzy się tak (`tests/unit/test_track_uneven.cpp`), w nawiasie limit Id-14 dla 80 km/h: + +| parametr | wynik | Id-14 | +|---------------------------|---------|---------| +| nierówności pionowe | 18 mm | 18 mm | +| nierówności poziome | 19 mm | 17 mm | +| wichrowatość na bazie 5 m | 17 mm | 16 mm | +| szerokość toru | ±10 mm | +10/-8 mm | +| przechyłka | 20 mm | 20 mm | +| wskaźnik J | 6,1 | 5,3 | + +## Jak to działa + +Nierówność to pole przesunięć zależne od położenia na mapie, złożone z fal o długości 5-42 m. Nie ma w nim losowania: to samo miejsce wygina się tak samo przy każdym uruchomieniu. Przesunięty tor dostaje fale z nowego miejsca. + +Każda składowa łączy się osobno: + +- **Tor z torem:** na styku obowiązuje mniejsza z dwóch wartości, a każdy tor dochodzi do niej płynnie na 20 m. Wolny koniec toru leży w projekcie. +- **Rozjazd:** wszystkie jego drogi mają jedną wartość. Rozjazdy złączone bezpośrednio przyjmują najmniejszą ze swoich. Dołączony tor dochodzi do wartości rozjazdu, także większej od własnej. Tor bez danej składowej trzyma w niej cały rozjazd w projekcie. +- **Styki:** zapadnięcia są co `fSoundDistance`, na długości 6 m, i biegną dalej przez kolejne tory o tym samym odstępie. Stukot osi wypada w miejscu zapadnięcia. Przy odstępie 6 m lub mniejszym oraz na rozjazdach zapadnięć nie ma. +- **Przechyłka:** dolicza się do projektowej. Na rozjazdach tylko ta wynikająca z fal, bez osobnego siadania toków. + +Za nierównością idą szyny, podsypka, `sleepermodel`, osie, przechył pudła i bujanie kabiny. + +Nie idą za nią modele z includów (np. napędy i podkłady rozjazdów), teren ani sieć trakcyjna, więc przy dużych wartościach szyna rozjeżdża się z takim modelem o kilka centymetrów. + +Fizyka bierze promień łuku i pochylenie z projektu, więc nierówności nie zmieniają tych wartości, a do wykolejeń dokładają tylko przechyłkę, ok. 0,06 m/s² przy `uneven 18` wobec progu ok. 3,2 m/s². + +## Wydajność + +Tor z nierównością ma geometrię co 2 m zamiast co 10 m na prostych. Rozjazdy zachowują swój podział. + +Zmierzone (kamera w ruchu lub kabina, 1920×1080): + +| scena | bez flag | z flagami 18/35 | +|---------------------------------------|--------------------|--------------------| +| Bałtyk, 56 km torów: wierzchołki | 0,56 mln (ok. 27 MB) | 2,17 mln (ok. 104 MB) | +| Bałtyk: najdłuższa klatka w przelocie | 31,5 ms | 64 ms | +| `td.scn`, jazda 120 km/h: klatka | 2,73 ms | 2,93 ms | + +Koszt rośnie z liczbą oflagowanych torów, a najdłuższe klatki pojawiają się przy budowaniu geometrii kolejnych sekcji. Sama jazda po takim torze praktycznie nie kosztuje: ok. 0,3 µs na oś w kroku fizyki. diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index 32ba307f7..83354288d 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -3627,6 +3627,7 @@ bool TDynamicObject::Update(double dt, double dt1) if( dRailLength > 0.0 ) { for( auto &axle : m_axlesounds ) { axle.distance = axle.offset; + axle.atjoints = false; } } dRailLength = MyTrack->fSoundDistance; @@ -3660,9 +3661,19 @@ bool TDynamicObject::Update(double dt, double dt1) 1 : ctOwner->Vehicle()->DirectionGet() == DirectionGet() ? 1 : -1 ) }; for( auto &axle : m_axlesounds ) { - axle.distance += dDOMoveLen * directioninconsist; - if( axle.distance < 0 - || axle.distance > dRailLength ) { + // on a track with dipping joints the clatter comes from them, elsewhere the axle counts a rail off itself + auto const railphase { Axle0.RailPhase( axle.offset - 0.5 * fAxleDist ) }; + auto crossed { false }; + if( railphase >= 0.0 ) { + crossed = axle.atjoints && std::abs( railphase - axle.distance ) > 0.5 * dRailLength; + axle.distance = railphase; + } + else { + axle.distance += dDOMoveLen * directioninconsist; + crossed = axle.distance < 0 || axle.distance > dRailLength; + } + axle.atjoints = ( railphase >= 0.0 ); + if( crossed ) { axle.distance = clamp_circular( axle.distance, dRailLength ); if( MoverParameters->Vel > 0.1 ) { // NOTE: for combined clatter sound we supply 1/100th of actual value, as the sound module converts does the opposite, converting received (typically) 0-1 values to 0-100 range @@ -8035,6 +8046,12 @@ TDynamicObject::update_shake( double const Timedelta ) { -MoverParameters->AccN * Timedelta * 5.0 * Global.ShakingMultiplierRL, // highlight side sway -MoverParameters->AccVert * Timedelta * Global.ShakingMultiplierUD, -MoverParameters->AccSVBased * Timedelta * 1.5 * Global.ShakingMultiplierBF); // accent acceleration/deceleration + // unevenness of the track under the outer axles + auto const ride { 0.5 * ( Axle0.UnevenBend() + Axle1.UnevenBend() ) * ( MoverParameters->V * MoverParameters->V ) }; + shakevector += glm::dvec3( + -glm::dot( ride, vLeft ) * Timedelta * 5.0 * Global.ShakingMultiplierRL, + -ride.y * Timedelta * Global.ShakingMultiplierUD, + 0.0 ); } auto shake { 1.25 * ShakeSpring.ComputateForces( shakevector, ShakeState.offset ) }; diff --git a/vehicle/DynObj.h b/vehicle/DynObj.h index 36335a320..1bc50b1d1 100644 --- a/vehicle/DynObj.h +++ b/vehicle/DynObj.h @@ -402,6 +402,7 @@ private: double distance; // distance to rail joint double offset; // axle offset from centre of the vehicle sound_source clatter; // clatter emitter + bool atjoints { false }; // distance comes from TTrack::rail_phase }; struct powertrain_sounds { diff --git a/world/Segment.cpp b/world/Segment.cpp index 69886f42c..ad817b5ea 100644 --- a/world/Segment.cpp +++ b/world/Segment.cpp @@ -118,6 +118,10 @@ bool TSegment::Init(glm::dvec3 &NewPoint1, glm::dvec3 NewCPointOut, glm::dvec3 N fStoop = std::atan2(Point2.y - Point1.y, fLength); // pochylenie toru prostego, żeby nie liczyć wielokrotnie fStep = fNewStep; + if( m_uneven && pOwner->eType != tt_Switch ) { + // dense enough for the waves; a switch keeps its division, the blades depend on it + fStep = std::min( fStep, 2.0 ); + } // NOTE: optionally replace this part with the commented version, after solving geometry issues with double switches if( pOwner->eType == tt_Switch && fStep * (3.0 * Global.SplineFidelity) > fLength ) { @@ -366,6 +370,52 @@ Math3D::vector3 TSegment::GetPoint(double const fDistance) const */ void TSegment::RaPositionGet(double const fDistance, glm::dvec3 &position, glm::vec3 &rotation) const { + design_position( fDistance, position, rotation ); + if( false == m_uneven ) { + return; + } + // direction and slope stay as designed: the physics takes the curve radius and the grade from them + auto const gauge { std::max( std::abs( pOwner->fTrackWidth ), 0.1f ) }; + glm::dvec3 const across { -std::cos( rotation.z ), 0.0, -std::sin( rotation.z ) }; + auto const amount { pOwner->uneven_at( fDistance ) }; + rotation.x += static_cast( track_uneven::stray_per_mm * ( + amount.up * track_uneven::roll( position, across, gauge ) + + amount.cross * track_uneven::level( position ) / gauge ) ); + position += stray( position, fDistance ); +} + +glm::dvec3 TSegment::stray( glm::dvec3 const &Point, double const Distance ) const { + auto const amount { pOwner->uneven_at( Distance ) }; + auto const field { track_uneven::field( Point ) }; + glm::dvec3 result { field.x * amount.side, field.y * amount.up, field.z * amount.side }; + result *= track_uneven::stray_per_mm; + result.y -= pOwner->joint_dip( Distance ); + return result; +} + +glm::dvec3 TSegment::uneven_bend( double const Distance ) const { + if( false == m_uneven ) { + return glm::dvec3 { 0.0 }; + } + // over about a bogie; FastGetTFromS extrapolates past the ends of the path + auto const reach { 1.5 }; + auto const strayed = [&]( double const At ) { + return stray( FastGetPoint( FastGetTFromS( At ) ), At ); }; + return ( strayed( Distance + reach ) - 2.0 * strayed( Distance ) + strayed( Distance - reach ) ) / ( reach * reach ); +} + +void TSegment::settle_vertex( gfx::basic_vertex &Vertex, glm::dvec3 const &Origin, glm::vec3 const &Position, glm::vec3 const &Parallel, double const Distance ) const { + if( false == m_uneven ) { + return; + } + // the rails settling apart turn about the middle of the track, what's outside them follows the rail + auto const gauge { std::max( std::abs( pOwner->fTrackWidth ), 0.1f ) }; + auto const across { std::clamp( glm::dot( Vertex.position - Position, Parallel ), -0.5f * gauge, 0.5f * gauge ) }; + Vertex.position.y -= static_cast( track_uneven::stray_per_mm * pOwner->uneven_at( Distance ).cross * track_uneven::level( Origin + glm::dvec3 { Position } ) * across / gauge ); + Vertex.position += glm::vec3 { stray( Origin + glm::dvec3 { Vertex.position }, Distance ) }; +} + +void TSegment::design_position(double const fDistance, glm::dvec3 &position, glm::vec3 &rotation) const { if (bCurve) { // można by wprowadzić uproszczony wzór dla okręgów płaskich auto const t = FastGetTFromS(fDistance); // aproksymacja dystansu na krzywej Beziera na parametr (t) @@ -500,6 +550,7 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, glm::dvec3 const &Origin, pt, glm::normalize( norm ), glm::vec2 { ( jmm1 * ShapePoints[ j ].texture.x + m1 * ShapePoints[ j + iNumShapePoints ].texture.x ) / texturescale, tv1 } ); + settle_vertex( Output.back(), Origin, pos1, parallel1, s - step ); } // jeśli jest wskaźnik do tablicy if (p && *p && !j) // to dla pierwszego punktu @@ -518,6 +569,7 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, glm::dvec3 const &Origin, pt, glm::normalize( norm ), glm::vec2 { ( jmm2 * ShapePoints[ j ].texture.x + m2 * ShapePoints[ j + iNumShapePoints ].texture.x ) / texturescale, tv2 } ); + settle_vertex( Output.back(), Origin, pos2, parallel2, s ); } // jeśli jest wskaźnik do tablicy // to dla pierwszego punktu @@ -540,6 +592,7 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, glm::dvec3 const &Origin, pt, glm::normalize( norm ), glm::vec2 { ShapePoints[ j ].texture.x / texturescale, tv1 } ); + settle_vertex( Output.back(), Origin, pos1, parallel1, s - step ); pt = parallel2 * ( jmm2 * ( ShapePoints[ j ].position.x - fOffsetX.first ) + m2 * ( ShapePoints[ j ].position.x - fOffsetX.second ) ) + pos2; pt.y += ShapePoints[ j ].position.y; @@ -550,6 +603,7 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, glm::dvec3 const &Origin, pt, glm::normalize( norm ), glm::vec2 { ShapePoints[ j ].texture.x / texturescale, tv2 } ); + settle_vertex( Output.back(), Origin, pos2, parallel2, s ); } } } diff --git a/world/Segment.h b/world/Segment.h index a3c83ade7..492cab94b 100644 --- a/world/Segment.h +++ b/world/Segment.h @@ -47,6 +47,7 @@ class TSegment glm::dvec3 Point2; float fRoll1 { 0.f }; float fRoll2 { 0.f }; // przechyłka na końcach + bool m_uneven { false }; // see TrackUneven.h double fLength { -1.0 }; // długość policzona std::vector fTsBuffer; // wartości parametru krzywej t dla równych odcinków s std::vector fTsSlope; // nachylenie dt/du (= dt/ds * fStep) w tych samych punktach @@ -67,6 +68,12 @@ class TSegment glm::dvec3 RaInterpolate(double const t) const; glm::dvec3 RaInterpolate0(double const t) const; + // moves a lofted vertex with the unevenness of the track + void settle_vertex( gfx::basic_vertex &Vertex, glm::dvec3 const &Origin, glm::vec3 const &Position, glm::vec3 const &Parallel, double const Distance ) const; + // displacement of a point by the unevenness, at a distance along the path + glm::dvec3 stray( glm::dvec3 const &Point, double const Distance ) const; + void design_position( double const fDistance, glm::dvec3 &position, glm::vec3 &rotation ) const; + public: bool bCurve = false; @@ -106,6 +113,13 @@ public: /// Calculated position /// Calculated rotation void RaPositionGet(double const fDistance, glm::dvec3 &position, glm::vec3 &rotation) const; + // call before Init, it sets the density of the geometry + void + set_uneven( bool const Uneven ) { + m_uneven = Uneven; } + // second derivative of the displacement along the path; times speed squared: acceleration of an axle + glm::dvec3 + uneven_bend( double const Distance ) const; glm::dvec3 FastGetPoint(double const t) const; inline glm::dvec3 diff --git a/world/Track.cpp b/world/Track.cpp index f1a29798c..ff5a378a6 100644 --- a/world/Track.cpp +++ b/world/Track.cpp @@ -47,6 +47,7 @@ TIsolated *TIsolated::pRoot = nullptr; TTrack::profiles_array TTrack::m_profiles; TTrack::profiles_map TTrack::m_profilesmap; +int TTrack::s_layoutstamp { 0 }; TSwitchExtension::TSwitchExtension(TTrack *owner, int const what) { // na początku wszystko puste @@ -325,6 +326,7 @@ void TTrack::ConnectPrevPrev(TTrack *pTrack, int typ) { //łączenie torów - Point1 własny do Point1 cudzego if (pTrack) { //(pTrack) może być zwrotnicą, a (this) tylko zwykłym odcinkiem + ++s_layoutstamp; trPrev = pTrack; iPrevDirection = pTrack->eType == tt_Switch ? 0 : typ & 2; pTrack->trPrev = this; @@ -335,6 +337,7 @@ void TTrack::ConnectPrevNext(TTrack *pTrack, int typ) { //łaczenie torów - Point1 własny do Point2 cudzego if (pTrack) { + ++s_layoutstamp; trPrev = pTrack; iPrevDirection = typ | 1; // 1:zwykły lub pierwszy zwrotnicy, 3:drugi zwrotnicy pTrack->trNext = this; @@ -354,6 +357,7 @@ void TTrack::ConnectNextPrev(TTrack *pTrack, int typ) { //łaczenie torów - Point2 własny do Point1 cudzego if (pTrack) { + ++s_layoutstamp; trNext = pTrack; iNextDirection = pTrack->eType == tt_Switch ? 0 : typ & 2; pTrack->trPrev = this; @@ -373,6 +377,7 @@ void TTrack::ConnectNextNext(TTrack *pTrack, int typ) { //łaczenie torów - Point2 własny do Point2 cudzego if (pTrack) { + ++s_layoutstamp; trNext = pTrack; iNextDirection = typ | 1; // 1:zwykły lub pierwszy zwrotnicy, 3:drugi zwrotnicy pTrack->trNext = this; @@ -633,6 +638,27 @@ void TTrack::Load(cParser *parser, glm::dvec3 const &pOrigin) m_profile1 = fetch_track_rail_profile( railprofile ); } } + else if( str == "uneven" ) { + // uneven : see TrackUneven.h + auto const uneven { parser->getToken() }; + if( ( eType == tt_Normal || eType == tt_Switch ) && iCategoryFlag == 1 ) { + m_uneven = std::clamp( uneven, 0.f, track_uneven::most ); + } + } + else if( str == "unevenup" || str == "unevenside" || str == "unevencross" ) { + // the components of uneven set apart, mm + auto const value { parser->getToken() }; + if( ( eType == tt_Normal || eType == tt_Switch ) && iCategoryFlag == 1 ) { + ( str == "unevenup" ? m_unevenup : str == "unevenside" ? m_unevenside : m_unevencross ) = std::clamp( value, 0.f, track_uneven::most ); + } + } + else if( str == "jointdip" ) { + // jointdip : depth of the dip at rail joints, with or without uneven + auto const jointdip { parser->getToken() }; + if( eType == tt_Normal && iCategoryFlag == 1 ) { + m_jointdip = std::clamp( jointdip, 0.f, track_uneven::most ); + } + } else if( str == "friction" ) { // memory cell holding friction value modifiers m_friction.first = parser->getToken(); @@ -674,6 +700,10 @@ void TTrack::Load(cParser *parser, glm::dvec3 const &pOrigin) *parser >> token; str = token; } + // the segments were made before the attributes were read, and unevenness changes them + if( is_uneven() ) { + init_segments( false ); + } // alternatywny zapis nazwy odcinka izolowanego - po znaku "@" w nazwie toru if ((i = m_name.find("@")) != std::string::npos && i < m_name.length()) { @@ -687,6 +717,159 @@ void TTrack::Load(cParser *parser, glm::dvec3 const &pOrigin) // to a stale origin and the renderer would draw sleepers in the wrong place). } +track_uneven::amounts TTrack::uneven_declared() const { + + return { + m_unevenup >= 0.f ? m_unevenup : m_uneven, + m_unevenside >= 0.f ? m_unevenside : m_uneven, + eType != tt_Normal ? 0.f : m_unevencross >= 0.f ? m_unevencross : m_uneven }; +} + +bool TTrack::is_uneven() const { + + auto const declared { uneven_declared() }; + return declared.up > 0.0 || declared.side > 0.0 || declared.cross > 0.0 || joint_depth() > 0.0; +} + +track_uneven::amounts TTrack::uneven_at( double const Distance ) const { + + if( eType == tt_Switch ) { + return switch_uneven(); + } + auto const own { uneven_declared() }; + auto const atend = [&]( TTrack const *Other ) -> track_uneven::amounts { + if( Other == nullptr ) { + return {}; + } + if( Other->eType == tt_Switch ) { + return Other->switch_uneven(); + } + auto const theirs { Other->uneven_declared() }; + return { std::min( own.up, theirs.up ), std::min( own.side, theirs.side ), std::min( own.cross, theirs.cross ) }; }; + auto const start { atend( trPrev ) }; + auto const end { atend( trNext ) }; + return { + track_uneven::along( own.up, start.up, end.up, Distance, Length() ), + track_uneven::along( own.side, start.side, end.side, Distance, Length() ), + track_uneven::along( own.cross, start.cross, end.cross, Distance, Length() ) }; +} + +track_uneven::amounts TTrack::switch_uneven() const { + + if( m_switchstray.stamp == s_layoutstamp ) { + return m_switchstray.value; + } + std::vector group { this }; + auto least { uneven_declared() }; + for( std::size_t index = 0; index < group.size(); ++index ) { + auto const &extension { *group[ index ]->SwitchExtension }; + for( auto const *other : { extension.pPrevs[ 0 ], extension.pPrevs[ 1 ], extension.pNexts[ 0 ], extension.pNexts[ 1 ] } ) { + if( other == nullptr ) { + continue; + } + auto const theirs { other->uneven_declared() }; + if( other->eType == tt_Switch && other->SwitchExtension ) { + least.up = std::min( least.up, theirs.up ); + least.side = std::min( least.side, theirs.side ); + if( std::find( group.begin(), group.end(), other ) == group.end() ) { + group.push_back( other ); + } + } + else { + // a track with none of a component keeps to its design in it, any other comes to the value of the switch + if( theirs.up <= 0.0 ) { least.up = 0.0; } + if( theirs.side <= 0.0 ) { least.side = 0.0; } + } + } + } + for( auto const *track : group ) { + track->m_switchstray = { least, s_layoutstamp }; + } + return least; +} + +double TTrack::joint_depth() const { + + if( eType != tt_Normal ) { + return 0.0; + } + return ( m_jointdip >= 0.f ? m_jointdip : track_uneven::dip_share * uneven_declared().up ); +} + +double TTrack::joint_dip( double const Distance ) const { + + auto const phase { rail_phase( Distance ) }; + if( phase < 0.0 ) { + return 0.0; + } + auto const fromjoint { std::min( phase, fSoundDistance - phase ) }; + if( fromjoint >= track_uneven::dip_reach ) { + return 0.0; + } + auto const depth { joint_depth() }; + auto const atend = [&]( TTrack const *Other ) { + return ( Other == nullptr || Other->fSoundDistance != fSoundDistance ? 0.0 : std::min( depth, Other->joint_depth() ) ); }; + return 0.001 * track_uneven::dip( fromjoint ) * track_uneven::along( depth, atend( trPrev ), atend( trNext ), Distance, Length() ); +} + +double TTrack::rail_phase( double const Distance ) const { + + if( joint_depth() <= 0.0 || fSoundDistance <= 2.0 * track_uneven::dip_reach ) { + return -1.0; + } + if( m_railrun.stamp != s_layoutstamp ) { + settle_rail_run(); + } + return track_uneven::rail_phase( m_railrun.origin + m_railrun.way * Distance, fSoundDistance ); +} + +void TTrack::settle_rail_run() const { + + // the next track of the run past an end of a track, and which of its ends is joined there + auto const onward = []( TTrack const &Track, int const End, int &Joined ) -> TTrack const * { + auto const *other { End == 0 ? Track.trPrev : Track.trNext }; + if( other == nullptr || other == &Track || other->joint_depth() <= 0.0 || other->fSoundDistance != Track.fSoundDistance ) { + return nullptr; + } + Joined = ( End == 0 ? Track.iPrevDirection : Track.iNextDirection ) & 1; + return other; }; + // walks from this track to an end of the run + auto const walk = [&]( int &End ) { + auto const *track { this }; + int joined { 0 }; + for( int step = 0; step < 1000000; ++step ) { + auto const *next { onward( *track, End, joined ) }; + if( next == nullptr || next == this ) { + break; + } + track = next; + End = 1 - joined; + } + return track; }; + auto const place = []( TTrack const &Track, int const End ) { + auto const point { End == 0 ? Track.Segment->FastGetPoint_0() : Track.Segment->FastGetPoint_1() }; + return std::make_pair( point.x, point.z ); }; + + // start at the end with the lesser coordinates, to get the same joints from any track of the run + int end { 0 }; + int otherend { 1 }; + auto const *track { walk( end ) }; + auto const *other { walk( otherend ) }; + if( place( *other, otherend ) < place( *track, end ) ) { + track = other; + end = otherend; + } + auto along { 0.0 }; + while( track != nullptr && track->m_railrun.stamp != s_layoutstamp ) { + auto const length { track->Length() }; + track->m_railrun = { end == 0 ? along : along + length, end == 0 ? 1.0 : -1.0, s_layoutstamp }; + along += length; + int joined { 0 }; + track = onward( *track, 1 - end, joined ); + end = joined; + } +} + void TTrack::update_location() { location( ( @@ -705,6 +888,14 @@ void TTrack::init_segments( bool const Initial ) { fTexHeight1 -= fTexHeightOffset; fTexHeightOffset = 0.f; iTrapezoid = 0; + ++s_layoutstamp; + if( eType == tt_Switch && SwitchExtension ) { + SwitchExtension->Segments[ 0 ]->set_uneven( is_uneven() ); + SwitchExtension->Segments[ 1 ]->set_uneven( is_uneven() ); + } + else if( Segment ) { + Segment->set_uneven( is_uneven() ); + } switch (eType) { // Ra: łuki segmentowane co 5m albo 314-kątem foremnym @@ -1351,6 +1542,8 @@ glm::vec3 TTrack::get_nearest_point(const glm::dvec3 &point) const // wypełnianie tablic VBO void TTrack::rebuild_geometry( gfx::geometrybank_handle const &Bank ) { + ++s_layoutstamp; + Geometry1.clear(); Geometry2.clear(); if( SwitchExtension ) { @@ -2445,6 +2638,21 @@ TTrack::export_as_text_( std::ostream &Output ) const { && false == m_profile1.first.empty() ) { Output << "railprofile " << m_profile1.first << ' '; } + if( m_uneven > 0.f ) { + Output << "uneven " << m_uneven << ' '; + } + if( m_unevenup >= 0.f ) { + Output << "unevenup " << m_unevenup << ' '; + } + if( m_unevenside >= 0.f ) { + Output << "unevenside " << m_unevenside << ' '; + } + if( m_unevencross >= 0.f ) { + Output << "unevencross " << m_unevencross << ' '; + } + if( m_jointdip >= 0.f ) { + Output << "jointdip " << m_jointdip << ' '; + } if( false == m_friction.first.empty() ) { Output << "friction " << m_friction.first << ' '; } diff --git a/world/Track.h b/world/Track.h index 72a6b7ff4..ac6d1425e 100644 --- a/world/Track.h +++ b/world/Track.h @@ -19,6 +19,7 @@ http://mozilla.org/MPL/2.0/. #include "utilities/Classes.h" #include "world/Segment.h" +#include "world/TrackUneven.h" #include "model/material.h" #include "scene/scenenode.h" #include "utilities/Names.h" @@ -238,6 +239,12 @@ public: TEnvironmentType eEnvironment = e_flat; // dźwięk i oświetlenie int iAction = 0; // czy modyfikowany eventami (specjalna obsługa przy skanowaniu) float fOverhead = -1.0; // można normalnie pobierać prąd (0 dla jazdy bezprądowej po danym odcinku, >0-z opuszczonym i ograniczeniem prędkości) + float m_uneven { 0.f }; // mm, see TrackUneven.h; plain tracks and switches + // the components set apart from m_uneven, mm; negative: m_uneven. Cross level on plain tracks only + float m_unevenup { -1.f }; + float m_unevenside { -1.f }; + float m_unevencross { -1.f }; + float m_jointdip { -1.f }; // depth of the dip at rail joints, mm; negative: from m_uneven; plain tracks only private: double fVelocity = -1.0; // ograniczenie prędkości // prędkość dla AI (powyżej rośnie prawdopowobieństwo wykolejenia) public: @@ -339,6 +346,15 @@ public: void VelocitySet(float v); double VelocityGet(); float Friction() const; + // the unevenness the track declares + track_uneven::amounts uneven_declared() const; + bool is_uneven() const; + // the unevenness at a distance along the track, meeting the tracks joined at its ends + track_uneven::amounts uneven_at( double const Distance ) const; + double joint_depth() const; // mm + double joint_dip( double const Distance ) const; // m + // distance from the rail joint behind; negative: the track has no joints that dip + double rail_phase( double const Distance ) const; void ConnectionsLog(); bool DoubleSlip() const; static void fetch_default_profiles(); @@ -370,6 +386,22 @@ private: void create_track_rail_profile( gfx::vertex_array &Right, gfx::vertex_array &Left ); void create_track_blade_profile( gfx::vertex_array &Right, gfx::vertex_array &Left ); void create_track_bed_profile( gfx::vertex_array &Output, TTrack const *Previous, TTrack const *Next ); + // rail joints run on across joined tracks, however the line is cut into them, so the clatter keeps its rhythm + struct rail_run { + double origin { 0.0 }; // position along the run of Point1 + double way { 1.0 }; // direction of the path along the run + int stamp { -1 }; + }; + void settle_rail_run() const; + mutable rail_run m_railrun; + // one value along all paths of a switch: the lowest of the switches joined, 0 next to a track with none + track_uneven::amounts switch_uneven() const; + struct switch_stray { + track_uneven::amounts value; + int stamp { -1 }; + }; + mutable switch_stray m_switchstray; + static int s_layoutstamp; // bumped when tracks are joined or changed, invalidates the two above void create_road_profile( gfx::vertex_array &Output, bool const Forcetransition = false ); void create_road_side_profile( gfx::vertex_array &Right, gfx::vertex_array &Left, gfx::vertex_array const &Road, bool const Forcetransition = false ); /// diff --git a/world/TrackUneven.h b/world/TrackUneven.h new file mode 100644 index 000000000..7486cea2b --- /dev/null +++ b/world/TrackUneven.h @@ -0,0 +1,125 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include +#include +#include +#include + +// Track unevenness: a displacement field over the plan of the scenery, so everything at one place moves together: joined tracks, the +// paths of a switch, sleepers, axles. Waves 5-42 m long, shares after the German track spectrum with the long waves cut down. +// The "uneven" value is the peak deviation of a rail on a 10 m chord, as in PLK Id-14 appendix 1; see test_track_uneven.cpp. +namespace track_uneven { + +inline constexpr float most { 100.f }; // largest value of the attributes, mm +inline constexpr double stray_per_mm { 0.00145 }; // field amplitude per mm of "uneven", m +inline constexpr double cross_share { 0.6 }; // share of the field amplitude the rails settle apart by +inline constexpr double fade { 20.0 }; // length over which a track goes from the value at its end to its own, m +inline constexpr double dip_share { 0.4 }; // joint dip depth per mm of "uneven", mm +inline constexpr double dip_reach { 3.0 }; // reach of the dip on each side of a joint, m + +// the value of each component of the unevenness, mm +struct amounts { + double up { 0.0 }; + double side { 0.0 }; + double cross { 0.0 }; +}; + +struct wave { + double x; + double z; + double phase; + double share; +}; + +template +using wave_set = std::array; + +// the waves run in all directions of the plan, so no direction of a track is favoured +template +wave_set make_waves( double const Turn, std::array const &Lengths, std::array const &Shares ) { + + auto const golden { glm::pi() * ( 3.0 - std::sqrt( 5.0 ) ) }; + wave_set result {}; + for( std::size_t i = 0; i < Count; ++i ) { + auto const number { glm::two_pi() / Lengths[ i ] }; + auto const heading { Turn + golden * i }; + result[ i ] = { number * std::cos( heading ), number * std::sin( heading ), golden * ( i + 1 ) * ( 1.0 + 3.0 * Turn ), Shares[ i ] }; + } + return result; +} + +inline constexpr std::array wave_lengths { 5.3, 7.1, 9.7, 13.1, 17.9, 23.9, 31.7, 41.9 }; +inline constexpr std::array wave_shares { 0.0721, 0.0997, 0.1344, 0.1703, 0.1549, 0.1386, 0.1226, 0.1074 }; + +inline wave_set<8> const up_waves { make_waves( 0.0, wave_lengths, wave_shares ) }; +inline wave_set<8> const x_waves { make_waves( 1.1, wave_lengths, wave_shares ) }; +inline wave_set<8> const z_waves { make_waves( 2.3, wave_lengths, wave_shares ) }; +// long waves only: with the short ones the cross level reaching its limit would break the limit of twist +inline wave_set<3> const cross_waves { make_waves<3>( 0.7, { 23.9, 31.7, 41.9 }, { 1.0 / 3.0, 1.0 / 3.0, 1.0 / 3.0 } ) }; + +template +double sum( wave_set const &Waves, glm::dvec3 const &Point ) { + + auto total { 0.0 }; + for( auto const &wave : Waves ) { + total += wave.share * std::sin( wave.x * Point.x + wave.z * Point.z + wave.phase ); + } + return total; +} + +// displacement at the point for an amplitude of 1, each axis within +-1 +inline glm::dvec3 field( glm::dvec3 const &Point ) { + + return { sum( x_waves, Point ), sum( up_waves, Point ), sum( z_waves, Point ) }; +} + +// how much lower the right rail lies by settling apart, for an amplitude of 1. Follows the middle of a path, so plain tracks only +inline double level( glm::dvec3 const &Point ) { + + return cross_share * sum( cross_waves, Point ); +} + +// roll made by the field for an amplitude of 1; positive lowers the rail towards Across, as the roll of a path +inline double roll( glm::dvec3 const &Point, glm::dvec3 const &Across, double const Gauge ) { + + return ( sum( up_waves, Point - Across * ( 0.5 * Gauge ) ) - sum( up_waves, Point + Across * ( 0.5 * Gauge ) ) ) / Gauge; +} + +// value at a distance along a track: Full inside, exactly Atstart and Atend at its ends where it meets the neighbours +inline double along( double const Full, double const Atstart, double const Atend, double const Distance, double const Length ) { + + auto const smooth = []( double const Share ) { + auto const share { std::clamp( Share, 0.0, 1.0 ) }; + return share * share * ( 3.0 - 2.0 * share ); }; + auto const ends { Length > 0.0 ? Atstart + ( Atend - Atstart ) * smooth( Distance / Length ) : Atstart }; + return ends + ( Full - ends ) * std::min( smooth( Distance / fade ), smooth( ( Length - Distance ) / fade ) ); +} + +// distance from the joint behind the point +inline double rail_phase( double const Along, double const Rail ) { + + auto const phase { std::fmod( Along, Rail ) }; + return phase < 0.0 ? phase + Rail : phase; +} + +// share of the dip depth at a distance from the joint +inline double dip( double const Fromjoint ) { + + if( Fromjoint >= dip_reach ) { + return 0.0; + } + auto const height { std::cos( glm::half_pi() * Fromjoint / dip_reach ) }; + return height * height; +} + +} // namespace track_uneven diff --git a/world/TrkFoll.cpp b/world/TrkFoll.cpp index c437553da..035e0bd96 100644 --- a/world/TrkFoll.cpp +++ b/world/TrkFoll.cpp @@ -267,6 +267,11 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) } }; +double TTrackFollower::RailPhase( double const Offset ) const { + + return pCurrentTrack != nullptr ? pCurrentTrack->rail_phase( fCurrentDistance + fDirection * Offset ) : -1.0; +} + bool TTrackFollower::ComputatePosition() { // ustalenie współrzędnych XYZ if (pCurrentSegment) // o ile jest tor diff --git a/world/TrkFoll.h b/world/TrkFoll.h index bba97681a..62f386a95 100644 --- a/world/TrkFoll.h +++ b/world/TrkFoll.h @@ -39,6 +39,10 @@ public: // inline double GetLength(vector3 p1, vector3 cp1, vector3 cp2, vector3 p2) //{ return pCurrentSegment->ComputeLength(p1,cp1,cp2,p2); }; // inline double GetRadius(double L, double d); //McZapkie-150503 + inline glm::dvec3 UnevenBend() const { + return pCurrentSegment ? pCurrentSegment->uneven_bend( fCurrentDistance ) : glm::dvec3 { 0.0 }; }; + // TTrack::rail_phase of the point Offset ahead of the axle along the vehicle + double RailPhase( double const Offset ) const; bool Init(TTrack *pTrack, TDynamicObject *NewOwner, double fDir); void Reset(); void Render(float fNr); From b2dcb8a42e419e60ce689462c4a10a9004bd48b0 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 31 Oct 2026 18:21:28 +0100 Subject: [PATCH 220/430] fix(vehicle): wheel clatter on an uneven track doesn't loop into a buzz The phase of the rails was wrapped to the rail length of the track the vehicle is on, while an axle can be on a track with longer rails. From then on every frame looked like a joint crossed. --- vehicle/DynObj.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index 83354288d..2c56cb7ca 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -3665,16 +3665,19 @@ bool TDynamicObject::Update(double dt, double dt1) auto const railphase { Axle0.RailPhase( axle.offset - 0.5 * fAxleDist ) }; auto crossed { false }; if( railphase >= 0.0 ) { - crossed = axle.atjoints && std::abs( railphase - axle.distance ) > 0.5 * dRailLength; + // the rails under the axle, which aren't always those under the track the vehicle is on + crossed = axle.atjoints && std::abs( railphase - axle.distance ) > 0.5 * Axle0.GetTrack()->fSoundDistance; axle.distance = railphase; } else { axle.distance += dDOMoveLen * directioninconsist; crossed = axle.distance < 0 || axle.distance > dRailLength; + if( crossed ) { + axle.distance = clamp_circular( axle.distance, dRailLength ); + } } axle.atjoints = ( railphase >= 0.0 ); if( crossed ) { - axle.distance = clamp_circular( axle.distance, dRailLength ); if( MoverParameters->Vel > 0.1 ) { // NOTE: for combined clatter sound we supply 1/100th of actual value, as the sound module converts does the opposite, converting received (typically) 0-1 values to 0-100 range auto const frequency = true == axle.clatter.is_combined() ? MoverParameters->Vel * 0.01 : 1.0; From e74bbf951f87e399b95a824dc70bdefa587c97e0 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 31 Oct 2026 18:23:19 +0100 Subject: [PATCH 221/430] fix(track): the cross level of an uneven track goes by the place, not by how it was laid Tracks laid towards each other settled to opposite sides: a step of cant of twice the value at their joint, in the geometry and under the axles. It's now a tilt of the plan, which reads the same from either track. --- tests/unit/test_track_uneven.cpp | 23 +++++++++++++++++++++-- track_uneven_doc.md | 2 +- world/Segment.cpp | 4 ++-- world/TrackUneven.h | 14 ++++++++------ 4 files changed, 32 insertions(+), 11 deletions(-) diff --git a/tests/unit/test_track_uneven.cpp b/tests/unit/test_track_uneven.cpp index 6333b6ab2..195a2d729 100644 --- a/tests/unit/test_track_uneven.cpp +++ b/tests/unit/test_track_uneven.cpp @@ -59,7 +59,7 @@ TEST_CASE("uneven track: measures as the Id-14 limits for its value") { auto const sign{rail == 0 ? 1.0 : -1.0}; auto const stray{track_uneven::field(point + across * (sign * 0.5 * gauge))}; - up[rail].push_back((stray.y - sign * 0.5 * track_uneven::level(point)) * amplitude); + up[rail].push_back((stray.y - sign * 0.5 * track_uneven::level(point, across)) * amplitude); side[rail].push_back(glm::dot(stray, across) * amplitude); } middle.push_back(track_uneven::field(point).y * amplitude); @@ -102,7 +102,26 @@ TEST_CASE("uneven track: a place strays the same every time") CHECK(stray.x == doctest::Approx(0.309777548158).epsilon(1e-9)); CHECK(stray.y == doctest::Approx(-0.295557487607).epsilon(1e-9)); CHECK(stray.z == doctest::Approx(-0.328429734019).epsilon(1e-9)); - CHECK(track_uneven::level(place) == doctest::Approx(0.6 * -0.178598957983).epsilon(1e-9)); + CHECK(track_uneven::level(place, {1.0, 0.0, 0.0}) == doctest::Approx(0.53 * -0.178598957983).epsilon(1e-9)); + CHECK(track_uneven::level(place, {0.0, 0.0, 1.0}) == doctest::Approx(0.53 * -0.868291889902).epsilon(1e-9)); +} + +TEST_CASE("uneven track: tracks laid towards each other meet at one cant") +{ + // the same rail stays lower seen from either of them, and a path taken the other way sees the roll turned over + glm::dvec3 const place{812.25, 0.0, 3071.5}; + glm::dvec3 const across{0.6, 0.0, -0.8}; + CHECK(track_uneven::level(place, -across) == doctest::Approx(-track_uneven::level(place, across))); + CHECK(track_uneven::roll(place, -across, 1.435) == doctest::Approx(-track_uneven::roll(place, across, 1.435))); + // and there's no step along a curve turning through the headings + auto last{track_uneven::level(place, {1.0, 0.0, 0.0})}; + for (int step = 1; step <= 3600; ++step) + { + auto const heading{glm::two_pi() * step / 3600.0}; + auto const value{track_uneven::level(place, {std::cos(heading), 0.0, std::sin(heading)})}; + REQUIRE(std::abs(value - last) < 0.002); + last = value; + } } TEST_CASE("uneven track: the field stays within its bound") diff --git a/track_uneven_doc.md b/track_uneven_doc.md index 8cb443ac4..ebced90ee 100644 --- a/track_uneven_doc.md +++ b/track_uneven_doc.md @@ -58,7 +58,7 @@ Każda składowa łączy się osobno: - **Tor z torem:** na styku obowiązuje mniejsza z dwóch wartości, a każdy tor dochodzi do niej płynnie na 20 m. Wolny koniec toru leży w projekcie. - **Rozjazd:** wszystkie jego drogi mają jedną wartość. Rozjazdy złączone bezpośrednio przyjmują najmniejszą ze swoich. Dołączony tor dochodzi do wartości rozjazdu, także większej od własnej. Tor bez danej składowej trzyma w niej cały rozjazd w projekcie. - **Styki:** zapadnięcia są co `fSoundDistance`, na długości 6 m, i biegną dalej przez kolejne tory o tym samym odstępie. Stukot osi wypada w miejscu zapadnięcia. Przy odstępie 6 m lub mniejszym oraz na rozjazdach zapadnięć nie ma. -- **Przechyłka:** dolicza się do projektowej. Na rozjazdach tylko ta wynikająca z fal, bez osobnego siadania toków. +- **Przechyłka:** dolicza się do projektowej. Jest pochyleniem w planie mapy, więc tory wpisane ku sobie spotykają się na tej samej przechyłce. Na rozjazdach tylko ta wynikająca z fal, bez osobnego siadania toków. Za nierównością idą szyny, podsypka, `sleepermodel`, osie, przechył pudła i bujanie kabiny. diff --git a/world/Segment.cpp b/world/Segment.cpp index ad817b5ea..84a0c22b4 100644 --- a/world/Segment.cpp +++ b/world/Segment.cpp @@ -380,7 +380,7 @@ void TSegment::RaPositionGet(double const fDistance, glm::dvec3 &position, glm:: auto const amount { pOwner->uneven_at( fDistance ) }; rotation.x += static_cast( track_uneven::stray_per_mm * ( amount.up * track_uneven::roll( position, across, gauge ) - + amount.cross * track_uneven::level( position ) / gauge ) ); + + amount.cross * track_uneven::level( position, across ) / gauge ) ); position += stray( position, fDistance ); } @@ -411,7 +411,7 @@ void TSegment::settle_vertex( gfx::basic_vertex &Vertex, glm::dvec3 const &Origi // the rails settling apart turn about the middle of the track, what's outside them follows the rail auto const gauge { std::max( std::abs( pOwner->fTrackWidth ), 0.1f ) }; auto const across { std::clamp( glm::dot( Vertex.position - Position, Parallel ), -0.5f * gauge, 0.5f * gauge ) }; - Vertex.position.y -= static_cast( track_uneven::stray_per_mm * pOwner->uneven_at( Distance ).cross * track_uneven::level( Origin + glm::dvec3 { Position } ) * across / gauge ); + Vertex.position.y -= static_cast( track_uneven::stray_per_mm * pOwner->uneven_at( Distance ).cross * track_uneven::level( Origin + glm::dvec3 { Position }, glm::dvec3 { Parallel } ) * across / gauge ); Vertex.position += glm::vec3 { stray( Origin + glm::dvec3 { Vertex.position }, Distance ) }; } diff --git a/world/TrackUneven.h b/world/TrackUneven.h index 7486cea2b..5974f42d3 100644 --- a/world/TrackUneven.h +++ b/world/TrackUneven.h @@ -22,7 +22,7 @@ namespace track_uneven { inline constexpr float most { 100.f }; // largest value of the attributes, mm inline constexpr double stray_per_mm { 0.00145 }; // field amplitude per mm of "uneven", m -inline constexpr double cross_share { 0.6 }; // share of the field amplitude the rails settle apart by +inline constexpr double cross_share { 0.53 }; // share of the field amplitude the rails settle apart by inline constexpr double fade { 20.0 }; // length over which a track goes from the value at its end to its own, m inline constexpr double dip_share { 0.4 }; // joint dip depth per mm of "uneven", mm inline constexpr double dip_reach { 3.0 }; // reach of the dip on each side of a joint, m @@ -64,8 +64,9 @@ inline constexpr std::array wave_shares { 0.0721, 0.0997, 0.1344, 0.1 inline wave_set<8> const up_waves { make_waves( 0.0, wave_lengths, wave_shares ) }; inline wave_set<8> const x_waves { make_waves( 1.1, wave_lengths, wave_shares ) }; inline wave_set<8> const z_waves { make_waves( 2.3, wave_lengths, wave_shares ) }; -// long waves only: with the short ones the cross level reaching its limit would break the limit of twist -inline wave_set<3> const cross_waves { make_waves<3>( 0.7, { 23.9, 31.7, 41.9 }, { 1.0 / 3.0, 1.0 / 3.0, 1.0 / 3.0 } ) }; +// the tilt along each axis of the plan. Long waves only: with the short ones the cross level reaching its limit would break the limit of twist +inline wave_set<3> const tilt_x_waves { make_waves<3>( 0.7, { 23.9, 31.7, 41.9 }, { 1.0 / 3.0, 1.0 / 3.0, 1.0 / 3.0 } ) }; +inline wave_set<3> const tilt_z_waves { make_waves<3>( 2.9, { 23.9, 31.7, 41.9 }, { 1.0 / 3.0, 1.0 / 3.0, 1.0 / 3.0 } ) }; template double sum( wave_set const &Waves, glm::dvec3 const &Point ) { @@ -83,10 +84,11 @@ inline glm::dvec3 field( glm::dvec3 const &Point ) { return { sum( x_waves, Point ), sum( up_waves, Point ), sum( z_waves, Point ) }; } -// how much lower the right rail lies by settling apart, for an amplitude of 1. Follows the middle of a path, so plain tracks only -inline double level( glm::dvec3 const &Point ) { +// how much lower the rail towards Across lies by settling apart, for an amplitude of 1. A tilt of the plan, so tracks laid towards each +// other meet at one cant. Follows the middle of a path, so plain tracks only +inline double level( glm::dvec3 const &Point, glm::dvec3 const &Across ) { - return cross_share * sum( cross_waves, Point ); + return cross_share * ( Across.x * sum( tilt_x_waves, Point ) + Across.z * sum( tilt_z_waves, Point ) ); } // roll made by the field for an amplitude of 1; positive lowers the rail towards Across, as the roll of a path From 6aed9ec5bd38d942a400a7085f044a28602b3c2a Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 31 Oct 2026 18:25:16 +0100 Subject: [PATCH 222/430] feat(track): vertical unevenness comes near its limit more often, with longer buckles too Fewer short waves: at uneven 18 the humps over 12.6 mm on the 10 m chord go from 28 to 38 per km, with the peak still at 18 mm. Waves of 47-83 m join them. They hardly count on that chord, the body rises and falls on them. The documentation tells how far unevenness goes before a pantograph can't keep up. A wire rising fast enough trips the main breaker on a straight track too: it does at tor0290 on Baltyk, over about 46 km/h. --- tests/unit/test_track_uneven.cpp | 10 +++++++--- track_uneven_doc.md | 6 ++++-- world/TrackUneven.h | 8 +++++--- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/tests/unit/test_track_uneven.cpp b/tests/unit/test_track_uneven.cpp index 195a2d729..afea0b678 100644 --- a/tests/unit/test_track_uneven.cpp +++ b/tests/unit/test_track_uneven.cpp @@ -91,7 +91,7 @@ TEST_CASE("uneven track: measures as the Id-14 limits for its value") CHECK(wander == doctest::Approx(10.0).epsilon(0.2)); CHECK(level == doctest::Approx(20.0).epsilon(0.1)); CHECK(j == doctest::Approx(5.3).epsilon(0.2)); - CHECK(away < 25.0); // appendix 1a: 15 mm off the survey marks + CHECK(away < 40.0); // the long waves go past the 15 mm off the survey marks of appendix 1a } TEST_CASE("uneven track: a place strays the same every time") @@ -100,7 +100,7 @@ TEST_CASE("uneven track: a place strays the same every time") glm::dvec3 const place{1234.5, 0.0, -678.9}; auto const stray{track_uneven::field(place)}; CHECK(stray.x == doctest::Approx(0.309777548158).epsilon(1e-9)); - CHECK(stray.y == doctest::Approx(-0.295557487607).epsilon(1e-9)); + CHECK(stray.y == doctest::Approx(0.311350299745).epsilon(1e-9)); CHECK(stray.z == doctest::Approx(-0.328429734019).epsilon(1e-9)); CHECK(track_uneven::level(place, {1.0, 0.0, 0.0}) == doctest::Approx(0.53 * -0.178598957983).epsilon(1e-9)); CHECK(track_uneven::level(place, {0.0, 0.0, 1.0}) == doctest::Approx(0.53 * -0.868291889902).epsilon(1e-9)); @@ -127,13 +127,17 @@ TEST_CASE("uneven track: tracks laid towards each other meet at one cant") TEST_CASE("uneven track: the field stays within its bound") { auto most{0.0}; + auto highest{0.0}; for (int i = 0; i < 20000; ++i) { auto const stray{track_uneven::field({i * 3.7 - 30000.0, 0.0, i * -2.9 + 41000.0})}; - most = std::max({most, std::abs(stray.x), std::abs(stray.y), std::abs(stray.z)}); + most = std::max({most, std::abs(stray.x), std::abs(stray.z)}); + highest = std::max(highest, std::abs(stray.y)); } CHECK(most <= 1.0); CHECK(most > 0.5); + CHECK(highest <= 1.69); + CHECK(highest > 0.5); } TEST_CASE("uneven track: the value along a track meets its neighbours exactly") diff --git a/track_uneven_doc.md b/track_uneven_doc.md index ebced90ee..aca9ca32b 100644 --- a/track_uneven_doc.md +++ b/track_uneven_doc.md @@ -44,14 +44,14 @@ Tor z `uneven 18` mierzy się tak (`tests/unit/test_track_uneven.cpp`), w nawias |---------------------------|---------|---------| | nierówności pionowe | 18 mm | 18 mm | | nierówności poziome | 19 mm | 17 mm | -| wichrowatość na bazie 5 m | 17 mm | 16 mm | +| wichrowatość na bazie 5 m | 15 mm | 16 mm | | szerokość toru | ±10 mm | +10/-8 mm | | przechyłka | 20 mm | 20 mm | | wskaźnik J | 6,1 | 5,3 | ## Jak to działa -Nierówność to pole przesunięć zależne od położenia na mapie, złożone z fal o długości 5-42 m. Nie ma w nim losowania: to samo miejsce wygina się tak samo przy każdym uruchomieniu. Przesunięty tor dostaje fale z nowego miejsca. +Nierówność to pole przesunięć zależne od położenia na mapie, złożone z fal o długości 5-42 m. W pionie krótkich fal jest mniej, żeby częściej dochodziły blisko wartości szczytowej, a do tego są fale 47-83 m: na cięciwie 10 m prawie się nie liczą, pudło unosi się na nich i opada, a pantograf za nimi nadąża. Nie ma w nim losowania: to samo miejsce wygina się tak samo przy każdym uruchomieniu. Przesunięty tor dostaje fale z nowego miejsca. Każda składowa łączy się osobno: @@ -64,6 +64,8 @@ Za nierównością idą szyny, podsypka, `sleepermodel`, osie, przechył pudła Nie idą za nią modele z includów (np. napędy i podkłady rozjazdów), teren ani sieć trakcyjna, więc przy dużych wartościach szyna rozjeżdża się z takim modelem o kilka centymetrów. +Pantograf podnosi się z szybkością ciśnienia, ok. 0,14 m/s, a szczelina do drutu większa niż 1 cm odcina napięcie i wybija wyłącznik szybki. Nierówność dokłada się do tego przy dużej prędkości. Na torach Bałtyku symulacja daje szczelinę 0,6 cm, gdy składowa w pionie razy prędkość w km/h wynosi 925, czyli np. 8 mm przy 120 km/h, 13 mm przy 70 km/h i 23 mm przy 40 km/h. Wartości z tabeli Id-14 są od tego większe. Sam drut też to potrafi: na Bałtyku przy `tor0290` wznosi się o ok. 1%, więc pantograf nadąża tam do ok. 46 km/h, a powyżej wyłącznik wybija także na prostym torze. + Fizyka bierze promień łuku i pochylenie z projektu, więc nierówności nie zmieniają tych wartości, a do wykolejeń dokładają tylko przechyłkę, ok. 0,06 m/s² przy `uneven 18` wobec progu ok. 3,2 m/s². ## Wydajność diff --git a/world/TrackUneven.h b/world/TrackUneven.h index 5974f42d3..9031c6cac 100644 --- a/world/TrackUneven.h +++ b/world/TrackUneven.h @@ -16,7 +16,7 @@ http://mozilla.org/MPL/2.0/. #include // Track unevenness: a displacement field over the plan of the scenery, so everything at one place moves together: joined tracks, the -// paths of a switch, sleepers, axles. Waves 5-42 m long, shares after the German track spectrum with the long waves cut down. +// paths of a switch, sleepers, axles. Waves 5-42 m long, shares after the German track spectrum with the long waves cut down; up and down to 83 m. // The "uneven" value is the peak deviation of a rail on a 10 m chord, as in PLK Id-14 appendix 1; see test_track_uneven.cpp. namespace track_uneven { @@ -61,7 +61,9 @@ wave_set make_waves( double const Turn, std::array const & inline constexpr std::array wave_lengths { 5.3, 7.1, 9.7, 13.1, 17.9, 23.9, 31.7, 41.9 }; inline constexpr std::array wave_shares { 0.0721, 0.0997, 0.1344, 0.1703, 0.1549, 0.1386, 0.1226, 0.1074 }; -inline wave_set<8> const up_waves { make_waves( 0.0, wave_lengths, wave_shares ) }; +// fewer short ones than sideways: the rails come near the limit in the vertical more often, with the peak still at it. +// The long ones hardly count on the 10 m chord: the body rises and falls on them, slowly enough for a pantograph to keep up +inline wave_set<8> const up_waves { make_waves<8>( 0.0, { 8.3, 11.9, 16.7, 23.9, 37.1, 47.3, 61.9, 83.3 }, { 0.14, 0.19, 0.22, 0.22, 0.23, 0.23, 0.23, 0.23 } ) }; inline wave_set<8> const x_waves { make_waves( 1.1, wave_lengths, wave_shares ) }; inline wave_set<8> const z_waves { make_waves( 2.3, wave_lengths, wave_shares ) }; // the tilt along each axis of the plan. Long waves only: with the short ones the cross level reaching its limit would break the limit of twist @@ -78,7 +80,7 @@ double sum( wave_set const &Waves, glm::dvec3 const &Point ) { return total; } -// displacement at the point for an amplitude of 1, each axis within +-1 +// displacement at the point for an amplitude of 1, sideways within +-1, up and down within +-1.69 inline glm::dvec3 field( glm::dvec3 const &Point ) { return { sum( x_waves, Point ), sum( up_waves, Point ), sum( z_waves, Point ) }; From 3dbe8a75f80fd109ccd0dab5bccf96b23faf33d8 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 31 Oct 2026 18:27:19 +0100 Subject: [PATCH 223/430] feat(track): the foot of the ballast stays on the ground as designed Rails, sleepers and the top of the ballast go with the unevenness, the slope of the ballast takes up the difference. --- tests/unit/test_track_uneven.cpp | 12 ++++++++++++ track_uneven_doc.md | 2 +- world/Segment.cpp | 7 ++++--- world/Track.cpp | 5 +++++ world/Track.h | 2 ++ world/TrackUneven.h | 7 +++++++ 6 files changed, 31 insertions(+), 4 deletions(-) diff --git a/tests/unit/test_track_uneven.cpp b/tests/unit/test_track_uneven.cpp index afea0b678..46bd1e5f6 100644 --- a/tests/unit/test_track_uneven.cpp +++ b/tests/unit/test_track_uneven.cpp @@ -165,6 +165,18 @@ TEST_CASE("uneven track: the value along a track meets its neighbours exactly") } } +TEST_CASE("uneven track: the foot of the ballast stays where it was") +{ + double const rail{0.18}; + double const height{0.38}; + CHECK(track_uneven::bed_share(0.0, rail, height) == doctest::Approx(1.0)); // rail top + CHECK(track_uneven::bed_share(rail, rail, height) == doctest::Approx(1.0)); // top of the ballast + CHECK(track_uneven::bed_share(rail + 0.5 * height, rail, height) == doctest::Approx(0.5)); + CHECK(track_uneven::bed_share(rail + height, rail, height) == doctest::Approx(0.0)); // its foot + CHECK(track_uneven::bed_share(rail + 2.0 * height, rail, height) == doctest::Approx(0.0)); + CHECK(track_uneven::bed_share(rail + 1.0, rail, 0.0) == doctest::Approx(1.0)); // no ballast +} + TEST_CASE("uneven track: the rails dip around a joint") { CHECK(track_uneven::dip(0.0) == doctest::Approx(1.0)); diff --git a/track_uneven_doc.md b/track_uneven_doc.md index aca9ca32b..8570fd945 100644 --- a/track_uneven_doc.md +++ b/track_uneven_doc.md @@ -60,7 +60,7 @@ Każda składowa łączy się osobno: - **Styki:** zapadnięcia są co `fSoundDistance`, na długości 6 m, i biegną dalej przez kolejne tory o tym samym odstępie. Stukot osi wypada w miejscu zapadnięcia. Przy odstępie 6 m lub mniejszym oraz na rozjazdach zapadnięć nie ma. - **Przechyłka:** dolicza się do projektowej. Jest pochyleniem w planie mapy, więc tory wpisane ku sobie spotykają się na tej samej przechyłce. Na rozjazdach tylko ta wynikająca z fal, bez osobnego siadania toków. -Za nierównością idą szyny, podsypka, `sleepermodel`, osie, przechył pudła i bujanie kabiny. +Za nierównością idą szyny, wierzch podsypki, `sleepermodel`, osie, przechył pudła i bujanie kabiny. Skarpa podsypki przejmuje różnicę, a jej spód zostaje w projekcie, na terenie. Nie idą za nią modele z includów (np. napędy i podkłady rozjazdów), teren ani sieć trakcyjna, więc przy dużych wartościach szyna rozjeżdża się z takim modelem o kilka centymetrów. diff --git a/world/Segment.cpp b/world/Segment.cpp index 84a0c22b4..3668ed130 100644 --- a/world/Segment.cpp +++ b/world/Segment.cpp @@ -408,11 +408,12 @@ void TSegment::settle_vertex( gfx::basic_vertex &Vertex, glm::dvec3 const &Origi if( false == m_uneven ) { return; } - // the rails settling apart turn about the middle of the track, what's outside them follows the rail + // the rails settling apart turn about the middle of the track, what's outside them follows the rail; the foot of the ballast stays auto const gauge { std::max( std::abs( pOwner->fTrackWidth ), 0.1f ) }; auto const across { std::clamp( glm::dot( Vertex.position - Position, Parallel ), -0.5f * gauge, 0.5f * gauge ) }; - Vertex.position.y -= static_cast( track_uneven::stray_per_mm * pOwner->uneven_at( Distance ).cross * track_uneven::level( Origin + glm::dvec3 { Position }, glm::dvec3 { Parallel } ) * across / gauge ); - Vertex.position += glm::vec3 { stray( Origin + glm::dvec3 { Vertex.position }, Distance ) }; + auto const share { pOwner->uneven_bed_share( Position.y - Vertex.position.y ) }; + Vertex.position.y -= static_cast( share * track_uneven::stray_per_mm * pOwner->uneven_at( Distance ).cross * track_uneven::level( Origin + glm::dvec3 { Position }, glm::dvec3 { Parallel } ) * across / gauge ); + Vertex.position += glm::vec3 { share * stray( Origin + glm::dvec3 { Vertex.position }, Distance ) }; } void TSegment::design_position(double const fDistance, glm::dvec3 &position, glm::vec3 &rotation) const { diff --git a/world/Track.cpp b/world/Track.cpp index ff5a378a6..b5589eedc 100644 --- a/world/Track.cpp +++ b/world/Track.cpp @@ -731,6 +731,11 @@ bool TTrack::is_uneven() const { return declared.up > 0.0 || declared.side > 0.0 || declared.cross > 0.0 || joint_depth() > 0.0; } +double TTrack::uneven_bed_share( double const Depth ) const { + + return track_uneven::bed_share( Depth, std::abs( track_rail_profile( m_profile1.second ).front().position.y ), fTexHeight1 ); +} + track_uneven::amounts TTrack::uneven_at( double const Distance ) const { if( eType == tt_Switch ) { diff --git a/world/Track.h b/world/Track.h index ac6d1425e..92516ee6d 100644 --- a/world/Track.h +++ b/world/Track.h @@ -351,6 +351,8 @@ public: bool is_uneven() const; // the unevenness at a distance along the track, meeting the tracks joined at its ends track_uneven::amounts uneven_at( double const Distance ) const; + // how much of the displacement a point of the profile at the depth takes + double uneven_bed_share( double const Depth ) const; double joint_depth() const; // mm double joint_dip( double const Distance ) const; // m // distance from the rail joint behind; negative: the track has no joints that dip diff --git a/world/TrackUneven.h b/world/TrackUneven.h index 9031c6cac..182f37995 100644 --- a/world/TrackUneven.h +++ b/world/TrackUneven.h @@ -109,6 +109,13 @@ inline double along( double const Full, double const Atstart, double const Atend return ends + ( Full - ends ) * std::min( smooth( Distance / fade ), smooth( ( Length - Distance ) / fade ) ); } +// how much of the displacement a point of the profile takes, by its depth under the rail top: all of it down to the foot of the rail, +// none at the foot of the ballast, which stays on the ground as designed +inline double bed_share( double const Depth, double const Rail, double const Height ) { + + return Height > 0.0 ? std::clamp( 1.0 - ( Depth - Rail ) / Height, 0.0, 1.0 ) : 1.0; +} + // distance from the joint behind the point inline double rail_phase( double const Along, double const Rail ) { From 7aff1ee9ff646eff64e18fce96e52daae76b1831 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 31 Oct 2026 18:29:22 +0100 Subject: [PATCH 224/430] feat(vehicle): an uneven track shakes the cab by itself On such a track the sway drawn from the lateral acceleration, that is from the curve radius, and the jolts drawn at random are off. Tracks with no unevenness shake the cab as before. Hunting stays: it goes by the vehicle and its speed, not by the track. --- track_uneven_doc.md | 2 ++ vehicle/DynObj.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/track_uneven_doc.md b/track_uneven_doc.md index 8570fd945..4b71140bd 100644 --- a/track_uneven_doc.md +++ b/track_uneven_doc.md @@ -64,6 +64,8 @@ Za nierównością idą szyny, wierzch podsypki, `sleepermodel`, osie, przechył Nie idą za nią modele z includów (np. napędy i podkłady rozjazdów), teren ani sieć trakcyjna, więc przy dużych wartościach szyna rozjeżdża się z takim modelem o kilka centymetrów. +Na torze z nierównością kabinę buja sam tor. Odpada kołysanie wyliczane z przyspieszenia poprzecznego, czyli z promienia łuku, oraz losowe szarpnięcia przy większej prędkości. Na torach bez nierówności działają jak dotąd. + Pantograf podnosi się z szybkością ciśnienia, ok. 0,14 m/s, a szczelina do drutu większa niż 1 cm odcina napięcie i wybija wyłącznik szybki. Nierówność dokłada się do tego przy dużej prędkości. Na torach Bałtyku symulacja daje szczelinę 0,6 cm, gdy składowa w pionie razy prędkość w km/h wynosi 925, czyli np. 8 mm przy 120 km/h, 13 mm przy 70 km/h i 23 mm przy 40 km/h. Wartości z tabeli Id-14 są od tego większe. Sam drut też to potrafi: na Bałtyku przy `tor0290` wznosi się o ok. 1%, więc pantograf nadąża tam do ok. 46 km/h, a powyżej wyłącznik wybija także na prostym torze. Fizyka bierze promień łuku i pochylenie z projektu, więc nierówności nie zmieniają tych wartości, a do wykolejeń dokładają tylko przechyłkę, ok. 0,06 m/s² przy `uneven 18` wobec progu ok. 3,2 m/s². diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index 2c56cb7ca..af8828282 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -8043,10 +8043,12 @@ TDynamicObject::update_shake( double const Timedelta ) { shakevector *= 0; auto const iVel { std::min( GetVelocity(), 150.0 ) }; + // an uneven track shakes the cab by itself, in place of the sway drawn from the curve and the jolts drawn at random + auto const uneven { MyTrack != nullptr && MyTrack->is_uneven() }; if( iVel > 0.5 ) { // acceleration-driven base shake shakevector += glm::dvec3( - -MoverParameters->AccN * Timedelta * 5.0 * Global.ShakingMultiplierRL, // highlight side sway + uneven ? 0.0 : -MoverParameters->AccN * Timedelta * 5.0 * Global.ShakingMultiplierRL, // highlight side sway -MoverParameters->AccVert * Timedelta * Global.ShakingMultiplierUD, -MoverParameters->AccSVBased * Timedelta * 1.5 * Global.ShakingMultiplierBF); // accent acceleration/deceleration // unevenness of the track under the outer axles @@ -8059,7 +8061,7 @@ TDynamicObject::update_shake( double const Timedelta ) { auto shake { 1.25 * ShakeSpring.ComputateForces( shakevector, ShakeState.offset ) }; - if( LocalRandom( iVel ) > 25.0 ) { + if( false == uneven && LocalRandom( iVel ) > 25.0 ) { // extra shake at increased velocity shake += ShakeSpring.ComputateForces( glm::dvec3( From 88609a1657e7c41286e24b37733789a28d9a21d6 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 31 Oct 2026 18:31:28 +0100 Subject: [PATCH 225/430] fix(track): the ends of joined paths meet, in place and in cant Ends less than 20 cm apart meet in the middle with a common vector across, which closes the cracks from coordinates that don't match in the data, on tracks with no unevenness as well. At such a joint a switch takes the cant of the plain track, and alike ones meet halfway: the slips on Baltyk had steps of 0.2 degrees. The physics goes by the same cant. --- track_uneven_doc.md | 2 ++ world/Segment.cpp | 24 ++++++++++++++++ world/Segment.h | 15 ++++++++++ world/Track.cpp | 69 +++++++++++++++++++++++++++++++++++++++++++++ world/Track.h | 2 ++ 5 files changed, 112 insertions(+) diff --git a/track_uneven_doc.md b/track_uneven_doc.md index 4b71140bd..a9b888aef 100644 --- a/track_uneven_doc.md +++ b/track_uneven_doc.md @@ -60,6 +60,8 @@ Każda składowa łączy się osobno: - **Styki:** zapadnięcia są co `fSoundDistance`, na długości 6 m, i biegną dalej przez kolejne tory o tym samym odstępie. Stukot osi wypada w miejscu zapadnięcia. Przy odstępie 6 m lub mniejszym oraz na rozjazdach zapadnięć nie ma. - **Przechyłka:** dolicza się do projektowej. Jest pochyleniem w planie mapy, więc tory wpisane ku sobie spotykają się na tej samej przechyłce. Na rozjazdach tylko ta wynikająca z fal, bez osobnego siadania toków. +Końce złączonych dróg spotykają się w środku między sobą, z jednym kierunkiem poprzecznym, jeśli są bliżej niż 20 cm, co zamyka pęknięcia z niezgodnych współrzędnych w danych, także na torach bez nierówności. Przechyłkę na takim styku rozjazd bierze od zwykłego toru, a dwa tory albo dwa rozjazdy spotykają się w połowie. To dotyczy też fizyki. + Za nierównością idą szyny, wierzch podsypki, `sleepermodel`, osie, przechył pudła i bujanie kabiny. Skarpa podsypki przejmuje różnicę, a jej spód zostaje w projekcie, na terenie. Nie idą za nią modele z includów (np. napędy i podkłady rozjazdów), teren ani sieć trakcyjna, więc przy dużych wartościach szyna rozjeżdża się z takim modelem o kilka centymetrów. diff --git a/world/Segment.cpp b/world/Segment.cpp index 3668ed130..16f878c9c 100644 --- a/world/Segment.cpp +++ b/world/Segment.cpp @@ -69,6 +69,10 @@ bool TSegment::Init(glm::dvec3 &NewPoint1, glm::dvec3 NewCPointOut, glm::dvec3 N // poprawienie przechyłki fRoll1 = static_cast(glm::radians(fNewRoll1)); // Ra: przeliczone jest bardziej przydatne do obliczeń fRoll2 = static_cast(glm::radians(fNewRoll2)); + m_designrolls[ 0 ] = fRoll1; + m_designrolls[ 1 ] = fRoll2; + m_joints[ 0 ].reset(); + m_joints[ 1 ].reset(); bCurve = bIsCurve; if (Global.bRollFix) { // Ra: poprawianie przechyłki @@ -441,6 +445,18 @@ void TSegment::design_position(double const fDistance, glm::dvec3 &position, glm } }; +void TSegment::plan_frame( double const Distance, glm::dvec3 &Point, glm::dvec3 &Across ) const { + auto const t { FastGetTFromS( std::clamp( Distance, 0.0, fLength ) ) }; + Point = FastGetPoint( t ); + auto const dir { FastGetDirection( t, 0.1 / fLength ) }; + Across = glm::dvec3{ -dir.z, 0.0, dir.x }; + if( glm::length2( Across ) == 0.0 ) { + auto const chord { FastGetPoint_1() - FastGetPoint_0() }; + Across = glm::dvec3{ -chord.z, 0.0, chord.x }; + } + Across = glm::normalize( Across ); +} + glm::dvec3 TSegment::FastGetPoint(double const t) const { // return (bCurve?std::lerp(t,Point1,CPointOut,CPointIn,Point2):((1.0-t)*Point1+(t)*Point2)); @@ -492,6 +508,10 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, glm::dvec3 const &Origin, parallel1 = glm::vec3{ glm::dvec3{ FastGetPoint_1() - FastGetPoint_0() } }; } parallel1 = glm::normalize( parallel1 ); + if( iSkip == 0 && m_joints[ 0 ] ) { + pos1 = glm::vec3{ m_joints[ 0 ]->first - Origin }; + parallel1 = glm::vec3{ m_joints[ 0 ]->second }; + } if( iEnd == 0 ) iEnd = iSegCount; fEnd = static_cast(fLength * double( iEnd ) / double( iSegCount )); @@ -537,6 +557,10 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, glm::dvec3 const &Origin, parallel2 = glm::vec3{ glm::dvec3{ FastGetPoint_1() - FastGetPoint_0() } }; } parallel2 = glm::normalize( parallel2 ); + if( i == iSegCount && m_joints[ 1 ] ) { + pos2 = glm::vec3{ m_joints[ 1 ]->first - Origin }; + parallel2 = glm::vec3{ m_joints[ 1 ]->second }; + } // TODO: refactor the loop, there's no need to calculate starting points for each segment when we can copy the end points of the previous one if( Transition ) { diff --git a/world/Segment.h b/world/Segment.h index 492cab94b..7af8a894f 100644 --- a/world/Segment.h +++ b/world/Segment.h @@ -9,6 +9,8 @@ http://mozilla.org/MPL/2.0/. #pragma once +#include + #include "utilities/Classes.h" #include "rendering/geometrybank.h" #include @@ -47,6 +49,9 @@ class TSegment glm::dvec3 Point2; float fRoll1 { 0.f }; float fRoll2 { 0.f }; // przechyłka na końcach + float m_designrolls[ 2 ] { 0.f, 0.f }; // as entered; the two above can differ at a joint + // where the path meets the next one: the middle of their ends and their common vector across + std::optional> m_joints[ 2 ]; bool m_uneven { false }; // see TrackUneven.h double fLength { -1.0 }; // długość policzona std::vector fTsBuffer; // wartości parametru krzywej t dla równych odcinków s @@ -117,6 +122,16 @@ public: void set_uneven( bool const Uneven ) { m_uneven = Uneven; } + // a point of the path and the unit vector across it in the plan + void + plan_frame( double const Distance, glm::dvec3 &Point, glm::dvec3 &Across ) const; + float + design_roll( int const End ) const { + return m_designrolls[ End ]; } + void + set_joint( int const End, std::optional> const &Joint, float const Roll ) { + m_joints[ End ] = Joint; + ( End == 0 ? fRoll1 : fRoll2 ) = Roll; } // second derivative of the displacement along the path; times speed squared: acceleration of an axle glm::dvec3 uneven_bend( double const Distance ) const; diff --git a/world/Track.cpp b/world/Track.cpp index b5589eedc..6ac1ce7c6 100644 --- a/world/Track.cpp +++ b/world/Track.cpp @@ -1561,8 +1561,72 @@ void TTrack::rebuild_geometry( gfx::geometrybank_handle const &Bank ) { create_geometry( Bank ); } +void TTrack::share_joints() { + + int const paths { eType == tt_Switch ? 2 : 1 }; + auto const segment_of = []( TTrack const &Track, int const Path ) -> TSegment * { + return ( Track.eType == tt_Switch ? Track.SwitchExtension->Segments[ Path ].get() : Track.Segment.get() ); }; + for( int path = 0; path < paths; ++path ) { + auto *segment { segment_of( *this, path ) }; + if( segment == nullptr ) { + continue; + } + for( int end = 0; end < 2; ++end ) { + std::optional> joint; + auto roll { segment->design_roll( end ) }; + auto const *neighbour { eType == tt_Switch ? + ( end ? SwitchExtension->pNexts[ path ] : SwitchExtension->pPrevs[ path ] ) : + ( end ? trNext : trPrev ) }; + if( neighbour != nullptr && neighbour != this && ( neighbour->iCategoryFlag & 15 ) == ( iCategoryFlag & 15 ) ) { + glm::dvec3 point; + glm::dvec3 across; + segment->plan_frame( end ? segment->GetLength() : 0.0, point, across ); + auto closest { 0.2 }; + for( int theirpath = 0; theirpath < ( neighbour->eType == tt_Switch ? 2 : 1 ); ++theirpath ) { + auto const *theirs { segment_of( *neighbour, theirpath ) }; + if( theirs == nullptr ) { + continue; + } + for( int theirend = 0; theirend < 2; ++theirend ) { + glm::dvec3 theirpoint; + glm::dvec3 theiracross; + theirs->plan_frame( theirend ? theirs->GetLength() : 0.0, theirpoint, theiracross ); + if( theirend == end ) { + theiracross = -theiracross; + } + auto const gap { glm::length( theirpoint - point ) }; + if( gap >= closest || glm::dot( across, theiracross ) < 0.9 ) { + continue; + } + closest = gap; + joint.emplace( 0.5 * ( point + theirpoint ), glm::normalize( across + theiracross ) ); + if( iCategoryFlag & 1 ) { + // the cant of a plain track is what was designed, a switch takes it; alike ones meet halfway + auto const own { segment->design_roll( end ) }; + auto const their { theirend == end ? -theirs->design_roll( theirend ) : theirs->design_roll( theirend ) }; + roll = ( + ( eType == tt_Switch ) == ( neighbour->eType == tt_Switch ) ? 0.5f * ( own + their ) : + eType == tt_Switch ? their : + own ); + } + } + } + } + segment->set_joint( end, joint, roll ); + } + } + if( eType != tt_Switch && Segment && ( iCategoryFlag & 1 ) ) { + float roll1, roll2; + Segment->GetRolls( roll1, roll2 ); + if( roll1 != 0.f || roll2 != 0.f ) { + iTrapezoid |= 1; + } + } +} + void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { gfx::userdata_array empty_userdata; + share_joints(); // bake per-instance sleeper transforms now that the owning cell has assigned m_origin. // safe to call here even if the track has no sleepermodel (early-outs internally). if( m_sleeper_enabled && m_sleeper_local_transforms.empty() ) { @@ -3845,6 +3909,11 @@ path_table::InitTracks() { isolated = isolated->Next(); } + // the physics goes by the cant at the joints too, and comes before any geometry is made + for( auto *track : m_items ) { + track->share_joints(); + } + TTrack::fetch_default_profiles(); } diff --git a/world/Track.h b/world/Track.h index 92516ee6d..f7b581b88 100644 --- a/world/Track.h +++ b/world/Track.h @@ -353,6 +353,8 @@ public: track_uneven::amounts uneven_at( double const Distance ) const; // how much of the displacement a point of the profile at the depth takes double uneven_bed_share( double const Depth ) const; + // closes the gaps and steps of cant between the ends of joined paths + void share_joints(); double joint_depth() const; // mm double joint_dip( double const Distance ) const; // m // distance from the rail joint behind; negative: the track has no joints that dip From 02abc7df0ab4baa288d977e3d2650ec1127fe999 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 31 Oct 2026 18:33:35 +0100 Subject: [PATCH 226/430] feat(track): all of the unevenness in one attribute, with values for each path of a switch Usage, before endtrack, in mm, 0-100, separated by semicolons with no spaces: a plain track: uneven value;up;side;cross;dip a switch: uneven p1-p2;p3-p4;up p1-p2;side p1-p2;up p3-p4;side p3-p4 uneven 18 the value alone uneven 18;;;25;6 with its own cross level and dip at the joints uneven 0;;30 sideways alone uneven 14;35 a switch, 14 on the straight path, 35 on the diverging What's left out takes the first number, the dip goes by the up and down one, and a path p3-p4 with no numbers of its own takes those of p1-p2. This replaces unevenup, unevenside, unevencross and jointdip. The fields in the editor stay, track panel, section Ride and sound. At the end they share, the paths of a switch keep to the lower value, and each comes to its own value along the way. Joined switches take the lowest of the same path, a path joined to another path the lower of the two, and a plain track comes to the value of the path it meets. See track_uneven_doc.md. --- application/editormodetrack.cpp | 4 +- editor/editorTrack.cpp | 17 ++- editor/editorTrack.hpp | 3 + lang/editor_pl.po | 9 ++ tests/unit/test_track_uneven.cpp | 37 +++++++ track_uneven_doc.md | 27 ++--- world/Segment.cpp | 6 +- world/Segment.h | 8 +- world/Track.cpp | 179 +++++++++++++++++++++---------- world/Track.h | 26 +++-- world/TrackUneven.h | 46 ++++++++ 11 files changed, 266 insertions(+), 96 deletions(-) diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 5b048396f..717a3657c 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -1171,10 +1171,12 @@ void editor_mode::render_path_parameters(TTrack &Track) char const *label; float *value; }; - for (auto const &part : {component{"Up and down (mm)", &track->m_unevenup}, component{"Sideways (mm)", &track->m_unevenside}, component{"Cross level (mm)", &track->m_unevencross}}) + for (auto const &part : {component{"Up and down (mm)", &track->m_unevenup}, component{"Sideways (mm)", &track->m_unevenside}, component{"Cross level (mm)", &track->m_unevencross}, component{"Diverging path (mm)", &track->m_unevenbranch}, component{"Diverging, up and down (mm)", &track->m_unevenbranchup}, component{"Diverging, sideways (mm)", &track->m_unevenbranchside}}) { if (part.value == &track->m_unevencross && track->eType != tt_Normal) continue; + if ((part.value == &track->m_unevenbranch || part.value == &track->m_unevenbranchup || part.value == &track->m_unevenbranchside) && track->eType != tt_Switch) + continue; if (ImGui::InputFloat(STR_C(part.label), part.value, 0.0f, 0.0f, "%.1f")) *part.value = *part.value < 0.f ? -1.f : std::min(*part.value, track_uneven::most); item_tooltip("Set apart from the unevenness, mm. Negative: the unevenness"); diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index cbe7c26b6..da4260077 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -156,6 +156,9 @@ editor_track::state editor_track::capture(TTrack const &Track) result.unevenup = Track.m_unevenup; result.unevenside = Track.m_unevenside; result.unevencross = Track.m_unevencross; + result.unevenbranch = Track.m_unevenbranch; + result.unevenbranchup = Track.m_unevenbranchup; + result.unevenbranchside = Track.m_unevenbranchside; result.jointdip = Track.m_jointdip; result.sleepers = Track.m_sleeper_enabled; result.sleeper_frequency = Track.m_sleeper_frequency; @@ -259,6 +262,9 @@ void editor_track::apply(TTrack &Track, state const &State) Track.m_unevenup = State.unevenup; Track.m_unevenside = State.unevenside; Track.m_unevencross = State.unevencross; + Track.m_unevenbranch = State.unevenbranch; + Track.m_unevenbranchup = State.unevenbranchup; + Track.m_unevenbranchside = State.unevenbranchside; Track.m_jointdip = State.jointdip; Track.m_sleeper_enabled = State.sleepers; Track.m_sleeper_frequency = State.sleeper_frequency; @@ -2360,16 +2366,7 @@ void write_ending(std::ostream &Text, TTrack const &Style) { if ((Style.iCategoryFlag & 15) == 1 && false == Style.m_profile1.first.empty()) Text << "railprofile " << Style.m_profile1.first << ' '; - if (Style.m_uneven > 0.f) - Text << "uneven " << Style.m_uneven << ' '; - if (Style.m_unevenup >= 0.f) - Text << "unevenup " << Style.m_unevenup << ' '; - if (Style.m_unevenside >= 0.f) - Text << "unevenside " << Style.m_unevenside << ' '; - if (Style.m_unevencross >= 0.f) - Text << "unevencross " << Style.m_unevencross << ' '; - if (Style.m_jointdip >= 0.f) - Text << "jointdip " << Style.m_jointdip << ' '; + Text << Style.uneven_text(); // a piece of the track made from another one stays in its track circuit and under the same overhead line for (auto const *isolated : Style.Isolated) Text << "isolated " << isolated->asName << ' '; diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index b6137bd8d..618583368 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -59,6 +59,9 @@ class editor_track float unevenup{-1.f}; float unevenside{-1.f}; float unevencross{-1.f}; + float unevenbranch{-1.f}; + float unevenbranchup{-1.f}; + float unevenbranchside{-1.f}; float jointdip{-1.f}; bool sleepers{false}; float sleeper_frequency{0.6f}; diff --git a/lang/editor_pl.po b/lang/editor_pl.po index a9c61b83b..dbf7c124e 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -876,6 +876,15 @@ msgstr "W poziomie (mm)" msgid "Cross level (mm)" msgstr "Przechyłka (mm)" +msgid "Diverging path (mm)" +msgstr "Tor na bok (mm)" + +msgid "Diverging, up and down (mm)" +msgstr "Na bok, w pionie (mm)" + +msgid "Diverging, sideways (mm)" +msgstr "Na bok, w poziomie (mm)" + msgid "Set apart from the unevenness, mm. Negative: the unevenness" msgstr "Osobno od nierówności, mm. Ujemna: wartość nierówności" diff --git a/tests/unit/test_track_uneven.cpp b/tests/unit/test_track_uneven.cpp index 46bd1e5f6..22970fa63 100644 --- a/tests/unit/test_track_uneven.cpp +++ b/tests/unit/test_track_uneven.cpp @@ -140,6 +140,43 @@ TEST_CASE("uneven track: the field stays within its bound") CHECK(highest > 0.5); } +TEST_CASE("uneven track: all the values in one attribute") +{ + auto const one{track_uneven::read_fields<6>("18")}; + CHECK(one[0] == doctest::Approx(18.f)); + CHECK(one[1] < 0.f); + auto const both{track_uneven::read_fields<6>("14;35")}; + CHECK(both[0] == doctest::Approx(14.f)); + CHECK(both[1] == doctest::Approx(35.f)); + CHECK(both[2] < 0.f); + auto const gaps{track_uneven::read_fields<6>("18.5;;;25;6")}; + CHECK(gaps[0] == doctest::Approx(18.5f)); + CHECK(gaps[1] < 0.f); + CHECK(gaps[2] < 0.f); + CHECK(gaps[3] == doctest::Approx(25.f)); + CHECK(gaps[4] == doctest::Approx(6.f)); + auto const bounds{track_uneven::read_fields<6>("500;-3;x")}; + CHECK(bounds[0] == doctest::Approx(track_uneven::most)); + CHECK(bounds[1] == doctest::Approx(0.f)); + CHECK(bounds[2] < 0.f); + CHECK(track_uneven::write_fields<6>({14.f, 35.f, -1.f, -1.f, -1.f, -1.f}) == "14;35"); + CHECK(track_uneven::write_fields<6>({18.5f, -1.f, -1.f, 25.f, 6.f, -1.f}) == "18.5;;;25;6"); + CHECK(track_uneven::write_fields<6>({0.f, -1.f, 30.f, -1.f, -1.f, -1.f}) == "0;;30"); + CHECK(track_uneven::write_fields<6>({18.f, -1.f, -1.f, -1.f, -1.f, -1.f}) == "18"); +} + +TEST_CASE("uneven track: amounts take the lowest of each component") +{ + auto const least{track_uneven::least({14.0, 9.0, 0.0}, {7.0, 35.0, 3.0})}; + CHECK(least.up == doctest::Approx(7.0)); + CHECK(least.side == doctest::Approx(9.0)); + CHECK(least.cross == doctest::Approx(0.0)); + // the diverging path of a switch: from the common end at the lowest to its own value at the far end + double const length{30.0}; + CHECK(track_uneven::along(35.0, 7.0, 35.0, 0.0, length) == doctest::Approx(7.0)); + CHECK(track_uneven::along(35.0, 7.0, 35.0, length, length) == doctest::Approx(35.0)); +} + TEST_CASE("uneven track: the value along a track meets its neighbours exactly") { double const length{500.0}; diff --git a/track_uneven_doc.md b/track_uneven_doc.md index a9b888aef..cbbb70c03 100644 --- a/track_uneven_doc.md +++ b/track_uneven_doc.md @@ -1,6 +1,6 @@ # Nierówności toru -Opcjonalne atrybuty wpisu toru, przed `endtrack`: +Opcjonalny atrybut wpisu toru, przed `endtrack`: ``` node -1 0 tor1 track normal 100.0 1.435 0.15 25.0 20 0 flat vis @@ -10,21 +10,22 @@ rail_screw_used1 6 1435mm/tpbps-new2 0.2 0.5 1.1 0.0 0.0 0.0 0.0 0.2 100.0 0.0 0.0 -uneven 18 -unevencross 25 -jointdip 6 +uneven 18;;;25;6 endtrack ``` -| atrybut | dotyczy | opis | -|-------------------|-----------------------|---------------------------------------------------------------------------------------| -| `uneven ` | `normal`, `switch` | największa odchyłka toku szynowego na cięciwie 10 m; 0-100, domyślnie 0 | -| `unevenup ` | `normal`, `switch` | składowa w pionie, osobno od `uneven` | -| `unevenside ` | `normal`, `switch` | składowa w poziomie, osobno od `uneven` | -| `unevencross `| `normal` | składowa przechyłki, osobno od `uneven`; rozjazd jej nie ma | -| `jointdip ` | `normal` | głębokość zapadnięcia na styku szyn; 0-100, domyślnie 0,4 składowej w pionie | +Liczby w mm, 0-100, rozdzielone średnikiem, bez spacji: -Składowa niepodana przyjmuje wartość `uneven`. Na przykład sam bok to `unevenside 30`, a same zapadnięcia na stykach to `jointdip 6`. +| pozycja | tor `normal` | rozjazd `switch` | +|---------|--------------------------------------------------|-----------------------------| +| 1 | największa odchyłka toku na cięciwie 10 m | to samo, droga p1-p2 | +| 2 | w pionie | droga p3-p4 | +| 3 | w poziomie | droga p1-p2, w pionie | +| 4 | przechyłka | droga p1-p2, w poziomie | +| 5 | zapadnięcie na styku, domyślnie 0,4 pionu | droga p3-p4, w pionie | +| 6 | | droga p3-p4, w poziomie | + +Pozycję pominiętą zastępuje pierwsza liczba, a zapadnięcie liczy się z pionu. Końcowe można opuścić. Sam bok to `uneven 0;;30`, a same zapadnięcia na stykach to `uneven 0;;;;6`. Rozjazd bez składowych na drodze p3-p4 przyjmuje wartości z drogi p1-p2. Rozjazd na 100 km/h na wprost i 40 km/h na bok to na przykład `uneven 14;35`. Wszystkie są też w edytorze, w panelu toru, w sekcji „Ride and sound”. Na drogach, rzekach i obrotnicach są ignorowane. @@ -56,7 +57,7 @@ Nierówność to pole przesunięć zależne od położenia na mapie, złożone z Każda składowa łączy się osobno: - **Tor z torem:** na styku obowiązuje mniejsza z dwóch wartości, a każdy tor dochodzi do niej płynnie na 20 m. Wolny koniec toru leży w projekcie. -- **Rozjazd:** wszystkie jego drogi mają jedną wartość. Rozjazdy złączone bezpośrednio przyjmują najmniejszą ze swoich. Dołączony tor dochodzi do wartości rozjazdu, także większej od własnej. Tor bez danej składowej trzyma w niej cały rozjazd w projekcie. +- **Rozjazd:** każda droga ma swoją wartość, a na wspólnym końcu obu obowiązuje mniejsza z nich. Rozjazdy złączone bezpośrednio przyjmują najmniejszą z tej samej drogi, a na styku dwóch dróg mniejszą z obu. Dołączony tor dochodzi do wartości rozjazdu na końcu, do którego dochodzi, także większej od własnej. Tor bez danej składowej trzyma w niej cały rozjazd w projekcie. - **Styki:** zapadnięcia są co `fSoundDistance`, na długości 6 m, i biegną dalej przez kolejne tory o tym samym odstępie. Stukot osi wypada w miejscu zapadnięcia. Przy odstępie 6 m lub mniejszym oraz na rozjazdach zapadnięć nie ma. - **Przechyłka:** dolicza się do projektowej. Jest pochyleniem w planie mapy, więc tory wpisane ku sobie spotykają się na tej samej przechyłce. Na rozjazdach tylko ta wynikająca z fal, bez osobnego siadania toków. diff --git a/world/Segment.cpp b/world/Segment.cpp index 16f878c9c..dd236c61a 100644 --- a/world/Segment.cpp +++ b/world/Segment.cpp @@ -381,7 +381,7 @@ void TSegment::RaPositionGet(double const fDistance, glm::dvec3 &position, glm:: // direction and slope stay as designed: the physics takes the curve radius and the grade from them auto const gauge { std::max( std::abs( pOwner->fTrackWidth ), 0.1f ) }; glm::dvec3 const across { -std::cos( rotation.z ), 0.0, -std::sin( rotation.z ) }; - auto const amount { pOwner->uneven_at( fDistance ) }; + auto const amount { pOwner->uneven_at( fDistance, m_path ) }; rotation.x += static_cast( track_uneven::stray_per_mm * ( amount.up * track_uneven::roll( position, across, gauge ) + amount.cross * track_uneven::level( position, across ) / gauge ) ); @@ -389,7 +389,7 @@ void TSegment::RaPositionGet(double const fDistance, glm::dvec3 &position, glm:: } glm::dvec3 TSegment::stray( glm::dvec3 const &Point, double const Distance ) const { - auto const amount { pOwner->uneven_at( Distance ) }; + auto const amount { pOwner->uneven_at( Distance, m_path ) }; auto const field { track_uneven::field( Point ) }; glm::dvec3 result { field.x * amount.side, field.y * amount.up, field.z * amount.side }; result *= track_uneven::stray_per_mm; @@ -416,7 +416,7 @@ void TSegment::settle_vertex( gfx::basic_vertex &Vertex, glm::dvec3 const &Origi auto const gauge { std::max( std::abs( pOwner->fTrackWidth ), 0.1f ) }; auto const across { std::clamp( glm::dot( Vertex.position - Position, Parallel ), -0.5f * gauge, 0.5f * gauge ) }; auto const share { pOwner->uneven_bed_share( Position.y - Vertex.position.y ) }; - Vertex.position.y -= static_cast( share * track_uneven::stray_per_mm * pOwner->uneven_at( Distance ).cross * track_uneven::level( Origin + glm::dvec3 { Position }, glm::dvec3 { Parallel } ) * across / gauge ); + Vertex.position.y -= static_cast( share * track_uneven::stray_per_mm * pOwner->uneven_at( Distance, m_path ).cross * track_uneven::level( Origin + glm::dvec3 { Position }, glm::dvec3 { Parallel } ) * across / gauge ); Vertex.position += glm::vec3 { share * stray( Origin + glm::dvec3 { Vertex.position }, Distance ) }; } diff --git a/world/Segment.h b/world/Segment.h index 7af8a894f..77e61f904 100644 --- a/world/Segment.h +++ b/world/Segment.h @@ -50,9 +50,10 @@ class TSegment float fRoll1 { 0.f }; float fRoll2 { 0.f }; // przechyłka na końcach float m_designrolls[ 2 ] { 0.f, 0.f }; // as entered; the two above can differ at a joint + bool m_uneven { false }; // see TrackUneven.h + int m_path { 0 }; // which path of a switch // where the path meets the next one: the middle of their ends and their common vector across std::optional> m_joints[ 2 ]; - bool m_uneven { false }; // see TrackUneven.h double fLength { -1.0 }; // długość policzona std::vector fTsBuffer; // wartości parametru krzywej t dla równych odcinków s std::vector fTsSlope; // nachylenie dt/du (= dt/ds * fStep) w tych samych punktach @@ -120,8 +121,9 @@ public: void RaPositionGet(double const fDistance, glm::dvec3 &position, glm::vec3 &rotation) const; // call before Init, it sets the density of the geometry void - set_uneven( bool const Uneven ) { - m_uneven = Uneven; } + set_uneven( bool const Uneven, int const Path = 0 ) { + m_uneven = Uneven; + m_path = Path; } // a point of the path and the unit vector across it in the plan void plan_frame( double const Distance, glm::dvec3 &Point, glm::dvec3 &Across ) const; diff --git a/world/Track.cpp b/world/Track.cpp index 6ac1ce7c6..8359f78a2 100644 --- a/world/Track.cpp +++ b/world/Track.cpp @@ -49,6 +49,9 @@ TTrack::profiles_array TTrack::m_profiles; TTrack::profiles_map TTrack::m_profilesmap; int TTrack::s_layoutstamp { 0 }; +// how near an end of a path counts as being at a point, m +static double const switch_end_reach { 0.3 }; + TSwitchExtension::TSwitchExtension(TTrack *owner, int const what) { // na początku wszystko puste pNexts[0] = nullptr; // wskaźniki do kolejnych odcinków ruchu @@ -639,24 +642,10 @@ void TTrack::Load(cParser *parser, glm::dvec3 const &pOrigin) } } else if( str == "uneven" ) { - // uneven : see TrackUneven.h - auto const uneven { parser->getToken() }; + // uneven [;...]: see read_uneven and TrackUneven.h. The semicolons stay in the token + auto const values { parser->getToken( false, "\n\r\t " ) }; if( ( eType == tt_Normal || eType == tt_Switch ) && iCategoryFlag == 1 ) { - m_uneven = std::clamp( uneven, 0.f, track_uneven::most ); - } - } - else if( str == "unevenup" || str == "unevenside" || str == "unevencross" ) { - // the components of uneven set apart, mm - auto const value { parser->getToken() }; - if( ( eType == tt_Normal || eType == tt_Switch ) && iCategoryFlag == 1 ) { - ( str == "unevenup" ? m_unevenup : str == "unevenside" ? m_unevenside : m_unevencross ) = std::clamp( value, 0.f, track_uneven::most ); - } - } - else if( str == "jointdip" ) { - // jointdip : depth of the dip at rail joints, with or without uneven - auto const jointdip { parser->getToken() }; - if( eType == tt_Normal && iCategoryFlag == 1 ) { - m_jointdip = std::clamp( jointdip, 0.f, track_uneven::most ); + read_uneven( values ); } } else if( str == "friction" ) { @@ -717,18 +706,56 @@ void TTrack::Load(cParser *parser, glm::dvec3 const &pOrigin) // to a stale origin and the renderer would draw sleepers in the wrong place). } -track_uneven::amounts TTrack::uneven_declared() const { +void TTrack::read_uneven( std::string const &Text ) { - return { + auto const fields { track_uneven::read_fields<6>( Text ) }; + m_uneven = std::max( fields[ 0 ], 0.f ); + if( eType == tt_Switch ) { + m_unevenbranch = fields[ 1 ]; + m_unevenup = fields[ 2 ]; + m_unevenside = fields[ 3 ]; + m_unevenbranchup = fields[ 4 ]; + m_unevenbranchside = fields[ 5 ]; + } + else { + m_unevenup = fields[ 1 ]; + m_unevenside = fields[ 2 ]; + m_unevencross = fields[ 3 ]; + m_jointdip = fields[ 4 ]; + } +} + +std::string TTrack::uneven_text() const { + + auto const fields { eType == tt_Switch ? + std::array { m_uneven, m_unevenbranch, m_unevenup, m_unevenside, m_unevenbranchup, m_unevenbranchside } : + std::array { m_uneven, m_unevenup, m_unevenside, m_unevencross, m_jointdip, -1.f } }; + if( m_uneven <= 0.f && std::all_of( fields.begin() + 1, fields.end(), []( float const Field ) { return Field < 0.f; } ) ) { + return {}; + } + return "uneven " + track_uneven::write_fields( fields ) + ' '; +} + +track_uneven::amounts TTrack::uneven_declared( int const Path ) const { + + track_uneven::amounts result { m_unevenup >= 0.f ? m_unevenup : m_uneven, m_unevenside >= 0.f ? m_unevenside : m_uneven, eType != tt_Normal ? 0.f : m_unevencross >= 0.f ? m_unevencross : m_uneven }; + if( Path == 1 ) { + auto const branch = [ this ]( float const Part, double const Straight ) -> double { + return Part >= 0.f ? Part : m_unevenbranch >= 0.f ? m_unevenbranch : Straight; }; + result.up = branch( m_unevenbranchup, result.up ); + result.side = branch( m_unevenbranchside, result.side ); + } + return result; } bool TTrack::is_uneven() const { - auto const declared { uneven_declared() }; - return declared.up > 0.0 || declared.side > 0.0 || declared.cross > 0.0 || joint_depth() > 0.0; + auto const any = []( track_uneven::amounts const &Amount ) { + return Amount.up > 0.0 || Amount.side > 0.0 || Amount.cross > 0.0; }; + return any( uneven_declared( 0 ) ) || any( uneven_declared( 1 ) ) || joint_depth() > 0.0; } double TTrack::uneven_bed_share( double const Depth ) const { @@ -736,61 +763,109 @@ double TTrack::uneven_bed_share( double const Depth ) const { return track_uneven::bed_share( Depth, std::abs( track_rail_profile( m_profile1.second ).front().position.y ), fTexHeight1 ); } -track_uneven::amounts TTrack::uneven_at( double const Distance ) const { +track_uneven::amounts TTrack::uneven_at( double const Distance, int const Path ) const { + auto const along = [ Distance ]( track_uneven::amounts const &Own, track_uneven::amounts const &Start, track_uneven::amounts const &End, double const Length ) -> track_uneven::amounts { + return { + track_uneven::along( Own.up, Start.up, End.up, Distance, Length ), + track_uneven::along( Own.side, Start.side, End.side, Distance, Length ), + track_uneven::along( Own.cross, Start.cross, End.cross, Distance, Length ) }; }; if( eType == tt_Switch ) { - return switch_uneven(); + auto const &stray { switch_uneven() }; + return along( stray.paths[ Path ], stray.ends[ Path ][ 0 ], stray.ends[ Path ][ 1 ], SwitchExtension->Segments[ Path ]->GetLength() ); } auto const own { uneven_declared() }; - auto const atend = [&]( TTrack const *Other ) -> track_uneven::amounts { + auto const atend = [&]( TTrack const *Other, glm::dvec3 const &Point ) -> track_uneven::amounts { if( Other == nullptr ) { return {}; } if( Other->eType == tt_Switch ) { - return Other->switch_uneven(); + return Other->switch_uneven_at( Point ); } - auto const theirs { Other->uneven_declared() }; - return { std::min( own.up, theirs.up ), std::min( own.side, theirs.side ), std::min( own.cross, theirs.cross ) }; }; - auto const start { atend( trPrev ) }; - auto const end { atend( trNext ) }; - return { - track_uneven::along( own.up, start.up, end.up, Distance, Length() ), - track_uneven::along( own.side, start.side, end.side, Distance, Length() ), - track_uneven::along( own.cross, start.cross, end.cross, Distance, Length() ) }; + return track_uneven::least( own, Other->uneven_declared() ); }; + return along( own, atend( trPrev, Segment->FastGetPoint_0() ), atend( trNext, Segment->FastGetPoint_1() ), Length() ); } -track_uneven::amounts TTrack::switch_uneven() const { +TTrack::switch_stray const &TTrack::switch_uneven() const { if( m_switchstray.stamp == s_layoutstamp ) { - return m_switchstray.value; + return m_switchstray; } std::vector group { this }; - auto least { uneven_declared() }; + std::array least { uneven_declared( 0 ), uneven_declared( 1 ) }; for( std::size_t index = 0; index < group.size(); ++index ) { auto const &extension { *group[ index ]->SwitchExtension }; for( auto const *other : { extension.pPrevs[ 0 ], extension.pPrevs[ 1 ], extension.pNexts[ 0 ], extension.pNexts[ 1 ] } ) { if( other == nullptr ) { continue; } - auto const theirs { other->uneven_declared() }; if( other->eType == tt_Switch && other->SwitchExtension ) { - least.up = std::min( least.up, theirs.up ); - least.side = std::min( least.side, theirs.side ); + least[ 0 ] = track_uneven::least( least[ 0 ], other->uneven_declared( 0 ) ); + least[ 1 ] = track_uneven::least( least[ 1 ], other->uneven_declared( 1 ) ); if( std::find( group.begin(), group.end(), other ) == group.end() ) { group.push_back( other ); } } else { // a track with none of a component keeps to its design in it, any other comes to the value of the switch - if( theirs.up <= 0.0 ) { least.up = 0.0; } - if( theirs.side <= 0.0 ) { least.side = 0.0; } + auto const theirs { other->uneven_declared() }; + for( auto &path : least ) { + if( theirs.up <= 0.0 ) { path.up = 0.0; } + if( theirs.side <= 0.0 ) { path.side = 0.0; } + } } } } for( auto const *track : group ) { - track->m_switchstray = { least, s_layoutstamp }; + track->m_switchstray.paths = least; + track->m_switchstray.stamp = s_layoutstamp; } - return least; + // the lowest of the paths of a switch ending at a point + auto const paths_at = []( TTrack const &Track, glm::dvec3 const &Point ) { + auto result { track_uneven::least( Track.m_switchstray.paths[ 0 ], Track.m_switchstray.paths[ 1 ] ) }; + auto found { false }; + track_uneven::amounts ending { track_uneven::most, track_uneven::most, track_uneven::most }; + for( int path = 0; path < 2; ++path ) { + auto const &segment { *Track.SwitchExtension->Segments[ path ] }; + if( glm::length( segment.FastGetPoint_0() - Point ) < switch_end_reach || glm::length( segment.FastGetPoint_1() - Point ) < switch_end_reach ) { + ending = track_uneven::least( ending, Track.m_switchstray.paths[ path ] ); + found = true; + } + } + return found ? ending : result; }; + for( auto const *track : group ) { + auto const &extension { *track->SwitchExtension }; + for( int path = 0; path < 2; ++path ) { + auto const &segment { *extension.Segments[ path ] }; + for( int end = 0; end < 2; ++end ) { + auto const point { end == 0 ? segment.FastGetPoint_0() : segment.FastGetPoint_1() }; + auto value { paths_at( *track, point ) }; + auto const *other { end == 0 ? extension.pPrevs[ path ] : extension.pNexts[ path ] }; + if( other != nullptr && other->eType == tt_Switch && other->SwitchExtension ) { + value = track_uneven::least( value, paths_at( *other, point ) ); + } + track->m_switchstray.ends[ path ][ end ] = value; + } + } + } + return m_switchstray; +} + +track_uneven::amounts TTrack::switch_uneven_at( glm::dvec3 const &Point ) const { + + auto const &stray { switch_uneven() }; + auto found { false }; + track_uneven::amounts result { track_uneven::most, track_uneven::most, track_uneven::most }; + for( int path = 0; path < 2; ++path ) { + auto const &segment { *SwitchExtension->Segments[ path ] }; + for( int end = 0; end < 2; ++end ) { + if( glm::length( ( end == 0 ? segment.FastGetPoint_0() : segment.FastGetPoint_1() ) - Point ) < switch_end_reach ) { + result = track_uneven::least( result, stray.ends[ path ][ end ] ); + found = true; + } + } + } + return found ? result : track_uneven::least( stray.paths[ 0 ], stray.paths[ 1 ] ); } double TTrack::joint_depth() const { @@ -896,7 +971,7 @@ void TTrack::init_segments( bool const Initial ) { ++s_layoutstamp; if( eType == tt_Switch && SwitchExtension ) { SwitchExtension->Segments[ 0 ]->set_uneven( is_uneven() ); - SwitchExtension->Segments[ 1 ]->set_uneven( is_uneven() ); + SwitchExtension->Segments[ 1 ]->set_uneven( is_uneven(), 1 ); } else if( Segment ) { Segment->set_uneven( is_uneven() ); @@ -2707,21 +2782,7 @@ TTrack::export_as_text_( std::ostream &Output ) const { && false == m_profile1.first.empty() ) { Output << "railprofile " << m_profile1.first << ' '; } - if( m_uneven > 0.f ) { - Output << "uneven " << m_uneven << ' '; - } - if( m_unevenup >= 0.f ) { - Output << "unevenup " << m_unevenup << ' '; - } - if( m_unevenside >= 0.f ) { - Output << "unevenside " << m_unevenside << ' '; - } - if( m_unevencross >= 0.f ) { - Output << "unevencross " << m_unevencross << ' '; - } - if( m_jointdip >= 0.f ) { - Output << "jointdip " << m_jointdip << ' '; - } + Output << uneven_text(); if( false == m_friction.first.empty() ) { Output << "friction " << m_friction.first << ' '; } diff --git a/world/Track.h b/world/Track.h index f7b581b88..1d366ebfe 100644 --- a/world/Track.h +++ b/world/Track.h @@ -244,6 +244,10 @@ public: float m_unevenup { -1.f }; float m_unevenside { -1.f }; float m_unevencross { -1.f }; + // the diverging path of a switch, mm; negative: as the straight one + float m_unevenbranch { -1.f }; + float m_unevenbranchup { -1.f }; + float m_unevenbranchside { -1.f }; float m_jointdip { -1.f }; // depth of the dip at rail joints, mm; negative: from m_uneven; plain tracks only private: double fVelocity = -1.0; // ograniczenie prędkości // prędkość dla AI (powyżej rośnie prawdopowobieństwo wykolejenia) @@ -346,11 +350,15 @@ public: void VelocitySet(float v); double VelocityGet(); float Friction() const; - // the unevenness the track declares - track_uneven::amounts uneven_declared() const; + // the attribute of the entry. A plain track: the value;up and down;sideways;cross level;dip at the joints. + // A switch: path p1-p2;path p3-p4;up and down of the first;sideways of the first;up and down of the second;sideways of the second + void read_uneven( std::string const &Text ); + std::string uneven_text() const; + // the unevenness the track declares, on a path of a switch + track_uneven::amounts uneven_declared( int const Path = 0 ) const; bool is_uneven() const; - // the unevenness at a distance along the track, meeting the tracks joined at its ends - track_uneven::amounts uneven_at( double const Distance ) const; + // the unevenness at a distance along a path, meeting the tracks joined at its ends + track_uneven::amounts uneven_at( double const Distance, int const Path = 0 ) const; // how much of the displacement a point of the profile at the depth takes double uneven_bed_share( double const Depth ) const; // closes the gaps and steps of cant between the ends of joined paths @@ -398,13 +406,17 @@ private: }; void settle_rail_run() const; mutable rail_run m_railrun; - // one value along all paths of a switch: the lowest of the switches joined, 0 next to a track with none - track_uneven::amounts switch_uneven() const; + // the value along each path of a switch: the lowest of that path in the switches joined, 0 next to a track with none. + // And at the ends of the paths, by what meets there: the other path at the common end, the path of a switch joined struct switch_stray { - track_uneven::amounts value; + std::array paths; + std::array, 2> ends; int stamp { -1 }; }; mutable switch_stray m_switchstray; + switch_stray const &switch_uneven() const; + // the value of a switch where a track joined to it meets it + track_uneven::amounts switch_uneven_at( glm::dvec3 const &Point ) const; static int s_layoutstamp; // bumped when tracks are joined or changed, invalidates the two above void create_road_profile( gfx::vertex_array &Output, bool const Forcetransition = false ); void create_road_side_profile( gfx::vertex_array &Right, gfx::vertex_array &Left, gfx::vertex_array const &Road, bool const Forcetransition = false ); diff --git a/world/TrackUneven.h b/world/TrackUneven.h index 182f37995..f4a50eb7a 100644 --- a/world/TrackUneven.h +++ b/world/TrackUneven.h @@ -11,7 +11,10 @@ http://mozilla.org/MPL/2.0/. #include #include +#include #include +#include +#include #include #include @@ -34,6 +37,11 @@ struct amounts { double cross { 0.0 }; }; +inline amounts least( amounts const &Left, amounts const &Right ) { + + return { std::min( Left.up, Right.up ), std::min( Left.side, Right.side ), std::min( Left.cross, Right.cross ) }; +} + struct wave { double x; double z; @@ -41,6 +49,44 @@ struct wave { double share; }; +// the numbers of an entry like "uneven 14;35", negative where left out +template +std::array read_fields( std::string const &Text ) { + + std::array result; + result.fill( -1.f ); + std::size_t start { 0 }; + for( std::size_t index = 0; index < Count && start < Text.size(); ++index ) { + auto const end { std::min( Text.find( ';', start ), Text.size() ) }; + auto value { 0.f }; + if( end > start && std::from_chars( Text.data() + start, Text.data() + end, value ).ec == std::errc {} ) { + result[ index ] = std::clamp( value, 0.f, most ); + } + start = end + 1; + } + return result; +} + +// and back, with the ones left out at the end dropped +template +std::string write_fields( std::array const &Fields ) { + + auto count { Count }; + while( count > 1 && Fields[ count - 1 ] < 0.f ) { + --count; + } + std::ostringstream text; + for( std::size_t index = 0; index < count; ++index ) { + if( index > 0 ) { + text << ';'; + } + if( Fields[ index ] >= 0.f ) { + text << Fields[ index ]; + } + } + return text.str(); +} + template using wave_set = std::array; From 798e8d6a843b5376f1a99f4b82839f84d20a5b4a Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 31 Oct 2026 18:35:00 +0100 Subject: [PATCH 227/430] feat(tools): grade the tracks of any scenery for the uneven attribute Usage: python tools/track_uneven_grade.py scenery/lk357.scn --out graded python tools/track_uneven_grade.py scenery/baltyk_skm1.scn --out graded --route -107,2300 -4120,2491 It follows the includes from a .scn, .scm or .inc, and takes the state of each track from what the scenery shows: ballast and rail textures, grass on the track, curves, speed and road crossings. The originals stay as they are, copies of the files with tracks go to --out, and with no --out it only reports. Values stay under what a pantograph can follow on those tracks, by simulation, the rise of the wire itself not counted. Tracks in .inc files taking parameters are skipped and rotate blocks not applied, the report says so. See track_uneven_doc.md. --- tools/track_uneven_grade.py | 549 ++++++++++++++++++++++++++++++++++++ track_uneven_doc.md | 17 ++ 2 files changed, 566 insertions(+) create mode 100644 tools/track_uneven_grade.py diff --git a/tools/track_uneven_grade.py b/tools/track_uneven_grade.py new file mode 100644 index 000000000..eb39d7c67 --- /dev/null +++ b/tools/track_uneven_grade.py @@ -0,0 +1,549 @@ +#!/usr/bin/env python3 +"""Grades the tracks of any scenery for the uneven attribute, from what the scenery shows: textures, grass on the track, +curves, speed and road crossings. The originals stay as they are, graded copies of the files with tracks go to --out. + + python track_uneven_grade.py scenery/td.scn + python track_uneven_grade.py scenery/baltyk_skm1.scn --out graded + python track_uneven_grade.py scenery/baltyk_skm1.scn --out graded --route -107,2300 -4120,2491 --straight tor0290,tor0906 + python track_uneven_grade.py scenery/mytracks.scm --root scenery --out graded --gain 1.2 + +With no --out it only reports. See track_uneven_doc.md for the attribute. Python 3.8 or later, no other packages. +""" +import argparse +import collections +import heapq +import math +import pathlib +import re +import sys +import zlib + +# PLK Id-14 appendix 1, class C: vertical limit in mm by speed in km/h +LIMITS = [(20, 50), (30, 40), (40, 35), (50, 30), (60, 25), (70, 21), (80, 18), (90, 16), (100, 14), (110, 12), (120, 10), (130, 9), (140, 8), (150, 7), (160, 6)] +# how worn a texture looks, 0-1: the first pattern found in its name counts, anything else is 0.5 +BALLAST_WEAR = [("grass|traw", 0.95), ("old|star", 0.9), ("oil|smar", 0.6), ("new|nowa", 0.0), ("bps|beton|conc|tpb", 0.2), ("drew|wood|tpd", 0.45)] +RAIL_WEAR = [("unused2", 1.0), ("unused", 0.85), ("rused2", 0.8), ("rused", 0.65), ("used2", 0.45), ("used", 0.2), ("new", 0.0), ("old|rust", 0.8)] +WOOD = re.compile("drew|wood|tpd") +GRASS = re.compile("grass|traw|chwast|weed") +NO_SPEED = 40.0 # km/h, a stretch with no velocity anywhere: station and side tracks +SWITCH_MOST = 35.0 # the limit of 40 km/h +DIVERGING = 40.0 # km/h through the diverging path +MOST, MOST_UP = 50.0, 60.0 # of uneven and of its vertical part +REACH = 0.3 # how near the ends of tracks count as joined, m +SHORT = 2.0 # the pieces inside a slip don't tell the quality of the line +PIECE = 100.0 # a track without a speed shorter than this can take it through a switch, m +GRASS_NEAR, GRASS_FULL = 2.5, 14.0 # grass this near the middle grows on the track; plants per 100 m of an overgrown one +NEAR_LEAST, NEAR_MOST = 0.5, 0.95 # how far a chosen track goes towards the limit +CURVE_STEP = 1.0 / 2500.0 # a difference of curvature that counts as a change, 1/m +RISE = 0.0273 * 4.5 # how fast pressure lifts a pantograph, m/s, by TDynamicObject::Update +GAP_MOST = 0.006 # the gap to the wire allowed; at 0.01 m the voltage goes and the main breaker trips +OVERSPEED = 1.1 # a driver can go this much over the speed of the track +# as up_waves and the dip of the joints in world/TrackUneven.h +STRAY_PER_MM, DIP_SHARE, DIP_REACH = 0.00145, 0.4, 3.0 +GOLDEN = math.pi * (3.0 - math.sqrt(5.0)) +UP_WAVES = [(2 * math.pi / length * math.cos(GOLDEN * i), 2 * math.pi / length * math.sin(GOLDEN * i), GOLDEN * (i + 1), share) for i, (length, share) in enumerate(zip((8.3, 11.9, 16.7, 23.9, 37.1, 47.3, 61.9, 83.3), (.14, .19, .22, .22, .23, .23, .23, .23)))] +TOKEN = re.compile(r"//[^\n]*|\S+") +NUMBER = re.compile(r"^[-+]?\d*\.?\d+([eE][-+]?\d+)?$") + + +def limit(speed): + if speed <= LIMITS[0][0]: + return float(LIMITS[0][1]) + for (v0, n0), (v1, n1) in zip(LIMITS, LIMITS[1:]): + if speed <= v1: + return n0 + (n1 - n0) * (speed - v0) / (v1 - v0) + return float(LIMITS[-1][1]) + + +def wear(name, table): + name = (name or "").lower() + for pattern, value in table: + if re.search(pattern, name): + return value + return 0.5 + + +def hashed(salt, name): + return zlib.crc32(salt + name.encode("latin-1", "replace")) / 0xffffffff + + +class Scenery: + """All that's found by following the includes from the given files.""" + + def __init__(self, root): + self.root = root + self.tracks, self.roads, self.plants = [], [], collections.defaultdict(list) + self.seen = set() + self.notes = collections.Counter() + self.texts = {} + + def read(self, path, offset=(0.0, 0.0, 0.0)): + path = path.resolve() + if path in self.seen: + return + self.seen.add(path) + text = path.read_bytes().decode("latin-1") + self.texts[path] = text + matches = [m for m in TOKEN.finditer(text) if not m.group(0).startswith("//")] + words = [m.group(0) for m in matches] + lower = [w.lower() for w in words] + origins = [offset] + i = 0 + while i < len(words): + word = lower[i] + if word == "include" and i + 1 < len(words): + end = i + 1 + while end < len(words) and lower[end] != "end": + end += 1 + self.include(words[i + 1], words[i + 2:end], origins[-1]) + i = end + elif word == "origin" and i + 3 < len(words) and all(NUMBER.match(w) for w in words[i + 1:i + 4]): + origins.append(tuple(o + float(w) for o, w in zip(origins[-1], words[i + 1:i + 4]))) + i += 3 + elif word == "endorigin" and len(origins) > 1: + origins.pop() + elif word == "rotate" and i + 3 < len(words) and any(w.strip("0.-") for w in words[i + 1:i + 4]): + self.notes["rotate"] += 1 + elif word == "node" and i + 4 < len(words): + kind = lower[i + 4] + if kind == "track": + i = self.track(path, matches, words, lower, i, origins[-1]) + elif kind == "model" and i + 9 < len(words) and GRASS.search(lower[i + 9]) and all(NUMBER.match(w) for w in words[i + 5:i + 8]): + self.plant(float(words[i + 5]) + origins[-1][0], float(words[i + 7]) + origins[-1][2]) + i += 1 + + def include(self, name, params, origin): + path = self.root / name.replace("\\", "/") + if GRASS.search(name.lower()): + numbers = [float(w) for w in params if NUMBER.match(w)] + if len(numbers) >= 3: + self.plant(numbers[0] + origin[0], numbers[2] + origin[2]) + return + if not path.is_file(): + self.notes["brak pliku " + name] += 1 + return + if params: + # the same file can come many times with other parameters: its tracks can't be told apart in one copy + if path.stat().st_size < 4000000 and re.search(rb"\btrack\s+(normal|switch)\b", path.read_bytes(), re.I): + self.notes["pliki z parametrami, tory pominiete"] += 1 + return + self.read(path, origin) + + def plant(self, x, z): + self.plants[(round(x / 10), round(z / 10))].append((x, z)) + + def track(self, path, matches, words, lower, i, origin): + at = i + 4 + end = at + while end < len(words) and lower[end] != "endtrack": + end += 1 + if end >= len(words) or at + 10 >= end: + return i + kind = lower[at + 1] + if kind not in ("normal", "switch", "road"): + return end + cursor = at + 10 + rail = ballast = None + if lower[at + 9] == "vis": + rail, ballast = lower[cursor], lower[cursor + 2] + cursor += 6 + paths = [] + for _ in range(2 if kind == "switch" else 1): + values = words[cursor:cursor + 15] + if len(values) < 15 or not all(NUMBER.match(v) for v in values): + self.notes["tory z parametrami, pominiete"] += 1 + return end + n = [float(v) for v in values] + part = dict(p1=[n[j] + origin[j] for j in range(3)], c1=n[4:7], c2=n[7:10], p2=[n[10 + j] + origin[j] for j in range(3)], radius=abs(n[14])) + part["line"] = line_of(part) + part["length"] = sum(math.dist(a, b) for a, b in zip(part["line"], part["line"][1:])) + paths.append(part) + cursor += 15 + if kind == "road": + self.roads.append(paths[0]) + return end + block = lower[at:end] + taken = any(w in block for w in ("uneven", "unevenup", "unevenside", "unevencross", "jointdip")) + velocity = float(words[at + block.index("velocity") + 1]) if "velocity" in block and NUMBER.match(words[at + block.index("velocity") + 1]) else 0.0 + sound = float(words[at + 5]) if NUMBER.match(words[at + 5]) else -1.0 + self.tracks.append(dict(name=words[i + 3], kind=kind, rail=rail, ballast=ballast, sound=sound, paths=paths, speed=velocity if velocity > 0 else None, source="wpis" if velocity > 0 else None, file=path, offset=matches[end].start(), taken=taken)) + return end + + +def bezier(part, t): + a = [part["p1"][i] + part["c1"][i] for i in range(3)] + b = [part["p2"][i] + part["c2"][i] for i in range(3)] + u = 1 - t + return [u * u * u * part["p1"][i] + 3 * u * u * t * a[i] + 3 * u * t * t * b[i] + t * t * t * part["p2"][i] for i in range(3)] + + +def line_of(part, step=5.0): + if not any(part["c1"]) and not any(part["c2"]): + return [list(part["p1"]), list(part["p2"])] + count = max(4, int(math.dist(part["p1"], part["p2"]) / step)) + return [bezier(part, i / count) for i in range(count + 1)] + + +def plan_radius(line): + least = math.inf + for a, b, c in zip(line, line[1:], line[2:]): + area = abs((b[0] - a[0]) * (c[2] - a[2]) - (c[0] - a[0]) * (b[2] - a[2])) / 2 + if area > 1e-6: + least = min(least, math.dist((a[0], a[2]), (b[0], b[2])) * math.dist((b[0], b[2]), (c[0], c[2])) * math.dist((c[0], c[2]), (a[0], a[2])) / (4 * area)) + return least + + +def end_curve(part, key): + line = part["line"] + if len(line) < 3: + return 1.0 / part["radius"] if part["radius"] > 0 else 0.0 + a, b, c = line[:3] if key == "p1" else line[-3:] + sides = math.dist(a, b) * math.dist(b, c) * math.dist(c, a) + return 2.0 * ((b[0] - a[0]) * (c[2] - b[2]) - (b[2] - a[2]) * (c[0] - b[0])) / sides if sides > 0 else 0.0 + + +class Joints: + def __init__(self, tracks): + self.ends = collections.defaultdict(list) + for t in tracks: + for part in t["paths"]: + for key in ("p1", "p2"): + self.ends[(round(part[key][0]), round(part[key][2]))].append((t, part, key)) + + def at(self, point): + found = [] + for cx in (round(point[0]) - 1, round(point[0]), round(point[0]) + 1): + for cz in (round(point[2]) - 1, round(point[2]), round(point[2]) + 1): + for item in self.ends.get((cx, cz), ()): + if abs(item[1][item[2]][0] - point[0]) <= REACH and abs(item[1][item[2]][2] - point[2]) <= REACH: + found.append(item) + return found + + +def settle_speeds(tracks, joints): + # from the nearest track on the stretch between switches, a short piece also along the straight path of a switch + heads = collections.deque(t for t in tracks if t["kind"] == "normal" and t["speed"]) + while heads: + t = heads.popleft() + for key in ("p1", "p2"): + for other, _, _ in joints.at(t["paths"][0][key]): + if other is not t and other["kind"] == "normal" and other["speed"] is None: + other["speed"], other["source"] = t["speed"], "sasiad" + heads.append(other) + heads = collections.deque(t for t in tracks if t["kind"] == "normal" and t["speed"]) + while heads: + t = heads.popleft() + for key in ("p1", "p2"): + points, seen = [t["paths"][0][key]], set() + for _ in range(6): + onward = [] + for point in points: + for other, part, side in joints.at(point): + if other is t or id(part) in seen: + continue + seen.add(id(part)) + if other["kind"] == "switch": + if other["paths"].index(part) != other["bent"]: + onward.append(part["p2" if side == "p1" else "p1"]) + elif other["speed"] is None and other["paths"][0]["length"] < PIECE: + other["speed"], other["source"] = t["speed"], "sasiad" + heads.append(other) + points = onward + for t in tracks: + if t["speed"] is None: + t["speed"], t["source"] = NO_SPEED, "brak" + + +def distances(tracks, joints, station): + best, heap = {}, [] + for t in tracks: + for part in t["paths"]: + for key in ("p1", "p2"): + gap = math.dist((part[key][0], part[key][2]), station) + node = (round(part[key][0], 1), round(part[key][2], 1)) + if gap < 300 and t["kind"] == "normal" and gap < best.get(node, math.inf): + best[node] = gap + heapq.heappush(heap, (gap, node, part[key])) + while heap: + distance, node, point = heapq.heappop(heap) + if distance > best.get(node, math.inf): + continue + for _, part, key in joints.at(point): + other = part["p2" if key == "p1" else "p1"] + onward = (round(other[0], 1), round(other[2], 1)) + if distance + part["length"] < best.get(onward, math.inf): + best[onward] = distance + part["length"] + heapq.heappush(heap, (best[onward], onward, other)) + return best + + +def grass_on(part, plants): + near, count = set(), max(1, int(part["length"] / 3)) + line = part["line"] + for i in range(count + 1): + position = i / count * (len(line) - 1) + low = min(int(position), len(line) - 2) + share = position - low + x, z = line[low][0] + (line[low + 1][0] - line[low][0]) * share, line[low][2] + (line[low + 1][2] - line[low][2]) * share + for cx in (round(x / 10) - 1, round(x / 10), round(x / 10) + 1): + for cz in (round(z / 10) - 1, round(z / 10), round(z / 10) + 1): + for plant in plants.get((cx, cz), ()): + if (plant[0] - x) ** 2 + (plant[1] - z) ** 2 < GRASS_NEAR * GRASS_NEAR: + near.add(plant) + return len(near) * 100.0 / max(part["length"], 5.0) + + +def road_cells(roads): + cells = collections.defaultdict(list) + for road in roads: + for a, b in zip(road["line"], road["line"][1:]): + for x in range(math.floor(min(a[0], b[0]) / 50), math.floor(max(a[0], b[0]) / 50) + 1): + for z in range(math.floor(min(a[2], b[2]) / 50), math.floor(max(a[2], b[2]) / 50) + 1): + cells[(x, z)].append((a, b)) + return cells + + +def hits_road(part, cells): + for a, b in zip(part["line"], part["line"][1:]): + for x in range(math.floor(min(a[0], b[0]) / 50), math.floor(max(a[0], b[0]) / 50) + 1): + for z in range(math.floor(min(a[2], b[2]) / 50), math.floor(max(a[2], b[2]) / 50) + 1): + for c, d in cells.get((x, z), ()): + rx, rz, sx, sz = b[0] - a[0], b[2] - a[2], d[0] - c[0], d[2] - c[2] + k = rx * sz - rz * sx + if abs(k) < 1e-9: + continue + t = ((c[0] - a[0]) * sz - (c[2] - a[2]) * sx) / k + u = ((c[0] - a[0]) * rz - (c[2] - a[2]) * rx) / k + if 0 <= t <= 1 and 0 <= u <= 1: + return True + return False + + +def heights_per_mm(t): + # the height of the rail under a pantograph frame by frame, per mm of the vertical part + step = t["speed"] * OVERSPEED / 3.6 / 60.0 + heights, done = [], 0.0 + line = t["paths"][0]["line"] + for a, b in zip(line, line[1:]): + length = math.dist(a, b) + count = max(1, int(length / step)) + for i in range(count): + share = i / count + x, z = a[0] + (b[0] - a[0]) * share, a[2] + (b[2] - a[2]) * share + height = STRAY_PER_MM * sum(s * math.sin(wx * x + wz * z + phase) for wx, wz, phase, s in UP_WAVES) + if t["sound"] > 2.0 * DIP_REACH: + phase = math.fmod(done + length * share, t["sound"]) + joint = min(phase, t["sound"] - phase) + if joint < DIP_REACH: + height -= 0.001 * DIP_SHARE * math.cos(math.pi / 2 * joint / DIP_REACH) ** 2 + heights.append(height) + done += length + return heights + + +def largest_gap(heights, up): + gap = worst = 0.0 + climb = RISE / 60.0 + for before, after in zip(heights, heights[1:]): + gap = max(0.0, gap + (before - after) * up - climb) + worst = max(worst, gap) + return worst + + +def ceiling(t, product): + # the worst track of a speed comes up to it and the better ones stay under it, so the state of a track still shows + return product / t["speed"] * (0.7 + 0.3 * min(1.0, max(0.0, (t["state"] - 0.5) / 0.7))) + + +def grade(scenery, options): + tracks = scenery.tracks + joints = Joints(tracks) + for t in tracks: + if t["kind"] == "switch": + radii = [min(plan_radius(p["line"]), p["radius"] if p["radius"] > 0 else math.inf) for p in t["paths"]] + t["bent"] = 1 if len(radii) < 2 or radii[1] <= radii[0] else 0 + settle_speeds(tracks, joints) + route = None + if options.route: + first, last = options.route + from_first, from_last = distances(tracks, joints, first), distances(tracks, joints, last) + ends = [from_last[n] for n in from_last if math.dist(n, first) < 300] + route = (from_first, from_last, min(ends) if ends else math.dist(first, last)) + if not ends: + print("uwaga: po torach nie ma polaczenia miedzy punktami --route, licze w linii prostej") + cells = road_cells(scenery.roads) + normal = [t for t in tracks if t["kind"] == "normal"] + for t in tracks: + part = t["paths"][0] + radius = min(plan_radius(part["line"]), part["radius"] if part["radius"] > 0 else math.inf) + curve = 0.0 if radius >= 6000 else min(1.0, max(0.0, (1200 - radius) / 950)) + density = grass_on(part, scenery.plants) if t["kind"] == "normal" else 0.0 + crossing = t["kind"] == "normal" and hits_road(part, cells) + progress = 0.5 + if route: + shares = [] + for key in ("p1", "p2"): + node = (round(part[key][0], 1), round(part[key][2], 1)) + a, b = route[0].get(node), route[1].get(node) + if a is None or b is None: + a, b = math.dist((part[key][0], part[key][2]), options.route[0]), math.dist((part[key][0], part[key][2]), options.route[1]) + shares.append(min(1.0, max(0.0, (a - b + route[2]) / (2 * route[2])))) + progress = 0.5 * sum(shares) + state = 0.50 + 0.20 * wear(t["ballast"], BALLAST_WEAR) + 0.10 * wear(t["rail"], RAIL_WEAR) + 0.12 * min(1.0, density / GRASS_FULL) + 0.06 * curve + 0.22 * progress + 0.18 * crossing + 0.06 * (hashed(b"", t["name"]) - 0.5) + t.update(state=min(state, 1.2) * options.gain, curve=curve, crossing=crossing, grass=density) + if t["kind"] == "normal": + value = min(limit(t["speed"]) * t["state"], MOST) + t.update(value=value, up=min(value * 1.25, MOST_UP), side=min(value * (0.9 + 0.4 * curve), MOST)) + for t in normal: + t["heights"] = heights_per_mm(t) + # the largest product of the vertical part and the speed with the gap small on every track + low, high = 100, 4000 + while high - low > 25: + middle = (low + high) // 2 + if all(largest_gap(t["heights"], min(t["up"], ceiling(t, middle))) <= GAP_MOST for t in normal): + low = middle + else: + high = middle + product = low + for t in normal: + up = ceiling(t, product) + if up < t["up"]: + ratio = up / t["up"] + t["up"], t["value"], t["side"] = up, t["value"] * ratio, t["side"] * ratio + # on wooden sleepers and where the curve changes, a share of the tracks goes nearer the limit, chosen for good by the place + chosen = 0 + for t in normal: + part = t["paths"][0] + change = abs(end_curve(part, "p1") - end_curve(part, "p2")) > CURVE_STEP + for key in ("p1", "p2"): + for other, theirs, side in joints.at(part[key]): + if other is not t and other["kind"] == "normal": + their = end_curve(theirs, side) + if abs(end_curve(part, key) - (-their if side == key else their)) > CURVE_STEP: + change = True + if not (change or WOOD.search(t["ballast"] or "")): + continue + name = f"{t['name']}:{part['p1'][0]:.0f}:{part['p1'][2]:.0f}" + if hashed(b"near", name) >= options.near: + continue + value = t["value"] + (limit(t["speed"]) - t["value"]) * (NEAR_LEAST + (NEAR_MOST - NEAR_LEAST) * hashed(b"how", name)) + if value <= t["value"]: + continue + up = value + while up > t["up"] and largest_gap(t["heights"], up) > GAP_MOST: + up -= 0.5 + t["value"], t["up"], t["side"] = value, max(up, t["up"]), min(value * (0.9 + 0.4 * t["curve"]), MOST) + chosen += 1 + worst = max((largest_gap(t["heights"], t["up"]) for t in normal), default=0.0) + for t in normal: + del t["heights"] + if t["name"].lower() in options.straight: + t["value"] = t["up"] = t["side"] = 0.0 + # each path of a switch by the plain tracks it leads to, the worst of them; those only among switches from their neighbours + switches = [t for t in tracks if t["kind"] == "switch"] + for t in switches: + t["values"] = [None] * len(t["paths"]) + for index, part in enumerate(t["paths"]): + found = [o for key in ("p1", "p2") for o, theirs, _ in joints.at(part[key]) if o["kind"] == "normal" and theirs["length"] >= SHORT] + if found: + speed = max(o["speed"] for o in found) + if index == t["bent"]: + speed = min(speed, DIVERGING) + t["values"][index] = min(limit(speed) * max(o["state"] for o in found), SWITCH_MOST, product / speed) + for _ in range(5): + for t in switches: + for index, part in enumerate(t["paths"]): + if t["values"][index] is None: + found = [o["values"][i] for key in ("p1", "p2") for o, theirs, _ in joints.at(part[key]) if o["kind"] == "switch" and o is not t for i, q in enumerate(o["paths"]) if q is theirs and o["values"][i] is not None] + if found: + t["values"][index] = max(found) + for t in switches: + t["values"] = [min(SWITCH_MOST, product / NO_SPEED) if v is None else v for v in t["values"]] + return product, chosen, worst + + +def report(scenery, product, chosen, worst): + normal = [t for t in scenery.tracks if t["kind"] == "normal"] + switches = [t for t in scenery.tracks if t["kind"] == "switch"] + print(f"pliki: {len(scenery.seen)}, tory: {len(normal)}, rozjazdy: {len(switches)}, drogi: {len(scenery.roads)}, trawa: {sum(len(v) for v in scenery.plants.values())}") + print(f"pion razy km/h najwyzej {product}, blizej granicy {chosen} torow, najwieksza przerwa do drutu {worst * 100:.2f} cm (bez wznosu samego drutu)") + groups = collections.defaultdict(list) + for t in normal: + groups[(t["source"], t["speed"])].append(t) + print("predkosc skad torow km limit uneven min/mediana/max pion max") + for key in sorted(groups, key=lambda k: (-k[1], k[0])): + rows = groups[key] + values = sorted(t["value"] for t in rows) + print(f"{key[1]:8.0f} {key[0]:8} {len(rows):6} {sum(t['paths'][0]['length'] for t in rows) / 1000:6.1f} {limit(key[1]):6.1f} {values[0]:6.1f} {values[len(values) // 2]:6.1f} {values[-1]:6.1f} {max(t['up'] for t in rows):8.1f}") + if switches: + values = sorted(v for t in switches for v in t["values"]) + print(f"rozjazdy: {values[0]:.1f}-{values[-1]:.1f} mm, mediana {values[len(values) // 2]:.1f}") + for note, count in sorted(scenery.notes.items()): + print(f"uwaga: {note}: {count}" if not note.startswith("brak") else f"uwaga: {note}") + if scenery.notes["rotate"]: + print("uwaga: bloki rotate nie sa uwzgledniane, polaczenia torow z nich moga byc nierozpoznane") + taken = sum(1 for t in scenery.tracks if t["taken"]) + if taken: + print(f"uwaga: {taken} torow ma juz nierownosci, zostaja bez zmian") + + +def attribute(t): + if t["kind"] == "normal": + return f"uneven {t['value']:.1f};{t['up']:.1f};{t['side']:.1f} " if t["value"] > 0 else "" + return "uneven " + ";".join(f"{v:.1f}" for v in t["values"]) + " " + + +def write(scenery, out): + by_file = collections.defaultdict(list) + for t in scenery.tracks: + if not t["taken"]: + by_file[t["file"]].append(t) + written = 0 + for path, tracks in by_file.items(): + text = scenery.texts[path] + pieces, last = [], 0 + for t in sorted(tracks, key=lambda t: t["offset"]): + pieces += [text[last:t["offset"]], attribute(t)] + last = t["offset"] + pieces.append(text[last:]) + target = out / path.relative_to(scenery.root) + target.parent.mkdir(parents=True, exist_ok=True) + target.write_bytes("".join(pieces).encode("latin-1")) + written += 1 + print(f"zapisane pliki: {written}, w {out}") + + +def point(text): + x, z = text.split(",") + return float(x), float(z) + + +def main(): + parser = argparse.ArgumentParser(description="Ocena torow dowolnej scenerii dla atrybutu uneven.") + parser.add_argument("files", nargs="+", type=pathlib.Path, help=".scn, .scm albo .inc; includy sa czytane dalej") + parser.add_argument("--root", type=pathlib.Path, help="folder scenery, wzgledem ktorego ida includy; domyslnie folder pierwszego pliku") + parser.add_argument("--out", type=pathlib.Path, help="folder na kopie plikow z torami; bez tego tylko raport") + parser.add_argument("--route", nargs=2, type=point, metavar="X,Z", help="tory pogarszaja sie od pierwszego punktu do drugiego, liczac po torach") + parser.add_argument("--gain", type=float, default=1.0, help="mnoznik stanu torow, domyslnie 1") + parser.add_argument("--near", type=float, default=0.6, help="jaka czesc torow na drewnie i przy zmianach krzywizny idzie blizej granicy Id-14, domyslnie 0.6") + parser.add_argument("--straight", default="", help="nazwy torow bez nierownosci, po przecinku") + options = parser.parse_args() + options.straight = {name.strip().lower() for name in options.straight.split(",") if name.strip()} + root =(options.root or options.files[0].parent).resolve() + if options.out: + options.out = options.out.resolve() + if options.out == root or root in options.out.parents: + sys.exit("--out nie moze lezec w folderze scenerii: oryginaly maja zostac nietkniete") + scenery = Scenery(root) + for path in options.files: + scenery.read(path) + if not scenery.tracks: + sys.exit("nie znaleziono torow") + product, chosen, worst = grade(scenery, options) + report(scenery, product, chosen, worst) + if options.out: + write(scenery, options.out) + + +if __name__ == "__main__": + main() diff --git a/track_uneven_doc.md b/track_uneven_doc.md index cbbb70c03..325e89443 100644 --- a/track_uneven_doc.md +++ b/track_uneven_doc.md @@ -73,6 +73,23 @@ Pantograf podnosi się z szybkością ciśnienia, ok. 0,14 m/s, a szczelina do d Fizyka bierze promień łuku i pochylenie z projektu, więc nierówności nie zmieniają tych wartości, a do wykolejeń dokładają tylko przechyłkę, ok. 0,06 m/s² przy `uneven 18` wobec progu ok. 3,2 m/s². +## Ocena torów dowolnej scenerii + +`tools/track_uneven_grade.py` wylicza wartości z tego, co widać w scenerii: z tekstur podsypki i szyn, trawy na torze, łuków, prędkości i przejazdów drogowych. Czyta plik `.scn`, `.scm` albo `.inc` razem z jego includami, oryginałów nie zmienia, a kopie plików z torami zapisuje do `--out`. Bez `--out` tylko wypisuje raport. + +``` +python tools/track_uneven_grade.py scenery/lk357.scn --out graded +python tools/track_uneven_grade.py scenery/baltyk_skm1.scn --out graded --route -107,2300 -4120,2491 +``` + +- `--route X,Z X,Z`: tory pogarszają się od pierwszego punktu do drugiego, licząc po torach. +- `--gain`: mnożnik stanu torów, domyślnie 1. +- `--near`: jaka część torów na drewnie i przy zmianach krzywizny idzie bliżej granicy Id-14, domyślnie 0,6. Wybór jest stały. +- `--straight`: nazwy torów bez nierówności, po przecinku. +- `--root`: folder `scenery`, gdy podany plik leży głębiej. + +Wartości trzymają się pod sufitem pantografu, liczonym symulacją na tych torach, ale bez wznosu samego drutu. Zużycie tekstur odczytywane jest z ich nazw, według tabel na początku skryptu, a nieznana nazwa dostaje 0,5. Tory z plików `.inc` z parametrami są pomijane, a bloki `rotate` nieuwzględniane. W obu przypadkach raport wypisuje uwagę. Tor, który ma już nierówność, zostaje bez zmian. + ## Wydajność Tor z nierównością ma geometrię co 2 m zamiast co 10 m na prostych. Rozjazdy zachowują swój podział. From ec2d22668876c358723bc0925436864eac10aa5e Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 31 Oct 2026 18:58:20 +0100 Subject: [PATCH 228/430] fix(editor): the uneven attribute is written in the layout of the entry it goes into Its numbers go by position, and the positions differ between a plain track and a switch. A switch made in the style of a plain track wrote them in the layout of the plain one, so they were read back as other values: the up and down part as the value of the path p3-p4, and so on. The values are now one struct with pure functions to read, write and resolve them, which replaces eight fields and which the unit tests can reach. --- application/editormodetrack.cpp | 14 ++++---- editor/editorTrack.cpp | 22 +++--------- editor/editorTrack.hpp | 10 ++---- tests/unit/test_track_uneven.cpp | 29 +++++++++++++++ world/Track.cpp | 50 +++----------------------- world/Track.h | 15 +------- world/TrackUneven.h | 62 ++++++++++++++++++++++++++++++++ 7 files changed, 110 insertions(+), 92 deletions(-) diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 717a3657c..4e313bfd9 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -1162,8 +1162,8 @@ void editor_mode::render_path_parameters(TTrack &Track) finish_edit(rebuild::parameters); if ((track->eType == tt_Normal || track->eType == tt_Switch) && (track->iCategoryFlag & 15) == 1) { - if (ImGui::InputFloat(STR_C("Unevenness (mm)"), &track->m_uneven, 0.0f, 0.0f, "%.1f")) - track->m_uneven = std::clamp(track->m_uneven, 0.f, track_uneven::most); + if (ImGui::InputFloat(STR_C("Unevenness (mm)"), &track->m_uneven.value, 0.0f, 0.0f, "%.1f")) + track->m_uneven.value = std::clamp(track->m_uneven.value, 0.f, track_uneven::most); item_tooltip("Peak deviation of a rail on a 10 m chord. Id-14 limits: 6 mm at 160 km/h, 10 at 120, 18 at 80, 35 at 40.\nWith a sound distance set, the rails also dip at the joints. Joined switches use the lowest of their values"); finish_edit(rebuild::parameters); struct component @@ -1171,11 +1171,11 @@ void editor_mode::render_path_parameters(TTrack &Track) char const *label; float *value; }; - for (auto const &part : {component{"Up and down (mm)", &track->m_unevenup}, component{"Sideways (mm)", &track->m_unevenside}, component{"Cross level (mm)", &track->m_unevencross}, component{"Diverging path (mm)", &track->m_unevenbranch}, component{"Diverging, up and down (mm)", &track->m_unevenbranchup}, component{"Diverging, sideways (mm)", &track->m_unevenbranchside}}) + for (auto const &part : {component{"Up and down (mm)", &track->m_uneven.up}, component{"Sideways (mm)", &track->m_uneven.side}, component{"Cross level (mm)", &track->m_uneven.cross}, component{"Diverging path (mm)", &track->m_uneven.branch}, component{"Diverging, up and down (mm)", &track->m_uneven.branchup}, component{"Diverging, sideways (mm)", &track->m_uneven.branchside}}) { - if (part.value == &track->m_unevencross && track->eType != tt_Normal) + if (part.value == &track->m_uneven.cross && track->eType != tt_Normal) continue; - if ((part.value == &track->m_unevenbranch || part.value == &track->m_unevenbranchup || part.value == &track->m_unevenbranchside) && track->eType != tt_Switch) + if ((part.value == &track->m_uneven.branch || part.value == &track->m_uneven.branchup || part.value == &track->m_uneven.branchside) && track->eType != tt_Switch) continue; if (ImGui::InputFloat(STR_C(part.label), part.value, 0.0f, 0.0f, "%.1f")) *part.value = *part.value < 0.f ? -1.f : std::min(*part.value, track_uneven::most); @@ -1185,8 +1185,8 @@ void editor_mode::render_path_parameters(TTrack &Track) } if (track->eType == tt_Normal && (track->iCategoryFlag & 15) == 1) { - if (ImGui::InputFloat(STR_C("Dip at rail joints (mm)"), &track->m_jointdip, 0.0f, 0.0f, "%.1f")) - track->m_jointdip = track->m_jointdip < 0.f ? -1.f : std::min(track->m_jointdip, track_uneven::most); + if (ImGui::InputFloat(STR_C("Dip at rail joints (mm)"), &track->m_uneven.dip, 0.0f, 0.0f, "%.1f")) + track->m_uneven.dip = track->m_uneven.dip < 0.f ? -1.f : std::min(track->m_uneven.dip, track_uneven::most); item_tooltip("Depth of the dip at each rail joint, every sound distance. Works with unevenness at 0. Negative: 0.4 of the unevenness"); finish_edit(rebuild::parameters); } diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index da4260077..b70501747 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -153,13 +153,6 @@ editor_track::state editor_track::capture(TTrack const &Track) result.isolated.push_back(isolated->asName); result.overhead = Track.fOverhead; result.uneven = Track.m_uneven; - result.unevenup = Track.m_unevenup; - result.unevenside = Track.m_unevenside; - result.unevencross = Track.m_unevencross; - result.unevenbranch = Track.m_unevenbranch; - result.unevenbranchup = Track.m_unevenbranchup; - result.unevenbranchside = Track.m_unevenbranchside; - result.jointdip = Track.m_jointdip; result.sleepers = Track.m_sleeper_enabled; result.sleeper_frequency = Track.m_sleeper_frequency; result.sleeper_model = Track.m_sleeper_model_name; @@ -259,13 +252,6 @@ void editor_track::apply(TTrack &Track, state const &State) isolated(Track, State.isolated); overhead(Track, State.overhead); Track.m_uneven = State.uneven; - Track.m_unevenup = State.unevenup; - Track.m_unevenside = State.unevenside; - Track.m_unevencross = State.unevencross; - Track.m_unevenbranch = State.unevenbranch; - Track.m_unevenbranchup = State.unevenbranchup; - Track.m_unevenbranchside = State.unevenbranchside; - Track.m_jointdip = State.jointdip; Track.m_sleeper_enabled = State.sleepers; Track.m_sleeper_frequency = State.sleeper_frequency; Track.m_sleeper_model_name = State.sleeper_model; @@ -2362,11 +2348,11 @@ void write_points(std::ostream &Text, segment_data const &Path) Text << start.x << ' ' << start.y << ' ' << start.z << ' ' << Path.rolls[0] << ' ' << control1.x << ' ' << control1.y << ' ' << control1.z << ' ' << control2.x << ' ' << control2.y << ' ' << control2.z << ' ' << end.x << ' ' << end.y << ' ' << end.z << ' ' << Path.rolls[1] << ' ' << Path.radius << ' '; } -void write_ending(std::ostream &Text, TTrack const &Style) +void write_ending(std::ostream &Text, TTrack const &Style, bool const Switch) { if ((Style.iCategoryFlag & 15) == 1 && false == Style.m_profile1.first.empty()) Text << "railprofile " << Style.m_profile1.first << ' '; - Text << Style.uneven_text(); + Text << track_uneven::write_attribute(Style.m_uneven, Switch); // a piece of the track made from another one stays in its track circuit and under the same overhead line for (auto const *isolated : Style.Isolated) Text << "isolated " << isolated->asName << ' '; @@ -2418,7 +2404,7 @@ TTrack *editor_track::create_switch(switch_template const &Template, std::vector write_points(text, Paths[1]); if (auto const trackbed{ballast_of(Style)}; trackbed != null_handle) text << "trackbed " << material_name(trackbed) << ' '; - write_ending(text, Style); + write_ending(text, Style, true); track = load_path(text.str(), Style, Name); } track->m_paths.assign(Paths.begin(), Paths.begin() + 2); @@ -2679,7 +2665,7 @@ TTrack *editor_track::create_path(TTrack const &Style, segment_data const &Path) write_points(text, Path); if (auto const speed{velocity(Style)}; speed > 0.0) text << "velocity " << speed << ' '; - write_ending(text, Style); + write_ending(text, Style, false); auto *track{load_path(text.str(), Style)}; track->m_paths = {Path}; return track; diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index 618583368..14f9e9a40 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -17,6 +17,7 @@ http: #include #include "world/Segment.h" +#include "world/TrackUneven.h" #include "utilities/Classes.h" class TTrack; @@ -55,14 +56,7 @@ class editor_track float texslope{0.9f}; std::vector isolated; float overhead{-1.f}; - float uneven{0.f}; - float unevenup{-1.f}; - float unevenside{-1.f}; - float unevencross{-1.f}; - float unevenbranch{-1.f}; - float unevenbranchup{-1.f}; - float unevenbranchside{-1.f}; - float jointdip{-1.f}; + track_uneven::attribute uneven; bool sleepers{false}; float sleeper_frequency{0.6f}; std::string sleeper_model; diff --git a/tests/unit/test_track_uneven.cpp b/tests/unit/test_track_uneven.cpp index 22970fa63..247f9cbfa 100644 --- a/tests/unit/test_track_uneven.cpp +++ b/tests/unit/test_track_uneven.cpp @@ -165,6 +165,35 @@ TEST_CASE("uneven track: all the values in one attribute") CHECK(track_uneven::write_fields<6>({18.f, -1.f, -1.f, -1.f, -1.f, -1.f}) == "18"); } +TEST_CASE("uneven track: the attribute goes by the entry it's written into") +{ + auto const plain{track_uneven::read_attribute("18;22;19;25;6", false)}; + CHECK(track_uneven::write_attribute(plain, false) == "uneven 18;22;19;25;6 "); + // a switch made in the style of a plain track: no path p3-p4 of its own, the components in their places + CHECK(track_uneven::write_attribute(plain, true) == "uneven 18;;22;19 "); + auto const made{track_uneven::read_attribute("18;;22;19", true)}; + CHECK(track_uneven::declared(made, false, 0).up == doctest::Approx(22.0)); + CHECK(track_uneven::declared(made, false, 0).side == doctest::Approx(19.0)); + CHECK(track_uneven::declared(made, false, 1).up == doctest::Approx(22.0)); + CHECK(track_uneven::declared(made, false, 0).cross == doctest::Approx(0.0)); + // a switch with its own values, and a plain track in its style + auto const points{track_uneven::read_attribute("14;35;16;17", true)}; + CHECK(track_uneven::write_attribute(points, true) == "uneven 14;35;16;17 "); + CHECK(track_uneven::declared(points, false, 1).up == doctest::Approx(35.0)); + CHECK(track_uneven::declared(points, false, 1).side == doctest::Approx(35.0)); + CHECK(track_uneven::write_attribute(points, false) == "uneven 14;16;17 "); + // a plain track: the value stands in for what's left out, only there is the cross level + auto const track{track_uneven::read_attribute("18;;30", false)}; + CHECK(track_uneven::declared(track, true, 0).up == doctest::Approx(18.0)); + CHECK(track_uneven::declared(track, true, 0).side == doctest::Approx(30.0)); + CHECK(track_uneven::declared(track, true, 0).cross == doctest::Approx(18.0)); + // nothing given, nothing written + CHECK(track_uneven::write_attribute({}, false).empty()); + CHECK(track_uneven::write_attribute({}, true).empty()); + // a value of 0 stays when there's more after it + CHECK(track_uneven::write_attribute(track_uneven::read_attribute("0;;;;6", false), false) == "uneven 0;;;;6 "); +} + TEST_CASE("uneven track: amounts take the lowest of each component") { auto const least{track_uneven::least({14.0, 9.0, 0.0}, {7.0, 35.0, 3.0})}; diff --git a/world/Track.cpp b/world/Track.cpp index 8359f78a2..31b5f5c54 100644 --- a/world/Track.cpp +++ b/world/Track.cpp @@ -642,10 +642,10 @@ void TTrack::Load(cParser *parser, glm::dvec3 const &pOrigin) } } else if( str == "uneven" ) { - // uneven [;...]: see read_uneven and TrackUneven.h. The semicolons stay in the token + // uneven [;...]: see TrackUneven.h. The semicolons stay in the token auto const values { parser->getToken( false, "\n\r\t " ) }; if( ( eType == tt_Normal || eType == tt_Switch ) && iCategoryFlag == 1 ) { - read_uneven( values ); + m_uneven = track_uneven::read_attribute( values, eType == tt_Switch ); } } else if( str == "friction" ) { @@ -706,49 +706,9 @@ void TTrack::Load(cParser *parser, glm::dvec3 const &pOrigin) // to a stale origin and the renderer would draw sleepers in the wrong place). } -void TTrack::read_uneven( std::string const &Text ) { - - auto const fields { track_uneven::read_fields<6>( Text ) }; - m_uneven = std::max( fields[ 0 ], 0.f ); - if( eType == tt_Switch ) { - m_unevenbranch = fields[ 1 ]; - m_unevenup = fields[ 2 ]; - m_unevenside = fields[ 3 ]; - m_unevenbranchup = fields[ 4 ]; - m_unevenbranchside = fields[ 5 ]; - } - else { - m_unevenup = fields[ 1 ]; - m_unevenside = fields[ 2 ]; - m_unevencross = fields[ 3 ]; - m_jointdip = fields[ 4 ]; - } -} - -std::string TTrack::uneven_text() const { - - auto const fields { eType == tt_Switch ? - std::array { m_uneven, m_unevenbranch, m_unevenup, m_unevenside, m_unevenbranchup, m_unevenbranchside } : - std::array { m_uneven, m_unevenup, m_unevenside, m_unevencross, m_jointdip, -1.f } }; - if( m_uneven <= 0.f && std::all_of( fields.begin() + 1, fields.end(), []( float const Field ) { return Field < 0.f; } ) ) { - return {}; - } - return "uneven " + track_uneven::write_fields( fields ) + ' '; -} - track_uneven::amounts TTrack::uneven_declared( int const Path ) const { - track_uneven::amounts result { - m_unevenup >= 0.f ? m_unevenup : m_uneven, - m_unevenside >= 0.f ? m_unevenside : m_uneven, - eType != tt_Normal ? 0.f : m_unevencross >= 0.f ? m_unevencross : m_uneven }; - if( Path == 1 ) { - auto const branch = [ this ]( float const Part, double const Straight ) -> double { - return Part >= 0.f ? Part : m_unevenbranch >= 0.f ? m_unevenbranch : Straight; }; - result.up = branch( m_unevenbranchup, result.up ); - result.side = branch( m_unevenbranchside, result.side ); - } - return result; + return track_uneven::declared( m_uneven, eType == tt_Normal, Path ); } bool TTrack::is_uneven() const { @@ -873,7 +833,7 @@ double TTrack::joint_depth() const { if( eType != tt_Normal ) { return 0.0; } - return ( m_jointdip >= 0.f ? m_jointdip : track_uneven::dip_share * uneven_declared().up ); + return ( m_uneven.dip >= 0.f ? m_uneven.dip : track_uneven::dip_share * uneven_declared().up ); } double TTrack::joint_dip( double const Distance ) const { @@ -2782,7 +2742,7 @@ TTrack::export_as_text_( std::ostream &Output ) const { && false == m_profile1.first.empty() ) { Output << "railprofile " << m_profile1.first << ' '; } - Output << uneven_text(); + Output << track_uneven::write_attribute( m_uneven, eType == tt_Switch ); if( false == m_friction.first.empty() ) { Output << "friction " << m_friction.first << ' '; } diff --git a/world/Track.h b/world/Track.h index 1d366ebfe..7d07f4340 100644 --- a/world/Track.h +++ b/world/Track.h @@ -239,16 +239,7 @@ public: TEnvironmentType eEnvironment = e_flat; // dźwięk i oświetlenie int iAction = 0; // czy modyfikowany eventami (specjalna obsługa przy skanowaniu) float fOverhead = -1.0; // można normalnie pobierać prąd (0 dla jazdy bezprądowej po danym odcinku, >0-z opuszczonym i ograniczeniem prędkości) - float m_uneven { 0.f }; // mm, see TrackUneven.h; plain tracks and switches - // the components set apart from m_uneven, mm; negative: m_uneven. Cross level on plain tracks only - float m_unevenup { -1.f }; - float m_unevenside { -1.f }; - float m_unevencross { -1.f }; - // the diverging path of a switch, mm; negative: as the straight one - float m_unevenbranch { -1.f }; - float m_unevenbranchup { -1.f }; - float m_unevenbranchside { -1.f }; - float m_jointdip { -1.f }; // depth of the dip at rail joints, mm; negative: from m_uneven; plain tracks only + track_uneven::attribute m_uneven; // plain tracks and switches private: double fVelocity = -1.0; // ograniczenie prędkości // prędkość dla AI (powyżej rośnie prawdopowobieństwo wykolejenia) public: @@ -350,10 +341,6 @@ public: void VelocitySet(float v); double VelocityGet(); float Friction() const; - // the attribute of the entry. A plain track: the value;up and down;sideways;cross level;dip at the joints. - // A switch: path p1-p2;path p3-p4;up and down of the first;sideways of the first;up and down of the second;sideways of the second - void read_uneven( std::string const &Text ); - std::string uneven_text() const; // the unevenness the track declares, on a path of a switch track_uneven::amounts uneven_declared( int const Path = 0 ) const; bool is_uneven() const; diff --git a/world/TrackUneven.h b/world/TrackUneven.h index f4a50eb7a..b46ebf7aa 100644 --- a/world/TrackUneven.h +++ b/world/TrackUneven.h @@ -87,6 +87,68 @@ std::string write_fields( std::array const &Fields ) { return text.str(); } +// the values of the attribute, mm, negative where not given. Cross level and the dip at joints for plain tracks, the path p3-p4 for switches +struct attribute { + float value { 0.f }; + float up { -1.f }; + float side { -1.f }; + float cross { -1.f }; + float dip { -1.f }; + float branch { -1.f }; + float branchup { -1.f }; + float branchside { -1.f }; +}; + +// a plain track: value;up;side;cross;dip. A switch: p1-p2;p3-p4;up of p1-p2;side of p1-p2;up of p3-p4;side of p3-p4 +inline attribute read_attribute( std::string const &Text, bool const Switch ) { + + auto const fields { read_fields<6>( Text ) }; + attribute result; + result.value = std::max( fields[ 0 ], 0.f ); + if( Switch ) { + result.branch = fields[ 1 ]; + result.up = fields[ 2 ]; + result.side = fields[ 3 ]; + result.branchup = fields[ 4 ]; + result.branchside = fields[ 5 ]; + } + else { + result.up = fields[ 1 ]; + result.side = fields[ 2 ]; + result.cross = fields[ 3 ]; + result.dip = fields[ 4 ]; + } + return result; +} + +// in the layout of the entry it goes into, which can be of another type than the track the values come from +inline std::string write_attribute( attribute const &Values, bool const Switch ) { + + auto const fields { Switch ? + std::array { Values.value, Values.branch, Values.up, Values.side, Values.branchup, Values.branchside } : + std::array { Values.value, Values.up, Values.side, Values.cross, Values.dip, -1.f } }; + if( Values.value <= 0.f && std::all_of( fields.begin() + 1, fields.end(), []( float const Field ) { return Field < 0.f; } ) ) { + return {}; + } + return "uneven " + write_fields( fields ) + ' '; +} + +// what a path comes to from the values: what's not given takes the first value, p3-p4 those of p1-p2. Cross level on plain tracks only +inline amounts declared( attribute const &Values, bool const Plain, int const Path ) { + + amounts result { + Values.up >= 0.f ? Values.up : Values.value, + Values.side >= 0.f ? Values.side : Values.value, + false == Plain ? 0.f : Values.cross >= 0.f ? Values.cross : Values.value }; + if( Path == 1 ) { + auto const branch = [ &Values ]( float const Part, double const Straight ) -> double { + return Part >= 0.f ? Part : Values.branch >= 0.f ? Values.branch : Straight; }; + result.up = branch( Values.branchup, result.up ); + result.side = branch( Values.branchside, result.side ); + } + return result; +} + template using wave_set = std::array; From 371de52342a501ceca7df43ddf2abfde06301cd3 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 31 Oct 2026 19:02:55 +0100 Subject: [PATCH 229/430] fix(track): what the review of unevenness found in the engine - A path of no length gave a joint with a vector across of NaN to the path joined to it, on any scenery, with unevenness or not. It now has no vector across, and so makes no joint. - Axles no longer stray along the track. It moved vehicles against each other, changing the distance their couplers go by. - The bend under an axle goes straight on past the ends of a path: the polynomial ran off on a short curved one, with a kick in the cab shake. - A track left out of its rail run, where tracks are joined one way only, no longer walks the whole run again on every call. - The clatter of an axle goes by the outer axle on its side of the vehicle, and not always by the same one, as the two can be on different tracks. - A vertex works out the amounts once, and the foot of the ballast not at all. --- tests/unit/test_track_uneven.cpp | 33 +++++++++++++++++++++++ vehicle/DynObj.cpp | 6 +++-- world/Segment.cpp | 45 +++++++++++++++++++++----------- world/Segment.h | 5 +++- world/Track.cpp | 16 +++++++----- world/TrackUneven.h | 25 ++++++++++++++++++ 6 files changed, 105 insertions(+), 25 deletions(-) diff --git a/tests/unit/test_track_uneven.cpp b/tests/unit/test_track_uneven.cpp index 247f9cbfa..fd95cec96 100644 --- a/tests/unit/test_track_uneven.cpp +++ b/tests/unit/test_track_uneven.cpp @@ -194,6 +194,39 @@ TEST_CASE("uneven track: the attribute goes by the entry it's written into") CHECK(track_uneven::write_attribute(track_uneven::read_attribute("0;;;;6", false), false) == "uneven 0;;;;6 "); } +TEST_CASE("uneven track: axles don't stray along the track") +{ + glm::dvec3 const across{0.6, 0.0, -0.8}; + glm::dvec3 const along{0.8, 0.0, 0.6}; + auto const moved{track_uneven::across_only(across * 0.03 + along * 0.05 + glm::dvec3{0.0, 0.02, 0.0}, across)}; + CHECK(glm::dot(moved, along) == doctest::Approx(0.0)); + CHECK(glm::dot(moved, across) == doctest::Approx(0.03)); + CHECK(moved.y == doctest::Approx(0.02)); +} + +TEST_CASE("uneven track: a path of no length gives no vector across") +{ + glm::dvec3 const none{0.0}; + CHECK(track_uneven::across_of(none, none) == none); + CHECK(glm::length(track_uneven::across_of({3.0, 0.0, 4.0}, none)) == doctest::Approx(1.0)); + // it can't pass for a joint: the check of the two vectors being alike fails + CHECK(glm::dot(track_uneven::across_of(none, none), glm::dvec3{1.0, 0.0, 0.0}) < 0.9); + // falls back on the chord + auto const chord{track_uneven::across_of(none, {0.0, 0.0, 10.0})}; + CHECK(chord.x == doctest::Approx(-1.0)); + CHECK(chord.z == doctest::Approx(0.0)); + // straight up has no direction in the plan + CHECK(glm::length(track_uneven::across_of({0.0, 5.0, 0.0}, {0.0, 0.0, 10.0})) == doctest::Approx(1.0)); +} + +TEST_CASE("uneven track: the cant at a joint") +{ + CHECK(track_uneven::joint_roll(0.1f, -0.1f, true, true) == doctest::Approx(0.f)); + CHECK(track_uneven::joint_roll(0.2f, 0.4f, false, false) == doctest::Approx(0.3f)); + CHECK(track_uneven::joint_roll(0.1f, 0.0f, true, false) == doctest::Approx(0.f)); + CHECK(track_uneven::joint_roll(0.0f, 0.1f, false, true) == doctest::Approx(0.f)); +} + TEST_CASE("uneven track: amounts take the lowest of each component") { auto const least{track_uneven::least({14.0, 9.0, 0.0}, {7.0, 35.0, 3.0})}; diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index af8828282..3f633cccb 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -3662,11 +3662,13 @@ bool TDynamicObject::Update(double dt, double dt1) ctOwner->Vehicle()->DirectionGet() == DirectionGet() ? 1 : -1 ) }; for( auto &axle : m_axlesounds ) { // on a track with dipping joints the clatter comes from them, elsewhere the axle counts a rail off itself - auto const railphase { Axle0.RailPhase( axle.offset - 0.5 * fAxleDist ) }; + // by the outer axle on its side of the vehicle: the two can be on different tracks + auto const &outer { axle.offset >= 0.0 ? Axle0 : Axle1 }; + auto const railphase { outer.RailPhase( axle.offset - std::copysign( 0.5 * fAxleDist, axle.offset ) ) }; auto crossed { false }; if( railphase >= 0.0 ) { // the rails under the axle, which aren't always those under the track the vehicle is on - crossed = axle.atjoints && std::abs( railphase - axle.distance ) > 0.5 * Axle0.GetTrack()->fSoundDistance; + crossed = axle.atjoints && std::abs( railphase - axle.distance ) > 0.5 * outer.GetTrack()->fSoundDistance; axle.distance = railphase; } else { diff --git a/world/Segment.cpp b/world/Segment.cpp index dd236c61a..9c0e1077e 100644 --- a/world/Segment.cpp +++ b/world/Segment.cpp @@ -385,13 +385,12 @@ void TSegment::RaPositionGet(double const fDistance, glm::dvec3 &position, glm:: rotation.x += static_cast( track_uneven::stray_per_mm * ( amount.up * track_uneven::roll( position, across, gauge ) + amount.cross * track_uneven::level( position, across ) / gauge ) ); - position += stray( position, fDistance ); + position += track_uneven::across_only( stray( position, amount, fDistance ), across ); } -glm::dvec3 TSegment::stray( glm::dvec3 const &Point, double const Distance ) const { - auto const amount { pOwner->uneven_at( Distance, m_path ) }; +glm::dvec3 TSegment::stray( glm::dvec3 const &Point, track_uneven::amounts const &Amount, double const Distance ) const { auto const field { track_uneven::field( Point ) }; - glm::dvec3 result { field.x * amount.side, field.y * amount.up, field.z * amount.side }; + glm::dvec3 result { field.x * Amount.side, field.y * Amount.up, field.z * Amount.side }; result *= track_uneven::stray_per_mm; result.y -= pOwner->joint_dip( Distance ); return result; @@ -401,13 +400,25 @@ glm::dvec3 TSegment::uneven_bend( double const Distance ) const { if( false == m_uneven ) { return glm::dvec3 { 0.0 }; } - // over about a bogie; FastGetTFromS extrapolates past the ends of the path + // over about a bogie auto const reach { 1.5 }; auto const strayed = [&]( double const At ) { - return stray( FastGetPoint( FastGetTFromS( At ) ), At ); }; + return stray( point_extended( At ), pOwner->uneven_at( At, m_path ), At ); }; return ( strayed( Distance + reach ) - 2.0 * strayed( Distance ) + strayed( Distance - reach ) ) / ( reach * reach ); } +glm::dvec3 TSegment::point_extended( double const Distance ) const { + auto const on { std::clamp( Distance, 0.0, fLength ) }; + auto const t { FastGetTFromS( on ) }; + auto const point { FastGetPoint( t ) }; + if( on == Distance ) { + return point; + } + auto const direction { FastGetDirection( t, 0.1 / fLength ) }; + auto const size { glm::length( direction ) }; + return size > 0.0 ? point + direction * ( ( Distance - on ) / size ) : point; +} + void TSegment::settle_vertex( gfx::basic_vertex &Vertex, glm::dvec3 const &Origin, glm::vec3 const &Position, glm::vec3 const &Parallel, double const Distance ) const { if( false == m_uneven ) { return; @@ -416,8 +427,12 @@ void TSegment::settle_vertex( gfx::basic_vertex &Vertex, glm::dvec3 const &Origi auto const gauge { std::max( std::abs( pOwner->fTrackWidth ), 0.1f ) }; auto const across { std::clamp( glm::dot( Vertex.position - Position, Parallel ), -0.5f * gauge, 0.5f * gauge ) }; auto const share { pOwner->uneven_bed_share( Position.y - Vertex.position.y ) }; - Vertex.position.y -= static_cast( share * track_uneven::stray_per_mm * pOwner->uneven_at( Distance, m_path ).cross * track_uneven::level( Origin + glm::dvec3 { Position }, glm::dvec3 { Parallel } ) * across / gauge ); - Vertex.position += glm::vec3 { share * stray( Origin + glm::dvec3 { Vertex.position }, Distance ) }; + if( share <= 0.0 ) { + return; + } + auto const amount { pOwner->uneven_at( Distance, m_path ) }; + Vertex.position.y -= static_cast( share * track_uneven::stray_per_mm * amount.cross * track_uneven::level( Origin + glm::dvec3 { Position }, glm::dvec3 { Parallel } ) * across / gauge ); + Vertex.position += glm::vec3 { share * stray( Origin + glm::dvec3 { Vertex.position }, amount, Distance ) }; } void TSegment::design_position(double const fDistance, glm::dvec3 &position, glm::vec3 &rotation) const { @@ -446,15 +461,15 @@ void TSegment::design_position(double const fDistance, glm::dvec3 &position, glm }; void TSegment::plan_frame( double const Distance, glm::dvec3 &Point, glm::dvec3 &Across ) const { + if( fTsBuffer.empty() ) { + // never made into a path: tt_Cross and the like + Point = Point1; + Across = glm::dvec3 { 0.0 }; + return; + } auto const t { FastGetTFromS( std::clamp( Distance, 0.0, fLength ) ) }; Point = FastGetPoint( t ); - auto const dir { FastGetDirection( t, 0.1 / fLength ) }; - Across = glm::dvec3{ -dir.z, 0.0, dir.x }; - if( glm::length2( Across ) == 0.0 ) { - auto const chord { FastGetPoint_1() - FastGetPoint_0() }; - Across = glm::dvec3{ -chord.z, 0.0, chord.x }; - } - Across = glm::normalize( Across ); + Across = track_uneven::across_of( FastGetDirection( t, 0.1 / fLength ), FastGetPoint_1() - FastGetPoint_0() ); } glm::dvec3 TSegment::FastGetPoint(double const t) const diff --git a/world/Segment.h b/world/Segment.h index 77e61f904..67e4ed05e 100644 --- a/world/Segment.h +++ b/world/Segment.h @@ -13,6 +13,7 @@ http://mozilla.org/MPL/2.0/. #include "utilities/Classes.h" #include "rendering/geometrybank.h" +#include "world/TrackUneven.h" #include struct map_colored_paths { @@ -77,7 +78,9 @@ class TSegment // moves a lofted vertex with the unevenness of the track void settle_vertex( gfx::basic_vertex &Vertex, glm::dvec3 const &Origin, glm::vec3 const &Position, glm::vec3 const &Parallel, double const Distance ) const; // displacement of a point by the unevenness, at a distance along the path - glm::dvec3 stray( glm::dvec3 const &Point, double const Distance ) const; + glm::dvec3 stray( glm::dvec3 const &Point, track_uneven::amounts const &Amount, double const Distance ) const; + // a point of the path at a distance, past its ends straight on: the polynomial would run off on a short curved path + glm::dvec3 point_extended( double const Distance ) const; void design_position( double const fDistance, glm::dvec3 &position, glm::vec3 &rotation ) const; public: diff --git a/world/Track.cpp b/world/Track.cpp index 31b5f5c54..bdb1cfe9a 100644 --- a/world/Track.cpp +++ b/world/Track.cpp @@ -908,6 +908,10 @@ void TTrack::settle_rail_run() const { track = onward( *track, 1 - end, joined ); end = joined; } + // tracks joined one way only can leave this one out of the run: it stands on its own then, not to walk all of it again on every call + if( m_railrun.stamp != s_layoutstamp ) { + m_railrun = { 0.0, 1.0, s_layoutstamp }; + } } void TTrack::update_location() { @@ -1636,13 +1640,11 @@ void TTrack::share_joints() { closest = gap; joint.emplace( 0.5 * ( point + theirpoint ), glm::normalize( across + theiracross ) ); if( iCategoryFlag & 1 ) { - // the cant of a plain track is what was designed, a switch takes it; alike ones meet halfway - auto const own { segment->design_roll( end ) }; - auto const their { theirend == end ? -theirs->design_roll( theirend ) : theirs->design_roll( theirend ) }; - roll = ( - ( eType == tt_Switch ) == ( neighbour->eType == tt_Switch ) ? 0.5f * ( own + their ) : - eType == tt_Switch ? their : - own ); + roll = track_uneven::joint_roll( + segment->design_roll( end ), + theirend == end ? -theirs->design_roll( theirend ) : theirs->design_roll( theirend ), + eType == tt_Switch, + neighbour->eType == tt_Switch ); } } } diff --git a/world/TrackUneven.h b/world/TrackUneven.h index b46ebf7aa..dbec7a24b 100644 --- a/world/TrackUneven.h +++ b/world/TrackUneven.h @@ -224,6 +224,31 @@ inline double bed_share( double const Depth, double const Rail, double const Hei return Height > 0.0 ? std::clamp( 1.0 - ( Depth - Rail ) / Height, 0.0, 1.0 ) : 1.0; } +// a displacement with the part along the track taken out, Across being a unit vector in the plan. Along the track +// it would only change the distance between coupled vehicles, and with it the forces between them +inline glm::dvec3 across_only( glm::dvec3 const &Offset, glm::dvec3 const &Across ) { + + return Across * glm::dot( Offset, Across ) + glm::dvec3 { 0.0, Offset.y, 0.0 }; +} + +// the unit vector across a direction in the plan, or across the chord if it has none; zero for a path of no length, which has neither +inline glm::dvec3 across_of( glm::dvec3 const &Direction, glm::dvec3 const &Chord ) { + + for( auto const &along : { Direction, Chord } ) { + glm::dvec3 const across { -along.z, 0.0, along.x }; + if( glm::dot( across, across ) > 0.0 ) { + return glm::normalize( across ); + } + } + return glm::dvec3 { 0.0 }; +} + +// the cant where two paths meet, theirs turned to the way of this one: a switch takes that of a plain track, alike ones meet halfway +inline float joint_roll( float const Own, float const Their, bool const Switch, bool const Theirswitch ) { + + return Switch == Theirswitch ? 0.5f * ( Own + Their ) : Switch ? Their : Own; +} + // distance from the joint behind the point inline double rail_phase( double const Along, double const Rail ) { From 2b8d7d7cf3ab2b2df8fbe3e9c238d6cd96c83869 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 31 Oct 2026 19:05:56 +0100 Subject: [PATCH 230/430] refactor(track): what goes with unevenness in one place, readable The rules stay in TrackUneven.h with no dependence on the engine, as they can be tested. Their use on the tracks moves out of Track.cpp to TrackUneven.cpp, split into steps: the group of switches, the values of its paths, the meeting of two ends. One set of helpers for the paths of a track takes the place of the same conditions written out in several places, and the value at the ends of a switch is worked out in one place. The clatter of an axle leaves the long Update of a vehicle. The fields in the editor say themselves when they show. No change in behaviour. --- CMakeLists.txt | 1 + application/editormodetrack.cpp | 13 +- tests/unit/test_track_uneven.cpp | 13 ++ vehicle/DynObj.cpp | 42 ++-- vehicle/DynObj.h | 2 + world/Segment.h | 3 + world/Track.cpp | 272 ------------------------- world/Track.h | 9 + world/TrackUneven.cpp | 336 +++++++++++++++++++++++++++++++ world/TrackUneven.h | 9 + 10 files changed, 405 insertions(+), 295 deletions(-) create mode 100644 world/TrackUneven.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 477f584e9..eba44c4ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,6 +96,7 @@ set(SOURCES "model/Texture.cpp" "utilities/Timer.cpp" "world/Track.cpp" +"world/TrackUneven.cpp" "world/Road.cpp" "world/Sweep.cpp" "world/RoadPoint.cpp" diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 4e313bfd9..49059c213 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -1170,12 +1170,17 @@ void editor_mode::render_path_parameters(TTrack &Track) { char const *label; float *value; + bool shown; }; - for (auto const &part : {component{"Up and down (mm)", &track->m_uneven.up}, component{"Sideways (mm)", &track->m_uneven.side}, component{"Cross level (mm)", &track->m_uneven.cross}, component{"Diverging path (mm)", &track->m_uneven.branch}, component{"Diverging, up and down (mm)", &track->m_uneven.branchup}, component{"Diverging, sideways (mm)", &track->m_uneven.branchside}}) + auto const plain{track->eType == tt_Normal}; + for (auto const &part : {component{"Up and down (mm)", &track->m_uneven.up, true}, + component{"Sideways (mm)", &track->m_uneven.side, true}, + component{"Cross level (mm)", &track->m_uneven.cross, plain}, + component{"Diverging path (mm)", &track->m_uneven.branch, !plain}, + component{"Diverging, up and down (mm)", &track->m_uneven.branchup, !plain}, + component{"Diverging, sideways (mm)", &track->m_uneven.branchside, !plain}}) { - if (part.value == &track->m_uneven.cross && track->eType != tt_Normal) - continue; - if ((part.value == &track->m_uneven.branch || part.value == &track->m_uneven.branchup || part.value == &track->m_uneven.branchside) && track->eType != tt_Switch) + if (false == part.shown) continue; if (ImGui::InputFloat(STR_C(part.label), part.value, 0.0f, 0.0f, "%.1f")) *part.value = *part.value < 0.f ? -1.f : std::min(*part.value, track_uneven::most); diff --git a/tests/unit/test_track_uneven.cpp b/tests/unit/test_track_uneven.cpp index fd95cec96..65b7da6e1 100644 --- a/tests/unit/test_track_uneven.cpp +++ b/tests/unit/test_track_uneven.cpp @@ -194,6 +194,19 @@ TEST_CASE("uneven track: the attribute goes by the entry it's written into") CHECK(track_uneven::write_attribute(track_uneven::read_attribute("0;;;;6", false), false) == "uneven 0;;;;6 "); } +TEST_CASE("uneven track: each component comes to its neighbours along a track") +{ + double const length{500.0}; + auto const atstart{track_uneven::along(track_uneven::amounts{18.0, 16.0, 14.0}, {5.0, 4.0, 3.0}, {7.0, 8.0, 9.0}, 0.0, length)}; + CHECK(atstart.up == doctest::Approx(5.0)); + CHECK(atstart.side == doctest::Approx(4.0)); + CHECK(atstart.cross == doctest::Approx(3.0)); + auto const inside{track_uneven::along(track_uneven::amounts{18.0, 16.0, 14.0}, {5.0, 4.0, 3.0}, {7.0, 8.0, 9.0}, 0.5 * length, length)}; + CHECK(inside.up == doctest::Approx(18.0)); + CHECK(inside.side == doctest::Approx(16.0)); + CHECK(inside.cross == doctest::Approx(14.0)); +} + TEST_CASE("uneven track: axles don't stray along the track") { glm::dvec3 const across{0.6, 0.0, -0.8}; diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index 3f633cccb..ac87f395c 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -3661,25 +3661,7 @@ bool TDynamicObject::Update(double dt, double dt1) 1 : ctOwner->Vehicle()->DirectionGet() == DirectionGet() ? 1 : -1 ) }; for( auto &axle : m_axlesounds ) { - // on a track with dipping joints the clatter comes from them, elsewhere the axle counts a rail off itself - // by the outer axle on its side of the vehicle: the two can be on different tracks - auto const &outer { axle.offset >= 0.0 ? Axle0 : Axle1 }; - auto const railphase { outer.RailPhase( axle.offset - std::copysign( 0.5 * fAxleDist, axle.offset ) ) }; - auto crossed { false }; - if( railphase >= 0.0 ) { - // the rails under the axle, which aren't always those under the track the vehicle is on - crossed = axle.atjoints && std::abs( railphase - axle.distance ) > 0.5 * outer.GetTrack()->fSoundDistance; - axle.distance = railphase; - } - else { - axle.distance += dDOMoveLen * directioninconsist; - crossed = axle.distance < 0 || axle.distance > dRailLength; - if( crossed ) { - axle.distance = clamp_circular( axle.distance, dRailLength ); - } - } - axle.atjoints = ( railphase >= 0.0 ); - if( crossed ) { + if( axle_passed_joint( axle, dDOMoveLen, directioninconsist ) ) { if( MoverParameters->Vel > 0.1 ) { // NOTE: for combined clatter sound we supply 1/100th of actual value, as the sound module converts does the opposite, converting received (typically) 0-1 values to 0-100 range auto const frequency = true == axle.clatter.is_combined() ? MoverParameters->Vel * 0.01 : 1.0; @@ -8089,6 +8071,28 @@ TDynamicObject::update_shake( double const Timedelta ) { } } +bool +TDynamicObject::axle_passed_joint( axle_sounds &Axle, double const Move, int const Direction ) { + + // by the outer axle on its side of the vehicle: the two can be on different tracks + auto const &outer { Axle.offset >= 0.0 ? Axle0 : Axle1 }; + auto const railphase { outer.RailPhase( Axle.offset - std::copysign( 0.5 * fAxleDist, Axle.offset ) ) }; + if( railphase >= 0.0 ) { + // the rails under the axle, which aren't always those under the track the vehicle is on + auto const passed { Axle.atjoints && std::abs( railphase - Axle.distance ) > 0.5 * outer.GetTrack()->fSoundDistance }; + Axle.distance = railphase; + Axle.atjoints = true; + return passed; + } + Axle.atjoints = false; + Axle.distance += Move * Direction; + if( Axle.distance >= 0 && Axle.distance <= dRailLength ) { + return false; + } + Axle.distance = clamp_circular( Axle.distance, dRailLength ); + return true; +} + std::pair TDynamicObject::shake_angles() const { diff --git a/vehicle/DynObj.h b/vehicle/DynObj.h index 1bc50b1d1..b903f0874 100644 --- a/vehicle/DynObj.h +++ b/vehicle/DynObj.h @@ -404,6 +404,8 @@ private: sound_source clatter; // clatter emitter bool atjoints { false }; // distance comes from TTrack::rail_phase }; + // whether the axle has just passed a rail joint. On a track with dipping joints it goes by them, elsewhere the axle counts a rail off itself + bool axle_passed_joint( axle_sounds &Axle, double const Move, int const Direction ); struct powertrain_sounds { sound_source inverter { sound_placement::engine }; diff --git a/world/Segment.h b/world/Segment.h index 67e4ed05e..75e070152 100644 --- a/world/Segment.h +++ b/world/Segment.h @@ -127,6 +127,9 @@ public: set_uneven( bool const Uneven, int const Path = 0 ) { m_uneven = Uneven; m_path = Path; } + glm::dvec3 + end_point( int const End ) const { + return End == 0 ? Point1 : Point2; } // a point of the path and the unit vector across it in the plan void plan_frame( double const Distance, glm::dvec3 &Point, glm::dvec3 &Across ) const; diff --git a/world/Track.cpp b/world/Track.cpp index bdb1cfe9a..49138b4eb 100644 --- a/world/Track.cpp +++ b/world/Track.cpp @@ -49,9 +49,6 @@ TTrack::profiles_array TTrack::m_profiles; TTrack::profiles_map TTrack::m_profilesmap; int TTrack::s_layoutstamp { 0 }; -// how near an end of a path counts as being at a point, m -static double const switch_end_reach { 0.3 }; - TSwitchExtension::TSwitchExtension(TTrack *owner, int const what) { // na początku wszystko puste pNexts[0] = nullptr; // wskaźniki do kolejnych odcinków ruchu @@ -706,214 +703,6 @@ void TTrack::Load(cParser *parser, glm::dvec3 const &pOrigin) // to a stale origin and the renderer would draw sleepers in the wrong place). } -track_uneven::amounts TTrack::uneven_declared( int const Path ) const { - - return track_uneven::declared( m_uneven, eType == tt_Normal, Path ); -} - -bool TTrack::is_uneven() const { - - auto const any = []( track_uneven::amounts const &Amount ) { - return Amount.up > 0.0 || Amount.side > 0.0 || Amount.cross > 0.0; }; - return any( uneven_declared( 0 ) ) || any( uneven_declared( 1 ) ) || joint_depth() > 0.0; -} - -double TTrack::uneven_bed_share( double const Depth ) const { - - return track_uneven::bed_share( Depth, std::abs( track_rail_profile( m_profile1.second ).front().position.y ), fTexHeight1 ); -} - -track_uneven::amounts TTrack::uneven_at( double const Distance, int const Path ) const { - - auto const along = [ Distance ]( track_uneven::amounts const &Own, track_uneven::amounts const &Start, track_uneven::amounts const &End, double const Length ) -> track_uneven::amounts { - return { - track_uneven::along( Own.up, Start.up, End.up, Distance, Length ), - track_uneven::along( Own.side, Start.side, End.side, Distance, Length ), - track_uneven::along( Own.cross, Start.cross, End.cross, Distance, Length ) }; }; - if( eType == tt_Switch ) { - auto const &stray { switch_uneven() }; - return along( stray.paths[ Path ], stray.ends[ Path ][ 0 ], stray.ends[ Path ][ 1 ], SwitchExtension->Segments[ Path ]->GetLength() ); - } - auto const own { uneven_declared() }; - auto const atend = [&]( TTrack const *Other, glm::dvec3 const &Point ) -> track_uneven::amounts { - if( Other == nullptr ) { - return {}; - } - if( Other->eType == tt_Switch ) { - return Other->switch_uneven_at( Point ); - } - return track_uneven::least( own, Other->uneven_declared() ); }; - return along( own, atend( trPrev, Segment->FastGetPoint_0() ), atend( trNext, Segment->FastGetPoint_1() ), Length() ); -} - -TTrack::switch_stray const &TTrack::switch_uneven() const { - - if( m_switchstray.stamp == s_layoutstamp ) { - return m_switchstray; - } - std::vector group { this }; - std::array least { uneven_declared( 0 ), uneven_declared( 1 ) }; - for( std::size_t index = 0; index < group.size(); ++index ) { - auto const &extension { *group[ index ]->SwitchExtension }; - for( auto const *other : { extension.pPrevs[ 0 ], extension.pPrevs[ 1 ], extension.pNexts[ 0 ], extension.pNexts[ 1 ] } ) { - if( other == nullptr ) { - continue; - } - if( other->eType == tt_Switch && other->SwitchExtension ) { - least[ 0 ] = track_uneven::least( least[ 0 ], other->uneven_declared( 0 ) ); - least[ 1 ] = track_uneven::least( least[ 1 ], other->uneven_declared( 1 ) ); - if( std::find( group.begin(), group.end(), other ) == group.end() ) { - group.push_back( other ); - } - } - else { - // a track with none of a component keeps to its design in it, any other comes to the value of the switch - auto const theirs { other->uneven_declared() }; - for( auto &path : least ) { - if( theirs.up <= 0.0 ) { path.up = 0.0; } - if( theirs.side <= 0.0 ) { path.side = 0.0; } - } - } - } - } - for( auto const *track : group ) { - track->m_switchstray.paths = least; - track->m_switchstray.stamp = s_layoutstamp; - } - // the lowest of the paths of a switch ending at a point - auto const paths_at = []( TTrack const &Track, glm::dvec3 const &Point ) { - auto result { track_uneven::least( Track.m_switchstray.paths[ 0 ], Track.m_switchstray.paths[ 1 ] ) }; - auto found { false }; - track_uneven::amounts ending { track_uneven::most, track_uneven::most, track_uneven::most }; - for( int path = 0; path < 2; ++path ) { - auto const &segment { *Track.SwitchExtension->Segments[ path ] }; - if( glm::length( segment.FastGetPoint_0() - Point ) < switch_end_reach || glm::length( segment.FastGetPoint_1() - Point ) < switch_end_reach ) { - ending = track_uneven::least( ending, Track.m_switchstray.paths[ path ] ); - found = true; - } - } - return found ? ending : result; }; - for( auto const *track : group ) { - auto const &extension { *track->SwitchExtension }; - for( int path = 0; path < 2; ++path ) { - auto const &segment { *extension.Segments[ path ] }; - for( int end = 0; end < 2; ++end ) { - auto const point { end == 0 ? segment.FastGetPoint_0() : segment.FastGetPoint_1() }; - auto value { paths_at( *track, point ) }; - auto const *other { end == 0 ? extension.pPrevs[ path ] : extension.pNexts[ path ] }; - if( other != nullptr && other->eType == tt_Switch && other->SwitchExtension ) { - value = track_uneven::least( value, paths_at( *other, point ) ); - } - track->m_switchstray.ends[ path ][ end ] = value; - } - } - } - return m_switchstray; -} - -track_uneven::amounts TTrack::switch_uneven_at( glm::dvec3 const &Point ) const { - - auto const &stray { switch_uneven() }; - auto found { false }; - track_uneven::amounts result { track_uneven::most, track_uneven::most, track_uneven::most }; - for( int path = 0; path < 2; ++path ) { - auto const &segment { *SwitchExtension->Segments[ path ] }; - for( int end = 0; end < 2; ++end ) { - if( glm::length( ( end == 0 ? segment.FastGetPoint_0() : segment.FastGetPoint_1() ) - Point ) < switch_end_reach ) { - result = track_uneven::least( result, stray.ends[ path ][ end ] ); - found = true; - } - } - } - return found ? result : track_uneven::least( stray.paths[ 0 ], stray.paths[ 1 ] ); -} - -double TTrack::joint_depth() const { - - if( eType != tt_Normal ) { - return 0.0; - } - return ( m_uneven.dip >= 0.f ? m_uneven.dip : track_uneven::dip_share * uneven_declared().up ); -} - -double TTrack::joint_dip( double const Distance ) const { - - auto const phase { rail_phase( Distance ) }; - if( phase < 0.0 ) { - return 0.0; - } - auto const fromjoint { std::min( phase, fSoundDistance - phase ) }; - if( fromjoint >= track_uneven::dip_reach ) { - return 0.0; - } - auto const depth { joint_depth() }; - auto const atend = [&]( TTrack const *Other ) { - return ( Other == nullptr || Other->fSoundDistance != fSoundDistance ? 0.0 : std::min( depth, Other->joint_depth() ) ); }; - return 0.001 * track_uneven::dip( fromjoint ) * track_uneven::along( depth, atend( trPrev ), atend( trNext ), Distance, Length() ); -} - -double TTrack::rail_phase( double const Distance ) const { - - if( joint_depth() <= 0.0 || fSoundDistance <= 2.0 * track_uneven::dip_reach ) { - return -1.0; - } - if( m_railrun.stamp != s_layoutstamp ) { - settle_rail_run(); - } - return track_uneven::rail_phase( m_railrun.origin + m_railrun.way * Distance, fSoundDistance ); -} - -void TTrack::settle_rail_run() const { - - // the next track of the run past an end of a track, and which of its ends is joined there - auto const onward = []( TTrack const &Track, int const End, int &Joined ) -> TTrack const * { - auto const *other { End == 0 ? Track.trPrev : Track.trNext }; - if( other == nullptr || other == &Track || other->joint_depth() <= 0.0 || other->fSoundDistance != Track.fSoundDistance ) { - return nullptr; - } - Joined = ( End == 0 ? Track.iPrevDirection : Track.iNextDirection ) & 1; - return other; }; - // walks from this track to an end of the run - auto const walk = [&]( int &End ) { - auto const *track { this }; - int joined { 0 }; - for( int step = 0; step < 1000000; ++step ) { - auto const *next { onward( *track, End, joined ) }; - if( next == nullptr || next == this ) { - break; - } - track = next; - End = 1 - joined; - } - return track; }; - auto const place = []( TTrack const &Track, int const End ) { - auto const point { End == 0 ? Track.Segment->FastGetPoint_0() : Track.Segment->FastGetPoint_1() }; - return std::make_pair( point.x, point.z ); }; - - // start at the end with the lesser coordinates, to get the same joints from any track of the run - int end { 0 }; - int otherend { 1 }; - auto const *track { walk( end ) }; - auto const *other { walk( otherend ) }; - if( place( *other, otherend ) < place( *track, end ) ) { - track = other; - end = otherend; - } - auto along { 0.0 }; - while( track != nullptr && track->m_railrun.stamp != s_layoutstamp ) { - auto const length { track->Length() }; - track->m_railrun = { end == 0 ? along : along + length, end == 0 ? 1.0 : -1.0, s_layoutstamp }; - along += length; - int joined { 0 }; - track = onward( *track, 1 - end, joined ); - end = joined; - } - // tracks joined one way only can leave this one out of the run: it stands on its own then, not to walk all of it again on every call - if( m_railrun.stamp != s_layoutstamp ) { - m_railrun = { 0.0, 1.0, s_layoutstamp }; - } -} - void TTrack::update_location() { location( ( @@ -1600,67 +1389,6 @@ void TTrack::rebuild_geometry( gfx::geometrybank_handle const &Bank ) { create_geometry( Bank ); } -void TTrack::share_joints() { - - int const paths { eType == tt_Switch ? 2 : 1 }; - auto const segment_of = []( TTrack const &Track, int const Path ) -> TSegment * { - return ( Track.eType == tt_Switch ? Track.SwitchExtension->Segments[ Path ].get() : Track.Segment.get() ); }; - for( int path = 0; path < paths; ++path ) { - auto *segment { segment_of( *this, path ) }; - if( segment == nullptr ) { - continue; - } - for( int end = 0; end < 2; ++end ) { - std::optional> joint; - auto roll { segment->design_roll( end ) }; - auto const *neighbour { eType == tt_Switch ? - ( end ? SwitchExtension->pNexts[ path ] : SwitchExtension->pPrevs[ path ] ) : - ( end ? trNext : trPrev ) }; - if( neighbour != nullptr && neighbour != this && ( neighbour->iCategoryFlag & 15 ) == ( iCategoryFlag & 15 ) ) { - glm::dvec3 point; - glm::dvec3 across; - segment->plan_frame( end ? segment->GetLength() : 0.0, point, across ); - auto closest { 0.2 }; - for( int theirpath = 0; theirpath < ( neighbour->eType == tt_Switch ? 2 : 1 ); ++theirpath ) { - auto const *theirs { segment_of( *neighbour, theirpath ) }; - if( theirs == nullptr ) { - continue; - } - for( int theirend = 0; theirend < 2; ++theirend ) { - glm::dvec3 theirpoint; - glm::dvec3 theiracross; - theirs->plan_frame( theirend ? theirs->GetLength() : 0.0, theirpoint, theiracross ); - if( theirend == end ) { - theiracross = -theiracross; - } - auto const gap { glm::length( theirpoint - point ) }; - if( gap >= closest || glm::dot( across, theiracross ) < 0.9 ) { - continue; - } - closest = gap; - joint.emplace( 0.5 * ( point + theirpoint ), glm::normalize( across + theiracross ) ); - if( iCategoryFlag & 1 ) { - roll = track_uneven::joint_roll( - segment->design_roll( end ), - theirend == end ? -theirs->design_roll( theirend ) : theirs->design_roll( theirend ), - eType == tt_Switch, - neighbour->eType == tt_Switch ); - } - } - } - } - segment->set_joint( end, joint, roll ); - } - } - if( eType != tt_Switch && Segment && ( iCategoryFlag & 1 ) ) { - float roll1, roll2; - Segment->GetRolls( roll1, roll2 ); - if( roll1 != 0.f || roll2 != 0.f ) { - iTrapezoid |= 1; - } - } -} - void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { gfx::userdata_array empty_userdata; share_joints(); diff --git a/world/Track.h b/world/Track.h index 7d07f4340..f5bb8c1b6 100644 --- a/world/Track.h +++ b/world/Track.h @@ -341,6 +341,10 @@ public: void VelocitySet(float v); double VelocityGet(); float Friction() const; + // a switch has two paths, any other track the one + int path_count() const; + TSegment *path_segment( int const Path ) const; + TTrack *path_neighbour( int const Path, int const End ) const; // the unevenness the track declares, on a path of a switch track_uneven::amounts uneven_declared( int const Path = 0 ) const; bool is_uneven() const; @@ -402,6 +406,11 @@ private: }; mutable switch_stray m_switchstray; switch_stray const &switch_uneven() const; + void settle_switch_stray() const; + // the lowest value of the paths ending at the point + track_uneven::amounts switch_paths_at( glm::dvec3 const &Point ) const; + // what a plain track comes to at its end, where it meets the other one + track_uneven::amounts uneven_met( TTrack const *Other, glm::dvec3 const &Point ) const; // the value of a switch where a track joined to it meets it track_uneven::amounts switch_uneven_at( glm::dvec3 const &Point ) const; static int s_layoutstamp; // bumped when tracks are joined or changed, invalidates the two above diff --git a/world/TrackUneven.cpp b/world/TrackUneven.cpp new file mode 100644 index 000000000..152449ad2 --- /dev/null +++ b/world/TrackUneven.cpp @@ -0,0 +1,336 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "world/Track.h" + +// The part of TTrack that goes with the unevenness of a track and with what it meets at its ends: joined tracks and switches. +// The rules themselves are in TrackUneven.h, here they get applied to the tracks. + +namespace { + +double const switch_end_reach { 0.3 }; // how near an end of a path counts as being at a point, m +double const joint_reach { 0.2 }; // ends of joined paths further apart than this stay as they are, m +double const joint_alike { 0.9 }; // ends of joined paths less alike in direction than this stay as they are, cosine + +bool is_switch( TTrack const *Track ) { + + return Track != nullptr && Track->eType == tt_Switch && Track->SwitchExtension; +} + +std::array joined_to_switch( TTrack const &Switch ) { + + auto const &extension { *Switch.SwitchExtension }; + return { extension.pPrevs[ 0 ], extension.pPrevs[ 1 ], extension.pNexts[ 0 ], extension.pNexts[ 1 ] }; +} + +// the switch and the switches joined directly to it, and to those +std::vector switch_group( TTrack const &Switch ) { + + std::vector group { &Switch }; + for( std::size_t index = 0; index < group.size(); ++index ) { + for( auto const *other : joined_to_switch( *group[ index ] ) ) { + if( is_switch( other ) && std::find( group.begin(), group.end(), other ) == group.end() ) { + group.push_back( other ); + } + } + } + return group; +} + +// the value along each path: the lowest of that path in the group, 0 in a component that a plain track joined has none of +std::array group_path_values( std::vector const &Group ) { + + std::array values { Group.front()->uneven_declared( 0 ), Group.front()->uneven_declared( 1 ) }; + for( auto const *track : Group ) { + values[ 0 ] = track_uneven::least( values[ 0 ], track->uneven_declared( 0 ) ); + values[ 1 ] = track_uneven::least( values[ 1 ], track->uneven_declared( 1 ) ); + for( auto const *other : joined_to_switch( *track ) ) { + if( other == nullptr || is_switch( other ) ) { + continue; + } + // any other comes to the value of the switch + auto const theirs { other->uneven_declared() }; + for( auto &path : values ) { + if( theirs.up <= 0.0 ) { path.up = 0.0; } + if( theirs.side <= 0.0 ) { path.side = 0.0; } + } + } + } + return values; +} + +// the lowest Value( path, end ) of the ends of the paths at the point; Otherwise when none of them is there +template +track_uneven::amounts least_at_ends( TTrack const &Switch, glm::dvec3 const &Point, track_uneven::amounts const &Otherwise, Value_ const &Value ) { + + auto found { false }; + track_uneven::amounts result { track_uneven::most, track_uneven::most, track_uneven::most }; + for( int path = 0; path < 2; ++path ) { + for( int end = 0; end < 2; ++end ) { + if( glm::length( Switch.path_segment( path )->end_point( end ) - Point ) < switch_end_reach ) { + result = track_uneven::least( result, Value( path, end ) ); + found = true; + } + } + } + return found ? result : Otherwise; +} + +// how the end of a path meets the track joined to it +struct path_joint { + std::optional> place; // none: too far apart, or going different ways + float roll; +}; + +path_joint meet( TTrack const &Track, TSegment const &Segment, int const End, TTrack const &Neighbour ) { + + path_joint result { {}, Segment.design_roll( End ) }; + glm::dvec3 point; + glm::dvec3 across; + Segment.plan_frame( End ? Segment.GetLength() : 0.0, point, across ); + auto closest { joint_reach }; + for( int path = 0; path < Neighbour.path_count(); ++path ) { + auto const *theirs { Neighbour.path_segment( path ) }; + if( theirs == nullptr ) { + continue; + } + for( int end = 0; end < 2; ++end ) { + // laid towards each other, they look across and lean to opposite sides + auto const opposite { end == End }; + glm::dvec3 theirpoint; + glm::dvec3 theiracross; + theirs->plan_frame( end ? theirs->GetLength() : 0.0, theirpoint, theiracross ); + if( opposite ) { + theiracross = -theiracross; + } + auto const gap { glm::length( theirpoint - point ) }; + if( gap >= closest || glm::dot( across, theiracross ) < joint_alike ) { + continue; + } + closest = gap; + result.place.emplace( 0.5 * ( point + theirpoint ), glm::normalize( across + theiracross ) ); + if( Track.iCategoryFlag & 1 ) { + result.roll = track_uneven::joint_roll( + Segment.design_roll( End ), + opposite ? -theirs->design_roll( end ) : theirs->design_roll( end ), + Track.eType == tt_Switch, + Neighbour.eType == tt_Switch ); + } + } + } + return result; +} + +} // namespace + +int TTrack::path_count() const { + + return eType == tt_Switch ? 2 : 1; +} + +TSegment *TTrack::path_segment( int const Path ) const { + + return eType == tt_Switch ? SwitchExtension->Segments[ Path ].get() : Segment.get(); +} + +TTrack *TTrack::path_neighbour( int const Path, int const End ) const { + + if( eType == tt_Switch ) { + return End == 0 ? SwitchExtension->pPrevs[ Path ] : SwitchExtension->pNexts[ Path ]; + } + return End == 0 ? trPrev : trNext; +} + +track_uneven::amounts TTrack::uneven_declared( int const Path ) const { + + return track_uneven::declared( m_uneven, eType == tt_Normal, Path ); +} + +bool TTrack::is_uneven() const { + + auto const any = []( track_uneven::amounts const &Amount ) { + return Amount.up > 0.0 || Amount.side > 0.0 || Amount.cross > 0.0; }; + return any( uneven_declared( 0 ) ) || any( uneven_declared( 1 ) ) || joint_depth() > 0.0; +} + +double TTrack::uneven_bed_share( double const Depth ) const { + + return track_uneven::bed_share( Depth, std::abs( track_rail_profile( m_profile1.second ).front().position.y ), fTexHeight1 ); +} + +track_uneven::amounts TTrack::uneven_at( double const Distance, int const Path ) const { + + if( eType == tt_Switch ) { + auto const &stray { switch_uneven() }; + return track_uneven::along( stray.paths[ Path ], stray.ends[ Path ][ 0 ], stray.ends[ Path ][ 1 ], Distance, path_segment( Path )->GetLength() ); + } + return track_uneven::along( uneven_declared(), uneven_met( trPrev, Segment->end_point( 0 ) ), uneven_met( trNext, Segment->end_point( 1 ) ), Distance, Length() ); +} + +track_uneven::amounts TTrack::uneven_met( TTrack const *Other, glm::dvec3 const &Point ) const { + + if( Other == nullptr ) { + return {}; + } + return Other->eType == tt_Switch ? Other->switch_uneven_at( Point ) : track_uneven::least( uneven_declared(), Other->uneven_declared() ); +} + +TTrack::switch_stray const &TTrack::switch_uneven() const { + + if( m_switchstray.stamp != s_layoutstamp ) { + settle_switch_stray(); + } + return m_switchstray; +} + +void TTrack::settle_switch_stray() const { + + auto const group { switch_group( *this ) }; + auto const values { group_path_values( group ) }; + for( auto const *track : group ) { + track->m_switchstray.paths = values; + track->m_switchstray.stamp = s_layoutstamp; + } + // at the ends of the paths, with the paths known in all of the group + for( auto const *track : group ) { + for( int path = 0; path < 2; ++path ) { + for( int end = 0; end < 2; ++end ) { + auto const point { track->path_segment( path )->end_point( end ) }; + auto value { track->switch_paths_at( point ) }; + auto const *other { track->path_neighbour( path, end ) }; + if( is_switch( other ) ) { + value = track_uneven::least( value, other->switch_paths_at( point ) ); + } + track->m_switchstray.ends[ path ][ end ] = value; + } + } + } +} + +track_uneven::amounts TTrack::switch_paths_at( glm::dvec3 const &Point ) const { + + auto const &paths { m_switchstray.paths }; + return least_at_ends( *this, Point, track_uneven::least( paths[ 0 ], paths[ 1 ] ), [ & ]( int const Path, int ) { return paths[ Path ]; } ); +} + +track_uneven::amounts TTrack::switch_uneven_at( glm::dvec3 const &Point ) const { + + auto const &stray { switch_uneven() }; + return least_at_ends( *this, Point, track_uneven::least( stray.paths[ 0 ], stray.paths[ 1 ] ), [ & ]( int const Path, int const End ) { return stray.ends[ Path ][ End ]; } ); +} + +double TTrack::joint_depth() const { + + if( eType != tt_Normal ) { + return 0.0; + } + return ( m_uneven.dip >= 0.f ? m_uneven.dip : track_uneven::dip_share * uneven_declared().up ); +} + +double TTrack::joint_dip( double const Distance ) const { + + auto const phase { rail_phase( Distance ) }; + if( phase < 0.0 ) { + return 0.0; + } + auto const fromjoint { std::min( phase, fSoundDistance - phase ) }; + if( fromjoint >= track_uneven::dip_reach ) { + return 0.0; + } + auto const depth { joint_depth() }; + auto const atend = [&]( TTrack const *Other ) { + return ( Other == nullptr || Other->fSoundDistance != fSoundDistance ? 0.0 : std::min( depth, Other->joint_depth() ) ); }; + return 0.001 * track_uneven::dip( fromjoint ) * track_uneven::along( depth, atend( trPrev ), atend( trNext ), Distance, Length() ); +} + +double TTrack::rail_phase( double const Distance ) const { + + if( joint_depth() <= 0.0 || fSoundDistance <= 2.0 * track_uneven::dip_reach ) { + return -1.0; + } + if( m_railrun.stamp != s_layoutstamp ) { + settle_rail_run(); + } + return track_uneven::rail_phase( m_railrun.origin + m_railrun.way * Distance, fSoundDistance ); +} + +void TTrack::settle_rail_run() const { + + // the next track of the run past an end of a track, and which of its ends is joined there + auto const onward = []( TTrack const &Track, int const End, int &Joined ) -> TTrack const * { + auto const *other { End == 0 ? Track.trPrev : Track.trNext }; + if( other == nullptr || other == &Track || other->joint_depth() <= 0.0 || other->fSoundDistance != Track.fSoundDistance ) { + return nullptr; + } + Joined = ( End == 0 ? Track.iPrevDirection : Track.iNextDirection ) & 1; + return other; }; + // walks from this track to an end of the run + auto const walk = [&]( int &End ) { + auto const *track { this }; + int joined { 0 }; + for( int step = 0; step < 1000000; ++step ) { + auto const *next { onward( *track, End, joined ) }; + if( next == nullptr || next == this ) { + break; + } + track = next; + End = 1 - joined; + } + return track; }; + auto const place = []( TTrack const &Track, int const End ) { + auto const point { Track.Segment->end_point( End ) }; + return std::make_pair( point.x, point.z ); }; + + // start at the end with the lesser coordinates, to get the same joints from any track of the run + int end { 0 }; + int otherend { 1 }; + auto const *track { walk( end ) }; + auto const *other { walk( otherend ) }; + if( place( *other, otherend ) < place( *track, end ) ) { + track = other; + end = otherend; + } + auto along { 0.0 }; + while( track != nullptr && track->m_railrun.stamp != s_layoutstamp ) { + auto const length { track->Length() }; + track->m_railrun = { end == 0 ? along : along + length, end == 0 ? 1.0 : -1.0, s_layoutstamp }; + along += length; + int joined { 0 }; + track = onward( *track, 1 - end, joined ); + end = joined; + } + // tracks joined one way only can leave this one out of the run: it stands on its own then, not to walk all of it again on every call + if( m_railrun.stamp != s_layoutstamp ) { + m_railrun = { 0.0, 1.0, s_layoutstamp }; + } +} + +void TTrack::share_joints() { + + for( int path = 0; path < path_count(); ++path ) { + auto *segment { path_segment( path ) }; + if( segment == nullptr ) { + continue; + } + for( int end = 0; end < 2; ++end ) { + auto const *neighbour { path_neighbour( path, end ) }; + auto const joined { neighbour != nullptr && neighbour != this && ( neighbour->iCategoryFlag & 15 ) == ( iCategoryFlag & 15 ) }; + auto const joint { joined ? meet( *this, *segment, end, *neighbour ) : path_joint { {}, segment->design_roll( end ) } }; + segment->set_joint( end, joint.place, joint.roll ); + } + } + if( eType != tt_Switch && Segment && ( iCategoryFlag & 1 ) ) { + float roll1, roll2; + Segment->GetRolls( roll1, roll2 ); + if( roll1 != 0.f || roll2 != 0.f ) { + iTrapezoid |= 1; + } + } +} diff --git a/world/TrackUneven.h b/world/TrackUneven.h index dbec7a24b..624e6db16 100644 --- a/world/TrackUneven.h +++ b/world/TrackUneven.h @@ -249,6 +249,15 @@ inline float joint_roll( float const Own, float const Their, bool const Switch, return Switch == Theirswitch ? 0.5f * ( Own + Their ) : Switch ? Their : Own; } +// each component the same way +inline amounts along( amounts const &Full, amounts const &Atstart, amounts const &Atend, double const Distance, double const Length ) { + + return { + along( Full.up, Atstart.up, Atend.up, Distance, Length ), + along( Full.side, Atstart.side, Atend.side, Distance, Length ), + along( Full.cross, Atstart.cross, Atend.cross, Distance, Length ) }; +} + // distance from the joint behind the point inline double rail_phase( double const Along, double const Rail ) { From 702ab5422ef658ea600541ea8aeb72cd3d08a2f5 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 31 Oct 2026 19:07:31 +0100 Subject: [PATCH 231/430] fix(tools): the grading tool reads files with grass in their name A plain file like baltyk/mod/grass.scm was taken for a plant and never read, which lost about a quarter of the plants on Baltyk, so overgrown tracks came out better than they are. The grading is also split into steps. --- tools/track_uneven_grade.py | 151 +++++++++++++++++++++++------------- 1 file changed, 95 insertions(+), 56 deletions(-) diff --git a/tools/track_uneven_grade.py b/tools/track_uneven_grade.py index eb39d7c67..d643f94f8 100644 --- a/tools/track_uneven_grade.py +++ b/tools/track_uneven_grade.py @@ -114,10 +114,10 @@ class Scenery: def include(self, name, params, origin): path = self.root / name.replace("\\", "/") - if GRASS.search(name.lower()): - numbers = [float(w) for w in params if NUMBER.match(w)] - if len(numbers) >= 3: - self.plant(numbers[0] + origin[0], numbers[2] + origin[2]) + # a plant takes its place in the parameters; a file with grass in its name and none of them just lists plants + numbers = [float(w) for w in params if NUMBER.match(w)] + if GRASS.search(name.lower()) and len(numbers) >= 3: + self.plant(numbers[0] + origin[0], numbers[2] + origin[2]) return if not path.is_file(): self.notes["brak pliku " + name] += 1 @@ -355,47 +355,58 @@ def ceiling(t, product): return product / t["speed"] * (0.7 + 0.3 * min(1.0, max(0.0, (t["state"] - 0.5) / 0.7))) -def grade(scenery, options): - tracks = scenery.tracks - joints = Joints(tracks) - for t in tracks: - if t["kind"] == "switch": - radii = [min(plan_radius(p["line"]), p["radius"] if p["radius"] > 0 else math.inf) for p in t["paths"]] - t["bent"] = 1 if len(radii) < 2 or radii[1] <= radii[0] else 0 - settle_speeds(tracks, joints) - route = None - if options.route: - first, last = options.route - from_first, from_last = distances(tracks, joints, first), distances(tracks, joints, last) - ends = [from_last[n] for n in from_last if math.dist(n, first) < 300] - route = (from_first, from_last, min(ends) if ends else math.dist(first, last)) +def path_radius(part): + return min(plan_radius(part["line"]), part["radius"] if part["radius"] > 0 else math.inf) + + +def mark_diverging_paths(switches): + # the path that bends more + for t in switches: + radii = [path_radius(p) for p in t["paths"]] + t["bent"] = 1 if len(radii) < 2 or radii[1] <= radii[0] else 0 + + +class Route: + """How far along from the first point to the second a place lies, measured along the tracks.""" + + def __init__(self, tracks, joints, first, last): + self.first, self.last = first, last + self.from_first, self.from_last = distances(tracks, joints, first), distances(tracks, joints, last) + ends = [self.from_last[n] for n in self.from_last if math.dist(n, first) < 300] + self.length = min(ends) if ends else math.dist(first, last) if not ends: print("uwaga: po torach nie ma polaczenia miedzy punktami --route, licze w linii prostej") + + def share(self, part): + shares = [] + for key in ("p1", "p2"): + place = (part[key][0], part[key][2]) + node = (round(place[0], 1), round(place[1], 1)) + a, b = self.from_first.get(node), self.from_last.get(node) + if a is None or b is None: + a, b = math.dist(place, self.first), math.dist(place, self.last) + shares.append(min(1.0, max(0.0, (a - b + self.length) / (2 * self.length)))) + return 0.5 * sum(shares) + + +def grade_states(scenery, route, gain): cells = road_cells(scenery.roads) - normal = [t for t in tracks if t["kind"] == "normal"] - for t in tracks: + for t in scenery.tracks: part = t["paths"][0] - radius = min(plan_radius(part["line"]), part["radius"] if part["radius"] > 0 else math.inf) + radius = path_radius(part) curve = 0.0 if radius >= 6000 else min(1.0, max(0.0, (1200 - radius) / 950)) - density = grass_on(part, scenery.plants) if t["kind"] == "normal" else 0.0 - crossing = t["kind"] == "normal" and hits_road(part, cells) - progress = 0.5 - if route: - shares = [] - for key in ("p1", "p2"): - node = (round(part[key][0], 1), round(part[key][2], 1)) - a, b = route[0].get(node), route[1].get(node) - if a is None or b is None: - a, b = math.dist((part[key][0], part[key][2]), options.route[0]), math.dist((part[key][0], part[key][2]), options.route[1]) - shares.append(min(1.0, max(0.0, (a - b + route[2]) / (2 * route[2])))) - progress = 0.5 * sum(shares) + plain = t["kind"] == "normal" + density = grass_on(part, scenery.plants) if plain else 0.0 + crossing = plain and hits_road(part, cells) + progress = route.share(part) if route else 0.5 state = 0.50 + 0.20 * wear(t["ballast"], BALLAST_WEAR) + 0.10 * wear(t["rail"], RAIL_WEAR) + 0.12 * min(1.0, density / GRASS_FULL) + 0.06 * curve + 0.22 * progress + 0.18 * crossing + 0.06 * (hashed(b"", t["name"]) - 0.5) - t.update(state=min(state, 1.2) * options.gain, curve=curve, crossing=crossing, grass=density) - if t["kind"] == "normal": + t.update(state=min(state, 1.2) * gain, curve=curve, crossing=crossing, grass=density) + if plain: value = min(limit(t["speed"]) * t["state"], MOST) t.update(value=value, up=min(value * 1.25, MOST_UP), side=min(value * (0.9 + 0.4 * curve), MOST)) - for t in normal: - t["heights"] = heights_per_mm(t) + + +def fit_under_pantograph(normal): # the largest product of the vertical part and the speed with the gap small on every track low, high = 100, 4000 while high - low > 25: @@ -404,43 +415,51 @@ def grade(scenery, options): low = middle else: high = middle - product = low for t in normal: - up = ceiling(t, product) + up = ceiling(t, low) if up < t["up"]: ratio = up / t["up"] t["up"], t["value"], t["side"] = up, t["value"] * ratio, t["side"] * ratio + return low + + +def curve_changes(t, joints): + part = t["paths"][0] + if abs(end_curve(part, "p1") - end_curve(part, "p2")) > CURVE_STEP: + return True + for key in ("p1", "p2"): + for other, theirs, side in joints.at(part[key]): + if other is not t and other["kind"] == "normal": + their = end_curve(theirs, side) + if abs(end_curve(part, key) - (-their if side == key else their)) > CURVE_STEP: + return True + return False + + +def move_near_limit(normal, joints, share): # on wooden sleepers and where the curve changes, a share of the tracks goes nearer the limit, chosen for good by the place chosen = 0 for t in normal: - part = t["paths"][0] - change = abs(end_curve(part, "p1") - end_curve(part, "p2")) > CURVE_STEP - for key in ("p1", "p2"): - for other, theirs, side in joints.at(part[key]): - if other is not t and other["kind"] == "normal": - their = end_curve(theirs, side) - if abs(end_curve(part, key) - (-their if side == key else their)) > CURVE_STEP: - change = True - if not (change or WOOD.search(t["ballast"] or "")): + if not (WOOD.search(t["ballast"] or "") or curve_changes(t, joints)): continue + part = t["paths"][0] name = f"{t['name']}:{part['p1'][0]:.0f}:{part['p1'][2]:.0f}" - if hashed(b"near", name) >= options.near: + if hashed(b"near", name) >= share: continue value = t["value"] + (limit(t["speed"]) - t["value"]) * (NEAR_LEAST + (NEAR_MOST - NEAR_LEAST) * hashed(b"how", name)) if value <= t["value"]: continue + # sideways and the cross level don't move a pantograph, up and down only as far as it keeps to the wire on this track up = value while up > t["up"] and largest_gap(t["heights"], up) > GAP_MOST: up -= 0.5 t["value"], t["up"], t["side"] = value, max(up, t["up"]), min(value * (0.9 + 0.4 * t["curve"]), MOST) chosen += 1 - worst = max((largest_gap(t["heights"], t["up"]) for t in normal), default=0.0) - for t in normal: - del t["heights"] - if t["name"].lower() in options.straight: - t["value"] = t["up"] = t["side"] = 0.0 - # each path of a switch by the plain tracks it leads to, the worst of them; those only among switches from their neighbours - switches = [t for t in tracks if t["kind"] == "switch"] + return chosen + + +def grade_switches(switches, joints, product): + # each path by the plain tracks it leads to, the worst of them; those only among switches from their neighbours for t in switches: t["values"] = [None] * len(t["paths"]) for index, part in enumerate(t["paths"]): @@ -459,6 +478,26 @@ def grade(scenery, options): t["values"][index] = max(found) for t in switches: t["values"] = [min(SWITCH_MOST, product / NO_SPEED) if v is None else v for v in t["values"]] + + +def grade(scenery, options): + tracks = scenery.tracks + normal = [t for t in tracks if t["kind"] == "normal"] + switches = [t for t in tracks if t["kind"] == "switch"] + joints = Joints(tracks) + mark_diverging_paths(switches) + settle_speeds(tracks, joints) + grade_states(scenery, Route(tracks, joints, *options.route) if options.route else None, options.gain) + for t in normal: + t["heights"] = heights_per_mm(t) + product = fit_under_pantograph(normal) + chosen = move_near_limit(normal, joints, options.near) + worst = max((largest_gap(t["heights"], t["up"]) for t in normal), default=0.0) + for t in normal: + del t["heights"] + if t["name"].lower() in options.straight: + t["value"] = t["up"] = t["side"] = 0.0 + grade_switches(switches, joints, product) return product, chosen, worst From 56d389e2df05a8a2e5010ff0f1244d565f8c035c Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 31 Oct 2026 19:07:31 +0100 Subject: [PATCH 232/430] docs(track): the documentation of track unevenness in English With a warning where values get chosen: at the limits of Id-14 a pantograph may not keep up at speed, which trips the main breaker. --- track_uneven_doc.md | 118 ++++++++++++++++++++++---------------------- 1 file changed, 60 insertions(+), 58 deletions(-) diff --git a/track_uneven_doc.md b/track_uneven_doc.md index 325e89443..c7446e34d 100644 --- a/track_uneven_doc.md +++ b/track_uneven_doc.md @@ -1,6 +1,6 @@ -# Nierówności toru +# Track unevenness -Opcjonalny atrybut wpisu toru, przed `endtrack`: +An optional attribute of a track entry, before `endtrack`: ``` node -1 0 tor1 track normal 100.0 1.435 0.15 25.0 20 0 flat vis @@ -14,92 +14,94 @@ uneven 18;;;25;6 endtrack ``` -Liczby w mm, 0-100, rozdzielone średnikiem, bez spacji: +The numbers are in mm, 0-100, separated by semicolons with no spaces: -| pozycja | tor `normal` | rozjazd `switch` | -|---------|--------------------------------------------------|-----------------------------| -| 1 | największa odchyłka toku na cięciwie 10 m | to samo, droga p1-p2 | -| 2 | w pionie | droga p3-p4 | -| 3 | w poziomie | droga p1-p2, w pionie | -| 4 | przechyłka | droga p1-p2, w poziomie | -| 5 | zapadnięcie na styku, domyślnie 0,4 pionu | droga p3-p4, w pionie | -| 6 | | droga p3-p4, w poziomie | +| position | `normal` track | `switch` | +|----------|-----------------------------------------------|--------------------------| +| 1 | peak deviation of a rail on a 10 m chord | the same, path p1-p2 | +| 2 | vertical | path p3-p4 | +| 3 | sideways | path p1-p2, vertical | +| 4 | cross level | path p1-p2, sideways | +| 5 | dip at rail joints, by default 0.4 of vertical | path p3-p4, vertical | +| 6 | | path p3-p4, sideways | -Pozycję pominiętą zastępuje pierwsza liczba, a zapadnięcie liczy się z pionu. Końcowe można opuścić. Sam bok to `uneven 0;;30`, a same zapadnięcia na stykach to `uneven 0;;;;6`. Rozjazd bez składowych na drodze p3-p4 przyjmuje wartości z drogi p1-p2. Rozjazd na 100 km/h na wprost i 40 km/h na bok to na przykład `uneven 14;35`. +A position left out takes the first number, and the dip follows the vertical value. Positions at the end can be dropped. Sideways alone is `uneven 0;;30`, and dips at the joints alone are `uneven 0;;;;6`. A switch with no components of its own on path p3-p4 takes the values of path p1-p2. A switch for 100 km/h on the straight path and 40 km/h on the diverging one is, for example, `uneven 14;35`. -Wszystkie są też w edytorze, w panelu toru, w sekcji „Ride and sound”. Na drogach, rzekach i obrotnicach są ignorowane. +All of them are also in the editor, in the track panel, section "Ride and sound". On roads, rivers and turntables they are ignored. -## Jaką wartość wybrać +## Choosing a value -`uneven` odpowiada kolumnie „nierówności pionowe” z instrukcji PLK Id-14, załącznik 1 (klasa C): +`uneven` corresponds to the "vertical irregularities" column of the PLK Id-14 instruction, appendix 1 (class C): -| prędkość [km/h] | 20 | 40 | 60 | 80 | 100 | 120 | 160 | -|-----------------|----|----|----|----|-----|-----|-----| -| `uneven` [mm] | 50 | 35 | 25 | 18 | 14 | 10 | 6 | +| speed [km/h] | 20 | 40 | 60 | 80 | 100 | 120 | 160 | +|---------------|----|----|----|----|-----|-----|-----| +| `uneven` [mm] | 50 | 35 | 25 | 18 | 14 | 10 | 6 | -Tor w dobrym stanie to według instrukcji połowa tej wartości (klasa A), w dostatecznym 3/4 (klasa B). +According to the instruction, a track in good condition is half of this value (class A), and one in fair condition 3/4 (class B). -Tor z `uneven 18` mierzy się tak (`tests/unit/test_track_uneven.cpp`), w nawiasie limit Id-14 dla 80 km/h: +At these limits a pantograph may not keep up at speed, which trips the main breaker: see the end of "How it works". `tools/track_uneven_grade.py` keeps the values below that. -| parametr | wynik | Id-14 | -|---------------------------|---------|---------| -| nierówności pionowe | 18 mm | 18 mm | -| nierówności poziome | 19 mm | 17 mm | -| wichrowatość na bazie 5 m | 15 mm | 16 mm | -| szerokość toru | ±10 mm | +10/-8 mm | -| przechyłka | 20 mm | 20 mm | -| wskaźnik J | 6,1 | 5,3 | +A track with `uneven 18` measures as follows (`tests/unit/test_track_uneven.cpp`), against the Id-14 limit for 80 km/h: -## Jak to działa +| parameter | result | Id-14 | +|--------------------------|--------|-----------| +| vertical irregularities | 18 mm | 18 mm | +| horizontal irregularities | 19 mm | 17 mm | +| twist on a 5 m base | 15 mm | 16 mm | +| gauge | ±10 mm | +10/-8 mm | +| cross level | 20 mm | 20 mm | +| J index | 6.1 | 5.3 | -Nierówność to pole przesunięć zależne od położenia na mapie, złożone z fal o długości 5-42 m. W pionie krótkich fal jest mniej, żeby częściej dochodziły blisko wartości szczytowej, a do tego są fale 47-83 m: na cięciwie 10 m prawie się nie liczą, pudło unosi się na nich i opada, a pantograf za nimi nadąża. Nie ma w nim losowania: to samo miejsce wygina się tak samo przy każdym uruchomieniu. Przesunięty tor dostaje fale z nowego miejsca. +## How it works -Każda składowa łączy się osobno: +Unevenness is a displacement field that depends on the position on the map, made of waves 5-42 m long. Vertically there are fewer short waves, so the rails come near the peak value more often, and there are also waves of 47-83 m: they hardly count on the 10 m chord, the body rises and falls on them, and a pantograph keeps up with them. Nothing in it is random: one place bends the same way on every run. A track that is moved gets the waves of its new place. -- **Tor z torem:** na styku obowiązuje mniejsza z dwóch wartości, a każdy tor dochodzi do niej płynnie na 20 m. Wolny koniec toru leży w projekcie. -- **Rozjazd:** każda droga ma swoją wartość, a na wspólnym końcu obu obowiązuje mniejsza z nich. Rozjazdy złączone bezpośrednio przyjmują najmniejszą z tej samej drogi, a na styku dwóch dróg mniejszą z obu. Dołączony tor dochodzi do wartości rozjazdu na końcu, do którego dochodzi, także większej od własnej. Tor bez danej składowej trzyma w niej cały rozjazd w projekcie. -- **Styki:** zapadnięcia są co `fSoundDistance`, na długości 6 m, i biegną dalej przez kolejne tory o tym samym odstępie. Stukot osi wypada w miejscu zapadnięcia. Przy odstępie 6 m lub mniejszym oraz na rozjazdach zapadnięć nie ma. -- **Przechyłka:** dolicza się do projektowej. Jest pochyleniem w planie mapy, więc tory wpisane ku sobie spotykają się na tej samej przechyłce. Na rozjazdach tylko ta wynikająca z fal, bez osobnego siadania toków. +Each component joins separately: -Końce złączonych dróg spotykają się w środku między sobą, z jednym kierunkiem poprzecznym, jeśli są bliżej niż 20 cm, co zamyka pęknięcia z niezgodnych współrzędnych w danych, także na torach bez nierówności. Przechyłkę na takim styku rozjazd bierze od zwykłego toru, a dwa tory albo dwa rozjazdy spotykają się w połowie. To dotyczy też fizyki. +- **Track to track:** the lower of the two values applies at the joint, and each track comes to it smoothly over 20 m. A free end of a track stays as designed. +- **Switch:** each path has its own value, and the lower of the two applies at their common end. Directly joined switches take the lowest value of the same path, and where two paths meet, the lower of the two. A joined track comes to the value of the switch at the end it meets, even if that is higher than its own. A track with none of a component keeps the whole switch as designed in it. +- **Joints:** the dips come every `fSoundDistance`, over 6 m, and run on through following tracks with the same spacing. The wheel clatter falls where the dip is. With a spacing of 6 m or less, and on switches, there are no dips. +- **Cross level:** adds to the designed cant. It is a tilt of the map plan, so tracks laid towards each other meet at the same cant. On switches there is only the part coming from the waves, with no separate settling of the rails. -Za nierównością idą szyny, wierzch podsypki, `sleepermodel`, osie, przechył pudła i bujanie kabiny. Skarpa podsypki przejmuje różnicę, a jej spód zostaje w projekcie, na terenie. +The ends of joined paths meet in the middle between them, with one vector across, if they are less than 20 cm apart. This closes the cracks from coordinates that don't match in the data, on tracks with no unevenness as well. At such a joint a switch takes the cant of the plain track, and two tracks or two switches meet halfway. This applies to the physics too. -Nie idą za nią modele z includów (np. napędy i podkłady rozjazdów), teren ani sieć trakcyjna, więc przy dużych wartościach szyna rozjeżdża się z takim modelem o kilka centymetrów. +The rails, the top of the ballast, `sleepermodel`, the axles, the roll of the body and the cab shake follow the unevenness. The slope of the ballast takes up the difference, and its foot stays as designed, on the ground. -Na torze z nierównością kabinę buja sam tor. Odpada kołysanie wyliczane z przyspieszenia poprzecznego, czyli z promienia łuku, oraz losowe szarpnięcia przy większej prędkości. Na torach bez nierówności działają jak dotąd. +Models from includes (e.g. switch drives and timbers), the terrain and the catenary don't follow it, so at large values a rail shifts away from such a model by a few centimetres. -Pantograf podnosi się z szybkością ciśnienia, ok. 0,14 m/s, a szczelina do drutu większa niż 1 cm odcina napięcie i wybija wyłącznik szybki. Nierówność dokłada się do tego przy dużej prędkości. Na torach Bałtyku symulacja daje szczelinę 0,6 cm, gdy składowa w pionie razy prędkość w km/h wynosi 925, czyli np. 8 mm przy 120 km/h, 13 mm przy 70 km/h i 23 mm przy 40 km/h. Wartości z tabeli Id-14 są od tego większe. Sam drut też to potrafi: na Bałtyku przy `tor0290` wznosi się o ok. 1%, więc pantograf nadąża tam do ok. 46 km/h, a powyżej wyłącznik wybija także na prostym torze. +On a track with unevenness the track itself shakes the cab. The sway calculated from the lateral acceleration, that is from the curve radius, and the random jolts at higher speed are off. On tracks with no unevenness they work as before. -Fizyka bierze promień łuku i pochylenie z projektu, więc nierówności nie zmieniają tych wartości, a do wykolejeń dokładają tylko przechyłkę, ok. 0,06 m/s² przy `uneven 18` wobec progu ok. 3,2 m/s². +A pantograph rises at the rate set by the pressure, about 0.14 m/s, and a gap to the wire over 1 cm cuts the voltage and trips the main breaker. Unevenness adds to this at high speed. On the tracks of Bałtyk a simulation gives a gap of 0.6 cm when the vertical value times the speed in km/h is 925, for example 8 mm at 120 km/h, 13 mm at 70 km/h and 23 mm at 40 km/h. The values in the Id-14 table are higher than that. The wire alone can do it too: at `tor0290` on Bałtyk it rises by about 1%, so a pantograph keeps up to about 46 km/h there, and above that the breaker trips on a straight track as well. -## Ocena torów dowolnej scenerii +The physics takes the curve radius and the grade from the design, so unevenness doesn't change them. It adds only the cross level towards derailment, about 0.06 m/s² at `uneven 18` against a threshold of about 3.2 m/s². -`tools/track_uneven_grade.py` wylicza wartości z tego, co widać w scenerii: z tekstur podsypki i szyn, trawy na torze, łuków, prędkości i przejazdów drogowych. Czyta plik `.scn`, `.scm` albo `.inc` razem z jego includami, oryginałów nie zmienia, a kopie plików z torami zapisuje do `--out`. Bez `--out` tylko wypisuje raport. +## Grading the tracks of any scenery + +`tools/track_uneven_grade.py` works out the values from what the scenery shows: ballast and rail textures, grass on the track, curves, speed and road crossings. It reads a `.scn`, `.scm` or `.inc` file with its includes and leaves the originals as they are, writing copies of the files with tracks to `--out`. With no `--out` it only prints a report. ``` python tools/track_uneven_grade.py scenery/lk357.scn --out graded python tools/track_uneven_grade.py scenery/baltyk_skm1.scn --out graded --route -107,2300 -4120,2491 ``` -- `--route X,Z X,Z`: tory pogarszają się od pierwszego punktu do drugiego, licząc po torach. -- `--gain`: mnożnik stanu torów, domyślnie 1. -- `--near`: jaka część torów na drewnie i przy zmianach krzywizny idzie bliżej granicy Id-14, domyślnie 0,6. Wybór jest stały. -- `--straight`: nazwy torów bez nierówności, po przecinku. -- `--root`: folder `scenery`, gdy podany plik leży głębiej. +- `--route X,Z X,Z`: tracks get worse from the first point to the second, measured along the tracks. +- `--gain`: multiplier of the state of the tracks, 1 by default. +- `--near`: the share of tracks on wooden sleepers and at changes of curve that go nearer the Id-14 limit, 0.6 by default. The choice is fixed. +- `--straight`: names of tracks with no unevenness, separated by commas. +- `--root`: the `scenery` folder, when the given file lies deeper. -Wartości trzymają się pod sufitem pantografu, liczonym symulacją na tych torach, ale bez wznosu samego drutu. Zużycie tekstur odczytywane jest z ich nazw, według tabel na początku skryptu, a nieznana nazwa dostaje 0,5. Tory z plików `.inc` z parametrami są pomijane, a bloki `rotate` nieuwzględniane. W obu przypadkach raport wypisuje uwagę. Tor, który ma już nierówność, zostaje bez zmian. +The values stay under what a pantograph can follow, by a simulation over those tracks, but the rise of the wire itself isn't counted. Texture wear is read from the names, by the tables at the top of the script, and an unknown name gets 0.5. Tracks in `.inc` files taking parameters are skipped and `rotate` blocks aren't applied; the report says so in both cases. A track that already has unevenness stays as it is. -## Wydajność +## Performance -Tor z nierównością ma geometrię co 2 m zamiast co 10 m na prostych. Rozjazdy zachowują swój podział. +A track with unevenness has geometry every 2 m instead of every 10 m on straights. Switches keep their division. -Zmierzone (kamera w ruchu lub kabina, 1920×1080): +Measured (camera moving or in the cab, 1920×1080): -| scena | bez flag | z flagami 18/35 | -|---------------------------------------|--------------------|--------------------| -| Bałtyk, 56 km torów: wierzchołki | 0,56 mln (ok. 27 MB) | 2,17 mln (ok. 104 MB) | -| Bałtyk: najdłuższa klatka w przelocie | 31,5 ms | 64 ms | -| `td.scn`, jazda 120 km/h: klatka | 2,73 ms | 2,93 ms | +| scene | no flags | flags 18/35 | +|-------------------------------------|-----------------------|------------------------| +| Bałtyk, 56 km of tracks: vertices | 0.56 M (about 27 MB) | 2.17 M (about 104 MB) | +| Bałtyk: longest frame in a fly-through | 31.5 ms | 64 ms | +| `td.scn`, driving at 120 km/h: frame | 2.73 ms | 2.93 ms | -Koszt rośnie z liczbą oflagowanych torów, a najdłuższe klatki pojawiają się przy budowaniu geometrii kolejnych sekcji. Sama jazda po takim torze praktycznie nie kosztuje: ok. 0,3 µs na oś w kroku fizyki. +The cost grows with the number of flagged tracks, and the longest frames occur when the geometry of further sections is built. Driving on such a track costs practically nothing: about 0.3 µs per axle in a physics step. From 9364b03e1ad9d9711942864c4d5ab17a00f487d3 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 31 Oct 2026 20:17:47 +0100 Subject: [PATCH 233/430] fix(track): what Sonar reports on the unevenness The blockers are in the EP brake of a vehicle, older than this work: its arrays made with new[] are vectors now, which also removes the deletes. - The caches of the unevenness of a track are no longer mutable: what fills them isn't const any more. - TSegment gets back to RaPositionGet in one piece, with what the path has to do with the others in one struct. - Less nesting in the group of switches and in the fields of the editor, nested conditionals written out, and the attribute is read from a string_view. A test no longer counts in floating point. No change in behaviour. --- application/editormodetrack.cpp | 33 ++++----- tests/unit/test_track_uneven.cpp | 33 ++++++--- vehicle/DynObj.cpp | 73 +++++++++---------- vehicle/DynObj.h | 2 +- world/Segment.cpp | 77 +++++++++----------- world/Segment.h | 29 ++++---- world/Track.h | 21 +++--- world/TrackUneven.cpp | 117 ++++++++++++++++++------------- world/TrackUneven.h | 45 +++++++----- 9 files changed, 223 insertions(+), 207 deletions(-) diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 49059c213..0ae732d86 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -1166,26 +1166,23 @@ void editor_mode::render_path_parameters(TTrack &Track) track->m_uneven.value = std::clamp(track->m_uneven.value, 0.f, track_uneven::most); item_tooltip("Peak deviation of a rail on a 10 m chord. Id-14 limits: 6 mm at 160 km/h, 10 at 120, 18 at 80, 35 at 40.\nWith a sound distance set, the rails also dip at the joints. Joined switches use the lowest of their values"); finish_edit(rebuild::parameters); - struct component - { - char const *label; - float *value; - bool shown; - }; - auto const plain{track->eType == tt_Normal}; - for (auto const &part : {component{"Up and down (mm)", &track->m_uneven.up, true}, - component{"Sideways (mm)", &track->m_uneven.side, true}, - component{"Cross level (mm)", &track->m_uneven.cross, plain}, - component{"Diverging path (mm)", &track->m_uneven.branch, !plain}, - component{"Diverging, up and down (mm)", &track->m_uneven.branchup, !plain}, - component{"Diverging, sideways (mm)", &track->m_uneven.branchside, !plain}}) - { - if (false == part.shown) - continue; - if (ImGui::InputFloat(STR_C(part.label), part.value, 0.0f, 0.0f, "%.1f")) - *part.value = *part.value < 0.f ? -1.f : std::min(*part.value, track_uneven::most); + auto const component = [&](char const *Label, float &Value) { + if (ImGui::InputFloat(STR_C(Label), &Value, 0.0f, 0.0f, "%.1f")) + Value = Value < 0.f ? -1.f : std::min(Value, track_uneven::most); item_tooltip("Set apart from the unevenness, mm. Negative: the unevenness"); finish_edit(rebuild::parameters); + }; + component("Up and down (mm)", track->m_uneven.up); + component("Sideways (mm)", track->m_uneven.side); + if (track->eType == tt_Normal) + { + component("Cross level (mm)", track->m_uneven.cross); + } + else + { + component("Diverging path (mm)", track->m_uneven.branch); + component("Diverging, up and down (mm)", track->m_uneven.branchup); + component("Diverging, sideways (mm)", track->m_uneven.branchside); } } if (track->eType == tt_Normal && (track->iCategoryFlag & 15) == 1) diff --git a/tests/unit/test_track_uneven.cpp b/tests/unit/test_track_uneven.cpp index 65b7da6e1..06f4663b0 100644 --- a/tests/unit/test_track_uneven.cpp +++ b/tests/unit/test_track_uneven.cpp @@ -2,6 +2,8 @@ #include "doctest.h" #include "world/TrackUneven.h" +#include +#include #include #include @@ -12,19 +14,20 @@ double deviation(std::vector const &Values) auto mean{0.0}; for (auto const value : Values) mean += value; - mean /= Values.size(); + auto const count{static_cast(Values.size())}; + mean /= count; auto sum{0.0}; for (auto const value : Values) sum += (value - mean) * (value - mean); - return std::sqrt(sum / Values.size()); + return std::sqrt(sum / count); } double peak(std::vector Values) { for (auto &value : Values) value = std::abs(value); - std::sort(Values.begin(), Values.end()); - return Values[static_cast(0.999 * Values.size())]; + std::ranges::sort(Values); + return Values[Values.size() * 999 / 1000]; } void add_chord(std::vector &Output, std::vector const &Line, int const Half) @@ -44,14 +47,22 @@ TEST_CASE("uneven track: measures as the Id-14 limits for its value") int const steps{4000}; int const base{10}; // 5 m int const lines{36}; - double vertical{0.0}, horizontal{0.0}, twist{0.0}, wander{0.0}, level{0.0}, j{0.0}, away{0.0}; + double vertical{0.0}; + double horizontal{0.0}; + double twist{0.0}; + double wander{0.0}; + double level{0.0}; + double j{0.0}; + double away{0.0}; for (int line = 0; line < lines; ++line) { auto const heading{glm::pi() * (line + 0.37) / lines}; glm::dvec3 const start{7919.0 * std::sin(line * 1.7), 0.0, 6577.0 * std::cos(line * 2.3)}; glm::dvec3 const along{std::cos(heading), 0.0, std::sin(heading)}; glm::dvec3 const across{-along.z, 0.0, along.x}; - std::vector up[2], side[2], middle; + std::array, 2> up; + std::array, 2> side; + std::vector middle; for (int i = 0; i < steps; ++i) { auto const point{start + along * (i * step)}; @@ -64,7 +75,11 @@ TEST_CASE("uneven track: measures as the Id-14 limits for its value") } middle.push_back(track_uneven::field(point).y * amplitude); } - std::vector verticals, horizontals, twists, gauges, levels; + std::vector verticals; + std::vector horizontals; + std::vector twists; + std::vector gauges; + std::vector levels; for (int rail = 0; rail < 2; ++rail) { add_chord(verticals, up[rail], base); @@ -269,9 +284,9 @@ TEST_CASE("uneven track: the value along a track meets its neighbours exactly") CHECK(track_uneven::along(18.0, 35.0, 35.0, 0.25, 0.5) == doctest::Approx(35.0).epsilon(0.01)); // no jump anywhere auto last{track_uneven::along(18.0, 35.0, 0.0, 0.0, length)}; - for (auto distance{0.25}; distance <= length; distance += 0.25) + for (int step = 1; step <= 2000; ++step) { - auto const value{track_uneven::along(18.0, 35.0, 0.0, distance, length)}; + auto const value{track_uneven::along(18.0, 35.0, 0.0, step * 0.25, length)}; REQUIRE(std::abs(value - last) < 0.5); last = value; } diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index ac87f395c..305e12020 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -3382,14 +3382,12 @@ bool TDynamicObject::Update(double dt, double dt1) FzadED = 0; //pętla bezpieczeństwa - bez ED auto const FzadPN = Fzad - FrED * MoverParameters->MED_FrED_factor; //np = 0; - // BUG: likely memory leak, allocation per inner loop, deleted only once outside - // TODO: sort this shit out - bool* PrzekrF = new bool[np]; + std::vector PrzekrF( np ); float nPrzekrF = 0; bool test = true; - float* FzED = new float[np]; - float* FzEP = new float[np]; - float* FmaxEP = new float[np]; + std::vector FzED( np ); + std::vector FzEP( np ); + std::vector FmaxEP( np ); // 3. ustaw pojazdom sile hamowania ED // - proporcjonalnie do mozliwosci @@ -3548,11 +3546,6 @@ bool TDynamicObject::Update(double dt, double dt1) } - delete[] PrzekrF; - delete[] FzED; - delete[] FzEP; - delete[] FmaxEP; - MED_oldFED = FzadED; } @@ -3661,33 +3654,32 @@ bool TDynamicObject::Update(double dt, double dt1) 1 : ctOwner->Vehicle()->DirectionGet() == DirectionGet() ? 1 : -1 ) }; for( auto &axle : m_axlesounds ) { - if( axle_passed_joint( axle, dDOMoveLen, directioninconsist ) ) { - if( MoverParameters->Vel > 0.1 ) { - // NOTE: for combined clatter sound we supply 1/100th of actual value, as the sound module converts does the opposite, converting received (typically) 0-1 values to 0-100 range - auto const frequency = true == axle.clatter.is_combined() ? MoverParameters->Vel * 0.01 : 1.0; - axle.clatter - .pitch( frequency ) - .gain( volume ) - .play(); - // crude bump simulation, drop down on even axles, move back up on - // the odd ones - // MoverParameters->AccVert += (MoverParameters->Vel*0.1f) * - double const headroom = std::clamp( - MoverParameters->Vmax - ( MoverParameters->Vel + MoverParameters->Vmax * 0.32f ), - 0.0, MoverParameters->Vmax ); - double const jolt = headroom * .05f * ( MyTrack->iDamageFlag * 0.25f ); - if (MyTrack->eType == tt_Normal) - { - MoverParameters->AccVert += std::clamp( jolt, 0.0, 4.0 ); - } - else if (MyTrack->eType == tt_Switch) - { - double const accHorizontal = std::clamp( jolt, 0.0, 1.0 ) * ((axleindex % 2) != 0 ? 1 : -1); - MoverParameters->AccS += accHorizontal; - MoverParameters->AccN += accHorizontal; - MoverParameters->AccVert += std::clamp( jolt, 0.0, 2.0 ); - } - } + if( axle_passed_joint( axle, dDOMoveLen, directioninconsist ) + && MoverParameters->Vel > 0.1 ) { + // NOTE: for combined clatter sound we supply 1/100th of actual value, as the sound module converts does the opposite, converting received (typically) 0-1 values to 0-100 range + auto const frequency = true == axle.clatter.is_combined() ? MoverParameters->Vel * 0.01 : 1.0; + axle.clatter + .pitch( frequency ) + .gain( volume ) + .play(); + // crude bump simulation, drop down on even axles, move back up on + // the odd ones + // MoverParameters->AccVert += (MoverParameters->Vel*0.1f) * + double const headroom = std::clamp( + MoverParameters->Vmax - ( MoverParameters->Vel + MoverParameters->Vmax * 0.32f ), + 0.0, MoverParameters->Vmax ); + double const jolt = headroom * .05f * ( MyTrack->iDamageFlag * 0.25f ); + if (MyTrack->eType == tt_Normal) + { + MoverParameters->AccVert += std::clamp( jolt, 0.0, 4.0 ); + } + else if (MyTrack->eType == tt_Switch) + { + double const accHorizontal = std::clamp( jolt, 0.0, 1.0 ) * ((axleindex % 2) != 0 ? 1 : -1); + MoverParameters->AccS += accHorizontal; + MoverParameters->AccN += accHorizontal; + MoverParameters->AccVert += std::clamp( jolt, 0.0, 2.0 ); + } } ++axleindex; } @@ -8072,12 +8064,11 @@ TDynamicObject::update_shake( double const Timedelta ) { } bool -TDynamicObject::axle_passed_joint( axle_sounds &Axle, double const Move, int const Direction ) { +TDynamicObject::axle_passed_joint( axle_sounds &Axle, double const Move, int const Direction ) const { // by the outer axle on its side of the vehicle: the two can be on different tracks auto const &outer { Axle.offset >= 0.0 ? Axle0 : Axle1 }; - auto const railphase { outer.RailPhase( Axle.offset - std::copysign( 0.5 * fAxleDist, Axle.offset ) ) }; - if( railphase >= 0.0 ) { + if( auto const railphase { outer.RailPhase( Axle.offset - std::copysign( 0.5 * fAxleDist, Axle.offset ) ) }; railphase >= 0.0 ) { // the rails under the axle, which aren't always those under the track the vehicle is on auto const passed { Axle.atjoints && std::abs( railphase - Axle.distance ) > 0.5 * outer.GetTrack()->fSoundDistance }; Axle.distance = railphase; diff --git a/vehicle/DynObj.h b/vehicle/DynObj.h index b903f0874..4fee9778e 100644 --- a/vehicle/DynObj.h +++ b/vehicle/DynObj.h @@ -405,7 +405,7 @@ private: bool atjoints { false }; // distance comes from TTrack::rail_phase }; // whether the axle has just passed a rail joint. On a track with dipping joints it goes by them, elsewhere the axle counts a rail off itself - bool axle_passed_joint( axle_sounds &Axle, double const Move, int const Direction ); + bool axle_passed_joint( axle_sounds &Axle, double const Move, int const Direction ) const; struct powertrain_sounds { sound_source inverter { sound_placement::engine }; diff --git a/world/Segment.cpp b/world/Segment.cpp index 9c0e1077e..1aff4ae42 100644 --- a/world/Segment.cpp +++ b/world/Segment.cpp @@ -69,10 +69,8 @@ bool TSegment::Init(glm::dvec3 &NewPoint1, glm::dvec3 NewCPointOut, glm::dvec3 N // poprawienie przechyłki fRoll1 = static_cast(glm::radians(fNewRoll1)); // Ra: przeliczone jest bardziej przydatne do obliczeń fRoll2 = static_cast(glm::radians(fNewRoll2)); - m_designrolls[ 0 ] = fRoll1; - m_designrolls[ 1 ] = fRoll2; - m_joints[ 0 ].reset(); - m_joints[ 1 ].reset(); + m_setting.designrolls = { fRoll1, fRoll2 }; + m_setting.joints = {}; bCurve = bIsCurve; if (Global.bRollFix) { // Ra: poprawianie przechyłki @@ -122,7 +120,7 @@ bool TSegment::Init(glm::dvec3 &NewPoint1, glm::dvec3 NewCPointOut, glm::dvec3 N fStoop = std::atan2(Point2.y - Point1.y, fLength); // pochylenie toru prostego, żeby nie liczyć wielokrotnie fStep = fNewStep; - if( m_uneven && pOwner->eType != tt_Switch ) { + if( m_setting.uneven && pOwner->eType != tt_Switch ) { // dense enough for the waves; a switch keeps its division, the blades depend on it fStep = std::min( fStep, 2.0 ); } @@ -373,21 +371,6 @@ Math3D::vector3 TSegment::GetPoint(double const fDistance) const }; */ -void TSegment::RaPositionGet(double const fDistance, glm::dvec3 &position, glm::vec3 &rotation) const { - design_position( fDistance, position, rotation ); - if( false == m_uneven ) { - return; - } - // direction and slope stay as designed: the physics takes the curve radius and the grade from them - auto const gauge { std::max( std::abs( pOwner->fTrackWidth ), 0.1f ) }; - glm::dvec3 const across { -std::cos( rotation.z ), 0.0, -std::sin( rotation.z ) }; - auto const amount { pOwner->uneven_at( fDistance, m_path ) }; - rotation.x += static_cast( track_uneven::stray_per_mm * ( - amount.up * track_uneven::roll( position, across, gauge ) - + amount.cross * track_uneven::level( position, across ) / gauge ) ); - position += track_uneven::across_only( stray( position, amount, fDistance ), across ); -} - glm::dvec3 TSegment::stray( glm::dvec3 const &Point, track_uneven::amounts const &Amount, double const Distance ) const { auto const field { track_uneven::field( Point ) }; glm::dvec3 result { field.x * Amount.side, field.y * Amount.up, field.z * Amount.side }; @@ -397,30 +380,25 @@ glm::dvec3 TSegment::stray( glm::dvec3 const &Point, track_uneven::amounts const } glm::dvec3 TSegment::uneven_bend( double const Distance ) const { - if( false == m_uneven ) { + if( false == m_setting.uneven ) { return glm::dvec3 { 0.0 }; } // over about a bogie auto const reach { 1.5 }; - auto const strayed = [&]( double const At ) { - return stray( point_extended( At ), pOwner->uneven_at( At, m_path ), At ); }; + auto const strayed = [ this ]( double const At ) { + // past the ends of the path straight on: the polynomial would run off on a short curved one + auto const on { std::clamp( At, 0.0, fLength ) }; + auto const t { FastGetTFromS( on ) }; + auto point { FastGetPoint( t ) }; + if( auto const direction { FastGetDirection( t, 0.1 / fLength ) }; on != At && glm::length( direction ) > 0.0 ) { + point += direction * ( ( At - on ) / glm::length( direction ) ); + } + return stray( point, pOwner->uneven_at( At, m_setting.path ), At ); }; return ( strayed( Distance + reach ) - 2.0 * strayed( Distance ) + strayed( Distance - reach ) ) / ( reach * reach ); } -glm::dvec3 TSegment::point_extended( double const Distance ) const { - auto const on { std::clamp( Distance, 0.0, fLength ) }; - auto const t { FastGetTFromS( on ) }; - auto const point { FastGetPoint( t ) }; - if( on == Distance ) { - return point; - } - auto const direction { FastGetDirection( t, 0.1 / fLength ) }; - auto const size { glm::length( direction ) }; - return size > 0.0 ? point + direction * ( ( Distance - on ) / size ) : point; -} - void TSegment::settle_vertex( gfx::basic_vertex &Vertex, glm::dvec3 const &Origin, glm::vec3 const &Position, glm::vec3 const &Parallel, double const Distance ) const { - if( false == m_uneven ) { + if( false == m_setting.uneven ) { return; } // the rails settling apart turn about the middle of the track, what's outside them follows the rail; the foot of the ballast stays @@ -430,12 +408,12 @@ void TSegment::settle_vertex( gfx::basic_vertex &Vertex, glm::dvec3 const &Origi if( share <= 0.0 ) { return; } - auto const amount { pOwner->uneven_at( Distance, m_path ) }; + auto const amount { pOwner->uneven_at( Distance, m_setting.path ) }; Vertex.position.y -= static_cast( share * track_uneven::stray_per_mm * amount.cross * track_uneven::level( Origin + glm::dvec3 { Position }, glm::dvec3 { Parallel } ) * across / gauge ); Vertex.position += glm::vec3 { share * stray( Origin + glm::dvec3 { Vertex.position }, amount, Distance ) }; } -void TSegment::design_position(double const fDistance, glm::dvec3 &position, glm::vec3 &rotation) const { +void TSegment::RaPositionGet(double const fDistance, glm::dvec3 &position, glm::vec3 &rotation) const { if (bCurve) { // można by wprowadzić uproszczony wzór dla okręgów płaskich auto const t = FastGetTFromS(fDistance); // aproksymacja dystansu na krzywej Beziera na parametr (t) @@ -458,6 +436,17 @@ void TSegment::design_position(double const fDistance, glm::dvec3 &position, glm rotation.y = static_cast(fStoop); // pochylenie toru prostego rotation.z = static_cast(fDirection); // kierunek toru w planie } + if( false == m_setting.uneven ) { + return; + } + // direction and slope stay as designed: the physics takes the curve radius and the grade from them + auto const gauge { std::max( std::abs( pOwner->fTrackWidth ), 0.1f ) }; + glm::dvec3 const across { -std::cos( rotation.z ), 0.0, -std::sin( rotation.z ) }; + auto const amount { pOwner->uneven_at( fDistance, m_setting.path ) }; + rotation.x += static_cast( track_uneven::stray_per_mm * ( + amount.up * track_uneven::roll( position, across, gauge ) + + amount.cross * track_uneven::level( position, across ) / gauge ) ); + position += track_uneven::across_only( stray( position, amount, fDistance ), across ); }; void TSegment::plan_frame( double const Distance, glm::dvec3 &Point, glm::dvec3 &Across ) const { @@ -523,9 +512,9 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, glm::dvec3 const &Origin, parallel1 = glm::vec3{ glm::dvec3{ FastGetPoint_1() - FastGetPoint_0() } }; } parallel1 = glm::normalize( parallel1 ); - if( iSkip == 0 && m_joints[ 0 ] ) { - pos1 = glm::vec3{ m_joints[ 0 ]->first - Origin }; - parallel1 = glm::vec3{ m_joints[ 0 ]->second }; + if( iSkip == 0 && m_setting.joints[ 0 ] ) { + pos1 = glm::vec3{ m_setting.joints[ 0 ]->first - Origin }; + parallel1 = glm::vec3{ m_setting.joints[ 0 ]->second }; } if( iEnd == 0 ) iEnd = iSegCount; @@ -572,9 +561,9 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, glm::dvec3 const &Origin, parallel2 = glm::vec3{ glm::dvec3{ FastGetPoint_1() - FastGetPoint_0() } }; } parallel2 = glm::normalize( parallel2 ); - if( i == iSegCount && m_joints[ 1 ] ) { - pos2 = glm::vec3{ m_joints[ 1 ]->first - Origin }; - parallel2 = glm::vec3{ m_joints[ 1 ]->second }; + if( i == iSegCount && m_setting.joints[ 1 ] ) { + pos2 = glm::vec3{ m_setting.joints[ 1 ]->first - Origin }; + parallel2 = glm::vec3{ m_setting.joints[ 1 ]->second }; } // TODO: refactor the loop, there's no need to calculate starting points for each segment when we can copy the end points of the previous one diff --git a/world/Segment.h b/world/Segment.h index 75e070152..099480e36 100644 --- a/world/Segment.h +++ b/world/Segment.h @@ -9,7 +9,9 @@ http://mozilla.org/MPL/2.0/. #pragma once +#include #include +#include #include "utilities/Classes.h" #include "rendering/geometrybank.h" @@ -50,11 +52,14 @@ class TSegment glm::dvec3 Point2; float fRoll1 { 0.f }; float fRoll2 { 0.f }; // przechyłka na końcach - float m_designrolls[ 2 ] { 0.f, 0.f }; // as entered; the two above can differ at a joint - bool m_uneven { false }; // see TrackUneven.h - int m_path { 0 }; // which path of a switch - // where the path meets the next one: the middle of their ends and their common vector across - std::optional> m_joints[ 2 ]; + // how the path sits among the others + struct setting { + std::array designrolls { 0.f, 0.f }; // as entered; fRoll1 and fRoll2 can differ at a joint + bool uneven { false }; // see TrackUneven.h + int path { 0 }; // which path of a switch + // where the path meets the next one: the middle of their ends and their common vector across + std::array>, 2> joints; + } m_setting; double fLength { -1.0 }; // długość policzona std::vector fTsBuffer; // wartości parametru krzywej t dla równych odcinków s std::vector fTsSlope; // nachylenie dt/du (= dt/ds * fStep) w tych samych punktach @@ -79,9 +84,6 @@ class TSegment void settle_vertex( gfx::basic_vertex &Vertex, glm::dvec3 const &Origin, glm::vec3 const &Position, glm::vec3 const &Parallel, double const Distance ) const; // displacement of a point by the unevenness, at a distance along the path glm::dvec3 stray( glm::dvec3 const &Point, track_uneven::amounts const &Amount, double const Distance ) const; - // a point of the path at a distance, past its ends straight on: the polynomial would run off on a short curved path - glm::dvec3 point_extended( double const Distance ) const; - void design_position( double const fDistance, glm::dvec3 &position, glm::vec3 &rotation ) const; public: bool bCurve = false; @@ -125,20 +127,17 @@ public: // call before Init, it sets the density of the geometry void set_uneven( bool const Uneven, int const Path = 0 ) { - m_uneven = Uneven; - m_path = Path; } - glm::dvec3 - end_point( int const End ) const { - return End == 0 ? Point1 : Point2; } + m_setting.uneven = Uneven; + m_setting.path = Path; } // a point of the path and the unit vector across it in the plan void plan_frame( double const Distance, glm::dvec3 &Point, glm::dvec3 &Across ) const; float design_roll( int const End ) const { - return m_designrolls[ End ]; } + return m_setting.designrolls[ End ]; } void set_joint( int const End, std::optional> const &Joint, float const Roll ) { - m_joints[ End ] = Joint; + m_setting.joints[ End ] = Joint; ( End == 0 ? fRoll1 : fRoll2 ) = Roll; } // second derivative of the displacement along the path; times speed squared: acceleration of an axle glm::dvec3 diff --git a/world/Track.h b/world/Track.h index f5bb8c1b6..72cbd8847 100644 --- a/world/Track.h +++ b/world/Track.h @@ -349,15 +349,15 @@ public: track_uneven::amounts uneven_declared( int const Path = 0 ) const; bool is_uneven() const; // the unevenness at a distance along a path, meeting the tracks joined at its ends - track_uneven::amounts uneven_at( double const Distance, int const Path = 0 ) const; + track_uneven::amounts uneven_at( double const Distance, int const Path = 0 ); // how much of the displacement a point of the profile at the depth takes double uneven_bed_share( double const Depth ) const; // closes the gaps and steps of cant between the ends of joined paths void share_joints(); double joint_depth() const; // mm - double joint_dip( double const Distance ) const; // m + double joint_dip( double const Distance ); // m // distance from the rail joint behind; negative: the track has no joints that dip - double rail_phase( double const Distance ) const; + double rail_phase( double const Distance ); void ConnectionsLog(); bool DoubleSlip() const; static void fetch_default_profiles(); @@ -395,8 +395,8 @@ private: double way { 1.0 }; // direction of the path along the run int stamp { -1 }; }; - void settle_rail_run() const; - mutable rail_run m_railrun; + void settle_rail_run(); + rail_run m_railrun; // the value along each path of a switch: the lowest of that path in the switches joined, 0 next to a track with none. // And at the ends of the paths, by what meets there: the other path at the common end, the path of a switch joined struct switch_stray { @@ -404,15 +404,16 @@ private: std::array, 2> ends; int stamp { -1 }; }; - mutable switch_stray m_switchstray; - switch_stray const &switch_uneven() const; - void settle_switch_stray() const; + switch_stray m_switchstray; + switch_stray const &switch_uneven(); + void settle_switch_stray(); + void settle_switch_ends(); // the lowest value of the paths ending at the point track_uneven::amounts switch_paths_at( glm::dvec3 const &Point ) const; // what a plain track comes to at its end, where it meets the other one - track_uneven::amounts uneven_met( TTrack const *Other, glm::dvec3 const &Point ) const; + track_uneven::amounts uneven_met( TTrack *Other, glm::dvec3 const &Point ); // the value of a switch where a track joined to it meets it - track_uneven::amounts switch_uneven_at( glm::dvec3 const &Point ) const; + track_uneven::amounts switch_uneven_at( glm::dvec3 const &Point ); static int s_layoutstamp; // bumped when tracks are joined or changed, invalidates the two above void create_road_profile( gfx::vertex_array &Output, bool const Forcetransition = false ); void create_road_side_profile( gfx::vertex_array &Right, gfx::vertex_array &Left, gfx::vertex_array const &Road, bool const Forcetransition = false ); diff --git a/world/TrackUneven.cpp b/world/TrackUneven.cpp index 152449ad2..78505ac3a 100644 --- a/world/TrackUneven.cpp +++ b/world/TrackUneven.cpp @@ -24,42 +24,55 @@ bool is_switch( TTrack const *Track ) { return Track != nullptr && Track->eType == tt_Switch && Track->SwitchExtension; } -std::array joined_to_switch( TTrack const &Switch ) { +glm::dvec3 end_point( TSegment const &Segment, int const End ) { + + return End == 0 ? Segment.FastGetPoint_0() : Segment.FastGetPoint_1(); +} + +std::array joined_to_switch( TTrack const &Switch ) { auto const &extension { *Switch.SwitchExtension }; return { extension.pPrevs[ 0 ], extension.pPrevs[ 1 ], extension.pNexts[ 0 ], extension.pNexts[ 1 ] }; } // the switch and the switches joined directly to it, and to those -std::vector switch_group( TTrack const &Switch ) { +std::vector switch_group( TTrack &Switch ) { - std::vector group { &Switch }; - for( std::size_t index = 0; index < group.size(); ++index ) { - for( auto const *other : joined_to_switch( *group[ index ] ) ) { - if( is_switch( other ) && std::find( group.begin(), group.end(), other ) == group.end() ) { + std::vector group { &Switch }; + std::vector pending { &Switch }; + while( false == pending.empty() ) { + auto const *track { pending.back() }; + pending.pop_back(); + for( auto *other : joined_to_switch( *track ) ) { + if( is_switch( other ) && std::ranges::find( group, other ) == group.end() ) { group.push_back( other ); + pending.push_back( other ); } } } return group; } +// a plain track with none of a component keeps the switch to its design in it, any other comes to the value of the switch +void keep_to_plain_track( std::array &Values, TTrack const &Plain ) { + + auto const theirs { Plain.uneven_declared() }; + for( auto &path : Values ) { + if( theirs.up <= 0.0 ) { path.up = 0.0; } + if( theirs.side <= 0.0 ) { path.side = 0.0; } + } +} + // the value along each path: the lowest of that path in the group, 0 in a component that a plain track joined has none of -std::array group_path_values( std::vector const &Group ) { +std::array group_path_values( std::vector const &Group ) { std::array values { Group.front()->uneven_declared( 0 ), Group.front()->uneven_declared( 1 ) }; for( auto const *track : Group ) { values[ 0 ] = track_uneven::least( values[ 0 ], track->uneven_declared( 0 ) ); values[ 1 ] = track_uneven::least( values[ 1 ], track->uneven_declared( 1 ) ); for( auto const *other : joined_to_switch( *track ) ) { - if( other == nullptr || is_switch( other ) ) { - continue; - } - // any other comes to the value of the switch - auto const theirs { other->uneven_declared() }; - for( auto &path : values ) { - if( theirs.up <= 0.0 ) { path.up = 0.0; } - if( theirs.side <= 0.0 ) { path.side = 0.0; } + if( other != nullptr && false == is_switch( other ) ) { + keep_to_plain_track( values, *other ); } } } @@ -74,7 +87,7 @@ track_uneven::amounts least_at_ends( TTrack const &Switch, glm::dvec3 const &Poi track_uneven::amounts result { track_uneven::most, track_uneven::most, track_uneven::most }; for( int path = 0; path < 2; ++path ) { for( int end = 0; end < 2; ++end ) { - if( glm::length( Switch.path_segment( path )->end_point( end ) - Point ) < switch_end_reach ) { + if( glm::length( end_point( *Switch.path_segment( path ), end ) - Point ) < switch_end_reach ) { result = track_uneven::least( result, Value( path, end ) ); found = true; } @@ -165,16 +178,16 @@ double TTrack::uneven_bed_share( double const Depth ) const { return track_uneven::bed_share( Depth, std::abs( track_rail_profile( m_profile1.second ).front().position.y ), fTexHeight1 ); } -track_uneven::amounts TTrack::uneven_at( double const Distance, int const Path ) const { +track_uneven::amounts TTrack::uneven_at( double const Distance, int const Path ) { if( eType == tt_Switch ) { auto const &stray { switch_uneven() }; return track_uneven::along( stray.paths[ Path ], stray.ends[ Path ][ 0 ], stray.ends[ Path ][ 1 ], Distance, path_segment( Path )->GetLength() ); } - return track_uneven::along( uneven_declared(), uneven_met( trPrev, Segment->end_point( 0 ) ), uneven_met( trNext, Segment->end_point( 1 ) ), Distance, Length() ); + return track_uneven::along( uneven_declared(), uneven_met( trPrev, end_point( *Segment, 0 ) ), uneven_met( trNext, end_point( *Segment, 1 ) ), Distance, Length() ); } -track_uneven::amounts TTrack::uneven_met( TTrack const *Other, glm::dvec3 const &Point ) const { +track_uneven::amounts TTrack::uneven_met( TTrack *Other, glm::dvec3 const &Point ) { if( Other == nullptr ) { return {}; @@ -182,7 +195,7 @@ track_uneven::amounts TTrack::uneven_met( TTrack const *Other, glm::dvec3 const return Other->eType == tt_Switch ? Other->switch_uneven_at( Point ) : track_uneven::least( uneven_declared(), Other->uneven_declared() ); } -TTrack::switch_stray const &TTrack::switch_uneven() const { +TTrack::switch_stray const &TTrack::switch_uneven() { if( m_switchstray.stamp != s_layoutstamp ) { settle_switch_stray(); @@ -190,26 +203,30 @@ TTrack::switch_stray const &TTrack::switch_uneven() const { return m_switchstray; } -void TTrack::settle_switch_stray() const { +void TTrack::settle_switch_stray() { auto const group { switch_group( *this ) }; auto const values { group_path_values( group ) }; - for( auto const *track : group ) { + for( auto *track : group ) { track->m_switchstray.paths = values; track->m_switchstray.stamp = s_layoutstamp; } - // at the ends of the paths, with the paths known in all of the group - for( auto const *track : group ) { - for( int path = 0; path < 2; ++path ) { - for( int end = 0; end < 2; ++end ) { - auto const point { track->path_segment( path )->end_point( end ) }; - auto value { track->switch_paths_at( point ) }; - auto const *other { track->path_neighbour( path, end ) }; - if( is_switch( other ) ) { - value = track_uneven::least( value, other->switch_paths_at( point ) ); - } - track->m_switchstray.ends[ path ][ end ] = value; + // with the paths known in all of the group + for( auto *track : group ) { + track->settle_switch_ends(); + } +} + +void TTrack::settle_switch_ends() { + + for( int path = 0; path < 2; ++path ) { + for( int end = 0; end < 2; ++end ) { + auto const point { end_point( *path_segment( path ), end ) }; + auto value { switch_paths_at( point ) }; + if( auto const *other { path_neighbour( path, end ) }; is_switch( other ) ) { + value = track_uneven::least( value, other->switch_paths_at( point ) ); } + m_switchstray.ends[ path ][ end ] = value; } } } @@ -217,13 +234,13 @@ void TTrack::settle_switch_stray() const { track_uneven::amounts TTrack::switch_paths_at( glm::dvec3 const &Point ) const { auto const &paths { m_switchstray.paths }; - return least_at_ends( *this, Point, track_uneven::least( paths[ 0 ], paths[ 1 ] ), [ & ]( int const Path, int ) { return paths[ Path ]; } ); + return least_at_ends( *this, Point, track_uneven::least( paths[ 0 ], paths[ 1 ] ), [ &paths ]( int const Path, int ) { return paths[ Path ]; } ); } -track_uneven::amounts TTrack::switch_uneven_at( glm::dvec3 const &Point ) const { +track_uneven::amounts TTrack::switch_uneven_at( glm::dvec3 const &Point ) { auto const &stray { switch_uneven() }; - return least_at_ends( *this, Point, track_uneven::least( stray.paths[ 0 ], stray.paths[ 1 ] ), [ & ]( int const Path, int const End ) { return stray.ends[ Path ][ End ]; } ); + return least_at_ends( *this, Point, track_uneven::least( stray.paths[ 0 ], stray.paths[ 1 ] ), [ &stray ]( int const Path, int const End ) { return stray.ends[ Path ][ End ]; } ); } double TTrack::joint_depth() const { @@ -234,7 +251,7 @@ double TTrack::joint_depth() const { return ( m_uneven.dip >= 0.f ? m_uneven.dip : track_uneven::dip_share * uneven_declared().up ); } -double TTrack::joint_dip( double const Distance ) const { +double TTrack::joint_dip( double const Distance ) { auto const phase { rail_phase( Distance ) }; if( phase < 0.0 ) { @@ -245,12 +262,12 @@ double TTrack::joint_dip( double const Distance ) const { return 0.0; } auto const depth { joint_depth() }; - auto const atend = [&]( TTrack const *Other ) { + auto const atend = [ this, depth ]( TTrack const *Other ) { return ( Other == nullptr || Other->fSoundDistance != fSoundDistance ? 0.0 : std::min( depth, Other->joint_depth() ) ); }; return 0.001 * track_uneven::dip( fromjoint ) * track_uneven::along( depth, atend( trPrev ), atend( trNext ), Distance, Length() ); } -double TTrack::rail_phase( double const Distance ) const { +double TTrack::rail_phase( double const Distance ) { if( joint_depth() <= 0.0 || fSoundDistance <= 2.0 * track_uneven::dip_reach ) { return -1.0; @@ -261,22 +278,22 @@ double TTrack::rail_phase( double const Distance ) const { return track_uneven::rail_phase( m_railrun.origin + m_railrun.way * Distance, fSoundDistance ); } -void TTrack::settle_rail_run() const { +void TTrack::settle_rail_run() { // the next track of the run past an end of a track, and which of its ends is joined there - auto const onward = []( TTrack const &Track, int const End, int &Joined ) -> TTrack const * { - auto const *other { End == 0 ? Track.trPrev : Track.trNext }; + auto const onward = []( TTrack const &Track, int const End, int &Joined ) -> TTrack * { + auto *other { End == 0 ? Track.trPrev : Track.trNext }; if( other == nullptr || other == &Track || other->joint_depth() <= 0.0 || other->fSoundDistance != Track.fSoundDistance ) { return nullptr; } Joined = ( End == 0 ? Track.iPrevDirection : Track.iNextDirection ) & 1; return other; }; // walks from this track to an end of the run - auto const walk = [&]( int &End ) { - auto const *track { this }; + auto const walk = [ this, &onward ]( int &End ) { + auto *track { this }; int joined { 0 }; for( int step = 0; step < 1000000; ++step ) { - auto const *next { onward( *track, End, joined ) }; + auto *next { onward( *track, End, joined ) }; if( next == nullptr || next == this ) { break; } @@ -285,15 +302,14 @@ void TTrack::settle_rail_run() const { } return track; }; auto const place = []( TTrack const &Track, int const End ) { - auto const point { Track.Segment->end_point( End ) }; + auto const point { end_point( *Track.Segment, End ) }; return std::make_pair( point.x, point.z ); }; // start at the end with the lesser coordinates, to get the same joints from any track of the run int end { 0 }; int otherend { 1 }; - auto const *track { walk( end ) }; - auto const *other { walk( otherend ) }; - if( place( *other, otherend ) < place( *track, end ) ) { + auto *track { walk( end ) }; + if( auto *other { walk( otherend ) }; place( *other, otherend ) < place( *track, end ) ) { track = other; end = otherend; } @@ -327,7 +343,8 @@ void TTrack::share_joints() { } } if( eType != tt_Switch && Segment && ( iCategoryFlag & 1 ) ) { - float roll1, roll2; + float roll1 { 0.f }; + float roll2 { 0.f }; Segment->GetRolls( roll1, roll2 ); if( roll1 != 0.f || roll2 != 0.f ) { iTrapezoid |= 1; diff --git a/world/TrackUneven.h b/world/TrackUneven.h index 624e6db16..2c32ad660 100644 --- a/world/TrackUneven.h +++ b/world/TrackUneven.h @@ -15,6 +15,7 @@ http://mozilla.org/MPL/2.0/. #include #include #include +#include #include #include @@ -51,18 +52,20 @@ struct wave { // the numbers of an entry like "uneven 14;35", negative where left out template -std::array read_fields( std::string const &Text ) { +std::array read_fields( std::string_view const Text ) { std::array result; result.fill( -1.f ); - std::size_t start { 0 }; - for( std::size_t index = 0; index < Count && start < Text.size(); ++index ) { - auto const end { std::min( Text.find( ';', start ), Text.size() ) }; - auto value { 0.f }; - if( end > start && std::from_chars( Text.data() + start, Text.data() + end, value ).ec == std::errc {} ) { - result[ index ] = std::clamp( value, 0.f, most ); + auto rest { Text }; + for( auto &field : result ) { + auto const end { std::min( rest.find( ';' ), rest.size() ) }; + if( auto value { 0.f }; end > 0 && std::from_chars( rest.data(), rest.data() + end, value ).ec == std::errc {} ) { + field = std::clamp( value, 0.f, most ); } - start = end + 1; + if( end == rest.size() ) { + break; + } + rest.remove_prefix( end + 1 ); } return result; } @@ -100,7 +103,7 @@ struct attribute { }; // a plain track: value;up;side;cross;dip. A switch: p1-p2;p3-p4;up of p1-p2;side of p1-p2;up of p3-p4;side of p3-p4 -inline attribute read_attribute( std::string const &Text, bool const Switch ) { +inline attribute read_attribute( std::string_view const Text, bool const Switch ) { auto const fields { read_fields<6>( Text ) }; attribute result; @@ -136,15 +139,15 @@ inline std::string write_attribute( attribute const &Values, bool const Switch ) // what a path comes to from the values: what's not given takes the first value, p3-p4 those of p1-p2. Cross level on plain tracks only inline amounts declared( attribute const &Values, bool const Plain, int const Path ) { + auto const given = []( float const Part, double const Otherwise ) { + return Part >= 0.f ? static_cast( Part ) : Otherwise; }; amounts result { - Values.up >= 0.f ? Values.up : Values.value, - Values.side >= 0.f ? Values.side : Values.value, - false == Plain ? 0.f : Values.cross >= 0.f ? Values.cross : Values.value }; + given( Values.up, Values.value ), + given( Values.side, Values.value ), + Plain ? given( Values.cross, Values.value ) : 0.0 }; if( Path == 1 ) { - auto const branch = [ &Values ]( float const Part, double const Straight ) -> double { - return Part >= 0.f ? Part : Values.branch >= 0.f ? Values.branch : Straight; }; - result.up = branch( Values.branchup, result.up ); - result.side = branch( Values.branchside, result.side ); + result.up = given( Values.branchup, given( Values.branch, result.up ) ); + result.side = given( Values.branchside, given( Values.branch, result.side ) ); } return result; } @@ -160,8 +163,9 @@ wave_set make_waves( double const Turn, std::array const & wave_set result {}; for( std::size_t i = 0; i < Count; ++i ) { auto const number { glm::two_pi() / Lengths[ i ] }; - auto const heading { Turn + golden * i }; - result[ i ] = { number * std::cos( heading ), number * std::sin( heading ), golden * ( i + 1 ) * ( 1.0 + 3.0 * Turn ), Shares[ i ] }; + auto const place { static_cast( i ) }; + auto const heading { Turn + golden * place }; + result[ i ] = { number * std::cos( heading ), number * std::sin( heading ), golden * ( place + 1.0 ) * ( 1.0 + 3.0 * Turn ), Shares[ i ] }; } return result; } @@ -246,7 +250,10 @@ inline glm::dvec3 across_of( glm::dvec3 const &Direction, glm::dvec3 const &Chor // the cant where two paths meet, theirs turned to the way of this one: a switch takes that of a plain track, alike ones meet halfway inline float joint_roll( float const Own, float const Their, bool const Switch, bool const Theirswitch ) { - return Switch == Theirswitch ? 0.5f * ( Own + Their ) : Switch ? Their : Own; + if( Switch == Theirswitch ) { + return 0.5f * ( Own + Their ); + } + return Switch ? Their : Own; } // each component the same way From 32fadd634d259595a961556fd5e6349895569dec Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 31 Oct 2026 20:17:47 +0100 Subject: [PATCH 234/430] refactor(tools): the grading tool in smaller functions As Sonar asks, and a regular expression with no backtracking. The results stay the same byte for byte on baltyk_skm1, baltyk_cargo, td and lk357. --- tools/track_uneven_grade.py | 348 +++++++++++++++++++++--------------- 1 file changed, 208 insertions(+), 140 deletions(-) diff --git a/tools/track_uneven_grade.py b/tools/track_uneven_grade.py index d643f94f8..1994559d0 100644 --- a/tools/track_uneven_grade.py +++ b/tools/track_uneven_grade.py @@ -43,7 +43,7 @@ STRAY_PER_MM, DIP_SHARE, DIP_REACH = 0.00145, 0.4, 3.0 GOLDEN = math.pi * (3.0 - math.sqrt(5.0)) UP_WAVES = [(2 * math.pi / length * math.cos(GOLDEN * i), 2 * math.pi / length * math.sin(GOLDEN * i), GOLDEN * (i + 1), share) for i, (length, share) in enumerate(zip((8.3, 11.9, 16.7, 23.9, 37.1, 47.3, 61.9, 83.3), (.14, .19, .22, .22, .23, .23, .23, .23)))] TOKEN = re.compile(r"//[^\n]*|\S+") -NUMBER = re.compile(r"^[-+]?\d*\.?\d+([eE][-+]?\d+)?$") +NUMBER = re.compile(r"^[-+]?(\d+(\.\d*)?|\.\d+)([eE][-+]?\d+)?$") def limit(speed): @@ -79,38 +79,9 @@ class Scenery: def read(self, path, offset=(0.0, 0.0, 0.0)): path = path.resolve() - if path in self.seen: - return - self.seen.add(path) - text = path.read_bytes().decode("latin-1") - self.texts[path] = text - matches = [m for m in TOKEN.finditer(text) if not m.group(0).startswith("//")] - words = [m.group(0) for m in matches] - lower = [w.lower() for w in words] - origins = [offset] - i = 0 - while i < len(words): - word = lower[i] - if word == "include" and i + 1 < len(words): - end = i + 1 - while end < len(words) and lower[end] != "end": - end += 1 - self.include(words[i + 1], words[i + 2:end], origins[-1]) - i = end - elif word == "origin" and i + 3 < len(words) and all(NUMBER.match(w) for w in words[i + 1:i + 4]): - origins.append(tuple(o + float(w) for o, w in zip(origins[-1], words[i + 1:i + 4]))) - i += 3 - elif word == "endorigin" and len(origins) > 1: - origins.pop() - elif word == "rotate" and i + 3 < len(words) and any(w.strip("0.-") for w in words[i + 1:i + 4]): - self.notes["rotate"] += 1 - elif word == "node" and i + 4 < len(words): - kind = lower[i + 4] - if kind == "track": - i = self.track(path, matches, words, lower, i, origins[-1]) - elif kind == "model" and i + 9 < len(words) and GRASS.search(lower[i + 9]) and all(NUMBER.match(w) for w in words[i + 5:i + 8]): - self.plant(float(words[i + 5]) + origins[-1][0], float(words[i + 7]) + origins[-1][2]) - i += 1 + if path not in self.seen: + self.seen.add(path) + FileReader(self, path, offset).run() def include(self, name, params, origin): path = self.root / name.replace("\\", "/") @@ -118,21 +89,90 @@ class Scenery: numbers = [float(w) for w in params if NUMBER.match(w)] if GRASS.search(name.lower()) and len(numbers) >= 3: self.plant(numbers[0] + origin[0], numbers[2] + origin[2]) - return - if not path.is_file(): + elif not path.is_file(): self.notes["brak pliku " + name] += 1 - return - if params: + elif not params: + self.read(path, origin) + elif path.stat().st_size < 4000000 and re.search(rb"\btrack\s+(normal|switch)\b", path.read_bytes(), re.I): # the same file can come many times with other parameters: its tracks can't be told apart in one copy - if path.stat().st_size < 4000000 and re.search(rb"\btrack\s+(normal|switch)\b", path.read_bytes(), re.I): - self.notes["pliki z parametrami, tory pominiete"] += 1 - return - self.read(path, origin) + self.notes["pliki z parametrami, tory pominiete"] += 1 def plant(self, x, z): self.plants[(round(x / 10), round(z / 10))].append((x, z)) - def track(self, path, matches, words, lower, i, origin): + +class FileReader: + """Goes through the words of one file. Each handler takes the place of its word and gives the place of the last word it used.""" + + def __init__(self, scenery, path, offset): + self.scenery, self.path = scenery, path + text = path.read_bytes().decode("latin-1") + scenery.texts[path] = text + self.matches = [m for m in TOKEN.finditer(text) if not m.group(0).startswith("//")] + self.words = [m.group(0) for m in self.matches] + self.lower = [w.lower() for w in self.words] + self.origins = [offset] + self.handlers = {"include": self.include, "origin": self.origin, "endorigin": self.endorigin, "rotate": self.rotate, "node": self.node} + + def run(self): + i = 0 + while i < len(self.words): + handler = self.handlers.get(self.lower[i]) + i = (handler(i) if handler else i) + 1 + + def include(self, i): + if i + 1 >= len(self.words): + return i + end = i + 1 + while end < len(self.words) and self.lower[end] != "end": + end += 1 + self.scenery.include(self.words[i + 1], self.words[i + 2:end], self.origins[-1]) + return end + + def origin(self, i): + values = self.words[i + 1:i + 4] + if len(values) < 3 or not all(NUMBER.match(w) for w in values): + return i + self.origins.append(tuple(o + float(w) for o, w in zip(self.origins[-1], values))) + return i + 3 + + def endorigin(self, i): + if len(self.origins) > 1: + self.origins.pop() + return i + + def rotate(self, i): + if i + 3 < len(self.words) and any(w.strip("0.-") for w in self.words[i + 1:i + 4]): + self.scenery.notes["rotate"] += 1 + return i + + def node(self, i): + if i + 4 >= len(self.words): + return i + kind = self.lower[i + 4] + if kind == "track": + return self.track(i) + if kind == "model" and i + 9 < len(self.words) and GRASS.search(self.lower[i + 9]) and all(NUMBER.match(w) for w in self.words[i + 5:i + 8]): + self.scenery.plant(float(self.words[i + 5]) + self.origins[-1][0], float(self.words[i + 7]) + self.origins[-1][2]) + return i + + def paths_from(self, cursor, count): + paths = [] + origin = self.origins[-1] + for _ in range(count): + values = self.words[cursor:cursor + 15] + if len(values) < 15 or not all(NUMBER.match(v) for v in values): + return None + n = [float(v) for v in values] + part = {"p1": [n[j] + origin[j] for j in range(3)], "c1": n[4:7], "c2": n[7:10], "p2": [n[10 + j] + origin[j] for j in range(3)], "radius": abs(n[14])} + part["line"] = line_of(part) + part["length"] = sum(math.dist(a, b) for a, b in zip(part["line"], part["line"][1:])) + paths.append(part) + cursor += 15 + return paths + + def track(self, i): + words, lower = self.words, self.lower at = i + 4 end = at while end < len(words) and lower[end] != "endtrack": @@ -142,33 +182,30 @@ class Scenery: kind = lower[at + 1] if kind not in ("normal", "switch", "road"): return end - cursor = at + 10 - rail = ballast = None - if lower[at + 9] == "vis": - rail, ballast = lower[cursor], lower[cursor + 2] - cursor += 6 - paths = [] - for _ in range(2 if kind == "switch" else 1): - values = words[cursor:cursor + 15] - if len(values) < 15 or not all(NUMBER.match(v) for v in values): - self.notes["tory z parametrami, pominiete"] += 1 - return end - n = [float(v) for v in values] - part = dict(p1=[n[j] + origin[j] for j in range(3)], c1=n[4:7], c2=n[7:10], p2=[n[10 + j] + origin[j] for j in range(3)], radius=abs(n[14])) - part["line"] = line_of(part) - part["length"] = sum(math.dist(a, b) for a, b in zip(part["line"], part["line"][1:])) - paths.append(part) - cursor += 15 - if kind == "road": - self.roads.append(paths[0]) - return end - block = lower[at:end] - taken = any(w in block for w in ("uneven", "unevenup", "unevenside", "unevencross", "jointdip")) - velocity = float(words[at + block.index("velocity") + 1]) if "velocity" in block and NUMBER.match(words[at + block.index("velocity") + 1]) else 0.0 - sound = float(words[at + 5]) if NUMBER.match(words[at + 5]) else -1.0 - self.tracks.append(dict(name=words[i + 3], kind=kind, rail=rail, ballast=ballast, sound=sound, paths=paths, speed=velocity if velocity > 0 else None, source="wpis" if velocity > 0 else None, file=path, offset=matches[end].start(), taken=taken)) + visible = lower[at + 9] == "vis" + paths = self.paths_from(at + (16 if visible else 10), 2 if kind == "switch" else 1) + if paths is None: + self.scenery.notes["tory z parametrami, pominiete"] += 1 + elif kind == "road": + self.scenery.roads.append(paths[0]) + else: + self.add_track(i, at, end, kind, visible, paths) return end + def add_track(self, i, at, end, kind, visible, paths): + words = self.words + block = self.lower[at:end] + velocity = 0.0 + if "velocity" in block and NUMBER.match(words[at + block.index("velocity") + 1]): + velocity = float(words[at + block.index("velocity") + 1]) + self.scenery.tracks.append({ + "name": words[i + 3], "kind": kind, + "rail": self.lower[at + 10] if visible else None, "ballast": self.lower[at + 12] if visible else None, + "sound": float(words[at + 5]) if NUMBER.match(words[at + 5]) else -1.0, + "paths": paths, "speed": velocity if velocity > 0 else None, "source": "wpis" if velocity > 0 else None, + "file": self.path, "offset": self.matches[end].start(), + "taken": any(w in block for w in ("uneven", "unevenup", "unevenside", "unevencross", "jointdip"))}) + def bezier(part, t): a = [part["p1"][i] + part["c1"][i] for i in range(3)] @@ -220,50 +257,67 @@ class Joints: return found +def plain_neighbours(t, joints): + return [other for key in ("p1", "p2") for other, _, _ in joints.at(t["paths"][0][key]) if other is not t and other["kind"] == "normal"] + + +def plain_past_switches(t, point, joints): + # the plain tracks reached from a point of a track along the straight paths of switches + points, seen, found = [point], set(), [] + for _ in range(6): + onward = [] + for reached in points: + for other, part, side in joints.at(reached): + if other is t or id(part) in seen: + continue + seen.add(id(part)) + if other["kind"] != "switch": + found.append(other) + elif other["paths"].index(part) != other["bent"]: + onward.append(part["p2" if side == "p1" else "p1"]) + points = onward + return found + + +def short_pieces_past_switches(t, joints): + return [o for key in ("p1", "p2") for o in plain_past_switches(t, t["paths"][0][key], joints) if o["paths"][0]["length"] < PIECE] + + +def spread_speed(tracks, joints, reached): + heads = collections.deque(t for t in tracks if t["kind"] == "normal" and t["speed"]) + while heads: + t = heads.popleft() + for other in reached(t, joints): + if other["speed"] is None: + other["speed"], other["source"] = t["speed"], "sasiad" + heads.append(other) + + def settle_speeds(tracks, joints): # from the nearest track on the stretch between switches, a short piece also along the straight path of a switch - heads = collections.deque(t for t in tracks if t["kind"] == "normal" and t["speed"]) - while heads: - t = heads.popleft() - for key in ("p1", "p2"): - for other, _, _ in joints.at(t["paths"][0][key]): - if other is not t and other["kind"] == "normal" and other["speed"] is None: - other["speed"], other["source"] = t["speed"], "sasiad" - heads.append(other) - heads = collections.deque(t for t in tracks if t["kind"] == "normal" and t["speed"]) - while heads: - t = heads.popleft() - for key in ("p1", "p2"): - points, seen = [t["paths"][0][key]], set() - for _ in range(6): - onward = [] - for point in points: - for other, part, side in joints.at(point): - if other is t or id(part) in seen: - continue - seen.add(id(part)) - if other["kind"] == "switch": - if other["paths"].index(part) != other["bent"]: - onward.append(part["p2" if side == "p1" else "p1"]) - elif other["speed"] is None and other["paths"][0]["length"] < PIECE: - other["speed"], other["source"] = t["speed"], "sasiad" - heads.append(other) - points = onward + spread_speed(tracks, joints, plain_neighbours) + spread_speed(tracks, joints, short_pieces_past_switches) for t in tracks: if t["speed"] is None: t["speed"], t["source"] = NO_SPEED, "brak" +def plain_ends(tracks): + for t in tracks: + if t["kind"] == "normal": + for part in t["paths"]: + yield part["p1"] + yield part["p2"] + + def distances(tracks, joints, station): best, heap = {}, [] - for t in tracks: - for part in t["paths"]: - for key in ("p1", "p2"): - gap = math.dist((part[key][0], part[key][2]), station) - node = (round(part[key][0], 1), round(part[key][2], 1)) - if gap < 300 and t["kind"] == "normal" and gap < best.get(node, math.inf): - best[node] = gap - heapq.heappush(heap, (gap, node, part[key])) + for point in plain_ends(tracks): + gap = math.dist((point[0], point[2]), station) + node = (round(point[0], 1), round(point[2], 1)) + if gap < 300 and gap < best.get(node, math.inf): + best[node] = gap + heapq.heappush(heap, (gap, node, point)) while heap: distance, node, point = heapq.heappop(heap) if distance > best.get(node, math.inf): @@ -293,30 +347,34 @@ def grass_on(part, plants): return len(near) * 100.0 / max(part["length"], 5.0) +def cells_under(a, b): + for x in range(math.floor(min(a[0], b[0]) / 50), math.floor(max(a[0], b[0]) / 50) + 1): + for z in range(math.floor(min(a[2], b[2]) / 50), math.floor(max(a[2], b[2]) / 50) + 1): + yield x, z + + def road_cells(roads): cells = collections.defaultdict(list) for road in roads: for a, b in zip(road["line"], road["line"][1:]): - for x in range(math.floor(min(a[0], b[0]) / 50), math.floor(max(a[0], b[0]) / 50) + 1): - for z in range(math.floor(min(a[2], b[2]) / 50), math.floor(max(a[2], b[2]) / 50) + 1): - cells[(x, z)].append((a, b)) + for cell in cells_under(a, b): + cells[cell].append((a, b)) return cells +def cross_in_plan(a, b, c, d): + rx, rz, sx, sz = b[0] - a[0], b[2] - a[2], d[0] - c[0], d[2] - c[2] + k = rx * sz - rz * sx + if abs(k) < 1e-9: + return False + t = ((c[0] - a[0]) * sz - (c[2] - a[2]) * sx) / k + u = ((c[0] - a[0]) * rz - (c[2] - a[2]) * rx) / k + return 0 <= t <= 1 and 0 <= u <= 1 + + def hits_road(part, cells): - for a, b in zip(part["line"], part["line"][1:]): - for x in range(math.floor(min(a[0], b[0]) / 50), math.floor(max(a[0], b[0]) / 50) + 1): - for z in range(math.floor(min(a[2], b[2]) / 50), math.floor(max(a[2], b[2]) / 50) + 1): - for c, d in cells.get((x, z), ()): - rx, rz, sx, sz = b[0] - a[0], b[2] - a[2], d[0] - c[0], d[2] - c[2] - k = rx * sz - rz * sx - if abs(k) < 1e-9: - continue - t = ((c[0] - a[0]) * sz - (c[2] - a[2]) * sx) / k - u = ((c[0] - a[0]) * rz - (c[2] - a[2]) * rx) / k - if 0 <= t <= 1 and 0 <= u <= 1: - return True - return False + line = part["line"] + return any(cross_in_plan(a, b, c, d) for a, b in zip(line, line[1:]) for cell in cells_under(a, b) for c, d in cells.get(cell, ())) def heights_per_mm(t): @@ -423,17 +481,19 @@ def fit_under_pantograph(normal): return low +def joint_curve_changes(t, part, key, joints): + own = end_curve(part, key) + for other, theirs, side in joints.at(part[key]): + if other is not t and other["kind"] == "normal": + their = end_curve(theirs, side) + if abs(own - (-their if side == key else their)) > CURVE_STEP: + return True + return False + + def curve_changes(t, joints): part = t["paths"][0] - if abs(end_curve(part, "p1") - end_curve(part, "p2")) > CURVE_STEP: - return True - for key in ("p1", "p2"): - for other, theirs, side in joints.at(part[key]): - if other is not t and other["kind"] == "normal": - their = end_curve(theirs, side) - if abs(end_curve(part, key) - (-their if side == key else their)) > CURVE_STEP: - return True - return False + return abs(end_curve(part, "p1") - end_curve(part, "p2")) > CURVE_STEP or any(joint_curve_changes(t, part, key, joints) for key in ("p1", "p2")) def move_near_limit(normal, joints, share): @@ -458,24 +518,32 @@ def move_near_limit(normal, joints, share): return chosen +def value_from_plain(t, index, part, joints, product): + found = [o for key in ("p1", "p2") for o, theirs, _ in joints.at(part[key]) if o["kind"] == "normal" and theirs["length"] >= SHORT] + if not found: + return None + speed = max(o["speed"] for o in found) + if index == t["bent"]: + speed = min(speed, DIVERGING) + return min(limit(speed) * max(o["state"] for o in found), SWITCH_MOST, product / speed) + + +def value_from_switches(t, part, joints): + found = [] + for key in ("p1", "p2"): + for other, theirs, _ in joints.at(part[key]): + if other["kind"] == "switch" and other is not t: + found += [other["values"][i] for i, q in enumerate(other["paths"]) if q is theirs and other["values"][i] is not None] + return max(found) if found else None + + def grade_switches(switches, joints, product): # each path by the plain tracks it leads to, the worst of them; those only among switches from their neighbours for t in switches: - t["values"] = [None] * len(t["paths"]) - for index, part in enumerate(t["paths"]): - found = [o for key in ("p1", "p2") for o, theirs, _ in joints.at(part[key]) if o["kind"] == "normal" and theirs["length"] >= SHORT] - if found: - speed = max(o["speed"] for o in found) - if index == t["bent"]: - speed = min(speed, DIVERGING) - t["values"][index] = min(limit(speed) * max(o["state"] for o in found), SWITCH_MOST, product / speed) + t["values"] = [value_from_plain(t, index, part, joints, product) for index, part in enumerate(t["paths"])] for _ in range(5): for t in switches: - for index, part in enumerate(t["paths"]): - if t["values"][index] is None: - found = [o["values"][i] for key in ("p1", "p2") for o, theirs, _ in joints.at(part[key]) if o["kind"] == "switch" and o is not t for i, q in enumerate(o["paths"]) if q is theirs and o["values"][i] is not None] - if found: - t["values"][index] = max(found) + t["values"] = [value_from_switches(t, part, joints) if value is None else value for value, part in zip(t["values"], t["paths"])] for t in switches: t["values"] = [min(SWITCH_MOST, product / NO_SPEED) if v is None else v for v in t["values"]] From dbc173ebeaf0d25c839e0e3df8bbe8dce76ef775 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sat, 31 Oct 2026 20:17:47 +0100 Subject: [PATCH 235/430] docs(track): what of the cab shake goes off on an uneven track A table of all the sources of the shake, and what happens to each of them. --- track_uneven_doc.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/track_uneven_doc.md b/track_uneven_doc.md index c7446e34d..1c3163c50 100644 --- a/track_uneven_doc.md +++ b/track_uneven_doc.md @@ -69,7 +69,19 @@ The rails, the top of the ballast, `sleepermodel`, the axles, the roll of the bo Models from includes (e.g. switch drives and timbers), the terrain and the catenary don't follow it, so at large values a rail shifts away from such a model by a few centimetres. -On a track with unevenness the track itself shakes the cab. The sway calculated from the lateral acceleration, that is from the curve radius, and the random jolts at higher speed are off. On tracks with no unevenness they work as before. +On a track with unevenness the track itself shakes the cab, in place of two of the sources of shake that were there before. It goes by the track under the vehicle, and a track with only dips at its joints counts too. On tracks with no unevenness everything works as before. + +| source of the cab shake | on a track with unevenness | +|--------------------------------------------------------------------|----------------------------| +| side sway from the lateral acceleration: curve radius and cant, jolts sideways on a damaged switch | off | +| random jolts over 25 km/h | off | +| the track itself, from the bend under the axles | added | +| vertical jolts at the joints of a damaged track | stays | +| fore and aft, when accelerating and braking | stays | +| diesel engine vibration | stays | +| hunting (`huntingspring`), set by the vehicle | stays | + +This is about the cab only. The physics, derailment included, and the noise of the wheels still use the lateral acceleration. A pantograph rises at the rate set by the pressure, about 0.14 m/s, and a gap to the wire over 1 cm cuts the voltage and trips the main breaker. Unevenness adds to this at high speed. On the tracks of Bałtyk a simulation gives a gap of 0.6 cm when the vertical value times the speed in km/h is 925, for example 8 mm at 120 km/h, 13 mm at 70 km/h and 23 mm at 40 km/h. The values in the Id-14 table are higher than that. The wire alone can do it too: at `tor0290` on Bałtyk it rises by about 1%, so a pantograph keeps up to about 46 km/h there, and above that the breaker trips on a straight track as well. From d995674bee8b45465fd98489a1559bf4d515765a Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 1 Nov 2026 09:12:36 +0100 Subject: [PATCH 236/430] =?UTF-8?q?fix(physics):=20automatic=20couplers=20?= =?UTF-8?q?don't=20catch=20above=20the=20safe=20collision=E2=80=A6=20(#217?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: automatic coupler crashes, horns, compressor start delay, radio and cab lever sounds fix(cab): the line contactors lamp goes out with the pressure switch (eu07/maszyna#470) The lamp of the open line contactors, which tells the start can be made, went out at 1 bar in the brake cylinders, while the pressure switch cuts the start off only at 2 bar (or below 3.6 bar in the main pipe), so with the brakes partly applied the start could be made with the lamp out. With a pressure switch fitted the lamp now follows it; without one it goes out at 1 bar as before. The same holds for the lamp of the second unit, which used to keep its last state between 1 bar and the cut-off. The condition is TMoverParameters::LineContactorsLampLit(). Tests: tests/unit/test_line_contactors.cpp. refactor: Sonar findings of PR 217 - horn_supply::pneumatic shadowed the pneumatic enumerator of the sound flags (cpp:S1117), it's horn_supply::air; the supplies read with using enum (S6177), - CouplerForce(): the automatic coupling refused or caught without another level of nested ifs (S134), the same outcome: too fast, the coupling is locked; caught, coupled and locked; otherwise left to try again, - CompressorCheck(): the power the compressor doesn't draw yet noted without a TODO (S1135), - tests: the previous crash damage setting in an in-class initializer (S3230), the loops which stop early with break rather than in their conditions (S886), the stand-ins of test::pair in a std::vector rather than an array (S5945), units in the comments of the example without /* */ (S1103). test: the cases the changes of the branch left without a test - Cntrl.: BDelay1 to BDelay4 reach the brake delays (now through std::format), the default start types of the ground and converter overload relays of a multiple unit and of other vehicles (out of the nested conditionals), - the compressor: fed from the low voltage it waits from the low voltage coming on; the pressure switch stops it above the cut-out pressure, without one the excess air is vented (the vented fraction rewritten), - the horns: a vehicle without any air sounds as before, the threshold pressure, an electric horn on 110 V, - the positions of a cab control below zero, and a control without position sounds. refactor(cab): the kind of the train heating switch as a flag Read once with the vehicle definition, rather than compared as text in each of the switch commands. feat(cab): train heating switch springing back (MaSzyna-EU07/maszyna#85) TrainHeating=[toggle]|impulse in the Switches: section of the vehicle definition makes the train heating switch an unstable one: it goes up to switch the heating on, down to switch it off, and back to the middle once let go, instead of staying where it was put. The position of such a switch isn't set from the heating state when the cab is entered. Tests: tests/unit/test_switches.cpp. feat(sound): mirror sounds (MaSzyna-EU07/maszyna#84, eu07/maszyna#322) The sound definitions of a vehicle (.mmd) take mirroropen: and mirrorclose:, played as a mirror sets off unfolding or folding, and the locations section mirrors: ... end, the offsets along the vehicle of the mirror pairs, as for the doors (negative ahead of the centre), each pair at the sides of the vehicle. As the animation, only the mirrors at the occupied cab sound. The start of a move is mirror_moves::motion in vehicle/mirrors.h. Tests: tests/unit/test_mirrors.cpp. feat(cab): joint oil and fuel pump switch (MaSzyna-EU07/maszyna#81) A cab control oilfuelpump_sw: switches both the oil and the fuel pump at once, with the new command oilfuelpumptoggle (no key by default). As a two-state switch it turns both pumps off when both are on and both on otherwise; as an impulse switch it's held to start them, like the separate pump switches. Its position follows the pumps when the cab is entered. refactor(editor): text fields filled without strncpy (MaSzyna-EU07/maszyna#112) The last three strncpy calls Sonar flags (cpp:S5816), in the road and track editors, copy the text into the ImGui field buffers with std::string::copy and terminate it right after; the text gets cut to the buffer as before. fix: automatic coupler crashes, horns, compressor start delay, radio and cab lever sounds - automatic couplers don't catch above the safe collision speed (#86): with crash damage on they couple at a closing speed of 15 km/h at most, a faster hit locks the coupling until the vehicles part and the collision runs its course. On the way: CollisionVelocity() read a head-on 10 + 10 km/h as 14.1 km/h (quaternions turn by half the angle), it's now taken from the touching ends; CollisionDetect() took the other vehicle's speed the wrong way round for vehicles facing each other. Head-on hits now derail sooner, at the intended limit, - a single horn lever can't sound both tones at once (eu07/maszyna#392), - a skid ends once the vehicle stops on locked wheels (eu07/maszyna#479), - electronic destination signs are blanked at the end of the timetable (eu07/maszyna#446), - horns need the air or the voltage to sound (eu07/maszyna#290, #76): HornType=[Pneumatic]|Electric and Horn3Type in Cntrl.; a pneumatic horn needs 0.2 MPa in the main reservoir (or the main pipe without one), an electric one the low voltage; the lever stays where it was put, - compressor start delay (#67): CompressorStartDelay [s] in Brake., counted from the compressor getting its power, after the engine starts say; none by default, - the channel and volume buttons of a radio without power do nothing (eu07/maszyna#429); the power check of the radio is TMoverParameters::RadioPowered(), - a lever moved smoothly sounds the positions it passes (#83). Sonar findings in the functions changed: nesting, nested conditionals, commented-out code, std::format, references to const. Unit tests: test::pair for two vehicles running into each other, test_couplers, test_horn, test_wheelslip, test_compressor, test_radio, test_gauge_positions. * fix: review findings of PR 217 - the pressures of the mover are in bar (MinCP=7.0 in the vehicle definitions), so the 0.2 the pneumatic horns needed was 0.2 bar; it's 2 bar now, and the tests take their pressures in bar too, - the lamps of the ground relay and of the motor overload relays follow the pressure switch as the line contactors one does, TMoverParameters::MainCircuitLampsEnabled(), so the lamps of one cab go out together, - the joint oil and fuel pump switch leaves out a pump started automatically, which ignores the switching: with one, it couldn't turn the other off, and showed off with both running (OilFuelPumpsEnabled()), - the kind of the train heating switch comes from the occupied vehicle on entering the cab too, as in the switch commands; in a multiple unit these are different vehicles, - CouplerForce() put the force taken back by the other vehicle on its far coupler when the vehicles faced each other (Couplers[1 - End] rather than the coupler it's coupled with), - the velocity difference along the coupler axis computed once, CouplerVelocityDifference(), for CouplerForce() and CollisionVelocity(), - the attachcoupler flag added without the SetFlag() call with 0, the index of the mirror moves noted as by side. Tests: the coupler force of vehicles facing each other, the joint switch with an automatic pump, the lamps of the main circuit, the horn and compressor pressures in bar. * fix: coupler force of vehicles facing each other taken back along the other vehicle's axis CForce runs along the axis of its own vehicle, so the force the other vehicle takes back on its coupler of the pair is turned around once more when the vehicles face each other (-CF * DirPatch()), as that vehicle computes it itself. Tests: the coupler forces of the pair facing each other and facing the same way. --- CMakeLists.txt | 1 + McZapkie/MOVER.h | 50 +++ McZapkie/Mover.cpp | 199 +++++++----- application/editormoderoad.cpp | 4 +- application/editormodetrack.cpp | 7 +- input/command.cpp | 2 + input/command.h | 1 + input/drivermouseinput.cpp | 3 + tests/unit/README.md | 6 +- tests/unit/test_cntrl.cpp | 39 +++ tests/unit/test_compressor.cpp | 115 +++++++ tests/unit/test_couplers.cpp | 458 ++++++++++++++++++++++++++++ tests/unit/test_gauge_positions.cpp | 58 ++++ tests/unit/test_horn.cpp | 121 ++++++++ tests/unit/test_line_contactors.cpp | 59 ++++ tests/unit/test_mirrors.cpp | 32 ++ tests/unit/test_pumps.cpp | 52 ++++ tests/unit/test_radio.cpp | 28 ++ tests/unit/test_switches.cpp | 16 + tests/unit/test_wheelslip.cpp | 62 ++++ tests/unit/vehicle.cpp | 104 ++++++- tests/unit/vehicle.h | 51 ++++ utilities/translation.cpp | 1 + vehicle/Driver.cpp | 27 +- vehicle/DynObj.cpp | 91 +++++- vehicle/DynObj.h | 16 +- vehicle/Gauge.cpp | 42 ++- vehicle/Train.cpp | 185 ++++++----- vehicle/Train.h | 7 +- vehicle/gaugepositions.h | 35 +++ vehicle/horn.cpp | 24 ++ vehicle/horn.h | 24 ++ vehicle/mirrors.h | 44 +++ vr/openvr_imp.cpp | 3 + 34 files changed, 1765 insertions(+), 202 deletions(-) create mode 100644 tests/unit/test_cntrl.cpp create mode 100644 tests/unit/test_compressor.cpp create mode 100644 tests/unit/test_couplers.cpp create mode 100644 tests/unit/test_gauge_positions.cpp create mode 100644 tests/unit/test_horn.cpp create mode 100644 tests/unit/test_line_contactors.cpp create mode 100644 tests/unit/test_mirrors.cpp create mode 100644 tests/unit/test_pumps.cpp create mode 100644 tests/unit/test_radio.cpp create mode 100644 tests/unit/test_switches.cpp create mode 100644 tests/unit/test_wheelslip.cpp create mode 100644 vehicle/gaugepositions.h create mode 100644 vehicle/horn.cpp create mode 100644 vehicle/horn.h create mode 100644 vehicle/mirrors.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 477f584e9..dfe58b66d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -462,6 +462,7 @@ set(CORE_SOURCES "utilities/utilities.cpp" "scripting/ladderlogic.cpp" "vehicle/handover.cpp" +"vehicle/horn.cpp" ) add_library(eu07_core STATIC ${CORE_SOURCES}) target_link_libraries(eu07_core PUBLIC eu07_settings) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 29b3e75cd..bb36694bb 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -676,6 +676,13 @@ struct TTractionParam }; /*powyzsze parametry zwiazane sa z torem po ktorym aktualnie pojazd jedzie*/ +// what a horn needs to sound: air from the main reservoir, or the low voltage +enum class horn_supply +{ + air, + electric +}; + /// High-level brake-system family. enum class TBrakeSystem { @@ -1710,6 +1717,10 @@ class TMoverParameters float DistanceCounterDoublePressPeriod = {1.f}; // czas w jakim nalezy podwojnie wcisnac przycisk, aby rozpoczac pomiar odleglosci TSecuritySystem SecuritySystem; int EmergencyBrakeWarningSignal{0}; // combined with basic WarningSignal when manual emergency brake is active + horn_supply HornSupply{horn_supply::air}; // of the low and high tone horns (WarningSignal 1 and 2) + horn_supply Horn3Supply{horn_supply::air}; // of the third horn (WarningSignal 4) + // main reservoir pressure [bar, as MinCP and MaxCP] below which a pneumatic horn stays silent + static constexpr double HornMinPressure{2.0}; TUniversalCtrlTable UniCtrlList; /*lista pozycji uniwersalnego nastawnika*/ int UniCtrlListSize = 0; /*wielkosc listy pozycji uniwersalnego nastawnika*/ bool UniCtrlIntegratedBrakePNCtrl = false; /*zintegrowany nastawnik JH obsluguje hamulec PN*/ @@ -2001,6 +2012,8 @@ class TMoverParameters bool CompressorAllow = false; /*! zezwolenie na uruchomienie sprezarki NBMX*/ bool CompressorAllowLocal{true}; // local device state override (most units don't have this fitted so it's set to true not to intefere) bool CompressorGovernorLock{false}; // indicates whether compressor pressure switch was activated due to reaching cut-out pressure + double CompressorStartDelay{0.0}; // time [s] the compressor waits after getting its power before it can start, after the engine starts say + double CompressorPowerTime{0.0}; // time [s] since the compressor got its power bool CompressorTankValve{false}; // indicates excessive pressure is vented from compressor tank directly and instantly start_t CompressorStart{start_t::manual}; // whether the compressor is started manually, or another way start_t PantographCompressorStart{start_t::manual}; @@ -2228,6 +2241,7 @@ class TMoverParameters // TODO: move these switch types where they belong, cabin definition std::string PantSwitchType; std::string ConvSwitchType; + bool HeatingSwitchImpulse{false}; // the train heating switch springs back to its middle position std::string StLinSwitchType; bool Heating = false; // ogrzewanie 'Winger 020304 @@ -2428,6 +2442,42 @@ class TMoverParameters double BrakeForce(const TTrackParam &Track); double CouplerForce(int const End, double dt); void CollisionDetect(int const End, double const dt); + // closing speed of a collision [km/h] above which the vehicles involved may derail, adjusted for their mass ratio + static constexpr double SafeCollisionVelocity{15.0}; + // closing speed [km/h] of the End of this vehicle and the OtherEnd of the other vehicle it touches, along the coupler + // axis: the sum of the speeds in a head-on collision, the difference in a rear-end one, negative when they part + double CollisionVelocity(int const End, TMoverParameters const &Other, int const OtherEnd) const; + // velocity [m/s] of this vehicle relative to the other vehicle it touches with its End and the OtherEnd of the + // other one, along this vehicle's axis + double CouplerVelocityDifference(int const End, TMoverParameters const &Other, int const OtherEnd) const; + // whether the automatic couplers at the End of this vehicle and the OtherEnd of the other one can catch each other on + // contact, rather than the vehicles colliding (with crash damage enabled, only at a closing speed which doesn't derail them) + bool AutomaticCouplingSafe(int const End, TMoverParameters const &Other, int const OtherEnd) const; + // the horns of the Signal (WarningSignal bits) which have the air or the voltage they need to sound + int SoundingHorns(int const Signal) const; + // whether the signal lamps of the main circuit (line contactors, ground relay, motor overload relays) can light: + // the pressure switch, when fitted, cuts the start off and puts them out, otherwise they go out once the brakes are applied + bool MainCircuitLampsEnabled() const + { + return false == ControlPressureSwitch && (HasControlPressureSwitch || BrakePress < 1.0); + } + // whether the lamp of the open line contactors is lit, telling the start can be made + bool LineContactorsLampLit() const + { + return false == StLinFlag && MainCircuitLampsEnabled(); + } + // whether the pumps a joint oil and fuel pump switch works, those not started automatically, are all switched on + bool OilFuelPumpsEnabled() const + { + auto const fuelmanual{FuelPump.start_type != start_t::automatic}; + auto const oilmanual{OilPump.start_type != start_t::automatic}; + return (fuelmanual || oilmanual) && (false == fuelmanual || FuelPump.is_enabled) && (false == oilmanual || OilPump.is_enabled); + } + // whether the radio is switched on and has the low voltage to work + bool RadioPowered() const + { + return Radio && (Power24vIsAvailable || Power110vIsAvailable); + } /*obrot kol uwzgledniajacy poslizg*/ double ComputeRotatingWheel(double WForce, double dt, double n) const; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 3b5b62153..cb17e30ad 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -16,6 +16,8 @@ http://mozilla.org/MPL/2.0/. #include "utilities/Logs.h" #include "utilities/parser.h" #include "simulation/simulation.h" + +#include //--------------------------------------------------------------------------- // Ra: tu należy przenosić funcje z mover.pas, które nie są z niego wywoływane. @@ -1176,6 +1178,56 @@ double TMoverParameters::EngineMaxRPM() const std::numeric_limits::max(); // shouldn't ever get here but, eh } +// ************************************************************************************************* +// prędkość zbliżania się stykających się końców pojazdów przy zderzeniu, w km/h +// ************************************************************************************************* +double TMoverParameters::CollisionVelocity(int const End, TMoverParameters const &Other, int const OtherEnd) const +{ + auto const velocitydifference{CouplerVelocityDifference(End, Other, OtherEnd)}; + // the front end closes in on the other vehicle when this one moves forward faster, the rear end when it's slower + return (End == end::front ? velocitydifference : -velocitydifference) * 3.6; // m/s -> km/h +} + +double TMoverParameters::CouplerVelocityDifference(int const End, TMoverParameters const &Other, int const OtherEnd) const +{ + // V runs along the vehicle's own axis, towards its front; the other vehicle's velocity is turned around when the + // vehicles face each other (touch with the same ends) + return V - Other.V * DirPatch(End, OtherEnd); +} + +bool TMoverParameters::AutomaticCouplingSafe(int const End, TMoverParameters const &Other, int const OtherEnd) const +{ + return false == Global.crash_damage || CollisionVelocity(End, Other, OtherEnd) <= SafeCollisionVelocity; +} + +int TMoverParameters::SoundingHorns(int const Signal) const +{ + auto const supplied{[this](horn_supply const Supply) { + if (Supply == horn_supply::electric) + { + return Power24vIsAvailable || Power110vIsAvailable; + } + if (VeselVolume > 0.0) + { + return Compressor >= HornMinPressure; + } + // a vehicle without a main reservoir of its own takes the air from the main pipe, a vehicle without either + // (a road vehicle, say) has no air to check + auto const mainpipe{((Couplers[end::front].AllowedFlag | Couplers[end::rear].AllowedFlag) & coupling::mainhose) != 0}; + return false == mainpipe || ScndPipePress >= HornMinPressure; + }}; + auto horns{0}; + if (supplied(HornSupply)) + { + horns |= Signal & (1 | 2); + } + if (supplied(Horn3Supply)) + { + horns |= Signal & 4; + } + return horns; +} + // ************************************************************************************************* // Q: 20160716 // Wykrywanie kolizji @@ -1192,8 +1244,11 @@ void TMoverParameters::CollisionDetect(int const End, double const dt) auto const otherend{Neighbours[End].vehicle_end}; auto const &othercoupler{othervehicle->Couplers[otherend]}; + // the velocities along this vehicle's axis: the other vehicle's one is turned around when the vehicles face each + // other (touch with the same ends), as in CouplerForce() + auto const otherdirection{DirPatch(End, otherend)}; auto velocity{V}; - auto othervehiclevelocity{othervehicle->V}; + auto othervehiclevelocity{othervehicle->V * otherdirection}; // calculate collision force and new velocities for involved vehicles auto const VirtualCoupling{(thiscoupler.CouplingFlag == coupling::faux)}; auto CCF{0.0}; @@ -1224,28 +1279,25 @@ void TMoverParameters::CollisionDetect(int const End, double const dt) damage_coupler(End); } - if (thiscoupler.CouplingFlag == coupling::faux || true == TestFlag(othervehicle->DamageFlag, dtrain_out)) - { // HACK: limit excessive speed derailment checks to vehicles which aren't part of the same consist - auto const safevelocitylimit{15.0}; - auto const velocitydifference{glm::length(glm::angleAxis(Rot.Rz, glm::dvec3{0, 1, 0}) * V - glm::angleAxis(othervehicle->Rot.Rz, glm::dvec3{0, 1, 0}) * othervehicle->V) * - 3.6}; // m/s -> km/h + // HACK: limit excessive speed derailment checks to vehicles which aren't part of the same consist + auto const outsideconsist{thiscoupler.CouplingFlag == coupling::faux || true == TestFlag(othervehicle->DamageFlag, dtrain_out)}; + auto const velocitydifference{outsideconsist ? CollisionVelocity(End, *othervehicle, otherend) : 0.0}; - if (velocitydifference > safevelocitylimit) + if (velocitydifference > SafeCollisionVelocity) + { + // HACK: crude estimation for potential derail, will take place with velocity difference > 15 km/h adjusted for vehicle mass ratio + if (false == TestFlag(DamageFlag, dtrain_out) || false == TestFlag(othervehicle->DamageFlag, dtrain_out)) { - // HACK: crude estimation for potential derail, will take place with velocity difference > 15 km/h adjusted for vehicle mass ratio - if (false == TestFlag(DamageFlag, dtrain_out) || false == TestFlag(othervehicle->DamageFlag, dtrain_out)) - { - WriteLog("Bad driving: " + Name + " and " + othervehicle->Name + " collided with velocity " + to_string(velocitydifference, 0) + " km/h"); - } + WriteLog("Bad driving: " + Name + " and " + othervehicle->Name + " collided with velocity " + to_string(velocitydifference, 0) + " km/h"); + } - if (velocitydifference > safevelocitylimit * (TotalMass / othervehicle->TotalMass)) - { - Derail(COLLISION); - } - if (velocitydifference > safevelocitylimit * (othervehicle->TotalMass / TotalMass)) - { - othervehicle->Derail(COLLISION); - } + if (velocitydifference > SafeCollisionVelocity * (TotalMass / othervehicle->TotalMass)) + { + Derail(COLLISION); + } + if (velocitydifference > SafeCollisionVelocity * (othervehicle->TotalMass / TotalMass)) + { + othervehicle->Derail(COLLISION); } } } @@ -1254,21 +1306,15 @@ void TMoverParameters::CollisionDetect(int const End, double const dt) if (false == TestFlag(DamageFlag, dtrain_out)) { auto const accelerationchange{(velocity - V) / dt}; - // if( accelerationchange / AccS < 1.0 ) { - // HACK: prevent excessive vehicle pinball cases AccS += accelerationchange; - // AccS = std::clamp( AccS, -2.0, 2.0 ); V = velocity; - // } } if (false == TestFlag(othervehicle->DamageFlag, dtrain_out)) { - auto const othervehicleaccelerationchange{(othervehiclevelocity - othervehicle->V) / dt}; - // if( othervehicleaccelerationchange / othervehicle->AccS < 1.0 ) { - // HACK: prevent excessive vehicle pinball cases + auto const othervehiclenewvelocity{othervehiclevelocity * otherdirection}; // back along the other vehicle's axis + auto const othervehicleaccelerationchange{(othervehiclenewvelocity - othervehicle->V) / dt}; othervehicle->AccS += othervehicleaccelerationchange; - othervehicle->V = othervehiclevelocity; - // } + othervehicle->V = othervehiclenewvelocity; } } @@ -4332,7 +4378,10 @@ void TMoverParameters::CompressorCheck(double dt) } } - auto const compressorpower{(CompressorPower == 0 ? Mains : CompressorPower == 3 ? Mains : Power110vIsAvailable)}; + // the main circuit, also for a compressor driven by the engine, otherwise the low voltage + auto const compressorpower{CompressorPower == 0 || CompressorPower == 3 ? Mains : Power110vIsAvailable}; + CompressorPowerTime = compressorpower ? CompressorPowerTime + dt : 0.0; + auto const compressorready{compressorpower && CompressorPowerTime >= CompressorStartDelay}; // TBD: split CompressorAllow into separate enable/disable flags, inherit compressor from basic_device auto const compressorenable{CompressorAllowLocal && (CompressorStart == start_t::automatic || CompressorAllow)}; auto const compressordisable{false == compressorenable}; @@ -4354,7 +4403,7 @@ void TMoverParameters::CompressorCheck(double dt) auto const compressorflag{CompressorFlag}; CompressorFlag = - compressorpower && false == compressordisable && (false == governorlock || CompressorPower == 3) && (CompressorFlag || (compressorenable && LastSwitchingTime > CtrlDelay)); + compressorready && false == compressordisable && (false == governorlock || CompressorPower == 3) && (CompressorFlag || (compressorenable && LastSwitchingTime > CtrlDelay)); if (CompressorFlag && CompressorFlag != compressorflag) { @@ -4384,30 +4433,23 @@ void TMoverParameters::CompressorCheck(double dt) { // vent some air out if there's no governor lock to stop the compressor from exceeding acceptable pressure level SetFlag(SoundFlag, sound::relay | sound::loud); - CompressedVolume *= false == governorlockispresent ? 0.80 : // arbitrary amount - CompressorTankValve ? MinCompressorF / MaxCompressorF : // drop to mincompressor level - 0.999; // HACK: drop a tiny bit so the sound doesn't trigger repeatedly + auto ventedfraction{0.999}; // HACK: drop a tiny bit so the sound doesn't trigger repeatedly + if (false == governorlockispresent) + { + ventedfraction = 0.80; // arbitrary amount + } + else if (CompressorTankValve) + { + ventedfraction = MinCompressorF / MaxCompressorF; // drop to mincompressor level + } + CompressedVolume *= ventedfraction; if (false == governorlockispresent || CompressorTankValve) { CompressorGovernorLock = false; } } - // tymczasowo tylko obciążenie sprężarki, tak z 5A na sprężarkę - // TODO: draw power from proper high- or low voltage circuit - if (CompressorPower == 3) - { - // diesel-powered compressor doesn't draw power - } - else - { - // TODO: drain power from 110v circuit - /* - if( compressorowner != nullptr ) { - compressorowner->TotalCurrent += 0.0015 * compressorowner->PantographVoltage; - } - */ - } + // a compressor not driven by the engine doesn't draw power (some 5 A) from the high- or low voltage circuit yet } // ************************************************************************************************* @@ -5008,7 +5050,7 @@ void TMoverParameters::ComputeTotalForce(double dt) } else { - EngineVoltage *= DirAbsolute; // DirActive*CabActive; + EngineVoltage *= DirAbsolute; // the reverser of the active cab, relative to the couplers } } // bo nie dzialalo else @@ -5032,6 +5074,14 @@ void TMoverParameters::ComputeTotalForce(double dt) { SlippingWheels = true; } + if (true == SlippingWheels && Vel < 0.1 // the same crude trap: (nearly) stopped vehicle... + && std::abs(nrot * M_PI * WheelDiameter - V) < 0.1 / 3.6) // ...with wheels turning at its speed, i.e. locked wheels at the end of a skid + { + // locked wheels never pass the rotation speed test below once the vehicle stops, and a skidding vehicle + // keeps its braking force capped by the sliding adhesion, so the rest of the consist could push it around + SlippingWheels = false; + nrot = V / M_PI / WheelDiameter; + } double temp_nrot = nrot; if (true == SlippingWheels) { @@ -5286,7 +5336,7 @@ double TMoverParameters::CouplerForce(int const End, double dt) auto const newdistance{initialdistance + 10.0 * distancedelta}; - auto const dV{V - othervehicle->V * DirPatch(End, otherend)}; + auto const dV{CouplerVelocityDifference(End, *othervehicle, otherend)}; auto const absdV{std::abs(dV)}; // potentially generate sounds on clash or stretch @@ -5399,25 +5449,23 @@ double TMoverParameters::CouplerForce(int const End, double dt) couplingtype &= ~coupling::control; } - if (Attach(End, otherend, othervehicle, couplingtype)) - { - // HACK: we're reusing sound enum to mark whether vehicle was connected to another - SetFlag(AIFlag, sound::attachcoupler); - thiscoupler.AutomaticCouplingAllowed = false; - othercoupler.AutomaticCouplingAllowed = false; - } - /* - coupler.CouplingFlag = ( coupler.AutomaticCouplingFlag & othercoupler.AutomaticCouplingFlag ); - SetFlag( coupler.sounds, sound::attachcoupler ); - */ + // too fast for the couplers to catch, the vehicles collide instead (and may derail, see CollisionDetect()) + auto const safe{AutomaticCouplingSafe(End, *othervehicle, otherend)}; + auto const caught{safe && Attach(End, otherend, othervehicle, couplingtype)}; + // HACK: we're reusing sound enum to mark whether vehicle was connected to another + AIFlag |= (caught ? sound::attachcoupler : 0); + // coupled, or locked until the vehicles part, so they don't couple as soon as the collision slows them down + thiscoupler.AutomaticCouplingAllowed = safe && false == caught; + othercoupler.AutomaticCouplingAllowed = safe && false == caught; } } } if (thiscoupler.CouplingFlag != coupling::faux) { - // uzgadnianie prawa Newtona - othervehicle->Couplers[1 - End].CForce = -CF; + // uzgadnianie prawa Newtona, on the coupler of the other vehicle this one is coupled with, along that vehicle's + // axis: turned around once more when the vehicles face each other + othervehicle->Couplers[otherend].CForce = -CF * DirPatch(End, otherend); } return CF; @@ -10468,6 +10516,7 @@ void TMoverParameters::LoadFIZ_Brake(std::string const &line) auto lookup = compressorpowers.find(extract_value("CompressorPower", line)); CompressorPower = lookup != compressorpowers.end() ? lookup->second : 1; } + extract_value(CompressorStartDelay, "CompressorStartDelay", line, ""); if (true == extract_value(AirLeakRate, "AirLeakRate", line, "")) { @@ -10684,7 +10733,7 @@ void TMoverParameters::LoadFIZ_Cntrl(std::string const &line) for (int idx = 0; idx < 4; ++idx) { - extract_value(BrakeDelay[idx], "BDelay" + std::to_string(idx + 1), line, ""); + extract_value(BrakeDelay[idx], std::format("BDelay{}", idx + 1), line, ""); } // brakedelays, brakedelayflag { @@ -10780,6 +10829,16 @@ void TMoverParameters::LoadFIZ_Cntrl(std::string const &line) // maksymalna predkosc dostepna na tarczce predkosciomierza extract_value(maxTachoSpeed, "MaxTachoSpeed", line, ""); + // horns + { + using enum horn_supply; + std::map> const hornsupplies{{"Pneumatic", air}, {"Electric", electric}}; + auto lookup = hornsupplies.find(extract_value("HornType", line)); + HornSupply = lookup != hornsupplies.end() ? lookup->second : air; + lookup = hornsupplies.find(extract_value("Horn3Type", line)); + Horn3Supply = lookup != hornsupplies.end() ? lookup->second : HornSupply; + } + // dynamicbrake { std::map> dynamicbrakes{{"Passive", dbrake_passive}, {"Switch", dbrake_switch}, {"Reversal", dbrake_reversal}, {"Automatic", dbrake_automatic}}; @@ -10939,14 +10998,15 @@ void TMoverParameters::LoadFIZ_Cntrl(std::string const &line) // ground relay { auto lookup = starts.find(extract_value("GroundRelayStart", line)); - GroundRelayStart = lookup != starts.end() ? lookup->second : TrainType == dt_EZT ? start_t::automatic : start_t::manual; + auto const defaultstart{TrainType == dt_EZT ? start_t::automatic : start_t::manual}; + GroundRelayStart = lookup != starts.end() ? lookup->second : defaultstart; } // converter overload relay { auto lookup = starts.find(extract_value("ConverterOverloadRelayStart", line)); - ConverterOverloadRelayStart = lookup != starts.end() ? lookup->second : - TrainType == dt_EZT ? start_t::converter : // relay activates when converter is switched off - start_t::manual; + // the relay of a multiple unit activates when the converter is switched off + auto const defaultstart{TrainType == dt_EZT ? start_t::converter : start_t::manual}; + ConverterOverloadRelayStart = lookup != starts.end() ? lookup->second : defaultstart; } } @@ -11339,6 +11399,7 @@ void TMoverParameters::LoadFIZ_Switches(std::string const &Input) extract_value(PantSwitchType, "Pantograph", Input, ""); extract_value(ConvSwitchType, "Converter", Input, ""); extract_value(StLinSwitchType, "MotorConnectors", Input, ""); + HeatingSwitchImpulse = ToLower(extract_value("TrainHeating", Input)) == "impulse"; // because people can't make up their minds whether it's "impulse" or "Impulse"... PantSwitchType = ToLower(PantSwitchType); ConvSwitchType = ToLower(ConvSwitchType); diff --git a/application/editormoderoad.cpp b/application/editormoderoad.cpp index a07da795f..9b5dc64ac 100644 --- a/application/editormoderoad.cpp +++ b/application/editormoderoad.cpp @@ -120,8 +120,8 @@ bool is_curved(segment_data const &Path) void copy_text(char *Buffer, std::size_t const Size, std::string const &Text) { - std::strncpy(Buffer, Text.c_str(), Size - 1); - Buffer[Size - 1] = 0; + // as much of the text as fits, always terminated + Buffer[Text.copy(Buffer, Size - 1)] = 0; } std::string lower_case(std::string Text) diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 0b264b784..8dfd831f9 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -1188,8 +1188,8 @@ void editor_mode::render_path_parameters(TTrack &Track) if (m_track_material_edited[i] != nullptr) continue; auto const name = materials[i] ? editor_track::material_name(*materials[i]) : std::string{}; - std::strncpy(m_track_materials[i].data(), name.c_str(), m_track_materials[i].size() - 1); - m_track_materials[i].back() = '\0'; + auto &buffer{m_track_materials[i]}; + buffer[name.copy(buffer.data(), buffer.size() - 1)] = '\0'; } } for (int i = 0; i < 3; ++i) @@ -1238,8 +1238,7 @@ void editor_mode::render_path_circuits(TTrack &Track) { auto *track{&Track}; auto const copy = [](std::array &Buffer, std::string const &Text) { - std::strncpy(Buffer.data(), Text.c_str(), Buffer.size() - 1); - Buffer.back() = '\0'; + Buffer[Text.copy(Buffer.data(), Buffer.size() - 1)] = '\0'; }; auto const isolated_text = [&]() { std::string text; diff --git a/input/command.cpp b/input/command.cpp index d7966f37d..0ae67cfa5 100644 --- a/input/command.cpp +++ b/input/command.cpp @@ -405,6 +405,7 @@ commanddescription_sequence Commands_descriptions = { {"wiperswitchincrease", command_target::vehicle, command_mode::oneoff}, {"wiperswitchdecrease", command_target::vehicle, command_mode::oneoff}, {"lightsset", command_target::vehicle, command_mode::oneoff}, + {"oilfuelpumptoggle", command_target::vehicle, command_mode::oneoff}, }; // Maps of command and coresponding strings @@ -789,6 +790,7 @@ std::unordered_map const commandMap = { {"wiperswitchincrease", user_command::wiperswitchincrease}, {"wiperswitchdecrease", user_command::wiperswitchdecrease}, {"lightsset", user_command::lightsset}, + {"oilfuelpumptoggle", user_command::oilfuelpumptoggle}, {"none", user_command::none}}; } // namespace simulation diff --git a/input/command.h b/input/command.h index e03622a9f..ddacef4a0 100644 --- a/input/command.h +++ b/input/command.h @@ -403,6 +403,7 @@ enum class user_command wiperswitchincrease, wiperswitchdecrease, lightsset, + oilfuelpumptoggle, none = -1 }; diff --git a/input/drivermouseinput.cpp b/input/drivermouseinput.cpp index ab3d0aaf8..22562b856 100644 --- a/input/drivermouseinput.cpp +++ b/input/drivermouseinput.cpp @@ -576,6 +576,9 @@ drivermouse_input::default_bindings() { { "oilpump_sw:", { oilpumptoggle, none } }, + { "oilfuelpump_sw:", { + oilfuelpumptoggle, + none } }, { "motorblowersfront_sw:", { motorblowerstogglefront, none } }, diff --git a/tests/unit/README.md b/tests/unit/README.md index bca46e83b..97cc94910 100644 --- a/tests/unit/README.md +++ b/tests/unit/README.md @@ -56,8 +56,10 @@ TEST_CASE("brakes: service braking stops a heavier wagon too") { functions on the vehicle state the class calls, and the test calls them the same way: see `vehicle/handover.h`, which `TController::TakeControl()` uses, and `test_handover.cpp`. - `vehicle` creates the vehicle the way `TDynamicObject::Init()` does and steps it the way the - simulation loop does, on a straight track of the given friction and gradient. Coupled vehicles - aren't supported yet. + simulation loop does, on a straight track of the given friction and gradient. `pair` puts two of + them on that track facing each other with the given ends and runs them together, as the + simulation runs the vehicles of a scene: the coupler and buffer forces, collisions and automatic + coupling come from the physics (`test_couplers.cpp`). Longer consists aren't supported yet. - Check behaviour (speeds, pressures, states the player sees) rather than internal flags, and make the test check its own preconditions (`REQUIRE` that the braking skidded, before checking what a skid leads to). diff --git a/tests/unit/test_cntrl.cpp b/tests/unit/test_cntrl.cpp new file mode 100644 index 000000000..0dd3ddc20 --- /dev/null +++ b/tests/unit/test_cntrl.cpp @@ -0,0 +1,39 @@ +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" + +using test::definition; +using test::vehicle; + +// the Cntrl. section of the vehicle definition, as read by TMoverParameters::LoadFIZ_Cntrl() + +TEST_CASE("cntrl: the brake delays of the settings come from BDelay1 to BDelay4") { + vehicle wagon{definition::load("wagon").set("Cntrl", "BDelay1", 10.0).set("Cntrl", "BDelay2", 20.0).set("Cntrl", "BDelay3", 30.0).set("Cntrl", "BDelay4", 40.0)}; + CHECK(wagon->BrakeDelay[0] == doctest::Approx(10.0)); + // the vehicle varies the others a little, by 0.83 to 0.9 (CheckLocomotiveParameters()) + for (auto setting{1}; setting < 4; ++setting) { + CAPTURE(setting); + auto const given{10.0 * (setting + 1)}; + CHECK(wagon->BrakeDelay[setting] >= 0.83 * given); + CHECK(wagon->BrakeDelay[setting] <= 0.9 * given); + } +} + +TEST_CASE("cntrl: the relays of a multiple unit start on their own, of other vehicles by hand") { + SUBCASE("multiple unit") { + vehicle unit{definition::load("wagon").set("Param", "Type", "ezt")}; + REQUIRE(unit->TrainType == dt_EZT); + CHECK(unit->GroundRelayStart == start_t::automatic); + CHECK(unit->ConverterOverloadRelayStart == start_t::converter); // activates when the converter is switched off + } + SUBCASE("other vehicle") { + vehicle wagon{definition::load("wagon")}; + CHECK(wagon->GroundRelayStart == start_t::manual); + CHECK(wagon->ConverterOverloadRelayStart == start_t::manual); + } + SUBCASE("given in the definition") { + vehicle unit{definition::load("wagon").set("Param", "Type", "ezt").set("Cntrl", "GroundRelayStart", "Manual").set("Cntrl", "ConverterOverloadRelayStart", "Automatic")}; + CHECK(unit->GroundRelayStart == start_t::manual); + CHECK(unit->ConverterOverloadRelayStart == start_t::automatic); + } +} diff --git a/tests/unit/test_compressor.cpp b/tests/unit/test_compressor.cpp new file mode 100644 index 000000000..c5aa2fff7 --- /dev/null +++ b/tests/unit/test_compressor.cpp @@ -0,0 +1,115 @@ +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" + +using test::definition; +using test::vehicle; + +// the compressor waiting a while after getting its power before it starts (CompressorStartDelay, +// MaSzyna-EU07/maszyna#67): in a diesel it starts some time after the engine, rather than with it + +namespace { + +double const step{0.01}; + +// a compressor which starts on its own, fed from the main circuit unless given another Power, its pressure +// switch between MinCP and MaxCP, and an empty main reservoir for it to fill +vehicle compressor_vehicle(double const Delay, std::string const &Power = "Main", double const MinCP = 6.5) { + auto definition{definition::load("wagon")}; + definition.set("Brake", "Vv", 1.0).set("Brake", "MinCP", MinCP).set("Brake", "MaxCP", 8.0); + definition.set("Brake", "CompressorSpeed", 0.01); + if (false == Power.empty()) { + definition.set("Brake", "CompressorPower", Power); + } + definition.set("Cntrl", "CompressorStart", "Automatic"); + if (Delay > 0.0) { + definition.set("Brake", "CompressorStartDelay", Delay); + } + vehicle vehicle{definition}; + vehicle->CompressedVolume = 0.0; + vehicle->LastSwitchingTime = 10.0; // nothing was switched lately + return vehicle; +} + +// runs the compressor for Seconds, the main circuit as it is, the time since the last switching going on as in +// ComputeTotalForce() +void run_compressor(vehicle &Vehicle, double const Seconds) { + for (auto i{std::lround(Seconds / step)}; i > 0; --i) { + Vehicle->LastSwitchingTime += step; + Vehicle->CompressorCheck(step); + } +} + +} // namespace + +TEST_CASE("compressor: without a start delay the compressor starts with its power") { + auto vehicle{compressor_vehicle(0.0)}; + run_compressor(vehicle, 1.0); + REQUIRE_FALSE(vehicle->CompressorFlag); // no power, no compressor + + vehicle->Mains = true; + run_compressor(vehicle, step); + CHECK(vehicle->CompressorFlag); +} + +TEST_CASE("compressor: the compressor starts the delay after getting its power") { + auto vehicle{compressor_vehicle(5.0)}; + vehicle->Mains = true; + + run_compressor(vehicle, 4.9); + CHECK_FALSE(vehicle->CompressorFlag); + CHECK(vehicle->Compressor == doctest::Approx(0.0)); + + run_compressor(vehicle, 0.2); + CHECK(vehicle->CompressorFlag); + run_compressor(vehicle, 10.0); + CHECK(vehicle->Compressor > 0.0); // and fills the reservoir +} + +TEST_CASE("compressor: the delay starts over once the power is gone") { + auto vehicle{compressor_vehicle(5.0)}; + vehicle->Mains = true; + run_compressor(vehicle, 10.0); + REQUIRE(vehicle->CompressorFlag); + + vehicle->Mains = false; // the engine stopped + run_compressor(vehicle, 1.0); + CHECK_FALSE(vehicle->CompressorFlag); + + vehicle->Mains = true; // and started again + run_compressor(vehicle, 4.9); + CHECK_FALSE(vehicle->CompressorFlag); + run_compressor(vehicle, 0.2); + CHECK(vehicle->CompressorFlag); +} + +TEST_CASE("compressor: a compressor fed from the low voltage waits from the low voltage coming on") { + auto vehicle{compressor_vehicle(5.0, "")}; // the default supply: the converter, the 110 V + vehicle->Mains = true; // which alone doesn't feed it + run_compressor(vehicle, 10.0); + REQUIRE_FALSE(vehicle->CompressorFlag); + + vehicle->Power110vIsAvailable = true; + run_compressor(vehicle, 4.9); + CHECK_FALSE(vehicle->CompressorFlag); + run_compressor(vehicle, 0.2); + CHECK(vehicle->CompressorFlag); +} + +TEST_CASE("compressor: the pressure switch stops the compressor above the cut-out pressure") { + auto vehicle{compressor_vehicle(0.0)}; + vehicle->Mains = true; + vehicle->CompressedVolume = 8.5; // over MaxCP, in the reservoir of 1 m3 + run_compressor(vehicle, step); + CHECK(vehicle->CompressorGovernorLock); + CHECK_FALSE(vehicle->CompressorFlag); +} + +TEST_CASE("compressor: without a pressure switch the air over the cut-out pressure is vented") { + auto vehicle{compressor_vehicle(0.0, "Main", 8.0)}; // MinCP the same as MaxCP: no pressure switch + vehicle->Mains = true; + vehicle->CompressedVolume = 8.5; + run_compressor(vehicle, step); + REQUIRE(vehicle->CompressorFlag); // nothing stops it + CHECK(vehicle->CompressedVolume < 8.5 * 0.81); // a fifth of the air let out +} diff --git a/tests/unit/test_couplers.cpp b/tests/unit/test_couplers.cpp new file mode 100644 index 000000000..8787a419b --- /dev/null +++ b/tests/unit/test_couplers.cpp @@ -0,0 +1,458 @@ +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" +#include "utilities/Globals.h" + +using test::definition; +using test::vehicle; + +namespace { + +// the wagon from data/wagon.json with automatic couplers at both ends, which couple the given connections +definition automatic_definition(int Flag = coupling::coupler | coupling::brakehose) { + return definition::load("wagon").set("BuffCoupl", "CType", "Automatic").set("BuffCoupl", "AutomaticFlag", Flag); +} + +// the wagon from data/wagon.json with automatic couplers at both ends, running at the given speed [km/h] +vehicle automatic_wagon(double Velocity, std::string const &Name) { + return vehicle{automatic_definition(), Velocity, Name}; +} + +// the same wagon, twice as heavy +vehicle heavy_automatic_wagon(double Velocity, std::string const &Name) { + return vehicle{automatic_definition().set("Param", "M", 2 * 42200), Velocity, Name}; +} + +bool derailed(vehicle &Vehicle) { + return TestFlag(Vehicle->DamageFlag, dtrain_out); +} + +// runs the pair for Seconds, returns whether the vehicles were coupled at any point +bool couple_during(test::pair &Pair, double Seconds) { + auto coupled{false}; + for (auto i{std::lround(Seconds / 0.01)}; i > 0; --i) { + Pair.step(); + coupled = coupled || Pair.coupled(); + } + return coupled; +} + +// sets the crash damage setting for the test, restores it after +class crash_damage_setting { +public: + explicit crash_damage_setting(bool Enabled) { Global.crash_damage = Enabled; } + ~crash_damage_setting() { Global.crash_damage = m_previous; } + crash_damage_setting(crash_damage_setting const &) = delete; + crash_damage_setting &operator=(crash_damage_setting const &) = delete; + +private: + bool m_previous{Global.crash_damage}; +}; + +} // namespace + +// issue #86: automatic couplers used to catch at any closing speed, so the vehicles never collided nor derailed + +TEST_CASE("couplers: automatic couplers catch a standing wagon hit at a walking pace") { + crash_damage_setting const crashdamage{true}; + auto moving{automatic_wagon(10.0, "moving")}; + auto standing{automatic_wagon(0.0, "standing")}; + REQUIRE(moving->Couplers[end::front].type() == TCouplerType::Automatic); + REQUIRE(moving.speed() == doctest::Approx(10.0)); + + // the front of the moving wagon runs into the rear of the standing one + CHECK(moving->CollisionVelocity(end::front, standing.mover(), end::rear) == doctest::Approx(10.0)); + CHECK(moving->AutomaticCouplingSafe(end::front, standing.mover(), end::rear)); + CHECK(standing->AutomaticCouplingSafe(end::rear, moving.mover(), end::front)); +} + +TEST_CASE("couplers: automatic couplers don't catch a wagon hit too fast, the wagons collide instead") { + crash_damage_setting const crashdamage{true}; + auto moving{automatic_wagon(30.0, "moving")}; + auto standing{automatic_wagon(0.0, "standing")}; + REQUIRE(moving.speed() == doctest::Approx(30.0)); + + CHECK(moving->CollisionVelocity(end::front, standing.mover(), end::rear) > TMoverParameters::SafeCollisionVelocity); + CHECK_FALSE(moving->AutomaticCouplingSafe(end::front, standing.mover(), end::rear)); + CHECK_FALSE(standing->AutomaticCouplingSafe(end::rear, moving.mover(), end::front)); +} + +TEST_CASE("couplers: automatic couplers catch a wagon running ahead only a little slower") { + crash_damage_setting const crashdamage{true}; + auto faster{automatic_wagon(60.0, "faster")}; + auto slower{automatic_wagon(50.0, "slower")}; + + CHECK(faster->CollisionVelocity(end::front, slower.mover(), end::rear) == doctest::Approx(10.0)); + CHECK(slower->CollisionVelocity(end::rear, faster.mover(), end::front) == doctest::Approx(10.0)); + CHECK(faster->AutomaticCouplingSafe(end::front, slower.mover(), end::rear)); +} + +TEST_CASE("couplers: without crash damage automatic couplers catch at any speed") { + crash_damage_setting const crashdamage{false}; + auto moving{automatic_wagon(30.0, "moving")}; + auto standing{automatic_wagon(0.0, "standing")}; + + CHECK(moving->AutomaticCouplingSafe(end::front, standing.mover(), end::rear)); +} + +// the closing speed used to treat the speed of each vehicle as a vector turned by half its heading, so for vehicles +// facing each other it came out as the root of the sum of the squares of their speeds, rather than the sum + +TEST_CASE("couplers: the closing speed of a rear-end collision is the difference of the speeds") { + auto faster{automatic_wagon(40.0, "faster")}; + auto slower{automatic_wagon(25.0, "slower")}; + + // running forwards, the front of the faster wagon hits the rear of the slower one + CHECK(faster->CollisionVelocity(end::front, slower.mover(), end::rear) == doctest::Approx(15.0)); + CHECK(slower->CollisionVelocity(end::rear, faster.mover(), end::front) == doctest::Approx(15.0)); + // the wagons running ahead of each other are parting + CHECK(slower->CollisionVelocity(end::front, faster.mover(), end::rear) == doctest::Approx(-15.0)); + + // backing up, the rear of the faster wagon hits the front of the slower one + auto backingfaster{automatic_wagon(-40.0, "backing faster")}; + auto backingslower{automatic_wagon(-25.0, "backing slower")}; + CHECK(backingfaster->CollisionVelocity(end::rear, backingslower.mover(), end::front) == doctest::Approx(15.0)); + CHECK(backingslower->CollisionVelocity(end::front, backingfaster.mover(), end::rear) == doctest::Approx(15.0)); +} + +TEST_CASE("couplers: the closing speed of a head-on collision is the sum of the speeds") { + crash_damage_setting const crashdamage{true}; + auto first{automatic_wagon(10.0, "first")}; + auto second{automatic_wagon(10.0, "second")}; + + // both wagons run forwards, their fronts meet + CHECK(first->CollisionVelocity(end::front, second.mover(), end::front) == doctest::Approx(20.0)); + CHECK(second->CollisionVelocity(end::front, first.mover(), end::front) == doctest::Approx(20.0)); + // 20 km/h is above the limit, the couplers don't catch (the old formula gave 14.1 km/h and coupled them) + CHECK(first->CollisionVelocity(end::front, second.mover(), end::front) > TMoverParameters::SafeCollisionVelocity); + CHECK_FALSE(first->AutomaticCouplingSafe(end::front, second.mover(), end::front)); + CHECK_FALSE(second->AutomaticCouplingSafe(end::front, first.mover(), end::front)); + + // both wagons back up, their rears meet + auto firstbacking{automatic_wagon(-10.0, "first backing")}; + auto secondbacking{automatic_wagon(-10.0, "second backing")}; + CHECK(firstbacking->CollisionVelocity(end::rear, secondbacking.mover(), end::rear) == doctest::Approx(20.0)); + + // running back to back, the wagons part + CHECK(first->CollisionVelocity(end::rear, second.mover(), end::rear) == doctest::Approx(-20.0)); + CHECK(first->AutomaticCouplingSafe(end::rear, second.mover(), end::rear)); + + // slow enough, the couplers catch + auto slowfirst{automatic_wagon(5.0, "slow first")}; + auto slowsecond{automatic_wagon(5.0, "slow second")}; + CHECK(slowfirst->CollisionVelocity(end::front, slowsecond.mover(), end::front) == doctest::Approx(10.0)); + CHECK(slowfirst->AutomaticCouplingSafe(end::front, slowsecond.mover(), end::front)); +} + +TEST_CASE("couplers: the closing speed of a hit on a standing vehicle is the speed of the moving one, whichever way it faces") { + auto moving{automatic_wagon(20.0, "moving")}; + auto standing{automatic_wagon(0.0, "standing")}; + + // the standing wagon faces away from the moving one + CHECK(moving->CollisionVelocity(end::front, standing.mover(), end::rear) == doctest::Approx(20.0)); + CHECK(standing->CollisionVelocity(end::rear, moving.mover(), end::front) == doctest::Approx(20.0)); + // the standing wagon faces the moving one + CHECK(moving->CollisionVelocity(end::front, standing.mover(), end::front) == doctest::Approx(20.0)); + CHECK(standing->CollisionVelocity(end::front, moving.mover(), end::front) == doctest::Approx(20.0)); + // the moving wagon backs up into the standing one + auto backing{automatic_wagon(-20.0, "backing")}; + CHECK(backing->CollisionVelocity(end::rear, standing.mover(), end::front) == doctest::Approx(20.0)); + CHECK(backing->CollisionVelocity(end::rear, standing.mover(), end::rear) == doctest::Approx(20.0)); + // the moving wagon runs away from the standing one + CHECK(moving->CollisionVelocity(end::rear, standing.mover(), end::front) == doctest::Approx(-20.0)); +} + +// the coupling as the simulation runs it: two vehicles on a track, closing in on each other until the couplers (or +// buffers) meet, the coupler forces and the collision computed by the physics, step by step + +TEST_CASE("couplers: automatic couplers catch right up to the safe closing speed") { + crash_damage_setting const crashdamage{true}; + auto standing{automatic_wagon(0.0, "standing")}; + + auto below{automatic_wagon(14.9, "below")}; + CHECK(below->CollisionVelocity(end::front, standing.mover(), end::rear) == doctest::Approx(14.9)); + CHECK(below->AutomaticCouplingSafe(end::front, standing.mover(), end::rear)); + + auto above{automatic_wagon(15.1, "above")}; + CHECK(above->CollisionVelocity(end::front, standing.mover(), end::rear) == doctest::Approx(15.1)); + CHECK_FALSE(above->AutomaticCouplingSafe(end::front, standing.mover(), end::rear)); + auto faster{automatic_wagon(15.5, "faster")}; + CHECK_FALSE(faster->AutomaticCouplingSafe(end::front, standing.mover(), end::rear)); +} + +TEST_CASE("couplers: a wagon rolling slowly into a standing one couples with it") { + crash_damage_setting const crashdamage{true}; + auto moving{automatic_wagon(5.0, "moving")}; + auto standing{automatic_wagon(0.0, "standing")}; + test::pair pair{moving, end::front, standing, end::rear, 1.0}; + + pair.run(3.0); + + REQUIRE(pair.coupled()); + CHECK(moving->Couplers[end::front].CouplingFlag == (coupling::coupler | coupling::brakehose)); + CHECK(standing->Couplers[end::rear].CouplingFlag == (coupling::coupler | coupling::brakehose)); + CHECK(moving->Couplers[end::front].Connected == &standing.mover()); + CHECK_FALSE(derailed(moving)); + CHECK_FALSE(derailed(standing)); + // coupled, they run on together + pair.run(2.0); + CHECK(moving.speed() == doctest::Approx(standing.speed()).epsilon(0.05)); + CHECK(pair.gap() < 0.2); +} + +TEST_CASE("couplers: a wagon hitting a standing one too fast doesn't couple, nor once the hit has slowed it down") { + crash_damage_setting const crashdamage{true}; + auto moving{automatic_wagon(30.0, "moving")}; + auto standing{automatic_wagon(0.0, "standing")}; + test::pair pair{moving, end::front, standing, end::rear, 1.0}; + + auto touched{false}; + auto parted{false}; + auto coupled{false}; + auto locked{true}; + for (int i = 0; i < 1000; ++i) { + pair.step(); + // as far as the couplers know: the distance between them at the start of the step + auto const distance{moving->Neighbours[end::front].distance}; + touched = touched || distance < 0.0; + parted = parted || (touched && distance > 0.05); + coupled = coupled || pair.coupled(); + if (touched && false == parted) { + locked = locked && false == moving->Couplers[end::front].AutomaticCouplingAllowed && false == standing->Couplers[end::rear].AutomaticCouplingAllowed; + } + } + + REQUIRE(touched); + CHECK_FALSE(coupled); + // the hit derailed and stopped them, the couplers next to each other, the automatic coupling locked all along + CHECK_FALSE(parted); + CHECK(locked); + CHECK(derailed(moving)); + CHECK(derailed(standing)); + CHECK(std::abs(moving.speed()) < 3.0); + CHECK(std::abs(standing.speed()) < 3.0); + CHECK_FALSE(couple_during(pair, 5.0)); +} + +TEST_CASE("couplers: the automatic coupling locked by a hit is unlocked once the vehicles part") { + crash_damage_setting const crashdamage{true}; + auto moving{automatic_wagon(3.0, "moving")}; + auto standing{automatic_wagon(0.0, "standing")}; + // as a hit too fast or manual uncoupling leaves them + moving->Couplers[end::front].AutomaticCouplingAllowed = false; + standing->Couplers[end::rear].AutomaticCouplingAllowed = false; + + SUBCASE("parted by more than 5 cm, they couple on the next approach") { + test::pair pair{moving, end::front, standing, end::rear, 0.5}; + pair.step(); + CHECK(moving->Couplers[end::front].AutomaticCouplingAllowed); + CHECK(couple_during(pair, 3.0)); + } + SUBCASE("kept together, they don't") { + test::pair pair{moving, end::front, standing, end::rear, 0.0}; + auto coupled{false}; + for (int i = 0; i < 300; ++i) { + pair.step(); + if (pair.gap() > 0.05) { + break; // parted + } + coupled = coupled || pair.coupled(); + } + CHECK_FALSE(coupled); + } +} + +// the couplers refuse a hit by the closing speed when they meet, the derail check (CollisionDetect()) takes the one +// left when the buffers are pressed in all the way, after their springs have slowed the hit down: for the wagons here +// by about 7 km/h. so a hit a little over the safe closing speed only bounces the vehicles apart + +TEST_CASE("couplers: a hit a little too fast for the couplers bounces the vehicles apart, uncoupled and on the rails") { + crash_damage_setting const crashdamage{true}; + auto moving{automatic_wagon(20.0, "moving")}; + auto standing{automatic_wagon(0.0, "standing")}; + test::pair pair{moving, end::front, standing, end::rear, 1.0}; + + CHECK_FALSE(couple_during(pair, 3.0)); + CHECK_FALSE(derailed(moving)); + CHECK_FALSE(derailed(standing)); + CHECK(pair.gap() > 0.5); + CHECK(standing.speed() > moving.speed()); +} + +TEST_CASE("couplers: a hit too fast for the couplers derails the vehicles over the limit adjusted for their mass ratio") { + crash_damage_setting const crashdamage{true}; + + SUBCASE("equal masses: both derail") { + auto moving{automatic_wagon(30.0, "moving")}; + auto standing{automatic_wagon(0.0, "standing")}; + test::pair pair{moving, end::front, standing, end::rear, 1.0}; + CHECK_FALSE(couple_during(pair, 5.0)); + CHECK(derailed(moving)); + CHECK(derailed(standing)); + } + SUBCASE("half the mass: between the safe closing speed and twice that, only the lighter one derails") { + auto light{automatic_wagon(27.0, "light")}; + auto heavy{heavy_automatic_wagon(0.0, "heavy")}; + test::pair pair{light, end::front, heavy, end::rear, 1.0}; + CHECK_FALSE(couple_during(pair, 5.0)); + CHECK(derailed(light)); + CHECK_FALSE(derailed(heavy)); + } + SUBCASE("half the mass: above twice the safe closing speed both derail") { + auto light{automatic_wagon(45.0, "light")}; + auto heavy{heavy_automatic_wagon(0.0, "heavy")}; + test::pair pair{light, end::front, heavy, end::rear, 1.0}; + CHECK_FALSE(couple_during(pair, 5.0)); + CHECK(derailed(light)); + CHECK(derailed(heavy)); + } + SUBCASE("half the mass: below the safe closing speed the couplers catch, nothing derails") { + auto light{automatic_wagon(12.0, "light")}; + auto heavy{heavy_automatic_wagon(0.0, "heavy")}; + test::pair pair{light, end::front, heavy, end::rear, 1.0}; + CHECK(couple_during(pair, 5.0)); + CHECK_FALSE(derailed(light)); + CHECK_FALSE(derailed(heavy)); + } +} + +TEST_CASE("couplers: wagons running head-on into each other couple only up to the safe closing speed") { + crash_damage_setting const crashdamage{true}; + + SUBCASE("7 + 7 km/h, the couplers catch") { + auto first{automatic_wagon(7.0, "first")}; + auto second{automatic_wagon(7.0, "second")}; + test::pair pair{first, end::front, second, end::front, 1.0}; + CHECK(couple_during(pair, 3.0)); + CHECK_FALSE(derailed(first)); + CHECK_FALSE(derailed(second)); + } + SUBCASE("8 + 8 km/h, the wagons bounce apart") { + auto first{automatic_wagon(8.0, "first")}; + auto second{automatic_wagon(8.0, "second")}; + test::pair pair{first, end::front, second, end::front, 1.0}; + CHECK_FALSE(couple_during(pair, 3.0)); + CHECK_FALSE(derailed(first)); + CHECK_FALSE(derailed(second)); + // both backwards, away from each other + CHECK(first.speed() < 0.0); + CHECK(second.speed() < 0.0); + } + SUBCASE("backing up, 8 + 8 km/h, the wagons bounce apart") { + auto first{automatic_wagon(-8.0, "first")}; + auto second{automatic_wagon(-8.0, "second")}; + test::pair pair{first, end::rear, second, end::rear, 1.0}; + CHECK_FALSE(couple_during(pair, 3.0)); + CHECK(first.speed() > 0.0); + CHECK(second.speed() > 0.0); + } + SUBCASE("15 + 15 km/h, both derail") { + auto first{automatic_wagon(15.0, "first")}; + auto second{automatic_wagon(15.0, "second")}; + test::pair pair{first, end::front, second, end::front, 1.0}; + CHECK_FALSE(couple_during(pair, 5.0)); + CHECK(derailed(first)); + CHECK(derailed(second)); + } +} + +// the collision used to take the speed of a vehicle facing the other way as if it faced the same way, so a wagon +// pushed away by the buffers of the vehicle hitting it head-on counted as running into it: the hit slowed it down, +// and the hitter bounced back as from a wall + +TEST_CASE("couplers: a wagon hit head-on runs off the same as one hit from behind") { + // without automatic couplers or crash damage, the collision alone + crash_damage_setting const crashdamage{false}; + auto speeds_after_hit = [](int StruckEnd) { + auto moving{vehicle{definition::load("wagon"), 20.0, "moving"}}; + auto struck{vehicle{definition::load("wagon"), 0.0, "struck"}}; + test::pair pair{moving, end::front, struck, StruckEnd, 0.5}; + auto touched{false}; + for (int i = 0; i < 300; ++i) { + pair.step(); + touched = touched || pair.gap() < 0.0; + if (touched && pair.gap() > 0.3) { + break; // bounced off + } + } + REQUIRE(touched); + REQUIRE(pair.gap() > 0.3); + REQUIRE_FALSE(pair.coupled()); + return std::make_pair(moving.speed(), struck.speed()); + }; + + auto const [hitterfrombehind, struckfrombehind]{speeds_after_hit(end::rear)}; + auto const [hitterheadon, struckheadon]{speeds_after_hit(end::front)}; + + // hit from behind, the struck wagon runs off forwards, faster than the hitter + CHECK(struckfrombehind > 10.0); + CHECK(hitterfrombehind < struckfrombehind); + // hit head-on, it runs off backwards, as fast + CHECK(struckheadon == doctest::Approx(-struckfrombehind).epsilon(0.02)); + CHECK(hitterheadon == doctest::Approx(hitterfrombehind).epsilon(0.05)); +} + +// the other conditions of automatic coupling + +TEST_CASE("couplers: an automatic coupler doesn't catch a coupler of another type") { + crash_damage_setting const crashdamage{true}; + auto moving{automatic_wagon(5.0, "moving")}; + auto standing{vehicle{definition::load("wagon"), 0.0, "standing"}}; + REQUIRE(standing->Couplers[end::rear].type() == TCouplerType::Screw); + test::pair pair{moving, end::front, standing, end::rear, 1.0}; + + CHECK_FALSE(couple_during(pair, 3.0)); +} + +TEST_CASE("couplers: automatic couplers of different control systems couple without the control connection") { + crash_damage_setting const crashdamage{true}; + auto const flag{coupling::coupler | coupling::brakehose | coupling::control}; + auto moving{vehicle{automatic_definition(flag).set("BuffCoupl", "ControlType", "first"), 5.0, "moving"}}; + + SUBCASE("the same control system") { + auto standing{vehicle{automatic_definition(flag).set("BuffCoupl", "ControlType", "first"), 0.0, "standing"}}; + REQUIRE(standing->Couplers[end::rear].control_type == "first"); + test::pair pair{moving, end::front, standing, end::rear, 1.0}; + REQUIRE(couple_during(pair, 3.0)); + CHECK(pair.coupling() == flag); + } + SUBCASE("a different one") { + auto standing{vehicle{automatic_definition(flag).set("BuffCoupl", "ControlType", "second"), 0.0, "standing"}}; + REQUIRE(standing->Couplers[end::rear].control_type == "second"); + test::pair pair{moving, end::front, standing, end::rear, 1.0}; + REQUIRE(couple_during(pair, 3.0)); + CHECK(pair.coupling() == (coupling::coupler | coupling::brakehose)); + } +} + +TEST_CASE("couplers: the coupler force of vehicles facing each other lands on the couplers holding them") { + // the force a vehicle takes from its coupler, the other one takes back on its own coupler of the pair, whichever + // way the vehicles face; it used to land on the far end of the other vehicle when they faced each other. + // CForce runs along the axis of its own vehicle, so the two forces of the pair are opposite along the track: of + // opposite signs for vehicles facing the same way, of the same sign for vehicles facing each other + auto first{automatic_wagon(5.0, "first")}; + auto second{automatic_wagon(0.0, "second")}; + + SUBCASE("facing each other") { + test::pair pair{first, end::front, second, end::front, 1.0}; + pair.run(5.0); + REQUIRE(pair.coupled()); + + pair.step(); + REQUIRE(second->Couplers[end::front].CForce != 0.0); + CHECK(first->Couplers[end::front].CForce == doctest::Approx(second->Couplers[end::front].CForce)); + CHECK(first->Couplers[end::rear].CForce == 0.0); // nothing there + CHECK(second->Couplers[end::rear].CForce == 0.0); + } + SUBCASE("facing the same way") { + test::pair pair{first, end::front, second, end::rear, 1.0}; + pair.run(5.0); + REQUIRE(pair.coupled()); + + pair.step(); + REQUIRE(second->Couplers[end::rear].CForce != 0.0); + CHECK(first->Couplers[end::front].CForce == doctest::Approx(-second->Couplers[end::rear].CForce)); + CHECK(first->Couplers[end::rear].CForce == 0.0); + CHECK(second->Couplers[end::front].CForce == 0.0); + } +} diff --git a/tests/unit/test_gauge_positions.cpp b/tests/unit/test_gauge_positions.cpp new file mode 100644 index 000000000..791234e9d --- /dev/null +++ b/tests/unit/test_gauge_positions.cpp @@ -0,0 +1,58 @@ +#include "stdafx.h" +#include "doctest.h" + +#include "vehicle/gaugepositions.h" + +#include + +// the sounds of the positions of a cab control (MaSzyna-EU07/maszyna#83): a brake lever moved smoothly (Num3/Num9) +// passes its positions instead of stopping at them, and sounds each one it reaches, as it does when put there + +namespace { + +// a brake lever with sounds at positions 0, 2 and 5; values in hundredths of a position +std::map lever_sounds() { + return {{0, "release"}, {2, "running"}, {5, "service"}}; +} + +std::string reached(int const Previous, int const Desired) { + auto positions{lever_sounds()}; + auto const position{gauge_positions::last_reached(positions, Previous, Desired)}; + return position != positions.end() ? position->second : ""; +} + +} // namespace + +TEST_CASE("gauge positions: a lever put at a position sounds it") { + CHECK(reached(100, 200) == "running"); + CHECK(reached(600, 500) == "service"); +} + +TEST_CASE("gauge positions: a lever moved smoothly past a position sounds it (MaSzyna-EU07/maszyna#83)") { + CHECK(reached(190, 205) == "running"); // moving up + CHECK(reached(510, 495) == "service"); // moving down +} + +TEST_CASE("gauge positions: of the positions passed in one go the last one reached sounds") { + CHECK(reached(50, 520) == "service"); // up past 2 and 5 + CHECK(reached(520, 10) == "running"); // down past 5 and 2, short of 0 + CHECK(reached(520, 0) == "release"); +} + +TEST_CASE("gauge positions: moving between the positions or off one sounds nothing") { + CHECK(reached(210, 290) == ""); + CHECK(reached(200, 230) == ""); // leaving a position isn't reaching it + CHECK(reached(200, 170) == ""); +} + +TEST_CASE("gauge positions: positions below zero count the same way") { + // a brake lever with the release position at -1 + std::map positions{{-1, "release"}, {0, "running"}}; + CHECK(gauge_positions::last_reached(positions, 50, -120)->second == "release"); // down past 0 and -1 + CHECK(gauge_positions::last_reached(positions, -150, -90)->second == "release"); // up past -1 +} + +TEST_CASE("gauge positions: a control without position sounds reaches none") { + std::map positions; + CHECK(gauge_positions::last_reached(positions, 0, 500) == positions.end()); +} diff --git a/tests/unit/test_horn.cpp b/tests/unit/test_horn.cpp new file mode 100644 index 000000000..18e5c5322 --- /dev/null +++ b/tests/unit/test_horn.cpp @@ -0,0 +1,121 @@ +#include "stdafx.h" +#include "doctest.h" + +#include "vehicle.h" + +#include "vehicle/horn.h" + +// the horn keys of the cab: low tone (A) and high tone (shift+A), held to sound + +TEST_CASE("horn: a single lever for both tones sounds one tone at a time (eu07/maszyna#392)") { + auto signal{0}; + signal = horn::pressed(signal, horn::low, true); + REQUIRE(signal == horn::low); + + // the lever moved over to the high tone while the low tone key is still held + signal = horn::pressed(signal, horn::high, true); + CHECK(signal == horn::high); + + // letting go of the low tone key leaves the high tone sounding + signal = horn::released(signal, horn::low); + CHECK(signal == horn::high); + + signal = horn::released(signal, horn::high); + CHECK(signal == 0); +} + +TEST_CASE("horn: separate buttons for the tones can sound both at once") { + auto signal{0}; + signal = horn::pressed(signal, horn::low, false); + signal = horn::pressed(signal, horn::high, false); + CHECK(signal == (horn::low | horn::high)); + + signal = horn::released(signal, horn::low); + CHECK(signal == horn::high); +} + +TEST_CASE("horn: releasing a tone leaves the other bits of the signal alone") { + auto const third{4}; // the third horn, operated separately + CHECK(horn::released(horn::low | third, horn::low) == third); + CHECK(horn::pressed(third, horn::high, true) == (horn::high | third)); +} + +// what the horns need to sound (eu07/maszyna#290): a pneumatic horn the air of the main reservoir, an electric one +// the low voltage. the horn lever stays where the driver put it, only the horn is silent +namespace { + +test::vehicle horn_vehicle(test::definition Definition) { + // a main reservoir of its own + return test::vehicle{Definition.set("Brake", "Vv", 1.0).set("Brake", "MinCP", 6.5).set("Brake", "MaxCP", 8.0)}; +} + +int const allhorns{horn::low | horn::high | 4}; + +} // namespace + +TEST_CASE("horn: a pneumatic horn sounds on the air of the main reservoir only") { + auto vehicle{horn_vehicle(test::definition::load("wagon"))}; + REQUIRE(vehicle->HornSupply == horn_supply::air); // the default + + vehicle->Compressor = 6.5; + CHECK(vehicle->SoundingHorns(allhorns) == allhorns); + vehicle->Compressor = 0.0; // the reservoir is empty + CHECK(vehicle->SoundingHorns(allhorns) == 0); +} + +TEST_CASE("horn: a vehicle without a main reservoir takes the horn air from the main pipe") { + test::vehicle vehicle{test::definition::load("wagon")}; + REQUIRE(vehicle->VeselVolume == 0.0); + + vehicle->ScndPipePress = 5.0; + CHECK(vehicle->SoundingHorns(horn::low) == horn::low); + vehicle->ScndPipePress = 0.0; + CHECK(vehicle->SoundingHorns(horn::low) == 0); +} + +TEST_CASE("horn: an electric horn sounds on the low voltage, whatever the air") { + auto vehicle{horn_vehicle(test::definition::load("wagon").set("Cntrl", "HornType", "Electric"))}; + REQUIRE(vehicle->HornSupply == horn_supply::electric); + REQUIRE(vehicle->Horn3Supply == horn_supply::electric); // the third horn follows the others unless told otherwise + + vehicle->Compressor = 0.0; + vehicle->Power24vIsAvailable = true; + CHECK(vehicle->SoundingHorns(allhorns) == allhorns); + vehicle->Power24vIsAvailable = false; + CHECK(vehicle->SoundingHorns(allhorns) == 0); +} + +TEST_CASE("horn: the third horn can have a supply of its own, an electric horn of a diesel say") { + auto vehicle{horn_vehicle(test::definition::load("wagon").set("Cntrl", "Horn3Type", "Electric"))}; + REQUIRE(vehicle->HornSupply == horn_supply::air); + REQUIRE(vehicle->Horn3Supply == horn_supply::electric); + + vehicle->Compressor = 0.0; + vehicle->Power24vIsAvailable = true; + CHECK(vehicle->SoundingHorns(allhorns) == 4); + vehicle->Compressor = 6.5; + vehicle->Power24vIsAvailable = false; + CHECK(vehicle->SoundingHorns(allhorns) == (horn::low | horn::high)); +} + +TEST_CASE("horn: a vehicle without any air, a road vehicle say, sounds its pneumatic horn as before") { + // no main reservoir and no main pipe connection at either end + test::vehicle vehicle{test::definition::load("wagon").set("BuffCoupl", "AllowedFlag", 3)}; + REQUIRE(vehicle->VeselVolume == 0.0); + vehicle->ScndPipePress = 0.0; + CHECK(vehicle->SoundingHorns(allhorns) == allhorns); +} + +TEST_CASE("horn: a pneumatic horn sounds from the threshold pressure up") { + auto vehicle{horn_vehicle(test::definition::load("wagon"))}; + vehicle->Compressor = TMoverParameters::HornMinPressure; + CHECK(vehicle->SoundingHorns(horn::low) == horn::low); + vehicle->Compressor = TMoverParameters::HornMinPressure - 0.01; + CHECK(vehicle->SoundingHorns(horn::low) == 0); +} + +TEST_CASE("horn: an electric horn sounds on 110 V too") { + auto vehicle{horn_vehicle(test::definition::load("wagon").set("Cntrl", "HornType", "Electric"))}; + vehicle->Power110vIsAvailable = true; + CHECK(vehicle->SoundingHorns(horn::high) == horn::high); +} diff --git a/tests/unit/test_line_contactors.cpp b/tests/unit/test_line_contactors.cpp new file mode 100644 index 000000000..79c419edf --- /dev/null +++ b/tests/unit/test_line_contactors.cpp @@ -0,0 +1,59 @@ +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" + +// the lamp of the open line contactors (eu07/maszyna#470): lit, it tells the start can be made, so it should go out +// where the start is cut off, by the pressure switch at 2 bar in the brake cylinders, not at 1 bar already + +namespace { + +test::vehicle locomotive(bool const Pressureswitch) { + test::vehicle vehicle{test::definition::load("wagon").set("Engine", "PressureSwitch", Pressureswitch)}; + vehicle->StLinFlag = false; // the line contactors open + vehicle->PipePress = 5.0; + return vehicle; +} + +} // namespace + +TEST_CASE("line contactors: with a pressure switch the lamp goes out with the start cut off") { + auto vehicle{locomotive(true)}; + REQUIRE(vehicle->HasControlPressureSwitch); + + vehicle->BrakePress = 1.5; // braked, the start can still be made + vehicle->MotorConnectorsCheck(); // updates the pressure switch + REQUIRE_FALSE(vehicle->ControlPressureSwitch); + CHECK(vehicle->LineContactorsLampLit()); + + vehicle->BrakePress = 2.5; // the pressure switch cuts the start off + vehicle->MotorConnectorsCheck(); + REQUIRE(vehicle->ControlPressureSwitch); + CHECK_FALSE(vehicle->LineContactorsLampLit()); +} + +TEST_CASE("line contactors: without a pressure switch the lamp goes out with the brakes applied, as before") { + auto vehicle{locomotive(false)}; + vehicle->BrakePress = 0.5; + vehicle->MotorConnectorsCheck(); + CHECK(vehicle->LineContactorsLampLit()); + vehicle->BrakePress = 1.5; + vehicle->MotorConnectorsCheck(); + CHECK_FALSE(vehicle->LineContactorsLampLit()); +} + +TEST_CASE("line contactors: closed contactors put the lamp out") { + auto vehicle{locomotive(true)}; + vehicle->StLinFlag = true; + CHECK_FALSE(vehicle->LineContactorsLampLit()); +} + +TEST_CASE("line contactors: the ground relay and overload lamps follow the same rule") { + // all the lamps of the main circuit go out together, with the pressure switch where it's fitted + auto vehicle{locomotive(true)}; + vehicle->BrakePress = 1.5; + vehicle->MotorConnectorsCheck(); + CHECK(vehicle->MainCircuitLampsEnabled()); + vehicle->BrakePress = 2.5; + vehicle->MotorConnectorsCheck(); + CHECK_FALSE(vehicle->MainCircuitLampsEnabled()); +} diff --git a/tests/unit/test_mirrors.cpp b/tests/unit/test_mirrors.cpp new file mode 100644 index 000000000..7408eeaa5 --- /dev/null +++ b/tests/unit/test_mirrors.cpp @@ -0,0 +1,32 @@ +#include "stdafx.h" +#include "doctest.h" + +#include "vehicle/mirrors.h" + +// the sounds of the mirrors (MaSzyna-EU07/maszyna#84, eu07/maszyna#322): a mirror sounds as it sets off, unfolding +// or folding, and not again while it keeps moving the same way + +using mirror_moves::event; + +TEST_CASE("mirrors: a mirror sounds once as it sets off") { + mirror_moves::motion mirror; + CHECK(mirror.update(0.0) == event::none); // standing folded + CHECK(mirror.update(0.01) == event::unfolding); + CHECK(mirror.update(0.01) == event::none); // still unfolding + CHECK(mirror.update(0.0) == event::none); // unfolded + CHECK(mirror.update(-0.01) == event::folding); + CHECK(mirror.update(-0.01) == event::none); +} + +TEST_CASE("mirrors: a mirror turned back halfway sounds the other way") { + mirror_moves::motion mirror; + REQUIRE(mirror.update(0.01) == event::unfolding); + CHECK(mirror.update(-0.01) == event::folding); // the vehicle got too fast while it was unfolding +} + +TEST_CASE("mirrors: a mirror setting off again the same way sounds again") { + mirror_moves::motion mirror; + REQUIRE(mirror.update(0.01) == event::unfolding); + REQUIRE(mirror.update(0.0) == event::none); // stopped, the doors lost their permit say + CHECK(mirror.update(0.01) == event::unfolding); +} diff --git a/tests/unit/test_pumps.cpp b/tests/unit/test_pumps.cpp new file mode 100644 index 000000000..2245e3eb8 --- /dev/null +++ b/tests/unit/test_pumps.cpp @@ -0,0 +1,52 @@ +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" + +// the joint oil and fuel pump switch (MaSzyna-EU07/maszyna#81) works the pumps which aren't started automatically + +namespace { + +test::vehicle pumps_vehicle(std::string const &Fuelstart, std::string const &Oilstart) { + return test::vehicle{test::definition::load("wagon").set("Cntrl", "FuelStart", Fuelstart).set("Cntrl", "OilStart", Oilstart)}; +} + +// what the two-state joint switch does when pressed, as TTrain::OnCommand_oilfuelpumptoggle() +void press_joint_switch(test::vehicle &Vehicle) { + auto const enable{false == Vehicle->OilFuelPumpsEnabled()}; + Vehicle->FuelPumpSwitch(enable, range_t::local); + Vehicle->FuelPumpSwitchOff(false == enable, range_t::local); + Vehicle->OilPumpSwitch(enable, range_t::local); + Vehicle->OilPumpSwitchOff(false == enable, range_t::local); +} + +} // namespace + +TEST_CASE("pumps: the joint switch turns both manual pumps on, then off") { + auto vehicle{pumps_vehicle("Manual", "Manual")}; + REQUIRE_FALSE(vehicle->OilFuelPumpsEnabled()); + press_joint_switch(vehicle); + CHECK(vehicle->FuelPump.is_enabled); + CHECK(vehicle->OilPump.is_enabled); + CHECK(vehicle->OilFuelPumpsEnabled()); + press_joint_switch(vehicle); + CHECK_FALSE(vehicle->FuelPump.is_enabled); + CHECK_FALSE(vehicle->OilPump.is_enabled); +} + +TEST_CASE("pumps: with one pump started automatically the joint switch still turns the other one off") { + auto vehicle{pumps_vehicle("Manual", "Automatic")}; + press_joint_switch(vehicle); + REQUIRE(vehicle->FuelPump.is_enabled); + CHECK(vehicle->OilFuelPumpsEnabled()); // the switch shows on + press_joint_switch(vehicle); + CHECK_FALSE(vehicle->FuelPump.is_enabled); +} + +TEST_CASE("pumps: with one manual pump on and the other off the joint switch turns both on") { + auto vehicle{pumps_vehicle("Manual", "Manual")}; + vehicle->FuelPumpSwitch(true, range_t::local); + REQUIRE_FALSE(vehicle->OilFuelPumpsEnabled()); + press_joint_switch(vehicle); + CHECK(vehicle->FuelPump.is_enabled); + CHECK(vehicle->OilPump.is_enabled); +} diff --git a/tests/unit/test_radio.cpp b/tests/unit/test_radio.cpp new file mode 100644 index 000000000..33a12f72d --- /dev/null +++ b/tests/unit/test_radio.cpp @@ -0,0 +1,28 @@ +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" + +// the radio works only switched on and with the low voltage (eu07/maszyna#429): its channel and volume buttons, +// the calls and the radio-stop all ask RadioPowered() + +TEST_CASE("radio: a radio switched on with the low voltage works") { + test::vehicle vehicle{test::definition::load("wagon")}; + vehicle->Radio = true; + SUBCASE("24 V") { vehicle->Power24vIsAvailable = true; } + SUBCASE("110 V") { vehicle->Power110vIsAvailable = true; } + CHECK(vehicle->RadioPowered()); +} + +TEST_CASE("radio: a radio switched off or without the low voltage doesn't") { + test::vehicle vehicle{test::definition::load("wagon")}; + SUBCASE("switched off") { + vehicle->Radio = false; + vehicle->Power24vIsAvailable = true; + } + SUBCASE("batteries off") { + vehicle->Radio = true; + vehicle->Power24vIsAvailable = false; + vehicle->Power110vIsAvailable = false; + } + CHECK_FALSE(vehicle->RadioPowered()); +} diff --git a/tests/unit/test_switches.cpp b/tests/unit/test_switches.cpp new file mode 100644 index 000000000..72b1e47ce --- /dev/null +++ b/tests/unit/test_switches.cpp @@ -0,0 +1,16 @@ +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" + +// the kinds of the cab switches, given in the Switches: section of the vehicle definition + +TEST_CASE("switches: the train heating switch can spring back (MaSzyna-EU07/maszyna#85)") { + SUBCASE("impulse") { + test::vehicle vehicle{test::definition::load("cab_vehicle").set("Switches", "TrainHeating", "Impulse")}; + CHECK(vehicle->HeatingSwitchImpulse); // whichever the case it's written in + } + SUBCASE("a plain switch by default") { + test::vehicle vehicle{test::definition::load("cab_vehicle")}; + CHECK_FALSE(vehicle->HeatingSwitchImpulse); + } +} diff --git a/tests/unit/test_wheelslip.cpp b/tests/unit/test_wheelslip.cpp new file mode 100644 index 000000000..9b39e82c6 --- /dev/null +++ b/tests/unit/test_wheelslip.cpp @@ -0,0 +1,62 @@ +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" + +using test::definition; +using test::track; +using test::vehicle; + +namespace { + +struct braking_result { + bool skidded{false}; // the wheels locked while braking + bool stopped{false}; // came (almost) to a stop on the braking rail +}; + +// brakes the wagon from 40 km/h on the Braking rail until it's (nearly) stopped, then has it stand on the +// Standing one for 30 seconds +braking_result brake_to_stop_then_stand(vehicle &Coach, track const &Braking, track const &Standing) { + braking_result result; + Coach.hold_brake_pipe(5.0); + Coach.run(5.0, Braking); + Coach.hold_brake_pipe(3.5); // service braking + // a skidding wagon brakes on the sliding adhesion only, give it time + for (auto step = 0; step < 60000; ++step) { // 600 s in 0.01 s steps + result.skidded |= Coach->SlippingWheels; + if (auto const speed{std::abs(Coach.speed())}; speed > 0.0 && speed < 0.1) { + // almost stopped; a skidding wagon is still skidding at this point + result.stopped = true; + break; + } + Coach.step(Braking); + } + Coach.run(30.0, Standing); + return result; +} + +} // namespace + +// the engine doesn't let a stopped, braked vehicle slip (the Vel > 0.1 trap in TMoverParameters::ComputeTotalForce), +// so a wagon which stopped in a skid should be no different from one which stopped without it. it used to stay +// skidding instead, with its brakes capped by the sliding adhesion, and slid or crept away (eu07/maszyna#479) +TEST_CASE("wheelslip: a wagon which stopped in a skid holds like one which stopped without it") { + track const dry{0.15, 0.0}; + track const slippery{0.02, 0.0}; + // held only by the brakes: the sliding adhesion on this rail is too low for the slope + track const slipperyslope{0.02, 0.08}; + + vehicle normal{definition::load("wagon"), 40.0}; + auto const normalbraking{brake_to_stop_then_stand(normal, dry, slipperyslope)}; + vehicle skidding{definition::load("wagon"), 40.0}; + auto const skiddingbraking{brake_to_stop_then_stand(skidding, slippery, slipperyslope)}; + + // the test means something only when the braking went as planned + REQUIRE(normalbraking.stopped); + REQUIRE_FALSE(normalbraking.skidded); + REQUIRE(skiddingbraking.stopped); + REQUIRE(skiddingbraking.skidded); + + CHECK(std::abs(normal.speed()) < 0.1); + CHECK(std::abs(skidding.speed()) < 0.1); + CHECK_FALSE(skidding->SlippingWheels); +} diff --git a/tests/unit/vehicle.cpp b/tests/unit/vehicle.cpp index 135c5c2fb..c0930d134 100644 --- a/tests/unit/vehicle.cpp +++ b/tests/unit/vehicle.cpp @@ -1,5 +1,6 @@ #include "stdafx.h" #include "vehicle.h" +#include "vehicle/DynObj.h" #include #include @@ -159,6 +160,18 @@ vehicle::vehicle(definition const &Definition, double Velocity, std::string cons } void vehicle::step(track const &Track, double Dt) { + compute_forces(Dt); + compute_movement(Track, Dt, TLocation{0.0, 0.0, 0.0}); +} + +void vehicle::compute_forces(double Dt) { + if (m_pipepressure >= 0.0) { + m_mover->Pipe->CreatePress(m_pipepressure); + } + m_mover->ComputeTotalForce(Dt); +} + +double vehicle::compute_movement(track const &Track, double Dt, TLocation const &Location) { TTrackShape shape; shape.Len = 1000.0; shape.dHtrack = Track.gradient; @@ -167,13 +180,8 @@ void vehicle::step(track const &Track, double Dt) { param.friction = Track.friction; param.CategoryFlag = 1; TTractionParam const traction; - TLocation const location{0.0, 0.0, 0.0}; TRotation const rotation{0.0, 0.0, 0.0}; - if (m_pipepressure >= 0.0) { - m_mover->Pipe->CreatePress(m_pipepressure); - } - m_mover->ComputeTotalForce(Dt); - m_mover->ComputeMovement(Dt, Dt, shape, param, traction, location, rotation); + return m_mover->ComputeMovement(Dt, Dt, shape, param, traction, Location, rotation); } void vehicle::run(double Seconds, track const &Track, double Dt) { @@ -184,4 +192,88 @@ void vehicle::run(double Seconds, track const &Track, double Dt) { } } +// the physics reaches the vehicle next to it through TDynamicObject::MoverParameters only (neighbour_data). the +// tests can't make a TDynamicObject, whose constructor and members come with the rest of the engine, so the +// neighbour is a zeroed block of its size with just that pointer set: enough for the physics, which reads nothing +// else of it, and never used as a whole object +static_assert(alignof(TDynamicObject) <= __STDCPP_DEFAULT_NEW_ALIGNMENT__); + +namespace { + +std::vector make_standin(TMoverParameters &Mover) { + std::vector standin(sizeof(TDynamicObject)); // zeroed + reinterpret_cast(standin.data())->MoverParameters = &Mover; // NOSONAR see above + return standin; +} + +TDynamicObject *as_neighbour(std::byte *Standin) { + return reinterpret_cast(Standin); // NOSONAR see above +} + +} // namespace + +pair::pair(vehicle &First, int FirstEnd, vehicle &Second, int SecondEnd, double Gap) { + auto const &first{First.mover()}; + auto const &second{Second.mover()}; + // the first vehicle in the middle, its FirstEnd towards the second one + m_vehicles[0] = {&First, FirstEnd, 0.0, FirstEnd == end::front ? 1.0 : -1.0, make_standin(First.mover())}; + m_vehicles[1] = {&Second, SecondEnd, 0.5 * first.Dim.L + Gap + 0.5 * second.Dim.L, SecondEnd == end::front ? -1.0 : 1.0, make_standin(Second.mover())}; +} + +pair::~pair() { + for (auto const &placed : m_vehicles) { + // the vehicles outlive the pair, they mustn't point at its stand-ins + for (auto &neighbour : placed.owner->mover().Neighbours) { + neighbour = neighbour_data(); + } + } +} + +void pair::find_neighbours() { + // as TDynamicObject::update_neighbours() + for (auto const &placed : m_vehicles) { + placed.owner->mover().Loc = TLocation{placed.position, 0.0, 0.0}; + } + for (int i = 0; i < 2; ++i) { + auto const &self{m_vehicles[i]}; + auto &other{m_vehicles[1 - i]}; // its stand-in is what this one points at + auto &mover{self.owner->mover()}; + auto const &othermover{other.owner->mover()}; + auto &neighbour{mover.Neighbours[self.end]}; + neighbour.vehicle = as_neighbour(other.standin.data()); + neighbour.vehicle_end = other.end; + neighbour.distance = static_cast(TMoverParameters::CouplerDist(&mover, &othermover) - mover.Couplers[self.end].adapter_length - + othermover.Couplers[other.end].adapter_length); + mover.Neighbours[1 - self.end] = neighbour_data(); + } +} + +void pair::step(track const &Track, double Dt) { + find_neighbours(); + for (auto const &placed : m_vehicles) { + placed.owner->compute_forces(Dt); + } + for (auto &placed : m_vehicles) { + placed.position += placed.heading * placed.owner->compute_movement(Track, Dt, TLocation{placed.position, 0.0, 0.0}); + } +} + +void pair::run(double Seconds, track const &Track, double Dt) { + // whole steps, as in vehicle::run() + auto const steps{std::lround(Seconds / Dt)}; + for (long i = 0; i < steps; ++i) { + step(Track, Dt); + } +} + +double pair::gap() const { + auto const &first{m_vehicles[0].owner->mover()}; + auto const &second{m_vehicles[1].owner->mover()}; + return std::abs(m_vehicles[1].position - m_vehicles[0].position) - 0.5 * (first.Dim.L + second.Dim.L); +} + +int pair::coupling() const { + return m_vehicles[0].owner->mover().Couplers[m_vehicles[0].end].CouplingFlag; +} + } // namespace test diff --git a/tests/unit/vehicle.h b/tests/unit/vehicle.h index ad036839e..616e75d11 100644 --- a/tests/unit/vehicle.h +++ b/tests/unit/vehicle.h @@ -1,8 +1,10 @@ #pragma once +#include #include #include #include +#include #include @@ -64,8 +66,57 @@ public: double speed() const { return m_mover->V * 3.6; } private: + friend class pair; + + // the two halves of a step: the forces, taken by all the vehicles in the scene first, then the movement, + // the vehicle placed at Location. returns the distance travelled [m], positive forwards + void compute_forces(double Dt); + double compute_movement(track const &Track, double Dt, TLocation const &Location); + std::unique_ptr m_mover; double m_pipepressure{-1.0}; }; +// two vehicles on a straight track, the FirstEnd of the first one facing the SecondEnd of the second one Gap metres +// away (from coupler to coupler), with nothing else around. a step runs them the way the simulation runs the +// vehicles of a scene (vehicle_table::update()): each one finds its neighbour, then both take the forces, the +// coupler and buffer ones among them (CouplerForce()), then both move and handle the collisions (CollisionDetect()). +// they couple and part on their own, as the couplers let them; the speed of each runs along its own axis +// test::pair pair{moving, end::front, standing, end::rear, 1.0}; // 1 m apart +// pair.run(5.0); // for 5 s +// CHECK(pair.coupled()); +class pair { +public: + pair(vehicle &First, int FirstEnd, vehicle &Second, int SecondEnd, double Gap); + ~pair(); + pair(pair const &) = delete; + pair &operator=(pair const &) = delete; + // the vehicles point at the stand-ins of the pair, which stay where they are + pair(pair &&) = delete; + pair &operator=(pair &&) = delete; + + // advances both vehicles by one step of Dt + void step(track const &Track = {}, double Dt = 0.01); + // advances both vehicles by Seconds in steps of Dt + void run(double Seconds, track const &Track = {}, double Dt = 0.01); + // distance between the facing couplers [m], negative while the buffers are pressed in + double gap() const; + // type of the coupling between the vehicles, coupling::faux when they aren't coupled + int coupling() const; + bool coupled() const { return coupling() != coupling::faux; } + +private: + struct placement { + vehicle *owner{nullptr}; + int end{0}; // the end facing the other vehicle + double position{0.0}; // of the middle of the vehicle along the track [m] + double heading{1.0}; // +1 when the vehicle runs forwards towards the growing position, -1 otherwise + std::vector standin; // what the other vehicle sees as this one, see vehicle.cpp + }; + + void find_neighbours(); + + std::array m_vehicles; +}; + } // namespace test diff --git a/utilities/translation.cpp b/utilities/translation.cpp index b1db12275..c0dbeb1a0 100644 --- a/utilities/translation.cpp +++ b/utilities/translation.cpp @@ -218,6 +218,7 @@ std::string locale::label_cab_control(std::string const &Label) { "watercircuitslink_sw:", STRN("water circuits link") }, { "fuelpump_sw:", STRN("fuel pump") }, { "oilpump_sw:", STRN("oil pump") }, + { "oilfuelpump_sw:", STRN("oil and fuel pumps") }, { "motorblowersfront_sw:", STRN("motor blowers A") }, { "motorblowersrear_sw:", STRN("motor blowers B") }, { "motorblowersalloff_sw:", STRN("all motor blowers") }, diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 5beac4c1e..08f0c0d24 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -30,6 +30,8 @@ http://mozilla.org/MPL/2.0/. #include "world/station.h" #include "input/keyboardinput.h" +#include + #define LOGVELOCITY 0 #define LOGORDERS 1 #define LOGSTOPS 1 @@ -1093,10 +1095,9 @@ TController::TableUpdateStopPoint( TCommandType &Command, TSpeedPos &Point, doub if (Point.fDist < passengerstopmaxdistance * 0.5 ) { // zaliczamy posterunek w pewnej odległości przed (choć W4 nie zasłania już semafora) #if LOGSTOPS - WriteLog( - pVehicle->asName + " as " + TrainParams.TrainName - + ": at " + std::to_string(simulation::Time.data().wHour) + ":" + std::to_string(simulation::Time.data().wMinute) - + " passed " + asNextStop); // informacja + WriteLog(std::format( + "{} as {}: at {}:{} passed {}", + pVehicle->asName, TrainParams.TrainName, simulation::Time.data().wHour, simulation::Time.data().wMinute, asNextStop)); // informacja #endif // przy jakim dystansie (stanie licznika) ma przesunąć na następny postój fLastStopExpDist = mvOccupied->DistCounter + 0.250 + 0.001 * fLength; @@ -1253,10 +1254,9 @@ TController::TableUpdateStopPoint( TCommandType &Command, TSpeedPos &Point, doub TrainParams.StationIndexInc(); // przejście do następnej asNextStop = TrainParams.NextStop(); // pobranie kolejnego miejsca zatrzymania #if LOGSTOPS - WriteLog( - pVehicle->asName + " as " + TrainParams.TrainName - + ": at " + std::to_string(simulation::Time.data().wHour) + ":" + std::to_string(simulation::Time.data().wMinute) - + " next " + asNextStop); // informacja + WriteLog(std::format( + "{} as {}: at {}:{} next {}", + pVehicle->asName, TrainParams.TrainName, simulation::Time.data().wHour, simulation::Time.data().wMinute, asNextStop)); // informacja #endif // update consist weight, brake settings and ai braking tables // NOTE: this calculation is expected to run after completing loading/unloading @@ -1297,13 +1297,16 @@ TController::TableUpdateStopPoint( TCommandType &Command, TSpeedPos &Point, doub else { // jeśli dojechaliśmy do końca rozkładu #if LOGSTOPS - WriteLog( - pVehicle->asName + " as " + TrainParams.TrainName - + ": at " + std::to_string(simulation::Time.data().wHour) + ":" + std::to_string(simulation::Time.data().wMinute) - + " end of route."); // informacja + WriteLog(std::format( + "{} as {}: at {}:{} end of route.", + pVehicle->asName, TrainParams.TrainName, simulation::Time.data().wHour, simulation::Time.data().wMinute)); // informacja #endif asNextStop = TrainParams.NextStop(); // informacja o końcu trasy TrainParams.NewName("none"); // czyszczenie nieaktualnego rozkładu + // koniec kursu, gasimy wyświetlacze relacji (tablice blaszane zostają) + for( auto *vehicle { pVehicles[ end::front ] }; vehicle != nullptr; vehicle = vehicle->Next() ) { + vehicle->DestinationClear(); + } // ma nie podjeżdżać pod W4 i ma je pomijać iDrivigFlags &= ~moveStopCloser; if( false == TestFlag( iDrivigFlags, movePushPull ) ) { diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index 32ba307f7..c6793e454 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -4150,6 +4150,8 @@ bool TDynamicObject::Update(double dt, double dt1) // mirrors + auto const mirrorleft { dMirrorMoveL }; + auto const mirrorright { dMirrorMoveR }; if( MoverParameters->Vel > MoverParameters->MirrorVelClose || MoverParameters->CabActive == 0 && activation::mirrors || MoverParameters->MirrorForbidden ) { @@ -4180,6 +4182,8 @@ bool TDynamicObject::Update(double dt, double dt1) dMirrorMoveR + 1.0 * dt1 ); } } + play_mirror_sounds( side::left, m_mirrormotion[ side::left ].update( dMirrorMoveL - mirrorleft ) ); + play_mirror_sounds( side::right, m_mirrormotion[ side::right ].update( dMirrorMoveR - mirrorright ) ); // compartment lights // if the vehicle has a controller, we base the light state on state of the controller otherwise we check the vehicle itself @@ -4825,12 +4829,13 @@ void TDynamicObject::RenderSounds() { // horns { - // for moving vehicle combine regular horn activation flag with emergency brake horn activation flag, if the brake is active - auto const warningsignal { ( - MoverParameters->Vel > 0.5 && MoverParameters->AlarmChainFlag ? + // for moving vehicle combine regular horn activation flag with emergency brake horn activation flag, if the brake is active; + // the horns without the air or the voltage they need stay silent + auto const warningsignal { MoverParameters->SoundingHorns( + ( MoverParameters->Vel > 0.5 && MoverParameters->AlarmChainFlag ? MoverParameters->EmergencyBrakeWarningSignal : 0 ) - | MoverParameters->WarningSignal }; + | MoverParameters->WarningSignal ) }; if( TestFlag( warningsignal, 1 ) ) { sHorn1.play( sound_flags::exclusive | sound_flags::looping ); @@ -6363,6 +6368,19 @@ void TDynamicObject::LoadMMediaFile( std::string const &TypeName, std::string co } } + else if( token == "mirroropen:" || token == "mirrorclose:" ) { + sound_source soundtemplate { sound_placement::general }; + soundtemplate.deserialize( parser, sound_type::single ); + soundtemplate.owner( this ); + for( auto &mirror : m_mirrorsounds ) { + // apply configuration to all defined mirrors, but preserve their individual offsets + auto &sound { token == "mirroropen:" ? mirror.unfold : mirror.fold }; + auto const mirroroffset { sound.offset() }; + sound = soundtemplate; + sound.offset( mirroroffset ); + } + } + else if( token == "doorstepclose:" ) { sound_source soundtemplate { sound_placement::general }; soundtemplate.deserialize( parser, sound_type::single ); @@ -6576,6 +6594,27 @@ void TDynamicObject::LoadMMediaFile( std::string const &TypeName, std::string co } } + else if( token == "mirrors:" ) { + // a list of offsets along vehicle's z-axis of the mirror pairs, one at each cab; followed with "end" + while( (token = parser.getToken()) != "" + && token != "end" ) { + // vehicle faces +Z in 'its' space, as for the doors negative value means ahead of centre + auto const offset { std::atof( token.c_str() ) * -1.f }; + mirror_sounds mirror; + mirror.end = offset >= 0.f ? end::front : end::rear; + for( auto const mirrorside : { side::left, side::right } ) { + auto const location { glm::vec3 { + MoverParameters->Dim.W * ( mirrorside == side::left ? 0.5f : -0.5f ), + MoverParameters->Dim.H * 0.5f, + offset } }; + mirror.placement = mirrorside; + mirror.unfold.offset( location ); + mirror.fold.offset( location ); + m_mirrorsounds.emplace_back( mirror ); + } + } + } + else if( token == "tractionmotors:" ) { // a list of offsets along vehicle's z-axis; followed with "end" while( (token = parser.getToken()) != "" @@ -7794,7 +7833,29 @@ int TDynamicObject::RouteWish(TTrack *tr) return Mechanik ? Mechanik->CrossRoute(tr) : 0; // wg AI albo prosto }; -void TDynamicObject::DestinationSet(std::string to, std::string numer) { +void TDynamicObject::play_mirror_sounds( side const Side, mirror_moves::event const Event ) { + + if( Event == mirror_moves::event::none ) { return; } + // as UpdateMirror(), only the mirrors of the occupied cab move + if( MoverParameters->CabOccupied == 0 ) { return; } + auto const cabend { MoverParameters->CabOccupied > 0 ? end::front : end::rear }; + for( auto &mirror : m_mirrorsounds ) { + if( mirror.placement != Side || mirror.end != cabend ) { continue; } + auto &sound { Event == mirror_moves::event::unfolding ? mirror.unfold : mirror.fold }; + auto &other { Event == mirror_moves::event::unfolding ? mirror.fold : mirror.unfold }; + other.stop(); + sound.play( sound_flags::exclusive ); + } +} + +void TDynamicObject::DestinationClear() { + + if( false == DestinationSign.has_light ) { return; } // physical destination signs remain up until manually changed + // update_destinations() shows the blank sign in place of the missing destination + DestinationSign.destination = null_handle; +} + +void TDynamicObject::DestinationSet(std::string const &to, std::string const &numer) { // ustawienie stacji docelowej oraz wymiennej tekstury 4, jeśli istnieje plik // w zasadzie, to każdy wagon mógłby mieć inną stację docelową // zwłaszcza w towarowych, pod kątem zautomatyzowania maewrów albo pracy górki @@ -7823,6 +7884,15 @@ void TDynamicObject::DestinationSet(std::string to, std::string numer) { if( DestinationSign.script.empty() ) { return; } // no script so no way to make the texture if( numer == "none" ) { return; } // blank or incomplete/malformed timetable, don't bother + auto const trainname { [this]() -> std::string { + if( ctOwner != nullptr ) { return ctOwner->TrainName(); } + if( Mechanik != nullptr ) { return Mechanik->TrainName(); } + return "none"; } }; // shouldn't get here but, eh + auto const instance { [this]() -> std::string { + if( DestinationSign.instancing == "name" ) { return MoverParameters->Name; } + if( DestinationSign.instancing == "type" ) { return MoverParameters->TypeName; } + return "none"; } }; + std::string signrequest { "make:" + DestinationSign.script @@ -7834,17 +7904,10 @@ void TDynamicObject::DestinationSet(std::string to, std::string numer) { ctOwner->Vehicle()->MoverParameters->Name ) // owned vehicle, safer to point to owner as carriages can have identical names // basic instancing string // NOTE: underscore doesn't have any magic meaning for the time being, it's just less likely to conflict with regular dictionary keys - + "&_id1=" + ( - ctOwner != nullptr ? ctOwner->TrainName() : - Mechanik != nullptr ? Mechanik->TrainName() : - "none" ) }; // shouldn't get here but, eh + + "&_id1=" + trainname() }; // TBD, TODO: replace instancing with support for variables in extra parameters string? if( false == DestinationSign.instancing.empty() ) { - signrequest += - "&_id2=" + ( - DestinationSign.instancing == "name" ? MoverParameters->Name : - DestinationSign.instancing == "type" ? MoverParameters->TypeName : - "none" ); + signrequest += "&_id2=" + instance(); } // optionl extra parameters if( false == DestinationSign.parameters.empty() ) { diff --git a/vehicle/DynObj.h b/vehicle/DynObj.h index 36335a320..2d9636b2f 100644 --- a/vehicle/DynObj.h +++ b/vehicle/DynObj.h @@ -21,6 +21,7 @@ http://mozilla.org/MPL/2.0/. #include "interfaces/ITexture.h" #include "audio/sound.h" #include "world/Spring.h" +#include "vehicle/mirrors.h" #include @@ -393,6 +394,13 @@ private: side placement {}; }; + struct mirror_sounds { + sound_source unfold { sound_placement::general }; + sound_source fold { sound_placement::general }; + side placement {}; + int end {}; // of the vehicle, the mirror moves with the cab at this end occupied + }; + struct exchange_sounds { sound_source loading { sound_placement::general }; sound_source unloading { sound_placement::general }; @@ -567,6 +575,8 @@ private: std::vector m_pantographsounds; // typically 2 but can be less (or more?) std::vector m_doorsounds; // can expect symmetrical arrangement, but don't count on it bool m_doorlocks { false }; // sound helper, current state of door locks + std::vector m_mirrorsounds; + std::array m_mirrormotion; // indexed by side: right, left sound_source sHorn1 { sound_placement::external, 5 * EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; sound_source sHorn2 { sound_placement::external, 5 * EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; sound_source sHorn3 { sound_placement::external, 5 * EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; @@ -703,6 +713,8 @@ private: void Move(double fDistance); void FastMove(double fDistance); void RenderSounds(); + // plays the sounds of the mirrors on the Side, of the occupied cab, starting the Event + void play_mirror_sounds( side const Side, mirror_moves::event const Event ); inline glm::dvec3 GetPosition() const { return vPosition; }; // converts location from vehicle coordinates frame to world frame @@ -815,7 +827,9 @@ private: void ParamSet(int what, int into); // zapytanie do AI, po którym segmencie skrzyżowania jechać int RouteWish(TTrack *tr); - void DestinationSet(std::string to, std::string numer); + void DestinationSet(std::string const &to, std::string const &numer); + // blanks electronic destination sign at the end of the service; physical signs stay until changed + void DestinationClear(); material_handle DestinationFind( std::string Destination ); void OverheadTrack(float o); glm::dvec3 get_future_movement() const; diff --git a/vehicle/Gauge.cpp b/vehicle/Gauge.cpp index d7a41062e..af8e9a060 100644 --- a/vehicle/Gauge.cpp +++ b/vehicle/Gauge.cpp @@ -15,6 +15,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "vehicle/Gauge.h" +#include "vehicle/gaugepositions.h" #include "utilities/parser.h" #include "model/Model3d.h" #include "vehicle/DynObj.h" @@ -302,42 +303,37 @@ bool TGauge::UpdateValue( float fNewDesired ) { auto const desiredtimes100 = static_cast( std::round( 100.0 * fNewDesired ) ); - if( desiredtimes100 == static_cast( std::round( 100.0 * m_targetvalue ) ) ) { + auto const previoustimes100 = static_cast( std::round( 100.0 * m_targetvalue ) ); + if( desiredtimes100 == previoustimes100 ) { return true; } m_targetvalue = fNewDesired; - // if there's any sound associated with new requested value, play it - // check value-specific table first... - if( auto const fullinteger { desiredtimes100 % 100 == 0 }; fullinteger ) { - // filter out values other than full integers - auto const lookup = m_soundfxvalues.find( desiredtimes100 / 100 ); - if( lookup != m_soundfxvalues.end() ) { - lookup->second.play(); - return true; - } - } - else { + if( desiredtimes100 % 100 != 0 ) { // toggle the control to continous range/exclusive sound mode from now on m_soundtype = sound_flags::exclusive; } + // if there's any sound associated with a position reached on the way to the new requested value, play it + // check value-specific table first... + if( auto const reached = gauge_positions::last_reached( m_soundfxvalues, previoustimes100, desiredtimes100 ); + reached != m_soundfxvalues.end() ) { + reached->second.play(); + return true; + } // ...and if there isn't any, fall back on the basic set... // HACK: crude way to discern controls with continuous and quantized value range - if( auto const currentvalue = GetValue(); currentvalue < fNewDesired ) { + auto const currentvalue = GetValue(); + if( currentvalue < fNewDesired && false == m_soundfxincrease.empty() ) { // shift up - if( false == m_soundfxincrease.empty() ) { - m_soundfxincrease.play( m_soundtype ); - return true; - } + m_soundfxincrease.play( m_soundtype ); + return true; } - else if( currentvalue > fNewDesired ) { + if( currentvalue > fNewDesired && false == m_soundfxdecrease.empty() ) { // shift down - if( false == m_soundfxdecrease.empty() ) { - m_soundfxdecrease.play( m_soundtype ); - return true; - } + m_soundfxdecrease.play( m_soundtype ); + return true; } return false; // no suitable sound was found -}; +} void TGauge::PutValue(float fNewDesired) { // McZapkie-281102: natychmiastowe wpisanie wartosci diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index f0b2367f7..201b8972f 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -14,6 +14,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "vehicle/Train.h" +#include "vehicle/horn.h" #include "utilities/Globals.h" #include "simulation/simulation.h" @@ -340,6 +341,7 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { {user_command::fuelpumpenable, &TTrain::OnCommand_fuelpumpenable}, {user_command::fuelpumpdisable, &TTrain::OnCommand_fuelpumpdisable}, {user_command::oilpumptoggle, &TTrain::OnCommand_oilpumptoggle}, + {user_command::oilfuelpumptoggle, &TTrain::OnCommand_oilfuelpumptoggle}, {user_command::oilpumpenable, &TTrain::OnCommand_oilpumpenable}, {user_command::oilpumpdisable, &TTrain::OnCommand_oilpumpdisable}, {user_command::waterheaterbreakertoggle, &TTrain::OnCommand_waterheaterbreakertoggle}, @@ -3995,6 +3997,37 @@ void TTrain::OnCommand_oilpumpdisable(TTrain *Train, command_data const &Command } } +void TTrain::OnCommand_oilfuelpumptoggle(TTrain *Train, command_data const &Command) +{ + if (Command.action == GLFW_REPEAT) + { + return; + } + + auto *vehicle{Train->mvControlled}; + if (Train->ggOilFuelPumpButton.type() == TGaugeType::push) + { + // impulse switch, as the separate ones: held to start both pumps + auto const pressed{Command.action == GLFW_PRESS}; + Train->ggOilFuelPumpButton.UpdateValue(pressed ? 1.0 : 0.0, Train->dsbSwitch); + vehicle->FuelPumpSwitch(pressed); + vehicle->OilPumpSwitch(pressed); + return; + } + // two-state switch, only cares about press events + if (Command.action != GLFW_PRESS) + { + return; + } + // both pumps go off if both were on, otherwise both go on; a pump started automatically doesn't take part + auto const enable{false == vehicle->OilFuelPumpsEnabled()}; + Train->ggOilFuelPumpButton.UpdateValue(enable ? 1.0 : 0.0, Train->dsbSwitch); + vehicle->FuelPumpSwitch(enable); + vehicle->FuelPumpSwitchOff(false == enable); + vehicle->OilPumpSwitch(enable); + vehicle->OilPumpSwitchOff(false == enable); +} + void TTrain::OnCommand_waterheaterbreakertoggle(TTrain *Train, command_data const &Command) { @@ -6605,7 +6638,7 @@ void TTrain::OnCommand_heatingtoggle(TTrain *Train, command_data const &Command) OnCommand_heatingdisable(Train, Command); } } - else if (Command.action == GLFW_RELEASE && Train->ggTrainHeatingButton.type() == TGaugeType::push) + else if (Command.action == GLFW_RELEASE && (Train->ggTrainHeatingButton.type() == TGaugeType::push || Train->mvOccupied->HeatingSwitchImpulse)) { // impulse switch // visual feedback @@ -6623,6 +6656,11 @@ void TTrain::OnCommand_heatingenable(TTrain *Train, command_data const &Command) // visual feedback Train->ggTrainHeatingButton.UpdateValue(1.0, Train->dsbSwitch); } + else if (Command.action == GLFW_RELEASE && Train->mvOccupied->HeatingSwitchImpulse) + { + // the switch springs back to the middle + Train->ggTrainHeatingButton.UpdateValue(0.0, Train->dsbSwitch); + } } void TTrain::OnCommand_heatingdisable(TTrain *Train, command_data const &Command) @@ -6632,8 +6670,21 @@ void TTrain::OnCommand_heatingdisable(TTrain *Train, command_data const &Command { Train->mvOccupied->HeatingSwitch(false); - // visual feedback - Train->ggTrainHeatingButton.UpdateValue(Train->ggTrainHeatingButton.type() == TGaugeType::push ? 1.0 : 0.0, Train->dsbSwitch); + // visual feedback: an impulse switch is pushed the other way, down + auto position{0.0}; + if (Train->mvOccupied->HeatingSwitchImpulse) + { + position = -1.0; + } + else if (Train->ggTrainHeatingButton.type() == TGaugeType::push) + { + position = 1.0; + } + Train->ggTrainHeatingButton.UpdateValue(position, Train->dsbSwitch); + } + else if (Command.action == GLFW_RELEASE && Train->mvOccupied->HeatingSwitchImpulse) + { + Train->ggTrainHeatingButton.UpdateValue(0.0, Train->dsbSwitch); } } @@ -7841,16 +7892,10 @@ void TTrain::OnCommand_hornlowactivate(TTrain *Train, command_data const &Comman if (Command.action == GLFW_PRESS) { // only need to react to press, sound will continue until stopped - if (false == TestFlag(Train->mvOccupied->WarningSignal, 1)) + if (false == TestFlag(Train->mvOccupied->WarningSignal, horn::low)) { // turn on - Train->mvOccupied->WarningSignal |= 1; - /* - if( true == TestFlag( Train->mvOccupied->WarningSignal, 2 ) ) { - // low and high horn are treated as mutually exclusive - Train->mvControlled->WarningSignal &= ~2; - } - */ + Train->mvOccupied->WarningSignal = horn::pressed(Train->mvOccupied->WarningSignal, horn::low, Train->has_single_horn_lever()); // visual feedback Train->ggHornButton.UpdateValue(-1.0); Train->ggHornLowButton.UpdateValue(1.0); @@ -7859,13 +7904,13 @@ void TTrain::OnCommand_hornlowactivate(TTrain *Train, command_data const &Comman else if (Command.action == GLFW_RELEASE) { // turn off - /* - // NOTE: we turn off both low and high horn, due to unreliability of release event when shift key is involved - Train->mvOccupied->WarningSignal &= ~( 1 | 2 ); - */ - Train->mvOccupied->WarningSignal &= ~1; + Train->mvOccupied->WarningSignal = horn::released(Train->mvOccupied->WarningSignal, horn::low); // visual feedback - Train->ggHornButton.UpdateValue(0.0); + if (false == (Train->has_single_horn_lever() && TestFlag(Train->mvOccupied->WarningSignal, horn::high))) + { + // leave the single lever alone if it was moved to the other tone in the meantime + Train->ggHornButton.UpdateValue(0.0); + } Train->ggHornLowButton.UpdateValue(0.0); } } @@ -7885,16 +7930,10 @@ void TTrain::OnCommand_hornhighactivate(TTrain *Train, command_data const &Comma if (Command.action == GLFW_PRESS) { // only need to react to press, sound will continue until stopped - if (false == TestFlag(Train->mvOccupied->WarningSignal, 2)) + if (false == TestFlag(Train->mvOccupied->WarningSignal, horn::high)) { // turn on - Train->mvOccupied->WarningSignal |= 2; - /* - if( true == TestFlag( Train->mvOccupied->WarningSignal, 1 ) ) { - // low and high horn are treated as mutually exclusive - Train->mvControlled->WarningSignal &= ~1; - } - */ + Train->mvOccupied->WarningSignal = horn::pressed(Train->mvOccupied->WarningSignal, horn::high, Train->has_single_horn_lever()); // visual feedback Train->ggHornButton.UpdateValue(1.0); Train->ggHornHighButton.UpdateValue(1.0); @@ -7903,13 +7942,13 @@ void TTrain::OnCommand_hornhighactivate(TTrain *Train, command_data const &Comma else if (Command.action == GLFW_RELEASE) { // turn off - /* - // NOTE: we turn off both low and high horn, due to unreliability of release event when shift key is involved - Train->mvOccupied->WarningSignal &= ~( 1 | 2 ); - */ - Train->mvOccupied->WarningSignal &= ~2; + Train->mvOccupied->WarningSignal = horn::released(Train->mvOccupied->WarningSignal, horn::high); // visual feedback - Train->ggHornButton.UpdateValue(0.0); + if (false == (Train->has_single_horn_lever() && TestFlag(Train->mvOccupied->WarningSignal, horn::low))) + { + // leave the single lever alone if it was moved to the other tone in the meantime + Train->ggHornButton.UpdateValue(0.0); + } Train->ggHornHighButton.UpdateValue(0.0); } } @@ -7953,12 +7992,7 @@ void TTrain::OnCommand_radiotoggle(TTrain *Train, command_data const &Command) return; } - // NOTE: we ignore the lack of 3d model to allow system reset after receiving radio-stop signal - /* - if( false == Train->m_controlmapper.contains( "radio_sw:" ) ) { - return; - } - */ + // NOTE: works without the switch in the 3d model too, to allow system reset after receiving radio-stop signal // only reacting to press, so the sound can loop uninterrupted if (false == Train->mvOccupied->Radio) { @@ -8003,9 +8037,13 @@ void TTrain::OnCommand_radiochannelincrease(TTrain *Train, command_data const &C if (Command.action == GLFW_PRESS) { - command_data newCommand = Command; - newCommand.param1 = Train->RadioChannel() + 1; - OnCommand_radiochannelset(Train, newCommand); + // the channel buttons of a radio switched off or without power do nothing + if (Train->mvOccupied->RadioPowered()) + { + command_data newCommand = Command; + newCommand.param1 = Train->RadioChannel() + 1; + OnCommand_radiochannelset(Train, newCommand); + } Train->ggRadioChannelNext.UpdateValue(1.0); } @@ -8021,9 +8059,12 @@ void TTrain::OnCommand_radiochanneldecrease(TTrain *Train, command_data const &C if (Command.action == GLFW_PRESS) { - command_data newCommand = Command; - newCommand.param1 = Train->RadioChannel() - 1; - OnCommand_radiochannelset(Train, newCommand); + if (Train->mvOccupied->RadioPowered()) + { + command_data newCommand = Command; + newCommand.param1 = Train->RadioChannel() - 1; + OnCommand_radiochannelset(Train, newCommand); + } Train->ggRadioChannelPrevious.UpdateValue(1.0); } @@ -8049,7 +8090,7 @@ void TTrain::OnCommand_radiostopsend(TTrain *Train, command_data const &Command) if (Command.action == GLFW_PRESS) { - if (true == Train->mvOccupied->Radio && (Train->mvOccupied->Power24vIsAvailable || Train->mvOccupied->Power110vIsAvailable)) + if (Train->mvOccupied->RadioPowered()) { simulation::Region->RadioStop(Train->Dynamic()->GetPosition()); } @@ -8067,7 +8108,7 @@ void TTrain::OnCommand_radiostopenable(TTrain *Train, command_data const &Comman { if (Command.action == GLFW_PRESS && Train->ggRadioStop.GetValue() == 0) { - if (true == Train->mvOccupied->Radio && (Train->mvOccupied->Power24vIsAvailable || Train->mvOccupied->Power110vIsAvailable)) + if (Train->mvOccupied->RadioPowered()) { simulation::Region->RadioStop(Train->Dynamic()->GetPosition()); } @@ -8090,7 +8131,7 @@ void TTrain::OnCommand_radiostoptest(TTrain *Train, command_data const &Command) if (Command.action == GLFW_PRESS) { - if (Train->RadioChannel() == 10 && true == Train->mvOccupied->Radio && (Train->mvOccupied->Power24vIsAvailable || Train->mvOccupied->Power110vIsAvailable)) + if (Train->RadioChannel() == 10 && Train->mvOccupied->RadioPowered()) { Train->Dynamic()->RadioStop(); } @@ -8108,7 +8149,7 @@ void TTrain::OnCommand_radiocall1send(TTrain *Train, command_data const &Command { if (Command.action == GLFW_PRESS) { - if (Train->RadioChannel() != 10 && true == Train->mvOccupied->Radio && (Train->mvOccupied->Power24vIsAvailable || Train->mvOccupied->Power110vIsAvailable)) + if (Train->RadioChannel() != 10 && Train->mvOccupied->RadioPowered()) { simulation::Events.queue_receivers(radio_message::call1, Train->Dynamic()->GetPosition()); } @@ -8127,7 +8168,7 @@ void TTrain::OnCommand_radiocall3send(TTrain *Train, command_data const &Command if (Command.action == GLFW_PRESS) { - if (Train->RadioChannel() != 10 && true == Train->mvOccupied->Radio && (Train->mvOccupied->Power24vIsAvailable || Train->mvOccupied->Power110vIsAvailable)) + if (Train->RadioChannel() != 10 && Train->mvOccupied->RadioPowered()) { simulation::Events.queue_receivers(radio_message::call3, Train->Dynamic()->GetPosition()); } @@ -8146,9 +8187,13 @@ void TTrain::OnCommand_radiovolumeincrease(TTrain *Train, command_data const &Co if (Command.action == GLFW_PRESS) { - command_data newCommand = Command; - newCommand.param1 = Train->m_radiovolume + 0.125; - OnCommand_radiovolumeset(Train, newCommand); + // so do the volume buttons + if (Train->mvOccupied->RadioPowered()) + { + command_data newCommand = Command; + newCommand.param1 = Train->m_radiovolume + 0.125; + OnCommand_radiovolumeset(Train, newCommand); + } Train->ggRadioVolumeNext.UpdateValue(1.0); } else if (Command.action == GLFW_RELEASE) @@ -8163,9 +8208,12 @@ void TTrain::OnCommand_radiovolumedecrease(TTrain *Train, command_data const &Co if (Command.action == GLFW_PRESS) { - command_data newCommand = Command; - newCommand.param1 = Train->m_radiovolume - 0.125; - OnCommand_radiovolumeset(Train, newCommand); + if (Train->mvOccupied->RadioPowered()) + { + command_data newCommand = Command; + newCommand.param1 = Train->m_radiovolume - 0.125; + OnCommand_radiovolumeset(Train, newCommand); + } Train->ggRadioVolumePrevious.UpdateValue(1.0); } else if (Command.action == GLFW_RELEASE) @@ -8931,9 +8979,9 @@ bool TTrain::Update(double const Deltatime) btLampkaOpory.Turn(mvControlled->StLinFlag && mvControlled->ResistorsFlagCheck()); btLampkaBezoporowa.Turn(mvControlled->ResistorsFlagCheck() || mvControlled->MainCtrlActualPos == 0); // do EU04 - btLampkaStyczn.Turn(!mvControlled->StLinFlag && !mvControlled->ControlPressureSwitch && mvControlled->BrakePress < 1.0); // mozna prowadzic rozruch - btLampkaPrzekRozn.Turn(!mvControlled->GroundRelay && !mvControlled->ControlPressureSwitch && mvControlled->BrakePress < 1.0); // relay is off and needs a reset - btLampkaNadmSil.Turn(mvControlled->FuseFlagCheck() && !mvControlled->ControlPressureSwitch && mvControlled->BrakePress < 1.0); // relay is off and needs a reset + btLampkaStyczn.Turn(mvControlled->LineContactorsLampLit()); // mozna prowadzic rozruch + btLampkaPrzekRozn.Turn(!mvControlled->GroundRelay && mvControlled->MainCircuitLampsEnabled()); // relay is off and needs a reset + btLampkaNadmSil.Turn(mvControlled->FuseFlagCheck() && mvControlled->MainCircuitLampsEnabled()); // relay is off and needs a reset btLampkaUkrotnienie.Turn(TestFlag(mvControlled->Couplers[mvControlled->CabOccupied == 1 ? rear : front].CouplingFlag, control)); btLampkaHamPosp.Turn(TestFlag(mvOccupied->Hamulec->GetBrakeStatus(), 1)); // lampka drugiego stopnia hamowania // TODO: youBy wyciągnąć flagę wysokiego stopnia @@ -9180,14 +9228,7 @@ bool TTrain::Update(double const Deltatime) btLampkaOporyB.Turn(mover->ResistorsFlagCheck()); btLampkaBezoporowaB.Turn(true == mover->ResistorsFlagCheck() || mover->MainCtrlActualPos == 0); // do EU04 - if (mover->StLinFlag || mover->ControlPressureSwitch) - { - btLampkaStycznB.Turn(false); - } - else if (mover->BrakePress < 1.0) - { - btLampkaStycznB.Turn(true); // mozna prowadzic rozruch - } + btLampkaStycznB.Turn(mover->LineContactorsLampLit()); // mozna prowadzic rozruch // hunter-271211: sygnalizacja poslizgu w pierwszym pojezdzie, gdy wystapi w drugim if (mover->SlippingWheels) { @@ -9583,6 +9624,7 @@ bool TTrain::Update(double const Deltatime) ggWaterCircuitsLinkButton.Update(); ggFuelPumpButton.Update(); ggOilPumpButton.Update(); + ggOilFuelPumpButton.Update(); ggMotorBlowersFrontButton.Update(); ggMotorBlowersRearButton.Update(); ggMotorBlowersAllOffButton.Update(); @@ -10106,7 +10148,7 @@ void TTrain::update_sounds_radio() std::erase_if(m_radiomessages, [](auto const &source) { return false == source.second->is_playing(); }); } // adjust audibility of remaining messages based on current radio conditions - auto const radioenabled{true == mvOccupied->Radio && (mvOccupied->Power24vIsAvailable || mvOccupied->Power110vIsAvailable)}; + auto const radioenabled{mvOccupied->RadioPowered()}; for (auto const &[messagechannel, messagesound] : m_radiomessages) { auto const volume{true == radioenabled && Dynamic()->Mechanik != nullptr && messagechannel == RadioChannel() ? m_radiovolume : 0.0}; @@ -10893,7 +10935,7 @@ void TTrain::radio_message(sound_source *Message, int const Channel) m_radiomessages.emplace_back(Channel, std::make_shared(m_radiosound)); // assign sound to the template and play it auto &message = *m_radiomessages.back().second.get(); - auto const radioenabled{true == mvOccupied->Radio && (mvOccupied->Power24vIsAvailable || mvOccupied->Power110vIsAvailable)}; + auto const radioenabled{mvOccupied->RadioPowered()}; auto const volume{true == radioenabled && Dynamic()->Mechanik != nullptr && Channel == RadioChannel() ? 1.0 : 0.0}; message.copy_sounds(*Message).gain(static_cast(volume)).play(); } @@ -11081,6 +11123,7 @@ void TTrain::clear_cab_controls() ggWaterCircuitsLinkButton.Clear(); ggFuelPumpButton.Clear(); ggOilPumpButton.Clear(); + ggOilFuelPumpButton.Clear(); ggMotorBlowersFrontButton.Clear(); ggMotorBlowersRearButton.Clear(); ggMotorBlowersAllOffButton.Clear(); @@ -11362,7 +11405,7 @@ void TTrain::set_cab_controls(int const Cab) ggDoorStepButton.PutValue(mvOccupied->Doors.step_enabled ? 1.f : 0.f); } // heating - if (false == ggTrainHeatingButton.is_push()) + if (false == ggTrainHeatingButton.is_push() && false == mvOccupied->HeatingSwitchImpulse) { ggTrainHeatingButton.PutValue(mvControlled->Heating ? 1.f : 0.f); } @@ -11415,6 +11458,11 @@ void TTrain::set_cab_controls(int const Cab) { ggOilPumpButton.PutValue(mvControlled->OilPump.is_enabled ? 1.f : 0.f); } + // joint oil and fuel pump + if (ggOilFuelPumpButton.type() != TGaugeType::push) + { + ggOilFuelPumpButton.PutValue(mvControlled->OilFuelPumpsEnabled() ? 1.f : 0.f); + } // traction motor fans if (ggMotorBlowersFrontButton.type() != TGaugeType::push) { @@ -11742,6 +11790,7 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con {"watercircuitslink_sw:", ggWaterCircuitsLinkButton}, {"fuelpump_sw:", ggFuelPumpButton}, {"oilpump_sw:", ggOilPumpButton}, + {"oilfuelpump_sw:", ggOilFuelPumpButton}, {"oilpressb:", ggOilPressB}, {"motorblowersfront_sw:", ggMotorBlowersFrontButton}, {"motorblowersrear_sw:", ggMotorBlowersRearButton}, diff --git a/vehicle/Train.h b/vehicle/Train.h index 4fc11dc2c..009b349b4 100644 --- a/vehicle/Train.h +++ b/vehicle/Train.h @@ -195,6 +195,9 @@ class TTrain { bool initialize_button(cParser &Parser, std::string const &Label, int const Cabindex); // helper, returns true for EMU with oerlikon brake bool is_eztoer() const; + // helper, returns true if both horn tones are operated with the same lever, without separate low and high tone buttons + bool has_single_horn_lever() const { + return ggHornButton.SubModel != nullptr && ggHornLowButton.SubModel == nullptr && ggHornHighButton.SubModel == nullptr; } // locates nearest vehicle belonging to the consist TDynamicObject *find_nearest_consist_vehicle(bool freefly, glm::vec3 pos) const; // mover master controller to specified position @@ -339,6 +342,7 @@ class TTrain { static void OnCommand_fuelpumpenable( TTrain *Train, command_data const &Command ); static void OnCommand_fuelpumpdisable( TTrain *Train, command_data const &Command ); static void OnCommand_oilpumptoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_oilfuelpumptoggle( TTrain *Train, command_data const &Command ); static void OnCommand_oilpumpenable( TTrain *Train, command_data const &Command ); static void OnCommand_oilpumpdisable( TTrain *Train, command_data const &Command ); static void OnCommand_waterheaterbreakertoggle( TTrain *Train, command_data const &Command ); @@ -692,7 +696,8 @@ public: // reszta może by?publiczna TGauge ggWaterHeaterButton; // water heater switch TGauge ggWaterCircuitsLinkButton; TGauge ggFuelPumpButton; // fuel pump switch - TGauge ggOilPumpButton; // fuel pump switch + TGauge ggOilPumpButton; // oil pump switch + TGauge ggOilFuelPumpButton; // joint oil and fuel pump switch TGauge ggMotorBlowersFrontButton; // front traction motor fan switch TGauge ggMotorBlowersRearButton; // rear traction motor fan switch TGauge ggMotorBlowersAllOffButton; // motor fans shutdown switch diff --git a/vehicle/gaugepositions.h b/vehicle/gaugepositions.h new file mode 100644 index 000000000..fc82ed44b --- /dev/null +++ b/vehicle/gaugepositions.h @@ -0,0 +1,35 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include + +// positions of a cab control which have sounds of their own +namespace gauge_positions { + +// the entry of the last position of Positions the control reached on its way from the Previous to the Desired value, +// both in hundredths of a position, or Positions.end() if it reached none: a lever moved smoothly passes the +// positions rather than stops at them, and should sound each one it gets to +template +typename std::map::iterator last_reached(std::map &Positions, int const Previous, int const Desired) { + auto reached{Positions.end()}; + for (auto position{Positions.begin()}; position != Positions.end(); ++position) { + auto const at{position->first * 100}; + if (Desired > Previous && at > Previous && at <= Desired) { + reached = position; // moving up, the last one in the ascending order is the one reached last + } + else if (Desired < Previous && at < Previous && at >= Desired) { + return position; // moving down, the first one is + } + } + return reached; +} + +} // namespace gauge_positions diff --git a/vehicle/horn.cpp b/vehicle/horn.cpp new file mode 100644 index 000000000..006274bb9 --- /dev/null +++ b/vehicle/horn.cpp @@ -0,0 +1,24 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "vehicle/horn.h" + +namespace horn { + +int pressed(int const Signal, int const Tone, bool const Singlelever) { + auto const other{Tone == low ? high : low}; + return (Signal | Tone) & (Singlelever ? ~other : ~0); +} + +int released(int const Signal, int const Tone) { + return Signal & ~Tone; +} + +} // namespace horn diff --git a/vehicle/horn.h b/vehicle/horn.h new file mode 100644 index 000000000..615db2f1b --- /dev/null +++ b/vehicle/horn.h @@ -0,0 +1,24 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +// the horn controls of the cab, on the WarningSignal bits of the vehicle (1: low tone, 2: high tone) +namespace horn { + +int const low{1}; +int const high{2}; + +// the signal after the key or button of the Tone is pressed. a single lever for both tones, without +// separate buttons for them, can't sound both tones at once +int pressed(int Signal, int Tone, bool Singlelever); +// the signal after the key or button of the Tone is released +int released(int Signal, int Tone); + +} // namespace horn diff --git a/vehicle/mirrors.h b/vehicle/mirrors.h new file mode 100644 index 000000000..cf3735541 --- /dev/null +++ b/vehicle/mirrors.h @@ -0,0 +1,44 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +// the mirrors of a vehicle, unfolded on the side of the open doors and folded at speed +namespace mirror_moves { + +enum class event { + none, + unfolding, + folding +}; + +// the move of a mirror from one update to the next. a mirror sounds as it sets off, unfolding or folding, not on +// every update it keeps moving the same way +struct motion { + int direction{0}; // of the last update: +1 unfolding, -1 folding, 0 standing + + // the event the Change of the mirror position (0: folded, 1: unfolded) since the last update starts, if any + event update(double const Change) { + auto now{0}; + if (Change > 0.0) { + now = 1; + } + else if (Change < 0.0) { + now = -1; + } + auto const setsoff{now != 0 && now != direction}; + direction = now; + if (false == setsoff) { + return event::none; + } + return now > 0 ? event::unfolding : event::folding; + } +}; + +} // namespace mirror_moves diff --git a/vr/openvr_imp.cpp b/vr/openvr_imp.cpp index 088fd5b58..15467d006 100644 --- a/vr/openvr_imp.cpp +++ b/vr/openvr_imp.cpp @@ -474,6 +474,9 @@ std::unordered_map vr_openvr::m_buttonb { "oilpump_sw:", { user_command::oilpumptoggle, user_command::none } }, + { "oilfuelpump_sw:", { + user_command::oilfuelpumptoggle, + user_command::none } }, { "motorblowersfront_sw:", { user_command::motorblowerstogglefront, user_command::none } }, From 823807201c7b1c8512fff2c45aaf23dbf062ab9e Mon Sep 17 00:00:00 2001 From: Sebastian Krzyszkowiak Date: Sun, 1 Nov 2026 13:40:57 +0100 Subject: [PATCH 237/430] Fix driver UI "mode windows" menu (#226) Make the keyboard shortcuts match the actually used ones and check the correct panels for is_open. --- application/driveruilayer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/driveruilayer.cpp b/application/driveruilayer.cpp index 569ade337..0b7b0dc46 100644 --- a/application/driveruilayer.cpp +++ b/application/driveruilayer.cpp @@ -74,9 +74,9 @@ void driver_ui::render_menu_contents() if (ImGui::BeginMenu(STR_C("Mode windows"))) { ImGui::MenuItem(m_aidpanel.title.c_str(), "F1", &m_aidpanel.is_open); - ImGui::MenuItem(m_scenariopanel.title.c_str(), "F1", &m_aidpanel.is_open); ImGui::MenuItem(STR_C("Timetable"), "F2", &m_timetablepanel.is_open); - ImGui::MenuItem(m_debugpanel.name().c_str(), "F12", &m_debugpanel.is_open); + ImGui::MenuItem(m_scenariopanel.title.c_str(), "F3", &m_scenariopanel.is_open); + ImGui::MenuItem(m_debugpanel.name().c_str(), "Shift+F12", &m_debugpanel.is_open); ImGui::MenuItem(m_mappanel.name().c_str(), "Tab", &m_mappanel.is_open); ImGui::MenuItem(m_vehiclelist.name().c_str(), nullptr, &m_vehiclelist.is_open); ImGui::MenuItem(m_trainingcardpanel.name().c_str(), nullptr, &m_trainingcardpanel.is_open); From a68c535be9e3338306881576be4b115f5f87b0a6 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 1 Nov 2026 20:12:33 +0100 Subject: [PATCH 238/430] fix(track): the cab keeps the shake a track doesn't replace, and the editor redraws all that an edit changes The side sway from the lateral acceleration now goes off only on a track with a sideways value, and the random jolts on one with a vertical or a sideways value. Dips at the rail joints and cross level alone replace neither. On a switch it goes by the path set and what its joined tracks allow. An edit in the editor also rebuilds the other switches of a joined group with the tracks they meet, and the tracks of a rail run whose joints moved. Removing a track does the same. While dragging, the tracks further off wait until the drag ends. The clatter of a bogie's axles was right: the followers stand at the pivots and the offsets are the places of the wheel sets. The misleading name goes. Also what Sonar had left: a parameter as a span, a const method, a struct and its member apart, commented out code, and a function of the grading tool split, with the same output. --- application/editormode.h | 1 + application/editormodetrack.cpp | 6 ++++-- editor/editorTrack.cpp | 22 +++++++++++++++---- editor/editorTrack.hpp | 5 ++++- tests/unit/test_track_uneven.cpp | 22 +++++++++++++++++++ tools/track_uneven_grade.py | 25 ++++++++++++++------- track_uneven_doc.md | 6 +++--- vehicle/DynObj.cpp | 18 ++++++++-------- world/Segment.h | 3 ++- world/Track.cpp | 5 ++++- world/Track.h | 11 ++++++++-- world/TrackUneven.cpp | 37 ++++++++++++++++++++++++++++++-- world/TrackUneven.h | 12 +++++++++++ 13 files changed, 140 insertions(+), 33 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index c7dbd3911..4b395ae68 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -639,6 +639,7 @@ class editor_mode : public application_mode, private editor_track::observer glm::mat4 m_track_gizmo{1.0f}; bool m_track_gizmo_using{false}; bool m_track_dirty{false}; + bool m_track_drag_on_the_way{false}; // committed, but not as the end of the drag std::chrono::steady_clock::time_point m_track_last_commit; editor_track::state m_track_field_before; std::array, 3> m_track_materials{}; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 0ae732d86..2523929d8 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -442,12 +442,14 @@ void editor_mode::render_track_gizmo() void editor_mode::commit_track_drag(bool const Force) { - if (false == m_track_dirty || m_track_drag.empty()) + // on letting go the rest of what follows the dragged tracks is yet to come, even with all of the drag committed + if ((false == m_track_dirty && false == (Force && m_track_drag_on_the_way)) || m_track_drag.empty()) return; auto const now = std::chrono::steady_clock::now(); if (false == Force && now - m_track_last_commit < std::chrono::milliseconds(100)) return; - editor_track::commit(m_track_drag); + editor_track::commit(m_track_drag, false == Force); + m_track_drag_on_the_way = false == Force; m_track_dirty = false; m_track_last_commit = now; } diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index b70501747..8e6339913 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -426,7 +426,7 @@ bool editor_track::can_edit_geometry(TTrack const &Track, std::string &Reason) return true; } -void editor_track::commit(std::vector const &Tracks) +void editor_track::commit(std::vector const &Tracks, bool const Dragging) { if (Tracks.empty()) return; @@ -457,6 +457,8 @@ void editor_track::commit(std::vector const &Tracks) add_unique(affected, neighbour); for (auto *track : affected) update_transition(*track); + if (false == Dragging) + add_followers(affected); for (auto *track : affected) rebuild_geometry(*track); for (auto *track : Tracks) @@ -478,6 +480,7 @@ void editor_track::commit_parameters(TTrack &Track) add_unique(affected, neighbour); for (auto *track : affected) update_transition(*track); + add_followers(affected); for (auto *track : affected) rebuild_geometry(*track); Track.mark_dirty(); @@ -2819,14 +2822,25 @@ void editor_track::retire(TTrack &Track) simulation::Region->erase_and_unregister(&Track); Track.m_editorremoved = true; for (auto *neighbour : adjoining) - { update_transition(*neighbour); - rebuild_geometry(*neighbour); - } + auto affected{adjoining}; + add_followers(affected); + for (auto *track : affected) + rebuild_geometry(*track); if (s_observer != nullptr) s_observer->track_retired(Track); } +void editor_track::add_followers(std::vector &Tracks) +{ + ++TTrack::s_layoutstamp; + for (auto *track : TTrack::switch_followers(Tracks)) + add_unique(Tracks, track); + for (auto *track : simulation::Paths.sequence()) + if (false == track->m_editorremoved && track->rail_joints_moved()) + add_unique(Tracks, track); +} + void editor_track::rebuild_geometry(TTrack &Track) { auto §ion{simulation::Region->section(Track.location())}; diff --git a/editor/editorTrack.hpp b/editor/editorTrack.hpp index 14f9e9a40..efb5fdac9 100644 --- a/editor/editorTrack.hpp +++ b/editor/editorTrack.hpp @@ -93,7 +93,8 @@ class editor_track static bool can_edit_geometry(TTrack const &Track, std::string &Reason); static bool is_supported(TTrack const &Track); - static void commit(std::vector const &Tracks); + // Dragging: on the way, what follows them from further off waits for the commit at the end of it + static void commit(std::vector const &Tracks, bool const Dragging = false); static void commit_parameters(TTrack &Track); static glm::dvec3 point_position(TTrack const &Track, point_ref const &Point); @@ -350,6 +351,8 @@ class editor_track static void bind_switch_path(TTrack &Switch, int const Path); static void store_switch_path(TTrack &Switch, int const Path); static void rebuild_geometry(TTrack &Track); + // adds the tracks whose shape goes by a change of the given from further off: by the switches they meet, and by rail joints running on through them + static void add_followers(std::vector &Tracks); static TTrack *clone(TTrack const &Template); static TTrack *load_text(std::string const &Text, TTrack const *Template, std::string const &Name); static void move_straight(straight const &Line, glm::dvec3 const &Start, glm::dvec3 const &End, std::function const &Member); diff --git a/tests/unit/test_track_uneven.cpp b/tests/unit/test_track_uneven.cpp index 06f4663b0..b55de1644 100644 --- a/tests/unit/test_track_uneven.cpp +++ b/tests/unit/test_track_uneven.cpp @@ -38,6 +38,28 @@ void add_chord(std::vector &Output, std::vector const &Line, int } // namespace +TEST_CASE("uneven track: the cab keeps what the ride on the track doesn't stand in for") +{ + auto const replaced = [](double const Up, double const Side, double const Cross) { + return track_uneven::replaced_shake({Up, Side, Cross}); + }; + // all of it, as "uneven 18" + CHECK(replaced(18.0, 18.0, 18.0).sway); + CHECK(replaced(18.0, 18.0, 18.0).jolts); + // nothing at all, as on a track with dips at its joints alone + CHECK_FALSE(replaced(0.0, 0.0, 0.0).sway); + CHECK_FALSE(replaced(0.0, 0.0, 0.0).jolts); + // up and down only: there is nothing to sway with + CHECK_FALSE(replaced(18.0, 0.0, 0.0).sway); + CHECK(replaced(18.0, 0.0, 0.0).jolts); + // sideways only + CHECK(replaced(0.0, 18.0, 0.0).sway); + CHECK(replaced(0.0, 18.0, 0.0).jolts); + // cross level only turns the body + CHECK_FALSE(replaced(0.0, 0.0, 18.0).sway); + CHECK_FALSE(replaced(0.0, 0.0, 18.0).jolts); +} + TEST_CASE("uneven track: measures as the Id-14 limits for its value") { // appendix 1, class C at 80 km/h: 18 mm vertically, 17 mm sideways, 16 mm of twist on 5 m, gauge +10/-8 mm, 20 mm of cross level, J = 5.3 diff --git a/tools/track_uneven_grade.py b/tools/track_uneven_grade.py index 1994559d0..81df2ce2a 100644 --- a/tools/track_uneven_grade.py +++ b/tools/track_uneven_grade.py @@ -261,20 +261,29 @@ def plain_neighbours(t, joints): return [other for key in ("p1", "p2") for other, _, _ in joints.at(t["paths"][0][key]) if other is not t and other["kind"] == "normal"] +def joined_at(t, point, joints, seen): + # the plain tracks joined at a point, and the far ends of the straight paths of the switches joined there + plain, further = [], [] + for other, part, side in joints.at(point): + if other is t or id(part) in seen: + continue + seen.add(id(part)) + if other["kind"] != "switch": + plain.append(other) + elif other["paths"].index(part) != other["bent"]: + further.append(part["p2" if side == "p1" else "p1"]) + return plain, further + + def plain_past_switches(t, point, joints): # the plain tracks reached from a point of a track along the straight paths of switches points, seen, found = [point], set(), [] for _ in range(6): onward = [] for reached in points: - for other, part, side in joints.at(reached): - if other is t or id(part) in seen: - continue - seen.add(id(part)) - if other["kind"] != "switch": - found.append(other) - elif other["paths"].index(part) != other["bent"]: - onward.append(part["p2" if side == "p1" else "p1"]) + plain, further = joined_at(t, reached, joints, seen) + found += plain + onward += further points = onward return found diff --git a/track_uneven_doc.md b/track_uneven_doc.md index 1c3163c50..e4822b971 100644 --- a/track_uneven_doc.md +++ b/track_uneven_doc.md @@ -69,12 +69,12 @@ The rails, the top of the ballast, `sleepermodel`, the axles, the roll of the bo Models from includes (e.g. switch drives and timbers), the terrain and the catenary don't follow it, so at large values a rail shifts away from such a model by a few centimetres. -On a track with unevenness the track itself shakes the cab, in place of two of the sources of shake that were there before. It goes by the track under the vehicle, and a track with only dips at its joints counts too. On tracks with no unevenness everything works as before. +On a track with unevenness the track itself shakes the cab, in place of two of the sources of shake that were there before, as far as it has something to put in their place. It goes by the track under the vehicle, and on a switch by the path set and what its joined tracks allow. Dips at the joints and cross level replace nothing, as they don't shake the cab all the way along or sideways. On tracks with no unevenness everything works as before. | source of the cab shake | on a track with unevenness | |--------------------------------------------------------------------|----------------------------| -| side sway from the lateral acceleration: curve radius and cant, jolts sideways on a damaged switch | off | -| random jolts over 25 km/h | off | +| side sway from the lateral acceleration: curve radius and cant, jolts sideways on a damaged switch | off with a sideways value | +| random jolts over 25 km/h | off with a vertical or a sideways value | | the track itself, from the bend under the axles | added | | vertical jolts at the joints of a damaged track | stays | | fore and aft, when accelerating and braking | stays | diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index 305e12020..c4838395f 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -3381,7 +3381,6 @@ bool TDynamicObject::Update(double dt, double dt1) && MoverParameters->eimc[eimc_p_abed] < 0.001) FzadED = 0; //pętla bezpieczeństwa - bez ED auto const FzadPN = Fzad - FrED * MoverParameters->MED_FrED_factor; - //np = 0; std::vector PrzekrF( np ); float nPrzekrF = 0; bool test = true; @@ -8019,12 +8018,12 @@ TDynamicObject::update_shake( double const Timedelta ) { shakevector *= 0; auto const iVel { std::min( GetVelocity(), 150.0 ) }; - // an uneven track shakes the cab by itself, in place of the sway drawn from the curve and the jolts drawn at random - auto const uneven { MyTrack != nullptr && MyTrack->is_uneven() }; + // an uneven track shakes the cab by itself, in place of the sway drawn from the curve and the jolts drawn at random, as far as it does + auto const replaced { track_uneven::replaced_shake( MyTrack != nullptr ? MyTrack->uneven_underway() : track_uneven::amounts {} ) }; if( iVel > 0.5 ) { // acceleration-driven base shake shakevector += glm::dvec3( - uneven ? 0.0 : -MoverParameters->AccN * Timedelta * 5.0 * Global.ShakingMultiplierRL, // highlight side sway + replaced.sway ? 0.0 : -MoverParameters->AccN * Timedelta * 5.0 * Global.ShakingMultiplierRL, // highlight side sway -MoverParameters->AccVert * Timedelta * Global.ShakingMultiplierUD, -MoverParameters->AccSVBased * Timedelta * 1.5 * Global.ShakingMultiplierBF); // accent acceleration/deceleration // unevenness of the track under the outer axles @@ -8037,7 +8036,7 @@ TDynamicObject::update_shake( double const Timedelta ) { auto shake { 1.25 * ShakeSpring.ComputateForces( shakevector, ShakeState.offset ) }; - if( false == uneven && LocalRandom( iVel ) > 25.0 ) { + if( false == replaced.jolts && LocalRandom( iVel ) > 25.0 ) { // extra shake at increased velocity shake += ShakeSpring.ComputateForces( glm::dvec3( @@ -8066,11 +8065,12 @@ TDynamicObject::update_shake( double const Timedelta ) { bool TDynamicObject::axle_passed_joint( axle_sounds &Axle, double const Move, int const Direction ) const { - // by the outer axle on its side of the vehicle: the two can be on different tracks - auto const &outer { Axle.offset >= 0.0 ? Axle0 : Axle1 }; - if( auto const railphase { outer.RailPhase( Axle.offset - std::copysign( 0.5 * fAxleDist, Axle.offset ) ) }; railphase >= 0.0 ) { + // from the follower on its side of the vehicle, as the two can be on different tracks. They stand fAxleDist apart, at the bogie pivots, and + // the offset of the axle is the place of its wheel set, so the two of a bogie come out half of ADist to either side of the pivot + auto const &follower { Axle.offset >= 0.0 ? Axle0 : Axle1 }; + if( auto const railphase { follower.RailPhase( Axle.offset - std::copysign( 0.5 * fAxleDist, Axle.offset ) ) }; railphase >= 0.0 ) { // the rails under the axle, which aren't always those under the track the vehicle is on - auto const passed { Axle.atjoints && std::abs( railphase - Axle.distance ) > 0.5 * outer.GetTrack()->fSoundDistance }; + auto const passed { Axle.atjoints && std::abs( railphase - Axle.distance ) > 0.5 * follower.GetTrack()->fSoundDistance }; Axle.distance = railphase; Axle.atjoints = true; return passed; diff --git a/world/Segment.h b/world/Segment.h index 099480e36..05522e602 100644 --- a/world/Segment.h +++ b/world/Segment.h @@ -59,7 +59,8 @@ class TSegment int path { 0 }; // which path of a switch // where the path meets the next one: the middle of their ends and their common vector across std::array>, 2> joints; - } m_setting; + }; + setting m_setting; double fLength { -1.0 }; // długość policzona std::vector fTsBuffer; // wartości parametru krzywej t dla równych odcinków s std::vector fTsSlope; // nachylenie dt/du (= dt/ds * fStep) w tych samych punktach diff --git a/world/Track.cpp b/world/Track.cpp index 49138b4eb..c9c7ae36d 100644 --- a/world/Track.cpp +++ b/world/Track.cpp @@ -1375,7 +1375,7 @@ glm::vec3 TTrack::get_nearest_point(const glm::dvec3 &point) const // wypełnianie tablic VBO void TTrack::rebuild_geometry( gfx::geometrybank_handle const &Bank ) { - ++s_layoutstamp; + m_drawnrun = {}; Geometry1.clear(); Geometry2.clear(); @@ -1392,6 +1392,9 @@ void TTrack::rebuild_geometry( gfx::geometrybank_handle const &Bank ) { void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { gfx::userdata_array empty_userdata; share_joints(); + if( rail_phase( 0.0 ) >= 0.0 ) { + m_drawnrun = m_railrun; + } // bake per-instance sleeper transforms now that the owning cell has assigned m_origin. // safe to call here even if the track has no sleepermodel (early-outs internally). if( m_sleeper_enabled && m_sleeper_local_transforms.empty() ) { diff --git a/world/Track.h b/world/Track.h index 72cbd8847..dc6be7412 100644 --- a/world/Track.h +++ b/world/Track.h @@ -348,6 +348,8 @@ public: // the unevenness the track declares, on a path of a switch track_uneven::amounts uneven_declared( int const Path = 0 ) const; bool is_uneven() const; + // the unevenness along what the vehicles take now: the path set on a switch, with what the switches joined and the tracks by them allow + track_uneven::amounts uneven_underway(); // the unevenness at a distance along a path, meeting the tracks joined at its ends track_uneven::amounts uneven_at( double const Distance, int const Path = 0 ); // how much of the displacement a point of the profile at the depth takes @@ -358,6 +360,10 @@ public: double joint_dip( double const Distance ); // m // distance from the rail joint behind; negative: the track has no joints that dip double rail_phase( double const Distance ); + // whether the rail joints are elsewhere than the geometry of the track has them + bool rail_joints_moved(); + // the uneven tracks whose values go by the switches among the given: all the switches joined to those, and the tracks they meet + static std::vector switch_followers( std::vector const &Tracks ); void ConnectionsLog(); bool DoubleSlip() const; static void fetch_default_profiles(); @@ -397,6 +403,7 @@ private: }; void settle_rail_run(); rail_run m_railrun; + rail_run m_drawnrun; // as the geometry has it; stamp -1: it has no joints that dip // the value along each path of a switch: the lowest of that path in the switches joined, 0 next to a track with none. // And at the ends of the paths, by what meets there: the other path at the common end, the path of a switch joined struct switch_stray { @@ -411,10 +418,10 @@ private: // the lowest value of the paths ending at the point track_uneven::amounts switch_paths_at( glm::dvec3 const &Point ) const; // what a plain track comes to at its end, where it meets the other one - track_uneven::amounts uneven_met( TTrack *Other, glm::dvec3 const &Point ); + track_uneven::amounts uneven_met( TTrack *Other, glm::dvec3 const &Point ) const; // the value of a switch where a track joined to it meets it track_uneven::amounts switch_uneven_at( glm::dvec3 const &Point ); - static int s_layoutstamp; // bumped when tracks are joined or changed, invalidates the two above + static int s_layoutstamp; // bumped when tracks are joined or changed, invalidates the two above. Once per change: a run is walked again after each void create_road_profile( gfx::vertex_array &Output, bool const Forcetransition = false ); void create_road_side_profile( gfx::vertex_array &Right, gfx::vertex_array &Left, gfx::vertex_array const &Road, bool const Forcetransition = false ); /// diff --git a/world/TrackUneven.cpp b/world/TrackUneven.cpp index 78505ac3a..10bf48d62 100644 --- a/world/TrackUneven.cpp +++ b/world/TrackUneven.cpp @@ -10,6 +10,8 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "world/Track.h" +#include + // The part of TTrack that goes with the unevenness of a track and with what it meets at its ends: joined tracks and switches. // The rules themselves are in TrackUneven.h, here they get applied to the tracks. @@ -64,7 +66,7 @@ void keep_to_plain_track( std::array &Values, TTrack c } // the value along each path: the lowest of that path in the group, 0 in a component that a plain track joined has none of -std::array group_path_values( std::vector const &Group ) { +std::array group_path_values( std::span const Group ) { std::array values { Group.front()->uneven_declared( 0 ), Group.front()->uneven_declared( 1 ) }; for( auto const *track : Group ) { @@ -173,6 +175,11 @@ bool TTrack::is_uneven() const { return any( uneven_declared( 0 ) ) || any( uneven_declared( 1 ) ) || joint_depth() > 0.0; } +track_uneven::amounts TTrack::uneven_underway() { + + return is_switch( this ) ? switch_uneven().paths[ SwitchExtension->CurrentIndex ] : uneven_declared(); +} + double TTrack::uneven_bed_share( double const Depth ) const { return track_uneven::bed_share( Depth, std::abs( track_rail_profile( m_profile1.second ).front().position.y ), fTexHeight1 ); @@ -187,7 +194,7 @@ track_uneven::amounts TTrack::uneven_at( double const Distance, int const Path ) return track_uneven::along( uneven_declared(), uneven_met( trPrev, end_point( *Segment, 0 ) ), uneven_met( trNext, end_point( *Segment, 1 ) ), Distance, Length() ); } -track_uneven::amounts TTrack::uneven_met( TTrack *Other, glm::dvec3 const &Point ) { +track_uneven::amounts TTrack::uneven_met( TTrack *Other, glm::dvec3 const &Point ) const { if( Other == nullptr ) { return {}; @@ -278,6 +285,32 @@ double TTrack::rail_phase( double const Distance ) { return track_uneven::rail_phase( m_railrun.origin + m_railrun.way * Distance, fSoundDistance ); } +bool TTrack::rail_joints_moved() { + + return m_drawnrun.stamp != -1 + && rail_phase( 0.0 ) >= 0.0 + && ( m_railrun.origin != m_drawnrun.origin || m_railrun.way != m_drawnrun.way ); +} + +std::vector TTrack::switch_followers( std::vector const &Tracks ) { + + std::vector followers; + auto const follow = [ &followers ]( TTrack *Track ) { + if( Track != nullptr && Track->is_uneven() && std::ranges::find( followers, Track ) == followers.end() ) { + followers.push_back( Track ); + } }; + for( auto *track : Tracks ) { + if( false == is_switch( track ) ) { + continue; + } + for( auto *member : switch_group( *track ) ) { + follow( member ); + std::ranges::for_each( joined_to_switch( *member ), follow ); + } + } + return followers; +} + void TTrack::settle_rail_run() { // the next track of the run past an end of a track, and which of its ends is joined there diff --git a/world/TrackUneven.h b/world/TrackUneven.h index 2c32ad660..8e0f07750 100644 --- a/world/TrackUneven.h +++ b/world/TrackUneven.h @@ -43,6 +43,18 @@ inline amounts least( amounts const &Left, amounts const &Right ) { return { std::min( Left.up, Right.up ), std::min( Left.side, Right.side ), std::min( Left.cross, Right.cross ) }; } +// which of the other sources of the cab shake the ride on a track stands in for +struct shake_sources { + bool sway { false }; // from the lateral acceleration + bool jolts { false }; // drawn at random +}; + +// sideways only with something going sideways. Cross level turns the body, and the dips at the joints come and go: neither makes up for any of them +inline shake_sources replaced_shake( amounts const &Amount ) { + + return { Amount.side > 0.0, Amount.up > 0.0 || Amount.side > 0.0 }; +} + struct wave { double x; double z; From 6b82f1471aaf38b7417f28c018aa3e1e958416fc Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Mon, 2 Nov 2026 12:36:11 +0100 Subject: [PATCH 239/430] AI braking: take power off when holding the speed uphill near a stop Within fMaxProximityDist of a stop, going uphill, the AI holds its speed with AccDesired = min(0, AccPreferred). control_tractive_force only cut the power uphill when AccDesired < 0, so an AccDesired of exactly 0 kept the controller where it was. A consist that came into that range under power kept full power and crept up to the signal. Holding the speed uphill on the way to a stop now asks for no speeding up: power comes off once the train is faster than AccDesired allows. With the current brake valves this rarely shows: on a 10 per mille climb, four real-time runs of 32 consists each, the E186 with 25 empty 408W drew power in 0-14 samples of the last 50 m before and 0-8 after, no overruns either way. It surfaced once the AI predicted the ESt3 brake closer to what the valve delivers, where the same train crept to 12 km/h from 40 m out and overran the signal; with this change it stopped short in all runs. --- vehicle/Driver.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 2c59ddcda..436cdb7f6 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -8099,7 +8099,9 @@ void TController::control_tractive_force() { } else if( velocity > VelDesired + SpeedCtrlMargin || ( fAccGravity < -0.01 ? - AccDesired < 0.0 : + AccDesired < 0.0 + // holding the speed uphill on the way to a stop asks for no speeding up + || ( VelNext == 0.0 && ActualProximityDist <= fMaxProximityDist && AbsAccS > AccDesired + 0.05 ) : AbsAccS > AccDesired + 10.05 ) || IsAnyCouplerStretched ) { // jak za bardzo przyspiesza albo prędkość przekroczona From 1f3cf4fe56ee33fe38accd7903eaee401cd2d2a7 Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Mon, 2 Nov 2026 16:02:06 +0100 Subject: [PATCH 240/430] AI braking: don't let the running brake test override a stop ahead adjust_desired_speed_for_braking_test runs after the target speed was worked out and overwrites AccDesired. In its third phase it holds the deceleration near fAccThreshold until the speed has dropped by 8 km/h. On a 20 per mille descent that application barely holds the speed, so the phase can last minutes, and a stop signal coming up meanwhile is ignored. In one real-time run an E186 with 19 container wagons started the test 1290 m before a stop signal, lost 7 km/h by the signal and overran it by 274 m after the emergency application. While the test runs the AI now uses whichever of the two asks for the harder braking: the test may brake harder than the route needs, never softer. Measured in real time, four runs of 32 consists each on a 20 per mille descent, on the flat and on the descent with half the rail adhesion: the test no longer runs within 600 m of a stop signal (before: down to 414 m on this branch, and 14 m with the overrun above in a build with other brake changes), no overruns, stops 8-15 m short of the signal 86, 117 and 83 of 128 (before 90, 117 and 78). --- vehicle/Driver.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 436cdb7f6..6d6c1532e 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -7927,6 +7927,10 @@ TController::adjust_desired_speed_for_braking_test() { if( false == AIControllFlag ) { return; } // TBD: add notification about braking test and enable it for human driver as well? auto const vel { DirectionalVel() }; + // what the route ahead asks for; the test may brake harder than that, never softer + auto const routeaccdesired { AccDesired }; + auto const routeaccdesiredgravity { fAccDesiredGravity }; + auto const routeveldesired { VelDesired }; switch( DynamicBrakeTest ) { case 0: { @@ -7993,6 +7997,14 @@ TController::adjust_desired_speed_for_braking_test() { break; } } + // a stop or a restriction coming up while the test runs takes precedence + if( ( DynamicBrakeTest >= 1 ) + && ( DynamicBrakeTest <= 3 ) + && ( routeaccdesired < AccDesired ) ) { + AccDesired = routeaccdesired; + fAccDesiredGravity = routeaccdesiredgravity; + VelDesired = std::min( VelDesired, routeveldesired ); + } } void From 18bc7e06bfe58a4efff593dc3245a27289605ed3 Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Mon, 2 Nov 2026 16:43:16 +0100 Subject: [PATCH 241/430] AI braking: move the uphill power-off check into its own function The condition added for holding the speed uphill near a stop pushed the cognitive complexity of control_tractive_force() to 26, over the 25 SonarCloud allows. It now lives in is_too_fast_uphill(); the behaviour is unchanged. --- vehicle/Driver.cpp | 13 ++++++++----- vehicle/Driver.h | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 6d6c1532e..2311ffacf 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -8110,11 +8110,7 @@ void TController::control_tractive_force() { cue_action( driver_hint::mastercontrollersetzerospeed ); } else if( velocity > VelDesired + SpeedCtrlMargin - || ( fAccGravity < -0.01 ? - AccDesired < 0.0 - // holding the speed uphill on the way to a stop asks for no speeding up - || ( VelNext == 0.0 && ActualProximityDist <= fMaxProximityDist && AbsAccS > AccDesired + 0.05 ) : - AbsAccS > AccDesired + 10.05 ) + || ( fAccGravity < -0.01 ? is_too_fast_uphill() : AbsAccS > AccDesired + 10.05 ) || IsAnyCouplerStretched ) { // jak za bardzo przyspiesza albo prędkość przekroczona // dodany wyjatek na "pelna w przod" @@ -8126,6 +8122,13 @@ void TController::control_tractive_force() { SpeedSet(); // ciągla regulacja prędkości } +bool TController::is_too_fast_uphill() const { + + if( AccDesired < 0.0 ) { return true; } + // holding the speed uphill on the way to a stop asks for no speeding up + return ( VelNext == 0.0 && ActualProximityDist <= fMaxProximityDist && AbsAccS > AccDesired + 0.05 ); +} + void TController::increase_tractive_force() { if( fActionTime < 0.0 ) { return; } // gdy jest nakaz poczekać z jazdą, to nie ruszać diff --git a/vehicle/Driver.h b/vehicle/Driver.h index af97b4a1e..11a01517f 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -358,6 +358,7 @@ private: void control_motor_connectors(); void control_tractive_force(); void increase_tractive_force(); + bool is_too_fast_uphill() const; void control_braking_force(); // how far short of a stop the AI aims: in train running the middle of the 8-15 m window before a signal, // otherwise (a W4 stop point, shunting, coupling) half the minimum proximity distance, as before From bb43f559e8ede590142d5383e4686e8d3d563f6c Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Mon, 2 Nov 2026 17:01:21 +0100 Subject: [PATCH 242/430] ESt3: spring preload, minimum stage, releaser time and AL2 timing Corrections to the TNESt3 distributor, checked against the ESt3 data and acceptance requirements (orange book tables 3-5, 3-7 and 3-9) and discussed with youBy: - The main control device settles at (control reservoir - pipe - 0.21) times the ratio instead of using a 0.05 bar offset. The 0.21 bar is the spring preload; without it the first stage came 0.2 bar of pipe drop too early. BVM is derived from the same offset, so a full service drop still gives MaxBP. - When the valve brakes it gives at least the minimum stage of 0.28 bar (acceptance tests 12 and 22 require 0.25-0.30 bar); when the target drops to zero the cylinder vents completely. - The automatic releaser vents the 15 l control reservoir from 5.0 to 0.4 bar in about 23 s (test 27: 23 +/- 3 s) instead of 5.6 s. - 12" cylinder fill nozzle dTN is 1.62, not 1.65 (typo). - With the AL2 relay the impulse chamber is 1 l and the cylinder nozzles are scaled so that the fill and release times meet table 3-9; before, the AL2 timings had been set by eye. On a valve test bench running the acceptance procedures, the number of results out of tolerance drops from 77 to 40. The remaining ones need parts that are not modelled yet (accelerator venting, ZP/ZS filling, intermediate chamber). --- McZapkie/Oerlikon_ESt.cpp | 44 +++++++++++++++++++++++++++++---------- McZapkie/Oerlikon_ESt.h | 1 + 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/McZapkie/Oerlikon_ESt.cpp b/McZapkie/Oerlikon_ESt.cpp index eb3a9ad4b..f37dc69f9 100644 --- a/McZapkie/Oerlikon_ESt.cpp +++ b/McZapkie/Oerlikon_ESt.cpp @@ -16,6 +16,11 @@ Copyright (C) 2007-2014 Maciej Cierniak #include "Oerlikon_ESt.h" #include "utilities/utilities.h" +// wstepny nacisk sprezyn na glowny przyrzad rozrzadczy, wyrazony jako roznica cisnien ZS - PG [bar] +static double const dPSprezyny = 0.21; +// najmniejszy stopien hamowania w cylindrze [bar] (tablica 3-9, proby 12 i 22: 0,25-0,30) +static double const pStopnia = 0.28; + double d2A( double const d ) { return d * d * 0.7854 / 1000.0; @@ -218,10 +223,11 @@ double TNESt3::GetPF( double const PP, double const dt, double const Vel ) // pr CheckReleaser(dt); // luzowanie + double const cel{ CelBCP( CVP, VVP ) }; if ((BrakeStatus & b_hld) == b_off) dV = PF(0.0, BCP, Nozzles[dTO] * nastG + (1.0 - nastG) * Nozzles[dOO]) - * dt * (0.1 + 4.9 * std::min(0.2, BCP - ((CVP - 0.05 - VVP) * BVM + 0.1))); + * dt * (0.1 + 4.9 * std::min(0.2, BCP - (cel > 0.0 ? cel + 0.1 : 0.0))); // bez stopnia luzuje do zera else dV = 0.0; // BrakeCyl.Flow(-dV); @@ -229,7 +235,7 @@ double TNESt3::GetPF( double const PP, double const dt, double const Vel ) // pr if ( (BrakeStatus & b_on) == b_on && Przekladniki[1]->P() * HBG300 < MaxBP ) dV = PF( BVP, BCP, Nozzles[dTN] * (nastG + 2.0 * (BCP < Podskok ? 1.0 : 0.0)) + Nozzles[dON] * (1.0 - nastG) ) - * dt * (0.1 + 4.9 * std::min( 0.2, (CVP - 0.05 - VVP) * BVM - BCP ) ); + * dt * (0.1 + 4.9 * std::min( 0.2, cel - BCP ) ); else dV = 0; // BrakeCyl.Flow(-dV); @@ -313,7 +319,7 @@ void TNESt3::Init( double const PP, double const HPP, double const LPP, double c Miedzypoj->CreateCap(5.0); Miedzypoj->CreatePress(PP); - BVM = 1.0 / (HPP - 0.05 - LPP) * MaxBP; + BVM = 1.0 / (HPP - dPSprezyny - LPP) * MaxBP; BrakeDelayFlag = BDF; @@ -345,6 +351,13 @@ double TNESt3::GetCRP() // return Miedzypoj.P; } +double TNESt3::CelBCP( double const CVP, double const VVP ) const // docelowe cisnienie w cylindrze +{ + double const cel{ ( CVP - dPSprezyny - VVP ) * BVM }; + // gdy zawor hamuje, nie daje mniej niz najmniejszy stopien + return ( cel > 0.0 ? std::max( cel, pStopnia ) : cel ); +} + void TNESt3::CheckState(double const BCP, double & /*dV1*/) // glowny przyrzad rozrzadczy { double const VVP{ ValveRes->P() }; @@ -355,14 +368,14 @@ void TNESt3::CheckState(double const BCP, double & /*dV1*/) // glowny przyrzad r Przys_blok = false; // sprawdzanie stanu - // if ((BrakeStatus and 1)=1)and(BCP>0.25)then - if (VVP + 0.01 + BCP / BVM < CVP - 0.05 && Przys_blok) + double const cel{ CelBCP( CVP, VVP ) }; + if (BCP < cel - 0.01 * BVM && Przys_blok) BrakeStatus |= b_on | b_hld; // hamowanie stopniowe; - else if (VVP - 0.01 + (BCP - 0.1) / BVM > CVP - 0.05) + else if (BCP - 0.1 > cel + 0.01 * BVM) BrakeStatus &= ~( b_on | b_hld ); // luzowanie; - else if (VVP + BCP / BVM > CVP - 0.05) + else if (BCP > cel) BrakeStatus &= ~b_on; // zatrzymanie napelaniania; - else if (VVP + (BCP - 0.1) / BVM < CVP - 0.05 && BCP > 0.25) // zatrzymanie luzowania + else if (BCP - 0.1 < cel && BCP > 0.25) // zatrzymanie luzowania BrakeStatus |= b_hld; if( ( BrakeStatus & b_hld ) == 0 ) @@ -391,7 +404,7 @@ void TNESt3::CheckReleaser(double const dt) // odluzniacz // odluzniacz automatyczny if ((BrakeStatus & b_rls) == b_rls) { - CntrlRes->Flow(PF(CVP, 0, 0.02) * dt); + CntrlRes->Flow(PF(CVP, 0, 0.0049) * dt); // ZS 15 l z 5,0 do 0,4 bar w 23 s (proba odbioru nr 27) if (CVP < VVP + 0.3 || false == autom) BrakeStatus &= ~b_rls; } @@ -560,7 +573,7 @@ void TNESt3::SetSize( int const size, std::string const ¶ms ) // ustawianie { // dON,dOO,dTN,dTO,dP,dS Nozzles[dON] = 3.7; Nozzles[dOO] = 2.50; - Nozzles[dTN] = 1.65; + Nozzles[dTN] = 1.62; Nozzles[dTO] = 1.39; Nozzles[dP] = 2.65; Nozzles[dPd] = 1.80; @@ -649,6 +662,14 @@ void TNESt3::SetSize( int const size, std::string const ¶ms ) // ustawianie Nozzles[dSd] = 1.1; Nozzles[dSm] = 0.9; + if( PrzekCiagly != nullptr ) { + // dysze cylindra skalibrowane na komore impulsowa przekladnika AL2 (1 l) wg czasow z tablicy 3-9 + Nozzles[dON] *= 0.914; + Nozzles[dTN] *= 0.885; + Nozzles[dOO] *= 0.82; + Nozzles[dTO] *= 0.8; + } + // przeliczanie z mm^2 na l/m for (auto &nozzle : Nozzles) { @@ -657,7 +678,8 @@ void TNESt3::SetSize( int const size, std::string const ¶ms ) // ustawianie for (int i = 1; i < 4; ++i) { Przekladniki[i]->BrakeRes = BrakeRes; - Przekladniki[i]->CreateCap(i); + // komora impulsowa przekladnika AL2 ma 1 l + Przekladniki[i]->CreateCap( ( Przekladniki[i] == PrzekCiagly ) ? 1.0 : i ); Przekladniki[i]->CreatePress(BrakeCyl->P()); if (i < 3) Przekladniki[i]->Next = Przekladniki[i + 1]; diff --git a/McZapkie/Oerlikon_ESt.h b/McZapkie/Oerlikon_ESt.h index 9cdffe7bc..01aefb7f2 100644 --- a/McZapkie/Oerlikon_ESt.h +++ b/McZapkie/Oerlikon_ESt.h @@ -196,6 +196,7 @@ class TNESt3 : public TBrake { void EStParams(double i_crc) const; // parametry charakterystyczne dla ESt double GetCRP() override; double GetRapidRatio(double const Vel) const override; + double CelBCP(double const CVP, double const VVP) const; // docelowe cisnienie w cylindrze void CheckState(double const BCP, double &dV1); // glowny przyrzad rozrzadczy void CheckReleaser(double const dt); // odluzniacz double CVs(double const BP) const; // napelniacz sterujacego From 6374e2d32e7ef00bb938d7b79763b1aae1d57779 Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Mon, 2 Nov 2026 17:01:32 +0100 Subject: [PATCH 243/430] AI braking: predict the ESt3 brake force from the distributor characteristic --- McZapkie/Mover.cpp | 1 + McZapkie/Oerlikon_ESt.cpp | 11 +++++++++++ McZapkie/Oerlikon_ESt.h | 1 + McZapkie/hamulce.h | 4 ++++ 4 files changed, 17 insertions(+) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 429c2df17..2b2275112 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -5091,6 +5091,7 @@ void TMoverParameters::ComputeTotalForce(double dt) double TMoverParameters::BrakeForceR(double ratio, double velocity) { double press = 0; + ratio = Hamulec->GetBrakeRatio(ratio); if (MBPM > 2) { press = MaxBrakePress[1] + (MaxBrakePress[3] - MaxBrakePress[1]) * std::min(1.0, (TotalMass - Mass) / (MBPM - Mass)); diff --git a/McZapkie/Oerlikon_ESt.cpp b/McZapkie/Oerlikon_ESt.cpp index f37dc69f9..1e7a5be66 100644 --- a/McZapkie/Oerlikon_ESt.cpp +++ b/McZapkie/Oerlikon_ESt.cpp @@ -351,6 +351,17 @@ double TNESt3::GetCRP() // return Miedzypoj.P; } +double TNESt3::GetBrakeRatio( double const Ratio ) const // udzial cisnienia w cylindrze dla udzialu spadku w PG +{ + if( MaxBP <= 0.0 || BVM <= 0.0 ) { + return Ratio; + } + // pelny spadek sluzbowy w PG (HPP - LPP), odtworzony z przelozenia + double const spadek{ MaxBP / BVM + dPSprezyny }; + double const cel{ ( Ratio * spadek - dPSprezyny ) * BVM }; + return ( cel > 0.0 ? std::max( cel, pStopnia ) / MaxBP : 0.0 ); +} + double TNESt3::CelBCP( double const CVP, double const VVP ) const // docelowe cisnienie w cylindrze { double const cel{ ( CVP - dPSprezyny - VVP ) * BVM }; diff --git a/McZapkie/Oerlikon_ESt.h b/McZapkie/Oerlikon_ESt.h index 01aefb7f2..02d65a285 100644 --- a/McZapkie/Oerlikon_ESt.h +++ b/McZapkie/Oerlikon_ESt.h @@ -197,6 +197,7 @@ class TNESt3 : public TBrake { double GetCRP() override; double GetRapidRatio(double const Vel) const override; double CelBCP(double const CVP, double const VVP) const; // docelowe cisnienie w cylindrze + double GetBrakeRatio(double const Ratio) const override; // udzial cisnienia w cylindrze dla udzialu spadku w PG void CheckState(double const BCP, double &dV1); // glowny przyrzad rozrzadczy void CheckReleaser(double const dt); // odluzniacz double CVs(double const BP) const; // napelniacz sterujacego diff --git a/McZapkie/hamulce.h b/McZapkie/hamulce.h index 5b5f8933c..37b9b6a4d 100644 --- a/McZapkie/hamulce.h +++ b/McZapkie/hamulce.h @@ -421,6 +421,10 @@ class TBrake double GetVRP() const; // cisnienie komory wstepnej rozdzielacza /// Returns control reservoir (ZS) pressure [bar]; defaults to the auxiliary reservoir for valves without a dedicated ZS. virtual double GetCRP(); // cisnienie zbiornika sterujacego + /// Share of the full cylinder pressure the distributor settles at for the given share + /// of the full service pipe drop. Used only to predict the brake force; the default is proportional. + /// Share of the full service brake pipe drop. + virtual double GetBrakeRatio(double const Ratio) const { return Ratio; } /// /// Sets the brake delay (G/P/R/M) selector if requested mode is supported. /// From b34238f33fd49a82e9bc68380959335c890343ab Mon Sep 17 00:00:00 2001 From: maj00r Date: Tue, 3 Nov 2026 21:45:57 +0100 Subject: [PATCH 244/430] fix(app): the log written to the end of the closing, each step of it with its time; the Discord thread idle outside the driver mode The log service stopped with applicationQuitOrder, so whatever was logged while the simulator closed was lost; it now runs until StopLogService() and writes out what came before. The closing logs each of its steps with the time since it began, to tell where a closing that hangs stops. Outside the driver mode the Discord thread spun a core in its loop, it now sleeps a second between the checks. --- application/application.cpp | 16 ++++++++++++++++ nodebank_previews_standalone.cpp | 4 ++-- utilities/Logs.cpp | 11 ++++++++++- utilities/Logs.h | 2 ++ 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/application/application.cpp b/application/application.cpp index 119cb021e..56a83c29c 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -270,7 +270,11 @@ void eu07_application::DiscordRPCService() } if (currentMode != mode::driver) + { + // the editor and the other modes: nothing to tell, without spinning a core on it + std::this_thread::sleep_for(std::chrono::milliseconds(1000)); continue; + } // Discord RPC updater if (simulation::is_ready) @@ -690,19 +694,29 @@ void eu07_application::release_python_lock() void eu07_application::exit() { Global.applicationQuitOrder = true; + // each step of the closing in the log, to tell from it where a closing that hangs stops + auto const closing{std::chrono::steady_clock::now()}; + auto const step = [&](char const *What) { + WriteLog(std::string{"Closing: "} + What + " at " + std::to_string(std::chrono::duration_cast(std::chrono::steady_clock::now() - closing).count()) + " ms"); + }; + step("the modes"); for (auto &mode : m_modes) mode.reset(); + step("the renderer"); GfxRenderer->Shutdown(); m_network.reset(); // SafeDelete( simulation::Train ); + step("the scenery"); SafeDelete(simulation::Region); + step("the ui and the python workers"); ui_layer::shutdown(); // the python workers detach their GL context on the way out, so they have to be done before the windows they use are destroyed m_taskqueue.exit(); + step("the windows"); for (auto *window : m_windows) { glfwDestroyWindow(window); @@ -713,6 +727,8 @@ void eu07_application::exit() if (!Global.exec_on_exit.empty()) system(Global.exec_on_exit.c_str()); + step("done"); + StopLogService(); auto it = Global.threads.find("LogService"); if (it != Global.threads.end()) { diff --git a/nodebank_previews_standalone.cpp b/nodebank_previews_standalone.cpp index 39884fd38..d94eb13ed 100644 --- a/nodebank_previews_standalone.cpp +++ b/nodebank_previews_standalone.cpp @@ -290,9 +290,9 @@ int generate_nodebank_previews(int Argc, char *Argv[]) std::thread logservice(LogService); auto const finish = [&](int const Result) { - // give the log service time to write out what's left - std::this_thread::sleep_for(std::chrono::milliseconds(200)); + // the log service writes out what's left before it stops Global.applicationQuitOrder = true; + StopLogService(); logservice.join(); return Result; }; diff --git a/utilities/Logs.cpp b/utilities/Logs.cpp index 38f8062b9..18020d6f1 100644 --- a/utilities/Logs.cpp +++ b/utilities/Logs.cpp @@ -73,12 +73,21 @@ std::deque ErrorStack; // lock for log stacks std::mutex logMutex; +// the log is written through the closing of the simulator, to the end +std::atomic logStop{false}; + +void StopLogService() +{ + logStop = true; +} void LogService() { - while (!Global.applicationQuitOrder) + // one more pass after the stop, so what came just before it gets written too + for (bool last{false}; false == last;) { + last = logStop; { // --- Obsługa InfoStack --- while (!InfoStack.empty()) diff --git a/utilities/Logs.h b/utilities/Logs.h index 93276d651..63727de9c 100644 --- a/utilities/Logs.h +++ b/utilities/Logs.h @@ -23,7 +23,9 @@ enum class logtype : unsigned int { traction = 1 << 9, powergrid = 1 << 10, }; +// writes the log until StopLogService(), and all of it that came before void LogService(); +void StopLogService(); void WriteLog( const char *str, logtype const Type = logtype::generic, bool isError = false ); void Error( const std::string &asMessage, bool box = false ); void Error( const char* &asMessage, bool box = false ); From e75d8496797732cb2463956f3986f022529bdb6b Mon Sep 17 00:00:00 2001 From: maj00r Date: Tue, 3 Nov 2026 21:45:57 +0100 Subject: [PATCH 245/430] fix(app): a scenery file named in another case than given is found, a scenario that can't be opened goes back to the launcher The command line gives the name of the scenery lowercased, and the sceneries made on Windows name their files and includes in any case: on a case-sensitive filesystem they weren't found. FileCased() finds the file whose name differs only in case; the parser and the scenario loader use it. A scenario that can't be opened logs the reason and goes back to the launcher instead of ending with an exception. --- application/scenarioloadermode.cpp | 16 +++++++++++++++- utilities/parser.cpp | 9 +++++++++ utilities/utilities.cpp | 14 ++++++++++++++ utilities/utilities.h | 3 +++ 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/application/scenarioloadermode.cpp b/application/scenarioloadermode.cpp index dbdce6068..7afe0a442 100644 --- a/application/scenarioloadermode.cpp +++ b/application/scenarioloadermode.cpp @@ -41,11 +41,25 @@ bool scenarioloader_mode::update() { WriteLog("using simulation seed: " + std::to_string(Global.random_seed), logtype::generic); WriteLog("using simulation starting timestamp: " + std::to_string(Global.starting_timestamp), logtype::generic); + // the command line gives the name lowercased, the file may be named in another case, as a scenery made on Windows; + // the scenery is saved back to its own file then + if (auto const cased{FileCased(Global.asCurrentSceneryPath + Global.SceneryFile)}; cased.size() > Global.asCurrentSceneryPath.size()) + Global.SceneryFile = cased.substr(Global.asCurrentSceneryPath.size()); Application.set_title( Global.AppName + " (" + Global.SceneryFile + ")" ); WriteLog( "\nLoading scenario \"" + Global.SceneryFile + "\"..." ); timestart = std::chrono::system_clock::now(); - state = simulation::State.deserialize_begin(Global.SceneryFile); + try { + state = simulation::State.deserialize_begin(Global.SceneryFile); + } + catch (std::exception const &e) { + ErrorLog("Bad init: scenario \"" + Global.SceneryFile + "\" couldn't be opened (" + e.what() + ")"); + state.reset(); + Global.SceneryFile.clear(); + Application.pop_mode(); + Application.push_mode(eu07_application::mode::launcher); + return true; + } } try { diff --git a/utilities/parser.cpp b/utilities/parser.cpp index b64aee39b..ee5a9ce5b 100644 --- a/utilities/parser.cpp +++ b/utilities/parser.cpp @@ -63,6 +63,15 @@ cParser::cParser(std::string const &Stream, buffertype const Type, std::string P // the file is read in one go, tokens are then extracted straight from the memory std::ifstream file(Path, std::ios_base::binary); if (file.fail()) + { + // named in another case than it's on the disk + if (auto const cased{FileCased(Path)}; false == cased.empty()) + { + file.clear(); + file.open(cased, std::ios_base::binary); + } + } + if (file.fail()) { mFailBit = true; } diff --git a/utilities/utilities.cpp b/utilities/utilities.cpp index 02608262b..0c18e0027 100644 --- a/utilities/utilities.cpp +++ b/utilities/utilities.cpp @@ -471,6 +471,20 @@ bool FileExists(std::string const &Filename) return std::filesystem::exists(Filename); } +std::string FileCased(std::string const &Filename) +{ + std::error_code error; + if (std::filesystem::exists(Filename, error)) + return Filename; + std::filesystem::path const path{Filename}; + auto const directory{path.has_parent_path() ? path.parent_path() : std::filesystem::path{"."}}; + auto const wanted{ToLower(path.filename().string())}; + for (std::filesystem::directory_iterator entry{directory, error}, end; entry != end; entry.increment(error)) + if (ToLower(entry->path().filename().string()) == wanted) + return path.has_parent_path() ? (directory / entry->path().filename()).string() : entry->path().filename().string(); + return {}; +} + std::pair FileExists(std::vector const &Names, std::vector const &Extensions) { diff --git a/utilities/utilities.h b/utilities/utilities.h index 5392ba6c5..d98b7bc9a 100644 --- a/utilities/utilities.h +++ b/utilities/utilities.h @@ -217,6 +217,9 @@ template bool extract_value(Type_ &Variable, std::string const template <> bool extract_value(bool &Variable, std::string const &Key, std::string const &Input, std::string const &Default); bool FileExists(std::string const &Filename); +// the file as it's named on the disk when only the case of its name differs, as in the sceneries made on Windows; empty when +// there's none +std::string FileCased(std::string const &Filename); std::pair FileExists(std::vector const &Names, std::vector const &Extensions); From 0d69059448b84d9b545ce0a4812c823fc7f60ec9 Mon Sep 17 00:00:00 2001 From: maj00r Date: Tue, 3 Nov 2026 21:45:58 +0100 Subject: [PATCH 246/430] fix(launcher): the scans of the sceneries and the vehicles go past folders they can't read, a vehicle dropped without its skin set isn't added A folder without the permission to read it or a name that can't be converted ended the scan with an exception. Ctrl+Delete with no trainset selected, a dropped skin whose vehicle is gone, and a description with a % in it no longer crash the launcher. --- launcher/scenery_list.cpp | 28 ++++++++++++++++------------ launcher/scenery_scanner.cpp | 16 ++++++++++++---- launcher/textures_scanner.cpp | 9 +++++---- 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/launcher/scenery_list.cpp b/launcher/scenery_list.cpp index d95c962b5..195b0e2c3 100644 --- a/launcher/scenery_list.cpp +++ b/launcher/scenery_list.cpp @@ -23,7 +23,7 @@ bool ui::scenerylist_panel::on_key(int key, int action) if (it == keyboard.keytonamemap.end()) return false; - if (Global.ctrlState && it->second == "delete") + if (Global.ctrlState && it->second == "delete" && selected_trainset != nullptr) purge_selected_trainset(); return true; @@ -117,7 +117,7 @@ void ui::scenerylist_panel::draw_launch_box() { ImGui::NextColumn(); - ImGui::TextWrapped(selected_trainset->description.c_str()); + ImGui::TextWrapped("%s", selected_trainset->description.c_str()); ImGui::Checkbox(STR_C("Trainset turned around"), &selected_trainset->reversed); if (ImGui::IsItemHovered()) @@ -283,7 +283,8 @@ void ui::scenerylist_panel::draw_trainset(trainset_desc &trainset) draw_droptarget(trainset, position++); ImGui::SameLine(15.0f); - for (auto &dyn_desc : trainset.vehicles) { + for (std::size_t index = 0; index < trainset.vehicles.size(); ++index) { + auto &dyn_desc = trainset.vehicles[index]; deferred_image *mini = nullptr; if (dyn_desc.skin && dyn_desc.skin->mini.get() != deferred_image::invalid_id) @@ -345,16 +346,19 @@ void ui::scenerylist_panel::draw_droptarget(trainset_desc &trainset, int positio if (payload) { skin_set *ptr = *reinterpret_cast(payload->Data); std::shared_ptr skin; - for (auto &s : ptr->vehicle.lock()->matching_skinsets) - if (s.get() == ptr) - skin = s; + if (auto const vehicle = ptr->vehicle.lock()) + for (auto &s : vehicle->matching_skinsets) + if (s.get() == ptr) + skin = s; - trainset.vehicles.emplace(trainset.vehicles.begin() + position); - dynamic_desc &desc = trainset.vehicles[position]; + if (skin) { + trainset.vehicles.emplace(trainset.vehicles.begin() + position); + dynamic_desc &desc = trainset.vehicles[position]; - desc.name = skin->skin + "_" + std::to_string((int)LocalRandom(0.0, 10000000.0)); - desc.vehicle = skin->vehicle.lock(); - desc.skin = skin; + desc.name = skin->skin + "_" + std::to_string((int)LocalRandom(0.0, 10000000.0)); + desc.vehicle = skin->vehicle.lock(); + desc.skin = skin; + } } payload = ImGui::AcceptDragDropPayload("vehicle_set"); @@ -368,7 +372,7 @@ void ui::scenerylist_panel::draw_droptarget(trainset_desc &trainset, int positio if (moved->position < position) offset = -1; } else { - desc_copy.name = desc_copy.skin->skin + "_" + std::to_string((int)LocalRandom(0.0, 10000000.0)); + desc_copy.name = (desc_copy.skin ? desc_copy.skin->skin : desc_copy.name) + "_" + std::to_string((int)LocalRandom(0.0, 10000000.0)); } trainset.vehicles.insert(trainset.vehicles.begin() + position + offset, desc_copy); diff --git a/launcher/scenery_scanner.cpp b/launcher/scenery_scanner.cpp index bcd18ac90..5f6a6d2f9 100644 --- a/launcher/scenery_scanner.cpp +++ b/launcher/scenery_scanner.cpp @@ -10,13 +10,21 @@ scenery_scanner::scenery_scanner(ui::vehicles_bank &bank) void scenery_scanner::scan() { - for (auto &f : std::filesystem::directory_iterator("scenery")) { - std::filesystem::path path(std::filesystem::relative(f.path(), "scenery/")); + std::error_code error; + for (std::filesystem::directory_iterator f{"scenery", std::filesystem::directory_options::skip_permission_denied, error}, end; f != end; f.increment(error)) { + std::filesystem::path path(std::filesystem::relative(f->path(), "scenery/", error)); + std::string name; + try { + name = path.string(); + } + catch (std::exception const &) { + continue; + } - if (*path.filename().string().begin() == '$') + if (name.empty() || path.filename().string().front() == '$') continue; - if (path.string().ends_with(".scn")) + if (name.ends_with(".scn")) scan_scn(path); } diff --git a/launcher/textures_scanner.cpp b/launcher/textures_scanner.cpp index 524a23ca6..741f978ca 100644 --- a/launcher/textures_scanner.cpp +++ b/launcher/textures_scanner.cpp @@ -4,12 +4,13 @@ void ui::vehicles_bank::scan_textures() { - for (auto &f : std::filesystem::recursive_directory_iterator("dynamic")) { - if (f.path().filename() != "textures.txt") + std::error_code error; + for (std::filesystem::recursive_directory_iterator f{"dynamic", std::filesystem::directory_options::skip_permission_denied, error}, end; f != end; f.increment(error)) { + if (f->path().filename() != "textures.txt") continue; - std::fstream stream(f.path(), std::ios_base::binary | std::ios_base::in); - ctx_path = std::filesystem::relative(f.path().parent_path(), "dynamic/"); + std::fstream stream(f->path(), std::ios_base::binary | std::ios_base::in); + ctx_path = std::filesystem::relative(f->path().parent_path(), "dynamic/", error); std::string line; while (std::getline(stream, line)) From e230d7b902831b9e6fdac4eebffd73087fb4b6cd Mon Sep 17 00:00:00 2001 From: maj00r Date: Tue, 3 Nov 2026 21:45:58 +0100 Subject: [PATCH 247/430] fix: a deleted model is no longer the picked node, an orthophoto tile isn't swept as a grey stub, the ED brake arrays freed Deleting a model in the editor left the renderer holding it as the picked node, the next pick used freed memory: the renderer forgets it now (Forget_Node). A texture filled straight from memory (internalsrc:) can't be read again, released by the garbage sweep it came back grey; it stays now, and the units bound with the old name are rebound. The arrays of the ED brake force sharing are vectors, they leaked once per update. The scene hierarchy and the editor menu items go through the translation. Python caches ignored. --- .gitignore | 2 ++ application/uilayer.cpp | 10 +++++----- model/Texture.cpp | 10 ++++++++++ rendering/opengl33renderer.cpp | 7 +++++++ rendering/opengl33renderer.h | 2 ++ rendering/openglrenderer.cpp | 9 +++++++++ rendering/openglrenderer.h | 2 ++ rendering/renderer.h | 2 ++ simulation/simulation.cpp | 4 ++++ vehicle/DynObj.cpp | 16 ++++------------ 10 files changed, 47 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 5186ceaee..70a6d1c68 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,5 @@ vcpkg.json # Local Python (setup.bat / CMake) for embedding tools/python314/ +__pycache__/ +*.pyc diff --git a/application/uilayer.cpp b/application/uilayer.cpp index 2dd771bdd..d8417e4fe 100644 --- a/application/uilayer.cpp +++ b/application/uilayer.cpp @@ -567,7 +567,7 @@ void ui_layer::render_hierarchy(){ // fitted to the contents when it first appears; no auto resize, which a docked window can't do ImGui::SetNextWindowSize(ImVec2(0, 0), ImGuiCond_FirstUseEver); ImGui::Begin((std::string(STR_C("Scene Hierarchy")) + "###scenehierarchy").c_str(), &m_editor_hierarchy); - ImGui::Text("Registered nodes: %zu", scene::Hierarchy.size()); + ImGui::Text(STR_C("Registered nodes: %zu"), scene::Hierarchy.size()); ImGui::BeginChild("hierarchy_list", ImVec2(500, 300), true); for (auto &entry : scene::Hierarchy) @@ -598,7 +598,7 @@ void ui_layer::render_hierarchy(){ if (ImGui::IsItemHovered()) { - ImGui::SetTooltip("UUID: %s\nNode type: %s", uuid.c_str(), typeid(*node).name()); + ImGui::SetTooltip(STR_C("UUID: %s\nNode type: %s"),uuid.c_str(), typeid(*node).name()); } } } @@ -708,14 +708,14 @@ void ui_layer::render_menu_contents() GfxRenderer->Debug_Ui_State(ret); } if(EditorModeFlag){ - ImGui::MenuItem("Hierarchy", nullptr, &m_editor_hierarchy); + ImGui::MenuItem(STR_C("Scene Hierarchy"), nullptr, &m_editor_hierarchy); bool change_history_enabled = editor_mode::change_history(); - if (ImGui::MenuItem("Change History", nullptr, &change_history_enabled)) + if (ImGui::MenuItem(STR_C("Change History"), nullptr, &change_history_enabled)) { editor_mode::set_change_history(change_history_enabled); } bool settings_open = editor_mode::settings_open(); - if (ImGui::MenuItem("Editor Settings", nullptr, &settings_open)) + if (ImGui::MenuItem(STR_C("Editor Settings"), nullptr, &settings_open)) { editor_mode::set_settings_open(settings_open); } diff --git a/model/Texture.cpp b/model/Texture.cpp index 136846a33..4a7b24792 100644 --- a/model/Texture.cpp +++ b/model/Texture.cpp @@ -706,6 +706,16 @@ void opengl_texture::update_from_memory(size_t width, size_t height, const uint8 if (glGenerateMipmap) glGenerateMipmap(target); glFlush(); + // the content given straight to the gpu can't be read again: released by the garbage sweep, the texture would come back as + // the grey stub + if (type == "internalsrc:") + { + is_static = true; + is_ready = true; + } + // the name may be a new one, and the unit active took the texture past the unit cache + for (auto &unit : units) + unit = -1; } void diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index d20454c35..a5d1f3894 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -5410,6 +5410,13 @@ void opengl33_renderer::Pick_Node_Callback(std::functionis_busy()) diff --git a/rendering/opengl33renderer.h b/rendering/opengl33renderer.h index 64574420f..0f17ede7f 100644 --- a/rendering/opengl33renderer.h +++ b/rendering/opengl33renderer.h @@ -108,6 +108,8 @@ class opengl33_renderer : public gfx_renderer { Pick_Control() const override { return m_pickcontrolitem; } scene::basic_node const * Pick_Node() const override { return m_picksceneryitem; } + void + Forget_Node( scene::basic_node const *Node ) override; glm::dvec3 Mouse_Position() const override { return m_worldmousecoordinates; } bool diff --git a/rendering/openglrenderer.cpp b/rendering/openglrenderer.cpp index 59152c64d..864d84141 100644 --- a/rendering/openglrenderer.cpp +++ b/rendering/openglrenderer.cpp @@ -1888,6 +1888,15 @@ opengl_renderer::Pick_Node_Callback( std::function m_node_pick_requests.emplace_back( Callback ); } +void +opengl_renderer::Forget_Node( scene::basic_node const *Node ) { + + if( m_picksceneryitem == Node ) { + m_picksceneryitem = nullptr; + } + std::replace_if( m_picksceneryitems.begin(), m_picksceneryitems.end(), [Node]( scene::basic_node const *Item ) { return Item == Node; }, nullptr ); +} + void opengl_renderer::Render( scene::basic_region *Region ) { diff --git a/rendering/openglrenderer.h b/rendering/openglrenderer.h index 78fffa40b..ada032808 100644 --- a/rendering/openglrenderer.h +++ b/rendering/openglrenderer.h @@ -103,6 +103,8 @@ public: Pick_Control() const override { return m_pickcontrolitem; } scene::basic_node const * Pick_Node() const override { return m_picksceneryitem; } + void + Forget_Node( scene::basic_node const *Node ) override; glm::dvec3 Mouse_Position() const override { return m_worldmousecoordinates; } glm::mat4 diff --git a/rendering/renderer.h b/rendering/renderer.h index 0b9eb60f4..e9dc8a47c 100644 --- a/rendering/renderer.h +++ b/rendering/renderer.h @@ -90,6 +90,8 @@ public: virtual void Pick_Node_Callback( std::function Callback ) = 0; virtual auto Pick_Control() const -> TSubModel const * = 0; virtual auto Pick_Node() const -> scene::basic_node const * = 0; + // a node deleted from the scene is no longer given as picked + virtual void Forget_Node( scene::basic_node const *Node ) {} virtual auto Mouse_Position() const -> glm::dvec3 = 0; virtual auto Mouse_Hit() const -> bool { return true; } diff --git a/simulation/simulation.cpp b/simulation/simulation.cpp index 70f9e3074..ea2177170 100644 --- a/simulation/simulation.cpp +++ b/simulation/simulation.cpp @@ -30,6 +30,7 @@ http://mozilla.org/MPL/2.0/. #include "scene/scenelayers.h" #include "vehicle/Train.h" #include "application/application.h" +#include "rendering/renderer.h" #include "utilities/Logs.h" #include "vehicle/Driver.h" @@ -561,6 +562,9 @@ std::pair state_manager::rebuild_include(scene::instance_handle const } void state_manager::delete_model(TAnimModel *model) { + if (GfxRenderer) { + GfxRenderer->Forget_Node(model); + } scene::Layers.count(model->layer(), scene::layer_item::model, -1); scene::Layers.forget(model); Region->erase(model); diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index c6793e454..2309c433b 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -3381,15 +3381,12 @@ bool TDynamicObject::Update(double dt, double dt1) && MoverParameters->eimc[eimc_p_abed] < 0.001) FzadED = 0; //pętla bezpieczeństwa - bez ED auto const FzadPN = Fzad - FrED * MoverParameters->MED_FrED_factor; - //np = 0; - // BUG: likely memory leak, allocation per inner loop, deleted only once outside - // TODO: sort this shit out - bool* PrzekrF = new bool[np]; + std::vector PrzekrF( np ); float nPrzekrF = 0; bool test = true; - float* FzED = new float[np]; - float* FzEP = new float[np]; - float* FmaxEP = new float[np]; + std::vector FzED( np ); + std::vector FzEP( np ); + std::vector FmaxEP( np ); // 3. ustaw pojazdom sile hamowania ED // - proporcjonalnie do mozliwosci @@ -3548,11 +3545,6 @@ bool TDynamicObject::Update(double dt, double dt1) } - delete[] PrzekrF; - delete[] FzED; - delete[] FzEP; - delete[] FmaxEP; - MED_oldFED = FzadED; } From a24118baf7630eb0ab545c947d7874135a96356d Mon Sep 17 00:00:00 2001 From: maj00r Date: Tue, 3 Nov 2026 21:50:31 +0100 Subject: [PATCH 248/430] feat(render): a geometry chunk emptied in place, the kind of its primitive told; a chunk gaining or losing its userdata gets a new buffer Erase() empties a chunk and keeps its handle to be filled again, for geometry made anew as it changes. Primitive() tells whether a chunk holds triangles or strips, -1 from a renderer which doesn't know. The VAO bank reused the buffer of a chunk of the same length even when the userdata came or went, the layout of the buffer differing then. --- rendering/geometrybank.cpp | 36 ++++++++++++++++++++++++++++++ rendering/geometrybank.h | 6 +++++ rendering/opengl33geometrybank.cpp | 3 ++- rendering/opengl33renderer.cpp | 24 +++++++++++++++++++- rendering/opengl33renderer.h | 7 ++++++ rendering/openglrenderer.cpp | 5 +++++ rendering/openglrenderer.h | 1 + rendering/renderer.h | 8 +++++++ 8 files changed, 88 insertions(+), 2 deletions(-) diff --git a/rendering/geometrybank.cpp b/rendering/geometrybank.cpp index f2db8b8bf..2a1ff5ee6 100644 --- a/rendering/geometrybank.cpp +++ b/rendering/geometrybank.cpp @@ -318,6 +318,20 @@ geometry_bank::append( gfx::vertex_array &Vertices, userdata_array &Userdata, gf return replace( Vertices, Userdata, Geometry, gfx::geometry_bank::chunk( Geometry ).vertices.size() ); } +void +geometry_bank::erase( gfx::geometry_handle const &Geometry ) { + + if( ( Geometry.chunk == 0 ) || ( Geometry.chunk > m_chunks.size() ) ) { return; } + + auto &chunk = gfx::geometry_bank::chunk( Geometry ); + if( chunk.vertices.empty() && chunk.indices.empty() ) { return; } + + gfx::vertex_array().swap( chunk.vertices ); + gfx::index_array().swap( chunk.indices ); + gfx::userdata_array().swap( chunk.userdata ); + replace_( Geometry ); +} + // draws geometry stored in specified chunk std::size_t geometry_bank::draw( gfx::geometry_handle const &Geometry, gfx::stream_units const &Units, unsigned int const Streams ) { @@ -360,6 +374,13 @@ geometry_bank::vertices( gfx::geometry_handle const &Geometry ) const { return geometry_bank::chunk( Geometry ).vertices; } +// kind of geometry of specified chunk +unsigned int +geometry_bank::primitive( gfx::geometry_handle const &Geometry ) const { + + return geometry_bank::chunk( Geometry ).type; +} + // provides direct access to vertex user data of specfied chunk userdata_array const & geometry_bank::userdata( gfx::geometry_handle const &Geometry ) const { @@ -418,6 +439,14 @@ geometrybank_manager::append( gfx::vertex_array &Vertices, userdata_array &Userd return bank( Geometry ).first->append( Vertices, Userdata, Geometry ); } + +void +geometrybank_manager::erase( gfx::geometry_handle const &Geometry ) { + + if( ( Geometry.bank == 0 ) || ( Geometry.bank > m_geometrybanks.size() ) ) { return; } + + bank( Geometry ).first->erase( Geometry ); +} // draws geometry stored in specified chunk void geometrybank_manager::draw( gfx::geometry_handle const &Geometry, unsigned int const Streams ) { @@ -483,6 +512,13 @@ geometrybank_manager::vertices( gfx::geometry_handle const &Geometry ) const { return bank( Geometry ).first->vertices( Geometry ); } +// kind of geometry of specified chunk +unsigned int +geometrybank_manager::primitive( gfx::geometry_handle const &Geometry ) const { + + return bank( Geometry ).first->primitive( Geometry ); +} + // provides direct access to vertex user data of specfied chunk gfx::userdata_array const & geometrybank_manager::userdata( gfx::geometry_handle const &Geometry ) const { diff --git a/rendering/geometrybank.h b/rendering/geometrybank.h index 20baf4ed2..537c79ba2 100644 --- a/rendering/geometrybank.h +++ b/rendering/geometrybank.h @@ -117,6 +117,7 @@ public: auto replace( gfx::vertex_array &Vertices, gfx::userdata_array& Userdata, gfx::geometry_handle const &Geometry, std::size_t const Offset = 0 ) -> bool; // adds supplied vertex data at the end of specified chunk auto append( gfx::vertex_array &Vertices, gfx::userdata_array& Userdata, gfx::geometry_handle const &Geometry ) -> bool; + void erase( gfx::geometry_handle const &Geometry ); // draws geometry stored in specified chunk auto draw( gfx::geometry_handle const &Geometry, gfx::stream_units const &Units, unsigned int const Streams = basic_streams ) -> std::size_t; // draws geometry stored in specified chunk N times via glDrawElementsInstanced* @@ -138,6 +139,8 @@ public: auto vertices( gfx::geometry_handle const &Geometry ) const -> gfx::vertex_array const &; // provides direct access to vertex user data of specfied chunk auto userdata( gfx::geometry_handle const &Geometry ) const -> gfx::userdata_array const &; + // kind of geometry of specified chunk, GL_TRIANGLES, GL_TRIANGLE_STRIP... + auto primitive( gfx::geometry_handle const &Geometry ) const -> unsigned int; protected: // types: @@ -220,6 +223,7 @@ public: auto replace( gfx::vertex_array &Vertices, gfx::userdata_array &Userdata, gfx::geometry_handle const &Geometry, std::size_t const Offset = 0 ) -> bool; // adds supplied vertex data at the end of specified chunk auto append( gfx::vertex_array &Vertices, gfx::userdata_array &Userdata, gfx::geometry_handle const &Geometry ) -> bool; + void erase( gfx::geometry_handle const &Geometry ); // draws geometry stored in specified chunk void draw( gfx::geometry_handle const &Geometry, unsigned int const Streams = basic_streams ); // draws geometry stored in specified chunk InstanceCount times via GPU instancing. @@ -238,6 +242,8 @@ public: auto vertices( gfx::geometry_handle const &Geometry ) const -> gfx::vertex_array const &; // provides direct access to vertex data of specfied chunk auto userdata( gfx::geometry_handle const &Geometry ) const -> gfx::userdata_array const &; + // kind of geometry of specified chunk + auto primitive( gfx::geometry_handle const &Geometry ) const -> unsigned int; // sets target texture unit for the texture data stream auto units() -> gfx::stream_units & { return m_units; } // provides access to primitives count diff --git a/rendering/opengl33geometrybank.cpp b/rendering/opengl33geometrybank.cpp index 4713ec69b..978a1b75d 100644 --- a/rendering/opengl33geometrybank.cpp +++ b/rendering/opengl33geometrybank.cpp @@ -33,7 +33,8 @@ opengl33_vaogeometrybank::replace_( gfx::geometry_handle const &Geometry ) { auto &chunkrecord = m_chunkrecords[ Geometry.chunk - 1 ]; chunkrecord.is_good = false; // if the overall length of the chunk didn't change we can get away with reusing the old buffer... - if( geometry_bank::chunk( Geometry ).vertices.size() != chunkrecord.vertex_count ) { + if( ( geometry_bank::chunk( Geometry ).vertices.size() != chunkrecord.vertex_count ) + || ( geometry_bank::chunk( Geometry ).userdata.empty() == chunkrecord.has_userdata ) ) { // ...but otherwise we'll need to allocate a new one // TBD: we could keep and reuse the old buffer also if the new chunk is smaller than the old one, // but it'd require some extra tracking and work to keep all chunks up to date; also wasting vram; may be not worth it? diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index d20454c35..97b2fa8d2 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -2201,8 +2201,13 @@ bool opengl33_renderer::Append(gfx::vertex_array &Vertices, gfx::userdata_array return m_geometry.append(Vertices, Userdata, Geometry); } +void opengl33_renderer::Erase(gfx::geometry_handle const &Geometry) +{ + m_geometry.erase(Geometry); +} + // provides direct access to index data of specfied chunk -gfx::index_array const & opengl33_renderer::Indices(gfx::geometry_handle const &Geometry) const +gfx::index_array const & opengl33_renderer::Indices(gfx::geometry_handle const &Geometry) const { return m_geometry.indices(Geometry); } @@ -2218,6 +2223,11 @@ gfx::userdata_array const &opengl33_renderer::UserData(const gfx::geometry_handl return m_geometry.userdata(Geometry); } +int opengl33_renderer::Primitive(gfx::geometry_handle const &Geometry) const +{ + return static_cast(m_geometry.primitive(Geometry)); +} + // material methods material_handle opengl33_renderer::Fetch_Material(std::string const &Filename, bool const Loadnow) { @@ -2225,6 +2235,18 @@ material_handle opengl33_renderer::Fetch_Material(std::string const &Filename, b return m_materials.create(Filename, Loadnow); } +material_handle opengl33_renderer::Matte_Material(material_handle const Material) +{ + + return m_materials.create_matte(Material); +} + +material_handle opengl33_renderer::Tinted_Material(material_handle const Material, glm::vec3 const &Colour) +{ + + return m_materials.create_tinted(Material, Colour); +} + std::shared_ptr opengl33_renderer::Fetch_Shader(const std::string &name) { auto it = m_shaders.find(name); diff --git a/rendering/opengl33renderer.h b/rendering/opengl33renderer.h index 64574420f..b04153586 100644 --- a/rendering/opengl33renderer.h +++ b/rendering/opengl33renderer.h @@ -66,6 +66,7 @@ class opengl33_renderer : public gfx_renderer { bool Replace(gfx::vertex_array &Vertices, gfx::userdata_array &Userdata, gfx::geometry_handle const &Geometry, int const Type, const std::size_t Offset = 0) override; // adds supplied vertex data at the end of specified chunk bool Append(gfx::vertex_array &Vertices, gfx::userdata_array &Userdata, gfx::geometry_handle const &Geometry, int const Type) override; + void Erase( gfx::geometry_handle const &Geometry ) override; // provides direct access to index data of specfied chunk gfx::index_array const & Indices( gfx::geometry_handle const &Geometry ) const override; @@ -75,9 +76,15 @@ class opengl33_renderer : public gfx_renderer { // provides direct access to vertex data of specfied chunk gfx::userdata_array const & UserData( gfx::geometry_handle const &Geometry ) const override; + int + Primitive( gfx::geometry_handle const &Geometry ) const override; // material methods material_handle Fetch_Material( std::string const &Filename, bool const Loadnow = true ) override; + material_handle + Matte_Material( material_handle const Material ) override; + material_handle + Tinted_Material( material_handle const Material, glm::vec3 const &Colour ) override; void Bind_Material( material_handle const Material, TSubModel const *sm = nullptr, lighting_data const *lighting = nullptr ) override; IMaterial const * diff --git a/rendering/openglrenderer.cpp b/rendering/openglrenderer.cpp index 59152c64d..51ac1e715 100644 --- a/rendering/openglrenderer.cpp +++ b/rendering/openglrenderer.cpp @@ -1758,6 +1758,11 @@ bool opengl_renderer::Append(gfx::vertex_array &Vertices, gfx::userdata_array &U return m_geometry.append( Vertices, Userdata, Geometry ); } +void opengl_renderer::Erase( gfx::geometry_handle const &Geometry ) +{ + m_geometry.erase( Geometry ); +} + // provides direct access to vertex data of specfied chunk gfx::index_array const & opengl_renderer::Indices( gfx::geometry_handle const &Geometry ) const { diff --git a/rendering/openglrenderer.h b/rendering/openglrenderer.h index 78fffa40b..da3faad06 100644 --- a/rendering/openglrenderer.h +++ b/rendering/openglrenderer.h @@ -65,6 +65,7 @@ public: bool Replace(gfx::vertex_array &Vertices, gfx::userdata_array &Userdata, gfx::geometry_handle const &Geometry, int const Type, const std::size_t Offset = 0) override; // adds supplied vertex data at the end of specified chunk bool Append(gfx::vertex_array &Vertices, gfx::userdata_array &Userdata, gfx::geometry_handle const &Geometry, int const Type) override; + void Erase( gfx::geometry_handle const &Geometry ) override; // provides direct access to index data of specfied chunk gfx::index_array const & Indices( gfx::geometry_handle const &Geometry ) const override; diff --git a/rendering/renderer.h b/rendering/renderer.h index 0b9eb60f4..4dabc204a 100644 --- a/rendering/renderer.h +++ b/rendering/renderer.h @@ -59,16 +59,24 @@ public: virtual auto Replace(gfx::vertex_array &Vertices, gfx::userdata_array &Userdata, gfx::geometry_handle const &Geometry, int const Type, const std::size_t Offset = 0) -> bool = 0; // adds supplied vertex data at the end of specified chunk virtual auto Append(gfx::vertex_array &Vertices, gfx::userdata_array &Userdata, gfx::geometry_handle const &Geometry, int const Type) -> bool = 0; + // empties specified chunk, its handle stays valid to be filled again + virtual void Erase( gfx::geometry_handle const &Geometry ) {} // provides direct access to index data of specfied chunk virtual auto Indices( gfx::geometry_handle const &Geometry ) const->gfx::index_array const & = 0; // provides direct access to vertex data of specfied chunk virtual auto Vertices( gfx::geometry_handle const &Geometry ) const ->gfx::vertex_array const & = 0; // provides direct access to vertex user data of specfied chunk virtual auto UserData( gfx::geometry_handle const &Geometry ) const ->gfx::userdata_array const & = 0; + // kind of geometry of specified chunk, -1 when the renderer doesn't tell + virtual auto Primitive( gfx::geometry_handle const &Geometry ) const -> int { return -1; } // material methods virtual auto Fetch_Material( std::string const &Filename, bool const Loadnow = true ) -> material_handle = 0; virtual void Bind_Material( material_handle const Material, TSubModel const *sm = nullptr, lighting_data const *lighting = nullptr ) = 0; virtual auto Material( material_handle const Material ) const -> IMaterial const * = 0; + // the same material with its highlights damped, for faces which aren't polished like the surfaces they are cut from. backends which can't make one give back the material itself + virtual auto Matte_Material( material_handle const Material ) -> material_handle { return Material; } + // the same material with its texture tinted by the colour, as far as the userdata of the vertices says. backends which can't make one give back the material itself + virtual auto Tinted_Material( material_handle const Material, glm::vec3 const &Colour ) -> material_handle { return Material; } // heightmap terrain: material of a chunk blending the materials of up to 8 layers by their weights. // Weights: (Samples + 1)^2 values per layer, planar, rows of growing z, the weights of a sample adding up to 255; null with a single layer. // Placement: corner of the chunk (x, z) in the texture coordinates of its mesh, and the size of the chunk. From 89c4555e1e9b410c149331cb485c5baf48f1285d Mon Sep 17 00:00:00 2001 From: maj00r Date: Tue, 3 Nov 2026 21:50:32 +0100 Subject: [PATCH 249/430] feat(render): matte and tinted copies of a material, the steel weathered or tinted as far as the userdata of its vertices says Matte_Material() gives a copy of a material with its glossiness damped and its weathering on: the faces cut out of a polished surface, as the sides of a worn rail head, darken and lose the shine by the userdata of their vertices. Tinted_Material() gives a copy whose texture is tinted to a colour as far instead. Both are made once per material. The weathering and the tint colour have a param slot of their own, param[3]: the shaders of the materials use all four components of param[2] among them (detail, parallax, water, the terrain placement), and light_common.glsl is included in all of them. MAX_PARAMS grows from 3 to 4, the model UBO by 16 bytes. Neither copy is made when another param of the shader lies on the components it would set. --- gl/ubo.h | 2 +- model/material.cpp | 117 ++++++++++++++++++++++++++++++++++++++ model/material.h | 7 +++ shaders/light_common.glsl | 18 ++++++ 4 files changed, 143 insertions(+), 1 deletion(-) diff --git a/gl/ubo.h b/gl/ubo.h index d5335b21d..9d2c96912 100644 --- a/gl/ubo.h +++ b/gl/ubo.h @@ -62,7 +62,7 @@ namespace gl static_assert(sizeof(scene_ubs) == 400, "bad size of ubs"); - const size_t MAX_PARAMS = 3; + const size_t MAX_PARAMS = 4; struct model_ubs { diff --git a/model/material.cpp b/model/material.cpp index dd7598ab1..ddc521e59 100644 --- a/model/material.cpp +++ b/model/material.cpp @@ -662,6 +662,123 @@ material_manager::create_from_text( std::string const &Name, std::string const & return materialhandle; } +namespace { + +opengl_material +variant_of( opengl_material const &Source, std::string const &Suffix ) { + + opengl_material variant; + variant.textures = Source.textures; + variant.texture_variants = Source.texture_variants; + variant.params = Source.params; + variant.params_state = Source.params_state; + variant.shader = Source.shader; + variant.opacity = Source.opacity; + variant.selfillum = Source.selfillum; + variant.shadow_rank = Source.shadow_rank; + variant.name = Source.name + Suffix; + variant.size = Source.size; + variant.is_good = Source.is_good; + variant.path = Source.path; + return variant; +} + +// whether another param of the shader lies on a component of the named one, which a value set for that one would change too +bool +shares_slot( std::unordered_map const &Conf, std::string const &Name ) { + + auto const own { Conf.find( Name ) }; + if( own == Conf.end() ) { + return false; + } + return std::any_of( + std::begin( Conf ), std::end( Conf ), + [&]( auto const &Entry ) { + return Entry.first != Name + && Entry.second.location == own->second.location + && Entry.second.offset < own->second.offset + own->second.size + && own->second.offset < Entry.second.offset + Entry.second.size; } ); +} + +} // namespace + +material_handle +material_manager::create_matte( material_handle const Material ) { + + if( Material == null_handle || Material >= m_materials.size() ) { + return Material; + } + auto const lookup { m_mattes.find( Material ) }; + if( lookup != m_mattes.end() ) { + return lookup->second; + } + auto matte { variant_of( m_materials[ Material ], ":matte" ) }; + matte.glossiness = 0.1f; + if( matte.shader ) { + for( auto const &[ key, value ] : std::vector>{ { "weathering", glm::vec4{ 1.f } } } ) { + auto const entry { matte.shader->param_conf.find( key ) }; + if( entry == matte.shader->param_conf.end() + || shares_slot( matte.shader->param_conf, key ) ) { + continue; + } + for( std::size_t i = 0; i < entry->second.size; ++i ) { + matte.params[ entry->second.location ][ entry->second.offset + i ] = value[ static_cast( i ) ]; + } + matte.params_state.erase( + std::remove_if( + std::begin( matte.params_state ), std::end( matte.params_state ), + [&]( gl::shader::param_entry const &State ) { + return State.location == entry->second.location && State.offset == entry->second.offset; } ), + std::end( matte.params_state ) ); + } + } + auto const mattehandle { static_cast( m_materials.size() ) }; + m_materials.emplace_back( std::move( matte ) ); + m_mattes.emplace( Material, mattehandle ); + return mattehandle; +} + +material_handle +material_manager::create_tinted( material_handle const Material, glm::vec3 const &Colour ) { + + if( Material == null_handle || Material >= m_materials.size() || !m_materials[ Material ].shader ) { + return Material; + } + auto const key { std::make_tuple( Material, Colour.r, Colour.g, Colour.b ) }; + if( auto const lookup { m_tints.find( key ) }; lookup != m_tints.end() ) { + return lookup->second; + } + // the colour in the rgb of the slot of the weathering, which tells the shader to tint by its sign; nothing else in that slot + auto const &conf { m_materials[ Material ].shader->param_conf }; + auto const weathering { conf.find( "weathering" ) }; + auto const tint { conf.find( "tint" ) }; + if( weathering == conf.end() + || tint == conf.end() + || weathering->second.offset != 3 + || tint->second.location != weathering->second.location + || tint->second.offset != 0 + || std::any_of( + std::begin( conf ), std::end( conf ), + [&]( auto const &Entry ) { + return Entry.first != weathering->first && Entry.first != tint->first && Entry.second.location == weathering->second.location; } ) ) { + return Material; + } + auto tinted { variant_of( m_materials[ Material ], ":tinted" ) }; + tinted.glossiness = m_materials[ Material ].glossiness; + auto const location { weathering->second.location }; + tinted.params[ location ] = glm::vec4{ Colour, -1.f }; + tinted.params_state.erase( + std::remove_if( + std::begin( tinted.params_state ), std::end( tinted.params_state ), + [&]( gl::shader::param_entry const &State ) { + return State.location == location; } ), + std::end( tinted.params_state ) ); + auto const tintedhandle { static_cast( m_materials.size() ) }; + m_materials.emplace_back( std::move( tinted ) ); + m_tints.emplace( key, tintedhandle ); + return tintedhandle; +} + void material_manager::on_weather_change() { diff --git a/model/material.h b/model/material.h index f329a3256..05a68880f 100644 --- a/model/material.h +++ b/model/material.h @@ -142,6 +142,11 @@ public: // material described by provided text (the content of a .mat file), not kept in a file. returns: handle to the material or null_handle material_handle create_from_text( std::string const &Name, std::string const &Definition ); + // copy of provided material with its specular highlights and reflections damped. returns: handle to the copy, made once per material + material_handle + create_matte( material_handle const Material ); + material_handle + create_tinted( material_handle const Material, glm::vec3 const &Colour ); opengl_material const & material( material_handle const Material ) const { return m_materials[ Material ]; } opengl_material & @@ -170,6 +175,8 @@ private: // members: material_sequence m_materials; index_map m_materialmappings; + std::unordered_map m_mattes; + std::map, material_handle> m_tints; }; //--------------------------------------------------------------------------- diff --git a/shaders/light_common.glsl b/shaders/light_common.glsl index 0801b09dc..6261a090d 100644 --- a/shaders/light_common.glsl +++ b/shaders/light_common.glsl @@ -9,6 +9,11 @@ uniform sampler2D headlightmap; float glossiness = 1.0; float metalic = 0.0; +in vec4 UserData; +// a slot of its own, the shaders of the materials using all of param[2]: how weathered the steel is as far as the userdata of +// its vertices says; below 0: the texture tinted to the colour of tint as far instead +#param (weathering, 3, 3, 1, zero) +#param (tint, 3, 0, 3, one) // --------------------------------------------------------------------- // Lighting balance tunables - tweak these to control overall scene @@ -285,6 +290,19 @@ vec3 apply_lights(vec3 fragcolor, vec3 fragnormal, vec3 texturecolor, float refl { // Diffuse colour is applied once, to the albedo; the light terms below are not scaled by it again texturecolor *= material_diffuse(); + float weathered = (param[3].w > 0.0 ? clamp(param[3].w * UserData.x, 0.0, 1.0) : 0.0); + float tinted = (param[3].w < 0.0 ? clamp(-param[3].w * UserData.x, 0.0, 1.0) : 0.0); + // a tint only scales the colour of the texture, the steel keeps its own polish + float polished = weathered * smoothstep(0.03, 0.12, dot(texturecolor, vec3(0.2126, 0.7152, 0.0722))); + float weatheredluma = min(dot(texturecolor, vec3(0.2126, 0.7152, 0.0722)), 0.05); + vec3 unused = texturecolor * (weatheredluma / max(dot(texturecolor, vec3(0.2126, 0.7152, 0.0722)), 1e-4)); + unused = mix(unused, vec3(1.0, 0.82, 0.74) * (weatheredluma / 0.8525), 0.5); + texturecolor = mix(texturecolor, unused, smoothstep(0.0, 0.4, weathered)); + texturecolor = (tinted > 0.0 ? texturecolor * mix(vec3(1.0), param[3].rgb, tinted) : texturecolor); + specularity = mix(specularity, min(specularity, 0.03), smoothstep(0.0, 0.4, polished)); + metalic = mix(metalic, 0.0, polished); + glossiness = mix(glossiness, min(glossiness, 0.06 * abs(param[1].w)), polished); + reflectivity = mix(reflectivity, min(reflectivity, 0.08 * param[1].z), smoothstep(0.0, 0.4, polished)); // Scale ambient before it gets tinted by the texture. // Sun, headlights and emission are added afterwards so they are NOT // attenuated by AMBIENT_SCALE - this only dims the indirect term. From ed0ff36a6994243d939160807c651376adecc7d2 Mon Sep 17 00:00:00 2001 From: maj00r Date: Tue, 3 Nov 2026 21:53:52 +0100 Subject: [PATCH 250/430] fix(app): a scenario failing as it loads goes back to the launcher too, the files of other cases looked for only off Windows A scenario failing past its opening popped the loader mode and went on to pop it again and push the driver mode with the scenery half loaded; it goes back to the launcher as one that can't be opened. FileCased() goes through the folder only where the file system tells the case apart: on Windows a missing file was looked for in its whole folder for nothing, and a name outside the code page threw from the parser. The Discord thread sleeps a quarter of a second outside the driver mode, not to hold the closing up. --- application/application.cpp | 2 +- application/scenarioloadermode.cpp | 5 +++++ application/uilayer.cpp | 2 +- utilities/utilities.cpp | 7 +++++++ utilities/utilities.h | 2 +- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/application/application.cpp b/application/application.cpp index 56a83c29c..33f5c8a0e 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -272,7 +272,7 @@ void eu07_application::DiscordRPCService() if (currentMode != mode::driver) { // the editor and the other modes: nothing to tell, without spinning a core on it - std::this_thread::sleep_for(std::chrono::milliseconds(1000)); + std::this_thread::sleep_for(std::chrono::milliseconds(250)); continue; } diff --git a/application/scenarioloadermode.cpp b/application/scenarioloadermode.cpp index 7afe0a442..eaa034f7e 100644 --- a/application/scenarioloadermode.cpp +++ b/application/scenarioloadermode.cpp @@ -67,8 +67,13 @@ bool scenarioloader_mode::update() { return true; } catch (invalid_scenery_exception &e) { + // back to the launcher as when the scenario can't be opened, not on to the driver mode with the scenery half loaded ErrorLog( "Bad init: scenario loading failed" ); + state.reset(); + Global.SceneryFile.clear(); Application.pop_mode(); + Application.push_mode(eu07_application::mode::launcher); + return true; } // the loading state holds the scenario file open, which on some systems keeps the file from being replaced // when the scenery is saved in the editor. it'd also get in the way of another load diff --git a/application/uilayer.cpp b/application/uilayer.cpp index d8417e4fe..a188d4f0b 100644 --- a/application/uilayer.cpp +++ b/application/uilayer.cpp @@ -598,7 +598,7 @@ void ui_layer::render_hierarchy(){ if (ImGui::IsItemHovered()) { - ImGui::SetTooltip(STR_C("UUID: %s\nNode type: %s"),uuid.c_str(), typeid(*node).name()); + ImGui::SetTooltip(STR_C("UUID: %s\nNode type: %s"), uuid.c_str(), typeid(*node).name()); } } } diff --git a/utilities/utilities.cpp b/utilities/utilities.cpp index 0c18e0027..b25c6b31d 100644 --- a/utilities/utilities.cpp +++ b/utilities/utilities.cpp @@ -476,6 +476,12 @@ std::string FileCased(std::string const &Filename) std::error_code error; if (std::filesystem::exists(Filename, error)) return Filename; +#ifdef _WIN32 + // the names there are found in any case already: no folder to go through for every file missing, nor names outside of the + // code page to throw on + return {}; +#else + // only the name of the file itself, a folder named in another case isn't found std::filesystem::path const path{Filename}; auto const directory{path.has_parent_path() ? path.parent_path() : std::filesystem::path{"."}}; auto const wanted{ToLower(path.filename().string())}; @@ -483,6 +489,7 @@ std::string FileCased(std::string const &Filename) if (ToLower(entry->path().filename().string()) == wanted) return path.has_parent_path() ? (directory / entry->path().filename()).string() : entry->path().filename().string(); return {}; +#endif } std::pair FileExists(std::vector const &Names, std::vector const &Extensions) diff --git a/utilities/utilities.h b/utilities/utilities.h index d98b7bc9a..f16431dde 100644 --- a/utilities/utilities.h +++ b/utilities/utilities.h @@ -218,7 +218,7 @@ template <> bool extract_value(bool &Variable, std::string const &Key, std::stri bool FileExists(std::string const &Filename); // the file as it's named on the disk when only the case of its name differs, as in the sceneries made on Windows; empty when -// there's none +// there's none. the folders have to be named in their case; on Windows, finding the names in any case itself, the file given or none std::string FileCased(std::string const &Filename); std::pair FileExists(std::vector const &Names, std::vector const &Extensions); From 48af69cbf19e475d4472d6347e64f29b770a1ddf Mon Sep 17 00:00:00 2001 From: maj00r Date: Tue, 3 Nov 2026 22:00:48 +0100 Subject: [PATCH 251/430] fix(render): the matte and tinted copies of a material made again with its season and weather, the primitive of a handle to no chunk told as none The copies don't update themselves, their names aren't files to read again: after a change of the weather or the season the material got its new textures and its copies kept the old ones. They are made again from it then, under their handles. primitive() of an empty handle or one past the banks read out of the bank list; it gives no_primitive there, -1 from the renderer. --- model/material.cpp | 131 ++++++++++++++++++++++----------- model/material.h | 5 ++ rendering/geometrybank.cpp | 4 + rendering/geometrybank.h | 3 +- rendering/opengl33renderer.cpp | 3 +- 5 files changed, 102 insertions(+), 44 deletions(-) diff --git a/model/material.cpp b/model/material.cpp index ddc521e59..2b92986d0 100644 --- a/model/material.cpp +++ b/model/material.cpp @@ -676,6 +676,7 @@ variant_of( opengl_material const &Source, std::string const &Suffix ) { variant.opacity = Source.opacity; variant.selfillum = Source.selfillum; variant.shadow_rank = Source.shadow_rank; + variant.glossiness = Source.glossiness; variant.name = Source.name + Suffix; variant.size = Source.size; variant.is_good = Source.is_good; @@ -700,6 +701,65 @@ shares_slot( std::unordered_map const &Con && own->second.offset < Entry.second.offset + Entry.second.size; } ); } +// the highlights of a copy of a material damped and its weathering on +void +make_matte( opengl_material &Variant ) { + + Variant.glossiness = 0.1f; + if( !Variant.shader ) { + return; + } + for( auto const &[ key, value ] : std::vector>{ { "weathering", glm::vec4{ 1.f } } } ) { + auto const entry { Variant.shader->param_conf.find( key ) }; + if( entry == Variant.shader->param_conf.end() + || shares_slot( Variant.shader->param_conf, key ) ) { + continue; + } + for( std::size_t i = 0; i < entry->second.size; ++i ) { + Variant.params[ entry->second.location ][ entry->second.offset + i ] = value[ static_cast( i ) ]; + } + Variant.params_state.erase( + std::remove_if( + std::begin( Variant.params_state ), std::end( Variant.params_state ), + [&]( gl::shader::param_entry const &State ) { + return State.location == entry->second.location && State.offset == entry->second.offset; } ), + std::end( Variant.params_state ) ); + } +} + +// the colour in the rgb of the slot of the weathering of a copy of a material, which tells the shader to tint by its sign. returns: +// whether the shader can tint it, the weathering and the tint alone in that slot +bool +make_tinted( opengl_material &Variant, glm::vec3 const &Colour ) { + + if( !Variant.shader ) { + return false; + } + auto const &conf { Variant.shader->param_conf }; + auto const weathering { conf.find( "weathering" ) }; + auto const tint { conf.find( "tint" ) }; + if( weathering == conf.end() + || tint == conf.end() + || weathering->second.offset != 3 + || tint->second.location != weathering->second.location + || tint->second.offset != 0 + || std::any_of( + std::begin( conf ), std::end( conf ), + [&]( auto const &Entry ) { + return Entry.first != weathering->first && Entry.first != tint->first && Entry.second.location == weathering->second.location; } ) ) { + return false; + } + auto const location { weathering->second.location }; + Variant.params[ location ] = glm::vec4{ Colour, -1.f }; + Variant.params_state.erase( + std::remove_if( + std::begin( Variant.params_state ), std::end( Variant.params_state ), + [&]( gl::shader::param_entry const &State ) { + return State.location == location; } ), + std::end( Variant.params_state ) ); + return true; +} + } // namespace material_handle @@ -713,25 +773,7 @@ material_manager::create_matte( material_handle const Material ) { return lookup->second; } auto matte { variant_of( m_materials[ Material ], ":matte" ) }; - matte.glossiness = 0.1f; - if( matte.shader ) { - for( auto const &[ key, value ] : std::vector>{ { "weathering", glm::vec4{ 1.f } } } ) { - auto const entry { matte.shader->param_conf.find( key ) }; - if( entry == matte.shader->param_conf.end() - || shares_slot( matte.shader->param_conf, key ) ) { - continue; - } - for( std::size_t i = 0; i < entry->second.size; ++i ) { - matte.params[ entry->second.location ][ entry->second.offset + i ] = value[ static_cast( i ) ]; - } - matte.params_state.erase( - std::remove_if( - std::begin( matte.params_state ), std::end( matte.params_state ), - [&]( gl::shader::param_entry const &State ) { - return State.location == entry->second.location && State.offset == entry->second.offset; } ), - std::end( matte.params_state ) ); - } - } + make_matte( matte ); auto const mattehandle { static_cast( m_materials.size() ) }; m_materials.emplace_back( std::move( matte ) ); m_mattes.emplace( Material, mattehandle ); @@ -748,43 +790,47 @@ material_manager::create_tinted( material_handle const Material, glm::vec3 const if( auto const lookup { m_tints.find( key ) }; lookup != m_tints.end() ) { return lookup->second; } - // the colour in the rgb of the slot of the weathering, which tells the shader to tint by its sign; nothing else in that slot - auto const &conf { m_materials[ Material ].shader->param_conf }; - auto const weathering { conf.find( "weathering" ) }; - auto const tint { conf.find( "tint" ) }; - if( weathering == conf.end() - || tint == conf.end() - || weathering->second.offset != 3 - || tint->second.location != weathering->second.location - || tint->second.offset != 0 - || std::any_of( - std::begin( conf ), std::end( conf ), - [&]( auto const &Entry ) { - return Entry.first != weathering->first && Entry.first != tint->first && Entry.second.location == weathering->second.location; } ) ) { + auto tinted { variant_of( m_materials[ Material ], ":tinted" ) }; + if( false == make_tinted( tinted, Colour ) ) { return Material; } - auto tinted { variant_of( m_materials[ Material ], ":tinted" ) }; - tinted.glossiness = m_materials[ Material ].glossiness; - auto const location { weathering->second.location }; - tinted.params[ location ] = glm::vec4{ Colour, -1.f }; - tinted.params_state.erase( - std::remove_if( - std::begin( tinted.params_state ), std::end( tinted.params_state ), - [&]( gl::shader::param_entry const &State ) { - return State.location == location; } ), - std::end( tinted.params_state ) ); auto const tintedhandle { static_cast( m_materials.size() ) }; m_materials.emplace_back( std::move( tinted ) ); m_tints.emplace( key, tintedhandle ); return tintedhandle; } +void +material_manager::update_variants( bool const Weather ) { + + // the copies don't update themselves, their names aren't files to read again + auto const changed = [&]( material_handle const Source ) { + auto const &source { m_materials[ Source ] }; + return Weather ? source.update_on_weather_change : source.update_on_season_change; }; + for( auto const &[ source, matte ] : m_mattes ) { + if( changed( source ) ) { + auto variant { variant_of( m_materials[ source ], ":matte" ) }; + make_matte( variant ); + m_materials[ matte ] = std::move( variant ); + } + } + for( auto const &[ key, tinted ] : m_tints ) { + auto const source { std::get<0>( key ) }; + if( changed( source ) ) { + auto variant { variant_of( m_materials[ source ], ":tinted" ) }; + make_tinted( variant, glm::vec3 { std::get<1>( key ), std::get<2>( key ), std::get<3>( key ) } ); + m_materials[ tinted ] = std::move( variant ); + } + } +} + void material_manager::on_weather_change() { for( auto &material : m_materials ) { if( material.update_on_weather_change ) { material.update(); } } + update_variants( true ); } void @@ -793,6 +839,7 @@ material_manager::on_season_change() { for( auto &material : m_materials ) { if( material.update_on_season_change ) { material.update(); } } + update_variants( false ); } // checks whether specified material is in the material bank. returns handle to the material, or a null handle diff --git a/model/material.h b/model/material.h index 05a68880f..82d14557c 100644 --- a/model/material.h +++ b/model/material.h @@ -145,6 +145,8 @@ public: // copy of provided material with its specular highlights and reflections damped. returns: handle to the copy, made once per material material_handle create_matte( material_handle const Material ); + // copy of provided material with its texture tinted to the colour as far as the userdata of the vertices says. returns: handle to + // the copy, made once per material and colour; the material itself when its shader can't tint it material_handle create_tinted( material_handle const Material, glm::vec3 const &Colour ); opengl_material const & @@ -166,6 +168,9 @@ private: // checks whether specified texture is in the texture bank. returns texture id, or npos. material_handle find_in_databank( std::string const &Materialname ) const; + // the matte and tinted copies of the materials changed with the weather or the season made again from them, under their handles + void + update_variants( bool const Weather ); public: // checks whether specified file exists. returns name of the located file, or empty string. static std::pair diff --git a/rendering/geometrybank.cpp b/rendering/geometrybank.cpp index 2a1ff5ee6..aa7c1f8b5 100644 --- a/rendering/geometrybank.cpp +++ b/rendering/geometrybank.cpp @@ -378,6 +378,8 @@ geometry_bank::vertices( gfx::geometry_handle const &Geometry ) const { unsigned int geometry_bank::primitive( gfx::geometry_handle const &Geometry ) const { + if( ( Geometry.chunk == 0 ) || ( Geometry.chunk > m_chunks.size() ) ) { return no_primitive; } + return geometry_bank::chunk( Geometry ).type; } @@ -516,6 +518,8 @@ geometrybank_manager::vertices( gfx::geometry_handle const &Geometry ) const { unsigned int geometrybank_manager::primitive( gfx::geometry_handle const &Geometry ) const { + if( ( Geometry.bank == 0 ) || ( Geometry.bank > m_geometrybanks.size() ) ) { return geometry_bank::no_primitive; } + return bank( Geometry ).first->primitive( Geometry ); } diff --git a/rendering/geometrybank.h b/rendering/geometrybank.h index 537c79ba2..c01e46fe3 100644 --- a/rendering/geometrybank.h +++ b/rendering/geometrybank.h @@ -139,8 +139,9 @@ public: auto vertices( gfx::geometry_handle const &Geometry ) const -> gfx::vertex_array const &; // provides direct access to vertex user data of specfied chunk auto userdata( gfx::geometry_handle const &Geometry ) const -> gfx::userdata_array const &; - // kind of geometry of specified chunk, GL_TRIANGLES, GL_TRIANGLE_STRIP... + // kind of geometry of specified chunk, GL_TRIANGLES, GL_TRIANGLE_STRIP...; no_primitive for a handle to no chunk auto primitive( gfx::geometry_handle const &Geometry ) const -> unsigned int; + static constexpr unsigned int no_primitive { ~0u }; protected: // types: diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index 97b2fa8d2..9b42bb280 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -2225,7 +2225,8 @@ gfx::userdata_array const &opengl33_renderer::UserData(const gfx::geometry_handl int opengl33_renderer::Primitive(gfx::geometry_handle const &Geometry) const { - return static_cast(m_geometry.primitive(Geometry)); + auto const primitive{m_geometry.primitive(Geometry)}; + return primitive == gfx::geometry_bank::no_primitive ? -1 : static_cast(primitive); } // material methods From 85233160069bd0d5b79dcb34800363431eebb61e Mon Sep 17 00:00:00 2001 From: maj00r Date: Tue, 3 Nov 2026 23:03:52 +0100 Subject: [PATCH 252/430] fix(track): a tributary loads as a river of its first path keeping the second, a track of an unknown type is left out, where both made the simulator fall over as it loaded On master neither got a segment: update_location() dereferenced the missing one of a track of an unknown type, and a tributary went to Switch(0), which logged "Cannot switch normal track", with no segment under it either. A tributary is now a river of its first path. Its second path is kept in m_paths, isn't drawn nor run on, and is written back with the type "tributary". A track of an unknown type is logged and left out by the loader; as it is no node, its text stays in the file when the editor saves the scenery. --- simulation/simulationstateserializer.cpp | 6 ++++++ world/Track.cpp | 18 ++++++++++++++++-- world/Track.h | 1 + 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index 1ff771d1d..78955c828 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -543,6 +543,12 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch else if( nodedata.type == "track" ) { auto *path { deserialize_path( Input, Scratchpad, nodedata ) }; + if( path->eType == tt_Unknown ) { + // with no path made it can't be joined nor drawn, and nothing could run on it + ErrorLog( "Bad scenario: track \"" + path->name() + "\" of an unknown type defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ") left out" ); + delete path; + return; + } // duplicates of named tracks are currently experimentally allowed if( false == simulation::Paths.insert( path ) ) { ErrorLog( "Bad scenario: duplicate track name \"" + path->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); diff --git a/world/Track.cpp b/world/Track.cpp index f1a29798c..14998ce7c 100644 --- a/world/Track.cpp +++ b/world/Track.cpp @@ -427,11 +427,15 @@ void TTrack::Load(cParser *parser, glm::dvec3 const &pOrigin) } else if (str == "tributary") { - eType = tt_Tributary; + // dopływ: no path of it was ever made, the simulator falling over it as it loaded. a river of its first path now, the + // second one kept and written back + ErrorLog("Bad track: tributary \"" + m_name + "\" in file \"" + parser->Name() + "\" (line " + std::to_string(parser->Line()) + ") is drawn and run on as a river of its first path"); + eType = tt_Normal; iCategoryFlag = 4; + m_tributary = true; } else - eType = tt_Unknown; + eType = tt_Unknown; // left out by the loader if (Global.iWriteLogEnabled & 4) WriteLog(str); parser->getTokens(4); @@ -517,6 +521,11 @@ void TTrack::Load(cParser *parser, glm::dvec3 const &pOrigin) break; } } + if( m_tributary ) { + // the second path of a tributary, kept to be written back + m_paths.emplace_back(); + m_paths.back().deserialize( *parser, pOrigin ); + } init_segments( true ); @@ -681,6 +690,10 @@ void TTrack::Load(cParser *parser, glm::dvec3 const &pOrigin) m_name = m_name.substr(0, i - 1); // usunięcie z nazwy } + if( CurrentSegment() == nullptr ) { + // of an unknown type, no path of it is made + return; + } update_location(); // sleeper transforms are baked later in create_geometry(), once the owning cell has // assigned this track its m_origin (otherwise the local-space matrices would be relative @@ -2314,6 +2327,7 @@ TTrack::export_as_text_( std::ostream &Output ) const { // type Output << ( eType == tt_Normal ? ( + m_tributary ? "tributary" : iCategoryFlag == 1 ? "normal" : iCategoryFlag == 2 ? "road" : iCategoryFlag == 4 ? "river" : diff --git a/world/Track.h b/world/Track.h index 72a6b7ff4..5952da6a7 100644 --- a/world/Track.h +++ b/world/Track.h @@ -187,6 +187,7 @@ public: std::vector m_paths; // source data for owned paths bool m_editorremoved { false }; + bool m_tributary { false }; // loaded as a tributary: a river of its first path, the second one kept to be written back scene::basic_node *m_road { nullptr }; // road or road junction which generated this path. such path is one-way, and isn't saved nor edited on its own std::array m_routeweights { 0.f, 0.f, 0.f }; // odds of each route through a crossroads being picked by a driver, by the number of the route. all zero: even odds int iterate_stamp = 0; From 09b1c2de10463f69331841a81cc18999fd7846a2 Mon Sep 17 00:00:00 2001 From: maj00r <73280030+maj00r@users.noreply.github.com> Date: Thu, 5 Nov 2026 03:12:05 +0100 Subject: [PATCH 253/430] fix(utilities): win1250_to_utf8 turns the polish letters into utf-8, not into themselves (#252) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit utilities.cpp starts with a byte order mark, so the compiler reads it as utf-8. The game's targets don't get /utf-8, though: set_target_properties(... COMPILE_OPTIONS ...) in the MSVC block of CMakeLists.txt replaces the options add_compile_options gave them. So the string literals went into the program in the code page of the system, windows-1250 on a polish one, and the map of win1250_to_utf8 turned each letter into itself. What read windows-1250 through it got no utf-8: the names, descriptions and categories of the sceneries and the names of the textures in the launcher, and the descriptions of the templates in the editor. The editor writes such a description back through utf8_to_win1250, which makes a question mark of each byte that doesn't start a utf-8 sequence, so the letters it had read unchanged didn't come back. The utf-8 sequences are written as bytes now, the way utf8_to_win1250 has them, so they don't depend on the options. The options stay as they are: with /utf-8 other literals of the files with a byte order mark would change, the "±" of the table of Bezogonkow would take two bytes and move the letters after it. The unit tests check the letters and that the text given is valid utf-8. Co-authored-by: maj00r --- tests/unit/test_win1250.cpp | 26 ++++++++++++++++++++++++++ utilities/utilities.cpp | 7 +++++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 tests/unit/test_win1250.cpp diff --git a/tests/unit/test_win1250.cpp b/tests/unit/test_win1250.cpp new file mode 100644 index 000000000..156c46ae7 --- /dev/null +++ b/tests/unit/test_win1250.cpp @@ -0,0 +1,26 @@ +#include "stdafx.h" +#include "doctest.h" +#include "utilities/utilities.h" + +// the polish letters, in windows-1250 and in utf-8; written as bytes, the build reads the sources in any code page +namespace +{ +std::string const kWin1250{"\xA5\xC6\xCA\xA3\xD1\xD3\x8C\x8F\xAF\xB9\xE6\xEA\xB3\xF1\xF3\x9C\x9F\xBF"}; +std::string const kUtf8{"\xC4\x84\xC4\x86\xC4\x98\xC5\x81\xC5\x83\xC3\x93\xC5\x9A\xC5\xB9\xC5\xBB" + "\xC4\x85\xC4\x87\xC4\x99\xC5\x82\xC5\x84\xC3\xB3\xC5\x9B\xC5\xBA\xC5\xBC"}; +} // namespace + +TEST_CASE("win1250: the polish letters of a scenery file read as utf-8") { + CHECK(win1250_to_utf8("Bia\xB3" "a Podlaska") == "Bia\xC5\x82" "a Podlaska"); + CHECK(win1250_to_utf8(kWin1250) == kUtf8); + // the rest of the text stays as it is + CHECK(win1250_to_utf8("tor 1, km 0.178") == "tor 1, km 0.178"); +} + +TEST_CASE("win1250: what win1250_to_utf8 gives is valid utf-8") { + std::u32string decoded; + CHECK_FALSE(utf8_to_utf32(kWin1250, decoded)); + REQUIRE(utf8_to_utf32(win1250_to_utf8(kWin1250), decoded)); + CHECK(decoded.size() == kWin1250.size()); + CHECK(decoded[12] == U'\x0142'); +} diff --git a/utilities/utilities.cpp b/utilities/utilities.cpp index 02608262b..e84307e39 100644 --- a/utilities/utilities.cpp +++ b/utilities/utilities.cpp @@ -317,8 +317,11 @@ void win1250_to_ascii(std::string &Input) std::string win1250_to_utf8(const std::string &Input) { - std::unordered_map const charmap{{165, "Ą"}, {198, "Ć"}, {202, "Ę"}, {163, "Ł"}, {209, "Ń"}, {211, "Ó"}, {140, "Ś"}, {143, "Ź"}, {175, "Ż"}, - {185, "ą"}, {230, "ć"}, {234, "ę"}, {179, "ł"}, {241, "ń"}, {243, "ó"}, {156, "ś"}, {159, "ź"}, {191, "ż"}}; + // the utf-8 sequences written as bytes: the file has a byte order mark and the build doesn't give the compiler /utf-8, so letters + // written as letters would end up in the program in windows-1250, the same as the input + static std::unordered_map const charmap{{'\xA5', "\xC4\x84"}, {'\xC6', "\xC4\x86"}, {'\xCA', "\xC4\x98"}, {'\xA3', "\xC5\x81"}, {'\xD1', "\xC5\x83"}, {'\xD3', "\xC3\x93"}, + {'\x8C', "\xC5\x9A"}, {'\x8F', "\xC5\xB9"}, {'\xAF', "\xC5\xBB"}, {'\xB9', "\xC4\x85"}, {'\xE6', "\xC4\x87"}, {'\xEA', "\xC4\x99"}, + {'\xB3', "\xC5\x82"}, {'\xF1', "\xC5\x84"}, {'\xF3', "\xC3\xB3"}, {'\x9C', "\xC5\x9B"}, {'\x9F', "\xC5\xBA"}, {'\xBF', "\xC5\xBC"}}; std::string output; std::unordered_map::const_iterator lookup; for (auto &input : Input) From fc22645d7c5a1fa7c008436b48541296bbbec040 Mon Sep 17 00:00:00 2001 From: pawelw Date: Thu, 5 Nov 2026 10:25:26 +0100 Subject: [PATCH 254/430] fix(physics): articulated couplers stall freight trains (eu07/maszyna#553) (#255) * fix(physics): articulated couplers stall freight trains (eu07/maszyna#553) Articulated wagons (T3000e, N-230, N-234) set up with CType=Articulated barely moved in a freight train and jerked. - The articulated joint took the spring force up to DmaxC = 0.05 m only, 225 kN, well short of its FmaxC of 850 kN and of what a loaded section in a freight train takes. It overstretched and the sections collided at every physics step. Dmax is now sized so the spring carries FmaxC (0.19 m stretched, 0.09 m pressed in), never below the old 0.05 m. - ComputeCollision() scaled the velocities of both vehicles by sqrt(1 - beta), so each collision braked the pair as a whole: two coupled vehicles in a sustained "collision" lost a third of their speed per step. The restitution now applies to the velocities relative to the centre of mass only, and the pair keeps its momentum. Tests: the articulated joint carries FmaxC within its travel; a jerked articulated set and a jerked screw-coupled pair keep their momentum. On the code before the fix both pairs stop dead within 3 s. * style(physics): English-only comment in ComputeCollision() The comment above the collision velocities started in Polish and went on in English. * style(physics): SonarQube findings in the #553 fix std::lerp for the collision velocities (cpp:S6179) and test locals renamed so they no longer shadow the end and coupling enumerators (cpp:S1117). --- McZapkie/Mover.cpp | 17 ++++++--- tests/unit/test_couplers.cpp | 69 ++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 4 deletions(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index cb17e30ad..954e277ba 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -17,6 +17,7 @@ http://mozilla.org/MPL/2.0/. #include "utilities/parser.h" #include "simulation/simulation.h" +#include #include //--------------------------------------------------------------------------- @@ -51,8 +52,13 @@ double ComputeCollision(double &v1, double &v2, double m1, double m2, double bet double sum = m1 + m2; double w1 = (m2 * v2 * 2.0 + v1 * (m1 - m2)) / sum; double w2 = (m1 * v1 * 2.0 + v2 * (m2 - m1)) / sum; - v1 = w1 * std::sqrt(1.0 - beta); // niejawna zmiana predkosci wskutek zderzenia - v2 = w2 * std::sqrt(1.0 - beta); + // the collision changes the velocities directly: the bounce loses energy in the velocities relative to the + // centre of mass only, the pair keeps its momentum. scaling the velocities themselves braked the vehicles + // down with every step their couplers spent stretched or pressed in all the way (eu07/maszyna#553) + auto const centre{(m1 * v1 + m2 * v2) / sum}; + auto const restitution{std::sqrt(1.0 - beta)}; + v1 = std::lerp(centre, w1, restitution); + v2 = std::lerp(centre, w2, restitution); return m1 * (w2 - w1) * (1 - beta); } } @@ -10695,12 +10701,15 @@ void TMoverParameters::LoadFIZ_BuffCoupl(std::string const &line, int const Inde coupler->beta = 0.55; */ thiscoupler->SpringKC = 4500 * 1000; - thiscoupler->DmaxC = 0.05; thiscoupler->FmaxC = 850 * 1000; thiscoupler->SpringKB = 9200 * 1000; - thiscoupler->DmaxB = 0.05; thiscoupler->FmaxB = 320 * 1000; thiscoupler->beta = 0.55; + // the spring force is taken up to Dmax only, past it the vehicles collide (CollisionDetect()); so the joint + // carries the full FmaxC either way before it gives. with 0.05 m it carried 225 kN, short of what a loaded + // articulated wagon in a freight train takes, which then collided at every step (eu07/maszyna#553) + thiscoupler->DmaxC = std::max(0.05, thiscoupler->FmaxC / thiscoupler->SpringKC); + thiscoupler->DmaxB = std::max(0.05, thiscoupler->FmaxC / thiscoupler->SpringKB); } if (Index == 0) diff --git a/tests/unit/test_couplers.cpp b/tests/unit/test_couplers.cpp index 8787a419b..2a0ff6e50 100644 --- a/tests/unit/test_couplers.cpp +++ b/tests/unit/test_couplers.cpp @@ -456,3 +456,72 @@ TEST_CASE("couplers: the coupler force of vehicles facing each other lands on th CHECK(second->Couplers[end::front].CForce == 0.0); } } + +// eu07/maszyna#553: articulated wagons (T3000e, N-234 and the like) set up with articulated couplers barely moved in a +// freight train. the joint took the spring force up to 5 cm only, 225 kN, so it overstretched under the train and the +// sections collided at every step; and each collision scaled the velocities of both vehicles down, rather than only +// the velocity of one relative to the other, braking the whole train + +namespace { + +// the wagon from data/wagon.json, loaded, with articulated couplers at both ends +vehicle articulated_wagon(double Velocity, std::string const &Name) { + return vehicle{definition::load("wagon").set("Param", "M", 60000).set("BuffCoupl", "CType", "Articulated"), Velocity, Name}; +} + +// couples the facing ends of the two vehicles for good, as the scenery does for an articulated set +void join(vehicle &First, int FirstEnd, vehicle &Second, int SecondEnd) { + REQUIRE(First->Attach(FirstEnd, SecondEnd, &Second.mover(), coupling::coupler, true, false)); + REQUIRE(Second->Attach(SecondEnd, FirstEnd, &First.mover(), coupling::coupler, true, false)); +} + +} // namespace + +TEST_CASE("couplers: an articulated joint takes its full tensile force within its travel") { + auto wagon{articulated_wagon(0.0, "wagon")}; + auto const &joint{wagon->Couplers[end::front]}; + REQUIRE(joint.type() == TCouplerType::Articulated); + + CHECK(joint.SpringKC * joint.DmaxC >= doctest::Approx(joint.FmaxC)); + CHECK(joint.SpringKB * joint.DmaxB >= doctest::Approx(joint.FmaxC)); + // and no less than it had before + CHECK(joint.DmaxC >= 0.05); + CHECK(joint.DmaxB >= 0.05); +} + +TEST_CASE("couplers: an articulated set keeps its momentum when one section jerks the other") { + // the front section moving, the rear one barely (so that its brakes are released), joined: the jerk overstretches the joint, the sections collide + // and run on together at half the speed, as the momentum they have between them dictates + auto front_section{articulated_wagon(20.0, "front")}; + auto rear_section{articulated_wagon(0.1, "rear")}; + join(rear_section, end::front, front_section, end::rear); + test::pair pair{rear_section, end::front, front_section, end::rear, 0.0}; + REQUIRE(pair.coupled()); + // brakes released, as a locomotive keeps them + front_section.hold_brake_pipe(5.0); + rear_section.hold_brake_pipe(5.0); + + pair.run(3.0, test::track{0.15, 0.0}); + + CHECK(front_section.speed() == doctest::Approx(rear_section.speed()).epsilon(0.1)); + // rolling resistance takes a little in the 3 s, the collisions used to take most of it + CHECK(0.5 * (front_section.speed() + rear_section.speed()) > 9.0); + CHECK(0.5 * (front_section.speed() + rear_section.speed()) < 10.05 + 1e-6); + CHECK(pair.coupled()); +} + +TEST_CASE("couplers: a collision of coupled vehicles keeps the momentum of the pair") { + // the same jerk through screw couplers, which collide when stretched beyond their travel as well + auto front_wagon{vehicle{definition::load("wagon"), 30.0, "front"}}; + auto rear_wagon{vehicle{definition::load("wagon"), 0.1, "rear"}}; + join(rear_wagon, end::front, front_wagon, end::rear); + test::pair pair{rear_wagon, end::front, front_wagon, end::rear, 0.0}; + REQUIRE(pair.coupled()); + front_wagon.hold_brake_pipe(5.0); + rear_wagon.hold_brake_pipe(5.0); + + pair.run(3.0, test::track{0.15, 0.0}); + + CHECK(0.5 * (front_wagon.speed() + rear_wagon.speed()) > 13.5); + CHECK(0.5 * (front_wagon.speed() + rear_wagon.speed()) < 15.05 + 1e-6); +} From a6778c9fe24f8bee37ce045cf99e797a943da0d0 Mon Sep 17 00:00:00 2001 From: maj00r Date: Fri, 6 Nov 2026 19:54:54 +0100 Subject: [PATCH 255/430] refactor: the Sonar remarks on the small fixes taken care of - the log stops through a flag kept in a function, not a global one - the messages are put together with std::format - a vehicle dropped on a trainset in the launcher goes in once the trainset is drawn, so the vehicles are gone through with a plain loop again; the drop split into a new vehicle and a moved one - the scenario that can't be opened is caught as the runtime error it is, a file name outside of the code page as the system error it is - a track of an unknown type is left out through the pointer owning it - the keyword of a track type written out by a function of its own - the picked node forgotten with ranges::replace_if, the empty Forget_Node of the base renderer told why it is empty - FileCased takes the path it works on --- application/application.cpp | 4 +- application/scenarioloadermode.cpp | 7 +- launcher/scenery_list.cpp | 103 +++++++++++++++-------- launcher/scenery_list.h | 4 + launcher/scenery_scanner.cpp | 5 +- rendering/opengl33renderer.cpp | 2 +- rendering/openglrenderer.cpp | 2 +- rendering/renderer.h | 4 +- simulation/simulationstateserializer.cpp | 12 +-- utilities/Logs.cpp | 15 +++- utilities/utilities.cpp | 11 ++- utilities/utilities.h | 2 +- world/Track.cpp | 42 ++++++--- world/Track.h | 2 + 14 files changed, 140 insertions(+), 75 deletions(-) diff --git a/application/application.cpp b/application/application.cpp index 33f5c8a0e..9b7b82853 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -696,8 +696,8 @@ void eu07_application::exit() Global.applicationQuitOrder = true; // each step of the closing in the log, to tell from it where a closing that hangs stops auto const closing{std::chrono::steady_clock::now()}; - auto const step = [&](char const *What) { - WriteLog(std::string{"Closing: "} + What + " at " + std::to_string(std::chrono::duration_cast(std::chrono::steady_clock::now() - closing).count()) + " ms"); + auto const step = [closing](char const *What) { + WriteLog(std::format("Closing: {} at {} ms", What, std::chrono::duration_cast(std::chrono::steady_clock::now() - closing).count())); }; step("the modes"); for (auto &mode : m_modes) diff --git a/application/scenarioloadermode.cpp b/application/scenarioloadermode.cpp index eaa034f7e..f8f06ac93 100644 --- a/application/scenarioloadermode.cpp +++ b/application/scenarioloadermode.cpp @@ -21,6 +21,8 @@ http://mozilla.org/MPL/2.0/. #include "utilities/translation.h" #include "audio/audiorenderer.h" +#include + scenarioloader_mode::scenarioloader_mode() { m_userinterface = std::make_shared(); } @@ -52,8 +54,9 @@ bool scenarioloader_mode::update() { try { state = simulation::State.deserialize_begin(Global.SceneryFile); } - catch (std::exception const &e) { - ErrorLog("Bad init: scenario \"" + Global.SceneryFile + "\" couldn't be opened (" + e.what() + ")"); + // the file it can't read, as the parser and the scenery opening it report it + catch (std::runtime_error const &e) { + ErrorLog(std::format("Bad init: scenario \"{}\" couldn't be opened ({})", Global.SceneryFile, e.what())); state.reset(); Global.SceneryFile.clear(); Application.pop_mode(); diff --git a/launcher/scenery_list.cpp b/launcher/scenery_list.cpp index 195b0e2c3..6a57db54b 100644 --- a/launcher/scenery_list.cpp +++ b/launcher/scenery_list.cpp @@ -8,6 +8,28 @@ #include "utilities/translation.h" #include +#include + +namespace +{ + +// the skin of the bank of vehicles as it's shared, the one a skin dragged out of the bank points at; none for one gone since +std::shared_ptr shared_skin(ui::skin_set const *Skin) +{ + auto const vehicle{Skin->vehicle.lock()}; + if (vehicle == nullptr) + return {}; + auto const found{std::ranges::find_if(vehicle->matching_skinsets, [Skin](std::shared_ptr const &Set) { return Set.get() == Skin; })}; + return found != vehicle->matching_skinsets.end() ? *found : nullptr; +} + +// the name of a vehicle put in a trainset, with a number of its own +std::string numbered(std::string const &Name) +{ + return std::format("{}_{}", Name, static_cast(LocalRandom(0.0, 10000000.0))); +} + +} // namespace ui::scenerylist_panel::scenerylist_panel(scenery_scanner &scanner) : ui_panel(STR("Scenario list"), false), scanner(scanner), placeholder_mini("textures/mini/other") @@ -283,8 +305,8 @@ void ui::scenerylist_panel::draw_trainset(trainset_desc &trainset) draw_droptarget(trainset, position++); ImGui::SameLine(15.0f); - for (std::size_t index = 0; index < trainset.vehicles.size(); ++index) { - auto &dyn_desc = trainset.vehicles[index]; + // a vehicle dropped between them goes in once they're all drawn, so they're gone through unchanged + for (auto &dyn_desc : trainset.vehicles) { deferred_image *mini = nullptr; if (dyn_desc.skin && dyn_desc.skin->mini.get() != deferred_image::invalid_id) @@ -333,6 +355,10 @@ void ui::scenerylist_panel::draw_trainset(trainset_desc &trainset) ImGui::PopID(); } + if (m_drop) { + m_drop(); + m_drop = nullptr; + } ImGui::NewLine(); ImGui::PopID(); @@ -341,44 +367,47 @@ void ui::scenerylist_panel::draw_trainset(trainset_desc &trainset) void ui::scenerylist_panel::draw_droptarget(trainset_desc &trainset, int position) { ImGui::Dummy(ImVec2(15, 30)); - if (ImGui::BeginDragDropTarget()) { - const ImGuiPayload *payload = ImGui::AcceptDragDropPayload("vehicle_pure"); - if (payload) { - skin_set *ptr = *reinterpret_cast(payload->Data); - std::shared_ptr skin; - if (auto const vehicle = ptr->vehicle.lock()) - for (auto &s : vehicle->matching_skinsets) - if (s.get() == ptr) - skin = s; + if (false == ImGui::BeginDragDropTarget()) + return; + if (auto const *payload{ImGui::AcceptDragDropPayload("vehicle_pure")}) + drop_new_vehicle(trainset, position, *static_cast(payload->Data)); + if (auto const *payload{ImGui::AcceptDragDropPayload("vehicle_set")}) + drop_moved_vehicle(trainset, position, *static_cast(payload->Data)); + ImGui::EndDragDropTarget(); +} - if (skin) { - trainset.vehicles.emplace(trainset.vehicles.begin() + position); - dynamic_desc &desc = trainset.vehicles[position]; +// a vehicle of the bank dropped on a gap of a trainset, put in there as a new one of it +void ui::scenerylist_panel::drop_new_vehicle(trainset_desc &trainset, int const position, skin_set const *Skin) +{ + auto skin{shared_skin(Skin)}; + if (skin == nullptr) + return; + m_drop = [&trainset, position, skin] { + auto &desc{*trainset.vehicles.emplace(trainset.vehicles.begin() + position)}; + desc.name = numbered(skin->skin); + desc.vehicle = skin->vehicle.lock(); + desc.skin = skin; + }; +} - desc.name = skin->skin + "_" + std::to_string((int)LocalRandom(0.0, 10000000.0)); - desc.vehicle = skin->vehicle.lock(); - desc.skin = skin; - } +// a vehicle of a trainset dropped on a gap of it or of another one: moved there within it, from another one copied in with a +// name of its own +void ui::scenerylist_panel::drop_moved_vehicle(trainset_desc &trainset, int const position, vehicle_moved const &Moved) +{ + auto copy{Moved.dynamic}; + auto &source{Moved.source}; + auto const from{Moved.position}; + if (&trainset != &source) + copy.name = numbered(copy.skin ? copy.skin->skin : copy.name); + m_drop = [&trainset, &source, from, position, copy] { + auto offset{0}; + if (&trainset == &source) { + trainset.vehicles.erase(trainset.vehicles.begin() + from); + if (from < position) + offset = -1; } - - payload = ImGui::AcceptDragDropPayload("vehicle_set"); - if (payload) { - vehicle_moved *moved = reinterpret_cast(payload->Data); - - dynamic_desc desc_copy = moved->dynamic; - int offset = 0; - if (&trainset == &moved->source) { - trainset.vehicles.erase(trainset.vehicles.begin() + moved->position); - if (moved->position < position) - offset = -1; - } else { - desc_copy.name = (desc_copy.skin ? desc_copy.skin->skin : desc_copy.name) + "_" + std::to_string((int)LocalRandom(0.0, 10000000.0)); - } - - trainset.vehicles.insert(trainset.vehicles.begin() + position + offset, desc_copy); - } - ImGui::EndDragDropTarget(); - } + trainset.vehicles.insert(trainset.vehicles.begin() + position + offset, copy); + }; } void ui::scenerylist_panel::purge_selected_trainset() diff --git a/launcher/scenery_list.h b/launcher/scenery_list.h index 957f1b5ee..0bc91c452 100644 --- a/launcher/scenery_list.h +++ b/launcher/scenery_list.h @@ -54,6 +54,8 @@ private: scenery_desc *selected_scenery = nullptr; trainset_desc *selected_trainset = nullptr; deferred_image placeholder_mini; + // a vehicle dropped on a gap between the vehicles of a trainset: put in there once they're all drawn, not while they are + std::function m_drop; void draw_scenery_list(); void draw_scenery_info(); @@ -67,6 +69,8 @@ private: void open_link(const std::string &link); void draw_trainset(trainset_desc &trainset); void draw_droptarget(trainset_desc &trainset, int position); + void drop_new_vehicle(trainset_desc &trainset, int position, skin_set const *Skin); + void drop_moved_vehicle(trainset_desc &trainset, int position, vehicle_moved const &Moved); void purge_selected_trainset(); }; } // namespace ui diff --git a/launcher/scenery_scanner.cpp b/launcher/scenery_scanner.cpp index 5f6a6d2f9..6e258425e 100644 --- a/launcher/scenery_scanner.cpp +++ b/launcher/scenery_scanner.cpp @@ -2,6 +2,8 @@ #include "scenery_scanner.h" #include "utilities/Logs.h" +#include + scenery_scanner::scenery_scanner(ui::vehicles_bank &bank) : bank(bank) { @@ -17,7 +19,8 @@ void scenery_scanner::scan() try { name = path.string(); } - catch (std::exception const &) { + catch (std::system_error const &) { + // a name outside of the code page, which the path can't give as a string on Windows continue; } diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index a5d1f3894..a8a1b2139 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -5414,7 +5414,7 @@ void opengl33_renderer::Forget_Node(scene::basic_node const *Node) { if (m_picksceneryitem == Node) m_picksceneryitem = nullptr; - std::replace_if(m_picksceneryitems.begin(), m_picksceneryitems.end(), [Node](scene::basic_node const *Item) { return Item == Node; }, nullptr); + std::ranges::replace_if(m_picksceneryitems, [Node](scene::basic_node const *Item) { return Item == Node; }, nullptr); } glm::dvec3 opengl33_renderer::Update_Mouse_Position() diff --git a/rendering/openglrenderer.cpp b/rendering/openglrenderer.cpp index 864d84141..6313aa55f 100644 --- a/rendering/openglrenderer.cpp +++ b/rendering/openglrenderer.cpp @@ -1894,7 +1894,7 @@ opengl_renderer::Forget_Node( scene::basic_node const *Node ) { if( m_picksceneryitem == Node ) { m_picksceneryitem = nullptr; } - std::replace_if( m_picksceneryitems.begin(), m_picksceneryitems.end(), [Node]( scene::basic_node const *Item ) { return Item == Node; }, nullptr ); + std::ranges::replace_if( m_picksceneryitems, [Node]( scene::basic_node const *Item ) { return Item == Node; }, nullptr ); } void diff --git a/rendering/renderer.h b/rendering/renderer.h index e9dc8a47c..5850e1754 100644 --- a/rendering/renderer.h +++ b/rendering/renderer.h @@ -91,7 +91,9 @@ public: virtual auto Pick_Control() const -> TSubModel const * = 0; virtual auto Pick_Node() const -> scene::basic_node const * = 0; // a node deleted from the scene is no longer given as picked - virtual void Forget_Node( scene::basic_node const *Node ) {} + virtual void Forget_Node( scene::basic_node const * /*Node*/ ) { + // a renderer which keeps no node picked has none to forget + } virtual auto Mouse_Position() const -> glm::dvec3 = 0; virtual auto Mouse_Hit() const -> bool { return true; } diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index 78955c828..664f3b955 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -36,6 +36,7 @@ http://mozilla.org/MPL/2.0/. #include "utilities/utilities.h" #include "editor/editorTerrainStreamer.hpp" +#include namespace simulation { @@ -542,13 +543,14 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch } else if( nodedata.type == "track" ) { - auto *path { deserialize_path( Input, Scratchpad, nodedata ) }; - if( path->eType == tt_Unknown ) { - // with no path made it can't be joined nor drawn, and nothing could run on it - ErrorLog( "Bad scenario: track \"" + path->name() + "\" of an unknown type defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ") left out" ); - delete path; + std::unique_ptr made { deserialize_path( Input, Scratchpad, nodedata ) }; + if( made->eType == tt_Unknown ) { + // with no path made it can't be joined nor drawn, and nothing could run on it: it goes with its holder + ErrorLog( std::format( "Bad scenario: track \"{}\" of an unknown type defined in file \"{}\" (line {}) left out", made->name(), Input.Name(), inputline ) ); return; } + // from here on the scene owns it + auto *path { made.release() }; // duplicates of named tracks are currently experimentally allowed if( false == simulation::Paths.insert( path ) ) { ErrorLog( "Bad scenario: duplicate track name \"" + path->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); diff --git a/utilities/Logs.cpp b/utilities/Logs.cpp index 18020d6f1..38094d72e 100644 --- a/utilities/Logs.cpp +++ b/utilities/Logs.cpp @@ -73,12 +73,19 @@ std::deque ErrorStack; // lock for log stacks std::mutex logMutex; -// the log is written through the closing of the simulator, to the end -std::atomic logStop{false}; +namespace +{ +// the log is written through the closing of the simulator, to the end: set once the closing has nothing more to tell +std::atomic &log_stopped() +{ + static std::atomic stopped{false}; + return stopped; +} +} // namespace void StopLogService() { - logStop = true; + log_stopped() = true; } @@ -87,7 +94,7 @@ void LogService() // one more pass after the stop, so what came just before it gets written too for (bool last{false}; false == last;) { - last = logStop; + last = log_stopped(); { // --- Obsługa InfoStack --- while (!InfoStack.empty()) diff --git a/utilities/utilities.cpp b/utilities/utilities.cpp index b25c6b31d..cf9003f4d 100644 --- a/utilities/utilities.cpp +++ b/utilities/utilities.cpp @@ -471,23 +471,22 @@ bool FileExists(std::string const &Filename) return std::filesystem::exists(Filename); } -std::string FileCased(std::string const &Filename) +std::string FileCased(std::filesystem::path const &Filename) { std::error_code error; if (std::filesystem::exists(Filename, error)) - return Filename; + return Filename.string(); #ifdef _WIN32 // the names there are found in any case already: no folder to go through for every file missing, nor names outside of the // code page to throw on return {}; #else // only the name of the file itself, a folder named in another case isn't found - std::filesystem::path const path{Filename}; - auto const directory{path.has_parent_path() ? path.parent_path() : std::filesystem::path{"."}}; - auto const wanted{ToLower(path.filename().string())}; + auto const directory{Filename.has_parent_path() ? Filename.parent_path() : std::filesystem::path{"."}}; + auto const wanted{ToLower(Filename.filename().string())}; for (std::filesystem::directory_iterator entry{directory, error}, end; entry != end; entry.increment(error)) if (ToLower(entry->path().filename().string()) == wanted) - return path.has_parent_path() ? (directory / entry->path().filename()).string() : entry->path().filename().string(); + return Filename.has_parent_path() ? (directory / entry->path().filename()).string() : entry->path().filename().string(); return {}; #endif } diff --git a/utilities/utilities.h b/utilities/utilities.h index f16431dde..cc4056cae 100644 --- a/utilities/utilities.h +++ b/utilities/utilities.h @@ -219,7 +219,7 @@ template <> bool extract_value(bool &Variable, std::string const &Key, std::stri bool FileExists(std::string const &Filename); // the file as it's named on the disk when only the case of its name differs, as in the sceneries made on Windows; empty when // there's none. the folders have to be named in their case; on Windows, finding the names in any case itself, the file given or none -std::string FileCased(std::string const &Filename); +std::string FileCased(std::filesystem::path const &Filename); std::pair FileExists(std::vector const &Names, std::vector const &Extensions); diff --git a/world/Track.cpp b/world/Track.cpp index 14998ce7c..c6339a424 100644 --- a/world/Track.cpp +++ b/world/Track.cpp @@ -29,6 +29,8 @@ http://mozilla.org/MPL/2.0/. #include "utilities/Logs.h" #include "rendering/renderer.h" +#include + // 101206 Ra: trapezoidalne drogi i tory // 110720 Ra: rozprucie zwrotnicy i odcinki izolowane @@ -429,7 +431,7 @@ void TTrack::Load(cParser *parser, glm::dvec3 const &pOrigin) { // dopływ: no path of it was ever made, the simulator falling over it as it loaded. a river of its first path now, the // second one kept and written back - ErrorLog("Bad track: tributary \"" + m_name + "\" in file \"" + parser->Name() + "\" (line " + std::to_string(parser->Line()) + ") is drawn and run on as a river of its first path"); + ErrorLog(std::format("Bad track: tributary \"{}\" in file \"{}\" (line {}) is drawn and run on as a river of its first path", m_name, parser->Name(), parser->Line())); eType = tt_Normal; iCategoryFlag = 4; m_tributary = true; @@ -2319,25 +2321,37 @@ TTrack::deserialize_( std::istream &Input ) { // TODO: implement } +// the keyword the track is written with, by its type and for a plain one by what runs on it +char const * +TTrack::type_keyword() const { + + if( eType == tt_Normal && m_tributary ) { + return "tributary"; + } + if( eType == tt_Normal ) { + switch( iCategoryFlag ) { + case 1: { return "normal"; } + case 2: { return "road"; } + case 4: { return "river"; } + default: { return "none"; } + } + } + switch( eType ) { + case tt_Switch: { return "switch"; } + case tt_Cross: { return "cross"; } + case tt_Table: { return "turn"; } + case tt_Tributary: { return "tributary"; } + default: { return "none"; } + } +} + // export() subclass details, sends basic content of the class in legacy (text) format to provided stream void TTrack::export_as_text_( std::ostream &Output ) const { // header Output << "track "; // type - Output << ( - eType == tt_Normal ? ( - m_tributary ? "tributary" : - iCategoryFlag == 1 ? "normal" : - iCategoryFlag == 2 ? "road" : - iCategoryFlag == 4 ? "river" : - "none" ) : - eType == tt_Switch ? "switch" : - eType == tt_Cross ? "cross" : - eType == tt_Table ? "turn" : - eType == tt_Tributary ? "tributary" : - "none" ) - << ' '; + Output << type_keyword() << ' '; // basic attributes Output << Length() << ' ' diff --git a/world/Track.h b/world/Track.h index 5952da6a7..70431072a 100644 --- a/world/Track.h +++ b/world/Track.h @@ -358,6 +358,8 @@ private: void deserialize_( std::istream &Input ); // export() subclass details, sends basic content of the class in legacy (text) format to provided stream void export_as_text_( std::ostream &Output ) const; + // the keyword the track is written with, by its type and for a plain one by what runs on it + char const *type_keyword() const; // locates specified profile in the profile database, potentially loading it from a file static std::pair fetch_track_rail_profile( std::string const &Profile ); // loads content of specified file and converts it into a vertex array From d232cd0a6937dda6bb482fac2a9b23e10bdd7fb7 Mon Sep 17 00:00:00 2001 From: maj00r Date: Fri, 6 Nov 2026 19:58:24 +0100 Subject: [PATCH 256/430] refactor: the Sonar remarks on the material copies taken care of - the params of a shader named by the type the shader keeps them in - ranges::any_of and erase_if, with explicit captures - the weathering set component by component with an index of the type of the vector - the lookups declared in the ifs that use them - the empty Erase of the base renderer told why it is empty --- model/material.cpp | 51 ++++++++++++++++++++++---------------------- rendering/renderer.h | 4 +++- 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/model/material.cpp b/model/material.cpp index 2b92986d0..4e96ddd8c 100644 --- a/model/material.cpp +++ b/model/material.cpp @@ -684,17 +684,20 @@ variant_of( opengl_material const &Source, std::string const &Suffix ) { return variant; } +// the params of a shader, as the shader keeps them +using param_confs = decltype( gl::shader::param_conf ); + // whether another param of the shader lies on a component of the named one, which a value set for that one would change too bool -shares_slot( std::unordered_map const &Conf, std::string const &Name ) { +shares_slot( param_confs const &Conf, std::string const &Name ) { auto const own { Conf.find( Name ) }; if( own == Conf.end() ) { return false; } - return std::any_of( - std::begin( Conf ), std::end( Conf ), - [&]( auto const &Entry ) { + return std::ranges::any_of( + Conf, + [ &Name, &own ]( auto const &Entry ) { return Entry.first != Name && Entry.second.location == own->second.location && Entry.second.offset < own->second.offset + own->second.size @@ -715,15 +718,16 @@ make_matte( opengl_material &Variant ) { || shares_slot( Variant.shader->param_conf, key ) ) { continue; } - for( std::size_t i = 0; i < entry->second.size; ++i ) { - Variant.params[ entry->second.location ][ entry->second.offset + i ] = value[ static_cast( i ) ]; + auto &slot { Variant.params[ entry->second.location ] }; + auto const offset { static_cast( entry->second.offset ) }; + auto const size { static_cast( entry->second.size ) }; + for( glm::length_t i = 0; i < size; ++i ) { + slot[ offset + i ] = value[ i ]; } - Variant.params_state.erase( - std::remove_if( - std::begin( Variant.params_state ), std::end( Variant.params_state ), - [&]( gl::shader::param_entry const &State ) { - return State.location == entry->second.location && State.offset == entry->second.offset; } ), - std::end( Variant.params_state ) ); + std::erase_if( + Variant.params_state, + [ &entry ]( gl::shader::param_entry const &State ) { + return State.location == entry->second.location && State.offset == entry->second.offset; } ); } } @@ -737,26 +741,24 @@ make_tinted( opengl_material &Variant, glm::vec3 const &Colour ) { } auto const &conf { Variant.shader->param_conf }; auto const weathering { conf.find( "weathering" ) }; - auto const tint { conf.find( "tint" ) }; - if( weathering == conf.end() + if( auto const tint { conf.find( "tint" ) }; + weathering == conf.end() || tint == conf.end() || weathering->second.offset != 3 || tint->second.location != weathering->second.location || tint->second.offset != 0 - || std::any_of( - std::begin( conf ), std::end( conf ), - [&]( auto const &Entry ) { + || std::ranges::any_of( + conf, + [ &weathering, &tint ]( auto const &Entry ) { return Entry.first != weathering->first && Entry.first != tint->first && Entry.second.location == weathering->second.location; } ) ) { return false; } auto const location { weathering->second.location }; Variant.params[ location ] = glm::vec4{ Colour, -1.f }; - Variant.params_state.erase( - std::remove_if( - std::begin( Variant.params_state ), std::end( Variant.params_state ), - [&]( gl::shader::param_entry const &State ) { - return State.location == location; } ), - std::end( Variant.params_state ) ); + std::erase_if( + Variant.params_state, + [ location ]( gl::shader::param_entry const &State ) { + return State.location == location; } ); return true; } @@ -768,8 +770,7 @@ material_manager::create_matte( material_handle const Material ) { if( Material == null_handle || Material >= m_materials.size() ) { return Material; } - auto const lookup { m_mattes.find( Material ) }; - if( lookup != m_mattes.end() ) { + if( auto const lookup { m_mattes.find( Material ) }; lookup != m_mattes.end() ) { return lookup->second; } auto matte { variant_of( m_materials[ Material ], ":matte" ) }; diff --git a/rendering/renderer.h b/rendering/renderer.h index 4dabc204a..1d60a1d95 100644 --- a/rendering/renderer.h +++ b/rendering/renderer.h @@ -60,7 +60,9 @@ public: // adds supplied vertex data at the end of specified chunk virtual auto Append(gfx::vertex_array &Vertices, gfx::userdata_array &Userdata, gfx::geometry_handle const &Geometry, int const Type) -> bool = 0; // empties specified chunk, its handle stays valid to be filled again - virtual void Erase( gfx::geometry_handle const &Geometry ) {} + virtual void Erase( gfx::geometry_handle const & /*Geometry*/ ) { + // a renderer which keeps no chunks of its own has none to empty + } // provides direct access to index data of specfied chunk virtual auto Indices( gfx::geometry_handle const &Geometry ) const->gfx::index_array const & = 0; // provides direct access to vertex data of specfied chunk From e0cef91049c3089c0ac0a2bb93a78d2dc53595ba Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 04:48:15 +0100 Subject: [PATCH 257/430] fix(physics): running backwards, the camshaft goes back down from the last series position (eu07/maszyna#393) (#256) Running backwards, AutoRelayCheck() keeps the camshaft from joining the motors in more branches than BackwardsBranchesAllowed (the series connection alone, by default). It did that by returning before any move of the camshaft, so once it reached the last series position (22 of 43 in the Skoda 181 and 182, the next one joins the motors in two branches) it stayed there whatever the driver did with the master controller: with the controller back at zero the line contactors stayed closed and the motors kept pulling, until the line contactors were opened by hand. Now the limit only keeps the camshaft from going further up; it goes back down as usual. Tests: tests/unit/test_camshaft.cpp, on a locomotive made after the Skoda 181 (its RList); the test definitions take the RList and MotorParamTable0 tables. --- McZapkie/Mover.cpp | 11 ++- tests/unit/test_camshaft.cpp | 135 +++++++++++++++++++++++++++++++++++ tests/unit/vehicle.cpp | 2 + 3 files changed, 142 insertions(+), 6 deletions(-) create mode 100644 tests/unit/test_camshaft.cpp diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 954e277ba..6b7bdcec5 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -6904,13 +6904,12 @@ bool TMoverParameters::AutoRelayCheck(void) } else { // zmieniaj mainctrlactualpos - if (DirActive < 0 && TrainType != dt_PseudoDiesel && RList[MainCtrlActualPos + 1].Bn > BackwardsBranchesAllowed) - { - return false; // nie poprawiamy przy konwersji - // return ARC;// bbylo exit; //Ra: to powoduje, że EN57 nie wyłącza się przy IminLo - } + // running backwards, the motors don't get joined in more branches than allowed (the series connection + // alone, usually); the camshaft still goes back down from there (eu07/maszyna#393: it stayed where it + // was, the line contactors closed, whatever the driver did with the master controller) + auto const backwardslimit{DirActive < 0 && TrainType != dt_PseudoDiesel && RList[MainCtrlActualPos + 1].Bn > BackwardsBranchesAllowed}; // main bez samoczynnego rozruchu - if (MainCtrlActualPos < std::size(RList) - 1 // crude guard against running out of current fixed table + if (false == backwardslimit && MainCtrlActualPos < std::size(RList) - 1 // crude guard against running out of current fixed table && (RList[MainCtrlActualPos].Relay < MainCtrlPos || (RList[MainCtrlActualPos + 1].Relay == MainCtrlPos && MainCtrlActualPos < RlistSize) || (TrainType == dt_ET22 && DelayCtrlFlag))) { diff --git a/tests/unit/test_camshaft.cpp b/tests/unit/test_camshaft.cpp new file mode 100644 index 000000000..940616a62 --- /dev/null +++ b/tests/unit/test_camshaft.cpp @@ -0,0 +1,135 @@ +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" + +using test::definition; +using test::vehicle; + +// eu07/maszyna#393: running backwards, a camshaft which reached the last position of the series connection (the +// next one already joins the motors in more branches than BackwardsBranchesAllowed) stayed there whatever the driver +// did with the master controller, with the line contactors closed and the motors pulling, until the line contactors +// were opened by hand + +namespace { + +// the starting resistances of the Skoda 181 (cd/181_v2): 6 motors in series up to position 22, then two branches of +// 3 up to 34, then three branches of 2 up to 43; columns: position, resistance, branches, motors in a branch, auto +nlohmann::ordered_json skoda_rlist() { + nlohmann::ordered_json rows{nlohmann::ordered_json::array({0, 0, 0, 0, 0}), nlohmann::ordered_json::array({1, 999999, 1, 6, 0})}; + auto const series{std::vector{15.87, 12.32, 10.03, 8.54, 6.98, 5.84, 5.35, 4.87, 3.88, 2.92, 2.68, 2.43, 2.19, 1.95, 1.70, 1.46, 1.22, 0.97, 0.49, 0.24, 0.00}}; + auto const seriesparallel{std::vector{4.50, 3.63, 3.11, 2.42, 2.08, 1.73, 1.38, 1.04, 0.69, 0.35, 0.17, 0.00}}; + auto const parallel{std::vector{2.78, 2.29, 1.80, 1.41, 1.02, 0.73, 0.44, 0.24, 0.00}}; + auto position{2}; + for (auto const resistance : series) { + rows.push_back(nlohmann::ordered_json::array({position++, resistance, 1, 6, 0})); + } + for (auto const resistance : seriesparallel) { + rows.push_back(nlohmann::ordered_json::array({position++, resistance, 2, 3, 0})); + } + for (auto const resistance : parallel) { + rows.push_back(nlohmann::ordered_json::array({position++, resistance, 3, 2, 0})); + } + return rows; +} + +// an electric locomotive with a camshaft, made after the Skoda 181 +definition skoda() { + auto result{definition::load("wagon") + .set("Param", "M", 124200) + .set("Param", "Vmax", 90) + .set("Dimensions", "L", 18.8) + .set("Wheels", "D", 1.25) + .set("Wheels", "Axle", "Co'Co'") + .set("Engine", "EngineType", "ElectricSeriesMotor") + .set("Engine", "Volt", 967) + .set("Engine", "Trans", "21:89") + .set("Engine", "WindingRes", 0.084) + .set("Engine", "nmax", 1870) + .set("Circuit", "CircuitRes", 0.01) + .set("Circuit", "ImaxLo", 550) + .set("Circuit", "ImaxHi", 550) + .set("Circuit", "IminLo", 307) + .set("Circuit", "IminHi", 332) + .set("Cntrl", "MCPN", 43) + .set("Cntrl", "SCPN", 3) + .set("Cntrl", "CoupledCtrl", "No") + .set("Cntrl", "IniCDelay", 0.2) + .set("Cntrl", "SCDelay", 0.18) + .set("Cntrl", "SCDDelay", 0.18) + .set("Cntrl", "Camshaft", "Yes") + .set("MotorParamTable0", "rows", + nlohmann::ordered_json::array({nlohmann::ordered_json::array({0, 33.75, 57, 0.4, 225.70, 57, 0.4}), nlohmann::ordered_json::array({1, 31.66, 69, 0.4, 217.10, 69, 0.4}), + nlohmann::ordered_json::array({2, 30.52, 90, 0.4, 212.80, 90, 0.4}), nlohmann::ordered_json::array({3, 28.74, 107, 0.4, 199.55, 107, 0.4})})) + .set("RList", "Size", 43) + .set("RList", "rows", skoda_rlist())}; + return result; +} + +// the locomotive running with the line contactors closed and the camshaft at Position, the master controller moved +// to Controller, in the given direction; the time since the last step of the camshaft long enough for the next one +void running(TMoverParameters &Locomotive, int const Direction, int const Position, int const Controller) { + Locomotive.CabActive = 1; + Locomotive.DirActive = Direction; + Locomotive.Mains = true; + Locomotive.PipePress = 5.0; // bar, the pressure switch lets the line contactors close + Locomotive.BrakePress = 0.0; + Locomotive.StLinFlag = true; + Locomotive.MainCtrlActualPos = Position; + Locomotive.MainCtrlPos = Controller; + Locomotive.LastRelayTime = 10.0; +} + +// steps the camshaft as the physics does, each step once the delay since the previous one passed; returns where it +// ended up +int run_camshaft(TMoverParameters &Locomotive, int const Steps) { + for (int step = 0; step < Steps; ++step) { + Locomotive.LastRelayTime = 10.0; + Locomotive.AutoRelayCheck(); + } + return Locomotive.MainCtrlActualPos; +} + +} // namespace + +TEST_CASE("camshaft: running backwards, the camshaft goes back down from the last series position (eu07/maszyna#393)") { + vehicle locomotive{skoda()}; + auto &mover{locomotive.mover()}; + REQUIRE(mover.HasCamshaft); + REQUIRE(mover.RlistSize == 43); + REQUIRE(mover.RList[22].Bn == 1); + REQUIRE(mover.RList[23].Bn == 2); + + SUBCASE("the controller turned back a few positions") { + running(mover, -1, 22, 15); + CHECK(run_camshaft(mover, 1) == 21); // it used to stay at 22 + CHECK(run_camshaft(mover, 10) == 15); + } + SUBCASE("the controller turned back to zero: the camshaft runs down and the line contactors open") { + running(mover, -1, 22, 0); + run_camshaft(mover, 30); + CHECK(mover.MainCtrlActualPos == 0); + CHECK_FALSE(mover.StLinFlag); // the motors don't pull any more + } +} + +TEST_CASE("camshaft: running backwards, the camshaft still doesn't go past the series connection") { + vehicle locomotive{skoda()}; + auto &mover{locomotive.mover()}; + running(mover, -1, 20, 43); + CHECK(run_camshaft(mover, 10) == 22); + + SUBCASE("unless more branches are allowed backwards") { + mover.BackwardsBranchesAllowed = 2; + CHECK(run_camshaft(mover, 20) == 34); + } +} + +TEST_CASE("camshaft: running forwards, the camshaft goes through all the connections and back") { + vehicle locomotive{skoda()}; + auto &mover{locomotive.mover()}; + running(mover, 1, 20, 43); + CHECK(run_camshaft(mover, 30) == 43); + + mover.MainCtrlPos = 10; + CHECK(run_camshaft(mover, 40) == 10); +} diff --git a/tests/unit/vehicle.cpp b/tests/unit/vehicle.cpp index c0930d134..914a31079 100644 --- a/tests/unit/vehicle.cpp +++ b/tests/unit/vehicle.cpp @@ -45,6 +45,8 @@ std::map> const sections{ {"DimmerList", {':', "endDimmerList"}}, {"WiperList", {':', "endwl"}}, {"CompressorList", {':', "endCL"}}, + {"RList", {':', "END-RL"}}, + {"MotorParamTable0", {':', "END-MPT"}}, }; section_format const &format_of(std::string const &Section) { From 28cf5fe276ccc61087da9d1800b9c5738094af6f Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Thu, 15 Oct 2026 22:26:13 +0200 Subject: [PATCH 258/430] fix(gfx): a vehicle taken off the tracks stops smoking (#90) The smoke sources of a vehicle stay in the particle manager when the vehicle is taken off the tracks: one gone through a portal, or a road vehicle waiting in the pool of its spawn point. They kept spawning particles where the vehicle had vanished, for good. A source of a disabled vehicle spawns no more particles now, the ones it let out fade away as usual, and a pooled road vehicle puffs again once it's back on the road. Checked on td.scn with a portal added at the dead end of tdo_n585 and an SM42 driven into it by the AI: on master its smoke source kept about 100 particles where it vanished for the rest of the run (over 200 s); with the fix they were gone within a second. --- rendering/particles.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/rendering/particles.cpp b/rendering/particles.cpp index 5f7158e0c..6719eb6df 100644 --- a/rendering/particles.cpp +++ b/rendering/particles.cpp @@ -162,8 +162,15 @@ smoke_source::update( double const Timedelta, bool const Onlydespawn ) { glm::dvec3{ std::numeric_limits::max() }, glm::dvec3{ std::numeric_limits::lowest() } }; + // a vehicle taken off the tracks (gone through a portal, or waiting in the pool of the road traffic) puffs no more, + // the particles it already let out fade away as usual + auto const nospawn { + false == Global.Smoke + || true == Onlydespawn + || ( m_ownertype == owner_type::vehicle && false == m_owner.vehicle->bEnabled ) }; + m_spawncount = ( - ( ( false == Global.Smoke ) || ( true == Onlydespawn ) ) ? + ( true == nospawn ) ? 0.f : std::min( static_cast(m_spawncount + ( m_spawnrate * Timedelta * Global.SmokeFidelity )), @@ -179,7 +186,7 @@ smoke_source::update( double const Timedelta, bool const Onlydespawn ) { if (m_owner.vehicle->MoverParameters->dizel_spinup == true) { m_spawncount = - ((false == Global.Smoke) || (true == Onlydespawn)) ? + (true == nospawn) ? 0.f : std::min( // m_spawncount + ( m_spawnrate * Timedelta * Global.SmokeFidelity ), @@ -191,7 +198,7 @@ smoke_source::update( double const Timedelta, bool const Onlydespawn ) { m_owner.vehicle->MoverParameters->Im == 0) { m_spawncount = - ((false == Global.Smoke) || (true == Onlydespawn)) ? + (true == nospawn) ? 0.f : std::min( // m_spawncount + ( m_spawnrate * Timedelta * Global.SmokeFidelity ), @@ -201,7 +208,7 @@ smoke_source::update( double const Timedelta, bool const Onlydespawn ) { { m_spawncount = - ((false == Global.Smoke) || (true == Onlydespawn)) ? + (true == nospawn) ? 0.f : std::min( // m_spawncount + ( m_spawnrate * Timedelta * Global.SmokeFidelity ), From f94b3080629523d991683fabff7f6ec3584534d8 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Thu, 15 Oct 2026 22:26:13 +0200 Subject: [PATCH 259/430] fix(sound): check for the player train in the outer noise test of a vehicle The test whether a vehicle belongs to the player train dereferenced simulation::Train without a null check (commented out long ago). The driver mode switches to the free camera in the same frame the player train goes through a portal, before the sounds are updated, so it isn't known to crash, but nothing else guards it. --- vehicle/DynObj.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index c6793e454..6f151f0e8 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -4863,7 +4863,7 @@ void TDynamicObject::RenderSounds() { #endif && ( // compound test whether the vehicle belongs to user-driven consist (as these don't emit outer noise in cab view) FreeFlyModeFlag ? true : // in external view all vehicles emit outer noise - // Global.pWorld->train() == nullptr ? true : // (can skip this check, with no player train the external view is a given) + simulation::Train == nullptr ? true : // no player train, e.g. it went through a portal and the view isn't switched yet ctOwner == nullptr ? true : // standalone vehicle, can't be part of user-driven train ctOwner != simulation::Train->Dynamic()->ctOwner ? true : // confirmed isn't a part of the user-driven train Global.CabWindowOpen ? true : // sticking head out we get to hear outer noise From 4489dd7469e16437a125d1bc399d7127f54237dc Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 11:38:49 +0100 Subject: [PATCH 260/430] test(gfx): unit tests of the smoke of a vehicle taken off the tracks (#90) The spawn count of the smoke source of a vehicle moves out of smoke_source::update() into smoke::vehicle_spawn_count() (vehicle/smoke.h), a free function on the mover state, which joins the core library so the unit tests can call it the way the source does. The rates are the same as before, the steady rate of the source still counted in before the share of the engine. Tests: tests/unit/test_smoke.cpp. A vehicle taken off the tracks spawns no smoke and drops the pending particles, with the engine starting, idling or under load; a road vehicle back from the pool puffs again; the engine adds to the steady rate; the pending count stays within the room of the source. Two of the four fail without the fix. Checked again on td.scn with the SM42 driven into a portal: the smoke source keeps puffing on the run and drops to 0 particles once the vehicle is taken off the tracks. --- CMakeLists.txt | 1 + rendering/particles.cpp | 75 +++++++++++----------------------- tests/unit/test_smoke.cpp | 85 +++++++++++++++++++++++++++++++++++++++ vehicle/smoke.cpp | 46 +++++++++++++++++++++ vehicle/smoke.h | 30 ++++++++++++++ 5 files changed, 186 insertions(+), 51 deletions(-) create mode 100644 tests/unit/test_smoke.cpp create mode 100644 vehicle/smoke.cpp create mode 100644 vehicle/smoke.h diff --git a/CMakeLists.txt b/CMakeLists.txt index dfe58b66d..9d19e844c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -463,6 +463,7 @@ set(CORE_SOURCES "scripting/ladderlogic.cpp" "vehicle/handover.cpp" "vehicle/horn.cpp" +"vehicle/smoke.cpp" ) add_library(eu07_core STATIC ${CORE_SOURCES}) target_link_libraries(eu07_core PUBLIC eu07_settings) diff --git a/rendering/particles.cpp b/rendering/particles.cpp index 6719eb6df..8ccb728dd 100644 --- a/rendering/particles.cpp +++ b/rendering/particles.cpp @@ -15,6 +15,7 @@ http://mozilla.org/MPL/2.0/. #include "model/AnimModel.h" #include "simulation/simulationenvironment.h" #include "utilities/Logs.h" +#include "vehicle/smoke.h" void @@ -162,60 +163,32 @@ smoke_source::update( double const Timedelta, bool const Onlydespawn ) { glm::dvec3{ std::numeric_limits::max() }, glm::dvec3{ std::numeric_limits::lowest() } }; - // a vehicle taken off the tracks (gone through a portal, or waiting in the pool of the road traffic) puffs no more, - // the particles it already let out fade away as usual - auto const nospawn { - false == Global.Smoke - || true == Onlydespawn - || ( m_ownertype == owner_type::vehicle && false == m_owner.vehicle->bEnabled ) }; + auto const spawning { ( true == Global.Smoke ) && ( false == Onlydespawn ) }; - m_spawncount = ( - ( true == nospawn ) ? - 0.f : - std::min( - static_cast(m_spawncount + ( m_spawnrate * Timedelta * Global.SmokeFidelity )), - static_cast(m_max_particles) ) ); - // consider special spawn rate cases if( m_ownertype == owner_type::vehicle ) { - if (Global.AirTemperature <= 5.f || m_owner.vehicle->MoverParameters->dizel_heat.Ts < 45.f) - { - m_emitter.color = glm::vec3{128, 128, 128}; - } - - if (m_owner.vehicle->MoverParameters->dizel_spinup == true) - { - m_spawncount = - (true == nospawn) ? - 0.f : - std::min( - // m_spawncount + ( m_spawnrate * Timedelta * Global.SmokeFidelity ), - static_cast(m_spawncount +(m_spawnrate * Timedelta * Global.SmokeFidelity * (((m_owner.vehicle->MoverParameters->enrot) / 4 ) * 0.01))), static_cast(m_max_particles)); - } - else - { - if (m_owner.vehicle->MoverParameters->DirAbsolute == 0 || - m_owner.vehicle->MoverParameters->Im == 0) - { - m_spawncount = - (true == nospawn) ? - 0.f : - std::min( - // m_spawncount + ( m_spawnrate * Timedelta * Global.SmokeFidelity ), - static_cast(m_spawncount + (m_spawnrate * Timedelta * Global.SmokeFidelity * ((((m_owner.vehicle->MoverParameters->DElist[m_owner.vehicle->MoverParameters->MainCtrlPosNo].RPM -m_owner.vehicle->MoverParameters->enrot) /60) *0.02) *(m_owner.vehicle->MoverParameters->EnginePower * 0.005)))), static_cast(m_max_particles)); - } - else - { - - m_spawncount = - (true == nospawn) ? - 0.f : - std::min( - // m_spawncount + ( m_spawnrate * Timedelta * Global.SmokeFidelity ), - static_cast(m_spawncount + (m_spawnrate * Timedelta * Global.SmokeFidelity * ((((m_owner.vehicle->MoverParameters->DElist[m_owner.vehicle->MoverParameters->MainCtrlPosNo].RPM -m_owner.vehicle->MoverParameters->enrot) /60) * (sqrt(m_owner.vehicle->MoverParameters->Im) * 0.01) * 0.02) *(m_owner.vehicle->MoverParameters->EnginePower * 0.005)))), static_cast(m_max_particles)); - } - } - } + auto const &mover { *m_owner.vehicle->MoverParameters }; + if( Global.AirTemperature <= 5.f || mover.dizel_heat.Ts < 45.f ) { + m_emitter.color = glm::vec3{ 128, 128, 128 }; + } + // a vehicle taken off the tracks (gone through a portal, or waiting in the pool of the road traffic) puffs no more, + // the particles it already let out fade away as usual + m_spawncount = ( + ( true == spawning ) ? + smoke::vehicle_spawn_count( + mover, m_owner.vehicle->bEnabled, + { m_spawncount, m_spawnrate, Global.SmokeFidelity, static_cast( m_max_particles ) }, + Timedelta ) : + 0.f ); + } + else { + m_spawncount = ( + ( true == spawning ) ? + std::min( + static_cast(m_spawncount + ( m_spawnrate * Timedelta * Global.SmokeFidelity )), + static_cast(m_max_particles) ) : + 0.f ); + } // update spawned particles for( auto particleiterator { std::begin( m_particles ) }; particleiterator != std::end( m_particles ); ++particleiterator ) { diff --git a/tests/unit/test_smoke.cpp b/tests/unit/test_smoke.cpp new file mode 100644 index 000000000..05fb8ae8b --- /dev/null +++ b/tests/unit/test_smoke.cpp @@ -0,0 +1,85 @@ +#include "stdafx.h" +#include "doctest.h" + +#include "vehicle.h" + +#include "vehicle/smoke.h" + +// the smoke of a vehicle's engine: how many particles the smoke source of the vehicle's model spawns in an update + +namespace { + +// a source of 20 particles per second, with room for 100 +smoke::spawn_rate const source{0.f, 20.f, 1.f, 100.f}; +double const update{0.1}; // s + +// a diesel at work, its engine in the state of one of the cases below +test::vehicle diesel() { + test::vehicle vehicle{test::definition::load("wagon")}; + vehicle->MainCtrlPosNo = 1; + vehicle->DElist[1].RPM = 1500.0; + vehicle->enrot = 300.0; + vehicle->EnginePower = 400.0; + return vehicle; +} + +} // namespace + +TEST_CASE("smoke: a vehicle taken off the tracks puffs no more (#90)") { + auto vehicle{diesel()}; + SUBCASE("engine starting") { vehicle->dizel_spinup = true; } + SUBCASE("engine idling") { vehicle->DirAbsolute = 0; } + SUBCASE("engine under load") { + vehicle->DirAbsolute = 1; + vehicle->Im = 400.0; + } + // on the tracks the engine puffs + REQUIRE(smoke::vehicle_spawn_count(vehicle.mover(), true, source, update) >= 1.f); + + // gone through a portal, the pending particles are dropped too + auto pending{source}; + pending.pending = 5.f; + CHECK(smoke::vehicle_spawn_count(vehicle.mover(), false, pending, update) == 0.f); +} + +TEST_CASE("smoke: a road vehicle back on the road from the pool puffs again") { + auto vehicle{diesel()}; + // waiting in the pool, the count stays at zero update after update + auto rate{source}; + for (auto i{0}; i < 10; ++i) { + rate.pending = smoke::vehicle_spawn_count(vehicle.mover(), false, rate, update); + } + REQUIRE(rate.pending == 0.f); + + CHECK(smoke::vehicle_spawn_count(vehicle.mover(), true, rate, update) >= 1.f); +} + +TEST_CASE("smoke: the engine adds to the steady rate of the source") { + auto vehicle{diesel()}; + vehicle->DirAbsolute = 0; + auto const steady{source.rate * update}; // the rate of a source of the scenery + + vehicle->EnginePower = 0.0; + CHECK(smoke::vehicle_spawn_count(vehicle.mover(), true, source, update) == doctest::Approx(steady)); + + vehicle->EnginePower = 400.0; + auto const working{smoke::vehicle_spawn_count(vehicle.mover(), true, source, update)}; + CHECK(working > steady); + + // the faster the starting engine turns, the more it puffs + vehicle->dizel_spinup = true; + vehicle->enrot = 100.0; + auto const slow{smoke::vehicle_spawn_count(vehicle.mover(), true, source, update)}; + vehicle->enrot = 400.0; + CHECK(smoke::vehicle_spawn_count(vehicle.mover(), true, source, update) > slow); +} + +TEST_CASE("smoke: the pending particles never outgrow the room of the source") { + auto vehicle{diesel()}; + vehicle->dizel_spinup = true; + vehicle->enrot = 100000.0; + auto rate{source}; + rate.pending = 99.f; + + CHECK(smoke::vehicle_spawn_count(vehicle.mover(), true, rate, 10.0) == rate.limit); +} diff --git a/vehicle/smoke.cpp b/vehicle/smoke.cpp new file mode 100644 index 000000000..b6e923222 --- /dev/null +++ b/vehicle/smoke.cpp @@ -0,0 +1,46 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "vehicle/smoke.h" + +#include "McZapkie/MOVER.h" + +namespace smoke { + +namespace { + +// how hard the engine works, scaling the spawn rate of the source +double engine_load(TMoverParameters const &Mover) { + if (Mover.dizel_spinup) { + // starting up, it puffs harder the faster it turns + return ((Mover.enrot / 4) * 0.01); + } + auto const rpmrise{(Mover.DElist[Mover.MainCtrlPosNo].RPM - Mover.enrot) / 60}; + if (Mover.DirAbsolute == 0 || Mover.Im == 0) { + // idling: speeding up to the revolutions of the master controller + return ((rpmrise * 0.02) * (Mover.EnginePower * 0.005)); + } + // under load: the more current the traction motors draw, the more smoke + return ((rpmrise * (std::sqrt(Mover.Im) * 0.01) * 0.02) * (Mover.EnginePower * 0.005)); +} + +} // namespace + +float vehicle_spawn_count(TMoverParameters const &Mover, bool const Ontracks, spawn_rate const &Rate, double const Timedelta) { + if (false == Ontracks) { + return 0.f; + } + // the steady rate of the source, the way a source of the scenery spawns... + auto const steady{std::min(static_cast(Rate.pending + (Rate.rate * Timedelta * Rate.fidelity)), Rate.limit)}; + // ...and on top of it the share of the engine + return std::min(static_cast(steady + (Rate.rate * Timedelta * Rate.fidelity * engine_load(Mover))), Rate.limit); +} + +} // namespace smoke diff --git a/vehicle/smoke.h b/vehicle/smoke.h new file mode 100644 index 000000000..e9dac2622 --- /dev/null +++ b/vehicle/smoke.h @@ -0,0 +1,30 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +class TMoverParameters; + +// the smoke of a vehicle's engine, let out by the smoke sources of its model (rendering/particles.h) +namespace smoke { + +// what a smoke source spawns, before the engine of its vehicle is taken into account +struct spawn_rate { + float pending{0.f}; // particles left to spawn from the previous updates + float rate{0.f}; // particles per second + float fidelity{1.f}; // multiplier of the smoke settings + float limit{0.f}; // most particles the source can have +}; + +// number of particles the smoke source of a vehicle has to spawn after Timedelta seconds: the steady rate of the +// source, plus a share which grows with the work of its engine. a vehicle taken off the tracks (Ontracks false: gone through a portal, or waiting in the pool of the road +// traffic) puffs no more, the particles it already let out fade away as usual +float vehicle_spawn_count(TMoverParameters const &Mover, bool Ontracks, spawn_rate const &Rate, double Timedelta); + +} // namespace smoke From 088eeaa743d5e88ae39329238bc78e9da144f605 Mon Sep 17 00:00:00 2001 From: maj00r <73280030+maj00r@users.noreply.github.com> Date: Sat, 7 Nov 2026 12:32:02 +0100 Subject: [PATCH 261/430] fix(editor): a scenery saved under another name keeps one file of turntable controls, not the old one beside its own (#251) The editor writes the turntable controls on each save to _obrotnice.scm and includes it. A copy of a scenery, saved under another name, still included the file of the scenery it came from. Its save wrote a file of its own and included it too, so each turntable had its events twice. Now the save leaves out of the scenery the other files of turntable controls it includes, told by the line the editor writes at their start. Their files stay on the disk, for the scenery they were made for. A file of turntables made by hand, without that line, stays included. Co-authored-by: maj00r --- application/editormodeturntable.cpp | 32 ++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/application/editormodeturntable.cpp b/application/editormodeturntable.cpp index e6b78d9ef..76b70b575 100644 --- a/application/editormodeturntable.cpp +++ b/application/editormodeturntable.cpp @@ -19,6 +19,7 @@ http://mozilla.org/MPL/2.0/. #include "scene/scenelayers.h" #include "simulation/simulation.h" #include "utilities/Globals.h" +#include "utilities/Logs.h" #include "utilities/translation.h" #include "utilities/utilities.h" #include "world/Track.h" @@ -186,6 +187,20 @@ void label(screen_projection const &Projection, glm::dvec3 const &Point, std::st drawlist->AddText(ImVec2(at.x + 12.f, at.y), IM_COL32(255, 255, 255, 235), Text.c_str()); } +// the first line of the file of the turntable controls, which tells it from the files of the scenery made by hand +char const *const kControlsHeader{"// made by the scenery editor on each save: T turns each turntable to its next position, Shift+T to the previous one"}; + +// true if the file is one of the turntable controls the editor writes +bool controls_file(std::string const &Path) +{ + std::ifstream input{Path, std::ios_base::binary}; + std::string first; + std::getline(input, first); + if (false == first.empty() && first.back() == '\r') + first.pop_back(); + return first == kControlsHeader; +} + } // namespace void editor_mode::scan_turntables() @@ -1143,7 +1158,7 @@ bool editor_mode::turntable_controls(std::vector &Rootstatements) auto const exists{std::filesystem::exists(path, error)}; if (tables == 0 && false == exists) return false; - auto const content{"// made by the scenery editor on each save: T turns each turntable to its next position, Shift+T to the previous one\r\n" + text.str()}; + auto const content{std::string{kControlsHeader} + "\r\n" + text.str()}; std::string current; { std::ifstream input{path, std::ios_base::binary}; @@ -1154,6 +1169,21 @@ bool editor_mode::turntable_controls(std::vector &Rootstatements) std::ofstream output{path, std::ios_base::binary | std::ios_base::trunc}; output << content; } + // the controls written for this scenery under another name, the file it was copied from, give way to these: with both + // included each turntable would have its events twice. their files stay on the disk, for the scenery they were made for + for (std::size_t handle = 1; handle <= scene::Layers.size(); ++handle) + { + auto const layer{static_cast(handle)}; + if (false == scene::Layers.listed(layer) || scene::Layers.layer(layer).removed) + continue; + auto name{scene::Layers.layer(layer).name}; + std::replace(name.begin(), name.end(), '\\', '/'); + auto const lower{ToLower(name)}; + if (lower == ToLower(file) || lower.ends_with("/" + ToLower(file)) || false == lower.ends_with("_obrotnice.scm")) + continue; + if (controls_file(Global.asCurrentSceneryPath + scene::Layers.layer(layer).name) && scene::Layers.remove(layer)) + WriteLog("Editor: " + name + " left out of the scenery, the turntable controls are in " + file + " now"); + } auto included{m_turntable_included}; for (std::size_t handle = 1; handle <= scene::Layers.size() && false == included; ++handle) { From ecdef7f7537bbc9d76a7938fbd8cd74f7b4da5bf Mon Sep 17 00:00:00 2001 From: Sebastian Krzyszkowiak Date: Sat, 7 Nov 2026 12:33:22 +0100 Subject: [PATCH 262/430] opengl*renderer: Show an empty frame early (#233) Gives a better feedback to the user that something has actually launched. --- rendering/opengl33renderer.cpp | 4 ++++ rendering/openglrenderer.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index 76750472d..5c64988b4 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -104,6 +104,10 @@ bool opengl33_renderer::Init(GLFWwindow *Window) glDebugMessageCallback( ErrorCallback, 0 ); } + glClearColor( 0.f, 0.f, 0.f, 1.f ); + glClear( GL_COLOR_BUFFER_BIT ); + glfwSwapBuffers( Window ); + if (!Init_caps()) return false; diff --git a/rendering/openglrenderer.cpp b/rendering/openglrenderer.cpp index 7516f5a22..ef54f32c9 100644 --- a/rendering/openglrenderer.cpp +++ b/rendering/openglrenderer.cpp @@ -75,6 +75,10 @@ float const EU07_OPACITYDEFAULT { 0.5f }; bool opengl_renderer::Init( GLFWwindow *Window ) { + glClearColor( 0.f, 0.f, 0.f, 1.f ); + glClear( GL_COLOR_BUFFER_BIT ); + glfwSwapBuffers( Window ); + if( false == Init_caps() ) { return false; } m_window = Window; From 605a94cf2b66214ca4ebc24c841952c504a1f973 Mon Sep 17 00:00:00 2001 From: Sebastian Krzyszkowiak Date: Sat, 7 Nov 2026 12:33:46 +0100 Subject: [PATCH 263/430] uilayer: Force ui viewports to be disabled under gamescope and Steam Big Picture (#232) --- application/uilayer.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/application/uilayer.cpp b/application/uilayer.cpp index 2b1fa1686..5443d158c 100644 --- a/application/uilayer.cpp +++ b/application/uilayer.cpp @@ -395,10 +395,15 @@ bool ui_layer::init(GLFWwindow *Window) } // panels can be docked together, and dragged out of the simulator window into windows of their own (e.g. on another monitor) - // when both backends can do it. glfw can't place windows under wayland. both flags have to be set before the first frame + // when both backends can do it. glfw can't place windows under wayland. gamescope does not work well with popup windows. + // both flags have to be set before the first frame m_imguiio->ConfigFlags |= ImGuiConfigFlags_DockingEnable; + const char* desktop = std::getenv("XDG_CURRENT_DESKTOP"); + const char* gamepadui = std::getenv("SteamGamepadUI"); + if (!desktop) desktop = ""; + if (!gamepadui) gamepadui = ""; auto const viewportsupport{(m_imguiio->BackendFlags & ImGuiBackendFlags_PlatformHasViewports) && (m_imguiio->BackendFlags & ImGuiBackendFlags_RendererHasViewports) && - glfwGetPlatform() != GLFW_PLATFORM_WAYLAND}; + glfwGetPlatform() != GLFW_PLATFORM_WAYLAND && std::string_view{desktop} != "gamescope" && std::string_view{gamepadui} != "1"}; if (Global.ui_viewports && viewportsupport) { m_imguiio->ConfigFlags |= ImGuiConfigFlags_ViewportsEnable; From 3a29a165a9b79aee5ee7d7f687848da0bc07b33a Mon Sep 17 00:00:00 2001 From: Sebastian Krzyszkowiak Date: Sat, 7 Nov 2026 12:34:01 +0100 Subject: [PATCH 264/430] simulationenvironment: Don't multiply fog color by diffuselevel (#229) It can easily make the fog too dark compared to the environment, producing a "fire in the forest" effect. --- simulation/simulationenvironment.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/simulation/simulationenvironment.cpp b/simulation/simulationenvironment.cpp index 14ad2353c..bdc4b0598 100644 --- a/simulation/simulationenvironment.cpp +++ b/simulation/simulationenvironment.cpp @@ -167,9 +167,8 @@ world_environment::update() { // the impact of sun component is reduced proportionally to overcast level, as overcast increases role of ambient light auto const diffuselevel = std::lerp( keylightintensity, intensity * ( 1.0f - twilightfactor ), 1.0f - std::min( 1.f, Global.Overcast ) * 0.75f ); // ...update light colours and intensity. - keylightcolor = keylightcolor * diffuselevel; - Global.DayLight.diffuse = glm::vec4( keylightcolor, Global.DayLight.diffuse.a ); - Global.DayLight.specular = glm::vec4( keylightcolor * 0.85f, diffuselevel ); + Global.DayLight.diffuse = glm::vec4( keylightcolor * diffuselevel, Global.DayLight.diffuse.a ); + Global.DayLight.specular = glm::vec4( keylightcolor * diffuselevel * 0.85f, diffuselevel ); // tonal impact of skydome color is inversely proportional to how high the sun is above the horizon // (this is pure conjecture, aimed more to 'look right' than be accurate) From 55ba7a9f41e463dcb94f2adaf6859d8563df316c Mon Sep 17 00:00:00 2001 From: pawelw Date: Sat, 7 Nov 2026 12:35:55 +0100 Subject: [PATCH 265/430] Instancing: skip the buckets of a cell lying wholly beyond the range of their instances (#225) * perf(instancing): skip a cell's buckets lying wholly beyond the range of their instances * perf(instancing): go only through the instances drawn one by one in the per-node pass * perf(instancing): leave out of the color pass the cells holding only instances too far to be drawn * refactor(instancing): keep the caches of the instances of a cell without mutable fields, set by the renderer when the cell is queued --- model/AnimModel.cpp | 3 ++ model/AnimModel.h | 3 ++ rendering/opengl33renderer.cpp | 93 +++++++++++++++++++++++++++++++++- rendering/opengl33renderer.h | 6 +++ scene/scene.cpp | 3 ++ scene/scene.h | 13 +++++ 6 files changed, 119 insertions(+), 2 deletions(-) diff --git a/model/AnimModel.cpp b/model/AnimModel.cpp index 770790c1e..cafb3a93e 100644 --- a/model/AnimModel.cpp +++ b/model/AnimModel.cpp @@ -514,6 +514,7 @@ bool submodel_tree_blocks_instancing( TSubModel const *Sub ) { } // anonymous namespace int TAnimModel::s_instanceable_total = 0; +unsigned int TAnimModel::s_instanceable_revoked = 0; int TAnimModel::s_classified_total = 0; int TAnimModel::s_rejected_no_pmodel = 0; int TAnimModel::s_rejected_lights = 0; @@ -551,6 +552,7 @@ std::shared_ptr TAnimModel::AddContainer(std::string const &Name m_animlist.push_back(tmp); // containers are added by events after the instance was loaded and bucketed; // the instanced path skips RaAnimate(), so this instance has to be drawn on its own + if( m_instanceable ) { ++s_instanceable_revoked; } m_instanceable = false; return tmp; } @@ -780,6 +782,7 @@ void TAnimModel::SkinSet( int const Index, material_handle const Material ) { m_materialdata.replacable_skins[ std::clamp( Index, 1, 4 ) ] = Material; // the instance stays in the bucket of its old skin set, where it would get the textures of the batch + if( m_instanceable ) { ++s_instanceable_revoked; } m_instanceable = false; } diff --git a/model/AnimModel.h b/model/AnimModel.h index 0087418df..2cf1003bb 100644 --- a/model/AnimModel.h +++ b/model/AnimModel.h @@ -237,6 +237,9 @@ public: // diagnostic counters (process-wide). Updated inside update_instanceable_flag() // so the renderer can surface load-time classification stats in the debug overlay. static int s_instanceable_total; // count of TAnimModel*'s classified instanceable + // bumped whenever an instance loses its instanceable status after it was put in a scene cell (an event adds + // an animation container, or changes a skin); the cells rebuild their lists of instances drawn one by one then + static unsigned int s_instanceable_revoked; static int s_classified_total; // count of TAnimModel*'s that ran through the classifier static int s_rejected_no_pmodel; static int s_rejected_lights; diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index 5c64988b4..33346fad2 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -2666,6 +2666,12 @@ void opengl33_renderer::Render(section_sequence::iterator First, section_sequenc { if ((true == cell.m_active) && (m_renderpass.pass_camera.visible(cell.m_area))) { + // a cell with nothing but instances too far to be drawn is left out of the color pass altogether + if( ( true == Prepare_Instances( cell ) ) + && ( m_renderpass.draw_mode == rendermode::color ) + && ( true == Cell_Out_Of_Range( cell ) ) ) { + continue; + } // store visible cells with content as well as their current distance, for sorting later m_cellqueue.emplace_back(glm::length2(m_renderpass.pass_camera.position() - cell.m_area.center), &cell); } @@ -2680,6 +2686,7 @@ void opengl33_renderer::Render(section_sequence::iterator First, section_sequenc { if ((true == cell.m_active) && (m_renderpass.pass_camera.visible(cell.m_area))) { + Prepare_Instances( cell ); // store visible cells with content as well as their current distance, for sorting later m_cellqueue.emplace_back(glm::length2(m_renderpass.pass_camera.position() - cell.m_area.center), &cell); } @@ -2871,8 +2878,10 @@ void opengl33_renderer::Render(cell_sequence::iterator First, cell_sequence::ite Queue_Instances( cell ); } } - // remaining (non-instanceable) opaque instance nodes go through the per-node path - for (auto *instance : cell->m_instancesopaque) + // remaining (non-instanceable) opaque instance nodes go through the per-node path. the list of them kept for + // the cell spares going through every instance of it only to skip the instanceable ones - with many of these + // (vegetation) that took more time than drawing everything else + for (auto *instance : ( Instance_Cache_Valid( *cell ) ? cell->m_instancecache.single : cell->m_instancesopaque )) { if( instance->m_instanceable ) { continue; } // already handled via bucket Render(instance); @@ -3178,6 +3187,11 @@ void opengl33_renderer::Queue_Instances( scene::basic_cell const *Cell ) auto const distancelimit { slack * ( reflections ? sq( static_cast( Global.reflectiontune.range_instances ) ) : sq( static_cast( m_renderpass.draw_range ) + 250.0 ) ) }; // up close the rounding of the copies is too large a part of the distance for the slack to cover it auto const distancetested { sq( 64.0 ) }; + // the nearest point of the bounding sphere of the cell, which holds the locations of all its instances. no instance + // of the cell is closer, so where this distance fails the range test below for the largest range in a bucket, + // it fails it for each instance of that bucket, and the bucket can be skipped without going through them + auto const cellnearestdistance { std::max( 0.0, glm::length( Cell->m_area.center - cameraposition ) - Cell->m_area.radius ) }; + auto const cellnearestdistancesquared { cellnearestdistance * cellnearestdistance }; for( auto const &bucket : Cell->m_instancebuckets_opaque ) { auto const &instances { bucket.second.instances }; @@ -3190,6 +3204,11 @@ void opengl33_renderer::Queue_Instances( scene::basic_cell const *Cell ) || ( bucket.second.bounds.size() != instances.size() ) ) { Update_Instance_Bounds( bucket.first.pModel, bucket.second ); } + else if( ( bucket.second.rangeversion == m_instanceboundsversion ) + && ( cellnearestdistancesquared > distancetested ) + && ( cellnearestdistancesquared * distancescale + distanceoffset >= slack * bucket.second.rangesquaredmax ) ) { + continue; + } auto const &bounds { bucket.second.bounds }; std::vector *dest { nullptr }; // looked up when there's something to put in it for( std::size_t idx = 0; idx < bounds.size(); ++idx ) { @@ -3210,6 +3229,76 @@ void opengl33_renderer::Queue_Instances( scene::basic_cell const *Cell ) } } +// brings up to date what the renderer keeps of the instances of the cell: the copies of the bounds of the instances +// and the largest range in each bucket, the largest range in the cell, and the list of its instances drawn one by one. +// rebuilt after the content of the cell changed, or any instance lost its instanceable status (an event added an +// animation container, or changed a skin). returns: true if the cache can be used; it can't in the editor, which +// moves and resizes the instances in place, as with the copies of their bounds +bool opengl33_renderer::Prepare_Instances( scene::basic_cell &Cell ) +{ + if( EditorModeFlag ) { return false; } + if( Instance_Cache_Valid( Cell ) ) { return true; } + + auto &cache { Cell.m_instancecache }; + cache.rangesquaredmax = 0.f; + for( auto &[ key, bucket ] : Cell.m_instancebuckets_opaque ) { + if( ( bucket.boundsversion != m_instanceboundsversion ) + || ( bucket.bounds.size() != bucket.instances.size() ) ) { + Update_Instance_Bounds( key.pModel, bucket ); + } + auto rangesquaredmax { 0.f }; + for( auto const &instancebounds : bucket.bounds ) { + rangesquaredmax = std::max( rangesquaredmax, instancebounds.rangesquaredmax ); + } + bucket.rangesquaredmax = rangesquaredmax; + bucket.rangeversion = m_instanceboundsversion; + cache.rangesquaredmax = std::max( cache.rangesquaredmax, rangesquaredmax ); + } + cache.single.clear(); + for( auto *instance : Cell.m_instancesopaque ) { + if( false == instance->m_instanceable ) { + cache.single.emplace_back( instance ); + } + } + cache.instancedonly = + ( false == Cell.m_instancebuckets_opaque.empty() ) + && Cell.m_paths.empty() + && Cell.m_shapesopaque.empty() + && Cell.m_shapestranslucent.empty() + && Cell.m_lines.empty() + && Cell.m_traction.empty() + && Cell.m_instancetranslucent.empty() + && cache.single.empty(); + cache.boundsversion = m_instanceboundsversion; + cache.revoked = TAnimModel::s_instanceable_revoked; + return true; +} + +bool opengl33_renderer::Instance_Cache_Valid( scene::basic_cell const &Cell ) const +{ + return ( false == EditorModeFlag ) + && ( Cell.m_instancecache.boundsversion == m_instanceboundsversion ) + && ( Cell.m_instancecache.revoked == TAnimModel::s_instanceable_revoked ); +} + +// true if nothing of the cell would be drawn by the color pass: it holds only instances drawn with the instanced path, +// and the nearest point of the cell is past the largest range of them. the test is the one made for each bucket in +// Queue_Instances(), done before the cell is put in the cell queue: a scenery with many small instances of a short +// range has them in nearly every cell up to the draw range, and queueing, sorting and visiting these cells only +// to skip all their buckets took a good part of the frame +bool opengl33_renderer::Cell_Out_Of_Range( scene::basic_cell const &Cell ) const +{ + if( ( false == Instance_Cache_Valid( Cell ) ) || ( false == Cell.m_instancecache.instancedonly ) ) { return false; } + // same measures as in Queue_Instances() for the color pass + auto const distancescale { 1.0 / ( static_cast( Global.ZoomFactor ) * static_cast( Global.ZoomFactor ) * static_cast( Global.fDistanceFactor ) ) }; + auto const slack { 1.001 }; + auto const distancetested { sq( 64.0 ) }; + auto const cellnearestdistance { std::max( 0.0, glm::length( Cell.m_area.center - m_renderpass.pass_camera.position() ) - Cell.m_area.radius ) }; + auto const cellnearestdistancesquared { cellnearestdistance * cellnearestdistance }; + return ( cellnearestdistancesquared > distancetested ) + && ( cellnearestdistancesquared * distancescale >= slack * Cell.m_instancecache.rangesquaredmax ); +} + // makes the copies of the bounds of the instances held by a bucket of a scene cell void opengl33_renderer::Update_Instance_Bounds( TModel3d const *Model, scene::basic_cell::instance_bucket const &Bucket ) { diff --git a/rendering/opengl33renderer.h b/rendering/opengl33renderer.h index d48055f9f..b472849bc 100644 --- a/rendering/opengl33renderer.h +++ b/rendering/opengl33renderer.h @@ -302,6 +302,12 @@ class opengl33_renderer : public gfx_renderer { // adds the bucketed instances of a scene cell to the frame-level buckets drawn by Render_Instanced(), // less the ones the copies of their bounds show to be out of sight in the current render pass void Queue_Instances( scene::basic_cell const *Cell ); + // brings up to date what the renderer keeps of the instances of the cell; returns: true if the cache can be used + bool Prepare_Instances( scene::basic_cell &Cell ); + // true if the cache of the cell is up to date + bool Instance_Cache_Valid( scene::basic_cell const &Cell ) const; + // true if nothing of the cell would be drawn by the color pass from the camera of the pass + bool Cell_Out_Of_Range( scene::basic_cell const &Cell ) const; // makes the copies of the bounds of the instances held by a bucket of a scene cell void Update_Instance_Bounds( TModel3d const *Model, scene::basic_cell::instance_bucket const &Bucket ); bool Render(TDynamicObject *Dynamic); diff --git a/scene/scene.cpp b/scene/scene.cpp index 7b0e29940..312765c4d 100644 --- a/scene/scene.cpp +++ b/scene/scene.cpp @@ -352,6 +352,7 @@ void basic_cell::insert( TAnimModel *Instance ) { m_active = true; + m_instancecache.boundsversion = 0; // the renderer builds it anew auto const flags = Instance->Flags(); auto alpha = @@ -454,6 +455,8 @@ basic_cell::unregister_end( TTrack *Path ) { void basic_cell::erase( TAnimModel *Instance ) { + m_instancecache.boundsversion = 0; // the renderer builds it anew + auto const flags = Instance->Flags(); auto alpha = Instance->Material() != nullptr ? Instance->Material()->textures_alpha : 0x30300030; diff --git a/scene/scene.h b/scene/scene.h index 086e2e830..0f52fcdbd 100644 --- a/scene/scene.h +++ b/scene/scene.h @@ -252,6 +252,18 @@ public: // caches owned by the renderer; emptied whenever the content of the bucket changes mutable std::vector bounds; // copies for the instances, in the same order mutable unsigned int boundsversion { 0 }; + // the largest rangesquaredmax of the copies - past it no instance of the bucket is drawn - and the version + // of the bounds it was taken with. set by the renderer before the cell is drawn, see Prepare_Instances() + float rangesquaredmax { 0.f }; + unsigned int rangeversion { 0 }; + }; + // what the renderer keeps of the instances of the cell, set by it before the cell is drawn + struct instance_cache { + instance_sequence single; // the opaque instances drawn one by one, as they aren't instanceable + float rangesquaredmax { 0.f }; // the largest rangesquaredmax of the instance buckets + bool instancedonly { false }; // the cell holds nothing to draw but instances drawn with the instanced path + unsigned int boundsversion { 0 }; // version of the bounds of the renderer it was built with, 0: not built + unsigned int revoked { 0 }; // TAnimModel::s_instanceable_revoked at the time of the build }; using instance_bucketdata_map = std::unordered_map< instance_bucket_key, instance_bucket, instance_bucket_key_hash >; using sound_sequence = std::vector; @@ -275,6 +287,7 @@ public: // m_instancesopaque for nodes whose TAnimModel::m_instanceable == true. // The renderer uses these to amortise per-model state setup across many instances. instance_bucketdata_map m_instancebuckets_opaque; + instance_cache m_instancecache; traction_sequence m_traction; sound_sequence m_sounds; eventlauncher_sequence m_eventlaunchers; From bb009b049993c84cc4f84c4d7f7c3bf0c42ea742 Mon Sep 17 00:00:00 2001 From: pawelw Date: Sat, 7 Nov 2026 12:36:17 +0100 Subject: [PATCH 266/430] Text displays: draw opaque characters in the opaque pass (#201) * Text displays: accept characters above 127, in windows-1250 or utf-8 A text display (sub-model of type "text") looks up the sub-model of each character in a 256 entry table, and indexed it with a plain char. With char being signed, any character above 127 gave a negative index: reading the text went outside the table, and so did filling the table if a character sub-model had such a name. In effect the displays could only show ASCII, and a text with national characters could crash. The lookup is now keyed by unicode code point. Both the displayed text and the names of the character sub-models are decoded as utf-8 if they are valid utf-8, and as windows-1250 otherwise, so legacy (ansi) sceneries and models work next to utf-8 ones, and the two can be mixed. A short ansi text can be valid utf-8 by accident (two upper case accented letters in a row will do); when both readings are possible the one which finds more of its characters in the model is used. The rest is unchanged: the first character of the text still isn't displayed, the characters are still drawn in the translucent pass only. A missing text pointer no longer gets dereferenced. * Text displays: draw opaque characters in the opaque pass The characters of a text display were only laid out in the translucent pass, so a display had to be made of translucent sub-models to show anything. Those don't write depth: overhead wires and other translucent geometry drawn later showed through the display, and translucent geometry in front of it could end up painted over. The opaque pass now lays the characters out the same way, so a display built from opaque sub-models is drawn with depth like any other opaque geometry (and casts shadows). Translucent characters keep working as before. A model with a text display shows the text of its own instance, so such models are excluded from the GPU-instanced opaque path. * Text displays: prepare the characters once for each text The sequence of character sub-models was cached for the last text only, so displays of several instances drawn in turn decoded their texts again on every draw. It is now kept for each text the display shows; the texts of the instances don't change, so a draw costs a single lookup. Also the comments added in the renderers are now in English. * Text displays: move the text decoding to utilities utf8_to_utf32() and win1250_to_utf32(), with the windows-1250 table, now sit next to win1250_to_utf8(). The existing function maps only the Polish letters and passes other bytes above 127 through, so it can't serve the displays. * Text displays: address the SonarCloud findings std::array instead of the C-style arrays, the utf-8 sequence length worked out in a function of its own instead of nested conditional operators, std::byte for the bit operations, std::ranges::count_if and contains(). The character loop of the renderers moved to Render_Alpha_text(), which takes the nesting back to the limit, and the static pasText is accessed through the class. * Text displays: move the opaque character loop to Render_text() The same as for the translucent pass: the loop sits in a function of its own and the static pasText is accessed through the class, which keeps the nesting within the limit. * Text displays: access the static iAlpha through the class in the opaque pass * Text displays: transparent lookup of the text layouts, init-statement for the lookup result Two SonarCloud findings left in the code of #198: the map of the text layouts gets a transparent hasher with std::equal_to<>, and the result of the lookup is declared in the if statement. --- model/AnimModel.cpp | 2 ++ model/Model3d.cpp | 3 +-- model/Model3d.h | 9 ++++++++- rendering/opengl33renderer.cpp | 29 +++++++++++++++++++++++++++-- rendering/opengl33renderer.h | 1 + rendering/openglrenderer.cpp | 25 +++++++++++++++++++++++-- rendering/openglrenderer.h | 3 +++ 7 files changed, 65 insertions(+), 7 deletions(-) diff --git a/model/AnimModel.cpp b/model/AnimModel.cpp index cafb3a93e..52a879ac2 100644 --- a/model/AnimModel.cpp +++ b/model/AnimModel.cpp @@ -505,6 +505,8 @@ bool anim_type_shared_by_instances( TAnimType a ) { // instanced path (one shared submodel tree across all instances) cannot serve. bool submodel_tree_blocks_instancing( TSubModel const *Sub ) { if( Sub == nullptr ) { return false; } + // a text display shows the text of its instance, a tree shared by all instances can't do that + if( Sub->eType == TP_TEXT ) { return true; } if( anim_type_unsafe_for_instancing( Sub->b_Anim ) ) { return true; } if( ( ( Sub->iFlags & 0x4000 ) != 0 ) && ( false == anim_type_shared_by_instances( Sub->b_Anim ) ) ) { return true; } if( submodel_tree_blocks_instancing( Sub->Child ) ) { return true; } diff --git a/model/Model3d.cpp b/model/Model3d.cpp index 66fc08c94..44f5f6255 100644 --- a/model/Model3d.cpp +++ b/model/Model3d.cpp @@ -898,8 +898,7 @@ std::vector const &TSubModel::text_letters(std::string const &Text) { // the sequence is prepared once for each text the display shows. the texts of the model instances don't change, // so drawing a display afterwards costs a single lookup, however many instances and passes take turns - auto const prepared{m_textlayouts.find(Text)}; - if (prepared != m_textlayouts.end()) + if (auto const prepared{m_textlayouts.find(Text)}; prepared != m_textlayouts.end()) { return prepared->second; } diff --git a/model/Model3d.h b/model/Model3d.h index 27565c206..a9ef8af12 100644 --- a/model/Model3d.h +++ b/model/Model3d.h @@ -15,6 +15,8 @@ http://mozilla.org/MPL/2.0/. #include "model/material.h" #include "gl/query.h" +#include + #define EU07_USE_GEOMETRYINDEXING // Ra: specjalne typy submodeli, poza tym GL_TRIANGLES itp. @@ -159,7 +161,12 @@ public: // chwilowo // text display (TP_TEXT) data, filled on first use std::unordered_map m_letters; // sub-models of the available characters, by unicode code point bool m_lettersready { false }; // whether the character lookup was built yet - std::unordered_map> m_textlayouts; // sub-models of consecutive characters, for each text shown + // transparent hasher, so the text layouts can be looked up with any string type without a temporary std::string + struct text_hash { + using is_transparent = void; + std::size_t operator()( std::string_view const Text ) const noexcept { return std::hash{}( Text ); } + }; + std::unordered_map, text_hash, std::equal_to<>> m_textlayouts; // sub-models of consecutive characters, for each text shown TSubModel *Parent{ nullptr }; // nadrzędny, np. do wymnażania macierzy int iVisible { 1 }; // roboczy stan widoczności float fVisible { 1.f }; // visibility level diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index 33346fad2..c24f750c8 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -4152,6 +4152,23 @@ bool opengl33_renderer::Render(TModel3d *Model, material_data const *Material, f return result; } +// opaque characters of a text display, laid out in a row the same way as the translucent ones +void opengl33_renderer::Render_text(TSubModel *Submodel) +{ + if (TSubModel::pasText == nullptr) + { + return; + } + ::glPushMatrix(); + for (auto *p : Submodel->text_letters(*TSubModel::pasText)) + { + Render(p); + if (p->fMatrix) + ::glMultMatrixf(p->fMatrix->readArray()); // move on to the place of the next character + } + ::glPopMatrix(); +} + void opengl33_renderer::Render(TSubModel *Submodel) { glDebug("Render TSubModel"); @@ -4302,9 +4319,17 @@ void opengl33_renderer::Render(TSubModel *Submodel) } } } - if (Submodel->Child != nullptr) - if (Submodel->iAlpha & Submodel->iFlags & 0x001F0000) + if (Submodel->Child != nullptr && (TSubModel::iAlpha & Submodel->iFlags & 0x001F0000)) + { + if (Submodel->eType == TP_TEXT) + { + Render_text(Submodel); + } + else + { Render(Submodel->Child); + } + } if (Submodel->iFlags & 0xC000) { diff --git a/rendering/opengl33renderer.h b/rendering/opengl33renderer.h index b472849bc..1b4897386 100644 --- a/rendering/opengl33renderer.h +++ b/rendering/opengl33renderer.h @@ -314,6 +314,7 @@ class opengl33_renderer : public gfx_renderer { bool Render(TModel3d *Model, material_data const *Material, float const Squaredistance, glm::dvec3 const &Position, glm::vec3 const &Angle); bool Render(TModel3d *Model, material_data const *Material, float const Squaredistance); void Render(TSubModel *Submodel); + void Render_text(TSubModel *Submodel); // opaque characters of a text display void Render(TTrack *Track); void Render(scene::basic_cell::path_sequence::const_iterator First, scene::basic_cell::path_sequence::const_iterator Last); // renders the per-track sleeper instances (TTrack::m_sleeper_local_transforms) via GPU instancing. diff --git a/rendering/openglrenderer.cpp b/rendering/openglrenderer.cpp index ef54f32c9..180dba771 100644 --- a/rendering/openglrenderer.cpp +++ b/rendering/openglrenderer.cpp @@ -2794,6 +2794,21 @@ opengl_renderer::Render( TModel3d *Model, material_data const *Material, float c return result; } +// opaque characters of a text display, laid out in a row the same way as the translucent ones +void +opengl_renderer::Render_text( TSubModel *Submodel ) { + + if( TSubModel::pasText == nullptr ) { return; } + + ::glPushMatrix(); + for( auto *p : Submodel->text_letters( *TSubModel::pasText ) ) { + Render( p ); + if( p->fMatrix ) + ::glMultMatrixf( p->fMatrix->readArray() ); // move on to the place of the next character + } + ::glPopMatrix(); +} + void opengl_renderer::Render( TSubModel *Submodel ) { @@ -3112,9 +3127,15 @@ opengl_renderer::Render( TSubModel *Submodel ) { } } } - if( Submodel->Child != nullptr ) - if( Submodel->iAlpha & Submodel->iFlags & 0x001F0000 ) + if( Submodel->Child != nullptr + && ( TSubModel::iAlpha & Submodel->iFlags & 0x001F0000 ) ) { + if( Submodel->eType == TP_TEXT ) { + Render_text( Submodel ); + } + else { Render( Submodel->Child ); + } + } if( Submodel->iFlags & 0xC000 ) ::glPopMatrix(); diff --git a/rendering/openglrenderer.h b/rendering/openglrenderer.h index 9779388c7..3a3538a6c 100644 --- a/rendering/openglrenderer.h +++ b/rendering/openglrenderer.h @@ -237,6 +237,9 @@ private: Render( TModel3d *Model, material_data const *Material, float const Squaredistance ); void Render( TSubModel *Submodel ); + // opaque characters of a text display + void + Render_text( TSubModel *Submodel ); void Render( TTrack *Track ); void From 466cbbbfa157525a51738f9d9715225ca066d7ce Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 12:37:12 +0100 Subject: [PATCH 267/430] Test/core unit coverage (#235) * test: real vehicles and golden traces in the unit tests The game's own vehicles (dynamic/ of the release used for the tests) as JSON of what the game's vehicle loader reads of their .fiz files, includes expanded: test_fiz.cpp converts them on demand and checks the loader reads the same sections, values and rows as of the game's file (fiz.h). Chosen to cover every engine type, brake valve, brake handle, local brake, coupler type, door type and brake delay set the game data uses. Golden traces (golden.h) characterise the simulation, compared within a relative tolerance or exactly, re-recorded with EU07_UNIT_TESTS_UPDATE_GOLDEN=1: - the parameters of every real vehicle as loaded, - the brakes of every real vehicle through charge, service steps, release, overcharge and emergency, on every brake delay setting, - every position of every driver's and local brake handle, - every powered vehicle started up the way the AI does it, driven to full power and braked to a stop (drive.h), - the real electric units and a locomotive with wagons driven whole, as trains of coupled vehicles stepped the way the game steps them (consist.h), - scenarios of the controls (scenario.h): doors, reversing and cab change, slip and sand, emergency stops, releasers, the ep and the electrodynamic brake, heating, loading, a collision, and frames of several physics iterations. * test: commands passed between vehicles Every command RunCommand knows run on every real vehicle and recorded, commands travelling through a train with a vehicle facing backwards, a coupling without the control cable, and loading and unloading by commands. * test: every switch of the cab, sent to the next vehicle Each switch sending its state to the train, each way and to each range, with the controllers and direction among them, on every real vehicle driving another of its kind, recorded for both. * test: the switches of the cab worked on a pair under the catenary The same switches with two seconds for the vehicles to act on each, so the pantographs rise, the main switch closes and the auxiliaries start. * test: gauges of trains in multiple and the damage descriptions The ammeters and the brake force the AI expects, recorded on the electric units and locomotives in multiple driven, the damage described on the driver's panel and ammeters showing the current of controlled vehicles. * test: give load commands their place, as the game does The loading test set its commands with SetInternalCommand, which leaves TCommand::Location as it is: uninitialised in a fresh vehicle, so the distance check of Load= and UnLoad= read garbage and the test failed now and then. The game gives them through PutCommand with the place of the platform, and so do the tests now. * test: brake valves and handles no vehicle of the game data has Fitted to a wagon and to an EU07: the valve variants and handles the loader knows that no real vehicle uses, the CV1 ones and the test handle among them, and a name the loader doesn't know. * test: braking from speed with the automatic ED brake, and a draisine Trains with the EP09, the E6ACT and the EW58 braked by ep, light and full service applications from speed, and the draisine pumped from rest and rolling. Only the E6ACT brings its electrodynamic brake in here. * test: the EP09's electrodynamic brake in service braking held to a stop start_up() took a vehicle for ready once its line breaker was closed and its reservoir full, which a train made already moving is at once: the EP09's manually started converter was never switched on, so there was no 110 V and no electrodynamic brake. It now waits for the converter. The EP09 with wagons is braked from 120 km/h by light, medium, high and full service applications held to a stop: the motors brake, the air of its cylinders is let out and given back as the train slows down. The flag of the electrodynamic brake stays on at a standstill below 2.1 bar. C strings given to CAPTURE are shown as text. * test: the converter switched on before a train is ready, the EW58's ep-staged electrodynamic brake start_up() called a train ready as soon as its line breaker closed and the air was there, so the converter of a unit having it in another car than the cab (the EW58's middle car) was never switched on, and its electrodynamic brake, gated by the 110 V, never came in. The converter and the compressor now always get switched on first. The EW58 brakes electrically by the stages of the ep brake, not by the pipe alone. * test: the ET42 and the 214M railbus among the real vehicles The ET42's halves (its own series motor branch: the motors in series at the high current setting) and the 214MA, a diesel railbus with the hydraulic torque converter, the retarder and the controller of an induction motor drive, converted from the game data and recorded in every sweep of the real vehicles. * test: the wagons' hand brakes released with the train's brakes; the 754, SM31 and SU46 release_brakes() released the hand brake of the driver's vehicle only, so every wagon set up braked kept its hand brake on and got dragged along. It now releases the hand and spring brakes of the whole train, as TController::AutoRewident() does when the AI takes it over, and the traces of the trains with wagons are recorded anew. The 754, the SM31 and the SU46 join the real vehicles for the kinds of the diesel-electrics' field shunting relays the others lack (RelayType 0, 1 and 46). * test: traction on a lost and too high catenary voltage, the ET42, the diesel-electrics' shunting relays The line breaker opened by the voltage relays of a series motor locomotive and by the limits of an induction motor one. The ET42 at the high current setting, which keeps its halves' motors in series, and its switched electrodynamic brake, whose current trips the overload relay from the top speed of the low setting. The field shunting of the diesel-electrics through each kind of their relays, at full power and notched back. * test: the EW58's electrodynamic brake stages, the EU47's speed control and braking at the voltage's limit The stages of the EW58's motor brake set by the positions of its ep handle, the first one alone over 100 km/h. The EU47's second controller holding, raising and lowering the speed set, its local brake setting the flag of the electrodynamic brake without the motors braking, and its brake feeding back less current into a catenary over the drive's MaxV. * test: diesel engines too cold and too hot to start, the 214M railbus's controller and retarder The heat of the diesel engines: at -10 degrees the ones with the lowest water temperature set don't start until the heater warms them, at 88 degrees the ones with a second water circuit don't start while it cools, and the SM42 run hot at full power is kept under its highest temperature by its fans and shutters. The 214M railbus's controller from the air brake through the retarder and neutral to power, its torque converter's lock-up and its gearbox. The controller helpers of the traction tests (full power, waiting for the line contactors, and notching back) move to test::scenario. * test: couplers coupled, uncoupled, broken and colliding; loads assigned, loaded and unloaded Coupling by hand touching or apart and of the same kind or not, with the sounds of what changes; uncoupling a screw coupler pressed together, stretched, with the hoses alone or broken; the automatic couplers of electric units coupling on contact, without the control cable between two kinds; a coupler broken with its brake hose; collisions over 15 km/h derailing. The pantographs set up by the pantstate load, a load of one kind at a time up to the capacity, and the steps of loading and unloading. * test: the battery drained and charged, the pantographs' tank and pressure switch, the 214M's speed control The EU07's battery drained without the converter by the lights and the small compressor until it opens the line breaker and nothing starts, charged by the converter, and switched off. The pantographs on their own leaking tank until the pressure switch opens the line breaker, and the small compressor pumping it up and priming the switch. The 214M railbus's speed control set by its buttons, steps and power limit, braking down with the retarder, and standing by. * test: the MHZ handles' buttons, the valves at speed, every brake material, the NESt3's relays The overload and the high pressure buttons of the MHZ handles. The KE and the LSt at speed in the R and P settings, under the anti-slip request and the releaser button. Every material of the brake shoes and disks the loader takes, braking a wagon from speed, the ones no game vehicle has among them. The CV1_R and the Oerlikon valve's relays set by its name (-ED, AL2 without ESt3) fitted to a wagon. * test: the loader's lists and lines: the 218M, SA134 and 22WEc, a compressor list, Pmax by speed, skipped lines The 218M (V2NList), the SA134 (HTCList) and the Elf 22WEc (ffBrakeList) join the real vehicles for the lists the others lack. Definitions made by the tests for what no game file has: a compressor list, whose table of whole numbers reads a factor of 0.9 as 0; the compressor's limits apart for the rear cab; the highest power of an induction motor drive by the speed, extrapolated past the table; and the lines the loader skips or trims (comments, a hash anywhere, leading spaces, carriage returns). * test: what the cab and the AI call on a vehicle: gauges of the train, the split ED brake, spring brake, cut-off The engine rotation of up to three vehicles in multiple and the lamps of the overload relay and the starting resistors read through the control cable; the engine's idle speed and the ET42's second controller shown in its dynamic brake; the controller of the electrodynamic brake apart from the local brake, which no game vehicle has yet; the spring brake shut off and released, the ep brake's fuse and the handle stepped by the AI; damaged motors cut off; the cab activated by itself; a road vehicle moved across a road, for which the tests' track gets a width; and the lamps and the buzzer of the security system left unattended. * test: the EP05 and its camshaft among the real vehicles, the headlights' colour and brightness The EP05, whose camshaft closes the line breaker and the line contactors by the camshaft's own position, converted from the game data and recorded in every sweep of the real vehicles. The Headlights section, which only the 214M's own file has, in a definition made by the test. * test: what the unit tests reach of the simulation core, what's dead or left, and what they found COVERAGE.md: the blocks of Mover.cpp, hamulce.cpp, Oerlikon_ESt.cpp and friction.cpp the tests run, the code nothing in the game runs, the code only data no game vehicle has would run, what's reachable and left, and the behaviour the tests found that may deserve a look. * test: check invariants of the physics on every step of every golden trace Rules any vehicle keeps whatever a test does (no NaN, cylinders and pipes within their limits, no current with the line breaker or contactors open, no force without power, distance as the speed runs, no acceleration over 5 g), checked on every step, with no comparison to a recorded file. The traces where a test or a game vehicle breaks one are excused with the reason; the vehicles' cases are in the findings of COVERAGE.md. * test: key figures of every golden trace, per part of the run Duration, speeds, distance, time to stop, the brake pipe's lowest pressure and time to recover, the peaks of the cylinders, the motor current and the tractive force, for each part between two events, in data/golden/.figures. Compared within 0.5% or the last decimal, so they hold on any compiler, and an intended change of behaviour shows in a few readable lines. Traces sampled by hand keep none. * test: keep the golden samples out of the repository, recorded on the code before a change The samples of the golden traces are 29 MB and only mean something against the code before the change they check, so they're recorded locally before it (EU07_UNIT_TESTS_UPDATE_GOLDEN=1) and compared after it, and ignored by git. The key figures and the invariants stay, and are what the CI checks. Without samples recorded a trace compares only its key figures, but with EU07_UNIT_TESTS_GOLDEN_EXACT=1, the check of a change which shouldn't alter anything, it fails, so the check can't pass by having nothing to compare. * fix: draw the noise of the control pipe pressure in one order on every compiler The order of the two Random(10) calls in 'Random(10) - Random(10)' is unspecified: GCC draws them the other way round than MSVC Release, which mirrored the control pipe pressure around 5 bar and failed 32 unit tests on the Linux CI. The draws are sequenced in the order of MSVC Release, which the golden traces were recorded with. * test: count the start-up rounds with an integer, not a double (SonarCloud S2193) * test: behaviour in CHECKs, the key figures out of the repository The key figures of the golden traces are recorded with their samples on the code before a change, and compared after it, instead of being kept: a trace without them checks the invariants and its test's CHECKs, which is what the CI runs. The scenarios of the controls state what they show in CHECKs, and the runs of every real vehicle what holds for each of them. Writing them showed scenarios which didn't do what they were named for: the cab change stopped in the engine room, the slip runs put the controller to full power at once and never got the line contactors closed, and the train stopped by the alarm chain never got its pipe charged again. They do it now; the rest went to the findings. * test: the SonarCloud findings in the unit tests std::format for the texts put together, emplace_back, const references, string_view parameters, std::array and std::vector for the C arrays, the ranges algorithms, names no longer shadowing the coupler ends, comments in the empty loops; start_up(), trace::check() and the converter of the definitions split up. BrakeForceR() is const, which it always was in effect, so the gauges test needs no const_cast. The golden traces compare bit for bit. --- McZapkie/MOVER.h | 2 +- McZapkie/Mover.cpp | 7 +- tests/unit/CMakeLists.txt | 14 +- tests/unit/COVERAGE.md | 117 ++++ tests/unit/README.md | 118 +++- tests/unit/consist.cpp | 106 +++ tests/unit/consist.h | 57 ++ tests/unit/data/fiz/11xa_v2/93a.json | 14 + tests/unit/data/fiz/14xa_v1/173a.json | 14 + tests/unit/data/fiz/168a_v1/168a.json | 14 + tests/unit/data/fiz/21xm_v1/214ma.json | 78 +++ tests/unit/data/fiz/21xm_v1/218ma_a_kd.json | 84 +++ tests/unit/data/fiz/3wl_v2/3wl.json | 11 + tests/unit/data/fiz/430w_v2/430w.json | 11 + tests/unit/data/fiz/4e_v1/4e.json | 81 +++ tests/unit/data/fiz/README.md | 66 ++ tests/unit/data/fiz/bdhpumn_v3/bdhpumn.json | 14 + tests/unit/data/fiz/bhp_v1/bhp-b.json | 15 + tests/unit/data/fiz/br285_v1/br285.json | 69 ++ tests/unit/data/fiz/cd/754_v1/754.json | 56 ++ tests/unit/data/fiz/cd/810_v2/810.json | 41 ++ tests/unit/data/fiz/dr2_v1/dr2.json | 13 + tests/unit/data/fiz/e186_v2/eu47.json | 61 ++ tests/unit/data/fiz/e6act_v2/e6acta.json | 41 ++ tests/unit/data/fiz/ed72_v1/5bs-ra.json | 25 + tests/unit/data/fiz/ed72_v1/5bs-rb.json | 25 + tests/unit/data/fiz/ed72_v1/6bs-sa.json | 47 ++ tests/unit/data/fiz/ed72_v1/6bs-sb.json | 47 ++ tests/unit/data/fiz/elf_v1/21we-a.json | 52 ++ tests/unit/data/fiz/elf_v1/21we-b.json | 25 + tests/unit/data/fiz/elf_v1/21we-c.json | 52 ++ tests/unit/data/fiz/elf_v1/22wec-a.json | 54 ++ .../data/fiz/en57_v1/5bgaiii_led_spot.json | 26 + tests/unit/data/fiz/en57_v1/5bgb.json | 26 + tests/unit/data/fiz/en57_v1/6ba_840.json | 26 + tests/unit/data/fiz/en57_v1/6bai.json | 25 + tests/unit/data/fiz/en57akl_v1/akl_ra.json | 40 ++ tests/unit/data/fiz/ep05_v2/ep05.json | 84 +++ tests/unit/data/fiz/ep09_v2/104e.json | 76 +++ tests/unit/data/fiz/et22_v3/201e-rn.json | 86 +++ tests/unit/data/fiz/et22_v3/201e-w.json | 86 +++ tests/unit/data/fiz/et42_v2/112e-a.json | 77 +++ tests/unit/data/fiz/et42_v2/112e-b.json | 77 +++ tests/unit/data/fiz/eu04_v1/eu04-01.json | 67 ++ tests/unit/data/fiz/ew58_v1/ew58-d.json | 20 + tests/unit/data/fiz/ew58_v1/ew58-sa.json | 68 ++ tests/unit/data/fiz/ew58_v1/ew58-sb.json | 68 ++ tests/unit/data/fiz/impuls_v1/31we-a_pr.json | 50 ++ tests/unit/data/fiz/impuls_v1/31we-b_pr.json | 20 + tests/unit/data/fiz/impuls_v1/31we-c_pr.json | 20 + tests/unit/data/fiz/impuls_v1/31we-d_pr.json | 50 ++ tests/unit/data/fiz/road/man/nl293.json | 36 + tests/unit/data/fiz/sa134_v1/218mc_a.json | 94 +++ tests/unit/data/fiz/sieciowiec_v1/a.json | 13 + tests/unit/data/fiz/sm03_v1/sm03.json | 41 ++ tests/unit/data/fiz/sm31_v1/411d.json | 43 ++ tests/unit/data/fiz/sm40_v1/sm40.json | 48 ++ tests/unit/data/fiz/sm42_v1/6d1.json | 42 ++ tests/unit/data/fiz/sn61_v2/sn61.json | 42 ++ tests/unit/data/fiz/st44_v2/m62-1151.json | 56 ++ tests/unit/data/fiz/st45_v2/301dd.json | 55 ++ .../unit/data/fiz/static/sug/sug_kielce.json | 70 ++ tests/unit/data/fiz/su45_v2/301d.json | 47 ++ tests/unit/data/fiz/su46_v2/303d.json | 50 ++ tests/unit/data/fiz/tem2_v2/tem2a.json | 39 ++ tests/unit/data/fiz/wm15_v1/wm15.json | 22 + tests/unit/data/fiz/wmb10_v1/wmb10.json | 49 ++ tests/unit/data/fiz/z1_v2/152a.json | 14 + tests/unit/data/golden/.gitignore | 4 + tests/unit/drive.cpp | 246 +++++++ tests/unit/drive.h | 56 ++ tests/unit/figures.cpp | 222 ++++++ tests/unit/figures.h | 70 ++ tests/unit/fiz.cpp | 222 ++++++ tests/unit/fiz.h | 44 ++ tests/unit/golden.cpp | 393 +++++++++++ tests/unit/golden.h | 90 +++ tests/unit/invariants.cpp | 163 +++++ tests/unit/invariants.h | 36 + tests/unit/main.cpp | 12 +- tests/unit/real_vehicles.h | 12 + tests/unit/scenario.cpp | 80 +++ tests/unit/scenario.h | 63 ++ tests/unit/test_auxiliaries.cpp | 112 ++++ tests/unit/test_brake_cycle.cpp | 194 ++++++ tests/unit/test_brake_handles.cpp | 154 +++++ tests/unit/test_cab.cpp | 229 +++++++ tests/unit/test_commands.cpp | 547 +++++++++++++++ tests/unit/test_consist.cpp | 135 ++++ tests/unit/test_controls.cpp | 632 ++++++++++++++++++ tests/unit/test_couplers_trains.cpp | 174 +++++ tests/unit/test_definition.cpp | 106 +++ tests/unit/test_diesel.cpp | 179 +++++ tests/unit/test_figures.cpp | 67 ++ tests/unit/test_fiz.cpp | 183 +++++ tests/unit/test_invariants.cpp | 34 + tests/unit/test_loads.cpp | 116 ++++ tests/unit/test_queries.cpp | 61 ++ tests/unit/test_traction.cpp | 270 ++++++++ tests/unit/vehicle.cpp | 254 ++++--- tests/unit/vehicle.h | 70 +- 101 files changed, 8298 insertions(+), 116 deletions(-) create mode 100644 tests/unit/COVERAGE.md create mode 100644 tests/unit/consist.cpp create mode 100644 tests/unit/consist.h create mode 100644 tests/unit/data/fiz/11xa_v2/93a.json create mode 100644 tests/unit/data/fiz/14xa_v1/173a.json create mode 100644 tests/unit/data/fiz/168a_v1/168a.json create mode 100644 tests/unit/data/fiz/21xm_v1/214ma.json create mode 100644 tests/unit/data/fiz/21xm_v1/218ma_a_kd.json create mode 100644 tests/unit/data/fiz/3wl_v2/3wl.json create mode 100644 tests/unit/data/fiz/430w_v2/430w.json create mode 100644 tests/unit/data/fiz/4e_v1/4e.json create mode 100644 tests/unit/data/fiz/README.md create mode 100644 tests/unit/data/fiz/bdhpumn_v3/bdhpumn.json create mode 100644 tests/unit/data/fiz/bhp_v1/bhp-b.json create mode 100644 tests/unit/data/fiz/br285_v1/br285.json create mode 100644 tests/unit/data/fiz/cd/754_v1/754.json create mode 100644 tests/unit/data/fiz/cd/810_v2/810.json create mode 100644 tests/unit/data/fiz/dr2_v1/dr2.json create mode 100644 tests/unit/data/fiz/e186_v2/eu47.json create mode 100644 tests/unit/data/fiz/e6act_v2/e6acta.json create mode 100644 tests/unit/data/fiz/ed72_v1/5bs-ra.json create mode 100644 tests/unit/data/fiz/ed72_v1/5bs-rb.json create mode 100644 tests/unit/data/fiz/ed72_v1/6bs-sa.json create mode 100644 tests/unit/data/fiz/ed72_v1/6bs-sb.json create mode 100644 tests/unit/data/fiz/elf_v1/21we-a.json create mode 100644 tests/unit/data/fiz/elf_v1/21we-b.json create mode 100644 tests/unit/data/fiz/elf_v1/21we-c.json create mode 100644 tests/unit/data/fiz/elf_v1/22wec-a.json create mode 100644 tests/unit/data/fiz/en57_v1/5bgaiii_led_spot.json create mode 100644 tests/unit/data/fiz/en57_v1/5bgb.json create mode 100644 tests/unit/data/fiz/en57_v1/6ba_840.json create mode 100644 tests/unit/data/fiz/en57_v1/6bai.json create mode 100644 tests/unit/data/fiz/en57akl_v1/akl_ra.json create mode 100644 tests/unit/data/fiz/ep05_v2/ep05.json create mode 100644 tests/unit/data/fiz/ep09_v2/104e.json create mode 100644 tests/unit/data/fiz/et22_v3/201e-rn.json create mode 100644 tests/unit/data/fiz/et22_v3/201e-w.json create mode 100644 tests/unit/data/fiz/et42_v2/112e-a.json create mode 100644 tests/unit/data/fiz/et42_v2/112e-b.json create mode 100644 tests/unit/data/fiz/eu04_v1/eu04-01.json create mode 100644 tests/unit/data/fiz/ew58_v1/ew58-d.json create mode 100644 tests/unit/data/fiz/ew58_v1/ew58-sa.json create mode 100644 tests/unit/data/fiz/ew58_v1/ew58-sb.json create mode 100644 tests/unit/data/fiz/impuls_v1/31we-a_pr.json create mode 100644 tests/unit/data/fiz/impuls_v1/31we-b_pr.json create mode 100644 tests/unit/data/fiz/impuls_v1/31we-c_pr.json create mode 100644 tests/unit/data/fiz/impuls_v1/31we-d_pr.json create mode 100644 tests/unit/data/fiz/road/man/nl293.json create mode 100644 tests/unit/data/fiz/sa134_v1/218mc_a.json create mode 100644 tests/unit/data/fiz/sieciowiec_v1/a.json create mode 100644 tests/unit/data/fiz/sm03_v1/sm03.json create mode 100644 tests/unit/data/fiz/sm31_v1/411d.json create mode 100644 tests/unit/data/fiz/sm40_v1/sm40.json create mode 100644 tests/unit/data/fiz/sm42_v1/6d1.json create mode 100644 tests/unit/data/fiz/sn61_v2/sn61.json create mode 100644 tests/unit/data/fiz/st44_v2/m62-1151.json create mode 100644 tests/unit/data/fiz/st45_v2/301dd.json create mode 100644 tests/unit/data/fiz/static/sug/sug_kielce.json create mode 100644 tests/unit/data/fiz/su45_v2/301d.json create mode 100644 tests/unit/data/fiz/su46_v2/303d.json create mode 100644 tests/unit/data/fiz/tem2_v2/tem2a.json create mode 100644 tests/unit/data/fiz/wm15_v1/wm15.json create mode 100644 tests/unit/data/fiz/wmb10_v1/wmb10.json create mode 100644 tests/unit/data/fiz/z1_v2/152a.json create mode 100644 tests/unit/data/golden/.gitignore create mode 100644 tests/unit/drive.cpp create mode 100644 tests/unit/drive.h create mode 100644 tests/unit/figures.cpp create mode 100644 tests/unit/figures.h create mode 100644 tests/unit/fiz.cpp create mode 100644 tests/unit/fiz.h create mode 100644 tests/unit/golden.cpp create mode 100644 tests/unit/golden.h create mode 100644 tests/unit/invariants.cpp create mode 100644 tests/unit/invariants.h create mode 100644 tests/unit/real_vehicles.h create mode 100644 tests/unit/scenario.cpp create mode 100644 tests/unit/scenario.h create mode 100644 tests/unit/test_auxiliaries.cpp create mode 100644 tests/unit/test_brake_cycle.cpp create mode 100644 tests/unit/test_brake_handles.cpp create mode 100644 tests/unit/test_cab.cpp create mode 100644 tests/unit/test_commands.cpp create mode 100644 tests/unit/test_consist.cpp create mode 100644 tests/unit/test_controls.cpp create mode 100644 tests/unit/test_couplers_trains.cpp create mode 100644 tests/unit/test_diesel.cpp create mode 100644 tests/unit/test_figures.cpp create mode 100644 tests/unit/test_fiz.cpp create mode 100644 tests/unit/test_invariants.cpp create mode 100644 tests/unit/test_loads.cpp create mode 100644 tests/unit/test_queries.cpp create mode 100644 tests/unit/test_traction.cpp diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index bb36694bb..199c65a0c 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -2437,7 +2437,7 @@ class TMoverParameters double Adhesive(double staticfriction) const; double TractionForce(double dt); double FrictionForce() const; - double BrakeForceR(double ratio, double velocity); + double BrakeForceR(double ratio, double velocity) const; double BrakeForceP(double press, double velocity) const; double BrakeForce(const TTrackParam &Track); double CouplerForce(int const End, double dt); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 6b7bdcec5..330e8eb8f 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -5144,7 +5144,7 @@ void TMoverParameters::ComputeTotalForce(double dt) FTotal = FTrain - Sign(V) * FStand; } -double TMoverParameters::BrakeForceR(double ratio, double velocity) +double TMoverParameters::BrakeForceR(double ratio, double velocity) const { double press = 0; if (MBPM > 2) @@ -10482,7 +10482,10 @@ void TMoverParameters::LoadFIZ_Brake(std::string const &line) P2FTrans = 0; } - CntrlPipePress = 5 + 0.001 * (Random(10) - Random(10)); // Ra 2014-07: trochę niedokładności + // Ra 2014-07: trochę niedokładności + // the draws are sequenced: the order of the operands of '-' is unspecified, and GCC and MSVC draw them the other way round + auto const firstdraw{Random(10)}; + CntrlPipePress = 5 + 0.001 * (Random(10) - firstdraw); extract_value(CntrlPipePress, "HiPP", line, ""); HighPipePress = CntrlPipePress; LowPipePress = std::min(HighPipePress, 3.5); diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index 7bb624106..17efffa7d 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -6,20 +6,28 @@ set(UNIT_TESTS_NAME eu07_unit_tests) -# a new test_*.cpp file or data/*.json definition is picked up on its own +# a new test_*.cpp file or file in data/ (definitions, real vehicles, golden traces) is picked up on its own file(GLOB UNIT_TEST_CASES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/test_*.cpp") -file(GLOB UNIT_TEST_DATA CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/data/*.json") +file(GLOB_RECURSE UNIT_TEST_DATA CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/data/*") add_executable(${UNIT_TESTS_NAME} main.cpp vehicle.cpp + fiz.cpp + drive.cpp + consist.cpp + scenario.cpp + golden.cpp + invariants.cpp + figures.cpp engine_stubs.cpp ${UNIT_TEST_CASES}) # the core library brings the game's build settings along target_link_libraries(${UNIT_TESTS_NAME} PRIVATE eu07_core) target_include_directories(${UNIT_TESTS_NAME} PRIVATE "${DEPS_DIR}/doctest") -target_compile_definitions(${UNIT_TESTS_NAME} PRIVATE EU07_UNIT_TESTS_DATA="${CMAKE_CURRENT_SOURCE_DIR}/data") +# the names the tests CAPTURE are often C strings, shown as text rather than pointers +target_compile_definitions(${UNIT_TESTS_NAME} PRIVATE EU07_UNIT_TESTS_DATA="${CMAKE_CURRENT_SOURCE_DIR}/data" DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING) if (MSVC) target_compile_options(${UNIT_TESTS_NAME} PRIVATE /bigobj) endif() diff --git a/tests/unit/COVERAGE.md b/tests/unit/COVERAGE.md new file mode 100644 index 000000000..aafcc27a6 --- /dev/null +++ b/tests/unit/COVERAGE.md @@ -0,0 +1,117 @@ +# Coverage of the simulation core by the unit tests + +These tests characterise the physics of the vehicles (`McZapkie/Mover.cpp`, `hamulce.cpp`, `Oerlikon_ESt.cpp`, `friction.cpp`). They exist to show that refactors of those files, such as splitting `TractionForce` or `RunCommand`, leave the behaviour as it was. This page lists: + +- what the tests reach; +- what nothing in the game ever runs; +- what only data no game vehicle has would run; +- what is left to test; +- the behaviour the tests found that may deserve a look. + +## How it was measured + +Coverage was measured on Windows with MSVC's SanitizerCoverage (`/fsanitize-coverage=trace-pc-guard`) on the unit test binary. The counts are basic blocks, which comes close to branch coverage: both sides of a condition are blocks of their own. The tool is local and not part of the build, by decision (2026-10). Any block-coverage tool run over `eu07_unit_tests` gives comparable numbers. + +| File | Blocks run, at the start | Now | +|---|---|---| +| `Mover.cpp` | 8.9% | 80.7% (3323 of 4118) | +| `hamulce.cpp` | 30% | 76.3% (649 of 851) | +| `Oerlikon_ESt.cpp` | 58% | 87.4% (118 of 135) | +| `friction.cpp` | 9% | 90.9% (10 of 11) | + +The aim is branch coverage with the rest explained below, not 100%. + +## Code nothing in the game runs + +Nothing creates these objects or calls these functions anywhere in the game, which was checked against the whole source tree. A refactor can delete them, or leave them untested. + +- **Brake valves that never get created:** + - `TESt`, `TESt3` and `TESt3AL2`, including `Init`, `PLC` and `SetLP`. The valve names ESt3, ESt3AL2 and ESt4 all create `TNESt3`. + - `TESt4R::GetPF`, overridden by `TLSt` and never called by it. + - `TESt::CheckState`, `CVs`, `BVs`, `GetPF` and `EStParams`, and `TNESt3::EStParams`. +- **`TFV4a`** (`GetPF`, `Init`): the FV4a handle of the vehicle definitions creates `TFV4aM`. +- **Base implementations always overridden:** `TFricMat::GetFC` (every material, the default P10 too, has its own) and `TPrzekladnik::Update` (every relay has its own). +- **Functions without callers:** + - In `hamulce.cpp`: `PF_old`, `TBrake::GetBCF`, `TDriverHandle::OvrldButton`, `TReservoir::pa` and `TBrakeCyl::pa`. + - In `Mover.cpp`: `BrakeVP`, `PipeRatio`, `RealPipeRatio`, `IncBrakeLevel`, `DecBrakeLevel`, `IncBrakePress`, `DecBrakePress`, `MainCtrlActualPowerPos` and `GetExternalCommand`. +- **Inverter failures** of the induction motor drives (`inverter::Failure_Drive`, `Failure_Const`, `Activate`): nothing ever sets them. The cab only shows them. The branches reading them in `TractionForce` can't be reached. + +## Code only data no game vehicle has would run + +Where it was worth it, a test fits the missing parameter to a real vehicle or builds a definition with it (`definition::set()`). Those cases are marked "tested" below. The rest is reachable only by a vehicle definition the game data doesn't have: + +- **Tested, fitted or handmade:** + - The valves CV1, CV1_R, CV1_L_TR, the W, K and Hik variants, SW, NESt3 and M483 (`brake cycle: the valves the game knows…`). + - An Oerlikon valve named with -ED or AL2 without ESt3 (its relays `TPrzekED` and `TPrzekCiagly`). + - The brake materials FR513, FR510, P10yBg and P10yBgu (`brake cycle: every material…`). + - The handles test, D2, Westinghouse, MHZ_EN57 and St113 fitted to an EU07. + - A `CompressorList`, a `PmaxList` and a `Headlights` section. + - The rear cab's compressor limits (`MinCP_B`, `MaxCP_B`). + - The controller of the electrodynamic brake apart from the local brake (`SplitEDPneumaticBrake`). +- **Not tested:** + - The retarder's clutch (`R_IsClutch`, `R_ClutchSpeed`) and the retarder worked by the local brake (`R_WithIndividual`). + - The automatic relays of type 2 (`RelayType=2`). + - The variant of `CheckLocomotiveParameters` for a definition whose `RList` doesn't match its powered axles. + +## Reachable, not tested yet + +These are run by the game, by vehicles it has or by the cab, the AI or the scenery, but no test reaches them yet. Most of them are the far sides of conditions inside functions the tests do run. + +- **Entry points from outside the core:** + - `TBrake::ForceEmptiness` and its overrides: a scenario's vehicle set up with empty brakes (`DynObj.cpp`). + - `TBrake::GetSoundFlag`: the sounds of the brakes. + - `LoadFIZ` and `reload_FIZ`: the file loading around `LoadFIZ_Text`, which the tests call directly. + - `TSecuritySystem::set_cabsignal_lock`. + - `TMHZ_EN57::GetEP`: an MHZ_EN57 handle in the EP mode of the brake. +- **Inside the functions the tests run** (blocks run of the function's total): + - `TractionForce` (305 of 373): the inverter failures above. The rest are mostly halves of conditions: + - the `SST` table of the series-excited diesel-electrics; + - the speed control's brake intervention with the air under `BrakeInterventionVel`; + - a diesel-electric's generator tripping on overcurrent; + - the `ffBrakeList` of the 22WEc, whose electrodynamic brake no test applies. + - `AutoRelayCheck` (87 of 119): the ET22's group switch under some sequences, the relays at reverse with `BackwardsBranchesAllowed`, and the shunting of the EZTs. + - `update_doors` (134 of 160), `PantographsCheck` (44 of 64) and `PowerCouplersCheck` (70 of 88): door modes and pantograph valve kinds only some game vehicles have, and the 24 V circuit across couplers. + - `RelayReset` (29 of 43) and `MainSwitchCheck` (16 of 27): relays tripping in states the drive cycles don't reach. + - `UpdatePipePressure` (108 of 130): the pressure switch lock of an electric unit's pantographs, which the EW58's automatic valve keeps away. Also the EP mode of the EN57's handle and the `LockPipe` thresholds (`LPOn`, `LPOff`), which no vehicle sets. + - `TCV1L_TR::GetPF` (9 of 20), `TKE::GetPF` (28 of 37) and the MHZ handles: settings (G with the CV1L_TR, the KE's anti-slip pressure `ASBP`) that no real vehicle has together. + +## What the tests found + +The tests record the behaviour as it is. The following points may deserve a look by someone who knows how the real vehicles behave. + +- **`Random(10) - Random(10)` (`Mover.cpp`, the noise of the control pipe pressure `CntrlPipePress`):** the order the two calls were evaluated in isn't specified. MSVC Release, MSVC Debug and GCC gave different traces, a control pipe pressure mirrored around 5 bar, which failed 32 tests on the Linux CI. Fixed: the draws are sequenced in the order of MSVC Release, which the golden traces were recorded with. +- **`TCommand::Location` isn't initialised** in a new vehicle. The game always sets it through `PutCommand()`, but a test calling `RunCommand()` directly got different results run to run. +- **`CompressorList` is `int[4][9]`** (`MOVER.h`), though its factors are fractions: 0.9 is read as 0. No game vehicle has the list yet. +- **A train whose pipe leaks under 2.75 bar before its start-up can't be released:** + - Where this happens: an FV4a handle and an LSt valve, for example 4 minutes standing with wagons, waiting for a hot engine. + - The cause: the pipe gets cut off the main reservoir (`lock_old` in `UpdatePipePressure`). The AI presses its unlock button only for the lock set by `LPOn` and `LPOff` (`control_main_pipe`). + - The same after every emergency stop of such a train, by the alarm chain or the radio-stop: reset, it stays with its pipe empty until the releaser is held (`b_rls`), which the test of the emergency stops does. +- **EW58:** + - Its electrodynamic brake comes in only by the stages of the ep brake (TUHEX), never by the brake pipe alone. + - It needs 110 V, from the converter of the middle car only. +- **ET42:** + - At the high current setting the controller stops at the last series position, and the train crawls. + - From the low setting's top speed (over 100 km/h) the dynamic brake's current trips the overload relay at once. +- **EU47:** its local brake sets the flag of the electrodynamic brake, which keeps the train brake's air out, but the motors don't brake. The local brake's air does it. +- **EP09:** the flag of the automatic electrodynamic brake stays on at a standstill while the cylinders hold less than 2.1 bar, and it flicks on while a high application is released. +- **Diesel engines with a second water circuit (SU45, ST44) started at 88 degrees:** they don't start until that circuit, over its limit (74 or 75 degrees), cools. Off, it cools slowly. +- **Brake cylinders over the vehicle's highest pressure** (found by the invariants, see the README): + - The K valve of the SM03 and the EU04 fills the cylinders to the pressure of the auxiliary reservoir in a full service or emergency application: 4.27 bar of the SM03's MaxBP 3.5, 3.19 bar of the EU04's 2.8. + - The ESt3d_PZZ valve of the SN61 does so in an emergency: 4.6 bar of its MaxBP 3.8. + - The EU07's LSt overshoots a little, to 4.0 bar of its 3.8. +- **Diesel engines driven over their top speed:** a lower gear taken at speed drives the engine through the wheels over its `nmax`, the SM03's by 10%, the WMB10's by 25%. The cutoff (`nmax_cutoff`) only takes the fuel off. +- **The ELF's C car's main reservoir over its governor:** the cars share the supply pipe, the A car's governor stops at 9 bar, the C car's at 8.5, so the C car's reservoir reaches 8.64 bar. +- **Wagons thrown about as a train starts with full physics of the couplers:** the slack taken up throws them at up to 5.7 g, and back within a step. +- **Nothing limits the speed:** a light train at full power runs well past its Vmax (the 754 past 160 km/h, against a Vmax of 100). +- **Vehicles that don't do what they should, as driven by the tests:** + - An EN57 doesn't get ready (main reservoir). + - An EN57AKL alone doesn't charge its pipe. + - The TEM2 barely moves, and the SM31 crawls at 0.3 km/h at full power, its motors taking 444 A. + - The draisine can't start from rest (the pump's force is under the resistance of a standing draisine). + - The Elf and the Impuls, their doors opened with the steps permitted, close the doors as they start off but keep the steps out, which keeps them from moving. + - The ED72 holds an ep application with its handle at running, and with the ep brake switched off too; only the ep release position lets it off. The EW58 releases at running. + - The road vehicle (MAN) is only slowed down by a minute of full service. +- **A train run with five physics steps in a frame:** an EU07 with wagons takes no current, its controller at full power, and rolls at a few km/h. The test steps the vehicles the way `TDynamicObject` does (`FastComputeMovement` for the steps before the last one), so the game may do the same. +- **Game data:** + - The 214M's file has `TurboPos` and `MotorParamTable` twice, and the EN57AL's `Engine` twice. The loader reads each in turn, so the later one overrides what both set. + - A wagon set up braked keeps its hand brake on until someone releases it. The AI does that for the whole train (`AutoRewident`), so a test has to as well. diff --git a/tests/unit/README.md b/tests/unit/README.md index 97cc94910..a10f1798e 100644 --- a/tests/unit/README.md +++ b/tests/unit/README.md @@ -10,6 +10,9 @@ The code under test is `eu07_core`, the library of the simulation parts the game game uses it. The python library gets linked along with the game's settings, but the tests don't use it and run without it. +[COVERAGE.md](COVERAGE.md) says how much of the simulation core the tests reach, what's left and why, and +what they found. + ## Running - **With the build**: building the game (`WITH_TESTS`, on by default) runs them at the end, once the @@ -46,24 +49,127 @@ TEST_CASE("brakes: service braking stops a heavier wagon too") { - `definition::load("")` reads `data/.json`, with the sections and keys of the game's vehicle definitions; `set()` and `remove()` change it for the test. Table sections give their rows as `"rows": [[...], ...]`, keys starting with `_` are comments. A section the loader doesn't - know is an error (the table of them is in `vehicle.cpp`); a misspelt key isn't caught, so check + know is an error (the table of them is in `fiz.cpp`); a misspelt key isn't caught, so check in the test that the value the test is about made it to the vehicle. Keep the definitions physically sensible: some parts need keys others don't (the ESt brake valves need `Brake.Size`), and a test on a half-defined vehicle tests the definition rather than the simulation. +- `definition::fiz("/")` is one of the game's own vehicles, `data/fiz//.json`, + in the same form, converted from the game's `.fiz` with the files it includes (the list and how to + add one: `data/fiz/README.md`). The conversion keeps what the game's loader reads of the file and + checks it reads the same of the converted one (`fiz.h`), so the vehicle is the game's. - The random numbers of the simulation are reseeded before every test case, so a test gives the - same result alone or among the others. + same result alone or among the others. Loading a vehicle draws some too (the scatter of its brake + pipe pressure), so a test making vehicles in a loop calls `test::reseed_random()` before each. - Logic which lives in classes too big to set up in a test (the AI driver, the cab) goes into free functions on the vehicle state the class calls, and the test calls them the same way: see `vehicle/handover.h`, which `TController::TakeControl()` uses, and `test_handover.cpp`. - `vehicle` creates the vehicle the way `TDynamicObject::Init()` does and steps it the way the - simulation loop does, on a straight track of the given friction and gradient. `pair` puts two of - them on that track facing each other with the given ends and runs them together, as the - simulation runs the vehicles of a scene: the coupler and buffer forces, collisions and automatic - coupling come from the physics (`test_couplers.cpp`). Longer consists aren't supported yet. + simulation loop does, on a straight track of the given friction, gradient, catenary voltage and + physics iterations a frame. With a cab (`vehicle{definition, 0.0, "name", 1}`) it has a driver. +- `consist` (`consist.h`) couples vehicles into a train and steps them together, coupler forces, + air, control and power passing between them. The physics reaches a neighbour through its + `TDynamicObject`, for its `MoverParameters` only; the tests have a stand-in of it with just that. +- `drive.h` has the driver's part, made of the AI's steps: `start_up()` (battery, pumps, + pantographs, line breaker, converter, compressor), `drive()` (running, acknowledging the + vigilance), `release_brakes()`, `drive_cycle()` (a whole run from start-up to a stop). +- `scenario` (`scenario.h`) puts a train, its driver and a golden trace for each vehicle together, + for a test of a feature: `act()` marks an event in the traces, `wait()` runs the train. +- `pair` (`vehicle.h`) puts two vehicles on that track facing each other with the given ends and + runs them together, as the simulation runs the vehicles of a scene: the coupler and buffer + forces, collisions and automatic coupling come from the physics (`test_couplers.cpp`). - Check behaviour (speeds, pressures, states the player sees) rather than internal flags, and make the test check its own preconditions (`REQUIRE` that the braking skidded, before checking what a skid leads to). +## Golden traces + +A golden trace pins down how the simulation behaves now, for changes which mustn't alter it, like +restructuring a function: the values of some channels of a vehicle over a run, compared with the +ones recorded from the code before, in `data/golden/.csv`. A difference fails the test, naming +the channel, the time and both rows. + +The samples and their key figures aren't kept in the repository (tens of megabytes, and they only mean +something against the code before the change): record them before the change, and compare after it. + +``` +git switch master +EU07_UNIT_TESTS_UPDATE_GOLDEN=1 eu07_unit_tests # records data/golden/**/*.csv, ignored by git +git switch my-refactor +EU07_UNIT_TESTS_GOLDEN_EXACT=1 eu07_unit_tests # compares every sample, bit for bit +``` + +The recorded files stay through switching branches. Without them, a trace checks the invariants and +its test's own `CHECK`s, which is what the CI does: every test states the behaviour it's about in +`CHECK`s, a scenario of a feature what the feature does (the doors open, the train stops), a run of +every real vehicle what holds for each of them (it brakes harder by every step, it runs off and stops). + +```cpp +test::trace trace{"eu07/notch up", test::channels::motion() + test::channels::traction()}; +eu07.record(trace); // samples every 10th step +eu07->MainSwitch(true); +trace.mark("main switch"); // shows in the event column of the row +eu07.run(30.0); +trace.check(); +``` + +- `EU07_UNIT_TESTS_UPDATE_GOLDEN=1` records the samples and the key figures, for a new test or a + change which alters the behaviour on purpose; the diff of the key figures shows what it altered, + review it like code. +- Without `EU07_UNIT_TESTS_GOLDEN_EXACT=1`, samples recorded are compared within a relative 1e-9, as + GCC and glibc's maths functions can differ from MSVC's in the last bits, and a trace without them + passes. With it they're compared exactly, and a trace without them or its key figures fails, so a + run of the refactoring check can't pass by having nothing to compare. +- Keep the runs short (tens of seconds): the simulation feeds back on itself, and a last bit grows. +- A trace with no assertion about what the behaviour should be is a characterisation, bugs included; + put the behaviour the test is about into `CHECK`s besides. + +### Key figures + +Next to its samples, every trace records the figures a person reads (`figures.h`), for each part of +the run between two events, in `data/golden/.figures`: the duration, the speeds, the distance, +the time to stop, the brake pipe's lowest pressure and the time to get back to 4.9 bar, the peaks of +the brake cylinders, the motor current and the tractive force. + +``` +[brake] +duration = 60.00 s +speed at the start = 118.5 km/h +distance = 944.3 m +stopped after = 45.97 s +brake cylinders peak = 3.997 bar +``` + +They're compared within 0.5% or the last decimal written, loose enough for any compiler, and the +differences are told by part and figure: + +``` +key figures of "traction/4e_v1/4e" differ: + [brake] distance: 944.3 m now, 980.0 m recorded +``` + +`EU07_UNIT_TESTS_UPDATE_GOLDEN=1` records them with the samples. After a change which alters the +behaviour, their comparison says in a few lines what the thousands of changed samples mean. A trace +sampled by hand, at times of its own (the commands and switches tests), records none. + +### Invariants + +Every trace also checks, on every step of its vehicle and not only on the recorded ones, the rules +which hold for any vehicle whatever a test does (`invariants.h`): no NaN, the brake cylinders under +the vehicle's highest pressure, the pipes under the highest governor setting, no motor current with +the line breaker open, no tractive force without power, the distance counted as the speed runs, no +acceleration over 5 g, and a few more. They compare nothing with a recorded file, so they hold on +any compiler, and they still check a behaviour recorded anew on purpose makes sense. A broken rule +fails the test, naming the time, the last event and the values: + +``` +invariant "no motor current with the line breaker open" broken in traction/et42 fuse/0 at 63.200 s, +after "dynamic brake": Mains=0 Im=-412.5 Itot=-412.5 +``` + +Where a test makes a vehicle break a rule (a collision), or a game vehicle breaks one as it is, the +list of excuses in `invariants.cpp` names the trace, the rule and the reason; the second kind goes +into the findings of [COVERAGE.md](COVERAGE.md) too. + ## Code to test, and when the tests fail to link A source joins the tested code by moving from `SOURCES` to `CORE_SOURCES` in the main diff --git a/tests/unit/consist.cpp b/tests/unit/consist.cpp new file mode 100644 index 000000000..a5f10d936 --- /dev/null +++ b/tests/unit/consist.cpp @@ -0,0 +1,106 @@ +#include "stdafx.h" +#include "consist.h" + +#include "vehicle/DynObj.h" + +namespace test { + +consist::consist() = default; +consist::~consist() = default; + +vehicle &consist::add(definition const &Definition, int Cab, int Coupling, double Velocity, double Gap) { + auto added{std::make_unique(Definition, Velocity, std::format("test{}", m_vehicles.size()), Cab)}; + auto &mover{added->mover()}; + + std::vector object(sizeof(TDynamicObject)); + reinterpret_cast(object.data())->MoverParameters = &mover; // NOSONAR see m_objects + + auto position{0.0}; + if (false == m_vehicles.empty()) { + auto &last{m_vehicles.back()->mover()}; + position = m_positions.back() - 0.5 * (last.Dim.L + mover.Dim.L) - Gap; + mover.Loc = TLocation{position, 0.0, 0.0}; + if (Coupling != coupling::faux) { + last.Attach(end::rear, end::front, &mover, Coupling, true, false); + mover.Attach(end::front, end::rear, &last, Coupling, true, false); + } + } + else { + mover.Loc = TLocation{position, 0.0, 0.0}; + } + m_vehicles.push_back(std::move(added)); + m_positions.push_back(position); + m_objects.push_back(std::move(object)); + update_neighbours(); + return *m_vehicles.back(); +} + +void consist::update_neighbours() { + // TDynamicObject::update_neighbours(), for vehicles coupled in a line + for (std::size_t i = 0; i < m_vehicles.size(); ++i) { + auto &mover{m_vehicles[i]->mover()}; + for (int end = end::front; end <= end::rear; ++end) { + auto &neighbour{mover.Neighbours[end]}; + auto const other{end == end::front ? static_cast(i) - 1 : static_cast(i) + 1}; + if (other < 0 || other >= static_cast(m_vehicles.size())) { + neighbour = neighbour_data(); + continue; + } + auto const &othermover{m_vehicles[other]->mover()}; + auto const otherend{end == end::front ? end::rear : end::front}; + auto const distance{TMoverParameters::CouplerDist(&mover, &othermover) - mover.Couplers[end].adapter_length - + othermover.Couplers[otherend].adapter_length}; + // a vehicle not coupled is a collision source when it's within the range the game scans + if (mover.Couplers[end].Connected == nullptr && distance > std::max(10.0, std::abs(mover.V)) + 40.0) { + neighbour = neighbour_data(); + continue; + } + neighbour.vehicle = reinterpret_cast(m_objects[other].data()); // NOSONAR see m_objects + neighbour.vehicle_end = otherend; + neighbour.distance = static_cast(distance); + } + } +} + +void consist::step(track const &Track, double Dt) { + for (auto const &vehicle : m_vehicles) { + vehicle->begin_step(); + } + update_neighbours(); + for (int iteration = 1; iteration < Track.iterations; ++iteration) { + for (auto const &vehicle : m_vehicles) { + vehicle->forces(Dt); + } + for (std::size_t i = 0; i < m_vehicles.size(); ++i) { + m_positions[i] += m_vehicles[i]->fast_move(Track, Dt, TLocation{m_positions[i], 0.0, 0.0}); + } + } + for (auto const &vehicle : m_vehicles) { + vehicle->forces(Dt); + } + // the average pressure in the train's brake pipe weighed by the vehicles' lengths, TDynamicObject::GetEPP(), + // over the whole train (the game's stops at a vehicle without the brake hose coupled) + auto pipe{0.0}; + auto length{0.0}; + for (auto const &vehicle : m_vehicles) { + pipe += vehicle->mover().PipePress * vehicle->mover().Dim.L; + length += vehicle->mover().Dim.L; + } + pipe /= length; + for (std::size_t i = 0; i < m_vehicles.size(); ++i) { + m_positions[i] += m_vehicles[i]->move(Track, Dt, TLocation{m_positions[i], 0.0, 0.0}, pipe); + } +} + +void consist::run(double Seconds, track const &Track, double Dt) { + auto const steps{std::lround(Seconds / (Dt * Track.iterations))}; + for (long i = 0; i < steps; ++i) { + step(Track, Dt); + } +} + +double consist::gap(std::size_t Index) const { + return TMoverParameters::CouplerDist(&m_vehicles[Index]->mover(), &m_vehicles[Index + 1]->mover()); +} + +} // namespace test diff --git a/tests/unit/consist.h b/tests/unit/consist.h new file mode 100644 index 000000000..02001e042 --- /dev/null +++ b/tests/unit/consist.h @@ -0,0 +1,57 @@ +#pragma once + +#include +#include +#include + +#include "vehicle.h" + +class TDynamicObject; + +namespace test { + +// vehicles coupled into a train on a straight track, all facing forward, from the front one back, stepped the +// way vehicle_table::update() steps the vehicles of the game: the constants and neighbours of all of them, +// their forces, then their movement. couplers carry the forces, the air, the control and the power between +// the vehicles as in the game: +// test::consist en57; +// en57.add(definition::fiz("en57_v1/5bgb"), 1); // driven from the front cab +// en57.add(definition::fiz("en57_v1/6ba_840")); +// en57.add(definition::fiz("en57_v1/5bgb")); +class consist { +public: + // everything a coupler can join, as two vehicles of a train coupled by a crew + static constexpr int full_coupling{coupling::coupler | coupling::brakehose | coupling::mainhose | coupling::control | coupling::gangway | coupling::heating | + coupling::permanent | coupling::power110v | coupling::power24v | coupling::highvoltage}; + + consist(); + ~consist(); + consist(consist const &) = delete; + consist &operator=(consist const &) = delete; + + // a vehicle at the back of the train, its front coupler joined to the rear one of the last vehicle with + // the given coupling (coupling flags), Gap [m] between their buffers. Cab as for a vehicle. a vehicle + // with no coupling (coupling::faux) is free on the same track, as one about to be coupled or hit + vehicle &add(definition const &Definition, int Cab = 0, int Coupling = full_coupling, double Velocity = 0.0, double Gap = 0.0); + + vehicle &operator[](std::size_t Index) { return *m_vehicles[Index]; } + std::size_t size() const { return m_vehicles.size(); } + + void step(track const &Track = {}, double Dt = 0.01); + void run(double Seconds, track const &Track = {}, double Dt = 0.01); + + // distance between the couplers of the vehicle and the one behind it [m], negative when the buffers press + double gap(std::size_t Index) const; + +private: + void update_neighbours(); + + std::vector> m_vehicles; + std::vector m_positions; // of the vehicles' middles along the track + // the physics reaches a neighbouring vehicle through its TDynamicObject, for its MoverParameters alone. + // the game's object can't be made without the rest of the game, so it's a stand-in: storage of its size + // with that one member set, never constructed, which only the physics ever looks into + std::vector> m_objects; +}; + +} // namespace test diff --git a/tests/unit/data/fiz/11xa_v2/93a.json b/tests/unit/data/fiz/11xa_v2/93a.json new file mode 100644 index 000000000..63dbb4fbb --- /dev/null +++ b/tests/unit/data/fiz/11xa_v2/93a.json @@ -0,0 +1,14 @@ +{ + "_source": "pkp/11xa_v2/93a.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "40000", "Vmax": "120", "HeatingP": "32", "LightP": "0.56"}, + "Load": {"MaxLoad": "8", "LoadQ": "pieces", "LoadAccepted": "Workers", "OverLoadFactor": "1.5", "LoadSpeed": "1", "UnLoadSpeed": "2"}, + "Dimensions": {"L": "24.5", "H": "4", "W": "2.9", "Cx": "0.1"}, + "Wheels": {"D": "0.92", "Tw": "1.435", "Axle": "2'2'", "Ad": "2.50", "Bd": "17.2", "Rmin": "80", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "ESt4", "Size": "200", "NBpA": "4", "MBF": "90", "MaxBP": "4.0", "BCN": "2", "BCR": "0.1778", "BCD": "0.150", "BCM": "8.17", "BCS": "1.4", "BSA": "4.0", "BM": "P10-Bgu", "BVV": "200", "BRE": "0.87"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.11", "FmaxB": "320", "kC": "4500", "DmaxC": "0.1", "FmaxC": "850", "beta": "0.58", "AllowedFlag": "115"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "LocalBrake": "ManualBrake", "BrakeDelays": "R", "ASB": "Yes", "MCPN": "1", "rows": []}, + "Light": {"Light": "Generator", "LGeneratorEngine": "WheelsDriven", "LMaxVoltage": "24", "AlterLight": "Accu", "AlterLMaxVoltage": "24", "AlterLCap": "495", "AlterLRS": "Generator"}, + "Clima": {"Heating": "PowerCable", "HPowerTrans": "ElectricPower", "HMaxVoltage": "3000"}, + "Doors": {"OpenCtrl": "Passenger", "CloseCtrl": "Mixed", "OpenSpeed": "70", "CloseSpeed": "400", "DoorMaxShiftL": "80", "DoorMaxShiftR": "80", "DoorOpenMethod": "Fold", "DoorClosureWarning": "No"} +} diff --git a/tests/unit/data/fiz/14xa_v1/173a.json b/tests/unit/data/fiz/14xa_v1/173a.json new file mode 100644 index 000000000..d1243f7ed --- /dev/null +++ b/tests/unit/data/fiz/14xa_v1/173a.json @@ -0,0 +1,14 @@ +{ + "_source": "pkp/14xa_v1/173a.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "42000", "Mred": "1600", "Vmax": "160", "HeatingP": "42", "LightP": "0.56"}, + "Load": {"MaxLoad": "30", "LoadQ": "pieces", "LoadAccepted": "Passengers", "OverLoadFactor": "1.5", "LoadSpeed": "1", "UnLoadSpeed": "2"}, + "Dimensions": {"L": "24.5", "H": "4", "W": "2.9", "Cx": "0.1"}, + "Wheels": {"D": "0.92", "Tw": "1.435", "Axle": "2'2'", "Ad": "2.70", "Bd": "17.2", "Rmin": "80", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "ESt4HBG300-s216", "Size": "375", "NBpA": "4", "MBF": "90", "MaxBP": "3.8", "BCN": "2", "BCR": "0.2032", "BCD": "0.150", "BCM": "9.04", "BCS": "1.6", "BSA": "4.0", "BM": "P10-Bgu", "BVV": "375", "BRE": "0.95"}, + "Doors": {"OpenCtrl": "Passenger", "CloseCtrl": "AutomaticCtrl", "OpenSpeed": "0.36", "CloseSpeed": "0.48", "DoorCloseDelay": "2.2", "DoorMaxShiftL": "0.9", "DoorMaxShiftR": "0.9", "DoorOpenMethod": "Plug", "DoorClosureWarning": "yes", "DoorBlocked": "Yes", "DoorMaxShiftPlug": "0.043", "PlatformMaxShift": "-45", "PlatformSpeed": "4", "PlatformOpenMethod": "Rotate", "DoorStayOpen": "10"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.11", "FmaxB": "320", "kC": "4500", "DmaxC": "0.1", "FmaxC": "850", "beta": "0.58", "AllowedFlag": "115"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "LocalBrake": "ManualBrake", "BrakeDelays": "R", "ASB": "Yes", "MCPN": "1", "rows": []}, + "Light": {"Light": "Generator", "LGeneratorEngine": "WheelsDriven", "LMaxVoltage": "24", "AlterLight": "Accu", "AlterLMaxVoltage": "24", "AlterLCap": "495", "AlterLRS": "Generator"}, + "Clima": {"Heating": "PowerCable", "HPowerTrans": "ElectricPower", "HMaxVoltage": "3000"} +} diff --git a/tests/unit/data/fiz/168a_v1/168a.json b/tests/unit/data/fiz/168a_v1/168a.json new file mode 100644 index 000000000..aa391639a --- /dev/null +++ b/tests/unit/data/fiz/168a_v1/168a.json @@ -0,0 +1,14 @@ +{ + "_source": "pkp/168a_v1/168a.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "42000", "Mred": "1600", "Vmax": "160", "HeatingP": "20", "LightP": "0.56"}, + "Load": {"MaxLoad": "56", "LoadQ": "pieces", "LoadAccepted": "Passengers,Luggage", "OverLoadFactor": "1.5", "LoadSpeed": "1", "UnLoadSpeed": "2"}, + "Dimensions": {"L": "24.5", "H": "4", "W": "2.9", "Cx": "0.1"}, + "Wheels": {"D": "0.92", "Tw": "1.435", "Axle": "2'2'", "Ad": "2.70", "Bd": "17.2", "Rmin": "80", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "ESt4HBG300", "Size": "200", "NBpA": "4", "MBF": "90", "MaxBP": "3.8", "BCN": "2", "BCR": "0.1778", "BCD": "0.150", "BCM": "10.00", "BCS": "1.4", "BSA": "6.0", "BM": "P10-Bgu", "BVV": "200", "BRE": "0.9"}, + "Doors": {"OpenCtrl": "Passenger", "CloseCtrl": "AutomaticCtrl", "OpenSpeed": "0.44", "CloseSpeed": "0.27", "DoorCloseDelay": "2.25", "DoorMaxShiftL": "0.9", "DoorMaxShiftR": "0.9", "DoorOpenMethod": "Plug", "DoorClosureWarning": "yes", "DoorBlocked": "Yes", "DoorMaxShiftPlug": "0.043", "PlatformMaxShift": "-45", "PlatformSpeed": "4", "PlatformOpenMethod": "Rotate", "DoorStayOpen": "10"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.11", "FmaxB": "320", "kC": "4500", "DmaxC": "0.1", "FmaxC": "850", "beta": "0.58", "AllowedFlag": "115"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "LocalBrake": "ManualBrake", "BrakeDelays": "R", "ASB": "Yes", "MCPN": "1", "rows": []}, + "Light": {"Light": "Generator", "LGeneratorEngine": "WheelsDriven", "LMaxVoltage": "24", "AlterLight": "Accu", "AlterLMaxVoltage": "24", "AlterLCap": "495", "AlterLRS": "Generator"}, + "Clima": {"Heating": "PowerCable", "HPowerTrans": "ElectricPower", "HMaxVoltage": "3000"} +} diff --git a/tests/unit/data/fiz/21xm_v1/214ma.json b/tests/unit/data/fiz/21xm_v1/214ma.json new file mode 100644 index 000000000..10cfcd60c --- /dev/null +++ b/tests/unit/data/fiz/21xm_v1/214ma.json @@ -0,0 +1,78 @@ +{ + "_source": "pkp/21xm_v1/214ma.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "46000", "Vmax": "120", "PWR": "390", "SandCap": "100", "Type": "dmu"}, + "Load": {"MaxLoad": "50", "OverLoadFactor": "2.2", "LoadQ": "pieces", "LoadAccepted": "passengers", "LoadSpeed": "0.5", "UnLoadSpeed": "0.7"}, + "Dimensions": {"L": "24.38", "H": "4.2", "W": "2.9", "Cx": "0.0"}, + "Wheels": {"D": "0.84", "Tw": "1.435", "AIM": "300", "Axle": "B'2'", "Ad": "2", "Bd": "17.23", "Rmin": "75", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "EStED", "Size": "150", "NBpA": "4", "MBF": "2.74", "MaxBP": "2.9", "LocMaxBP": "3.8", "RV": "-1", "RM": "0.77", "BCN": "8", "BCR": "0.127", "BCD": "0.1", "BCM": "2.15", "HiPP": "5", "LoPP": "3.5", "Vv": "0.125", "MinCP": "7.5", "MaxCP": "8.5", "CompressorSpeed": "0.0138", "CompressorPower": "Main", "BCS": "0.5", "BSA": "0", "BM": "Cosid", "BVV": "88", "BRE": "0.97", "TareMaxBP": "2.2", "LPOn": "3.0", "LPOff": "4.5", "UBB1": "2", "UBB2": "8"}, + "Doors": {"OpenCtrl": "Mixed", "CloseCtrl": "DriverCtrl", "OpenSpeed": "0.25", "CloseSpeed": "0.19", "DoorCloseDelay": "0.1", "DoorMaxShiftL": "0.78", "DoorMaxShiftR": "0.78", "DoorOpenMethod": "Plug", "DoorClosureWarning": "No", "DoorBlocked": "Yes", "DoorMaxShiftPlug": "0.04", "MirrorMaxShift": "75", "DoorStayOpen": "10", "DoorClosexDelay": "1.8", "DoorNeedPermit": "Yes", "DoorPermitList": "1|0|2|3", "DoorPermitListDefault": "2", "DoorAutoCloseRemote": "No"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "39", "ControlType": "214MA"}, + "SpringBrake": {"Volume": "20", "MBF": "5.8", "MaxSP": "5.5", "ResetP": "4.0", "MinFP": "3.5", "PressOff": "4.5", "PressOn": "0.5", "ValveOnArea": "0.0005", "ValveOffArea": "0.0005", "ValvePNBArea": "0.002", "MTC": "4"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "BCPN": "3", "BDelay1": "15", "BDelay2": "4", "BDelay3": "35", "BDelay4": "25", "ASB": "Yes", "LocalBrake": "PneumaticBrake", "ManualBrake": "No", "MCPN": "5", "SCPN": "5", "AutoRelay": "Yes", "IniCDelay": "1.0", "SCDelay": "0.3", "BrakeDelays": "PR", "MaxBPMass": "55", "BrakeHandle": "MHZ_K5P", "LocBrakeHandle": "FD1", "WaterStart": "Battery", "OilStart": "Automatic", "FuelStart": "Automatic", "ConverterStart": "Automatic", "ConverterStartDelay": "4", "BrakeOpModes": "PN", "EIMCtrlType": "3", "DirChangeMaxPos": "4", "SBD": "0.47", "AutomaticCabActivation": "No", "InactiveCabFlag": "27", "CompartmentLightsStart": "Manual", "rows": [ + ["-1","0.6","-1","20","Pneumatic"], + ["0","0.5","-1","2","Pneumatic"], + ["1","0.46","-1","2","Pneumatic"], + ["2","0.42","-1","2","Pneumatic"], + ["3","0.38","-1","2","Pneumatic"], + ["4","0.34","-1","2","Pneumatic"], + ["5","0.29","-1","2","Pneumatic"], + ["6","0","-1","40","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "2.4", "EmergencyBrakeDelay": "2.1", "RadioStop": "Yes", "CabDependent": "Yes"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "28", "LMaxCurrent": "500"}, + "Clima": {"HMaxVoltage": "3000", "Heating": "Generator", "HGeneratorEngine": "Main", "HGeneratorMinRPM": "696", "HGeneratorMinVoltage": "2400", "HGeneratorMaxRPM": "1500", "HGeneratorMaxVoltage": "3300"}, + "Engine": {"EngineType": "DieselEngine", "Trans": "50:129", "TransEff": "0.91", "nmin": "800", "nmax": "2000", "nmax_cutoff": "1950", "AIM": "65", "EUS": "102.5", "EDS": "102.0", "IsTC": "Yes", "TC_TMMax": "1.82", "TC_CP": "0.75", "TC_LT": "3000", "TC_LR": "1", "TC_ULR": "1", "TC_FRI": "1", "TC_FRD": "2", "TC_TII": "2.93", "TC_TIO": "0", "TC_TOO": "-1.65", "TC_LS": "29.5", "TC_ULS": "40", "IsRetarder": "Yes", "R_Place": "1", "R_TII": "5.0", "R_MT": "1500", "R_MP": "250", "R_FRI": "1", "R_FRD": "1", "R_MinVel": "30", "WaterMaxTemperature": "105", "WaterCoolingTemperature": "90", "WaterFlowTemperature": "35", "WaterAuxCircuit": "Yes"}, + "SpeedControl": {"SpeedCtrl": "Yes", "SpeedButtons": "0|30|40|50|60|70|80|90|100|120", "OverrideManual": "Yes", "InitPwr": "0.3", "MaxPwrVel": "5", "StartVel": "2", "VelStep": "5", "PwrStep": "0.1", "MinPwr": "0.3", "MaxPwr": "1.0", "MinVel": "0", "MaxVel": "120", "Offset": "-0.5", "kPpos": "0.1", "kPneg": "0.4", "kIpos": "0.06", "kIneg": "0.06", "BrakeIntervention": "Yes", "PowerUpSpeed": "0.3", "PowerDownSpeed": "0.3"}, + "TurboPos": {"TurboPos": "1"}, + "MotorParamTable": {"minVelfullengage": "3.0", "engageDia": "1", "engageMaxForce": "3000", "engagefriction": "1", "rows": []}, + "MotorParamTable0": {"minVelfullengage": "3.0", "engageDia": "1", "engageMaxForce": "3000", "engagefriction": "1", "rows": [ + ["0","0","0","0","-1","-1","0","1"], + ["1","2.81","-1","-1","38.2","42.4","0.18","1"], + ["2","1.84","17.4","29.9","53.8","59.8","0.13","1"], + ["3","1.36","26.6","45.0","70.8","78.7","0","1"], + ["4","1.00","61.1","61.1","90.4","100.4","0","1"], + ["5","0.80","80.2","80.2","200","200","0","1"] + ]}, + "DList": {"Size": "5", "Mmax": "2450", "nMmax": "21.7", "nmax": "33", "Mnmax": "2160", "nominalfill": "1.0", "Mstand": "250.0", "NomFuelConsRate": "220", "rows": [ + ["0","0.15","0"], + ["1","0.20","2"], + ["2","0.40","2"], + ["3","0.60","2"], + ["4","0.80","2"], + ["5","1.00","2"] + ]}, + "DMList": {"rows": [ + ["0","0"], + ["80","637"], + ["400","796"], + ["800","1592"], + ["1050","2090"], + ["1300","2200"], + ["1550","2124"], + ["1800","2070"], + ["2000","1676"] + ]}, + "UCList": {"Size": "5", "IntegratedBrakePN": "Yes", "IntegratedBrake": "Yes", "rows": [ + ["0","3","0","0","0","0.15","0.15","0","1","0"], + ["1","2","0","0","0","0.15","0.15","1","3","0"], + ["2","1","-1","0","-1","0.15","0.15","3","3","1"], + ["3","1","-1","1","0","0.00","0.15","3","4","1"], + ["4","0","-1","1","0","0.15","0.00","4","5","3"], + ["5","0","0","1","1","0.15","0.15","4","5","3"] + ]}, + "LightsList": {"Size": "5", "Wrap": "no", "Default": "1", "rows": [ + ["0","0"], + ["21","34"], + ["22","34"], + ["34","34"], + ["16","1"] + ]}, + "WiperList": {"Size": "5", "Angle": "75", "Default": "1", "rows": [ + ["3","0.5","0.5","0.0"], + ["0","0.8","0.0","0.5"], + ["3","0.8","6.0","0.5"], + ["3","0.8","3.0","0.0"], + ["3","0.8","1.0","0.0"] + ]} +} diff --git a/tests/unit/data/fiz/21xm_v1/218ma_a_kd.json b/tests/unit/data/fiz/21xm_v1/218ma_a_kd.json new file mode 100644 index 000000000..6d2f9db61 --- /dev/null +++ b/tests/unit/data/fiz/21xm_v1/218ma_a_kd.json @@ -0,0 +1,84 @@ +{ + "_source": "pkp/21xm_v1/218ma_a_kd.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "38500", "Vmax": "120", "PWR": "360", "SandCap": "100", "Type": "dmu"}, + "Load": {"MaxLoad": "50", "OverLoadFactor": "2.2", "LoadQ": "pieces", "LoadAccepted": "passengers", "LoadSpeed": "0.5", "UnLoadSpeed": "0.7"}, + "Dimensions": {"L": "20.75", "H": "4.2", "W": "2.9", "Cx": "0.10"}, + "Wheels": {"D": "0.84", "Tw": "1.435", "AIM": "300", "Axle": "B'1'", "Ad": "2", "Bd": "17.23", "Rmin": "75", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "EStED", "Size": "150", "NBpA": "4", "MBF": "2.74", "MaxBP": "2.9", "LocMaxBP": "3.8", "RV": "-1", "RM": "0.77", "BCN": "6", "BCR": "0.127", "BCD": "0.1", "BCM": "2.15", "HiPP": "5", "LoPP": "3.5", "Vv": "0.125", "MinCP": "7.0", "MaxCP": "8.0", "CompressorSpeed": "0.015", "CompressorPower": "Main", "BCS": "0.5", "BSA": "0", "BM": "Cosid", "BVV": "88", "BRE": "0.97", "TareMaxBP": "2.2", "LPOn": "3.0", "LPOff": "4.5", "UBB1": "2", "UBB2": "8"}, + "SpringBrake": {"Volume": "15", "MBF": "4.35", "MaxSP": "5.5", "ResetP": "4.0", "MinFP": "3.5", "PressOff": "4.5", "PressOn": "0.5", "ValveOnArea": "0.0005", "ValveOffArea": "0.0005", "ValvePNBArea": "0.002", "MTC": "4"}, + "Doors": {"OpenCtrl": "Mixed", "CloseCtrl": "DriverCtrl", "OpenSpeed": "0.25", "CloseSpeed": "0.19", "DoorCloseDelay": "0.1", "DoorMaxShiftL": "0.78", "DoorMaxShiftR": "0.78", "DoorOpenMethod": "Plug", "DoorClosureWarning": "No", "DoorBlocked": "Yes", "DoorMaxShiftPlug": "0.04", "MirrorMaxShift": "75", "DoorStayOpen": "10", "DoorNeedPermit": "Yes", "DoorPermitList": "1|0|2|3", "DoorPermitListDefault": "2", "DoorAutoCloseRemote": "No"}, + "BuffCoupl1": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "39"}, + "BuffCoupl2": {"CType": "Articulated", "AllowedFlag": "-55"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "BCPN": "3", "BDelay1": "15", "BDelay2": "4", "BDelay3": "35", "BDelay4": "25", "ASB": "Yes", "LocalBrake": "PneumaticBrake", "ManualBrake": "No", "MCPN": "5", "SCPN": "5", "AutoRelay": "Yes", "IniCDelay": "1.0", "SCDelay": "0.3", "BrakeDelays": "PR", "MaxBPMass": "55", "BrakeHandle": "MHZ_K5P", "LocBrakeHandle": "FD1", "WaterStart": "Battery", "OilStart": "Automatic", "FuelStart": "Automatic", "ConverterStart": "Automatic", "ConverterStartDelay": "4", "BrakeOpModes": "PN", "EIMCtrlType": "3", "DirChangeMaxPos": "4", "SBD": "0.47", "AutomaticCabActivation": "No", "InactiveCabFlag": "27", "CompartmentLightsStart": "Manual", "rows": [ + ["-1","0.6","-1","20","Pneumatic"], + ["0","0.5","-1","2","Pneumatic"], + ["1","0.46","-1","2","Pneumatic"], + ["2","0.42","-1","2","Pneumatic"], + ["3","0.38","-1","2","Pneumatic"], + ["4","0.34","-1","2","Pneumatic"], + ["5","0.29","-1","2","Pneumatic"], + ["6","0","-1","40","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "2.4", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "2.1", "RadioStop": "Yes", "CabDependent": "Yes"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "28", "LMaxCurrent": "500"}, + "Engine": {"EngineType": "DieselEngine", "Trans": "50:129", "TransEff": "0.95", "nmin": "800", "nmax": "1800", "nmax_cutoff": "1850", "nreg_acc": "150", "AIM": "30", "EUS": "102.5", "EDS": "102.0", "IsTC": "Yes", "TC_TMMax": "1.82", "TC_CP": "0.85", "TC_LT": "2500", "TC_LR": "1", "TC_ULR": "1", "TC_FRI": "1", "TC_FRD": "2", "TC_TII": "2.93", "TC_TIO": "0", "TC_TOO": "-1.65", "TC_LS": "22", "TC_ULS": "40", "IsRetarder": "Yes", "R_Place": "1", "R_TII": "5.0", "R_MT": "1500", "R_MP": "250", "R_FRI": "1", "R_FRD": "1", "R_MinVel": "1", "WaterMaxTemperature": "105", "WaterCoolingTemperature": "95", "WaterFlowTemperature": "75", "WaterAuxCircuit": "No", "WaterCoolingFanSpeed": "-100", "NominalCoolingPower": "300"}, + "Clima": {"HMaxVoltage": "3000", "Heating": "Generator", "HGeneratorEngine": "Main", "HGeneratorMinRPM": "696", "HGeneratorMinVoltage": "2400", "HGeneratorMaxRPM": "1500", "HGeneratorMaxVoltage": "3300"}, + "SpeedControl": {"SpeedCtrl": "Yes", "SpeedButtons": "0|30|40|50|60|70|80|90|100|120", "OverrideManual": "Yes", "InitPwr": "0.3", "MaxPwrVel": "5", "StartVel": "2", "VelStep": "5", "PwrStep": "0.1", "MinPwr": "0.3", "MaxPwr": "1.0", "MinVel": "0", "MaxVel": "120", "Offset": "-0.5", "kPpos": "0.1", "kPneg": "0.4", "kIpos": "0.06", "kIneg": "0.06", "BrakeIntervention": "Yes", "PowerUpSpeed": "0.17", "PowerDownSpeed": "0.17"}, + "TurboPos": {"TurboPos": "1"}, + "MotorParamTable": {"minVelfullengage": "3.0", "engageDia": "1", "engageMaxForce": "2300", "engagefriction": "1", "rows": []}, + "MotorParamTable0": {"minVelfullengage": "3.0", "engageDia": "1", "engageMaxForce": "2300", "engagefriction": "1", "rows": [ + ["0","0","0","0","-1","-1","0","1"], + ["1","2.81","-1","-1","31.3","33.7","0.17","1"], + ["2","1.84","17.4","29.9","47.9","51.5","0.11","1"], + ["3","1.36","26.6","45.0","64.8","69.7","0","1"], + ["4","1.00","61.1","61.1","84.2","90.8","0","1"], + ["5","0.80","80.2","80.2","200","200","0","1"] + ]}, + "DList": {"Size": "5", "Mmax": "2450", "nMmax": "21.7", "nmax": "30", "Mnmax": "2160", "nominalfill": "1.0", "Mstand": "250.0", "NomFuelConsRate": "220", "rows": [ + ["0","0.15","0"], + ["1","0.20","2"], + ["2","0.40","2"], + ["3","0.60","2"], + ["4","0.80","2"], + ["5","1.00","2"] + ]}, + "DMList": {"rows": [ + ["0","0"], + ["80","637"], + ["400","796"], + ["800","1592"], + ["1050","2090"], + ["1300","2200"], + ["1550","2032"], + ["1800","1910"], + ["2000","1547"] + ]}, + "V2NList": {"rows": [ + ["0","1200"], + ["40","1800"], + ["120","1800"] + ]}, + "UCList": {"Size": "5", "IntegratedBrakePN": "Yes", "IntegratedBrake": "Yes", "rows": [ + ["0","3","0","0","0","0.15","0.15","0","1","0"], + ["1","2","0","0","0","0.15","0.15","1","3","0"], + ["2","1","-1","0","-1","0.15","0.15","3","3","1"], + ["3","1","-1","1","0","0.00","0.15","3","4","1"], + ["4","0","-1","1","0","0.15","0.00","4","5","3"], + ["5","0","0","1","1","0.15","0.15","4","5","3"] + ]}, + "LightsList": {"Size": "5", "Wrap": "no", "Default": "1", "rows": [ + ["0","0"], + ["21","34"], + ["22","34"], + ["34","34"], + ["16","1"] + ]}, + "WiperList": {"Size": "5", "Angle": "75", "Default": "1", "rows": [ + ["3","0.5","0.5","0.0"], + ["0","0.8","0.0","0.5"], + ["3","0.8","6.0","0.5"], + ["3","0.8","3.0","0.0"], + ["3","0.8","1.0","0.0"] + ]} +} diff --git a/tests/unit/data/fiz/3wl_v2/3wl.json b/tests/unit/data/fiz/3wl_v2/3wl.json new file mode 100644 index 000000000..96e22b6ca --- /dev/null +++ b/tests/unit/data/fiz/3wl_v2/3wl.json @@ -0,0 +1,11 @@ +{ + "_source": "pkp/3wl_v2/3wl.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "10500", "Vmax": "100"}, + "Load": {"MaxLoad": "30", "LoadQ": "tonns", "LoadAccepted": "Coal,Sand,sand2,ruda,tluczen,scrap,scrap2", "LoadSpeed": "1", "UnLoadSpeed": "0.1"}, + "Dimensions": {"L": "9.87", "H": "3", "W": "3", "Cx": "0.1"}, + "Wheels": {"D": "1", "Tw": "1.435", "AIM": "300", "Axle": "1'1'", "Bd": "6", "Rmin": "30", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "ESt3", "Size": "12", "MBF": "72", "MaxBP": "3.8", "BCN": "1", "BCR": "0.1524", "BCD": "0.14", "BCMlo": "3.05", "BCMHi": "10.67", "NBpA": "4", "BM": "P10-Bg", "BCS": "2.7", "BSA": "8.00", "BVV": "50", "BRE": "0.8"}, + "BuffCoupl": {"CType": "Screw", "kB": "9000", "DmaxB": "0.12", "FmaxB": "350", "kC": "4500", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.52", "AllowedFlag": "3"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "LocalBrake": "ManualBrake", "BrakeDelays": "GP", "rows": []} +} diff --git a/tests/unit/data/fiz/430w_v2/430w.json b/tests/unit/data/fiz/430w_v2/430w.json new file mode 100644 index 000000000..b99807857 --- /dev/null +++ b/tests/unit/data/fiz/430w_v2/430w.json @@ -0,0 +1,11 @@ +{ + "_source": "pkp/430w_v2/430w.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "20500", "Vmax": "100"}, + "Load": {"MaxLoad": "59.5", "LoadQ": "tonns", "LoadAccepted": "coal,piasek,piasek2,ruda,tluczen,zlom,zlom2,siarka", "LoadSpeed": "1", "UnLoadSpeed": "0.1"}, + "Dimensions": {"L": "14.028", "H": "3.235", "W": "3.04", "Cx": "0.1"}, + "Wheels": {"D": "0.92", "Tw": "1.435", "AIM": "300", "Axle": "2'2'", "Ad": "2", "Bd": "8.5", "Rmin": "75", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "ESt3AL2HBG300", "Size": "100", "MBF": "144", "MaxBP": "3.8", "TareMaxBP": "1.3", "BCN": "1", "BCR": "0.2032", "BCD": "0.145", "BCM": "12.00", "NBpA": "4", "BM": "P10-Bg", "BCS": "2.7", "BSA": "16.00", "BVV": "100", "BRE": "0.9"}, + "BuffCoupl": {"CType": "Screw", "kB": "9000", "DmaxB": "0.12", "FmaxB": "350", "kC": "4500", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.52", "AllowedFlag": "3"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "LocalBrake": "ManualBrake", "BrakeDelays": "GP", "rows": []} +} diff --git a/tests/unit/data/fiz/4e_v1/4e.json b/tests/unit/data/fiz/4e_v1/4e.json new file mode 100644 index 000000000..6781a9e88 --- /dev/null +++ b/tests/unit/data/fiz/4e_v1/4e.json @@ -0,0 +1,81 @@ +{ + "_source": "pkp/4e_v1/4e.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "80000", "Mred": "16000", "Vmax": "125", "PWR": "2000", "SandCap": "500"}, + "Load": {"MaxLoad": "52", "LoadQ": "pieces", "LoadAccepted": "pantstate", "LoadSpeed": "1", "UnLoadSpeed": "0.1"}, + "Dimensions": {"L": "15.915", "H": "4.348", "W": "2.903", "Cx": "0.38"}, + "Wheels": {"D": "1.250", "AIM": "2000", "Tw": "1.435", "Axle": "Bo'Bo'", "Ad": "3.05", "Bd": "8.55", "Rmin": "80", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "LSt", "NBpA": "4", "MBF": "85.0", "MaxBP": "4.0", "MaxASBP": "1.1", "RM": "0.635", "BCN": "8", "BCR": "0.1143", "BCD": "0.05", "BCM": "5.18", "Vv": "0.828", "MinCP": "7.0", "MaxCP": "8.7", "BCS": "1", "BSA": "0.5", "BM": "P10-Bgu", "BVV": "278", "CompressorSpeed": "0.0566", "BRE": "0.9"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "103", "ControlType": "4e"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "BCPN": "6", "BDelay1": "15", "BDelay2": "7", "BDelay3": "39", "BDelay4": "17", "ASB": "Manual", "LocalBrake": "PneumaticBrake", "DynamicBrake": "Passive", "MCPN": "43", "SCPN": "6", "AutoRelay": "No", "IniCDelay": "0.5", "SCDelay": "0.26", "SCDDelay": "0.05", "BrakeDelays": "GPR", "BrakeHandle": "FV4a", "LocBrakeHandle": "FD1", "MotorBlowersStart": "Converter", "rows": [ + ["-1","0.6","-1","12","Pneumatic"], + ["0","0.5","-1","9","Pneumatic"], + ["1","0.43","-1","9","Pneumatic"], + ["2","0.40","-1","9","Pneumatic"], + ["3","0.37","-1","9","Pneumatic"], + ["4","0.34","-1","9","Pneumatic"], + ["5","0.28","-1","9","Pneumatic"], + ["6","0","-1","18","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareMinSpeed": "10", "AwareDelay": "60", "SoundSignalDelay": "3", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "4", "RadioStop": "Yes"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Clima": {"Heating": "Main"}, + "Power": {"EnginePower": "CurrentCollector", "CollectorsNo": "2", "MaxVoltage": "3600", "MaxCurrent": "1250", "MinH": "0.48", "MaxH": "2.5", "CSW": "1.4", "MinV": "1900", "MinPress": "3.5", "MaxPress": "5.0", "PhysicalLayout": "3"}, + "Engine": {"EngineType": "ElectricSeriesMotor", "Volt": "1500", "Trans": "18:79", "WindingRes": "0.14", "nmax": "2390", "MotorBlowersSpeed": "-1310"}, + "MotorParamTable0": {"rows": [ + ["0","21.8","105","0.11","140.9","105","0.11"], + ["1","20.22","140","0.07","130.7","140","0.07"], + ["2","21.06","190","0.09","136.2","190","0.09"], + ["3","23.95","160","0.25","154.8","160","0.25"], + ["4","21.73","255","0.16","140.5","255","0.16"], + ["5","24.66","170","0.35","159.4","170","0.35"], + ["6","23","800","0.02","148.7","800","0.02"] + ]}, + "Circuit": {"CircuitRes": "0.5", "ImaxLo": "600", "ImaxHi": "750", "IminLo": "350", "IminHi": "470"}, + "RList": {"Size": "43", "RVent": "Automatic", "RVentnmax": "3300", "RVentCutOff": "0.2", "rows": [ + ["0","0","0","0","0"], + ["1","24.891","1","4","0"], + ["2","16.821","1","4","0"], + ["3","12.301","1","4","0"], + ["4","9.771","1","4","0"], + ["5","8.111","1","4","0"], + ["6","6.915","1","4","0"], + ["7","6.481","1","4","0"], + ["8","6.047","1","4","0"], + ["9","5.629","1","4","0"], + ["10","5.211","1","4","0"], + ["11","4.827","1","4","0"], + ["12","4.443","1","4","0"], + ["13","4.099","1","4","0"], + ["14","3.755","1","4","0"], + ["15","3.442","1","4","0"], + ["16","3.129","1","4","0"], + ["17","2.838","1","4","0"], + ["18","2.547","1","4","0"], + ["19","2.286","1","4","0"], + ["20","2.025","1","4","0"], + ["21","1.780","1","4","0"], + ["22","1.535","1","4","0"], + ["23","1.275","1","4","0"], + ["24","1.095","1","4","0"], + ["25","0.775","1","4","0"], + ["26","0.525","1","4","0"], + ["27","0.275","1","4","0"], + ["28","0.000","1","4","0"], + ["29","5.44","2","2","0"], + ["30","4.41","2","2","0"], + ["31","3.85","2","2","0"], + ["32","3.29","2","2","0"], + ["33","2.82","2","2","0"], + ["34","2.36","2","2","0"], + ["35","1.93","2","2","0"], + ["36","1.56","2","2","0"], + ["37","1.21","2","2","0"], + ["38","0.89","2","2","0"], + ["39","0.61","2","2","0"], + ["40","0.34","2","2","0"], + ["41","0.21","2","2","0"], + ["42","0.10","2","2","0"], + ["43","0.00","2","2","0"] + ]} +} diff --git a/tests/unit/data/fiz/README.md b/tests/unit/data/fiz/README.md new file mode 100644 index 000000000..514fb6287 --- /dev/null +++ b/tests/unit/data/fiz/README.md @@ -0,0 +1,66 @@ +# Real vehicle definitions + +The game's own vehicles (`dynamic/` of the MaSzyna release used for the tests, 2026-10), to test the simulation on the vehicles players drive. Chosen to cover every engine type, brake valve, brake handle, local brake, coupler type, door type and brake delay set the game data uses. `pkp/` is left out of the paths, the other operators keep theirs. + +They aren't the game's files: each `.json` here holds what the game's vehicle loader reads of the `.fiz`, with the files it includes, in the form of the tests' own definitions (`vehicle.h`): the values of every section line, and the rows of the lists. `test_fiz.cpp` converts them, using the game's parser for the includes, and checks the loader reads the same of the converted definition as of the game's file (`fiz.h`): the same sections with the same values, the same rows read by the same lists, in the same order. Comments, and lines the loader skips, are left out. + +Convert them again, from the game data in `/dynamic`, and add vehicles (paths as in the table, without the extension, separated by commas), with: + + EU07_UNIT_TESTS_FIZ_SOURCE=/dynamic EU07_UNIT_TESTS_FIZ_ADD=sm42_v1/6d1 eu07_unit_tests -tc="fiz: conversion*" + +Every `.json` here is a vehicle picked up by `test_fiz.cpp`: record the parameters of an added one with `EU07_UNIT_TESTS_UPDATE_GOLDEN=1`. + +| Path | Vehicle | Engine | Brake valve | Brake handle | Local brake | Coupler | +|---|---|---|---|---|---|---| +| `11xa_v2/93a.fiz` | 11XA | - | ESt4 | - | ManualBrake | Screw | +| `14xa_v1/173a.fiz` | 14XA | - | ESt4HBG300-s216 | - | ManualBrake | Screw | +| `168a_v1/168a.fiz` | 168A | - | ESt4HBG300 | - | ManualBrake | Screw | +| `21xm_v1/218ma_a_kd.fiz` | 218M | DieselEngine | EStED | MHZ_K5P | PneumaticBrake | Screw | +| `21xm_v1/214ma.fiz` | 214M | DieselEngine | EStED | MHZ_K5P | PneumaticBrake | Screw | +| `3wl_v2/3wl.fiz` | 3WL | - | ESt3 | - | ManualBrake | Screw | +| `430w_v2/430w.fiz` | 430W | - | ESt3AL2HBG300 | - | ManualBrake | Screw | +| `4e_v1/4e.fiz` | 4E | ElectricSeriesMotor | LSt | FV4a | PneumaticBrake | Screw | +| `bdhpumn_v3/bdhpumn.fiz` | BDHPUMN | - | KE | - | ManualBrake | Screw | +| `bhp_v1/bhp-b.fiz` | BHP | - | ESt3AL2 | - | ManualBrake | Articulated | +| `br285_v1/br285.fiz` | BR285 | DieselElectric | KE | MHZ_6P | PneumaticBrake | Screw | +| `cd/810_v2/810.fiz` | 810 | DieselEngine | ESt3_PZZ | FV4a | PneumaticBrake | Screw | +| `cd/754_v1/754.fiz` | 754 | DumbDE | LSt | FV4a | PneumaticBrake | Screw | +| `dr2_v1/dr2.fiz` | DR2 | WheelsDriven | - | - | ManualBrake | None | +| `e186_v2/eu47.fiz` | E186 | ElectricInductionMotor | EStED | MHZ_6P | PneumaticBrake | Screw | +| `e6act_v2/e6acta.fiz` | E6ACT | ElectricInductionMotor | EStED | MHZ_K5P | PneumaticBrake | Screw | +| `ed72_v1/5bs-rb.fiz` | ED72 | - | EP2 | FVel6 | ManualBrake | Automatic | +| `elf_v1/22wec-a.fiz` | ELF 22WEc | ElectricInductionMotor | EStED | MHZ_K5P | PneumaticBrake | Automatic | +| `elf_v1/21we-a.fiz` | ELF | ElectricInductionMotor | EStED | MHZ_K5P | PneumaticBrake | Automatic | +| `en57_v1/5bgb.fiz` | EN57 | - | EP2 | FVel6 | ManualBrake | Automatic | +| `en57_v1/6ba_840.fiz` | EN57 | - | EP2 | FVel6 | ManualBrake | Automatic | +| `en57_v1/6bai.fiz` | EN57 | - | K | St113 | ManualBrake | Automatic | +| `en57akl_v1/akl_ra.fiz` | EN57AKL | ElectricInductionMotor | EStED | MHZ_EN57 | PneumaticBrake | Automatic | +| `ep05_v2/ep05.fiz` | EP05 | ElectricSeriesMotor | LSt | FV4a | PneumaticBrake | Screw | +| `ep09_v2/104e.fiz` | EP09 | ElectricSeriesMotor | EStED | FV4a | PneumaticBrake | Screw | +| `et22_v3/201e-rn.fiz` | ET22 | ElectricSeriesMotor | LSt | FV4a | PneumaticBrake | Screw | +| `et22_v3/201e-w.fiz` | ET22 | ElectricSeriesMotor | LSt | FV4a | PneumaticBrake | Screw | +| `et42_v2/112e-a.fiz` | ET42 | ElectricSeriesMotor | LSt | FV4a | PneumaticBrake | Screw | +| `et42_v2/112e-b.fiz` | ET42 | ElectricSeriesMotor | LSt | FV4a | PneumaticBrake | Screw | +| `eu04_v1/eu04-01.fiz` | EU04 | ElectricSeriesMotor | K | Knorr | PneumaticBrake | Screw | +| `ew58_v1/ew58-d.fiz` | EW58 | - | EP1 | - | ManualBrake | Automatic | +| `ew58_v1/ew58-sa.fiz` | EW58 | ElectricSeriesMotor | EP1 | FVE408 | ManualBrake | Automatic | +| `impuls_v1/31we-a_pr.fiz` | IMPULS | ElectricInductionMotor | EStED | MHZ_6P | PneumaticBrake | Automatic | +| `road/man/nl293.fiz` | MAN (road) | DieselEngine | - | - | HydraulicBrake | Bare | +| `sa134_v1/218mc_a.fiz` | SA134 | DieselEngine | EStED | MHZ_K5P | PneumaticBrake | Screw | +| `sieciowiec_v1/a.fiz` | SIECIOWIEC | - | - | - | NoBrake | Screw | +| `sm03_v1/sm03.fiz` | SM03 | DieselEngine | K | Knorr | PneumaticBrake | Screw | +| `sm31_v1/411d.fiz` | SM31 | DumbDE | LSt | FV4a | PneumaticBrake | Screw | +| `sm40_v1/sm40.fiz` | SM40 | DieselElectric | K | Knorr | PneumaticBrake | Screw | +| `sm42_v1/6d1.fiz` | SM42 | DumbDE | LSt | FV4a | PneumaticBrake | Screw | +| `sn61_v2/sn61.fiz` | SN61 | DieselEngine | ESt3d_PZZ | FV4a | PneumaticBrake | Screw | +| `st44_v2/m62-1151.fiz` | ST44 | DieselElectric | LSt | FV4a | PneumaticBrake | Screw | +| `st45_v2/301dd.fiz` | ST45 | DumbDE | SW | MHZ_K8P | PneumaticBrake | Screw | +| `static/sug/sug_kielce.fiz` | SUG | ElectricSeriesMotor | W | Knorr | PneumaticBrake | Screw | +| `su45_v2/301d.fiz` | SU45 | DumbDE | LSt | FV4a | PneumaticBrake | Screw | +| `su46_v2/303d.fiz` | SU46 | DumbDE | LSt | FV4a | PneumaticBrake | Screw | +| `tem2_v2/tem2a.fiz` | TEM2 | DieselElectric | LSt | M394 | PneumaticBrake | Screw | +| `wm15_v1/wm15.fiz` | WM15 | Dumb | LSt | FV4a | PneumaticBrake | Screw | +| `wmb10_v1/wmb10.fiz` | WMB10 | DieselEngine | LSt | FV4a | PneumaticBrake | Screw | +| `z1_v2/152a.fiz` | Z1 | - | KE | - | ManualBrake | Screw | + +The paths are those of the game's `.fiz` files. `elf_v1/inverter.fiz` is a part the Elf units include, not a vehicle. The 218M (V2NList), the SA134 (HTCList) and the 22WEc (ffBrakeList) are there for lists the others lack, the EP05 for its camshaft. The 214MA stands for the 214M railbus, whose own file repeats a section (TurboPos and MotorParamTable twice), which the definitions here can't hold. diff --git a/tests/unit/data/fiz/bdhpumn_v3/bdhpumn.json b/tests/unit/data/fiz/bdhpumn_v3/bdhpumn.json new file mode 100644 index 000000000..80b1ab662 --- /dev/null +++ b/tests/unit/data/fiz/bdhpumn_v3/bdhpumn.json @@ -0,0 +1,14 @@ +{ + "_source": "pkp/bdhpumn_v3/bdhpumn.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "42200", "Vmax": "120", "HeatingP": "40", "LightP": "0.56"}, + "Load": {"MaxLoad": "132", "LoadQ": "pieces", "LoadAccepted": "Passengers", "OverLoadFactor": "2", "LoadSpeed": "1", "UnLoadSpeed": "2"}, + "Dimensions": {"L": "26.8", "H": "4.7", "W": "2.88", "Cx": "0.15"}, + "Wheels": {"D": "0.96", "Tw": "1.435", "Axle": "2'2'", "Ad": "2.5", "Bd": "19.5", "Rmin": "80", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "KE", "NBpA": "6", "MBF": "15", "MaxBP": "3.8", "BCN": "12", "BCR": "0.127", "BCD": "0.04", "BCM": "1.5", "BCS": "1.2", "BSA": "0", "BM": "Disk1", "BVV": "125", "TareMaxBP": "2.3"}, + "Doors": {"OpenCtrl": "Mixed", "CloseCtrl": "Mixed", "OpenSpeed": "0.5", "CloseSpeed": "1.0", "DoorCloseDelay": "0", "DoorMaxShiftL": "0.65", "DoorMaxShiftR": "0.65", "DoorOpenMethod": "Shift", "DoorMaxShiftPlug": "0.028", "DoorStayOpen": "5.0", "DoorClosureWarning": "no", "DoorBlocked": "Yes", "DoorAutoCloseRemote": "No", "DoorNeedPermit": "no"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.11", "FmaxB": "320", "kC": "4500", "DmaxC": "0.1", "FmaxC": "850", "beta": "0.58", "AllowedFlag": "115"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "LocalBrake": "ManualBrake", "BrakeDelays": "P", "MaxBPMass": "63", "rows": []}, + "Light": {"Light": "Generator", "LGeneratorEngine": "WheelsDriven", "LMaxVoltage": "24", "AlterLight": "Accu", "AlterLMaxVoltage": "24", "AlterLCap": "495", "AlterLRS": "Generator"}, + "Clima": {"Heating": "PowerCable", "HPowerTrans": "ElectricPower", "HMaxVoltage": "3000", "AlterHeating": "PowerCable", "AlterHPowerTrans": "SteamPower", "AlterHSteamPress": "0.45"} +} diff --git a/tests/unit/data/fiz/bhp_v1/bhp-b.json b/tests/unit/data/fiz/bhp_v1/bhp-b.json new file mode 100644 index 000000000..031542506 --- /dev/null +++ b/tests/unit/data/fiz/bhp_v1/bhp-b.json @@ -0,0 +1,15 @@ +{ + "_source": "pkp/bhp_v1/bhp-b.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "36000", "Vmax": "120", "HeatingP": "37.5", "LightP": "0.56"}, + "Load": {"LoadAccepted": "Passengers,Luggage", "MaxLoad": "110", "LoadQ": "pieces", "OverLoadFactor": "2", "LoadSpeed": "3", "UnLoadSpeed": "4"}, + "Dimensions": {"L": "19.75", "H": "4.750", "W": "2.720", "Cx": "0.4"}, + "Wheels": {"D": "0.94", "AIM": "300", "Tw": "1.435", "Axle": "2'3'", "Ad": "3.0", "Bd": "17", "Rmin": "80", "BearingType": "Roll"}, + "BuffCoupl1": {"CType": "Articulated", "AllowedFlag": "83", "PowerFlag": "256"}, + "BuffCoupl2": {"CType": "Screw", "kB": "9200", "DmaxB": "0.11", "FmaxB": "320", "kC": "4500", "DmaxC": "0.1", "FmaxC": "850", "beta": "0.58", "AllowedFlag": "67"}, + "Brake": {"BrakeValve": "ESt3AL2", "Size": "100", "MBF": "144", "MaxBP": "3.8", "TareMaxBP": "2.5", "BCN": "2", "BCR": "0.1403", "BCD": "0.14", "BCM": "10.38", "NBpA": "4", "BM": "P10-Bgu", "BCS": "2.7", "BSA": "5.00", "BVV": "100", "BRE": "0.85"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "LocalBrake": "ManualBrake", "BrakeDelays": "P", "MaxBPMass": "55", "rows": []}, + "Doors": {"OpenCtrl": "Passenger", "CloseCtrl": "Mixed", "OpenSpeed": "0.55", "CloseSpeed": "0.75", "DoorMaxShiftL": "0.65", "DoorMaxShiftR": "0.65", "DoorOpenMethod": "Shift"}, + "Clima": {"Heating": "PowerCable", "HPowerTrans": "ElectricPower", "HMaxVoltage": "3000", "AlterHeating": "PowerCable", "AlterHPowerTrans": "SteamPower", "AlterHSteamPress": "0.45"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "WheelsDriven", "LMaxVoltage": "24", "AlterLight": "Accu", "AlterLMaxVoltage": "24", "AlterLCap": "375", "AlterLRS": "Generator"} +} diff --git a/tests/unit/data/fiz/br285_v1/br285.json b/tests/unit/data/fiz/br285_v1/br285.json new file mode 100644 index 000000000..ec7dcbf4d --- /dev/null +++ b/tests/unit/data/fiz/br285_v1/br285.json @@ -0,0 +1,69 @@ +{ + "_source": "pkp/br285_v1/br285.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "82400", "Mred": "12000", "Vmax": "140", "PWR": "2200", "SandCap": "700"}, + "Load": {"MaxLoad": "52", "LoadQ": "pieces", "LoadAccepted": "pantstate", "LoadSpeed": "1", "UnLoadSpeed": "0.1"}, + "Dimensions": {"L": "18.900", "H": "3.95", "W": "2.977", "Cx": "0.1"}, + "Wheels": {"D": "1.250", "AIM": "4000", "Tw": "1.435", "Axle": "Bo'Bo'", "Ad": "1.75", "Bd": "10.3", "Rmin": "80"}, + "SpringBrake": {"Volume": "10", "MBF": "8", "MaxSP": "5.5", "ResetP": "4.0", "MinFP": "3.5", "PressOff": "4.5", "PressOn": "3.5", "ValveOnArea": "0.0002", "ValveOffArea": "0.0002", "ValvePNBArea": "0.002", "MTC": "4"}, + "BuffCoupl": {"ControlType": "br285", "CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "103"}, + "Brake": {"BrakeValve": "KE", "NBpA": "4", "MBF": "50", "MaxBP": "3.8", "BCN": "8", "RM": "1.4", "BCR": "0.127", "BCD": "0.04", "BCM": "2.7", "BCS": "0.8", "BSA": "0", "BM": "Disk2", "BVV": "125", "Vv": "0.8", "CompressorSpeed": "0.04", "CompressorPower": "Converter", "MinCP": "8", "MaxCP": "10", "UBB3": "8", "LPOn": "3.0", "LPOff": "4.5", "HandlePipeUnlockPos": "2", "EmergencyCutsOffHandle": "Yes"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "BCPN": "6", "BDelay1": "15", "BDelay2": "3", "BDelay3": "35", "BDelay4": "36", "ASB": "Manual", "LocalBrake": "PneumaticBrake", "MCPN": "6", "SCPN": "4", "AutoRelay": "Yes", "IniCDelay": "0.5", "SCDelay": "0.1", "BrakeDelays": "GPR", "BrakeHandle": "MHZ_6P", "LocBrakeHandle": "FD1", "ConverterStart": "Manual", "ConverterStartDelay": "3", "FuelStart": "Automatic", "OilStart": "Automatic", "BrakeOpModes": "PN", "EIMCtrlType": "3", "DirChangeMaxPos": "3", "HAO": "No", "HMO": "Yes", "HGDP1": "2", "rows": [ + ["-1","0.8","-1","20","Pneumatic"], + ["0","0.5","-1","2","Pneumatic"], + ["1","0.46","-1","2","Pneumatic"], + ["2","0.42","-1","2","Pneumatic"], + ["3","0.38","-1","2","Pneumatic"], + ["4","0.34","-1","2","Pneumatic"], + ["5","0.29","-1","2","Pneumatic"], + ["6","0","-1","40","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal,SeparateAcknowledge", "AwareDelay": "30", "SoundSignalDelay": "2.5", "MaxHoldTime": "1.0", "RadioStop": "Yes"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "100"}, + "Clima": {"HMaxVoltage": "3000", "Heating": "Generator", "HGeneratorEngine": "Main", "HGeneratorMinRPM": "600", "HGeneratorMinVoltage": "2400", "HGeneratorMaxRPM": "1860", "HGeneratorMaxVoltage": "3300"}, + "SpeedControl": {"SpeedCtrl": "Yes", "OverrideManual": "No", "InitPwr": "1.0", "MaxPwrVel": "-1", "StartVel": "-1", "VelStep": "5", "PwrStep": "0.01", "MinPwr": "0.0", "MaxPwr": "1.0", "MinVel": "0", "MaxVel": "140", "Offset": "0", "kPpos": "0.1", "kPneg": "0.2", "kIpos": "0.03", "kIneg": "0.03", "BrakeIntervention": "No", "SpeedCtrlType": "Time", "SpeedCtrlDelay": "0.5"}, + "Engine": {"EngineType": "DieselElectric", "Trans": "18:64", "Ftmax": "300000", "Vhyp": "24", "Vadd": "5.5", "Cr": "1", "WaterMinTemperature": "40", "WaterFlowTemperature": "70", "WaterCoolingTemperature": "82", "WaterMaxTemperature": "91", "WaterShutters": "Yes", "WaterAuxCircuit": "Yes", "WaterAuxCoolingTemperature": "50", "WaterAuxMaxTemperature": "74", "WaterAuxShutters": "Yes", "OilMinPressure": "0.15", "HeatKFO2": "33"}, + "MotorParamTable": {"rows": [ + ["0","8.35","50","2000","48.2","0","0"] + ]}, + "Switches": {"Converter": "impulse"}, + "WWList": {"Size": "6", "rows": [ + ["600","0","0","0"], + ["800","600","1404","6000"], + ["950","900","1404","6000"], + ["1050","1100","1404","6000"], + ["1250","1500","1404","6000"], + ["1450","1850","1404","6000"], + ["1860","2188","1404","6000"] + ]}, + "LightsList": {"Size": "12", "Wrap": "Yes", "Default": "1", "rows": [ + ["21","34"], + ["34","0"], + ["37","34"], + ["21","34"], + ["38","34"], + ["22","34"], + ["17","17"], + ["17","17"], + ["42","42"], + ["4","4"], + ["17","17"], + ["16","1"] + ]}, + "WiperList": {"Size": "4", "Angle": "70", "rows": [ + ["0","0.8","0.0","0.5"], + ["3","0.8","5.0","0.5"], + ["3","0.8","0.5","0.0"], + ["3","0.6","0.5","0.0"], + ["endL"] + ]}, + "UCList": {"Size": "6", "IntegratedBrakePN": "no", "IntegratedLocBrake": "no", "IntegratedBrake": "no", "rows": [ + ["0","0","-1","0","-1","0.15","0.15","0","1","1"], + ["1","0","-1","0","0","0.00","0.00","1","3","1"], + ["2","0","-1","0","0","0.15","0.00","1","3","1"], + ["3","0","0","0","0","0.00","0.00","1","5","3"], + ["4","0","0","1","0","0.00","0.15","3","5","5"], + ["5","0","0","1","0","0.00","0.00","3","6","5"], + ["6","0","0","1","1","0.15","0.15","5","6","5"] + ]} +} diff --git a/tests/unit/data/fiz/cd/754_v1/754.json b/tests/unit/data/fiz/cd/754_v1/754.json new file mode 100644 index 000000000..4f0a850a9 --- /dev/null +++ b/tests/unit/data/fiz/cd/754_v1/754.json @@ -0,0 +1,56 @@ +{ + "_source": "cd/754_v1/754.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "74500", "Mred": "15000", "Vmax": "100", "PWR": "1460", "SandCap": "400", "HeatingP": "300"}, + "Dimensions": {"L": "16.54", "H": "4.335", "W": "2.900", "Cx": "-0.1"}, + "Wheels": {"D": "1.000", "AIM": "4000", "Tw": "1.435", "Axle": "Bo'Bo'", "Ad": "2.4", "Bd": "9.0", "Rmin": "100"}, + "Brake": {"BrakeValve": "LSt", "NBpA": "4", "MBF": "85.0", "MaxBP": "4.1", "LocMaxBP": "4.5", "MaxASBP": "1.5", "RM": "0.69", "BCN": "8", "BCR": "0.114", "BCD": "0.06", "BCM": "8.1", "HiPP": "5", "LoPP": "3.5", "Vv": "0.8", "MinCP": "7.0", "MaxCP": "8.5", "CompressorSpeed": "0.069", "BCS": "1", "BSA": "2", "BM": "P10-Bgu", "CompressorPower": "Converter", "BVV": "240", "BRE": "0.9"}, + "BuffCoupl": {"ControlType": "cd754", "CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "103"}, + "Cntrl": {"BrakeHandle": "FV4a", "LocBrakeHandle": "FD1", "BrakeSystem": "Pneumatic", "BCPN": "6", "BDelay1": "15", "BDelay2": "6", "BDelay3": "36", "BDelay4": "32", "ASB": "Manual", "LocalBrake": "PneumaticBrake", "MCPN": "14", "SCPN": "3", "AutoRelay": "Yes", "IniCDelay": "0.5", "SCDelay": "0.1", "BrakeDelays": "GPR", "rows": [ + ["-1","0.7","-1","15","Pneumatic"], + ["0","0.5","-1","9","Pneumatic"], + ["1","0.46","-1","9","Pneumatic"], + ["2","0.42","-1","9","Pneumatic"], + ["3","0.38","-1","9","Pneumatic"], + ["4","0.34","-1","9","Pneumatic"], + ["5","0.29","-1","9","Pneumatic"], + ["6","0","-1","15","Pneumatic"] + ]}, + "LightsList": {"Size": "8", "Wrap": "No", "Default": "1", "rows": [ + ["0","0"], + ["388","34"], + ["21","34"], + ["1","16"], + ["16","1"], + ["22","34"], + ["38","38"], + ["34","34"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "5", "EmergencyBrakeDelay": "6", "RadioStop": "Yes"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "227.8"}, + "Engine": {"EngineType": "DumbDE", "Trans": "18:62", "Ftmax": "215000", "Flat": "0", "Vhyp": "7.2", "Vadd": "5.5", "Cr": "1.0", "RelayType": "0"}, + "Clima": {"Heating": "Main"}, + "MotorParamTable": {"rows": [ + ["0","20","100","3000","20.8","1340","1713"], + ["1","18.5","110","2700","25","1340","1713"], + ["2","17.2","135","2500","30","1340","1713"], + ["3","14.3","170","2000","48.5","1340","1713"] + ]}, + "WWList": {"Size": "14", "rows": [ + ["500","0","0","0"], + ["500","0","0","0"], + ["550","122","78","273"], + ["550","122","78","273"], + ["600","244","147","547"], + ["650","365","221","820"], + ["700","287","295","1094"], + ["750","609","369","1367"], + ["800","730","442","1641"], + ["850","852","516","1914"], + ["900","973","590","2187"], + ["950","1095","664","2461"], + ["1000","1216","737","2734"], + ["1050","1338","811","3007"], + ["1100","1460","885","3281"] + ]} +} diff --git a/tests/unit/data/fiz/cd/810_v2/810.json b/tests/unit/data/fiz/cd/810_v2/810.json new file mode 100644 index 000000000..89a3c945e --- /dev/null +++ b/tests/unit/data/fiz/cd/810_v2/810.json @@ -0,0 +1,41 @@ +{ + "_source": "cd/810_v2/810.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "Type": "dmu", "M": "20000", "Vmax": "80", "PWR": "155", "SandCap": "25"}, + "Load": {"MaxLoad": "55", "OverLoadFactor": "2.2", "LoadQ": "pieces", "LoadAccepted": "passengers", "LoadSpeed": "0.5", "UnLoadSpeed": "0.7"}, + "Dimensions": {"L": "13.86", "H": "2.8", "W": "3.00", "Cx": "0.38"}, + "Wheels": {"D": "0.84", "Tw": "1.435", "AIM": "300", "Axle": "1'A'", "Bd": "8", "Rmin": "100", "BearingType": "Roll"}, + "Brake": {"BrakeType": "Oerlikon", "BrakeValve": "ESt3_PZZ", "Size": "100", "NBpA": "4", "MBF": "45.0", "MaxBP": "3.8", "BCN": "2", "BCR": "0.127", "BCD": "0.14", "BCM": "3.25", "HiPP": "5.0", "LoPP": "3.5", "Vv": "0.257", "MinCP": "7.0", "MaxCP": "8.0", "CompressorSpeed": "0.0136", "BM": "P10-Bg", "BVV": "75", "BRE": "0.87", "AirLeakRate": "1.15", "CompressorPower": "Converter"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "3"}, + "Doors": {"OpenCtrl": "Mixed", "CloseCtrl": "DriverCtrl", "OpenSpeed": "0.35", "CloseSpeed": "0.625", "DoorMaxShiftL": "0.9", "DoorMaxShiftR": "0.9", "DoorOpenMethod": "Plug", "DoorClosureWarning": "No", "DoorBlocked": "Yes", "DoorMaxShiftPlug": "0.02", "DoorNeedPermit": "Yes", "DoorPermitList": "1|0|2", "DoorPermitListDefault": "2", "DoorAutoCloseRemote": "No"}, + "Cntrl": {"BrakeHandle": "FV4a", "LocBrakeHandle": "FD1", "BrakeSystem": "Pneumatic", "BCPN": "6", "BDelay1": "15", "BDelay2": "4", "BDelay3": "35", "BDelay4": "25", "ASB": "Manual", "LocalBrake": "PneumaticBrake", "MCPN": "8", "SCPN": "2", "AutoRelay": "Yes", "IniCDelay": "0.5", "SCDelay": "0.3", "ManualBrake": "Yes", "WaterStart": "Battery", "OilStart": "Automatic", "FuelStart": "Automatic", "ConverterStart": "Automatic", "ConverterStartDelay": "4", "CompartmentLightsStart": "Manual", "rows": [ + ["-1","1.0","-1","12","Pneumatic"], + ["0","0.5","-1","9","Pneumatic"], + ["1","0.43","-1","9","Pneumatic"], + ["2","0.4","-1","9","Pneumatic"], + ["3","0.37","-1","9","Pneumatic"], + ["4","0.34","-1","9","Pneumatic"], + ["5","0.3","-1","9","Pneumatic"], + ["6","0","-1","16","Pneumatic"] + ]}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Clima": {"HMaxVoltage": "3000", "Heating": "Generator", "HGeneratorEngine": "Main", "HGeneratorMinRPM": "600", "HGeneratorMinVoltage": "2400", "HGeneratorMaxRPM": "2150", "HGeneratorMaxVoltage": "3300"}, + "Security": {"AwareSystem": "Active", "AwareDelay": "30", "SoundSignalDelay": "0.1", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "5", "RadioStop": "No"}, + "Engine": {"EngineType": "DieselEngine", "Trans": "13:51", "nmin": "600", "nmax": "2150", "nmax_cutoff": "2500", "AIM": "60", "EUS": "2.5", "EDS": "2.5", "IsTC": "Yes", "TC_TMMax": "2.70", "TC_CP": "0.85", "TC_LT": "850", "TC_LR": "1", "TC_ULR": "1", "TC_FRI": "1", "TC_FRD": "1", "TC_TII": "0.60", "TC_TIO": "0", "TC_TOO": "0", "TC_LS": "55", "TC_ULS": "45", "IsRetarder": "No", "WaterMaxTemperature": "105", "WaterCoolingTemperature": "90", "WaterFlowTemperature": "75", "WaterAuxCircuit": "No", "WaterCoolingFanSpeed": "-100", "NominalCoolingPower": "154"}, + "MotorParamTable": {"minVelfullengage": "-0.1", "engageDia": "1", "engageMaxForce": "1900", "engagefriction": "1", "rows": [ + ["0","0","0","-1","1"], + ["1","2.120","-1","33","1"], + ["2","1.000","25","200","1"] + ]}, + "DList": {"Size": "8", "Mmax": "850", "nMmax": "29", "nmax": "41", "Mnmax": "750", "nominalfill": "0.9", "Mstand": "100.0", "rows": [ + ["0","0.1","0"], + ["1","0.2","1"], + ["2","0.3","2"], + ["3","0.4","2"], + ["4","0.5","2"], + ["5","0.6","2"], + ["6","0.7","2"], + ["7","0.8","2"], + ["8","1.0","2"] + ]} +} diff --git a/tests/unit/data/fiz/dr2_v1/dr2.json b/tests/unit/data/fiz/dr2_v1/dr2.json new file mode 100644 index 000000000..f80e6ef75 --- /dev/null +++ b/tests/unit/data/fiz/dr2_v1/dr2.json @@ -0,0 +1,13 @@ +{ + "_source": "pkp/dr2_v1/dr2.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "300", "Vmax": "40", "PWR": "6"}, + "Dimensions": {"L": "1.65", "H": "0.79", "W": "1.47", "Cx": "0.058"}, + "Load": {"MaxLoad": "3", "LoadQ": "pieces", "LoadAccepted": "Passengers", "LoadSpeed": "0.5", "UnLoadSpeed": "0.5"}, + "Wheels": {"D": "0.4", "AIM": "4.8", "Tw": "1.435", "Axle": "1'A", "Bd": "0.86", "Rmin": "20", "BearingType": "Slide"}, + "BuffCoupl": {"CType": "None"}, + "Brake": {"BrakeType": "Individual", "MBF": "0.2"}, + "Cntrl": {"BrakeSystem": "Individual", "LocalBrake": "ManualBrake", "MCPN": "1", "SCDelay": "0.2", "rows": []}, + "Power": {"EnginePower": "Internal", "PowerType": "BioPower"}, + "Engine": {"EngineType": "WheelsDriven", "Trans": "9:2", "Ftmax": "1200"} +} diff --git a/tests/unit/data/fiz/e186_v2/eu47.json b/tests/unit/data/fiz/e186_v2/eu47.json new file mode 100644 index 000000000..c20e0c823 --- /dev/null +++ b/tests/unit/data/fiz/e186_v2/eu47.json @@ -0,0 +1,61 @@ +{ + "_source": "pkp/e186_v2/eu47.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "81000", "Mred": "9000", "Vmax": "160", "PWR": "5600", "SandCap": "760"}, + "Load": {"MaxLoad": "52", "LoadQ": "pieces", "LoadAccepted": "pantstate", "LoadSpeed": "1", "UnLoadSpeed": "0.1"}, + "Dimensions": {"L": "18.900", "H": "3.95", "W": "2.977", "Cx": "0.1"}, + "Wheels": {"D": "1.250", "AIM": "4000", "Tw": "1.435", "Axle": "Bo'Bo'", "Ad": "1.75", "Bd": "10.3", "Rmin": "100"}, + "Brake": {"BrakeValve": "EStED", "NBpA": "4", "MBF": "50", "MaxBP": "3.8", "BCN": "8", "RM": "1.4", "BCR": "0.127", "BCD": "0.04", "BCM": "2.7", "BCS": "0.8", "BSA": "0", "BM": "Disk2", "BVV": "125", "Vv": "0.8", "CompressorSpeed": "0.04", "CompressorPower": "Converter", "MinCP": "8", "MaxCP": "10", "UBB3": "8", "LPOn": "3.0", "LPOff": "4.5", "HandlePipeUnlockPos": "2", "EmergencyCutsOffHandle": "Yes"}, + "SpringBrake": {"Volume": "10", "MBF": "8", "MaxSP": "5.5", "ResetP": "4.0", "MinFP": "3.5", "PressOff": "4.5", "PressOn": "3.5", "ValveOnArea": "0.0002", "ValveOffArea": "0.0002", "ValvePNBArea": "0.002", "MTC": "4"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "103", "ControlType": "EU47"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "BrakeOpModes": "PN", "BCPN": "4", "BDelay1": "15", "BDelay2": "4", "BDelay3": "35", "BDelay4": "25", "ASB": "Automatic", "LocalBrake": "PneumaticBrake", "MCPN": "7", "SCPN": "4", "AutoRelay": "No", "MainInitTime": "10", "IniCDelay": "0.5", "SCDelay": "0.1", "BrakeDelays": "GPR", "BrakeHandle": "MHZ_6P", "LocBrakeHandle": "FD1", "ScndS": "Yes", "SBD": "0", "ConverterStart": "Automatic", "ConverterStartDelay": "10", "PantCompressorStart": "Automatic", "PantAutoValve": "Yes", "EIMCtrlType": "1", "HAO": "No", "HMO": "No", "HGDP1": "0.0", "HGDP2": "1", "OMP": "0.4", "DirChangeMaxPos": "3", "LocalBrakeTraxx": "Yes", "PantEPValveStart": "Manual", "PantEPValveSpring": "No", "rows": [ + ["-1","0.8","-1","20","Pneumatic"], + ["0","0.5","-1","2","Pneumatic"], + ["1","0.46","-1","2","Pneumatic"], + ["2","0.42","-1","2","Pneumatic"], + ["3","0.38","-1","2","Pneumatic"], + ["4","0.34","-1","2","Pneumatic"], + ["5","0.29","-1","2","Pneumatic"], + ["6","0","-1","40","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal,SeparateAcknowledge", "AwareDelay": "30", "SoundSignalDelay": "2.5", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "5", "RadioStop": "Yes"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Clima": {"Heating": "Main"}, + "Power": {"EnginePower": "CurrentCollector", "CollectorsNo": "4", "MaxVoltage": "3900", "MaxCurrent": "2000", "MinH": "0.48", "MinV": "1900", "MaxH": "2.5", "CSW": "1.5", "PhysicalLayout": "3"}, + "Engine": {"EngineType": "ElectricInductionMotor", "Trans": "48:251", "dfic": "861", "dfmax": "1.84", "p": "2", "cfu": "43.7", "cim": "13.4", "icif": "0.679", "Uzmax": "2183", "Uzh": "2183", "DU": "20", "I0": "20", "fcfu": "43.7", "F0": "300", "a1": "0.4", "Pmax": "5600", "Fh": "150", "Ph": "2600", "Vh0": "5", "Vh1": "10", "Imax": "1950", "abed": "1", "Flat": "Yes"}, + "Switches": {"Pantograph": "Impulse"}, + "SpeedControl": {"SpeedCtrl": "Yes", "OverrideManual": "No", "InitPwr": "1.0", "MaxPwrVel": "-1", "StartVel": "-1", "VelStep": "5", "PwrStep": "0.01", "MinPwr": "0.0", "MaxPwr": "1.0", "MinVel": "0", "MaxVel": "160", "Offset": "0", "kPpos": "0.1", "kPneg": "0.2", "kIpos": "0.03", "kIneg": "0.03", "BrakeIntervention": "No", "SpeedCtrlType": "Time", "SpeedCtrlDelay": "0.5"}, + "Doors": {"DoorPermitList": "0|3", "DoorPermitListDefault": "1"}, + "Circuit": {"ImaxHi": "500"}, + "ffList": {"Size": "7", "rows": [ + ["0","0.4"], + ["6.3","0.4"], + ["7.1","0.6"], + ["25.6","0.6"], + ["26.4","0.7"], + ["29.6","0.7"], + ["30.4","1.0"], + ["60.8","2.0"] + ]}, + "LightsList": {"Size": "12", "Wrap": "Yes", "Default": "1", "rows": [ + ["21","34"], + ["34","0"], + ["37","34"], + ["21","34"], + ["38","34"], + ["22","34"], + ["17","17"], + ["17","17"], + ["42","42"], + ["4","4"], + ["17","17"], + ["16","1"] + ]}, + "WiperList": {"Size": "4", "Angle": "70", "rows": [ + ["0","0.8","0.0","0.5"], + ["3","0.8","5.0","0.5"], + ["3","0.8","0.5","0.0"], + ["3","0.6","0.5","0.0"], + ["endL"] + ]} +} diff --git a/tests/unit/data/fiz/e6act_v2/e6acta.json b/tests/unit/data/fiz/e6act_v2/e6acta.json new file mode 100644 index 000000000..1904bbcf6 --- /dev/null +++ b/tests/unit/data/fiz/e6act_v2/e6acta.json @@ -0,0 +1,41 @@ +{ + "_source": "pkp/e6act_v2/e6acta.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "115000", "Mred": "9000", "Vmax": "120", "PWR": "5004", "SandCap": "700"}, + "Load": {"MaxLoad": "52", "LoadQ": "pieces", "LoadAccepted": "pantstate", "LoadSpeed": "1", "UnLoadSpeed": "0.1"}, + "Dimensions": {"L": "20.33", "H": "4.325", "W": "3.0", "Cx": "0.1"}, + "Wheels": {"D": "1.250", "AIM": "4000", "Tw": "1.435", "Axle": "Co'Co'", "Ad": "3.9", "Bd": "14.2", "Rmin": "150", "BearingType": "Roll"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "35"}, + "Brake": {"BrakeValve": "EStED", "NBpA": "4", "MBF": "50", "MaxBP": "4.4", "BCN": "12", "MaxLBP": "4.4", "RM": "1.4", "BCR": "0.127", "BCD": "0.04", "BCM": "2.7", "BCS": "0.8", "BSA": "0", "BRE": "0.97", "BM": "P10-Bgu", "BVV": "100", "Vv": "0.8", "CompressorSpeed": "0.04", "MinCP": "8", "MaxCP": "10", "DynamicBrake": "Automatic", "LPOn": "3.0", "LPOff": "4.5", "UBB1": "8", "UBB2": "1", "HandlePipeUnlockPos": "0", "EmergencyCutsOffHandle": "Yes"}, + "SpringBrake": {"Volume": "10", "MBF": "2.9", "MaxSP": "5.5", "ResetP": "4.0", "MinFP": "3.5", "PressOff": "4.5", "PressOn": "4.2", "ValveOnArea": "0.0005", "ValveOffArea": "0.0005", "ValvePNBArea": "0.002", "MTC": "4"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "BCPN": "6", "BDelay1": "15", "BDelay2": "4", "BDelay3": "35", "BDelay4": "25", "ASB": "Automatic", "LocalBrake": "PneumaticBrake", "MCPN": "10", "SCPN": "12", "AutoRelay": "No", "MainInitTime": "5", "IniCDelay": "0.5", "SCDelay": "0.1", "BrakeDelays": "GP", "BrakeHandle": "MHZ_K5P", "LocBrakeHandle": "FD1", "ConverterStart": "Automatic", "ConverterStartDelay": "10", "PantCompressorStart": "Mixed", "PantAutoValve": "Yes", "LocalBrakeTraxx": "Yes", "HAO": "No", "HMO": "No", "HGDP1": "0.0", "HGDP2": "1", "BrakeOpModes": "PN", "AutomaticCabActivation": "No", "InactivaCabEmergencyBrake": "Yes", "InactiveCabFlag": "15", "rows": [ + ["-1","0.8","-1","20","Pneumatic"], + ["0","0.5","-1","2","Pneumatic"], + ["1","0.46","-1","2","Pneumatic"], + ["2","0.42","-1","2","Pneumatic"], + ["3","0.38","-1","2","Pneumatic"], + ["4","0.34","-1","2","Pneumatic"], + ["5","0.29","-1","2","Pneumatic"], + ["6","0","-1","40","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "2.4", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "2.1", "CabDependent": "Yes", "RadioStop": "Yes"}, + "Circuit": {"ImaxHi": "500"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Power": {"EnginePower": "CurrentCollector", "CollectorsNo": "2", "MaxVoltage": "4600", "MaxCurrent": "1600", "MinH": "0.8", "MaxH": "1.8", "CSW": "1.5", "MinV": "2000", "InsetV": "2000", "PhysicalLayout": "3"}, + "Engine": {"EngineType": "ElectricInductionMotor", "Trans": "54:253", "dfic": "1021", "dfmax": "0.92", "p": "2", "cfu": "48.9", "cim": "15", "icif": "0.664", "Uzmax": "2150", "Uzh": "2150", "DU": "20", "I0": "20", "fcfu": "48.9", "F0": "420", "a1": "1.53", "Pmax": "5100", "Fh": "200", "Ph": "3000", "Vh0": "5", "Vh1": "10", "Imax": "1870", "abed": "1", "eped": "10"}, + "SpeedControl": {"SpeedCtrl": "Yes", "OverrideManual": "No", "InitPwr": "1.0", "MaxPwrVel": "-1", "StartVel": "-1", "VelStep": "10", "PwrStep": "0.01", "MinPwr": "0.0", "MaxPwr": "1.0", "MinVel": "0", "MaxVel": "120", "Offset": "-0.1", "kPpos": "0.2", "kPneg": "0.4", "kIpos": "0.02", "kIneg": "0.00", "BrakeIntervention": "No", "SpeedCtrlDelay": "0.5"}, + "ffList": {"Size": "2", "rows": [ + ["0","0.40"], + ["19.6","0.805"], + ["25.7","1.055"] + ]}, + "LightsList": {"Size": "7", "Wrap": "no", "Default": "4", "rows": [ + ["16","1"], + ["21","34"], + ["22","34"], + ["0","0"], + ["34","34"], + ["17","34"], + ["38","34"] + ]} +} diff --git a/tests/unit/data/fiz/ed72_v1/5bs-ra.json b/tests/unit/data/fiz/ed72_v1/5bs-ra.json new file mode 100644 index 000000000..0f11e0b42 --- /dev/null +++ b/tests/unit/data/fiz/ed72_v1/5bs-ra.json @@ -0,0 +1,25 @@ +{ + "_source": "pkp/ed72_v1/5bs-ra.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "35500", "Vmax": "110", "PWR": "0", "SandCap": "0", "Type": "ezt"}, + "Load": {"MaxLoad": "54", "LoadQ": "pieces", "LoadAccepted": "Passengers,Pantstate", "OverLoadFactor": "2", "LoadSpeed": "1", "UnLoadSpeed": "1"}, + "Dimensions": {"L": "20.87", "H": "4", "W": "2.9", "Cx": "0.2"}, + "Wheels": {"D": "0.94", "AIM": "2000", "Tw": "1.435", "Axle": "2'2'", "Ad": "2.83", "Bd": "13.9", "Rmin": "80", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "EP2", "NBpA": "4", "MBF": "85.0", "MaxBP": "4", "BCN": "1", "BCR": "0.203", "BCD": "0.15", "BCM": "9.39", "HiPP": "5", "LoPP": "3.5", "Vv": "0.3", "MinCP": "5.8", "MaxCP": "7.2", "CompressorSpeed": "0.013", "TareMaxBP": "2.5", "BVV": "88", "BM": "P10-Bgu", "BCS": "1.5", "BSA": "5", "BRE": "0.9", "CompressorPower": "Coupler2"}, + "Doors": {"OpenCtrl": "DriverCtrl", "CloseCtrl": "DriverCtrl", "OpenSpeed": "0.4", "CloseSpeed": "0.4", "DoorCloseDelay": "0.5", "DoorMaxShiftL": "0.625", "DoorMaxShiftR": "0.625", "DoorOpenMethod": "Shift", "DoorClosureWarning": "Yes", "DoorBlocked": "Yes"}, + "BuffCoupl1": {"ControlType": "ed72", "CType": "Automatic", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "39", "AutomaticFlag": "39"}, + "BuffCoupl2": {"ControlType": "ed72", "CType": "Automatic", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "-119"}, + "Cntrl": {"BrakeHandle": "FVel6", "BrakeSystem": "ElectroPneumatic", "MaxBPMass": "52", "BCPN": "6", "BDelay1": "15", "BDelay2": "4", "ASB": "Manual", "LocalBrake": "ManualBrake", "MCPN": "3", "SCPN": "3", "IniCDelay": "0.0", "SCDelay": "0.975", "CoupledCtrl": "Yes", "ScndS": "Yes", "BatteryStart": "Disabled", "ConverterStart": "Disabled", "rows": [ + ["-1","0.5","0.0","6","ElectroPneumatic"], + ["0","0.5","-1","4","ElectroPneumatic"], + ["1","0.5","0.35","4","ElectroPneumatic"], + ["2","0.5","0.35","4","Pneumatic"], + ["3","0.5","0.35","4","Pneumatic"], + ["4","-1","0.35","4","Pneumatic"], + ["5","0.34","-1","4","Pneumatic"], + ["6","-1","-1","0","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "5", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "6", "RadioStop": "Yes", "MagnetLocation": "5"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Switches": {"Pantograph": "impulse", "Converter": "impulse"} +} diff --git a/tests/unit/data/fiz/ed72_v1/5bs-rb.json b/tests/unit/data/fiz/ed72_v1/5bs-rb.json new file mode 100644 index 000000000..ccb89b269 --- /dev/null +++ b/tests/unit/data/fiz/ed72_v1/5bs-rb.json @@ -0,0 +1,25 @@ +{ + "_source": "pkp/ed72_v1/5bs-rb.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "35500", "Vmax": "110", "PWR": "0", "SandCap": "0", "Type": "ezt"}, + "Load": {"MaxLoad": "54", "LoadQ": "pieces", "LoadAccepted": "Passengers,Pantstate", "OverLoadFactor": "2", "LoadSpeed": "1", "UnLoadSpeed": "1"}, + "Dimensions": {"L": "20.87", "H": "4", "W": "2.9", "Cx": "0.2"}, + "Wheels": {"D": "0.94", "AIM": "2000", "Tw": "1.435", "Axle": "2'2'", "Ad": "2.83", "Bd": "13.9", "Rmin": "80", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "EP2", "NBpA": "4", "MBF": "85.0", "MaxBP": "4", "BCN": "1", "BCR": "0.203", "BCD": "0.15", "BCM": "9.39", "HiPP": "5", "LoPP": "3.5", "Vv": "0.3", "MinCP": "5.8", "MaxCP": "7.2", "CompressorSpeed": "0.013", "TareMaxBP": "2.5", "BVV": "88", "BM": "P10-Bgu", "BCS": "1.5", "BSA": "5", "BRE": "0.9", "CompressorPower": "Coupler1"}, + "Doors": {"OpenCtrl": "DriverCtrl", "CloseCtrl": "DriverCtrl", "OpenSpeed": "0.315", "CloseSpeed": "0.325", "DoorMaxShiftL": "0.625", "DoorCloseDelay": "1.6", "DoorMaxShiftR": "0.625", "DoorOpenMethod": "Shift", "DoorClosureWarning": "Yes", "DoorBlocked": "Yes"}, + "BuffCoupl1": {"ControlType": "ed72", "CType": "Automatic", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "-119"}, + "BuffCoupl2": {"ControlType": "ed72", "CType": "Automatic", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "39", "AutomaticFlag": "39"}, + "Cntrl": {"BrakeHandle": "FVel6", "BrakeSystem": "ElectroPneumatic", "MaxBPMass": "52", "BCPN": "6", "BDelay1": "15", "BDelay2": "4", "ASB": "Manual", "LocalBrake": "ManualBrake", "MCPN": "3", "SCPN": "3", "IniCDelay": "0.0", "SCDelay": "0.975", "CoupledCtrl": "Yes", "ScndS": "Yes", "ConverterStart": "Disabled", "rows": [ + ["-1","0.5","0.0","6","ElectroPneumatic"], + ["0","0.5","-1","4","ElectroPneumatic"], + ["1","0.5","0.35","4","ElectroPneumatic"], + ["2","0.5","0.35","4","Pneumatic"], + ["3","0.5","0.35","4","Pneumatic"], + ["4","-1","0.35","4","Pneumatic"], + ["5","0.34","-1","4","Pneumatic"], + ["6","-1","-1","0","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "5", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "6", "RadioStop": "Yes", "MagnetLocation": "5"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Switches": {"Pantograph": "impulse", "Converter": "impulse"} +} diff --git a/tests/unit/data/fiz/ed72_v1/6bs-sa.json b/tests/unit/data/fiz/ed72_v1/6bs-sa.json new file mode 100644 index 000000000..bd115fe6c --- /dev/null +++ b/tests/unit/data/fiz/ed72_v1/6bs-sa.json @@ -0,0 +1,47 @@ +{ + "_source": "pkp/ed72_v1/6bs-sa.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "55500", "Vmax": "110", "PWR": "608", "SandCap": "500", "Type": "ezt"}, + "Load": {"MaxLoad": "76", "LoadQ": "pieces", "LoadAccepted": "Passengers,Pantstate", "OverLoadFactor": "2", "LoadSpeed": "1", "UnLoadSpeed": "2"}, + "Dimensions": {"L": "21.77", "H": "4.12", "W": "2.96", "Cx": "0.1"}, + "Wheels": {"D": "1.0", "AIM": "2000", "Tw": "1.435", "Axle": "Bo'Bo'", "Ad": "2.75", "Bd": "15.6", "Rmin": "80", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "EP2", "NBpA": "4", "MBF": "85.0", "MaxBP": "4.1", "BCN": "2", "BCR": "0.178", "BCD": "0.15", "BCM": "7.32", "HiPP": "5", "LoPP": "3.5", "Vv": "0.1", "MinCP": "5.8", "MaxCP": "7.2", "CompressorSpeed": "0.0", "TareMaxBP": "2.8", "BVV": "100", "BM": "P10-Bgu", "BCS": "1.5", "BSA": "4", "BRE": "0.9"}, + "Doors": {"OpenCtrl": "DriverCtrl", "CloseCtrl": "DriverCtrl", "OpenSpeed": "0.38", "CloseSpeed": "0.475", "DoorCloseDelay": "2.0", "DoorMaxShiftL": "0.625", "DoorMaxShiftR": "0.625", "DoorOpenMethod": "Shift", "DoorClosureWarning": "Yes", "DoorBlocked": "Yes"}, + "BuffCoupl1": {"ControlType": "ed72", "CType": "Automatic", "kB": "19200", "DmaxB": "0.05", "FmaxB": "740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "-119"}, + "BuffCoupl2": {"ControlType": "ed72", "CType": "Automatic", "kB": "19200", "DmaxB": "0.05", "FmaxB": "740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "-127"}, + "Cntrl": {"BrakeSystem": "ElectroPneumatic", "MaxBPMass": "75", "BCPN": "1", "BDelay1": "15", "BDelay2": "4", "ASB": "Manual", "DynamicBrake": "Passive", "MCPN": "3", "SCPN": "3", "AutoRelay": "Yes", "IniCDelay": "0.0", "SCDelay": "0.975", "CoupledCtrl": "Yes", "ScndS": "Yes", "BatteryStart": "Disabled", "rows": [ + ["-1","0.5","0.0","6","ElectroPneumatic"], + ["0","-1","-1","0","ElectroPneumatic"], + ["1","-1","0.35","4","ElectroPneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "5", "EmergencyBrakeDelay": "6", "RadioStop": "Yes"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Clima": {"Heating": "Main"}, + "Power": {"EnginePower": "CurrentCollector", "CollectorsNo": "1", "MaxVoltage": "3600", "MaxCurrent": "1200", "MinH": "0.38", "MinV": "1900", "MaxH": "2.4", "CSW": "1.4", "PhysicalLayout": "1"}, + "Engine": {"EngineType": "ElectricSeriesMotor", "Volt": "1500", "Trans": "19:70", "WindingRes": "0.3836", "nmax": "2390"}, + "Switches": {"Pantograph": "Impulse"}, + "MotorParamTable0": {"rows": [ + ["0","21.52","81","-0.02","148","81","-0.02","1"], + ["1","21.68","120","-0.02","148.2","120","-0.02","1"], + ["2","21.17","130","0.01","142.3","130","0.01","1"], + ["3","22.46","70","0.24","150.1","70","0.24","0"] + ]}, + "Circuit": {"CircuitRes": "0.01", "ImaxLo": "280", "ImaxHi": "281", "IminLo": "135", "IminHi": "175"}, + "RList": {"Size": "14", "RVent": "No", "rows": [ + ["0","0","0","0","0"], + ["1","17.682","1","4","0"], + ["2","14.182","1","4","1"], + ["2","10.682","1","4","1"], + ["2","8.474","1","4","1"], + ["2","6.266","1","4","1"], + ["2","4.605","1","4","1"], + ["2","2.944","1","4","1"], + ["2","1.472","1","4","1"], + ["2","0","1","4","1"], + ["3","8.841","2","2","1"], + ["3","5.341","2","2","1"], + ["3","3.133","2","2","1"], + ["3","1.472","2","2","1"], + ["3","0","2","2","0"] + ]} +} diff --git a/tests/unit/data/fiz/ed72_v1/6bs-sb.json b/tests/unit/data/fiz/ed72_v1/6bs-sb.json new file mode 100644 index 000000000..2a8cb50c1 --- /dev/null +++ b/tests/unit/data/fiz/ed72_v1/6bs-sb.json @@ -0,0 +1,47 @@ +{ + "_source": "pkp/ed72_v1/6bs-sb.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "55500", "Vmax": "110", "PWR": "608", "SandCap": "500", "Type": "ezt"}, + "Load": {"MaxLoad": "76", "LoadQ": "pieces", "LoadAccepted": "Passengers,Pantstate", "OverLoadFactor": "2", "LoadSpeed": "1", "UnLoadSpeed": "2"}, + "Dimensions": {"L": "21.77", "H": "4.12", "W": "2.96", "Cx": "0.1"}, + "Wheels": {"D": "1.0", "AIM": "2000", "Tw": "1.435", "Axle": "Bo'Bo'", "Ad": "2.75", "Bd": "15.6", "Rmin": "80", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "EP2", "NBpA": "4", "MBF": "85.0", "MaxBP": "4.1", "BCN": "2", "BCR": "0.178", "BCD": "0.15", "BCM": "7.32", "HiPP": "5", "LoPP": "3.5", "Vv": "0.1", "MinCP": "5.8", "MaxCP": "7.2", "CompressorSpeed": "0.0", "TareMaxBP": "2.8", "BVV": "100", "BM": "P10-Bgu", "BCS": "1.5", "BSA": "4", "BRE": "0.9"}, + "Doors": {"OpenCtrl": "DriverCtrl", "CloseCtrl": "DriverCtrl", "OpenSpeed": "0.335", "CloseSpeed": "0.34", "DoorCloseDelay": "1.5", "DoorMaxShiftL": "0.625", "DoorMaxShiftR": "0.625", "DoorOpenMethod": "Shift", "DoorClosureWarning": "Yes", "DoorBlocked": "Yes"}, + "BuffCoupl1": {"ControlType": "ed72", "CType": "Automatic", "kB": "19200", "DmaxB": "0.05", "FmaxB": "740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "-127"}, + "BuffCoupl2": {"ControlType": "ed72", "CType": "Automatic", "kB": "19200", "DmaxB": "0.05", "FmaxB": "740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "-119"}, + "Cntrl": {"BrakeSystem": "ElectroPneumatic", "MaxBPMass": "75", "BCPN": "1", "BDelay1": "15", "BDelay2": "4", "ASB": "Manual", "DynamicBrake": "Passive", "MCPN": "3", "SCPN": "3", "AutoRelay": "Yes", "IniCDelay": "0.0", "SCDelay": "0.975", "CoupledCtrl": "Yes", "ScndS": "Yes", "BatteryStart": "Disabled", "rows": [ + ["-1","0.5","0.0","6","ElectroPneumatic"], + ["0","-1","-1","0","ElectroPneumatic"], + ["1","-1","0.35","4","ElectroPneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "5", "EmergencyBrakeDelay": "6", "RadioStop": "Yes"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Clima": {"Heating": "Main"}, + "Power": {"EnginePower": "CurrentCollector", "CollectorsNo": "2", "MaxVoltage": "3600", "MaxCurrent": "1200", "MinH": "0.38", "MinV": "1900", "MaxH": "2.4", "CSW": "1.4", "PhysicalLayout": "2"}, + "Engine": {"EngineType": "ElectricSeriesMotor", "Volt": "1500", "Trans": "19:70", "WindingRes": "0.3836", "nmax": "2390"}, + "Switches": {"Pantograph": "Impulse"}, + "MotorParamTable0": {"rows": [ + ["0","21.52","81","-0.02","148","81","-0.02","1"], + ["1","21.68","120","-0.02","148.2","120","-0.02","1"], + ["2","21.17","130","0.01","142.3","130","0.01","1"], + ["3","22.46","70","0.24","150.1","70","0.24","0"] + ]}, + "Circuit": {"CircuitRes": "0.01", "ImaxLo": "280", "ImaxHi": "281", "IminLo": "135", "IminHi": "175"}, + "RList": {"Size": "14", "RVent": "No", "rows": [ + ["0","0","0","0","0"], + ["1","17.682","1","4","0"], + ["2","14.182","1","4","1"], + ["2","10.682","1","4","1"], + ["2","8.474","1","4","1"], + ["2","6.266","1","4","1"], + ["2","4.605","1","4","1"], + ["2","2.944","1","4","1"], + ["2","1.472","1","4","1"], + ["2","0","1","4","1"], + ["3","8.841","2","2","1"], + ["3","5.341","2","2","1"], + ["3","3.133","2","2","1"], + ["3","1.472","2","2","1"], + ["3","0","2","2","0"] + ]} +} diff --git a/tests/unit/data/fiz/elf_v1/21we-a.json b/tests/unit/data/fiz/elf_v1/21we-a.json new file mode 100644 index 000000000..19b3938c6 --- /dev/null +++ b/tests/unit/data/fiz/elf_v1/21we-a.json @@ -0,0 +1,52 @@ +{ + "_source": "pkp/elf_v1/21we-a.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "28650", "Vmax": "160", "PWR": "800", "SandCap": "500", "Type": "ezt", "HeatingP": "37"}, + "Load": {"MaxLoad": "108", "LoadQ": "pieces", "LoadAccepted": "Passengers,Pantstate", "OverLoadFactor": "2.3", "LoadSpeed": "1", "UnLoadSpeed": "2"}, + "Dimensions": {"L": "21.081", "H": "4.228", "W": "2.96", "Cx": "0.1"}, + "Wheels": {"D": "0.850", "AIM": "8000", "Tw": "1.435", "Axle": "Bo'", "Ad": "2.83", "Bd": "16.3", "Rmin": "80", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "EStED", "NBpA": "4", "MBF": "85.0", "MaxBP": "3.1", "MaxLBP": "4.2", "RM": "0.74", "RV": "-1", "BCN": "4", "BCR": "0.127", "BCD": "0.05", "BCM": "1.9075", "HiPP": "5", "LoPP": "3.5", "Vv": "0.5", "MinCP": "7.7", "MaxCP": "9.0", "CompressorSpeed": "0.025", "BVV": "150", "BM": "Cosid", "BCS": "1", "BSA": "0.00", "BRE": "0.95", "TareMaxBP": "2.6", "CompressorPower": "Converter", "LPOn": "3.0", "LPOff": "4.5", "UBB1": "2", "UBB2": "8"}, + "SpringBrake": {"Volume": "10", "MBF": "2.9", "MaxSP": "5.5", "ResetP": "4.0", "MinFP": "3.5", "PressOff": "4.5", "PressOn": "4.2", "ValveOnArea": "0.0005", "ValveOffArea": "0.0005", "ValvePNBArea": "0.002", "MTC": "4"}, + "Doors": {"OpenCtrl": "Mixed", "CloseCtrl": "DriverCtrl", "OpenSpeed": "0.24", "CloseSpeed": "0.2", "DoorMaxShiftL": "0.74", "DoorMaxShiftR": "0.74", "DoorOpenMethod": "Plug", "DoorStayOpen": "5.0", "DoorClosureWarningAuto": "Yes", "DoorBlocked": "Yes", "DoorMaxShiftPlug": "0.05", "DoorCloseDelay": "1.8", "PlatformMaxShift": "0.270", "PlatformSpeed": "0.4", "PlatformOpenMethod": "Shift", "MirrorMaxShift": "45", "DoorNeedPermit": "Yes", "DoorPermitList": "1|0|2|3", "DoorPermitListDefault": "2", "DoorAutoCloseRemote": "Yes", "MirrorVelClose": "25"}, + "BuffCoupl1": {"CType": "Automatic", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "39", "AutomaticFlag": "39", "ControlType": "en62"}, + "BuffCoupl2": {"CType": "Articulated", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "-255"}, + "Cntrl": {"BrakeHandle": "MHZ_K5P", "LocBrakeHandle": "FD1", "BrakeSystem": "ElectroPneumatic", "MaxBPMass": "37", "BCPN": "6", "BDelay1": "15", "BDelay2": "4", "LocalBrake": "PneumaticBrake", "MCPN": "4", "EIMCtrlType": "2", "SCPN": "1", "MainInitTime": "10", "IniCDelay": "1.0", "SCDelay": "0.2", "CoupledCtrl": "No", "SBD": "0.6", "ASB": "Yes", "CompressorStart": "Automatic", "ConverterStart": "Automatic", "ConverterStartDelay": "10.0", "PantCompressorStart": "Mixed", "PantAutoValve": "Yes", "BrakeDelays": "PR", "BrakeOpModes": "PN", "DirChangeMaxPos": "3", "HAO": "No", "HMO": "Yes", "HGDP1": "0", "ReleaseParkingBySpringBrake": "Yes", "MotorBlowersStart": "Converter", "CompartmentLightsStart": "Manual", "AutomaticCabActivation": "No", "InactivaCabEmergencyBrake": "Yes", "InactiveCabFlag": "3", "rows": [ + ["-1","0.5","0.0","6","ElectroPneumatic"], + ["0","0.5","-1","4","ElectroPneumatic"], + ["1","0.5","0.35","4","ElectroPneumatic"], + ["2","0.5","0.35","4","Pneumatic"], + ["3","0.5","0.35","4","Pneumatic"], + ["4","-1","0.35","4","Pneumatic"], + ["5","0.34","-1","4","Pneumatic"], + ["6","-1","-1","0","Pneumatic"] + ]}, + "Circuit": {"ImaxHi": "500"}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "2.4", "MaxHoldTime": "0.1", "EmergencyBrakeDelay": "2.1", "CabDependent": "Yes", "RadioStop": "Yes", "EmergencyBrakeWarningSignal": "2", "MagnetLocation": "4.5"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Clima": {"Heating": "Main", "HMaxVoltage": "400"}, + "Power": {"EnginePower": "CurrentCollector", "CollectorsNo": "1", "MaxVoltage": "4000", "MinV": "2000", "MaxCurrent": "1200", "MinH": "0.38", "MaxH": "2.4", "CSW": "1.4", "PhysicalLayout": "1"}, + "Blending": {"MED_amax": "1.04", "MED_EPVC": "No", "MED_Ncor": "No", "MED_FirstDelayED": "2", "MED_ScndDelayED": "1"}, + "Engine": {"EngineType": "ElectricInductionMotor", "Trans": "40:218", "dfic": "470", "dfmax": "0.790", "p": "2", "cfu": "33.43", "cim": "10.22", "icif": "0.67", "Uzmax": "2340", "Uzh": "2340", "DU": "20", "I0": "20", "fcfu": "33.5", "F0": "75", "a1": "0.0", "Pmax": "980", "Fh": "48", "Ph": "830", "Vh0": "2", "Vh1": "5", "Imax": "377", "abed": "0", "Flat": "Yes", "edep": "1.0", "MotorBlowersSpeed": "-29", "InvNo": "2", "InvCtrCplFlag": "255"}, + "SpeedControl": {"SpeedCtrl": "Yes", "SpeedButtons": "0|40|50|60|70|80|100|120|140|160", "OverrideManual": "Yes", "InitPwr": "0.3", "MaxPwrVel": "5", "StartVel": "2", "VelStep": "5", "PwrStep": "0.1", "MinPwr": "0.3", "MaxPwr": "1.0", "MinVel": "0", "MaxVel": "160", "Offset": "-0.5", "kPpos": "0.1", "kPneg": "0.4", "kIpos": "0.06", "kIneg": "0.06", "BrakeIntervention": "No", "PowerUpSpeed": "0.3", "PowerDownSpeed": "0.3"}, + "AI": {"Pantstate": "1"}, + "ffList": {"Size": "10", "rows": [ + ["0","2.49"], + ["22.1","2.49"], + ["24.1","2.50"], + ["31.3","2.50"], + ["32.3","2.53"], + ["39.3","3.0"], + ["65","5.0"], + ["91","7.0"], + ["124","9.0"], + ["161","11.7"], + ["177","13.0"] + ]}, + "LightsList": {"Size": "5", "Wrap": "no", "Default": "1", "rows": [ + ["0","0"], + ["21","34"], + ["22","34"], + ["34","34"], + ["16","1"] + ]} +} diff --git a/tests/unit/data/fiz/elf_v1/21we-b.json b/tests/unit/data/fiz/elf_v1/21we-b.json new file mode 100644 index 000000000..ecd26847c --- /dev/null +++ b/tests/unit/data/fiz/elf_v1/21we-b.json @@ -0,0 +1,25 @@ +{ + "_source": "pkp/elf_v1/21we-b.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "50000", "Vmax": "160", "PWR": "0", "SandCap": "500", "Type": "ezt", "HeatingP": "37"}, + "Load": {"MaxLoad": "108", "LoadQ": "pieces", "LoadAccepted": "Passengers,Pantstate", "OverLoadFactor": "2.3", "LoadSpeed": "1", "UnLoadSpeed": "2"}, + "Dimensions": {"L": "16.5", "H": "4.12", "W": "2.96", "Cx": "0.1"}, + "Wheels": {"D": "0.850", "AIM": "670", "Tw": "1.435", "Axle": "2'2'", "Ad": "2.83", "Bd": "16.3", "Rmin": "80", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "EStED", "NBpA": "2", "MBF": "85.0", "MaxBP": "3.1", "MaxLBP": "4.2", "RM": "0.74", "RV": "-1", "BCN": "8", "BCR": "0.127", "BCD": "0.05", "BCM": "1.9075", "HiPP": "5", "LoPP": "3.5", "Vv": "0.1", "MinCP": "7.7", "MaxCP": "9.0", "CompressorSpeed": "0.0000001", "BVV": "176", "BM": "Cosid", "BCS": "1", "BSA": "0.00", "BRE": "0.95", "TareMaxBP": "1.9"}, + "SpringBrake": {"Volume": "20", "MBF": "5.8", "MaxSP": "5.5", "ResetP": "4.0", "MinFP": "3.5", "PressOff": "4.5", "PressOn": "4.2", "ValveOnArea": "0.0005", "ValveOffArea": "0.0005", "ValvePNBArea": "0.002", "MTC": "4"}, + "Doors": {"OpenCtrl": "Mixed", "CloseCtrl": "DriverCtrl", "OpenSpeed": "0.24", "CloseSpeed": "0.2", "DoorMaxShiftL": "0.74", "DoorMaxShiftR": "0.74", "DoorOpenMethod": "Plug", "DoorStayOpen": "5.0", "DoorClosureWarningAuto": "Yes", "DoorBlocked": "Yes", "DoorMaxShiftPlug": "0.05", "DoorCloseDelay": "1.8", "PlatformMaxShift": "0.270", "PlatformSpeed": "0.4", "PlatformOpenMethod": "Shift", "MirrorMaxShift": "45", "DoorNeedPermit": "Yes", "DoorPermitList": "1|0|2|3", "DoorPermitListDefault": "2", "DoorAutoCloseRemote": "Yes"}, + "BuffCoupl1": {"CType": "Articulated", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "-255"}, + "BuffCoupl2": {"CType": "Articulated", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "-255"}, + "Cntrl": {"BrakeHandle": "MHZ_K5P", "LocBrakeHandle": "FD1", "BrakeSystem": "ElectroPneumatic", "MaxBPMass": "74", "BCPN": "6", "BDelay1": "15", "BDelay2": "4", "LocalBrake": "PneumaticBrake", "MCPN": "4", "EIMCtrlType": "2", "SCPN": "1", "IniCDelay": "0.0", "SCDelay": "0.8", "CoupledCtrl": "No", "SBD": "0.6", "ASB": "Automatic", "CompressorStart": "Automatic", "ConverterStart": "Automatic", "ConverterStartDelay": "10.15", "BrakeDelays": "PR", "BrakeOpModes": "PN", "ReleaseParkingBySpringBrake": "Yes", "CompartmentLightsStart": "Manual", "rows": [ + ["-1","0.5","0.0","6","ElectroPneumatic"], + ["0","0.5","-1","4","ElectroPneumatic"], + ["1","0.5","0.35","4","ElectroPneumatic"], + ["2","0.5","0.35","4","Pneumatic"], + ["3","0.5","0.35","4","Pneumatic"], + ["4","-1","0.35","4","Pneumatic"], + ["5","0.34","-1","4","Pneumatic"], + ["6","-1","-1","0","Pneumatic"] + ]}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Clima": {"Heating": "PowerCable", "HPowerTrans": "ElectricPower", "HMaxVoltage": "400"} +} diff --git a/tests/unit/data/fiz/elf_v1/21we-c.json b/tests/unit/data/fiz/elf_v1/21we-c.json new file mode 100644 index 000000000..10101e91a --- /dev/null +++ b/tests/unit/data/fiz/elf_v1/21we-c.json @@ -0,0 +1,52 @@ +{ + "_source": "pkp/elf_v1/21we-c.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "28650", "Vmax": "160", "PWR": "800", "SandCap": "500", "Type": "ezt", "HeatingP": "37"}, + "Load": {"MaxLoad": "95", "LoadQ": "pieces", "LoadAccepted": "Passengers,Pantstate", "OverLoadFactor": "2.3", "LoadSpeed": "1", "UnLoadSpeed": "2"}, + "Dimensions": {"L": "20.70", "H": "4.228", "W": "2.96", "Cx": "0.1"}, + "Wheels": {"D": "0.850", "AIM": "8000", "Tw": "1.435", "Axle": "Bo'", "Ad": "2.83", "Bd": "16.3", "Rmin": "80", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "EStED", "NBpA": "4", "MBF": "85.0", "MaxBP": "3.1", "MaxLBP": "4.2", "RM": "0.74", "RV": "-1", "BCN": "4", "BCR": "0.127", "BCD": "0.05", "BCM": "1.9075", "HiPP": "5", "LoPP": "3.5", "Vv": "0.5", "MinCP": "7.0", "MaxCP": "8.5", "CompressorSpeed": "0.025", "BVV": "150", "BM": "Cosid", "BCS": "1", "BSA": "0.00", "BRE": "0.95", "TareMaxBP": "2.6", "CompressorPower": "Converter", "LPOn": "3.0", "LPOff": "4.5", "UBB1": "2", "UBB2": "8"}, + "SpringBrake": {"Volume": "10", "MBF": "2.9", "MaxSP": "5.5", "ResetP": "4.0", "MinFP": "3.5", "PressOff": "4.5", "PressOn": "4.2", "ValveOnArea": "0.0005", "ValveOffArea": "0.0005", "ValvePNBArea": "0.002", "MTC": "4"}, + "Doors": {"OpenCtrl": "Mixed", "CloseCtrl": "DriverCtrl", "OpenSpeed": "0.24", "CloseSpeed": "0.2", "DoorMaxShiftL": "0.74", "DoorMaxShiftR": "0.74", "DoorOpenMethod": "Plug", "DoorStayOpen": "5.0", "DoorClosureWarningAuto": "Yes", "DoorBlocked": "Yes", "DoorMaxShiftPlug": "0.05", "DoorCloseDelay": "1.8", "PlatformMaxShift": "0.270", "PlatformSpeed": "0.4", "PlatformOpenMethod": "Shift", "MirrorMaxShift": "45", "DoorNeedPermit": "Yes", "DoorPermitList": "1|0|2|3", "DoorPermitListDefault": "2", "DoorAutoCloseRemote": "Yes", "MirrorVelClose": "25"}, + "BuffCoupl1": {"CType": "Articulated", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "-255"}, + "BuffCoupl2": {"CType": "Automatic", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "39", "AutomaticFlag": "39", "ControlType": "en62"}, + "Cntrl": {"BrakeHandle": "MHZ_K5P", "LocBrakeHandle": "FD1", "BrakeSystem": "ElectroPneumatic", "MaxBPMass": "37", "BCPN": "6", "BDelay1": "15", "BDelay2": "4", "LocalBrake": "PneumaticBrake", "MCPN": "4", "EIMCtrlType": "2", "SCPN": "1", "MainInitTime": "10", "IniCDelay": "1.0", "SCDelay": "0.2", "CoupledCtrl": "No", "SBD": "0.6", "ASB": "Yes", "CompressorStart": "Automatic", "ConverterStart": "Automatic", "ConverterStartDelay": "10.0", "PantCompressorStart": "Mixed", "PantAutoValve": "Yes", "BrakeDelays": "PR", "BrakeOpModes": "PN", "DirChangeMaxPos": "3", "HAO": "No", "HMO": "Yes", "HGDP1": "0", "ReleaseParkingBySpringBrake": "Yes", "MotorBlowersStart": "Converter", "CompartmentLightsStart": "Manual", "AutomaticCabActivation": "No", "InactivaCabEmergencyBrake": "Yes", "InactiveCabFlag": "3", "rows": [ + ["-1","0.5","0.0","6","ElectroPneumatic"], + ["0","0.5","-1","4","ElectroPneumatic"], + ["1","0.5","0.35","4","ElectroPneumatic"], + ["2","0.5","0.35","4","Pneumatic"], + ["3","0.5","0.35","4","Pneumatic"], + ["4","-1","0.35","4","Pneumatic"], + ["5","0.34","-1","4","Pneumatic"], + ["6","-1","-1","0","Pneumatic"] + ]}, + "Circuit": {"ImaxHi": "500"}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "2.4", "MaxHoldTime": "0.1", "EmergencyBrakeDelay": "2.1", "CabDependent": "Yes", "RadioStop": "Yes", "EmergencyBrakeWarningSignal": "2", "MagnetLocation": "4.5"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Clima": {"Heating": "Main", "HMaxVoltage": "400"}, + "Power": {"EnginePower": "CurrentCollector", "CollectorsNo": "1", "MaxVoltage": "4000", "MinV": "2000", "MaxCurrent": "1200", "MinH": "0.38", "MaxH": "2.4", "CSW": "1.4", "PhysicalLayout": "2"}, + "Blending": {"MED_amax": "1.04", "MED_EPVC": "No", "MED_Ncor": "No", "MED_FirstDelayED": "2", "MED_ScndDelayED": "1"}, + "Engine": {"EngineType": "ElectricInductionMotor", "Trans": "40:218", "dfic": "470", "dfmax": "0.790", "p": "2", "cfu": "33.43", "cim": "10.22", "icif": "0.67", "Uzmax": "2340", "Uzh": "2340", "DU": "20", "I0": "20", "fcfu": "33.5", "F0": "75", "a1": "0.0", "Pmax": "980", "Fh": "48", "Ph": "830", "Vh0": "2", "Vh1": "5", "Imax": "377", "abed": "0", "Flat": "Yes", "edep": "1.0", "MotorBlowersSpeed": "-29", "InvNo": "2", "InvCtrCplFlag": "255"}, + "SpeedControl": {"SpeedCtrl": "Yes", "SpeedButtons": "0|40|50|60|70|80|100|120|140|160", "OverrideManual": "Yes", "InitPwr": "0.3", "MaxPwrVel": "5", "StartVel": "2", "VelStep": "5", "PwrStep": "0.1", "MinPwr": "0.3", "MaxPwr": "1.0", "MinVel": "0", "MaxVel": "160", "Offset": "-0.5", "kPpos": "0.1", "kPneg": "0.4", "kIpos": "0.06", "kIneg": "0.06", "BrakeIntervention": "No", "PowerUpSpeed": "0.3", "PowerDownSpeed": "0.3"}, + "AI": {"Pantstate": "2"}, + "ffList": {"Size": "10", "rows": [ + ["0","2.49"], + ["22.1","2.49"], + ["24.1","2.50"], + ["31.3","2.50"], + ["32.3","2.53"], + ["39.3","3.0"], + ["65","5.0"], + ["91","7.0"], + ["124","9.0"], + ["161","11.7"], + ["177","13.0"] + ]}, + "LightsList": {"Size": "5", "Wrap": "no", "Default": "1", "rows": [ + ["0","0"], + ["21","34"], + ["22","34"], + ["34","34"], + ["16","1"] + ]} +} diff --git a/tests/unit/data/fiz/elf_v1/22wec-a.json b/tests/unit/data/fiz/elf_v1/22wec-a.json new file mode 100644 index 000000000..6059b098d --- /dev/null +++ b/tests/unit/data/fiz/elf_v1/22wec-a.json @@ -0,0 +1,54 @@ +{ + "_source": "pkp/elf_v1/22wec-a.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "29000", "Vmax": "120", "PWR": "800", "SandCap": "500", "Type": "ezt", "HeatingP": "37"}, + "Load": {"MaxLoad": "108", "LoadQ": "pieces", "LoadAccepted": "Passengers,Pantstate", "OverLoadFactor": "2.3", "LoadSpeed": "1", "UnLoadSpeed": "2"}, + "Dimensions": {"L": "21.081", "H": "4.228", "W": "2.96", "Cx": "0.1"}, + "Wheels": {"D": "0.850", "AIM": "8000", "Tw": "1.435", "Axle": "Bo'", "Ad": "2.83", "Bd": "16.3", "Rmin": "80", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "EStED", "NBpA": "4", "MBF": "85.0", "MaxBP": "3.1", "MaxLBP": "4.2", "RM": "0.74", "RV": "-1", "BCN": "4", "BCR": "0.127", "BCD": "0.05", "BCM": "1.9075", "HiPP": "5", "LoPP": "3.5", "Vv": "0.5", "MinCP": "7.7", "MaxCP": "9.0", "CompressorSpeed": "0.025", "BVV": "150", "BM": "Cosid", "BCS": "1", "BSA": "0.00", "BRE": "0.95", "TareMaxBP": "2.6", "CompressorPower": "Converter", "LPOn": "3.0", "LPOff": "4.5", "UBB1": "2", "UBB2": "8"}, + "SpringBrake": {"Volume": "10", "MBF": "2.9", "MaxSP": "5.5", "ResetP": "4.0", "MinFP": "3.5", "PressOff": "4.5", "PressOn": "4.2", "ValveOnArea": "0.0005", "ValveOffArea": "0.0005", "ValvePNBArea": "0.002", "MTC": "4"}, + "Doors": {"OpenCtrl": "Mixed", "CloseCtrl": "DriverCtrl", "OpenSpeed": "0.24", "CloseSpeed": "0.2", "DoorMaxShiftL": "0.74", "DoorMaxShiftR": "0.74", "DoorOpenMethod": "Plug", "DoorStayOpen": "5.0", "DoorClosureWarningAuto": "Yes", "DoorBlocked": "Yes", "DoorMaxShiftPlug": "0.05", "DoorCloseDelay": "1.8", "PlatformMaxShift": "0.270", "PlatformSpeed": "0.4", "PlatformOpenMethod": "Shift", "MirrorMaxShift": "45", "DoorNeedPermit": "Yes", "DoorPermitList": "1|0|2|3", "DoorPermitListDefault": "2", "DoorAutoCloseRemote": "Yes", "MirrorVelClose": "25"}, + "BuffCoupl1": {"CType": "Automatic", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "39", "AutomaticFlag": "39"}, + "BuffCoupl2": {"CType": "Articulated", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "-255"}, + "Cntrl": {"BrakeHandle": "MHZ_K5P", "LocBrakeHandle": "FD1", "BrakeSystem": "ElectroPneumatic", "MaxBPMass": "35", "BCPN": "6", "BDelay1": "15", "BDelay2": "4", "LocalBrake": "PneumaticBrake", "MCPN": "4", "EIMCtrlType": "2", "SCPN": "1", "MainInitTime": "10", "IniCDelay": "1.0", "SCDelay": "0.2", "CoupledCtrl": "No", "SBD": "0.6", "ASB": "Yes", "CompressorStart": "Automatic", "ConverterStart": "Automatic", "ConverterStartDelay": "10.15", "BrakeDelays": "PR", "BrakeOpModes": "PN", "DirChangeMaxPos": "3", "HAO": "No", "HMO": "Yes", "HGDP1": "0", "ReleaseParkingBySpringBrake": "Yes", "MotorBlowersStart": "Converter", "CompartmentLightsStart": "Manual", "PantEPValveSpring": "No", "PantCompressorStart": "Automatic", "PantAutoValve": "Yes", "AutomaticCabActivation": "No", "InactivaCabEmergencyBrake": "Yes", "InactiveCabFlag": "9", "rows": [ + ["-1","0.5","0.0","6","ElectroPneumatic"], + ["0","0.5","-1","4","ElectroPneumatic"], + ["1","0.5","0.35","4","ElectroPneumatic"], + ["2","0.5","0.35","4","Pneumatic"], + ["3","0.5","0.35","4","Pneumatic"], + ["4","-1","0.35","4","Pneumatic"], + ["5","0.34","-1","4","Pneumatic"], + ["6","-1","-1","0","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "2.4", "MaxHoldTime": "0.1", "EmergencyBrakeDelay": "2.1", "CabDependent": "Yes", "RadioStop": "Yes", "EmergencyBrakeWarningSignal": "2", "MagnetLocation": "4.5"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Clima": {"Heating": "Main", "HMaxVoltage": "400"}, + "Power": {"EnginePower": "CurrentCollector", "CollectorsNo": "1", "MaxVoltage": "4000", "MinV": "2000", "MaxCurrent": "1200", "MinH": "0.38", "MaxH": "2.4", "CSW": "1.4", "PhysicalLayout": "1"}, + "Switches": {"PantographPresets": "1|3|2"}, + "Circuit": {"ImaxHi": "500"}, + "Blending": {"MED_amax": "1.04", "MED_EPVC": "No", "MED_Ncor": "No", "MED_FirstDelayED": "2", "MED_ScndDelayED": "1"}, + "Engine": {"EngineType": "ElectricInductionMotor", "Trans": "40:218", "dfic": "470", "dfmax": "0.790", "p": "2", "cfu": "33.43", "cim": "10.22", "icif": "0.67", "Uzmax": "2340", "Uzh": "2340", "DU": "20", "I0": "20", "fcfu": "33.5", "F0": "75", "a1": "0.0", "Pmax": "990", "Fh": "48", "Ph": "830", "Vh0": "2", "Vh1": "5", "Imax": "377", "abed": "0", "Flat": "Yes", "edep": "1.0", "MotorBlowersSpeed": "-29", "InvNo": "2", "InvCtrCplFlag": "255"}, + "SpeedControl": {"SpeedCtrl": "Yes", "SpeedButtons": "0|10|20|30|40|50|60|80|100|120", "OverrideManual": "Yes", "InitPwr": "0.3", "MaxPwrVel": "5", "StartVel": "2", "VelStep": "5", "PwrStep": "0.1", "MinPwr": "0.3", "MaxPwr": "1.0", "MinVel": "0", "MaxVel": "160", "Offset": "-0.5", "kPpos": "0.1", "kPneg": "0.4", "kIpos": "0.06", "kIneg": "0.06", "BrakeIntervention": "No", "PowerUpSpeed": "0.3", "PowerDownSpeed": "0.3"}, + "AI": {"Pantstate": "1"}, + "ffList": {"Size": "3", "rows": [ + ["0","2.0"], + ["33.7","2.08"], + ["34.0","2.12"], + ["130.4","8.10"] + ]}, + "ffBrakeList": {"Size": "4", "rows": [ + ["0","2.0"], + ["33.7","2.08"], + ["34.8","2.08"], + ["34.8","2.17"], + ["130.4","8.10"] + ]}, + "LightsList": {"Size": "6", "Wrap": "no", "Default": "1", "rows": [ + ["21","34"], + ["22","34"], + ["16","1"], + ["34","34"], + ["17","34"], + ["38","34"] + ]} +} diff --git a/tests/unit/data/fiz/en57_v1/5bgaiii_led_spot.json b/tests/unit/data/fiz/en57_v1/5bgaiii_led_spot.json new file mode 100644 index 000000000..7ca99dcc3 --- /dev/null +++ b/tests/unit/data/fiz/en57_v1/5bgaiii_led_spot.json @@ -0,0 +1,26 @@ +{ + "_source": "pkp/en57_v1/5bgaiii_led_spot.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "34000", "Vmax": "110", "PWR": "0", "SandCap": "500", "Type": "ezt", "HeatingP": "19.6"}, + "Load": {"MaxLoad": "95", "LoadQ": "pieces", "LoadAccepted": "Passengers,Pantstate", "OverLoadFactor": "2", "LoadSpeed": "1", "UnLoadSpeed": "2"}, + "Dimensions": {"L": "21.286", "H": "4", "W": "2.9", "Cx": "0.1"}, + "Wheels": {"D": "0.92", "AIM": "2000", "Tw": "1.435", "Axle": "2'2'", "Ad": "2.83", "Bd": "13.9", "Rmin": "80", "BearingType": "Roll"}, + "BuffCoupl1": {"ControlType": "en57", "CType": "Automatic", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "39", "AutomaticFlag": "39"}, + "BuffCoupl2": {"ControlType": "en57", "CType": "Automatic", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "-887", "PowerFlag": "768"}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "5", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "6", "RadioStop": "Yes", "MagnetLocation": "5"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Clima": {"Heating": "PowerCable", "HPowerTrans": "ElectricPower", "HMaxVoltage": "3000"}, + "Switches": {"Pantograph": "impulse", "Converter": "impulse"}, + "Brake": {"BrakeValve": "EP2", "NBpA": "4", "MBF": "85.0", "MaxBP": "4", "BCN": "1", "BCR": "0.203", "BCD": "0.15", "BCM": "9.39", "HiPP": "5", "LoPP": "3.5", "Vv": "0.3", "MinCP": "5.8", "MaxCP": "7.2", "CompressorSpeed": "0.013", "TareMaxBP": "2.5", "BVV": "88", "BM": "P10-Bgu", "BCS": "1.5", "BSA": "5", "BRE": "0.9", "CompressorPower": "Coupler2"}, + "Cntrl": {"BrakeHandle": "FVel6", "BrakeSystem": "ElectroPneumatic", "MaxBPMass": "52", "BCPN": "6", "BDelay1": "15", "BDelay2": "4", "ASB": "Manual", "LocalBrake": "ManualBrake", "MCPN": "3", "SCPN": "3", "IniCDelay": "0.0", "SCDelay": "0.975", "CoupledCtrl": "Yes", "CompartmentLightsStart": "Manual", "BatteryStart": "Disabled", "ConverterStart": "Disabled", "rows": [ + ["-1","0.5","0.0","6","ElectroPneumatic"], + ["0","0.5","-1","4","ElectroPneumatic"], + ["1","0.5","0.35","4","ElectroPneumatic"], + ["2","0.5","0.35","4","Pneumatic"], + ["3","0.5","0.35","4","Pneumatic"], + ["4","-1","0.35","4","Pneumatic"], + ["5","0.34","-1","4","Pneumatic"], + ["6","-1","-1","0","Pneumatic"] + ]}, + "Doors": {"OpenCtrl": "DriverCtrl", "CloseCtrl": "DriverCtrl", "OpenSpeed": "0.315", "CloseSpeed": "0.315", "DoorCloseDelay": "1.6", "DoorMaxShiftL": "0.625", "DoorMaxShiftR": "0.625", "DoorOpenMethod": "Shift", "DoorClosureWarning": "Yes", "DoorBlocked": "Yes"} +} diff --git a/tests/unit/data/fiz/en57_v1/5bgb.json b/tests/unit/data/fiz/en57_v1/5bgb.json new file mode 100644 index 000000000..3075c0a6f --- /dev/null +++ b/tests/unit/data/fiz/en57_v1/5bgb.json @@ -0,0 +1,26 @@ +{ + "_source": "pkp/en57_v1/5bgb.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "34000", "Vmax": "110", "PWR": "0", "SandCap": "500", "Type": "ezt", "HeatingP": "19.6"}, + "Load": {"MaxLoad": "90", "LoadQ": "pieces", "LoadAccepted": "Passengers,Pantstate", "OverLoadFactor": "2", "LoadSpeed": "1", "UnLoadSpeed": "2"}, + "Dimensions": {"L": "21.288", "H": "4", "W": "2.9", "Cx": "0.1"}, + "Wheels": {"D": "0.92", "AIM": "2000", "Tw": "1.435", "Axle": "2'2'", "Ad": "2.83", "Bd": "13.9", "Rmin": "80", "BearingType": "Roll"}, + "BuffCoupl1": {"ControlType": "en57", "CType": "Automatic", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "-887", "PowerFlag": "768"}, + "BuffCoupl2": {"ControlType": "en57", "CType": "Automatic", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "39", "AutomaticFlag": "39"}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "5", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "6", "RadioStop": "Yes", "MagnetLocation": "5"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Clima": {"Heating": "PowerCable", "HPowerTrans": "ElectricPower", "HMaxVoltage": "3000"}, + "Switches": {"Pantograph": "impulse", "Converter": "impulse"}, + "Brake": {"BrakeValve": "EP2", "NBpA": "4", "MBF": "85.0", "MaxBP": "4", "BCN": "1", "BCR": "0.203", "BCD": "0.15", "BCM": "9.39", "HiPP": "5", "LoPP": "3.5", "Vv": "0.3", "MinCP": "5.8", "MaxCP": "7.2", "CompressorSpeed": "0.013", "TareMaxBP": "2.5", "BVV": "88", "BM": "P10-Bgu", "BCS": "1.5", "BSA": "5", "BRE": "0.9", "CompressorPower": "Coupler1"}, + "Cntrl": {"BrakeHandle": "FVel6", "BrakeSystem": "ElectroPneumatic", "MaxBPMass": "52", "BCPN": "6", "BDelay1": "15", "BDelay2": "4", "ASB": "Manual", "LocalBrake": "ManualBrake", "MCPN": "3", "SCPN": "3", "IniCDelay": "0.0", "SCDelay": "0.975", "CoupledCtrl": "Yes", "CompartmentLightsStart": "Manual", "ConverterStart": "Disabled", "rows": [ + ["-1","0.5","0.0","6","ElectroPneumatic"], + ["0","0.5","-1","4","ElectroPneumatic"], + ["1","0.5","0.35","4","ElectroPneumatic"], + ["2","0.5","0.35","4","Pneumatic"], + ["3","0.5","0.35","4","Pneumatic"], + ["4","-1","0.35","4","Pneumatic"], + ["5","0.34","-1","4","Pneumatic"], + ["6","-1","-1","0","Pneumatic"] + ]}, + "Doors": {"OpenCtrl": "DriverCtrl", "CloseCtrl": "DriverCtrl", "OpenSpeed": "0.315", "CloseSpeed": "0.315", "DoorCloseDelay": "1.6", "DoorMaxShiftL": "0.625", "DoorMaxShiftR": "0.625", "DoorOpenMethod": "Shift", "DoorClosureWarning": "Yes", "DoorBlocked": "Yes"} +} diff --git a/tests/unit/data/fiz/en57_v1/6ba_840.json b/tests/unit/data/fiz/en57_v1/6ba_840.json new file mode 100644 index 000000000..aed27f1e7 --- /dev/null +++ b/tests/unit/data/fiz/en57_v1/6ba_840.json @@ -0,0 +1,26 @@ +{ + "_source": "pkp/en57_v1/6ba_840.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "34000", "Vmax": "110", "PWR": "0", "SandCap": "500", "Type": "ezt", "HeatingP": "19.6"}, + "Load": {"MaxLoad": "95", "LoadQ": "pieces", "LoadAccepted": "Passengers,Pantstate", "OverLoadFactor": "2", "LoadSpeed": "1", "UnLoadSpeed": "2"}, + "Dimensions": {"L": "21.286", "H": "4", "W": "2.9", "Cx": "0.1"}, + "Wheels": {"D": "0.92", "AIM": "2000", "Tw": "1.435", "Axle": "2'2'", "Ad": "2.83", "Bd": "13.9", "Rmin": "80", "BearingType": "Roll"}, + "BuffCoupl1": {"ControlType": "en57", "CType": "Automatic", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "39", "AutomaticFlag": "39"}, + "BuffCoupl2": {"ControlType": "en57", "CType": "Automatic", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "-887", "PowerFlag": "768"}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "5", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "6", "RadioStop": "Yes", "MagnetLocation": "5"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Clima": {"Heating": "PowerCable", "HPowerTrans": "ElectricPower", "HMaxVoltage": "3000"}, + "Switches": {"Pantograph": "impulse", "Converter": "impulse"}, + "Brake": {"BrakeValve": "EP2", "NBpA": "4", "MBF": "85.0", "MaxBP": "4", "BCN": "1", "BCR": "0.203", "BCD": "0.15", "BCM": "9.39", "HiPP": "5", "LoPP": "3.5", "Vv": "0.3", "MinCP": "5.8", "MaxCP": "7.2", "CompressorSpeed": "0.013", "TareMaxBP": "2.5", "BVV": "88", "BM": "P10-Bgu", "BCS": "1.5", "BSA": "5", "BRE": "0.9", "CompressorPower": "Coupler2"}, + "Cntrl": {"BrakeHandle": "FVel6", "BrakeSystem": "ElectroPneumatic", "MaxBPMass": "52", "BCPN": "6", "BDelay1": "15", "BDelay2": "4", "ASB": "Manual", "LocalBrake": "ManualBrake", "MCPN": "3", "SCPN": "3", "IniCDelay": "0.0", "SCDelay": "0.975", "CoupledCtrl": "Yes", "CompartmentLightsStart": "Manual", "BatteryStart": "Disabled", "ConverterStart": "Disabled", "rows": [ + ["-1","0.5","0.0","6","ElectroPneumatic"], + ["0","0.5","-1","4","ElectroPneumatic"], + ["1","0.5","0.35","4","ElectroPneumatic"], + ["2","0.5","0.35","4","Pneumatic"], + ["3","0.5","0.35","4","Pneumatic"], + ["4","-1","0.35","4","Pneumatic"], + ["5","0.34","-1","4","Pneumatic"], + ["6","-1","-1","0","Pneumatic"] + ]}, + "Doors": {"OpenCtrl": "Mixed", "CloseCtrl": "DriverCtrl", "OpenSpeed": "0.32", "CloseSpeed": "0.242", "DoorCloseDelay": "3.35", "DoorMaxShiftL": "0.625", "DoorMaxShiftR": "0.625", "DoorOpenMethod": "Shift", "DoorClosureWarning": "Yes", "DoorClosureWarningAuto": "Yes", "DoorBlocked": "Yes", "DoorNeedPermit": "Yes", "DoorAutoCloseVel": "10.0"} +} diff --git a/tests/unit/data/fiz/en57_v1/6bai.json b/tests/unit/data/fiz/en57_v1/6bai.json new file mode 100644 index 000000000..13f1132b7 --- /dev/null +++ b/tests/unit/data/fiz/en57_v1/6bai.json @@ -0,0 +1,25 @@ +{ + "_source": "pkp/en57_v1/6bai.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "34000", "Vmax": "110", "PWR": "0", "SandCap": "500", "Type": "ezt", "HeatingP": "19.6"}, + "Load": {"MaxLoad": "80", "LoadQ": "pieces", "LoadAccepted": "Passengers,Pantstate", "OverLoadFactor": "2", "LoadSpeed": "1", "UnLoadSpeed": "2"}, + "Dimensions": {"L": "21.286", "H": "4", "W": "2.9", "Cx": "0.1"}, + "Wheels": {"D": "0.92", "AIM": "2000", "Tw": "1.435", "Axle": "2'2'", "Ad": "2.83", "Bd": "13.9", "Rmin": "80", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "K", "NBpA": "4", "MBF": "85.0", "MaxBP": "12", "BCN": "1", "BCR": "0.203", "BCD": "0.15", "BCM": "12.00", "HiPP": "5", "LoPP": "3.5", "Vv": "0.3", "MinCP": "5.8", "MaxCP": "7.2", "CompressorSpeed": "0.013", "TareMaxBP": "2.5", "BVV": "88", "BM": "P10-Bgu", "BCS": "1.5", "BSA": "5", "BRE": "0.9", "CompressorPower": "Coupler2"}, + "Doors": {"OpenCtrl": "DriverCtrl", "CloseCtrl": "DriverCtrl", "OpenSpeed": "0.315", "CloseSpeed": "0.315", "DoorCloseDelay": "1.6", "DoorMaxShiftL": "0.625", "DoorMaxShiftR": "0.625", "DoorOpenMethod": "Shift", "DoorClosureWarning": "Yes", "DoorBlocked": "Yes"}, + "BuffCoupl1": {"CType": "Automatic", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "39", "AutomaticFlag": "39"}, + "BuffCoupl2": {"CType": "Automatic", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "-887", "PowerFlag": "768"}, + "Cntrl": {"BrakeHandle": "St113", "BrakeSystem": "ElectroPneumatic", "LocalBrake": "ManualBrake", "MaxBPMass": "52", "BCPN": "5", "BDelay1": "15", "BDelay2": "4", "ASB": "Manual", "DynamicBrake": "Passive", "MCPN": "3", "SCPN": "3", "IniCDelay": "0.0", "SCDelay": "0.975", "CoupledCtrl": "Yes", "CompartmentLightsStart": "Manual", "BatteryStart": "Disabled", "ConverterStart": "Disabled", "rows": [ + ["-1","0.5","-1","9","Pneumatic"], + ["0","-1","0.0","6","ElectroPneumatic"], + ["1","-1","0.35","4","ElectroPneumatic"], + ["2","-1","-1","0","Pneumatic"], + ["3","-1","-1","3","Pneumatic"], + ["4","0.34","-1","4","Pneumatic"], + ["5","0.0","-1","9","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "5", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "6", "RadioStop": "Yes", "MagnetLocation": "5"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Clima": {"Heating": "PowerCable", "HPowerTrans": "ElectricPower", "HMaxVoltage": "3000"}, + "Switches": {"Pantograph": "impulse", "Converter": "impulse"} +} diff --git a/tests/unit/data/fiz/en57akl_v1/akl_ra.json b/tests/unit/data/fiz/en57akl_v1/akl_ra.json new file mode 100644 index 000000000..18cc9ed8d --- /dev/null +++ b/tests/unit/data/fiz/en57akl_v1/akl_ra.json @@ -0,0 +1,40 @@ +{ + "_source": "pkp/en57akl_v1/akl_ra.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "38000", "Vmax": "120", "PWR": "0", "SandCap": "500", "Type": "ezt", "HeatingP": "20"}, + "Load": {"MaxLoad": "80", "LoadQ": "pieces", "LoadAccepted": "Passengers", "OverLoadFactor": "2", "LoadSpeed": "1", "UnLoadSpeed": "2"}, + "Dimensions": {"L": "21.286", "H": "4", "W": "2.9", "Cx": "0.1"}, + "Wheels": {"D": "0.92", "AIM": "2000", "Tw": "1.435", "Axle": "2'2'", "Ad": "2.7", "Bd": "14.9", "Rmin": "80", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "EStED", "NBpA": "4", "MBF": "85.0", "MaxBP": "3.5", "MaxLBP": "3.5", "BCN": "1", "BCR": "0.203", "BCD": "0.105", "BCM": "9.39", "HiPP": "5", "LoPP": "3.5", "Vv": "0.3", "MinCP": "6.2", "MaxCP": "7.2", "CompressorSpeed": "0.01416667", "TareMaxBP": "2.5", "BVV": "107", "BM": "P10-Bgu", "BCS": "1.5", "BSA": "5", "BRE": "0.9", "CompressorPower": "Coupler2", "UBB1": "2", "UBB2": "8", "LPOn": "3.0", "LPOff": "4.5"}, + "SpringBrake": {"Volume": "10", "MBF": "29", "MaxSP": "7.2", "ResetP": "4.0", "MinFP": "3.5", "PressOff": "4.5", "PressOn": "4.2", "ValveOnArea": "0.0001", "ValveOffArea": "0.0001", "ValvePNBArea": "0.002", "MTC": "4"}, + "Doors": {"OpenCtrl": "Mixed", "CloseCtrl": "DriverCtrl", "OpenSpeed": "0.2", "CloseSpeed": "0.2", "DoorCloseDelay": "2.5", "DoorMaxShiftL": "0.58", "DoorMaxShiftR": "0.58", "DoorOpenMethod": "Plug", "DoorClosureWarningAuto": "Yes", "DoorBlocked": "Yes", "DoorMaxShiftPlug": "0.035", "DoorNeedPermit": "Yes", "DoorStayOpen": "5.0", "DoorAutoCloseVel": "10.0"}, + "BuffCoupl1": {"CType": "Automatic", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "39", "AutomaticFlag": "39"}, + "BuffCoupl2": {"CType": "Automatic", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "-119", "PowerFlag": "1792"}, + "Cntrl": {"BrakeHandle": "MHZ_EN57", "LocBrakeHandle": "FD1", "BrakeSystem": "ElectroPneumatic", "MaxBPMass": "52", "BCPN": "10", "BDelay1": "15", "BDelay2": "4", "MainInitTime": "10", "ASB": "Manual", "LocalBrake": "PneumaticBrake", "MCPN": "10", "SCPN": "1", "SpeedCtrlATOF": "1", "EIMCtrlAddZeros": "Yes", "IniCDelay": "0.0", "SCDelay": "0.8", "CoupledCtrl": "No", "BrakeOpModes": "PNEPMED", "CompressorStart": "Automatic", "CompartmentLightsStart": "Manual", "ConverterStart": "Disabled", "BatteryStart": "Disabled", "AutomaticCabActivation": "No", "InactivaCabEmergencyBrake": "Yes", "InactiveCabFlag": "15", "rows": [ + ["-1","0.5","0.0","6","ElectroPneumatic"], + ["0","0.5","-1","4","ElectroPneumatic"], + ["1","0.5","0.35","4","ElectroPneumatic"], + ["2","0.5","0.35","4","Pneumatic"], + ["3","0.5","0.35","4","Pneumatic"], + ["4","-1","0.35","4","Pneumatic"], + ["5","0.34","-1","4","Pneumatic"], + ["6","-1","-1","0","Pneumatic"] + ]}, + "Blending": {"MED_Vmax": "95", "MED_Vmin": "1", "MED_Vref": "100", "MED_amax": "0.8", "MED_EPVC": "Yes", "MED_Ncor": "No"}, + "SpeedControl": {"SpeedCtrl": "Yes", "OverrideManual": "No", "InitPwr": "1.0", "MaxPwrVel": "-1", "StartVel": "-1", "VelStep": "10", "PwrStep": "0.00", "MinPwr": "1.0", "MaxPwr": "1.0", "MinVel": "0", "MaxVel": "120", "Offset": "-0.1", "kPpos": "0.2", "kPneg": "0.4", "kIpos": "0.00", "kIneg": "0.00", "BrakeIntervention": "No", "SpeedCtrlATOF": "1"}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "2.4", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "2.1", "CabDependent": "Yes", "RadioStop": "Yes", "MagnetLocation": "5"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Clima": {"Heating": "PowerCable", "HPowerTrans": "ElectricPower", "HMaxVoltage": "3000"}, + "Switches": {"Pantograph": "impulse", "Converter": "impulse"}, + "AI": {"Pantstate": "2", "IdlePantUp": "Yes"}, + "Engine": {"EngineType": "ElectricInductionMotor", "Trans": "46:252", "dfic": "377", "dfmax": "0.98", "p": "2", "cfu": "46.8", "cim": "14.2", "icif": "0.671", "Uzmax": "2340", "Uzh": "2340", "DU": "20", "I0": "20", "fcfu": "49", "F0": "130", "a1": "0", "Pmax": "0", "Fh": "130", "Ph": "1000", "Vh0": "5", "Vh1": "10", "Imax": "557", "abed": "0", "edep": "0.95"}, + "LightsList": {"Size": "7", "Wrap": "No", "Default": "1", "rows": [ + ["0","0"], + ["34","34"], + ["38","34"], + ["22","34"], + ["16","1"], + ["1","16"], + ["21","34"] + ]} +} diff --git a/tests/unit/data/fiz/ep05_v2/ep05.json b/tests/unit/data/fiz/ep05_v2/ep05.json new file mode 100644 index 000000000..4340a0b11 --- /dev/null +++ b/tests/unit/data/fiz/ep05_v2/ep05.json @@ -0,0 +1,84 @@ +{ + "_source": "pkp/ep05_v2/ep05.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "82500", "Mred": "12000", "Vmax": "160", "PWR": "2032", "SandCap": "100", "Type": "ep05"}, + "Load": {"MaxLoad": "52", "LoadQ": "pieces", "LoadAccepted": "pantstate", "LoadSpeed": "1", "UnLoadSpeed": "0.1"}, + "Dimensions": {"L": "16.14", "H": "3.987", "W": "2.950", "Cx": "0.2"}, + "Wheels": {"D": "1.250", "AIM": "2000", "Tw": "1.435", "Axle": "Bo'Bo'", "Ad": "3.05", "Bd": "8.55", "Rmin": "120", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "LSt", "NBpA": "4", "MBF": "85.0", "MaxBP": "3.8", "MaxASBP": "1.3", "RM": "0.56", "BCN": "4", "BCR": "0.1524", "BCD": "0.05", "BCM": "7.13", "Vv": "1.07", "MinCP": "7.5", "MaxCP": "9.0", "BCS": "1.2", "BSA": "0.0", "BM": "P10-Bgu", "BVV": "220", "CompressorSpeed": "0.06", "BRE": "0.85"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "103", "ControlType": "EP05"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "BCPN": "6", "BDelay1": "15", "BDelay2": "4", "BDelay3": "35", "BDelay4": "25", "ASB": "Manual", "ManualBrake": "Yes", "LocalBrake": "PneumaticBrake", "DynamicBrake": "Passive", "MCPN": "46", "SCPN": "0", "CoupledCtrl": "Yes", "AutoRelay": "Yes", "SCIM": "1", "IniCDelay": "0.4", "SCDelay": "0.26", "BrakeDelays": "P", "BrakeHandle": "FV4a", "LocBrakeHandle": "FD1", "Camshaft": "Yes", "rows": [ + ["-1","0.60","-1","15","Pneumatic"], + ["0","0.50","-1","9","Pneumatic"], + ["1","0.46","-1","9","Pneumatic"], + ["2","0.42","-1","9","Pneumatic"], + ["3","0.38","-1","9","Pneumatic"], + ["4","0.34","-1","9","Pneumatic"], + ["5","0.28","-1","9","Pneumatic"], + ["6","0.00","-1","15","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "5", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "6", "RadioStop": "Yes"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "48", "LMaxCurrent": "155"}, + "Clima": {"Heating": "Main"}, + "Power": {"EnginePower": "CurrentCollector", "CollectorsNo": "2", "MaxVoltage": "3600", "MaxCurrent": "1600", "MinH": "0.38", "MinV": "1900", "MaxH": "2.4", "CSW": "1.4", "PhysicalLayout": "3"}, + "Engine": {"EngineType": "ElectricSeriesMotor", "Volt": "1500", "Trans": "44:77", "WindingRes": "0.126", "nmax": "1270"}, + "Switches": {"PantographPresets": "0|2|3|1"}, + "MotorParamTable0": {"rows": [ + ["0","56.48","80","0.4","370","80","0.445","0"], + ["1","45.15","150","0.3","296","150","0.29","0"], + ["2","41.45","300","0.2","271","300","0.16","0"], + ["3","39.29","400","0.13","257","400","0.13","0"], + ["4","38.36","700","0.04","251","700","0.04","0"], + ["5","33.83","850","0.01","221","850","0.01","0"] + ]}, + "Circuit": {"CircuitRes": "0.01", "ImaxLo": "800", "ImaxHi": "800", "IminLo": "350", "IminHi": "450"}, + "RList": {"Size": "46", "RVent": "Automatic", "RVentnmax": "3300", "RVentCutOff": "0.1", "rows": [ + ["0","0","0","0","0","0"], + ["1","100.000","1","4","0","0"], + ["2","14.308","1","4","0","0"], + ["3","10.558","1","4","0","0"], + ["4","8.908","1","4","0","0"], + ["5","7.668","1","4","0","0"], + ["6","6.428","1","4","0","0"], + ["7","5.744","1","4","0","0"], + ["8","5.060","1","4","0","0"], + ["9","4.616","1","4","0","0"], + ["10","4.172","1","4","0","0"], + ["11","3.813","1","4","0","0"], + ["12","3.454","1","4","0","0"], + ["13","3.100","1","4","0","0"], + ["14","2.746","1","4","0","0"], + ["15","2.456","1","4","0","0"], + ["16","2.215","1","4","0","0"], + ["17","1.974","1","4","0","0"], + ["18","1.629","1","4","0","0"], + ["19","1.284","1","4","0","0"], + ["20","1.054","1","4","0","0"], + ["21","0.824","1","4","0","0"], + ["22","0.593","1","4","0","0"], + ["23","0.362","1","4","0","0"], + ["24","0.181","1","4","0","0"], + ["25","0.000","1","4","0","0"], + ["26","0.000","1","4","0","1"], + ["27","0.000","1","4","0","2"], + ["28","0.000","1","4","0","3"], + ["29","0.000","1","4","0","4"], + ["30","0.000","1","4","0","4"], + ["31","0.000","1","4","0","4"], + ["32","0.000","1","4","0","4"], + ["33","2.086","2","2","0","0"], + ["34","1.727","2","2","0","0"], + ["35","1.373","2","2","0","0"], + ["36","1.228","2","2","0","0"], + ["37","0.987","2","2","0","0"], + ["38","0.642","2","2","0","0"], + ["39","0.412","2","2","0","0"], + ["40","0.181","2","2","0","0"], + ["41","0.00","2","2","0","0"], + ["42","0.00","2","2","0","1"], + ["43","0.00","2","2","0","2"], + ["44","0.00","2","2","0","3"], + ["45","0.00","2","2","0","4"], + ["46","0.00","2","2","0","5"] + ]} +} diff --git a/tests/unit/data/fiz/ep09_v2/104e.json b/tests/unit/data/fiz/ep09_v2/104e.json new file mode 100644 index 000000000..9928285cb --- /dev/null +++ b/tests/unit/data/fiz/ep09_v2/104e.json @@ -0,0 +1,76 @@ +{ + "_source": "pkp/ep09_v2/104e.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Load": {"MaxLoad": "52", "LoadQ": "pieces", "LoadAccepted": "pantstate", "LoadSpeed": "10", "UnLoadSpeed": "0.1"}, + "Param": {"Category": "train", "M": "85400", "Mred": "12000", "Vmax": "160", "PWR": "2920", "SandCap": "730"}, + "Dimensions": {"L": "16.74", "H": "4.12", "W": "2.96", "Cx": "0.3"}, + "Wheels": {"D": "1.2", "Tw": "1.435", "AIM": "2000", "Axle": "Bo'Bo'", "Ad": "3.2", "Bd": "7.97", "Rmin": "120", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "EStED", "NBpA": "4", "MBF": "85.0", "MaxBP": "4.6", "MaxASBP": "1.3", "RM": "0.72", "BCN": "8", "BCR": "0.1143", "BCD": "0.05", "BCM": "5.18", "HiPP": "5", "LoPP": "3.5", "Vv": "0.834", "MinCP": "8.5", "MaxCP": "10.0", "CompressorSpeed": "0.058", "BCS": "1", "BSA": "2", "BM": "P10-Bgu", "BVV": "278", "CompressorPower": "Main"}, + "SpringBrake": {"Volume": "10", "MBF": "8", "MaxSP": "5.5", "ResetP": "4.0", "MinFP": "3.5", "PressOff": "4.5", "PressOn": "3.5", "ValveOnArea": "0.0002", "ValveOffArea": "0.0002", "ValvePNBArea": "0.002", "MTC": "4"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "99"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "BCPN": "6", "BDelay1": "27", "BDelay2": "4", "BDelay3": "55", "BDelay4": "25", "ASB": "Manual", "LocalBrake": "PneumaticBrake", "ManualBrake": "No", "DynamicBrake": "Automatic", "DBAM": "1", "MCPN": "31", "SCPN": "5", "AutoRelay": "No", "SCIM": "255", "IniCDelay": "0.5", "SCDelay": "0.25", "SCDDelay": "0.25", "BrakeDelays": "GPR", "BrakeHandle": "FV4a", "LocBrakeHandle": "FD1", "rows": [ + ["-1","0.7","-1","9","Pneumatic"], + ["0","0.5","-1","9","Pneumatic"], + ["1","0.44","-1","9","Pneumatic"], + ["2","0.40","-1","9","Pneumatic"], + ["3","0.36","-1","9","Pneumatic"], + ["4","0.32","-1","9","Pneumatic"], + ["5","0.28","-1","9","Pneumatic"], + ["6","0","-1","35","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "3", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "4", "RadioStop": "Yes"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Clima": {"Heating": "Main"}, + "Power": {"EnginePower": "CurrentCollector", "CollectorsNo": "2", "MaxVoltage": "3600", "MaxCurrent": "2000", "MinH": "0.38", "MinV": "1900", "MaxH": "2.4", "CSW": "1.4", "PhysicalLayout": "3"}, + "Engine": {"EngineType": "ElectricSeriesMotor", "Volt": "1500", "Trans": "38:73", "WindingRes": "0.07", "nmax": "1530"}, + "Switches": {"Pantograph": "Continuos", "RelayResetButton1": "1", "RelayResetButton2": "4"}, + "MotorParamTable0": {"rows": [ + ["0","52.81","78","0.53","356.8","78","0.53"], + ["1","42.73","120","0.42","288.7","120","0.42"], + ["2","38.38","193","0.33","259.3","193","0.33"], + ["3","36.60","320","0.24","247.3","320","0.24"], + ["4","36.66","534","0.16","247.7","534","0.16"], + ["5","40.29","1100","0.06","272.2","1100","0.06"] + ]}, + "Circuit": {"CircuitRes": "0.00", "ImaxLo": "850", "ImaxHi": "850", "IminLo": "520", "IminHi": "650"}, + "RList": {"Size": "31", "RVent": "Automatic", "RVentnmax": "3300", "RVentCutOff": "0.1", "rows": [ + ["0","0","0","0","0","0"], + ["1","10.758","1","4","0","2"], + ["2","10.758","1","4","0","0"], + ["3","7.994","1","4","0","0"], + ["4","6.156","1","4","0","0"], + ["5","4.808","1","4","0","0"], + ["6","4.032","1","4","0","0"], + ["7","3.342","1","4","0","0"], + ["8","3.014","1","4","0","0"], + ["9","2.686","1","4","0","0"], + ["10","2.375","1","4","0","0"], + ["11","2.064","1","4","0","0"], + ["12","1.772","1","4","0","0"], + ["13","1.480","1","4","0","0"], + ["14","1.196","1","4","0","0"], + ["15","0.912","1","4","0","0"], + ["16","0.683","1","4","0","0"], + ["17","0.454","1","4","0","0"], + ["18","0.227","1","4","0","0"], + ["19","0","1","4","0","255"], + ["20","5.379","2","2","0","0"], + ["21","3.997","2","2","0","0"], + ["22","3.078","2","2","0","0"], + ["23","2.404","2","2","0","0"], + ["24","2.016","2","2","0","0"], + ["25","1.671","2","2","0","0"], + ["26","1.343","2","2","0","0"], + ["27","1.032","2","2","0","0"], + ["28","0.740","2","2","0","0"], + ["29","0.456","2","2","0","0"], + ["30","0.227","2","2","0","0"], + ["31","0","2","2","0","255"] + ]}, + "WiperList": {"Size": "4", "Angle": "83", "rows": [ + ["0","1.0","0.0","0.5"], + ["3","1.0","5.0","0.5"], + ["3","1.0","0.0","0.5"], + ["3","0.5","0.0","0.5"] + ]} +} diff --git a/tests/unit/data/fiz/et22_v3/201e-rn.json b/tests/unit/data/fiz/et22_v3/201e-rn.json new file mode 100644 index 000000000..05b2e9c8a --- /dev/null +++ b/tests/unit/data/fiz/et22_v3/201e-rn.json @@ -0,0 +1,86 @@ +{ + "_source": "pkp/et22_v3/201e-rn.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "120000", "Mred": "18000", "Vmax": "125", "PWR": "3120", "SandCap": "700", "Type": "et22"}, + "Load": {"MaxLoad": "52", "LoadQ": "pieces", "LoadAccepted": "pantstate", "LoadSpeed": "1", "UnLoadSpeed": "0.1"}, + "Dimensions": {"L": "19.240", "H": "4.055", "W": "3.005", "Cx": "0.3"}, + "Wheels": {"D": "1.250", "AIM": "2000", "Tw": "1.435", "Axle": "Co'Co'", "Ad": "3.05", "Bd": "10.30", "Rmin": "120", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "LSt", "NBpA": "4", "MBF": "85.0", "MaxBP": "4.2", "MaxASBP": "1.8", "BCN": "8", "BCR": "0.1143", "BCD": "0.05", "BCM": "7.75", "HiPP": "5", "LoPP": "3.5", "Vv": "1", "MinCP": "7.5", "MaxCP": "8.5", "CompressorSpeed": "0.0566", "BVV": "250", "RM": "0.677", "BSA": "0", "BCS": "1", "BM": "P10-Bgu", "CompressorPower": "Main", "BRE": "0.75"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "99"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "BCPN": "6", "BDelay1": "17", "BDelay2": "7", "BDelay3": "45", "BDelay4": "25", "BrakeDelays": "GPR", "BrakeHandle": "FV4a", "LocBrakeHandle": "FD1", "ManualBrake": "Yes", "ASB": "Manual", "LocalBrake": "PneumaticBrake", "DynamicBrake": "Passive", "MCPN": "48", "SCPN": "6", "AutoRelay": "No", "IniCDelay": "0.5", "SCDelay": "0.26", "SCDDelay": "0.05", "MotorBlowersStart": "Converter", "MotorBlowersSpeed": "-1310", "rows": [ + ["-1","0.6","-1","12","Pneumatic"], + ["0","0.5","-1","9","Pneumatic"], + ["1","0.43","-1","9","Pneumatic"], + ["2","0.40","-1","9","Pneumatic"], + ["3","0.37","-1","9","Pneumatic"], + ["4","0.34","-1","9","Pneumatic"], + ["5","0.28","-1","9","Pneumatic"], + ["6","0","-1","18","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "5", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "6", "RadioStop": "Yes"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Clima": {"Heating": "Main"}, + "Power": {"EnginePower": "CurrentCollector", "CollectorsNo": "2", "MaxVoltage": "3600", "MaxCurrent": "1800", "MinH": "0.38", "MinV": "1900", "MaxH": "2.4", "CSW": "1.4", "PhysicalLayout": "3"}, + "Engine": {"EngineType": "ElectricSeriesMotor", "Volt": "1500", "Trans": "18:79", "WindingRes": "0.14", "nmax": "2390"}, + "MotorParamTable0": {"rows": [ + ["0","21.4","105","0.12","141.5","105","0.12"], + ["1","19.57","140","0.07","129.3","140","0.07"], + ["2","20.42","190","0.09","134.7","190","0.09"], + ["3","22.97","160","0.25","152.1","160","0.25"], + ["4","22.12","255","0.16","145.8","255","0.16"], + ["5","24.18","170","0.35","158.2","170","0.35"], + ["6","22.76","800","0.02","149","800","0.02"] + ]}, + "Circuit": {"CircuitRes": "0.01", "ImaxLo": "600", "ImaxHi": "750", "IminLo": "350", "IminHi": "450"}, + "RList": {"Size": "48", "RVent": "Automatic", "RVentnmax": "3300", "RVentCutOff": "0.2", "rows": [ + ["0","0","0","0","0"], + ["1","25.88","1","6","0"], + ["2","15.05","1","6","0"], + ["3","11.02","1","6","0"], + ["4","8.98","1","6","0"], + ["5","7.54","1","6","0"], + ["6","6.28","1","6","0"], + ["7","5.50","1","6","0"], + ["8","5.11","1","6","0"], + ["9","4.67","1","6","0"], + ["10","4.11","1","6","0"], + ["11","3.61","1","6","0"], + ["12","3.06","1","6","0"], + ["13","2.70","1","6","0"], + ["14","2.38","1","6","0"], + ["15","2.05","1","6","0"], + ["16","1.69","1","6","0"], + ["17","1.36","1","6","0"], + ["18","1.00","1","6","0"], + ["19","0.84","1","6","0"], + ["20","0.29","1","6","0"], + ["21","0.00","1","6","0"], + ["22","5.53","2","3","0"], + ["23","4.53","2","3","0"], + ["24","3.58","2","3","0"], + ["25","3.03","2","3","0"], + ["26","2.60","2","3","0"], + ["27","2.26","2","3","0"], + ["28","1.97","2","3","0"], + ["29","1.60","2","3","0"], + ["30","1.46","2","3","0"], + ["31","1.26","2","3","0"], + ["32","1.00","2","3","0"], + ["33","0.61","2","3","0"], + ["34","0.35","2","3","0"], + ["35","0.23","2","3","0"], + ["36","0.00","2","3","0"], + ["37","2.64","3","2","0"], + ["38","2.23","3","2","0"], + ["39","1.78","3","2","0"], + ["40","1.49","3","2","0"], + ["41","1.29","3","2","0"], + ["42","1.11","3","2","0"], + ["43","0.95","3","2","0"], + ["44","0.78","3","2","0"], + ["45","0.62","3","2","0"], + ["46","0.47","3","2","0"], + ["47","0.22","3","2","0"], + ["48","0.00","3","2","0"] + ]} +} diff --git a/tests/unit/data/fiz/et22_v3/201e-w.json b/tests/unit/data/fiz/et22_v3/201e-w.json new file mode 100644 index 000000000..80b9aedda --- /dev/null +++ b/tests/unit/data/fiz/et22_v3/201e-w.json @@ -0,0 +1,86 @@ +{ + "_source": "pkp/et22_v3/201e-w.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "120000", "Mred": "18000", "Vmax": "125", "PWR": "3120", "SandCap": "700", "Type": "et22"}, + "Load": {"MaxLoad": "52", "LoadQ": "pieces", "LoadAccepted": "pantstate", "LoadSpeed": "1", "UnLoadSpeed": "0.1"}, + "Dimensions": {"L": "19.240", "H": "4.055", "W": "3.005", "Cx": "0.3"}, + "Wheels": {"D": "1.250", "AIM": "2000", "Tw": "1.435", "Axle": "Co'Co'", "Ad": "3.05", "Bd": "10.30", "Rmin": "120", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "LSt", "NBpA": "4", "MBF": "85.0", "MaxBP": "4.2", "MaxASBP": "1.8", "BCN": "8", "BCR": "0.1143", "BCD": "0.05", "BCM": "7.75", "HiPP": "5", "LoPP": "3.5", "Vv": "1", "MinCP": "7.5", "MaxCP": "8.5", "CompressorSpeed": "0.0566", "BVV": "250", "RM": "0.677", "BSA": "0", "BCS": "1", "BM": "P10-Bgu", "CompressorPower": "Main", "BRE": "0.75"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "99"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "BCPN": "6", "BDelay1": "17", "BDelay2": "7", "BDelay3": "45", "BDelay4": "25", "BrakeDelays": "GPR", "BrakeHandle": "FV4a", "LocBrakeHandle": "FD1", "ManualBrake": "Yes", "ASB": "Manual", "LocalBrake": "PneumaticBrake", "DynamicBrake": "Passive", "MCPN": "48", "SCPN": "6", "AutoRelay": "No", "IniCDelay": "0.5", "SCDelay": "0.26", "SCDDelay": "0.05", "MotorBlowersStart": "Converter", "MotorBlowersSpeed": "-1310", "rows": [ + ["-1","0.6","-1","12","Pneumatic"], + ["0","0.5","-1","9","Pneumatic"], + ["1","0.43","-1","9","Pneumatic"], + ["2","0.40","-1","9","Pneumatic"], + ["3","0.37","-1","9","Pneumatic"], + ["4","0.34","-1","9","Pneumatic"], + ["5","0.28","-1","9","Pneumatic"], + ["6","0","-1","18","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "5", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "6", "RadioStop": "Yes"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Clima": {"Heating": "Main"}, + "Power": {"EnginePower": "CurrentCollector", "CollectorsNo": "2", "MaxVoltage": "3600", "MaxCurrent": "1800", "MinH": "0.38", "MinV": "1900", "MaxH": "2.4", "CSW": "1.4", "PhysicalLayout": "3"}, + "Engine": {"EngineType": "ElectricSeriesMotor", "Volt": "1500", "Trans": "18:79", "WindingRes": "0.14", "nmax": "2390"}, + "MotorParamTable0": {"rows": [ + ["0","21.4","105","0.12","141.5","105","0.12"], + ["1","19.57","140","0.07","129.3","140","0.07"], + ["2","20.42","190","0.09","134.7","190","0.09"], + ["3","22.97","160","0.25","152.1","160","0.25"], + ["4","22.12","255","0.16","145.8","255","0.16"], + ["5","24.18","170","0.35","158.2","170","0.35"], + ["6","22.76","800","0.02","149","800","0.02"] + ]}, + "Circuit": {"CircuitRes": "0.01", "ImaxLo": "600", "ImaxHi": "750", "IminLo": "350", "IminHi": "450"}, + "RList": {"Size": "48", "RVent": "Automatic", "RVentnmax": "3300", "RVentCutOff": "0.2", "rows": [ + ["0","0","0","0","0"], + ["1","25.88","1","6","0"], + ["2","15.05","1","6","0"], + ["3","11.02","1","6","0"], + ["4","8.98","1","6","0"], + ["5","7.54","1","6","0"], + ["6","6.28","1","6","0"], + ["7","5.50","1","6","0"], + ["8","5.11","1","6","0"], + ["9","4.67","1","6","0"], + ["10","4.11","1","6","0"], + ["11","3.61","1","6","0"], + ["12","3.06","1","6","0"], + ["13","2.70","1","6","0"], + ["14","2.38","1","6","0"], + ["15","2.05","1","6","0"], + ["16","1.69","1","6","0"], + ["17","1.36","1","6","0"], + ["18","1.00","1","6","0"], + ["19","0.84","1","6","0"], + ["20","0.29","1","6","0"], + ["21","0.00","1","6","0"], + ["22","5.53","2","3","0"], + ["23","4.53","2","3","0"], + ["24","3.58","2","3","0"], + ["25","3.03","2","3","0"], + ["26","2.60","2","3","0"], + ["27","2.26","2","3","0"], + ["28","1.97","2","3","0"], + ["29","1.60","2","3","0"], + ["30","1.46","2","3","0"], + ["31","1.26","2","3","0"], + ["32","1.00","2","3","0"], + ["33","0.61","2","3","0"], + ["34","0.35","2","3","0"], + ["35","0.23","2","3","0"], + ["36","0.00","2","3","0"], + ["37","2.64","3","2","0"], + ["38","2.23","3","2","0"], + ["39","1.78","3","2","0"], + ["40","1.49","3","2","0"], + ["41","1.29","3","2","0"], + ["42","1.11","3","2","0"], + ["43","0.95","3","2","0"], + ["44","0.78","3","2","0"], + ["45","0.62","3","2","0"], + ["46","0.47","3","2","0"], + ["47","0.22","3","2","0"], + ["48","0.00","3","2","0"] + ]} +} diff --git a/tests/unit/data/fiz/et42_v2/112e-a.json b/tests/unit/data/fiz/et42_v2/112e-a.json new file mode 100644 index 000000000..f1ed904ff --- /dev/null +++ b/tests/unit/data/fiz/et42_v2/112e-a.json @@ -0,0 +1,77 @@ +{ + "_source": "pkp/et42_v2/112e-a.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "82000", "Vmax": "100", "PWR": "2240", "SandCap": "850", "Type": "et42"}, + "Load": {"MaxLoad": "52", "LoadQ": "pieces", "LoadAccepted": "pantstate", "LoadSpeed": "1", "UnLoadSpeed": "0.1"}, + "Dimensions": {"L": "15.43", "H": "4.62", "W": "2.95", "Cx": "0.3"}, + "Wheels": {"D": "1.250", "AIM": "2000", "Tw": "1.435", "Axle": "Bo'Bo'", "Ad": "3.05", "Bd": "8.55", "Rmin": "125", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "LSt", "NBpA": "4", "MBF": "85.0", "MaxBP": "4.0", "MaxASBP": "1.5", "BCN": "4", "BCR": "0.127", "BCD": "0.12", "BCM": "5.76", "Vv": "1.2", "MinCP": "7.5", "MaxCP": "9.0", "BCS": "1", "BSA": "0.5", "BM": "P10-Bg", "BVV": "300", "CompressorSpeed": "0.0392", "CompressorPower": "Main", "BRE": "0.7"}, + "BuffCoupl1": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "99"}, + "BuffCoupl2": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "-127"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "BCPN": "6", "BrakeDelays": "GP", "BrakeHandle": "FV4a", "LocBrakeHandle": "FD1", "BDelay1": "15", "BDelay2": "4", "BDelay3": "35", "BDelay4": "25", "ASB": "Manual", "LocalBrake": "PneumaticBrake", "ManualBrake": "Yes", "DynamicBrake": "Switch", "MCPN": "38", "SCPN": "5", "AutoRelay": "No", "SCIM": "255", "IniCDelay": "0.5", "SCDelay": "0.1", "rows": [ + ["-1","0.60","-1","15","Pneumatic"], + ["0","0.50","-1","9","Pneumatic"], + ["1","0.46","-1","9","Pneumatic"], + ["2","0.42","-1","9","Pneumatic"], + ["3","0.38","-1","9","Pneumatic"], + ["4","0.34","-1","9","Pneumatic"], + ["5","0.28","-1","9","Pneumatic"], + ["6","0.00","-1","15","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "5", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "6", "RadioStop": "Yes"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Clima": {"Heating": "Main"}, + "Power": {"EnginePower": "CurrentCollector", "CollectorsNo": "1", "MaxVoltage": "3600", "MaxCurrent": "1300", "MinH": "0.42", "MinV": "1900", "MaxH": "1.77", "CSW": "1.4", "PhysicalLayout": "1"}, + "Engine": {"EngineType": "ElectricSeriesMotor", "Volt": "1500", "Trans": "25:86", "WindingRes": "0.5", "nmax": "1500"}, + "Switches": {"Pantograph": "Continuos", "MotorConnectors": "Toggle"}, + "MotorParamTable": {"rows": [ + ["0","21.86","205","142","150"], + ["1","21.49","244","139","187"], + ["2","21.48","299","138","234"], + ["3","19.77","320","136","297"], + ["4","23.75","581","126","333"], + ["5","24.47","768","123","412"] + ]}, + "Circuit": {"CircuitRes": "0.01", "ImaxLo": "650", "ImaxHi": "651", "IminLo": "415", "IminHi": "415"}, + "RList": {"Size": "38", "RVent": "Automatic", "RVentnmax": "3300", "RVentCutOff": "0.2", "rows": [ + ["0","0","0","0","0","0"], + ["1","10.566","1","4","0","5"], + ["2","10.566","1","4","0","3"], + ["3","10.566","1","4","0","0"], + ["4","9.136","1","4","0","0"], + ["5","7.706","1","4","0","0"], + ["6","6.881","1","4","0","0"], + ["7","6.056","1","4","0","0"], + ["8","5.682","1","4","0","0"], + ["9","5.308","1","4","0","0"], + ["10","4.932","1","4","0","0"], + ["11","4.556","1","4","0","0"], + ["12","4.211","1","4","0","0"], + ["13","3.866","1","4","0","0"], + ["14","3.538","1","4","0","0"], + ["15","3.21","1","4","0","0"], + ["16","2.899","1","4","0","0"], + ["17","2.588","1","4","0","0"], + ["18","2.296","1","4","0","0"], + ["19","2.004","1","4","0","0"], + ["20","1.72","1","4","0","0"], + ["21","1.436","1","4","0","0"], + ["22","1.055","1","4","0","0"], + ["23","0.674","1","4","0","0"], + ["24","0.337","1","4","0","0"], + ["25","0.00","1","4","0","255"], + ["26","5.283","2","2","0","0"], + ["27","4.568","2","2","0","0"], + ["28","3.853","2","2","0","0"], + ["29","3.028","2","2","0","0"], + ["30","2.654","2","2","0","0"], + ["31","2.278","2","2","0","0"], + ["32","1.933","2","2","0","0"], + ["33","1.605","2","2","0","0"], + ["34","1.294","2","2","0","0"], + ["35","1.002","2","2","0","0"], + ["36","0.718","2","2","0","0"], + ["37","0.337","2","2","0","0"], + ["38","0.0","2","2","0","255"] + ]} +} diff --git a/tests/unit/data/fiz/et42_v2/112e-b.json b/tests/unit/data/fiz/et42_v2/112e-b.json new file mode 100644 index 000000000..4c6ec9ede --- /dev/null +++ b/tests/unit/data/fiz/et42_v2/112e-b.json @@ -0,0 +1,77 @@ +{ + "_source": "pkp/et42_v2/112e-b.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "82000", "Vmax": "100", "PWR": "2240", "SandCap": "850", "Type": "et42"}, + "Load": {"MaxLoad": "52", "LoadQ": "pieces", "LoadAccepted": "pantstate", "LoadSpeed": "1", "UnLoadSpeed": "0.1"}, + "Dimensions": {"L": "15.43", "H": "4.62", "W": "2.95", "Cx": "0.3"}, + "Wheels": {"D": "1.250", "AIM": "2000", "Tw": "1.435", "Axle": "Bo'Bo'", "Ad": "3.05", "Bd": "8.55", "Rmin": "125", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "LSt", "NBpA": "4", "MBF": "85.0", "MaxBP": "4.0", "MaxASBP": "1.5", "BCN": "4", "BCR": "0.127", "BCD": "0.12", "BCM": "5.76", "Vv": "1.2", "MinCP": "7.5", "MaxCP": "9.0", "BCS": "1", "BSA": "0.5", "BM": "P10-Bg", "BVV": "300", "CompressorSpeed": "0.0392", "CompressorPower": "Main", "BRE": "0.7"}, + "BuffCoupl1": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "-127"}, + "BuffCoupl2": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "99"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "BCPN": "6", "BrakeDelays": "GP", "BrakeHandle": "FV4a", "LocBrakeHandle": "FD1", "BDelay1": "15", "BDelay2": "4", "BDelay3": "35", "BDelay4": "25", "ASB": "Manual", "LocalBrake": "PneumaticBrake", "ManualBrake": "Yes", "DynamicBrake": "Switch", "MCPN": "38", "SCPN": "5", "AutoRelay": "No", "SCIM": "255", "IniCDelay": "0.5", "SCDelay": "0.1", "rows": [ + ["-1","0.60","-1","15","Pneumatic"], + ["0","0.50","-1","9","Pneumatic"], + ["1","0.46","-1","9","Pneumatic"], + ["2","0.42","-1","9","Pneumatic"], + ["3","0.38","-1","9","Pneumatic"], + ["4","0.34","-1","9","Pneumatic"], + ["5","0.28","-1","9","Pneumatic"], + ["6","0.00","-1","15","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "5", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "6", "RadioStop": "Yes"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Clima": {"Heating": "Main"}, + "Power": {"EnginePower": "CurrentCollector", "CollectorsNo": "1", "MaxVoltage": "3600", "MaxCurrent": "1300", "MinH": "0.42", "MinV": "1900", "MaxH": "1.77", "CSW": "1.4", "PhysicalLayout": "1"}, + "Engine": {"EngineType": "ElectricSeriesMotor", "Volt": "1500", "Trans": "25:86", "WindingRes": "0.5", "nmax": "1500"}, + "Switches": {"Pantograph": "Continuos", "MotorConnectors": "Toggle"}, + "MotorParamTable": {"rows": [ + ["0","21.86","205","142","150"], + ["1","21.49","244","139","187"], + ["2","21.48","299","138","234"], + ["3","19.77","320","136","297"], + ["4","23.75","581","126","333"], + ["5","24.47","768","123","412"] + ]}, + "Circuit": {"CircuitRes": "0.01", "ImaxLo": "650", "ImaxHi": "651", "IminLo": "415", "IminHi": "415"}, + "RList": {"Size": "38", "RVent": "Automatic", "RVentnmax": "3300", "RVentCutOff": "0.2", "rows": [ + ["0","0","0","0","0","0"], + ["1","10.566","1","4","0","5"], + ["2","10.566","1","4","0","3"], + ["3","10.566","1","4","0","0"], + ["4","9.136","1","4","0","0"], + ["5","7.706","1","4","0","0"], + ["6","6.881","1","4","0","0"], + ["7","6.056","1","4","0","0"], + ["8","5.682","1","4","0","0"], + ["9","5.308","1","4","0","0"], + ["10","4.932","1","4","0","0"], + ["11","4.556","1","4","0","0"], + ["12","4.211","1","4","0","0"], + ["13","3.866","1","4","0","0"], + ["14","3.538","1","4","0","0"], + ["15","3.21","1","4","0","0"], + ["16","2.899","1","4","0","0"], + ["17","2.588","1","4","0","0"], + ["18","2.296","1","4","0","0"], + ["19","2.004","1","4","0","0"], + ["20","1.72","1","4","0","0"], + ["21","1.436","1","4","0","0"], + ["22","1.055","1","4","0","0"], + ["23","0.674","1","4","0","0"], + ["24","0.337","1","4","0","0"], + ["25","0.00","1","4","0","255"], + ["26","5.283","2","2","0","0"], + ["27","4.568","2","2","0","0"], + ["28","3.853","2","2","0","0"], + ["29","3.028","2","2","0","0"], + ["30","2.654","2","2","0","0"], + ["31","2.278","2","2","0","0"], + ["32","1.933","2","2","0","0"], + ["33","1.605","2","2","0","0"], + ["34","1.294","2","2","0","0"], + ["35","1.002","2","2","0","0"], + ["36","0.718","2","2","0","0"], + ["37","0.337","2","2","0","0"], + ["38","0.0","2","2","0","255"] + ]} +} diff --git a/tests/unit/data/fiz/eu04_v1/eu04-01.json b/tests/unit/data/fiz/eu04_v1/eu04-01.json new file mode 100644 index 000000000..bf5354005 --- /dev/null +++ b/tests/unit/data/fiz/eu04_v1/eu04-01.json @@ -0,0 +1,67 @@ +{ + "_source": "pkp/eu04_v1/eu04-01.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "87200", "Mred": "12000", "Vmax": "110", "PWR": "1680", "SandCap": "500", "type": "EU04"}, + "Dimensions": {"L": "16.238", "H": "4.343", "W": "2.903", "Cx": "0.3"}, + "Wheels": {"D": "1.350", "AIM": "2000", "Tw": "1.435", "Axle": "Bo'Bo'", "Ad": "3.05", "Bd": "8.55", "Rmin": "140", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "K", "NBpA": "4", "MBF": "85.0", "MaxBP": "2.8", "RM": "0.43", "LocMaxBP": "3.5", "BCN": "8", "BCR": "0.1524", "BCD": "0.12", "BCM": "8.7", "HiPP": "5", "LoPP": "3.5", "Vv": "0.83", "MinCP": "7.0", "MaxCP": "8.0", "CompressorSpeed": "0.03", "BCS": "0.8", "BSA": "0", "BM": "P10-Bgu", "BVV": "200", "BRE": "0.8"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "103"}, + "Cntrl": {"BrakeDelays": "GPRR", "BrakeHandle": "Knorr", "LocBrakeHandle": "Knorr", "BrakeSystem": "Pneumatic", "BCPN": "4", "BDelay1": "15", "BDelay2": "4", "BDelay3": "35", "BDelay4": "25", "ManualBrake": "Yes", "ASB": "Manual", "LocalBrake": "PneumaticBrake", "DynamicBrake": "Passive", "MCPN": "31", "SCPN": "8", "AutoRelay": "Optional", "IniCDelay": "0.4", "SCDelay": "0.4", "rows": [ + ["-1","0.90","0","15","Pneumatic"], + ["0","0.50","0","9","Pneumatic"], + ["1","-1","-1","0","Pneumatic"], + ["2","-1","-1","5","Pneumatic"], + ["3","0.001","-1","9","Pneumatic"], + ["4","0.00","-1","15","Pneumatic"] + ]}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Clima": {"Heating": "Main"}, + "Power": {"EnginePower": "CurrentCollector", "CollectorsNo": "2", "MaxVoltage": "3600", "MaxCurrent": "1000", "MinH": "0.38", "MaxH": "2.4", "CSW": "1.4", "PhysicalLayout": "3"}, + "Engine": {"EngineType": "ElectricSeriesMotor", "Volt": "1500", "Trans": "21:81", "WindingRes": "0.1411", "nmax": "2075"}, + "MotorParamTable0": {"rows": [ + ["0","23.9","200","-0.08","155.9","200","-0.08","1"], + ["1","23.28","200","-0.07","151.8","200","-0.07","1"], + ["2","22.45","200","-0.06","146.5","200","-0.06","1"], + ["3","22.18","200","0","144.7","200","0","1"], + ["4","23.09","300","-0.05","150.6","300","-0.05","1"], + ["5","22.89","290","-0.02","149.3","290","-0.02","1"], + ["6","23.59","360","-0.02","153.9","360","-0.02","1"], + ["7","23.95","410","0.01","156.2","410","0.01","1"], + ["8","21.94","410","0.05","143.1","410","0.05","0"] + ]}, + "Circuit": {"CircuitRes": "0.01", "ImaxLo": "650", "ImaxHi": "650", "IminLo": "350", "IminHi": "450"}, + "RList": {"Size": "31", "RVent": "Automatic", "RVentnmax": "3300", "RVentCutOff": "50", "rows": [ + ["0","0","0","0","0"], + ["1","16.9","1","4","1"], + ["2","12.4","1","4","1"], + ["3","9.77","1","4","1"], + ["4","8.0","1","4","1"], + ["5","6.4","1","4","1"], + ["6","4.94","1","4","1"], + ["7","4.38","1","4","1"], + ["8","3.9","1","4","1"], + ["9","3.37","1","4","1"], + ["10","2.86","1","4","1"], + ["11","2.5","1","4","1"], + ["12","2.1","1","4","1"], + ["13","1.78","1","4","1"], + ["14","1.49","1","4","1"], + ["15","1.18","1","4","1"], + ["16","0.89","1","4","1"], + ["17","0.66","1","4","1"], + ["18","0.42","1","4","1"], + ["19","0.2","1","4","1"], + ["20","0.0","1","4","1"], + ["21","6.09","2","2","1"], + ["22","3.9","2","2","1"], + ["23","3.1","2","2","1"], + ["24","2.57","2","2","1"], + ["25","2.185","2","2","1"], + ["26","1.58","2","2","1"], + ["27","1.115","2","2","1"], + ["28","0.795","2","2","1"], + ["29","0.5","2","2","1"], + ["30","0.23","2","2","1"], + ["31","0.0","2","2","0"] + ]} +} diff --git a/tests/unit/data/fiz/ew58_v1/ew58-d.json b/tests/unit/data/fiz/ew58_v1/ew58-d.json new file mode 100644 index 000000000..67a381d36 --- /dev/null +++ b/tests/unit/data/fiz/ew58_v1/ew58-d.json @@ -0,0 +1,20 @@ +{ + "_source": "pkp/ew58_v1/ew58-d.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "42200", "Mred": "1800", "Vmax": "120", "PWR": "2", "SandCap": "0", "Type": "ezt", "HeatingP": "18"}, + "Load": {"MaxLoad": "220", "LoadQ": "pieces", "LoadAccepted": "Passengers,Pantstate", "OverLoadFactor": "2", "LoadSpeed": "6", "UnLoadSpeed": "6"}, + "Dimensions": {"L": "21.7", "H": "4.12", "W": "2.96", "Cx": "0.1"}, + "Wheels": {"D": "0.92", "AIM": "2000", "Tw": "1.435", "Axle": "2'2'", "Ad": "2.75", "Bd": "15.6", "Rmin": "80", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "EP1", "NBpA": "4", "MBF": "85.0", "MaxBP": "3.8", "BCN": "4", "BCR": "0.1143", "BCD": "0.08", "BCM": "12.156", "HiPP": "5", "LoPP": "3.5", "Vv": "0.3", "MinCP": "7.0", "MaxCP": "8.0", "CompressorSpeed": "0.013", "TareMaxBP": "2.4", "BVV": "150", "BM": "P10-Bg", "BCS": "1.5", "BSA": "16.00", "BRE": "0.83"}, + "Doors": {"OpenCtrl": "DriverCtrl", "CloseCtrl": "DriverCtrl", "OpenSpeed": "0.35", "CloseSpeed": "0.35", "DoorCloseDelay": "0.5", "DoorMaxShiftL": "0.53", "DoorMaxShiftR": "0.53", "DoorOpenMethod": "Shift", "DoorClosureWarning": "Yes"}, + "BuffCoupl": {"ControlType": "ew58", "CType": "Automatic", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "-127"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "MaxBPMass": "68", "BCPN": "1", "BDelay1": "15", "BDelay2": "4", "ASB": "Manual", "LocalBrake": "ManualBrake", "DynamicBrake": "Passive", "MCPN": "4", "SCPN": "9", "SCIM": "1", "AutoRelay": "Yes", "IniCDelay": "0.0", "SCDelay": "0.8", "CoupledCtrl": "No", "BrakeDelays": "R", "rows": [ + ["-1","0.5","0.0","6","ElectroPneumatic"], + ["0","-1","-1","0","ElectroPneumatic"], + ["1","-1","0.35","4","ElectroPneumatic"] + ]}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Power": {"EnginePower": "CurrentCollector", "CollectorsNo": "2", "MaxVoltage": "3600", "MaxCurrent": "1200", "MinH": "0.38", "MaxH": "2.4", "CSW": "1.4", "MinPress": "3.5", "PhysicalLayout": "3"}, + "DCEMUED": {"CouplerCheck": "3", "EP_max_Vel": "48"}, + "Switches": {"Pantograph": "Continous"} +} diff --git a/tests/unit/data/fiz/ew58_v1/ew58-sa.json b/tests/unit/data/fiz/ew58_v1/ew58-sa.json new file mode 100644 index 000000000..95cc27446 --- /dev/null +++ b/tests/unit/data/fiz/ew58_v1/ew58-sa.json @@ -0,0 +1,68 @@ +{ + "_source": "pkp/ew58_v1/ew58-sa.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "52400", "Mred": "4980", "Vmax": "120", "PWR": "820", "SandCap": "500", "Type": "ezt", "HeatingP": "21"}, + "Load": {"MaxLoad": "220", "LoadQ": "pieces", "LoadAccepted": "Passengers,Pantstate", "OverLoadFactor": "2", "LoadSpeed": "6", "UnLoadSpeed": "6"}, + "Dimensions": {"L": "21.55", "H": "4", "W": "2.9", "Cx": "0.1"}, + "Wheels": {"D": "1.0", "AIM": "2000", "Tw": "1.435", "Axle": "Bo'Bo'", "Ad": "2.83", "Bd": "13.9", "Rmin": "80", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "EP1", "NBpA": "4", "MBF": "85.0", "MaxBP": "3.8", "BCN": "4", "BCR": "0.1143", "BCD": "0.08", "BCM": "12.156", "HiPP": "5", "LoPP": "3.5", "TareMaxBP": "2.9", "BVV": "150", "BM": "P10-Bg", "BCS": "1.5", "BSA": "16.00", "BRE": "0.83"}, + "Doors": {"OpenCtrl": "DriverCtrl", "CloseCtrl": "DriverCtrl", "OpenSpeed": "0.35", "CloseSpeed": "0.35", "DoorCloseDelay": "0.5", "DoorMaxShiftL": "0.53", "DoorMaxShiftR": "0.53", "DoorOpenMethod": "Shift", "DoorClosureWarning": "Yes"}, + "BuffCoupl1": {"ControlType": "ew58", "CType": "Automatic", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "39"}, + "BuffCoupl2": {"ControlType": "ew58", "CType": "Automatic", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "-127"}, + "Cntrl": {"BrakeHandle": "FVE408", "BrakeSystem": "ElectroPneumatic", "MaxBPMass": "68", "BCPN": "6", "BDelay1": "15", "BDelay2": "4", "ASB": "Manual", "LocalBrake": "ManualBrake", "MCPN": "4", "SCPN": "9", "DBAM": "2", "IniCDelay": "0.0", "SCDelay": "0.3", "CoupledCtrl": "No", "SCIM": "1", "AutoRelay": "Yes", "DynamicBrake": "Automatic", "ConverterStart": "Disabled", "BatteryStart": "Disabled", "rows": [ + ["-1","0.5","0.0","6","ElectroPneumatic"], + ["0","0.5","-1","4","ElectroPneumatic"], + ["1","0.5","0.35","4","ElectroPneumatic"], + ["2","0.5","0.35","4","Pneumatic"], + ["3","0.5","0.35","4","Pneumatic"], + ["4","-1","0.35","4","Pneumatic"], + ["5","0.34","-1","4","Pneumatic"], + ["6","-1","-1","0","Pneumatic"] + ]}, + "Security": {"AwareSystem": "CabSignal", "AwareDelay": "60", "SoundSignalDelay": "5", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "6", "RadioStop": "Yes"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Clima": {"Heating": "Main"}, + "Power": {"EnginePower": "CurrentCollector", "CollectorsNo": "0", "MaxVoltage": "3750", "MaxCurrent": "800"}, + "Engine": {"EngineType": "ElectricSeriesMotor", "Volt": "750", "Trans": "18:69", "WindingRes": "0.1097", "nmax": "2390"}, + "Blending": {"MED_amax": "1.00"}, + "DCEMUED": {"CouplerCheck": "2", "EP_min_Im": "80"}, + "Switches": {"Pantograph": "Continous", "RelayResetButton1": "101"}, + "MotorParamTable0": {"rows": [ + ["0","11.3","90","0.21","79.5","90","0.21","1"], + ["1","12.39","110","0.24","83.9","110","0.24","1"], + ["2","11.88","123","0.23","80.5","123","0.23","1"], + ["3","11.37","135","0.22","77.2","135","0.22","1"], + ["4","11.05","180","0.2","74.6","180","0.2","1"], + ["5","10.73","225","0.18","72.1","225","0.18","1"], + ["6","10.26","250","0.18","68.7","250","0.18","1"], + ["7","9.8","275","0.19","65.4","275","0.19","1"], + ["8","9.34","300","0.19","62","300","0.19","1"], + ["9","8.15","455","0.1","55.5","455","0.1","0"] + ]}, + "Circuit": {"CircuitRes": "0.01", "ImaxLo": "580", "ImaxHi": "581", "IminLo": "360", "IminHi": "455", "TUHEX_Sum1": "365", "TUHEX_Sum2": "500", "TUHEX_Sum3": "610", "TUHEX_Diff": "10", "TUHEX_MaxIw": "280", "TUHEX_MinIw": "11", "TUHEX_Stages": "3"}, + "RList": {"Size": "22", "RVent": "No", "DynBrakeRes1": "4.3", "DynBrakeRes2": "1.956", "rows": [ + ["0","0","0","0","0","0"], + ["1","17.001","1","4","0","0"], + ["2","10.677","1","4","1","0"], + ["2","7.573","1","4","1","0"], + ["2","5.505","1","4","1","0"], + ["2","4.477","1","4","1","0"], + ["2","3.589","1","4","1","0"], + ["2","2.821","1","4","1","0"], + ["2","2.157","1","4","1","0"], + ["2","1.585","1","4","1","0"], + ["2","1.116","1","4","1","0"], + ["2","0.688","1","4","1","0"], + ["2","0.320","1","4","1","0"], + ["2","0.000","1","4","1","0"], + ["3","0.000","1","4","1","1"], + ["3","0.000","1","4","1","2"], + ["3","0.000","1","4","1","3"], + ["3","0.000","1","4","1","4"], + ["3","0.000","1","4","1","5"], + ["4","0.000","1","4","1","6"], + ["4","0.000","1","4","1","7"], + ["4","0.000","1","4","1","8"], + ["4","0.000","1","4","1","9"] + ]} +} diff --git a/tests/unit/data/fiz/ew58_v1/ew58-sb.json b/tests/unit/data/fiz/ew58_v1/ew58-sb.json new file mode 100644 index 000000000..f08052daa --- /dev/null +++ b/tests/unit/data/fiz/ew58_v1/ew58-sb.json @@ -0,0 +1,68 @@ +{ + "_source": "pkp/ew58_v1/ew58-sb.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "52400", "Mred": "4980", "Vmax": "120", "PWR": "820", "SandCap": "500", "Type": "ezt", "HeatingP": "21"}, + "Load": {"MaxLoad": "220", "LoadQ": "pieces", "LoadAccepted": "Passengers,Pantstate", "OverLoadFactor": "2", "LoadSpeed": "6", "UnLoadSpeed": "6"}, + "Dimensions": {"L": "21.55", "H": "4", "W": "2.9", "Cx": "0.1"}, + "Wheels": {"D": "1.0", "AIM": "2000", "Tw": "1.435", "Axle": "Bo'Bo'", "Ad": "2.83", "Bd": "13.9", "Rmin": "80", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "EP1", "NBpA": "4", "MBF": "85.0", "MaxBP": "3.8", "BCN": "4", "BCR": "0.1143", "BCD": "0.08", "BCM": "12.156", "HiPP": "5", "LoPP": "3.5", "TareMaxBP": "2.5", "BVV": "150", "BM": "P10-Bg", "BCS": "1.5", "BSA": "16.00", "BRE": "0.83"}, + "Doors": {"OpenCtrl": "DriverCtrl", "CloseCtrl": "DriverCtrl", "OpenSpeed": "0.35", "CloseSpeed": "0.35", "DoorCloseDelay": "0.5", "DoorMaxShiftL": "0.53", "DoorMaxShiftR": "0.53", "DoorOpenMethod": "Shift", "DoorClosureWarning": "Yes"}, + "BuffCoupl1": {"CControlType": "ew58", "Type": "Automatic", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "-127"}, + "BuffCoupl2": {"ControlType": "ew58", "CType": "Automatic", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "39"}, + "Cntrl": {"BrakeHandle": "FVE408", "BrakeSystem": "ElectroPneumatic", "MaxBPMass": "68", "BCPN": "6", "BDelay1": "15", "BDelay2": "4", "ASB": "Manual", "LocalBrake": "ManualBrake", "MCPN": "4", "SCPN": "9", "DBAM": "2", "IniCDelay": "0.0", "SCDelay": "0.3", "CoupledCtrl": "No", "SCIM": "1", "AutoRelay": "Yes", "DynamicBrake": "Automatic", "ConverterStart": "Disabled", "BatteryStart": "Disabled", "rows": [ + ["-1","0.5","0.0","6","ElectroPneumatic"], + ["0","0.5","-1","4","ElectroPneumatic"], + ["1","0.5","0.35","4","ElectroPneumatic"], + ["2","0.5","0.35","4","Pneumatic"], + ["3","0.5","0.35","4","Pneumatic"], + ["4","-1","0.35","4","Pneumatic"], + ["5","0.34","-1","4","Pneumatic"], + ["6","-1","-1","0","Pneumatic"] + ]}, + "Security": {"AwareSystem": "CabSignal", "AwareDelay": "60", "SoundSignalDelay": "5", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "6", "RadioStop": "Yes"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Clima": {"Heating": "Main"}, + "Power": {"EnginePower": "CurrentCollector", "CollectorsNo": "0", "MaxVoltage": "3750", "MaxCurrent": "800"}, + "Engine": {"EngineType": "ElectricSeriesMotor", "Volt": "750", "Trans": "18:69", "WindingRes": "0.1097", "nmax": "2390"}, + "Blending": {"MED_amax": "1.00"}, + "DCEMUED": {"CouplerCheck": "1", "EP_min_Im": "80"}, + "Switches": {"Pantograph": "Continous", "RelayResetButton1": "101"}, + "MotorParamTable0": {"rows": [ + ["0","11.3","90","0.21","79.5","90","0.21","1"], + ["1","12.39","110","0.24","83.9","110","0.24","1"], + ["2","11.88","123","0.23","80.5","123","0.23","1"], + ["3","11.37","135","0.22","77.2","135","0.22","1"], + ["4","11.05","180","0.2","74.6","180","0.2","1"], + ["5","10.73","225","0.18","72.1","225","0.18","1"], + ["6","10.26","250","0.18","68.7","250","0.18","1"], + ["7","9.8","275","0.19","65.4","275","0.19","1"], + ["8","9.34","300","0.19","62","300","0.19","1"], + ["9","8.15","455","0.1","55.5","455","0.1","0"] + ]}, + "Circuit": {"CircuitRes": "0.01", "ImaxLo": "580", "ImaxHi": "581", "IminLo": "360", "IminHi": "455", "TUHEX_Sum1": "365", "TUHEX_Sum2": "500", "TUHEX_Sum3": "610", "TUHEX_Diff": "10", "TUHEX_MaxIw": "280", "TUHEX_MinIw": "11", "TUHEX_Stages": "3"}, + "RList": {"Size": "22", "RVent": "No", "DynBrakeRes1": "4.3", "DynBrakeRes2": "1.956", "rows": [ + ["0","0","0","0","0","0"], + ["1","17.001","1","4","0","0"], + ["2","10.677","1","4","1","0"], + ["2","7.573","1","4","1","0"], + ["2","5.505","1","4","1","0"], + ["2","4.477","1","4","1","0"], + ["2","3.589","1","4","1","0"], + ["2","2.821","1","4","1","0"], + ["2","2.157","1","4","1","0"], + ["2","1.585","1","4","1","0"], + ["2","1.116","1","4","1","0"], + ["2","0.688","1","4","1","0"], + ["2","0.320","1","4","1","0"], + ["2","0.000","1","4","1","0"], + ["3","0.000","1","4","1","1"], + ["3","0.000","1","4","1","2"], + ["3","0.000","1","4","1","3"], + ["3","0.000","1","4","1","4"], + ["3","0.000","1","4","1","5"], + ["4","0.000","1","4","1","6"], + ["4","0.000","1","4","1","7"], + ["4","0.000","1","4","1","8"], + ["4","0.000","1","4","1","9"] + ]} +} diff --git a/tests/unit/data/fiz/impuls_v1/31we-a_pr.json b/tests/unit/data/fiz/impuls_v1/31we-a_pr.json new file mode 100644 index 000000000..368c0f24f --- /dev/null +++ b/tests/unit/data/fiz/impuls_v1/31we-a_pr.json @@ -0,0 +1,50 @@ +{ + "_source": "pkp/impuls_v1/31we-a_pr.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "31800", "Vmax": "160", "PWR": "1000", "SandCap": "200", "Type": "ezt"}, + "Load": {"MaxLoad": "42", "LoadQ": "pieces", "LoadAccepted": "Passengers", "OverLoadFactor": "2", "LoadSpeed": "1", "UnLoadSpeed": "1"}, + "Dimensions": {"L": "21.06", "H": "4", "W": "2.9", "Cx": "0.1"}, + "Wheels": {"D": "0.840", "AIM": "2000", "Tw": "1.435", "Axle": "Bo'", "Ad": "2.83", "Bd": "13.9", "Rmin": "80", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "EStED", "NBpA": "4", "MBF": "85.0", "MaxBP": "4.37", "MaxLBP": "4.37", "BCN": "4", "BCR": "0.127", "BCD": "0.05", "BCM": "1.9075", "HiPP": "5", "LoPP": "3.5", "Vv": "0.125", "MinCP": "7.5", "MaxCP": "9.0", "MinCP_B": "8.5", "MaxCP_B": "10.0", "CompressorSpeed": "0.00625", "BVV": "125", "BM": "Cosid", "BCS": "1", "BSA": "0.00", "BRE": "0.95", "TareMaxBP": "3.85", "CompressorPower": "Converter", "LPOn": "2.8", "LPOff": "4.3", "UBB1": "2", "EmergencyCutsOffHandle": "Yes"}, + "SpringBrake": {"Volume": "10", "MBF": "2.9", "MaxSP": "5.5", "ResetP": "4.0", "MinFP": "3.5", "PressOff": "4.5", "PressOn": "4.2", "ValveOnArea": "0.0005", "ValveOffArea": "0.0005", "ValvePNBArea": "0.002", "MTC": "4"}, + "Doors": {"OpenCtrl": "Mixed", "CloseCtrl": "DriverCtrl", "OpenSpeed": "0.21", "CloseSpeed": "0.19", "DoorCloseDelay": "2.1", "DoorOpenWithPermit": "1", "DoorMaxShiftL": "0.7", "DoorMaxShiftR": "0.7", "DoorOpenMethod": "Plug", "DoorMaxShiftPlug": "0.028", "DoorStayOpen": "5.0", "DoorClosureWarningAuto": "Yes", "DoorBlocked": "Yes", "DoorAutoCloseRemote": "Yes", "PlatformMaxShift": "0.270", "PlatformSpeed": "0.4", "PlatformOpenMethod": "Shift", "MirrorMaxShift": "45", "DoorNeedPermit": "Yes", "MirrorVelClose": "20", "DoorsPermitLightBlinking": "2"}, + "BuffCoupl1": {"CType": "Automatic", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "39", "AutomaticFlag": "39", "ControlType": "31we_pr"}, + "BuffCoupl2": {"CType": "Articulated", "AllowedFlag": "-255", "ControlType": "impuls"}, + "Cntrl": {"BrakeHandle": "MHZ_6P", "LocBrakeHandle": "FD1", "BrakeSystem": "ElectroPneumatic", "MaxBPMass": "37.8", "BCPN": "4", "BDelay1": "15", "BDelay2": "4", "LocalBrake": "PneumaticBrake", "MCPN": "10", "SCPN": "1", "IniCDelay": "0.0", "SCDelay": "0.8", "CoupledCtrl": "No", "EIMCtrlAddZeros": "Yes", "SBD": "0.65", "ASB": "Yes", "ConverterStart": "Automatic", "ConverterStartDelay": "8", "MainInitTime": "2", "BrakeOpModes": "PN", "MotorBlowersStart": "Converter", "EIMCtrlEmergency": "Yes", "PantEPValveStart": "Automatic", "PantEPValveSpring": "No", "SpringBrakeCutsOffDrive": "No", "SpringBrakeDriveEmergencyVel": "2", "ReleaseParkingBySpringBrakeWhenDoorIsOpen": "Yes", "CompartmentLightsStart": "Manual", "HAO": "Yes", "OMP": "0.8", "AutomaticCabActivation": "No", "InactivaCabEmergencyBrake": "Yes", "InactiveCabFlag": "239", "rows": [ + ["-1","0.5","0.0","6","ElectroPneumatic"], + ["0","0.5","-1","4","ElectroPneumatic"], + ["1","0.5","0.35","4","ElectroPneumatic"], + ["2","0.5","0.35","4","Pneumatic"], + ["3","0.5","0.35","4","Pneumatic"], + ["4","-1","0.35","4","Pneumatic"], + ["5","0.34","-1","4","Pneumatic"], + ["6","-1","-1","0","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "2.4", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "2.1", "CabDependent": "Yes", "RadioStop": "Yes", "MagnetLocation": "4.5"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "24", "LMaxCurrent": "300"}, + "Power": {"EnginePower": "CurrentCollector", "CollectorsNo": "0", "MaxVoltage": "3900", "MinV": "2100", "MaxCurrent": "1200", "MinH": "0.38", "MaxH": "2.4", "CSW": "1.4"}, + "Engine": {"EngineType": "ElectricInductionMotor", "InvNo": "2", "Trans": "60:252", "dfic": "794", "dfmax": "1.500", "p": "2", "cfu": "40.1", "cim": "12.24", "icif": "0.679", "Uzmax": "2200", "Uzh": "1500", "DU": "20", "I0": "10", "fcfu": "47.6", "fcfuh": "31.4", "F0": "100", "a1": "0", "Pmax": "1260", "Fh": "48", "Ph": "800", "Vh0": "5", "Vh1": "15", "Imax": "475", "abed": "0", "edep": "3.0", "eimclf": "Yes", "MotorBlowersSpeed": "-15", "MotorBlowersSustainTime": "300", "MotorBlowersStartVelocity": "0.1"}, + "SpeedControl": {"SpeedCtrl": "Yes", "SpeedButtons": "10|20|40|60|80|100|120|140|160", "OverrideManual": "No", "InitPwr": "1.0", "MaxPwrVel": "-1", "StartVel": "-1", "VelStep": "10", "PwrStep": "0.0", "MinPwr": "0.2", "MaxPwr": "1.0", "MinVel": "0", "MaxVel": "160", "Offset": "-0.5", "kPpos": "0.2", "kPneg": "0.4", "kIpos": "0.00", "kIneg": "0.00", "BrakeIntervention": "No", "SpeedCtrlATOF": "2"}, + "AI": {"Pantstate": "2", "LocalBrakeAccFactor": "0.5", "IdlePantUp": "No"}, + "Blending": {"MED_amax": "1.08", "MED_EPVC": "No", "MED_Ncor": "No", "MED_FrEDFactor": "0", "MED_FirstDelayED": "0.5", "MED_ScndDelayED": "0.25"}, + "Switches": {"PantographPresets": "0|1|2|3"}, + "Circuit": {"ImaxHi": "500"}, + "LightsList": {"Size": "8", "Wrap": "No", "Default": "1", "rows": [ + ["0","0"], + ["388","34"], + ["21","34"], + ["1","16"], + ["16","1"], + ["22","34"], + ["38","38"], + ["34","34"] + ]}, + "ffList": {"Size": "5", "rows": [ + ["0","0.5"], + ["24","1.0"], + ["35","1.0"], + ["42","1.3"], + ["42","1.3"], + ["74","2.3"] + ]} +} diff --git a/tests/unit/data/fiz/impuls_v1/31we-b_pr.json b/tests/unit/data/fiz/impuls_v1/31we-b_pr.json new file mode 100644 index 000000000..60138291f --- /dev/null +++ b/tests/unit/data/fiz/impuls_v1/31we-b_pr.json @@ -0,0 +1,20 @@ +{ + "_source": "pkp/impuls_v1/31we-b_pr.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "38700", "Vmax": "160", "PWR": "2", "SandCap": "0", "Type": "ezt"}, + "Load": {"MaxLoad": "48", "LoadQ": "pieces", "LoadAccepted": "Passengers", "OverLoadFactor": "2", "LoadSpeed": "1", "UnLoadSpeed": "2"}, + "Dimensions": {"L": "15.92", "H": "4.12", "W": "2.96", "Cx": "0.1"}, + "Wheels": {"D": "0.84", "AIM": "500", "Tw": "1.435", "Axle": "2'1'", "Ad": "2.75", "Bd": "15.92", "Rmin": "80", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "EStED", "NBpA": "2", "MBF": "85.0", "MaxBP": "4.06", "MaxLBP": "4.06", "BCN": "6", "BCR": "0.127", "BCD": "0.05", "BCM": "1.9075", "HiPP": "5", "LoPP": "3.5", "Vv": "0.01", "MinCP": "10.0", "MaxCP": "12.0", "CompressorSpeed": "0.0000001", "BVV": "187", "BM": "Cosid", "BCS": "1", "BSA": "0.00", "BRE": "0.95", "TareMaxBP": "3.09", "CompressorPower": "Converter"}, + "SpringBrake": {"Volume": "10", "MBF": "2.9", "MaxSP": "5.5", "ResetP": "4.0", "MinFP": "3.5", "PressOff": "4.8", "PressOn": "4.5", "ValveOnArea": "0.0005", "ValveOffArea": "0.0005", "ValvePNBArea": "0.002", "MTC": "4"}, + "Doors": {"OpenCtrl": "Mixed", "CloseCtrl": "DriverCtrl", "OpenSpeed": "0.21", "CloseSpeed": "0.19", "DoorCloseDelay": "2.1", "DoorOpenWithPermit": "1", "DoorMaxShiftL": "0.7", "DoorMaxShiftR": "0.7", "DoorOpenMethod": "Plug", "DoorMaxShiftPlug": "0.028", "DoorStayOpen": "5.0", "DoorClosureWarningAuto": "Yes", "DoorBlocked": "Yes", "DoorAutoCloseRemote": "Yes", "PlatformMaxShift": "0.270", "PlatformSpeed": "0.4", "PlatformOpenMethod": "Shift", "MirrorMaxShift": "45", "DoorNeedPermit": "Yes"}, + "BuffCoupl": {"CType": "Articulated", "AllowedFlag": "-255", "ControlType": "impuls"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "LocBrakeHandle": "FD1", "MaxBPMass": "53", "BCPN": "2", "BDelay1": "15", "BDelay2": "4", "LocalBrake": "PneumaticBrake", "DynamicBrake": "Passive", "MCPN": "10", "SCPN": "0", "AutoRelay": "Yes", "IniCDelay": "0.0", "SCDelay": "0.8", "CoupledCtrl": "Yes", "ASB": "Yes", "CompartmentLightsStart": "Manual", "HAO": "Yes", "OMP": "0.8", "PantEPValveStart": "Automatic", "PantEPValveSpring": "No", "PantCompressorStart": "Automatic", "PantAutoValve": "Yes", "rows": [ + ["-1","0.5","0.0","6","ElectroPneumatic"], + ["0","-1","-1","0","ElectroPneumatic"], + ["1","-1","0.35","4","ElectroPneumatic"], + ["2","-1","-1","0","ElectroPneumatic"] + ]}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "24", "LMaxCurrent": "300"}, + "Power": {"EnginePower": "CurrentCollector", "CollectorsNo": "1", "MaxVoltage": "3900", "MinV": "2100", "MaxCurrent": "1200", "MinH": "0.38", "MaxH": "2.4", "CSW": "1.4", "PhysicalLayout": "1"} +} diff --git a/tests/unit/data/fiz/impuls_v1/31we-c_pr.json b/tests/unit/data/fiz/impuls_v1/31we-c_pr.json new file mode 100644 index 000000000..0272b3e24 --- /dev/null +++ b/tests/unit/data/fiz/impuls_v1/31we-c_pr.json @@ -0,0 +1,20 @@ +{ + "_source": "pkp/impuls_v1/31we-c_pr.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "38700", "Vmax": "160", "PWR": "2", "SandCap": "0", "Type": "ezt"}, + "Load": {"MaxLoad": "46", "LoadQ": "pieces", "LoadAccepted": "Passengers", "OverLoadFactor": "2", "LoadSpeed": "1", "UnLoadSpeed": "2"}, + "Dimensions": {"L": "15.92", "H": "4.12", "W": "2.96", "Cx": "0.1"}, + "Wheels": {"D": "0.84", "AIM": "500", "Tw": "1.435", "Axle": "1'2'", "Ad": "2.75", "Bd": "15.92", "Rmin": "80", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "EStED", "NBpA": "2", "MBF": "85.0", "MaxBP": "4.06", "MaxLBP": "4.06", "BCN": "6", "BCR": "0.127", "BCD": "0.05", "BCM": "1.9075", "HiPP": "5", "LoPP": "3.5", "Vv": "0.01", "MinCP": "10.0", "MaxCP": "12.0", "CompressorSpeed": "0.0000001", "BVV": "187", "BM": "Cosid", "BCS": "1", "BSA": "0.00", "BRE": "0.95", "TareMaxBP": "3.09", "CompressorPower": "Converter"}, + "SpringBrake": {"Volume": "10", "MBF": "2.9", "MaxSP": "5.5", "ResetP": "4.0", "MinFP": "3.5", "PressOff": "4.8", "PressOn": "4.5", "ValveOnArea": "0.0005", "ValveOffArea": "0.0005", "ValvePNBArea": "0.002", "MTC": "4"}, + "Doors": {"OpenCtrl": "Mixed", "CloseCtrl": "DriverCtrl", "OpenSpeed": "0.21", "CloseSpeed": "0.19", "DoorCloseDelay": "2.1", "DoorOpenWithPermit": "1", "DoorMaxShiftL": "0.7", "DoorMaxShiftR": "0.7", "DoorOpenMethod": "Plug", "DoorMaxShiftPlug": "0.028", "DoorStayOpen": "5.0", "DoorClosureWarningAuto": "Yes", "DoorBlocked": "Yes", "DoorAutoCloseRemote": "Yes", "PlatformMaxShift": "0.270", "PlatformSpeed": "0.4", "PlatformOpenMethod": "Shift", "MirrorMaxShift": "45", "DoorNeedPermit": "Yes"}, + "BuffCoupl": {"CType": "Articulated", "AllowedFlag": "-255", "ControlType": "impuls"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "LocBrakeHandle": "FD1", "MaxBPMass": "53", "BCPN": "2", "BDelay1": "15", "BDelay2": "4", "LocalBrake": "PneumaticBrake", "DynamicBrake": "Passive", "MCPN": "10", "SCPN": "0", "AutoRelay": "Yes", "IniCDelay": "0.0", "SCDelay": "0.8", "CoupledCtrl": "Yes", "ASB": "Yes", "CompartmentLightsStart": "Manual", "HAO": "Yes", "OMP": "0.8", "PantEPValveStart": "Automatic", "PantEPValveSpring": "No", "PantCompressorStart": "Automatic", "PantAutoValve": "Yes", "rows": [ + ["-1","0.5","0.0","6","ElectroPneumatic"], + ["0","-1","-1","0","ElectroPneumatic"], + ["1","-1","0.35","4","ElectroPneumatic"], + ["2","-1","-1","0","ElectroPneumatic"] + ]}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "24", "LMaxCurrent": "300"}, + "Power": {"EnginePower": "CurrentCollector", "CollectorsNo": "1", "MaxVoltage": "3900", "MinV": "2100", "MaxCurrent": "1200", "MinH": "0.38", "MaxH": "2.4", "CSW": "1.4", "PhysicalLayout": "2"} +} diff --git a/tests/unit/data/fiz/impuls_v1/31we-d_pr.json b/tests/unit/data/fiz/impuls_v1/31we-d_pr.json new file mode 100644 index 000000000..d78930b9b --- /dev/null +++ b/tests/unit/data/fiz/impuls_v1/31we-d_pr.json @@ -0,0 +1,50 @@ +{ + "_source": "pkp/impuls_v1/31we-d_pr.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "31800", "Vmax": "160", "PWR": "1000", "SandCap": "200", "Type": "ezt"}, + "Load": {"MaxLoad": "54", "LoadQ": "pieces", "LoadAccepted": "Passengers", "OverLoadFactor": "2", "LoadSpeed": "1", "UnLoadSpeed": "1"}, + "Dimensions": {"L": "21.06", "H": "4", "W": "2.9", "Cx": "0.1"}, + "Wheels": {"D": "0.840", "AIM": "2000", "Tw": "1.435", "Axle": "Bo'", "Ad": "2.83", "Bd": "13.9", "Rmin": "80", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "EStED", "NBpA": "4", "MBF": "85.0", "MaxBP": "4.37", "MaxLBP": "4.37", "BCN": "4", "BCR": "0.127", "BCD": "0.05", "BCM": "1.9075", "HiPP": "5", "LoPP": "3.5", "Vv": "0.125", "MinCP": "8.5", "MaxCP": "10.0", "MinCP_B": "7.5", "MaxCP_B": "9.0", "CompressorSpeed": "0.00625", "BVV": "125", "BM": "Cosid", "BCS": "1", "BSA": "0.00", "BRE": "0.95", "TareMaxBP": "3.85", "CompressorPower": "Converter", "LPOn": "2.8", "LPOff": "4.3", "UBB1": "2", "EmergencyCutsOffHandle": "Yes"}, + "SpringBrake": {"Volume": "10", "MBF": "2.9", "MaxSP": "5.5", "ResetP": "4.0", "MinFP": "3.5", "PressOff": "4.5", "PressOn": "4.2", "ValveOnArea": "0.0005", "ValveOffArea": "0.0005", "ValvePNBArea": "0.002", "MTC": "4"}, + "Doors": {"OpenCtrl": "Mixed", "CloseCtrl": "DriverCtrl", "OpenSpeed": "0.21", "CloseSpeed": "0.19", "DoorCloseDelay": "2.1", "DoorOpenWithPermit": "1", "DoorMaxShiftL": "0.7", "DoorMaxShiftR": "0.7", "DoorOpenMethod": "Plug", "DoorMaxShiftPlug": "0.028", "DoorStayOpen": "5.0", "DoorClosureWarningAuto": "Yes", "DoorBlocked": "Yes", "DoorAutoCloseRemote": "Yes", "PlatformMaxShift": "0.270", "PlatformSpeed": "0.4", "PlatformOpenMethod": "Shift", "MirrorMaxShift": "45", "DoorNeedPermit": "Yes", "MirrorVelClose": "20", "DoorsPermitLightBlinking": "2"}, + "BuffCoupl1": {"CType": "Articulated", "AllowedFlag": "-255", "ControlType": "impuls"}, + "BuffCoupl2": {"CType": "Automatic", "kB": "4200", "DmaxB": "0.05", "FmaxB": "1740", "kC": "6800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "39", "AutomaticFlag": "39", "ControlType": "31we_pr"}, + "Cntrl": {"BrakeHandle": "MHZ_6P", "LocBrakeHandle": "FD1", "BrakeSystem": "ElectroPneumatic", "MaxBPMass": "37.8", "BCPN": "4", "BDelay1": "15", "BDelay2": "4", "LocalBrake": "PneumaticBrake", "MCPN": "10", "SCPN": "1", "IniCDelay": "0.0", "SCDelay": "0.8", "CoupledCtrl": "No", "EIMCtrlAddZeros": "Yes", "SBD": "0.65", "ASB": "Yes", "ConverterStart": "Automatic", "ConverterStartDelay": "8", "MainInitTime": "2", "BrakeOpModes": "PN", "MotorBlowersStart": "Converter", "EIMCtrlEmergency": "Yes", "PantEPValveStart": "Automatic", "PantEPValveSpring": "No", "SpringBrakeCutsOffDrive": "No", "SpringBrakeDriveEmergencyVel": "2", "ReleaseParkingBySpringBrakeWhenDoorIsOpen": "Yes", "CompartmentLightsStart": "Manual", "HAO": "Yes", "OMP": "0.8", "AutomaticCabActivation": "No", "InactivaCabEmergencyBrake": "Yes", "InactiveCabFlag": "239", "rows": [ + ["-1","0.5","0.0","6","ElectroPneumatic"], + ["0","0.5","-1","4","ElectroPneumatic"], + ["1","0.5","0.35","4","ElectroPneumatic"], + ["2","0.5","0.35","4","Pneumatic"], + ["3","0.5","0.35","4","Pneumatic"], + ["4","-1","0.35","4","Pneumatic"], + ["5","0.34","-1","4","Pneumatic"], + ["6","-1","-1","0","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "2.4", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "2.1", "CabDependent": "Yes", "RadioStop": "Yes", "MagnetLocation": "4.5"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "24", "LMaxCurrent": "300"}, + "Power": {"EnginePower": "CurrentCollector", "CollectorsNo": "0", "MaxVoltage": "3900", "MinV": "2100", "MaxCurrent": "1200", "MinH": "0.38", "MaxH": "2.4", "CSW": "1.4"}, + "Engine": {"EngineType": "ElectricInductionMotor", "InvNo": "2", "Trans": "60:252", "dfic": "794", "dfmax": "1.500", "p": "2", "cfu": "40.1", "cim": "12.24", "icif": "0.679", "Uzmax": "2200", "Uzh": "1500", "DU": "20", "I0": "10", "fcfu": "47.6", "fcfuh": "31.4", "F0": "100", "a1": "0", "Pmax": "1260", "Fh": "48", "Ph": "800", "Vh0": "5", "Vh1": "15", "Imax": "475", "abed": "0", "edep": "3.0", "eimclf": "Yes", "MotorBlowersSpeed": "-15", "MotorBlowersSustainTime": "300", "MotorBlowersStartVelocity": "0.1"}, + "SpeedControl": {"SpeedCtrl": "Yes", "SpeedButtons": "10|20|40|60|80|100|120|140|160", "OverrideManual": "No", "InitPwr": "1.0", "MaxPwrVel": "-1", "StartVel": "-1", "VelStep": "10", "PwrStep": "0.0", "MinPwr": "0.2", "MaxPwr": "1.0", "MinVel": "0", "MaxVel": "160", "Offset": "-0.5", "kPpos": "0.2", "kPneg": "0.4", "kIpos": "0.00", "kIneg": "0.00", "BrakeIntervention": "No", "SpeedCtrlATOF": "2"}, + "AI": {"Pantstate": "1", "LocalBrakeAccFactor": "0.5", "IdlePantUp": "No"}, + "Blending": {"MED_amax": "1.08", "MED_EPVC": "No", "MED_Ncor": "No", "MED_FrEDFactor": "0", "MED_FirstDelayED": "0.5", "MED_ScndDelayED": "0.25"}, + "Switches": {"PantographPresets": "0|1|2|3"}, + "Circuit": {"ImaxHi": "500"}, + "LightsList": {"Size": "8", "Wrap": "No", "Default": "1", "rows": [ + ["0","0"], + ["388","34"], + ["21","34"], + ["1","16"], + ["16","1"], + ["22","34"], + ["38","38"], + ["34","34"] + ]}, + "ffList": {"Size": "5", "rows": [ + ["0","0.5"], + ["24","1.0"], + ["35","1.0"], + ["42","1.3"], + ["42","1.3"], + ["74","2.3"] + ]} +} diff --git a/tests/unit/data/fiz/road/man/nl293.json b/tests/unit/data/fiz/road/man/nl293.json new file mode 100644 index 000000000..3d5e91a44 --- /dev/null +++ b/tests/unit/data/fiz/road/man/nl293.json @@ -0,0 +1,36 @@ +{ + "_source": "road/man/nl293.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "road", "M": "12000", "Vmax": "90", "PWR": "206"}, + "Load": {"LoadAccepted": "Passengers,Luggage", "MaxLoad": "44", "LoadQ": "pieces", "OverLoadFactor": "1.2", "LoadSpeed": "1", "UnLoadSpeed": "2"}, + "Dimensions": {"L": "10.5", "H": "3", "W": "2.6", "Cx": "0.4"}, + "Wheels": {"D": "1.0", "AIM": "300", "Tw": "2.3", "Axle": "1'A", "Bd": "4.615", "Rmin": "10.5"}, + "Brake": {"BrakeType": "Hydraulic", "NBpA": "2", "MBF": "14.75", "MaxBP": "0.5", "BCN": "4", "BCR": "0.2", "BCD": "0.2", "BCM": "2.0"}, + "Doors": {"OpenCtrl": "DriverCtrl", "CloseCtrl": "DriverCtrl", "OpenSpeed": "30", "CloseSpeed": "38", "DoorMaxShiftL": "88", "DoorMaxShiftR": "88", "DoorOpenMethod": "Fold", "DoorClosureWarning": "Yes"}, + "BuffCoupl": {"CType": "Bare"}, + "Cntrl": {"BrakeSystem": "Individual", "BCPN": "10", "LocalBrake": "HydraulicBrake", "MCPN": "10", "SCPN": "5", "IniCDelay": "1.0", "SCDelay": "0.25", "AutoRelay": "Yes", "OilStart": "Automatic", "FuelStart": "Automatic", "rows": []}, + "Light": {"Light": "Accu", "LMaxVoltage": "12", "LCap": "340", "LRS": "Generator", "LMaxCurrent": "10"}, + "Power": {"EnginePower": "Internal"}, + "Engine": {"EngineType": "DieselEngine", "Trans": "10:54", "nmin": "600", "nmax": "2000", "nmax_cutoff": "1900", "AIM": "50", "EUS": "2.5", "EDS": "2.5", "IsTC": "Yes", "TC_TMMax": "1.52", "TC_CP": "0.85", "TC_LT": "1700", "TC_LR": "2.0", "TC_ULR": "2.0", "TC_FRI": "1", "TC_FRD": "1", "TC_TII": "1.63", "TC_TIO": "0", "TC_TOO": "0", "TC_LS": "33", "TC_ULS": "25.4", "IsRetarder": "Yes", "R_Place": "2", "R_TII": "2.0", "R_MT": "1000", "R_MP": "100", "R_FRI": "1", "R_FRD": "1", "R_MinVel": "30"}, + "MotorParamTable": {"minVelfullengage": "2.0", "engageDia": "1", "engageMaxForce": "1600", "engagefriction": "1", "rows": [ + ["0","0","0","-1","1"], + ["1","2.81","-1","18.8","1"], + ["2","1.84","15.2","28.6","1"], + ["3","1.36","25.4","38.8","1"], + ["4","1.00","34.6","52.7","1"], + ["5","0.80","43.2","200","1"] + ]}, + "DList": {"Size": "10", "nMmax": "20.83", "Mmax": "1400", "Mnmax": "1050", "nmax": "31.67", "nominalfill": "1", "Mstand": "150", "rows": [ + ["0","0.1","0"], + ["1","0.1","2"], + ["2","0.2","2"], + ["3","0.3","2"], + ["4","0.4","2"], + ["5","0.5","2"], + ["6","0.6","2"], + ["7","0.7","2"], + ["8","0.8","2"], + ["9","0.9","2"], + ["10","1.0","2"] + ]} +} diff --git a/tests/unit/data/fiz/sa134_v1/218mc_a.json b/tests/unit/data/fiz/sa134_v1/218mc_a.json new file mode 100644 index 000000000..6c91065df --- /dev/null +++ b/tests/unit/data/fiz/sa134_v1/218mc_a.json @@ -0,0 +1,94 @@ +{ + "_source": "pkp/sa134_v1/218mc_a.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "41000", "Vmax": "120", "PWR": "382", "SandCap": "100", "Type": "dmu"}, + "Load": {"MaxLoad": "50", "OverLoadFactor": "2.2", "LoadQ": "pieces", "LoadAccepted": "passengers", "LoadSpeed": "0.5", "UnLoadSpeed": "0.7"}, + "Dimensions": {"L": "20.75", "H": "4.2", "W": "2.9", "Cx": "0.0"}, + "Wheels": {"D": "0.84", "Tw": "1.435", "AIM": "300", "Axle": "B'1'", "Ad": "2", "Bd": "17.23", "Rmin": "75", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "EStED", "Size": "150", "NBpA": "4", "MBF": "85.0", "MaxBP": "2.9", "LocMaxBP": "3.8", "RV": "-1", "RM": "0.77", "BCN": "6", "BCR": "0.127", "BCD": "0.1", "BCM": "2.15", "HiPP": "5", "LoPP": "3.5", "Vv": "0.50", "MinCP": "7.0", "MaxCP": "8.0", "CompressorSpeed": "0.0208", "CompressorPower": "Main", "BCS": "0.5", "BSA": "0", "BM": "Cosid", "BVV": "150", "BRE": "0.97", "TareMaxBP": "2.2", "LPOn": "3.0", "LPOff": "4.5", "UBB1": "2", "UBB2": "8"}, + "SpringBrake": {"Volume": "15", "MBF": "4.35", "MaxSP": "5.5", "ResetP": "4.0", "MinFP": "3.5", "PressOff": "4.5", "PressOn": "0.5", "ValveOnArea": "0.0005", "ValveOffArea": "0.0005", "ValvePNBArea": "0.002", "MTC": "4"}, + "Doors": {"OpenCtrl": "Mixed", "CloseCtrl": "DriverCtrl", "OpenSpeed": "0.23", "CloseSpeed": "0.19", "DoorCloseDelay": "2.45", "DoorMaxShiftL": "0.78", "DoorMaxShiftR": "0.78", "DoorOpenMethod": "Plug", "DoorClosureWarning": "No", "DoorBlocked": "Yes", "DoorMaxShiftPlug": "0.04", "MirrorMaxShift": "75", "DoorStayOpen": "10", "DoorNeedPermit": "Yes", "DoorPermitList": "1|0|2|3", "DoorPermitListDefault": "2", "DoorAutoCloseRemote": "No"}, + "BuffCoupl1": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "39", "ControlType": "218M"}, + "BuffCoupl2": {"CType": "Articulated", "AllowedFlag": "-55", "ControlType": "218M"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "BCPN": "3", "BDelay1": "15", "BDelay2": "4", "BDelay3": "35", "BDelay4": "25", "ASB": "Yes", "LocalBrake": "PneumaticBrake", "ManualBrake": "No", "MCPN": "5", "SCPN": "1", "AutoRelay": "Yes", "IniCDelay": "1.0", "SCDelay": "0.3", "BrakeDelays": "PR", "MaxBPMass": "55", "BrakeHandle": "MHZ_K5P", "LocBrakeHandle": "FD1", "WaterStart": "Battery", "OilStart": "Automatic", "FuelStart": "Automatic", "ConverterStart": "Automatic", "ConverterStartDelay": "4", "BrakeOpModes": "PN", "EIMCtrlType": "3", "DirChangeMaxPos": "4", "SBD": "0.47", "AutomaticCabActivation": "No", "InactiveCabFlag": "27", "CompartmentLightsStart": "Manual", "rows": [ + ["-1","0.6","-1","20","Pneumatic"], + ["0","0.5","-1","2","Pneumatic"], + ["1","0.46","-1","2","Pneumatic"], + ["2","0.42","-1","2","Pneumatic"], + ["3","0.38","-1","2","Pneumatic"], + ["4","0.34","-1","2","Pneumatic"], + ["5","0.29","-1","2","Pneumatic"], + ["6","0","-1","40","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "2.4", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "2.1", "RadioStop": "Yes", "CabDependent": "Yes"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "24", "LMaxCurrent": "155"}, + "Engine": {"EngineType": "DieselEngine", "Trans": "69:229", "TransEff": "0.90", "nmin": "850", "nmax": "2100", "nmax_cutoff": "2150", "nmin_hdrive": "1000", "nmin_hdrive_factor": "800", "nmin_retarder": "1400", "MaxVelANS": "255", "AIM": "150", "EUS": "2.5", "EDS": "2.5", "IsTC": "Yes", "TC_TMMax": "4.23", "TC_CP": "0.80", "TC_LT": "3000", "TC_LR": "1", "TC_ULR": "1", "TC_FRI": "0.25", "TC_FRD": "1", "TC_TII": "1.97", "TC_TIO": "0", "TC_TOO": "0", "TC_LS": "80", "TC_ULS": "75", "IsRetarder": "Yes", "R_Place": "0", "R_TII": "18.0", "R_MT": "2000", "R_MP": "300", "R_FRI": "1", "R_FRD": "1", "R_MinVel": "16", "R_EngageVel": "95", "WaterMaxTemperature": "105", "WaterCoolingTemperature": "95", "WaterFlowTemperature": "75", "WaterAuxCircuit": "No", "WaterCoolingFanSpeed": "-100", "NominalCoolingPower": "300"}, + "Clima": {"HMaxVoltage": "3000", "Heating": "Generator", "HGeneratorEngine": "Main", "HGeneratorMinRPM": "696", "HGeneratorMinVoltage": "2400", "HGeneratorMaxRPM": "1500", "HGeneratorMaxVoltage": "3300"}, + "SpeedControl": {"SpeedCtrl": "Yes", "SpeedButtons": "0|30|40|50|60|70|80|90|100|120", "OverrideManual": "Yes", "InitPwr": "0.3", "MaxPwrVel": "5", "StartVel": "2", "VelStep": "5", "PwrStep": "0.1", "MinPwr": "0.3", "MaxPwr": "1.0", "MinVel": "0", "MaxVel": "120", "Offset": "-0.5", "kPpos": "0.1", "kPneg": "0.4", "kIpos": "0.06", "kIneg": "0.06", "BrakeIntervention": "Yes"}, + "TurboPos": {"TurboPos": "1"}, + "MotorParamTable": {"minVelfullengage": "-0.1", "engageDia": "1", "engageMaxForce": "3300", "engagefriction": "5.0", "rows": [ + ["0","0","0","-1","1"], + ["1","0.72","-1","200","1"] + ]}, + "DList": {"Size": "10", "Mmax": "2750", "nMmax": "18.3", "nmax": "33.3", "Mnmax": "2142", "nominalfill": "1.0", "Mstand": "250.0", "NomFuelConsRate": "220", "rows": [ + ["0","0.15","0"], + ["1","0.10","2"], + ["2","0.20","2"], + ["3","0.30","2"], + ["4","0.40","2"], + ["5","0.50","2"], + ["6","0.60","2"], + ["7","0.70","2"], + ["8","0.80","2"], + ["9","0.90","2"], + ["10","1.00","2"] + ]}, + "DMList": {"rows": [ + ["0","0"], + ["80","591"], + ["400","738"], + ["800","1477"], + ["1300","2400"], + ["1500","2400"], + ["1750","2071"], + ["2000","1824"], + ["2200","1508"] + ]}, + "HTCList": {"rows": [ + ["0.000","4.89"], + ["0.061","4.44"], + ["0.159","3.63"], + ["0.236","3.12"], + ["0.293","2.81"], + ["0.354","2.46"], + ["0.427","2.14"], + ["0.492","1.87"], + ["0.565","1.62"], + ["0.642","1.39"], + ["0.720","1.23"], + ["0.800","1.00"], + ["1.000","0.00"] + ]}, + "UCList": {"Size": "5", "IntegratedBrakePN": "Yes", "IntegratedBrake": "Yes", "rows": [ + ["0","3","0","0","0","0.15","0.15","0","1","0"], + ["1","2","0","0","0","0.15","0.15","1","3","0"], + ["2","1","-1","0","-1","0.15","0.15","3","3","1"], + ["3","1","-1","1","0","0.00","0.15","3","4","1"], + ["4","0","-1","1","0","0.15","0.00","4","5","3"], + ["5","0","0","1","1","0.15","0.15","4","5","3"] + ]}, + "LightsList": {"Size": "5", "Wrap": "no", "Default": "1", "rows": [ + ["0","0"], + ["21","34"], + ["22","34"], + ["34","34"], + ["16","1"] + ]}, + "WiperList": {"Size": "5", "Angle": "-75", "Default": "1", "rows": [ + ["3","0.5","0.5","0.0"], + ["0","0.8","0.0","0.5"], + ["3","0.8","6.0","0.5"], + ["3","0.8","3.0","0.0"], + ["3","0.8","1.0","0.0"] + ]} +} diff --git a/tests/unit/data/fiz/sieciowiec_v1/a.json b/tests/unit/data/fiz/sieciowiec_v1/a.json new file mode 100644 index 000000000..4471406d7 --- /dev/null +++ b/tests/unit/data/fiz/sieciowiec_v1/a.json @@ -0,0 +1,13 @@ +{ + "_source": "pkp/sieciowiec_v1/a.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "35500", "Vmax": "80", "HeatingP": "20", "LightP": "0.56"}, + "Load": {"MaxLoad": "80", "LoadQ": "pieces", "LoadAccepted": "Passengers,Luggage", "OverLoadFactor": "2", "LoadSpeed": "1", "UnLoadSpeed": "2"}, + "Dimensions": {"L": "21.13", "H": "4", "W": "2.9", "Cx": "0.1"}, + "Wheels": {"D": "1.00", "Tw": "1.435", "Axle": "2'2'", "Ad": "2.83", "Bd": "13.9", "Rmin": "80", "BearingType": "Roll"}, + "Brake": {"BrakeType": "None", "NBpA": "0", "MBF": "0", "MaxBP": "0"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.11", "FmaxB": "320", "kC": "4500", "DmaxC": "0.1", "FmaxC": "850", "beta": "0.58", "AllowedFlag": "115"}, + "Cntrl": {"MCPN": "1", "BrakeSystem": "Individual", "LocalBrake": "NoBrake", "rows": []}, + "Light": {"Light": "Generator", "LGeneratorEngine": "WheelsDriven", "LMaxVoltage": "24", "AlterLight": "Accu", "AlterLMaxVoltage": "24", "AlterLCap": "495", "AlterLRS": "Generator"}, + "Clima": {"Heating": "PowerCable", "HPowerTrans": "ElectricPower", "HMaxVoltage": "3000", "AlterHeating": "PowerCable", "AlterHPowerTrans": "SteamPower", "AlterHSteamPress": "0.45"} +} diff --git a/tests/unit/data/fiz/sm03_v1/sm03.json b/tests/unit/data/fiz/sm03_v1/sm03.json new file mode 100644 index 000000000..0b241f6b4 --- /dev/null +++ b/tests/unit/data/fiz/sm03_v1/sm03.json @@ -0,0 +1,41 @@ +{ + "_source": "pkp/sm03_v1/sm03.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "23200", "Vmax": "25.68", "PWR": "111.855", "SandCap": "200"}, + "Dimensions": {"L": "6.94", "H": "3.21", "W": "2.97", "Cx": "0.3"}, + "Wheels": {"D": "0.94", "Tw": "1.435", "AIM": "250", "Axle": "B", "Ad": "2.5", "Bd": "2.5", "Rmin": "50", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "K", "NBpA": "2", "MBF": "85.0", "MaxBP": "3.5", "LocMaxBP": "5.0", "BCN": "1", "BCR": "0.114", "BCD": "0.12", "BCM": "10.0", "HiPP": "5", "LoPP": "3.5", "Vv": "0.3", "MinCP": "7.0", "MaxCP": "8.0", "CompressorSpeed": "0.0125", "CompressorPower": "Main", "BCS": "0.8", "BSA": "0", "BM": "P10-Bg", "BVV": "40", "BRE": "0.9"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "3"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "BCPN": "4", "BDelay1": "15", "BDelay2": "4", "ASB": "Manual", "LocalBrake": "PneumaticBrake", "ManualBrake": "Yes", "DynamicBrake": "Passive", "MCPN": "9", "SCPN": "7", "AutoRelay": "No", "IniCDelay": "0.5", "SCDelay": "0.1", "BrakeDelays": "P", "BrakeHandle": "Knorr", "LocBrakeHandle": "Knorr", "FuelStart": "Automatic", "ConverterStart": "Automatic", "rows": [ + ["-1","0.6","0","15","Pneumatic"], + ["0","0.5","0","9","Pneumatic"], + ["1","-1","-1","0","Pneumatic"], + ["2","-1","-1","5","Pneumatic"], + ["3","0.34","-1","9","Pneumatic"], + ["4","0.0","-1","15","Pneumatic"] + ]}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "24", "LMaxCurrent": "100"}, + "Engine": {"EngineType": "DieselEngine", "Trans": "1:1", "nmin": "900", "nmax": "1500", "nmax_cutoff": "1550", "AIM": "100", "OilMinPressure": "0.343", "OilMaxPressure": "0.686", "WaterCoolingTemperature": "80", "WaterShutters": "yes", "WaterAuxCircuit": "no", "HeatKFO": "160", "HeatKFO2": "180", "HeatKFS": "160", "HeatKFE": "7", "HeatKW": "2", "HeatKV": "0.3", "IsTC": "No", "TC_TMMax": "1.00", "TC_CP": "0.9", "TC_LT": "1000", "TC_LR": "1", "TC_ULR": "1", "TC_FRI": "1", "TC_FRD": "1", "TC_TII": "0.8", "TC_TIO": "0", "TC_TOO": "0", "TC_LS": "3.5", "TC_ULS": "3.0", "EUS": "0.35", "EDS": "1.0"}, + "MotorParamTable": {"minVelfullengage": "3.8", "engageDia": "1", "engageMaxForce": "800", "engagefriction": "1", "rows": [ + ["0","0","0","-1"], + ["1","46.88","-1","5.73"], + ["2","0","0","-1"], + ["3","28.65","2.9","9.42"], + ["4","0","0","-1"], + ["5","17.12","4.7","15.69"], + ["6","0","0","-1"], + ["7","10.46","10.6","100"] + ]}, + "DList": {"Size": "9", "Mmax": "784.5", "nMmax": "15", "Mnmax": "686.4", "nmax": "25", "nominalfill": "1", "Mstand": "200.0", "rows": [ + ["0","0.1","0"], + ["1","0.2","2"], + ["2","0.3","2"], + ["3","0.4","2"], + ["4","0.5","2"], + ["5","0.6","2"], + ["6","0.7","2"], + ["7","0.8","2"], + ["8","0.9","2"], + ["9","1.0","2"] + ]} +} diff --git a/tests/unit/data/fiz/sm31_v1/411d.json b/tests/unit/data/fiz/sm31_v1/411d.json new file mode 100644 index 000000000..b08d1c7e5 --- /dev/null +++ b/tests/unit/data/fiz/sm31_v1/411d.json @@ -0,0 +1,43 @@ +{ + "_source": "pkp/sm31_v1/411d.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "116400", "Mred": "15000", "Vmax": "80", "PWR": "880", "SandCap": "400"}, + "Dimensions": {"L": "17.00", "H": "4.292", "W": "2.904", "Cx": "0.3"}, + "Wheels": {"D": "1.100", "AIM": "4000", "Tw": "1.435", "Axle": "Co'Co'", "Ad": "2.6", "Bd": "13.1", "Rmin": "80"}, + "Brake": {"BrakeValve": "LSt", "NBpA": "4", "MBF": "85.0", "MaxBP": "4.3", "LocMaxBP": "4.3", "MaxASBP": "1.3", "BCN": "12", "BCR": "0.114", "BCD": "0.06", "BCM": "5.84", "HiPP": "5", "LoPP": "3.5", "Vv": "0.8", "MinCP": "7.5", "MaxCP": "8.0", "CompressorSpeed": "0.03", "BCS": "1", "BSA": "2", "BM": "P10-Bgu", "CompressorPower": "Converter", "BVV": "130", "BRE": "0.9"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "35"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "BCPN": "6", "BDelay1": "15", "BDelay2": "4", "BDelay3": "35", "BDelay4": "25", "ASB": "Manual", "LocalBrake": "PneumaticBrake", "MCPN": "11", "SCPN": "2", "AutoRelay": "Yes", "IniCDelay": "0.5", "SCDelay": "0.1", "BrakeDelays": "GP", "BrakeHandle": "FV4a", "LocBrakeHandle": "FD1", "ConverterStart": "Automatic", "ConverterStartDelay": "7", "rows": [ + ["-1","0.60","-1","15","Pneumatic"], + ["0","0.50","-1","9","Pneumatic"], + ["1","0.46","-1","9","Pneumatic"], + ["2","0.42","-1","9","Pneumatic"], + ["3","0.38","-1","9","Pneumatic"], + ["4","0.34","-1","9","Pneumatic"], + ["5","0.28","-1","9","Pneumatic"], + ["6","0.00","-1","15","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "5", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "6", "RadioStop": "Yes"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "100"}, + "Engine": {"AIM": "1.6", "EngineType": "DumbDE", "Trans": "19:70", "Ftmax": "392000", "Vhyp": "4", "Vadd": "5", "Cr": "1", "RelayType": "1"}, + "TurboPos": {"TurboPos": "5"}, + "MotorParamTable": {"rows": [ + ["0","17.567","64","1500","15","30","0"], + ["1","16.29","123.7","1750","32","43","0"], + ["2","15","183.3","2000","49","200","0"] + ]}, + "Circuit": {"ImaxLo": "2800", "IminLo": "2000"}, + "WWList": {"Size": "11", "rows": [ + ["496","0","0","0"], + ["496","30","870","3000"], + ["496","75","870","3000"], + ["496","105","870","3000"], + ["496","135","870","3000"], + ["568","213","870","3000"], + ["640","305","870","3000"], + ["712","395","870","3000"], + ["784","495","870","3000"], + ["856","595","870","3000"], + ["928","705","870","3000"], + ["1000","800","870","3000"] + ]} +} diff --git a/tests/unit/data/fiz/sm40_v1/sm40.json b/tests/unit/data/fiz/sm40_v1/sm40.json new file mode 100644 index 000000000..e8cec2474 --- /dev/null +++ b/tests/unit/data/fiz/sm40_v1/sm40.json @@ -0,0 +1,48 @@ +{ + "_source": "pkp/sm40_v1/sm40.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "62000", "Mred": "10000", "Vmax": "80", "PWR": "1175", "SandCap": "400"}, + "Dimensions": {"L": "11.30", "H": "4.44", "W": "3.05", "Cx": "0.3"}, + "Wheels": {"D": "1.04", "AIM": "4000", "Tw": "1.435", "Axle": "Bo'Bo'", "Ad": "1.75", "Bd": "10.3", "Rmin": "100"}, + "Brake": {"BrakeValve": "K", "NBpA": "4", "MBF": "85.0", "MaxBP": "4.0", "LocMaxBP": "5.0", "BCN": "4", "BCR": "0.236", "BCD": "0.1", "BCM": "6.54", "HiPP": "5", "LoPP": "3.5", "Vv": "0.50", "MinCP": "7.0", "MaxCP": "8.0", "CompressorSpeed": "0.0208", "CompressorPower": "Main", "BCS": "0.8", "BSA": "0", "BM": "P10-Bg", "BVV": "127", "BRE": "0.75"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "850", "beta": "0.5", "AllowedFlag": "39"}, + "Cntrl": {"ControlType": "sm40", "BrakeSystem": "Pneumatic", "BCPN": "4", "BDelay1": "15", "BDelay2": "4", "BDelay3": "35", "BDelay4": "25", "ASB": "0", "LocalBrake": "PneumaticBrake", "ManualBrake": "Yes", "MCPN": "20", "SCPN": "1", "AutoRelay": "Yes", "IniCDelay": "0.4", "SCDelay": "0.4", "BrakeDelays": "GP", "BrakeHandle": "Knorr", "LocBrakeHandle": "Knorr", "ConverterStart": "Automatic", "rows": [ + ["-1","0.90","0","15","Pneumatic"], + ["0","0.50","0","9","Pneumatic"], + ["1","-1","-1","0","Pneumatic"], + ["2","-1","-1","5","Pneumatic"], + ["3","0.001","-1","9","Pneumatic"], + ["4","0.00","-1","15","Pneumatic"] + ]}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "100"}, + "Engine": {"EngineType": "DieselElectric", "Trans": "17:77", "Ftmax": "184500", "Flat": "1", "Vhyp": "5.5", "Vadd": "5.5", "Cr": "1.0", "RelayType": "41"}, + "Clima": {"Heating": "PowerCable", "HPowerTrans": "ElectricPower", "HMaxVoltage": "3000"}, + "MotorParamTable": {"rows": [ + ["0","5.84","137","300","91","25","0"], + ["1","3.32","191","400","230","0","2700"] + ]}, + "Circuit": {"CircuitRes": "0.01", "ImaxLo": "3350", "ImaxHi": "3350", "IminLo": "400", "IminHi": "400"}, + "WWList": {"Size": "20", "rows": [ + ["470","0","0","0"], + ["900","0","0","0"], + ["900","0","0","0"], + ["800","75","360","2600"], + ["800","100","405","2600"], + ["800","125","450","2600"], + ["800","145","450","2600"], + ["845","180","495","2600"], + ["890","230","540","2600"], + ["930","270","585","2600"], + ["970","315","630","2600"], + ["1005","355","675","2600"], + ["1100","360","410","2600"], + ["1100","365","285","2600"], + ["1100","370","405","2600"], + ["1100","375","440","2600"], + ["1100","380","468","2600"], + ["1100","385","490","2600"], + ["1100","390","502","2600"], + ["1100","400","512","2600"], + ["1100","412","540","2600"] + ]} +} diff --git a/tests/unit/data/fiz/sm42_v1/6d1.json b/tests/unit/data/fiz/sm42_v1/6d1.json new file mode 100644 index 000000000..54bdf251b --- /dev/null +++ b/tests/unit/data/fiz/sm42_v1/6d1.json @@ -0,0 +1,42 @@ +{ + "_source": "pkp/sm42_v1/6d1.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "74000", "Mred": "10000", "Vmax": "90", "PWR": "590", "SandCap": "300"}, + "Dimensions": {"L": "14.24", "H": "4.285", "W": "3.170", "Cx": "0.2"}, + "Wheels": {"D": "1.100", "AIM": "4000", "Tw": "1.435", "Axle": "Bo'Bo'", "Ad": "2.6", "Bd": "7.524", "Rmin": "80"}, + "Brake": {"BrakeValve": "LSt", "NBpA": "4", "MBF": "85.0", "MaxBP": "4.0", "MaxASBP": "1.8", "BCN": "4", "BCR": "0.1143", "BCD": "0.05", "BCM": "6.68", "HiPP": "5.0", "LoPP": "3.5", "Vv": "0.8", "MinCP": "7.0", "MaxCP": "8.0", "CompressorSpeed": "0.057", "CompressorPower": "Engine", "BVV": "200", "BRE": "0.85"}, + "BuffCoupl": {"ControlType": "sm42", "CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "103"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "BCPN": "6", "BDelay1": "15", "BDelay2": "3", "BDelay3": "36", "BDelay4": "22", "ASB": "Manual", "LocalBrake": "PneumaticBrake", "MCPN": "11", "SCPN": "1", "AutoRelay": "No", "IniCDelay": "0.5", "SCDelay": "0.1", "BrakeDelays": "GP", "BrakeHandle": "FV4a", "LocBrakeHandle": "FD1", "ManualBrake": "Yes", "OilStart": "Mixed", "WaterStart": "Battery", "ConverterStart": "Automatic", "rows": [ + ["-1","0.7","-1","15","Pneumatic"], + ["0","0.5","-1","9","Pneumatic"], + ["1","0.45","-1","9","Pneumatic"], + ["2","0.41","-1","9","Pneumatic"], + ["3","0.38","-1","9","Pneumatic"], + ["4","0.34","-1","9","Pneumatic"], + ["5","0.28","-1","9","Pneumatic"], + ["6","0","-1","15","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active", "AwareMinSpeed": "0.0", "AwareDelay": "60", "SoundSignalDelay": "2.5", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "2.5", "RadioStop": "Yes"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "91"}, + "Engine": {"AIM": "1.6", "RPMDecRate": "4.0", "EngineType": "DumbDE", "Trans": "17:75", "Ftmax": "228000", "Vhyp": "7", "Vadd": "5.5", "Cr": "1", "ShuntMode": "1", "WaterCoolingTemperature": "81", "WaterCoolingFanSpeed": "-1200", "WaterMaxTemperature": "85", "OilMinPressure": "0.15", "OilMinTemperature": "25", "OilMaxTemperature": "90", "HeaterMinTemperature": "55", "HeaterMaxTemperature": "60", "HeatKFS": "35", "HeatKFO": "30", "HeatKFE": "7", "HeatKW": "0.011", "HeatKV": "0.3", "HeatKFO2": "100"}, + "TurboPos": {"TurboPos": "5"}, + "MotorParamTable": {"rows": [ + ["0","17.567","64","1500","15","0","0"], + ["1","15","183.3","2000","49","0","0"] + ]}, + "Circuit": {"CircuitRes": "0.1", "ImaxLo": "1900", "ImaxHi": "1900", "IminLo": "400", "IminHi": "400"}, + "WWList": {"Size": "11", "rows": [ + ["496","0","0","0","0","0","0"], + ["496","20","125","600","0","140","180"], + ["496","50","156","846","0","140","180"], + ["496","90","194","1065","0","140","180"], + ["496","135","240","1260","0","140","180"], + ["568","182","293","1428","25","150","200"], + ["640","234","353","1571","50","160","235"], + ["712","286","420","1688","80","200","270"], + ["784","348","494","1780","100","235","305"], + ["856","408","575","1845","130","300","370"], + ["928","474","664","1886","150","360","410"], + ["1000","540","760","1900","170","450","490"] + ]} +} diff --git a/tests/unit/data/fiz/sn61_v2/sn61.json b/tests/unit/data/fiz/sn61_v2/sn61.json new file mode 100644 index 000000000..4237a1336 --- /dev/null +++ b/tests/unit/data/fiz/sn61_v2/sn61.json @@ -0,0 +1,42 @@ +{ + "_source": "pkp/sn61_v2/sn61.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "Type": "sn61", "M": "54810", "Vmax": "100", "PWR": "368", "SandCap": "100"}, + "Load": {"MaxLoad": "50", "LoadQ": "pieces", "LoadAccepted": "passengers", "LoadSpeed": "1", "UnLoadSpeed": "1"}, + "Dimensions": {"L": "24.22", "H": "4.12", "W": "2.96", "Cx": "0.5"}, + "Wheels": {"D": "0.94", "Tw": "1.435", "AIM": "300", "Axle": "B'2'", "Ad": "3.2", "Bd": "18.36", "Rmin": "100", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "ESt3d_PZZ", "Size": "150", "NBpA": "4", "MBF": "85.0", "MaxBP": "3.8", "LocMaxBP": "3.8", "BCN": "3", "BCR": "0.127", "BCD": "0.1", "BCM": "6.54", "HiPP": "5", "LoPP": "3.5", "Vv": "0.50", "MinCP": "7.0", "MaxCP": "8.0", "CompressorSpeed": "0.0208", "CompressorPower": "Main", "BCS": "1.5", "BSA": "2", "BM": "P10-Bg", "BVV": "150", "BRE": "0.85"}, + "Doors": {"OpenCtrl": "Passenger", "CloseCtrl": "Passenger", "OpenSpeed": "110", "CloseSpeed": "400", "DoorMaxShiftL": "89", "DoorMaxShiftR": "89", "DoorOpenMethod": "Roll", "DoorClosureWarning": "No"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "39", "ControlType": "sn61"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "BCPN": "6", "BDelay1": "15", "BDelay2": "4", "BDelay3": "35", "BDelay4": "25", "ASB": "Manual", "DirChangeMaxPos": "2", "LocalBrake": "PneumaticBrake", "ManualBrake": "Yes", "MCPN": "8", "SCPN": "5", "AutoRelay": "Yes", "IniCDelay": "1.5", "SCDelay": "0.3", "BrakeDelays": "P", "BrakeHandle": "FV4a", "LocBrakeHandle": "FD1", "FuelStart": "Automatic", "WaterStart": "Battery", "OilStart": "Automatic", "ConverterStart": "Automatic", "rows": [ + ["-1","0.6","-1","20","Pneumatic"], + ["0","0.5","-1","2","Pneumatic"], + ["1","0.46","-1","2","Pneumatic"], + ["2","0.42","-1","2","Pneumatic"], + ["3","0.38","-1","2","Pneumatic"], + ["4","0.34","-1","2","Pneumatic"], + ["5","0.29","-1","2","Pneumatic"], + ["6","0","-1","40","Pneumatic"] + ]}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Engine": {"EngineType": "DieselEngine", "Trans": "39:83", "nmin": "660", "nmax": "1350", "nmax_cutoff": "1250", "AIM": "150"}, + "MotorParamTable": {"minVelfullengage": "7.8", "engageDia": "1", "engageMaxForce": "3800", "engagefriction": "1", "rows": [ + ["0","0","0","-1","1"], + ["1","5.056","-1","20.3","1"], + ["2","3.325","14.7","30.8","1"], + ["3","2.259","25.4","45.3","1"], + ["4","1.486","40.9","68.9","1"], + ["5","1.000","62.4","200","1"] + ]}, + "DList": {"Size": "8", "Mmax": "3630", "nMmax": "13.333", "Mnmax": "3100", "nmax": "21", "nominalfill": "0.9", "Mstand": "300.0", "rows": [ + ["0","0","0"], + ["1","0.4","0"], + ["2","0.1","0"], + ["3","0.6","1"], + ["4","0.15","3"], + ["5","0.40","3"], + ["6","0.60","3"], + ["7","0.80","3"], + ["8","1.00","4"] + ]} +} diff --git a/tests/unit/data/fiz/st44_v2/m62-1151.json b/tests/unit/data/fiz/st44_v2/m62-1151.json new file mode 100644 index 000000000..1e75cc9c8 --- /dev/null +++ b/tests/unit/data/fiz/st44_v2/m62-1151.json @@ -0,0 +1,56 @@ +{ + "_source": "pkp/st44_v2/m62-1151.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "116000", "Mred": "20000", "Vmax": "100", "PWR": "1232", "SandCap": "400", "Type": "st44"}, + "Dimensions": {"L": "17.55", "H": "4.62", "W": "2.95", "Cx": "0.1"}, + "Wheels": {"D": "1.05", "AIM": "4000", "Tw": "1.435", "Axle": "Co'Co'", "Ad": "2.6", "Bd": "8.6", "Rmin": "80"}, + "Brake": {"BrakeValve": "LSt", "NBpA": "4", "MBF": "124", "MaxBP": "4.1", "MaxLBP": "3.9", "MaxASBP": "1.8", "BCN": "8", "BCR": "0.1016", "BCD": "0.1", "BCM": "10.4", "HiPP": "5", "LoPP": "3.5", "Vv": "0.888", "MinCP": "7", "MaxCP": "8.5", "CompressorSpeed": "0.077", "BCS": "1", "BSA": "2", "BM": "P10-Bgu", "BVV": "222", "CompressorPower": "Main", "BRE": "0.9", "UBB1": "1", "UBB2": "2"}, + "BuffCoupl": {"ControlType": "kolomna", "CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "39"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "BCPN": "6", "BDelay1": "15", "BDelay2": "4", "BDelay3": "35", "BDelay4": "25", "ASB": "Manual", "LocalBrake": "PneumaticBrake", "MCPN": "15", "SCPN": "2", "IniCDelay": "0.5", "SCDelay": "0.1", "BrakeDelays": "GP", "BrakeHandle": "FV4a", "LocBrakeHandle": "FD1", "AutoRelay": "Yes", "ManualBrake": "Yes", "OilStart": "Automatic", "WaterStart": "Battery", "ConverterStart": "Automatic", "rows": [ + ["-1","0.7","-1","15","Pneumatic"], + ["0","0.5","-1","9","Pneumatic"], + ["1","0.46","-1","9","Pneumatic"], + ["2","0.42","-1","9","Pneumatic"], + ["3","0.38","-1","9","Pneumatic"], + ["4","0.34","-1","9","Pneumatic"], + ["5","0.29","-1","9","Pneumatic"], + ["6","0","-1","15","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "5", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "6", "RadioStop": "Yes"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "100"}, + "Clima": {"HMaxVoltage": "3000", "Heating": "Generator", "HGeneratorEngine": "Main", "HGeneratorMinRPM": "400", "HGeneratorMinVoltage": "2400", "HGeneratorMaxRPM": "750", "HGeneratorMaxVoltage": "3300"}, + "Engine": {"AIM": "3.3", "EngineType": "DieselElectric", "Trans": "15:68", "Ftmax": "396000", "Flat": "1", "Vhyp": "18", "Vadd": "0", "Cr": "1.107", "WaterFlowTemperature": "80", "WaterCoolingTemperature": "45", "WaterMaxTemperature": "95", "WaterShutters": "Yes", "WaterAuxCircuit": "Yes", "WaterAuxCoolingTemperature": "60", "WaterAuxMaxTemperature": "75", "WaterAuxShutters": "Yes", "OilMinPressure": "0.25", "OilMaxPressure": "0.8", "OilMaxTemperature": "71", "HeatKFO": "40", "HeatKFO2": "190", "HeatKW": "0.2", "WaterCoolingFanSpeed": "1.86"}, + "LightsList": {"Size": "8", "Wrap": "No", "Default": "4", "rows": [ + ["38","38","/","A"], + ["38","38","/","A"], + ["34","34"], + ["0","0"], + ["21","34"], + ["1","16"], + ["16","1"], + ["22","34"] + ]}, + "MotorParamTable": {"rows": [ + ["0","10","179","2000","72","2450","0"], + ["1","8","190","1600","95","2250","3600"], + ["2","7","300","1400","170","0","3450"] + ]}, + "WWList": {"Size": "15", "rows": [ + ["400","0","0","0"], + ["400","40","180","1500"], + ["425","100","240","2000"], + ["450","250","300","2080"], + ["475","450","330","3660"], + ["500","500","360","3830"], + ["525","550","380","4000"], + ["550","600","405","4160"], + ["575","700","430","4330"], + ["600","750","450","4660"], + ["625","800","475","4830"], + ["650","850","500","5160"], + ["675","950","525","5330"], + ["700","1050","550","5500"], + ["725","1150","575","5660"], + ["750","1232","600","6000"] + ]} +} diff --git a/tests/unit/data/fiz/st45_v2/301dd.json b/tests/unit/data/fiz/st45_v2/301dd.json new file mode 100644 index 000000000..bc1924c07 --- /dev/null +++ b/tests/unit/data/fiz/st45_v2/301dd.json @@ -0,0 +1,55 @@ +{ + "_source": "pkp/st45_v2/301dd.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "97000", "Mred": "15000", "Vmax": "120", "PWR": "1330", "SandCap": "400"}, + "Dimensions": {"L": "18.99", "H": "4.243", "W": "3.034", "Cx": "0.3"}, + "Wheels": {"D": "1.100", "AIM": "4000", "Tw": "1.435", "Axle": "Co'Co'", "Ad": "1.950", "Bd": "10.3", "Rmin": "100"}, + "Brake": {"BrakeValve": "LSt", "NBpA": "4", "MBF": "85.0", "MaxBP": "4.1", "MaxASBP": "1.5", "RM": "0.71", "BCN": "8", "BCR": "0.114", "RV": "50", "BCD": "0.06", "BCM": "8.1", "HiPP": "5", "LoPP": "3.5", "Vv": "0.8", "MinCP": "8.0", "MaxCP": "10.0", "CompressorSpeed": "0.0613", "CompressorPower": "Converter", "BCS": "1", "BSA": "2", "BM": "P10-Bgu", "BVV": "250", "BRE": "0.9", "UBB1": "8", "HandlePipeUnlockPos": "-0.5", "LPOn": "2.75", "LPOff": "4.5"}, + "SpringBrake": {"Volume": "10", "MBF": "8", "MaxSP": "5.5", "ResetP": "4.0", "MinFP": "3.5", "PressOff": "4.5", "PressOn": "3.5", "ValveOnArea": "0.0002", "ValveOffArea": "0.0002", "ValvePNBArea": "0.002", "MTC": "4"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "39", "ControlType": "ST45"}, + "Cntrl": {"BrakeHandle": "MHZ_K8P", "LocBrakeHandle": "FD1", "BrakeSystem": "Pneumatic", "BCPN": "10", "BDelay1": "15", "BDelay2": "6", "BDelay3": "36", "BDelay4": "32", "ASB": "Manual", "LocalBrake": "PneumaticBrake", "MCPN": "4", "SCPN": "3", "AutoRelay": "Yes", "IniCDelay": "0.5", "SCDelay": "0.1", "BrakeDelays": "GPR", "ConverterStart": "Automatic", "ConverterStartDelay": "5", "MotorBlowersStart": "Converter", "FuelStart": "Automatic", "OilStart": "Automatic", "WaterStart": "Battery", "EIMCtrlType": "3", "BrakeOpModes": "PN", "DirChangeMaxPos": "2", "rows": [ + ["-1","0.7","-1","15","Pneumatic"], + ["0","0.5","-1","9","Pneumatic"], + ["1","0.46","-1","9","Pneumatic"], + ["2","0.42","-1","9","Pneumatic"], + ["3","0.38","-1","9","Pneumatic"], + ["4","0.34","-1","9","Pneumatic"], + ["5","0.29","-1","9","Pneumatic"], + ["6","0","-1","15","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "5", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "6", "RadioStop": "Yes"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "227.8"}, + "Engine": {"AIM": "0.9", "EngineType": "DumbDE", "Trans": "19:64", "Ftmax": "326000", "Flat": "0", "Vhyp": "7.2", "Vadd": "5.5", "Cr": "1.0", "RelayType": "45", "WaterMinTemperature": "40", "WaterFlowTemperature": "70", "WaterCoolingTemperature": "82", "WaterMaxTemperature": "91", "WaterShutters": "Yes", "WaterAuxCircuit": "Yes", "WaterAuxCoolingTemperature": "60", "WaterAuxMaxTemperature": "74", "WaterAuxShutters": "Yes", "OilMinPressure": "0.15", "HeatKFO2": "24", "HeatingRPM": "1096", "MotorBlowersSpeed": "-10", "MotorBlowersSustainTime": "600", "MotorBlowersStartVelocity": "0.1"}, + "SpeedControl": {"SpeedCtrl": "Yes", "SpeedButtons": "0|30|40|50|60|70|80|90|100|120", "OverrideManual": "Yes", "InitPwr": "0.3", "MaxPwrVel": "5", "StartVel": "2", "VelStep": "5", "PwrStep": "0.1", "MinPwr": "0.3", "MaxPwr": "1.0", "MinVel": "0", "MaxVel": "120", "Offset": "-0.5", "kPpos": "0.1", "kPneg": "0.4", "kIpos": "0.06", "kIneg": "0.06", "BrakeIntervention": "Yes"}, + "MotorParamTable": {"rows": [ + ["0","20","100","3000","20.8","1340","1713"], + ["1","18.5","110","2700","25","1340","1713"], + ["2","17.2","135","2500","30","1340","1713"], + ["3","14.3","170","2000","48.5","1340","1713"] + ]}, + "Circuit": {"CircuitRes": "0.01", "ImaxLo": "3300", "IminLo": "2500"}, + "WWList": {"Size": "4", "rows": [ + ["600","0","0","0"], + ["1365","1131","816","3026"], + ["1410","1196","864","3204"], + ["1455","1264","912","3382"], + ["1500","1320","960","3560"] + ]}, + "LightsList": {"Size": "8", "Wrap": "no", "Default": "4", "rows": [ + ["38","34"], + ["38","0"], + ["34","34"], + ["0","0"], + ["21","34"], + ["22","34"], + ["01","16"], + ["16","01"] + ]}, + "UCList": {"Size": "4", "IntegratedBrakePN": "no", "IntegratedBrake": "no", "rows": [ + ["0","0","0","0","0","0.15","0.15","0","1","0"], + ["1","0","0","0","0","0.15","0.15","3","3","1"], + ["2","0","0","1","0","0.00","0.15","3","4","1"], + ["3","0","0","1","0","0.15","0.00","4","5","3"], + ["4","0","0","1","1","0.15","0.15","4","5","3"] + ]} +} diff --git a/tests/unit/data/fiz/static/sug/sug_kielce.json b/tests/unit/data/fiz/static/sug/sug_kielce.json new file mode 100644 index 000000000..d7474ed0f --- /dev/null +++ b/tests/unit/data/fiz/static/sug/sug_kielce.json @@ -0,0 +1,70 @@ +{ + "_source": "static/sug/sug_kielce.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "120000", "Mred": "18000", "Vmax": "100", "PWR": "1860", "SandCap": "700", "Type": "et22"}, + "Load": {"MaxLoad": "52", "LoadQ": "pieces", "LoadAccepted": "pantstate", "LoadSpeed": "1", "UnLoadSpeed": "0.1"}, + "Dimensions": {"L": "16.820", "H": "4.559", "W": "3.005", "Cx": "0.585"}, + "Wheels": {"D": "1.250", "AIM": "2000", "Tw": "1.435", "Axle": "Co'Co'", "Ad": "2.1", "Bd": "8.6", "Rmin": "100", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "W", "NBpA": "4", "MBF": "85.0", "MaxBP": "4.1", "LocMaxBP": "5.0", "BCN": "8", "BCR": "0.114", "BCD": "0.12", "BCM": "7.0", "HiPP": "5", "LoPP": "3.5", "Vv": "0.88", "MinCP": "7.0", "MaxCP": "8.0", "CompressorSpeed": "0.0567", "BCS": "0.8", "BSA": "0", "BM": "P10-Bg", "BVV": "200", "CompressorPower": "Main", "BRE": "0.75"}, + "Doors": {"OpenCtrl": "DriverCtrl", "CloseCtrl": "DriverCtrl", "OpenSpeed": "0.3", "CloseSpeed": "0.1", "DoorMaxShiftL": "0.53", "DoorMaxShiftR": "0.53", "DoorOpenMethod": "Shift", "DoorClosureWarning": "Yes"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "850", "beta": "0.5", "AllowedFlag": "0"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "BCPN": "4", "BDelay1": "15", "BDelay2": "4", "ASB": "Manual", "LocalBrake": "PneumaticBrake", "ManualBrake": "Yes", "DynamicBrake": "Passive", "MCPN": "36", "SCPN": "3", "AutoRelay": "No", "IniCDelay": "0.5", "SCDelay": "0.23", "BrakeDelays": "GP", "BrakeHandle": "Knorr", "LocBrakeHandle": "Knorr", "rows": [ + ["-1","0.90","0","15","Pneumatic"], + ["0","0.50","0","9","Pneumatic"], + ["1","-1","-1","0","Pneumatic"], + ["2","-1","-1","5","Pneumatic"], + ["3","0.001","-1","9","Pneumatic"], + ["4","0.00","-1","15","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "5", "EmergencyBrakeDelay": "6", "RadioStop": "Yes"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Power": {"EnginePower": "CurrentCollector", "CollectorsNo": "2", "MaxVoltage": "3600", "MaxCurrent": "1500", "MinH": "0.38", "MaxH": "2.4", "CSW": "1.4", "MinV": "1800", "MinPress": "3.5", "MaxPress": "5.0"}, + "Engine": {"EngineType": "ElectricSeriesMotor", "Volt": "1500", "Trans": "24:85", "WindingRes": "0.1782", "nmax": "1500"}, + "Switches": {"Pantograph": "impulse"}, + "MotorParamTable0": {"rows": [ + ["0","24.84","85","0.02","167.8","85","0.02"], + ["1","21.37","180","-0.15","144.4","180","-0.15"], + ["2","20.67","230","-0.15","139.7","230","-0.15"], + ["3","21.69","190","-0.04","145","190","-0.04"] + ]}, + "Circuit": {"CircuitRes": "0.01", "ImaxLo": "500", "ImaxHi": "500", "IminLo": "250", "IminHi": "250"}, + "RList": {"Size": "36", "RVent": "Automatic", "RVentnmax": "3300", "RVentCutOff": "50", "rows": [ + ["0","0","0","0","0"], + ["1","26.43","1","6","0"], + ["2","18.43","1","6","0"], + ["3","13.49","1","6","0"], + ["4","10.87","1","6","0"], + ["5","9.40","1","6","0"], + ["6","7.97","1","6","0"], + ["7","6.56","1","6","0"], + ["8","5.56","1","6","0"], + ["9","4.59","1","6","0"], + ["10","3.36","1","6","0"], + ["11","2.67","1","6","0"], + ["12","2.04","1","6","0"], + ["13","1.48","1","6","0"], + ["14","0.91","1","6","0"], + ["15","0.37","1","6","0"], + ["16","0.00","1","6","0"], + ["17","3.72","2","3","0"], + ["18","2.68","2","3","0"], + ["19","2.40","2","3","0"], + ["20","1.98","2","3","0"], + ["21","1.88","2","3","0"], + ["22","1.26","2","3","0"], + ["23","0.98","2","3","0"], + ["24","0.72","2","3","0"], + ["25","0.40","2","3","0"], + ["26","0.21","2","3","0"], + ["27","0.00","2","3","0"], + ["28","1.59","3","2","0"], + ["29","1.16","3","2","0"], + ["30","0.86","3","2","0"], + ["31","0.65","3","2","0"], + ["32","0.48","3","2","0"], + ["33","0.40","3","2","0"], + ["34","0.25","3","2","0"], + ["35","0.14","3","2","0"], + ["36","0.00","3","2","0"] + ]} +} diff --git a/tests/unit/data/fiz/su45_v2/301d.json b/tests/unit/data/fiz/su45_v2/301d.json new file mode 100644 index 000000000..e45090fb2 --- /dev/null +++ b/tests/unit/data/fiz/su45_v2/301d.json @@ -0,0 +1,47 @@ +{ + "_source": "pkp/su45_v2/301d.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "102000", "Mred": "15000", "Vmax": "120", "PWR": "1250", "SandCap": "400", "HeatingP": "300"}, + "Dimensions": {"L": "18.99", "H": "4.238", "W": "2.900", "Cx": "0.2"}, + "Wheels": {"D": "1.100", "AIM": "4000", "Tw": "1.435", "Axle": "Co'Co'", "Ad": "1.950", "Bd": "10.3", "Rmin": "100"}, + "Brake": {"BrakeValve": "LSt", "NBpA": "4", "MBF": "85.0", "MaxBP": "4.1", "LocMaxBP": "4.5", "MaxASBP": "1.5", "RM": "0.69", "BCN": "8", "BCR": "0.114", "BCD": "0.06", "BCM": "8.1", "HiPP": "5", "LoPP": "3.5", "Vv": "0.8", "MinCP": "7.0", "MaxCP": "8.5", "CompressorSpeed": "0.053", "BCS": "1", "BSA": "2", "BM": "P10-Bgu", "CompressorPower": "Engine", "BVV": "240", "BRE": "0.9"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "103", "ControlType": "SU45"}, + "Cntrl": {"BrakeHandle": "FV4a", "LocBrakeHandle": "FD1", "BrakeSystem": "Pneumatic", "BCPN": "6", "BDelay1": "15", "BDelay2": "6", "BDelay3": "36", "BDelay4": "32", "ASB": "Manual", "LocalBrake": "PneumaticBrake", "MCPN": "14", "SCPN": "3", "AutoRelay": "Yes", "IniCDelay": "0.5", "SCDelay": "0.1", "BrakeDelays": "GPR", "MotorBlowersStart": "Manual", "ConverterStart": "Automatic", "rows": [ + ["-1","0.7","-1","15","Pneumatic"], + ["0","0.5","-1","9","Pneumatic"], + ["1","0.46","-1","9","Pneumatic"], + ["2","0.42","-1","9","Pneumatic"], + ["3","0.38","-1","9","Pneumatic"], + ["4","0.34","-1","9","Pneumatic"], + ["5","0.29","-1","9","Pneumatic"], + ["6","0","-1","15","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "5", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "6", "RadioStop": "Yes"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "227.8"}, + "TurboPos": {"TurboPos": "4"}, + "Engine": {"AIM": "1.6", "EngineType": "DumbDE", "Trans": "18:62", "Ftmax": "326000", "Flat": "0", "Vhyp": "7.2", "Vadd": "5.5", "Cr": "1.0", "RelayType": "45", "WaterMinTemperature": "40", "WaterFlowTemperature": "70", "WaterCoolingTemperature": "82", "WaterMaxTemperature": "91", "WaterShutters": "Yes", "WaterAuxCircuit": "Yes", "WaterAuxCoolingTemperature": "60", "WaterAuxMaxTemperature": "74", "WaterAuxShutters": "Yes", "OilMinPressure": "0.15", "HeatKFO2": "24", "HeatingRPM": "1096", "MotorBlowersSpeed": "-10"}, + "Clima": {"HMaxVoltage": "3000", "Heating": "Generator", "HGeneratorEngine": "Main", "HGeneratorMinRPM": "696", "HGeneratorMinVoltage": "2400", "HGeneratorMaxRPM": "1500", "HGeneratorMaxVoltage": "3300"}, + "MotorParamTable": {"rows": [ + ["0","20","100","3000","20.8","1340","0"], + ["1","18.5","110","2700","25","1340","40"], + ["2","17.2","135","2500","30","1340","50"], + ["3","14.3","170","2000","48.5","1340","1713"] + ]}, + "WWList": {"Size": "14", "rows": [ + ["696","0","0","0"], + ["696","0","0","0"], + ["629","96","78","273"], + ["763","192","147","547"], + ["830","288","221","820"], + ["897","384","295","1094"], + ["964","480","369","1367"], + ["1031","576","442","1641"], + ["1098","672","516","1914"], + ["1165","768","590","2187"], + ["1232","864","664","2461"], + ["1299","960","737","2734"], + ["1366","1056","811","3007"], + ["1433","1152","885","3281"], + ["1500","1245","960","3560"] + ]} +} diff --git a/tests/unit/data/fiz/su46_v2/303d.json b/tests/unit/data/fiz/su46_v2/303d.json new file mode 100644 index 000000000..57061902f --- /dev/null +++ b/tests/unit/data/fiz/su46_v2/303d.json @@ -0,0 +1,50 @@ +{ + "_source": "pkp/su46_v2/303d.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "105000", "Mred": "15000", "Vmax": "120", "PWR": "1400", "SandCap": "400", "HeatingP": "440"}, + "Dimensions": {"L": "18.99", "H": "4.292", "W": "2.904", "Cx": "0.3"}, + "Wheels": {"D": "1.100", "AIM": "4000", "Tw": "1.435", "Axle": "Co'Co'", "Ad": "1.75", "Bd": "10.3", "Rmin": "100"}, + "Brake": {"BrakeValve": "LSt", "NBpA": "4", "MBF": "85.0", "MaxBP": "4.4", "LocMaxBP": "4.4", "MaxASBP": "1.3", "RM": "0.71", "BCN": "12", "BCR": "0.114", "BCD": "0.06", "BCM": "5.84", "HiPP": "5", "LoPP": "3.5", "Vv": "0.9", "MinCP": "7", "MaxCP": "8.5", "CompressorSpeed": "0.05", "BCS": "1", "BSA": "2", "BM": "P10-Bgu", "CompressorPower": "Converter", "BVV": "200", "BRE": "0.8"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "103", "ControlType": "SU46"}, + "Cntrl": {"BrakeHandle": "FV4a", "LocBrakeHandle": "FD1", "BrakeSystem": "Pneumatic", "BCPN": "6", "BDelay1": "15", "BDelay2": "6", "BDelay3": "36", "BDelay4": "32", "ASB": "Manual", "LocalBrake": "PneumaticBrake", "MCPN": "15", "SCPN": "4", "AutoRelay": "Yes", "IniCDelay": "0.5", "SCDelay": "0.1", "BrakeDelays": "GPR", "ConverterStart": "Automatic", "ConverterStartDelay": "10", "MotorBlowersStart": "Manual", "rows": [ + ["-1","0.7","-1","15","Pneumatic"], + ["0","0.5","-1","9","Pneumatic"], + ["1","0.46","-1","9","Pneumatic"], + ["2","0.42","-1","9","Pneumatic"], + ["3","0.38","-1","9","Pneumatic"], + ["4","0.34","-1","9","Pneumatic"], + ["5","0.29","-1","9","Pneumatic"], + ["6","0","-1","15","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "5", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "6", "RadioStop": "Yes"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "100"}, + "Engine": {"AIM": "1.6", "EngineType": "DumbDE", "Trans": "18:62", "Ftmax": "317000", "Flat": "0", "Vhyp": "15.0", "Vadd": "3.8", "Cr": "1.0", "RelayType": "46", "HeatingRPM": "1098", "OilMinPressure": "0.055", "OilMaxPressure": "0.6", "WaterMinTemperature": "40", "WaterMaxTemperature": "92", "WaterCoolingTemperature": "76", "WaterFlowTemperature": "71", "WaterShutters": "Yes", "WaterAuxCircuit": "Yes", "WaterAuxFlowTemperature": "1", "WaterAuxMinTemperature": "35", "WaterAuxMaxTemperature": "71", "WaterAuxCoolingTemperature": "56", "WaterAuxShutters": "Yes", "HeaterMinTemperature": "50", "HeaterMaxTemperature": "85", "HeatKW": "0.068599", "HeatKV": "0.3", "HeatKFE": "1", "HeatKFS": "87.76269", "HeatKFO": "26.72716", "HeatKFO2": "57.72", "WaterCoolingFanSpeed": "0.56", "MotorBlowersSpeed": "-10"}, + "TurboPos": {"TurboPos": "4"}, + "Circuit": {"CircuitRes": "0.01", "ImaxLo": "3300", "IminLo": "2500"}, + "Clima": {"HMaxVoltage": "3000", "Heating": "Generator", "HGeneratorEngine": "Main", "HGeneratorMinRPM": "696", "HGeneratorMinVoltage": "2400", "HGeneratorMaxRPM": "1500", "HGeneratorMaxVoltage": "3300"}, + "MotorParamTable": {"rows": [ + ["0","16.7","100","2000","24.1","1680","0"], + ["1","16.9","155","2250","36.9","40","40"], + ["2","17.1","210","2500","50.8","1680","1680"], + ["3","17.3","265","2800","65.0","50","50"], + ["4","17.5","321","3125","79.9","0","1680"] + ]}, + "WWList": {"Size": "15", "rows": [ + ["696","0","0","0"], + ["696","0","0","0"], + ["696","80","350","1000"], + ["696","80","350","1000"], + ["763","214","455","1400"], + ["830","321","500","1600"], + ["897","428","545","1800"], + ["964","535","590","2000"], + ["1031","642","635","2200"], + ["1098","748","680","2400"], + ["1165","855","725","2600"], + ["1232","962","770","2800"], + ["1299","1069","815","3000"], + ["1366","1176","865","3200"], + ["1433","1283","910","3400"], + ["1500","1390","960","3600"] + ]} +} diff --git a/tests/unit/data/fiz/tem2_v2/tem2a.json b/tests/unit/data/fiz/tem2_v2/tem2a.json new file mode 100644 index 000000000..6a9831b57 --- /dev/null +++ b/tests/unit/data/fiz/tem2_v2/tem2a.json @@ -0,0 +1,39 @@ +{ + "_source": "pkp/tem2_v2/tem2a.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "116000", "Mred": "20000", "Vmax": "100", "PWR": "780", "SandCap": "2000"}, + "Dimensions": {"L": "17", "H": "4.62", "W": "2.95", "Cx": "0.1"}, + "Wheels": {"D": "1.05", "AIM": "4000", "Tw": "1.435", "Axle": "Co'Co'", "Ad": "2.1", "Bd": "8.6", "Rmin": "80", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "LSt", "NBpA": "2", "MBF": "124", "MaxBP": "4.1", "MaxLBP": "3.9", "BCN": "4", "BCR": "0.127", "BCD": "0.1", "BCM": "10.77", "HiPP": "5.0", "LoPP": "3.5", "Vv": "0.888", "MinCP": "7", "MaxCP": "8.5", "CompressorSpeed": "0.077", "CompressorPower": "Main", "BCS": "1", "BSA": "0", "BM": "P10-Bgu", "BVV": "222", "BRE": "0.85"}, + "BuffCoupl1": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "3"}, + "BuffCoupl2": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "23", "ControlType": "TEM2"}, + "Cntrl": {"BrakeHandle": "M394", "LocBrakeHandle": "FD1", "BrakeDelays": "G", "BrakeSystem": "Pneumatic", "BCPN": "5", "BDelay1": "25", "BDelay2": "13", "BDelay3": "25", "BDelay4": "13", "ASB": "None", "LocalBrake": "PneumaticBrake", "MCPN": "8", "SCPN": "2", "AutoRelay": "Yes", "IniCDelay": "0.5", "SCDelay": "0.1", "rows": [ + ["-1","1.0","-1","10","Pneumatic"], + ["0","0.5","-1","4","Pneumatic"], + ["1","-1","-1","0","Pneumatic"], + ["2","-1","-1","2","Pneumatic"], + ["3","0.0","-1","2","Pneumatic"], + ["4","0.0","-1","6","Pneumatic"], + ["5","0.0","-1","15","Pneumatic"] + ]}, + "Security": {"AwareSystem": "Active,CabSignal", "AwareDelay": "60", "SoundSignalDelay": "5", "MaxHoldTime": "1.0", "EmergencyBrakeDelay": "6", "RadioStop": "Yes"}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "75", "LMaxCurrent": "75"}, + "TurboPos": {"TurboPos": "3"}, + "Engine": {"AIM": "0.9", "EngineType": "DieselElectric", "Trans": "15:68", "Ftmax": "396000", "Flat": "1", "Vhyp": "15", "Vadd": "0", "Cr": "1.107", "OilMinPressure": "0.16", "OilMaxPressure": "0.3", "WaterCoolingFanSpeed": "1.41", "WaterMaxTemperature": "88", "WaterCoolingTemperature": "76", "WaterShutters": "yes"}, + "MotorParamTable": {"rows": [ + ["0","24","66","2000","14","1000","0"], + ["1","18","70","1600","17","1000","1400"], + ["2","15","106","1400","26","0","1400"] + ]}, + "WWList": {"Size": "8", "rows": [ + ["300","0","0","0"], + ["290","65","870","1900"], + ["270","166","870","1900"], + ["330","268","870","1900"], + ["400","370","870","1900"], + ["480","471","870","1900"], + ["570","573","870","1900"], + ["650","647","870","1900"], + ["750","780","870","1900"] + ]} +} diff --git a/tests/unit/data/fiz/wm15_v1/wm15.json b/tests/unit/data/fiz/wm15_v1/wm15.json new file mode 100644 index 000000000..1b1cdce49 --- /dev/null +++ b/tests/unit/data/fiz/wm15_v1/wm15.json @@ -0,0 +1,22 @@ +{ + "_source": "pkp/wm15_v1/wm15.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "20000", "Vmax": "80", "PWR": "200", "SandCap": "400"}, + "Dimensions": {"L": "11", "H": "4.292", "W": "2.900", "Cx": "0.3"}, + "Wheels": {"D": "1.100", "AIM": "4000", "Tw": "1.435", "Axle": "Bo'Bo'", "Ad": "2.6", "Bd": "10.1", "Rmin": "80"}, + "Brake": {"BrakeValve": "LSt", "NBpA": "4", "MBF": "85.0", "MaxBP": "3.8", "BCN": "4", "BCR": "0.0625", "BCD": "0.11", "BCM": "5.14", "HiPP": "5.0", "LoPP": "3.5", "Vv": "0.250", "MinCP": "7.5", "MaxCP": "8.5", "CompressorSpeed": "0.03", "BVV": "52", "BRE": "0.8", "BM": "P10-Bg", "BCS": "0.8", "BSA": "0"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "3"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "BCPN": "6", "BDelay1": "15", "BDelay2": "4", "BDelay3": "35", "BDelay4": "25", "ASB": "Manual", "LocalBrake": "PneumaticBrake", "MCPN": "8", "SCPN": "3", "AutoRelay": "No", "IniCDelay": "0.5", "SCDelay": "0.1", "BrakeDelays": "GP", "BrakeHandle": "FV4a", "LocBrakeHandle": "FD1", "rows": [ + ["-1","0.8","-1","20","Pneumatic"], + ["0","0.5","-1","2","Pneumatic"], + ["1","0.46","-1","2","Pneumatic"], + ["2","0.42","-1","2","Pneumatic"], + ["3","0.38","-1","2","Pneumatic"], + ["4","0.34","-1","2","Pneumatic"], + ["5","0.29","-1","2","Pneumatic"], + ["6","0","-1","40","Pneumatic"] + ]}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "110", "LMaxCurrent": "155"}, + "Power": {"EnginePower": "Internal"}, + "Engine": {"EngineType": "Dumb", "Ftmax": "250000"} +} diff --git a/tests/unit/data/fiz/wmb10_v1/wmb10.json b/tests/unit/data/fiz/wmb10_v1/wmb10.json new file mode 100644 index 000000000..8dc4272f6 --- /dev/null +++ b/tests/unit/data/fiz/wmb10_v1/wmb10.json @@ -0,0 +1,49 @@ +{ + "_source": "pkp/wmb10_v1/wmb10.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "9800", "Vmax": "70", "PWR": "92", "SandCap": "0", "Mred": "1000"}, + "Dimensions": {"L": "8.21", "H": "2.9", "W": "2.8", "Cx": "0.2"}, + "Load": {"MaxLoad": "6", "LoadQ": "pieces", "LoadAccepted": "Passengers,naprawcze,brygada_naprawcza,konserwacja", "OverLoadFactor": "1", "LoadSpeed": "0.5", "UnLoadSpeed": "0.5"}, + "Wheels": {"D": "0.7", "AIM": "2000", "Tw": "1.435", "Axle": "1'A", "Bd": "5.1", "Rmin": "80", "BearingType": "Roll"}, + "Doors": {"OpenCtrl": "Passenger", "CloseCtrl": "Passenger", "OpenSpeed": "0.2", "CloseSpeed": "0.2", "DoorOpenMethod": "Rotate", "DoorMaxShiftL": "0.625", "DoorMaxShiftR": "0.625"}, + "Brake": {"BrakeValve": "LSt", "Size": "12", "NBpA": "1", "MBF": "11", "MaxBP": "4.0", "BCN": "2", "BCR": "0.1016", "BCD": "0.15", "BCM": "4.1", "BCS": "1.0", "BSA": "1.0", "BM": "Disk2", "BVV": "50", "BRE": "0.9", "MinCP": "6", "MaxCP": "7.3", "Vv": "0.2", "CompressorSpeed": "0.0125", "CompressorPower": "Main"}, + "SpringBrake": {"Volume": "9.4", "MBF": "11", "MaxSP": "5.5", "ResetP": "4.0", "MinFP": "3.5", "PressOff": "4.5", "PressOn": "4.2", "ValveOnArea": "0.0005", "ValveOffArea": "0.0005", "ValvePNBArea": "0.002", "MTC": "132"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.15", "FmaxB": "740", "kC": "4800", "DmaxC": "0.15", "FmaxC": "780", "beta": "0.58", "AllowedFlag": "3"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "BCPN": "6", "BDelay1": "15", "BDelay2": "4", "BDelay3": "35", "BDelay4": "25", "ASB": "Manual", "LocalBrake": "PneumaticBrake", "MCPN": "9", "SCPN": "5", "AutoRelay": "no", "IniCDelay": "0.48", "SCDelay": "0.3", "BrakeDelays": "P", "BrakeHandle": "FV4a", "LocBrakeHandle": "FD1", "FuelStart": "Automatic", "OilStart": "Automatic", "WaterStart": "Battery", "ConverterStart": "Automatic", "rows": [ + ["-1","0.8","-1","20","Pneumatic"], + ["0","0.5","-1","2","Pneumatic"], + ["1","0.46","-1","2","Pneumatic"], + ["2","0.42","-1","2","Pneumatic"], + ["3","0.38","-1","2","Pneumatic"], + ["4","0.34","-1","2","Pneumatic"], + ["5","0.29","-1","2","Pneumatic"], + ["6","0","-1","40","Pneumatic"] + ]}, + "Light": {"Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": "24", "LMaxCurrent": "100"}, + "Engine": {"EngineType": "DieselEngine", "Trans": "10:54", "nmin": "575", "nmax": "2700", "nmax_cutoff": "2600", "AIM": "10", "EUS": "20", "EDS": "20"}, + "MotorParamTable": {"minVelfullengage": "1.62", "engageDia": "1", "engageMaxForce": "384", "engagefriction": "1", "rows": [ + ["0","0","0","-1"], + ["1","6.93","-1","10"], + ["2","4.03","4","17"], + ["3","2.36","9","30"], + ["4","1.40","18","53"], + ["5","1.00","33","100"] + ]}, + "DList": {"Size": "9", "Mmax": "450", "nMmax": "26.66", "Mnmax": "370", "nmax": "43.33", "nominalfill": "1", "Mstand": "130", "rows": [ + ["0","0.4","0"], + ["1","0.46","1"], + ["2","0.52","2"], + ["3","0.58","2"], + ["4","0.64","2"], + ["5","0.70","2"], + ["6","0.76","2"], + ["7","0.82","2"], + ["8","0.88","2"], + ["9","1.0","2"] + ]}, + "LightsList": {"Size": "3", "Wrap": "No", "Default": "2", "rows": [ + ["34","21"], + ["0","0"], + ["21","34"] + ]} +} diff --git a/tests/unit/data/fiz/z1_v2/152a.json b/tests/unit/data/fiz/z1_v2/152a.json new file mode 100644 index 000000000..8b33786a2 --- /dev/null +++ b/tests/unit/data/fiz/z1_v2/152a.json @@ -0,0 +1,14 @@ +{ + "_source": "pkp/z1_v2/152a.fiz", + "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads", + "Param": {"Category": "train", "M": "48000", "Vmax": "200", "HeatingP": "54", "LightP": "0.56"}, + "Load": {"MaxLoad": "80", "LoadQ": "pieces", "LoadAccepted": "Passengers,Luggage", "OverLoadFactor": "1.5", "LoadSpeed": "1", "UnLoadSpeed": "2"}, + "Dimensions": {"L": "26.4", "H": "4", "W": "2.9", "Cx": "0.01"}, + "Wheels": {"D": "0.92", "Tw": "1.435", "Axle": "2'2'", "Ad": "2.70", "Bd": "19", "Rmin": "100", "BearingType": "Roll"}, + "Brake": {"BrakeValve": "KE", "MBF": "11", "MaxBP": "3.8", "BCN": "12", "BCR": "0.127", "BCD": "0.05", "BCM": "1.42", "NBpA": "6", "RM": "1.4", "BM": "Disk1+Mg", "BCS": "1.2", "BSA": "0", "BVV": "130", "TBF": "32"}, + "BuffCoupl": {"CType": "Screw", "kB": "9200", "DmaxB": "0.11", "FmaxB": "320", "kC": "4500", "DmaxC": "0.1", "FmaxC": "850", "beta": "0.58", "AllowedFlag": "115"}, + "Cntrl": {"BrakeSystem": "Pneumatic", "LocalBrake": "ManualBrake", "BrakeDelays": "PR+Mg", "ASB": "Yes", "rows": []}, + "Light": {"Light": "Generator", "LGeneratorEngine": "WheelsDriven", "LMaxVoltage": "24", "AlterLight": "Accu", "AlterLMaxVoltage": "24", "AlterLCap": "495", "AlterLRS": "Generator"}, + "Clima": {"Heating": "PowerCable", "HPowerTrans": "ElectricPower", "HMaxVoltage": "3000"}, + "Doors": {"OpenCtrl": "Passenger", "CloseCtrl": "AutomaticCtrl", "OpenSpeed": "0.5", "CloseSpeed": "0.20", "DoorMaxShiftL": "0.9", "DoorMaxShiftR": "0.9", "DoorOpenMethod": "Plug", "DoorClosureWarning": "yes", "DoorBlocked": "Yes", "DoorMaxShiftPlug": "0.043"} +} diff --git a/tests/unit/data/golden/.gitignore b/tests/unit/data/golden/.gitignore new file mode 100644 index 000000000..b191ca629 --- /dev/null +++ b/tests/unit/data/golden/.gitignore @@ -0,0 +1,4 @@ +# the golden traces are recorded on the code before a change, not kept: the samples and their key figures +# (see tests/unit/README.md) +*.csv +*.figures diff --git a/tests/unit/drive.cpp b/tests/unit/drive.cpp new file mode 100644 index 000000000..0ee5adb2b --- /dev/null +++ b/tests/unit/drive.cpp @@ -0,0 +1,246 @@ +#include "stdafx.h" +#include "drive.h" +#include "consist.h" +#include "golden.h" +#include "doctest.h" + +#include "McZapkie/hamulce.h" + +namespace test { + +void mark(trace *Trace, std::string const &Event) { + if (Trace != nullptr) { + Trace->mark(Event); + } +} + +bool is_powered(TMoverParameters const &Vehicle) { + using enum TEngineType; + auto const type{Vehicle.EngineType}; + return Vehicle.Power > 1.0 && (type == ElectricSeriesMotor || type == ElectricInductionMotor || type == DieselEngine || type == DieselElectric); +} + +driven driving(vehicle &Vehicle) { + return {Vehicle.mover(), Vehicle.mover(), Vehicle.mover(), [&Vehicle](double Seconds, track const &Track) { Vehicle.run(Seconds, Track); }}; +} + +driven driving(consist &Consist) { + // the AI's mvControlling and mvPantographUnit: the first vehicle with an engine, and with pantographs + auto *controlling{&Consist[0].mover()}; + auto *pantographs{&Consist[0].mover()}; + for (auto i = Consist.size(); i-- > 0;) { + auto &mover{Consist[i].mover()}; + if (is_powered(mover)) { + controlling = &mover; + } + if (mover.EnginePowerSource.SourceType == TPowerSource::CurrentCollector && mover.EnginePowerSource.CollectorParameters.CollectorsNo > 0) { + pantographs = &mover; + } + } + return {Consist[0].mover(), *controlling, *pantographs, [&Consist](double Seconds, track const &Track) { Consist.run(Seconds, Track); }}; +} + +namespace { + +void attend(TMoverParameters &Mover) { + if (Mover.SecuritySystem.is_cabsignal_blinking() && Mover.SecuritySystem.has_separate_acknowledge()) { + Mover.SecuritySystem.cabsignal_reset(); + } + if (Mover.SecuritySystem.is_blinking()) { + Mover.SecuritySystemReset(); + } +} + +} // namespace + +void drive(driven Driven, track const &Track, double Seconds) { + auto const seconds{std::lround(Seconds)}; + for (long second = 0; second < seconds; ++second) { + attend(Driven.cab); + Driven.run(1.0, Track); + } +} + +void release_brakes(TMoverParameters &Cab) { + Cab.BrakeLevelSet(Cab.Handle->GetPos(bh_RP)); + Cab.DecLocalBrakeLevel(LocalBrakePosNo); + Cab.DecManualBrakeLevel(ManualBrakePosNo); + Cab.SpringBrakeActivate(false); + // the hand and spring brakes of the rest of the train, as TController::AutoRewident() releases them + std::vector train{&Cab}; + std::vector pending{&Cab}; + while (false == pending.empty()) { + auto const *vehicle{pending.back()}; + pending.pop_back(); + for (auto const &thiscoupler : vehicle->Couplers) { + if (thiscoupler.Connected != nullptr && thiscoupler.CouplingFlag != coupling::faux && std::ranges::find(train, thiscoupler.Connected) == train.end()) { + thiscoupler.Connected->DecManualBrakeLevel(ManualBrakePosNo); + thiscoupler.Connected->SpringBrake.Activate = false; + train.push_back(thiscoupler.Connected); + pending.push_back(thiscoupler.Connected); + } + } + } +} + +bool is_ready(driven const &Driven) { + auto const &mover{Driven.controlling}; + auto const air{mover.VeselVolume <= 0.0 || mover.ScndPipePress >= 4.5}; + // the converter feeds the 110 V circuits (the electrodynamic brake's control among them); the AI switches + // it on once the line breaker is closed, so a train already charged with air isn't ready before it runs + auto const converter{mover.ConverterStart != start_t::manual || mover.ConverterFlag}; + return mover.Mains && air && converter; +} + +namespace { + +// the pumps and the heater of a diesel's water, and the fuel pump +void prepare_diesel(driven const &Driven) { + Driven.cab.OilPumpSwitch(true); + Driven.controlling.WaterPumpBreakerSwitch(true); + Driven.controlling.WaterPumpSwitch(true); + Driven.controlling.WaterHeaterBreakerSwitch(true); + Driven.controlling.WaterHeaterSwitch(true); + Driven.cab.FuelPumpSwitch(true); +} + +// the pantographs' own air topped up by their compressor, and the pantographs raised +void raise_pantographs(driven const &Driven) { + auto &pantographs{Driven.pantographs}; + if (auto const enough{(pantographs.TrainType == dt_EZT ? 2.5 : 3.5) + 0.1}; pantographs.PantPress < enough) { + if (false == pantographs.PantAutoValve) { + pantographs.bPantKurek3 = false; // the pantographs on their own air + } + pantographs.PantCompFlag = true; + } + else if (false == pantographs.bPantKurek3 || pantographs.PantPress <= pantographs.ScndPipePress) { + pantographs.PantCompFlag = false; + } + Driven.cab.OperatePantographsValve(operation_t::enable); + Driven.cab.OperatePantographValve(end::rear, operation_t::enable); +} + +// the line breaker closed, which it does only with the controller at zero, and after the relays are reset +void close_line_breaker(driven const &Driven) { + auto &controlling{Driven.controlling}; + while (controlling.DecMainCtrl(2)) { + // down to zero + } + controlling.DecScndCtrl(2); + Driven.cab.RelayReset(relay_t::maincircuitground | relay_t::tractionnmotoroverload | relay_t::primaryconverteroverload); + if (controlling.EngineType == TEngineType::DieselEngine) { + // a mechanical diesel starts at idle, the first position giving the engine fuel + while (controlling.RList[controlling.MainCtrlPos].Mn == 0 && controlling.IncMainCtrl(1)) { + // up to the first position with fuel + } + } + Driven.cab.MainSwitch(true); +} + +// the converter, the compressor and the motor blowers, once the line breaker is closed +void switch_auxiliaries_on(TMoverParameters &Cab) { + Cab.ConverterSwitch(true); + Cab.CompressorSwitch(true); + for (auto const side : {end::front, end::rear}) { + if (Cab.MotorBlowers[side].speed != 0) { + Cab.MotorBlowersSwitchOff(false, side); + Cab.MotorBlowersSwitch(true, side); + } + } +} + +} // namespace + +bool start_up(driven Driven, track const &Track, double Seconds, trace *Trace) { + auto &cab{Driven.cab}; + auto const &controlling{Driven.controlling}; + auto const &pantographs{Driven.pantographs}; + mark(Trace, "start up"); + auto const diesel{controlling.EngineType == TEngineType::DieselEngine || controlling.EngineType == TEngineType::DieselElectric}; + auto const collector{pantographs.EnginePowerSource.SourceType == TPowerSource::CurrentCollector && + pantographs.EnginePowerSource.CollectorParameters.CollectorsNo > 0}; + // the converter and the compressor get switched on once the line breaker is closed, wherever in the train + // they are; a train already charged with air isn't ready before that + auto auxiliaries{false}; + // one round of the driver's actions a second, as the AI reacts + for (auto second = 0; second < Seconds; ++second) { + cab.BatterySwitch(true); + cab.CabActivisation(); + if (diesel) { + prepare_diesel(Driven); + } + if (collector) { + raise_pantographs(Driven); + } + if (false == collector || std::max(controlling.GetTrainsetHighVoltage(), controlling.PantographVoltage) > controlling.EnginePowerSource.CollectorParameters.MinV) { + // a direction first, as in TController::PrepareDirection(): the relays reset only with one set + for (int i = 0; i < 3 && cab.DirActive <= 0; ++i) { + cab.DirectionForward(); + } + if (false == controlling.Mains) { + close_line_breaker(Driven); + } + else { + switch_auxiliaries_on(cab); + auxiliaries = true; + } + } + drive(Driven, Track, 1.0); + if (auxiliaries && is_ready(Driven)) { + mark(Trace, "ready"); + return true; + } + } + return false; +} + +void drive_cycle(driven Driven, track const &Track, trace &Trace) { + auto &cab{Driven.cab}; + auto &controlling{Driven.controlling}; + if (false == start_up(Driven, Track, 300.0, &Trace)) { + MESSAGE("didn't get ready: Mains " << controlling.Mains << ", main reservoir " << controlling.ScndPipePress); + } + Trace.mark("release brakes"); + release_brakes(cab); + drive(Driven, Track, 30.0); + + Trace.mark("forward"); + for (int i = 0; i < 3 && cab.DirActive <= 0; ++i) { + cab.DirectionForward(); + } + drive(Driven, Track, 2.0); + + Trace.mark("notch up"); + for (int i = 0; i < 60 && false == controlling.IsMainCtrlMaxPowerPos(); ++i) { + controlling.IncMainCtrl(1); + drive(Driven, Track, 2.0); + } + Trace.mark("full power"); + drive(Driven, Track, 30.0); + + Trace.mark("second controller up"); + for (int i = 0; i < 20 && controlling.IncScndCtrl(1); ++i) { + drive(Driven, Track, 2.0); + } + drive(Driven, Track, 20.0); + Trace.mark("second controller down"); + for (int i = 0; i < 20 && controlling.DecScndCtrl(1); ++i) { + drive(Driven, Track, 1.0); + } + + Trace.mark("notch down"); + for (int i = 0; i < 60 && controlling.DecMainCtrl(1); ++i) { + drive(Driven, Track, 1.0); + } + Trace.mark("coast"); + drive(Driven, Track, 10.0); + + Trace.mark("brake"); + cab.BrakeLevelSet(cab.Handle->GetPos(bh_FB)); + drive(Driven, Track, 60.0); + Trace.mark("release"); + cab.BrakeLevelSet(cab.Handle->GetPos(bh_RP)); + drive(Driven, Track, 20.0); +} + +} // namespace test diff --git a/tests/unit/drive.h b/tests/unit/drive.h new file mode 100644 index 000000000..a1aed95be --- /dev/null +++ b/tests/unit/drive.h @@ -0,0 +1,56 @@ +#pragma once + +#include +#include + +#include "vehicle.h" + +namespace test { + +class trace; +class consist; + +// what a driver does with a vehicle, made of the steps the AI takes (TController and the driver hints of +// application/driverhints.cpp), on the vehicle's own controls. the driver sits in a vehicle with a cab +// (Cab != 0): a lone one, or the first one of a consist, and drives the whole of it + +// what the driver drives: the vehicle with the driver in it, the vehicles the driver controls the engine and +// the pantographs of (the AI's mvOccupied, mvControlling, mvPantographUnit; all the same one in a lone +// vehicle or a locomotive), and the way to run the whole of it +struct driven { + TMoverParameters &cab; + TMoverParameters &controlling; + TMoverParameters &pantographs; + std::function run; +}; +driven driving(vehicle &Vehicle); +driven driving(consist &Consist); + +// gets the vehicle ready to run, the way TController::PrepareEngine() does: battery, cab, pumps and heating +// of a diesel engine, pantographs, line breaker, converter, compressor and motor blowers, then waits for the +// air. stops trying after Seconds; returns whether the vehicle got ready +bool start_up(driven Driven, track const &Track, double Seconds = 300.0, trace *Trace = nullptr); + +// runs the vehicle for Seconds with the driver paying attention, as TController::control_security_system() +// does: once a second the vigilance and the cab signalling get acknowledged when they call for it +void drive(driven Driven, track const &Track, double Seconds); + +// releases every brake the driver has a hand on: the train brake to running, the independent brake, the +// hand brake and the spring brake; and the hand and spring brakes of the vehicles coupled to the cab's +void release_brakes(TMoverParameters &Cab); + +// whether the vehicle is ready to run: line breaker closed (or the engine running), air in the main reservoir +bool is_ready(driven const &Driven); + +// whether the vehicle drives itself +bool is_powered(TMoverParameters const &Vehicle); + +// a trace mark, when there's a trace +void mark(trace *Trace, std::string const &Event); + +// a whole run: start up, release the brakes, notch up to full power, the second controller (field weakening, +// shunting) up and down, notch down, coast and brake to a stop. the controllers move on a fixed schedule, +// not the way a driver watching the ammeter would, so the relays may trip on the way +void drive_cycle(driven Driven, track const &Track, trace &Trace); + +} // namespace test diff --git a/tests/unit/figures.cpp b/tests/unit/figures.cpp new file mode 100644 index 000000000..96f5a3d74 --- /dev/null +++ b/tests/unit/figures.cpp @@ -0,0 +1,222 @@ +#include "stdafx.h" +#include "figures.h" + +#include +#include +#include +#include + + +namespace test { + +namespace { + +// the units of the figures, with the decimals they're written with +struct unit { + char const *name; + int decimals; +}; +unit const seconds{"s", 2}; +unit const kmh{"km/h", 1}; +unit const metres{"m", 1}; +unit const bar{"bar", 3}; +unit const amperes{"A", 0}; +unit const kilonewtons{"kN", 1}; +std::array const units{seconds, kmh, metres, bar, amperes, kilonewtons}; + +std::string line(char const *Name, double Value, unit const &Unit) { + return std::format("{} = {:.{}f} {}", Name, Value, Unit.decimals, Unit.name); +} + +// the name, the value and the unit of a line of a figure, or false for the header of a part +bool parse(std::string_view const Line, std::string &Name, double &Value, std::string &Unit) { + auto const equals{Line.find(" = ")}; + if (equals == std::string_view::npos) { + return false; + } + Name = Line.substr(0, equals); + std::string const value{Line.substr(equals + 3)}; + auto const space{value.find(' ')}; + Value = std::strtod(value.substr(0, space).c_str(), nullptr); + Unit = space == std::string::npos ? std::string{} : value.substr(space + 1); + return true; +} + +// a difference of 0.5%, or of the last decimal written +bool close(double Recorded, double Now, std::string_view const Unit) { + auto step{0.0}; + for (auto const &unit : units) { + if (Unit == unit.name) { + step = std::pow(10.0, -unit.decimals); + } + } + return std::abs(Recorded - Now) <= 0.005 * std::max(std::abs(Recorded), std::abs(Now)) + step + 1e-9; +} + +// the drop of the brake pipe which the time to get back counts from, and the pressure it counts to +constexpr double pipe_drop{4.8}; +constexpr double pipe_back{4.9}; + +} // namespace + +void figures::sample(double Time, TMoverParameters const &Vehicle) { + auto &part{m_parts.back()}; + auto const speed{Vehicle.V * 3.6}; + auto const pipe{Vehicle.PipePress}; + if (false == part.sampled) { + part.sampled = true; + // from the last step of the part before, so the parts add up to the run + part.start = m_last_time < 0.0 ? Time : m_last_time; + part.speed_start = m_last_time < 0.0 ? speed : m_last_speed; + part.distance_start = m_last_time < 0.0 ? Vehicle.DistCounter : m_last_distance; + part.pipe_lowest = pipe; + } + part.end = Time; + part.speed_end = speed; + part.speed_peak = std::max(part.speed_peak, std::abs(speed)); + part.distance_end = Vehicle.DistCounter; + if (part.stopped < 0.0 && std::abs(part.speed_start) > 1.0 && std::abs(speed) < 0.05) { + part.stopped = Time - part.start; + } + if (pipe < part.pipe_lowest) { + part.pipe_lowest = pipe; + part.pipe_back = -1.0; + } + part.pipe_end = pipe; + if (part.pipe_back < 0.0 && part.pipe_lowest < pipe_drop && pipe >= pipe_back) { + part.pipe_back = Time - part.start; + } + part.cylinders_peak = std::max(part.cylinders_peak, Vehicle.BrakePress); + part.current_peak = std::max(part.current_peak, std::abs(Vehicle.Im)); + part.force_peak = std::max(part.force_peak, std::abs(Vehicle.Ft) / 1000.0); + + m_last_time = Time; + m_last_speed = speed; + m_last_distance = Vehicle.DistCounter; + // which figures the vehicle has, over the whole run, so each part has the same ones + m_moved |= std::abs(speed) >= 0.05; + m_piped |= pipe >= 0.1; + m_braked |= Vehicle.BrakePress >= 0.005; + m_current |= std::abs(Vehicle.Im) >= 0.5; + m_force |= std::abs(Vehicle.Ft) >= 50.0; +} + +void figures::mark(std::string const &Event) { + if (auto &part{m_parts.back()}; false == part.sampled) { + // nothing ran since the last event: a part of both + part.event = part.event == "start" ? Event : part.event + ", " + Event; + return; + } + m_parts.emplace_back(Event); +} + +std::vector figures::lines() const { + std::vector result; + for (auto const &part : m_parts) { + if (false == part.sampled) { + continue; + } + result.push_back("[" + part.event + "]"); + result.push_back(line("duration", part.end - part.start, seconds)); + if (m_moved) { + result.push_back(line("speed at the start", part.speed_start, kmh)); + result.push_back(line("speed at the end", part.speed_end, kmh)); + result.push_back(line("speed peak", part.speed_peak, kmh)); + result.push_back(line("distance", (part.distance_end - part.distance_start) * 1000.0, metres)); + if (part.stopped >= 0.0) { + result.push_back(line("stopped after", part.stopped, seconds)); + } + } + if (m_piped) { + result.push_back(line("brake pipe lowest", part.pipe_lowest, bar)); + result.push_back(line("brake pipe at the end", part.pipe_end, bar)); + if (part.pipe_back >= 0.0) { + result.push_back(line("brake pipe back at 4.9 bar after", part.pipe_back, seconds)); + } + } + if (m_braked) { + result.push_back(line("brake cylinders peak", part.cylinders_peak, bar)); + } + if (m_current) { + result.push_back(line("motor current peak", part.current_peak, amperes)); + } + if (m_force) { + result.push_back(line("tractive force peak", part.force_peak, kilonewtons)); + } + } + return result; +} + +namespace { + +struct figure { + std::string name; + double value; + std::string unit; + std::string text; // the value and the unit as written +}; + +struct recorded_part { + std::string header; + std::vector
figures; +}; + +std::vector parts_of(std::vector const &Lines) { + std::vector parts; + for (auto const &line : Lines) { + figure figure; + if (false == parse(line, figure.name, figure.value, figure.unit)) { + parts.emplace_back(line); + continue; + } + if (parts.empty()) { + parts.emplace_back(); + } + figure.text = line.substr(line.find(" = ") + 3); + parts.back().figures.push_back(figure); + } + return parts; +} + +figure const *find(std::vector
const &Figures, std::string_view const Name) { + for (auto const &figure : Figures) { + if (figure.name == Name) { + return &figure; + } + } + return nullptr; +} + +} // namespace + +std::vector figures::compare(std::vector const &Recorded, std::vector const &Now) { + std::vector differences; + auto const recorded{parts_of(Recorded)}; + auto const now{parts_of(Now)}; + for (std::size_t i = 0; i < std::max(recorded.size(), now.size()); ++i) { + if (i >= recorded.size() || i >= now.size() || recorded[i].header != now[i].header) { + // the parts can't be paired up from here on + differences.push_back(std::format("the parts differ from part {}: {} now, {} recorded", i + 1, i < now.size() ? now[i].header : std::string{"none"}, + i < recorded.size() ? recorded[i].header : std::string{"none"})); + break; + } + auto const &header{now[i].header}; + for (auto const &figure : recorded[i].figures) { + auto const *current{find(now[i].figures, figure.name)}; + if (current == nullptr) { + differences.push_back(header + " " + figure.name + ": none now, " + figure.text + " recorded"); + } + else if (current->unit != figure.unit || false == close(figure.value, current->value, figure.unit)) { + differences.push_back(header + " " + figure.name + ": " + current->text + " now, " + figure.text + " recorded"); + } + } + for (auto const &figure : now[i].figures) { + if (find(recorded[i].figures, figure.name) == nullptr) { + differences.push_back(header + " " + figure.name + ": " + figure.text + " now, none recorded"); + } + } + } + return differences; +} + +} // namespace test diff --git a/tests/unit/figures.h b/tests/unit/figures.h new file mode 100644 index 000000000..e69e67ef4 --- /dev/null +++ b/tests/unit/figures.h @@ -0,0 +1,70 @@ +#pragma once + +#include +#include + +#include "McZapkie/MOVER.h" + +namespace test { + +// the key figures of a vehicle's run, for each part of it between two events of the test: the speeds, the +// distance, the time to stop, the brake pipe's lowest pressure and the time it took to get back, the brake +// cylinders', the motor current's and the tractive force's peaks. a golden trace keeps them next to its +// samples, in data/golden/.figures, which a person reads: +// +// [emergency] +// duration = 40.00 s +// speed at the start = 80.0 km/h +// speed at the end = 0.0 km/h +// distance = 412.3 m +// stopped after = 38.21 s +// brake cylinders peak = 3.800 bar +// +// a figure the vehicle doesn't have (no speed, no current) is left out of all the parts. they're compared +// within 0.5%, loose enough for any compiler, so a change which alters the behaviour on purpose shows in their +// diff in a few readable lines, where the samples change in thousands +class figures { +public: + // called on every step of the vehicle + void sample(double Time, TMoverParameters const &Vehicle); + // a part of the run starts with the event + void mark(std::string const &Event); + + // the figures as the lines of the file + std::vector lines() const; + // the differences of the lines from the recorded ones, beyond the tolerance, each told in a line + static std::vector compare(std::vector const &Recorded, std::vector const &Now); + +private: + struct part { + std::string event; + bool sampled{false}; + double start{0.0}; + double end{0.0}; + double speed_start{0.0}; + double speed_end{0.0}; + double speed_peak{0.0}; + double distance_start{0.0}; + double distance_end{0.0}; + double stopped{-1.0}; // after the start, if it started moving and stopped + double pipe_lowest{0.0}; + double pipe_end{0.0}; + double pipe_back{-1.0}; // after the start, at 4.9 bar again after a drop under 4.8 + double cylinders_peak{0.0}; + double current_peak{0.0}; + double force_peak{0.0}; + }; + + std::vector m_parts{part{"start"}}; + double m_last_time{-1.0}; + double m_last_speed{0.0}; + double m_last_distance{0.0}; + // the figures the vehicle has, shown in every part + bool m_moved{false}; + bool m_piped{false}; + bool m_braked{false}; + bool m_current{false}; + bool m_force{false}; +}; + +} // namespace test diff --git a/tests/unit/fiz.cpp b/tests/unit/fiz.cpp new file mode 100644 index 000000000..38310db46 --- /dev/null +++ b/tests/unit/fiz.cpp @@ -0,0 +1,222 @@ +#include "stdafx.h" +#include "fiz.h" + +#include +#include +#include + +#include "utilities/parser.h" + +namespace test::fiz { + +namespace { + +// the lists of LoadFIZ_Parse(), as bits of the set of the ones reading a row +constexpr unsigned brake_table{1 << 0}; // startBPT +constexpr unsigned motor_table{1 << 1}; // startMPT +constexpr unsigned motor_table0{1 << 2}; // startMPT0 +constexpr unsigned resistors{1 << 3}; // startRLIST +constexpr unsigned universal{1 << 4}; // startUCLIST +constexpr unsigned diesel{1 << 5}; // startDLIST +constexpr unsigned diesel_momentum{1 << 6}; // startDIZELMOMENTUMLIST +constexpr unsigned diesel_v2n{1 << 7}; // startDIZELV2NMAXLIST +constexpr unsigned hydro{1 << 8}; // startHYDROTCLIST +constexpr unsigned diesel_pmax{1 << 9}; // startPMAXLIST +constexpr unsigned field{1 << 10}; // startFFLIST +constexpr unsigned field_brake{1 << 11}; // startFFEDLIST +constexpr unsigned generator{1 << 12}; // startWWLIST +constexpr unsigned wipers{1 << 13}; // startWiperList +constexpr unsigned dimmer{1 << 14}; // startDimmerList +constexpr unsigned lights{1 << 15}; // startLIGHTSLIST +constexpr unsigned compressors{1 << 16}; // startCOMPRESSORLIST + +// the issection() calls of LoadFIZ_Parse() +std::array const sections{ + section{"Param", '.'}, + section{"Load", ':'}, + section{"Dimensions", ':'}, + section{"Wheels", ':'}, + section{"Brake", ':'}, + section{"Doors", ':'}, + section{"BuffCoupl", '.'}, + section{"BuffCoupl1", '.'}, + section{"BuffCoupl2", '.'}, + section{"TurboPos", ':'}, + section{"Cntrl", '.', brake_table, ""}, + section{"Headlights", ':'}, + section{"Blending", ':'}, + section{"DCEMUED", ':'}, + section{"SpringBrake", ':'}, + section{"Light", ':'}, + section{"Security", ':'}, + section{"Clima", ':'}, + section{"Power", ':'}, + section{"SpeedControl", ':'}, + section{"Engine", ':'}, + section{"Switches", ':'}, + section{"MotorParamTable", ':', motor_table, "END-MPT"}, + section{"MotorParamTable0", ':', motor_table0, "END-MPT"}, + section{"Circuit", ':'}, + section{"AI", ':'}, + section{"RList", ':', resistors, "END-RL"}, + section{"UCList", ':', universal, "END-UCL"}, + section{"DList", ':', diesel, "END-DL"}, + section{"DMList", ':', diesel_momentum, "END-DML"}, + section{"HTCList", ':', hydro, "END-HTCL"}, + section{"PmaxList", ':', diesel_pmax, "END-PML"}, + section{"V2NList", ':', diesel_v2n, "END-V2NL"}, + section{"ffList", ':', field, "endff"}, + section{"ffBrakeList", ':', field_brake, "endff"}, + section{"WWList", ':', generator, "END-WWL"}, + section{"WiperList", ':', wipers, "endwl"}, + section{"DimmerList", ':', dimmer, "endDimmerList"}, + section{"LightsList", ':', lights, "endL"}, + section{"CompressorList", ':', compressors, "endCL"}, +}; + +// the lines closing lists, checked by the loader before the sections in this order, each closing the brake table too +struct closing { + std::string_view line; + unsigned lists; +}; +std::array const closings{ + closing{"END-MPT", motor_table | motor_table0}, + closing{"END-RL", resistors}, + closing{"END-UCL", universal}, + closing{"END-DL", diesel}, + closing{"END-DML", diesel_momentum}, + closing{"END-V2NL", diesel_v2n}, + closing{"END-HTCL", hydro}, + closing{"END-PML", diesel_pmax}, + closing{"endff", field | field_brake}, + closing{"endwl", wipers}, + closing{"endDimmerList", dimmer}, + closing{"END-WWL", generator}, + closing{"endL", lights}, + closing{"endCL", compressors}, +}; + +} // namespace + +std::string value(std::string const &Key, std::string const &Line) { + std::string const input{" " + Line}; + auto const lookup{input.find(" " + Key + "=")}; + if (lookup == std::string::npos) { + return {}; + } + auto const start{input.find_first_not_of(' ', lookup + Key.size() + 2)}; + if (start == std::string::npos) { + return {}; + } + auto const end{input.find(' ', start)}; + return input.substr(start, end == std::string::npos ? std::string::npos : end - start); +} + +std::vector words(std::string_view const Line) { + std::vector result; + std::size_t start{0}; + while ((start = Line.find_first_not_of(" \t;", start)) != std::string_view::npos) { + auto const end{Line.find_first_of(" \t;", start)}; + result.emplace_back(Line.substr(start, end == std::string_view::npos ? std::string_view::npos : end - start)); + start = end; + } + return result; +} + +section const *named(std::string_view Name) { + auto const lookup{std::ranges::find(sections, Name, §ion::name)}; + return lookup == sections.end() ? nullptr : std::to_address(lookup); +} + +section const *opened_by(std::string_view Line) { + auto const lookup{std::ranges::find_if(sections, [&](section const &Section) { return Line.starts_with(Section.name) && Line.size() > Section.name.size() && Line[Section.name.size()] == Section.separator; })}; + return lookup == sections.end() ? nullptr : std::to_address(lookup); +} + +std::vector lines(cParser &Parser) { + std::vector result; + while (Parser.ok()) { + auto line{Parser.getToken(false, "\n\r")}; + if (line.starts_with("//") || line.find('#') != std::string::npos) { + continue; + } + line.erase(0, line.find_first_not_of(' ')); + if (false == line.empty() && line.back() == '\r') { + line.pop_back(); + } + result.push_back(line); + } + return result; +} + +std::vector keys(std::string const &Line) { + std::vector result; + std::string const input{" " + Line}; + for (auto equals{input.find('=')}; equals != std::string::npos; equals = input.find('=', equals + 1)) { + auto const start{input.rfind(' ', equals) + 1}; + auto key{input.substr(start, equals - start)}; + // a=b=c gives a, not a=b + if (false == key.empty() && key.find('=') == std::string::npos && std::ranges::find(result, key) == result.end()) { + result.push_back(std::move(key)); + } + } + return result; +} + +// the values the section gives, as the loader asks for them by their keys +std::string section_values(section const &Section, std::string const &Line) { + auto keys{fiz::keys(Line)}; + std::ranges::sort(keys); + std::string values{Section.name}; + for (auto const &key : keys) { + if (auto const value{fiz::value(key, Line)}; false == value.empty()) { + values += " " + key + "=" + value; + } + } + return values; +} + +// the lists reading a row: the first one open, in the order of the loader's checks, which carries on past the dimmer list +unsigned row_readers(unsigned const Active) { + unsigned readers{0}; + for (unsigned list = brake_table; list <= compressors; list <<= 1) { + if ((Active & list) == 0) { + continue; + } + readers |= list; + if (list != dimmer) { + break; + } + } + return readers; +} + +std::vector reading(std::vector const &Lines) { + std::vector result; + unsigned active{0}; + for (auto const &line : Lines) { + if (line.empty()) { + active &= ~brake_table; + continue; + } + if (auto const close{std::ranges::find_if(closings, [&](closing const &Closing) { return line.starts_with(Closing.line); })}; close != closings.end()) { + active &= ~(close->lists | brake_table); + continue; + } + if (auto const opened{opened_by(line)}; opened != nullptr) { + active = (active & ~brake_table) | opened->list; + result.push_back(section_values(*opened, line)); + continue; + } + if (auto const readers{row_readers(active)}; readers != 0) { + std::string row{std::format("row of {:x}:", readers)}; + for (auto const &word : words(line)) { + row += " " + word; + } + result.push_back(std::move(row)); + } + } + return result; +} + +} // namespace test::fiz diff --git a/tests/unit/fiz.h b/tests/unit/fiz.h new file mode 100644 index 000000000..1e65049fc --- /dev/null +++ b/tests/unit/fiz.h @@ -0,0 +1,44 @@ +#pragma once + +#include +#include +#include + +class cParser; + +// what the game's vehicle loader (TMoverParameters::LoadFIZ_Parse) makes of the lines of a vehicle definition, +// for the test definitions to give it the same and for checking they do +namespace test::fiz { + +// a section of the definition, opened by a line starting with its name and separator. a list section is +// followed by rows, read until the line closing them (an empty line for the Cntrl brake table) and as +// long as no other list closes first, see reading() +struct section { + std::string_view name; + char separator; + unsigned list{0}; // the bit of the list its rows go to, none for a section of values only + char const *end{nullptr}; // the line closing the rows +}; + +// the section of the given name, or none for a name the loader doesn't know +section const *named(std::string_view Name); +// the section the line opens, or none +section const *opened_by(std::string_view Line); + +// the lines of a definition as the loader takes them: without comments, leading spaces and line ends +std::vector lines(cParser &Parser); + +// the keys of the values in the line, in the order of their first appearance: the words followed by =, +// which extract_value() finds +std::vector keys(std::string const &Line); + +// the value of the key in the line, as extract_value() gives it, empty for none (where it would throw too) +std::string value(std::string const &Key, std::string const &Line); +// the words of a row, as the readers of the lists get them from cParser +std::vector words(std::string_view Line); + +// what the loader reads from the lines, in order: every section line with the values it gives, every row +// with the lists reading it. two definitions reading the same load the same vehicle +std::vector reading(std::vector const &Lines); + +} // namespace test::fiz diff --git a/tests/unit/golden.cpp b/tests/unit/golden.cpp new file mode 100644 index 000000000..45bd1c532 --- /dev/null +++ b/tests/unit/golden.cpp @@ -0,0 +1,393 @@ +#include "stdafx.h" +#include "golden.h" +#include "doctest.h" + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "McZapkie/hamulce.h" + +namespace test { + +namespace channels { + +std::vector motion() { + return { + {"V", [](auto const &M) { return M.V; }}, + {"DistCounter", [](auto const &M) { return M.DistCounter; }}, + {"AccS", [](auto const &M) { return M.AccS; }}, + {"nrot", [](auto const &M) { return M.nrot; }}, + {"Ft", [](auto const &M) { return M.Ft; }}, + {"Fb", [](auto const &M) { return M.Fb; }}, + {"FStand", [](auto const &M) { return M.FStand; }}, + {"SlippingWheels", [](auto const &M) { return M.SlippingWheels ? 1.0 : 0.0; }}, + }; +} + +std::vector traction() { + return { + {"Mains", [](auto const &M) { return M.Mains ? 1.0 : 0.0; }}, + {"DirActive", [](auto const &M) { return M.DirActive; }}, + {"MainCtrlPos", [](auto const &M) { return M.MainCtrlPos; }}, + {"MainCtrlActualPos", [](auto const &M) { return M.MainCtrlActualPos; }}, + {"ScndCtrlPos", [](auto const &M) { return M.ScndCtrlPos; }}, + {"ScndCtrlActualPos", [](auto const &M) { return M.ScndCtrlActualPos; }}, + {"Im", [](auto const &M) { return M.Im; }}, + {"Itot", [](auto const &M) { return M.Itot; }}, + {"EngineVoltage", [](auto const &M) { return M.EngineVoltage; }}, + {"EnginePower", [](auto const &M) { return M.EnginePower; }}, + {"enrot", [](auto const &M) { return M.enrot; }}, + {"dizel_fill", [](auto const &M) { return M.dizel_fill; }}, + {"eimv_pr", [](auto const &M) { return M.eimv_pr; }}, + {"DynamicBrakeFlag", [](auto const &M) { return M.DynamicBrakeFlag ? 1.0 : 0.0; }}, + }; +} + +std::vector brakes() { + return { + {"BrakeCtrlPos", [](auto const &M) { return M.BrakeCtrlPos; }}, + {"PipePress", [](auto const &M) { return M.PipePress; }}, + {"BrakePress", [](auto const &M) { return M.BrakePress; }}, + {"LocBrakePress", [](auto const &M) { return M.LocBrakePress; }}, + {"BRP", [](auto const &M) { return M.Hamulec->GetBRP(); }}, + {"VRP", [](auto const &M) { return M.Hamulec->GetVRP(); }}, + {"CRP", [](auto const &M) { return M.Hamulec->GetCRP(); }}, + }; +} + +std::vector air() { + return { + {"Compressor", [](auto const &M) { return M.Compressor; }}, + {"CompressorFlag", [](auto const &M) { return M.CompressorFlag ? 1.0 : 0.0; }}, + {"ScndPipePress", [](auto const &M) { return M.ScndPipePress; }}, + }; +} + +std::vector handles() { + std::vector result{ + {"BrakeCtrlPosR", [](auto const &M) { return M.BrakeCtrlPosR; }}, + {"dpMainValve", [](auto const &M) { return M.dpMainValve; }}, + {"HandleCP", [](auto const &M) { return M.Handle->GetCP(); }}, + {"HandleRP", [](auto const &M) { return M.Handle->GetRP(); }}, + {"HandleEP", [](auto const &M) { return M.Handle->GetEP(); }}, + {"LocalBrakePosA", [](auto const &M) { return M.LocalBrakePosA; }}, + {"dpLocalValve", [](auto const &M) { return M.dpLocalValve; }}, + }; + for (int i = 0; i < 5; ++i) { + result.emplace_back(std::format("HandleSound{}", i), [i](auto const &M) { return M.Handle->GetSound(i); }); + } + return result; +} + +std::vector doors() { + std::vector result{ + {"DoorsLocked", [](auto const &M) { return M.Doors.is_locked ? 1.0 : 0.0; }}, + }; + for (int side : {side::right, side::left}) { + auto const name{std::string{side == side::right ? "Right" : "Left"}}; + result.emplace_back(name + "Position", [side](auto const &M) { return M.Doors.instances[side].position; }); + result.emplace_back(name + "Step", [side](auto const &M) { return M.Doors.instances[side].step_position; }); + result.emplace_back(name + "Open", [side](auto const &M) { return M.Doors.instances[side].is_open ? 1.0 : 0.0; }); + result.emplace_back(name + "Closed", [side](auto const &M) { return M.Doors.instances[side].is_closed ? 1.0 : 0.0; }); + result.emplace_back(name + "Permit", [side](auto const &M) { return M.Doors.instances[side].open_permit ? 1.0 : 0.0; }); + } + return result; +} + +std::vector parameters() { + std::vector result{ + {"CategoryFlag", [](auto const &M) { return M.CategoryFlag; }}, + {"TrainType", [](auto const &M) { return M.TrainType; }}, + {"EngineType", [](auto const &M) { return static_cast(M.EngineType); }}, + {"Vmax", [](auto const &M) { return M.Vmax; }}, + {"Mass", [](auto const &M) { return M.Mass; }}, + {"TotalMass", [](auto const &M) { return M.TotalMass; }}, + {"Mred", [](auto const &M) { return M.Mred; }}, + {"Power", [](auto const &M) { return M.Power; }}, + {"HeatingPower", [](auto const &M) { return M.HeatingPower; }}, + {"LightPower", [](auto const &M) { return M.LightPower; }}, + {"BatteryVoltage", [](auto const &M) { return M.BatteryVoltage; }}, + {"Cx", [](auto const &M) { return M.Cx; }}, + {"WheelDiameter", [](auto const &M) { return M.WheelDiameter; }}, + {"TrackW", [](auto const &M) { return M.TrackW; }}, + {"AxleInertialMoment", [](auto const &M) { return M.AxleInertialMoment; }}, + {"NPoweredAxles", [](auto const &M) { return M.NPoweredAxles; }}, + {"NAxles", [](auto const &M) { return M.NAxles; }}, + {"BearingType", [](auto const &M) { return M.BearingType; }}, + {"ADist", [](auto const &M) { return M.ADist; }}, + {"BDist", [](auto const &M) { return M.BDist; }}, + {"NBpA", [](auto const &M) { return M.NBpA; }}, + {"SandCapacity", [](auto const &M) { return M.SandCapacity; }}, + {"BrakeSystem", [](auto const &M) { return static_cast(M.BrakeSystem); }}, + {"BrakeValve", [](auto const &M) { return static_cast(M.BrakeValve); }}, + {"BrakeHandle", [](auto const &M) { return static_cast(M.BrakeHandle); }}, + {"BrakeLocHandle", [](auto const &M) { return static_cast(M.BrakeLocHandle); }}, + {"LocalBrake", [](auto const &M) { return static_cast(M.LocalBrake); }}, + {"ASBType", [](auto const &M) { return M.ASBType; }}, + {"MaxBrakeForce", [](auto const &M) { return M.MaxBrakeForce; }}, + {"P2FTrans", [](auto const &M) { return M.P2FTrans; }}, + {"BrakeMethod", [](auto const &M) { return M.BrakeMethod; }}, + {"HighPipePress", [](auto const &M) { return M.HighPipePress; }}, + {"LowPipePress", [](auto const &M) { return M.LowPipePress; }}, + {"DeltaPipePress", [](auto const &M) { return M.DeltaPipePress; }}, + {"CntrlPipePress", [](auto const &M) { return M.CntrlPipePress; }}, + {"BrakeVolume", [](auto const &M) { return M.BrakeVolume; }}, + {"BrakeVVolume", [](auto const &M) { return M.BrakeVVolume; }}, + {"VeselVolume", [](auto const &M) { return M.VeselVolume; }}, + {"BrakeCylNo", [](auto const &M) { return M.BrakeCylNo; }}, + {"BrakeCylRadius", [](auto const &M) { return M.BrakeCylRadius; }}, + {"BrakeCylDist", [](auto const &M) { return M.BrakeCylDist; }}, + {"BrakeCylSpring", [](auto const &M) { return M.BrakeCylSpring; }}, + {"BrakeSlckAdj", [](auto const &M) { return M.BrakeSlckAdj; }}, + {"BrakeRigEff", [](auto const &M) { return M.BrakeRigEff; }}, + {"RapidMult", [](auto const &M) { return M.RapidMult; }}, + {"RapidVel", [](auto const &M) { return M.RapidVel; }}, + {"BrakeValveSize", [](auto const &M) { return M.BrakeValveSize; }}, + {"MinCompressor", [](auto const &M) { return M.MinCompressor; }}, + {"MaxCompressor", [](auto const &M) { return M.MaxCompressor; }}, + {"CompressorSpeed", [](auto const &M) { return M.CompressorSpeed; }}, + {"EmergencyValveOn", [](auto const &M) { return M.EmergencyValveOn; }}, + {"AirLeakRate", [](auto const &M) { return M.AirLeakRate; }}, + {"BrakeCtrlPosNo", [](auto const &M) { return M.BrakeCtrlPosNo; }}, + {"MainCtrlPosNo", [](auto const &M) { return M.MainCtrlPosNo; }}, + {"ScndCtrlPosNo", [](auto const &M) { return M.ScndCtrlPosNo; }}, + {"LightsPosNo", [](auto const &M) { return M.LightsPosNo; }}, + {"MBrake", [](auto const &M) { return M.MBrake ? 1.0 : 0.0; }}, + {"StopBrakeDecc", [](auto const &M) { return M.StopBrakeDecc; }}, + {"BrakeDelays", [](auto const &M) { return M.BrakeDelays; }}, + {"BrakeOpModes", [](auto const &M) { return M.BrakeOpModes; }}, + {"Imin", [](auto const &M) { return M.Imin; }}, + {"Imax", [](auto const &M) { return M.Imax; }}, + {"EIMCtrlType", [](auto const &M) { return M.EIMCtrlType; }}, + {"Volume", [](auto const &M) { return M.Volume; }}, + {"PantVolume", [](auto const &M) { return M.PantVolume; }}, + }; + for (int i = 0; i < 5; ++i) { + result.emplace_back(std::format("MaxBrakePress{}", i), [i](auto const &M) { return M.MaxBrakePress[i]; }); + } + for (int i = 0; i < 3; ++i) { + result.emplace_back(std::format("BrakeCylMult{}", i), [i](auto const &M) { return M.BrakeCylMult[i]; }); + } + return result; +} + +std::vector operator+(std::vector Left, std::vector const &Right) { + Left.insert(Left.end(), Right.begin(), Right.end()); + return Left; +} + +} // namespace channels + +namespace { + +bool environment(char const *Name) { + auto const *value{std::getenv(Name)}; + return value != nullptr && value[0] != '\0' && value[0] != '0'; +} + +std::string number(double Value) { + // the shortest text which reads back as the same double + std::array text{}; + auto const result{std::to_chars(text.data(), text.data() + text.size(), Value)}; + return {text.data(), result.ptr}; +} + +// a line of the file, whichever line ends the checkout gave it +bool read_line(std::ifstream &File, std::string &Line) { + if (false == static_cast(std::getline(File, Line))) { + return false; + } + if (false == Line.empty() && Line.back() == '\r') { + Line.pop_back(); + } + return true; +} + +std::vector split(std::string const &Line) { + std::vector fields; + std::stringstream stream(Line); + std::string field; + while (std::getline(stream, field, ',')) { + fields.push_back(field); + } + if (false == Line.empty() && Line.back() == ',') { + fields.emplace_back(); + } + return fields; +} + +bool same(std::string const &Recorded, std::string const &Now, bool const Exact) { + if (Recorded == Now) { + return true; + } + if (Exact) { + return false; + } + char *end{nullptr}; + auto const recorded{std::strtod(Recorded.c_str(), &end)}; + auto const now{std::strtod(Now.c_str(), &end)}; + if (std::isnan(recorded) || std::isnan(now)) { + return std::isnan(recorded) && std::isnan(now); + } + return std::abs(recorded - now) <= 1e-9 * std::max(std::abs(recorded), std::abs(now)) + 1e-12; +} + +} // namespace + +trace::trace(std::string Name, std::vector Channels, int Every, bool Figures) + : m_name(std::move(Name)), m_channels(std::move(Channels)), m_every(Every), m_keep_figures(Figures) {} + +void trace::sample(double Time, TMoverParameters const &Vehicle) { + // the invariants on every step, the first time each is broken + for (auto const &invariant : invariants()) { + if (std::ranges::find(m_broken, invariant.name) != m_broken.end()) { + continue; + } + if (false == invariant.holds(Vehicle, Time, m_sampled ? &m_before : nullptr)) { + m_broken.push_back(invariant.name); + m_violations.push_back(std::format("invariant \"{}\" broken in {} at {:.3f} s{}: {}", invariant.name, m_name, Time, + m_last_event.empty() ? std::string{} : std::format(", after \"{}\"", m_last_event), invariant.explain(Vehicle))); + } + } + m_before = {Time, Vehicle.V, Vehicle.DistCounter}; + m_sampled = true; + m_figures.sample(Time, Vehicle); + + if (m_step++ % m_every != 0) { + return; + } + // the time is a label, summed up from the steps: milliseconds are all it needs + auto row{std::format("{:.3f}", Time)}; + for (auto const &channel : m_channels) { + row += "," + number(channel.value(Vehicle)); + } + row += "," + m_event; + m_event.clear(); + m_rows.push_back(row); +} + +void trace::mark(std::string const &Event) { + m_event += (m_event.empty() ? "" : " ") + Event; + m_last_event = Event; + m_figures.mark(Event); +} + +void trace::check_figures(std::filesystem::path const &Path, bool const Exact) const { + // like the samples, the key figures are recorded on the code before a change and compared after it + std::ifstream file(Path, std::ios::binary); + if (false == file.is_open()) { + if (Exact) { + FAIL_CHECK("no key figures " << Path.string() << ", run the tests with EU07_UNIT_TESTS_UPDATE_GOLDEN=1 on the code before the change to record them"); + } + return; + } + std::vector recorded; + std::string line; + while (read_line(file, line)) { + recorded.push_back(line); + } + auto const differences{figures::compare(recorded, m_figures.lines())}; + if (false == differences.empty()) { + std::string text; + for (auto const &difference : differences) { + text += "\n " + difference; + } + FAIL_CHECK("key figures of " << m_name << " differ:" << text); + } +} + +void trace::check() const { + for (std::size_t i = 0; i < m_violations.size(); ++i) { + if (false == excused(m_name, m_broken[i])) { + FAIL_CHECK(m_violations[i]); + } + } + + std::string header{"time"}; + for (auto const &channel : m_channels) { + header += "," + channel.name; + } + header += ",event"; + + // no spaces in the file names: the build depends on the files, and make doesn't take to them + auto name{m_name}; + std::ranges::replace(name, ' ', '_'); + std::filesystem::path const filename{name + ".csv"}; + auto const path{std::filesystem::path{EU07_UNIT_TESTS_DATA} / "golden" / filename}; + auto figurespath{path}; + figurespath.replace_extension(".figures"); + if (environment("EU07_UNIT_TESTS_UPDATE_GOLDEN")) { + record(path, figurespath, header); + return; + } + + // the samples aren't kept in the repository, they're recorded on the code before a change and compared after it + auto const exact{environment("EU07_UNIT_TESTS_GOLDEN_EXACT")}; + if (m_keep_figures) { + check_figures(figurespath, exact); + } + check_samples(path, header, exact); +} + +void trace::record(std::filesystem::path const &Path, std::filesystem::path const &FiguresPath, std::string const &Header) const { + std::filesystem::create_directories(Path.parent_path()); + std::ofstream file(Path, std::ios::binary); + file << Header << "\n"; + for (auto const &row : m_rows) { + file << row << "\n"; + } + if (m_keep_figures) { + std::ofstream figuresfile(FiguresPath, std::ios::binary); + for (auto const &line : m_figures.lines()) { + figuresfile << line << "\n"; + } + } + MESSAGE("recorded the golden trace " << Path.string()); +} + +void trace::check_samples(std::filesystem::path const &path, std::string const &header, bool const exact) const { + std::ifstream file(path, std::ios::binary); + if (false == file.is_open()) { + if (exact) { + FAIL_CHECK("no golden trace " << path.string() << ", run the tests with EU07_UNIT_TESTS_UPDATE_GOLDEN=1 on the code before the change to record it"); + } + return; + } + std::string line; + read_line(file, line); + if (line != header) { + FAIL_CHECK("golden trace " << m_name << " has other channels: " << line << ", the test records " << header); + return; + } + auto const names{split(header)}; + std::size_t row{0}; + while (read_line(file, line)) { + if (row >= m_rows.size()) { + FAIL_CHECK("golden trace " << m_name << " is longer: " << m_rows.size() << " rows now, more recorded"); + return; + } + auto const recorded{split(line)}; + auto const now{split(m_rows[row])}; + for (std::size_t field = 0; field < names.size(); ++field) { + auto const recordedvalue{field < recorded.size() ? recorded[field] : std::string{}}; + auto const nowvalue{field < now.size() ? now[field] : std::string{}}; + if (false == same(recordedvalue, nowvalue, exact || names[field] == "event")) { + FAIL_CHECK("golden trace " << m_name << " differs first at time " << now.front() << " in " << names[field] << ": " << nowvalue + << " now, " << recordedvalue << " recorded\n now: " << m_rows[row] << "\n recorded: " << line); + return; + } + } + ++row; + } + if (row != m_rows.size()) { + FAIL_CHECK("golden trace " << m_name << " is shorter: " << m_rows.size() << " rows now, " << row << " recorded"); + } +} + +} // namespace test diff --git a/tests/unit/golden.h b/tests/unit/golden.h new file mode 100644 index 000000000..cb82ed0da --- /dev/null +++ b/tests/unit/golden.h @@ -0,0 +1,90 @@ +#pragma once + +#include +#include +#include +#include + +#include "McZapkie/MOVER.h" +#include "figures.h" +#include "invariants.h" + +namespace test { + +// one value of the vehicle a trace follows +struct channel { + std::string name; + std::function value; +}; + +// sets of channels for the usual subjects of a test, which can be put together +namespace channels { +std::vector motion(); // speed, distance, forces +std::vector traction(); // controllers, current, voltage, engine +std::vector brakes(); // pressures of the brake pipe, cylinders and reservoirs +std::vector air(); // compressor and main reservoir +std::vector handles(); // the driver's brake handle and the local brake handle, with their sounds +std::vector doors(); // both sides' doors and steps, their permits and the lock +std::vector parameters(); // what the vehicle definition sets, as the loader read it +std::vector operator+(std::vector Left, std::vector const &Right); +} // namespace channels + +// characterisation of the simulation: the values of the channels over a run of a vehicle, compared with the +// ones the code gave when the trace got recorded, in tests/unit/data/golden/.csv (spaces as underscores). a difference fails the +// test, naming the channel and the time it shows up first. the samples are tens of megabytes and only mean +// something against the code before a change, so they stay out of the repository: running the tests with +// EU07_UNIT_TESTS_UPDATE_GOLDEN=1 records them on the code before the change, and after it they're compared. +// a trace with nothing recorded checks only the invariants and its test's own CHECKs, as the CI does. +// +// values are compared within a relative tolerance of 1e-9 (the CI builds with GCC and glibc, whose maths +// functions can differ from MSVC's in the last bits), or exactly with EU07_UNIT_TESTS_GOLDEN_EXACT=1, which is the check to +// run for a change which shouldn't alter anything at all, and which fails a trace with nothing recorded. +// +// besides the samples, a trace records the key figures of the run (figures.h) in .figures, the few +// lines a person reads of what a change altered, and checks the invariants (invariants.h) on every step +// +// test::trace trace{"eu07 notch up", test::channels::motion() + test::channels::traction()}; +// eu07.record(trace); +// ... run the vehicle ... +// trace.check(); +class trace { +public: + // samples every Every-th step of the vehicle: 100, a second at the usual step, is plenty for a run of minutes, + // as a difference stays once the simulation has taken it in + // Figures: whether to keep the key figures, which a trace sampled by hand, at times of its own, has no use for + trace(std::string Name, std::vector Channels, int Every = 10, bool Figures = true); + + // called by the vehicle after every step + void sample(double Time, TMoverParameters const &Vehicle); + // adds an event of the test to the trace, so a difference can be told apart from the moment of the action + void mark(std::string const &Event); + + // compares the trace and its key figures (figures.h) with the recorded ones, or records them, and reports the + // invariants broken + void check() const; + // the invariants broken in the trace (see invariants.h), the first time each, excused or not + std::vector const &violations() const { return m_violations; } + +private: + void check_figures(std::filesystem::path const &Path, bool Exact) const; + // writes the samples and the key figures, as recorded on the code before a change + void record(std::filesystem::path const &Path, std::filesystem::path const &FiguresPath, std::string const &Header) const; + // compares the samples with the recorded ones + void check_samples(std::filesystem::path const &path, std::string const &header, bool exact) const; + + std::string m_name; + std::vector m_channels; + int m_every; + long m_step{0}; + std::vector m_rows; // formatted, as in the file + std::string m_event; // marked since the last row + std::string m_last_event; // the last one marked, for the invariants broken after it + snapshot m_before{}; + bool m_sampled{false}; + std::vector m_broken; // the names of the invariants broken so far + std::vector m_violations; + bool m_keep_figures; + figures m_figures; +}; + +} // namespace test diff --git a/tests/unit/invariants.cpp b/tests/unit/invariants.cpp new file mode 100644 index 000000000..4fafeb04d --- /dev/null +++ b/tests/unit/invariants.cpp @@ -0,0 +1,163 @@ +#include "stdafx.h" +#include "invariants.h" + +#include +#include +#include +#include + +namespace test { + +namespace { + +std::string values(std::initializer_list> Values) { + std::string result; + for (auto const &[name, value] : Values) { + result += std::format("{}{}={:.6g}", result.empty() ? "" : " ", name, value); + } + return result; +} + +bool electric(TMoverParameters const &M) { + return M.EngineType == TEngineType::ElectricSeriesMotor || M.EngineType == TEngineType::ElectricInductionMotor; +} + +double max_brake_press(TMoverParameters const &M) { + auto result{0.0}; + for (auto const press : M.MaxBrakePress) { + result = std::max(result, press); + } + return result; +} + +// the margin over a limit which a step of the simulation may overshoot it by +constexpr double pressure_margin{0.05}; +// the highest acceleration of a vehicle, 5 g, which a collision goes well over +constexpr double highest_acceleration{5.0 * 9.81}; + +} // namespace + +std::vector const &invariants() { + static std::vector const rules{ + {"every value a number", + [](auto const &M, double, auto const *) { + std::initializer_list const values{M.V, M.AccS, M.Ft, M.Fb, M.Im, M.Itot, M.EngineVoltage, + M.enrot, M.PipePress, M.BrakePress, M.LocBrakePress, M.ScndPipePress, M.Compressor, M.BatteryVoltage}; + return std::ranges::all_of(values, [](double const Value) { return std::isfinite(Value); }); + }, + [](auto const &M) { + return values({{"V", M.V}, {"AccS", M.AccS}, {"Ft", M.Ft}, {"Fb", M.Fb}, {"Im", M.Im}, {"Itot", M.Itot}, {"EngineVoltage", M.EngineVoltage}, + {"enrot", M.enrot}, {"PipePress", M.PipePress}, {"BrakePress", M.BrakePress}, {"LocBrakePress", M.LocBrakePress}, + {"ScndPipePress", M.ScndPipePress}, {"Compressor", M.Compressor}, {"BatteryVoltage", M.BatteryVoltage}}); + }}, + {"brake cylinders between empty and the vehicle's highest pressure", + [](auto const &M, double, auto const *) { + // a step overshoots the setting a little: the EU07's LSt fills its cylinders to 4.0 bar of its 3.8 + auto const limit{1.1 * max_brake_press(M) + pressure_margin}; + return M.BrakePress >= -pressure_margin && M.BrakePress <= limit && M.LocBrakePress >= -pressure_margin && M.LocBrakePress <= limit; + }, + [](auto const &M) { return values({{"BrakePress", M.BrakePress}, {"LocBrakePress", M.LocBrakePress}, {"max(MaxBrakePress)", max_brake_press(M)}}); }}, + {"pipes between empty and the highest governor setting", + [](auto const &M, double, auto const *) { + // all the air comes from the main reservoirs, which the game sets up to 10 bar, some (the Impuls) to 12; + // the driver's valve in its filling position joins the brake pipe to them + auto const highest{1.01 * std::max(10.0, M.MaxCompressor) + pressure_margin}; + std::initializer_list const pressures{M.PipePress, M.ScndPipePress, M.Compressor}; + return std::ranges::all_of(pressures, [highest](double const Press) { return Press >= -pressure_margin && Press <= highest; }); + }, + [](auto const &M) { return values({{"PipePress", M.PipePress}, {"ScndPipePress", M.ScndPipePress}, {"Compressor", M.Compressor}}); }}, + {"main reservoir no higher than the compressor's governor", + [](auto const &M, double, auto const *) { return M.MaxCompressor <= 0.0 || M.Compressor <= 1.01 * M.MaxCompressor + pressure_margin; }, + [](auto const &M) { return values({{"Compressor", M.Compressor}, {"MaxCompressor", M.MaxCompressor}}); }}, + {"no motor current with the line breaker open", + [](auto const &M, double, auto const *) { return M.Mains || false == electric(M) || std::abs(M.Im) < 1.0; }, + [](auto const &M) { return values({{"Mains", M.Mains}, {"Im", M.Im}, {"Itot", M.Itot}}); }}, + {"no motor current with the line contactors open, but for the dynamic brake", + [](auto const &M, double, auto const *) { + // the dynamic brake closes its own circuit of the motors and the resistors + return M.StLinFlag || M.DynamicBrakeFlag || M.EngineType != TEngineType::ElectricSeriesMotor || std::abs(M.Im) < 1.0; + }, + [](auto const &M) { + return values({{"StLinFlag", M.StLinFlag}, {"DynamicBrakeFlag", M.DynamicBrakeFlag}, {"Im", M.Im}, {"MainCtrlActualPos", M.MainCtrlActualPos}}); + }}, + {"no tractive force without power", + [](auto const &M, double, auto const *) { return M.Power >= 0.01 || std::abs(M.Ft) < 1.0; }, + [](auto const &M) { return values({{"Power", M.Power}, {"Ft", M.Ft}}); }}, + {"engine fill between none and full", + [](auto const &M, double, auto const *) { return M.dizel_fill >= 0.0 && M.dizel_fill <= 1.0; }, + [](auto const &M) { return values({{"dizel_fill", M.dizel_fill}}); }}, + {"diesel engine turning forward, no faster than its top speed", + [](auto const &M, double, auto const *) { + // the governor lets it overshoot a little (the SN61 by 1%) + return M.EngineType != TEngineType::DieselEngine || (M.enrot >= 0.0 && M.enrot <= 1.05 * M.dizel_nmax); + }, + [](auto const &M) { return values({{"enrot", M.enrot}, {"dizel_nmax", M.dizel_nmax}}); }}, + {"battery no higher than its nominal voltage", + [](auto const &M, double, auto const *) { return M.NominalBatteryVoltage <= 0.0 || M.BatteryVoltage <= 1.05 * M.NominalBatteryVoltage; }, + [](auto const &M) { return values({{"BatteryVoltage", M.BatteryVoltage}, {"NominalBatteryVoltage", M.NominalBatteryVoltage}}); }}, + {"distance counted as the speed runs", + [](auto const &M, double Time, auto const *Before) { + if (Before == nullptr) { + return true; + } + // the speed of the step is between the speeds at its ends, or a bit off it, as the movement is integrated; + // through a standstill, down to none + auto const dt{Time - Before->time}; + auto const covered{(M.DistCounter - Before->DistCounter) * 1000.0}; + auto const lowest{M.V * Before->V > 0.0 ? std::min(std::abs(M.V), std::abs(Before->V)) : 0.0}; + auto const highest{std::max(std::abs(M.V), std::abs(Before->V))}; + return covered >= lowest * dt * 0.9 - 0.01 && covered <= highest * dt * 1.1 + 0.01; + }, + [](auto const &M) { return values({{"V", M.V}, {"DistCounter", M.DistCounter}}); }}, + {"no acceleration over 5 g", + [](auto const &M, double Time, auto const *Before) { + return Before == nullptr || std::abs(M.V - Before->V) <= highest_acceleration * (Time - Before->time) + 0.01; + }, + [](auto const &M) { return values({{"V", M.V}, {"AccS", M.AccS}}); }}, + {"hand brake applied, the wheels braked on the move", + [](auto const &M, double, auto const *) { return false == M.MBrake || M.ManualBrakePos == 0 || std::abs(M.V) < 0.5 || std::abs(M.Fb) > 0.0; }, + [](auto const &M) { return values({{"ManualBrakePos", M.ManualBrakePos}, {"V", M.V}, {"Fb", M.Fb}}); }}, + }; + return rules; +} + +namespace { + +struct excuse { + char const *trace; // a part of the trace's name + char const *invariant; + char const *reason; +}; + +std::vector const excuses{ + // what the tests do + {"couplers/collision/", "no acceleration over 5 g", "vehicles run into each other"}, + {"controls/collision/", "no acceleration over 5 g", "vehicles run into each other"}, + {"couplers/collision/", "distance counted as the speed runs", "the buffers throw the vehicle back within a step"}, + {"switches_live/", "no acceleration over 5 g", "sampled by hand, a second apart in the trace for 2 s run"}, + {"switches_live/", "distance counted as the speed runs", "sampled by hand, a second apart in the trace for 2 s run"}, + {"brake handles/", "main reservoir no higher than the compressor's governor", "the test holds the main reservoir at 8 bar"}, + {"local brake/", "main reservoir no higher than the compressor's governor", "the test holds the main reservoir at 8 bar"}, + {"brake cycle/at speed/", "brake cylinders between empty and the vehicle's highest pressure", "the rapid step of the valves at speed"}, + // the vehicles as they are + {"elf/2", "main reservoir no higher than the compressor's governor", + "the units' reservoirs share the supply pipe: the A car's governor stops at 9 bar, the C car's at 8.5"}, + {"sm03_v1/", "brake cylinders between empty and the vehicle's highest pressure", + "its K valve fills the cylinders to the auxiliary reservoir's pressure (4.27 bar), over MaxBP 3.5"}, + {"eu04_v1/", "brake cylinders between empty and the vehicle's highest pressure", + "its K valve fills the cylinders to the auxiliary reservoir's pressure (3.19 bar), over MaxBP 2.8"}, + {"sn61", "brake cylinders between empty and the vehicle's highest pressure", + "its ESt3d_PZZ valve fills the cylinders to the auxiliary reservoir's pressure in an emergency (4.6 bar), over MaxBP 3.8"}, + {"sm03_v1/", "diesel engine turning forward, no faster than its top speed", "a lower gear at speed drives the engine over its top speed, by 10%"}, + {"wmb10_v1/", "diesel engine turning forward, no faster than its top speed", "a lower gear at speed drives the engine over its top speed, by 25%"}, + {"controls/full physics/", "no acceleration over 5 g", "the couplers' slack taken up as the train starts throws the wagons about at up to 5.7 g"}, + {"controls/full physics/", "distance counted as the speed runs", "the couplers' slack taken up as the train starts throws the wagons back within a step"}, +}; + +} // namespace + +bool excused(std::string_view const Trace, std::string_view const Invariant) { + return std::ranges::any_of(excuses, [&](excuse const &Excuse) { return Excuse.invariant == Invariant && Trace.find(Excuse.trace) != std::string_view::npos; }); +} + +} // namespace test diff --git a/tests/unit/invariants.h b/tests/unit/invariants.h new file mode 100644 index 000000000..491edc84b --- /dev/null +++ b/tests/unit/invariants.h @@ -0,0 +1,36 @@ +#pragma once + +#include +#include +#include +#include + +#include "McZapkie/MOVER.h" + +namespace test { + +// what the rules over time need of the step before +struct snapshot { + double time; + double V; + double DistCounter; +}; + +// a rule of physics or of the vehicle's circuits, which holds for every vehicle after every step, whatever +// the test does with it. every golden trace checks them as it samples (see golden.h), on every step, not only +// on the recorded ones, and with no comparison to a recorded file, so they hold on any compiler. a change which +// alters the behaviour on purpose records the traces anew, and the rules still check the new behaviour makes sense. +struct invariant { + std::string name; + // Before is null at the first step of a trace + std::function holds; + // the values the rule looks at, shown when it's broken + std::function explain; +}; + +std::vector const &invariants(); + +// the traces where the game breaks a rule, as it is, with the reason (see COVERAGE.md, what the tests found) +bool excused(std::string_view Trace, std::string_view Invariant); + +} // namespace test diff --git a/tests/unit/main.cpp b/tests/unit/main.cpp index 451dd4c7b..cc801ba18 100644 --- a/tests/unit/main.cpp +++ b/tests/unit/main.cpp @@ -2,7 +2,7 @@ #include "stdafx.h" #include "doctest.h" -#include "utilities/Globals.h" +#include "vehicle.h" namespace { @@ -13,8 +13,8 @@ class deterministic_random : public doctest::IReporter { public: explicit deterministic_random(doctest::ContextOptions const &) {} - void test_case_start(doctest::TestCaseData const &) override { reseed(); } - void test_case_reenter(doctest::TestCaseData const &) override { reseed(); } + void test_case_start(doctest::TestCaseData const &) override { test::reseed_random(); } + void test_case_reenter(doctest::TestCaseData const &) override { test::reseed_random(); } // the rest of doctest's reporter interface: a listener reports nothing, the console reporter does that void report_query(doctest::QueryData const &) override { /* nothing to report */ } @@ -27,12 +27,6 @@ public: void log_assert(doctest::AssertData const &) override { /* nothing to report */ } void log_message(doctest::MessageData const &) override { /* nothing to report */ } void test_case_skipped(doctest::TestCaseData const &) override { /* nothing to report */ } - -private: - static void reseed() { - Global.random_engine.seed(1); - Global.local_random_engine.seed(1); - } }; } // namespace diff --git a/tests/unit/real_vehicles.h b/tests/unit/real_vehicles.h new file mode 100644 index 000000000..0928ca2d5 --- /dev/null +++ b/tests/unit/real_vehicles.h @@ -0,0 +1,12 @@ +#pragma once + +#include +#include + +namespace test { + +// the real vehicle definitions of data/fiz, as paths for definition::fiz(): every .json file there, sorted. +// vehicles the game defines by including others are vehicles of their own too (201e-rn, included by 201e-w) +std::vector const &real_vehicles(); + +} // namespace test diff --git a/tests/unit/scenario.cpp b/tests/unit/scenario.cpp new file mode 100644 index 000000000..b933a0ab5 --- /dev/null +++ b/tests/unit/scenario.cpp @@ -0,0 +1,80 @@ +#include "stdafx.h" +#include "scenario.h" + +#include "McZapkie/hamulce.h" + +namespace test { + +scenario::scenario(std::string Name, std::vector Channels, track const &Track) : m_name(std::move(Name)), m_channels(std::move(Channels)), m_track(Track) { + reseed_random(); +} + +scenario &scenario::add(std::string const &Path, int Cab, int Coupling, double Velocity, double Gap) { + m_train.add(definition::fiz(Path), Cab, Coupling, Velocity, Gap); + return *this; +} + +void scenario::record() { + // on the first action, once the train is complete + if (false == m_traces.empty()) { + return; + } + for (std::size_t i = 0; i < m_train.size(); ++i) { + m_traces.push_back(std::make_unique(std::format("{}/{}", m_name, i), m_channels, 100)); + m_train[i].record(*m_traces.back()); + } +} + +void scenario::act(std::string const &Event) { + record(); + for (auto const &trace : m_traces) { + trace->mark(Event); + } +} + +void scenario::wait(double Seconds) { + record(); + drive(driver(), m_track, Seconds); +} + +bool scenario::start_up() { + record(); + return test::start_up(driver(), m_track, 300.0, m_traces.front().get()); +} + +void scenario::get_going() { + act("get going"); + release_brakes(cab()); + for (int i = 0; i < 3 && cab().DirActive <= 0; ++i) { + cab().DirectionForward(); + } + wait(20.0); +} + +void scenario::full_power(double Seconds) { + auto &controlling{driver().controlling}; + controlling.IncMainCtrl(1); + for (int i = 0; i < 90 && false == controlling.StLinFlag; ++i) { + wait(1.0); + } + for (int i = 0; i < 60 && false == controlling.IsMainCtrlMaxPowerPos(); ++i) { + controlling.IncMainCtrl(1); + wait(1.0); + } + wait(Seconds); +} + +void scenario::notch_back(int Position) { + auto &controlling{driver().controlling}; + while (controlling.MainCtrlPos > Position && controlling.DecMainCtrl(1)) { + wait(1.0); + } +} + +void scenario::check() const { + for (auto const &trace : m_traces) { + trace->check(); + } +} + +} // namespace test diff --git a/tests/unit/scenario.h b/tests/unit/scenario.h new file mode 100644 index 000000000..fff4d9619 --- /dev/null +++ b/tests/unit/scenario.h @@ -0,0 +1,63 @@ +#pragma once + +#include +#include +#include + +#include "consist.h" +#include "drive.h" +#include "golden.h" + +namespace test { + +// a scenario of a test: a train of real vehicles (one vehicle is a train too), a driver in the front one, +// and a golden trace for each vehicle (data/golden//.csv) with the events of +// the scenario in them: +// test::scenario scenario{"doors/elf", test::channels::motion() + test::channels::doors()}; +// scenario.add("elf_v1/21we-a", 1).add("elf_v1/21we-b").add("elf_v1/21we-c"); +// scenario.start_up(); +// scenario.act("open left"); +// scenario.cab().OperateDoors(side::left, true); +// scenario.wait(10.0); +// scenario.check(); +class scenario { +public: + scenario(std::string Name, std::vector Channels, track const &Track = {0.15, 0.0, catenary_3kv}); + + // adds a real vehicle at the back, see consist::add() + scenario &add(std::string const &Path, int Cab = 0, int Coupling = consist::full_coupling, double Velocity = 0.0, double Gap = 0.0); + + consist &train() { return m_train; } + TMoverParameters &vehicle(std::size_t Index) { return m_train[Index].mover(); } + TMoverParameters &cab() { return m_train[0].mover(); } + driven driver() { return driving(m_train); } + track &line() { return m_track; } + + // marks the event in the traces, the action follows it + void act(std::string const &Event); + // runs the train with the driver attending to it + void wait(double Seconds); + // gets the train ready to run, see test::start_up(); returns whether it did + bool start_up(); + // releases the brakes and sets the direction forward, for a train to move off + void get_going(); + // the main controller up to its full power position, a notch a second, and Seconds more there. the line + // contactors close at the first position, after their delay (InitialCtrlDelay) and once the pressure switch + // lets them (the cylinders under 2 bar, the pipe over 3.6), so it waits there for them, as the AI does + void full_power(double Seconds); + // the main controller back to the given position, a notch a second + void notch_back(int Position); + // checks the traces + void check() const; + +private: + void record(); + + std::string m_name; + std::vector m_channels; + track m_track; + consist m_train; + std::vector> m_traces; +}; + +} // namespace test diff --git a/tests/unit/test_auxiliaries.cpp b/tests/unit/test_auxiliaries.cpp new file mode 100644 index 000000000..bb823a4cf --- /dev/null +++ b/tests/unit/test_auxiliaries.cpp @@ -0,0 +1,112 @@ +#include "stdafx.h" +#include "doctest.h" +#include "scenario.h" +#include "drive.h" + +// characterisation of the auxiliary circuits of vehicles: the battery drained and charged, and the air of the +// pantographs kept in their own tank, whose pressure switch opens the line breaker, each in a scenario on real +// vehicles recorded in golden traces (data/golden/auxiliaries/) + +using test::scenario; +using namespace test::channels; + +namespace { + +std::vector auxiliaries() { + return { + {"BatteryVoltage", [](auto const &M) { return M.BatteryVoltage; }}, + {"Battery", [](auto const &M) { return M.Battery ? 1.0 : 0.0; }}, + {"ConverterFlag", [](auto const &M) { return M.ConverterFlag ? 1.0 : 0.0; }}, + {"Power110vIsAvailable", [](auto const &M) { return M.Power110vIsAvailable ? 1.0 : 0.0; }}, + {"PantPress", [](auto const &M) { return M.PantPress; }}, + {"PantVolume", [](auto const &M) { return M.PantVolume; }}, + {"PantCompFlag", [](auto const &M) { return M.PantCompFlag ? 1.0 : 0.0; }}, + {"PantPressSwitchActive", [](auto const &M) { return M.PantPressSwitchActive ? 1.0 : 0.0; }}, + {"PantPressLockActive", [](auto const &M) { return M.PantPressLockActive ? 1.0 : 0.0; }}, + }; +} + +} // namespace + +TEST_CASE("auxiliaries: the battery drained by the lights and the pantographs' compressor, until nothing starts") { + // without the converter the battery falls quickly to 90 V, then slowly as the lights and the small compressor + // draw on it; at 70 V (110 / 1.57) it opens the line breaker, and the locomotive doesn't start again + scenario scenario{"auxiliaries/battery/eu07 drained", traction() + auxiliaries()}; + scenario.add("4e_v1/4e", 1); + REQUIRE(scenario.start_up()); + auto &eu07{scenario.cab()}; + REQUIRE(eu07.BatteryVoltage == doctest::Approx(eu07.NominalBatteryVoltage)); + scenario.act("converter off, lights on, small compressor on"); + eu07.ConverterSwitch(false); + eu07.iLights[end::front] = 1 | 2 | 4; + eu07.iLights[end::rear] = 16; + eu07.PantCompFlag = true; + scenario.wait(30.0); + CHECK(eu07.BatteryVoltage < 0.83 * eu07.NominalBatteryVoltage); + CHECK(eu07.Mains); + scenario.wait(5000.0); + CHECK(eu07.BatteryVoltage < eu07.NominalBatteryVoltage / 1.57); + CHECK_FALSE(eu07.Mains); + scenario.act("start up again"); + CHECK_FALSE(scenario.start_up()); + CHECK(eu07.BatteryVoltage < eu07.NominalBatteryVoltage / 1.57); + scenario.check(); +} + +TEST_CASE("auxiliaries: the battery switched off, and charged by the converter") { + scenario scenario{"auxiliaries/battery/eu07 switched off", traction() + auxiliaries()}; + scenario.add("4e_v1/4e", 1); + REQUIRE(scenario.start_up()); + auto &eu07{scenario.cab()}; + scenario.act("converter off"); + eu07.ConverterSwitch(false); + scenario.wait(10.0); + auto const discharged{eu07.BatteryVoltage}; + CHECK(discharged < 0.83 * eu07.NominalBatteryVoltage); + // the converter charges it back at once + scenario.act("converter on"); + eu07.ConverterSwitch(true); + scenario.wait(10.0); + CHECK(eu07.BatteryVoltage == doctest::Approx(eu07.NominalBatteryVoltage)); + // switched off, the battery falls to 90 V at once, then holds + scenario.act("battery off"); + eu07.MainSwitch(false); + eu07.ConverterSwitch(false); + eu07.BatterySwitch(false); + scenario.wait(10.0); + CHECK(eu07.BatteryVoltage == doctest::Approx(discharged).epsilon(0.01)); + scenario.check(); +} + +TEST_CASE("auxiliaries: the pantographs on their own tank, leaking until the pressure switch opens the line breaker") { + // the pantographs cut off the main reservoir (bPantKurek3 off) are held up by the air of their own small tank, + // which leaks; under MinPress the pressure switch, primed at 4.6 bar, opens the line breaker. the small + // compressor pumps the tank up to 4.8 bar, priming the switch again. (an electric unit's switch turns its + // converter off instead; the EW58's pantographs have an automatic valve to the main reservoir, which keeps + // their tank up) + scenario scenario{"auxiliaries/pantograph tank/eu07", traction() + auxiliaries()}; + scenario.add("4e_v1/4e", 1); + REQUIRE(scenario.start_up()); + auto &eu07{scenario.cab()}; + // started up on the small compressor, the tank gets joined to the main reservoir, which primes the switch + scenario.act("tank joined to the main reservoir"); + eu07.bPantKurek3 = true; + scenario.wait(30.0); + REQUIRE(eu07.PantPressSwitchActive); + scenario.act("tank cut off the main reservoir"); + eu07.bPantKurek3 = false; + eu07.PantCompFlag = false; + scenario.wait(600.0); + CHECK(eu07.PantPress < eu07.EnginePowerSource.CollectorParameters.MinPress); + CHECK_FALSE(eu07.PantPressSwitchActive); + CHECK_FALSE(eu07.Mains); + scenario.act("small compressor on"); + eu07.PantCompFlag = true; + for (int i = 0; i < 60 && eu07.PantCompFlag; ++i) { + scenario.wait(10.0); + } + CHECK_FALSE(eu07.PantCompFlag); + CHECK(eu07.PantPress >= 4.6); // stopped at 4.8, leaking since + CHECK(eu07.PantPressSwitchActive); + scenario.check(); +} diff --git a/tests/unit/test_brake_cycle.cpp b/tests/unit/test_brake_cycle.cpp new file mode 100644 index 000000000..1dc5a84c1 --- /dev/null +++ b/tests/unit/test_brake_cycle.cpp @@ -0,0 +1,194 @@ +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" +#include "golden.h" +#include "real_vehicles.h" + +#include "McZapkie/hamulce.h" + +#include +#include + +using test::definition; +using test::vehicle; + +// characterisation of the brakes of every real vehicle: the brake pipe driven through a whole cycle, as the +// locomotive of a train would drive it, and the distributor valve, the cylinders and the reservoirs followed +// in golden traces (data/golden/brake cycle/). pressures in bar, the pipe runs at 5.0 + +namespace { + +struct stage { + char const *name; + double pipe; // held brake pipe pressure + double seconds; +}; + +// charging, the service application in steps, release, the overcharge used to speed the release up and its +// drop back, the emergency application and recharging after it +std::array const cycle{{ + {"charge", 5.0, 90.0}, {"light", 4.6, 20.0}, {"medium", 4.2, 20.0}, {"full service", 3.5, 20.0}, + {"release", 5.0, 40.0}, {"overcharge", 5.4, 15.0}, {"back to 5", 5.0, 45.0}, {"emergency", 0.0, 15.0}, + {"recharge", 5.0, 90.0}, +}}; + +// returns the pressure in the cylinders at the end of each stage, by the name of the stage +std::map> run_cycle(vehicle &Vehicle, test::trace &Trace) { + std::map> cylinders; + for (auto const &stage : cycle) { + Trace.mark(stage.name); + Vehicle.hold_brake_pipe(stage.pipe); + Vehicle.run(stage.seconds); + cylinders[stage.name] = Vehicle->BrakePress; + } + return cylinders; +} + +} // namespace + +TEST_CASE("brake cycle: every real vehicle through charge, service steps, release, overcharge and emergency") { + for (auto const &path : test::real_vehicles()) { + CAPTURE(path); + test::reseed_random(); + vehicle real{definition::fiz(path)}; + test::trace trace{"brake cycle/" + path, test::channels::brakes(), 100}; + real.record(trace); + // a vehicle braked by the pipe: released once charged, braking harder by every step of the service + // application, and by the emergency one. the release isn't checked: some vehicles don't release within + // its 40 s, others keep a little air after the overcharge + if (auto cylinders{run_cycle(real, trace)}; cylinders["full service"] > 0.0) { + CHECK(cylinders["charge"] < 0.1); + CHECK(cylinders["light"] <= cylinders["medium"]); + CHECK(cylinders["medium"] <= cylinders["full service"] + 0.01); + CHECK(cylinders["full service"] > 1.0); + CHECK(cylinders["emergency"] > 0.5); + } + else { + // the draisine, the road vehicle and the catenary car, which have no brake worked by the pipe + CHECK(cylinders["emergency"] == 0.0); + } + trace.check(); + } +} + +TEST_CASE("brake cycle: every brake delay setting of the real vehicles") { + // G, P, R and their mixes change how fast the cylinders fill and empty; every vehicle offering more + // than one setting goes through the service part of the cycle on each + for (auto const &path : test::real_vehicles()) { + CAPTURE(path); + test::reseed_random(); + vehicle probe{definition::fiz(path)}; + for (auto const delay : {bdelay_G, bdelay_P, bdelay_R, bdelay_R + bdelay_M, bdelay_G + bdelay_M}) { + if ((probe->BrakeDelays & delay) != delay || delay == probe->BrakeDelayFlag) { + continue; + } + CAPTURE(delay); + test::reseed_random(); + vehicle real{definition::fiz(path)}; + REQUIRE(real->BrakeDelaySwitch(delay)); + test::trace trace{std::format("brake delays/{} {}", path, delay), test::channels::brakes(), 100}; + real.record(trace); + std::map> cylinders; + for (auto const &stage : {stage{"charge", 5.0, 90.0}, stage{"full service", 3.5, 30.0}, stage{"release", 5.0, 60.0}}) { + trace.mark(stage.name); + real.hold_brake_pipe(stage.pipe); + real.run(stage.seconds); + cylinders[stage.name] = real->BrakePress; + } + // every setting brakes in half a minute and releases in a minute + CHECK(cylinders["full service"] > 1.0); + CHECK(cylinders["release"] < 0.3); + trace.check(); + } + } +} + +TEST_CASE("brake cycle: the valves the game knows but none of its vehicles has, fitted to a wagon") { + // the variants of the Westinghouse and Knorr valves, the Hik ones, the old ESt3 and the CV1 ones, with a name + // the game doesn't know at the end. any other name with ESt in it is an Oerlikon valve (NESt3) whose name sets + // its relays: -ED the electrodynamic brake's one, AL2 the load-weighing one, without ESt3 the rapid one + for (auto const *name : {"W_Lu_L", "W_Lu_XR", "W_Lu_VI", "Kg", "Kp", "Kss", "Kkg", "Kkp", "Kks", "Hikp1", "Hikss", "Hikg1", "SW", "NESt3", "M483", "CV1", "CV1_L_TR", + "CV1_R", "ESt4-ED", "ESt4AL2", "no such valve"}) { + CAPTURE(name); + test::reseed_random(); + vehicle real{definition::fiz("3wl_v2/3wl").set("Brake", "BrakeValve", name)}; + test::trace trace{std::string{"brake cycle/fitted/"} + name, test::channels::brakes(), 100}; + real.record(trace); + run_cycle(real, trace); + trace.check(); + } +} + +TEST_CASE("brake cycle: the rapid setting at speed, the anti-slip brake and the releaser button") { + // R gives the cylinders more air at speed (RM); the anti-slip request the game makes while the wheels slip and + // slow down (3) and the releaser button (ub_Release) let the LSt's cylinders out, the KE's not + struct valve { + char const *name; + char const *path; + int delay; + double service; // in the cylinders, full service over 100 km/h + bool releases; // by the button + }; + for (auto const &[name, path, delay, service, releases] : {valve{"KE", "z1_v2/152a", bdelay_R, 3.78, false}, valve{"KE in P", "z1_v2/152a", bdelay_P, 2.70, false}, + valve{"LSt", "4e_v1/4e", bdelay_R, 5.79, true}, valve{"LSt in P", "4e_v1/4e", bdelay_P, 3.68, true}}) { + CAPTURE(name); + test::reseed_random(); + vehicle real{definition::fiz(path), 160.0}; + real->DecManualBrakeLevel(ManualBrakePosNo); + real->BrakeDelaySwitch(delay); // false when already set + REQUIRE(real->BrakeDelayFlag == delay); + using test::channels::operator+; + test::trace trace{std::string{"brake cycle/at speed/"} + name, test::channels::motion() + test::channels::brakes(), 100}; + real.record(trace); + trace.mark("charge"); + real.hold_brake_pipe(5.0); + real.run(60.0); + trace.mark("full service"); + real.hold_brake_pipe(3.5); + real.run(10.0); + CHECK(real->Vel > 100.0); + CHECK(real->BrakePress == doctest::Approx(service).epsilon(0.01)); + trace.mark("anti-slip"); + real->Hamulec->ASB(3); + real.run(2.0); + real->Hamulec->ASB(0); + real.run(3.0); + trace.mark("releaser button"); + real->Hamulec->SetUniversalFlag(TUniversalBrake::ub_Release); + real.run(3.0); + real->Hamulec->SetUniversalFlag(0); + CHECK((real->BrakePress < 1.0) == releases); + // released for good, the pipe still at full service + real.run(40.0); + CHECK((real->BrakePress < 0.1) == releases); + trace.check(); + } +} + +TEST_CASE("brake cycle: every material of the brake shoes and disks, braking a wagon from speed") { + // the friction of the shoes (BM) against the speed and the pressing force (friction.cpp): the game's wagons + // have P10-Bg, P10-Bgu, Cosid and the disks; FR513, FR510, P10yBg and P10yBgu none of them, nor an unknown one + // (P10, as with no BM). Mg adds the magnetic rail brake under 3 bar in the pipe + for (auto const *material : {"P10-Bg", "P10-Bgu", "FR513", "FR510", "Cosid", "P10yBg", "P10yBgu", "Disk1", "Disk1+Mg", "Disk2", "no such material"}) { + CAPTURE(material); + test::reseed_random(); + vehicle real{definition::fiz("3wl_v2/3wl").set("Brake", "BM", material), 100.0}; + real->DecManualBrakeLevel(ManualBrakePosNo); + using test::channels::operator+; + test::trace trace{std::string{"brake cycle/materials/"} + material, test::channels::motion() + test::channels::brakes(), 100}; + real.record(trace); + trace.mark("charge"); + real.hold_brake_pipe(5.0); + real.run(30.0); + auto const speed{real->Vel}; + trace.mark("full service"); + real.hold_brake_pipe(3.5); + real.run(20.0); + CHECK(real->Vel < speed - 10.0); + CHECK(real->Fb > 0.0); + trace.mark("emergency"); + real.hold_brake_pipe(0.0); + real.run(60.0); + trace.check(); + } +} diff --git a/tests/unit/test_brake_handles.cpp b/tests/unit/test_brake_handles.cpp new file mode 100644 index 000000000..51c25243b --- /dev/null +++ b/tests/unit/test_brake_handles.cpp @@ -0,0 +1,154 @@ +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" +#include "golden.h" +#include "real_vehicles.h" +#include "drive.h" + +#include "McZapkie/hamulce.h" + +using test::definition; +using test::vehicle; + +// characterisation of the driver's brake handles and the local brake handles of the real locomotives and +// units: every position of the handle, with the main reservoir kept full, followed in golden traces +// (data/golden/brake handles/). the vehicle runs alone, so the handle drives only its own brake pipe + +namespace { + +std::vector handle_channels() { + using namespace test::channels; + return brakes() + handles() + air(); +} + +// the vehicles with a driver's brake handle +bool has_handle(vehicle &Vehicle) { + return Vehicle->BrakeCtrlPosNo > 1; +} + +void hold(vehicle &Vehicle, test::trace &Trace, std::string const &Event, double Position, double Seconds) { + Trace.mark(Event); + Vehicle->BrakeLevelSet(Position); + Vehicle.run(Seconds); +} + +// every position of the driver's handle, recorded in the trace +void every_position(vehicle &Vehicle, test::trace &Trace) { + Vehicle.hold_main_reservoir(std::max(Vehicle->MaxCompressor, 8.0)); + auto &handle{*Vehicle->Handle}; + Vehicle.record(Trace); + + hold(Vehicle, Trace, "running", handle.GetPos(bh_RP), 90.0); + // every position from the lowest to the highest, emergency included, then back to running + auto const lowest{static_cast(std::ceil(handle.GetPos(bh_MIN)))}; + auto const highest{static_cast(std::floor(handle.GetPos(bh_MAX)))}; + for (auto position = lowest; position <= highest; ++position) { + hold(Vehicle, Trace, std::format("position {}", position), position, 15.0); + hold(Vehicle, Trace, "running", handle.GetPos(bh_RP), 30.0); + } + // filling stroke, neutral and the positions of the ep brake, where the handle has them + hold(Vehicle, Trace, "filling stroke", handle.GetPos(bh_FS), 10.0); + hold(Vehicle, Trace, "neutral", handle.GetPos(bh_NP), 20.0); + hold(Vehicle, Trace, "first step", handle.GetPos(bh_MB), 20.0); + hold(Vehicle, Trace, "full service", handle.GetPos(bh_FB), 20.0); + hold(Vehicle, Trace, "ep release", handle.GetPos(bh_EPR), 10.0); + hold(Vehicle, Trace, "ep hold", handle.GetPos(bh_EPN), 10.0); + hold(Vehicle, Trace, "ep brake", handle.GetPos(bh_EPB), 10.0); + hold(Vehicle, Trace, "running", handle.GetPos(bh_RP), 60.0); +} + +} // namespace + +TEST_CASE("brake handles: every position of the driver's handle of every real vehicle") { + for (auto const &path : test::real_vehicles()) { + CAPTURE(path); + test::reseed_random(); + vehicle real{definition::fiz(path)}; + if (false == has_handle(real)) { + continue; + } + test::trace trace{"brake handles/" + path, handle_channels(), 100}; + every_position(real, trace); + trace.check(); + } +} + +TEST_CASE("brake handles: the handles the game knows but none of its vehicles has, fitted to an EU07") { + // test is a handle for trying things out, D2 and Westinghouse fall back to the plain handle of the base class + for (auto const *name : {"test", "D2", "Westinghouse", "MHZ_EN57", "St113", "no such handle"}) { + CAPTURE(name); + test::reseed_random(); + vehicle real{definition::fiz("4e_v1/4e").set("Cntrl", "BrakeHandle", name)}; + test::trace trace{std::string{"brake handles/fitted/"} + name, handle_channels(), 100}; + every_position(real, trace); + trace.check(); + } +} + +TEST_CASE("brake handles: the local brake handle of every real vehicle") { + for (auto const &path : test::real_vehicles()) { + CAPTURE(path); + test::reseed_random(); + vehicle real{definition::fiz(path)}; + if (false == has_handle(real)) { + continue; + } + real.hold_main_reservoir(std::max(real->MaxCompressor, 8.0)); + test::trace trace{"local brake/" + path, handle_channels(), 100}; + real.record(trace); + real->BrakeLevelSet(real->Handle->GetPos(bh_RP)); + trace.mark("charge"); + real.run(60.0); + for (auto const position : {0.25, 0.5, 1.0, 0.5, 0.0}) { + trace.mark(std::format("local {:f}", position)); + real->LocalBrakePosA = position; + real.run(15.0); + } + trace.check(); + } +} + +TEST_CASE("brake handles: the overload and the high pressure buttons of the MHZ handles") { + // the overload button charges the pipe over its running pressure (TP), which then decays; the high pressure + // button gives the filling stroke its overpressure, where the handle has one only with the button pressed. + // from the cab, with the battery on and the driver attending to the vigilance: the electro-pneumatic handles + // work only so + // the MHZ_EN57, whose unit doesn't charge its pipe alone, fitted to an EU07 + for (auto const &[name, definition] : std::vector>{ + {"eu47", definition::fiz("e186_v2/eu47")}, + {"e6act", definition::fiz("e6act_v2/e6acta")}, + {"eu07 with MHZ_EN57", definition::fiz("4e_v1/4e").set("Cntrl", "BrakeHandle", "MHZ_EN57")}}) { + CAPTURE(name); + test::reseed_random(); + vehicle real{definition, 0.0, "test", 1}; + real->BatterySwitch(true); + real->CabActivisation(); + real.hold_main_reservoir(std::max(real->MaxCompressor, 8.0)); + test::trace trace{"brake handles/buttons/" + name, handle_channels(), 100}; + real.record(trace); + auto &handle{*real->Handle}; + auto const at{[&trace, &real](std::string const &Event, double Position, double Seconds) { + trace.mark(Event); + real->BrakeLevelSet(Position); + test::drive(test::driving(real), {}, Seconds); + }}; + at("running", handle.GetPos(bh_RP), 60.0); + auto const running{real->PipePress}; + handle.SetUniversalFlag(TUniversalBrake::ub_Overload); + at("overload button", handle.GetPos(bh_RP), 30.0); + handle.SetUniversalFlag(0); + auto const overloaded{real->PipePress}; + at("overload decaying", handle.GetPos(bh_RP), 240.0); + auto const decayed{real->PipePress}; + handle.SetUniversalFlag(TUniversalBrake::ub_HighPressure); + at("high pressure button, filling stroke", handle.GetPos(bh_FS), 10.0); + auto const filled{real->PipePress}; + handle.SetUniversalFlag(0); + at("running", handle.GetPos(bh_RP), 120.0); + CHECK(running == doctest::Approx(5.0).epsilon(0.01)); + CHECK(overloaded > running + 0.3); + CHECK(decayed < overloaded); + CHECK(filled >= decayed - 0.05); + trace.check(); + } +} diff --git a/tests/unit/test_cab.cpp b/tests/unit/test_cab.cpp new file mode 100644 index 000000000..4c5ba9f53 --- /dev/null +++ b/tests/unit/test_cab.cpp @@ -0,0 +1,229 @@ +#include "stdafx.h" +#include "doctest.h" +#include "consist.h" +#include "scenario.h" +#include "drive.h" + +#include "McZapkie/hamulce.h" +#include "utilities/utilities.h" + +// characterisation of what the cab (Train.cpp) and the AI (Driver.cpp, driverhints.cpp) call on a vehicle +// besides the controls of test_controls.cpp: the gauges and lamps reading other vehicles of the train, the +// controller of the electrodynamic brake apart from the local brake, the spring brake, the ep brake's fuse, +// cutting off damaged motors, the cab activated by itself, a road vehicle's place across the road, and the +// lamps and the buzzer of the security system + +using test::consist; +using test::definition; +using test::scenario; +using test::vehicle; +using namespace test::channels; + +TEST_CASE("cab: the engine rotation of up to three vehicles in multiple, on the tachometers of the SN61") { + consist train; + auto &first{train.add(definition::fiz("sn61_v2/sn61"), 1).mover()}; + auto &second{train.add(definition::fiz("sn61_v2/sn61")).mover()}; + auto &third{train.add(definition::fiz("sn61_v2/sn61")).mover()}; + first.enrot = -10.0; + second.enrot = 20.0; + third.enrot = 30.0; + CHECK(first.ShowEngineRotation(1) == doctest::Approx(10.0)); + CHECK(first.ShowEngineRotation(2) == doctest::Approx(20.0)); + CHECK(first.ShowEngineRotation(3) == doctest::Approx(30.0)); + CHECK(first.ShowEngineRotation(4) == doctest::Approx(0.0)); + // the others look the same way along their couplers, front first + CHECK(second.ShowEngineRotation(2) == doctest::Approx(10.0)); + CHECK(third.ShowEngineRotation(2) == doctest::Approx(20.0)); + CHECK(third.ShowEngineRotation(3) == doctest::Approx(10.0)); + // no control cable, no reading + consist apart; + auto const &alone{apart.add(definition::fiz("sn61_v2/sn61"), 1).mover()}; + apart.add(definition::fiz("sn61_v2/sn61"), 0, coupling::coupler | coupling::brakehose); + CHECK(alone.ShowEngineRotation(2) == doctest::Approx(0.0)); +} + +TEST_CASE("cab: the lamps of the overload relay and the starting resistors, read through the control cable") { + consist unit; + auto &trailer{unit.add(definition::fiz("ed72_v1/5bs-ra"), 1).mover()}; + auto &motor{unit.add(definition::fiz("ed72_v1/6bs-sa")).mover()}; + REQUIRE(trailer.Power < 0.01); + REQUIRE(motor.Power > 0.01); + CHECK_FALSE(trailer.FuseFlagCheck()); + CHECK_FALSE(trailer.ResistorsFlagCheck()); + motor.FuseFlag = true; + motor.ResistorsFlag = true; + CHECK(trailer.FuseFlagCheck()); + CHECK(trailer.ResistorsFlagCheck()); + CHECK(motor.FuseFlagCheck()); + CHECK(motor.ResistorsFlagCheck()); +} + +TEST_CASE("cab: the engine's idle speed, and the ET42's second controller shown in its dynamic brake") { + vehicle sn61{definition::fiz("sn61_v2/sn61")}; + CHECK(sn61->EngineIdleRPM() == doctest::Approx(sn61->dizel_nmin * 60.0)); + vehicle su45{definition::fiz("su45_v2/301d")}; + CHECK(su45->EngineIdleRPM() == doctest::Approx(su45->DElist[su45->MainCtrlNoPowerPos()].RPM)); + vehicle eu07{definition::fiz("4e_v1/4e")}; + CHECK(eu07->EngineIdleRPM() == std::numeric_limits::max()); + + vehicle et42{definition::fiz("et42_v2/112e-a")}; + CHECK(et42->GetVirtualScndPos() == 0); + et42->DynamicBrakeFlag = true; + CHECK(et42->GetVirtualScndPos() == -1); + et42->ScndCtrlPos = 1; + CHECK(et42->GetVirtualScndPos() == 1); + // with a speed control in place of the second controller, either end of it, for the AI + vehicle railbus{definition::fiz("21xm_v1/214ma")}; + REQUIRE(railbus->SpeedCtrl); + railbus->ScndCtrlPos = 1; + CHECK(railbus->IsScndCtrlNoPowerPos()); + CHECK(railbus->IsScndCtrlMaxPowerPos()); + CHECK(eu07->IsScndCtrlNoPowerPos()); + CHECK_FALSE(eu07->IsScndCtrlMaxPowerPos()); +} + +TEST_CASE("cab: the controller of the electrodynamic brake apart from the local brake") { + // none of the game's vehicles has one yet (SplitEDPneumaticBrake): the electrodynamic brake follows its own + // controller of DBPN positions, the local brake is pneumatic alone + scenario scenario{"cab/split electrodynamic brake", motion() + traction() + brakes()}; + scenario.add("e186_v2/eu47", 1, consist::full_coupling, 100.0).add("bdhpumn_v3/bdhpumn", 0, consist::full_coupling, 100.0); + auto &eu47{scenario.cab()}; + CHECK_FALSE(eu47.IncDynamicBrakeLevel(1.f)); + CHECK(eu47.DynamicBrakeRatio() == doctest::Approx(0.0)); + + scenario.train()[0].mover().SplitEDPneumaticBrake = true; + REQUIRE(scenario.start_up()); + REQUIRE(eu47.DynamicBrakeCtrlPosNo == 10); + CHECK(eu47.DynamicBrakeAvailable()); + scenario.act("dynamic brake up"); + for (int i = 0; i < 5; ++i) { + CHECK(eu47.IncDynamicBrakeLevel(1.f)); + } + CHECK(eu47.DynamicBrakeRatio() == doctest::Approx(0.5)); + scenario.wait(10.0); + CHECK(eu47.DynamicBrakeFlag); + CHECK(eu47.Im < -50.0); + CHECK(eu47.BrakePress < 0.1); + scenario.act("dynamic brake full"); + CHECK(eu47.DynamicBrakeLevelSet(2.0)); + CHECK(eu47.DynamicBrakeRatio() == doctest::Approx(1.0)); + CHECK_FALSE(eu47.IncDynamicBrakeLevel(1.f)); + scenario.wait(10.0); + scenario.act("dynamic brake off"); + for (int i = 0; i < 20 && eu47.DecDynamicBrakeLevel(1.f); ++i) { + // down a notch at a time + } + CHECK(eu47.DynamicBrakeRatio() == doctest::Approx(0.0)); + // the local brake no longer brings the motors in + scenario.act("local brake"); + eu47.IncLocalBrakeLevel(LocalBrakePosNo); + scenario.wait(5.0); + CHECK(eu47.BrakePress > 1.0); + scenario.check(); +} + +TEST_CASE("cab: the spring brake shut off and released by hand, the ep brake's fuse, the train brake handle stepped") { + scenario scenario{"cab/214m spring brake", motion() + brakes()}; + scenario.add("21xm_v1/214ma", 1); + REQUIRE(scenario.start_up()); + auto &railbus{scenario.cab()}; + scenario.act("spring brake on"); + railbus.SpringBrakeActivate(true); + scenario.wait(10.0); + CHECK(railbus.SpringBrake.IsActive); + // released by hand only with its cylinder empty of the air holding it off + auto const pressure{railbus.SpringBrake.Cylinder->P()}; + CHECK(railbus.SpringBrakeRelease() == (pressure < railbus.SpringBrake.MinForcePressure)); + scenario.act("shut off"); + CHECK(railbus.SpringBrakeShutOff(true)); + CHECK_FALSE(railbus.SpringBrakeShutOff(true)); + scenario.wait(5.0); + CHECK(railbus.SpringBrakeShutOff(false)); + scenario.act("spring brake off"); + railbus.SpringBrakeActivate(false); + scenario.wait(10.0); + // the ep brake's fuse + CHECK(railbus.EpFuseSwitch(false)); + CHECK_FALSE(railbus.EpFuseSwitch(false)); + CHECK(railbus.EpFuseSwitch(true)); + // the train brake handle stepped as the AI does, false at its ends + scenario.act("handle stepped"); + railbus.BrakeLevelSet(railbus.Handle->GetPos(bh_RP)); + CHECK(railbus.BrakeLevelAdd(1.0)); + CHECK(railbus.BrakeCtrlPos == static_cast(railbus.Handle->GetPos(bh_RP)) + 1); + CHECK(railbus.BrakeLevelAdd(-1.0)); + CHECK_FALSE(railbus.BrakeLevelAdd(-10.0)); + CHECK_FALSE(railbus.BrakeLevelAdd(100.0)); + scenario.wait(5.0); + scenario.check(); +} + +TEST_CASE("cab: damaged motors cut off in a car without a driver") { + // cutting off takes the damage off the engine and half of the powered axles with it; only in a car nobody + // drives, with its engine damaged + vehicle driven{definition::fiz("ew58_v1/ew58-sa"), 0.0, "test", 1}; + driven->BatterySwitch(true); + REQUIRE(driven->CabActivisation()); + driven->DamageFlag |= dtrain_engine; + CHECK_FALSE(driven->CutOffEngine()); + vehicle car{definition::fiz("ew58_v1/ew58-sa")}; + auto const axles{car->NPoweredAxles}; + CHECK_FALSE(car->CutOffEngine()); + car->DamageFlag |= dtrain_engine; + CHECK(car->CutOffEngine()); + CHECK(car->NPoweredAxles == axles / 2); + CHECK_FALSE(TestFlag(car->DamageFlag, dtrain_engine)); + vehicle wagon{definition::fiz("3wl_v2/3wl")}; + wagon->DamageFlag |= dtrain_engine; + CHECK_FALSE(wagon->CutOffEngine()); +} + +TEST_CASE("cab: activated by itself, where the vehicle allows it") { + for (auto const allowed : {false, true}) { + CAPTURE(allowed); + vehicle eu07{definition::fiz("4e_v1/4e").set("Cntrl", "AutomaticCabActivation", allowed ? "Yes" : "No"), 0.0, "test", 1}; + eu07->BatterySwitch(true); + CHECK(eu07->CabActivisationAuto() == allowed); + CHECK((eu07->CabActive != 0) == allowed); + CHECK(eu07->CabDeactivisationAuto() == allowed); + CHECK(eu07->CabActive == 0); + } +} + +TEST_CASE("cab: a road vehicle moved across its road") { + vehicle bus{definition::fiz("road/man/nl293")}; + bus.step(test::track{0.15, 0.0, 0.0, 2, 1, 7.0}); + REQUIRE(TestFlag(bus->CategoryFlag, 2)); + CHECK(bus->ChangeOffsetH(0.5)); + CHECK(bus->OffsetTrackH == doctest::Approx(0.5)); + // off the edge of the road + CHECK_FALSE(bus->ChangeOffsetH(100.0)); + vehicle eu07{definition::fiz("4e_v1/4e")}; + CHECK_FALSE(eu07->ChangeOffsetH(0.5)); +} + +TEST_CASE("cab: the lamps and the buzzer of the security system left unattended") { + scenario scenario{"cab/security system", motion() + brakes()}; + scenario.add("4e_v1/4e", 1); + REQUIRE(scenario.start_up()); + auto &eu07{scenario.cab()}; + scenario.get_going(); + scenario.full_power(10.0); + auto const &security{eu07.SecuritySystem}; + CHECK_FALSE(security.is_beeping()); + scenario.act("unattended"); + // the train runs with nobody acknowledging the vigilance + bool blinked{false}; + bool beeped{false}; + for (int i = 0; i < 120; ++i) { + scenario.train().run(1.0, scenario.line()); + blinked |= security.is_vigilance_blinking(); + beeped |= security.is_beeping(); + } + CHECK(blinked); + CHECK(beeped); + CHECK_FALSE(security.is_cabsignal_beeping()); + CHECK(eu07.PipePress < 1.0); + CHECK(security.radiostop_available()); + scenario.check(); +} diff --git a/tests/unit/test_commands.cpp b/tests/unit/test_commands.cpp new file mode 100644 index 000000000..6f5730cf7 --- /dev/null +++ b/tests/unit/test_commands.cpp @@ -0,0 +1,547 @@ +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" +#include "golden.h" +#include "consist.h" +#include "real_vehicles.h" + +#include +#include + +#include "McZapkie/hamulce.h" + +// characterisation of the commands vehicles pass each other along the couplers (RunCommand): what each of them +// does to every real vehicle, recorded in golden traces (data/golden/commands/), how they travel through a train of +// vehicles coupled either way round, and the loading and unloading driven by them + +using test::definition; +using test::vehicle; + +namespace { + +double flag(bool Value) { + return Value ? 1.0 : 0.0; +} + +// what the commands change +std::vector state() { + std::vector result{ + {"MainCtrlPos", [](auto const &M) { return M.MainCtrlPos; }}, + {"ScndCtrlPos", [](auto const &M) { return M.ScndCtrlPos; }}, + {"LastRelayTime", [](auto const &M) { return M.LastRelayTime; }}, + {"eimic_real", [](auto const &M) { return M.eimic_real; }}, + {"TUHEX_StageActual", [](auto const &M) { return M.TUHEX_StageActual; }}, + {"TUHEX_Active", [](auto const &M) { return flag(M.TUHEX_Active); }}, + {"DynamicBrakeEMUStatus", [](auto const &M) { return flag(M.DynamicBrakeEMUStatus); }}, + {"BrakeReleaser", [](auto const &M) { return flag(M.Hamulec->Releaser()); }}, + {"WaterPumpBreaker", [](auto const &M) { return flag(M.WaterPump.breaker); }}, + {"WaterPumpEnabled", [](auto const &M) { return flag(M.WaterPump.is_enabled); }}, + {"WaterPumpDisabled", [](auto const &M) { return flag(M.WaterPump.is_disabled); }}, + {"WaterHeaterBreaker", [](auto const &M) { return flag(M.WaterHeater.breaker); }}, + {"WaterHeaterEnabled", [](auto const &M) { return flag(M.WaterHeater.is_enabled); }}, + {"WaterCircuitsLink", [](auto const &M) { return flag(M.WaterCircuitsLink); }}, + {"FuelPumpEnabled", [](auto const &M) { return flag(M.FuelPump.is_enabled); }}, + {"FuelPumpDisabled", [](auto const &M) { return flag(M.FuelPump.is_disabled); }}, + {"OilPumpEnabled", [](auto const &M) { return flag(M.OilPump.is_enabled); }}, + {"OilPumpDisabled", [](auto const &M) { return flag(M.OilPump.is_disabled); }}, + {"CompartmentLightsEnabled", [](auto const &M) { return flag(M.CompartmentLights.is_enabled); }}, + {"CompartmentLightsDisabled", [](auto const &M) { return flag(M.CompartmentLights.is_disabled); }}, + {"MainSwitch", [](auto const &M) { return flag(M.Mains); }}, + {"Heating", [](auto const &M) { return flag(M.Heating); }}, + {"DirActive", [](auto const &M) { return M.DirActive; }}, + {"DirAbsolute", [](auto const &M) { return M.DirAbsolute; }}, + {"CabActive", [](auto const &M) { return M.CabActive; }}, + {"CabMaster", [](auto const &M) { return flag(M.CabMaster); }}, + {"AutoRelayFlag", [](auto const &M) { return flag(M.AutoRelayFlag); }}, + {"ConverterAllow", [](auto const &M) { return flag(M.ConverterAllow); }}, + {"Battery", [](auto const &M) { return flag(M.Battery); }}, + {"CompressorAllow", [](auto const &M) { return flag(M.CompressorAllow); }}, + {"CompressorListPos", [](auto const &M) { return M.CompressorListPos; }}, + {"DoorLock", [](auto const &M) { return flag(M.Doors.lock_enabled); }}, + {"DoorStep", [](auto const &M) { return flag(M.Doors.step_enabled); }}, + {"DoorRemoteOnly", [](auto const &M) { return flag(M.Doors.remote_only); }}, + {"DepartureSignal", [](auto const &M) { return flag(M.DepartureSignal); }}, + {"PantsValve", [](auto const &M) { return flag(M.PantsValve.is_enabled) + 2 * flag(M.PantsValve.is_disabled); }}, + {"MaxCurrentHigh", [](auto const &M) { return flag(M.MotorOverloadRelayHighThreshold); }}, + {"Imin", [](auto const &M) { return M.Imin; }}, + {"DamageFlag", [](auto const &M) { return M.DamageFlag; }}, + {"RadioStop", [](auto const &M) { return flag(M.RadioStopFlag); }}, + {"BrakeDelayFlag", [](auto const &M) { return M.BrakeDelayFlag; }}, + {"SandDose", [](auto const &M) { return flag(M.SandDose); }}, + {"CabSignal", [](auto const &M) { return flag(M.SecuritySystem.is_cabsignal_blinking()); }}, + {"LoadAmount", [](auto const &M) { return M.LoadAmount; }}, + {"LoadStatus", [](auto const &M) { return M.LoadStatus; }}, + {"SpeedCtrlValue", [](auto const &M) { return M.SpeedCtrlValue; }}, + {"SpeedCtrlParking", [](auto const &M) { return flag(M.SpeedCtrlUnit.Parking); }}, + {"SpringBrakeActivate", [](auto const &M) { return flag(M.SpringBrake.Activate); }}, + }; + for (int end : {end::front, end::rear}) { + auto const name{std::string{end == end::front ? "Front" : "Rear"}}; + result.emplace_back("MotorBlowers" + name + "Enabled", [end](auto const &M) { return flag(M.MotorBlowers[end].is_enabled); }); + result.emplace_back("MotorBlowers" + name + "Disabled", [end](auto const &M) { return flag(M.MotorBlowers[end].is_disabled); }); + result.emplace_back("Pant" + name + "Valve", [end](auto const &M) { return flag(M.Pantographs[end].valve.is_enabled) + 2 * flag(M.Pantographs[end].valve.is_disabled); }); + } + for (int side : {side::right, side::left}) { + auto const name{std::string{side == side::right ? "Right" : "Left"}}; + result.emplace_back(name + "DoorPermit", [side](auto const &M) { return flag(M.Doors.instances[side].open_permit); }); + result.emplace_back(name + "DoorRemoteOpen", [side](auto const &M) { return flag(M.Doors.instances[side].remote_open); }); + result.emplace_back(name + "DoorRemoteClose", [side](auto const &M) { return flag(M.Doors.instances[side].remote_close); }); + } + return result; +} + +struct command { + std::string name; + double value1; + double value2{1.0}; // the direction it comes from, 1 the front +}; + +// every command RunCommand knows, with values taking each of its ways, and one it doesn't +std::vector const commands{ + {"MainCtrl", 1}, + {"MainCtrl", 2}, + {"MainCtrl", 0}, + {"MainCtrl", 99}, + {"ScndCtrl", 1}, + {"ScndCtrl", 0}, + {"ScndCtrl", 99}, + {"EIMIC", 0.5}, + {"EIMIC", -0.5}, + {"Brake", 1}, + {"Brake", 2}, + {"Brake", 0}, + {"BrakeReleaser", 1}, + {"BrakeReleaser", 0}, + {"WaterPumpBreakerSwitch", 1}, + {"WaterPumpSwitch", 1}, + {"WaterPumpSwitchOff", 1}, + {"WaterPumpSwitchOff", 0}, + {"WaterPumpSwitch", 0}, + {"WaterPumpBreakerSwitch", 0}, + {"WaterHeaterBreakerSwitch", 1}, + {"WaterHeaterSwitch", 1}, + {"WaterHeaterSwitch", 0}, + {"WaterHeaterBreakerSwitch", 0}, + {"WaterCircuitsLinkSwitch", 1}, + {"WaterCircuitsLinkSwitch", 0}, + {"FuelPumpSwitch", 1}, + {"FuelPumpSwitchOff", 1}, + {"FuelPumpSwitchOff", 0}, + {"FuelPumpSwitch", 0}, + {"OilPumpSwitch", 1}, + {"OilPumpSwitchOff", 1}, + {"OilPumpSwitchOff", 0}, + {"OilPumpSwitch", 0}, + {"MotorBlowersFrontSwitch", 1}, + {"MotorBlowersFrontSwitchOff", 1}, + {"MotorBlowersFrontSwitchOff", 0}, + {"MotorBlowersFrontSwitch", 0}, + {"MotorBlowersRearSwitch", 1}, + {"MotorBlowersRearSwitchOff", 1}, + {"MotorBlowersRearSwitchOff", 0}, + {"MotorBlowersRearSwitch", 0}, + {"CompartmentLightsSwitch", 1}, + {"CompartmentLightsSwitchOff", 1}, + {"CompartmentLightsSwitchOff", 0}, + {"CompartmentLightsSwitch", 0}, + {"BatterySwitch", 1}, + {"ConverterSwitch", 1}, + {"CompressorSwitch", 1}, + {"CompressorPreset", 1}, + {"CompressorPreset", 99}, + {"CompressorPreset", -1}, + {"MainSwitch", 1}, + {"HeatingSwitch", 1}, + {"HeatingSwitch", 0}, + {"Direction", 1}, + {"Direction", -1}, + {"Direction", 0}, + {"CabActivisation", 1, 1}, + {"CabActivisation", 1, -1}, + {"CabActivisation", 0, 1}, + {"AutoRelaySwitch", 1}, + {"AutoRelaySwitch", 0}, + {"RelayReset", 1}, + {"DoorPermit", 1, 1}, + {"DoorPermit", 2, 1}, + {"DoorPermit", -3, 1}, + {"DoorPermit", 1, -1}, + {"DoorPermit", 3, -1}, + {"DoorOpen", 1, 1}, + {"DoorOpen", 2, -1}, + {"DoorClose", 3, 1}, + {"DoorOpen", 3, 1}, + {"DoorClose", 1, -1}, + {"DoorLock", 0}, + {"DoorLock", 1}, + {"DoorStep", 0}, + {"DoorStep", 1}, + {"DoorMode", 1}, + {"DoorMode", 0}, + {"DepartureSignal", 1}, + {"DepartureSignal", 0}, + {"PantValve", 1}, + {"PantValve", 0x80 | 1}, + {"PantValve", 0x40 | 1, -1}, + {"PantValve", 0x80 | 0x40 | 2, -1}, + {"PantValve", 3}, + {"PantValve", 4}, + {"PantValve", 0x80 | 5}, + {"PantValve", 0x80 | 6}, + {"PantsValve", 1}, + {"PantsValve", 2}, + {"PantsValve", 3}, + {"PantsValve", 4}, + {"PantsValve", 5}, + {"PantsValve", 6}, + {"PantAllDown", 1}, + {"PantAllDown", 0}, + {"MaxCurrentSwitch", 1}, + {"MaxCurrentSwitch", 0}, + {"MinCurrentSwitch", 1}, + {"MinCurrentSwitch", 0}, + {"SetDamage", 4, 1}, + {"SetDamage", 4, -1}, + {"SetDamage", 4, 0}, + {"Emergency_brake", 1}, + {"Emergency_brake", 0}, + {"BrakeDelay", 1}, + {"BrakeDelay", 2}, + {"BrakeDelay", 4}, + {"BrakeDelay", 8}, + {"BrakeDelay", 5}, + {"Sandbox", 1}, + {"Sandbox", 0}, + {"CabSignal", 0}, + {"Load=coal", 5, 0}, + {"Load=Coal", 5, 20}, + {"UnLoad=coal", 5, 0}, + {"UnLoad=Coal", 5, 0}, + {"SpeedCntrl", 40.4}, + {"SpeedCtrlUnit.Parking", 1}, + {"SpeedCtrlUnit.Parking", 0}, + {"SpringBrakeActivate", 1}, + {"SpringBrakeActivate", 0}, + {"MainSwitch", 0}, + {"CompressorSwitch", 0}, + {"ConverterSwitch", 0}, + {"BatterySwitch", 0}, + {"SpringBrakeActivate", 1}, + {"NoSuchCommand", 1}, +}; + +} // namespace + +TEST_CASE("commands: every command run on every real vehicle") { + for (auto const &path : test::real_vehicles()) { + CAPTURE(path); + test::reseed_random(); + vehicle real{definition::fiz(path), 0.0, "test", 1}; + // loading takes place where the command was given, which comes with the command (PutCommand). a + // vehicle gets none before its first one, TCommand::Location is left uninitialised + real->CommandIn.Location = real->Loc; + auto done{false}; + auto channels{state()}; + channels.emplace_back("Done", [&done](auto const &) { return flag(done); }); + test::trace trace{"commands/" + path, channels, 1, false}; + trace.sample(0.0, real.mover()); + for (std::size_t i = 0; i < commands.size(); ++i) { + auto const &command{commands[i]}; + trace.mark(std::format("{} {} {}", command.name, command.value1, command.value2)); + done = real->RunCommand(command.name, command.value1, command.value2, coupling::control); + trace.sample(static_cast(i + 1), real.mover()); + } + trace.check(); + } +} + +namespace { + +// a switch of the cab, worked on the driven vehicle +struct action { + std::string name; + std::function work; +}; + +// every switch sending its state to the rest of the train, each way and to each range, in the order a crew +// could work them, with the controllers and the direction among them to see what they make of the state +std::vector const actions{ + {"CabActivisation", [](auto &M) { return M.CabActivisation(); }}, + {"BatterySwitch on", [](auto &M) { return M.BatterySwitch(true, range_t::consist); }}, + {"CompartmentLightsSwitch on", [](auto &M) { return M.CompartmentLightsSwitch(true, range_t::consist); }}, + {"CompartmentLightsSwitchOff on", [](auto &M) { return M.CompartmentLightsSwitchOff(true, range_t::consist); }}, + {"CompartmentLightsSwitchOff off", [](auto &M) { return M.CompartmentLightsSwitchOff(false, range_t::unit); }}, + {"WaterPumpBreakerSwitch on", [](auto &M) { return M.WaterPumpBreakerSwitch(true, range_t::consist); }}, + {"WaterPumpSwitch on", [](auto &M) { return M.WaterPumpSwitch(true, range_t::consist); }}, + {"WaterPumpSwitchOff on", [](auto &M) { return M.WaterPumpSwitchOff(true, range_t::unit); }}, + {"WaterPumpSwitchOff off", [](auto &M) { return M.WaterPumpSwitchOff(false, range_t::consist); }}, + {"WaterHeaterBreakerSwitch on", [](auto &M) { return M.WaterHeaterBreakerSwitch(true, range_t::consist); }}, + {"WaterHeaterSwitch on", [](auto &M) { return M.WaterHeaterSwitch(true, range_t::consist); }}, + {"WaterCircuitsLinkSwitch on", [](auto &M) { return M.WaterCircuitsLinkSwitch(true, range_t::consist); }}, + {"FuelPumpSwitch on", [](auto &M) { return M.FuelPumpSwitch(true, range_t::consist); }}, + {"FuelPumpSwitchOff on", [](auto &M) { return M.FuelPumpSwitchOff(true, range_t::unit); }}, + {"FuelPumpSwitchOff off", [](auto &M) { return M.FuelPumpSwitchOff(false, range_t::consist); }}, + {"OilPumpSwitch on", [](auto &M) { return M.OilPumpSwitch(true, range_t::consist); }}, + {"OilPumpSwitchOff on", [](auto &M) { return M.OilPumpSwitchOff(true, range_t::unit); }}, + {"OilPumpSwitchOff off", [](auto &M) { return M.OilPumpSwitchOff(false, range_t::consist); }}, + {"MotorBlowersSwitch front on", [](auto &M) { return M.MotorBlowersSwitch(true, end::front, range_t::consist); }}, + {"MotorBlowersSwitch rear on", [](auto &M) { return M.MotorBlowersSwitch(true, end::rear, range_t::unit); }}, + {"MotorBlowersSwitchOff front on", [](auto &M) { return M.MotorBlowersSwitchOff(true, end::front, range_t::consist); }}, + {"MotorBlowersSwitchOff rear on", [](auto &M) { return M.MotorBlowersSwitchOff(true, end::rear, range_t::unit); }}, + {"MotorBlowersSwitchOff front off", [](auto &M) { return M.MotorBlowersSwitchOff(false, end::front, range_t::consist); }}, + {"MotorBlowersSwitchOff rear off", [](auto &M) { return M.MotorBlowersSwitchOff(false, end::rear, range_t::consist); }}, + {"OperatePantographsValve enable", [](auto &M) { return M.OperatePantographsValve(operation_t::enable, range_t::consist); }}, + {"OperatePantographValve front enable", [](auto &M) { return M.OperatePantographValve(end::front, operation_t::enable, range_t::consist); }}, + {"OperatePantographValve rear enable_on", [](auto &M) { return M.OperatePantographValve(end::rear, operation_t::enable_on, range_t::unit); }}, + {"OperatePantographValve rear enable_off", [](auto &M) { return M.OperatePantographValve(end::rear, operation_t::enable_off, range_t::unit); }}, + {"DirectionForward", [](auto &M) { return M.DirectionForward(); }}, + {"ConverterSwitch on", [](auto &M) { return M.ConverterSwitch(true, range_t::consist); }}, + {"CompressorSwitch on", [](auto &M) { return M.CompressorSwitch(true, range_t::consist); }}, + {"ChangeCompressorPreset 1", [](auto &M) { return M.ChangeCompressorPreset(1, range_t::consist); }}, + {"FuseOn", [](auto &M) { return M.FuseOn(range_t::consist); }}, + {"RelayReset all", [](auto &M) { return M.RelayReset(0xff, range_t::consist); }}, + {"UniversalResetButton 1", [](auto &M) { return M.UniversalResetButton(0, range_t::consist); }}, + {"UniversalResetButton 2", [](auto &M) { return M.UniversalResetButton(1, range_t::unit); }}, + {"MainSwitch on", [](auto &M) { return M.MainSwitch(true, range_t::consist); }}, + {"HeatingSwitch on", [](auto &M) { return M.HeatingSwitch(true, range_t::consist); }}, + {"MaxCurrentSwitch on", [](auto &M) { return M.MaxCurrentSwitch(true, range_t::consist); }}, + {"MinCurrentSwitch on", [](auto &M) { return M.MinCurrentSwitch(true); }}, + {"CurrentSwitch on", [](auto &M) { return M.CurrentSwitch(true); }}, + {"AutoRelaySwitch on", [](auto &M) { return M.AutoRelaySwitch(true); }}, + {"IncMainCtrl 1", [](auto &M) { return M.IncMainCtrl(1); }}, + {"IncMainCtrl 2", [](auto &M) { return M.IncMainCtrl(2); }}, + {"IncScndCtrl 1", [](auto &M) { return M.IncScndCtrl(1); }}, + {"IncScndCtrl 2", [](auto &M) { return M.IncScndCtrl(2); }}, + {"DecScndCtrl 1", [](auto &M) { return M.DecScndCtrl(1); }}, + {"DecScndCtrl 2", [](auto &M) { return M.DecScndCtrl(2); }}, + {"DecMainCtrl 1", [](auto &M) { return M.DecMainCtrl(1); }}, + {"DecMainCtrl 2", [](auto &M) { return M.DecMainCtrl(2); }}, + {"AutoRelaySwitch off", [](auto &M) { return M.AutoRelaySwitch(false); }}, + {"CurrentSwitch off", [](auto &M) { return M.CurrentSwitch(false); }}, + {"MinCurrentSwitch off", [](auto &M) { return M.MinCurrentSwitch(false); }}, + {"MaxCurrentSwitch off", [](auto &M) { return M.MaxCurrentSwitch(false, range_t::unit); }}, + {"DirectionBackward", [](auto &M) { return M.DirectionBackward(); }}, + {"DirectionBackward again", [](auto &M) { return M.DirectionBackward(); }}, + {"DirectionForward", [](auto &M) { return M.DirectionForward(); }}, + {"Sandbox on", [](auto &M) { return M.Sandbox(true, range_t::consist); }}, + {"SandboxManual on", [](auto &M) { return M.SandboxManual(true, range_t::consist); }}, + {"SandboxAuto on", [](auto &M) { return M.SandboxAuto(true, range_t::unit); }}, + {"SandboxAuto off", [](auto &M) { return M.SandboxAuto(false, range_t::consist); }}, + {"SandboxManual off", [](auto &M) { return M.SandboxManual(false, range_t::consist); }}, + {"Sandbox off", [](auto &M) { return M.Sandbox(false, range_t::consist); }}, + {"PermitDoors right", [](auto &M) { return M.PermitDoors(side::right, true, range_t::consist); }}, + {"PermitDoors left", [](auto &M) { return M.PermitDoors(side::left, true, range_t::unit); }}, + {"ChangeDoorPermitPreset +1", [](auto &M) { return M.ChangeDoorPermitPreset(1, range_t::consist); }}, + {"ChangeDoorPermitPreset -1", [](auto &M) { return M.ChangeDoorPermitPreset(-1, range_t::consist); }}, + {"PermitDoorStep off", [](auto &M) { return M.PermitDoorStep(false, range_t::consist); }}, + {"PermitDoorStep on", [](auto &M) { return M.PermitDoorStep(true, range_t::unit); }}, + {"LockDoors off", [](auto &M) { return M.LockDoors(false, range_t::consist); }}, + {"OperateDoors right open local", [](auto &M) { return M.OperateDoors(side::right, true, range_t::local); }}, + {"OperateDoors left open", [](auto &M) { return M.OperateDoors(side::left, true, range_t::consist); }}, + {"OperateDoors right close", [](auto &M) { return M.OperateDoors(side::right, false, range_t::unit); }}, + {"ChangeDoorControlMode remote", [](auto &M) { return M.ChangeDoorControlMode(true, range_t::consist); }}, + {"ChangeDoorControlMode local", [](auto &M) { return M.ChangeDoorControlMode(false, range_t::unit); }}, + {"LockDoors on", [](auto &M) { return M.LockDoors(true, range_t::unit); }}, + {"signal_departure on", [](auto &M) { return M.signal_departure(true, range_t::consist); }}, + {"signal_departure off", [](auto &M) { return M.signal_departure(false, range_t::unit); }}, + {"PermitDoors right off", [](auto &M) { return M.PermitDoors(side::right, false, range_t::consist); }}, + {"HeatingSwitch off", [](auto &M) { return M.HeatingSwitch(false, range_t::unit); }}, + {"MainSwitch off", [](auto &M) { return M.MainSwitch(false, range_t::consist); }}, + {"DropAllPantographs", [](auto &M) { return M.DropAllPantographs(true, range_t::consist); }}, + {"DropAllPantographs released", [](auto &M) { return M.DropAllPantographs(false, range_t::unit); }}, + {"OperatePantographsValve disable", [](auto &M) { return M.OperatePantographsValve(operation_t::disable, range_t::unit); }}, + {"OperatePantographValve front disable_on", [](auto &M) { return M.OperatePantographValve(end::front, operation_t::disable_on, range_t::consist); }}, + {"OperatePantographValve front disable_off", [](auto &M) { return M.OperatePantographValve(end::front, operation_t::disable_off, range_t::consist); }}, + {"OperatePantographValve front none", [](auto &M) { return M.OperatePantographValve(end::front, operation_t::none, range_t::local); }}, + {"CompressorSwitch off", [](auto &M) { return M.CompressorSwitch(false, range_t::unit); }}, + {"ConverterSwitch off", [](auto &M) { return M.ConverterSwitch(false, range_t::unit); }}, + {"WaterCircuitsLinkSwitch off", [](auto &M) { return M.WaterCircuitsLinkSwitch(false, range_t::unit); }}, + {"WaterHeaterSwitch off", [](auto &M) { return M.WaterHeaterSwitch(false, range_t::unit); }}, + {"WaterHeaterBreakerSwitch off", [](auto &M) { return M.WaterHeaterBreakerSwitch(false, range_t::unit); }}, + {"WaterPumpSwitch off", [](auto &M) { return M.WaterPumpSwitch(false, range_t::unit); }}, + {"WaterPumpBreakerSwitch off", [](auto &M) { return M.WaterPumpBreakerSwitch(false, range_t::unit); }}, + {"FuelPumpSwitch off", [](auto &M) { return M.FuelPumpSwitch(false, range_t::unit); }}, + {"OilPumpSwitch off", [](auto &M) { return M.OilPumpSwitch(false, range_t::unit); }}, + {"MotorBlowersSwitch front off", [](auto &M) { return M.MotorBlowersSwitch(false, end::front, range_t::unit); }}, + {"MotorBlowersSwitch rear off", [](auto &M) { return M.MotorBlowersSwitch(false, end::rear, range_t::consist); }}, + {"CompartmentLightsSwitch off", [](auto &M) { return M.CompartmentLightsSwitch(false, range_t::unit); }}, + {"BatterySwitch off", [](auto &M) { return M.BatterySwitch(false, range_t::unit); }}, + {"CabDeactivisation", [](auto &M) { return M.CabDeactivisation(); }}, +}; + +} // namespace + +TEST_CASE("commands: every switch of the cab, sent to the next vehicle") { + for (auto const &path : test::real_vehicles()) { + CAPTURE(path); + test::reseed_random(); + vehicle driven{definition::fiz(path), 0.0, "driven", 1}; + vehicle next{definition::fiz(path), 0.0, "next"}; + driven->Attach(end::rear, end::front, &next.mover(), test::consist::full_coupling, true, false); + auto done{false}; + auto channels{state()}; + for (auto const &channel : state()) { + channels.emplace_back("next." + channel.name, [&next, value = channel.value](auto const &) { return value(next.mover()); }); + } + channels.emplace_back("Done", [&done](auto const &) { return flag(done); }); + test::trace trace{"switches/" + path, channels, 1, false}; + trace.sample(0.0, driven.mover()); + for (std::size_t i = 0; i < actions.size(); ++i) { + trace.mark(actions[i].name); + done = actions[i].work(driven.mover()); + trace.sample(static_cast(i + 1), driven.mover()); + } + trace.check(); + } +} + +TEST_CASE("commands: every switch of the cab, worked on a pair standing under the catenary") { + // the same switches with time for the vehicles to act on them, as a crew works them: the pantographs rise, + // the main switch closes, the converter and the compressor start, and the controllers take power + for (auto const &path : test::real_vehicles()) { + CAPTURE(path); + test::reseed_random(); + test::consist pair; + pair.add(definition::fiz(path), 1); + pair.add(definition::fiz(path)); + auto done{false}; + auto channels{state()}; + channels.insert(channels.end(), { + {"PantFrontActive", [](auto const &M) { return flag(M.Pantographs[end::front].is_active); }}, + {"PantRearActive", [](auto const &M) { return flag(M.Pantographs[end::rear].is_active); }}, + {"PantPress", [](auto const &M) { return M.PantPress; }}, + {"GroundRelay", [](auto const &M) { return flag(M.GroundRelay); }}, + {"ConverterFlag", [](auto const &M) { return flag(M.ConverterFlag); }}, + {"CompressorFlag", [](auto const &M) { return flag(M.CompressorFlag); }}, + {"Compressor", [](auto const &M) { return M.Compressor; }}, + {"MainCtrlActualPos", [](auto const &M) { return M.MainCtrlActualPos; }}, + {"Itot", [](auto const &M) { return M.Itot; }}, + {"FuseFlag", [](auto const &M) { return flag(M.FuseFlag); }}, + {"EngineRotation", [](auto const &M) { return M.enrot; }}, + }); + auto const own{channels.size()}; + for (std::size_t i = 0; i < own; ++i) { + channels.emplace_back("next." + channels[i].name, [&pair, value = channels[i].value](auto const &) { return value(pair[1].mover()); }); + } + channels.emplace_back("Done", [&done](auto const &) { return flag(done); }); + test::trace trace{"switches_live/" + path, channels, 1, false}; + trace.sample(0.0, pair[0].mover()); + test::track const catenary{.voltage = test::catenary_3kv}; + for (std::size_t i = 0; i < actions.size(); ++i) { + trace.mark(actions[i].name); + done = actions[i].work(pair[0].mover()); + pair.run(2.0, catenary); + trace.sample(static_cast(i + 1), pair[0].mover()); + } + trace.check(); + } +} + +namespace { + +// three locomotives coupled with the given coupling, the middle one facing backwards, as a train made up of +// whatever came to hand: the commands of the front one go to the rear coupler of the middle one and from its +// front coupler to the front one of the last, which faces backwards from the middle one, so forwards +struct train { + vehicle head{definition::fiz("4e_v1/4e"), 0.0, "front", 1}; + vehicle middle{definition::fiz("4e_v1/4e"), 0.0, "middle"}; + vehicle last{definition::fiz("4e_v1/4e"), 0.0, "last"}; + + explicit train(int Coupling) { + head->Attach(end::rear, end::rear, &middle.mover(), Coupling, true, false); + middle->Attach(end::front, end::front, &last.mover(), Coupling, true, false); + } +}; + +} // namespace + +TEST_CASE("commands: travel along the train, turned round for a vehicle facing backwards") { + train consist{test::consist::full_coupling}; + // the driver takes the front cab, which the others follow + REQUIRE(consist.head->CabActivisation()); + CHECK(consist.head->CabActive == 1); + CHECK(consist.middle->CabActive == -1); + CHECK(consist.last->CabActive == 1); + // the command is done in each vehicle and cleared + CHECK(consist.middle->CommandIn.Command.empty()); + CHECK(consist.last->CommandIn.Command.empty()); + + SUBCASE("door permits: the right side of the sender is the left one of a vehicle facing backwards") { + consist.head->PermitDoors(side::right, true, range_t::consist); + CHECK(consist.head->Doors.instances[side::right].open_permit); + CHECK(consist.middle->Doors.instances[side::left].open_permit); + CHECK_FALSE(consist.middle->Doors.instances[side::right].open_permit); + CHECK(consist.last->Doors.instances[side::right].open_permit); + // and revoked the same way + consist.head->PermitDoors(side::right, false, range_t::consist); + CHECK_FALSE(consist.middle->Doors.instances[side::left].open_permit); + CHECK_FALSE(consist.last->Doors.instances[side::right].open_permit); + } + SUBCASE("a pantograph valve: the vehicles past one coupled by its control cable take the other pantograph") { + consist.head->OperatePantographValve(end::front, operation_t::enable, range_t::consist); + CHECK(consist.head->Pantographs[end::front].valve.is_enabled); + CHECK(consist.middle->Pantographs[end::front].valve.is_enabled); + CHECK(consist.last->Pantographs[end::rear].valve.is_enabled); + } + SUBCASE("sent backwards, it goes no further than the sender: nothing is coupled at its front") { + consist.head->RunCommand("DoorLock", 0, -1, coupling::control); + CHECK_FALSE(consist.head->Doors.lock_enabled); + CHECK(consist.middle->Doors.lock_enabled); + } + SUBCASE("the same command again isn't taken by the next vehicle a second time") { + CHECK(consist.middle->SetInternalCommand("DoorStep", 0, 1, coupling::control)); + CHECK_FALSE(consist.middle->SetInternalCommand("DoorStep", 0, 1, coupling::control)); + CHECK_FALSE(consist.head->RunInternalCommand()); // nothing to run + } +} + +TEST_CASE("commands: don't pass a coupling without the control cable") { + train consist{coupling::coupler | coupling::brakehose}; + consist.head->RunCommand("DoorLock", 0, 1, coupling::control); + CHECK_FALSE(consist.head->Doors.lock_enabled); + CHECK(consist.middle->Doors.lock_enabled); + // a command of another coupling goes through it + consist.head->RunCommand("DoorStep", 0, 1, coupling::brakehose); + CHECK_FALSE(consist.middle->Doors.step_enabled); +} + +TEST_CASE("commands: a wagon loaded and unloaded by commands, which repeat until done") { + vehicle wagon{definition::fiz("3wl_v2/3wl")}; + REQUIRE(wagon->MaxLoad > 0); + test::trace trace{"commands/loading", state(), 100}; + wagon.record(trace); + + // the game gives the commands of loading through PutCommand, with the place of the platform or the ramp + SUBCASE("loading 12 tonnes of coal") { + trace.mark("load"); + wagon->PutCommand("Load=Coal", 12, 0, wagon->Loc); + wagon.run(30.0); + CHECK(wagon->LoadAmount == doctest::Approx(12.0).epsilon(0.1)); + CHECK(wagon->LoadType.name == "coal"); + CHECK(wagon->CommandIn.Command.empty()); + + trace.mark("unload"); + wagon->PutCommand("UnLoad=Coal", 20, 0, wagon->Loc); + wagon.run(200.0); + CHECK(wagon->LoadAmount == doctest::Approx(0.0)); + CHECK(wagon->LoadType.name.empty()); + trace.check(); + } + SUBCASE("a load the wagon doesn't take stays a command, not done") { + wagon->PutCommand("Load=passengers", 12, 0, wagon->Loc); + wagon.run(10.0); + CHECK(wagon->LoadAmount == doctest::Approx(0.0)); + CHECK_FALSE(wagon->CommandIn.Command.empty()); + } + SUBCASE("away from the place of the command nothing is loaded") { + wagon->PutCommand("Load=Coal", 12, 5.0, TLocation{100.0, 0.0, 0.0}); + wagon.run(10.0); + CHECK(wagon->LoadAmount == doctest::Approx(0.0)); + CHECK(wagon->LastLoadChangeTime == doctest::Approx(0.0)); + } + SUBCASE("unloading an empty wagon isn't done either") { + wagon->PutCommand("UnLoad=Coal", 12, 0, wagon->Loc); + wagon.run(10.0); + CHECK_FALSE(wagon->CommandIn.Command.empty()); + } +} diff --git a/tests/unit/test_consist.cpp b/tests/unit/test_consist.cpp new file mode 100644 index 000000000..8305be171 --- /dev/null +++ b/tests/unit/test_consist.cpp @@ -0,0 +1,135 @@ +#include "stdafx.h" +#include "doctest.h" +#include "consist.h" +#include "drive.h" +#include "golden.h" + +#include "McZapkie/hamulce.h" + +using test::consist; +using test::definition; + +// characterisation of trains of coupled vehicles: the real electric units driven whole, a locomotive with +// wagons, the air, the control and the coupler forces between the vehicles, in golden traces +// (data/golden/consist/), each vehicle of the train in its own + +namespace { + +struct unit { + char const *name; + std::vector cars; // from the front, the first one driven +}; + +std::vector const units{ + {"en57", {"en57_v1/5bgaiii_led_spot", "en57_v1/6ba_840", "en57_v1/5bgb"}}, + {"ed72", {"ed72_v1/5bs-ra", "ed72_v1/6bs-sa", "ed72_v1/6bs-sb", "ed72_v1/5bs-rb"}}, + {"ew58", {"ew58_v1/ew58-sa", "ew58_v1/ew58-d", "ew58_v1/ew58-sb"}}, + {"elf", {"elf_v1/21we-a", "elf_v1/21we-b", "elf_v1/21we-c"}}, + {"impuls", {"impuls_v1/31we-a_pr", "impuls_v1/31we-b_pr", "impuls_v1/31we-c_pr", "impuls_v1/31we-d_pr"}}, +}; + +std::vector car_channels() { + using namespace test::channels; + return motion() + traction() + air() + brakes(); +} + +// a trace for each vehicle of the train, recording it +std::vector> record(consist &Train, std::string const &Name) { + std::vector> traces; + for (std::size_t i = 0; i < Train.size(); ++i) { + traces.push_back(std::make_unique(std::format("consist/{}/{}", Name, i), car_channels(), 100)); + Train[i].record(*traces.back()); + } + return traces; +} + +// the events go to every trace +struct all_traces { + std::vector> &traces; + void mark(std::string const &Event) const { + for (auto const &trace : traces) { + trace->mark(Event); + } + } +}; + +} // namespace + +TEST_CASE("consist: every real electric unit driven whole from its front cab") { + for (auto const &unit : units) { + CAPTURE(unit.name); + test::reseed_random(); + consist train; + for (auto const *car : unit.cars) { + train.add(definition::fiz(car), train.size() == 0 ? 1 : 0); + } + auto traces{record(train, unit.name)}; + // the drive cycle marks the events in the trace it gets; the first car's carries them + test::drive_cycle(test::driving(train), test::track{0.15, 0.0, test::catenary_3kv}, *traces.front()); + // every unit runs off and is braked to a stop, but the EN57, which doesn't get ready (COVERAGE.md) + auto const &leading{train[0].mover()}; + CHECK((leading.DistCounter > 0.2 /* km */) != (std::string{unit.name} == "en57")); + CHECK(leading.Vel < 0.5); + for (auto const &trace : traces) { + trace->check(); + } + } +} + +TEST_CASE("consist: a locomotive with wagons, driven, braked by its handle and pulled apart by the couplers") { + test::reseed_random(); + consist train; + train.add(definition::fiz("4e_v1/4e"), 1); + for (auto const *wagon : {"3wl_v2/3wl", "11xa_v2/93a", "bdhpumn_v3/bdhpumn", "z1_v2/152a"}) { + train.add(definition::fiz(wagon)); + } + auto traces{record(train, "eu07 with wagons")}; + test::drive_cycle(test::driving(train), test::track{0.15, 0.0, test::catenary_3kv}, *traces.front()); + for (auto const &trace : traces) { + trace->check(); + } + // the couplers kept the train together + for (std::size_t i = 0; i + 1 < train.size(); ++i) { + CAPTURE(i); + CHECK(std::abs(train.gap(i)) < 0.5); + } +} + +namespace { + +// what the cab's ammeters show (Train.cpp, the driver's panel) and the brake force the AI expects of the +// vehicle (Driver.cpp), read of the driven vehicle +std::vector gauges() { + std::vector result; + for (int ammeter = 0; ammeter < 4; ++ammeter) { + result.emplace_back(std::format("ShowCurrent{}", ammeter), [ammeter](auto const &M) { return M.ShowCurrent(ammeter); }); + } + result.emplace_back("BrakeForceR0.25", [](auto const &M) { return M.BrakeForceR(0.25, M.Vel); }); + result.emplace_back("BrakeForceR1", [](auto const &M) { return M.BrakeForceR(1.0, M.Vel); }); + result.emplace_back("BrakeForceR1at20", [](auto const &M) { return M.BrakeForceR(1.0, 20.0); }); + using test::channels::operator+; + return result + test::channels::traction(); +} + +} // namespace + +TEST_CASE("consist: the gauges of units and locomotives in multiple, driven") { + auto trains{units}; + trains.push_back({"eu07 pair", {"4e_v1/4e", "4e_v1/4e"}}); + trains.push_back({"et22 pair", {"et22_v3/201e-w", "et22_v3/201e-rn"}}); + trains.push_back({"ep09 pair", {"ep09_v2/104e", "ep09_v2/104e"}}); + trains.push_back({"sn61 three", {"sn61_v2/sn61", "sn61_v2/sn61", "sn61_v2/sn61"}}); + trains.push_back({"su45 pair", {"su45_v2/301d", "su45_v2/301d"}}); + for (auto const &train : trains) { + CAPTURE(train.name); + test::reseed_random(); + consist vehicles; + for (auto const *car : train.cars) { + vehicles.add(definition::fiz(car), vehicles.size() == 0 ? 1 : 0); + } + test::trace trace{std::string{"gauges/"} + train.name, gauges(), 100}; + vehicles[0].record(trace); + test::drive_cycle(test::driving(vehicles), test::track{0.15, 0.0, test::catenary_3kv}, trace); + trace.check(); + } +} diff --git a/tests/unit/test_controls.cpp b/tests/unit/test_controls.cpp new file mode 100644 index 000000000..4e5255ff4 --- /dev/null +++ b/tests/unit/test_controls.cpp @@ -0,0 +1,632 @@ +#include "stdafx.h" +#include "doctest.h" +#include "scenario.h" +#include "drive.h" + +#include "McZapkie/hamulce.h" +#include "utilities/utilities.h" + +// characterisation of the controls a driver and a crew use besides driving and braking: doors, direction and +// cab change, sanding against slip, the emergency brake, releasers, the ep and the dynamic brake, heating, +// loading, collisions and the frame of several physics iterations, each in a scenario on real vehicles, +// recorded in golden traces (data/golden/controls/) + +using test::scenario; +using namespace test::channels; + +namespace { + +void notch_up(scenario &Scenario, int Positions, double Seconds) { + for (int i = 0; i < Positions; ++i) { + Scenario.driver().controlling.IncMainCtrl(1); + Scenario.wait(Seconds); + } +} + +void notch_down(scenario &Scenario) { + while (Scenario.driver().controlling.DecMainCtrl(1)) { + Scenario.wait(0.5); + } + Scenario.driver().controlling.DecScndCtrl(2); +} + +void brake_to_stop(scenario &Scenario, double Seconds = 60.0) { + Scenario.act("brake to stop"); + Scenario.cab().BrakeLevelSet(Scenario.cab().Handle->GetPos(bh_FB)); + Scenario.wait(Seconds); + Scenario.cab().BrakeLevelSet(Scenario.cab().Handle->GetPos(bh_RP)); + Scenario.wait(20.0); +} + +// the pipe charged again after an emergency stop: the releaser held with the handle at running, then let go +void recharge(scenario &Scenario) { + auto &cab{Scenario.cab()}; + Scenario.act("releaser held, the pipe charged"); + cab.BrakeLevelSet(cab.Handle->GetPos(bh_RP)); + cab.BrakeReleaser(1); + Scenario.wait(30.0); + cab.BrakeReleaser(0); + Scenario.wait(30.0); +} + +bool stopped(scenario &Scenario) { + for (std::size_t i = 0; i < Scenario.train().size(); ++i) { + if (Scenario.vehicle(i).Vel > 0.1) { + return false; + } + } + return true; +} + +// the brake cylinders of every vehicle of the train under the pressure given +bool released(scenario &Scenario, double Pressure = 0.1) { + for (std::size_t i = 0; i < Scenario.train().size(); ++i) { + if (Scenario.vehicle(i).BrakePress > Pressure) { + return false; + } + } + return true; +} + +bool open(TMoverParameters const &Vehicle, int Side) { + return Vehicle.Doors.instances[Side].is_open; +} + +// the leaf shut, whatever the step does (closed, is_closed, wants the step folded too) +bool shut(TMoverParameters const &Vehicle, int Side) { + return Vehicle.Doors.instances[Side].position <= 0.f; +} + +bool closed(TMoverParameters const &Vehicle, int Side) { + return Vehicle.Doors.instances[Side].is_closed; +} + +} // namespace + +TEST_CASE("controls: the doors of an electric unit, opened, locked, permitted and closed by driving off") { + for (auto const &[name, cars] : std::vector>>{ + {"elf", {"elf_v1/21we-a", "elf_v1/21we-b", "elf_v1/21we-c"}}, + {"en57", {"en57_v1/5bgaiii_led_spot", "en57_v1/6ba_840", "en57_v1/5bgb"}}, + {"impuls", {"impuls_v1/31we-a_pr", "impuls_v1/31we-b_pr", "impuls_v1/31we-c_pr", "impuls_v1/31we-d_pr"}}}) { + CAPTURE(name); + scenario scenario{"controls/doors/" + name, motion() + doors()}; + for (auto const *car : cars) { + scenario.add(car, scenario.train().size() == 0 ? 1 : 0); + } + // the EN57 doesn't get ready (COVERAGE.md), its doors work all the same + auto const ready{scenario.start_up()}; + CHECK(ready == (name != "en57")); + auto &cab{scenario.cab()}; + auto const &last{scenario.vehicle(scenario.train().size() - 1)}; + scenario.act("permit left"); + cab.PermitDoors(side::left, true); + scenario.wait(2.0); + scenario.act("open left"); + cab.OperateDoors(side::left, true); + scenario.wait(10.0); + CHECK(open(cab, side::left)); + CHECK(open(last, side::left)); + CHECK(closed(cab, side::right)); + scenario.act("close left"); + cab.OperateDoors(side::left, false); + scenario.wait(10.0); + CHECK(shut(cab, side::left)); + CHECK(shut(last, side::left)); + scenario.act("open right without permit"); + cab.OperateDoors(side::right, true); + scenario.wait(5.0); + // the EN57 needs no permit + CHECK(shut(cab, side::right) == cab.Doors.permit_needed); + scenario.act("permit right, open"); + cab.PermitDoors(side::right, true); + cab.OperateDoors(side::right, true); + scenario.wait(10.0); + CHECK(open(cab, side::right)); + CHECK(open(last, side::right)); + scenario.act("lock"); + cab.LockDoors(true); + scenario.wait(5.0); + scenario.act("permit preset, steps off, remote control"); + cab.ChangeDoorPermitPreset(1); + cab.PermitDoorStep(false); + cab.ChangeDoorControlMode(true); + scenario.wait(5.0); + cab.ChangeDoorPermitPreset(-1); + cab.PermitDoorStep(true); + cab.ChangeDoorControlMode(false); + scenario.act("close all, unlock"); + cab.OperateDoors(side::right, false); + cab.OperateDoors(side::left, false); + cab.LockDoors(false); + scenario.wait(10.0); + CHECK(shut(cab, side::left)); + CHECK(shut(cab, side::right)); + scenario.act("open both and drive off"); + cab.PermitDoors(side::left, true); + cab.PermitDoors(side::right, true); + cab.OperateDoors(side::left, true); + cab.OperateDoors(side::right, true); + scenario.wait(5.0); + CHECK_FALSE(shut(cab, side::left)); + CHECK_FALSE(shut(cab, side::right)); + scenario.get_going(); + notch_up(scenario, 4, 2.0); + scenario.wait(20.0); + // the doors of a train ready to run close as the driver starts off. no CHECK of the speed: the Elf and + // the Impuls keep their steps out under the permit, which keeps them from moving (COVERAGE.md) + CHECK(shut(cab, side::left) == ready); + CHECK(shut(cab, side::right) == ready); + CHECK(shut(last, side::left) == ready); + CHECK(shut(last, side::right) == ready); + notch_down(scenario); + brake_to_stop(scenario); + scenario.check(); + } +} + +TEST_CASE("controls: the doors of wagons, worked from the locomotive") { + scenario scenario{"controls/doors/eu07 with wagons", motion() + doors()}; + scenario.add("4e_v1/4e", 1).add("bdhpumn_v3/bdhpumn").add("11xa_v2/93a"); + scenario.start_up(); + auto &cab{scenario.cab()}; + auto &coach{scenario.vehicle(1)}; + auto const &freight{scenario.vehicle(2)}; + // the locomotive works the coach's doors for the consist and for the unit, not with its local controls; the + // freight wagon's doors don't move from the locomotive + for (auto const range : {range_t::consist, range_t::unit, range_t::local}) { + CAPTURE(static_cast(range)); + scenario.act(std::format("open right {}", static_cast(range))); + cab.PermitDoors(side::right, true, range); + cab.OperateDoors(side::right, true, range); + scenario.wait(10.0); + CHECK(open(coach, side::right) == (range != range_t::local)); + CHECK(shut(coach, side::left)); + CHECK(shut(freight, side::right)); + scenario.act("close right"); + cab.OperateDoors(side::right, false, range); + scenario.wait(10.0); + CHECK(shut(coach, side::right)); + } + scenario.act("wagon opens its own"); + coach.OperateDoors(side::left, true, range_t::local); + // a second at a time, the same run as one wait. the coach's doors close by themselves 5 s after they + // opened (DoorStayOpen) + scenario.wait(1.0); + CHECK_FALSE(shut(coach, side::left)); + scenario.wait(9.0); + CHECK(shut(coach, side::left)); + coach.OperateDoors(side::left, false, range_t::local); + scenario.wait(10.0); + CHECK(shut(coach, side::left)); + scenario.check(); +} + +TEST_CASE("controls: reversing and changing the cab of a locomotive") { + scenario scenario{"controls/reverse/eu07", motion() + traction()}; + scenario.add("4e_v1/4e", 1); + scenario.start_up(); + scenario.get_going(); + auto &cab{scenario.cab()}; + // the speed along the vehicle, its front ahead + notch_up(scenario, 10, 1.5); + scenario.wait(10.0); + CHECK(cab.V > 3.0); + notch_down(scenario); + brake_to_stop(scenario); + CHECK(stopped(scenario)); + scenario.act("backward"); + cab.DirectionBackward(); + cab.DirectionBackward(); + scenario.wait(2.0); + CHECK(cab.DirActive < 0); + notch_up(scenario, 10, 1.5); + scenario.wait(10.0); + CHECK(cab.V < -3.0); + notch_down(scenario); + brake_to_stop(scenario); + CHECK(stopped(scenario)); + scenario.act("neutral, change cab"); + cab.DirectionForward(); + scenario.wait(1.0); + cab.CabDeactivisation(); + // through the engine room (cab 0) to the rear cab, as the player walks there + cab.ChangeCab(-1); + cab.ChangeCab(-1); + cab.CabActivisation(); + scenario.wait(5.0); + CHECK(cab.CabActive < 0); + scenario.act("drive from the rear cab"); + scenario.get_going(); + notch_up(scenario, 10, 1.5); + scenario.wait(10.0); + // forward from the rear cab is the vehicle's backward + CHECK(cab.V < -3.0); + notch_down(scenario); + brake_to_stop(scenario); + CHECK(stopped(scenario)); + scenario.check(); +} + +TEST_CASE("controls: wheel slip on a slippery track, sand and the anti-slip brake") { + for (auto const *path : {"4e_v1/4e", "sm42_v1/6d1", "e186_v2/eu47"}) { + CAPTURE(path); + scenario scenario{std::string{"controls/slip/"} + path, motion() + traction() + brakes(), test::track{0.04, 0.0, test::catenary_3kv}}; + scenario.add(path, 1); + scenario.start_up(); + scenario.get_going(); + auto &cab{scenario.cab()}; + // a notch a second: the controller put to full power at once never gets the line contactors closed + scenario.act("full power"); + scenario.full_power(0.0); + auto slipped{cab.SlippingWheels}; + for (int i = 0; i < 10; ++i) { + scenario.wait(1.0); + slipped = slipped || cab.SlippingWheels; + } + // the electric locomotives slip at full power, the SM42, of less power for its weight, doesn't + CHECK(slipped == (std::string{path} != "sm42_v1/6d1")); + scenario.act("sand"); + cab.Sandbox(true); + scenario.wait(10.0); + cab.Sandbox(false); + scenario.act("manual sand"); + cab.SandboxManual(true); + scenario.wait(5.0); + cab.SandboxManual(false); + scenario.act("anti-slip brake"); + cab.AntiSlippingButton(); + cab.AntiSlippingBrake(); + scenario.wait(10.0); + CHECK(cab.Vel > 5.0); + notch_down(scenario); + brake_to_stop(scenario); + CHECK(stopped(scenario)); + scenario.check(); + } +} + +TEST_CASE("controls: emergency stops by the alarm chain and the radio-stop") { + scenario scenario{"controls/emergency/eu07 with wagons", motion() + brakes()}; + scenario.add("4e_v1/4e", 1).add("bdhpumn_v3/bdhpumn").add("3wl_v2/3wl"); + scenario.start_up(); + scenario.get_going(); + notch_up(scenario, 20, 1.0); + scenario.wait(20.0); + notch_down(scenario); + auto &cab{scenario.cab()}; + CHECK(cab.Vel > 30.0); + scenario.act("alarm chain in the wagon"); + scenario.vehicle(1).AlarmChainSwitch(true); + scenario.wait(40.0); + // the pipe emptied, the whole train braked to a stop + CHECK(stopped(scenario)); + CHECK(cab.PipePress < 0.5); + CHECK(scenario.vehicle(2).BrakePress > 1.0); + scenario.act("alarm chain reset"); + scenario.vehicle(1).AlarmChainSwitch(false); + scenario.wait(10.0); + // the FV4a handle stays cut off the emptied pipe of an LSt locomotive (lock_old in UpdatePipePressure) + // until the releaser is held + CHECK(cab.PipePress < 0.5); + recharge(scenario); + CHECK(cab.PipePress > 4.5); + scenario.get_going(); + notch_up(scenario, 20, 1.0); + scenario.wait(20.0); + notch_down(scenario); + CHECK(cab.Vel > 30.0); + scenario.act("radio-stop"); + cab.RadiostopSwitch(true); + scenario.wait(40.0); + CHECK(stopped(scenario)); + CHECK(cab.PipePress < 0.5); + scenario.act("radio-stop reset"); + cab.RadiostopSwitch(false); + scenario.wait(10.0); + recharge(scenario); + CHECK(cab.PipePress > 4.5); + scenario.check(); +} + +TEST_CASE("controls: releasers and the universal brake buttons") { + scenario scenario{"controls/releaser/eu07 with wagons", brakes() + air()}; + scenario.add("4e_v1/4e", 1).add("bdhpumn_v3/bdhpumn").add("3wl_v2/3wl"); + scenario.start_up(); + scenario.get_going(); + auto &cab{scenario.cab()}; + auto &wagon{scenario.vehicle(2)}; + scenario.act("service brake"); + cab.BrakeLevelSet(cab.Handle->GetPos(bh_FB)); + scenario.wait(20.0); + CHECK(cab.BrakePress > 1.0); + CHECK(wagon.BrakePress > 1.0); + cab.BrakeLevelSet(cab.Handle->GetPos(bh_NP)); + auto &coach{scenario.vehicle(1)}; + // the releaser of the cab is passed along the whole train, a wagon's works on the wagon alone + auto const coachbraked{coach.BrakePress}; + auto wagonbraked{wagon.BrakePress}; + scenario.act("releaser of the locomotive"); + cab.BrakeReleaser(1); + scenario.wait(10.0); + cab.BrakeReleaser(0); + CHECK(cab.BrakePress < 0.5); + CHECK(coach.BrakePress < coachbraked - 1.0); + CHECK(wagon.BrakePress < wagonbraked - 0.5); + CHECK(cab.PipePress < 4.0); // the pipe stays where the service application left it + wagonbraked = wagon.BrakePress; + scenario.act("releaser of the wagon"); + wagon.BrakeReleaser(1); + scenario.wait(10.0); + wagon.BrakeReleaser(0); + CHECK(wagon.BrakePress < wagonbraked - 0.5); + for (int button = 0; button < 3; ++button) { + scenario.act(std::format("universal button {}", button)); + cab.UniversalBrakeButton(button, 1); + scenario.wait(5.0); + cab.UniversalBrakeButton(button, 0); + scenario.wait(5.0); + } + scenario.act("running"); + cab.BrakeLevelSet(cab.Handle->GetPos(bh_RP)); + scenario.wait(60.0); + CHECK(cab.PipePress > 4.8); + CHECK(released(scenario)); + scenario.check(); +} + +TEST_CASE("controls: the ep brake of electric units") { + for (auto const &[name, cars] : std::vector>>{ + {"ed72", {"ed72_v1/5bs-ra", "ed72_v1/6bs-sa", "ed72_v1/6bs-sb", "ed72_v1/5bs-rb"}}, + {"ew58", {"ew58_v1/ew58-sa", "ew58_v1/ew58-d", "ew58_v1/ew58-sb"}}}) { + CAPTURE(name); + scenario scenario{"controls/ep brake/" + name, motion() + brakes() + handles()}; + for (auto const *car : cars) { + scenario.add(car, scenario.train().size() == 0 ? 1 : 0); + } + scenario.start_up(); + scenario.get_going(); + auto &cab{scenario.cab()}; + scenario.act("ep on"); + cab.SwitchEPBrake(1); + scenario.wait(5.0); + auto const &last{scenario.vehicle(scenario.train().size() - 1)}; + auto const positions{std::vector{bh_EPB, bh_EPN, bh_EPR, bh_EPB, bh_RP}}; + for (std::size_t i = 0; i < positions.size(); ++i) { + CAPTURE(positions[i]); + scenario.act(std::format("handle {}", positions[i])); + cab.BrakeLevelSet(cab.Handle->GetPos(positions[i])); + scenario.wait(15.0); + if (i == 2) { + CHECK(released(scenario)); + } + if (i == 3) { + // the ep brake works the cylinders of every car by wire, the pipe stays charged (by the first + // application the EW58's pipe is still charging after the start-up) + CHECK(cab.PipePress > 4.8); + CHECK(cab.BrakePress > 1.0); + CHECK(last.BrakePress > 1.0); + } + } + // the EW58 releases at the running position, the ED72 holds the ep application there, and with the ep + // brake switched off as well: only the ep release position lets it off + auto const ed72{name == "ed72"}; + CHECK(released(scenario) != ed72); + scenario.act("ep off"); + cab.SwitchEPBrake(0); + scenario.wait(30.0); + CHECK(released(scenario) != ed72); + scenario.check(); + } +} + +TEST_CASE("controls: the electrodynamic brake of locomotives having one") { + for (auto const *path : {"ep09_v2/104e", "e186_v2/eu47", "e6act_v2/e6acta", "et22_v3/201e-rn"}) { + CAPTURE(path); + scenario scenario{std::string{"controls/dynamic brake/"} + path, motion() + traction() + brakes()}; + scenario.add(path, 1).add("bdhpumn_v3/bdhpumn").add("bdhpumn_v3/bdhpumn"); + scenario.start_up(); + scenario.get_going(); + notch_up(scenario, 60, 1.0); + scenario.wait(30.0); + notch_down(scenario); + auto &cab{scenario.cab()}; + CHECK(cab.Vel > 40.0); + auto const speed{cab.Vel}; + scenario.act("dynamic brake on"); + cab.DynamicBrakeSwitch(true); + scenario.wait(5.0); + scenario.act("brake"); + cab.BrakeLevelSet(cab.Handle->GetPos(bh_FB)); + scenario.wait(40.0); + CHECK(cab.Vel < speed); + scenario.act("dynamic brake off"); + cab.DynamicBrakeSwitch(false); + brake_to_stop(scenario, 30.0); + CHECK(stopped(scenario)); + scenario.check(); + } +} + +TEST_CASE("controls: train heating from the locomotive") { + scenario scenario{"controls/heating/eu07 with wagons", traction() + air()}; + scenario.add("4e_v1/4e", 1).add("bdhpumn_v3/bdhpumn").add("bdhpumn_v3/bdhpumn"); + scenario.start_up(); + auto &cab{scenario.cab()}; + scenario.act("heating on"); + cab.HeatingSwitch(true); + scenario.wait(30.0); + CHECK(cab.Heating); + CHECK(scenario.vehicle(2).Heating); + scenario.act("heating off"); + cab.HeatingSwitch(false); + scenario.wait(10.0); + CHECK_FALSE(cab.Heating); + CHECK_FALSE(scenario.vehicle(2).Heating); + scenario.check(); +} + +TEST_CASE("controls: a freight wagon loaded and braked") { + auto emptymass{0.0}; + for (auto const *load : {"", "coal", "ruda", "unknown"}) { + CAPTURE(load); + scenario scenario{std::string{"controls/load/3wl "} + (*load ? load : "empty"), motion() + brakes()}; + scenario.add("4e_v1/4e", 1).add("3wl_v2/3wl"); + auto &wagon{scenario.vehicle(1)}; + auto const known{std::string{load} == "coal" || std::string{load} == "ruda"}; + CHECK(wagon.AssignLoad(load, 30.f) == (known || std::string{load}.empty())); + wagon.ComputeMass(); + if (*load == '\0') { + emptymass = wagon.TotalMass; + } + else { + // 30 t of a load the wagon takes, none of one it doesn't + CHECK(wagon.TotalMass == doctest::Approx(emptymass + (known ? 30000.0 : 0.0)).epsilon(0.01)); + } + scenario.start_up(); + scenario.get_going(); + notch_up(scenario, 20, 1.0); + scenario.wait(20.0); + notch_down(scenario); + CHECK(scenario.cab().Vel > 20.0); + brake_to_stop(scenario); + CHECK(stopped(scenario)); + scenario.check(); + } +} + +TEST_CASE("controls: a locomotive running into a standing wagon") { + for (auto const speed : {5.0, 15.0, 40.0}) { + CAPTURE(speed); + scenario scenario{std::format("controls/collision/{} kmh", static_cast(speed)), motion()}; + // the wagon stands in front, the locomotive comes from behind it + scenario.add("bdhpumn_v3/bdhpumn").add("4e_v1/4e", 0, coupling::faux, speed, 30.0); + auto const &wagon{scenario.vehicle(0)}; + scenario.wait(30.0); + // slow, the locomotive pushes the wagon off, the buffers only touching, and both roll to a stop; fast, + // the wagon derails where it stands + auto const derailed{speed > 30.0}; + CHECK(TestFlag(wagon.DamageFlag, dtrain_out) == derailed); + CHECK((std::abs(wagon.DistCounter) > 0.0001) != derailed); + CHECK(stopped(scenario)); + scenario.check(); + } +} + +TEST_CASE("controls: a train run with five physics steps in a frame") { + scenario scenario{"controls/full physics/eu07 with wagons", motion() + traction() + brakes(), + test::track{0.15, 0.0, test::catenary_3kv, 0, 5}}; + scenario.add("4e_v1/4e", 1).add("bdhpumn_v3/bdhpumn").add("3wl_v2/3wl"); + scenario.start_up(); + scenario.get_going(); + notch_up(scenario, 25, 1.0); + scenario.wait(30.0); + notch_down(scenario); + // no CHECKs of the run: with five steps a frame the motors take no current and the train rolls at a few + // km/h, which is a finding (COVERAGE.md), not the behaviour to keep + brake_to_stop(scenario); + scenario.check(); +} + +TEST_CASE("controls: the automatic electrodynamic brake of the EP09, in service braking held to a stop") { + // held for longer, a service application of the train brake makes the EP09 brake electrodynamically: the + // pressure its distributor asks for (GetEDBCP) brings the motors in as generators, the air of its own + // cylinders is let out, and given back as the train slows down and the motors' brake force fades + struct application { + char const *name; + double steps; // past the first braking position of the handle + }; + for (auto const &[name, steps] : {application{"light", 0.0}, application{"medium", 1.0}, application{"high", 2.0}, application{"full service", 3.0}}) { + CAPTURE(name); + scenario scenario{std::string{"controls/dynamic brake held/ep09 "} + name, motion() + traction() + brakes()}; + scenario.add("ep09_v2/104e", 1, test::consist::full_coupling, 120.0); + scenario.add("bdhpumn_v3/bdhpumn", 0, test::consist::full_coupling, 120.0); + scenario.add("bdhpumn_v3/bdhpumn", 0, test::consist::full_coupling, 120.0); + REQUIRE(scenario.start_up()); + auto &ep09{scenario.cab()}; + REQUIRE(ep09.Power110vIsAvailable); + scenario.act(std::string{"brake "} + name); + ep09.BrakeLevelSet(ep09.Handle->GetPos(bh_MB) + steps); + scenario.wait(10.0); + CHECK(ep09.DynamicBrakeFlag); + CHECK(ep09.Im < -100.0); + CHECK(ep09.BrakePress < 0.25 * ep09.Hamulec->GetEDBCP()); + scenario.wait(110.0); + // stopped, held by the air alone. the flag of the electrodynamic brake stays on while the cylinders hold + // less than 2.1 bar, though the motors give nothing; a stronger application drops it before the stop + CHECK(ep09.Vel == doctest::Approx(0.0)); + CHECK(ep09.Im == doctest::Approx(0.0)); + CHECK(ep09.DynamicBrakeFlag == (ep09.BrakePress <= 2.1)); + CHECK(ep09.BrakePress == doctest::Approx(ep09.Hamulec->GetEDBCP()).epsilon(0.05)); + scenario.act("release"); + ep09.BrakeLevelSet(ep09.Handle->GetPos(bh_RP)); + scenario.wait(30.0); + scenario.check(); + } +} + +TEST_CASE("controls: the automatic electrodynamic brake under ep and service braking, from speed") { + // ep, light and full service braking of trains running at speed, whose locomotive or unit has the automatic + // electrodynamic brake + struct train { + char const *name; + std::vector cars; // the first one driven + double speed; // km/h at the start + bool epelectric; // whether the ep brake alone brings the motors in + }; + // the EW58's motors brake by the stages of the ep brake (TUHEX), with the 110 V of the converter in its + // middle car; the E6ACT's by its distributor, from a deeper service application + for (auto const &[name, cars, speed, epelectric] : { + train{"e6act with wagons", {"e6act_v2/e6acta", "bdhpumn_v3/bdhpumn", "bdhpumn_v3/bdhpumn"}, 100.0, false}, + train{"ew58", {"ew58_v1/ew58-sa", "ew58_v1/ew58-d", "ew58_v1/ew58-sb"}, 90.0, true}, + }) { + CAPTURE(name); + scenario scenario{std::string{"controls/dynamic brake from speed/"} + name, motion() + traction() + brakes()}; + for (auto const *car : cars) { + scenario.add(car, car == cars.front() ? 1 : 0, test::consist::full_coupling, speed); + } + scenario.start_up(); + auto &cab{scenario.cab()}; + auto const brake{[&scenario, &cab](char const *Event, double Position, double Seconds) { + scenario.act(Event); + cab.BrakeLevelSet(Position); + scenario.wait(Seconds); + }}; + brake("ep brake", cab.Handle->GetPos(bh_EPB), 15.0); + CHECK(cab.DynamicBrakeFlag == epelectric); + CHECK((cab.Im < -100.0) == epelectric); + brake("ep hold", cab.Handle->GetPos(bh_EPN), 5.0); + brake("first step", cab.Handle->GetPos(bh_MB), 20.0); + brake("deeper", cab.Handle->GetPos(bh_MB) + 1.0, 15.0); + // the pipe alone doesn't bring the EW58's motors in + CHECK((cab.Im < -50.0) != epelectric); + brake("release", cab.Handle->GetPos(bh_RP), 20.0); + brake("full service", cab.Handle->GetPos(bh_FB), 40.0); + brake("release", cab.Handle->GetPos(bh_RP), 20.0); + scenario.check(); + } +} + +TEST_CASE("controls: a draisine pumped along by hand") { + // the pumping force, half a stroke forwards and half backwards, is below the resistance of a draisine + // standing, which stays where it is; a rolling one is kept going + for (auto const speed : {0.0, 10.0}) { + CAPTURE(speed); + scenario scenario{std::format("controls/draisine/{}", static_cast(speed)), motion() + traction()}; + scenario.add("dr2_v1/dr2", 1, test::consist::full_coupling, speed); + auto &cab{scenario.cab()}; + cab.CabActivisation(); + scenario.act("hand brake off"); + test::release_brakes(cab); + for (int stroke = 0; stroke < 40; ++stroke) { + scenario.act("stroke"); + cab.IncMainCtrl(1); + scenario.wait(0.5); + cab.DecMainCtrl(1); + scenario.wait(0.5); + } + CHECK((speed > 0.0) == (cab.Vel > 1.0)); + scenario.act("coast"); + scenario.wait(20.0); + scenario.check(); + } +} diff --git a/tests/unit/test_couplers_trains.cpp b/tests/unit/test_couplers_trains.cpp new file mode 100644 index 000000000..926964dbe --- /dev/null +++ b/tests/unit/test_couplers_trains.cpp @@ -0,0 +1,174 @@ +#include "stdafx.h" +#include "doctest.h" +#include "consist.h" +#include "scenario.h" + +#include "utilities/utilities.h" + +// characterisation of the couplers between vehicles: coupling and uncoupling by hand (Attach, DettachStatus, +// Dettach), the automatic couplers coupling on contact, a broken coupler, and collisions which derail, on real +// vehicles, the moving ones recorded in golden traces (data/golden/couplers/) + +using test::consist; +using test::definition; +using test::scenario; +using namespace test::channels; + +TEST_CASE("couplers: coupled by hand, touching or apart, of the same kind or not") { + consist train; + auto &locomotive{train.add(definition::fiz("4e_v1/4e")).mover()}; + // the wagon's buffers touch the locomotive's, the unit's car stands a metre away + auto &wagon{train.add(definition::fiz("3wl_v2/3wl"), 0, coupling::faux).mover()}; + train.step(); + + // nothing to couple to, or nothing to couple + CHECK_FALSE(locomotive.Attach(end::rear, end::front, nullptr, coupling::coupler)); + CHECK_FALSE(locomotive.Attach(end::rear, end::front, &wagon, coupling::faux)); + // the hook first: the coupler alone, which sounds + locomotive.Couplers[end::rear].sounds = 0; + REQUIRE(locomotive.Attach(end::rear, end::front, &wagon, coupling::coupler)); + CHECK(locomotive.Couplers[end::rear].Connected == &wagon); + CHECK(wagon.Couplers[end::front].Connected == &locomotive); + CHECK(wagon.Couplers[end::front].CouplingFlag == coupling::coupler); + CHECK(locomotive.Couplers[end::rear].sounds == sound::attachcoupler); + // then the hoses: only what changes sounds + locomotive.Couplers[end::rear].sounds = 0; + REQUIRE(locomotive.Attach(end::rear, end::front, &wagon, coupling::coupler | coupling::brakehose | coupling::mainhose)); + CHECK(locomotive.Couplers[end::rear].sounds == (sound::attachbrakehose | sound::attachmainhose)); + // and again, quietly, the other side naming the coupler by the one it's connected to (2) + locomotive.Couplers[end::rear].sounds = 0; + REQUIRE(wagon.Attach(end::front, 2, &locomotive, coupling::coupler | coupling::brakehose, false, false)); + CHECK(locomotive.Couplers[end::rear].CouplingFlag == (coupling::coupler | coupling::brakehose)); + CHECK(locomotive.Couplers[end::rear].sounds == 0); + + // a screw coupler with the buffers pressed together comes apart whole + train.step(); + CHECK(locomotive.DettachStatus(end::rear) < 0); + locomotive.Couplers[end::rear].sounds = 0; + CHECK(locomotive.Dettach(end::rear)); + CHECK(locomotive.Couplers[end::rear].Connected == nullptr); + CHECK(wagon.Couplers[end::front].Connected == nullptr); + CHECK(locomotive.Couplers[end::rear].sounds == (sound::detach | sound::attachcoupler | sound::attachbrakehose)); + CHECK(locomotive.DettachStatus(end::rear) == 0); + CHECK(locomotive.Dettach(end::rear)); +} + +TEST_CASE("couplers: a screw coupler uncoupled with the buffers apart, or with the hoses alone, or broken") { + struct state { + char const *name; + double gap; // between the buffers, the coupler stretched + int coupling; + bool damaged; + bool apart; // whether it comes apart whole + }; + for (auto const &[name, gap, couplingtype, damaged, apart] : { + state{"stretched a little", 0.1, coupling::coupler | coupling::brakehose, false, false}, + state{"stretched far", 0.3, coupling::coupler | coupling::brakehose, false, true}, + state{"hoses alone", 0.1, coupling::brakehose, false, true}, + state{"broken", 0.1, coupling::coupler | coupling::brakehose, true, true}, + }) { + CAPTURE(name); + consist train; + auto &locomotive{train.add(definition::fiz("4e_v1/4e")).mover()}; + auto &wagon{train.add(definition::fiz("3wl_v2/3wl"), 0, coupling::faux, 0.0, gap).mover()}; + REQUIRE(locomotive.Attach(end::rear, end::front, &wagon, couplingtype, true)); + if (damaged) { + SetFlag(locomotive.DamageFlag, dtrain_coupling); + } + train.step(); + CHECK((locomotive.DettachStatus(end::rear) < 0) == apart); + CHECK(locomotive.Dettach(end::rear) == apart); + // what's left when it doesn't come apart is the coupler, the hoses taken off + CHECK(locomotive.Couplers[end::rear].CouplingFlag == (apart ? coupling::faux : coupling::coupler)); + CHECK(wagon.Couplers[end::front].CouplingFlag == (apart ? coupling::faux : coupling::coupler)); + } + // couplers of different kinds don't couple, unless forced + consist train; + auto &locomotive{train.add(definition::fiz("4e_v1/4e")).mover()}; + auto &unit{train.add(definition::fiz("en57_v1/5bgb"), 0, coupling::faux).mover()}; + train.step(); + CHECK_FALSE(locomotive.Attach(end::rear, end::front, &unit, coupling::coupler)); + CHECK(locomotive.Attach(end::rear, end::front, &unit, coupling::coupler, true)); +} + +TEST_CASE("couplers: automatic couplers coupling on contact") { + // a car running slowly into another from close by (its brakes are on), the automatic couplers of both ends + // set to couple what their AutomaticFlag says; without one, the hook alone + struct meeting { + char const *name; + char const *standing; // its rear coupler met + char const *running; // its front coupler meets + int coupling; // what they couple: what both flags allow, the control cable only of one kind + }; + for (auto const &[name, standing, running, couplingtype] : { + meeting{"en57 to en57", "en57_v1/5bgb", "en57_v1/5bgaiii_led_spot", 39}, + meeting{"impuls to en57", "en57_v1/5bgb", "impuls_v1/31we-a_pr", 39 & ~coupling::control}, + meeting{"en57 without the flag", "en57_v1/5bgaiii_led_spot", "en57_v1/6ba_840", coupling::coupler}, + }) { + CAPTURE(name); + scenario scenario{std::string{"couplers/automatic/"} + name, motion(), test::track{}}; + scenario.add(standing, 0, consist::full_coupling); + scenario.add(running, 0, coupling::faux, 3.0, 0.2); + scenario.wait(10.0); + auto &first{scenario.vehicle(0)}; + auto &second{scenario.vehicle(1)}; + CHECK(first.Couplers[end::rear].CouplingFlag == couplingtype); + CHECK(second.Couplers[end::front].CouplingFlag == couplingtype); + // once coupled, not again until uncoupled; the vehicle which coupled marks it for the AI + CHECK_FALSE(first.Couplers[end::rear].AutomaticCouplingAllowed); + CHECK_FALSE(second.Couplers[end::front].AutomaticCouplingAllowed); + CHECK((TestFlag(first.AIFlag, sound::attachcoupler) || TestFlag(second.AIFlag, sound::attachcoupler))); + scenario.check(); + } +} + +TEST_CASE("couplers: a coupler broken, with its brake hose torn off") { + consist train; + auto &locomotive{train.add(definition::fiz("4e_v1/4e")).mover()}; + auto &wagon{train.add(definition::fiz("3wl_v2/3wl")).mover()}; + REQUIRE(locomotive.Couplers[end::rear].Connected == &wagon); + locomotive.damage_coupler(end::rear); + CHECK(TestFlag(locomotive.DamageFlag, dtrain_coupling)); + CHECK(locomotive.AlarmChainFlag); + CHECK(locomotive.Couplers[end::rear].CouplingFlag == coupling::faux); + CHECK(wagon.Couplers[end::front].CouplingFlag == coupling::faux); + // the front coupler of the wagon, broken on its own: no hose to tear + wagon.damage_coupler(end::front); + CHECK(TestFlag(wagon.DamageFlag, dtrain_coupling)); + CHECK_FALSE(wagon.AlarmChainFlag); + // articulated couplers don't break + consist articulated; + auto &unit{articulated.add(definition::fiz("impuls_v1/31we-a_pr")).mover()}; + articulated.add(definition::fiz("impuls_v1/31we-b_pr")); + unit.damage_coupler(end::rear); + CHECK_FALSE(TestFlag(unit.DamageFlag, dtrain_coupling)); + CHECK(unit.Couplers[end::rear].CouplingFlag != coupling::faux); +} + +TEST_CASE("couplers: collisions fast enough to derail") { + // a locomotive running into a standing wagon from behind, and a wagon running backwards into a standing + // locomotive; over 15 km/h, weighed by the ratio of the masses, the vehicles derail + struct collision { + char const *name; + char const *frontpath; + double frontspeed; + char const *back; + double backspeed; + bool frontout; + bool backout; + }; + for (auto const &[name, frontpath, frontspeed, back, backspeed, frontout, backout] : { + collision{"locomotive into a wagon at 60", "3wl_v2/3wl", 0.0, "4e_v1/4e", 60.0, true, false}, + collision{"wagon backwards into a locomotive at 60", "3wl_v2/3wl", -60.0, "4e_v1/4e", 0.0, true, false}, + collision{"locomotive into a locomotive at 25", "4e_v1/4e", 0.0, "4e_v1/4e", 25.0, true, true}, + }) { + CAPTURE(name); + scenario scenario{std::string{"couplers/collision/"} + name, motion(), test::track{}}; + scenario.add(frontpath, 0, consist::full_coupling, frontspeed); + scenario.add(back, 0, coupling::faux, backspeed, 20.0); + scenario.wait(10.0); + CHECK(TestFlag(scenario.vehicle(0).DamageFlag, dtrain_out) == frontout); + CHECK(TestFlag(scenario.vehicle(1).DamageFlag, dtrain_out) == backout); + scenario.check(); + } +} diff --git a/tests/unit/test_definition.cpp b/tests/unit/test_definition.cpp index 6b2d446c0..6b0ce22b3 100644 --- a/tests/unit/test_definition.cpp +++ b/tests/unit/test_definition.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "doctest.h" #include "vehicle.h" +#include "drive.h" using test::definition; using test::vehicle; @@ -43,3 +44,108 @@ TEST_CASE("definition: rows of a table section reach the vehicle") { CHECK(wagon->LightsPos == 1); CHECK(wagon->Lights[end::front][1] == pc1); } + +TEST_CASE("definition: lines the loader skips or trims: comments, a hash anywhere, leading spaces, carriage returns") { + auto text{definition::load("wagon").text()}; + // a commented line and one with a hash set the mass the wagon doesn't get; the rest, indented and ended with + // a carriage return, still load + auto const param{text.find("Param")}; + REQUIRE(param != std::string::npos); + text.insert(param, "// Param: M=11111\nParam: M=22222 # a note\n "); + std::string crlf; + for (auto const c : text) { + if (c == '\n') { + crlf += '\r'; + } + crlf += c; + } + TMoverParameters wagon(0.0, "wagon", "test", 0); + REQUIRE(wagon.LoadFIZ_Text(crlf)); + CHECK(wagon.Mass == doctest::Approx(42200.0)); + CHECK(wagon.Vmax == doctest::Approx(120.0)); + CHECK(wagon.MaxBrakePress[3] == doctest::Approx(3.8)); +} + +TEST_CASE("definition: a compressor list, whose positions allow the compressor and scale its speed and limits") { + // none of the game's vehicles has one. its rows are the positions after the 0th, which changes nothing: whether + // the compressor may run (2 yes, 1 no, 0 as the switch says), its speed, and its lower and upper limits. the + // table holds whole numbers (int CompressorList[4][9]), so a factor of 0.9 is read as 0, and both limits + // drop to nothing + auto eu07{definition::fiz("4e_v1/4e") + .set("CompressorList", "Size", 3) + .set("CompressorList", "Default", 1) + .set("CompressorList", "rows", {{2, 2, 1, 1}, {1, 1, 1, 1}, {2, 1, 0.9, 0.9}})}; + vehicle real{eu07, 0.0, "test", 1}; + CHECK(real->CompressorListPosNo == 3); + CHECK(real->CompressorList[3][3] == 0); + auto driven{test::driving(real)}; + test::track const line{0.15, 0.0, test::catenary_3kv}; + REQUIRE(test::start_up(driven, line)); + CHECK(real->CompressorListPos == 1); + test::drive(driven, line, 60.0); + CHECK(real->CompressorAllow); + CHECK(real->Compressor <= real->MaxCompressor + 0.05); + CHECK(real->Compressor >= real->MinCompressor - 0.05); + // the second position doesn't let it run + CHECK(real->ChangeCompressorPreset(2)); + test::drive(driven, line, 2.0); + CHECK_FALSE(real->CompressorAllow); + CHECK_FALSE(real->CompressorFlag); + // the third lets it, under limits of nothing: with no span between them for the governor, the reservoir over + // the upper limit gets vented while the compressor runs on + CHECK(real->ChangeCompressorPreset(3)); + auto const full{real->Compressor}; + test::drive(driven, line, 10.0); + CHECK(real->CompressorAllow); + CHECK(real->CompressorFlag); + CHECK(real->Compressor < full - 1.0); + // no further than the last position + CHECK_FALSE(real->ChangeCompressorPreset(5)); + CHECK(real->CompressorListPos == 3); +} + +TEST_CASE("definition: the compressor's limits set apart for the rear cab") { + auto eu07{definition::fiz("4e_v1/4e").set("Brake", "MinCP_B", 5.0).set("Brake", "MaxCP_B", 6.0)}; + for (auto const cab : {1, -1}) { + CAPTURE(cab); + vehicle real{eu07, 0.0, "test", cab}; + auto driven{test::driving(real)}; + test::track const line{0.15, 0.0, test::catenary_3kv}; + REQUIRE(test::start_up(driven, line)); + test::drive(driven, line, 120.0); + CHECK(real->CabDependentCompressor); + CHECK(real->MaxCompressor == doctest::Approx(cab > 0 ? 8.7 : 6.0)); + CHECK(real->MinCompressor == doctest::Approx(cab > 0 ? 7.0 : 5.0)); + CHECK(real->Compressor <= real->MaxCompressor + 0.05); + CHECK(real->Compressor >= real->MinCompressor - 0.05); + } +} + +TEST_CASE("definition: the highest power of an induction motor drive by the speed (PmaxList)") { + // the drive's power limit (eimc_p_Pmax) follows the table, between its rows and, by the last two, past its end + auto eu47{definition::fiz("e186_v2/eu47").set("PmaxList", "Size", 3).set("PmaxList", "rows", {{0, 1000}, {50, 3000}, {100, 5600}})}; + auto const table{[](double Speed) { return Speed < 50.0 ? 1000.0 + 40.0 * Speed : 3000.0 + 52.0 * (Speed - 50.0); }}; + for (auto const speed : {25.0, 75.0, 150.0}) { + CAPTURE(speed); + vehicle real{eu47, speed, "test", 1}; + auto driven{test::driving(real)}; + test::track const line{0.0, 0.0, test::catenary_3kv}; + REQUIRE(test::start_up(driven, line)); + CHECK(real->eimc[eimc_p_Pmax] == doctest::Approx(table(real->Vel)).epsilon(0.01)); + } +} + +TEST_CASE("definition: the colour and the brightness of the headlights") { + // only the 214M's own file has the section, which the definitions here can't hold (see data/fiz/README.md) + vehicle railbus{definition::fiz("21xm_v1/214ma") + .set("Headlights", "LampRed", 248) + .set("Headlights", "LampGreen", 221) + .set("Headlights", "LampBlue", 111) + .set("Headlights", "DimmedMultiplier", 0.4) + .set("Headlights", "NormalMultiplier", 0.9)}; + CHECK(railbus->refR == doctest::Approx(248.0)); + CHECK(railbus->refG == doctest::Approx(221.0)); + CHECK(railbus->refB == doctest::Approx(111.0)); + CHECK(railbus->dimMultiplier == doctest::Approx(0.4)); + CHECK(railbus->normMultiplier == doctest::Approx(0.9)); +} diff --git a/tests/unit/test_diesel.cpp b/tests/unit/test_diesel.cpp new file mode 100644 index 000000000..07686dc10 --- /dev/null +++ b/tests/unit/test_diesel.cpp @@ -0,0 +1,179 @@ +#include "stdafx.h" +#include "doctest.h" +#include "scenario.h" +#include "drive.h" + +#include "McZapkie/hamulce.h" + +// characterisation of the diesel engines besides their drive, recorded in golden traces (data/golden/diesel/): +// the heat of the engine, its oil and its water circuits, which keep a too cold or too hot engine from starting + +using test::scenario; +using namespace test::channels; + +namespace { + +std::vector heat() { + return { + {"Ts", [](auto const &M) { return M.dizel_heat.Ts; }}, + {"To", [](auto const &M) { return M.dizel_heat.To; }}, + {"Twy", [](auto const &M) { return M.dizel_heat.Twy; }}, + {"Twy2", [](auto const &M) { return M.dizel_heat.Twy2; }}, + {"PA", [](auto const &M) { return M.dizel_heat.PA ? 1.0 : 0.0; }}, + {"WaterHeater", [](auto const &M) { return M.WaterHeater.is_active ? 1.0 : 0.0; }}, + {"WaterPump", [](auto const &M) { return M.WaterPump.is_active ? 1.0 : 0.0; }}, + {"zaluzje1", [](auto const &M) { return M.dizel_heat.zaluzje1 ? 1.0 : 0.0; }}, + {"zaluzje2", [](auto const &M) { return M.dizel_heat.zaluzje2 ? 1.0 : 0.0; }}, + }; +} + +} // namespace + +TEST_CASE("diesel: an engine too cold to start, warmed by its heater") { + // at -10 degrees an engine with the lowest temperature of its water set (WaterMinTemperature) doesn't start, + // until the heater, which the driver switches on with the pumps, warms the water up; one without starts + struct engine { + char const *path; + bool starts; // cold + }; + for (auto const &[path, starts] : {engine{"su45_v2/301d", false}, engine{"sm42_v1/6d1", false}, engine{"st44_v2/m62-1151", true}}) { + CAPTURE(path); + scenario scenario{std::string{"diesel/cold/"} + path, traction() + heat(), test::track{}}; + scenario.add(path, 1); + auto &locomotive{scenario.cab()}; + locomotive.dizel_HeatSet(-10.f); + CHECK(scenario.start_up() == starts); + CHECK(locomotive.dizel_heat.PA != starts); + CHECK(locomotive.WaterHeater.is_active); + scenario.act("heating"); + scenario.wait(1200.0); + CHECK_FALSE(locomotive.dizel_heat.PA); + CHECK(locomotive.dizel_heat.Twy > 50.f); + CHECK(scenario.start_up()); + scenario.check(); + } +} + +TEST_CASE("diesel: an engine started hot, and run at full power") { + // at 88 degrees the engines with a second water circuit are over its highest temperature + // (WaterAuxMaxTemperature) and don't start while it cools; the SM42 has none, starts and gets cooled by its + // fans and shutters at full power. alone: a train's pipe, leaking under 2.75 bar while the engine + // doesn't start, gets cut off the FV4a handle of an LSt locomotive (lock_old in UpdatePipePressure) + struct engine { + char const *path; + bool starts; + }; + for (auto const &[path, starts] : {engine{"su45_v2/301d", false}, engine{"sm42_v1/6d1", true}, engine{"st44_v2/m62-1151", false}}) { + CAPTURE(path); + scenario scenario{std::string{"diesel/hot/"} + path, traction() + heat(), test::track{}}; + scenario.add(path, 1); + auto &locomotive{scenario.cab()}; + locomotive.dizel_HeatSet(88.f); + CHECK(scenario.start_up() == starts); + CHECK(locomotive.dizel_heat.PA != starts); + if (starts) { + scenario.get_going(); + scenario.full_power(300.0); + CHECK(locomotive.Vel > 50.0); + CHECK(locomotive.dizel_heat.zaluzje1); + CHECK(locomotive.dizel_heat.Twy < locomotive.dizel_heat.water.config.temp_max); + } + scenario.check(); + } +} + +TEST_CASE("diesel: the 214M railbus's torque converter, gears and retarder") { + // the controller of the railbus (EIMCtrlType 3) runs from the air brake (0, 1) through the retarder (2) and + // neutral (3) to holding (4) and raising (5) the power; the torque converter locks up at speed and the + // gearbox shifts by itself + scenario scenario{"diesel/214m", motion() + traction() + brakes(), test::track{}}; + scenario.add("21xm_v1/214ma", 1); + REQUIRE(scenario.start_up()); + auto &railbus{scenario.cab()}; + scenario.get_going(); + scenario.full_power(60.0); + CHECK(railbus.MainCtrlPos == 5); + CHECK(railbus.eimic_real == doctest::Approx(1.0)); + CHECK(railbus.hydro_TC_Lockup); + CHECK(railbus.ScndCtrlActualPos == railbus.ScndCtrlPosNo); + struct position { + double eimic; + bool retarder; + bool air; + }; + auto number{railbus.MainCtrlPos}; + for (auto const &[eimic, retarder, air] : {position{1.0, false, false}, position{0.0, false, false}, position{-1.0, true, false}, position{0.0, false, true}}) { + --number; + CAPTURE(number); + scenario.act(std::format("position {}", number)); + railbus.DecMainCtrl(1); + scenario.wait(8.0); + CHECK(railbus.eimic_real == doctest::Approx(eimic)); + CHECK((railbus.hydro_R_Fill > 0.99) == retarder); + CHECK((railbus.hydro_R_Torque > 1000.0) == retarder); + CHECK((railbus.BrakePress > 2.0) == air); + } + scenario.act("position 0"); + railbus.DecMainCtrl(1); + scenario.wait(30.0); + CHECK(railbus.Vel == doctest::Approx(0.0)); + // the gearbox shifted down as the railbus slowed + CHECK(railbus.ScndCtrlActualPos < railbus.ScndCtrlPosNo); + scenario.check(); +} + +TEST_CASE("diesel: the 214M railbus's speed control, up to the speed of a button and braking down to a lower one") { + // the second controller's first position takes the speed of the moment to hold; the buttons, the steps and + // the power limit change it. set lower than the speed, it brakes with the retarder (and under + // BrakeInterventionVel with the air); with the main controller off its top positions it stands by + scenario scenario{"diesel/214m speed control", motion() + traction() + brakes(), test::track{}}; + scenario.add("21xm_v1/214ma", 1); + REQUIRE(scenario.start_up()); + auto &railbus{scenario.cab()}; + REQUIRE(railbus.SpeedCtrl); + scenario.get_going(); + scenario.full_power(10.0); + scenario.act("speed control on"); + REQUIRE(railbus.IncScndCtrl(1)); + CHECK(railbus.SpeedCtrlUnit.IsActive); + CHECK(railbus.SpeedCtrlValue == doctest::Approx(std::round(railbus.Vel)).epsilon(0.02)); + scenario.act("button 80"); + railbus.SpeedCtrlButton(6); + CHECK(railbus.SpeedCtrlValue == doctest::Approx(80.0)); + scenario.wait(90.0); + CHECK(railbus.Vel == doctest::Approx(80.0).epsilon(0.02)); + CHECK_FALSE(railbus.SpeedCtrlUnit.Standby); + scenario.act("step down, up, power down and up"); + railbus.SpeedCtrlDec(); + CHECK(railbus.SpeedCtrlValue == doctest::Approx(75.0)); + railbus.SpeedCtrlInc(); + railbus.SpeedCtrlInc(); + CHECK(railbus.SpeedCtrlValue == doctest::Approx(85.0)); + CHECK(railbus.SpeedCtrlUnit.DesiredPower == doctest::Approx(1.0)); + CHECK(railbus.SpeedCtrlPowerDec()); + CHECK(railbus.SpeedCtrlUnit.DesiredPower == doctest::Approx(0.9)); + CHECK(railbus.SpeedCtrlPowerInc()); + CHECK(railbus.SpeedCtrlUnit.DesiredPower == doctest::Approx(1.0)); + scenario.wait(20.0); + scenario.act("button 40"); + railbus.SpeedCtrlButton(2); + scenario.wait(5.0); + // the retarder does it at this speed, the air isn't needed + CHECK(railbus.eimic_real == doctest::Approx(-1.0)); + CHECK(railbus.hydro_R_Fill == doctest::Approx(1.0)); + CHECK(railbus.BrakePress < 0.1); + CHECK_FALSE(railbus.SpeedCtrlUnit.BrakeInterventionBraking); + scenario.wait(60.0); + CHECK(railbus.Vel == doctest::Approx(40.0).epsilon(0.05)); + scenario.act("main controller back, standing by"); + railbus.DecMainCtrl(1); + railbus.DecMainCtrl(1); + railbus.DecMainCtrl(1); + scenario.wait(5.0); + CHECK(railbus.SpeedCtrlUnit.Standby); + scenario.act("speed control off"); + railbus.DecScndCtrl(2); + scenario.wait(5.0); + CHECK_FALSE(railbus.SpeedCtrlUnit.IsActive); + scenario.check(); +} diff --git a/tests/unit/test_figures.cpp b/tests/unit/test_figures.cpp new file mode 100644 index 000000000..c8b575d50 --- /dev/null +++ b/tests/unit/test_figures.cpp @@ -0,0 +1,67 @@ +#include "stdafx.h" +#include "doctest.h" + +#include + +#include "figures.h" +#include "vehicle.h" + +// the key figures of the golden traces (figures.h): the parts of a run between the events, and the comparison +// with the recorded ones, which lets the last decimal and half a percent go and tells the rest in readable lines + +using test::definition; +using test::vehicle; + +TEST_CASE("figures: a run split into parts by the events, each from the last step of the part before") { + vehicle eu07{definition::fiz("4e_v1/4e")}; + test::figures figures; + auto &mover{eu07.mover()}; + mover.V = 10.0; + mover.PipePress = 5.0; + figures.sample(0.0, mover); + figures.mark("brake"); + figures.mark("hard"); + for (int i = 1; i <= 10; ++i) { + mover.V = 10.0 - i; + mover.DistCounter += 0.005; + mover.PipePress = 3.5; + mover.BrakePress = 0.4 * i; + figures.sample(i, mover); + } + figures.mark("release"); + mover.PipePress = 4.0; + figures.sample(11.0, mover); + mover.PipePress = 5.0; + figures.sample(12.0, mover); + + auto const lines{figures.lines()}; + auto const has{[&lines](std::string const &Line) { return std::ranges::find(lines, Line) != lines.end(); }}; + CHECK(lines.front() == "[start]"); + // two events with nothing run between them make one part + CHECK(has("[brake, hard]")); + CHECK(has("duration = 10.00 s")); + CHECK(has("speed at the start = 36.0 km/h")); + CHECK(has("distance = 50.0 m")); + CHECK(has("stopped after = 10.00 s")); + CHECK(has("brake pipe lowest = 3.500 bar")); + CHECK(has("brake cylinders peak = 4.000 bar")); + CHECK(has("brake pipe back at 4.9 bar after = 2.00 s")); + // no current nor force anywhere in the run: left out of every part + CHECK_FALSE(has("motor current peak = 0 A")); +} + +TEST_CASE("figures: compared within half a percent or the last decimal, the differences told by part") { + std::vector const recorded{"[brake]", "distance = 412.3 m", "stopped after = 38.21 s", "brake cylinders peak = 3.800 bar"}; + CHECK(test::figures::compare(recorded, recorded).empty()); + CHECK(test::figures::compare(recorded, {"[brake]", "distance = 413.9 m", "stopped after = 38.22 s", "brake cylinders peak = 3.810 bar"}).empty()); + + auto const differences{test::figures::compare(recorded, {"[brake]", "distance = 398.0 m", "brake cylinders peak = 3.800 bar", "motor current peak = 10 A"})}; + REQUIRE(differences.size() == 3); + CHECK(differences[0] == "[brake] distance: 398.0 m now, 412.3 m recorded"); + CHECK(differences[1] == "[brake] stopped after: none now, 38.21 s recorded"); + CHECK(differences[2] == "[brake] motor current peak: 10 A now, none recorded"); + + auto const parts{test::figures::compare(recorded, {"[brake hard]", "distance = 412.3 m"})}; + REQUIRE(parts.size() == 1); + CHECK(parts[0] == "the parts differ from part 1: [brake hard] now, [brake] recorded"); +} diff --git a/tests/unit/test_fiz.cpp b/tests/unit/test_fiz.cpp new file mode 100644 index 000000000..f25632dee --- /dev/null +++ b/tests/unit/test_fiz.cpp @@ -0,0 +1,183 @@ +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" +#include "golden.h" +#include "real_vehicles.h" +#include "fiz.h" + +#include +#include +#include + +#include "utilities/parser.h" + +using test::definition; +using test::vehicle; + +// the real vehicle definitions in data/fiz load, as the game loads them, and give the parameters they gave +// when the traces got recorded: the loader (LoadFIZ_Parse and the parsing of every section) stays as it was + +TEST_CASE("fiz: every real vehicle loads and keeps its parameters") { + for (auto const &path : test::real_vehicles()) { + CAPTURE(path); + test::reseed_random(); + vehicle real{definition::fiz(path)}; + test::trace trace{"fiz/" + path, test::channels::parameters(), 1}; + trace.sample(0.0, real.mover()); + // what every vehicle has, the rest of its parameters are in the golden trace + CHECK(real->Mass > 0.0); + CHECK(real->TotalMass >= real->Mass); + CHECK(real->Vmax > 0.0); + CHECK(real->NAxles > 0); + CHECK(real->WheelDiameter > 0.0); + CHECK(real->NPoweredAxles <= real->NAxles); + trace.check(); + } +} + +TEST_CASE("fiz: changes made by a test reach the vehicle") { + auto const eu07{definition::fiz("4e_v1/4e")}; + CHECK(vehicle{eu07}->Mass == doctest::Approx(80000.0)); + CHECK(vehicle{definition{eu07}.set("Param", "M", 90000)}->Mass == doctest::Approx(90000.0)); + // a key the file doesn't have is added to its section + CHECK(vehicle{definition{eu07}.set("Brake", "MaxBP", 3.5)}->MaxBrakePress[3] == doctest::Approx(3.5)); + // removing a key brings its default back + CHECK(vehicle{definition{eu07}.remove("Param", "Vmax")}->Vmax != doctest::Approx(125.0)); +} + +namespace { + +// a section of the game's definition, as data/fiz keeps it +struct converted_section { + std::string name; + nlohmann::ordered_json keys = nlohmann::ordered_json::object(); + nlohmann::ordered_json rows = nlohmann::ordered_json::array(); +}; + +// the sections of the lines of the game's definition: the values of each section line, and the rows of a +// list until the line closing it. lines the loader skips, and the lines closing the lists, are left out +converted_section convert_section(test::fiz::section const &Section, std::string const &Line) { + converted_section converted{std::string{Section.name}}; + for (auto const &key : test::fiz::keys(Line)) { + if (auto const value{test::fiz::value(key, Line)}; false == value.empty()) { + converted.keys[key] = value; + } + } + return converted; +} + +nlohmann::ordered_json convert_row(std::string const &Line) { + auto row = nlohmann::ordered_json::array(); + for (auto const &word : test::fiz::words(Line)) { + row.push_back(word); + } + return row; +} + +std::vector convert(std::vector const &Lines) { + std::vector result; + auto reading_rows{false}; + for (auto const &line : Lines) { + if (auto const section{test::fiz::opened_by(line)}; section != nullptr) { + result.push_back(convert_section(*section, line)); + reading_rows = section->list != 0; + continue; + } + auto const list{result.empty() ? nullptr : test::fiz::named(result.back().name)}; + if (list == nullptr || list->end == nullptr) { + continue; + } + // an empty line closes the brake table of the Cntrl section, the other lists have lines of their own + if (std::string_view const end{list->end}; line.empty() ? end.empty() : (false == end.empty() && line.starts_with(end))) { + reading_rows = false; + continue; + } + if (reading_rows && false == line.empty()) { + result.back().rows.push_back(convert_row(line)); + } + } + return result; +} + +// the JSON of data/fiz: a section a line, a row of a list a line +std::string json_text(std::string const &Source, std::vector const &Sections) { + std::string text{"{\n \"_source\": " + nlohmann::ordered_json(Source).dump() + ",\n"}; + text += R"( "_comment": "converted by test_fiz.cpp from the game's definition with the files it includes, keeping what the game's loader reads")"; + for (auto const §ion : Sections) { + text += ",\n " + nlohmann::ordered_json(section.name).dump() + ": {"; + auto first{true}; + for (auto const &[key, value] : section.keys.items()) { + text += (first ? "" : ", ") + nlohmann::ordered_json(key).dump() + ": " + value.dump(); + first = false; + } + if (test::fiz::named(section.name)->list != 0) { + text += std::string{first ? "" : ", "} + "\"rows\": ["; + for (std::size_t row = 0; row < section.rows.size(); ++row) { + text += (row == 0 ? "\n " : ",\n ") + section.rows[row].dump(); + } + text += section.rows.empty() ? "]" : "\n ]"; + } + text += "}"; + } + return text + "\n}\n"; +} + +std::vector split(std::string_view const List) { + std::vector result; + std::size_t start{0}; + while (start < List.size()) { + auto const end{std::min(List.find(',', start), List.size())}; + if (end > start) { + result.emplace_back(List.substr(start, end - start)); + } + start = end + 1; + } + return result; +} + +} // namespace + +// converts the game's definitions of the real vehicles to data/fiz, from the folder of the game's vehicles given +// in EU07_UNIT_TESTS_FIZ_SOURCE (dynamic/): the vehicles there already, and the ones named in EU07_UNIT_TESTS_FIZ_ADD +// (paths without pkp/ and the extension, separated by commas). the game's parser reads the file with its includes, +// the conversion keeps what the loader reads of it, and checks the loader reads the same of the converted one +TEST_CASE("fiz: conversion of the game's definitions, when asked for") { + auto const *source{std::getenv("EU07_UNIT_TESTS_FIZ_SOURCE")}; + if (source == nullptr) { + return; + } + auto paths{test::real_vehicles()}; + if (auto const *added{std::getenv("EU07_UNIT_TESTS_FIZ_ADD")}; added != nullptr) { + for (auto const &path : split(added)) { + paths.push_back(path); + } + } + auto const root{std::filesystem::path{source}}; + for (auto const &path : paths) { + CAPTURE(path); + // the vehicles of the Polish railways are in pkp/, the others under their operators + auto file{root / (path + ".fiz")}; + if (false == std::filesystem::exists(file)) { + file = root / "pkp" / (path + ".fiz"); + } + REQUIRE(std::filesystem::exists(file)); + cParser parser(file.filename().string(), cParser::buffer_FILE, file.parent_path().generic_string() + "/"); + auto const original{test::fiz::lines(parser)}; + + auto const target{std::filesystem::path{EU07_UNIT_TESTS_DATA} / "fiz" / (path + ".json")}; + std::filesystem::create_directories(target.parent_path()); + { + std::ofstream output(target, std::ios::binary); + output << json_text(std::filesystem::relative(file, root).generic_string(), convert(original)); + } + cParser converted(definition::fiz(path).text(), cParser::buffer_TEXT); + auto const expected{test::fiz::reading(original)}; + auto const actual{test::fiz::reading(test::fiz::lines(converted))}; + auto const mismatch{std::ranges::mismatch(expected, actual)}; + if (mismatch.in1 != expected.end() || mismatch.in2 != actual.end()) { + std::filesystem::remove(target); + FAIL_CHECK("the loader reads the converted definition differently, at " << (mismatch.in1 != expected.end() ? *mismatch.in1 : "the end") << " against " + << (mismatch.in2 != actual.end() ? *mismatch.in2 : "the end")); + } + } +} diff --git a/tests/unit/test_invariants.cpp b/tests/unit/test_invariants.cpp new file mode 100644 index 000000000..36c511863 --- /dev/null +++ b/tests/unit/test_invariants.cpp @@ -0,0 +1,34 @@ +#include "stdafx.h" +#include "doctest.h" +#include "golden.h" +#include "vehicle.h" + +// the invariants every golden trace checks (invariants.h) catch a vehicle in a state the simulation must +// never reach, once each, naming the time and the last event + +using test::definition; +using test::vehicle; + +TEST_CASE("invariants: a vehicle in an impossible state, reported once with its time and the last event") { + vehicle eu07{definition::fiz("4e_v1/4e")}; + test::trace trace{"invariants/self test", test::channels::brakes()}; + trace.sample(0.0, eu07.mover()); + CHECK(trace.violations().empty()); + + trace.mark("overfilled"); + eu07->BrakePress = 50.0; + trace.sample(0.01, eu07.mover()); + trace.sample(0.02, eu07.mover()); + REQUIRE(trace.violations().size() == 1); + auto const &violation{trace.violations().front()}; + CHECK(violation.find("brake cylinders") != std::string::npos); + CHECK(violation.find("at 0.010 s") != std::string::npos); + CHECK(violation.find("after \"overfilled\"") != std::string::npos); + CHECK(violation.find("BrakePress=50") != std::string::npos); + + eu07->BrakePress = 0.0; + eu07->V = std::nan(""); + trace.sample(0.03, eu07.mover()); + CHECK(trace.violations().size() > 1); + CHECK(trace.violations()[1].find("every value a number") != std::string::npos); +} diff --git a/tests/unit/test_loads.cpp b/tests/unit/test_loads.cpp new file mode 100644 index 000000000..b4a9da62a --- /dev/null +++ b/tests/unit/test_loads.cpp @@ -0,0 +1,116 @@ +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" + +// characterisation of the loads of vehicles besides the loading by commands (test_commands.cpp): the load +// assigned to a vehicle (AssignLoad), with the pantographs of an electric vehicle set up by the "pantstate" +// load of a scenario, and the steps of loading and unloading (LoadingDone) + +using test::definition; +using test::vehicle; + +TEST_CASE("loads: the pantographs of an electric vehicle set up by the amount of its pantstate load") { + // bit 0 raises the front pantograph, bit 1 the rear one, bit 2 turns the vehicle round in the train first + // (DoubleTr), so the bits name the pantographs the other way round + struct setup { + int amount; + bool frontraised; + bool rearraised; + }; + for (auto const &[amount, frontraised, rearraised] : {setup{0, false, false}, setup{1, true, false}, setup{2, false, true}, setup{3, true, true}, setup{5, false, true}, + setup{6, true, false}}) { + CAPTURE(amount); + vehicle et42{definition::fiz("et42_v2/112e-a")}; + CHECK(et42->AssignLoad("pantstate", static_cast(amount))); + CHECK(et42->DoubleTr == ((amount & 4) != 0 ? -1 : 1)); + CHECK(et42->Pantographs[end::front].valve.is_enabled == frontraised); + CHECK(et42->Pantographs[end::rear].valve.is_enabled == rearraised); + // the load itself stays as it was + CHECK(et42->LoadAmount == doctest::Approx(0.0)); + } + // a vehicle without a current collector takes no such load + vehicle wagon{definition::fiz("3wl_v2/3wl")}; + CHECK_FALSE(wagon->AssignLoad("pantstate", 3.f)); +} + +TEST_CASE("loads: a load assigned, of one kind at a time, up to the vehicle's capacity, and emptied") { + vehicle wagon{definition::fiz("3wl_v2/3wl")}; + auto const empty{wagon->TotalMass}; + REQUIRE(wagon->AssignLoad("coal", 10.f)); + CHECK(wagon->LoadTypeChange); + CHECK(wagon->LoadType.name == "coal"); + CHECK(wagon->TotalMass > empty); + // more of the same: the amount set, not added, and no more than the vehicle takes + wagon->LoadTypeChange = false; + REQUIRE(wagon->AssignLoad("coal", 1000.f)); + CHECK_FALSE(wagon->LoadTypeChange); + CHECK(wagon->LoadAmount == doctest::Approx(wagon->MaxLoad)); + // another kind can't be added to a load, nor can an unknown one be loaded + CHECK_FALSE(wagon->AssignLoad("ruda", 5.f)); + CHECK(wagon->LoadType.name == "coal"); + // emptied, with no name + REQUIRE(wagon->AssignLoad("")); + CHECK(wagon->LoadTypeChange); + CHECK(wagon->LoadAmount == doctest::Approx(0.0)); + CHECK(wagon->LoadType.name.empty()); + CHECK_FALSE(wagon->AssignLoad("unknown", 5.f)); + CHECK(wagon->AssignLoad("ruda", 5.f)); +} + +TEST_CASE("loads: the steps of loading and unloading") { + // most of the game's wagons may be overloaded (OverLoadFactor), the 3WL not + vehicle wagon{definition::fiz("3wl_v2/3wl").set("Load", "OverLoadFactor", 1.5)}; + REQUIRE(wagon->AssignLoad("coal", 10.f)); + auto const capacity{wagon->MaxLoad * (1.0 + wagon->OverLoadFactor)}; + + SUBCASE("no speed of the change: done at once") { + CHECK(wagon->LoadingDone(0.0, "coal")); + CHECK(wagon->LoadStatus == 4); + } + SUBCASE("no load, or another one, named: done when it was") { + wagon->LoadStatus = 1; + CHECK_FALSE(wagon->LoadingDone(1.0, "")); + CHECK_FALSE(wagon->LoadingDone(1.0, "ruda")); + wagon->LoadStatus = 4; + CHECK(wagon->LoadingDone(1.0, "")); + } + SUBCASE("unloading, step by step, what was asked or all of it, the name going with the last of it") { + wagon->CommandIn.Value1 = 4.0; // asked to unload + wagon->LastLoadChangeTime = 2.0; // at 1 a second + CHECK_FALSE(wagon->LoadingDone(-1.0, "coal")); + CHECK(wagon->LoadStatus == 2); + CHECK(wagon->LoadAmount == doctest::Approx(8.0)); + CHECK(wagon->LastLoadChangeTime == doctest::Approx(0.0)); + // nothing done since the last step + CHECK_FALSE(wagon->LoadingDone(-1.0, "coal")); + CHECK(wagon->LoadAmount == doctest::Approx(8.0)); + wagon->LastLoadChangeTime = 2.0; + CHECK(wagon->LoadingDone(-1.0, "coal")); + CHECK(wagon->LoadAmount == doctest::Approx(6.0)); + wagon->CommandIn.Value1 = 100.0; + wagon->LastLoadChangeTime = 10.0; + CHECK(wagon->LoadingDone(-1.0, "coal")); + CHECK(wagon->LoadAmount == doctest::Approx(0.0)); + CHECK(wagon->LoadType.name.empty()); + } + SUBCASE("loading, step by step, up to what was asked or what the vehicle takes, slower when overloaded") { + wagon->CommandIn.Value1 = 5.0; + wagon->LastLoadChangeTime = 2.0; + CHECK_FALSE(wagon->LoadingDone(1.0, "coal")); + CHECK(wagon->LoadStatus == 1); + CHECK(wagon->LoadAmount == doctest::Approx(12.0)); + wagon->LastLoadChangeTime = 3.0; + CHECK(wagon->LoadingDone(1.0, "coal")); + CHECK(wagon->LoadAmount == doctest::Approx(15.0)); + wagon->CommandIn.Value1 = 1000.0; + wagon->LastLoadChangeTime = 1000.0; + CHECK(wagon->LoadingDone(1.0, "coal")); + CHECK(wagon->LoadAmount == doctest::Approx(capacity)); + CHECK(capacity == doctest::Approx(2.5 * wagon->MaxLoad)); + // over the vehicle's own capacity, the change goes at half the speed + wagon->CommandIn.Value1 = 1000.0; + wagon->LastLoadChangeTime = 4.0; + CHECK_FALSE(wagon->LoadingDone(-1.0, "coal")); + CHECK(wagon->LoadAmount == doctest::Approx(capacity - 2.0)); + } +} diff --git a/tests/unit/test_queries.cpp b/tests/unit/test_queries.cpp new file mode 100644 index 000000000..d42232c2e --- /dev/null +++ b/tests/unit/test_queries.cpp @@ -0,0 +1,61 @@ +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" + +// characterisation of what the game's panels read of a vehicle besides the gauges recorded in the traces: the +// description of its damage on the driver's panel (driveruipanels.cpp) + +using test::definition; +using test::vehicle; + +TEST_CASE("queries: the damage of a vehicle as the driver's panel describes it") { + vehicle locomotive{definition::fiz("4e_v1/4e")}; + vehicle wagon{definition::fiz("3wl_v2/3wl")}; + // a powered locomotive and a wagon read some of the flags differently + locomotive->Power = 2000.0; + REQUIRE(wagon->Power < 0.1); + + struct damage { + int flag; + char const *locomotive; + char const *wagon; + }; + for (auto const &[flag, locomotivetext, wagontext] : { + damage{0, "OK", "OK"}, + damage{dtrain_thinwheel, "Thin wheel", "Load shifted"}, + damage{dtrain_wheelwear, "Wheel wear", "Wheel wear"}, + damage{dtrain_bearing, "Bearing damaged", "Bearing damaged"}, + damage{dtrain_coupling, "Coupler broken", "Coupler broken"}, + damage{dtrain_loaddamage, "Ventilator damaged", "Load damaged"}, + damage{dtrain_loaddestroyed, "Engine damaged", "LOAD DESTROYED"}, + damage{dtrain_axle, "Axle broken", "Axle broken"}, + damage{dtrain_out, "DERAILED", "DERAILED"}, + // the last flag of the list wins + damage{dtrain_bearing | dtrain_axle, "Axle broken", "Axle broken"}, + damage{255, "WRECKED", "WRECKED"}, + }) { + CAPTURE(flag); + locomotive->DamageFlag = flag; + wagon->DamageFlag = flag; + CHECK(locomotive->EngineDescription(0) == locomotivetext); + CHECK(wagon->EngineDescription(0) == wagontext); + } + // flat wheels count as worn ones + wagon->DamageFlag = 0; + wagon->WheelFlat = 6.0; + CHECK(wagon->EngineDescription(0) == "Wheel wear"); + // nothing else is described + CHECK(wagon->EngineDescription(1) == "Invalid qualifier"); +} + +TEST_CASE("queries: the ammeters of a vehicle without power show the current of the ones it controls") { + vehicle unpowered{definition::fiz("en57_v1/6ba_840")}; + vehicle powered{definition::fiz("en57_v1/5bgb")}; + unpowered->Attach(end::rear, end::front, &powered.mover(), coupling::control, true, false); + powered->Power = 600.0; + powered->Itot = 321.7; + unpowered->Power = 0.0; + CHECK(unpowered->ShowCurrent(0) == doctest::Approx(321.0)); // whole amperes + powered->Power = 0.0; + CHECK(unpowered->ShowCurrent(0) == doctest::Approx(0.0)); +} diff --git a/tests/unit/test_traction.cpp b/tests/unit/test_traction.cpp new file mode 100644 index 000000000..6da4ca506 --- /dev/null +++ b/tests/unit/test_traction.cpp @@ -0,0 +1,270 @@ +#include "stdafx.h" + +#include + +#include "doctest.h" +#include "vehicle.h" +#include "drive.h" +#include "golden.h" +#include "real_vehicles.h" +#include "scenario.h" + +#include "McZapkie/hamulce.h" + +using test::definition; +using test::vehicle; + +// characterisation of the drive of every real powered vehicle, driven alone from its front cab under a 3 kV +// catenary through test::drive_cycle(), in golden traces (data/golden/traction/). the cars of the electric +// units which take power or battery from the rest of their unit don't start alone: their traces record +// that, test_consist.cpp drives the whole units + +TEST_CASE("traction: every real powered vehicle started up, driven to full power and braked to a stop") { + for (auto const &path : test::real_vehicles()) { + CAPTURE(path); + test::reseed_random(); + vehicle real{definition::fiz(path), 0.0, "test", 1}; + if (false == test::is_powered(real.mover())) { + continue; + } + using namespace test::channels; + test::trace trace{"traction/" + path, motion() + traction() + air() + brakes(), 100}; + real.record(trace); + test::drive_cycle(test::driving(real), test::track{0.15, 0.0, test::catenary_3kv}, trace); + // every vehicle getting its line breaker closed runs off and is braked to a stop. the SM31 and the TEM2 + // barely move (COVERAGE.md); the cars of a unit taking their power from another car don't start alone + if (real->Mains) { + auto const crawls{path == "sm31_v1/411d" || path == "tem2_v2/tem2a"}; + CHECK((real->DistCounter > 0.2 /* km */) != crawls); + // but the road vehicle, which a minute of full service only slows down + CHECK((real->Vel < 0.5) != (path == "road/man/nl293")); + } + trace.check(); + } +} + +namespace { + +using test::scenario; +using namespace test::channels; + +void stop(scenario &Scenario) { + Scenario.notch_back(0); + Scenario.act("brake"); + Scenario.cab().BrakeLevelSet(Scenario.cab().Handle->GetPos(bh_FB)); + Scenario.wait(60.0); +} + +} // namespace + +TEST_CASE("traction: the line breaker opened by the catenary lost, and by too high a voltage") { + // the voltage relays of the series motors, and the induction motors' own limits: under MinV of the current + // collector, or over MaxV (with the overvoltage protection, OVP) and over MaxV + 200 V for the induction motors + for (auto const &[name, vehicles] : std::vector>>{ + {"eu07", {"4e_v1/4e"}}, {"et42", {"et42_v2/112e-a", "et42_v2/112e-b"}}, {"eu47", {"e186_v2/eu47"}}}) { + CAPTURE(name); + scenario scenario{"traction/catenary/" + name, motion() + traction()}; + for (auto const *path : vehicles) { + scenario.add(path, scenario.train().size() == 0 ? 1 : 0); + } + scenario.add("bdhpumn_v3/bdhpumn"); + REQUIRE(scenario.start_up()); + scenario.get_going(); + auto &controlling{scenario.driver().controlling}; + scenario.full_power(10.0); + REQUIRE(controlling.Mains); + scenario.act("catenary lost"); + scenario.line().voltage = 0.0; + scenario.wait(5.0); + CHECK_FALSE(controlling.Mains); + CHECK(controlling.Im == doctest::Approx(0.0)); + scenario.act("catenary back"); + scenario.line().voltage = test::catenary_3kv; + scenario.notch_back(0); + CHECK(scenario.start_up()); + scenario.full_power(5.0); + scenario.act("overvoltage"); + scenario.line().voltage = controlling.EnginePowerSource.CollectorParameters.MaxV + 300.0; + scenario.wait(5.0); + CHECK(controlling.Mains == (controlling.EngineType == TEngineType::ElectricSeriesMotor && false == controlling.EnginePowerSource.CollectorParameters.OVP)); + scenario.line().voltage = test::catenary_3kv; + stop(scenario); + scenario.check(); + } +} + +TEST_CASE("traction: the ET42 at the high current setting, its halves in series, and its switched electrodynamic brake") { + for (auto const high : {false, true}) { + CAPTURE(high); + scenario scenario{std::string{"traction/et42/"} + (high ? "high current" : "low current"), motion() + traction() + brakes()}; + scenario.add("et42_v2/112e-a", 1).add("et42_v2/112e-b").add("3wl_v2/3wl").add("3wl_v2/3wl").add("3wl_v2/3wl"); + REQUIRE(scenario.start_up()); + auto &et42{scenario.cab()}; + scenario.act("current setting"); + CHECK(et42.CurrentSwitch(high) == high); + // the relay takes the setting at the next step, with the controller at zero + scenario.get_going(); + CHECK((et42.Imax == et42.ImaxHi) == high); + scenario.full_power(60.0); + // at the high current setting the controller stops at the last series position: the halves' motors stay + // in series, at half the voltage each, for a heavy start, and the train crawls + CHECK((et42.RList[et42.MainCtrlPos].Bn > 1) != high); + CHECK(et42.Vel > (high ? 30.0 : 90.0)); + CHECK(et42.Vel < (high ? 50.0 : 110.0)); + scenario.act("controller to zero"); + while (et42.DecMainCtrl(2)) { + // down to zero + } + scenario.wait(2.0); + scenario.act("dynamic brake"); + CHECK(et42.DynamicBrakeSwitch(true)); + scenario.wait(5.0); + scenario.full_power(20.0); + // the controller sets the brake's strength. from the low setting's top speed, over 100 km/h, the motors' + // current goes over 300 A at the first position and the overload relay trips, leaving the train to roll; + // from the high setting's, under 40 km/h, the brake stops the train + CHECK(et42.FuseFlag != high); + CHECK((et42.Vel == doctest::Approx(0.0)) == high); + scenario.act("dynamic brake off"); + scenario.notch_back(0); + et42.DynamicBrakeSwitch(false); + stop(scenario); + scenario.check(); + } +} + +TEST_CASE("traction: the field shunting relays of the diesel-electric locomotives, at full power and notched back") { + // each kind of the automatic relays (RelayType) the game's diesel-electrics have, run with a wagon up to full + // shunting (and past their top speed, which nothing limits) and notched back through the positions where the + // relays let the shunting go: by the current (0), by the speed alone (1, which keeps it at any position), by + // the current at the full position only (41), by the position and the speed (45, 46) + struct locomotive { + char const *path; + int relaytype; + std::array shunting; // after notching back to 11, 10, 7 and 3 + }; + for (auto const &[path, relaytype, shunting] : {locomotive{"cd/754_v1/754", 0, {3, 3, 3, 0}}, locomotive{"sm31_v1/411d", 1, {2, 2, 2, 2}}, + locomotive{"sm40_v1/sm40", 41, {1, 1, 1, 1}}, locomotive{"su45_v2/301d", 45, {3, 2, 0, 0}}, + locomotive{"su46_v2/303d", 46, {4, 2, 0, 0}}}) { + CAPTURE(path); + scenario scenario{std::string{"traction/relays/"} + path, motion() + traction()}; + scenario.add(path, 1).add("bdhpumn_v3/bdhpumn"); + REQUIRE(scenario.start_up()); + auto &controlling{scenario.driver().controlling}; + CHECK(controlling.RelayType == relaytype); + scenario.get_going(); + scenario.full_power(120.0); + CHECK(controlling.ScndCtrlPos == controlling.ScndCtrlPosNo); + auto expected{shunting.begin()}; + for (auto const position : {11, 10, 7, 3}) { + CAPTURE(position); + scenario.act(std::format("notch back to {}", position)); + scenario.notch_back(position); + scenario.wait(15.0); + CHECK(controlling.ScndCtrlPos == *expected++); + } + stop(scenario); + scenario.check(); + } +} + +TEST_CASE("traction: the stages of the EW58's electrodynamic brake, set by the positions of its ep handle") { + // the FVE408's positions 1 to 5 give the ep brake's strength, whose whole part is the stage of the motors' + // brake (TUHEX): 1, 1, 2, 3, 3; over 100 km/h the motors brake at the first stage alone + scenario scenario{"traction/ew58 brake stages", motion() + traction() + brakes()}; + for (auto const *car : {"ew58_v1/ew58-sa", "ew58_v1/ew58-d", "ew58_v1/ew58-sb"}) { + scenario.add(car, scenario.train().size() == 0 ? 1 : 0, test::consist::full_coupling, 115.0); + } + REQUIRE(scenario.start_up()); + auto &ew58{scenario.cab()}; + for (auto const &[position, stage] : {std::pair{1, 1}, std::pair{3, 2}, std::pair{4, 3}, std::pair{2, 1}, std::pair{5, 3}}) { + CAPTURE(position); + scenario.act(std::format("position {}", position)); + ew58.BrakeLevelSet(position); + scenario.wait(6.0); + CHECK(ew58.TUHEX_StageActual == stage); + CHECK(ew58.DynamicBrakeFlag); + CHECK(ew58.Im < 0.0); + } + scenario.act("release"); + ew58.BrakeLevelSet(ew58.Handle->GetPos(bh_RP)); + scenario.wait(10.0); + CHECK(ew58.TUHEX_StageActual == 0); + scenario.check(); +} + +TEST_CASE("traction: the induction motor drive's speed control, its electrodynamic brake by the local brake, and at the voltage's limit") { + scenario scenario{"traction/eu47 drive", motion() + traction() + brakes()}; + scenario.add("e186_v2/eu47", 1).add("bdhpumn_v3/bdhpumn").add("bdhpumn_v3/bdhpumn"); + REQUIRE(scenario.start_up()); + auto &eu47{scenario.cab()}; + scenario.get_going(); + // the second controller of the EU47 sets the speed to hold (SpeedCtrlType=Time): position 2 keeps the speed + // set, 3 raises it by 10 km/h every SpeedCtrlDelay, 4 sets the top speed, 1 lowers it, 0 drops it + REQUIRE(eu47.ScndCtrlPosNo == 4); + REQUIRE(eu47.SpeedCtrlTypeTime); + scenario.full_power(0.0); + scenario.act("speed up"); + for (int i = 0; i < 3; ++i) { + eu47.IncScndCtrl(1); + } + scenario.wait(3.0); + scenario.act("hold"); + eu47.DecScndCtrl(1); + scenario.wait(1.0); + CHECK(eu47.SpeedCtrlValue == doctest::Approx(60.0)); + scenario.wait(60.0); + CHECK(eu47.Vel == doctest::Approx(60.0).epsilon(0.01)); + scenario.act("slow down"); + eu47.DecScndCtrl(1); + scenario.wait(1.5); + eu47.IncScndCtrl(1); + scenario.wait(1.0); + CHECK(eu47.SpeedCtrlValue == doctest::Approx(20.0)); + // a lower speed set only takes the power off, the train rolls on + scenario.wait(40.0); + CHECK(eu47.Vel > 50.0); + scenario.act("top speed"); + eu47.IncScndCtrl(2); + scenario.wait(5.0); + CHECK(eu47.SpeedCtrlValue == doctest::Approx(eu47.Vmax)); + scenario.act("speed control off"); + while (eu47.DecScndCtrl(1)) { + // down to zero + } + scenario.notch_back(0); + scenario.wait(2.0); + CHECK(eu47.SpeedCtrlValue == doctest::Approx(0.0)); + // the local brake sets the flag of the electrodynamic brake, which keeps the train brake's air out of the + // cylinders, but the motors' brake follows the train brake alone: the local brake's air does the braking + scenario.act("local brake"); + eu47.IncLocalBrakeLevel(LocalBrakePosNo); + scenario.wait(5.0); + CHECK(eu47.DynamicBrakeFlag); + CHECK(eu47.Im == doctest::Approx(0.0)); + CHECK(eu47.BrakePress > 2.0); + scenario.act("local brake off"); + eu47.DecLocalBrakeLevel(LocalBrakePosNo); + scenario.wait(10.0); + // braking back into the catenary: at its usual voltage, and at its highest, over the drive's MaxV, where + // the drive lets less of the current go back to it (Vadd) + for (auto const voltage : {test::catenary_3kv, eu47.EnginePowerSource.CollectorParameters.MaxV + 100.0}) { + CAPTURE(voltage); + scenario.line().voltage = voltage; + scenario.act(std::format("service brake at {} V", static_cast(voltage))); + eu47.BrakeLevelSet(eu47.Handle->GetPos(bh_FB)); + scenario.wait(6.0); + CHECK(eu47.DynamicBrakeFlag); + CHECK(eu47.Im < -100.0); + CHECK((eu47.Vadd > 1.0) == (voltage > eu47.EnginePowerSource.CollectorParameters.MaxV)); + eu47.BrakeLevelSet(eu47.Handle->GetPos(bh_RP)); + scenario.wait(6.0); + } + scenario.line().voltage = test::catenary_3kv; + scenario.act("line breaker off"); + eu47.MainSwitch(false); + scenario.wait(5.0); + CHECK(eu47.Im == doctest::Approx(0.0)); + stop(scenario); + scenario.check(); +} diff --git a/tests/unit/vehicle.cpp b/tests/unit/vehicle.cpp index 914a31079..e38999f7d 100644 --- a/tests/unit/vehicle.cpp +++ b/tests/unit/vehicle.cpp @@ -1,60 +1,26 @@ #include "stdafx.h" #include "vehicle.h" +#include "golden.h" +#include "real_vehicles.h" +#include "fiz.h" #include "vehicle/DynObj.h" +#include #include #include +#include "utilities/Globals.h" + namespace test { namespace { -struct section_format { - char separator; // the game's definitions end section names with either '.' or ':' - char const *table_end{nullptr}; // the line closing the rows of a table section -}; - -// the sections TMoverParameters::LoadFIZ() reads, see its issection() calls. a section missing here -// would be silently skipped by the loader, and the test would run on the defaults instead -std::map> const sections{ - {"Param", {'.'}}, - {"Load", {':'}}, - {"Dimensions", {':'}}, - {"Wheels", {':'}}, - {"Brake", {':'}}, - {"Doors", {':'}}, - {"BuffCoupl", {'.'}}, - {"BuffCoupl1", {'.'}}, - {"BuffCoupl2", {'.'}}, - {"TurboPos", {':'}}, - {"Cntrl", {'.'}}, - {"Blending", {':'}}, - {"DCEMUED", {':'}}, - {"SpringBrake", {':'}}, - {"Light", {':'}}, - {"Headlights", {':'}}, - {"Clima", {':'}}, - {"Power", {':'}}, - {"SpeedControl", {':'}}, - {"Engine", {':'}}, - {"Switches", {':'}}, - {"Security", {':'}}, - {"Circuit", {':'}}, - {"AI", {':'}}, - {"LightsList", {':', "endL"}}, - {"DimmerList", {':', "endDimmerList"}}, - {"WiperList", {':', "endwl"}}, - {"CompressorList", {':', "endCL"}}, - {"RList", {':', "END-RL"}}, - {"MotorParamTable0", {':', "END-MPT"}}, -}; - -section_format const &format_of(std::string const &Section) { - auto const lookup{sections.find(Section)}; - if (lookup == sections.end()) { - throw definition_error("unknown vehicle definition section " + Section + ", see tests/unit/vehicle.cpp"); +fiz::section const &format_of(std::string const &Section) { + auto const section{fiz::named(Section)}; + if (section == nullptr) { + throw definition_error("vehicle definition section " + Section + " isn't one the loader reads, see tests/unit/fiz.cpp"); } - return lookup->second; + return *section; } std::string value_text(nlohmann::ordered_json const &Value) { @@ -67,9 +33,9 @@ std::string value_text(nlohmann::ordered_json const &Value) { return Value.dump(); } -// the rows of a table section, each a list of values, and the line closing them -std::string table_text(std::string const &Section, section_format const &Format, nlohmann::ordered_json const &Rows) { - if (Format.table_end == nullptr) { +// the rows of a list section, each a list of values, and the line closing them +std::string table_text(std::string const &Section, fiz::section const &Format, nlohmann::ordered_json const &Rows) { + if (Format.end == nullptr) { throw definition_error("vehicle definition section " + Section + " has no rows"); } std::string text; @@ -79,34 +45,47 @@ std::string table_text(std::string const &Section, section_format const &Format, } text += "\n"; } - return text + Format.table_end + "\n"; + return text + Format.end + "\n"; } -} // namespace - -definition definition::load(std::string const &Name) { - auto const path{std::string{EU07_UNIT_TESTS_DATA} + "/" + Name + ".json"}; - std::ifstream file(path); +nlohmann::ordered_json sections_of(std::string const &Path) { + std::ifstream file(Path); if (false == file.is_open()) { - throw definition_error("no test vehicle definition " + path); + throw definition_error("no test vehicle definition " + Path); } - definition result; // not brace-initialised: json{other} makes an array of other with GCC and Clang (the initializer list constructor wins) auto const json = nlohmann::ordered_json::parse(file, nullptr, true, true); if (false == json.is_object()) { - throw definition_error("test vehicle definition " + path + " isn't a JSON object"); + throw definition_error("test vehicle definition " + Path + " isn't a JSON object"); } + auto result = nlohmann::ordered_json::object(); for (auto const &[section, keys] : json.items()) { // keys starting with _ are comments if (section.starts_with('_')) { continue; } format_of(section); - result.m_sections[section] = keys; + result[section] = keys; } return result; } +} // namespace + +definition definition::load(std::string const &Name) { + definition result; + result.m_sections = sections_of(std::string{EU07_UNIT_TESTS_DATA} + "/" + Name + ".json"); + return result; +} + +definition definition::fiz(std::string const &Path) { + definition result; + result.m_sections = sections_of(std::string{EU07_UNIT_TESTS_DATA} + "/fiz/" + Path + ".json"); + auto const slash{Path.rfind('/')}; + result.m_typename = slash == std::string::npos ? Path : Path.substr(slash + 1); + return result; +} + definition &definition::set(std::string const &Section, std::string const &Key, nlohmann::ordered_json const &Value) { format_of(Section); m_sections[Section][Key] = Value; @@ -143,52 +122,145 @@ std::string definition::text() const { return text; } -vehicle::vehicle(definition const &Definition, double Velocity, std::string const &Name) { - // the same steps as TDynamicObject::Init() - m_mover = std::make_unique(Velocity, Name, Name, 0); +vehicle::vehicle(definition const &Definition, double Velocity, std::string const &Name, int Cab) : m_cab(Cab) { + // the same steps as TDynamicObject::Init(), for a vehicle set the usual way round (iDirection 1) + auto const typename_{Definition.type_name().empty() ? Name : Definition.type_name()}; + m_mover = std::make_unique(Velocity, typename_, Name, Cab); if (false == m_mover->LoadFIZ_Text(Definition.text())) { throw definition_error("the test vehicle definition didn't load"); } m_mover->AssignLoad("", 0.f); m_mover->ComputeMass(); auto const driveractive{Velocity != 0.0}; - if (false == m_mover->CheckLocomotiveParameters(driveractive, Velocity >= 0.0 ? 1 : -1)) { + if (false == m_mover->CheckLocomotiveParameters(driveractive, (Velocity > 0 ? 1 : -1) * Cab)) { throw definition_error("parameters mismatch in the test vehicle definition"); } m_mover->MainCtrlPos = m_mover->MainCtrlNoPowerPos(); m_mover->LocalBrakePosA = 0.0; - m_mover->BrakeCtrlPos = static_cast(std::floor(m_mover->Handle->GetPos(driveractive ? bh_RP : bh_NP))); + if (driveractive) { + m_mover->BrakeCtrlPos = static_cast(std::floor(m_mover->Handle->GetPos(Cab == 0 ? bh_NP : bh_RP))); + // a driver keeps a vehicle on standby on its independent brake + if (Cab != 0 && m_mover->LocalBrake != TLocalBrake::ManualBrake && Velocity < 1.0) { + m_mover->IncLocalBrakeLevel(LocalBrakePosNo); + if (m_mover->EIMCtrlEmergency) { + m_mover->DecLocalBrakeLevel(1); + } + } + } + else { + m_mover->BrakeCtrlPos = static_cast(std::floor(m_mover->Handle->GetPos(bh_NP))); + } m_mover->BrakeLevelSet(m_mover->BrakeCtrlPos); } void vehicle::step(track const &Track, double Dt) { - compute_forces(Dt); - compute_movement(Track, Dt, TLocation{0.0, 0.0, 0.0}); -} - -void vehicle::compute_forces(double Dt) { - if (m_pipepressure >= 0.0) { - m_mover->Pipe->CreatePress(m_pipepressure); + begin_step(); + TLocation const location{0.0, 0.0, 0.0}; + for (int iteration = 1; iteration < Track.iterations; ++iteration) { + forces(Dt); + fast_move(Track, Dt, location); } - m_mover->ComputeTotalForce(Dt); + forces(Dt); + move(Track, Dt, location, m_mover->PipePress); } -double vehicle::compute_movement(track const &Track, double Dt, TLocation const &Location) { +namespace { + +TTrackShape shape_of(track const &Track) { TTrackShape shape; shape.Len = 1000.0; shape.dHtrack = Track.gradient; + return shape; +} + +TTrackParam parameters_of(track const &Track, TMoverParameters const &Mover) { TTrackParam param; - param.Width = 1.435; + param.Width = Track.width; param.friction = Track.friction; - param.CategoryFlag = 1; - TTractionParam const traction; + // the vehicle's own kind of way: a road vehicle on rails derails as soon as it moves + if (Track.category != 0) { + param.CategoryFlag = Track.category; + } + else { + param.CategoryFlag = Mover.CategoryFlag != 0 ? Mover.CategoryFlag : 1; + } + return param; +} + +} // namespace + +double vehicle::fast_move(track const &Track, double Dt, TLocation const &Location) { + // TDynamicObject::FastUpdate(), the iterations of a frame before the last one + auto param{parameters_of(Track, *m_mover)}; + return m_mover->FastComputeMovement(Dt, shape_of(Track), param, Location, TRotation{0.0, 0.0, 0.0}); +} + +void vehicle::begin_step() { + // the conditions the test keeps + if (m_pipepressure >= 0.0) { + m_mover->Pipe->CreatePress(m_pipepressure); + } + if (m_reservoirpressure >= 0.0 && m_mover->VeselVolume > 0.0) { + m_mover->CompressedVolume = m_reservoirpressure * m_mover->VeselVolume; + } + // vehicle_table::update(), before the forces + m_mover->ComputeConstans(); +} + +void vehicle::forces(double Dt) { + // TDynamicObject::UpdateForce() + m_mover->ComputeTotalForce(Dt); +} + +double vehicle::move(track const &Track, double Dt, TLocation const &Location, double Trainpipe) { + auto const shape{shape_of(Track)}; + auto const param{parameters_of(Track, *m_mover)}; TRotation const rotation{0.0, 0.0, 0.0}; - return m_mover->ComputeMovement(Dt, Dt, shape, param, traction, Location, rotation); + + // what TDynamicObject::Update() does before the movement. a raised pantograph touches the wire at once, + // the game animates its rise + auto &mover{*m_mover}; + mover.PantFrontVolt = mover.Pantographs[end::front].is_active ? Track.voltage : 0.0; + mover.PantRearVolt = mover.Pantographs[end::rear].is_active ? Track.voltage : 0.0; + TTractionParam traction; + traction.TractionVoltage = + mover.EnginePowerSource.SourceType == TPowerSource::CurrentCollector ? std::max(std::abs(mover.PantRearVolt), std::abs(mover.PantFrontVolt)) : 0.95 * mover.EnginePowerSource.MaxVoltage; + traction.TractionFreq = 0; + traction.TractionMaxCurrent = 7500; + traction.TractionResistivity = 0.3; + mover.PantographVoltage = traction.TractionVoltage; + if (m_cab != 0) { + using enum TEngineType; + // the driver's own vehicle, which gets the average pressure of the train's brake pipe + mover.EqvtPipePress = Trainpipe; + if (auto const diesel{mover.EngineType == DieselEngine || mover.EngineType == DieselElectric}; diesel && mover.EIMCtrlType > 0) { + mover.CheckEIMIC(Dt); + if (mover.SpeedCtrl) { + mover.CheckSpeedCtrl(Dt); + } + mover.eimic_real = std::min(mover.eimic, mover.eimicSpeedCtrl); + } + if (mover.EngineType == ElectricInductionMotor) { + // the share of the electric and pneumatic brake over the train (TDynamicObject's MED) isn't here + mover.CheckEIMIC(Dt); + mover.CheckSpeedCtrl(Dt); + mover.eimic_real = std::min(mover.eimic, mover.eimicSpeedCtrl); + } + } + + // the whole frame's time, of all its iterations + auto const frame{Dt * Track.iterations}; + auto const distance{m_mover->ComputeMovement(Dt, frame, shape, param, traction, Location, rotation)}; + m_time += frame; + if (m_trace != nullptr) { + m_trace->sample(m_time, *m_mover); + } + return distance; } void vehicle::run(double Seconds, track const &Track, double Dt) { - // whole steps: summing up Dt would make the step count depend on the rounding - auto const steps{std::lround(Seconds / Dt)}; + // whole frames: summing up Dt would make their count depend on the rounding + auto const steps{std::lround(Seconds / (Dt * Track.iterations))}; for (long i = 0; i < steps; ++i) { step(Track, Dt); } @@ -253,10 +325,12 @@ void pair::find_neighbours() { void pair::step(track const &Track, double Dt) { find_neighbours(); for (auto const &placed : m_vehicles) { - placed.owner->compute_forces(Dt); + placed.owner->begin_step(); + placed.owner->forces(Dt); } for (auto &placed : m_vehicles) { - placed.position += placed.heading * placed.owner->compute_movement(Track, Dt, TLocation{placed.position, 0.0, 0.0}); + auto const &mover{placed.owner->mover()}; + placed.position += placed.heading * placed.owner->move(Track, Dt, TLocation{placed.position, 0.0, 0.0}, mover.PipePress); } } @@ -278,4 +352,24 @@ int pair::coupling() const { return m_vehicles[0].owner->mover().Couplers[m_vehicles[0].end].CouplingFlag; } +void reseed_random() { + Global.random_engine.seed(1); + Global.local_random_engine.seed(1); +} + +std::vector const &real_vehicles() { + static std::vector const paths{[] { + std::vector result; + auto const root{std::filesystem::path{EU07_UNIT_TESTS_DATA} / "fiz"}; + for (auto const &entry : std::filesystem::recursive_directory_iterator(root)) { + if (entry.is_regular_file() && entry.path().extension() == ".json") { + result.push_back(std::filesystem::relative(entry.path(), root).replace_extension().generic_string()); + } + } + std::ranges::sort(result); + return result; + }()}; + return paths; +} + } // namespace test diff --git a/tests/unit/vehicle.h b/tests/unit/vehicle.h index 616e75d11..e14f4e464 100644 --- a/tests/unit/vehicle.h +++ b/tests/unit/vehicle.h @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -12,6 +13,10 @@ namespace test { +// reseeds the random number engines of the simulation, as before every test case. a test making several +// vehicles in a loop reseeds before each, so each one is the same whatever comes before it +void reseed_random(); + // thrown for a test vehicle definition which can't be used: missing, malformed, or not taken by the loader class definition_error : public std::runtime_error { public: @@ -21,34 +26,59 @@ public: // definition of a test vehicle: one of the JSON files in tests/unit/data, with the sections and keys // of the game's vehicle definitions, changed by the test where it needs to: // auto heavy = definition::load("wagon").set("Param", "M", 60000).set("Brake", "BrakeValve", "ESt3"); +// or one of the game's own vehicles, converted with the files it includes to tests/unit/data/fiz (see the +// README there), which reads to the game's vehicle loader the same as the game's file: +// auto eu07 = definition::fiz("4e_v1/4e").set("Brake", "MaxBP", 3.8); +// a section of a list keeps its rows under "rows", each a list of values class definition { public: // tests/unit/data/.json static definition load(std::string const &Name); + // tests/unit/data/fiz/.json + static definition fiz(std::string const &Path); // sets the key of the section, adding either one when it's missing definition &set(std::string const &Section, std::string const &Key, nlohmann::ordered_json const &Value); - // drops the whole section, or one key of it + // drops the whole section, with its rows, or one key of it definition &remove(std::string const &Section); definition &remove(std::string const &Section, std::string const &Key); - // the definition in the form the game's vehicle loader reads + // the definition in the form the game's vehicle loader reads, the sections in their order std::string text() const; + // the vehicle type of a real definition, its file name in the game; empty for the others + std::string const &type_name() const { return m_typename; } + private: - nlohmann::ordered_json m_sections; + nlohmann::ordered_json m_sections = nlohmann::ordered_json::object(); + std::string m_typename; }; -// conditions the vehicle runs in: straight track of the given friction and gradient (rise/run) +// conditions the vehicle runs in: straight track of the given friction and gradient (rise/run), under a +// catenary of the given voltage, or without one. the track is of the vehicle's own category (rail, road, +// water), unless the test gives one, and of the standard gauge wide, unless the test gives a road's width. iterations is how many steps of the physics the game makes in a frame: +// the last one moves the vehicle fully, the ones before it (FastComputeMovement) only roughly; the game +// makes as many as it takes to keep them at 0.01 s, in fives with "full physics" set struct track { double friction{0.15}; double gradient{0.0}; + double voltage{0.0}; + int category{0}; + int iterations{1}; + double width{1.435}; }; -// one vehicle created the way TDynamicObject::Init() creates it, from the given definition +// the catenary of the Polish railways [V] +inline constexpr double catenary_3kv{3000.0}; + +class trace; + +// one vehicle created the way TDynamicObject::Init() creates it, from the given definition. Cab is the +// cab with a driver in it, 1 (front) or -1 (rear), as for a "headdriver" or "reardriver" in a scenario; +// 0 for a vehicle nobody drives. the vehicle steps the way TDynamicObject::Update() steps a lone one class vehicle { public: - explicit vehicle(definition const &Definition, double Velocity = 0.0, std::string const &Name = "test"); + explicit vehicle(definition const &Definition, double Velocity = 0.0, std::string const &Name = "test", int Cab = 0); TMoverParameters &mover() { return *m_mover; } TMoverParameters *operator->() { return m_mover.get(); } @@ -56,25 +86,35 @@ public: // keeps the brake pipe at the given pressure [bar], as a locomotive coupled to the vehicle would; // a negative value leaves the pipe alone void hold_brake_pipe(double Pressure) { m_pipepressure = Pressure; } + // keeps the main reservoir at the given pressure [bar], as a running compressor or a coupled vehicle + // feeding it would; a negative value leaves it alone + void hold_main_reservoir(double Pressure) { m_reservoirpressure = Pressure; } - // advances the physics by one step of Dt, the way the simulation loop does + // advances the physics by one frame of Track.iterations steps of Dt, the way the simulation loop does void step(track const &Track = {}, double Dt = 0.01); - // advances the physics by Seconds in steps of Dt + // advances the physics by Seconds in frames of steps of Dt void run(double Seconds, track const &Track = {}, double Dt = 0.01); + // from now on records the vehicle in the trace after every step, see golden.h + void record(trace &Trace) { m_trace = &Trace; } + + // the parts of a step, which a consist makes for all its vehicles in turn, as vehicle_table::update() + // does: the test's conditions and the constants, the forces, the movement (returning the distance) + void begin_step(); + void forces(double Dt); + double fast_move(track const &Track, double Dt, TLocation const &Location); + double move(track const &Track, double Dt, TLocation const &Location, double Trainpipe); + // vehicle speed in kilometres per hour, negative when moving backwards double speed() const { return m_mover->V * 3.6; } private: - friend class pair; - - // the two halves of a step: the forces, taken by all the vehicles in the scene first, then the movement, - // the vehicle placed at Location. returns the distance travelled [m], positive forwards - void compute_forces(double Dt); - double compute_movement(track const &Track, double Dt, TLocation const &Location); - std::unique_ptr m_mover; + int m_cab{0}; double m_pipepressure{-1.0}; + double m_reservoirpressure{-1.0}; + trace *m_trace{nullptr}; + double m_time{0.0}; // of the simulation, since the vehicle got created }; // two vehicles on a straight track, the FirstEnd of the first one facing the SecondEnd of the second one Gap metres From 4a256477e0d5b8be8685d7e9944af530b6584136 Mon Sep 17 00:00:00 2001 From: Sebastian Krzyszkowiak Date: Wed, 28 Oct 2026 03:33:33 +0100 Subject: [PATCH 268/430] Train: Handle 3-way light switches in headlighttoggle actions This lets them be fully operated with mouse and VR pointers. --- vehicle/Train.cpp | 76 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 60 insertions(+), 16 deletions(-) diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index 201b8972f..e2f8fa86e 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -5234,15 +5234,37 @@ void TTrain::OnCommand_headlighttoggleleft(TTrain *Train, command_data const &Co if (Command.action == GLFW_PRESS) { // only reacting to press, so the switch doesn't flip back and forth if key is held down - if ((Train->mvOccupied->iLights[vehicleend] & light::headlight_left) == 0) + + if (Train->ggLeftEndLightButton.SubModel != nullptr || Train->ggLeftLightButton.SubModel == nullptr) { - // turn on - OnCommand_headlightenableleft(Train, Command); - } - else - { - // turn off - OnCommand_headlightdisableleft(Train, Command); + if ((Train->mvOccupied->iLights[vehicleend] & light::headlight_left) == 0) + { + // turn on + OnCommand_headlightenableleft(Train, Command); + } + else + { + // turn off + OnCommand_headlightdisableleft(Train, Command); + } + } else { + // if the light is controlled by 3-way switch, handle both headlight and redmarker + if ((Train->mvOccupied->iLights[vehicleend] & light::headlight_left) == 0 && + (Train->mvOccupied->iLights[vehicleend] & light::redmarker_left) == 0) + { + // turn on + OnCommand_headlightenableleft(Train, Command); + } + else if (Train->mvOccupied->iLights[vehicleend] & light::headlight_left) + { + // switch to red + OnCommand_redmarkerenableleft(Train, Command); + } + else + { + // disable + OnCommand_redmarkerdisableleft(Train, Command); + } } } } @@ -5317,15 +5339,37 @@ void TTrain::OnCommand_headlighttoggleright(TTrain *Train, command_data const &C if (Command.action == GLFW_PRESS) { // only reacting to press, so the switch doesn't flip back and forth if key is held down - if ((Train->mvOccupied->iLights[vehicleend] & light::headlight_right) == 0) + + if (Train->ggRightEndLightButton.SubModel != nullptr || Train->ggRightLightButton.SubModel == nullptr) { - // turn on - OnCommand_headlightenableright(Train, Command); - } - else - { - // turn off - OnCommand_headlightdisableright(Train, Command); + if ((Train->mvOccupied->iLights[vehicleend] & light::headlight_right) == 0) + { + // turn on + OnCommand_headlightenableright(Train, Command); + } + else + { + // turn off + OnCommand_headlightdisableright(Train, Command); + } + } else { + // if the light is controlled by 3-way switch, handle both headlight and redmarker + if ((Train->mvOccupied->iLights[vehicleend] & light::headlight_right) == 0 && + (Train->mvOccupied->iLights[vehicleend] & light::redmarker_right) == 0) + { + // turn on + OnCommand_headlightenableright(Train, Command); + } + else if (Train->mvOccupied->iLights[vehicleend] & light::headlight_right) + { + // switch to red + OnCommand_redmarkerenableright(Train, Command); + } + else + { + // disable + OnCommand_redmarkerdisableright(Train, Command); + } } } } From 7e426192b7962f0e2d0c1610e4639fe746b67fd9 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 10:05:10 +0100 Subject: [PATCH 269/430] fix(cab): a diesel with only the starter button stops its engine with the main switch off command (eu07/maszyna#427) The SM03 had no way to stop its engine. Its fuel pump starts on its own, so the fuel pump switch is ignored; the engine runs the converter feeding the low voltage circuit, so the battery switch doesn't starve the fuel pump either; and its cab has only the starter button, for which TTrain::OnCommand_linebreakeropen() kept a legacy branch which animated the button and returned without opening the circuit. MainSwitch(false) itself stops the engine fine. The command now opens the circuit on diesels whose cab has only the starter button (TMoverParameters::MainCircuitOpensWithStarterOnly()), without animating the button, which held down would start the engine again. Other vehicles with only the button closing the circuit keep ignoring the command. Tests: tests/unit/test_engine_shutdown.cpp, on a shunter made after the SM03. --- McZapkie/MOVER.h | 7 +++ tests/unit/data/diesel_shunter.json | 53 +++++++++++++++++++++ tests/unit/test_engine_shutdown.cpp | 74 +++++++++++++++++++++++++++++ vehicle/Train.cpp | 3 +- 4 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 tests/unit/data/diesel_shunter.json create mode 100644 tests/unit/test_engine_shutdown.cpp diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 199c65a0c..79a73f1a0 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -2466,6 +2466,13 @@ class TMoverParameters { return false == StLinFlag && MainCircuitLampsEnabled(); } + // whether the cab command opening the main circuit opens it where the only cab switch of the circuit is the button + // closing it: on a diesel that's the starter button, and the command is the one way to stop an engine whose fuel pump + // starts on its own (eu07/maszyna#427). the other vehicles with such a button keep ignoring the command + bool MainCircuitOpensWithStarterOnly() const + { + return EngineType == TEngineType::DieselEngine || EngineType == TEngineType::DieselElectric; + } // whether the pumps a joint oil and fuel pump switch works, those not started automatically, are all switched on bool OilFuelPumpsEnabled() const { diff --git a/tests/unit/data/diesel_shunter.json b/tests/unit/data/diesel_shunter.json new file mode 100644 index 000000000..3cbcdb992 --- /dev/null +++ b/tests/unit/data/diesel_shunter.json @@ -0,0 +1,53 @@ +{ + "_comment": "Diesel shunter with a mechanical gearbox, made after the SM03 (Ls150): the fuel pump starts on its own with the engine, a converter run by the engine feeds the low voltage circuit, the only cab control of the engine is the starter button.", + "Param": { "Category": "train", "M": 23200, "Vmax": 25.68, "PWR": 111.855, "SandCap": 200 }, + "Dimensions": { "L": 6.94, "H": 3.21, "W": 2.97, "Cx": 0.3 }, + "Wheels": { "D": 0.94, "Tw": 1.435, "AIM": 250, "Axle": "B", "Ad": 2.5, "Bd": 2.5, "Rmin": 50, "BearingType": "Roll" }, + "Brake": { + "BrakeValve": "K", "NBpA": 2, "MBF": 85.0, "MaxBP": 3.5, "LocMaxBP": 5.0, "BCN": 1, "BCR": 0.114, "BCD": 0.12, "BCM": 10.0, + "HiPP": 5, "LoPP": 3.5, "Vv": 0.3, "MinCP": 7.0, "MaxCP": 8.0, "CompressorSpeed": 0.0125, "CompressorPower": "Main", + "BCS": 0.8, "BSA": 0, "BM": "P10-Bg", "BVV": 40, "BRE": 0.9 + }, + "BuffCoupl": { "CType": "Screw", "kB": 9200, "DmaxB": 0.15, "FmaxB": 740, "kC": 4800, "DmaxC": 0.15, "FmaxC": 780, "beta": 0.58, "AllowedFlag": 3 }, + "Cntrl": { + "BrakeSystem": "Pneumatic", "BDelay1": 15, "BDelay2": 4, "ASB": "Manual", "LocalBrake": "PneumaticBrake", "ManualBrake": "Yes", + "DynamicBrake": "Passive", "MCPN": 9, "SCPN": 7, "AutoRelay": "No", "IniCDelay": 0.5, "SCDelay": 0.1, "BrakeDelays": "P", + "BrakeHandle": "Knorr", "LocBrakeHandle": "Knorr", "FuelStart": "Automatic", "ConverterStart": "Automatic" + }, + "Light": { "Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": 24, "LMaxCurrent": 100 }, + "Engine": { + "EngineType": "DieselEngine", "Trans": "1:1", "nmin": 900, "nmax": 1500, "nmax_cutoff": 1550, "AIM": 100, + "OilMinPressure": 0.343, "OilMaxPressure": 0.686, "WaterCoolingTemperature": 80, "WaterShutters": "yes", "WaterAuxCircuit": "no", + "HeatKFO": 160, "HeatKFO2": 180, "HeatKFS": 160, "HeatKFE": 7, "HeatKW": 2, "HeatKV": 0.3, "IsTC": "No", "EUS": 0.35, "EDS": 1.0 + }, + "_gears": "rows: gear, ratio, engagement speed, top speed; the even ones neutral", + "MotorParamTable": { + "minVelfullengage": 3.8, "engageDia": 1, "engageMaxForce": 800, "engagefriction": 1, + "rows": [ + [0, 0, 0, -1], + [1, 46.88, -1, 5.73], + [2, 0, 0, -1], + [3, 28.65, 2.9, 9.42], + [4, 0, 0, -1], + [5, 17.12, 4.7, 15.69], + [6, 0, 0, -1], + [7, 10.46, 10.6, 100] + ] + }, + "_throttle": "rows: position, fill, speed governor mode; position 0 idles", + "DList": { + "Size": 9, "Mmax": 784.5, "nMmax": 15, "Mnmax": 686.4, "nmax": 25, "nominalfill": 1, "Mstand": 200.0, + "rows": [ + [0, 0.1, 0], + [1, 0.2, 2], + [2, 0.3, 2], + [3, 0.4, 2], + [4, 0.5, 2], + [5, 0.6, 2], + [6, 0.7, 2], + [7, 0.8, 2], + [8, 0.9, 2], + [9, 1.0, 2] + ] + } +} diff --git a/tests/unit/test_engine_shutdown.cpp b/tests/unit/test_engine_shutdown.cpp new file mode 100644 index 000000000..9230330f4 --- /dev/null +++ b/tests/unit/test_engine_shutdown.cpp @@ -0,0 +1,74 @@ +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" + +// stopping the engine of a diesel shunter like the SM03 (eu07/maszyna#427): its fuel pump starts on its own with the +// engine and the engine runs the converter which feeds the low voltage circuit, so neither the fuel pump switch nor the +// battery switch stop it. the cab has only the starter button, and the command opening the main circuit has to stop it + +namespace { + +// the shunter with its engine started from the cab and idling +test::vehicle running_shunter() { + test::vehicle shunter{test::definition::load("diesel_shunter")}; + shunter->CabOccupied = 1; + shunter->CabActivisation(); + shunter->BatterySwitch(true); + shunter->OilPumpSwitch(true); + shunter.run(20.0); // the oil pressure builds up + shunter->MainSwitch(true); + shunter.run(15.0); + return shunter; +} + +} // namespace + +TEST_CASE("engine shutdown: the shunter starts with the starter button") { + auto shunter{running_shunter()}; + REQUIRE(shunter->EngineType == TEngineType::DieselEngine); + REQUIRE(shunter->FuelPump.start_type == start_t::automatic); + CHECK(shunter->Mains); + CHECK(shunter->FuelPump.is_active); + CHECK(shunter->enrot > 0.9 * shunter->dizel_nmin); +} + +TEST_CASE("engine shutdown: neither the fuel pump switch nor the battery switch stop the engine") { + auto shunter{running_shunter()}; + shunter->FuelPumpSwitchOff(true, range_t::local); // the pump started automatically ignores its switch + shunter.run(10.0); + CHECK(shunter->Mains); + shunter->BatterySwitch(false); + shunter.run(10.0); + CHECK(shunter->Power110vIsAvailable); // the converter run by the engine keeps feeding the fuel pump + CHECK(shunter->Mains); + CHECK(shunter->enrot > 0.9 * shunter->dizel_nmin); +} + +TEST_CASE("engine shutdown: the command opening the main circuit stops the engine and it stays stopped") { + auto shunter{running_shunter()}; + REQUIRE(shunter->MainCircuitOpensWithStarterOnly()); // the cab passes the command on with only the starter button + CHECK(shunter->MainSwitch(false)); + shunter.run(20.0); + CHECK_FALSE(shunter->Mains); + CHECK_FALSE(shunter->FuelPump.is_active); + CHECK(shunter->enrot == 0.0); +} + +TEST_CASE("engine shutdown: the engine starts again after it was stopped") { + auto shunter{running_shunter()}; + shunter->MainSwitch(false); + shunter.run(20.0); + REQUIRE(shunter->enrot == 0.0); + shunter->MainSwitch(true); + shunter.run(15.0); + CHECK(shunter->Mains); + CHECK(shunter->enrot > 0.9 * shunter->dizel_nmin); +} + +TEST_CASE("engine shutdown: vehicles without a diesel keep ignoring the command with only the button closing the circuit") { + test::vehicle wagon{test::definition::load("wagon")}; + CHECK_FALSE(wagon->MainCircuitOpensWithStarterOnly()); + test::vehicle electric{test::definition::load("wagon").set("Engine", "EngineType", "ElectricSeriesMotor")}; + REQUIRE(electric->EngineType == TEngineType::ElectricSeriesMotor); + CHECK_FALSE(electric->MainCircuitOpensWithStarterOnly()); +} diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index 201b8972f..1b7d06a8f 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -3702,13 +3702,14 @@ void TTrain::OnCommand_linebreakeropen(TTrain *Train, command_data const &Comman { Train->ggMainButton.UpdateValue(0.0, Train->dsbSwitch); } - else if (Train->ggMainOnButton.SubModel != nullptr) + else if (Train->ggMainOnButton.SubModel != nullptr && false == Train->mvControlled->MainCircuitOpensWithStarterOnly()) { // NOTE: legacy behaviour, for vehicles equipped only with impulse close switch // it doesn't make any real sense to animate this one, but some people can't get over how there's no visual reaction to their keypress Train->ggMainOnButton.UpdateValue(1.0, Train->dsbSwitch); return; } + // a diesel with only the starter button gets its engine stopped. the button stays put: held down, it would start the engine again // play sound immediately when the switch is hit, not after release Train->fMainRelayTimer = 0.0f; From d90edb698033c66ccc93e1c447c53269dbeaa9e9 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 14:06:58 +0100 Subject: [PATCH 270/430] fix(cab): on the SU45 and SU46 the open line contactors lamp lights with the contactors opened by the pressure switch (eu07/maszyna#263) On the electric locomotives the lamp of the open line contactors tells the start can be made, so it goes out with the start cut off by the pressure switch. The diesel-electric SU45 and SU46 (the only diesel-electrics with the lamp) use it just to show the contactors are open, but it went out the same way: with too low a pressure in the main pipe the contactors were open and the lamp out. Once the pressure came back with the master controller past the first position, the contactors stayed open, as they should, and the lamp lit up on a power position, which looked like the lamp working the other way round. On the diesel-electrics TMoverParameters::LineContactorsLampLit() now follows the contactors alone; the electric locomotives and the other main circuit lamps are unchanged. Tests: tests/unit/test_line_contactors.cpp, on a locomotive made after the SU46. --- McZapkie/MOVER.h | 8 +++- tests/unit/data/diesel_electric.json | 46 ++++++++++++++++++ tests/unit/test_line_contactors.cpp | 71 ++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 1 deletion(-) create mode 100644 tests/unit/data/diesel_electric.json diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 199c65a0c..a34d537f4 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -2461,9 +2461,15 @@ class TMoverParameters { return false == ControlPressureSwitch && (HasControlPressureSwitch || BrakePress < 1.0); } - // whether the lamp of the open line contactors is lit, telling the start can be made + // whether the lamp of the open line contactors is lit. on the electric locomotives it tells the start can be made, so + // it goes out with the start cut off; on the diesel-electric ones (the SU45 and SU46 family) it just tells the + // contactors are open, whatever opened them: the master controller at 0, or the pressure switch (eu07/maszyna#263) bool LineContactorsLampLit() const { + if (EngineType == TEngineType::DieselElectric) + { + return false == StLinFlag; + } return false == StLinFlag && MainCircuitLampsEnabled(); } // whether the pumps a joint oil and fuel pump switch works, those not started automatically, are all switched on diff --git a/tests/unit/data/diesel_electric.json b/tests/unit/data/diesel_electric.json new file mode 100644 index 000000000..bef605880 --- /dev/null +++ b/tests/unit/data/diesel_electric.json @@ -0,0 +1,46 @@ +{ + "_comment": "Diesel-electric locomotive made after the SU46 (303D): the line contactors close on the first power position of the master controller, the pressure switch (on by default) opens them with too low a pressure in the main pipe or the brakes applied.", + "Param": { "Category": "train", "M": 105000, "Mred": 15000, "Vmax": 120, "PWR": 1400, "SandCap": 400 }, + "Dimensions": { "L": 18.99, "H": 4.292, "W": 2.904, "Cx": 0.3 }, + "Wheels": { "D": 1.1, "AIM": 4000, "Tw": 1.435, "Axle": "Co'Co'", "Ad": 1.75, "Bd": 10.3, "Rmin": 100 }, + "Brake": { + "BrakeValve": "LSt", "NBpA": 4, "MBF": 85.0, "MaxBP": 4.4, "LocMaxBP": 4.4, "MaxASBP": 1.3, "RM": 0.71, "BCN": 12, "BCR": 0.114, + "BCD": 0.06, "BCM": 5.84, "HiPP": 5, "LoPP": 3.5, "Vv": 0.9, "MinCP": 7, "MaxCP": 8.5, "CompressorSpeed": 0.05, "BCS": 1, "BSA": 2, + "BM": "P10-Bgu", "CompressorPower": "Converter", "BVV": 200, "BRE": 0.8 + }, + "BuffCoupl": { "CType": "Screw", "kB": 9200, "DmaxB": 0.15, "FmaxB": 740, "kC": 4800, "DmaxC": 0.15, "FmaxC": 780, "beta": 0.58, "AllowedFlag": 103 }, + "Cntrl": { + "BrakeHandle": "FV4a", "LocBrakeHandle": "FD1", "BrakeSystem": "Pneumatic", "BDelay1": 15, "BDelay2": 6, "BDelay3": 36, "BDelay4": 32, + "ASB": "Manual", "LocalBrake": "PneumaticBrake", "MCPN": 15, "SCPN": 4, "AutoRelay": "Yes", "IniCDelay": 0.5, "SCDelay": 0.1, + "BrakeDelays": "GPR", "ConverterStart": "Automatic", "ConverterStartDelay": 10 + }, + "Light": { "Light": "Generator", "LGeneratorEngine": "ElectricSeriesMotor", "LMaxVoltage": 110, "LMaxCurrent": 100 }, + "Engine": { + "AIM": 1.6, "EngineType": "DumbDE", "Trans": "18:62", "Ftmax": 317000, "Flat": 0, "Vhyp": 15.0, "Vadd": 3.8, "Cr": 1.0, "RelayType": 46, + "OilMinPressure": 0.055, "OilMaxPressure": 0.6, "WaterMinTemperature": 40, "WaterMaxTemperature": 92, "WaterCoolingTemperature": 76, + "HeatKW": 0.068599, "HeatKV": 0.3, "HeatKFE": 1, "HeatKFS": 87.76269, "HeatKFO": 26.72716, "HeatKFO2": 57.72 + }, + "Circuit": { "CircuitRes": 0.01, "ImaxLo": 3300, "IminLo": 2500 }, + "_power": "rows: engine speed [rpm], power [kW], generator voltage limit, current limit, one per master controller position", + "WWList": { + "Size": 15, + "rows": [ + [696, 0, 0, 0], + [696, 0, 0, 0], + [696, 80, 350, 1000], + [696, 80, 350, 1000], + [763, 214, 455, 1400], + [830, 321, 500, 1600], + [897, 428, 545, 1800], + [964, 535, 590, 2000], + [1031, 642, 635, 2200], + [1098, 748, 680, 2400], + [1165, 855, 725, 2600], + [1232, 962, 770, 2800], + [1299, 1069, 815, 3000], + [1366, 1176, 865, 3200], + [1433, 1283, 910, 3400], + [1500, 1390, 960, 3600] + ] + } +} diff --git a/tests/unit/test_line_contactors.cpp b/tests/unit/test_line_contactors.cpp index 79c419edf..fd7e24f08 100644 --- a/tests/unit/test_line_contactors.cpp +++ b/tests/unit/test_line_contactors.cpp @@ -57,3 +57,74 @@ TEST_CASE("line contactors: the ground relay and overload lamps follow the same vehicle->MotorConnectorsCheck(); CHECK_FALSE(vehicle->MainCircuitLampsEnabled()); } + +// on the diesel-electric SU45 and SU46 (eu07/maszyna#263) the lamp tells just the line contactors are open: lit with the +// master controller at 0 and with the start cut off by too low a pressure in the main pipe, out on the power positions + +namespace { + +// the diesel-electric locomotive with its engine running and the brakes released, the master controller at 0 +test::vehicle diesel_electric() { + test::vehicle vehicle{test::definition::load("diesel_electric")}; + vehicle->CabOccupied = 1; + vehicle->CabActivisation(); + vehicle->BatterySwitch(true); + vehicle->OilPumpSwitch(true); + vehicle->FuelPumpSwitch(true); + vehicle.run(20.0); // the oil pressure builds up + vehicle.hold_brake_pipe(5.0); // bar + vehicle->MainSwitch(true); + vehicle.run(30.0); + vehicle->DirectionForward(); + vehicle.run(60.0); // the brakes release + return vehicle; +} + +} // namespace + +TEST_CASE("line contactors: on a diesel-electric the lamp is lit at 0 and goes out on a power position") { + auto vehicle{diesel_electric()}; + REQUIRE(vehicle->EngineType == TEngineType::DieselElectric); + REQUIRE(vehicle->Mains); + REQUIRE_FALSE(vehicle->ControlPressureSwitch); + CHECK_FALSE(vehicle->StLinFlag); + CHECK(vehicle->LineContactorsLampLit()); + + vehicle->IncMainCtrl(1); + vehicle.run(3.0); + CHECK(vehicle->StLinFlag); + CHECK_FALSE(vehicle->LineContactorsLampLit()); + + vehicle->DecMainCtrl(1); + vehicle.run(3.0); + CHECK_FALSE(vehicle->StLinFlag); + CHECK(vehicle->LineContactorsLampLit()); +} + +TEST_CASE("line contactors: on a diesel-electric the lamp lights with the contactors opened by too low a main pipe pressure") { + auto vehicle{diesel_electric()}; + vehicle->IncMainCtrl(1); + vehicle.run(1.0); + vehicle->IncMainCtrl(1); + vehicle.run(2.0); + REQUIRE(vehicle->StLinFlag); + + vehicle.hold_brake_pipe(2.5); // bar, below the 3.6 bar of the pressure switch + vehicle.run(10.0); + REQUIRE(vehicle->ControlPressureSwitch); + CHECK_FALSE(vehicle->StLinFlag); + CHECK(vehicle->LineContactorsLampLit()); // it went out here + CHECK_FALSE(vehicle->MainCircuitLampsEnabled()); // the ground relay and overload lamps still go out with the start cut off + + // the pressure back, the contactors stay open on the second position and the lamp stays lit, as it should; + // they close again only on the first one + vehicle.hold_brake_pipe(5.0); + vehicle.run(60.0); + REQUIRE_FALSE(vehicle->ControlPressureSwitch); + CHECK_FALSE(vehicle->StLinFlag); + CHECK(vehicle->LineContactorsLampLit()); + vehicle->DecMainCtrl(1); + vehicle.run(3.0); + CHECK(vehicle->StLinFlag); + CHECK_FALSE(vehicle->LineContactorsLampLit()); +} From 439e892abdaeac36bb76f3df2c8f926f76791477 Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Sat, 7 Nov 2026 15:35:35 +0100 Subject: [PATCH 271/430] AI: use the locomotive releaser only when starting off The rule "wyluzuj lokomotywe, to szybciej ruszymy" released the locomotive's own brake whenever power was asked for and the locomotive cylinder held more than 0.4 bar. It had no speed condition, so it also fired in motion, at 50-75 km/h, right after an application. On a locomotive with the EStED distributor (E186) this vented the control reservoir; with the pipe not yet recharged the locomotive brake then faded to nothing at the next application. The rule is meant for starting off, so it now applies only below 1 km/h. --- vehicle/Driver.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 2311ffacf..8d2a3fac6 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -8292,8 +8292,11 @@ void TController::control_releaser() { } } // wyluzuj lokomotywę, to szybciej ruszymy + // this rule is for starting off, so only below 1 km/h: at speed, just after an application, it would vent + // the control reservoir of a locomotive that may have to brake again before the pipe has refilled it if( mvOccupied->BrakePress > 0.4 - && mvOccupied->Hamulec->GetCRP() > 4.9 ) { + && mvOccupied->Hamulec->GetCRP() > 4.9 + && mvOccupied->Vel < 1.0 ) { actuate = true; } // keep engine brakes released during coupling/uncoupling From fddeea8b0e48e3bda81c3da5c90cb729eb8d3e31 Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Sat, 7 Nov 2026 15:35:35 +0100 Subject: [PATCH 272/430] AI: use the locomotive releaser only when starting off The rule "wyluzuj lokomotywe, to szybciej ruszymy" released the locomotive's own brake whenever power was asked for and the locomotive cylinder held more than 0.4 bar. It had no speed condition, so it also fired in motion, at 50-75 km/h, right after an application. On a locomotive with the EStED distributor (E186) this vented the control reservoir; with the pipe not yet recharged the locomotive brake then faded to nothing at the next application. The rule is meant for starting off, so it now applies only below 1 km/h. --- vehicle/Driver.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 08f0c0d24..97ec36470 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -8057,8 +8057,11 @@ void TController::control_releaser() { } } // wyluzuj lokomotywę, to szybciej ruszymy + // this rule is for starting off, so only below 1 km/h: at speed, just after an application, it would vent + // the control reservoir of a locomotive that may have to brake again before the pipe has refilled it if( mvOccupied->BrakePress > 0.4 - && mvOccupied->Hamulec->GetCRP() > 4.9 ) { + && mvOccupied->Hamulec->GetCRP() > 4.9 + && mvOccupied->Vel < 1.0 ) { actuate = true; } // keep engine brakes released during coupling/uncoupling From 939e42b611f3015f3f1bc5c1f0fe3be7b964b916 Mon Sep 17 00:00:00 2001 From: maj00r <73280030+maj00r@users.noreply.github.com> Date: Sat, 7 Nov 2026 16:17:57 +0100 Subject: [PATCH 273/430] docs: CLAUDE.md with the team's notes for Claude Code (#258) * docs: CLAUDE.md with the team's notes for Claude Code The rules Claude Code sessions kept relearning, shared with the team: - the code builds and behaves the same with GCC 13 (Linux CI and the Sonar build) as with MSVC, with the MSVC leniencies to watch for; - every SonarCloud remark on the changed code gets fixed without changing behaviour, with the recipes for the rules that keep coming up; - building, the unit tests, scripted editor runs, the game data and the profile folders, and GPU hangs; - the game data in the asset SVN and backward compatibility: existing files keep being read as before, new entries are optional, code falls back without new assets and a change that uses them says so in its commit message, what the editor saves stays readable by the current release, new features can be turned off in eu07.ini and don't change the look of existing data abruptly; StarterNG is the official starter. * docs: CLAUDE.md on the move to OpenGL 4.6 and Vulkan betterRenderer/ is to be removed and the OpenGL 3.3 and legacy renderers are being replaced by feat/gl46-migration (PR #216, a draft with milestone 27.04). Work on that code and on the shaders is kept to fixes and to what a feature on master needs to be drawn, with the PR saying where the branch has the counterpart. --------- Co-authored-by: maj00r --- CLAUDE.md | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) create mode 100644 CLAUDE.md diff --git a/CLAUDE.md b/CLAUDE.md new file mode 100644 index 000000000..c1709be8d --- /dev/null +++ b/CLAUDE.md @@ -0,0 +1,163 @@ +# MaSzyna: notes for Claude Code + +## The code builds and works with GCC, not only MSVC + +The Linux CI (`.github/workflows/build.yml`) builds with GCC 13 on ubuntu-24.04, through the Sonar build-wrapper, and `sonar.yml` +analyses that build once it has passed. A change that compiles with MSVC only fails there, and a failed GCC build also leaves Sonar +without an analysis of the PR. So every change has to compile with GCC, and behave the same with it, as well as with MSVC. The CI +builds with `-DWITH_BETTER_RENDERER=OFF` and Sonar excludes `betterRenderer/`, so that part is neither built on CI nor analysed. + +Where no GCC is at hand, read the new code for what MSVC lets through and GCC doesn't: + +- `constexpr` initialised from a floating or class-type constant declared only `const`: make the source `constexpr` too. +- Standard headers MSVC pulls in through others: include them yourself. For example, `` for `std::views`, ``, + ``, ``, ``, `` and ``. +- `typename` and `this->` where a template needs them. +- A temporary bound to a non-const reference. +- Explicit specialisations inside a class. +- A name a class uses and then declares again in its own body (GCC: "changes meaning"). +- A nested type with default member initialisers used as a default argument inside the class that encloses it. +- A declaration changed in a header (`const`, parameters) without its definition, or a new member function defined but not declared. +- `std::ifstream` / `std::ofstream` opened with a `std::wstring`. +- MSVC-only functions: `_stricmp`, `sprintf_s`, `fopen_s`, `localtime_s` and the like. +- Designated initialisers out of declaration order. +- `emplace_back(a, b, c)` with parenthesised aggregate initialisation is fine on GCC 13, but not for `std::array`. There is no brace + elision in parentheses, so build a named local instead. + +The same behaviour needs portable code. Don't rely on the order arguments are evaluated in, on the signedness of `char`, on the size of +`wchar_t`, or on `long` being 32 bits. + +## SonarCloud: every remark on the changed code gets fixed + +SonarCloud (`sonar.yml`, `sonar-project.properties`) analyses each PR. A PR counts as finished only when every remark Sonar raises on +the code it changes is fixed. That means the code smells too, not just the bugs, the vulnerabilities and the quality gate. The analysis +runs on the GCC build, so a PR that fails to build with GCC gets no analysis at all. + +Fixing a remark must not change what the code does: + +- Keep the order of side effects, the conditions and the floating-point results as they were. +- Text in `STR(...)`, `STR_C(...)` and `_(...)` is looked up in the translations (`lang/*.po`), so it stays byte for byte the same. + The same goes for what is written to the log. +- `// NOSONAR: ` is only for a real false positive, or where a fix would change behaviour. Use it rarely, always with the + reason. + +Write new code so that it doesn't raise the rules that keep coming up: + +- **S134** (nesting deeper than 3 `if` / `for` / `while` / `switch` / `try`) and **S3776** (cognitive complexity over 25): + - use early `continue` / `return`; + - move loop bodies and branches into named helpers, preferably free functions in the anonymous namespace; + - group the state of a long algorithm in a small struct with methods. + + Every `else if`, every `&&` / `||` sequence and every nested lambda adds to the complexity. +- **S1188**: a lambda over 20 lines becomes a named function. +- **S107**: a function with more than 7 parameters takes a struct. +- **S3608**: lambdas capture explicitly (`[this, &points]`, not `[&]` or `[=]`). The only exception is `[&]` on a lambda passed + straight to a standard algorithm; `[=]` is flagged even there, and so is `[&]` passed to one of our own functions. +- **S6197** / **S5566**: use the `std::ranges::` algorithm that takes the container rather than a begin/end pair or a hand-written + loop. +- **S6165**: use `std::erase_if` rather than erase-remove. +- **S6004**: a variable used only by the condition is declared in the `if (init; condition)`. +- **S3358**: no nested `?:`; use an `if` or a small function. +- **S1121**: no assignment inside an expression, chained ones included (`a = b = c`). +- **S1117**: no declaration shadowing a local, a member or an enumerator. +- **S6003**: `v.emplace_back(a, b, c)` rather than `v.push_back({a, b, c})`. For a `std::array` element, push a named local instead + (see the GCC notes above). +- **S6012**: let class template argument deduction work: `std::vector values{1.0, 2.0}`. +- **S5945**: `std::array` / `std::vector` / `std::string`, not C arrays. +- **S1659**: one declaration per statement. +- **S6009**: `std::string_view` rather than `std::string const &` for a string parameter that is only read. +- **S6185** / **S6494**: `std::format` rather than concatenation or `snprintf`. +- **S924**: at most one `break` per loop. +- **S886**: a `for` whose counter changes in its body becomes a `while`. +- **S5997**: `std::scoped_lock` rather than `std::lock_guard`. +- **S6168**: `std::jthread` rather than `std::thread`. A `std::jthread` joins in its destructor where a `std::thread` would + terminate, so in existing code switch only where the thread is always joined or detached before it is destroyed. +- **S6177**: `using enum` where a function names many enumerators. +- **S5350** / **S995**: `const` on references and pointers that aren't written through. +- **S5817**: `const` on member functions that change nothing. +- **S2193**: no `float` loop counters. +- **S5421**: no non-const globals. +- **S6179**: `std::lerp` rather than a hand-written interpolation, in new code. In existing code only where it gives the very same + result. +- **S6164**: `std::numbers::pi` rather than a literal, in new code. In existing code only where it gives the very same result. + +The project is C++20 (`CMAKE_CXX_STANDARD 20`), so no C++23 library addition is available on any compiler. That rules out +`std::ranges::to`, `views::zip`, `views::enumerate`, `ranges::contains`, `std::print` and `std::expected`. + +## Renderers: the move to OpenGL 4.6 and Vulkan + +The renderers on `master` are to be replaced. `feat/gl46-migration` (PR #216, a draft with milestone 27.04, to be merged after the +26.11 release) replaces the OpenGL 3.3 renderer with an OpenGL 4.6 core one and adds a Vulkan 1.4 renderer beside it. It also +removes the legacy OpenGL 2.1, the OpenGL ES / ANGLE and the NVRHI (`betterRenderer/`) paths. + +- `betterRenderer/` will be removed. Don't put work into it. +- On that branch, of the `rendering/opengl*` files only `openglcamera.*` and `openglmatrixstack.*` stay. The whole + `rendering/opengl33*` family and the rest of the legacy `rendering/opengl*` go, and the new renderers are in + `rendering/opengl46/`, `rendering/vulkan14/` and `rendering/common/`. The shared `rendering/renderer.*`, `geometrybank.*`, + `particles.*` and the like stay. The shaders move from `shaders/` to `shaders/ogl46/` and `shaders/vk14/`. +- So a change on `master` to the code that goes away, or to the shaders, may be pointless. Keep it to fixes and to what a feature + on `master` needs in order to be drawn at all. For such a change, say in the PR where `feat/gl46-migration` has the counterpart, + or that the branch already carries the change. + +## Building, testing and running + +- The unit tests (`tests/unit`) run at the end of the build, which prints `Unit tests: N/N passed` and fails on any failed case. + `-DWITH_TESTS=OFF` builds the game without them. +- A new feature goes on its own branch from `master`, not on whatever branch is checked out. Say which branch the work lands on + before the first edit. A fresh worktree has empty submodules, so it doesn't build until they are filled. +- The editor runs a script when `EU07_EDITOR_SELFTEST=` is set: one command per line, `#` for comments. The commands are in + `application/editormodeselftest*.cpp` (`camera`, `wait`, `select`, `lay`, `screenshot`, `save`, `quit` and many more). + - Run it on a copy of the scenery, never on the original, and delete the copy afterwards. + - Give every run a timeout and keep an eye on its memory. A loop gone wrong can fill the RAM of the whole machine. + - `screenshot` only queues the grab and waits 3 frames; the image is written later on another thread. A click right after it + has been seen to lose the selection, so leave a `wait` of about 15 frames after a `screenshot` before clicking. +- At run time the editor's texts load from `lang/editor_.po` in the game folder (`utilities/translation.cpp`), not from + the build. New strings of a branch show in English until that file has them. Without the `fonts` folder Polish letters show as `?`. +- When a build runs on a copy of the game data made of links to the real folders, turn off whatever writes into the data + (`convertmodels 0` in `eu07.ini`), or the run changes the real game folder through the links. +- A test of code that moves, migrates or deletes files in the user's profile (`%APPDATA%`, `%LOCALAPPDATA%`, caches) gets its own + test folder. Never point it at the real profile. +- A GPU hang (Windows TDR) can freeze the whole machine, not just the game. Don't test a hang hypothesis by running it. Guard the + code against what causes it (degenerate geometry, NaN in the camera or in transforms) and read the `LiveKernelEvent` / watchdog + dumps instead. +- PowerShell variable names are case-insensitive: `$Track` and `$track` are the same variable. + +## Game data and backward compatibility + +The code and the game data live apart. The assets (sceneries, vehicles with their `.fiz` and `.mmd`, models, textures, sounds, +timetables, most of `lang` and the shipped `eu07.ini`) are in a separate SVN repository, `https://svn.eu07.pl/pctga`. It needs an +account; there is no anonymous checkout. Of `lang/`, only `editor_pl.po` is in this repository. Players install and +launch the game through Steam, GOG and the like, and run new builds on the data they already have. + +The official starter is StarterNG (`https://github.com/MaSzyna-EU07/StarterNG`), a separate repository; the older +`MaSzyna-EU07/Starter` is not the one in use. `launcher/` in this repository is the simulator's built-in scenario and vehicle +picker (`launcher_mode`), not StarterNG. + +- Every existing file must still be read the way it was. Don't rename or drop a keyword, change the meaning or the unit of a value, + or make an optional entry required. This holds for every format the game reads: for example `.scn` and its includes, `.fiz`, + `.mmd`, `.e3d` / `.t3d`, `.mat`, the `.txt` timetables and track profiles, `eu07.ini` and the Python screens. +- A bug fix may change what an existing file leads to, such as how a vehicle from its `.fiz` behaves, as long as the PR says so. +- Something new in a format is optional, and without it the code does exactly what it did before. A file that loaded correctly + before doesn't get new warnings or errors in the log. A real fault that is newly detected may be logged. +- A code change must not need a change in the SVN to work. Where it uses new or changed assets, it falls back to the old behaviour + without them, and the PR says what is to be added to the SVN and in what order the two go in. +- A change that uses new or changed assets (and falls back without them, see above) says so plainly in its commit message: which + files, and what is to change in them. It is never left implied. Before such a commit, either make the asset change right away in + the user's SVN working copy, or get the user's agreement to leave it for later. Ask the user where their SVN working copy is; the + installed game folder is not one. Pushing to git and committing to the SVN both need the user's consent. +- A scenery saved by the editor without using a new feature holds nothing the current release can't read. The entries of a new + feature (such as a new kind of node) appear only where that feature was used, and the PR says that the release doesn't read + them. +- Saving patches the scenery files by byte spans: unchanged definitions stay byte for byte, and an edited node is written anew by + its `export_as_text`. A change to saving must not widen what gets rewritten, nor make `export_as_text` drop more of an edited + node (comments, unknown tokens) than it did before. +- A new feature that changes what the simulator does or shows with existing sceneries and vehicles can be turned off in + `eu07.ini`, and turned off, the simulator behaves as it did before the feature. Editor tools and new optional entries of a + format are covered by the points above. The key is parsed in `utilities/Globals.cpp` (`global_settings::ConfigParse*`) and + written by `global_settings::export_as_text`, which puts the settings in the log at start. `eu07.ini` is read from the user's + profile (`user_config_path`), and from the game folder only when the profile has none; test the switch in the file that is + actually read. +- A feature doesn't make existing sceneries and vehicles look suddenly different after an update. A change to how things look is + something the player turns on, or comes in gradually. +- When a format really has to change, read both the old and the new form, and say in the PR what changes for the data and for + the people who make it. From 798fd89dd0fc616967485a06530f9b40a88791e9 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Wed, 30 Sep 2026 19:16:46 +0200 Subject: [PATCH 274/430] test: scenario tests that run the simulator and check a vehicle's physicslog tests/scenarios/run.py builds a test scenery from a game install's scenery (own trainsets removed, case fragment added), runs eu07 in ghostview with physicslog on, and checks what the vehicle did: starts, max speed, brakes, stops. First case: EU07 on td.scn driven by AI on the td/rozklad timetable, with the Stacja1 exit route set by an event launcher instead of shift+4. eu07 gets a -ini option: an extra settings file read after eu07.ini, so a test run can switch to a window and turn on physicslog without touching the user's config. Local only: scenery and vehicle data are not in the repo. --- application/application.cpp | 12 +- tests/scenarios/.gitignore | 2 + tests/scenarios/README.md | 66 ++++ tests/scenarios/cases/eu07_td_timetable.json | 15 + tests/scenarios/cases/eu07_td_timetable.scn | 11 + tests/scenarios/run.py | 330 +++++++++++++++++++ 6 files changed, 435 insertions(+), 1 deletion(-) create mode 100644 tests/scenarios/.gitignore create mode 100644 tests/scenarios/README.md create mode 100644 tests/scenarios/cases/eu07_td_timetable.json create mode 100644 tests/scenarios/cases/eu07_td_timetable.scn create mode 100644 tests/scenarios/run.py diff --git a/application/application.cpp b/application/application.cpp index 9b7b82853..ee381f98b 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -1195,12 +1195,22 @@ int eu07_application::init_settings(int Argc, char *Argv[]) WriteLog(std::format("seed given on the command line: {} -> {}", Argv[i], Global.random_seed)); } } + else if (token == "-ini") + { + // extra settings file read on top of eu07.ini, so a run can override a few keys + // (window size, physicslog...) without touching the user's own config + if (i + 1 < Argc) + { + Global.LoadIniFile(Argv[++i]); + } + } else { std::cout << "usage: " << std::string(Argv[0]) << " [-s sceneryfilepath]" << " [-v vehiclename]" << " [-edit [sceneryfilepath]]" - << " [-seed number|word]" << std::endl; + << " [-seed number|word]" + << " [-ini settingsfile]" << std::endl; return -1; } } diff --git a/tests/scenarios/.gitignore b/tests/scenarios/.gitignore new file mode 100644 index 000000000..ea93687fe --- /dev/null +++ b/tests/scenarios/.gitignore @@ -0,0 +1,2 @@ +out/ +__pycache__/ diff --git a/tests/scenarios/README.md b/tests/scenarios/README.md new file mode 100644 index 000000000..77edb5a93 --- /dev/null +++ b/tests/scenarios/README.md @@ -0,0 +1,66 @@ +# Scenario tests + +End-to-end checks that run the real simulator on a scenery and look at what a vehicle +did: did it start, did it keep to the speed limit, did it brake and stop. + +Scenery and vehicle data are not in this repo, so these run against a local game install +only, not in CI. + +## Running + +``` +python tests/scenarios/run.py --game-dir "E:/Program Files (x86)/Steam/steamapps/common/MaSzyna" +``` + +Python 3.10+, no extra packages. Options: + +- `EU07_GAME_DIR` can replace `--game-dir`. +- `--exe path/to/eu07.exe` picks the build to test; the default is the newest + `cmake-build-*/bin/Release/eu07*.exe`. The build needs the `-ini` command line option. +- name one or more cases to run only those, e.g. `run.py ... eu07_td_timetable`. +- `--timespeed 4` runs the simulation faster than real time. + +Exit code is 0 when every case passed. Logs of each run (`log.txt`, `errors.txt`, +the vehicle's physicslog) land in `tests/scenarios/out//`. + +## How it works + +For each case the runner: + +1. writes `scenery/autotest_.scn` into the game dir: the base scenery with its own + trainsets removed, the start time changed if the case says so, and the case's `.scn` + fragment added: its trainsets after `FirstInit`, everything else (event launchers standing + in for keys the scenery expects a player to press, extra events) before it, +2. starts the simulator with `-s autotest_.scn -v ghostview -ini out//autotest.ini`; + ghostview leaves every train to the AI, and the extra ini turns on `physicslog`, + runs in a 1280x720 window and does not pause when the window loses focus, +3. waits until `physicslog/.dat` covers `duration` seconds, then closes the simulator, +4. runs the checks on the physicslog. + +## Writing a case + +`cases/.json`: + +| key | meaning | +| --- | --- | +| `base_scenery` | scenery file in the game's `scenery/` dir | +| `strip_trainsets` | drop the base scenery's trainsets (default `true`) | +| `time` | replace the scenery start time, `HH:MM` | +| `fragment` | `.scn` file in `cases/` added to the scenery: trainsets after `FirstInit` (before it they derail on unlinked track), the rest before it (launchers read after it never fire) | +| `vehicle` | node name of the vehicle whose physicslog is checked | +| `duration` | seconds of simulation to record | +| `timeout` | wall-clock seconds before giving up, loading included | +| `fail_on_errors` | fail when `errors.txt` is not empty (default `false`) | +| `checks` | list of checks, below | + +Checks (speeds in km/h, times in seconds of physicslog time): + +- `starts` `min_speed`, `within`: reaches `min_speed` within `within` seconds. +- `max_speed` `limit`, `tolerance`: never goes faster than `limit + tolerance`. +- `brakes` `min_pressure`: after moving off, brake cylinder pressure reaches `min_pressure` bar + (physicslog pressures are in bar whatever its header says; the brake pipe runs at 5.0). +- `stops` `moving_speed`, `stop_speed`, `hold`: after reaching `moving_speed`, stays at or + below `stop_speed` for `hold` seconds. + +New check types go in `CHECKS` in `run.py`; each gets the physicslog rows and the check's +parameters and returns `(passed, detail)`. diff --git a/tests/scenarios/cases/eu07_td_timetable.json b/tests/scenarios/cases/eu07_td_timetable.json new file mode 100644 index 000000000..c12b8ae71 --- /dev/null +++ b/tests/scenarios/cases/eu07_td_timetable.json @@ -0,0 +1,15 @@ +{ + "description": "EU07 on td.scn, AI driver on the td/rozklad timetable: starts from Stacja1, keeps to the speed limit, brakes to a stop at Przystanek.", + "base_scenery": "td.scn", + "time": "10:34", + "fragment": "eu07_td_timetable.scn", + "vehicle": "autotest_eu07", + "duration": 240, + "timeout": 600, + "checks": [ + { "type": "starts", "min_speed": 20, "within": 150 }, + { "type": "max_speed", "limit": 90, "tolerance": 3 }, + { "type": "brakes", "min_pressure": 0.5 }, + { "type": "stops", "moving_speed": 20, "stop_speed": 0.5, "hold": 5 } + ] +} diff --git a/tests/scenarios/cases/eu07_td_timetable.scn b/tests/scenarios/cases/eu07_td_timetable.scn new file mode 100644 index 000000000..c8044e467 --- /dev/null +++ b/tests/scenarios/cases/eu07_td_timetable.scn @@ -0,0 +1,11 @@ +// added by tests/scenarios/run.py to the base scenery, whose own trainsets were removed: +// the trainset goes after FirstInit, the launcher before it. +// the EU07 stands where td.scn keeps its timetable train and gets the same timetable. +trainset td/rozklad tdo_n1734 0.0 0.1 +node -1 0 autotest_eu07 dynamic pkp\4e_v1 4e-004 4e 0 headdriver 0 0 enddynamic +endtrainset + +// td.scn sets routes from the keyboard (shift+1..4 run events keyctrl01..04). keyctrl04 is the +// way out of the track the train stands on: switch zwr02 and the exit signal stacja1_j at 40. +// a launcher with a positive time fires once at that hour (HHMM), radius -1 means anywhere. +node -1 0 autotest_route eventlauncher 0 0 0 -1 none 1034 keyctrl04 end diff --git a/tests/scenarios/run.py b/tests/scenarios/run.py new file mode 100644 index 000000000..ad1f51ee7 --- /dev/null +++ b/tests/scenarios/run.py @@ -0,0 +1,330 @@ +#!/usr/bin/env python3 +"""Scenario tests: run the real simulator on a scenery and check what a vehicle did. + +A case (cases/.json) names a base scenery from the game install, a fragment +appended to it (usually a trainset with an AI driver), and checks on the vehicle's +physics log. The runner: + + 1. builds scenery/autotest_.scn in the game dir: the base scenery with its own + trainsets removed, optionally a different start time, and the case fragment appended, + 2. starts eu07 with that scenery in ghostview (every train driven by AI) and an extra + settings file (-ini) that turns on physicslog and runs in a window, + 3. waits until the vehicle's physicslog covers `duration` seconds of simulation, + then closes the simulator, + 4. evaluates the checks on the log and prints PASS/FAIL per check. + +Scenery and vehicle data are not part of this repo, so this runs against a local game +install only (--game-dir or EU07_GAME_DIR), not in CI. + +Usage: + python tests/scenarios/run.py --game-dir "E:/.../MaSzyna" # all cases + python tests/scenarios/run.py --game-dir ... eu07_td_timetable # chosen cases +""" + +from __future__ import annotations + +import argparse +import json +import os +import re +import shutil +import subprocess +import sys +import time +from dataclasses import dataclass, field +from pathlib import Path + +HERE = Path(__file__).resolve().parent +REPO = HERE.parents[1] +CASES_DIR = HERE / "cases" +OUT_DIR = HERE / "out" + +# physicslog columns, see TController::PhysicsLog() in vehicle/Driver.cpp. +# Velocity is in km/h and pressures in bar, despite the header saying m/s and MPa. +COL_TIME = 0 +COL_VELOCITY = 1 +COL_BRAKE_PRESS = 8 + +# settings layered over the user's eu07.ini for a test run +TEST_INI = """\ +fullscreen no +fullscreenwindowed no +width 1280 +height 720 +inactivepause no +soundenabled no +physicslog yes +multiplelogs no +timespeed {timespeed} +""" + + +# ---------------------------------------------------------------- scenery + + +def split_trainsets(text: str) -> tuple[str, str]: + """Splits text into (everything else, the trainset ... endtrainset blocks).""" + rest, trainsets = [], [] + inside = False + for line in text.splitlines(keepends=True): + tokens = line.split("//", 1)[0].split() + if not inside and tokens and tokens[0].lower() == "trainset": + inside = True + if inside: + trainsets.append(line) + if any(t.lower() == "endtrainset" for t in tokens): + inside = False + continue + rest.append(line) + return "".join(rest), "".join(trainsets) + + +def set_start_time(text: str, hhmm: str) -> str: + return re.sub(r"(?im)^(\s*time\s+)\d{1,2}:\d{2}", lambda m: m.group(1) + hhmm, text, count=1) + + +def build_scenery(case: dict, game_dir: Path, case_name: str) -> str: + """Writes the case scenery into the game's scenery dir and returns its file name.""" + scenery_dir = game_dir / "scenery" + # sceneries are cp1250; latin-1 round-trips every byte, so nothing gets mangled + text = (scenery_dir / case["base_scenery"]).read_bytes().decode("latin-1") + if case.get("strip_trainsets", True): + text, _ = split_trainsets(text) + if "time" in case: + text = set_start_time(text, case["time"]) + fragment = (CASES_DIR / case["fragment"]).read_bytes().decode("latin-1") + # FirstInit binds event launchers to their events and links the tracks. so launchers and + # events of the case go in before it (read after it they never fire), trainsets after it + # (placed before it they stand on unlinked track and derail at once) + before, trainsets = split_trainsets(fragment) + header = f"\n// ---- autotest: {case_name} ----\n" + firstinit = re.search(r"(?im)^\s*firstinit\b", text) + if firstinit: + text = text[: firstinit.start()] + header + before + "\n" + text[firstinit.start():] + else: + text += header + before + "\n" + text += header + trainsets + "\n" + name = f"autotest_{case_name}.scn" + (scenery_dir / name).write_bytes(text.encode("latin-1")) + return name + + +# ---------------------------------------------------------------- run + + +def read_physicslog(path: Path) -> list[list[float]]: + """Returns rows of numeric columns up to BrakePress; skips the header and partial lines.""" + rows = [] + try: + lines = path.read_text(errors="replace").splitlines() + except FileNotFoundError: + return rows + for line in lines[1:]: + parts = line.split() + if len(parts) <= COL_BRAKE_PRESS: + continue # line still being written + try: + rows.append([float(p) for p in parts[: COL_BRAKE_PRESS + 1]]) + except ValueError: + continue + return rows + + +@dataclass +class RunResult: + rows: list[list[float]] = field(default_factory=list) + exit_code: int | None = None # None: still running when we closed it (the normal end) + timed_out: bool = False + wall_seconds: float = 0.0 + + +def run_simulator(exe: Path, game_dir: Path, scenery: str, ini: Path, physicslog: Path, + duration: float, timeout: float) -> RunResult: + physicslog.unlink(missing_ok=True) + cmd = [str(exe), "-s", scenery, "-v", "ghostview", "-ini", str(ini)] + print(" $", " ".join(f'"{c}"' if " " in c else c for c in cmd)) + started = time.monotonic() + proc = subprocess.Popen(cmd, cwd=game_dir) + result = RunResult() + last_report = 0.0 + try: + while True: + time.sleep(1.0) + result.rows = read_physicslog(physicslog) + sim_t = result.rows[-1][COL_TIME] if result.rows else 0.0 + wall = time.monotonic() - started + if wall - last_report >= 15: + v = result.rows[-1][COL_VELOCITY] if result.rows else 0.0 + print(f" ... {wall:5.0f}s wall, sim {sim_t:6.1f}s, v={v:6.1f} km/h") + last_report = wall + if proc.poll() is not None: + result.exit_code = proc.returncode + break + if sim_t >= duration: + break + if wall > timeout: + result.timed_out = True + break + finally: + if proc.poll() is None: + proc.terminate() + try: + proc.wait(timeout=10) + except subprocess.TimeoutExpired: + proc.kill() + result.wall_seconds = time.monotonic() - started + result.rows = read_physicslog(physicslog) + return result + + +# ---------------------------------------------------------------- checks + + +def check_starts(rows, min_speed, within): + for r in rows: + if r[COL_TIME] > within: + break + if r[COL_VELOCITY] >= min_speed: + return True, f"reached {min_speed} km/h at t={r[COL_TIME]:.1f}s" + top = max((r[COL_VELOCITY] for r in rows if r[COL_TIME] <= within), default=0.0) + return False, f"top speed in the first {within}s was {top:.1f} km/h, wanted {min_speed}" + + +def check_max_speed(rows, limit, tolerance=0.0): + worst = max(rows, key=lambda r: r[COL_VELOCITY]) + v, t = worst[COL_VELOCITY], worst[COL_TIME] + ok = v <= limit + tolerance + return ok, f"top speed {v:.1f} km/h at t={t:.1f}s (limit {limit} +{tolerance})" + + +def _first_moving(rows, moving_speed): + return next((i for i, r in enumerate(rows) if r[COL_VELOCITY] >= moving_speed), None) + + +def check_brakes(rows, min_pressure, moving_speed=20): + start = _first_moving(rows, moving_speed) + if start is None: + return False, "never moved, so never braked" + for r in rows[start:]: + if r[COL_BRAKE_PRESS] >= min_pressure: + return True, f"brake cylinder {r[COL_BRAKE_PRESS]:.2f} bar at t={r[COL_TIME]:.1f}s, v={r[COL_VELOCITY]:.1f} km/h" + return False, f"brake cylinder pressure never reached {min_pressure} bar after moving off" + + +def check_stops(rows, moving_speed, stop_speed, hold): + start = _first_moving(rows, moving_speed) + if start is None: + return False, f"never reached {moving_speed} km/h" + stopped_at = None + for r in rows[start:]: + if r[COL_VELOCITY] <= stop_speed: + if stopped_at is None: + stopped_at = r[COL_TIME] + if r[COL_TIME] - stopped_at >= hold: + return True, f"came to a stop at t={stopped_at:.1f}s" + else: + stopped_at = None + return False, f"did not stay below {stop_speed} km/h for {hold}s after moving off" + + +CHECKS = { + "starts": check_starts, + "max_speed": check_max_speed, + "brakes": check_brakes, + "stops": check_stops, +} + + +# ---------------------------------------------------------------- main + + +def find_exe(explicit: str | None) -> Path: + if explicit: + return Path(explicit).resolve() + candidates = sorted(REPO.glob("cmake-build-*/bin/Release/eu07*.exe"), key=lambda p: p.stat().st_mtime) + if not candidates: + sys.exit("no eu07 executable found under cmake-build-*/bin/Release, pass --exe") + return candidates[-1] + + +def count_lines(path: Path) -> int: + try: + return sum(1 for line in path.read_text(errors="replace").splitlines() if line.strip()) + except FileNotFoundError: + return 0 + + +def run_case(name: str, exe: Path, game_dir: Path, timespeed: float) -> bool: + case = json.loads((CASES_DIR / f"{name}.json").read_text(encoding="utf-8")) + print(f"\n=== {name}: {case.get('description', '')}") + out = OUT_DIR / name + shutil.rmtree(out, ignore_errors=True) + out.mkdir(parents=True) + + scenery = build_scenery(case, game_dir, name) + ini = out / "autotest.ini" + ini.write_text(TEST_INI.format(timespeed=timespeed), encoding="ascii") + physicslog = game_dir / "physicslog" / f"{case['vehicle']}.dat" + + result = run_simulator(exe, game_dir, scenery, ini, physicslog, + float(case["duration"]), float(case.get("timeout", 600))) + + for f in ("log.txt", "errors.txt"): + if (game_dir / f).exists(): + shutil.copy2(game_dir / f, out / f) + if physicslog.exists(): + shutil.copy2(physicslog, out / physicslog.name) + + ok = True + sim_t = result.rows[-1][COL_TIME] if result.rows else 0.0 + print(f" ran {result.wall_seconds:.0f}s wall, {sim_t:.1f}s of physicslog, results in {out.relative_to(REPO)}") + if result.exit_code is not None: + print(f" FAIL simulator exited on its own with code {result.exit_code} (crash?)") + ok = False + if result.timed_out: + print(f" FAIL timed out before {case['duration']}s of simulation") + ok = False + if not result.rows: + print(f" FAIL no physicslog for '{case['vehicle']}' ({physicslog})") + return False + + for check in case["checks"]: + params = {k: v for k, v in check.items() if k != "type"} + passed, detail = CHECKS[check["type"]](result.rows, **params) + print(f" {'PASS' if passed else 'FAIL'} {check['type']}: {detail}") + ok &= passed + + errors = count_lines(out / "errors.txt") + if errors: + print(f" note errors.txt has {errors} line(s)") + if case.get("fail_on_errors") and errors: + ok = False + return ok + + +def main() -> int: + ap = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter) + ap.add_argument("cases", nargs="*", help="case names from cases/ (default: all)") + ap.add_argument("--game-dir", default=os.environ.get("EU07_GAME_DIR"), + help="game install with scenery/ and dynamic/ (or EU07_GAME_DIR)") + ap.add_argument("--exe", help="simulator executable (default: newest cmake-build-*/bin/Release/eu07*.exe)") + ap.add_argument("--timespeed", type=float, default=1.0, help="simulation time multiplier") + args = ap.parse_args() + + if not args.game_dir: + sys.exit("pass --game-dir or set EU07_GAME_DIR") + game_dir = Path(args.game_dir).resolve() + exe = find_exe(args.exe) + print(f"exe: {exe}\ngame: {game_dir}") + + names = args.cases or sorted(p.stem for p in CASES_DIR.glob("*.json")) + results = {n: run_case(n, exe, game_dir, args.timespeed) for n in names} + + print("\n=== summary") + for n, ok in results.items(): + print(f" {'PASS' if ok else 'FAIL'} {n}") + return 0 if all(results.values()) else 1 + + +if __name__ == "__main__": + sys.exit(main()) From 6cf8934acb65aec779aea3d0f7a9604f9ef7ec15 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Wed, 30 Sep 2026 19:29:10 +0200 Subject: [PATCH 275/430] test: run scenario tests at timespeed 20 by default eu07_td_timetable now takes about 20 s instead of 4 min. Its speed profile at 20 and 60 matched a real-time run within a few km/h and seconds; the physicslog keeps its 0.05 s rows. The runner polls the log every 0.25 s so it does not overshoot the case duration by a minute of simulation. --- tests/scenarios/README.md | 5 ++++- tests/scenarios/run.py | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/scenarios/README.md b/tests/scenarios/README.md index 77edb5a93..c233154d6 100644 --- a/tests/scenarios/README.md +++ b/tests/scenarios/README.md @@ -18,7 +18,10 @@ Python 3.10+, no extra packages. Options: - `--exe path/to/eu07.exe` picks the build to test; the default is the newest `cmake-build-*/bin/Release/eu07*.exe`. The build needs the `-ini` command line option. - name one or more cases to run only those, e.g. `run.py ... eu07_td_timetable`. -- `--timespeed 4` runs the simulation faster than real time. +- `--timespeed N` sets the simulation time multiplier, default 20: a 4-minute case runs in + about 20 s. Physics still steps finely (the physicslog keeps its 0.05 s rows) and the speed + profile at 20 and 60 matched a real-time run within a few km/h and seconds. Use + `--timespeed 1` to watch a run. Exit code is 0 when every case passed. Logs of each run (`log.txt`, `errors.txt`, the vehicle's physicslog) land in `tests/scenarios/out//`. diff --git a/tests/scenarios/run.py b/tests/scenarios/run.py index ad1f51ee7..b3736a929 100644 --- a/tests/scenarios/run.py +++ b/tests/scenarios/run.py @@ -149,7 +149,7 @@ def run_simulator(exe: Path, game_dir: Path, scenery: str, ini: Path, physicslog last_report = 0.0 try: while True: - time.sleep(1.0) + time.sleep(0.25) # at timespeed 20 that is 5 s of simulation result.rows = read_physicslog(physicslog) sim_t = result.rows[-1][COL_TIME] if result.rows else 0.0 wall = time.monotonic() - started @@ -308,7 +308,10 @@ def main() -> int: ap.add_argument("--game-dir", default=os.environ.get("EU07_GAME_DIR"), help="game install with scenery/ and dynamic/ (or EU07_GAME_DIR)") ap.add_argument("--exe", help="simulator executable (default: newest cmake-build-*/bin/Release/eu07*.exe)") - ap.add_argument("--timespeed", type=float, default=1.0, help="simulation time multiplier") + # 20 gave the same speed profile as 1 within a few km/h and seconds on eu07_td_timetable, + # in 20 s instead of 4 min; 1 is for watching a run + ap.add_argument("--timespeed", type=float, default=20.0, + help="simulation time multiplier, the simulator offers 1, 5, 20 and 60 (default 20)") args = ap.parse_args() if not args.game_dir: From cb0a1223835009fa8e82726170d4cc0afe992a41 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Wed, 30 Sep 2026 21:55:16 +0200 Subject: [PATCH 276/430] test: red signal case, seven vehicles on the td.scn timetable, parallel runs - eu07_td_red_signal: no route set, the train has to stop before the exit signal and stay there (new checks stays_stopped and distance; distance is integrated from the speed, the physicslog has no position) - en57/ep09/et22/sm42/sn61/vectron/eu07_td_timetable share one fragment template, td_timetable.scn; a case sets vars.consist and the lead vehicle is named {{vehicle}} = autotest_ - -j N runs cases in parallel: each case has its own physicslog and, with multiplelogs, its own log files, which are moved to out// - a run stops at once on Bad vehicle / Bad trainset instead of waiting for the timeout, and fails after 120 s without physicslog rows - the .sbt geometry cache of a test scenery is dropped when the base scenery is newer All 8 cases pass in about a minute with -j 4. --- tests/scenarios/README.md | 35 ++- tests/scenarios/cases/en57_td_timetable.json | 21 ++ tests/scenarios/cases/ep09_td_timetable.json | 17 ++ tests/scenarios/cases/et22_td_timetable.json | 17 ++ tests/scenarios/cases/eu07_td_red_signal.json | 18 ++ tests/scenarios/cases/eu07_td_timetable.json | 6 +- tests/scenarios/cases/sm42_td_timetable.json | 17 ++ tests/scenarios/cases/sn61_td_timetable.json | 17 ++ tests/scenarios/cases/td_red_signal.scn | 6 + ...eu07_td_timetable.scn => td_timetable.scn} | 9 +- .../scenarios/cases/vectron_td_timetable.json | 17 ++ tests/scenarios/run.py | 201 ++++++++++++++---- 12 files changed, 332 insertions(+), 49 deletions(-) create mode 100644 tests/scenarios/cases/en57_td_timetable.json create mode 100644 tests/scenarios/cases/ep09_td_timetable.json create mode 100644 tests/scenarios/cases/et22_td_timetable.json create mode 100644 tests/scenarios/cases/eu07_td_red_signal.json create mode 100644 tests/scenarios/cases/sm42_td_timetable.json create mode 100644 tests/scenarios/cases/sn61_td_timetable.json create mode 100644 tests/scenarios/cases/td_red_signal.scn rename tests/scenarios/cases/{eu07_td_timetable.scn => td_timetable.scn} (51%) create mode 100644 tests/scenarios/cases/vectron_td_timetable.json diff --git a/tests/scenarios/README.md b/tests/scenarios/README.md index c233154d6..23f793018 100644 --- a/tests/scenarios/README.md +++ b/tests/scenarios/README.md @@ -9,7 +9,7 @@ only, not in CI. ## Running ``` -python tests/scenarios/run.py --game-dir "E:/Program Files (x86)/Steam/steamapps/common/MaSzyna" +python tests/scenarios/run.py --game-dir "E:/Program Files (x86)/Steam/steamapps/common/MaSzyna" -j 4 ``` Python 3.10+, no extra packages. Options: @@ -18,13 +18,15 @@ Python 3.10+, no extra packages. Options: - `--exe path/to/eu07.exe` picks the build to test; the default is the newest `cmake-build-*/bin/Release/eu07*.exe`. The build needs the `-ini` command line option. - name one or more cases to run only those, e.g. `run.py ... eu07_td_timetable`. +- `-j N` runs N cases at once, each in its own simulator window. Each case prints its + results when it is done. All 8 cases take about a minute with `-j 4`. - `--timespeed N` sets the simulation time multiplier, default 20: a 4-minute case runs in about 20 s. Physics still steps finely (the physicslog keeps its 0.05 s rows) and the speed profile at 20 and 60 matched a real-time run within a few km/h and seconds. Use `--timespeed 1` to watch a run. Exit code is 0 when every case passed. Logs of each run (`log.txt`, `errors.txt`, -the vehicle's physicslog) land in `tests/scenarios/out//`. +the vehicle's physicslog) are moved to `tests/scenarios/out//`. ## How it works @@ -35,11 +37,19 @@ For each case the runner: fragment added: its trainsets after `FirstInit`, everything else (event launchers standing in for keys the scenery expects a player to press, extra events) before it, 2. starts the simulator with `-s autotest_.scn -v ghostview -ini out//autotest.ini`; - ghostview leaves every train to the AI, and the extra ini turns on `physicslog`, - runs in a 1280x720 window and does not pause when the window loses focus, -3. waits until `physicslog/.dat` covers `duration` seconds, then closes the simulator, + ghostview leaves every train to the AI, and the extra ini turns on `physicslog`, runs in a + 1280x720 window, does not pause when the window loses focus, and writes the logs to + `logs/log (autotest_) .txt` rather than the shared `log.txt` (`multiplelogs`), +3. waits until `physicslog/autotest_.dat` covers `duration` seconds, then closes the + simulator. It gives up early when the log reports `Bad vehicle` / `Bad trainset`, or when + the scenario has loaded and no physicslog appeared, 4. runs the checks on the physicslog. +The lead vehicle is named `autotest_`, so every case has its own physicslog and log +files and cases can run in parallel. The `autotest_*` sceneries (and the simulator's `.sbt` +geometry cache of them) stay in the game's `scenery/` dir; the cache is dropped when the base +scenery is newer. + ## Writing a case `cases/.json`: @@ -50,13 +60,19 @@ For each case the runner: | `strip_trainsets` | drop the base scenery's trainsets (default `true`) | | `time` | replace the scenery start time, `HH:MM` | | `fragment` | `.scn` file in `cases/` added to the scenery: trainsets after `FirstInit` (before it they derail on unlinked track), the rest before it (launchers read after it never fire) | -| `vehicle` | node name of the vehicle whose physicslog is checked | +| `vars` | values for `{{name}}` in the fragment; a list becomes one line per item | | `duration` | seconds of simulation to record | | `timeout` | wall-clock seconds before giving up, loading included | | `fail_on_errors` | fail when `errors.txt` is not empty (default `false`) | | `checks` | list of checks, below | -Checks (speeds in km/h, times in seconds of physicslog time): +`{{vehicle}}` is always set, also inside `vars` values: the node name of the lead vehicle, +the one whose physicslog is checked. Other vehicles of the consist take names made from it, +e.g. `{{vehicle}}_s`. The td.scn cases share two fragments, `td_timetable.scn` (route set, +train runs to Przystanek) and `td_red_signal.scn` (no route, exit signal at stop), and differ +only in `vars.consist`. + +Checks (speeds in km/h, times in seconds of physicslog time, distances in metres): - `starts` `min_speed`, `within`: reaches `min_speed` within `within` seconds. - `max_speed` `limit`, `tolerance`: never goes faster than `limit + tolerance`. @@ -64,6 +80,11 @@ Checks (speeds in km/h, times in seconds of physicslog time): (physicslog pressures are in bar whatever its header says; the brake pipe runs at 5.0). - `stops` `moving_speed`, `stop_speed`, `hold`: after reaching `moving_speed`, stays at or below `stop_speed` for `hold` seconds. +- `stays_stopped` `moving_speed`, `stop_speed`: after moving off and stopping, never goes + above `stop_speed` again. +- `distance` `min`, `max`: total distance travelled. The physicslog has no position, so the + distance comes from integrating the speed; on td.scn every vehicle's first stop after + Stacja1 came out at 1400 m (+-3), and the red signal stop at 140 m. New check types go in `CHECKS` in `run.py`; each gets the physicslog rows and the check's parameters and returns `(passed, detail)`. diff --git a/tests/scenarios/cases/en57_td_timetable.json b/tests/scenarios/cases/en57_td_timetable.json new file mode 100644 index 000000000..ddd52af37 --- /dev/null +++ b/tests/scenarios/cases/en57_td_timetable.json @@ -0,0 +1,21 @@ +{ + "description": "EN57 EMU (three cars) on td.scn, AI driver on the td/rozklad timetable: starts from Stacja1, keeps to the speed limit, brakes to a stop at Przystanek.", + "base_scenery": "td.scn", + "time": "10:34", + "fragment": "td_timetable.scn", + "vars": { + "consist": [ + "node -1 0 {{vehicle}} dynamic pkp\\en57_v2 EN57-1000ra EN57RA_GSO_WKM1_KM_NS_N 0 headdriver 255 0 enddynamic", + "node -1 0 {{vehicle}}_s dynamic pkp\\en57_v2 EN57-1000s EN57S_WKM1_KM_NS_S 0 nobody 255 0 enddynamic", + "node -1 0 {{vehicle}}_rb dynamic pkp\\en57_v2 EN57-1000rb EN57RB_GSO_WKM1_KM_NS 0 nobody 0 0 enddynamic" + ] + }, + "duration": 240, + "timeout": 600, + "checks": [ + { "type": "starts", "min_speed": 20, "within": 150 }, + { "type": "max_speed", "limit": 90, "tolerance": 3 }, + { "type": "brakes", "min_pressure": 0.5 }, + { "type": "stops", "moving_speed": 20, "stop_speed": 0.5, "hold": 5 } + ] +} diff --git a/tests/scenarios/cases/ep09_td_timetable.json b/tests/scenarios/cases/ep09_td_timetable.json new file mode 100644 index 000000000..dd130be3c --- /dev/null +++ b/tests/scenarios/cases/ep09_td_timetable.json @@ -0,0 +1,17 @@ +{ + "description": "EP09 on td.scn, AI driver on the td/rozklad timetable: starts from Stacja1, keeps to the speed limit, brakes to a stop at Przystanek.", + "base_scenery": "td.scn", + "time": "10:34", + "fragment": "td_timetable.scn", + "vars": { + "consist": "node -1 0 {{vehicle}} dynamic pkp\\ep09_v1 104e-005 104e_3 0 headdriver 0 0 enddynamic" + }, + "duration": 240, + "timeout": 600, + "checks": [ + { "type": "starts", "min_speed": 20, "within": 150 }, + { "type": "max_speed", "limit": 90, "tolerance": 3 }, + { "type": "brakes", "min_pressure": 0.5 }, + { "type": "stops", "moving_speed": 20, "stop_speed": 0.5, "hold": 5 } + ] +} diff --git a/tests/scenarios/cases/et22_td_timetable.json b/tests/scenarios/cases/et22_td_timetable.json new file mode 100644 index 000000000..004f5354d --- /dev/null +++ b/tests/scenarios/cases/et22_td_timetable.json @@ -0,0 +1,17 @@ +{ + "description": "ET22 on td.scn, AI driver on the td/rozklad timetable: starts from Stacja1, keeps to the speed limit, brakes to a stop at Przystanek.", + "base_scenery": "td.scn", + "time": "10:34", + "fragment": "td_timetable.scn", + "vars": { + "consist": "node -1 0 {{vehicle}} dynamic pkp\\et22_v3 201E-1150 201E 0 headdriver 0 0 enddynamic" + }, + "duration": 240, + "timeout": 600, + "checks": [ + { "type": "starts", "min_speed": 20, "within": 150 }, + { "type": "max_speed", "limit": 90, "tolerance": 3 }, + { "type": "brakes", "min_pressure": 0.5 }, + { "type": "stops", "moving_speed": 20, "stop_speed": 0.5, "hold": 5 } + ] +} diff --git a/tests/scenarios/cases/eu07_td_red_signal.json b/tests/scenarios/cases/eu07_td_red_signal.json new file mode 100644 index 000000000..b02acdc81 --- /dev/null +++ b/tests/scenarios/cases/eu07_td_red_signal.json @@ -0,0 +1,18 @@ +{ + "description": "EU07 on td.scn with no route set: pulls off, stops before the exit signal stacja1_j at stop, and stays there.", + "base_scenery": "td.scn", + "time": "10:34", + "fragment": "td_red_signal.scn", + "vars": { + "consist": "node -1 0 {{vehicle}} dynamic pkp\\4e_v1 4e-004 4e 0 headdriver 0 0 enddynamic" + }, + "duration": 240, + "timeout": 600, + "checks": [ + { "type": "starts", "min_speed": 5, "within": 150 }, + { "type": "max_speed", "limit": 40 }, + { "type": "stops", "moving_speed": 5, "stop_speed": 0.5, "hold": 5 }, + { "type": "stays_stopped", "moving_speed": 5, "stop_speed": 0.5 }, + { "type": "distance", "max": 150 } + ] +} diff --git a/tests/scenarios/cases/eu07_td_timetable.json b/tests/scenarios/cases/eu07_td_timetable.json index c12b8ae71..2f23019fe 100644 --- a/tests/scenarios/cases/eu07_td_timetable.json +++ b/tests/scenarios/cases/eu07_td_timetable.json @@ -2,8 +2,10 @@ "description": "EU07 on td.scn, AI driver on the td/rozklad timetable: starts from Stacja1, keeps to the speed limit, brakes to a stop at Przystanek.", "base_scenery": "td.scn", "time": "10:34", - "fragment": "eu07_td_timetable.scn", - "vehicle": "autotest_eu07", + "fragment": "td_timetable.scn", + "vars": { + "consist": "node -1 0 {{vehicle}} dynamic pkp\\4e_v1 4e-004 4e 0 headdriver 0 0 enddynamic" + }, "duration": 240, "timeout": 600, "checks": [ diff --git a/tests/scenarios/cases/sm42_td_timetable.json b/tests/scenarios/cases/sm42_td_timetable.json new file mode 100644 index 000000000..fc89be0fa --- /dev/null +++ b/tests/scenarios/cases/sm42_td_timetable.json @@ -0,0 +1,17 @@ +{ + "description": "SM42 diesel shunter on td.scn, AI driver on the td/rozklad timetable: starts from Stacja1, keeps to the speed limit, brakes to a stop at Przystanek.", + "base_scenery": "td.scn", + "time": "10:34", + "fragment": "td_timetable.scn", + "vars": { + "consist": "node -1 0 {{vehicle}} dynamic pkp\\sm42_v1 6D-468 6D 0 headdriver 0 0 enddynamic" + }, + "duration": 240, + "timeout": 600, + "checks": [ + { "type": "starts", "min_speed": 20, "within": 150 }, + { "type": "max_speed", "limit": 90, "tolerance": 3 }, + { "type": "brakes", "min_pressure": 0.5 }, + { "type": "stops", "moving_speed": 20, "stop_speed": 0.5, "hold": 5 } + ] +} diff --git a/tests/scenarios/cases/sn61_td_timetable.json b/tests/scenarios/cases/sn61_td_timetable.json new file mode 100644 index 000000000..1db425c80 --- /dev/null +++ b/tests/scenarios/cases/sn61_td_timetable.json @@ -0,0 +1,17 @@ +{ + "description": "SN61 diesel railcar on td.scn, AI driver on the td/rozklad timetable: starts from Stacja1, keeps to the speed limit, brakes to a stop at Przystanek.", + "base_scenery": "td.scn", + "time": "10:34", + "fragment": "td_timetable.scn", + "vars": { + "consist": "node -1 0 {{vehicle}} dynamic pkp\\sn61_v2 SN61-13 SN61_v1 0 headdriver 0 0 enddynamic" + }, + "duration": 240, + "timeout": 600, + "checks": [ + { "type": "starts", "min_speed": 20, "within": 150 }, + { "type": "max_speed", "limit": 90, "tolerance": 3 }, + { "type": "brakes", "min_pressure": 0.5 }, + { "type": "stops", "moving_speed": 20, "stop_speed": 0.5, "hold": 5 } + ] +} diff --git a/tests/scenarios/cases/td_red_signal.scn b/tests/scenarios/cases/td_red_signal.scn new file mode 100644 index 000000000..981707085 --- /dev/null +++ b/tests/scenarios/cases/td_red_signal.scn @@ -0,0 +1,6 @@ +// added by tests/scenarios/run.py to td.scn, whose own trainsets were removed. +// same start as td_timetable.scn, but nobody sets the route: the exit signal stacja1_j, +// about 150 m ahead of the train, stays at stop. +trainset td/rozklad tdo_n1734 0.0 0.1 +{{consist}} +endtrainset diff --git a/tests/scenarios/cases/eu07_td_timetable.scn b/tests/scenarios/cases/td_timetable.scn similarity index 51% rename from tests/scenarios/cases/eu07_td_timetable.scn rename to tests/scenarios/cases/td_timetable.scn index c8044e467..e67dcf9ad 100644 --- a/tests/scenarios/cases/eu07_td_timetable.scn +++ b/tests/scenarios/cases/td_timetable.scn @@ -1,11 +1,12 @@ -// added by tests/scenarios/run.py to the base scenery, whose own trainsets were removed: +// added by tests/scenarios/run.py to td.scn, whose own trainsets were removed: // the trainset goes after FirstInit, the launcher before it. -// the EU07 stands where td.scn keeps its timetable train and gets the same timetable. +// the case's consist stands where td.scn keeps its timetable train (track 1 of Stacja1) +// and gets the same timetable: Stacja1 10:35 -> Przystanek -> Stacja2. trainset td/rozklad tdo_n1734 0.0 0.1 -node -1 0 autotest_eu07 dynamic pkp\4e_v1 4e-004 4e 0 headdriver 0 0 enddynamic +{{consist}} endtrainset // td.scn sets routes from the keyboard (shift+1..4 run events keyctrl01..04). keyctrl04 is the -// way out of the track the train stands on: switch zwr02 and the exit signal stacja1_j at 40. +// way out of track 1: switch zwr02 and the exit signal stacja1_j at 40. // a launcher with a positive time fires once at that hour (HHMM), radius -1 means anywhere. node -1 0 autotest_route eventlauncher 0 0 0 -1 none 1034 keyctrl04 end diff --git a/tests/scenarios/cases/vectron_td_timetable.json b/tests/scenarios/cases/vectron_td_timetable.json new file mode 100644 index 000000000..9948a09ef --- /dev/null +++ b/tests/scenarios/cases/vectron_td_timetable.json @@ -0,0 +1,17 @@ +{ + "description": "Vectron 1293-107 on td.scn, AI driver on the td/rozklad timetable: starts from Stacja1, keeps to the speed limit, brakes to a stop at Przystanek.", + "base_scenery": "td.scn", + "time": "10:34", + "fragment": "td_timetable.scn", + "vars": { + "consist": "node -1 0 {{vehicle}} dynamic pkp\\vectron_v1 1293-107 wariant_7w 0 headdriver 0 0 enddynamic" + }, + "duration": 240, + "timeout": 600, + "checks": [ + { "type": "starts", "min_speed": 20, "within": 150 }, + { "type": "max_speed", "limit": 90, "tolerance": 3 }, + { "type": "brakes", "min_pressure": 0.5 }, + { "type": "stops", "moving_speed": 20, "stop_speed": 0.5, "hold": 5 } + ] +} diff --git a/tests/scenarios/run.py b/tests/scenarios/run.py index b3736a929..419906700 100644 --- a/tests/scenarios/run.py +++ b/tests/scenarios/run.py @@ -2,11 +2,11 @@ """Scenario tests: run the real simulator on a scenery and check what a vehicle did. A case (cases/.json) names a base scenery from the game install, a fragment -appended to it (usually a trainset with an AI driver), and checks on the vehicle's +added to it (usually a trainset with an AI driver), and checks on the vehicle's physics log. The runner: 1. builds scenery/autotest_.scn in the game dir: the base scenery with its own - trainsets removed, optionally a different start time, and the case fragment appended, + trainsets removed, optionally a different start time, and the case fragment added, 2. starts eu07 with that scenery in ghostview (every train driven by AI) and an extra settings file (-ini) that turns on physicslog and runs in a window, 3. waits until the vehicle's physicslog covers `duration` seconds of simulation, @@ -14,10 +14,10 @@ physics log. The runner: 4. evaluates the checks on the log and prints PASS/FAIL per check. Scenery and vehicle data are not part of this repo, so this runs against a local game -install only (--game-dir or EU07_GAME_DIR), not in CI. +install only (--game-dir or EU07_GAME_DIR), not in CI. See README.md. Usage: - python tests/scenarios/run.py --game-dir "E:/.../MaSzyna" # all cases + python tests/scenarios/run.py --game-dir "E:/.../MaSzyna" -j 4 # all cases python tests/scenarios/run.py --game-dir ... eu07_td_timetable # chosen cases """ @@ -31,6 +31,7 @@ import shutil import subprocess import sys import time +from concurrent.futures import ThreadPoolExecutor, as_completed from dataclasses import dataclass, field from pathlib import Path @@ -54,9 +55,11 @@ height 720 inactivepause no soundenabled no physicslog yes -multiplelogs no +multiplelogs yes timespeed {timespeed} """ +# multiplelogs: log and errors go to logs/log () .txt instead of the shared +# log.txt, so runs of different cases can go in parallel # ---------------------------------------------------------------- scenery @@ -83,7 +86,19 @@ def set_start_time(text: str, hhmm: str) -> str: return re.sub(r"(?im)^(\s*time\s+)\d{1,2}:\d{2}", lambda m: m.group(1) + hhmm, text, count=1) -def build_scenery(case: dict, game_dir: Path, case_name: str) -> str: +def fill_vars(fragment: str, values: dict, keep=frozenset()) -> str: + """Replaces {{name}} with the case's value; a list value becomes one line per item.""" + def value(m): + if m.group(1) in keep: + return m.group(0) + v = values.get(m.group(1)) + if v is None: + sys.exit(f"fragment uses {{{{{m.group(1)}}}}} but the case sets no such var") + return "\n".join(v) if isinstance(v, list) else str(v) + return re.sub(r"\{\{(\w+)\}\}", value, fragment) + + +def build_scenery(case: dict, game_dir: Path, case_name: str, vehicle: str) -> str: """Writes the case scenery into the game's scenery dir and returns its file name.""" scenery_dir = game_dir / "scenery" # sceneries are cp1250; latin-1 round-trips every byte, so nothing gets mangled @@ -93,6 +108,9 @@ def build_scenery(case: dict, game_dir: Path, case_name: str) -> str: if "time" in case: text = set_start_time(text, case["time"]) fragment = (CASES_DIR / case["fragment"]).read_bytes().decode("latin-1") + # vars first: {{vehicle}} inside a var's value gets filled in the second pass + fragment = fill_vars(fragment, case.get("vars", {}), keep={"vehicle"}) + fragment = fill_vars(fragment, {"vehicle": vehicle}) # FirstInit binds event launchers to their events and links the tracks. so launchers and # events of the case go in before it (read after it they never fire), trainsets after it # (placed before it they stand on unlinked track and derail at once) @@ -106,6 +124,12 @@ def build_scenery(case: dict, game_dir: Path, case_name: str) -> str: text += header + trainsets + "\n" name = f"autotest_{case_name}.scn" (scenery_dir / name).write_bytes(text.encode("latin-1")) + # the simulator caches the scenery's static geometry in .sbt and reads it instead of + # the terrain in the .scn (tracks, events and trainsets always come from the .scn), so + # drop the cache once the base scenery has changed + cache = scenery_dir / f"autotest_{case_name}.sbt" + if cache.exists() and cache.stat().st_mtime < (scenery_dir / case["base_scenery"]).stat().st_mtime: + cache.unlink() return name @@ -130,19 +154,47 @@ def read_physicslog(path: Path) -> list[list[float]]: return rows +def find_logs(game_dir: Path, scenery: str, since: float) -> dict[str, Path]: + """The log.txt / errors.txt of one run; with multiplelogs each scenery gets its own files.""" + stem = scenery.rsplit(".", 1)[0] + found = {} + for kind in ("log", "errors"): + files = [p for p in (game_dir / "logs").glob(f"{kind} ({stem}) *.txt") if p.stat().st_mtime >= since] + if files: + found[kind] = max(files, key=lambda p: p.stat().st_mtime) + return found + + +def read_text(path: Path | None) -> str: + try: + return path.read_text(errors="replace") if path else "" + except FileNotFoundError: + return "" + + +# load problems that leave the case without its vehicle; no point waiting for the timeout +FATAL_LOG_LINES = ("Bad vehicle:", "Bad trainset:") +# wall seconds from start to the first physicslog row before giving up. "Scenario loading +# time" in the log is not the end of loading (the trainsets after FirstInit still follow), +# and with several simulators loading at once the first rows took well over 15 s +STARTUP_TIMEOUT = 120.0 + + @dataclass class RunResult: rows: list[list[float]] = field(default_factory=list) exit_code: int | None = None # None: still running when we closed it (the normal end) - timed_out: bool = False + failure: str = "" # why the run was cut short wall_seconds: float = 0.0 + logs: dict[str, Path] = field(default_factory=dict) def run_simulator(exe: Path, game_dir: Path, scenery: str, ini: Path, physicslog: Path, - duration: float, timeout: float) -> RunResult: + duration: float, timeout: float, say) -> RunResult: physicslog.unlink(missing_ok=True) cmd = [str(exe), "-s", scenery, "-v", "ghostview", "-ini", str(ini)] - print(" $", " ".join(f'"{c}"' if " " in c else c for c in cmd)) + say(" $ " + " ".join(f'"{c}"' if " " in c else c for c in cmd), progress=True) + since = time.time() - 1 started = time.monotonic() proc = subprocess.Popen(cmd, cwd=game_dir) result = RunResult() @@ -150,12 +202,12 @@ def run_simulator(exe: Path, game_dir: Path, scenery: str, ini: Path, physicslog try: while True: time.sleep(0.25) # at timespeed 20 that is 5 s of simulation + wall = time.monotonic() - started result.rows = read_physicslog(physicslog) sim_t = result.rows[-1][COL_TIME] if result.rows else 0.0 - wall = time.monotonic() - started if wall - last_report >= 15: v = result.rows[-1][COL_VELOCITY] if result.rows else 0.0 - print(f" ... {wall:5.0f}s wall, sim {sim_t:6.1f}s, v={v:6.1f} km/h") + say(f" ... {wall:5.0f}s wall, sim {sim_t:6.1f}s, v={v:6.1f} km/h", progress=True) last_report = wall if proc.poll() is not None: result.exit_code = proc.returncode @@ -163,8 +215,18 @@ def run_simulator(exe: Path, game_dir: Path, scenery: str, ini: Path, physicslog if sim_t >= duration: break if wall > timeout: - result.timed_out = True + result.failure = f"timed out after {timeout:.0f}s before {duration}s of simulation" break + if not result.rows: + result.logs = find_logs(game_dir, scenery, since) + fatal = [l.strip() for l in read_text(result.logs.get("errors")).splitlines() + if any(k in l for k in FATAL_LOG_LINES)] + if fatal: + result.failure = "vehicle failed to load: " + " | ".join(fatal) + break + if wall > STARTUP_TIMEOUT: + result.failure = f"no physicslog rows after {STARTUP_TIMEOUT:.0f}s" + break finally: if proc.poll() is None: proc.terminate() @@ -174,6 +236,7 @@ def run_simulator(exe: Path, game_dir: Path, scenery: str, ini: Path, physicslog proc.kill() result.wall_seconds = time.monotonic() - started result.rows = read_physicslog(physicslog) + result.logs = find_logs(game_dir, scenery, since) return result @@ -201,6 +264,15 @@ def _first_moving(rows, moving_speed): return next((i for i, r in enumerate(rows) if r[COL_VELOCITY] >= moving_speed), None) +def _distances(rows): + """Metres travelled up to each row, from the speed; the physicslog has no position.""" + out, d = [0.0], 0.0 + for a, b in zip(rows, rows[1:]): + d += (a[COL_VELOCITY] + b[COL_VELOCITY]) / 2 / 3.6 * (b[COL_TIME] - a[COL_TIME]) + out.append(d) + return out + + def check_brakes(rows, min_pressure, moving_speed=20): start = _first_moving(rows, moving_speed) if start is None: @@ -215,23 +287,49 @@ def check_stops(rows, moving_speed, stop_speed, hold): start = _first_moving(rows, moving_speed) if start is None: return False, f"never reached {moving_speed} km/h" + dist = _distances(rows) stopped_at = None - for r in rows[start:]: + for i in range(start, len(rows)): + r = rows[i] if r[COL_VELOCITY] <= stop_speed: if stopped_at is None: - stopped_at = r[COL_TIME] - if r[COL_TIME] - stopped_at >= hold: - return True, f"came to a stop at t={stopped_at:.1f}s" + stopped_at = i + if r[COL_TIME] - rows[stopped_at][COL_TIME] >= hold: + return True, f"came to a stop at t={rows[stopped_at][COL_TIME]:.1f}s after {dist[stopped_at]:.0f} m" else: stopped_at = None return False, f"did not stay below {stop_speed} km/h for {hold}s after moving off" +def check_stays_stopped(rows, moving_speed, stop_speed): + """Once stopped after moving off, never moves again (e.g. waiting at a red signal).""" + start = _first_moving(rows, moving_speed) + if start is None: + return False, f"never reached {moving_speed} km/h" + stop = next((i for i in range(start, len(rows)) if rows[i][COL_VELOCITY] <= stop_speed), None) + if stop is None: + return False, f"never came down to {stop_speed} km/h" + moved = next((r for r in rows[stop:] if r[COL_VELOCITY] > stop_speed), None) + if moved is not None: + return False, f"stopped at t={rows[stop][COL_TIME]:.1f}s but moved again at t={moved[COL_TIME]:.1f}s, v={moved[COL_VELOCITY]:.1f} km/h" + return True, f"stopped at t={rows[stop][COL_TIME]:.1f}s and stayed until t={rows[-1][COL_TIME]:.1f}s" + + +def check_distance(rows, max=None, min=None): + """Total distance travelled, in metres.""" + d = _distances(rows)[-1] + ok = (max is None or d <= max) and (min is None or d >= min) + bounds = " ".join(s for s in (f">= {min}" if min is not None else "", f"<= {max}" if max is not None else "") if s) + return ok, f"travelled {d:.0f} m (wanted {bounds})" + + CHECKS = { "starts": check_starts, "max_speed": check_max_speed, "brakes": check_brakes, "stops": check_stops, + "stays_stopped": check_stays_stopped, + "distance": check_distance, } @@ -254,49 +352,52 @@ def count_lines(path: Path) -> int: return 0 -def run_case(name: str, exe: Path, game_dir: Path, timespeed: float) -> bool: +def run_case(name: str, exe: Path, game_dir: Path, timespeed: float, say) -> bool: case = json.loads((CASES_DIR / f"{name}.json").read_text(encoding="utf-8")) - print(f"\n=== {name}: {case.get('description', '')}") + say(f"\n=== {name}: {case.get('description', '')}") out = OUT_DIR / name shutil.rmtree(out, ignore_errors=True) out.mkdir(parents=True) - scenery = build_scenery(case, game_dir, name) + # the lead vehicle is named after the case, so parallel runs never share a physicslog + vehicle = f"autotest_{name}" + scenery = build_scenery(case, game_dir, name, vehicle) ini = out / "autotest.ini" ini.write_text(TEST_INI.format(timespeed=timespeed), encoding="ascii") - physicslog = game_dir / "physicslog" / f"{case['vehicle']}.dat" + physicslog = game_dir / "physicslog" / f"{vehicle}.dat" result = run_simulator(exe, game_dir, scenery, ini, physicslog, - float(case["duration"]), float(case.get("timeout", 600))) + float(case["duration"]), float(case.get("timeout", 600)), say) - for f in ("log.txt", "errors.txt"): - if (game_dir / f).exists(): - shutil.copy2(game_dir / f, out / f) + # the logs are ours alone (named after the case scenery), move them out of the game dir + for kind, path in result.logs.items(): + shutil.move(path, out / f"{kind}.txt") if physicslog.exists(): - shutil.copy2(physicslog, out / physicslog.name) + shutil.move(physicslog, out / physicslog.name) ok = True sim_t = result.rows[-1][COL_TIME] if result.rows else 0.0 - print(f" ran {result.wall_seconds:.0f}s wall, {sim_t:.1f}s of physicslog, results in {out.relative_to(REPO)}") + say(f" ran {result.wall_seconds:.0f}s wall, {sim_t:.1f}s of physicslog, results in {out.relative_to(REPO)}") if result.exit_code is not None: - print(f" FAIL simulator exited on its own with code {result.exit_code} (crash?)") + say(f" FAIL simulator exited on its own with code {result.exit_code}") ok = False - if result.timed_out: - print(f" FAIL timed out before {case['duration']}s of simulation") + if result.failure: + say(f" FAIL {result.failure}") ok = False if not result.rows: - print(f" FAIL no physicslog for '{case['vehicle']}' ({physicslog})") + if not result.failure: + say(f" FAIL no physicslog for '{vehicle}'") return False for check in case["checks"]: params = {k: v for k, v in check.items() if k != "type"} passed, detail = CHECKS[check["type"]](result.rows, **params) - print(f" {'PASS' if passed else 'FAIL'} {check['type']}: {detail}") + say(f" {'PASS' if passed else 'FAIL'} {check['type']}: {detail}") ok &= passed errors = count_lines(out / "errors.txt") if errors: - print(f" note errors.txt has {errors} line(s)") + say(f" note errors.txt has {errors} line(s)") if case.get("fail_on_errors") and errors: ok = False return ok @@ -312,6 +413,8 @@ def main() -> int: # in 20 s instead of 4 min; 1 is for watching a run ap.add_argument("--timespeed", type=float, default=20.0, help="simulation time multiplier, the simulator offers 1, 5, 20 and 60 (default 20)") + ap.add_argument("-j", "--jobs", type=int, default=1, + help="cases run at once, each in its own simulator window (default 1)") args = ap.parse_args() if not args.game_dir: @@ -321,11 +424,37 @@ def main() -> int: print(f"exe: {exe}\ngame: {game_dir}") names = args.cases or sorted(p.stem for p in CASES_DIR.glob("*.json")) - results = {n: run_case(n, exe, game_dir, args.timespeed) for n in names} + missing = [n for n in names if not (CASES_DIR / f"{n}.json").exists()] + if missing: + sys.exit("no such case: " + ", ".join(missing)) - print("\n=== summary") - for n, ok in results.items(): - print(f" {'PASS' if ok else 'FAIL'} {n}") + started = time.monotonic() + results = {} + if args.jobs <= 1: + def say(line, progress=False): + print(line, flush=True) + for n in names: + results[n] = run_case(n, exe, game_dir, args.timespeed, say) + else: + # each case prints its block when it is done, so parallel output does not interleave + def job(n): + lines = [] + def say(line, progress=False): + if not progress: + lines.append(line) + ok = run_case(n, exe, game_dir, args.timespeed, say) + return n, ok, lines + with ThreadPoolExecutor(max_workers=args.jobs) as pool: + for n in names: + print(f"started {n}", flush=True) + for fut in as_completed([pool.submit(job, n) for n in names]): + n, ok, lines = fut.result() + print("\n".join(lines), flush=True) + results[n] = ok + + print(f"\n=== summary ({time.monotonic() - started:.0f}s)") + for n in names: + print(f" {'PASS' if results[n] else 'FAIL'} {n}") return 0 if all(results.values()) else 1 From 219836b4648020de36f1ccf7dc7d7edc71b8e2a6 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Wed, 14 Oct 2026 13:55:06 +0200 Subject: [PATCH 277/430] test: track_friction case key for slippery rail scenarios --- tests/scenarios/README.md | 1 + tests/scenarios/run.py | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/tests/scenarios/README.md b/tests/scenarios/README.md index 23f793018..463086cc5 100644 --- a/tests/scenarios/README.md +++ b/tests/scenarios/README.md @@ -59,6 +59,7 @@ scenery is newer. | `base_scenery` | scenery file in the game's `scenery/` dir | | `strip_trainsets` | drop the base scenery's trainsets (default `true`) | | `time` | replace the scenery start time, `HH:MM` | +| `track_friction` | set the friction of every track of the base scenery (default in the sceneries is 0.15), e.g. for slippery rail | | `fragment` | `.scn` file in `cases/` added to the scenery: trainsets after `FirstInit` (before it they derail on unlinked track), the rest before it (launchers read after it never fire) | | `vars` | values for `{{name}}` in the fragment; a list becomes one line per item | | `duration` | seconds of simulation to record | diff --git a/tests/scenarios/run.py b/tests/scenarios/run.py index 419906700..32be5dfc0 100644 --- a/tests/scenarios/run.py +++ b/tests/scenarios/run.py @@ -86,6 +86,12 @@ def set_start_time(text: str, hhmm: str) -> str: return re.sub(r"(?im)^(\s*time\s+)\d{1,2}:\d{2}", lambda m: m.group(1) + hhmm, text, count=1) +def set_track_friction(text: str, friction: float) -> str: + """Sets the friction of every track: node track ...""" + return re.sub(r"(?im)^(\s*node\s+\S+\s+\S+\s+\S+\s+track\s+\S+\s+\S+\s+\S+\s+)[-\d.]+", + lambda m: m.group(1) + f"{friction}", text) + + def fill_vars(fragment: str, values: dict, keep=frozenset()) -> str: """Replaces {{name}} with the case's value; a list value becomes one line per item.""" def value(m): @@ -107,6 +113,8 @@ def build_scenery(case: dict, game_dir: Path, case_name: str, vehicle: str) -> s text, _ = split_trainsets(text) if "time" in case: text = set_start_time(text, case["time"]) + if "track_friction" in case: + text = set_track_friction(text, case["track_friction"]) fragment = (CASES_DIR / case["fragment"]).read_bytes().decode("latin-1") # vars first: {{vehicle}} inside a var's value gets filled in the second pass fragment = fill_vars(fragment, case.get("vars", {}), keep={"vehicle"}) From fe9e2f77c24f71d965fd3d6c11478840c6f659e8 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Wed, 14 Oct 2026 14:11:54 +0200 Subject: [PATCH 278/430] feat(log): vehicle speed column in the physicslog The Velocity column is the wheel speed, which stays at 0 while the wheels are locked in a skid, so a vehicle sliding on locked wheels looked as if it stood still. Add the signed vehicle speed in km/h as the last column. --- vehicle/Driver.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 08f0c0d24..c5f5f51e9 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -1880,7 +1880,8 @@ TController::TController(bool AI, TDynamicObject *NewControll, bool InitPsyche, << "BrakePress[MPa] PipePress[MPa] MotorCurrent[A] " << "MCP SCP BCP LBP Direction Command CVal1 CVal2 " << "Security Wheelslip " - << "EngineTemp[Deg] OilTemp[Deg] WaterTemp[Deg] WaterAuxTemp[Deg]" + << "EngineTemp[Deg] OilTemp[Deg] WaterTemp[Deg] WaterAuxTemp[Deg] " + << "VehicleVelocity[km/h]" << "\r\n"; LogFile << std::fixed << std::setprecision( 4 ); #endif @@ -4817,7 +4818,9 @@ void TController::PhysicsLog() << mvControlling->dizel_heat.Ts << " " << mvControlling->dizel_heat.To << " " << mvControlling->dizel_heat.temperatura1 << " " - << mvControlling->dizel_heat.temperatura2 + << mvControlling->dizel_heat.temperatura2 << " " + // vehicle speed [km/h], the second column is the wheel speed, which stays at 0 while the wheels are locked in a skid + << mvOccupied->V * 3.6 << "\r\n"; #endif #if LOGPRESS == 1 From 6209e165583b841b61d4ec9a99b2d69b2e0db5c2 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Wed, 14 Oct 2026 14:11:54 +0200 Subject: [PATCH 279/430] test: slippery rail skid cases, wheelslip and vehicle speed checks - physicslog rows keep all columns (text ones as None), checks can read the wheelslip flag and the new vehicle speed column - slips: the lead vehicle's wheels slip at some point (makes sure a slippery rail case does what it's meant to) - slip_clears: once stopped, the wheels stop slipping within N seconds - holds_still: once stopped, the vehicle doesn't creep, by vehicle speed - td_red_signal_moving.scn: the red signal case starting already moving - eu07_slippery_red_signal / eu07_slippery_push_red_signal: skid on braking for the red signal with track friction 0.03; the pushing one fails without the fix for eu07/maszyna#479 (stays skidding, creeps) - sn61_td_timetable: stop hold 5 -> 2 s, the railcar arrives 5-7 s before its departure time, so 5 s made the case flaky --- tests/scenarios/README.md | 14 +++- .../cases/eu07_slippery_push_red_signal.json | 36 ++++++++++ .../cases/eu07_slippery_red_signal.json | 36 ++++++++++ tests/scenarios/cases/sn61_td_timetable.json | 2 +- .../scenarios/cases/td_red_signal_moving.scn | 6 ++ tests/scenarios/run.py | 68 ++++++++++++++++++- 6 files changed, 156 insertions(+), 6 deletions(-) create mode 100644 tests/scenarios/cases/eu07_slippery_push_red_signal.json create mode 100644 tests/scenarios/cases/eu07_slippery_red_signal.json create mode 100644 tests/scenarios/cases/td_red_signal_moving.scn diff --git a/tests/scenarios/README.md b/tests/scenarios/README.md index 463086cc5..4600a3577 100644 --- a/tests/scenarios/README.md +++ b/tests/scenarios/README.md @@ -71,9 +71,13 @@ scenery is newer. the one whose physicslog is checked. Other vehicles of the consist take names made from it, e.g. `{{vehicle}}_s`. The td.scn cases share two fragments, `td_timetable.scn` (route set, train runs to Przystanek) and `td_red_signal.scn` (no route, exit signal at stop), and differ -only in `vars.consist`. +only in `vars.consist`. `td_red_signal_moving.scn` is the red signal one with the train +starting at `vars.velocity` km/h; with `track_friction` 0.03 it locks the wheels when braking. -Checks (speeds in km/h, times in seconds of physicslog time, distances in metres): +Checks (speeds in km/h, times in seconds of physicslog time, distances in metres). Most use +the physicslog Velocity column, which is the wheel speed: it stays at 0 while the wheels are +locked in a skid. The ones marked *vehicle speed* use the vehicle speed column at the end of +the row instead, logged by builds from this branch on. - `starts` `min_speed`, `within`: reaches `min_speed` within `within` seconds. - `max_speed` `limit`, `tolerance`: never goes faster than `limit + tolerance`. @@ -86,6 +90,12 @@ Checks (speeds in km/h, times in seconds of physicslog time, distances in metres - `distance` `min`, `max`: total distance travelled. The physicslog has no position, so the distance comes from integrating the speed; on td.scn every vehicle's first stop after Stacja1 came out at 1400 m (+-3), and the red signal stop at 140 m. +- `slips` `within`: the lead vehicle's wheels slip or lock at some point (within `within` + seconds if given), so a slippery rail case does what it's meant to. +- `slip_clears` `moving_speed`, `stop_speed`, `within` (*vehicle speed*): once stopped after + moving off, the wheels stop slipping within `within` seconds. +- `holds_still` `moving_speed`, `stop_speed`, `max_distance` (*vehicle speed*): once stopped + after moving off, moves no more than `max_distance` metres, e.g. no creeping on locked wheels. New check types go in `CHECKS` in `run.py`; each gets the physicslog rows and the check's parameters and returns `(passed, detail)`. diff --git a/tests/scenarios/cases/eu07_slippery_push_red_signal.json b/tests/scenarios/cases/eu07_slippery_push_red_signal.json new file mode 100644 index 000000000..f7ae10bb7 --- /dev/null +++ b/tests/scenarios/cases/eu07_slippery_push_red_signal.json @@ -0,0 +1,36 @@ +{ + "description": "EU07 pushing three coaches on td.scn with slippery rail and no route set, starting at 30 km/h: brakes for the exit signal at stop and skids. Pushed by the train it doesn't roll back at the stop, so it used to stay skidding on locked wheels with the brakes capped by the sliding adhesion and creep (eu07/maszyna#479).", + "base_scenery": "td.scn", + "time": "10:34", + "track_friction": 0.03, + "fragment": "td_red_signal_moving.scn", + "vars": { + "velocity": "30", + "consist": [ + "node -1 0 {{vehicle}}_w1 dynamic pkp\\bdhpumn_v3 bdhpumn_50512608068-6 BDHPUMN_TAPICERKA_1 0 nobody 115 0 enddynamic", + "node -1 0 {{vehicle}}_w2 dynamic pkp\\bdhpumn_v3 bdhpumn_50512608011-6 BDHPUMN_NG_1 0 nobody 115 0 enddynamic", + "node -1 0 {{vehicle}}_w3 dynamic pkp\\bdhpumn_v3 bdhpumn_50512608068-6 BDHPUMN_TAPICERKA_1 0 nobody 115 0 enddynamic", + "node -1 0 {{vehicle}} dynamic pkp\\4e_v1 4e-004 4e 0 headdriver 0 0 enddynamic" + ] + }, + "duration": 240, + "timeout": 900, + "checks": [ + { + "type": "slips", + "within": 60 + }, + { + "type": "slip_clears", + "moving_speed": 5, + "stop_speed": 0.05, + "within": 5 + }, + { + "type": "holds_still", + "moving_speed": 5, + "stop_speed": 0.05, + "max_distance": 0.01 + } + ] +} diff --git a/tests/scenarios/cases/eu07_slippery_red_signal.json b/tests/scenarios/cases/eu07_slippery_red_signal.json new file mode 100644 index 000000000..40b5944eb --- /dev/null +++ b/tests/scenarios/cases/eu07_slippery_red_signal.json @@ -0,0 +1,36 @@ +{ + "description": "EU07 with three coaches on td.scn with slippery rail and no route set, starting at 30 km/h: brakes for the exit signal at stop and skids, then the skid ends and the train holds still.", + "base_scenery": "td.scn", + "time": "10:34", + "track_friction": 0.03, + "fragment": "td_red_signal_moving.scn", + "vars": { + "velocity": "30", + "consist": [ + "node -1 0 {{vehicle}} dynamic pkp\\4e_v1 4e-004 4e 0 headdriver 0 0 enddynamic", + "node -1 0 {{vehicle}}_w1 dynamic pkp\\bdhpumn_v3 bdhpumn_50512608068-6 BDHPUMN_TAPICERKA_1 0 nobody 115 0 enddynamic", + "node -1 0 {{vehicle}}_w2 dynamic pkp\\bdhpumn_v3 bdhpumn_50512608011-6 BDHPUMN_NG_1 0 nobody 115 0 enddynamic", + "node -1 0 {{vehicle}}_w3 dynamic pkp\\bdhpumn_v3 bdhpumn_50512608068-6 BDHPUMN_TAPICERKA_1 0 nobody 115 0 enddynamic" + ] + }, + "duration": 240, + "timeout": 900, + "checks": [ + { + "type": "slips", + "within": 60 + }, + { + "type": "slip_clears", + "moving_speed": 5, + "stop_speed": 0.05, + "within": 5 + }, + { + "type": "holds_still", + "moving_speed": 5, + "stop_speed": 0.05, + "max_distance": 0.01 + } + ] +} diff --git a/tests/scenarios/cases/sn61_td_timetable.json b/tests/scenarios/cases/sn61_td_timetable.json index 1db425c80..9fa4b18d8 100644 --- a/tests/scenarios/cases/sn61_td_timetable.json +++ b/tests/scenarios/cases/sn61_td_timetable.json @@ -12,6 +12,6 @@ { "type": "starts", "min_speed": 20, "within": 150 }, { "type": "max_speed", "limit": 90, "tolerance": 3 }, { "type": "brakes", "min_pressure": 0.5 }, - { "type": "stops", "moving_speed": 20, "stop_speed": 0.5, "hold": 5 } + { "type": "stops", "moving_speed": 20, "stop_speed": 0.5, "hold": 2 } ] } diff --git a/tests/scenarios/cases/td_red_signal_moving.scn b/tests/scenarios/cases/td_red_signal_moving.scn new file mode 100644 index 000000000..648e5d90a --- /dev/null +++ b/tests/scenarios/cases/td_red_signal_moving.scn @@ -0,0 +1,6 @@ +// added by tests/scenarios/run.py to td.scn, whose own trainsets were removed. +// like td_red_signal.scn (no route, the exit signal stacja1_j about 150 m ahead stays at stop), +// but the train starts already moving at {{velocity}} km/h, so it has to brake right away. +trainset td/rozklad tdo_n1734 0.0 {{velocity}} +{{consist}} +endtrainset diff --git a/tests/scenarios/run.py b/tests/scenarios/run.py index 32be5dfc0..2cd754a06 100644 --- a/tests/scenarios/run.py +++ b/tests/scenarios/run.py @@ -43,8 +43,11 @@ OUT_DIR = HERE / "out" # physicslog columns, see TController::PhysicsLog() in vehicle/Driver.cpp. # Velocity is in km/h and pressures in bar, despite the header saying m/s and MPa. COL_TIME = 0 -COL_VELOCITY = 1 +COL_VELOCITY = 1 # wheel speed: stays at 0 while the wheels are locked in a skid COL_BRAKE_PRESS = 8 +COL_COMMAND = 16 # text, read as None +COL_WHEELSLIP = 20 +COL_VEHICLE_VELOCITY = 25 # signed vehicle speed, km/h; only in builds which log it # settings layered over the user's eu07.ini for a test run TEST_INI = """\ @@ -145,7 +148,7 @@ def build_scenery(case: dict, game_dir: Path, case_name: str, vehicle: str) -> s def read_physicslog(path: Path) -> list[list[float]]: - """Returns rows of numeric columns up to BrakePress; skips the header and partial lines.""" + """Returns rows of columns, None for the text ones; skips the header and partial lines.""" rows = [] try: lines = path.read_text(errors="replace").splitlines() @@ -156,9 +159,15 @@ def read_physicslog(path: Path) -> list[list[float]]: if len(parts) <= COL_BRAKE_PRESS: continue # line still being written try: - rows.append([float(p) for p in parts[: COL_BRAKE_PRESS + 1]]) + row = [float(p) for p in parts[: COL_BRAKE_PRESS + 1]] except ValueError: continue + for p in parts[COL_BRAKE_PRESS + 1:]: + try: + row.append(float(p)) + except ValueError: + row.append(None) + rows.append(row) return rows @@ -331,7 +340,60 @@ def check_distance(rows, max=None, min=None): return ok, f"travelled {d:.0f} m (wanted {bounds})" +def check_slips(rows, within=None): + """The lead vehicle's wheels slip (or lock in a skid) at some point, e.g. to make sure a slippery rail case does what it's meant to.""" + for r in rows: + if within is not None and r[COL_TIME] > within: + break + if len(r) > COL_WHEELSLIP and r[COL_WHEELSLIP]: + return True, f"wheels slipping at t={r[COL_TIME]:.1f}s, v={r[COL_VELOCITY]:.1f} km/h" + return False, "the wheels never slipped" + + +def check_holds_still(rows, moving_speed, stop_speed, max_distance): + """Once stopped after moving off, the vehicle doesn't creep. Uses the vehicle speed rather than the + wheel speed, so it also catches a vehicle sliding on locked wheels.""" + if not rows or len(rows[0]) <= COL_VEHICLE_VELOCITY or rows[0][COL_VEHICLE_VELOCITY] is None: + return False, "the physicslog has no vehicle speed column, the build is too old" + speed = [abs(r[COL_VEHICLE_VELOCITY]) for r in rows] + start = next((i for i, v in enumerate(speed) if v >= moving_speed), None) + if start is None: + return False, f"never reached {moving_speed} km/h" + stop = next((i for i in range(start, len(rows)) if speed[i] <= stop_speed), None) + if stop is None: + return False, f"never came down to {stop_speed} km/h" + d, top, top_t = 0.0, 0.0, rows[stop][COL_TIME] + for i in range(stop + 1, len(rows)): + d += (speed[i - 1] + speed[i]) / 2 / 3.6 * (rows[i][COL_TIME] - rows[i - 1][COL_TIME]) + if speed[i] > top: + top, top_t = speed[i], rows[i][COL_TIME] + held = rows[-1][COL_TIME] - rows[stop][COL_TIME] + detail = f"stopped at t={rows[stop][COL_TIME]:.1f}s, then moved {d:.3f} m in {held:.0f}s, top {top:.4f} km/h at t={top_t:.1f}s" + return d <= max_distance, detail + + +def check_slip_clears(rows, moving_speed, stop_speed, within): + """Once the vehicle has stopped after moving off, its wheels stop slipping within `within` seconds + (a vehicle left skidding on locked wheels keeps its brakes capped by the sliding adhesion).""" + if not rows or len(rows[0]) <= COL_VEHICLE_VELOCITY or rows[0][COL_VEHICLE_VELOCITY] is None: + return False, "the physicslog has no vehicle speed column, the build is too old" + start = next((i for i, r in enumerate(rows) if abs(r[COL_VEHICLE_VELOCITY]) >= moving_speed), None) + if start is None: + return False, f"never reached {moving_speed} km/h" + stop = next((i for i in range(start, len(rows)) if abs(rows[i][COL_VEHICLE_VELOCITY]) <= stop_speed), None) + if stop is None: + return False, f"never came down to {stop_speed} km/h" + deadline = rows[stop][COL_TIME] + within + late = [r for r in rows[stop:] if r[COL_TIME] > deadline and r[COL_WHEELSLIP]] + if late: + return False, f"stopped at t={rows[stop][COL_TIME]:.1f}s, wheels still slipping at t={late[0][COL_TIME]:.1f}s ({len(late)} rows after the {within}s grace)" + return True, f"stopped at t={rows[stop][COL_TIME]:.1f}s, no slipping after t={deadline:.1f}s" + + CHECKS = { + "slips": check_slips, + "slip_clears": check_slip_clears, + "holds_still": check_holds_still, "starts": check_starts, "max_speed": check_max_speed, "brakes": check_brakes, From 02e29f69712d1e02e960c14eba32feb1a3245ab3 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 13:17:26 +0100 Subject: [PATCH 280/430] feat(simulation): test mode, --test runs a scenery unattended and exits with the result (eu07/maszyna#541) eu07 --test -s [--test-timeout ] runs the scenery in ghostview with the null renderer (models loaded, no textures), a hidden window, no sound, network or python, and in fixed steps of 0.03 s of simulation time per frame (three 10 ms physics steps) as fast as it can. Without -seed it uses a fixed seed, so two runs give byte-identical physicslogs. The scenery reports its result to the __test.result memory cell, which the simulator always creates: value 1 passes once every vehicle has stood still for 1 s, value 0 fails at once. The run ends with exit code 0 pass, 1 fail, 2 a train passed a signal at stop (SetVelocity 0 0, as seen in its driver's speed table; SetVelocity 0 x on automatic block doesn't count), 3 timeout (test.timeout, default 3600 s of simulation time), 4 standstill (every vehicle still for test.standstill s, default 300, with no result; a pass with test.pass_on_standstill yes), 5 error (no -s, the scenery didn't load or has no vehicles, an exception). The test.* keys go in the scenery's config block; test.fail_if_stop_overran no only logs a signal passed at danger. Outside the test mode a signal passed at danger is logged. The null renderer gets a ui backend which draws nothing, hands out the null texture and material instead of throwing, and ends the ui frame. A GL context is still made for the hidden window, without asking for a version, as parts of the ui create textures with gl calls of their own. No crash dialog or message box in test mode; the window code no longer needs a monitor. --- CMakeLists.txt | 1 + EU07.cpp | 17 +++- application/application.cpp | 82 +++++++++++++--- application/drivermode.cpp | 13 +++ application/scenarioloadermode.cpp | 10 ++ rendering/nullrenderer.cpp | 19 ++++ rendering/nullrenderer.h | 30 ++++-- simulation/simulation.cpp | 3 + simulation/simulationtest.cpp | 149 +++++++++++++++++++++++++++++ simulation/simulationtest.h | 66 +++++++++++++ utilities/Globals.cpp | 37 +++++++ utilities/Globals.h | 10 ++ utilities/Timer.cpp | 13 ++- utilities/Timer.h | 3 + vehicle/Driver.cpp | 29 +++++- vehicle/Driver.h | 2 + 16 files changed, 458 insertions(+), 26 deletions(-) create mode 100644 simulation/simulationtest.cpp create mode 100644 simulation/simulationtest.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f34ad61f..8a4e1d6ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -160,6 +160,7 @@ set(SOURCES "world/station.cpp" "application/application.cpp" "simulation/simulationtime.cpp" +"simulation/simulationtest.cpp" "scene/sceneeditor.cpp" "rendering/screenshot.cpp" "input/driverkeyboardinput.cpp" diff --git a/EU07.cpp b/EU07.cpp index e03618297..aac7cae11 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -19,6 +19,8 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #include "stdafx.h" #include "application/application.h" +#include "simulation/simulationtest.h" +#include "utilities/Globals.h" #include "utilities/Logs.h" #include #ifdef WITHDUMPGEN @@ -148,9 +150,14 @@ int main(int argc, char *argv[]) #ifdef _WIN32 catch (std::runtime_error const &Error) { - std::string msg = "Simulator crash occured :(\n"; - msg += Error.what(); - MessageBoxA(nullptr, msg.c_str(), "Simulator crashed :(", MB_ICONERROR); + ErrorLog("Critical error: " + std::string(Error.what())); + // in test mode nobody is there to close the box, the exit code tells of the error + if (false == Global.test.enabled) + { + std::string msg = "Simulator crash occured :(\n"; + msg += Error.what(); + MessageBoxA(nullptr, msg.c_str(), "Simulator crashed :(", MB_ICONERROR); + } } #endif } @@ -158,5 +165,7 @@ int main(int argc, char *argv[]) fflush(stdout); fflush(stderr); #endif - std::_Exit(0); // skip destructors, there are ordering errors which causes segfaults + // skip destructors, there are ordering errors which causes segfaults + // a test run (--test) says its result in the exit code + std::_Exit(Global.test.enabled ? simulation::Test.exit_code() : 0); } diff --git a/application/application.cpp b/application/application.cpp index ee381f98b..37afff67f 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -378,7 +378,7 @@ int eu07_application::init(int Argc, char *Argv[]) return result; } - if (crashreport_is_pending()) + if (crashreport_is_pending() && false == Global.test.enabled) { // run crashgui as early as possible if ((result = run_crashgui()) != 0) { @@ -951,14 +951,17 @@ GLFWwindow *eu07_application::window(int const Windowindex, bool visible, int wi } // for index -1 create a new child window - auto const *vmode{glfwGetVideoMode(monitor ? monitor : glfwGetPrimaryMonitor())}; - - // match requested video mode to current to allow for - // fullwindow creation when resolution is the same - glfwWindowHint(GLFW_RED_BITS, vmode->redBits); - glfwWindowHint(GLFW_GREEN_BITS, vmode->greenBits); - glfwWindowHint(GLFW_BLUE_BITS, vmode->blueBits); - glfwWindowHint(GLFW_REFRESH_RATE, vmode->refreshRate); + auto *videomonitor{monitor ? monitor : glfwGetPrimaryMonitor()}; + // a machine without a display (e.g. a test runner) has no monitor to match + if (auto const *vmode{videomonitor ? glfwGetVideoMode(videomonitor) : nullptr}) + { + // match requested video mode to current to allow for + // fullwindow creation when resolution is the same + glfwWindowHint(GLFW_RED_BITS, vmode->redBits); + glfwWindowHint(GLFW_GREEN_BITS, vmode->greenBits); + glfwWindowHint(GLFW_BLUE_BITS, vmode->blueBits); + glfwWindowHint(GLFW_REFRESH_RATE, vmode->refreshRate); + } glfwWindowHint(GLFW_VISIBLE, visible); @@ -1195,6 +1198,19 @@ int eu07_application::init_settings(int Argc, char *Argv[]) WriteLog(std::format("seed given on the command line: {} -> {}", Argv[i], Global.random_seed)); } } + else if (token == "--test") + { + // integration test: the scenery runs unattended and the exit code is the result (eu07/maszyna#541) + Global.test.enabled = true; + } + else if (token == "--test-timeout") + { + if (i + 1 < Argc) + { + Global.test.timeout = std::max(0.0, std::atof(Argv[++i])); + Global.test.timeout_from_command_line = true; + } + } else if (token == "-ini") { // extra settings file read on top of eu07.ini, so a run can override a few keys @@ -1210,13 +1226,45 @@ int eu07_application::init_settings(int Argc, char *Argv[]) << " [-v vehiclename]" << " [-edit [sceneryfilepath]]" << " [-seed number|word]" - << " [-ini settingsfile]" << std::endl; + << " [-ini settingsfile]" + << " [--test [--test-timeout seconds]]" << std::endl; return -1; } } if (editwithoutscenery && false == sceneryfromcommandline) Global.SceneryFile.clear(); + if (Global.test.enabled) + { + if (false == sceneryfromcommandline || Global.SceneryFile.empty()) + { + ErrorLog("test: --test needs a scenery given with -s"); + return -1; + } + // nobody watches nor listens: no player vehicle, nothing drawn, no sound, no window in the way + Global.editor_session = false; + Global.local_start_vehicle = "ghostview"; + Global.GfxRenderer = "null"; + Global.NvRenderer = false; + Global.bSoundEnabled = false; + Global.python_enabled = false; + Global.bInactivePause = false; + Global.bFullScreen = false; + Global.fullscreen_windowed = false; + Global.VSync = false; + Global.iMultisampling = 0; + Global.gfx_usegles = false; + Global.minframetime = std::chrono::duration(0.0f); + Global.extra_viewports.clear(); + Global.headtrack_conf.joy.clear(); + // a test runs on its own + Global.network_servers.clear(); + Global.network_client.reset(); + // and the same way every time, unless given another seed (-seed, or randomseed in the settings) + if (!Global.random_seed) + Global.random_seed = seed_of("test"); + } + return 0; } @@ -1290,6 +1338,12 @@ int eu07_application::init_glfw() { glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API); } + else if (Global.test.enabled) + { + // the null renderer draws nothing, but parts of the ui make textures with gl calls of their own. + // any context will do for them, so none is asked for in particular: a machine without a graphics + // driver (a test runner) has only the basic one of the system + } else { if (!Global.LegacyRenderer) @@ -1341,7 +1395,8 @@ int eu07_application::init_glfw() Global.bFullScreen = true; } - auto *mainwindow = window(-1, true, Global.window_size.x, Global.window_size.y, Global.bFullScreen ? monitor : nullptr, true, false); + // test mode keeps its window hidden: glfw, the ui and the input still need one, but nothing is shown in it + auto *mainwindow = window(-1, false == Global.test.enabled, Global.window_size.x, Global.window_size.y, Global.bFullScreen ? monitor : nullptr, true, false); if (mainwindow == nullptr) { @@ -1428,6 +1483,11 @@ int eu07_application::init_gfx() // default render path GfxRenderer = gfx_renderer_factory::get_instance()->create("modern"); } + else if (Global.GfxRenderer == "null") + { + // draws nothing and loads no textures (test mode) + GfxRenderer = gfx_renderer_factory::get_instance()->create("null"); + } else if (Global.GfxRenderer == "experimental") { GfxRenderer = gfx_renderer_factory::get_instance()->create(Global.GfxRenderer); diff --git a/application/drivermode.cpp b/application/drivermode.cpp index b55d09c2b..1b3a44d63 100644 --- a/application/drivermode.cpp +++ b/application/drivermode.cpp @@ -17,6 +17,7 @@ http://mozilla.org/MPL/2.0/. #include "simulation/simulation.h" #include "simulation/simulationtime.h" #include "simulation/simulationenvironment.h" +#include "simulation/simulationtest.h" #include "scene/scene.h" #include "rendering/lightarray.h" #include "rendering/particles.h" @@ -305,6 +306,11 @@ bool driver_mode::update() simulation::Events.update(); simulation::Region->update_events(); simulation::Lights.update(); + + if (Global.test.enabled && simulation::is_ready) + { + simulation::Test.update(deltatime); + } } // render time routines follow: @@ -478,6 +484,13 @@ void driver_mode::enter() Timer::ResetTimers(); + if (Global.test.enabled) + { + // the test runs as fast as it can compute, in steps of fixed length, so that runs on different machines agree + Timer::set_fixed_step(simulation::test_manager::frame_step); + simulation::Test.start(); + } + set_picking(!Global.captureonstart); m_editorpending = Global.editor_session; diff --git a/application/scenarioloadermode.cpp b/application/scenarioloadermode.cpp index f8f06ac93..b84c1912f 100644 --- a/application/scenarioloadermode.cpp +++ b/application/scenarioloadermode.cpp @@ -14,6 +14,7 @@ http://mozilla.org/MPL/2.0/. #include "simulation/simulation.h" #include "simulation/simulationtime.h" #include "simulation/simulationenvironment.h" +#include "simulation/simulationtest.h" #include "application/application.h" #include "application/scenarioloaderuilayer.h" #include "rendering/renderer.h" @@ -58,6 +59,10 @@ bool scenarioloader_mode::update() { catch (std::runtime_error const &e) { ErrorLog(std::format("Bad init: scenario \"{}\" couldn't be opened ({})", Global.SceneryFile, e.what())); state.reset(); + if (Global.test.enabled) { + simulation::Test.finish(simulation::test_result::error, "scenario couldn't be opened"); + return true; + } Global.SceneryFile.clear(); Application.pop_mode(); Application.push_mode(eu07_application::mode::launcher); @@ -73,6 +78,11 @@ bool scenarioloader_mode::update() { // back to the launcher as when the scenario can't be opened, not on to the driver mode with the scenery half loaded ErrorLog( "Bad init: scenario loading failed" ); state.reset(); + if( Global.test.enabled ) { + // there's nothing to test; the exit code says the run went wrong + simulation::Test.finish( simulation::test_result::error, "scenario loading failed" ); + return true; + } Global.SceneryFile.clear(); Application.pop_mode(); Application.push_mode(eu07_application::mode::launcher); diff --git a/rendering/nullrenderer.cpp b/rendering/nullrenderer.cpp index 332d357c7..f193ad3e4 100644 --- a/rendering/nullrenderer.cpp +++ b/rendering/nullrenderer.cpp @@ -1,6 +1,25 @@ #include "stdafx.h" #include "rendering/nullrenderer.h" +#include "application/application.h" + +void null_imgui_renderer::BeginFrame() +{ + auto &io { ImGui::GetIO() }; + if( false == io.Fonts->IsBuilt() ) { + unsigned char *pixels; + int width, height; + io.Fonts->GetTexDataAsAlpha8( &pixels, &width, &height ); + } +} + +bool null_renderer::Render() +{ + // the ui frame begun by the application has to be ended, or imgui won't start the next one + Application.render_ui(); + return true; +} + std::unique_ptr null_renderer::create_func() { return std::make_unique(); diff --git a/rendering/nullrenderer.h b/rendering/nullrenderer.h index 0b21580b9..2a7ef0398 100644 --- a/rendering/nullrenderer.h +++ b/rendering/nullrenderer.h @@ -35,7 +35,18 @@ private: release_() override { /* null implementation, nothing to do */ } }; +// user interface backend which draws nothing: imgui still builds its frames, so the ui code runs as usual +class null_imgui_renderer : public imgui_renderer { +public: + bool Init() override { return true; } + void Shutdown() override { /* null implementation, nothing to do */ } + // imgui wants its font atlas built before a frame starts; that's done on the cpu, no texture is made of it + void BeginFrame() override; + void Render() override { /* null implementation, nothing to do */ } +}; + // bare-bones render controller, in lack of anything better yet +// it's the renderer of the test mode (--test): models are loaded for the physics, textures aren't class null_renderer : public gfx_renderer { public: @@ -49,7 +60,7 @@ public: Init( GLFWwindow *Window ) override { return true; } // main draw call. returns false on error bool - Render() override { return true; } + Render() override; void SwapBuffers() override { /* null implementation, nothing to do */ } inline @@ -105,20 +116,22 @@ public: void Bind_Material( material_handle const Material, TSubModel const *sm = nullptr, lighting_data const *lighting = nullptr ) override { /* null implementation, nothing to do */ } IMaterial const * - Material( material_handle const Material ) const override { return m_materials.at(Material - 1).get(); } + Material( material_handle const Material ) const override { + return ( Material > 0 && static_cast( Material ) <= m_materials.size() ? m_materials[ Material - 1 ].get() : IMaterial::null_material() ); } // shader methods auto Fetch_Shader( std::string const &name ) -> std::shared_ptr override { throw std::runtime_error("not impl"); } // texture methods + // no textures are loaded; whoever asks gets the null texture texture_handle - Fetch_Texture( std::string const &Filename, bool const Loadnow = true, GLint format_hint = GL_SRGB_ALPHA ) override { throw std::runtime_error("not impl"); } + Fetch_Texture( std::string const &Filename, bool const Loadnow = true, GLint format_hint = GL_SRGB_ALPHA ) override { return null_handle; } void Bind_Texture( texture_handle const Texture ) override { /* null implementation, nothing to do */ } void Bind_Texture( std::size_t const Unit, texture_handle const Texture ) override { /* null implementation, nothing to do */ } - opengl_texture & - Texture( texture_handle const Texture ) override { throw std::runtime_error("not impl"); } - opengl_texture const & - Texture( texture_handle const Texture ) const override { throw std::runtime_error("not impl"); } + ITexture & + Texture( texture_handle const Texture ) override { return *ITexture::null_texture(); } + ITexture const & + Texture( texture_handle const Texture ) const override { return *ITexture::null_texture(); } // utility methods void Pick_Control_Callback( std::function Callback ) override { /* null implementation, nothing to do */ } @@ -152,11 +165,12 @@ public: imgui_renderer *GetImguiRenderer() override { - return nullptr; + return &m_imgui; } private: std::string empty_str; + null_imgui_renderer m_imgui; gfx::geometrybank_manager m_geometry; std::vector> m_materials; }; diff --git a/simulation/simulation.cpp b/simulation/simulation.cpp index ea2177170..59635c38c 100644 --- a/simulation/simulation.cpp +++ b/simulation/simulation.cpp @@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/. #include "simulation/simulation.h" #include "simulation/simulationtime.h" #include "simulation/simulationenvironment.h" +#include "simulation/simulationtest.h" #include "utilities/Globals.h" #include "world/Event.h" @@ -109,6 +110,8 @@ state_manager::init_scripting_interface() { simulation::Memory.insert( memorycell ); simulation::Region->insert( memorycell ); } + // the cell a test scenery reports its result to + simulation::Test.init_result_cell(); } // legacy method, calculates changes in simulation state over specified time diff --git a/simulation/simulationtest.cpp b/simulation/simulationtest.cpp new file mode 100644 index 000000000..4dbe4c24f --- /dev/null +++ b/simulation/simulationtest.cpp @@ -0,0 +1,149 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "simulation/simulationtest.h" + +#include "application/application.h" +#include "scene/scene.h" +#include "simulation/simulation.h" +#include "utilities/Globals.h" +#include "utilities/Logs.h" +#include "vehicle/DynObj.h" +#include "world/Event.h" +#include "world/MemCell.h" + +namespace simulation { + +test_manager Test; + +std::string_view to_string(test_result const Result) +{ + switch (Result) + { + case test_result::pass: return "pass"; + case test_result::fail: return "fail"; + case test_result::signal_passed_at_danger: return "signal passed at danger"; + case test_result::timeout: return "timeout"; + case test_result::standstill: return "standstill"; + case test_result::error: return "error"; + } + return "unknown"; +} + +void test_manager::init_result_cell() +{ + auto *cell = new TMemCell({0, -1, std::string(result_cell), "memcell"}); + // neither of the reported values, so that a cell nobody wrote to says nothing + cell->UpdateValues("", -1.0, 0.0, basic_event::flags::value1 | basic_event::flags::value2); + simulation::Memory.insert(cell); + simulation::Region->insert(cell); +} + +void test_manager::start() +{ + if (m_started) + return; + m_started = true; + m_time = 0.0; + m_resttime = 0.0; + if (simulation::Vehicles.sequence().empty()) + { + // most likely the scenery wasn't found, or it isn't a test scenery + finish(test_result::error, "the scenery has no vehicles"); + return; + } + // a pause set by the scenery or the settings would never be lifted, nobody is there to press the key + Global.iPause = 0; + WriteLog(std::format("test: started, timeout {:.0f} s, standstill {:.0f} s{}{}", Global.test.timeout, Global.test.standstill, + Global.test.pass_on_standstill ? ", standstill passes" : "", + Global.test.fail_if_stop_overran ? "" : ", signals passed at danger allowed")); +} + +void test_manager::update(double const Deltatime) +{ + if (false == m_started || m_finished) + return; + + m_time += Deltatime; + + if (auto const *cell = simulation::Memory.find(std::string(result_cell))) + { + auto const value { cell->Value1() }; + auto const reason { cell->Text().empty() ? std::string() : " (" + cell->Text() + ")" }; + if (value == 0.0) + { + finish(test_result::fail, "__test.result set to 0" + reason); + return; + } + if (value == 1.0 && false == m_passrequested) + { + m_passrequested = true; + WriteLog(std::format("test: pass requested at {:.1f} s{}, waiting for every vehicle to stop", m_time, reason)); + } + } + + auto const atrest = std::none_of(simulation::Vehicles.sequence().begin(), simulation::Vehicles.sequence().end(), + [](TDynamicObject const *Vehicle) { return std::abs(Vehicle->GetVelocity()) > 0.01; }); + m_resttime = atrest ? m_resttime + Deltatime : 0.0; + + if (m_passrequested && m_resttime >= pass_settle_time) + { + finish(test_result::pass, "__test.result set to 1 and every vehicle stopped"); + return; + } + if (Global.test.standstill > 0.0 && m_resttime >= Global.test.standstill) + { + auto const reason { std::format("every vehicle stood still for {:.0f} s", Global.test.standstill) }; + finish(Global.test.pass_on_standstill ? test_result::pass : test_result::standstill, reason); + return; + } + if (Global.test.timeout > 0.0 && m_time >= Global.test.timeout) + { + finish(test_result::timeout, std::format("no result after {:.0f} s", Global.test.timeout)); + return; + } +} + +void test_manager::signal_passed_at_danger(std::string const &Vehicle, std::string const &Signal) +{ + auto const reason { Vehicle + " passed signal " + Signal + " at danger" }; + if (false == Global.test.enabled) + { + WriteLog(reason, logtype::generic); + return; + } + if (false == Global.test.fail_if_stop_overran) + { + WriteLog(std::format("test: {} at {:.1f} s, allowed by test.fail_if_stop_overran", reason, m_time)); + return; + } + finish(test_result::signal_passed_at_danger, reason); +} + +void test_manager::finish(test_result const Result, std::string const &Reason) +{ + if (m_finished || false == Global.test.enabled) + return; + m_finished = true; + m_result = Result; + + auto const line { std::format("test: {} (exit code {}) after {:.1f} s of simulation time: {}", to_string(Result), static_cast(Result), m_time, Reason) }; + if (Result == test_result::pass) + WriteLog(line); + else + ErrorLog(line); + // the process has no console of its own; whoever started it with a redirected output gets the verdict there too + std::fprintf(stdout, "%s\n", line.c_str()); + std::fflush(stdout); + + Application.queue_quit(true); +} + +} // namespace simulation diff --git a/simulation/simulationtest.h b/simulation/simulationtest.h new file mode 100644 index 000000000..c9bc5437e --- /dev/null +++ b/simulation/simulationtest.h @@ -0,0 +1,66 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include + +// integration test mode (eu07 --test -s , eu07/maszyna#541): the scenery runs unattended in a tight +// fixed-step loop and the simulator quits with an exit code saying how the test went +namespace simulation { + +// exit codes of a test run; public, scripts and CI read them +enum class test_result : int { + pass = 0, // __test.result set to 1, then every vehicle came to rest (or test.pass_on_standstill) + fail = 1, // __test.result set to 0 + signal_passed_at_danger = 2, // a train went past a stop signal (SetVelocity 0 0), unless test.fail_if_stop_overran no + timeout = 3, // test.timeout seconds of simulation time went by without a result + standstill = 4, // every vehicle stood still for test.standstill seconds without a result + error = 5, // the run could not start (no -s, the scenery failed to load) or the simulator threw +}; + +std::string_view to_string(test_result Result); + +class test_manager { + +public: + // name of the memory cell a scenery reports its result to + static constexpr std::string_view result_cell { "__test.result" }; + // how long everything has to stand before a requested pass is granted [s] + static constexpr double pass_settle_time { 1.0 }; + // fixed simulation time step of one frame in test mode [s]: 3 physics steps of 10 ms + static constexpr double frame_step { 0.03 }; + + // creates the result cell; called with the other scripting interface cells, before the scenery is read + void init_result_cell(); + // the simulation is ready: start the clocks + void start(); + // checks the end conditions after a simulation frame of Deltatime seconds + void update(double Deltatime); + // reported by a driver whose train went past a signal showing stop + void signal_passed_at_danger(std::string const &Vehicle, std::string const &Signal); + // ends the test with given result; the first call wins + void finish(test_result Result, std::string const &Reason); + + bool finished() const { return m_finished; } + // exit code of the process: the result, or error while the test hasn't finished + int exit_code() const { return static_cast(m_finished ? m_result : test_result::error); } + +private: + bool m_started { false }; + bool m_finished { false }; + test_result m_result { test_result::error }; + bool m_passrequested { false }; + double m_time { 0.0 }; // simulation time since the start [s] + double m_resttime { 0.0 }; // how long every vehicle has been standing [s] +}; + +extern test_manager Test; + +} // namespace simulation diff --git a/utilities/Globals.cpp b/utilities/Globals.cpp index b4f2e14be..e36223174 100644 --- a/utilities/Globals.cpp +++ b/utilities/Globals.cpp @@ -456,6 +456,40 @@ bool global_settings::ConfigParseInput(cParser& Parser, const std::string& token return false; } +bool global_settings::ConfigParseTest(cParser& Parser, const std::string& token) +{ + // integration test limits, usually given in the config block of a test scenery + if (token == "test.timeout") + { + double value{ test.timeout }; + ParseOne(Parser, value); + if (false == test.timeout_from_command_line) + test.timeout = std::max(0.0, value); + return true; + } + + if (token == "test.standstill") + { + ParseOne(Parser, test.standstill); + test.standstill = std::max(0.0, test.standstill); + return true; + } + + if (token == "test.pass_on_standstill") + { + ParseOne(Parser, test.pass_on_standstill); + return true; + } + + if (token == "test.fail_if_stop_overran") + { + ParseOne(Parser, test.fail_if_stop_overran); + return true; + } + + return false; +} + bool global_settings::ConfigParseSimulation(cParser& Parser, const std::string& token) { if (token == "async.trainThreads") @@ -1316,6 +1350,9 @@ void global_settings::ConfigParse(cParser& Parser) if (ConfigParseDebug(Parser, token)) continue; + if (ConfigParseTest(Parser, token)) + continue; + // WriteLog(std::format("Unknown config token: {}", token), logtype::warning, false); } while (true); diff --git a/utilities/Globals.h b/utilities/Globals.h index ad216cd96..8fa04e9ce 100644 --- a/utilities/Globals.h +++ b/utilities/Globals.h @@ -86,6 +86,15 @@ struct global_settings { std::string local_start_vehicle{ "EU07-424" }; std::string editor_enter_vehicle; // vehicle placed in the editor, to be entered when the driving goes on bool editor_session{ false }; // scenery was opened for editing (-edit): loader keeps track of scenery layers and hands over to the editor + // integration test mode (--test, eu07/maszyna#541); the limits can be set in the scenery's config block (test.*) + struct test_settings { + bool enabled{ false }; + double timeout{ 3600.0 }; // [s] of simulation time; no result by then fails the test + double standstill{ 300.0 }; // [s] every vehicle standing still this long ends the test; 0 = never + bool pass_on_standstill{ false }; // the standstill end passes the test instead of failing it + bool fail_if_stop_overran{ true }; // a train passing a signal at stop ends the test as failed; with false it's only logged + bool timeout_from_command_line{ false }; // --test-timeout given, the scenery doesn't override it + } test; bool editor_tracks{ false }; // F3 track workspace: draw and pick tracks without the scenery draw-range cap int iConvertModels{ 0 }; // tworzenie plików binarnych int iConvertIndexRange{ 1000 }; // range of duplicate vertex scan @@ -377,6 +386,7 @@ struct global_settings { bool ConfigParseNetwork(cParser& Parser, const std::string& token); bool ConfigParseHardware(cParser& Parser, const std::string& token); bool ConfigParseDebug(cParser& Parser, const std::string& token); + bool ConfigParseTest(cParser& Parser, const std::string& token); bool ConfigParse_gfx( cParser &parser, std::string_view const Token ); // sends basic content of the class in legacy (text) format to provided stream void diff --git a/utilities/Timer.cpp b/utilities/Timer.cpp index 0b877f2b4..388330bbe 100644 --- a/utilities/Timer.cpp +++ b/utilities/Timer.cpp @@ -26,6 +26,7 @@ double fRenderTime{ 0.0 }; double fSoundTimer{ 0.0 }; double fSinceStart{ 0.0 }; double override_delta = -1.0f; +double fixed_step = 0.0; double GetTime() { @@ -53,6 +54,11 @@ void set_delta_override(double t) override_delta = t; } +void set_fixed_step(double t) +{ + fixed_step = t; +} + void ResetTimers() { UpdateTimers( Global.iPause != 0 ); @@ -76,10 +82,15 @@ void UpdateTimers(bool pause) fr = 1000000000; #endif DeltaRenderTime = double(count - oldCount) / double(fr); + if (fixed_step > 0.0) + { + // the frame lasts exactly as long as said, however long it took to compute; the time speed doesn't apply + DeltaRenderTime = fixed_step; + } fRenderTime += DeltaRenderTime; if (!pause) { - DeltaTime = Global.fTimeSpeed * DeltaRenderTime; + DeltaTime = (fixed_step > 0.0 ? 1.0 : Global.fTimeSpeed) * DeltaRenderTime; fSoundTimer += DeltaTime; if (fSoundTimer > 0.1) fSoundTimer = 0.0; diff --git a/utilities/Timer.h b/utilities/Timer.h index 32e170a46..15fdd4f6b 100644 --- a/utilities/Timer.h +++ b/utilities/Timer.h @@ -19,6 +19,9 @@ double GetDeltaRenderTime(); void set_delta_override(double v); +// every frame advances the clocks by this many seconds, whatever the real time; 0 = real time (test mode) +void set_fixed_step(double v); + void ResetTimers(); void UpdateTimers(bool pause); diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index c5f5f51e9..5f1bde20c 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -26,6 +26,7 @@ http://mozilla.org/MPL/2.0/. #include "world/MemCell.h" #include "simulation/simulation.h" #include "simulation/simulationtime.h" +#include "simulation/simulationtest.h" #include "world/Track.h" #include "world/station.h" #include "input/keyboardinput.h" @@ -767,7 +768,12 @@ void TController::TableCheck(double fDistance) { // aktualizacja rekordów z wyjątkiem ostatniego if (sSpeedTable[i].iFlags & spEnabled) // jeśli pozycja istotna { - if (sSpeedTable[i].Update()) + auto const waspassed { TestFlag( sSpeedTable[ i ].iFlags, spElapsed ) }; + auto const switchchanged { sSpeedTable[ i ].Update() }; + if( false == waspassed ) { + CheckSignalPassedAtDanger( sSpeedTable[ i ] ); + } + if (switchchanged) { if( Global.iWriteLogEnabled & 8 ) { WriteLog( "Speed table for " + OwnerName() + " detected switch change at " + sSpeedTable[ i ].trTrack->name() + " (generating fresh trace)" ); @@ -816,7 +822,12 @@ void TController::TableCheck(double fDistance) } } } - sSpeedTable[iLast].Update(); // aktualizacja ostatniego + // aktualizacja ostatniego; a signal at stop often is the last, the scan doesn't go past it + auto const lastwaspassed { TestFlag( sSpeedTable[ iLast ].iFlags, spElapsed ) }; + sSpeedTable[iLast].Update(); + if( false == lastwaspassed ) { + CheckSignalPassedAtDanger( sSpeedTable[ iLast ] ); + } // WriteLog("TableCheck: Upate last track. Dist=" + AnsiString(sSpeedTable[iLast].fDist)); if( sSpeedTable[ iLast ].fDist < fDistance ) { TableTraceRoute( fDistance, pVehicles[ end::rear ] ); // doskanowanie dalszego odcinka @@ -827,6 +838,20 @@ void TController::TableCheck(double fDistance) } }; +void TController::CheckSignalPassedAtDanger( TSpeedPos const &Point ) const +{ + if( false == TestFlag( Point.iFlags, spElapsed ) + || false == TestFlag( Point.iFlags, spEvent ) + || false == TestFlag( Point.iFlags, spSemaphor ) + || true == TestFlag( Point.iFlags, spStopOnSBL ) // SetVelocity 0 x on automatic block: may go on after a stop + || Point.fVelNext != 0.0 + || Point.evEvent == nullptr + || ( mvOccupied->CategoryFlag & 1 ) == 0 ) { // railway only + return; + } + simulation::Test.signal_passed_at_danger( OwnerName(), Point.evEvent->m_name ); +} + auto const passengerstopmaxdistance { 400.0 }; // maximum allowed distance between passenger stop point and consist head TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fNext, double &fAcc) diff --git a/vehicle/Driver.h b/vehicle/Driver.h index f88e115ac..8c12087f9 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -519,6 +519,8 @@ private: bool TableNotFound( basic_event const *Event, double const Distance ) const; void TableTraceRoute( double fDistance, TDynamicObject *pVehicle ); void TableCheck( double fDistance ); + // reports the train going past a signal showing stop (SetVelocity 0 0); called once the head passed Point + void CheckSignalPassedAtDanger( TSpeedPos const &Point ) const; TCommandType TableUpdate( double &fVelDes, double &fDist, double &fNext, double &fAcc ); bool TableUpdateStopPoint( TCommandType &Command, TSpeedPos &Point, double const Signaldistance ); bool TableUpdateEvent( double &Velocity, TCommandType &Command, TSpeedPos &Point, double &Signaldistance, int const Pointindex ); From 6a538d202b6437e27e189e7c63a0fa413da65167 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 13:17:27 +0100 Subject: [PATCH 281/430] test: scenario tests run in the simulator's test mode and check its exit code run.py starts eu07 with --test (and --test-timeout for cases that record a fixed time) and compares the result from the exit code with the case's expect key, before the physicslog checks. The 14 cases take about 30 s with -j 4 instead of minutes. --watch keeps the old windowed run. New case keys: expect, test_config (lines of a config block), track_events (lines added to a track of the base scenery, e.g. event0 test_pass). New cases show each end of the test mode: test_mode_pass, _signal_passed_at_danger, _timeout and _standstill. The slippery rail cases slide past the red signal, which now ends a test, so they set test.fail_if_stop_overran no. README documents the test mode for scenery authors. --- tests/scenarios/README.md | 130 ++++++++++++++---- .../cases/eu07_slippery_push_red_signal.json | 3 + .../cases/eu07_slippery_red_signal.json | 3 + tests/scenarios/cases/td_red_signal_pass.scn | 8 ++ tests/scenarios/cases/test_mode_pass.json | 31 +++++ .../test_mode_signal_passed_at_danger.json | 22 +++ .../scenarios/cases/test_mode_standstill.json | 26 ++++ tests/scenarios/cases/test_mode_timeout.json | 21 +++ tests/scenarios/run.py | 122 ++++++++++++---- 9 files changed, 315 insertions(+), 51 deletions(-) create mode 100644 tests/scenarios/cases/td_red_signal_pass.scn create mode 100644 tests/scenarios/cases/test_mode_pass.json create mode 100644 tests/scenarios/cases/test_mode_signal_passed_at_danger.json create mode 100644 tests/scenarios/cases/test_mode_standstill.json create mode 100644 tests/scenarios/cases/test_mode_timeout.json diff --git a/tests/scenarios/README.md b/tests/scenarios/README.md index 4600a3577..1ebd84c75 100644 --- a/tests/scenarios/README.md +++ b/tests/scenarios/README.md @@ -1,49 +1,121 @@ # Scenario tests -End-to-end checks that run the real simulator on a scenery and look at what a vehicle -did: did it start, did it keep to the speed limit, did it brake and stop. +End-to-end checks that run the real simulator on a scenery and look at how the run ended +and what a vehicle did: did it start, did it keep to the speed limit, did it brake and stop, +did it pass a signal at stop. Scenery and vehicle data are not in this repo, so these run against a local game install only, not in CI. +## The simulator's test mode + +The runner drives the simulator's test mode (eu07/maszyna#541), which works without the +runner too and is meant for scenery authors as well: + +``` +eu07 --test -s [--test-timeout ] [-seed ] [-ini ] +``` + +With `--test` the simulator: + +- needs `-s`; `-v` is ignored and every train is driven by AI (ghostview), +- draws nothing: the null renderer loads the 3D models (the physics needs some of their + data) but no textures, and the window stays hidden, +- has no sound, no network, no python, no pause (not even one set by the scenery), and + no crash dialog, +- runs the simulation as fast as it can in fixed steps of 0.03 s of simulation time per + frame (three 10 ms physics steps), whatever the real time, the time speed or the machine, +- seeds its random numbers with a fixed seed unless `-seed` or `randomseed` gives one, so two + runs of a scenery come out the same (the physicslogs of two runs are byte for byte equal), +- quits when the test ends, and says how it ended in the exit code and in a `test: ...` + line on stdout and in the log. + +A scenery reports its result to the memory cell `__test.result`, which the simulator creates +(in every run, so a test scenery loads normally too). Write value 1 to it for a pass and 0 +for a failure, with an `UpdateValues` event; other values are ignored, and the text, if +given, goes to the log as the reason: + +``` +event test_pass UpdateValues 0 __test.result reached_the_stop 1 * endevent +event test_fail UpdateValues 0 __test.result wrong_track 0 * endevent +``` + +(`PutValues` isn't the event for it: it hands a command to a vehicle, it doesn't write a cell.) +A good place for the pass event is `event0` of a track the train should stop on: it runs +while a train stands there, and the length of the track is the margin of the stop. + +The test ends with the first of these: + +| exit code | result | when | +| --- | --- | --- | +| 0 | pass | `__test.result` was set to 1 and then every vehicle stood still for 1 s, so a train still moving towards a signal at stop has to stop first. Also the standstill end with `test.pass_on_standstill yes` | +| 1 | fail | `__test.result` was set to 0; ends at once | +| 2 | signal passed at danger | a train went past a signal showing stop (`SetVelocity 0 0`; `SetVelocity 0 x` on automatic block, which may be passed after a stop, doesn't count); ends at once, unless `test.fail_if_stop_overran no` | +| 3 | timeout | `test.timeout` seconds of simulation time went by (default 3600) | +| 4 | standstill | every vehicle stood still for `test.standstill` seconds (default 300) and nothing reported a result. Trains waiting at a station or for a signal count as standing, so the limit has to be longer than such waits | +| 5 | error | the run could not start: no `-s`, the scenery failed to load or has no vehicles, or the simulator threw | + +A crash ends with the system's code instead (on Windows e.g. `0xC0000005`, -1073741819). + +The limits go in a `config` block of the scenery: + +``` +config +test.timeout 600 +test.standstill 120 +test.pass_on_standstill no +test.fail_if_stop_overran yes +endconfig +``` + +`--test-timeout` on the command line wins over `test.timeout` of the scenery. + +A signal is passed at danger when the head of a train goes past a signal which its driver +has in its speed table, showing stop. So it's the driver's view that counts: a train without +a driver isn't watched, and neither is a signal the driver never scanned (a train placed at +100 km/h 150 m before a signal at stop got past it before its AI first looked ahead; at +60 km/h it was caught). Outside the test mode the same is written to the log, nothing more. + ## Running ``` -python tests/scenarios/run.py --game-dir "E:/Program Files (x86)/Steam/steamapps/common/MaSzyna" -j 4 +python tests/scenarios/run.py --game-dir "C:/Steam/steamapps/common/MaSzyna" -j 4 ``` Python 3.10+, no extra packages. Options: - `EU07_GAME_DIR` can replace `--game-dir`. - `--exe path/to/eu07.exe` picks the build to test; the default is the newest - `cmake-build-*/bin/Release/eu07*.exe`. The build needs the `-ini` command line option. + `cmake-build-*/bin/Release/eu07*.exe`. The build needs the `--test` and `-ini` command + line options. - name one or more cases to run only those, e.g. `run.py ... eu07_td_timetable`. -- `-j N` runs N cases at once, each in its own simulator window. Each case prints its - results when it is done. All 8 cases take about a minute with `-j 4`. -- `--timespeed N` sets the simulation time multiplier, default 20: a 4-minute case runs in - about 20 s. Physics still steps finely (the physicslog keeps its 0.05 s rows) and the speed - profile at 20 and 60 matched a real-time run within a few km/h and seconds. Use - `--timespeed 1` to watch a run. +- `-j N` runs N cases at once. Each case prints its results when it is done. All 14 cases + take about 30 s with `-j 4`, loading included. +- `--watch` runs a case the old way, in a visible window in real time (or faster with + `--timespeed N`), closed after the case's `duration`; the exit code isn't checked then. For + watching what a case does. Exit code is 0 when every case passed. Logs of each run (`log.txt`, `errors.txt`, -the vehicle's physicslog) are moved to `tests/scenarios/out//`. +`stdout.txt`, the vehicle's physicslog) are moved to `tests/scenarios/out//`. ## How it works For each case the runner: 1. writes `scenery/autotest_.scn` into the game dir: the base scenery with its own - trainsets removed, the start time changed if the case says so, and the case's `.scn` - fragment added: its trainsets after `FirstInit`, everything else (event launchers standing - in for keys the scenery expects a player to press, extra events) before it, -2. starts the simulator with `-s autotest_.scn -v ghostview -ini out//autotest.ini`; - ghostview leaves every train to the AI, and the extra ini turns on `physicslog`, runs in a - 1280x720 window, does not pause when the window loses focus, and writes the logs to - `logs/log (autotest_) .txt` rather than the shared `log.txt` (`multiplelogs`), -3. waits until `physicslog/autotest_.dat` covers `duration` seconds, then closes the - simulator. It gives up early when the log reports `Bad vehicle` / `Bad trainset`, or when - the scenario has loaded and no physicslog appeared, -4. runs the checks on the physicslog. + trainsets removed, the start time changed if the case says so, the case's track events + added, and the case's `.scn` fragment added: its trainsets after `FirstInit`, everything + else (the case's `test_config`, event launchers standing in for keys the scenery expects a + player to press, extra events) before it, +2. starts the simulator with `--test -s autotest_.scn -ini out//autotest.ini`, + plus `--test-timeout ` when the case gives a `duration`; the extra ini turns on + `physicslog` and writes the logs to `logs/log (autotest_) .txt` rather than the + shared `log.txt` (`multiplelogs`), +3. waits until the simulator quits by itself. It gives up early when the log reports + `Bad vehicle` / `Bad trainset`, when the scenario has loaded and no physicslog appeared, or + after the case's `timeout` of wall-clock time, +4. compares the result from the exit code with the case's `expect`, then runs the checks on + the physicslog. The lead vehicle is named `autotest_`, so every case has its own physicslog and log files and cases can run in parallel. The `autotest_*` sceneries (and the simulator's `.sbt` @@ -60,9 +132,12 @@ scenery is newer. | `strip_trainsets` | drop the base scenery's trainsets (default `true`) | | `time` | replace the scenery start time, `HH:MM` | | `track_friction` | set the friction of every track of the base scenery (default in the sceneries is 0.15), e.g. for slippery rail | +| `track_events` | lines added to tracks of the base scenery, by track name, e.g. `{ "tor1k": "event0 test_pass" }`; only tracks in the scenery file itself, not in its includes | +| `test_config` | lines of a `config` block added to the scenery, e.g. `["test.timeout 90"]` | | `fragment` | `.scn` file in `cases/` added to the scenery: trainsets after `FirstInit` (before it they derail on unlinked track), the rest before it (launchers read after it never fire) | | `vars` | values for `{{name}}` in the fragment; a list becomes one line per item | -| `duration` | seconds of simulation to record | +| `expect` | the result the test mode should end with: `pass`, `fail`, `signal_passed_at_danger`, `timeout`, `standstill` or `error`. Default `timeout` for a case with `duration`, else `pass` | +| `duration` | seconds of simulation to record: the test timeout of the run (`--test-timeout`) | | `timeout` | wall-clock seconds before giving up, loading included | | `fail_on_errors` | fail when `errors.txt` is not empty (default `false`) | | `checks` | list of checks, below | @@ -72,7 +147,14 @@ the one whose physicslog is checked. Other vehicles of the consist take names ma e.g. `{{vehicle}}_s`. The td.scn cases share two fragments, `td_timetable.scn` (route set, train runs to Przystanek) and `td_red_signal.scn` (no route, exit signal at stop), and differ only in `vars.consist`. `td_red_signal_moving.scn` is the red signal one with the train -starting at `vars.velocity` km/h; with `track_friction` 0.03 it locks the wheels when braking. +starting at `vars.velocity` km/h; with `track_friction` 0.03 it locks the wheels when braking +and slides past the signal, so those cases set `test.fail_if_stop_overran no`. +`td_red_signal_pass.scn` adds the `test_pass` event, which `test_mode_pass` puts as `event0` +on `tor1k`, the track in front of the signal. + +The `test_mode_*` cases show the ends of the test mode: `test_mode_pass` (exit 0, the pass +event), `test_mode_signal_passed_at_danger` (exit 2), `test_mode_timeout` (exit 3, from +`test.timeout`) and `test_mode_standstill` (exit 4, from `test.standstill`). Checks (speeds in km/h, times in seconds of physicslog time, distances in metres). Most use the physicslog Velocity column, which is the wheel speed: it stays at 0 while the wheels are diff --git a/tests/scenarios/cases/eu07_slippery_push_red_signal.json b/tests/scenarios/cases/eu07_slippery_push_red_signal.json index f7ae10bb7..64d6ba884 100644 --- a/tests/scenarios/cases/eu07_slippery_push_red_signal.json +++ b/tests/scenarios/cases/eu07_slippery_push_red_signal.json @@ -4,6 +4,9 @@ "time": "10:34", "track_friction": 0.03, "fragment": "td_red_signal_moving.scn", + "test_config": [ + "test.fail_if_stop_overran no" + ], "vars": { "velocity": "30", "consist": [ diff --git a/tests/scenarios/cases/eu07_slippery_red_signal.json b/tests/scenarios/cases/eu07_slippery_red_signal.json index 40b5944eb..c2f60f22d 100644 --- a/tests/scenarios/cases/eu07_slippery_red_signal.json +++ b/tests/scenarios/cases/eu07_slippery_red_signal.json @@ -4,6 +4,9 @@ "time": "10:34", "track_friction": 0.03, "fragment": "td_red_signal_moving.scn", + "test_config": [ + "test.fail_if_stop_overran no" + ], "vars": { "velocity": "30", "consist": [ diff --git a/tests/scenarios/cases/td_red_signal_pass.scn b/tests/scenarios/cases/td_red_signal_pass.scn new file mode 100644 index 000000000..724050322 --- /dev/null +++ b/tests/scenarios/cases/td_red_signal_pass.scn @@ -0,0 +1,8 @@ +// added by tests/scenarios/run.py to td.scn, whose own trainsets were removed. +// like td_red_signal.scn (no route, the exit signal stacja1_j about 150 m ahead stays at stop), +// with the test mode's pass event: the case puts it as event0 on tor1k, the track in front of +// the signal, so it runs once the train stands there. the test passes when every vehicle stopped. +event test_pass UpdateValues 0 __test.result stopped_before_stacja1_j 1 * endevent +trainset td/rozklad tdo_n1734 0.0 0.1 +{{consist}} +endtrainset diff --git a/tests/scenarios/cases/test_mode_pass.json b/tests/scenarios/cases/test_mode_pass.json new file mode 100644 index 000000000..686b7d160 --- /dev/null +++ b/tests/scenarios/cases/test_mode_pass.json @@ -0,0 +1,31 @@ +{ + "description": "Test mode, pass: EU07 on td.scn with no route set stops before the exit signal stacja1_j; event0 of the track there reports the pass, and the test ends as passed once the train stands.", + "base_scenery": "td.scn", + "time": "10:34", + "fragment": "td_red_signal_pass.scn", + "track_events": { + "tor1k": "event0 test_pass" + }, + "vars": { + "consist": "node -1 0 {{vehicle}} dynamic pkp\\4e_v1 4e-004 4e 0 headdriver 0 0 enddynamic" + }, + "expect": "pass", + "timeout": 600, + "checks": [ + { + "type": "starts", + "min_speed": 5, + "within": 150 + }, + { + "type": "stops", + "moving_speed": 5, + "stop_speed": 0.5, + "hold": 0.5 + }, + { + "type": "distance", + "max": 150 + } + ] +} diff --git a/tests/scenarios/cases/test_mode_signal_passed_at_danger.json b/tests/scenarios/cases/test_mode_signal_passed_at_danger.json new file mode 100644 index 000000000..338e7e6ea --- /dev/null +++ b/tests/scenarios/cases/test_mode_signal_passed_at_danger.json @@ -0,0 +1,22 @@ +{ + "description": "Test mode, signal passed at danger: EU07 on td.scn with no route set starts at 60 km/h about 150 m before the exit signal stacja1_j at stop. Its AI driver is still preparing the engine and doesn't brake, and the run ends when the train passes the signal.", + "base_scenery": "td.scn", + "time": "10:34", + "fragment": "td_red_signal_moving.scn", + "vars": { + "velocity": "60", + "consist": "node -1 0 {{vehicle}} dynamic pkp\\4e_v1 4e-004 4e 0 headdriver 0 0 enddynamic" + }, + "expect": "signal_passed_at_danger", + "timeout": 600, + "checks": [ + { + "type": "max_speed", + "limit": 61 + }, + { + "type": "distance", + "min": 140 + } + ] +} diff --git a/tests/scenarios/cases/test_mode_standstill.json b/tests/scenarios/cases/test_mode_standstill.json new file mode 100644 index 000000000..0d96585ee --- /dev/null +++ b/tests/scenarios/cases/test_mode_standstill.json @@ -0,0 +1,26 @@ +{ + "description": "Test mode, standstill: EU07 on td.scn with no route set stops before the exit signal stacja1_j at stop and stays; nothing reports a result, so the test ends once every vehicle stood still for test.standstill 120 seconds (the train waits about 70 s before it pulls off, so less would end it before the start).", + "base_scenery": "td.scn", + "time": "10:34", + "fragment": "td_red_signal.scn", + "test_config": [ + "test.standstill 120" + ], + "vars": { + "consist": "node -1 0 {{vehicle}} dynamic pkp\\4e_v1 4e-004 4e 0 headdriver 0 0 enddynamic" + }, + "expect": "standstill", + "timeout": 600, + "checks": [ + { + "type": "stops", + "moving_speed": 5, + "stop_speed": 0.5, + "hold": 5 + }, + { + "type": "distance", + "max": 150 + } + ] +} diff --git a/tests/scenarios/cases/test_mode_timeout.json b/tests/scenarios/cases/test_mode_timeout.json new file mode 100644 index 000000000..46899e89c --- /dev/null +++ b/tests/scenarios/cases/test_mode_timeout.json @@ -0,0 +1,21 @@ +{ + "description": "Test mode, timeout: EU07 on td.scn with no route set pulls off towards the exit signal stacja1_j at stop; nothing reports a result and test.timeout 90 from the scenery's config block runs out first.", + "base_scenery": "td.scn", + "time": "10:34", + "fragment": "td_red_signal.scn", + "test_config": [ + "test.timeout 90" + ], + "vars": { + "consist": "node -1 0 {{vehicle}} dynamic pkp\\4e_v1 4e-004 4e 0 headdriver 0 0 enddynamic" + }, + "expect": "timeout", + "timeout": 600, + "checks": [ + { + "type": "starts", + "min_speed": 5, + "within": 90 + } + ] +} diff --git a/tests/scenarios/run.py b/tests/scenarios/run.py index 2cd754a06..770069d12 100644 --- a/tests/scenarios/run.py +++ b/tests/scenarios/run.py @@ -2,16 +2,19 @@ """Scenario tests: run the real simulator on a scenery and check what a vehicle did. A case (cases/.json) names a base scenery from the game install, a fragment -added to it (usually a trainset with an AI driver), and checks on the vehicle's -physics log. The runner: +added to it (usually a trainset with an AI driver), the result the simulator's test +mode should end with, and checks on the vehicle's physics log. The runner: 1. builds scenery/autotest_.scn in the game dir: the base scenery with its own trainsets removed, optionally a different start time, and the case fragment added, - 2. starts eu07 with that scenery in ghostview (every train driven by AI) and an extra - settings file (-ini) that turns on physicslog and runs in a window, - 3. waits until the vehicle's physicslog covers `duration` seconds of simulation, - then closes the simulator, - 4. evaluates the checks on the log and prints PASS/FAIL per check. + 2. starts eu07 in test mode (--test: every train driven by AI, nothing drawn, fixed + time steps as fast as it can) with that scenery and an extra settings file (-ini) + that turns on physicslog, + 3. waits until the simulator quits by itself and reads the test result from its exit + code: pass, fail, signal passed at danger, timeout (after `duration` seconds of + simulation, if the case gives one), standstill or error, + 4. compares the result with the one the case expects, evaluates the checks on the + physicslog and prints PASS/FAIL per check. Scenery and vehicle data are not part of this repo, so this runs against a local game install only (--game-dir or EU07_GAME_DIR), not in CI. See README.md. @@ -49,7 +52,18 @@ COL_COMMAND = 16 # text, read as None COL_WHEELSLIP = 20 COL_VEHICLE_VELOCITY = 25 # signed vehicle speed, km/h; only in builds which log it -# settings layered over the user's eu07.ini for a test run +# exit codes of the simulator's test mode (eu07 --test), see simulation/simulationtest.h +EXIT_RESULTS = { + 0: "pass", + 1: "fail", + 2: "signal_passed_at_danger", + 3: "timeout", + 4: "standstill", + 5: "error", +} + +# settings layered over the user's eu07.ini for a test run; the window ones only matter +# with --watch, test mode keeps its window hidden and turns the sound off by itself TEST_INI = """\ fullscreen no fullscreenwindowed no @@ -89,6 +103,17 @@ def set_start_time(text: str, hhmm: str) -> str: return re.sub(r"(?im)^(\s*time\s+)\d{1,2}:\d{2}", lambda m: m.group(1) + hhmm, text, count=1) +def add_track_events(text: str, events: dict) -> str: + """Adds lines (e.g. "event0 test_pass") to tracks named in events, before their endtrack.""" + for track, lines in events.items(): + lines = [lines] if isinstance(lines, str) else lines + m = re.search(rf"(?im)^\s*node\s+\S+\s+\S+\s+{re.escape(track)}\s+track\b.*?^(\s*endtrack\b)", text, re.S) + if not m: + sys.exit(f"track_events: no track {track} in the base scenery itself (not in its includes)") + text = text[: m.start(1)] + "".join(line + "\n" for line in lines) + text[m.start(1):] + return text + + def set_track_friction(text: str, friction: float) -> str: """Sets the friction of every track: node track ...""" return re.sub(r"(?im)^(\s*node\s+\S+\s+\S+\s+\S+\s+track\s+\S+\s+\S+\s+\S+\s+)[-\d.]+", @@ -118,6 +143,8 @@ def build_scenery(case: dict, game_dir: Path, case_name: str, vehicle: str) -> s text = set_start_time(text, case["time"]) if "track_friction" in case: text = set_track_friction(text, case["track_friction"]) + if "track_events" in case: + text = add_track_events(text, case["track_events"]) fragment = (CASES_DIR / case["fragment"]).read_bytes().decode("latin-1") # vars first: {{vehicle}} inside a var's value gets filled in the second pass fragment = fill_vars(fragment, case.get("vars", {}), keep={"vehicle"}) @@ -126,6 +153,9 @@ def build_scenery(case: dict, game_dir: Path, case_name: str, vehicle: str) -> s # events of the case go in before it (read after it they never fire), trainsets after it # (placed before it they stand on unlinked track and derail at once) before, trainsets = split_trainsets(fragment) + if case.get("test_config"): + # settings of the test mode (test.timeout and so on), read like any other config block + before = "config\n" + "".join(line + "\n" for line in case["test_config"]) + "endconfig\n" + before header = f"\n// ---- autotest: {case_name} ----\n" firstinit = re.search(r"(?im)^\s*firstinit\b", text) if firstinit: @@ -200,20 +230,30 @@ STARTUP_TIMEOUT = 120.0 @dataclass class RunResult: rows: list[list[float]] = field(default_factory=list) - exit_code: int | None = None # None: still running when we closed it (the normal end) + exit_code: int | None = None # None: still running when we closed it (the normal end with --watch) + verdict: str = "" # the simulator's own line about the test result failure: str = "" # why the run was cut short wall_seconds: float = 0.0 logs: dict[str, Path] = field(default_factory=dict) def run_simulator(exe: Path, game_dir: Path, scenery: str, ini: Path, physicslog: Path, - duration: float, timeout: float, say) -> RunResult: + duration: float | None, timeout: float, watch: bool, say) -> RunResult: + """Runs the simulator on the scenery. In test mode it quits by itself and the exit code + is the result; with watch it runs in a window and gets closed after `duration`.""" physicslog.unlink(missing_ok=True) - cmd = [str(exe), "-s", scenery, "-v", "ghostview", "-ini", str(ini)] + if watch: + cmd = [str(exe), "-s", scenery, "-v", "ghostview", "-ini", str(ini)] + else: + cmd = [str(exe), "--test", "-s", scenery, "-ini", str(ini)] + if duration is not None: + cmd += ["--test-timeout", f"{duration:g}"] say(" $ " + " ".join(f'"{c}"' if " " in c else c for c in cmd), progress=True) since = time.time() - 1 started = time.monotonic() - proc = subprocess.Popen(cmd, cwd=game_dir) + # the test result line goes to stdout; a file, not a pipe, so a chatty run can't block on it + stdout = (ini.parent / "stdout.txt").open("w+b") + proc = subprocess.Popen(cmd, cwd=game_dir, stdout=stdout, stderr=subprocess.STDOUT) result = RunResult() last_report = 0.0 try: @@ -229,7 +269,7 @@ def run_simulator(exe: Path, game_dir: Path, scenery: str, ini: Path, physicslog if proc.poll() is not None: result.exit_code = proc.returncode break - if sim_t >= duration: + if watch and sim_t >= duration: break if wall > timeout: result.failure = f"timed out after {timeout:.0f}s before {duration}s of simulation" @@ -252,6 +292,10 @@ def run_simulator(exe: Path, game_dir: Path, scenery: str, ini: Path, physicslog except subprocess.TimeoutExpired: proc.kill() result.wall_seconds = time.monotonic() - started + stdout.seek(0) + result.verdict = next((line.strip() for line in stdout.read().decode(errors="replace").splitlines() + if line.startswith("test:")), "") + stdout.close() result.rows = read_physicslog(physicslog) result.logs = find_logs(game_dir, scenery, since) return result @@ -422,7 +466,14 @@ def count_lines(path: Path) -> int: return 0 -def run_case(name: str, exe: Path, game_dir: Path, timespeed: float, say) -> bool: +def describe_exit(code: int | None) -> str: + if code is None: + return "none, still running" + name = EXIT_RESULTS.get(code) + return f"{code} ({name})" if name else f"{code} (0x{code & 0xFFFFFFFF:08X}, a crash?)" + + +def run_case(name: str, exe: Path, game_dir: Path, timespeed: float, watch: bool, say) -> bool: case = json.loads((CASES_DIR / f"{name}.json").read_text(encoding="utf-8")) say(f"\n=== {name}: {case.get('description', '')}") out = OUT_DIR / name @@ -436,8 +487,16 @@ def run_case(name: str, exe: Path, game_dir: Path, timespeed: float, say) -> boo ini.write_text(TEST_INI.format(timespeed=timespeed), encoding="ascii") physicslog = game_dir / "physicslog" / f"{vehicle}.dat" + duration = float(case["duration"]) if "duration" in case else None + # a case that only records `duration` seconds ends on the test timeout; one that says + # how the test ends (a pass event, a signal passed at danger...) expects that result + expect = case.get("expect", "timeout" if duration is not None else "pass") + if expect not in EXIT_RESULTS.values(): + sys.exit(f"{name}: expect must be one of {', '.join(EXIT_RESULTS.values())}") + if watch and duration is None: + sys.exit(f"{name}: --watch needs a case with duration") result = run_simulator(exe, game_dir, scenery, ini, physicslog, - float(case["duration"]), float(case.get("timeout", 600)), say) + duration, float(case.get("timeout", 600)), watch, say) # the logs are ours alone (named after the case scenery), move them out of the game dir for kind, path in result.logs.items(): @@ -448,18 +507,26 @@ def run_case(name: str, exe: Path, game_dir: Path, timespeed: float, say) -> boo ok = True sim_t = result.rows[-1][COL_TIME] if result.rows else 0.0 say(f" ran {result.wall_seconds:.0f}s wall, {sim_t:.1f}s of physicslog, results in {out.relative_to(REPO)}") - if result.exit_code is not None: - say(f" FAIL simulator exited on its own with code {result.exit_code}") - ok = False + if watch: + if result.exit_code is not None: + say(f" FAIL simulator exited on its own with code {result.exit_code}") + ok = False + else: + if result.verdict: + say(f" {result.verdict}") + got = EXIT_RESULTS.get(result.exit_code) if result.exit_code is not None else None + passed = got == expect + say(f" {'PASS' if passed else 'FAIL'} exit code {describe_exit(result.exit_code)}, expected {expect}") + ok &= passed if result.failure: say(f" FAIL {result.failure}") ok = False - if not result.rows: + if not result.rows and case.get("checks"): if not result.failure: say(f" FAIL no physicslog for '{vehicle}'") return False - for check in case["checks"]: + for check in case.get("checks", []): params = {k: v for k, v in check.items() if k != "type"} passed, detail = CHECKS[check["type"]](result.rows, **params) say(f" {'PASS' if passed else 'FAIL'} {check['type']}: {detail}") @@ -479,12 +546,13 @@ def main() -> int: ap.add_argument("--game-dir", default=os.environ.get("EU07_GAME_DIR"), help="game install with scenery/ and dynamic/ (or EU07_GAME_DIR)") ap.add_argument("--exe", help="simulator executable (default: newest cmake-build-*/bin/Release/eu07*.exe)") - # 20 gave the same speed profile as 1 within a few km/h and seconds on eu07_td_timetable, - # in 20 s instead of 4 min; 1 is for watching a run - ap.add_argument("--timespeed", type=float, default=20.0, - help="simulation time multiplier, the simulator offers 1, 5, 20 and 60 (default 20)") + ap.add_argument("--watch", action="store_true", + help="run in a visible window in real time (see --timespeed) instead of the test mode, " + "closed after the case's duration; the exit code isn't checked") + ap.add_argument("--timespeed", type=float, default=1.0, + help="with --watch: simulation time multiplier, the simulator offers 1, 5, 20 and 60 (default 1)") ap.add_argument("-j", "--jobs", type=int, default=1, - help="cases run at once, each in its own simulator window (default 1)") + help="cases run at once, each in a simulator of its own (default 1)") args = ap.parse_args() if not args.game_dir: @@ -504,7 +572,7 @@ def main() -> int: def say(line, progress=False): print(line, flush=True) for n in names: - results[n] = run_case(n, exe, game_dir, args.timespeed, say) + results[n] = run_case(n, exe, game_dir, args.timespeed, args.watch, say) else: # each case prints its block when it is done, so parallel output does not interleave def job(n): @@ -512,7 +580,7 @@ def main() -> int: def say(line, progress=False): if not progress: lines.append(line) - ok = run_case(n, exe, game_dir, args.timespeed, say) + ok = run_case(n, exe, game_dir, args.timespeed, args.watch, say) return n, ok, lines with ThreadPoolExecutor(max_workers=args.jobs) as pool: for n in names: From 441caeed641b1a2257b382916f5dd6431b3369bc Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 17:12:11 +0100 Subject: [PATCH 282/430] refactor(simulation): tidy the test mode code The test manager is reached through simulation::test() instead of a global, the result cell is owned by a unique_ptr until the memory table takes it, the cell value is compared with a margin, strings are built with std::format and the --test settings moved to apply_test_mode_settings(). The driver's signal check is folded into UpdateSpeedPosition(), which updates a speed table entry and reports a signal at stop the head of the train just passed. The test.* keys are listed with the other settings at the start of the log. --- EU07.cpp | 5 +-- application/application.cpp | 55 ++++++++++++++++++------------ application/drivermode.cpp | 4 +-- application/scenarioloadermode.cpp | 4 +-- rendering/nullrenderer.cpp | 5 +-- simulation/simulation.cpp | 2 +- simulation/simulationtest.cpp | 47 ++++++++++++++++++------- simulation/simulationtest.h | 8 +++-- utilities/Globals.cpp | 4 +++ utilities/Timer.cpp | 21 +++++++++--- vehicle/Driver.cpp | 46 +++++++++++++------------ vehicle/Driver.h | 5 +-- 12 files changed, 131 insertions(+), 75 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index aac7cae11..ec3e972e7 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -23,6 +23,7 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #include "utilities/Globals.h" #include "utilities/Logs.h" #include +#include #ifdef WITHDUMPGEN #ifdef _WIN32 #include @@ -150,7 +151,7 @@ int main(int argc, char *argv[]) #ifdef _WIN32 catch (std::runtime_error const &Error) { - ErrorLog("Critical error: " + std::string(Error.what())); + ErrorLog(std::format("Critical error: {}", Error.what())); // in test mode nobody is there to close the box, the exit code tells of the error if (false == Global.test.enabled) { @@ -167,5 +168,5 @@ int main(int argc, char *argv[]) #endif // skip destructors, there are ordering errors which causes segfaults // a test run (--test) says its result in the exit code - std::_Exit(Global.test.enabled ? simulation::Test.exit_code() : 0); + std::_Exit(Global.test.enabled ? simulation::test().exit_code() : 0); } diff --git a/application/application.cpp b/application/application.cpp index 37afff67f..439c01d97 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -1137,6 +1137,38 @@ void eu07_application::init_files() } namespace fs = std::filesystem; +namespace +{ + +// the settings of the test mode (--test), over whatever the settings files say +void apply_test_mode_settings() +{ + // nobody watches nor listens: no player vehicle, nothing drawn, no sound, no window in the way + Global.editor_session = false; + Global.local_start_vehicle = "ghostview"; + Global.GfxRenderer = "null"; + Global.NvRenderer = false; + Global.bSoundEnabled = false; + Global.python_enabled = false; + Global.bInactivePause = false; + Global.bFullScreen = false; + Global.fullscreen_windowed = false; + Global.VSync = false; + Global.iMultisampling = 0; + Global.gfx_usegles = false; + Global.minframetime = std::chrono::duration(0.0f); + Global.extra_viewports.clear(); + Global.headtrack_conf.joy.clear(); + // a test runs on its own + Global.network_servers.clear(); + Global.network_client.reset(); + // and the same way every time, unless given another seed (-seed, or randomseed in the settings) + if (!Global.random_seed) + Global.random_seed = seed_of("test"); +} + +} // namespace + int eu07_application::init_settings(int Argc, char *Argv[]) { Global.asVersion = VERSION_INFO; @@ -1241,28 +1273,7 @@ int eu07_application::init_settings(int Argc, char *Argv[]) ErrorLog("test: --test needs a scenery given with -s"); return -1; } - // nobody watches nor listens: no player vehicle, nothing drawn, no sound, no window in the way - Global.editor_session = false; - Global.local_start_vehicle = "ghostview"; - Global.GfxRenderer = "null"; - Global.NvRenderer = false; - Global.bSoundEnabled = false; - Global.python_enabled = false; - Global.bInactivePause = false; - Global.bFullScreen = false; - Global.fullscreen_windowed = false; - Global.VSync = false; - Global.iMultisampling = 0; - Global.gfx_usegles = false; - Global.minframetime = std::chrono::duration(0.0f); - Global.extra_viewports.clear(); - Global.headtrack_conf.joy.clear(); - // a test runs on its own - Global.network_servers.clear(); - Global.network_client.reset(); - // and the same way every time, unless given another seed (-seed, or randomseed in the settings) - if (!Global.random_seed) - Global.random_seed = seed_of("test"); + apply_test_mode_settings(); } return 0; diff --git a/application/drivermode.cpp b/application/drivermode.cpp index 1b3a44d63..deb906a4a 100644 --- a/application/drivermode.cpp +++ b/application/drivermode.cpp @@ -309,7 +309,7 @@ bool driver_mode::update() if (Global.test.enabled && simulation::is_ready) { - simulation::Test.update(deltatime); + simulation::test().update(deltatime); } } @@ -488,7 +488,7 @@ void driver_mode::enter() { // the test runs as fast as it can compute, in steps of fixed length, so that runs on different machines agree Timer::set_fixed_step(simulation::test_manager::frame_step); - simulation::Test.start(); + simulation::test().start(); } set_picking(!Global.captureonstart); diff --git a/application/scenarioloadermode.cpp b/application/scenarioloadermode.cpp index b84c1912f..20fa46d3d 100644 --- a/application/scenarioloadermode.cpp +++ b/application/scenarioloadermode.cpp @@ -60,7 +60,7 @@ bool scenarioloader_mode::update() { ErrorLog(std::format("Bad init: scenario \"{}\" couldn't be opened ({})", Global.SceneryFile, e.what())); state.reset(); if (Global.test.enabled) { - simulation::Test.finish(simulation::test_result::error, "scenario couldn't be opened"); + simulation::test().finish(simulation::test_result::error, "scenario couldn't be opened"); return true; } Global.SceneryFile.clear(); @@ -80,7 +80,7 @@ bool scenarioloader_mode::update() { state.reset(); if( Global.test.enabled ) { // there's nothing to test; the exit code says the run went wrong - simulation::Test.finish( simulation::test_result::error, "scenario loading failed" ); + simulation::test().finish( simulation::test_result::error, "scenario loading failed" ); return true; } Global.SceneryFile.clear(); diff --git a/rendering/nullrenderer.cpp b/rendering/nullrenderer.cpp index f193ad3e4..bc466e977 100644 --- a/rendering/nullrenderer.cpp +++ b/rendering/nullrenderer.cpp @@ -7,8 +7,9 @@ void null_imgui_renderer::BeginFrame() { auto &io { ImGui::GetIO() }; if( false == io.Fonts->IsBuilt() ) { - unsigned char *pixels; - int width, height; + unsigned char *pixels { nullptr }; + int width { 0 }; + int height { 0 }; io.Fonts->GetTexDataAsAlpha8( &pixels, &width, &height ); } } diff --git a/simulation/simulation.cpp b/simulation/simulation.cpp index 59635c38c..d10d555a3 100644 --- a/simulation/simulation.cpp +++ b/simulation/simulation.cpp @@ -111,7 +111,7 @@ state_manager::init_scripting_interface() { simulation::Region->insert( memorycell ); } // the cell a test scenery reports its result to - simulation::Test.init_result_cell(); + simulation::test().init_result_cell(); } // legacy method, calculates changes in simulation state over specified time diff --git a/simulation/simulationtest.cpp b/simulation/simulationtest.cpp index 4dbe4c24f..439f295fe 100644 --- a/simulation/simulationtest.cpp +++ b/simulation/simulationtest.cpp @@ -19,9 +19,29 @@ http://mozilla.org/MPL/2.0/. #include "world/Event.h" #include "world/MemCell.h" +#include +#include +#include +#include +#include + +namespace { + +// the cell holds what the scenery wrote, so the values are whole numbers; the margin only keeps a stray fraction out +bool holds(double const Value, double const Expected) +{ + return std::abs(Value - Expected) < 1e-6; +} + +} // namespace + namespace simulation { -test_manager Test; +test_manager &test() +{ + static test_manager instance; + return instance; +} std::string_view to_string(test_result const Result) { @@ -39,11 +59,12 @@ std::string_view to_string(test_result const Result) void test_manager::init_result_cell() { - auto *cell = new TMemCell({0, -1, std::string(result_cell), "memcell"}); + auto cell { std::make_unique(scene::node_data{0, -1, std::string(result_cell), "memcell"}) }; // neither of the reported values, so that a cell nobody wrote to says nothing cell->UpdateValues("", -1.0, 0.0, basic_event::flags::value1 | basic_event::flags::value2); - simulation::Memory.insert(cell); - simulation::Region->insert(cell); + simulation::Region->insert(cell.get()); + // the table owns its cells + simulation::Memory.insert(cell.release()); } void test_manager::start() @@ -76,21 +97,21 @@ void test_manager::update(double const Deltatime) if (auto const *cell = simulation::Memory.find(std::string(result_cell))) { auto const value { cell->Value1() }; - auto const reason { cell->Text().empty() ? std::string() : " (" + cell->Text() + ")" }; - if (value == 0.0) + auto const reason { cell->Text().empty() ? std::string() : std::format(" ({})", cell->Text()) }; + if (holds(value, 0.0)) { - finish(test_result::fail, "__test.result set to 0" + reason); + finish(test_result::fail, std::format("__test.result set to 0{}", reason)); return; } - if (value == 1.0 && false == m_passrequested) + if (holds(value, 1.0) && false == m_passrequested) { m_passrequested = true; WriteLog(std::format("test: pass requested at {:.1f} s{}, waiting for every vehicle to stop", m_time, reason)); } } - auto const atrest = std::none_of(simulation::Vehicles.sequence().begin(), simulation::Vehicles.sequence().end(), - [](TDynamicObject const *Vehicle) { return std::abs(Vehicle->GetVelocity()) > 0.01; }); + auto const atrest { std::ranges::none_of(simulation::Vehicles.sequence(), + [](TDynamicObject const *Vehicle) { return std::abs(Vehicle->GetVelocity()) > 0.01; }) }; m_resttime = atrest ? m_resttime + Deltatime : 0.0; if (m_passrequested && m_resttime >= pass_settle_time) @@ -111,9 +132,9 @@ void test_manager::update(double const Deltatime) } } -void test_manager::signal_passed_at_danger(std::string const &Vehicle, std::string const &Signal) +void test_manager::signal_passed_at_danger(std::string_view const Vehicle, std::string_view const Signal) { - auto const reason { Vehicle + " passed signal " + Signal + " at danger" }; + auto const reason { std::format("{} passed signal {} at danger", Vehicle, Signal) }; if (false == Global.test.enabled) { WriteLog(reason, logtype::generic); @@ -127,7 +148,7 @@ void test_manager::signal_passed_at_danger(std::string const &Vehicle, std::stri finish(test_result::signal_passed_at_danger, reason); } -void test_manager::finish(test_result const Result, std::string const &Reason) +void test_manager::finish(test_result const Result, std::string_view const Reason) { if (m_finished || false == Global.test.enabled) return; diff --git a/simulation/simulationtest.h b/simulation/simulationtest.h index c9bc5437e..f47f408b7 100644 --- a/simulation/simulationtest.h +++ b/simulation/simulationtest.h @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include +#include // integration test mode (eu07 --test -s , eu07/maszyna#541): the scenery runs unattended in a tight // fixed-step loop and the simulator quits with an exit code saying how the test went @@ -44,9 +45,9 @@ public: // checks the end conditions after a simulation frame of Deltatime seconds void update(double Deltatime); // reported by a driver whose train went past a signal showing stop - void signal_passed_at_danger(std::string const &Vehicle, std::string const &Signal); + void signal_passed_at_danger(std::string_view Vehicle, std::string_view Signal); // ends the test with given result; the first call wins - void finish(test_result Result, std::string const &Reason); + void finish(test_result Result, std::string_view Reason); bool finished() const { return m_finished; } // exit code of the process: the result, or error while the test hasn't finished @@ -61,6 +62,7 @@ private: double m_resttime { 0.0 }; // how long every vehicle has been standing [s] }; -extern test_manager Test; +// the test of the run +test_manager &test(); } // namespace simulation diff --git a/utilities/Globals.cpp b/utilities/Globals.cpp index e36223174..5cdb3ef25 100644 --- a/utilities/Globals.cpp +++ b/utilities/Globals.cpp @@ -1779,6 +1779,10 @@ global_settings::export_as_text( std::ostream &Output ) const { export_as_text( Output, "gfx.shadowmap.enabled", gfx_shadowmap_enabled ); // TODO: export fpslimit export_as_text( Output, "randomseed", Global.random_seed ); + export_as_text( Output, "test.timeout", test.timeout ); + export_as_text( Output, "test.standstill", test.standstill ); + export_as_text( Output, "test.pass_on_standstill", test.pass_on_standstill ); + export_as_text( Output, "test.fail_if_stop_overran", test.fail_if_stop_overran ); export_as_text( Output, "gfx.envmap.enabled", gfx_envmap_enabled ); export_as_text( Output, "gfx.postfx.motionblur.enabled", gfx_postfx_motionblur_enabled ); export_as_text( Output, "gfx.postfx.motionblur.shutter", gfx_postfx_motionblur_shutter ); diff --git a/utilities/Timer.cpp b/utilities/Timer.cpp index 388330bbe..eacd2ba0a 100644 --- a/utilities/Timer.cpp +++ b/utilities/Timer.cpp @@ -26,7 +26,17 @@ double fRenderTime{ 0.0 }; double fSoundTimer{ 0.0 }; double fSinceStart{ 0.0 }; double override_delta = -1.0f; -double fixed_step = 0.0; + +namespace { + +// when set (test mode), every frame lasts this long, see set_fixed_step() +double &fixed_step() +{ + static double step{0.0}; + return step; +} + +} // namespace double GetTime() { @@ -56,7 +66,7 @@ void set_delta_override(double t) void set_fixed_step(double t) { - fixed_step = t; + fixed_step() = t; } void ResetTimers() @@ -82,15 +92,16 @@ void UpdateTimers(bool pause) fr = 1000000000; #endif DeltaRenderTime = double(count - oldCount) / double(fr); - if (fixed_step > 0.0) + auto const fixedstep{fixed_step()}; + if (fixedstep > 0.0) { // the frame lasts exactly as long as said, however long it took to compute; the time speed doesn't apply - DeltaRenderTime = fixed_step; + DeltaRenderTime = fixedstep; } fRenderTime += DeltaRenderTime; if (!pause) { - DeltaTime = (fixed_step > 0.0 ? 1.0 : Global.fTimeSpeed) * DeltaRenderTime; + DeltaTime = (fixedstep > 0.0 ? 1.0 : Global.fTimeSpeed) * DeltaRenderTime; fSoundTimer += DeltaTime; if (fSoundTimer > 0.1) fSoundTimer = 0.0; diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 5f1bde20c..c0614923c 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -768,12 +768,7 @@ void TController::TableCheck(double fDistance) { // aktualizacja rekordów z wyjątkiem ostatniego if (sSpeedTable[i].iFlags & spEnabled) // jeśli pozycja istotna { - auto const waspassed { TestFlag( sSpeedTable[ i ].iFlags, spElapsed ) }; - auto const switchchanged { sSpeedTable[ i ].Update() }; - if( false == waspassed ) { - CheckSignalPassedAtDanger( sSpeedTable[ i ] ); - } - if (switchchanged) + if (UpdateSpeedPosition(sSpeedTable[i])) { if( Global.iWriteLogEnabled & 8 ) { WriteLog( "Speed table for " + OwnerName() + " detected switch change at " + sSpeedTable[ i ].trTrack->name() + " (generating fresh trace)" ); @@ -823,11 +818,7 @@ void TController::TableCheck(double fDistance) } } // aktualizacja ostatniego; a signal at stop often is the last, the scan doesn't go past it - auto const lastwaspassed { TestFlag( sSpeedTable[ iLast ].iFlags, spElapsed ) }; - sSpeedTable[iLast].Update(); - if( false == lastwaspassed ) { - CheckSignalPassedAtDanger( sSpeedTable[ iLast ] ); - } + UpdateSpeedPosition(sSpeedTable[iLast]); // WriteLog("TableCheck: Upate last track. Dist=" + AnsiString(sSpeedTable[iLast].fDist)); if( sSpeedTable[ iLast ].fDist < fDistance ) { TableTraceRoute( fDistance, pVehicles[ end::rear ] ); // doskanowanie dalszego odcinka @@ -838,18 +829,31 @@ void TController::TableCheck(double fDistance) } }; -void TController::CheckSignalPassedAtDanger( TSpeedPos const &Point ) const +namespace { + +// the position is a signal showing stop (SetVelocity 0 0). SetVelocity 0 x on automatic block isn't: it may be passed after a stop +bool is_signal_at_stop( TSpeedPos const &Point ) { - if( false == TestFlag( Point.iFlags, spElapsed ) - || false == TestFlag( Point.iFlags, spEvent ) - || false == TestFlag( Point.iFlags, spSemaphor ) - || true == TestFlag( Point.iFlags, spStopOnSBL ) // SetVelocity 0 x on automatic block: may go on after a stop - || Point.fVelNext != 0.0 - || Point.evEvent == nullptr - || ( mvOccupied->CategoryFlag & 1 ) == 0 ) { // railway only - return; + return TestFlag( Point.iFlags, spEvent ) + && TestFlag( Point.iFlags, spSemaphor ) + && false == TestFlag( Point.iFlags, spStopOnSBL ) + && std::abs( Point.fVelNext ) <= 0.0 + && Point.evEvent != nullptr; +} + +} // namespace + +bool TController::UpdateSpeedPosition( TSpeedPos &Point ) const +{ + auto const passedbefore { TestFlag( Point.iFlags, spElapsed ) }; + auto const switchchanged { Point.Update() }; + if( false == passedbefore + && TestFlag( Point.iFlags, spElapsed ) + && is_signal_at_stop( Point ) + && ( mvOccupied->CategoryFlag & 1 ) != 0 ) { // railway only + simulation::test().signal_passed_at_danger( OwnerName(), Point.evEvent->m_name ); } - simulation::Test.signal_passed_at_danger( OwnerName(), Point.evEvent->m_name ); + return switchchanged; } auto const passengerstopmaxdistance { 400.0 }; // maximum allowed distance between passenger stop point and consist head diff --git a/vehicle/Driver.h b/vehicle/Driver.h index 8c12087f9..8f2015f2f 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -519,8 +519,9 @@ private: bool TableNotFound( basic_event const *Event, double const Distance ) const; void TableTraceRoute( double fDistance, TDynamicObject *pVehicle ); void TableCheck( double fDistance ); - // reports the train going past a signal showing stop (SetVelocity 0 0); called once the head passed Point - void CheckSignalPassedAtDanger( TSpeedPos const &Point ) const; + // updates a position of the speed table, returns true when a switch on it changed (TSpeedPos::Update). + // reports the head of the train going past it, if it's a signal showing stop + bool UpdateSpeedPosition( TSpeedPos &Point ) const; TCommandType TableUpdate( double &fVelDes, double &fDist, double &fNext, double &fAcc ); bool TableUpdateStopPoint( TCommandType &Command, TSpeedPos &Point, double const Signaldistance ); bool TableUpdateEvent( double &Velocity, TCommandType &Command, TSpeedPos &Point, double &Signaldistance, int const Pointindex ); From dd019d88ba4f45c711e37abe00782c27207ed5be Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 17:38:37 +0100 Subject: [PATCH 283/430] feat(simulation): the test mode takes no input from outside (eu07/maszyna#541) With --test the gamepad, mouse picking, UART, ZeroMQ and motion telemetry are off, the hidden window gets no key, mouse, scroll or char callbacks, and the window procedure that takes WM_COPYDATA commands from other programs isn't installed, so nothing but the scenery drives a test run. --- application/application.cpp | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/application/application.cpp b/application/application.cpp index 439c01d97..eaf60c7cd 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -1159,9 +1159,16 @@ void apply_test_mode_settings() Global.minframetime = std::chrono::duration(0.0f); Global.extra_viewports.clear(); Global.headtrack_conf.joy.clear(); - // a test runs on its own + // a test runs on its own: no network, and no input from outside (eu07/maszyna#541) Global.network_servers.clear(); Global.network_client.reset(); + Global.InputGamepad = false; + Global.InputMouse = false; + Global.uart_conf.enable = false; + Global.motiontelemetry_conf.enable = false; +#ifdef WITH_ZMQ + Global.zmq_address.clear(); +#endif // and the same way every time, unless given another seed (-seed, or randomseed in the settings) if (!Global.random_seed) Global.random_seed = seed_of("test"); @@ -1431,7 +1438,9 @@ int eu07_application::init_glfw() #ifdef _WIN32 // setup wrapper for base glfw window proc, to handle copydata messages Hwnd = glfwGetWin32Window(mainwindow); - BaseWindowProc = (WNDPROC)::SetWindowLongPtr(Hwnd, GWLP_WNDPROC, (LONG_PTR)WndProc); + // commands sent by other programs are input from outside, which a test doesn't take + if (false == Global.test.enabled) + BaseWindowProc = (WNDPROC)::SetWindowLongPtr(Hwnd, GWLP_WNDPROC, (LONG_PTR)WndProc); // switch off the topmost flag ::SetWindowPos(Hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); #endif @@ -1445,13 +1454,18 @@ void eu07_application::init_callbacks() auto *window{m_windows.front()}; glfwSetWindowSizeCallback(window, window_resize_callback); glfwSetFramebufferSizeCallback(window, framebuffer_resize_callback); + glfwSetWindowFocusCallback(window, focus_callback); + glfwSetCursorEnterCallback(window, cursor_enter_callback); + if (Global.test.enabled) + { + // a test takes no input: keys and clicks sent to its hidden window would change the run + return; + } glfwSetCursorPosCallback(window, cursor_pos_callback); glfwSetMouseButtonCallback(window, mouse_button_callback); glfwSetKeyCallback(window, key_callback); glfwSetScrollCallback(window, scroll_callback); glfwSetCharCallback(window, char_callback); - glfwSetWindowFocusCallback(window, focus_callback); - glfwSetCursorEnterCallback(window, cursor_enter_callback); } int eu07_application::init_ogl() From 6ccf4b14bf8a02fb7835dd20837db54ed5a5edcb Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 17:38:38 +0100 Subject: [PATCH 284/430] feat(simulation): test.no_movement_before_pass, a pass that doesn't wait for a stop The config key from eu07/maszyna#541. By default (yes) a pass reported to __test.result waits until every vehicle has stood still for 1 s; with no it ends the test at once. The key is listed with the other test.* settings in the log and in the test start line. Scenario tests: new case test_mode_pass_while_moving reports the pass from event2 of tor1k as the train runs onto it and checks the run ended with the train still moving (new check ends_moving). The README lists the test.* keys with their defaults and the input the test mode ignores. --- simulation/simulationtest.cpp | 10 +++++-- tests/scenarios/README.md | 18 +++++++++++- .../cases/test_mode_pass_while_moving.json | 28 +++++++++++++++++++ tests/scenarios/run.py | 10 +++++++ utilities/Globals.cpp | 7 +++++ utilities/Globals.h | 1 + 6 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 tests/scenarios/cases/test_mode_pass_while_moving.json diff --git a/simulation/simulationtest.cpp b/simulation/simulationtest.cpp index 439f295fe..8d57505ff 100644 --- a/simulation/simulationtest.cpp +++ b/simulation/simulationtest.cpp @@ -82,9 +82,10 @@ void test_manager::start() } // a pause set by the scenery or the settings would never be lifted, nobody is there to press the key Global.iPause = 0; - WriteLog(std::format("test: started, timeout {:.0f} s, standstill {:.0f} s{}{}", Global.test.timeout, Global.test.standstill, + WriteLog(std::format("test: started, timeout {:.0f} s, standstill {:.0f} s{}{}{}", Global.test.timeout, Global.test.standstill, Global.test.pass_on_standstill ? ", standstill passes" : "", - Global.test.fail_if_stop_overran ? "" : ", signals passed at danger allowed")); + Global.test.fail_if_stop_overran ? "" : ", signals passed at danger allowed", + Global.test.no_movement_before_pass ? "" : ", pass without waiting for a stop")); } void test_manager::update(double const Deltatime) @@ -103,6 +104,11 @@ void test_manager::update(double const Deltatime) finish(test_result::fail, std::format("__test.result set to 0{}", reason)); return; } + if (holds(value, 1.0) && false == Global.test.no_movement_before_pass) + { + finish(test_result::pass, std::format("__test.result set to 1{}", reason)); + return; + } if (holds(value, 1.0) && false == m_passrequested) { m_passrequested = true; diff --git a/tests/scenarios/README.md b/tests/scenarios/README.md index 1ebd84c75..b57fc4a05 100644 --- a/tests/scenarios/README.md +++ b/tests/scenarios/README.md @@ -23,6 +23,9 @@ With `--test` the simulator: data) but no textures, and the window stays hidden, - has no sound, no network, no python, no pause (not even one set by the scenery), and no crash dialog, +- takes no input from outside: keys and mouse sent to its window, gamepad, UART (a cab + desk), ZeroMQ and commands sent by other programs (`WM_COPYDATA`) are all ignored, and + motion telemetry is off, - runs the simulation as fast as it can in fixed steps of 0.03 s of simulation time per frame (three 10 ms physics steps), whatever the real time, the time speed or the machine, - seeds its random numbers with a fixed seed unless `-seed` or `randomseed` gives one, so two @@ -48,7 +51,7 @@ The test ends with the first of these: | exit code | result | when | | --- | --- | --- | -| 0 | pass | `__test.result` was set to 1 and then every vehicle stood still for 1 s, so a train still moving towards a signal at stop has to stop first. Also the standstill end with `test.pass_on_standstill yes` | +| 0 | pass | `__test.result` was set to 1 and then every vehicle stood still for 1 s, so a train still moving towards a signal at stop has to stop first (with `test.no_movement_before_pass no` the pass ends the test at once). Also the standstill end with `test.pass_on_standstill yes` | | 1 | fail | `__test.result` was set to 0; ends at once | | 2 | signal passed at danger | a train went past a signal showing stop (`SetVelocity 0 0`; `SetVelocity 0 x` on automatic block, which may be passed after a stop, doesn't count); ends at once, unless `test.fail_if_stop_overran no` | | 3 | timeout | `test.timeout` seconds of simulation time went by (default 3600) | @@ -65,9 +68,18 @@ test.timeout 600 test.standstill 120 test.pass_on_standstill no test.fail_if_stop_overran yes +test.no_movement_before_pass yes endconfig ``` +| key | default | meaning | +| --- | --- | --- | +| `test.timeout` | 3600 | seconds of simulation time before the test ends as `timeout`; 0 = never | +| `test.standstill` | 300 | seconds with every vehicle still and no result before the test ends as `standstill`; 0 = never | +| `test.pass_on_standstill` | no | the standstill end passes the test instead | +| `test.fail_if_stop_overran` | yes | a signal passed at danger ends the test; with `no` it's only logged | +| `test.no_movement_before_pass` | yes | a pass waits until every vehicle stands still; with `no` it ends the test at once | + `--test-timeout` on the command line wins over `test.timeout` of the scenery. A signal is passed at danger when the head of a train goes past a signal which its driver @@ -155,6 +167,8 @@ on `tor1k`, the track in front of the signal. The `test_mode_*` cases show the ends of the test mode: `test_mode_pass` (exit 0, the pass event), `test_mode_signal_passed_at_danger` (exit 2), `test_mode_timeout` (exit 3, from `test.timeout`) and `test_mode_standstill` (exit 4, from `test.standstill`). +`test_mode_pass_while_moving` reports the pass from `event2` of `tor1k` (the direction the train runs), as the train runs onto +it, with `test.no_movement_before_pass no`, so the test ends with the train still moving. Checks (speeds in km/h, times in seconds of physicslog time, distances in metres). Most use the physicslog Velocity column, which is the wheel speed: it stays at 0 while the wheels are @@ -178,6 +192,8 @@ the row instead, logged by builds from this branch on. moving off, the wheels stop slipping within `within` seconds. - `holds_still` `moving_speed`, `stop_speed`, `max_distance` (*vehicle speed*): once stopped after moving off, moves no more than `max_distance` metres, e.g. no creeping on locked wheels. +- `ends_moving` `min_speed`: the last row of the physicslog is at `min_speed` or faster, e.g. + the test ended without waiting for the train to stop. New check types go in `CHECKS` in `run.py`; each gets the physicslog rows and the check's parameters and returns `(passed, detail)`. diff --git a/tests/scenarios/cases/test_mode_pass_while_moving.json b/tests/scenarios/cases/test_mode_pass_while_moving.json new file mode 100644 index 000000000..cdf798f16 --- /dev/null +++ b/tests/scenarios/cases/test_mode_pass_while_moving.json @@ -0,0 +1,28 @@ +{ + "description": "Test mode, pass without waiting for a stop: like test_mode_pass, but event2 of the track in front of the exit signal reports the pass as the train runs onto it, and with test.no_movement_before_pass no the test ends at once, the train still moving.", + "base_scenery": "td.scn", + "time": "10:34", + "fragment": "td_red_signal_pass.scn", + "track_events": { + "tor1k": "event2 test_pass" + }, + "test_config": [ + "test.no_movement_before_pass no" + ], + "vars": { + "consist": "node -1 0 {{vehicle}} dynamic pkp\\4e_v1 4e-004 4e 0 headdriver 0 0 enddynamic" + }, + "expect": "pass", + "timeout": 600, + "checks": [ + { + "type": "starts", + "min_speed": 5, + "within": 150 + }, + { + "type": "ends_moving", + "min_speed": 3 + } + ] +} diff --git a/tests/scenarios/run.py b/tests/scenarios/run.py index 770069d12..4c3383081 100644 --- a/tests/scenarios/run.py +++ b/tests/scenarios/run.py @@ -416,6 +416,15 @@ def check_holds_still(rows, moving_speed, stop_speed, max_distance): return d <= max_distance, detail +def check_ends_moving(rows, min_speed): + """The run ended with the vehicle still moving, e.g. a pass that didn't wait for the trains to stop.""" + if not rows: + return False, "the physicslog is empty" + last = rows[-1] + ok = last[COL_VELOCITY] >= min_speed + return ok, f"last row t={last[COL_TIME]:.1f}s, v={last[COL_VELOCITY]:.1f} km/h (wanted >= {min_speed})" + + def check_slip_clears(rows, moving_speed, stop_speed, within): """Once the vehicle has stopped after moving off, its wheels stop slipping within `within` seconds (a vehicle left skidding on locked wheels keeps its brakes capped by the sliding adhesion).""" @@ -444,6 +453,7 @@ CHECKS = { "stops": check_stops, "stays_stopped": check_stays_stopped, "distance": check_distance, + "ends_moving": check_ends_moving, } diff --git a/utilities/Globals.cpp b/utilities/Globals.cpp index 5cdb3ef25..2516da29e 100644 --- a/utilities/Globals.cpp +++ b/utilities/Globals.cpp @@ -487,6 +487,12 @@ bool global_settings::ConfigParseTest(cParser& Parser, const std::string& token) return true; } + if (token == "test.no_movement_before_pass") + { + ParseOne(Parser, test.no_movement_before_pass); + return true; + } + return false; } @@ -1783,6 +1789,7 @@ global_settings::export_as_text( std::ostream &Output ) const { export_as_text( Output, "test.standstill", test.standstill ); export_as_text( Output, "test.pass_on_standstill", test.pass_on_standstill ); export_as_text( Output, "test.fail_if_stop_overran", test.fail_if_stop_overran ); + export_as_text( Output, "test.no_movement_before_pass", test.no_movement_before_pass ); export_as_text( Output, "gfx.envmap.enabled", gfx_envmap_enabled ); export_as_text( Output, "gfx.postfx.motionblur.enabled", gfx_postfx_motionblur_enabled ); export_as_text( Output, "gfx.postfx.motionblur.shutter", gfx_postfx_motionblur_shutter ); diff --git a/utilities/Globals.h b/utilities/Globals.h index 8fa04e9ce..a6a9e1226 100644 --- a/utilities/Globals.h +++ b/utilities/Globals.h @@ -93,6 +93,7 @@ struct global_settings { double standstill{ 300.0 }; // [s] every vehicle standing still this long ends the test; 0 = never bool pass_on_standstill{ false }; // the standstill end passes the test instead of failing it bool fail_if_stop_overran{ true }; // a train passing a signal at stop ends the test as failed; with false it's only logged + bool no_movement_before_pass{ true }; // a pass waits until every vehicle stands still; with false it ends the test at once bool timeout_from_command_line{ false }; // --test-timeout given, the scenery doesn't override it } test; bool editor_tracks{ false }; // F3 track workspace: draw and pick tracks without the scenery draw-range cap From 19b500f9bebdce6125630d3787c5bb684237a099 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 17:58:20 +0100 Subject: [PATCH 285/430] fix(lights): darken the coupled end with the light programmer from either cab (eu07/maszyna#395) SetLights() gives RaLightsSet() the lights for the vehicle's end towards the head of the consist and the end towards its tail, whichever way the occupied cab faces. The coupling that switches an end off was looked up at the opposite end whenever the cab faced the tail of the consist (e.g. 6Dg driven from its second cab position), so the free end went dark and the end with the train was lit. The per-vehicle choice moves to lights_programmer::vehicle_lights() in vehicle/lightsprogrammer.h, which checks the coupling at the same end it lights, with unit tests for both cabs, both orientations and the train at either end. Driving from a cab facing the head of the consist gives the same lights as before. No data change needed. --- tests/unit/test_lights_programmer.cpp | 93 +++++++++++++++++++++++++++ vehicle/DynObj.cpp | 30 ++++----- vehicle/lightsprogrammer.h | 41 ++++++++++++ 3 files changed, 148 insertions(+), 16 deletions(-) create mode 100644 tests/unit/test_lights_programmer.cpp create mode 100644 vehicle/lightsprogrammer.h diff --git a/tests/unit/test_lights_programmer.cpp b/tests/unit/test_lights_programmer.cpp new file mode 100644 index 000000000..8a31563d8 --- /dev/null +++ b/tests/unit/test_lights_programmer.cpp @@ -0,0 +1,93 @@ +#include "stdafx.h" +#include "doctest.h" + +#include "vehicle/lightsprogrammer.h" + +// the lights the light preset selector (programmer) of the occupied cab gives the vehicles of the consist, +// TDynamicObject::SetLights(): the cab's front lights at the end the cab faces, its back lights at the other +// end, and no lights at an end with another vehicle coupled + +namespace { + +int const pc1{light::headlight_left | light::headlight_upper | light::headlight_right}; +int const tailmarkers{light::redmarker_left | light::redmarker_right}; +std::array const cablights{pc1, tailmarkers}; // Lights[end::front], Lights[end::rear] + +// the lights at the vehicle's own end, placed the way TDynamicObject::RaLightsSet() places them +int lights_at(lights_programmer::consist_lights const &Lights, int const Direction, end const Side) { + auto const headend{Direction > 0 ? end::front : end::rear}; + return Side == headend ? Lights.head : Lights.rear; +} + +struct setup { + int cab; // CabOccupied of the vehicle with the programmer + int direction; // its iDirection + std::array coupled; // vehicle coupled at its end::front / end::rear +}; + +lights_programmer::consist_lights lights_for(setup const &Setup) { + // TDynamicObject::SetLights(): the cab faces the head of the consist when CabOccupied * DirectionGet() >= 0 + auto const cabfacinghead{Setup.cab * (Setup.direction > 0 ? 1 : -1) >= 0}; + return lights_programmer::vehicle_lights(cablights, cabfacinghead, Setup.direction, Setup.coupled); +} + +} // namespace + +TEST_CASE("lights programmer: a lone vehicle gets the cab's front lights ahead of the cab and its back lights behind it") { + for (auto const direction : {0, 1}) { + CAPTURE(direction); + // cab 1 faces end::front + auto const fromcab1{lights_for({1, direction, {false, false}})}; + CHECK(lights_at(fromcab1, direction, end::front) == pc1); + CHECK(lights_at(fromcab1, direction, end::rear) == tailmarkers); + // cab -1 faces end::rear + auto const fromcab2{lights_for({-1, direction, {false, false}})}; + CHECK(lights_at(fromcab2, direction, end::rear) == pc1); + CHECK(lights_at(fromcab2, direction, end::front) == tailmarkers); + } +} + +TEST_CASE("lights programmer: the end with the train coupled goes dark, not the other one (eu07/maszyna#395)") { + // a locomotive driven from either cab, with the train coupled at either end, either way round in the consist. + // the end with the train goes dark, the free end shows the lights meant for it + for (auto const direction : {0, 1}) { + for (auto const cab : {1, -1}) { + for (auto const trainend : {end::front, end::rear}) { + CAPTURE(direction); + CAPTURE(cab); + CAPTURE(trainend); + std::array coupled{false, false}; + coupled[trainend] = true; + auto const freeend{trainend == end::front ? end::rear : end::front}; + auto const cabfront{cab > 0 ? end::front : end::rear}; + + auto const lights{lights_for({cab, direction, coupled})}; + + CHECK(lights_at(lights, direction, trainend) == 0); + CHECK(lights_at(lights, direction, freeend) == (freeend == cabfront ? pc1 : tailmarkers)); + } + } + } +} + +TEST_CASE("lights programmer: 6Dg driven backwards from its second cab position pulls the train with its head lights lit (eu07/maszyna#395)") { + // the reported case: the train coupled behind the driver (end::front, which cab -1 has at its back), the + // locomotive running towards end::rear, the train in tow. the head lights stay lit, the end with the train goes dark; + // before the fix the couplings were looked up at the swapped ends and it was the other way round + auto const lights{lights_for({-1, 1, {true, false}})}; + + CHECK(lights_at(lights, 1, end::rear) == pc1); + CHECK(lights_at(lights, 1, end::front) == 0); +} + +TEST_CASE("lights programmer: a vehicle coupled at both ends stays dark") { + for (auto const direction : {0, 1}) { + for (auto const cab : {1, -1}) { + CAPTURE(direction); + CAPTURE(cab); + auto const lights{lights_for({cab, direction, {true, true}})}; + CHECK(lights.head == 0); + CHECK(lights.rear == 0); + } + } +} diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index d5f60e332..ce1f89e72 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -15,6 +15,8 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "vehicle/DynObj.h" +#include "vehicle/lightsprogrammer.h" + #include "simulation/simulation.h" #include "rendering/lightarray.h" #include "vehicle/Camera.h" @@ -7289,26 +7291,22 @@ void TDynamicObject::SetLights() { auto const isfrontcaboccupied { MoverParameters->CabOccupied * DirectionGet() >= 0 }; int const automaticmarkers { MoverParameters->CabActive == 0 && MoverParameters->InactiveCabFlag & activation::redmarkers ? light::redmarker_left + light::redmarker_right : 0 }; - int const front { ( isfrontcaboccupied ? end::front : end::rear ) }; - int const rear { 1 - front }; auto const lightpos { MoverParameters->LightsPos - 1 }; - auto const frontlights { automaticmarkers > 0 ? automaticmarkers : MoverParameters->Lights[ front ][ lightpos ] }; - auto const rearlights { automaticmarkers > 0 ? automaticmarkers : MoverParameters->Lights[ rear ][ lightpos ] }; + std::array const cablights { + automaticmarkers > 0 ? automaticmarkers : MoverParameters->Lights[ end::front ][ lightpos ], + automaticmarkers > 0 ? automaticmarkers : MoverParameters->Lights[ end::rear ][ lightpos ] }; + // the custom position keeps the lights lit at coupled ends as well + auto const ignorecouplings { MoverParameters->LightsPos == 18 }; auto *vehicle { GetFirstDynamic( MoverParameters->CabOccupied >= 0 ? end::front : end::rear, coupling::control ) }; while( vehicle != nullptr ) { // set lights on given side if there's no coupling with another vehicle, turn them off otherwise - auto const *frontvehicle{(isfrontcaboccupied ? vehicle->Prev(coupling::coupler) : vehicle->Next(coupling::coupler))}; - auto const *rearvehicle{(isfrontcaboccupied ? vehicle->Next(coupling::coupler) : vehicle->Prev(coupling::coupler))}; - - if (MoverParameters->LightsPos == 18) - { - frontvehicle = nullptr; - rearvehicle = nullptr; - } - - vehicle->RaLightsSet( - frontvehicle == nullptr ? frontlights : 0, - rearvehicle == nullptr ? rearlights : 0 ); + auto const iscoupled { [ vehicle, ignorecouplings ]( end const Side ) { + return false == ignorecouplings + && ( vehicle->MoverParameters->Couplers[ Side ].CouplingFlag & coupling::coupler ) != 0 + && vehicle->MoverParameters->Neighbours[ Side ].vehicle != nullptr; } }; + auto const lights { lights_programmer::vehicle_lights( + cablights, isfrontcaboccupied, vehicle->iDirection, { iscoupled( end::front ), iscoupled( end::rear ) } ) }; + vehicle->RaLightsSet( lights.head, lights.rear ); vehicle = isfrontcaboccupied ? vehicle->Next(coupling::control) : vehicle->Prev(coupling::control); } }; diff --git a/vehicle/lightsprogrammer.h b/vehicle/lightsprogrammer.h new file mode 100644 index 000000000..9ae8c2ab0 --- /dev/null +++ b/vehicle/lightsprogrammer.h @@ -0,0 +1,41 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include + +#include "McZapkie/MOVER.h" + +// the lights the light preset selector (programmer) of the occupied cab gives one vehicle of the consist +namespace lights_programmer { + +// the lights for the vehicle's two ends, in the terms of TDynamicObject::RaLightsSet(): head is the end +// towards the head of the consist (TDynamicObject::Prev()), rear the end towards its tail (Next()) +struct consist_lights { + int head; + int rear; +}; + +// Cablights: the selector's lights for the occupied cab's front and back (Lights[end::front / end::rear]). +// Cabfacinghead: the occupied cab faces the head of the consist. +// Direction: the vehicle's iDirection, 1 when its end::front is towards the head of the consist. +// Coupled: whether another vehicle is coupled at the vehicle's end::front / end::rear; an end with a coupled +// vehicle stays dark +inline consist_lights vehicle_lights(std::array const &Cablights, bool const Cabfacinghead, int const Direction, std::array const &Coupled) { + auto const headlights{Cablights[Cabfacinghead ? end::front : end::rear]}; + auto const rearlights{Cablights[Cabfacinghead ? end::rear : end::front]}; + // the head lights go to the vehicle's end towards the head of the consist whichever way the cab faces, + // so the coupling which keeps them dark is the one at that same end (eu07/maszyna#395) + auto const headend{Direction > 0 ? end::front : end::rear}; + auto const rearend{Direction > 0 ? end::rear : end::front}; + return {Coupled[headend] ? 0 : headlights, Coupled[rearend] ? 0 : rearlights}; +} + +} // namespace lights_programmer From f53e184949614cab1aeed8411110694ddbef7c4a Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Sat, 7 Nov 2026 15:37:14 +0100 Subject: [PATCH 286/430] AI braking: hold a train coming to a stand uphill Uphill a long train often came to a stand with its brake on the way off and rolled back several metres: the AI released the train brake to 0 about 20 m short of the stop (the gradient alone would have stopped the train short of the stopping window), applied only the first step again at the last moment, and a G train cannot apply its brake again within the few seconds the gradient takes to stop it. Coming to a stand on an up gradient (also when only part of the train is on it) the AI now: - applies the brake before the train stops on the gradient alone, once the time left to the stand is no longer than half of what the brake takes to apply; - does not let the train coast on or pull up while the brake is applied and the gradient would stop the train sooner than the brake of the consist can be released; - does not release the train brake any further below 10 km/h on the way to a stand (unless the train is to be driven on); - puts the locomotive brake on below 3 km/h when the train will reach the point it is to stop at (not when it has slowed down short of it and is to pull up), and at once if the train rolls back. --- vehicle/Driver.cpp | 59 ++++++++++++++++++++++++++++++++++++++++++++-- vehicle/Driver.h | 2 ++ 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index ea78e655c..75f7bea7a 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -3203,6 +3203,12 @@ bool TController::DecBrake() { // a distributor applied at all gives at least its minimum stage, about what the first position does, so // a position short of the first one brakes no weaker than that deltaAcc = -AccDesired * BrakeAccFactor() - ( fBrake_a0[ 0 ] + 4 * std::max( 0.0, BrakeCtrlPosition - pos_diff ) * fBrake_a1[ 0 ] ); + } + if( ( BrakeCtrlPosition > 0.0 ) + && ( uphill_stop_hold() ) ) { + // any release now raises the pipe, and a long train releases more than the handle is moved back, too late + // to apply again before the train stands: keep the brake as it is, and the locomotive brake with it + break; } if (deltaAcc < 0 && /*GBH mvOccupied->BrakeCtrlPosR*/ BrakeCtrlPosition > 0) { OK = /*mvOccupied->*/ BrakeLevelAdd(-0.25); @@ -7341,8 +7347,15 @@ TController::pick_optimal_speed( double const Range ) { AccDesired = std::min( AccDesired, EU07_AI_NOACCELERATION ); } else if( ( vel < 0.0 ) - || ( ( vel < 5.0 ) && ( AccDesired < 0.0 ) ) ) { - AccDesired = std::min( AccDesired, fAccGravity - 0.15 ); + || ( ( vel < 5.0 ) && ( AccDesired < 0.0 ) ) + // rolling to a stand on the gradient alone, the brake has to be on its way before the train stops: + // once the time left to the stand is no longer than half of what the brake takes to apply, apply it; any + // sooner and the brake takes off more of the distance than the stop was planned with + || ( ( BrakeSystem == TBrakeSystem::Pneumatic ) + && ( vel / 3.6 / -fAccGravity <= 0.5 * brake_response_horizon( mvOccupied, BrakeSystem, 1.0, fBrake_a0[ 0 ] ) ) ) ) { + // the gradient alone already slows the train down nearly this much; ask for enough on top of it that + // the brake is applied for sure, not held back by the margin against small corrections + AccDesired = std::min( AccDesired, fAccGravity - std::max( 0.15, fBrake_a0[ 0 ] ) - brake_increase_margin() ); } } @@ -7651,6 +7664,7 @@ TController::adjust_desired_speed_for_target_speed( double const Range ) { ( VelNext * VelNext - vel * vel ) / ( 25.92 * stoppingroom ) ); if( ( fAccGravity < -0.025 ) && ( AccDesired >= fAccGravity - 0.001 ) // no brake needed at all + && ( false == uphill_brake_committed( vel ) ) && ( ActualProximityDist - uphill_stopping_distance( vel, fAccGravity ) > stopping_margin() ) ) { // uphill the gradient alone would bring the train to a stand short of the // middle of the stopping window; keep it rolling at the present speed until that changes, @@ -7726,6 +7740,7 @@ TController::adjust_desired_speed_for_target_speed( double const Range ) { } else if( ( fAccGravity < -0.025 ) && ( ( OrderCurrentGet() & Obey_train ) != 0 ) + && ( false == uphill_brake_committed( vel ) ) && ( ActualProximityDist - uphill_stopping_distance( vel, fAccGravity ) > brakingpointoffset ) ) { // uphill the gradient alone slows the train down more than it is asked to; // keep it rolling at the present speed until that changes @@ -8177,6 +8192,35 @@ TController::brake_increase_margin() const { return fBrake_a1[ 0 ]; } +// a train coming to a stand with at least part of it on an up gradient: a long train brake released now cannot be +// applied again before the train stops and starts to roll back, so the train brake is not released any further, and the +// locomotive brake, which acts at once, helps to hold the train +bool +TController::uphill_stop_hold() const { + + return ( + ( BrakeSystem == TBrakeSystem::Pneumatic ) && is_train() && ( ( OrderCurrentGet() & Obey_train ) != 0 ) + && ( VelNext == 0.0 ) + && ( ActualProximityDist <= fMaxProximityDist ) + && ( fAccGravity < -0.005 ) + && ( std::abs( DirectionalVel() ) < 10.0 ) + // not while the train is to be driven on + && ( AccDesired <= 0.0 ) ); +} + +// uphill with the train brake applied, the gradient brings a slow train to a stand sooner than the brake of the consist +// can be released: letting the train roll on (or pulling up) at this speed only releases the brake for nothing, and the +// train stands with the brake on its way off instead +bool +TController::uphill_brake_committed( double const Velocity ) const { + + return ( + ( BrakeSystem == TBrakeSystem::Pneumatic ) + && ( BrakeCtrlPosition > 0.0 ) + && ( fAccGravity < -0.025 ) + && ( Velocity / 3.6 / -fAccGravity < brake_response_horizon( mvOccupied, BrakeSystem, -1.0, fBrake_a0[ 0 ] ) ) ); +} + void TController::control_braking_force() { // don't touch the brakes when compressing buffers during coupling/uncoupling @@ -8276,6 +8320,17 @@ void TController::control_braking_force() { cue_action(driver_hint::brakingforcedecrease, (mvOccupied->BrakeDelayFlag > bdelay_G ? mvOccupied->BrakeDelay[0] : mvOccupied->BrakeDelay[2]) / 3.0 * 0.5); // Ra: tymczasowo, bo przeżyna S1 } + // uphill, the locomotive brake acts at once while the train brake of a long train takes many seconds to apply: + // put it on as the train comes to a stand, and at once if the train has started to roll back + if( ( mvOccupied->LocalBrake != TLocalBrake::ManualBrake ) + && ( mvOccupied->LocalBrakePosA < 1.0 ) + && ( ( uphill_stop_hold() && ( std::abs( velocity ) < 3.0 ) + // a train that has slowed down short of where it is to stop and is to pull up further does not get it + && ( VelDesired <= std::abs( velocity ) + 0.5 ) + && ( ActualProximityDist - uphill_stopping_distance( std::abs( velocity ), fAccGravity ) <= stopping_margin() ) ) + || ( ( BrakeSystem == TBrakeSystem::Pneumatic ) && ( fAccGravity < -0.005 ) && ( velocity < -0.1 ) && ( AccDesired <= 0.0 ) ) ) ) { + cue_action( driver_hint::independentbrakeapply ); + } // stop-gap measure to ensure cars actually brake to stop even when above calculactions go awry // instead of releasing the brakes and creeping into obstacle at 1-2 km/h if( is_car() && VelDesired == 0.0 && velocity > VelDesired && ActualProximityDist <= fMinProximityDist && mvOccupied->LocalBrakePosA < 0.01 ) { diff --git a/vehicle/Driver.h b/vehicle/Driver.h index f1975fca6..82899493a 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -312,6 +312,8 @@ private: return mvOccupied->Vel * sign( iDirection * mvOccupied->V ); } double brake_increase_margin() const; + bool uphill_stop_hold() const; + bool uphill_brake_committed( double const Velocity ) const; void update_timers( double const dt ); void update_logs( double const dt ); From 8d1d9eec9b2f2e0ae15dc20f21c943e7f9693c89 Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Sat, 7 Nov 2026 18:10:47 +0100 Subject: [PATCH 287/430] AI braking: smaller steps, earlier, while approaching a stop or a lower speed Changes to how the AI works the train brake on the way to a lower speed or a stop, so that it uses few, early applications instead of a late deep one: - Approaching a lower speed, the deceleration may fall short of the demand by only half of a step (fBrake_a1) before the brake is applied harder. With a full step the demand crept up meanwhile and a long G train got its next step many seconds too late. - The shortfall is checked every 3 s. If it keeps growing at a handle left alone for longer than the brake takes to respond, the AI adds a small step at once instead of waiting until the margin calls for a deep one. A shortfall that shrinks on its own (brake still filling, blocks gripping harder at lower speed) does not trigger it. - Releasing, a position short of the first one counts as giving the minimum stage of the distributor, not less. - Holding the speed on a descent, the predicted excess speed is taken off over the time the brake takes to respond, not at once, so a slow brake does not get a deep application that then takes as long to release. --- vehicle/Driver.cpp | 69 ++++++++++++++++++++++++++++++++++++++++------ vehicle/Driver.h | 5 ++++ 2 files changed, 65 insertions(+), 9 deletions(-) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 8d2a3fac6..ea78e655c 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -2928,6 +2928,9 @@ bool TController::ReleaseEngine() { return OK; } +// defined further down, with the braking demand it is used for +static double brake_response_horizon( TMoverParameters const *Vehicle, TBrakeSystem const Brakesystem, double const Acceleration, double const Brakea0 ); + bool TController::IncBrake() { // zwiększenie hamowania auto OK { false }; @@ -3040,7 +3043,7 @@ bool TController::IncBrake() } double deltaAcc = -AccDesired*BrakeAccFactor() - (fBrake_a0[0] + 4.0 * (/*GBH mvOccupied->BrakeCtrlPosR*/BrakeCtrlPosition - 1 - pos_corr)*fBrake_a1[0]); - if( deltaAcc > fBrake_a1[0]) + if( deltaAcc > brake_increase_margin() ) { if( /*GBH mvOccupied->BrakeCtrlPosR*/BrakeCtrlPosition < 0.1 ) { OK = /*mvOccupied->*/BrakeLevelAdd( BrakingInitialLevel ); //GBH @@ -3069,10 +3072,13 @@ bool TController::IncBrake() } else if( BrakeCtrlPosition > 0.0 && AccDesired < 0.0 // only while braking is asked for, not when called for a train slipping back while starting - && fBrakeHeldTime > ( - mvOccupied->BrakeDelayFlag > bdelay_G ? - mvOccupied->BrakeDelay[ 1 ] : - mvOccupied->BrakeDelay[ 3 ] ) ) { + && ( fBrakeHeldTime > ( + mvOccupied->BrakeDelayFlag > bdelay_G ? + mvOccupied->BrakeDelay[ 1 ] : + mvOccupied->BrakeDelay[ 3 ] ) + // a train falling further behind needs no full fill time to be seen not to get enough + || ( ( fShortfall > 0.02 ) + && ( fBrakeHeldTime > brake_response_horizon( mvOccupied, BrakeSystem, 1.0, fBrake_a0[ 0 ] ) ) ) ) ) { // the table says the present position is enough, but the brake has had its full fill // time since the handle last moved and the train is still not slowing down as asked: // believe the train rather than the table @@ -3194,7 +3200,9 @@ bool TController::DecBrake() { if( fBrake_a0[0] != 0.0 || fBrake_a1[0] != 0.0 ) { auto const pos_diff { ( is_dmu() ? 0.25 : 1.0 ) }; - deltaAcc = -AccDesired * BrakeAccFactor() - ( fBrake_a0[ 0 ] + 4 * (/*GBH mvOccupied->BrakeCtrlPosR*/BrakeCtrlPosition - pos_diff )*fBrake_a1[ 0 ] ); + // a distributor applied at all gives at least its minimum stage, about what the first position does, so + // a position short of the first one brakes no weaker than that + deltaAcc = -AccDesired * BrakeAccFactor() - ( fBrake_a0[ 0 ] + 4 * std::max( 0.0, BrakeCtrlPosition - pos_diff ) * fBrake_a1[ 0 ] ); } if (deltaAcc < 0 && /*GBH mvOccupied->BrakeCtrlPosR*/ BrakeCtrlPosition > 0) { OK = /*mvOccupied->*/ BrakeLevelAdd(-0.25); @@ -7701,7 +7709,7 @@ TController::adjust_desired_speed_for_target_speed( double const Range ) { // train is still speeding up, the prediction above has taken that off already) auto room { brakingroom }; if( ( AbsAccS <= 0.0 ) - && ( ( VelNext > 0.0 ) || ( BrakeCtrlPosition <= 0.0 ) ) ) { // for a stop, only while the brake is still to be applied + && ( BrakeCtrlPosition <= 0.0 ) ) { // only while the brake is still to be applied: once it acts, the room it needs to respond is behind room = std::max( 0.5 * brakingroom, brakingroom - vel / 3.6 * brake_response_horizon( mvOccupied, BrakeSystem, 1.0, fBrake_a0[ 0 ] ) ); @@ -7830,6 +7838,10 @@ TController::adjust_desired_speed_for_current_speed() { BrakeSystem == TBrakeSystem::Pneumatic ? std::clamp( fAccGravity * 15.0, 1.0, 3.0 ) : std::clamp( fAccGravity * 7.5, 1.0, 1.5 ) ) }; + // the predicted difference is to be made up over the time the brake takes to respond, not at once: with a + // slow brake, a demand sized to remove it at once comes on as a deep application, which then takes as + // long to let go, and the train ends up well below the speed it was to hold + auto const holdgain { std::min( 0.04, 1.0 / ( 3.6 * std::max( 1.0, horizon ) ) ) }; if( ( speedestimate > VelDesired ) && ( VelDesired == 0.0 ) ) { // jesli stoj, to hamuj, ale i tak juz za pozno :) @@ -7843,7 +7855,7 @@ TController::adjust_desired_speed_for_current_speed() { AccDesired = std::min( AccDesired, // but don't override decceleration for VelNext std::clamp( - EU07_AI_NOACCELERATION - 0.04 * ( speedestimate - holdspeed ), + EU07_AI_NOACCELERATION - holdgain * ( speedestimate - holdspeed ), -0.05 + fAccThreshold, std::max( EU07_AI_NOACCELERATION, AccPreferred ) ) ); // HACK: for cargo trains with high braking threshold ensure we cross that threshold @@ -8151,6 +8163,20 @@ void TController::increase_tractive_force() { cue_action( driver_hint::tractiveforceincrease ); } +// how far the deceleration may fall short of the demand before the brake is applied harder. approaching a lower +// speed, a pneumatic brake given a full step only once that much is missing acts too late: the demand +// creeps up meanwhile, and in a long G train the next step takes many seconds to act, so half a step is enough +double +TController::brake_increase_margin() const { + + if( ( BrakeSystem == TBrakeSystem::Pneumatic ) + && ( VelNext > 0.0 ) + && ( VelNext < DirectionalVel() ) ) { + return 0.5 * fBrake_a1[ 0 ]; + } + return fBrake_a1[ 0 ]; +} + void TController::control_braking_force() { // don't touch the brakes when compressing buffers during coupling/uncoupling @@ -8168,6 +8194,19 @@ void TController::control_braking_force() { // resultant the AI asks for, not with the brake-only demand AccDesired holds on a descent auto const accdesiredresultant { AccDesired + fAccDesiredGravity }; + // every few seconds, note how far the train falls short of the demand and whether that is getting worse: a brake + // still filling, or blocks gripping harder as the train slows down, make up a shortfall on their own, but a + // shortfall that keeps growing at a constant handle means the train is falling further behind its braking curve + if( ElapsedTime - fShortfallTime >= 3.0 ) { + auto const shortfall { AbsAccS - accdesiredresultant }; + iShortfallGrowth = ( + ( ( AccDesired < 0.0 ) && ( shortfall > fShortfall + 0.005 ) ) ? + iShortfallGrowth + 1 : + 0 ); + fShortfall = shortfall; + fShortfallTime = ElapsedTime; + } + if( is_emu() && !ForcePNBrake ) { // właściwie, to warunek powinien być na działający EP // Ra: to dobrze hamuje EP w EZT @@ -8201,7 +8240,7 @@ void TController::control_braking_force() { } // type & dt_ezt else { // a stara wersja w miarę dobrze działa na składy wagonowe - if( (accdesiredresultant < fAccGravity - 0.1 && AbsAccS > accdesiredresultant + fBrake_a1[0] // regular braking + if( (accdesiredresultant < fAccGravity - 0.1 && AbsAccS > accdesiredresultant + brake_increase_margin() // regular braking || fAccGravity < -0.05 && velocity < -0.1) && // also brake if uphill and slipping back (fBrakeTime < 0.0 // the size of the brake demand decides whether to skip the reaction time, so the brake-only part @@ -8214,6 +8253,18 @@ void TController::control_braking_force() { // Ra: ten czas należy zmniejszyć, jeśli czas dojazdu do zatrzymania jest mniejszy (3.0 + 0.5 * ((mvOccupied->BrakeDelayFlag > bdelay_G ? mvOccupied->BrakeDelay[1] : mvOccupied->BrakeDelay[3]) - 3.0)) * 0.5); // Ra: tymczasowo, bo przeżyna S1 } + else if( ( BrakeSystem == TBrakeSystem::Pneumatic ) + && ( AccDesired < 0.0 ) + && ( BrakeCtrlPosition > 0.0 ) + && ( fShortfall > 0.02 ) + && ( iShortfallGrowth >= 2 ) + && ( fBrakeHeldTime > brake_response_horizon( mvOccupied, BrakeSystem, 1.0, fBrake_a0[ 0 ] ) ) ) { + // the train has been falling further behind the demand for a while at a handle left alone for longer than + // the brake takes to respond: a small step now, while it still is small, rather than the deep one the + // margin above would allow only once the train is far behind + cue_action( driver_hint::brakingforceincrease ); + iShortfallGrowth = 0; + } if ( (accdesiredresultant < fAccGravity - 0.05 || AccDesired >= EU07_AI_NOACCELERATION) // no braking asked for, yet the train is slowing down more than that && accdesiredresultant - fBrake_a1[0] * 0.51 - AbsAccS > 0.05 && OrderCurrentGet() != Disconnect && VelDesired > 0.0 ) { diff --git a/vehicle/Driver.h b/vehicle/Driver.h index 11a01517f..f1975fca6 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -311,6 +311,8 @@ private: double DirectionalVel() const { return mvOccupied->Vel * sign( iDirection * mvOccupied->V ); } + double brake_increase_margin() const; + void update_timers( double const dt ); void update_logs( double const dt ); void determine_consist_state(); @@ -401,6 +403,9 @@ private: double VelDesired = 0.0; // predkość, z jaką ma jechać, wynikająca z analizy tableki; <=VelSignal double fAccDesiredAv = 0.0; // uśrednione przyspieszenie z kolejnych przebłysków świadomości, żeby ograniczyć migotanie double fBrakeHeldTime = 0.0; // czas od ostatniego przestawienia kranu hamulca zasadniczego + double fShortfall = 0.0; // how far the train fell short of the braking demand at the last check [m/s2] + double fShortfallTime = 0.0; // when that was checked + int iShortfallGrowth = 0; // how many checks in a row the shortfall has grown double fAccDesiredGravity = 0.0; // część AccDesired odjęta na spadku jako kompensacja pochylenia; AbsAccS zawiera ją już sam double VelforDriver = -1.0; // prędkość, używana przy zmianie kierunku (ograniczenie przy nieznajmości szlaku?) double VelSignal = 0.0; // ograniczenie prędkości z kompilacji znaków i sygnałów // normalnie na początku ma stać, no chyba że jedzie From 137eb9641f0ea9fa93596c8a4be959f2342d0ba3 Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Sat, 7 Nov 2026 15:37:48 +0100 Subject: [PATCH 288/430] AI: start a train uphill on the train brake Starting uphill the AI released the train brake (and the locomotive brake with it) at once, while the power came on only later: a train on 10 per mille rolled back 20-30 m (E186 with 19 container wagons), and an E189 with 7 Z2 coaches rolled back for minutes without power, because the brake applied again for the rollback kept the power off. Many locomotives cannot pull while their own cylinder is under pressure (asynchronous drives switch to braking, others have a control pressure switch), so holding the train on the locomotive brake is no way out. A train standing on an up gradient with the train brake applied now starts as a driver of a heavy train does: - the train brake stays applied, the locomotive brake is released and the locomotive's own share of the train brake is let off with the releaser; - the power is applied against the braked train (Ready does not hold it back meanwhile, and the rule that brakes a train slipping back is off); - the train brake is released only once the tractive force exceeds 1.1 times the gradient force, the train moves forward, or after 45 s if the locomotive cannot hold the train on its own power. Multiple units are not affected. --- vehicle/Driver.cpp | 73 +++++++++++++++++++++++++++++++++++++++++++--- vehicle/Driver.h | 3 ++ 2 files changed, 72 insertions(+), 4 deletions(-) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 75f7bea7a..1a4d8e3a5 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -3204,6 +3204,10 @@ bool TController::DecBrake() { // a position short of the first one brakes no weaker than that deltaAcc = -AccDesired * BrakeAccFactor() - ( fBrake_a0[ 0 ] + 4 * std::max( 0.0, BrakeCtrlPosition - pos_diff ) * fBrake_a1[ 0 ] ); } + if( bUphillStart ) { + // starting uphill the train brake holds the train until the power does + break; + } if( ( BrakeCtrlPosition > 0.0 ) && ( uphill_stop_hold() ) ) { // any release now raises the pipe, and a long train releases more than the handle is moved back, too late @@ -5947,6 +5951,8 @@ TController::determine_consist_state() { { // sprawdzenie odhamowania wszystkich połączonych pojazdów auto *vehicle { p->MoverParameters }; auto const bp { std::max( 0.0, vehicle->BrakePress - ( vehicle->SpeedCtrlUnit.Parking ? vehicle->MaxBrakePress[ 0 ] * vehicle->StopBrakeDecc : 0.0 ) ) }; + // starting uphill the power is applied against the train brake on purpose, until the power holds the train + auto const heldforstart { bUphillStart }; if (Ready) { // bo jak coś nie odhamowane, to dalej nie ma co sprawdzać if( auto const isbraking { TestFlagAny( vehicle->Hamulec->GetBrakeStatus(), b_hld | b_on ) }; @@ -5955,7 +5961,9 @@ TController::determine_consist_state() { // once in motion a brake down to 0.4 bar counts as released (UIC), even if its distributor // is still in the lap position while the brake pipe recharges ( isbraking && bp > 0.4 ) || vehicle->Fb > 10000.0 ) { // 10 kN - Ready = false; + if( false == heldforstart ) { + Ready = false; + } } // Ra: odluźnianie przeładowanych lokomotyw, ciągniętych na zimno - prowizorka... if( bp >= 0.4 && (AIControllFlag || Global.AITrainman && mvOccupied->Vel < EU07_AI_NOMOVEMENT && !is_emu() && !is_dmu()) && BrakeCtrlPosition == gbh_RP // jest pozycja jazdy @@ -5973,7 +5981,7 @@ TController::determine_consist_state() { vehicle->BrakeReleaser(0); } } - fReady = std::max( bp, fReady ); // szukanie najbardziej zahamowanego + fReady = std::max( heldforstart ? 0.0 : bp, fReady ); // szukanie najbardziej zahamowanego if( ( dy = p->VectorFront().y ) != 0.0 ) { // istotne tylko dla pojazdów na pochyleniu // ciężar razy składowa styczna grawitacji @@ -8109,6 +8117,8 @@ void TController::control_motor_connectors() { void TController::control_tractive_force() { + control_uphill_start(); + auto const velocity { DirectionalVel() }; // jeśli przyspieszenie pojazdu jest mniejsze niż żądane oraz... if( AccDesired > EU07_AI_NOACCELERATION // don't add power if not asked for actual speed-up @@ -8156,6 +8166,58 @@ bool TController::is_too_fast_uphill() const { return ( VelNext == 0.0 && ActualProximityDist <= fMaxProximityDist && AbsAccS > AccDesired + 0.05 ); } +// starting uphill a driver of a heavy train keeps the train brake applied, lets the locomotive's own brake off (the +// independent brake, and its share of the train brake with the releaser), applies the power, and releases the train +// brake only once the power holds the train. releasing everything first lets the train roll back before the power is +// there, and holding the train on the locomotive brake is no way out where that brake cuts the power (asynchronous +// drives, the control pressure switch) +void TController::control_uphill_start() { + + auto const velocity { DirectionalVel() }; + auto const uphill { + ( BrakeSystem == TBrakeSystem::Pneumatic ) + && is_train() + && ( false == is_emu() ) && ( false == is_dmu() ) // a multiple unit has no locomotive to hold a train behind it + && ( fAccGravity < -0.01 ) }; + if( false == uphill ) { + bUphillStart = false; + return; + } + if( false == bUphillStart ) { + if( ( std::abs( velocity ) < EU07_AI_NOMOVEMENT ) + && ( AccDesired > EU07_AI_NOACCELERATION ) + && ( VelDesired > 0.0 ) + && ( BrakeCtrlPosition > 0.0 ) ) { // only with the train brake still applied to hold the train + bUphillStart = true; + fUphillStartTime = ElapsedTime; + } + else { + return; + } + } + if( AccDesired <= EU07_AI_NOACCELERATION ) { + // no longer to start: the standing rules take over + bUphillStart = false; + return; + } + if( ( mvOccupied->LocalBrake != TLocalBrake::ManualBrake ) + && ( mvOccupied->LocalBrakePosA > 0.0 ) ) { + cue_action( driver_hint::independentbrakerelease ); + } + auto tractiveforce { 0.0 }; + for( auto *vehicle { pVehicles[ end::front ] }; vehicle != nullptr; vehicle = vehicle->Next() ) { + tractiveforce += std::max( 0.0, vehicle->MoverParameters->Ft ); + } + auto const holdingforce { fMass * -fAccGravity }; + if( ( velocity > 1.0 ) + || ( tractiveforce > 1.1 * holdingforce ) + // a locomotive that can't hold the train on its own power gets the brake off in the end all the same + || ( ElapsedTime - fUphillStartTime > 45.0 ) ) { + // the power holds the train: the train brake can be released + bUphillStart = false; + } +} + void TController::increase_tractive_force() { if( fActionTime < 0.0 ) { return; } // gdy jest nakaz poczekać z jazdą, to nie ruszać @@ -8285,7 +8347,7 @@ void TController::control_braking_force() { else { // a stara wersja w miarę dobrze działa na składy wagonowe if( (accdesiredresultant < fAccGravity - 0.1 && AbsAccS > accdesiredresultant + brake_increase_margin() // regular braking - || fAccGravity < -0.05 && velocity < -0.1) && // also brake if uphill and slipping back + || fAccGravity < -0.05 && velocity < -0.1 && false == bUphillStart) && // also brake if uphill and slipping back (fBrakeTime < 0.0 // the size of the brake demand decides whether to skip the reaction time, so the brake-only part // (on a descent a heavy train needs its brake built up at once, the gravity does not help it slow) @@ -8401,7 +8463,10 @@ void TController::control_releaser() { // this rule is for starting off, so only below 1 km/h: at speed, just after an application, it would vent // the control reservoir of a locomotive that may have to brake again before the pipe has refilled it if( mvOccupied->BrakePress > 0.4 - && mvOccupied->Hamulec->GetCRP() > 4.9 + && ( mvOccupied->Hamulec->GetCRP() > 4.9 + // starting uphill the train brake stays applied on purpose, and the locomotive's own share of it has to go + // for the power to come on (asynchronous drives and the pressure switch cut the power while it is applied) + || bUphillStart ) && mvOccupied->Vel < 1.0 ) { actuate = true; } diff --git a/vehicle/Driver.h b/vehicle/Driver.h index 82899493a..895e638c5 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -314,6 +314,7 @@ private: double brake_increase_margin() const; bool uphill_stop_hold() const; bool uphill_brake_committed( double const Velocity ) const; + void control_uphill_start(); void update_timers( double const dt ); void update_logs( double const dt ); @@ -408,6 +409,8 @@ private: double fShortfall = 0.0; // how far the train fell short of the braking demand at the last check [m/s2] double fShortfallTime = 0.0; // when that was checked int iShortfallGrowth = 0; // how many checks in a row the shortfall has grown + bool bUphillStart = false; // starting uphill: the train brake holds the train until the power does + double fUphillStartTime = 0.0; // when the uphill start began double fAccDesiredGravity = 0.0; // część AccDesired odjęta na spadku jako kompensacja pochylenia; AbsAccS zawiera ją już sam double VelforDriver = -1.0; // prędkość, używana przy zmianie kierunku (ograniczenie przy nieznajmości szlaku?) double VelSignal = 0.0; // ograniczenie prędkości z kompilacji znaków i sygnałów // normalnie na początku ma stać, no chyba że jedzie From d7c66fa7bcdcb4af351591cf2d1b7dd51273f29b Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 18:10:59 +0100 Subject: [PATCH 289/430] feat: bistable hold coil lever of the line breaker (eu07/maszyna#364) main_off_bt declared with "type: toggle" in the cab's .mmd is now the line breaker's hold coil lever of the ET22 and EP09: it stays where it is put. Off, it opens the line breaker and keeps it from closing (also cancelling a closing armed by a held main_on_bt); back on, it only feeds the coil again. The single keyboard key puts the lever back on before closing, and a line breaker closed by the AI or through the control cable puts the lever back on to match. TGauge now remembers whether type: was given, since every control defaults to toggle. Without type: on main_off_bt (all vehicles today) nothing changes. Data (SVN, not part of this commit): add "type: toggle" to main_off_bt: in dynamic/pkp/et22_v3/*.mmd and dynamic/pkp/ep09_v1, ep09_v2/*.mmd. Older exes ignore it. --- tests/unit/test_hold_coil_lever.cpp | 30 +++++++++++++++++++ vehicle/Gauge.cpp | 1 + vehicle/Gauge.h | 4 +++ vehicle/Train.cpp | 45 +++++++++++++++++++++++++++-- vehicle/holdcoillever.h | 34 ++++++++++++++++++++++ 5 files changed, 112 insertions(+), 2 deletions(-) create mode 100644 tests/unit/test_hold_coil_lever.cpp create mode 100644 vehicle/holdcoillever.h diff --git a/tests/unit/test_hold_coil_lever.cpp b/tests/unit/test_hold_coil_lever.cpp new file mode 100644 index 000000000..cd3a3fee5 --- /dev/null +++ b/tests/unit/test_hold_coil_lever.cpp @@ -0,0 +1,30 @@ +#include "stdafx.h" +#include "doctest.h" + +#include "vehicle/holdcoillever.h" + +// the lever of the line breaker's hold coil on the ET22 and the EP09 stays where it's put (eu07/maszyna#364), when the +// cab declares its main_off_bt control with "type: toggle"; otherwise main_off_bt is the push button it always was + +TEST_CASE("hold coil lever: only a main_off_bt declared as a toggle switch is the bistable lever (eu07/maszyna#364)") { + CHECK(hold_coil_lever::is_bistable(true, true)); + // declared as a push button + CHECK_FALSE(hold_coil_lever::is_bistable(true, false)); + // no type given: a control defaults to the toggle type, which existing cabs relied on for the push button + CHECK_FALSE(hold_coil_lever::is_bistable(false, true)); +} + +TEST_CASE("hold coil lever: operated, it goes over to the other position and stays there") { + // on: the hold coil fed, the line breaker can close + CHECK_FALSE(hold_coil_lever::cuts_off(0.f)); + auto const off{hold_coil_lever::operated(0.f)}; + CHECK(off == doctest::Approx(1.f)); + CHECK(hold_coil_lever::cuts_off(off)); + // operated again it goes back on + auto const on{hold_coil_lever::operated(off)}; + CHECK(on == doctest::Approx(0.f)); + CHECK_FALSE(hold_coil_lever::cuts_off(on)); + // caught on the way between the positions it goes to the far one + CHECK(hold_coil_lever::operated(0.3f) == doctest::Approx(1.f)); + CHECK(hold_coil_lever::operated(0.7f) == doctest::Approx(0.f)); +} diff --git a/vehicle/Gauge.cpp b/vehicle/Gauge.cpp index af8e9a060..080efaef2 100644 --- a/vehicle/Gauge.cpp +++ b/vehicle/Gauge.cpp @@ -249,6 +249,7 @@ TGauge::Load_mapping( cParser &Input, TGauge::scratch_data &Scratchpad ) { gaugetype == "delayed" ? push_delayed : gaugetype == "pushtoggle" ? pushtoggle : toggle; // "toggle" and default + m_typedeclared = true; } else if( key == "soundinc:" ) { m_soundfxincrease.deserialize( Input, sound_type::single ); diff --git a/vehicle/Gauge.h b/vehicle/Gauge.h index fdef9c58e..54d8504da 100644 --- a/vehicle/Gauge.h +++ b/vehicle/Gauge.h @@ -58,6 +58,9 @@ public: // returns offset of submodel associated with the button from the model centre glm::vec3 model_offset() const; TGaugeType type() const; + // whether the definition of the control declared its type, rather than left it at the default + bool type_declared() const { + return m_typedeclared; } inline bool is_push() const { return ( static_cast( type() ) & static_cast( TGaugeType::push ) ) != 0; } @@ -87,6 +90,7 @@ private: // members TGaugeAnimation m_animation { TGaugeAnimation::gt_Unknown }; // typ ruchu TGaugeType m_type { TGaugeType::toggle }; // switch type + bool m_typedeclared { false }; // the type was given with type: in the definition float m_friction { 0.f }; // hamowanie przy zliżaniu się do zadanej wartości float m_targetvalue { 0.f }; // wartość docelowa float m_value { 0.f }; // wartość obecna diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index 201b8972f..5265d755b 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -15,6 +15,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "vehicle/Train.h" #include "vehicle/horn.h" +#include "vehicle/holdcoillever.h" #include "utilities/Globals.h" #include "simulation/simulation.h" @@ -3646,6 +3647,15 @@ void TTrain::OnCommand_pantographcompressoractivate(TTrain *Train, command_data } } +namespace +{ +// whether the cab's main_off_bt is the bistable lever of the line breaker's hold coil (eu07/maszyna#364) +bool is_hold_coil_lever(TGauge const &Button) +{ + return Button.SubModel != nullptr && hold_coil_lever::is_bistable(Button.type_declared(), Button.type() == TGaugeType::toggle); +} +} // namespace + void TTrain::OnCommand_linebreakertoggle(TTrain *Train, command_data const &Command) { @@ -3655,6 +3665,11 @@ void TTrain::OnCommand_linebreakertoggle(TTrain *Train, command_data const &Comm if (Train->m_linebreakerstate == 0) { // ...to close the circuit + if (is_hold_coil_lever(Train->ggMainOffButton) && hold_coil_lever::cuts_off(Train->ggMainOffButton.GetDesiredValue())) + { + // the one key works both controls: the hold coil lever goes back on first, or the line breaker couldn't close + Train->ggMainOffButton.UpdateValue(0.0, Train->dsbSwitch); + } // NOTE: bit of a dirty shortcut here OnCommand_linebreakerclose(Train, Command); } @@ -3694,7 +3709,18 @@ void TTrain::OnCommand_linebreakeropen(TTrain *Train, command_data const &Comman if (Command.action == GLFW_PRESS) { // visual feedback - if (Train->ggMainOffButton.SubModel != nullptr) + if (is_hold_coil_lever(Train->ggMainOffButton)) + { + // the bistable lever goes over to its other position and stays there + auto const position{hold_coil_lever::operated(Train->ggMainOffButton.GetDesiredValue())}; + Train->ggMainOffButton.UpdateValue(position, Train->dsbSwitch); + if (false == hold_coil_lever::cuts_off(position)) + { + // the hold coil is fed again, which by itself doesn't close the line breaker + return; + } + } + else if (Train->ggMainOffButton.SubModel != nullptr) { Train->ggMainOffButton.UpdateValue(1.0, Train->dsbSwitch); } @@ -3731,8 +3757,9 @@ void TTrain::OnCommand_linebreakeropen(TTrain *Train, command_data const &Comman { Train->ggMainOnButton.UpdateValue(0.0, Train->dsbSwitch); } - if (Train->ggMainOffButton.SubModel != nullptr) + if (Train->ggMainOffButton.SubModel != nullptr && false == is_hold_coil_lever(Train->ggMainOffButton)) { + // (the bistable hold coil lever stays where it was put) Train->ggMainOffButton.UpdateValue(0.0, Train->dsbSwitch); } // and the two-state switch too, for good measure @@ -8365,6 +8392,20 @@ bool TTrain::Update(double const Deltatime) // because the state of the line breaker isn't changed to match, we need to do it here manually m_linebreakerstate = 0; } + if (is_hold_coil_lever(ggMainOffButton) && hold_coil_lever::cuts_off(ggMainOffButton.GetDesiredValue())) + { + if (true == mvControlled->Mains) + { + // the line breaker was closed with the hold coil lever off, by the AI or through the control cable: + // put the lever back on to match, like the line breaker state above + ggMainOffButton.UpdateValue(0.0); + } + else if (m_linebreakerstate == 2) + { + // the hold coil was cut off while the closing button was held, the line breaker won't close on its release + m_linebreakerstate = 0; + } + } if ((ggMainButton.SubModel != nullptr && ggMainButton.GetDesiredValue() > 0.95) || ggMainOnButton.SubModel != nullptr && ggMainOnButton.GetDesiredValue() > 0.95 || diff --git a/vehicle/holdcoillever.h b/vehicle/holdcoillever.h new file mode 100644 index 000000000..005bccbd5 --- /dev/null +++ b/vehicle/holdcoillever.h @@ -0,0 +1,34 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +// the lever of the line breaker's hold coil (eu07/maszyna#364), as on the ET22 and the EP09: the cab's main_off_bt +// control declared with "type: toggle" stays in the position it's put in. Position 0 keeps the hold coil fed, so the +// line breaker can be closed; position 1 cuts the coil off, which opens the line breaker and keeps it from closing +// until the lever is put back. Without the declared type main_off_bt stays the push button it always was, which +// opens the line breaker and springs back. +namespace hold_coil_lever { + +// whether the main_off_bt control is the bistable lever, from the type its definition declares, if it declares one +inline bool is_bistable(bool const Typedeclared, bool const Toggletype) { + return Typedeclared && Toggletype; +} + +// whether the lever in the given position cuts off the hold coil +inline bool cuts_off(float const Position) { + return Position > 0.5f; +} + +// the position the lever goes to when it's operated: the other one +inline float operated(float const Position) { + return cuts_off(Position) ? 0.f : 1.f; +} + +} // namespace hold_coil_lever From d8f3875929b6fd4829cc6c69ea52de6f03892e0b Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 18:22:42 +0100 Subject: [PATCH 290/430] fix(gfx): diesel smoke only once the engine fires, not while the starter turns (eu07/maszyna#523) The smoke of a diesel came out at full strength the moment its ignition set Mains and started the spin up, together with the ignition sound, whose first part is the starter cranking the engine. The ignition now starts a countdown of the new optional .fiz parameter SmokeDelay (Engine section of DieselEngine and DieselElectric vehicles, seconds, default 2.0, 0 restores the old behaviour); the smoke source of the vehicle spawns nothing until it runs out. Engines already running, or switched on another way, smoke as before. No SVN data change is needed; vehicle authors may tune SmokeDelay to the cranking part of their ignition: sample. --- McZapkie/MOVER.h | 4 +++ McZapkie/Mover.cpp | 7 ++++ tests/unit/test_smoke.cpp | 68 +++++++++++++++++++++++++++++++++++++++ vehicle/smoke.cpp | 2 +- vehicle/smoke.h | 1 + 5 files changed, 81 insertions(+), 1 deletion(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 199c65a0c..f39de8e26 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -2171,6 +2171,10 @@ class TMoverParameters bool dizel_startup{false}; // engine startup procedure request indicator bool dizel_ignition{false}; // engine ignition request indicator bool dizel_spinup{false}; // engine spin up to idle speed flag + // the starter turns the engine a while before it fires: smoke comes out only after SmokeDelay (the Engine section of the .fiz, + // seconds from the start of the spin up) has passed. 0 lets it out as soon as the starter turns, as before eu07/maszyna#523 + double dizel_SmokeDelay{2.0}; + double dizel_FiringCountdown{0.0}; // seconds left until the engine being started fires, 0 once it runs on its own double dizel_engagedeltaomega = 0.0; /*roznica predkosci katowych tarcz sprzegla*/ double dizel_n_old = 0.0; /*poredkosc na potrzeby obliczen sprzegiel*/ double dizel_Torque = 0.0; /*aktualny moment obrotowy silnika spalinowego*/ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 330e8eb8f..8632e404e 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -7843,6 +7843,9 @@ bool TMoverParameters::dizel_Update(double dt) WaterHeaterCheck(dt); OilPumpCheck(dt); FuelPumpCheck(dt); + // the engine being started fires once the starter has turned it a while; one stopped meanwhile starts over + dizel_FiringCountdown = (Mains ? std::max(0.0, dizel_FiringCountdown - dt) : 0.0); + if (true == dizel_startup && true == dizel_StartupCheck()) { dizel_ignition = true; @@ -7857,6 +7860,7 @@ bool TMoverParameters::dizel_Update(double dt) LastSwitchingTime = 0; Mains = true; dizel_spinup = true; + dizel_FiringCountdown = dizel_SmokeDelay; enrot = std::max(enrot, 0.35 * ( // TODO: dac zaleznie od temperatury i baterii EngineType == TEngineType::DieselEngine ? dizel_nmin : DElist[0].RPM / 60.0)); @@ -11365,6 +11369,9 @@ void TMoverParameters::LoadFIZ_Engine(std::string const &Input) // oil pump extract_value(OilPump.pressure_minimum, "OilMinPressure", Input, ""); extract_value(OilPump.pressure_maximum, "OilMaxPressure", Input, ""); + // the time the starter turns the engine before it fires and smokes (eu07/maszyna#523) + extract_value(dizel_SmokeDelay, "SmokeDelay", Input, ""); + dizel_SmokeDelay = std::max(0.0, dizel_SmokeDelay); // engine cooling factore extract_value(dizel_heat.kw, "HeatKW", Input, ""); extract_value(dizel_heat.kv, "HeatKV", Input, ""); diff --git a/tests/unit/test_smoke.cpp b/tests/unit/test_smoke.cpp index 05fb8ae8b..a1ea788f3 100644 --- a/tests/unit/test_smoke.cpp +++ b/tests/unit/test_smoke.cpp @@ -2,6 +2,7 @@ #include "doctest.h" #include "vehicle.h" +#include "drive.h" #include "vehicle/smoke.h" @@ -83,3 +84,70 @@ TEST_CASE("smoke: the pending particles never outgrow the room of the source") { CHECK(smoke::vehicle_spawn_count(vehicle.mover(), true, rate, 10.0) == rate.limit); } + +TEST_CASE("smoke: an engine the starter turns lets out no smoke until it fires (#523)") { + auto vehicle{diesel()}; + vehicle->dizel_spinup = true; + auto pending{source}; + pending.pending = 5.f; + + vehicle->dizel_FiringCountdown = 0.5; + CHECK(smoke::vehicle_spawn_count(vehicle.mover(), true, pending, update) == 0.f); + + vehicle->dizel_FiringCountdown = 0.0; + CHECK(smoke::vehicle_spawn_count(vehicle.mover(), true, pending, update) >= 1.f); +} + +namespace { + +// the locomotive's engine started the way the AI starts it, a second at a time, until it runs (Mains) +bool start_engine(test::driven const &Driven, test::track const &Track) { + for (int second = 0; second < 120 && false == Driven.controlling.Mains; ++second) { + test::start_up(Driven, Track, 1.0); + } + return Driven.controlling.Mains; +} + +} // namespace + +TEST_CASE("smoke: a real diesel smokes only once its engine has fired, SmokeDelay after the starter began (#523)") { + // a diesel with a mechanical transmission and a diesel-electric one + for (auto const *path : {"sm42_v1/6d1", "st44_v2/m62-1151"}) { + CAPTURE(path); + test::track const track{}; + { + // the default delay + test::vehicle locomotive{test::definition::fiz(path)}; + REQUIRE(locomotive->dizel_SmokeDelay == doctest::Approx(2.0)); + auto const driven{test::driving(locomotive)}; + REQUIRE(start_engine(driven, track)); + // the engine started less than a second ago: the starter still turns it + CHECK(locomotive->dizel_FiringCountdown > 0.5); + CHECK(smoke::vehicle_spawn_count(locomotive.mover(), true, source, update) == 0.f); + // it has fired since + test::drive(driven, track, 3.0); + CHECK(locomotive->Mains); + CHECK(locomotive->dizel_FiringCountdown == 0.0); + CHECK(smoke::vehicle_spawn_count(locomotive.mover(), true, source, update) >= 1.f); + } + { + // SmokeDelay=0: smoke as soon as the starter turns, as before + test::vehicle locomotive{test::definition{test::definition::fiz(path)}.set("Engine", "SmokeDelay", 0)}; + REQUIRE(locomotive->dizel_SmokeDelay == 0.0); + auto const driven{test::driving(locomotive)}; + REQUIRE(start_engine(driven, track)); + CHECK(locomotive->dizel_FiringCountdown == 0.0); + CHECK(smoke::vehicle_spawn_count(locomotive.mover(), true, source, update) >= 1.f); + } + { + // a longer delay from the .fiz + test::vehicle locomotive{test::definition{test::definition::fiz(path)}.set("Engine", "SmokeDelay", 5)}; + auto const driven{test::driving(locomotive)}; + REQUIRE(start_engine(driven, track)); + test::drive(driven, track, 3.0); + CHECK(smoke::vehicle_spawn_count(locomotive.mover(), true, source, update) == 0.f); + test::drive(driven, track, 3.0); + CHECK(smoke::vehicle_spawn_count(locomotive.mover(), true, source, update) >= 1.f); + } + } +} diff --git a/vehicle/smoke.cpp b/vehicle/smoke.cpp index b6e923222..f5f64bef0 100644 --- a/vehicle/smoke.cpp +++ b/vehicle/smoke.cpp @@ -34,7 +34,7 @@ double engine_load(TMoverParameters const &Mover) { } // namespace float vehicle_spawn_count(TMoverParameters const &Mover, bool const Ontracks, spawn_rate const &Rate, double const Timedelta) { - if (false == Ontracks) { + if (false == Ontracks || Mover.dizel_FiringCountdown > 0.0) { return 0.f; } // the steady rate of the source, the way a source of the scenery spawns... diff --git a/vehicle/smoke.h b/vehicle/smoke.h index e9dac2622..dbcc131ae 100644 --- a/vehicle/smoke.h +++ b/vehicle/smoke.h @@ -25,6 +25,7 @@ struct spawn_rate { // number of particles the smoke source of a vehicle has to spawn after Timedelta seconds: the steady rate of the // source, plus a share which grows with the work of its engine. a vehicle taken off the tracks (Ontracks false: gone through a portal, or waiting in the pool of the road // traffic) puffs no more, the particles it already let out fade away as usual +// an engine the starter turns but which hasn't fired yet (TMoverParameters::dizel_FiringCountdown) lets out no smoke either float vehicle_spawn_count(TMoverParameters const &Mover, bool Ontracks, spawn_rate const &Rate, double Timedelta); } // namespace smoke From e8c4f3592e21ee431dca6947b4f9b4bbac625076 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 18:47:41 +0100 Subject: [PATCH 291/430] fix: fpslimit paced in integer clock ticks, FPS shown counts the wait (eu07/maszyna#416) The limiter slept off the rest of each frame with sleep_for() given a float duration. MSVC adds that to steady_clock::now() in float nanoseconds, so after a few hours of system uptime the wake-up time is rounded to tens of ms: at 95 h uptime fpslimit 60 had no effect at all and fpslimit 30 gave ~22 fps, in the full and the legacy renderer alike. frame_pacer now schedules frames on a fixed cadence in steady_clock ticks and the loop waits with sleep_until; an overshooting wait is made up in the next frame. The FPS shown and the motion blur use the new mainloop_period stopwatch (frame start to frame start, wait included); the targetfps/fpsaverage draw-range controllers keep reading the work time as before. (eu07/maszyna#416) --- application/application.cpp | 13 +++- rendering/opengl33renderer.cpp | 9 ++- rendering/openglrenderer.cpp | 9 ++- tests/unit/test_framepacer.cpp | 110 +++++++++++++++++++++++++++++++++ utilities/Timer.h | 1 + utilities/framepacer.h | 59 ++++++++++++++++++ 6 files changed, 192 insertions(+), 9 deletions(-) create mode 100644 tests/unit/test_framepacer.cpp create mode 100644 utilities/framepacer.h diff --git a/application/application.cpp b/application/application.cpp index 9b7b82853..64693b4dc 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -28,6 +28,7 @@ http://mozilla.org/MPL/2.0/. #include "utilities/translation.h" #include "vehicle/Train.h" #include "utilities/Timer.h" +#include "utilities/framepacer.h" #include "utilities/dictionary.h" #include "version_info.h" #include @@ -479,9 +480,14 @@ bool eu07_application::is_client() const int eu07_application::run() { auto frame{0}; + frame_pacer framepacer; + Timer::subsystem.mainloop_period.start(); // main application loop while (!glfwWindowShouldClose(m_windows.front()) && !m_modestack.empty()) { + // the time from one frame's start to the next, the wait for fpslimit included + Timer::subsystem.mainloop_period.stop(); + Timer::subsystem.mainloop_period.start(); Timer::subsystem.mainloop_total.start(); glfwPollEvents(); @@ -641,10 +647,11 @@ int eu07_application::run() if (m_network) m_network->update(); - auto const frametime{Timer::subsystem.mainloop_total.stop()}; - if (Global.minframetime.count() != 0.0f && (Global.minframetime - frametime).count() > 0.0f) + Timer::subsystem.mainloop_total.stop(); + // fpslimit: wait for the next frame's slot (eu07/maszyna#416) + if (auto const nextframe{framepacer.next_frame(frame_pacer::clock::now(), Global.minframetime)}) { - std::this_thread::sleep_for(Global.minframetime - frametime); + std::this_thread::sleep_until(*nextframe); } } // Handled by application.exit diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index c24f750c8..aa37c83e2 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -5663,12 +5663,15 @@ void opengl33_renderer::Update(double const Deltatime) } m_updateaccumulator = 0.0; - m_framerate = 1000.f / ( Timer::subsystem.mainloop_total.average() ); + // the frames actually shown, the wait for fpslimit included (eu07/maszyna#416) + m_framerate = 1000.f / ( Timer::subsystem.mainloop_period.average() ); + // the frames the work alone would allow, so a frame rate held down by fpslimit doesn't cut the draw ranges + auto const workframerate{1000.f / Timer::subsystem.mainloop_total.average()}; // adjust draw ranges etc, based on recent performance if (Global.targetfps != 0.0f) { - float fps_diff = Global.targetfps - m_framerate; + float fps_diff = Global.targetfps - workframerate; if (fps_diff > 0.0f) Global.fDistanceFactor = std::max(0.5f, Global.fDistanceFactor - 0.05f); else @@ -5676,7 +5679,7 @@ void opengl33_renderer::Update(double const Deltatime) } // legacy framerate parameters else if (Global.fFpsAverage != 0.f) { - auto const fps_diff = m_framerate - Global.fFpsAverage; + auto const fps_diff = workframerate - Global.fFpsAverage; if (fps_diff < -Global.fFpsDeviation) { Global.fDistanceFactor = std::min(std::max(1.0f, Global.fDistanceFactor - 0.05f), Global.gfx_distance_factor_max); } diff --git a/rendering/openglrenderer.cpp b/rendering/openglrenderer.cpp index 180dba771..e09aad917 100644 --- a/rendering/openglrenderer.cpp +++ b/rendering/openglrenderer.cpp @@ -4327,12 +4327,15 @@ opengl_renderer::Update( double const Deltatime ) { } m_updateaccumulator = 0.0; - m_framerate = 1000.f / ( Timer::subsystem.gfx_total.average() ); + // the frames actually shown, the wait for fpslimit included (eu07/maszyna#416) + m_framerate = 1000.f / ( Timer::subsystem.mainloop_period.average() ); + // the draw ranges follow the time spent on drawing alone, as before + auto const drawframerate { 1000.f / ( Timer::subsystem.gfx_total.average() ) }; // adjust draw ranges etc, based on recent performance // TODO: it doesn't make much sense with vsync if( Global.targetfps != 0.f ) { - auto const fps_diff = m_framerate - Global.targetfps; + auto const fps_diff = drawframerate - Global.targetfps; if( fps_diff < -0.5f ) { Global.fDistanceFactor = std::min( std::max( 1.0f, Global.fDistanceFactor - 0.05f ), Global.gfx_distance_factor_max ); } @@ -4342,7 +4345,7 @@ opengl_renderer::Update( double const Deltatime ) { } // legacy framerate parameters else if( Global.fFpsAverage != 0.f ) { - auto const fps_diff = m_framerate - Global.fFpsAverage; + auto const fps_diff = drawframerate - Global.fFpsAverage; if( fps_diff < -Global.fFpsDeviation ) { Global.fDistanceFactor = std::min( std::max( 1.0f, Global.fDistanceFactor - 0.05f ), Global.gfx_distance_factor_max ); } diff --git a/tests/unit/test_framepacer.cpp b/tests/unit/test_framepacer.cpp new file mode 100644 index 000000000..bb9acb025 --- /dev/null +++ b/tests/unit/test_framepacer.cpp @@ -0,0 +1,110 @@ +#include "stdafx.h" +#include "doctest.h" +#include "utilities/framepacer.h" + +// the main loop's frame limiter (fpslimit in eu07.ini, eu07/maszyna#416), driven with made-up clock readings +namespace +{ +using namespace std::chrono_literals; +using clock_type = frame_pacer::clock; + +clock_type::time_point const kStart{clock_type::time_point{} + 100s}; +constexpr clock_type::duration kFrame{std::chrono::duration_cast(std::chrono::duration(1.f / 30.f))}; + +// runs frames that take Work each, with every wait overshooting by Oversleep; returns when the last of Frames ends +clock_type::time_point run_frames(frame_pacer &Pacer, int const Frames, clock_type::duration const Work, clock_type::duration const Oversleep) +{ + auto now{kStart}; + for (auto frame = 0; frame < Frames; ++frame) + { + now += Work; + if (auto const next{Pacer.next_frame(now, kFrame)}) + { + CHECK(*next > now); + now = *next + Oversleep; + } + } + return now; +} +} // namespace + +TEST_CASE("frame pacer: without a limit nothing waits") +{ + frame_pacer pacer; + CHECK_FALSE(pacer.next_frame(kStart, clock_type::duration::zero()).has_value()); + CHECK_FALSE(pacer.next_frame(kStart + 1ms, clock_type::duration::zero()).has_value()); +} + +TEST_CASE("frame pacer: a quick frame waits out the rest of the frame time") +{ + frame_pacer pacer; + // the first frame only sets the cadence + CHECK_FALSE(pacer.next_frame(kStart, kFrame).has_value()); + auto const next{pacer.next_frame(kStart + 5ms, kFrame)}; + REQUIRE(next.has_value()); + CHECK(*next == kStart + kFrame); +} + +TEST_CASE("frame pacer: a slow frame doesn't wait") +{ + frame_pacer pacer; + CHECK_FALSE(pacer.next_frame(kStart, kFrame).has_value()); + CHECK_FALSE(pacer.next_frame(kStart + kFrame + 5ms, kFrame).has_value()); +} + +TEST_CASE("frame pacer: the frame rate holds the limit with fast frames") +{ + frame_pacer pacer; + auto const end{run_frames(pacer, 301, 2ms, clock_type::duration::zero())}; + // 300 paced frames after the first + CHECK(end == kStart + 2ms + 300 * kFrame); +} + +TEST_CASE("frame pacer: a wait that overshoots is made up in the next frame") +{ + // the windows timer wakes a sleeping thread up to ~15.6 ms late; sleeping off what is left of each frame + // then drops 30 fps to about 22. on a fixed cadence the frame rate still averages to the limit + frame_pacer pacer; + auto const end{run_frames(pacer, 301, 2ms, 12ms)}; + auto const elapsed{std::chrono::duration(end - kStart).count()}; + CHECK(300.0 / elapsed == doctest::Approx(30.0).epsilon(0.01)); +} + +TEST_CASE("frame pacer: after a long frame the cadence starts anew instead of catching up") +{ + frame_pacer pacer; + CHECK_FALSE(pacer.next_frame(kStart, kFrame).has_value()); + // a hitch of half a second + auto const late{kStart + 500ms}; + CHECK_FALSE(pacer.next_frame(late, kFrame).has_value()); + // the next quick frame waits a whole frame time from there rather than running at once + auto const next{pacer.next_frame(late + 1ms, kFrame)}; + REQUIRE(next.has_value()); + CHECK(*next == late + kFrame); +} + +TEST_CASE("frame pacer: turning the limit off and on again starts a new cadence") +{ + frame_pacer pacer; + CHECK_FALSE(pacer.next_frame(kStart, kFrame).has_value()); + CHECK_FALSE(pacer.next_frame(kStart + 1ms, clock_type::duration::zero()).has_value()); + CHECK_FALSE(pacer.next_frame(kStart + 2s, kFrame).has_value()); + auto const next{pacer.next_frame(kStart + 2s + 1ms, kFrame)}; + REQUIRE(next.has_value()); + CHECK(*next == kStart + 2s + kFrame); +} + +TEST_CASE("frame pacer: the wait stays exact after days of system uptime") +{ + // fpslimit 60 gives the frame time as float seconds; the old limiter handed the float rest of the frame + // to sleep_for, which adds it to steady_clock::now() in float nanoseconds. after 95 hours of uptime that + // rounds the wake-up time to steps of ~33 ms, and a 14 ms wait came out as no wait at all + frame_pacer pacer; + std::chrono::duration const frametime{1.f / 60.f}; + auto const uptime{clock_type::time_point{} + 95h}; + CHECK_FALSE(pacer.next_frame(uptime, frametime).has_value()); + auto const next{pacer.next_frame(uptime + 2ms, frametime)}; + REQUIRE(next.has_value()); + auto const wait{std::chrono::duration(*next - (uptime + 2ms)).count()}; + CHECK(wait == doctest::Approx(1000.0 / 60.0 - 2.0).epsilon(0.001)); +} diff --git a/utilities/Timer.h b/utilities/Timer.h index 32e170a46..c63ef14a7 100644 --- a/utilities/Timer.h +++ b/utilities/Timer.h @@ -64,6 +64,7 @@ struct subsystem_stopwatches { stopwatch sim_events; stopwatch sim_ai; stopwatch mainloop_total; + stopwatch mainloop_period; // start to start, the wait for fpslimit included }; extern subsystem_stopwatches subsystem; diff --git a/utilities/framepacer.h b/utilities/framepacer.h new file mode 100644 index 000000000..a0de0144d --- /dev/null +++ b/utilities/framepacer.h @@ -0,0 +1,59 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include + +// paces the main loop to the frame time set by fpslimit in eu07.ini. +// the frames are scheduled on a fixed cadence rather than by sleeping off what is left of each frame, +// so a sleep that overshoots (the windows timer wakes up in steps of up to ~15.6 ms) is made up by +// a shorter wait in the next frame, and the frame rate averages to the limit. +// all the time arithmetic is done in the clock's integer ticks: a sleep_for() given a float duration +// adds it to now() as float nanoseconds, which after a few hours of system uptime rounds the wake-up +// time to tens of milliseconds and lets the limit fall through (eu07/maszyna#416) +class frame_pacer { + +public: + using clock = std::chrono::steady_clock; + + // called at the end of each frame. returns the point in time the next frame may start at, + // or nothing when it may start right away + [[nodiscard]] std::optional next_frame(clock::time_point const Now, std::chrono::duration const Frametime) { + return next_frame(Now, std::chrono::duration_cast(Frametime)); + } + [[nodiscard]] std::optional next_frame(clock::time_point const Now, clock::duration const Minframetime) { + if (Minframetime <= clock::duration::zero()) { + // no limit + m_framestart.reset(); + return std::nullopt; + } + if (!m_framestart) { + // first paced frame + m_framestart = Now; + return std::nullopt; + } + auto const nextframe{*m_framestart + Minframetime}; + if (Now >= nextframe + Minframetime) { + // a whole frame or more behind: start the cadence anew rather than run frames back to back to catch up + m_framestart = Now; + return std::nullopt; + } + m_framestart = nextframe; + if (Now >= nextframe) { + return std::nullopt; + } + return nextframe; + } + +private: + // the scheduled start of the current frame + std::optional m_framestart; +}; From cf2092700e77cb6626be412130b3421ae0793f5e Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 19:01:13 +0100 Subject: [PATCH 292/430] feat: controller position marker of the diesel locomotives (#74) The mainctrlact: gauge showed MainCtrlActualPos, which nothing sets for DieselEngine/DieselElectric without an EIM controller, so the ST43's marker never moved. For those it now follows MainCtrlPos (vehicle/mainctrlact.h); every other vehicle reads what it did before. New optional gauge key scaletable: [ value scaled, ... ] in the block form gives a non-uniform scale, interpolated linearly between its points, in the units of value * scale + offset; without it gauges behave as before. Assets: none needed. To get the true ST43 scale, the line "mainctrlact: stery_1 rot -0.016 0 0.0" of dynamic/pkp/st43_v1/*.mmd is to become a block with a scaletable: of the 25 positions read off the cab's scale; until then the marker moves linearly with -0.016 turn per position. --- tests/unit/test_gauge_scale.cpp | 110 +++++++++++++++++++++++++++++ vehicle/Gauge.cpp | 27 ++++++++ vehicle/Gauge.h | 6 ++ vehicle/Train.cpp | 6 +- vehicle/gaugescale.h | 118 ++++++++++++++++++++++++++++++++ vehicle/mainctrlact.h | 31 +++++++++ 6 files changed, 294 insertions(+), 4 deletions(-) create mode 100644 tests/unit/test_gauge_scale.cpp create mode 100644 vehicle/gaugescale.h create mode 100644 vehicle/mainctrlact.h diff --git a/tests/unit/test_gauge_scale.cpp b/tests/unit/test_gauge_scale.cpp new file mode 100644 index 000000000..57486cee2 --- /dev/null +++ b/tests/unit/test_gauge_scale.cpp @@ -0,0 +1,110 @@ +#include "stdafx.h" +#include "doctest.h" +#include "consist.h" + +#include "utilities/parser.h" +#include "vehicle/gaugescale.h" +#include "vehicle/mainctrlact.h" + +// the controller position marker of the diesel locomotives (MaSzyna-EU07/maszyna#74): the mainctrlact: gauge of +// the ST43 follows its controller, on a scale whose marks are not evenly spaced (scaletable:) + +using test::consist; +using test::definition; + +namespace { + +gauge_scale::table read(std::string const &Text) { + cParser parser(Text, cParser::buffer_TEXT); + return gauge_scale::read(parser); +} + +} // namespace + +TEST_CASE("gauge scale: a table is read with or without commas, the brackets touching the numbers or not") { + for (auto const *text : {"[ 0 0, 1 0.5, 2 0.6 ]", "[0 0 1 0.5 2 0.6]", "[ 0 0,1 0.5,2 0.6]"}) { + CAPTURE(text); + auto const table{read(text)}; + CHECK(table.closed); + CHECK_FALSE(table.block_end); + CHECK_FALSE(table.malformed); + REQUIRE(table.points.size() == 3); + CHECK(table.points[1].value == doctest::Approx(1.0)); + CHECK(table.points[1].scaled == doctest::Approx(0.5)); + } +} + +TEST_CASE("gauge scale: the table leaves the rest of the gauge's block to be read") { + cParser parser("[ 0 0, 1 0.5 ] soundinc: x.wav }", cParser::buffer_TEXT); + CHECK(gauge_scale::read(parser).closed); + CHECK(parser.getToken(true, "\n\r\t ,;") == "soundinc:"); +} + +TEST_CASE("gauge scale: a table without its closing bracket stops at the end of the block") { + auto const table{read("[ 0 0, 1 0.5 }")}; + CHECK_FALSE(table.closed); + CHECK(table.block_end); + CHECK(table.points.size() == 2); +} + +TEST_CASE("gauge scale: a value without what the gauge shows for it, or a word, makes a malformed table") { + CHECK(read("[ 0 0, 1 ]").malformed); + CHECK(read("[ 0 0, 1 x ]").malformed); + CHECK(read("[ 0 0, 1 x ]").points.size() == 1); +} + +TEST_CASE("gauge scale: the points are put in the order of their values") { + auto const table{read("[ 2 0.6, 0 0, 1 0.5 ]")}; + REQUIRE(table.points.size() == 3); + CHECK(table.points[0].value == doctest::Approx(0.0)); + CHECK(table.points[2].value == doctest::Approx(2.0)); +} + +TEST_CASE("gauge scale: the gauge shows what the table gives, interpolated between its points") { + auto const table{read("[ 0 0, 1 -0.05, 2 -0.07, 4 -0.08 ]")}; + CHECK(gauge_scale::interpolate(table.points, 0.f) == doctest::Approx(0.0)); + CHECK(gauge_scale::interpolate(table.points, 1.f) == doctest::Approx(-0.05)); + CHECK(gauge_scale::interpolate(table.points, 0.5f) == doctest::Approx(-0.025)); // a marker on its way + CHECK(gauge_scale::interpolate(table.points, 3.f) == doctest::Approx(-0.075)); + CHECK(gauge_scale::interpolate(table.points, 4.f) == doctest::Approx(-0.08)); + // past the ends the marker stays at them + CHECK(gauge_scale::interpolate(table.points, -1.f) == doctest::Approx(0.0)); + CHECK(gauge_scale::interpolate(table.points, 9.f) == doctest::Approx(-0.08)); +} + +TEST_CASE("gauge scale: two points of the same value make a step") { + auto const table{read("[ 0 0, 1 0.1, 1 0.5, 2 0.6 ]")}; + CHECK(gauge_scale::interpolate(table.points, 0.99f) == doctest::Approx(0.099)); + CHECK(gauge_scale::interpolate(table.points, 1.f) == doctest::Approx(0.5)); + CHECK(gauge_scale::interpolate(table.points, 1.5f) == doctest::Approx(0.55)); +} + +TEST_CASE("main ctrl act: the marker of a diesel locomotive follows its controller (MaSzyna-EU07/maszyna#74)") { + // nothing sets the actual position of a diesel engine's controller, the marker stayed at 0 + for (auto const *path : {"st44_v2/m62-1151", "sm42_v1/6d1", "su45_v2/301d"}) { + CAPTURE(path); + consist train; + auto &locomotive{train.add(definition::fiz(path), 1).mover()}; + REQUIRE((locomotive.EngineType == TEngineType::DieselElectric || locomotive.EngineType == TEngineType::DieselEngine)); + REQUIRE(locomotive.EIMCtrlType == 0); + locomotive.MainCtrlPos = 5; + CHECK(locomotive.MainCtrlActualPos == 0); + CHECK(main_ctrl_act::position(locomotive) == doctest::Approx(5.0)); + // one with a controller of the EIM kind keeps its actual position itself + locomotive.EIMCtrlType = 2; + CHECK(main_ctrl_act::position(locomotive) == doctest::Approx(0.0)); + } +} + +TEST_CASE("main ctrl act: the marker of an electric locomotive shows its actual position, as before") { + consist train; + auto &locomotive{train.add(definition::fiz("et22_v3/201e-w"), 1).mover()}; + locomotive.MainCtrlPos = 10; + locomotive.MainCtrlActualPos = 3; + locomotive.ScndCtrlPos = 2; + locomotive.ScndCtrlActualPos = 1; + locomotive.CoupledCtrl = false; + CHECK(main_ctrl_act::position(locomotive) == doctest::Approx(3.0)); + locomotive.CoupledCtrl = true; + CHECK(main_ctrl_act::position(locomotive) == doctest::Approx(4.0)); +} diff --git a/vehicle/Gauge.cpp b/vehicle/Gauge.cpp index af8e9a060..18750c93a 100644 --- a/vehicle/Gauge.cpp +++ b/vehicle/Gauge.cpp @@ -152,6 +152,12 @@ void TGauge::Load( cParser &Parser, TDynamicObject const *Owner, double const mu while( true == Load_mapping( Parser, scratchpad ) ) { // all work done by while() } + // the values of the table are in the units the config uses for the scale, which the multiplier converts the gauge's value to + for( auto &point : scratchpad.scaletable ) { + point.value = static_cast( point.value / mul ); + } + gauge_scale::sort( scratchpad.scaletable ); + m_scaletable = std::move( scratchpad.scaletable ); // post-deserialization cleanup // set provided custom soundproofing to assigned sounds (for sounds without their own custom soundproofing) if( scratchpad.soundproofing ) { @@ -275,6 +281,10 @@ TGauge::Load_mapping( cParser &Input, TGauge::scratch_data &Scratchpad ) { >> soundproofing[ 5 ]; Scratchpad.soundproofing = soundproofing; } + else if( key == "scaletable:" ) { + // non-uniform scale in format [ value1 scaled1, value2 scaled2, ... ] + return Load_scaletable( Input, Scratchpad ); + } else if( key.starts_with("sound") ) { // sounds assigned to specific gauge values, defined by key soundX: where X = value auto const indexstart { key.find_first_of( "-1234567890" ) }; @@ -288,6 +298,20 @@ TGauge::Load_mapping( cParser &Input, TGauge::scratch_data &Scratchpad ) { return true; // return value marks a key: value pair was extracted, nothing about whether it's recognized } +// imports the optional non-uniform scale (MaSzyna-EU07/maszyna#74); returns false if it ran into the end of the block +bool +TGauge::Load_scaletable( cParser &Input, TGauge::scratch_data &Scratchpad ) { + + auto table { gauge_scale::read( Input ) }; + if( table.malformed || false == table.closed || table.points.size() < 2 ) { + ErrorLog( "Bad model: malformed scaletable of a gauge, it needs [ value scaled, value scaled, ... ] with at least two pairs", logtype::model ); + } + if( table.points.size() >= 2 ) { + Scratchpad.scaletable = std::move( table.points ); + } + return false == table.block_end; +} + // ustawienie wartości docelowej. plays provided fallback sound, if no sound was defined in the control itself bool TGauge::UpdateValue( float fNewDesired, std::optional &Fallbacksound ) { @@ -446,6 +470,9 @@ void TGauge::AssignState( bool const *State ) { float TGauge::GetScaledValue() const { + if( false == m_scaletable.empty() ) { + return gauge_scale::interpolate( m_scaletable, m_value ); + } return false == m_interpolatescale ? m_value * m_scale + m_offset : m_value * std::lerp(m_scale, m_endscale, std::clamp(m_value / m_endvalue, 0.f, 1.f)) + m_offset; } diff --git a/vehicle/Gauge.h b/vehicle/Gauge.h index fdef9c58e..59faff3f1 100644 --- a/vehicle/Gauge.h +++ b/vehicle/Gauge.h @@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/. #include "utilities/Classes.h" #include "audio/sound.h" +#include "vehicle/gaugescale.h" enum class TGaugeAnimation { // typ ruchu @@ -74,11 +75,14 @@ private: // types struct scratch_data { std::optional< std::array > soundproofing; + std::vector scaletable; // as read, in the units of the config }; // methods // imports member data pair from the config file bool Load_mapping( cParser &Input, TGauge::scratch_data &Scratchpad ); + static bool + Load_scaletable( cParser &Input, TGauge::scratch_data &Scratchpad ); float GetScaledValue() const; void @@ -95,6 +99,8 @@ private: float m_endscale { -1.f }; // scale applied to the value at the end of accepted value range float m_endvalue { -1.f }; // end value of accepted value range bool m_interpolatescale { false }; + std::vector m_scaletable; // optional non-uniform scale, sorted by value; replaces scale and offset + char m_datatype; // typ zmiennej parametru: f-float, d-double, i-int union { // wskaźnik na parametr pokazywany przez animację diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index 201b8972f..050717419 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -15,6 +15,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "vehicle/Train.h" #include "vehicle/horn.h" +#include "vehicle/mainctrlact.h" #include "utilities/Globals.h" #include "simulation/simulation.h" @@ -9336,10 +9337,7 @@ bool TTrain::Update(double const Deltatime) } if (ggMainCtrlAct.SubModel != nullptr) { - if (mvControlled->CoupledCtrl) - ggMainCtrlAct.UpdateValue(static_cast(double(mvControlled->MainCtrlActualPos + mvControlled->ScndCtrlActualPos))); - else - ggMainCtrlAct.UpdateValue(static_cast(double(mvControlled->MainCtrlActualPos))); + ggMainCtrlAct.UpdateValue(main_ctrl_act::position(*mvControlled)); ggMainCtrlAct.Update(); } if (ggScndCtrl.SubModel != nullptr) diff --git a/vehicle/gaugescale.h b/vehicle/gaugescale.h new file mode 100644 index 000000000..27e999ddc --- /dev/null +++ b/vehicle/gaugescale.h @@ -0,0 +1,118 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "utilities/parser.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// a non-uniform scale of a cab gauge (MaSzyna-EU07/maszyna#74), such as the marker of the controller position of +// the ST43, whose marks are not evenly spaced: the gauge shows what a table gives for its value, interpolated +// linearly between the points of the table, instead of value * scale + offset +namespace gauge_scale { + +struct point { + float value; // the value of the gauge + float scaled; // what the gauge shows for it, in the units of value * scale + offset (turns for rot, metres for mov) +}; + +// puts the points in the order of their values; points of the same value keep their order, so two of them make a step +inline void sort(std::vector &Points) { + std::ranges::stable_sort(Points, {}, &point::value); +} + +// what the gauge shows for the Value, from the Points sorted by value, which can't be empty; +// below the first point and above the last one the gauge stays at their ends of the scale +inline float interpolate(std::vector const &Points, float const Value) { + auto const upper{std::ranges::upper_bound(Points, Value, {}, &point::value)}; + if (upper == Points.begin()) { + return Points.front().scaled; + } + if (upper == Points.end()) { + return Points.back().scaled; + } + auto const &from{*std::prev(upper)}; + auto const &to{*upper}; + // from.value <= Value < to.value + return std::lerp(from.scaled, to.scaled, (Value - from.value) / (to.value - from.value)); +} + +// a table as read from the config +struct table { + std::vector points; // sorted by value + bool closed{false}; // it ended with its "]" + bool block_end{false}; // the "}" of the gauge's block came in place of the "]", and was read + bool malformed{false}; // something that isn't a number, or a value without what the gauge shows for it +}; + +// the number Text holds, nothing when it holds anything else +inline std::optional number(std::string_view const Text) { + float value{}; + auto const *last{Text.data() + Text.size()}; + if (auto const [end, error]{std::from_chars(Text.data(), last, value)}; error != std::errc{} || end != last) { + return std::nullopt; + } + return value; +} + +// what came with a token of a table +enum class token_end { more, closed, block_end, file_end }; + +// reads one token of a table into Numbers +inline token_end read_token(cParser &Input, std::vector &Numbers, bool &Malformed) { + auto token{Input.getToken(false, "\n\r\t ,;")}; + if (token.empty()) { + return token_end::file_end; + } + if (token == "}") { + return token_end::block_end; + } + auto const closes{token.ends_with(']')}; + std::erase(token, '['); + std::erase(token, ']'); + if (auto const value{number(token)}; value) { + Numbers.push_back(*value); + } + else if (false == token.empty()) { + Malformed = true; + } + return closes ? token_end::closed : token_end::more; +} + +// reads a table written as [ value scaled, value scaled, ... ], pairs of a value of the gauge and what it shows for +// it; the brackets may touch the numbers, the commas are optional +inline table read(cParser &Input) { + table result; + std::vector numbers; + auto end{token_end::more}; + while (end == token_end::more) { + end = read_token(Input, numbers, result.malformed); + } + result.closed = end == token_end::closed; + result.block_end = end == token_end::block_end; + if (numbers.size() % 2 != 0) { + result.malformed = true; + } + for (std::size_t index{0}; index + 1 < numbers.size(); index += 2) { + result.points.emplace_back(numbers[index], numbers[index + 1]); + } + sort(result.points); + return result; +} + +} // namespace gauge_scale diff --git a/vehicle/mainctrlact.h b/vehicle/mainctrlact.h new file mode 100644 index 000000000..0f187b1b4 --- /dev/null +++ b/vehicle/mainctrlact.h @@ -0,0 +1,31 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "McZapkie/MOVER.h" + +// the position the controller position marker of the cab (mainctrlact:) shows +namespace main_ctrl_act { + +// the diesel engines work the controller position straight away, they have no camshaft or relays of their own that +// would follow it, and nothing sets their MainCtrlActualPos; only with a controller of the EIM kind (EIMCtrlType) +// it is kept up to date (CheckEIMIC). so their marker shows the position of the controller (MaSzyna-EU07/maszyna#74) +inline bool follows_controller(TMoverParameters const &Vehicle) { + return (Vehicle.EngineType == TEngineType::DieselEngine || Vehicle.EngineType == TEngineType::DieselElectric) && Vehicle.EIMCtrlType == 0; +} + +inline float position(TMoverParameters const &Vehicle) { + auto const controller{follows_controller(Vehicle)}; + auto const main{controller ? Vehicle.MainCtrlPos : Vehicle.MainCtrlActualPos}; + auto const scnd{controller ? Vehicle.ScndCtrlPos : Vehicle.ScndCtrlActualPos}; + return static_cast(Vehicle.CoupledCtrl ? main + scnd : main); +} + +} // namespace main_ctrl_act From 5a20f86fd0b42d46e17b7ce1b5094fbb46c53e17 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 19:18:37 +0100 Subject: [PATCH 293/430] feat: line breaker before the pantographs, Cntrl.PantRequiresMain (#68) New optional .fiz key Cntrl.PantRequiresMain (default No, every existing vehicle unchanged). With Yes, as on Czech-built locomotives: - the line breaker closes on the low voltage circuits, without traction voltage, and the undervoltage trip doesn't open it (overvoltage and the other trips still do); - a pantograph valve opens and stays open only while the vehicle's line breaker is closed, so opening it drops the pantographs. The AI (TController::PrepareEngine) closes the line breaker before raising the pantographs for such a vehicle; the line breaker steps moved into TController::close_line_breaker(). test::start_up() follows the same order. Game data: to use it, PantRequiresMain=Yes goes on the Cntrl. line of dynamic/pkp/ep05_v2/ep05.fiz, ep05v1.fiz and dynamic/cd/181_v2/181_cz1.fiz, 18x_pl.fiz (left for later, not part of this change). (#68) --- McZapkie/MOVER.h | 4 + McZapkie/Mover.cpp | 19 ++- tests/unit/drive.cpp | 7 ++ tests/unit/test_mains_before_pantographs.cpp | 117 +++++++++++++++++++ vehicle/Driver.cpp | 31 +++-- vehicle/Driver.h | 1 + 6 files changed, 164 insertions(+), 15 deletions(-) create mode 100644 tests/unit/test_mains_before_pantographs.cpp diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 199c65a0c..24a0a3fc4 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -2093,6 +2093,10 @@ class TMoverParameters double MainsInitTime{0.0}; // config, initialization time (in seconds) of the main circuit after it receives power, before it can be closed double MainsInitTimeCountdown{0.0}; // current state of main circuit initialization, remaining time (in seconds) until it's ready start_t MainsStart{start_t::manual}; + // config, .fiz Cntrl.PantRequiresMain: the line breaker closes without traction voltage and holds without it, and the + // pantographs rise and stay up only while it's closed (Czech locomotives); off, the pantographs come first and the line + // breaker needs their voltage + bool PantographsRequireMains{false}; bool LineBreakerClosesOnlyAtNoPowerPos{false}; bool ControlPressureSwitch{false}; // activates if the main pipe and/or brake cylinder pressure aren't within operational levels bool HasControlPressureSwitch{true}; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 330e8eb8f..36ad8a52e 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1735,7 +1735,8 @@ void TMoverParameters::MainsCheck(double const Deltatime) break; } } - auto const maincircuitpowersupply{std::abs(localvoltage) > 0.1 || GetTrainsetHighVoltage() > 0.1}; + // a line breaker closed ahead of the pantographs gets ready on the low voltage circuits + auto const maincircuitpowersupply{std::abs(localvoltage) > 0.1 || GetTrainsetHighVoltage() > 0.1 || (PantographsRequireMains && (Power24vIsAvailable || Power110vIsAvailable))}; if (true == maincircuitpowersupply) { @@ -2327,7 +2328,8 @@ void TMoverParameters::PantographsCheck(double const /*Timestep*/) valve.is_active = (valve.spring ? lowvoltagepower : true) // spring actuator needs power to maintain non-default state && (manualcontrol && lowvoltagepower ? false == valve.is_disabled : true) // needs power to change state, without it just pass through && (manualcontrol && lowvoltagepower ? false == PantAllDown : true) && - (valve.is_active || (manualcontrol && lowvoltagepower && valve.is_enabled) || (autostart && lowvoltagepower)); // shouldn't ever get this far but, eh + (Mains || false == PantographsRequireMains) // fed through the closed line breaker, where it comes first + && (valve.is_active || (manualcontrol && lowvoltagepower && valve.is_enabled) || (autostart && lowvoltagepower)); // shouldn't ever get this far but, eh auto const pantographexists{EnginePowerSource.SourceType == TPowerSource::CurrentCollector && EnginePowerSource.CollectorParameters.PhysicalLayout & 1 << pant_id}; @@ -3683,7 +3685,8 @@ bool TMoverParameters::MainSwitchCheck() const case ElectricInductionMotor: { // TODO: check whether we can simplify this check and skip the outer EngineType switch - powerisavailable = EnginePowerSourceVoltage() > 0.5 * EnginePowerSource.MaxVoltage; + // closed ahead of the pantographs, the line breaker runs on the low voltage circuits + powerisavailable = PantographsRequireMains ? Power24vIsAvailable || Power110vIsAvailable : EnginePowerSourceVoltage() > 0.5 * EnginePowerSource.MaxVoltage; break; } default: @@ -3693,7 +3696,8 @@ bool TMoverParameters::MainSwitchCheck() const } return powerisavailable && (ScndCtrlPos == 0 || EngineType == ElectricInductionMotor) && MainsInitTimeCountdown <= 0.0 && - (ConvOvldFlag == false || ConverterOverloadRelayOffWhenMainIsOff) && true == GroundRelay && true == NoVoltRelay && true == OvervoltageRelay && LastSwitchingTime > CtrlDelay && + (ConvOvldFlag == false || ConverterOverloadRelayOffWhenMainIsOff) && true == GroundRelay && (true == NoVoltRelay || PantographsRequireMains) && true == OvervoltageRelay && + LastSwitchingTime > CtrlDelay && (HasCamshaft ? IsMainCtrlActualNoPowerPos() : LineBreakerClosesOnlyAtNoPowerPos ? IsMainCtrlNoPowerPos() : true) && @@ -5698,7 +5702,8 @@ double TMoverParameters::TractionForce(double dt) OvervoltageRelay = EnginePowerSource.SourceType != TPowerSource::CurrentCollector || voltage <= EnginePowerSource.CollectorParameters.MaxV || false == EnginePowerSource.CollectorParameters.OVP; // wywalanie szybkiego z powodu niewłaściwego napięcia - EventFlag |= true == Mains && (false == NoVoltRelay || false == OvervoltageRelay) && + // (a line breaker closed ahead of the pantographs holds without voltage) + EventFlag |= true == Mains && ((false == NoVoltRelay && false == PantographsRequireMains) || false == OvervoltageRelay) && MainSwitch(false, TrainType == dt_EZT ? range_t::unit : range_t::local); // TODO: check whether we need to send this EMU-wide break; } @@ -5707,7 +5712,8 @@ double TMoverParameters::TractionForce(double dt) { // TODO: check if we can use instead the code for electricseriesmotor // nie wchodzić w funkcję bez potrzeby - if (Mains && (std::max(GetTrainsetHighVoltage(), PantographVoltage) < EnginePowerSource.CollectorParameters.MinV || + // (a line breaker closed ahead of the pantographs holds without voltage) + if (Mains && ((std::max(GetTrainsetHighVoltage(), PantographVoltage) < EnginePowerSource.CollectorParameters.MinV && false == PantographsRequireMains) || std::max(GetTrainsetHighVoltage(), PantographVoltage) > EnginePowerSource.CollectorParameters.MaxV + 200)) { MainSwitch(false, TrainType == dt_EZT ? range_t::unit : range_t::local); // TODO: check whether we need to send this EMU-wide @@ -10934,6 +10940,7 @@ void TMoverParameters::LoadFIZ_Cntrl(std::string const &line) auto lookup = starts.find(extract_value("MainStart", line)); MainsStart = lookup != starts.end() ? lookup->second : start_t::manual; } + extract_value(PantographsRequireMains, "PantRequiresMain", line, ""); // battery { auto lookup = starts.find(extract_value("BatteryStart", line)); diff --git a/tests/unit/drive.cpp b/tests/unit/drive.cpp index 0ee5adb2b..b03eeac2d 100644 --- a/tests/unit/drive.cpp +++ b/tests/unit/drive.cpp @@ -169,6 +169,13 @@ bool start_up(driven Driven, track const &Track, double Seconds, trace *Trace) { if (diesel) { prepare_diesel(Driven); } + if (controlling.PantographsRequireMains && false == controlling.Mains) { + // the pantographs rise only through the closed line breaker, which closes without their voltage + for (int i = 0; i < 3 && cab.DirActive <= 0; ++i) { + cab.DirectionForward(); + } + close_line_breaker(Driven); + } if (collector) { raise_pantographs(Driven); } diff --git a/tests/unit/test_mains_before_pantographs.cpp b/tests/unit/test_mains_before_pantographs.cpp new file mode 100644 index 000000000..01f6e1197 --- /dev/null +++ b/tests/unit/test_mains_before_pantographs.cpp @@ -0,0 +1,117 @@ +#include "stdafx.h" +#include "doctest.h" +#include "drive.h" + +// the order of the line breaker and the pantographs (eu07/maszyna#68): on Polish locomotives the pantographs +// come first and the line breaker closes on their voltage; on Czech ones (Cntrl.PantRequiresMain) the line +// breaker closes first, without voltage, and the pantographs rise and stay up only while it's closed + +namespace { + +constexpr test::track line{0.15, 0.0, test::catenary_3kv}; + +test::definition ep05(bool const Mainsfirst) { + auto definition{test::definition::fiz("ep05_v2/ep05")}; + if (Mainsfirst) { + definition.set("Cntrl", "PantRequiresMain", "Yes"); + } + return definition; +} + +// battery and cab on, direction set and the relays reset, the pantographs on the main reservoir's air +void prepare(test::vehicle &Loco) { + Loco.hold_main_reservoir(6.0); + Loco->bPantKurek3 = true; + Loco->BatterySwitch(true); + Loco->CabActivisation(); + for (int i = 0; i < 3 && Loco->DirActive <= 0; ++i) { + Loco->DirectionForward(); + } + Loco.run(2.0, line); + Loco->RelayReset(relay_t::maincircuitground | relay_t::tractionnmotoroverload | relay_t::primaryconverteroverload); + Loco.run(2.0, line); +} + +void raise_pantograph(test::vehicle &Loco) { + Loco->OperatePantographsValve(operation_t::enable); + Loco->OperatePantographValve(end::rear, operation_t::enable); + Loco.run(5.0, line); +} + +void close_line_breaker(test::vehicle &Loco) { + Loco->MainSwitch(true); + Loco.run(2.0, line); +} + +} // namespace + +TEST_CASE("mains before pantographs: without the flag the line breaker needs the pantographs' voltage, as before") { + test::vehicle loco{ep05(false), 0.0, "test", 1}; + REQUIRE_FALSE(loco->PantographsRequireMains); + prepare(loco); + close_line_breaker(loco); + CHECK_FALSE(loco->Mains); + raise_pantograph(loco); + CHECK(loco->Pantographs[end::rear].is_active); + CHECK(loco->PantographVoltage == doctest::Approx(test::catenary_3kv)); + close_line_breaker(loco); + CHECK(loco->Mains); + // the pantographs stay up with the line breaker open, and the line breaker opens without voltage + loco->MainSwitch(false); + loco.run(2.0, line); + CHECK(loco->Pantographs[end::rear].is_active); + close_line_breaker(loco); + REQUIRE(loco->Mains); + loco->OperatePantographValve(end::rear, operation_t::disable); + loco.run(2.0, line); + CHECK_FALSE(loco->Mains); +} + +TEST_CASE("mains before pantographs: with the flag the pantographs rise only through the closed line breaker") { + test::vehicle loco{ep05(true), 0.0, "test", 1}; + REQUIRE(loco->PantographsRequireMains); + prepare(loco); + // the pantographs stay down while the line breaker is open + raise_pantograph(loco); + CHECK_FALSE(loco->Pantographs[end::rear].is_active); + CHECK(loco->PantographVoltage == 0.0); + // the line breaker closes without voltage, and the pantograph rises through it + close_line_breaker(loco); + CHECK(loco->Mains); + raise_pantograph(loco); + CHECK(loco->Pantographs[end::rear].is_active); + CHECK(loco->PantographVoltage == doctest::Approx(test::catenary_3kv)); + CHECK(loco->Mains); + // opening the line breaker drops the pantograph, which stays down until the line breaker closes again + loco->MainSwitch(false); + loco.run(2.0, line); + CHECK_FALSE(loco->Mains); + CHECK_FALSE(loco->Pantographs[end::rear].is_active); + CHECK(loco->PantographVoltage == 0.0); + // a pantograph lowered under the closed line breaker leaves it closed + close_line_breaker(loco); + raise_pantograph(loco); + REQUIRE(loco->Pantographs[end::rear].is_active); + loco->OperatePantographValve(end::rear, operation_t::disable); + loco.run(5.0, line); + CHECK_FALSE(loco->Pantographs[end::rear].is_active); + CHECK(loco->Mains); +} + +TEST_CASE("mains before pantographs: with the flag the line breaker still needs the battery") { + test::vehicle loco{ep05(true), 0.0, "test", 1}; + loco.hold_main_reservoir(6.0); + loco.run(2.0, line); + close_line_breaker(loco); + CHECK_FALSE(loco->Mains); +} + +TEST_CASE("mains before pantographs: with the flag the driver's start-up gets the locomotive ready") { + // test::start_up() takes the AI's steps of TController::PrepareEngine(), the line breaker first here + test::vehicle loco{ep05(true), 0.0, "test", 1}; + auto driven{test::driving(loco)}; + REQUIRE(test::start_up(driven, line)); + CHECK(loco->Mains); + CHECK(loco->PantographVoltage == doctest::Approx(test::catenary_3kv)); + CHECK(test::is_ready(driven)); +} diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 08f0c0d24..8605ebab5 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -2679,6 +2679,20 @@ void TController::SetDriverPsyche() { } } +// closes the line breaker, or starts the engine, the relays reset first +void TController::close_line_breaker() +{ + cue_action( driver_hint::mastercontrollersetzerospeed ); + // consist-wide ground relay reset + cue_action( driver_hint::maincircuitgroundreset ); + cue_action( driver_hint::tractionnmotoroverloadreset ); + if( mvOccupied->EngineType == TEngineType::DieselEngine ) { + // specjalnie dla SN61 żeby nie zgasł + cue_action( driver_hint::mastercontrollersetidle ); + } + cue_action( driver_hint::linebreakerclose ); +} + bool TController::PrepareEngine() { // odpalanie silnika // HACK: don't immediately activate inert vehicle in case the simulation is about to replace us with human driver @@ -2702,6 +2716,13 @@ bool TController::PrepareEngine() } } + if( mvControlling->PantographsRequireMains + && IsAnyLineBreakerOpen ) { + // the pantographs rise only through the closed line breaker, which closes without their voltage + PrepareDirection(); + close_line_breaker(); + } + if( mvPantographUnit->EnginePowerSource.SourceType == TPowerSource::CurrentCollector && mvPantographUnit->EnginePowerSource.CollectorParameters.CollectorsNo > 0 ) { // if our pantograph unit isn't a pantograph-devoid fallback @@ -2756,15 +2777,7 @@ bool TController::PrepareEngine() } if( IsAnyLineBreakerOpen ) { // activate main circuit or engine - cue_action( driver_hint::mastercontrollersetzerospeed ); - // consist-wide ground relay reset - cue_action( driver_hint::maincircuitgroundreset ); - cue_action( driver_hint::tractionnmotoroverloadreset ); - if( mvOccupied->EngineType == TEngineType::DieselEngine ) { - // specjalnie dla SN61 żeby nie zgasł - cue_action( driver_hint::mastercontrollersetidle ); - } - cue_action( driver_hint::linebreakerclose ); + close_line_breaker(); } else { // main circuit or engine is on, set up vehicle devices and controls diff --git a/vehicle/Driver.h b/vehicle/Driver.h index f88e115ac..78aaf1abb 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -592,6 +592,7 @@ public: bool CheckVehicles( TOrders user = Wait_for_orders ); private: bool PrepareEngine(); + void close_line_breaker(); bool ReleaseEngine(); void Doors( bool const Open, int const Side = 0 ); // returns true if any vehicle in the consist has an open door From 00955513500bc30f089cd01a97a798f58ae08310 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 19:30:10 +0100 Subject: [PATCH 294/430] feat: universal controller power demand in steps (UCList CtrlValStep) The 6Dg sets its power demand in 5% steps, while the universal controller (EIMCtrlType 3) ramped it continuously. A new optional UCList header key, CtrlValStep (e.g. 0.05), makes the setting move in whole steps: one at once when the controller is moved onto a raising or lowering position, then one each time SpeedUp / SpeedDown covers a step, stopping at the position's set value. Without the key (default 0) nothing changes. Data (SVN, optional, after this): add CtrlValStep=0.05 to the UCList: line of dynamic/pkp/6dg_v1/6dg.fiz (its variants include it). (eu07/maszyna#412) --- McZapkie/MOVER.h | 5 ++ McZapkie/Mover.cpp | 69 +++++++++++++++++++-- tests/unit/test_uc_steps.cpp | 115 +++++++++++++++++++++++++++++++++++ 3 files changed, 184 insertions(+), 5 deletions(-) create mode 100644 tests/unit/test_uc_steps.cpp diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 199c65a0c..51bdedcee 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1727,6 +1727,10 @@ class TMoverParameters bool UniCtrlIntegratedBrakeCtrl = false; /*zintegrowany nastawnik JH obsluguje hamowanie*/ bool UniCtrlIntegratedLocalBrakeCtrl = false; /*zintegrowany nastawnik JH obsluguje hamowanie hamulcem pomocniczym*/ int UniCtrlNoPowerPos{0}; // cached highesr position not generating traction force + // UCList CtrlValStep: the universal controller (EIMCtrlType 3) changes its setting in steps of this size (e.g. 0.05 for the + // 5% steps of the 6Dg), one at once when moved to a raising or lowering position, then one each time its SpeedUp / SpeedDown + // covers a step; 0 (the default) changes it continuously + double UniCtrlValStep{0.0}; std::pair> PantsPreset{"0132", {0, 0}}; // pantograph preset switches; .first holds possible setups as chars, .second holds currently selected preset in each cab /*-sekcja parametrow dla lokomotywy elektrycznej*/ @@ -2199,6 +2203,7 @@ class TMoverParameters double eimic = 0; /*aktualna pozycja zintegrowanego sterowania jazda i hamowaniem*/ double eimic_analog = 0; /*pozycja zadajnika analogowa*/ double eimic_real = 0; /*faktycznie uzywana pozycja zintegrowanego sterowania jazda i hamowaniem*/ + double eimic_step_progress{0.0}; // the part of the next UniCtrlValStep the controller has covered so far double eim_localbrake = 0; /*nastawa hamowania dodatkowego pneumatycznego lokomotywy*/ int EIMCtrlType = 0; /*rodzaj wariantu zadajnika jazdy*/ bool SpeedCtrlTypeTime = false; /*czy tempomat sterowany czasowo*/ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 330e8eb8f..b7536c4fc 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -7290,6 +7290,60 @@ bool TMoverParameters::DropAllPantographs(bool const State, range_t const Notify return State != initialstate; } +namespace +{ +// the setting of the universal controller one UniCtrlValStep further from Value towards Limit, never past it +double next_uc_step(double const Value, double const Limit, double const Step) +{ + constexpr double epsilon{1e-6}; + if (Limit > Value) + { + return std::min((std::floor(Value / Step + epsilon) + 1.0) * Step, Limit); + } + return std::max((std::ceil(Value / Step - epsilon) - 1.0) * Step, Limit); +} + +// the universal controller with UniCtrlValStep: the setting the continuous ramp got to (Ramped) turned into whole steps. +// a move of the controller onto a position which changes the setting makes one step at once, the ramp then one step each +// time it covers a step's length; the steps stop at the position's set value (or its bound, past which the ramp doesn't go) +double stepped_uc_value(double const Current, double const Ramped, TUniversalCtrl const &Position, double const Step, bool const Moved, double &Progress) +{ + if (Moved) + { + Progress = 0.0; + } + double const delta{Ramped - Current}; + if (std::abs(delta) < 1e-9) + { + Progress = 0.0; + return Ramped; + } + double limit{0.0}; + if (delta > 0.0) + { + limit = Position.SetCtrlVal > Current ? Position.SetCtrlVal : Position.MaxCtrlVal; + } + else + { + limit = Position.SetCtrlVal < Current ? Position.SetCtrlVal : Position.MinCtrlVal; + } + Progress = Moved ? Step : Progress + std::abs(delta); + double value{Current}; + bool reached{std::abs(value - limit) < 1e-9}; + while (!reached && Progress >= Step - 1e-9) + { + value = next_uc_step(value, limit, Step); + Progress -= Step; + reached = std::abs(value - limit) < 1e-9; + } + if (reached) + { + Progress = 0.0; + } + return safe_clamp(value, Position.MinCtrlVal, Position.MaxCtrlVal); +} +} // namespace + void TMoverParameters::CheckEIMIC(double dt) { double offset = EIMCtrlAdditionalZeros ? 1.0 : 0.0; @@ -7414,11 +7468,14 @@ void TMoverParameters::CheckEIMIC(double dt) if (MainCtrlActualPos != MainCtrlPos || LastRelayTime > InitialCtrlDelay) { - eimic -= safe_clamp(-UniCtrlList[MainCtrlPos].SetCtrlVal + eimic, 0.0, - MainCtrlActualPos == MainCtrlPos ? dt * UniCtrlList[MainCtrlPos].SpeedDown : sign(UniCtrlList[MainCtrlPos].SpeedDown) * 0.01); // odejmuj do X - eimic += safe_clamp(UniCtrlList[MainCtrlPos].SetCtrlVal - eimic, 0.0, - MainCtrlActualPos == MainCtrlPos ? dt * UniCtrlList[MainCtrlPos].SpeedUp : sign(UniCtrlList[MainCtrlPos].SpeedUp) * 0.01); // dodawaj do X - eimic = safe_clamp(eimic, UniCtrlList[MainCtrlPos].MinCtrlVal, UniCtrlList[MainCtrlPos].MaxCtrlVal); + auto const &position{UniCtrlList[MainCtrlPos]}; + double ramped{eimic}; + ramped -= safe_clamp(-position.SetCtrlVal + ramped, 0.0, + MainCtrlActualPos == MainCtrlPos ? dt * position.SpeedDown : sign(position.SpeedDown) * 0.01); // odejmuj do X + ramped += safe_clamp(position.SetCtrlVal - ramped, 0.0, + MainCtrlActualPos == MainCtrlPos ? dt * position.SpeedUp : sign(position.SpeedUp) * 0.01); // dodawaj do X + ramped = safe_clamp(ramped, position.MinCtrlVal, position.MaxCtrlVal); + eimic = UniCtrlValStep > 0.0 ? stepped_uc_value(eimic, ramped, position, UniCtrlValStep, MainCtrlActualPos != MainCtrlPos, eimic_step_progress) : ramped; } if (MainCtrlActualPos == MainCtrlPos) LastRelayTime += dt; @@ -11515,6 +11572,8 @@ void TMoverParameters::LoadFIZ_UCList(std::string const &Input) extract_value(UniCtrlIntegratedBrakeCtrl, "IntegratedBrake", Input, ""); extract_value(UniCtrlIntegratedLocalBrakeCtrl, "IntegratedLocBrake", Input, ""); extract_value(UniCtrlIntegratedBrakePNCtrl, "IntegratedBrakePN", Input, ""); + extract_value(UniCtrlValStep, "CtrlValStep", Input, ""); + UniCtrlValStep = std::max(UniCtrlValStep, 0.0); } void TMoverParameters::LoadFIZ_DList(std::string const &Input) diff --git a/tests/unit/test_uc_steps.cpp b/tests/unit/test_uc_steps.cpp new file mode 100644 index 000000000..eb1b26fa4 --- /dev/null +++ b/tests/unit/test_uc_steps.cpp @@ -0,0 +1,115 @@ +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" +#include "drive.h" + +#include + +// the universal controller (EIMCtrlType 3) setting its power demand in steps (UCList CtrlValStep), as the 6Dg does +// in steps of 5% (eu07/maszyna#412). the 214M railbus's controller: 3 lowers the power to 0, 4 holds it, 5 raises it +// to 1, at 0.15 a second after IniCDelay (1 s) + +using test::definition; +using test::vehicle; + +namespace { + +constexpr int lower{3}; +constexpr int hold{4}; +constexpr int raise{5}; + +// the railbus started up, its brakes released and its direction set, its controller holding no power +void get_ready(vehicle &Railbus, test::track const &Track) { + auto driven{test::driving(Railbus)}; + REQUIRE(test::start_up(driven, Track)); + test::release_brakes(driven.cab); + for (int i = 0; i < 3 && Railbus->DirActive <= 0; ++i) { + Railbus->DirectionForward(); + } + while (Railbus->MainCtrlPos < hold && Railbus->IncMainCtrl(1)) { + ; + } + while (Railbus->MainCtrlPos > hold && Railbus->DecMainCtrl(1)) { + ; + } + REQUIRE(Railbus->MainCtrlPos == hold); + Railbus.run(2.0, Track); + REQUIRE(Railbus->eimic == doctest::Approx(0.0)); +} + +void move_to(vehicle &Railbus, int const Position) { + while (Railbus->MainCtrlPos < Position && Railbus->IncMainCtrl(1)) { + ; + } + while (Railbus->MainCtrlPos > Position && Railbus->DecMainCtrl(1)) { + ; + } + REQUIRE(Railbus->MainCtrlPos == Position); +} + +bool on_step(double const Value, double const Step) { + return std::abs(Value / Step - std::round(Value / Step)) < 1e-6; +} + +} // namespace + +TEST_CASE("controls: the universal controller with CtrlValStep sets its power in whole steps") { + test::track const line{0.15, 0.0}; + vehicle railbus{definition::fiz("21xm_v1/214ma").set("UCList", "CtrlValStep", 0.05), 0.0, "test", 1}; + REQUIRE(railbus->UniCtrlValStep == doctest::Approx(0.05)); + get_ready(railbus, line); + + // a tap on the raising position: one step at once, kept by the holding one + move_to(railbus, raise); + railbus.step(line); + CHECK(railbus->eimic == doctest::Approx(0.05)); + move_to(railbus, hold); + railbus.run(2.0, line); + CHECK(railbus->eimic == doctest::Approx(0.05)); + + // held there: after the initial delay a step each third of a second (0.15 a second), never in between + move_to(railbus, raise); + for (int i = 0; i < 310; ++i) { // 3.1 s + railbus.step(line); + CAPTURE(i); + CHECK(on_step(railbus->eimic, 0.05)); + } + // the first step at once, 1 s of the initial delay, then 2.1 s of 0.15 a second (6 steps) + CHECK(railbus->eimic == doctest::Approx(0.40)); + move_to(railbus, hold); + railbus.run(2.0, line); + CHECK(railbus->eimic == doctest::Approx(0.40)); + + // up to the full power, and not past it + move_to(railbus, raise); + railbus.run(10.0, line); + CHECK(railbus->eimic == doctest::Approx(1.0)); + + // down the same way: a tap is one step, holding it goes on in steps down to nothing + move_to(railbus, lower); + railbus.step(line); + CHECK(railbus->eimic == doctest::Approx(0.95)); + move_to(railbus, hold); + railbus.run(1.0, line); + CHECK(railbus->eimic == doctest::Approx(0.95)); + move_to(railbus, lower); + for (int i = 0; i < 800; ++i) { // 8 s + railbus.step(line); + CAPTURE(i); + CHECK(on_step(railbus->eimic, 0.05)); + } + CHECK(railbus->eimic == doctest::Approx(0.0)); +} + +TEST_CASE("controls: the universal controller without CtrlValStep sets its power continuously, as before") { + test::track const line{0.15, 0.0}; + vehicle railbus{definition::fiz("21xm_v1/214ma"), 0.0, "test", 1}; + REQUIRE(railbus->UniCtrlValStep == 0.0); + get_ready(railbus, line); + // a tap moves it by 0.01, held it goes on at 0.15 a second after the initial delay + move_to(railbus, raise); + railbus.step(line); + CHECK(railbus->eimic == doctest::Approx(0.01)); + railbus.run(2.0 - 0.01, line); + CHECK(railbus->eimic == doctest::Approx(0.01 + 0.15).epsilon(0.05)); +} From 22c8e7322fc73d72c67c17e77062667ad9583838 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 19:53:10 +0100 Subject: [PATCH 295/430] feat: Elf emergency brake position in the master controller (eu07/maszyna#413) The Elf's master controller (EIMCtrlType 2) gets an optional emergency brake position below its position 0, turned on by the new .fiz key EIMCtrlMainEmergency=Yes in Cntrl (default No, no change without it). With it the old positions move up by one (MCPN 5, neutral at 4): the emergency position brakes fully at once and vents the brake pipe, like the alarm chain or the Impuls's EIMCtrlEmergency. The loader raises a too small MCPN to 5 and logs it. The Elf code with hard-coded positions (CheckEIMIC, the MED full braking, the AI) takes the shift into account. SVN data to change afterwards (dynamic/pkp/elf_v1, needs this exe): - every .fiz with EIMCtrlType=2: EIMCtrlMainEmergency=Yes, MCPN=5, DirChangeMaxPos=4 where present; - the cab .mmd mainctrl entries: offset one notch lower (-0.06 -> -0.09), sounds shifted one index up, new sound0 with 26284_elf_nastawnik_nagle_*.wav. Issue: (eu07/maszyna#413) --- McZapkie/MOVER.h | 5 ++ McZapkie/Mover.cpp | 32 ++++++- tests/unit/test_elf_controller.cpp | 136 +++++++++++++++++++++++++++++ vehicle/Driver.cpp | 29 +++--- vehicle/DynObj.cpp | 3 +- 5 files changed, 189 insertions(+), 16 deletions(-) create mode 100644 tests/unit/test_elf_controller.cpp diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 199c65a0c..d96e0d10c 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -2205,6 +2205,7 @@ class TMoverParameters int SpeedCtrlAutoTurnOffFlag = 0; /*czy tempomat sam się wyłącza*/ bool EIMCtrlAdditionalZeros = false; /*czy ma dodatkowe zero jazdy i zero hamowania */ bool EIMCtrlEmergency = false; /*czy ma dodatkowe zero jazdy i zero hamowania */ + bool EIMCtrlMainEmergency = false; /*czy zadajnik typu 2 (Elf) ma pozycje hamowania naglego ponizej swojej pozycji 0*/ double eimv_pr = 0; /*realizowany procent dostepnej sily rozruchu/hamowania*/ double eimv[21]; static std::vector const eimv_labels; @@ -2368,6 +2369,10 @@ class TMoverParameters int MainCtrlNoPowerPos() const; // highest setting of master controller which won't cause engine to generate extra power int MainCtrlActualPowerPos() const; // current actual setting of master controller, relative to the highest setting not generating extra power int MainCtrlPowerPos() const; // current setting of master controller, relative to the highest setting not generating extra power + // positions the master controller of the EIMCtrlType 2 (Elf) has below its own position 0, the emergency brake (0 or 1) + int EIMCtrlEmergencyPositions() const; + // whether the master controller is in its emergency brake position (EIMCtrlType 2 with EIMCtrlMainEmergency) + bool IsMainCtrlEmergencyPos() const; /*! pomocniczy nastawnik:*/ bool IncScndCtrl(int CtrlSpeed); bool DecScndCtrl(int CtrlSpeed); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 330e8eb8f..3499e16b3 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -2710,7 +2710,7 @@ int TMoverParameters::MainCtrlNoPowerPos() const } case 2: { - return 3; + return 3 + EIMCtrlEmergencyPositions(); } case 3: { @@ -2735,6 +2735,16 @@ int TMoverParameters::MainCtrlPowerPos() const return MainCtrlPos - MainCtrlNoPowerPos(); } +int TMoverParameters::EIMCtrlEmergencyPositions() const +{ + return (EIMCtrlType == 2 && EIMCtrlMainEmergency) ? 1 : 0; +} + +bool TMoverParameters::IsMainCtrlEmergencyPos() const +{ + return MainCtrlPos < EIMCtrlEmergencyPositions(); +} + // ************************************************************************************************* // Q: 20160710 // zwiększenie bocznika @@ -4577,7 +4587,7 @@ void TMoverParameters::UpdatePipePressure(double dt) // EngDmgFlag 32 (load destroyed) used to trigger this too; dropped, it has nothing to do with // the emergency brake (a broken coupler sets AlarmChainFlag instead) - if (RadioStopFlag || AlarmChainFlag || (EIMCtrlEmergency && LocalBrakePosA >= 1.0) || SecuritySystem.is_braking() || + if (RadioStopFlag || AlarmChainFlag || (EIMCtrlEmergency && LocalBrakePosA >= 1.0) || IsMainCtrlEmergencyPos() || SecuritySystem.is_braking() || (SpringBrakeDriveEmergencyVel >= 0 && Vel > SpringBrakeDriveEmergencyVel && SpringBrake.IsActive) || (0 == CabActive && (InactiveCabFlag & activation::emergencybrake) != 0)) { @@ -7357,10 +7367,16 @@ void TMoverParameters::CheckEIMIC(double dt) eimic = 0; break; case 2: - if (MainCtrlActualPos != MainCtrlPos || LastRelayTime > InitialCtrlDelay) + if (IsMainCtrlEmergencyPos()) + { + // hamowanie nagle: pelne hamowanie od razu, przewod glowny oproznia UpdatePipePressure() + eimic = -1.0; + } + else if (MainCtrlActualPos != MainCtrlPos || LastRelayTime > InitialCtrlDelay) { double delta = MainCtrlActualPos == MainCtrlPos ? dt * CtrlDelay : 0.01; - switch (MainCtrlPos) + // the positions below are those of the controller without the emergency brake position + switch (MainCtrlPos - EIMCtrlEmergencyPositions()) { case 0: case 1: @@ -10895,6 +10911,14 @@ void TMoverParameters::LoadFIZ_Cntrl(std::string const &line) extract_value(LocHandleTimeTraxx, "LocalBrakeTraxx", line, ""); extract_value(EIMCtrlAdditionalZeros, "EIMCtrlAddZeros", line, ""); extract_value(EIMCtrlEmergency, "EIMCtrlEmergency", line, ""); + // Elf (EIMCtrlType 2): an emergency brake position below the controller's position 0, which shifts the other positions up by one + extract_value(EIMCtrlMainEmergency, "EIMCtrlMainEmergency", line, ""); + if (auto const elfpositions{4 + EIMCtrlEmergencyPositions()}; EIMCtrlEmergencyPositions() > 0 && MainCtrlPosNo < elfpositions) + { + // without it the controller would have no power position + ErrorLog(std::format("Bad fiz: EIMCtrlMainEmergency needs MCPN={} in {}", elfpositions, TypeName)); + MainCtrlPosNo = elfpositions; + } extract_value(ScndS, "ScndS", line, ""); // brak pozycji rownoleglej przy niskiej nastawie PSR diff --git a/tests/unit/test_elf_controller.cpp b/tests/unit/test_elf_controller.cpp new file mode 100644 index 000000000..747a57630 --- /dev/null +++ b/tests/unit/test_elf_controller.cpp @@ -0,0 +1,136 @@ +#include "stdafx.h" +#include "doctest.h" +#include "consist.h" +#include "drive.h" + +#include "McZapkie/hamulce.h" + +// the master controller of the Elf (EIMCtrlType 2): its positions, and the emergency brake position below +// them which EIMCtrlMainEmergency adds (eu07/maszyna#413) + +using test::definition; +using test::vehicle; + +namespace { + +// a three-car Elf ready to run, standing with its brakes released and the driver in the front cab of the +// head car, which also drives (the controller's eimic is worked out there) +struct elf { + explicit elf(bool Emergency) { + for (auto const *car : {"elf_v1/21we-a", "elf_v1/21we-b", "elf_v1/21we-c"}) { + auto cardefinition{definition::fiz(car)}; + if (Emergency) { + cardefinition.set("Cntrl", "EIMCtrlMainEmergency", "Yes").set("Cntrl", "MCPN", 5); + } + unit.add(cardefinition, unit.size() == 0 ? 1 : 0); + } + ready = test::start_up(test::driving(unit), line); + // the start-up of the tests leaves the controller at its position 0 (close_line_breaker() in drive.cpp), + // the emergency brake one with EIMCtrlMainEmergency; the driver sets it to neutral, as the AI does. a unit + // moves its controller only with a direction set + for (int i = 0; i < 3 && cab().DirActive <= 0; ++i) { + cab().DirectionForward(); + } + while (cab().MainCtrlPos < cab().MainCtrlNoPowerPos() && cab().IncMainCtrl(1)) { + // up to neutral + } + test::release_brakes(cab()); + recharge(); + charged = cab().PipePress > 4.5; + } + // the pipe charged again after an emergency stop: the Elf locks its emptied pipe off the brake handle (LPOn, + // LPOff) until the unlock button (UBB1, the first universal brake button) is held, the handle at running + void recharge() { + cab().BrakeLevelSet(cab().Handle->GetPos(bh_RP)); + cab().UniversalBrakeButton(0, 1); + wait(30.0); + cab().UniversalBrakeButton(0, 0); + wait(30.0); + } + TMoverParameters &cab() { return unit[0].mover(); } + void wait(double Seconds) { test::drive(test::driving(unit), line, Seconds); } + test::consist unit; + test::track line{0.15, 0.0, test::catenary_3kv}; + bool ready{false}; + bool charged{false}; +}; + +} // namespace + +TEST_CASE("elf controller: without EIMCtrlMainEmergency the positions stay as they were") { + elf unit{false}; + REQUIRE(unit.ready); + REQUIRE(unit.charged); + auto &mover{unit.cab()}; + CHECK_FALSE(mover.EIMCtrlMainEmergency); + CHECK(mover.EIMCtrlEmergencyPositions() == 0); + CHECK(mover.MainCtrlPosNo == 4); + CHECK(mover.MainCtrlNoPowerPos() == 3); + CHECK(mover.MainCtrlPos == 3); + // the lowest position brakes fully, without emptying the pipe + mover.MainCtrlPos = 0; + CHECK_FALSE(mover.IsMainCtrlEmergencyPos()); + unit.wait(10.0); + CHECK(mover.eimic == doctest::Approx(-1.0)); + CHECK(mover.PipePress > 4.5); +} + +TEST_CASE("elf controller: EIMCtrlMainEmergency shifts the positions up by the emergency brake one") { + elf unit{true}; + REQUIRE(unit.ready); + REQUIRE(unit.charged); + auto &mover{unit.cab()}; + CHECK(mover.EIMCtrlMainEmergency); + CHECK(mover.EIMCtrlEmergencyPositions() == 1); + CHECK(mover.MainCtrlPosNo == 5); + CHECK(mover.MainCtrlNoPowerPos() == 4); + CHECK(mover.MainCtrlPos == 4); + CHECK_FALSE(mover.IsMainCtrlEmergencyPos()); + SUBCASE("the neutral position neither drives nor brakes") { + unit.wait(5.0); + CHECK(mover.eimic == doctest::Approx(0.0)); + } + SUBCASE("the full braking position, formerly 0, brakes fully without emptying the pipe") { + mover.MainCtrlPos = 1; + unit.wait(10.0); + CHECK(mover.eimic == doctest::Approx(-1.0)); + CHECK(mover.PipePress > 4.5); + } + SUBCASE("the braking position, formerly 1, ramps the braking up") { + mover.MainCtrlPos = 2; + unit.wait(1.0); + CHECK(mover.eimic < 0.0); + CHECK(mover.eimic > -1.0); + CHECK(mover.PipePress > 4.5); + } + SUBCASE("the emergency brake position brakes fully at once and empties the pipe") { + mover.MainCtrlPos = 0; + CHECK(mover.IsMainCtrlEmergencyPos()); + // a single step of the physics + unit.unit.step(unit.line); + CHECK(mover.eimic == doctest::Approx(-1.0)); + unit.wait(10.0); + CHECK(mover.PipePress < 0.5); + CHECK(mover.BrakePress > 1.0); + // out of it the pipe charges again + mover.MainCtrlPos = mover.MainCtrlNoPowerPos(); + CHECK_FALSE(mover.IsMainCtrlEmergencyPos()); + unit.recharge(); + CHECK(mover.PipePress > 4.5); + } +} + +TEST_CASE("elf controller: EIMCtrlMainEmergency with the old MCPN gets its positions all the same") { + vehicle car{definition::fiz("elf_v1/21we-a").set("Cntrl", "EIMCtrlMainEmergency", "Yes")}; + CHECK(car->MainCtrlPosNo == 5); + CHECK(car->MainCtrlNoPowerPos() == 4); +} + +TEST_CASE("elf controller: EIMCtrlMainEmergency leaves the other controllers alone") { + // the Impuls (EIMCtrlType 0) has its emergency brake in the brake range of its controller (EIMCtrlEmergency) + vehicle impuls{definition::fiz("impuls_v1/31we-a_pr").set("Cntrl", "EIMCtrlMainEmergency", "Yes"), 60.0, "impuls", 1}; + CHECK(impuls->EIMCtrlEmergencyPositions() == 0); + CHECK(impuls->MainCtrlPosNo == 10); + impuls->MainCtrlPos = 0; + CHECK_FALSE(impuls->IsMainCtrlEmergencyPos()); +} diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 08f0c0d24..461c8d1af 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -3144,9 +3144,11 @@ bool TController::IncBrakeEIM() break; } case 2: { - OK = mvOccupied->MainCtrlPos > 1; + // the braking position, above the emergency brake one where the controller has it + auto const brakepos{1 + mvOccupied->EIMCtrlEmergencyPositions()}; + OK = mvOccupied->MainCtrlPos > brakepos; if( OK ) - mvOccupied->MainCtrlPos = 1; + mvOccupied->MainCtrlPos = brakepos; break; } case 3: { @@ -3300,9 +3302,10 @@ bool TController::DecBrakeEIM() break; } case 2: { - OK = mvOccupied->MainCtrlPos < 3; + auto const neutralpos{mvOccupied->MainCtrlNoPowerPos()}; + OK = mvOccupied->MainCtrlPos < neutralpos; if( OK ) - mvOccupied->MainCtrlPos = 3; + mvOccupied->MainCtrlPos = neutralpos; break; } case 3: { @@ -3663,12 +3666,14 @@ bool TController::IncSpeedEIM() { } */ break; - case 2: - OK = mvControlling->MainCtrlPos < 4; + case 2: { + auto const powerpos{4 + mvControlling->EIMCtrlEmergencyPositions()}; + OK = mvControlling->MainCtrlPos < powerpos; if( OK ) { - mvControlling->MainCtrlPos = 4; + mvControlling->MainCtrlPos = powerpos; } break; + } } return OK; } @@ -3696,9 +3701,10 @@ bool TController::DecSpeedEIM( int const Amount ) mvControlling->SpeedCtrlPowerDec(); } else { - OK = mvControlling->MainCtrlPos > 2; + auto const holdpos{2 + mvControlling->EIMCtrlEmergencyPositions()}; + OK = mvControlling->MainCtrlPos > holdpos; if( OK ) { - mvControlling->MainCtrlPos = 2; + mvControlling->MainCtrlPos = holdpos; } } break; @@ -4170,8 +4176,9 @@ void TController::CheckTimeControllers() } else if (mvOccupied->EIMCtrlType == 2) //elf { - if (mvOccupied->eimic > 0) mvOccupied->MainCtrlPos = 3; - if (mvOccupied->eimic < 0) mvOccupied->MainCtrlPos = 2; + auto const emergencypositions{mvOccupied->EIMCtrlEmergencyPositions()}; + if (mvOccupied->eimic > 0) mvOccupied->MainCtrlPos = 3 + emergencypositions; + if (mvOccupied->eimic < 0) mvOccupied->MainCtrlPos = 2 + emergencypositions; } } //4. Check Speed Control System diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index d5f60e332..46aba815f 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -3238,7 +3238,8 @@ bool TDynamicObject::Update(double dt, double dt1) auto eimic = std::min(MoverParameters->eimic, MoverParameters->eimicSpeedCtrl); MoverParameters->eimic_real = eimic; - if (MoverParameters->EIMCtrlType == 2 && MoverParameters->MainCtrlPos == 0) + // Elf: full braking at once in the lowest position, and in the emergency brake position below it + if (MoverParameters->EIMCtrlType == 2 && MoverParameters->MainCtrlPos <= MoverParameters->EIMCtrlEmergencyPositions()) eimic = -1.0; MoverParameters->SendCtrlToNext("EIMIC", std::max(0., eimic), MoverParameters->CabActive); auto LBR = std::max(-eimic, 0.); From a86bcb1ef51b9ddd4c6ae030d15c7895185b2361 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 20:08:59 +0100 Subject: [PATCH 296/430] fix: SM42 shunt mode switched on at the first move of the switch (eu07/maszyna#497) CurrentSwitch() asked MaxCurrentSwitch() first. Since 2e86b3a5 (2021) that one takes any change of the motor overload relay threshold, on every engine type, and reports it, so the first move of the switch only flipped the threshold (meaningless on a diesel) and the shunt mode of the SM42/SP42 (and the 2Ls150 gear of the SM03) took a second one, both on and off; the cab switch, which shows the shunt mode, didn't move at the first click. The diesels with a shunt mode now set it alone. --- McZapkie/Mover.cpp | 27 +++++++++++++-------------- tests/unit/test_diesel.cpp | 29 +++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 330e8eb8f..34caced15 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -809,6 +809,19 @@ bool TMoverParameters::ChangeCab(int direction) // rozruch wysoki (true) albo niski (false) bool TMoverParameters::CurrentSwitch(bool const State) { + // TBD, TODO: split off shunt mode toggle into a separate command? It doesn't make much sense to have these two together like that + // the diesels with a shunt mode have no motor overload relay threshold to switch, the switch sets their shunt mode alone. + // MaxCurrentSwitch() takes any change of the setting, so asked first it took the first move of the switch (eu07/maszyna#497) + if (true == ShuntModeAllow && (EngineType == TEngineType::DieselEngine || EngineType == TEngineType::DieselElectric)) + { + // dla 2Ls150 przed ustawieniem kierunku, for SM42/SP42 at the controller's zero position + if (EngineType == TEngineType::DieselEngine ? DirActive != 0 : false == IsMainCtrlNoPowerPos()) + { + return false; + } + ShuntMode = State; + return true; + } if (MaxCurrentSwitch(State)) { @@ -818,20 +831,6 @@ bool TMoverParameters::CurrentSwitch(bool const State) } return true; } - // TBD, TODO: split off shunt mode toggle into a separate command? It doesn't make much sense to have these two together like that - // dla 2Ls150 - if (EngineType == TEngineType::DieselEngine && true == ShuntModeAllow && DirActive == 0) - { - // przed ustawieniem kierunku - ShuntMode = State; - return true; - } - // for SM42/SP42 - if (EngineType == TEngineType::DieselElectric && true == ShuntModeAllow && IsMainCtrlNoPowerPos()) - { - ShuntMode = State; - return true; - } return false; }; diff --git a/tests/unit/test_diesel.cpp b/tests/unit/test_diesel.cpp index 07686dc10..c4ea147d3 100644 --- a/tests/unit/test_diesel.cpp +++ b/tests/unit/test_diesel.cpp @@ -177,3 +177,32 @@ TEST_CASE("diesel: the 214M railbus's speed control, up to the speed of a button CHECK_FALSE(railbus.SpeedCtrlUnit.IsActive); scenario.check(); } + +TEST_CASE("diesel: the SM42's shunt mode, switched on and off with one move of the switch") { + // eu07/maszyna#497: the shunt mode of the diesel-electrics (ShuntMode=1) shares its switch with the motor + // overload relay threshold of the electric locomotives (CurrentSwitch()). the SM42 has no such relay, so + // the switch sets the shunt mode at the first move, at the controller's zero position only + scenario scenario{"diesel/sm42 shunt mode", motion() + traction(), test::track{}}; + scenario.add("sm42_v1/6d1", 1); + REQUIRE(scenario.start_up()); + auto &sm42{scenario.cab()}; + REQUIRE(sm42.ShuntModeAllow); + CHECK_FALSE(sm42.ShuntMode); + scenario.act("shunt mode on"); + CHECK(sm42.CurrentSwitch(true)); + CHECK(sm42.ShuntMode); + scenario.get_going(); + scenario.act("shunting power"); + sm42.AnPos = 0.5; + CHECK(sm42.IncMainCtrl(1)); + scenario.wait(60.0); + CHECK(sm42.Vel > 1.0); + // not with the controller out of its zero position + CHECK_FALSE(sm42.CurrentSwitch(false)); + CHECK(sm42.ShuntMode); + scenario.notch_back(0); + scenario.act("shunt mode off"); + CHECK(sm42.CurrentSwitch(false)); + CHECK_FALSE(sm42.ShuntMode); + scenario.check(); +} From 329dc4e42efda784739d82386737398189267f36 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 20:13:46 +0100 Subject: [PATCH 297/430] feat: SM42 vigilance device switched off in the shunt mode (eu07/maszyna#457) The shunt mode of the diesel-electrics (ShuntMode=1: SM42, SP42, SU42) now suspends their vigilance device (CA): no alerter while running, no alarm for the button held too long, and an alarm already on goes out. The cab signalling (SHP) stays as it was. Back in the line mode the CA works as before. --- McZapkie/MOVER.h | 2 ++ McZapkie/Mover.cpp | 26 ++++++++++++++++++++++---- tests/unit/test_cab.cpp | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 4 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 199c65a0c..0149bfb7d 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1131,6 +1131,7 @@ class TSecuritySystem bool is_sifa = false; // Sifa-like pedal device, with inverted input for convenient keyboard usage bool separate_acknowledge = false; // cabsignal reset button is separate from vigilance bool cabsignal_lock = false; + bool vigilance_suspended = false; // the vigilance device switched off by the vehicle, as by the SM42's shunt mode double vigilance_timer = 0.0; double alert_timer = 0.0; @@ -1155,6 +1156,7 @@ class TSecuritySystem void update(double dt, double Vel, bool pwr, int cab); void set_cabsignal(); void set_cabsignal_lock(bool); + void set_vigilance_suspended(bool Suspended); bool is_blinking() const; bool is_vigilance_blinking() const; bool is_cabsignal_blinking() const; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 34caced15..eaed979f0 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -152,11 +152,22 @@ void TSecuritySystem::update(double dt, double vel, bool pwr, int cab) velocity = vel; cabactive = cab; - if (vigilance_enabled && velocity > AwareMinSpeed) - vigilance_timer += dt; + if (vigilance_suspended) + { + // the vigilance device is switched off: neither the alerter nor the button held too long, its alarm gone with it + vigilance_timer = 0.0; + press_timer = 0.0; + if (!cabsignal_active) + alert_timer = 0.0; + } + else + { + if (vigilance_enabled && velocity > AwareMinSpeed) + vigilance_timer += dt; - if (pressed && (!is_sifa || velocity > AwareMinSpeed)) - press_timer += dt; + if (pressed && (!is_sifa || velocity > AwareMinSpeed)) + press_timer += dt; + } if (vigilance_timer > AwareDelay || press_timer > MaxHoldTime || cabsignal_active) alert_timer += dt; @@ -231,6 +242,11 @@ void TSecuritySystem::set_cabsignal_lock(bool v) cabsignal_lock = v; } +void TSecuritySystem::set_vigilance_suspended(bool const Suspended) +{ + vigilance_suspended = Suspended; +} + bool TSecuritySystem::is_engine_blocked() const { if (!is_sifa) @@ -3142,6 +3158,8 @@ void TMoverParameters::SecuritySystemReset(void) // zbijanie czuwaka/SHP void TMoverParameters::SecuritySystemCheck(double dt) { bool isPower = Power24vIsAvailable || Power110vIsAvailable; + // the shunt mode of the SM42/SP42 switches their vigilance device (CA) off (eu07/maszyna#457) + SecuritySystem.set_vigilance_suspended(EngineType == TEngineType::DieselElectric && ShuntMode); SecuritySystem.update(dt, Vel, isPower, CabActive); if (!Battery || !Radio) diff --git a/tests/unit/test_cab.cpp b/tests/unit/test_cab.cpp index 4c5ba9f53..69f6278e9 100644 --- a/tests/unit/test_cab.cpp +++ b/tests/unit/test_cab.cpp @@ -227,3 +227,38 @@ TEST_CASE("cab: the lamps and the buzzer of the security system left unattended" CHECK(security.radiostop_available()); scenario.check(); } + +TEST_CASE("cab: the SM42's vigilance device switched off in the shunt mode") { + // eu07/maszyna#457: the shunt mode of the SM42 switches its vigilance device (CA) off, it alerts again + // once the shunt mode is off + scenario scenario{"cab/sm42 vigilance in shunt mode", motion() + brakes(), test::track{}}; + scenario.add("sm42_v1/6d1", 1); + REQUIRE(scenario.start_up()); + auto &sm42{scenario.cab()}; + auto const &security{sm42.SecuritySystem}; + REQUIRE(sm42.CurrentSwitch(true)); + REQUIRE(sm42.ShuntMode); + scenario.get_going(); + sm42.AnPos = 0.3; + sm42.IncMainCtrl(1); + scenario.act("unattended in shunt mode"); + bool blinked{false}; + for (int i = 0; i < 120; ++i) { + scenario.train().run(1.0, scenario.line()); + blinked |= security.is_blinking(); + } + CHECK(sm42.Vel > 1.0); + CHECK_FALSE(blinked); + CHECK(sm42.PipePress > 3.5); + scenario.act("shunt mode off"); + scenario.notch_back(0); + REQUIRE(sm42.CurrentSwitch(false)); + sm42.IncMainCtrl(1); + scenario.act("unattended"); + for (int i = 0; i < 120; ++i) { + scenario.train().run(1.0, scenario.line()); + blinked |= security.is_vigilance_blinking(); + } + CHECK(blinked); + scenario.check(); +} From f34f912b38248b2c75ee54f34195076d1b1a4805 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 20:36:25 +0100 Subject: [PATCH 298/430] feat: interlock the line contactors with the section fans, own-converter lamp (eu07/maszyna#460) On the ET42 the fans of each section run off that section's converter: the section fan switch of the cab is bound to converterlocal_sw. The line contactors of a section with its fans switched off must not close. - New optional Cntrl. key LineContactorsInterlock=Converter|MotorBlowers. MotorConnectorsCheck() then also needs the vehicle's own converter (ConverterFlag, not the trainset's shared 110 V), or all its motor blowers, running. It is checked per vehicle, so only that section stays off, and switching the fans off on the way opens its contactors. Without the key nothing changes. - New optional lamp i-converteraoff:, lit while the converter of the vehicle with the cab is off. i-converteroff: follows the shared 110 V, so with one ET42 section's fans off it stayed dark. i-converterboff: already covers the other section. SVN data, to change once this is released (old data works as before): - dynamic/pkp/et42_v2/112e-a.fiz, 112e-b.fiz: LineContactorsInterlock=Converter in the Cntrl. line. - dynamic/pkp/et42_v2/112e-a.mmd.inc, 112e-b.mmd.inc: i-converter: nadm_przetw -> i-converteraoff: nadm_przetw, i-converterb: nadm_przetw_b -> i-converterboff: nadm_przetw_b, i-compressor: sprezarka -> i-compressoroff: sprezarka, i-compressorb: sprezarka_b -> i-compressorboff: sprezarka_b (the compressor "off" lamps already light with the compressor switched off or stopped by its pressure governor). (eu07/maszyna#460) --- McZapkie/MOVER.h | 13 +++ McZapkie/Mover.cpp | 23 +++- tests/unit/test_line_contactors_interlock.cpp | 110 ++++++++++++++++++ vehicle/Train.cpp | 4 + vehicle/Train.h | 1 + 5 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 tests/unit/test_line_contactors_interlock.cpp diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 199c65a0c..c7d9cdbec 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -279,6 +279,16 @@ enum class operation_t /// Disable button release transition. disable_off, }; +/// What else the line contactors of a vehicle need before they can close (LineContactorsInterlock in the Cntrl. section). +enum class line_contactors_interlock +{ + /// Nothing more, the legacy behaviour. + none, + /// The converter of the vehicle itself running, where it drives the traction motor fans (ET42). + converter, + /// The traction motor blowers of the vehicle running. + motor_blowers +}; /// Auto-start method for ancillary devices (mutually exclusive). enum class start_t { @@ -2152,6 +2162,7 @@ class TMoverParameters start_t GroundRelayStart{start_t::manual}; // relay activation method bool StLinFlag = false; /*!o styczniki liniowe*/ bool StLinSwitchOff{false}; // state of the button forcing motor connectors open + line_contactors_interlock LineContactorsInterlock{line_contactors_interlock::none}; // what else the line contactors need to close bool ResistorsFlag = false; /*!o jazda rezystorowa*/ double RventRot = 0.0; /*!s obroty wentylatorow rozruchowych*/ double PantographVoltage{0.0}; // voltage supplied to pantographs @@ -2466,6 +2477,8 @@ class TMoverParameters { return false == StLinFlag && MainCircuitLampsEnabled(); } + // whether the devices the line contactors are interlocked with (LineContactorsInterlock) let them close + bool LineContactorsInterlockReleased() const; // whether the pumps a joint oil and fuel pump switch works, those not started automatically, are all switched on bool OilFuelPumpsEnabled() const { diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 330e8eb8f..f5f88a681 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -7148,7 +7148,21 @@ bool TMoverParameters::MotorConnectorsCheck() auto const connectorsoff{false == Mains || true == FuseFlag || true == StLinSwitchOff || DirActive == 0}; - return false == connectorsoff; + return false == connectorsoff && LineContactorsInterlockReleased(); +} + +bool TMoverParameters::LineContactorsInterlockReleased() const +{ + switch (LineContactorsInterlock) + { + case line_contactors_interlock::converter: + // the converter of this very vehicle, not the 110 V of the trainset: a section with its fans off doesn't start + return ConverterFlag; + case line_contactors_interlock::motor_blowers: + return std::ranges::all_of(MotorBlowers, [](auto const &Blower) { return Blower.is_active; }); + default: + return true; + } } bool TMoverParameters::OperatePantographsValve(operation_t const State, range_t const Notify) @@ -11001,6 +11015,13 @@ void TMoverParameters::LoadFIZ_Cntrl(std::string const &line) MotorBlowers[end::rear].start_type = lookup != starts.end() ? lookup->second : start_t::manual; MotorBlowers[end::front].start_type = MotorBlowers[end::rear].start_type; } + // what else the line contactors need to close + { + std::map> const interlocks{{"Converter", line_contactors_interlock::converter}, + {"MotorBlowers", line_contactors_interlock::motor_blowers}}; + auto lookup = interlocks.find(extract_value("LineContactorsInterlock", line)); + LineContactorsInterlock = lookup != interlocks.end() ? lookup->second : line_contactors_interlock::none; + } // compartment lights { auto lookup = starts.find(extract_value("CompartmentLightsStart", line)); diff --git a/tests/unit/test_line_contactors_interlock.cpp b/tests/unit/test_line_contactors_interlock.cpp new file mode 100644 index 000000000..a34bcac7d --- /dev/null +++ b/tests/unit/test_line_contactors_interlock.cpp @@ -0,0 +1,110 @@ +#include "stdafx.h" +#include "doctest.h" +#include "consist.h" +#include "drive.h" +#include "vehicle.h" + +// the line contactors interlocked with the fans of the traction motors (eu07/maszyna#460): on the ET42 the fans of a +// section run off its own converter, and with them switched off the line contactors of that section don't close. + +using test::definition; +using test::vehicle; + +namespace { + +// a vehicle whose line contactors could close, but for the interlock +vehicle ready(std::string_view const Interlock) { + auto loaded{definition::load("wagon")}; + if (false == Interlock.empty()) { + loaded.set("Cntrl", "LineContactorsInterlock", std::string{Interlock}); + } + vehicle locomotive{loaded}; + locomotive->Mains = true; + locomotive->DirActive = 1; + locomotive->PipePress = 5.0; + locomotive->BrakePress = 0.0; + return locomotive; +} + +test::track const line{0.15, 0.0, test::catenary_3kv}; + +} // namespace + +TEST_CASE("line contactors interlock: read from the Cntrl. section, none by default") { + CHECK(ready("")->LineContactorsInterlock == line_contactors_interlock::none); + CHECK(ready("Converter")->LineContactorsInterlock == line_contactors_interlock::converter); + CHECK(ready("MotorBlowers")->LineContactorsInterlock == line_contactors_interlock::motor_blowers); + CHECK(ready("Something")->LineContactorsInterlock == line_contactors_interlock::none); +} + +TEST_CASE("line contactors interlock: without one the converter and the blowers don't matter, as before") { + auto locomotive{ready("")}; + locomotive->ConverterFlag = false; + for (auto &blower : locomotive->MotorBlowers) { + blower.is_active = false; + } + CHECK(locomotive->MotorConnectorsCheck()); +} + +TEST_CASE("line contactors interlock: on the converter, they close only with the vehicle's own converter running") { + auto locomotive{ready("Converter")}; + locomotive->ConverterFlag = false; + locomotive->Power110vIsAvailable = true; // the 110 V from the other section doesn't run this one's fans + CHECK_FALSE(locomotive->MotorConnectorsCheck()); + locomotive->ConverterFlag = true; + CHECK(locomotive->MotorConnectorsCheck()); + locomotive->Mains = false; // the other conditions still hold + CHECK_FALSE(locomotive->MotorConnectorsCheck()); +} + +TEST_CASE("line contactors interlock: on the motor blowers, they close only with all of them running") { + auto locomotive{ready("MotorBlowers")}; + locomotive->MotorBlowers[end::front].is_active = true; + locomotive->MotorBlowers[end::rear].is_active = false; + CHECK_FALSE(locomotive->MotorConnectorsCheck()); + locomotive->MotorBlowers[end::rear].is_active = true; + CHECK(locomotive->MotorConnectorsCheck()); +} + +TEST_CASE("line contactors interlock: the ET42 section with its fans switched off doesn't start") { + test::consist et42; + et42.add(definition::fiz("et42_v2/112e-a").set("Cntrl", "LineContactorsInterlock", "Converter"), 1); + et42.add(definition::fiz("et42_v2/112e-b").set("Cntrl", "LineContactorsInterlock", "Converter")); + auto driven{test::driving(et42)}; + REQUIRE(test::start_up(driven, line)); + auto &front{et42[0].mover()}; + auto &rear{et42[1].mover()}; + REQUIRE(front.ConverterFlag); + REQUIRE(rear.ConverterFlag); + + // the fans of the rear section switched off with its own switch, the 110 V of the front one still reaches it + rear.ConverterAllowLocal = false; + test::drive(driven, line, 2.0); + REQUIRE_FALSE(rear.ConverterFlag); + CHECK(rear.Power110vIsAvailable); + + test::release_brakes(driven.cab); + for (int i = 0; i < 3 && driven.cab.DirActive <= 0; ++i) { + driven.cab.DirectionForward(); + } + test::drive(driven, line, 20.0); + driven.controlling.IncMainCtrl(1); + // as the AI does, it waits at the first position for the contactors (their delay, the pressure switch) + for (int i = 0; i < 90 && false == front.StLinFlag; ++i) { + test::drive(driven, line, 1.0); + } + CHECK(front.StLinFlag); + CHECK_FALSE(rear.StLinFlag); + + // the fans back on, the section starts too + rear.ConverterAllowLocal = true; + test::drive(driven, line, 10.0); + REQUIRE(rear.ConverterFlag); + CHECK(rear.StLinFlag); + + // and the fans switched off on the way open its line contactors again + rear.ConverterAllowLocal = false; + test::drive(driven, line, 2.0); + CHECK_FALSE(rear.StLinFlag); + CHECK(front.StLinFlag); +} diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index 201b8972f..2926d74fc 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -8975,6 +8975,7 @@ bool TTrain::Update(double const Deltatime) btLampkaPrzetw.Turn(mvOccupied->Power110vIsAvailable); btLampkaPrzetwOff.Turn(!mvOccupied->Power110vIsAvailable); + btLampkaPrzetwAOff.Turn(!mvControlled->ConverterFlag); btLampkaNadmPrzetw.Turn(Dynamic()->Mechanik ? Dynamic()->Mechanik->IsAnyConverterOverloadRelayOpen : mvControlled->ConvOvldFlag); btLampkaOpory.Turn(mvControlled->StLinFlag && mvControlled->ResistorsFlagCheck()); @@ -9147,6 +9148,7 @@ bool TTrain::Update(double const Deltatime) btLampkaNapNastHam.Turn(false); btLampkaPrzetw.Turn(false); btLampkaPrzetwOff.Turn(false); + btLampkaPrzetwAOff.Turn(false); btLampkaNadmPrzetw.Turn(false); btLampkaSprezarka.Turn(false); btLampkaSprezarkaOff.Turn(false); @@ -11131,6 +11133,7 @@ void TTrain::clear_cab_controls() btLampkaPrzetw.Clear(); btLampkaPrzetwB.Clear(); btLampkaPrzetwBOff.Clear(); + btLampkaPrzetwAOff.Clear(); btLampkaPrzekRozn.Clear(); btLampkaPrzekRoznPom.Clear(); btLampkaUkrotnienie.Clear(); @@ -11546,6 +11549,7 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co {"i-conv_ovld:", btLampkaNadmPrzetw}, {"i-converter:", btLampkaPrzetw}, {"i-converteroff:", btLampkaPrzetwOff}, + {"i-converteraoff:", btLampkaPrzetwAOff}, {"i-converterb:", btLampkaPrzetwB}, {"i-converterboff:", btLampkaPrzetwBOff}, {"i-diff_relay:", btLampkaPrzekRozn}, diff --git a/vehicle/Train.h b/vehicle/Train.h index 009b349b4..df5dcfb76 100644 --- a/vehicle/Train.h +++ b/vehicle/Train.h @@ -709,6 +709,7 @@ public: // reszta może by?publiczna TButton btLampkaNadmPrzetw; TButton btLampkaPrzetw; TButton btLampkaPrzetwOff; + TButton btLampkaPrzetwAOff; // the converter of this very unit off, where the trainset shares its 110 V (ET42 section fans) TButton btLampkaPrzekRozn; // TODO: implement TButton btLampkaPrzekRoznPom; // TODO: implement TButton btLampkaNadmSil; From d50f51cdff0cce82cc71c385e61eb47cde42f7fb Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 20:41:06 +0100 Subject: [PATCH 299/430] feat: ET22 louvre lamp, lit until the main reservoir opens the louvres (eu07/maszyna#451) The ET22 cab binds its louvre lamp to i-voltbrake: (voltage on the brake controller) as a stand-in. The real lamp goes out once the main compressors have filled the main reservoir to about 5 bar and the pneumatic louvres of the motor fans open. - New optional lamp i-louvresclosed:, lit (with low voltage power) while the main reservoir pressure is below LouvresOpenPressure. - New optional Cntrl. key LouvresOpenPressure [bar], 5.0 by default, so the .mmd change alone is enough. - i-vent_trim: (btLampkaWentZaluzje, never driven) is left alone, because the WMB10 binds it and would suddenly light up. SVN data, to change once this is released (old data works as before): - dynamic/pkp/et22_v3/201eo.mmd.inc, 201eo_160ec.mmd.inc, 201ek.mmd: i-voltbrake: lampka_zaluzje -> i-louvresclosed: lampka_zaluzje - dynamic/pkp/et22-2000_v2/201em.mmd: i-voltbrake: zaluzje -> i-louvresclosed: zaluzje (eu07/maszyna#451) --- McZapkie/MOVER.h | 6 ++++++ McZapkie/Mover.cpp | 1 + tests/unit/test_line_contactors_interlock.cpp | 16 ++++++++++++++++ vehicle/Train.cpp | 4 ++++ vehicle/Train.h | 1 + 5 files changed, 28 insertions(+) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index c7d9cdbec..f7eb2fe56 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -2163,6 +2163,7 @@ class TMoverParameters bool StLinFlag = false; /*!o styczniki liniowe*/ bool StLinSwitchOff{false}; // state of the button forcing motor connectors open line_contactors_interlock LineContactorsInterlock{line_contactors_interlock::none}; // what else the line contactors need to close + double LouvresOpenPressure{5.0}; // main reservoir pressure [bar] at which the pneumatic louvres of the motor fans open (ET22) bool ResistorsFlag = false; /*!o jazda rezystorowa*/ double RventRot = 0.0; /*!s obroty wentylatorow rozruchowych*/ double PantographVoltage{0.0}; // voltage supplied to pantographs @@ -2477,6 +2478,11 @@ class TMoverParameters { return false == StLinFlag && MainCircuitLampsEnabled(); } + // whether the pneumatic louvres of the motor fans are still closed, the main reservoir short of the pressure that opens them + bool LouvresClosed() const + { + return Compressor < LouvresOpenPressure; + } // whether the devices the line contactors are interlocked with (LineContactorsInterlock) let them close bool LineContactorsInterlockReleased() const; // whether the pumps a joint oil and fuel pump switch works, those not started automatically, are all switched on diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index f5f88a681..a2845569c 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -11022,6 +11022,7 @@ void TMoverParameters::LoadFIZ_Cntrl(std::string const &line) auto lookup = interlocks.find(extract_value("LineContactorsInterlock", line)); LineContactorsInterlock = lookup != interlocks.end() ? lookup->second : line_contactors_interlock::none; } + extract_value(LouvresOpenPressure, "LouvresOpenPressure", line, ""); // compartment lights { auto lookup = starts.find(extract_value("CompartmentLightsStart", line)); diff --git a/tests/unit/test_line_contactors_interlock.cpp b/tests/unit/test_line_contactors_interlock.cpp index a34bcac7d..104d732e1 100644 --- a/tests/unit/test_line_contactors_interlock.cpp +++ b/tests/unit/test_line_contactors_interlock.cpp @@ -6,6 +6,7 @@ // the line contactors interlocked with the fans of the traction motors (eu07/maszyna#460): on the ET42 the fans of a // section run off its own converter, and with them switched off the line contactors of that section don't close. +// the louvres of the fans of the ET22 open with the air of the main reservoir (eu07/maszyna#451) using test::definition; using test::vehicle; @@ -108,3 +109,18 @@ TEST_CASE("line contactors interlock: the ET42 section with its fans switched of CHECK_FALSE(rear.StLinFlag); CHECK(front.StLinFlag); } + +TEST_CASE("louvres: closed until the main reservoir reaches the pressure that opens them") { + vehicle et22{definition::fiz("et22_v3/201e-w")}; + CHECK(et22->LouvresOpenPressure == doctest::Approx(5.0)); // by default + et22->Compressor = 4.9; + CHECK(et22->LouvresClosed()); + et22->Compressor = 5.0; + CHECK_FALSE(et22->LouvresClosed()); + + vehicle given{definition::fiz("et22_v3/201e-w").set("Cntrl", "LouvresOpenPressure", 4.0)}; + given->Compressor = 4.5; + CHECK_FALSE(given->LouvresClosed()); + given->Compressor = 3.9; + CHECK(given->LouvresClosed()); +} diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index 2926d74fc..6a1e9f4a1 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -9112,6 +9112,7 @@ bool TTrain::Update(double const Deltatime) btLampkaEngineOverheat.Turn(mvControlled->dizel_heat.engine_is_hot); btLampkaMotorBlowers.Turn(mvControlled->MotorBlowers[end::front].is_active && mvControlled->MotorBlowers[end::rear].is_active); btLampkaCoolingFans.Turn(mvControlled->RventRot > 1.0); + btLampkaLouvresClosed.Turn(mvControlled->LouvresClosed()); btLampkaTempomat.Turn(mvOccupied->SpeedCtrlUnit.IsActive); btLampkaDistanceCounter.Turn(m_distancecounter >= 0.f); // universal devices state indicators @@ -9198,6 +9199,7 @@ bool TTrain::Update(double const Deltatime) btLampkaMalfunction.Turn(false); btLampkaMotorBlowers.Turn(false); btLampkaCoolingFans.Turn(false); + btLampkaLouvresClosed.Turn(false); btLampkaTempomat.Turn(false); btLampkaDistanceCounter.Turn(false); // universal devices state indicators @@ -11213,6 +11215,7 @@ void TTrain::clear_cab_controls() btLampkaMalfunctionB.Clear(); btLampkaMotorBlowers.Clear(); btLampkaCoolingFans.Clear(); + btLampkaLouvresClosed.Clear(); btLampkaTempomat.Clear(); btLampkaDistanceCounter.Clear(); @@ -11577,6 +11580,7 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co {"i-vent_trim:", btLampkaWentZaluzje}, {"i-motorblowers:", btLampkaMotorBlowers}, {"i-coolingfans:", btLampkaCoolingFans}, + {"i-louvresclosed:", btLampkaLouvresClosed}, {"i-tempomat:", btLampkaTempomat}, {"i-distancecounter:", btLampkaDistanceCounter}, {"i-trainheating:", btLampkaOgrzewanieSkladu}, diff --git a/vehicle/Train.h b/vehicle/Train.h index df5dcfb76..b2cc84f46 100644 --- a/vehicle/Train.h +++ b/vehicle/Train.h @@ -815,6 +815,7 @@ public: // reszta może by?publiczna TButton btLampkaMalfunctionB; TButton btLampkaMotorBlowers; TButton btLampkaCoolingFans; + TButton btLampkaLouvresClosed; // ET22, the pneumatic louvres of the motor fans not open yet TButton btLampkaTempomat; TButton btLampkaDistanceCounter; From 5bc4e7cd2e15e19d6f85ec0ace1f666941983f98 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 21:01:54 +0100 Subject: [PATCH 300/430] feat: lock field shunting at zero and on resistive positions New optional Cntrl. key ScndCtrlResistiveLock=Yes: IncScndCtrl() refuses to step the shunt controller up while the master controller is at its no-power position or on a resistive RList position (R >= 0.01), as the interlock of the ET21, ET22 and EP09 does. Decreasing the shunt stays allowed so it can't get stuck. The AI doesn't choose field shunting while the lock applies. Without the key nothing changes. Game data: the key is to be added to the Cntrl. line of the ET21 (et21_v2), ET22 (et22_v3, et22-2000_v2) and EP09 (ep09_v1, ep09_v2) .fiz files that define it; until then they behave as before. (eu07/maszyna#402) --- McZapkie/MOVER.h | 3 ++ McZapkie/Mover.cpp | 9 ++++- tests/unit/test_cntrl.cpp | 80 +++++++++++++++++++++++++++++++++++++++ vehicle/Driver.cpp | 2 +- 4 files changed, 92 insertions(+), 2 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 199c65a0c..825bec6de 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1943,6 +1943,7 @@ class TMoverParameters double MirrorVelClose{5.0}; bool MirrorForbidden{false}; /*czy jest pozwolenie na otworzenie lusterek (przycisk)*/ bool ScndS = false; /*Czy jest bocznikowanie na szeregowej*/ + bool ScndCtrlResistiveLock{false}; // the shunt controller can't be moved up while the master controller is at zero or on a resistive position (ScndCtrlResistiveLock=Yes in Cntrl.) bool SpeedCtrl = false; /*czy jest tempomat*/ speed_control SpeedCtrlUnit; /*parametry tempomatu*/ double SpeedCtrlButtons[10]{30, 40, 50, 60, 70, 80, 90, 100, 110, 120}; /*przyciski prędkości*/ @@ -2372,6 +2373,8 @@ class TMoverParameters bool IncScndCtrl(int CtrlSpeed); bool DecScndCtrl(int CtrlSpeed); int GetVirtualScndPos() const; + // whether ScndCtrlResistiveLock keeps the shunt controller from being moved up at the current master controller position + bool IsScndCtrlLockedByMainCtrl() const; bool IsScndCtrlNoPowerPos() const; bool IsScndCtrlMaxPowerPos() const; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 330e8eb8f..b9d18d0b2 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -2751,7 +2751,7 @@ bool TMoverParameters::IncScndCtrl(int CtrlSpeed) { // if (RList[MainCtrlPos].R=0) and (MainCtrlPos>0) and (ScndCtrlPos= 0.01); +} + int TMoverParameters::GetVirtualScndPos() const { if (TrainType == dt_ET42 && DynamicBrakeFlag && !ScndCtrlPos) @@ -10897,6 +10903,7 @@ void TMoverParameters::LoadFIZ_Cntrl(std::string const &line) extract_value(EIMCtrlEmergency, "EIMCtrlEmergency", line, ""); extract_value(ScndS, "ScndS", line, ""); // brak pozycji rownoleglej przy niskiej nastawie PSR + extract_value(ScndCtrlResistiveLock, "ScndCtrlResistiveLock", line, ""); // bocznikowanie tylko na pozycjach bezoporowych extract_value(InitialCtrlDelay, "IniCDelay", line, ""); extract_value(CtrlDelay, "SCDelay", line, ""); diff --git a/tests/unit/test_cntrl.cpp b/tests/unit/test_cntrl.cpp index 0dd3ddc20..43c983edd 100644 --- a/tests/unit/test_cntrl.cpp +++ b/tests/unit/test_cntrl.cpp @@ -37,3 +37,83 @@ TEST_CASE("cntrl: the relays of a multiple unit start on their own, of other veh CHECK(unit->ConverterOverloadRelayStart == start_t::automatic); } } + +namespace { + +// the first position of the master controller after Position without the starting resistors in the circuit +int resistance_free_position(TMoverParameters const &Vehicle, int Position = 0) { + for (auto position{Position + 1}; position <= Vehicle.MainCtrlPosNo; ++position) { + if (Vehicle.RList[position].R < 0.01) { + return position; + } + } + return 0; +} + +// the vehicle with its cab occupied, the master controller set to Position and the shunt controller off +void controllers_at(vehicle &Vehicle, int Position) { + Vehicle->CabActive = 1; + Vehicle->MainCtrlPos = Position; + Vehicle->ScndCtrlPos = 0; +} + +} // namespace + +TEST_CASE("cntrl: ScndCtrlResistiveLock keeps the field shunting off at zero and on the resistive positions (eu07/maszyna#402)") { + for (auto const *path : {"et22_v3/201e-rn", "ep09_v2/104e"}) { + CAPTURE(path); + vehicle locked{definition::fiz(path).set("Cntrl", "ScndCtrlResistiveLock", "Yes"), 0.0, "test", 1}; + REQUIRE(locked->ScndCtrlResistiveLock); + REQUIRE(locked->ScndCtrlPosNo > 0); + auto const resistancefree{resistance_free_position(locked.mover())}; + REQUIRE(resistancefree > 1); + REQUIRE(locked->RList[resistancefree - 1].R >= 0.01); + + SUBCASE("zero") { + controllers_at(locked, 0); + CHECK(locked->IsScndCtrlLockedByMainCtrl()); + CHECK_FALSE(locked->IncScndCtrl(1)); + CHECK_FALSE(locked->IncScndCtrl(2)); + CHECK(locked->ScndCtrlPos == 0); + } + SUBCASE("resistive positions") { + for (auto position{1}; position < resistancefree; ++position) { + CAPTURE(position); + controllers_at(locked, position); + CHECK_FALSE(locked->IncScndCtrl(1)); + CHECK(locked->ScndCtrlPos == 0); + } + } + SUBCASE("every resistance-free position") { + for (auto position{resistancefree}; position > 0; position = resistance_free_position(locked.mover(), position)) { + CAPTURE(position); + controllers_at(locked, position); + CHECK_FALSE(locked->IsScndCtrlLockedByMainCtrl()); + CHECK(locked->IncScndCtrl(1)); + CHECK(locked->ScndCtrlPos == 1); + } + } + SUBCASE("the shunting still goes off on a resistive position") { + controllers_at(locked, resistancefree); + REQUIRE(locked->IncScndCtrl(1)); + locked->MainCtrlPos = resistancefree - 1; + CHECK(locked->DecScndCtrl(1)); + CHECK(locked->ScndCtrlPos == 0); + } + } +} + +TEST_CASE("cntrl: without ScndCtrlResistiveLock the field shunting engages on any position, as before") { + for (auto const *path : {"et22_v3/201e-rn", "ep09_v2/104e"}) { + CAPTURE(path); + vehicle unlocked{definition::fiz(path), 0.0, "test", 1}; + CHECK_FALSE(unlocked->ScndCtrlResistiveLock); + for (auto const position : {0, 1}) { + CAPTURE(position); + controllers_at(unlocked, position); + CHECK_FALSE(unlocked->IsScndCtrlLockedByMainCtrl()); + CHECK(unlocked->IncScndCtrl(1)); + CHECK(unlocked->ScndCtrlPos == 1); + } + } +} diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 08f0c0d24..bb6ff823b 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -3364,7 +3364,7 @@ bool TController::IncSpeed() mvOccupied->Vel <= (IsCargoTrain ? 40 : 30) + (seriesmodefieldshunting ? 5 : 0) - (fAccGravity < -0.025 ? 10 : 0)); // when not in series mode use the first available parallel mode configuration until 50/60 km/h for passenger/cargo train // (if there's only one parallel mode configuration it'll be used regardless of current speed) - auto const usefieldshunting = mvControlling->StLinFlag && mvControlling->RList[mvControlling->MainCtrlPos].R < 0.01 && + auto const usefieldshunting = mvControlling->StLinFlag && mvControlling->RList[mvControlling->MainCtrlPos].R < 0.01 && false == mvControlling->IsScndCtrlLockedByMainCtrl() && (useseriesmode ? mvControlling->RList[mvControlling->MainCtrlPos].Bn == 1 : true == sufficientacceleration && true == sufficienttractionforce && mvOccupied->Vel <= (IsCargoTrain ? 60 : 50) + (parallelmodefieldshunting ? 5 : 0) ? mvControlling->RList[mvControlling->MainCtrlPos].Bn > 1 : From 6dc1239553f41070f7439786ad3d29d86005caf8 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 21:16:19 +0100 Subject: [PATCH 301/430] fix: no multiple-unit control between electric and diesel locomotives An electric and a diesel locomotive got their control coupled whenever the scenario (and so the Starter) asked for it, since the scenery coupling ignores ControlType, or when neither coupler named a control system, so a Vectron and an SM42 ran in multiple unit. TMoverParameters::Attach() now leaves the control connection out between an electric (ElectricSeriesMotor, ElectricInductionMotor) and a diesel (DieselEngine, DieselElectric/DumbDE) traction vehicle, for the scenery, the AI, the coupling keys and the automatic couplers alike, and logs it. Vehicles without own traction (cars, control trailers) are not affected, nor are permanent couplings within a unit, nor couplers that both name the same ControlType, which stays the vehicle authors' way to allow such a pair. The AI coupling order expects the coupling the vehicles can take, so it doesn't wait for the control connection forever. Existing scenarios coupling such a pair still load, without the control connection. "controlcoupling.enginecheck no" in eu07.ini turns the check off. No SVN data change is needed. (eu07/maszyna#520) --- McZapkie/MOVER.h | 8 +++ McZapkie/Mover.cpp | 69 +++++++++++++++++- tests/unit/test_couplers.cpp | 135 +++++++++++++++++++++++++++++++++++ utilities/Globals.cpp | 7 ++ utilities/Globals.h | 1 + vehicle/Driver.cpp | 12 +++- vehicle/DynObj.cpp | 3 +- 7 files changed, 230 insertions(+), 5 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 199c65a0c..55a175145 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -2453,6 +2453,14 @@ class TMoverParameters // whether the automatic couplers at the End of this vehicle and the OtherEnd of the other one can catch each other on // contact, rather than the vehicles colliding (with crash damage enabled, only at a closing speed which doesn't derail them) bool AutomaticCouplingSafe(int const End, TMoverParameters const &Other, int const OtherEnd) const; + // whether the control coupling (multiple-unit control) can join the End of this vehicle and the OtherEnd of the other + // one: not between an electric and a diesel traction vehicle, unless both couplers name the same control system + // (ControlType). Vehicles without own traction (cars, control trailers) take any. Global.control_coupling_engine_check + // off allows it always (eu07/maszyna#520) + bool ControlCouplingAllowed(int const End, TMoverParameters const &Other, int const OtherEnd) const; + // the CouplingType to join the End of this vehicle and the OtherEnd of the other one with, without the control coupling + // when ControlCouplingAllowed() rules it out. a permanent coupling (of the vehicles of one unit) is kept whole + int CompatibleCoupling(int const End, TMoverParameters const &Other, int const OtherEnd, int const CouplingType) const; // the horns of the Signal (WarningSignal bits) which have the air or the voltage they need to sound int SoundingHorns(int const Signal) const; // whether the signal lamps of the main circuit (line contactors, ground relay, motor overload relays) can light: diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 330e8eb8f..4b10f4f9c 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -599,7 +599,8 @@ bool TMoverParameters::Attach(int ConnectNo, int ConnectToNr, TMoverParameters * } auto &thiscoupler{Couplers[ConnectNo]}; - auto &othercoupler = ConnectTo->Couplers[ConnectToNr != 2 ? ConnectToNr : thiscoupler.ConnectedNr]; + auto const otherend{ConnectToNr != 2 ? ConnectToNr : thiscoupler.ConnectedNr}; + auto &othercoupler = ConnectTo->Couplers[otherend]; auto const distance{CouplerDist(this, ConnectTo) - (thiscoupler.adapter_length + othercoupler.adapter_length)}; @@ -608,6 +609,18 @@ bool TMoverParameters::Attach(int ConnectNo, int ConnectToNr, TMoverParameters * return false; } + // no multiple-unit control between an electric and a diesel locomotive, whoever asks for it: the scenario, the AI + // or the player (eu07/maszyna#520) + if (auto const compatible{CompatibleCoupling(ConnectNo, *ConnectTo, otherend, CouplingType)}; compatible != CouplingType) + { + WriteLog(std::format("Vehicles \"{}\" and \"{}\" can't share their control, coupled without the control connection", Name, ConnectTo->Name)); + CouplingType = compatible; + if (CouplingType == coupling::faux) + { + return false; + } + } + // stykaja sie zderzaki i kompatybilne typy sprzegow, chyba że łączenie na starcie if (thiscoupler.CouplingFlag == coupling::faux) { @@ -1206,6 +1219,59 @@ bool TMoverParameters::AutomaticCouplingSafe(int const End, TMoverParameters con return false == Global.crash_damage || CollisionVelocity(End, Other, OtherEnd) <= SafeCollisionVelocity; } +namespace +{ + +// the kind of traction a vehicle's engine stands for, as far as its multiple-unit control goes +enum class traction_kind +{ + none, + electric, + diesel +}; + +traction_kind traction_of(TEngineType const Engine) +{ + switch (Engine) + { + case TEngineType::ElectricSeriesMotor: + case TEngineType::ElectricInductionMotor: + return traction_kind::electric; + case TEngineType::DieselEngine: + case TEngineType::DieselElectric: + return traction_kind::diesel; + default: + return traction_kind::none; + } +} + +} // namespace + +bool TMoverParameters::ControlCouplingAllowed(int const End, TMoverParameters const &Other, int const OtherEnd) const +{ + if (false == Global.control_coupling_engine_check) + { + return true; + } + // the same control system named on both couplers is the vehicle authors' word that they work together + if (auto const &controltype{Couplers[End].control_type}; false == controltype.empty() && controltype == Other.Couplers[OtherEnd].control_type) + { + return true; + } + auto const traction{traction_of(EngineType)}; + auto const othertraction{traction_of(Other.EngineType)}; + return traction == traction_kind::none || othertraction == traction_kind::none || traction == othertraction; +} + +int TMoverParameters::CompatibleCoupling(int const End, TMoverParameters const &Other, int const OtherEnd, int const CouplingType) const +{ + if ((CouplingType & coupling::control) == 0 || (CouplingType & coupling::permanent) != 0 || ControlCouplingAllowed(End, Other, OtherEnd)) + { + return CouplingType; + } + return CouplingType & ~coupling::control; +} + int TMoverParameters::SoundingHorns(int const Signal) const { auto const supplied{[this](horn_supply const Supply) { @@ -5454,6 +5520,7 @@ double TMoverParameters::CouplerForce(int const End, double dt) { couplingtype &= ~coupling::control; } + couplingtype = CompatibleCoupling(End, *othervehicle, otherend, couplingtype); // too fast for the couplers to catch, the vehicles collide instead (and may derail, see CollisionDetect()) auto const safe{AutomaticCouplingSafe(End, *othervehicle, otherend)}; diff --git a/tests/unit/test_couplers.cpp b/tests/unit/test_couplers.cpp index 2a0ff6e50..bed4d7a73 100644 --- a/tests/unit/test_couplers.cpp +++ b/tests/unit/test_couplers.cpp @@ -525,3 +525,138 @@ TEST_CASE("couplers: a collision of coupled vehicles keeps the momentum of the p CHECK(0.5 * (front_wagon.speed() + rear_wagon.speed()) > 13.5); CHECK(0.5 * (front_wagon.speed() + rear_wagon.speed()) < 15.05 + 1e-6); } + +// eu07/maszyna#520: an electric and a diesel locomotive got their control coupled (multiple-unit control) when the +// scenario or the Starter asked for it, or when the couplers let it through, as a Vectron and an SM42 did + +namespace { + +// the given setting of the control coupling check for the test, restored after it +class control_coupling_check_setting { +public: + explicit control_coupling_check_setting(bool Enabled) { Global.control_coupling_engine_check = Enabled; } + ~control_coupling_check_setting() { Global.control_coupling_engine_check = m_previous; } + control_coupling_check_setting(control_coupling_check_setting const &) = delete; + control_coupling_check_setting &operator=(control_coupling_check_setting const &) = delete; + +private: + bool m_previous{Global.control_coupling_engine_check}; +}; + +constexpr int scenario_coupling{coupling::coupler | coupling::brakehose | coupling::mainhose | coupling::control}; + +// couples the rear of the first vehicle to the front of the second one the way the scenery does (forced, from the +// first one only), returns the coupling the pair got +int scenario_couple(vehicle &First, vehicle &Second, int Coupling = scenario_coupling) { + REQUIRE(First->Attach(end::rear, end::front, &Second.mover(), Coupling, true, false)); + CHECK(Second->Couplers[end::front].CouplingFlag == First->Couplers[end::rear].CouplingFlag); + return First->Couplers[end::rear].CouplingFlag; +} + +} // namespace + +TEST_CASE("couplers: an electric and a diesel locomotive don't share their control") { + control_coupling_check_setting const check{true}; + // the E6ACT names no control system (ControlType), as the Vectron doesn't; the SM42 names its own, the SM03 none + auto electric{vehicle{definition::fiz("e6act_v2/e6acta"), 0.0, "electric"}}; + REQUIRE(electric->EngineType == TEngineType::ElectricInductionMotor); + + SUBCASE("a diesel-electric one with its own control system") { + auto diesel{vehicle{definition::fiz("sm42_v1/6d1"), 0.0, "diesel"}}; + REQUIRE(diesel->EngineType == TEngineType::DieselElectric); + CHECK_FALSE(electric->ControlCouplingAllowed(end::rear, diesel.mover(), end::front)); + CHECK(scenario_couple(electric, diesel) == (scenario_coupling & ~coupling::control)); + } + SUBCASE("a diesel-mechanical one without a control system named, either") { + auto diesel{vehicle{definition::fiz("sm03_v1/sm03"), 0.0, "diesel"}}; + REQUIRE(diesel->EngineType == TEngineType::DieselEngine); + CHECK_FALSE(diesel->ControlCouplingAllowed(end::front, electric.mover(), end::rear)); + CHECK(scenario_couple(diesel, electric) == (scenario_coupling & ~coupling::control)); + } + SUBCASE("unless both name the same control system") { + auto diesel{vehicle{definition::fiz("sm03_v1/sm03").set("BuffCoupl", "ControlType", "shared"), 0.0, "diesel"}}; + auto shared{vehicle{definition::fiz("e6act_v2/e6acta").set("BuffCoupl", "ControlType", "shared"), 0.0, "electric"}}; + CHECK(scenario_couple(shared, diesel) == scenario_coupling); + } + SUBCASE("unless the vehicles make one unit, coupled for good") { + auto diesel{vehicle{definition::fiz("sm03_v1/sm03"), 0.0, "diesel"}}; + auto const permanent{scenario_coupling | coupling::permanent}; + CHECK(scenario_couple(electric, diesel, permanent) == permanent); + } + SUBCASE("unless the check is turned off") { + control_coupling_check_setting const off{false}; + auto diesel{vehicle{definition::fiz("sm42_v1/6d1"), 0.0, "diesel"}}; + CHECK(electric->ControlCouplingAllowed(end::rear, diesel.mover(), end::front)); + CHECK(scenario_couple(electric, diesel) == scenario_coupling); + } +} + +TEST_CASE("couplers: locomotives of the same traction and the cars keep their control coupling") { + control_coupling_check_setting const check{true}; + + SUBCASE("two electric ones") { + auto first{vehicle{definition::fiz("ep09_v2/104e"), 0.0, "first"}}; + auto second{vehicle{definition::fiz("et22_v3/201e-w"), 0.0, "second"}}; + CHECK(scenario_couple(first, second) == scenario_coupling); + } + SUBCASE("an electric one of each motor type") { + auto first{vehicle{definition::fiz("e6act_v2/e6acta"), 0.0, "first"}}; + auto second{vehicle{definition::fiz("eu04_v1/eu04-01"), 0.0, "second"}}; + CHECK(scenario_couple(first, second) == scenario_coupling); + } + SUBCASE("two diesel ones") { + auto first{vehicle{definition::fiz("sm03_v1/sm03"), 0.0, "first"}}; + auto second{vehicle{definition::fiz("wmb10_v1/wmb10"), 0.0, "second"}}; + CHECK(scenario_couple(first, second) == scenario_coupling); + } + SUBCASE("a diesel-mechanical and a diesel-electric one") { + auto first{vehicle{definition::fiz("sm03_v1/sm03"), 0.0, "first"}}; + auto second{vehicle{definition::fiz("st44_v2/m62-1151"), 0.0, "second"}}; + CHECK(scenario_couple(first, second) == scenario_coupling); + } + SUBCASE("an electric multiple unit's motor car and its control trailer") { + auto trailer{vehicle{definition::fiz("en57_v1/5bgb"), 0.0, "trailer"}}; + auto motorcar{vehicle{definition::fiz("en57_v1/6bai"), 0.0, "motorcar"}}; + CHECK(scenario_couple(trailer, motorcar) == scenario_coupling); + } + SUBCASE("a diesel locomotive and a car") { + auto diesel{vehicle{definition::fiz("sm42_v1/6d1"), 0.0, "diesel"}}; + auto car{vehicle{definition::load("wagon"), 0.0, "car"}}; + CHECK(scenario_couple(diesel, car) == scenario_coupling); + } +} + +TEST_CASE("couplers: automatic couplers of an electric and a diesel locomotive couple without the control connection") { + crash_damage_setting const crashdamage{true}; + control_coupling_check_setting const check{true}; + auto const flag{coupling::coupler | coupling::brakehose | coupling::control}; + auto automatic = [flag](std::string const &Path) { + return definition::fiz(Path).set("BuffCoupl", "CType", "Automatic").set("BuffCoupl", "AutomaticFlag", flag); + }; + auto moving{vehicle{automatic("e6act_v2/e6acta"), 5.0, "moving"}}; + + SUBCASE("a diesel one") { + auto standing{vehicle{automatic("sm03_v1/sm03"), 0.0, "standing"}}; + test::pair pair{moving, end::front, standing, end::rear, 1.0}; + REQUIRE(couple_during(pair, 3.0)); + CHECK(pair.coupling() == (coupling::coupler | coupling::brakehose)); + } + SUBCASE("an electric one") { + auto standing{vehicle{automatic("ep09_v2/104e"), 0.0, "standing"}}; + test::pair pair{moving, end::front, standing, end::rear, 1.0}; + REQUIRE(couple_during(pair, 3.0)); + CHECK(pair.coupling() == flag); + } +} + +TEST_CASE("couplers: the AI and the player get the coupling the vehicles can take") { + control_coupling_check_setting const check{true}; + auto electric{vehicle{definition::fiz("e6act_v2/e6acta"), 0.0, "electric"}}; + auto diesel{vehicle{definition::fiz("sm42_v1/6d1"), 0.0, "diesel"}}; + auto other{vehicle{definition::fiz("ep09_v2/104e"), 0.0, "other"}}; + + CHECK(electric->CompatibleCoupling(end::rear, diesel.mover(), end::front, scenario_coupling) == (scenario_coupling & ~coupling::control)); + CHECK(electric->CompatibleCoupling(end::rear, other.mover(), end::front, scenario_coupling) == scenario_coupling); + // nothing to take away without the control connection asked for + CHECK(electric->CompatibleCoupling(end::rear, diesel.mover(), end::front, coupling::coupler) == coupling::coupler); +} diff --git a/utilities/Globals.cpp b/utilities/Globals.cpp index b4f2e14be..99a2decb9 100644 --- a/utilities/Globals.cpp +++ b/utilities/Globals.cpp @@ -751,6 +751,12 @@ bool global_settings::ConfigParseSimulation(cParser& Parser, const std::string& return true; } + if (token == "controlcoupling.enginecheck") + { + ParseOne(Parser, control_coupling_engine_check, 1); + return true; + } + return false; } @@ -1590,6 +1596,7 @@ global_settings::export_as_text( std::ostream &Output ) const { export_as_text( Output, "scenario.time.current", ScenarioTimeCurrent ); export_as_text( Output, "scenario.weather.temperature", AirTemperature ); export_as_text( Output, "ai.trainman", AITrainman ); + export_as_text( Output, "controlcoupling.enginecheck", control_coupling_engine_check ); export_as_text( Output, "scalespeculars", ScaleSpecularValues ); export_as_text( Output, "gfxrenderer", GfxRenderer ); export_as_text( Output, "shadows", RenderShadows ); diff --git a/utilities/Globals.h b/utilities/Globals.h index ad216cd96..d079db2cb 100644 --- a/utilities/Globals.h +++ b/utilities/Globals.h @@ -260,6 +260,7 @@ struct global_settings { bool captureonstart = true; bool render_cab = true; bool crash_damage = true; + bool control_coupling_engine_check = true; // no multiple-unit control between electric and diesel traction vehicles (eu07/maszyna#520) bool gui_defaultwindows = true; bool gui_showtranscripts = true; bool gui_trainingdefault = false; diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 08f0c0d24..b267b390b 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -6907,8 +6907,14 @@ TController::UpdateConnect() { auto *vehicle { iCouplingVehicle.value().first }; auto const couplingend { iCouplingVehicle.value().second }; auto *vehicleparameters { vehicle->MoverParameters }; - if( vehicleparameters->Couplers[ couplingend ].CouplingFlag != iCoupler ) { - auto const &neighbour { vehicleparameters->Neighbours[ couplingend ] }; + auto const &neighbour { vehicleparameters->Neighbours[ couplingend ] }; + // vehicles which can't share their control get coupled without the control connection (eu07/maszyna#520) + auto expectedcoupling { iCoupler }; + if( neighbour.vehicle != nullptr ) { + auto const neighbourend { neighbour.vehicle_end != 2 ? neighbour.vehicle_end : vehicleparameters->Couplers[ couplingend ].ConnectedNr }; + expectedcoupling = vehicleparameters->CompatibleCoupling( couplingend, *neighbour.vehicle->MoverParameters, neighbourend, iCoupler ); + } + if( vehicleparameters->Couplers[ couplingend ].CouplingFlag != expectedcoupling ) { if( neighbour.vehicle != nullptr && neighbour.distance < 10 ) { // check whether we need to attach coupler adapter auto coupleriscompatible{true}; @@ -6930,7 +6936,7 @@ TController::UpdateConnect() { } } // NOTE: no else as the preceeding block can potentially establish expected connection - if( vehicleparameters->Couplers[ couplingend ].CouplingFlag == iCoupler ) { + if( vehicleparameters->Couplers[ couplingend ].CouplingFlag == expectedcoupling ) { // jeżeli został podłączony CheckVehicles( Connect ); // sprawdzić światła nowego składu diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index d5f60e332..659b718fa 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -1713,7 +1713,8 @@ TDynamicObject::couple( int const Side ) { if( false == TestFlag( MoverParameters->Couplers[ Side ].CouplingFlag, coupling::control ) ) { // ukrotnionko if( (coupler.AllowedFlag & othercoupler.AllowedFlag & coupling::control) == coupling::control - && coupler.control_type == othercoupler.control_type ) { + && coupler.control_type == othercoupler.control_type + && ( MoverParameters->CompatibleCoupling( Side, *othervehicleparams, neighbour.vehicle_end, coupler.CouplingFlag | coupling::control ) & coupling::control ) != 0 ) { if( MoverParameters->Attach( Side, neighbour.vehicle_end, othervehicleparams, From 39244a88a500d51ada0f8c33ccc3056848466d22 Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Sat, 7 Nov 2026 21:17:12 +0100 Subject: [PATCH 302/430] tests: wait for the pressure switches before notching up full_power() notched up as soon as the controlling half had closed its line contactors. In the ET42 test the locomotive brake is still at about 2.0 bar then, right at the pressure switch threshold, so whether the second half starts as well depended on thousandths of a bar in its cylinder: a half whose switch is on when the controller leaves zero doesn't close its line contactors until the controller is back at zero. Any change to the air brakes could tip it either way (with the corrected ESt3 the second half stayed off and the train reached 88.7 instead of 106 km/h). The helper now waits, as a driver does, until no pressure switch in the train cuts the start off. --- tests/unit/scenario.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/unit/scenario.cpp b/tests/unit/scenario.cpp index b933a0ab5..4af8be18a 100644 --- a/tests/unit/scenario.cpp +++ b/tests/unit/scenario.cpp @@ -5,6 +5,21 @@ namespace test { +namespace { + +// whether the pressure switch of a vehicle in the train still cuts the start off: a half of a locomotive whose +// switch is on when the controller leaves zero doesn't close its line contactors until the controller is back at zero +bool start_cut_off(consist &Train) { + for (std::size_t i = 0; i < Train.size(); ++i) { + if (Train[i].mover().ControlPressureSwitch) { + return true; + } + } + return false; +} + +} // namespace + scenario::scenario(std::string Name, std::vector Channels, track const &Track) : m_name(std::move(Name)), m_channels(std::move(Channels)), m_track(Track) { reseed_random(); } @@ -53,6 +68,11 @@ void scenario::get_going() { void scenario::full_power(double Seconds) { auto &controlling{driver().controlling}; + // as a driver does, wait for the brakes to let go far enough for every pressure switch of the train to allow the + // start; otherwise whether all the halves of a locomotive start hangs on thousandths of a bar of their cylinders + for (int i = 0; i < 120 && start_cut_off(m_train); ++i) { + wait(1.0); + } controlling.IncMainCtrl(1); for (int i = 0; i < 90 && false == controlling.StLinFlag; ++i) { wait(1.0); From 8f51ea9a19a8900d424236deb545e978d3ff0811 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 21:32:41 +0100 Subject: [PATCH 303/430] feat(ai): suggested pantograph setup for shunting in the .fiz (eu07/maszyna#461) A new optional key in the AI section of the .fiz, ShuntPantstate= (bits as in Pantstate: 1 front, 2 rear, 3 both), sets the pantographs the AI driver keeps up while its order is Shunt or Loose_shunt, moving and standing alike: it raises those of the setup and lowers the others once one of the setup collects the voltage, and doesn't raise more when idling. Lowering on the track's demand still comes first. Without the key (default 0) nothing changes, so an ET41 no longer has to shunt on all four pantographs once its .fiz says so. SVN data, optional: add "AI: ShuntPantstate=<1|2|3>" to the .fiz of vehicles that should shunt on fewer pantographs, e.g. dynamic/pkp/et41_v2/203e-a.fiz, 203e-b.fiz and their _dsa150 variants (no AI line there yet). Without it the vehicles behave as before. (eu07/maszyna#461) --- McZapkie/MOVER.h | 3 +++ McZapkie/Mover.cpp | 1 + tests/unit/test_ai_hints.cpp | 31 +++++++++++++++++++++++++ vehicle/Driver.cpp | 44 +++++++++++++++++++++++++++++++++++- vehicle/Driver.h | 1 + 5 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 tests/unit/test_ai_hints.cpp diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 199c65a0c..b29f2afa9 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -2300,6 +2300,9 @@ class TMoverParameters plc::basic_controller m_plc; int AIHintPantstate{0}; // suggested pantograph setup + // suggested pantograph setup in shunting (AI: ShuntPantstate=, eu07/maszyna#461), the bits as in Pantstate: 1 front, + // 2 rear, 3 both; 0 (the default) shunts with the pantographs handled as in train mode + int AIHintShuntPantstate{0}; bool AIHintPantUpIfIdle{true}; // whether raise both pantographs if idling for a while double AIHintLocalBrakeAccFactor{1.05}; // suggested acceleration weight for local brake operation diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 330e8eb8f..7fb2ed8b5 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -11474,6 +11474,7 @@ void TMoverParameters::LoadFIZ_AI(std::string const &Input) { extract_value(AIHintPantstate, "Pantstate", Input, ""); + extract_value(AIHintShuntPantstate, "ShuntPantstate", Input, ""); extract_value(AIHintPantUpIfIdle, "IdlePantUp", Input, ""); extract_value(AIHintLocalBrakeAccFactor, "LocalBrakeAccFactor", Input, ""); } diff --git a/tests/unit/test_ai_hints.cpp b/tests/unit/test_ai_hints.cpp new file mode 100644 index 000000000..d01e421c9 --- /dev/null +++ b/tests/unit/test_ai_hints.cpp @@ -0,0 +1,31 @@ +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" + +using test::definition; +using test::vehicle; + +// the hints for the AI driver from the AI section of the .fiz + +TEST_CASE("ai hints: without the AI section the pantographs follow the built-in logic") { + vehicle wagon{definition::load("wagon")}; + + CHECK(wagon->AIHintPantstate == 0); + CHECK(wagon->AIHintShuntPantstate == 0); + CHECK(wagon->AIHintPantUpIfIdle); +} + +TEST_CASE("ai hints: the suggested pantograph setup for shunting is read apart from the one for train mode") { + // eu07/maszyna#461: so the ET41 doesn't shunt with all of its four pantographs up + vehicle shunting{definition::load("wagon").set("AI", "Pantstate", 1).set("AI", "ShuntPantstate", 2)}; + + CHECK(shunting->AIHintPantstate == 1); + CHECK(shunting->AIHintShuntPantstate == 2); +} + +TEST_CASE("ai hints: a .fiz with the setup for train mode only has none for shunting") { + vehicle train{definition::load("wagon").set("AI", "Pantstate", 3)}; + + CHECK(train->AIHintPantstate == 3); + CHECK(train->AIHintShuntPantstate == 0); +} diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 08f0c0d24..682061b68 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -6115,6 +6115,13 @@ TController::control_pantographs() { fActionTime = -2.0 - Random(10); } + // the pantograph setup the .fiz suggests for shunting (AI: ShuntPantstate=, eu07/maszyna#461), 0 when there's none + // or the vehicle isn't shunting + auto const shuntpantographsetup { + ( OrderCurrentGet() & ( Shunt | Loose_shunt ) ) != 0 ? + mvOccupied->AIHintShuntPantstate : + 0 }; + // raise/lower pantographs as needed auto const useregularpantographlayout { pVehicle->Next(coupling::control) == nullptr // standalone @@ -6141,7 +6148,11 @@ TController::control_pantographs() { // jeśli nie trzeba opuszczać pantografów // TODO: check if faction alone reduces frequency enough if( fActionTime > 0.0 ) { - if( mvOccupied->AIHintPantstate == 0 ) { + if( shuntpantographsetup != 0 ) { + // shunting with the pantograph setup the .fiz suggests for it + control_pantographs_setup( shuntpantographsetup ); + } + else if( mvOccupied->AIHintPantstate == 0 ) { // jazda na tylnym if( iDirection >= 0 && useregularpantographlayout ) { // jak jedzie w kierunku sprzęgu 0 @@ -6194,6 +6205,12 @@ TController::control_pantographs() { } } } + else if( shuntpantographsetup != 0 ) { + // shunting with the suggested setup, also while standing, and without raising more pantographs when idling + if( fOverhead2 <= 0.0 && iOverheadDown == 0 ) { + control_pantographs_setup( shuntpantographsetup ); + } + } else { if( !mvOccupied->AIHintPantUpIfIdle || IdleTime <= 45.0 || std::abs(fStopTime) <= 15.0 || mvPantographUnit->EnginePowerSource.CollectorParameters.CollectorsNo <= 1 ) { @@ -6220,6 +6237,31 @@ TController::control_pantographs() { } } +// raises the pantographs of the suggested setup (bit 0: front, bit 1: rear) and lowers the others, these only once +// a pantograph of the setup collects the voltage, so the vehicle doesn't lose its power on the way +void +TController::control_pantographs_setup( int const Setup ) { + + auto const front { ( Setup & 1 << 0 ) != 0 }; + auto const rear { ( Setup & 1 << 1 ) != 0 }; + if( front ) { + cue_action( driver_hint::frontpantographvalveon ); + } + if( rear ) { + cue_action( driver_hint::rearpantographvalveon ); + } + if( auto const setuplive { ( front && mvPantographUnit->PantFrontVolt != 0.0 ) || ( rear && mvPantographUnit->PantRearVolt != 0.0 ) }; + false == setuplive ) { + return; + } + if( false == front ) { + cue_action( driver_hint::frontpantographvalveoff ); + } + if( false == rear ) { + cue_action( driver_hint::rearpantographvalveoff ); + } +} + void TController::control_horns( double const Timedelta ) { // horn control diff --git a/vehicle/Driver.h b/vehicle/Driver.h index f88e115ac..8c661328c 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -320,6 +320,7 @@ private: void scan_obstacles( double const Range ); void control_wheelslip(); void control_pantographs(); + void control_pantographs_setup( int const Setup ); void control_horns( double const Timedelta ); void control_security_system( double const Timedelta ); void control_handles(); From 30bdc3da6139d0e3896aabe61bbb2980c06c7582 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 21:33:28 +0100 Subject: [PATCH 304/430] feat: radio fuse, a cut-off in the radio's power supply (eu07/maszyna#438) TMoverParameters::RadioFuse, closed by default, stands for a fuse in the cabinet, a lever on the desk or the switch on the radio's power supply. RadioPowered() needs it closed, so with it open the radio's buttons, calls, messages and the radio-stop stop working; opening it at a standstill resets the radio-stop as switching the radio off does, and the radio and radio-stop lamps go out. New commands radiofusetoggle/radiofuseenable/radiofusedisable (no default keys), cab controls radiofuse_sw: (follows the fuse state), radiofuseon_sw: and radiofuseoff_sw:, and radio_fuse for the Python screens. The AI turning the radio back on closes the fuse too. Existing vehicles don't change: the fuse starts closed and opens only from a new cab control or a bound key. SVN data, optional: cabs that have such a fuse or lever get one of the new controls in their .mmd, in the form of radio_sw: (e.g. "radiofuse_sw: { rot 0 0 0 }"); lang/*.po can translate "radio fuse". (eu07/maszyna#438) --- McZapkie/MOVER.h | 7 ++++-- McZapkie/Mover.cpp | 2 +- application/driverhints.cpp | 3 ++- input/command.cpp | 6 +++++ input/command.h | 3 +++ input/driverkeyboardinput.cpp | 3 +++ input/drivermouseinput.cpp | 9 +++++++ tests/unit/test_radio.cpp | 30 ++++++++++++++++++++++++ utilities/translation.cpp | 3 +++ vehicle/Driver.cpp | 2 +- vehicle/DynObj.cpp | 3 ++- vehicle/Train.cpp | 44 +++++++++++++++++++++++++++++++++-- vehicle/Train.h | 3 +++ vr/openvr_imp.cpp | 9 +++++++ 14 files changed, 119 insertions(+), 8 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 199c65a0c..b976174ec 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1590,6 +1590,9 @@ class TMoverParameters double EpForce = 0.0; /*Poziom zadanej sily EP*/ bool Signalling = false; /*Czy jest zalaczona sygnalizacja hamowania ostatniego wagonu*/ bool Radio = false; /*Czy jest zalaczony radiotelefon*/ + // the cut-off in the radio's power supply: a fuse in the cabinet, a lever on the desk or the switch on the radio's power + // supply (eu07/maszyna#438). Closed unless the driver opens it, so vehicles without such a switch work as before + bool RadioFuse = true; float NominalBatteryVoltage = 0.f; /*Winger - baterie w elektrykach*/ TDimension Dim; /*wymiary*/ double Cx = 0.0; /*wsp. op. aerodyn.*/ @@ -2473,10 +2476,10 @@ class TMoverParameters auto const oilmanual{OilPump.start_type != start_t::automatic}; return (fuelmanual || oilmanual) && (false == fuelmanual || FuelPump.is_enabled) && (false == oilmanual || OilPump.is_enabled); } - // whether the radio is switched on and has the low voltage to work + // whether the radio is switched on, its power supply isn't cut off and it has the low voltage to work bool RadioPowered() const { - return Radio && (Power24vIsAvailable || Power110vIsAvailable); + return Radio && RadioFuse && (Power24vIsAvailable || Power110vIsAvailable); } /*obrot kol uwzgledniajacy poslizg*/ double ComputeRotatingWheel(double WForce, double dt, double n) const; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 330e8eb8f..dae4996a8 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3145,7 +3145,7 @@ void TMoverParameters::SecuritySystemCheck(double dt) bool isPower = Power24vIsAvailable || Power110vIsAvailable; SecuritySystem.update(dt, Vel, isPower, CabActive); - if (!Battery || !Radio) + if (!Battery || !Radio || !RadioFuse) { // wyłączenie baterii deaktywuje sprzęt RadiostopSwitch(false); } diff --git a/application/driverhints.cpp b/application/driverhints.cpp index bcfd7dbd0..cd1a43b9e 100644 --- a/application/driverhints.cpp +++ b/application/driverhints.cpp @@ -130,12 +130,13 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) case driver_hint::radioon: { if( AIControllFlag ) { mvOccupied->Radio = true; + mvOccupied->RadioFuse = true; } remove_hint( driver_hint::radiooff ); hint( Action, [this](float const /*Parameter*/) { - return mvOccupied->Radio == true; } ); + return mvOccupied->Radio && mvOccupied->RadioFuse; } ); break; } case driver_hint::radiochannel: { diff --git a/input/command.cpp b/input/command.cpp index 0ae67cfa5..574d4dca9 100644 --- a/input/command.cpp +++ b/input/command.cpp @@ -158,6 +158,9 @@ commanddescription_sequence Commands_descriptions = { {"radiovolumeincrease", command_target::vehicle, command_mode::oneoff}, {"radiovolumedecrease", command_target::vehicle, command_mode::oneoff}, {"radiovolumeset", command_target::vehicle, command_mode::oneoff}, + {"radiofusetoggle", command_target::vehicle, command_mode::oneoff}, + {"radiofuseenable", command_target::vehicle, command_mode::oneoff}, + {"radiofusedisable", command_target::vehicle, command_mode::oneoff}, {"cabchangeforward", command_target::vehicle, command_mode::oneoff}, {"cabchangebackward", command_target::vehicle, command_mode::oneoff}, {"modernlightdimmerdecrease", command_target::vehicle, command_mode::oneoff}, @@ -544,6 +547,9 @@ std::unordered_map const commandMap = { {"radiovolumeincrease", user_command::radiovolumeincrease}, {"radiovolumedecrease", user_command::radiovolumedecrease}, {"radiovolumeset", user_command::radiovolumeset}, + {"radiofusetoggle", user_command::radiofusetoggle}, + {"radiofuseenable", user_command::radiofuseenable}, + {"radiofusedisable", user_command::radiofusedisable}, {"cabchangeforward", user_command::cabchangeforward}, {"cabchangebackward", user_command::cabchangebackward}, {"viewturn", user_command::viewturn}, diff --git a/input/command.h b/input/command.h index ddacef4a0..540bfc8f8 100644 --- a/input/command.h +++ b/input/command.h @@ -151,6 +151,9 @@ enum class user_command radiovolumeincrease, radiovolumedecrease, radiovolumeset, + radiofusetoggle, + radiofuseenable, + radiofusedisable, cabchangeforward, cabchangebackward, diff --git a/input/driverkeyboardinput.cpp b/input/driverkeyboardinput.cpp index e7e636b31..047f3678c 100644 --- a/input/driverkeyboardinput.cpp +++ b/input/driverkeyboardinput.cpp @@ -160,6 +160,9 @@ driverkeyboard_input::default_bindings() { // radiovolumeincrease, // radiovolumedecrease, // radiovolumeset, + // radiofusetoggle, + // radiofuseenable, + // radiofusedisable, { cabchangeforward, {GLFW_KEY_HOME, ""} }, { cabchangebackward, {GLFW_KEY_END, ""} }, // viewturn, diff --git a/input/drivermouseinput.cpp b/input/drivermouseinput.cpp index 22562b856..8c9763bf9 100644 --- a/input/drivermouseinput.cpp +++ b/input/drivermouseinput.cpp @@ -783,6 +783,15 @@ drivermouse_input::default_bindings() { { "radiooff_sw:", { radiodisable, none } }, + { "radiofuse_sw:", { + radiofusetoggle, + none } }, + { "radiofuseon_sw:", { + radiofuseenable, + none } }, + { "radiofuseoff_sw:", { + radiofusedisable, + none } }, { "radiochannel_sw:", { radiochannelincrease, radiochanneldecrease } }, diff --git a/tests/unit/test_radio.cpp b/tests/unit/test_radio.cpp index 33a12f72d..b65cc2ced 100644 --- a/tests/unit/test_radio.cpp +++ b/tests/unit/test_radio.cpp @@ -26,3 +26,33 @@ TEST_CASE("radio: a radio switched off or without the low voltage doesn't") { } CHECK_FALSE(vehicle->RadioPowered()); } + +// the cut-off in the radio's power supply (eu07/maszyna#438): a fuse, a desk lever or the switch on the radio's +// power supply, closed unless the driver opens it + +TEST_CASE("radio: the radio fuse is closed by default") { + test::vehicle vehicle{test::definition::load("wagon")}; + CHECK(vehicle->RadioFuse); +} + +TEST_CASE("radio: an opened radio fuse cuts the radio off") { + test::vehicle vehicle{test::definition::load("wagon")}; + vehicle->Radio = true; + vehicle->Power24vIsAvailable = true; + vehicle->RadioFuse = false; + CHECK_FALSE(vehicle->RadioPowered()); + vehicle->RadioFuse = true; + CHECK(vehicle->RadioPowered()); +} + +TEST_CASE("radio: opening the radio fuse at a standstill resets the radio-stop, as switching the radio off does") { + test::vehicle loco{test::definition::fiz("4e_v1/4e")}; + loco->Battery = true; + loco->Radio = true; + REQUIRE(loco->RadiostopSwitch(true)); + loco->SecuritySystemCheck(0.1); + CHECK(loco->RadioStopFlag); + loco->RadioFuse = false; + loco->SecuritySystemCheck(0.1); + CHECK_FALSE(loco->RadioStopFlag); +} diff --git a/utilities/translation.cpp b/utilities/translation.cpp index c0dbeb1a0..16e07d01c 100644 --- a/utilities/translation.cpp +++ b/utilities/translation.cpp @@ -271,6 +271,9 @@ std::string locale::label_cab_control(std::string const &Label) { "converteroff_sw:", STRN("converter") }, { "main_sw:", STRN("line breaker") }, { "radio_sw:", STRN("radio") }, + { "radiofuse_sw:", STRN("radio fuse") }, + { "radiofuseon_sw:", STRN("radio fuse") }, + { "radiofuseoff_sw:", STRN("radio fuse") }, { "radiochannel_sw:", STRN("radio channel") }, { "radiochannelprev_sw:", STRN("radio channel") }, { "radiochannelnext_sw:", STRN("radio channel") }, diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 08f0c0d24..0de55551d 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -6294,7 +6294,7 @@ TController::control_security_system( double const Timedelta ) { } } if( iEngineActive - && false == mvOccupied->Radio + && ( false == mvOccupied->Radio || false == mvOccupied->RadioFuse ) && false == mvOccupied->RadioStopFlag ) { // otherwise if it's safe to do so, turn the radio back on // arbitrary 5 sec delay before switching radio back on diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index d5f60e332..89359fc39 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -7197,7 +7197,8 @@ void TDynamicObject::RadioStop() if( Mechanik ) { // o ile ktoś go prowadzi if( MoverParameters->SecuritySystem.radiostop_available() - && MoverParameters->Radio ) { + && MoverParameters->Radio + && MoverParameters->RadioFuse ) { // jeśli pojazd ma RadioStop i jest on aktywny // HACK cast until math types unification glm::dvec3 pos = static_cast(vPosition); diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index 201b8972f..bc0924ce8 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -485,6 +485,9 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { {user_command::radiovolumeincrease, &TTrain::OnCommand_radiovolumeincrease}, {user_command::radiovolumedecrease, &TTrain::OnCommand_radiovolumedecrease}, {user_command::radiovolumeset, &TTrain::OnCommand_radiovolumeset}, + {user_command::radiofusetoggle, &TTrain::OnCommand_radiofusetoggle}, + {user_command::radiofuseenable, &TTrain::OnCommand_radiofuseenable}, + {user_command::radiofusedisable, &TTrain::OnCommand_radiofusedisable}, {user_command::cabchangeforward, &TTrain::OnCommand_cabchangeforward}, {user_command::cabchangebackward, &TTrain::OnCommand_cabchangebackward}, {user_command::generictoggle0, &TTrain::OnCommand_generictoggle}, @@ -785,6 +788,7 @@ std::shared_ptr TTrain::GetTrainState(dictionary_source const } } dict->insert("radio", mvOccupied->Radio); + dict->insert("radio_fuse", mvOccupied->RadioFuse); dict->insert("radio_channel", RadioChannel()); dict->insert("radio_volume", m_radiovolume); dict->insert("door_lock", mvOccupied->Doors.lock_enabled); @@ -8032,6 +8036,41 @@ void TTrain::OnCommand_radiodisable(TTrain *Train, command_data const &Command) } } +// the cut-off in the radio's power supply (eu07/maszyna#438); opening it works like switching the radio off, the +// radio-stop flag included +void TTrain::OnCommand_radiofusetoggle(TTrain *Train, command_data const &Command) +{ + if (Command.action != GLFW_PRESS) + { + return; + } + + if (Train->mvOccupied->RadioFuse) + { + OnCommand_radiofusedisable(Train, Command); + } + else + { + OnCommand_radiofuseenable(Train, Command); + } +} + +void TTrain::OnCommand_radiofuseenable(TTrain *Train, command_data const &Command) +{ + if (Command.action == GLFW_PRESS) + { + Train->mvOccupied->RadioFuse = true; + } +} + +void TTrain::OnCommand_radiofusedisable(TTrain *Train, command_data const &Command) +{ + if (Command.action == GLFW_PRESS) + { + Train->mvOccupied->RadioFuse = false; + } +} + void TTrain::OnCommand_radiochannelincrease(TTrain *Train, command_data const &Command) { @@ -9053,9 +9092,9 @@ bool TTrain::Update(double const Deltatime) // KURS90 btLampkaMaxSila.Turn(abs(mvControlled->Im) >= 350); btLampkaPrzekrMaxSila.Turn(abs(mvControlled->Im) >= 450); - btLampkaRadio.Turn(mvOccupied->Radio); + btLampkaRadio.Turn(mvOccupied->Radio && mvOccupied->RadioFuse); btLampkaRadioMessage.Turn(radio_message_played); - btLampkaRadioStop.Turn(mvOccupied->Radio && mvOccupied->RadioStopFlag); + btLampkaRadioStop.Turn(mvOccupied->Radio && mvOccupied->RadioFuse && mvOccupied->RadioStopFlag); btLampkaHamulecReczny.Turn(mvOccupied->ManualBrakePos > 0); // NBMX wrzesien 2003 - drzwi oraz sygnał odjazdu if (DynamicObject->Mechanik != nullptr) @@ -11962,6 +12001,7 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con {"pantfrontoff_sw:", &mvPantographUnit->Pantographs[end::front].valve.is_disabled}, {"pantrearoff_sw:", &mvPantographUnit->Pantographs[end::rear].valve.is_disabled}, {"radio_sw:", &mvOccupied->Radio}, + {"radiofuse_sw:", &mvOccupied->RadioFuse}, {"cablight_sw:", &Cabine[iCabn].bLight}, {"springbraketoggle_bt:", &mvOccupied->SpringBrake.Activate}, {"couplingdisconnect_sw:", &m_couplingdisconnect}, diff --git a/vehicle/Train.h b/vehicle/Train.h index 009b349b4..7071bf212 100644 --- a/vehicle/Train.h +++ b/vehicle/Train.h @@ -489,6 +489,9 @@ class TTrain { static void OnCommand_radiovolumeincrease(TTrain *Train, command_data const &Command); static void OnCommand_radiovolumedecrease(TTrain *Train, command_data const &Command); static void OnCommand_radiovolumeset(TTrain *Train, command_data const &Command); + static void OnCommand_radiofusetoggle(TTrain *Train, command_data const &Command); + static void OnCommand_radiofuseenable(TTrain *Train, command_data const &Command); + static void OnCommand_radiofusedisable(TTrain *Train, command_data const &Command); static void OnCommand_cabchangeforward( TTrain *Train, command_data const &Command ); static void OnCommand_cabchangebackward( TTrain *Train, command_data const &Command ); static void OnCommand_generictoggle( TTrain *Train, command_data const &Command ); diff --git a/vr/openvr_imp.cpp b/vr/openvr_imp.cpp index 15467d006..14f901f51 100644 --- a/vr/openvr_imp.cpp +++ b/vr/openvr_imp.cpp @@ -669,6 +669,15 @@ std::unordered_map vr_openvr::m_buttonb { "radiooff_sw:", { user_command::radiodisable, user_command::none } }, + { "radiofuse_sw:", { + user_command::radiofusetoggle, + user_command::none } }, + { "radiofuseon_sw:", { + user_command::radiofuseenable, + user_command::none } }, + { "radiofuseoff_sw:", { + user_command::radiofusedisable, + user_command::none } }, { "radiochannel_sw:", { user_command::radiochannelincrease, user_command::radiochanneldecrease } }, From 292092a7aa63184f62c7ff619b7ea3c2385cceff Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Sat, 7 Nov 2026 21:40:02 +0100 Subject: [PATCH 305/430] AI braking: take care of the Sonar remarks on the new braking code No change in what the AI does; only the structure of the code that came in with the braking changes: - S107: shaped_braking_demand() takes the consist brake table as a struct instead of four separate parameters; its lambdas capture explicitly. - S3358: brake_response_horizon() picks the BrakeDelay entry without a nested conditional operator. - S5276: the speed passed to braking_distance_multiplier() is converted to float explicitly, as it was implicitly before. - S134: the stop case of the proximity range is an else-if of its own, and its body a method of its own, adjust_desired_speed_for_final_approach(), with early returns instead of nested ifs. The cargo train threshold push is a conditional subtraction instead of a nested if. - S3776: pick_optimal_speed() hands the uncoupling stages and the uphill stand to set_velocity_for_uncoupling() and hold_train_coming_to_stand_uphill(). --- vehicle/Driver.cpp | 257 ++++++++++++++++++++++++--------------------- vehicle/Driver.h | 3 + 2 files changed, 141 insertions(+), 119 deletions(-) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 303560e98..cbdd97c62 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -7239,6 +7239,59 @@ TController::handle_orders() { UpdateChangeDirection(); } +// the stages of uncoupling: each one sets the speed for the next +void +TController::set_velocity_for_uncoupling() { + + if( iVehicleCount < 0 ) { + // 4th stage: restore initial direction + if( ( iDrivigFlags & movePress ) != 0 ) { + SetVelocity( 0, 0, stopJoin ); + } + return; + } + // 3rd stage: compress buffers and uncouple + if( ( iDrivigFlags & movePress ) != 0 && iDirection == iDirectionOrder ) { + SetVelocity( 2, 0 ); // jazda w ustawionym kierunku z prędkością 2 + return; + } + // 1st stage: bring it to stop + // 2nd stage: apply consist brakes and change direction + SetVelocity( 0, 0, stopJoin ); +} + +// uphill, the gradient alone brings a slow train to a stand within metres, far sooner than a released +// brake applies; so the train brake goes on while the train is coming to a stand, stays on while it +// stands, and is applied for real if the train has started to roll back +void +TController::hold_train_coming_to_stand_uphill() { + + if( ( false == is_train() ) + || ( ( OrderCurrentGet() & Obey_train ) == 0 ) + || ( VelNext != 0.0 ) + || ( ActualProximityDist > fMaxProximityDist ) + || ( fAccGravity >= -0.025 ) ) { + return; + } + auto const vel { DirectionalVel() }; + if( std::abs( vel ) < EU07_AI_NOMOVEMENT ) { + VelDesired = 0.0; + AccDesired = std::min( AccDesired, EU07_AI_NOACCELERATION ); + return; + } + if( ( vel < 0.0 ) + || ( ( vel < 5.0 ) && ( AccDesired < 0.0 ) ) + // rolling to a stand on the gradient alone, the brake has to be on its way before the train stops: + // once the time left to the stand is no longer than half of what the brake takes to apply, apply it; any + // sooner and the brake takes off more of the distance than the stop was planned with + || ( ( BrakeSystem == TBrakeSystem::Pneumatic ) + && ( vel / 3.6 / -fAccGravity <= 0.5 * brake_response_horizon( mvOccupied, BrakeSystem, 1.0, fBrake_a0[ 0 ] ) ) ) ) { + // the gradient alone already slows the train down nearly this much; ask for enough on top of it that + // the brake is applied for sure, not held back by the margin against small corrections + AccDesired = std::min( AccDesired, fAccGravity - std::max( 0.15, fBrake_a0[ 0 ] ) - brake_increase_margin() ); + } +} + void TController::pick_optimal_speed( double const Range ) { @@ -7274,23 +7327,7 @@ TController::pick_optimal_speed( double const Range ) { } // uncoupling mode changes velocity/acceleration between stages if( ( OrderCurrentGet() & Disconnect ) != 0 ) { - if( iVehicleCount >= 0 ) { - // 3rd stage: compress buffers and uncouple - if( (iDrivigFlags & movePress) != 0 && iDirection == iDirectionOrder ) { - SetVelocity( 2, 0 ); // jazda w ustawionym kierunku z prędkością 2 - } - // 1st stage: bring it to stop - // 2nd stage: apply consist brakes and change direction - else { - SetVelocity( 0, 0, stopJoin ); - } - } - else { - // 4th stage: restore initial direction - if( ( iDrivigFlags & movePress ) != 0 ) { - SetVelocity( 0, 0, stopJoin ); - } - } + set_velocity_for_uncoupling(); } VelLimitLastDist = { VelDesired, -1 }; @@ -7343,32 +7380,8 @@ TController::pick_optimal_speed( double const Range ) { is_car() ? -2.0 : -0.9, is_car() ? 2.0 : 0.9 ); - if( is_train() - && ( ( OrderCurrentGet() & Obey_train ) != 0 ) - && ( VelNext == 0.0 ) - && ( ActualProximityDist <= fMaxProximityDist ) - && ( fAccGravity < -0.025 ) ) { - // uphill, the gradient alone brings a slow train to a stand within metres, far sooner than a released - // brake applies; so the train brake goes on while the train is coming to a stand, stays on while it - // stands, and is applied for real if the train has started to roll back. done last, so that none of - // the adjustments above, made for a train moving forward, can undo it - auto const vel { DirectionalVel() }; - if( std::abs( vel ) < EU07_AI_NOMOVEMENT ) { - VelDesired = 0.0; - AccDesired = std::min( AccDesired, EU07_AI_NOACCELERATION ); - } - else if( ( vel < 0.0 ) - || ( ( vel < 5.0 ) && ( AccDesired < 0.0 ) ) - // rolling to a stand on the gradient alone, the brake has to be on its way before the train stops: - // once the time left to the stand is no longer than half of what the brake takes to apply, apply it; any - // sooner and the brake takes off more of the distance than the stop was planned with - || ( ( BrakeSystem == TBrakeSystem::Pneumatic ) - && ( vel / 3.6 / -fAccGravity <= 0.5 * brake_response_horizon( mvOccupied, BrakeSystem, 1.0, fBrake_a0[ 0 ] ) ) ) ) { - // the gradient alone already slows the train down nearly this much; ask for enough on top of it that - // the brake is applied for sure, not held back by the margin against small corrections - AccDesired = std::min( AccDesired, fAccGravity - std::max( 0.15, fBrake_a0[ 0 ] ) - brake_increase_margin() ); - } - } + // done last, so that none of the adjustments above, made for a train moving forward, can undo it + hold_train_coming_to_stand_uphill(); // if the route ahead is blocked we might need to head the other way check_route_behind( 1000 ); // NOTE: legacy scan range value @@ -7543,13 +7556,10 @@ brake_response_horizon( TMoverParameters const *Vehicle, TBrakeSystem const Brak auto horizon { ( 1.0 - Brakea0 ) * 30.0 / 3.6 }; if( Brakesystem == TBrakeSystem::Pneumatic ) { + // BrakeDelay holds the release and the application time in G, then the same two in P + auto const delays { Vehicle->BrakeDelayFlag > bdelay_G ? 0 : 2 }; auto const isrelease { Acceleration < 0.0 }; - horizon = std::max( - horizon, - 0.5 * ( - Vehicle->BrakeDelayFlag > bdelay_G ? - Vehicle->BrakeDelay[ isrelease ? 0 : 1 ] : - Vehicle->BrakeDelay[ isrelease ? 2 : 3 ] ) ); + horizon = std::max( horizon, 0.5 * Vehicle->BrakeDelay[ delays + ( isrelease ? 0 : 1 ) ] ); } return horizon; } @@ -7569,15 +7579,26 @@ uphill_coasting_speed( double const Distance, double const Gravity ) { // resultant acceleration [m/s2] to ask for now so that a steady application of the pneumatic brake takes the train // from Velocity down to Target [km/h] over Distance [m], with the brake force following the speed the way the // consist brake table says it does (cast iron blocks grip harder as the train slows) +struct consist_brake_table { + double const *a0; // deceleration at handle position 1, by speed + double const *a1; // deceleration added by each quarter of a position, by speed + int size; // entries, up to the vehicle's top speed + double vmax; // the vehicle's top speed [km/h] + + // deceleration [m/s2] of a full service application at Kmh + double full_braking( double const Kmh ) const { + auto const index { std::clamp( static_cast( size * Kmh / std::max( 1.0, vmax ) ), 1, size ) }; + return std::max( 0.01, a0[ index ] + 12.0 * a1[ index ] ); } +}; + static double shaped_braking_demand( double const Velocity, double const Target, double const Distance, double const Gravity, - double const Vmax, double const *Brakea0, double const *Brakea1, int const Tablesize ) { + consist_brake_table const &Table ) { - auto const fullbraking = [&]( double const Kmh ) { - auto const index { std::clamp( static_cast( Tablesize * Kmh / std::max( 1.0, Vmax ) ), 1, Tablesize ) }; - return std::max( 0.01, Brakea0[ index ] + 12.0 * Brakea1[ index ] ); }; - auto const travel = [&]( double const Ratio ) { + auto const fullbraking = [&Table]( double const Kmh ) { + return Table.full_braking( Kmh ); }; + auto const travel = [Velocity, Target, Gravity, &fullbraking]( double const Ratio ) { auto const steps { 24 }; auto const step { ( Velocity - Target ) / steps }; auto distance { 0.0 }; @@ -7603,6 +7624,53 @@ shaped_braking_demand( return Gravity - high * fullbraking( Velocity ); } +// the final approach to a stop, inside the proximity range: Vel is the present speed in the direction of travel +void +TController::adjust_desired_speed_for_final_approach( double const Vel ) { + + if( ( mvOccupied->CategoryFlag & 1 ) == 0 ) { + // for cars (and others) coast at low speed until we hit min proximity range + VelDesired = min_speed( VelDesired, 5.0 ); + return; + } + // trains + if( ( OrderCurrentGet() & ( Shunt | Connect ) ) + && ( Obstacle.distance < 50 ) ) { + // crude detection of edge case, if approaching another vehicle coast slowly until min distance + // this should allow to bunch up trainsets more on sidings + VelDesired = min_speed( 5.0, VelDesired ); + return; + } + // hamowanie tak, aby stanąć + if( ( OrderCurrentGet() & Obey_train ) == 0 ) { + VelDesired = VelNext; + AccDesired = ( VelNext * VelNext - Vel * Vel ) / ( 25.92 * ( ActualProximityDist + 0.1 - 0.5*fMinProximityDist ) ); + AccDesired = std::min( AccDesired, fAccThreshold ); + return; + } + // a train keeps its desired speed until the lower edge of the stopping window (a desired + // speed of 0 here asks for hard braking whatever the distance left), aims at the middle + // of the window, and asks only for what that takes + auto const stoppingroom { std::max( 0.5, ActualProximityDist - stopping_margin() ) }; + AccDesired = ( + BrakeSystem == TBrakeSystem::Pneumatic ? + // cast iron blocks grip harder as the train comes to a stand + shaped_braking_demand( + Vel, VelNext, stoppingroom, fAccGravity, + { fBrake_a0, fBrake_a1, BrakeAccTableSize, mvOccupied->Vmax } ) : + ( VelNext * VelNext - Vel * Vel ) / ( 25.92 * stoppingroom ) ); + if( ( fAccGravity < -0.025 ) + && ( AccDesired >= fAccGravity - 0.001 ) // no brake needed at all + && ( false == uphill_brake_committed( Vel ) ) + && ( ActualProximityDist - uphill_stopping_distance( Vel, fAccGravity ) > stopping_margin() ) ) { + // uphill the gradient alone would bring the train to a stand short of the + // middle of the stopping window; keep it rolling at the present speed until that changes, + // but no faster than the gradient alone can take off by the middle of the window + AccDesired = std::min( 0.0, AccPreferred ); + VelDesired = min_speed( VelDesired, uphill_coasting_speed( ActualProximityDist - stopping_margin(), fAccGravity ) ); + } +} + void TController::adjust_desired_speed_for_target_speed( double const Range ) { // ustalanie zadanego przyspieszenia @@ -7634,65 +7702,20 @@ TController::adjust_desired_speed_for_target_speed( double const Range ) { AccDesired = AccPreferred; } } + else if( ( ActualProximityDist > fMinProximityDist ) + // only a stop has a final approach of its own inside the proximity range; a lower speed ahead + // keeps the braking curve below right up to where it begins, or the train would stop braking + // (and even take power) that far out + && ( VelNext == 0.0 ) + && ( ActualProximityDist < fMaxProximityDist ) ) { + // jedzie szybciej, niż trzeba na końcu ActualProximityDist, ale jeszcze jest daleko + // jak minął już maksymalny dystans po prostu hamuj (niski stopień) + // ma stanąć, a jest w drodze hamowania albo ma jechać + adjust_desired_speed_for_final_approach( vel ); + AccDesired = std::min( AccDesired, AccPreferred ); + } else if (ActualProximityDist > fMinProximityDist) { // jedzie szybciej, niż trzeba na końcu ActualProximityDist, ale jeszcze jest daleko - // only a stop has a final approach of its own inside the proximity range; a lower speed ahead - // keeps the braking curve below right up to where it begins, or the train would stop braking - // (and even take power) that far out - if( ( VelNext == 0.0 ) && ( ActualProximityDist < fMaxProximityDist ) ) { - // jak minął już maksymalny dystans po prostu hamuj (niski stopień) - // ma stanąć, a jest w drodze hamowania albo ma jechać -/* - VelDesired = min_speed( VelDesired, VelNext ); -*/ - if( VelNext == 0.0 ) { - if( mvOccupied->CategoryFlag & 1 ) { - // trains - if( OrderCurrentGet() & (Shunt | Connect) - && Obstacle.distance < 50 ) { - // crude detection of edge case, if approaching another vehicle coast slowly until min distance - // this should allow to bunch up trainsets more on sidings - VelDesired = min_speed( 5.0, VelDesired ); - } - else { - // hamowanie tak, aby stanąć - if( ( OrderCurrentGet() & Obey_train ) == 0 ) { - VelDesired = VelNext; - AccDesired = ( VelNext * VelNext - vel * vel ) / ( 25.92 * ( ActualProximityDist + 0.1 - 0.5*fMinProximityDist ) ); - AccDesired = std::min( AccDesired, fAccThreshold ); - } - else { - // a train keeps its desired speed until the lower edge of the stopping window (a desired - // speed of 0 here asks for hard braking whatever the distance left), aims at the middle - // of the window, and asks only for what that takes - auto const stoppingroom { std::max( 0.5, ActualProximityDist - stopping_margin() ) }; - AccDesired = ( - BrakeSystem == TBrakeSystem::Pneumatic ? - // cast iron blocks grip harder as the train comes to a stand - shaped_braking_demand( - vel, VelNext, stoppingroom, fAccGravity, - mvOccupied->Vmax, fBrake_a0, fBrake_a1, BrakeAccTableSize ) : - ( VelNext * VelNext - vel * vel ) / ( 25.92 * stoppingroom ) ); - if( ( fAccGravity < -0.025 ) - && ( AccDesired >= fAccGravity - 0.001 ) // no brake needed at all - && ( false == uphill_brake_committed( vel ) ) - && ( ActualProximityDist - uphill_stopping_distance( vel, fAccGravity ) > stopping_margin() ) ) { - // uphill the gradient alone would bring the train to a stand short of the - // middle of the stopping window; keep it rolling at the present speed until that changes, - // but no faster than the gradient alone can take off by the middle of the window - AccDesired = std::min( 0.0, AccPreferred ); - VelDesired = min_speed( VelDesired, uphill_coasting_speed( ActualProximityDist - stopping_margin(), fAccGravity ) ); - } - } - } - } - else { - // for cars (and others) coast at low speed until we hit min proximity range - VelDesired = min_speed( VelDesired, 5.0 ); - } - } - } - else { // outside of max safe range AccDesired = AccPreferred; if( vel > min_speed( ActualProximityDist > 10.0 ? 10.0 : 5.0, VelDesired ) ) { @@ -7710,7 +7733,7 @@ TController::adjust_desired_speed_for_target_speed( double const Range ) { auto const brakingpointoffset = ( ( VelNext == 0.0 ) && is_train() && ( OrderCurrentGet() & Obey_train ) ? stopping_margin() : // the same stopping point as the final approach - VelNext * braking_distance_multiplier( VelNext ) ); + VelNext * braking_distance_multiplier( static_cast( VelNext ) ) ); // a pneumatic brake acts on the state the train will be in once it has responded; while the // train is still speeding up, plan the deceleration from there, so more is asked for at once auto velocity { vel }; @@ -7741,7 +7764,7 @@ TController::adjust_desired_speed_for_target_speed( double const Range ) { } deceleration = shaped_braking_demand( velocity, VelNext, room + 0.1 / 25.92, fAccGravity, - mvOccupied->Vmax, fBrake_a0, fBrake_a1, BrakeAccTableSize ); + { fBrake_a0, fBrake_a1, BrakeAccTableSize, mvOccupied->Vmax } ); } AccDesired = std::min( AccDesired, deceleration ); // najpierw hamuje mocniej, potem zluzuje if( vel > VelNext ) { @@ -7761,7 +7784,6 @@ TController::adjust_desired_speed_for_target_speed( double const Range ) { } } } - } AccDesired = std::min( AccDesired, AccPreferred ); } else { @@ -7885,11 +7907,8 @@ TController::adjust_desired_speed_for_current_speed() { -0.05 + fAccThreshold, std::max( EU07_AI_NOACCELERATION, AccPreferred ) ) ); // HACK: for cargo trains with high braking threshold ensure we cross that threshold - if( IsCargoTrain - && fBrake_a0[0] > 0.2 - && speedestimate > holdlimit ) { - AccDesired -= std::clamp( fBrake_a0[ 0 ] - 0.2, 0.0, 0.15 ); - } + auto const crossthreshold { IsCargoTrain && fBrake_a0[ 0 ] > 0.2 && speedestimate > holdlimit }; + AccDesired -= ( crossthreshold ? std::clamp( fBrake_a0[ 0 ] - 0.2, 0.0, 0.15 ) : 0.0 ); } // final tweaks if( vel > EU07_AI_NOMOVEMENT ) { diff --git a/vehicle/Driver.h b/vehicle/Driver.h index 895e638c5..846923df2 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -349,6 +349,9 @@ private: void pick_optimal_speed( double const Range ); void adjust_desired_speed_for_obstacles(); void adjust_desired_speed_for_limits(); + void set_velocity_for_uncoupling(); + void hold_train_coming_to_stand_uphill(); + void adjust_desired_speed_for_final_approach( double const Vel ); void adjust_desired_speed_for_target_speed( double const Range ); void adjust_desired_speed_for_current_speed(); void adjust_desired_speed_for_braking_test(); From 636d29eb228f8ccb5737cb558168be45bd8a10f8 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 21:53:25 +0100 Subject: [PATCH 306/430] fix: AI wagon inspector sets G/P/R by the instruction Cw-1 (eu07/maszyna#350) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The brake settings the AI chooses for a train (TController::AutoRewident) now follow Cw-1 (Mw56) §18 and §19: - freight trains: the 500 m / 1300 t and 300 m / 600 t limits apply to the wagons without the locomotives, limits included; - long locomotive setting: the five wagons on G are counted from the head of the train, not again after every locomotive in it; - a vehicle without the setting the train needs gets the other of G and P; - passenger trains run on R only with at most three cars on P, fewer than those on R; cars with a magnetic rail brake run on R+Mg. The choice moves to vehicle/brakesetting.{h,cpp} in eu07_core, with unit tests. The old inspector stays behind the new eu07.ini key ai.brakesetting.cw1 (default yes; no restores the earlier behaviour). No game data changes needed. (eu07/maszyna#350) --- CMakeLists.txt | 1 + tests/unit/test_brake_setting.cpp | 171 +++++++++++++++++++++++ utilities/Globals.cpp | 7 + utilities/Globals.h | 1 + vehicle/Driver.cpp | 123 ++++------------- vehicle/brakesetting.cpp | 216 ++++++++++++++++++++++++++++++ vehicle/brakesetting.h | 57 ++++++++ 7 files changed, 477 insertions(+), 99 deletions(-) create mode 100644 tests/unit/test_brake_setting.cpp create mode 100644 vehicle/brakesetting.cpp create mode 100644 vehicle/brakesetting.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f34ad61f..c8422e62f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -462,6 +462,7 @@ set(CORE_SOURCES "utilities/parser.cpp" "utilities/utilities.cpp" "scripting/ladderlogic.cpp" +"vehicle/brakesetting.cpp" "vehicle/handover.cpp" "vehicle/horn.cpp" "vehicle/smoke.cpp" diff --git a/tests/unit/test_brake_setting.cpp b/tests/unit/test_brake_setting.cpp new file mode 100644 index 000000000..7e598ad6e --- /dev/null +++ b/tests/unit/test_brake_setting.cpp @@ -0,0 +1,171 @@ +#include "stdafx.h" +#include "doctest.h" + +#include "McZapkie/hamulce.h" +#include "vehicle/brakesetting.h" + +// the brake settings the AI wagon inspector (TController::AutoRewident) chooses for a train, by the +// brake instruction Cw-1 (Mw56) §18 and §19 (eu07/maszyna#350) + +namespace { + +using brake_setting::train_setting; + +constexpr int G{bdelay_G}; +constexpr int P{bdelay_P}; +constexpr int R{bdelay_R}; +constexpr int M{bdelay_M}; + +brake_setting::vehicle locomotive(int const Delays = G | P | R) { + return {Delays, true, 17.0, 80000.0}; +} +// a freight wagon of the given length [m] and mass [t] +brake_setting::vehicle freight_wagon(double const Length = 15.0, double const Tonnes = 80.0) { + return {G | P, false, Length, Tonnes * 1000.0}; +} +brake_setting::vehicle passenger_car(int const Delays = P | R) { + return {Delays, false, 24.5, 45000.0}; +} + +std::vector train(brake_setting::vehicle const &Locomotive, int const Count, brake_setting::vehicle const &Wagon) { + std::vector consist{Locomotive}; + consist.insert(consist.end(), Count, Wagon); + return consist; +} + +} // namespace + +TEST_CASE("brake setting: a freight train runs on P only up to 500 m and 1300 t of wagons (Cw-1 §19.2)") { + // 25 wagons of 20 m and 52 t: 500 m and 1300 t exactly, the limits included + CHECK(brake_setting::choose_train_setting(train(locomotive(), 25, freight_wagon(20.0, 52.0))) == train_setting::freight_gp); + // one metre longer + CHECK(brake_setting::choose_train_setting(train(locomotive(), 25, freight_wagon(20.04, 52.0))) == train_setting::freight_g); + // one tonne heavier + CHECK(brake_setting::choose_train_setting(train(locomotive(), 25, freight_wagon(20.0, 52.04))) == train_setting::freight_g); +} + +TEST_CASE("brake setting: the locomotives don't count into the length and mass of a freight train's wagons") { + // 300 m and 600 t of wagons behind two locomotives of 80 t: all the wagons on P (Cw-1 §19.3a) + auto consist{train(locomotive(), 20, freight_wagon(15.0, 30.0))}; + consist.insert(consist.begin(), locomotive()); + CHECK(brake_setting::choose_train_setting(consist) == train_setting::freight_p); + auto const settings{brake_setting::choose(consist)}; + CHECK(settings[0] == G); + CHECK(settings[1] == G); + for (std::size_t i = 2; i < settings.size(); ++i) { + CAPTURE(i); + CHECK(settings[i] == P); + } + // a wagon more makes it the long locomotive setting (Cw-1 §19.3b) + consist.emplace_back(freight_wagon(15.0, 30.0)); + CHECK(brake_setting::choose_train_setting(consist) == train_setting::freight_gp); +} + +TEST_CASE("brake setting: the locomotive and the first five wagons on G, the rest on P (Cw-1 §19.3b)") { + auto const consist{train(locomotive(), 12, freight_wagon(15.0, 60.0))}; + REQUIRE(brake_setting::choose_train_setting(consist) == train_setting::freight_gp); + auto const settings{brake_setting::choose(consist)}; + REQUIRE(settings.size() == consist.size()); + for (std::size_t i = 0; i < settings.size(); ++i) { + CAPTURE(i); + CHECK(settings[i] == (i <= 5 ? G : P)); + } +} + +TEST_CASE("brake setting: a locomotive in the middle of the train doesn't put five more wagons on G") { + auto consist{train(locomotive(), 8, freight_wagon(15.0, 60.0))}; + consist.emplace_back(locomotive()); + consist.insert(consist.end(), 8, freight_wagon(15.0, 60.0)); + REQUIRE(brake_setting::choose_train_setting(consist) == train_setting::freight_gp); + auto const settings{brake_setting::choose(consist)}; + CHECK(settings[1] == G); + CHECK(settings[5] == G); + CHECK(settings[6] == P); + CHECK(settings[9] == G); // the locomotive + CHECK(settings[10] == P); + + // the inspector of the earlier releases started counting anew at it + auto const legacy{brake_setting::choose_legacy(consist)}; + CHECK(legacy[10] == G); + CHECK(legacy[14] == G); + CHECK(legacy[15] == P); +} + +TEST_CASE("brake setting: a heavy freight train runs on G, a vehicle without G on P") { + auto consist{train(locomotive(), 30, freight_wagon(15.0, 80.0))}; + consist.emplace_back(passenger_car(P)); + REQUIRE(brake_setting::choose_train_setting(consist) == train_setting::freight_g); + auto const settings{brake_setting::choose(consist)}; + for (std::size_t i = 0; i + 1 < settings.size(); ++i) { + CAPTURE(i); + CHECK(settings[i] == G); + } + CHECK(settings.back() == P); +} + +TEST_CASE("brake setting: a vehicle without the setting the train needs gets the other one of G and P") { + // a light freight train with a wagon which has G only + auto consist{train(locomotive(), 4, freight_wagon(15.0, 20.0))}; + consist.emplace_back(G, false, 15.0, 20000.0); + REQUIRE(brake_setting::choose_train_setting(consist) == train_setting::freight_p); + CHECK(brake_setting::choose(consist).back() == G); + // and a vehicle with neither is left alone + consist.emplace_back(R, false, 15.0, 20000.0); + CHECK(brake_setting::choose(consist).back() == 0); +} + +TEST_CASE("brake setting: a passenger train on R carries at most three cars on P, fewer than those on R (Cw-1 §18.3)") { + auto consist{train(locomotive(), 4, passenger_car())}; + consist.insert(consist.end(), 3, passenger_car(P)); + CHECK(brake_setting::choose_train_setting(consist) == train_setting::passenger_r); + auto const settings{brake_setting::choose(consist)}; + CHECK(settings[0] == R); + CHECK(settings[1] == R); + CHECK(settings.back() == P); + + // as many cars on P as on R: all on P + consist.emplace_back(passenger_car(P)); + CHECK(brake_setting::choose_train_setting(consist) == train_setting::passenger_p); + for (auto const setting : brake_setting::choose(consist)) { + CHECK(setting == P); + } + // the inspector of the earlier releases kept such a train on R + CHECK(brake_setting::choose_legacy(consist)[1] == R); + + // four cars on P are too many even with more on R + consist.insert(consist.end(), 6, passenger_car()); + CHECK(brake_setting::choose_train_setting(consist) == train_setting::passenger_p); +} + +TEST_CASE("brake setting: freight wagons in a passenger train on R count as cars on P (Cw-1 §18.4)") { + auto consist{train(locomotive(), 6, passenger_car())}; + consist.emplace_back(freight_wagon()); + REQUIRE(brake_setting::choose_train_setting(consist) == train_setting::passenger_r); + CHECK(brake_setting::choose(consist).back() == P); +} + +TEST_CASE("brake setting: cars with a magnetic rail brake run on R+Mg in a train on R (Cw-1 §18.2)") { + auto consist{train(locomotive(G | P | R | M), 3, passenger_car(P | R | M))}; + consist.emplace_back(passenger_car()); + REQUIRE(brake_setting::choose_train_setting(consist) == train_setting::passenger_r); + auto const settings{brake_setting::choose(consist)}; + CHECK(settings[0] == R); // the locomotive stays on R + CHECK(settings[1] == (R | M)); + CHECK(settings.back() == R); +} + +TEST_CASE("brake setting: a light engine runs on R where it has it") { + std::vector const consist{locomotive(), locomotive(G | P)}; + CHECK(brake_setting::choose_train_setting(consist) == train_setting::light_engine); + auto const settings{brake_setting::choose(consist)}; + CHECK(settings[0] == R); + CHECK(settings[1] == P); +} + +TEST_CASE("brake setting: the inspector of the earlier releases counted the locomotives into the train's mass") { + // 300 m and 600 t of wagons: P by Cw-1, the long locomotive setting before + auto const consist{train(locomotive(), 20, freight_wagon(15.0, 30.0))}; + CHECK(brake_setting::choose(consist)[1] == P); + CHECK(brake_setting::choose_legacy(consist)[1] == G); + CHECK(brake_setting::choose_legacy(consist)[6] == P); +} diff --git a/utilities/Globals.cpp b/utilities/Globals.cpp index b4f2e14be..9a3c81fc2 100644 --- a/utilities/Globals.cpp +++ b/utilities/Globals.cpp @@ -699,6 +699,12 @@ bool global_settings::ConfigParseSimulation(cParser& Parser, const std::string& return true; } + if (token == "ai.brakesetting.cw1") + { + ParseOne(Parser, AIBrakeSettingCw1, 1, false); + return true; + } + if (token == "pause") { std::string value; @@ -1590,6 +1596,7 @@ global_settings::export_as_text( std::ostream &Output ) const { export_as_text( Output, "scenario.time.current", ScenarioTimeCurrent ); export_as_text( Output, "scenario.weather.temperature", AirTemperature ); export_as_text( Output, "ai.trainman", AITrainman ); + export_as_text( Output, "ai.brakesetting.cw1", AIBrakeSettingCw1 ); export_as_text( Output, "scalespeculars", ScaleSpecularValues ); export_as_text( Output, "gfxrenderer", GfxRenderer ); export_as_text( Output, "shadows", RenderShadows ); diff --git a/utilities/Globals.h b/utilities/Globals.h index ad216cd96..31510aa34 100644 --- a/utilities/Globals.h +++ b/utilities/Globals.h @@ -130,6 +130,7 @@ struct global_settings { bool bJoinEvents{ false }; // czy grupować eventy o tych samych nazwach int iHiddenEvents{ 1 }; // czy łączyć eventy z torami poprzez nazwę toru bool AITrainman{ true }; // virtual assistant performing consist coupling/decoupling and other maintenance tasks + bool AIBrakeSettingCw1{ true }; // ai.brakesetting.cw1: the AI wagon inspector sets the brakes (G/P/R/Mg) by the instruction Cw-1, no: as before eu07/maszyna#350 // ui int PythonScreenUpdateRate{ 200 }; // delay between python-based screen updates, in milliseconds int iTextMode{ 0 }; // tryb pracy wyświetlacza tekstowego diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 9f83b6d53..db6a8b7fd 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -19,6 +19,7 @@ http://mozilla.org/MPL/2.0/. #include "utilities/translation.h" #include "utilities/Logs.h" #include "vehicle/Train.h" +#include "vehicle/brakesetting.h" #include "vehicle/handover.h" #include "world/mtable.h" #include "vehicle/DynObj.h" @@ -2080,106 +2081,30 @@ void TController::Activation() void TController::AutoRewident() { // autorewident: nastawianie hamulców w składzie - int r = 0, g = 0, p = 0; // ilości wagonów poszczególnych typów - TDynamicObject *d = pVehicles[0]; // pojazd na czele składu - // 1. Zebranie informacji o składzie pociągu — przejście wzdłuż składu i odczyt parametrów: - // · ilość wagonów -> są zliczane, wszystkich pojazdów jest (iVehicles) - // · długość (jako suma) -> jest w (fLength) - // · masa (jako suma) -> jest w (fMass) - while (d) - { // klasyfikacja pojazdów wg BrakeDelays i mocy (licznik) - if (d->MoverParameters->Power < 1) // - lokomotywa - Power>1 - ale może być nieczynna na końcu... - if (TestFlag(d->MoverParameters->BrakeDelays, bdelay_R)) - ++r; // - wagon pospieszny - jest R - else if (TestFlag(d->MoverParameters->BrakeDelays, bdelay_G)) - ++g; // - wagon towarowy - jest G (nie ma R) - else - ++p; // - wagon osobowy - reszta (bez G i bez R) - d = d->Next(); // kolejny pojazd, podłączony od tyłu (licząc od czoła) + // 1. Zebranie informacji o składzie pociągu, od czoła do końca + std::vector consist; + for (auto const *d = pVehicles[0]; d != nullptr; d = d->Next()) { + auto const *mover{d->MoverParameters}; + // a locomotive has Power > 1, though it may be a dead one at the end of the train + consist.emplace_back(mover->BrakeDelays, mover->Power >= 1.0, mover->Dim.L, mover->TotalMass); } - // 2. Określenie typu pociągu i nastawy: - int ustaw; //+16 dla pasażerskiego - if (r + g + p == 0) - ustaw = 16 + bdelay_R; // lokomotywa luzem (może być wieloczłonowa) - else - { // jeśli są wagony - ustaw = g < std::min(4, r + p) ? 16 : 0; - if (ustaw) // jeśli towarowe < Min(4, pospieszne+osobowe) - { // to skład pasażerski - nastawianie pasażerskiego - ustaw += g && r < g + p ? bdelay_P : bdelay_R; - // jeżeli towarowe>0 oraz pospiesze<=towarowe+osobowe to P (0) - // inaczej R (2) - } - else - { // inaczej towarowy - nastawianie towarowego - if (fLength < 300.0 && fMass < 600000.0) //[kg] - ustaw |= bdelay_P; // jeżeli długość<300 oraz masa<600 to P (0) - else if (fLength < 500.0 && fMass < 1300000.0) - ustaw |= bdelay_R; // jeżeli długość<500 oraz masa<1300 to GP (2) - else - ustaw |= bdelay_G; // inaczej G (1) - } - // zasadniczo na sieci PKP kilka lat temu na P/GP jeździły tylko kontenerowce o - // rozkładowej 90 km/h. Pozostałe jeździły 70 km/h i były nastawione na G. - } - d = pVehicles[0]; // pojazd na czele składu - p = 0; // będziemy tu liczyć wagony od lokomotywy dla nastawy GP - while (d) - { // 3. Nastawianie - if( true == AIControllFlag - || d != pVehicle ) { + // 2. Określenie typu pociągu i nastaw: by the brake instruction Cw-1 (eu07/maszyna#350), or as the releases before it did + auto const settings{Global.AIBrakeSettingCw1 ? brake_setting::choose(consist) : brake_setting::choose_legacy(consist)}; + // a light engine counts as a passenger train for the braking below + auto const passengertrain{brake_setting::passenger(brake_setting::choose_train_setting(consist))}; + // 3. Nastawianie + auto setting{settings.begin()}; + for (auto *d = pVehicles[0]; d != nullptr && setting != settings.end(); d = d->Next(), ++setting) { + if (false == AIControllFlag && d == pVehicle) { // don't touch human-controlled vehicle, but others are free game - switch( ustaw ) { - - case bdelay_P: { - // towarowy P - lokomotywa na G, reszta na P. - d->MoverParameters->BrakeDelaySwitch( - d->MoverParameters->Power > 1 ? - bdelay_G : - bdelay_P ); - break; - } - case bdelay_G: { - // towarowy G - wszystko na G, jeśli nie ma to P (powinno się wyłączyć hamulec) - d->MoverParameters->BrakeDelaySwitch( - TestFlag( d->MoverParameters->BrakeDelays, bdelay_G ) ? - bdelay_G : - bdelay_P ); - break; - } - case bdelay_R: { - // towarowy GP - lokomotywa oraz 5 pierwszych pojazdów przy niej na G, reszta na P - if( d->MoverParameters->Power > 1 ) { - d->MoverParameters->BrakeDelaySwitch( bdelay_G ); - p = 0; // a jak będzie druga w środku? - } - else { - d->MoverParameters->BrakeDelaySwitch( - ++p <= 5 ? - bdelay_G : - bdelay_P ); - } - break; - } - case 16 + bdelay_R: { - // pasażerski R - na R, jeśli nie ma to P - d->MoverParameters->BrakeDelaySwitch( - TestFlag( d->MoverParameters->BrakeDelays, bdelay_R ) ? - bdelay_R : - bdelay_P ); - break; - } - case 16 + bdelay_P: { - // pasażerski P - wszystko na P - d->MoverParameters->BrakeDelaySwitch( bdelay_P ); - break; - } - } - // potentially release manual brake - d->MoverParameters->DecManualBrakeLevel( ManualBrakePosNo ); - d->MoverParameters->SpringBrake.Activate = false; + continue; } - d = d->Next(); // kolejny pojazd, podłączony od tyłu (licząc od czoła) + if (*setting != 0) { + d->MoverParameters->BrakeDelaySwitch(*setting); + } + // potentially release manual brake + d->MoverParameters->DecManualBrakeLevel( ManualBrakePosNo ); + d->MoverParameters->SpringBrake.Activate = false; } //ustawianie trybu pracy zadajnika hamulca, wystarczy raz po inicjalizacji AI if( true == AIControllFlag ) { @@ -2218,7 +2143,7 @@ void TController::AutoRewident() if( OrderCurrentGet() & ( Obey_train | Bank ) ) { // 4. Przeliczanie siły hamowania double const velstep = mvOccupied->Vmax * 0.5 / BrakeAccTableSize; - d = pVehicles[0]; // pojazd na czele składu + auto *d = pVehicles[0]; // pojazd na czele składu while (d) { for( int i = 0; i < BrakeAccTableSize; ++i ) { fBrake_a0[ i + 1 ] += d->MoverParameters->BrakeForceR( 0.25, velstep*( 1 + 2 * i ) ); @@ -2257,7 +2182,7 @@ void TController::AutoRewident() fNominalAccThreshold = std::max( -0.75, -fBrake_a0[ BrakeAccTableSize ] - 8 * fBrake_a1[ BrakeAccTableSize ] ); fBrakeReaction = 0.25; } - else if (ustaw > 16) { + else if (passengertrain) { fNominalAccThreshold = -fBrake_a0[ BrakeAccTableSize ] - 4 * fBrake_a1[ BrakeAccTableSize ]; fBrakeReaction = 1.00 + fLength*0.004; } diff --git a/vehicle/brakesetting.cpp b/vehicle/brakesetting.cpp new file mode 100644 index 000000000..785bfbd6d --- /dev/null +++ b/vehicle/brakesetting.cpp @@ -0,0 +1,216 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "vehicle/brakesetting.h" + +#include "McZapkie/hamulce.h" + +#include + +namespace brake_setting { + +namespace { + +// the limits of Cw-1 §19.2 and §19.3 for the wagons of a freight train (the "skład pociągu", without +// the locomotives) +constexpr double freight_p_max_length{500.0}; // [m] +constexpr double freight_p_max_mass{1300000.0}; // [kg] +constexpr double freight_p_all_max_length{300.0}; // [m] +constexpr double freight_p_all_max_mass{600000.0}; // [kg] + +// the most P-braked vehicles a passenger train on R may carry (Cw-1 §18.3, §18.4) +constexpr int passenger_r_max_p_wagons{3}; + +bool has(int const Delays, int const Setting) { + return (Delays & Setting) == Setting; +} + +// Wanted when the vehicle has it, else Fallback when it has that, else 0 +int pick(int const Delays, int const Wanted, int const Fallback) { + if (has(Delays, Wanted)) { + return Wanted; + } + if (has(Delays, Fallback)) { + return Fallback; + } + return 0; +} + +// the wagons of the train by the fastest setting they have +struct wagon_counts { + int r{0}; // with R: passenger cars of fast trains + int g{0}; // with G but no R: freight wagons + int p{0}; // the rest: passenger cars with P only + double length{0.0}; // [m] + double mass{0.0}; // [kg] + + explicit wagon_counts(std::vector const &Consist) { + for (auto const &item : Consist) { + if (item.powered) { + continue; + } + length += item.length; + mass += item.mass; + if (has(item.delays, bdelay_R)) { + ++r; + } + else if (has(item.delays, bdelay_G)) { + ++g; + } + else { + ++p; + } + } + } + + int wagons() const { + return r + g + p; + } + // a train is a passenger one unless it has at least as many freight wagons as there are others, + // or four of them (the inspector's rule of the earlier releases, Cw-1 doesn't tell) + bool passenger() const { + return g < std::min(4, r + p); + } +}; + +int passenger_r_setting(vehicle const &Item) { + if (false == Item.powered && has(Item.delays, bdelay_R | bdelay_M)) { + return bdelay_R | bdelay_M; + } + return pick(Item.delays, bdelay_R, bdelay_P); +} + +} // namespace + +train_setting choose_train_setting(std::vector const &Consist) { + wagon_counts const counts{Consist}; + if (counts.wagons() == 0) { + return train_setting::light_engine; + } + if (counts.passenger()) { + // wagons without R run on P, and there may be no more than three of them, fewer than those on R + auto const pwagons{counts.g + counts.p}; + return pwagons <= passenger_r_max_p_wagons && counts.r > pwagons ? train_setting::passenger_r : train_setting::passenger_p; + } + if (counts.length > freight_p_max_length || counts.mass > freight_p_max_mass) { + return train_setting::freight_g; + } + if (counts.length > freight_p_all_max_length || counts.mass > freight_p_all_max_mass) { + return train_setting::freight_gp; + } + return train_setting::freight_p; +} + +std::vector choose(std::vector const &Consist) { + auto const setting{choose_train_setting(Consist)}; + std::vector settings; + settings.reserve(Consist.size()); + auto wagonsfromhead{0}; + for (auto const &item : Consist) { + if (false == item.powered) { + ++wagonsfromhead; + } + switch (setting) { + case train_setting::light_engine: { + settings.emplace_back(pick(item.delays, bdelay_R, bdelay_P)); + break; + } + case train_setting::passenger_r: { + settings.emplace_back(passenger_r_setting(item)); + break; + } + case train_setting::passenger_p: { + settings.emplace_back(pick(item.delays, bdelay_P, bdelay_P)); + break; + } + case train_setting::freight_p: { + settings.emplace_back(item.powered ? pick(item.delays, bdelay_G, bdelay_P) : pick(item.delays, bdelay_P, bdelay_G)); + break; + } + case train_setting::freight_gp: { + // the wagons are counted from the head of the train, past any locomotive in the middle of it + auto const ong{item.powered || wagonsfromhead <= freight_gp_wagons_on_g}; + settings.emplace_back(ong ? pick(item.delays, bdelay_G, bdelay_P) : pick(item.delays, bdelay_P, bdelay_G)); + break; + } + case train_setting::freight_g: + default: { + settings.emplace_back(pick(item.delays, bdelay_G, bdelay_P)); + break; + } + } + } + return settings; +} + +std::vector choose_legacy(std::vector const &Consist) { + wagon_counts const counts{Consist}; + auto length{0.0}; + auto mass{0.0}; + for (auto const &item : Consist) { + length += item.length; + mass += item.mass; + } + auto setting{train_setting::light_engine}; + if (counts.wagons() > 0) { + if (counts.passenger()) { + setting = counts.g && counts.r < counts.g + counts.p ? train_setting::passenger_p : train_setting::passenger_r; + } + else if (length < 300.0 && mass < 600000.0) { + setting = train_setting::freight_p; + } + else if (length < 500.0 && mass < 1300000.0) { + setting = train_setting::freight_gp; + } + else { + setting = train_setting::freight_g; + } + } + std::vector settings; + settings.reserve(Consist.size()); + auto wagonsfromloco{0}; + for (auto const &item : Consist) { + switch (setting) { + case train_setting::light_engine: + case train_setting::passenger_r: { + settings.emplace_back(has(item.delays, bdelay_R) ? bdelay_R : bdelay_P); + break; + } + case train_setting::passenger_p: { + settings.emplace_back(bdelay_P); + break; + } + case train_setting::freight_p: { + settings.emplace_back(item.powered ? bdelay_G : bdelay_P); + break; + } + case train_setting::freight_gp: { + // the count started anew at every locomotive + if (item.powered) { + wagonsfromloco = 0; + settings.emplace_back(bdelay_G); + } + else { + ++wagonsfromloco; + settings.emplace_back(wagonsfromloco <= freight_gp_wagons_on_g ? bdelay_G : bdelay_P); + } + break; + } + case train_setting::freight_g: + default: { + settings.emplace_back(has(item.delays, bdelay_G) ? bdelay_G : bdelay_P); + break; + } + } + } + return settings; +} + +} // namespace brake_setting diff --git a/vehicle/brakesetting.h b/vehicle/brakesetting.h new file mode 100644 index 000000000..cfb421d55 --- /dev/null +++ b/vehicle/brakesetting.h @@ -0,0 +1,57 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include + +// the brake setting (G/P/R/Mg) the virtual wagon inspector (TController::AutoRewident) chooses for every +// vehicle of a train, by the rules of the brake instruction Cw-1 (Mw56), §18 and §19 (eu07/maszyna#350) +namespace brake_setting { + +// what the inspector needs to know about a vehicle of the train +struct vehicle { + int delays{0}; // the settings the vehicle has (BrakeDelays, a combination of bdelay_*) + bool powered{false}; // a locomotive or a powered unit, as opposed to a wagon + double length{0.0}; // [m] + double mass{0.0}; // with its load [kg] +}; + +// the kind of train the inspector takes the consist for, and how it sets the brakes +enum class train_setting { + light_engine, // no wagons: R where there is one, else P + passenger_r, // passenger train on R, wagons with Mg on R+Mg (Cw-1 §18.2) + passenger_p, // passenger train on P (Cw-1 §18.3, §18.4) + freight_p, // freight train on P: locomotives on G, wagons on P (Cw-1 §19.3a) + freight_gp, // freight train on P: locomotives and the first five wagons on G, the rest on P (Cw-1 §19.3b) + freight_g // freight train on G (Cw-1 §19.1) +}; + +// how many wagons next to the locomotive stay on G in a freight_gp train +inline constexpr int freight_gp_wagons_on_g{5}; + +// the train setting by Cw-1. Consist runs from the head of the train to its rear +train_setting choose_train_setting(std::vector const &Consist); + +// a passenger train or a light engine, as opposed to a freight train. the inspector of the earlier +// releases tells them apart the same way +constexpr bool passenger(train_setting const Setting) { + return Setting == train_setting::light_engine || Setting == train_setting::passenger_r || Setting == train_setting::passenger_p; +} + +// the brake setting (bdelay_*) for every vehicle of Consist, in the same order, by Cw-1. a vehicle +// without the setting the train needs gets the other one of G and P it has, and 0 (left as it is) +// when it has neither. Cw-1 §19.9 would have the brake of such a vehicle cut out instead +std::vector choose(std::vector const &Consist); + +// the inspector of the releases before eu07/maszyna#350, kept for ai.brakesetting.cw1 no. the settings +// are requests: a vehicle which doesn't have the one asked for keeps its own +std::vector choose_legacy(std::vector const &Consist); + +} // namespace brake_setting From 99cf46866a1c35dae84967bf86da113bb1b19541 Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Sat, 7 Nov 2026 22:00:30 +0100 Subject: [PATCH 307/430] AI braking, ESt3: take care of the Sonar remarks on the braking PRs No change in what the AI or the distributor does: - S134: the step of the train brake sized from the consist brake table moves out of IncBrake() into increase_train_brake(), with early returns. - S134, S1066: while starting uphill, the check of the released brakes leaves Ready as it was by assigning the flag instead of nesting an if. - S6004: the uphill condition of control_uphill_start(), and the target cylinder pressure of TNESt3::CheckState(), are declared in the init-statement of their if. - S5350: the loop summing the tractive force walks the consist through a pointer to const. - S3776: the cylinder nozzle calibration for the AL2 relay moves out of TNESt3::SetSize() into ScaleNozzlesForAL2(). --- McZapkie/Oerlikon_ESt.cpp | 23 +++--- McZapkie/Oerlikon_ESt.h | 1 + vehicle/Driver.cpp | 152 +++++++++++++++++++------------------- vehicle/Driver.h | 1 + 4 files changed, 94 insertions(+), 83 deletions(-) diff --git a/McZapkie/Oerlikon_ESt.cpp b/McZapkie/Oerlikon_ESt.cpp index 1e7a5be66..0717eff5d 100644 --- a/McZapkie/Oerlikon_ESt.cpp +++ b/McZapkie/Oerlikon_ESt.cpp @@ -379,8 +379,7 @@ void TNESt3::CheckState(double const BCP, double & /*dV1*/) // glowny przyrzad r Przys_blok = false; // sprawdzanie stanu - double const cel{ CelBCP( CVP, VVP ) }; - if (BCP < cel - 0.01 * BVM && Przys_blok) + if (double const cel{ CelBCP( CVP, VVP ) }; BCP < cel - 0.01 * BVM && Przys_blok) BrakeStatus |= b_on | b_hld; // hamowanie stopniowe; else if (BCP - 0.1 > cel + 0.01 * BVM) BrakeStatus &= ~( b_on | b_hld ); // luzowanie; @@ -486,6 +485,18 @@ void TNESt3::SetLBP(double const P) LBP = P; } +void TNESt3::ScaleNozzlesForAL2() // dysze cylindra przy przekladniku AL2 +{ + if( PrzekCiagly == nullptr ) { + return; + } + // dysze cylindra skalibrowane na komore impulsowa przekladnika AL2 (1 l) wg czasow z tablicy 3-9 + Nozzles[dON] *= 0.914; + Nozzles[dTN] *= 0.885; + Nozzles[dOO] *= 0.82; + Nozzles[dTO] *= 0.8; +} + void TNESt3::SetSize( int const size, std::string const ¶ms ) // ustawianie dysz (rozmiaru ZR) { static double const dNO1l = 1.250; @@ -673,13 +684,7 @@ void TNESt3::SetSize( int const size, std::string const ¶ms ) // ustawianie Nozzles[dSd] = 1.1; Nozzles[dSm] = 0.9; - if( PrzekCiagly != nullptr ) { - // dysze cylindra skalibrowane na komore impulsowa przekladnika AL2 (1 l) wg czasow z tablicy 3-9 - Nozzles[dON] *= 0.914; - Nozzles[dTN] *= 0.885; - Nozzles[dOO] *= 0.82; - Nozzles[dTO] *= 0.8; - } + ScaleNozzlesForAL2(); // przeliczanie z mm^2 na l/m for (auto &nozzle : Nozzles) diff --git a/McZapkie/Oerlikon_ESt.h b/McZapkie/Oerlikon_ESt.h index 02d65a285..eaae2c032 100644 --- a/McZapkie/Oerlikon_ESt.h +++ b/McZapkie/Oerlikon_ESt.h @@ -201,6 +201,7 @@ class TNESt3 : public TBrake { void CheckState(double const BCP, double &dV1); // glowny przyrzad rozrzadczy void CheckReleaser(double const dt); // odluzniacz double CVs(double const BP) const; // napelniacz sterujacego + void ScaleNozzlesForAL2(); // dysze cylindra przy przekladniku AL2 double BVs(double const BCP) const; // napelniacz pomocniczego void SetSize( int const size, std::string const ¶ms ); // ustawianie dysz (rozmiaru ZR), przekladniki void PLC(double const mass) override; // wspolczynnik cisnienia przystawki wazacej diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index cbdd97c62..5ac1ccd12 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -2934,6 +2934,75 @@ bool TController::ReleaseEngine() { // defined further down, with the braking demand it is used for static double brake_response_horizon( TMoverParameters const *Vehicle, TBrakeSystem const Brakesystem, double const Acceleration, double const Brakea0 ); +// one step more of the train brake, sized from the consist brake table against the deceleration asked for +bool +TController::increase_train_brake() { + + // dodane dla towarowego + float pos_corr = 0; + + TDynamicObject *d; + d = pVehicles[0]; // pojazd na czele składu + while (d) + { // przeliczanie dodatkowego potrzebnego spadku ciśnienia + if( ( d->MoverParameters->Hamulec->GetBrakeStatus() & b_dmg ) == 0 ) { + pos_corr -= ( std::min( 5.0, d->MoverParameters->Hamulec->GetCRP() ) - 5.0 ) * d->MoverParameters->TotalMass; + } + d = d->Next(); // kolejny pojazd, podłączony od tyłu (licząc od czoła) + } + pos_corr = pos_corr / fMass * 2.5; + + if (mvOccupied->BrakeHandle == TBrakeHandle::FV4a) + { + pos_corr += mvOccupied->Handle->GetCP()*0.2; + + } + double deltaAcc = -AccDesired*BrakeAccFactor() - (fBrake_a0[0] + 4.0 * (/*GBH mvOccupied->BrakeCtrlPosR*/BrakeCtrlPosition - 1 - pos_corr)*fBrake_a1[0]); + + if( deltaAcc > brake_increase_margin() ) + { + if( /*GBH mvOccupied->BrakeCtrlPosR*/BrakeCtrlPosition < 0.1 ) { + auto const OK { /*mvOccupied->*/BrakeLevelAdd( BrakingInitialLevel ) }; //GBH + // HACK: stronger braking to overcome SA134 engine behaviour + if( is_dmu() + && VelNext == 0.0 + && fBrakeDist < 200.0 ) { + BrakeLevelAdd( + fBrakeDist / ActualProximityDist < 0.8 ? + 0.5 : + 1.0 ); + } + return OK; + } + auto const OK { /*mvOccupied->*/BrakeLevelAdd( BrakingLevelIncrease ) }; //GBH + // brake harder if the acceleration is much higher than desired + /*if( ( deltaAcc > 2 * fBrake_a1[ 0 ] ) + && ( mvOccupied->BrakeCtrlPosR + BrakingLevelIncrease <= 5.0 ) ) { + mvOccupied->BrakeLevelAdd( BrakingLevelIncrease ); + } GBH */ + if( deltaAcc > 2 * fBrake_a1[0] + && BrakeCtrlPosition + BrakingLevelIncrease <= 5.0 ) { + /*mvOccupied->*/BrakeLevelAdd( BrakingLevelIncrease ); + } + return OK; + } + if( BrakeCtrlPosition > 0.0 + && AccDesired < 0.0 // only while braking is asked for, not when called for a train slipping back while starting + && ( fBrakeHeldTime > ( + mvOccupied->BrakeDelayFlag > bdelay_G ? + mvOccupied->BrakeDelay[ 1 ] : + mvOccupied->BrakeDelay[ 3 ] ) + // a train falling further behind needs no full fill time to be seen not to get enough + || ( ( fShortfall > 0.02 ) + && ( fBrakeHeldTime > brake_response_horizon( mvOccupied, BrakeSystem, 1.0, fBrake_a0[ 0 ] ) ) ) ) ) { + // the table says the present position is enough, but the brake has had its full fill + // time since the handle last moved and the train is still not slowing down as asked: + // believe the train rather than the table + return BrakeLevelAdd( BrakingLevelIncrease ); + } + return false; +} + bool TController::IncBrake() { // zwiększenie hamowania auto OK { false }; @@ -3025,70 +3094,7 @@ bool TController::IncBrake() OK = false; } else { - // dodane dla towarowego - float pos_corr = 0; - - TDynamicObject *d; - d = pVehicles[0]; // pojazd na czele składu - while (d) - { // przeliczanie dodatkowego potrzebnego spadku ciśnienia - if( ( d->MoverParameters->Hamulec->GetBrakeStatus() & b_dmg ) == 0 ) { - pos_corr -= ( std::min( 5.0, d->MoverParameters->Hamulec->GetCRP() ) - 5.0 ) * d->MoverParameters->TotalMass; - } - d = d->Next(); // kolejny pojazd, podłączony od tyłu (licząc od czoła) - } - pos_corr = pos_corr / fMass * 2.5; - - if (mvOccupied->BrakeHandle == TBrakeHandle::FV4a) - { - pos_corr += mvOccupied->Handle->GetCP()*0.2; - - } - double deltaAcc = -AccDesired*BrakeAccFactor() - (fBrake_a0[0] + 4.0 * (/*GBH mvOccupied->BrakeCtrlPosR*/BrakeCtrlPosition - 1 - pos_corr)*fBrake_a1[0]); - - if( deltaAcc > brake_increase_margin() ) - { - if( /*GBH mvOccupied->BrakeCtrlPosR*/BrakeCtrlPosition < 0.1 ) { - OK = /*mvOccupied->*/BrakeLevelAdd( BrakingInitialLevel ); //GBH - // HACK: stronger braking to overcome SA134 engine behaviour - if( is_dmu() - && VelNext == 0.0 - && fBrakeDist < 200.0 ) { - BrakeLevelAdd( - fBrakeDist / ActualProximityDist < 0.8 ? - 0.5 : - 1.0 ); - } - } - else { - OK = /*mvOccupied->*/BrakeLevelAdd( BrakingLevelIncrease ); //GBH - // brake harder if the acceleration is much higher than desired - /*if( ( deltaAcc > 2 * fBrake_a1[ 0 ] ) - && ( mvOccupied->BrakeCtrlPosR + BrakingLevelIncrease <= 5.0 ) ) { - mvOccupied->BrakeLevelAdd( BrakingLevelIncrease ); - } GBH */ - if( deltaAcc > 2 * fBrake_a1[0] - && BrakeCtrlPosition + BrakingLevelIncrease <= 5.0 ) { - /*mvOccupied->*/BrakeLevelAdd( BrakingLevelIncrease ); - } - } - } - else if( BrakeCtrlPosition > 0.0 - && AccDesired < 0.0 // only while braking is asked for, not when called for a train slipping back while starting - && ( fBrakeHeldTime > ( - mvOccupied->BrakeDelayFlag > bdelay_G ? - mvOccupied->BrakeDelay[ 1 ] : - mvOccupied->BrakeDelay[ 3 ] ) - // a train falling further behind needs no full fill time to be seen not to get enough - || ( ( fShortfall > 0.02 ) - && ( fBrakeHeldTime > brake_response_horizon( mvOccupied, BrakeSystem, 1.0, fBrake_a0[ 0 ] ) ) ) ) ) { - // the table says the present position is enough, but the brake has had its full fill - // time since the handle last moved and the train is still not slowing down as asked: - // believe the train rather than the table - OK = BrakeLevelAdd( BrakingLevelIncrease ); - } - else - OK = false; + OK = increase_train_brake(); } } if( /*GBH mvOccupied->BrakeCtrlPos*/ @@ -5964,9 +5970,7 @@ TController::determine_consist_state() { // once in motion a brake down to 0.4 bar counts as released (UIC), even if its distributor // is still in the lap position while the brake pipe recharges ( isbraking && bp > 0.4 ) || vehicle->Fb > 10000.0 ) { // 10 kN - if( false == heldforstart ) { - Ready = false; - } + Ready = heldforstart; // ready all the same only when the power goes on against the brake on purpose } // Ra: odluźnianie przeładowanych lokomotyw, ciągniętych na zimno - prowizorka... if( bp >= 0.4 && (AIControllFlag || Global.AITrainman && mvOccupied->Vel < EU07_AI_NOMOVEMENT && !is_emu() && !is_dmu()) && BrakeCtrlPosition == gbh_RP // jest pozycja jazdy @@ -8196,12 +8200,12 @@ bool TController::is_too_fast_uphill() const { void TController::control_uphill_start() { auto const velocity { DirectionalVel() }; - auto const uphill { - ( BrakeSystem == TBrakeSystem::Pneumatic ) - && is_train() - && ( false == is_emu() ) && ( false == is_dmu() ) // a multiple unit has no locomotive to hold a train behind it - && ( fAccGravity < -0.01 ) }; - if( false == uphill ) { + if( auto const uphill { + ( BrakeSystem == TBrakeSystem::Pneumatic ) + && is_train() + && ( false == is_emu() ) && ( false == is_dmu() ) // a multiple unit has no locomotive to hold a train behind it + && ( fAccGravity < -0.01 ) }; + false == uphill ) { bUphillStart = false; return; } @@ -8227,7 +8231,7 @@ void TController::control_uphill_start() { cue_action( driver_hint::independentbrakerelease ); } auto tractiveforce { 0.0 }; - for( auto *vehicle { pVehicles[ end::front ] }; vehicle != nullptr; vehicle = vehicle->Next() ) { + for( auto const *vehicle { pVehicles[ end::front ] }; vehicle != nullptr; vehicle = vehicle->Next() ) { tractiveforce += std::max( 0.0, vehicle->MoverParameters->Ft ); } auto const holdingforce { fMass * -fAccGravity }; diff --git a/vehicle/Driver.h b/vehicle/Driver.h index 846923df2..700b41f75 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -350,6 +350,7 @@ private: void adjust_desired_speed_for_obstacles(); void adjust_desired_speed_for_limits(); void set_velocity_for_uncoupling(); + bool increase_train_brake(); void hold_train_coming_to_stand_uphill(); void adjust_desired_speed_for_final_approach( double const Vel ); void adjust_desired_speed_for_target_speed( double const Range ); From 6dc42e976fae695205c707fbbb4ec411eec12e61 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 22:08:42 +0100 Subject: [PATCH 308/430] feat: keep the vehicle odometers between the sessions (#72) Every vehicle gets an odometer (TMoverParameters::Odometer) counting along with the per-session DistCounter, starting from its state saved in eu07_odometers.txt in the user's settings directory, else from the file a python screen kept it in (kilometry/_przebieg.txt), else from a state made up from the vehicle name. The store is saved every minute of simulation time and on closing. The cab's distcounter: gauge shows the odometer; its .mmd offset seeds a vehicle with no known state. Python screens get it as state["odometer_total"]; state["odometer"] stays the session distance the logbook and mirror scripts count differences of. --- CMakeLists.txt | 1 + McZapkie/MOVER.h | 2 + McZapkie/Mover.cpp | 2 + application/application.cpp | 2 + tests/unit/test_odometer.cpp | 199 +++++++++++++++++++++++++++++++ vehicle/DynObj.cpp | 23 ++++ vehicle/DynObj.h | 5 + vehicle/Gauge.h | 7 ++ vehicle/Train.cpp | 10 +- vehicle/odometer.cpp | 225 +++++++++++++++++++++++++++++++++++ vehicle/odometer.h | 94 +++++++++++++++ 11 files changed, 568 insertions(+), 2 deletions(-) create mode 100644 tests/unit/test_odometer.cpp create mode 100644 vehicle/odometer.cpp create mode 100644 vehicle/odometer.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f34ad61f..d3152915e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -465,6 +465,7 @@ set(CORE_SOURCES "vehicle/handover.cpp" "vehicle/horn.cpp" "vehicle/smoke.cpp" +"vehicle/odometer.cpp" ) add_library(eu07_core STATIC ${CORE_SOURCES}) target_link_libraries(eu07_core PUBLIC eu07_settings) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 16bb207fa..1f7942e84 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -13,6 +13,7 @@ http://mozilla.org/MPL/2.0/. #include #include "hamulce.h" #include "scripting/ladderlogic.h" +#include "vehicle/odometer.h" class cParser; /* @@ -1963,6 +1964,7 @@ class TMoverParameters int SoundFlag = 0; /*!o patrz stale sound_ */ int AIFlag{0}; // HACK: events of interest for consist owner double DistCounter = 0.0; /*! licznik kilometrow */ + odometer::reading Odometer; // total distance run, kept between the sessions (eu07/maszyna#72) std::pair EnergyMeter; // energy from grid [kWh] double V = 0.0; // predkosc w [m/s] względem sprzęgów (dodania gdy jedzie w stronę 0) double Vel = 0.0; // moduł prędkości w [km/h], używany przez AI diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 20761bacb..48a36ccb6 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1510,6 +1510,7 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap dL)}; DistCounter += fabs(dL) / 1000.0; + Odometer.run(dL); dL = 0; // koniec procedury, tu nastepuja dodatkowe procedury pomocnicze @@ -1576,6 +1577,7 @@ double TMoverParameters::FastComputeMovement(double dt, const TTrackShape & /*Sh dL)}; DistCounter += fabs(dL) / 1000.0; + Odometer.run(dL); dL = 0; // koniec procedury, tu nastepuja dodatkowe procedury pomocnicze diff --git a/application/application.cpp b/application/application.cpp index 9b7b82853..bd0526269 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -708,6 +708,8 @@ void eu07_application::exit() m_network.reset(); // SafeDelete( simulation::Train ); + step("the odometers"); + simulation::Vehicles.save_odometers(); step("the scenery"); SafeDelete(simulation::Region); diff --git a/tests/unit/test_odometer.cpp b/tests/unit/test_odometer.cpp new file mode 100644 index 000000000..8297d3167 --- /dev/null +++ b/tests/unit/test_odometer.cpp @@ -0,0 +1,199 @@ +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" +#include "vehicle/odometer.h" + +#include +#include +#include + +// the odometer of a vehicle, kept between the sessions (eu07/maszyna#72): one state the cab's counters and the +// python screens show, saved in one store, taking over the states the python screens kept in their own files + +namespace { + +odometer::reading started(double const Km, odometer::origin const Source = odometer::origin::saved) { + odometer::reading reading; + reading.begin(Km, Source); + return reading; +} + +odometer::reading run(double const Km, double const Metres) { + auto reading{started(Km)}; + reading.run(Metres); + return reading; +} + +// a directory of its own for a test, removed afterwards +struct scratch_directory { + std::filesystem::path path; + explicit scratch_directory(std::string const &Name) : path{std::filesystem::temp_directory_path() / ("eu07_unit_" + Name)} { + std::filesystem::remove_all(path); + std::filesystem::create_directories(path); + } + ~scratch_directory() { + std::error_code error; + std::filesystem::remove_all(path, error); + } +}; + +void write_file(std::filesystem::path const &Path, std::string const &Content) { + std::filesystem::create_directories(Path.parent_path()); + std::ofstream{Path, std::ios::binary} << Content; +} + +} // namespace + +TEST_CASE("odometer: a vehicle counts the distance it runs either way, as the session's counter does") { + for (auto const velocity : {40.0, -40.0}) { + CAPTURE(velocity); + test::vehicle vehicle{test::definition::load("wagon"), velocity}; + vehicle->Odometer.begin(123456.0, odometer::origin::saved); + vehicle.run(10.0); + CHECK(vehicle->DistCounter > 0.05); + CHECK(vehicle->Odometer.km - 123456.0 == doctest::Approx(vehicle->DistCounter)); + CHECK(vehicle->Odometer.start == 123456.0); + CHECK(vehicle->Odometer.moved()); + } +} + +TEST_CASE("odometer: the store reads back what it writes") { + odometer::store store; + store.record("EN76-012a", run(1361539.4283, 1000.0)); + store.record("loco with spaces", run(42.0, 500.0)); + CHECK(store.modified()); + + std::stringstream file; + store.write(file); + odometer::store read; + CHECK(read.read(file) == 2); + CHECK(read.find("EN76-012a").value() == doctest::Approx(1361540.4283)); + CHECK(read.find("loco with spaces").value() == doctest::Approx(42.5)); + CHECK_FALSE(read.find("EN76-012").has_value()); + CHECK_FALSE(read.modified()); +} + +TEST_CASE("odometer: the store skips the comments and the malformed lines") { + std::stringstream file{"# comment\r\n" + "100.5 good\r\n" + "\n" + "nonsense\n" + "abc name\n" + "-5 negative\n" + "nan notanumber\n" + "7 \n" + "200\ttabbed\n"}; + odometer::store store; + CHECK(store.read(file) == 2); + CHECK(store.find("good").value() == 100.5); + CHECK(store.find("tabbed").value() == 200.0); + CHECK(store.size() == 2); +} + +TEST_CASE("odometer: a vehicle gets in the store once it has run, then it's kept up to date") { + odometer::store store; + SUBCASE("a vehicle which only stood doesn't get in") { + store.record("standing", started(5000.0, odometer::origin::guessed)); + CHECK_FALSE(store.find("standing").has_value()); + CHECK_FALSE(store.modified()); + } + SUBCASE("one which ran does") { + store.record("running", run(5000.0, 250.0)); + CHECK(store.find("running").value() == doctest::Approx(5000.25)); + CHECK(store.modified()); + } + SUBCASE("one already in the store follows its state, and an unchanged one doesn't make the store modified") { + std::stringstream file{"300 known\n"}; + store.read(file); + store.record("known", started(300.0)); + CHECK_FALSE(store.modified()); + store.record("known", run(300.0, 1000.0)); + CHECK(store.find("known").value() == doctest::Approx(301.0)); + CHECK(store.modified()); + store.saved(); + CHECK_FALSE(store.modified()); + } + SUBCASE("a nameless vehicle doesn't") { + store.record("", run(1.0, 1000.0)); + CHECK(store.size() == 0); + } +} + +TEST_CASE("odometer: the state the python screens kept is read") { + auto const legacy = [](std::string const &Content) { + std::stringstream file{Content}; + return odometer::read_legacy(file); + }; + // written as python's str() of a float + CHECK(legacy("1361539.4283109533").value() == doctest::Approx(1361539.4283109533)); + CHECK(legacy("170650.0\n").value() == 170650.0); + CHECK(legacy(" 5000 ").value() == 5000.0); + CHECK_FALSE(legacy("").has_value()); + CHECK_FALSE(legacy("12 km").has_value()); + CHECK_FALSE(legacy("inf").has_value()); +} + +TEST_CASE("odometer: the state starts from the store, else the python screens' file, else a guess") { + scratch_directory directory{"odometer_legacy"}; + // the python screens dropped the last letter of the vehicle name: the units of the EN76 shared the file + write_file(directory.path / "kilometry" / "EN76-012_przebieg.txt", "1361539.5"); + std::stringstream file{"2000 EN76-012b\n"}; + odometer::store store; + store.read(file); + + auto const saved{odometer::starting_state(store, "EN76-012b", directory.path)}; + CHECK(saved.source == odometer::origin::saved); + CHECK(saved.km == 2000.0); + + auto const legacy{odometer::starting_state(store, "EN76-012a", directory.path)}; + CHECK(legacy.source == odometer::origin::legacy); + CHECK(legacy.km == 1361539.5); + CHECK(legacy.start == legacy.km); + + auto const guessed{odometer::starting_state(store, "SM42-001", directory.path)}; + CHECK(guessed.source == odometer::origin::guessed); + CHECK(guessed.km == odometer::guessed_state("SM42-001")); + CHECK_FALSE(guessed.moved()); + + // an unreadable legacy file is no state + write_file(directory.path / "kilometry" / "ET22-100_przebieg.txt", ""); + CHECK(odometer::starting_state(store, "ET22-100a", directory.path).source == odometer::origin::guessed); +} + +TEST_CASE("odometer: a guessed state is the same for the same vehicle, in range") { + for (auto const *name : {"", "a", "EN57-1001ra", "ET22-100", "SM42-001"}) { + CAPTURE(name); + auto const state{odometer::guessed_state(name)}; + CHECK(state == odometer::guessed_state(name)); + CHECK(state >= 10000.0); + CHECK(state < 500000.0); + } + CHECK(odometer::guessed_state("ET22-100") != odometer::guessed_state("ET22-101")); +} + +TEST_CASE("odometer: the cab's counter offset replaces only a guessed state, the distance run kept") { + CHECK(odometer::counter_seed(101532.f, 1.f).value() == 101532.0); + CHECK(odometer::counter_seed(1015320.f, 10.f).value() == doctest::Approx(101532.0)); + CHECK_FALSE(odometer::counter_seed(0.f, 1.f).has_value()); + CHECK_FALSE(odometer::counter_seed(100.f, 0.f).has_value()); + CHECK_FALSE(odometer::counter_seed(-100.f, 1.f).has_value()); + + SUBCASE("guessed") { + auto reading{started(33333.0, odometer::origin::guessed)}; + reading.run(2000.0); + reading.seed(101532.0); + CHECK(reading.source == odometer::origin::counter); + CHECK(reading.start == 101532.0); + CHECK(reading.km == doctest::Approx(101534.0)); + // the next cab load doesn't seed it again + reading.seed(5.0); + CHECK(reading.start == 101532.0); + } + for (auto const source : {odometer::origin::saved, odometer::origin::legacy}) { + CAPTURE(static_cast(source)); + auto reading{started(777.0, source)}; + reading.seed(101532.0); + CHECK(reading.km == 777.0); + CHECK(reading.source == source); + } +} diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index d5f60e332..ff7587169 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -19,6 +19,7 @@ http://mozilla.org/MPL/2.0/. #include "rendering/lightarray.h" #include "vehicle/Camera.h" #include "vehicle/Train.h" +#include "vehicle/odometer.h" #include "vehicle/Driver.h" #include "utilities/Globals.h" #include "utilities/Timer.h" @@ -1983,6 +1984,8 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" */ // utworzenie parametrów fizyki MoverParameters = new TMoverParameters(iDirection ? fVel : -fVel, Type_Name, asName, Cab); + // the vehicle carries on with the odometer state of its earlier sessions (eu07/maszyna#72) + MoverParameters->Odometer = odometer::starting_state( odometer::states(), asName, asBaseDir ); // McZapkie: TypeName musi byc nazwą CHK/MMD pojazdu if (!MoverParameters->LoadFIZ(asBaseDir)) { // jak wczytanie CHK się nie uda, to błąd @@ -8721,6 +8724,26 @@ vehicle_table::update( double Deltatime, int Iterationcount ) { // jeśli jest coś do usunięcia z listy, to trzeba na końcu erase_disabled(); + + // the odometers are saved now and then, a crash doesn't lose more than the last minute + m_odometersavetimer += totaltime; + if( m_odometersavetimer >= 60.0 ) { + save_odometers(); + } +} + +// records the odometer states of the vehicles and saves them for the next sessions (eu07/maszyna#72) +void +vehicle_table::save_odometers() { + + m_odometersavetimer = 0.0; + auto &odometers { odometer::states() }; + for( auto const *vehicle : m_items ) { + if( vehicle->MoverParameters != nullptr ) { + odometers.record( vehicle->name(), vehicle->MoverParameters->Odometer ); + } + } + odometer::save(); } // legacy method, checks for presence and height of traction wire for specified vehicle diff --git a/vehicle/DynObj.h b/vehicle/DynObj.h index 577f0f020..b8eec1031 100644 --- a/vehicle/DynObj.h +++ b/vehicle/DynObj.h @@ -901,11 +901,16 @@ public: // legacy method, sends list of vehicles over network void DynamicList( bool const Onlycontrolled = false ) const; + // records the odometer states of the vehicles and saves them for the next sessions + void + save_odometers(); private: // maintenance; removes from tracks consists with vehicles marked as disabled bool erase_disabled(); + + double m_odometersavetimer { 0.0 }; // simulation time since the odometers were last saved }; diff --git a/vehicle/Gauge.h b/vehicle/Gauge.h index fdef9c58e..9aa539f15 100644 --- a/vehicle/Gauge.h +++ b/vehicle/Gauge.h @@ -55,6 +55,13 @@ public: void AssignBool(bool *bValue); void UpdateValue(); void AssignState( bool const *State ); + // the value shown is value * scale + offset + float offset() const { + return m_offset; } + void offset( float const Offset ) { + m_offset = Offset; } + float scale() const { + return m_scale; } // returns offset of submodel associated with the button from the model centre glm::vec3 model_offset() const; TGaugeType type() const; diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index e30635f4f..5a918809a 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -796,7 +796,8 @@ std::shared_ptr TTrain::GetTrainState(dictionary_source const dict->insert("tractionforce", std::abs(mvOccupied->Ft)); dict->insert("slipping_wheels", mvOccupied->SlippingWheels); dict->insert("sanding", mvOccupied->SandDose); - dict->insert("odometer", mvOccupied->DistCounter); + dict->insert("odometer", mvOccupied->DistCounter); // distance run in the session, km + dict->insert("odometer_total", mvOccupied->Odometer.km); // the vehicle's odometer, kept between the sessions // electric current data dict->insert("traction_voltage", std::abs(mvPantographUnit->PantographVoltage)); dict->insert("voltage", std::abs(mvControlled->EngineVoltage)); @@ -12320,7 +12321,12 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con // Ra 2014-07: licznik kilometrów auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka gauge.Load(Parser, DynamicObject); - gauge.AssignDouble(&mvControlled->DistCounter); + // the counter shows the odometer of the vehicle, kept between the sessions (eu07/maszyna#72). its offset + // was the state it started each session with, now it is that only for a vehicle with no known state + if (auto const seed{odometer::counter_seed(gauge.offset(), gauge.scale())}) + mvControlled->Odometer.seed(*seed); + gauge.offset(0.f); + gauge.AssignDouble(&mvControlled->Odometer.km); } else if (Label == "shuntmodepower:") { diff --git a/vehicle/odometer.cpp b/vehicle/odometer.cpp new file mode 100644 index 000000000..5f2a185d1 --- /dev/null +++ b/vehicle/odometer.cpp @@ -0,0 +1,225 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "vehicle/odometer.h" + +#include "utilities/Logs.h" +#include "utilities/utilities.h" + +#include +#include +#include +#include +#include + +namespace odometer { + +namespace { + +bool valid(double const Km) { + return std::isfinite(Km) && Km >= 0.0; +} + +// number making up all of the text, surrounding whitespace aside +std::optional parse_number(std::string const &Text) { + auto const first{Text.find_first_not_of(" \t\r\n")}; + if (first == std::string::npos) + return std::nullopt; + auto const last{Text.find_last_not_of(" \t\r\n")}; + auto const number{Text.substr(first, last - first + 1)}; + try { + std::size_t used{0}; + auto const value{std::stod(number, &used)}; + if (used != number.size() || false == valid(value)) + return std::nullopt; + return value; + } catch (std::exception const &) { + return std::nullopt; + } +} + +} // namespace + +void reading::begin(double const Km, origin const Source) { + km = Km; + start = Km; + source = Source; +} + +void reading::seed(double const Km) { + if (source != origin::guessed || false == valid(Km)) + return; + km += Km - start; + start = Km; + source = origin::counter; +} + +void reading::run(double const Metres) { + km += std::abs(Metres) / 1000.0; +} + +bool reading::moved() const { + return km != start; +} + +std::size_t store::read(std::istream &Input) { + std::size_t count{0}; + std::string line; + while (std::getline(Input, line)) { + if (false == line.empty() && line.back() == '\r') + line.pop_back(); + if (line.empty() || line.front() == '#') + continue; + // the name goes last, it's the rest of the line after the separator + auto const separator{line.find_first_of(" \t")}; + if (separator == std::string::npos) + continue; + auto const km{parse_number(line.substr(0, separator))}; + auto const name{line.substr(separator + 1)}; + if (false == km.has_value() || name.empty()) + continue; + m_states[name] = *km; + ++count; + } + return count; +} + +void store::write(std::ostream &Output) const { + Output << "# odometer states of the vehicles: \n"; + Output << std::fixed << std::setprecision(4); + for (auto const &[name, km] : m_states) + Output << km << ' ' << name << '\n'; +} + +std::optional store::find(std::string const &Vehicle) const { + auto const lookup{m_states.find(Vehicle)}; + if (lookup == m_states.end()) + return std::nullopt; + return lookup->second; +} + +void store::record(std::string const &Vehicle, reading const &Odometer) { + if (Vehicle.empty() || false == valid(Odometer.km)) + return; + auto const lookup{m_states.find(Vehicle)}; + if (lookup == m_states.end()) { + if (false == Odometer.moved()) + return; + m_states.emplace(Vehicle, Odometer.km); + m_modified = true; + return; + } + if (lookup->second == Odometer.km) + return; + lookup->second = Odometer.km; + m_modified = true; +} + +std::optional read_legacy(std::istream &Input) { + std::stringstream content; + content << Input.rdbuf(); + return parse_number(content.str()); +} + +std::optional legacy_state(std::filesystem::path const &Vehicledirectory, std::string const &Vehicle) { + if (Vehicle.size() < 2) + return std::nullopt; + auto const path{Vehicledirectory / "kilometry" / (Vehicle.substr(0, Vehicle.size() - 1) + "_przebieg.txt")}; + std::error_code error; + if (false == std::filesystem::is_regular_file(path, error)) + return std::nullopt; + std::ifstream input{path, std::ios::binary}; + if (false == input.is_open()) + return std::nullopt; + return read_legacy(input); +} + +double guessed_state(std::string const &Vehicle) { + // FNV-1a, stable between the builds unlike std::hash + std::uint64_t hash{14695981039346656037ull}; + for (auto const character : Vehicle) { + hash ^= static_cast(character); + hash *= 1099511628211ull; + } + return 10000.0 + static_cast(hash % 490000ull); +} + +reading starting_state(store const &States, std::string const &Vehicle, std::filesystem::path const &Vehicledirectory) { + reading result; + if (auto const saved{States.find(Vehicle)}) { + result.begin(*saved, origin::saved); + } else if (auto const legacy{legacy_state(Vehicledirectory, Vehicle)}) { + result.begin(*legacy, origin::legacy); + } else { + result.begin(guessed_state(Vehicle), origin::guessed); + } + return result; +} + +std::optional counter_seed(float const Offset, float const Scale) { + if (Offset == 0.f || Scale == 0.f) + return std::nullopt; + auto const km{static_cast(Offset) / static_cast(Scale)}; + if (false == valid(km)) + return std::nullopt; + return km; +} + +std::filesystem::path file() { + auto path{user_config_path("eu07_odometers.txt")}; + return path.empty() ? std::filesystem::path{"eu07_odometers.txt"} : path; +} + +store &states() { + static store odometers = [] { + store result; + std::ifstream input{file(), std::ios::binary}; + if (input.is_open()) { + auto const count{result.read(input)}; + WriteLog("Odometer states of " + std::to_string(count) + " vehicles read from \"" + file().string() + "\""); + } + return result; + }(); + return odometers; +} + +bool save() { + auto &odometers{states()}; + if (false == odometers.modified()) + return true; + auto const path{file()}; + std::error_code error; + if (path.has_parent_path()) + std::filesystem::create_directories(path.parent_path(), error); + // written aside first, a crash in the middle of a write doesn't lose the states + auto temporary{path}; + temporary += ".tmp"; + { + std::ofstream output{temporary, std::ios::binary | std::ios::trunc}; + if (false == output.is_open()) { + ErrorLog("Failed to save the odometer states to \"" + temporary.string() + "\""); + return false; + } + odometers.write(output); + if (false == output.good()) { + ErrorLog("Failed to save the odometer states to \"" + temporary.string() + "\""); + return false; + } + } + std::filesystem::rename(temporary, path, error); + if (error) { + ErrorLog("Failed to save the odometer states to \"" + path.string() + "\": " + error.message()); + return false; + } + odometers.saved(); + return true; +} + +} // namespace odometer diff --git a/vehicle/odometer.h b/vehicle/odometer.h new file mode 100644 index 000000000..65313c34b --- /dev/null +++ b/vehicle/odometer.h @@ -0,0 +1,94 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include +#include +#include +#include + +// the odometer of a vehicle: the total distance it has run, kept between the sessions (eu07/maszyna#72). +// the analog counters in the cab (distcounter:) and the python screens (state["odometer_total"]) show +// this one state, instead of the counters starting from their .mmd offset and the screens each keeping +// their own files +namespace odometer { + +// where the state of a vehicle came from +enum class origin { + saved, // the odometer store of the earlier sessions + legacy, // the file a python screen kept it in before + counter, // the offset of the cab's counter, which used to show it on top of the distance run in the session + guessed // nothing known, a made up state which the cab's counter can still replace +}; + +// odometer of one vehicle +struct reading { + double km{0.0}; // the state, km + double start{0.0}; // the state at the start of the session, km + origin source{origin::guessed}; + + // sets the state the vehicle starts the session with + void begin(double Km, origin Source); + // replaces a guessed state with the one the cab's counter showed at the start, the distance run kept. + // a known state stays + void seed(double Km); + // counts the distance run, in metres either way + void run(double Metres); + // the vehicle has run in this session + bool moved() const; +}; + +// the saved odometer states of the vehicles, km by vehicle name +class store { +public: + // reads the states written by write(). lines " ", '#' starts a comment line, a malformed + // line is skipped. returns the number of states read + std::size_t read(std::istream &Input); + void write(std::ostream &Output) const; + + std::optional find(std::string const &Vehicle) const; + // records the state of a vehicle. one not in the store yet gets in only once it has run, so the vehicles + // standing in the sceneries don't fill the file + void record(std::string const &Vehicle, reading const &Odometer); + + // there are states recorded since they were last saved + bool modified() const { return m_modified; } + void saved() { m_modified = false; } + std::size_t size() const { return m_states.size(); } + +private: + std::map m_states; + bool m_modified{false}; +}; + +// state kept in the file of the python screens before (/kilometry/_przebieg.txt, +// where the screens dropped the last character of the vehicle name), when it holds a number +std::optional read_legacy(std::istream &Input); +std::optional legacy_state(std::filesystem::path const &Vehicledirectory, std::string const &Vehicle); + +// made up state of a vehicle nothing is known about: a number from the name, in [10 000, 500 000) km, +// the same each session until the vehicle runs and gets its state saved +double guessed_state(std::string const &Vehicle); + +// state a vehicle starts the session with: the saved one, else the legacy one, else a guessed one +reading starting_state(store const &States, std::string const &Vehicle, std::filesystem::path const &Vehicledirectory); + +// state the cab's counter with offset Offset and scale Scale shows, once its offset no longer applies +// (the counter shows the odometer). nothing for a counter without an offset +std::optional counter_seed(float Offset, float Scale); + +// the odometer store of the simulation, read from the user's settings directory on the first use +store &states(); +std::filesystem::path file(); +// writes the store when anything was recorded since. returns false when the write failed +bool save(); + +} // namespace odometer From 95ceb815d2f4e9d8b87ed97c0482250256ecf1c4 Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Sat, 7 Nov 2026 22:55:09 +0100 Subject: [PATCH 309/430] AI braking: the braking curve outside the final approach in a method of its own Takes care of the last two Sonar remarks, with no change in what the AI does: - S134: the braking curve followed outside the final approach moves out of adjust_desired_speed_for_target_speed() into adjust_desired_speed_for_braking_curve(), with early returns. - S6004: deltaAcc of increase_train_brake() is declared in the init-statement of its if. --- vehicle/Driver.cpp | 151 ++++++++++++++++++++++++--------------------- vehicle/Driver.h | 1 + 2 files changed, 81 insertions(+), 71 deletions(-) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 5ac1ccd12..92a693532 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -2957,9 +2957,8 @@ TController::increase_train_brake() { pos_corr += mvOccupied->Handle->GetCP()*0.2; } - double deltaAcc = -AccDesired*BrakeAccFactor() - (fBrake_a0[0] + 4.0 * (/*GBH mvOccupied->BrakeCtrlPosR*/BrakeCtrlPosition - 1 - pos_corr)*fBrake_a1[0]); - - if( deltaAcc > brake_increase_margin() ) + if( double const deltaAcc = -AccDesired*BrakeAccFactor() - (fBrake_a0[0] + 4.0 * (/*GBH mvOccupied->BrakeCtrlPosR*/BrakeCtrlPosition - 1 - pos_corr)*fBrake_a1[0]); + deltaAcc > brake_increase_margin() ) { if( /*GBH mvOccupied->BrakeCtrlPosR*/BrakeCtrlPosition < 0.1 ) { auto const OK { /*mvOccupied->*/BrakeLevelAdd( BrakingInitialLevel ) }; //GBH @@ -7628,6 +7627,83 @@ shaped_braking_demand( return Gravity - high * fullbraking( Velocity ); } +// outside of max safe range: follow the braking curve down to the speed ahead, Vel is the present speed in the +// direction of travel +void +TController::adjust_desired_speed_for_braking_curve( double const Vel ) { + + AccDesired = AccPreferred; + if( Vel <= min_speed( ActualProximityDist > 10.0 ? 10.0 : 5.0, VelDesired ) ) { + return; + } + // allow to coast at reasonably low speed + auto const brakingdistance { fBrakeDist * braking_distance_multiplier( VelNext ) }; + auto const slowdowndistance { ( + mvOccupied->CategoryFlag == 2 ? // cars can stop on a dime, for bigger vehicles we enforce some minimal braking distance + brakingdistance : + std::max( + (OrderCurrentGet() & Connect) == 0 ? 100.0 : 25.0, + brakingdistance ) ) }; + if( brakingdistance + std::max(slowdowndistance, fMaxProximityDist) < ActualProximityDist - fMaxProximityDist ) { + // don't slow down prematurely; as long as we have room to come to a full stop at a safe distance, we're good + return; + } + // ensure some minimal coasting speed, otherwise a vehicle entering this zone at very low speed will be crawling forever + auto const brakingpointoffset = ( + ( VelNext == 0.0 ) && is_train() && ( OrderCurrentGet() & Obey_train ) ? + stopping_margin() : // the same stopping point as the final approach + VelNext * braking_distance_multiplier( static_cast( VelNext ) ) ); + // a pneumatic brake acts on the state the train will be in once it has responded; while the + // train is still speeding up, plan the deceleration from there, so more is asked for at once + auto velocity { Vel }; + auto distance { ActualProximityDist }; + if( ( BrakeSystem == TBrakeSystem::Pneumatic ) + && ( AbsAccS > 0.0 ) ) { + auto const horizon { brake_response_horizon( mvOccupied, BrakeSystem, AbsAccS, fBrake_a0[ 0 ] ) }; + velocity = Vel + 3.6 * horizon * AbsAccS; + distance = std::max( 0.5 * ActualProximityDist, ActualProximityDist - ( Vel + velocity ) * 0.5 / 3.6 * horizon ); + } + auto const brakingroom { + std::max( + distance - brakingpointoffset, + std::min( + distance, + brakingpointoffset ) ) }; + auto deceleration { ( VelNext * VelNext - velocity * velocity ) / ( 25.92 * brakingroom + 0.1 ) }; + if( ( BrakeSystem == TBrakeSystem::Pneumatic ) && ( velocity > VelNext ) ) { + // follow the shape of the consist brake force over speed rather than assume a constant + // deceleration, over the distance left once the brake has had time to fill (while the + // train is still speeding up, the prediction above has taken that off already) + auto room { brakingroom }; + if( ( AbsAccS <= 0.0 ) + && ( BrakeCtrlPosition <= 0.0 ) ) { // only while the brake is still to be applied: once it acts, the room it needs to respond is behind + room = std::max( + 0.5 * brakingroom, + brakingroom - Vel / 3.6 * brake_response_horizon( mvOccupied, BrakeSystem, 1.0, fBrake_a0[ 0 ] ) ); + } + deceleration = shaped_braking_demand( + velocity, VelNext, room + 0.1 / 25.92, fAccGravity, + { fBrake_a0, fBrake_a1, BrakeAccTableSize, mvOccupied->Vmax } ); + } + AccDesired = std::min( AccDesired, deceleration ); // najpierw hamuje mocniej, potem zluzuje + if( Vel <= VelNext ) { + return; + } + if( deceleration < fAccGravity - 0.001 ) { + // no power while still above the speed being braked for + AccDesired = std::min( AccDesired, EU07_AI_NOACCELERATION ); + } + else if( ( fAccGravity < -0.025 ) + && ( ( OrderCurrentGet() & Obey_train ) != 0 ) + && ( false == uphill_brake_committed( Vel ) ) + && ( ActualProximityDist - uphill_stopping_distance( Vel, fAccGravity ) > brakingpointoffset ) ) { + // uphill the gradient alone slows the train down more than it is asked to; + // keep it rolling at the present speed until that changes + AccDesired = std::min( 0.0, AccPreferred ); + VelDesired = min_speed( VelDesired, uphill_coasting_speed( ActualProximityDist - brakingpointoffset, fAccGravity ) ); + } +} + // the final approach to a stop, inside the proximity range: Vel is the present speed in the direction of travel void TController::adjust_desired_speed_for_final_approach( double const Vel ) { @@ -7720,74 +7796,7 @@ TController::adjust_desired_speed_for_target_speed( double const Range ) { } else if (ActualProximityDist > fMinProximityDist) { // jedzie szybciej, niż trzeba na końcu ActualProximityDist, ale jeszcze jest daleko - // outside of max safe range - AccDesired = AccPreferred; - if( vel > min_speed( ActualProximityDist > 10.0 ? 10.0 : 5.0, VelDesired ) ) { - // allow to coast at reasonably low speed - auto const brakingdistance { fBrakeDist * braking_distance_multiplier( VelNext ) }; - auto const slowdowndistance { ( - mvOccupied->CategoryFlag == 2 ? // cars can stop on a dime, for bigger vehicles we enforce some minimal braking distance - brakingdistance : - std::max( - (OrderCurrentGet() & Connect) == 0 ? 100.0 : 25.0, - brakingdistance ) ) }; - if( brakingdistance + std::max(slowdowndistance, fMaxProximityDist) >= ActualProximityDist - fMaxProximityDist ) { - // don't slow down prematurely; as long as we have room to come to a full stop at a safe distance, we're good - // ensure some minimal coasting speed, otherwise a vehicle entering this zone at very low speed will be crawling forever - auto const brakingpointoffset = ( - ( VelNext == 0.0 ) && is_train() && ( OrderCurrentGet() & Obey_train ) ? - stopping_margin() : // the same stopping point as the final approach - VelNext * braking_distance_multiplier( static_cast( VelNext ) ) ); - // a pneumatic brake acts on the state the train will be in once it has responded; while the - // train is still speeding up, plan the deceleration from there, so more is asked for at once - auto velocity { vel }; - auto distance { ActualProximityDist }; - if( ( BrakeSystem == TBrakeSystem::Pneumatic ) - && ( AbsAccS > 0.0 ) ) { - auto const horizon { brake_response_horizon( mvOccupied, BrakeSystem, AbsAccS, fBrake_a0[ 0 ] ) }; - velocity = vel + 3.6 * horizon * AbsAccS; - distance = std::max( 0.5 * ActualProximityDist, ActualProximityDist - ( vel + velocity ) * 0.5 / 3.6 * horizon ); - } - auto const brakingroom { - std::max( - distance - brakingpointoffset, - std::min( - distance, - brakingpointoffset ) ) }; - auto deceleration { ( VelNext * VelNext - velocity * velocity ) / ( 25.92 * brakingroom + 0.1 ) }; - if( ( BrakeSystem == TBrakeSystem::Pneumatic ) && ( velocity > VelNext ) ) { - // follow the shape of the consist brake force over speed rather than assume a constant - // deceleration, over the distance left once the brake has had time to fill (while the - // train is still speeding up, the prediction above has taken that off already) - auto room { brakingroom }; - if( ( AbsAccS <= 0.0 ) - && ( BrakeCtrlPosition <= 0.0 ) ) { // only while the brake is still to be applied: once it acts, the room it needs to respond is behind - room = std::max( - 0.5 * brakingroom, - brakingroom - vel / 3.6 * brake_response_horizon( mvOccupied, BrakeSystem, 1.0, fBrake_a0[ 0 ] ) ); - } - deceleration = shaped_braking_demand( - velocity, VelNext, room + 0.1 / 25.92, fAccGravity, - { fBrake_a0, fBrake_a1, BrakeAccTableSize, mvOccupied->Vmax } ); - } - AccDesired = std::min( AccDesired, deceleration ); // najpierw hamuje mocniej, potem zluzuje - if( vel > VelNext ) { - if( deceleration < fAccGravity - 0.001 ) { - // no power while still above the speed being braked for - AccDesired = std::min( AccDesired, EU07_AI_NOACCELERATION ); - } - else if( ( fAccGravity < -0.025 ) - && ( ( OrderCurrentGet() & Obey_train ) != 0 ) - && ( false == uphill_brake_committed( vel ) ) - && ( ActualProximityDist - uphill_stopping_distance( vel, fAccGravity ) > brakingpointoffset ) ) { - // uphill the gradient alone slows the train down more than it is asked to; - // keep it rolling at the present speed until that changes - AccDesired = std::min( 0.0, AccPreferred ); - VelDesired = min_speed( VelDesired, uphill_coasting_speed( ActualProximityDist - brakingpointoffset, fAccGravity ) ); - } - } - } - } + adjust_desired_speed_for_braking_curve( vel ); AccDesired = std::min( AccDesired, AccPreferred ); } else { diff --git a/vehicle/Driver.h b/vehicle/Driver.h index 700b41f75..7698fedb7 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -353,6 +353,7 @@ private: bool increase_train_brake(); void hold_train_coming_to_stand_uphill(); void adjust_desired_speed_for_final_approach( double const Vel ); + void adjust_desired_speed_for_braking_curve( double const Vel ); void adjust_desired_speed_for_target_speed( double const Range ); void adjust_desired_speed_for_current_speed(); void adjust_desired_speed_for_braking_test(); From d3dd883700be5979ad2596b2f0f4c1d57931cdd6 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 23:13:00 +0100 Subject: [PATCH 310/430] feat: light programmer positions can switch the cab light (eu07/maszyna#529) An optional third column in the LightsList rows of the .fiz sets the cab interior light when the driver moves the light preset selector to that position: 0 off, 1 on, 3 on dimmed (bit 2 the dimmer). Rows without the column, or with a negative value, leave the cab light to its own switch, so the existing tables work as before; a stray note after the two light columns (e.g. "38 38 / A") is not read as the flag. The light follows the occupied cab, or all cabs of a JointCabs vehicle, as with the interior light commands; the dimmer switch is moved along. The lightsset custom position and the AI leave the cab light alone. Covered by tests/unit/test_lights_preset_cablight.cpp. (eu07/maszyna#529) --- McZapkie/MOVER.h | 26 ++++++ McZapkie/Mover.cpp | 29 +++++++ tests/unit/test_lights_preset_cablight.cpp | 96 ++++++++++++++++++++++ vehicle/Train.cpp | 35 ++++++++ vehicle/Train.h | 2 + 5 files changed, 188 insertions(+) create mode 100644 tests/unit/test_lights_preset_cablight.cpp diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 16bb207fa..3da9c8aa4 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -10,7 +10,9 @@ http://mozilla.org/MPL/2.0/. #pragma once //--------------------------------------------------------------------------- // Q: 20160805 - odlaczenie pliku fizyki .pas od kompilacji +#include #include +#include #include "hamulce.h" #include "scripting/ladderlogic.h" @@ -324,6 +326,21 @@ enum light highbeamlight_right = 1 << 10 }; +/// The cab interior light a position of the light preset selector sets (eu07/maszyna#529). +struct lights_preset_cablight +{ + /// Bits of the optional third column of a LightsList row. + enum flag + { + /// The cab light is on. + light_on = 1 << 0, + /// The cab light is dimmed. + light_dimmed = 1 << 1 + }; + bool light{false}; + bool dim{false}; +}; + /// Door operation method (who controls them and how) — mutually exclusive. enum control_t { @@ -1703,6 +1720,13 @@ class TMoverParameters int LightsDefPos = 1; bool LightsWrap = false; int Lights[2][18]; // pozycje świateł, przód - tył, 1 .. 16 (17 do lightsset) + // the cab interior light each light preset sets, from the optional third column of LightsList (bits of + // lights_preset_cablight::flag); -1: the preset leaves the cab light as it is (eu07/maszyna#529) + std::array LightsCabLight{[] { + std::array positions; + positions.fill(-1); + return positions; + }()}; int ScndInMain{0}; /*zaleznosc bocznika od nastawnika*/ bool MBrake = false; /*Czy jest hamulec reczny*/ double maxTachoSpeed = {0.0}; // maksymalna predkosc na tarczce predkosciomierza analogowego @@ -2602,6 +2626,8 @@ class TMoverParameters bool LoadFIZ_Text(std::string const &Text); // the same, from text in the .fiz format bool CheckLocomotiveParameters(bool ReadyFlag, int Dir); std::string EngineDescription(int what) const; + // the cab interior light the light preset at given position (1-based, as LightsPos) sets, if it sets one + std::optional LightsPresetCabLight(int Position) const; private: bool LoadFIZ_Parse(cParser &Parser); // reads the definition from either of the above diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 20761bacb..a9a64eaf6 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -17,6 +17,7 @@ http://mozilla.org/MPL/2.0/. #include "utilities/parser.h" #include "simulation/simulation.h" +#include #include #include //--------------------------------------------------------------------------- @@ -9493,10 +9494,38 @@ bool TMoverParameters::readLightsList(std::string const &Input) return false; } parser >> Lights[0][idx] >> Lights[1][idx]; + // optional third column: the cab interior light the preset sets (eu07/maszyna#529). anything but a whole number + // (some rows carry stray notes after the two columns) leaves the cab light to its own switch + LightsCabLight[idx] = -1; + if (true == parser.getTokens(1, false)) + { + std::string cablight; + parser >> cablight; + int flags{-1}; + auto const [end, error]{std::from_chars(cablight.data(), cablight.data() + cablight.size(), flags)}; + if (error == std::errc{} && end == cablight.data() + cablight.size() && flags >= 0) + { + LightsCabLight[idx] = flags; + } + } return true; } +std::optional TMoverParameters::LightsPresetCabLight(int const Position) const +{ + if (Position < 1 || Position > static_cast(LightsCabLight.size())) + { + return std::nullopt; + } + auto const flags{LightsCabLight[Position - 1]}; + if (flags < 0) + { + return std::nullopt; + } + return lights_preset_cablight{(flags & lights_preset_cablight::light_on) != 0, (flags & lights_preset_cablight::light_dimmed) != 0}; +} + bool TMoverParameters::readCompressorList(std::string const &Input) { diff --git a/tests/unit/test_lights_preset_cablight.cpp b/tests/unit/test_lights_preset_cablight.cpp new file mode 100644 index 000000000..7c64c7d5a --- /dev/null +++ b/tests/unit/test_lights_preset_cablight.cpp @@ -0,0 +1,96 @@ +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" + +// the cab interior light set by the positions of the light preset selector: an optional third column of LightsList, +// 1 the cab light on, 2 dimmed, 0 off; a row without it leaves the cab light to its own switch (eu07/maszyna#529) + +using test::definition; +using test::vehicle; + +namespace { + +auto const shunting{light::headlight_left | light::headlight_right}; + +} // namespace + +TEST_CASE("lights preset cab light: a table without the column sets no position's cab light") { + vehicle wagon{definition::load("wagon") + .set("LightsList", "Size", 2) + .set("LightsList", "Default", 1) + .set("LightsList", "rows", {{0, 0}, {shunting, shunting}})}; + + REQUIRE(wagon->LightsPosNo == 2); + CHECK(wagon->Lights[end::front][1] == shunting); + CHECK_FALSE(wagon->LightsPresetCabLight(1).has_value()); + CHECK_FALSE(wagon->LightsPresetCabLight(2).has_value()); +} + +TEST_CASE("lights preset cab light: the third column turns the cab light off, on, or on dimmed") { + // off - shunting - shunting with the cab lit - shunting with the cab lit dimmed - shunting leaving the cab light + vehicle wagon{definition::load("wagon") + .set("LightsList", "Size", 5) + .set("LightsList", "Default", 1) + .set("LightsList", "rows", {{0, 0, 0}, {shunting, shunting}, {shunting, shunting, 1}, {shunting, shunting, 3}, {shunting, 0, -1}})}; + + REQUIRE(wagon->LightsPosNo == 5); + // the light columns read as before + CHECK(wagon->Lights[end::front][2] == shunting); + CHECK(wagon->Lights[end::rear][2] == shunting); + CHECK(wagon->Lights[end::rear][4] == 0); + + auto const off{wagon->LightsPresetCabLight(1)}; + REQUIRE(off.has_value()); + CHECK_FALSE(off->light); + CHECK_FALSE(off->dim); + + CHECK_FALSE(wagon->LightsPresetCabLight(2).has_value()); + + auto const lit{wagon->LightsPresetCabLight(3)}; + REQUIRE(lit.has_value()); + CHECK(lit->light); + CHECK_FALSE(lit->dim); + + auto const dimmed{wagon->LightsPresetCabLight(4)}; + REQUIRE(dimmed.has_value()); + CHECK(dimmed->light); + CHECK(dimmed->dim); + + // a negative value is the same as no value + CHECK_FALSE(wagon->LightsPresetCabLight(5).has_value()); +} + +TEST_CASE("lights preset cab light: positions outside the table, and the lightsset custom one, set nothing") { + vehicle wagon{definition::load("wagon") + .set("LightsList", "Size", 1) + .set("LightsList", "Default", 1) + .set("LightsList", "rows", {{shunting, shunting, 1}})}; + + CHECK(wagon->LightsPresetCabLight(1).has_value()); + CHECK_FALSE(wagon->LightsPresetCabLight(0).has_value()); + CHECK_FALSE(wagon->LightsPresetCabLight(2).has_value()); + CHECK_FALSE(wagon->LightsPresetCabLight(18).has_value()); + CHECK_FALSE(wagon->LightsPresetCabLight(19).has_value()); +} + +TEST_CASE("lights preset cab light: a stray note after the two columns is not read as the cab light") { + // some vehicles of the game carry rows like "38 38 / A" + auto text{definition::load("wagon") + .set("LightsList", "Size", 2) + .set("LightsList", "Default", 1) + .set("LightsList", "rows", {{0, 0}, {38, 38}}) + .text()}; + auto const list{text.find("LightsList")}; + REQUIRE(list != std::string::npos); + auto const row{text.find("38", list)}; + REQUIRE(row != std::string::npos); + auto const rowend{text.find('\n', row)}; + REQUIRE(rowend != std::string::npos); + text.insert(rowend, " / A"); + TMoverParameters wagon(0.0, "wagon", "test", 0); + REQUIRE(wagon.LoadFIZ_Text(text)); + REQUIRE(wagon.LightsPosNo == 2); + CHECK(wagon.Lights[end::front][1] == 38); + CHECK(wagon.Lights[end::rear][1] == 38); + CHECK_FALSE(wagon.LightsPresetCabLight(2).has_value()); +} diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index e30635f4f..848277913 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -5153,6 +5153,39 @@ void TTrain::OnCommand_universalrelayreset(TTrain *Train, command_data const &Co } } +// the cab interior light set by the light preset just selected, if the preset sets one (eu07/maszyna#529). +// the cab light switch (cablight_sw:) is bound to the light state and follows it by itself +void TTrain::set_cab_light_from_lights_preset() +{ + auto const cablight{mvOccupied->LightsPresetCabLight(mvOccupied->LightsPos)}; + if (false == cablight.has_value()) + { + return; + } + auto const set{[&cablight](TCab &Cab) { + Cab.bLight = cablight->light; + Cab.bLightDim = cablight->dim; + }}; + if (false == DynamicObject->JointCabs) + { + // vehicles with separate cabs get separate lighting switch states + set(Cabine[iCabn]); + } + else + { + // joint virtual cabs share lighting switch states + for (auto &cab : Cabine) + { + set(cab); + } + } + // the dimmer switch is driven by commands only, move it along + if (ggCabLightDimButton.SubModel != nullptr) + { + ggCabLightDimButton.UpdateValue(cablight->dim ? 1.f : 0.f); + } +} + void TTrain::OnCommand_lightspresetactivatenext(TTrain *Train, command_data const &Command) { @@ -5174,6 +5207,7 @@ void TTrain::OnCommand_lightspresetactivatenext(TTrain *Train, command_data cons Train->mvOccupied->LightsPos = false == restartcycle ? Train->mvOccupied->LightsPos + 1 : 1; // wrap mode Train->Dynamic()->SetLights(); + Train->set_cab_light_from_lights_preset(); // visual feedback if (Train->ggLightsButton.SubModel != nullptr) { @@ -5211,6 +5245,7 @@ void TTrain::OnCommand_lightspresetactivateprevious(TTrain *Train, command_data Train->mvOccupied->LightsPos = false == restartcycle ? Train->mvOccupied->LightsPos - 1 : Train->mvOccupied->LightsPosNo; // wrap mode Train->Dynamic()->SetLights(); + Train->set_cab_light_from_lights_preset(); // visual feedback if (Train->ggLightsButton.SubModel != nullptr) { diff --git a/vehicle/Train.h b/vehicle/Train.h index 009b349b4..431e52642 100644 --- a/vehicle/Train.h +++ b/vehicle/Train.h @@ -189,6 +189,8 @@ class TTrain { // sets cabin controls based on current state of the vehicle // NOTE: we can get rid of this function once we have per-cab persistent state void set_cab_controls( int const Cab ); + // sets the cab interior light as the selected light preset says, if it says anything (eu07/maszyna#529) + void set_cab_light_from_lights_preset(); // initializes a gauge matching provided label. returns: true if the label was found, false otherwise bool initialize_gauge(cParser &Parser, std::string const &Label, int const Cabindex); // initializes a button matching provided label. returns: true if the label was found, false otherwise From d259251373f23d0dd4d9f5f2557a257c568dd844 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 23:19:53 +0100 Subject: [PATCH 311/430] feat: cab controls can animate duplicate submodels (eu07/maszyna#527) A control defined again in the same cab section of the .mmd with the block key "duplicate: yes" no longer replaces the control: the first definition stays the control (sounds, type, command feedback), and the duplicate adds a copy with its own submodel, animation type and scale / offset, following the control's value and active state. The duplicate's sound keys are ignored so the control is not heard twice, and clicking any copy works the control. This lets e.g. the ASF cab move its second master controller and reverser with the first ones. Without the key a repeated definition still replaces the earlier one, as some of the game's .mmd files repeat controls with other submodels. A duplicate with no definition of the control loaded from the current cab's models before it is just the control. clear_cab_controls() now also clears ggCompressorListButton, which kept the previous cab's submodel. The rule is in vehicle/gaugeduplicates.h, covered by tests/unit/test_gauge_duplicates.cpp. (eu07/maszyna#527) --- tests/unit/test_gauge_duplicates.cpp | 53 ++++++++++++++++++++++ vehicle/Gauge.cpp | 68 +++++++++++++++++++++++++--- vehicle/Gauge.h | 12 +++++ vehicle/Train.cpp | 6 +++ vehicle/gaugeduplicates.h | 30 ++++++++++++ 5 files changed, 163 insertions(+), 6 deletions(-) create mode 100644 tests/unit/test_gauge_duplicates.cpp create mode 100644 vehicle/gaugeduplicates.h diff --git a/tests/unit/test_gauge_duplicates.cpp b/tests/unit/test_gauge_duplicates.cpp new file mode 100644 index 000000000..7bdbe9095 --- /dev/null +++ b/tests/unit/test_gauge_duplicates.cpp @@ -0,0 +1,53 @@ +#include "stdafx.h" +#include "doctest.h" + +#include "vehicle/gaugeduplicates.h" + +// cab controls with more than one submodel (eu07/maszyna#527): a definition of a control in the .mmd marked +// "duplicate: yes" adds a copy of the control already defined in the cab, instead of replacing it. TGauge itself +// (3d models, sounds) is not part of the core library, the rule which decides it is + +namespace { + +// stand-ins for the 3d models of the cab +struct model {}; + +} // namespace + +TEST_CASE("gauge duplicates: the values of the duplicate key which mark a duplicate") { + CHECK(gauge_duplicates::is_duplicate("yes")); + CHECK(gauge_duplicates::is_duplicate("true")); + CHECK(gauge_duplicates::is_duplicate("1")); + CHECK_FALSE(gauge_duplicates::is_duplicate("no")); + CHECK_FALSE(gauge_duplicates::is_duplicate("false")); + CHECK_FALSE(gauge_duplicates::is_duplicate("0")); + CHECK_FALSE(gauge_duplicates::is_duplicate("")); +} + +TEST_CASE("gauge duplicates: a duplicate adds a copy to the control loaded from either model of the cab") { + model cab; + model lowpoly; + CHECK(gauge_duplicates::adds_copy(true, &cab, &cab, &lowpoly)); + CHECK(gauge_duplicates::adds_copy(true, &lowpoly, &cab, &lowpoly)); + // a cab without a low poly interior + CHECK(gauge_duplicates::adds_copy(true, &cab, &cab, nullptr)); +} + +TEST_CASE("gauge duplicates: a definition not marked as a duplicate replaces the control, as before") { + model cab; + model lowpoly; + CHECK_FALSE(gauge_duplicates::adds_copy(false, &cab, &cab, &lowpoly)); + CHECK_FALSE(gauge_duplicates::adds_copy(false, nullptr, &cab, &lowpoly)); +} + +TEST_CASE("gauge duplicates: with nothing loaded in this cab a duplicate is the control itself") { + model cab; + model lowpoly; + model previouscab; + // the control isn't defined before it + CHECK_FALSE(gauge_duplicates::adds_copy(true, nullptr, &cab, &lowpoly)); + CHECK_FALSE(gauge_duplicates::adds_copy(true, nullptr, &cab, nullptr)); + // the control is left over from the cab loaded before + CHECK_FALSE(gauge_duplicates::adds_copy(true, &previouscab, &cab, &lowpoly)); + CHECK_FALSE(gauge_duplicates::adds_copy(true, &previouscab, &cab, nullptr)); +} diff --git a/vehicle/Gauge.cpp b/vehicle/Gauge.cpp index af8e9a060..2190370e0 100644 --- a/vehicle/Gauge.cpp +++ b/vehicle/Gauge.cpp @@ -16,6 +16,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "vehicle/Gauge.h" #include "vehicle/gaugepositions.h" +#include "vehicle/gaugeduplicates.h" #include "utilities/parser.h" #include "model/Model3d.h" #include "vehicle/DynObj.h" @@ -109,6 +110,14 @@ void TGauge::Load( cParser &Parser, TDynamicObject const *Owner, double const mu endvalue = -1; bool interpolatescale { false }; + // the control as defined so far in this cab, which a definition marked as its duplicate adds a copy to + // rather than replacing it (eu07/maszyna#527) + std::optional original; + if( gauge_duplicates::adds_copy( true, m_sourcemodel, Owner->mdKabina, Owner->mdLowPolyInt ) ) { + original = *this; + } + scratch_data scratchpad; + Parser.getTokens(); if( Parser.peek() != "{" ) { // old fixed size config @@ -148,7 +157,6 @@ void TGauge::Load( cParser &Parser, TDynamicObject const *Owner, double const mu } // new, variable length section { - scratch_data scratchpad; while( true == Load_mapping( Parser, scratchpad ) ) { // all work done by while() } @@ -190,17 +198,20 @@ void TGauge::Load( cParser &Parser, TDynamicObject const *Owner, double const mu endscale *= static_cast(mul); } TSubModel *submodel { nullptr }; + m_sourcemodel = nullptr; std::array sources { Owner->mdKabina, Owner->mdLowPolyInt }; for( auto const *source : sources ) { if( source != nullptr && ( submodel = source->GetFromName( submodelname ) ) != nullptr ) { // got what we wanted, bail out + m_sourcemodel = source; break; } // there's a possibility the default submodel was named with _off suffix if( source != nullptr && ( submodel = source->GetFromName( submodelname + "_off" ) ) != nullptr ) { // got what we wanted, bail out + m_sourcemodel = source; break; } } @@ -230,6 +241,14 @@ void TGauge::Load( cParser &Parser, TDynamicObject const *Owner, double const mu Init( submodel, submodelon, type, scale, offset, friction, 0, endvalue, endscale, interpolatescale ); + if( scratchpad.duplicate && original ) { + // a duplicate submodel of the control already defined: the control stays as it was, with one more copy + // animated along with it. the duplicate's own sounds, if any, are left out so the control isn't heard twice + auto duplicate { MirrorCopy() }; + *this = std::move( *original ); + m_mirrors.emplace_back( std::move( duplicate ) ); + } + // return md2 != nullptr; // true, gdy podany model zewnętrzny, a w kabinie nie było }; @@ -240,7 +259,12 @@ TGauge::Load_mapping( cParser &Input, TGauge::scratch_data &Scratchpad ) { auto const key { Input.getToken( true, "\n\r\t ,;" ) }; if( true == key.empty() || key == "}" ) { return false; } // if not block end then the key is followed by assigned value or sub-block - if( key == "type:" ) { + if( key == "duplicate:" ) { + // the definition is another submodel of the control defined before it, rather than its replacement + auto const duplicate { Input.getToken( true, "\n\r\t ,;" ) }; + Scratchpad.duplicate = gauge_duplicates::is_duplicate( duplicate ); + } + else if( key == "type:" ) { using enum TGaugeType; auto const gaugetype { Input.getToken( true, "\n\r\t ,;" ) }; m_type = gaugetype == "push" ? push : @@ -376,6 +400,22 @@ void TGauge::Update( bool const Power ) { else { m_soundfxoff.play(); } } m_state = state; + UpdateVisibility(); + // update submodel animations + UpdateAnimation( SubModel ); + UpdateAnimation( SubModelOn ); + // the copies follow the control's value and state, each with its own animation + for( auto &mirror : m_mirrors ) { + mirror.m_value = m_value; + mirror.m_targetvalue = m_targetvalue; + mirror.m_state = m_state; + mirror.UpdateVisibility(); + mirror.UpdateAnimation( mirror.SubModel ); + mirror.UpdateAnimation( mirror.SubModelOn ); + } +}; + +void TGauge::UpdateVisibility() const { // toggle submodel visibility only if the active state submodel is present, // keep the default model always visible otherwise if( SubModelOn != nullptr ) { @@ -384,10 +424,26 @@ void TGauge::Update( bool const Power ) { SubModel->iVisible = !m_state; } } - // update submodel animations - UpdateAnimation( SubModel ); - UpdateAnimation( SubModelOn ); -}; +} + +TGauge TGauge::MirrorCopy() const { + + TGauge mirror; + mirror.SubModel = SubModel; + mirror.SubModelOn = SubModelOn; + mirror.m_animation = m_animation; + mirror.m_friction = m_friction; + mirror.m_targetvalue = m_targetvalue; + mirror.m_value = m_value; + mirror.m_offset = m_offset; + mirror.m_scale = m_scale; + mirror.m_endscale = m_endscale; + mirror.m_endvalue = m_endvalue; + mirror.m_interpolatescale = m_interpolatescale; + mirror.m_state = m_state; + mirror.m_sourcemodel = m_sourcemodel; + return mirror; +} void TGauge::AssignFloat(float *fValue) { diff --git a/vehicle/Gauge.h b/vehicle/Gauge.h index fdef9c58e..c78cdb069 100644 --- a/vehicle/Gauge.h +++ b/vehicle/Gauge.h @@ -55,6 +55,9 @@ public: void AssignBool(bool *bValue); void UpdateValue(); void AssignState( bool const *State ); + // copies of the control animated along with it, from its definitions marked duplicate: yes + std::vector const &mirrors() const { + return m_mirrors; } // returns offset of submodel associated with the button from the model centre glm::vec3 model_offset() const; TGaugeType type() const; @@ -74,6 +77,7 @@ private: // types struct scratch_data { std::optional< std::array > soundproofing; + bool duplicate { false }; // the definition is a duplicate submodel of the control defined before }; // methods // imports member data pair from the config file @@ -83,6 +87,12 @@ private: GetScaledValue() const; void UpdateAnimation( TSubModel *Submodel ) const; + // shows the default or the active state submodel as the state says + void + UpdateVisibility() const; + // the copy of this control's submodels and animation, without its sounds and bindings + TGauge + MirrorCopy() const; // members TGaugeAnimation m_animation { TGaugeAnimation::gt_Unknown }; // typ ruchu @@ -112,6 +122,8 @@ private: sound_source m_soundfxincrease { m_soundtemplate }; // sound associated with increasing control's value sound_source m_soundfxdecrease { m_soundtemplate }; // sound associated with decreasing control's value std::map m_soundfxvalues; // sounds associated with specific values + TModel3d const *m_sourcemodel { nullptr }; // the 3d model the submodel was found in by Load() + std::vector m_mirrors; // duplicate submodels of the control (duplicate: yes), animated along with it }; diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index e30635f4f..a9bdfd86e 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -59,6 +59,11 @@ void control_mapper::insert(TGauge const &Gauge, std::string const &Label) { m_controlnames.try_emplace(Gauge.SubModelOn, Label); } + // the duplicate submodels of a control (duplicate: yes) work the control as well (eu07/maszyna#527) + for (auto const &mirror : Gauge.mirrors()) + { + insert(mirror, Label); + } m_names.emplace(Label); } @@ -11266,6 +11271,7 @@ void TTrain::clear_cab_controls() ggLeftEndLightButton.Clear(); ggRightEndLightButton.Clear(); ggLightsButton.Clear(); + ggCompressorListButton.Clear(); // hunter-230112 ggRearLeftLightButton.Clear(); ggRearRightLightButton.Clear(); diff --git a/vehicle/gaugeduplicates.h b/vehicle/gaugeduplicates.h new file mode 100644 index 000000000..3a20c9306 --- /dev/null +++ b/vehicle/gaugeduplicates.h @@ -0,0 +1,30 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include + +// cab controls with more than one submodel (eu07/maszyna#527): a definition of a control in the .mmd marked +// "duplicate: yes" adds a copy of the control already defined in the cab, instead of replacing it +namespace gauge_duplicates { + +// whether the value of the duplicate: key marks the definition as a duplicate +inline bool is_duplicate(std::string_view const Value) { + return Value == "yes" || Value == "true" || Value == "1"; +} + +// whether a definition adds a copy to the control rather than replacing it: it is marked as a duplicate, and the +// control is already loaded from one of the 3d models of the cab being loaded (Cab, Lowpoly). a control left over +// from another cab, or not loaded at all (Loadedfrom null), has nothing in this cab to add the copy to +template bool adds_copy(bool const Duplicate, Model_ const *Loadedfrom, Model_ const *Cab, Model_ const *Lowpoly) { + return Duplicate && Loadedfrom != nullptr && (Loadedfrom == Cab || Loadedfrom == Lowpoly); +} + +} // namespace gauge_duplicates From 326a84445b7dbb21ce3cabfaadad600d9d29d841 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 7 Nov 2026 23:30:10 +0100 Subject: [PATCH 312/430] fix(lights): keep the headlight dimmer position within the DimmerList modernDimmerPosition indexed dimPositions without a range check in RaLightsSet(), SetLightDimmings() and the off_from_dimmer value of the cab's Python state. An empty DimmerList, or a DefaultPos past the end of a short one, read past the end of the vector; the dimmer commands could also leave or put the position outside the list. Reads go through currentDimPosition(), a plain entry (not off, not dimmed) outside the list. DefaultPos and the position are clamped after the .fiz is loaded, the increase/decrease commands step through stepDimmerPosition(), which clamps and does nothing for an empty list, and headlightsdimenable clamps its position 1. --- McZapkie/MOVER.h | 8 +++ McZapkie/Mover.cpp | 49 ++++++++++++++++ tests/unit/test_dimmer.cpp | 112 +++++++++++++++++++++++++++++++++++++ vehicle/DynObj.cpp | 8 +-- vehicle/Train.cpp | 28 +++------- 5 files changed, 178 insertions(+), 27 deletions(-) create mode 100644 tests/unit/test_dimmer.cpp diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 16bb207fa..0ef9505d1 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -2286,6 +2286,14 @@ class TMoverParameters // bool modernContainOffPos{true}; bool enableModernDimmer{false}; bool modernDimmerCanCycle{false}; + // the given dimmer position brought into the DimmerList, to its first or last entry; 0 for an empty list + int clampDimmerPosition(int Position) const; + // the entry of the current dimmer position, or a plain one (not off, not dimmed, no high beam) when the + // position is outside the DimmerList: the .fiz can give a short or an empty list, or a DefaultPos past its end + dimPosition currentDimPosition() const; + // moves the dimmer by Step positions within the DimmerList, around to its other end when it can cycle; + // a position outside the list is brought into it first. false when the dimmer doesn't move + bool stepDimmerPosition(int Step); // Barwa reflektora int refR{255}; // Czerwony diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 20761bacb..e018b65db 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -9448,6 +9448,52 @@ bool TMoverParameters::readDimmerList(std::string const &line) return true; } +int TMoverParameters::clampDimmerPosition(int const Position) const +{ + if (dimPositions.empty()) + { + return 0; + } + return std::clamp(Position, 0, static_cast(dimPositions.size()) - 1); +} + +TMoverParameters::dimPosition TMoverParameters::currentDimPosition() const +{ + if (modernDimmerPosition < 0 || modernDimmerPosition >= static_cast(dimPositions.size())) + { + return {}; + } + return dimPositions[modernDimmerPosition]; +} + +bool TMoverParameters::stepDimmerPosition(int const Step) +{ + if (dimPositions.empty()) + { + return false; + } + auto const last{static_cast(dimPositions.size()) - 1}; + auto const current{clampDimmerPosition(modernDimmerPosition)}; + auto next{current + Step}; + if (next < 0 || next > last) + { + if (false == modernDimmerCanCycle) + { + next = current; + } + else + { + next = (next < 0 ? last : 0); + } + } + if (next == modernDimmerPosition) + { + return false; + } + modernDimmerPosition = next; + return true; +} + // parsowanie WWList bool TMoverParameters::readWWList(std::string const &line) { @@ -10249,6 +10295,9 @@ bool TMoverParameters::LoadFIZ_Parse(cParser &fizparser) // NOSONAR the former b result = false; // ustawiamy domyslna pozycje dimmera + // the DefaultPos of a short or an empty DimmerList would put the dimmer outside of it + modernDimmerDefaultPosition = clampDimmerPosition(modernDimmerDefaultPosition); + modernDimmerPosition = clampDimmerPosition(modernDimmerPosition); if (!enableModernDimmer) { modernDimmerPosition = modernDimmerDefaultPosition; diff --git a/tests/unit/test_dimmer.cpp b/tests/unit/test_dimmer.cpp new file mode 100644 index 000000000..d4d2e2663 --- /dev/null +++ b/tests/unit/test_dimmer.cpp @@ -0,0 +1,112 @@ +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" + +using test::definition; +using test::vehicle; + +// the headlight dimmer's position indexes the DimmerList of the .fiz. a short or an empty list, or a DefaultPos +// past its end, put the dimmer outside the list, where the lights and the cab read past the end of it + +namespace { + +// rows: high beam, dimmed, off +nlohmann::ordered_json const plain{"no", "no", "no"}; +nlohmann::ordered_json const dimmed{"no", "yes", "no"}; +nlohmann::ordered_json const off{"no", "no", "yes"}; + +definition dimmer_list(nlohmann::ordered_json const &Rows, int const Defaultposition, bool const Cycle = false) { + return definition::load("cab_vehicle") + .set("DimmerList", "rows", Rows) + .set("DimmerList", "Size", static_cast(Rows.size())) + .set("DimmerList", "DefaultPos", Defaultposition) + .set("DimmerList", "Cycle", Cycle ? "yes" : "no"); +} + +} // namespace + +TEST_CASE("dimmer: a position outside the list reads as a plain one, neither off nor dimmed") { + vehicle cab{dimmer_list(nlohmann::ordered_json::array({off, dimmed}), 0)}; + REQUIRE(cab->dimPositions.size() == 2); + + for (auto const position : {-1, 2, 100}) { + CAPTURE(position); + cab->modernDimmerPosition = position; + auto const entry{cab->currentDimPosition()}; + CHECK_FALSE(entry.isOff); + CHECK_FALSE(entry.isDimmed); + CHECK_FALSE(entry.isHighBeam); + } + cab->modernDimmerPosition = 0; + CHECK(cab->currentDimPosition().isOff); + cab->modernDimmerPosition = 1; + CHECK(cab->currentDimPosition().isDimmed); +} + +TEST_CASE("dimmer: positions are clamped to the list") { + vehicle cab{dimmer_list(nlohmann::ordered_json::array({plain, dimmed, off}), 0)}; + + CHECK(cab->clampDimmerPosition(-3) == 0); + CHECK(cab->clampDimmerPosition(1) == 1); + CHECK(cab->clampDimmerPosition(3) == 2); + CHECK(cab->clampDimmerPosition(100) == 2); +} + +TEST_CASE("dimmer: a DefaultPos past the end of the list starts the dimmer at its last position") { + vehicle cab{dimmer_list(nlohmann::ordered_json::array({plain, dimmed}), 7)}; + + CHECK(cab->modernDimmerDefaultPosition == 1); + // the cab puts the modern dimmer to its default position when it's entered (TTrain::set_cab_controls()) + cab->modernDimmerPosition = cab->modernDimmerDefaultPosition; + CHECK(cab->currentDimPosition().isDimmed); +} + +TEST_CASE("dimmer: without the modern dimmer a DefaultPos past the end of the list puts the dimmer at its last position") { + vehicle cab{dimmer_list(nlohmann::ordered_json::array({plain, dimmed}), 7).set("Switches", "ModernDimmer", "No")}; + REQUIRE_FALSE(cab->enableModernDimmer); + + CHECK(cab->modernDimmerPosition == 1); + CHECK(cab->currentDimPosition().isDimmed); +} + +TEST_CASE("dimmer: an empty list leaves the dimmer at 0, reading as a plain position, and it doesn't move") { + vehicle cab{dimmer_list(nlohmann::ordered_json::array(), 3, true)}; + REQUIRE(cab->dimPositions.empty()); + + CHECK(cab->modernDimmerDefaultPosition == 0); + CHECK(cab->modernDimmerPosition == 0); + CHECK(cab->clampDimmerPosition(1) == 0); + CHECK_FALSE(cab->currentDimPosition().isOff); + CHECK_FALSE(cab->stepDimmerPosition(1)); + CHECK_FALSE(cab->stepDimmerPosition(-1)); + CHECK(cab->modernDimmerPosition == 0); +} + +TEST_CASE("dimmer: stepping stays within the list") { + SUBCASE("without cycling it stops at the ends") { + vehicle cab{dimmer_list(nlohmann::ordered_json::array({plain, dimmed, off}), 0)}; + CHECK_FALSE(cab->stepDimmerPosition(-1)); + CHECK(cab->modernDimmerPosition == 0); + CHECK(cab->stepDimmerPosition(1)); + CHECK(cab->stepDimmerPosition(1)); + CHECK(cab->modernDimmerPosition == 2); + CHECK_FALSE(cab->stepDimmerPosition(1)); + CHECK(cab->modernDimmerPosition == 2); + } + SUBCASE("with cycling it goes around to the other end") { + vehicle cab{dimmer_list(nlohmann::ordered_json::array({plain, dimmed, off}), 0, true)}; + CHECK(cab->stepDimmerPosition(-1)); + CHECK(cab->modernDimmerPosition == 2); + CHECK(cab->stepDimmerPosition(1)); + CHECK(cab->modernDimmerPosition == 0); + } + SUBCASE("a position past the end steps from the last one") { + vehicle cab{dimmer_list(nlohmann::ordered_json::array({plain, dimmed, off}), 0)}; + cab->modernDimmerPosition = 9; + CHECK(cab->stepDimmerPosition(-1)); + CHECK(cab->modernDimmerPosition == 1); + cab->modernDimmerPosition = 9; + CHECK(cab->stepDimmerPosition(1)); // can't go further, but comes back into the list + CHECK(cab->modernDimmerPosition == 2); + } +} diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index d5f60e332..7364c8c70 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -7350,9 +7350,7 @@ void TDynamicObject::RaLightsSet(int head, int rear) bool tRight = MoverParameters->iLights[vehicleend] & (light::auxiliary_right | light::headlight_right); // a tu z prawej if (Controller == Humandriver) { - int ¤tDimPos = MoverParameters->modernDimmerPosition; - auto &dimmerPositions = MoverParameters->dimPositions; - TMoverParameters::dimPosition dps = dimmerPositions[currentDimPos]; + auto const dps{MoverParameters->currentDimPosition()}; // domyślnie HighBeamLights = false; @@ -7414,9 +7412,7 @@ void TDynamicObject::SetLightDimmings() if (Controller == Humandriver) { - int ¤tDimPos = MoverParameters->modernDimmerPosition; - auto &dimmerPositions = MoverParameters->dimPositions; - TMoverParameters::dimPosition dps = dimmerPositions[currentDimPos]; + auto const dps{MoverParameters->currentDimPosition()}; // domyślnie HighBeamLights = false; diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index e30635f4f..7ae4bff15 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -716,7 +716,7 @@ std::shared_ptr TTrain::GetTrainState(dictionary_source const dict->insert("pant_compressor", mvPantographUnit->PantCompFlag); dict->insert("lights_front", mvOccupied->iLights[end::front]); dict->insert("lights_rear", mvOccupied->iLights[end::rear]); - dict->insert("off_from_dimmer", mvOccupied->dimPositions[mvOccupied->modernDimmerPosition].isOff); + dict->insert("off_from_dimmer", mvOccupied->currentDimPosition().isOff); dict->insert("lights_compartments", mvOccupied->CompartmentLights.is_active || mvOccupied->CompartmentLights.is_disabled); if (Dynamic()->Mechanik) { @@ -5897,14 +5897,9 @@ void TTrain::OnCommand_modernlightdimmerincrease(TTrain *Train, command_data con if (Command.action == GLFW_PRESS) { // update modern dimmer state - - auto &dimPos = Train->mvOccupied->modernDimmerPosition; - if (auto dimCount = Train->mvOccupied->dimPositions.size(); dimPos + 1 < dimCount) - dimPos++; - else if (Train->mvOccupied->modernDimmerCanCycle) - dimPos = 0; // return to 0 - else - return; // już na minimum i nie można cyklicznie + if (false == Train->mvOccupied->stepDimmerPosition(1)) + return; // już na maksimum i nie można cyklicznie + auto const dimPos = Train->mvOccupied->modernDimmerPosition; // update lightning // Train->Dynamic()->SetLights(); Train->Dynamic()->SetLightDimmings(); @@ -5921,18 +5916,9 @@ void TTrain::OnCommand_modernlightdimmerdecrease(TTrain *Train, command_data con if (Command.action == GLFW_PRESS) { - auto &dimPos = Train->mvOccupied->modernDimmerPosition; - auto dimCount = Train->mvOccupied->dimPositions.size(); - - if (dimCount == 0) - return; - - if (dimPos > 0) - dimPos--; - else if (Train->mvOccupied->modernDimmerCanCycle) - dimPos = static_cast(dimCount - 1); // ostatnia pozycja - else + if (false == Train->mvOccupied->stepDimmerPosition(-1)) return; // już na minimum i nie można cyklicznie + auto const dimPos = Train->mvOccupied->modernDimmerPosition; // Train->Dynamic()->SetLights(); Train->Dynamic()->SetLightDimmings(); @@ -6173,7 +6159,7 @@ void TTrain::OnCommand_headlightsdimenable(TTrain *Train, command_data const &Co Train->DynamicObject->DimHeadlights = true; */ - Train->DynamicObject->MoverParameters->modernDimmerPosition = 1; // ustawiamy modern dimmer na flage przyciemnienia + Train->DynamicObject->MoverParameters->modernDimmerPosition = Train->DynamicObject->MoverParameters->clampDimmerPosition(1); // ustawiamy modern dimmer na flage przyciemnienia Train->DynamicObject->SetLightDimmings(); } } From b992df7ab796fddaab97979f6f979aac6636519e Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Sat, 7 Nov 2026 23:53:02 +0100 Subject: [PATCH 313/430] AI braking: slowdowndistance in the init-statement of its if (Sonar S6004) --- vehicle/Driver.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 92a693532..e27dff946 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -7638,13 +7638,13 @@ TController::adjust_desired_speed_for_braking_curve( double const Vel ) { } // allow to coast at reasonably low speed auto const brakingdistance { fBrakeDist * braking_distance_multiplier( VelNext ) }; - auto const slowdowndistance { ( - mvOccupied->CategoryFlag == 2 ? // cars can stop on a dime, for bigger vehicles we enforce some minimal braking distance - brakingdistance : - std::max( - (OrderCurrentGet() & Connect) == 0 ? 100.0 : 25.0, - brakingdistance ) ) }; - if( brakingdistance + std::max(slowdowndistance, fMaxProximityDist) < ActualProximityDist - fMaxProximityDist ) { + if( auto const slowdowndistance { ( + mvOccupied->CategoryFlag == 2 ? // cars can stop on a dime, for bigger vehicles we enforce some minimal braking distance + brakingdistance : + std::max( + (OrderCurrentGet() & Connect) == 0 ? 100.0 : 25.0, + brakingdistance ) ) }; + brakingdistance + std::max(slowdowndistance, fMaxProximityDist) < ActualProximityDist - fMaxProximityDist ) { // don't slow down prematurely; as long as we have room to come to a full stop at a safe distance, we're good return; } From aecc73e89337c8cc73054285a660d6cefd8c91b9 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 01:34:35 +0100 Subject: [PATCH 314/430] fix(render): antialias alpha tested edges with multisampling (eu07/maszyna#449) The sides of the trackbed (and grass, fences, foliage) are cut out of their textures by the alpha test, which keeps or drops whole pixels, so their edges stayed jagged at any multisampling level; only geometry edges got smoothed. With multisampling on, the alpha tested materials of the opaque colour pass now draw with GL_SAMPLE_ALPHA_TO_COVERAGE. Their shaders do the alpha test with alpha_test_fail() of glsl_common and write as alpha the coverage of the test edge: the alpha sharpened around the opacity threshold to go from 0 to 1 over about a pixel, so the edge keeps the place it had and gets the samples it covers. The renderer turns alpha to coverage on per material, only for shaders which use the helper and only in the opaque pass with a positive opacity, so translucent, water, terrain and the other shaders are unchanged. Without multisampling the shaders work as before. --- ci_shadervalidator/Globals.h | 1 + gl/glsl_common.cpp | 30 +++++++++++++++++++ gl/shader.cpp | 3 ++ gl/shader.h | 4 +++ rendering/opengl33renderer.cpp | 24 +++++++++++++++ rendering/opengl33renderer.h | 3 ++ shaders/mat_default.frag | 5 ++-- shaders/mat_default_detail.frag | 5 ++-- shaders/mat_default_specgloss.frag | 5 ++-- shaders/mat_detail_normalmap.frag | 5 ++-- shaders/mat_detail_normalmap_specgloss.frag | 5 ++-- shaders/mat_detail_parallax.frag | 5 ++-- shaders/mat_detail_parallax_specgloss.frag | 5 ++-- shaders/mat_normalmap.frag | 5 ++-- shaders/mat_normalmap_specgloss.frag | 5 ++-- shaders/mat_parallax.frag | 5 ++-- shaders/mat_parallax_specgloss.frag | 5 ++-- shaders/mat_reflmap.frag | 5 ++-- shaders/mat_reflmap_specgloss.frag | 5 ++-- shaders/mat_shadowlessnormalmap.frag | 5 ++-- .../mat_shadowlessnormalmap_specgloss.frag | 5 ++-- shaders/mat_sunlessnormalmap.frag | 5 ++-- shaders/mat_sunlessnormalmap_specgloss.frag | 5 ++-- 23 files changed, 116 insertions(+), 34 deletions(-) diff --git a/ci_shadervalidator/Globals.h b/ci_shadervalidator/Globals.h index 16f85e802..e8f548dc3 100644 --- a/ci_shadervalidator/Globals.h +++ b/ci_shadervalidator/Globals.h @@ -8,6 +8,7 @@ struct _global bool gfx_extraeffects; bool gfx_shadergamma; bool gfx_usegles; + int iMultisampling; }; extern _global Global; diff --git a/gl/glsl_common.cpp b/gl/glsl_common.cpp index 26c310000..a0d38de63 100644 --- a/gl/glsl_common.cpp +++ b/gl/glsl_common.cpp @@ -11,6 +11,7 @@ void gl::glsl_common_setup() "#define MOTIONBLUR_ENABLED " + std::to_string((int)Global.gfx_postfx_motionblur_enabled) + "\n" + "#define POSTFX_ENABLED " + std::to_string((int)!Global.gfx_skippipeline) + "\n" + "#define EXTRAEFFECTS_ENABLED " + std::to_string((int)Global.gfx_extraeffects) + "\n" + + "#define ALPHA_TO_COVERAGE_ENABLED " + std::to_string((int)(Global.iMultisampling > 0)) + "\n" + "#define MAX_LIGHTS " + std::to_string(MAX_LIGHTS) + "U\n" + "#define MAX_CASCADES " + std::to_string(MAX_CASCADES) + "U\n" + "#define MAX_PARAMS " + std::to_string(MAX_PARAMS) + "U\n" + @@ -110,5 +111,34 @@ void gl::glsl_common_setup() } #endif + #ifdef STAGE_FRAGMENT + // alpha tested surfaces (positive opacity, the opaque pass) get the coverage of their alpha + // test edge from GL_SAMPLE_ALPHA_TO_COVERAGE, which the renderer turns on for them with + // multisampling; otherwise the alpha test keeps or drops whole pixels and its edges stay + // jagged whatever the multisampling. the alpha is sharpened to go from 0 to 1 over about + // a pixel around the test threshold, so the edge keeps the place and sharpness the alpha + // test gave it. computed before any discard, which leaves the derivatives undefined + float alpha_coverage(float alpha) + { + #if ALPHA_TO_COVERAGE_ENABLED + if (opacity > 0.0) + return clamp((alpha - opacity) / max(fwidth(alpha), 0.0001) + 0.5, 0.0, 1.0); + #endif + return alpha; + } + + // true for the fragments the alpha test drops: below the opacity threshold in the opaque + // pass, at or above it (negative opacity) in the translucent pass. with alpha to coverage + // only the fragments which cover no sample at all + bool alpha_test_fail(float alpha, float coverage) + { + #if ALPHA_TO_COVERAGE_ENABLED + if (opacity > 0.0) + return coverage <= 0.0; + #endif + return (opacity >= 0.0 ? (alpha < opacity) : (alpha >= -opacity)); + } + #endif + )STRING"; } diff --git a/gl/shader.cpp b/gl/shader.cpp index 9160a2c97..31a3e6a87 100644 --- a/gl/shader.cpp +++ b/gl/shader.cpp @@ -175,6 +175,8 @@ std::pair gl::shader::process_source(const std::string &fil str += "vec4 FBOUT(vec4 x) { return " + (Global.gfx_shadergamma ? std::string("vec4(pow(x.rgb, vec3(1.0 / 2.2)), x.a)") : std::string("x")) + "; }\n"; str += read_file(basedir + filename); + // checked before the includes are expanded, since glsl_common defines the function + alpha_to_coverage = ( str.find( "alpha_test_fail(" ) != std::string::npos ); expand_includes(str, basedir); parse_texture_entries(str); @@ -381,6 +383,7 @@ void gl::program::attach(const gl::shader &s) texture_conf.try_emplace(texturename, std::move(textureentry)); for (auto [paramname, paramentry] : s.param_conf) param_conf.try_emplace(paramname, std::move(paramentry)); + alpha_to_coverage = alpha_to_coverage || s.alpha_to_coverage; glAttachShader(*this, *s); } diff --git a/gl/shader.h b/gl/shader.h index f1735a0e9..e46c14273 100644 --- a/gl/shader.h +++ b/gl/shader.h @@ -63,6 +63,9 @@ namespace gl std::unordered_map texture_conf; std::unordered_map param_conf; std::string name; + // the shader does its alpha test with alpha_test_fail() of glsl_common, so its alpha + // output can drive GL_SAMPLE_ALPHA_TO_COVERAGE in the opaque pass + bool alpha_to_coverage{ false }; #ifndef SHADERVALIDATOR_STANDALONE private: @@ -96,6 +99,7 @@ namespace gl std::unordered_map texture_conf; std::unordered_map param_conf; + bool alpha_to_coverage{ false }; private: void init(); diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index 932ac31f2..d577312b5 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -1820,6 +1820,18 @@ void opengl33_renderer::setup_matrices() OpenGLMatrices.load_matrix(glm::mat4{glm::mat3{m_renderpass.pass_camera.modelview()}}); } +void opengl33_renderer::setup_alpha_to_coverage(bool const Enable) +{ + if (Enable == m_alphatocoverageenabled) + return; + + if (Enable) + glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE); + else + glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); + m_alphatocoverageenabled = Enable; +} + void opengl33_renderer::setup_drawing(bool const Alpha) { if (Alpha) @@ -1834,6 +1846,8 @@ void opengl33_renderer::setup_drawing(bool const Alpha) glDepthMask(GL_TRUE); m_blendingenabled = false; } + // turned on again per material, by the ones which need it + setup_alpha_to_coverage(false); switch (m_renderpass.draw_mode) { @@ -2374,6 +2388,16 @@ void opengl33_renderer::Bind_Material( material_handle const Material, TSubModel else model_ubs.alpha_mult = 1.0f; + // the alpha test drops or keeps whole pixels, so multisampling alone leaves its edges (e.g. sides + // of the trackbed textures) jagged. the alpha tested materials of the opaque colour pass get them + // antialiased with alpha to coverage instead; their shaders give the coverage as the alpha + setup_alpha_to_coverage( + Global.iMultisampling > 0 + && false == m_blendingenabled + && m_renderpass.draw_mode == rendermode::color + && model_ubs.opacity > 0.f + && material.shader->alpha_to_coverage ); + // materials which declare texture variants provide a different texture set per model instance, // picked from the seed of the rendered instance and the variant group of the submodel auto const &materialtextures{ diff --git a/rendering/opengl33renderer.h b/rendering/opengl33renderer.h index 1b4897386..0e84761e1 100644 --- a/rendering/opengl33renderer.h +++ b/rendering/opengl33renderer.h @@ -277,6 +277,8 @@ class opengl33_renderer : public gfx_renderer { void setup_pass(viewport_config &Viewport, renderpass_config &Config, rendermode const Mode, float const Znear = 0.f, float const Zfar = 1.f, bool const Ignoredebug = false); void setup_matrices(); void setup_drawing(bool const Alpha = false); + // alpha to coverage for the alpha tested materials of the opaque colour pass, when multisampled + void setup_alpha_to_coverage(bool const Enable); void setup_shadow_unbind_map(); void setup_shadow_bind_map(); void setup_shadow_color( glm::vec4 const &Shadowcolor ); @@ -560,6 +562,7 @@ class opengl33_renderer : public gfx_renderer { material_handle m_invalid_material; bool m_blendingenabled; + bool m_alphatocoverageenabled{ false }; bool m_widelines_supported; diff --git a/shaders/mat_default.frag b/shaders/mat_default.frag index bc48d939c..5459f1d21 100644 --- a/shaders/mat_default.frag +++ b/shaders/mat_default.frag @@ -29,7 +29,8 @@ void main() { vec4 tex_color = texture(diffuse, f_coord); - bool alphatestfail = ( opacity >= 0.0 ? (tex_color.a < opacity) : (tex_color.a >= -opacity) ); + float alphacoverage = alpha_coverage(tex_color.a); + bool alphatestfail = alpha_test_fail(tex_color.a, alphacoverage); if(alphatestfail) discard; // if (tex_color.a < opacity) @@ -42,7 +43,7 @@ void main() glossiness = abs(param[1].w); fragcolor = apply_lights(fragcolor, fragnormal, tex_color.rgb, reflectivity, 0.0, shadow_tone); - vec4 color = vec4(apply_fog(fragcolor), tex_color.a * alpha_mult); + vec4 color = vec4(apply_fog(fragcolor), alphacoverage * alpha_mult); /* float distance = dot(f_pos.xyz, f_pos.xyz); if( distance <= cascade_end.x ) { color.r += 0.25; } diff --git a/shaders/mat_default_detail.frag b/shaders/mat_default_detail.frag index 63d15c7ce..0f8ad7d5a 100644 --- a/shaders/mat_default_detail.frag +++ b/shaders/mat_default_detail.frag @@ -35,7 +35,8 @@ void main() { vec4 tex_color = texture(diffuse, f_coord); - bool alphatestfail = ( opacity >= 0.0 ? (tex_color.a < opacity) : (tex_color.a >= -opacity) ); + float alphacoverage = alpha_coverage(tex_color.a); + bool alphatestfail = alpha_test_fail(tex_color.a, alphacoverage); if(alphatestfail) discard; // if (tex_color.a < opacity) @@ -52,7 +53,7 @@ void main() glossiness = abs(param[1].w); fragcolor = apply_lights(fragcolor, fragnormal, tex_color.rgb, reflectivity, specularity, shadow_tone); - vec4 color = vec4(apply_fog(fragcolor), tex_color.a * alpha_mult); + vec4 color = vec4(apply_fog(fragcolor), alphacoverage * alpha_mult); #if POSTFX_ENABLED out_color = color; #else diff --git a/shaders/mat_default_specgloss.frag b/shaders/mat_default_specgloss.frag index 254a0cc7f..52d94aec0 100644 --- a/shaders/mat_default_specgloss.frag +++ b/shaders/mat_default_specgloss.frag @@ -32,7 +32,8 @@ void main() { vec4 tex_color = texture(diffuse, f_coord); - bool alphatestfail = ( opacity >= 0.0 ? (tex_color.a < opacity) : (tex_color.a >= -opacity) ); + float alphacoverage = alpha_coverage(tex_color.a); + bool alphatestfail = alpha_test_fail(tex_color.a, alphacoverage); if(alphatestfail) discard; // if (tex_color.a < opacity) @@ -46,7 +47,7 @@ void main() metalic = texture(specgloss, f_coord).b; fragcolor = apply_lights(fragcolor, fragnormal, tex_color.rgb, reflectivity, specularity, shadow_tone); - vec4 color = vec4(apply_fog(fragcolor), tex_color.a * alpha_mult); + vec4 color = vec4(apply_fog(fragcolor), alphacoverage * alpha_mult); /* float distance = dot(f_pos.xyz, f_pos.xyz); if( distance <= cascade_end.x ) { color.r += 0.25; } diff --git a/shaders/mat_detail_normalmap.frag b/shaders/mat_detail_normalmap.frag index 85f552899..debfe3bab 100644 --- a/shaders/mat_detail_normalmap.frag +++ b/shaders/mat_detail_normalmap.frag @@ -39,7 +39,8 @@ void main() { vec4 tex_color = texture(diffuse, f_coord); - bool alphatestfail = ( opacity >= 0.0 ? (tex_color.a < opacity) : (tex_color.a >= -opacity) ); + float alphacoverage = alpha_coverage(tex_color.a); + bool alphatestfail = alpha_test_fail(tex_color.a, alphacoverage); if(alphatestfail) discard; @@ -64,7 +65,7 @@ void main() float specularity = (tex_color.r + tex_color.g + tex_color.b) * 0.5; fragcolor = apply_lights(fragcolor, fragnormal, tex_color.rgb, reflectivity, specularity, shadow_tone); - vec4 color = vec4(apply_fog(fragcolor), tex_color.a * alpha_mult); + vec4 color = vec4(apply_fog(fragcolor), alphacoverage * alpha_mult); #if POSTFX_ENABLED out_color = color; #else diff --git a/shaders/mat_detail_normalmap_specgloss.frag b/shaders/mat_detail_normalmap_specgloss.frag index a3799ce1e..0fa9ea2ee 100644 --- a/shaders/mat_detail_normalmap_specgloss.frag +++ b/shaders/mat_detail_normalmap_specgloss.frag @@ -42,7 +42,8 @@ void main() { vec4 tex_color = texture(diffuse, f_coord); - bool alphatestfail = ( opacity >= 0.0 ? (tex_color.a < opacity) : (tex_color.a >= -opacity) ); + float alphacoverage = alpha_coverage(tex_color.a); + bool alphatestfail = alpha_test_fail(tex_color.a, alphacoverage); if(alphatestfail) discard; // if (tex_color.a < opacity) @@ -72,7 +73,7 @@ void main() fragcolor = apply_lights(fragcolor, fragnormal, tex_color.rgb, reflectivity, specularity, shadow_tone); - vec4 color = vec4(apply_fog(fragcolor), tex_color.a * alpha_mult); + vec4 color = vec4(apply_fog(fragcolor), alphacoverage * alpha_mult); #if POSTFX_ENABLED out_color = color; #else diff --git a/shaders/mat_detail_parallax.frag b/shaders/mat_detail_parallax.frag index 75919b13f..28de25095 100644 --- a/shaders/mat_detail_parallax.frag +++ b/shaders/mat_detail_parallax.frag @@ -49,7 +49,8 @@ void main() vec4 detailnormal_map = texture(detailnormalmap, f_coord_p * param[2].x); vec4 tex_color = texture(diffuse, f_coord_p); - bool alphatestfail = ( opacity >= 0.0 ? (tex_color.a < opacity) : (tex_color.a >= -opacity) ); + float alphacoverage = alpha_coverage(tex_color.a); + bool alphatestfail = alpha_test_fail(tex_color.a, alphacoverage); if(alphatestfail) discard; // if (tex_color.a < opacity) @@ -72,7 +73,7 @@ void main() fragcolor = apply_lights(fragcolor, fragnormal, tex_color.rgb, reflectivity, specularity, shadow_tone); - vec4 color = vec4(apply_fog(fragcolor), tex_color.a * alpha_mult); + vec4 color = vec4(apply_fog(fragcolor), alphacoverage * alpha_mult); #if POSTFX_ENABLED out_color = color; #else diff --git a/shaders/mat_detail_parallax_specgloss.frag b/shaders/mat_detail_parallax_specgloss.frag index fcc33ac34..8d1b86457 100644 --- a/shaders/mat_detail_parallax_specgloss.frag +++ b/shaders/mat_detail_parallax_specgloss.frag @@ -55,7 +55,8 @@ void main() vec4 tex_color = texture(diffuse, f_coord_p); vec4 specgloss_map = texture(specgloss, f_coord_p); - bool alphatestfail = ( opacity >= 0.0 ? (tex_color.a < opacity) : (tex_color.a >= -opacity) ); + float alphacoverage = alpha_coverage(tex_color.a); + bool alphatestfail = alpha_test_fail(tex_color.a, alphacoverage); if(alphatestfail) discard; @@ -78,7 +79,7 @@ void main() fragcolor = apply_lights(fragcolor, fragnormal, tex_color.rgb, reflectivity, specularity, shadow_tone); - vec4 color = vec4(apply_fog(fragcolor), tex_color.a * alpha_mult); + vec4 color = vec4(apply_fog(fragcolor), alphacoverage * alpha_mult); #if POSTFX_ENABLED out_color = color; #else diff --git a/shaders/mat_normalmap.frag b/shaders/mat_normalmap.frag index 3ef505eba..9757324d8 100644 --- a/shaders/mat_normalmap.frag +++ b/shaders/mat_normalmap.frag @@ -34,7 +34,8 @@ void main() { vec4 tex_color = texture(diffuse, f_coord); - bool alphatestfail = ( opacity >= 0.0 ? (tex_color.a < opacity) : (tex_color.a >= -opacity) ); + float alphacoverage = alpha_coverage(tex_color.a); + bool alphatestfail = alpha_test_fail(tex_color.a, alphacoverage); if(alphatestfail) discard; // if (tex_color.a < opacity) @@ -51,7 +52,7 @@ void main() fragcolor = apply_lights(fragcolor, fragnormal, tex_color.rgb, reflectivity, specularity, shadow_tone); - vec4 color = vec4(apply_fog(fragcolor), tex_color.a * alpha_mult); + vec4 color = vec4(apply_fog(fragcolor), alphacoverage * alpha_mult); #if POSTFX_ENABLED out_color = color; #else diff --git a/shaders/mat_normalmap_specgloss.frag b/shaders/mat_normalmap_specgloss.frag index a4b184627..3f043b51a 100644 --- a/shaders/mat_normalmap_specgloss.frag +++ b/shaders/mat_normalmap_specgloss.frag @@ -38,7 +38,8 @@ void main() { vec4 tex_color = texture(diffuse, f_coord); - bool alphatestfail = ( opacity >= 0.0 ? (tex_color.a < opacity) : (tex_color.a >= -opacity) ); + float alphacoverage = alpha_coverage(tex_color.a); + bool alphatestfail = alpha_test_fail(tex_color.a, alphacoverage); if(alphatestfail) discard; // if (tex_color.a < opacity) @@ -57,7 +58,7 @@ void main() fragcolor = apply_lights(fragcolor, fragnormal, tex_color.rgb, reflectivity, specularity, shadow_tone); - vec4 color = vec4(apply_fog(fragcolor), tex_color.a * alpha_mult); + vec4 color = vec4(apply_fog(fragcolor), alphacoverage * alpha_mult); #if POSTFX_ENABLED out_color = color; #else diff --git a/shaders/mat_parallax.frag b/shaders/mat_parallax.frag index 7adac0549..49e8eb2a0 100644 --- a/shaders/mat_parallax.frag +++ b/shaders/mat_parallax.frag @@ -42,7 +42,8 @@ void main() vec4 tex_color = texture(diffuse, f_coord_p); - bool alphatestfail = ( opacity >= 0.0 ? (tex_color.a < opacity) : (tex_color.a >= -opacity) ); + float alphacoverage = alpha_coverage(tex_color.a); + bool alphatestfail = alpha_test_fail(tex_color.a, alphacoverage); if(alphatestfail) discard; // if (tex_color.a < opacity) @@ -59,7 +60,7 @@ void main() fragcolor = apply_lights(fragcolor, fragnormal, tex_color.rgb, reflectivity, specularity, shadow_tone); - vec4 color = vec4(apply_fog(fragcolor), tex_color.a * alpha_mult); + vec4 color = vec4(apply_fog(fragcolor), alphacoverage * alpha_mult); #if POSTFX_ENABLED out_color = color; #else diff --git a/shaders/mat_parallax_specgloss.frag b/shaders/mat_parallax_specgloss.frag index 8b590fae1..04349ef2c 100644 --- a/shaders/mat_parallax_specgloss.frag +++ b/shaders/mat_parallax_specgloss.frag @@ -46,7 +46,8 @@ void main() vec4 tex_color = texture(diffuse, f_coord_p); - bool alphatestfail = ( opacity >= 0.0 ? (tex_color.a < opacity) : (tex_color.a >= -opacity) ); + float alphacoverage = alpha_coverage(tex_color.a); + bool alphatestfail = alpha_test_fail(tex_color.a, alphacoverage); if(alphatestfail) discard; // if (tex_color.a < opacity) @@ -65,7 +66,7 @@ void main() fragcolor = apply_lights(fragcolor, fragnormal, tex_color.rgb, reflectivity, specularity, shadow_tone); - vec4 color = vec4(apply_fog(fragcolor), tex_color.a * alpha_mult); + vec4 color = vec4(apply_fog(fragcolor), alphacoverage * alpha_mult); #if POSTFX_ENABLED out_color = color; #else diff --git a/shaders/mat_reflmap.frag b/shaders/mat_reflmap.frag index bd4c4ae79..1ffdd822f 100644 --- a/shaders/mat_reflmap.frag +++ b/shaders/mat_reflmap.frag @@ -32,7 +32,8 @@ void main() { vec4 tex_color = texture(diffuse, f_coord); - bool alphatestfail = ( opacity >= 0.0 ? (tex_color.a < opacity) : (tex_color.a >= -opacity) ); + float alphacoverage = alpha_coverage(tex_color.a); + bool alphatestfail = alpha_test_fail(tex_color.a, alphacoverage); if(alphatestfail) discard; // if (tex_color.a < opacity) @@ -49,7 +50,7 @@ void main() if(alphatestfail) fragcolor.r = 1.0; - vec4 color = vec4(apply_fog(fragcolor), tex_color.a * alpha_mult); + vec4 color = vec4(apply_fog(fragcolor), alphacoverage * alpha_mult); #if POSTFX_ENABLED out_color = color; diff --git a/shaders/mat_reflmap_specgloss.frag b/shaders/mat_reflmap_specgloss.frag index 4c89083c7..71ebbac24 100644 --- a/shaders/mat_reflmap_specgloss.frag +++ b/shaders/mat_reflmap_specgloss.frag @@ -36,7 +36,8 @@ void main() { vec4 tex_color = texture(diffuse, f_coord); - bool alphatestfail = ( opacity >= 0.0 ? (tex_color.a < opacity) : (tex_color.a >= -opacity) ); + float alphacoverage = alpha_coverage(tex_color.a); + bool alphatestfail = alpha_test_fail(tex_color.a, alphacoverage); if(alphatestfail) discard; // if (tex_color.a < opacity) @@ -54,7 +55,7 @@ void main() if(alphatestfail) fragcolor.r = 1.0; - vec4 color = vec4(apply_fog(fragcolor), tex_color.a * alpha_mult); + vec4 color = vec4(apply_fog(fragcolor), alphacoverage * alpha_mult); #if POSTFX_ENABLED out_color = color; diff --git a/shaders/mat_shadowlessnormalmap.frag b/shaders/mat_shadowlessnormalmap.frag index cb2c040e9..ebf135ba1 100644 --- a/shaders/mat_shadowlessnormalmap.frag +++ b/shaders/mat_shadowlessnormalmap.frag @@ -34,7 +34,8 @@ void main() { vec4 tex_color = texture(diffuse, f_coord); - bool alphatestfail = ( opacity >= 0.0 ? (tex_color.a < opacity) : (tex_color.a >= -opacity) ); + float alphacoverage = alpha_coverage(tex_color.a); + bool alphatestfail = alpha_test_fail(tex_color.a, alphacoverage); if(alphatestfail) discard; // if (tex_color.a < opacity) @@ -51,7 +52,7 @@ void main() glossiness = abs(param[1].w); fragcolor = apply_lights(fragcolor, fragnormal, tex_color.rgb, reflectivity, specularity, 1.0); - vec4 color = vec4(apply_fog(fragcolor), tex_color.a * alpha_mult); + vec4 color = vec4(apply_fog(fragcolor), alphacoverage * alpha_mult); #if POSTFX_ENABLED out_color = color; #else diff --git a/shaders/mat_shadowlessnormalmap_specgloss.frag b/shaders/mat_shadowlessnormalmap_specgloss.frag index adc473ff6..2bd6d215f 100644 --- a/shaders/mat_shadowlessnormalmap_specgloss.frag +++ b/shaders/mat_shadowlessnormalmap_specgloss.frag @@ -38,7 +38,8 @@ void main() { vec4 tex_color = texture(diffuse, f_coord); - bool alphatestfail = ( opacity >= 0.0 ? (tex_color.a < opacity) : (tex_color.a >= -opacity) ); + float alphacoverage = alpha_coverage(tex_color.a); + bool alphatestfail = alpha_test_fail(tex_color.a, alphacoverage); if(alphatestfail) discard; // if (tex_color.a < opacity) @@ -56,7 +57,7 @@ void main() metalic = texture(specgloss, f_coord).b; fragcolor = apply_lights(fragcolor, fragnormal, tex_color.rgb, reflectivity, specularity, 1.0); - vec4 color = vec4(apply_fog(fragcolor), tex_color.a * alpha_mult); + vec4 color = vec4(apply_fog(fragcolor), alphacoverage * alpha_mult); #if POSTFX_ENABLED out_color = color; #else diff --git a/shaders/mat_sunlessnormalmap.frag b/shaders/mat_sunlessnormalmap.frag index 0b3fc7f67..a5e97d30c 100644 --- a/shaders/mat_sunlessnormalmap.frag +++ b/shaders/mat_sunlessnormalmap.frag @@ -99,7 +99,8 @@ void main() { vec4 tex_color = texture(diffuse, f_coord); - bool alphatestfail = ( opacity >= 0.0 ? (tex_color.a < opacity) : (tex_color.a >= -opacity) ); + float alphacoverage = alpha_coverage(tex_color.a); + bool alphatestfail = alpha_test_fail(tex_color.a, alphacoverage); if(alphatestfail) discard; // if (tex_color.a < opacity) @@ -115,7 +116,7 @@ void main() float specularity = (tex_color.r + tex_color.g + tex_color.b) * 0.5; fragcolor = apply_lights_sunless(fragcolor, fragnormal, tex_color.rgb, reflectivity, specularity, shadow_tone); - vec4 color = vec4(apply_fog(fragcolor), tex_color.a * alpha_mult); + vec4 color = vec4(apply_fog(fragcolor), alphacoverage * alpha_mult); #if POSTFX_ENABLED out_color = color; #else diff --git a/shaders/mat_sunlessnormalmap_specgloss.frag b/shaders/mat_sunlessnormalmap_specgloss.frag index 21cc9f6e9..4e2abe1d9 100644 --- a/shaders/mat_sunlessnormalmap_specgloss.frag +++ b/shaders/mat_sunlessnormalmap_specgloss.frag @@ -113,7 +113,8 @@ void main() { vec4 tex_color = texture(diffuse, f_coord); - bool alphatestfail = ( opacity >= 0.0 ? (tex_color.a < opacity) : (tex_color.a >= -opacity) ); + float alphacoverage = alpha_coverage(tex_color.a); + bool alphatestfail = alpha_test_fail(tex_color.a, alphacoverage); if(alphatestfail) discard; // if (tex_color.a < opacity) @@ -131,7 +132,7 @@ void main() metalic = texture(specgloss, f_coord).b; fragcolor = apply_lights_sunless(fragcolor, fragnormal, tex_color.rgb, reflectivity, specularity, shadow_tone); - vec4 color = vec4(apply_fog(fragcolor), tex_color.a * alpha_mult); + vec4 color = vec4(apply_fog(fragcolor), alphacoverage * alpha_mult); #if POSTFX_ENABLED out_color = color; #else From 4b769d95c1588e13acd8e9e6fea02efdae2336ca Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 02:05:45 +0100 Subject: [PATCH 315/430] fix: SOD lamp shows the doors of the whole consist in three states (eu07/maszyna#288) The door closure signalling lamp (i-door_blocked) showed only Doors.is_locked of the occupied vehicle, so a door open in another car or a coupled unit didn't show on it. TMoverParameters::door_closure() gives the state of one vehicle (none, locked, released, open), the driver gathers the most severe one of the train in determine_consist_state(), next to IsAnyDoorOpen, and the lamp is lit for locked doors, blinks for closed but released ones (a permit given, or no lock engaged on doors that need no permit) and is dark with a door open. doorclosuresignal in eu07.ini (default yes) switches it; with no the lamp shows is_locked of the occupied vehicle as before. No data change needed. --- McZapkie/MOVER.h | 17 +++++ McZapkie/Mover.cpp | 37 +++++++++++ tests/unit/test_door_closure.cpp | 110 +++++++++++++++++++++++++++++++ utilities/Globals.cpp | 7 ++ utilities/Globals.h | 2 + vehicle/Driver.cpp | 3 + vehicle/Driver.h | 1 + vehicle/Train.cpp | 11 +++- 8 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 tests/unit/test_door_closure.cpp diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 16bb207fa..45e3305c0 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -261,6 +261,22 @@ enum class range_t /// Affects the entire consist. consist }; +/// State of the door closure signalling (SOD) of a vehicle or a consist, ordered from the least to the most +/// severe: the state of a consist is the most severe state of its vehicles. +enum class door_closure_t +{ + /// No doors worked by the crew: the vehicle doesn't take part in the signalling. + none, + /// All doors closed and locked: they can't be opened. + locked, + /// All doors closed, but released: a permit is given, or no lock holds them shut. + released, + /// A door is open, or not fully closed yet. + open +}; +/// Whether the door closure signalling lamp is lit: steadily for locked doors, in the lit phase of the +/// blinking for released ones, never with a door open or with no doors signalled. +bool door_closure_lamp(door_closure_t const State, bool const BlinkLit); /// Possible settings for an enable/disable input pair (mutually exclusive). enum class operation_t { @@ -2593,6 +2609,7 @@ class TMoverParameters bool LockDoors(bool const State, range_t const Notify = range_t::consist); bool signal_departure(bool const State, range_t const Notify = range_t::consist); // toggles departure warning void update_doors(double const Deltatime); // door controller update + door_closure_t door_closure() const; // state of the door closure signalling of this vehicle /* funkcje dla samochodow*/ bool ChangeOffsetH(double DeltaOffset); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 20761bacb..03fa3e6db 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -8699,6 +8699,43 @@ bool TMoverParameters::signal_departure(bool const State, range_t const Notify) return true; } +// state of the door closure signalling (SOD) of this vehicle: open while a door isn't fully closed, released while +// the closed doors can be opened (a permit given, or, for doors that need none, no lock engaged), locked otherwise. +// doors the crew doesn't close (autonomous) aren't signalled, the same as for the door lights of the consist +door_closure_t TMoverParameters::door_closure() const +{ + if (Doors.range == 0.f || Doors.close_control == control_t::autonomous) + { + return door_closure_t::none; + } + if (std::ranges::any_of(Doors.instances, [](basic_door const &Door) { return false == Door.is_closed; })) + { + return door_closure_t::open; + } + if (Doors.is_locked) + { + return door_closure_t::locked; + } + if (Doors.permit_needed && std::ranges::none_of(Doors.instances, [](basic_door const &Door) { return Door.open_permit; })) + { + return door_closure_t::locked; + } + return door_closure_t::released; +} + +bool door_closure_lamp(door_closure_t const State, bool const BlinkLit) +{ + switch (State) + { + case door_closure_t::locked: + return true; + case door_closure_t::released: + return BlinkLit; + default: + return false; + } +} + // automatic door controller update void TMoverParameters::update_doors(double const Deltatime) { diff --git a/tests/unit/test_door_closure.cpp b/tests/unit/test_door_closure.cpp new file mode 100644 index 000000000..abfa5a7e1 --- /dev/null +++ b/tests/unit/test_door_closure.cpp @@ -0,0 +1,110 @@ +#include "stdafx.h" +#include "doctest.h" +#include "scenario.h" + +// the door closure signalling (SOD, the i-door_blocked lamp of a cab): the state of each vehicle's doors and of the +// whole train, the most severe of its vehicles, as the driver gathers it for the lamp (eu07/maszyna#288) + +using test::scenario; +using namespace test::channels; + +namespace { + +// the state of the whole train, the way TController::determine_consist_state() gathers it +door_closure_t consist_closure(scenario &Scenario) { + auto closure{door_closure_t::none}; + for (std::size_t i = 0; i < Scenario.train().size(); ++i) { + closure = std::max(closure, Scenario.vehicle(i).door_closure()); + } + return closure; +} + +} // namespace + +TEST_CASE("door closure: the lamp is lit for locked doors, blinks for released ones and is dark for open ones") { + for (auto const lit : {true, false}) { + CAPTURE(lit); + CHECK(door_closure_lamp(door_closure_t::locked, lit)); + CHECK(door_closure_lamp(door_closure_t::released, lit) == lit); + CHECK_FALSE(door_closure_lamp(door_closure_t::open, lit)); + CHECK_FALSE(door_closure_lamp(door_closure_t::none, lit)); + } + // a consist takes the most severe state of its vehicles + CHECK(std::max(door_closure_t::none, door_closure_t::locked) == door_closure_t::locked); + CHECK(std::max(door_closure_t::locked, door_closure_t::released) == door_closure_t::released); + CHECK(std::max(door_closure_t::released, door_closure_t::open) == door_closure_t::open); +} + +TEST_CASE("door closure: a unit with permits, locked, released by the permit and open, in any of its cars") { + scenario scenario{"door closure/elf", motion() + doors()}; + scenario.add("elf_v1/21we-a", 1).add("elf_v1/21we-b").add("elf_v1/21we-c"); + scenario.start_up(); + auto &cab{scenario.cab()}; + auto &last{scenario.vehicle(scenario.train().size() - 1)}; + // closed with no permit: no door can be opened + CHECK(cab.door_closure() == door_closure_t::locked); + CHECK(last.door_closure() == door_closure_t::locked); + CHECK(consist_closure(scenario) == door_closure_t::locked); + + scenario.act("permit left"); + cab.PermitDoors(side::left, true); + scenario.wait(2.0); + CHECK(last.door_closure() == door_closure_t::released); + CHECK(consist_closure(scenario) == door_closure_t::released); + + scenario.act("the last car opens its own door"); + last.OperateDoors(side::left, true, range_t::local); + scenario.wait(5.0); + // the cab's own doors stay closed, the train is open all the same + CHECK(cab.door_closure() == door_closure_t::released); + CHECK(last.door_closure() == door_closure_t::open); + CHECK(consist_closure(scenario) == door_closure_t::open); + + scenario.act("close, the steps stay out under the permit"); + last.OperateDoors(side::left, false, range_t::local); + cab.OperateDoors(side::left, false); + scenario.wait(10.0); + CHECK(last.Doors.instances[side::left].position <= 0.f); + // a step out isn't a closed door + CHECK(consist_closure(scenario) == door_closure_t::open); + + scenario.act("revoke the permit"); + cab.PermitDoors(side::left, false); + scenario.wait(10.0); + CHECK(consist_closure(scenario) == door_closure_t::locked); +} + +TEST_CASE("door closure: the doors of a unit without permits are released at a standstill") { + scenario scenario{"door closure/en57", motion() + doors()}; + scenario.add("en57_v1/5bgaiii_led_spot", 1).add("en57_v1/6ba_840").add("en57_v1/5bgb"); + scenario.start_up(); + auto &cab{scenario.cab()}; + auto &middle{scenario.vehicle(1)}; + REQUIRE_FALSE(cab.Doors.permit_needed); + REQUIRE(middle.Doors.permit_needed); + // the door lock engages only once the train runs (DoorLockSpeed), till then the end cars' doors can be opened + CHECK(cab.door_closure() == door_closure_t::released); + CHECK(middle.door_closure() == door_closure_t::locked); + CHECK(consist_closure(scenario) == door_closure_t::released); + scenario.act("open right"); + cab.OperateDoors(side::right, true); + scenario.wait(10.0); + CHECK(consist_closure(scenario) == door_closure_t::open); + scenario.act("close right"); + cab.OperateDoors(side::right, false); + scenario.wait(10.0); + CHECK(consist_closure(scenario) == door_closure_t::released); +} + +TEST_CASE("door closure: a locomotive has no doors to signal, its coach does") { + scenario scenario{"door closure/eu07 with a coach", motion() + doors()}; + scenario.add("4e_v1/4e", 1).add("bdhpumn_v3/bdhpumn"); + scenario.start_up(); + CHECK(scenario.cab().door_closure() == door_closure_t::none); + scenario.act("open right"); + scenario.cab().PermitDoors(side::right, true); + scenario.cab().OperateDoors(side::right, true); + scenario.wait(10.0); + CHECK(scenario.vehicle(1).door_closure() == door_closure_t::open); + CHECK(consist_closure(scenario) == door_closure_t::open); +} diff --git a/utilities/Globals.cpp b/utilities/Globals.cpp index b4f2e14be..a8aadec22 100644 --- a/utilities/Globals.cpp +++ b/utilities/Globals.cpp @@ -506,6 +506,12 @@ bool global_settings::ConfigParseSimulation(cParser& Parser, const std::string& return true; } + if (token == "doorclosuresignal") + { + ParseOne(Parser, DoorClosureSignal); + return true; + } + if (token == "movelight") { ParseOne(Parser, fMoveLight, 1, false); @@ -1573,6 +1579,7 @@ global_settings::export_as_text( std::ostream &Output ) const { export_as_text( Output, "skyenabled", asSky ); export_as_text( Output, "defaultext", szDefaultExt ); export_as_text( Output, "newaircouplers", bnewAirCouplers ); + export_as_text( Output, "doorclosuresignal", DoorClosureSignal ); export_as_text( Output, "anisotropicfiltering", AnisotropicFiltering ); export_as_text( Output, "usevbo", bUseVBO ); export_as_text( Output, "feedbackmode", iFeedbackMode ); diff --git a/utilities/Globals.h b/utilities/Globals.h index ad216cd96..971f8495a 100644 --- a/utilities/Globals.h +++ b/utilities/Globals.h @@ -115,6 +115,8 @@ struct global_settings { std::string Period{}; // time of the day, based on sun position bool FullPhysics{ true }; // full calculations performed for each simulation step bool bnewAirCouplers{ true }; + bool DoorClosureSignal{ true }; // door closure signalling lamp (i-door_blocked) shows the doors of the whole consist in three states + float fMoveLight{ 0.f }; // numer dnia w roku albo -1 bool FakeLight{ false }; // toggle between fixed and dynamic daylight double fTimeSpeed{ 1.0 }; // przyspieszenie czasu, zmienna do testów diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 9f83b6d53..778b97004 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -5937,6 +5937,7 @@ TController::determine_consist_state() { IsAnyDoorOnlyOpen[ side::right ] = IsAnyDoorOnlyOpen[ side::left ] = false; IsAnyDoorOpen[ side::right ] = IsAnyDoorOpen[ side::left ] = false; IsAnyDoorPermitActive[ side::right ] = IsAnyDoorPermitActive[ side::left ] = false; + auto doorclosure { door_closure_t::none }; ConsistShade = 0.0; auto *p { pVehicles[ end::front ] }; // pojazd na czole składu double dy; // składowa styczna grawitacji, w przedziale <0,1> @@ -5998,12 +5999,14 @@ TController::determine_consist_state() { IsAnyDoorPermitActive[ side::right ] |= rightdoor.open_permit; IsAnyDoorPermitActive[ side::left ] |= leftdoor.open_permit; } + doorclosure = std::max( doorclosure, vehicle->door_closure() ); } // measure lighting level // TBD: apply weight (multiplier) to partially lit vehicles? ConsistShade += p->fShade > 0.0 ? p->fShade : 1.0; p = p->Next(); // pojazd podłączony z tyłu (patrząc od czoła) } + DoorClosure = doorclosure; // calculate average amount of received sunlight ConsistShade /= iVehicles; diff --git a/vehicle/Driver.h b/vehicle/Driver.h index f1975fca6..d750fc398 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -632,6 +632,7 @@ private: bool IsAnyDoorOpen[ 2 ]; // state of door in the consist bool IsAnyDoorOnlyOpen[ 2 ]; // state of door in the consist regardless of step bool IsAnyDoorPermitActive[ 2 ]; // state of door permit in the consist + door_closure_t DoorClosure{ door_closure_t::none }; // state of the door closure signalling (SOD) of the consist bool IsAnyLineBreakerOpen{ false }; // state of line breaker in all powered vehicles under control bool IsAnyConverterOverloadRelayOpen{ false }; // state of converter overload relays in all vehicles under control bool IsAnyMotorOverloadRelayOpen{ false }; // state of motor overload relays in all vehicles under control diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index e30635f4f..3a4c42db1 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -9108,7 +9108,16 @@ bool TTrain::Update(double const Deltatime) btLampkaDoorLeft.Turn(DynamicObject->Mechanik->IsAnyDoorOpen[cab_to_end() == end::front ? side::left : side::right]); btLampkaDoorRight.Turn(DynamicObject->Mechanik->IsAnyDoorOpen[cab_to_end() == end::front ? side::right : side::left]); } - btLampkaBlokadaDrzwi.Turn(mvOccupied->Doors.is_locked); + if (Global.DoorClosureSignal && DynamicObject->Mechanik != nullptr) + { + // door closure signalling (SOD) of the whole consist: lit with all doors closed and locked, blinking with + // them closed but released, dark with a door open + btLampkaBlokadaDrzwi.Turn(door_closure_lamp(DynamicObject->Mechanik->DoorClosure, simulation::Time.data().wSecond % 2 < 1)); + } + else + { + btLampkaBlokadaDrzwi.Turn(mvOccupied->Doors.is_locked); + } btLampkaDoorLockOff.Turn(false == mvOccupied->Doors.lock_enabled); btLampkaDepartureSignal.Turn(mvControlled->DepartureSignal); btLampkaNapNastHam.Turn(mvControlled->DirActive != 0 && mvOccupied->EpFuse); // napiecie na nastawniku hamulcowym From c99a07ddd742c8ca0019c94ac6f964a90fe8fe4b Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 04:08:15 +0100 Subject: [PATCH 316/430] fix: initialize the gauge's parameter type for CI The gauge copies made for the duplicate submodels start from a default gauge, whose parameter type was left uninitialized (Sonar S836). --- vehicle/Gauge.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vehicle/Gauge.h b/vehicle/Gauge.h index c78cdb069..d83668c4e 100644 --- a/vehicle/Gauge.h +++ b/vehicle/Gauge.h @@ -105,7 +105,7 @@ private: float m_endscale { -1.f }; // scale applied to the value at the end of accepted value range float m_endvalue { -1.f }; // end value of accepted value range bool m_interpolatescale { false }; - char m_datatype; // typ zmiennej parametru: f-float, d-double, i-int + char m_datatype { '\0' }; // typ zmiennej parametru: f-float, d-double, i-int, b-bool; none until one is assigned union { // wskaźnik na parametr pokazywany przez animację float *fData; From f2ecbd055c66ab8e1468aba1039c4c60276a0786 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 04:22:13 +0100 Subject: [PATCH 317/430] fix: keep the resistive-lock test's controller table index in range for CI Sonar (S3519) doesn't see the REQUIRE ending the test, so it read the table at the index below the first resistance-free position as possibly -1. --- tests/unit/test_cntrl.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/unit/test_cntrl.cpp b/tests/unit/test_cntrl.cpp index 43c983edd..e6c53940c 100644 --- a/tests/unit/test_cntrl.cpp +++ b/tests/unit/test_cntrl.cpp @@ -67,6 +67,9 @@ TEST_CASE("cntrl: ScndCtrlResistiveLock keeps the field shunting off at zero and REQUIRE(locked->ScndCtrlPosNo > 0); auto const resistancefree{resistance_free_position(locked.mover())}; REQUIRE(resistancefree > 1); + if (resistancefree <= 1) { + continue; // not reached, the REQUIRE above ends the test; tells the static analysis the index below is in range + } REQUIRE(locked->RList[resistancefree - 1].R >= 0.01); SUBCASE("zero") { From 3a718695695fa01ac56f9a8277594edaf90285d5 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 04:22:19 +0100 Subject: [PATCH 318/430] fix: table-drive the same-traction coupling test for CI The repeated subcases were duplicated code above the Sonar threshold; also renames a local shadowing coupling::permanent. --- tests/unit/test_couplers.cpp | 44 +++++++++++++++--------------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/tests/unit/test_couplers.cpp b/tests/unit/test_couplers.cpp index bed4d7a73..bbb1c0dd9 100644 --- a/tests/unit/test_couplers.cpp +++ b/tests/unit/test_couplers.cpp @@ -580,8 +580,8 @@ TEST_CASE("couplers: an electric and a diesel locomotive don't share their contr } SUBCASE("unless the vehicles make one unit, coupled for good") { auto diesel{vehicle{definition::fiz("sm03_v1/sm03"), 0.0, "diesel"}}; - auto const permanent{scenario_coupling | coupling::permanent}; - CHECK(scenario_couple(electric, diesel, permanent) == permanent); + auto const forgood{scenario_coupling | coupling::permanent}; + CHECK(scenario_couple(electric, diesel, forgood) == forgood); } SUBCASE("unless the check is turned off") { control_coupling_check_setting const off{false}; @@ -594,30 +594,22 @@ TEST_CASE("couplers: an electric and a diesel locomotive don't share their contr TEST_CASE("couplers: locomotives of the same traction and the cars keep their control coupling") { control_coupling_check_setting const check{true}; - SUBCASE("two electric ones") { - auto first{vehicle{definition::fiz("ep09_v2/104e"), 0.0, "first"}}; - auto second{vehicle{definition::fiz("et22_v3/201e-w"), 0.0, "second"}}; - CHECK(scenario_couple(first, second) == scenario_coupling); - } - SUBCASE("an electric one of each motor type") { - auto first{vehicle{definition::fiz("e6act_v2/e6acta"), 0.0, "first"}}; - auto second{vehicle{definition::fiz("eu04_v1/eu04-01"), 0.0, "second"}}; - CHECK(scenario_couple(first, second) == scenario_coupling); - } - SUBCASE("two diesel ones") { - auto first{vehicle{definition::fiz("sm03_v1/sm03"), 0.0, "first"}}; - auto second{vehicle{definition::fiz("wmb10_v1/wmb10"), 0.0, "second"}}; - CHECK(scenario_couple(first, second) == scenario_coupling); - } - SUBCASE("a diesel-mechanical and a diesel-electric one") { - auto first{vehicle{definition::fiz("sm03_v1/sm03"), 0.0, "first"}}; - auto second{vehicle{definition::fiz("st44_v2/m62-1151"), 0.0, "second"}}; - CHECK(scenario_couple(first, second) == scenario_coupling); - } - SUBCASE("an electric multiple unit's motor car and its control trailer") { - auto trailer{vehicle{definition::fiz("en57_v1/5bgb"), 0.0, "trailer"}}; - auto motorcar{vehicle{definition::fiz("en57_v1/6bai"), 0.0, "motorcar"}}; - CHECK(scenario_couple(trailer, motorcar) == scenario_coupling); + SUBCASE("two locomotives or motor cars of the same traction") { + // two electric ones, an electric one of each motor type, two diesel ones, a diesel-mechanical and a + // diesel-electric one, an electric multiple unit's control trailer and its motor car + std::initializer_list> const pairs{ + {"ep09_v2/104e", "et22_v3/201e-w"}, + {"e6act_v2/e6acta", "eu04_v1/eu04-01"}, + {"sm03_v1/sm03", "wmb10_v1/wmb10"}, + {"sm03_v1/sm03", "st44_v2/m62-1151"}, + {"en57_v1/5bgb", "en57_v1/6bai"}}; + for (auto const &paths : pairs) { + CAPTURE(paths.first); + CAPTURE(paths.second); + auto first{vehicle{definition::fiz(paths.first), 0.0, "first"}}; + auto second{vehicle{definition::fiz(paths.second), 0.0, "second"}}; + CHECK(scenario_couple(first, second) == scenario_coupling); + } } SUBCASE("a diesel locomotive and a car") { auto diesel{vehicle{definition::fiz("sm42_v1/6d1"), 0.0, "diesel"}}; From 1083f3cb5db56af9775d975852d14dbacc0848f3 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 04:23:30 +0100 Subject: [PATCH 319/430] fix: make the odometer test's scratch directory in the build directory for CI Sonar (S5443) flags the shared temporary directory; the tests now use one in their working directory. Also makes the scratch directory non-copyable and spells out the optional checks Sonar asked about. --- tests/unit/test_odometer.cpp | 7 +++++-- vehicle/Train.cpp | 2 +- vehicle/odometer.cpp | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/unit/test_odometer.cpp b/tests/unit/test_odometer.cpp index 8297d3167..784fabaab 100644 --- a/tests/unit/test_odometer.cpp +++ b/tests/unit/test_odometer.cpp @@ -24,13 +24,16 @@ odometer::reading run(double const Km, double const Metres) { return reading; } -// a directory of its own for a test, removed afterwards +// a directory of its own for a test, removed afterwards. it's made in the working directory of the tests (the build +// directory), not in the shared temporary one struct scratch_directory { std::filesystem::path path; - explicit scratch_directory(std::string const &Name) : path{std::filesystem::temp_directory_path() / ("eu07_unit_" + Name)} { + explicit scratch_directory(std::string const &Name) : path{std::filesystem::current_path() / ("eu07_unit_" + Name)} { std::filesystem::remove_all(path); std::filesystem::create_directories(path); } + scratch_directory(scratch_directory const &) = delete; + scratch_directory &operator=(scratch_directory const &) = delete; ~scratch_directory() { std::error_code error; std::filesystem::remove_all(path, error); diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index 5a918809a..c48ef69c6 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -12323,7 +12323,7 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con gauge.Load(Parser, DynamicObject); // the counter shows the odometer of the vehicle, kept between the sessions (eu07/maszyna#72). its offset // was the state it started each session with, now it is that only for a vehicle with no known state - if (auto const seed{odometer::counter_seed(gauge.offset(), gauge.scale())}) + if (auto const seed{odometer::counter_seed(gauge.offset(), gauge.scale())}; seed.has_value()) mvControlled->Odometer.seed(*seed); gauge.offset(0.f); gauge.AssignDouble(&mvControlled->Odometer.km); diff --git a/vehicle/odometer.cpp b/vehicle/odometer.cpp index 5f2a185d1..9d03462b2 100644 --- a/vehicle/odometer.cpp +++ b/vehicle/odometer.cpp @@ -153,9 +153,9 @@ double guessed_state(std::string const &Vehicle) { reading starting_state(store const &States, std::string const &Vehicle, std::filesystem::path const &Vehicledirectory) { reading result; - if (auto const saved{States.find(Vehicle)}) { + if (auto const saved{States.find(Vehicle)}; saved.has_value()) { result.begin(*saved, origin::saved); - } else if (auto const legacy{legacy_state(Vehicledirectory, Vehicle)}) { + } else if (auto const legacy{legacy_state(Vehicledirectory, Vehicle)}; legacy.has_value()) { result.begin(*legacy, origin::legacy); } else { result.begin(guessed_state(Vehicle), origin::guessed); From 87f1d960a094f5f2f17eb69170df5f9d806a6ba9 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 04:25:34 +0100 Subject: [PATCH 320/430] fix: EN57 brakes hauled with the brake hose alone, Knorr EP brake without control power eu07/maszyna#87: the EP2 (and EP1) valve charged its auxiliary reservoir only from the main reservoir pipe. A dead EN57 hauled by a locomotive coupled with the hook and the brake hose alone ("3") never charged it, its control reservoir stopped at about 2.5 bar and the unit didn't brake. The valve now refills the auxiliary reservoir from the brake pipe through the slide valve's check valve, as every ESt does (TESt::FillBrakeRes, shared with TESt::GetPF, which stays bit for bit the same). With the main reservoir pipe charged the auxiliary reservoir stays above the brake pipe and nothing changes; the reservoir now also takes air from the brake pipe while it is below it, e.g. at start-up before the compressor has charged the main reservoir pipe. eu07/maszyna#134: the EP brake of the Knorr St113 handle (EN57-001) worked with the reverser in neutral, the battery off or the EP fuse switched off (Ctrl+Z). It now needs the control powered, as the Oerlikon handle's does (EPBrakeControlPowered: battery, reverser out of neutral, EP fuse), and an EP brake switched on drops out (holding the cylinder pressure) when the control loses power. The positions of the EP release and brake were already moved by 810b7ad07; a test pins them. No change to game data needed. --- McZapkie/MOVER.h | 2 + McZapkie/Mover.cpp | 15 ++++- McZapkie/hamulce.cpp | 36 ++++++++--- McZapkie/hamulce.h | 9 +++ tests/unit/test_brake_handles.cpp | 103 ++++++++++++++++++++++++++++++ tests/unit/test_brakes.cpp | 46 +++++++++++++ 6 files changed, 200 insertions(+), 11 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 16bb207fa..e6d6296aa 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -2413,6 +2413,8 @@ class TMoverParameters bool BrakeReleaser(int state); bool UniversalBrakeButton(int button, int state); /*uniwersalny przycisk hamulca*/ bool SwitchEPBrake(int state); + // whether the EP brake control of the cab has power: battery, the reverser out of neutral and the EP fuse on + bool EPBrakeControlPowered() const; bool AntiSlippingButton(void); /*! reczny wlacznik urzadzen antyposlizgowych*/ /*funkcje dla ukladow pneumatycznych*/ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 20761bacb..6e38ad143 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -4161,7 +4161,8 @@ bool TMoverParameters::SwitchEPBrake(int state) OK = false; if (BrakeHandle == TBrakeHandle::St113 && CabOccupied != 0) { - if (state > 0) + // the handle works the EP contactors pneumatically, their supply is cut as the Oerlikon handle's is + if (state > 0 && EPBrakeControlPowered()) EpForce = Handle->GetEP(); // TODO: przetlumaczyc else EpForce = 0; @@ -4173,6 +4174,11 @@ bool TMoverParameters::SwitchEPBrake(int state) return OK; } +bool TMoverParameters::EPBrakeControlPowered() const +{ + return Power24vIsAvailable && DirActive != 0 && EpFuse; +} + // ************************************************************************************************* // Q: 20160711 // zwiększenie ciśnienia hamowania @@ -4706,7 +4712,7 @@ void TMoverParameters::UpdatePipePressure(double dt) if ((BrakeHandle == TBrakeHandle::FVel6 || BrakeHandle == TBrakeHandle::FVE408) && CabOccupied != 0) { - if (Power24vIsAvailable && DirActive != 0 && EpFuse) // tu powinien byc jeszcze bezpiecznik EP i baterie - + if (EPBrakeControlPowered()) // tu powinien byc jeszcze bezpiecznik EP i baterie - // temp = (Handle as TFVel6).GetCP EpForce = Handle->GetEP(); else @@ -4725,6 +4731,11 @@ void TMoverParameters::UpdatePipePressure(double dt) // Ra 2014-11: na tym się wysypuje, ale nie wiem, w jakich warunkach SendCtrlToNext("Brake", EpForce, CabActive); } + else if (BrakeHandle == TBrakeHandle::St113 && CabOccupied != 0 && std::abs(EpForce) > 0.001 && !EPBrakeControlPowered()) + { + // the EP brake switched on with the button drops out with the control's supply + SwitchEPBrake(0); + } Pipe->Act(); PipePress = Pipe->P(); diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp index c0a7d2a0e..da0a98116 100644 --- a/McZapkie/hamulce.cpp +++ b/McZapkie/hamulce.cpp @@ -968,6 +968,28 @@ double TESt::BVs(double const BCP) const return 0; } +/// +/// Refills the auxiliary reservoir (ZP) from the valve pre-chamber through the +/// check valve of the slide valve, opened as far as says for the +/// given cylinder (or impulse-chamber) pressure, while the pre-chamber is more +/// than 0.05 bar above the reservoir. The flows wait for the caller's Act(). +/// +/// Brake cylinder (or impulse-chamber) pressure. +/// Time step [s]. +/// Volume taken into the auxiliary reservoir, 0.96 of it drawn from the brake pipe. +double TESt::FillBrakeRes(double const BCP, double const dt) +{ + double const BVP{BrakeRes->P()}; + double const VVP{ValveRes->P()}; + double const temp{BVs(BCP)}; + double dv{0.0}; + if (VVP - 0.05 > BVP) + dv = PF(BVP, VVP, 0.02 * SizeBR * temp / 1.87) * dt; + BrakeRes->Flow(dv); + ValveRes->Flow(-0.04 * dv); + return dv; +} + /// /// One-step Oerlikon ESt distributor advance: runs CheckState/CheckReleaser, /// integrates the ZS <-> PG, ZP <-> cylinder, ZP <-> pre-chamber and @@ -1021,15 +1043,7 @@ double TESt::GetPF(double const PP, double const dt, double const Vel) BrakeCyl->Flow(-dv); // przeplyw ZP <-> rozdzielacz - temp = BVs(BCP); - // if(BrakeStatus and b_hld)=b_off then - if (VVP - 0.05 > BVP) - dv = PF(BVP, VVP, 0.02 * SizeBR * temp / 1.87) * dt; - else - dv = 0; - BrakeRes->Flow(dv); - dV1 = dV1 + dv * 0.96; - ValveRes->Flow(-0.04 * dv); + dV1 = dV1 + FillBrakeRes(BCP, dt) * 0.96; // przeplyw PG <-> rozdzielacz dv = PF(PP, VVP, 0.01) * dt; ValveRes->Flow(-dv); @@ -1191,6 +1205,10 @@ double TEStEP2::GetPF(double const PP, double const dt, double const Vel) ValveRes->Flow(-0.04 * dv); dV1 = dV1 - 0.96 * dv; + // przeplyw ZP <-> rozdzielacz: as in every ESt, the auxiliary reservoir also charges from the brake pipe, + // not from the main reservoir pipe alone, so a unit hauled with the brake hose alone charges and brakes + dV1 = dV1 + FillBrakeRes(BCP, dt) * 0.96; + // hamulec EP EPCalc(dt); diff --git a/McZapkie/hamulce.h b/McZapkie/hamulce.h index 37b9b6a4d..b9a5ffd15 100644 --- a/McZapkie/hamulce.h +++ b/McZapkie/hamulce.h @@ -620,6 +620,15 @@ class TESt : public TBrake /// Brake cylinder pressure. /// Dimensionless opening coefficient. double BVs(double BCP) const; // napelniacz pomocniczego + /// + /// Refills the auxiliary reservoir (ZP) from the valve pre-chamber through the + /// check valve of the slide valve, opened as far as says, while + /// the pre-chamber is above the reservoir. The flows wait for the caller's Act(). + /// + /// Brake cylinder (or impulse-chamber) pressure for . + /// Time step [s]. + /// Volume taken into the auxiliary reservoir, 0.96 of it drawn from the brake pipe. + double FillBrakeRes(double BCP, double dt); // napelnianie pomocniczego z rozdzielacza /// Vents the valve, brake and control reservoirs to zero. void ForceEmptiness() override; // wymuszenie bycia pustym diff --git a/tests/unit/test_brake_handles.cpp b/tests/unit/test_brake_handles.cpp index 51c25243b..e6b435471 100644 --- a/tests/unit/test_brake_handles.cpp +++ b/tests/unit/test_brake_handles.cpp @@ -4,6 +4,7 @@ #include "golden.h" #include "real_vehicles.h" #include "drive.h" +#include "consist.h" #include "McZapkie/hamulce.h" @@ -152,3 +153,105 @@ TEST_CASE("brake handles: the overload and the high pressure buttons of the MHZ trace.check(); } } + +// eu07/maszyna#134: the Knorr St113 of the EN57-001 releases the EP brake in the running position (bh_RP, Num 6) +// and applies it one position on (Num 8), short of the lap position (Num 5); the positions are those the keys +// select, and the EP brake works only with the control of the cab powered: the battery, the reverser out of +// neutral and the EP fuse on (Ctrl+Z), as the Oerlikon handle's +namespace { + +// the front car of the EN57-001 driven from its cab, with the motor car behind it, which has the battery of the two; +// air in the reservoirs, the battery on +void ready_knorr_ep(test::consist &Unit) { + Unit.add(definition::fiz("en57_v1/6bai"), 1); + Unit.add(definition::fiz("en57_v1/5bgb")); + auto &cab{Unit[0]}; + REQUIRE(cab->BrakeHandle == TBrakeHandle::St113); + cab->BatterySwitch(true); + cab->CabActivisation(); + cab.hold_brake_pipe(5.0); + cab->BrakeLevelSet(cab->Handle->GetPos(bh_RP)); + Unit.run(60.0); +} + +// the EP brake button pressed in the given handle position, held for Seconds; the cylinder pressure of the cab car +double ep_brake(test::consist &Unit, double Position, double Seconds) { + auto &cab{Unit[0]}; + cab->BrakeLevelSet(Position); + Unit.run(0.1); + cab->SwitchEPBrake(1); + Unit.run(Seconds); + return cab->BrakePress; +} + +} // namespace + +TEST_CASE("brake handles: the positions of the Knorr St113 EP brake") { + test::consist unit; + ready_knorr_ep(unit); + auto &cab{unit[0]}; + auto &handle{*cab->Handle}; + auto const ep_at{[&unit, &cab, &handle](double Position) { + cab->BrakeLevelSet(Position); + unit.run(0.1); + return handle.GetEP(); + }}; + // the keys: Num 6 running, Num 8 the first position on, Num 5 the middle of the handle + CHECK(handle.GetPos(bh_RP) == doctest::Approx(0.0)); + CHECK(ep_at(0.0) == doctest::Approx(-1.0)); // EP release + CHECK(ep_at(1.0) == doctest::Approx(1.0)); // EP brake + CHECK(ep_at(cab->BrakeCtrlPosNo / 2) == doctest::Approx(0.0)); // lap, Num 5 + CHECK(ep_at(handle.GetPos(bh_FB)) == doctest::Approx(0.0)); + CHECK(ep_at(handle.GetPos(bh_EPR)) == doctest::Approx(-1.0)); + CHECK(ep_at(handle.GetPos(bh_EPB)) == doctest::Approx(1.0)); +} + +TEST_CASE("brake handles: the Knorr St113 EP brake needs the control of the cab powered") { + for (std::string const cut : {"reverser in neutral", "EP fuse off", "battery off"}) { + CAPTURE(cut); + test::consist unit; + ready_knorr_ep(unit); + auto &cab{unit[0]}; + cab->DirectionForward(); + unit.run(1.0); + REQUIRE(cab->EPBrakeControlPowered()); + if (cut == "reverser in neutral") { + cab->DirectionBackward(); + } + else if (cut == "EP fuse off") { + cab->EpFuseSwitch(false); + } + else { + cab->BatterySwitch(false); + } + unit.run(1.0); + REQUIRE_FALSE(cab->EPBrakeControlPowered()); + // the button in the EP brake position does nothing + CHECK(ep_brake(unit, 1.0, 5.0) < 0.1); + CHECK(cab->EpForce == doctest::Approx(0.0)); + cab->SwitchEPBrake(0); + } + + test::consist unit; + ready_knorr_ep(unit); + auto &cab{unit[0]}; + cab->DirectionForward(); + unit.run(1.0); + // powered, the EP brake applies + auto const applied{ep_brake(unit, 1.0, 2.0)}; + CHECK(applied > 0.5); + // the reverser put to neutral with the button still held: the EP brake drops out and holds what it applied + cab->DirectionBackward(); + unit.run(0.1); + CHECK(cab->EpForce == doctest::Approx(0.0)); + auto const held{cab->BrakePress}; + unit.run(5.0); + CHECK(cab->BrakePress < held + 0.05); + CHECK(cab->BrakePress > 0.2); + // and doesn't release either, until the control is powered again + CHECK(ep_brake(unit, 0.0, 5.0) > 0.2); + cab->SwitchEPBrake(0); + cab->DirectionForward(); + unit.run(0.1); + CHECK(ep_brake(unit, 0.0, 10.0) < 0.1); +} diff --git a/tests/unit/test_brakes.cpp b/tests/unit/test_brakes.cpp index 834168074..e12694f3f 100644 --- a/tests/unit/test_brakes.cpp +++ b/tests/unit/test_brakes.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "doctest.h" #include "vehicle.h" +#include "consist.h" using test::definition; using test::vehicle; @@ -91,3 +92,48 @@ TEST_CASE("brakes: service braking stops a heavier wagon too") { wagon.run(40.0 /* s */, test::track{0.15 /* friction */, 0.0 /* gradient */}); CHECK(std::abs(wagon.speed()) < 0.1); } + +// eu07/maszyna#87: the ESt4d of the EN57's EP2 valve charged its auxiliary reservoir from the main reservoir pipe +// alone, so a dead unit hauled by a locomotive coupled with the hook and the brake hose ("3") never charged it, +// its control reservoir stopped half way, and it didn't brake. Like every ESt, it charges from the brake pipe too +TEST_CASE("brakes: a dead EN57 hauled with the brake hose alone charges from the brake pipe and brakes") { + test::consist train; + auto &locomotive{train.add(definition::fiz("sm42_v1/6d1"))}; + train.add(definition::fiz("en57_v1/5bgb"), 0, coupling::coupler | coupling::brakehose); + train.add(definition::fiz("en57_v1/6ba_840")); + train.add(definition::fiz("en57_v1/5bgaiii_led_spot")); + // a unit standing dead: no air anywhere, nothing in its main reservoir pipe + for (std::size_t i = 1; i < train.size(); ++i) { + auto &car{train[i].mover()}; + REQUIRE(car.BrakeValve == TBrakeValve::EP2); + car.Hamulec->ForceEmptiness(); + car.Pipe->CreatePress(0.0); + car.Pipe->Act(); + car.Pipe2->CreatePress(0.0); + car.Pipe2->Act(); + car.CompressedVolume = 0.0; + } + locomotive.hold_brake_pipe(5.0); + train.run(900.0); + for (std::size_t i = 1; i < train.size(); ++i) { + CAPTURE(i); + auto &car{train[i].mover()}; + REQUIRE(car.ScndPipePress < 0.1); // no main reservoir pipe + CHECK(car.Hamulec->GetBRP() > 4.8); + CHECK(car.Hamulec->GetCRP() > 4.8); + CHECK(car.BrakePress < 0.1); + } + // a full service application brakes the unit, and it releases again + locomotive.hold_brake_pipe(3.5); + train.run(20.0); + for (std::size_t i = 1; i < train.size(); ++i) { + CAPTURE(i); + CHECK(train[i]->BrakePress > 2.0); + } + locomotive.hold_brake_pipe(5.0); + train.run(60.0); + for (std::size_t i = 1; i < train.size(); ++i) { + CAPTURE(i); + CHECK(train[i]->BrakePress < 0.1); + } +} From 5d6f734b047ac96a92f8752b46b96cd8dff3a444 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 06:05:37 +0100 Subject: [PATCH 321/430] feat: pose door wings of the low poly interior along with the main model (eu07/maszyna#512) The door wings are in the main model, where the door animation finds them, so seen from inside the vehicle they are lit like the exterior and ignore the compartment lights. A door panel put into the low poly interior instead stayed closed, since nothing moved it. A door wing animation now also picks up the submodel of the same name in the low poly interior, if it has one, and gives it the same pose (shift, rotate, fold with its child wings, plug). Placed under a compartment section, such a wing is lit with the section and follows its light switch. The pose maths moved unchanged to vehicle/doorwings.h, with unit tests. Assets: optional. No low poly interior in the SVN or in the Steam install has a submodel named like a door wing, so nothing changes for existing vehicles. To use it, a low poly interior gets the inside of each door wing as a submodel named like the wing in the main model (door1, door01, drzwi1, ...), with the same pivot and transform, under the compartment section it belongs to, with a SelfIllum threshold like the section's, and slightly inside the wing of the main model. --- tests/unit/test_door_wings.cpp | 54 +++++++++++++ vehicle/DynObj.cpp | 138 +++++++++++++++++++-------------- vehicle/DynObj.h | 5 ++ vehicle/doorwings.h | 52 +++++++++++++ 4 files changed, 192 insertions(+), 57 deletions(-) create mode 100644 tests/unit/test_door_wings.cpp create mode 100644 vehicle/doorwings.h diff --git a/tests/unit/test_door_wings.cpp b/tests/unit/test_door_wings.cpp new file mode 100644 index 000000000..290260f6a --- /dev/null +++ b/tests/unit/test_door_wings.cpp @@ -0,0 +1,54 @@ +#include "stdafx.h" +#include "doctest.h" + +#include "vehicle/doorwings.h" + +// the poses of the animated door wings (eu07/maszyna#512): a wing of the main model and its namesake in the low +// poly interior get the same pose, worked out once from the door position of the mover + +TEST_CASE("door wings: only the door animations move wings") { + CHECK(door_wings::is_wing(0x010)); // TAnim::TypeSet for the doors + CHECK_FALSE(door_wings::is_wing(0x000)); // axles + CHECK_FALSE(door_wings::is_wing(0x055)); // pantographs, five submodels + CHECK_FALSE(door_wings::is_wing(0x070)); // doorsteps + CHECK_FALSE(door_wings::is_wing(0x080)); // mirrors + CHECK(door_wings::is_wing(0x210)); // the parameter count in the upper bits doesn't matter +} + +TEST_CASE("door wings: odd wings are on the left, even ones on the right") { + CHECK_FALSE(door_wings::on_right_side(1)); + CHECK(door_wings::on_right_side(2)); + CHECK_FALSE(door_wings::on_right_side(3)); + CHECK(door_wings::on_right_side(4)); +} + +TEST_CASE("door wings: a sliding wing shifts along the vehicle by the door position") { + CHECK(door_wings::slide(0.f) == glm::vec3(0.f, 0.f, 0.f)); + CHECK(door_wings::slide(0.65f) == glm::vec3(0.f, 0.f, 0.65f)); +} + +TEST_CASE("door wings: a plug wing goes out first, then slides") { + auto const rangeout{0.1f}; + // closed + CHECK(door_wings::plug(0.f, rangeout) == glm::vec3(0.f, 0.f, 0.f)); + // still going out, and not sliding yet + auto const out{door_wings::plug(0.02f, rangeout)}; + CHECK(out.x == doctest::Approx(0.04f)); + CHECK(out.z == 0.f); + // out as far as it goes, sliding by what the position has beyond half of the way out + auto const open{door_wings::plug(0.7f, rangeout)}; + CHECK(open.x == rangeout); + CHECK(open.y == 0.f); + CHECK(open.z == doctest::Approx(0.65f)); +} + +TEST_CASE("door wings: a folding wing turns one way and its larger wing twice as far the other way") { + auto const angles{door_wings::fold(40.f)}; + CHECK(angles.smaller == 40.f); + CHECK(angles.larger == -80.f); + CHECK(angles.step == 40.f); + auto const closed{door_wings::fold(0.f)}; + CHECK(closed.smaller == 0.f); + CHECK(closed.larger == 0.f); + CHECK(closed.step == 0.f); +} diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index d5f60e332..bbe00028b 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -29,6 +29,7 @@ http://mozilla.org/MPL/2.0/. #include "audio/sound.h" #include "model/MdlMngr.h" #include "model/Model3d.h" +#include "vehicle/doorwings.h" #include "rendering/renderer.h" #include "application/uitranscripts.h" #include "input/messaging.h" @@ -557,20 +558,52 @@ void TDynamicObject::UpdateAxle(TAnim *pAnim) pAnim->smAnimated->future_transform = glm::rotate((float)glm::radians(m_future_wheels_angle[wheel_id]), glm::vec3(1.0f, 0.0f, 0.0f)); }; +namespace { + +// the position of the door the animated wing belongs to: its shift or angle from closed +float door_position( TMoverParameters const &Mover, TAnim const *Animation ) { + + return Mover.Doors.instances[ ( + door_wings::on_right_side( Animation->iNumber ) ? + side::right : + side::left ) ].position; +} + +// the wing in the main model, and its namesake in the low poly interior; either can be missing +std::array wing_parts( TAnim const *Animation ) { + + return { Animation->smAnimated, Animation->smInterior }; +} + +// folding door: the smaller wing turns, the larger wing (its child) the other way, the step (child of that) under it +void fold_wing( TSubModel *Wing, door_wings::fold_angles const &Angles ) { + + if( Wing == nullptr ) { return; } + // skrzydło mniejsze + Wing->SetRotate( float3( 0, 0, 1 ), Angles.smaller ); + // skrzydło większe + auto *larger { Wing->ChildGet() }; + if( larger == nullptr ) { return; } + larger->SetRotate( float3( 0, 0, 1 ), Angles.larger ); + // podnóżek? + auto *step { larger->ChildGet() }; + if( step == nullptr ) { return; } + step->SetRotate( float3( 0, 1, 0 ), Angles.step ); +} + +} // namespace + // animacja drzwi - przesuw void TDynamicObject::UpdateDoorTranslate(TAnim *pAnim) { + if( pAnim->smAnimated == nullptr ) { return; } - auto const &door { MoverParameters->Doors.instances[ ( - ( pAnim->iNumber & 1 ) == 0 ? - side::right : - side::left ) ] }; - - pAnim->smAnimated->SetTranslate( - glm::vec3{ - 0.0, - 0.0, - door.position } ); + auto const shift { door_wings::slide( door_position( *MoverParameters, pAnim ) ) }; + for( auto *wing : wing_parts( pAnim ) ) { + if( wing != nullptr ) { + wing->SetTranslate( shift ); + } + } }; // animacja drzwi - obrót @@ -578,14 +611,12 @@ void TDynamicObject::UpdateDoorRotate(TAnim *pAnim) { if( pAnim->smAnimated == nullptr ) { return; } - auto const &door { MoverParameters->Doors.instances[ ( - ( pAnim->iNumber & 1 ) == 0 ? - side::right : - side::left ) ] }; - - pAnim->smAnimated->SetRotate( - float3(1, 0, 0), - door.position ); + auto const angle { door_position( *MoverParameters, pAnim ) }; + for( auto *wing : wing_parts( pAnim ) ) { + if( wing != nullptr ) { + wing->SetRotate( float3( 1, 0, 0 ), angle ); + } + } }; // animacja drzwi - obrót @@ -593,31 +624,10 @@ void TDynamicObject::UpdateDoorFold(TAnim *pAnim) { if( pAnim->smAnimated == nullptr ) { return; } - auto const &door { MoverParameters->Doors.instances[ ( - ( pAnim->iNumber & 1 ) == 0 ? - side::right : - side::left ) ] }; - - // skrzydło mniejsze - pAnim->smAnimated->SetRotate( - float3(0, 0, 1), - door.position); - - // skrzydło większe - auto *sm = pAnim->smAnimated->ChildGet(); - if( sm == nullptr ) { return; } - - sm->SetRotate( - float3(0, 0, 1), - -door.position - door.position); - - // podnóżek? - sm = sm->ChildGet(); - if( sm == nullptr ) { return; } - - sm->SetRotate( - float3(0, 1, 0), - door.position); + auto const angles { door_wings::fold( door_position( *MoverParameters, pAnim ) ) }; + for( auto *wing : wing_parts( pAnim ) ) { + fold_wing( wing, angles ); + } }; // animacja drzwi - odskokprzesuw @@ -625,20 +635,12 @@ void TDynamicObject::UpdateDoorPlug(TAnim *pAnim) { if( pAnim->smAnimated == nullptr ) { return; } - auto const &door { MoverParameters->Doors.instances[ ( - ( pAnim->iNumber & 1 ) == 0 ? - side::right : - side::left ) ] }; - - pAnim->smAnimated->SetTranslate( - glm::vec3{ - std::min( - door.position * 2.f, - MoverParameters->Doors.range_out ), - 0.0, - std::max( - 0.f, - door.position - MoverParameters->Doors.range_out * 0.5f ) } ); + auto const shift { door_wings::plug( door_position( *MoverParameters, pAnim ), MoverParameters->Doors.range_out ) }; + for( auto *wing : wing_parts( pAnim ) ) { + if( wing != nullptr ) { + wing->SetTranslate( shift ); + } + } } void TDynamicObject::UpdatePant(TAnim *pAnim) @@ -2417,6 +2419,8 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" for( auto const &nameprefix : nameprefixes ) { init_sections( mdLowPolyInt, nameprefix, MoverParameters->CompartmentLights.start_type == start_t::manual ); } + // the inside of the door wings, if the interior has them + init_interior_doors(); } // destination sign if( mdModel ) { @@ -2561,6 +2565,26 @@ TDynamicObject::init_sections( TModel3d const *Model, std::string const &Namepre return sectioncount; } +// a door wing of the main model is seen from the outside, lit as the exterior. its namesake in the low poly interior, +// if the model has one, follows its moves and is lit with the interior, by its compartment section if it's in one +void +TDynamicObject::init_interior_doors() { + + if( mdLowPolyInt == nullptr ) { return; } + + for( auto &animation : pAnimations ) { + // the door animation is only set up for a wing found in the main model + if( false == door_wings::is_wing( animation.iFlags ) ) { continue; } + if( ( animation.yUpdate == nullptr ) || ( animation.smAnimated == nullptr ) ) { continue; } + + auto *interiorwing { mdLowPolyInt->GetFromName( animation.smAnimated->pName ) }; + if( ( interiorwing == nullptr ) || ( interiorwing == animation.smAnimated ) ) { continue; } + + interiorwing->WillBeAnimated(); + animation.smInterior = interiorwing; + } +} + bool TDynamicObject::init_destination( TModel3d *Model ) { diff --git a/vehicle/DynObj.h b/vehicle/DynObj.h index 577f0f020..b6a2985bf 100644 --- a/vehicle/DynObj.h +++ b/vehicle/DynObj.h @@ -157,6 +157,9 @@ public: float fMaxDist; // do jakiej odległości wykonywana jest animacja NOTE: square of actual distance float fSpeed; // parametr szybkości animacji int iNumber; // numer kolejny obiektu + // door wings only: the submodel of the same name in the low poly interior, if it has one, posed along with + // smAnimated, so the inside of the door can be part of the interior and lit with it + TSubModel *smInterior { nullptr }; TUpdate yUpdate; // metoda TDynamicObject aktualizująca animację /* @@ -694,6 +697,8 @@ private: float Load, std::string LoadType, bool Reversed, std::string); int init_sections( TModel3d const *Model, std::string const &Nameprefix, bool const Overrideselfillum ); bool init_destination( TModel3d *Model ); + // pairs the animated door wings with their namesakes in the low poly interior + void init_interior_doors(); void create_controller( std::string const Type, bool const Trainset ); void AttachNext(TDynamicObject *Object, int iType = 1); bool UpdateForce(double dt); diff --git a/vehicle/doorwings.h b/vehicle/doorwings.h new file mode 100644 index 000000000..07286aac8 --- /dev/null +++ b/vehicle/doorwings.h @@ -0,0 +1,52 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include + +#include + +// the poses of the animated door wings of a vehicle, for the door position of the mover. a wing is posed alike +// in the main model and, when the low poly interior has a submodel of the same name, in the interior as well +namespace door_wings { + +// whether the animation with the given flags (TAnim::iFlags, the kind of animation in bits 4-7) moves a door wing +inline bool is_wing(int const Flags) { + return (Flags & 0xF0) == 0x10; +} + +// odd numbered wings (door1, door3...) are on the left side of the vehicle, even numbered on the right +inline bool on_right_side(int const Number) { + return (Number & 1) == 0; +} + +// sliding door (type 1): shifted along the vehicle +inline glm::vec3 slide(float const Position) { + return {0.f, 0.f, Position}; +} + +// plug door (type 4): pushed out first, up to Rangeout, then slid along the vehicle +inline glm::vec3 plug(float const Position, float const Rangeout) { + return {std::min(Position * 2.f, Rangeout), 0.f, std::max(0.f, Position - Rangeout * 0.5f)}; +} + +// folding door (type 3): the angles of the smaller wing, of the larger wing (its child) and of the step (the +// child of the larger wing) +struct fold_angles { + float smaller; + float larger; + float step; +}; + +inline fold_angles fold(float const Position) { + return {Position, -Position - Position, Position}; +} + +} // namespace door_wings From 13ded6cdfa33c444acd48097db428440a7a4b8f7 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 07:12:30 +0100 Subject: [PATCH 322/430] feat: separate engine start switches for the vehicles in multiple (eu07/maszyna#80) In vehicles like the ST43, the SP32 or the SN61 every engine of a train in multiple has its own start and stop buttons in the cab. Until now the cab's line breaker / engine start switch (main_sw, main_on_bt, main_off_bt) always started and stopped the engines of all the vehicles under its control. - .fiz, Engine: JointEngineStart=Yes|No (default Yes, as before). With No the cab's main_* work the cab's own vehicle only, and an engine stopping on its own (stalled, out of fuel) stops only its own vehicle instead of every engine in the train. - .mmd: mainb_sw, mainb_on_bt, mainb_off_bt work the second vehicle with an engine under the cab's control, mainc_sw, mainc_on_bt, mainc_off_bt the third one. They count along the control cable from the cab's vehicle, behind the cab first. Like main_*, the start switch has to be held for the vehicle's IniCDelay with the vehicle ready (MainSwitchCheck); an impulse switch of an electric locomotive with series motors closes on release. - New commands, added at the end of the command list: linebreakertoggleb, linebreakeropenb, linebreakercloseb, linebreakertogglec, linebreakeropenc, linebreakerclosec. No default keys. - The logic is in vehicle/enginestart.{h,cpp} (core library), tested in tests/unit/test_engine_start.cpp. Nothing changes for existing vehicles: the new key and the new cab controls are optional, and without them the code does what it did before. Game data (SVN, not changed here, to be done separately; the code works without it): for the SN61 (dynamic/pkp/sn61_v2), whose cab models already have the buttons start02/stop02/start03/stop03, - sn61.fiz, sn61-86.fiz, sn61_v1.fiz and the other SN61 .fiz: add JointEngineStart=No to the Engine: line; - sn61.mmd.inc (and the other SN61 includes): after main_on_bt add mainb_off_bt: { stop02 mov -0.005 0 0.1 ... } mainb_on_bt: { start02 mov -0.005 0 0.1 ... } mainc_off_bt: { stop03 mov -0.005 0 0.1 ... } mainc_on_bt: { start03 mov -0.005 0 0.1 ... } with the sounds of main_off_bt / main_on_bt. The tooltips "line breaker B" / "line breaker C" are new strings for lang/*.po. --- CMakeLists.txt | 1 + McZapkie/MOVER.h | 9 ++ McZapkie/Mover.cpp | 7 +- input/command.cpp | 12 ++ input/command.h | 6 + input/drivermouseinput.cpp | 18 +++ tests/unit/test_engine_start.cpp | 248 +++++++++++++++++++++++++++++++ utilities/translation.cpp | 6 + vehicle/Train.cpp | 193 +++++++++++++++++++++++- vehicle/Train.h | 17 +++ vehicle/enginestart.cpp | 107 +++++++++++++ vehicle/enginestart.h | 45 ++++++ vr/openvr_imp.cpp | 18 +++ 13 files changed, 682 insertions(+), 5 deletions(-) create mode 100644 tests/unit/test_engine_start.cpp create mode 100644 vehicle/enginestart.cpp create mode 100644 vehicle/enginestart.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f34ad61f..05e24b42d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -462,6 +462,7 @@ set(CORE_SOURCES "utilities/parser.cpp" "utilities/utilities.cpp" "scripting/ladderlogic.cpp" +"vehicle/enginestart.cpp" "vehicle/handover.cpp" "vehicle/horn.cpp" "vehicle/smoke.cpp" diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 16bb207fa..3d0f7b777 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -2093,6 +2093,9 @@ class TMoverParameters double MainsInitTime{0.0}; // config, initialization time (in seconds) of the main circuit after it receives power, before it can be closed double MainsInitTimeCountdown{0.0}; // current state of main circuit initialization, remaining time (in seconds) until it's ready start_t MainsStart{start_t::manual}; + // config, Engine:JointEngineStart. whether the cab's line breaker / engine start switch works the vehicles in multiple + // too; when it doesn't, the cab has separate switches for them (mainb_*, mainc_*) + bool JointEngineStart{true}; bool LineBreakerClosesOnlyAtNoPowerPos{false}; bool ControlPressureSwitch{false}; // activates if the main pipe and/or brake cylinder pressure aren't within operational levels bool HasControlPressureSwitch{true}; @@ -2475,6 +2478,12 @@ class TMoverParameters // whether the cab command opening the main circuit opens it where the only cab switch of the circuit is the button // closing it: on a diesel that's the starter button, and the command is the one way to stop an engine whose fuel pump // starts on its own (eu07/maszyna#427). the other vehicles with such a button keep ignoring the command + // the vehicles the line breaker / engine start switch of this vehicle works, and its engine stopping on its own + // stops: the whole consist, or with JointEngineStart=No this vehicle alone (eu07/maszyna#80) + range_t MainSwitchRange() const + { + return JointEngineStart ? range_t::consist : range_t::local; + } bool MainCircuitOpensWithStarterOnly() const { return EngineType == TEngineType::DieselEngine || EngineType == TEngineType::DieselElectric; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 20761bacb..e48ae4e11 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -7869,7 +7869,8 @@ bool TMoverParameters::dizel_Update(double dt) { // knock out the engine if the fuel pump isn't feeding it // TBD, TODO: grace period before the engine is starved for fuel and knocked out - MainSwitch(false); + // an engine started on its own stops on its own + MainSwitch(false, MainSwitchRange()); } bool DU{false}; @@ -8160,7 +8161,8 @@ double TMoverParameters::dizel_Momentum(double Fill, double n, double dt) if (enrot <= 0 && false == dizel_spinup) { - MainSwitch(false); + // a stopped engine doesn't stop those started on their own + MainSwitch(false, MainSwitchRange()); enrot = 0; } @@ -11158,6 +11160,7 @@ void TMoverParameters::LoadFIZ_Engine(std::string const &Input) { EngineType = LoadFIZ_EngineDecode(extract_value("EngineType", Input)); + extract_value(JointEngineStart, "JointEngineStart", Input, ""); if (std::string transmission = extract_value("Trans", Input); false == transmission.empty()) { diff --git a/input/command.cpp b/input/command.cpp index 0ae67cfa5..ad208ce95 100644 --- a/input/command.cpp +++ b/input/command.cpp @@ -406,6 +406,12 @@ commanddescription_sequence Commands_descriptions = { {"wiperswitchdecrease", command_target::vehicle, command_mode::oneoff}, {"lightsset", command_target::vehicle, command_mode::oneoff}, {"oilfuelpumptoggle", command_target::vehicle, command_mode::oneoff}, + {"linebreakertoggleb", command_target::vehicle, command_mode::oneoff}, + {"linebreakeropenb", command_target::vehicle, command_mode::oneoff}, + {"linebreakercloseb", command_target::vehicle, command_mode::oneoff}, + {"linebreakertogglec", command_target::vehicle, command_mode::oneoff}, + {"linebreakeropenc", command_target::vehicle, command_mode::oneoff}, + {"linebreakerclosec", command_target::vehicle, command_mode::oneoff}, }; // Maps of command and coresponding strings @@ -791,6 +797,12 @@ std::unordered_map const commandMap = { {"wiperswitchdecrease", user_command::wiperswitchdecrease}, {"lightsset", user_command::lightsset}, {"oilfuelpumptoggle", user_command::oilfuelpumptoggle}, + {"linebreakertoggleb", user_command::linebreakertoggleb}, + {"linebreakeropenb", user_command::linebreakeropenb}, + {"linebreakercloseb", user_command::linebreakercloseb}, + {"linebreakertogglec", user_command::linebreakertogglec}, + {"linebreakeropenc", user_command::linebreakeropenc}, + {"linebreakerclosec", user_command::linebreakerclosec}, {"none", user_command::none}}; } // namespace simulation diff --git a/input/command.h b/input/command.h index ddacef4a0..ea51a68cb 100644 --- a/input/command.h +++ b/input/command.h @@ -404,6 +404,12 @@ enum class user_command wiperswitchdecrease, lightsset, oilfuelpumptoggle, + linebreakertoggleb, + linebreakeropenb, + linebreakercloseb, + linebreakertogglec, + linebreakeropenc, + linebreakerclosec, none = -1 }; diff --git a/input/drivermouseinput.cpp b/input/drivermouseinput.cpp index 22562b856..c7a9aeb97 100644 --- a/input/drivermouseinput.cpp +++ b/input/drivermouseinput.cpp @@ -597,6 +597,18 @@ drivermouse_input::default_bindings() { { "main_on_bt:",{ linebreakerclose, none } }, + { "mainb_off_bt:", { + linebreakeropenb, + none } }, + { "mainb_on_bt:", { + linebreakercloseb, + none } }, + { "mainc_off_bt:", { + linebreakeropenc, + none } }, + { "mainc_on_bt:", { + linebreakerclosec, + none } }, { "security_reset_bt:", { alerteracknowledge, none } }, @@ -774,6 +786,12 @@ drivermouse_input::default_bindings() { { "main_sw:", { linebreakertoggle, none } }, + { "mainb_sw:", { + linebreakertoggleb, + none } }, + { "mainc_sw:", { + linebreakertogglec, + none } }, { "radio_sw:", { radiotoggle, none } }, diff --git a/tests/unit/test_engine_start.cpp b/tests/unit/test_engine_start.cpp new file mode 100644 index 000000000..6524075c3 --- /dev/null +++ b/tests/unit/test_engine_start.cpp @@ -0,0 +1,248 @@ +#include "stdafx.h" +#include "doctest.h" +#include "consist.h" + +#include "vehicle/enginestart.h" + +// starting the engines of the vehicles in multiple from the cab (eu07/maszyna#80): the cab's own switch (main_*) works +// all of them unless Engine:JointEngineStart=No keeps it to its own vehicle, and the switches mainb_* and mainc_* start +// the second and the third vehicle alone. the cab (TTrain) passes the vehicle's MainSwitchRange() to its MainSwitch(), +// finds the vehicles with engine(), and runs remote_switch for the switches of the others + +using test::consist; +using test::definition; + +namespace { + +// the SN61 railcar, whose cab has a set of switches for each of up to three railcars in multiple +definition sn61(bool const Joint = true) { + auto railcar{definition::fiz("sn61_v2/sn61")}; + if (false == Joint) { + railcar.set("Engine", "JointEngineStart", "No"); + } + return railcar; +} + +// the battery, the cab and the pumps of every railcar of the train switched on from the first one's cab, the oil +// pressure built up, and the controller at the first position giving the engines fuel, which a mechanical diesel +// starts at: everything but the engines ready to start +void prepare(consist &Train) { + auto &cab{Train[0].mover()}; + cab.BatterySwitch(true); + cab.CabActivisation(); + cab.OilPumpSwitch(true); + cab.FuelPumpSwitch(true); + while (cab.RList[cab.MainCtrlPos].R == 0.0 && cab.IncMainCtrl(1)) { + // up to the first position with fuel + } + Train.run(20.0); +} + +bool running(TMoverParameters const &Vehicle) { + return Vehicle.Mains && Vehicle.enrot > 0.5 * Vehicle.dizel_nmin; +} + +// the switch of Engine held closed for Seconds, then let go, in steps of the train +void hold(consist &Train, engine_start::remote_switch &Switch, TMoverParameters *Engine, double const Seconds, bool const Closesonrelease = false) { + auto const dt{0.01}; + for (auto time = 0.0; time < Seconds; time += dt) { + Switch.update(Engine, true, false, dt, Closesonrelease); + Train.step({}, dt); + } + Switch.update(Engine, false, false, dt, Closesonrelease); +} + +} // namespace + +TEST_CASE("engine start: the joint start is the default, and JointEngineStart=No keeps the cab's switch to its vehicle") { + consist train; + auto const &joint{train.add(sn61(), 1).mover()}; + auto const &separate{train.add(sn61(false)).mover()}; + CHECK(joint.JointEngineStart); + CHECK_FALSE(separate.JointEngineStart); + CHECK(joint.MainSwitchRange() == range_t::consist); + CHECK(separate.MainSwitchRange() == range_t::local); +} + +TEST_CASE("engine start: the vehicles in multiple, counted from the cab's own one, those behind the cab first") { + consist train; + auto &first{train.add(sn61(), 1).mover()}; + auto &second{train.add(sn61()).mover()}; + auto &third{train.add(sn61()).mover()}; + CHECK(engine_start::engine(first, first, 1) == &first); + CHECK(engine_start::engine(first, first, 2) == &second); + CHECK(engine_start::engine(first, first, 3) == &third); + CHECK(engine_start::engine(first, first, 4) == nullptr); + CHECK(engine_start::engine(first, first, 0) == nullptr); + // from the rear cab of the first railcar the others are in front of the cab, in the same order + first.CabOccupied = -1; + CHECK(engine_start::engine(first, first, 2) == &second); + CHECK(engine_start::engine(first, first, 3) == &third); + // from the middle one, the one behind its cab comes first + second.CabOccupied = 1; + CHECK(engine_start::engine(second, second, 2) == &third); + CHECK(engine_start::engine(second, second, 3) == &first); + second.CabOccupied = -1; + CHECK(engine_start::engine(second, second, 2) == &first); + CHECK(engine_start::engine(second, second, 3) == &third); +} + +TEST_CASE("engine start: only the vehicles with an engine and under control through the cable count") { + consist train; + auto &first{train.add(sn61(), 1).mover()}; + // a vehicle without an engine between the railcars is passed over + auto &trailer{train.add(definition::fiz("ed72_v1/5bs-ra")).mover()}; + auto &second{train.add(sn61()).mover()}; + REQUIRE(trailer.Power < 0.01); + CHECK(engine_start::engine(first, first, 2) == &second); + // the vehicle with the cab doesn't drive itself: its engine is in the vehicle it controls, which isn't counted twice + trailer.CabOccupied = 1; + CHECK(engine_start::engine(trailer, first, 1) == &first); + CHECK(engine_start::engine(trailer, first, 2) == &second); + CHECK(engine_start::engine(trailer, first, 3) == nullptr); + + // coupled without the control cable, the other railcar isn't under the cab's control + consist apart; + auto &alone{apart.add(sn61(), 1).mover()}; + apart.add(sn61(), 0, coupling::coupler | coupling::brakehose); + CHECK(engine_start::engine(alone, alone, 2) == nullptr); +} + +TEST_CASE("engine start: by default the cab's switch starts and stops the engines of all the vehicles in multiple") { + consist train; + auto &first{train.add(sn61(), 1).mover()}; + auto const &second{train.add(sn61()).mover()}; + prepare(train); + REQUIRE_FALSE(first.Mains); + REQUIRE_FALSE(second.Mains); + first.MainSwitch(true, first.MainSwitchRange()); + train.run(15.0); + CHECK(running(first)); + CHECK(running(second)); + first.MainSwitch(false, first.MainSwitchRange()); + train.run(5.0); + CHECK_FALSE(first.Mains); + CHECK_FALSE(second.Mains); +} + +TEST_CASE("engine start: with JointEngineStart=No each engine has its own switch") { + consist train; + auto &first{train.add(sn61(false), 1).mover()}; + auto &second{train.add(sn61(false)).mover()}; + auto &third{train.add(sn61(false)).mover()}; + prepare(train); + // the cab's own switch starts its own engine only + first.MainSwitch(true, first.MainSwitchRange()); + train.run(15.0); + REQUIRE(running(first)); + CHECK_FALSE(second.Mains); + CHECK_FALSE(third.Mains); + + // the second one's switch, mainb_*, starts the second engine + engine_start::remote_switch switchb; + engine_start::remote_switch switchc; + auto *engineb{engine_start::engine(first, first, 2)}; + auto *enginec{engine_start::engine(first, first, 3)}; + REQUIRE(engineb == &second); + REQUIRE(enginec == &third); + hold(train, switchb, engineb, 2.0); // past the SN61's delay of 1.5 s + train.run(15.0); + CHECK(running(second)); + CHECK_FALSE(third.Mains); + // and the third one's, mainc_*, the third + hold(train, switchc, enginec, 2.0); + train.run(15.0); + CHECK(running(third)); + + // the switches open their own vehicles' circuits only + CHECK(engine_start::remote_switch::open(second)); + train.run(5.0); + CHECK_FALSE(second.Mains); + CHECK(running(first)); + CHECK(running(third)); + first.MainSwitch(false, first.MainSwitchRange()); + train.run(5.0); + CHECK_FALSE(first.Mains); + CHECK(running(third)); + CHECK_FALSE(engine_start::remote_switch::open(second)); // already stopped +} + +TEST_CASE("engine start: the switch of another vehicle is held for the vehicle's delay, with the vehicle ready") { + consist train; + train.add(sn61(false).set("Cntrl", "IniCDelay", "2.0"), 1); + auto &second{train.add(sn61(false).set("Cntrl", "IniCDelay", "2.0")).mover()}; + REQUIRE(second.InitialCtrlDelay == doctest::Approx(2.0)); + engine_start::remote_switch switchb; + + // without the battery the switch does nothing, however long it's held + hold(train, switchb, &second, 5.0); + train.run(5.0); + CHECK_FALSE(second.Mains); + CHECK_FALSE(second.dizel_startup); + + prepare(train); + // let go too early + hold(train, switchb, &second, 1.0); + CHECK_FALSE(engine_start::remote_switch::is_running(second)); + // the switch opening the circuit held along, the closing one does nothing + auto const dt{0.01}; + for (auto time = 0.0; time < 3.0; time += dt) { + switchb.update(&second, true, true, dt, false); + train.step({}, dt); + } + CHECK_FALSE(engine_start::remote_switch::is_running(second)); + // held long enough + hold(train, switchb, &second, 2.5); + CHECK(engine_start::remote_switch::is_running(second)); + train.run(15.0); + CHECK(running(second)); +} + +TEST_CASE("engine start: a switch closing on release, as an electric locomotive's impulse switch, waits to be let go") { + consist train; + train.add(sn61(false), 1); + auto &second{train.add(sn61(false).set("Cntrl", "IniCDelay", "1.0")).mover()}; + prepare(train); + engine_start::remote_switch switchb; + auto const dt{0.01}; + // held past the delay, the circuit stays open while the switch is held + for (auto time = 0.0; time < 2.0; time += dt) { + switchb.update(&second, true, false, dt, true); + train.step({}, dt); + } + CHECK_FALSE(engine_start::remote_switch::is_running(second)); + // and closes when let go + switchb.update(&second, false, false, dt, true); + CHECK(engine_start::remote_switch::is_running(second)); + train.run(15.0); + REQUIRE(running(second)); + // let go before the delay, it doesn't + CHECK(engine_start::remote_switch::open(second)); + train.run(5.0); + REQUIRE_FALSE(engine_start::remote_switch::is_running(second)); + hold(train, switchb, &second, 0.5, true); + CHECK_FALSE(engine_start::remote_switch::is_running(second)); +} + +TEST_CASE("engine start: an engine stopping on its own stops the others only when they started together") { + for (auto const joint : {true, false}) { + CAPTURE(joint); + consist train; + auto &first{train.add(sn61(joint), 1).mover()}; + auto const &second{train.add(sn61(joint)).mover()}; + prepare(train); + engine_start::remote_switch switchb; + first.MainSwitch(true, first.MainSwitchRange()); + hold(train, switchb, engine_start::engine(first, first, 2), 2.0); + train.run(15.0); + REQUIRE(running(first)); + REQUIRE(running(second)); + // the first one's fuel cut off, its engine stops + first.FuelPump.is_disabled = true; + train.run(15.0); + CHECK_FALSE(first.Mains); + CHECK(first.enrot == 0.0); + // started on their own, the others keep running + CHECK(running(second) == (false == joint)); + } +} diff --git a/utilities/translation.cpp b/utilities/translation.cpp index c0dbeb1a0..d05ee13e8 100644 --- a/utilities/translation.cpp +++ b/utilities/translation.cpp @@ -225,6 +225,10 @@ std::string locale::label_cab_control(std::string const &Label) { "coolingfans_sw:", STRN("cooling fans") }, { "main_off_bt:", STRN("line breaker") }, { "main_on_bt:", STRN("line breaker") }, + { "mainb_off_bt:", STRN("line breaker B") }, + { "mainb_on_bt:", STRN("line breaker B") }, + { "mainc_off_bt:", STRN("line breaker C") }, + { "mainc_on_bt:", STRN("line breaker C") }, { "security_reset_bt:", STRN("alerter") }, { "shp_reset_bt:", STRN("shp") }, { "releaser_bt:", STRN("independent brake releaser") }, @@ -270,6 +274,8 @@ std::string locale::label_cab_control(std::string const &Label) { "converterlocal_sw:", STRN("local converter") }, { "converteroff_sw:", STRN("converter") }, { "main_sw:", STRN("line breaker") }, + { "mainb_sw:", STRN("line breaker B") }, + { "mainc_sw:", STRN("line breaker C") }, { "radio_sw:", STRN("radio") }, { "radiochannel_sw:", STRN("radio channel") }, { "radiochannelprev_sw:", STRN("radio channel") }, diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index e30635f4f..ab60371c4 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -337,6 +337,12 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { {user_command::linebreakertoggle, &TTrain::OnCommand_linebreakertoggle}, {user_command::linebreakeropen, &TTrain::OnCommand_linebreakeropen}, {user_command::linebreakerclose, &TTrain::OnCommand_linebreakerclose}, + {user_command::linebreakertoggleb, &TTrain::OnCommand_linebreakertoggleremote}, + {user_command::linebreakeropenb, &TTrain::OnCommand_linebreakeropenremote}, + {user_command::linebreakercloseb, &TTrain::OnCommand_linebreakercloseremote}, + {user_command::linebreakertogglec, &TTrain::OnCommand_linebreakertoggleremote}, + {user_command::linebreakeropenc, &TTrain::OnCommand_linebreakeropenremote}, + {user_command::linebreakerclosec, &TTrain::OnCommand_linebreakercloseremote}, {user_command::fuelpumptoggle, &TTrain::OnCommand_fuelpumptoggle}, {user_command::fuelpumpenable, &TTrain::OnCommand_fuelpumpenable}, {user_command::fuelpumpdisable, &TTrain::OnCommand_fuelpumpdisable}, @@ -3718,7 +3724,7 @@ void TTrain::OnCommand_linebreakeropen(TTrain *Train, command_data const &Comman return; } // already in the desired state - if (true == Train->mvControlled->MainSwitch(false)) + if (true == Train->mvControlled->MainSwitch(false, Train->mvControlled->MainSwitchRange())) { Train->m_linebreakerstate = 0; } @@ -3793,13 +3799,157 @@ void TTrain::OnCommand_linebreakerclose(TTrain *Train, command_data const &Comma if (Train->m_linebreakerstate == 2 && Train->mvControlled->EngineType == TEngineType::ElectricSeriesMotor) { // try to finalize state change of the line breaker, set the state based on the outcome - Train->m_linebreakerstate = Train->mvControlled->MainSwitch(true) ? 1 : 0; + Train->m_linebreakerstate = Train->mvControlled->MainSwitch(true, Train->mvControlled->MainSwitchRange()) ? 1 : 0; } // on button release reset the closing timer Train->fMainRelayTimer = 0.0f; } } +namespace +{ + +// which of the switches of the other vehicles in multiple a command works: 0 the second vehicle's, 1 the third one's +std::size_t remote_linebreaker_index(user_command const Command) +{ + using enum user_command; + return (Command == linebreakertogglec || Command == linebreakeropenc || Command == linebreakerclosec) ? 1 : 0; +} + +// the impulse switches of another vehicle's line breaker spring back when let go, whichever way they were pressed +void release_remote_linebreaker(TTrain::remote_linebreaker &Controls, std::optional &Sound) +{ + if (Controls.on_button.SubModel != nullptr) + { + Controls.on_button.UpdateValue(0.0, Sound); + } + if (Controls.off_button.SubModel != nullptr) + { + Controls.off_button.UpdateValue(0.0, Sound); + } + if (Controls.main_switch.SubModel != nullptr && Controls.main_switch.type() != TGaugeType::toggle) + { + Controls.main_switch.UpdateValue(0.5, Sound); + } + Controls.held_without_switch = false; +} + +} // namespace + +TMoverParameters *TTrain::remote_engine(std::size_t const Index) const +{ + return engine_start::engine(*mvOccupied, *mvControlled, static_cast(Index) + 2); +} + +void TTrain::OnCommand_linebreakertoggleremote(TTrain *Train, command_data const &Command) +{ + auto const index{remote_linebreaker_index(Command.command)}; + auto &controls{Train->m_remotelinebreakers[index]}; + + if (Command.action == GLFW_PRESS) + { + // a two-state switch goes the other way than it stands, an impulse one the other way than the engine is + bool close{false}; + if (controls.main_switch.SubModel != nullptr && controls.main_switch.type() == TGaugeType::toggle) + { + close = controls.main_switch.GetDesiredValue() < 0.5; + } + else + { + auto const *engine{Train->remote_engine(index)}; + close = engine == nullptr || false == engine_start::remote_switch::is_running(*engine); + } + if (close) + { + OnCommand_linebreakercloseremote(Train, Command); + } + else + { + OnCommand_linebreakeropenremote(Train, Command); + } + } + else if (Command.action == GLFW_RELEASE) + { + if (controls.on_button.SubModel != nullptr || controls.main_switch.type() != TGaugeType::toggle) + { + // only impulse switches react to release events + release_remote_linebreaker(controls, Train->dsbSwitch); + } + controls.held_without_switch = false; + } +} + +void TTrain::OnCommand_linebreakeropenremote(TTrain *Train, command_data const &Command) +{ + auto const index{remote_linebreaker_index(Command.command)}; + auto &controls{Train->m_remotelinebreakers[index]}; + + if (Command.action == GLFW_PRESS) + { + // visual feedback + if (controls.off_button.SubModel != nullptr) + { + controls.off_button.UpdateValue(1.0, Train->dsbSwitch); + } + else if (controls.main_switch.SubModel != nullptr) + { + controls.main_switch.UpdateValue(0.0, Train->dsbSwitch); + } + controls.held_without_switch = false; + if (auto *engine{Train->remote_engine(index)}; engine != nullptr) + { + engine_start::remote_switch::open(*engine); + } + } + else if (Command.action == GLFW_RELEASE) + { + release_remote_linebreaker(controls, Train->dsbSwitch); + } +} + +void TTrain::OnCommand_linebreakercloseremote(TTrain *Train, command_data const &Command) +{ + auto const index{remote_linebreaker_index(Command.command)}; + auto &controls{Train->m_remotelinebreakers[index]}; + + if (Command.action == GLFW_PRESS) + { + // visual feedback; the line breaker closes in the train update, once the switch was held long enough + if (controls.on_button.SubModel != nullptr) + { + controls.on_button.UpdateValue(1.0, Train->dsbSwitch); + } + else if (controls.main_switch.SubModel != nullptr) + { + controls.main_switch.UpdateValue(1.0, Train->dsbSwitch); + } + else + { + // no switch in the cab, the command alone holds it + controls.held_without_switch = true; + } + } + else if (Command.action == GLFW_RELEASE) + { + release_remote_linebreaker(controls, Train->dsbSwitch); + } +} + +void TTrain::update_remote_linebreakers(double const Deltatime) +{ + for (std::size_t index = 0; index < m_remotelinebreakers.size(); ++index) + { + auto &controls{m_remotelinebreakers[index]}; + auto *engine{remote_engine(index)}; + auto const closeheld{controls.held_without_switch || (controls.main_switch.SubModel != nullptr && controls.main_switch.GetDesiredValue() > 0.95) || + (controls.on_button.SubModel != nullptr && controls.on_button.GetDesiredValue() > 0.95)}; + auto const openheld{controls.off_button.SubModel != nullptr && controls.off_button.GetDesiredValue() > 0.95}; + // as with the cab's own switch, an electric locomotive's impulse switch closes the line breaker when let go + auto const closesonrelease{engine != nullptr && controls.on_button.SubModel != nullptr && engine->EngineType == TEngineType::ElectricSeriesMotor}; + controls.state.update(engine, closeheld, openheld, Deltatime, closesonrelease); + } +} + void TTrain::OnCommand_fuelpumptoggle(TTrain *Train, command_data const &Command) { @@ -8442,8 +8592,10 @@ bool TTrain::Update(double const Deltatime) if (m_linebreakerstate == 2 && (ggMainOnButton.SubModel == nullptr || mvControlled->EngineType != TEngineType::ElectricSeriesMotor)) { // try to finalize state change of the line breaker, set the state based on the outcome - m_linebreakerstate = mvControlled->MainSwitch(true) ? 1 : 0; + m_linebreakerstate = mvControlled->MainSwitch(true, mvControlled->MainSwitchRange()) ? 1 : 0; } + // the switches of the other vehicles in multiple + update_remote_linebreakers(Deltatime); // door permits for (auto idx = 0; idx < 2; ++idx) { @@ -9543,6 +9695,12 @@ bool TTrain::Update(double const Deltatime) ggMainOffButton.Update(); ggMainOnButton.Update(); ggMainButton.Update(); + for (auto &remotelinebreaker : m_remotelinebreakers) + { + remotelinebreaker.main_switch.Update(); + remotelinebreaker.on_button.Update(); + remotelinebreaker.off_button.Update(); + } ggSecurityResetButton.Update(); ggSHPResetButton.Update(); ggReleaserButton.Update(); @@ -11036,6 +11194,13 @@ void TTrain::clear_cab_controls() ggMaxCurrentCtrl.Clear(); ggMainOffButton.Clear(); ggMainOnButton.Clear(); + for (auto &remotelinebreaker : m_remotelinebreakers) + { + remotelinebreaker.main_switch.Clear(); + remotelinebreaker.on_button.Clear(); + remotelinebreaker.off_button.Clear(); + remotelinebreaker.held_without_switch = false; + } ggSecurityResetButton.Clear(); ggSHPResetButton.Clear(); ggReleaserButton.Clear(); @@ -11287,6 +11452,22 @@ void TTrain::set_cab_controls(int const Cab) { // instead of single main button there can be on/off pair ggMainButton.PutValue(ggMainButton.type() == TGaugeType::push ? 0.5f : m_linebreakerstate > 0 ? 1.f : 0.f); } + // line breakers of the other vehicles in multiple + for (std::size_t index = 0; index < m_remotelinebreakers.size(); ++index) + { + auto &mainswitch{m_remotelinebreakers[index].main_switch}; + if (mainswitch.SubModel == nullptr) + { + continue; + } + if (mainswitch.type() == TGaugeType::push) + { + mainswitch.PutValue(0.5f); + continue; + } + auto const *engine{remote_engine(index)}; + mainswitch.PutValue(engine != nullptr && engine_start::remote_switch::is_running(*engine) ? 1.f : 0.f); + } if (ggModernLightDimSw.SubModel != nullptr) { @@ -11778,6 +11959,12 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con {"maxcurrent_sw:", ggMaxCurrentCtrl}, {"main_off_bt:", ggMainOffButton}, {"main_on_bt:", ggMainOnButton}, + {"mainb_sw:", m_remotelinebreakers[0].main_switch}, + {"mainb_off_bt:", m_remotelinebreakers[0].off_button}, + {"mainb_on_bt:", m_remotelinebreakers[0].on_button}, + {"mainc_sw:", m_remotelinebreakers[1].main_switch}, + {"mainc_off_bt:", m_remotelinebreakers[1].off_button}, + {"mainc_on_bt:", m_remotelinebreakers[1].on_button}, {"security_reset_bt:", ggSecurityResetButton}, {"shp_reset_bt:", ggSHPResetButton}, {"releaser_bt:", ggReleaserButton}, diff --git a/vehicle/Train.h b/vehicle/Train.h index 009b349b4..a834d8ff0 100644 --- a/vehicle/Train.h +++ b/vehicle/Train.h @@ -14,6 +14,7 @@ http://mozilla.org/MPL/2.0/. #include "vehicle/Driver.h" #include "vehicle/Button.h" #include "vehicle/Gauge.h" +#include "vehicle/enginestart.h" #include "audio/sound.h" #include "scripting/PyInt.h" #include "input/command.h" @@ -214,6 +215,10 @@ class TTrain { void change_pantograph_selection( int const Change ); // helper, common part of pantograh valves state update methods void update_pantograph_valves(); + // the Index-th other vehicle in multiple whose engine the cab starts with its own switches (0: mainb_*, 1: mainc_*) + TMoverParameters *remote_engine( std::size_t const Index ) const; + // the switches starting the engines of the other vehicles in multiple, for Deltatime seconds + void update_remote_linebreakers( double const Deltatime ); // update function subroutines void update_sounds( double const Deltatime ); void update_sounds_runningnoise( sound_source &Sound ); @@ -338,6 +343,9 @@ class TTrain { static void OnCommand_linebreakertoggle( TTrain *Train, command_data const &Command ); static void OnCommand_linebreakeropen( TTrain *Train, command_data const &Command ); static void OnCommand_linebreakerclose( TTrain *Train, command_data const &Command ); + static void OnCommand_linebreakertoggleremote( TTrain *Train, command_data const &Command ); + static void OnCommand_linebreakeropenremote( TTrain *Train, command_data const &Command ); + static void OnCommand_linebreakercloseremote( TTrain *Train, command_data const &Command ); static void OnCommand_fuelpumptoggle( TTrain *Train, command_data const &Command ); static void OnCommand_fuelpumpenable( TTrain *Train, command_data const &Command ); static void OnCommand_fuelpumpdisable( TTrain *Train, command_data const &Command ); @@ -570,6 +578,15 @@ public: // reszta może by?publiczna TGauge ggMainOffButton; TGauge ggMainOnButton; TGauge ggMainButton; // EZT + // the line breaker / engine start switches of the second and the third vehicle in multiple (mainb_*, mainc_*) + struct remote_linebreaker { + TGauge main_switch; // mainb_sw: + TGauge on_button; // mainb_on_bt: + TGauge off_button; // mainb_off_bt: + bool held_without_switch{ false }; // closed by a command, in a cab without a switch for it + engine_start::remote_switch state; + }; + std::array m_remotelinebreakers; TGauge ggSecurityResetButton; TGauge ggSHPResetButton; TGauge ggReleaserButton; diff --git a/vehicle/enginestart.cpp b/vehicle/enginestart.cpp new file mode 100644 index 000000000..4b6da2e06 --- /dev/null +++ b/vehicle/enginestart.cpp @@ -0,0 +1,107 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "vehicle/enginestart.h" + +#include "McZapkie/MOVER.h" +#include "utilities/utilities.h" + +namespace engine_start { + +namespace { + +// whether the vehicle has an engine the cab can start, the same test the tachometers of the vehicles in multiple make +bool has_engine(TMoverParameters const &Vehicle) { + return Vehicle.Power > 0.01; +} + +// walks from Start through its coupler Side along the control cable, and returns the Number-th vehicle with an engine +// other than Skipped it meets; Number is lowered by the ones it met when it doesn't get that far +TMoverParameters *find_along(TMoverParameters const &Start, int Side, TMoverParameters const &Skipped, int &Number) { + auto const *vehicle{&Start}; + // a train can't loop back on itself, the limit only guards against a broken chain of couplers + for (auto steps = 0; steps < 1000; ++steps) { + auto const &coupler{vehicle->Couplers[Side]}; + if (coupler.Connected == nullptr || false == TestFlag(coupler.CouplingFlag, coupling::control)) { + return nullptr; + } + // onwards through the other end of the next vehicle, whichever way round it stands + Side = 1 - coupler.ConnectedNr; + vehicle = coupler.Connected; + if (vehicle == &Skipped || false == has_engine(*vehicle)) { + continue; + } + if (--Number == 0) { + return coupler.Connected; + } + } + return nullptr; +} + +} // namespace + +TMoverParameters *engine(TMoverParameters const &Occupied, TMoverParameters &Controlled, int Number) { + if (Number < 1) { + return nullptr; + } + if (Number == 1) { + return &Controlled; + } + // the cab's own vehicle is the first one + auto others{Number - 1}; + // behind the cab is the rear end of a vehicle driven from its front cab, and the other way round + int const behind{Occupied.CabOccupied < 0 ? end::front : end::rear}; + if (auto *found{find_along(Occupied, behind, Controlled, others)}; found != nullptr) { + return found; + } + return find_along(Occupied, 1 - behind, Controlled, others); +} + +void remote_switch::update(TMoverParameters *Engine, bool const Closeheld, bool const Openheld, double const Deltatime, bool const Closesonrelease) { + if (Engine != m_engine) { + // another vehicle under the switch, after a change in the train + m_engine = Engine; + m_heldtime = 0.0; + m_ready = false; + } + if (Engine == nullptr) { + return; + } + if (Openheld || is_running(*Engine)) { + // the switch opening the circuit is held down, or there's nothing left to start + m_heldtime = 0.0; + m_ready = false; + return; + } + if (Closeheld && Engine->MainSwitchCheck()) { + m_heldtime += Deltatime; + } + if (m_heldtime > Engine->InitialCtrlDelay) { + m_ready = true; + } + if (m_ready && false == (Closesonrelease && Closeheld)) { + Engine->MainSwitch(true, range_t::local); + m_ready = false; + m_heldtime = 0.0; + } + if (false == Closeheld) { + m_heldtime = 0.0; + } +} + +bool remote_switch::open(TMoverParameters &Engine) { + return Engine.MainSwitch(false, range_t::local); +} + +bool remote_switch::is_running(TMoverParameters const &Engine) { + return Engine.Mains || Engine.dizel_startup; +} + +} // namespace engine_start diff --git a/vehicle/enginestart.h b/vehicle/enginestart.h new file mode 100644 index 000000000..beedab106 --- /dev/null +++ b/vehicle/enginestart.h @@ -0,0 +1,45 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +class TMoverParameters; + +// starting the engines (closing the line breakers) of the vehicles in multiple from the cab (eu07/maszyna#80). in +// vehicles like the ST43, the SP32 or the SN61 every engine of the train has its own switches in the cab: main_* work +// the cab's own vehicle, mainb_* the second one and mainc_* the third one under its control. Engine:JointEngineStart=No +// in the .fiz of the cab's vehicle keeps main_* to that vehicle alone (TMoverParameters::MainSwitchRange()); by +// default it works all of them, as before. +namespace engine_start { + +// the Number-th vehicle with an engine under the cab's control: 1 is Controlled, the cab's own; then the others +// connected through the control cable, those behind the cab of Occupied first, the nearest first, then those in front +// of it. nullptr when there are fewer of them +TMoverParameters *engine(TMoverParameters const &Occupied, TMoverParameters &Controlled, int Number); + +// the switch starting the engine of another vehicle in multiple. like the cab's own switch, it has to be held closed +// for the vehicle's InitialCtrlDelay, with the vehicle ready for it, before the engine starts (the line breaker closes) +class remote_switch { +public: + // one step of Deltatime seconds of the switch of Engine, with the switch held closed (Closeheld) or open (Openheld). + // with Closesonrelease, the line breaker closes when the switch is let go after the delay, as the impulse switch + // of an electric locomotive with series motors does + void update(TMoverParameters *Engine, bool Closeheld, bool Openheld, double Deltatime, bool Closesonrelease); + // opens the line breaker / stops the engine of Engine, the vehicle alone; returns whether it was running + static bool open(TMoverParameters &Engine); + // whether the line breaker of Engine is closed or its engine starting or running + static bool is_running(TMoverParameters const &Engine); + +private: + TMoverParameters const *m_engine{nullptr}; // the vehicle the switch worked the last step + double m_heldtime{0.0}; // how long the switch is held closed with the vehicle ready to start + bool m_ready{false}; // held long enough, the line breaker closes now or when the switch is let go +}; + +} // namespace engine_start diff --git a/vr/openvr_imp.cpp b/vr/openvr_imp.cpp index 15467d006..02044d6e5 100644 --- a/vr/openvr_imp.cpp +++ b/vr/openvr_imp.cpp @@ -495,6 +495,18 @@ std::unordered_map vr_openvr::m_buttonb { "main_on_bt:",{ user_command::linebreakerclose, user_command::none } }, + { "mainb_off_bt:", { + user_command::linebreakeropenb, + user_command::none } }, + { "mainb_on_bt:", { + user_command::linebreakercloseb, + user_command::none } }, + { "mainc_off_bt:", { + user_command::linebreakeropenc, + user_command::none } }, + { "mainc_on_bt:", { + user_command::linebreakerclosec, + user_command::none } }, { "security_reset_bt:", { user_command::alerteracknowledge, user_command::none } }, @@ -660,6 +672,12 @@ std::unordered_map vr_openvr::m_buttonb { "main_sw:", { user_command::linebreakertoggle, user_command::none } }, + { "mainb_sw:", { + user_command::linebreakertoggleb, + user_command::none } }, + { "mainc_sw:", { + user_command::linebreakertogglec, + user_command::none } }, { "radio_sw:", { user_command::radiotoggle, user_command::none } }, From 46e0628fbe441d6882c7c98ea2e31f8b6c99ac07 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 07:24:39 +0100 Subject: [PATCH 323/430] refactor: keep the coupler side walked along in a local in engine_start::engine() --- vehicle/enginestart.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/vehicle/enginestart.cpp b/vehicle/enginestart.cpp index 4b6da2e06..feb4445ce 100644 --- a/vehicle/enginestart.cpp +++ b/vehicle/enginestart.cpp @@ -24,21 +24,23 @@ bool has_engine(TMoverParameters const &Vehicle) { // walks from Start through its coupler Side along the control cable, and returns the Number-th vehicle with an engine // other than Skipped it meets; Number is lowered by the ones it met when it doesn't get that far -TMoverParameters *find_along(TMoverParameters const &Start, int Side, TMoverParameters const &Skipped, int &Number) { +TMoverParameters *find_along(TMoverParameters const &Start, int const Side, TMoverParameters const &Skipped, int &Number) { auto const *vehicle{&Start}; + auto side{Side}; // a train can't loop back on itself, the limit only guards against a broken chain of couplers for (auto steps = 0; steps < 1000; ++steps) { - auto const &coupler{vehicle->Couplers[Side]}; + auto const &coupler{vehicle->Couplers[side]}; if (coupler.Connected == nullptr || false == TestFlag(coupler.CouplingFlag, coupling::control)) { return nullptr; } // onwards through the other end of the next vehicle, whichever way round it stands - Side = 1 - coupler.ConnectedNr; + side = 1 - coupler.ConnectedNr; vehicle = coupler.Connected; if (vehicle == &Skipped || false == has_engine(*vehicle)) { continue; } - if (--Number == 0) { + --Number; + if (Number == 0) { return coupler.Connected; } } From 547706b54d769865bc9fb8239cdbdbe64f292dc8 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 09:35:59 +0100 Subject: [PATCH 324/430] refactor(simulation): fix the Sonar remarks on the test mode code - TController::TableCheck() calls TSpeedPos::Update() as it did before the test mode: the check for a signal passed at danger is a call of its own after it (CheckSignalPassedAtDanger), so the update lines nest no deeper than on master (S134). A switch is a track, so a signal's update never takes the switch-change branch and the check runs in the same place as before; the physicslogs of all 15 scenario cases are byte for byte the same. - null_imgui_renderer is final (S1235), to_string(test_result) uses `using enum` (S6177), init_result_cell() is const (S5817), ConfigParseTest() takes a std::string_view (S6009) and the test settings struct is declared apart from its member (S3646). --- rendering/nullrenderer.h | 2 +- simulation/simulationtest.cpp | 15 ++++++++------- simulation/simulationtest.h | 2 +- utilities/Globals.cpp | 12 ++++++------ utilities/Globals.h | 5 +++-- vehicle/Driver.cpp | 18 ++++++++++-------- vehicle/Driver.h | 4 ++-- 7 files changed, 31 insertions(+), 27 deletions(-) diff --git a/rendering/nullrenderer.h b/rendering/nullrenderer.h index 2a7ef0398..7ecb57bf8 100644 --- a/rendering/nullrenderer.h +++ b/rendering/nullrenderer.h @@ -36,7 +36,7 @@ private: }; // user interface backend which draws nothing: imgui still builds its frames, so the ui code runs as usual -class null_imgui_renderer : public imgui_renderer { +class null_imgui_renderer final : public imgui_renderer { public: bool Init() override { return true; } void Shutdown() override { /* null implementation, nothing to do */ } diff --git a/simulation/simulationtest.cpp b/simulation/simulationtest.cpp index 8d57505ff..45aa513f8 100644 --- a/simulation/simulationtest.cpp +++ b/simulation/simulationtest.cpp @@ -45,19 +45,20 @@ test_manager &test() std::string_view to_string(test_result const Result) { + using enum test_result; switch (Result) { - case test_result::pass: return "pass"; - case test_result::fail: return "fail"; - case test_result::signal_passed_at_danger: return "signal passed at danger"; - case test_result::timeout: return "timeout"; - case test_result::standstill: return "standstill"; - case test_result::error: return "error"; + case pass: return "pass"; + case fail: return "fail"; + case signal_passed_at_danger: return "signal passed at danger"; + case timeout: return "timeout"; + case standstill: return "standstill"; + case error: return "error"; } return "unknown"; } -void test_manager::init_result_cell() +void test_manager::init_result_cell() const { auto cell { std::make_unique(scene::node_data{0, -1, std::string(result_cell), "memcell"}) }; // neither of the reported values, so that a cell nobody wrote to says nothing diff --git a/simulation/simulationtest.h b/simulation/simulationtest.h index f47f408b7..a58e9ae2f 100644 --- a/simulation/simulationtest.h +++ b/simulation/simulationtest.h @@ -39,7 +39,7 @@ public: static constexpr double frame_step { 0.03 }; // creates the result cell; called with the other scripting interface cells, before the scenery is read - void init_result_cell(); + void init_result_cell() const; // the simulation is ready: start the clocks void start(); // checks the end conditions after a simulation frame of Deltatime seconds diff --git a/utilities/Globals.cpp b/utilities/Globals.cpp index 2516da29e..3a9e10145 100644 --- a/utilities/Globals.cpp +++ b/utilities/Globals.cpp @@ -456,10 +456,10 @@ bool global_settings::ConfigParseInput(cParser& Parser, const std::string& token return false; } -bool global_settings::ConfigParseTest(cParser& Parser, const std::string& token) +bool global_settings::ConfigParseTest(cParser& Parser, std::string_view const Token) { // integration test limits, usually given in the config block of a test scenery - if (token == "test.timeout") + if (Token == "test.timeout") { double value{ test.timeout }; ParseOne(Parser, value); @@ -468,26 +468,26 @@ bool global_settings::ConfigParseTest(cParser& Parser, const std::string& token) return true; } - if (token == "test.standstill") + if (Token == "test.standstill") { ParseOne(Parser, test.standstill); test.standstill = std::max(0.0, test.standstill); return true; } - if (token == "test.pass_on_standstill") + if (Token == "test.pass_on_standstill") { ParseOne(Parser, test.pass_on_standstill); return true; } - if (token == "test.fail_if_stop_overran") + if (Token == "test.fail_if_stop_overran") { ParseOne(Parser, test.fail_if_stop_overran); return true; } - if (token == "test.no_movement_before_pass") + if (Token == "test.no_movement_before_pass") { ParseOne(Parser, test.no_movement_before_pass); return true; diff --git a/utilities/Globals.h b/utilities/Globals.h index a6a9e1226..11d14e34f 100644 --- a/utilities/Globals.h +++ b/utilities/Globals.h @@ -95,7 +95,8 @@ struct global_settings { bool fail_if_stop_overran{ true }; // a train passing a signal at stop ends the test as failed; with false it's only logged bool no_movement_before_pass{ true }; // a pass waits until every vehicle stands still; with false it ends the test at once bool timeout_from_command_line{ false }; // --test-timeout given, the scenery doesn't override it - } test; + }; + test_settings test; bool editor_tracks{ false }; // F3 track workspace: draw and pick tracks without the scenery draw-range cap int iConvertModels{ 0 }; // tworzenie plików binarnych int iConvertIndexRange{ 1000 }; // range of duplicate vertex scan @@ -387,7 +388,7 @@ struct global_settings { bool ConfigParseNetwork(cParser& Parser, const std::string& token); bool ConfigParseHardware(cParser& Parser, const std::string& token); bool ConfigParseDebug(cParser& Parser, const std::string& token); - bool ConfigParseTest(cParser& Parser, const std::string& token); + bool ConfigParseTest(cParser& Parser, std::string_view Token); bool ConfigParse_gfx( cParser &parser, std::string_view const Token ); // sends basic content of the class in legacy (text) format to provided stream void diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index c0614923c..fe09fb240 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -768,7 +768,8 @@ void TController::TableCheck(double fDistance) { // aktualizacja rekordów z wyjątkiem ostatniego if (sSpeedTable[i].iFlags & spEnabled) // jeśli pozycja istotna { - if (UpdateSpeedPosition(sSpeedTable[i])) + auto const passedbefore { TestFlag( sSpeedTable[ i ].iFlags, spElapsed ) }; + if (sSpeedTable[i].Update()) { if( Global.iWriteLogEnabled & 8 ) { WriteLog( "Speed table for " + OwnerName() + " detected switch change at " + sSpeedTable[ i ].trTrack->name() + " (generating fresh trace)" ); @@ -794,6 +795,8 @@ void TController::TableCheck(double fDistance) // nie kontynuujemy pętli, trzeba doskanować ciąg dalszy break; } + // a switch is a track, the update of a signal never ends the loop above + CheckSignalPassedAtDanger( sSpeedTable[ i ], passedbefore ); if (sSpeedTable[i].iFlags & spTrack) // jeśli odcinek { if( sSpeedTable[ i ].fDist + sSpeedTable[ i ].trTrack->Length() < -fLength ) // a skład wyjechał całą długością poza @@ -817,8 +820,10 @@ void TController::TableCheck(double fDistance) } } } - // aktualizacja ostatniego; a signal at stop often is the last, the scan doesn't go past it - UpdateSpeedPosition(sSpeedTable[iLast]); + auto const lastpassedbefore { TestFlag( sSpeedTable[ iLast ].iFlags, spElapsed ) }; + sSpeedTable[iLast].Update(); // aktualizacja ostatniego + // a signal at stop often is the last, the scan doesn't go past it + CheckSignalPassedAtDanger( sSpeedTable[ iLast ], lastpassedbefore ); // WriteLog("TableCheck: Upate last track. Dist=" + AnsiString(sSpeedTable[iLast].fDist)); if( sSpeedTable[ iLast ].fDist < fDistance ) { TableTraceRoute( fDistance, pVehicles[ end::rear ] ); // doskanowanie dalszego odcinka @@ -843,17 +848,14 @@ bool is_signal_at_stop( TSpeedPos const &Point ) } // namespace -bool TController::UpdateSpeedPosition( TSpeedPos &Point ) const +void TController::CheckSignalPassedAtDanger( TSpeedPos const &Point, bool const Passedbefore ) const { - auto const passedbefore { TestFlag( Point.iFlags, spElapsed ) }; - auto const switchchanged { Point.Update() }; - if( false == passedbefore + if( false == Passedbefore && TestFlag( Point.iFlags, spElapsed ) && is_signal_at_stop( Point ) && ( mvOccupied->CategoryFlag & 1 ) != 0 ) { // railway only simulation::test().signal_passed_at_danger( OwnerName(), Point.evEvent->m_name ); } - return switchchanged; } auto const passengerstopmaxdistance { 400.0 }; // maximum allowed distance between passenger stop point and consist head diff --git a/vehicle/Driver.h b/vehicle/Driver.h index 8f2015f2f..dfa63c088 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -519,9 +519,9 @@ private: bool TableNotFound( basic_event const *Event, double const Distance ) const; void TableTraceRoute( double fDistance, TDynamicObject *pVehicle ); void TableCheck( double fDistance ); - // updates a position of the speed table, returns true when a switch on it changed (TSpeedPos::Update). + // called after TSpeedPos::Update() of a position of the speed table, with its spElapsed flag from before it: // reports the head of the train going past it, if it's a signal showing stop - bool UpdateSpeedPosition( TSpeedPos &Point ) const; + void CheckSignalPassedAtDanger( TSpeedPos const &Point, bool Passedbefore ) const; TCommandType TableUpdate( double &fVelDes, double &fDist, double &fNext, double &fAcc ); bool TableUpdateStopPoint( TCommandType &Command, TSpeedPos &Point, double const Signaldistance ); bool TableUpdateEvent( double &Velocity, TCommandType &Command, TSpeedPos &Point, double &Signaldistance, int const Pointindex ); From 4356e7c3fd8beb83c9c22e0ae55b0ac34df7705e Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 09:36:28 +0100 Subject: [PATCH 325/430] fix(simulation): a test run that can't start ends with the error code and says why - `--test` is looked for before the rest of the command line is read. An unknown option before it (e.g. `-s x.scn --test-timout 90 --test`) used to end the run with exit code 0, which a caller reads as a pass. - `--test-timeout` without a value, or with one that isn't a number of seconds, fails the run instead of leaving the default or, through atof, turning the timeout off. - These, a missing -s, a failed start and an exception caught in main() end the test through test_manager::conclude(), which writes the usual `test: error (exit code 5) ... : ` line to stdout and the log. Before, `eu07 --test` alone exited with 5 and nothing anywhere: the error went to the log queue and the process ended before the log thread wrote it. In test mode main() now stops the log thread and waits for it before _Exit(). Outside the test mode nothing changes: conclude() does nothing there. --- EU07.cpp | 21 +++++++++++++++++++++ application/application.cpp | 34 ++++++++++++++++++++++++++++++---- simulation/simulationtest.cpp | 11 ++++++++--- simulation/simulationtest.h | 5 ++++- 4 files changed, 63 insertions(+), 8 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index ec3e972e7..790f6ffb9 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -84,6 +84,20 @@ LONG WINAPI CrashHandler(EXCEPTION_POINTERS *ExceptionInfo) #endif +namespace +{ + +// the log is written by a thread of its own, which the closing of the application stops and waits for. on the ways +// out that skip the closing (a failed start, an exception) what was logged last would be lost with the process +void finish_log() +{ + StopLogService(); + if (auto const logservice{Global.threads.find("LogService")}; logservice != Global.threads.end() && logservice->second.joinable()) + logservice->second.join(); +} + +} // namespace + int main(int argc, char *argv[]) { #ifdef WITHDUMPGEN @@ -153,6 +167,7 @@ int main(int argc, char *argv[]) { ErrorLog(std::format("Critical error: {}", Error.what())); // in test mode nobody is there to close the box, the exit code tells of the error + simulation::test().conclude(simulation::test_result::error, std::format("critical error: {}", Error.what())); if (false == Global.test.enabled) { std::string msg = "Simulator crash occured :(\n"; @@ -166,6 +181,12 @@ int main(int argc, char *argv[]) fflush(stdout); fflush(stderr); #endif + if (Global.test.enabled) + { + // a run that stopped before its test ended (a failed start, an exception) says so like any other end + simulation::test().conclude(simulation::test_result::error, "the simulator stopped before the test ended"); + finish_log(); + } // skip destructors, there are ordering errors which causes segfaults // a test run (--test) says its result in the exit code std::_Exit(Global.test.enabled ? simulation::test().exit_code() : 0); diff --git a/application/application.cpp b/application/application.cpp index eaf60c7cd..f8e20bed4 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -30,8 +30,15 @@ http://mozilla.org/MPL/2.0/. #include "utilities/Timer.h" #include "utilities/dictionary.h" #include "version_info.h" +#include "simulation/simulationtest.h" +#include +#include #include +#include #include +#include +#include +#include #include "utilities/translation.h" #if WITH_DISCORD_RPC @@ -1174,6 +1181,16 @@ void apply_test_mode_settings() Global.random_seed = seed_of("test"); } +// seconds given on the command line: a number, not negative. returns nothing for anything else +std::optional parse_seconds(std::string_view const Text) +{ + auto const *const last{Text.data() + Text.size()}; + double value{0.0}; + if (auto const [parsed, status]{std::from_chars(Text.data(), last, value)}; status != std::errc{} || parsed != last || false == std::isfinite(value) || value < 0.0) + return std::nullopt; + return value; +} + } // namespace int eu07_application::init_settings(int Argc, char *Argv[]) @@ -1191,6 +1208,10 @@ int eu07_application::init_settings(int Argc, char *Argv[]) Global.LoadIniFile("eu07.ini"); } + // a test run is known before the rest of the command line is read, so a command line it can't take + // ends with the error code of the test, not with 0, which would pass it + Global.test.enabled = std::ranges::any_of(std::span(Argv, static_cast(Argc)), [](char const *Argument) { return std::string_view(Argument) == "--test"; }); + // process command line arguments bool sceneryfromcommandline{false}; bool editwithoutscenery{false}; @@ -1244,11 +1265,15 @@ int eu07_application::init_settings(int Argc, char *Argv[]) } else if (token == "--test-timeout") { - if (i + 1 < Argc) + auto const timeout{i + 1 < Argc ? parse_seconds(Argv[++i]) : std::nullopt}; + if (false == timeout.has_value()) { - Global.test.timeout = std::max(0.0, std::atof(Argv[++i])); - Global.test.timeout_from_command_line = true; + // a typo would otherwise turn the timeout off + simulation::test().conclude(simulation::test_result::error, "--test-timeout needs a number of seconds"); + return -1; } + Global.test.timeout = *timeout; + Global.test.timeout_from_command_line = true; } else if (token == "-ini") { @@ -1267,6 +1292,7 @@ int eu07_application::init_settings(int Argc, char *Argv[]) << " [-seed number|word]" << " [-ini settingsfile]" << " [--test [--test-timeout seconds]]" << std::endl; + simulation::test().conclude(simulation::test_result::error, std::format("unknown command line argument {}", token)); return -1; } } @@ -1277,7 +1303,7 @@ int eu07_application::init_settings(int Argc, char *Argv[]) { if (false == sceneryfromcommandline || Global.SceneryFile.empty()) { - ErrorLog("test: --test needs a scenery given with -s"); + simulation::test().conclude(simulation::test_result::error, "--test needs a scenery given with -s"); return -1; } apply_test_mode_settings(); diff --git a/simulation/simulationtest.cpp b/simulation/simulationtest.cpp index 45aa513f8..214d7e463 100644 --- a/simulation/simulationtest.cpp +++ b/simulation/simulationtest.cpp @@ -156,9 +156,15 @@ void test_manager::signal_passed_at_danger(std::string_view const Vehicle, std:: } void test_manager::finish(test_result const Result, std::string_view const Reason) +{ + if (conclude(Result, Reason)) + Application.queue_quit(true); +} + +bool test_manager::conclude(test_result const Result, std::string_view const Reason) { if (m_finished || false == Global.test.enabled) - return; + return false; m_finished = true; m_result = Result; @@ -170,8 +176,7 @@ void test_manager::finish(test_result const Result, std::string_view const Reaso // the process has no console of its own; whoever started it with a redirected output gets the verdict there too std::fprintf(stdout, "%s\n", line.c_str()); std::fflush(stdout); - - Application.queue_quit(true); + return true; } } // namespace simulation diff --git a/simulation/simulationtest.h b/simulation/simulationtest.h index a58e9ae2f..2b5012e9f 100644 --- a/simulation/simulationtest.h +++ b/simulation/simulationtest.h @@ -46,8 +46,11 @@ public: void update(double Deltatime); // reported by a driver whose train went past a signal showing stop void signal_passed_at_danger(std::string_view Vehicle, std::string_view Signal); - // ends the test with given result; the first call wins + // ends the test with given result and closes the application; the first call wins void finish(test_result Result, std::string_view Reason); + // ends the test with given result, without closing the application: for the ways out that close it anyway + // (a bad command line, a failed start, an exception). returns false if the test had already ended + bool conclude(test_result Result, std::string_view Reason); bool finished() const { return m_finished; } // exit code of the process: the result, or error while the test hasn't finished From ced4e06b35b7945789460efed5af22c205fa0b98 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 09:36:35 +0100 Subject: [PATCH 326/430] fix(simulation): no crash message box in test mode The crash handler of WITHDUMPGEN builds (on by default) shows a message box before it writes the dump. It also gets the C++ exceptions nothing catches, since it replaces the CRT's unhandled exception filter. In test mode nobody is there to close the box, so a crashing test waited for it until whatever started it gave up (run.py after the case's timeout, 600 s by default). The dump is still written, the exit code is the exception's. --- EU07.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/EU07.cpp b/EU07.cpp index 790f6ffb9..0fbabba5b 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -73,7 +73,9 @@ LONG WINAPI CrashHandler(EXCEPTION_POINTERS *ExceptionInfo) MINIDUMP_TYPE dumpType = MINIDUMP_TYPE(MiniDumpWithFullMemory | MiniDumpWithHandleData | MiniDumpWithThreadInfo | MiniDumpWithUnloadedModules | MiniDumpWithIndirectlyReferencedMemory | MiniDumpWithFullMemoryInfo | MiniDumpWithTokenInformation); - MessageBoxA(nullptr, "Simulator crash occured :(\n", "Simulator crashed :(", MB_ICONERROR); + // in test mode nobody is there to close the box, and the run would wait for it until killed + if (false == Global.test.enabled) + MessageBoxA(nullptr, "Simulator crash occured :(\n", "Simulator crashed :(", MB_ICONERROR); MiniDumpWriteDump(GetCurrentProcess(), GetCurrentProcessId(), hFile, dumpType, &dumpInfo, nullptr, nullptr); CloseHandle(hFile); From 93e2b85d08cca5d4d374a3965c747292d59656d9 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 09:36:51 +0100 Subject: [PATCH 327/430] fix(simulation): the test mode gives nothing to the outside and leaves the player's files alone The test mode turned off what comes in from outside, but a few settings of the user's eu07.ini still reached out of a test run: - feedbackmode: 1 and 2 toggle Caps Lock / Scroll Lock by injecting key events into the whole system, 3 and 4 drive an LPT port or a PoKeys desk (and 4 reads the desk's switches); - multiplayer: events are reported to a multiplayer server, and some events are held back for it; - execonexit: a program is run with system() at the end of each run, which also waits for it; - showsystemconsole: a console of the run's own pops up and stdout is reopened on it, so whoever started the test with a redirected output doesn't get the `test:` line (and a console the run was started from would be hidden without it); - imgui.ini in the game folder was written by every run, and by several at once with run.py -j. All of these are off in test mode. Nothing changes outside it. --- application/application.cpp | 18 ++++++++++++++++++ application/uilayer.cpp | 5 +++++ 2 files changed, 23 insertions(+) diff --git a/application/application.cpp b/application/application.cpp index f8e20bed4..d4aed9d8a 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -31,6 +31,9 @@ http://mozilla.org/MPL/2.0/. #include "utilities/dictionary.h" #include "version_info.h" #include "simulation/simulationtest.h" +#ifdef _WIN32 +#include "Console.h" +#endif #include #include #include @@ -1048,6 +1051,13 @@ void eu07_application::init_debug() void eu07_application::init_console() { #ifdef _WIN32 + if (Global.test.enabled) + { + // a test is started by whoever waits for its result, often reading its output: no console of its own + // (showsystemconsole) pops up and takes stdout away from them, and a console it was started from isn't hidden + return; + } + HWND consoleWnd = ::GetConsoleWindow(); const bool hadConsole = consoleWnd != nullptr; @@ -1176,6 +1186,14 @@ void apply_test_mode_settings() #ifdef WITH_ZMQ Global.zmq_address.clear(); #endif + // nor anything to the outside: no keyboard leds, LPT or PoKeys desk (feedbackmode), no messages to a + // multiplayer server (multiplayer, which also holds some events back for it), no program run at the end + Global.iFeedbackMode = 0; +#ifdef _WIN32 + Console::ModeSet(Global.iFeedbackMode, Global.iFeedbackPort); +#endif + Global.iMultiplayer = 0; + Global.exec_on_exit.clear(); // and the same way every time, unless given another seed (-seed, or randomseed in the settings) if (!Global.random_seed) Global.random_seed = seed_of("test"); diff --git a/application/uilayer.cpp b/application/uilayer.cpp index 5443d158c..855bfbadc 100644 --- a/application/uilayer.cpp +++ b/application/uilayer.cpp @@ -288,6 +288,11 @@ bool ui_layer::init(GLFWwindow *Window) IMGUI_CHECKVERSION(); ImGui::CreateContext(); m_imguiio = &ImGui::GetIO(); + if (Global.test.enabled) + { + // a test leaves the player's window layout alone (imgui.ini in the game folder), runs in parallel included + m_imguiio->IniFilename = nullptr; + } ImGui::GetCurrentContext()->ConfigNavWindowingKeyNext = ImGuiKey_None; ImGui::GetCurrentContext()->ConfigNavWindowingKeyPrev = ImGuiKey_None; // imgui.ini is read with the first frame, which may be of another mode than the editor From 1b373bcc385e800e3a6717fc37f1fbda75f5de7c Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 09:36:56 +0100 Subject: [PATCH 328/430] docs(test): the test mode README on the new ends, outside settings and Windows shells - what the test mode turns off towards the outside (feedbackmode, multiplayer, execonexit, showsystemconsole, imgui.ini), - a command line it can't take or a failed start ends with `error`, - cmd and PowerShell don't wait for the (windowed) simulator nor show its output: start /wait, Start-Process -Wait, - 15 cases, not 14. --- tests/scenarios/README.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tests/scenarios/README.md b/tests/scenarios/README.md index b57fc4a05..1d63ebefe 100644 --- a/tests/scenarios/README.md +++ b/tests/scenarios/README.md @@ -26,12 +26,21 @@ With `--test` the simulator: - takes no input from outside: keys and mouse sent to its window, gamepad, UART (a cab desk), ZeroMQ and commands sent by other programs (`WM_COPYDATA`) are all ignored, and motion telemetry is off, +- gives nothing to the outside either: no keyboard leds, LPT or PoKeys (`feedbackmode`), no + messages to a multiplayer server (`multiplayer`), no program run at the end (`execonexit`), + no console window of its own (`showsystemconsole`), and the game's `imgui.ini` stays as it is, - runs the simulation as fast as it can in fixed steps of 0.03 s of simulation time per frame (three 10 ms physics steps), whatever the real time, the time speed or the machine, - seeds its random numbers with a fixed seed unless `-seed` or `randomseed` gives one, so two runs of a scenery come out the same (the physicslogs of two runs are byte for byte equal), - quits when the test ends, and says how it ended in the exit code and in a `test: ...` - line on stdout and in the log. + line on stdout and in the log. A command line it can't take, or a start that fails, ends + the same way with the `error` code. + +On Windows the simulator is a windowed program, so `cmd` and PowerShell don't wait for it nor +show its output by themselves: run it with `start /wait eu07 --test ... > result.txt` and read +`%errorlevel%` in `cmd`, or `(Start-Process eu07 '--test ...' -Wait -PassThru -RedirectStandardOutput result.txt).ExitCode` +in PowerShell. Scripts (Python's `subprocess`, bash) wait for it as for any other program. A scenery reports its result to the memory cell `__test.result`, which the simulator creates (in every run, so a test scenery loads normally too). Write value 1 to it for a pass and 0 @@ -101,7 +110,7 @@ Python 3.10+, no extra packages. Options: `cmake-build-*/bin/Release/eu07*.exe`. The build needs the `--test` and `-ini` command line options. - name one or more cases to run only those, e.g. `run.py ... eu07_td_timetable`. -- `-j N` runs N cases at once. Each case prints its results when it is done. All 14 cases +- `-j N` runs N cases at once. Each case prints its results when it is done. All 15 cases take about 30 s with `-j 4`, loading included. - `--watch` runs a case the old way, in a visible window in real time (or faster with `--timespeed N`), closed after the case's `duration`; the exit code isn't checked then. For From b2331ad2d185a2b4e52529b1900e90eeeecf4be7 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 09:37:32 +0100 Subject: [PATCH 329/430] docs(test): what waits for a test run in cmd, checked start /wait gives the exit code but not the output; a .bat file waits for the windowed simulator and passes its output on. --- tests/scenarios/README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/scenarios/README.md b/tests/scenarios/README.md index 1d63ebefe..8ad7e7470 100644 --- a/tests/scenarios/README.md +++ b/tests/scenarios/README.md @@ -37,10 +37,11 @@ With `--test` the simulator: line on stdout and in the log. A command line it can't take, or a start that fails, ends the same way with the `error` code. -On Windows the simulator is a windowed program, so `cmd` and PowerShell don't wait for it nor -show its output by themselves: run it with `start /wait eu07 --test ... > result.txt` and read -`%errorlevel%` in `cmd`, or `(Start-Process eu07 '--test ...' -Wait -PassThru -RedirectStandardOutput result.txt).ExitCode` -in PowerShell. Scripts (Python's `subprocess`, bash) wait for it as for any other program. +On Windows the simulator is a windowed program, which the `cmd` prompt and PowerShell don't wait +for. In a `.bat` file `eu07 --test ... > result.txt` waits and sets `%errorlevel%`; at the prompt +`start /wait eu07 --test ...` waits too but doesn't pass the output on. In PowerShell use +`(Start-Process eu07 '--test ...' -Wait -PassThru -RedirectStandardOutput result.txt).ExitCode`. +Scripts (Python's `subprocess`, bash) wait for it as for any other program. A scenery reports its result to the memory cell `__test.result`, which the simulator creates (in every run, so a test scenery loads normally too). Write value 1 to it for a pass and 0 From 62526e9d6a1b87fcb0f67cb36ba674a91da94f9c Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 11:16:33 +0100 Subject: [PATCH 330/430] test(scenarios): the timetable cases check where the train stops, not how long Przystanek on td.scn is a technical stop of the td/rozklad timetable (pt): the AI doesn't wait there for the departure time but sets off as soon as it counts the train as standing at the W4, below 1 km/h. How long the speed then stays under 0.5 km/h is only how fast the brake releases. With the AI braking of #264 the trains creep up to the W4 at about 10 km/h on a light application and stood there for 1-5 s; the SN61 turns back at 0.36 km/h without stopping. The hold of 5 s (2 s for the SN61) failed for EP09, SN61 and Vectron and had well under a second to spare for others. The cases now check that the train comes down to 1 km/h, the AI's own standstill at a W4, 1380-1420 m from the start; every vehicle stops at 1397-1401 m, before and after #264. `stops` takes min_distance and max_distance for that. --- tests/scenarios/README.md | 14 ++++++++++---- tests/scenarios/cases/en57_td_timetable.json | 2 +- tests/scenarios/cases/ep09_td_timetable.json | 2 +- tests/scenarios/cases/et22_td_timetable.json | 2 +- tests/scenarios/cases/eu07_td_timetable.json | 2 +- tests/scenarios/cases/sm42_td_timetable.json | 2 +- tests/scenarios/cases/sn61_td_timetable.json | 2 +- tests/scenarios/cases/vectron_td_timetable.json | 2 +- tests/scenarios/run.py | 8 ++++++-- 9 files changed, 23 insertions(+), 13 deletions(-) diff --git a/tests/scenarios/README.md b/tests/scenarios/README.md index 8ad7e7470..8bd6f1a4a 100644 --- a/tests/scenarios/README.md +++ b/tests/scenarios/README.md @@ -168,7 +168,12 @@ scenery is newer. the one whose physicslog is checked. Other vehicles of the consist take names made from it, e.g. `{{vehicle}}_s`. The td.scn cases share two fragments, `td_timetable.scn` (route set, train runs to Przystanek) and `td_red_signal.scn` (no route, exit signal at stop), and differ -only in `vars.consist`. `td_red_signal_moving.scn` is the red signal one with the train +only in `vars.consist`. Przystanek is a technical stop in that timetable (`pt`), where the AI +doesn't wait for the departure time: it sets off as soon as it counts the train as standing at +the W4, which is below 1 km/h, so the train stands there for a few seconds at most, or doesn't +quite stop (since the AI braking of #264 the SN61 turns back at 0.4 km/h). The +timetable cases therefore check that the train comes down to 1 km/h, with no hold, 1380-1420 m +from the start (every vehicle stops at 1397-1401 m). `td_red_signal_moving.scn` is the red signal one with the train starting at `vars.velocity` km/h; with `track_friction` 0.03 it locks the wheels when braking and slides past the signal, so those cases set `test.fail_if_stop_overran no`. `td_red_signal_pass.scn` adds the `test_pass` event, which `test_mode_pass` puts as `event0` @@ -189,13 +194,14 @@ the row instead, logged by builds from this branch on. - `max_speed` `limit`, `tolerance`: never goes faster than `limit + tolerance`. - `brakes` `min_pressure`: after moving off, brake cylinder pressure reaches `min_pressure` bar (physicslog pressures are in bar whatever its header says; the brake pipe runs at 5.0). -- `stops` `moving_speed`, `stop_speed`, `hold`: after reaching `moving_speed`, stays at or - below `stop_speed` for `hold` seconds. +- `stops` `moving_speed`, `stop_speed`, `hold`, optional `min_distance`, `max_distance`: after + reaching `moving_speed`, stays at or below `stop_speed` for `hold` seconds; with the distances, + that stop has to be between them (metres travelled, as in `distance`). - `stays_stopped` `moving_speed`, `stop_speed`: after moving off and stopping, never goes above `stop_speed` again. - `distance` `min`, `max`: total distance travelled. The physicslog has no position, so the distance comes from integrating the speed; on td.scn every vehicle's first stop after - Stacja1 came out at 1400 m (+-3), and the red signal stop at 140 m. + Stacja1 came out at 1400 m (+-4), and the red signal stop at 140 m. - `slips` `within`: the lead vehicle's wheels slip or lock at some point (within `within` seconds if given), so a slippery rail case does what it's meant to. - `slip_clears` `moving_speed`, `stop_speed`, `within` (*vehicle speed*): once stopped after diff --git a/tests/scenarios/cases/en57_td_timetable.json b/tests/scenarios/cases/en57_td_timetable.json index ddd52af37..d4c4f26fa 100644 --- a/tests/scenarios/cases/en57_td_timetable.json +++ b/tests/scenarios/cases/en57_td_timetable.json @@ -16,6 +16,6 @@ { "type": "starts", "min_speed": 20, "within": 150 }, { "type": "max_speed", "limit": 90, "tolerance": 3 }, { "type": "brakes", "min_pressure": 0.5 }, - { "type": "stops", "moving_speed": 20, "stop_speed": 0.5, "hold": 5 } + { "type": "stops", "moving_speed": 20, "stop_speed": 1.0, "hold": 0, "min_distance": 1380, "max_distance": 1420 } ] } diff --git a/tests/scenarios/cases/ep09_td_timetable.json b/tests/scenarios/cases/ep09_td_timetable.json index dd130be3c..851b4dbfe 100644 --- a/tests/scenarios/cases/ep09_td_timetable.json +++ b/tests/scenarios/cases/ep09_td_timetable.json @@ -12,6 +12,6 @@ { "type": "starts", "min_speed": 20, "within": 150 }, { "type": "max_speed", "limit": 90, "tolerance": 3 }, { "type": "brakes", "min_pressure": 0.5 }, - { "type": "stops", "moving_speed": 20, "stop_speed": 0.5, "hold": 5 } + { "type": "stops", "moving_speed": 20, "stop_speed": 1.0, "hold": 0, "min_distance": 1380, "max_distance": 1420 } ] } diff --git a/tests/scenarios/cases/et22_td_timetable.json b/tests/scenarios/cases/et22_td_timetable.json index 004f5354d..47622c622 100644 --- a/tests/scenarios/cases/et22_td_timetable.json +++ b/tests/scenarios/cases/et22_td_timetable.json @@ -12,6 +12,6 @@ { "type": "starts", "min_speed": 20, "within": 150 }, { "type": "max_speed", "limit": 90, "tolerance": 3 }, { "type": "brakes", "min_pressure": 0.5 }, - { "type": "stops", "moving_speed": 20, "stop_speed": 0.5, "hold": 5 } + { "type": "stops", "moving_speed": 20, "stop_speed": 1.0, "hold": 0, "min_distance": 1380, "max_distance": 1420 } ] } diff --git a/tests/scenarios/cases/eu07_td_timetable.json b/tests/scenarios/cases/eu07_td_timetable.json index 2f23019fe..3774242cd 100644 --- a/tests/scenarios/cases/eu07_td_timetable.json +++ b/tests/scenarios/cases/eu07_td_timetable.json @@ -12,6 +12,6 @@ { "type": "starts", "min_speed": 20, "within": 150 }, { "type": "max_speed", "limit": 90, "tolerance": 3 }, { "type": "brakes", "min_pressure": 0.5 }, - { "type": "stops", "moving_speed": 20, "stop_speed": 0.5, "hold": 5 } + { "type": "stops", "moving_speed": 20, "stop_speed": 1.0, "hold": 0, "min_distance": 1380, "max_distance": 1420 } ] } diff --git a/tests/scenarios/cases/sm42_td_timetable.json b/tests/scenarios/cases/sm42_td_timetable.json index fc89be0fa..994f94c0e 100644 --- a/tests/scenarios/cases/sm42_td_timetable.json +++ b/tests/scenarios/cases/sm42_td_timetable.json @@ -12,6 +12,6 @@ { "type": "starts", "min_speed": 20, "within": 150 }, { "type": "max_speed", "limit": 90, "tolerance": 3 }, { "type": "brakes", "min_pressure": 0.5 }, - { "type": "stops", "moving_speed": 20, "stop_speed": 0.5, "hold": 5 } + { "type": "stops", "moving_speed": 20, "stop_speed": 1.0, "hold": 0, "min_distance": 1380, "max_distance": 1420 } ] } diff --git a/tests/scenarios/cases/sn61_td_timetable.json b/tests/scenarios/cases/sn61_td_timetable.json index 9fa4b18d8..1a03c31f8 100644 --- a/tests/scenarios/cases/sn61_td_timetable.json +++ b/tests/scenarios/cases/sn61_td_timetable.json @@ -12,6 +12,6 @@ { "type": "starts", "min_speed": 20, "within": 150 }, { "type": "max_speed", "limit": 90, "tolerance": 3 }, { "type": "brakes", "min_pressure": 0.5 }, - { "type": "stops", "moving_speed": 20, "stop_speed": 0.5, "hold": 2 } + { "type": "stops", "moving_speed": 20, "stop_speed": 1.0, "hold": 0, "min_distance": 1380, "max_distance": 1420 } ] } diff --git a/tests/scenarios/cases/vectron_td_timetable.json b/tests/scenarios/cases/vectron_td_timetable.json index 9948a09ef..04656a00f 100644 --- a/tests/scenarios/cases/vectron_td_timetable.json +++ b/tests/scenarios/cases/vectron_td_timetable.json @@ -12,6 +12,6 @@ { "type": "starts", "min_speed": 20, "within": 150 }, { "type": "max_speed", "limit": 90, "tolerance": 3 }, { "type": "brakes", "min_pressure": 0.5 }, - { "type": "stops", "moving_speed": 20, "stop_speed": 0.5, "hold": 5 } + { "type": "stops", "moving_speed": 20, "stop_speed": 1.0, "hold": 0, "min_distance": 1380, "max_distance": 1420 } ] } diff --git a/tests/scenarios/run.py b/tests/scenarios/run.py index 4c3383081..210d6c013 100644 --- a/tests/scenarios/run.py +++ b/tests/scenarios/run.py @@ -344,7 +344,7 @@ def check_brakes(rows, min_pressure, moving_speed=20): return False, f"brake cylinder pressure never reached {min_pressure} bar after moving off" -def check_stops(rows, moving_speed, stop_speed, hold): +def check_stops(rows, moving_speed, stop_speed, hold, min_distance=None, max_distance=None): start = _first_moving(rows, moving_speed) if start is None: return False, f"never reached {moving_speed} km/h" @@ -356,7 +356,11 @@ def check_stops(rows, moving_speed, stop_speed, hold): if stopped_at is None: stopped_at = i if r[COL_TIME] - rows[stopped_at][COL_TIME] >= hold: - return True, f"came to a stop at t={rows[stopped_at][COL_TIME]:.1f}s after {dist[stopped_at]:.0f} m" + where = dist[stopped_at] + detail = f"came to a stop at t={rows[stopped_at][COL_TIME]:.1f}s after {where:.0f} m" + if (min_distance is not None and where < min_distance) or (max_distance is not None and where > max_distance): + return False, f"{detail}, wanted between {min_distance} and {max_distance} m" + return True, detail else: stopped_at = None return False, f"did not stay below {stop_speed} km/h for {hold}s after moving off" From 486a714f521ce6d28aca9f9adc475f03817306dc Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 11:20:52 +0100 Subject: [PATCH 331/430] refactor(simulation): the rules of the test mode in a file of their own, with unit tests The command line options of the test mode and the end conditions checked after each frame are now plain functions in simulation/simulationtestrules.cpp, which needs nothing of the running simulation: parse_test_command_line() and evaluate_frame(). The file is part of the core library, so the unit tests check them (tests/unit/test_test_mode.cpp): the --test-timeout value, values of other options not taken for options, a pass that waits for the stop, the standstill, the timeout. test_manager only gathers what a frame brought and acts on the verdict. No change in behaviour. --- CMakeLists.txt | 3 +- application/application.cpp | 45 +++---- simulation/simulationtest.cpp | 77 +++--------- simulation/simulationtest.h | 21 +--- simulation/simulationtestrules.cpp | 139 ++++++++++++++++++++ simulation/simulationtestrules.h | 82 ++++++++++++ tests/unit/test_test_mode.cpp | 195 +++++++++++++++++++++++++++++ 7 files changed, 452 insertions(+), 110 deletions(-) create mode 100644 simulation/simulationtestrules.cpp create mode 100644 simulation/simulationtestrules.h create mode 100644 tests/unit/test_test_mode.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a4e1d6ea..483dbc146 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -454,7 +454,7 @@ endif() add_library(eu07_settings INTERFACE) # the parts of the simulation the game shares with the unit tests: the vehicle physics, the vehicle -# definition parser and the helpers they use. built once, and tested as the game uses them +# definition parser, the helpers they use and the rules of the test mode. built once, and tested as the game uses them set(CORE_SOURCES "McZapkie/friction.cpp" "McZapkie/hamulce.cpp" @@ -463,6 +463,7 @@ set(CORE_SOURCES "utilities/parser.cpp" "utilities/utilities.cpp" "scripting/ladderlogic.cpp" +"simulation/simulationtestrules.cpp" "vehicle/handover.cpp" "vehicle/horn.cpp" "vehicle/smoke.cpp" diff --git a/application/application.cpp b/application/application.cpp index d4aed9d8a..f3c3fe46d 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -34,14 +34,9 @@ http://mozilla.org/MPL/2.0/. #ifdef _WIN32 #include "Console.h" #endif -#include -#include #include -#include #include -#include -#include -#include +#include #include "utilities/translation.h" #if WITH_DISCORD_RPC @@ -1199,16 +1194,6 @@ void apply_test_mode_settings() Global.random_seed = seed_of("test"); } -// seconds given on the command line: a number, not negative. returns nothing for anything else -std::optional parse_seconds(std::string_view const Text) -{ - auto const *const last{Text.data() + Text.size()}; - double value{0.0}; - if (auto const [parsed, status]{std::from_chars(Text.data(), last, value)}; status != std::errc{} || parsed != last || false == std::isfinite(value) || value < 0.0) - return std::nullopt; - return value; -} - } // namespace int eu07_application::init_settings(int Argc, char *Argv[]) @@ -1228,7 +1213,18 @@ int eu07_application::init_settings(int Argc, char *Argv[]) // a test run is known before the rest of the command line is read, so a command line it can't take // ends with the error code of the test, not with 0, which would pass it - Global.test.enabled = std::ranges::any_of(std::span(Argv, static_cast(Argc)), [](char const *Argument) { return std::string_view(Argument) == "--test"; }); + auto const testcommandline{simulation::parse_test_command_line(std::vector(Argv, Argv + Argc))}; + Global.test.enabled = testcommandline.enabled; + if (false == testcommandline.error.empty()) + { + simulation::test().conclude(simulation::test_result::error, testcommandline.error); + return -1; + } + if (testcommandline.timeout.has_value()) + { + Global.test.timeout = *testcommandline.timeout; + Global.test.timeout_from_command_line = true; + } // process command line arguments bool sceneryfromcommandline{false}; @@ -1278,20 +1274,13 @@ int eu07_application::init_settings(int Argc, char *Argv[]) } else if (token == "--test") { - // integration test: the scenery runs unattended and the exit code is the result (eu07/maszyna#541) - Global.test.enabled = true; + // integration test: the scenery runs unattended and the exit code is the result (eu07/maszyna#541), + // taken from the command line above } else if (token == "--test-timeout") { - auto const timeout{i + 1 < Argc ? parse_seconds(Argv[++i]) : std::nullopt}; - if (false == timeout.has_value()) - { - // a typo would otherwise turn the timeout off - simulation::test().conclude(simulation::test_result::error, "--test-timeout needs a number of seconds"); - return -1; - } - Global.test.timeout = *timeout; - Global.test.timeout_from_command_line = true; + // taken from the command line above, with its value + ++i; } else if (token == "-ini") { diff --git a/simulation/simulationtest.cpp b/simulation/simulationtest.cpp index 214d7e463..76aa1be30 100644 --- a/simulation/simulationtest.cpp +++ b/simulation/simulationtest.cpp @@ -25,16 +25,6 @@ http://mozilla.org/MPL/2.0/. #include #include -namespace { - -// the cell holds what the scenery wrote, so the values are whole numbers; the margin only keeps a stray fraction out -bool holds(double const Value, double const Expected) -{ - return std::abs(Value - Expected) < 1e-6; -} - -} // namespace - namespace simulation { test_manager &test() @@ -43,21 +33,6 @@ test_manager &test() return instance; } -std::string_view to_string(test_result const Result) -{ - using enum test_result; - switch (Result) - { - case pass: return "pass"; - case fail: return "fail"; - case signal_passed_at_danger: return "signal passed at danger"; - case timeout: return "timeout"; - case standstill: return "standstill"; - case error: return "error"; - } - return "unknown"; -} - void test_manager::init_result_cell() const { auto cell { std::make_unique(scene::node_data{0, -1, std::string(result_cell), "memcell"}) }; @@ -73,8 +48,7 @@ void test_manager::start() if (m_started) return; m_started = true; - m_time = 0.0; - m_resttime = 0.0; + m_progress = test_progress {}; if (simulation::Vehicles.sequence().empty()) { // most likely the scenery wasn't found, or it isn't a test scenery @@ -94,48 +68,25 @@ void test_manager::update(double const Deltatime) if (false == m_started || m_finished) return; - m_time += Deltatime; - + test_frame frame { Deltatime, std::nullopt, {}, + std::ranges::none_of(simulation::Vehicles.sequence(), [](TDynamicObject const *Vehicle) { return std::abs(Vehicle->GetVelocity()) > 0.01; }) }; if (auto const *cell = simulation::Memory.find(std::string(result_cell))) { - auto const value { cell->Value1() }; - auto const reason { cell->Text().empty() ? std::string() : std::format(" ({})", cell->Text()) }; - if (holds(value, 0.0)) - { - finish(test_result::fail, std::format("__test.result set to 0{}", reason)); - return; - } - if (holds(value, 1.0) && false == Global.test.no_movement_before_pass) - { - finish(test_result::pass, std::format("__test.result set to 1{}", reason)); - return; - } - if (holds(value, 1.0) && false == m_passrequested) - { - m_passrequested = true; - WriteLog(std::format("test: pass requested at {:.1f} s{}, waiting for every vehicle to stop", m_time, reason)); - } + frame.reported = cell->Value1(); + frame.reason = cell->Text(); } - auto const atrest { std::ranges::none_of(simulation::Vehicles.sequence(), - [](TDynamicObject const *Vehicle) { return std::abs(Vehicle->GetVelocity()) > 0.01; }) }; - m_resttime = atrest ? m_resttime + Deltatime : 0.0; - - if (m_passrequested && m_resttime >= pass_settle_time) + auto const requestedbefore { m_progress.passrequested }; + auto const verdict { evaluate_frame(m_progress, frame, test_limits { Global.test.timeout, Global.test.standstill, Global.test.pass_on_standstill, Global.test.no_movement_before_pass }) }; + if (verdict.has_value()) { - finish(test_result::pass, "__test.result set to 1 and every vehicle stopped"); + finish(verdict->result, verdict->reason); return; } - if (Global.test.standstill > 0.0 && m_resttime >= Global.test.standstill) + if (m_progress.passrequested && false == requestedbefore) { - auto const reason { std::format("every vehicle stood still for {:.0f} s", Global.test.standstill) }; - finish(Global.test.pass_on_standstill ? test_result::pass : test_result::standstill, reason); - return; - } - if (Global.test.timeout > 0.0 && m_time >= Global.test.timeout) - { - finish(test_result::timeout, std::format("no result after {:.0f} s", Global.test.timeout)); - return; + WriteLog(std::format("test: pass requested at {:.1f} s{}, waiting for every vehicle to stop", m_progress.time, + frame.reason.empty() ? std::string() : std::format(" ({})", frame.reason))); } } @@ -149,7 +100,7 @@ void test_manager::signal_passed_at_danger(std::string_view const Vehicle, std:: } if (false == Global.test.fail_if_stop_overran) { - WriteLog(std::format("test: {} at {:.1f} s, allowed by test.fail_if_stop_overran", reason, m_time)); + WriteLog(std::format("test: {} at {:.1f} s, allowed by test.fail_if_stop_overran", reason, m_progress.time)); return; } finish(test_result::signal_passed_at_danger, reason); @@ -168,7 +119,7 @@ bool test_manager::conclude(test_result const Result, std::string_view const Rea m_finished = true; m_result = Result; - auto const line { std::format("test: {} (exit code {}) after {:.1f} s of simulation time: {}", to_string(Result), static_cast(Result), m_time, Reason) }; + auto const line { std::format("test: {} (exit code {}) after {:.1f} s of simulation time: {}", to_string(Result), static_cast(Result), m_progress.time, Reason) }; if (Result == test_result::pass) WriteLog(line); else diff --git a/simulation/simulationtest.h b/simulation/simulationtest.h index 2b5012e9f..66384b6ed 100644 --- a/simulation/simulationtest.h +++ b/simulation/simulationtest.h @@ -9,32 +9,19 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include +#include "simulation/simulationtestrules.h" + #include // integration test mode (eu07 --test -s , eu07/maszyna#541): the scenery runs unattended in a tight // fixed-step loop and the simulator quits with an exit code saying how the test went namespace simulation { -// exit codes of a test run; public, scripts and CI read them -enum class test_result : int { - pass = 0, // __test.result set to 1, then every vehicle came to rest (or test.pass_on_standstill) - fail = 1, // __test.result set to 0 - signal_passed_at_danger = 2, // a train went past a stop signal (SetVelocity 0 0), unless test.fail_if_stop_overran no - timeout = 3, // test.timeout seconds of simulation time went by without a result - standstill = 4, // every vehicle stood still for test.standstill seconds without a result - error = 5, // the run could not start (no -s, the scenery failed to load) or the simulator threw -}; - -std::string_view to_string(test_result Result); - class test_manager { public: // name of the memory cell a scenery reports its result to static constexpr std::string_view result_cell { "__test.result" }; - // how long everything has to stand before a requested pass is granted [s] - static constexpr double pass_settle_time { 1.0 }; // fixed simulation time step of one frame in test mode [s]: 3 physics steps of 10 ms static constexpr double frame_step { 0.03 }; @@ -60,9 +47,7 @@ private: bool m_started { false }; bool m_finished { false }; test_result m_result { test_result::error }; - bool m_passrequested { false }; - double m_time { 0.0 }; // simulation time since the start [s] - double m_resttime { 0.0 }; // how long every vehicle has been standing [s] + test_progress m_progress; }; // the test of the run diff --git a/simulation/simulationtestrules.cpp b/simulation/simulationtestrules.cpp new file mode 100644 index 000000000..44f740f13 --- /dev/null +++ b/simulation/simulationtestrules.cpp @@ -0,0 +1,139 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "simulation/simulationtestrules.h" + +#include +#include +#include + +namespace { + +// the cell holds what the scenery wrote, so the values are whole numbers; the margin only keeps a stray fraction out +bool holds(double const Value, double const Expected) +{ + return std::abs(Value - Expected) < 1e-6; +} + +// the text of the result cell, as said after the result +std::string reason_suffix(std::string_view const Reason) +{ + return Reason.empty() ? std::string() : std::format(" ({})", Reason); +} + +// options of the simulator which take a value, see eu07_application::init_settings() +bool takes_value(std::string_view const Option) +{ + return Option == "-s" || Option == "-v" || Option == "-seed" || Option == "-ini"; +} + +// a number of seconds given to Option, at Index of Arguments; the index is moved past the value +std::optional option_seconds(std::span const Arguments, std::size_t &Index) +{ + if (Index + 1 >= Arguments.size()) + return std::nullopt; + ++Index; + return simulation::parse_seconds(Arguments[Index]); +} + +} // namespace + +namespace simulation { + +std::string_view to_string(test_result const Result) +{ + using enum test_result; + switch (Result) + { + case pass: return "pass"; + case fail: return "fail"; + case signal_passed_at_danger: return "signal passed at danger"; + case timeout: return "timeout"; + case standstill: return "standstill"; + case error: return "error"; + } + return "unknown"; +} + +std::optional parse_seconds(std::string_view const Text) +{ + auto const *const last{Text.data() + Text.size()}; + double value{0.0}; + if (auto const [parsed, status]{std::from_chars(Text.data(), last, value)}; status != std::errc{} || parsed != last || false == std::isfinite(value) || value < 0.0) + return std::nullopt; + return value; +} + +test_command_line parse_test_command_line(std::span const Arguments) +{ + test_command_line result; + for (std::size_t i = 1; i < Arguments.size(); ++i) + { + std::string_view const option{Arguments[i]}; + if (option == "--test") + { + result.enabled = true; + } + else if (option == "--test-timeout") + { + auto const seconds{option_seconds(Arguments, i)}; + if (false == seconds.has_value()) + { + // a typo would otherwise turn the limit off + if (result.error.empty()) + result.error = std::format("{} needs a number of seconds", option); + continue; + } + result.timeout = seconds; + } + else if (takes_value(option)) + { + ++i; + } + else if (option == "-edit" && i + 1 < Arguments.size() && Arguments[i + 1][0] != '-') + { + // the scenery to edit is optional + ++i; + } + } + return result; +} + +std::optional evaluate_frame(test_progress &Progress, test_frame const &Frame, test_limits const &Limits) +{ + using enum test_result; + + Progress.time += Frame.deltatime; + + if (Frame.reported.has_value()) + { + auto const value{*Frame.reported}; + if (holds(value, 0.0)) + return test_verdict{fail, std::format("__test.result set to 0{}", reason_suffix(Frame.reason))}; + if (holds(value, 1.0)) + { + if (false == Limits.no_movement_before_pass) + return test_verdict{pass, std::format("__test.result set to 1{}", reason_suffix(Frame.reason))}; + Progress.passrequested = true; + } + } + + Progress.resttime = Frame.atrest ? Progress.resttime + Frame.deltatime : 0.0; + + if (Progress.passrequested && Progress.resttime >= pass_settle_time) + return test_verdict{pass, "__test.result set to 1 and every vehicle stopped"}; + if (Limits.standstill > 0.0 && Progress.resttime >= Limits.standstill) + return test_verdict{Limits.pass_on_standstill ? pass : standstill, std::format("every vehicle stood still for {:.0f} s", Limits.standstill)}; + if (Limits.timeout > 0.0 && Progress.time >= Limits.timeout) + return test_verdict{timeout, std::format("no result after {:.0f} s", Limits.timeout)}; + return std::nullopt; +} + +} // namespace simulation diff --git a/simulation/simulationtestrules.h b/simulation/simulationtestrules.h new file mode 100644 index 000000000..5d966c3c2 --- /dev/null +++ b/simulation/simulationtestrules.h @@ -0,0 +1,82 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include +#include +#include + +// the rules of the test mode (eu07 --test, eu07/maszyna#541) which need nothing of the running simulation: the exit +// codes, the command line and the end conditions. kept apart so the unit tests can check them +namespace simulation { + +// exit codes of a test run; public, scripts and CI read them +enum class test_result : int { + pass = 0, // __test.result set to 1, then every vehicle came to rest (or test.pass_on_standstill) + fail = 1, // __test.result set to 0 + signal_passed_at_danger = 2, // a train went past a stop signal (SetVelocity 0 0), unless test.fail_if_stop_overran no + timeout = 3, // test.timeout seconds of simulation time went by without a result + standstill = 4, // every vehicle stood still for test.standstill seconds without a result + error = 5, // the run could not start (a bad command line, the scenery failed to load) or the simulator threw +}; + +std::string_view to_string(test_result Result); + +// how a test ended, and why +struct test_verdict { + test_result result{test_result::error}; + std::string reason; +}; + +// the test mode options of the command line +struct test_command_line { + bool enabled{false}; // --test + std::optional timeout; // --test-timeout + std::string error; // what's wrong with them; empty if nothing +}; + +// seconds given on the command line: a number, not negative. nothing for anything else +std::optional parse_seconds(std::string_view Text); + +// picks the test mode options out of a command line (the first argument is the program). the values of the other +// options are skipped, so a scenery named like an option isn't taken for one; options it doesn't know are left alone +test_command_line parse_test_command_line(std::span Arguments); + +// the limits and switches the end conditions go by +struct test_limits { + double timeout{3600.0}; // [s] of simulation time; 0 = never + double standstill{300.0}; // [s] of every vehicle standing without a result; 0 = never + bool pass_on_standstill{false}; + bool no_movement_before_pass{true}; +}; + +// what a frame of the simulation brought +struct test_frame { + double deltatime{0.0}; // [s] of simulation time + std::optional reported; // value of the result cell, if there is one + std::string_view reason; // text of the result cell + bool atrest{false}; // every vehicle stands +}; + +// the state of a test between frames +struct test_progress { + double time{0.0}; // simulation time since the start [s] + double resttime{0.0}; // how long every vehicle has been standing [s] + bool passrequested{false}; // __test.result was set to 1, the pass waits for the vehicles to stop +}; + +// how long everything has to stand before a requested pass is granted [s] +inline constexpr double pass_settle_time{1.0}; + +// checks the end conditions after a frame and moves the progress on. returns the verdict once the test is over +std::optional evaluate_frame(test_progress &Progress, test_frame const &Frame, test_limits const &Limits); + +} // namespace simulation diff --git a/tests/unit/test_test_mode.cpp b/tests/unit/test_test_mode.cpp new file mode 100644 index 000000000..fec475c5c --- /dev/null +++ b/tests/unit/test_test_mode.cpp @@ -0,0 +1,195 @@ +#include "stdafx.h" +#include "doctest.h" + +#include "simulation/simulationtestrules.h" + +#include + +// the test mode of the simulator (eu07 --test, eu07/maszyna#541): its command line and end conditions + +namespace { + +using simulation::test_result; + +simulation::test_command_line parse(std::vector Arguments) +{ + Arguments.insert(Arguments.begin(), "eu07"); + return simulation::parse_test_command_line(Arguments); +} + +// a frame of the default 0.03 s +simulation::test_frame frame(bool const Atrest, std::optional const Reported = std::nullopt, std::string_view const Reason = {}) +{ + return simulation::test_frame{0.03, Reported, Reason, Atrest}; +} + +// runs frames until the test ends or Seconds of simulation time go by +std::optional run(simulation::test_progress &Progress, simulation::test_limits const &Limits, double const Seconds, + simulation::test_frame const &Frame) +{ + while (Progress.time < Seconds) + { + if (auto verdict{simulation::evaluate_frame(Progress, Frame, Limits)}) + return verdict; + } + return std::nullopt; +} + +} // namespace + +TEST_CASE("test mode: seconds on the command line are a number, not negative") +{ + CHECK(simulation::parse_seconds("240") == 240.0); + CHECK(simulation::parse_seconds("0.5") == 0.5); + CHECK(simulation::parse_seconds("0") == 0.0); + CHECK_FALSE(simulation::parse_seconds("").has_value()); + CHECK_FALSE(simulation::parse_seconds("-1").has_value()); + CHECK_FALSE(simulation::parse_seconds("60s").has_value()); + CHECK_FALSE(simulation::parse_seconds("abc").has_value()); + CHECK_FALSE(simulation::parse_seconds("inf").has_value()); + CHECK_FALSE(simulation::parse_seconds("nan").has_value()); +} + +TEST_CASE("test mode: the command line") +{ + SUBCASE("without --test there is no test") + { + auto const commandline{parse({"-s", "td.scn", "-v", "ep07-424"})}; + CHECK_FALSE(commandline.enabled); + CHECK(commandline.error.empty()); + } + SUBCASE("--test and its limit, in any order") + { + auto const commandline{parse({"-s", "td.scn", "--test-timeout", "240", "--test"})}; + CHECK(commandline.enabled); + CHECK(commandline.timeout == 240.0); + CHECK(commandline.error.empty()); + } + SUBCASE("a limit not given stays unset") + { + auto const commandline{parse({"--test", "-s", "td.scn"})}; + CHECK_FALSE(commandline.timeout.has_value()); + } + SUBCASE("a limit which isn't a number is an error, not a limit turned off") + { + auto const commandline{parse({"--test", "-s", "td.scn", "--test-timeout", "4m"})}; + CHECK(commandline.enabled); + CHECK_FALSE(commandline.timeout.has_value()); + CHECK(commandline.error == "--test-timeout needs a number of seconds"); + } + SUBCASE("a limit without its value is an error") + { + auto const commandline{parse({"--test", "-s", "td.scn", "--test-timeout"})}; + CHECK(commandline.error == "--test-timeout needs a number of seconds"); + } + SUBCASE("values of other options aren't taken for options") + { + auto const commandline{parse({"-s", "--test", "-ini", "--test-timeout", "-v", "--test", "-seed", "--test"})}; + CHECK_FALSE(commandline.enabled); + CHECK(commandline.error.empty()); + } + SUBCASE("the scenery of -edit is optional") + { + CHECK(parse({"-edit", "--test", "-s", "td.scn"}).enabled); + CHECK_FALSE(parse({"-edit", "td.scn"}).enabled); + } +} + +TEST_CASE("test mode: the end conditions") +{ + simulation::test_limits limits; + simulation::test_progress progress; + + SUBCASE("nothing happens, nothing ends") + { + CHECK_FALSE(simulation::evaluate_frame(progress, frame(false), limits).has_value()); + CHECK(progress.time == doctest::Approx(0.03)); + CHECK(progress.resttime == 0.0); + } + SUBCASE("a cell nobody wrote to says nothing") + { + CHECK_FALSE(simulation::evaluate_frame(progress, frame(false, -1.0), limits).has_value()); + CHECK_FALSE(simulation::evaluate_frame(progress, frame(false, 2.0), limits).has_value()); + CHECK_FALSE(progress.passrequested); + } + SUBCASE("0 fails at once, with the text of the cell") + { + auto const verdict{simulation::evaluate_frame(progress, frame(false, 0.0, "wrong_track"), limits)}; + REQUIRE(verdict.has_value()); + CHECK(verdict->result == test_result::fail); + CHECK(verdict->reason == "__test.result set to 0 (wrong_track)"); + } + SUBCASE("1 passes once every vehicle has stood for a second") + { + CHECK_FALSE(simulation::evaluate_frame(progress, frame(false, 1.0), limits).has_value()); + CHECK(progress.passrequested); + // still moving: the pass waits + CHECK_FALSE(run(progress, limits, 30.0, frame(false, 1.0)).has_value()); + auto const stoppedat{progress.time}; + auto const verdict{run(progress, limits, 60.0, frame(true, 1.0))}; + REQUIRE(verdict.has_value()); + CHECK(verdict->result == test_result::pass); + CHECK(progress.time - stoppedat == doctest::Approx(simulation::pass_settle_time).epsilon(0.05)); + } + SUBCASE("the pass stays requested when the cell changes back") + { + CHECK_FALSE(simulation::evaluate_frame(progress, frame(false, 1.0), limits).has_value()); + auto const verdict{run(progress, limits, 60.0, frame(true, -1.0))}; + REQUIRE(verdict.has_value()); + CHECK(verdict->result == test_result::pass); + } + SUBCASE("1 with test.no_movement_before_pass no passes at once") + { + limits.no_movement_before_pass = false; + auto const verdict{simulation::evaluate_frame(progress, frame(false, 1.0, "reached_the_stop"), limits)}; + REQUIRE(verdict.has_value()); + CHECK(verdict->result == test_result::pass); + CHECK(verdict->reason == "__test.result set to 1 (reached_the_stop)"); + } + SUBCASE("standing still without a result ends after test.standstill") + { + limits.standstill = 120.0; + auto const verdict{run(progress, limits, 1000.0, frame(true))}; + REQUIRE(verdict.has_value()); + CHECK(verdict->result == test_result::standstill); + CHECK(progress.time == doctest::Approx(120.0).epsilon(0.001)); + } + SUBCASE("a move starts the standstill over") + { + limits.standstill = 120.0; + CHECK_FALSE(run(progress, limits, 100.0, frame(true)).has_value()); + CHECK_FALSE(simulation::evaluate_frame(progress, frame(false), limits).has_value()); + CHECK(progress.resttime == 0.0); + CHECK_FALSE(run(progress, limits, 200.0, frame(true)).has_value()); + } + SUBCASE("test.pass_on_standstill makes the standstill a pass") + { + limits.standstill = 10.0; + limits.pass_on_standstill = true; + auto const verdict{run(progress, limits, 1000.0, frame(true))}; + REQUIRE(verdict.has_value()); + CHECK(verdict->result == test_result::pass); + } + SUBCASE("test.standstill 0 never ends the test") + { + limits.standstill = 0.0; + limits.timeout = 0.0; + CHECK_FALSE(run(progress, limits, 5000.0, frame(true)).has_value()); + } + SUBCASE("no result by test.timeout") + { + limits.timeout = 240.0; + auto const verdict{run(progress, limits, 1000.0, frame(false))}; + REQUIRE(verdict.has_value()); + CHECK(verdict->result == test_result::timeout); + CHECK(verdict->reason == "no result after 240 s"); + CHECK(progress.time == doctest::Approx(240.0).epsilon(0.001)); + } + SUBCASE("a result in the last frame wins over the timeout") + { + limits.timeout = 0.03; + auto const verdict{simulation::evaluate_frame(progress, frame(false, 0.0), limits)}; + REQUIRE(verdict.has_value()); + CHECK(verdict->result == test_result::fail); + } +} From baf6bc2a2080a2c6a691b4e0e119e346a15d6603 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 11:21:30 +0100 Subject: [PATCH 332/430] feat(simulation): the test mode's exit codes keep clear of 1 and 3 1 is what a process killed with TerminateProcess (and the plain failure of most programs) ends with, 3 what abort() ends with on Windows, so a fail or a timeout couldn't be told from a run that was killed or blew up. The codes other than pass now are 10 fail, 11 signal passed at danger, 12 timeout, 13 standstill and 14 error: none of them a code a process gets on its own, neither the shells' 126-127 nor 128 + a signal number on Linux. pass stays 0. --- simulation/simulationtestrules.h | 14 ++++++++------ tests/scenarios/README.md | 19 +++++++++++-------- tests/scenarios/run.py | 12 ++++++------ tests/unit/test_test_mode.cpp | 24 +++++++++++++++++++++++- 4 files changed, 48 insertions(+), 21 deletions(-) diff --git a/simulation/simulationtestrules.h b/simulation/simulationtestrules.h index 5d966c3c2..99d35db7b 100644 --- a/simulation/simulationtestrules.h +++ b/simulation/simulationtestrules.h @@ -18,14 +18,16 @@ http://mozilla.org/MPL/2.0/. // codes, the command line and the end conditions. kept apart so the unit tests can check them namespace simulation { -// exit codes of a test run; public, scripts and CI read them +// exit codes of a test run; public, scripts and CI read them. none of them is a code a process commonly ends with +// when it goes wrong on its own: 1 (killed with TerminateProcess, or a plain failure of most programs), 3 (abort() +// on Windows), 126-127 (a shell that can't run the program) or 128 + a signal number (killed, on Linux) enum class test_result : int { pass = 0, // __test.result set to 1, then every vehicle came to rest (or test.pass_on_standstill) - fail = 1, // __test.result set to 0 - signal_passed_at_danger = 2, // a train went past a stop signal (SetVelocity 0 0), unless test.fail_if_stop_overran no - timeout = 3, // test.timeout seconds of simulation time went by without a result - standstill = 4, // every vehicle stood still for test.standstill seconds without a result - error = 5, // the run could not start (a bad command line, the scenery failed to load) or the simulator threw + fail = 10, // __test.result set to 0 + signal_passed_at_danger = 11, // a train went past a stop signal (SetVelocity 0 0), unless test.fail_if_stop_overran no + timeout = 12, // test.timeout seconds of simulation time went by without a result + standstill = 13, // every vehicle stood still for test.standstill seconds without a result + error = 14, // the run could not start (a bad command line, the scenery failed to load) or the simulator threw }; std::string_view to_string(test_result Result); diff --git a/tests/scenarios/README.md b/tests/scenarios/README.md index 8bd6f1a4a..acab07e79 100644 --- a/tests/scenarios/README.md +++ b/tests/scenarios/README.md @@ -62,13 +62,16 @@ The test ends with the first of these: | exit code | result | when | | --- | --- | --- | | 0 | pass | `__test.result` was set to 1 and then every vehicle stood still for 1 s, so a train still moving towards a signal at stop has to stop first (with `test.no_movement_before_pass no` the pass ends the test at once). Also the standstill end with `test.pass_on_standstill yes` | -| 1 | fail | `__test.result` was set to 0; ends at once | -| 2 | signal passed at danger | a train went past a signal showing stop (`SetVelocity 0 0`; `SetVelocity 0 x` on automatic block, which may be passed after a stop, doesn't count); ends at once, unless `test.fail_if_stop_overran no` | -| 3 | timeout | `test.timeout` seconds of simulation time went by (default 3600) | -| 4 | standstill | every vehicle stood still for `test.standstill` seconds (default 300) and nothing reported a result. Trains waiting at a station or for a signal count as standing, so the limit has to be longer than such waits | -| 5 | error | the run could not start: no `-s`, the scenery failed to load or has no vehicles, or the simulator threw | +| 10 | fail | `__test.result` was set to 0; ends at once | +| 11 | signal passed at danger | a train went past a signal showing stop (`SetVelocity 0 0`; `SetVelocity 0 x` on automatic block, which may be passed after a stop, doesn't count); ends at once, unless `test.fail_if_stop_overran no` | +| 12 | timeout | `test.timeout` seconds of simulation time went by (default 3600) | +| 13 | standstill | every vehicle stood still for `test.standstill` seconds (default 300) and nothing reported a result. Trains waiting at a station or for a signal count as standing, so the limit has to be longer than such waits | +| 14 | error | the run could not start: no `-s`, the scenery failed to load or has no vehicles, or the simulator threw | -A crash ends with the system's code instead (on Windows e.g. `0xC0000005`, -1073741819). +A crash ends with the system's code instead (on Windows e.g. `0xC0000005`, -1073741819). The +codes of the test mode keep clear of the ones a process gets when it goes wrong on its own: 1 +(killed with `TerminateProcess`, or a plain failure of most programs), 3 (`abort()` on Windows), +126-127 (a shell that can't run the program) and 128 + a signal number (killed, on Linux). The limits go in a `config` block of the scenery: @@ -180,8 +183,8 @@ and slides past the signal, so those cases set `test.fail_if_stop_overran no`. on `tor1k`, the track in front of the signal. The `test_mode_*` cases show the ends of the test mode: `test_mode_pass` (exit 0, the pass -event), `test_mode_signal_passed_at_danger` (exit 2), `test_mode_timeout` (exit 3, from -`test.timeout`) and `test_mode_standstill` (exit 4, from `test.standstill`). +event), `test_mode_signal_passed_at_danger` (exit 11), `test_mode_timeout` (exit 12, from +`test.timeout`) and `test_mode_standstill` (exit 13, from `test.standstill`). `test_mode_pass_while_moving` reports the pass from `event2` of `tor1k` (the direction the train runs), as the train runs onto it, with `test.no_movement_before_pass no`, so the test ends with the train still moving. diff --git a/tests/scenarios/run.py b/tests/scenarios/run.py index 210d6c013..886e2e90d 100644 --- a/tests/scenarios/run.py +++ b/tests/scenarios/run.py @@ -52,14 +52,14 @@ COL_COMMAND = 16 # text, read as None COL_WHEELSLIP = 20 COL_VEHICLE_VELOCITY = 25 # signed vehicle speed, km/h; only in builds which log it -# exit codes of the simulator's test mode (eu07 --test), see simulation/simulationtest.h +# exit codes of the simulator's test mode (eu07 --test), see simulation/simulationtestrules.h EXIT_RESULTS = { 0: "pass", - 1: "fail", - 2: "signal_passed_at_danger", - 3: "timeout", - 4: "standstill", - 5: "error", + 10: "fail", + 11: "signal_passed_at_danger", + 12: "timeout", + 13: "standstill", + 14: "error", } # settings layered over the user's eu07.ini for a test run; the window ones only matter diff --git a/tests/unit/test_test_mode.cpp b/tests/unit/test_test_mode.cpp index fec475c5c..609b16ff0 100644 --- a/tests/unit/test_test_mode.cpp +++ b/tests/unit/test_test_mode.cpp @@ -3,9 +3,10 @@ #include "simulation/simulationtestrules.h" +#include #include -// the test mode of the simulator (eu07 --test, eu07/maszyna#541): its command line and end conditions +// the test mode of the simulator (eu07 --test, eu07/maszyna#541): its exit codes, command line and end conditions namespace { @@ -37,6 +38,27 @@ std::optional run(simulation::test_progress &Progress, } // namespace +TEST_CASE("test mode: the exit codes keep clear of the ones of a killed or aborted process") +{ + std::array const results{test_result::pass, test_result::fail, test_result::signal_passed_at_danger, test_result::timeout, test_result::standstill, test_result::error}; + for (auto const result : results) + { + auto const code{static_cast(result)}; + CAPTURE(code); + CHECK(code != 1); // TerminateProcess, most programs' failure + CHECK(code != 3); // abort() on Windows + CHECK(code < 126); // shells, signals on Linux + CHECK(simulation::to_string(result) != "unknown"); + } + // the codes are public: scripts and CI read them + CHECK(static_cast(test_result::pass) == 0); + CHECK(static_cast(test_result::fail) == 10); + CHECK(static_cast(test_result::signal_passed_at_danger) == 11); + CHECK(static_cast(test_result::timeout) == 12); + CHECK(static_cast(test_result::standstill) == 13); + CHECK(static_cast(test_result::error) == 14); +} + TEST_CASE("test mode: seconds on the command line are a number, not negative") { CHECK(simulation::parse_seconds("240") == 240.0); From 7f8892cda6f02facd364d093992c48060bd1db09 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 11:21:57 +0100 Subject: [PATCH 333/430] fix(simulation): a test doesn't read the player's own eu07.ini The simulator reads eu07.ini from %APPDATA%/MaSzyna (~/.config/MaSzyna on Linux) when there is one, in place of the game folder's. A test run then depended on whose machine it ran on. With --test only the game folder's eu07.ini is read, then the files given with -ini. The test mode options are taken from the command line before the settings for that; --test-timeout still wins over test.timeout of any settings file. --- application/application.cpp | 24 +++++++++++++----------- tests/scenarios/README.md | 3 +++ tests/scenarios/run.py | 3 ++- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/application/application.cpp b/application/application.cpp index f3c3fe46d..638eacdce 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -1200,17 +1200,6 @@ int eu07_application::init_settings(int Argc, char *Argv[]) { Global.asVersion = VERSION_INFO; - fs::path iniPath = user_config_path("eu07.ini"); - - if (!iniPath.empty() && fs::exists(iniPath)) - { - Global.LoadIniFile(iniPath.string().c_str()); - } - else - { - Global.LoadIniFile("eu07.ini"); - } - // a test run is known before the rest of the command line is read, so a command line it can't take // ends with the error code of the test, not with 0, which would pass it auto const testcommandline{simulation::parse_test_command_line(std::vector(Argv, Argv + Argc))}; @@ -1226,6 +1215,19 @@ int eu07_application::init_settings(int Argc, char *Argv[]) Global.test.timeout_from_command_line = true; } + fs::path iniPath = user_config_path("eu07.ini"); + + // a test reads the settings of the game folder only (and those given with -ini), not the player's own + // (%APPDATA%/MaSzyna, ~/.config/MaSzyna), so it runs the same for whoever runs it + if (false == Global.test.enabled && !iniPath.empty() && fs::exists(iniPath)) + { + Global.LoadIniFile(iniPath.string().c_str()); + } + else + { + Global.LoadIniFile("eu07.ini"); + } + // process command line arguments bool sceneryfromcommandline{false}; bool editwithoutscenery{false}; diff --git a/tests/scenarios/README.md b/tests/scenarios/README.md index acab07e79..ca45dc34d 100644 --- a/tests/scenarios/README.md +++ b/tests/scenarios/README.md @@ -19,6 +19,9 @@ eu07 --test -s [--test-timeout ] [-seed ] [- With `--test` the simulator: - needs `-s`; `-v` is ignored and every train is driven by AI (ghostview), +- reads the settings of the game folder's `eu07.ini` and of the files given with `-ini` (in that + order), not the player's own `eu07.ini` in `%APPDATA%\MaSzyna` (`~/.config/MaSzyna` on Linux), + so a test runs the same for whoever runs it, - draws nothing: the null renderer loads the 3D models (the physics needs some of their data) but no textures, and the window stays hidden, - has no sound, no network, no python, no pause (not even one set by the scenery), and diff --git a/tests/scenarios/run.py b/tests/scenarios/run.py index 886e2e90d..9cc6f84a9 100644 --- a/tests/scenarios/run.py +++ b/tests/scenarios/run.py @@ -62,7 +62,8 @@ EXIT_RESULTS = { 14: "error", } -# settings layered over the user's eu07.ini for a test run; the window ones only matter +# settings layered over the game's eu07.ini for a test run (test mode doesn't read the player's own +# in %APPDATA%); the window ones only matter # with --watch, test mode keeps its window hidden and turns the sound off by itself TEST_INI = """\ fullscreen no From 1626df2bc49945680f596395f06f81256edd2130 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 11:22:37 +0100 Subject: [PATCH 334/430] fix(simulation): a scenery's config block can't turn back on what a test keeps off The config block of a scenery is read like the settings files, after the test mode settings were applied, so a scenery with soundenabled, multiplayer, execonexit, feedbackmode or the like in it got them back in a test run. The test mode settings now are applied again after each config block of the scenery; apply_test_mode_settings() moved to simulationtest.cpp for that. --- application/application.cpp | 52 +----------------------- simulation/simulationstateserializer.cpp | 5 +++ simulation/simulationtest.cpp | 46 +++++++++++++++++++++ simulation/simulationtest.h | 5 +++ tests/scenarios/README.md | 2 + 5 files changed, 59 insertions(+), 51 deletions(-) diff --git a/application/application.cpp b/application/application.cpp index 638eacdce..d0ef6a01a 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -31,9 +31,6 @@ http://mozilla.org/MPL/2.0/. #include "utilities/dictionary.h" #include "version_info.h" #include "simulation/simulationtest.h" -#ifdef _WIN32 -#include "Console.h" -#endif #include #include #include @@ -1149,53 +1146,6 @@ void eu07_application::init_files() } namespace fs = std::filesystem; -namespace -{ - -// the settings of the test mode (--test), over whatever the settings files say -void apply_test_mode_settings() -{ - // nobody watches nor listens: no player vehicle, nothing drawn, no sound, no window in the way - Global.editor_session = false; - Global.local_start_vehicle = "ghostview"; - Global.GfxRenderer = "null"; - Global.NvRenderer = false; - Global.bSoundEnabled = false; - Global.python_enabled = false; - Global.bInactivePause = false; - Global.bFullScreen = false; - Global.fullscreen_windowed = false; - Global.VSync = false; - Global.iMultisampling = 0; - Global.gfx_usegles = false; - Global.minframetime = std::chrono::duration(0.0f); - Global.extra_viewports.clear(); - Global.headtrack_conf.joy.clear(); - // a test runs on its own: no network, and no input from outside (eu07/maszyna#541) - Global.network_servers.clear(); - Global.network_client.reset(); - Global.InputGamepad = false; - Global.InputMouse = false; - Global.uart_conf.enable = false; - Global.motiontelemetry_conf.enable = false; -#ifdef WITH_ZMQ - Global.zmq_address.clear(); -#endif - // nor anything to the outside: no keyboard leds, LPT or PoKeys desk (feedbackmode), no messages to a - // multiplayer server (multiplayer, which also holds some events back for it), no program run at the end - Global.iFeedbackMode = 0; -#ifdef _WIN32 - Console::ModeSet(Global.iFeedbackMode, Global.iFeedbackPort); -#endif - Global.iMultiplayer = 0; - Global.exec_on_exit.clear(); - // and the same way every time, unless given another seed (-seed, or randomseed in the settings) - if (!Global.random_seed) - Global.random_seed = seed_of("test"); -} - -} // namespace - int eu07_application::init_settings(int Argc, char *Argv[]) { Global.asVersion = VERSION_INFO; @@ -1315,7 +1265,7 @@ int eu07_application::init_settings(int Argc, char *Argv[]) simulation::test().conclude(simulation::test_result::error, "--test needs a scenery given with -s"); return -1; } - apply_test_mode_settings(); + simulation::apply_test_mode_settings(); } return 0; diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index 664f3b955..244700070 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -15,6 +15,7 @@ http://mozilla.org/MPL/2.0/. #include "simulation/simulationtime.h" #include "simulation/simulationsounds.h" #include "simulation/simulationenvironment.h" +#include "simulation/simulationtest.h" #include "scene/scenenodegroups.h" #include "scene/scenelayers.h" #include "scene/sceneterrain.h" @@ -363,6 +364,10 @@ state_serializer::deserialize_config( cParser &Input, scene::scratch_data &Scrat // config parameters (re)definition Global.ConfigParse( Input ); + if( Global.test.enabled ) { + // a scenery doesn't get to turn on what a test keeps off + simulation::apply_test_mode_settings(); + } } void diff --git a/simulation/simulationtest.cpp b/simulation/simulationtest.cpp index 76aa1be30..67e05ad31 100644 --- a/simulation/simulationtest.cpp +++ b/simulation/simulationtest.cpp @@ -15,11 +15,16 @@ http://mozilla.org/MPL/2.0/. #include "simulation/simulation.h" #include "utilities/Globals.h" #include "utilities/Logs.h" +#include "utilities/utilities.h" #include "vehicle/DynObj.h" #include "world/Event.h" #include "world/MemCell.h" +#ifdef _WIN32 +#include "Console.h" +#endif #include +#include #include #include #include @@ -33,6 +38,47 @@ test_manager &test() return instance; } +void apply_test_mode_settings() +{ + // nobody watches nor listens: no player vehicle, nothing drawn, no sound, no window in the way + Global.editor_session = false; + Global.local_start_vehicle = "ghostview"; + Global.GfxRenderer = "null"; + Global.NvRenderer = false; + Global.bSoundEnabled = false; + Global.python_enabled = false; + Global.bInactivePause = false; + Global.bFullScreen = false; + Global.fullscreen_windowed = false; + Global.VSync = false; + Global.iMultisampling = 0; + Global.gfx_usegles = false; + Global.minframetime = std::chrono::duration(0.0f); + Global.extra_viewports.clear(); + Global.headtrack_conf.joy.clear(); + // a test runs on its own: no network, and no input from outside (eu07/maszyna#541) + Global.network_servers.clear(); + Global.network_client.reset(); + Global.InputGamepad = false; + Global.InputMouse = false; + Global.uart_conf.enable = false; + Global.motiontelemetry_conf.enable = false; +#ifdef WITH_ZMQ + Global.zmq_address.clear(); +#endif + // nor anything to the outside: no keyboard leds, LPT or PoKeys desk (feedbackmode), no messages to a + // multiplayer server (multiplayer, which also holds some events back for it), no program run at the end + Global.iFeedbackMode = 0; +#ifdef _WIN32 + Console::ModeSet(Global.iFeedbackMode, Global.iFeedbackPort); +#endif + Global.iMultiplayer = 0; + Global.exec_on_exit.clear(); + // and the same way every time, unless given another seed (-seed, or randomseed in the settings) + if (!Global.random_seed) + Global.random_seed = seed_of("test"); +} + void test_manager::init_result_cell() const { auto cell { std::make_unique(scene::node_data{0, -1, std::string(result_cell), "memcell"}) }; diff --git a/simulation/simulationtest.h b/simulation/simulationtest.h index 66384b6ed..e67b2adaf 100644 --- a/simulation/simulationtest.h +++ b/simulation/simulationtest.h @@ -53,4 +53,9 @@ private: // the test of the run test_manager &test(); +// the settings of the test mode, over whatever the settings files and the scenery say: applied once the command +// line is read, and again after each config block of the scenery, which could turn the sound, the network or the +// program run at the end back on +void apply_test_mode_settings(); + } // namespace simulation diff --git a/tests/scenarios/README.md b/tests/scenarios/README.md index ca45dc34d..006a0fc69 100644 --- a/tests/scenarios/README.md +++ b/tests/scenarios/README.md @@ -32,6 +32,8 @@ With `--test` the simulator: - gives nothing to the outside either: no keyboard leds, LPT or PoKeys (`feedbackmode`), no messages to a multiplayer server (`multiplayer`), no program run at the end (`execonexit`), no console window of its own (`showsystemconsole`), and the game's `imgui.ini` stays as it is, +- keeps all of the above whatever the `config` block of the scenery says: the settings of the + test mode are applied again after it, - runs the simulation as fast as it can in fixed steps of 0.03 s of simulation time per frame (three 10 ms physics steps), whatever the real time, the time speed or the machine, - seeds its random numbers with a fixed seed unless `-seed` or `randomseed` gives one, so two From 14d25520f3e056b9279c0458e7a1487bc4fb2bea Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 11:23:02 +0100 Subject: [PATCH 335/430] fix(simulation): a test's standard output carries its result only The log was printed in colour to stdout too (debuglog bit 2), so a script reading the verdict of a test got the whole log with it. In test mode the log goes to the log file only and stdout has the `test: ...` line alone; the usage text of a bad command line goes to stderr. Whether the run is a test is now known before the log service starts. --- application/application.cpp | 11 +++++++---- tests/scenarios/README.md | 3 ++- utilities/Logs.cpp | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/application/application.cpp b/application/application.cpp index d0ef6a01a..4fe0911ac 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -322,6 +322,9 @@ int eu07_application::init(int Argc, char *Argv[]) { int result{0}; + // a test run is known before anything is logged: whoever started it reads its result on the standard output, + // which the log isn't written to then (eu07/maszyna#541) + Global.test.enabled = simulation::parse_test_command_line(std::vector(Argv, Argv + Argc)).enabled; // start logging service std::thread sLoggingService(LogService); Global.threads.emplace("LogService", std::move(sLoggingService)); @@ -1150,10 +1153,9 @@ int eu07_application::init_settings(int Argc, char *Argv[]) { Global.asVersion = VERSION_INFO; - // a test run is known before the rest of the command line is read, so a command line it can't take - // ends with the error code of the test, not with 0, which would pass it + // a test run is known before the rest of the command line is read (Global.test.enabled, see init()), so a + // command line it can't take ends with the error code of the test, not with 0, which would pass it auto const testcommandline{simulation::parse_test_command_line(std::vector(Argv, Argv + Argc))}; - Global.test.enabled = testcommandline.enabled; if (false == testcommandline.error.empty()) { simulation::test().conclude(simulation::test_result::error, testcommandline.error); @@ -1245,7 +1247,8 @@ int eu07_application::init_settings(int Argc, char *Argv[]) } else { - std::cout << "usage: " << std::string(Argv[0]) << " [-s sceneryfilepath]" + // a test's standard output carries its result only + (Global.test.enabled ? std::cerr : std::cout) << "usage: " << std::string(Argv[0]) << " [-s sceneryfilepath]" << " [-v vehiclename]" << " [-edit [sceneryfilepath]]" << " [-seed number|word]" diff --git a/tests/scenarios/README.md b/tests/scenarios/README.md index 006a0fc69..d3f256782 100644 --- a/tests/scenarios/README.md +++ b/tests/scenarios/README.md @@ -40,7 +40,8 @@ With `--test` the simulator: runs of a scenery come out the same (the physicslogs of two runs are byte for byte equal), - quits when the test ends, and says how it ended in the exit code and in a `test: ...` line on stdout and in the log. A command line it can't take, or a start that fails, ends - the same way with the `error` code. + the same way with the `error` code. That line is all there is on stdout: the log goes to + the log file only (`debuglog` doesn't print it on the console in test mode). On Windows the simulator is a windowed program, which the `cmd` prompt and PowerShell don't wait for. In a `.bat` file `eu07 --test ... > result.txt` waits and sets `%errorlevel%`; at the prompt diff --git a/utilities/Logs.cpp b/utilities/Logs.cpp index 38094d72e..e0949aba6 100644 --- a/utilities/Logs.cpp +++ b/utilities/Logs.cpp @@ -125,8 +125,8 @@ void LogService() if (log_scrollback.size() > 200) log_scrollback.pop_front(); - // log to console - if (Global.iWriteLogEnabled & 2) + // log to console; not in test mode, where the standard output carries the result of the test only + if ((Global.iWriteLogEnabled & 2) && false == Global.test.enabled) { if (isError) printf("\033[1;37;41m%s\033[0m\n", msg.c_str()); From 03a417c7b0b4307546bec78a9cf0321abd573f17 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 11:33:36 +0100 Subject: [PATCH 336/430] feat(simulation): a real time watchdog ends a test run that hangs A test run that hung, in the loading or anywhere else, waited until whoever started it killed it. A watchdog thread now ends a run still going test.wall_timeout seconds of real time after the start of the simulator, loading included: it says `test: timeout ... still running after N s of real time` and quits with the timeout code, whatever the main thread is doing, with no dialog. A test that has ended but whose simulator doesn't close ends with its own result. The limit is test.wall_timeout (settings, the scenery's config block) or --test-wall-timeout, which wins. Not given, it is test.timeout + 600 s: ten minutes for the loading, and a simulation that runs at least as fast as real time is never cut short. test.timeout 0 means no watchdog unless the limit is given; test.wall_timeout 0 turns it off. run.py passes the case's timeout as --test-wall-timeout and kills a simulator only 30 s after it. A timeout from the watchdog counts as wall_timeout there, so a run that hung doesn't pass a case expecting the simulation time to run out; test_mode_wall_timeout ends while loading on a limit of 2 s. --- application/application.cpp | 9 ++- simulation/simulationtest.cpp | 73 +++++++++++++++++-- simulation/simulationtest.h | 17 ++++- simulation/simulationtestrules.cpp | 14 +++- simulation/simulationtestrules.h | 13 +++- tests/scenarios/README.md | 36 ++++++--- .../cases/test_mode_wall_timeout.json | 11 +++ tests/scenarios/run.py | 23 ++++-- tests/unit/test_test_mode.cpp | 34 ++++++++- utilities/Globals.cpp | 12 +++ utilities/Globals.h | 3 + 11 files changed, 210 insertions(+), 35 deletions(-) create mode 100644 tests/scenarios/cases/test_mode_wall_timeout.json diff --git a/application/application.cpp b/application/application.cpp index 4fe0911ac..860b8a235 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -1166,6 +1166,11 @@ int eu07_application::init_settings(int Argc, char *Argv[]) Global.test.timeout = *testcommandline.timeout; Global.test.timeout_from_command_line = true; } + if (testcommandline.wall_timeout.has_value()) + { + Global.test.wall_timeout = testcommandline.wall_timeout; + Global.test.wall_timeout_from_command_line = true; + } fs::path iniPath = user_config_path("eu07.ini"); @@ -1231,7 +1236,7 @@ int eu07_application::init_settings(int Argc, char *Argv[]) // integration test: the scenery runs unattended and the exit code is the result (eu07/maszyna#541), // taken from the command line above } - else if (token == "--test-timeout") + else if (token == "--test-timeout" || token == "--test-wall-timeout") { // taken from the command line above, with its value ++i; @@ -1253,7 +1258,7 @@ int eu07_application::init_settings(int Argc, char *Argv[]) << " [-edit [sceneryfilepath]]" << " [-seed number|word]" << " [-ini settingsfile]" - << " [--test [--test-timeout seconds]]" << std::endl; + << " [--test [--test-timeout seconds] [--test-wall-timeout seconds]]" << std::endl; simulation::test().conclude(simulation::test_result::error, std::format("unknown command line argument {}", token)); return -1; } diff --git a/simulation/simulationtest.cpp b/simulation/simulationtest.cpp index 67e05ad31..15cdf0e3f 100644 --- a/simulation/simulationtest.cpp +++ b/simulation/simulationtest.cpp @@ -27,9 +27,20 @@ http://mozilla.org/MPL/2.0/. #include #include #include +#include #include #include +namespace { + +// [s] of real time since the start of the simulator +double elapsed_wall_time() +{ + return std::chrono::duration(std::chrono::steady_clock::now() - Global.startTimestamp).count(); +} + +} // namespace + namespace simulation { test_manager &test() @@ -77,6 +88,8 @@ void apply_test_mode_settings() // and the same way every time, unless given another seed (-seed, or randomseed in the settings) if (!Global.random_seed) Global.random_seed = seed_of("test"); + // the real time limit, which the scenery may set too + test().watch_wall_clock(wall_clock_limit(Global.test.wall_timeout, Global.test.timeout)); } void test_manager::init_result_cell() const @@ -94,7 +107,10 @@ void test_manager::start() if (m_started) return; m_started = true; - m_progress = test_progress {}; + { + std::scoped_lock lock { m_lock }; + m_progress = test_progress {}; + } if (simulation::Vehicles.sequence().empty()) { // most likely the scenery wasn't found, or it isn't a test scenery @@ -103,7 +119,9 @@ void test_manager::start() } // a pause set by the scenery or the settings would never be lifted, nobody is there to press the key Global.iPause = 0; - WriteLog(std::format("test: started, timeout {:.0f} s, standstill {:.0f} s{}{}{}", Global.test.timeout, Global.test.standstill, + auto const walllimit { m_walllimit.load() }; + WriteLog(std::format("test: started, timeout {:.0f} s, real time limit {}, standstill {:.0f} s{}{}{}", Global.test.timeout, + walllimit > 0.0 ? std::format("{:.0f} s", walllimit) : std::string("none"), Global.test.standstill, Global.test.pass_on_standstill ? ", standstill passes" : "", Global.test.fail_if_stop_overran ? "" : ", signals passed at danger allowed", Global.test.no_movement_before_pass ? "" : ", pass without waiting for a stop")); @@ -122,14 +140,21 @@ void test_manager::update(double const Deltatime) frame.reason = cell->Text(); } - auto const requestedbefore { m_progress.passrequested }; - auto const verdict { evaluate_frame(m_progress, frame, test_limits { Global.test.timeout, Global.test.standstill, Global.test.pass_on_standstill, Global.test.no_movement_before_pass }) }; + auto const limits { test_limits { Global.test.timeout, Global.test.standstill, Global.test.pass_on_standstill, Global.test.no_movement_before_pass } }; + std::optional verdict; + auto passrequested { false }; + { + std::scoped_lock lock { m_lock }; + auto const requestedbefore { m_progress.passrequested }; + verdict = evaluate_frame(m_progress, frame, limits); + passrequested = m_progress.passrequested && false == requestedbefore; + } if (verdict.has_value()) { finish(verdict->result, verdict->reason); return; } - if (m_progress.passrequested && false == requestedbefore) + if (passrequested) { WriteLog(std::format("test: pass requested at {:.1f} s{}, waiting for every vehicle to stop", m_progress.time, frame.reason.empty() ? std::string() : std::format(" ({})", frame.reason))); @@ -160,10 +185,11 @@ void test_manager::finish(test_result const Result, std::string_view const Reaso bool test_manager::conclude(test_result const Result, std::string_view const Reason) { + std::scoped_lock lock { m_lock }; if (m_finished || false == Global.test.enabled) return false; - m_finished = true; m_result = Result; + m_finished = true; auto const line { std::format("test: {} (exit code {}) after {:.1f} s of simulation time: {}", to_string(Result), static_cast(Result), m_progress.time, Reason) }; if (Result == test_result::pass) @@ -176,4 +202,39 @@ bool test_manager::conclude(test_result const Result, std::string_view const Rea return true; } +int test_manager::exit_code() const +{ + std::scoped_lock lock { m_lock }; + return static_cast(m_finished ? m_result : test_result::error); +} + +void test_manager::watch_wall_clock(double const Limit) +{ + m_walllimit = Limit; + if (Limit <= 0.0 || m_watchdog.joinable()) + return; + m_watchdog = std::jthread([this](std::stop_token const &Stop) { + while (false == Stop.stop_requested()) + { + std::this_thread::sleep_for(std::chrono::milliseconds(100)); + check_wall_clock(elapsed_wall_time()); + } + }); +} + +void test_manager::check_wall_clock(double const Elapsed) +{ + auto const limit { m_walllimit.load() }; + if (limit <= 0.0 || Elapsed < limit) + return; + // the run hangs, or is too slow: it ends here, whatever the main thread is doing. a run whose test has ended + // but which doesn't close ends with its result + if (false == conclude(test_result::timeout, std::format("still running after {:.0f} s of real time (test.wall_timeout)", limit))) + ErrorLog(std::format("test: the simulator was still running {:.0f} s of real time after the start, ended", limit)); + // what was logged last gets written, unless the log is held up by a hung thread + StopLogService(); + std::this_thread::sleep_for(std::chrono::milliseconds(250)); + std::_Exit(exit_code()); +} + } // namespace simulation diff --git a/simulation/simulationtest.h b/simulation/simulationtest.h index e67b2adaf..a59ec87bf 100644 --- a/simulation/simulationtest.h +++ b/simulation/simulationtest.h @@ -11,7 +11,10 @@ http://mozilla.org/MPL/2.0/. #include "simulation/simulationtestrules.h" +#include +#include #include +#include // integration test mode (eu07 --test -s , eu07/maszyna#541): the scenery runs unattended in a tight // fixed-step loop and the simulator quits with an exit code saying how the test went @@ -38,16 +41,26 @@ public: // ends the test with given result, without closing the application: for the ways out that close it anyway // (a bad command line, a failed start, an exception). returns false if the test had already ended bool conclude(test_result Result, std::string_view Reason); + // (re)sets the real time limit of the run [s] since the start of the simulator, 0 = none. the first limit + // starts the watchdog, which ends a run still going at the limit with the timeout code, whatever it's doing + void watch_wall_clock(double Limit); bool finished() const { return m_finished; } // exit code of the process: the result, or error while the test hasn't finished - int exit_code() const { return static_cast(m_finished ? m_result : test_result::error); } + int exit_code() const; private: + // the watchdog's check, at Elapsed seconds of real time since the start of the simulator + void check_wall_clock(double Elapsed); + + // the watchdog may end the test from its own thread + mutable std::mutex m_lock; bool m_started { false }; - bool m_finished { false }; + std::atomic m_finished { false }; test_result m_result { test_result::error }; test_progress m_progress; + std::atomic m_walllimit { 0.0 }; // [s] since the start of the simulator, 0 = none + std::jthread m_watchdog; }; // the test of the run diff --git a/simulation/simulationtestrules.cpp b/simulation/simulationtestrules.cpp index 44f740f13..eba1d7dd3 100644 --- a/simulation/simulationtestrules.cpp +++ b/simulation/simulationtestrules.cpp @@ -81,7 +81,7 @@ test_command_line parse_test_command_line(std::span const Arg { result.enabled = true; } - else if (option == "--test-timeout") + else if (option == "--test-timeout" || option == "--test-wall-timeout") { auto const seconds{option_seconds(Arguments, i)}; if (false == seconds.has_value()) @@ -91,7 +91,10 @@ test_command_line parse_test_command_line(std::span const Arg result.error = std::format("{} needs a number of seconds", option); continue; } - result.timeout = seconds; + if (option == "--test-timeout") + result.timeout = seconds; + else + result.wall_timeout = seconds; } else if (takes_value(option)) { @@ -106,6 +109,13 @@ test_command_line parse_test_command_line(std::span const Arg return result; } +double wall_clock_limit(std::optional const Given, double const Simulationtimeout) +{ + if (Given.has_value()) + return *Given; + return Simulationtimeout > 0.0 ? Simulationtimeout + wall_timeout_loading_allowance : 0.0; +} + std::optional evaluate_frame(test_progress &Progress, test_frame const &Frame, test_limits const &Limits) { using enum test_result; diff --git a/simulation/simulationtestrules.h b/simulation/simulationtestrules.h index 99d35db7b..52adf27a8 100644 --- a/simulation/simulationtestrules.h +++ b/simulation/simulationtestrules.h @@ -15,7 +15,7 @@ http://mozilla.org/MPL/2.0/. #include // the rules of the test mode (eu07 --test, eu07/maszyna#541) which need nothing of the running simulation: the exit -// codes, the command line and the end conditions. kept apart so the unit tests can check them +// codes, the command line, the end conditions and the real time limit. kept apart so the unit tests can check them namespace simulation { // exit codes of a test run; public, scripts and CI read them. none of them is a code a process commonly ends with @@ -25,7 +25,7 @@ enum class test_result : int { pass = 0, // __test.result set to 1, then every vehicle came to rest (or test.pass_on_standstill) fail = 10, // __test.result set to 0 signal_passed_at_danger = 11, // a train went past a stop signal (SetVelocity 0 0), unless test.fail_if_stop_overran no - timeout = 12, // test.timeout seconds of simulation time went by without a result + timeout = 12, // test.timeout seconds of simulation time, or test.wall_timeout seconds of real time went by standstill = 13, // every vehicle stood still for test.standstill seconds without a result error = 14, // the run could not start (a bad command line, the scenery failed to load) or the simulator threw }; @@ -42,6 +42,7 @@ struct test_verdict { struct test_command_line { bool enabled{false}; // --test std::optional timeout; // --test-timeout + std::optional wall_timeout; // --test-wall-timeout std::string error; // what's wrong with them; empty if nothing }; @@ -52,6 +53,14 @@ std::optional parse_seconds(std::string_view Text); // options are skipped, so a scenery named like an option isn't taken for one; options it doesn't know are left alone test_command_line parse_test_command_line(std::span Arguments); +// time allowed for loading the scenery, on top of the simulation time, when the real time limit isn't given [s] +inline constexpr double wall_timeout_loading_allowance{600.0}; + +// the real time limit of a test run [s], 0 = none: the one given, else the simulation time limit plus time for the +// loading, so a simulation that runs at least as fast as real time is never cut short. no simulation time limit +// (test.timeout 0) means none in real time either, unless given +double wall_clock_limit(std::optional Given, double Simulationtimeout); + // the limits and switches the end conditions go by struct test_limits { double timeout{3600.0}; // [s] of simulation time; 0 = never diff --git a/tests/scenarios/README.md b/tests/scenarios/README.md index d3f256782..5eed983e1 100644 --- a/tests/scenarios/README.md +++ b/tests/scenarios/README.md @@ -13,7 +13,7 @@ The runner drives the simulator's test mode (eu07/maszyna#541), which works with runner too and is meant for scenery authors as well: ``` -eu07 --test -s [--test-timeout ] [-seed ] [-ini ] +eu07 --test -s [--test-timeout ] [--test-wall-timeout ] [-seed ] [-ini ] ``` With `--test` the simulator: @@ -70,7 +70,7 @@ The test ends with the first of these: | 0 | pass | `__test.result` was set to 1 and then every vehicle stood still for 1 s, so a train still moving towards a signal at stop has to stop first (with `test.no_movement_before_pass no` the pass ends the test at once). Also the standstill end with `test.pass_on_standstill yes` | | 10 | fail | `__test.result` was set to 0; ends at once | | 11 | signal passed at danger | a train went past a signal showing stop (`SetVelocity 0 0`; `SetVelocity 0 x` on automatic block, which may be passed after a stop, doesn't count); ends at once, unless `test.fail_if_stop_overran no` | -| 12 | timeout | `test.timeout` seconds of simulation time went by (default 3600) | +| 12 | timeout | `test.timeout` seconds of simulation time went by (default 3600), or `test.wall_timeout` seconds of real time since the start (see below) | | 13 | standstill | every vehicle stood still for `test.standstill` seconds (default 300) and nothing reported a result. Trains waiting at a station or for a signal count as standing, so the limit has to be longer than such waits | | 14 | error | the run could not start: no `-s`, the scenery failed to load or has no vehicles, or the simulator threw | @@ -84,6 +84,7 @@ The limits go in a `config` block of the scenery: ``` config test.timeout 600 +test.wall_timeout 900 test.standstill 120 test.pass_on_standstill no test.fail_if_stop_overran yes @@ -94,12 +95,22 @@ endconfig | key | default | meaning | | --- | --- | --- | | `test.timeout` | 3600 | seconds of simulation time before the test ends as `timeout`; 0 = never | +| `test.wall_timeout` | `test.timeout` + 600 | seconds of real time since the start before the test ends as `timeout`; 0 = never | | `test.standstill` | 300 | seconds with every vehicle still and no result before the test ends as `standstill`; 0 = never | | `test.pass_on_standstill` | no | the standstill end passes the test instead | | `test.fail_if_stop_overran` | yes | a signal passed at danger ends the test; with `no` it's only logged | | `test.no_movement_before_pass` | yes | a pass waits until every vehicle stands still; with `no` it ends the test at once | -`--test-timeout` on the command line wins over `test.timeout` of the scenery. +`--test-timeout` and `--test-wall-timeout` on the command line win over `test.timeout` and +`test.wall_timeout` of the scenery and the settings files. + +`test.wall_timeout` is a watchdog in real time, for a run that hangs or crawls: when the +simulator still runs that many seconds after its start, loading included, it says `test: timeout` +and quits with the timeout code, whatever it is doing at the moment, with no dialog. Not given, +it is `test.timeout` + 600 s: ten minutes for the loading, and a simulation that runs at least as +fast as real time is never cut short by it. With `test.timeout 0` there is no watchdog unless +`test.wall_timeout` is given; `test.wall_timeout 0` turns it off. A test that has ended but whose +simulator doesn't close is ended by the watchdog too, with its own result. A signal is passed at danger when the head of a train goes past a signal which its driver has in its speed table, showing stop. So it's the driver's view that counts: a train without @@ -120,7 +131,7 @@ Python 3.10+, no extra packages. Options: `cmake-build-*/bin/Release/eu07*.exe`. The build needs the `--test` and `-ini` command line options. - name one or more cases to run only those, e.g. `run.py ... eu07_td_timetable`. -- `-j N` runs N cases at once. Each case prints its results when it is done. All 15 cases +- `-j N` runs N cases at once. Each case prints its results when it is done. All 16 cases take about 30 s with `-j 4`, loading included. - `--watch` runs a case the old way, in a visible window in real time (or faster with `--timespeed N`), closed after the case's `duration`; the exit code isn't checked then. For @@ -138,13 +149,15 @@ For each case the runner: added, and the case's `.scn` fragment added: its trainsets after `FirstInit`, everything else (the case's `test_config`, event launchers standing in for keys the scenery expects a player to press, extra events) before it, -2. starts the simulator with `--test -s autotest_.scn -ini out//autotest.ini`, - plus `--test-timeout ` when the case gives a `duration`; the extra ini turns on +2. starts the simulator with `--test -s autotest_.scn -ini out//autotest.ini + --test-wall-timeout `, plus `--test-timeout ` when the case gives a + `duration`; the extra ini turns on `physicslog` and writes the logs to `logs/log (autotest_) .txt` rather than the shared `log.txt` (`multiplelogs`), 3. waits until the simulator quits by itself. It gives up early when the log reports - `Bad vehicle` / `Bad trainset`, when the scenario has loaded and no physicslog appeared, or - after the case's `timeout` of wall-clock time, + `Bad vehicle` / `Bad trainset`, or when the scenario has loaded and no physicslog appeared. + After the case's `timeout` of wall-clock time the simulator ends itself with the timeout code; + one that doesn't is killed 30 s later, 4. compares the result from the exit code with the case's `expect`, then runs the checks on the physicslog. @@ -167,9 +180,9 @@ scenery is newer. | `test_config` | lines of a `config` block added to the scenery, e.g. `["test.timeout 90"]` | | `fragment` | `.scn` file in `cases/` added to the scenery: trainsets after `FirstInit` (before it they derail on unlinked track), the rest before it (launchers read after it never fire) | | `vars` | values for `{{name}}` in the fragment; a list becomes one line per item | -| `expect` | the result the test mode should end with: `pass`, `fail`, `signal_passed_at_danger`, `timeout`, `standstill` or `error`. Default `timeout` for a case with `duration`, else `pass` | +| `expect` | the result the test mode should end with: `pass`, `fail`, `signal_passed_at_danger`, `timeout`, `standstill` or `error`, or `wall_timeout` for the timeout of the real time watchdog (the timeout code with a verdict saying it was the real time; a case expecting `timeout` fails on it). Default `timeout` for a case with `duration`, else `pass` | | `duration` | seconds of simulation to record: the test timeout of the run (`--test-timeout`) | -| `timeout` | wall-clock seconds before giving up, loading included | +| `timeout` | wall-clock seconds before giving up, loading included: the simulator's `--test-wall-timeout` (default 600) | | `fail_on_errors` | fail when `errors.txt` is not empty (default `false`) | | `checks` | list of checks, below | @@ -190,7 +203,8 @@ on `tor1k`, the track in front of the signal. The `test_mode_*` cases show the ends of the test mode: `test_mode_pass` (exit 0, the pass event), `test_mode_signal_passed_at_danger` (exit 11), `test_mode_timeout` (exit 12, from -`test.timeout`) and `test_mode_standstill` (exit 13, from `test.standstill`). +`test.timeout`), `test_mode_standstill` (exit 13, from `test.standstill`) and +`test_mode_wall_timeout` (exit 12 from the real time watchdog, which ends it while it loads). `test_mode_pass_while_moving` reports the pass from `event2` of `tor1k` (the direction the train runs), as the train runs onto it, with `test.no_movement_before_pass no`, so the test ends with the train still moving. diff --git a/tests/scenarios/cases/test_mode_wall_timeout.json b/tests/scenarios/cases/test_mode_wall_timeout.json new file mode 100644 index 000000000..078ccca93 --- /dev/null +++ b/tests/scenarios/cases/test_mode_wall_timeout.json @@ -0,0 +1,11 @@ +{ + "description": "Test mode, real time limit: EU07 on td.scn, with a limit of 2 s of real time (the case's timeout, which the runner passes as --test-wall-timeout). The scenery takes longer to load, so the simulator's watchdog ends the run while it loads, with the timeout code and a verdict saying it was the real time.", + "base_scenery": "td.scn", + "time": "10:34", + "fragment": "td_red_signal.scn", + "vars": { + "consist": "node -1 0 {{vehicle}} dynamic pkp\\4e_v1 4e-004 4e 0 headdriver 0 0 enddynamic" + }, + "expect": "wall_timeout", + "timeout": 2 +} diff --git a/tests/scenarios/run.py b/tests/scenarios/run.py index 9cc6f84a9..62cb7d135 100644 --- a/tests/scenarios/run.py +++ b/tests/scenarios/run.py @@ -61,6 +61,10 @@ EXIT_RESULTS = { 13: "standstill", 14: "error", } +# the timeout of the simulator's real time watchdog (test.wall_timeout) has the timeout code too; told +# apart by its verdict, so a run that hung doesn't pass a case that expects the simulation time to run out +WALL_TIMEOUT = "wall_timeout" +RESULTS = (*EXIT_RESULTS.values(), WALL_TIMEOUT) # settings layered over the game's eu07.ini for a test run (test mode doesn't read the player's own # in %APPDATA%); the window ones only matter @@ -226,6 +230,8 @@ FATAL_LOG_LINES = ("Bad vehicle:", "Bad trainset:") # time" in the log is not the end of loading (the trainsets after FirstInit still follow), # and with several simulators loading at once the first rows took well over 15 s STARTUP_TIMEOUT = 120.0 +# wall seconds past a case's timeout before the runner kills a simulator that didn't end itself +KILL_GRACE = 30.0 @dataclass @@ -246,7 +252,8 @@ def run_simulator(exe: Path, game_dir: Path, scenery: str, ini: Path, physicslog if watch: cmd = [str(exe), "-s", scenery, "-v", "ghostview", "-ini", str(ini)] else: - cmd = [str(exe), "--test", "-s", scenery, "-ini", str(ini)] + # the simulator's own watchdog ends a run that takes too long, with the timeout code and its verdict + cmd = [str(exe), "--test", "-s", scenery, "-ini", str(ini), "--test-wall-timeout", f"{timeout:g}"] if duration is not None: cmd += ["--test-timeout", f"{duration:g}"] say(" $ " + " ".join(f'"{c}"' if " " in c else c for c in cmd), progress=True) @@ -272,8 +279,9 @@ def run_simulator(exe: Path, game_dir: Path, scenery: str, ini: Path, physicslog break if watch and sim_t >= duration: break - if wall > timeout: - result.failure = f"timed out after {timeout:.0f}s before {duration}s of simulation" + # in test mode a little later than the simulator's own limit, for a run that can't even end itself + if wall > timeout + (0 if watch else KILL_GRACE): + result.failure = f"timed out after {wall:.0f}s before {duration}s of simulation" break if not result.rows: result.logs = find_logs(game_dir, scenery, since) @@ -506,8 +514,8 @@ def run_case(name: str, exe: Path, game_dir: Path, timespeed: float, watch: bool # a case that only records `duration` seconds ends on the test timeout; one that says # how the test ends (a pass event, a signal passed at danger...) expects that result expect = case.get("expect", "timeout" if duration is not None else "pass") - if expect not in EXIT_RESULTS.values(): - sys.exit(f"{name}: expect must be one of {', '.join(EXIT_RESULTS.values())}") + if expect not in RESULTS: + sys.exit(f"{name}: expect must be one of {', '.join(RESULTS)}") if watch and duration is None: sys.exit(f"{name}: --watch needs a case with duration") result = run_simulator(exe, game_dir, scenery, ini, physicslog, @@ -530,8 +538,11 @@ def run_case(name: str, exe: Path, game_dir: Path, timespeed: float, watch: bool if result.verdict: say(f" {result.verdict}") got = EXIT_RESULTS.get(result.exit_code) if result.exit_code is not None else None + if got == "timeout" and "of real time" in result.verdict: + got = WALL_TIMEOUT passed = got == expect - say(f" {'PASS' if passed else 'FAIL'} exit code {describe_exit(result.exit_code)}, expected {expect}") + watchdog = ", from the real time watchdog" if got == WALL_TIMEOUT else "" + say(f" {'PASS' if passed else 'FAIL'} exit code {describe_exit(result.exit_code)}{watchdog}, expected {expect}") ok &= passed if result.failure: say(f" FAIL {result.failure}") diff --git a/tests/unit/test_test_mode.cpp b/tests/unit/test_test_mode.cpp index 609b16ff0..55a90387e 100644 --- a/tests/unit/test_test_mode.cpp +++ b/tests/unit/test_test_mode.cpp @@ -80,17 +80,19 @@ TEST_CASE("test mode: the command line") CHECK_FALSE(commandline.enabled); CHECK(commandline.error.empty()); } - SUBCASE("--test and its limit, in any order") + SUBCASE("--test and its limits, in any order") { - auto const commandline{parse({"-s", "td.scn", "--test-timeout", "240", "--test"})}; + auto const commandline{parse({"--test-wall-timeout", "900", "-s", "td.scn", "--test", "--test-timeout", "240"})}; CHECK(commandline.enabled); CHECK(commandline.timeout == 240.0); + CHECK(commandline.wall_timeout == 900.0); CHECK(commandline.error.empty()); } SUBCASE("a limit not given stays unset") { auto const commandline{parse({"--test", "-s", "td.scn"})}; CHECK_FALSE(commandline.timeout.has_value()); + CHECK_FALSE(commandline.wall_timeout.has_value()); } SUBCASE("a limit which isn't a number is an error, not a limit turned off") { @@ -101,12 +103,17 @@ TEST_CASE("test mode: the command line") } SUBCASE("a limit without its value is an error") { - auto const commandline{parse({"--test", "-s", "td.scn", "--test-timeout"})}; + auto const commandline{parse({"--test", "-s", "td.scn", "--test-wall-timeout"})}; + CHECK(commandline.error == "--test-wall-timeout needs a number of seconds"); + } + SUBCASE("the first error is the one told") + { + auto const commandline{parse({"--test", "--test-timeout", "x", "--test-wall-timeout", "y"})}; CHECK(commandline.error == "--test-timeout needs a number of seconds"); } SUBCASE("values of other options aren't taken for options") { - auto const commandline{parse({"-s", "--test", "-ini", "--test-timeout", "-v", "--test", "-seed", "--test"})}; + auto const commandline{parse({"-s", "--test", "-ini", "--test-timeout", "-v", "--test-wall-timeout", "-seed", "--test"})}; CHECK_FALSE(commandline.enabled); CHECK(commandline.error.empty()); } @@ -117,6 +124,25 @@ TEST_CASE("test mode: the command line") } } +TEST_CASE("test mode: the real time limit") +{ + SUBCASE("given, it is the limit, 0 turns it off") + { + CHECK(simulation::wall_clock_limit(120.0, 3600.0) == 120.0); + CHECK(simulation::wall_clock_limit(0.0, 3600.0) == 0.0); + } + SUBCASE("not given, it is the simulation time limit and time for the loading") + { + CHECK(simulation::wall_clock_limit(std::nullopt, 240.0) == 240.0 + simulation::wall_timeout_loading_allowance); + CHECK(simulation::wall_clock_limit(std::nullopt, 3600.0) == 3600.0 + simulation::wall_timeout_loading_allowance); + } + SUBCASE("no simulation time limit, no real time limit unless given") + { + CHECK(simulation::wall_clock_limit(std::nullopt, 0.0) == 0.0); + CHECK(simulation::wall_clock_limit(300.0, 0.0) == 300.0); + } +} + TEST_CASE("test mode: the end conditions") { simulation::test_limits limits; diff --git a/utilities/Globals.cpp b/utilities/Globals.cpp index 3a9e10145..217374cb6 100644 --- a/utilities/Globals.cpp +++ b/utilities/Globals.cpp @@ -468,6 +468,15 @@ bool global_settings::ConfigParseTest(cParser& Parser, std::string_view const To return true; } + if (Token == "test.wall_timeout") + { + double value{ 0.0 }; + ParseOne(Parser, value); + if (false == test.wall_timeout_from_command_line) + test.wall_timeout = std::max(0.0, value); + return true; + } + if (Token == "test.standstill") { ParseOne(Parser, test.standstill); @@ -1786,6 +1795,9 @@ global_settings::export_as_text( std::ostream &Output ) const { // TODO: export fpslimit export_as_text( Output, "randomseed", Global.random_seed ); export_as_text( Output, "test.timeout", test.timeout ); + if( test.wall_timeout.has_value() ) { + export_as_text( Output, "test.wall_timeout", *test.wall_timeout ); + } export_as_text( Output, "test.standstill", test.standstill ); export_as_text( Output, "test.pass_on_standstill", test.pass_on_standstill ); export_as_text( Output, "test.fail_if_stop_overran", test.fail_if_stop_overran ); diff --git a/utilities/Globals.h b/utilities/Globals.h index 11d14e34f..81bc1e475 100644 --- a/utilities/Globals.h +++ b/utilities/Globals.h @@ -16,6 +16,7 @@ http://mozilla.org/MPL/2.0/. #include "utilities/utilities.h" #include "utilities/motiontelemetry.h" #include +#include #ifdef WITH_UART #include "utilities/uart.h" @@ -95,6 +96,8 @@ struct global_settings { bool fail_if_stop_overran{ true }; // a train passing a signal at stop ends the test as failed; with false it's only logged bool no_movement_before_pass{ true }; // a pass waits until every vehicle stands still; with false it ends the test at once bool timeout_from_command_line{ false }; // --test-timeout given, the scenery doesn't override it + std::optional wall_timeout; // [s] of real time since the start; none = test.timeout + time for the loading, 0 = no limit + bool wall_timeout_from_command_line{ false }; // --test-wall-timeout given, the scenery doesn't override it }; test_settings test; bool editor_tracks{ false }; // F3 track workspace: draw and pick tracks without the scenery draw-range cap From e5aafd154f058ae801093fe2032dbe56f3751e3e Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 11:39:52 +0100 Subject: [PATCH 337/430] feat(simulation): the pass and the standstill wait for the train under test only Both waited for every vehicle of the scenery to stand still, so on a scenery with AI traffic a test could pass only when the traffic happened to stand too, and the standstill end hardly ever came. A test scenery names the train under test with test.vehicle in its config block (once for each train, if several): the pass and the standstill wait for the consists of these vehicles as they are at the moment, so a train the tested one couples to counts with it. A name the scenery doesn't have ends the test with the error code. Without test.vehicle every vehicle counts, as before. A signal passed at danger counts for every train either way. run.py puts the case's lead vehicle into test.vehicle. test_mode_standstill_traffic has the train under test standing on track 2 of Stacja1 while AI traffic leaves track 1 on the timetable: it ends on its 100 s standstill, where counting every vehicle runs into the 300 s timeout. Physicslogs of the other trains of a case (_) are moved out of the game dir too. --- simulation/simulationtest.cpp | 38 +++++++++++++++++-- simulation/simulationtest.h | 2 + simulation/simulationtestrules.cpp | 4 +- simulation/simulationtestrules.h | 14 +++---- tests/scenarios/README.md | 28 +++++++++----- tests/scenarios/cases/td_traffic.scn | 13 +++++++ .../scenarios/cases/test_mode_standstill.json | 2 +- .../cases/test_mode_standstill_traffic.json | 18 +++++++++ tests/scenarios/run.py | 10 +++-- tests/unit/test_test_mode.cpp | 2 +- utilities/Globals.cpp | 14 +++++++ utilities/Globals.h | 5 ++- 12 files changed, 120 insertions(+), 30 deletions(-) create mode 100644 tests/scenarios/cases/td_traffic.scn create mode 100644 tests/scenarios/cases/test_mode_standstill_traffic.json diff --git a/simulation/simulationtest.cpp b/simulation/simulationtest.cpp index 15cdf0e3f..89a8a1046 100644 --- a/simulation/simulationtest.cpp +++ b/simulation/simulationtest.cpp @@ -33,6 +33,11 @@ http://mozilla.org/MPL/2.0/. namespace { +bool is_moving(TDynamicObject const *Vehicle) +{ + return std::abs(Vehicle->GetVelocity()) > 0.01; +} + // [s] of real time since the start of the simulator double elapsed_wall_time() { @@ -117,10 +122,25 @@ void test_manager::start() finish(test_result::error, "the scenery has no vehicles"); return; } + for (auto const &name : Global.test.vehicles) + { + if (simulation::Vehicles.find(name) == nullptr) + { + finish(test_result::error, std::format("the scenery has no vehicle {} (test.vehicle)", name)); + return; + } + } // a pause set by the scenery or the settings would never be lifted, nobody is there to press the key Global.iPause = 0; + auto tested { std::string("every vehicle") }; + if (false == Global.test.vehicles.empty()) + { + tested = "the consists of"; + for (auto const &name : Global.test.vehicles) + tested += " " + name; + } auto const walllimit { m_walllimit.load() }; - WriteLog(std::format("test: started, timeout {:.0f} s, real time limit {}, standstill {:.0f} s{}{}{}", Global.test.timeout, + WriteLog(std::format("test: started, testing {}, timeout {:.0f} s, real time limit {}, standstill {:.0f} s{}{}{}", tested, Global.test.timeout, walllimit > 0.0 ? std::format("{:.0f} s", walllimit) : std::string("none"), Global.test.standstill, Global.test.pass_on_standstill ? ", standstill passes" : "", Global.test.fail_if_stop_overran ? "" : ", signals passed at danger allowed", @@ -132,8 +152,7 @@ void test_manager::update(double const Deltatime) if (false == m_started || m_finished) return; - test_frame frame { Deltatime, std::nullopt, {}, - std::ranges::none_of(simulation::Vehicles.sequence(), [](TDynamicObject const *Vehicle) { return std::abs(Vehicle->GetVelocity()) > 0.01; }) }; + test_frame frame { Deltatime, std::nullopt, {}, tested_trains_at_rest() }; if (auto const *cell = simulation::Memory.find(std::string(result_cell))) { frame.reported = cell->Value1(); @@ -156,11 +175,22 @@ void test_manager::update(double const Deltatime) } if (passrequested) { - WriteLog(std::format("test: pass requested at {:.1f} s{}, waiting for every vehicle to stop", m_progress.time, + WriteLog(std::format("test: pass requested at {:.1f} s{}, waiting for the tested trains to stop", m_progress.time, frame.reason.empty() ? std::string() : std::format(" ({})", frame.reason))); } } +bool test_manager::tested_trains_at_rest() const +{ + if (Global.test.vehicles.empty()) + return std::ranges::none_of(simulation::Vehicles.sequence(), is_moving); + // the consists as they are now: a train the tested one couples to joins it, one it leaves behind doesn't + return std::ranges::none_of(Global.test.vehicles, [](std::string const &Name) { + auto *vehicle { simulation::Vehicles.find(Name) }; + return vehicle != nullptr && vehicle->find_vehicle(coupling::coupler, is_moving) != nullptr; + }); +} + void test_manager::signal_passed_at_danger(std::string_view const Vehicle, std::string_view const Signal) { auto const reason { std::format("{} passed signal {} at danger", Vehicle, Signal) }; diff --git a/simulation/simulationtest.h b/simulation/simulationtest.h index a59ec87bf..784cd39e8 100644 --- a/simulation/simulationtest.h +++ b/simulation/simulationtest.h @@ -52,6 +52,8 @@ public: private: // the watchdog's check, at Elapsed seconds of real time since the start of the simulator void check_wall_clock(double Elapsed); + // every vehicle of the tested trains stands: the consists of test.vehicle, or every vehicle without it + bool tested_trains_at_rest() const; // the watchdog may end the test from its own thread mutable std::mutex m_lock; diff --git a/simulation/simulationtestrules.cpp b/simulation/simulationtestrules.cpp index eba1d7dd3..cdfea0e3b 100644 --- a/simulation/simulationtestrules.cpp +++ b/simulation/simulationtestrules.cpp @@ -138,9 +138,9 @@ std::optional evaluate_frame(test_progress &Progress, test_frame c Progress.resttime = Frame.atrest ? Progress.resttime + Frame.deltatime : 0.0; if (Progress.passrequested && Progress.resttime >= pass_settle_time) - return test_verdict{pass, "__test.result set to 1 and every vehicle stopped"}; + return test_verdict{pass, "__test.result set to 1 and the tested trains stopped"}; if (Limits.standstill > 0.0 && Progress.resttime >= Limits.standstill) - return test_verdict{Limits.pass_on_standstill ? pass : standstill, std::format("every vehicle stood still for {:.0f} s", Limits.standstill)}; + return test_verdict{Limits.pass_on_standstill ? pass : standstill, std::format("the tested trains stood still for {:.0f} s", Limits.standstill)}; if (Limits.timeout > 0.0 && Progress.time >= Limits.timeout) return test_verdict{timeout, std::format("no result after {:.0f} s", Limits.timeout)}; return std::nullopt; diff --git a/simulation/simulationtestrules.h b/simulation/simulationtestrules.h index 52adf27a8..153dc8a42 100644 --- a/simulation/simulationtestrules.h +++ b/simulation/simulationtestrules.h @@ -22,11 +22,11 @@ namespace simulation { // when it goes wrong on its own: 1 (killed with TerminateProcess, or a plain failure of most programs), 3 (abort() // on Windows), 126-127 (a shell that can't run the program) or 128 + a signal number (killed, on Linux) enum class test_result : int { - pass = 0, // __test.result set to 1, then every vehicle came to rest (or test.pass_on_standstill) + pass = 0, // __test.result set to 1, then the tested trains came to rest (or test.pass_on_standstill) fail = 10, // __test.result set to 0 signal_passed_at_danger = 11, // a train went past a stop signal (SetVelocity 0 0), unless test.fail_if_stop_overran no timeout = 12, // test.timeout seconds of simulation time, or test.wall_timeout seconds of real time went by - standstill = 13, // every vehicle stood still for test.standstill seconds without a result + standstill = 13, // the tested trains stood still for test.standstill seconds without a result error = 14, // the run could not start (a bad command line, the scenery failed to load) or the simulator threw }; @@ -64,7 +64,7 @@ double wall_clock_limit(std::optional Given, double Simulationtimeout); // the limits and switches the end conditions go by struct test_limits { double timeout{3600.0}; // [s] of simulation time; 0 = never - double standstill{300.0}; // [s] of every vehicle standing without a result; 0 = never + double standstill{300.0}; // [s] of the tested trains standing without a result; 0 = never bool pass_on_standstill{false}; bool no_movement_before_pass{true}; }; @@ -74,17 +74,17 @@ struct test_frame { double deltatime{0.0}; // [s] of simulation time std::optional reported; // value of the result cell, if there is one std::string_view reason; // text of the result cell - bool atrest{false}; // every vehicle stands + bool atrest{false}; // every vehicle of the tested trains stands (test.vehicle; every vehicle without it) }; // the state of a test between frames struct test_progress { double time{0.0}; // simulation time since the start [s] - double resttime{0.0}; // how long every vehicle has been standing [s] - bool passrequested{false}; // __test.result was set to 1, the pass waits for the vehicles to stop + double resttime{0.0}; // how long the tested trains have been standing [s] + bool passrequested{false}; // __test.result was set to 1, the pass waits for the tested trains to stop }; -// how long everything has to stand before a requested pass is granted [s] +// how long the tested trains have to stand before a requested pass is granted [s] inline constexpr double pass_settle_time{1.0}; // checks the end conditions after a frame and moves the progress on. returns the verdict once the test is over diff --git a/tests/scenarios/README.md b/tests/scenarios/README.md index 5eed983e1..c1226e637 100644 --- a/tests/scenarios/README.md +++ b/tests/scenarios/README.md @@ -67,11 +67,11 @@ The test ends with the first of these: | exit code | result | when | | --- | --- | --- | -| 0 | pass | `__test.result` was set to 1 and then every vehicle stood still for 1 s, so a train still moving towards a signal at stop has to stop first (with `test.no_movement_before_pass no` the pass ends the test at once). Also the standstill end with `test.pass_on_standstill yes` | +| 0 | pass | `__test.result` was set to 1 and then the tested trains stood still for 1 s, so a train still moving towards a signal at stop has to stop first (with `test.no_movement_before_pass no` the pass ends the test at once). Also the standstill end with `test.pass_on_standstill yes` | | 10 | fail | `__test.result` was set to 0; ends at once | | 11 | signal passed at danger | a train went past a signal showing stop (`SetVelocity 0 0`; `SetVelocity 0 x` on automatic block, which may be passed after a stop, doesn't count); ends at once, unless `test.fail_if_stop_overran no` | | 12 | timeout | `test.timeout` seconds of simulation time went by (default 3600), or `test.wall_timeout` seconds of real time since the start (see below) | -| 13 | standstill | every vehicle stood still for `test.standstill` seconds (default 300) and nothing reported a result. Trains waiting at a station or for a signal count as standing, so the limit has to be longer than such waits | +| 13 | standstill | the tested trains stood still for `test.standstill` seconds (default 300) and nothing reported a result. Trains waiting at a station or for a signal count as standing, so the limit has to be longer than such waits | | 14 | error | the run could not start: no `-s`, the scenery failed to load or has no vehicles, or the simulator threw | A crash ends with the system's code instead (on Windows e.g. `0xC0000005`, -1073741819). The @@ -89,6 +89,7 @@ test.standstill 120 test.pass_on_standstill no test.fail_if_stop_overran yes test.no_movement_before_pass yes +test.vehicle ep07-424 endconfig ``` @@ -96,10 +97,11 @@ endconfig | --- | --- | --- | | `test.timeout` | 3600 | seconds of simulation time before the test ends as `timeout`; 0 = never | | `test.wall_timeout` | `test.timeout` + 600 | seconds of real time since the start before the test ends as `timeout`; 0 = never | -| `test.standstill` | 300 | seconds with every vehicle still and no result before the test ends as `standstill`; 0 = never | +| `test.standstill` | 300 | seconds with the tested trains still and no result before the test ends as `standstill`; 0 = never | | `test.pass_on_standstill` | no | the standstill end passes the test instead | | `test.fail_if_stop_overran` | yes | a signal passed at danger ends the test; with `no` it's only logged | -| `test.no_movement_before_pass` | yes | a pass waits until every vehicle stands still; with `no` it ends the test at once | +| `test.no_movement_before_pass` | yes | a pass waits until the tested trains stand still; with `no` it ends the test at once | +| `test.vehicle` | none | a vehicle of a train under test, by its name in the scenery (once for each train under test). The tested trains are the consists of these vehicles as they are at the moment (a train the tested one couples to joins it), and only they count for the pass and the standstill: other trains, AI traffic, may run on. A name the scenery doesn't have ends the test with `error`. Not given, every vehicle of the scenery counts. A signal passed at danger counts for every train either way | `--test-timeout` and `--test-wall-timeout` on the command line win over `test.timeout` and `test.wall_timeout` of the scenery and the settings files. @@ -131,14 +133,15 @@ Python 3.10+, no extra packages. Options: `cmake-build-*/bin/Release/eu07*.exe`. The build needs the `--test` and `-ini` command line options. - name one or more cases to run only those, e.g. `run.py ... eu07_td_timetable`. -- `-j N` runs N cases at once. Each case prints its results when it is done. All 16 cases +- `-j N` runs N cases at once. Each case prints its results when it is done. All 17 cases take about 30 s with `-j 4`, loading included. - `--watch` runs a case the old way, in a visible window in real time (or faster with `--timespeed N`), closed after the case's `duration`; the exit code isn't checked then. For watching what a case does. Exit code is 0 when every case passed. Logs of each run (`log.txt`, `errors.txt`, -`stdout.txt`, the vehicle's physicslog) are moved to `tests/scenarios/out//`. +`stdout.txt`, the physicslogs of the vehicle and of other trains of the case) are moved to +`tests/scenarios/out//`. ## How it works @@ -177,7 +180,7 @@ scenery is newer. | `time` | replace the scenery start time, `HH:MM` | | `track_friction` | set the friction of every track of the base scenery (default in the sceneries is 0.15), e.g. for slippery rail | | `track_events` | lines added to tracks of the base scenery, by track name, e.g. `{ "tor1k": "event0 test_pass" }`; only tracks in the scenery file itself, not in its includes | -| `test_config` | lines of a `config` block added to the scenery, e.g. `["test.timeout 90"]` | +| `test_config` | lines of a `config` block added to the scenery, e.g. `["test.timeout 90"]`; the block always has `test.vehicle` with the case's lead vehicle, so only its train counts for the pass and the standstill | | `fragment` | `.scn` file in `cases/` added to the scenery: trainsets after `FirstInit` (before it they derail on unlinked track), the rest before it (launchers read after it never fire) | | `vars` | values for `{{name}}` in the fragment; a list becomes one line per item | | `expect` | the result the test mode should end with: `pass`, `fail`, `signal_passed_at_danger`, `timeout`, `standstill` or `error`, or `wall_timeout` for the timeout of the real time watchdog (the timeout code with a verdict saying it was the real time; a case expecting `timeout` fails on it). Default `timeout` for a case with `duration`, else `pass` | @@ -187,15 +190,16 @@ scenery is newer. | `checks` | list of checks, below | `{{vehicle}}` is always set, also inside `vars` values: the node name of the lead vehicle, -the one whose physicslog is checked. Other vehicles of the consist take names made from it, -e.g. `{{vehicle}}_s`. The td.scn cases share two fragments, `td_timetable.scn` (route set, +the one whose physicslog is checked, and the train under test (`test.vehicle`). Other vehicles +of the consist take names made from it, e.g. `{{vehicle}}_s`; another train with a driver is named +`_{{vehicle}}`, so its physicslog is moved out of the game dir too. The td.scn cases share two fragments, `td_timetable.scn` (route set, train runs to Przystanek) and `td_red_signal.scn` (no route, exit signal at stop), and differ only in `vars.consist`. Przystanek is a technical stop in that timetable (`pt`), where the AI doesn't wait for the departure time: it sets off as soon as it counts the train as standing at the W4, which is below 1 km/h, so the train stands there for a few seconds at most, or doesn't quite stop (since the AI braking of #264 the SN61 turns back at 0.4 km/h). The timetable cases therefore check that the train comes down to 1 km/h, with no hold, 1380-1420 m -from the start (every vehicle stops at 1397-1401 m). `td_red_signal_moving.scn` is the red signal one with the train +from the start (each of the seven trains stops at 1397-1401 m). `td_red_signal_moving.scn` is the red signal one with the train starting at `vars.velocity` km/h; with `track_friction` 0.03 it locks the wheels when braking and slides past the signal, so those cases set `test.fail_if_stop_overran no`. `td_red_signal_pass.scn` adds the `test_pass` event, which `test_mode_pass` puts as `event0` @@ -205,6 +209,10 @@ The `test_mode_*` cases show the ends of the test mode: `test_mode_pass` (exit 0 event), `test_mode_signal_passed_at_danger` (exit 11), `test_mode_timeout` (exit 12, from `test.timeout`), `test_mode_standstill` (exit 13, from `test.standstill`) and `test_mode_wall_timeout` (exit 12 from the real time watchdog, which ends it while it loads). +`test_mode_standstill_traffic` (fragment `td_traffic.scn`) has a train under test standing on +track 2 of Stacja1 and AI traffic, `traffic_{{vehicle}}`, leaving track 1 on the timetable: the +standstill of 100 s ends the test although the traffic runs on (counting every vehicle, it runs +into the test timeout). `test_mode_pass_while_moving` reports the pass from `event2` of `tor1k` (the direction the train runs), as the train runs onto it, with `test.no_movement_before_pass no`, so the test ends with the train still moving. diff --git a/tests/scenarios/cases/td_traffic.scn b/tests/scenarios/cases/td_traffic.scn new file mode 100644 index 000000000..49720a0b5 --- /dev/null +++ b/tests/scenarios/cases/td_traffic.scn @@ -0,0 +1,13 @@ +// added by tests/scenarios/run.py to td.scn, whose own trainsets were removed: two trains at Stacja1. +// the train under test (test.vehicle) stands on track 2, where its driver has nothing to do; the other one, +// AI traffic, has the td/rozklad timetable on track 1 and leaves for Przystanek at 10:35. the standstill of +// the test waits for the train under test only, so the traffic running on doesn't hold it up. +trainset none tor2k 30.0 0.0 +node -1 0 {{vehicle}} dynamic pkp\4e_v1 4e-004 4e 0 headdriver 0 0 enddynamic +endtrainset +trainset td/rozklad tdo_n1734 0.0 0.1 +node -1 0 traffic_{{vehicle}} dynamic pkp\4e_v1 4e-004 4e 0 headdriver 0 0 enddynamic +endtrainset + +// the way out of track 1 for the traffic, see td_timetable.scn +node -1 0 autotest_route eventlauncher 0 0 0 -1 none 1034 keyctrl04 end diff --git a/tests/scenarios/cases/test_mode_standstill.json b/tests/scenarios/cases/test_mode_standstill.json index 0d96585ee..4dd891cf0 100644 --- a/tests/scenarios/cases/test_mode_standstill.json +++ b/tests/scenarios/cases/test_mode_standstill.json @@ -1,5 +1,5 @@ { - "description": "Test mode, standstill: EU07 on td.scn with no route set stops before the exit signal stacja1_j at stop and stays; nothing reports a result, so the test ends once every vehicle stood still for test.standstill 120 seconds (the train waits about 70 s before it pulls off, so less would end it before the start).", + "description": "Test mode, standstill: EU07 on td.scn with no route set stops before the exit signal stacja1_j at stop and stays; nothing reports a result, so the test ends once the train under test stood still for test.standstill 120 seconds (the train waits about 70 s before it pulls off, so less would end it before the start).", "base_scenery": "td.scn", "time": "10:34", "fragment": "td_red_signal.scn", diff --git a/tests/scenarios/cases/test_mode_standstill_traffic.json b/tests/scenarios/cases/test_mode_standstill_traffic.json new file mode 100644 index 000000000..8b545e2a5 --- /dev/null +++ b/tests/scenarios/cases/test_mode_standstill_traffic.json @@ -0,0 +1,18 @@ +{ + "description": "Test mode, standstill with traffic: an EU07 stands on track 2 of Stacja1 on td.scn while another EU07, AI traffic, leaves track 1 on the td/rozklad timetable at 10:35 and runs on. Only the train under test (test.vehicle, the case's vehicle) counts, so the test ends on test.standstill 100 although the traffic is moving; counting every vehicle, it would run into the 300 s test timeout.", + "base_scenery": "td.scn", + "time": "10:34", + "fragment": "td_traffic.scn", + "test_config": [ + "test.standstill 100" + ], + "expect": "standstill", + "duration": 300, + "timeout": 600, + "checks": [ + { + "type": "max_speed", + "limit": 0.5 + } + ] +} diff --git a/tests/scenarios/run.py b/tests/scenarios/run.py index 62cb7d135..3757a8249 100644 --- a/tests/scenarios/run.py +++ b/tests/scenarios/run.py @@ -158,9 +158,10 @@ def build_scenery(case: dict, game_dir: Path, case_name: str, vehicle: str) -> s # events of the case go in before it (read after it they never fire), trainsets after it # (placed before it they stand on unlinked track and derail at once) before, trainsets = split_trainsets(fragment) - if case.get("test_config"): - # settings of the test mode (test.timeout and so on), read like any other config block - before = "config\n" + "".join(line + "\n" for line in case["test_config"]) + "endconfig\n" + before + # settings of the test mode, read like any other config block: the case's vehicle is the train under test, + # whose consist the pass and the standstill wait for, and the case's own (test.timeout and so on) + config = [f"test.vehicle {vehicle}", *case.get("test_config", [])] + before = "config\n" + "".join(line + "\n" for line in config) + "endconfig\n" + before header = f"\n// ---- autotest: {case_name} ----\n" firstinit = re.search(r"(?im)^\s*firstinit\b", text) if firstinit: @@ -526,6 +527,9 @@ def run_case(name: str, exe: Path, game_dir: Path, timespeed: float, watch: bool shutil.move(path, out / f"{kind}.txt") if physicslog.exists(): shutil.move(physicslog, out / physicslog.name) + # other trains of the case with a driver, named _, log too + for other in physicslog.parent.glob(f"*_{vehicle}.dat"): + shutil.move(other, out / other.name) ok = True sim_t = result.rows[-1][COL_TIME] if result.rows else 0.0 diff --git a/tests/unit/test_test_mode.cpp b/tests/unit/test_test_mode.cpp index 55a90387e..27e8c0d96 100644 --- a/tests/unit/test_test_mode.cpp +++ b/tests/unit/test_test_mode.cpp @@ -167,7 +167,7 @@ TEST_CASE("test mode: the end conditions") CHECK(verdict->result == test_result::fail); CHECK(verdict->reason == "__test.result set to 0 (wrong_track)"); } - SUBCASE("1 passes once every vehicle has stood for a second") + SUBCASE("1 passes once the tested trains have stood for a second") { CHECK_FALSE(simulation::evaluate_frame(progress, frame(false, 1.0), limits).has_value()); CHECK(progress.passrequested); diff --git a/utilities/Globals.cpp b/utilities/Globals.cpp index 217374cb6..8957a4a0e 100644 --- a/utilities/Globals.cpp +++ b/utilities/Globals.cpp @@ -477,6 +477,17 @@ bool global_settings::ConfigParseTest(cParser& Parser, std::string_view const To return true; } + if (Token == "test.vehicle") + { + // a vehicle of a train under test, by its name in the scenery; the pass and the standstill wait for its + // consist only, not for other trains (eu07/maszyna#541). given more than once, for each of them + std::string name; + ParseOne(Parser, name, 1, true); + if (false == name.empty() && std::ranges::find(test.vehicles, name) == test.vehicles.end()) + test.vehicles.emplace_back(name); + return true; + } + if (Token == "test.standstill") { ParseOne(Parser, test.standstill); @@ -1802,6 +1813,9 @@ global_settings::export_as_text( std::ostream &Output ) const { export_as_text( Output, "test.pass_on_standstill", test.pass_on_standstill ); export_as_text( Output, "test.fail_if_stop_overran", test.fail_if_stop_overran ); export_as_text( Output, "test.no_movement_before_pass", test.no_movement_before_pass ); + for( auto const &vehicle : test.vehicles ) { + export_as_text( Output, "test.vehicle", vehicle ); + } export_as_text( Output, "gfx.envmap.enabled", gfx_envmap_enabled ); export_as_text( Output, "gfx.postfx.motionblur.enabled", gfx_postfx_motionblur_enabled ); export_as_text( Output, "gfx.postfx.motionblur.shutter", gfx_postfx_motionblur_shutter ); diff --git a/utilities/Globals.h b/utilities/Globals.h index 81bc1e475..50e42085b 100644 --- a/utilities/Globals.h +++ b/utilities/Globals.h @@ -91,10 +91,11 @@ struct global_settings { struct test_settings { bool enabled{ false }; double timeout{ 3600.0 }; // [s] of simulation time; no result by then fails the test - double standstill{ 300.0 }; // [s] every vehicle standing still this long ends the test; 0 = never + double standstill{ 300.0 }; // [s] the tested trains standing still this long ends the test; 0 = never bool pass_on_standstill{ false }; // the standstill end passes the test instead of failing it bool fail_if_stop_overran{ true }; // a train passing a signal at stop ends the test as failed; with false it's only logged - bool no_movement_before_pass{ true }; // a pass waits until every vehicle stands still; with false it ends the test at once + bool no_movement_before_pass{ true }; // a pass waits until the tested trains stand still; with false it ends the test at once + std::vector vehicles; // test.vehicle: the trains under test are the consists of these; none = every vehicle bool timeout_from_command_line{ false }; // --test-timeout given, the scenery doesn't override it std::optional wall_timeout; // [s] of real time since the start; none = test.timeout + time for the loading, 0 = no limit bool wall_timeout_from_command_line{ false }; // --test-wall-timeout given, the scenery doesn't override it From 349ffb1caf0ec40a8c350a29e36ca7cce383e38a Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 11:40:13 +0100 Subject: [PATCH 338/430] fix(simulation): on Linux an exception ends a test run with its verdict too The runtime_error the simulator throws on a fatal problem was caught on Windows only. On Linux a test run aborted on it, with the code of abort() and no `test:` line. It is caught there too in test mode and ends the test with the error code and the reason; outside a test it is thrown on as before. --- EU07.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index 0fbabba5b..4bc453867 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -164,20 +164,25 @@ int main(int argc, char *argv[]) { ErrorLog("Critical error, memory allocation failure: " + std::string(Error.what())); } -#ifdef _WIN32 catch (std::runtime_error const &Error) { +#ifndef _WIN32 + // outside a test the error ends the program as it always did there, uncaught + if (false == Global.test.enabled) + throw; +#endif ErrorLog(std::format("Critical error: {}", Error.what())); // in test mode nobody is there to close the box, the exit code tells of the error simulation::test().conclude(simulation::test_result::error, std::format("critical error: {}", Error.what())); +#ifdef _WIN32 if (false == Global.test.enabled) { std::string msg = "Simulator crash occured :(\n"; msg += Error.what(); MessageBoxA(nullptr, msg.c_str(), "Simulator crashed :(", MB_ICONERROR); } - } #endif + } } #ifndef _WIN32 fflush(stdout); From cea92f017011389d37deecf72926b61bbd291080 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 11:57:03 +0100 Subject: [PATCH 339/430] test(unit): the test mode tests compare seconds with a tolerance Floating point values of the command line, the real time limit and the standstill clock are checked with doctest::Approx rather than ==. --- tests/unit/test_test_mode.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/unit/test_test_mode.cpp b/tests/unit/test_test_mode.cpp index 27e8c0d96..a85d73e52 100644 --- a/tests/unit/test_test_mode.cpp +++ b/tests/unit/test_test_mode.cpp @@ -61,9 +61,9 @@ TEST_CASE("test mode: the exit codes keep clear of the ones of a killed or abort TEST_CASE("test mode: seconds on the command line are a number, not negative") { - CHECK(simulation::parse_seconds("240") == 240.0); - CHECK(simulation::parse_seconds("0.5") == 0.5); - CHECK(simulation::parse_seconds("0") == 0.0); + CHECK(simulation::parse_seconds("240").value_or(-1.0) == doctest::Approx(240.0)); + CHECK(simulation::parse_seconds("0.5").value_or(-1.0) == doctest::Approx(0.5)); + CHECK(simulation::parse_seconds("0").value_or(-1.0) == doctest::Approx(0.0)); CHECK_FALSE(simulation::parse_seconds("").has_value()); CHECK_FALSE(simulation::parse_seconds("-1").has_value()); CHECK_FALSE(simulation::parse_seconds("60s").has_value()); @@ -84,8 +84,8 @@ TEST_CASE("test mode: the command line") { auto const commandline{parse({"--test-wall-timeout", "900", "-s", "td.scn", "--test", "--test-timeout", "240"})}; CHECK(commandline.enabled); - CHECK(commandline.timeout == 240.0); - CHECK(commandline.wall_timeout == 900.0); + CHECK(commandline.timeout.value_or(-1.0) == doctest::Approx(240.0)); + CHECK(commandline.wall_timeout.value_or(-1.0) == doctest::Approx(900.0)); CHECK(commandline.error.empty()); } SUBCASE("a limit not given stays unset") @@ -128,18 +128,18 @@ TEST_CASE("test mode: the real time limit") { SUBCASE("given, it is the limit, 0 turns it off") { - CHECK(simulation::wall_clock_limit(120.0, 3600.0) == 120.0); - CHECK(simulation::wall_clock_limit(0.0, 3600.0) == 0.0); + CHECK(simulation::wall_clock_limit(120.0, 3600.0) == doctest::Approx(120.0)); + CHECK(simulation::wall_clock_limit(0.0, 3600.0) == doctest::Approx(0.0)); } SUBCASE("not given, it is the simulation time limit and time for the loading") { - CHECK(simulation::wall_clock_limit(std::nullopt, 240.0) == 240.0 + simulation::wall_timeout_loading_allowance); - CHECK(simulation::wall_clock_limit(std::nullopt, 3600.0) == 3600.0 + simulation::wall_timeout_loading_allowance); + CHECK(simulation::wall_clock_limit(std::nullopt, 240.0) == doctest::Approx(240.0 + simulation::wall_timeout_loading_allowance)); + CHECK(simulation::wall_clock_limit(std::nullopt, 3600.0) == doctest::Approx(3600.0 + simulation::wall_timeout_loading_allowance)); } SUBCASE("no simulation time limit, no real time limit unless given") { - CHECK(simulation::wall_clock_limit(std::nullopt, 0.0) == 0.0); - CHECK(simulation::wall_clock_limit(300.0, 0.0) == 300.0); + CHECK(simulation::wall_clock_limit(std::nullopt, 0.0) == doctest::Approx(0.0)); + CHECK(simulation::wall_clock_limit(300.0, 0.0) == doctest::Approx(300.0)); } } @@ -152,7 +152,7 @@ TEST_CASE("test mode: the end conditions") { CHECK_FALSE(simulation::evaluate_frame(progress, frame(false), limits).has_value()); CHECK(progress.time == doctest::Approx(0.03)); - CHECK(progress.resttime == 0.0); + CHECK(progress.resttime == doctest::Approx(0.0)); } SUBCASE("a cell nobody wrote to says nothing") { @@ -207,7 +207,7 @@ TEST_CASE("test mode: the end conditions") limits.standstill = 120.0; CHECK_FALSE(run(progress, limits, 100.0, frame(true)).has_value()); CHECK_FALSE(simulation::evaluate_frame(progress, frame(false), limits).has_value()); - CHECK(progress.resttime == 0.0); + CHECK(progress.resttime == doctest::Approx(0.0)); CHECK_FALSE(run(progress, limits, 200.0, frame(true)).has_value()); } SUBCASE("test.pass_on_standstill makes the standstill a pass") From b8ea91bd4474e7eea7455efb3de01d5e035899d7 Mon Sep 17 00:00:00 2001 From: Sebastian Krzyszkowiak Date: Tue, 27 Oct 2026 01:19:10 +0100 Subject: [PATCH 340/430] driveruipanels: Allow to toggle AI driver from the driving aid Possibly the single greatest UX improvement for newcomers that could there ever be. --- application/driveruipanels.cpp | 18 ++++++++++++++++++ application/driveruipanels.h | 1 + 2 files changed, 19 insertions(+) diff --git a/application/driveruipanels.cpp b/application/driveruipanels.cpp index e318d3563..f7519feb7 100644 --- a/application/driveruipanels.cpp +++ b/application/driveruipanels.cpp @@ -206,6 +206,24 @@ drivingaid_panel::update() { } } +void +drivingaid_panel::render_contents() { + ImGui::Checkbox(STR_C("expand"), &is_expanded); + + ImGui::SameLine(); + + auto const *driver = (simulation::Train && simulation::Train->Dynamic()) ? simulation::Train->Dynamic()->Mechanik : nullptr; + if (driver && (false == Global.RealisticControlMode || DebugModeFlag)) { + bool autopilot = driver->AIControllFlag; + if (ImGui::Checkbox(STR_C("autopilot"), &autopilot)) { + command_relay commandrelay; + commandrelay.post(autopilot ? user_command::aidriverenable : user_command::aidriverdisable, 0.0, 0.0, GLFW_PRESS, 0); + } + } + + ui_panel::render_contents(); +} + void scenario_panel::update() { diff --git a/application/driveruipanels.h b/application/driveruipanels.h index 96b9ac1c7..393d0e9a3 100644 --- a/application/driveruipanels.h +++ b/application/driveruipanels.h @@ -20,6 +20,7 @@ public: {} void update() override; + void render_contents() override; private: // members From 1e650e375a72d03ed4c68cd6a2619ab1c7529589 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 12:32:28 +0100 Subject: [PATCH 341/430] docs: why the inspector puts a vehicle without G on P in a train on G (eu07/maszyna#350) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cw-1 §19.9 cuts the brake of such a vehicle out; the inspector keeps the earlier P, as it has no record to put a cut out brake back with. --- vehicle/brakesetting.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vehicle/brakesetting.cpp b/vehicle/brakesetting.cpp index 785bfbd6d..a55d3d751 100644 --- a/vehicle/brakesetting.cpp +++ b/vehicle/brakesetting.cpp @@ -142,6 +142,10 @@ std::vector choose(std::vector const &Consist) { } case train_setting::freight_g: default: { + // NOTE: Cw-1 §19.9 wants the brake of a vehicle without G (a passenger car with P and R only) cut out in a + // train braked on G. It's put on P instead, as before: a brake cut out by the inspector would have to be + // remembered and put back when the train is made up again, and the simulator has no such record yet. + // The same goes for the vehicles kept on G in the long locomotive setting above (freight_gp) settings.emplace_back(pick(item.delays, bdelay_G, bdelay_P)); break; } From a6c7d539832b6d3181b77ff59ad9355754f9c40c Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 12:33:53 +0100 Subject: [PATCH 342/430] fix: SmokeDelay defaults to 0, the delay comes only from the vehicle's .fiz (eu07/maszyna#523) Without SmokeDelay in its Engine section a diesel smokes as soon as the starter turns, as before; the delay is set per locomotive in its own .fiz. The value stays a member of the vehicle's mover, read from its .fiz with an explicit default of 0. Tests: the real SM42 and ST44 with SmokeDelay=2 and 5 in the .fiz, and without it (smoke at once), next to a locomotive with a delay loaded just before, which keeps its own value. --- McZapkie/MOVER.h | 6 +++--- McZapkie/Mover.cpp | 2 +- tests/unit/test_smoke.cpp | 30 +++++++++++++++++++----------- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index f39de8e26..ec8e5e9b3 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -2171,9 +2171,9 @@ class TMoverParameters bool dizel_startup{false}; // engine startup procedure request indicator bool dizel_ignition{false}; // engine ignition request indicator bool dizel_spinup{false}; // engine spin up to idle speed flag - // the starter turns the engine a while before it fires: smoke comes out only after SmokeDelay (the Engine section of the .fiz, - // seconds from the start of the spin up) has passed. 0 lets it out as soon as the starter turns, as before eu07/maszyna#523 - double dizel_SmokeDelay{2.0}; + // the starter turns the engine a while before it fires: smoke comes out only after SmokeDelay (the Engine section of the vehicle's + // .fiz, seconds from the start of the spin up) has passed. 0, the default, lets it out as soon as the starter turns, as before eu07/maszyna#523 + double dizel_SmokeDelay{0.0}; double dizel_FiringCountdown{0.0}; // seconds left until the engine being started fires, 0 once it runs on its own double dizel_engagedeltaomega = 0.0; /*roznica predkosci katowych tarcz sprzegla*/ double dizel_n_old = 0.0; /*poredkosc na potrzeby obliczen sprzegiel*/ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 8632e404e..cb9eba023 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -11370,7 +11370,7 @@ void TMoverParameters::LoadFIZ_Engine(std::string const &Input) extract_value(OilPump.pressure_minimum, "OilMinPressure", Input, ""); extract_value(OilPump.pressure_maximum, "OilMaxPressure", Input, ""); // the time the starter turns the engine before it fires and smokes (eu07/maszyna#523) - extract_value(dizel_SmokeDelay, "SmokeDelay", Input, ""); + extract_value(dizel_SmokeDelay, "SmokeDelay", Input, "0"); dizel_SmokeDelay = std::max(0.0, dizel_SmokeDelay); // engine cooling factore extract_value(dizel_heat.kw, "HeatKW", Input, ""); diff --git a/tests/unit/test_smoke.cpp b/tests/unit/test_smoke.cpp index a1ea788f3..281b5dbf6 100644 --- a/tests/unit/test_smoke.cpp +++ b/tests/unit/test_smoke.cpp @@ -116,8 +116,8 @@ TEST_CASE("smoke: a real diesel smokes only once its engine has fired, SmokeDela CAPTURE(path); test::track const track{}; { - // the default delay - test::vehicle locomotive{test::definition::fiz(path)}; + // SmokeDelay set in the .fiz of the locomotive + test::vehicle locomotive{test::definition{test::definition::fiz(path)}.set("Engine", "SmokeDelay", 2)}; REQUIRE(locomotive->dizel_SmokeDelay == doctest::Approx(2.0)); auto const driven{test::driving(locomotive)}; REQUIRE(start_engine(driven, track)); @@ -130,15 +130,6 @@ TEST_CASE("smoke: a real diesel smokes only once its engine has fired, SmokeDela CHECK(locomotive->dizel_FiringCountdown == 0.0); CHECK(smoke::vehicle_spawn_count(locomotive.mover(), true, source, update) >= 1.f); } - { - // SmokeDelay=0: smoke as soon as the starter turns, as before - test::vehicle locomotive{test::definition{test::definition::fiz(path)}.set("Engine", "SmokeDelay", 0)}; - REQUIRE(locomotive->dizel_SmokeDelay == 0.0); - auto const driven{test::driving(locomotive)}; - REQUIRE(start_engine(driven, track)); - CHECK(locomotive->dizel_FiringCountdown == 0.0); - CHECK(smoke::vehicle_spawn_count(locomotive.mover(), true, source, update) >= 1.f); - } { // a longer delay from the .fiz test::vehicle locomotive{test::definition{test::definition::fiz(path)}.set("Engine", "SmokeDelay", 5)}; @@ -151,3 +142,20 @@ TEST_CASE("smoke: a real diesel smokes only once its engine has fired, SmokeDela } } } + +TEST_CASE("smoke: without SmokeDelay in its .fiz a diesel smokes as soon as the starter turns, as before (#523)") { + for (auto const *path : {"sm42_v1/6d1", "st44_v2/m62-1151"}) { + CAPTURE(path); + test::track const track{}; + // a locomotive which has the delay, loaded first, doesn't hand it on to the next one: the value is the vehicle's own + test::vehicle delayed{test::definition{test::definition::fiz(path)}.set("Engine", "SmokeDelay", 3)}; + REQUIRE(delayed->dizel_SmokeDelay == doctest::Approx(3.0)); + test::vehicle locomotive{test::definition::fiz(path)}; + REQUIRE(locomotive->dizel_SmokeDelay == 0.0); + CHECK(delayed->dizel_SmokeDelay == doctest::Approx(3.0)); + auto const driven{test::driving(locomotive)}; + REQUIRE(start_engine(driven, track)); + CHECK(locomotive->dizel_FiringCountdown == 0.0); + CHECK(smoke::vehicle_spawn_count(locomotive.mover(), true, source, update) >= 1.f); + } +} From b5953ef61e451dc0bb9ff15f886342678800a3f5 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 13:00:24 +0100 Subject: [PATCH 343/430] feat: lock the field shunting in both directions on resistive positions With ScndCtrlResistiveLock=Yes the shunt controller can't be moved down either while the master controller is at zero or on a resistive position (eu07/maszyna#402: "inc/dec"). So that a shunt step can't be left stuck there, the shunt controller drops to 0 whenever the master controller is at zero or on a resistive position: right after IncMainCtrl()/DecMainCtrl() move it there (before the positions go down the consist) and in every update, for the master controller set directly (AI clamp, consist). Electrically nothing changes, the relays already drop the shunting on resistive positions. Reducing power is never blocked: the EP09/ET21 master controller turns back with the shunt on, the ET22 keeps its interlock (shunt off first), and on the ET22 a shunt left on at a resistive position would otherwise lock both controllers. Tests: the shunt goes down on resistance-free positions only; the master controller taken back or up onto a resistive position from a shunt step, by hand and directly, on the ET22 and EP09. --- McZapkie/MOVER.h | 7 +++-- McZapkie/Mover.cpp | 16 +++++++++- tests/unit/test_cntrl.cpp | 63 +++++++++++++++++++++++++++++++++++++-- 3 files changed, 81 insertions(+), 5 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 825bec6de..6a70147ab 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1943,7 +1943,7 @@ class TMoverParameters double MirrorVelClose{5.0}; bool MirrorForbidden{false}; /*czy jest pozwolenie na otworzenie lusterek (przycisk)*/ bool ScndS = false; /*Czy jest bocznikowanie na szeregowej*/ - bool ScndCtrlResistiveLock{false}; // the shunt controller can't be moved up while the master controller is at zero or on a resistive position (ScndCtrlResistiveLock=Yes in Cntrl.) + bool ScndCtrlResistiveLock{false}; // the shunt controller can't be moved, up or down, while the master controller is at zero or on a resistive position, and drops to 0 when the master controller gets there (ScndCtrlResistiveLock=Yes in Cntrl.) bool SpeedCtrl = false; /*czy jest tempomat*/ speed_control SpeedCtrlUnit; /*parametry tempomatu*/ double SpeedCtrlButtons[10]{30, 40, 50, 60, 70, 80, 90, 100, 110, 120}; /*przyciski prędkości*/ @@ -2373,8 +2373,11 @@ class TMoverParameters bool IncScndCtrl(int CtrlSpeed); bool DecScndCtrl(int CtrlSpeed); int GetVirtualScndPos() const; - // whether ScndCtrlResistiveLock keeps the shunt controller from being moved up at the current master controller position + // whether ScndCtrlResistiveLock keeps the shunt controller from being moved at the current master controller position bool IsScndCtrlLockedByMainCtrl() const; + // ScndCtrlResistiveLock: the shunt controller drops to 0 once the master controller is at zero or on a resistive position, so it + // can't stay engaged there, locked in place (eu07/maszyna#402) + void ScndCtrlResistiveLockCheck(); bool IsScndCtrlNoPowerPos() const; bool IsScndCtrlMaxPowerPos() const; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index b9d18d0b2..8154eb927 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1631,6 +1631,8 @@ void TMoverParameters::compute_movement_(double const Deltatime) BRVentilators = false; } + // the master controller set directly, not through IncMainCtrl()/DecMainCtrl() (AI, consist): the locked shunt follows it as well + ScndCtrlResistiveLockCheck(); // automatyczny rozruch if (EngineType == TEngineType::ElectricSeriesMotor && AutoRelayCheck()) { @@ -2537,6 +2539,7 @@ bool TMoverParameters::IncMainCtrl(int CtrlSpeed) if (true == OK) { + ScndCtrlResistiveLockCheck(); // e.g. from the last series position on to the resistive parallel ones SendCtrlToNext("MainCtrl", MainCtrlPos, CabActive); //??? SendCtrlToNext("ScndCtrl", ScndCtrlPos, CabActive); } @@ -2662,6 +2665,7 @@ bool TMoverParameters::DecMainCtrl(int CtrlSpeed) if (OK) { + ScndCtrlResistiveLockCheck(); // the shunt drops when the master controller leaves a resistance-free position /*OK:=*/SendCtrlToNext("MainCtrl", MainCtrlPos, CabActive); // hmmmm...???!!! /*OK:=*/SendCtrlToNext("ScndCtrl", ScndCtrlPos, CabActive); } @@ -2822,7 +2826,7 @@ bool TMoverParameters::DecScndCtrl(int CtrlSpeed) } else if (ScndCtrlPosNo > 0 && CabActive != 0) { - if (ScndCtrlPos > 0 && !CoupledCtrl && (EngineType != TEngineType::DieselElectric || !AutoRelayFlag)) + if (ScndCtrlPos > 0 && !CoupledCtrl && (EngineType != TEngineType::DieselElectric || !AutoRelayFlag) && !IsScndCtrlLockedByMainCtrl()) { if (CtrlSpeed == 1) { @@ -2878,6 +2882,16 @@ bool TMoverParameters::IsScndCtrlLockedByMainCtrl() const return ScndCtrlResistiveLock && (IsMainCtrlNoPowerPos() || RList[MainCtrlPos].R >= 0.01); } +void TMoverParameters::ScndCtrlResistiveLockCheck() +{ + // the shunt controller, locked in both directions on zero and the resistive positions, would otherwise stay engaged there once the + // master controller is taken back (or set from elsewhere, e.g. by the AI or another vehicle of the consist) with the shunt on + if (ScndCtrlPos > 0 && !CoupledCtrl && IsScndCtrlLockedByMainCtrl()) + { + ScndCtrlPos = 0; + } +} + int TMoverParameters::GetVirtualScndPos() const { if (TrainType == dt_ET42 && DynamicBrakeFlag && !ScndCtrlPos) diff --git a/tests/unit/test_cntrl.cpp b/tests/unit/test_cntrl.cpp index e6c53940c..c73c45d85 100644 --- a/tests/unit/test_cntrl.cpp +++ b/tests/unit/test_cntrl.cpp @@ -96,12 +96,71 @@ TEST_CASE("cntrl: ScndCtrlResistiveLock keeps the field shunting off at zero and CHECK(locked->ScndCtrlPos == 1); } } - SUBCASE("the shunting still goes off on a resistive position") { + SUBCASE("the shunt goes down on a resistance-free position") { + controllers_at(locked, resistancefree); + REQUIRE(locked->IncScndCtrl(1)); + REQUIRE(locked->IncScndCtrl(1)); + CHECK(locked->DecScndCtrl(1)); + CHECK(locked->ScndCtrlPos == 1); + CHECK(locked->DecScndCtrl(2)); + CHECK(locked->ScndCtrlPos == 0); + } + SUBCASE("the shunt doesn't go down on a resistive position either") { + // a state the lock doesn't let arise (see below), set by hand to check the controller alone + controllers_at(locked, resistancefree - 1); + locked->ScndCtrlPos = 1; + CHECK(locked->IsScndCtrlLockedByMainCtrl()); + CHECK_FALSE(locked->DecScndCtrl(1)); + CHECK_FALSE(locked->DecScndCtrl(2)); + CHECK(locked->ScndCtrlPos == 1); + } + SUBCASE("the master controller taken back from a shunt step drops the shunt") { + controllers_at(locked, resistancefree); + REQUIRE(locked->IncScndCtrl(1)); + if (locked->TrainType == dt_ET22) { + // the ET22's master controller doesn't turn with the shunt on: the shunt goes off first, as before + CHECK_FALSE(locked->DecMainCtrl(1)); + CHECK(locked->MainCtrlPos == resistancefree); + CHECK(locked->DecScndCtrl(1)); + } + CHECK(locked->DecMainCtrl(1)); + CHECK(locked->MainCtrlPos == resistancefree - 1); + CHECK(locked->ScndCtrlPos == 0); + // and the master controller goes on down to zero, nothing left locked + while (locked->MainCtrlPos > 0 && locked->DecMainCtrl(1)) { + } + CHECK(locked->MainCtrlPos == 0); + } + SUBCASE("the master controller set directly (AI, consist) drops the shunt in the next update") { controllers_at(locked, resistancefree); REQUIRE(locked->IncScndCtrl(1)); locked->MainCtrlPos = resistancefree - 1; - CHECK(locked->DecScndCtrl(1)); + locked.step(); CHECK(locked->ScndCtrlPos == 0); + CHECK(locked->MainCtrlPos == resistancefree - 1); + } + SUBCASE("the master controller moved up from a shunt step onto a resistive position drops the shunt") { + // the last series position, followed by the resistive parallel ones + auto lastseries{0}; + for (auto position{resistancefree}; position > 0 && position < locked->MainCtrlPosNo; position = resistance_free_position(locked.mover(), position)) { + if (locked->RList[position + 1].R >= 0.01) { + lastseries = position; + break; + } + } + REQUIRE(lastseries > 0); + controllers_at(locked, lastseries); + locked->DirActive = 1; + REQUIRE(locked->IncScndCtrl(1)); + if (locked->TrainType == dt_ET22) { + CHECK_FALSE(locked->IncMainCtrl(1)); // the ET22's interlock, as before + CHECK(locked->ScndCtrlPos == 1); + } + else { + CHECK(locked->IncMainCtrl(1)); + CHECK(locked->MainCtrlPos == lastseries + 1); + CHECK(locked->ScndCtrlPos == 0); + } } } } From c4dc2ccb3519156d0b4c390795012b5e7a2cbdec Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 13:00:51 +0100 Subject: [PATCH 344/430] =?UTF-8?q?docs:=20PantRequiresMain=20is=20for=20t?= =?UTF-8?q?he=20EU05,=20EP05=20and=20=C4=8CD=20181=20family,=20not=20every?= =?UTF-8?q?=20Czech=20locomotive=20(#68)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The comment on the flag named Czech locomotives in general; the EP03 doesn't get it. --- McZapkie/MOVER.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 24a0a3fc4..c08797c50 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -2094,7 +2094,7 @@ class TMoverParameters double MainsInitTimeCountdown{0.0}; // current state of main circuit initialization, remaining time (in seconds) until it's ready start_t MainsStart{start_t::manual}; // config, .fiz Cntrl.PantRequiresMain: the line breaker closes without traction voltage and holds without it, and the - // pantographs rise and stay up only while it's closed (Czech locomotives); off, the pantographs come first and the line + // pantographs rise and stay up only while it's closed (EU05, EP05, ČD 181 family); off, the pantographs come first and the line // breaker needs their voltage bool PantographsRequireMains{false}; bool LineBreakerClosesOnlyAtNoPowerPos{false}; From 81f10e4d901ff54ac40331216f32086e5ec6e115 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 13:03:06 +0100 Subject: [PATCH 345/430] fix: AI wagon inspector cuts out the brake of wagons without G in a train on G (eu07/maszyna#350) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cw-1 §19.9: in a freight train braked on G, the brake of a vehicle that has no G setting (e.g. a passenger car with P and R) is cut out. The inspector put such wagons on P; now it cuts their brake out the way the scenery's '0' flag does (b_dmg, the distributor's reservoirs emptied), so the brake releases and stays off. - The vehicle remembers the inspector cut it out (TMoverParameters::BrakeCutOutByInspector); the next inspection puts such a brake back and sets it to what the new train needs. A brake cut out for any other reason (scenery, player, damage) is never put back; the cab's cut-out toggle hands an inspector's cut-out over to the player. - Locomotives and the vehicle the train is driven from keep a working brake (on P). In the long locomotive setting (§19.3b) the train runs on P, so a wagon without G stays on P there. - The braking tables after the settings leave cut-out brakes out. - §18.3: a car with R whose brake is cut out counts as one on P. - ai.brakesetting.cw1 no keeps the earlier behaviour: nothing cut out. The choice and the cutting out stay in vehicle/brakesetting.{h,cpp}, with unit tests on real wagons. --- McZapkie/MOVER.h | 3 + tests/unit/test_brake_setting.cpp | 170 +++++++++++++++++++++++++++++- vehicle/Driver.cpp | 14 +-- vehicle/Train.cpp | 2 + vehicle/brakesetting.cpp | 77 ++++++++++++-- vehicle/brakesetting.h | 26 ++++- 6 files changed, 273 insertions(+), 19 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 16bb207fa..77a122467 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -2060,6 +2060,9 @@ class TMoverParameters bool UnlockPipe = false; /*unlockig brake pipe button pressed*/ int BrakeDelayFlag = 0; /*nastawa opoznienia ham. osob/towar/posp/exp 0/1/2/4*/ int BrakeDelays = 0; /*nastawy mozliwe do uzyskania*/ + // the AI wagon inspector cut the brake out (b_dmg) and puts it back when the train no longer needs it + // cut out (brake_setting::apply). Anyone else cutting it out or putting it back takes it over + bool BrakeCutOutByInspector = false; int BrakeOpModeFlag = 0; /*nastawa trybu pracy PS/PN/EP/MED 1/2/4/8*/ int BrakeOpModes = 0; /*nastawy mozliwe do uzyskania*/ bool DynamicBrakeFlag = false; /*czy wlaczony hamulec elektrodymiczny*/ diff --git a/tests/unit/test_brake_setting.cpp b/tests/unit/test_brake_setting.cpp index 7e598ad6e..aba1e80bb 100644 --- a/tests/unit/test_brake_setting.cpp +++ b/tests/unit/test_brake_setting.cpp @@ -1,7 +1,9 @@ #include "stdafx.h" #include "doctest.h" +#include "McZapkie/MOVER.h" #include "McZapkie/hamulce.h" +#include "vehicle.h" #include "vehicle/brakesetting.h" // the brake settings the AI wagon inspector (TController::AutoRewident) chooses for a train, by the @@ -91,18 +93,182 @@ TEST_CASE("brake setting: a locomotive in the middle of the train doesn't put fi CHECK(legacy[15] == P); } -TEST_CASE("brake setting: a heavy freight train runs on G, a vehicle without G on P") { +TEST_CASE("brake setting: a heavy freight train runs on G, a wagon without G has its brake cut out (Cw-1 §19.9)") { auto consist{train(locomotive(), 30, freight_wagon(15.0, 80.0))}; consist.emplace_back(passenger_car(P)); + consist.emplace_back(passenger_car()); REQUIRE(brake_setting::choose_train_setting(consist) == train_setting::freight_g); auto const settings{brake_setting::choose(consist)}; - for (std::size_t i = 0; i + 1 < settings.size(); ++i) { + for (std::size_t i = 0; i + 2 < settings.size(); ++i) { CAPTURE(i); CHECK(settings[i] == G); } + CHECK(settings[settings.size() - 2] == brake_setting::cut_out); + CHECK(settings.back() == brake_setting::cut_out); + + // the inspector of the earlier releases put them on P + auto const legacy{brake_setting::choose_legacy(consist)}; + CHECK(legacy[settings.size() - 2] == P); + CHECK(legacy.back() == P); +} + +TEST_CASE("brake setting: in a train on G a locomotive and the vehicle it's driven from keep a working brake") { + auto consist{train(locomotive(P | R), 30, freight_wagon(15.0, 80.0))}; + // a dead locomotive without G at the end, and a car which tells no settings at all + consist.emplace_back(locomotive(P | R)); + consist.emplace_back(0, false, 20.0, 40000.0); + REQUIRE(brake_setting::choose_train_setting(consist) == train_setting::freight_g); + auto settings{brake_setting::choose(consist)}; + CHECK(settings.front() == P); + CHECK(settings[settings.size() - 2] == P); + CHECK(settings.back() == 0); + + // a control car without G, the train driven from it, pushed by the locomotive at the rear + brake_setting::vehicle controlcar{P | R, false, 24.5, 45000.0}; + controlcar.driven = true; + consist.front() = controlcar; + consist.back() = locomotive(); + settings = brake_setting::choose(consist); + CHECK(settings.front() == P); + CHECK(settings.back() == G); +} + +TEST_CASE("brake setting: in the long locomotive setting a vehicle without G brakes on P, not cut out (Cw-1 §19.3b)") { + // the train runs on P, so §19.9 doesn't apply to it, among the first five wagons kept on G or behind them + auto consist{train(locomotive(), 2, freight_wagon(15.0, 60.0))}; + consist.emplace_back(passenger_car()); + consist.insert(consist.end(), 8, freight_wagon(15.0, 60.0)); + consist.emplace_back(passenger_car()); + REQUIRE(brake_setting::choose_train_setting(consist) == train_setting::freight_gp); + auto const settings{brake_setting::choose(consist)}; + CHECK(settings[2] == G); + CHECK(settings[3] == P); + CHECK(settings[4] == G); + CHECK(settings[6] == P); CHECK(settings.back() == P); } +TEST_CASE("brake setting: a car with its brake cut out counts as one on P in a passenger train (Cw-1 §18.3)") { + auto consist{train(locomotive(), 5, passenger_car())}; + consist.insert(consist.end(), 3, passenger_car(P)); + REQUIRE(brake_setting::choose_train_setting(consist) == train_setting::passenger_r); + // one car with R cut out makes four on P + consist[1].cut_out = true; + CHECK(brake_setting::choose_train_setting(consist) == train_setting::passenger_p); + // with fewer P-only cars, three on P and four on R still run on R + consist.pop_back(); + CHECK(brake_setting::choose_train_setting(consist) == train_setting::passenger_r); + // a cut out brake changes nothing about a train being a passenger or a freight one + auto freight{train(locomotive(), 4, freight_wagon())}; + freight.emplace_back(passenger_car()); + freight.back().cut_out = true; + CHECK(brake_setting::choose_train_setting(freight) == train_setting::freight_p); +} + +namespace { + +// a passenger car with P and R, with the KE distributor of the test wagon +test::definition passenger_car_definition() { + return test::definition::load("wagon").set("Cntrl", "BrakeDelays", "PR"); +} + +// charges the brake of the vehicle from a brake pipe at 5 bar, then makes a full service application +void charge_and_apply(test::vehicle &Vehicle) { + Vehicle.hold_brake_pipe(5.0); + Vehicle.run(90.0); + Vehicle.hold_brake_pipe(3.5); + Vehicle.run(20.0); +} + +// the inspector at work on a heavy train on G with the vehicle at its end, as AutoRewident() does it +int inspect_heavy_train(test::vehicle &Vehicle) { + auto consist{train(locomotive(), 30, freight_wagon(15.0, 80.0))}; + consist.emplace_back(brake_setting::describe(Vehicle.mover(), false)); + auto const setting{brake_setting::choose(consist).back()}; + brake_setting::apply(Vehicle.mover(), setting); + return setting; +} + +// the same on a light train, which runs on P +int inspect_light_train(test::vehicle &Vehicle) { + auto consist{train(locomotive(), 4, freight_wagon())}; + consist.emplace_back(brake_setting::describe(Vehicle.mover(), false)); + auto const setting{brake_setting::choose(consist).back()}; + brake_setting::apply(Vehicle.mover(), setting); + return setting; +} + +} // namespace + +TEST_CASE("brake setting: the inspector cuts the brake out in a train on G and puts it back in a train on P") { + test::vehicle car{passenger_car_definition()}; + charge_and_apply(car); + REQUIRE(car->BrakePress > 1.0); + + // made up into a heavy train on G: the brake is cut out and released + REQUIRE(inspect_heavy_train(car) == brake_setting::cut_out); + CHECK(brake_setting::is_cut_out(car.mover())); + CHECK(car->BrakeCutOutByInspector); + car.run(30.0); + CHECK(car->BrakePress < 0.1); + // and it stays off whatever the brake pipe does + car.hold_brake_pipe(5.0); + car.run(60.0); + car.hold_brake_pipe(3.5); + car.run(20.0); + CHECK(car->BrakePress < 0.1); + car.hold_brake_pipe(0.0); + car.run(20.0); + CHECK(car->BrakePress < 0.1); + // to the inspector looking at the train again it's a car like any other, and the train needs it cut out still + CHECK(false == brake_setting::describe(car.mover(), false).cut_out); + REQUIRE(inspect_heavy_train(car) == brake_setting::cut_out); + CHECK(car->BrakeCutOutByInspector); + + // made up into a light train: the brake is back on P, charges and brakes again + CHECK(inspect_light_train(car) == P); + CHECK(false == brake_setting::is_cut_out(car.mover())); + CHECK(false == car->BrakeCutOutByInspector); + CHECK(car->BrakeDelayFlag == P); + // the reservoirs emptied when it was cut out take some five minutes to charge from the brake pipe + car.hold_brake_pipe(5.0); + car.run(300.0); + CHECK(car->Hamulec->GetBRP() > 4.9); + charge_and_apply(car); + CHECK(car->BrakePress > 1.0); +} + +TEST_CASE("brake setting: the inspector never puts back a brake cut out for another reason") { + test::vehicle car{passenger_car_definition()}; + charge_and_apply(car); + // cut out the way the scenery's '0' does it + car->Hamulec->ForceEmptiness(); + car->Hamulec->SetBrakeStatus(car->Hamulec->GetBrakeStatus() | b_dmg); + CHECK(brake_setting::describe(car.mover(), false).cut_out); + + // a train on G wants it cut out anyway: it isn't the inspector's to put back + CHECK(inspect_heavy_train(car) == brake_setting::cut_out); + CHECK(false == car->BrakeCutOutByInspector); + // a train on P would want it working: it stays cut out + CHECK(inspect_light_train(car) == P); + CHECK(brake_setting::is_cut_out(car.mover())); + charge_and_apply(car); + CHECK(car->BrakePress < 0.1); + + // a brake the inspector cut out, which someone else puts back and cuts out again, is theirs from then on + test::vehicle other{passenger_car_definition()}; + REQUIRE(inspect_heavy_train(other) == brake_setting::cut_out); + other->Hamulec->SetBrakeStatus(other->Hamulec->GetBrakeStatus() & ~b_dmg); + CHECK(inspect_heavy_train(other) == brake_setting::cut_out); // the inspector cuts it out again, and it's its own again + CHECK(other->BrakeCutOutByInspector); + other->Hamulec->SetBrakeStatus(other->Hamulec->GetBrakeStatus() & ~b_dmg); + CHECK(inspect_light_train(other) == P); + CHECK(false == other->BrakeCutOutByInspector); + other->Hamulec->SetBrakeStatus(other->Hamulec->GetBrakeStatus() | b_dmg); + CHECK(inspect_light_train(other) == P); + CHECK(brake_setting::is_cut_out(other.mover())); +} + TEST_CASE("brake setting: a vehicle without the setting the train needs gets the other one of G and P") { // a light freight train with a wagon which has G only auto consist{train(locomotive(), 4, freight_wagon(15.0, 20.0))}; diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index db6a8b7fd..0bb569c81 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -2084,9 +2084,7 @@ void TController::AutoRewident() // 1. Zebranie informacji o składzie pociągu, od czoła do końca std::vector consist; for (auto const *d = pVehicles[0]; d != nullptr; d = d->Next()) { - auto const *mover{d->MoverParameters}; - // a locomotive has Power > 1, though it may be a dead one at the end of the train - consist.emplace_back(mover->BrakeDelays, mover->Power >= 1.0, mover->Dim.L, mover->TotalMass); + consist.emplace_back(brake_setting::describe(*d->MoverParameters, d == pVehicle)); } // 2. Określenie typu pociągu i nastaw: by the brake instruction Cw-1 (eu07/maszyna#350), or as the releases before it did auto const settings{Global.AIBrakeSettingCw1 ? brake_setting::choose(consist) : brake_setting::choose_legacy(consist)}; @@ -2099,9 +2097,8 @@ void TController::AutoRewident() // don't touch human-controlled vehicle, but others are free game continue; } - if (*setting != 0) { - d->MoverParameters->BrakeDelaySwitch(*setting); - } + // the setting, a brake cut out in a train on G (Cw-1 §19.9) or put back when the train no longer needs it cut out + brake_setting::apply(*d->MoverParameters, *setting); // potentially release manual brake d->MoverParameters->DecManualBrakeLevel( ManualBrakePosNo ); d->MoverParameters->SpringBrake.Activate = false; @@ -2145,7 +2142,10 @@ void TController::AutoRewident() double const velstep = mvOccupied->Vmax * 0.5 / BrakeAccTableSize; auto *d = pVehicles[0]; // pojazd na czele składu while (d) { - for( int i = 0; i < BrakeAccTableSize; ++i ) { + // a vehicle with its brake cut out (by the inspector above or for a reason of its own) adds its mass only; + // the inspector of the earlier releases counted its brake in + auto const brakes{false == Global.AIBrakeSettingCw1 || false == brake_setting::is_cut_out(*d->MoverParameters)}; + for( int i = 0; i < BrakeAccTableSize && brakes; ++i ) { fBrake_a0[ i + 1 ] += d->MoverParameters->BrakeForceR( 0.25, velstep*( 1 + 2 * i ) ); fBrake_a1[ i + 1 ] += d->MoverParameters->BrakeForceR( 1.00, velstep*( 1 + 2 * i ) ); } diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index e30635f4f..004e8092c 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -2114,6 +2114,8 @@ void TTrain::OnCommand_trainbrakeoperationtoggle(TTrain *Train, command_data con } vehicle->MoverParameters->Hamulec->SetBrakeStatus(vehicle->MoverParameters->Hamulec->GetBrakeStatus() ^ b_dmg); + // the brake is the player's now, the wagon inspector won't put it back on its own + vehicle->MoverParameters->BrakeCutOutByInspector = false; } } diff --git a/vehicle/brakesetting.cpp b/vehicle/brakesetting.cpp index a55d3d751..bf42f8ab4 100644 --- a/vehicle/brakesetting.cpp +++ b/vehicle/brakesetting.cpp @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "vehicle/brakesetting.h" +#include "McZapkie/MOVER.h" #include "McZapkie/hamulce.h" #include @@ -48,6 +49,7 @@ struct wagon_counts { int r{0}; // with R: passenger cars of fast trains int g{0}; // with G but no R: freight wagons int p{0}; // the rest: passenger cars with P only + int r_cut_out{0}; // of those with R, the ones with their brake cut out double length{0.0}; // [m] double mass{0.0}; // [kg] @@ -60,6 +62,9 @@ struct wagon_counts { mass += item.mass; if (has(item.delays, bdelay_R)) { ++r; + if (item.cut_out) { + ++r_cut_out; + } } else if (has(item.delays, bdelay_G)) { ++g; @@ -95,9 +100,11 @@ train_setting choose_train_setting(std::vector const &Consist) { return train_setting::light_engine; } if (counts.passenger()) { - // wagons without R run on P, and there may be no more than three of them, fewer than those on R - auto const pwagons{counts.g + counts.p}; - return pwagons <= passenger_r_max_p_wagons && counts.r > pwagons ? train_setting::passenger_r : train_setting::passenger_p; + // wagons without R run on P, and a wagon with its brake cut out counts as one on P (Cw-1 §18.3). there may + // be no more than three of them, fewer than those on R + auto const pwagons{counts.g + counts.p + counts.r_cut_out}; + auto const rwagons{counts.r - counts.r_cut_out}; + return pwagons <= passenger_r_max_p_wagons && rwagons > pwagons ? train_setting::passenger_r : train_setting::passenger_p; } if (counts.length > freight_p_max_length || counts.mass > freight_p_max_mass) { return train_setting::freight_g; @@ -135,18 +142,27 @@ std::vector choose(std::vector const &Consist) { break; } case train_setting::freight_gp: { - // the wagons are counted from the head of the train, past any locomotive in the middle of it + // the wagons are counted from the head of the train, past any locomotive in the middle of it. + // the train runs on P (Cw-1 §19.3b), so §19.9 doesn't apply: a vehicle without G among the ones + // kept on G brakes on P like the rest of the train, rather than being cut out auto const ong{item.powered || wagonsfromhead <= freight_gp_wagons_on_g}; settings.emplace_back(ong ? pick(item.delays, bdelay_G, bdelay_P) : pick(item.delays, bdelay_P, bdelay_G)); break; } case train_setting::freight_g: default: { - // NOTE: Cw-1 §19.9 wants the brake of a vehicle without G (a passenger car with P and R only) cut out in a - // train braked on G. It's put on P instead, as before: a brake cut out by the inspector would have to be - // remembered and put back when the train is made up again, and the simulator has no such record yet. - // The same goes for the vehicles kept on G in the long locomotive setting above (freight_gp) - settings.emplace_back(pick(item.delays, bdelay_G, bdelay_P)); + if (has(item.delays, bdelay_G)) { + settings.emplace_back(bdelay_G); + } + else if (item.powered || item.driven || item.delays == 0) { + // a locomotive, or the vehicle the train is driven from, keeps a working brake: on P. a vehicle + // which tells no settings at all is left alone + settings.emplace_back(pick(item.delays, bdelay_P, bdelay_P)); + } + else { + // a wagon without G (a passenger car with P and R) has its brake cut out (Cw-1 §19.9) + settings.emplace_back(cut_out); + } break; } } @@ -217,4 +233,47 @@ std::vector choose_legacy(std::vector const &Consist) { return settings; } +bool is_cut_out(TMoverParameters const &Vehicle) { + return (Vehicle.Hamulec->GetBrakeStatus() & b_dmg) == b_dmg; +} + +vehicle describe(TMoverParameters const &Vehicle, bool const Driven) { + vehicle described; + described.delays = Vehicle.BrakeDelays; + // a locomotive has Power > 1, though it may be a dead one at the end of the train + described.powered = Vehicle.Power >= 1.0; + described.length = Vehicle.Dim.L; + described.mass = Vehicle.TotalMass; + described.cut_out = is_cut_out(Vehicle) && false == Vehicle.BrakeCutOutByInspector; + described.driven = Driven; + return described; +} + +void apply(TMoverParameters &Vehicle, int const Setting) { + auto &brake{*Vehicle.Hamulec}; + if (Vehicle.BrakeCutOutByInspector && false == is_cut_out(Vehicle)) { + // someone put the brake back in the meantime, it's theirs now + Vehicle.BrakeCutOutByInspector = false; + } + if (Setting == cut_out) { + if (false == is_cut_out(Vehicle)) { + // close the cut-out cock and empty the brake with the releaser, as the scenery's '0' does: the + // distributor, cut off the brake pipe, has no air left to brake with and lets the cylinders go + brake.ForceEmptiness(); + brake.SetBrakeStatus(brake.GetBrakeStatus() | b_dmg); + Vehicle.BrakeCutOutByInspector = true; + } + // a brake cut out already, by the inspector or for a reason of its own, stays as it is + return; + } + if (Vehicle.BrakeCutOutByInspector) { + // open the cut-out cock: the distributor charges from the brake pipe again + brake.SetBrakeStatus(brake.GetBrakeStatus() & ~b_dmg); + Vehicle.BrakeCutOutByInspector = false; + } + if (Setting != 0) { + Vehicle.BrakeDelaySwitch(Setting); + } +} + } // namespace brake_setting diff --git a/vehicle/brakesetting.h b/vehicle/brakesetting.h index cfb421d55..cce2bbeb0 100644 --- a/vehicle/brakesetting.h +++ b/vehicle/brakesetting.h @@ -11,6 +11,8 @@ http://mozilla.org/MPL/2.0/. #include +class TMoverParameters; + // the brake setting (G/P/R/Mg) the virtual wagon inspector (TController::AutoRewident) chooses for every // vehicle of a train, by the rules of the brake instruction Cw-1 (Mw56), §18 and §19 (eu07/maszyna#350) namespace brake_setting { @@ -21,6 +23,8 @@ struct vehicle { bool powered{false}; // a locomotive or a powered unit, as opposed to a wagon double length{0.0}; // [m] double mass{0.0}; // with its load [kg] + bool cut_out{false}; // the brake is cut out for a reason of its own (damage, the scenario, the player) + bool driven{false}; // the vehicle the train is driven from: its brake is never cut out }; // the kind of train the inspector takes the consist for, and how it sets the brakes @@ -36,6 +40,9 @@ enum class train_setting { // how many wagons next to the locomotive stay on G in a freight_gp train inline constexpr int freight_gp_wagons_on_g{5}; +// the setting choose() gives a vehicle whose brake is to be cut out (Cw-1 §19.9) +inline constexpr int cut_out{-1}; + // the train setting by Cw-1. Consist runs from the head of the train to its rear train_setting choose_train_setting(std::vector const &Consist); @@ -47,11 +54,28 @@ constexpr bool passenger(train_setting const Setting) { // the brake setting (bdelay_*) for every vehicle of Consist, in the same order, by Cw-1. a vehicle // without the setting the train needs gets the other one of G and P it has, and 0 (left as it is) -// when it has neither. Cw-1 §19.9 would have the brake of such a vehicle cut out instead +// when it has neither. In a train on G (freight_g) a wagon without G gets cut_out instead: its brake +// is to be cut out (Cw-1 §19.9). A locomotive and the vehicle the train is driven from keep their +// brake working, on P std::vector choose(std::vector const &Consist); // the inspector of the releases before eu07/maszyna#350, kept for ai.brakesetting.cw1 no. the settings // are requests: a vehicle which doesn't have the one asked for keeps its own std::vector choose_legacy(std::vector const &Consist); +// the brake of the vehicle is cut out (b_dmg), whoever did it +bool is_cut_out(TMoverParameters const &Vehicle); + +// what choose() needs to know of the vehicle. a brake the inspector cut out itself doesn't count as +// cut out: the inspector decides about it anew +vehicle describe(TMoverParameters const &Vehicle, bool Driven); + +// the inspector puts the vehicle on Setting, as choose() gives it. cut_out cuts the brake out the way +// the scenery's '0' does: b_dmg, which cuts the distributor off the brake pipe (as the cab's cut-out, +// trainbrakeoperationtoggle, does), and its reservoirs emptied, so the brake releases and stays off. +// The vehicle remembers the inspector did it. Any other setting first puts back a brake the inspector +// cut out (it charges from the brake pipe again), then sets the vehicle to it (0: leaves the setting +// as it is). A brake cut out by anyone else stays cut out +void apply(TMoverParameters &Vehicle, int Setting); + } // namespace brake_setting From a6f30c3a2a9ec81eccb83c8b07a5ac0cce12bcf5 Mon Sep 17 00:00:00 2001 From: maj00r <73280030+maj00r@users.noreply.github.com> Date: Sun, 8 Nov 2026 14:39:19 +0100 Subject: [PATCH 346/430] CLAUDE.md: a PR has to pass the Sonar quality gate, not fix every remark (#296) * docs(claude): a PR has to pass the Sonar quality gate, not fix every remark The section on SonarCloud asked for every remark on the changed code to be fixed, code smells included. It now asks for the quality gate: new code rated A for reliability, security and maintainability, duplication at most 3%, hotspots reviewed. A remark that doesn't fail the gate needn't be fixed, and large restructurings that only answer one stay out of the PR. The rules that keep coming up stay listed, as the way to keep the gate passing. * docs(claude): what the gate's ratings mean for bugs, smells and hotspots Every bug or vulnerability on new code drops its rating below A and fails the gate, code smells only count together through the maintainability rating, and a hotspot is reviewed in SonarCloud rather than by rewriting the code. --------- Co-authored-by: maj00r --- CLAUDE.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index c1709be8d..283058cbe 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -27,11 +27,16 @@ Where no GCC is at hand, read the new code for what MSVC lets through and GCC do The same behaviour needs portable code. Don't rely on the order arguments are evaluated in, on the signedness of `char`, on the size of `wchar_t`, or on `long` being 32 bits. -## SonarCloud: every remark on the changed code gets fixed +## SonarCloud: the PR passes the quality gate -SonarCloud (`sonar.yml`, `sonar-project.properties`) analyses each PR. A PR counts as finished only when every remark Sonar raises on -the code it changes is fixed. That means the code smells too, not just the bugs, the vulnerabilities and the quality gate. The analysis -runs on the GCC build, so a PR that fails to build with GCC gets no analysis at all. +SonarCloud (`sonar.yml`, `sonar-project.properties`) analyses each PR. A PR has to pass Sonar's quality gate. The gate rates the new +code: reliability, security and maintainability have to be A, duplication is at most 3% and the security hotspots are reviewed. +Any bug or vulnerability on the new code lowers its rating below A, so each one gets fixed (or gets a NOSONAR when it is a false +positive). Code smells count only together, through the maintainability rating, so a single one rarely fails the gate, but many in a +large PR can. A hotspot is reviewed by marking it in SonarCloud as safe or fixed, which is the user's step there, not a reason to +rewrite the code. A remark that doesn't fail the gate doesn't have to be fixed. Leave large restructurings that only answer such a +remark (splitting a class or a file, rewriting a working algorithm) out of the PR. The analysis runs on the GCC build, so a PR that +fails to build with GCC gets no analysis at all, and so it doesn't pass the gate. Fixing a remark must not change what the code does: @@ -41,7 +46,7 @@ Fixing a remark must not change what the code does: - `// NOSONAR: ` is only for a real false positive, or where a fix would change behaviour. Use it rarely, always with the reason. -Write new code so that it doesn't raise the rules that keep coming up: +To keep the gate passing, write new code so that it doesn't raise the rules that keep coming up: - **S134** (nesting deeper than 3 `if` / `for` / `while` / `switch` / `try`) and **S3776** (cognitive complexity over 25): - use early `continue` / `return`; From 3487e75f9affe9ba47e86cd219581aafddb86ddb Mon Sep 17 00:00:00 2001 From: pawelw Date: Sun, 8 Nov 2026 14:40:13 +0100 Subject: [PATCH 347/430] AI: the passenger stop flag no longer turns itself on and off (#295) Whether a train is at a passenger stop (IsAtPassengerStop) was checked against the final approach margins fMinProximityDist and fMaxProximityDist, which are themselves set from that flag: 10-15 m and 15-40 m at a stop, 8 m and 50 m otherwise. With the two sets different, the flag switched on and off on every other scan of the route on the way to a W4. Each time the train went from a final approach to a stop 50 m long to one 15 m long and back: braking in one scan, full power below the 10 km/h coasting speed in the next. Close to the stop the braking demand did not hold the train to a standstill, and below 1 km/h the stop counted as done, so an SN61 drove off without ever standing still (#290). The margins are now worked out in train_proximity_margins(), and the check of the stop uses the margins of a passenger stop whatever the flag is at the moment. A vehicle that is not a train keeps the present ones, as before. --- vehicle/Driver.cpp | 93 +++++++++++++++++++++++++--------------------- vehicle/Driver.h | 1 + 2 files changed, 51 insertions(+), 43 deletions(-) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 9f83b6d53..21aed82ab 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -829,6 +829,45 @@ void TController::TableCheck(double fDistance) auto const passengerstopmaxdistance { 400.0 }; // maximum allowed distance between passenger stop point and consist head +// the margins of the final approach of a train [m], closer than the first of which it stops at once and within the +// second of which it makes its final approach: at a passenger stop, or at a signal and anything else it stops at +std::pair +TController::train_proximity_margins( bool const Passengerstop ) const { + + auto minproximity { 0.0 }; + auto maxproximity { 0.0 }; + if( Passengerstop ) { + // a stop point keeps the margins its W4 parameters (head or middle of the consist, + // platform length) were set up against + minproximity = std::clamp( 5 + iVehicles, 10, 15 ) + ( IsCargoTrain ? 10.0 : 0.0 ); + maxproximity = std::clamp( 10 + iVehicles, 15, 40 ); + } + else { + // a train stops 8-15 m short of the signal whatever its length; closer than the lower + // edge it stops at once, the braking aims at the middle of the window, 3.5 m further out + minproximity = 8.0; + // the final approach begins far enough out to slow from the coasting speed down to the window, + // and at the same distance whether the train is moving or standing, so it does not flip + // between creeping closer and holding still when it comes to a stand short of the window + maxproximity = 50.0; + } + if( IsCargoTrain ) { + // start the final approach earlier for cargo trains, their brakes react more slowly + maxproximity += 10.0; + } + if( ( Global.FrictionWeatherFactor < 1.f ) + && ( iVehicles > 1 ) ) { + // take into account weather conditions + minproximity += 5.0; + maxproximity += 5.0; + } + if( mvOccupied->Vel < 0.1 ) { + // jak stanie za daleko, to niech nie dociąga paru metrów + maxproximity = std::max( maxproximity, 50.0 ); + } + return { minproximity, maxproximity }; +} + TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fNext, double &fAcc) { // ustalenie parametrów, zwraca typ komendy, jeśli sygnał podaje prędkość do jazdy // fVelDes - prędkość zadana @@ -1152,14 +1191,20 @@ TController::TableUpdateStopPoint( TCommandType &Command, TSpeedPos &Point, doub return true; } + // the margins of a passenger stop, whether the train is already making for it or not: the present ones + // depend on this very flag, and a check against them would turn it on and off every other scan + auto const [ stopminproximity, stopmaxproximity ] { + is_train() ? + train_proximity_margins( true ) : + std::pair{ fMinProximityDist, fMaxProximityDist } }; IsAtPassengerStop = Point.fDist <= passengerstopmaxdistance // Ra 2F1I: odległość plus długość pociągu musi być mniejsza od długości // peronu, chyba że pociąg jest dłuższy, to wtedy minimalna. // jeśli długość peronu ((sSpeedTable[i].evEvent->ValueGet(2)) nie podana, // przyjąć odległość fMinProximityDist && ((iDrivigFlags & moveStopCloser) != 0 ? - Point.fDist + fLength + (Point.fMoved - fMinProximityDist * 0.5f) <= std::max(std::abs(Point.evEvent->input_value(2)), - 2.0 * fMaxProximityDist + fLength) : // fmaxproximitydist typically equals ~50 m + Point.fDist + fLength + (Point.fMoved - stopminproximity * 0.5f) <= std::max(std::abs(Point.evEvent->input_value(2)), + 2.0 * stopmaxproximity + fLength) : Point.fDist < Signaldistance); if( !eSignNext ) { @@ -6677,47 +6722,9 @@ TController::determine_proximity_ranges() { // na jaka odleglosc i z jaka predkoscia ma podjechac do przeszkody // jeśli pociąg if( is_train() ) { - if( IsAtPassengerStop ) { - // a stop point keeps the margins its W4 parameters (head or middle of the consist, - // platform length) were set up against - fMinProximityDist = std::clamp( 5 + iVehicles, 10, 15 ); - fMaxProximityDist = std::clamp( 10 + iVehicles, 15, 40 ); - if( IsCargoTrain ) { - fMinProximityDist += 10.0; - } - } - else { - // a train stops 8-15 m short of the signal whatever its length; closer than the lower - // edge it stops at once, the braking aims at the middle of the window, 3.5 m further out - fMinProximityDist = 8.0; - // the final approach begins far enough out to slow from the coasting speed down to the window, - // and at the same distance whether the train is moving or standing, so it does not flip - // between creeping closer and holding still when it comes to a stand short of the window - fMaxProximityDist = 50.0; - } - - if( IsCargoTrain ) { - // start the final approach earlier for cargo trains, their brakes react more slowly - fMaxProximityDist += 10.0; -/* - if( IsHeavyCargoTrain ) { - // cargo trains with high braking threshold may require even larger safety margin - fMaxProximityDist += 20.0; - } -*/ - } - - if (Global.FrictionWeatherFactor < 1.f - && iVehicles > 1 ) { - // take into account weather conditions - fMinProximityDist += 5.0; - fMaxProximityDist += 5.0; - } - - if( mvOccupied->Vel < 0.1 ) { - // jak stanie za daleko, to niech nie dociąga paru metrów - fMaxProximityDist = std::max( fMaxProximityDist, 50.0 ); - } + auto const [ minproximity, maxproximity ] { train_proximity_margins( IsAtPassengerStop ) }; + fMinProximityDist = minproximity; + fMaxProximityDist = maxproximity; if( iDrivigFlags & moveLate ) { // jeśli spóźniony, to gna diff --git a/vehicle/Driver.h b/vehicle/Driver.h index f1975fca6..68964711c 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -312,6 +312,7 @@ private: return mvOccupied->Vel * sign( iDirection * mvOccupied->V ); } double brake_increase_margin() const; + std::pair train_proximity_margins( bool const Passengerstop ) const; void update_timers( double const dt ); void update_logs( double const dt ); From 5f46aca43a41bb26d7822eb39756f5c3169b98a6 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 14:48:04 +0100 Subject: [PATCH 348/430] fix: a latching line breaker lever goes off with the breaker knocked out (#277) The EP05's single two-state line breaker lever stayed on once the converter overload relay knocked the breaker out: every press of the toggle tried to close the open breaker, which the tripped relay refused. A press now puts a lever left on over an open breaker off first. (eu07/maszyna#394) --- CMakeLists.txt | 1 + tests/unit/test_linebreaker.cpp | 114 ++++++++++++++++++++++++++++++++ vehicle/Train.cpp | 17 +++-- vehicle/linebreaker.cpp | 26 ++++++++ vehicle/linebreaker.h | 28 ++++++++ 5 files changed, 181 insertions(+), 5 deletions(-) create mode 100644 tests/unit/test_linebreaker.cpp create mode 100644 vehicle/linebreaker.cpp create mode 100644 vehicle/linebreaker.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f34ad61f..a5e467d93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -464,6 +464,7 @@ set(CORE_SOURCES "scripting/ladderlogic.cpp" "vehicle/handover.cpp" "vehicle/horn.cpp" +"vehicle/linebreaker.cpp" "vehicle/smoke.cpp" ) add_library(eu07_core STATIC ${CORE_SOURCES}) diff --git a/tests/unit/test_linebreaker.cpp b/tests/unit/test_linebreaker.cpp new file mode 100644 index 000000000..126e3307c --- /dev/null +++ b/tests/unit/test_linebreaker.cpp @@ -0,0 +1,114 @@ +#include "stdafx.h" +#include "doctest.h" +#include "consist.h" +#include "drive.h" + +#include "vehicle/linebreaker.h" + +// the line breaker (WS) controls of the cab (eu07/maszyna#394) + +using test::consist; +using test::definition; + +namespace { + +// the line breaker lever of the EP05 (main_sw), a single two-state lever, the way TTrain works it: the state +// the cab keeps of the line breaker follows the vehicle, the breaker closes while the lever is on and can close +struct lever { + TMoverParameters &mover; + int breaker{0}; // as TTrain::m_linebreakerstate: 0 open, 1 closed + bool on{false}; + + void press() { + switch (linebreaker::pressed(breaker, true, on)) { + case linebreaker::toggle::close: + on = true; + break; + case linebreaker::toggle::open: + on = false; + if (breaker == 1 && mover.MainSwitch(false)) { + breaker = 0; + } + break; + default: + break; + } + } + // TTrain::Update() + void update() { + if (breaker == 0 && mover.Mains) { + breaker = 1; + } + if (breaker == 1 && false == mover.Mains) { + breaker = 0; + } + if (on && breaker == 0 && mover.MainSwitchCheck()) { + breaker = mover.MainSwitch(true) ? 1 : 0; + } + } +}; + +} // namespace + +TEST_CASE("line breaker: a press of the toggle closes an open breaker and opens a closed one") { + using enum linebreaker::toggle; + for (auto const latching : {false, true}) { + CHECK(linebreaker::pressed(0, latching, false) == close); + CHECK(linebreaker::pressed(1, latching, true) == open); + CHECK(linebreaker::pressed(1, latching, false) == open); + // freshly closed, the cab finishes closing it first + CHECK(linebreaker::pressed(2, latching, true) == none); + } + // a lever left on over an open breaker goes off; push buttons have no position to keep + CHECK(linebreaker::pressed(0, true, true) == open); + CHECK(linebreaker::pressed(0, false, true) == close); +} + +TEST_CASE("line breaker: the EP05's lever goes off with the converter overload relay tripped (eu07/maszyna#394)") { + consist train; + auto &ep05{train.add(definition::fiz("ep05_v2/ep05"), 1).mover()}; + test::track const line{0.15, 0.0, test::catenary_3kv}; + auto const driver{test::driving(train)}; + REQUIRE(test::start_up(driver, line)); + REQUIRE(ep05.Mains); + REQUIRE(ep05.ConverterFlag); + lever ws{ep05, 1, true}; + + // the converter overload relay knocks the line breaker out, as the cab does it when the converter is + // switched on together with the compressor; the lever stays on + ep05.ConvOvldFlag = true; + ep05.MainSwitch(false, range_t::local); + ws.update(); + REQUIRE_FALSE(ep05.Mains); + REQUIRE(ws.breaker == 0); + CHECK(ws.on); + // with the relay tripped the breaker doesn't close + test::drive(driver, line, 5.0); + CHECK_FALSE(ep05.MainSwitchCheck()); + + // nothing holds the lever: it goes off, and on again, though the breaker stays open + ws.press(); + CHECK_FALSE(ws.on); + ws.press(); + CHECK(ws.on); + ws.update(); + CHECK_FALSE(ep05.Mains); + ws.press(); + CHECK_FALSE(ws.on); + + // the relay reset, with the converter switched off, the lever put on closes the breaker again + ep05.ConverterSwitch(false, range_t::local); + test::drive(driver, line, 1.0); + CHECK(ep05.RelayReset(relay_t::primaryconverteroverload, range_t::local)); + CHECK_FALSE(ep05.ConvOvldFlag); + ws.update(); + CHECK_FALSE(ep05.Mains); // the lever is off + ws.press(); + ws.update(); + CHECK(ep05.Mains); + CHECK(ws.breaker == 1); + // and the next press opens it + ws.press(); + CHECK_FALSE(ws.on); + CHECK_FALSE(ep05.Mains); +} diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index e30635f4f..9fdb97bf9 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -15,6 +15,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "vehicle/Train.h" #include "vehicle/horn.h" +#include "vehicle/linebreaker.h" #include "utilities/Globals.h" #include "simulation/simulation.h" @@ -3652,16 +3653,22 @@ void TTrain::OnCommand_linebreakertoggle(TTrain *Train, command_data const &Comm if (Command.action == GLFW_PRESS) { // press or hold... - if (Train->m_linebreakerstate == 0) + // a single two-state lever stays where it was put, also when the line breaker gets knocked out + auto const latchinglever{Train->ggMainOnButton.SubModel == nullptr && Train->ggMainOffButton.SubModel == nullptr && Train->ggMainButton.SubModel != nullptr && + Train->ggMainButton.type() == TGaugeType::toggle}; + switch (linebreaker::pressed(Train->m_linebreakerstate, latchinglever, Train->ggMainButton.GetDesiredValue() > 0.5)) { + case linebreaker::toggle::close: // ...to close the circuit // NOTE: bit of a dirty shortcut here OnCommand_linebreakerclose(Train, Command); - } - else if (Train->m_linebreakerstate == 1) - { - // ...to open the circuit + break; + case linebreaker::toggle::open: + // ...to open the circuit, or to put the lever off if the circuit was already opened OnCommand_linebreakeropen(Train, Command); + break; + default: + break; } } else if (Command.action == GLFW_RELEASE) diff --git a/vehicle/linebreaker.cpp b/vehicle/linebreaker.cpp new file mode 100644 index 000000000..97eae0325 --- /dev/null +++ b/vehicle/linebreaker.cpp @@ -0,0 +1,26 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "vehicle/linebreaker.h" + +namespace linebreaker { + +toggle pressed(int const Breakerstate, bool const Latchinglever, bool const Leveron) { + if (Breakerstate == 1) { + return toggle::open; + } + if (Breakerstate != 0) { + return toggle::none; + } + // the line breaker is open; a lever left on goes off first + return Latchinglever && Leveron ? toggle::open : toggle::close; +} + +} // namespace linebreaker diff --git a/vehicle/linebreaker.h b/vehicle/linebreaker.h new file mode 100644 index 000000000..370e992cc --- /dev/null +++ b/vehicle/linebreaker.h @@ -0,0 +1,28 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +// the line breaker (main switch, WS) controls of the cab +namespace linebreaker { + +enum class toggle : int { + none, // the press does nothing + close, // the control goes to its on position, and the line breaker closes if it can + open // the control goes to its off position, and the line breaker opens +}; + +// what a press of the line breaker toggle does. Breakerstate is the state the cab keeps of the line +// breaker (0: open, 1: closed, 2: freshly closed). Latchinglever is a single two-state switch which +// stays where it was put, Leveron that it stands in its on position. such a lever doesn't follow the +// line breaker: knocked out (by the converter overload relay, say) the breaker opens with the lever +// left on, and the lever has to go off before it can be put on again (eu07/maszyna#394) +toggle pressed(int Breakerstate, bool Latchinglever, bool Leveron); + +} // namespace linebreaker From 22c588d8f99099947b6d3e89e50c4051f5c1ef62 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 14:48:42 +0100 Subject: [PATCH 349/430] feat(cab): 401Da oil pump lamp and slotted speedometer lever (eu07/maszyna#546) (#261) * feat: 401da oil pump lamp and slotted lever animation (eu07/maszyna#546) i-oilpump lights while the pre-lubrication oil pump works, so it goes off once the engine runs. animslottedlever: in the .mmd turns a lever by a pin on the coupling rod sliding in the lever's slot, which the speedometer drive of 401Da needs. The compressor start delay of #546 came with CompressorStartDelay (Brake section) of master. * fix: force GLM AVX2 only when the compiler targets AVX2 ENABLE_AVX2=OFF left GLM_FORCE_AVX2 defined, so MSVC still emitted AVX2 intrinsics and the exe crashed on CPUs without AVX2. * test: cover the compressor start delay and the oil pump lamp The delay of an engine stopped before it passed starts over, a compressor switched on by hand waits too, and the key is read from the Brake section. In the converter-fed set-up of 401Da the compressor waits for ConverterStartDelay and then its own delay. The oil pump (i-oilpump lamp) works before the engine start and stops once the engine runs. --- stdafx.h | 2 +- tests/unit/test_compressor.cpp | 90 ++++++++++++++++++++++++++++++++++ tests/unit/test_oil_pump.cpp | 55 +++++++++++++++++++++ vehicle/DynObj.cpp | 57 +++++++++++++++++++++ vehicle/DynObj.h | 10 ++++ vehicle/Train.cpp | 4 ++ vehicle/Train.h | 1 + 7 files changed, 218 insertions(+), 1 deletion(-) create mode 100644 tests/unit/test_oil_pump.cpp diff --git a/stdafx.h b/stdafx.h index f2b377196..164edc240 100644 --- a/stdafx.h +++ b/stdafx.h @@ -91,7 +91,7 @@ #if defined(__aarch64__) || defined(__arm64__) #define GLM_FORCE_NEON -#else +#elif defined(__AVX2__) // set by /arch:AVX2 or -mavx2 (ENABLE_AVX2); without it GLM falls back to SSE2 #define GLM_FORCE_AVX2 #endif #define GLM_FORCE_SWIZZLE diff --git a/tests/unit/test_compressor.cpp b/tests/unit/test_compressor.cpp index c5aa2fff7..4f55ce0b8 100644 --- a/tests/unit/test_compressor.cpp +++ b/tests/unit/test_compressor.cpp @@ -113,3 +113,93 @@ TEST_CASE("compressor: without a pressure switch the air over the cut-out pressu REQUIRE(vehicle->CompressorFlag); // nothing stops it CHECK(vehicle->CompressedVolume < 8.5 * 0.81); // a fifth of the air let out } + +TEST_CASE("compressor: an engine stopped before the delay passed counts the whole delay again") { + auto vehicle{compressor_vehicle(30.0)}; + vehicle->Mains = true; // engine started + run_compressor(vehicle, 20.0); + REQUIRE_FALSE(vehicle->CompressorFlag); + + vehicle->Mains = false; // engine stopped, 10 s short of the delay + run_compressor(vehicle, 1.0); + vehicle->Mains = true; + run_compressor(vehicle, 15.0); // 36 s since the first start, but only 15 s since this one + CHECK_FALSE(vehicle->CompressorFlag); + + run_compressor(vehicle, 15.1); + CHECK(vehicle->CompressorFlag); +} + +TEST_CASE("compressor: the start delay holds back a compressor switched on by hand too") { + auto vehicle{compressor_vehicle(30.0)}; + vehicle->CompressorStart = start_t::manual; + vehicle->CompressorAllow = true; // switch in the cabinet on before the engine start + vehicle->Mains = true; + + run_compressor(vehicle, 29.9); + CHECK_FALSE(vehicle->CompressorFlag); + run_compressor(vehicle, 0.2); + CHECK(vehicle->CompressorFlag); +} + +TEST_CASE("compressor: the start delay is read from the brake section") { + auto const delay{[](std::string const &Section) { + return vehicle{definition::load("wagon").set(Section, "CompressorStartDelay", 30)}->CompressorStartDelay; + }}; + CHECK(delay("Brake") == doctest::Approx(30.0)); + CHECK(delay("Cntrl") == doctest::Approx(0.0)); // the key isn't taken from the control section +} + +namespace { + +// 401Da: the compressor runs from the 110 V of the auxiliary generator driven by the engine, here the converter +// started with the main circuit, which gets up to voltage the converter start delay after the engine start +definition generator_vehicle(double const ConverterDelay, double const CompressorDelay) { + return definition::load("cab_vehicle") + .set("Param", "PWR", 370) + .set("Light", "Light", "Generator") + .set("Light", "LMaxVoltage", 110) + .set("Brake", "Vv", 0.6) + .set("Brake", "MinCP", 6.5) + .set("Brake", "MaxCP", 8.0) + .set("Brake", "CompressorSpeed", 0.003) + .set("Brake", "CompressorPower", "Converter") + .set("Brake", "CompressorStartDelay", CompressorDelay) + .set("Cntrl", "CompressorStart", "Automatic") + .set("Cntrl", "ConverterStart", "Automatic") + .set("Cntrl", "ConverterStartDelay", ConverterDelay); +} + +} // namespace + +TEST_CASE("compressor: fed from the converter it waits for the converter start delay") { + vehicle loco{generator_vehicle(30.0, 0.0)}; + REQUIRE(loco->CompressorPower == 2); + REQUIRE(loco->ConverterStartDelay == doctest::Approx(30.0)); + + loco.run(1.0); // engine off + CHECK_FALSE(loco->Power110vIsAvailable); + + loco->Mains = true; // engine started + loco.run(25.0); + CHECK_FALSE(loco->Power110vIsAvailable); + CHECK_FALSE(loco->CompressorFlag); + + loco.run(10.0); + CHECK(loco->Power110vIsAvailable); + CHECK(loco->CompressorFlag); +} + +TEST_CASE("compressor: fed from the converter the start delay counts from the converter voltage") { + vehicle loco{generator_vehicle(20.0, 10.0)}; + REQUIRE(loco->CompressorStartDelay == doctest::Approx(10.0)); + + loco.run(1.0); // engine off + loco->Mains = true; // engine started + loco.run(25.0); + REQUIRE(loco->Power110vIsAvailable); // the converter is up + CHECK_FALSE(loco->CompressorFlag); // but the compressor waits for its own delay as well + + loco.run(10.0); + CHECK(loco->CompressorFlag); +} diff --git a/tests/unit/test_oil_pump.cpp b/tests/unit/test_oil_pump.cpp new file mode 100644 index 000000000..a5f623233 --- /dev/null +++ b/tests/unit/test_oil_pump.cpp @@ -0,0 +1,55 @@ +#include "stdafx.h" +#include "doctest.h" +#include "vehicle.h" + +using test::definition; +using test::vehicle; + +// the oil pump lamp of the cab (i-oilpump) shows OilPump.is_active: the pre-lubrication pump of 401Da, which works +// before the engine start and stops once the engine runs and makes the oil pressure itself (eu07/maszyna#546) +// NOTE: the test vehicle has no diesel engine, so the pump check is called the way dizel_Update() calls it + +TEST_CASE("oil pump: the pre-lubrication pump works before the engine start and stops once the engine runs") { + vehicle loco{definition::load("cab_vehicle").set("Cntrl", "OilStart", "Manual")}; + REQUIRE(loco->OilPump.start_type == start_t::manual); + loco->Power24vIsAvailable = true; // battery on + + loco->OilPumpCheck(0.01); + CHECK_FALSE(loco->OilPump.is_active); // not switched on yet + + loco->OilPump.is_enabled = true; // pump switch on: pre-lubrication + loco->OilPumpCheck(0.01); + CHECK(loco->OilPump.is_active); + + loco->Mains = true; // engine started + loco->OilPumpCheck(0.01); + CHECK_FALSE(loco->OilPump.is_active); +} + +TEST_CASE("oil pump: the pump started with the engine start procedure stops once the engine runs") { + vehicle loco{definition::load("cab_vehicle").set("Cntrl", "OilStart", "Automatic")}; + REQUIRE(loco->OilPump.start_type == start_t::automatic); + loco->Power24vIsAvailable = true; + + loco->dizel_startup = true; // starter button pressed + loco->OilPumpCheck(0.01); + CHECK(loco->OilPump.is_active); + + loco->dizel_startup = false; // start procedure done, the pump keeps working until the engine runs + loco->OilPumpCheck(0.01); + CHECK(loco->OilPump.is_active); + + loco->Mains = true; + loco->OilPumpCheck(0.01); + CHECK_FALSE(loco->OilPump.is_active); +} + +TEST_CASE("oil pump: without power the pump and its lamp stay off") { + vehicle loco{definition::load("cab_vehicle")}; + loco->Power24vIsAvailable = false; + loco->Power110vIsAvailable = false; + + loco->OilPump.is_enabled = true; + loco->OilPumpCheck(0.01); + CHECK_FALSE(loco->OilPump.is_active); +} diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index d5f60e332..2da371e86 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -557,6 +557,33 @@ void TDynamicObject::UpdateAxle(TAnim *pAnim) pAnim->smAnimated->future_transform = glm::rotate((float)glm::radians(m_future_wheels_angle[wheel_id]), glm::vec3(1.0f, 0.0f, 0.0f)); }; +// angle of a slotted lever for given angle of the wheel, which drives the coupling rod with the pin +// all points of the coupling rod move along circles of crank radius, the lever follows the pin sliding in its slot +double TDynamicObject::slottedlever_angle( slottedlever_data const &Lever, double const Wheelangle ) { + // crank turned around X axis, the same way as the wheel + auto const wheelangle { glm::radians( Wheelangle ) }; + auto const crank { glm::dvec2( + Lever.crank.x * std::cos( wheelangle ) - Lever.crank.y * std::sin( wheelangle ), + Lever.crank.x * std::sin( wheelangle ) + Lever.crank.y * std::cos( wheelangle ) ) }; + auto const pin { Lever.pin - Lever.crank + crank }; + // angle relative to the pose of the lever in the model, which matches wheel angle 0 + return glm::degrees( std::atan2( pin.y, pin.x ) - std::atan2( Lever.pin.y, Lever.pin.x ) ); +} + +void TDynamicObject::update_slottedlevers() { + + for( auto const &lever : m_slottedlevers ) { + auto const wheelid { ( + ( lever.axle < iAnimType[ ANIM_WHEELS ] ) && ( lever.axle < static_cast( pAnimations.size() ) ) ? + pAnimations[ lever.axle ].dWheelAngle : + 1 ) }; // driving wheels and coupling rods by default + auto const angle { slottedlever_angle( lever, dWheelAngle[ wheelid ] ) }; + auto const futureangle { slottedlever_angle( lever, dWheelAngle[ wheelid ] + m_future_wheels_angle[ wheelid ] ) }; + lever.submodel->SetRotate( float3( 1, 0, 0 ), angle ); + lever.submodel->future_transform = glm::rotate( (float)glm::radians( std::remainder( futureangle - angle, 360.0 ) ), glm::vec3( 1.0f, 0.0f, 0.0f ) ); + } +} + // animacja drzwi - przesuw void TDynamicObject::UpdateDoorTranslate(TAnim *pAnim) { if( pAnim->smAnimated == nullptr ) { return; } @@ -841,6 +868,7 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) animation.yUpdate( &animation ); } } + update_slottedlevers(); if( mdModel != nullptr && ObjSqrDist < 50 * 50 ) { @@ -5739,6 +5767,35 @@ void TDynamicObject::LoadMMediaFile( std::string const &TypeName, std::string co } } + else if( token == "animslottedlever:" ) { + // lever with a slot, turned by a pin on the coupling rod (e.g. speedometer drive) + // parameters: submodel name, number of axle (from animwheelprefix) driving the coupling rod, crank radius [m], + // pin position relative to the lever axis [m] and crank angle [deg] for wheel angle 0, in local (Y, Z) plane of the lever + // angle is measured from Y axis towards Z axis, i.e. in the direction of rotation around X axis + slottedlever_data lever; + int axle { 1 }; + double crankradius { 0.0 }; + double crankangle { 0.0 }; + parser.getTokens( 6, false ); + parser + >> asAnimName + >> axle + >> crankradius + >> lever.pin.x + >> lever.pin.y + >> crankangle; + lever.submodel = GetSubmodelFromName( mdModel, asAnimName ); + if( lever.submodel != nullptr ) { + lever.submodel->WillBeAnimated(); + lever.axle = std::max( 0, axle - 1 ); + lever.crank = crankradius * glm::dvec2( std::cos( glm::radians( crankangle ) ), std::sin( glm::radians( crankangle ) ) ); + m_slottedlevers.emplace_back( lever ); + } + else { + ErrorLog( "Bad model: " + asFileName + " - missed submodel " + asAnimName, logtype::model ); + } + } + else if( token == "animdoorprefix:" ) { // nazwa animowanych drzwi int i, j; diff --git a/vehicle/DynObj.h b/vehicle/DynObj.h index 577f0f020..9df2d93b6 100644 --- a/vehicle/DynObj.h +++ b/vehicle/DynObj.h @@ -316,6 +316,16 @@ private: TSubModel *sm_summer_variant {}; // submodel letniego wariantu TSubModel *sm_autumn_variant {}; // submodel jesiennego wariantu double fWahaczeAmp; + // levers with a slot, turned by a pin on the coupling rod sliding in the slot (e.g. speedometer drive of 401Da) + struct slottedlever_data { + TSubModel *submodel { nullptr }; // lever, turned around its local X axis like the wheels + int axle { 0 }; // index of the axle animation, whose crank drives the coupling rod + glm::dvec2 pin { 0.0 }; // pin position relative to the lever axis for wheel angle 0, in local (Y, Z) plane [m] + glm::dvec2 crank { 0.0 }; // crank vector for wheel angle 0, in local (Y, Z) plane [m] + }; + std::vector m_slottedlevers; + static double slottedlever_angle( slottedlever_data const &Lever, double const Wheelangle ); + void update_slottedlevers(); // Winger 160204 - pantografy double pantspeedfactor; // animacje typu przesuw diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index 9fdb97bf9..5f27f2720 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -9044,6 +9044,7 @@ bool TTrain::Update(double const Deltatime) btLampkaSprezarka.Turn(mvControlled->CompressorFlag); // mutopsitka dziala btLampkaSprezarkaOff.Turn(!mvControlled->CompressorFlag); btLampkaFuelPumpOff.Turn(!mvControlled->FuelPump.is_active); + btLampkaOilPump.Turn(mvControlled->OilPump.is_active); // pre-lubrication pump, goes off once the engine is started // boczniki // Ra: w SU45 boczniki wchodzą na ScndCtrlPos, a nie na ScndCtrlActualPos @@ -9203,6 +9204,7 @@ bool TTrain::Update(double const Deltatime) btLampkaSprezarka.Turn(false); btLampkaSprezarkaOff.Turn(false); btLampkaFuelPumpOff.Turn(false); + btLampkaOilPump.Turn(false); btLampkaBezoporowa.Turn(false); btLampkaHamowanie1zes.Turn(false); btLampkaHamienie.Turn(false); @@ -11236,6 +11238,7 @@ void TTrain::clear_cab_controls() btLampkaSprezarkaOff.Clear(); btLampkaSprezarkaBOff.Clear(); btLampkaFuelPumpOff.Clear(); + btLampkaOilPump.Clear(); btLampkaNapNastHam.Clear(); btLampkaOporyB.Clear(); btLampkaStycznB.Clear(); @@ -11658,6 +11661,7 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co {"i-compressoroff:", btLampkaSprezarkaOff}, {"i-compressorboff:", btLampkaSprezarkaBOff}, {"i-fuelpumpoff:", btLampkaFuelPumpOff}, + {"i-oilpump:", btLampkaOilPump}, {"i-voltbrake:", btLampkaNapNastHam}, {"i-resistorsb:", btLampkaOporyB}, {"i-contactorsb:", btLampkaStycznB}, diff --git a/vehicle/Train.h b/vehicle/Train.h index 009b349b4..e664c231a 100644 --- a/vehicle/Train.h +++ b/vehicle/Train.h @@ -760,6 +760,7 @@ public: // reszta może by?publiczna TButton btLampkaSprezarkaOff; TButton btLampkaSprezarkaBOff; TButton btLampkaFuelPumpOff; + TButton btLampkaOilPump; TButton btLampkaBocznik1; TButton btLampkaBocznik2; TButton btLampkaBocznik3; From 63fe5bde57ed6278d2c5587c76d36e80a2ca7d61 Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Sun, 8 Nov 2026 15:56:32 +0100 Subject: [PATCH 350/430] AI on up gradients: what the review found - The tractive force that tells the start on the train brake is over is projected on the direction of travel: Ft is in the vehicle's own frame, so a locomotive driven from its rear cab, or turned the other way in the consist, counted as nothing. - Rolling back faster than 0.5 km/h ends the start on the train brake, so the rules for a train slipping back apply the brakes again. - One threshold for an up gradient that rolls a standing train back, EU07_AI_UPHILLGRAVITY (-0.025 m/s2, about 2.5 per mille), for the stop hold, the locomotive brake on rollback, the start, uphill_brake_committed() and hold_train_coming_to_stand_uphill(); the stop hold and the rollback rule started at 0.5 per mille before, on almost level track. - hold_train_coming_to_stand_uphill() brakes on the brake's response time only for a train that is not to pull up further. - Starting against the brake keeps the train Ready only at a standstill; in motion a braking force left in the train stops it as before. --- vehicle/Driver.cpp | 24 +++++++++++++++++------- vehicle/Driver.h | 1 + 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 4f9205bc3..726523725 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -6014,7 +6014,9 @@ TController::determine_consist_state() { // once in motion a brake down to 0.4 bar counts as released (UIC), even if its distributor // is still in the lap position while the brake pipe recharges ( isbraking && bp > 0.4 ) || vehicle->Fb > 10000.0 ) { // 10 kN - Ready = heldforstart; // ready all the same only when the power goes on against the brake on purpose + // ready all the same only at a standstill with the power going on against the brake on purpose; + // in motion a braking force left anywhere in the train (a hand brake) stops it as before + Ready = heldforstart && ( vehicle->Vel < 1.0 ); } // Ra: odluźnianie przeładowanych lokomotyw, ciągniętych na zimno - prowizorka... if( bp >= 0.4 && (AIControllFlag || Global.AITrainman && mvOccupied->Vel < EU07_AI_NOMOVEMENT && !is_emu() && !is_dmu()) && BrakeCtrlPosition == gbh_RP // jest pozycja jazdy @@ -7280,7 +7282,7 @@ TController::hold_train_coming_to_stand_uphill() { || ( ( OrderCurrentGet() & Obey_train ) == 0 ) || ( VelNext != 0.0 ) || ( ActualProximityDist > fMaxProximityDist ) - || ( fAccGravity >= -0.025 ) ) { + || ( fAccGravity >= EU07_AI_UPHILLGRAVITY ) ) { return; } auto const vel { DirectionalVel() }; @@ -7295,6 +7297,8 @@ TController::hold_train_coming_to_stand_uphill() { // once the time left to the stand is no longer than half of what the brake takes to apply, apply it; any // sooner and the brake takes off more of the distance than the stop was planned with || ( ( BrakeSystem == TBrakeSystem::Pneumatic ) + // not for a train that is short of where it is to stop and is to pull up further + && ( AccDesired <= 0.0 ) && ( vel / 3.6 / -fAccGravity <= 0.5 * brake_response_horizon( mvOccupied, BrakeSystem, 1.0, fBrake_a0[ 0 ] ) ) ) ) { // the gradient alone already slows the train down nearly this much; ask for enough on top of it that // the brake is applied for sure, not held back by the margin against small corrections @@ -8220,7 +8224,7 @@ void TController::control_uphill_start() { ( BrakeSystem == TBrakeSystem::Pneumatic ) && is_train() && ( false == is_emu() ) && ( false == is_dmu() ) // a multiple unit has no locomotive to hold a train behind it - && ( fAccGravity < -0.01 ) }; + && ( fAccGravity < EU07_AI_UPHILLGRAVITY ) }; false == uphill ) { bUphillStart = false; return; @@ -8242,13 +8246,19 @@ void TController::control_uphill_start() { bUphillStart = false; return; } + if( velocity < -0.5 ) { + // rolling back all the same: the rules for a train slipping back take over and apply the brakes + bUphillStart = false; + return; + } if( ( mvOccupied->LocalBrake != TLocalBrake::ManualBrake ) && ( mvOccupied->LocalBrakePosA > 0.0 ) ) { cue_action( driver_hint::independentbrakerelease ); } auto tractiveforce { 0.0 }; for( auto const *vehicle { pVehicles[ end::front ] }; vehicle != nullptr; vehicle = vehicle->Next() ) { - tractiveforce += std::max( 0.0, vehicle->MoverParameters->Ft ); + // Ft is signed in the vehicle's own frame + tractiveforce += std::max( 0.0, vehicle->MoverParameters->Ft * ( vehicle->DirectionGet() == iDirection ? 1 : -1 ) ); } auto const holdingforce { fMass * -fAccGravity }; if( ( velocity > 1.0 ) @@ -8306,7 +8316,7 @@ TController::uphill_stop_hold() const { ( BrakeSystem == TBrakeSystem::Pneumatic ) && is_train() && ( ( OrderCurrentGet() & Obey_train ) != 0 ) && ( VelNext == 0.0 ) && ( ActualProximityDist <= fMaxProximityDist ) - && ( fAccGravity < -0.005 ) + && ( fAccGravity < EU07_AI_UPHILLGRAVITY ) && ( std::abs( DirectionalVel() ) < 10.0 ) // not while the train is to be driven on && ( AccDesired <= 0.0 ) ); @@ -8321,7 +8331,7 @@ TController::uphill_brake_committed( double const Velocity ) const { return ( ( BrakeSystem == TBrakeSystem::Pneumatic ) && ( BrakeCtrlPosition > 0.0 ) - && ( fAccGravity < -0.025 ) + && ( fAccGravity < EU07_AI_UPHILLGRAVITY ) && ( Velocity / 3.6 / -fAccGravity < brake_response_horizon( mvOccupied, BrakeSystem, -1.0, fBrake_a0[ 0 ] ) ) ); } @@ -8432,7 +8442,7 @@ void TController::control_braking_force() { // a train that has slowed down short of where it is to stop and is to pull up further does not get it && ( VelDesired <= std::abs( velocity ) + 0.5 ) && ( ActualProximityDist - uphill_stopping_distance( std::abs( velocity ), fAccGravity ) <= stopping_margin() ) ) - || ( ( BrakeSystem == TBrakeSystem::Pneumatic ) && ( fAccGravity < -0.005 ) && ( velocity < -0.1 ) && ( AccDesired <= 0.0 ) ) ) ) { + || ( ( BrakeSystem == TBrakeSystem::Pneumatic ) && ( fAccGravity < EU07_AI_UPHILLGRAVITY ) && ( velocity < -0.1 ) && ( AccDesired <= 0.0 ) ) ) ) { cue_action( driver_hint::independentbrakeapply ); } // stop-gap measure to ensure cars actually brake to stop even when above calculactions go awry diff --git a/vehicle/Driver.h b/vehicle/Driver.h index 6a4db3003..4908936c0 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -24,6 +24,7 @@ auto const EU07_AI_NOACCELERATION = -0.05; auto const EU07_AI_BRAKINGTESTACCELERATION = -0.06; auto const EU07_AI_NOMOVEMENT = 0.05; // standstill velocity threshold auto const EU07_AI_MOVEMENT = 1.0; // deliberate movement velocity threshold +auto const EU07_AI_UPHILLGRAVITY = -0.025; // [m/s2] about 2.5 per mille up: the gradient that rolls a standing train back auto const EU07_AI_SPEEDLIMITEXTENDSBEYONDSCANRANGE = 10000.0; enum TOrders From 8cc8158d2a18aed45fd9a9a98be2f7e8df638fcb Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Sun, 8 Nov 2026 16:12:51 +0100 Subject: [PATCH 351/430] AI: making for a passenger stop, leave room only for the brake's own fill time Since #187 the braking curve towards a stop or a lower speed leaves room for the time the brake takes to respond, as long as the train brake handle is still in the running position. The horizon it takes has the AI's old look-ahead, (1 - a0) * 30/3.6 s, about 7-8 s, as its floor; at 60 km/h that is over 100 m, up to half of the braking distance. Stops at signals were tuned with it. A vehicle that brakes with its independent brake (an SN61, a light engine) leaves the train brake handle where it is, so it kept that room the whole way in: it braked early and gently, came down to 10 km/h some 50 m out and crawled the rest, applying power and the brake in turn. Making for a passenger stop (the point the train is to stop at, found by the scan of the route, is a W4), the room now covers only the time the brake takes to fill (half its application time), without the look-ahead floor. Stops at signals and anything else keep the room as it was. When a vehicle ahead is closer than the stop the scan found, the train makes for that vehicle, so the room is the full one again. --- vehicle/Driver.cpp | 14 +++++++++++++- vehicle/Driver.h | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 21aed82ab..bf0e18318 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -882,6 +882,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN auto speedlimitiscontinuous { true }; // stays true if potential active speed limit is unbroken to the last (relevant) point in scan table eSignNext = nullptr; IsAtPassengerStop = false; + bStopTargetIsPassengerStop = false; IsScheduledPassengerStopVisible = false; mvOccupied->SecuritySystem.set_cabsignal_lock(false); // te flagi są ustawiane tutaj, w razie potrzeby @@ -1001,6 +1002,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN fAcc = a; // zalecane przyspieszenie (nie musi być uwzględniane przez AI) fNext = v; // istotna jest prędkość na końcu tego odcinka fDist = d; // dlugość odcinka + bStopTargetIsPassengerStop = ( v == 0.0 ) && ( ( point.iFlags & spPassengerStopPoint ) != 0 ); } /* else if ((fAcc > 0) && (v >= 0) && (v > fNext)) { @@ -1015,6 +1017,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN fAcc = a; fNext = v; fDist = d; + bStopTargetIsPassengerStop = ( v == 0.0 ) && ( ( point.iFlags & spPassengerStopPoint ) != 0 ); } // potentially update our current speed limit if( v < VelLimitLastDist.first @@ -7377,6 +7380,10 @@ TController::adjust_desired_speed_for_obstacles() { if( k - vel < 5 ) { // porównanie modułów prędkości [km/h] // zatroszczyć się trzeba, jeśli tamten nie jedzie znacząco szybciej + if( Obstacle.distance < ActualProximityDist ) { + // the vehicle ahead, not the stop found by the scan, is what the train is now to stop short of + bStopTargetIsPassengerStop = false; + } ActualProximityDist = std::min( ActualProximityDist, Obstacle.distance ); @@ -7720,9 +7727,14 @@ TController::adjust_desired_speed_for_target_speed( double const Range ) { auto room { brakingroom }; if( ( AbsAccS <= 0.0 ) && ( BrakeCtrlPosition <= 0.0 ) ) { // only while the brake is still to be applied: once it acts, the room it needs to respond is behind + // making for a passenger stop only the time the brake takes to fill: the look-ahead the horizon + // keeps as its floor was set for the stops at a signal, and a vehicle that brakes with its + // independent brake, which leaves the train brake handle where it is, kept braking earlier + // and earlier the whole way in, to crawl the last tens of metres to the stop point + auto const brakea0 { bStopTargetIsPassengerStop ? 1.0 : fBrake_a0[ 0 ] }; room = std::max( 0.5 * brakingroom, - brakingroom - vel / 3.6 * brake_response_horizon( mvOccupied, BrakeSystem, 1.0, fBrake_a0[ 0 ] ) ); + brakingroom - vel / 3.6 * brake_response_horizon( mvOccupied, BrakeSystem, 1.0, brakea0 ) ); } deceleration = shaped_braking_demand( velocity, VelNext, room + 0.1 / 25.92, fAccGravity, diff --git a/vehicle/Driver.h b/vehicle/Driver.h index 68964711c..dd5403789 100644 --- a/vehicle/Driver.h +++ b/vehicle/Driver.h @@ -404,6 +404,7 @@ private: double VelDesired = 0.0; // predkość, z jaką ma jechać, wynikająca z analizy tableki; <=VelSignal double fAccDesiredAv = 0.0; // uśrednione przyspieszenie z kolejnych przebłysków świadomości, żeby ograniczyć migotanie double fBrakeHeldTime = 0.0; // czas od ostatniego przestawienia kranu hamulca zasadniczego + bool bStopTargetIsPassengerStop = false; // the point the train is to stop at, found by the last scan of the route, is a passenger stop double fShortfall = 0.0; // how far the train fell short of the braking demand at the last check [m/s2] double fShortfallTime = 0.0; // when that was checked int iShortfallGrowth = 0; // how many checks in a row the shortfall has grown From 200d3ae73b25ffa355bb4e40ebc220d5015397e0 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 17:37:56 +0100 Subject: [PATCH 352/430] fix: review of the EN57 EP brake (Sonar null check, EP fuse of the cab car, AI re-asserts the EP brake) - tests: REQUIRE the brake handle before dereferencing it (Sonar cpp:S2259) - TESt::FillBrakeRes is const (S5817) - cab EP brake command: drop the mvControlled->EpFuse check, SwitchEPBrake already checks the cab car's (mvOccupied) EP fuse with the control supply - AI: with the handle already at the EP brake position, switch the EP brake on again once the control supply is back --- McZapkie/hamulce.cpp | 2 +- McZapkie/hamulce.h | 2 +- tests/unit/test_brake_handles.cpp | 5 +++++ vehicle/Driver.cpp | 8 ++++++++ vehicle/Train.cpp | 4 +++- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp index da0a98116..9411dc425 100644 --- a/McZapkie/hamulce.cpp +++ b/McZapkie/hamulce.cpp @@ -977,7 +977,7 @@ double TESt::BVs(double const BCP) const /// Brake cylinder (or impulse-chamber) pressure. /// Time step [s]. /// Volume taken into the auxiliary reservoir, 0.96 of it drawn from the brake pipe. -double TESt::FillBrakeRes(double const BCP, double const dt) +double TESt::FillBrakeRes(double const BCP, double const dt) const { double const BVP{BrakeRes->P()}; double const VVP{ValveRes->P()}; diff --git a/McZapkie/hamulce.h b/McZapkie/hamulce.h index b9a5ffd15..2fb433a85 100644 --- a/McZapkie/hamulce.h +++ b/McZapkie/hamulce.h @@ -628,7 +628,7 @@ class TESt : public TBrake /// Brake cylinder (or impulse-chamber) pressure for . /// Time step [s]. /// Volume taken into the auxiliary reservoir, 0.96 of it drawn from the brake pipe. - double FillBrakeRes(double BCP, double dt); // napelnianie pomocniczego z rozdzielacza + double FillBrakeRes(double BCP, double dt) const; // napelnianie pomocniczego z rozdzielacza /// Vents the valve, brake and control reservoirs to zero. void ForceEmptiness() override; // wymuszenie bycia pustym diff --git a/tests/unit/test_brake_handles.cpp b/tests/unit/test_brake_handles.cpp index e6b435471..1490e43d8 100644 --- a/tests/unit/test_brake_handles.cpp +++ b/tests/unit/test_brake_handles.cpp @@ -36,6 +36,7 @@ void hold(vehicle &Vehicle, test::trace &Trace, std::string const &Event, double // every position of the driver's handle, recorded in the trace void every_position(vehicle &Vehicle, test::trace &Trace) { Vehicle.hold_main_reservoir(std::max(Vehicle->MaxCompressor, 8.0)); + REQUIRE(Vehicle->Handle != nullptr); auto &handle{*Vehicle->Handle}; Vehicle.record(Trace); @@ -97,6 +98,7 @@ TEST_CASE("brake handles: the local brake handle of every real vehicle") { real.hold_main_reservoir(std::max(real->MaxCompressor, 8.0)); test::trace trace{"local brake/" + path, handle_channels(), 100}; real.record(trace); + REQUIRE(real->Handle != nullptr); real->BrakeLevelSet(real->Handle->GetPos(bh_RP)); trace.mark("charge"); real.run(60.0); @@ -127,6 +129,7 @@ TEST_CASE("brake handles: the overload and the high pressure buttons of the MHZ real.hold_main_reservoir(std::max(real->MaxCompressor, 8.0)); test::trace trace{"brake handles/buttons/" + name, handle_channels(), 100}; real.record(trace); + REQUIRE(real->Handle != nullptr); auto &handle{*real->Handle}; auto const at{[&trace, &real](std::string const &Event, double Position, double Seconds) { trace.mark(Event); @@ -167,6 +170,7 @@ void ready_knorr_ep(test::consist &Unit) { Unit.add(definition::fiz("en57_v1/5bgb")); auto &cab{Unit[0]}; REQUIRE(cab->BrakeHandle == TBrakeHandle::St113); + REQUIRE(cab->Handle != nullptr); cab->BatterySwitch(true); cab->CabActivisation(); cab.hold_brake_pipe(5.0); @@ -190,6 +194,7 @@ TEST_CASE("brake handles: the positions of the Knorr St113 EP brake") { test::consist unit; ready_knorr_ep(unit); auto &cab{unit[0]}; + REQUIRE(cab->Handle != nullptr); auto &handle{*cab->Handle}; auto const ep_at{[&unit, &cab, &handle](double Position) { cab->BrakeLevelSet(Position); diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 9f83b6d53..d174a377c 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -3126,6 +3126,14 @@ bool TController::IncBrake() mvOccupied->SwitchEPBrake( 1 ); // to nie chce działać OK = true; } + else if( ( mvOccupied->Handle->GetPos( bh_EPR ) - mvOccupied->Handle->GetPos( bh_EPN ) < 0.1 ) + && ( mvOccupied->EpForce <= 0.0 ) + && ( mvOccupied->EPBrakeControlPowered() ) ) { + // the handle already in the EP brake position, but the EP brake dropped out with the control's + // supply (e.g. the EP fuse off in the running brake test): switch it on again + mvOccupied->SwitchEPBrake( 1 ); + OK = ( mvOccupied->EpForce > 0.0 ); + } else OK = false; break; diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index e30635f4f..333d99a69 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -2235,7 +2235,9 @@ void TTrain::OnCommand_wheelspinbrakeactivate(TTrain *Train, command_data const // visual feedback Train->ggAntiSlipButton.UpdateValue(1.0, Train->dsbPneumaticSwitch); - if (Train->mvOccupied->BrakeHandle == TBrakeHandle::St113 && Train->mvControlled->EpFuse == true) + // the EP fuse is the cab car's (Ctrl+Z switches mvOccupied's), checked by SwitchEPBrake with the rest of + // the control's supply + if (Train->mvOccupied->BrakeHandle == TBrakeHandle::St113) { Train->mvOccupied->SwitchEPBrake(1); } From 91e0d90e8daa12a0861663271c1683a593a38e09 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 17:38:59 +0100 Subject: [PATCH 353/430] fix: review of the separate engine start switches (eu07/maszyna#80) - initialise the cooling power read from the .fiz to its default, no division by an indeterminate value - integer step counters in the engine start tests - main_sw opening the consist turns the two-state mainb_sw / mainc_sw off too, left on they'd start the engines again - the doc comment of MainCircuitOpensWithStarterOnly() back on it; the .fiz read is the controlled vehicle's --- McZapkie/MOVER.h | 6 +++--- McZapkie/Mover.cpp | 2 +- tests/unit/test_engine_start.cpp | 17 +++++++++++------ vehicle/Train.cpp | 12 ++++++++++++ vehicle/enginestart.h | 7 ++++--- 5 files changed, 31 insertions(+), 13 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 3d0f7b777..1d9ca414b 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -2475,15 +2475,15 @@ class TMoverParameters } return false == StLinFlag && MainCircuitLampsEnabled(); } - // whether the cab command opening the main circuit opens it where the only cab switch of the circuit is the button - // closing it: on a diesel that's the starter button, and the command is the one way to stop an engine whose fuel pump - // starts on its own (eu07/maszyna#427). the other vehicles with such a button keep ignoring the command // the vehicles the line breaker / engine start switch of this vehicle works, and its engine stopping on its own // stops: the whole consist, or with JointEngineStart=No this vehicle alone (eu07/maszyna#80) range_t MainSwitchRange() const { return JointEngineStart ? range_t::consist : range_t::local; } + // whether the cab command opening the main circuit opens it where the only cab switch of the circuit is the button + // closing it: on a diesel that's the starter button, and the command is the one way to stop an engine whose fuel pump + // starts on its own (eu07/maszyna#427). the other vehicles with such a button keep ignoring the command bool MainCircuitOpensWithStarterOnly() const { return EngineType == TEngineType::DieselEngine || EngineType == TEngineType::DieselElectric; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index e48ae4e11..f6697d934 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -11394,7 +11394,7 @@ void TMoverParameters::LoadFIZ_Engine(std::string const &Input) // water heater extract_value(WaterHeater.config.temp_min, "HeaterMinTemperature", Input, ""); extract_value(WaterHeater.config.temp_max, "HeaterMaxTemperature", Input, ""); - float pf; + float pf{ 1235.f }; extract_value(pf, "NominalCoolingPower", Input, "1235"); dizel_heat.powerfactor = 1235 / pf; } diff --git a/tests/unit/test_engine_start.cpp b/tests/unit/test_engine_start.cpp index 6524075c3..e763a4404 100644 --- a/tests/unit/test_engine_start.cpp +++ b/tests/unit/test_engine_start.cpp @@ -42,10 +42,17 @@ bool running(TMoverParameters const &Vehicle) { return Vehicle.Mains && Vehicle.enrot > 0.5 * Vehicle.dizel_nmin; } +// the time step of the train in the loops below +auto const dt{0.01}; + +// the count of the steps of dt making up Seconds +int steps(double const Seconds) { + return static_cast(std::lround(Seconds / dt)); +} + // the switch of Engine held closed for Seconds, then let go, in steps of the train void hold(consist &Train, engine_start::remote_switch &Switch, TMoverParameters *Engine, double const Seconds, bool const Closesonrelease = false) { - auto const dt{0.01}; - for (auto time = 0.0; time < Seconds; time += dt) { + for (auto step = 0; step < steps(Seconds); ++step) { Switch.update(Engine, true, false, dt, Closesonrelease); Train.step({}, dt); } @@ -185,8 +192,7 @@ TEST_CASE("engine start: the switch of another vehicle is held for the vehicle's hold(train, switchb, &second, 1.0); CHECK_FALSE(engine_start::remote_switch::is_running(second)); // the switch opening the circuit held along, the closing one does nothing - auto const dt{0.01}; - for (auto time = 0.0; time < 3.0; time += dt) { + for (auto step = 0; step < steps(3.0); ++step) { switchb.update(&second, true, true, dt, false); train.step({}, dt); } @@ -204,9 +210,8 @@ TEST_CASE("engine start: a switch closing on release, as an electric locomotive' auto &second{train.add(sn61(false).set("Cntrl", "IniCDelay", "1.0")).mover()}; prepare(train); engine_start::remote_switch switchb; - auto const dt{0.01}; // held past the delay, the circuit stays open while the switch is held - for (auto time = 0.0; time < 2.0; time += dt) { + for (auto step = 0; step < steps(2.0); ++step) { switchb.update(&second, true, false, dt, true); train.step({}, dt); } diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index ab60371c4..8fa708c29 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -3727,6 +3727,18 @@ void TTrain::OnCommand_linebreakeropen(TTrain *Train, command_data const &Comman if (true == Train->mvControlled->MainSwitch(false, Train->mvControlled->MainSwitchRange())) { Train->m_linebreakerstate = 0; + if (Train->mvControlled->MainSwitchRange() != range_t::local) + { + // the engines of the vehicles in multiple stopped along: their two-state switches go off too, left on + // they'd start them again after the delay + for (auto &controls : Train->m_remotelinebreakers) + { + if (controls.main_switch.SubModel != nullptr && controls.main_switch.type() == TGaugeType::toggle) + { + controls.main_switch.UpdateValue(0.0); + } + } + } } } else if (Command.action == GLFW_RELEASE) diff --git a/vehicle/enginestart.h b/vehicle/enginestart.h index beedab106..77b6a2d93 100644 --- a/vehicle/enginestart.h +++ b/vehicle/enginestart.h @@ -13,9 +13,10 @@ class TMoverParameters; // starting the engines (closing the line breakers) of the vehicles in multiple from the cab (eu07/maszyna#80). in // vehicles like the ST43, the SP32 or the SN61 every engine of the train has its own switches in the cab: main_* work -// the cab's own vehicle, mainb_* the second one and mainc_* the third one under its control. Engine:JointEngineStart=No -// in the .fiz of the cab's vehicle keeps main_* to that vehicle alone (TMoverParameters::MainSwitchRange()); by -// default it works all of them, as before. +// the vehicle the cab controls (TTrain::mvControlled: the cab's own vehicle, on an EMU its motor car), mainb_* the +// second one and mainc_* the third one under its control. Engine:JointEngineStart=No in the .fiz of the controlled +// vehicle (on an EMU the motor car's, not the one of the car with the cab) keeps main_* to that vehicle alone +// (TMoverParameters::MainSwitchRange()); by default it works all of them, as before. namespace engine_start { // the Number-th vehicle with an engine under the cab's control: 1 is Controlled, the cab's own; then the others From dc4cc45769c8e53c7a618d5f08efb554e3c2f860 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 17:45:01 +0100 Subject: [PATCH 354/430] fix: the diesel throttle marker follows the controller only with a scaletable: A mainctrlact: without a scaletable: (the shipped ST43 cabs) keeps its marker still, as before, instead of sweeping on an unchecked linear scale. A gauge redefined in the fixed form drops the scaletable: of its earlier definition. --- tests/unit/test_gauge_scale.cpp | 46 +++++++++++++++++++++++---------- vehicle/Gauge.cpp | 2 ++ vehicle/Gauge.h | 3 +++ vehicle/Train.cpp | 2 +- vehicle/mainctrlact.h | 7 +++-- 5 files changed, 44 insertions(+), 16 deletions(-) diff --git a/tests/unit/test_gauge_scale.cpp b/tests/unit/test_gauge_scale.cpp index 57486cee2..04fa645bb 100644 --- a/tests/unit/test_gauge_scale.cpp +++ b/tests/unit/test_gauge_scale.cpp @@ -79,7 +79,7 @@ TEST_CASE("gauge scale: two points of the same value make a step") { CHECK(gauge_scale::interpolate(table.points, 1.5f) == doctest::Approx(0.55)); } -TEST_CASE("main ctrl act: the marker of a diesel locomotive follows its controller (MaSzyna-EU07/maszyna#74)") { +TEST_CASE("main ctrl act: the marker of a diesel locomotive with a scaletable: follows its controller (MaSzyna-EU07/maszyna#74)") { // nothing sets the actual position of a diesel engine's controller, the marker stayed at 0 for (auto const *path : {"st44_v2/m62-1151", "sm42_v1/6d1", "su45_v2/301d"}) { CAPTURE(path); @@ -89,22 +89,42 @@ TEST_CASE("main ctrl act: the marker of a diesel locomotive follows its controll REQUIRE(locomotive.EIMCtrlType == 0); locomotive.MainCtrlPos = 5; CHECK(locomotive.MainCtrlActualPos == 0); - CHECK(main_ctrl_act::position(locomotive) == doctest::Approx(5.0)); + CHECK(main_ctrl_act::position(locomotive, true) == doctest::Approx(5.0)); // one with a controller of the EIM kind keeps its actual position itself locomotive.EIMCtrlType = 2; - CHECK(main_ctrl_act::position(locomotive) == doctest::Approx(0.0)); + CHECK(main_ctrl_act::position(locomotive, true) == doctest::Approx(0.0)); + } +} + +TEST_CASE("main ctrl act: the marker of a diesel locomotive without a scaletable: stays still, as before") { + // the shipped ST43 cabs define mainctrlact: with a linear scale nobody has seen working; it is not opted in + for (auto const *path : {"st44_v2/m62-1151", "sm42_v1/6d1", "su45_v2/301d"}) { + CAPTURE(path); + consist train; + auto &locomotive{train.add(definition::fiz(path), 1).mover()}; + REQUIRE(locomotive.EIMCtrlType == 0); + locomotive.MainCtrlPos = 5; + locomotive.ScndCtrlPos = 1; + for (auto const coupled : {false, true}) { + CAPTURE(coupled); + locomotive.CoupledCtrl = coupled; + CHECK(main_ctrl_act::position(locomotive, false) == doctest::Approx(0.0)); + } } } TEST_CASE("main ctrl act: the marker of an electric locomotive shows its actual position, as before") { - consist train; - auto &locomotive{train.add(definition::fiz("et22_v3/201e-w"), 1).mover()}; - locomotive.MainCtrlPos = 10; - locomotive.MainCtrlActualPos = 3; - locomotive.ScndCtrlPos = 2; - locomotive.ScndCtrlActualPos = 1; - locomotive.CoupledCtrl = false; - CHECK(main_ctrl_act::position(locomotive) == doctest::Approx(3.0)); - locomotive.CoupledCtrl = true; - CHECK(main_ctrl_act::position(locomotive) == doctest::Approx(4.0)); + for (auto const scaletable : {false, true}) { + CAPTURE(scaletable); + consist train; + auto &locomotive{train.add(definition::fiz("et22_v3/201e-w"), 1).mover()}; + locomotive.MainCtrlPos = 10; + locomotive.MainCtrlActualPos = 3; + locomotive.ScndCtrlPos = 2; + locomotive.ScndCtrlActualPos = 1; + locomotive.CoupledCtrl = false; + CHECK(main_ctrl_act::position(locomotive, scaletable) == doctest::Approx(3.0)); + locomotive.CoupledCtrl = true; + CHECK(main_ctrl_act::position(locomotive, scaletable) == doctest::Approx(4.0)); + } } diff --git a/vehicle/Gauge.cpp b/vehicle/Gauge.cpp index 18750c93a..e952da6fa 100644 --- a/vehicle/Gauge.cpp +++ b/vehicle/Gauge.cpp @@ -112,6 +112,8 @@ void TGauge::Load( cParser &Parser, TDynamicObject const *Owner, double const mu Parser.getTokens(); if( Parser.peek() != "{" ) { // old fixed size config + // it has no scaletable:, drop the one of an earlier definition of the same control + m_scaletable.clear(); Parser >> submodelname; gaugetypename = Parser.getToken( true ); Parser.getTokens( 3, false ); diff --git a/vehicle/Gauge.h b/vehicle/Gauge.h index 59faff3f1..b79f8de8d 100644 --- a/vehicle/Gauge.h +++ b/vehicle/Gauge.h @@ -67,6 +67,9 @@ public: return ( static_cast( type() ) & static_cast( TGaugeType::toggle ) ) != 0; } bool is_delayed() const { return ( static_cast( type() ) & static_cast( TGaugeType::delayed ) ) != 0; } + // true if the gauge was given a non-uniform scale (scaletable:) + bool has_scaletable() const { + return false == m_scaletable.empty(); } // members TSubModel *SubModel { nullptr }; // McZapkie-310302: zeby mozna bylo sprawdzac czy zainicjowany poprawnie TSubModel *SubModelOn { nullptr }; // optional submodel visible when the state input is set diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index 050717419..2b0e04fe6 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -9337,7 +9337,7 @@ bool TTrain::Update(double const Deltatime) } if (ggMainCtrlAct.SubModel != nullptr) { - ggMainCtrlAct.UpdateValue(main_ctrl_act::position(*mvControlled)); + ggMainCtrlAct.UpdateValue(main_ctrl_act::position(*mvControlled, ggMainCtrlAct.has_scaletable())); ggMainCtrlAct.Update(); } if (ggScndCtrl.SubModel != nullptr) diff --git a/vehicle/mainctrlact.h b/vehicle/mainctrlact.h index 0f187b1b4..df61aa061 100644 --- a/vehicle/mainctrlact.h +++ b/vehicle/mainctrlact.h @@ -21,8 +21,11 @@ inline bool follows_controller(TMoverParameters const &Vehicle) { return (Vehicle.EngineType == TEngineType::DieselEngine || Vehicle.EngineType == TEngineType::DieselElectric) && Vehicle.EIMCtrlType == 0; } -inline float position(TMoverParameters const &Vehicle) { - auto const controller{follows_controller(Vehicle)}; +// Scaletable: the cab's gauge has a scaletable:. only such a marker follows the controller; the cabs that define +// mainctrlact: without one (the ST43 so far) keep their marker still, as before, instead of moving it on a scale +// nobody has checked +inline float position(TMoverParameters const &Vehicle, bool const Scaletable) { + auto const controller{Scaletable && follows_controller(Vehicle)}; auto const main{controller ? Vehicle.MainCtrlPos : Vehicle.MainCtrlActualPos}; auto const scnd{controller ? Vehicle.ScndCtrlPos : Vehicle.ScndCtrlActualPos}; return static_cast(Vehicle.CoupledCtrl ? main + scnd : main); From 43fc80f45244b891c322e5ce11e5ad6649fdd934 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 17:52:39 +0100 Subject: [PATCH 355/430] fix: radio fuse review: working push buttons, own hint, HUD - radioon_sw:/radiooff_sw:/radiofuseon_sw:/radiofuseoff_sw: are now loaded as push-button gauges in initialize_gauge, so they can be clicked; the enable/disable commands press them while held. radiotoggle and radiofusetoggle flip the state directly, so they don't move them. - New driver hint "Close radio fuse" (radiofuseon); "Switch on radio" is given only when the radio's own switch is off. - The HUD shows the radio channel only with the fuse closed. (eu07/maszyna#438) --- application/driverhints.cpp | 13 ++++- application/driverhints_def.h | 1 + application/driveruipanels.cpp | 2 +- utilities/translation.cpp | 2 + vehicle/Driver.cpp | 9 +++- vehicle/Train.cpp | 97 +++++++++++++++++++++++----------- vehicle/Train.h | 4 ++ 7 files changed, 94 insertions(+), 34 deletions(-) diff --git a/application/driverhints.cpp b/application/driverhints.cpp index cd1a43b9e..ae39ede7a 100644 --- a/application/driverhints.cpp +++ b/application/driverhints.cpp @@ -130,13 +130,22 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) case driver_hint::radioon: { if( AIControllFlag ) { mvOccupied->Radio = true; - mvOccupied->RadioFuse = true; } remove_hint( driver_hint::radiooff ); hint( Action, [this](float const /*Parameter*/) { - return mvOccupied->Radio && mvOccupied->RadioFuse; } ); + return mvOccupied->Radio == true; } ); + break; + } + case driver_hint::radiofuseon: { + if( AIControllFlag ) { + mvOccupied->RadioFuse = true; + } + hint( + Action, + [this](float const /*Parameter*/) { + return mvOccupied->RadioFuse == true; } ); break; } case driver_hint::radiochannel: { diff --git a/application/driverhints_def.h b/application/driverhints_def.h index f59ed734c..2ce896679 100644 --- a/application/driverhints_def.h +++ b/application/driverhints_def.h @@ -2,6 +2,7 @@ DRIVER_HINT_DEF(batteryon, STRN("Switch on battery")) DRIVER_HINT_DEF(batteryoff, STRN("Switch off battery")) DRIVER_HINT_DEF(radioon, STRN("Switch on radio")) DRIVER_HINT_DEF(radiooff, STRN("Switch off radio")) +DRIVER_HINT_DEF(radiofuseon, STRN("Close radio fuse")) DRIVER_HINT_DEF(radiochannel, STRN("Tune into channel %.0f")) DRIVER_HINT_DEF(oilpumpon, STRN("Switch on oil pump")) DRIVER_HINT_DEF(oilpumpoff, STRN("Switch off oil pump")) diff --git a/application/driveruipanels.cpp b/application/driveruipanels.cpp index e318d3563..8186b82c4 100644 --- a/application/driveruipanels.cpp +++ b/application/driveruipanels.cpp @@ -810,7 +810,7 @@ debug_panel::update_section_vehicle( std::vector &Output ) { mover.HeatingAllow ? 'h' : '.', mover.Hamulec->Releaser() ? '^' : '.', - std::string( m_input.mechanik ? STR(" R") + ( mover.Radio ? std::to_string( m_input.mechanik->iRadioChannel ) : "-" ) : "" ).c_str(), + std::string( m_input.mechanik ? STR(" R") + ( mover.Radio && mover.RadioFuse ? std::to_string( m_input.mechanik->iRadioChannel ) : "-" ) : "" ).c_str(), std::string( isdieselenginepowered ? STR(" oil pressure: ") + to_string( mover.OilPump.pressure, 2 ) : "" ).c_str(), // power transfers // 3000v diff --git a/utilities/translation.cpp b/utilities/translation.cpp index 16e07d01c..14fd709f5 100644 --- a/utilities/translation.cpp +++ b/utilities/translation.cpp @@ -271,6 +271,8 @@ std::string locale::label_cab_control(std::string const &Label) { "converteroff_sw:", STRN("converter") }, { "main_sw:", STRN("line breaker") }, { "radio_sw:", STRN("radio") }, + { "radioon_sw:", STRN("radio") }, + { "radiooff_sw:", STRN("radio") }, { "radiofuse_sw:", STRN("radio fuse") }, { "radiofuseon_sw:", STRN("radio fuse") }, { "radiofuseoff_sw:", STRN("radio fuse") }, diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 0de55551d..9eb3b3b50 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -2689,6 +2689,7 @@ bool TController::PrepareEngine() cue_action( driver_hint::batteryon ); cue_action( driver_hint::cabactivation); + cue_action( driver_hint::radiofuseon ); cue_action( driver_hint::radioon ); if( has_diesel_engine() ) { @@ -6300,7 +6301,13 @@ TController::control_security_system( double const Timedelta ) { // arbitrary 5 sec delay before switching radio back on m_radiocontroltime = std::min( m_radiocontroltime, 5.0 ); if( m_radiocontroltime < 0.0 ) { - cue_action( driver_hint::radioon ); + // hint at whichever of the two is open, the radio's switch or the cut-off in its power supply + if( false == mvOccupied->RadioFuse ) { + cue_action( driver_hint::radiofuseon ); + } + if( false == mvOccupied->Radio ) { + cue_action( driver_hint::radioon ); + } } else { m_radiocontroltime -= Timedelta; diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index bc0924ce8..1b10f7556 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -7998,41 +7998,47 @@ void TTrain::OnCommand_radiotoggle(TTrain *Train, command_data const &Command) // NOTE: works without the switch in the 3d model too, to allow system reset after receiving radio-stop signal // only reacting to press, so the sound can loop uninterrupted - if (false == Train->mvOccupied->Radio) - { - // turn on - OnCommand_radioenable(Train, Command); - } - else - { - // turn off - OnCommand_radiodisable(Train, Command); - } + // NOTE: flips the state directly rather than through radioenable/radiodisable, so it doesn't move the radioon_sw:/radiooff_sw: buttons + Train->mvOccupied->Radio = (false == Train->mvOccupied->Radio); } void TTrain::OnCommand_radioenable(TTrain *Train, command_data const &Command) { - if (Command.action != GLFW_PRESS) - { - return; - } - - if (false == Train->mvOccupied->Radio) + if (Command.action == GLFW_PRESS) { Train->mvOccupied->Radio = true; + // visual feedback + if (Train->m_controlmapper.contains("radioon_sw:")) + { + Train->ggRadioOnButton.UpdateValue(1.0f, Train->dsbSwitch); + } + } + else if (Command.action == GLFW_RELEASE) + { + if (Train->m_controlmapper.contains("radioon_sw:")) + { + Train->ggRadioOnButton.UpdateValue(0.0f, Train->dsbSwitch); + } } } void TTrain::OnCommand_radiodisable(TTrain *Train, command_data const &Command) { - if (Command.action != GLFW_PRESS) - { - return; - } - - if (Train->mvOccupied->Radio) + if (Command.action == GLFW_PRESS) { Train->mvOccupied->Radio = false; + // visual feedback + if (Train->m_controlmapper.contains("radiooff_sw:")) + { + Train->ggRadioOffButton.UpdateValue(1.0f, Train->dsbSwitch); + } + } + else if (Command.action == GLFW_RELEASE) + { + if (Train->m_controlmapper.contains("radiooff_sw:")) + { + Train->ggRadioOffButton.UpdateValue(0.0f, Train->dsbSwitch); + } } } @@ -8045,14 +8051,9 @@ void TTrain::OnCommand_radiofusetoggle(TTrain *Train, command_data const &Comman return; } - if (Train->mvOccupied->RadioFuse) - { - OnCommand_radiofusedisable(Train, Command); - } - else - { - OnCommand_radiofuseenable(Train, Command); - } + // NOTE: flips the state directly rather than through radiofuseenable/radiofusedisable, so it doesn't move the + // radiofuseon_sw:/radiofuseoff_sw: buttons + Train->mvOccupied->RadioFuse = (false == Train->mvOccupied->RadioFuse); } void TTrain::OnCommand_radiofuseenable(TTrain *Train, command_data const &Command) @@ -8060,6 +8061,18 @@ void TTrain::OnCommand_radiofuseenable(TTrain *Train, command_data const &Comman if (Command.action == GLFW_PRESS) { Train->mvOccupied->RadioFuse = true; + // visual feedback + if (Train->m_controlmapper.contains("radiofuseon_sw:")) + { + Train->ggRadioFuseOnButton.UpdateValue(1.0f, Train->dsbSwitch); + } + } + else if (Command.action == GLFW_RELEASE) + { + if (Train->m_controlmapper.contains("radiofuseon_sw:")) + { + Train->ggRadioFuseOnButton.UpdateValue(0.0f, Train->dsbSwitch); + } } } @@ -8068,6 +8081,18 @@ void TTrain::OnCommand_radiofusedisable(TTrain *Train, command_data const &Comma if (Command.action == GLFW_PRESS) { Train->mvOccupied->RadioFuse = false; + // visual feedback + if (Train->m_controlmapper.contains("radiofuseoff_sw:")) + { + Train->ggRadioFuseOffButton.UpdateValue(1.0f, Train->dsbSwitch); + } + } + else if (Command.action == GLFW_RELEASE) + { + if (Train->m_controlmapper.contains("radiofuseoff_sw:")) + { + Train->ggRadioFuseOffButton.UpdateValue(0.0f, Train->dsbSwitch); + } } } @@ -9562,6 +9587,10 @@ bool TTrain::Update(double const Deltatime) ggRadioVolumeSelector.Update(); ggRadioVolumePrevious.Update(); ggRadioVolumeNext.Update(); + ggRadioOnButton.Update(); + ggRadioOffButton.Update(); + ggRadioFuseOnButton.Update(); + ggRadioFuseOffButton.Update(); ggDepartureSignalButton.Update(); /* ggPantFrontButton.Update(); @@ -11102,6 +11131,10 @@ void TTrain::clear_cab_controls() ggRadioVolumeSelector.Clear(); ggRadioVolumePrevious.Clear(); ggRadioVolumeNext.Clear(); + ggRadioOnButton.Clear(); + ggRadioOffButton.Clear(); + ggRadioFuseOnButton.Clear(); + ggRadioFuseOffButton.Clear(); ggDoorLeftPermitButton.Clear(); ggDoorRightPermitButton.Clear(); ggDoorPermitPresetButton.Clear(); @@ -11844,6 +11877,10 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con {"radiovolume_sw:", ggRadioVolumeSelector}, {"radiovolumeprev_sw:", ggRadioVolumePrevious}, {"radiovolumenext_sw:", ggRadioVolumeNext}, + {"radioon_sw:", ggRadioOnButton}, + {"radiooff_sw:", ggRadioOffButton}, + {"radiofuseon_sw:", ggRadioFuseOnButton}, + {"radiofuseoff_sw:", ggRadioFuseOffButton}, /* { "pantfront_sw:", ggPantFrontButton }, { "pantrear_sw:", ggPantRearButton }, diff --git a/vehicle/Train.h b/vehicle/Train.h index 7071bf212..9deacc9b4 100644 --- a/vehicle/Train.h +++ b/vehicle/Train.h @@ -598,6 +598,10 @@ public: // reszta może by?publiczna TGauge ggRadioVolumeSelector; TGauge ggRadioVolumePrevious; TGauge ggRadioVolumeNext; + TGauge ggRadioOnButton; + TGauge ggRadioOffButton; + TGauge ggRadioFuseOnButton; + TGauge ggRadioFuseOffButton; TGauge ggUpperLightButton; TGauge ggLeftLightButton; TGauge ggRightLightButton; From 7db67c3ce71caf1c8e5e3ff34992750cb856fbaf Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 18:03:13 +0100 Subject: [PATCH 356/430] fix: the inspector cuts brakes out only in a train at a standstill, R+Mg keeps the rapid stage (review of #282) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - §19.9 cut-outs only when the AI runs the consist as a train (Obey_train); in shunting a wagon without G brakes on P, which also puts back a brake the inspector cut out before - no new cut-out while the consist moves: left to the next inspection at a standstill (putting back still happens) - ESt4R, LSt and EStED test the bit of R, so R+Mg keeps the high-speed stage of R as on the KE and Oerlikon valves --- McZapkie/hamulce.cpp | 6 +- tests/unit/test_brake_setting.cpp | 141 +++++++++++++++++++++++++----- vehicle/Driver.cpp | 10 ++- vehicle/brakesetting.cpp | 14 +-- vehicle/brakesetting.h | 16 ++-- 5 files changed, 148 insertions(+), 39 deletions(-) diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp index c0a7d2a0e..b4441eac0 100644 --- a/McZapkie/hamulce.cpp +++ b/McZapkie/hamulce.cpp @@ -1449,7 +1449,7 @@ double TESt4R::GetPF(double const PP, double const dt, double const Vel) result = dv - dV1; - RapidStatus = BrakeDelayFlag == bdelay_R && ((Vel > 55 && RapidStatus == true) || Vel > 70); + RapidStatus = (BrakeDelayFlag & bdelay_R) == bdelay_R && ((Vel > 55 && RapidStatus == true) || Vel > 70); RapidTemp = RapidTemp + (0.9 * int(RapidStatus) - RapidTemp) * dt / 2; temp = 1.9 - RapidTemp; @@ -1752,7 +1752,7 @@ double TLSt::GetPF(double const PP, double const dt, double const Vel) // if Vel>55 then temp:=0.72 else // temp:=1;{R} // cisnienie PP - RapidTemp = RapidTemp + (RM * int(Vel > 55 && BrakeDelayFlag == bdelay_R) - RapidTemp) * dt / 2; + RapidTemp = RapidTemp + (RM * int(Vel > 55 && (BrakeDelayFlag & bdelay_R) == bdelay_R) - RapidTemp) * dt / 2; temp = 1 - RapidTemp; if (EDFlag > 0.2) temp = 10000; @@ -1971,7 +1971,7 @@ double TEStED::GetPF(double const PP, double const dt, double const Vel) dv = dv + PF(MPP, VVP, 0.02); Miedzypoj->Flow(dv * dt * 0.15); - RapidTemp = RapidTemp + (RM * int(Vel > RV && BrakeDelayFlag == bdelay_R) - RapidTemp) * dt / 2; + RapidTemp = RapidTemp + (RM * int(Vel > RV && (BrakeDelayFlag & bdelay_R) == bdelay_R) - RapidTemp) * dt / 2; temp = std::max(1 - RapidTemp, 0.001); // if EDFlag then temp:=1000; // temp:=temp/(1-); diff --git a/tests/unit/test_brake_setting.cpp b/tests/unit/test_brake_setting.cpp index aba1e80bb..2d5b02a41 100644 --- a/tests/unit/test_brake_setting.cpp +++ b/tests/unit/test_brake_setting.cpp @@ -18,6 +18,13 @@ constexpr int P{bdelay_P}; constexpr int R{bdelay_R}; constexpr int M{bdelay_M}; +// how the AI runs the consist the inspector looks at: as a train (Obey_train), or shunting it +constexpr bool as_train{true}; +constexpr bool shunting{false}; +// whether the train stands, as AutoRewident() tells the inspector +constexpr bool standstill{true}; +constexpr bool moving{false}; + brake_setting::vehicle locomotive(int const Delays = G | P | R) { return {Delays, true, 17.0, 80000.0}; } @@ -51,7 +58,7 @@ TEST_CASE("brake setting: the locomotives don't count into the length and mass o auto consist{train(locomotive(), 20, freight_wagon(15.0, 30.0))}; consist.insert(consist.begin(), locomotive()); CHECK(brake_setting::choose_train_setting(consist) == train_setting::freight_p); - auto const settings{brake_setting::choose(consist)}; + auto const settings{brake_setting::choose(consist, as_train)}; CHECK(settings[0] == G); CHECK(settings[1] == G); for (std::size_t i = 2; i < settings.size(); ++i) { @@ -66,7 +73,7 @@ TEST_CASE("brake setting: the locomotives don't count into the length and mass o TEST_CASE("brake setting: the locomotive and the first five wagons on G, the rest on P (Cw-1 §19.3b)") { auto const consist{train(locomotive(), 12, freight_wagon(15.0, 60.0))}; REQUIRE(brake_setting::choose_train_setting(consist) == train_setting::freight_gp); - auto const settings{brake_setting::choose(consist)}; + auto const settings{brake_setting::choose(consist, as_train)}; REQUIRE(settings.size() == consist.size()); for (std::size_t i = 0; i < settings.size(); ++i) { CAPTURE(i); @@ -79,7 +86,7 @@ TEST_CASE("brake setting: a locomotive in the middle of the train doesn't put fi consist.emplace_back(locomotive()); consist.insert(consist.end(), 8, freight_wagon(15.0, 60.0)); REQUIRE(brake_setting::choose_train_setting(consist) == train_setting::freight_gp); - auto const settings{brake_setting::choose(consist)}; + auto const settings{brake_setting::choose(consist, as_train)}; CHECK(settings[1] == G); CHECK(settings[5] == G); CHECK(settings[6] == P); @@ -98,7 +105,7 @@ TEST_CASE("brake setting: a heavy freight train runs on G, a wagon without G has consist.emplace_back(passenger_car(P)); consist.emplace_back(passenger_car()); REQUIRE(brake_setting::choose_train_setting(consist) == train_setting::freight_g); - auto const settings{brake_setting::choose(consist)}; + auto const settings{brake_setting::choose(consist, as_train)}; for (std::size_t i = 0; i + 2 < settings.size(); ++i) { CAPTURE(i); CHECK(settings[i] == G); @@ -118,7 +125,7 @@ TEST_CASE("brake setting: in a train on G a locomotive and the vehicle it's driv consist.emplace_back(locomotive(P | R)); consist.emplace_back(0, false, 20.0, 40000.0); REQUIRE(brake_setting::choose_train_setting(consist) == train_setting::freight_g); - auto settings{brake_setting::choose(consist)}; + auto settings{brake_setting::choose(consist, as_train)}; CHECK(settings.front() == P); CHECK(settings[settings.size() - 2] == P); CHECK(settings.back() == 0); @@ -128,7 +135,7 @@ TEST_CASE("brake setting: in a train on G a locomotive and the vehicle it's driv controlcar.driven = true; consist.front() = controlcar; consist.back() = locomotive(); - settings = brake_setting::choose(consist); + settings = brake_setting::choose(consist, as_train); CHECK(settings.front() == P); CHECK(settings.back() == G); } @@ -140,7 +147,7 @@ TEST_CASE("brake setting: in the long locomotive setting a vehicle without G bra consist.insert(consist.end(), 8, freight_wagon(15.0, 60.0)); consist.emplace_back(passenger_car()); REQUIRE(brake_setting::choose_train_setting(consist) == train_setting::freight_gp); - auto const settings{brake_setting::choose(consist)}; + auto const settings{brake_setting::choose(consist, as_train)}; CHECK(settings[2] == G); CHECK(settings[3] == P); CHECK(settings[4] == G); @@ -148,6 +155,23 @@ TEST_CASE("brake setting: in the long locomotive setting a vehicle without G bra CHECK(settings.back() == P); } +TEST_CASE("brake setting: a heavy consist being shunted has nothing cut out, a wagon without G brakes on P") { + // §19.9 is about trains: the same consist the AI shunts rather than runs as a train + auto consist{train(locomotive(), 30, freight_wagon(15.0, 80.0))}; + consist.emplace_back(passenger_car(P)); + consist.emplace_back(passenger_car()); + REQUIRE(brake_setting::choose_train_setting(consist) == train_setting::freight_g); + auto const settings{brake_setting::choose(consist, shunting)}; + for (std::size_t i = 0; i + 2 < settings.size(); ++i) { + CAPTURE(i); + CHECK(settings[i] == G); + } + CHECK(settings[settings.size() - 2] == P); + CHECK(settings.back() == P); + // as a train they're cut out + CHECK(brake_setting::choose(consist, as_train).back() == brake_setting::cut_out); +} + TEST_CASE("brake setting: a car with its brake cut out counts as one on P in a passenger train (Cw-1 §18.3)") { auto consist{train(locomotive(), 5, passenger_car())}; consist.insert(consist.end(), 3, passenger_car(P)); @@ -180,12 +204,13 @@ void charge_and_apply(test::vehicle &Vehicle) { Vehicle.run(20.0); } -// the inspector at work on a heavy train on G with the vehicle at its end, as AutoRewident() does it -int inspect_heavy_train(test::vehicle &Vehicle) { +// the inspector at work on a heavy train on G with the vehicle at its end, as AutoRewident() does it, the AI +// running it as a train or shunting it, standing or on the run +int inspect_heavy_train(test::vehicle &Vehicle, bool const Train = as_train, bool const Standstill = standstill) { auto consist{train(locomotive(), 30, freight_wagon(15.0, 80.0))}; consist.emplace_back(brake_setting::describe(Vehicle.mover(), false)); - auto const setting{brake_setting::choose(consist).back()}; - brake_setting::apply(Vehicle.mover(), setting); + auto const setting{brake_setting::choose(consist, Train).back()}; + brake_setting::apply(Vehicle.mover(), setting, Standstill); return setting; } @@ -193,8 +218,8 @@ int inspect_heavy_train(test::vehicle &Vehicle) { int inspect_light_train(test::vehicle &Vehicle) { auto consist{train(locomotive(), 4, freight_wagon())}; consist.emplace_back(brake_setting::describe(Vehicle.mover(), false)); - auto const setting{brake_setting::choose(consist).back()}; - brake_setting::apply(Vehicle.mover(), setting); + auto const setting{brake_setting::choose(consist, as_train).back()}; + brake_setting::apply(Vehicle.mover(), setting, standstill); return setting; } @@ -269,22 +294,96 @@ TEST_CASE("brake setting: the inspector never puts back a brake cut out for anot CHECK(brake_setting::is_cut_out(other.mover())); } +TEST_CASE("brake setting: shunting puts back a brake the inspector cut out, and cuts none out") { + test::vehicle car{passenger_car_definition()}; + charge_and_apply(car); + // shunted in a heavy consist: nothing is cut out, the car is on P and brakes + CHECK(inspect_heavy_train(car, shunting) == P); + CHECK(false == brake_setting::is_cut_out(car.mover())); + CHECK(car->BrakeDelayFlag == P); + CHECK(car->BrakePress > 1.0); + + // cut out when the consist became a train, then shunted again (e.g. left in a yard): the brake is back + REQUIRE(inspect_heavy_train(car) == brake_setting::cut_out); + REQUIRE(car->BrakeCutOutByInspector); + CHECK(inspect_heavy_train(car, shunting) == P); + CHECK(false == brake_setting::is_cut_out(car.mover())); + CHECK(false == car->BrakeCutOutByInspector); + car.hold_brake_pipe(5.0); + car.run(300.0); + charge_and_apply(car); + CHECK(car->BrakePress > 1.0); + + // a brake cut out for a reason of its own stays cut out in shunting too + test::vehicle other{passenger_car_definition()}; + other->Hamulec->SetBrakeStatus(other->Hamulec->GetBrakeStatus() | b_dmg); + CHECK(inspect_heavy_train(other, shunting) == P); + CHECK(brake_setting::is_cut_out(other.mover())); +} + +TEST_CASE("brake setting: the inspector doesn't cut a brake out on the run, it waits for a standstill") { + test::vehicle car{passenger_car_definition()}; + charge_and_apply(car); + REQUIRE(car->BrakePress > 1.0); + // the train checked on the run (the order changed mid-run): the car keeps its brake and its setting + auto const setting{car->BrakeDelayFlag}; + CHECK(inspect_heavy_train(car, as_train, moving) == brake_setting::cut_out); + CHECK(false == brake_setting::is_cut_out(car.mover())); + CHECK(false == car->BrakeCutOutByInspector); + CHECK(car->BrakeDelayFlag == setting); + car.run(5.0); + CHECK(car->BrakePress > 1.0); + // the next check, standing, cuts it out + CHECK(inspect_heavy_train(car) == brake_setting::cut_out); + CHECK(brake_setting::is_cut_out(car.mover())); + CHECK(car->BrakeCutOutByInspector); + // a brake cut out already stays cut out on the run, and one put back on the run is back + CHECK(inspect_heavy_train(car, as_train, moving) == brake_setting::cut_out); + CHECK(car->BrakeCutOutByInspector); + CHECK(inspect_heavy_train(car, shunting, moving) == P); + CHECK(false == brake_setting::is_cut_out(car.mover())); + CHECK(false == car->BrakeCutOutByInspector); +} + +TEST_CASE("brake setting: R+Mg brakes as hard as R at speed, the rapid stage of an LSt kept") { + // the inspector sets R+Mg (Cw-1 §18.2), the bits of R and Mg together: the valves test the bit of R, not + // the whole setting, so the high stage of R at speed stays on with Mg. the EU07's LSt given an Mg here + auto const definition{test::definition::fiz("4e_v1/4e").set("Cntrl", "BrakeDelays", "GPR+Mg")}; + auto const service = [&](int const Setting) { + test::reseed_random(); + test::vehicle real{definition, 160.0}; + real->DecManualBrakeLevel(ManualBrakePosNo); + real->BrakeDelaySwitch(Setting); // false when already set + REQUIRE(real->BrakeDelayFlag == Setting); + real.hold_brake_pipe(5.0); + real.run(60.0); + real.hold_brake_pipe(3.5); + real.run(10.0); + REQUIRE(real->Vel > 100.0); + return real->BrakePress; + }; + auto const rapid{service(R)}; + CHECK(service(R | M) == doctest::Approx(rapid).epsilon(0.01)); + // and P has no high stage + CHECK(service(P) < rapid - 1.0); +} + TEST_CASE("brake setting: a vehicle without the setting the train needs gets the other one of G and P") { // a light freight train with a wagon which has G only auto consist{train(locomotive(), 4, freight_wagon(15.0, 20.0))}; consist.emplace_back(G, false, 15.0, 20000.0); REQUIRE(brake_setting::choose_train_setting(consist) == train_setting::freight_p); - CHECK(brake_setting::choose(consist).back() == G); + CHECK(brake_setting::choose(consist, as_train).back() == G); // and a vehicle with neither is left alone consist.emplace_back(R, false, 15.0, 20000.0); - CHECK(brake_setting::choose(consist).back() == 0); + CHECK(brake_setting::choose(consist, as_train).back() == 0); } TEST_CASE("brake setting: a passenger train on R carries at most three cars on P, fewer than those on R (Cw-1 §18.3)") { auto consist{train(locomotive(), 4, passenger_car())}; consist.insert(consist.end(), 3, passenger_car(P)); CHECK(brake_setting::choose_train_setting(consist) == train_setting::passenger_r); - auto const settings{brake_setting::choose(consist)}; + auto const settings{brake_setting::choose(consist, as_train)}; CHECK(settings[0] == R); CHECK(settings[1] == R); CHECK(settings.back() == P); @@ -292,7 +391,7 @@ TEST_CASE("brake setting: a passenger train on R carries at most three cars on P // as many cars on P as on R: all on P consist.emplace_back(passenger_car(P)); CHECK(brake_setting::choose_train_setting(consist) == train_setting::passenger_p); - for (auto const setting : brake_setting::choose(consist)) { + for (auto const setting : brake_setting::choose(consist, as_train)) { CHECK(setting == P); } // the inspector of the earlier releases kept such a train on R @@ -307,14 +406,14 @@ TEST_CASE("brake setting: freight wagons in a passenger train on R count as cars auto consist{train(locomotive(), 6, passenger_car())}; consist.emplace_back(freight_wagon()); REQUIRE(brake_setting::choose_train_setting(consist) == train_setting::passenger_r); - CHECK(brake_setting::choose(consist).back() == P); + CHECK(brake_setting::choose(consist, as_train).back() == P); } TEST_CASE("brake setting: cars with a magnetic rail brake run on R+Mg in a train on R (Cw-1 §18.2)") { auto consist{train(locomotive(G | P | R | M), 3, passenger_car(P | R | M))}; consist.emplace_back(passenger_car()); REQUIRE(brake_setting::choose_train_setting(consist) == train_setting::passenger_r); - auto const settings{brake_setting::choose(consist)}; + auto const settings{brake_setting::choose(consist, as_train)}; CHECK(settings[0] == R); // the locomotive stays on R CHECK(settings[1] == (R | M)); CHECK(settings.back() == R); @@ -323,7 +422,7 @@ TEST_CASE("brake setting: cars with a magnetic rail brake run on R+Mg in a train TEST_CASE("brake setting: a light engine runs on R where it has it") { std::vector const consist{locomotive(), locomotive(G | P)}; CHECK(brake_setting::choose_train_setting(consist) == train_setting::light_engine); - auto const settings{brake_setting::choose(consist)}; + auto const settings{brake_setting::choose(consist, as_train)}; CHECK(settings[0] == R); CHECK(settings[1] == P); } @@ -331,7 +430,7 @@ TEST_CASE("brake setting: a light engine runs on R where it has it") { TEST_CASE("brake setting: the inspector of the earlier releases counted the locomotives into the train's mass") { // 300 m and 600 t of wagons: P by Cw-1, the long locomotive setting before auto const consist{train(locomotive(), 20, freight_wagon(15.0, 30.0))}; - CHECK(brake_setting::choose(consist)[1] == P); + CHECK(brake_setting::choose(consist, as_train)[1] == P); CHECK(brake_setting::choose_legacy(consist)[1] == G); CHECK(brake_setting::choose_legacy(consist)[6] == P); } diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 0bb569c81..35856c412 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -2086,8 +2086,12 @@ void TController::AutoRewident() for (auto const *d = pVehicles[0]; d != nullptr; d = d->Next()) { consist.emplace_back(brake_setting::describe(*d->MoverParameters, d == pVehicle)); } - // 2. Określenie typu pociągu i nastaw: by the brake instruction Cw-1 (eu07/maszyna#350), or as the releases before it did - auto const settings{Global.AIBrakeSettingCw1 ? brake_setting::choose(consist) : brake_setting::choose_legacy(consist)}; + // 2. Określenie typu pociągu i nastaw: by the brake instruction Cw-1 (eu07/maszyna#350), or as the releases before it did. + // brakes are cut out (Cw-1 §19.9) only in a train, not in a consist being shunted + auto const train{(OrderCurrentGet() & Obey_train) != 0}; + auto const settings{Global.AIBrakeSettingCw1 ? brake_setting::choose(consist, train) : brake_setting::choose_legacy(consist)}; + // and only at a standstill: a check on the run (the order changed mid-run) leaves them to the next one + auto const standstill{false == (mvOccupied->Vel > EU07_AI_NOMOVEMENT)}; // a light engine counts as a passenger train for the braking below auto const passengertrain{brake_setting::passenger(brake_setting::choose_train_setting(consist))}; // 3. Nastawianie @@ -2098,7 +2102,7 @@ void TController::AutoRewident() continue; } // the setting, a brake cut out in a train on G (Cw-1 §19.9) or put back when the train no longer needs it cut out - brake_setting::apply(*d->MoverParameters, *setting); + brake_setting::apply(*d->MoverParameters, *setting, standstill); // potentially release manual brake d->MoverParameters->DecManualBrakeLevel( ManualBrakePosNo ); d->MoverParameters->SpringBrake.Activate = false; diff --git a/vehicle/brakesetting.cpp b/vehicle/brakesetting.cpp index bf42f8ab4..bafe8a95b 100644 --- a/vehicle/brakesetting.cpp +++ b/vehicle/brakesetting.cpp @@ -115,7 +115,7 @@ train_setting choose_train_setting(std::vector const &Consist) { return train_setting::freight_p; } -std::vector choose(std::vector const &Consist) { +std::vector choose(std::vector const &Consist, bool const Train) { auto const setting{choose_train_setting(Consist)}; std::vector settings; settings.reserve(Consist.size()); @@ -154,9 +154,10 @@ std::vector choose(std::vector const &Consist) { if (has(item.delays, bdelay_G)) { settings.emplace_back(bdelay_G); } - else if (item.powered || item.driven || item.delays == 0) { + else if (item.powered || item.driven || item.delays == 0 || false == Train) { // a locomotive, or the vehicle the train is driven from, keeps a working brake: on P. a vehicle - // which tells no settings at all is left alone + // which tells no settings at all is left alone. a consist being shunted isn't a train and §19.9 + // doesn't apply to it: its wagons keep their brakes, on P settings.emplace_back(pick(item.delays, bdelay_P, bdelay_P)); } else { @@ -249,21 +250,22 @@ vehicle describe(TMoverParameters const &Vehicle, bool const Driven) { return described; } -void apply(TMoverParameters &Vehicle, int const Setting) { +void apply(TMoverParameters &Vehicle, int const Setting, bool const Standstill) { auto &brake{*Vehicle.Hamulec}; if (Vehicle.BrakeCutOutByInspector && false == is_cut_out(Vehicle)) { // someone put the brake back in the meantime, it's theirs now Vehicle.BrakeCutOutByInspector = false; } if (Setting == cut_out) { - if (false == is_cut_out(Vehicle)) { + if (false == is_cut_out(Vehicle) && Standstill) { // close the cut-out cock and empty the brake with the releaser, as the scenery's '0' does: the // distributor, cut off the brake pipe, has no air left to brake with and lets the cylinders go brake.ForceEmptiness(); brake.SetBrakeStatus(brake.GetBrakeStatus() | b_dmg); Vehicle.BrakeCutOutByInspector = true; } - // a brake cut out already, by the inspector or for a reason of its own, stays as it is + // a brake cut out already, by the inspector or for a reason of its own, stays as it is. on the run the + // vehicle is left alone, brake and setting, until the inspector looks at the train standing return; } if (Vehicle.BrakeCutOutByInspector) { diff --git a/vehicle/brakesetting.h b/vehicle/brakesetting.h index cce2bbeb0..789f52808 100644 --- a/vehicle/brakesetting.h +++ b/vehicle/brakesetting.h @@ -56,8 +56,10 @@ constexpr bool passenger(train_setting const Setting) { // without the setting the train needs gets the other one of G and P it has, and 0 (left as it is) // when it has neither. In a train on G (freight_g) a wagon without G gets cut_out instead: its brake // is to be cut out (Cw-1 §19.9). A locomotive and the vehicle the train is driven from keep their -// brake working, on P -std::vector choose(std::vector const &Consist); +// brake working, on P. Train tells the AI runs the consist as a train (Obey_train): §19.9 is about +// trains, so in shunting (or banking) nothing is cut out and a wagon without G brakes on P, which puts +// back a brake the inspector cut out before +std::vector choose(std::vector const &Consist, bool Train); // the inspector of the releases before eu07/maszyna#350, kept for ai.brakesetting.cw1 no. the settings // are requests: a vehicle which doesn't have the one asked for keeps its own @@ -73,9 +75,11 @@ vehicle describe(TMoverParameters const &Vehicle, bool Driven); // the inspector puts the vehicle on Setting, as choose() gives it. cut_out cuts the brake out the way // the scenery's '0' does: b_dmg, which cuts the distributor off the brake pipe (as the cab's cut-out, // trainbrakeoperationtoggle, does), and its reservoirs emptied, so the brake releases and stays off. -// The vehicle remembers the inspector did it. Any other setting first puts back a brake the inspector -// cut out (it charges from the brake pipe again), then sets the vehicle to it (0: leaves the setting -// as it is). A brake cut out by anyone else stays cut out -void apply(TMoverParameters &Vehicle, int Setting); +// The vehicle remembers the inspector did it. A brake is cut out only with the train at a standstill +// (Standstill): on the run the vehicle is left as it is until the inspector looks at the train again +// standing, rather than losing its brake while moving. Any other setting first puts back a brake the +// inspector cut out (it charges from the brake pipe again), then sets the vehicle to it (0: leaves the +// setting as it is). A brake cut out by anyone else stays cut out +void apply(TMoverParameters &Vehicle, int Setting, bool Standstill); } // namespace brake_setting From 97c483e827cb958f5f4d6c905b8f9e934285163f Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 18:05:00 +0100 Subject: [PATCH 357/430] fix: Elf emergency brake position vents the pipe only from the driven vehicle, coupled units agree on the controller position The emergency position of the master controller vented the brake pipe from every vehicle whose controller stood there, and "MainCtrl" reached the coupled vehicles raw, so an Elf with EIMCtrlMainEmergency and one without it disagreed by one notch (the full braking of one was the emergency brake of the other, neutral of one a power position of the other). The pipe is now vented only from the vehicle driven from (IsCabMaster()), and the position goes to the coupled vehicles in the positions without the key (MainCtrlPosForCoupled(), the emergency one as the full braking), each adding its own shift on receiving it (MainCtrlPosFromCoupled()). The loader's fix-up for the old MCPN=4 raises DirChangeMaxPos by the same shift, so the reverser keeps working at the new neutral. --- McZapkie/MOVER.h | 5 ++ McZapkie/Mover.cpp | 35 +++++--- tests/unit/test_elf_controller.cpp | 136 +++++++++++++++++++++++++++-- 3 files changed, 158 insertions(+), 18 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index d96e0d10c..21c9ba7e4 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -2373,6 +2373,11 @@ class TMoverParameters int EIMCtrlEmergencyPositions() const; // whether the master controller is in its emergency brake position (EIMCtrlType 2 with EIMCtrlMainEmergency) bool IsMainCtrlEmergencyPos() const; + // the master controller position sent to the coupled vehicles ("MainCtrl"), the same with and without + // EIMCtrlMainEmergency: the Elf's positions without the emergency brake one, which goes as the full braking + int MainCtrlPosForCoupled() const; + // the master controller position of this vehicle for one received from a coupled vehicle ("MainCtrl") + int MainCtrlPosFromCoupled(int Position) const; /*! pomocniczy nastawnik:*/ bool IncScndCtrl(int CtrlSpeed); bool DecScndCtrl(int CtrlSpeed); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 3499e16b3..cd4573ca0 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -2537,7 +2537,7 @@ bool TMoverParameters::IncMainCtrl(int CtrlSpeed) if (true == OK) { - SendCtrlToNext("MainCtrl", MainCtrlPos, CabActive); //??? + SendCtrlToNext("MainCtrl", MainCtrlPosForCoupled(), CabActive); //??? SendCtrlToNext("ScndCtrl", ScndCtrlPos, CabActive); } @@ -2662,7 +2662,7 @@ bool TMoverParameters::DecMainCtrl(int CtrlSpeed) if (OK) { - /*OK:=*/SendCtrlToNext("MainCtrl", MainCtrlPos, CabActive); // hmmmm...???!!! + /*OK:=*/SendCtrlToNext("MainCtrl", MainCtrlPosForCoupled(), CabActive); // hmmmm...???!!! /*OK:=*/SendCtrlToNext("ScndCtrl", ScndCtrlPos, CabActive); } } @@ -2745,6 +2745,17 @@ bool TMoverParameters::IsMainCtrlEmergencyPos() const return MainCtrlPos < EIMCtrlEmergencyPositions(); } +int TMoverParameters::MainCtrlPosForCoupled() const +{ + // the emergency brake itself reaches the train through the brake pipe, vented by the vehicle driven from + return std::max(0, MainCtrlPos - EIMCtrlEmergencyPositions()); +} + +int TMoverParameters::MainCtrlPosFromCoupled(int const Position) const +{ + return Position + EIMCtrlEmergencyPositions(); +} + // ************************************************************************************************* // Q: 20160710 // zwiększenie bocznika @@ -2786,7 +2797,7 @@ bool TMoverParameters::IncScndCtrl(int CtrlSpeed) OK = false; if (OK) { - /*OK:=*/SendCtrlToNext("MainCtrl", MainCtrlPos, CabActive); //??? + /*OK:=*/SendCtrlToNext("MainCtrl", MainCtrlPosForCoupled(), CabActive); //??? /*OK:=*/SendCtrlToNext("ScndCtrl", ScndCtrlPos, CabActive); } } @@ -2848,7 +2859,7 @@ bool TMoverParameters::DecScndCtrl(int CtrlSpeed) OK = false; if (OK) { - /*OK:=*/SendCtrlToNext("MainCtrl", MainCtrlPos, CabActive); //??? + /*OK:=*/SendCtrlToNext("MainCtrl", MainCtrlPosForCoupled(), CabActive); //??? /*OK:=*/SendCtrlToNext("ScndCtrl", ScndCtrlPos, CabActive); } } @@ -4586,8 +4597,9 @@ void TMoverParameters::UpdatePipePressure(double dt) // EngDmgFlag 32 (load destroyed) used to trigger this too; dropped, it has nothing to do with - // the emergency brake (a broken coupler sets AlarmChainFlag instead) - if (RadioStopFlag || AlarmChainFlag || (EIMCtrlEmergency && LocalBrakePosA >= 1.0) || IsMainCtrlEmergencyPos() || SecuritySystem.is_braking() || + // the emergency brake (a broken coupler sets AlarmChainFlag instead). the Elf's emergency brake position + // vents the pipe only from the vehicle driven from, whatever the controllers of the others show + if (RadioStopFlag || AlarmChainFlag || (EIMCtrlEmergency && LocalBrakePosA >= 1.0) || (IsMainCtrlEmergencyPos() && IsCabMaster()) || SecuritySystem.is_braking() || (SpringBrakeDriveEmergencyVel >= 0 && Vel > SpringBrakeDriveEmergencyVel && SpringBrake.IsActive) || (0 == CabActive && (InactiveCabFlag & activation::emergencybrake) != 0)) { @@ -10915,8 +10927,10 @@ void TMoverParameters::LoadFIZ_Cntrl(std::string const &line) extract_value(EIMCtrlMainEmergency, "EIMCtrlMainEmergency", line, ""); if (auto const elfpositions{4 + EIMCtrlEmergencyPositions()}; EIMCtrlEmergencyPositions() > 0 && MainCtrlPosNo < elfpositions) { - // without it the controller would have no power position - ErrorLog(std::format("Bad fiz: EIMCtrlMainEmergency needs MCPN={} in {}", elfpositions, TypeName)); + // the old positions in the file: without the fix-up the controller would have no power position, and the + // reverser would stop working at neutral (DirChangeMaxPos read before, in the old positions) + MainCtrlMaxDirChangePos += EIMCtrlEmergencyPositions(); + ErrorLog(std::format("Bad fiz: EIMCtrlMainEmergency needs MCPN={} in {}, DirChangeMaxPos taken as {}", elfpositions, TypeName, MainCtrlMaxDirChangePos)); MainCtrlPosNo = elfpositions; } @@ -12256,9 +12270,10 @@ bool TMoverParameters::RunCommand(std::string const &Command, double CValue1, do if (Command == "MainCtrl") { - if (MainCtrlPosNo >= floor(CValue1)) + // sent as MainCtrlPosForCoupled(), passed on unchanged + if (auto const position{MainCtrlPosFromCoupled(static_cast(floor(CValue1)))}; MainCtrlPosNo >= position) { - MainCtrlPos = static_cast(floor(CValue1)); + MainCtrlPos = position; if (DelayCtrlFlag) { if (LastRelayTime >= InitialCtrlDelay && MainCtrlPos == 1) diff --git a/tests/unit/test_elf_controller.cpp b/tests/unit/test_elf_controller.cpp index 747a57630..212ed51d0 100644 --- a/tests/unit/test_elf_controller.cpp +++ b/tests/unit/test_elf_controller.cpp @@ -5,6 +5,9 @@ #include "McZapkie/hamulce.h" +#include +#include + // the master controller of the Elf (EIMCtrlType 2): its positions, and the emergency brake position below // them which EIMCtrlMainEmergency adds (eu07/maszyna#413) @@ -13,16 +16,32 @@ using test::vehicle; namespace { -// a three-car Elf ready to run, standing with its brakes released and the driver in the front cab of the -// head car, which also drives (the controller's eimic is worked out there) +// the data of an Elf: without the emergency brake position as now, with it in the files updated for it +// (EIMCtrlMainEmergency, MCPN=5, DirChangeMaxPos=4), or with the key alone added to the old files, which the +// loader fixes up +enum class data { plain, emergency, emergency_old_layout }; + +// three-car Elfs coupled into one train, of the given data each, ready to run, standing with their brakes +// released and the driver in the front cab of the head car of the first one, which also drives (the +// controller's eimic is worked out there) struct elf { - explicit elf(bool Emergency) { - for (auto const *car : {"elf_v1/21we-a", "elf_v1/21we-b", "elf_v1/21we-c"}) { - auto cardefinition{definition::fiz(car)}; - if (Emergency) { - cardefinition.set("Cntrl", "EIMCtrlMainEmergency", "Yes").set("Cntrl", "MCPN", 5); + explicit elf(bool Emergency) : elf({Emergency ? data::emergency : data::plain}) {} + explicit elf(std::initializer_list Units) { + for (auto const units : Units) { + for (auto const *car : {"elf_v1/21we-a", "elf_v1/21we-b", "elf_v1/21we-c"}) { + auto cardefinition{definition::fiz(car)}; + if (units != data::plain) { + cardefinition.set("Cntrl", "EIMCtrlMainEmergency", "Yes"); + } + if (units == data::emergency) { + cardefinition.set("Cntrl", "MCPN", 5); + if (std::string{car} != "elf_v1/21we-b") { + // the cars with a cab have it, at neutral: 3 before, one up with the key + cardefinition.set("Cntrl", "DirChangeMaxPos", 4); + } + } + unit.add(cardefinition, unit.size() == 0 ? 1 : 0); } - unit.add(cardefinition, unit.size() == 0 ? 1 : 0); } ready = test::start_up(test::driving(unit), line); // the start-up of the tests leaves the controller at its position 0 (close_line_breaker() in drive.cpp), @@ -48,6 +67,14 @@ struct elf { wait(30.0); } TMoverParameters &cab() { return unit[0].mover(); } + TMoverParameters &car(std::size_t Index) { return unit[Index].mover(); } + // the driver moves the controller notch by notch, which the cab sends on to the coupled vehicles + void set_controller(int Position) { + while (cab().MainCtrlPos < Position && cab().IncMainCtrl(1)) { + } + while (cab().MainCtrlPos > Position && cab().DecMainCtrl(1)) { + } + } void wait(double Seconds) { test::drive(test::driving(unit), line, Seconds); } test::consist unit; test::track line{0.15, 0.0, test::catenary_3kv}; @@ -124,6 +151,99 @@ TEST_CASE("elf controller: EIMCtrlMainEmergency with the old MCPN gets its posit vehicle car{definition::fiz("elf_v1/21we-a").set("Cntrl", "EIMCtrlMainEmergency", "Yes")}; CHECK(car->MainCtrlPosNo == 5); CHECK(car->MainCtrlNoPowerPos() == 4); + // DirChangeMaxPos=3 of the file, the old neutral, moves up with the positions + CHECK(car->MainCtrlMaxDirChangePos == 4); +} + +TEST_CASE("elf controller: EIMCtrlMainEmergency leaves DirChangeMaxPos of the files updated for it alone") { + vehicle car{definition::fiz("elf_v1/21we-a").set("Cntrl", "EIMCtrlMainEmergency", "Yes").set("Cntrl", "MCPN", 5).set("Cntrl", "DirChangeMaxPos", 4)}; + CHECK(car->MainCtrlPosNo == 5); + CHECK(car->MainCtrlMaxDirChangePos == 4); +} + +TEST_CASE("elf controller: the reverser works at the neutral shifted by EIMCtrlMainEmergency") { + // the key added to the old files, DirChangeMaxPos=3 in them + elf unit{{data::emergency_old_layout}}; + REQUIRE(unit.ready); + auto &mover{unit.cab()}; + REQUIRE(mover.MainCtrlPos == mover.MainCtrlNoPowerPos()); + REQUIRE(mover.DirActive == 1); + CHECK(mover.DirectionBackward()); + CHECK(mover.DirActive == 0); + CHECK(mover.DirectionForward()); + CHECK(mover.DirActive == 1); + // not in the power position + unit.set_controller(mover.MainCtrlNoPowerPos() + 1); + REQUIRE(mover.MainCtrlPos == 5); + CHECK_FALSE(mover.DirectionBackward()); + CHECK(mover.DirActive == 1); +} + +TEST_CASE("elf controller: the emergency brake position vents the pipe only from the vehicle driven from") { + elf unit{true}; + REQUIRE(unit.ready); + REQUIRE(unit.charged); + // the rear car, with its own cab, has its controller in the emergency brake position, the driven one not + auto &rear{unit.car(2)}; + rear.MainCtrlPos = 0; + CHECK(rear.IsMainCtrlEmergencyPos()); + CHECK_FALSE(rear.IsCabMaster()); + unit.wait(10.0); + CHECK(unit.cab().PipePress > 4.5); + CHECK(rear.PipePress > 4.5); +} + +TEST_CASE("elf controller: an Elf with the emergency brake position leading one without it") { + elf unit{{data::emergency, data::plain}}; + REQUIRE(unit.ready); + REQUIRE(unit.charged); + auto &lead{unit.cab()}; + auto &other{unit.car(3)}; + REQUIRE_FALSE(other.EIMCtrlMainEmergency); + // neutral of the lead is neutral of the other + CHECK(lead.MainCtrlPos == 4); + CHECK(other.MainCtrlPos == other.MainCtrlNoPowerPos()); + SUBCASE("power") { + unit.set_controller(5); + CHECK(other.MainCtrlPos == 4); + } + SUBCASE("full braking") { + unit.set_controller(1); + CHECK(other.MainCtrlPos == 0); + unit.wait(10.0); + CHECK(lead.PipePress > 4.5); + } + SUBCASE("the emergency brake: the other one at its full braking, the pipe vented by the lead") { + unit.set_controller(0); + REQUIRE(lead.IsMainCtrlEmergencyPos()); + CHECK(other.MainCtrlPos == 0); + unit.wait(10.0); + CHECK(lead.PipePress < 0.5); + CHECK(other.PipePress < 0.5); + } +} + +TEST_CASE("elf controller: an Elf without the emergency brake position leading one with it") { + elf unit{{data::plain, data::emergency}}; + REQUIRE(unit.ready); + REQUIRE(unit.charged); + auto &lead{unit.cab()}; + auto &other{unit.car(3)}; + REQUIRE(other.EIMCtrlMainEmergency); + CHECK(lead.MainCtrlPos == 3); + CHECK(other.MainCtrlPos == other.MainCtrlNoPowerPos()); + SUBCASE("power") { + unit.set_controller(4); + CHECK(other.MainCtrlPos == 5); + } + SUBCASE("the full braking of the lead is the full braking of the other, not its emergency brake") { + unit.set_controller(0); + CHECK(other.MainCtrlPos == 1); + CHECK_FALSE(other.IsMainCtrlEmergencyPos()); + unit.wait(10.0); + CHECK(lead.PipePress > 4.5); + CHECK(other.PipePress > 4.5); + } } TEST_CASE("elf controller: EIMCtrlMainEmergency leaves the other controllers alone") { From a3ad30b72bbb071c73eb1ad19d3707641c654c50 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 18:18:35 +0100 Subject: [PATCH 358/430] fix: the odometer store merges the file other simulations saved, keeps a made up state replaceable by the cab's counter - each process writes its own ..tmp and renames it in place; before writing it re-reads the file and merges it per vehicle (a known state beats a made up one, else the larger one, never the sum) - a state counted from a made up one is saved as ~ and the .mmd counter offset still replaces it later - a vehicle removed from the scenery has its odometer recorded right away --- tests/unit/test_odometer.cpp | 160 +++++++++++++++++++++++++++++++++++ vehicle/DynObj.cpp | 5 ++ vehicle/odometer.cpp | 123 +++++++++++++++++++++------ vehicle/odometer.h | 38 +++++++-- 4 files changed, 292 insertions(+), 34 deletions(-) diff --git a/tests/unit/test_odometer.cpp b/tests/unit/test_odometer.cpp index 784fabaab..853072d33 100644 --- a/tests/unit/test_odometer.cpp +++ b/tests/unit/test_odometer.cpp @@ -200,3 +200,163 @@ TEST_CASE("odometer: the cab's counter offset replaces only a guessed state, the CHECK(reading.source == source); } } + +TEST_CASE("odometer: a state counted from a made up one is saved as such, the cab's counter still replaces it") { + scratch_directory directory{"odometer_guessed"}; + auto const guess{odometer::guessed_state("EU07-424")}; + // the vehicle runs 30 km with no cab loaded (the AI's, loose stock) + odometer::store first; + auto ai{odometer::starting_state(first, "EU07-424", directory.path)}; + REQUIRE(ai.source == odometer::origin::guessed); + ai.run(30000.0); + first.record("EU07-424", ai); + std::stringstream file; + first.write(file); + CHECK(file.str().find("\n~") != std::string::npos); + + odometer::store second; + REQUIRE(second.read(file) == 1); + CHECK(second.guessed("EU07-424")); + CHECK(second.find("EU07-424").value() == doctest::Approx(guess + 30.0)); + auto player{odometer::starting_state(second, "EU07-424", directory.path)}; + CHECK(player.source == odometer::origin::guessed); + CHECK(player.km == doctest::Approx(guess + 30.0)); + + SUBCASE("a cab whose counter has an offset loads it: the offset replaces the made up state, the 30 km kept") { + player.run(2000.0); + player.seed(101532.0); + CHECK(player.source == odometer::origin::counter); + CHECK(player.start == doctest::Approx(101562.0)); + CHECK(player.km == doctest::Approx(101564.0)); + // recorded as known, also when the counter shows less than the made up state did + second.record("EU07-424", player); + CHECK_FALSE(second.guessed("EU07-424")); + CHECK(second.find("EU07-424").value() == doctest::Approx(101564.0)); + odometer::reading low; + low.begin(10.0, odometer::origin::counter); + odometer::store replaced; + std::stringstream guessedfile{"~400000 SM42-001\n"}; + replaced.read(guessedfile); + replaced.record("SM42-001", low); + CHECK(replaced.find("SM42-001").value() == 10.0); + CHECK_FALSE(replaced.guessed("SM42-001")); + CHECK(replaced.modified()); + } + SUBCASE("it runs with no cab again: it stays guessed") { + player.run(1000.0); + second.record("EU07-424", player); + CHECK(second.guessed("EU07-424")); + CHECK(second.find("EU07-424").value() == doctest::Approx(guess + 31.0)); + } +} + +TEST_CASE("odometer: the store reads the marker of a made up state, and skips it malformed") { + std::stringstream file{"~300 guessed one\n" + "~ nothing\n" + "~abc name\n" + "~-5 negative\n" + "~~5 twice\n" + "400 known\n"}; + odometer::store store; + CHECK(store.read(file) == 2); + CHECK(store.find("guessed one").value() == 300.0); + CHECK(store.guessed("guessed one")); + CHECK_FALSE(store.guessed("known")); + CHECK_FALSE(store.guessed("missing")); +} + +TEST_CASE("odometer: a recorded state is replaced only by a newer one") { + std::stringstream file{"500 known\n~600 guessed\n"}; + odometer::store store; + store.read(file); + // a vehicle of this simulation counting from less than another simulation saved meanwhile + store.record("known", run(400.0, 50000.0)); + CHECK(store.find("known").value() == 500.0); + CHECK_FALSE(store.modified()); + // a larger one does, also when the vehicle hasn't run in this session + store.record("known", run(900.0, 0.0)); + CHECK(store.find("known").value() == 900.0); + CHECK(store.modified()); + // a guessed state doesn't replace a known one, even a larger one + odometer::reading guessed; + guessed.begin(5000.0, odometer::origin::guessed); + guessed.run(1000.0); + store.record("known", guessed); + CHECK(store.find("known").value() == 900.0); + CHECK_FALSE(store.guessed("known")); + // a larger guessed one replaces a guessed one + store.record("guessed", guessed); + CHECK(store.find("guessed").value() == doctest::Approx(5001.0)); + CHECK(store.guessed("guessed")); +} + +TEST_CASE("odometer: two simulations saving one file keep each other's states") { + scratch_directory directory{"odometer_merge"}; + auto const path{directory.path / "eu07_odometers.txt"}; + write_file(path, "1000 shared\n~20000 both guessed\n50 untouched\n"); + auto const load = [&path]() { + odometer::store store; + std::ifstream input{path, std::ios::binary}; + store.read(input); + return store; + }; + auto first{load()}; + auto second{load()}; + auto const guessed = [](double const Km, double const Metres) { + odometer::reading reading; + reading.begin(Km, odometer::origin::guessed); + reading.run(Metres); + return reading; + }; + + // both run the shared vehicle, as two multiplayer simulations of the same train do, the first one further + first.record("shared", run(1000.0, 5000.0)); + first.record("first only", run(70.0, 1000.0)); + first.record("both guessed", guessed(20000.0, 3000.0)); + second.record("shared", run(1000.0, 2000.0)); + second.record("second only", run(80.0, 1000.0)); + second.record("both guessed", guessed(20000.0, 1000.0)); + + REQUIRE(odometer::save(first, path)); + CHECK_FALSE(first.modified()); + REQUIRE(odometer::save(second, path)); + + auto const saved{load()}; + CHECK(saved.size() == 5); + // the larger state of the shared vehicle, not the sum of the two: they counted the same run + CHECK(saved.find("shared").value() == doctest::Approx(1005.0)); + CHECK(saved.find("first only").value() == doctest::Approx(71.0)); + CHECK(saved.find("second only").value() == doctest::Approx(81.0)); + CHECK(saved.find("both guessed").value() == doctest::Approx(20003.0)); + CHECK(saved.guessed("both guessed")); + CHECK(saved.find("untouched").value() == 50.0); + // the second one now knows the states the first one saved, for the vehicles it loads later + CHECK(second.find("first only").value() == doctest::Approx(71.0)); + + SUBCASE("a known state saved by one replaces a guessed one of the other") { + odometer::reading seeded; + seeded.begin(100.0, odometer::origin::counter); + first.record("both guessed", seeded); + REQUIRE(odometer::save(first, path)); + second.record("both guessed", guessed(20003.0, 5000.0)); + REQUIRE(odometer::save(second, path)); + auto const after{load()}; + CHECK(after.find("both guessed").value() == 100.0); + CHECK_FALSE(after.guessed("both guessed")); + CHECK(after.find("second only").value() == doctest::Approx(81.0)); + } + SUBCASE("nothing but the file is left in the directory") { + std::size_t files{0}; + for (auto const &entry : std::filesystem::directory_iterator{directory.path}) { + CAPTURE(entry.path().string()); + CHECK(entry.path().filename() == path.filename()); + ++files; + } + CHECK(files == 1); + } + SUBCASE("a store with nothing recorded since doesn't write") { + write_file(path, "1 replaced by hand\n"); + REQUIRE(odometer::save(second, path)); + CHECK(load().size() == 1); + } +} diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index ff7587169..b30eabba5 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -8890,6 +8890,11 @@ vehicle_table::erase_disabled() { ++vehicleiter; } else { + // the distance the vehicle ran goes in the odometer store now, it doesn't depend on the vehicle being + // kept on the list until the next save (eu07/maszyna#72) + if( vehicle->MoverParameters != nullptr ) { + odometer::states().record( vehicle->name(), vehicle->MoverParameters->Odometer ); + } if( vehicle->MyTrack != nullptr && true == vehicle->MyTrack->RemoveDynamicObject(vehicle) ) { vehicle->MyTrack = nullptr; diff --git a/vehicle/odometer.cpp b/vehicle/odometer.cpp index 9d03462b2..3584253d3 100644 --- a/vehicle/odometer.cpp +++ b/vehicle/odometer.cpp @@ -13,11 +13,19 @@ http://mozilla.org/MPL/2.0/. #include "utilities/Logs.h" #include "utilities/utilities.h" +#include +#include #include #include #include #include #include +#include +#ifdef _WIN32 +#include +#else +#include +#endif namespace odometer { @@ -27,6 +35,14 @@ bool valid(double const Km) { return std::isfinite(Km) && Km >= 0.0; } +int process_id() { +#ifdef _WIN32 + return _getpid(); +#else + return static_cast(getpid()); +#endif +} + // number making up all of the text, surrounding whitespace aside std::optional parse_number(std::string const &Text) { auto const first{Text.find_first_not_of(" \t\r\n")}; @@ -51,13 +67,16 @@ void reading::begin(double const Km, origin const Source) { km = Km; start = Km; source = Source; + guess = Km; } void reading::seed(double const Km) { if (source != origin::guessed || false == valid(Km)) return; - km += Km - start; - start = Km; + auto const shift{Km - guess}; + km += shift; + start += shift; + guess = Km; source = origin::counter; } @@ -81,47 +100,71 @@ std::size_t store::read(std::istream &Input) { auto const separator{line.find_first_of(" \t")}; if (separator == std::string::npos) continue; - auto const km{parse_number(line.substr(0, separator))}; + auto number{line.substr(0, separator)}; + auto const guessed{false == number.empty() && number.front() == '~'}; + if (guessed) + number.erase(0, 1); + auto const km{parse_number(number)}; auto const name{line.substr(separator + 1)}; if (false == km.has_value() || name.empty()) continue; - m_states[name] = *km; + m_states[name] = state{*km, guessed}; ++count; } return count; } void store::write(std::ostream &Output) const { - Output << "# odometer states of the vehicles: \n"; + Output << "# odometer states of the vehicles: , ~ for one counted from a made up state\n"; Output << std::fixed << std::setprecision(4); - for (auto const &[name, km] : m_states) - Output << km << ' ' << name << '\n'; + for (auto const &[name, state] : m_states) + Output << (state.guessed ? "~" : "") << state.km << ' ' << name << '\n'; } std::optional store::find(std::string const &Vehicle) const { auto const lookup{m_states.find(Vehicle)}; if (lookup == m_states.end()) return std::nullopt; - return lookup->second; + return lookup->second.km; +} + +bool store::guessed(std::string const &Vehicle) const { + auto const lookup{m_states.find(Vehicle)}; + return lookup != m_states.end() && lookup->second.guessed; +} + +bool store::newer(state const &Left, state const &Right) { + if (Left.guessed != Right.guessed) + return Right.guessed; + return Left.km > Right.km; } void store::record(std::string const &Vehicle, reading const &Odometer) { if (Vehicle.empty() || false == valid(Odometer.km)) return; + state const recorded{Odometer.km, Odometer.source == origin::guessed}; auto const lookup{m_states.find(Vehicle)}; if (lookup == m_states.end()) { if (false == Odometer.moved()) return; - m_states.emplace(Vehicle, Odometer.km); + m_states.emplace(Vehicle, recorded); m_modified = true; return; } - if (lookup->second == Odometer.km) + if (false == newer(recorded, lookup->second)) return; - lookup->second = Odometer.km; + lookup->second = recorded; m_modified = true; } +void store::merge(store const &Other) { + for (auto const &[name, other] : Other.m_states) { + auto const [lookup, added] {m_states.try_emplace(name, other)}; + if (false == added && newer(other, lookup->second)) + lookup->second = other; + } +} + std::optional read_legacy(std::istream &Input) { std::stringstream content; content << Input.rdbuf(); @@ -154,7 +197,14 @@ double guessed_state(std::string const &Vehicle) { reading starting_state(store const &States, std::string const &Vehicle, std::filesystem::path const &Vehicledirectory) { reading result; if (auto const saved{States.find(Vehicle)}; saved.has_value()) { - result.begin(*saved, origin::saved); + if (States.guessed(Vehicle)) { + // the vehicle ran with a made up state before any cab with a known one loaded it (as the AI's or loose + // stock); the made up part of it stays replaceable + result.begin(*saved, origin::guessed); + result.guess = std::min(*saved, guessed_state(Vehicle)); + } else { + result.begin(*saved, origin::saved); + } } else if (auto const legacy{legacy_state(Vehicledirectory, Vehicle)}; legacy.has_value()) { result.begin(*legacy, origin::legacy); } else { @@ -190,36 +240,59 @@ store &states() { return odometers; } -bool save() { - auto &odometers{states()}; - if (false == odometers.modified()) +bool save(store &States, std::filesystem::path const &File) { + if (false == States.modified()) return true; - auto const path{file()}; std::error_code error; - if (path.has_parent_path()) - std::filesystem::create_directories(path.parent_path(), error); - // written aside first, a crash in the middle of a write doesn't lose the states - auto temporary{path}; - temporary += ".tmp"; + if (File.has_parent_path()) + std::filesystem::create_directories(File.parent_path(), error); + // other simulations on the machine (multiplayer, parallel runs) keep their states in the same file: what they + // saved since this one read it is merged in, not overwritten + { + std::ifstream input{File, std::ios::binary}; + if (input.is_open()) { + store saved; + saved.read(input); + States.merge(saved); + } + } + // written aside first, a crash in the middle of a write doesn't lose the states. the file aside is this process' + // own, the other simulations write theirs + auto temporary{File}; + temporary += "." + std::to_string(process_id()) + ".tmp"; { std::ofstream output{temporary, std::ios::binary | std::ios::trunc}; if (false == output.is_open()) { ErrorLog("Failed to save the odometer states to \"" + temporary.string() + "\""); return false; } - odometers.write(output); + States.write(output); if (false == output.good()) { + output.close(); + std::filesystem::remove(temporary, error); ErrorLog("Failed to save the odometer states to \"" + temporary.string() + "\""); return false; } } - std::filesystem::rename(temporary, path, error); + // the file can't be replaced while another simulation is reading it, that takes a moment + for (auto attempt{0};; ++attempt) { + std::filesystem::rename(temporary, File, error); + if (false == static_cast(error) || attempt == 4) + break; + std::this_thread::sleep_for(std::chrono::milliseconds(20)); + } if (error) { - ErrorLog("Failed to save the odometer states to \"" + path.string() + "\": " + error.message()); + ErrorLog("Failed to save the odometer states to \"" + File.string() + "\": " + error.message()); + std::error_code ignored; + std::filesystem::remove(temporary, ignored); return false; } - odometers.saved(); + States.saved(); return true; } +bool save() { + return save(states(), file()); +} + } // namespace odometer diff --git a/vehicle/odometer.h b/vehicle/odometer.h index 65313c34b..1414548c9 100644 --- a/vehicle/odometer.h +++ b/vehicle/odometer.h @@ -26,7 +26,7 @@ enum class origin { saved, // the odometer store of the earlier sessions legacy, // the file a python screen kept it in before counter, // the offset of the cab's counter, which used to show it on top of the distance run in the session - guessed // nothing known, a made up state which the cab's counter can still replace + guessed // counted from a made up state, which the cab's counter can still replace, also once it was saved }; // odometer of one vehicle @@ -34,11 +34,12 @@ struct reading { double km{0.0}; // the state, km double start{0.0}; // the state at the start of the session, km origin source{origin::guessed}; + double guess{0.0}; // the made up state a guessed one counts from, km // sets the state the vehicle starts the session with void begin(double Km, origin Source); - // replaces a guessed state with the one the cab's counter showed at the start, the distance run kept. - // a known state stays + // replaces the made up state a guessed one counts from with the one the cab's counter showed at the start, + // the distance run on top of it kept, in this session and the earlier ones. a known state stays void seed(double Km); // counts the distance run, in metres either way void run(double Metres); @@ -49,15 +50,22 @@ struct reading { // the saved odometer states of the vehicles, km by vehicle name class store { public: - // reads the states written by write(). lines " ", '#' starts a comment line, a malformed - // line is skipped. returns the number of states read + // reads the states written by write(). lines " ", "~ " for a state counted + // from a made up one, '#' starts a comment line, a malformed line is skipped. returns the number of states read std::size_t read(std::istream &Input); void write(std::ostream &Output) const; std::optional find(std::string const &Vehicle) const; + // the state of the vehicle is counted from a made up one, which the cab's counter can still replace + bool guessed(std::string const &Vehicle) const; // records the state of a vehicle. one not in the store yet gets in only once it has run, so the vehicles - // standing in the sceneries don't fill the file + // standing in the sceneries don't fill the file. a recorded state is replaced only by a newer one: a larger + // one, or a known one in place of a guessed one void record(std::string const &Vehicle, reading const &Odometer); + // takes the states of the other store (the file, as other simulations have saved it since) newer than these. + // the odometers only count up, so of two states of a vehicle the larger is the newer one. they aren't added + // up: two simulations on one machine (multiplayer) count the same runs of the same vehicles + void merge(store const &Other); // there are states recorded since they were last saved bool modified() const { return m_modified; } @@ -65,7 +73,14 @@ public: std::size_t size() const { return m_states.size(); } private: - std::map m_states; + struct state { + double km{0.0}; + bool guessed{false}; + }; + // the first state is newer than the second one + static bool newer(state const &Left, state const &Right); + + std::map m_states; bool m_modified{false}; }; @@ -78,7 +93,8 @@ std::optional legacy_state(std::filesystem::path const &Vehicledirectory // the same each session until the vehicle runs and gets its state saved double guessed_state(std::string const &Vehicle); -// state a vehicle starts the session with: the saved one, else the legacy one, else a guessed one +// state a vehicle starts the session with: the saved one, else the legacy one, else a guessed one. a saved state +// counted from a guessed one stays guessed, so the cab's counter can still replace the made up part of it reading starting_state(store const &States, std::string const &Vehicle, std::filesystem::path const &Vehicledirectory); // state the cab's counter with offset Offset and scale Scale shows, once its offset no longer applies @@ -88,7 +104,11 @@ std::optional counter_seed(float Offset, float Scale); // the odometer store of the simulation, read from the user's settings directory on the first use store &states(); std::filesystem::path file(); -// writes the store when anything was recorded since. returns false when the write failed +// writes the store to the file when anything was recorded since, merged with what other simulations saved in the +// file meanwhile. it's written to a file of this process aside first, then put in place. returns false when the +// write failed +bool save(store &States, std::filesystem::path const &File); +// saves the store of the simulation to its file bool save(); } // namespace odometer From d755c7708f752684231e8f7792582993133b56bf Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 18:19:59 +0100 Subject: [PATCH 359/430] fix: the SM42's CA off in the shunt mode only with AwareOffInShuntMode, an alarm on kept Review of #275. The shunt mode suspends the vigilance device (CA) only on the vehicles whose .fiz sets the new Security key AwareOffInShuntMode=Yes (default No), instead of on every diesel-electric with ShuntMode=1 (SP42, SU42 and the 401Z generator car had it too). Suspended, the CA counts no time towards a new alarm, but an alarm already on stays, goes on to the emergency braking and needs the usual acknowledgement, instead of going out with the shunt mode. --- McZapkie/MOVER.h | 5 +- McZapkie/Mover.cpp | 20 +++-- tests/unit/test_cab.cpp | 184 ++++++++++++++++++++++++++++++++++++++-- 3 files changed, 189 insertions(+), 20 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 0149bfb7d..e67da9b54 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1131,7 +1131,7 @@ class TSecuritySystem bool is_sifa = false; // Sifa-like pedal device, with inverted input for convenient keyboard usage bool separate_acknowledge = false; // cabsignal reset button is separate from vigilance bool cabsignal_lock = false; - bool vigilance_suspended = false; // the vigilance device switched off by the vehicle, as by the SM42's shunt mode + bool vigilance_suspended = false; // the vigilance device switched off by the shunt mode of the vehicle, see AwareOffInShuntMode double vigilance_timer = 0.0; double alert_timer = 0.0; @@ -1147,6 +1147,7 @@ class TSecuritySystem double EmergencyBrakeDelay = 5.0; double MaxHoldTime = 1.5; bool CabDependent = false; + bool AwareOffInShuntMode = false; // the shunt mode of the vehicle switches the vigilance device off, as on the SM42 public: void set_enabled(bool e); @@ -1156,7 +1157,7 @@ class TSecuritySystem void update(double dt, double Vel, bool pwr, int cab); void set_cabsignal(); void set_cabsignal_lock(bool); - void set_vigilance_suspended(bool Suspended); + void set_shunt_mode(bool State); bool is_blinking() const; bool is_vigilance_blinking() const; bool is_cabsignal_blinking() const; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index eaed979f0..af3591c24 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -154,11 +154,12 @@ void TSecuritySystem::update(double dt, double vel, bool pwr, int cab) if (vigilance_suspended) { - // the vigilance device is switched off: neither the alerter nor the button held too long, its alarm gone with it - vigilance_timer = 0.0; - press_timer = 0.0; - if (!cabsignal_active) - alert_timer = 0.0; + // the vigilance device is switched off: no time counts towards a new alarm, of the alerter or of the button held + // too long. an alarm already on, with the emergency braking it leads to, stays until it's acknowledged as usual + if (vigilance_timer <= AwareDelay) + vigilance_timer = 0.0; + if (press_timer <= MaxHoldTime) + press_timer = 0.0; } else { @@ -242,9 +243,9 @@ void TSecuritySystem::set_cabsignal_lock(bool v) cabsignal_lock = v; } -void TSecuritySystem::set_vigilance_suspended(bool const Suspended) +void TSecuritySystem::set_shunt_mode(bool const State) { - vigilance_suspended = Suspended; + vigilance_suspended = State && AwareOffInShuntMode; } bool TSecuritySystem::is_engine_blocked() const @@ -276,6 +277,7 @@ void TSecuritySystem::load(std::string const &line, double Vmax) extract_value(radiostop_enabled, "RadioStop", line, ""); extract_value(MagnetLocation, "MagnetLocation", line, ""); extract_value(CabDependent, "CabDependent", line, ""); + extract_value(AwareOffInShuntMode, "AwareOffInShuntMode", line, ""); } double TableInterpolation(std::map &Map, double Parameter) @@ -3158,8 +3160,8 @@ void TMoverParameters::SecuritySystemReset(void) // zbijanie czuwaka/SHP void TMoverParameters::SecuritySystemCheck(double dt) { bool isPower = Power24vIsAvailable || Power110vIsAvailable; - // the shunt mode of the SM42/SP42 switches their vigilance device (CA) off (eu07/maszyna#457) - SecuritySystem.set_vigilance_suspended(EngineType == TEngineType::DieselElectric && ShuntMode); + // the shunt mode of the SM42 switches its vigilance device (CA) off, on the vehicles with AwareOffInShuntMode=Yes (eu07/maszyna#457) + SecuritySystem.set_shunt_mode(ShuntMode); SecuritySystem.update(dt, Vel, isPower, CabActive); if (!Battery || !Radio) diff --git a/tests/unit/test_cab.cpp b/tests/unit/test_cab.cpp index 69f6278e9..063e70911 100644 --- a/tests/unit/test_cab.cpp +++ b/tests/unit/test_cab.cpp @@ -228,11 +228,31 @@ TEST_CASE("cab: the lamps and the buzzer of the security system left unattended" scenario.check(); } -TEST_CASE("cab: the SM42's vigilance device switched off in the shunt mode") { - // eu07/maszyna#457: the shunt mode of the SM42 switches its vigilance device (CA) off, it alerts again - // once the shunt mode is off +namespace { + +// the SM42, its shunt mode switching its vigilance device (CA) off or not (AwareOffInShuntMode), set in the +// test whatever the converted definition says +definition sm42_vigilance(bool const Off) { + return definition::fiz("sm42_v1/6d1").set("Security", "AwareOffInShuntMode", Off ? "Yes" : "No"); +} + +// runs the train for Seconds with nobody acknowledging the vigilance; returns whether the vigilance alarm came +bool unattended(scenario &Scenario, int const Seconds) { + bool blinked{false}; + for (int i = 0; i < Seconds; ++i) { + Scenario.train().run(1.0, Scenario.line()); + blinked |= Scenario.cab().SecuritySystem.is_vigilance_blinking(); + } + return blinked; +} + +} // namespace + +TEST_CASE("cab: the SM42's vigilance device switched off in the shunt mode, where its definition says so") { + // eu07/maszyna#457: with AwareOffInShuntMode=Yes the shunt mode of the SM42 switches its vigilance device (CA) + // off, it alerts again once the shunt mode is off scenario scenario{"cab/sm42 vigilance in shunt mode", motion() + brakes(), test::track{}}; - scenario.add("sm42_v1/6d1", 1); + scenario.train().add(sm42_vigilance(true), 1); REQUIRE(scenario.start_up()); auto &sm42{scenario.cab()}; auto const &security{sm42.SecuritySystem}; @@ -255,10 +275,156 @@ TEST_CASE("cab: the SM42's vigilance device switched off in the shunt mode") { REQUIRE(sm42.CurrentSwitch(false)); sm42.IncMainCtrl(1); scenario.act("unattended"); - for (int i = 0; i < 120; ++i) { - scenario.train().run(1.0, scenario.line()); - blinked |= security.is_vigilance_blinking(); - } - CHECK(blinked); + CHECK(unattended(scenario, 120)); scenario.check(); } + +TEST_CASE("cab: the vigilance device of the SM42 kept in the shunt mode, by default") { + // without AwareOffInShuntMode the shunt mode leaves the vigilance device alone: unattended, it alerts and brakes + scenario scenario{"cab/sm42 vigilance kept in shunt mode", motion() + brakes(), test::track{}}; + scenario.train().add(sm42_vigilance(false), 1); + REQUIRE(scenario.start_up()); + auto &sm42{scenario.cab()}; + REQUIRE(sm42.CurrentSwitch(true)); + REQUIRE(sm42.ShuntMode); + scenario.get_going(); + sm42.AnPos = 0.3; + sm42.IncMainCtrl(1); + scenario.act("unattended in shunt mode"); + CHECK(unattended(scenario, 120)); + CHECK(sm42.ShuntMode); + CHECK(sm42.PipePress < 1.0); + scenario.check(); +} + +TEST_CASE("cab: the SM42's vigilance alarm on, not cleared by switching into the shunt mode") { + // the shunt mode switches the vigilance device off for the time to come: an alarm already on goes on to the + // emergency braking, until the driver acknowledges it (#275 review) + scenario scenario{"cab/sm42 vigilance alarm into shunt mode", motion() + brakes(), test::track{}}; + scenario.train().add(sm42_vigilance(true), 1); + REQUIRE(scenario.start_up()); + auto &sm42{scenario.cab()}; + auto const &security{sm42.SecuritySystem}; + scenario.get_going(); + sm42.IncMainCtrl(1); + scenario.act("unattended"); + // the alerter counts only on the move, which takes a while on the first notch + for (int i = 0; i < 300 && false == security.is_vigilance_blinking(); ++i) { + scenario.train().run(1.0, scenario.line()); + } + REQUIRE(security.is_vigilance_blinking()); + REQUIRE_FALSE(security.is_braking()); + scenario.act("shunt mode on"); + for (int i = 0; i < 20 && false == sm42.IsMainCtrlNoPowerPos(); ++i) { + sm42.DecMainCtrl(1); + } + REQUIRE(sm42.CurrentSwitch(true)); + REQUIRE(sm42.ShuntMode); + scenario.train().run(15.0, scenario.line()); + CHECK(security.is_vigilance_blinking()); + CHECK(security.is_beeping()); + CHECK(security.is_braking()); + CHECK(sm42.PipePress < 1.0); + scenario.act("acknowledged"); + sm42.SecuritySystemReset(); + scenario.train().run(1.0, scenario.line()); + CHECK_FALSE(security.is_blinking()); + CHECK_FALSE(security.is_braking()); + scenario.check(); +} + +namespace { + +TSecuritySystem sm42_security(bool const OffInShuntMode) { + TSecuritySystem security; + security.load(std::string{"Security: AwareSystem=Active AwareMinSpeed=0.0 AwareDelay=60 SoundSignalDelay=2.5 MaxHoldTime=1.0 " + "EmergencyBrakeDelay=2.5 AwareOffInShuntMode="} + + (OffInShuntMode ? "Yes" : "No"), + 90.0); + security.set_enabled(true); + security.update(0.1, 20.0, true, 1); + return security; +} + +void run(TSecuritySystem &Security, double const Seconds) { + for (int i = 0; i < std::lround(Seconds / 0.1); ++i) { + Security.update(0.1, 20.0, true, 1); + } +} + +} // namespace + +TEST_CASE("cab: the alerter in the shunt mode, with and without AwareOffInShuntMode") { + for (auto const off : {false, true}) { + CAPTURE(off); + auto security{sm42_security(off)}; + security.set_shunt_mode(true); + run(security, 120.0); + // without the key the shunt mode changes nothing: the alerter alerts and brakes + CHECK(security.is_vigilance_blinking() != off); + CHECK(security.is_braking() != off); + } +} + +TEST_CASE("cab: the alerter's alarm on, not cleared by the shunt mode") { + auto security{sm42_security(true)}; + run(security, 61.0); + REQUIRE(security.is_vigilance_blinking()); + REQUIRE_FALSE(security.is_braking()); + security.set_shunt_mode(true); + run(security, 10.0); + CHECK(security.is_vigilance_blinking()); + CHECK(security.is_beeping()); + CHECK(security.is_braking()); + security.acknowledge_press(); + security.acknowledge_release(); + run(security, 0.1); + CHECK_FALSE(security.is_blinking()); + CHECK_FALSE(security.is_braking()); + // then nothing more on the move in the shunt mode + run(security, 300.0); + CHECK_FALSE(security.is_blinking()); + // and back in the line mode the alerter counts again + security.set_shunt_mode(false); + run(security, 61.0); + CHECK(security.is_vigilance_blinking()); +} + +TEST_CASE("cab: the vigilance button held too long, its alarm not cleared by the shunt mode") { + // the alarm of the button held too long stays on in the shunt mode too, until the button is let go + TSecuritySystem security; + security.load("Security: AwareSystem=Active AwareMinSpeed=0.0 AwareDelay=60 SoundSignalDelay=2.5 MaxHoldTime=1.0 " + "EmergencyBrakeDelay=2.5 AwareOffInShuntMode=Yes", + 90.0); + security.set_enabled(true); + security.update(0.1, 20.0, true, 1); + security.acknowledge_press(); + for (int i = 0; i < 20; ++i) { + security.update(0.1, 20.0, true, 1); + } + REQUIRE(security.is_vigilance_blinking()); + security.set_shunt_mode(true); + for (int i = 0; i < 60; ++i) { + security.update(0.1, 20.0, true, 1); + } + CHECK(security.is_vigilance_blinking()); + CHECK(security.is_braking()); + security.acknowledge_release(); + security.update(0.1, 20.0, true, 1); + CHECK_FALSE(security.is_blinking()); + CHECK_FALSE(security.is_braking()); + // held again in the shunt mode, no new alarm + security.acknowledge_press(); + for (int i = 0; i < 100; ++i) { + security.update(0.1, 20.0, true, 1); + } + CHECK_FALSE(security.is_blinking()); + security.acknowledge_release(); + // out of the shunt mode, held too long again + security.set_shunt_mode(false); + security.acknowledge_press(); + for (int i = 0; i < 20; ++i) { + security.update(0.1, 20.0, true, 1); + } + CHECK(security.is_vigilance_blinking()); +} From 57db0087ff43e898bd949525edd704ebf1576a78 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 18:30:22 +0100 Subject: [PATCH 360/430] fix: the SOD lamp of the whole consist is opt-in per vehicle (DoorClosureSignal) The three-state door closure lamp is switched on by DoorClosureSignal=Yes in the Doors: section of the .fiz of the vehicle whose cab shows the lamp (the occupied vehicle), off by default: without it the lamp keeps showing the lock of the vehicle's own doors. The eu07.ini switch doorclosuresignal is gone, the data decides. Sets whose cars lack DoorNeedPermit would blink at every standstill, so only the sets with permits get the key. --- McZapkie/MOVER.h | 4 +++ McZapkie/Mover.cpp | 7 +++++ tests/unit/test_door_closure.cpp | 48 ++++++++++++++++++++++++++++++++ utilities/Globals.cpp | 7 ----- utilities/Globals.h | 2 -- vehicle/Train.cpp | 9 +++--- 6 files changed, 64 insertions(+), 13 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 45e3305c0..a1a102075 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1455,6 +1455,7 @@ class TMoverParameters float auto_velocity{-1.f}; // automatic door closure velocity threshold bool auto_include_remote{false}; // automatic door closure applies also to remote control bool permit_needed{false}; + bool closure_signal{false}; // the door closure lamp (SOD) of the cab signals the doors of the whole consist in three states std::vector permit_presets; // permit presets selectable with preset switch float voltage{0.f}; // power type required for door movement // ld inputs @@ -2610,6 +2611,9 @@ class TMoverParameters bool signal_departure(bool const State, range_t const Notify = range_t::consist); // toggles departure warning void update_doors(double const Deltatime); // door controller update door_closure_t door_closure() const; // state of the door closure signalling of this vehicle + // whether the door closure lamp in the cab of this vehicle is lit: with DoorClosureSignal, for the given state of the + // consist; without it, for the lock of the vehicle's own doors, as the lamp always worked + bool door_closure_lamp_lit(door_closure_t const Consist, bool const BlinkLit) const; /* funkcje dla samochodow*/ bool ChangeOffsetH(double DeltaOffset); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 03fa3e6db..ce3c08458 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -8723,6 +8723,11 @@ door_closure_t TMoverParameters::door_closure() const return door_closure_t::released; } +bool TMoverParameters::door_closure_lamp_lit(door_closure_t const Consist, bool const BlinkLit) const +{ + return Doors.closure_signal ? door_closure_lamp(Consist, BlinkLit) : Doors.is_locked; +} + bool door_closure_lamp(door_closure_t const State, bool const BlinkLit) { switch (State) @@ -10613,6 +10618,8 @@ void TMoverParameters::LoadFIZ_Doors(std::string const &line) extract_value(Doors.auto_include_remote, "DoorAutoCloseRemote", line, ""); // operation permit extract_value(Doors.permit_needed, "DoorNeedPermit", line, ""); + // the door closure lamp (SOD) of the cab signals the doors of the whole consist + extract_value(Doors.closure_signal, "DoorClosureSignal", line, ""); { auto permitpresets = Split(extract_value("DoorPermitList", line), '|'); for (auto const &permit : permitpresets) diff --git a/tests/unit/test_door_closure.cpp b/tests/unit/test_door_closure.cpp index abfa5a7e1..c92d8fef8 100644 --- a/tests/unit/test_door_closure.cpp +++ b/tests/unit/test_door_closure.cpp @@ -1,11 +1,14 @@ #include "stdafx.h" #include "doctest.h" #include "scenario.h" +#include "vehicle.h" // the door closure signalling (SOD, the i-door_blocked lamp of a cab): the state of each vehicle's doors and of the // whole train, the most severe of its vehicles, as the driver gathers it for the lamp (eu07/maszyna#288) using test::scenario; +using test::definition; +using test::vehicle; using namespace test::channels; namespace { @@ -108,3 +111,48 @@ TEST_CASE("door closure: a locomotive has no doors to signal, its coach does") { CHECK(scenario.vehicle(1).door_closure() == door_closure_t::open); CHECK(consist_closure(scenario) == door_closure_t::open); } + +TEST_CASE("door closure: the signalling is switched on by DoorClosureSignal in the Doors section, off without it") { + SUBCASE("without the key") { + vehicle wagon{definition::load("wagon")}; + CHECK_FALSE(wagon->Doors.closure_signal); + } + SUBCASE("with the key") { + vehicle wagon{definition::load("wagon").set("Doors", "DoorClosureSignal", "Yes")}; + CHECK(wagon->Doors.closure_signal); + } +} + +TEST_CASE("door closure: without DoorClosureSignal the lamp shows the lock of the vehicle's own doors, as before") { + vehicle wagon{definition::load("wagon")}; + REQUIRE_FALSE(wagon->Doors.closure_signal); + for (auto const locked : {true, false}) { + wagon->Doors.is_locked = locked; + for (auto const consist : {door_closure_t::none, door_closure_t::locked, door_closure_t::released, door_closure_t::open}) { + for (auto const lit : {true, false}) { + CAPTURE(locked); + CAPTURE(static_cast(consist)); + CAPTURE(lit); + // no blinking at a standstill with the doors closed, whatever the consist does + CHECK(wagon->door_closure_lamp_lit(consist, lit) == locked); + } + } + } +} + +TEST_CASE("door closure: with DoorClosureSignal the lamp shows the consist in three states") { + vehicle wagon{definition::load("wagon").set("Doors", "DoorClosureSignal", "Yes")}; + REQUIRE(wagon->Doors.closure_signal); + for (auto const locked : {true, false}) { + // the vehicle's own lock doesn't matter, the consist does + wagon->Doors.is_locked = locked; + for (auto const lit : {true, false}) { + CAPTURE(locked); + CAPTURE(lit); + CHECK(wagon->door_closure_lamp_lit(door_closure_t::locked, lit)); + CHECK(wagon->door_closure_lamp_lit(door_closure_t::released, lit) == lit); + CHECK_FALSE(wagon->door_closure_lamp_lit(door_closure_t::open, lit)); + CHECK_FALSE(wagon->door_closure_lamp_lit(door_closure_t::none, lit)); + } + } +} diff --git a/utilities/Globals.cpp b/utilities/Globals.cpp index a8aadec22..b4f2e14be 100644 --- a/utilities/Globals.cpp +++ b/utilities/Globals.cpp @@ -506,12 +506,6 @@ bool global_settings::ConfigParseSimulation(cParser& Parser, const std::string& return true; } - if (token == "doorclosuresignal") - { - ParseOne(Parser, DoorClosureSignal); - return true; - } - if (token == "movelight") { ParseOne(Parser, fMoveLight, 1, false); @@ -1579,7 +1573,6 @@ global_settings::export_as_text( std::ostream &Output ) const { export_as_text( Output, "skyenabled", asSky ); export_as_text( Output, "defaultext", szDefaultExt ); export_as_text( Output, "newaircouplers", bnewAirCouplers ); - export_as_text( Output, "doorclosuresignal", DoorClosureSignal ); export_as_text( Output, "anisotropicfiltering", AnisotropicFiltering ); export_as_text( Output, "usevbo", bUseVBO ); export_as_text( Output, "feedbackmode", iFeedbackMode ); diff --git a/utilities/Globals.h b/utilities/Globals.h index 971f8495a..ad216cd96 100644 --- a/utilities/Globals.h +++ b/utilities/Globals.h @@ -115,8 +115,6 @@ struct global_settings { std::string Period{}; // time of the day, based on sun position bool FullPhysics{ true }; // full calculations performed for each simulation step bool bnewAirCouplers{ true }; - bool DoorClosureSignal{ true }; // door closure signalling lamp (i-door_blocked) shows the doors of the whole consist in three states - float fMoveLight{ 0.f }; // numer dnia w roku albo -1 bool FakeLight{ false }; // toggle between fixed and dynamic daylight double fTimeSpeed{ 1.0 }; // przyspieszenie czasu, zmienna do testów diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index 3a4c42db1..bbcdd1778 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -9108,11 +9108,12 @@ bool TTrain::Update(double const Deltatime) btLampkaDoorLeft.Turn(DynamicObject->Mechanik->IsAnyDoorOpen[cab_to_end() == end::front ? side::left : side::right]); btLampkaDoorRight.Turn(DynamicObject->Mechanik->IsAnyDoorOpen[cab_to_end() == end::front ? side::right : side::left]); } - if (Global.DoorClosureSignal && DynamicObject->Mechanik != nullptr) + if (DynamicObject->Mechanik != nullptr) { - // door closure signalling (SOD) of the whole consist: lit with all doors closed and locked, blinking with - // them closed but released, dark with a door open - btLampkaBlokadaDrzwi.Turn(door_closure_lamp(DynamicObject->Mechanik->DoorClosure, simulation::Time.data().wSecond % 2 < 1)); + // with DoorClosureSignal in the definition of the cab's vehicle, the door closure signalling (SOD) of the whole + // consist: lit with all doors closed and locked, blinking with them closed but released, dark with a door open. + // without it, the lock of the vehicle's own doors, as before + btLampkaBlokadaDrzwi.Turn(mvOccupied->door_closure_lamp_lit(DynamicObject->Mechanik->DoorClosure, simulation::Time.data().wSecond % 2 < 1)); } else { From b1f2d0e3a1e915a399131d55bc52777e2af217fe Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 8 Nov 2026 18:14:06 +0100 Subject: [PATCH 361/430] feat(editor): the clips of the tutorial lessons, which the tutorial plays from lang/editor_tutorial The lessons of looking around, laying, the curves, correcting a curve, joining, the switches, selecting and editing with the gizmo each name a clip, lang/editor_tutorial/.gif. The editor tutorial that #289 brings plays them, but doesn't carry them: they were recorded on feat/switch-blades and stayed there. Taken from it as they are, 6.1 MB; the packages copy lang/ whole, so they go out with the game. Without them a lesson just shows no clip. --- lang/editor_tutorial/camera.gif | Bin 0 -> 1545975 bytes lang/editor_tutorial/curves.gif | Bin 0 -> 1817214 bytes lang/editor_tutorial/edit.gif | Bin 0 -> 302462 bytes lang/editor_tutorial/gizmo.gif | Bin 0 -> 357759 bytes lang/editor_tutorial/join.gif | Bin 0 -> 262186 bytes lang/editor_tutorial/lay.gif | Bin 0 -> 570167 bytes lang/editor_tutorial/plan.gif | Bin 0 -> 472328 bytes lang/editor_tutorial/switch.gif | Bin 0 -> 773288 bytes 8 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 lang/editor_tutorial/camera.gif create mode 100644 lang/editor_tutorial/curves.gif create mode 100644 lang/editor_tutorial/edit.gif create mode 100644 lang/editor_tutorial/gizmo.gif create mode 100644 lang/editor_tutorial/join.gif create mode 100644 lang/editor_tutorial/lay.gif create mode 100644 lang/editor_tutorial/plan.gif create mode 100644 lang/editor_tutorial/switch.gif diff --git a/lang/editor_tutorial/camera.gif b/lang/editor_tutorial/camera.gif new file mode 100644 index 0000000000000000000000000000000000000000..3558c0c1258a951709d54dea28bf00652cec4652 GIT binary patch literal 1545975 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�k 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 z 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

xL~e%rK8kMqGO9ZJ-eKQH zra)5RWNv7qdpcgy;w?+a7{w*0u#Wd@(1At9P=1k9y}ZWn(6Gg96`cjnd~vL-~ZZc8~`JQn@LGFy;0Swl`CI){cE){Tabl{wtFju}5`9 zg!9&sR_-rndb((eP5dDtFJ2UBb^QZ@K5+V4;4VW00n4N~cy*0S7%_(}2;Z}=X*-(~ zK(*8hv7U8Lf-k7Dxo|5%GFZgM{#|7G3k0D&LBwYUnAt@F9Qk92^Slfatf(4}AB+IY zzjYQ|g`~>-n(WL-$cKqagzmCGK6Unhoe3Z{>bOOy=AMH9&lxS#J~aD_6|!)#KVIx1 z-@#ki{MT@QC3$Y2xcLMgbB!GK`e$zYsmnUv6Bu}G)WaKrMkDx)AIC35m7{Uk;1TL$ z1X~=^rP>rW$l_&@ZUr#BYQBw~`Zg@RK3(oIwQ5l*>i_^;WC}i=#3wkpXS|8G6C_2$!BgD)!fxdLYkyaduTmsC%+K#@P23J(k(i0f1$K zwEJ8mPG^igJIL}eb-wjS%#BjF4}DcDFU~a|kLQ2E-+)nzI@J{a&?n+Pf|&&U#0>)C2hW+mR~@rdBRs=8 z3F9YZ77X*e5VV^o>cHG!#OKnyd{QQ&mwU3gb0r7DBU8!n<5s_vB-C5ZvT*2$>**!j zim~}bY#PU%=Q%L5yM1IUNdt+i#syR~ZA5ZVu}t=7yu4|8z*Wx~cVt!e58LmLU*@O1 zd<~m+|4n%ot8mQ|7>%ZBG0NZJwGv}ZI+zTe4_FBlPjlQnrX*#k0Eki~w*F8nq2($4} zDY-YpUq%m-*Y59(wJ(nmJ2t~Usqp1lovh5E>JBr6dT##O+->{$86F2>-ezB{TKj$S zvsGk4xo+iV+FRul#-)>w$}CqWkjWFshbkpeJ0~-6Md+U63Sc>(btDL4&tM-

h%338C5aE?!LVecMw*CEDuDTMM?$ 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ⅇ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 z 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
?D%62k?CaLu(Ob5U$J@)lxL3f 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

|c3J+{u|1(|^Fo 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

H|QSn~ROvzG8#?-8#3V!&(F$wa+$U$Pl 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

klIFNi2PVW=Fvm7{7#W4n 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 z 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

IPK1_7IceV+ zz(8}opo<-0`HN=~!-5*JFP0@fzb81ey{+NkvrQZJ67tdgaAN!%E}r@w5o zQC}^^wjiUt6CSZd>Sa*{PQw z$&(GZb0wC+Dwn6*z?Ixr0A4*r-`-;-7ux@A6uzFiudM51OzZ0ZsQFgiu%r1qFTL{! z;<%zv<2yc=ho$=nBZ58RAy1!FttAg5RQUi304a;A66|UY%oeS_dW_o5x#inO{U)Fl zjwxiT=cf?1Fs8j8I-1B(`Qc5OT#a&6`kOX^dTl!VStOg>b4S5s3X94!Y}@R)E{%2T z!lZXYAIzR5Ru9OzHNvF)Z$A}{{f*JgdD1I}Jg!(waL-AACPWk^|9k6=%gw!g???&5 z`ioybG0c3_^3NhDe}fU{&{jWK#`C7y9(XP zXUGVuRTDfr5xxui|HNqZ{2twVVW)Q%jt%||7CG!*{Kd#^klZd&k2}S!j=pB_RQQjQ z{A^N^HuMyre)QlvYRB!#(g`kX96<0cPUat{j}=~4q^7f072J9lH`m2^zEXne7$A>x z+M+(C3hO9iTSxBbdB^+PPI7@X8?CxB=P4*kY1Ys%wG~S(-_k?)%;hfv!pW5ne_O-; zNozdaG~&F%|4m1P3+sBcMg(I0kHGuCt#g{&8WRxrJL(cYec(G7TQ}Q@p$tT<{`Ttl zf=VmW8-YM2SRmQ;?R&#xG7xzu7qq(3L1)EM?4Z`^0$uy85(b1!c~GNUW-3zpoPN$% zcrF3BC}}N@Y`J01fYO;Zv=)@TGx^{vp}TH_Flku#s$Y|rs}K&@QN2eOqzN2n;UbIa z?9BD5W6@G_YW(7|?^XsI8toozVSlKAxvon9@u*_J$dDFmass11o3aR}U@{il>rEMm5V|%)I<++w9)eHC3 zWu8a_bbsp4=tdY4pjH&6JIODUC~<ej?ZW%lkc7qZz^&v!tA=GMf z2_-r^a{&epUL1DhibotjqH=E3f?U8~q z!DJvZiuV-(Q<;_RR=UEl0APN;dbI&ucUHL)!9;tHMy_)gRoOE|Qla0Mx`fm8asfs| zQ@eYlj+luVnCUuSyH!R>7qh&Kj;=DEQ#X7gYK4kS*J?1KWd#SKCCMCpQ)gQ^kdzUk zLc_qWO+c@(0Eji|7UH@8yJ!C>l;pZkF2|;I5fl&67t8q~6^-wOqNtUgf~N2VyG+yp z>ZA`^a~7$H@_h&`16RlVJ&Z*JKHrf;*!5oTWgHNrPt%njP_53E2+GJVW8tTbVtr{o z5SyQat_A{_6r!*ompj?VDfnJ94_PR6esNe~iU340;}K|vw7vC7!fK#M&7>QqwK3Ue zL589i&lB_jAg9TPvEU4fdCFp;J>9-E8MRbn{G~FUO4(iT&X%t*cfdd zTbtw8pi|?@eNzsX)cqwuk!~19&bWNaIxPPz+yjuj|RNJdV~oyJ{rtJ$)tTj z!eJPin{8w)%&QmDkuJdpJ(aP({B>^?Hx;QSsOUP z;*A9+jJ1^-EjM-$O|4pFb(=ftSgHsqgo9rT*GX&a6VR0r;y(z z$UilI+zHrfe#qi?bJ$Qx79VmfW@R%p!*wO8?Gpf0^{NZ3fLK7AA8z!lHL|er3 zLaGm@8G-~mw(5^DY~pGlu!XP=s&$@g5D6z4ksbTd`GN)LKUVbLA2*lrP_+iiB}RW! zbWWLWtUSY=GC!Jttyc)uYr8|h_WVcIcd~#&`UYD)TMo*d|I|E8Q6x}?YO=K1GlRX@ zXy%Bm^G29Wi}ffi{q8oDkh*_u>WpECr{zy5OM|OdHsYZNpC`tK|BuGjbElb6{X7PE zG~a>%E2OQI5n?87A+JS(50dVw{X3gyuf0lgYk(P4vs8$~7!YB{g2et;9*v=8P~BO7 zIsQPrXW1yJF&kH#?Q`2bq@~a8)G3W_ZRwH~aA)W{bp%=9{bbEQji0G`f=+i2pdI*O z$EO()E)iz$sjZWs4k}g-Jhn*x-lV{Q*z;d-+bskpGkq%s@=qZe^jgG;SwBItD8e1NG{4VcfJ6mnR?uuy?wKVg{du@6Qcbeeqom2a+tU39FRE)OXaDn zNf+akaXmvSY)rHJh!I9739*=8w-u5_43$HO15%V$*r@y2{nKTK1qp}0-E<6|B2mmj zk5^d$#*6!cV8KR?V`Xg?Uz=0|PP>4gY+H6a^4+ZVJR%_CFk74@s%NKN3cD`ByRcbC zdO|JC_L9LdtbAzrz$42a&X9!qwAiw}1zMpFg~Wl#^w%{O4uCvgT9cw++M8y+ehvVL z1h&l)TrrWn`pG2}U+?nwr!Wp2l@SY2 zHjaOHTxYzXJznk6$+nvioPIv$GqEb#b*7*nJI}g*GY6y{iW6uXN%>45fu<4l3Za^F zed6G!%!g{UMnL4zl8$$|?)^a#3eB?qe0Pu9wY+WLT2~EK+5B|x4>+`+g9Y75DAdnhpr`V7hH=OO2z3wAj;VuLE`Xzlk0j%S5@MrV1t1= zz(gTeRmS^}tjD`hZ_tNqH8TicJ8dJ@2O+UGUFpI^?1CHwP<$C?Q;+g437AF-I9v)G zYyrIQhC=`V$;`{Oib=J}(AYq1K;dGdj)uh3-u5J{9*!qMA;3xH{l4}RDASFWKIw}t zwKuDSa9O%1SD7C&;nk~1=BrbwGCc?XfS1f|OHf=mobs<#gi?_4&TE+WEC_@FIP{0d zlpyg5C*~7ug2XBT1hh0FBB#k4_8PU@5FJJflfn&^6zXQC_CY!4y=G1@RA5w9oltpYTdtaGA%jfbXkd!lT)_lK2$Lac1)m{ zpW`fyad~3{52ssSCqZ_QHtWwgG8nm5y*LhW>nj^2Ni#Zufc$hd_i>hHOUmh%8O>q3 z^>Pzxr&L$O(-xpi_bJ=YzS$Te(j3G@`>st}E~zZq=9fh0ztI7sS(-1H2z;;d{q8I} z;h5L-_E$mR#vjTkNmS{FcYmh5)GKmcGh#%c`j`Nk>8&lH^v@z$^n#O53vjb>(*eOA zlm4Ub@b6Chot7f9-P8w~m1lWcU%K<3GSbBRsn0122QS%qc4N8?v`#w3=)zS$XR%Jn z{Tc`x3}ioxWZ*D6riQjpH!!EJbp6a4({TkxXk}tX2;04x;_I3CwLF}nBxhv_R=(!; zY)S+Wto2LNs1ik$XSr-Rl9H`?EeDa9!1nv9Kis28=!2=-B~v6S;(iB{5aH9SCu!e8 zGo%V**Bw6fB!mL^bJsK?Dv?^l<_Oo41Qf!}y>jhM3jCR}+N9Q3DTdJ(69b~0yUKe4 z404)Kd#=T#cbSoFtfTHxF2-zsHUh~N7j{f;t0hQ|`mz&qJ&M82l_`2_wvY*?%HORN zrIm~PyXs&awmYV5E&^5-QiQmHKXEthY=ep^4Kn4Nex~)r75Du|L3K*9;c zY>yBrc9rd};K8iR*XdpW3NJnqd1N6`*LSJ8U$CVR%gBAT>@l-RKU)T=%_@i2=g^1 zK^ZJv!7L<@WZq6!em$ePD#aHfv(Hl$_f|#JcDW4^AQuyj-b`t>Cj_!@gjYDLrE+m! z64$NxCFjEd#8Qb`5Od3J9`IXgSv8}(Jn1!}lR6fG`X)FH<7wMhHm}z;AJ|Q^qR|W@ zTrF%NMhOlI%u|!oCI^v(#}NjnxSdUG$X{nsmFz9ky;eayc$TO(Y*M*d-YJ6uYdx%E z5oIa4$lWyEZlHDd<91&^FsGbMk|UN=73%2f%uF{m-lY@L_NuGcID;5e9l#mio`}-< z2;yDEIZw5tpsO8E`!x~o(mKSpy9@Mgaj z9XI`l-C;~s`zQOH1iZ;+cl)6y379pD#%BqgPgYfY{qcmE^KOY5$Lf4$0@kk_OH}rb zHYmyUSLTh8cdYC zRYVOgodxukh9*5t7}%3`nKKgQVYx{ zyoZp^+bf@km?o<-q77_0%uTwCKmVU7eAp@G1lQHV)o@#-^VZNyD9eHT^Mlksxha7Q zCzeOp-7P3tvqExHU`5^4tV@WP$3c#6R14R|Ak z-j}Q_AF2n;(_p@5(VVybL{VX^AS#QXaJbOJ$gl1uOtsPq72N9m$K#lBXX^Q55Y{UN z$`Z9Edg3xlm6wEzmg!vCIH8n=eCvz;;KcC>Erw?MS(8s2q_!X7$$ZnL2?oU;^lM~3 zd<$0j5f60K?675A+kDPx0i`(f89Oh>c~+rdV%4I1QHgx#vV}wCfK9r}*4I<}YvtbI zHoV~p-EV`if?kZTh(O^37AKMj-!`c-Zzx!iulmy-`O%D6+&6HuMqmw-ybs5)w?$eb}ew4yU?iIUQ zf$2UbtY7D3Q2a45gl5>Jw+6Jx@cdp5IMi}vN?U6P9xRbSBw!8r zI4!|%)o(A}{_y=SP4~6pcLwv5I$D~VGh|jwOP9K~q&C3y@Nd@PTNWCR&g$Nc(Ri0S zH>-{6JZAirZ~pTtjwZJCnmrZ_RgbjY^?sfn^jK4cjMVe6U#=|O*9bR~19}^2g5Ivb zu$Md>yT{OOXD`7{=rl%~C((~0GX_w9hnm;FrXpN*!@744xx>^4aH&vLZx*F!BIZ;N z(~tF63EOg)USYY#w%u>msd(L`egf8TJQG1{_zgi%dqXm0iyR4Epn_FX1}QfJE3 z_E(1#orXXP?f60qj>;nM&GI||0jeGH%Dc?!wROMOqyCu`*`SUD583p_J}Kf-en&>5 zh&P}+F2&p+D6@$=QiAgYaWgGhm2k?826QXv z{;B4Znuuf8FJXgJsQaS7H^!1V_7W{KLY;}}cY>PCg(P^VLpVj7e79rXq;9b%`%O64 zd_>l}{dCX3v}7RCl6i!Swi;Irt8;(wLxWKYemWnvdEf3`PoCGMsBU_1aCI`LQqa9a z8#LhR4Ey2>Tgq;&4UKfBRUrQG#cmZ-W?Ds8T6 zj;!t}0PpXm#nZ9<1%b-IHykG*t2?<9;!R?9 zWvv`)`Vj_CWHhardU!YLlzraEn2_q5z@)D+N3S`xz4E@=g+uVExBu7?Hi}efDI)#A zC}hLGGXxb$;c!6s6a_PwV$m2Zt-L%LjfU5#@qq&lH9$E=cwaNs?gFtjWvhTTCt7q! zs`P90)m=mhf=$gb&je?4290O{3Wg_Gd5*b{dEV)>Bhv@%`Ug5$GkpYn%X*KImDPWQ z7Aq;8)-ho7ZyT^Xa-YA&7KYxutEas4OVpkd{!!j+jwfJ&g#%Tpfan*;$tTi7*ABQN z>c2KaqglDm^usN5+?D!# zAX|~xPf1+%1q&cr?k)b3F@T{4oXC=b`FBB}Si^4hGT&2=fG21lWel2?D%NTQPk!73 zCmD=$=dBlIPzRT-kjd-(9aBiS7E1!vHoQPK)O9DAM@fmTF4dHk-4Z91QIJn|OXj8f zt@!KI8Xh}xoC?RV#(XOWi(HYOHv{AiaBc+to+y2h6S*EFa?!Oy5qOwg z2Vs6HCixg=(jeNj)-z6~>qQ29vy+SLF134^T>m4u3a2e%k$q?T&7m}<-R}sMF3#t^ zc%?%K8fo2=(z$r2Lh9ow^4&L58@LK7y&RxjynP(_7mZxa+*C;Y8>i(}$JNFX2#TMM zm((Zamy#{V-|3z;`Qq8Q;FuvTLW!s{epP6jnfn3G0A7ygWW@zDjI#}u zX%b*_+Oa4YvDUs(J=%)#0q>>3pbK`av&8$yE;4%bvFHpnKP9w(7EN$OnH$%IX@1M< zV^uI|;1=tlVQh#M7n+^=-#J|6IZp!oOoZnYt@>Ew1RYGOl386fa~as70AP8CH;|>> z2Wobc&Muh+ZHd5Z4?ea(JVs(lb21winwjSA%0w@o?5*qmMc$y(@$ z=YJZF=~&7p>goYVf_0pJQr{RYi*={>dLW(kjlB16)B-1~3&Er{+<7(QaS3L@^ex(m z@+xjRF}Ecshd68b2thr}OAFB;^hD&19A*8g+gEq{Y;i~ASK$-*-eRegF3Kz~49!e& zwU$`y=-6_`$hV(O3A72`)b`=M5@9JKkX!z@vFYI6`*Ko(RB17;= z)fLgvvEZlzIqA4ySls4hbyatxL` z7j0F$MP1pkK8loQ`{(Yv;S=k@_3C+mHi_UnX&V{$va?*;x&Zu1Ddc=93xQh5zveDw z>jzQzvL;vnKkI^-AAin69)Cutiuxh9xmGR2;~5($$U(syWqpWEZ^+AkMr}{c z0tkSMV*TTqHKh5FX2sK3(#X50Dwe7otkk;2DB z74)Ljp`XF1JD>TOGJfpF=;T9`P7Z$Ju;#HH`<`QYjQ*C7-YRx^Fodtco?{%-j$>se zBE)U%@Q}|QyDYuhFFJFt7`X5i0Fg=-aR@YvD>C`NUIXekU%99XsbHyHJtau|;q>wK z3^g~DSZI579xc(WuCb$?-7{QPYwlSG>> zT?KeuxsRVkCiT{9Yh695xu$%vj8Cr*_TY0Ymm#J`x#$NW&Nyg{7EybM1R zSZ0^Sc}ni=Km=;MytY(e6ygl+H*~RT^6*A{98Nv*%stDMkO`M`*1U_YWuBX1QG*V` z2wc{Iq;HKYPY6Z?yFBGSx$aplF#qS83bBY{aZb@hhi{dB^rHGgNW%D3kAB&5C#9j_*O3Rhfi>jcS6SBe7 z4T+^8{?b^$B=7RLzTZ4VRD%RX#eY@k=QQsU|~uKbIc4ZL4p<=DH@#j5ny9 zRS6a5Y`OJ}csLu}x94ZE^mTBP+pKs1FM(PoE>ty@=eX#qm-4te?xnMn;J)2{YAkWi z^FHb6b*F+jqpo)jP0fl(E}!1zciF*NYOQ;ri#oUjr0?|}3Hhz-&LM%6)yuhmuhz(%8MN%Ma{tXB2jTPUwu>}eF5 z9O;H9=eOf04Ub$&9}f*mt1Hoyoy%P<*sGz?R|HYv&qQh^XB4J`DwL83hfaMxuR@B+ z9(CLP`TAFz(X$2d1c8Cs3{s|ee;3XT~8FGfB-7vzza9brEh=t!M;sf z)ZTyz&uR}HES3QXJLtJJ!P3XS7_f>;S2Qg`4>A=!(o_*aX5RXJ!Uis=ofm;?FPaFp zR#T3c)Gv@({a9p64ay-12Kli58Jko7?0iQ@jzIuFH^mMz;wQ@{f&8SC|N3-n2T?0~ zu?}(eBB)(^$VrzMLkg;CFxa(6|Fp;#kMyTw4~Wl1X)9}=+~SUoR}pNr&^cu!`W{Q? zm4Y2ikHfDMRe9GR*HFUz$J~HKnR+pew@23&? zmj4ceRy?rdU1yhQ^^U%>i0yYvANGkJ@0GjovURk>X$X^}hGIirLm+#x2dh2-r(%?B z1lKKC-CnQMqyFAM*FLu1H8k&V-+yA!jKey9hp($|LO3useMfIa*=(T`0YR~5XCf!Q zXlwIm2nr8Zuo)M_gJTx42KWIpIRr3BIJFFC$-xVfwBVgOUiFyHY<7j%$23uf-C=hG`-DyvFfo}N;qK{f%@c0%YY3H^o(zc8ni(p6 zMW>{3glKgX&UE-lw2=oVAX6n+m-){XW3LSv<`OjnYehw=_CS>T zSp*Hiz4dvC3v1~t_tp1EXmcU&xV+T>1Aqab;5Rs%lRQoVH>N!ode=QVkkr}wF~MvL2}Y= zBMWX*!7RqG$|FD%SqBUiqZGRIoLiq3e(|rWgK6cruw)(4uA%Ou8-QVG>;ZKW?h%Qn z#VA4jO($#B9ecF_>AuXIrsLLL{plcAOO1m3F?7(#^}UVY^MKsLYR7Dfvrnx6u#jSd zJ{m>ms&vG22mq`vRzaeF7SM(Gd1L18?Jd2WraYl}93yDSH#zU!`cL=aAJgDEQ+fgL zdz}4oXF{yHD}P%64MCM^hdq9v&(fa#KpUUvUtFRwCHUS2xK*jn`w!S!{{0J_;#&q@ ze0{@!l`rp_${$8+-k_N{x&YXopn%1lC>riUGk$OwOwz**^RtA~9d^>&?w@;wgne`u z)7R~gVa}-;pbyay<#&h?B6(k2*WC7LBRv*cuTReOR2)kL#}$VNA^f2Q>ARv%tp+9HbKlPp3C22>g};^+RHd4+Dzp^4llpz z*Y*rQ3(kJvmQ^Nfvwv{-U2M%Y^y&qOk|0HpIE()**#6YtW})~(Lu$y2j7I=@R@s4O-skmWocr_cc}lcR zcAmH3hkxO4_|aZHwB#TLTSPZ7gYKbNuCzIi`58gKt)zX1%9)!Ty)6T)0FD zZt&%B^dcLYUfM;&Cf@V&6j-to(=qy=GBqH2(UGR)|CB%u5ICOfqHomBqa${j!0?0c z4qYEb?a@;PJ)fl5z0H9S?~)oLRjn>-Zrg{0&Ca2Oo6^lj39bl~?TN zuliu6^L|l!wZ{~aNmdCz(hRTpDA0IYE5QrEo8TshD_@uuyXhfw``pr2%%Zj{Z`>2m z-g`7MTnb;$?LZy)k-L$9Qf_v>GpIBFI$hN3Y?9gi$;HP^pt!f&dF@lVz~ZHq8Cl~+l$k7rCs{vMt0?uK9$DbuP-}j4fCUwUvA7E$o2AERa{gMR2YYSB?fs) z;VTtUW9IR_G{Qs$dZ!F)hSD{W1$sr10vXli*LTd9{}}~QO-R4aqGilbbwrW+u>-6d zi;KY1Ku5L-o}zfSV}ifDsY*thZ$Qu@VP*idbT0pWLL@Gdn7dCDll=?E({+t9W?s=* z|8Tf1Ea$sxy+NbV$ykhHFu%iILUd=jZry==!80!Qu}Prg_7c~}H$JDFqmcbk&d{Py z?{@78;d;{AHb7o8t-!^#TP@c09+_If0;&a6x%g1$4PD2Fn=hS2DqeUJV!UMYV=;87 z0fk!7gwf(V9h#_3DL<;mh!}wEpbj~{DAf)i9$uYdNXo%+5kJg_+-NrjnC+9sdvcTzT?-XIE> zgDKCu_k7QPJ`}QfUyq3Hx+2k;Y4_~s97M8ooApfU@em7s5M9UJJ+T?D16{W}j(ttX zW+Y|+Qffk-f$uOn@*{SzNij4lrv1--H?%(<$Zc?QFjxGJFCOx)%?c7zef8g%j%Rp! zb|3LCfH8$_HyW|ju_5^*y)UKy;fZIcQ|vFcy_S-W+*}hkEMtC)^y$LcLr?(t);YIU zbVgw>MCV$vUP<#^0JCHWMyO)0)KnRrQof)uiyopCUNV{0Rc;|h+3o;X=NlfPn4v?m z!6XdL_?A!+DS=Hq!+JOdujNL-MTm{d^{%hMp}#`>T+F@cMr#jUC`(5Dc_hysi!kS0 zNu-B+SB9&}mA2xWeS;sytIQyEw_j^N*}bzj>5IyzDEDqdY!u|+`rPGcgtkFk>Aa+l z!g0=K!FO5}G3x6{R)1S$_fy0hk6`d?^d}8;l;SS4=nWyci^2t41JKqk8>)yPNFQWs z1UX zAx7|KAM`MNam>Yw6G6$2I$Hnd1F`T|+~PmcA-T6_RmN$4v}b4FPxarUe~cJPCfMu8 zjXfXfDoYJ1aHBsnsUnzVqqQ+*z+-JC!|DQV%Ly#sAi;i}7A$M&sw`16!wt)Q4? zzt7od*RUO9E527Ak$}H%<*aqrd2?tZ?r*l$E zmTfm7-@nivLV*uH*)}sJjh24KFKHz!({*E_kCH2(ds$q0+HWl?>%ahK?QE5n-TnlW6IwybJ-SA8X?E$ZX zZNRLde-X9={5+_l-rxzbK6O=p8xY$}%_DgQ6fwFbgUDbYUTlJf0)=G;fi3CUe#?bw zbJ5MH2Kq>WvXR;9EvCPE;ROwoL1P{ZbVxB_iIYbb-a4TOi?=P$Za6&X93k(3pwUG{ zB9f#()9J&_BKW}C0s6N%S-J{GZBi*R`wm0}^~yusRCp143is+?rTu5N?Kc3dGE+;I zY9QDA_;R5B@g+um#kxBy3*eU%=`F2O=@n#EG~KUdVT29Iv!+Iti{SD5gTFi^h%s_4q$!%TDVUt; z^u&_j?ABr>*$cZH+vqIk8gq~u9+DgozKy^=462-+a@9#;QBjPd0Fp;nOP}A4?Y99Z zFE;$!Aj;8&|5(9@H+eRf-Nb|dpFgU4`kCuD2?HXBg9H$Js`L!vK6YUbs)pYLBWmhO z+#EmF=#}p#oFIY-JY^Mt?ew7Or5}_&7En8s<(kTMQDOlZ-p9!U(XV`?*{~LKA>g%c zPKE<#l%b=VYbgnw>`Ee-N%dvs;Po=Lew!=mjD<*wyLtdV8%m9pPiVk8o3r@DK1K)Q5$6!Xrs`&S4q2+;4FSB+Jis&wq0*x z*jqs_rK>*cP(-Hc6U1HILCR1|(BL(_D2ae%)t0}{5u+im2NNEYynbBQ0W#*sf(!?G zd26CvQzCFugA#Dv-P=6Uwmb2D2d^lHWj+J%GPR^V5F>NhV+PS@{ zu_$YXE!LS98iU_L|6@!v2E;RnnIP=u-9Z&iW>XDydm5m?s2l!TmdJH&y)}N@J&-mr zrVJ>6lnF%^;=Vz}dccIS7;ao2pl|o&9)UkTqP?CuWB}7ORF=4pFaHRr#&pr45xfz9 zD<0hMg^AU%eZ${>Y4ej48fjs65Om6@;7E?A{WHq+OMoB=xL$XJ#&v01MdU_wtY)5? zg`4z<1@@XO@W5<|THk6JYQPYL4?bC*S-qM`7;^j{(aEhshx6M`hMtbgMyd_1{-IulrVk%F23IWZbHu8X;_}1ufIbWc08}`ylE@US(sSl%f-W zaAQOOeMKxKWJ~D*S7~`ylpdTz%fo^R=A_^S)Jp82(Cn$?&)?!iyMA7Jn)G zsQ$RhA=N%I5aFQHvYgTa=SR9PMm7-9CK{_b!7h9%lK(;=mSK+65JRsDaFV%n?UZK^ zb@l4^UFXuTsIMM8VmGsIlVI9UgD%6pWx45S35y}b`prGEIOe(JioNLuh7~(RH2zzZ zRe&@#?80A1a`Cann zkW{Lgql>Ee0a0h$cOud)VFeo#z-m0wr|Ibj0dUvf!>y}inAkzs*)UpQh8O$u|5|WK zk(Zjc4z|)EpbnxG>G;LHkdSGqD|0ODr->oV@7kr@&>Yf(LEqwsOrW(4spRzQm40&) zV4N1W(KFGh!tJq7ZbGF8klTX!YMrCIF8CTl zDOF_;-1#9}3Vj^z2B?>v*}dm&`e%=@VOCQ2@&*Loqz<75?7JHbV23ezRRcbu-~tIP zo8n9d8t6w`gyA3Xn&xc8}sV)dQ%TQXc!$;BfhDYj8=)X)_;V{zA}oJ({&-DT)av<+7vdEeyMHtpAey(TP}sPU&jg9^~FFc`c@g+XlK*6k)hehj0mn#SyaqW+JebMa?- z|Ks@gyZcdE>&1^P z!k9~07Ue<1^U9^RKmLP1*G0*im_;BR0$<3yyvk%`eZF~uHxe0|c#Qhba4Xvu z;P}Kq<3CGu<|6kIVCnLV9y-_iT;Zn0)gQ*S|E;xd&;0u|$u|VW-Jk?tZEU4vEdQ?T%5udO zRqA-RZ_b9Mea?f{W1elV^k_@h9r+^s2{PN1M>fH2$-86#uax8iCF`C6k{oCmd@U>A zhU-QP0jo$^&)4^Mw?MAv&4=g$2MIM1)K^3*=tH@5u2N85w6}lXD`?C(y(ZIOOA2iD zq=}E4fI00wg-84KVH$yAU8IuV@NSw*U`*M&ptROhfo`i;QLEsMiS!|?7$3Dyup+3M z^*xg{xZ@*gf{QN?cm5c)DR106Flr*{W@M0xSbDsP{l!Rn-sCwEawl>4bJg@&{jpW(ISFaj@o1QwdR$zCWC@v4E`gVZ0uBy>HQdy<~V`l0* z%dOM6!CXd44LIld)N$!~&KC2O$$whaKM*N_P?`Jh^iS)GoFe5j zuZ@~{KJWYp_ZK)p8t3R;`LFV_Z{HV2hj3$O9dB?4Ad!{&sC;TWAvY_1F^a`VDN8JR zLmzu+QzqHlR%{w7v|u{w^(ncLKqOv@ng;(ITHb9^c0N)-Jg#@+o0F=tn7xM7XxRi^ z_PxMy2^O=$sO=K-q~UjD)UJK7&=6hXqh?{;k`oD)+bANauAF#9pc_} zRw|fSPs2~T+FkQe7rSib_}c>e&?Hg;!?nA2I5yoSh7Xig2|Tr#V5$?u84Nv>b4|P) z#>`ZG$%?HBjWuB+zFp8anbG6R0!83vgoGM7=xfs4x>ot6v005Qur4kj)D#;@Kv>xb z5#`|@x=(KfegdCGP-Ck42y?QLv}<03QAatt0JY?n%S{_Q<-NXr6M_%CC>VVF^r$Qm z@eai)N$^Ad&eJ^xbZ#X`W%L1ETK8}_F@HHTSnZ>kA_QoJ#-`r_=yRPH`yPKKj z{%>@WUl8|C=H~@WeN-}b2kk`}MBeNCGn!?%7v&F}H1|K;7umm!_wZ;@)v>p(NvLI8 zS{4c~2{h!FCkp^TVvM*n+>PuoL5=jKj#6|yrpkUGm^y?Gd|uolU`0+e z{*#06LdYfu663~v_c_yaNj6ls1V92g5gnUXVJhX?vVgU$O1$%8_dg^pphdI2uiP(t z?2LTvOV*X`{nnk1e3R+(gX0Zx&DKPKV&P=#F9J^tM#}LaCcuXl$FePuDRV?xj>exY zKQ)g|)SbXRgZ{!pOS$mr6QVeOUDuqZen9lx1ngLN=*;v}{imq>Q@xMhpc;Yilf&E@ zP{zj&-NIbzE|=WRE3?6y94o@huNP=FZ^{mQD$c-%d9QoYJe^a^2*cM|C}N{<@moeHlz#A=|v4Ln=xsKH(>!b z+s#;qN)8k=!G?kduGOee_aA`?`dbJyacrkd5hVR za>zBqFp>BxdkBp&O34}oyDRt%)aO>?W|DwkMrv?W!o%^1|jE6-E@-TkEc8*79 z`%$x+;UTSaHcyqMg+o;W%(noL=N1^*;N$o5+v}01+!1B>q0x}R*D7hK_aH!mJ6Bx+ z#5pkbP_+wd&F@ti8;;8oz4H-{(%N0HGQ!^@G)z7$WU)JWW?P#J_|;f5=8?kJxIe`2 zJtRzbM}sMG)s^3a6L1&w8u?&2=-@YApf7oBZAziNQqp10UXoIrJC$jU_al~xw_WN? zBuQ3~elj0!y{Q9}hUc{^++Rgl%h7(6Fb!V1y1WVymbm8;gvcn0F$u0nU;PeinY**6 zWbKoGAPe0*LL!%hQCSnS!_TQ8F<;`6LahnvOq&h%7ehaPtfxD4Y7j=8CJRZG=y5Jb zm_8{WFc&Zbsx<`^rr(X;j2&@J2h0Ef!|Yt|?BWQGUe2FeQ+^18xsE*!X7t&f*`lY% zMcXGh=gpPjoyB9$m+Ud!7TbaAb_*Q{`AdE$(X>kQhu=cT zsS03AtEInSr!Ld&ImnM3d_1Zp3p_dO$Itaw>?j-mgP0JJSFz&=EIZl!wI_aLtmqPA z^VvQaJGR3yv1L3cTodEceOP~tP<5=6d@1vNSwuvpg=g+?@0;#!e>lwZk+0Kb+IWx4 z*4sE#&P{s^j`u(o;#|9*|IUP6{(f$1s_^?v+W6rJX5X=nDrVIIUpIkDs**KqWa}&_ zOTkUG^z#iR52CO6EQLc(s|1}7Iv(}WMFhQK;(BMauJ*G>$a!5<4|Ct`DDOtenCQIb z!@&oW&W|jH&DN*~CPC=EY|W5|Krw+%W{$@f_LBf4Lm2J=qu$W**v1Ulz>%je-S8ip z%wYEKBRKs+;>E8bOaHMhgI+}AX4XobPbwa{SE=s@?E6Qk5;+wkId+OVKa;c>egAqU zZ!j3*K!rtgROExkk&|c#xHg~p1wp9z<>KF6AVD*y$E`Zp#i~Q?i~Ee6{IGk%8kLes zcU(q6ZQ%_KTZhK-_I0T1eY!PfEZ&gyae1y#eo%W!KN)l9MI?m#_2isP;N`V!cE$U> z=VQOh4~0C2*^I!jZf#IzjCf;e@)PaT*@c(se>CLoiYFWluLq)Q^ADL?!#q zyR;mTDkX+o@oRm$neF@jqNUnWW_OYA7_X{@+p(f!*wW#>mv!#A04+*!AMvXO?=ns%-I(i1{HX47L z6@A7|ZZUB}$>GsE2l@Cmj}xCKs(!_3UI^#RPyb!%m)w1QVjmNLF_WuGjaxG>glC^` z2|QWmxUc>1Vn+Vq3yyE!3x2;0NcB9p_oI-j)-M@cMb!wfLFjj{p>A;zg0iYBG%%9P z@@3RyJo8eOV^x}COS>PrwuK$5K(GAzX0W^~+X9iuW0glbn^($R5%F~*U;CzN$B5l# zwSDc|B`Wu_uJsAKf~`L%{w1MGy3T?&^JKq+WuslFkFT>ow{G_D=!0x2N53rT$5+#F zhOj<-1*D8)PLiR1fBtcwm-_!ah9l4>UPQ>?^O!l>?{JUiR@SK3R~f5X((6!xH1*NM z#A*rbb4b6ZGh-L*zp1_AvH8afYw1}>B%Lc96dveUIY4gO95@{Sfp+?8KbNc2||io^Ky7%b?&2OjiBT`YD3bD~qYH#fOAnV2mZnA#9CXG){;cIMf zktQo735h9GKIT+#JoBXeU>pxmqd%8Jv!*KU-e^&&wWP77(l}ljM4sr_#V^JT%cRrx zTZuqPx-3A8nQuY88O|pv9Oxw^^l@@jjXclx7WpoZ$i<^D653@5=&ekj?~P)*r=N|d z{XQWr0r)iU(&;<#9@4Lr)+h0 zd*{u=!+cfEYw%AU|8%}ss(|6KRsf!YK#usydH&{Qa@Nrvd+`7u2{27Ulc_7ZKL#7I z2EXFRFIZb1+|?r^;jEMUH+!+#6=f1@ZQ(XwjQ(Hl7D<0Xo;M(1IxOve6mIB33AH%p zSuKD zLM3_l{zuzDN_qefRiEKGj^Y=pT&T+^WD*xH%hJfLjivj!hE0X`>woJ({%Iw5F5BGU zfWIUt3Iuu9*N3)QPXQi;Yi5hm9}=n|0-r`2gs_4C#MqR^WTSwR zHWi!6g{5n!E<6jniTO02k*}}O5@Ajyr~yK=c>x)!U`2yu4_d7-yLQw0z(t58j|Q>Q z8q4GC{9|*948=&5a4u9PK?8jV?$_B`51D{e(q(R75VZC7q{? zvJPKLE4f0|f$GpXaJW`mWQLjpgwu~=Lw@v??=S)(5HrrTyJDl22K{6ufH#G)=Ru%o znb8LRcXrUpF}ECxZjo1GJHS7?hGhdra&WIM`}bVl*pkg&s0JUH`A}pqXEi=-oC`+Y z+(vuDleZDa`9jRZTn1<{JSA=Nnzs@{T}p&saNCw6Avt0g`4(BeolGgTu;1K3r?EB| zJa(hfQ3!ud*J&`KBqXa#%lFpR6DFZsMnRjW8L|qh^WGSiNL}sVqgiRmet-V4k{s`V z&6vc+{T27Mqlu`LSK7C4d9)Y9Le-S6Eu35#$S8y0Dr-s&<(_*=a!Wc<^{Rjbt{Mx9 z`}Puv{WOTOruzzO&iXes{V~x;N(;3SWbRi8US~WGUIN6#_SHb#4&g+PTlMlrOmfb? zwO`t`N4$+C*a*4fjtbU4R?OtFCq9WqDkbRlN}LVih`O0DUc$Li36O+g!vuGA?>y>& zQ9V%fPs#ph4L&s3q6>-{q;1mN(e0PBE*nZhFQJ^t`lT6S|4mc48CzhcP}FKG$25N% z_!wkJ(Km`(Js$`k5`1|L4_Cs#nhl@02gr;5O)f6*tPss#Q*E#oii-!^V;kFtxvQNg zmry!bVI*mQF&@dsl7|2XXTFAM@eV|>tSm0RI5*^KVt_ix0VFQOn57dkVD_rYlKouy z2l(E8=(xMI+{Z-cqy}5?GuWaA>*t34R0`N@OFNd@d75LT=l>Hw%?*rkRCGj*kYHT% z(+jI;M&1BpuoE6InI_N4V*bqeoDS!{QHZ3nwjtVKxb{gEok}f4=hhyzl?SJPoaqT` z&vEWc!>5u2iLS)}eEtjGfcAJ?w;gHxEy{B9ajN5~yMU_!-^^B#)^En27TxL?0O6Cu znCn;Q6$aN#FF6bCR6z* zWdKUz6s*b5`MV_(E1d<|exh8}^ep)u@g)}fXY-ImmV3a+Fud-w4w(%B@kJ`?hoHOv zE(&VRJ8r!e^oCO!&a5CoWyrE>5OA-Mpysw->5Q0{XLMpDHlNJ`tr0G7KIgJ9V)!&ijrqIj4|J=a<#LmB+nO+ zOMR2!cGcNHn}Jp#d{t75Fl#9o|V zbh*<~WEQ+aA&fb_e~|8~?A&tWx_T66?+*xO>H`2?NzYmB=~Ml(tJ!d4KhB*DdVFgj z?ixqZekRabt)?HMt%0I;dx3_TMV4MxdWQnuhJ!(IWmq6OS%#Q7QxF0ksEk)~k=YvnaR1U%h-g(m?ToktW;{H> ztNQFh|AAS6QIaqYj~!TQNjGa9+TN+j(13|4))qwni^%OlM-U=ik2{rACG3wmOZe|<_dfu7Vk$)veLqTbBze6Ft0K9 zGd63r|A;r=kNV4AeGWzY_o`}a@`^5nwD8Y;qqwA$0j(1m0=fCg_!H@w{W&KxtJ!t8 z6owuj`@ot!yj7>IrZ}N?oSZKB6*P6tiK`j1Cyj_7)u9YY;F_J&YZc#g%B4(n*kJ|f za$T|i%s7-}2zx$W2O(dK{I5>R?sK*^m5C_Mw?6ZY~Ai>?xxgn0QP zEbt=Dn?K~Y@#WLMo;cXQ^#cx1EUW)wUorWl%tB0c=!V<3KCha|m~dU^-*&}^rc6|J<*7%PrC?Rq_xd-q?x?cFHXok2dA);EJL zs~)Jj^oM4(=N2aij4>viXu?V^H1_!hHpf<6y7~xB` zXYIb4d&x4ppcM{WsP&;3_DFCoFB0a4K4F6%dTEdIQv$sN#~E*!ysrz@5NXc+8-@r~ z!WPGIhj*oAsE=yoJ#>zvo&Ec?{5$zis7fg2y|4ulb{+nE1K}IU_sYS9Is(1z3Vpm{ z9Z=S_2U<_#kJT%gLIu2JT&!4eC82U2gNzXu!chvqJ=Hx8w~g+qDW(b^_H>yrm4WqU z)OwjC^*)0J{Q4k14p{!xF47AuwB)m>6a4SuI!H?YjiNLis?9lV_~yCD3hxhPG<2gv zn8>cB^N>&D!j(+UuTG=ARE<+LP(I&lJ`*C5!KERSr}$H24Vi>LmcP^#GMv?^4eDZ$ z6nGsUDE#MO*TvIC7DcjOe_mQggZ={L`Y_VQ=%5=$Wh_eQo}8~FA$#ss@TFRVdl8A# zh;Yck-;JjV!w$ThyDy+Tdd|VbO<^{}}T3#(`i5)=m@;Ojm`H~uW4T2sU4SLo|^t2ow&K|QDLWJ8jN<{-k7mVDPz0H zDSQD7Loq@kL8mop?#6?qXq1`ISzRK?mk7#cTULFoO1|9jfPs>6vi6i(a&`f%Wh~KM zFlm_K#_XV|3kxU37vfy1sr+iH@D_s@HI@VWWxlhr+aRl)x+-Q*wMX7l1lGyu9)#H% z4DOzD%4pl6HYf!u``{pK2M!_E#@1wYP~)q9PphG_EQd#%Sz?6|id#XNp0KL+dzjiE zJkjsdxpM>qMjUcNTt_!F){AHGm=@lj&s$U#@VH8UWSw^*4p_$B^-@ot{!)f*7g35V zIEJPDQYGVY1Z=d>crq>H0)&xsetcDaa}kF_2<49$j+OSdkfuP5$g#2*=dUlQ20hNx zl-4=)5bIP%pGENsrb9An#6`PbqK)35itbDKs&_3b`_WM#0g~K%!4vqZo5fs(>a&z_ zEihk+I^E}PbLVx=zwUmauzyck9%n##&sEcNpvSo$-a4fQCN;F6I-j&mW15^p!acg0 zq-ll^n=j4^1~_W9v4qPD1GbsQ{4%w)g!-K~minnz zbj|`b^ie*@D8AYbfAvORd!PWu1h!0E+miL_>?Ymj^O93C4+ENkqtIW;2#tJI?SWy( zpJR+rNgmS~dIv?qJlb5)^-eD`DazKQvQ1MoEb=b;D!-FW`HIzgGgWKz zv)8>3zn+?bwa7Xpw*47dQAc|m9mhZPUamsW%WQPwNpXbo{J+=7*Ku;1<-)`5j{0%7 zvgv7)_)H}d+yGro`vL=cgxnR`a0>|C2cYy+$+TQM8p!`%-|%P1Q%unVEA+Iln$JTeNC zu5_nx5C)LKrhyE@p}a@B&Dv_(M3b^5YM$QKL*$xev1QZ=PZqjV9IMR=Tdto}7Zm#n zwu+Opr@&1WDhjZeQz(LjcFG^2XH22p{}WUoskEcHxdNkdCE5kn*wbfL!aB0d_N5*@ z4nz+#q}YSRtaL@q+v27=)PLo7zIc2wtD^>@F~$by(*sXr5w5~C16IL734CT9wz~rx z{17p`G`+nG?Zt2T#4Ok!wEfq*DBoi4C;H;~s(k$5vzX^{;rUR#`AWNihN>`gezNjM z3}Qb%PmZT}wEcWFrtPJB-WW=OLKX&%rQPIhGv)Qfh;<#x(sL(~DGN3)J8C_$Mq+CQ zeC9>pdeyY$#YZvKo08`K~>qp6y3(>*V{`s|ENx8ZvPqV8>`#F8s`w2a1a*fdP z&&*tpyds#^I6%f!2)WzG4IO-|8~PysmgdGM)`|%=QZD%m2a#>(mrO3*+*Q*kz0>Qd zNVcOUMJ@n zE*KXe8x}q){lkaw55GD;Xj1;Ubn__I9%gztu=}vj0wqv|cqu!$xG}aX^eA^5f1~E? z5EZJnZ#j5OJ&v<;H#omwr<0^n$U3lb^MVt~9B%EEDSBc!cA+zi&z9yMDwdsYVU*L0 z9RQoY^zzWwnhCFi6i{SJGrjQ2iO-d{tC%tLcXN~|PYH5gRnBcv7w6skyt@s-R&Z`x zAn<;ad1Ur(WEQgc)TliIrR-m*fNAnXyrXfTi$LefsA39Mh~WvE7y@l(G)uX2GO)GG`$((&g{eIjKv2CCs?A#G}jAQQ|IdYdz zX4|3$JVjJ!nxO||O^fOU)U=z#hxTSF4SiJ+mDQWP9;NA65JN+}{+Ypl@gN|Fl)klH zwWM?>(#w-mx}}3m`aa%Z)QD^6JR-ivGc&Iazi8B11?6uP9b}xXn!*2bo#iDb;OF=R zsuFkn-8)cNdM10!u=%_sCw1|rx!zcAJEr54_IvstjfCv3Lw_Kv8Wwmw1JpAwHp1a` z+e?hfBn!Tmm+m^&Wje7Y3ltU| zq20Crl`-}q^Bp>4M?ktGGehst?U_$pAqO#3$5I_pJE$eRSo%{AGxXs*WX&)!jCMg1OQDMxw=#KoIs0Phw@-_<5 zdbXsdOKoA)ku6bkH zYR%fCg|#)lR`5NQyC&204`u$BT9;qf>s$HZ5qaO3@uD2eyHsY zyr(#I>IfQ>yKQR6W;dMrpgD?7*L;}gzywU*iSmte4}1{iH2-B(1;dJSJpq6-`dW=- zO}UeH{I1gNdQH>4RW2DMizMvkgI@~im-TQ_e~(SmoBx-v?HMNuyK`mr&y3M5XSW7s z!ngPiGpB?s&Ms%p(szR%Ioqq;OEt0qEk_)_Ts^^fYImuT0es_+K+T-;VAMS2iOcxp z+k-vjyNJNxO-=HGT;fXyw`|<~tbG1FJdkz2Q&vXvqhwApL)V2}>`!OY5Gvewg70M< z;Gb`1%q%PjQGyt~3+^6|3TVG@#)t2LED!Wg)7*o}AVNSny)tPjincHf(<22um5<8{Mlscg)V-W4+c z@+>J&OD7WXq5W+LK`hvGUAjqm0AwUSnTxnlV9Hlb86Rr>VTP&L!G#5*8Wn}~)YgWN zRIqRFxHP_Su;}anAJCD}J(eT4H!B;Yer(t^dEidk*_ij=*7i8KYWOxB@jC?jRaCWZ!3&M^p*jl}9< zF<7jE0u+NmZ%G4Bz|jbZyBiwjY}fDuoc z#-?cIn?|!!j~KSL48~(~tdaTH6GQWb>1A_0+`)a7vH-=9Od>7oktq9=WlwSm3MAdg z;2%w*a#SJE61PqeSuM`;yCy-t{&NwcjAp!`IwBrht#cx5nTG?&(4Rt?6rGV$) zSDo4bHOzR8;kk-bBA`5ei}Tnu?FF3xSk+Y{uD`T99qJeTt6?NCE8cVkY~gqBDLbby zr5BVAlbSVQYo2|qoi=*A3mVmf?!>^mi;9iR)g8(Iv>UV>>T4n6ASfBY{-}++8~R3 z0IOrVt_lpa2WE&j>PBS(&?KK=7|E);0G2Yj;wOU>rw^S8&;W#xjKoNjo2ZlR=-5G2 zkwgo$K@T50lU*bMaY0N>)e@g(_2N^2@lW8=@WuvF>(AY zNYnFS4RYeoNq4Og}a9=;5w;0B?3G)+@S8P z>8w5) z6O)!+8%~57>+{CeQF>ojMIP*;RuLvmN%z#4w=0CUq{d4oO^M!XO6ymyIVqR$k@_2H z<%$t4(3rb2R3nV=Mg;Rrb^CJ;WH(};GB3GvQ4)lp-CVPv82H-}FIi2i2HwbNnM zYr4hr;bKT&7>j_ZWA5CzY@3M{5Q(J}%Z^2K)wY9%0d={rb%EUzGUZJb%>wK#iIq-g z|AzBsc#9{=(|`VWsAX8WJ}|{qv+e=q5kG{oe$YMJNi|md4Q&Mzo>m@I>*oG%7qsy# zQ#LmZX_1s}eg@R~_#wU83eX*%qGU6E?MHpN3_!DXDMfaaX$5i$PwdOW?#2w*J7?cO zn$*i&-uA|42gO>&hYqlexv!P|)T zBv5>tzHr0Z2_E>W>koe+UuOL-m+UAO$QNRHse?|IVO>k_0 zhv-(q=7q4Q-n+sOSk(O@+TH*XD|_urje)BptzfNQPW>l0(U@NwW(q{8&3jx}kk{cs(G!_A5+i zo+ttTDbJqbWg^X-`MC*IY3Ls{BOXai&$YhYq{X|kThwzX-bt44x0}D;OmgVpcPI)s z2a!WVTn`yM_RhLf zb+j>-ALc&`piu6lKpDV#DyA*&kM=hz@mWsfLh%~&!=ZRX)V{keFtO6^9f50q285qL zpRS*DloMr6dvXEjH>bY+OPvhNfM{=)qf8n3_OjSLqq18ah~y1?EQ*kJ(R&=w?~2Gj zjeEb;lVKJ4GrOWwf?U*?oqlP1zbZIQU;eqNQwV%Z4vRTE@$rd!=2V=_?GBQe>WqJ) zOVwb?DU|%*+O9%nzJz!=3dp0f$(#fYC^gV$5pSJKanILcP zxL&PNQo_6>YBI9`V!r4*LX)yTqZH!FnZ-MmC~77V09Xv-OJjJp{=4dsx2>=UF;04u z93@md@$T&B1nq2YwC%#qxl-72S!}EXHX?z{C3s}6Z)1yrHY|@kCfd@e#W45?cFx!3Wki}WKH_qNCcY6a| zsAao%v+dS8Eclitzd{SPxkV8r0`4woPcgXKbQ(K_-#3-E;d|i9@w0~ocsSNMMe47y z=wX*Bb2QFn$EJ$fDIsjwI#<0)Z`u~V+KKBgPn2l~9&oBwnL1O)FVOcMuG3cg z;o$v6S7#RWu-RkZy56(nN;(1Hxz8#F63v?ucOqHIi5K-l&nyTqkhKU1>4VAg)s>rs zs|fmSs{82(^@dw94OjvT4(Vd&nf0-r3DDSL!bH!hqwB;2c$uha7#l(~f+N8hu-!5( z$~Uc5Psg7IdBZNq5zv48mlUUq*4Vbm3AXcfFe~XXD>2C?sqnToqro3yLOE2ci_RP* z-fTqIFqLpjAe4PpSbsb!JHueTG~Ws0Ka(5hC^Su~v|H3~lfV?)fw}KM&65}hPKnZ{ zqYk~!p6bM^;kyjCqkiw<i>4vHCj*72IVS%DpX4)^<jNY(IN}JB^>q5P7 zEadPTMl?U`2DiNCl-}>dJJV-^)B2i2^$!)&!Zw}=WhFJIzMx&E5n*An=P+tX?+r{x zYol`vc4$ zQ;cAr>q5DZjop^&C-yc*!AR?;E}b-b3~Ja&!*>N#m08ONYTE-EH7Qv zM#ws;00>sox3f6WYk#uO|GXCPJ zdiiR#lVth>zp&>r#C;U~uz{Sv4q4)#ThYE=2Y)&2CLSm% zxm5&y+{!ZNiN^8BKPZ(VeJ!~ehm}C3Sd7}15)5*ji1`lulM#M#M9wWzqXB9B)Cioh zzczb8;b_t|sgu%1SV7V4iV5w?AH2in#XjEUHn(K1BPi7>V*25)=yDwK-V{X=s$^;t zcHktE1%rRI*1lV^?O+jPi$7E6+8mXcl;sqrRIF4jt0*~+MXBUJ)3Fh;It-^cXdSD{ zc*t^?RklyDKiyb9lzbM~>OSonux@`m4%suS`yq4(Zj*O<-{%xK23ZiFuBnDLid2UY z5J{hrs1ks&P5o4}LTeGIbd`D9*Rg*}9bByX3u2aVycju!zu*=bw0PjQi`E@=ko$(u z>2|E)!(Hg2$py!k$HSK!Z8_9HD42fhOHgxW^tHFRdtXWqFWLB0RacGb$z`(Vg6eh2 z7_SA!T{=NUdfmShW5dE~B*1j*0`2=la5`!vA9&0lIM|&Da}lrd(P%z^FFjJ(56PNx zml2)oTLw_gz|oUsXfp6M4e`iTZCCtV9X#8JfKK74Ig#tyvsAUoh_8G420Y~452snb z3m`FNqkVeE_k!2gUHX7iKL@PEf_&KKXlNa+>l#Mu2fbq z;0_)SmbamIwBXGyBe%O98yP{Ldjj{IMFhChCQCw&Lct%#DRgIVnix`P?ev)eHRcBi z{qwMraPUu!DIgAC0>AAd9!hpa#L-~Wi~w5h(=p=R%nXy`eNwlhTI;vh-_Qe!%}d_q zyZEP`b~Hry>Pat7Yo~9>ZRjH)N8xeE*kS`Mo$|*V#IF8>I7`RW zJH7rt^~+CaU8lt&eDa#!SJ}Toe5eEJ#Rw;7#d=J>YnsdW2brKZgd261HeY3A!dpbs z24{SMko5zh8@31ww-+D6%r;ROrWHCGWiqfL(AU?Ic^=QDj;Zr(NM^*zr5+1k+LjGZiFw9ClBN zyXnG%ztO&)Ld@QL2ER40+h~KG#KEn%2H9My=`}N?jynnSq&YtPOPPMnBJ1*-pXW$=w*|AGvMscVXXK%OB6 zBj8HkY>O!twl!9zJpH6PpovT!9(}zUn*QGFaDVANHQIu*^y=A+AxI}Xd8q1B2w--f zaeuQ4GTvT)N!7R}_0vt4fkf6NoaNW_S3k1t%RGjVXj5PKmt`(vPz#Hm|;yM}U~0 zHmJULYo{pzz4N7eZx0MuM@A(EmOdJOw)^PL8>`+*6Q$mmFa*ZMe@Fd8*@?2XkSETr zQdimvzaqQ;Z)^)kPFVNRe7=+noIGcZEu9MaH*S|dj^OVr<9j5pmWv3=@RD8s z6lkm!*B+W2N7+$_dy!|>Ne;xX1Qf!9 z@y1V^5cI78INcczv%lzg(Hr)#l{tmuL|K(MlgqI|+oQV~ir&;Eupg+OT)=#sq6nSL z7DFY5@L>c3km!HKW$gay;u7)o%QF1Xp+i=BaOl9oVwlJ;z3f(*(p$ZzMi@C3#(Tu$ zF-#y5PLVti&n(jIr_4kJ@}-mkuf@K6m#3$1FNsi5o6O{%)X)VflOm8Zw@M)v7rd_J zKnn)?I7>g)`s`_;%n%4q&r=AZ01;vLx^Jb9_k+MzF$lxL!syWiD4-*&a?m@xw*{0F zW2m{z)~UfU5N6=+XYp0aO2-@_Gx_K`C=vooN*s;*=7X#y+wn$up3w2cHN0OW%TbhN zM|d0a3{nRKLif=aFx~iY6pa2S7IriIBB1xa#m{bjcdinM?ia0WtB2O_5NZz^PKSDn zWHj6x36vXym+(TPIA)lnpvE*8Z|XP@!^}~sbPipFNh_Lm0sHglC~4VhNP%8&r+;q1 zYKR{DTl|TYmqMAq!bG%jXprS5RHo~Fxv?i7tYPRymecAx%=Rz*L!iyK?b@ZVI-`+{ zyy2a3YU-skVfau%8e{-JXz_$1zyYDbw?ayoy*q!GjAo~ajV1L)R*cAoOeQbX3h>56 zMJrH_DAJx-dkCc(L8Nl&VR}1QlxI--s|Kf5w^wUSBIfhpK$IqkS1!&_2i z=oYzY$^%i(UE7y@3Nem!ATJjZCq!Vav{7zddyVcimdtv8^(yx=v4}trVMB1da%^8d z{#A(dDC`<;VH0u@o0aehBpvsalI|noGJ&le>aC#7bsn+JKiTPeI`#s<_uskmG+7S5 zNE8>0cOHj!p%!x+N#aQcyIId_^>09z%-cPwhnbp?X~(sUY6HL2QTe zR((z@q9|#;u1x)XP!E>jNJekx-(MOP9f@dkrQ_3NMxIm z7tPSB`%j#5S%!M7gi_i_xtLzcJ~Hi9?wMGAtP-AT=zRk+C(FK&FpeE2RxOW3S5~VV zZ}!Ra$dw2Koj!XWC}gr7`5=A;4FLvqZaw|yfz4-61%*!S`om7TlBEW@l#?j=G9hp8 z?JFzCvXDb?=DiFf#*_Jda>fF3T0M>I524>x`D@nSHWGq-n^+Io;`H$ped+m5=MR@G zkkzr8Kbsa>$ontr>Dmv*6Z8kEpuF5K+D%z8P@Oi}>#kDsgOPN1@Uc_-3n;MfeUW~_ zpYqf;%Y%BToF7k00-jIJ?N0;WHzqKColy@c<*QsiI&G@@^0b7$VZp>n`s^NcJj*Mx z&Vzo__4g*DkaJ1dV2k3m_^B6p@eoMwGzE0QKxLDaFiEo@QxqrxIXnVo6Fh=`a*Byt zgP?@7Lk`oeju2{6HVh1tXS`?1I!eUH{Jle%GHOb^AzeG(WvF6_>_>hXDCdB(yZWSl zmHk$9V!kQKJXwzHJEe~9F*Avo_eZ>GCl8D@q7bNDht>5aIo(i{0lSaXT)y?YFE%*o zK8bRzU}gej<1dx&p{VSv^=xxu%JC;3CYw-Ol~DGzF|FU!VzdWei2FX_JRQp?1~Y~U z`D1Wu{6Kbaucx|IScVpJs{cWHXzGp zeVA)LamN%GIYKFrf64Q5c=RCiN8Edh{k_==({w({tgo<@3djSIE~>^iJ#O?Axbip+ zzt8@&gQX`Ah?)71dCaukqvon@62QcloEy{??;DoN|Il^3Aga6F-s&R4dIohN3Olx| zNb(dI@wMeG57ix^hV2>`PYWW$9q)1#VZV=Op650h#R7Q_i~KEvHyfkYf^p8VgcaeX zxCbQ@N*HN#hI0h#KtBh^n`tw0pvw7dk_gz%yTxZZ4b;D2oN5NG!L$c+`)6AAF84Db z#xL1=c&m3oZeq|i+@K00$#T6yOOKwyLST$>3LR6fj{RaBm~xQ_O8F6T?M=w!-IW+9 z8pI>^q}WN$7v0=_-$bnVJI)&naqGUDp5AgXRV&*56uRm42RwoTH{O3-aAi^GyLt0f zK*Fl^-3*DAHmzJ~++Kct2C;3J#%2y{=b0t-flp?tMedTVMIrw>1Fm~Sr=zf>jpg#N zYfGH)uCyv>kfH~7!BW7_rf#ghM zc*8a2nAYDHVdJKrNfdAs`2a>k9MnbK`M6=W*z8SLAxkJwAa@w3Kb-ad*3SN) z>HYuX@At0F%r?Vlv@tA6NG?j9_huO8A|bhIG$m0Zp;BjKV=hB3OBx|brIOU4voVq+ zB&nRv289771?8&wom-My{ly9DdbKhqKr7qC98O#1q~ zG&#fvL5)@CFSWOq6ew0@5yel-6RXPiI31)Jc>2e#b=0E5igyx0&ww!=qDcpc&Mj-4 ze2g2}!-&RxhjV>6S7qcGlc?5sOcu$cGG4&=BjkSZy4+dF2yL0~khP2B5v_dzMbdU>84uHe_qcoI?6$p@!H+6 z7q7jzH!F&x^0(S_IP&_!sy??p+dUBq;Qd|0+)bjVj$;r^=Yhkd?{ado0_&pUQB-Z3 zf8V?Sm7Na=LR7?mO(+w1$p-ux0JTfG<(SNm{N_euNh@vTKG&P6P>KTmUWsM05bw(z~{^c~t*MaP= zSDZbP=FvUA=G@ptrjx=)1;D4T*g1(J1ERw!@sYXe2-O4A6N0ZPun^-%`YYvkJ78Il z5q>55Bjr(`T~Cb(!xy@jSuG+UrubgX7NfP)aggC(2m9f+KFj2tJuPTvL4VE_C#erQ zs$8fX4j=kQ*0KT>XPZ3~|yL_+1eSaXH9Ad3wvu-SS0IYws zs!{tAkniwZp+%^rmMf!q4R1;kLQ##Y(jIBs&n_3!YX5iV>VKO6f~5fWRbMggEBO12 zK$<*?K_jsbBJ79&rw&QEgwT2$L82j&S-RLc5~h!EjG)nYKC05g%{Rf>#R?{3q8pSn z0zb^8AJYl@H3~4slaGxgl%x-)S2byuxxx#VOe(MDEKV|$P^Px2L1CBwACVr?kOkROZF0!`yzG%8a? z$0h3b&Bhq7^B8(HK^B?6$1jh(-J}10ea!d>jd>~2IM;kqwO+Mg=iW!liVmAxNx=_< z*>}4P^_JD{_AAA>9wM7J>UQ6h;zlRMH^Hw*Rw=PcDm?PeOl3?o7iR&uKP zmlv&jXoDZL3|~qzTo_!!0`RmJFU-9)T5mU;W)a<9t^8pi$@SRg-61A&-R8RTK830- z-ps!a{<+UY`!(rnbY}82F)0IsogVDVLmKb4{$lcpb8V~x-Dh2xHX~k)ZrGDW*YJ(A z8W0<@du+51eFv<_(+@~X`^j~2&5^7CzNk#->ez?8tapGX=*4OZ(0_v}2FxsL?W{^t zNS52j?B`Hnr#YASAscYCdPK?EjG1YGHiMwaw$~RPanB+&?qSN>jI5Qw0>hGXP%{N1 zPb$*1d(RGNF&cEOg6+#rpQo$#8+Nc^&5uE2b`5p^W=%_5J^CvC!&Ru)Dq~B$h`wz5 zqj)`U@K9C)!{#0PXtZJH!{;+>V@C6%J0#Fb4d-Q;;?M7An%Hl#S$mz{`FVO`>4sMH z!(cW8dXVLAuH5@}R`WyN#z;I6Cr44;95*E(*vb32_G4|Pz6DeIfh;{u#QxK6CeZsE ztrB8Q2L8F2@OHbkN=^vl^Xjeie=n7kXht?>(5Bs=RMYlW+84cl1rEIeemtVtywaq~ zS8q@-OKEMPARJ5YmApE@8}jqzIDLuMhWN0j(;3quHKhgkxd2C5*#8}vXE-;s$s(@Z z%&YAK;zu+8aIat9w8?;$S;?ou&dac~d}D=4$U-f~3ZQq3%ndOHB?-&M)>#Ebrs5L$ zF-~(77fPvf6A$zaSxxQbmEFagkprI4;zgyg);dB!e^Y{;&y1EY$m8By(P>iIyc z#-u*E^;?+Wwb((6A4cttMA8lzvro?Zv3-F<@tAdrXxJ1pC0K^=DsU%HZ8>U^nXe4{ zV}`^XS;M({L~_Y1>?6}&F%i&G5dvyS-g=tJkeAhOmmcmIXRoa4A9D}>t^Vz=`J_}j ztivsB(Z?t|25&5p2;FZ_3Ldu8K+E#9czZF4mcDWTBT0lLJwoK`z)|Mq{Dvqeq|K`_ z5V00dgHo&(GAKEFHY%H@EiT%X&I%Q=9F5pRN{1hNmpKI~w105KR#t1esqJU;=+ZBU z>6n_v@rMHfXT+Z0sKd!~S8+>I`#)HQ7n1++CmM$^SAAm?w99pm)EO4^@KQbz%JJ~J zX_L4AGDy~8tx++40^uc4V1&>&XkN1`gB+^fRW+Mn7cO z3a%I~d#pi;tFUqJT8B*UtYi&t#-W{ul5*9wqo0%Gg&9E>?`-D61MD-wT3ddu?pOkk zHkx_5*1MfgcWWNmM58q;7C71&rDpEr?45n@(p;D)bVvRL)CRv8NbA|4w|&kOPub1d z{{`!>udjV$0!_@kZo=QtteDGLTZ=ltN5w&Z*3H4nRk`OJ9R;infwQ03bL^$U!(}DFv0+vQ$x*5>RhPBX1O8*=ptiojrr1T`kP5`us>y743Qs;(8P> za<*isADp)z&)>^T^PtnoS#JmvbI_iLu~ad6v# zxaW9==|FcBd$i8g;kH+AN{CbNLTrKm9g##0Jdvboze#!V|@U&`GP$C~I`Z1$Z_4xV198%*3h>c4_~b zGxm;pFEWc`cSkp|$gghk-e!FmcYQQAar!@{p4XGn@^9Z4yhr0iu8C8mr5}GbYdd1r zh|3{dESmcH11r{qrH);v?swU9jIim2nIqfWlfCReyKd_{71QN~OA{=+8>8}exx+@Tb|->>K7BUouJl(LCrRNN*^CA z*AU!1x_o9UTrX4Ld&^E^RQceG{nm*~alWWN{-aIa@gy#Mcc1JWRC{Jlu4D7*S@+6(A?)CcdRnCvaqY8?#SGEm=_J92c@-Y zoVk9VG8cOe)Ba4|Se^@~J{4>bP79br_6G3{{as{UkWSJ1fJoDQb(9ldEndfdc^vJ& zY?!Ib82m~b10ogj;+TlUOHsBV-56Om3j=_IG|O(czaJ(DDF$Yz*XYL7Ww?!ioI115 z(a%Y-?SIUKMI8$pua%`wKHRPIkS#)5`WWY~gifO=?)AE-9u9R-lYjoZGhbx7Re{lC zym&YJc?Z|P=v%pW9F1WjM9;V&C8wB6kw zSd2#j$)9Z(oI+t2fp}s2@sAt(Q8w#LEIT4B0C3G|Er@-{m?M`a(^+$CQntR!gMEE( zT4y=SxtX@3<3urn5EY`wn!GXX!Ng-oSdQCvPb$8)&fSziwlCs#^9lIt_#DRcO4LS# zy$#SL?xs1LmPA6|29oDw0Zx_GlfgOa!qQ3>3SFqyRvpMaS}s~tcdvQ{FcBX8ToIpi zH?6s;Qz3XhJUKWl>+Wo-2RJ}|XMMfo=+UGrL*;@%GBv+A#|XnPVltqjpk$GNKz9N6 zvJ9;9is^(PQ4zVfMkH$OFRQMm5qQ@w7Sv1DpDG(}Y+Y_kYlH~-#lt5B5TQ=(31Upy z1aG!Tlto&nDy7h2C(m0vZ{O%VLT6A{PKEFM)`1WfM#SOkZh`t61jX=)aNL^O*pW_CyBk@*PPhR?hgY5`z5Mf`bI9X#8(D&{j#5}FFQ z7vCxM-T?SlY&=+JyBl>S=yGK5otSsQZ^9@?>CQqeh?Jlj3!;V6Gp|7}Xk?7>`WJ2p zMF-em7Wk^VKxv9AoVP~GDqhWB1D4-jbkne%o-do1{{u~0#K(_1oZzdRZ6}|sT)a0; zJgD$Ikrj)A!C09eu*D)jtf|bj55|${JOhv96tVoY+27PItcDfb6G2!E2@i1>Ifzg7 z!fZ_3FdRenh;_?C(Ix5t6y8`5rkS27he$Boib={enI<-MBFZ5o#!AjY?-zn<=ee-gSPK%Z2Xg#=lPxP-gKQCuNXB!uO@H8=#o08G%DR3rXr1t2pU_f4J_0Sb+; zg4BpD>@xnc1XVEF4gUT~Lq1sl#>cSRxok9%ZDoeATS4zuZ-|SO-^C)+UA%@*YPOa7 z^O3P;AupObIU$#C0vkI~w+e8@|6zW+3W(P{n!>|-#kRA=EVCm(Y&AIPW9p0`1 z?0ea5jyqp4d0#}~+sv7#G-vEZaWOg>PLGVAmQ(bDi}MqIhtU}5+pI-MNT{}9!}JYy zQ(;Cw5ibXInXQQtbJtm1WZ-{euqG>91n9CROEel3&L$L4UdR$JJ*Bofp+lo_@@1ul zmd2T61W_;o0S6j9ei4mH~MXZw%>4|03pIsyts%H0n z6krMri*t@G3>>3 z{(0`a?zY2w4X$K7N$(d9jvjGye+_X-ccyYl)aZ3_LR~5W$ne~lOMUb_dy^`phLMg> zfitx+2Tjhrop`wI(o$bRr>AxHB-^{gGTBRwAK(HaA=Mfvd=WnO&zeA@2wu($G2-tN4 z#Nx@b_O&Hv|FYh3Nd1YiuhPWoPN1k;Xd(jI?5!R5pL^_PuC@uB2~SD60I_`4%Yj@^e_Ubhb_x z1OI&KHh=zN+3^mD-R#9=Bo?VH#hdmrB9U8OWbW1BqV8O<^b%gW05WVZ!$h4x<4f}_rmh3Y~VNd((5{1yu zrS;z^8qs#`pH~1oJ=ggB; zuO<@l{cI4|>V)TRBR$xh&}m%?nm!r@ii9FV^G_lYZ#xiDxMXUV&S1}6CG@FLzK;pJ zr?Fva=Dj57+L%+2Ih(2}n^?tmtXexIM7Z|^oILpzRS}Wp<1~fv+x$3U!!}Y3@toAq zMkxODcIUFso8#iW|1|@8Br|yPX)cXX?bT9L>;I-))AsrP4qYG3?WT5)^s9RgIDP)6 zLEw)x=A93~QFs(|zo=<7=Gyb;`O%78DJ4>ET$`4w6?b;XqZ13$tT}IucF?CrcRm_C z5wRMh!Rt;5W{kMub4nAM!I5uwV{C;#c>>;@Aee(3-ao%aheT}7uG=0NK=6*UH+hPdo!bY+FN?WooiAQ1NTK%-6h;QNH}$%3@3}}^O?bTXodk{K z$Ex81n9LQe%3NE8qzWMuf49i`JnoSJ!=DcgWx(ra;q2pi-sFtSo&Fj!(FpA%f-j3! zRWMhiTTiNfNZ5X7ah9LQFk>$*q*UvP`8*DkRsL zACV~(Q<{{=YVYOND{-UzRVvnKkqE(8=+MB3H~qJ$@|zIqf+w`A4SoZn6*6)|sohcv z>Y}(GRjxqK2YkrSoH;8>PxsWrQU0@XeU+0Lhs@58xp(Ew3tXHULwIC)Q=frBH;HJ@ z9oXGg3h6i2MmD68&+dOO`8U1$NJ8IAhm{ujiFuO(V^2?gQ)STrh4XTKTpsA8aWJjk z@$z0aq6#RQf(oYCIM=N|9&E55c&a;;PKF*dv7+L!DEn-}#FVDsRDIJu{1atRhz?!I z3YmBsDHG|s;20!Be>oPIfS=^&8A8z$D$1&htdkv?$;)j$6bW|DzIf%Ob}kC0J4VN+ z&n;cYa$uKiUYDc`^HK~MyTJZ*)0%Y?{i!OODF*r|FNq)3!-4nUr9qAa?Z2FXv{HyF z@W9{fDaN^Lc8E0nB@dDJcKtQjx^HU1M;Ut98`BBIhOo^$YW$?yy;ZOLkL%;9Wrj`e z{m+c|S1MbCsvrr31yp(StcM@qi1()91d%QRZEq$TaT=?s&kV<{Ix6&hAPb=}>UYAR zB`dUnTpCXSG2zJKG);x9lIE*{5DDh<3*iO$JnDJRauVYuMJ-VY&q8Loo{w+#kOs%= zD$Cg&(s&mQzps*CIbn&^sx8WGLCcaD()(eU6^izr#h_NH-+O7)7wqVwmDdwKnJI^j zW^Wnv*cOW}f!VGDGhSlMFV?tbeS^`K-5ZWX92Q~!qbN7(4ZQ6*4Wmu@{$=2FJtL;_ zRVrxi_pn=(5A3Hj1~>yQ=B~#^O+D-%>*@}in{hwvT&lkg@j56UYM9q|QXKpEB&60O z$_#e~nE~fxF_ruZ=Ya2Vq^nB^x1^WuL@Aeov zDGm$>Hq$^)r$8a}EQn8uISn3OK5_AXk@ao*W(8?bJ;dioBp~BT@y|jJTz1 zn4K78E1KD6ouN%s1}@`sU0kGwI4^L5^2>8*iF0g#Z^~bjMu~km= z`@Gm~K_o52X`WuFZXa$xN3nHYTPS=|H~bfQr{%W!^YCxoIy_!41eW$cc!prdj%U$F zksA4m@<2)RIz?-*#38@uM4*a%Sh==Se97!3XQ~k#+xP2cCc;XKD2X5yL6NNr9~{c; z03}fHW^rEXEE4TwhuloOZy6)nXCSXyFfXfr0Rs8$L(|_M>d}4@8Dsm5oM=~KAB4n4 zS+^^66opf=unJ}m=OMZQn^TlLgDaGH65dT9@i&@S#b+PynniB1dDxklc?mZbV;7r} zc=G<@*pKD3ij)!HdyB&4_Q?ye^FQJ%EJ9c$D=fP(3XJ6nJGm~<_H0Y&hZuak$k1z^v$e>qVM?qRnlGm&yHWZ5%fP^hU({ zcTFm=SP(StlbZ++3dc<&x*-=a*y?>)nR`OR^F7V2#SQW3i!_w#xr>S0*(}D8VT~o3 z=lvNCDb@q#=ZYp{Qtn6gO1ooP|Bg{aKFJZUXyCF^VE@YxzeehT5?`<*lu?~B)G}WY zEL0H)@C)m#AMi!Lc~xDP_Kfwh!%LLL{(`_~Xt&7iCY|iL{!^K4*%Ur@q11=Yg?_ya z8-DMv*>>+u7ce0cH7R-@)s5fmpnlLa`R014(46E(i*ksRFt`alN(H7=&kb_JS;l9v7~CEYF~22w@TbV zWunC4;NtZCp`i>rz;(+EEpFV@$JR8O&5NPp*SoPr>*yKkf%p~ zn2aoZs0a%}|1?wzK#xFOm37p)WGIIdjuG7Sq3enh7firg5WNYZrDcSv2e!@Zk`|Xn z&!7@>vNeGr4rNfQ>_MK|&Uo?F)2w%-V*}e;?AnLBt$B=%`7Euk&y71dMpjk$>%89} zn;@R->0)c(4{&p$?&GeL)rn6i$pD3-_)kl}1R%Gwz}2Dwug|+U0&An0-sYCvf<@~m zz~zrx6ID)4DeLHrg8XliKK~KmToegcfBsV(Y%TOpZ5I$m5G|Ja3p*ck!^Lct=g2fJ zL0EJ5iyLKD8O5(zHFecJS%i{d*Bl0p0IoJxkj?uVo8_-3b7P_OAij=nPh07^rY4p! zJ-)WXHKDDvR`XKu;g5-$m6MccxC6;ML*D(z_j3C*)|L3o)6kp zyXHS}+f4B>CT9kxRylR`Z2qYZZ2qSp-t}O|7^UQ%j`~ofUCFzPs5g}7k~xS!Ez;@~ z8BV@#%$94up6P}XxUiU1%VAKl6eSe9WLDH?21&|pq zSPo8b3kj(WUtnGx%C@MP%Td^{COjp)zj(P=b5`lmO!3^%QRH-7wcK(OEGqS8X#Tp{ zBi!d5XeM%zsFUjiTMB;IehD|L%Nz zqU(blbO9LNNh;}Px?IJ|AMHi#!KbIh?l0L?-u|JWI*0>a#VLq3EcT%PEYusdIXXRh%64V8`eVf$iJ;SJYxRVPB4!VxJkU65dK#8HMok-zw(>{IrS7*BHLV__qbTcWT?0Y z{$IqkAE!+7*6voqo0vKmz}XwXfDZ0n?(gdz*)% zIN+=H|GaXQo&Dy~-bEVlXG5-U)F2(tJ*hSa{q>q~ERUQXG;>4t--8WDi*f@+C%Pnw zBH+f}zOS)6_Rf4_XqEXkh`tTozq$KZi=7|sSHDYq^lyiC{{uD0%lwf-13JXJxrKKt zFzedoZ(YN=J4<~}$RA(=^Ff*-w}mxw;>@ZxHw`yPp`CR~_$kWbVN&S5`?nC9$k9zQ zmH}zhQPVaHjt|O4Hv$=VulKL|_J^s+<>r}SmWxfejp>H1Kj8F-#{_5fT?|@_Ao8_~ zU4KR+zpkQKow8k~j*y+82P<-P9y;|j+`m;()HeF5Whnk5SnBrp*vEr$#1kvriqM;4 z<4V=@1FB=5uZq;QE`9L4>Vx4a+d+Wk#wB2h7{Xw?z#+kgse|(GlJAI32!=}6%=D(%if|+-)fq`^BcS7 zP$A9=U`4B`PRKp$LjA90$S_Gbs}`nOX)OdoWrQgkw_H6luWIO71~Q`{2~~}m6ZOFS zbT1hB(&F&vou0)AYoXI0ob;BmA-=W)~Z?3X2 zTDlI#d~a?LMPq+6%91|ZpyPDZ1`F&nlDTw&*@31gB6*S5n7;gJ=*zVAd#(m z>vx8`!hoil+Nkm8Yx~aGCO`x$ABYhq#{mG51pxH#2;?CE0IV>;7{FY4q$`ue{mzFE zxEwvOIc@*e)I^t~Nt;h3Z$6gjl77hLcaU~$2@b=ymHdHh3UR|BG2LsUuo`+GtxaP zpZotEsAWjxFSAA9vLrNxKo5)PR^15kXO?-**f^y-_1N%_@y*M8%wdKFdbnaPGI24> zrTX45d_KMyWoW$G+Xv;BfH){3Vu*B;R4P@|)#QZ8a5Zi9Dy=<4KP@dyga`#MT+LvZ z8f)Xr*d{b09Ho1PMl;64Fd7;>EwV8J#)ZR)tLZIiNAL*1Sk)c^g(L9q+m64DGO9RtMHH=Xm}PPVp>(}Pb)Z;<@1)>|F!nC z)JfkykSW~10$L(Ya++Qb7qM}xT@aUqQ{8mySA>up5`SlPiPNlrsH)G%TJ}e_Gaxk| zCJoqV+V*)?!2(LQ-1zo$m?bvHW2ipyn`*H(4aP?|9&hF60H6k~J^oEp1xm}*J$!grFJt}T$G1wQCRD%2!WIGGdJX9?m|^M@~+Djq9?5hp2M5+ zI|@;_(L!2P8mK1*5tR6OQT8D)h3ZoI!tJOnHPaa9L&oIYx6_OQ^`JfU)QvCyXqGw^ z_0o{$Xc9-rp8~s1U$#haS}Rh99R9;R2KQ09(i5-^XFvapknJ$QKDQ> z1pA!`iBnUF!y@+S1U`uT{mHD66~2DAff4zQ#E-1&AYHD4Yi^Z4%cPAzSt%+6Ipx3) z+k6uH>hs6@U_M=6g1ttBX#Z6Gz~Cx)Vwxh-MYo>|0jN-sGK{L`P9Z@zh;?A=rZf-F<1VzxQqFEIn04?$NY2!Is2$8}j=AACMyl(fhw(ymxN18V;|FN>E=wr#!hR z-qpaN1LbLL#(Y~{&Z0AkMW&})Y_Qat_I;@*WwpBqWw-#>`!n~9dRU-w`CIB>@IQ;A&1u_2xsYO>JK+>%(QJbRX-#~}C zf>$*xtWMo&9SqrB1dkE}?vw|Mk53{jdJ_n!Cu9>v(!YbAQLmzL^xMZk6y+AmXl#`t PeeQ$j)GJp62yFg80ha1D literal 0 HcmV?d00001 diff --git a/lang/editor_tutorial/curves.gif b/lang/editor_tutorial/curves.gif new file mode 100644 index 0000000000000000000000000000000000000000..2d9f93a05a102f313283051bbb685dc47a013e44 GIT binary patch literal 1817214 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�|pN<4RqYTi0KwjB&@t<3H=^DEk$5q)E1K9P24~idHAV?jP+JVGfNg8L_M=vC*yUuT`YIncY!2{OqCWF z)L)5cVP00>5OyOy3`DEUrkr-JLv{?u)V(RRReU7j86*@&mQXtE@R9_P0!E^JM%f9I zImLOs9V|zts@eWB5;c;~U(@+|46h(nVOaJ!X7kp%de2SuESJjR*GRaQQ;fpgLO~;| znrMcagMF@e?qqp|;`=IctUZl?8#8R5&A-j?^X-v9Cv^UelB#7@-r4Ukp>zk}?5{pE zdySeO6%;0y7zkGL@zGtQSVhaRDC)mhU}FCFa&Zc@0ce8ayzRIo5fB%%2iXY`{2!)_ z%f;+JaM}MT7rkA$9{4gzF33Z+_`sJP9Bj%G(wWe8DH9`e7Y|7E}UAG@p=@qn29{}jyr(=Yxv!R&wEFBZE%{zt-i z@T33#nlM5ReiZ+gWA?)g@nbXie~*}Lb|C({WA@+qvj0;p`|rWxL#_A#mpzbW4~^{q zty-qeMHOrZc~Hw9?6Us>mq~IlMcZ*jyC9-nxT5V4xc49&T-re-2pk0_VW-svMaais z;7MB4HX{|H3Gk>x#GAj!rGg1mN8)F{C`Oa3L`nxhncqheKJkO$dNZSQsmMh?*QuvX z#bQaka^-B>Q%;6JEflFq<#ZE;MJTjPv#ZozQQKwG2DLisro;0h`wE5YjT;F)GKFg? zY^R&_+$xfja`;X1H4U8kCTG4*LUtST(}*r3lj~{ zT6T$>i*KtQO!|JO=bck~FoeND(Yn{zGB{7+J~>qS;_^#_+M{A(Y8(6N({gVy?GnK& z09!OQwRofKd(TG3B}0fy%4K%oR)jtE^BJy7S|!{IAz5iC-EU}2q$OpVhLT$TGU$#G zRj&I7SNIEvpzLBLmRu4>Vh5L3Esv|>8u_B2)NiunDm>w+n~aqVro|yQoQc3BJ&LGM zC`f>pr119~viieXad%t{@WoLwG7Z0DRNn1+gdTd z?p{)}tGGCjz3#!a^O0faJdj@~z^&0t>oBE_*{eIMLaJz~a^ya*xTvVY=YudlKXB_V zj!U+oIF!wP{EADBX6>n=eYVq0di0_1z3_%*JSWJmW9+)OuzoJmpIdQQ(2)-u8W{kQIaiWwu)tUiDoOat z#9a|$MCD&B|6RM<(ndh^YBpfgn7kszo1tmV)6Kd#@VNwA5+5`Wm6^k`++hH`aZ^1p?rE&7LB|2xpgWA0m(|m zql0&}O4!0@r?nT#ref zO;%GvVGXfbK%COLOh3;(^V#6%J=KmceyEn8s&rSs@dwY7K0A4=mAmhtm|ghh-1FQL zzva-y>(_v*T?gpn(QL7A725~y889~M*x+H1AM4;@TAYf*H^-B^8v_oicB=1|r(p%J zr5=q_?O~>vEu3bOTm)&{j&CBOCheZcdXS-ohA>AT%@j?PRm1g9jg+k4cp>7Zp98QH zb%!4Qgg5+qV+}N3=zoDa=|6@mt&bEYgMVb7?6mig5c4fDvjkYv_2ylPYJygcw+Da2Am7#3) z@Jw%@MBf;b`i)12rO_lO-S@^04AAZIBZdW@zf- zlC#k(Ceb!dP^^P<{O|T+(`^&98es~b-D)|-d+?}#v}W)^agxk#XEx+1I7D(hQi?q* ziBeR_tmR@tM|Vs~qgJRXuoGDn1FMt;In>f1b4m8cX4~*+sA5n|R?)&9&UC=YRRMxS z8DPUri--Np&d7RH9uFKNqVUpDSmdZdEZ#v4TwWxYT^#3yAtPl0*OqyO)6Y%`Grfvtyed1ldDWGlEWmIYB4(Ar|d(!4);b>winYv!O!XrWS5DNv5$q$rH6 zj@QZ(r0%&NNpQcjsdA*9qex{{*1lZGbY~F~-Pz|wbSdrYU9l+FewzZlh&jQQ^oZ!0 z^L;(kGl*p<5J7eHyFySm0wi9O4#rI~)t$PX7Vf(;PW; z*4vxQr_bSPudivV)epGya$@LEpY{ma558a4YOdRVk`AD{5e2%7)Ao0m83Kl zC>4#+eSl%$IHDkje1RD|SN>Q1aB*vP%f2{5I%PbcM{sk=m5r}uAxYQvdNngUuz~5K z)%06&CV5&Ff6(8`O&D12mFv8NYE=r(bmH3{ke@?KgDa+!lLqOnIGQ@8gFl5g3S{wy z9vo1@jVcDHrWP@~|CxCX9y-x`#mB`2eJhaSni*?u$SC@Utdm>%MmTQB>S=-7a_A-O zTJMz^&QvOx;Gb_-d7dvlrPEVQ_r0QDzp(b3fw%XOz68?;!AdI2;P3tP`Z>SlE)%S4 zqiq>{pp#ajt55MV1U(Whnm)h+I((mn0xWHVOJvA~yC;X-)Q$;Gxe zX#y?=+~;CLJ@`4f;h67E=F;9JE(jH2KF&>z65EO?t0 zc30(BU8-vCr*EZb&iC`gtm_N)nJmcFGA(sq4FMk-&A$^yaTK}7;kO;fd=Mugxg;sJi%3&|{W_q$9aLu8;rX7&MLBDw zobP3@BmR(-~u^fh>d@bo0r9wJeTa9uj6Cym`6X6 zRI%^6U9C>2NKdpvDr&-X00+>7<(Fw8mZ#yUAh>97(qFlExG! zpNvWtU1Eh~$O^}Zeu|a+6KTc`V;%{h{nY)$SCMoB+iU<=c*0vAXEuF=J?*R|8E-cE zO|7(&Jp|sP4zQCRvD-EaJvuc|JZw#`S>l;oB5jRC8nnRppdmx|Y-BItl+lXT4ZqYm zXXW$SItk|UJ;iO2LVJaTVgl@Da~N`BCsS7XRzRc zeI{%9GeI~(!rGJWf=o?#gi%Vu*+7+)awk{q7wJE{s3rw^0%4@YSQJA0V)p=dl_X|ihv zgJMu_wwWIM%AC2-e#|8uI&Mrl`fxK%2@`vYI?V3G&f(a1SMoGUVkfoN1+_|O| z8K8fp_ynyXc$TU=TPTPHeWPT8bE*C?v6$6Cer!PT@18}s2K+)+-0k>WT=I7=TD<6>$_8%vKv(oR9lhsI6CiHMbC<~Tp?X4 z9J1RXV8+TNZ({oyV)$S=Pct}%`V9@L_HS9a)VaI~gZ~&91 z?@=>ACsg;i7yMl|KI$VO6HyC-9FW){UD*L;Dt2evcISq7=i}RDz1^6N?&3e)B`iH< ziaiy!Jyqd774`lL?>IGgVXN^5Z3&Fb`uw5hP~J&@|C~}LTqzU|Ead=jA3zmKz_LR) z*b6>FkwDPE!%C7K!oKK_Ed9iFznMX|jDZIhrA9lQ^U{ylb_khdZrKNR=_8;;sW0l- z1E~HXO4HT{KK~iGz{^F&!Asl0AK`;vdZ~Z)4*seiy#6x?V#VHk90cE74~p(uub9|T zjYS3_k=uD8FcZN_K1$29g76vj*-=h7>`w-*F z;o17|K|3(fZDJ%=_D|u}LtijY1hqS2gdQ{up!JJVbHp!R(cj=64FJH-M%kYy{eO~k zr249v0{~$}{F*NiV@B_K7I!_cM>%KbH+LjFyNVfeQkspap8d)?yG=QPGk9}oFmYh; z>|5&GzstYy-!c^C{I~1zQzabDR*f!DNs(j& z*RUqPj;Ym!NssfsuyVsiAZ9-rQ3;krk2=h}{i6TIR%t#= zY5uA3@@LywkIey(vo~I|qdrvQZd5pHrTM_EnqR_$p=@)esVjbzZ@<f?0W9 zH=DGze006+lD29iKkjV8o9gT!s^*xJ@8y#aM-`a-R$DYYA^SyNwt85qe?ZH=*KbW{24dN84tDbwwyRr>D_*I~DQP*$hTGON14JU@AGSu% zeOIAuWBU;+Us%R}Z_QnAjW5s4JW(DOyir=cwqG%5c>Al|v!kA(0^Rbl`= zdQ<`)xqj=)>fl)HCfp2mWUu|!Q|q{0BLR7IX!wSrY3{6d#j3Atn({Dg>;2Kp>^H+w ztLyjQ4BnKGcO9S29X77meyTPUK8kr-y4ZK%*DxEx{{G4K@zG9MfJ13=+FMu3<-+av zG5=~QKcBp8I@WK!EY&)b( z>jUCc+fRGCcvEv~e1-um_!h*CiHE?hcwhBL{5RWUa`uTQbAwm+k0X?i&caU;*jK-N zEUUObNO*VoLU}dW{^DHmIJx+U9C>%O9I(JD0L&v7#57e=qW%{y6RX>G|O2%et|5|7vY8KTfZYAm=|jmVfxXy$GT{ z`NsDXJhw&fH1a@YMTq%V2XPf8qZ6{Os%X^P&t3mR3ApR2{jE?y;CwhE!9S7%BESY( zHvT4jH7wINu5|aAdfKAWgWu}?XF1Q5MS9L2w9_beoaN2UR1E&Pb#<1y0UYgsm=tD@ zjE6r_)KPrS5!|Wnv>*OSHETCGJMqlwaJG*n)N1K~@Pu-Q`FZ&*pIKerxu83<>2rSx zU*gJC&Io4T3o+k-#5oW*pvUxc8FG99n}o6S<5aAPXu^>g0(whsTC9^+3NS9>*Y$Qs z=Q$w@ahF_>GbkM*nQ3iJ%c+%1CUV~`DR@UcSDq%_U^Sr3AVrKXQRxvi=X8QL8#SRI zWC&GjL1N721QN0&G^_P#@5!kHHCgp@ia9xrYtRV_%0)Q=!<$`!cN*%Nfz#9{L`|ZQ zUZ*+~8TWH7Va)3b!pH0|85ve7KDT%Xk&#kE#s`-v6_~^_X=oW4BeRsXV$u3~a`4KO zMqIOM?fA@*Il>w+*YZoGk;Xq>W7s1m738Gu+i}B?kQ#v-x^{L0rjogSnmp{5a{lm1 z_73r2qJ+r&9Ffth`kSwGE=*A14Ey1p%Jk`U zgUTlvQ<|Zlb7oV#Brt~b{y1iJepDk9e(Kq)uB&Qw+E;>D!9k{-3*iPiH+W;aM9_2+ z#eUgzG>jt=py}syngF#n(apc1X$;bnj3QT%(9QP}@+*m6)vKATAs?A(e(RN0&BHCJ zW(uz%Ei9p=6iWD#_+-t>w}sfYi?aq+>gtkLDDXM%+2jC95Ud znn7D+W@p}H4@U0K%V@?*}-vY2O5m1F9zv_Y>&*U15zF*UeG-LJj|jJgb9l^@qU)+LJ&OWV9BmjTR5S76#P!}XVW)@u1jA7*yo=bmkHMdqkJ?DcoT(?x57KNJe$Y0NRt zdw$0fq#YRM^>llkIuP5cB&0wYRbxfLL8#m1RK8+uYUUXut%N!hZHx_3DdXMynICQY zYYcAm{p;6x>(5?K3c|-;|3!v_1{W;<*uncb^=(3Q_nS57ZoSuQ9wS1tehsRCPZ4snN3v+` zI9?%nx0GcWpKDz~#64tPdE5J=9q%P*(FI*K=;A=zTPW`}^)HSw`^pdk z28z4zpA9tPLc$Amxi;oC!*uuKkPb=O6ur@mU9@7te~p<|gt4*|sj6HTkKu%(h$u3* z8>fUIXFwm0N~mUN0Urf`XqIy)ZhfhaeeWI91*J1Kgr(`%$1D!GEZk0$ayOB-S<)t`Q;|~8inM+4 z^1DH@iFC(vG;frS^>`eDFxnk-jX;4;#R=j!4YeZbDboIFsL~OB&XRO)euQa)F4Piv9?wo@LbW_0|P4AMrUdPd+ToP)E5dPOltK76)7!=$$e^dN-5*- zmFLa9HibFL^@Uh{S_K$a_G!}cCe0>y4IuAcSGtd9<}Mk*ZnC~gkg-{h{wbe(5%`lKjto>NGzw6kcfFeM{`c%RE0tBs}#oCzFT)1)IJU^df!$qQjykZ9)3Jg zVYXMfWs}5jl(lU-LuXMZ3>SGhbawCOvdHZRaJko?TFu!!b6Sn!`plFmnl0o+_f&+jmWs0jr5SBin!!$HT(0JeibHD5x{uWriqzGHUnU)Y ze6F{vqa`Rd))LdN<6Dfl&$p0IB{fXYA4uNt?~zlcJ1WsWFOTT+SvEDOj%PrETkppy z(<_nzF!UIqW(m5rx%H>@iDL!N>?25r{toMtyO%qvU$aUsCj~gWvE)97v`M24P24qD zdKONt%4YWSy9F?fQVC+x{JzUt=7|ZJu&9T@r{7r#t{n1Y8Q!zF5xWjqI=kU#vz?Y~(PXhg{k2o4xw zEI}n;Rnr5oWP}REoKXi^(xincH!piB%Y%B{G8;Xo>ssXQ-q{!(Y8f>Mfie%*)edVk z{L=9HJ=$!{dj3Qtq@dJK{f@B$#gAYi3bZPzP9Iq_N(-xrSC1U)Wxa^vCGy`bWH(645c*bImd zp1#j7KTe^woyZA=Xfy6G6{ke~(x;?jV&FSQNiZdB0~5PsxBK659!-FXZO6$$<0Y$Q zpyn~Qk0|+14CE!_pu{vXbcPlh{|kXwhQ`TtbnLPdHsB-f+_F0tZ$M}uE)~dPnZ(!7 zqFr^0r^n*a(bKfQ_DFp{;}yZ8sADF!-ZV$=}A@%51yN;HV98AOF1FQx>= z3%^+{L2X9s^?&K6M(bra!;khL1n|;UC)#gnAX>o;Qy0PJVL_UtRz}^Xd(rxY(JTxm z3NWF{bA>xro9(R;ER7N}uk=`3CO9me8SOr)@+c)7$|Xpwf_k|K`Z5w){v-xbf|R^s z-{VpOOSJZ!0ICU8!44Bm0N>KpSa@4jY#S(=C1H06gk#W#$|a;zGLY(&?d1N9sbr4zvNX*PBm^&G^`->UdjD!Z*kXT73e zS-0$Y2x3!?get$tc@m_A6Ne!Z-s4cuAI)%a6YPn}v+0)!pP;l>)vtsJsJvo9I1t4J zYWsT3GBf36OfozeQ_~ASmuzjjNGVttXi%$zMY4`O<|untcTa85)S#4uOVinu0~?^v z=+b^spDPtZnyQ<)9W{}hLAw>C7lK{@8FvQD^-)YP;mpgZR@3fI8t-awMK#lJ@8|D^ zL?_A3i4_^{HD~cJP;@sFhu}#0YCti@vPwiM^M1Vp;VFpu@$O?(yHC-k7h#Yb$toG> z<{39ZT$d8*1yf7_SnEI=A&^}cLY>HfNEB8@w@px?`Fvtis2|-;ok=^wHFo0&AQx{~ zePbsUQKT1dBqmHl-%UJ=Eqi7c#SjNl?n-ji(5jjNiPYz4KfVdg`psZgx zH08ENhQ-Ot4^Q|R(~W8IBReyGrP7#xRpyC$@P$+$G+KFnjN8Y6 zu`6dr$mZ=OliRh9dej1$oEi+i5sZt8y_}#vp4c_$Q&1xLvuI{1uht$4-mh3p-dUK} z(BipHTY+gOdJ%T5(oc*U9;SMs)L`I7jtx;16NhE<8>{^X4uk(IwD1mvkK zQyc~@s8Cnx_1Bn38~1Pq7*M% zzz16YzAIl>-UC_oZv#NR#xez{hxEIj8Ax}4^_m$q4mvek z4bo@(3tGlIPE@EmwnVP%1WL#a-vpo$}E~O zd%fI_Z9kt8UEN8q`~GGEl;M5e4 z2<=d?nKjae-`z0D_DAFzfA)q^MdNaalWSxACVAlLIvdDhupBl0Oe5)^!APDGYM#2;u5Uy$ub)Rvs|BW$ALkklm` z)UeO}OVOky6e!uvA`mw>sZC?RD9uk)+i9Ax^g?=IJhyh6SV}$>Uo$ZuhO9Y-`pcKZ zhv8|ZGLXklX0#TmA7kGQD(*K$TiGyQ++5*82SBKAP)6D+lv; z-e%2kfsp*D`4f{hUfPQF);j)-px;}J0`Su*zoz5)zoOgkr0ttI6_}89H9hu~V7g~r z8q*FJ_4%T}&tz^h(-vkB**%9Zq`r$mbV^@`^(fB2@`|)}lL}_n)888YKrHh3TgRi3 z&ae2%Et&W8<%>VcpEn*BkEn6Iu!el%P1@q%UJ^vpKYY*>g{I@G2$ef$A0)FCtUr?I z$Z_acykYAI%9)rli<*}f(P44h(tCRcOF8NZEQT&6)w;;)*AWsU4`y)Q_6jB0r zrT04u#vu23sUVdkk|<@nwFnTbtjcXdqYxqfK(WT=fc z==~gNar2iXoLTw>%3CDq`A*XMWWjTtK=D(u(nm0sBQk3NvaMRS=K8R7m!XUdB|0Vo z-ohFNzCJo=zj-(rtx_Q)TuyI+3wK-{C7=E&zh)ZSj3K3d3P$=mh0Sp(XKjHfTVA39 zQ`c|Eq%FvP0@vTo>4%;_B9E-i_k2%w@$_L=){g)hzKn|=DdH+AE$>hI)|78~UtRrb zH4gAng}&oCIXbO$JbhHp@;Hpjx&rxovNkz$&@VtwdTgpujXRNvTjcT>^qxbwN{(9B zitp2xJLLj3+OwL`>)G3v&ws6=6rGEAc*|pIj!GQJVI}*Y-J=-JKE*`4mxYL|y+2Ar@F z(W($PTEUqn-K9X0Y~Z|uQETLf3ui#vHTaQQKgFa9dD z{fswa)FnAluYZ6-Z+BHvV-u>i6OFMC>4)zvm4iaMl0a(JPmAs-Vf!}{6k|zgWmExf z*zL^cWEI#HFV)P)o#gVv-||u7hg9Vm06@dD~^fc7whSqe}umd zzbSeyvq=Nhz@`@=etC_GaLdsWCxQUC202;PVoGue84UeIbTooan4B4dGj;+&A(l=U zV~&vlMmi>>lJ;(Nd@wT{V>a(hMCJ=2V4`%IFT;{C1s8J#&g~2o(f`O{#XCh1vF>wf zer&b?L8bOfPE9yM(6n49$7P8;R3N(6AxpwZ0a_c?YSGT?ub)#35c<3@+ha0DruL;Ya7SdlW-x%*rE zJ0lPBYio}fBHtrS$gc@b5D_VhjNJr|e>`>)bLZ`6G3NtfayBDLgR_lEd1#d^2@VaE z_q~KFhIrX26A(d`C9+>1$6~NrjNkwoRC?IRrz2sh9;eb6da?|bkDqKL71<$n#%shd zRS%f9FhXlfuf(Q=gbdbjD~gzIreoXfmRHz@=g1@kD$Cq_lKnM~UF)`GJw~P33k7S6(RteiDUFpM(G~hH37-1o*QIk)qd_lJx z<)Vo8F$6D~Slpa&E%G+|S=uZ)fgc}2hK@dJKC*5e?#5Z@sK)jfF@xldvQ?w$mmhTq zRy;wi+7sb&0`Fu1n2BgY_D>;EShzxzs!=UW!-r(bea8FV4as+1VIu(TWD+Jzr^tp1l%M5iS;?~?D>=!FQM%QSH5Xs$ z=AH9~HuAi)Sc6^SOt_XLaW?Yk0ClJwD}wUaBHUgJ(jeQ25N~++fSCC@-=qOzeGvv) zJAn!iN~py;_5*U&!1ILS59?8#lixBB?WfMLJ$JjEJ6g+Um$gJsY%d-^{3SiQVaS~g zL~TtLbM1!t$#&Feu}(S-8S!Nb;r8ed6<|V=tgv);D0}irU{Afqwr;O|38#Oq=T0pB z%a*R<^G~69sx|Yrazn3*pKU*mqN~_;c)x)xp|8DR^fFc*V)VnQo@z0h9~&x8s=Ey< zI?FGae7T^fS!!LNDPN?#17cuy_!o#3E^tR#f13so%OQwe1lUPgr$MuBLq!}s?Br4u zglQ5(BI54&)UeaEj28mD-4J8$yW=93Lr-Ch;G;X8Y&75m7Wf;7rh=GLqGa#%qJ;jlO-gu|$g)m?*mvY)gScA>dSNl-=W!YJ=cc| zT{`igY0R}C$kDeHgOO}K+1fBp z0mx&19|DGhQfU?Lg*e1?z_jnlUmq~QcoGO^?w*hvcSk$gjDU%TpYOtV0CF5L+c&o% zIk*ekO9l!2Di}oVi`R}xM{D13qlZofQKr9MdnzfZy;Db-4VIAu_x?A-H?tp91&cDRv$~Iwy;NPA1^G~5e z19CrnY?#f8A#(YXd+sf&<>X%C_14g3A|Ph+omq|Udb@B~D~ATwwYrr_e>XNBYJz@h z`5|hK?AW$;W+^;m%pAba3z_NXFrE`vv_BcDxiyapb>x9B!V)E6(@P!3YJjR5maKGh z2KA{5b5=Hz#?-CTQj;SO?CQW%kgtB>tN_3!#)3+mls$Mv&yy^vdFeFGohgWGPHtD` z@)$)VNRRrG8e=nCbc0p)eN?I>I^j?6rNJv}z(U#ZP?C}9!?Vb`MHNvd7rr{|4;c{b z8#%YDXf29e0VPjx3(B`bp80&v87jwf(m`O2$ao%|1BS~BQ!p50y$snG=gAcW>qywg z!VX-L-2p54(%h`nTYxzfATig=FKR&Ec}O2?AevI}mJ=jM0EsoEc;^C=uK;C7ff@K? z5IEKNpP6TTiYECaMvLg@%-)p(4jDGj=!#x1#5%-@sJk)`7p7{oge9q5mReb6{oISU z0>fS-t~RG{t7^=r&5;>O%(h&8pE7YG3Q;e6avT_O^(uik>d941`X>hO+FSBrzd>oe zj2Aj^4UWu;8+Bd?`K761{Pv~)Rl_ozt3JX_DDxq4IIZ&8J;P5@)xOVzZ0Mk~x~7)A zrp?|)a_Y-l#g$oBPvbWLR)|4N!H(_3>}Q$M4gM<`auAzXOnO5qUx~_Vw4dqVbzGs@ z?pNx2a-m%1xlzkBx5$$#|9;63`m`%+BR$DMeagZ1hgXn=d{Qi0)TmM^ujI!v+=@H< zz9j21*OVmq zMJM5TTZ5!QKsRiq`u=xm=g1cDoj=gSjzjh1^SYAdQ)X@I?zM)wx8_&u!RLdFFZOpKBPC z4o@f9)a*0aKdyo`;+;{E};!_CQOJ1^%895pHRrxGcj5ki6O_gBAj{PiU_ASFEX{z3n#?5R1&Ez6o{eHAig_o^gt(Rb3xw!Qxdi!Fhg=Q5O_W2~ zV(+3^bn~TvXp?Q$v>83$K>xFQCKCmLguP$VF(maKTW~6(=~!M9AbTOVyQIOftV*>K zi{9YCeTQMeb|ca|YINT;>+dIx#V-p<%_v) z6!8Bu&*{Zd_xY7ri%#Z0uA|1LxN_80N7nTY)i|59Ct z_y2@JB;Ia%WfhPo+uIq(n=ynr&H4V8ja-#gB9UhY%ODX%e5=xu73XkD=8~D@Q)WM(=#k@2WHxN? zNV)0dap>@MTVaiCvGL$@ps_?|mZl0slx}w+#N*y@Dk*LJJ9ySR4M&Tw+ve-K{oO>+ zu*#sTR4W~-r3kV-HqWAL2#Ic?!uf^&? zgpcN$jd8!BJBriGg2A(!jL){I z@nOop{ikIRQ%Z>RnV03LCIQ(|G!h3;K}Y}`>38+4-J}=acR&_osXk_w*KZjl#&Vdw z-3vDs#3mPB^P4g7rjyU!SdR%o9aHHz2qSSnipKIHj8lC$ij*LEGPrx3Coed8A`3Tq zygB?jWGG0AxFjjBQ#x@|sqyj>7}jKS(BGdrwU0iMcZrZLuV}C0HuWfmPO_ zYPF=-S@*iRtY{;zj;GtrZF09a(3L38(la{h-m9^7GOjcot?i|y@^jB3J@d?Wg1MKj z4SGyYqoE#jX?M9fEcoeHyxai`B5C<78!^QFMwSs?XSZG74c%NH7}0nKne^`wn?9Sq zC|!4ficD4A{LO}ff_K{geEn)Q2cwMdFBSASY&n}(%SSp_n)+dsG*{0)nZW&AXEkpz ze{j#W6=&yO-1K#usYPlAO=&$%}8pywk;--fRp8k9+Z~7f*Td))!BFk)~>R+56v3FP`|u#>W1a>`g_sr^4F*3-{uo zFFsC+cf9`{_u|DbJ|FsjBzxyzso9WJ7$zKcK9{-;fdz-d#^&a>k=b*|ISdl-a{rU{ z;$iLo2ic34#(3O|XTASX7v+G(W+SsxG5EqM5_8^ueuzA;LK4~ziS|ce0k7OJ1?oX91@ZZgW!cQvj6-)eDAs5f5u7i(D#2cPWnG_uUJn1`OZ)*DHRlf zMsp4()7<9VISN1ku|#*FtU9!NIw`!8#paXEPI`&-Y(3dzndQUDe6ZBxa+5LyG4Gw$ z#l$Zj!_OpjwcG;CPH;IC`W{k(mvA$T1({3HX(s1v9y`r=svJsSrOKqgERA2H&hRz# ztxAysq;{lU&^fH#W>F|Q-py){XEJa9eJcT_6T>Q66&NG_V(JE8+qqliF)tCPL=PMg zL0-vdT;zXtEFqS-Muu57lZ01gZjN_(KFK@Cb5 zhZU@B(?+DPIY0GHi^qthIQ2}8SCT!wvHSP#hw0~jTJ`(L7e5ghVFKE2N^9T$e6RSJ zOLg3Zri$GzC`ZP60DS{W6$quXMsEQ2pw8aG>je)k)k_Ut4#P8&L9 zG&v44BzP^uWG@~lWonzk#*K}jZHMNo%Uo5Wb#QT^dnN);DqOXcg52W?=|cjBh+uH< zcvar*d?ptsksSsNXR0-mY(8mjTLYn49a^XQ3{B@msZ!nC{AY|jZsx?Z);3!5t+MWR z{LyP0A-Zh)rA0Qw@?}USe`tPQyth`Sz2ZQ@;>*aoRgV(U%%4kM1ea~b_6P?bn`eg3 zK8Hb{#K~75f%`-2RCAKAPE-r4ZZxW1B(QOt+miP$Wj1<1JPEv5zN=zjcg6S7_F@Bi z2cQSPT^;Lw{O;VX%5BXS#AIa_zSp@T^6`nK06OyRsW`3#TrCT9c`Xo${8O{H4E_T9^BzA<>Zo@>Z21rE+PwP=QcbgZ9nDg?@tcr)EVmU7Zf`XDuVItCgnUr~dFI+bn11(;1oY#0niSYk=(+?tDq*{@t4g(bwnm9&3cJp%-WM?*NC?HCa{_5+B_@6B+WS5~P|omy17H(RaSW>JUccdg#mK~7I zsQ;zIo#OkbvAcBIZzA(!p4@;nwUSVK1vp%ECuIYEj-iMp_f%g;2KAmo2&h1&!QtqveCj&d1#kC&QoO^YJIQgpRg?>IHuD zt|0p^2nOGG{jeSE?W-Jo9(#h_w(qmM%o1ENPOnsAvk`sj-J@5@kXa}`M8yBo$y|*b zq(r!>FT(iRDb>`qr;499`hH>h-Rz)_Q%JffE5=+;#Vaow^nmkL>Wqa8KNo(J3+OUG zim-18pm1{{kP*ic-M}v@h|tHecM3U>!!g+dpaXXf%mnEq=WU8iW343<8%G8LO=jhc zJ3JK=WCYc$?HaLh_v>~@Q%q6IHU1pWX%nHUAiBdk()h+-K1imrPIWXhJ0vmTYH`w-JXT+Lft$z1 za%jRl$aW?=iB?xY7nBqP5C=q2=#>D}b|qkz8W3S@H;AgagmSn5@J`j?I$&!RqANG_ zfH>(^n~2%G#JIgoCFK%MlMpE2p7jr?mQ!@RtzA}Di`cB;ItX#>0#GSda>O|7}fetYqsoYaa zt(WI7f7R7!80d0ILdlIC3CvY$AMr#SWajl>I*TRP0M2S4unGo2>`_8o92cT9#>~=L zvbfM@5yFG`uKUFeW8`hxzNlPqm}{n?Z@io>bI6T8oVA3 ziRz`q3k8%;^ui^n+ME8^3rAWR?=zxAL*D=ote30uE zvzx8-FapZ$Z**Nfd(sbfU#IMRb;;|i`70W_>#+qU_%%#WaS=tUzWa^y*C3tQg&(`0 zvumkNr#Co2^NPO?E~_ZX^kT?dY?DqO@YJBg|eqh6mEgvbj|GCMi^*MlapjFD|M3S z>7+-~@)zjWw-+oJU4-6&O&*}-;TW>f&ItuW0unt4$h`|LO(~{Mj8Ter)TW$cM@kQ_HJnX$F)BM}x0LG>4+ zB_?&!&?Zzt{d>`z=9hm7rwtM-_B>^XuyMbk^$#;_ zg$t4?y~oPSHnFzJk#AQVG^nNaxo!_eNS2J})N&5K&SEd?tq>m^YK*Q*f=~*)P`vKz z?tjpSM(FV$+DR2D{@9*cp`OtSS!v*tf3T|Ii@u|-c0Nh zM~o66S-^28y}xYzI*VW)FX^T0D;yK+<{*w10Lb0o1WT&XX2C+y9j^(VV*lOn&e znZ()&$Bo}nrVg<{A;5USd+5jKq9fu}(BBgw{bk~UFApR{y=4&MVIl|L!gezwW;!D% z% zcV~5sudqzu0S7XL&#~PSKwFvV$`FT-TWSQ$wZ%qXX~Y(^S`);`zN3{MZwso3mTl9x zE%Qq(h#=NmC;lOq?3Am=y>Ah!6VZvm@;n+b95La3-=o(o9VvfT zrsu10p+{17nn^isNe}q%lZvUCe()+YQ-IORbH*oc1~H9gIpvx>kt$7IUD6KX;JKvZ zC_4Zf{|cziwfW`_)K@7Iqjh(srR)Hu6D#23%F}IQv(M51lUVA(Hw$ZmByjGcHfhKl>43Q2x)#5Y+Mxq zOGj;jqa!)Qen~J5CTKhFa~d(g4Qc5OD1 z^=*7!3gVTcSX?jfVKbk>)--*-gnJU(#JXnt@jPFqjom!dOBfGgX3%2{QKdK6 zdd*}$FY6~j7PDlUXgMnK)Qfp)UYiBq(>viCzQt`IF2);m&p*!i_)AXNWu8h^%+FB+ z+*g-pk1cPP^J+-*J^XIk{Vf3XCKj6wa2W@RoLK!{&M?cIKkj-PHea7-5w9SFD4cT)_@W zs=mjg1aoMmtH$9&k+Eor#f((BcA8=fGdOu!8?S)~Tz7ZTdWx1)I@nmahRcmhh1G(; zRK}>9=b>zi>1H>VP0lR=E?Q!8Z<{bvQP;GToN(kGBT1-KJ)fPbH01ikkFAnR5Xl=| zu1UOJ&iz`BKmih*|ANN3;cxZoST>Oj3}v39rgI>ju#+O#Qfm9ZHF z=f<&K3nvGfVca4zJX}1C{X=P1g!Yo-h$b&y^&E!Z!y&!x0`wMDALGNjDj8efu(zDr zewb$n39U<#W{|$cbYG9IZ^&x=!149N@}q}U7sCq17M?Oy_VHv6RXQ$&GP>M{UaQ}k z0+>sg;X!98z%zh2Tmc-JO#PI(=2Wl769otd5Oa3AWiq>EX;y#5`Y<=s{AP9wn)2Dh zy~-N%Y3O(b)vjhh7t$ToQrni%BO4#c1h9#-M_Woc^0aIrJ!g0ux5-`F^Fk>PTUIBW zwltqmdL*lpwNmjy3FKSv__nT*Yr{M0S8sYaDKc8_C%8_Bsw@A&P#?ksS(vM$@@+Le z*fQ{2odb`Io6hiG1zXMK1Vmp|$6UoG_%t2DYiWG~#dv4{1RyC!`~wL-ogxWEK8p3J zJt|T3*RKvb?Jz!r#|rkyiwHAbv<05SBX!kZC?Pl;I;k~W)FM=DZ_yt zNn&~@Rz?Ih&|GrlL`kIebK+(+rPQd zzx}6wg|@eSM{!`^cHl64;P}PBY45-dl*DwZF4WF5tQYFvO&i9S7yNQ4XFdA%?Fpma z*y<_0a z!7jaS9?igm>E5am;y1pp034WShmaFqEr|sP!l@D8`ijT_Nl@>ae*a>9zv}hKmg1;r z#HgCxs9r=rqHlD=chn%Y-*Bei*stHhu3t-O?B1tQUDh$O=`jt1vE}JH(+s+uE|XV! zb-Fxt&Py@fp<#&eNK^fGdRc?2lAdt@fHgN4E`b3jV4PNptHfp-Bt_p`82hmA`Uy3C zNpF@9wGjyTPzOBMroO4#sWIlKp+B;@6)+*CTYc0Vr_fL<88KjWJ@!6)%9u3Hp>Irw zb^IWF>eZ*ImeeUzziE5B>9*7rV_a+WE(PVzocZtr$;9R| zXG#RkA7(Q{2?Nw=^=LhDqbx znp5iLwjrHF^~65SZia`C=;2M!mBMERxP8iwQl+Unc>+;*P($k29-Nw(1w_+d6WBYo zqS$xF()x4a4ptAovS;Iw6wnc*J`H-tcP5b_Vhy{bbcT#Miv2i;~ z1|b<$7Ky}{ZZ7np!!%UE$`OeubsxwjDz>jH*6dFcBM$s%eS*mt_`wMBK?6PNbIcd| zn+=qJ6ZtKye#uhr6Td#T&52(~@TKOXBRJrVm;~$}5!eE;Z=UMO5M=rVGN6g2zW33U zP=+NhGS0qQQk)?ZTH^8VmzkY1QMS?9TCeY4sEd62!*0I8a3eryqv~v3J7R-{ZE5At zdY{q^t3CJ!z0P| z7Hpk2=JqqyNC!7Y#&ePK$xzPfU$(p%DScAJDj|ime2(P8)Cb8c?%0Xnb^xcC>x- zZ86}h6E!Eo5e5OJ`2}t_10+TSJ^|DeNU&4=Tw8eGo|vy>gW?xyfa_DocIptLn2iX2 zMV?R#V++gvQimbmhSXsfUu=ihxslg5`S+%rPQ6QE9ug5F;1Zir^Y5o=+!D9n))rpc zGk!JHKYijqwz;*~HoJe=xTRAx*0!}EyLE8nKP{uOXp=UjHn6Cwd?@PowzFu#^8TXp zzp+lLPE-3=KH_@DuzXdoY+68#VVL3P&QUt45l=?Sr?H1D*jTN2H$9K0rRg|k+}@4e z_(+fBgewA&g6xt!rM`tAIJ|fS%>#rt!7RA9>FXV-4ZT4M8uUt&luE>Hxf9bb_E?+u znBicEG1#94U_v;)O)2bgsy+h69idjpSVpC!2|^UWSaVh`{QhWKg9eBGmk-5mh+*!NH_S8z`JNdcSo<{SV?A3#_)3&UmhYs5(Do1aXN6ltm zeL(gf&dqP!A5)!~^7oylo&Eg5=OSoedn28PD2PT=HH2=E$HYCR=0i~pA7uD9q-?z8 z{Ci}z9V;?9Ezfl3Z8!sAL??ZOp09dT;^jp)X)To)W zo4zwn*~uq*_)`OH+~xSOaU*LJKbU#Xb#UFW>C|_iU)JxuZT6$#+-vlc3+1$aPQD;D z(F->G806Ym_241#7(S+0i8uo(RCoZjFcA7B+e^i`_jm*x_e<{FYeth{@?^k#k9 zvL^gyucZ?+`+gH#jO#Vw`(P~R{a=UMw>i&IR8KWO?gFp$ug<=<(wz_p+Z<9{Pkx)A zNoBsq`F4)$NJQ^Dpd2xPA~JA@vSWSLv=f-s57-8dN|I8xk+^ih?23UjZeb+5*j35| zK+sa$FA#fX{N6Su)G7tbV38wbFQ?{`?PHe95~K1q5L#uGCX^IhuhncknuICBxes^^ zEC9i^xON@X-eSFLjpyjEsNh#Xwh?g|uK^QQf1xp#iKcQ;LN|10zBCKLk(@K-4ptKD zsGUnWmcuI58aDeRDl(lR%tWGxFIH@Tln<-eDA7En1s;G{GX&A|s!zBfQkCc&x zS04eiuvgMoau zaB4VXUbZpS)>5IFC&Y)GcSxL}xXN)T6Qeki_V1;JM-R8D`N4m6UcxfaGp;= zNwAKaaACTv`-ZGS+P+#-23~O(+Z|)H-gHuKa}0MpLM6;Z^sn}4J z+t!Pa)fR|B+o=lS`X66~^X}fgO&`$0#6b>dMlNf zhiq9T0F7>NHfXgPkR=wD319GM=$s=ko)61pKagj*wM$}5um@S^5kU#_Zq2DoLqMGd ze`q&u+DD@zlN_vS)$C-3bIfI>Nm_^B-;DN(=;Y+L^yw~kdLPI%^p?P_R|!Wf7yHy@ zWXZ&Lr_P!=9Z%k?R*~|u5ZL5o&WG0=MYyGu05%=sxUqoq27PHy#FTWN$k+ndP;gb{ zA6lovE!Yeh%%jvkal%pqOn%BZd$5@CVdOl?!qJZA3=S9;riPlvic=eWj_dKp1L8D* zuqE?62qH#~6D&uuF$xTge4a;;Hz%+pbpzkm$6`+;%9}YI&Z@wSky3Ml&2lNZpt4Qr zL81G#pB~MZVUMroZ{9PHrFYerul5-@k+e@4Awb$Bt*rzx-c`AId%6jyPG zBs&dKc52iy>kjVV;i!)mhK%b$XzM+CV-hWx#5exr_Gg=WmZ=SqSgGcKqlEG|KD0NVEE@BbKlV zf!JJEAJFKoMDp0bF}dKNP%2~W%gxWFG@4x&$1dgG=fD+;7bvsgchsL4gf=`gUe7vN zx-vdxz2X@w7q^$`t!(Fjb$5lzxJF8X2AvW*+x#vevdBa>M_X=5?x{Q9^-po~a?;bI zo>41J86ZPxu9Kn z8m{ZIG_A#5fBV-Lj&an&Cd5EcdzR_j6Hg2VfI$l zpGE91vN?`#h=GI4Q9|ofXvAK(qMw!i zPq~orQ%f*-(dmq`45ISBO8&AlE1Sekqwpq-Qv4^6K<2Ytmj8gQjcMku+) zgn1S+x;@{|v`N;hotqyh#mlgMt|2!bCRbFkb_=ZnXKGFe+k+>jh;2UY95dK;Argv8Yt{Yrvz&l6+M{1VoRuvZ*rNK@;9 zOr~_kinop71%`bf_u)ikKq`Mz_vdxq`-Atm5Bl(31Xe7GBu;_Nrk4uR1BXGCa)7D~ zOTrp}lR`ktvO=IkFr~BM(cLRSL`rn`?-~N5w~YD(fnUkcDkURFkm1WZK{-0*oL(~G zcafK225sj;j2MeLsoFp;RX-^G_%+&eeMoyKk8J{g*E&t-Zo9B|q|q7Jqbx{-cgekx zIm-bBN}d6KDk7a5AuB^!5Ncr9jwq32Bs~D`M4=tfB;`Wj{yKmPkaTD!OT!s#5&%zR zh_I%SV!?R+We!B-D8H9X5`_R)DtufmAUgjv6e14ZDYzTM8lyxY#=!1iU;%QbQLYsV za#j8EW0!Tt0u-t)`;B$FAw$Tfx~*f=me59(UiKyuM2U%Yp!@xOfW{dHR;6B63bFb= zAUxV&{V0hB=Cpc^q=ARgI^&=1cxgwY#js@b3KG^txB|%x)=8gJonXU~hNC6bqn};fU+Lj^117wGGXyCl{t!0XE~Ii}PZ`)KLn+GuHW>y}6$Wx~{_q;%&Kx29_xNE@ zrmgod1RHN$MP8xq432G$=r6n zGY*!}tFy{B3^_60r+|w;Yv?WzW_X?yk97SI1{QwKEz&kg&rMd*O0G&Ed_+AV$w*$4 zpG2=1w%#&8NIu7(NZ4qP;t8jOh-E+o9UYz^=vrlRoEVp9&+N}m!LSAdI4S$U`dT3% zhBEYpSc!Mx%=NO_?X6&A6146GhQIUn`QtLfcZ_rJ2DH~GC{7D%pR7B zmzl7(xQ7=@rY1Z^{~Adi5QrudN?L1m(RPO)1n#aA#%IfOwF@8oRRf-{{8w zlnH~zmgF#kG5xZEjKqY{;J+1sT=>SS+tJ74fGYuxq!_-o`p_#-cazgZ?mEq)! zFbNXP$+5=KVPOnXpF}Gs-YEi(u5qLW5&AxOKD!+~%_<#*{~t9i}VUsT%F3jt*#g|sL1wJmE{0s)LL~eLvfT>!GPzXLVF{#WK|zzKvSNr zpKbAFLgH9Vap&|!@Txom%-npnDenglQT<~XULCzpF#P8k+uvL6=^JJ6&5W%yYlt93 zBN3ojNgOSG`MnuX|GcYgouERXTh76pffF`NlU3H4?TD>>o!TG!@G*}$4wmMCG+t5uD~r1&l5h#B8h zW`E0o{zI_q{yaT)@^dperEta^#yM5`KDVjt_-Fqok+ZzkeAY1rk%dLVOl~&X<5h2` zn*7KGvaH2Lr$m*LvRikzZO*v4jvWVs_$ZG}F^wd5w*J@@F#bV!u-2GJ#{;X`1 zf-!M>PM0{d7qVWG)jXK zVdvK3)FysDC$oy3rEadTvRSfXjWn*<#thhmb8h{VVh#DVV6Om7j|bRyWyA;4COI;l zc~6rstv)R2znr@1*K5uYPBNr!BI8cdc#EojMN~z^_Kh*5-R;_e^zG=$*UgZ7XUKKa zpHo|c5E3r?LtjXNe^lBu2N8wTR!uSz-axwp{`3Sd*{m(3D zDgmB{Wlf^=2eKmBDXtslx!ETpBQO@&kH@1B*f{JILr~a>sg2)p2+qFFXcf(q)GITUsb71Rg@a+nNzah$A6rgPz~1ExG3m>~TbiFa zCr7)!E09utiIhM^b91<+YN=IMq;mJ`4ZAbL29*%8`HiAmZ!8pAXtsZA_#dI}m3^rB z3r&?t`{dxq^()ihBU0czYdPm|-nWlnk}O}+a8nYhHeKobVo&i*Pygr#Xq=MZKf0@m z{T}t^(gEzPhW15~Q_qZa=Q-|{)adj@PanN`zI>Oh^?a@-Cl}l6>++0Q2#NNv@QT#x zKsAtD%170*9VF@8L1ww2*rjH00)@3mtQp0t?pc?G2aF7P-e>>S&}+fES$nGR49{hG zlWHfIn!9%O%5H>ZZ%v69iBa(wW0W#VqPhT611?f8ebDN-TEFvMedS0@;_&``^U^N* z5-`t4WmEWckS41Ya(=AS;4$hSUteL&$J=<3Ac-qC-#kVp)~VqT3XsT&6c)_mPIJvp z5UCFs_O%8|Si72od-c`M3@%{dml0^!avpy#`lx(N_Fi01%G4fkGMxwk;AdG^U@7D; zrGDP`f98{{V|BzBD9_mnDpXS{G56j^Uso}cO*g+kDlS$wRKL0LP2K=p&p`Dk|1R-` zGZEk1uACRtNpVsJ3sBB9nQOKbx-b^%jfECuBt7c!(Hp(k*L37zyM3C9Wr+^RDT(VX zX&~JgTTdMlW*gYQ5r9Eumr3`;N#82CLO8_Ld0lBnB~Ql&qw?Ng_(TWXgmXRyRqGwV$+Ec>Z=bJaSDbPos=- zvlLwF%5%08um9dTcs(JIcolt&-4xbuF4it6GS^8aBOXU}!%XT1-dfM&g{qb;Vq4y$ za%ib(TOJSxiJ7;pF`6!K&w18$nVetjjeZ&1hRx>f>~kqsDHXHWzE5Ob(+Pd0|4%uU zJC1d+PD*k^DOJvbDWZ6noF9kfEDdSNTJ{lYf>Z0vOLC`eKb{Wbm#a@mpLldKtr-M3 zd2F9|eM#>Fq_yN#)$z63EMetx-#7E;gt3{*R3hWeG zoL+{cI#{o2kU9Wk`q8XrMBFL_Y=g+y2~{KJ0$sDvLUW0o=`sN%7TWA>3}Ca;*2^fw z4I4|JVee1+y`uWiv7Cvm%t&eA8{t)p zfA3#`H|n7bt-gn2SMFXmQ?LMvvN z0%iBf~i8}Yhv<2$h_TU`GzK-{63&I;zw~y-`G-F ztR1Aof%StG<+b+qGwf?^?!p#MCb{BBLqK*S)!vq!wN}voIIEQ?MAO^y23Q&v8^X~< zVM>6szY-C=O#%#-3KaTq=5P>WXY^0)tefmz(f&;|o9zBguWm)ACZLY2iIZsnyW?^= z`PeX(4LOY zV*UMwu6E}oOT9yfN*l#{$`8tqijA9y+h=M8S=fxQ#6$KxyVr~os3sXE|Ez~e#r|3b z=b46Lzs%z>!ZO$)?Duawr0l&!Veq#c#-P4} zwwIADP19?SLGi)QC}RT}EiSbdAYB&!d~y|7!8+O$H=(TnW!De%V!YB*3@52DG_aa; zd@lkpTV+e@AaNt$sZ_GJp@hK=XN#k|)+P*Z^A~i3yZYUqli2 z!3(JZxfGjJ$1@k7KLYfpWVDM(*N@#c(|8(FDj;!VG&ty!TgRMrT`ga!@?T7v!@}Du z^~>_!-H#mb4iX;%RO{75Ei?Pp`FYqT_^Y}l8PuR}7_*Mi#{Ke&M?wP2=TQtg9&0Jm zL_%)13BghzAIxg84i?uhWHk<7VFTi|d)D-@6PElgG z{gSu^$n?x0yIa$9d!2d7O{gccUYt!+o@HpJtn=Vk@$+oPDCzH#lY(+e1+c6QP}wAk zHLe0`z5ZAs#g*Ol=({j*?a{UUq7NYowQ}dV$DLk#+eG^r&843oS6?zDn8wGli`bM0oJesX&K=-QeY(x8uG-C`3KzaceIt9H5aNP9Yy^<3S8%N_);Pl@f`9Du$S~Es-&)UxI(`HiPk-m=+ff_k zc|4NZ_dx`ucXOrZZvBl%&AVpUqS5>7&yxDi_w(NweEBZ7wzINzeLUt%^!v1)+6!fW zrXGriWqvsQW2Pcr`2KcalT9Kcmj&;W7inGO2`M4Q7=68q4q<`-A>wXOILPj6*tQ!R zc`Xl08KnG{c<{||&j6~F>@d=@zejj zkr=!ad0T?LWUCmgX=zW2YnPgfL{m0CtPFrP3DoJp`t*PfZv zU-@W!`kLc8S;r_RH$p1doI@lh!DJ)x34L3a6FPELPP7>cplm89jSggDunXq95S zZZV?#spaQLFf!!9V(@FDfJ;Aa`%l6W)ea_ah6so5eXojw#Q^tznJ`rHP5pB-CZzTSV@oFD;S^urxn90|uC(sK7+>U%6!C_Fi^=0{MgEM%5Zf8S=g^OX5Hc-i+}qV=?hueht{2dU~axvd30x^K#tp>5EE zOQ+A5d-s=~m&i&gBXcE}SK@w9dn)ZuzKGd#8@c{q-^EQQX)$ZAez)=N-6)vrjYZnH z=EAk77dTO2sh(v=o|f9pJxC&8Kh7fEd@#ygLjyA;zlD zz{2ji_5V8QlO-I~7yy8`ZvRk!@FcqF>F*E2Nk1AVnUR7MF@5*O@_|`u8{x>9yAf7j z(Zm#Zh4r=GpSO>$*ZJEfs@vZYf}q*6`V`dY2OY+Uo^1^Tq(C#_DWam>I#fG`gDny*ug5ImEX~$d}tJR}at{ z)k$lzV-E_g#!E$d<}x;-a;wzD{wcERUn|XfE3&GdZ5xR4QGSprH<===EanDz{Qs-)Jkzr`>wyzY9^ENW*su8JLr`)e_ zvPom!1*_j?eIl(Uc|ZL2-(aZlfXGp72E4i2FXkscw*){K(LS~Z!Yj?D%yOpvvorss ztiF%&nj*U008HOu;uF%Al*jp*&}Xyt zX_{1QB7~Cki)VNyX}wfwy((!#tF-wfY5Tp>_OB$CnTq9*~T?-UGq&5z~e zHPt6z(}p9!T*cp=Kfv9S7Ii}P{zVP{>VJ^pAE6N7ClnC8D57+ z5;h!Pbtvtatq4^~-aRpuMVnPG2V7%krBVnm2juz*x<`CVJsIP%|st(znZLw z$&}i!ynJ&;8b2Z45?y-z@3xE$>~@aNYTt+0Rp~2Ved-RXIw+X`hH=UO000Gfz%xKI zK=uDS#z|MR(pk-hhKALpe=$zlA#HV)Mu$1+80XB=4BgJ!-``HhIRACD_BYV!O(+^l zH?q=^&j0RcMbjOvWO}0(x#2&PoOFzn4s+5;PP+ZIgj(Xeiun(ulg@MgH<+^o3O}U& zt7#pj!tsaj!&rF9D10;)jvxIGN9+HY`JCVd8F)LL0;OY|Gov$fl9P^cy7lA#CxCO5j&UCT z&j9EDN^jE1PaPVD4sg;j&i`OI|HIMxzXv$~Gs8*i?;rhF@%rCQt^aQ%CmrMLU;WpU zOUF3>pBc`>ej1(Oq?4TgtD_YRMWBKnF@sn+CC#%22NK!%bgZhI)(I&v0U={>b~!4ZPl8|O zB&&QZo>#)t7@JcuLKcNZeC@&pn5HsY*7kL&tPgYYkL7jqKYXUeCL)&^s=fApn96X% z`nv#%c=kvMh7~c7A`lXA-NC%od235qe9hv5MYA=piI<`@M0BxxZ^;qxnb2L0s}4!t zFIT8SyE4U4k`YCBC6D$tTJ*L!fxT!wF2`o0=9UZmn3kBQ`|GRKQN)|c`?BBD4)EWC z#}$~I&i^@z((6RjJkhXl>M+Y{w!0>nY;*7PMxcU~<3xeHAA|n3MnG!bUR*!qG$>%j zQ5OVkb`Ci$`!pXqLE4z(UU=)!dZ~7I?t0sd+MTbxD=dX$m@xMw=-4P-m?v7vC<>~Z z^dB(lifW@6%yG1#Y&cXL28dAoHfZ#XcD31f7=NTlT+Xf(Hfc^|CqJ1%!NogBzFhF4 zk%ClVJ}?%Jy2qiU2aDqx{|Pk%bCcB8Zwq@?i5jkjS1;aSvI=wyvpTLUw*aM|a2tUR z5`_(C!#BP2mrW!Imq4ye0co%EA`$nkZr|9r!0F0QGT(BkKVh&-0TD;YhZ=Pn(jkyH_ z_d9uPwy1ew9c(v*;Db!~384ZOqXWLOn>Z+IW6u~{{N1cjLY>e^A{GSZcLxmfF8p-3 zIrKp!-APe030#J-b=W&`)+Y=#ETX*{u$?$K(8dSkqp*ofX)S z_VdSxoKp3{P(VZPEByMzIZLs@YDa5W5x>h@pKT_0bQRT+Mkw$CsQ!ErP@_b7hKc`HKLT^^ zZtVNjg~XK2;s?Pi_X8!UHdkylW7;J>5XZbXESmS=sI_iR&qGGU**ooJUlpSH+<(Cd zhEx2MfdN!|MOe(H!Vd(=>xPGYnA%*tQlAHE68q z#_%KL>pBhCBEp<*5;QCZ{eD_r>PT#aMmr zIlGAS&znC|g?TUB6wguM{+MOi{W2HK#G+oaE|>Tt*6=S<=WefZm}sL?6*`o+xOu^Y!f`LwNMF2f21z3h`8))p&r32kQ#2$mQ|3 z0Bh;77k4>Pp~4)DvG3>es}$Nh6EF+qk|~@Fvw6)KqmR=L``iG$0(EuKRDAKV0|>Sj zM;;X8{>S_^(|Iq2yPvHB{(*6%p(EQ~82a6M^G4K+eWwLIzjtOgmGF5coSEHgjom)b zkZp{>dBYXux0AKUDet3u;y=n>VLY|hA{pk5aoteYkbD8F+GLp z(VBK(*SZd|y8`T$(QW4p%&YSp9q@Txyxc73-P$i}p;_a=i z=sml$0&j}$JeKaZIBOMbrgZ<=QmBA2`6O&Z;nip3X1ch1w_HW&VqXL&Aq0psZ-%rJEea24AOv41w<*otdAt8o4DG%9&!2~Apxz}J9F=n9B zc*?tX#1UeF)8XIxvNeA_3f7B(M+xaO3L|isQEY|4D0UTWAHL0N`P0_Dq-P{PhPb5E z_>TzK-M|VVjx}|Unh(qkxuf9F?1aNpm2$=wAy>h+wW-6g0VbWWm8|C&hVJ|Urm0zC zhs`L_a9k_|Uof%~YSo1r#$<(Nk$hIH>pnGC&cC&@A>i3$&xKjRB z+*UPcG0sx^J7XP5o&l7cDX^Y8S7e*jb8=(*z!Hn0*RPOVxGlB) z3g6yOw|9|(cBp>LI@a~>6^8{>+1%JhJ_Rs=01U!1-xkh>H5eE*9BFQ2=&O$dEJ>oo zO5ra%e;0TfGambF+N^tQMLjsxs~5fHduI)V;Q%lyp-zfw{m`L7$ZMR&(4S^(CHnjP zVy=EXLAo-fZ9~9i<{PP!DqapwUyneajpcQvBVTVvv>jhVJ2P)NDjxeV00F#8Vn99d z$W&h2u{QaLMW7z&;>Yii{9c?H2crD+h@_$hbczTRQ@{i?N8(U09A`7@Gm%b$M>vpKwIVau(CCTwSN$|S`yWD1E z&Df(lR7r(BT1;9zbq@Fu=rKC%)9>OmW~8S7h3mDXkUFo9{}&kR2-h}<5Q|QIy=2qv zVBkeQ|8rO&6yfLEY-lnjq>5CPG*m@aXdl}_U(D-hsrfPi_(I@*JgqwAs(0Ck#Q9m| zO6{Q=GMu0ZhiZYXUZCi7q)Cl;&K6(*X+T3JHUO+=mkYGdx8mTR)JedK}FkC0q35GmMQ7q0pjf zayrJXuP%XRMJ~}Ebyr!kkRF61l6mk-YUMSMhskk{$^d(%5;rBK*0V9@rb|Y(_k+3F ze~Pf0XLjLg2yoMh4Oq4xck71pzN#Uz;$o%+kFca6L*%7~ib}X+J)DK&`C3V!833f{ z_6^&7;;jOMMUrSy_%9hE+$Pr;uD^lsFbg57M|>?o(oF&hZ*(L!TEqw2Ll0E>bb|qJ zM@`0dv%mA$PHbFY#%2qdBiTfl2DeU68$PIu*jh|*)$5I}Mz)LC@)FOofSosx=ZR-Q|&FYkFxcM(5&T+IAzJ(>&hF~li zH5wNJ?=hI}k@U)XD%qPc1YZ7tY2$$PhZW62CUrt4x!k?P>bvVAoJQ6iF=tzqjaijD zQ)qW@$X~(qKm+R97`-n?bIVhw&UiO>I)Q{}&&?dace_?!2i+71)y(#1B0&oUxzt5vQV@#^mIuFA0i8f z18_P}Fc=^!3&!K|OG``ic<0BDAG9SJJ<>^Nz$DP%7_>4yYoQ&k>c|2xa9LkBH#gtd zb}AZ2OHXKk;%NN|GFPzqoYxl*q_ru$L;qCpau^0@^4W~nc>x95{XzesO4oZVV zL+C|PG-?7ZHldvgO+Q>kKml;5asoN_a5a{?8oNrL$}K$spAL^z#?cOO>GU_!Cnx_K z(xlUH?PT1)2@RPZ(%{nD;py!-UmDz(hVyNQ`?k~i(Kt7#j*e_e3Az7p6`r2nADaO8 z^@XSVj*gD5mY{JsG`&u22@jQ3mW5Mwpl(n&7(iWZz$N%L;Gnn}9bAGAd`4%6UIPX% zNq`?Fz)Ro>^z%?$0u(+2ouRja!SM<3(F8cY9S$Czw*g9(g&xvt zv*73kIGPHkzn=a;r^C@p^y`)dV{~x+{SD+;dV1DAgE^d`(q=Fv37EqK`becE#P-i% zMrUH_C-DiG(FFQPKc0zAn29~aKo2o!92ER-=@*6`ia=*D^oRxB9*e;p>fm(nI4XT? zhac*|b?A5J@DN@?{jW(G+)W2gh2jpOI4V6lqkpi`LpYxLU*j_z6p#D2Q7V0mrH#@WW)5Q$=nrZ?SVwu3+MZBC#^W)x(S}(1 zMa9z7tiy!E2D~gZ77mTY)9)v}nG11xh@pQaL+FVZ{i&Od4jLRAD;pcD981rCd@*?X z=mtJr!iC@vXk|cxuWUkyazcn~2u>D!3Sa@#tINFxi6Aa+w&1N3+0?TtKQkFZ(LRF|6sF+SZ>=z#)VAApxft*SfD z4MwZH%ioeIkcn#&=K_7V?AVX%kBdhp{nHV=lE(gF_oZ}9%chT~%B=yfLCfaJ1Ibo- zlO%*9^#EW)a1fpoNCZhx+GUH-xo} z%D)M?taox{*Y9z>={fC_uy+$_il<_wzcfA&6^N;tQS47Mg0fBrYVvf=0mc0^$zcW!h7-X~t5|6{T z$jR;;ZG=QITo*L{)`hMd^lb}pMKX_w!$9hw_L?t1U#BTk?;i&*LuOAeqDcV11Hdoq zh!NmNw)F&Z<=JCo@7>$~y|cjwjD%NaUBvAUFmdY1ZWV+KZ4mB>eYWqEKV7{5?bT+@8o1hA*Ty*B;a1eZSk1s)- z#1yQBxJQ@SZ}@^_%_}nHU!O+jB(W+}UZMGr4g}IoYrlPyWIo=d$1o1vkOpz)AAAgx zI{peC&_wF}M*EM!*v6rVp4p~&$3jZ{PJ1FCXl}*7&VD9I#-|a{(aYVt@nrjI1IM1k z787voA(!^P;9fk_S%)STFlUx8`v6}_Orq$?N#JFcUs|`2Spr8fOxo9uQx1!`cPu#> zu4zDQM^85Aq#p3v-Wv1^x~f<7ATX}`^91rSo>&UpL=YK{)2);r1YrgS#y1(m5@(Gs zKl`E+V;uVRgZXrp@0a(AhPm zb@k$biq}U>;%>2LPl&*2LPJBY;XXD|C2w!GsjDK*c|`yw>R7YV5fW{5zihk9EzsKY zJoP-^k}Rzr$CpoI*}ARZ`ZU-w+Vpp%7;(RGpFtNSV$AwNM|ATOQ4pw*W5^_?mSy(I zM{qZh@%ONLgTFt!4@>$!!Hiyh)T1PS{roJ%HYox;U4F`~!xs zV$5o&!n1<1Pd@HX%$j%i{Y z$m~98Hkl>}^v!Rtk;<_=x+wTVva4D(gI#p77hoXi)ppombv7n?u(*~*S$StY7S;Qj zDgTF5x%R+KV3+H#9C8pKc}>Kt*zMau8`7;Y=d6B9@mZ0k$%n*e-t23hXXj^ujno>3 zM2Ess1;-jm94uXFvb;t}d_>k1mIfB`6&&2@OguA}oIPB@J-XX?rpV5O=NHznINB&V zniF-bMzY_TJIzO8=41y~Af)4zM&ePc*kBxqpKTB7u>MlvU|}Kss+P&!Cw>t>*|DaY z>abfaFlI3hS$LzDB1hqZh^UwugX9{~$IDCT8ww!tyEz#<%f)tfIZm*nqgrqF5Tc)W zN#U+TKWXrV_xd!0zCssgwAG93Hw=%4L$_ZZ4?e7Q=8MlOgjD+N4P$1eJx2a+6ZKrM z=K5Dwo=X<7FjpSLUXr2MezUvqE|JgAif35gQ;Zq#OQ!mAOK!*S)}i!AOeLV83N5Z2 zY=sv&F(@X`l6k;Z@FNZHcjmHb%m`;zq;jHZLOxn@8hhqflOpabf`FCJn#z2cTov^O z#c7OPKAo?1{he?w#QWl#*ESl6ybsxi&rh_KxE&CU9_7JIIkQV2ve>HuK@j6weO8xs z5pcEHr{h@`E~o@UnpZ+J9C+`Bl^E#sCh&8GY!VJ2OXk^s{d_IEuXGOgWOBdmq-Pt+ z#`z*kKXD}w-OZwQ8^LkNM=gECF9W&mb#`_k`8)6Ay{H8NQ5m*Nm)dm(6+;DYULR5d zjvj$d`M5=IXP5y-yju8jeMaB@LnYt3Iaz}+Hs;E!qN%XK?#%N8tEbL|J`Zp|%gl>- z@C|%Lggms_v13%{p9fcVBz&keaoTAv*MLU2>FD3 z$m#PlbI#kUiK_uQ{s=W0$B)?f>ob{tB@8&Y;UnSQ4lPS)ZL88`x>3=bZ@OdO1y zq{Ls}B*OZkbmw7HkTSg~aAQDC;^cGYv*>b==fto;j{`)RqQ!-t@+;sLq*j1FS{UrT z5{H>gNA0Y$aT8dypP-t527J5D;r01r?M|A>>5kf5X1K`*_k>a5>8tm9Y2*%7#i{2 z0|E7n<>Nk}`89Xs@1&N?AGd-PEABgY|8#cY+J6fRek{E)ecOv19K+WyhW75xQ0*!;Ykc_=3N z)dix`+xZOm5&!c2m!^}?FkmFe*p>OTkcst%@#$3# zx?IuYK#2$@YZ(>9S#VUb&6gC$OFwujpf4?j3!07spUdX_Ty1$T<{)KY&#}jLTBYH? z1LLlYkcBxGdk5A`CqW!W)$g)hj>N~wOjNjAyh|G5elR~e3<*zARG~6Zn^-phK{?Dg z@^`?)B(6gW*KG<5a?9RyUXp_X3`_Pa?ly$r?K(^qK#Kg37>iWwlASD&}kqQBZc0Pd;&s}%v|CNx!=4pd@CJ5la9zgHYz#A>7>X+@D5_} zUy`yXA}D$2vJG*E<`gmXt@v-E(F{@gIKW>DgCq*1)dZdd1hcqA%~K&tC}t@tFlE3@ zb`c=ot~W-3rzvrWP>6z*G*0Z*UY^h+uXG(A$@ed%{6>R3@xa@oLE#1J>5;&oBPM+` zeP@|sFPx0pX&@ErE*CZr?ODlg%|bRA4+o0w0pk2Zm=y zf8lYOBZyW)N6OmK;3AXS zR;y}(q}iUm+PgsIz-6R2T=h>>77nlL{Nc(=Ujx34kgpq8j%I;*YAPaFDab>8b}uP! zZh%Nw;kt&(pEyfyMm5^Tm2=VFd^~{TwE_)uizHkQk`>mX&h2cMgZZ2zGG|2n3H^oO zuX@d|6#&a13i|n8F30g{b-HvXLs!X~Ugd&-c|nL7w3+peL~^cZLBNQaJL};6sKJs& z@sdl9%3fIZYID$t5~r^wXIc~MB?<%M1o*ItbM|!9bTb9wHw*j|CI#bF75;)GiGzf^ zfF*HX(qBN; zFA)@(Lg-0>H6~rdjPOV`*C?R(Vo3`&p%~UY5i>Ed^b|QKP=w{0Su_>SX>%XsPAHU| zv%;I%M>cGMi6KEOb^$pWl}?R#7ptP9IFcVq*J!*)h#(SiprWILmVA*#AhA+58uD-w z)gKZPll{?K{vjfh!C=$b2#c@?f;0{vFb?Ce2|Dlvm-Y?^DGyg*1&vVv10qidAOQ_3 zF(}h(X_A2-pa|gL1>s;)8qg*iV?S4tmrkXhQxc)*|Hw;LWhmc+DCbx|m2_6;C_sZk zC$wgu(P$`znLc(hJwn(om`bVc8JP)WCF5hDBZDUE&;XyuOJufw=>mylMr2>adu(A@ zB>9Q|5ji!YPg$Bc!WubBN*CY(nh(M(yxA;$GcWBjEtwK%(#nagLM|)RhC?(ie?fe8 zBXf-AE7M|sar3O^;&XyyE6K911;AQ#Xs!)MLay^BV1NZ+dX<^M85Tec-I)jeU@vZ3 z8XWPF>46qbgD*LlZ&VWi5g?xy;0GGG2!5a>e$bWoVkb0sNVcOt_YzC}5=lSuJ@Unw z6a%Ux+idd{OOQ$>8qx~=>slEEpjYh zVYWR)7DWoAq$5!ugbGd5Sc|QH+D@} zOczyDP+in-EYfg4!6H1=t_EUT%vCx4;99A2zr%_WjaEc2G>L}gi5X>ll4YViGyvs? zO$Q- zIEcbiSruCb9Ax{uoE$g8x z6S8Ex)xSx7Ex(#tX~A&xAS(dU$Mxhk996%zDsgNvs}SK(J#=Vlp&$%!)h*&GLAR~* zk|~x|Xtu(>6jC5;R%UZ;9kjH_VtOQxY`}sm(UlCRiYRaw;ww`<6K2gS#sYr`5T6+E z0a!2wX(x=9jRAg(0U`h#u6fs@<1X;0DQcW8l4x2VWN=0*rJbzOhwUD_GN+&YO+`T| zS2Si`a#eQSUiDTUF0%TsntuO62$=6wABV4r%6W0sD%c9~4 zz)vfJ7oCM!CK8Bu@ec5V-;BK99^DAjkibC$F`@##$(xbs{Gx97yp)*L`d|-U0O5kJ zfg`X0r-6QYNItDe6t4MaBBo`3okHHVi7q*0d|nP1+k1YCcFj!gtKfRB-^bKtBy;y% z=~mt#sZ&}CqK2yy&MPr+XniATt8!->AfggZeE*0553uXJ-s`^p>%boD!anT8UhKwx z?8u(%%D(K(-t5lK>s4TYgAU>1@a)!p?blufeQ+2nBrR}3acfbDg1B>Ev6=-HAB}Mn zTN^qnwB2cDuwBc&A@cqv36F=~NvhWkX^E{vN6VC%5JnffVu{E#oKhN_L@9{fN@KBHQ z`=0R!AM_wk^&x-t{w@LYPz7JG6%L7$j{gywrfE-~xrSqZlPWnBHi{EZZSQX19@EVb z?X400-Y;DlJy??SkD2rN-uH>g?~WoRp3Cn$>-T@Z_l8gSh!6OF525{Tv5pV&1plf8 zKd6E_^JAb0ejoxU&+FF8eb^GPyAS-_>M0pwIBF?LIHn30!HDS zzS3MJ@`%fM9>ER%G#NQfF`Py5_Ui{NMy=0Dk?w+1oXTYql285C|8|P6_{`t)$FJ}J z;UGYO1_KSQ8z>N=K?e&5!ZVoAVgG=M0U9Q>7%>1ugB%N5oak}jx&{$Uo7X-W+gHEO(wQKLhJ0W|o*kX7qe zu6{l~jhgW(!?6{gQY}k%EJg=k5iS(Cb{(TC0~icIzyQGjynXxL-OCqmzrF|z3+5Zx zuHU_l7YBCSw}4{6{0b`$Y8*x?Qf?Hg#(XBl6mju(WOQ#2^473o-139!Fg(gh#})U zTyaSug7*n2dGOGny$AaD@BcO6JQ|@#2SwZCALU^upyC@UDc&I3O|F4*JBXkWxPnkC zMI3srI^d+U@VKw4is~cZF8qii=$Ip}!Vis$=!yp#E5NnAENhW9&lbDuuf6)oi-84N z>#Ls@^?@ug!tNTawbSzQYqZVSadCith@@;V8iPy{$uFL=Y+wMQEzPj~*gW#0OHZFsX<4PSs8WSA}vFC_NQi zlOVJ#Y~TtXBIN3W3ICe1ZmQ#;3N+6uuV;h3gIj8tEmQ6GraNq&iWScQCeNvwHL2;wQTHMaJS@Z#~CFv5;4BM&9`5? ztb=ErJu{@Jp{g2$N1!?zLhvH0lAY)xh$fcE0c%4#wjzliRu-Ns;&NyxM8CTUJU>Vk z0gOl$No2hVdQjvF4aTSmy$BSIuLlA(xT1%e>>KYsAFkk`rk_iN&m^RI=ozR;hdMe} z1S9%bMB*eqb|5n>09Gpt%(zg{J;fIEIBPR{3uKT=4k_0W?;IIWJi%^m#Q_BN%d~P8 zBdpxQ`E`=7#Q)Vb&G3PpRM$0nl9aM>#Fz}z@yZdm(KQ~y1X%OHI2STB#TxGyf!?lI z=K?w%KIj4mu87#=0AT-npbIR*y`hP0huvb6aSznaJ(maj_mz)xsA1Vb>iGGQ8qgs7 z_FfuKgbGxh8H^G97^Bk)hSg;sp&*AUYlMT6N$74|$+$A`YCM z1V=)`k5!~%%ez>{RJgkr8jm5kgNU}w<(S0r<#OV>QDQ7J03i0Thk)svYZd?+gC#B= zJQR#+p8wb*#|5k~kDFI)1T#b+YEE-g>|El8h{VSUW{HRCVPC+QM8xQ2Iv>)VZi2%W zWua+VEJMqn$|jXtk%dA~fleF;l0BiwtY?f8fvQFjlQCSOJnNa+PR7H7A@t`cr9#Pj zD*2vJ!AF25NfoOikU$=+<9i7#TBgF`2duF#5i`pq$?Ui{jpgnjJn%x=77>Ah(9T)4 zv=AQewwz(I#e#eEO&|S6OY7)PAUZ?P98y~oQN4BH(m5N*7RkF17H#$r6tE=`A#er`rSnoBFkkRL>>)t2=abc z%>Ug<6ysFB(ht}ENjr(iBQ79YXfh)bfm{O1 z3yC1s-XI#);n8Vt841hAc~MAahyAWfC7)M&JtSQy@#t5Xq>C;6F&&DNqtoDxnm&rv9t0P=OMT_goX>Jmf5!!yWnHpJW@QG!va_nX@ z!y|SSfOFN{%NYlNSZwBHoOxLy>MAGAb-feA@wf{+CcC-{yDN*EAtC}UN2P3rX&yDw zmtIPUkS4w*Uk|!7KlY-} z48?uV%yhD}ot$(C5s(Q`((J1WBxR=6)f5lB2cG0^R|ElCTAX>{gE8=+2md~J<!X zXZ9|6Eej=bK?|Hc_;9V!*>iHDjWs^w3=;Jv0hOOMHG**XARLuU#5!II2B4%W-U2dO1jw7-^CE2shib|~zJ~46Qd@XsDUN%m zZRCj)`D@K?o1Y@x@!kpe+0F5d4izW5$lL{CS6bbb@B-nLFUDXp$N%}tWnS~u+3T{_ z>!?*2s6|$vN=nJQ{TwP5Q;H@IBPeI?yW^hrK*~M z8w?b{sRjy?$sr_S3>pxscnj2Lp$u&u5$NPn-agZr3YDfw=`*2Q@*hIir$7bL6rodw zGPlLHPEJ=ep4gONsYm5jv9)*eA^WP2+c-%ZGT-=n2Aui+L*Z}2@GFjj45Ia z$3U1S!HaTAr@dk|mg@`>q?au5jBb&=gW(s*@W6z5C)&so9zhmjlC2NP9cx1i9z;1L zTdmc?4(yS#iyAwcv8V~LAM6o8u)!)=xijsuk4%vju7Q=qi@T!`FO+ycLZdrBQ@>b& zm6Hg(zypd|;Q`i4i;%k;#+#!6{2)oQn;b-|0o#=U1PeB#4zKzplaq*r&=v`E5zBxQ z#-TNJ@fO%f49ch{zevPwS&cFI9C*=-%88L8!5l_RjsHVj7unb~cd-ji43bOyKyqRb z0hB;xdWzGN7L#kfI+DO?!xn^yGPj#Dv9q$8kO?qQ1PTy}>`BFnD2etltF{678ei0L2yOD1Z7c3%; z1;DY@Asxt}5!@3KcId+jbd%HC7>(=0v#^*ESu2JbCJNxKiqb`RqlxhtA3wM|VN{Oj zAg~3YLPrb6TA8WzTcE^qwD_}+pt3(d!@~87v;Vql73{J?SK%67`kUn85I~$EsW?5f z$Q6?T#D97+x*;L6s7aE1${<{!JuIkQ$stM1mtjjweoP$~X_s^o3?(s=eJMdO;s+># z7a`J;8euHDti5AX7chD;%<(bStE<`*7X_0YyTKSr1EJd)D6mOw1i-xU}~TO+z9zfFzbOf34%6wxXkEK8O_8)1lbtpoJxsNPMXZl=(qyfy1wPn zAq^WM3@aQq%9k>_q99U?3!A-Z8Z3JmEdRMAjK^V5%8|7yQXRy2PtYl&$f%|(@|<#k ziiS8S1#GB{<2-{1o;z`ffO;Obx*dzKJksi~bzroBo3ifNMVAaWx)a8e`@yGTD!MVD zAiOwg8Hx6SqlR%9+HukMDvlRDkQhx+usVo9iMkgRi{P=Lgg~CniyH?Ztr}gP#jFV4 zX`zU4Q0h_A+nF7M5(o!M(IXSl=vXKt{lN&TjtD)=V#7eb(2O;Ty&{UDxCFkqq>a)c z)An3bgGn~Qm@&clM=*uK#@Zs%sEstL)0hhwCW5Cub-iI@4qozv6tc6x%+1`k zit4s_v#3QHO-&&d-ncksxsVFs!~f}+!?T!DOJzl|c+y$Yt?XkfxQHV_grhB;Qn1jp zU|K3BTZ`*U)IS+XSe!mm&5)EM4G&Bw2H*_zY{YhQr*3+Ueq@Z!q7B#^7!~9Z26)H_ zLsoVX#dOK0Euj(yn4-IEr^U(_An}8dcrCjjAt74_wYt#>lEdnGs;AJlp;5`1NJ1`uv!B}7vw7! z8xu1MCo9@3aC^rzaAFYPIM zJiB02JABQP5^6prmDRJ-%7}VLRh)`JF$*{(OZaMzru#S-x-B4l!?FmlvABS`jgz_^ zi`TLc>v>fLmClDSGm{1SV55S*2QY9g8S~S0vm; zEQ3i(RXg5AGTmLk|B9A2bl$T#C~F&B7vf!OL*CvM*GQX1sEwOYwchK<5Q42V-bJ2k z)3~^J0AF1fhD0?~6E;^f49hjX8jKAkS>M`_5mg&jZ@N$Z#Xv<|HA4KRVHGu0Ym5L` z1TT09Jz1-|k+`eu9qM#oJd6rPqbLnMpYQ9QN&Qf@JqR|T&gaWGrW(YKFrW!xYW5o^Ty zS-@NYz}wU|gTS6bdK9g7l<^TaybI1|!x+>2;kJ#64@u!bV$jI*yih$EK-N6FZRD_M zU>vp+xanc7qh9ZoAgjx`aO}F8l(>=+Nj*{F*pjwSrlq=>IvJKcBD=u$jlDS?9sj(! z)xj$OHAo)$t8VoozNlSdtv#W0J;{k8J~ieS9LO|905He^EGWn5100%+h%$hMGN5K_ zu4b$Xim;Q3;RUx}B+W#n!{||y=X1kfikoyk+hUpSOCjU#4)grb0t8wC1SDQgXWJ{R63^8>z5hRlsyqCgM z+QB$XJiQT>B_fZOwTBdDllIop$ReigfYJ&_0*p3mCW4u!=`y&F?(rV^3C%}|53D-g zr|6}>iDzk>J|MK)|8g>--c+PkUS>i$lF36ieBM=Di;p{M9eh|%9Y;j{-j5VATAdbh zoJUanz#|zAq&tjAd|Z7X#heY@|E-q-o(%f+F}D7&Q5+{vESR}Q!GozM8x+V5WZjD7 z7JU#A0vlYqiM+N7fNG}cnjRGcdLLd4w+8Uq2AGq0q_}+oSbjR;zi~xAvRe`9Y{jlc zeS+ZUtHURji#jAQ1FeeE9{;A$ZjjGwVyrXVe)U5%X&{h+XIRZjjbY5@;Iw5y2)LRY zx-zG4fv{g?oGcPZI!)c1BaAMpJq}bXVLlC?YYkxo&@V|#Lv$>{WVz~In0@NeG~qPL zDAWfe30Q0{E_JDg%SAg^#RaMIr5EB5tTl1s=#W$>KmxjliKU z*N85EAdPXVAO7G0&pg!RP6x=_6cN%SU0WR%6g&SV9Gc3Np-hR@a>Z6xIG0%0QW;tr ztM0T|3V+ZM)$#_Pmh`r*;&^nLTqpxAp)U2gG_n%>Je*;!Q(jI>Ya$%VMawF>C(_BB z*K-Y4*Y#T-T0PZ7#i0#WmtA2W06;Q84maToDWP?6Z<>w+Sg@M==9_bj&>5PZD%DD} z+R`;Cj^TDIH&<|x0U@fZ%owGm;Q5`eIn;}#9piymHwW<88CAN8(9e@}gto0>B2eZr z&^1x3yaB61{{MD^*E-mylLFmRh{7S((j!|fUj^*Cj0;ci9>~@MoyS1(ZoRC;A&ito z9AYCQ{X86*R^F#YjWk0wv`U}SI7w8gsx9&ZB&bJZjLVRK zVzO1uS4=es9nw}|&Mfw{*28${6vPXojmvBTa@lZP7mOx!(h_OXT*iRb7x`6`ZaL0% z4QS==UTv&Y8{p6YvWV~j1wLo7h)3V3W^3mBYSsW;6|x0Qz&+3Ubys@@m1+^kSim8a zOUu6OZU24Nr$ed-dn%PQuR?l%Z7o(j*Nyd2txPcA2Od2X{dnxur%nB`rwGzl=*DFy za^b5p3MUl%*?0gsY4qieB0U$Ee zxRGK+c^e&84B%j*$&V4&P2^beO3IQLRhDGA@?}PvA2GVLC~sy-lO#3vbO1AD&zM1h z9<6v$Wl@qkGd7*-v8qI<6;I|2dc|W&2M&qW^!Q-F00afnrlp5~E!wwl+0K#0JUKZdLu-n8otICE8D*MRuJoju#sS%;o;jLF zBuCffsg#Uf&Sd0@Os=TokzraSWsG(PaMod!HfCw1b76{BUz^6Y0H&H|=qUrBdK%iM znr3=fhN^OQs;a53WoccbZdxj)9Rz@d1?%`ATL+C;fB^K9-+&@$K$bNQCDq7)aIlvL}Vpf(V-NrBNBSecEsCqOj^0_ zxk!C$ExC(A#M8j=QpBxs??z|jvyDDSscHiDv+4jIPK@6GsJ(SDV)w0gOea(+2N^UD{F`H}-bvVVw|4Zu2Si z*XmjQoq0W(chjG2%X>H1lhOt9gojhOSAUEN2r^-Ib*8c6AHJ-q#}i9#bAbb-%-~v? z)fM{7i*2UZeu+mon&ay<5KacKXRrr27C7Js21VoB)xGP{gz$1&PbHss#gAPs@!$?# zC40xFBzN&qf5(yVWuM3V_1}?o{MFv=JH6ZODkna6?fSj#_|@?qUH`%fLCgT_gEh#2 zg0s%`nP8n)oPX&A#=|;X7^k4r!7oB{DIkUTBAC)KhJGMpO99~b7)>FtVhGa50!zm@ z&>)6D`ruj7cohHNYU4c6q*mlyw=hV$;=)p>JNa7qSdeJ(< zdx%(y5|R3lE;0j{80l>07|tjLfOCU(aUZb(NE_=}u2U*h&KsOq<;40!hQ7Mo#J_Ws)r+Klusv zusANTNXc8NOxG8KdM}vtkd;R>iBwnOM0DK?BS`(5SpR~0KA&2}Bqps0O1`o~8(k$N zGODWh(1TQQ=EPeL%gHH$_Z5s#YIC=Oi{|pFDSs{~F7yBlfm%kPz+QA>sKc0JD@8f9 z9JW%dyO_=p`NoYoCbAdhtjHq6*o+OJe0OD@M`YQiQo59d9`RN=Q$nLCE=q_8TVZl| zWLuE}6C}T!SA1Ygy=yv5tOL8@GVf~Kq$=gKM0M1?w5eL_*wvZB99VMRDLzPC=e&j46devX{m_SYycChPF7@ zy$;LAT+JlUi=77@yM3oBLd0eclf$eJXRUB9oyr!QCSyfSg^W6BVR&F%5geabeZBk6 z+2CoPx9|f&89N=u?ki6>79ew0W`KT7HWzk;&SaNkU|PH^$S}LHR0=Y);^15=kPR@+ zmZ=#67AR&3b<`(Nl<{tq2R&@D)?Q9dU!Ye~-CzR+FebPQD zGV9QD^U9{JC!ISvd0xeN?l86DlB%$4jrSbPVfhn}#6q|L>{y_cK~1{}O2bYX$^>!v)igYSpEXE_$bW zINXhqdt&697*RLe1K*OFMKy7AT5#ZIPP>O^?hcoP-0b$al1@h`)KW2cgcKAp z-aE-bw%Y?jC%^%?<;-4#7PBpb9-RavY zb*HWF!uPC?Y*(LDh658K2GGMokn~*2OBbPNKXgE958!7jlx5L8P%Z^1JDTseU}FoL z&vAF$+tHquFlCidKnhry>SQG?adjtDDrck)pR^(WC2A#G(hB2=j3nL8DM^5e7L%qH zracKNNrg|bqmCZ>uhprje&SJ$URZNBMM_#)f^Yk3|1CNZ+3-n){fZpmrZbuNN}azF zpm>9)HziC?WUG&-+|E%?>9=da^^~hLR)>8K5zNJtzD_V^|`_|7?;ygt&OEvB= z#bc(SpIp@4YYRFG&kiV$?%R$yop<8_7xm~;y#-3nDPK0t$F`VH&fy*cvX8=n5}ZH> z13C}RaR>eBkkP$J_u$a?(4Tuj$CJQKx51NY>|I`r#?7DwI}jMkpi0bzTwJh&KY<42 z)E(Nn3e13C-K8LDDU#mdjM(`_rep@o*i_;FEX9loU3Yxi{3RXTSWm-19i4ERx`5FQ zt(ef^R0HZ%^a!0*G*j1|PZx?B{6Wo*MT8ZG&yda7y2Y1F(Ad?uSQHA5ed&dPP!t~t zNaK`QTG-kI)sd=bOh2qe25lc*G!DtAg(QWH-2n!b4MqkjQe%9G=71SS-B}^_plCpn z-Eo-RT%7{;Tv&`@{H+hY@tnJrM=2elxrx$@eI0fA&bx(T^f;ls@k=T;kMrzMHjN_M zyrPrs8!ncc?;sj;QOjBQkILO4t#QT%bLd&U$1eHVJM@p2^7nn z&VBKZMloB=jZC&-qk+Yd2XUCYOc&Sx5R<_?#1=`5SeVDN_*-`fPrL-#nSfC$sgTXJ z%}6kjb=ezOaReAK1@bhW7X_0K`6ERvB>J!o!Kuwg=;K6&#kZ*;7gC*a2noZXOHI+( zk2M#>EF)U{g|5xfW>JRy^pRSy+{m<%WBkQr<;7ntA|Scl=0wyB$|PmrOf}YwV%X#z zsYQP+Mq$__I=%&3EzvsR(h}jEFomGHu+WaQ(pP*E>ai0%gxhd^1-VSq^FR~gnPqY% z(-m;u@1#_A$kJ~Ginm~sSvt{)@d#3_npA!zRUY2&oYQf1ggPP0Hj$-Ya^X=xQ;ckt zOYGEM`h-y^ky@V8G|8Ss=%oz*0m)(x*Hb{B#k2(k4O9t!&dH&LsVI~~MGQdUAb<@( zOJ_K$q zM0$Ny75UUj_9cl;r+Mv(8DU3CE$0+I$}<6vYAF*|e1$_mj3kB1WeM0NuI7bMTxw_x z_}QT&xlDut(hc@eUJPYwz{Q14%tCRH$V`lg4pM=^1wX{vC32R_PzKk8Q!;f0KBgFt z3|A`MP;=C1xdaJwp+rglq0&71Vg#m50H$6P+2cUwNRuTX93D@jC8nfthh5QMwLsc* zyps9sWf}V4Q-#wm64z73M2OiabCGFwv{iEv6<@_@%gKx&I+)`;mW1-r35up%&}l=F zj0*ngN)BNo(MnKCsKylPo~mY_#>HkR>gAZm#dyq#N)`fm8#+}4Qps4l#hZ{W8PkM> zkYL54O$8E7PZ!zPrq);x?OYf24UcJ{8A1(_>I5g%T#~})tTIpC1dh{b6ZnK!F7w~f_O~DanKEx z1_g1*W!zc<%~?O4_?Gv2c#|lEK zwH20vP2;uMnuu~)v&Ac72vi|e42HUlv1N?SQV?#Yj)GaveYq^_+{b6oL!rtAWmG@~ z_<=`=Km~AJQglFWgxd&(0~jdjsDXz=EW*~7#KVbKqK&Nx}n$7WBd{5gq*udV&%My{UAU~(w*fjB~dD+ z%4tRq#%>?xk*kD`$`KTYByBY!0I@7W0Qdm0U;tDoPr&Vgu&hJ_EW$Kkz|;~4EcV9o zV1VF$UBHzMwQLVX_ZG=OVF;VX#%2KYe$U_jU!)AEd$_a4#i3{C%bZ_TMhBTU1OuEPaKgaKzj z3Ds`^fI<2WiwIEg{(Z08v~LHPO9Rwl>9op4Z5$-UWL_4~&2VD1tah?c6%RQF&%HM@Ud?vC-51IfbhZbN5pXjD6j)4@J7t-2>AdkFX0vVz|;!g70hy? ztiu~uuiOf=N5pXh#IYQ6i788o2z>F>%19hTgdf=QLS!?#q%z=UfJO)l7=VDcS;r** z=Y}PB0D7eIjZa{hFyj~Pbi4$Ps^c290{=t_8~)~ z%E`4~X`%|zL7RdZ~cY?v19&j0L zOCx}QMq7X)Ag?WVzz0l&0hg}=cYsabb+KSeSX%%~2f$)u02W+F{=T&KI=1@%qR>(Y zz+|_ETYrG-#B~W-KyEa01AxK!egFa|byy&;Qa1t?m^DLa^hLKuTbB@LQ+95kbxF8z z9%-WD_;!JO&V=g6nLSv}LYT|)WMuGUUW`f&^VtsjEXgsqs1PM;G6-aI7>cY9`OXIU zuEQ=52VFZri8R0-D76 zh>0iy^{R6KoVNylz}CV<12lq1LquZ-Kt(fz0T)YR@3J2Z$5QVBxwuC3T6K8`fCYqu z09SxIgMa}~!)ruDW?Qxhxc7+^I785P0I)O&C_>PzgH?k-LXdB1Yws2RU@`2dEo9Sl zcW*=kXaGE5fFf|P_MW$OQ12eVPE~lp`oaSi2Y@`i|m1FS40P3KwjfcT;~qm_V{b0@6?v}^p5rcH$aPTH%%mCo~aJp+0iBz zVj^1N9QDIqC^vuMn#~A?g%H#M#RG9868&uYg18;_@dsqQk^Ky!0yS2o8_*+Bx?@DT zFEhkXThbUrzywTyYfJ!_SHJ`ic&)dH1`NSl+cg$6f-~>R2k43j#18V(Ep6;=NS_d$ zC-8T7+k_u4V-w3BTy#m$I6S~Lu?WXgciRcYgaNzAoS&`sYDA0wCxl-AH}amf2!Vn2 zez+G*tq2VJ-hxGhPlE-lumPWl1%#~wH2WUxa{gL*BOq^8l=*@4?>-0%JS4T1Z!NJj z0(|(vWEVL@@Vg})F9r~ad?!Rw56xF&{8nRu1GI={8}B+~cFXT=i+ce$G(b|gbJ zjfS&b{mMM|1I@~`HOAJTqdeUQrAJ21E+en~&&YYJau)_==!1#m#CB@{t((CFL_h|F zff&>(day9|QSf+7ptE;_0I$ph3FWnS7lSeXIITS-aQY&!X4k#E->oP& zfG9i7E*ryeB(YDAIa0Iyy7zc{_wwF)IG5)JS!4juWWaB1Hx_t-C#P>CocADqM2l;+ zuI#b~Jigr0Ight*F;qb1$HOke16g1|=!Uxi|8#B`uqKl)FK<4@_b=drasUAPLYzB` zGxfNiP$p%!1z_-+x4er4xr=0ZW|OuBEJEcQv!J_3kOX7oBE+z+ z0hSB|9a3myVO@ZU2pf4p=rCbL2M-t&7{G1-f|4f(4A587q{);g8H_yXvY$x?E&HK# zxge&_mn&Po6sj+%OOy;2nB-@apUjv>Q3CauvgHE*lrK$+oGH{Lf}lcGZUsBwsgHyk zF^q{YVXc`77%G?<19!p|3=@V}Q0pg=h6)%&oDJY$-JV7md^nicz(Aj-SUNl4tq@*=a32CRxaj4e13wKyYn09#UP93UKpge~Pjtf%aHR%5aW$Avl{tezl4s< z?mPrJD%DG*6{=Oj?Mz3zl6X5k1*2D z`kc4#GXJ-HYJD#s^s_{GY@LijpS^wQI26PG`v9mVn7_bdJmV>v+z`-|uRN_L zV0oGXy+)R$B~VT{iIda50u_=>P%JFz%AGPe6$XBgEL-`?*C=>Go_L9b7!*_siPFFM zREltg3&Rk?;R7A|U<8U70}TTQJ)0%zMx<(=<0fXg*a;DI@?c{7lt`*5zOQ(-J7RVa z@|q_uEOWFG!H6a@o+&c1cY|Rf7ziXVBR@{~_f zr2vZ>KqDoI08y$9E063-1Ak&DuxxMu^FUMyX_BT#?&*X7CJ|x}^u`uN_yC6^7y%C} zphHEhg_#kU&J-OW0w0V~iO^(XMdl;OJ4#WA=pvss2f0mfPLVbsNM`2Hc};a*Sb3d6v%ytuq%H6&FbT?bBxF>toSG!odY1@RlaL(;^W-53y{} zB=mraD;?UBc#MsNt}F^x;*rslY?PrNHR(yRbW*1!<)pjhs7^L2#7|Xfm_rzW5O6qz zxF{l-ikMWT0(r=F;xU~>Wg{80DabL-C!g_zo*qdhK0#hFb5MP1ALD3MQYH1Oa@1T@ z=^0jbhLfD(78Z+5)%qa*#2w|vzP6Id05wwLZ=E7zc2T7TP zs1}_S`6_B%JI|pFlzY8dZEbB9+h^wXEJORJZ=Y#7;O@4lzFn$qznWa$)|R%oy<==& zi%!<+Hn{U_Em3s~+}YL*y3f5Wacwr+=vEiCb8PMbK`2MB{kAZ^<{}Jj%s?qKL?9eP;Oq!&T7e4SZ33SSrWss&V6B>V zd`#_PcY8~v8x@ha<$-E!tF%qZ5C*N%weE=jJ$zl`a<57wo@0tn?Bb+ibHvh#af*kF zV(>oG$J_*RI(dw^44am>FfOW)hb!GBcce-zj$)PnN#p7Km|ILnNYR>>5=-8r(V`H0}NhsGsDf=ZPX_F)~ z3Co*^^eTaZuS=}P&~V>`zSpj{No9!tkO;J8m{Z__5JnINVpf2r;qa;6i0#}Rs~V5A zxuUQ^T|2H;bJP8<-ypLa$0=WW)Mni#b-AkAB33iX2v?`SuWUK3#&*ND9X5z9?eHu= zT(_?luE726UD{kpB>J#6+E7|GL21P$Az6vJ$)XRdnENJd3rd!@{a${=1StIgELr05 z?5wEd<&urbwh46<2J{3?18Bje8}4mz4>JGZK=#xyQ7+V8-s=>kmuEQ)#~3b$`C_CwcfOV?7wMm#Qa;DL+u$BDRw40|Ut_G7!m zF#g!Edai(}ET{d}0Sm*B^VU$sxJU}qPy){{4>fMY>@W@OCh)8X5Unr@Ax;ZH%tl;e z#P0A6U26{6Z{kAi3)#>{zOco50~2%045cHHLQ0ZGDQiLy_1Xq%Nb&UuMa=@GDb(z+ zXyPSMa7)as27O`{htJM#X>4NA_1eZvc=08&gw_ay!ZaluMBs0j@ozfdZ$!Y}Xo%O! zNd0JSw~{JF^hndBqh_M$kcy1Ez7X&_Y~k8yJhD+9y71xJh#P-P)X?$Ldczt^t$wV^ z#D)zaHY6NLrDn4Kk&3v=%JR{`O64qs%Brl)#;j-^{IMU~u^)BqALFmZREq*j;@Rdz zDZ+-LgaS?2#!hTdlF}vy_l%axq-nSYhF(f27+`}=@+Z=UX-IOul&)n986(H87e=1FmsjQb3+;i$_f^=XNkD*%kry58@)vdD?v#|pja@yu_xJ})x} zF5iGHD+R+SpR#&1hZ6NkbL3%s#w(zxvhg6$yy~eex#@i>?=05R;tozK59-@S3EYq^ z=5P;$ERao>O_eMPQ8uao7{HcDh%trFXc+1$I_ZVnYuf@-p`wCLM#+RA=p;xYYtkeh zl7is^fN+xk@!o)lnc9vmC`I&cL>>9A4xK9@E}$vLlGJSTEjdr*XomoABq|@THfghq z;^;OJLN?2YEbs5(xCl6*k^p~GtpI6|aI>m}^ElWWJ0W-%f?}+{+&8nsdJ*&wom&y#KQ~P+sDw$}fP zI~1t|2oNAZa4FE>QlMxHw6sBs7l#6+SSb~X6-p`nv3d60*?DGX|2cCeGnvfE$wW@> z@8^vo# zPVp4JZ5OvGUB#DW>xa<4&=wsuv?>1kIm;F&w?Sk%(=E<3*%SI_CLgE?ocQT9baqy419r2?h<9++#TrCurMh4yBm>oAh!Lx!lQk zd)fT{s`-uiT)!)`k5Sd@{iKo&Wc@~>LG-O{g#h!*Q2AlSBV7v24PMdDg7HQ3#j_n5 zi!%j3zknW96kQXZwp7x@_p7X@W&7qRdX>t~#8!B5>i2)f!W4D{8W!;%{$av$Z>250 z4H`npwt&hnBQ%tF)RiK2?nfHDj5Klm9ciHyWph8u;boM|?GZDP#Dn+W}qI6x^GWmX;3ObcM`Bw|*~&?{?jk$?_rf;2_p=&0sLV_CAiq+F6BN5^tDjY_& zqPzivLCZWv^8;W+mxBm&l$DhcQ4TaVo(&26e^HKpV%89Ah{fhR8X}2BMy%sLmTe#F z*!}+jI*2p}(c);yht1^kTDBNMHx2(Emt&^Z(a>_Hh4+7G4kFM&q&bK{2a)C=Mk6Es z2k5|#Y|c1h|2NIS77Va5wYsHPkgfX_w%91 zeJHX83fm`suo)tWUCIbUVvrF=+(B;k=N~y@yN@>ix5&X3QASKIVvmT2DRWe2d9-PH zl+V^eJZc%(Oqu1(CNXDOMzlC)%7|e{WJ_5@%Mq_98YW7dS=on)!XgY|Fwt(}4wBf+ zgd&kpWCU~{28BgHyNO$*how@s!zz$#@b84&o8Xz*@>I_w)0K zxya2CnWIhOLwFvQMbyg3%xp#kAol~bJ_myr?uU-E__5{jLX z+23FOJ;IBwEsGC;{XSy*KNg1!3>H8vZpr`xJlTk`MpY#71x#!-!aN;$MWHay0AkZo z#!?3A=_pDpHO70Y#z%<82dH`mi2lFTMzp64vD(NY4MPEdnm{rVMvNWqE;0$i#*K!~ zaf2cM==tRB@ms^GV7lw-9t*%w4lSLdz@NDay(DS6((8sW_n~}{ZK1I}K@b#2ER{r# z938jlFALQSyjcZ?r&U%ZKIBD#SM56^k433d1fH2!*#WJ2KaEVCy1g%w zXQ7Ym>Fm&KBxi|)to`9zPDt>k2&4+zM?97ecs8BM8nL_iD&Q}7G40n;(A&3sh&Ped zMyuEA6DeGO-CTE{gI8=#;`#5lFx|7f;qGzT{rwF(b7son@S;D9BS$h+B`41GQ(Pyv z+0*MNV+KDjlosg@#*G+ZmoR63^!?UvCmmxJlt(((b3znW$#4?H?1CWMJ zc+#Z?{GEwM_VuCEg+k?-G(VSil5%T(%O7c}P8?Q@4_sKfpC}0LxJdue&ug}d(l>v0 zq?^Ct^3zh+^6r}^g{l{y66{Aqi)QtUd2bNmG2HF)M{-1NG^qUyB6qKg>q)xXVoeC<5a2}QTN2ZYmS1fYc}+p zD&)NyS&;m!){VNyf~ixC_IOk)g-@u*(^mU(HJ zt+&pinZJvcsjB3r>F6#=HI7P(xg!w!jW+0~+|C;cX}i7D`1^g^#m|?n4sV#tqSx3X z;SV%mUN~J|>aK;E%rcs;UaL0oXJ6*>L#9+rk^D`~GqvstvGJ?-qmLIi??2o=pFew~ zptD)sr#4t2T;%b^ezSz#IGt#oj@P*I{B@|!v8eXvuWp79)pRr-!#owh2PFDKCz;}<&RgLT)v1D(N(}KnW^iFeGvLB!buoQa|8W9{2=#JuR zBn)ue&Q}EudL@#6&HZvS1sc|;mUM~O9`E*7yhCCuh`QsP{$CZnY!a;9nS;v2i=MT$ zSl;3R9d-vzT;RUqg@wbap$`-X0gi&7J=hbmXY})kHk^zS(YkUM64ZM$T$4p@Owp&D zSn|#Wqn|9TJ-b*UYz&$0=6hX7kFhslty_U(k;Z@zu$@ zld%&fh)e~5-p!kgm5|NC?m?E~tIJe6FzISLz{WZTAQ6#Hr1C|8c-jz@BDf^8|FZIQ zMFq*VdU00irzPbA+ww2j1cKr^^DBP|tm!rayKEMolr;;<*Op9ws`b{J-cCKMyI=Nh ziS7}mZ1c|k_>C^^Qd}UNb1(F@tU;dJXA8qci}nfcj@iIw5jxK5iom4zGRsXq>Xdt2 z)n9ntcZ2GeajX%H>)8Uf%{cDwGXf;y>(&nVtqS@te3)y75nk(vHMC=mJIw-b&?;dIU+ zyr9|#tFbSJmV|N6h|5fbabg#M;bAp8KOmS6udv3a(Sq@t1cSKn4NYa(!bNHUsb0{}(14OF4U&1GKO z;rR%ybhp1bIgoEN8Ln`Rb2Q&s#jF2NB=G!)k})n4)-3TdzaLj>6!v}TgUUzImz^J5 zvKd63$+*xxcfV!79JA3}?WsW@%&XuAqlD};>P zC=aJIAqRi(eSJM)9o@=@#7Ak1h<@RZ+a^;go+H&@?3?92KpDtxprG>nAiCmXaWeb@ zm$G9K7a)}v&Xv&kGk0Mc6Y}80RyLRX5Dbp@S2;b&ibVnDr*VXsTewLdC@&dX4}#{+ z--MeT0*MknRBZ#80E7tYO&H;s5`3awyatl$=6%I z#OhtX`@pyQKI@`VTf`w+RDVBy=T?MVsvbsnt;1|kU&TMoVPjyd$<$jb6_16=rJu#l zG=3$9(&XsnWMkcwo?YCXtDkq`aux4C(9cVVfi0lWvVS;GAL=W zeg;c(T@8jj@`fOffl=BBuG34Dnkt@#7n;Cxjr(R9;y_Yc=h#HI3bZlcN{odr@z|KZ zYtB<~z25--q{IaPy>ZR9+GV#A2nEwfqmpRl@L&?t&DV6thR>fpp`P~D(^yR(gvKi` z`X2)BY|tg#kLdwI?FCacj4$ls5wE~BS6m{m2qYB`2}>uLG3HKO5YvAYyK_{e zTODAPU~eWNs-xe851$8Z`pW#lj9H(cvix5v-rvbpO+83>p|D{@-gbG9_ za;*%|E4DvY4ikW4lv6BF{_}L05n679Z)%D!3>Bs74diKy@?!Bb`AmzPrBd69wpdCu zh`Jk952o9q`QBzFbU>=X1e);y=3N*z%LCwUK@kN;dLj@o4$LPFVu3+2ihx{g;8%OW z^ZSP9(f-ut=#)^8)#ccgQNT2gHpC{FPC8EK($`kst$B||ry&k*PJ**TQ=11plaHae zu>CX}92}F9xg6Nd3=9N#E-eFk(Scv~QV@OUBxRH#VO1uppN9fb;d+xj$og+KM&*QI@k7VPai$u zhD7k>2ypiL@>bDddss7alN~JOu-zx@QOoo?gZ#N8QXjjVQ-q@82-Mtg;K?x!*D=k} z7VY?QV&w~018@KAWh!2CnlowIUTdgEf$?dme{!hR`6}T177ZAl^`05Ml7eooiGR+F zR+ZA6@!?1^~+y0oN(+_V$6r zcC8hvHm+ zi(l@CrBseJ*WWy^<1>yhHiigM@q!UX)=r&6I{LR(Kp`B31xsSk7O+qVV)EJ726kVs zz*^e|d5)*q_W^3ypo7h!dHYe{P{~@XF4Qp4zkS0M9ovVjE}z`u7YcJ$6zxb$fRb>GO4CX08uT^+XQ#H?a5=IHcJc9Wnx-I}Vis527I7Fi{G+QA#LM^~FC-9J>Qe0J-6o>$6U8mol|T@?nW85~yPk4|Od zQt(N{;Os2$+#IMP4dg=rOHLCkQz5A-#p8wk21|a*bwOL^(A|;yItJO`EgH!`CA|Vx zbIHifeVU!sk`<1vTJH zjbR^BCH;Q+c=m|HeVGpc{7XBL#oBu|XldIDFpid;tyCA|auH2YUgxQViQ9HarGv-N zsQ`?xs5Mk`{7F22-6Tq}ff+IVF5kY=a)tV@)FQ{Ufdgoo zj3T0;QY&B%)Fc3GaI|Jk*;D|JwTs{(AJ4*fhSLPn-)(+hY)RArK%Ik-krd>o)s3S8O-lP3exqR;gNJhPYu#|jV92XWIQRhwo!dEfdUG zE61%H7q3X_v0pj{nnk;0W{~*fKRnnwZCn-@Ij&H zzBnIfyFgZ%5A+LL#Z4XZY}x(cm|v2rZQ{KiJGCSL5yW{&?iYxL;5p$bKNnJtN@4LU3}Dr(F~&5c&f+Pzb+MD3Uwr53YV zKuZS)PU9Y2Ueu(7QiMcNbeH0-x2`0m$rW zVuN^%ZMlwXMxt}%6#NW+1T|0^DL4$){;`E3%6K+t-jnd)!gOeUaY$u&6`u=;oOJZh zi%hI)&lz=nUe}*LQKvgGXO_#j$!ARI(reZieR5{ToM7;HI6tV$-~sR0!^IBOnxnhfi%^}VvadGP!HoZ?xRp_-h~^7t*5=c$N5ExS*<5iop0Wi>8r4JsS@LY z2@bIHv0_GpS27v&n(uSN#<rd4cpr&HTrMZ+Mj$JRImidAF+*Xa8`jeO}-ePG%=b z)}T45sLLyw=nz6)+_T+=`GR9x7-|2_QWPP8JJK(T++L&v1ccXT$4wX<-^3SX)J{-Zy(E6TI1oKEoYKy zQT5T&h7v(u{AOEt%u3OFJz=pf^e??3oRqI$#n9==+aCr&bi5O4oI&dwN z&HAxlhlP37x|xUYBU?6}CbtPs>xnkv$$^SLBrj?M*OB^>VhL&+glK+#g?F=@l8(50 zgB%YwxG$zoNQ2C;_Lg-5x1Be0zPN8+x6IkPDVHxXp{72#>|3XU2kKhx{@k;B7?-5B za{A)44R_B+3A>=ymS4;JiR-u(=8#Q^&wjT;eouJ3`{(>x(>q3hpI_GXq2?3B^YBo? zM6q<5NJd6fek;nsVuyiShfR|`k4CWKW>ex`qZ9m|SGz)|#&-t>uW#4nconq|b&`=? z=}N&~Zx~;Cec@%Gk)iLFboO9oix{5TS6EUei*@9he=^`D zqgIjIkFntRTNoo1PWOw@Uw88@9B#ZgxpGb&Yn+r4X{Rjs%)}ieIiwop&XscMye~Rp zz(9fHpWctaNB~HycmNzq+tNGSv5}(HaB=YM!vD@>Yt2Q_B~It-g>>P?_%5m2VbJ&4 z(u7X{|F^$8Ur#RhOcH)v7<|02z8+|J_WMr%WyHUQtfLZM<3BBXlR0<)WQz~Ry`3z5 ze8HycgyWn<3| z4c#6>9}1a9ikQ16g+LX8tuIe@^ivrbm?e7Kye4wQoNjylk*!35KrnclD8UCY%ST4*q-rDWZ5-s%!tdSadA+TDu)XjGm& z5^{00J(zy1xEpma+p03n%a!Q##1cj{@*LeWXXcYR*7mhX+!JCgK}^gE!;W^b1uNrEaK#!a1d zdiXqi+hN=N-Qmfdkmi=HJgS8M{*!xOar4u$xjY6T?M3EI#eq#Uvi&m&<3jod1MaJu z;}GSy&yMai`=^Jz{Z&{>OZad06_v=vah~zBQW|;M=1SwPXON8;uxt_!TzUqdrE07% zkkH^XuYc?{KUVb_>3F~|o>|kO^+h|kL-3nnhopf-=MPI2fu|guh6+p_z9_{cIsM_A zZ#yz?Zs1xldG+mGIkU^U4!O6twrZ0|HKK&%#R?J zFR4^nMW#a_9hhpFqQKM-$u;@&4oXk{j#kNvhj&(s7cCW5W|u7ms0emySdQ5 zQaTn++|OC`HOOja>iiIw_nKw>$87S-xX^iv?D~H5`NbGJ9o&Kdpw$Q%`TJuS>rN+b z8@i2`oq4`=*T9+R1>1D(ivy=wv6Ji#|vUw*kjrcapTc_znNFyD*A-nkNe?p;h&`QG-XFgPoB9YCX2xa0_XljS)IrU(kd$ev#*+V zE34xc{kkO2o)bPr$UBT~B~ZI|J@L(#(y6y&m=*p`NuW$5MVBKWbo0c~D^3b0Z!#__ z_v)m;lk|ECJu9s7t<0xItAEag-Z+XOlsa$Q_Wpc3HGWZ)_qeTIh~dm^=v43ZFL?xH z7(`E_?S?@z8h}`RfuHG5t2tQ($XI&_B;mV>Q!M~8MuMg`=X@g7))t5l#_(iOzBL&I zBcoTpSpet)1}SR>`1r<5*y(dqVEd#gGMog6B>rWRz8k2w5`h$RLvl6~0xxBu0o1I`n{uA56GsG6uT2|lZ zj4Y%{miRHv%EPH$hY;)(b5x1M3l3cBc?gQsq;a-k>S@thOt%qTJHLDK7Jr$cIroXxZ@@Pk9hSDJ?nwJ5*2z}p_X3@%$VRQdAN z)V{*G7&R1Sk7;kPzSfCHbzaqMqj}24iNEv^^TI*!tq2zi;9Y9=KbfUwu8pkN?}Lkv z8Fds*#fj5l=={E(eVeCLf=T0X6WoR|Et0dFscT9BP9-C&AUCn5^T=JxNzCeV<{!`A zlz;n6@}zx^(a^%xq<)dO`r$`ml*Q>cfA=pP5^qSS8w+w99z_zk&h3p|A#XaOwNVp? z4S{)EwHi~==KM^oKrgy<;H(V*{Dgx5HfqblN($V7TmPn*lbI(Z(f~kn-!}9@&7C-L zfC#YfS5?!d9B4!^V2J%dbGS_B&~e;>k2L{7aT1nv&6dH|f`X|2$33+;YGhDi9O?x!#U-6Pp@YrPH_KI>ad;@5~;KNdt`j;J0rDJ)6H3l z#!lt${PTyFv3@9sGY(9T?Z|I9cincvzW{FR$~=@pz26CQdsF{|5O3zNw_BMoRZk^W z#}0q^4}!Q;;NtoGtG_dAvHTEet-0{fU1=ak{Ovh|4#5EwIn5R9Nv_<&{b#>6b2q}% z+hzlA^&ogfEW@FUT`(q?9;IVbZJK&MMEQo$gItWUO48=6V1y0)e8OlkA#<;Mh-n8f zzvcI(xQLfcfkty}V0|(wc#lVECI^)i*&YuA5B8zD|J>Oh>!Cy3NwOEAgeO#2rE(@w zj1kfvVPtas5G}qhKMhdT+5k$S zV3wW)_Q(>ZF%(mA8#`4Z95uiypVhcP$pooQ0SNZHVffI3=HD>9i`@Oiir?u_4+sR; zlJo~~wxx_ra!xu3K9w3m-KEUUMn|b>p&MAiy0ZNvV#zy+64eOWBjy3!8+~CJjnMDCfMwsZG%n$wmkGa+cD-4Hz5=SWt1MdUE$rvY4oXQP} zj;Z_n3CPfdxgCvfNiBuQ+q0*18)Ja%IKGbnF0yYeih~Uw@c^c9GUfS9d|)}pV26Ad zUvylxNctUUY5n3ic_kQarW=W&eD6|6wYvaW*kx7mU@r42HR~0r@;CWRH+-FPdNr@m z9mfKbKB}m^sV9Jv2>~Izrcw=l>bVH47Lh*HoS%q8vF5*{SQS=*lf^r~Wi~HEUui1Y z1B=eG1Zq^1wi;lAnHH~wq}UULtu+tb^+#C;ApxiuO#aJDg_mkM71B7SuY#2*?986P zY!@rTU#^??W!S%=w9nJ24zJUwA5<)g;3k{X8}Z{`>>G)1p9O}PuX1S=p-Eq@DhYWg z3iCHbV`i7v{mIHA=Q9yXl2phB)?(=X;aM}C(r z|E5IBMus-YlRVy!B{;1p_90ZDrfBwS-@THe553HfmsSi5n5WX{lMEz7{;Yh#Fy|Z1 z281m>PG)9P%?%jOWnE)g%3*mjSp@WLa_P&?vBE& zkX*f<)NaQ{A>6OSmtI@>s%7y*iG60j6RM>s^>a})n{#?Hy=?p2jN~3T^guMQv^$cGz?`;VjgFz#&d%l+@`cP6u6}z@x}70mUATP;m@a3@vP! zWx`8xHTp=n1uu2|2m|N0sEZ?fySFP9ED$5kuQ(aoVU5=C&_Qfe%VKJ;6ppf z-*lmckkAk`mNY2#!G(?Qq@*&^|I0N&6=8w##;Of?L^D9MesPnInu zR!T(WVNR*n1+${pxSx4rWNr8d7ArysKqw03?k768rgIoZc^+g_AKMSqbmwkw`c_^C zP867B8aSBBD=n^jIf+e95O^7ixHl+JJ|=VLkRDBKJyrs}`3-J_D$@T8%HD7Vna=<+}8B&7sAMd|5&3rk1W!6emiPd#27@+q*vyu-93i zO*yh&P@OL(DWBLX@4Mr}OU4-r9MvzAT&kKhXfuDq!Rdyn8<97TfCW1BJCVXB@fr5L z6pp5^UQ$*tG3PY=Sp&86)R*>KXMTwsxhEHRH>C%7UwIyVIX@^0Wxs|d(|~aFY6<$B zS>^{6q0CSGfr^7BE3dg&^qNW#{(HXlNBWvqIw+Z9R{Pyq52bO2gS$|bR8z~( zO6ho3=bbSjycZN6O|}|VDPP>haau(q3nZxfd~9wJ+3dxe4${MTS!6|a7P+bP+v?6m zBbnt6ElMqW^;_E7FIm|c{|W+e2x?FFC=NcQ_p$# z#VY2jy^!O;EW@O_e|+?9WDLk!nw@5@`FA0Pn{@WQ@P>JENfF*UNhP}8Jj|XCTEZuy zQn(Mb+;`_AN3fJ5aPu!lYYHf{+x!&mNXijRQT&N}uySvyvEbE>%F~A#9vm`u)d4Ut zMXV>|wOg14e>ct0Azg$RHDGK}>V!Fp^W%U?7$7gfhp zyXh~QJbL@{P!XBzlOxg1n}EhF)h~aefl9NJF?^MV-{r|gAYJ~VDyzd-qokeWN`icX ziC3~08*ptAdKRwD>aRP{tdb0`XF(FEFy_{!di~maaKw%5%G~yY!76;ZC^;aiKB+fh zOd`EoId29KuD?kYns6ivAzjVWNpPyk$?^NUM*MYjY(o3+O}4uu1w^gfBD{@RwKLiB zS)v!!d+`bykpuxf6F#q^PZieI*obOnrwsNQ=13ATM zew&$(*KcJzd*L9;vJ#EKxaqyw`P>n~eMKn^%y@>X<4Sn;4y7^#;Dj0`+P@9BXcU|f zVF0}CqUT#RXo24I{gDSap5)ZFetT?m)e8m@`~bDjA&X7I~NPgch4ylI}g zMGm^&(rTzXtBRe!j}J(2E9YmZ2>FN&-u9KX0fvbjX)JLrtOQYYb*87w}EhdqDF!9enHso2nW3 zX|qlXQyYfX<23M2wSM&5B<1>@bUs_-O5*z55EaRM)?@0_GzwN{sz6@hRB{%2>6-B^ z4?>?jA1M_~Cb62FlgW7t##^ORO4qoYGj z|4;!W&e7c#w)K^kNga3!7IT(9p&m?T=8V7)wi(D4vEqrG0`09M$?~_1U5VH5G=UJ% z-c_EsTPrFC%DPc|@3*8gB>Zf9M7$`$8FKT3n;Erw^s)Cu72!KeAW0(^TCjeNb4QPo zGdRj~ZMABtlac`Re5Txhko(kY)V_eqiy&yhdiRsVV1(L-f%v0ny;lPkAKLxM^nM2S z2Cb8NuPe6xZSY$g%~Zm?hPS#r!g8tU0#r_&k3mR47gIv2L8ECJPO5qLY6c z#z4;46Pf^JciplwV#+_Bw&qNU)B-ah5bNfYHh2qOzGlLllGLMxTuKTX^BS|CkU6Im zKB(ZHEz8DnHS{}`G>GOF0tF_ODzP4;77j;m=xgRn4^ptiGC~}ACm27Iuw=F^DBU+* zvLc5V%o32@+bDjOTl(+>V^sr$73Fuxz+5@KmklF%au+JWOl2z+Sf=cS@C<;Gj+UY# z4o4iF8`ypBdd83(*pqSnN-6Q-3myG@PaFexq-0Tm1^8DMirFb=y5jUhz*OfAKSZH}jh$8q?Aw z+4rxVl&A0X+jmK~#@vauw^ut$cRdg4*aytIEW8#>lhNZAY7EYy18LuTaHPfj4;JSu z{Pf+Bq!m~4KvKbw$h|t3|GWZB_!+gUjCq2;Ulq!~$DJnG96pE!V*?pT zr25($?+G%_)03*;+WbhRN((hfzvr9N>m?_rS3EqC`N_STuEZLvesa7|(}E0-KDk$! z=|h`b@I{bt=YGM>&&|Gr4>pKquGIxilDyu{xaQ~YUE{w?b_M@E>^z%M`}usG=K8p6 z9enp|hEePFgNgdqzSA73$8iDE;=%vUbF?HMp0DXiq0km{#g&wA%h_IP3OG+&{K5RU zNKkd0=vUN}JymvxF^!p3>)PAhT2PfoH_*EQe8VFKs$nA>?Eh$$f90(|?TfAhsy8Lv z^XjqLsY2pomS=%i9IIz2}w=UW^Zx`@vM7>kC9mrim*DpmR&RX+)8WwORYA&oK3`z%`)h!99}bpLnYrn)Rbc1+ zqTEzt57sC#phR{giT)ChP@zYxE#~G}jRPYj{3gk(veEbYysUk}ZNI0IvwrWeaFOhm z_Qv2#m%H|#`y>rJ%FJ1neXwDCVtH#3FC6v!gL@;DqCVu^F)Bb%m(9LbzeKOw??)pOq$x><2pJ57^d^Pw93qWf4+8$5-wg_O0~p(aBr{?z>Q+UO$>6Ys!4( z%kgK&?tm_!<2OA@qaqbQL?MDGoAz}5@wGzdsw0V0B1pob6loG?UMw4yD&mqcpF^S0 z-DT4f=(4`Hv|m{BItXqyk~)a@?|3=(&2MF`k(Dre^7KCNmXpC3pift2-|{&^+S0P) zX2wq_{o-;|`Cs42otdcKn=AfyT{4%4xn$vy&Y2N^pyu~-5g{j4ig8k zAf?o1F|Fy9T2|xzsD2*eAE+Go_KmNj8a-nv+iLYS>*ox zQuSOg#`EfpNVxQies?@2Hqmlz4=~&r^!e|bZ4l?@Q)4CNuf(ye0rCVEW!@~qw16jj z&K;+@3Nw4TY4STCY22#SYJPle_+36c8zy6SjS1o+UvXSNwLn*>`R-Z8qeEIof_$+tAimvt-Lbv-WO{*l{uoeaHeUoix)RW zv$LK2zHE-ofA(@_PQCVN${i$TTUj0`o9>(GoAZ$tT8>a{EaeP1c^Jf+N)hEOXPlT3HpEc17pG^tsUGve=4%}1O&SC4$hKia7N zbIaM=oV<@N1G_@EM93z%5j05cGy423Qj+nzyQouurLZqU2+e=Jr{zk>pq<@phi}&qh!TO{o`&}RTAi|0shjp zd-_5;mC+k`F2(vV%^n3yt|B~0NE)se_vU`HfsC$q{hu|ju3BvGli!`$QfTlhQU-|s&leQ>R+_xNnG<;}j*9lL!YMH#AW zD&Ozy*L$~4dr&*M&_sfunP3_S-I-Pc`qG&A%j`d8Rv;-Ag7W&)jmGT8O*ska545iN zyiO0|6B@GpKpVD5{qJNAFsn^tjj(ezrj$qMV^N~+ChTqi01ZOSi%>E)`mDtaj2j}6 z*D=a3h8(0pya=XUZ zXk`$nqjbx+o2rGG_6%UK0P!v@##Sv}UqecJ!o3Gzn?**8o0#DgHf^VCNQ!_7)JKN| zHIn0nB27n;FoLS4xMl@LT0_&-+{UVBv8Ie58V4$GTO*T8VbU{s(H zUgI3-P{}mHgs*abm@$!h@cl-ZHtfck0AU0vC$d`n%Eq>5=c5dsQv>Y1 zP~=`vQUr=*tctoKdE6RhlW1=nZd|Uv4Z&|EOAG@phJ&!R@@w-HZYXzdpOp{kj42R) zhtJRfZI_8@*Q-UV#W5oYkmlO9>CaB`7C}RqP7j~V;Vh{4BU5T~NYxfW+J&k+zPmz4 zLt+gf5zzg{nwzw0WICEdfFfKrk`+z}3Nl(`@*6Ha0s$L!Ne{dpcNv-1k+It5crnf& zG*6Co8{Pghv;)6d>3c0~wMOFJmi}v;@_}IeYg}RAO`tx>bz09Hl}#j9t#4Yz!7w=nOdg7BQKwib zFVx*aK`=wE;o2osTLw%fq~-)W4^QL3EHi9Xq3=ZJ;b*;7I9V;`x@`RE!9=BTu9PBR zI&{?(o@};l`O`&xf z_8|y_VHdbcdEZ>bZKWKaazk8Y?Kg2Xg|25Dq=3`t9#2us>SL(TenR6JUTA1OIfC1i zG}d z?E;v&anf7X&RZm1Ngacfc)rV{V}LG({JFN zAZwlie@Cy%k+M2`qku4L)~XQMGVMXQ7h(ZBnbhnyFabQoIh~VHg!Dpx{1VdDj!8Kf zN7R7CSxwjxBtG`L{!|mPL2F}Bpi}{qsgy~uRxmE4-aO%`OD5*LH zkk>Gs#46{o)&vVM_S>qf(Oe3G(>gUbugD+ftau>r&*MT3~g-q`5CCeNidn#+tdVi>Amoe zmFFXk95*zJNI~O7>MA@v<9$B=I?|~4PtO_T!?wKqPTL61ba`Pz=V zSM-s`I+7k`x3l?4k5y|WSSWZ{c0`?3j&J4*xO5Q>{_{aL>sQQnhUabXJrE`*(qYsx zw8AA_7t+CDILMe;Xp}h(2irxKhm?#>*hA>Ot3qpd`n_`jeVY6}f;8M_$ymsvES%0d z%-?seGBL2sYuYujYvGQ@(m=ON`HOmUA6Jdooq<(KRv`UBlo_hwDet&UQmstV>dN`+ zcaD|K-hNHo{Na{-%j{0YoC}ozc`!$tlz$LM)oPGTlw~*5(Ty|=(uMfl!5?xc9r`a@ zOWdSD!4n!>5UH-sR|Tjo70e1`ZF#$J@!}x7Z&k(3*!o z<<;Pc>u#g0wyL#w4@%|yRr&LDFXwQkaVMXhBbfK;M~1y-ma@!FT8D@uS=+CePA7*A znND|=Am=!0qvMm2n3Q(|KM11sq?QHz!QIT^D5rdCmKQ-!%w=GdbnUlz^D=Clv?9y{ z4jqx6C(_%N<`(M~zz|xccDkZv@qugx{t~GmUgmx~4;Uv$?1^`R9P8H)59EnMfMdmy zSp|*1WCL8EGU@iweTgZSw_zJSOCUC)i@;APm>cDPJfbT~Zhlr1dCcY9plp2_OJ?oL zVA%-SIPkE({g#{ggqyRnRi^qK$Qme=DrWkbwZm85AQnd!HQ(ys^um38iwz=WATR0Q zbPP)U;}+s-#g@(auBFyKcaA;gmd!1W60?zT=iSraJK@m>3b&rFz7)B6VVuAIn32__ zXq`|eXY$IKo7ZxLFPGr#oaDVY)UxNS?p!AH{wqOla;fW4*(c=bI!gPzPb2uTBkSnb zRL%is>$6{@B^Q21JWwP1Kw9jhzzewh(>?mJI}M5;v~b_l1zb1f|Dx=!pW2EWbHk4P4;QmJ%t);$!V?Y;l;`h)fBo9kNGUGyU`?Wh^* zD`qvQEn)*lPF=u22#;#FIKo5XPNou?zZNMjZeWok?p+-E6Bk4`GOqoT=zU|j`a9tp z*BvF(Uf{@8gjko-LtG%IimWuXOx~J8l7o7ZsxI$`5`J;(FF1_M09!Uo^?6VnjU@8t zu;1~D0-4%?-Uk5FhY%vXJn|7g`+F_b4>mibF?o`VH_pt&lD&zeqv{`US|r`a?mfxN zYPddxYu)L^Nir;a$j`d>%z{}t7)Ez|zmZrHx!_M*{qQuT3+*H)%@F= zN)2VK1mzDoY#J?WcGMBgM@`%MfqgPWMxAKCt{W&5M!N6Hw)Ho(PMm3lvQIVvz6ddAenQ`={2y zxPW&?n~|+|`)P%s^!OU6=Xb^E@7XG={He!m@q^3^1Z6TUlLprBq1@~YW#NQt(F2;P zJwY8-JKgMbe{=M@Vs4_&=!a|^=KoD)|k?F4yuKPnddsS-bq*L^P~Hf8eLkZzlF zqkcoX`kUcw)LW5L)4B0}+8`k1_x7#Bz{`kgU0Q7ai02H3fuG4A$vJ=hT*@p&-Ihgw z;-7K<;~IW zRX}t(2e_z)+&)FN5AMb?E^)XiTUKTemf3AJ-tuF~OPZk(OS86hbWZNzd9~bcVwtXK zs9(H|TiuxOHQiBdeMUd}+s}UPN1tS^Pin3PU5|Oo;+(^N?H}5ZekluW`5~@$)=AR4NF_xt81HS%o}1GwT7hidn^fI|Dst zIt2UYuQgh0Oxwtw{!&80HfFP^Y*;!p^;n`((+7n(x+Uzk(^$xf(H;oq>0yRbJ&rL` zQI`a~pZ7)yw>$1>M1rrC)Lvc=yiy>Y7_MEpR+@b7>Ak~;sYm!#T&QDs#dW{paFwl*@bbH5nx$p@$P1B&9LL&l~0#|9!)CizMV_Sp@r+2G@Da-wnl3R30>GX}=9rnGQb1*PjVKoie!E8iyKS9qb6TnQ%u{t2x+w z#bYtv4O=ucx2>EK2EVdfTuh1MuU^KXKF<~k`{E(APG@vOZfRfm=V-pEB3AH&vvcbM z)j~)<8zPRv2 zoZYvViW|@><|?ajRsJq(-v9g*(z)t#&lY~gF1wq2>7Hyc(!p_XJ3&)fd|WQsjsECW z;3`S(j?Ww_7J7crjhb}dwfMo2P%Jh`(dhe%)VqzT4_~fYw$!~l!Fvq9;N9bCxid}f z0+X1Ot8%#))Q#wGS=^P=q7%Oz7lb*FT0gu};$~UVuJa1aa)XA5vTmEZv{Kv4KKx=^ z_BVfbsr8-58|G_rSF_T|`gHa7n}I$QYeMyy|Ld^8s02HH$TvKn=wJ6j3Yi`t`g2+u zbGhwbIBE=$pVoeNx7Y3k6_3vmx!sfZZMkiwXDz3>QrROX{~42mwthS&veZ)oF82w@ z_`okG^FjeHJ3)*Z5#Qz2WQi2m-!eC{@)9ts{CTNx&z~mzMCl9GlX-=i0JbHJ(39MU02h)8Ql%H>N<^E%3u(A^95D(> zNP>L-x|_LLCN*qzKc2B1S|_%+j;JLck`4)?>7$g7m#S*gty0_SF23u8J4X)`T+9X8 zPH8kBGL@=WX|0r-{Zk2z=L1@WUghbCZ`7;@dKtcs3jC4L)Me#PW~APReaUu2lRtIK zlC@NlE`4;lhS}T@M_25*Mby7OoL{bea5!TxV`1#L9Z0_ve4By#QuvkajT)@-G-z01 z8%32Vk5k|#RavSZF}pw=OVQ|fI-jz{!^VLwsna@iwcsgl5yACs5_jq%b#kep?@(q} zI_;Wf|74c#q`_SXB4YxM<_NFzA;spyQ{gF`*((&y+6`v*ilHnbiIApOP85BQorh-x zTwBY@xKYj|8t*Lrx~U~Oq^+`io=q|P@{H(oewyh@_zgU+>_xMSkSD=|Zq%&$D@Ma&fAP+HUt!n9L!>a^|cja7GL3{s3ln>DI_Y=&gn>0#G>wA=4+2{v_m z9+$S)oUEuXB`aVRSO`g?6vOQ*Ao>^RRN`3gy0kJB@)6vK*QDx`&%kQF6~dRbb8{!OaBAcT?B6GN zri2b7*;w&sRzl|*J_1=?sALxq9ofx>yU!i~J-vx8-oRHW;Rz3x?>_>!^fbO(G~|Eu zcY=l*0JgKI+SltNvAy(t9%c3%r6%_H^YBMr;2MEPwUpWw^RmE;jkSZ}Fd@rx(uVazCAV>P4y5|@-RXSQ;lh)wlp^O6uy|u@d27c|Xc>HHV+eK;SCOEc; zDf0^NBg(weHb*l+vtE&AW!DuTVTxg~K+})jc>^!BIIt9LWGzW5`kDrgxG=FWEZdXi z_{AA4R`W)e@=%5q_miw~Yt@6vBOP}Kq-+R5mHepGb0OM?nRfzc@VCzs8@^K#7c?_z ziecq^hev|LdS%Jxt_q22Q>?|lMLuKYl*2w+i2jr0f{&FRrp9Zjy~KM3zsiwOMF$3w z6Qv_DiDx=NRT4(l#DOhV^v^!UOO@3HWLGA6*(7_rtyA*l`X8M#Xx_*&mVNf2()YRj zYAQgUVVujZcy{MlIb*vD{qT49M1FO*0?Cu1cJ1)yg_?UyjvcQ7O`m{ds--%Mjge~u zj=^?pkrVJE75epc16`!0Cu+{%RgQvhhK*%vyxyYr=Qif|?QfKnaD~U+Q?G$UTADoG zR&UO7OKN((?aWI3@-s!R>ychN&;4BWx8$u`>llvIAC9uoSwc6r8sPm_zgy*5s`Gb2 ze~uKq$tTltE~5KS9^W4HiGSS$<8#SgBbJ|#A>{DoUVzfUG$((|>g!2J7P zhtY=+7su8>{(ZTj2F@!>{Ysj%SBge!Oex@ne80Ol%A<11*TUN@3>a?Xhr{NNEn;s zsICdq$K#@}XKN=+;p0=!+}b=RUT$^j4`62x-k(+G;|1u&NNTuygcCK0A@l^Q!uOPq zcU(K9;^1CKAWlMer@cUPK1U9pr?Sd8_I1PX9bCD@ezp@{c=X4idV8_7;{kWG2bXit z^Rx?!AK10C5D7$R6}Q2=vVgPwB?sWyGFa4&1pFr2C)Jy1`22w{K2WVL0k1-Z3j)I% zbu4xkOtpsO<}!kx6M)_cqc z);%lf5`)eCP0Je9G|+_O`HGkg)u*)@ z>pp5+V|ekYAmbCx)M`QcXfE1soO1OCXbB+tOG2ROu|KtoGxeC*&&bG!sq<%Nq$;bN z(dQQ_n{yR=zSl52boMqw9bsIx^9R|3*%?8TFQn-mr12ZrvC=FIs+w(koM$s!8r^~v z>`kmBTnRctk;t7gfpT(T;Kh+Hu+azLRf1yq^{?hjkgNC<2bG`$3mqFK_Om=xKC?N$@ndA zT8p5_pQp`u3Ore((+EWKSGNMjI@gX&&in@QJGI7m7F9wU3vf<(y@S8@8Xm*~s) zQ`mpl*e*~P7g|gZScwq7FhmQ^$oNFa`814nuSrU&48c|f7<~O8z#@J-fu~F!trcB; zJ8CS%-lDLLnQh^BJbDd2W0$rsq2R66`YfMU7V(8!yY&aVIh%;wTZt3_j+n{!c4%5r z0%ls6q&lV<=0~?yZ4;b^Z-MQTN6^i5{5kc?gqXM@fc4F$eUHKgtJsl9OHHxLm9AHo zeB-C;)p!xofyW*=A{pG(Qg~Paa}YlOE{q8z#6%8*W2>Ox+9enCpLEz_+f)d1%{37^ z9)cwG)&Rne>selH&%b$3#HP0ea4^%LUIL^5fk{P$QNFINfxI(PCEd%nO72RyY_I*a z^L|dSo(U<6eo`H-WD=Rra0_^{l_al*Sw3$V&MOx&yk>hSU}uj{=C8SAeA#RcYgOJQ z3`os1Q_>Wj#c83fpdB8-DCj#2}4u%16{rdjROzJ4bDeVk- z5S=iEi}YU~Gc`Nm%WDlb6JV!#C@)n_4%i_cd9Z_x`WUssZ`0&`bl8%T5kbVYxiEca zjv=xI1m%(FKaqaCh2UE#3xH33t3q#AD|v#K#|v26S6PQWz)O0=*_mu$bHn@Z?G6D! zk4T`gfoM-BUoR7zPqVM4YxzG}CXf#j|LYgHFbde1uA|!bZ+U=|9HIOZG$U!&301xI1^1dz@J_kEK*>YYP^R`pB{pK>yHa+i`1AOYicCd9^RXZ1;$w~VOvID>s zlBfKN3DX2%BmID|O`XRLJF|qXVs6VKKb#DWU|2eDJ9fOc?aULjm*d9QMB;XDh183l zd?QBmVB#XfDL&2)mwAZoS$EDp$4jn93J>vziO=>Mx%hl+#{(WelAsTilz22bh3^v* znDbR}i8^SlnlNp~<5FsnhEB4Qz`0z0joIs@+lC%EUVZ>)yI53v&+=Z9dE&nAk7EDMN9#CxTR{fpes7L2_N3S)h@RrceUq)Ns#Z|{6JTyDsgnsYCSIC5M5 zCy@rndLJ)b#c!UXW-ZIiL7Y68}a>jlR)J$i^Sm8otgrPS}nN!EF2v7iuRy z$#ZWCK!~FAS-PVDu6Dh4vjY!fgL!f+>?K#v!BOtSA$*MKtk0XW_*;bVuS`UICjn7=}P91 zLt&*3OIiUpm}ui=gwOSwe!=md&J{H&t|oN3_^;=y_N@a+pA^`{NO+Q24qOD5 zWC0wATVGzX#9F~FyN7`N#_e+jrMY@YBiB!wVu(=9l56~!ue(z&i%kt#4v;S}j%y{v zPyA9$|MKU6Ub~gA>i~h2%<{);f(r{UHpBW zG*TC6|Mg|H0(t?Dgff7DBaca9j)zJ3&RH1!(IA0=;TWA^I(PF?q3e#{YwM;I{5vrX z^~yhC{L|Yo2w5!s1gzYFEC1OwTtilf?pc^P3HM;0Urn!!yPkqWFE6*0cfD?&kp35o zp?$~Wq?bHjO#8jXeG~6^g1D7;Ggbclcsq-e(61CCSR&7C0Nh~~+Kmk5-;`&MdjG(w z@^*W|ndT-_fn*9+Xn`!xl?YvYk|CYF+tjM6#+2ja0>k`#n9 zFX?0-MNQI8K8tAt&J>+jb46f=zSI84imtQHvf@|8x4&na~aMi8D#rgS%5JZ*)eZ+o4( zQkq02NqXjpCmmOdycgWvfAc%0J#$K%F##33;`H>pl;@`K=|U=})HWt`{+ZxTA?`n! zS7@2M-zMOP6T^_e>yMt~Q16@DcTh3wpxiDdh%Nau>%Va}%(G;*kXZ(PDkhA*XQc^oZXkO;yi&@5=)e>8ACsO(gulyTE)M8JMrRDJl89x*xg0x|GbRXcTLd+NX}&r7U)piG87>8?q^ z{X6yZC}YP+u}es?HtoPaE@52RR~Nyu5R|p10XjjA{Pg#w{zi2ofQ(tm$gSlAVCh7t#P474N&=B;AQ9ScpCs135W#JkWe%t zH+v&NI0PhpNT%LMLSlkO&U2goXlf`6mk*2?m_kQ0Vvv9;QN+5SuXQl>WmAlX(xe82 zz_zC2sVpu%xRA_hg+O?xl6q^2LLoQlkpmCXZuGSXPLk!%OWWZRZ3FX#nhY+5L=GV6 zf2hK|fIh%Fmd5{3h5theV{GC7gDQ;igfXfx#unzL!TT>amP8e>#p42*nt_XF+D z{U2Bu?T)$f|AK}8TNTFe!vFuUFh&(-eyf1ti2oNU{2xyk0}JnE|G?PD|5Fv-%bxjv z!NM9OZ!xg&|CK8IA5yq7+n)pv4+9HhNaVeZng1(W7@aNnA6~f99^Hmfg+KmyYyaQ8 zFvc;)=)P!;|5Al9h_O8h1{Pl2tNcI1!tNw*F{mLkeSTVT?13A%!uvaG1Z;|6Ub# z7yNHn7{d$ymnw|Ibij#Z1cHG$Y=&H@K6z{+W}biqM43`79u53!$LxmUe-*I0@tRBF zDMXK)w5av_G%|@qjrk`P`d^P=w)N)9%?`^?oX3-MSXrhm{b~kYAaVX>bp*H!OyR-fm1%XzZ;_fc(TG)EyNKrrqp|B=S(^-p%@`edvUC8!+7}a3DZA zWj`ka?50Zys4&XFAZBbjoo)B~8IgMjEP;IN`IH_7_xptaBc5xPg2PB!D#dhKjU#`C zkq0WP{A!*ry785i1U2>bDZfgUn}*xD>TsKt3bRLV^D>=zYmIqblodGj;=7^@51JN* zC_J)fI|-;rCo*`pPz4 zO>i@#SBqA}AzMh7BSVIEx7=A?T%DJ6{N%=YHtyqhw4V;kdkVi<vz7=?Nb?dltH8by-NxcCOx;M&yfxK}k#=0x$EUl7efml=4dNtj#vj?9b256s zWVTgQ6DuwGC8yiqCgj@In_>^SOls|CNtk^$!no6F*q#*bwA~Ih*+kYV& zyyiVcrdBzrHQQEgzs!$S&6WC2QwS?uR=KfEekJ*6YcXI^s(+-^Gy9c#a-1t(oaOI0 z?eOOl5ebg8_lGCQPe+3`Dw&t}fZkfuHN~`2nJWj_9X5H#XIW|bO#~bSf&0t@CB{nr zeE*HBDi!vvCGkW-U%HL-iFL#Mx5#t_DdNNi7M22ni&+DTGzuv1rh&yl<965i*9s%X zqnCLdQBM>}eZ-1a$K&A=EZD7hPmzmDqsh z^F{)$LBuX4LyaJykCSwkd2UY98d$w4Ph4VzN8;e}Cs#@Hg`zVGke@or(J?Yh9qBpMZhKDh(l772K zw%FCqoE`V%#dY(ud*4)^5N?g+`Zw8Dp=^1m%!!p?&m7e&wOR8og9?{krNa5T;a3I%Q~1O7Oa7fe}TbGb|jdSAcpsFwfm)>O77e@A}L z_^3)3L3N#ekN-)&6hG%Z^>}G%$N?pO8%Kf$1xHqEwOvfbT#8s+A~g<)GUufM?pxL~xfT)Q`Z=a=~5$>MUIQoRm%9H%FnZ zgN0QPzwWq+r*R6K%!~%77AQz!j6=u%zId!rNNTS%U{o(c<2p}3{U$*jVnK7mPqkJ)pU4oSz*hepuTbXJ(VUW+^z+-# z4r#~hZ1}FrJ$L+dz%WS7j>09Vqg||SDy2Yp*a^hZH(mTL68ANv)>-cOvuME8BOjMh z=~=a2g8C*bnGOReM|$dlITFNp&?h}Infc?N7E_XDgQct8$J;o!;%OPnu%Yq|-IWuT zew@#yNGB60$SLxdlG=_3u2~P$6S)VMS4cbs%F`_(wy#g|Aa#nJ9rG%qa|;YcfvWJw zv;-RQuE`#jyY@9dm!GLiu4j?@wCS>#IXv1iT_H{+1D1F{0JDs?X^$fT#c{%Y!5o|t zU5RlvQ_KwHd9R=HSpfX|?148hd+|`eX(YGC;}~j=lq2}!jiG_aMs9pgZs+_ zd+RfY$4O6X-8xNuyRTlyf9ZU-n`!gc(U^6^R3K6#t9zu)U(e~^C0)}WOgELAsis=> zIc=^I$BhPaXtASk^ZayDB5(PRQpkI6MLIk|EZBz3w=2A$^B=_fziH*Z4maG2?wdsJ z?FSI|!h#~-=>9zn`i$)Z2b3Ipr2?nCPtH;Bhq4!s{}5GwA`r@{xp?u|>t=oZ=h+k1 z^AtHKv{AQ;EIks(dM=4(G;j#5C5=DOSuVHZDOs$u!pNK`r(dWg?Y|&z>RBqXg{M2cCYZy)u*_8faiP zrea*35dSmbBd&UrJW2gNd(9lPBA0;B7$4-0FQSrzMxXU<8SK*y&&qcmu&@zj2J}H* zMrNLDZIIbq#GN-tGjPw8GuoOyLpU2mnwup&1r~dUYXZz*F|a2YFg4*EOlk0E+zKXj z@h4CE4AnY_=^PCsnUmdEA{MAn`MyuQAufjpfFkkYDEk1YT;j`FVt*K}3n0SLCB1hO z@_bR-2${Y+OMID5ypv9R*q9cI2R%fBE_~8(09bd+02hS8wLS4omdaHYF(E9L9QEX0 z;@Pc4tcxMQ1t!OWpGoMH>HaW;JVO$@I*=@3Lvi{D8hmWUOLQbkzP#O4LEle2A z^PO}cfq~pXP1`pWzf`6t8{TqBE%QCZtBmWHY{J&bTbnNrNZb+ z+}l{dUv$KOte z7H%G30)U~w*9On7t6s(4Ml3oYWh!HTQiJ9b3tV=H-&d-4wB%ds(XchisEd(8cC=XJ zg<3_VAe7QmZ9Jb#WmMl5FRe9D;f}kh>MLIDwJ>w2;dq@IuN5(bh7fUx9SZbt0H=Uc+ zGsxk@t4vtqiGb~uaHhtL4OQFq{8u=$P-zr^1c}@>_7*e)KmpLdOs^zX0QSozOW3&5 zfY;X##%7Bm&%hj+ysoeA(_`_NUfmcQ0P~3PjIlzgvlZ{bIL=t?C0Kg_SnNnF{XVde zdI=6f1=0tIl7cP<)ZG58b?*agh+y59IVtl;ExUrz;&R*u}&-a|AXPq~g3jNOwe1fZF0-1(R5n4Bpr zhy>GPWdgNj95V}~Vw<=NzqzJeM}wu2-s_2A^1`g!gN$e~sEJf_(>UnIJ)v}8!R|x; zt7{PM4uaE-39CL`#~TGYxF$HdetkRyK1U)Uv#);KH_6~2d(&IoH;Vwb2B+AW?tM)+ z2EK8DV$Ct{xZ8{=mNb8Umsydb;h%4F%wRTXH!T|oU^Oxko7Wp}3)UB<N z)E`r{aHyzw;0Ce#U@`c-P*(-1y$pcNLR(gdtqF7h#yEZIACfx3v-@7CXI?HP5HTc@ zvINpwQfx2&?9TLctD8ZtsQ3C|&StjCO^CsggIUy1fDiojk(q%=j*1J4z#y*}hAcca z$TVE(kcL4S4~sS3yC8j_UU=zfT~3J$aHr%2T?zOcmc8GqqgeOC8->mEu%bPrF6T%K z9Y$20&6f0PlzfuJ+Ut80^b26)`Yc*i-&M#?N=iSpE|M&kGUcTasi31Z&iiMvrrXQ! zk%j29HcEpLJ{KHQhg+CuQ?I=(uM?SM4|~7NFSUbhtU6Tfbt#wu`2u6Pt1J(Thd7P0o-@G zp;ap7$5;w5 z(Wva7w~=>ar!`go)n5^qEdzIn8Ugg4Yg=&YxTh0;hZEnyM?6*y=*>FG;mtevI&n_O z2|mwD$?2GU>G-hS9QB1A~u&N9`-ce^*KvR?GNxDDHIc36<8| z&_|t)t43B#i*yXDnAH`y?+icE+GCB+0t@Zb^i(fW2 zUd|p!Hx(R>Zi{5?-vVGTZ)Ltr@Lq%{J?IP{`sdu>k7dajvU2;HP%UJ|Hyi{uw#9+r zk~3jV@?l*xPEpJPCchHzl*9w>W65WUZN|QPU`9<5uUz?^ALnmXcIA9qs=lH^J^8m~ zu~N-fyr{cUEz+|kR=g!iye+Y@{q*510zL|J)MqRqQzP;Z&XP_cqqi=*40>Q;t(~VK zl^4T|4a^K!IyykT00ZnLU>PJaXEF4j=mJsgCmbnMx97GSrrlhxO~cg1u_9|wt#Vh> zED*A9u@doX{S8Z(4OC_L$$doU@9H>}G+kw$Jj^{8@&;1q#Xe%2B)R&_B;?4EQ))|YX7xYhpr_=CWvxRz&Bc?N=ITgykbJ`lRF?}gxl83!(V#Sm>#nfc*U_6?axWH1Y!dP{q#X=9C%iX}b#fpnVdjl7?Tl{k zy7{@)y0#JXGYj{%N{n%d2zx@Va;E+JF1+5X+@7u*^8N3s7v$!hhSFYpOc&&jhrV-W zxls&t*5!b$(;V+2R$;ZTdUV9oi##;0#9kb+dtLoDzaoP@lX!9TSh6%Ow`Ag9BAc1_ z`uiLbk_0{4%8}yOo7)VL#DXV>*Y=}X(lj^9k8jrZub&@n80%)Osb61vm{2tf4^l=6 zH?wY)?>I8^O&STTN-=83BLY7qJAZ@u`%hj74BP@#0X=4?RbN~1w|&4CPLD~?PA?Gm zOA05MiS${!`4=?bmQEkE??u|eSzL>at7~qAy)GqPp3IzE^8GsX2#l`2kG9Ty@hhwB z)BUJGQX)DFr}4F5FV^)Y@w?|ot=30xH-2|N9F2|tCPSS>qz-p&+?;dYn14Gl%r9ZX zhw4C2)a9-xdj5Pnyou%bIBxTI{Pinq^_?MVbt5JFqI%JCd68y$3WD&7)f+eO{#@)P z|LW@1kIO|iwq`CefC zW8ls0dfio?BCHB3UKoSyD6djffb{ozVYu}uh44BdWNxElY`$+1Q9pR?u8tchUcUTy9 zF}-}x*5}t**Zg5v>W8%cS*oxnAZ#eZm(6s2g+U$>mtdx$hVy<}kp~@}Sh&ox2*%7` zpZGmiy!OsQ2N32Zgyv|3ZxeC1lnLQ-;nykfRTaoa_Z2k|_#7&bMY3d6Ho=o!s}l)= zNvm^e{cs-yvo##>YqMh%Cf-n)P526DbJ*?Xyifg#qBlM%z%Z6@k`n=fRYl+v0`tR? zc=r3ul8HX1<}zHtr*L59JeTm5)*Kf(Ilc(9@MtunbTAPk&u2aWJ}-i38pb;jQ?2Wt z-ciav=GDP0G)3aCm;&TsdLnk6cdXNKoM(XOR43&Un9rn2pP5&CO1V&uqpf@{b?&hp zFL@}nAYz=XCW zRJDzodh$0rFM2E#jxLAvymeXgorH*gb^GuN_0^1DO5DnS{qN$c`?~TY>(DEiARDiR z>7a)wphocaSo;Q7KQ?}A1`}f(KUW2igx<>(D7umU9YVaAQ4%dKwuy`;-a4e-5&!BU z!9pU^$mD>gjHO|mM5azfLA(~321W#OBSET!2+cT%Lt`00tfJ!sHZ;M=Fd8C_JQd9S zo>>imRy3LsNIhmXrh_;nOnlfcOEEmr^t|FX#&t($iBy@moK)00SoAxwB%C(pF{ypxO%q0J{@)>4lBz$cB*;+9g z{hR)B&d5f_%MkyX{^pAjlsItJ%w{cMR@4oE8@)163Sfk*kuwrX;nhZsc{Q>;FydKr zmjZab65ar~trJEWh(%^q-Uc((mSF9Yx4=_GrfvVlNv51(>C96oP664r^ai8KD6fzp z@vTE-beSVpq*#4PFED%>q(-vxo9L=-yhvU5d``vi%ee@zPahVPLWjq^aGyn)bWXP^J8k#FWb@KwMmcpK0Ru2dHT&ok2PPx&eN`A zXw}6TZJ|U$j(hu*Q0WI&tU6k9%U3#&21k%RUEYCbQ-tgzvmQyKjhznYp;f#wQbZ^{ zavCs(g-G<9@$wr;W->Ije=M6eEoW=&&{_NR8&pcq&#WXcrpDo&xrrE zVTp|R6f;<(pVtN}S&j%XZitSp|CFPYTpqe!Ilrys%s_577rwr8yGP5NnIfrwVprRk zQ1VU$%w5V^#W{*J`JKgr{J2V{POUu1tHVWQeYQtbDMoOV@UdIj);OW8Q_i0M zAl*RxSY|P|kEJl0$U0J%P|X%W$3>BdxS}R>DZ!>s?@uPmlFNR$Z3T#rnd*|3%k5(M zg%2qZfrN$2fZcF{?W{=fz+Kz9Z}F=maurHwv+r-ea4`g@7L<0 zG#?&xi-vU=45i3G^{xmvQC^XRgoV^dsqm9}s@!g^c8GCC>^K>72w5HXwIMNUA-PL6 zi#tNw(V?m4NR=ESWzt*=dFPd4NZC(5yDH%YybC^cAD2(X=i0@3wPMda zoUrYEHU3?e>#`5gCuoz5Q92tUB=ZopoYI={j zCxk9Pj|}^*=H*@kB0qnAEk*$7Gj@Zs3w5BJo^c!H#p?QO^I{S6AX9(FTx-$JI^vW` zEVkS)kGi*gCD$fY%!CC@VnO(wH2>0#vOi(?^I(dT;47M9)z1X}b z(&=?r zF_am)cQvU+XRpLnZFhlgx-DHvF`l@g4^-}-y~IL?#!Ng!ca`c$S!{yQHjF~Yee}Ut z=k_fRC8Hq3rQZ8%xD$jc(n11(`qdV@iE|*&=7^{QAFRRLe6!L|Fi?-Qz{1LieTlySodQK zFF%~sO|F*OSNO_RG<qgwdfbb^N%)4sa;6Xf-|5jSap{xRrv;uU zsmuhbG)IWI^`6^)>0R&Z)M3Ui%c26(ryg%7tS|Sr9i|*8k^sMa2uHCRUC6qc!81tU z@kc3Vb-l*qeY%kx8FCCl0x zhR6?apBQ6NK_#TU~gL&ts!=puBgjR`EB!qWVRCJ(cq)zr)1`hTu<8s%*zq= zijgcrrjnvx2)Y?t==6(Hf`LNbb-W!%ir!tyZXnj3gdAKzQvQYTBrI!PpMt-hs38A| z?VpbciV8g0BH76j4>+OO>@klE^dt%*dE|H@wFKojQ}Hb=U8!U7rv4nKiU7atD(?Ux zZ?;iNeahtJM52TEUra-g;Mm)3O2(h1&zBQJOXN}yh<*N~royC~S<<4g;l@ox!)5W$ zl;j8L5=R7b@(HWcjl4Eg zsF8lH$_@DDlX^CWtLXtdgXL_(QI6{4(SEG;^o4Ilay+n<@JN(I`T$n`aSTaVgEeVA z_(@54&C4{>54f#w*74GC94NK0h580l-+ifyy3{byQwAA|efDcgh4nS=BwRG6HWX=5 z{}Ef8r8oJ_*E%(oiHh#-hUm$wVVcs@L}|Ry#GXf*Td%m%UdVaU6Yv@r*Nau_f z6`E0`j%pAa@u~5!ipJKqyC*mQ;MM$&P$u9LItL89SdbLA@DlyiAk^;bE~UGMmurtx z^wrZn7-7qWwy2!Ut4wmmoE>37@JQXWi6Z?QqF8BP@yrP4)2v?skYC~+o#U6aj({ih zXdp9;$msid^6_BwuOx!yqNZKxjma|JE?F{-gKg)g8m*+2?YSt&d z%wE%w97GmOAkoKB=!U}vH|ddi1c(L}Pe9F0L)|*n@kQ;F9D4plb-DxC2&jXhAEmRq z5TziDm^2+}kP1NhzI={X2=L&p z4&x(GU*5zM(H5of(>g2>+%b&rbO5*V{6eCz9U*h%N5d!KJI|Ld~w`QReU4@*9a7Cy68$4G=iajSD6) zrGEgH1XTQ}Ua3q@SDalcVRH3|Wm^v$okVuKTjyXEzh2A7nTRqaXN{_dW>K~FSM$x8 z7F8)#ry~3z{Jb6t{V&MsTrL&Gl?!R7h&oIOk0Nhv-JZ3A#RasUl zQKw#^t0Cc;kT!6D#ZWa@%Y&6nPP5Yn9Igh?dKH*7c93nZV7pb)DkqA=nM&Q8n+FF^ zD^hMG5-hLr}PMjac~UL{FdbC*}3_e6Ux) zRaNcT{`pbXOtGqE;VFx~;5ZiRz7MhPGcjO7DWY2tH;hu$vAH_1UDt^!6}~pqwnQ72 z3OugwmfS5K9K`Qw2mV9q{X?pcPZlS)$0Zproev9w*dJcI0@9lqPY19{&01f(HUOJx z5J#`~B2nT80I@!52v@6PP;S zyWl|8;sYAvjXFyEKA?=!;{(P3!3nqojgbTh#dpY0Z+>Rr%O|}-CKag=(76DfVm4F) z#B{yHla(+K`Q|So%TAUxlSSjxsbP2J@_-h)fNZWBV)3q~u@B00aiO0Kqw8&C{vW#T zI;f2|>>GU&JOmP)U=8jRcL^>7-dEc3xoojY>vblHi$7b*Q^S#oiFH+4~6)Yq6$?#&T$q7x1q_UAYKc=!o zJda9tcyD&6mOoTxXA0+7!Qi>5oo5xx^=t)5vt26jgo9z_k{+_xU$GRSFEfv@-C{*@ zp;4^+yqL=6;U8E_p(t7bV!a+Lm|P)>b%64!prfu{JE;9YC3`(PYG5A;@XMtm8XmWH zVHHnM>n3F2$IylX4;KJ;5!m2z(fG*}Rk}*5La?wuQ8pF0<`5`@Wht2VET0EA`6rZO zvGQNmTXC~}!&V_qh9Q~^uTxBxv|yz~+m8$?GVHc*s^-=Nj67rRcSN0*uvX|fo|0c$ zeTMahU#s12Q#d;~UEizUR*#m$vQSzloSE)us6YL8fdywp%{3!xDjY5g%jf+3WWNG* z;U2f38c;$qZ(3-QQZrkmxWdT{< zbFw`?T+{+UH#QlzlUXK__1OD)MSWGie^TjHQgJ9nX+dV;hH8gB7u*Hq(Jkxm+zgII zn#{?j9^R+5=i}i{nqNeUgJwv1luuxkg|c){ zz08C?;v!Z)dj1`({QQ!rty)+8X|pNLm@Xn`rM>xsdf8*5u>y`#To>tl{Q0VHktxT% zY>`o}XKkO({RW+Pb!FW)c$Y`V$%RREf2j$8U#N|0X z5BF3|Ok}9ax^5D3&_5$G5;Ieht2_WWo0R#tPfreTLLCW^U_C!!zKZ7;FF8#+fYY0| z#ItdXUJQ1)Z;Fpjs5J7oPf)C1#MeKl{bRV$@r)5MV{9`v{TK2WpFe|lQF?TDEAj82 zv9$76>6LV*mh>`pTW^4b%xOt&utp5bsatOFiS3cXLU3^kiEk+$&;J!Co$*ScJA_ z43*z5O&`BzOeg7A(xU7gopMy@*J|s~r9li4xnwmt8~8<3Top^3EW!qf0ft_3T=a&T z0zjnD8&REDJpgd^ksGI^^%-nX4d+3jr-lC^0*ZJ{((+d6+;QMZ(5(iBa_bjb$xpt| zvD#VPj($Z)VyAP|9iaB6QtCDgK-K~nC{|k1_Re>B{StI6JJ5JnYGjD!j$9ee>dbq! zY+NJua=Sr;ie$##w{9N6Dy;SNNsaM!`S&mPl)iNh{EbkTWe<%EaeygY9Uo9e8@)gY z4t}SE(~ek2h{vRAs6_J!#tf6*_Sn{e%K6W0lFWa?U#A)sJ0f*jgAcaVU=g^SLl+TyXpEq_u*q5-gK3NQRWQg zAxj%)m$IaVY=27yJ{4$}d+8%8e73#%*W<}&;l!3G;DZYlevgWnMY6i8Z!)N;M- zZEQgv(t{|gI^ZHD?_|rMg?tW{nAHc1i6K#0L17_Y8_t7NpnlZQU6u)0x{_W-;*m-B zRCy&mZ$WmB5+{0I-QuIlWJ^PQ9!7Thv;*Uz62GW8WHUgWRimnVpMl*ww^g^gQ( z*W=bf3D*jP{}SsvUMv*s{@iJ~*3EqGeZT*V>+E)qZ>p_79`sRZjYzAIzph5^hSwIr zDo*njsexck<6upINtRXf!%TQqv9KEL}KOx=#k>3!?VzuI7HU~250pCzD>b?JBDYdn& z-b%IMZ$i>jM3+_0V}y@?{}#Llq+L}#qE1qSerF&ive{M#s#uH9cbJAna1R~L#anr# zb&S^dq$Kg(*LqaiQJW2*#H9NcR2^KUr=_ai*D8@;}vY3UQozF^&{|+SK6?k z61(24<2;P-r=sAGynmM4g)qjOj5c@%buJ`~V0d zF>|B%h7IO;ARNn_mg#A(N8!iD_L^+L|9M2W*(EB8NI?WjUnQU`4OWTXi#wb#tc#GDF`{l&eLX7je+CjKRpH zXdJPMoKiI5&*|iHmr}lnBO z+ckfleLdq^oF}1>Q8RPjHvkvB^*a}-P{5tIC}mFhKR2o&s?^gQE*{$_F~;;wJIjXK zAv!wsYUu!MrI)nPhg0kvSNh64Fep!-Bfn&5oPzS%+t7KLJTP33WFw$FE<=ukcNaiA0nUWM0}1vMBN!vg2HgdT?&ZT?BDn6b4FNji+N5(&As{ z(I=4?+#%05KoZd&>s-}zA04=Y_*fE2L9e)+oqhitM$^Z&{Z5#L=Vr%5}sYq9L_)5T2>#q#(*|Nw2FKS8kiIneWMM`I{6v zZxR&(+oIaOB0#QTHQjgmbESgSSWs)~BZh6c8`{f{GUs!CiG_XPu)1J$+8@yzI%^ps z%~=8%Z&iarQ*$+hNXt)TV{25zr$|c-G_$&h`uyq|SUd!rz#s7-ws{N@&m$;L;>mKW zSqBT4Hoee;zh3=<}Gc@JUsZ?<_0B$WH$&^u5Vb;IwJiTa%_kMd^QfZ_sB(vFK;u2n3}>cPAM2u8 z5wQpNPVobGnk&Du*!#iXVO*3UQiCMh2a()%Wi$)38E5_4nY&7|M?5pSHyhPU3Zx&w zx~0Csm*~_Kdam(7YfakT$A^#L?#v8#IAj%@LiUz!5l;Kb`PK-Br4D`i@3d#%W2@^}s zNQ89D1eED^3@kc_e=033``&qj@{0ZFvamj;!QsB;YPUKlMJBlQwN>fZh%tDQva7c@ z@u`Gl;45M|oQ)HEndhHRlCpw*=qs<4En^Sfxe=w_4JmoW1)kJ@{%r$p`y~Q{aP^@k+{Z zPaJ3Zk=AWsl@70EN1^iy;os$RS5PCHbxc+0Godpc|$(qypI_H*=QoISce z)p!O+;fdw9N7l{ih0KuCenZCiL-lJ&f#McN)--)H!^#Evu7GinbgIgVHtA4y?V~iZ zucPGDGd`gRF!lS7q1)h_IYOuaDU}yB@R-hDOaJrLeCgYyFQIH+*s;w~#vXxXxJ*1v zsrIqHg-`w5DJ~u(O|N6Yc_=|jAFhwVQt0?2n6`93vwbKir8z5bEP3n*Q{?n>%r~GJ z*@nb2Yy+?YCMzo@cXsH48Ov-BI^oV1Enc{87Sy z+@&O*GqC`Wcwx!>$?Jp1>j31G4{{qFrxRtgUTzw^q%jfQOy~Q2FC6I9AcN;yOD8Qi z1X^JGYtoq3N{>iPy)X-yzfL+TNtml_9~iz=;KMQTLf4tL{vf4fnd1RI?*8B19K$hf z^N~GVGCs|>EJa_2oyusV z^43_o#ck13N)m-;%6+7@PgQ?{1|sS$GSXiM*S-_(8C;TeZu$8&6g76^y~i zG)n}p<^rduNn*-_Gu6fyl)h7PGu2Dg&)=Xp>)6S_=xcVHD^ZgcH#yUb>U+(Sc$d91 zJs>aWGgio|@pa+we!gPdw(8r#md@kO__;PGldTv4h5n6p6*_R$hzpT6P>8E$L6C># z@t6C%Ic1qd_(Q|9+=XZ%18g%WTK(6`#si!XFJMt_6vq=W+>e8!UG451G`58$HK3F3*$+f z@YEuMU%g+e;s>dlJVGs|9hdVHDerfZ>YBQPIcj>H=+#W)U(L~_``ftqFMHD2A$(JSW~Q;Qew_4h-*n=CaI@!e^7 zQ#tDD!%6SxoVPOOxy)!nDt5f4vrGDkzU61#*eLdgXSznX2jRP!qiXI=@ z{N}gYOS`ZaE&H0NBKTZ=b=pURt<3d>*5eWe<5P<-qw$qQeXjjfqECG{NJg~No;FjgdYS%}-6(bIHs$RAe1%mh+x?N!`qv}@G%@uVK3lMl^~j^`~RcZ1eP7)Eg0b};q5FKgyz(cAP@2u{2z@?P5{{iicJ97&IX+SQS6!$0&d2| z;v@vgn{hC-#sL9gqhSaCi?IK*)CLg*hmC`G%)!wFyNrwF+(Q4q(mFOa2p3CG%LWHq z|6%L@h&H-o4vi*wZi4D2sO!;=8iLIJUv+)jQS!g)`agbMG73M9fCr7jM^g$G5zN9S;JCAge90-o;35hU>I(}NQ9oWa~d$y~=f99pm$esBsu zXoh#3{mhw5RCP~s00Caqn!=VC8y}q8g$VA)m0PlH@YO^ zKT(a2{a@Z)gC@}G4g&8!MRy3o2z#^v4DL-p>;%R=x<%mKwaDrd& zFn}8vz&hrdoe8iT1_Ka;b@S=gX~$OcDV!j!n@>yNB_;6FQvz&1#g#OV622s1q$Tjt z(^K3Q?vyZCLV<3E!%pF_=A5}$IBpJCGKbrm!=Z6-*c==-S|ZqtD8<1;6{HMSVVB|1DVL%Q$Anzd52C+CZg2N`< zcyvigGg_hsjc!JhpQ8UqVCNXjq5tF8&7)g{Gftb)%{ixn8t`Vg#3@{2j&Ou_yx|7kunvO2es?NJKhyHoO09665s;D1f_e-vAg)7b#_ZVonw z`~RD4g2pD8>>zJ50>~z?Yy#RQXl#PXCdh0>19E4yAc18^cq=;p_mfr(LQ6yh33~sx z|4(CoqF~lL1E@!m5;V3R3Nai_MPXof=)XG{M?}YBhoIR-lCt0OgLIz()S|(Xl3FXK zRe&eVRAxN-Fdm~^ITDL+^7D@R(c%G;!C~31(?tp-D}NO(Dp18RceEWj!zUda7YTF6 z%B7q6bDOZ=tf6MwLiyIEMf3(T)l1FF3LMu0@3~D|EKkJ}1+%@;Boxo&*~tt1KRgv$ z;?N6wFBmfb0z=tLWZcyAD0rb8wi&JVuc0Ki44-W{-Quz+h5rdy@Vr|z2=G$%&ljAU zA#2ciXxAp~QsjC2rzIdl&^j$o_tdXZ!ga9x72Pep2ZLicxU5*UM&hH8v78>u`!^4T z;F3-;h*q&O!174^!`7F2@bb?UY=Xn ztE4>3@HzE|ED>bHyqqp%IyG+{nI$baz5cKx$}QPt`SBonzFHLOK%p+fgD6XYKIN}# z4lIUc@^I%d&%Ynmj}c=!)hU7J`?sQne`hB@V6w)jKaj#8%e^Q$-5qp9Y2)TIGish; zBJJbqQ2AD^dnFNIQNHXj+0v`0X1uvPwHljI-&PC|U&EN4{gZwjSlAt`18?L9#I)odsWa@F(B|L#;;*gbtDQs;*^;G@F$ zHX)}*s7k2gQ;UT$Yd;~H#74vV35=%DKAZR(MU%MP3nriQ5u4BmNp+;z#Q@ zfH8uNhGpL`xqJ^4$a2@Pr8)P!ey<)$PQ}xHsz|JDO`z-7Bm~tp$Bv#9g50Nt3wM8O z$j0q5JN4j|k#{h?C+9fs82axcAA9?ln45!~D(TW~EuQtdH3Sh)2|A?t)EM>ji2)4? z(@3vh@~xS>sI4u4LhV=8h%)b&VFU|rXm_`yc#D3E9k4&SqMrKpPt$pUkHv>N!35?G zUD&!g)`eYBO+C@oPt%>q7hc0tM>0zyB1ZBHeul+I>}N0IBqwr)kT6Ne1_XG0_cayQ zJc8+B!n&aYOQMGbb*5m613&c!T#0csV4}d{SRiGnIykWh{&Y5Q6S~Bo=o?@KawduBm`fRq4(`(GPtt36z*Yv`ZVO%91DjU@E@%>Q|9Z`? zRuZ2{cIpOga^3oMc9kK^c%}&w=VrhB*st=t(VH0Vtj@@#Bkw11$6N&VYyLo2vok5v zCzv~In{Vj%u}+XqrLzm)B;j*YAF0z+hs+9 znf3REyB%)QPe0FqrI#8Pmm5gD5HT!uNbo#oo!IK-o3bGv0dWO%W^@mH#dG;?B25vg z>jm%1hOW!cENYb5fkMsMp+XK}y@WJ~ZW36_b606Qnf4CDWKz1JnGz-*sl`XScUm3( zh1yL5y)u?3VR*}lo@nvG;`de;T$QV@8qbjp@&=uVzMl5E@eeK#S#4-LS)2e_OZKjD zevg;_wyF374yiN9ZLm {g^`)L!fqBfpwOl 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§{`nq8jPQo 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

wbmNIOIR_DN36%w1z&2(n=B2RGn8y69Drfyz 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 (Y}FH?MSXUZPY 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

A_L7-d^$}BLbculD9dihz5$3;e~ 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

9~Xe98ds|jz=lm*wu@(DHeF- z3;{)fCysP=UqJBT772U^kOm$v^*D3*;lD*||{8WWb)D$kMk3AJ4vX`(nIpyYilyhQ1 zlz&}C30@7a>;Le^fU$atC>hz%|Kg1?U;N`s>U|AA$o|IKx0mwkj`H~qiL#G0XRdH1 zm#e(=Pl%0w{Na3m2cs_0L6#TTsIGk7lI6W|DQeYNPpLR(?h2+Kzgq9BpKU$1kGq4O zX%STK4EVE;c!i$%&!hRYBl-X!?c@JHn*aYF&4-ntVE^Aenokb^)6@Tpx#-ZI6LKs7 zL7);q=>PnQfks0B5QvNj1c&(>yU;|--x!5vENBp=rRCq=1uX)jF&7$k!C+7{_(B6N zH1Z-Ng8EPOLNhV{Q}y!yBri1SLSrs8?2-^fq%jwoqWDL;;EA|@VV8sdfn5&%!7emq z^DpT_`CmwvgnXKRSwNv85@;GGe_@kmTxdw;-{ghnUH)HV7aEii3BoF&(KPZx^DgPc zbQ*l20hIqzF9!$z1z#vM^71eBLLuW1D0ngjPodx=C^Y-hf>Xki6YvKK`Q(HDP%jbx z314XH1%ioyV5ksG7X(H#Bwc^27aDn?!50|y-`HjF0DmyHc|cP>O8J8asDDWpngqiC z59#u^3i=1TbS-TDr+4`WyPzO27zRTQg3#2?-{ge~lYvFZ4AQPKK`0o63WLBRAcM4P z%s<8je?V>_=KmvI{-?}^rd4RnrR!jG5T&$$S1Lm(1!1T`G_Qi`qDdDl?QZ0kwY2a|NG2kvRHV@b89@6fmKwzvZrA( z9V%-PdneU%=aA?-U#0SG{Y6fH z+v7S}H#Yh{c~BdRu?mk`uAvOB#rTTgNpBgVu*19;Fk+@a8Iq0JbuKcD{$SDPzfvtA z>-b@PC?=9H@filG(1wdH<^nEW^thYwhxrqfy=VL0rQ^+|cZz9jV;P|LwHC6M$a0~O!MIj_kjl_zJM~Mi2-xQA7cZEs7)A% z31tJwVnoj>H8KirA?b3%@|}1>b@O3$N$r-t?pd79Fd$gZD2x$&`{e3Xc9C5qh5@d) zlM))|6D`CfTi}}#tnNjkuseC1OeARQnE+uK6F^glNHz+{uN&|CDuyYp?SjWK(}3QtBrYCnXtcwiCH4{nme!*IumMyUtU3x{cq@kJbH# z^6C{C5{R2-lYAZlS8sOkyocnz7O()8eAQSpPwV(S*RLvK8w|P1-Iv`OU3D?c%hc5) zCir!|fmGDq8q)9OM8#cFKGN}S7+8)mP30vC!X-l}yYFfxW9%?#rG`|R;?yq32%w5r z-i~Vy?p>S_zFB_LCDe_R(@?DC!y?3h()9Tex4aSNy!ZfpzkwJe9sWpMKCBO@97;c6 zW5e)r5hFZh2nYSw3!c!w$8`X}2>_w%{@1up^NRmXF#gLfD*Y#4M9aWVSJ5=V2!X(8 zLpx0{qR}V}Mo9z)!Q*kXVgB2%WMEV( zD!q$#!KKp%JSqx@L8p`RaWLBVH&HP1AUPc$fhS{WPLen_HnzICiIxH6r>B2If5ZLD zJmLoPH>o(<2#FgULs7?2gGAKe*kB6^1yky3!Qs&OK`L&LcC-0|sQf`3aS%lu9Hfv} z7govSGTMnbC^RuYVUU`TkAe|#)B`LPPa6ytu#^P~r7S%{Nl7W4vO0KBwn@o{eGB|7ap-?y&ZHFp?M^h5UC|EKU4WUL*C<)Yq7795+X^=`= zIX#_vkbcl|fQ_I%3Tfm0=D}t{0&QPI6O1CKR2&2XK*MN)5fg+*CnU%uBq#;pA+&-2 z^Z*?}ghb#WXc^SM?P3s4CI}}&&agCu$szqn@6D?kQ=7@FUPAUu%+l02g` zUbL;3#t+4M`yUb~Q<1uYa>H`o=+Vvl-^53zMvbxFXwwW$-vi|^h z+Vi$Nx!_>)ZanZ8GQYrnYl7pusQT|1#jWWqA@k@*h=Y|TEMIh_8EV_D>b#TQ2W)A$ z!F8qcpP*VxQtuwh)GlP82@{rm>TPx1W6u=~)?;FzYH>pvi>X%EFuFD|ong;o@~*M{ zA*&iTfd-ko%ymR(2QV(s)0p?`+H1fsbF$y`bpP1I`DT2J?oMi-*p0rr*(wN+H~TsL zKtssn_()^%oCm#dN@~veLt`(X_^_}Cv)*uhIvibDskdg-PRMB1k#5Y&ae;_rN~rJG zXECsyRM5`1d(-GVk}~6ZY4gXk+9aigTbrTddr|@kZ;#AM3=uCKT}n15%62a^a-xK- zB@;8mqp;{K+kBjRG;hiF_E3w#m)Nhn`fkh;8t$aAVOrCojyuy6rYd# z%jr#w(F4dEx0q$dvIM)#Jy@907?N0<2woIX_b6HxZfRC*_w>lIyiRDXxXz>BE}~u; zkkwF#4QQ**^naVyf;}bhSpR0lx?O8)iIXZ#T7LKZT5{veW>coZ7r(kDfkU{jG|9fM zukDBU%c$T7x0d=oFh!2*n9IM%+iV8p$=jP`_zF3{!J0Q2FxT!qk5m2WTQYp#wzDev z$C$&Xeo1-4lL7EjkVhY-c))gIR$#RI{s$L^kK;R`6^aJ0bEn2Fk>4`q4Zx9_o~>-Y z__tXN-D}%v@Cw(r4~09Oy|SCm#C}dk1in*FFQK-PCf5vPIj*rJJUi~^@@uXiN#R&{7aW$oPj)cAU5MqcL%i`?RJPud&qTY2E8iSE`HJoL0S zh)pk-c7CW8QseweKMk*d2-zKvgc^Ax=AjjHKj%3{VQKWWkr7#}qt9)Okx^#V!tDbZ z(lY*X<#+40Li;1*o#sL;H>h_Xh<*1#3(UriKj8gzF=Vab!G8w_W!HQ$UE`mkA`EG0Da=d37S&a#vENdtpry@AI*EZa+3#x@|CUm>ze z!+jX2vt_{7yY*7xG+xSx??WS>y!{gNs6N6 zs}0OG1J;+G>YjYJt9u_zOuTM36SYBd4osb8==C*CQU2sV|GCYLlh;JS>+_|Lb8XsU z%GbdS7*K3c3iGH4P{&`tdE`q2i;WAYbjJXE)+T_}>kO#0Te;dn-xrCtWyG^IAU0-Y z;De;)t6b$EaZ8KV`zwmr9q6@O`gYxhGhBs~&W@0DZ+}jF)k=G@x-Nc!RMu){DYz93 z`^fKXT}p1!+9f@D>y95`emWe;dM1Ly%#}6O@y@cZOr$QJKxuq-PhHI>Wsu2Hb;B{c z5ZRmQv+Kbc?OeOpFH!mPK8HOlnRCmt{B`?O+H6CL`@7Fjak`=<2a?ZqJKw>r-rVc@MWgiQV%rzS0hj8d@rh*=$}KII+~Di@OF*_T zH*wu**6Fyj*loMqsIY$XvY5+A0gm3?EGX;J>2YhW?OMlAJGRq`ZzTXl2>UH)vKa`l z0}iO?$YDxn$q!oQu5%7i0oy*58<>(c-z49D);^Q#uJ!(3g zKaq$2HKhY%5HBIJ$Gw=?x>Of`+kXx(E7#xmVnO58;39L*1(!J=zkvd+$8YB#O5OQq?t1hzQJzqeFRmvf$d z_dlp8;@|O79ob#xzGov>yDdS|i*@vKKZo<%RLx|@IGg&_BWD}d@J>3;72avC zaYKoA;VJEQ0Oy!tBePCJ9{1<9?1>9s1;PYCIu_D&P|=re7X`ac$II^=1&$2MvOPdT{DuV z*9+G67F#qoL+p6)4l*!C0 z0|^W>k*R*Cl~c3Z(wrBkV}qgdxeCZaK zs8xIJ;S~OUI9IW+q-$itdxO|Nuf>7oEhg2_Mu0#gMH8l?|f-~vpR^E~CUw9OWLdS4D;2xIgY+yUx_ z%!+M!WvN0;BK*ao8jTqy+!;hUK)cS?=}xT1vZFiv#yhaw3df4mD9M@PY(%d*!&gyr zTetF*9Jdqa{a)+M2H9^{6H@w+Ct@6Ksj_Un`p&AkS!RwFK*vi6x8h1^-_*-~+pu=& z6i`ZTidkw?cHTJ*tkdffr8He*(sibi=b4|8;Uep(A^5^RP>=w&IAm~C1PKafij8ZJ z^Z>`~7!_22;u)+rf%%>eIpj5`2vKp(3HMB8IA|bECszEUYTi%p^XjAkqLTQ>9Todb z$!0jl#+TnA74ClQ4omm=tJV6gs^^E)gyaEvzBE;SB`cE^InFe7gES0Ci5-zs{M=jd zd%MbBpAyTq5YH^fk4cmb!t~9a*3%LzMnbW;Cx*?3lj~H{?aN{D>q#!#0bzR^kiUOE z$6@+;o{Xh0>9aflif_i~3hQMURIr{+(uTQ(0BM0SsK7E?xAN5$=`c^3OqoQghl?JE zOa4wx`@mURPE;+5R2tn;_{M>@{ahSNaunqedymj-IMzuV^4MF6dwMK%tgq+m$?czU zMQb9jWHLF~*f{rr?!mFiD@3W%whz}Ap-uyzg4URX2eDcP#(YKw^&?y!JJG2l{GVRK zRU1Qiqz&{_9FZ%UTV-mHH;PwRLiD%M*yc>bA2sG>_T(Mq7)7JndZ^)4S%o6VQxUxI zgY3Bl+^}JM?hm@X$T%9oXupMdtyzN3LVAeRc%Cw3yA)S>7;q#oW!>$yu1ZUBYpqhZ zttyMu)qSh_r&Z(Rha#IdCLAQ*0XG?lGkK3tmk=+Kit}v%nS_%{4x)u%40@NQ;_g-| zARfvK1BI?XL*(tAvns#FrHyR&6;@jSNr9sHsA_<#uh~eyRBv`JafbrFy@eb)Q<6y zKgjTU)7^H#77b2L&W1q|vs|QD_DDl{te$n5>A}>szp{%f{o*p2tWlZgIiFgUOS%eoI&uA^>&e6&xSVR z&$QMYf>l&om?mi=yaRZvLxyDagHmjj;ZVY8tP>lDo-{7xal?Uae4l!+VBJs4+sU#L?J2_j>h7$z^ZV6~+wWXCp1MEzX-%7{O9m*^*Di_q0@R9P?9ByY zZI~C{HYXjjt=oViU{Jas&Oq z2DY=({nfj@=d5vuuX?uc%7(b#8FlvULboNSSFwqMVPFRUgE9ePo!j|(5!f+E?=TK< z`pJMya1M9q?`z}SDbH%I9-#9XRCW$0OQU_uZ^eGULVi~$;D2`aq=nycc!bowIHBdh zAVG-tCq^iIZSjuext=Gfo3nn-EWw&}AlKE%W3MzICoom+`e00lWMR@S_J!F%GLsK%Z0B%~x-(<2%d%@CVCbbBNv zuqOK6@h^_nC7&BtIoBocT&cKcc;uTE0Wbc^-Z*nN*5J0pM2JVTZ@kZ4K)yz5MRJ@| z;Ezs82G_ffk%%ufTX0bzr?_E7~Ic$`Yop!974xSIPY5&$7~(> zf)7b;BKDq-wCfk48_A=dg!0g^QGp)di{zHk2mr9DWjMRnfjo-PxnE^M zhXq+5C>~xYv4@JWI*4ZV88Kd=CjNnV9+MX;F(EfB*+3DJjMYLSu&t9!)wPiu&}v_hZ#Ta#amc(~=#Y}4hl7+BwKs&py*<#4Md%9{v;x2& zs7OEY0%)+vMpL`noz@d0?84#`~Fx*R@ao91G~dRj`@j9_Pj)3e*jdKh80%B-8& zHWk@fgvNUH*sNP5iPgb0$Hu$~W$`JFvkn5bW2x zzx%UiZ51?i<)?6BY`v+L^8F`_1l$Hvd!02p|-fT(fkfjC zfD-laM@yNr1KXm!KRp*nmkO&NN&Xyl`|`|kC-BAD67g|Xv7=|SDe7LnM7+4TBBrl2 zA5g3(3I|;~Tyv_YbLk20-C`;U0oB^De-?%sYylN&>CAiRM;#dxx1fXd{=7;|aKG&alNl0nm1_SwjmzT+(Fy zTUFjxuuZ`qHJ-(TUSsa+_PpUJ8a-zscoyN}kn2(!#>62BH#5)^-~r8>B^4(*@BTP4 zawz1FIE^#)W-I-3bY?|8!DZvD zyo;=@$*jd^OpiQ;A}l+E*3TyrrJO$LhyT?k?_vyr*KF8@m$gg!KV|p3vrL-n%H(CGhBQwG{@w+%U-W(4sx?D(HZ@DH)&_20O^Y2Vyix3e;1~-J zDX1IUtoB~EEQrur2vKLQ<>EGa_tUoK%1rf7xVp)_#+o2U(I23b4O4vgn}wcWbsMNq z7{L93wikhkM{)nY4r870T%A6U3lKZoXC0qgH`i~nrI4^aDG!+X_%>f4$4>8YQjT-O z$ADAj^B<1S{YYzMK=aB}r(qj4Vn3>PJ0ZSxG$LcJWR4UO0-q{Y9Xa|`W{>eP7yn-X zJ3z$0pF`e?=ebBRkJplfMWE}bYxk@mpS}~+@pQzeA+MpPoGgYpqLfqdeUlOla0TZ6 z0UuBa<&f@KzyzOg4a4O-G0+YlPzRkb3tcz^79h;pknb441TsJeBA~#}qsqbo_b%eY zH}Vrf&hm^}Bb}6B_8jzI?)Umy^!J*tl`5{5_o$91uE>+ARtu=mO063mzEQ)Pr_*KnjN0*pIu{i{{zMOdsSH;YqFAm{~4SA z05M>|0f7Vw3M`1w;FS+o9DZ^pMG6@ySzLVjbl_mSZZgoj4QrRJhY;&4ECR{`ARnDA9vGn+jw=lW5QZGJzgs&~Ba!???}IPKi_p`a*bFAwht{c#-7TrCac;b3qPV37|=7z_A-#5 z_Kq5Dyan|ms6Mm)+iX4ykCF?ruizq(t_%TVY_b&P<4eB*NOTXO154!N6XAT5s3HwM zae*cur5b><1?ZWDHw-%QEy*Nf7)wK<(pyoW@E|PhzXw?)j4TGT^lZHW4N4J2DE~hk z6SD*Ukub9V3Mhbq%p9Bv$glXJ2~C02JV3mt4vefTHr*5oy*TyaC$jSJWDm_Z4Jx!v z*}^hZ&L45WYKdpEc7Vtlu-uSd^OopmrWK>fFxMGVh#yDe*H|Drwk3Z(P4LF)RPsSL;CAVBk7+gT6G5>2??6@ce z+A`1NSoP{S{@82m<~(_=X`cc5oNKL}&6Bx-0G19w>7|u+n(3$;pc?9@pRT&;tFhKv zYOk%{T5GDicDm}U!G=2OuEkz^>ZZ}Y+HAJtrn_#Y?|vKZxb;rk?z8d6dhD|IW_xh8 z+g>~Dz6TduaKy)+n{LLrcDr%1zc&1C#{thffD}^r;)@hwsG)SzEeL=HrX>)k4LPt8 zXrH?lz~;1+%e4S9d0-UkL4?dhRI!5C%1h`|-`aT~qQji&ErN_shymyZkUc2hx#NuU z0KQl{9qqXfzhbP+)^GAV&>UAi@}YfePT` z-ULJ-G7yQ!QUk!o65r^%Vnb8q@MSJc3Jwv{CxZA8 zi9uo%d!(q4#GQ|OQFEXF$TvXtY0!dQ)Zzv6m%%Gukc(n8AO+D!g$Xjyf@efy8sn(O z_OY>k`}5)$+t|e}N-&RfoZ}z&h`tn1ppc)70VQH!0S?rF95GtVgp>q>4^_ru7^09;FW!>SRP5B2q5pNIM7!c+E_DgWUG~zK zzXYZpJpBeOUDC`SxjSoQH)t+W;F8{gDa4O1BXl`2Vx)(3v56FXY`%~9H5bY zQ06U|)Fcf(V1a+2t2A9f(C~s7rb;F+NZ+v;Sw8tP@KESHc{xBiTf`utg=qov87Kqr zD9F`0^KKI0B_GSEL5Sv2Z57SsG5v>8%{`Q%!!+PR!G}eRYE+MK5au;E9%IiNTLm`96t7Y`LtPp^9 z-V#=Ic~Xe#LYkrpiz{j>+P^*%9Uy%ag?s$3aR1ockHT+@UgTnc4-7#Aa&N(JoZo`~ z8{j-rc*0-2@B}jq%?Cetm>eE3g7fF#2IAGj&h-Q_b3?4aK}K+UqWhc$LO8k7N z>+sUXi?gAe_jc=Thqo@X6`aI#RDzi=k@LG0C5tsXv>ftP;>t|AKJ&R$mZ%-wXu>)! z*UQfJ?JleA%P|Ysxn_L6%J$PA*IRT>G9LIMXz_yh`$4S57wS8rn0y&%pLA-}d>9P-hq zdNpzSq)I5C;)!?+)ft+!qkM+t<2So_SMos=)B#YrAOFg|nddU*o6TsZ`3gRi$4{|l z7V`xwn$nlAIpyUucde+(?Y=$7rhI^T|2yCN_w%U3+@UV-`^wLF z@IfN}=fz)j3f*V}@> z+c=4m!+IKpAc3~o6hB1u7*!8eXA#~(h^Rz`Y-idOdSNNIBgKB^e%c#C3uG$&K92fN z;S7Cg%V{3^yT|eR!ma-2^?ttYd)|xJf2m3xDE`nJzWdFEC>8WBenEb7@@>333h|eB z>{nQQ{AaH6TR-~SqoJ!m!8$zmqddL}zm@~60Hc7P3LOgIDQ&U^QnNgw~(vK&K5g}4RqVOT;;R_Z#3QKvR5tJfJxgHW+9wf3928k$l z8?_*eH%xo~IgDbgq8mb*3nnFOKcHh8@xi?6LLWo&pvqDt%DTYOd%|79A6UB?dHR{0 zV7B}yk3*xcMjJz~n30=khxG70Q;IDa;gCbCLpGEbI_#Ru>#M?Bw}&z}1oSswQmF(A zKMwRXVCuO){5)bJJepF!L|nwXu`WT}r9;BR7|=uu=q3wLxnr8YoNEBt%RT+z6uA4O zYRj1*N)FunI)MPF)r!SqI|!Lz0ImC{IkbzJfuau?8d(d&b}+AqN<2_orbomwKMcH} z!y66R4lCmA=rAv|}r)$}@iyzO2YYzxc9k%(RpuLgkvoykbbo%d`nd z#DX-l#p<_+>?JqDL<`8mZu+js!^YUdLDxbGC>cR4xvjTjB1mbg`(O&z8Z_D351jFj zqHxLd@E!l?I#8_@4+8+8_GbELMsEh0m8~=G&L)%z(taWpTaC={7U&rhaJ0#8w!jilME#j zwEU_%qnHc#A{dR+ujos(>2se3kb(7L0vQMZCYS>X03!+NfTct+hvFU#Xv;y`02%22 zfEnlj$9x~Bw8{$mrLLSe1tLu|3NCf)LKZ_K66-eMvareA9tk2J^~uWXGM@x;FgJ5E zp4!CK`y33T%rt_^Ka$HZoC*%d8(6po0|P zHrbq`Dnqv?tj1_M!XaF_h(xnMtUNf90JcoJ4bVhN;7HIh#$t-g|-twe)9L9>imYYL*t!(>~#-ykP?-?IbIh0Vdr54`|X3xPtA`OwJ6-{iFaom;se)01vn|`(#if z9KuQrwS*MPG;PygqJUD9hc*+Po=T*62rB=CQyr@~Pl3mqi3(zS7AJv|SrSwaVU&5n zNw6@~0m&8gz_#5w5iV)A6*0SiFd-R`0V+658rXmiST8m}%o%8!bie>eVge5^Aq-#w zJi-8ZP#P=ffT5#-2G9V-jDg4ufbd#U3+MnD*q`?7fF;;W2qna^)ShsP%06tdMm#L% zx<9vkx(1C?tvs%3M4@{79MRFHe3OSEkOy88w~DMEfJ>gNpiBCY&N|8e!~Ix3!f@BN zFqD#+H3b=(Zn30!jW+3sFZtLNg|!0lVFF|AfDTwp55ODYV1o;4&nJ}tFz7YTYbc(>KT9+)H+9)&^rD(msh8S6 z{z*TWy`O9JLuf59*KUmo$EQB;&*hN~FHN?^7yxJv4k6PWv!rj?jowF33 z)YHOorMC#>z~9|0l{(HHGE^VBix+f{Sjt1;c~|BGqO8qB-qWEIMX~{aURJS`@Z}P+ zt%-|89X6N&3KZ1<0MY=cff?Yp&kf2|r2s0xfQp&`CZvK6;M)M;RPW&cko^KW=l~kn z)hqad%UaSe&`eJhEQngz4Qkx&10eTd)=-39z(GH@Rv!~j~|o~A-lzRlkNU;|$LuW;dGHjq%71zO63 zM$+rfB9vNdg;v5NEKH6!^4q{hT*jJBRvBiRr28BS#8ZyspfN+U!~+~s^qIUUCAE`~ z*kZK4^u-F9WzcvYRuU0GqZAQjisFgozeI|~kWqXJ01Kc1rvcS3*q;WlBc;JCr#Yc$ zZ5l08n+<^Gs2PEv@}>EOQ?49kpB-9hV$)?sL~33C$neQoPCn;j@*XU(H=fEupvpi{ ze7tPzBP#SBb7TPW6+U3&s%66`Ydff!X_-J}40M?%ys)7I2;W*fj$4$)nQ07Rl;~p{ z9()22199jNX{TXaE={~!ZSu?}#2b?ap%_T%Ml7ypBxRnZ!YgZ5&P!*U)<%AYH!- z%ns+7L+N7|#^^zGe3_Q~GV(N7gGJNVV;{E`)ACfroK|PR(JKk4#H-Bf2dXH%9!(CG zE5UAO?4svGvd}F2DGtI0I7Q-`-mw&M7C5p0)LQ&YtSCv(unO90RMO}=g2=}(v6YgE zNnxStu1JiyifO>10vdqrob#nyr5e>y=VW3{`$>lf6QA9dO%HQD{2^yXj6$JRF-km5 zxJFGo^i?|Y$`PwbWc>o!(@vShujv$6j@GZb zls@bT66|a;9@C4=el+ZCZ=49)74st8HdhVOtJrKe{>Ih;heE9k%b8xy1jl9#GvR8D zS$Dox0UNgi_wT>{Gzv%udrKszWy_;IZqy|3rDh*IGv=Gf$GC{sN$Cu%4wQE~vX?{- zgz^ay{g>-dr7$dUxGFbFWbSvmIxJpnD4^0G|Q#&;^ zJXK3m3jjMi$o&2`SSz%z3m)%n@Agi+y@cC2DKsge3?K;)!U&${`-%ezLscyE^@yk3 z|DuctC$m0<%bIT1C3n_}#PR}OJ^j*Pn{e$@+nv5?3>)EL2Zui*4;BiBbabh&~# zMh9KzbN2OH&vn7_N{Aw=!+xkzTiO($gcqfp0E%anLyNJUdbmJzGyRuY+oW4AN3arasi|8|Iy9RCCUffK%O)10LWv& zrXM~uAjhiBFA`xu#Pw+9>mCnkLAT-jxw*!2&Hd(Uwlp>0T%<<7cR>&K`Z;)y|Mxqo zOHmOX1kuz@zv45jk;kN7CZ*b zqeyIBOGMf{Mp`DMT4IO909yJyZpJ)bc%U8P<$e0ft9rq*&1Qt|W_0=j{63g_=d3@x zFOd3U=i$Uw_Egrl4e-^R75e;xSpdA*5$?ZwhdGXdsByC1YJZ}QC?bsueDPq%o2X*! zonA1;8GeA?D@G#lFo-jbk6PZLD4Mp#0K%xtKAMJM;3_cEy_??Ms0@TXfhdt*8hyVfuNEm3)U_pal5FY%JaNxrL4ygo?m*OIYFDWR! zpcKQx1`8=9EIbHNU^;;j2`W6e(&WmLDq%Kk8Nfk-0sICW;MtSszX3dj9{34VCr^Gx zdomcXZ)j1W1DYP#*>h=upI3(pWzbWpPoh(GZq+(=Usi$SbRWH~VtYQ7%X2{i zmj_dt?0eF$Nxml|3Z4l#z=V=13%{g!_;KUMhYL$4$d__u#0D|%|J4gPGGNY!LHng} z5#t7rF;-i!An%Jzl#Vm^B~06}-6g5j!Uf8Epg)RuocEEz5MdNZE&`w^|w8)h^ z9kAB=0;;~J%4-+B`9J7pjV2#j*XZ-8#|xxCFz+}6=#y(hu7CSJ{`;g^j_w~o^nQ{( zB-&xI^)*3$wC#tWe-vP0nrSJl####UZ14p(4P>@ofc^o-;D43j#MV_=Y1h_N*&Sz; zb4?9b;sH6y#S~G}{q&DkR^2t$j8NIwmR&vN{r9FnVm5hsaC6%U10%@sqO@Vsq z073C2kwAZLDHE)%2HH|d1}>J8pta6glc2K2TIR1@28%1Ja2BiUm&ckJqD+FNLu{14 zx(ThV%I;e1w9Iz4Sg_X)3aym49=pK?rT5~-{)zZ}~Xz?`O)|C>Tc>8fi{yF0tfC6qDWMpySMK@Bp*keLjaS+GeJ(? zv~A3R1|13%Lk)%>Hu=#5y}(2aDb*miL8J?`fd)!kB*C1$Zx90|9JIy+6BixC#0>3P zz{ci-ui3iMnNzOB;(f*Tc=bH_h;*>A zBr;+y8st+i}2L1D70760#xJ}S6BFW-FK(c`v6yys-yqg4s zClL-zkOGu*NG$o1g4WOyFf}M+0H{zj{|v-ZjCV_i1!lm8)?nZYF({=5=%As2bYLO7 zlt4NVSIQ!GfC(CE%@MOVGBGYrmZyW87(tRs)d|Fe-=v%b$dS4LWN|_soE+s=Y0M`6 zay6V$K{FfB01KoJ12uSNNK(K`42aW?0f zE-TCsoE4FyK(5e%b`g^#&paJF=N3wlkRu@>p#TR|_X1-cj+We%;}_IPPoC~Dd#=1f zyZG`nwD~4R4T~Qm(^3^i%8zQ~D^gdAla`(M=u=3cj&!VQm#1JyI$R}HQpN&SfE9&r zJalCT*wDWofybkwM{D(nD1?pjY4a22wiYHeUS zm6D!3ltxvBY+9`jim1$FPF>}!Qzi;or^*v~D7gb0oqcMAcz{2~_ZH06H50 zzBPabnl2U-tiav?Kn@Ijn*bd&Km#1EW{F=gAz%@`(l3zoZlXR37|bX)Oe0nV8;~Fc zAa?=eQ9uM2xIi75AcN$IK!z2lzy(Ag?G$wL0wg^)vZ4LK1Viox82G}mjV%HiNc#eB zEVr>Q0EQSGTLxgD{{XZx@B(r--~xOL_XWVKSvZQo&lb2q7aLGT3E_5!9$?KWGineS z(s*&qU7Y`DK;yo3wgWPtNEd0qTsbN`P41;!c`LVWifk_hX#TT#YzT|EX=Q_f15^<21QopC z4ur5TXUsIE{}(6k3seAd8R()2pqqhXKU=&hxIhL}3f*+DK8lU2fU_@<4h;mhuQ>Jq z+&X{-*1G}P6>tOVyZQVI%)a#;cs?6u0PPG2TeKJe1Lc|Eh74pN1~OP;1$dZ_3RDpb zJly3QW57d7SZD^{r+lSxKH@k3H712BCb?KFVf!PyLrN%mpG7?Ga;w2K?fz#K4; z43Lop2vY};1I=N;986HH>6r&mfqPj&4Wxq`p%iZ1gmEm)mHmX2HH=w}nR;N2)5!&s zxu6URMbJrwRs0y%9En}1;16nrcyL9S@nDht#sTmT4@nU=QJ_SqT|?LyMTA_=jh@XZ z-kV{7|Lk;thNyrCD4Hi_9|v3k2hbAo2!slNlG0d!ie*|sFc;-uKs;=ohG3RKFo84) zR0Pez3``Ji1pqdf5UH`82Qbj(h~61`MgVTk7pz;RSpc*N8xH-_zs+9rNznyfK=bX; z49tME0aiLdfVIg$2DkwwHh?G0KnAoQ8GS+XK^yJiUKg>RCPpH=0Us&i-nx~dwlM+g zJsY-Vfd5JS2K~CAwJX$C8B330Rfuet~h|Hpv9z6#gi?Csq7=DyoLOT-Hcof z|4}H#cznhA{G(9dV+?AIQzWDzL4}kt1wyjLC6UFWT#_dt&)zJ-=0MjMoFWrkflM?2 z9fVPZ$;}cd!9XyU{|H155grZjosQwq8%Y+*2sgjzKJ91kGD#;ob$39|Ku|2uvUA@eLWN zKm}NU2xI^m4FP1O0JOOQhp`^^ zi1k%+ffDkpn&vqu26O-z01-tH)8S}ZXN`azX+Vl)4~G%a7kE(ekVEl-5Ey_Cr!g1> z$bg8>))+xhX0cR;d;vo>0C3IT2w{O6EE)&QUhiRn358@g?N&F5K!}c*|Mta0U=>dB zS-}!OKog|{k0y@{(1AVxV+Mc#fsPmx2;+#!SK+*62fP3*Dkc-?Lkbw%`H3i+_1g^S zg9yAI@qHBJfCK=l;ik#aG|3P>#Z@}^kBogl0AQ3ENx%fifI76sZq3lLjoPyD>Ec9_ zKAaAfIwzL?SVKQMU_jpC8425<`RagATa5Ri~)`(9WQd8v*1L$XV zen)#kOo^aXveFNV^lFayM0*Yi)w~CdG{w#J1r@}U&V|rvnnsss+^F>hf*C{uScpkX z(-rigNeI<#gbrYYt3U{op!5k$l#*YBPGQi%^SxymmLc&`Kx78b|3{I-22=nRe3V8R z8y1w|EskIHUBD3N15T~q>}3G;Wq`?9PGr^zYfvBVJ=n`;L)C^48NKD0)&81X|{nSsvuuUMX$krU8)mBYap$d%@S!INbLy1h70E%C% z#>~vo$s|q2C{VpLfW>Me2RsOm)&Ti6AM;fJPGLb?Qi2=!63}T{2)}3E%E{k*(S-vEN^;Fjnn{)3tnyY z4gkF{O_vD7LG4SpL{GhV%&bh)G~Em4*aWf!&>VHk_?k>fz>N65CGK%R3b>yN+#W5` zVg`7`^V#nOK)^?kEKb!aWgZ&@;FPgFpXGvVGBTfpyk%;jX#=}~os{9fF<%Cp^li+(tQJ=>+}1E8=Po6eME4|2QCx?ODAFdQ&!+nFX+?(f97Kgd^YOeA9X0SXlY{UiE?Nd~3aEevbZ);25ANX<>~KKJF7Wg% zETA&5^WokGC>uFkKo&jU5WN4u>FzHFoTWQot_UP@gAWFS(V)&eM;G75~i?ER8>p?G*ZDxD@YGVrCbGc01{Vxw8K!9 zC#&)gAHYA1T3{{KqfM3|*1+WD&_PIAA*Qg*d=LxaZWU2Pq!AYXeMV_XlT4|r>BR&a z9AFA3;z3}p`Ds>n)j+7F8?=eQ3*;s4Wv&PSas{YBe=Sy6(qaW9BNn{z_KAR6f0tf{ z@df;jHlG4Zn+O2v5YST0ZbS@xK{`+ZC4^$SU4ZyTbo$NQc1)BNd$@=Wna-~NMWE-b>EEz znASijR5~4zE8SA2ZB9Bg_kyX;)Y6mT;HE}=s6kYKK1fjwY$i9SBIvrM{2|Zto#_i) zptMn6GQPEqi81pb4mm6z?&a3=>DCOmN!bcoosjqhS%ukLFxg8h8Er$wk;QiU zFqx5bM^eN#aTNb#)BVPA7>SbjxFso>DYaoV$rCn7MC9R}LI76rm>z~DRu7qAm-iJD zEVc0gn0EP<97fRMBm}Fq6Y*4!Oz0MtE)Ej)Rd6nKUbpXj$Eb`DV`t>FADK4{7pJVbUU5;!9kQ4_4pA}?4umNrt?JN0JQN?C>^(C$d zfItw4z-Ceaguq545B&x+@a#QyWKZ(#;_V|-u?_nR63<{-X$4a`%0CdK46Zg;)V*&c z$B)Rp@!mbK?y%Vs1<^H?Jor(?`~w37GejuC!3jiQ+1xkImAwLY1CWE61!>+9Q#$+- zZ`1#|JK9{tiJs!6-b3W1qq6}OOuRUKBM%WE?I_p`c!Im)9dI>j91^-?x12iym=b8f zvT=Y5Ij9G~>&`E*`~%Vtvw9CRaN!52(!_6PK{P2X^1@odNxQ8NT3`w2iu2rw|f7lH%@5;S-) zp~8a?4?18lV8DTj7b~{2IACAJjRPibJizax#dZ`e9#Bc~A4riHD=w(WuVR6ZAyLA# z*mA%;j}$L%B#H5Wypqu0p@W40G&Fk*(1 zg$)At{kudh<{32h9vsnu0*$r-EEEoaK}H9vG-jv`5ZdpID}g;24xr&L#0#m(Ww=nm zO$NXE++4tr;)3xR#fQI`v7vc%3^kGuubx32IpV`(yAiQBgA5sNuy|mSE`|r~6)Ie~ zAcB6nAnDR!p^(A}g)dmrp-%+)-b*e%?J^jsA+rKl(5!?UR4_t@7?iL=DjKXXLk%}% zu%U$EHL3!mAhj#J#9#&s#OiIfN>k7P(t*-hf({NKn84N=W=H`7 zbucoj98F%YZ< zFanTA<_-#tnSua5pi8WW80$cT6k5~NvCQoHD(A!;;%p!bqGn^E!Pw{^XU8_M0*nsk z`0I@Qm`Utw%qh9 z01N|A_ErsM27_kF2ztTsoExy<^SuG%i-y)Ppo6Y2B%olw6d1Q421;Ux$AS$ukl>52 z8Kj}hhZg#p_kn`vaCnCf2VUKNk3YP5frUrDUxZ&O5oI4~%wGS=?Y9RRDDJJ->3i_U z_tARqlgd7P@xRZKcMLJ?vh{~3hbSEj)2pY-@=mgrSTf$%zs~qCgQW3@%*#s-0aipd_NxI*$O>w7v%EF}aer`} zqw8Q7!~M{1b~ltq3a|mfhj@^U3&Bqgizq}%Lb8v_BO?DFF-Z_oI3Pwpl2KDkMj{$v zi~%%BSj5tIl9V|SlqfMuMP>vOR7!CqTvS;ttM^Kzw9Jzw%916GILSp`5|00xBNe(d zM_^VGB3(ja5TOac2{x0G0ZWH}VhFEn#(WJk!` z$%AnzP-cY+_ETZfRGPswXH3t@JdUcX4RAO~EUW)WGL2c(dqFV@##U*Rszw!kCSq7u zi!uO=iPd{8ktb9yQh*z&NUXO6r9521Fe(|P9U?tmN})GN2{zA%di-Gz$!Sze;uW0+ z!)sp)i`1dw=XHSGzzn(hLfDnFs2qyWLJ|T}1rc*X#GBC9I=fjShIX@e9SAAl2?q;k z$!mvn z5mQRV0oAqcb+MaW?QWO5-SzHw!5d!jj+eaUHSc-Rn_l&{-4IxA?|NrZG?|*1Zw05-38dv4t}n;;q(rj9QfPO1P)b62)??6tOZd z>08{A6<5t$o-T^MN1`o%4<|G+B~4@;T?F4*#NiWVn)zF!0WisygH9+=764F;Dutiv z`$v>ZRN0No;`SJq4PA*s_W`N#+8z%vYh zfek{oLXlnIf=}$kNHqGiEfvj0N>~3iD(wi;7*|xi?~xk1sO~hOM-ApuSDHrcAT>-D z&}eMe+0ib$@mW_^6m6F^xEfRCsX47%jHEl&Ou{cvIDOz6u{)P*Z8rn{5$aSY+sngk zbpiCfXplhIWLlkY#sCa&j7s}SC3^`^qKJ})MO>`e79*4`?lM=3OyK?&cmbY7rJH0s z;taOP6+Ur=%<+s4xBdi?T_7@foO{9y2snZztzX+Br6jMFHb_FgXnt!vW6B1Ku{B1q zn@jbcsm^d!8KBD)!35xtMhS3XOHrc`{ODHyFv$SO9JC_wHf?hj;8FZDiP1Bpy#cm@nmjt}^N?7j}~5D<(a z5CtvpMNrA-RB-29@c;h=Z~=jD0cUUpuSf-RklNU4xF~RoQX>DrXqE^t;oQn%jsnCw zY@t?Z0CU3Bl+EL=r(*K!1Z_~{e96nmr+m7Md!CGnxF^Z9j0-)C48x}jw-C#kNDWVH z49k$lM8fnk5cN!t34n|aG$#+)fFJn4i#W^+(=ZSPu?@rM3<1%^u}`tN-!hHbRxK z&m?{i>MBpaSnSda&Hc);mUxM*W@6E-uI&I4A-k{7rmsi>@aT{aBkXY+Bhss0A|9^5 z1yV2dUhck09Nz^YD&JPO`(^&8uJu!C35~Sk3rYGAZW{DA6Y-PY?>B zOJoo#$`*jY2%Rc0)aOD}_vC@yn1ugH7O?Jk?^Mj$Ss zE^{v>?j?eAV~9&-{(&pE#|5b|C*jK8><%fjM+vpZ{ML;IU*y`Nv)8gx2XTwVh{E8E z4y(q<1viZb3qS-vAO_|zBY#ZDWMDCMjU>BhmWGlu`*Yvij;#*LI~mO0Fp5b!ZOM}2 zL^|m@#j`*Caqc`~J%W>aADNQAlHx{d3`m($xkRi+qyMXV*zDqNRIX<0NZro3 zptLzDLfuk=4?choHgW@fEXZ0e*FND(N%BWSMn`1t`}9moqm)LS6isC>(A+dffuj3p zvM8rCP7BITX#}dCl1x`gNPUh>wmC1FOkYDRhLjzi>%VQ#&0I8 zEV^jo+(_bGRWi2ptk>Rjt4P9>0CoTbmNE;~&b$m_wJ=2#worv6mH@Vv`l~@DRtr0V zCZ32UF81nD#?JU)FjLORIDkHZOvv!_69kR=KElf63?ueIVE2qBiOtTUkz0!^Vjz|# z4DNe6LP%snC*<@@`zvHMRyG?iY0d2S)Tdz$PGV_7%=C;WXO>Z`YGfI*^8VF4DYnDV z^++|2W(P9P#K>v~R&9?GM+%l4f7VBMQmy=sAO|4h(yAF-5@f2bNhwCF1TQl;6#eA& z!EU6Xyr%%LYM`J@EL)RGBkyoOEc3hvOI||L1plf;daTE^^a_3~$k+haa4qLLW+))= zA00O;Hkaz`?I|g3^5$+tqHS{v?sdCLo@955223IoH{7(U@kW!^b_u#-WNY(%Cgp$CJ&I)-efBjJHye{fW@<$GmB`l7=OpgPafCIFY z3FcseZ|(J5pdHTbBW4Z)8%C_y_n}nM>o)k{47dXIYeo9;dqNEoqfQ$)!YH^h`sR1; z_7}>64#BRfeFtrY-O@xtZN7N(hTqqHEB~g0^LAtS;VI0{VHd4_ClQ5n&_vLaBR&G) zq!ZEPfeLTWNbdK8sTf9N!h0`b`^eMe@J}TOZDp{xs~mGYwKHS>x0PlOK+iEG-Z&)$ zSSlklIqNTt!?hx=p~oP&bBQd-=3sO`p$Uo%%6ia+g939M55*RaI~NzMFy`7GDnutn zC)TQ}PDCR*&c*r<#i9z@+%khNriTr(MpQG6Lq?(;EaAFpB7oRPFgYk-`9)TEl2^hp zbs{DwW{O>Mlv8)q5KJVF*61#<}-Mq%ne{ zahj+(k;)iWiat>cv-1uRUcck!4aWKWTA?9 z;kYl9ajDEO_s58}MoRH+Gj#3N4>-&1AKF1AInpp$R&@|b{9rC`O)gu9g@eG>uvSjUkYhR|cP($_Iqyta z!83Z3k;FPn;;LE=&1k9rLlIy&QRvd?KQu8%Qv%RUA zXyB1OPP2XeF44N_blWwR`>=gTNwwVQvACd$;-&Typ|q)tR`DxLBDc8^5GknJ81k-^peKytiyn}T`T zhOVR81Nx=t)<@RC7Az(C$?wuJfJY;Ma1;!ZKTgZ^^3iA*{NR3Fn{gB(VzL~}Yq<#^ z2<&>|oO!GeOCkObVdHJBnt>tE#BFLbst`{0Ym(|}CU%jPuI z97yuprzJ?vYBB+hyoY(_IRg<{NLT4tYewXt5k)S}ThVaMI3Eu#AN;KDe{R%;r9@fs z(DehkwpQ+l%i(>Z9DTEl-!k1vqm;{~K~yuhei50U@LE0PtGE4LR}?bjDUpcJrm+%Y zO+z1Sv)}GeC?O@cbUPYD)odkf`QQ&P!b0eyHov}#M58r{CKGG#lIk;+=e)llJ5-&} zdvGjazvDcbK>L^bMs=G<^#{s%sYoHIhvA^BjZGFr98Hf+AAp7c#(d;OeB7P~ewes#26D0Dq`RHCY%xdQpF; zzyN#xu!#?1I5mz4o%w9M<7#}PS`e@9L6(*5*-K(;wlw3A5ggIWO73?~`j9El-uSo< z!%F;2nuyT=Au8k6TVJ$7wLPfR)a*J5r;=>Xx`L2J3f?1fln z4ixUM0vdExBeDj|(mYoh>=kL1HZKxsDP!`IYm8Ous^snNO6BT+7tKNLuJ6q?tZI!+ zx{52AiTyRD=kx>6Vlb&2NM>u;(v#Af4~)W2LyWr0YB{--fB47p^t_rHaz%W#HMdiO zw8bwMVc%=GKF7(jp3rLyG;Y?t!~EF)HQ&JiFLP=v6*0B0pY?;c#ezukVH9Mnj_4s@F+;4rdB1?qIFZ1g(J^kM=qKfi=Pbb|= z;egB6&#}KxHoRmwF0<1YWN)Y~dzbI#{V*`s0@3LQROET}NyiEFio6@$!XgOpK;?@+ zV!0%G=Xiu%wr6lxg^Y7KToX0S6>93aL2Zo@vWS^EbmN}$U|j{K^*JT0M?uP8Upa=8 zw{Q{ngK_g2y#Ef(l){53-5BEJx(*Mo702ocJoyt@=gB_sM@j~fGj0U3BA3<0bZ#p>54((QtY)xpeg<6;Pk&IigwbOhP5{cl2VIf?2UfqsuraN zrr{}<0doVZx=o&XmlbRE8%l*7icF5T&#|s8t2yzf6iwgER+SPhKD6mGz7PAQmPpoF z{TBTLe@!frsZh+!hpRiNF4>$@u6X)p047_qZk+`e2Mcd%ZpNz=7cFZc1V!mDO{@aK zBFB<_p?3{3E;8BJHpo=rohwZ*Em56D*AFXtZUw_hBGN-*2#8sYII5^)GfY&~^)Z83 zUL_)N#$eR~zy2KYK6DmtS5kRC7*o+VV$Q$c(w4s6l zXjJN9vo*=uBocOdD*;6uk(fEqqUSx_$lt2$^?qvH|!aD7t^mq77A~0tIp)k508*C)(+=!=DvJ z%UPXP9_1o2I)R8v)37;7AR>_f2(YCOeH~Y4u2&MNG2?PGD#Je;us(gLiubYgl=xU+ zRF?ZLxRF*h0;DOs!mfjA_?#NeGS>BLZ_!ukcgY$>Hs5cQ&7nN*gc2!nz|^v+;on|+ zr#Uj=A5jI+9S3_8%@#`imu-{&M+*r)>m?%q{}2Qai(>c*1>431#j1A%r)m(`j{h*g zCnkU+cTM7k%&^bIOWvfOmzw zFo5z)+GtZT_R+Q?F_l-yL@M)L4e@TJu7T-t@J)8b%2cuJhNcoH@V23P>f-v1{VLDB zCbe2Bq58X`Rc)i6*U#?U8JJ(1cs~#kBJ8!!E>tD$4U}Th?dhY{GrXuNN20OympvfP zBPhfPp0ABYklBYB2KYvzi9UYE{Pj`~{e)g6cYs^#Ts@!q>lBEkB-BwGyFWAJFnW~X zeYW^RCc9q&h{ircJmqCn%_S*SX}~tqzH+DqXy3i?Y<(0{a+}ZY7j@i{5mO5B$tw>i z8EjZm+n}?9J1y_qlt#D@1qyo*ohUUamey6W!onCKjaW82YTj1wWbnVFy8zbPMq<#* zZMzo*<-cLQX?$El^)DO&c@#OG|z6Kj=zJlLE`4;)nRWr;1Bp7t`=;e>gU((AG9@%7&q@JR)H8Tg1 zTM!l%?p%S&&JdrYc@)*^ysRb zt_>0N(i8&|4%;r@Z)tdraz1Jfx;p>D2`Z~uYSgu6TrttTOVtk37!<#rkh1MH#JOuc zs+_&ei@;@O1ylT=oX-!Gs&M)<9y-6PCrIyI7Vb_ z$MzbWCSg9&$ zLd)^q$CbrQ1I7HSe)yX#%G(U&zGZIB285_mtaL*7zCM>T6X{>ONNFM=k}<%K6#`Z< zu6Po*q-r>WF-zb&{x%6f(A(Za1>Z0Nn~YwTvI2MC@b@fc?nCeUwNTFjdWMoRpwMu19phb?9-G zDoMU34T{;2iqJxpNeLnETV@urQNVDX&RZi%e;D@#BNM?P*IW>1XAGr^C>zj7_zjHa zxh(PpRDqEP8Kh1s_#t0T zdypM?*v2{#+hoy-dpWL0oUA46`3YfHlR&+LeaWCC*;e=@s##Tpe*o?y)f|ElL9ra$ zWKICmx*P z{#R}*7VCDl=@PMUieoWo%5OSbFj;|J0s$XkD(0Ma9&bb#*$b2R5Z&fx2xsd+>LmHE ztqJ^dX??*T8*>_tO@b3e*!`q3SvjZ0rA{zPp${2E2Z8n^fS5uVD&2q+L7-tr*>SZ4 z98C+DfnvyF{8i9?IR-&}$ewb5uEJ}hmRk)9c~_9%6C+IM zs$k3k8w!?_KLgLkMNI}tBphb1qNkwWm1CIV+V~Pi zF_=SDQNxgW!I|gE<2^yuxdE$tQXXBW%)HR>LTxU-)n%{Lq?Q2G9LNY~;G1D9+xI#c z2+P_TIy$hnJf2$AZEDp&T9jv~v{ecRH}M z*=sJKr~#E&|IkOz!oVb%=|`?=GAzv}oS});?14!!!o8;O8eOgnab6;&FG1{weqsg; zZqpS$KeISmZ9?KU9Nf?1tfeKillPX9x*zXAr>dH|A4`NaJC$5~rq(zp_4T9I1* zP9^PxA|dTN%U1=Kw!IEUuH7XZMw5fJmYiA|##%TXK#mAJZwIH35+>IZR_-%S zj{I00j3gSI6#>G~6*gUjHX50!(74nLIk7ZFyrHjYc>v>aWG_`n14P+8)F@=%h*Zpp z|3Tl!BP!p4i zC$VltxX5+s|8}tJ7cW)ew5{(dX#tgOCpzjf**QleaM5WnPpkYRZIXN5)Ew)TkP%gq z`HnYtH3jJLee`1y5lOJMrBtz=WwqlRa-{0&f^56$;E=6pyqylUVH124i|!|;N(DvN zWELtduCjd-<6aR$nG&G-ec6sol^~eZ0J8*)gPSo$&Zc(EU6_|z*arZJ1JFg~Mb1&M z*-S{+ycIj^%56;kUdy(PTYh+-uO&bgZEW}K8DooY>^_U2V0w7XeeM1`*>SnRMdQ}0 zEtae=z^zK+Ep42b@EC>g8!?Y4TZ)g8oW{*FhxSEjJ3lg8 zapZfVI>V}6%v#1Pe)8LCPDa)e?R?-C%pQ_SamWZ$#%;8<~50c=|sOI&gv0-=k7gEK=B@ ziD7ZvRa$j^#frQYlZXr%p9hy^g>8&kT1aMWjH+36QsZ{o)^03(`<+U!oDl;JQ(`3R zB-AuRna$PX(RX=0^F_JJR>&uZj6aj|Wv7Gy#%x>@S4QUSWKHTSf`a=4cpgDZV;~g> zrPK|LB#_oj1P&Z%5cU^P%_G>}Mosors?sj3@mQ+GWN`z(hRG54^<4KPb%OsIygMfanz9kG7U1S21-;mEwiJ>M{W!`;+OU4KH#}rRlkG!! zCcU4Qnn6%aekxl4`^InV*m^ivFs1WtXsO3kEAw zq67?+p4Yrp3tWdpR3Krw7W*_mszpg7!tc5mySiwBx;RG5SY92JxXbK?5A5z8i(kJ1 zJ2f!eZ7OzLNydHrg49Hpst`n#yc*T%ajq#8k;%U$VjSevXN=Q;>uTx}#a-VyuZJsd z7nqnB$h5ZGO-1XWM2oUj%qqhg!6*M;@O?=diGckNmu*Thz1W{6p{X1 zs093zKVeh{)AC92=r+Cy@po~NvfUa3U7-i+qV4En`0JvrSYn{qqR|`xjlocAeyATZ z&;84j{4qM}2uJ8Y`Dx907~4$ z>m0$O^*%u+zP!qWUhVAKNn;dL6^&5krAymR#f1tZN*o%yK6OTqa?o~(6NdbIr{yA6 zslBSpJABLawz5rnYalwRJDSBwVthuF=zc3CvGi|q_0jM1k9GUou?y&N_Q5!IyStt2$?gY01kXpRpTHyU z2D01g3}asXuM8X7f?ZMLJ(n^e7 z4Zc?wG*S8HF`M+^iYVke$S^uW{(9GW22j5LyjOsbih^*#M+XW*XW3t93a^x0*exoM zZfr1&CEMIwd?QF&0HEwP0YHc0_+M-=0_bs?D)90me%O8oUN{t~9D3{Qi?d}NfMrx# zEooY2mph0lUeC6@ho}@J@uBt9djanQ)L-wM3ETJ(Wu1VtT*;ZUxXpd;mmJd^`AZ4-7$^@K*Lynrh2+8b=nT?yr z>e)y0L!tBULN_68wXS;7z6OEIcwH4(Bi{HUHW(dz*iANA+q&nz8N`Gps-8vcibdwN zt8ahcm4&L(;JuVg=n3_T%%%J3+o;0&ys#DD@WHZ^sdw>J4koaELZ@_NpG>?q6gnyY zA}}S{ ztz711|3^>xp#TEGJd1uGz)Bi{g5ya;P9-duT+NZY!tikQ6*Hm0H&rmxSS=Y&_#e{_ z&go`!axt3ib+@T>P!>$_vDXfQ%ip&VQp1^oRXh~N&zx2h0r}zh9;O0o{mL7T#wnX;E93PhDjuoD!X6uB zkHT^A_#i*x6QV0sQD$k`X{TfPEXlp&sCmzS_Ym% zlKju1iZX^*^0TiJ1wL3?wtQ`E`@|;`bJobq@tfksH2=~+0o~DyDr6Q@bit5$;X2d_ z5Ah3%!47B?*-nORCHkAi*U@t3o;}15!QglQJSBZ(?MikI+55WN!SYXrXHEjAZvIL!P$fEp+SktzE1pUUE?=b)0n5B_(^z190UW(z>LCo?`Yi}R- zjtQ5>9IJ^(NC%{lQ3;tOB&$*iPhgQu#a-RCsFeAu##9k~pEaY`)ZYz%PlS0XDA;QG ztDj>Q#V@}JNOjX!C*R4eFiZT9`%#nbCU@jh!Y2W^{#wyu?Zd;` zRlWzEJ(?T)qy*r_wpO`gU-6`^Y;7fczGN|L$8+~9LkF7Qo88&Xh}5Mg>_Prxzeq&G zVgB==cR8_e-^E}FNa^eumWZXW?QFqzUtk@T$LjAmCnPAg9A_9K@wH4e+E}8IlzD5I zmj?Yw+TYDe&meX&E9HCY8P?}CPkZrfNj;m4*j?-}28nhHQb)w0D+ff**U^KgCeKbsw_^_n{_ z9luuOelv(tw$Oh)T}VUB5QpWvTV>@HpL5gu7^ZGXFD&{;G449ml09YT$FOptPrb$6 zxx%I2?_2d7@8Aqc>$yYM^z7+xiRf2Wm7-^H^0{Ex@=!5c!mPf!sRzNlYd|2)ej*Ta z%cSAiZJN;Kmk}xUoT4xps@Y3jFcSNR-I^d1)0u)k)3&lXI5>%}%lM)Fxa2DXy2bRu zX(e}Lg{Hl~tzPZ4qeA!=w{wgS#cYE}L@+LYY*X`gGi?wxqsX-PZAQh+beu39Sxvl3 z$Ug4%_}eg}PWyH}NOF_iP_!<)%dgHoSj|~G_iAF|>rdD?TTJ7xGT9jl%t}aB0($~F zzT%fQD9|+N;^dg33dR8S=bS~QD&^V@>OavFU@1r@jj&sPOtxYcMDO@hGHI(N1V7$m z=YSD8x`+FGA`|E6(53WDk`}@_ga2X{$aA;r@;kuta8!!*7RYHvH6!nS~ z;-MsK;&2F)!^YU*|g-15Q*Ue)pgONm874xjq+ru}kio zaCb&O3oIucSu9SvG*#x zKb%+ssmpQz0GKJEZV%57tvR8+wK*vLn2MOMM6oqV5Y(pG<-DrsVu5SLT4>Im1Ys5#Cxd44>RX zxFJNESFJWl>)riDjmop2BMv z;h~H0#gxUAl3IAo$B(C{tq`P~`JZ_V0VAp4)81MRBsiHf9Fu~)1u?D2Zo_+#6!B$B zEypk%KFooHcrlS2L=F#pLDH9)i+i3$7OtvE6p)nllU`%!7eS;zi$=q};4wGugS zj!QWFl7jU;!rm* z;(w;)|ACfpHx2|GIiDrm5KzQ_^BEB8%MprnMiCrH*^=N)(pxSfA_|QF+q6U1b}Z&M z5%yX9^1-_#0vcZGGrnUW3MC8CgvynTN;D>xq13M{fI=!ZA15_3wfJ-{gpVl0teajT z9p8viDzWQu5|2vY;lfXJz*h|9H>gD! zj#G`Sp?lnLlEZOl={pY+IUxt7cA~e>6Rj>m)3Qo=Y{OInygKHpZh3_cpr<-Mw6wytX_mZob84Rw-<*0 zx((Xs-rxi9xjmwNe!mx7O(Q4oL1ze#1NVA(?*pH|1zHOyCrTh`wAG!ix?<9biFCNms^2n`R< zCOx5ek&PXV2(t?pRpt-%J1|m9P8;7O^k?UM#WqJLa?M`&X%nEwXSoWke-!(xH|5`) zeLsv7^_J8!Yz<1ysVc?K@&iPQZrub6Mp-sPWG8h-U3*WNnh~G<+yXyTsnn)zkqM2o zc64H|6pr_r+6}YUQsMzoEjX(UW$t?jY72hh5Cd^ElTYLy*-Ji;q==vz$setdWRCR* zn3#>DEZ4ZHWw69_jGp3Ie3nTJ>)=txSpL{PP08?$-x4Q-n|~C$@z!G+J@w6=0(Eyo z#>^DdzI&Q?m?L7IA6DbzG;bYDh4 zFzi^`$A|@`x19b|$-Sdu<(&%X#D>Z<1Z`)m8f^U04RuXo#Diqh?vE8cTA zf1%s@Ir(>`OR%+`$tp3KcfdPvH;wYl2|eLs)@|Z@wpE51EvR}lc`Z*8elT~S>9N~~ z-)1P`@1!QLvVII^vyP@LKkk{FO8HaMqPmM=r0Qs);`NVWaC>upL2Y6OndSZNF_LMo zxd6QJEw|G4XTYSKc&V33|DZb|cuV>@lGeA}ZRepfx<8gr9Jy-x?}Svkmq6pzK=tO$ z(Hj=h8XXL?6-C~D)}F^|q}2b#glUBxA_XXM-A|L|_La823<8ju$>G>WaxzJqd*}z28|^lhb#@`|JNK zcd{wPfdmKi=&Zz){MkL(kJnlHpM!1m9{YvZ;2p&n{46)D_j9#qST8Fz^jn%H#J;b% zo1RrV7}~#AFvC`g!7BXR5rh6LJ0h*cIGj>tLUEH7h-Jf*974Rgn!U_T6XCf$XA9#2 z>HXX~iL1Xh;gzgP_kswSV@VyzHrTJkFQO*l*v_gnkFgLie+JBz0K|AlfFem6P|{)T zI`=9*uQtcpWR5b66i7M#{Yhl{@r(rBYudVgUoO2)J!1h%X@A1Ih73yDy0<9#a;bg+ zQBmwtYDelOi><|fr@O}9bVMM68l;k@mTPMr-d)Yb(=HCrtKB(= zJ34w)6l)lE095bkTbjpBm8L~>@r7^I`C;D(J9mO-!B{L!W#TC^&T5(&(}Gfqvrct= z^$P`mv3lYrQ>+ZLjE|lPNlLG|6Avk2=3045SrgGmOx2uZ7eNFJHFk3!`o3^CIIuAf z_2%WqjF%KSEAdkYC$;wdY&l_e6G4ncBBUemXOb3#n+Iogm zX$U)%&YQxrSbZ7Zx1w<%yeO+#1W6r-zY^A}TshaFygCj0G3?-Tm|Qv{A;bgj!#7z8 z9o#_e8#64#Uy3-+dgTqkoM+|(H&iA$e^eYNlOg=gFLhkXYoaz(x#TZKU5bw(Vl}dI z=~sDs%x)#YIRT3Lk81W3W~eMVeF>tHq(=;_7f!<1mN|i>MK4Rt-Vi?m z@E0?H_&o*mjoPK8mRoA_Tpm(6C+T%7ID`AkELv3m9CMBRORCT=;1_?WbtSN*-)Qzo zsT`~OXnhd#P}bs}zn@t$4LH%)b8Oy)ki5A+&vF;$f=T$yHUyBX~ zB7QgpD~-@U>%fP9mMXm8{K^0vH=KSYxy*K%z|1VExe&DpiR)f<=GZ!jXGJ%KPg1k+ z)|s^wND5up)wNS(Vw(NL^(zyME2SHyn15<&Fp)IIbOJv@>@qOv74H@P!2-sZOMbGo zr{w-AI)kV4=6=|z>63E`k#FPG%KziL1m{!V_U*d&SxP;NbPYA5|M;!xUDl5oi7uXp zkM-4oF-~$})<(ZR(lC~`D%bPsnWI*Wf38gp{+LUc{qG`&>Ryk5&E?WY$V)f6B!jZw z3o1bb1uD+V9ni5qqAp%Vn$|}HbsQ#SI)jvV#tug zNlYfO>$8c}7v8HN&45J4U76X+q5j#UQ9=O9*2p(l*M}2#AKELFEYLn=$ybkz5 z8b29&zo^!H5j!4dB79Vgic!#DRy+>WrQ3{1$clljB`7{746hM-k&r8{tFqfCeEdxJ z-6`Jb%+X#fm0LM(BPbOaTYCEi@V!2Dt0C2CI^Jh9j{Boycu*R*alDi2E5}S@_Z#Ag z7^!|%t?`-|c2tc3VM6UgvN2|fdLJGCHOb!EsI>{n8pH7DQ{O$Rx;spn#B243>9%F+N(v*GyEZGx6o#R!{)8sf_sbl3TZaLa+#;^1HeTvMk zS)=?-Mt3^}fzOa(W?P5D^aCc{G5kq|KI*NQ7&EbWP;FS@W+T=V>6miy$qF;6w(<{b zK+p7M`yip;F$NAsOwSSg6v{j}wakrO`W{(AHk0JT_F5F30h}(xC?d(^EQY`AUJ@Kr zqIkzgKE}IH#4FC&9Z)131jRQ%5(oe}jlsFWo7jTh!2XAD!DZ}5tlYh`)JRMx88*nD zs=UBlbKF9~#4U>&6Vt88Y$!;Z0=?9%%Y@G{N+Mn#U8scputc29j9M4%<+FHMlNcxk zj3Io0bv{sbF;n(qtLy?&erX2!$x;4upiEd7eN`8x3(UgEMtBFng`sdTk�o8R|jl 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 aXMBIa5!=t4acd&pG| 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≀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

5vr<@X2*_hQNHmD)JXdM3>U|5#|J5Au) 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

6im3Hi=96G^Q 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%0DDId`6{-}wEugNt09ADGIf`~RS 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Ǭ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¥#ZsmMnT#Ul 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 z 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

lAAm2w!Rit@7@{{hwH?1Vqyl<}mG{`Co985*} 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

D%3(;EhL^QaRuIS#{nCr5v0-x=ouRlS|dL>KpC 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�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
{mM7MzJvW8COV>Ik_W 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�${ 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 z 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%0DR{&Ecq*J=dKtNqtt1 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 CY{Di0 literal 0 HcmV?d00001 diff --git a/lang/editor_tutorial/gizmo.gif b/lang/editor_tutorial/gizmo.gif new file mode 100644 index 0000000000000000000000000000000000000000..c5f192c367bb44a2099cf78d3bb44b99982d0ecf GIT binary patch literal 357759 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

P^{y+#Q_e96*c$e}Q`D(-#IYubvd4UC@H^^x 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%0DDG2aTaO50KrLRX&!g2UV>X`*%6jo&p;wA34SD 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 z°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

~nL)pI^i}=4 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 VAOtNH^~@x#DHkj2i$v00{2%bNFmnI^ literal 0 HcmV?d00001 diff --git a/lang/editor_tutorial/join.gif b/lang/editor_tutorial/join.gif new file mode 100644 index 0000000000000000000000000000000000000000..49c5e75e7561f55ccc8aff4d3bd747d70020c5ab GIT binary patch literal 262186 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

UqEcJ7Zp6uau~CO~bH;@p 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 literal 0 HcmV?d00001 diff --git a/lang/editor_tutorial/lay.gif b/lang/editor_tutorial/lay.gif new file mode 100644 index 0000000000000000000000000000000000000000..09c9da71a9e6eb4d409f178163865233da8ea89a GIT binary patch literal 570167 zcmW(*1yCG3(?-kTclhClA6DF=5`1_GK171sF8@bxXfL=N44(lX&Vbthz2FEi z92o&lcp*3x3IWRkfzV!^nYR3h2!yql&dW;h@&tHb0(@p>CILKyghs&Om+(U*{1AGm zgM_zT{*U10a5%gdnlQWt=!MU~4`<+Q@Lm7_EDJk?%YtPuhk0k(wi1T(%Ol{(!+an@ zr#vFx8li){+(MSaFWa`n5IUFOgv(3tWm`V<5)3X!mV*`281aIn{PJa|nXTUC{c%?00vyXJcPo4Km-`*_2T`6 z^8a}N3BP=4yqAZ)VhAw&5())hLSNz%h=d1TULGQ#;9=-XfL;uP0|EbY#|->(CgMf$ zGD6JjMgGMVmw^At&&(Vm0N`N&*lPw3L=NX8hqqpI;4oR_B^+74by*HazBr-$1;`~5 z%nQAILB|_Wo*z*TpLwAdnTV~+h?iAgBFzi9d_lqcvJDh0>wE~e2FoVE0Z`Z_6qXN# z4MShj1A3SMZJU9@0kBH|EFSvFOhJ-<<_A!3>XN703pETVIVIQ zX#Ij4D(eLW&LDvg!$6oA*xDKl69WWVgRS8}7!+*n4D_-F2EO$0mjNu$Sq$zBwT8c> zw3zk(@);%23mWLfYi$h$JfmPz1C`zT`@+#c7jk}DkiiHHa-tvycZQ)*BCuGipT*u_ zD5;?0pCb<|l{h9PPYHi*X~iTo*<3v+ku@xjM`p{r>&8|tm&f+ska7ACSP@$?Q9+k? z)m$=fAWZ*B;ApW#%EV5AP485{LLVCk$gxeg)?|fMVkYj3`mMw5dkt5hZ{2#=JL~o7 zT0?Gli{HbtEtN3O`hd$4+P%0R*KSYp96N1L);p7acV1lcd?T;JkzjO9A=5Qan}I?l zexb9~o1H~#(FU&R2XE&QZ>sl-{vk{4Q?LKS^8xEy z&%XsLppaj&mEVK1mL9$bW8wHwga?QMKoJ`S9dve+kMDN^d1yL{KddM`Y<$$B*dPK*v}`@IIrcqXd;BP0TIzzd)I#*hmpnl*7r+!Cw)2YtRb?j1CIxGj z!bV20ISU2Bw=P(osXDU4n5wA=UCV;y8n30mJ^c+btSkI&(`^inS*+h7-&aS*w?}V)0lR9;d==NN9ZtIKt#@RIrrn;=v zo0w#8sdk%it!un~YUoAX6XR*XJS}&8%X(O970umDl^gH=FCagVV@Q9q{m9sqVr1RX zG}pKJ{1>}jTav_zS5dvoF)GJck9D-)9N;8gY2tL>OYq&<@yG>DqgRHc^9IeV5N^~B zTr4o>wh4om%RAg&VVb`PW@snqwFN>7&O7vTUdp}wXll8PMq}2r#t|Rs>2BW=#62!m zD%|1blm5KaylC3+w;6?I1)Fag^@6R*=-*k}K(fMQ{3n#eoA=VlgX*?Ucn0BZr*t-P z!rQ&MNbcoB>qq_-9PErARttzP{#IzDUr2sCxThI%t(K|gn4M4E6`EW$yyKMEZvAT8 z{WApgMcjDwU4aCAGJdJ&^y^nr$+d-2%0DN_j%-Qzx32^ed$n{VVuPhE_MZ>?#p^%B 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%0A*en~ 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

wlE_ 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 z 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 U6DkDw~U-v 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

mkB?5~8s;u`zJBSm88fZe6x}ga=bC z%2WgvSSv?p6&E)pdzOIO8$PbS>xx@XJp~b09|JWqFEfn%sl4Q>!d%`5su+T+H%x0i zFmL2kZG*uSaUhhckS-LeU(=u`RarJKSbV$ACgJ z>$?zt#?^1>Y?I%wttb=ibTG=EF>luOU$qj$wsgO5>Y785cPoUhwb%_p7B*I5PhkMN`FG=sy% zq_H!t0}=pW&)}s3R>fHH^-z|~Q}P{=C?g1SggeQCZVanY1mVN^XNnTSbQfLxd^o9YsVsH#t3# zF#|tf;hMp1ILqXuXy8_5AAUQXr_qjL#Irp*Y~p=N7Qu-A85|d?H`Ny{EeHkLJK|+i zO9!&-PK;FH*0ip!h5WjX3&qL;YV1R(RZgy(HynGrZZk0taoO2vv@pi# zpSyWQ+ZqcoKO8K6HOH!8#A_>8!enemdBT46j#7<}6HTw@xp&}%2$+jxM2(65lc8Fv z7xzdBVY+JrwgP5S7%!9+>gN^Wk6?FCd^FTT*sv`FYnZJ8At;5QuH?K=LmaJ1K z_H6TUxoe6u%6Q~yLMfjn3b=i&bhSA3xRao?uj9fxbdT;@%G~h!O_a z@WC6xo6llKpVn{3*d4QG=>ktKl|jEny>3>+;F#!A1B`IkjnXnA-#r&;CWwDTMTwd* z&$MOzyxd1S3ts)Fmw23^H2msPP&yKB= zL)bTsS-hlVxtDc^C)maU4al)=ykY|UX3sLRTO~h2aYN+R9xjS9>KSS0w&?=^Gaz-x zw*pV1xVY^=4}T;l(fp5aGZcBAa>@1x7SycD*-US#u94WRY|?zqxf$@(OKCY!J*wsM zDrfCyU4+CO&+dB}NK>}azFyz2I$We4>qxQELJ=pmOG1ncjiWQmN<8oNxaM*?<~*n%=_F~_KNX%meH-3DL(j~ zZLW-xfyoEmj_r3Yd8#2(%yJH!GQ>M9mvXQE`dV<##HsBwyY-qBAg+X#MX{iZeZ7NE zXN%P3IVYUoM5I~_{@`r}zM6BsqGu%wA%Umilx{&(2b`2wF^vFkqmz6i7E6Z9pF+**dg{)Sj0%<@ zFm*P7X}Xj5OD7+ZBw*T?J%XMiPQB-5lNDCFKeTk3zvlhHyZfY6;1e@?0OYm z@0gkQ1+hk&>HL%(z2GQD1WksCVts8E9w=w%hC9zG=G=QDPB}Q>#zu=YTv#`ke_wK~ zzn|&1@u^_Zol@ckdqmiB*Jn=3>4qRSbp1c}z++jUima3X02EO$94HGr4+1k<0s+ca z^p-%pOTBDjGoj81?>|EHcQ|tx$?6zMq8rsS8Hu68lM+F{OJFK+*d>N;qy-LZK>{)U zV~nJ+GSjg-mod!5STPrjQFg4EZoEViSWg_QDj09o7;Ax#cM->NT+NlV{Szat8Oljd zzn9cmYxFkTOns1!Ra3}*&m0qsJ{@;pIl=nMg}l2M7q-1_vK zz8Njk(M*o|Y!0Vxe1!l<1iM!D3;UK-LA|RhHW*Cw#4cq);I8%K41rtq8cB`|3vNkp zxx_e+_k9Y8KQq_zsjhHl`{4}XeTGbb8ix*?-(DrPgV4ZO4d5oA8c_lgSffOe=);KJ z;tgRi0PsAYT0W>H8q+OLn*JWtd2sY0*~y_Tq#5QKXeA6DegE)m9MGmS^WqW7WereF z4=ny?3BFb(PhyauuMtJk>jf~Z!C{Ulu+2Y|zmCQTnG}ljV{OxvDnQsK#vx1=w1)in z>>(I!N%al&POos@R&z|19tM+zZ6e3pR{)ojg%sb`fKC3LFw0KG5^z8e2~v&V#a|=J zr3@J=V>b2U4imp_a!^jKb(kc9Ly{pk*B&t?LyOd|4J1*ua@+!&{&O7-Qq+_EvBswO zjOMPM*lIEamNJl<5r}&0|EDWY_z{IB2+_cp9i?`EDHm)0G1181jgcDDKxOmO-H14?&`qjyU9}CORk{vnK+F zP_x1=TtX3fWNN*X)5OA2r(X39pQvcC2GqL4tgo3L9cIo=9 ze#sS1=bHh#CnDhk@3D04J#V^B~%P03c?h z^X+1PR$YWRdf8y%$Bzpi>$ozH{$cf zy>ewYP;{HvfL}Np5_TeyvK*Iqb9LZ>t4>lk0OQID-pv{KpL- zBMKS@cV%8nNizesOanIIAO$2)H3-xQ0Ld$Y&XK?$^iWX%2spGCHdT1>5Pagw5dYO7 z?VZCVpXF|gENqe+76zN!#DI1SDF8EQ0}u|vDM&7!iNSzDP+9z9Ln#1A%OmfAT%*@b zU>Bk}BL_S8M>4ADzgA827>uJ5?y|iqC#aW4b*1OwdBdtsCfr2(p}+~|S}fz81!l{@ zt)XmPcHJ#Qq=0@BKRe?Yw3$B|EOk}+b&g%->@#G&@IT?974y&BUv(W`wf=-{LZ_~3 zpi0dMT#x>_;ATcQ5D|f*_(Y_RJ_O0afieViV!=okHbw6SSRVnJ%{c-nOP0?LOJPzq zEQx?*Go&jOns(N$r-L0U_4EQBp8PF>ORR9gi?%i}6PY^R&Kf zG-$6O$_cZLZ=^|AxL%}UB1Hj$c;zOywdjW&0Bwrior!wTu{dEZiDqb2L3w`OsH6$Z z-|yeXD6vToWtUesRGe5{D=Ufs#F(}~Rtc{7XpVZbnPJQ5x)#VKe^3dKl3yu++v5E? zfDqIJECo@cNCq0mcSj&PQLu(|IC_Ql4kVJ1V268PIlVziZBECRrC?bCfH-+iyTvj! z%~*mi`{D=RQ?BIOp;0}KcPP<4rPvs?6;2V(W6_4dS5evpKni7H zR8=RDVagu^Lhe+ggTusoKD3$orDJKyzjdi_V;bQ3=_N*FGB&bHM-E$u7t6|DX4DiTC4krxi=$^=I37lGE7q-1I;(XE<#Uq9AI=OJHQ=EEeVK9zx~qyN1^YL? ze|0}|P#NW~-h&3AEl0{q=I7T{2#}4J;ajm9j5+J+iaVNaSQ|=q(b&Xi@zrbHpd$WV zEsn0!U5m7wr}?ieaWSWL!sk+FwDdmrk1-Ym`j4dZlLAP*(NnMxSaO zrP5u`1|CQ?9V;fNy<~e*9i(PTwFH21TwM0^sCf5CX@|01u9bj)RO?V(ARt`2pQ-R{ z1{#ZSLXaoWF>c-RnxHI*f?AvB^lG-+q5zM7u$9ibDn`@$K{O|RjZTOk+P#V<#hM24 zOVm(Xz)CW}9l=u8C)V5sC#gd5@qETJgg!!(5ch`}J-bdCv%T;x)U2E^Mf3R3Qd3v9 zWSZxgI$KHutE{T~Xd3-z!EDedKMVU8iBK0uC;)-CeuKq@q+y|AsEmpg1`Ku8B-+@6 z3*|PX9Nuq=2E5a{mF3I*y(&q~I9kORv6W4MrK6B$%6C-*_|9|PmKE|g^X#IxoO^h(73^qLd5l68c}(}u$UmP&o5+S`a}@%lG(?@JJnDhZUo>|@&}64Lo+Ow z%K5~U(#(<&6p&KkNJW4(V#FEPp9-J>H1YLe>3mJ+#)l=p-^uN*^qEf>56q$gm8lWr zEIc?y4G)oB$Df~ugV~!7hmc*42H+<;@5`^&WCwEjTftmm zg5uil#(FQ>7x50>VhE;KRr(CtXKm*R-6AnFnWiq#GPDso?Z*~Y_%(+r~$eVW~{S$Rv6!a=0QV7J2_?y3)EDdzZL_?dAk= z?yvFtSH=Ma6!A;aGG9!q`M%3B716mT#$P9Ak9l`!BnAJVe2#BZF0FZEhmlouX49G1 zVg!)tZ%=G+F6Ruc1E#l~>LdXaBXSgI0rVGb6U`!u@cY!B*KI-D`qD81CX@*emsJt3 zT29BFLa)5e~{BqXSJ{I$3Y)@-;?_ z4PrBt8~Gq}RXx}FMzGJUN`&*70RSmGWj{t``BbZ;IgZzy6xZ`qo(H3<^uR3<@B`nR zHpOY(8~M*3y~KKcSFD8Q`!u;ZDV8Sp_}}vOxS`Y1-1P4Fg|olJ%-_7lJg>txSm@@v zHa4BFjW^tFLY6-!RVQ7dz8W_KXp+v%1(tb)l2$PRIlk(TB!t?BUq0I53~=V>H+x`e z&iIYsKkzX>Bfh7B=4*0GD*unJnGTuzhgh%EPhf@7-p>+2_rVlv+I`q7+Lp9ILDW-)AoRRNGoVx z(~fxfIe3{fmsV^v`LJ|$i?^RM5UFza+X?Wkc-W9&TO8}r348T&_~q)-or(Z`9@Mu- z&sJZK^E9Nd;K#O@s#i`&Qk!X!hp{4`hAuTV8WZtf6#05omx3tKmTTSk_}n2D^D!%F zz~dKj#n*1iL@f@l{%Y;kJPfvo`qALalKYnNGQvJDjbWAM_nd> z1#6PM6CaE#_kU)qb`{rtjd;{R03!!7!^OGI`^$3T_g}ug7DYJTPpv1V#S?V<6D#;N z#A~Oi>T+~zgDUb)&{9~ap{<_A61ASEW|*N4iVbU8!ag5@DL!HZIVj*u1v137QyLOi zYX*4srQ8M*s9IhdW;APY4HkhktI8M^qiT5gsv|KqPY8Vvdn=b_fPZTMQ6r$R5gazB zJG7+`)q_>6#{2*?lgkZfJAm9rFY(@BuIX%~ck~ikfD4L4vXP(s9Nu6Kw$ukXI=FBu z#aV3Jywq2BXeEwXttQb`Q2aqTwLc^+Zm~#`U4u3Q`ivCMc?@NKeW|;~pT1XG;pGW! zJ?ciQ4{Y@&D2~UU=Z)4u6E!^2Qd@MT^Q*H*23kp@xr}34z8J;$nCsR+Gc3mbM^Ee7 zfQiOn3K5ZCHI^Yu^PNLlu@*`+N{}hnuTnLRgX$uI5|8)@5qVgcVHRbMh-WGG4jRie zjinjEMMjX|C2@+5aX7Q zcYP(zjO%%ufDv5*A*hABvmy?8Gyy?E5Iz`XS1OL9zW!9z$#7Bx9dOz|deOBC;vG%C zr}*Rm3($n0J-}hrFG{hpdhVjlB*o4gGsG^$!=jfHN1gjAK4%Na9(UD>_mLHiApq@)<=taH*uvCX zC2)S>IqIF^P%07yG9_8{ZKqm`Fw^ibqrbApi%QZnA_&WQKvYSbTmXQY9{3oIrIF26 zRO5o@!Vy&fSb(YaG}c4RhQk{mWoSt*kSK&W%q=^mK#t}%MJ+!Diz**kCOOSv-J@yt zW;U>je&s`ESyAf71%IsN%dENHx=;QCeunW->${bO5-42JYZ&LbVQ+<&0<>~ zi`90Cw0!Al5K@gfw~XT?sd6LVzmc@TkvbwYuuK5RA6w{O?Lw>rm4Fb01KR(>MmV$( zEA1K01n7qwVyG<%QFshB76T(oh~n2j${A(m2*$V>olG=sysk(kXw-%~r0ME^#R-a2 zjFqjtI$d(mKIm@pZ_3cFSguQG*C<&0Ho7PS9Gk0Cc^67cS%Qhsm_-8?I(*0z02)+~!iR!+NEYU(afK49M;mi6!pMaNkO4)Y zG-KkxSYXVUsH(feL<{-tw75#JL72B;6@};H*Kt*>9rQq{Du7mH+pJ^Usn3o-Th!{Rec zjcD}>E+V1RkbOSJY}`Y7AxTX9AD%@k~X#S8b(993LOt|Sv?S0ICB+=&DMqz7cqiH$g#hE!z%V+#`=f}f4B)ed~* z1{S5c6Wk=le)=N5q|yYMIBg^d%-PcHUl`^Vq$zz~13}DpBV9jLu+iI7M~`1Z=^i>1 z!r58u?c!DY8Xz)t74M`KXHD23iJPDxLhfh0!1f~)-D3g!Ovle&iK|4yVT)l=%?&yj z(0Z#%5l7YU!gXf^U=`_L5hZ_xs{sY3K(hy zo{#b;K#RBPJRs9%)z7`IS=;u)J(&*6fx*7Mi?OCj?=~wq3pG;pT1?2P%k3FaG&hBXfM5dIwHfA!TbHvoLdVyic@W zx(lvVX2y5p`sW)8X^@6h%Ddvso3HddtPppegPFNUaDvgbf%ivXX_*zF&)zEJ0=NxHXgy0SayRsJlxuD-l+fHABRKm-W(i zJ*j6^RJMKA^B<}Hh{hnsj&ge}Zj0%P+tJzcAPiFmd|yW7VnJyJKm zQH0(;R`VvX_ke1t993s;C5`0(D=%&*G&u}1T#Fx$O5MMYpga|L(qJZe6GipH!D%uu zJvR`a*c7DU5e?5&1mOb{4CLnz`RS*kFs;>s1RfB_dKPLyRW;84mLGNzu*e{)Ox#gnE|6^oPIwH6@MM~*OY5bB7cigasM!_hBhDllv>P;w1@^aL-WKC(4d+T*GkKh`?UWs$z&I zoydy=r4M#@A_`s#a$lK3ONgcYSuu5AiQlW=&U?-JRLpef_@nbf!@-s>n#4`uMhIFRQTm%o8uS<&2+A94-D$4tEKR3y!2P8YOj zBpvU*nqjSvNXWIz)U)Ep&x(f4aO?=SR*>({54mDypNHoodMK_;|59P-djYWa9{9|% z&Fz@^P^!?{^>mg>+RmTeI(Gd}hpUC$_A+P3dnW2z_;4!rdp2@(IG~-7tf#5lMeWPO zaP2+k?_LaX9E2a`TJ?68C|BUr!?`yUh{j2fHgY+I@{w?ntu_Nsi!(W>P`*f|_{HLY zSo+7?A20nVpp+m=X;s;y5;C*{5!O{DVR{KP4B8r^Ye|6kpYl!`q=pjRI1o~~KsCr? zlt^vmv?Yov?umpWgE|H_sNn2WjQ(7ggvL@-wlGCQ=)M&|r_>;oCg5rl-+a3ECqO-0 zSVW?z8j7N3gyzYyQqgo$-yW%ltMq&4H#I5vNmCMQDSCt=3}D=1XS;^Kd|%3X1L9Mube-z!VI?b)PY~5l=VVK|a!2N5`~L!M zK$5?gi-J{v);gi#P{9d$p>-k(380{bT?qto0vjmom_QJ9%|OqL30US=2q*}0V`wi1 zk`Ms|SVv)aGR0DaOno^P zQVu=@(}xcg8j@?qA;jfE99i|ynoCI(TUOE4(*OlP*o4y{^{4~rpOCubWtm$MWz?CD z>L=%GXL?y%Y<;pSD5Kcrd8=z;HCoi90u8DVMyNJ))?Dk5NJDCM1)&dT>Vz-@vvYCQ zfM0-QTR~{11yKQC^aPUFVigENT4n#_CO}V>mnDFMvO1t(?hHZDU}IeJ4)#uCfHj)m ztpfF?9(LpTiIF~zN`!Et(#=^RM;E%pFqm8xik?CQ?6+VQKp z;uaFf7dHgw0Snw|lEKfpH^Lx4%qIg72~aRI!@klc^Q$li>l4Y&6-!jE9EDYM#>`=t zaI6VY-Sl($?H09C6gNz=Y!NuH&WH(g06|(ogm6L!XVCCY2PnvGSB!AU6;}glqi~pJ za-Y!R4Goa}ZUEME^vvRsxhY7j={k0yLn1h@_y;HUurOikm^QZ~9!i!ecm zAYtf10~$E+EsI&l0kNZ>H~hmQEnJR4T9`lFkS{kFVc|ets1l5{FhNIYVGAL)u^e{A zBRKp?3n%rD8j3842N4btJCZvjdQSj7^htkWXvGAvgoi%#&FWg1#U)>0D}DC z4GT7#Mq&pf*g<50EP|1wU?c(*7@z|yrw#!+a4~5C;Ezn1ti`Bf9-~ByI@U5G!Rbv0 z4z!2hNLfN%zA^zofnEH-laNIg#foNP07*2tlBTE-Z0CF08D(`oIH9B@4XI{JTDCl_ zB-1G_d)ailm%3=W4u;BXP)e@(J*?zI9YBx;3yL5MAZ$+`&?(6=f!WMqwS)kf;s_$^ z(aoVS$jqi9m4U}O6YfZiy>LLe_feZ$RQdgd^gsEJI zF4H2}kjj!UI2F-cUZmLtib$m>1?@@&NIQ=#F(fiO3SRl76tF1Nie({*BQf^c!9LU@ zh+RNf3UWuMvUVuO$*oof+7OK;#UD-iXKP&o&6HtMilE_+omK_^cB-| zn@XJQqUW{6)rSn~1A)v|)`6{DX(=60SzV$nwHQvoJbv_+kj`Tr8kQ+YKdh`9c?3Ee zijc$r#+-sSay<-+7=L){G~PakQFn}ui@_9@_2T$xGR_XsA|l}449YoUEi#c|BN2fJ zIKEPgNEW-}oc;&^tv^7)4`cuW2e|dRGz$=xF;-iHaM@u@Q!LSjHRFu*M$J4Xj%)v!aX2R6p6js zL$OAzNN#0o*)6-)sB2hbi*0A)7F(SBEzVP%LP`9cQM&-$qEReG$wpEoIRUmN5syQm z&o zh=y=$8<*O=l3hCOE$e$L+ah0e%DV$jGm#^u&B@MqvTgUMmgu=DL3ExACB$;Qrlj3c z!y$Gg7E#z0b10+|%5?o>wNy*=Iy$Ex!O^GeSeYcyLV@VYnN}OANLzVEKQhlPuD}1} zZEplJ_yId)F^B_w;%E>rvI^*L^Xj2B#z$>U?bQ8Y%wnS+I-B zSb}_o<5L?b+TGNRwB`Q zI{Y2yK{i&i>)_czZy*lJphA3C%^lhkp**@zHu><|zB~(Rw!wy<`l{*%{I=P1R?O*5 zM4`L-iP{zO5`_Pe^)s0v0kZK4i&hwj%dFf1Aj;}A%9=RVm@I^pxkUU8plfVw$exUZ zpFIV600#k59!0bVT@1n{u)_}w!W*cAThU$WkVjC!$^KatGEK^bzU$Z%i?;r?&wTxBm z)v}2S4gkU#oWKge0tYw%ei)X>C``)Sn5?m3C7B+?&=K-jO`_yed%+yWtl?5YU*W}u zAzd6DdZH#Nil-$??#v$25L@C2pC(R46>SZJ00@K7k(v0;08&JqMNg;I;X`GS%3+1S zY0M`2l*)w;kvWf5Fp<&;2rxoS=WOCca9Qz$4lsQOk6Oy|L1Q`c z;zt0;(5%xz+D`-G$p}Q>ldTRlV&M*{P7hI&P+*d89YjXT9J$#LxY^Yu%@)Lbq@w^) zGwp{TIo`*hWE1Vvx3whfjU?51q~Qe*N+yL$!VF95Lq1SIip;sB$zQUmU9vHN-#JC5cv{c3L`Ln& z6`s#OB?r_s1q_)9Z6TC8A=GLeMArd9m9$73aEdqa-9z!yUvg$RX(2!VH3Up}X55+E zWCkW;`kenc#T7;r6{6csUPWWh+GPsG&k-kUo&*eT*Ru_oIPr;WR#!B&Vcm71r9f0R z`qeyg%~6dP`9(7?`n#_tMDPTl| z*E{Kq763vJIKVc#25h0uEJk5@8t8V$9(>`LBstXzGD`C(2tq(dm7yL3PA9QtAF5qU zg<>Z{Mc(KvM|?tGg=WXsY((<4O7g*2Zm{Tux`x}KlXwnAGDX)%e93TW3`ES=4Ap2@ zsl;&g7i_g1kV*|to)3+E#XrTNVSNvc>DO`DXlojiYYAS#5yhte;LN800T6J?n=lh} zp$Bsb*9_5EStMzJ{Sd}P=KuMY%@J2_nS_J=6*3B!aXqP=qUqBOX?O8y^y%qDc$can zBV+v|NzhkFutbR}YM{(%birwb&Z&6J%=BH}_bDR2DHQ4PSYPQ!8Lnpe$A7pP zY{=YwB@!d5#H8j%t4gQLU8)0q$mppNmy*{YFo4etR)<6xpZzLp7T$+=42!k~i{^*U z-C&`aXlpo;c+BD~UfiU;pf0W<(#N>Rtf+8w&8!Fs5~Hf+XitWkVw8`@q)E4

yp}6o#hV&ZrM*@nx~`+ExZ264$<2Nq*~XzkbP;goU7-#gof1UJ5GN`| z-`nEdN-o<~c+8sWtzp4q$rUQqi3$U}Q#{R+mln}MICWIF2 z@P*&VKw+`m;Mm${rP5&LO`ff7QUSgO1%io~XllW*N$+4E&DdW1l;Hwi+^{gfuB8=D zfWWRUNcGMg?@I61FsoZWNBB+|R2&)fMn?}`+48=Im}rddE?%p4O!}&y#Z<`qQrnHG z?|_Ym@JVl`x|&CDAtOSeqO|YQ*b0hfEcP{QibkQQp-I6$MRaDHn7Ct7eANSITm*|m zMJSh4B%smdUG;1WBT(ry-#Y z&kyB-6{Q|yen4Zi!dxbbWbFj#u6-Staln|l zRV!B2a9F7d?IHtW;#|dXCn`)O*Rg<5V&Y|z<3cDOdF{12_ve+6V zlRk*}lm(NH?97;+P|eTBW#cqL5g*BIb2MHx5^Y;%kyn-_SI#j(;xQrZ)-W%wPF}3e z77syuE4T?OGrI78{;UHyK%M*GvXZb{~CFxo9$7K|Ekz}MXb5G3+Ei!?YTpdvBu zAw^O$$}~<=E)S(~MEb-XC3Gc%Q}8f~Ljog5?@ll+VnBkE3h|^|BGg4UMI?Q6RWAh) zUA5`uQB1>(C3z9$W_2Yk*KXFAIU!bTy5>OsaQD@EFu2WQCok#1|%}IkVYv2v=ED6QLbf zUiH{7V=!{V({>7}u#OR!y6LMpSPXS*b|QqGVoZ(JUyMiOg{$MK z90j11p|Uzhv@)on6k53A&RBg(hU-{$!}*+_YRTLhD&qNv{5hIsN5a@D7s$d4U=PH3 z;u=S*h8kLgLwcdh%AXnQzxnE`vPQUis`ve`d)aXIb#9A&4c5r2`9_4KTd1o&qkc^4 zoRunrDCVVxy2-|?$m;CFvg^WD?5@A_z4H37qujx!YsiZ5raYFvUIGWS(?(FBGpC%f zCv30>yLuM8w(p$HM%}Fadba~R!y-Gv4!bdbd&jmbwma3fi)=cjazr3-ycHAWZYr`} zuI0)*&9vFG`DS$g2IOP<2PEglEdTIH16sN2gLW_azv99O>?;3Foz7t++fDn*KB9@z zaz?zd;(~PQw#LLiG5&Of)T$rVf)zp_@X3@ss>?>mtEU7{9mo2raRoefe4f?L>(mZp zn+nf#YWC&&YJ2UKXaDWq2D&>!;!$i!(bLfESW?{%J*;Vnd%OV`81f}N{CS=0diOF{ z>G$aXE`S3aDO<|uN=oUE(5BtmXXpdVtNFU_*q%AyDEEh%@ z?omL5;lfS-$bxyz5%T$lsJdBpaN*HW9>91$ab5nDNr-F_*Y46|CIBE50Nt0IYxo9%J^^Dwr=!rGiHa?klzL0m2{c+D%;Xv0Ta$J6guM z_;N(B^%@-D!Ufk47O}=PXqcJrVYPVQ&~04VaYovTDe9da6EfwRo-Z%8?RzQkiLr~f zRvvaa;^7qg>fX#7`g4}Jlh@YlIym>`AhBmv9uhWl#r~8USDv{h|6ZdXYyaz+_<;P1 z3v&KLt}(t=qxK`hiYEKq0t_qw)1wH%1O-4)z>4JK>8XE4dQic#CL<81<5Y4$9Uvl* zK^7E#0HFa2#^MjS2pK#uum6<7FD3bqv#>$to@#I+s{}xgz?EuZk-;0OTd~NAXmkrc z1DqBm^ySm!k5W?@s z>?|j+8hb8I8T*6`;DPA46c&!mYcfB=Zm24NutS=51m zf_}!+>oTwqjqnZm!t9gIvZ}kQIt2UU3)S9QmD936wZoG||20pwXgke*!}GQ3dfmxI zS^a|ZJMz>TbxaPCT~yV+@Y_gLEo+TS*j<~8DJ5Zt^fsr54nS|MdN3M+IgTFE@2Ukb z!fPXPDKv_JndyqfQVAk}{lXV5gCokfr+Nrb7rBk#ZJ9xo>kAoWhCvdF;gbF}3}T2RF00U- z_T5<`hjT(#B9aYWnpKYKsc%1+A963?fs<0Y+^qkdx+10d4eKIxubK%x{|;z(zn;`K z3|*o)k}{^Te9BCyl5B#mtd$zdI_{)=y&EEsRub@y|G#p3D=Ucg;>sqWBEqPmv1ZZ| z;+qU(pmDP(ug8G~28kd7AXq?wjS5st%Bu%AA|Pg4bGwPDuN@jIr^_czsUrf;D$8{# z_a+Ol9Wn39q0NITJR*OR#+<9mA=lj@$#2K}@Qp4C`2gtQYh7U0UyR=Ov_aZC?IAm2 zpl`=7GR&=eSt2~|afRP1t_lsSuv)spf+=zXp#nIuT&Y6uQA4akyC8- zlX_4<9V6gE1h^oJ5d1(N75G5ZaOA6#{D~|Ij7U)=WIy#d(1aqy5LPU-q$No#Bk(dH zRs0vi6fz)84NOZ5kpdH}1hH8qEX-68n316+|A>fLu^jD)`q*375lob8uBWes|2N3!8=s5OQLyeQN`5O{g~-ZUIJ5`SL&rRp;(>PJ#Ajy8D==Q8BAir z&OhBWW?Y&%PkdT!ndp?~E_sQzUapCq|IIu=-||@${@|o<+RTxJ5URb1BGV)Q#ih`+ zml1{51|$td<~GGf!AptGAS@6>I4B^wkX3Y{u2Kv2XroYy3iN0#`O{2rCd>466rW_& zjt_H{o{2V4rsjm!MY4^X^6ab^cPiG297gr3Qn9FvWs%G zPBJX3XJ*L~tboO-JL1X9ZYUX}l7&>3;nGkL(-KD^3MPfZDOuvB4+>gPbQ!!v2(qA> z6v`DRSfQjBix`w)!c~ER%F%Wl3(kk4HFj@}9Lz48Bb6#qLX@Qra{kId(l*PjKQS#b z>nEt477<%dDIaU?he+8?M?AKH|KL|+cuV3HYB-uhAtCP-$NF_;sgKp1R0!#iOtywC zjcuew+PNe3?PPPB^Wo!y`9G6TupZM4ku^{H0lFS-qm|^*b^U4?9>Q^G3{Yty&*;~K zUN>h}A*A4dlD-1Eb(C3!W?Euj$Ofo*R1~4BjLY4yFkq915pYIC zg%K3`HMtPpa0*w88TnqgeZBRqw=OxH7Aw$`0?lFL7@Ix*iOjCw-6rr{qhr6RZy}*8 zED(O61s#MYF1zEOR2>JLssK)fS!`)vTiDg(P}nHZsWOKYi4wL7?<$bFif*O)Ubq>? z%Me)`h200`tVq>HYkF~Y|JXy;1R9X7?t4;joNS)JtxHJ{uEQE}l@ zF+rLjZR#nf&T{E;lJe6|*Ktq*vyP>e3M|BkYF){+G@*Y(ATg2^sFevnCJWF7xK9Tyq)lbhXCgT|2YQ?{OVZm>AQh_fND_(U~mE< ztNQYL-jI+aBzrWX^cB5JBOjxK(b0n$4y?TV6>UhVjdR4QXt^&EU*F_K>zB211At7UN7|G&H!JJ10bO9 z{tgH{r}PZa1Y=M&M&R`TaBvQQ0zAY+Drf{&&jRPJ1n&+7Rf7V|js+LO>~>HcLa(9> zquUs(WH_r%dM1FV??AOrv*2<}b>3L-=jzyUmQG(uz@C~-8npx+u`9Xv!J{EZ7h<8xRs^e7R7 z@-6{RaWoi!0~>D^x!~|lZv)j~5K!?K{jIQI(e4m10SplCEa(9r&;b%40uCVa)&T+@ zkn%ibG%}_d-vEO~;|)0Q?YMv&=3xk>u>kGv?m|)WxL^bZVGtgW9pAthXYpg2=3(F^ zReZ+}%Zd(l<_=>b56gmOdV^|Q2U{$n4i)4P#mD<>B5Y)0ikgZcPo+@kkRmfuV1@!D z*o3%DEPrN+R6fF%?C0Dxsv}_~J9g!>SmGnCql%gZBUCXP%nk%bXB;TNG}?e3*l`_D z|EC__F&i6T9H{XXA#Vlijur2&9><{r|8C$2V)Y;Z1X9uOmeTQ9Fcouf15ZyNP)8l! zv4V_|@=Oo|SrGyT0SH`C0UO{Q4bTA=Fceu40WCIbWdI23PLCGA z-zZ2fDX8ukKn6Y_Fe$(vn6UvW04`VW?$p65i}L3bCwGsSFz{mX2o5 zY9{ASqN^|osKU#DTr&T$sOu{{w`7&WgRB0wPs!UYd+1|@GD7Jv(Ou>mfH6dB+ZM*|2-&qFMT z9D#s6IiMPukr}1&9SxKVsu3I`fFMT02i1WCWMCa+U=(3-A%Gw+XK@9Y192RwdB(`c zdI~5mia}`8wpwk~aKc56$*06AtrjZ8oDa5YWtjTO>+SN5Jt>G zrs{MQ>^_8#(2fFRpbj=jFqx1p6JVq`AoC!U3F{FRH;@%QL@DbLG^CU7I>iCFfeWzl z150!?EJhd+@bLDNESYc}Fpw-qXCdAoPgAi|Iz<>i@I=M(4Jv3k#Zn>a|8W6U@a;Z? zq$p@HGe$#QQ5{GW2rdOQrf~!+07OP$7#WmAM<6>RfC*)wOv&;-PfshX6pAcrpo}fo zit5>{4J0jXnXI&(ybgwPEuaQ+MvDnp<%cfv=+7Jiag-0P6(jF0neai$QZ-IAFqtq#8@3*QumGv3pqffq_lv2v|LcIR&08_VTY)xO zp_N&i6p3iZS%U(LPRXcb(yR^xf_N(`%!7r1wv9j{vlNJHnd5G>CyCx*CLD_ZCa3}q zfCEHTRAt}|!XX^8UAkvVj^IfIt^wEbop) z2cczu(FC)zU+2zs$8vQk$STvbQCCq024NLbG(E?W@3;;=e)F?tvZj*v>VU&)ckHe< zbGeAeYgyuWbE}SqX1IDxI}XY-S}co_t0X~8cBajeK1sxI|I@yPbG4WSec{3>!m4`B zR>QW|s@`q{av*>8SAT5)5JEr)fIu7*phPP(?+P;kMB@$k?qU^!2^Zk*22>nB2Xm#- zg2v$oNsk=~0vZ>90EIGD`7Rm>uwLO#G_s*^8{mLHSRD@d0QNH*?==C0GC|d0KN}!i z6}Uag@&nBBQr_-wZ=i!=76=512Sv6XLD(1{v;yihR0Se15s+p-WJC$DaJiy4Is$}9 z0xayShhCyF*h3>4Lnd1CrqB8cw%b;ekE+~J)|6r0SIS1N+?JB^A0dPN=G4w9z z67_B%V%P3EwIDWd1qrY+aWd4nV1!jeTmctEFh~YUw;7l4E#WS8KOk=h7=uEj?mTgp z=k;V8uK`R}9jx*b{b7$rqfCd8?}FJn#}piCIW3=<14Oq&#gYQ%p-y4o(QhmtS$UFE?Q}B?u_K@=tYW?h!iNym<>b1Dp9V8 z>z*z5l(c-MFIfylMip9FiAzXwu-`^N1wt(cpkb2lppt7L9M~~B{f-G!IRQTC?|86N zA{GF5@n%;KWi4}MKi4ZCZynf_0>F!dBI(yotVYp$ZQy>O!sVQg$uTdH2p&psA0IxCA(kZ93 z!{AZ{;eKeV9&1cyt=#M^(NL^4cI;PZ#XYF6NWVp#;<{HJBV~YX=w|Modj&WQXWp9S zSd?T&mSbRu?w#T75D8UV^FTEL zFwnJ8a7|TvI>S^NJMi^NTK0HaZ|9Eh7*I|HmbgJxFp;pfFO|62HShjaQ9G}v)q3!F zI;~$Xb6@XH=OL(@QXzWULm*B$)Xh}Lk~PVFUIBcFL{ylCipM$?iz_a6j3(w+EE%ga0g|39SLvs?y~@g?LKm?XL*aE zl8B+2&dax0r;N0qr((3~iNSS>N}Fn%qA>Xe5^Hio3=Ie?MnFrv0u9MT!sHD{@nw?a z?Q1!zCRRgg=!Yfh!2s*jv#qlN>_L)8d(v}Y@lsg^E$}`IIQ3+_r+G1zPq{)HFqGxg z%88IFmH!+a-wtK(6desPhP@IhJ2}W35bjpAG6@iKYx@U7Q5{eDES1v84R9IZQx?1X zbMrO^d%dhr?>kR6^gxEs+X?;N*HH}ZRN$)0*4ZpPB5a(Z*47EJ3&|%Iru>#B+cDc^ z>cl79g+jDfGQRzVB4PxXtx!e)`l2GKeCQ!*hx?{t%IafptU_f(D6Sz=awJkDPUv$+ z3YHn50&qYO&Op*dI|ocW#4FQ6thEFf=%Gv}&5eQ4&UoYLrQ@hs{H^i5**@4k3f3U_Y6m*HOVOKE_ z{r^nIRECWNvax(3ObEViwoD@oSpevL;s9d=f^#cO1`)T%&)@~&3A%QABS z3Nl&P_=M8KDr^WRG-o7Mf<**z;Q2m>S`)+~EWla z!wv5*tGK(Ny909_$x-k=ML#V?-$GHj*o9y80k7GK(B$EhxSv1QRln~BZYcQWAwxp( z5eO^7glmP5G*1&g94mej&XUNiVW2nQmG_{_XZsI-QM^qe!XGpRJfp(NBUl4%r2jS8 z0OEjvfdmB(G+0mo!UG5o7HsJ7-~xgX4I->ZK^+7j5juJVLO}Z87 z-nhnh?V&?DU2S2vR9d6TlVJVs)=vZLl<^t@-j(=Z8haEs4e23NZpMeMHqfmMl5s(~q z3ufmNeH9^On}OiPcM(SF93YxUT*z=s9jUSL4h7k4W|m~Z>BSs;FpedmL^9$Q;dX*) zSfGFkO(d5>dTB=xkZ}FgV{XVP=unPAI(H;NNk*s8l)FL5Bw=sAPp|z)kYoC|l@Nw7D%sw9fg0o%pAQ|xKzNHCkl{i4 zG3wI?6g2P#7b0>oh#-K3Ac#pQF|ePb8zR`;eN=8})?e*iW~h?jUH^vRs)O-0pmuz= zc&B`h4La+qaR!zoZl{V$D}00%8{cdE1t#lkVS=^meruxI=Z3J2$>^%-T`Qlmsaor* zkgXmR?YG`;_@rB;j=Gzwryg)Dx(jLPD{h1_h+w?%9t5GVgs~;&UEAXMA6u?v)Bq5c zk~YW>n*!3tNr~E}Xk--2xG#A0)tMgy$ywB~g8$NJ*1uggC@hv^^80Rox%FjofpwOp zvW@|lHE>0Q0UKw36Jn>(tpdAj=wJ7C$z*@h;?}4`@fJ<4%N9~}tX)ppDQ`g`>+JK! zPKUXGnA5)7anBbIRHk6g)|DVd>+Rc6#Xzyi-Fop76&pl7?*E83Mh#HFQ3PC!D9aBa zXwgOx6a@ODfgj&?a&8Wl>0U#Iq1+JVd{;KCV~jOM^UCgNj$MH*qV3b&w5ATxdXiTb zwRn!IjxNeHJ&r5u_!Wt>V&?Hpx?*;pO8MH~ZfD`JuuE=`-M)uAQ1X!P&2dve8Z;b1 ziq-_yf9Xm7{g~O`1r^^2IYvQ7Ad)77ESH3Eh9EeoV`!ZVOy=15N`B8}Qr`|VzT!yd zTZEy?cIc9v{M{}=`m;>|2SgW}7*9Frc^m-Ex4WLX=S#}jpa31R9D8kWWd@=g0PiL< z08Ym-;ZxgmuH%^d+3s#bs~oX1$Q|sh?PM9#U+=hAC;y5}274oP;O>t0C&KLNNy!q@ z12 z)OsL>=2*l(RZ)*}#FLBk5=2x*#&bWE;6U7{8~Ml%Cq{G+62F5U-OS97)xuB40@Ow_ z4rh&#*~}ab>9Y>5(LI|yWE}mH#0>`MdzQIK(%@vK6ar;k6O5h)&%~ak(F8%&nUn(* z76BDB><1|Lfeym)xBg_NKHza(Snij!1@&(snW0^k+P0fCa)+19#HEjL$-jemjYrcg zNU$nGs_-3hne|B_IjyM>XG#WU3NoRB&WWLP8vkWa1iMQsdqN;=7Ac)PLK6=m7f}8% zpiDHZkRKleBRA@+E`d3~apHEAHkq=bA!J)WS#$t@NbY0Hp%nob;5QHru6>ta0Sg2X zgbGk#YA0>bu*#A>LWM1)lH<$>R%RQK9tJYKdCX3^$3%cx)LDP3r~rN%oWxv|AVg)A z&;Bt{mz71NdYsHf1(F#8{Iq{}5~^ToDv+@r#;Y3ToRB)|GcF;70D%!}0|)yaf-OaP!AE{t|~0RLF1vWMI)P*gRM5nRq9eHoB{`qJ1#wkUMy zH4uHKJHG5PYap1lF1En+)bXCIFZDgHK!A%i8Dd9SKHTqrB||a#O0PfV?H1O2A~utj zrDBlb8>uw9wnoWFZWdYaj?&kFdMHc=U1UKqV_}a5sKYhFx|KJdRmq@HiEnbl8k4}< zCfDJXe8;u%UCgtzR?%2V?h=+}+jZpVz~@?RMb_%{;>IcUb;-h_vXLRID%>n>%QH^$ zlf?GB^6uDG5e`m7qjB%!8P3cA-(AJwv%aHhdnIKZ8Gm{dr3|Q*YOWdL!Dz*>} z+rv~-o<(R|u?~P-sKG_OY1VVr^_$@QN}6C2Ar}1JepuMON-nsCk!~aeDLI$$(e2%k zX3r_Po$gBRIxRG0Ct?oRqWmaXPMEu^EZ2&=wZ6zA3}xQl`mEv+33X4|>B%Hk|IeE&c$m;`E+FQB_?8ZDeR0loZ6smk(=Dr7}2;nT-6GbP4w z4lgD>T;V?#2+EO^b4NAYv%1r{$&o~xh5IMkgu)oq1vFuk6C7^Yl#t1|6_!NZJZNYh zkFRbtU;TuIpJ3@s0~&AuAjqI$E@go%Mqp^re6B7R{w|Bx3!ZVYnW`vDdr#O7)IYs> z%%U>uu1MzLq9?k=>gLSCV4+xaprx@{F1Z?0>F2U} zS_fV(Ea%#}v=%+V3$gO11pDHrMjocxZ$P~@8o#hZubEfvTYggq2jnj3VqU@xBT(^7 z{oN(%UrvFZF#f$1dd734aGIRH6|6Q=cVejB`vzOKD#>Dp*8MPYozlb(t z5JkTIGpKeuax{T5Q6+PH(NQPb^dIY2LmCEv8U%iEmM^YyQ$F@XE)*FI7(5B_PtKAa znH6<5R6M5xaHymu_22-MB6o$u0xNI{vcLfcV0|N)5PemH_s3L>(JQ;7WAXuln-)nT zC@MqqgPTT28RR@0^eBoELqEiUx+8A7Q$cVhZA>U_YLhDHRu!f)IbTB=(bjFfvMpcp zgg~QqRP-V&llSq|RV8Ee-bnyn9MMMQbF`q#{ zE9gZt@B^Fx1pgy&XcVAdN3n;wK@}EMiGL!9_%Rg6A|3R$hyC-3Y6BfO(TV@lhg`8s zn)HWIu|t;F6gZ`XypcoC0Y`o~i%B7HfEZsCq(S=gL30vrFu|{gRK_I4DB<4jfB?~~n0SnLo0x(;%)N+3J@>451IHH3HB_Ocn=nc0RbN} zl8b1krDOq zd@RTU7B>hSa1YkU7%-z5?q+jJF<(e^N86qIz zB6@sY^4!V2w!^J8E_o0;E{h7t850 zyuw)62_rx%haDOnhQg#n2w*q{Uo!HckGUf?MkG2$C9ZQHbi)?OF=YftYz>eAnlcD2 zZ6QuM~jyb(jzpdA~&v+A#6c8qL*cjIj9(PP-_^f!j&};W~z~zW_q=R z_a%BqHjp>bV1dMHF7gu*3R0_y-8`aoBr)@j@}7n^pgchs!Q znrY7_YPY%-lQvz4IYpK>HJtwz6xKRtmIkh~YH8aSu1Y~KPvMTuN;S3Ptm}Ge+FCmi zSr<$3tj>Y0+=#12$ZD8ogb0L^Xz>-*QD-~j8S2mgBH^nufC4iR0wG|IGxC?ZB71*H7)GK*(c!UiRM~TzbxwD-IC&$ENw2w?RZiwtXkwvn`;J`}EL@^tI*4-SM1e`G zsb)rA{GnbpB$!vLkbnPswuVW5xyfTmyF_I2bW##?!m@OD8*(=GGz%EH@wB!qOQ{D4 zPi3iQ>RGA15_PXfdYL*@oDOnJ^fAax7`MRxCz%dOH>{homjwg1)vi zmAThtXw$!Qx+uWsDx?Np<|?v1_c~iLkLlKH zI}^cv>xBaxT^ceToBzRvX*-)fuJ57@yQXIx@ z<2j9)eYo+1>hw6kMi-fx02L4pH$Ve8kOjQ@uqELEIIs>kFaZ^S!kGyH4xkR}kN{ch z$c?NK4X_R~jIb1t1@Az~4L}2JpaT#<$&>8JJFH?3keR5Au=?;Z@ThOSVjW$KV-l%{ z4Rw&PSr7!a z5DxHM0W&L6PvXVFb@r&1s$LT8W9A5KnTF91BWKcS*sBckN^%4 z(4wpkj=YZ2F-g}!xPz!0MgvOZV-sC5kST2(N;HZ(v^(WCT%uG-ftWG&Qc6RZ(?4R< zpl6IXB#pH^LZVpI5kyLjyNPC06Z&F&E{)X1oI21kGb`;NPyK+B2-PzEbIO<-50r~U z^h7yrgMfLO|7aN~MFH;|1X!1&>h0pU4 z1a1HD4wWp*382`4Z~`cx1!gJ;C-4r6ox@qX4(~t%I`9sctOG%i(33n{u-UE}`GK9o zoBB%51nH8sSk2nJj1P#-6w#HtM`?(vMjl13^J|h&ysjY_6;9P@9at0rlCjGS%?Cn~ zxP3lVp*&7Z#uaIA2MoSkKu7Q+kJ4FlJd~Fc6)9?cfdj<~^58==OGe8J{ z5CkEB0u8&_5*-30!3G`Bu$|JdCols+P|6m40&PGNGYm%4P|*#5$`hLa>3sqnFcOW; z28Xr|Abn6`Nu#1u;cq)Uhp_-M1E>mUl{Z)61BVl3so|uOUO0)<19F?NvbT_1k}&^v zWf#VYe7nFC;?!QIB-rhhw=_;zoRbAnJd#68bF`F;cHs&lL%p@(a+?^rsJ6Q(msGVL zyZIN211&2^ETg>@LF$y3vUW~E7^(^;<^MMJMSo7S1B za|Ic+?oq?}X3&&dT1KP8BI^3fIl~_8S=k?^L+e%ExVgEDm7%DwDOd9rPq_c_84j?u zn=;=h5CUx=!nV)>x?2G#Q0N_?18;XYiY*8;kN{dh2qCcUYz_#D9MO&K(3b1~>!1TO zFxjuA4nZ*Q^Z)@Uzy@y@$qhgVG>`x~KnMui1}GrtGu*?1Do7Uq z7qQy6#X=ucjvFVQv%#UB(lw}HNHfY+Wo}H0-=tMKNF@alLZQQdJ`FO81mZf@hdz8? ztmD>atwZ-HAlwYCKr5mR$>wxQMyaOQxpDGckdxJv`!V8ZJDb~8}uC{WS# z06#eV?r(3e18TLYo-a%@Us8g0a-io4xrc) z&OD)Hb`$Xidt+hMf^?-`7(V^@N6WZ3*Ya*+smQ{rT8eXI34hZf`9{~da7+3*Dyx5C z9byJSR3Do}Ty>J4`R$vWZ@^9g_>nb|m5xcL4%Vv1965m0M2E4fSUfqD?sy%Tgs%M27VW@rH<=v@PK z`s%Gq(4aww5GV*~@!KIw-ym89hrp2l1&R|WbX3qG7*LkSac4Au;6Po11nVly1)cbD zh#(2nf+j>GfsPKK+n{KWz=2u{Tou;qNzi54-dxKbkXlfnzNiUzV>Otvd2iwZkn^Od z)aG)HN|`6Mp3|t*sl20KoSK~KS+EpIHVh9nCj)~Yb)ygd9Bjee8{yC2DS$V1rqWAF zJoXMEpga5q`fs}g+0%)@nhp%ECy2m<>ZIuEsfU6Ff)M{ii!(xiYlaZC5JU&R)Zxv) z2G%JIf*?NgYeom~qJf4AW_$;S9BZopG{1283^WH^>?;9vT0Bx68XzDNuOs~eZA#Tt z<19D-Uc%@NjHqgkO9A#92t%%Zb8n#)7cx#KGNJlNO!qJ{6GQoao9ZJ8uX~fhgX*a+ zPKLbX&d&M7^zxwnoV&GiauQz?G+;;i|LryhX$8Y133G{4~rzwL7pS{|-Ql!v>}SL<PaP#1QL2Dq4(aTXs80xyA%yoI#CoUmV_F5M?la3 zA|Rl2Q9whJD$=BjQHr7{D2QFYJn#Fhz4xE}Cu>$FlgwN*S!;6VzRp9k{#&L>P{Bn` z%NL!Wb}Xj!;*UC?$^E@BWA@^L1aRCmu_1Lr+pdaF@AUS|2x~8)%@1>@<2T)0PpnH? z+`cMx=lvONr1Y$hW8Te0y|Y8iFD%oQu{cZN(aR;I56|i9Za_ah?EWM8Iol`mQNj}a zmO1+)-%}EIb17*s^UuVqpH5-?A>G|>0p>33kKZTEZiJg$nw$1<$Kn+nklKSbvkNT8 zx@~eL-#H9}UPO3)8d>q^Y4Va7cU20H8I8UWj+pCgijdKFVp)X`9(wGq{wwD&syKLb z>_juS_kLZU2%EEy7VCqBo*N?uc19y+$J_1=@BV%$F>vAqY2VC5hDUPR$StO4_+vrQ z1;?KXqZj*Sc#b}QTNF6^S86s<|9)R~*OQKht;XMfzvghwAs<{$G4vaJ^kJ-DW$oW1 z!()in8(&XP&dL9NCAi=^{QL0&>xuXt7X`89$)4AqJNwTMtwo;B&Y!8cyH_w0muD|^ z&1UkF&?e3$g3cPuUp$)&h&$3fCd~)oN>&EpbN~Mk+y)UulE@@cAn@X*Z zvK#$)Ck$Abk_@(m9duhoQd)>Ltihpo|9_3bT>Zg;~9acK~f$555m+Rul#tX z{e<_YRHom6;~n3lb6EA$k<4a?N`O76T*zbhJm$bAGTNPc{mU+yW!lg2A6C}<7c(0& zL^8I_&rra)CU3Mw!frWf^dmp%JpYpaPG){NqkS}IYkQKtskZNWk5A6gqMh@BMV^7n zSBW&qqHhezQHnvUj76WfN<)RTjy+Vcu>j5c7b+R&|Rug+^fV%+qX+z`c6uE{8WtmP~oIyO>x-s znHbeWF?>o0NO`m&@=$N?!w#~#_16f?&8pVhR}re(lju|s27IgU*S#f|YkTJlT-YG+(N?fDRh&OA+)?=w zHYLdX-fSqqqjf_)Sq*Bk=!1w139iWF<~}PNZ+r9L{Md{0JCF2ys3tIrwzn0dZuQll zpFd7t-2CcR+x@0#$>*r3N2MY)`m>M4nDXVd@6oQZwbd%o@1k%UUr!qREMhOOQ|~X) za&un2q_VNo{b+$z{&B8;Mm(#q<29qNPtlXg7gQd)8TIKTiHE8Zzl@*#yx<`Zz2xAk zFZ8lMQTqc~RoMyMce9Y!_Fgg=`RT*f`1*uP%yHw!I$OQ6_PNu_{)Fd|`9q%4uRce} z>vON!d`uSW`xZ0$IPLsI;gwsUhaVDLdG})ruT-dHEE(Pw5zj7S<3aE8w@_QU!G#R^5q19+aMZf~+lU_*nQv3z5@tw(^PZ4Fp^efcCM7duxTfM|lWBqC08oUDrwQC<= zu0$gM{7)zp1pt8JCBP3T06G7UMancsLp|i8{M6$8 z7aHoAWYsZ=&z!_>twkZ$tONv@p%;aIcnl^U!(>f6%C~C#k}`K|JfaFa3NgLCz5nZ& z{x4!GP(CEE8!r$wBrp{JKk#Q}$E05&CiDMwOedM>WxT-9WDN#W7={1OE^XRk+NE2W zTTSImvomU~xA1>S(Wd{QOqrf&6Vowes-pirdK9X8FilhDQT?ZxGDTH^4z(>SrkxoT zs+Ls9d=Wl#7ylnsh5svmzN&o*u z(zOnZM|l*}CH1h1_iM76^i$iysBP^!ZtWKCGWVJJ&Y6zJO;%fzj$2#vTk~pLlWR;> z^nc}1rXgCRrqLO-*jnD&80$kHPDOT46%1qWnCV94Qke{ZAy7 z1DFaalOxqL#(4a9t^SWcss_YI=^gE=F+o);HN^k*M?>|PWNZ?%+M#kue*amdXcRx0 z%%CSCpeV%{68%I18&X~PN2G6GDlb;h-`(L&e+manOkqs(TQV4_7V<}T+NVED%qH%S zZtiP374oCQpLL&Mk;u)24?S9ORtb2ls8ku3xJ@=JH6Nu%AR67Y7dSBea8cpeZJfq( zSP-{tLh-4zYg(Sp{$uqJ){d?c2l?q1*V3}plDRiPQ`lc|UAD_gCTaY?u|-sZntdUa zb>2^w{DmGD|MN^lEN`F5RWW>2O?^jHFDPArmzv4YJof@(t0Ni1yYG|4B_fpU$)WHf z{k~RQ1iBEkKKoZ%@I;2%kKH9jv9Tvtqlq6VRYDJv>V>+u<_ncVk6y&6b&k$Vz>ujn z1)WAqq(&mW*(edEoB!J!{=A*|VN^#X)g!18^y5aLU%j+L0Kul%`4Y>q=;aGiA{RZ* zz}cSRV%lCs=h|=?>k{o_y?G1I|NWW#HXJ8D1vpHi_r#OfMGF_sG@rhk=L@Hsy-X)a zNtKy%C=KT(&V9K!mB~A4UU|v?5uZ>P-nMWq*t(40(O6v2dBeP5^l&q8P{i58isVid zV-cC4QQ)NVddC||hy4CY*YgG|v#fu1U`n-k-2g~P*vYAoUnQoFkOs7U-7Oh4nW_X& zId@Eu6WVpE+EKZ-t}xG6Z$6(hzK;96w?$M^oNUoK zUTP)0tj9ZnEW_&ZpasJv7VtN zs|ePo){ecu+?OcxPu1Gmx8qZ0F0W)4UB=Sj=Nr8$$f`8WHcj@Q$0-zQQgi*Lb~pG=R0_42zL-LF3WXzY9b>j=g$*NWDp z;x01tU)YU1z*ac^oIGvgQ0K(WpElxF-8M(ysJp zw-R(Z3lzZ!fVC2nz?Vx$n7{YoDziTlyQ*D@aBX8|cw$V%gUB#E4y>O}OTg?Yr!5iQ z?m9Pv#GwR;NY|OYKz=~Ni$>Lv?Bi%TdEE2D{>@8J9b1aXe?_~xlT-qkI-l-<{p7%r#K6m2xy)j^6n%>YKY`y6wd{9$Z=TPKjyMNK# z-bM+sp&<#&B#ohC2yjEik8nL85$#SxRILIqe_SHFefx2nAWGQ>KT~6Nb%47=*83&_ zid!RH7M&u)4CvsYIC|dPtT)^l{*+IEQ7-l-HK5e83%;r-r7lmmpK!!ZYxA6z^UJWA z)GAbZbO%7YpUa-qdV2k+NA|RvKey_4>1Fxj8(zoF#=>8x^(`vHwOaz1>Y%Y_ONnxh zy88V%#P@d9vW?abZ*;iN*OgC?=Ot%0BQCZ<1y;z0q5BVyqN?VZ2;Y*Py zYeOD;0x;((_qNAHM|r!OWHt*Th?md@kz7n+{kW2Js^nYK8jiC2;e$S#Y9vIc8O)A8 z1@)SvgH21;z!uFQ3DuU%qEyWqIbabDB@{2^dW2k;ub%F#m2l1~ze5{%G(lTF#e0Cg zt!q&c%fsbU9(!Bod_sF=Lb2xOFIi_Vlvm{~{*r`aqs@{6RlQHv-&8QlX~-DuGjaHK zh1m1TGw6bbf{|&ctrtB`?A7ak;(9HHJuu0}PSJo!HM680|^&m3&H{FihV@mi)OO z+JmpfD;ye40g9P8r__qzgrF0Wj7&h&FP7QQ)H9wn3W zB}**7yhH-7am^}rCcNxs3MqoX6N_n7$j2?0!?%34vYMjWJE>>M&$BPJE!(jsvU9)5 zRoNq;<;h46(&L%O)$gy%HM=8CTM;%4II@vos4#+~e*0S?EytL$O(ixqgeAZPkF2_{ z&&?u(K!beG*$d3g-D34d&)x2~23(SYoIGZ1DuspacTs)B-eAWakM@PJX5&{kTus!I ze%&SNm-BPw)eCNVd^)%${;}t(uw{|X5JRP0r;PKfk8`=d<*+eJwOekm#D(zt&(n73 zW=C9&t`Qx#Js~B9-#?$h0J4gVM(St!t^pbO8r#SA?Tvm_1_0sL1hJW_Ub7)1BV5Fi z-jU+BKp$EGlk8Vdv|3P1Oq3HFxQgc&u zz9bS7cyCCk!@p4HF7fX>`W94i-hpv!uK;d0kB03Xu;29(JANJORGfgEL(1eo0`4c8&3Ql%(D9VrMl z!ySfs>$9Z!i{^1(ZKvnOQXMMQMs6M!SnFuT-{CvyTzgWr^Tgamettcn6;rNJJ{`PO z71W_JcRG9r>e3U8dCeD+u~f2t8lBC0=OqJ-BY=-x1o>H{1Xo^(yT}>Zre)7okn zS1wL-O+{;xSmhMm^DHk^J@|g|&%Slk2d>yo2pK~71uX1UZ`LDCLx9`Q*h2)>URLFue;iP}ErQkXfH$KTiLNov&U!v> z@CbqW*LfY2!^mQdPmV#vgH6Lvcd5!va$=(jWXQX&-lep6Tr@dQw67$e!Hn> zyLm%frN=D}d$d)2yZLwt{CtMqGWf4RE8a6$5~-#ZQ2R39arv~L9~KLzmxKVuw~Nt1 z8J#Z&^n+JAU(R-tGE7JxJHr$nMvZqiK_77`|(XdJKVWCjh(rj1U@2;MPPQIyX+r+TWlb9c*GS~42pC+!8vC`sMakqR?`~N6^e? zZM@e$*l_FP6Op@y-HA`Jr=GgY8E*f6(jE1*b%lg^g$DyQ~&qB(F=4Y)= zPdtj6=vBdt&@3TvRdDUczQzW$=8qDgtp( zO6JHPfL#;!SY>Zy=@b=R_GHE2`6I7quO@mgT`}RnahiaXAXtuVpmjI{RE^4{jw$*M zD#iD!HFPCF9g?n}Kg~gS`pRi25H&h2G5$?qoS&~~y&*Nce7YNTQy^yCzJB`kO(N;a zM7aA?haFO=!e~q83^38V;O0L1NvJ4%V!T~HXStxa*TmSG4iz+*Y;52VHQ>-}1|)?? zavLW`dS)kthrS7oNA^6seb?cq7Y|o8PpJa{8X0iS0AcN0OM_f^jlx1OMt^2x?_0>% z9wmEV!-u-)!MVa<8v^)}^{IqtL-Q%Hi6(79!}XeyqU)Lo8_ zn%C!UHa6itFE|7?Co)B$ITh785)Hnlx|)V!w;@8aG7Y{S42Oj++S!cSyn4<$q0a$0 z5d%-J0P`cEpp`vMTb^3U)9L#rvQcfhh&^EYrq3g52h1~K&ww2-5u`ZC9&yQPjo!O^ z={38{kiyRD@<675i{YX6Yni0fx+E*tTm#akt1DsQ^@_eoGl^vl<%7%d@;h0DTPy?Mk1$D)VH{(@>%pV$nYt|(XUXV(Iz#PvzGQPQGN zi-06uac+B?7RCzvVVt8 zpV?yC-1mYzkhZOvvv*$3r(L~saqgJQhwvvcuA2{(AW0|5ji)bj6JKXIziD{ln&A35 zzR2B`Y^6?{so(~Rw1W@cy<0GG*tu+2$V&{rVZiS)-UoTxcJa%yAC#9w6d|q`_V%k> ze;prg2z>xnq8UP8pqEsMJ=PB8fkA07A6~6Dbq5i15@5S2cO@Fw4u`TMIE>m*m)k%w z;ac2uF!kA4t|uUV0z!g@E}4s1B#5aJ9sam3-Uxdxaip|a+&B~@{N|Y#^@Rq#>(A%< zD@{nEl`C@VPFUp`@qG6V9m0;pw#XQq~SfZ*1GK}6aeOQ<{=O0P*sv@R1aW8BNd z4~!MUZ2xI45jU+0Or6-3JT#@OppbH2=1A;oG8}?3V7#Y5hpF7@b#(jcgmg5!N!X%Q zULq_L)CHTG!uzeVaVu(`Cc2po!a%KN6NlevECQ<9J22}!5fs|=M{9#mrNv-3oYmK# zkCq6FMnauXt3HW&8J|9gZru|w-;x#-4`gqy#OWi2!NefPO5?1AG{}Jze@j|2)!YCR zobW~k#&HKijqx=a;1UsRH28T}Ke~Vq+q1jZ+{f09JkSg3BEPtq`PnsO$KoNrzq5P4 z<I_(O9$~;=hBaay>baKtTQH^wfkd!5!UkR6vUaYK$9$cX%lO|@#714V1 zz?%s7T%VilMuY^lSVoZ*RWkMfzL*eQWq`wDDs1M7DM6+beNlH9 zY<*-(n$+ctX(Ee-Ym=)XC=XQ*A!$0E8F^a*I|{cti>c`Cmm6cgh( z4$}-w^^KnE3gqJ>xRY$(xg!B2HDXZ%IhBiu-6pdrGA9uImAZ=Uqr0}^1(%wc1zbHvJX4csfRz@oBYGj5 zFrbJj3E>39$>w&v4Ci|mw&8q`VS9_{76A_|)6qKSI0$c$1XM+luUnZ+j&77K0x|eb z%zbNSjE0(76BiJjmCDzQc3~3sH!jnffpBLAj6tL9{TWDNQEVpvu@}>PeM2psqzG9E z;y2?ip|JPn7+@crJ@*!y1H+&|Uu0>6tMg|z%Q-D}tkieSn^h=Fgj3xjG zYH1{}jVp31+*ORqB4}kiW|TlTgOGZ1&R+S;adyFFKHPx7xBml;`0y@)WpCYofz+q9$Jd9H%@qqF z-98>oY5DH01hD>DP)0SA13$k7;YddQ0mn}4*F^JmcRf3`NLf~Km`X7AB|vgFUrhA7`7ZVF54acY6Na5v62|sw%2YA@o`SC@+9uw47V96qkd;&-4 zNvJZA9UEjq=UTpj>%2^XzyEk*xmn@Fdmnw0I|pbi39Mlzl;^GMisl$uRJNEWWBGPq zx?OO8Fj_xB5W;Y_}4G%##vK?-3yvx;-<& zElTy@E`bLv+99LoghCszeY-QJv09c$)rAN>m}S)dfxn(2X*inCFQoH~biQ z>Fg&B2`P=oy*m+#H$2xSwZ5P4=w7{`LN8!hO2P7aRPiy?h4<|fkIymAeUf^7Pcj2A zgr0xk`~=Co?K^;xM_v0;io9R0nCrSfQYPW;&~Jd-PuRl8FR0<0K>V?f03pgpBg%t+ zr(;KN`~;?z0Z=#Yoz_v$Q3m{?`H;v3&UUS5IiWq$;&o<==Ok8CrMw3;rp^EcwBC&; z^tO+fiD&c3A2(6t?gZ0iOzOXry2_rWu%HkS3pvQU`6WS-yKm)rzW(L+fp^ZKY(B@( z6{q=zZr=H^m3Ma0CutOb^KsJ_FX(L6`LH^_suT+U0nsyfg^>lo1-%C^12|bT>?q0lOE4h2Hgaj!Ms%EYYlnqAS0JAS;~GOjzvL#!DsLU- zd+M2CD!yBoZoK@{;4z6ujH>EBr}#$7f5t0Z>{+fpVnN{&jSqGDK|ScsK7a`S&d zVOg=TdlFh9g)CM4KS#A{>(cKsSlT`B!}#$kUkjr7@n4A5+RN!qA$ar@nQw|CI*782 z0FDJ$vlCg^NcaH@E(H>Pj)thrtDd&+)1Dz?7!zpO<6ET6Hx`v&-17_P009CI-`moW zMF5GTuo1FU*~SKqc=+k$`9Dozx?DDDR1MZljmkphVCTo8f z7OO&RS!AGt62fySXflZTFU7RQ$1rWbpLJNuD3=;kpF~5wvp)*ppPbD+#J^q@YRmY!>We{+ymf z%7#G&Vi5%nr-TC;2vsnOU^|KsL)RWJsTOq0^JFe z)O`xNkV24&VuQO2+-pwv+(8P3u`FFIZyF^e#T5fY${6%{f-c7~2j(4g3Qz0Av{-{ zaFz&-1%iQckQ1@)w@8cdDQnBRN+I<7(tkT#=O`ea`mAswO12pm76gt3J+CY0kZMil z!`XNe%EgJ`zqrO_1lI!;J_N+a>wbrq4tSCi!vFHh=7PdXg#5Aq9(oFbK?Vnazt_2; z?At$+7o>Ib))X3l$O(`%X)l6kjlb`v3kYL=N_S85Lp&Ux&`R_@#wGLIYsWkK8fWfx zrK=cObG}DDCZHoMUX)u_3L6(t$P{42t$mSt>|4gb-dq%1DS7hTe$^O1lngOp6MA1&?w>JyLG3-YwbJhj{0Ww63A2c(af|La-&;b=IC!1|R zfu4d2OAsNBAi6S+a0)gKyx$j7#P^;L1Rd*f;B~G9EQ6mYpO+e#BA+VBIY^q42JBJp z#er$SW20Ami>RVIRs9x~;!_-+bqoHZgnH9r?Z*pc{?Z)VC>hH|1@+Pd(2TIBV|u_D zedEW1)BO5lnaRm4S&vTP!fD|Ap_cte@}FvDx`()|GsaYT7`Y&?AWC%-(h&`;QH4ML zKsvYJw`B20oJDq??i|gf-Q}?v4(D^IgrZU0i}?4PkAq(y2Dm(^1Z*F1e^eCaJP=B0 z_Yf0gmsmuz!t-=PD);I@5kY0(gtE*%vLGGktwwHL6co|pN|ZGo28}f2xp4I7_W~@s zxgZpS?2V@UY-SfHvh1%;tU7}t32!b^ft14H{VQ|#TMK^@Ee_hjYzX)&gO4|v66ruu z7GOWxb7p(b5it6k_$3E_kiOMyjf{Ck%HyhkpRkj>c1iEG;S`Ze@&1aM=oirZhei* zJc6mRv$^MU<~zOg0%&;dsf$_jvI(p0$)6Ujb(FwLeP^Y<(vV%HLip!rxIF{$*wwlK zamI`~*4gPZ=Zs>4Q6AB`rIay(-}h%hS(LLOvfG+%^}ewEZf92!aB8>Y?!!#p>LZT= zg>;}$^HC0l4$zFOReUBmnT>5f#2!v@XB+_Rj8t2DQFI9?PWBCKuTt5(piS1kwV53D zBSmgLr?9-36)231nS&Y@gsX~Eyl-6JDPw`zaMHYyBr4}mIKilBe{gu}6`8d;nR^*7 zC7+PZJH~;&aUCTpPPOOX8$cz2n@Pp~0(1Tj*o1g;OcxoY`{7PDONIM~qdVpwYUk7H zo&eR?K2!&W)JA_m(LOZZ`cOB|+Ti-3PWyul7pLugmg`{ITT+?4t!RPcw|R@QqGb~f zBvBeeDJ>oBak<=l#s#_|)mMASya6xt`fT}2Pzj9s-r~s3?nf zE*0~NQssW$!(BEo3GTiJK1T+RMB*vx;`MA7Osu0ZZ!>~2q!$a*X!Q@t zh)<%PDRs!Mmijw#eTgGZ=Pn{&grw@EQ&ri4S-QDWsPYhCz$x=3cp{~Uv#>NoLrLOX za*!>nbxvOhG=NjJG%dObninhyZ+PqeY?9Dx>^^3r{D^_|AMm4(kLXOkx9 z=!h#jSyZcUr`>M4M0R_A?`Bkyd4C|KiN@k&;}cv-eVe@0W+9K-OByE8S3C~`pSHe@ zBg-|BkZ&U;PM2Pz?ICi~gH`tI?wjQr(u*kRY)7fBTaovuC2jHP?a@N<`iS3QhXI$* z8ofyumtDCMs^f9uVMFZUm7L4jxmFYna<{sn!^bbzPsW^ncZG(kuF9Z}Q>~4IcO42au>Ev(e0iQzIB46+6XZgwXmDOTjPv zj9u4JoY5H*`g-S~vU=Ok59&Sl&whI(5&uH{SCHHH@YHl<)y44C_)FJ+cfO7ec^zXe zvzKAF*ZE+Gt)Cg_ng3>{P@vR&NjvTh0VR3R$jy!F3@sd7(cyCbGm`W0h433*N#cvJ zzDW&ZHv5r*-?(S{jTq{-HswzVN4)4#3Q-m8g#p45mn*?-@Guk9-d^ zY7d?sx%aTtUEOay7p&ohDHv?PD$q0LBCp-#vpdq}TAFizr}9y0glKdNMg`;>p|b9( zH~V0qMIQfi0f{iQIh!(p-}qSyT0|B~BcD&?$p&FW8~F)714&3UJf`msq7uWv)M267 ztOaa}Zt(XsypUz05rp`WmXAMG2x=rPjz&q2Rl>5atjapmU{v|?>qP| zF9d1VfJ9M28T3zNc=%DT8F8VB{OHnpXVLHC&*WYT1R`p%2>1*{u842xxbLm?bL7KI zs2Qe4oOr<$Ro^>N%+@MnqOxq6IE=^CxZAm%T9`X1iEiZqu-nx-?TD#C<4b6pXu(HBD4)I8 z{7s=o44(f!@6XVX6?niS_oda@vRFZT0{G<8hO7Oh)e(Avk(sssa*$-MX_7x5dneaY;#Z~ok?@ZdZlyf0w7v+ru`>G=+|OMyTX$cg5AcG~nxqB4L>`=*XGE{m zLXKJgkQ*r8Xsg=S$as4r@4OQ41^~t#5$O=eSQ-W9im3#d3Sx{Xa6w|O0}NaAND#HA zXb&wVx=szk`A30jJ8EPe;NSf$}1^;U#ilU zTOL{!C>`)H-zF6p3m!@H-OyK}g&GO-$Aq)6xnTO?^3J(;FP7+8VUQE zJUj9bof1d;C_s7F(*)4VLU4ELw-JpHtNiC9?bL~Gl)2-<3rX-o9%uPet}!A2tB|aV zQTn-f?{8FY9w=v|XwSU_7`!EM3W@bkL@Jw_vYpfwk(94%d~=#GQz6RVm-QAIbkFl8 zNA%ye1|3gaMcmoTfC=!4<~>b6mFjK}vli;@G**hCP0c_)DcsG{-!9=bKC1;S-bG1; z?O81~e^c{ugS*o6$2e#$K5+p8{NQA?YKt$ITjYiP1)a>zZ;_kHgd5k|B#t#cfKTmP zXkNBg=+p~7`WFQ7YN~|;~I*b=k{yy@Sg+6<}0&&w+kCY#bcvG{6v*B)a|@Z9kPvHrfR{TjltvEr4{c_ z9pNiJvTjd7JL;BH0QL{O4Bi-I4ryA$x9vvc9H40ZJCgxhgEyZQWV zdn=4gXnE2-aVLusRo7q6=h9b7`8Lhe)OjeGxqGPHJOsCqtEjTpcFOa~)qz2=O)r z;mk}yDC;`hkk4?(ok!0uZ)Sjl58z0WgM2E<>?BH{ePnYTafxfVf*9ZHgCz8=N%{2iRl zBMAgBvq+0rdR*ns-{X?(GD4V~#fch+Z#sl`zn&+xsGxgrP`V>XW2m}3_^q9st16pi zW^R?*v01I-atU`;tLrCo-<^~FLeSGQ?wcZifY~p?u_Pk|B*;XFZ_%8^fLQ76LasbF z10?B^MYkoLaTASqnFHY9pO;QGMZJ9ncA<_(Y!`zM5H`-Jua%btHd@Qru&iY?VRXy@ zUNC5QLT?HrQ5bUe>5R8yL|jo4&_ukJXl2AdZ#m?}3KDDcKltF-OM`1!aC~(5nwd_{ z|K|7f04C+nKSg$tHa&~F=X{Hb0dx3o*z0)O>1my$SOp}9^UM>DqTTrfd(WG|L}l$@ zym7t-9%JAK%OrDSW8p|=bBTMc1XJS!I+{ci5n@-an_M?4tyBtekPxy^H@%e|GvMeW zVtFUb3lmfB4|!fD6AaQ9CA~o?FX97M728zaJ?bUYLk$SD}W{ zJY9YZo_tr%3WV1PY1(>yFl4v1R$%rW&9i|hr- zO7K=5c2>oSXXmUGD_vzd<5qDJoAX^qjw>)C{cc~a1^n#E$HxZG!p`7294Kx+Qs}Ha z!ytdG8z1~>%kyRh0!V)0+ycvJZc5qEiDA$8+2t zEC^qJj}D9T*yG2l667UHvL9D%({5Ch;&*%-%u!?I7fXh%XH=W-FP=S2 zxWnSyWB#}ESl@;F`{gfU74%M&OeTBJR&W`b>kb_ns^sQ~PC|sw&TD-f+~OAAE{75m zrfoBBU25X!{iu5sodxBU_{F%A!%??;Z$CpyyeZDF#_M;TU5ZrcL+{U&rDQ?!aMAlM zi(0Lk$M#bfc-S=GEPQmaIxXvc*iK(~>;Gb!&N;7tRE!(SHiTsud$j_PJMpiq$>4{5 z7fMelB%9ZHKER&2Q#`mUj0fqDZ*+_Q7)yQi*3F2z_9o-^sqt%xy5ZTD@KUsv^ZKV( zo{pZxThR|y?JR@%_EsLG|H)fgsKb#!I@<+VPx0-CYpHCX#Z-z7L`CFeE3ba>imYBs z6RS+Wfwjw?wAtNV>rMJ|4fcmC8`DmZM!6H9No(I>)E}jT>m3UgUAGRUXrfXK`qari zEXQWn>(exLOO&J4#oHSK#82mO4c4?>?j$6Gylj}WPd96nOY_0Of9&00Gq)Qyd%aIM z>&aa-pvwH&LKd7`)v+Nqt!2s7yHXXsk35(b@SYPZ(4 zJ*qYC`+XIW)JT_rB+)&)s@40ewIlrU2>t})bzS*tg1Vo9I$c9v!oqi5qio%bT~bF{ zY=5UJPx4vbVwGQJj*=~EZ1cvUD#uqS&moF`1m&C0{q{hU49LDVk!OX_g|)K%9pIxf zJW|@Xa6_7#7Sdv0-wz{AVFyY zK#&OrbOWw8XttTcEqORHK{Xf(qGlK&Ui?j zxkq$Tdg-KfHn&_5DNa9fEOKYS43O`^R-xHPBK5-j@3-H^ET%aeC6E5o(!)`s5S2uawyEAq}fVL5)w zXT0g1eR}Oa+B}?Xv1mia@6QnOzMw?1@a0ZHi4HG$*6MJG*F$C=OkH~ z40I1Af_mQXYXuyIDW}x6NT(nAOIOMU^Rgz7d8C%T^S!gYs+Bof&loX03$owdf6lnB z##4u_D`I;V2$ygflC8Db&e;e=Ukm=a^nO6Ks$j2{6<#I2#Fv*;uKLxdwtnMl_^9Yw zV67ZHZ_gynl{Epz^L3+ETv}fI)^ZWu7b*UN_QVVh1uj0L9CxJ%I@ba{Rm|?VGVzjp z?hlo`ca@~yj_$p2gz*fcp)*SB&_RZyo=*oF-^3C^i&UMpm!)Cg$h;No@^H#pSioe&6fYMXf60jm0<2*L+7pFf&LG*Yp{O7l=AdV-yV;9tnUl86^m5~ zPFafCpXIu%8i@Qm!-WdH`3gUh!ny=`tRoak4&NS5z4gObmTZNzE)O}s9BTM>2l>nF z@_osoIFSBP(za{0s;ckrGtuyij^n7`#$&FGtb=3+;cNGlYi1? zHoKWkcK7pozo#EBKB}Ydy1ZB-eNwXaHLP}ds_ZMKwnX$`7`5?4;T238fcNyiwAi^P zIsIiz^vkwPhfMP9E8eWd!2PF7kySRCnVaoII_U3) zIKheb_xFt&Fy92?Kh#v2MNM0iC5s_3%G8Nco61l95++F0R;my}w}W`vMBsKhz$5{z zIk&X@#kI%%;o{(_(>T9MU9Q!U@bBxF@o)Gp7?_tf?uq)JYmpt$G+06APi65i^vQd& zHm-cy~8KPJ7*%ftTRG)e_G<*eX}n4Z@GnabJxVXmusB7mcAzmyc*2d zl@l?&k`1_jy>>6}^w>?+n`Kw_%uA0NPU!l+BN6mzWR$Yu?9V`YV_JoKEI-7)-f)p( zVN0pB-RZ zx200VN9w$^{6~a_TbZZYwdr!b7lvb%_$HKYTcymxl%)} zz_-MH-}in|iD{{_8C(9UEOnxua5tpgPjuD``3gUw@7t$j9it4vPuG{XjlmLp@DN2 ze|S9w%Kt~$Qvm(*=k0N6Q50cMq4pGTPZ9PMaQ{Cedy1H+2z!dNr}%q{s{bFto?`1M zGX6ijo?`1M!k$9#|4Z0Mq5hwQy#$)#s{JW0pW^KQhp@MKY(hcy|3%?#bScPQz(e;=#O1=&-C{eO6UF=hSypThqCKVDC9^At4ye~auX zs{Vg*_7wV0$pD}@dy0mqAp8Hf!anD}3;X}U>pjv;D8im%>;F5lpRm!TJTkFDQTr5R zPf_(0QeSK%U+naMk^29zdkV7u@3vkZpkVs{V)yEBim?9=um6v&mw^8luh*3aD8ils z>plD_-%^0W>!bYD|0C=vr2aq1{=axV1=;@}yq*TbiOInC#!|8H39BAqViOqXRa{i9 z-TG4yLhL=mRux0{;Ci5+a7do2(9K-0wI9Chomk=#pe2}`vp43<#gr@FHe*Vm>S>}3&UBjM7v32OC% zX{ukYEOw}8x0LvlZM&47-C)jjz$bF9-G^#hCfvWm)^k@n z!hN0obrmSAj7Es%H98bZzb2bl>V5Zb0;!l3WdfQq+!Ek-0$ErNO(XICNts0^?fXiK zI{l9KI9!Ue$^d9NrDJCJ#>Pg=o8}8=B@tRTLSHvplETthzTRrxVf=1iVDEY5t77!0 zN~e%NeaGw)O8mMA5&bKUG)SP#mI2+gs!xrWbG-vq#`M9SN3Q9>yIn94o0#Vu3R=+PM=n}GtZq(*QE{EIIn*|m=IlrDHg~O<`6n;(6-5_}+Pc+ESNiK(#yeRh zx6XAQ+72|{+VKkZR|T{3IER2 zbLhtp@-N@dZSjf^24%joVi?oud9rliKkMoyA1tRw?bZ+(QqaKzM5#%qwFEED;47rg zE1B>HxvQFt2RVSp0W|;Iw$@i?c*m6p8v!nrxx-bv#375_a7zXv`ZX1D7?TB;Pn*M|U@(iFk=&kEXL3p(E>n7km0F<3Kek zJ!FsCUOQvQ+}1U>u=|6y^(yhr`Imo7y4e@Shw|pxEbdV66}^#WCxej_(bNU>I!imP zpMeak7~e88jB0Uw1X3ln8^1L^n?K3`k7J(V(3|JzW4vf6Q$pvc8~7CUN6k{0|2Dsu zDyIgI8wia&U#)8x#aiARS!Xr4%8^=w+jZ1VgEC%# z1o$AVZ4}d0X+1@wEmyQ3HoZ~8`MptNGt0EGEIeiOwvhBOr1k`Y-SH(Oo)yqipEwSO zuQiyYUg{=F?tvWvhCU_3C?#(Q6ieEG5=jzwL}KY-;bXIkzeGgGjRH1+-3G| z?d>;zti*C*qZc2zZu5hsDMFDS1FnAb6>3hqC@NWenYg>3Q+Yewfff{$*O)Y;J;Rnk z4CF{knJIRZ5;!Wf9E72X457P?r|Nv}2N1aI>0AiZR~dR~w6Rp-ef`B(|4M4E`p&tT zm|dlfT%5o$yY@5R?fK$6+Pw&KIK5$7O-r(j(pwb!`N>4OFf%46^Z|Z>M>1DMJWRkKP0Fkn=?Ki-Zpes!2zV1dTwVmYa z@n4|sd9(RwGRcW*Z6-EZG5M-8gt|+8fTK;d`v_0-?~f{5(TtcD&ibxP-XHc1_@`i) zimX-H(&lMp^;N@|Gyb{6+fGV*c4nBKFem{TmZN)r)n z_LYh~qayfbD1*=qOv*dedHVEJDBGPfh+-MY{Gx7P$Gv>e*lt5vR}R+#v7dPLjQ~5A z{&4fwJ7ww_g=|>FB$?e@La4>F@P3ZA^1@@?+L#arhr1cSuI{MW^D#tmk@#^jCbN_}V8%y7{>++wSEPnHr*soe}}(rVT;`@D^On($fAyjSk65Rq5v1BGhtahbX&>OGMC^VyiC@p zdcI$A_byP?O8=3IIOqaL07I<1WApu@4_wb-h9auWGMOL}yGA8jMuvEyNbc^v5Ky(V zgab>gYF*=sXvCIjSvl92#vWL^v@x?hzu1BdrLuG&(`9f2r~vGm?hTfl;PYa?pxaiB zGIkf_zlr4F55&&@p0O*;QN>+OIWp{?yEzpnNT<7LlSH@tM&M1=kcO9G)Q{m+`3u7c zG~sLbUe+vM8ZRd=r%7(1F%?wKsqAC4ZSEbGL-Y>s;)hTC35Kj$R_;GdGtHCVO?;=W zGTqra&(CbGb$$jW0H?#df&6m1%(bp&jGmZeu_M>BSr3<`4_t0t?+AkIIBBB0w!rUP z?R@+96X}d_TPU}j;d1lDGO$ZI6T~7-!!G^ChUJky>r+;7=)9F#zffnNGO3MU?Tb@N zHi1@0-oMXy?#uZxCaa?j;$9Xpf|Wy1UxO;2*dC``RdJp#l-cRJ%}NN~-`YvKS9$o@ ziv5&iZ;zX>}w6k z_8YOW2>#J$|E9=nMB)#Ai>C%P+&YN-XAhZ^BF?4cOWjQ(WtB%>R!j=;kXK7o++w4= zP4USq5za@-blXW!E~1F@0Rlpdx=(?T^WM7RaTDI4JPINh9H=MEc(577AIxy0Dsa9U z;b{*FV7--&pqx$I6W<^qK4838%L`6tCpUf5;uJ>5tf-+=_fuTc6iG9l_iT^Da*+E9>ZG7 z6;>p6_%=>8j$KY)R?ci4dyV>x3>XVAUfI0MW(6*Y;MR}a2Zt>j#oa#`L|;ktUVjxg zlLR|=1j;x0$ZVSrZHDVyG&{nY9iCWR5WyK!SgevxcE3z{ubzs>1@ml9v2R>=?KELi z7xL%R=cYo|b?_T*g6PCJQeEm+bGbO`4n7 zU3BdH#-D?6VN{-I0LfewKelQsI$^){ue*bgS4(qdqnJb9O#@VyR{l&Jz~*aPPLhQ8t9bGMkA_UV!nC zT;%wp{HdB*mxS5ny&zDo7=xjI_2{n5XdM22^xq%3zO#4tHp7<(iZFf`pX**Kgqj&p z=l^PBDz#;jj4SzWNBXEM{3rOzO=FZr2G7$r4PhM)ff<>oO&hARGL3k?T26&{fl%so zONNyE?|RI#ZyEIw939r4o3&yVepN+K|7)X<*eV>@nmP5Im~0V+dcuWms;S*fR7TZ> zI>LGG`*JZG=7(oc%N}%2o>z`6H7NfJtedQm{Z%pQoAdXk+4AtknLXQFc7RKcw}hFA z<{8he8Ht8jx#BpWcGKh|n^U>cl@t5(wP70cDv#i9mu%!?Q46Y>F#aCN`m+=1A%q~G zgG{G;Lm>-yLm_L@Bc{Q9g)(0Q1}sD!6;~;d-M^J4Ggqjd%u2;(HT;Wb*~r2%^5Lg8 z7yCW;emhVpqxNLKA~m7NxwdGb{o?Pg%cGA#k3GI~y~6ZmlZlZtRg#6uv z;%;WvXl8Y8W{+y-ENbTJZsu`jKol`B0xgVd&2;{ZJW|b~sg!Yj2#~@GDa(F>&Xbk% z`BqpvdL{w1akR>g0cz-0ZPP{!q}8}rA$r;qAplSxKre({9%DmV{BE=2Znx>Su>IZU z?AY$W-EOYYZdTNewQqm7)$Z)v?s3p=6V>kM++kDS;gs6$R@C9{-{JY*OnEZK@QAYY zp8m;rYJoutlI;a9g33q8527G1xx+5CJt?ZgCKa^6H?@7?!484SrcVrx3iI6qtU|92 ziC!}(f2`N;0vXEfSL(v*cm2KDHGpeh&~LAK|HP%%rHZ?IX|}6wtgGI%Tez!hi?#dF zSZ*|*3>U!VPtMPo|z4>$1o@P^L6t>gz zOc)6dhFJu|HjC)C#uzs+$Xxn>W4Db6t!f3NVYjvnNC>4RhqUq)7@19xi?(-?VT$(SJ#(FUgF1(tQhSi?_ z?q0?4-o>#V_Tuh^qF#Z39zpsZewTFF!#;(jT*-$1OBy}cS#WFs$4NkLSiLYXd$G~< z^e_ra2Y||Cv(bU)YjOR92mQ}d`vNG4H>%5mz`*s6#Dz(q8Na<>hH1W^g}#ZuKqX{v zBmB%;o3ZIht@F!s4gFucEgY8GJ{1lXBm zeDPpJ&u}C6uoBNmn`w#Ec%N@rclKd_iCOpS0W(rCbXV?$LE4L&L+A+s`4a1V+^&F=~Q%dH<`(5XDpvn?LdZ zBesujvY&?s>HKW)Th#0GW__5$*L9{tm+N~Y(q4Zp$~`gd+6@>IrSIt(89r!xDEy~f z?9UL-?bqjjO+=ba*o^0H6~A%h88yR=>fau)AiTJ=#&|*=Sfv|F^dICu91@id{xClA zqo*q;V2JFZaV!D6>$sg;1b)WkHH!A;=BAHwMOMfsL%#sMzai~E+g*Bmp=RG~_v}Cn z&}iliYA5t-KexAt?;ndFStz=^W%u&H&hAIv#j&lo7^@16yuvnr=(+IztKYngS$k~% z#vPnMWid0|E`zec`eW^HChFhTp*(fMA$E=;9|LinV&b%A$Z80L1$ejU3&IMlY@TK(g z4zk)qfAk3kyS&;;D=XuKYJB=R6F*IXjQ^%tIVb6bUh1gIj`TVQRrw>u%c zWOzWy+uHuJW1@FtRq9dB@X8Nce)UxlYd;Q$9AZ`?FRr*0G#bajmMWirPK53WKgT$M zm(F`DTud0ydOLsv2QNF5P=Fx@xoP@>c6oiH39LhTm~aBytjc9N3J4y2w@}bcP?&4 zzZnSRcUetqKpdPvj&`D1*S5HLyZKO5+SlGqM1_f!-5J2`h~ancl&o?CjqA(y{K2z_ zn7zh&L|zweAP&X>?0#A_vlfSQl_5Ga<`c=(ofza_GWAyik`n`$#e>W!52L2JgE%M} zv*)M0xOC8V|Jq=0U~go@^Zpkv*N=dww%6&V06MuR-%O}j36YrV)5vwnJYhzjdS_+x_inoE zZ5A{fy}BC6&2v0` zoap5elT$@OZ^3LAiLSmxbd=w1A*Fj&9DlAKU%e-fg<_V$Lt0JShUahYr*H;|SGlZY6$Dz7$XwJ_fRZP3z zZ0%)^jGMyz)Qj!DvXgi$_F%4tGQ0NCDJ*uj?-I@VPflvbG-Yft5%OJYkbOT7%J{cD zb_BtW^9w`^QsXAkAuV55zCe<)3j5nHJnJ1+lRiFAgEthSV*a?U>!7Mrj&^bor$TWg5*VSsu@3UFY|^n0HFuwR57$U@%{>oTQWGh6x|;ab;&ZBx`{Vlj0 z#JD_XCc3l4A7X9or^AEmr2RJ|%(^aw%kHq8r&6m>GJesz4f-SeFc-9Y`(?WsTSAVuI!ODf;^Bs%V+ET9Bq?SvG=NNzWDS_Z;9Y% zfyD>?>6)=zr{g;plJjK&<_KK^%1-E`G+t1od0w})Dg$vlp3u+Pi;N&7)B6NNg(675 zHr}1rF|&ZE_W|mtBgX4(RuplouX!9&iG-F>@iskxPL%60AvOqG{e2NJKHA^(MTB^m z%YDfAGfQs}ZZF$zSXp=gk~YmCq{f{JVKpe}&Xme9Y0lnU!+kDf3UL0jfqr9DJohI- zdEOu3o}GDh@QC{AW8aA;Cz6Ji%ypu503%qgnq$Ebf3H{o|1o9=tM|%My^v|sOHiV) z*LRYOZ><+;fPHpaf`UBo{I4=jM*1`lo-;!SLcqrLbW2@q&gV&MX*acguFb1?&2d=O zIQjmI$INsFr=AQX%Awj^8Ff>Di1b}!GdSEffBc51VnOY=k6>%z1LH?8ocbVnwrcP-htWDgrq^1c^%?fP9|*12tgM-O7x*=SdG&lQi#PTS> zP%)8S>=oQeQvZA0x#(gG9nh(&6ly2ZlXCeL2)U z+rki)dZi)Nm0pt5i+&!?Qy!>r#{CqYU+U4gNoyQWTwq^s8|k^>WaXjoAd0PMghHQxAol%r<*O?wW9YP(3Zw6^;=3m z3)0|xTk=uY-zqJA&W=446+5um{YJ*mbRv@Tvy#aa>BUe*{_E+ogjvVM#*Qp5=qJ%j z@4-t|c03lUjc(~E#?}@9+}Nd4_cOl7?n>k{c{CI{)%>=nc(U#%$`EjuNOICGGdx!* z2~A(?J94!*9A+J|u!LW9%bJZhoXkWFHeYU<2+rd~4O!mYhkk*CB`k@2rm7>}4amR% z|01v|oM{9Y5DcmZ2dkdR$;rPAf7Qf|Bp{0k>p{o4{OWSF#`6M}JC7Qa|8f#MX_~mV z$n&1}{|0ymIKQ7*6DtEzAWhm9=tUIujy$)MP2WYR(G)0g4Vle;KAnlOTN_fZEvuKT zbGPOF>87bIts#exD`bW8)zuKZks?f7WsirRUdv5b0Pjooi}B=c>aZ$t!uXPcU(h8D zK^lXhw(OK~{Xd&l0w_jk{s&&V(LbDaNDz|CfW$_D_Ccj+NYW$Q3GEDbf~;=l&iHsIM$+cv`d+Kk!* ztw;ujo8JbxkBjl_%(uR%zr0VVc<=d4OmZSphniJ&a$FKhSS~2zy8w{0CkaA-|NMyl z=UByl8xR8J`b?xz5YoZnrH5LX*c;#5WJCfhd$p==O*Iqp)Yswfx**g|j`sX1dOOq! zM4EA_%mpNnC`dR{fj9)7=wmNS!_4}Na)U06Sc2oqkxLk;FwEbfTdV+8PL`$lnT zFfyqJfXXjeI0-7{ik-MZ5yoq&am+|1sZHo#+*f1qH9-dMby`I@@vCXYt@t)s;+0-I zV7h_~Cuvd%?Tpe>(wpfh+(>30UX_tS<|rPxsO(3)>{5w z6IlSz9+gM|whP2|4kMU57buLSxsD|vA`+>U2$3~_jvR0U3lScsfz}WaKraU%Nv{fJ zGKzn6EOSKTnnflt#7IB$|3^R^)OsFQR`$gOEXHxY6> zS?QVx`kTo_+tkD+9=iF|;0TibA8mW|efmzqDis6QB+ghfrO9D{rH0Xb079R^G?Y2; zoRAoN3WSr>(LPMCz7Xse2!?6MP+9^yp9w7wVQM1yM+_+VGg>{PW-e!zmZOQt$jX}s zA|_c&hY7i-gD*#benj%t?-z^?yh5Bj+Wlp`m^0oRog{OnM06(sJrAhB2PuKsV{SN| zPPShjJaDU2kf05>f(4Ef?hpu{i*R&U2>g`Mnx1G0k$nD)hb}^$R*qXjK+;_yyzMI`1^6?VCoV< zi~vtW#f2qf+f>JPtx{e@re;1o14217L&>IeRyo{}%nf8VrcQ#`X$n`?*l#&rgI;(r zQ*zvT@@Zu1bGgL0W+1{Ug?qiH-3%CRWX&3Dy+29VB$u*t z6RtuG)Q~{ioTPVNS%UM<|KQVGMk&FV_Glq6;yPsk-!o)}D=HJ|` zeA_f^BaMn!0L-ZhOx>e>?ulvxghxy1^>O_S{c^#G9;Cx1G+Qfxm)EMz-a{8)_ZmK) zPBlc(sjv|_lICHjaLTT(n)6u?GdGtTjf-_ICL~kxBWLP4xOemLTu&}Q;kZeI&dKvh zv*xyG$#FkBXF!GUy|-#?M1M*zqxA$ZdGC#TOVu8_`xI{FmXgy1l$Qac;>ni=@0FH- z()iS;a*#(6V970PUl%C`!)va{ftVaBI3h%3+zUk|GVO8Ov(X?YjirsU=rVLT;UN1w zyx~19+$!Jl7W4CXV&oBxJ%c3th;SK|CB_)phF)ejw_zS=R%pPK(+t-LRKPuMsJf`_szAcfwv&FLqEKqnwRrwf1N(_ zSDJv`IM{GPkNVUEr#wBXC%#6nBVSY1h4lr3z-5kH$!CEc^*6E(%aXfFP`%$B2}b0WvGb`v4}maY4KTLY(HJW&T_x5WL_Ca zDL#TD;m=sC*mmg?xz_9$lkU3&lU%Tgck@Sd)e;etM&-_DjJ#jcZ*tn&MyLJt$vlc9 zFoEyNY6#y@(9zRkH8$wiqajAQS#-tfG|RYMMkdED0Ly$7+s2wmAUGSt+6lnTX8=)? z@|28hrm{6TZgRWX#=EA+h@Jk32g6Y*3( z6H}OL1dp&nnR_xmn7rquMMO3^9xW3dCk?`kRLzSsx1_4sJM&m32PAD#uhde2T~%S# zL=_}~7%(??`0%fCQi0q(xcV647o+e|M)1*D25mvx(QOjDaXgn?V&q{$UH-aI89?c< z^?KB1yL69w7We))A$ybH!aS%Z%G`4_fm#8$;55qmf@Z(60&W%x+f^wLUSedWeM z8&P~LB-u0n-np5Tt`qu3IE$fdVldNCrPL^N$|u{Chc+1Dzzo;P_dV<^Mt4%TBPIf! z8iGPPQ6K3I{wc&l%3h9+0>d=`rh$*DEUI2eW2&@Tr9k!BRNmfGSTNJ?=m$w;h~{gz zS8LT-^ZZLvNr-&j6IvRx<_EP_`N3=V#>;>K>7>!HbcA?osTKck$AjRc&c}`L?9;KA zbK?KX%ijCelw%&Cv2J0g1bsc4&EvCFIx_6?WyzG_1FDwfpsDrrgyEp;kA9GhoYdQ% zn8e3VNF?#dzF~jV16(_oVANoud#oVox}lWRKwxKAIp<|j26@C)?7{ou(L*6gm#>u% zouz^x)i3Mh?)5POTn>W@4YfyU6)Wi>q(q6LbdzxO$YTGl7N2IO^xULab20MdKzlnp z9Zw{9~ZyE>;onIo_rwUA?lHwz7UNISU09#ybxEqif_PbVEzh zCE@eAkDk=&v~quXr&X6`R!@6L(qlAueLLWZg2rc?y7ZW3_)zL>#}SLSN@;8G!$mc> z*k!D1(%z@09`~dkgkP0PZjay@?Vx(Y+r{hhBT}fbdf4!$T7`5DQC?_AFQ?aal#Yfm zgLU+4F5qzC$l=_bUo}e`(m1b7A8lHcR871pv77$u#o9r+JB)JokIQAmXVt&T$+jd& zsLmWS3(1k}k`gJ4d#6d}kJHgXAnp0Dwaq5=KMO@Ze3x+LnrlmW=3Mw_jXto)NT=5+2i_^=uyboFbi)~xJL^NYv4MUTy6Of>5R`E&Q}Z^7LA{a@?i%YqY1N9|Agn1s8Kf9E}tyF(Q5_f>y5lTIP-N zzSDHs)7aJ8P+;O7V?^`0pJ`7b5^kzQP6CVKo;vKF3>h>9jM4>ne(Fv{77qdUA4KNU z+$voCS#yyEtp{voma3&>XD;wbtTwm>fPeyIWKx{LIE`lkQu#yBqLAOz+QUAMsP%Q8qk z6H8TyeA8m#2YYuRctCAG8$ysa{qFgFf>YXImBeZEW}3F{j2U~zTlt+?*6lZNX1jVb z9pwW~qGHaQ!yEYTiUrM4DzSxwaWBeS#uo4s8NhcPQYSO>=Jao7((MVW7qN7=j|eZC z6aCe-0z~(dSu%#w+QZK)8`taH*&O;~2uT8tASh{{j5P>}atabfE(0J?Dr%z~)iMGI zGD(CK?`Ay2QL$+GHK<~RN2pnU5;w&O?t^#OCA0%ZzEGNt4cKd#b&dvUL%}|@d`O=U zAk3E0BYt*TNwP&*Ws@QlW-!e4hiQ2D4`Hb+l9(jE=16y71~BNOc0l!0=?Di%)o`h{ zLEvqyaP3;IvcBY4J&sAZ+fh8sz824^!YQZ+6XJFy_qUYm!sr~nvn%y|if5uV!g4Yt zuBBwVY_MZ9$Ui?jFs+BYQnrzEyHd}Cd07Jl9n3rey~yTC1K}>@u%A_0F~22y5!@Lp z^zuT-H)0E#q2!R>;!Ko=RwbJmitpN2>bKlxHItguBu35%CACl>`ZtS|w$g%4g$diY z5B&Oqj!M}vG{~~)m|qM8+bDidybhhEXHzdVT2r|n#u13ZQggWCbsQ8q6L9qC82A|} zC1c8fNQ1V*^w9)6CdR|8jK%us&7-2sGkqjBJMus9oZiD&ZM&|!8u0vXUQM>_DDCy=g9x12gm*!SnIxo> z?+@Jgw53CTRC!!ekVV82Vd%K*0?VsT_gyVmnyeQAlx6mgXO}e zwfd?Q)0_x`E7Wf78NF%)wC#_d6}y#-Tx*M;?2DSCg>AXEDLXFHdxwy#^T5MjI`M`b z7$gnH5^b*rZ|6Jq2mGAZkx!SmhSQVf49rlJ)Reb<^xI}G#D{ztz8>(X*K#3Ahjtmg zUh%y~BE7|KQp>c8K>+EcU)NB@%V{DC^3wNX%C#q-n-312tdFOCY`iojdf3DusFBqM z-yC`xI}^Tnel^nc?ETZVL@Dtps>`#_39q47C;K3Bt}O3h!PY=vfnpn0=4P9~m-!+A zyeXK4KI!y>?KJ!rPqmBvS@Xv8-%p&bJhQOl6|_4Me8yAx)Y+oj2HQ_FA{FESm&Z!> zC0^UQ0p9$&=nuMp(v%ZMXWiXCykEP0trS94|yn+7Ko64+_*fz$xvdT-XOR3;Xu} z6xhf$O6_M=?fQxqv8DwIaxEk!S!qxSeqFnXz_4p^?ux0y4RAXOW)VrleDY zDYul*SoIg}5HsTa9D1hCMPBjA;KYwx^E8!qYZ{_xu>fthj^PFEVE7G9H!70q@Ho6h zuI6Nz$8U6cyDFbWUdz~YZk@Su^ahdr$Ou{oOtEUc19fb6rDd)3Ys4|U9Y#o*!{7>A zZ9*KZc#YEZOas?k1MP#8d6ncW5iG|lar3XQA&l3bY$`I+6yQYV7A#{Lj5D7LtchF* z$iwY^xOXP!FDOY%32}RdxpC2xkCCuh-&0v$8%gj+*KosXysJu^eXraR$aWK*7cp`? z+l~>K$9iyefDI)WF)f5`dPl3$2zf9=mW+i`>4E9%!;<(70&HCIiHtRtmz%5$bD!j7 z#DLzyq!l`qF5<)6<`Cr!0+Zbr(8Wa{lY&F*bd40hQwIOEn)!!TUFzf= zNJCtC&v#}$^db*ea;p*|Y0i>_XDXLV$mP10V_gh_S#u}V+2IJiGaqLz%O;L=?W;a_ zBp2x$!rzzpk2kBg*u&v6gvr_-ue%d3uieo(S&rV62YkYZp;Ga zYO=6~4M+rPHemE9n!3 zv!5f-laK0jNU4^M$>C+8;9b)&NghnLlT^gW1FV(4RAG)ZKjfuC?YobyII zglIhZMc* ztINwOFYA9#wHq4Is-=Akjc{i3W~ZSZf67rP(1vV7KXE%4tfCYoe@#N>nAp?vUu7)tv_ zS?qPjtG_R=1lQ0P;U7(wfOPwj{O^JH`&!vLs%2DA&FL>} zaaM!N&~VJO4vjao^an5IBf9vBbcrJE+@Ue1`x!%&DxU7v+7WM@rYi9tLngRs*zhwE z#15R_qFifzOB}~B84NJ4O#Wd?T^+uHGb_G>NloJ&)}s{A?UJbi1UMF{IAY2vH%@IV zXSx7q;W~Ss09V#JSIatAof~(b8&^j;=coYhN;&t28((2L?_xP$_&PuJ1|MRBXTyzu zt{i=lidJ>NbpDDy{kjM7Ey=6`M<_f?`er54fxClqS1-v=s&z4>pE5e6qRQ9+GB&hX zCnOZenq?J3k18Z4sGA-~}aPF>k`1!c4$&9@QY*@8)L)x0RaJxOSx0%fgj{T|e0w#0%X1MG zqsp%DE^2P%btPoewUpC4ecK>T)Ga;EW6M0*c$@z2yend=%^_~%=a5_2+qJa}XYGnB zi!?!k*f!0LRZUMnF4I6RG13g`dKdpjr59ddNBLvo4TFJIPO|y-rp0$*TEI1ouN;>? z;NQpZK)qdKzm2;scD6c$GD>m}qb0H1#y>F$@L+}K)HXZ6V9d;Em#D~nv?t^^fjpG|m4yj1d^}d6s zj=dF^#5I;uSKK0A+YBeTmoJfWpkgbc?j><)x^W3rRbWpIsi8(s#^{gzfNDv0nkzJJ zo1q21?ohWEYT=_#4Ht)4Cs8K6%f$`tmPjOAEOTm{g<#0WRkML=^R-%M^_9$h3Bn9C zwr>FGi#-EWL0U3FdYF>pElf>ct)^D-&}L)9hvmV)4E=w5Y07amRg#b+ueeW!sg7|K zd39S_bE@riY0o8p{~c<`%C69LeNgxIc446ypI_KEL(+A@#;muGnfJxM*Tp0`#bAIM zhOt!T`u4_EGaujI5@SJ#^t%O*aB=>Ib_YmU{m{n@$_r2ez8jBMLld}I5^#4{c4gX# zJQ?KKh3fW%#b3)+D$7>-qNP`~+3B0N+T8t{$+-3e5yy1@4|^i|1gAlJAN6*B{84GW`n6S}1XQ}eH#;$Ba9zpZm;kbm5e>9jTF>D+f<+_r6IR6UYX z-Fd6Hq=ItS$CPuu;)T!pfcPkz?_Nq{t@_R_2p{b*L7I$x!G#4>2coA@_{JUA5OHU9 zx+a8d(_Eu|qi-_8=T={>e!i4fflP(q`U92JFC8qkf|4Ju?|BEhD~q`P8Wer%By)Cy z`dajS;;%Zt<6mCMf2l55**>7I>VoVNe+`wYocnuGkT_Wz^l5L{HM=d#Wl#6Xdy5K| z&IblLPKFNGxR>hLR6$B|W8E!D(oxj~g8NTD*G0-IGn5Xx73{!Q*N~8nqc`fw^45=d z+qIII_FS$#V|A+W@G`Yg?6DZFEi|^~2v@gyqeIe=@Uh|XJRo$$RMe0JelZ*7$4w@V zeA)VY&h4tn`udXS;z}@z<@41r7dL}-%^LyCRZZq6iC&HsNHxK~ys2K_Fs9_DlDa1# z9?-}EWbuA46v!S`@^LavcX9@}f({INn%jH^(D$2B3C-XAcoO;~1YTP4bl0A7y`k#Z z7-A736aF-x1O^Mxh;w~?g!&|x=9?$@^>quT7V~6jJqgEAB!W3;7y?_GUWIUoA*pKQ zP3b4ZOa{2SKei!Lua{nll2N$9EFXjPF@?5{Zb=$8DHvJFUt!;^eI(v$C4ex6LY)ce z;X6!AErEXSYROMXIkF)g`$TDh(5%*IKs@!@mob@|*frF(gzDJiArG_|TdHg;=key$ zSFH=~QXh6me~!Nu`bJ!={LA~5`JeAEV^Oh|t*aZ`j(zp9N}E?-c(*z(kRpr&^y@qjp6@6khBz4D63MZP5`%!gfktls9#OqGp zjzgn}bNG!FPG$Xv#c9WT`s5qKF-qRAl;~+{9leBa2Oj28xVz~_6Mg`K0chKLKV<>1 z(2rORCHtTT1C4Kf6(V-`d;*S7Odozr5-g2@gzd@fA9b|*em}v!Ize<_^(T2D$J3O)Q&0)xP-Ah#pI5yXOND+e8_U2gge*&{PkUQc@0yd^9TdH2#~t%qq~f_wlx*G4R+jdk*=+m^X;ZtP zl#%xo)i1er@~t`J>F;xS*A?16wEM-Ux3)O38%0#b@Edu2F%NrsGqNSyqg{d~QH*d< zZBi_*KU&*5M+pM))9c>T@AR`uZ8SCdZ}1O!AtL*#oSRpaQ-*%B z${)TB*ZrwTi)oh;H}7xI5_oX(jk-sHME!Lygmw3L=4b22n^sb-HNGvO2cDYY4=fJ$ zQoXAsXImbP=Dp8=19>;3m>r(?PVgFzb^A||4o)S11Et)e)#u`z)y4&7$*L6{I^La* zYLg^q`FYW9)<-#f-rY{O`ak+UWK_e%cl?WU>u&XLP3w95;GA0d(N*+O#!C!FvDL`* z@?>3$!Na#DOf9rCFsYinm8F#~2*Zk3K^OT;#f7b?1&`l3V$CzMurVWe0#3sf@O$`n zT;dbvSwIiGsmbNm$fMs+W21L>rFHw%S`9KkpXa-#!V~=#`}u-zG{cWR10{)3yN@$J z2Ie(eXt*A~fSH^$W$&{7?h@Lvn9%=fK94+`mF4)qB?k)Q zK*1a+ZbM5;3k7qal=o9S2a4p7kPt;A5-Gw1#dDxw4v!x{rYH?R&VEqn28!fBfg1iB zbNG+suuE)l#Oyj^C@0~dNDdTofx&TenVU%O&nB!QKo3>4z=pWwH{OT?tH!BT^elIgSiPYPTRU zyGTq6g=MHCIv$R-{5R%6Jd7gBrXT*-NTWE)$~X=WDQ*LCEQ%wvjAQI@c0H;NBYQ|0 zvh06h4(VgN-DA7|E9S7?jX`Qtt`&;h#UL@ENXlD`w&VZ69JuIYa-c8{6wHAFI7EfY zQap#VLki#^fD{1!TXOgxjDy7gM{+>26M$hL2F`@Ww&AKS#z6(qQpgv0T^NLM>avd| zjzT(6dpTP&RO3?rYU?Wi6lNO2C!NSVN3J!7a@x4nipy7%b1(RZeCx~RkIN8=p#*-f zs4m5xh&#~Skn$yp(SQ+md&m1psQ9=Mi+!$7Si%xeq6R3;xnx& z#@M{N_`&;mvR0ZoiF5cOsRCi(JjWkmFq0!<0?|Xbo)Rx1up-3ND*^qlZ zRie?sQIgc?w|*v4M1q8A$@s|&ZFYkKs5$B2pg3)K1aEtxWz{j@obv@O zt;^#1TK}@oMAmhzn24{sE+>5of3Y^AT)aTF_Ng;5E?xz&zI8tUpprwq7=|}twVqHh z(^zUD?$5FGKDRV>`B{)ht)SqyBK@OoHKbi(skTYBe#4D*c(F7q?7BhzC%kre=_l&r z!RjS3_)zVb+13?7lOccG{8tHMHfo=iBDO=nSiM+$6!n7g%=?Xzh2P#($?n0x*TR*5 zRl$#vw$)yX{q@QH6Zu{bq(UJ9sKQY!I)O}pbK?LU8Kg@vG3}&D`ScCZm)@43C)qc% zjb9{Y@R*wLS({je@8lsJV76|8uPgekM}9jeB#5IhF7w)T5p~H9NU->t+~P>}qEWp3 zwj=G?gSzZD0i<}rpQwC6h>rjMZlv3aC(>3slaK7Orfam%a$=gds!Z&%sAZt6*&w5K_jxtd<9(R$WU%O~2N3BSO4 zUN^H*hCv16k*%ybk#FdBmTl1e5Z-rt_3rH)g-Kzy$##&xBO7Y<22gM~f5OlqF(6d8 zZ~$S*UenL(4$Bl}P#GjuO{rvttq8vNWKQF5h+64iur=(}I%)18GPKiDEi(}OXtGOI z<`NY_kRAt&Ky=vS;7VBYkX-o;Q+_RmR3OeT0f4gNwE>^;%m6upm+QcLjc)Kv-_P;# zz3;2uz!VFk*_9n(v*Ddp(`q9+nZ~LWKP010<6}!ky=u+joxsQ~#^iZSNM6l^KF#E$ zrRt(MC%5lFbk~cx)~PzqZJ)~raTCZvOH&%@MhRL^Q&GQM*OG4y+Ulx3#m3VO^~|n~ zlx5d0XODY$4;*c?O6)cBO5~>0d-y}YS-NaIl4}A7PsD;a0suvfN+KZGgs|)lW*t01 z>8UuRWagk^G2M^0tNm5fLw!59|vdI*0>i$a@_d=UImnv#7 zHy=mg^D|o-uyZZXOH?f{ zVfh3Lee&j#=I>gQ5Za!MyEEhBWIK|1WitsAtK8!_d)@Izlb$6NzfW7NfN(0@lsyro z42^(&D!Tmxlji-sBkWD9 z%t-wb_Vu>&vIdJUVv3ncQn5^8x*v@$(|6oYskM57ZQpFrTzo{MM(vM`J&Lz-lgd#< zSQsl-)ki*cyK;9-PcD$@iRnuS+LX+Dgo&k^@O2RlAW-Y?ez23qf;K(`*xP9`!d45{ z&I`8i0I`blZL!^O{!;b^9FRE&(ph)*>G*)ux^oakC;S;{g&9wx5#)Ix{9et+*I0)r zCYVTf_m(RSoxVyaXRgYU334aT|BJJUT2^EA*TJ<#Hs69w8bV<|7i9xp zf$aYvaRa(S*Ca_nlIdamM)+n?lq4B!wEfzAcxF9@@WO4krK$jWy#(+=+pF_$^WLBu za7cyhP)_?iuV2^f24B@mc`_c?%)yu+X^zQM$*(Pj%Ml0rM5IbH-s9D)eM{S`PMS?c!^YVn4bizX zT)lNDBbRCQF-oL(LEisk$Oyyhp99SXBm3qIQrqUc3WBQp{|diVY4{M&hxG!Mq}22D zn+%a;bQ{m3upgp@(tNLg4UP94NcbiZAVGP~WKr#qY8K;f=LH3QQAk<8oO6gm z!`HIm)P}d>y);B?#ISH)B^F*9cWm%Gy^#EyXm8xY{qQXo|2>?oClx_t8STUfK{BvY83-PMe1JY54tfaCfAq#t=H2A`fgBq!K7KEcrNGOIHl=KUFa`pS z#w^udrK;4-xz0sbsaY+k3lCOE6}sSiEdQ)JF;I(#p<45)m9AZl6Cqw{tU58CiPc~J z;=eZK2{*+_J3(#*g{U)eWAk^CRtrgid&~jiy4g_0tVm_|9G>e>l*GT#r;q4H94D13 zOWElJbLOVzURQ}3L$l&|cNya4B60qsFwQnxkWxERsK12J7r??G9w3#qzX1mDO9H=$ zp+}ZnC|gAeco1$)mlSb*j}U3Rd?gs+&$khYuQd~>H1n8KsYFw$oKrdZ9wK6>deSbrRT>>Is-^2ipmTecK82JPlo1wA*dqyeATE+9hUp z;nMdd8Tt{^kITBe@1h=yNjkmOii6;7it}|63TlzD5~13L)?8VOS9M{9)z$o$`?L`H z?4%!D_vDx(sILjm1H35~IfeRN%DMj5ASWhIqLEE^ICo_`S6;df3CX*8^@MQ6 zQwg-{dS+)%{f+jx2kMH z*Kq#Kh-cRK9I30|KD=T;hwtpGok1HoZ*aSN`O1b!y8Hs1OD=S}vBlc!cQp|y6Rl`1oFtwPWx>ftM?A)+4r?9%{F?RF1 z3AWl=5TZBfAX56p6sc746edENuX?U6TdT}tJ!$P)T|GHkeXfK(cdJ@)$HZe(_TeUH z&h|NxlG^f3#x4)t!w$xxcspTBkSYu(l!9Z=2KUGT$2JC1A(v*m7~pfxsy{u6)ZQnG z7DNv3?;`pN870$Z9~u%#4S6(;nYS7fX&Q6<8jDsMvm_huIW|_7G?p2Yh?1nFeo}oZsj9!R z(UH_7+0;s+eA-Z|+SF-G|LTY|XiVx_X>2rZcx4H>Hf87f?PdVW{ZPsKDvk9kgpy_5 zo9hKv7g^a*PzFUys0on3-DW#`(z0^Y!i{ZxJB8l%Yu)uT+ca+7b~M{}4BY?Ky5soZ z@I%X0(biSVz$3>8yELswB@aH6(!6&c{Jzz?DcJ@%1#Xe(5Nd7zKD7EwJ)l!-TlahL z*3s+`r;N7P@zT$9JFNz*8KP-KLL-C6sB781~4P@eNU+$?V@~$04ceK(+OY zUkq5Wz=`iu>Iwsn$|n z+IQ|*A5T-qtv9`lQGG9MZNLo}fegsC(Y>*x;tYP&!$sB0Wp27_w!ZDzaI-(WDKA}Z z;45=m@o)5`agU-U^poj^!pt7ds^?23Hfsx z8NxmEFKPfB;uwG}?buipxDYmA%<4Vf#y#myWGbm4(6r~7 zznMue9bQ&PQ5P(6fBe!8mSGhXNS)Fi!axsrKjkW}``PaJN-qzE zh&<~!AorojUS(HJ%BFspnArskRlgbB5wB|L8@DnY{TemI$%)H3cs3Dm<<9T1fdlgV zz|`+I?a%dw!HuWv1F-l3SSN1wUmKm=9Ap)SOgHV%-=BE;d#d91=pz()S?YP%v;}>z zptu#20gev4+{^*c(*jeK)gq*k=PH5#{ZZdaHd;w#MsUN%J{o4RM096<;TZ{IxK&S- zdU|F8*~e5xPTMJP<%vEna!Suje>BFeF@4trVuQ~!IKx2%%^*kI05jX% z(y4s274FZ2y$J?q?7qAH*g0K+A3{IfFIqNQAQrFZVwPm!Z%PL2>h%SVLi7Nr->XOw zXR{U77yq`esPsl0h6SdpjIvnLT{L*gNlxr}|EMhYZ1e+uQgeRJ2Tx2+fKS_(A9 zr@fn)%5XtH-+?h<={q02G{McTtbzM&DudFr^t>CvO}AHrT86aCpBI-eno0BreG2%! zDqVQWEsceOpDKCU5}b+2c{$QDXK_lw`~38Tr%PU5#E+f?OJ1zqeWXl=mlAATqxA*6 zYGqFUW}TTH9uy=mg8VMV0lhyx%rG>_DVO_C3~fEuKsV+pkL8sy{f&=N2^^TbF7B!l zv2;Tu@=8JT&AWHZ13_tSTOMh&)D^Exr(QPfO@EsO0}SK_$t#@;hhBdHT2iskExpl= zuq#JHgK6$=P#0Muf49MGFuQxE5Oyr+Yzy1Ro7wFypZU*dNKfWJ8X!ea?mq5iXr>Ew zIq#(-1to*ies2}X;1y79xt;a98@Hdz^0AYbscDaNu>PiH;)-o+=>qO~pqct$#Au+I zlV1SQtY?|nk0C8!&S+-LCa>gOiz&I#Lx{L4)HB^&4vzdG3vTSK=+hMhKD(}@I@KFG z@h9S1EqHxN|0Q#T)T67sE4OV`~wMdZ$90<36krcmOp)LN_PFWowZIjP9F=*FynGMRGkFrgW0gdQt+IF znO|VSx;Q3Rx$6Q8bR>!{V+?9;cKhX+9>Mm|(}HUq{4#1Q*8sB2f@aGxJiz$#0&vAL z086%I&qli(5TjSXJ^Wo(Y?b)_sCU=YhLsuHT;Pr+uR{FbN>~EhTmUg;h!3zpVQlyG zK2EIKnVj)K1TE2fI4J(l=iYE|BpFVmL)$RBK^{$* zwfU+<7KprP(XEdYIr|cMVaMi5B0G-GZS=dFwbzOHvd`$J-Dh@K%$7y*w;TPpjh6SF z((jD@39ae;xb6p%KObJL4_vH`Fmd+Z!GqVu&>XlwFRyN2P29M0)eQZwLR?1Q>U^)8 zO>5v;!dBWU2xtW^F-n+t-QB~wPb!77$oW9O#p)9PK1~?=e5@c`lpEsFfO{dJ7szZT zhqTPCH7bz2+@bq3H`X}o-0K#Pl&_w%06h)r^a7<-4u~XhN~?BJ#n(wMcN1vx<3N&8 zj-cY)2FbEk=dO%6f!y!{LT`9$8>6jbTF$NPvu7zx&Os?y*V9%>dM43HJ`0?{$LdhA zGY5rCkcEMG6c@za2lchwB$X%ePxq=Ekb%;(oNdll0T7&Q9OuUOa~u)0GB$qh^RY0C zK&;GX1*1;_2y(y$yA4b8&E2#WpM(S>hPJx^fo)4eyZVV4t-!X-E|%N!F73$~WMWzL zuKe(ATBa#D%uPozFkX!2{-xFtT{N3guZAY)nr`{Q`cCcig>u7^N#Q~-w~zHuXsr|w zu3RbB2(r%kNwp@F%t=V!?M9hD{E133a!B+31IB0zOPZD&Ht{vG+Z)Hh1QFp z#og~ybS&Gg%r2N9R8lHkj#j9o?JL9vH&cmn5Do^**iRn_2g_6P5Fc#pP>rX_t**Ddr!$gx^<@KyJy#3kBRAl}Hq6gAU42YqCHd+i+`5 z#@Nc58wP$3o4BBF1Nw4V|H*;mV@Sy7+#I9rQV-b;Xz-d@bA94xP&)P0^e&q1X1MaI z=`CXm;8I8Kef1ljM*4c8Q{Qb1qWdiYhC)TMb_{lOj&KiiYEaR_>4T4DDb^#!R*y1% zh%FH}J_iduv_@B<<%$C1Lm8@ly3wk=bn$PL$b@wPGwt*e;sMjsI4v-2PMBWR{;pu} zysSh`1XR2_K8a7qd!6o%r*B(?{Kk*C2%dPYHTvys34$WuXb(PB>XiR2ePUPTCc5bK z!8U-MBM&dDRu1>?eid03UH|^(MeO~%-x4*g%IGq;wC_(5GVV*N;;2a|bWbh0a`{og}r$=<}7;<0XX}siW(@CF=D;+s1#oCx7mwKxwh& zMl4ru_WKTo7`xq1CYz~_v{3T631BE@*(*il&v7FEZFYF=&rt_S?;q(cygz>aG=ztX zJ&PT4`Q2&LV|3}&z|#~Eo$Yd>>$C7)?XYD&CgyMJRL6kb6TBZL=JylZl$Ku^R6KfK zo1Eu99g5H}ZWy7Gxv0KB7eS8N07C3q;Q>MB6317~MJ>@dQ*u0C86j5NsxsG%Ujt;n zqDAATE-|VD=f=K+RrHYCY%Bw8*yBpA!_Ni&2}(Nq(fJM?BsV(USC7+jp2HYb)7=WA za$F4IOKj}`#Pr)!U9Ok@>Sbhx&OH$_UNm}eOPAwF5t;r|O{nj)UEANlplFbrzdhV= ze2nlMCv3{~bKnQ3YHkorUp$fFpYjB?f_MyQNRJ@vVDvxh&{U_oB2AQp)aq+9wifiW zd^+=FXZJJMoiX&+bqpB8J1)L2EnpVW)f>D)b&W08^5IHPzU1JHHUv{Bno(y`;ruy| zI(mcnE0WPose#D0S}QZ7EK*EFWfeZjAi!!(h>;ugLUXYUVQn)3#&Yg*e=3=9`~#5z z?p#Q$f%>#78V-z5&wS+<)IrVy)14LA=Ck+ex05V5mcCZ-g7*&(sOO@7UC#Zh>!bDQ zHRTDdvWiB;=OP`cHzg5MIk*MasMltJntImo)EPsSeqGA8@~r*7v1f4KN}!4?E$%2_ z45h&lTO(iCBUWmSF%95T9|E=fh>-d6CC&nD6=zOq`DyYbV}V|#93Rr{HCjcgykZ8T zb7cDDM1-6hy;0a4l|q$_g>ZU&rC;IJLi!4tM-j*^C*lUQv%>%fc8B}x2H9!NZ{!;= z!aKusU+pGM+z{kB@6oCMRoahsqbK<-l#r7W#Kit-Y9~Zk`~a3}8OuP1Mw*}cyT|r8 z*hDXt6RCy||NK(e0E3V$SSkK9OsV6P>M%8Z@K!HPmqxhHHT$&vPd@Bq09GyBi>d^q z9w`Drp91gDZ+MzUCod>wdI|Sma*HZhDND-sVBx^TqKj`1{Z&a(k>|8S7UlKPi|@xF zSNJIU!o?69ei$3bNVjVP(u&JUCvt6F3)P08*acv^bE1xq9V{@(p}Z*NB-Ct9R;YC( z?@linvqG)TRJe0#9Wt$m7I0y0`5Q>r(%+*Uotq8qou7u-T zQF(RN!Q-PMGHS~LXYse#pKDPuc3w|S%&=85q;*e93ROWYKzHa3GqpH~N#wEg>tsK;X_t($U zy+c0ah@-M}^O5v@@_a>k&5Q;iO9v|vxnP8V%N&7OhQjmg_#zW+OU4nZ4=-|;^cm)J z`ck9uFoC&P_?6(Li_2TjhC;P7YAYLKinh3$=ExYFWw~T!HQ%oC0>C<-Wux!_DVRM1 zFnWPD-@1`{02rBCNkf|rM9!$`vB2@>*QfBSZrIL8r+ck#|VFUT*e}tM&{SD zzQ%lDX6V^9C`ON80WKA6!+_F){qm_8OOm3Z<)RHY5nk!vu(-!$V~<7LF;&t#Y)&!w^XH*OHfy{da4=5RP|az!K%5Ib8{I&Q0?s4 z=of&9|9!S+2^sR?$%IcIt3kxlB4i({#dZ0a9aZpS8Fn9GuaBzp=E@7P(K~IPA2}g| z5PB5>S>P(i9-zuwdu3t{komaz;10({uEBtD)t5#|Vc54Ee%>9jx_^-&GL=PjMBT?~ z^ZIb?y$9u<ybXX@ceC!1CH@G+Ye~Dp)gKYynr$bjW(W@(UX2b%C>(Lw zID-%fw3@;pUmkgHAdQ}=Z|MPXH26x+Z@F;`>}_;5(S+loq3b@_p;!k~oH_q;FGF&M zKm+8~C8~ob>Wq|09;5NciD``%9R3X)sO1JCGtgL0Iv_!k4B*%yDEr6X{dwWZN$FOd z=O>w(F3Uq35O6Gk6-T&r$_T3@)P@doVhN1mAO{ZMkiBPWA9sJb;xRRiI498gh81-z zIN$dmqyfF#`vAx;A!CyCbdpAJgDDLJKXPH2E26sypd%B6fb{DOPd*+A{I#OG-j!bn0uyLMy01taCTt|Ry1o1i>!jY^AOQ!8H zrhg{hQRCEu=2!mBAKUF-%z;Iu0kP-G2n_h#z`4iNWFj2^1_qzoUO;dF39QR-N|n~{ z%XgC{AUFUOs!gynMR6)ia#SW-4#Z3o;2XH=>&Z7& z%s7r7-l$H>3ZuzyQ%!>H3C1}%eP#dQ06f)l7-&%SqXpiliqH(p z4?1WoTBT(KqfDffIQc<3elXDpm6|*yx%imgC$H`sgOT&h$mP3#*$a6&=I*&ZIYk1p zsPp77V})Z2;TKQnk?CWVVA!(7-AgK}T}ZkORLpRp06!h4rEE?STgtoQEK3xnSWbf) z~Q1!(Qrp~1-JfQqxm{hr33ebh&m)~C+}_7JK&84G_5qKyzS*~r*$vY1Ll(-tXX zAd!pu_2fZsQP z7X(^{Y$gWwbV^(nbp))5$MxgUqSOFdnAE@&`CZQ26!Tntl zk(oUrxU61q^T~C^TmhfhhT7!6?ue8WrkZV?f8@NFG}{X-nX`m6GfH_w+tB)CmJ~I0 zFELZ#2*6FGQ8y%^ad$-;;w0^n@ZhG_)kH~TEM0co_t3aj7^u9K7-EPLYhwy4N=nBS zK}G>6a{P<~0N3pMv@R`tV;>q|d9AU;vA9KdlR6@KT@uDPRyeAVuZ(McaC3;9eBl2g__5%d{LG`-~+Ce+z;GiT`j z`560Ti<~%A5eOG=ZoWG!B#Ri2cOg8&F#_s`Zz$meBBh4Ox{~cuJ5sC-h)91_mVuPN z!G=n>yrCs*gUq0{)QQB$MNbm+ZDc(>AniM}THOH5@FM5wU`#g0!zV-xwnT^{_GR#f zh&|J#eSIhBNYWEhhA`)M97ms|FEr347o{1e1Y_L~1j+5-2 zq(f=wkEI}?j*y^+g>RMPCahvFt*E@qlJ2r!fbE^bVS(BlNK7&!EWrcX28?~^i(vE= zD?-3FDkJ>P9bxb1Ex=(qXhuMWVY=!>*u1c@(YT~F>`=x*710>%Uf*nIvEjKF>Mvxj9t-ptZn7XJ{CX98o5k; zTQOm;4Y*!Cj=Ll5dr--+#YUWMCSI!;HI@?A>0tH$FmBwwlqw+h`<&ob(<3u_C-_QL zWvrXkvjNH?%`sT@{ zrG$rfZicURbY}0WetayE3TbP6!q0wH4z-mlq?zk~W>LMBZ|~#s^Yc|9o&-(dAI|Py zGx-tK?w*3|o&hS8xv?VB6%NTs;c*ChieTKa|1#tQ5$?$JYwr#E!*~efB}57z4yiDg zT3Qdl|7%14@~JEjT)WaD;v@&$KN{?JnzL;Yh(D@>H%D~H&0LYb)l01|`MIGTgbw`lKQzF%yn(c}sskJO;&NPT3K6M57D>)ut6*|B2+P?_-<->|hFLQku zX5c_Y)a#kR+aiYMDe6M^k18AoHh{99^L$*xA-W`2?W7$V;~T{fiUPrfnE@Euknvw_ zqy2AY)(Lb31bt8&F+B8M1wduGpS63HL3#fS@$?9HL7*TpV5q-?=6zG%oxpj0sS6e@ zh#&0;{#K)}pX$g=a-C(H*SyW&I@O=%)-HStukWODU=60G(R9LWRAe=w31J&W_ZL!5 zeti3=Pq}%wsi@y%QN(5hA5+-^X^rGZ55Rwv@wUum9kGURtKHNQZYO{JGL?(P?C5+HsArD+<8ec1l$rswyI^n%tEoenm%Rk2)j;k~`{ z0F3?!&^fownWMyBLde%CYtpWb{(@vVC!AeGXpF6z6>Ae{pbJAjq3P`zJR*c31;*&b z{|t)191>G`U3v2hkOmQ3V(S4{6_TcXEBmY(U)RA)_@zMItCQsOcqo72@wY7iGcY93PM7TP7`+@l zS_9tiAEC*>T^G-Q^ZpWwrClpUK7uBrdGOrSKn*0GhR4wUbPj~V=|F|BiR@T-k`Puh z97z_|Apk4di5^GqppyWXoIS=4tewc_kR&b?#5w|;;-S^FDz4f&7!K8hqMUcyh!TF$ zTGXVBuxc#3s-cwjmTRH_Dig)?;rN|3owQfTQDiJMg9g;)?)DKN=(SPFS9WECPwt|q zN)y!?tCN+7f{gBTk*gr-0L#1$|E0U<Psz=-8PSGIFaoa0T`t5Ke-O3m%9A zYcA0%x2T4JXV7M?^FC{iIKP#c^N^h1u!H~G6Iyx~7 zEh~lN-IvC3f}WOWJ{d^0pVqB+dE85Uvz0TVd1Wkfu9)_d2X5J_ulQb>7jv4*UJ7UQ z=9|MXQuE{}tieBWh-Zd=qQb^f>A)1@FWNABX2RKlTt+X59K#5Pcc7LL&gxThS>?O~ znP@Cf3q`6TY_G?rzO*K|q#-);mcrP5++V@LXu_;(O3JItfPf&ow&6;crH7%KdM2&IwqeEUGL;Sxe0lsz8{BO!`j7YpM3!-Twly-kt z0W{8tJZw0mAW`wMN~+C*4};NULY|gioyaV4Bg4R&YBOD7UYo;GxJVfeCxD8)KKzSt zY4R8>0$y$N0)Jky#2jG|KuKV6sow?j1zN0^y!aA=r7lf!q`c5&w`L_1JzwCU{OP+0 zZ3Z3gb~B_+z?Kn02hSB(1*&^G-;vHCXsP^eB!cl0m-5^I8?t{noM#15tGD2&u$HM( zHCnBQojW>j#AR9%8igD3k2=W#_~Ff)}Bjkk-c% zt3hG2O7DHehXObQD+P|82gp2Ae-F@`DltL@21GJ5|HgW}GUvu)?nQqREY@m!_>)C; z&D>@l!vbY5L-N?XQ}P{#vwL7;Gd%@FXS;Ytp8{hjlt7q1OEO)svFnBID=M%rJ!K{! zZ^R8l1+2h&tSwr06!PYD0hD~hK0mx@AZ|FX=El1;?9|IisXY%9JGjy*z~Lk5Xn2Ky zrvBMFf^!6wrPuSre6v-b3iw)TxxarcX1^xYT~yS{Vp%hcU_lMn7V$q#X#Mi0u2%i3 z_fp^2O6W#k=}e0>nd^DrN;+`5{Oatd*DR8`U%fj1c38rV7T!OLwey11wQ1nM4Ml`- zLZz*-skQJGgyx)hFAOUzh)1Z2%Yke>?;v`{CUHs|57D(X0*DTJgz6$MEp|hir2%ea z>{Uy+E3C@7F_o`w1#7&N0NY%)d01ad9~z)TV|7Z)Z_N-Vgyk21zBTQ|tR2V7j>OoI zaSR951vgnn<2mq2N{K84n*@>VYzx;((f%oqF;|>%Cw*4v5L0X zMSM|HijXP`K513*OZnyMsXJ&bk+JG;Pq#1)at5dkCuJPVZwcMN_cXf*8hoaR;V|D% zeg=difo}+4Fx5(!&>397#LnShoAzRI_ln50(W&rnBeQB*5{)RVnFcJ*8>~T;XOIc* z-l$3WiEQW(OM#G`|JM?>Fzd1CQUnMJbD?DELvoUR060}S{z zv5jMj9HeE!V|Dga^FtkV>;_WU5J6YiM#n(_Fn`|RM4OmLFn1duh!qpV(W=x^%^+k8 zjLDOzj2m43UL9dFiPEf^Pbl7#6X%!$>?GY$sp=ihIs)VA2kYC@KN$iErcMr*hkkOrP`bs-%B-I zbHqyc=kmQmt#3P7Ys$Lsa}QinqIT)7D#?}pynais!&K{}x2&*iI%FXy6CBlPMgg#N zVJ7#S+vy!S?`ldp2E0BzbeIhmy{4iE@t&4a9mvvrr6!u8shw0yCBn2_`O_+%vr9=) zG`}O*`J;!mw}odGZ05UtYUiuA0Q0}VOhe(uvZz*j^%p=AFI z^O+&lM)9OQUc(-y`Ed3CDVL_h^C7qFri9>J=;oj6Xk0`|y_WemU5y#S)ZZeoBD48= zt28Bh^1>$b@0ZKTW``MqM>Bg?KRQ}60>YlWk+`G4_V8^UqXpvU)5BRQZ}sv6z!Fbg zGj8DP75EXHfab_O`rhI#Bwltm+Oy%O!BdA&f3dG@xe)PT#l2&oc%f`peyDF|KPR;8 zYxH}~LzTJP|Grjj4eV-N?0=Ec`nB}A^DaH^*7JPyjmFEjKNvpfpYObOqdDmDp2m+-LV@&^!a|{MH5%i~%m+yRyI}cDTYk{V7{4DIP)nu44MUKpi33^ zCzWW~2jAL|>J?tE{UzVLoF~E?y!h64_3iQTy};h9zaQ)S%-#E=Sn0zKP+gwN?$-i{`g0UN48?BLo_x`DD1k4opU^f1Y@y#sqo*mz#`Naog#3Rp6 zuAnyGLM8d>MkWt#Zv<#moKhR)HM-=3G=6O^r%1##g?Gfhw-Ek!LK*r{B#lW<)}5b5 zJ_qB?X0Cx{oPc>1pIooMDMgkL8Q#~3xwV0ohmUdSj{ygG52n&wVjB4aqcUs+=5z&(Lmu0JdVOIfBHyYMCyx(LP2zr&t!*7)sD z1|6kO5wnyF?)~^~^o)C%OK#rCQ{YFV&{=x{L#|NsC%e=1=h%Ap@2C14oB|5A78<|Y zzo%zSj%_`weW$)+RKhL<8BDo|uKjl@S2(|lgXAuq%WR-2?C0UJCq2wLic_Sl(NN)N zHv~^uYV>oNrBrJIh22}atpybsPhz)O^ta7!ZEMGEuQn1V1vc{fhz3(029P=nZFlp* z6*DhkD^+2`!2+|-?i%Rj^Rukdsm?a=Et40CcUXj6;|c?x zT%ZwYR-7+oCu^&^3hqwJX*w8}i{x|ENo@)lHL@COybf3`^qbjqsNl3ZTdDg;ZP1)U zJbz6@UeJ?pef#!KEq>S3xFtPU{B=N>t-+mop`VFUmFfOA?&mww{pu%u`j(XI>(#&L z|9!lBZDQK1g9wuYjK*;&JY_Qpr>wW@2@$$Ra@S+6!ahuyyz%^cVu8x6mqmS*)*V4& zyJOg{zG&{&ELJe^ir8$Vt>B~=E1KYwxb?%5(eK3lM7h|%>V3@3I@5ZT&(f=(E+W2* z-Y47drvn@U8bxD$DZ+KP=gxz4pE#|e?9dr7iJ^ec+s|DSOrBamnzeHdf>mKn-KWWz} z%TdU*+cbl>#t&e3J<-3-xSdT?lsr`vgy$$HTlaE|Xo~tjc>5!Ex5hu4SL_o`fOUASmKCO=ob zeq?|8%(S?F@|v)o0Aw$bC){H7Mt#yITN7v9a>fVJU_*oqrIVz%sG$!XkqlFq|ZLloI?@UpnGTCpBC~S_M{12CJuMOap$ZA54(kU*9bo zkIfqFUz&22n9962r0VWxDmBu&I63uk>ZRSZw)<1r=JEuKH#fcf_YbDNqz?*8NudJ; z+nwhHTc#3MTaKqkR6nh}o^Ez|K30E!YAS#ky(|>?TB>5Ll#=`-d-Vuft)^5_hl>j~ ze!{X!yzaZlT|so`+yNHjAGLT&j*>Zv1XP=jhWa~$O=|NqM~i!vJY{?D1Df?6mR#N4 zp1<_lDZ@x_+3w`-)^1wOvuVrF?n>`IB&|$I+AkIIkgmDre%{i4calH;US``zdB>Tz z;c-Eh(PJ?`hgR8KeZN34(x6zLub3F4-+`?}fmijNVaXAz_mu_Xu<&NZ)e-c>zV{yq zzn4N9CI00h)yjgni$wqYaxwkf@ts!DpY89qLTuMmwr_Tr7Nm$OmXNgi^}nnH`E<1Y z*gh|q@w}1r{>c<))t6S~rIfG#9{heNbUD#GkU8L(l=#F;>bdE=)lbmby+WS^`X>;) z0GjYC=Q)!gVR!1Yaozdd4$dpT^pPJw88fs5k5Zd*;AqdVIO=At4fHh)818CjFfG?R zWDT}#V^TAqiNPF;iWfN*mMuFSKS3T}&23X%5rH(^dls9;oR>xQYW!3)cN5-rkZ936 zl0ubt)O7p$O~Gq8^Wfo4X;%4Tm-n^q0iSq5vsJ ztSk-b^qo-te9EHN^^x%^9NIY7Tqwvih}vfhr4CLoZbJAsIZo{Eg}slhLqRs0q_iIh zM}^${41Xr=;HN9fUSP{g8`7D%YwWq5dw1L0?1PlMB#CtGoW*-(rQ>VDheSQ^;yX*T zQXSFj*DI~wuLk-B5qENw>J-o9TxF_VIo(Zc-dmlyg>ndX!r){&rwvYZ5Q4>B_3{)H z=)79t8TwH2ZU0xLo?89fdTi*nt!=0^+Dm&yUi0JEx?Q1VM~=&1I$deLUEuOrvyxY{ zvoM+8F+qDZwN_b8eeE?q59KF2KHOm<681RQ%~s@RZRIa`i@a5>Bj)btX&+h}e^YxU zY~(F(b<&A@(^_sFrhOQu3GFi5RB#pa`WWZoRj|0$D&)!8WO`qsrrMkN^8B>|95qZv z^Z=(C1Lu+X;%d7?%-^{`CG4*0Ak5{ZC~D;qB6#_tmBTal9Z@$IIjrrbm>t{qvN`EX zY<0eoU+oZzMo+tAUJE+KRBPqR&9*Kkj=Ra6y>cN)J4F6kvx*Nosr6ESwFwJRaGE7Q ztme0Z856slblaN;c;*KxnzH9Rxqq*2@^cggLMOJw!l9Z*R< zCj19R$#-|srIi>*IxPRCbYgg-Fcltp%OY{}tM_<;iIRl0WJLaPL-WJQwW?}mQu(Bd zL$R07+UNRlvM+T&{0CQ&nhy;QF-kRwb-AM6KI}hkotH3KTg#dXzvVA}LWr<>^aBjq z4zTaZOH>jb77a^NEVq0YHzJhjC$75mS!bmhcjqu;if5hE{%1K!;l~H8R~z;k$Dmu6 z->}!;_MkV~{z**s0JBzx2Vq}Bi#Fil$r-8OTGyv9GXEEQcOI40|F;W&0}ePLI3u-V$8G?bY~j@sAb(xgMXR8h_%RjeP9b7jo_A%Odgaf*SCLeWRi0<2cz6R`ju|{pS6Ut2HTWZUm*G z5G|&ocF^mv_$BJC_M+Z3o(HBsmP2Z9b;LJuGzUjypVTqDz6t2wA0)7;O;N8SZ?Et4 z{!<{jxA=6k_uM(YS9R|+M4GM}?&wXg-@5lt5Kq{oVk7PRYwD%jT|f5>%!jG+7|qD- z^&9PWs`Fgm{5aCJu5>Nr?qK|g>c?&~|EcZWvo@^HPW%1CVh@V%HwZZJ`51rSyy+~w zV{K)7uTdvf$eZkF$Hk3bMy@o8o~;`-SsHO$?hoyd*1JFY>amA>ozuDV<7UhiKirVn z{Sf=+p_KhUoN#t>iLp@^3Rmy@PTu$E_%$l8EAF+(IPf`mtMiF|HS&faep*FQDtz4G zxBO-Q@s{^l8VVu)lR}4sJZHq3{v2vAzIr0C8lqmeN6&Yo*P#d*z3ozal~vGuAJ;ZTRj&o@J862`y!emg zh4WwZcE@_>)}*zUH<$VJh_Xd3($_wYSyo9X;qm{{6zTu~Xjwo`05yQt{~=BBon`nx z(G;Ld0ono}O#!+T3_2Y|DVmxX|3N80mjD1o3ecqhQ3{Zq@C0=Pi~oWsK*0heC=x*^u&J&twNKmI>_u%H|qy8VDg2`ZlKm|xpfKmmA z23iX9EKd^EvxkNxvCt$cx(9SA{$(maqk_s(ppy(imx4y84b!opPN5JAVhMBxiAv=# zKq-MrA8w*ysWjv?QvuCk{ADVJ8R#eunga?A!|1;@!!UJte!hps@}yBcIW#1Vg{D!_ zoPVVX2Ga0fsRCpws4NniLqM|#Oge~buoFTlY$}`MNooT34M*ajNloY;4hTD-dsv=5 zEbx?01c`{KP@HE^6bMvMISNgG_tq1nDgL??90n*-{Br!xfkQO*}6bTthLjOxsfDi?!Q-CN1s8f9B82+Ux zNEV)+SkS8=;NS^S|8Xfou@n-x;o!RfFWgEy8~{IIC!`^hQEA?v!lR(-8tb$)kb;mm z)gtFA4pZR@hwj(o{QIw}?a}rw(XO>BkUZ+s=|mb#lRCH}7#_5sY?Us1B;MbEOd85W za_4S!0lqdxaILbiHQ@$4!z5EeQcB0y<+`<|g*aSn4eBbP^$XSSW>t9ycFd7}jj8me zYj=J6x8BRj*IkZZPP!WAog2O3RxIUMat!k}JA>Ew^y}|SZ!>kZxZ($c(pJz(`}&lz zlPmodaEXLFvC%jB8~wO1U9>m&M&xQwUt|9hzY4sllV_WtV}P)v73~+uFL5@3C|$SR zce7K6lA#%grCSoTId+r$kGgm7o&|Q+%5$)Yb9kd~F<+Nz$~cbU35WC7M-{d45SuJX zT1MZPbj5jG3LK48t^kB&{lzS}wff}Dg%6D6B@6h9AB%wVO^`1#e&2QRLH>~tPlJEs zdTU{_yk`kIgLPH#=*t{Mg>%#Ngt^zXk$p1KLq2>_6}Wr~uL9lY<*}hR9pdJL1~Ibk z+`4yb@m^S)d^1_u;u3$jy7*GKpNQ`30w2ZUx5mp&v#Q);>+l;_Awf?4GW&F%4e`hh zRq{uj(1r@}NVp#u^>=P8K3WEQoYq(UD_Z9j>4)oidGovjYtKlso_EwKYKXq47o~FM zj$eQ!YIs@aiVP_kL56n6@mJTwL_>k(KBWv3@vZP7RMh&9r`5CjvZO2u9>(M~z|e(Gb#FveCh7$%#>q{B zJ7X-P^N!jOW0|dueiW9TYtB0u(_$_fCG%{MPa;|r?zOEgZ7JMsALLY>9&ujA;wN2d z+B9=~WIo&ilG;~qkwYOfv>?oIlWP?>ZtvU3v=G{_vp8_u zWUD2IS6AnY#F3&}5f~h2jPtC)FI!4ys6_SnhRkQVPtUYuvz{hkti-2qjM62yKCDcBD)?9M?A2PG)9Mc`P=y)|K!aXoI^;p z)b!e}8`!o;-w!wcg4Vul^}Yc~5!mMh5qePx0~aw87%^8948z0PH}iN)0+L+UM=l=G zkZ*WzZTk7ndxAXIsgFWnePmT1 z3}D`vB(S@gnk=+41~=*>Z{sVi+UjdH`A}Euwg*L~bQUrdx3b3s^JS+f4OvABS%)1} zfIsgKbDOA_eK|=M74XJOJCi(x@!Grz4t?=bKtBr8X&Dm+z>vT2*AG=fc{ew%%9mh3 zJQz1mz2V%k>S|wYhsxH52V6+uw`%zyT^XCFg);E%z4U@2D|wqo-ARt;&KKyy>`-uW zh6+5Sk1R&6ghDdR`4e?|ZFv>>%Tj|l*wk}b~MwlBo!}&r9gb2zs!HnF&BKnw`&`?Oxi-U@=t+Cxf z{;l9Ro3Q}F$ph&TkNcrVKA3BiIi>KED?M_o3W+0u*Q#X#LZeB~l+q`wC*27S(ru_u zl!Jh9xfAy*IJ?4qW+X;Ys6skCN&Bn#jS43WfPE9lOwIsxMuABQE5 z<28&cg>Fsx*q`#xv1s|AlGL*IgqYz`^NAOxlyI!VF^@jx)&} zYrM&l!Zm#ZKyrrPt;4_1XeMdW`Onskgx{-&=KFy+vo#I4@csiO-zG+B4vJbewH-DA z4X?u-4y?^h)b9*5OxJ#lo)DR`sBo3nUuD79{A-r?Rmv>%=yGd(KywRX_VDZ`9ma^M zhuxyiw4eEaV5kd``6;j37e^%A%mUUd%`pYbippMY$LwgTFqz(Zjc!@&8+>j32~^TY zm#es=r>qQairu2+oblf~xrBaB-qdz{d+W))OYJ!oo8g^I4XxhTPNBDT(Jd_p&H@@v zDd{KAbP3zFB=32=5U;({kG#@CQFB=2Gm7mWs&7f#ljw`E>>T93nfrT<WmlnTXfl-OOY^pYql6UhIygZMpXA`#ZSDuN@lEIoo>G-{EP51EwfBHl4#0^I+tO z0(aysJV5fe5;;+jZoH*gbn#Yze6SDHt=R=otxVc~)uYobJXt74=jx$R?5<;2nJrM( zvXp-EhgEy`(Z&E9{BV+a<;EEd^68(Uc*4sj_)$<7{)9hS-JG!94Wq&#(#0r5r=e=?z6&8a22zah9jYt zVw#!h#%+fnpLw9zaAAFOgY0Ms4yhdc3|1Rxe24;tr9wUj*fr`!>@tHj?4o{cNB%kF zU0ReZp_cGD-9CY!4Fp znFp3Tom5l+Hq$4@<8^aNK2QOnfA0pb&GlN-Ce``&3FTC<3Bl(!br`u;2~ z7qSuq-D77WO9te=+rGlUhX)`%-=Xg&5@nEpL@uP2Xm#(KB{nwVqFd}8bxqgeOTPlL zAEienvXwg1Jzhn4VXKX_F`DM}kY{^Xnz2Pe(mkiT}eB6dst+*s;IKHbM|d zt!y{E=?A!j$30Y>=S8v8e ze7|u7cMvJM5ps#*5(7WoFrk?}4FgGlm5IDR3nhCughnL~iy}k69!H4dFYMG&pLQe* zq@VjvOt|QNMsp?{{LJP4K)+Al(=OKUpDqoE-MygVRe((H%a*jwdyo%3Qoz5J8wAJD zuh`SY>Lbq=r?=N<-%`79&obh5T=q=brF|vm)<(0}JAyY~mc59%?Bs8HID(FhkL`s9 z^jak?ZC`uvL+JDkXtH+vw!vxt?ErtCsz8ZqWXMsZVKpYJnzS9TFTPrxaC&b%T?QYf z7JpiIu6o~GwSi}~mPU=rT(!AIt%4K){jRFEr5ZM=$^*dUoFL*YL5KqWQyxLcT4?$R zpk^y9r5#^$!T;MTM2fcvy8_*ZkFWjC9od>b3$zSAOw979Wg;$K)!rmRcmd8QC(zft>&^eVq=5r5afnftiLqxP5;K5TP;R0 zwUH0X_9ssyiUT^fJi^+QH+?%HK3$qm(uHr8MIg6siTd2KE7E)cJ7mF)i`}+D<&PQ|R)CsJ87CWKs#;O9lougx}(Y#uaq44E}vo;%$z1qN6F2=%XVe&zU#)eRDv>KLI_;M};o`8_$hYkJ^x(o#1v;$s+ zbJg++Y6RL!I$0(!9EL>;zXg}cn=7bVaYFP)I(7Zf%qAexh;6@sH7*RXo}U-qhCPTK>XW{RCQz`Z%OJ!i{$-Iw{Soh zQ5~*^gnb2!Hzr`GBw^}gVNy0EI~tcf!KH(O?cWfR83*2C$SQDX8WL)x?ZmeuL<`Q` zZv>I{fnYJwvQCg&%QjcO3h#GH#yLUW+o@x6Aqv{$z#Sp!aLBF0wonR0bOUlr*U1Dp zn~WEJ>r)#zglG$dxgj+-2LXXf=pSuiLGXxhg&$m8#((P`@Gk%X|NNgxr2n_>`M-6~ z|KI8!E`XPd>%X5Ef`A;T%gO(5JTX9@7gTydqSx>*(fhXt1%2MAP%Ksf4u}6$dOaIVJJex>mpxJ07 z5ec5KnN3aX9xQ`^L?bPj^F*QrgE@~zTQJxhDkA}n#3AVk1h5?a{(YCmV1kV)n*erl z^ArY=7|KS6vO)cq7|KM4GO-G1CWAn*72d3p+iaE!CR4l<1`Vc*=U@h zp#l0d}MbV5Lp4 zU=b{+1PelfA(3Oq0e1{M{acjM8UL2X;EpknJ>Vn3KoU7fGzSUR$Q*PO<3D9Gl?7I* zXrw2S!(xN?GFWi3Sv^Eg3$WcpT38Uk%LyE!MHGiXXMhjL-<@GlI1CP9m_vwS5QZ6l zcZSi^MCqY`-wVuh=FucWq9-vSfeN;vpb?BUM1xgm6!vcq3O1u~H~{*2s8OEC zT@Epnq!8+9=!rubB9T!fi-ZJRLIQS|MFjiNzeMkUs!*^8g(1;nzLotcT&TGgg)>!_ z(uqisE?bJFIbvNyvOXPOJ$iLDgW{kka&_#goMto)^yvGGpw4p9ZqEV;DWaYd#`@;$ z!zp`F5`t1~(7XzmwYoUuNbvJIhZ@uK-FJd%jfc%flr07*FK?ebPu8un6rOD-J&|Lq)(=7PoExn|Be$_b6+*8f!e*HfA0_rKVa|;yby6{3d|ThY zs*B?&D<%*7y*CK==>u=)`&eb~V)iF5+Z09cNSJGHUB(-XJW1~tpRb4*3n6$Qd z=zGzF(0edW>@K&UK^UHbFz^Y7@F|8>ChieLg_ zv>J%q*&w7mw<;NPl1J645+nCcciQ_L&y$^*ODc(#??Uy%`%8FcgMF^V?(qf&c&xii zApV7!NY{cc=f3M{6I5PhZYe6b?z2|zLO>#>1W5{eJ(aPT<8r777XKN(%Hmehc7yVK zuIlK|zgk%OqI7O~;l_2p<{zXO6|D~tIka|(Ww!L4k{hY8Be|z8FCF`*L^>zuMsUVw z6A5WK$=+c)pQvJ>RA60^=$d(HT$%Kl8#W1Uk|-~fuOpvm1^>;n_t|N40U~kQFB1=o zhpxAdDIRv`lOsomdQMa`r#*d~1>C&$rBYmT2q#pMJLY3FKX)8XGHNDzTCWvYJ!*P1 z>8#eHB<2i%Mj_slW8V3Mw~^&8cGy*XLG0t}swFnzdwxFe<`V5^8Sw~`!NJtuH!5fU zzEP0}oPbrx}e+E4)vCm5o^If|hn8VuxrgW19Y2hOIb2_$f;0*-~i z-~?w>7B~e^QlFll2eUaUG}M!*K&4SFut@OfK(MeNqQQ{{kvPwxqmd+V>csY>GNp&Z$fOe4J!o)alF-Z^MiY|>Mje%jrZR~nCYr=#M}g@(-$S4No6}%s8+x)CGzw=P z%xo|^*aG>OgZ8Rj&haipl};bAaY!E6Ro1dGOkFHiIYFq16k z2_*JBYx-{{foypcJqkXB!U}~ivH`pM}ds^znRSeS0iu2t8mDqv?iV7{iGQ6ao!Q%_af|OlU(-1u!!I6X(NBHkHDmf>};P zVwnsqkw^rC{5$vpMnHmb4#qHxfc(#_5B%?=h6&)yYA6fMCK`euyC;zj?r;;@unA0e zG#yC6?1n2l7>^c#W%mY=P3+isMt$!b>aQ& zawW{_Tw}GDM=3b@xff_+fDHvM8?)Ze91J{KYnFaMrG86&?DD<M5xmI+RhGW?6FWkT(+MZk-8SA1HB}CVpOiORCj{% zjlamIB_40`>aGc?&SRT>Hfc+wh^v!(SL#b~9N-E^$> zKTkN5&kwA}RxqbJAW*9kGxJMa;i$FePamA>{rzJzuJRPu?h{*|OMlQom`i+);98E~ zW!2>gpH_!FY)8wtWvri|hkZ%&UBwfzD<^p5td)CTx`wF4=*eVAuqb8c6&R9ANA1M7 zsvUdEOC)mKu-nfGX7Mpg8S{K`@3Nite)GK|u83C7J6c!#4*2tHr83DYvH^4XWXunh z%ZRK7pVHG6tBfQFwem#1=SBB`Ot=sC^&) z3eZunj8P>xL9R-;26<>fLxSw{Az7j|@qXi2&-|?J;JQm!3fCGGWk=QOQrC9btM!*Q zQ_5;<>)1rM8r=ntx5|I4oMaf=(+G5IH_4^5Vp~<88xL-CHb5jooj=>)`H! z_@HMYZ>ncr_uC#&=2&bv(!*=`9=3n75KISGC9m0@k-UGuIasxAFu&_<>(4WN15#RH z!0E?7&vY?hy&_BNEMw04<58#N?YVlfll->>{&bJa#40s$wcI;cCcZCAQK4yZqHq>n zaQBzn)ZElRZZW!~YpJzp(w|LrTh4N)ao0_v_YuTE z_PND(%J$K>(;w8Q+W1~XL-J0p>@1*DVs6F-SaN?~y50Yh@x*`AT%P5dCD(7@muS$> zRo5<;Br-qaJ8JMF6Ln9P;N8bq_1U};^|bG+gWX*^LtoMTnZlFKNZ}uYw~mLfv2VKrXU&MXtmoZJqFZO88-Bxj0vC=y`ZKUEz|7+Uq<~8TqecPpE z9>qTBnfb zpq9keuzEM?vNS)IABJi)X-y6?v7epD?mVFKW3D7!(m=<-0P6-HmaM#=ri*kweN0Z= z9V8K$)XMA%`hk}&W3b!#rkPc+s;eLFqamVJzA#A1o5UfXbO8rU#%)o{M0U!HAF&wI zS*`*YEgWIA5e@w!nQ|=7~LH zzZh+c+)$vsic5Z9XbgLJ^TaoWi{c_~V+MrMWR0 zg}*a=JdBcet$ZmsV=KW23i7p|myj`-Iz1X-siLk2mENh-WBGQUcx)Se$!?Hur;-b^ zQ&kc=5iA%m;^5IT<)ODz-d-}SwK!Gd!HTzrzzttdZcbUstbV8vtJ~i?5mB|?_*Rvv z-(`~8sznK_O_!9=Nw3I1C{#ltqgr02MxX1Sp7qyi81!v?QR`b6bv#wt&CAfQDS@8I zcl;2a#v)mN;B$4*+=k9k76d%XWOcM&r`;#Z$^E#5P?Nv0h;w7@pt+GaBq>W0at^6v zCR-`%UYL7bXp4NqJbFTbhNl8n?d~(*cmy))T|+h0cLC=NGH*%OL3J*CuNeu?b0AkN zaGi?WT<{S)3Fs5D-tu&Ca|T|3=cLj`33d z$7pTooiLexcdaTL!jS-?H_W;U2ALr1MF*zGc4`YrcajCwFzrAtp6@h!nX8R{ri#TI zctGj2b3yhAqr~&)^)eO{-I0!gaVf~KR2we%mn`s53Vz>QZUv1AmON6C+tdqx+kPvI z7(~4ZpkvO4U#D{PZzsTuz_i2^6u^8Idk9(H?ISUnX ze01$X(N#*~fInY-sLbyut^)zSbkpdO^8DZy^&7d7p4Wef7=C!FoNChc+vjQw^SZRd zh2pPYMzj)-Uir<6gGRVC?C#CN2kka)7Ai!$_nY7D*BU*ucbxfi?1TJyN)1FQ zJkvdH>*>uKo489Q%IV6v?gczm?Y08zPiunbeMbEDN1`s|`!#zh?KcsK5Ry8wSvBbz zW$L`q#|MZ(=*!`zdphySj({t?3E}blI)1merxx;QR}D~im?(MgCD=BP<_9PC2=YXd z3>n~cl011Sbn#%0hloy@+F_P2(X?9bbAj46QKNGY(ffr02utyZs#REr8YOEt>cxL` z@#PxZcT>VedsADBs321kG!wZGmP95mC#gs(yB^;souZM0Q=I3<%xgm{YYed|r`2Gp z{mCg|7H+=Ukbq^u4uD&K0}_H4AlM0nZ9pE9V{b2LZ34$VXi4?Sq8U*2!by*-ZMOOE zJPPzQE1=R|vHShp0S`%BLz{XK4(Ihjq0>(zXUptzKC!$_gO{6-SB<>~#l{9HlOye7 z+z;JpQ>Y-OZM{hUvz3-`z&Uo;E?wN2Bv^?tA$L{{?{Puhwg_ktFBA<#@4{=gYEgG%pOB44ReLOT1cC%cE#Ys9q2 z@BfxPR43s-h@}*vJVljjByii$_0^UynXQ+;Wy>Gu_KlTH6+4{T@nj#1F-ak7u z_m$u+YS08VpL}*mX*bwj7FAFeEi1Mpa<>f~``nkyiG2?&`^Bdqd3Z=B-Orn6JHYE3NccGeiGwp@u7qOe9e-1 zUH~6{gTf5A_RWPD73f4?st@s>(v-~ryN2FP6>CupJc-bGzQ6zW5Ag)1)P zyS?}`8*%p~6n25zD23+}7Y}8FTR)cviOuuMg^T$JoCKgwxsXrq1(RA1ZZ71!S`~X` zAY%XB$(=|x$n%Ajkh7}x-uvJM%R5@Nl^PyoM)yy^jo1V$8yr8N7CTdOpo^fpot&kN z+&`{>(M6pT%khENGIWwFC$(?c)<#$)d?wjf9kaLoCsr=jUYLn;pYy0!3$a)9A{lBN z3pr|_;FZAUKHD8=^p&5u0duN^Ho{>=*t|PP1lXb|=JK}n0W1sn=2VSxnKISaiN7SI ze)ld?*2Y7XvA5x_XN9g#9e0C5jB|~Lgvmg?d@3&AbMI}OH!g&L+a{J}1(jNp8xEDJ zv`Xm*=$ADr{T_;}o7-zp%y9MfEzt07^$TV;5{14JC8BON8r1LyRo^miJox2!wWoTu ztuXwMyH37L&;oaY1pH)WQ&KL(Wa5Guo}09wrGe*uNQUeqm)_lg$dF-b7;Y9BxHA*( zVI?w5XpoaA$}99tUl#X&FN2QoVBQd4h$ZG)Q!haGL%on6;ym<=JSvBdUVuuUFVq0} zVC^aoOsn0tp=L|uQQlBrs22{me7#}$viwcS#AB_PZ`Tw@6UD1q%g@WoUel1@T}*Z9 zKW^|*Joi}}{$OjQxaRLhe{w2-c+~QyyJ@xzqS(@;tj$BJgla4Zg?;1Jn7D8X!`+wx zv96?4^)-Ly=V`&aQNL?t6xQ}}6JC{QXDx}XEBJ|hJt~zBSR6Wj=HuQgDt^FuB*v{} ztT>`p#OI=b&XZUhsEru!Vvt_f@e2YfZzrkO(t&S42lqe9z!VB&Q%H}NlQkEnB~blE zWzHQ$N~QQkBy?cw{cM~&Ne4A*B5q@k6Em}Gv-_i!&AX1+c5HNZIEldDltGQco6s#y zC&S@KrJ2NQ_vc#ia%#jqHbzQ%k5XzktUs;FD ztCL7NCZ@Y0y(}$i){h#CkgH)c-Wd_z{k(FtK)KllnMXs5xCFahFfj?KrI|lqet*zc zs%MtuyLlM(+ed8fxerhiY%`uDl@~g(gA{fs?0NR!Di7nxsOPI>pRL2~@LNb@j{)E? zQktH4Fxl@XcUV@LQi&?^@HL20OOs*?Y_2R|?ArZ@0?d_-3#|OAuc^Ro?bwF^bf^#V zX^vNE!ZF3^E-PP@#~2;zU%Pv6B=Ycz_=lxz^BbrS4StfgelBaWsWj1t^`fEc!@kDI zQ(9`IF!7}?A!ha?Mb0jLohZeF`_Boscx1LY=8bUj#TQC$`mdLNb&0Th8Lz62k}d4t zpHHnG9UibxJRP0`A?rmC6%Z==ZQLcyHQ!=Rc#bA zNmD&ZBGG32eo{HTE~muwO2%`epS5+>3j1^RhTG}vbyv<2fq$Anq)i|OUrh~N8y9>t zv7E}||B2hQ1*VpVySoFs?Q6L3T^KTG;kgZP5ykooU0=AodGWPAAuU=e z7an>C+pK_L-g}*)wD||kb&7(?w621r1*^#x!;i1pgu`Y z8&bIb!~pl{$wF)TZhAsQ=dr=hN=NfP*>?n{TQ_xm@|p1LfxXqf|DXwc0w5Y6kDISg z$l|AikoUJYs=(jXSgk;g9vn*sLZ1k#=L$xfyo>{Q9B*-{;RSb{=GtU6n)AEU1XL80 zlm3a5*7Wl)QP6iWACoP9`X^2$o-T@gDE52@#e#Lw_U7DPduuc~`jsg511`&X6XlT9 z&-eO@x~AHYgvvZFCt+~X>~Mmnmdra;zpE&&ojOq(BRm=Nf9ycX!>ylR<{Pf=?#| z*Cr5102=*i=*_30Z|SgPykLAU?L?;7FTjRRu#>A-TR!hCuWMJMKi=QGRj|Tu$b*3T ze68jg?)tP+*SJ!GQuQal=%Gx%y#D=$ixDP^$YlRv%cZ+quIX#e(kGl-20Wx5-MuzC z^LZ+wdUr_Btm<*R+W2Q~u7?s|NT$#17>nx|6#V5{-HhiKZ10lB!o&*xa?@w-`c>3g zm;R12J*4NLI)*zA!<~`K9rXk<_ojJ$93q=@` z8gE9td#Av-D1x@Ry?tW8@FmrkpZ?(=nAmi@|08BE{8J<3#O3w~d0Spl@9t%+;4xs5 z-+MP(WA3q<=T3%wDlw{ioRB5{QwgPc%GkU8_V>^9nm#)(=vUH5qnl)bUwFP>dZENG zVn5riIxDK#T=!JzA15GC-Z?MY;&1!LKe!U6%%IIpHlGvut%4qW)Fgg+d?@FOlh;XH zFO2e3*i)!I=&;BjgL6&1L!1nle;xvG+`PQW+(HuGN}RVq+ApNG{|*xJ03ya~EYpJb z8-l{MEfVd7`yX7zDC|oN`l1BAET?4QKl4TLapoT9$uRwex?#HD`zMb*3X~@@B+fy9 zXSA^orzsyE@NfB|Vsk@W;j>X(1op_~gU1h0*S=kUaG8HMXQ$Y$!tCQ?ojBk|FiiqXJ^`~B?S2Y#(iDi4=yA0=EG$E!}$x1w3^ zAAbEncGvd%G?S+|xHgp(PnWK-*j}G?T~}X43Oqqrf|Dl2?#cki3AC-KHRiehksP_@ z;4$;?1@kqT@SxmupQM0sE8m#!tc9f(-sLCPZLgpF9l!nQ&4YCLQ-2cw`S$7U==D>( zm;U_z_%^PO`ju z7vLa+8x}iax+#{obt0#OsapLo%BVnNIT^~8lIPL zS3O9Cpnjc7gu>M)%n5uI(Zq4B1`09Vsa|lIaG-08_-OwV9no>zlV2i_RY!-2kF?)V z$m1e84x3|=*}p_><@akt=mL(~=2SU}6Rv{Ba>MWV?39K{LPCyCfhq7`ICEZ6f>xe@ zT=wIxh5@!`N1ZwpK^LXP4D>*AO6xt=dEhrD?LHxwj!kfMCoopjaukViny zrznrW>nbsiR2k>nJcDn%nY0gU?mAxLRrETlr@ZL3>S(!yXIy4Z zUy8uKj0KA5=bV*fIWh4Rie-FX4br$weaBg7DKiizDz|ORD`sD==OG*&zT8*3%Re!u z8Fzn&Je?A5SKpMA|54J-hY8iJHu?kDdW4rXb)F`XdQpMbs;1%s_aqw81#g=7WAs8oZoKGU32@#5 z=oa5p#GEf4(O0Ojw*QcHPDJioilk7+Y~{wlx$t|ZE#*FFbTueSnWwB;-94LfU1IZA zZNaH{-I~I=I1IF$bY(V0?1((-8{m4iHCp_b+V3qf((&^1bdLwEF|(wjC#+v4aDIQE zx*#vNGka>cYiBxV^u&(^Tk3C5oYjV1f z(2Ufhz3nf3;=icC11|pP?3$!O!I!Pse=OEvlOG8*Xw;SNrjv zZQcI#sl9SiAk#S%4i||{N=cV|&9iSoTNHCNrX|V;>Y{#sS(ii6i0?b9A+y zZ@*69+0341W7#8ATLDr*pSu~(_z0JpW=5iq*37Gg#_e9~bAm-o;=ap{IZkkM3?ui(G6jm*0n% zJhib_Ds@ho^(0@F)E%I~{WM^fIf@8#FBf*gtG$Ytib))6yPVb(I-95l#U!EB-$$JM zF&2JEq$oZ5y}UVP`G9EWFv%m&UBdcgw!_McWoBgAA-}b}=5DQB<&c9(+H;M>05Mf_ zk-_qxN*{}(TX;}3Y`JhM8J^L~pj|2Ox_GC?bM(FP`8&?gi{67<>#w$_14J@Mc69xp@K z-7atB^X02yfBC?yzZeXw<@Urqp7NI7;X!Ru7^37a2~k4B7B}klUMg$#f}H>lWm`&XwuiGcYMTa~|v5#nk0bTmqqz z4%Zu%1N@>gTQ0)gq>hVbI=$x!t`t9avAZi>@`9rDqQg74w8!r8Q>orzpT9KgFBNa^ zYnXFT%st}Z4EGWZdMmz}n|&Wo&(qBl14b1lXPSj}7K75l&dHr`fuQi%iep(s`7bY< zqwju)esL!Rj^M)Iz|5?(lK6UEa;zGuD#1T^@p{E%*9JJ`&o8P?&sF*k&6$o>DlD7VYfNdAL_# zBHAnAk4^7|XDuCLtND$swA! zQt5L4h~AP%I=46T+-p=akXNq>Tv>NQ$8Au#-O1~ClR9j*z6P&(_A3+E(TZl-ZOXjYP=^hw4W!VgSiN`94|6jysq)AD8l}F zTZHDuHBm#a;*f~zyOXABNup6$=`gc4*V1uGsdE)Q!8C!k2N?;fge=|g zF>`61em~sZJ#=%WdwG+OviPx?$1H*PncO;`Qpkt&$GHklyEk)%e1YZayIK8)Vy>pe zkwdEqR%r=EBEB8a1o@WI0Rp|aRKpo=$<-T>|pg&|pielv#hxZ$xj(&kR*j-8gKsWJ5yFZli zPn4N|cUQ^i(CyH+83X(?%?gjhm1l=a8{f&+!$!q#X`E3mx+yipVV&QHgmQc`kWKcGorc%6as0_88 z_-O-oc^DJ@&|X8Xa>)M7Wa-^JGSJe?V@Hr(fYyac%eM3aK2j|(qs(A}Xdam-XuR=0 zA(IcV3&}SL&c7W-zCj&teLQ~q*LcG(!pB$RH?$sgh!x(xPtfz0eRz;|@rOmucxCRI z_GDJN$iP^cAc3k=-3(2Sp)p^TGMgux!(CN}qaX6_*yTE9=GO8HE>>|bRLdJM%j}o z+MZc@asR{8&W4u#uDrP-ki%UqvFcb^^ikEQeXB}Ovxe@3i9LnNwDQVmRQ450hoY$& zRDrH8HWd$jL+6VSFAwT2v45$%r>P&4Z;&ubjjmCYAJ00PgYv zvUvhKX+r9@zhoRV!?^YvdB5!SfKcPgSVuQo&LN#=;ThWH{N6hu5PXv1?yr`#T9)R_bV zcL)F?~? zLWS=u=aYU%JvB?ucG~v>>%uDn+ux#-aYyHl%QHb}rGSgdb6;%QJ+hM&L((2QV^FWN zur~)>jsSpk`RU`_We-0m!%He&J_8UX72qc*gg!tZThQ=}-~#n11RNjkb4&6^n!pYj zfk&l5A?BY(USQq0Cw0TgV_F0&mnY??5+4_bbWw&6eRXXs_MQ@R?vhJkKD&A3^`?oC=5h_5 ziOmA9p%B51xpVqn4a^i^!A)of{Q8%G6SQGC2~k4kTOhYzoI}mJAxb<^V-RHSE1?q4 zfq?690NT~_3Yd7#D0h*M@Z5u<+_ip|Pf~F`hAAQS@;P}tYdv&EfShusDSM`JL$66(*TOHPdz%0TO8fS}hHNRnBO>Gdu{i<*;P9f$!6 z&g@Aic~nx;7igLxO(>Sf@zV)vw@3M7$91bE9#?mTuVnNzt0~fNMF3b1v+-I63*^kI z330hbKNddgXf|KYLeB^7=W=~}1=U?}eMv)iQ2YCm7^dD8lx`YHwA@qDXAb-@ zgNP(bayQ5evj8r`gw{KY6>qF09g}g$o0+M|Y!9GX_cap#eWRH!= zjj2-UAYb@kccA6q%Aku>v%AbUU0u3!@`)uKS=Kpqm83| zYrqqeqaLS+W>jpZbc;w^gZ@Jqw64dG{eiq4EaPVtLQvr7;bzJH1<~-iZ(Rtz3SYB6 zh{(bzqYJCg1QUZ!iXmSgco;-UMRhk5L z0nMLcr!B3YzQ0x{N$oECHtagDQO4F03})?R!>eyjmFA|izARe}K=Y z_)F{nD1cXzl!OEV#8uLSH{PQ%z08lG{s%?p9Z%)^hw-z|!I_Rdk3B+UmvN50_g-|$tJT9LP);Hj8t}6Wu&51grem9{Qi6XdH#Ct`}KM5>%Ok*jmq+6&vr)< zOZ7h41!tA=ASh5YS^EgURQsVpcZt(38$rqLW*2Px}kBZu)OBIZ{?PQe~wk|#JlCmfk z9KNUJ?;fJ(!y}o>p+k5u>#puKsA$bha6wvt2(4(7u7qP-5Hb??zTcatHG!>%tdQl5 zCMZ4{1@_pwzwZSY)8Aiarg>w#z0mF-IDjCND-@nx@4*o#o^A?*MSORei~2LlNZ{sD z2sU2U`cf7ey$j-kz28iou94Kgu3$RprZMk1Bk1KN_T^q=#&lD_g;y;l*=!vBs)_kI zY6Az76+1tKZ#EX$)zQ_;|NY`cKIyD^Av3bct25$qE{43$Y`D3b$+zK|g)}T8j&m#) zqAftIJ$WqSMtBC`lOzhzJ{!A`>wN*2Y?Y153MjZvPSy*yU)qxpN*20p$H|L3wZ%!^ z7ASNk*pxe591eZ1GiMbceOhp#{(-2Bx(@0InYZt@h3oi)0 z{&{*j`sndKfj$wG%d7sz<4V>Jhw}>)?YA%4>(xuTsZ5KX#LnuS$rN7Mf_BsvPsGlN zNwz3IF1z>X)8$#C+OZbBr$K;-#!Iig&0Yz;4jYm(Eq9D?lFvJz5q#rMa`qn>ni&iz zXp#SCcE`*!=)}x-aLoNytwedMv|H+Ie^$Q1l!k9%VzDxFIH+9Qy?m1@(sO7o~e|ePp(N*nM6RqiOd`_(BZP_4kxplCpB5g+eqc?*7+j`J#+7Qq+2Ws#)@e zW~AL^pYqs`95{>C);53rmUNYGKwAE_$|dxD7jOEgHLh2bijYTmn)QPqDblQV4*u#%NPEX#`JTHZq?We ztbW}p$#-28js^EQI*dF^UzjhOXFMNyknP=B|JmxkLFd_kMco;g?Cb(#-V(n4gp0UFCOQyVm)52>|m(v=?1n z=SHCP*dANAuE{vZ4dZ_9Sl2h-;@$^E8>*2$O~kn;Z!1Xa&u%MF^*e3$ku|%B@}l`H z-;jrui2J(lmhNOTH1y8tYNx>vm^Bbqii4m9zyM)fE>u~8Apjns!NMUYpi70};vYtZ zte;h*aPwtU2GcP4X`UC6ufrVnS4=YlBjGbIp+}U{ya-qq-AF@IR15k`c1t& z)m?!BJhx1#EXgE++Qen%OHJAHHm(xm7K9jwirSR2Xuj|+wrUtJHYfECAI!2jqE$F9r3{}9myzgGQ4TjC965px3QjywK5;D1I-Xq|%aa zw)7_sucFj~1<)zdy*LW~QI{?DTh#$y2*(>y{v=Mm!uQF1y}zeTIE%fxNl~@JJSol1 zDH|z|+r+Eg7R!jd_KvAU6E(5nFiJ>!+grD2l~+;Tfd+z{8?oGMJymhZ$B&6Xrby9R zwY2HS4*99a39Glk;eL(@b}$EG0+NMF1J&7btoX^!4A%sEL<4Lc{6=b)t#VA1-fomo zy7Xr*lV3MFWyl;m=2rE)5^Zf&J?jTxd_@HBz^L9auA4XPj+XQ*Hx#_9v~`Q@O^TV9 z8niI(Y>wo=rgc|xg5z-QC47{<|i9hw83z&TK&{>-+ zw=|@KyZ)tI)UlZq|8SjAQ^B+F)aP<9zen%-+S-iV{{Yi4Vkd$x-%;5g*ZVsfnyfOB zydQWlZqhvW-Y8veT;RWhcDFT~osw%9sh6$fzj954rjtg~t|ssr{2V2@=Uz#ac}hxy zRmXf>`x{&;@>l!Af6WSSs_Xicqax|xmi8HT(YPBQc#>nM*H)qA`{81xzb>*bTTx`;8NuY<&|U5yzvtQ| z+*I6e={dCbcfLER`bfys=tOI?nuZ4oWaX)oP~_F6qjl~Mbv>NLZ?6b0mwMn`(Q9j5 zqc5~EJ;|dFmA@UXq5U*pe7{=qR!t|;@TS{CHT)BZ00J2Fm^pr>psQPb_ZmIN-47sA z`Z-m`a5}+!LPMMwhiY*U6wZW%6DSr2ge2xl8j~YJoAW^y=pwla6?mk@OI%Bm-VtEB z(XGwXvYW!ZC4d$n4za+9Vf6XzG`p@Dp@n<0F+6H+^xlsH(#czCVhZJPZ2NaX4UO)e zp(X##Bv)LJM92kP;|2k2MCh`0c0a}4;MyA_izbsQdCRX-A_p6T3~O$^`CwC*1=UJu z*rm$E)-c&FjInhE=j54qU~Lf;KBx8^nMAU%$AW=rmjyCqi-f5e>yb#yO1PDm%eMdI z0cM0byMuHWUfkKB%_VG<9g^iC*-$hgOm$CFb!cX`KBrWUb8w7*31a(DSMOj}7^I35 zuubaS^xn*mS2H~{3)dpO(eb{yWLUmY+Yqln$dN{lh^t2%8d~L)=k|RT`ldP=^TImk zEHJ~+M>dk9u5nxS(EP?SXu(u^Q@}3i!g;R6jp&0dgRcq1L{T$Cl`Kmw7D-Bi; z60cmlE5~hgsNLm#nknblOYmj;P+1@d(E1G2#|*dT{MHdhm4lv}WPl)S4Q2v-P^f0EhXI~4IlQM{idi8@W`GJ2?n z5Fk0wak}xCm*!w1QQYdSmBIYRUBM(~X6>0uAO=8!c%uAC3S_Vx%jUxYSJOPK&|Rn{ z>_ReU&@EVN?Xc92+#OP*=S%KY;F{zG>YhH3CmHKm1B4T30JH)j8ACV-LeT~oygA7j z$Xii$0Lh;MNC1QbAR(#NF9Bgq_jTr!-C7?4?#2}4yAa@~P#_#JNCBl_;4M%Pf?VnP z_4OwKxLyNE#y#aMN&r&Xjfc>dw9UTHmSNXGP$Cf$)rG}~HF#sx4JQ?kJWv4yJ#pF} z1JQ@FEUD@PS2Rn(Hh;ti)E9vW83Kr>XiZ(O2aq9m=Iv2A1h0rNp!+T9T4}!SuL(4Y z>$y@kxlMP0crppjm*MrCRcDxe8i4SXg7Lfz8tL^gw?HZusIeYLV5%yaOq^o^ z!m(Imju*&`y3!urhxp-3%AX$erCQ>7l18$4$V4!(n}l&_1@lmeU_6!t(IF&ry91sB zi`q!CyW3ame_eDTP!lDP@u|T{f}TV%#~G2g0IV07TjeY1dj=Lq)<*Vck~xB7ftT@{ zpc`l!OkqvqYHkf2(GTpmjim&27ZCcBJ2Dh$z#AV_Kt%D5*kD;Kp1{q+zD0Q)V&Q0> z5|0=rBr__vCJ%pE162=8Ar+?pf>a`C6+6U0tpua!TQm%pZ`G%GahRtXbCc{zH=0U- z72!Qlj@tkR0|1C5{7k=*CAIS3D^Mh6Wc8+qvcGE93#Q@wD_1`Pn2;d5gawa5U>5B} z_*zi(Unk_udm=oT7Jmcpy#pO5aWUrv#b2W_0Wjoc{7Z_GJ{hWVs^`C7_yfOnKyYch z;jf$JlqjnK;#g~`4_X5nah8rAey1s?$%o&1D|6lBPZ^jVRttP)S{pEU_iNJCm%y~CzuzEJCV&I~sbC}EfRoQKR4h8P6uIAL`ozNrvhLNwwPF2>2V(96F`ofkKUxgc?Ja*27t*+ zTs&HPmWyMC0Qkbn_kWIPmBsJt0Qe>V7Y?B0^T4xc3<}H+NdRmtKyn=bj;C>Lk_jj5 z@L^uK%c`>MTIn$tgGA9W;@Lv;z1eSIJRBsR*P+PAC1AW`Cr*j2h-8M>_!y zXeZn6&w5OdJLPOJ0Ahzssv%YRT*g!u|4Ut}sU<;ziI7-UL=;V#3`kofu!|2QlAu_? zLg_c#Q{GB;}}DB0911%c)h|cC=p+@pykcP$41cv7?`0!vLBa zf=Ux_HrmS@j+0Bv^DGz!A!9xUFk=Q|t6B$blO+?tlJ*+WeTN;!!b3{rdL-hIcAT2hTAnVsNJPz!|m5|K(oV`eZkm~3*r0>T4AcTD}V1jtQoLS6WvHbwdL zHnPcuB3?3$;fSQcJjCTfM!Pt=EmF?zmw0^vv~R`C5aR7rpux{&-9)bPBv-IFA(Nqo zv`M=Gr71^wHsTVQZM-%7oxz*=5v~OP4j4*l7Z`q5r73&6jB_>UJ5`&4L~vk7=meThTO-NLKF%Zsbbq$WzOfm`R*vk z7>B&FV|3eP%JU?xpot;h1iJ!AS5O>Qb|@y9oIx`yz`b68DFR&hYN*rOiUC08wg3tF z7Ha13t4&~ybybTj@|)`VzE%JM0le20lQ)8#VeZ#B>;Hq2XQ0G?^gS*l)>*M@{fqzy z69{b&lWTeEy^ain15Q9fGl$0>Mjd#CD$7Q$bN#PHE|M=@aN7V z#msr;fGKeB#SW_hw9|A^D$DR0%Mg)D;_xLQ#7J}&iH7wB6c(&%CduH&>v<}1w&e0o z%LxyBz#9@(4`2wSd&4LPsk`cTDY=O6v(6DWty!$NO$>o7tMm$ z%++veRolFz1JDInV8As2+uGW^(|hn-ALjiBY+t4SH;fCdlb4@@zv0h!8) z=08`sSO`pM6vmH@h(y8oT8mdW;E!l01eJ^~J%iE;K9wo6HX;|hRYu$sW=9m)!muid z5B!6PTfCpLlU+#!E?V?m(r}q~+852&pNmt8U>CxF?`XVs0gLOz;E$K5#d$t>kk_PF zcPXqY5B$<00$S@2gd&~bM-Rx++n4E{d<^gJ6*E4BWmQ_siJnsLd|!C+jfPu>SYKBP z+G(3z4MzR$bs%kU^ZaZ%ng-U7^p<_9CvGzf{&0r9MLaF@z}Z#03d zm$ywveEfY#@uEqT#*kjurVS$Z>xxLzYwvE6wRZelW6GW0I~x5du63o+fuG*XEU2FP z@y0Kaw2FBD*ci2w(Xzhc)$Z_>n)K}eE&~9q1$d=-0CrR~&QO!Y%+2(NgvgL#=$pE^ zMDb42O0M>ud|#3O?<+c%#zpqPJg`WjfZ1<}$(@wPzIFzK+=AtXYk;KqRG{_}uM+d{ zRvM74PQ)JyVCSjrl1OZ!-x8}ydhf)=Pa-&xf`Lk(@~zh;Za}M?Vz$$=334kmOFg1n z9M^BRVfCNQU2>32L5MAx>-4x8`?D&BZ52v;@F@DT!_P)VrNnPEd)Waea-QX!5jM~a zCdYuG6^-g{iKF5HaxTQ%B#t^yzw5T%Bm?f&cl^j3e&{2oF53l2tZkJ#2M%WcFlUM9 z=hjKydPU^M6*tL1-1k=4CkW(Pp_2n`RC3HyQf1h+uvh{pn8<+^cGoz!+`Bs5ewC!v zwoh`<hTn~7H61*RTwSa70ww3xop22IQI zU5Nz|Wc1pmE?sH;5J#f$5fBD|nss8pE6%%_{)z=fw|Q$8S@kh}pMe{zrEwl3T!|;2 zd???`*$wKnh-)lL#Amm(!C60VRDb9|>9|-`GKb3@9DYGT+&Jp<(|c;fZdDj6>0rO` zpI1IlicR`36pb1`Q_xT&AwAAFq(v zYaAgt&Krsl{dO2FWI!{>04#i<>yiUG0zzrIC}~HgS6S#pnp%VvuEzrV&$if-{IU&u zh5j!bk;NoO1$dXaieuSwt1xmd!#eio5Rfo!7k~nc_{+tal~+d-?9yo$Fnu?X`4rDF9GJSR zj`=lPj^n(S4MF`GvI89%fHo0MCOk@pxM4?<=|k7t(dQ&JnqazcUU{uT6_;BeUIUHemaF(Au@(g(2zWIFa_fK zcd^X%mjP`g71(2tba7?uen&1sg*EW%-y`J8MBLECEAw_6n`_?|WFoqyeInPezt>+r z>Ey`FfMlNTMgy|)ma^=9rr3+3b|1Mv@mb><0*pn=^?9>kKF&CUiMt&iN3S1FA_k7N z)cDgFwA?!c(M7!FbwX{rOiYOt%)X|b9MCJ=Q(?QKF-sny^jn4B87iv~(Imvzcfki1 zC-oLJOFDgs2K>2z?oCjn#P46lJs~M{6iS30HiNAZpH|1 zqw??TEv(Lrz0C}~Kvb|C{W8AcQ98Fc_aX*L{rc`7v^kp``~ROn1{QaF?cm^O;=XDk z;^n){zQiLoNc%UJs1?V@)WbUF`jNEtcb`^uVt+Ue9+Km9ugOHmma z&$6+pI7%vAW0?JYDP$K$Bs0loxhDcZ45DWU=>b5>DU2m6g}h2mM#H6c?EwS2FgCeA z+Pm48htk2PRo+C*reU@y2_0o2OM{}h5TRK7T0&Wnr^XsB8@3{VCB%P103dJ#4=*f~ zmS;0E(RfXG$L=oqjz<(1HdK(&>8k`;*Xy^FaB)0-kwIP8N}HFnL!2PHBv zz%1owQ&o=(ADU5!pD$w9V}3I(|93fP_Zj@pPfTwG`S!Oz|9)<#-~A7u=Fm_JzU1FX zE^=?D3PE`NsT8PG&aPlCmR>n^A92;lSG5$>O#z>$4hW>YnDHfZG+#$#tFh6JCCPlU z-9()RU!;3Ni7??Vfx=}0f}<;q3=H1W3=_b63t;n6KxolUCHMFSIT5>a6j;ek5SnQE zI%k!mTtbY!aOP`RAyi==2vXBKerk`M^W-uB!_J=vJiqkrnwNR}yiSu*H&*osmdGR8 zT_qDN>icjStwRGOpk8oMAxQGmwM1S!{6IHKX%_^4uO%yI`I*@XH=J1HNjbOb0HsWK zX#oUN*arM6fo$#0kJN!BEQo~@s)(3qb4p~2 z5x0RXID~!IJSVMQl<;_ZbfAqhL?y8j1dUIxl<^peCdf%~x33>D?%Z5Dt=9de@5dmu z66AkhJ$9D{u22d&Lc`g<|5u3O5%9h*-Dfz$6iXZmpXB{L7&fntT?w6!ldVH9b2IfN zYSIZ+6inC5;|B)mE6sI7$$Sn8Jh&Daf$nwhOOGj`tzMOA**K&m#`o?7;nDX|QkBd% zi?7K>vljiLJZ})R)#OX3#3Ok*->^zp+GO8ZxSpp$Mh1~?Y?_&BC)GI$izlUGzv|!T z38&fd1B`3KXTi{4M96B?3kD^35PpStLph3hSF47CX_5qFTdl5MVT&(D4V!gd1G`vfb&i&?@rSFz}< z9xjEPdo)>N_FW?ohiDY94!fQ z(PJKt%n{i=!T6MXvDQ){D}H^|5DhVOOGoM<@pC({7@n~iP-UW)BAJlwRPu6WzX*d) zg!(_NwtCS{!N;z76D?mtr^dL^MQenV9tP}DioEHFnLK%#Y%fdBlG0tnnqNv}XAuWo zn##;4`c@uS|3n%6TJwh7d;LJqkmdK$C#kF1A7N`C$dCC6FtJq#lb}Kf@xLDY4OopH zzh}m?gr&ZosZt$Et$;Ut7vg8I@9y=v$V4%7`6avo_`;cc_vF4d>t80gdn;=PG3gQq zZGiq0R8$3VhnuDHP0PqqC~fW_SODWO2#_FR$|CJ+Yzi=2V|hm3(Xjyw==sVLLBKm{ zXAxV8wqbHPlM56sTbVnH80;%A-X?%`-Y+KCaEMd|p3751NR?C<;S=lXSAqJjJYTwI z+*#y2u{blg4q$n?K`epBqI7#mgxO^ctJ12CF#x>%01yzj5*RgW8yqcLsq|+BQ@q6Q zvFFbC#I5x(!uo~msul+Hemu0jDoY#m?|iJOoLAK@e(Ckg2lC~IzOJg-zg~ zp{B#ioN|joM9kk@%vGWMy|+E6Z>mgfsV!D@iSHPr_XHST*D`B$#rV2E{mJ0uur$Fc zGG&ImG?m6~aAtkJM&KLvF^y)}nETzIk^w-c!g?pkZyEs_0* ztR4bbatN^BDmha5yB@XlTwQx5MY||!a+bG2kg3=^a6x1QU-Y{h9z(?ydHo>znp35Pixo`JT?wKacMP z)PLMTZkV%EHFi1_ioCv+n+6>vw|p{!D76w#_yi|}ceRGpvbcuPF5eW?*TjMugJDKby*^=Kp7i16p3jK@)ycJRyO!g=Kt9H?FN%FVk7WD# zivH_a7dvw~nE~E<@^5hahpN0@EDsC4@OL~|=B(-IwOMESyO&oB6fw|>-x2T2L^ZX< zkOS&Nlp3%1E!5{UU@w5ZUdaU?GM1Wsx-q5Cr7dn3-n+SX*Q4(Pu=&QnuO9q27bnYq zbw2s`Eu`Y+yC3DhpZ)&#gTf!Xj;S~rQ9j)Z3rhBg&D=H-D^$nPn5Uu7MrA|V0=I!N zK~P?x%&jSZcAcucq85>!`Okn&lE5TJO`B8BlSKlO9huMnPfJ;lIEl%g^ynA(P`}5_ znn)sO@s*3a=8TQ>CAprMZ(-d5pU=~UTz2TacaN#!B02!n1p>H_z!pjfDyRWp^d!9y zc~U)gKoHj2ygOR_9dd>vkbRUYB{&VRnEpO~qK5$*XSuq^)8GH7_=Aa%(b;#3*NT-r z_-+omYvF35rOg%pPfGBK&ftFkN1<>FXjKrY01Y=chst9Rd*%$hAmBjO$xJQP?wZT% zR-`!=sjZKi&Z4?aAy;>WH(IHmWLIafs2|(tR~9I^3>ZAXbOC_6D2wv+fO`sHPf-~2 zlyHN3blDFoM>h4!1X92fWxsQ9AsbU-u_`Es|NICwyUQ#$&1C!;KhcVRz6%ryVO5o5 zi3mn6n`3^PqJj+~vh1qs-aZ>_zITd_bXBlXo^ey3WU8Esgq68!9F}2SZ zs_oED?P#Zq7|aN2g?6QVcNxt&iM>D)hE!%?>FrZeyuuZ|7~$4d9*_7=hli=&NVszrd+Vx(1JYvD{Ng+&~hpcVp^V3y7^d0tNpxc z?ldD!JZTmY7LaQs@yD`i3qukRn`wx z75R2PL{21Q=D>6IkEAejkE|$R@KUz8!tr*8jns(^+;s&{=rP~w5958yENT@mM;}+$ z&87=EoMTq?l+H!V%G0nA9IB6I=YN4M_Dtgn<5U{63Td%` z=ZMZ<3F+6T-(<6$eWI6PfR0ChIHp(4u+LxKb&-q*nQNI?P6#ZRo1k9luzyqC{)xVq zDK>uBM7~X!8f<*t8}8c^vp!BCoyRQ^gvNYy7_FvS2kXy_0s&D4owj8&;Y8bWLaclv2dNiX zg_`80%B=W*L@=rEIdO-$;=7QkhbKB6Mjowh`>eY1@uNu7)GyMyrh=~g@t((xD1j~k z<4HGlch6L#tf7xgq=rdXRW!XX1#c>>#Mvl*t@@2V1g^?M*8flU&8 zonKDyTG+vqk=CfY=QYf${q|g6Zmqy=C9@xaK8s3bab30#vqY}2S@tLf3AGAl{1Uv2 zcwRImFxN%;$rb`cU*(^&c~%>^w|g!1deDagkH7%iluX#Tu8?D=z$JTr_R27G+0>37 z!aB+l{DUg=#t7@ePBmpAJ{zn2P)FOG&Oc`ceY+c!7Uk(AfZ=li5D8l#9IZ;kqUG35 zDU#p9aNJr<`7M00_S+gP0uY;PwectMabP0yOm!TgC85I%kbQ5;ox<1>o3fa{uuuN0|5W5BV??&Bw~xTT!dS z=e3SVj2TK`vBy&yC)5I*9tr)%%p1sWR#G9&;K#G z8X{yVZg?zs^EYbx{2!Ycvb9+JK1$o)9tdRvEZa-r$gV7kMtIH)iTLmfzl)#Gm_;uZ zP9`x{%{pVF1=SYI?KV*VIq=#~#XmegQ5yEpw2nZAxqOwEB^8qTyE)G-NI#j^dDmWe zP6sA3oKbO5*(NVydWId~Dra)nR~=*m$w4m=EiA!}kO4lKDEahksQv+c%Ypy!SSw3~ zq~|o$W(loO4a9gNpB&F%C zN%Qibre&wWmt4)Hmrd_3Hh*3MFOl*#1|Vich`$Q-L?IrIXRyXCG`6iEAQ;#6hKkfHTpE}1sO|W>JUTC9B@12_C zcG#cwDHA94x8KjcE|$`3cs}t-gmY8GQ<{)F2zx?%#WgTgJb>>T;CC5BsSS$t4YKx~ zJ@An)bp!u$>k#;?Xy5gSN|T`i6RPSdz5f|UVt{Y@ng5P1@MD32J|XvHmfV(na-1KR2KlKGaSs-x{kgR2dJ|c4AR@noG)=W%|Ks zWdAk1+q&+lOR?!WmzTv*2O?Oik0$2M-ao*kv^Ma80_`7o{rLp+{e*j=bWqG4qTtT{ zCZ?q}0V){Fu0wqF-@xQh@7XJ_o>3t>v_~IE$Qbeq9rs5cJbtPXI&admtV}03lA@HY z9W`flFAZEsooK7dc2Fsqb_teavj5s)+B@d@uTLmy;&&+UCO*>j@KVKWAgfJ9jM;N2?}55)H=jRJ7P=z{wx zEkwY3>q>$kfmbrPqAg-s_n^i@q2{@AZwYV0vnQza199hN7Cc9ZP{?Kp2g8I2^Yhv8 z_zs9EhtbzClFghhkaD_07`2D=ydp zPd;-jL9@srnag|!VX{#s~^sD^EufU#&>tF921h9tdbWZbJJ|Ob%^9CM$4y~!Nj9R_=s^(gF2X(r;Wmk06@65pLw z-GN$3+!9?K4Xw0SF|zO|lkQ+o!%Bkck~hP?s9pi%_JG<^TV3CM1Lv6?Rcj%WdzR-y zS)H;a$CI(rW+D%4*X*0mL(4n2ST|!roUj_z=G1}bR|1nK}7&(o0=#Qjb?(`_@4}Wl=x>gq(sPybQ z?u%_Y@41$Gu8!Wz2V`ix*f?3-wTES7f|Uz*8*d1&xUFHCuPyiR`QhshR9-f z_9NJ!azflb&<}6GMgquY(Y$i;-hg;%hvfqps@#oH9?Be2dv-hlPp?A#mAJ_t+_h zL|#Vo?R$i^*nLwpS5a0xLOnJ&9wxE5;K)TZ_!WHZZ&hx~18?XSdbF zE@~57@nZ1c?$g~@NSQ{2RONL&yy?daQQ$v!&i#$K{z>t#y zla0#0;HxyqImys+`$HRtAeHbFCVPMdFvSP%QocCWJ&t;S_efN1R=MdPu4_u~+g@Ay z$xF~%PWkw?`MtAGhm|qzK=CzM?C|QLeyUT8X=1f`cFYIf%=IS6f0G2xeDmPhgt^|) zunsV))#h`q@`SnYU(;zVa0?FVW|W1!~(#ydjPBfN0LI3d#G{-4JxzS8x;kF_%oB#ma-F=;|Zu7 zLomYNXmDW5EP+GHo;|;Mz{OEkNKBv-48DQuww<~ec9Q^RSH||tUz5bS2tD92=t_%4 z-DV75J+&FBtTkcEbY-gf^#I19#)cJ0DCN`YUm$)BM4gK>OcRmdq#3)N%PpJ{c4#>q zFU4I`%CTI4C=t1=tzOD=Q{e?xO59RVvRT6Pj1+$t5G7kDA4?RGjFwkhPm+SNbC6_M z@nk#CZMR#DK7xuphCdI5$rUU{idCGnM)!7tueK5Y`E4bCGwb3Hv7Z#Q{aytoTL%{* z#l$D+sivX+@bZJRkkBQ^tS2taf$4n~7vVD+L4uWWUnhj0aM+ZQ&2oS|r8$yU6H2L8 zCShoijW5DR!?QdgU{Mu{rUC&b7bW1$y`KW-G7@vL%DXz#;bnPEYl7WWffIRZTtI4_EQx%NyOgP6Bi7$KitG7pYd)JlT>wjOuHw-h3M@ z6!Wb`=oqP?j)owpXK$|_a8YoriQ4{wQ&+k%v~Ru7e*A8D_zQ> z7Y^%OGm67D#w>LYG}`(4>U!P2^~vA`W1ht9G=BALJ3n^x&rXl$ypr16QqFjzSzI-1 zQgF;PEG{27r(WapZ=3m3&a9C7w-(I zxMPmI2^qZ=in*J9QF+14z>fXap4H757K2;)HnHa_^qb~$x(1(Tu>Z<8*%aU&*`ih!&`nZfDat}3eo^@_g}NaTHnYrG9^a-h!my<&@ap8oP}M^5XvC*`3Z_$KT} zIdAKT8?u%fMER(w_UBH?4zxH;`sn>Lw2nzW*sInC$&)^{i3E(l|6A?Sj}3GztsJx{ zC~?%3=4KW`U-+tfU^VvhfT8)^c3yL*6>CmIn^4iBrC3^cNN6S(n@=}JPKw&fAp`-gg*E+rQ%(t!t zn#=fcu~b;1fc9~T-?(dQ^{Jj+xtg1N2mdII}QdQhK^Yu|^iL#vQ(`r;J@FOLo|y!F{p$5&cfD3+9U7 zMsD*>id8GRUuq`|-4eAJP@c?>GI*<)OTAsA&%C>9cmBcr<+WysgDPP+3RCZ_>6?~c zeoKaG-kgT!zM?lqu4-iK-(a8o&5|E3nW&dpA(}^#j_CdTGI;3y{Za0wnC=%zAMu>O zwkN9PwTtl!#a9r9krxXJYG_yqYEsX$wIqj40!EdZv_DOIEaO=_XWdUf)Kz%(rFCoM zkdk=8?N-Ge)JN>&)q`%wcH>ts>=b_*JKK*<)GzH+^%LW&7%rE$WO+B8JimUJbs^SsAN36}#I7zFntKJY!OSApk;Qe|*KxCXz_mmr?|3 zG+Q}$RO4}NluvCGvW>*Y4+27C0eT;B{dKP3F+4htA7^0KFym6uB~@)F(Kiysz^;P6 zfV=+_cXf|q^*H$=?zZ@tR2(}?SG81gC-Yel;)9lV@Nel4);9F{K?(Ik-)p{7w;rd= zTlt)$kcvH(x#N|j<)vS!r<7b?AD{ z8e=t*)M%&tP~1PMJEiEe5?oGC%)?KXl*&#~BFRTjidc;z5+fzC$kkMsHvw9ALiK+N^o<(&e;m~ zBPN{r`5O>1&7n3%Kxe+}yDe7&e7*JbqgdurQvdzdA7b*AMy4d{&!6cCRuhqw=^>5h z&@8x)rhcwJKeKB4b4l}t_;r!nbUeFsZnBQJp0KLsLp`j8WsdGIpK5&^uE0QN+TdxY zk9e2e&IJQxy}_5a3GeZmD|z{qFe8>IJTC#EIt8SVV|}w=?w@1ZXrXB}(TBgyun?J@ zLA_I94e7-ov9Us@d->^`e9`iJONp*0_=4$ty~l5Y4)4n=!aP$OZ)%I0vBnpC{Am*z zrEgXj`Vd~U!&1N;!ZtOcsgjUSHxRXHgq!)Xo7Op+={`2)fSJGTaC+i+>#<>Ye3zNe zAts&%d_E3TB^K_$AZ@$Xld*_5%B4ZpB?k6oCSdd4?eKZd8?GNqULO=z)tEjR_jqqp zR-0m&lxoPYSKt~DXH4Yx(dO`D2GRO?Fj4@9Kwjp}=li*hMAET!k;? zo`w6Tz7qL<5t|(=Jt@UU?+sD&lfie@6w%{*#yHP3PN7OcB@!Y4kpU9tJQTs&@w4J@=R6w*I0?9+y+kPrxP8 z?~A)JHi758F?I&MlEj{z=8sk$P(qVP&O^HatcuFRs)A5$J<2g9pPO02Z_6d#+9UE} zV>Scs>7R$XzlxfA&(U>sT?b!aPPq)0|6H|vEIoM9gN(aPW^8JG{=khjKk$R8ljv=c zI@SUhTQ~K={m#1U)^|7tas;|HXMy?>%Lj=vD8vR4DpoKM#$!6i^+=FR%(ov zR(O0T^D*(Gy@l14e66+zqUYK*(s9b*Y!;@>uKe6aJMa7X9S;i9b_a4iDEZ2Aq+oCC zr|>raw07*aN`_Us%^@`(5`O7})ljm{e{T|NLW6rn&4i~DF_b5E$1#GRoj3KFhYLY& z*q|}x1pd~lGlR>Fl6ii8(MYw^*?nJBdgRkc7p|(JlEM(y8^nm4;oY`;rriR?591{K zdrFp7ZU*#kvYjpKYBZwTmokOk`qVzIpP))cUz&od5)eN>nJ_R2 z2yrC`|L&N47#7(bnafUmH-0nwEnfLXpIk_fHCPE&^i1-1^iPS<82e`@?9r!H|EXUs z`xZbGEL2&1nmq0tGP{ib^{_H{owZ_wmhm<+Xg{>DzW?^;@?){k;TOy<>(;pOE=#XL zkYO#;axZBG#^Zi4Rh*tvnYIdHQ`4x;1{8KtG;H`vnqD4vY9p3--utw zxDxP@FE2ob-W9-=Nn1 zC1Dxi;b# z6{3O6)RGe#<`OZRvo*q%c3sgSHW{0*p@+dutHd-!$-ZQ9ILhihyj{$!*AVI4-<9>M zq@XQdPr{&1Xm6t078eNZs<2IOk{W^NV4cVEbPWA;fa7C3PST3@(wsID94>4uVGGD4 zi=C*rEu#BLL*mXImh2ZN!U5HyL;X>Nw*@Rtb>eF(*is+GIp3;UD_8eRfU(a_YsLwl zVv+Q}1WZ1IYEO*xsspZ&VMKexwh-z673t6DktzUU(KM*K`ykEcue>HgB4{sdGpfKV zpBe;Z6W_UaUs?T&*5qz(om7a#GDnv*EWIak^lgUAc?N?CwJ@^O9A)zRj@N#J zafigaYED?aSFhuJ@0$8N!Yn!~Y)jF^_1NN`UdZN;3{8@k^mGO%zw(Y~f$?V9StK$e zLjA7GP_q>lfUd3CBpR$){p^ z?!R+sFV(B^>n@~XKlC^omkw4mn%&E@{pnpk11-(pHnn0bJygKSMa8m@Umq8XoNi3m z&{ZGzi?b|jpFs^mKzdYP*dO4u{-JLlYtLgAUxr^b0D-MQ_{CX=PE1MsxGwv+U zg}qyiGaPhX#{Um}K!U%New`WKNx`?@U1P!9J+#@EvPVhSC&K4>Q-vl^7+iY(Ee~h? z$$=mOu@J;zXM^ov2>$EezlD(5Ih_PP%x*Ju<` z9{#+ydCy%v-1A+XJ0qd^t>FyP-aGDZBKA)z{uH3ZeVH30MJiJ%s&JnwdM%N}Z7iX+ ztXBWebgXlFZprs`?RJ;LH-HjB<+e$b`l>CuM-b9#RSmi`CVl3}Rk;pkPA1J#KWW*R zWzbbF=S>bks~pids^n`JMpgr%IXR_N%$CyEsVPlWhMtzh%1%kqS+PZ{HW9IuICbu4oX(d4rW_I*Ti1w$rD^$dizc97sXoo5WW(Hn zZ6s8R%3Bsjf&Z}U9|C1-1ZhQP>?LdxehRw5{Y`CzPoXN^G?t>5#W$ClrM=9yvksDh zxhFgro3Cp+=WiKO_OPkygySMJj_d zhhHCr1*9GoSN3&JRO5n(j~C!=OItuEU7;)Y27)s+XS=FMxqQhFtB!7>=mq~fu;p40 zZ-xLlDe}30y!&mtx%45^ zf=v5lS#i92bO}H4Zp)R)KUSThE>>Jg+7EO3opM{O`$vkoNWpX(NTN>h_(9G;9sCf? zOUShyzw93!Up0cn49bS^$>;_UXgcJ`lP66qggbUDkT(Fq0EiIzLGBQfGizO;I;)1bVnT~yX^y4oq^8TU8%nxOdlpp2Hcab zw(f9qjy(j>ORp=P_Q4Il|FVlPKm3ToXg$eNs<6J?HYAF?2>%msHU`$?uz;xYi>RRi zO1;3fGsT4}<)p5t%A!d?;# zr3F%)sH69qaud74QmQj1x@L>-A&uhP>(Dpnq>HF3^O8<0NG*+Nr;nsMP|gA@lDLH6bcMEB=IP%cHWy(@518Q<7_`vL0ff9yh7ui5U22@*YqGsgGVCG)*mi`LpMC41 zZvycmg$(jW1Ku3S95WUd835QJl?cVv*Z1PQbU{TSPZg$rNLJj}gel&a@eosP9O%X+ zOL22gL+o61LP;Nr^ut3uT{(O_C^wXKgJ%E~_7!QJ10%U~cF!bB*R zK+x(LE!-@8TK@v=4;X)p@b7=0dYb*ZlRg0w5P${Tp8*GmKnJEzf(c|`|NK`$2`vzV z59Ck;Hz>gZQgB=iyx<2bnEyZfF@$^ATM{3@R=(;b=^S2o;R~HKfgVJG1T?w;3GAQ* zJFvipFy!9(K4qa;;D7@hz(EJ}<|TsU;2;P=LkikK6{4I;f^m9U>YkF6!2mFfC<%`N z@1(%y9g$d2Ip9USn7%ZEBxvd5;#1Q2G%mX2J8mIS8~^l`0Uf4;7L1(+!+0$Ix$2Nr zS!ApT7(6o$<|%Rl8C^~?M~7@?THj;A_j>d_4X|KI8~EP!A`rguUBC_`(7**EaDi`> zvTZcdfF0~`2pS#24kuU=koZ8O4eUY$u8aT+T=~Kgq{t^W2}B2$$V4W_f*@g%uJAC1;DN7)ULDREqS zhE<=4!9-!V5^HvrVmR5&Nq6<>NQz435V|H5qbQO}g#3Xkv%1l(7k!ISDwmzmEh?_A zN{>p!)s>|X_WzN3J(j>AOEJS)FgIs~9BJVixu(fgtuYZv<;L2Ry_)s2ma@%@$cEAY zYyhSa_#rp~AO<@uX{bK+!;K~ofLpSVY)TNpjeZ#c5}X6MxKyQ1cdIrS6t@T75W@sW zpoFkRARTaV-;o-(x1Qamz~7umR2Egp0+tG87P2p|ptjDCX0&$$ZXkid0=w=MG-wZYa7Z92mZmte zp#h_qJ>`U9W{Ksp{X66~7u4XD@Z-cOBB_m3IzFG`(i@@-z))#qQ|SIsls7PP1Ww>X zTb`qBwf`KSkx%f$9w`BrPJ(FwMBoh@A-P82a7PBD>IJ=VX$MrTDh|@nn;mpjDnvsQ zU=QdV>`ZK;Zvkjoh1VCOc(Xhh#ZI5|ysC`UiA9M9%R{PkXoia9Bo!Ixd&0x$w;;tR z7ValVs?;iw^qG%!_RF5Z+80lkB+xKxepc5&sVI>{Rs@G_X`9RYvj`ve+jpFpM=xa0@|2Oki` zSn$m2Mm;T0EjNn7cAgZZ#HG~4`igs&vPVId?vfi9q#H+Wp^0Qlz!OP4P}Z8hOhHh8 zmvji7Pd*foi9Ahw43s1B;+$0v9rb7#Ia)H$_=%82N_#Hx)lS~~pyYmEI6-_mPye2$ z$-~?}3V;2s3osF!=>8vI1Hnm2a3gP&@&YdX;R$^D(lvNl2~p_58eVFL4(!Nm-k!h) zpe*HC&RYb*6+;d%pak!oARfDcVnL>e93Mafd!Ut=@DBt5D5ilYi-HbFQLsz-t8Qw* z{HTpa@`rrV8Qo(%1Pr6-;4}>}j}^IyaUz)xyp0lsEBY9x%P6b`0jL0ij()-z-6Ore zXdX7f4^D$8f3lAYY@i3z4iRjq3xTK=gAh%Dz_YM0nOMLGWR}4w5o6=1peYr3comWY zmne9pA@VT~Af_cDhNznW7qXFGngCuR67ors8wmg}G^JVUksYY24>*Ah(EorQh@!xm zpB+d6rMa)ryNX9)C}&|6Pni?VD@1>&!YG`L{qP9lqY{{~2|oj=K4C(`kemaFkeB(1 zm3ftlNe@(+kW4JZS6RKmXg!P~ibiBKqBsyqoDKJ&i&yap$B?VRV-HSwL^rCE3Gqa_ zNRd#Cl~KeMhUe>;Er^n2D&M2aemw z5zD!ffFuh+I-)5F8yq@w0wiM`$db53g3&~&=!dP@z5iH%1xSY?>4EZLp&|+|wt*YA z(Z)CA5wY6G&Cm1GaA>8GnKv8zxO%(2J(u$@=Corj3W%DN}vNuB2y z9&@_1LLwdvb4%0trm(CVMN!807)8m@OWI+avpl1c;7hi^%bysX0PY%#3M5TAu(#sL_!JR z%sA+5PL{FG=}jK!bMRhm*LD z2|~$1`V&%9Afyw$FH)pE>&nXO2|`+kenI~6aO^}5fs1t56EN8hziW)!LZAi zsM$fi5ZOc>iyVVQo&~(9h_VP5B)~vLP68Q^AxuRBIjG5@C-GQRJ>8d-C`LpLsHoT@ z7%WKfpi_@aMcpaFpeZLjaVW7wts=ag>)_Ok5yZY^kA|o{iW3*Cbf@(B2gE7~-_V=h zFw-$nQ~#TvSU?9su$RIxlOGJNfQcB=dK0mFFwJtkf|9MyVgSw3ldLQtydt2!vLJ6Y zt?`I0$v~0sj2LsZ49N&Iyy~o!xFgL0Nk!3}6XUEFn~%5hDs-)#!{MuIbv@VGENT6y z=t!f{YNz?o*OhSBew`e@BB;F@jKkCui7lOw?Ek~Oz%Lc?u(|}PIx#aXAy(f&10e7> zDH5Fa3IyU~kw(R}zk<=!stltDu$*C6KIvJH3`P;miSNu=$#D=Hy9$k%r#+k5VbeMG zXcZV;F)P8jIJ^>1KGDQJlmVtgNs%EQQL}h zC&>T_5!+b>i!oF|i;}YwqkGoUOP@u}xY!Mp4Gw`wgW|wDgy4-pkO%o9il?|mi<^t0+sK~F z4~wIW5RE*#d^npEsX@t)M?^V`v^mrD+om<$Q3>A<{i4d7(U2Hln+uEbq~DCgIFS=u zuw6Y0*5DeAxif-3BbAQ8;MAbQxYsgapJPZ5uBYg2CrJ}gdW~S7!wHbUi8FB{y!^cv z8(cv%1T%9`H24j@`5WSpANpCBu#mI=;iBLx77HQTyXDxru;JM2(6;K^ z42>8R7~|Nl&5)Bgo)|;p6gnizGQwJZK3tjI8=wc)sR zJ?|Y@kECMOsx!MHe$*f<;2f!4@fITYd*^Wb+33Ex_^avK0w2e67OILwL_HYga2xWE2o4VTpbeN`tP>$r-0a|G% zG4+e9I7C(1#6|H%x-1N2H2=gvxd}}iG{{*1f2iBC7?z1XqkevzR*YtfU};0#mwpCJ zM=Aa95|7j_gpNv$lHl_>Zk5#j={)>T;3EI0KGZf!#!m%F^+bOg>0HcwoMoaYsqLN z!um2km$c*9soAqE-y&>6CA6vrMYTg4YaCZV>{Ig|bz z`yxq_{nQ6JFrVG9Ibsu6UNP&PKoMp_)sB_Sh90lf>S^^`uk;00|#kLxizQZ#?hQY)XH$u!Hj0C3AxH&%n)~t8rzA*`sy5xpiCb1)2U&?*TzX6 zg|G>c%c2=;6v1w?ly1qnP4AA_J~8jORIx<;9LbqXx%3!;CmnvN4!AP2&6w9=pu zhjALO&gj&$llyQXx1Wsv>G6+qiq4V;GZO(~{f&89;)Na@j8G5+`#TQxiQtXX+jua7 zH8rU)6rPJx7F@isFpC7#i$n6vkDIue(aZQaXTbz1&?)c6+L z5#bk$ylFoF!P=amQ@4n8P1)9C_ahL4`~+SZ1=CrNoaU}x(FH4zu$6Ka%RN|BdoTzC zLP+~C7=%~o4N`6wU2t53;Bzc!^ZC7AKdAl>uMw=8i<+_KbC*5pb=6A%C>A@N# zYu}1fvjELnVF(PbS6+6ck%NF~#4?r-83e+TbUU#m)JZMPGynq$6*ZA@KrJRwMa&s= zp-FY^7STr>emGHx8uInmbs~Ltkx3kKBv6YEW*DJHAtCT$Tp|sIKtCGlhT(AoU8s=% zbh^Q4;$a_=m*aX8BE{rLHk~w6L&1s2(EvqOm{gH95=j`9Fc}HtXGLKcB$XOUr&EfA zp_$f+q#4Hd+Ftq7&Qu0ANyN=9}$0KGIlgr~3y7gQDh5BD7^ z%{bD`63iE0fF)K~K8V>-doV8b?v|m#>T8%a3RFOky1Lw|bY#kvR$gC9ce6nC9F~{9 zdd8fibj9I$US2X28QiBQJ6ue|>uMU@8-RmZ?c+ zT^G$9iM@5y7oOK7*Atbzbg1VN)ah9PAI+JkElUlfQFy9s+1?rI)gfBIo_+FnBGQdO z27?g7gQ101Jc}+;K%vzRJ}^*#ry7lZR_PA0%i-w-AQWrrHAidQ-&zVT5USxqxwMP~ zzk6Y>sE6x%yI$A6YpTE7WIFB+-9CFk&JQW>w~Mj9e4n3=45rB~QzSb7ub*DjHH8VS z#PahRQTTkc=K1+NbHXD4ZbIuHOwsLNR!P$A`nH((mhOj(0Ur6=N`zM>o)yG4ws{6G z2(bc+70P0OsD&1w@CqlL4pVH>(yoBiq4k}oTDhAEVc^!mdkv3$nyC{01ed|VfpB1S zX%~Z*r@J7rkV?htS?>0i!@iscc^+h;*EU!~QH^jX;yGc4Or|ysa_C6F17Qr-Y!o*u0tSU7T;UcOLd6u828lMhqeimT zkkP3IJOXoL?tWJqKhm%{x`|DM47tbh08u2l5#W<>s6irn>y6+4k|Ki~nU)!f$BP`{ z)6wSGJsa^!ksKV4ZuAmKK5kHuQp}AMtLVn|Es-D~oa8DA5=eq9z!_nv#R?3SMntWE z2ZM0NVho}w<7qLGs-e;^8K$u0r6rKu3YVTZ6So=m8Jr zA@W*@mJc z@zkuw*uGf$>5DnZ>AEUXQ!7HrR{Z!It{C7Cj?(m+RpjaaC7;L7P5A|sJ1xLJIYh<| zk`andg{o1nc`trUD2Ctq;zq^_L|n!1UAtoy5YZ~tlPqLH^<$1*ZIzs*y6dg#6Rd=u zDp*hH6sNe{pmDB>zJH9t z$2>fMf)j*bw6fJf17r)15%?o;Jk;AhEs9sTkV-lx0h`rigv6BuS4|5+2)ojf5v_5= zHhNPol)h7>h#ahh@Y>Ql|7Vm5?XD&YqbtB5M&2|%H)NtT*USvZT@0<&uCyrlp>W_cMY+F4kiIqTt1ZgsLtv$v>>i9p)v;Gf>;E z6D{Kq=gBm~0+wxQOvz5SXL$K&Yk5y?q;FzbtVdd|_mq{7u4Y%0xYw`eRx!V-iHNsNai~L_&Wxq+TISADQd&xTTAc4%@1`(rCNl9l*P{8rRKG*?^=Yd=H{(h<|#tvt>&#M zLah)=8Sh%P?~JYQ=A|hR<|z=ZYZ)1oty%~|<_JQq2oUB75Uol==1LiJgp@jzF^q)8 z-mR4HF*-tolo0RlYwsD18Sn2IoSg685Z6BRYZ-Hl&N__F z5PL!)dk`VTwVb`BV~p=QjPDS8YdQ!JAu(eRF+v$@V;M0i8DmNaLOLM`5CBR#A$w~O zV`~s&S}9{%A!}L)dt(sy|K@vRI&)(PV{0jdYbk45F@$R|QaTwzIskK8F@$3&gkv## zb1{2!DG2`n4+t2zV4#401_dfKn9yKBh6n``WJqyhMTrF^Ruu4%qQ;I44@B&UaG=DK zAstdIX>#Ajk1tIsh$%qhK$bP{*)-X5BTtYK8(vg7)S^eBH)|qI3e%@imM3Q(t?3eC z$bCDN8cmtA=z*$JziON?fk8U649w<3k&dldw{PE`O_%SiTDs}Z)=kTxF5bIo>+Thd z_U{C}eeXTQ$q=Mhr6?yx)~aA3Pnk9QX*&@yQ;R$)oa=$!HfNun+&QvX-nWU8x#Wtc++6jQwj4qxzC1fv_RbYJXxmO@!1m=?u2ojv7Ctq#x zrNg2(h+vikI_#i>9xe3w-hq7$Xx~0wDg~vNb&6(LYv{!p<*CUzBqePvVd!H)?^OS( zm0~J7rx=9bH7OLVRW7v80=kN(SgDsCM`u+=E+~+x?{FGkhqA({W^xF@`Yf%%5p?Ua z*J0(OgU5>2nu?}!gru}|%IT|`REdVwxos|>olB=(D57-g_No=E&JDzAv=ZsbRu~NU z#}*1T79#mG#(?eI~ZjbO-;n5Zyg< zSYt%U`L_2$UQ;Jf;z9FFc+_@^HeucPtp&smdg$P2I+JSdj--=@fdZtMi@?L8D4z~O zq#vN5vK}Hxknve0GZ2OjJm^zc=bB@#1ITHWwb*BLPuJsg{=}$M@(jhv7}aU}Cgwo@ zNDrMsrdf!TWkV~3Jk>Q`$<=7dC%0qysA=SnaP?ZR5zx}t3$$?0Lsna8(4()eZ|e_~ zz4}U-8mk0Qy^Bahe^Aq(Nm3P~q3K8>^NSG#-8Yr)xNm|1OAA{xM=>41Omk_G0Hw+S z0!QJ_bs|Gqd>BxUkD;I}hY`UJBqaxtoorDOppVFYH@e?3Kn|M|Svvm|fE#+9kAgM< z+-LA{rUeSbAN}ax+me?&<6RFbSu0;?4k!R73LtrvdEytNXF)Pr1|Q7xn;5<5M1#OD zBG|#n-wcAqCq^+P06dXFlD9<&u5XJ2p&}l~SQ0?W?QIFUhYFshKhDC9MpR0e+y zyqf>;6&ZY84}93e%H%}zqGIV}JH<*GbTaY}y0u9{&hb{_dKCXp$=D-n{_`Hu-sv|y zUZ*4rTBkx3pwEVA=AHjM0C*%5Hyv3~GYl14NLa(Fd}?$fu9}JhW`rAwbZRmhBHGdF z8JYR)aAN1+p$<4kva?9w6eu{y2W%;VbAX_R=@20f${_*}px{6V>L3n2aKe!}YA-0z zK{0WlgS4FPJ#1->0&a1EP_cA1Hlowwq&LznMaf%ll2foOvj8{2vnFNDWHzIe(x?n$J|bA`NePn22~&tn^Vr6eRw-+Ri~=H?5Iz63<(B85YQ}Vc1Cc@M0~Hg2 zK16qpqSn$;41lHWG*_P%{3jhEpj0~aP(!8yPf={)g$}Y?Rr@qT3`hvC7{t(s!m%}@ zCef=_fb%W1_RBPp(@0zopx$Mn7du9z8dly}qkAR^Oa7W~Bki^(wsPcKHgYe3RZ`j# zT{EuG6U%EQ+#U9QO999!C`I*ZlZ>?1q#r_`M)Hea5UE!w8Lg1rJZwGM-ZNdIx$kHS z;;q(#txTg~<_=fqLk38KW4+8A2w;{uJs|U$zdIf3b|5nMP<2rs6B!ROcgq$K2%0Fk z>N5>w3M7bO4nz2^m*-I6bk4P3p&f8^lm?-l`H25PZ%#93MAT++zRhMKva^cAQ|3nM z3w*+Hb7AM^scR}J!e)|WgeJ@-l|Dz$0tq8&T)eMml{QG$DfDYg1X#0{S+KVCaXQ?Q z7yE?F%I9#)2VfSmkiqO6`hbhbaNv$|tndTnNHtmzg#r{F>MUsRvM!o1Y+b+ryhD%* zWVC}FZuQe=eC7_CsiV9~Ba%7SR^DWag~=I9+bF4_U~ax`y?!e0+`EY?jECunt zm_iI_81^#$@PcI!8@!D$cO%(GN0nAYGa~=OT8Eqh*K=-Vqc*zUd5Y3<20Dn^jHJ0^ ziluDhoD(A}L5-|R$|0Z29Oo7BP(0n_bB&aAW+i`C&bMvyi#TRzP$JFF$LEu*7c1ol z$V**-mmjwL<&=0qP{-hdAO!j8Ky^9l+A|e*g$D*NYYFzSjSvST`27V<;Kz7t0(GJ2 zCQg$<{K#iwMRxLRM}OYYjnaDHZzF9yySl8n(p>Xr6A{6ahop@>OBt1S8fl$sBuB5q znR;QHvG9sE$!Dg-gk)=*YV#k_X5MXlgGljg%HHlxQ<6}hl0FOfliHQP>%Qy>Q~7Z? zfOc&c`mlv8dHM1!{@{1NN5TkzAN>E8&?>plQmr5SYRQ^_WqYB6T}bls5&BW3qt~#X zNbH1?gbIS=zhNj%m$v{_LQ*aQ5+ucc>k>Jj@^xAQBpEU@PBMS}hbKw{P$^P$wZai9 zq9XQJA+?cy^_LS6_#q_HB1=Lc8F+a)f^uW^6}mzm0;oLvfPl&~e=BH#ztR}&^bYTU z0T?g=J;;L?@D4yYghm*IKv;x5ID|q-gg_{SPZ)$h*n~RkQ0(T8Kf;bq7jtpsY;UDdxS>$=HX4s38)Rb;-SisSQ(5uIB>nUn8P+yZ z*Erm>a*szihg39FH;Tm5F7k(wMMIGmm=IENk;h?jsj-jG;b_8`X|z>({zw(Vml_vv z0T%F*)|dk?2}F)?3Mv0^4A3A4+$V-cunfm01~>Rydk7Rt*(MP1<30!h zMd(x!-qJ)iwh-{sCXfL?QuI!sF>WA|JZv;3SoAhose97{O6B4}Aaa%sG)BFb9e)!! z^(U3?^OUwBR}nOaAo3cu=aiRmBM0!5ZNeZ?**sQ~M#V9f4-}PjgB)WcUrc#!gDE$0 zVwZ4&l}KqP7GMD*Fapsi0Wp~aK!lTfkOHWg0;q5dJMad6*LRTsc)H+ap!7gult!bs zJe1W%d?QFbBWZjT5=%5lfuuc>C=$to9ze5~@n|ORQ%ODN(doolf+3%=Mloko?&GnxQR$l2{h=zJSg%R zxCu%3$#f90K1D}L4ECLjWJyYql>l^@s`#D>aSt%*nK4<7G-&~HaFZ!;ny0y;8+r;l z;0MP*4Z5%lf7b*sFb7Bwa`Z`m6NVLDbRCt^O_ZTds9`)<0Y!F(Az$@06cSOs;Vp{g z8953ba=1V`8e`s4U!+A}yN4C`^L6tmU+SbyhDbnwV-h-%q}@VaMmZvOd88{vG=`X@ zf%#F_K~8LQf)N28Jo=>)_F?MRKGBvH?X(axfgxskB0Y+UHSrHd$|H(3rw&w~q^C4M zdH|idg&zM9lc0Hx5+Dbsum>HQnx}aRr?3MW-~k?x1AQ=Fw*Ujh77xgVXCty;O5~N@ zp%d~3Sy|I_Bc&p2R2{&#auUHf5N2axr6TqKS&DZOxwsjuDw2>19aqX6v8Sa4_B4N1 z9krqn_W)tm5v(5(Cwrr;ns+V@F@Y$-h-hP|78FhUE zhr9om6OtxZkZ4vZ2pO!pNb3a|v$ZCDt%V72!vj?A+730g0^9@I)W7y3sfn7G3Zk3ZsGXSu7}8c;asUtuUSk$= z9IF6fv`9XqO<7k??ACg9dS}^&t(i8JduFwKmVu&zc%9~p+5~i*H(`iIxsKM9t0*cU z`z>JdHjewW-oYk^sJMa#x;HC(7FlhM>!Xw@XND^f;vlwTo3Jq{ngZ*gZ2O^7APgR$ z0iDUOrAV^mdJEGaZ{C)tsbV$r6 zZn*~?4HCZe$aUO1a=n+n=EgwH`*YPMy#^G&+*WRpHWYx>uk(-t^DqJxdX3Q-uxh)u zY@4Yd(5T;F0n}gt++=4+fgxZ)ZquuN1rkx9aNXcZ1IpAGpK8+josQLiIh!K-1a_#?ynBEx!Q9789%ilc1oV{!{d zM^6)U7$J!&F%SDYyB_eF766UcXaORiww21EdmsgR0KA;qsPY05O>ui!r$jyfmmMhf zX1Hg${Inv6tA+=fK4|$Ypw%6m$Tl^*c#7MSEZi@LyCdc`8iSmcmo^ZEY`JXng4FS> zdQ5VCrNVu6$C);5hrA`cXSnZ1isn(6l}U68Setf|JOuFBQGPk8gtSS{@05Tf`0e6PUd3FU?qTFClb7Z zNc|8ipL-e$a1TTIBeB90y1@@~f=S8@bth3R<;syZXw3W9i$o*L+G8QvTzJ9U&B;6` z_G>N4%n{mb8~sqs-h3u=OU7v<%uV#n``lmlcg_9$iYbA9qBRx3;>>pc@-LM}r>1NH zkeUP6D8Q?{yL({3Va%y15{ZLEgO}LPz|w;7tj+Ypf8_id6(~?s6S~}D$cf{!qY~4V z7>B4)l~bFW;^d4IJk!5t9hlZGzq)dJED=O~i1ymku9(!-TzN#PF4HqsnfWb34Nx># zlEl%y$=VvfDiCg{X<02A)8U7ZtkjC8)QPA>nh4c)7Q6`ysS+RpX}iU(ECL!3%VHdf zGD2uwO~{XSx@DF)Vr3O~*lfTjnLI-jS<#1fhLGYUk-*FlAZrzd9X$fw5a=;cnkj$}8?E06F*HxQVmi`|a33fVIMSCDlY6akqt%c2yZ zebNvSk~ZO)RIJfr8>zWVz?6!q8t}Fn0NiOjf>|-hjFgfFaodqGf_tMG-3d3dx|K={ zi@a$*Jp)c*`8*0Cmbn3-fWv_tDLHT%P!zJ9Uz0afL^leS-fvky6cU_n$~I=IdS7(J zQHe?YeIgSiKDfQ0rLCD1fmUziZ%pZy6#kbD&R|?*5Y8jNc61a2{zZVpUhr*Fpjn~O zXaTrTjRIV$tBk1z3keqB0pcJI{g4CVpfoAo#%aTkfEjfPq2K-;mN_>fJ3*vc<6k-A~`JP z%KDtAaiv(KpDM*Pr~v{eaKKeO0uqn|qJ9CTSqHj115vdXLuOkw7ss{WwPk5=A2 zD*b&lZGZ|4=K=((=$jX|_sP8qt~a;I9_23lT3567LAQ%gP^}sc$<1 z-!KCGz`(D_SiC-%(~DNR+APhQhjK4j3vpN>LCFP`P3ZFwt!pMponVKYrxj8VGA6hu z8)<&KY)N88r?0YUCavC%+?kfAH%nn}*0q}dIQ4+SC%zB%^$s6z2PhKfeE2RG#_xRd zUKogR_L`#nYDaw?Q~Y|tHYg!r)={)`_Fu1(NwZ74Few2e-~kt44H19-5n!nwnyKF4 z4KGQyIlI_wywnx#ZKwtNyFvfB2(@!I+W;ZpfIxx*2o79eaNt0N2OSnnxUiu_ffOYs zbjVO+Lyj03K8#pU;(>i4CkohSk>f*(Ayo?SXmVgmnI;#cW56ICuMs>Lsgm}_n%#D3HA~ZOUmxXx}ER4ASfcU~<3mPIsu=e=zo;{~_fbd}9f&~xX790S5 zASTSe9ZTn>xN_t~ns^zGc3lyr!IiXY+V*SvHtpEDKYrwmTX#W|!5<1Yj+}UMysB&G zX1<(w^X0$|Qe^-H$O#~4;o{`Z{cO4$Ax?z2k#hnF?KhB4#mPVd5FA3A=De|eJI?v~ z=jt2^E+8gA>$`L;2v3By*aO17u5g-Qy40pqPA}yS$U&SOawu#B4|rKjg2gWIW``3_ zj7&1fyvfW07cKY7C+u15!qXTH{f);xsbS zx*w}kNP*OT3kf+LAxe_RBSoVB$;;1zRA|Bj$g*Yx2BxtFDxq|$Preg)Nyn!o!T@4~ zbmqIKg%d1DCqAwAJOL`~aH5le7Iu+9&K6J@6uz7WaM}d~5l$3KsM)Ey;e_~p5&;OYPSD_- zn1f0RC~kNz_TjpM31C%tLDxN4(j;_wi!@53%?U-~EEP&iAP1~XnI00Q zca6kZJOoXT*wq|s;jJMId&vP*7{r6LkT*^g64Dm7kfbmGJ^9gq&B}5q5$qxiTZ|qr z@B@OJ$l(O&yHq-oFrSqnZ!IXJSQT?}0y4e{e8OV@4}kE+q~r%bJ79pXX7|0_T?&RX z@s>nLr$YsJ0|>j&fLktLwG9cd553z?|Nb|?0a{>$t2$&&WavWD48)1gfnwxzI3vCg zc-_`vLDC$uD_<8~qQ9Rqfd9Oj3rl{QiJN8vt_RR@yGsm+`SL!OGReaS|u260wY z&w5q=i8w2(z7cD~bZC&LDk-iGM50@DLoT|4Ra{K8>O}t0R|i^Y9}Ea+b|f%65M=aC z!5e{H%tx_yvPF+02!p5)n?|^#Y-O{X!0gg7f;c7x2NRe8o&Xgnn-PcsyLgly`G^zJ zg6aku*h!u~AgVVJC><1eYLnbb)qNbs11FG7ib}*k|FH;w8kmRE=7Cn$o%NN1J1beS zTF!@Xl~uIy2UV*IRkMcoyLbJrLBh)rcA0fJ3K&zgl-ZjDq|P;|} z2(*->5CNOyR3X%oNO2S2C$Y^oWSwt??E9AjCuafB+M+cQ^?`LFPdh*e!N<~Z0&9T( zI0Pa9%I&%npft861SPh{8M8v-M_Pl7ASiKz#F9Oh0YNAajVM(t%AFg0F&$>?j`PZb zf>hP_Nw!MN1$Ob66h&YcCxFBbyb(4JXuuo&5XS}ZK}zBTPBr~42z;q?V1kg9B4+k4 zjhvg^WiSq#eNajakbV~Lbkt2!&G&rl2lEJcsZDYoZ+=zq3F+W7j z!8ID&pm%sr0j$h+V#pdT;{abADZ7>Ba36dB1xjToPJPEuzmWIf;s^165F3 zC$!ea%Sj7xfT^-XOna9yUWhhcbjbjy*5$9HfrTQB`FGS`-%}v3XSj=@T zq^`Cp_1j5uwA7$o054Zsr3H;QwHX> zp0=<)p5O;rJjEB%bO7B4)^8&E?{;@GxF|X5Cqv$MX4i9EtEK0uFE;XaH({`2IW?C2~O6hVnSmO;I`0FbCVwm}iH zR|}A?*uDOniY-Ec_L7JVxjNw!5tZs4uIYmT5+E#d66zzry`jM5Fuw|U3HLje^fSTv zJHh=Lu<8<~^YaoKNv{hT4j9708T&Y%Vtfr)o87b7g3bIGA0j6ofdujqJ=xynBvw82G;KPs7$ zdT}M!$P$2AB4%Q{ng}$oniiRm2srCROQf$%?2(}&qO*}dq|&CaBCsbR2nCC@lS`Vb zDv}E_4u&}vo#HRs=*43}oM3F7o0_Iznhg-pfM1*q+L(t7$&A5J4CB+Jud#qXv;f1J z!H?n~*N`Q%aBkvN;VQX&{sD}Up}Dv`xsR6j&Y8kb;_n$k(Lk9v*YK)B88 zpE6fQ< zdAW#;*p`koA&nfxj~u2T8mEe&i4eNHZg~gHK%@#(0Id_g&DftS+awR@Kmx*+ELk;* zw5cp%#ZuxvW@@F4Ovor{p%COgCql)?c}WiXjC>hNCK{@7QI~`N#I82unC6utse{7$;Tt7WCjhGaHk$9RMumGcwfZ_9ot+}l(<1#A&NKjHF z$5fWhxl5AB7Q2GWXbDT?U`@JQ67^w;!OV-k@xIk*OW&*(#ay9e!M9!-r51FvW{RJ- zg2#sdof@K!8JeYhaWe-x&c}%`e{)3_>P1{aqMTyJ;&dDEWWQcgCX2Ke0f5d_`ioQI zE@V=<$1AGhm_wu@CB(B%6Jn8pm@cT%j0|jy69EE90D+$WFwKfP2-9>ROvBL#eLU(yn5YswrZS}#B#uv1#8v7m_6i~h zYZB@b2^wXN9MwfK0~5?J2oD$m3&;Un(2Sf!1{UeEulWq$LyZwV$1C-z$&&~j9XJPDENX{H3uI|E4Cef>|Dlbm|uJxKT=JYQ01TIkQ)FxR} z8X~1fH7i&p2=9{BV8v2+P{uK}09?4b06o3|x&eHMm0c|?ix?|ktTunRR=v1Yy>J!@ zB@R9-){hu7D`g^WJukxQ5r%jxUlqu1O^t3Xuehv;@?*;^r9^lfR8`q8xI3gDjlaG@ zCc7cUGHE=?TaN$Ymj8+tI+L%zYDa#hFKW6L2D=hd6AAaZ(Z^8$m;8&lIT+t77|S#X zk0p*9pfa)AlRiuda5r{^cNK`8r0rNPo zrP@DJRL~=rzZ_eT@H4W_xTsve2_+6SJAfsfiMc(E2ujGXtvq~*h-BPMg z_KFCR3!O0$IfB3@k5ihG_>6joaIe(67Or zukl0Pl;hqp;|0#FGAcWfozx7O9himxD6sCm)8%D5?B&@ioe{r#JNOMXv%$^ZAYGMk z*yS*+t{pj$oesVl;I=aex~s_Ti=wRrj8F;*$Bjsp04nMOj8Y@Gt)&SSHcA&ZQRh_& zjHo>2Ef~8cOmM8>90oal1Y&iWpqjE_6aFU7YhIh6mkUIUZhH(C;fy+LzLu~)(2KmJ z%nKk^NF%zJ(EDN=Ce8-iVx$>k=N;VkvRJf@X5>0p>a^`YY!I6Y3!ee^+9R1JP9Vz~;*eg23Ed&gEx z&RMLEkKETH3aWi}(6mVsa9xOrM#7VrHePOMfeEuQ4H2x_8sr0(T{s+b0p`!eu5@Hb z;2_0OR$_F-h=wl8=L1KB4zOkh$9jI~hEX&HR%oe|iT2XUh}?^{9$V6(EWFnzfP0sUSlE@r) z%aE0wq%M0_4R{f!R5U%aXxIE?grH%mHkf2W%VxG}kke|l-plz)Ce-{3u^uMIVd^jb zX}-+IPA(-LB@L4m68x&myBX`ckvka5mdU}3+Dsdu6iCtVx6$6O&sY_9K}y$HY>0F? z(*B#fc}Qn^9L3S%3+hk&%+#x%!|x96`}s>doJ&jI85j;ZP;M2EJ+|0EX;U&&FX{7?rR9*OwI>A zQ6t3-7IkQi2R-o&>^n%;kfO@Wc6(D2YPVxvg;AK08HY;0YV90YAcl!aCmOoL59(7vC{lRW|aUP z9OsP>Wk|d#@CuiurcFD0cB1^mX?%Xq?i5H*J&AsJtB)Pk%4S#hLpAq1l`6+BD&LW_ z+DfuoQV!Bl2R-wK#N9M+zA2SbFrP#*N5ZX=5bTt4Gnc-z@^ZFupfhhiveG+OdaDT< zRkqqQ!w8Ya*pAz>fUujNyVR@r19Pl=SIg`3I(L=Y-R6D6J8m5G9vMguUmr|ABMoN|2KOApnBXf*SBs#5*d ziKud1kE>AaF1>2h7#&yeqSt1hGleMjQz241m(Zk=WrovrM~u``t@c~T&Vk?z5WyPg z_8*?~fJ?1aDtTQ#W%g0McF<_FX3DC{Yu8&Eh;n;fZujL_KPz&dcH5Zu;PS3YMfha) zcIr~AWFN0_4PU`DM0m#Mdd6qr{@pV9jDDax-)Q6Q?N_{>(VQLmAP4bL^Jk0L;WBAb z7ADb>r7zV!r1*OHdy8P+&}^93QY>k5-Y^P0WLXY$_fh~?t)y}(30kFH-i-%2iwA0r zV9uleB_fLb*qCPtU83O6lh`K#rvcWXh?Uq;7YJ&K(S!x#gP_{LO*7PW7!n>`&-QI- zG1Z5-hjSDAd-&1SP=L07JigD$H(PrGGfg|)mr;5%-#y#VMcNvkG*J!PzsKE_)@l)S z{Hax8p0bFAu*R!#)))VpQV<8KCy0BHafjf0Mmvti)7r-q+aooh#S2@vE10(9Tf0I1 z1!&#b$6Z#dc(9hzaS|}Z=P%Y@4OmL?W2_~fp1C4KUW*_(fKJeSu~6Q|=Z>QrjibB= zD)k__{J${W?VdL=9=wfn2sJ~0e#QCKXkqjQjdQ$Erw6C3ooOgBG@j5p2@skF0SFEM z-aO>Uabbag0|^BzOnBhl0fiD7DqL_tfx?9o-!=S4ks-&4_%dd+_)(((gd{&I49Sw> zzK9h2Wz>kVp~jdpR|?pNlBULY6A$2PSP>=5m^XPUPj9H-w|?x3bZSboTi-tA>NP3Jm?zgt zOdHrCMGL$}T#(>F1Edo-270iNV}ZrCROK2jT$19@(~wsxZj6%c>bYF826kK#Hf_6u zcitV_@NL_xf~mS@ow_DpoHCU&gxvgTO|wX!H(!pt`bp^7aRR>n^7-}XaJTdSq#hnS zc=FTBCue?sI{Nm=VW)>r@j?y@lr4DJapD9B{9Rzd0{obVUVYAeC*4y%;WS)=3Lh@piO7WN>5?MW9MiGUq=0DblOWngwLAt=C92lRtoc{4(oAVd}-C*F7r z**GGOJidosYxSWhWOFVGU}J_vPV^&B-htF%MmK4AmU8)7Z~>Pd-0&X=9(XWdUdavl zp?Hq@h?7vy%~(@+DuQ_BlF{iEpMp-#iPVq3{p22$>7{8On@HlN6Hs9-lqgoBC8QWo zFZtz|N{Ob6>pt%+Fe|ON zE>P<`_u$H_t-SJj>#epDtE;cGf`+TIzrI6LK^AOT83_N~Am)}f5(X7TIc7SVjPQXP zmSX&Hn^2|eVcHnC;YN86rm`gjuZ-tD=^D6)QIxKtTEPUXxa*oG@T<}xWYTviR>c=+ zH-gq^Ue^>^2@l_a@DrQW)8%=t_Z^v+24 zY_rZk&yMr#GUtN=(6{HD5ACrB-7^sKL}1Mg7ijS14Sn!O;I84)mGOctIr{l~Iri-7q2>@|8@m~SW}m3VRo`*U4^XNNb_)a%i&?M4*Q~1Ok{m;EfUN%0XMP5pE(V7J^~0e;`^) zsS@_1Hxcjv`df$-6Nr^k0R=BY5}^Moh`{t%5QHew2m{a9xdSZ_L@KdjLi_;~BSL0I z{JEY~1cQA9|?_@Rs-q|vT4A`a6 zcozm7@E{CfK*8&1D70L{YyvItp*4DlJTZCTNc{+8LOKaChJcbu87WF4S)$51?T>w^ z^j}13VoBa$QULq_WgpSQK2WZ*a-#&GYuZ`PMZvS2@${dSW^~Hx$fPK50_Q&!;z!9D zi9rl0%HlfIHNM=DMUL^~j1ZR*P!9=8Hr#YRyJ}G(PY!$vGIMQFN}h z9VQito9;r&OM9XK47hNG6G-9jWO=k%(hLPML%|LtfJ>jzkO6wo!3}f(f?FO`x(9T8_CeB$QGu2VG0rqeK>okXSXRRchj_f-V9~6yzfe>EJ;N zXcmSE5Hn{VFfPqnAORjQpapu6Lm1qV4(WctsI*Ln9wcxM6pZ(mJ2NgXKEQx5NFWSa zJziI>;enRE$+yAn3MA1IFMM5OxBP|Cs(#B5%r?Xy81XNKAcZf71X#A@BxOco`ySp< z1a->6h$=06)7KWRRIgRZK#^mS|0v?bCw+ZT^qLeBIZ~K0y!oDs;d2k2ozuM#;h`!Yr0q4;EM6oDVA z1DPtt#3{!|`q-n6{Ya_w|BYlP#tN?QmXg;U6$m0YM+<)UG!IQ)>%aPP9^B`s-5CM55umd!QSpwwU zfgI@F0y#WYsy}1Ey;0C+_41D1I?!sGKfnVK_<0&(z(5PoQ6}_E>PFj(N~gWT6K5Yq z=un>!38;|8`;g(t)kH$6p>ks@nX2Ck!LZO=wUKC5buX!n3WX@}{tR^4PoNTG+4kQl<4)IKPOoy1tRNb9|ybO48j$d91J9!^LMdJG%n z#Z;l-1W(NjyM=)cxWhRp!I{aO4j9*(U0=?K9Rqxw%!mL8pa2Sr0G+i!ccla0C09PQ zfDaNMd-)kJ|M1-h+`|f0(UfEm)zt^C?H|>()M=O=U{Q!``2~W2Adg(kN%%_?(VB)# z;0XGkl3>UH9^gq}4o^(spwLF5*biK2UXM&r_gs+X>DNze9KX~CuYp!YXq=-N1*3S9 zeno`<4We%Z*G%}KSu|BTm|K}iKshh~@$pUzh(J^cgL;+OQ}Mt#w3(l^*(qol59-bb z^x3{46Vqtb-G$%X@qz{D0qigU25{jXijzdxPg(%i;_V)94Tb8!lwknfi}?s2K1pe$ z3L%QjSe#MQMFeb&OZG4#(`B1&WzBFLOfSv^%Yk7@q+GByj^&BXa6m-WKt{%Bj9~}` zi7-yL|Fy>8P!HU^&8JNiiFghm*3_=#&0Sd9fyBf;z(Wh^zy!>h&J>j<<_rovfL1vq z1L%X!@RTp{5)LGnJ`kZ+X;ls^Tn^wsdf|@D*h)IFMWj5;?)gN-#fvwFAV6A-?$sRn zq{KH)L_2CBRg_I&z#~i5oCHQ08o>nCkWB_1Ojpp+Sxn&fsAPJu1IIh(!gEM0kpG)+dcrk*f?Reu_sMEhh%z({FlS zPb`Fh$|g8!RuTngS7Hesr5bJa1!@=&{3|1O1$ zhM@o;Q&p)DQ2mlnnUD=ZX)-~n&g_!S5EsmJFB4NgxHS$!h#4o1R5+Viaw-5-U+q zjato+0$4#c$9($fiEKx=HC4@lz{~XNuJY;xU;wbbjIjPHu>xzbA`=F@%&<jO#l7 zh|htCthQk?R$9u*%jbF8hr(+*4cU$;W2lu4Nz9fzMO{I;#*!VPkKz_d=!K=ciDK*; zIa%X#vIOd_(SA~+AejkuTE|@RSGm~6h+&F}ywO<^R78YWb@bJnjKG#iiw8(eAB5FB zj896k6>OPo=Y&fK8tjgY(Q*(D9a@KcKB)C%7zG_s=+z0(f)@G1>#YEOU$++X^gNJxEhTgshDo*Q}nDz#-9gP~F}r zPA<+NVcL!H1spCTRNif$#%+>eZKEoLM=VTVZH3-0h(Brom*hva{{V=X_yeM8sHWi> zjnQqYF4EXWgh%|v=)R%V!ii4IEyF-al3B#vDjG%%E+D0(=&dhiW=<5xN*vgkj)z$m zM;z_MQJB+3^cP7Wlv=2aHja(t@!1mb=TYH`A_e!- zU;c4yh3QBWpK)t>)J)p2h_taW&Sdr?$*Zb~ddzVb_wgNz-tPUM{CRP7?1D7_!42?7 zwcLOP^v77*(&{S}>{xTgD=$R~3$t|sRo?};H7Z2WQH9jEaD*|0XAG8O(`A}f%Z zsKy-gjxz%F!E4?)7zY>7z@3@~!=R@SdJ&PK)+G)`J{z7R)Z%tsmbMPR9=>2y(T zmBm=q^jek#0cs2EM_guA2#|J(R ztw4HI`b4!@40RU?C3bkD`~@2>i{^xQO?jO4?rrZk%0|D=!#s?DHC(d~ZH5Q@<6FzM zM};&~)AdVqG*d1mZh{s3R?6758(fNM5JapTcxVgL$+jRGEYoo&WK^ny8X~L( ztyqsHtj^@Couye0V}kM|i+CZ25Hi=Cl;g#64qs+@uZGYrMue(VjQD29<E*v=kiLNU50Sazs&rv#Wh&ID8{0l`UuGBv7{?#XMMdc6-(F zoP`mE_(#OZhUWxC^HFscCxi-Z6h*N#F0*(`G}3Z{c%UFhqI~#>FXw_=r{7pOc0f^h z_!yDQn*wc!a4^CIvjbaVuqnP^^@602*fvCKC~mRo3*Cg)uwA@_qE*yQ z*^+?-zgVT#u1C381>qoZ11~Jb{Gm>_d16f7&>abXc!LC(^mSW+OmLP<+$|#>b8VD- z`oR3mmwewG#yB=&`ao>s-CU>YSIPW#Tp*a8{P#9WtWoMq=74-mn@Q3NR#EfVQA?gz zwAusp>#wQ@~%uE?-bH57>j&^wC~*GE##t@P5Q$?wJq$9 zOx{D;@6v7i`h$Q{h0_cOU=x}KkcMMfN=IXavQNkz5*crqm_y2n`n%Jkc**J z-0yu2Tg3B5N9n%*ZR9UmjI~-n|6i)+Dc9x}Q@rk+Vo~JZJzz=ib4;1rgJwFRJ+P~h z<7KarciZ8Qheec+7wPf(Ie+@z0l@=e5-@y1PFf055oe1mr*? zc*B?c_3?Pa^$Y6uw8ctACO`-{AW#6o0|OBj6u3a(z;^=)E=YJ_AH;zS4+_9&aN<3K z0xLEY=nvw?f%hg#jQ9~D!jJ|{5@h+2Bg=^s6yg~Bnu-2$0G2OL022}~ArVzFD>{Z^ zO7NhUE)rBD#}4QR&^!s^2hgt+v@<)N`lM;mpdPi4qDuQL)US&YGHxypbbur;y$HP0 zG&-MJfWwtk!b#CXHCq6|mGY$YqfTX-wbI=xI*Qj=1>o=iV)wi>EkXr=64$^0B(_&& zrIYm8g%qPyv_EMTbJIy%Eefhkiv@AaMAa(kAi=aV^C|>4T6Lg`9uiQdiZCRoU2!2o zDPM>XtXHyNv&A*cgy5};$a)j}>sa=_673qZIF1P_?IHB4$-rB$$m=hZ6z zU@n((^`J1LlJ;Jab8=|SESbXh&5-VV`ClS`4Vl;Q-i%gXo=EOTyQl12cP#DZ+!bb~ z7(&oMd5cxLE$w1e%)m4S;0Ge?_>FQ^5d}cambwnFNweh6sW1~<^ zd!`i|{kkA#8@+P6=$JONAphF-;Di%2xZr~1@Y2fyUgw>g??iiL&+Eel-|Aqe_%sMf z#4XDE?~F>{_9(I;R1nC`%kCU@%-Mq|%c5wGJyqIi51ZxH*Jg?A*l+FcYynW(jqLbP zr1>TVQ50_Og79gIz_t8o>L-Xu`f8x+uku?VGqFz+A(qFd3H-MFhKN71x*rJtO5PN< zFZ%hzTtBGc-#H?&PTnc?2dZb5+7O~h`aXEf!iSd+D>10D34O zh*Yn7_BzOiey0?C^hY4hYKjpH5=3Z4hlH0?VC?Lcy@Le{JK5_836&znW+??bP>fFX zwwMtjmJN*M!=hn;sFe39B#7eh0004a0!TE@0}?q38Ye`@{0LHa8_6C?gea3LT2PA? zjALMqg2?mGu4}prV<3SSyB|stfr{i@WEv@^M=E3^Yt-HG`~$@+s`8QlE*i)oIfptb zMhS;!(hR^Va>D=Ui9HXgWSKCMyYxuJY&#N)RLC?IUqZ-(2WVqNk|)d%`caz2dWf2m zS3RpNAbHVq$uc8z50yBtAQtdn1grr-An3&#lHyWV_5sdqK4ghbxn?nmggMuMGcfU7 znLSaW&8<`jnE#=WK|w-K%Oukv;zTG#7*>;WQP3&m`;S1}B$|f^(|yFOD3GY+q3QVZ zm>QDMmtcmUioD7w{u01HTyr4?>gQN5teQ#C1fYM=B%XC63rdXjl;TN80U?1YGJ_hz zIQ_70!)wTt1i&!~ob!L_+=U11bdPr=Rd#SJsx0f&nZ9_*C@XFMNmAT}I<=6MPOkzO zfVze{w)G``?)$1xAcj+=NGMAb0#N+2lTw8wOq4E_=$aUERADJ#N+ls59A{&nf;{$> zpTpBDx0%7ItmXjx5vWCycetD$q=!k_i9j3LS&E{CV3&cTT2R6te^|CJwK<_w9OkWa zb2^c5E#G~NMnOUibY_GDDow8PG_L3l!cKQ*5p%!AEt;&1#DKWX4wjugU zk7~I~C#y+JD1}?9j%unVip)ebeff@rJ2y86vxL1RJt=_yjk&G?Z^^2)F>-VIwJR+Ef;kRrQtF;1B5 zw7B`@PAoPEvzA&ln7mM36wdHW$l4N?TI70?33GS7%-Nxhk2LO4*k%9&8mwT3J0%29 zJSV__bm*DSd-gK}^1Np~3;NIL@Ux%?-RD80fB}jww4?d#=zQooAA6p(pfAnmeBj^% zo&G==cpw1@Oha)e@Boy+E9W^ACo_{#HLFL{o&&!6%|>bubtH=$TW{8p8Im>q%p)6G z7lthjdRVZ*W070kCso#24}&SQZ0o#3&w-THJn~cepFvf)-4}9bv!$FGQV#FihhEEwI%XBlsV0N?S6` zp57Y`QlZ2Ulr7Ef4ij_YpPU6|sEM)oZ79j$-l(TAABQ%glHF3?)aK0>-7>E+YMXv# zgmnaIY(kv$P<%QJpHZHVlc04ZgJPP{;NJ7K`K<0n0~*_Wo&dV{taNtcd+F|ubh#Ui zfyc(Op|y^J58T7kIKYLdr!fs)w4l)wsM}$aX(BfDBqN`rsZGj)PtnCJpPJO~ zP>zywI992CIXqog0?($=@=d{I`%jtAlg}Lgx(`dkrTGv46?o$vn|EoxDVDjl>n?at|)i7sJ-PN3s_aRSOpSr^MdwKM>GRk5SI_|`QH+teHg?}`w{Q}?1*jwFATkO zOY8aHm(IQLlYj3?Yrx*Ft6BmD@NSV^j6*dsh5YFd4g zT|z9JVu(>aD~SqYe~~-s30W_pmfS^3Pm;!4j>XQpB~Jdt$~0vF7os$#$E=oOYDTYG zk52zNmRE$s+b5DD9@+qw=2$nDQs z00b6i20uUoKwuYW5D1WO-1Ln6{w^j^#9_eWvfAYBHt&O+0uB+wtyCpwqRhP9DOjfF)PnH>47~Q{Z$yG+ zl87wGNxeR4?+yUo^lTR--~o6c1aM%|CV=Y%EewD_0#LBgWN`$}K?F{q>XvZ%rV98> z(a%0j7qJZmri$&x@96pr2y*WO7%d-KU;;j18p7byb^!#q?*w>Z8munr+%A?HqV2pznNNt{pEc8cAI*37rh|3Cs2pM1& z0WAb1;07OU1Wte!pN;{vu+hv(1dy-Z9%z1&DC!P{0C!pzEf}Cey9n#tj8# zkOoBn-aPFCdJhORAPhVJ2tWV_*lqd9?+^_ml>AU5XYL}~ktV*YDkzd5S_p*LZ-@|u zj@T!X!g4M2XMSP_ut4c81?ePssD`lT;o_)-^hYEG0=3c-h}u#k%`%E)$VyO)Bh)65 zXeX6AvXug(dKQU0QtczYyofz!$v~( zU>@Y)29EOtqS4**;Tt#8Po5}yQe~F>Za(nluo5JDmg$UWDJj5*mA=sTrjJ}E1X5=kMV!!rZaGC%*x zS?USQ4q(2t!l71cECOY{=xM+lL?UJ@@+{0l*WyAXQ8CCzL?W#Qk5dDh4k?dM1b|=! zbaEFy0MQr?2w+p&lFtZFAPI?X>4Y-UmX2}C5bVxD2#@asc;Ey2EiOdOHEmSWX0z&i zk{~UtjR1z2uInMbt4wHRyaeZ&{>G2$2`3)nA8L+mP;@4erb8v_9aQ2?@1;b=#6`L5 zBrqbuiUlJ8%Y7NWf73^rDRWGW^l4>zPRTG5e))mPd>S0P1S(@S@#;m8ROd;%q ztKemRUXNd`q+TWJBmy>D49jBG3?UNi%-B#gd@i*RBERwkRwqfY?yfB`0;IC-BxzA5 zPe3>~&CqyZ7RBuYP_o;?pxba@7J>E8MgRz=LFufH0hW~Ou9X2~Q3C#K2~V;be>Mls z&iBAC{AO{}@@!{Y_S+_)12+#*OK`%<74JU9%h+%-39_W@5N!{vV1EDXr6{am#uom9 zE^JW4L=l26MMGRB=_?JwQZH_7535i{)nnh}tsc(B#-eR7g(TrB1If0tW}@vF02LeU z1401#C@l=Fa_K~17Z5EqSI}E+??#W%8g_6O*=-s^z#2ke7j8f%cVPu@02wn48e8C4 zyKokLFYQhM2ybA|jxz{BpxormEa*1GU`TOy$)*a$Fh&bblsEF?qryO{E21|xRwK>m z_N|;ZLOc)2Sg)Z})O!K1?=UrCC*o)b(Y1aIO=ZnH7DE%=OnYE1_FkiYgKZ!B?9mME z+Zce;h}3`AEghh;>A;QK{FedFVG4`x9QN!3FgM(~PWw8|9k%}!`*`8sqOpLj?$iA2 zC-tmpsKQwoPuN7s*Pd;DmFj)zjDFfoHukDMJR>*imo$hCg`bUX;B3`ABQ+zxVKZsU-G;$k?8eOT@aQbi?BnOLpKFr(xALx_!S z0>`3s_ztch&M5x)j(_Rm5;CU}*^y}plE+g0!iRaN;*ZZ(=-!UyawUDnYbfT_$2?`S zjtEYqgMC~{A+GJ-l2y~LZi}bx(X6FCk;5zLdLTz_>;U3t|+#>DJ zYEj;nu4vj1h6)#-_N4WSgg|J9m(urbeh8Gc*?C;Ki7tbcQs!RF)BbV=9>cb7ZB9q3 z%pghf;lv|Q?9cN8jLC|ET5{|C8c!o!4_u5QUEl6fKtf`CiHZH0%^Pv$9 zi{BX0oH^_Iw;Pv^X)D^>8Vv&|*we6d8+m}>m~{D?F4K~a(6-8HDo~#eP7g^*o6Du8 zBkQ0Ma3Kzwml!(B@Fh6Z#V7J4{n+)NJ%w8c_WlqTb0lKf=sg%jRx83nr&(3H8{)J@!OP~Wb#)BFvC!Ou$J*cD%q-mVzX$j}uD7XJ!{ zX~1Jdi^QzC7oj!`^&WIh=+Lyuf*x@qOaw8ws-moq=_5R%^4{<%p7^beVr#-C=%Qk@ za~pXka$LI?QYQ#$EDS$3FiNZlePD-2fLIgT0w8T_X;%5UDYS&pCs0%abD&4EpnH!=bN_Xt}H6isv{HU0%VXdj>`b@WI6xG5)14v$t#XX;%*MYlm>%}XlGQxM@|o~ zy)b+tsfa5vCzLFzg3J*yL&KD?gIN5bgHZg$&&x0^U>8L+s9Bmjvc%CaKM1#>KOc^V?j(UQ0n zvt)$JFlYS1zr1dUDDZXy#IfUgvIl%Pe8sh5e!xc}6O>XRNkSDiAz(?Bqnx*t_c|uC zDa6yD6anx5~O4e12Z4ETzN>;rTB((<#FoJy` zZ#Y)l;!rc^%YI$8vLZSj>nXw{*fCDhOZH4nCQT!DP^sdy2m>W_$;|5UF;qfP4dW*^ zU8q7dWduDTeuBi0%y3NW0PLZ^R{|gUVFZrL$2CCJSshiz^oTIEFXUa{-{-UXh45Om zB8s^E_`N4wRF&qnMA+HdGqsqK=iLp1dmP_OUAe zZ_NHt<#kIM^JLz{V42Eqmx%E91M<=FTw&n11SjKEb zxyxmstfX*8_X9fr*5_3wuUv@?j4&bxh~5#qMw7V)-c_e1L}J*6m?s5ZjCdr=3#cHa*H;=loa0u&s$cR)bGg#r{R zJh1P8L5B|=E@TMtqQ(D)7!xYA$8n#41sgd!B*`#j!UY&PE{w<#U%`_V`I%G*Q((h} zD04DYaI+;)h#ONL3`)^sOOGZ~0v)-trNVn9lSbuPkZIAZR;9jc>T)MVs82zhIN|NW z2n!x=ob{%`gSUSDqIx9R^{Q0`B9&hC__d@?s743-waC;c*T7?S9)0O>DAFhlXJ;oc7THJZD(Lrz&S^sWxHv2+;9G@Xa>Wi%NNzl7cTXhT2iJVWkymLCI)UQX_!y z-FIi*5SIrz>A?8!7stO={jYSZER5 z$Pi0xQrcdldWK%?vT1cjv8U00UMoifR6-tjzx|E^Gx;R}# zzZvS1ZU>MXqe9AVY7~38)f*EjYY{28z`G_rs$jzVfSC}#rBXx^xdop%U%8p_ zOKMmAj;NGKmO^#j1*ifM0ju9Zf~p0J_S-SU83T#&qC_zZYEv8g3+_k(TXbE`e)S`g z!Jbn0&OR$1wt&%RmWw0CINxV2pm#kiT3zn4xsZbbIoKNozV6Q5K(UD z^0e@n5X;<`zAj^1bfHNltst~Uzi1MCie$4vzF>Od+nD?o;xVHNdbWSQoz41gvyO(oh=(aBjwh|<0-V#p34oxgl10E9D-rmQBQwkG!}#9#s-2u0f0qX|N%eiwpCg(!1A*}3L~*twg%5+aiiUeAHQ zvR~uYGacpBg;>o=iuqOuG3g~}EHdGtx$xJX`I)F8gsaXGN8=M_5d?E&>W2rvLoSdwK@KP)6Q(%FALfJ50c0}8AvSCvVu@S~$%wY_X;D83VPt+fDS#p#NFknN zq-X>plSDpHiu8HcqX1r<#or9>UR>JmeB5k!<+Q4Dkp<{B^sN|)JbUu`((lzJ&gYW_KZIG+k%SbYwjSZ7R~)1rOoa$j!x`>h zDZ1!w-oubKrY<9q8 z=|mg?@PGv*@FWYkC6IBMh6bilwA>s3Bx<7C16ve73o+Gs#VRUA?tv12a5b2B#feup z(idjACaRQF3`+ii9GwUjv0tppH0RotT5Z)S7U3o2`YJ)44X-2!L1jB3L(P(C>#%?Q zVz8RJkVK}=A#L;>r3TBNoIo}urQPD(|6bdWy=DcR_Y16LW@L}V*ij)u{geDM_8VUI zjWE(BP@$x&p+)V5BtW67N$|5rK3-r4XMseMJb<$VeMSKPkXOdqYZdt9GBJRqh<6nN zl#2R=W$g8k->Az%E^$ zLGZHM>3%Ut*Y%4*^lK7OVOJuxdSsBC1>YrdFDx^)3U^^>7_x*#B~ZyqHi^4mi$q5t zFtHm=boAqgwoWjL^Cd^@W)RsH>Z%DD;0Vs6fwh`1mB~^H>VtRr<*3D^oN$l>65z?k<0GQ zsIZfs+LP#u(zN!j5GmF?v2@aX*!1O?-Ms=)`uhe|rK9tYBl32;wqJfJq%TYDeT7$) z&lmR=u=Fk^OM}!>(k0z2AuPQD(o!ldp}0%8bS|)@)FP>Xpo=sJ(xnngON$DqUtWIi zzwy53nP<+#oq6s&Gv}T;GxvV(#BXPrJdW1aqc2R~$Zv&In9(#pK7%!1{Vua%Rf`62~7gWT@l|2|3Xk@aSR z=?T9J9bev%1^72!80~(dyUy*vH8wFgXTYzxtP#fPr5pL@z=JO>#=<4ID^P% zi;3_~gBLeN_THQbeGv6`F+-9+TWH1n=d5+pIryfZPo$3HeSgPdM(+YQF`En(jtypZI*gZ{ey__4; zi=y^3Mi5V&@$6%LaExdIJm4FAZ;Jlj3HyeYwr7?=_(>Fep7k;_O2t+sZUC*?!SP^P zv|2{L%S~To!|1;Oc!&Gr`(MrM<{p_ihf zx4?p@ilP0P$&1Y{z1LbHz3Fx}x=q>0!64-^H(Ms0VMvJH2Q;ShzIvUuz6-AnZJFM! z*M{y)8lwsE5fB3*4KBbY@aVPkv0}JL0S;N48JHDurP^u4)NJOWDG}h#2oH)Wj4_N^ z*L$d=mZ&L~aWk;7%`gC>?rI)>*qRYo|-z0TzeP|J_Wp2p=`w3)iD=Vr#3A4vhPfomPN+@p8hS+V)?UitBz`H5cn(Vh9R zOZk~g`FTpfXv2b-umUCXGa=gOZG-ejz&sOluA#RO3v*{ zkC#gRE|vc3Ed5(s!U)T6T8IC@5`3Ng_$mq&CMmd%2?}AHA+mNB+oJq%7ussWZY$B! zU9+sk|xi1ntF!6`YMTMt!j zD|!xdT_R&E?_~&HX5g)6h_-PcD|5aIQ6LU~{Z7Mlq+Mea)5Nmm&-kpRx z7F<~`j-mCO>*%8TKneJ7w`8HKWV(=e*jeSk_F`d==+{-{UPtsmmHss(OiuIUlm*^A zR_aa%zs~ie^UNx%R*2M2(8zUhiiew4!(;h`epQ#%@p=+_ZMR*;)N$oOzhVEv;a`4B z7y;d>KV`U7huD2%fV~j}Q{O^tC~o|Qc`?W&VusDI}h$3WJ+_+oB-;n99 z;Rgz-xrRQyL#KZedsCbSZsA}4mI)NXw9qpBqIS5K?+>FJpC`N2Utb4;3r3oA$3EXZP zW*|{(iB?|;1BQadKy(dY1}w-=q)Qk6(%T=@<|7SnqW1K6WFft`lno7&GBb?H`WtP! z@%q+Gh1}CXj}eQxYy6{-;y+>*9}+~*ujRWFOXUT2>^l0!dj zqX{~S50|L_V9u+i-Re4)DlX=TPPbC*-@7y6{Ra^!Z?!{tu!Cg z70r3&{@Q=mhvSVM^AD*o+1bGLty|OR>E(vE^=-Q48MEUrZs@DT^0Yi>%$-(#%xKx8 z=m~CA#)5^-=#q^`Zc0}3IenxdLBrGO7zmKt0Fo4w=3>9dewmf@D$mZh$;U0i6*`_Qe2%zF zRDKgBhsQug9ul7uDdY=?8{3(c49e!H4kwl*sRFtEcElxVsSGqIDIf|OTvxMA)bmcX zLRjv?Mc!ZcAF!{WKTL<(Y{d5F>+EN3mi#9%XM3Y3ht-spLxkCU#t21hS23N2UpjH!Mw3 zu{sx)XlM)-;H%vlODd^{cqT!|979)s0Z;KGPmPDmib`=4fQTn_yK8g-P9q7$rOL4C zZUXoh5j+n7>HYz7lY(mt-bAyL8MoX8{RllAHtnYOfx+a?UU+IjTGE9A_|14_t zS)mPqR_E?Zohq)F8tXlMds+*wJ)WTA*wKhM^uo}QeJt5e1YP=(K1-C&EthQabnV&E z<-QpKi*&iF1Nk)Gw6TN8xXD@8?nIpt{ClZ$x>hsLF#pxzneS6dTe2q-cK#%TR%(DvteG^hux%Q8OfOeZo){D4% zHBCr~I|6)k!I%3i4mo!$O~ZdgX9!60+PAD4rhh#z5nwaTHTpeSs^L^R$JYM6pqfhM z*AL24M%d1WkJZ3`rQ>)0x$d=z!^l}1`5AbCJS2WNhKo%5JVT}6kw0U})>UG(RBg|Y zeT}(A{@0wgWd_lXhT+3EH>{bcK(&pOFc2NIUx>6u0{@}wW(;jAivm+~u=x&~eFZ)N zi;B$VXSno{LDiFHgJ(F+m<<)#I;UJ;1bkZ8nM< zE%wxw8L3|Pfj;Ggpn`2{5i$w5ZIdyRtmRX z8y__5Fd}8)x($M;3|;y+U(?H}kzM9j1P&7p&mmSRw<%p(8>R;Xw8=E^AvSm406pqd z$drC6HYjs|%S(2*`0-&F1z6%8O{}!Bk4KItPhfbYq}Hg&}NHk^-MFf zUPhJt?Ln|5TXP5J^UIp-YTj|!)BD}pavPpayU~_cBGQw z2I`DZC`LOcWNl$DtG9G%elpFfS$W2b*45duC{xQ}er1u!o+xbfvcV7#sl_CZZf5y% zzm%*k+*;Z5_lPg|2~DAV+kJ6{wI#AfD-@sSQ6~xHD3Px5g<2M{9>-|f0nF^Cs`qB)-7J>=T)edlzP(Ti%4dkcn%dOh5Z)I1e+B#jvs)1YQTLi%QdfY zF)_MZe5l>AP=V&P*A^xPzs5Y1&aa^xj||uhb3cr6D3 zOJ~PKb~p2#6nZlLBRJDi=O;`;exJuxCs)(gs!2r8JB7-3t~RB-=Z52Es=CTN$5Smf zwg0Fx$VV!!+$;yLt`IMH1!pOFjdXi?T{7HlisaG&RQ-2igvQG@b55wR&t zfd6z|)FO>wU*XWgq!5n7mgkP=8%?IV9s*JV;p8+R4f7}`6&qD?j3cM^cVW*PD>tj%~GX0q#!Fc?L3RJX!EQg76 zCP&TRgIXV1*Ht`IBuw{tW%gp-!dk4ES<9}o z&y%j+ip+jh(nv%jo6L+uuMPW~^!ODcU>&k@talMaS+MP#5%R%{Ka~7*ilCIvr#6?d z_ewD%`MCLt|2sR|=W>s6&|B%^&i8ok_^u-MV2ZLA4U}ey%PP_4Fy0`3uXnixom5== zmf!KHn?g%+UrZQ_Dtu9v9~GO-J@oY|3#?l?^ZbcP^k-p`Y-JA@|=JX1g-hmp?U0cL%Rm#4=4kf0mxqq9%j#Rt=UN^{W!R zl~{{a57UwqSLG%erpI1B zQ{3gOyi%Q_yt4rFPjKbpQvBLAzX?1U_};qx10ZJ>*zrgy1gAzrXg!>O@ zuH5_UzumJjn`KF;m1}@UG1@x4h4KoGY#1|YdL8n~p0N`(tuw8XEusy6AST?tGu6#2 zp{iCStRyzdE6dmwF4%z43spM#)#G_->-t~j?dx(0&_*WdR9Xj%KHq^*>5x|A$1q)Q zTWaz3=3TaTM4^$`7fk^}O25auXGr2w`ynqo6F?0X<%c`$3ixIKEPZ?@|L{F%U{?XH z+xI?k(mH_S9cL{s-S|httws{#2%BaB@i<|*=8Qc_&y%sT-Bj9K;ol0wy1)$kSy@$D z;-@L`@G>phsmN$5j)mkmQo>}g1jFr&jBbe#;vsa*CTTjeO(5iTk-?1U^hFlt%IzlY zsH%~)$a0pn8_)*;l&0c&GD2)VZQNHiFBl0&RgL`0*dafJhpUitufA(+c&gimoY!CO z2rHe^ITZ^Zg6=WB3J#{9GAn&e(IiJ-^`RzR8g)oqE3z*B_~>3x+bB4Y=;v`j)LE-# zUN8b_J{v6T(Em!K4d)A33qC99-6x=6A<;P^BfeyEHpS|wR)~qc%=G=ySrZUzzXSpX+`DL-FUL^wM)#4Dv;-MipiE+d&_ zYW!{P0X1~eLpuIrNUbiU8)ke$@jq=&G8Vme}?dlRN! z&v&IV#c0mLijiVD3I2*_=eb@TSW^tv-di$6ioLA>d2cT|tONUGMCJs*k%#1{8>J=j zGRHdS{2Z2v-FasYY$Ze?ycn^?W{AaRk+-$@X*9lI=iS>2#RX0JKF!7%R^B*+ck`WW zhTVl*hP?$&9Og#3s*p5z6ZxaH)apq_O2ELUf?J!tctah$EhJy1pH+FbpT-}b`-wPP zzzq)Ij|Dt`Jp!Yv?|Yd)kfgy@Ae^t450*NPmW6?(JY%9euva%P3&AwpA4N)AD2veP zIe)|O_Oh(;JZdIvB|4)$|8?REZ|Bgzum1*0n>o>~h~id$Ba!5E3x<9nEt2V~S*y&) z6I;jdB~fmTQKY!9jFXMoMOJc+u@Wb&3pWr0IsvE@DX7h&PO>uGGCJZWY2irLI{}1M zc7^|NQW&_h+Vqf#UBLuUu2@sQY?*e&2coVK<>d>J(g5+ZMoIMPjZX_a!p7xC#e^mE zt*}?wAw(B7s#y38DrS&>P7__ahSWtesLKdpNun~BISo4beV1hdID@2g!dQAqf;m6P zUa0@QP@X4rWhTev^rp}HJ`+`5Z*&_J<C`so-!imyI+s)P}e0g9MI3KK@4|ed3nu)>P4INbTY|2$; zudyf!Q6goFB)&z~Y^sjG1)uPxMJbv(*|pzn z7Q(eKf94R<;vc3nOw%JlW_+Wr-GAM*C3onEy;9SNQW7qbJtL>}BL%{V>D@wIT5PD( zJYdU9I3E?4YfX56x9KO%sB(g5bSs?zbW5c!f1jv5VocTYS_|G*@5EJmNm=#v-DJJI z;L{QYQLzf!kryM=wPAQ>kxrPc5?Kw_!8Toz6{mvFQTRUIVw|?(|A9ffTF5O!0i32U zTiG>jaoKbE{u!GE9G48=%0cxHb+c-8{djYiyeR&8%ofsh1tlE2o2(E>-~Q#n`Od@em~L)(P(cALU<+sqR$L z3LFmiO*8Yl6zC9YAqwchte*=w2GRNZ~abtDZk=_z&!D zM((~-ReQUX%*pVjq`t8a{v{UrEL2MDjkbjkcV-90LuzWS?^1q!v^|$iH@|5kwPnD| zOvnhsfWBtVpESn!4_bUpmou8B9oLXMi3dLxRicZYw--sXcY@Qg?342>1}QLB3W`YE^zUq0|D?2S8RgNhen?>A#j?R{=I9g^B=Uko&wP-g#Dk6dP=Li!uH4i-ZFU3{MU_R zhXF4QC?wXiFM<^tg0!L=M1lr-nrC=|MQ^{MUHwgabj550Rc^pim-ZjK2& zV01e$km0wgp>RQGFo?xK>2?4;spev!O+r%`U7(X1%Bu3v0T;Wst%S1=GTSj``RtaRxqM2Lo63)w(l>Jd4Za8rOf- zBU$fo9IpHiJD+;S7smi!$t~W{FkvC`{uz6XV(icAUgl|j2k5RW;$+s{CvdpU#`~7y zeehKc@BXoGd{s_bl4)7d+Bj!d*7WEf__MAWa!>E# zVp+ffKd<)*`Kx<`KDa4o65P;JJRj(q8=3Cmf#ev=DfoKQ@7c&Hv9U#`^1d3HH|C{D zeb)Q%)ita%;uicibI=!8%0%{SaktL@5lNNN#F-V+Z)MNFm_iA~X-^!;Vv} zF-$DkW!WvnPQIVqB|PB5MBVksl-$vJI~psz`esjas-s9ukCL@^J6RZ*>#<8E3C#D{ zy)TR_h}#Vm#swYUW1$+u)#B>~sN#`u#cWV7#3+9T?Zd0DK7ZywE(<%8@X!~F~2ZAj{GqB&)`KZ_! z6BraJCbssyv0g>w573ghYo@RMxQoS(X8HOWtJQLB*w`Um=tgxf7)SD&Z*gnq4${)k zZcK!ZQGXoX6zkX7T+^ zag35F4xTemMRtWMv31eIjbXM9j<4lhY~FXRuP_;_~|bb$npdYl&za*x!4Lv zU%7Ep4^^^U^8Yegr`Uv5uZ?#4zOUu~-j5&pO@5nUp_YSIfbJ#sI1NB;5c{toFT4}? zuZ^6mgF++d*i6Qi?r*|hbN`pnlX~ey&h>h#bz_QcCZ^XtL#|R)pKN2CcD)z($61aU z(s2_Kfq-|rMSAdU{7}d;Dw}`d8*h#I@~sr<7ewWRt3Y9ucwPj9uviy?MzgxMRycSL z8X*Ez&2y&gF;&0Aq_IF7L{+G5qg-ramfcHf?)Kq{TcUfIfSu+fQH516Z+)ie1#=<4 z_43?f#V>v7fK$PMyH{7(SPd(~k4I}C)FU;6TGOhlyzArqf~t~#+`~_5ll?5a_)#9- zZzPnXbTf^mCdB6sna?8}eN%|cyIsJlugAgUydOXJ7ruM@Dc3iIT$sJkY=P+7IrqN< zH-3B&RKJ_P%TcE&?!Y_q(VZvsX+>ncwVs>|vr0u=lT;q~YxVgqAxl5)91z|doTxw( zW)J{iz85BD@4Ei@;kEu|1=C-j)ljb7So~?-&%E?^#!CQT?hW$X1u%RPoO}O*6GjeC z$I5&RV`pcc(>U|USg`lnGLOJNbh%f-vp1R3s4th~W33W_ z9D`PQ)K?eb9*oU{D?1E0Z1j4ql&4t6?t52F5zX+m6c5{;JvL!WRFhp!EIpTWin{Fw ze0vn}?ka*r|D>1u$@_QFw>!=kbQPU?dQ2*qJPWEShcuVXq=N_2Ejyn0zWd8Udh&rD z><9zGp~qC`Awsm6EJ+EAukPvNr330GjNaGEHNtm&F13-hcF8$2@lSQ}EjKQ0;aQlQ z7OnE&Rq;OjyCkGmUIu$9%72|_; zB2SL~3p$QG7P>mVLw(GB9Y>vAMV`f9{k#+PMiJDv8q`8|@9|} zG1BDGUjky0joJM{GA+G@o9+*@EH^Kpcrbmv@83bkD8WI&%QJ#HjdvJ5Vn=0marNq1 zgR-)($yNSBoqTl#feR7P??nkqm1sp`DIQQjXtkPu~n zn*o)Qj%9rVdi{IR!*3#Pi_be(_a;kkzf=pn{c~UDrU=Vx1*s5m9 zozcUV7yPS3lJLy8ha&eWB$t)zDcQqWbA1xo5ZuohI~j!%-QDDfgy_X^TU&BAeS3&R z$re9v558gXaFsLN>M=i+--az%(2^-fy;gC~82xMTGw8KcB41A9gT$|n>bQ#)4T%dy zPPFQw0$<^SVEyzkJzhBnlcSh2r>Hmf>CZjj;c=Ka*h4)}w?uDN-ty=u7Q6exF$w7< ze>FQ@^?tf3A=l{O58TG?IXE>%}dIG z+5P9*h%tU0MV_r~7hX3%I=4DIXhCeQstCdZkJDRHN(%6(A>F_v6i_>kS3L;Y)=IW% zrf+30uJRel-!pjslz-Y#yt`{!U0C8c4Xb;&TcW2mC*q?9wk9a{xqd)n|(a23fk0pH{>pMIqLLU!_2r&1eHYQ3RocHK_A zZBhM;%#9g!=iq-(e#&hGNT9#*8IoxxVi~nZXewYLm^>FIx4;kS1*q>*Q(#h9B>hFCAG=IrD7;j*R5nJC;Pu}<(N&11Js4#)=;lGp>n>J!^c*`VHuPNyPVp#Zl z?}7gqLohInQL_nTVL;(Yz>wIg!IAoe=#8d{gc_`4v#2vzTU*17j#wJ{@CaUUri z$!f_MZy)FzuJ7{brYMw1us}?q=Gd(1c=3J6k*#D3t=?!2%n2@KbZl2!b8L60-!%NFAFlj-q`j8-U^*GpfKghD28i7Lvi3?DeMjIniMrQPhKu# z9yuClMsU9FD_$-7M8>7$lC<-Z^XzGiz#qN_bZMmwk7)y@U#aZEe1zP?%Ywa_^ zpGXdwwrOvj=f?9r^Gu4Phr@LUwK7-3w|GO4f~OGd2T4wuTyuPqTym$VN8B;bn6bxJ z_^(Poj2Z7L6LaJi65!5YasPt9;`3#g|{#4xPw-H;71^yA4!QY!ZcY)pzpAeg(fg9Mw3h6Y|{V(h_Y;`lwP+lY=JoC ziVV=p%QTM#brlw4Qms^)x~D%?_t8HSGvVQ}gdWIm5*1b$iHCog?&QwXw=n1yf9-v4 zM-3kA*xv~Y0XjP!>Dbocx0~F{o$Wd>oUPf+EptfUk7vro8RK(&(Yl-Te>4qf6G-3y zGa`i!0jRsuD_acdRZ`QiAh*>9(WjHdAB=(fgUKOp7TvD&Kl+1J@sn(v?ix@rvrn)! zED%n@$^9Cx8Tt9+wnnmn!+4kM$13I+Pi8d3YjT^%C;{fKS#9cB&5^Z!Xny1SjJt;! z%zF=n1g~IUIhI`7lhzb8j*61*Ox>3u+j*^|);`~*M_!WuSHild&*+4y<@xIa1r;|M zpD{wv>OOKjX+&8g?q#%-w9@@P3aF$)=X??D8SJqy#MO5)d?l8^!yVTKqhd{`XR34s zN$h+8YcT>HudN<=LU#qnGVa0wW&TAO8W26dv>>boG;#4b7$Sg|E^9|2; zx`6D>(Zah=PP_T_AW08RfO&|EqR)prGOXAUvuw2pPC*Qn>J#XlCLCY;DV z`pVCZIq3J6^_6R%d4r5Z${RBJ+k5(Ybqe-##qJ*ChZtNxEf(B1-5a7V`_Ya5H8IJM zmQV)XKt_D7>w7U#jl2D&DjHQe)ve_pZ2j-64=z>`>aXbm6LO$5CWi_)4+`Gpc@9r- zx)EI|O)o72@;N3|@G4TcC|{x}33ox)*mJa6$GE2lJ^`BicaN%Tciuzayre8!ndtb# zCbV>ymzsrNUyBC^Hq_u0FwlMSvX0GG+*$BJMW+W%_w zI$KMO3iB7%3c#%4R+}53=D)tR`?N__18Y~6|LF_Mu4Z>dp{s92OqhQ7D$a>K!^?+GmPc?rW3D!4s0g@__n zhB!eT-Pd0x2I@p_%jEZyzzji2d{I!(GsqlkJXG4779Ogj7afv=YBD$}B*Y&68CiS& zq_0RIN9ca;g5%$~%Kf@Ia#hB6)_>$*s=kE^35DjfK?Aj=PN|FCOxl#7|=&(7Q=DvX5D z?<*waDF!dNyRxBGMqTjXF>=57)3F*yaw~VMmQW z4?+@0lK!qGgMu4VKKHIrx@26u3 zDNGKcA)8D{#rM@?tv~rCYK&wwCQ#8DCN^v&kvsA>IWTS|4DDQS6%`x0t}};1%JBVq zVUy|Me(TS4Xje}XME#Ax-nklHR6706&Y$C`SsBW7NC9Lt?gR~Qj`DY*38ckY%43k= z!5En1YZ)Xxy`Z#^i6tBIg$(kF)-LGEilHFMz>N8cITpgBZ=Hi}HG{eRqjKcPIHtMF zkn>Sp%9{MaHS!2VEF&?LlEwNAlFu_X)ob@=jgP~szv=^@q)QoY#0qc1mef-&{xDCr zZmQ8Y|FxnnVrfNo;;Za@d?j$KaUb%t8#B&tBVdJztCE=;eeOh-w+#Jt#L-shAlqc)N}g4?r=c0M^BCq+4tDXcyac&HV-I1HcU-P(i(bWMr6k{)A>hy z=~SCj6{2EIrsGE>=|9vMlX+c@PydZI^B$Q!-k2oWnZ0*o?b%prO2tx=I6vcBd%wJM z8@xSuxA&a3TY$zLyLsPWiR4#h=MiU}iD^FA2$fCT>f|?T~IpC)=Cy+uNXHHt(oB&PA9Vn=E|B`m-8Cl$nL~DYx-_%wq!X&wMtt) zo*q9Z)9yY zEzC7`#5KIGCm`Yw5HWgnKVno9W$U(&*RKDP^C!jdp#h$`#Zdn==U$t!gIqE$$qM{- z{WOIvN{`U@0ix8nRNGU?k(oq1UKk~fY&}SHr1N|*o8t==rkyf{c;nwO^CpEZs7m#6 zc94?ad!~%;q)dCJF7Kqa#DR8%^~65bkGOOE`t10{%*xY=@t->@M9_)KV}Z6>w{B3$ z5^L?1m5wHprkt_|GTUI&)i=pyYCkq^^yfUxaTnCd?TX34R9l^8TM%mhHe|&X*FsE@ zkxu3X0o!NBNIaTMRw}V1W>+q3t~hrph}H5SbjHy{w}@>9U!4^iK9^=WZku?YL&>{{ zZLh3_EV7#>a{sDNZ9n0%=FW?75vf@37v3VqF?D9f(SQ%pw>S05PHW`->&&LoY+!Zw zf@<+xb@?koB2*SHSD;4xg36!CBYYQZh|><_IXAlU!}}?sUED*A|ION=MOm!oXk}R+izEPA3OLo=oztw<=kmY0kowD)aV89#|QB1 z@7r$Zzk-_*^k13rO~;=~oWp8M%qu4FxbXlubg?zWfM8Z!F>}+opFG8gcz&+=0eowr>JY3>Ttutw&f7X<&Y1)$k>MqEBarpkvr9F zfwq*5n(^P5+21aqrsWTecD5~4sQ2b6zEgcpKku( zk7vMJ(C5@3_Z;!4@?s#hS5Fpg{5^~qY-^aUh99yfUl;Unuk2f&$N%asG0~|jXt3Kb zbo{eoYd_z@&6y@RZCCP7jq8u~O!COfl#Eyt#RI{pu_fr>@Ry@vUiKJi+E697rsjb? zf5+cJGh|k*2b;y0h`r&+I}f&?2elmAR@9aaCGwb^G54FBbAvx15CHE51fl`}0K}jG zE}$rY8xSApiuA!C16`#eT#ojkKk5r)Rb&QN~mGb#tA+MG)OiLMoQbs6CK?8k| zzpt*UQX;Y=Tw{DNC}n6&M4&4QfkyG7QOcMeOgla%Cc>3StiqsCc!bo%#6SujPt3+6 zj#f}wu$8T?-}6!{XerDQ#x(_jLEtfnBMc%CgBU0+!t#F|ks$)lNhrw2rPj+1kq9 ziXdXPh+D)XO#4v^@o1|G*@MCKAhX*sP=r?Y76$siEHoxtIa?|PC8ZoQutLl}O2J6Q zWW$b*e2)G%mLud50$FuUas7{BD@549(e=2FkP+FiYy@J0c!YofWT!$*ybs-`Ui5S345Q!Mr5eA02 zX1OY6qJ2v_5Ci=mJrs(-LlH-?>ntJ=iWr!{zSZ$7Z! zS6i+aC|a2}!c{rK6&C0Uz5W!&2dSkDhzLYR1YWOgDOXn{^a?=60ppom#YKbuqvSX6 z>m}i+$Y2-E{duqHS$n+v13d`pI4BtdtVsh~iGxt&J`wif)f873F3D)x7$V5rBqIeT zN|$LwLjJV7ox^Idk)Rv+f&}+Tdhz@FQvAo0{MzvnWY=hbFNL(@PUy@CW|?LDmCp5b z_6aRQR2V18L%go3nOs_3~-%?b|b=&fE z-7U+Cpe?x?-#>m7C&U zUF3hW@pI23#XpBs-Y@BUn!{}=DON!9b}aNuB)JI+VeZc`d&9m=qJLK--HJ-!o3<>=?^R78@c)X(&;JvT*DnBg X{rrFN`2WS@|J&jb0wBBIH{AX|5a()1 literal 0 HcmV?d00001 diff --git a/lang/editor_tutorial/plan.gif b/lang/editor_tutorial/plan.gif new file mode 100644 index 0000000000000000000000000000000000000000..03f5e7f772f151837f884e5d80d5fad93a0d56b9 GIT binary patch literal 472328 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

XERuJa6J>5ibf&pc0ZEJ+=(G-nsf4AY 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

XmzaAVw?;BW&Q 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 G%>Mw-zMJ#_ literal 0 HcmV?d00001 diff --git a/lang/editor_tutorial/switch.gif b/lang/editor_tutorial/switch.gif new file mode 100644 index 0000000000000000000000000000000000000000..56d21914677fae3c0f135616f9df8d070c05455c GIT binary patch literal 773288 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 z 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

Q)3dyPFv1*F$wUE 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

c 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�wt*{8^Y$!;<&P8u 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

r$NkV@zgsk4T}mdvyNG{Nb8C{~-|$jiC} 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
?4bwlV<;E4ddlRQ?J>i@ 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�$71j9g5Mh|Bnk3~jkWvoD68S7Xt4%NvwUi!+q_+u?cHDSV{umV`>=*lp@3it+Z8%ZW+!7(i`2HX z2rGY8eZ88C%3k_X;swJr=J$GL*v+IJ4? zT-w`WdfNO1=sU;10AC|4U$3R`iKKSW(00qK|BQE2-YbmAwzp-=7ag=2sAKIv>;bcs z)&F&!`Evw$e*ib`ExxB&@FZz+d~5kK&v&T^F%i#CUk{vtRT~eSTTw4((t9|*dBJ}O6 zuB|Ahtgd1yK(u1nCR;SX$~&#BM?;v2M&`g~YqTEly_)DQqlYf3vykZt&UdnyT**tH zW@c(I7vuth^dJv2ViUIYIfn$P^lF)hZWKk>SkCn5g{Ku1G2sDic79I^!#GC23!f<@ zF=DR)N9@ae=sokt0vjvau^6J@WIr9p8BxDA(*N%i9RsJ52I0W`da(Rj0wVQ!cCPH* zMz}@5@FU5eVxE2;OS5C24l|&7uI~2lu)H6g({W)v+WX>+i8DU{JqUk49)U!vij?P& zv^f3riOUQ1j>SQq-0hKxVdeL(ux6>1I&{IWhM%Y?B59}1`_D7NHAwV z3~EPA3Jz{4;@_~O)oPs#j%NW2|0%;*wTesdtQN_R^r;#RPCTb^D&b=VVblk2CXQN` z3Hbocw09>`E%HmGjy-7~4Nhg&u#^dX*)~$j4$Fcbm&%Rc5IV7w)!CL+`hUa>4wT#91Ql&+1s3plo+S5X5arR}(BU1VwahGVj$>vo$%dc%c;Th<%qJi|jIi+usLNO*Uu&QcWy^~7=r6onRY zsW#VU9JksReN_8btmLlXb{E(AlN%=zC{B@sN(6Fo;%rp0!G1)W!7lG}H-mMBq}4rI zh6%fliYIl#n$bp@f$)ZxkKUd?_p%Ua|NLAhpoWXy7sFaPKk&q|OQKjJ`j8t-{q1qd z1==5_Z2-f@3CcweCaMsONPZro$sM9xAKY-3~p z*fY*x&Ex8~OQ`3A(k*bOnbSMvlGk<6m+nt<3p#Ou?T=yO`<+rK5 zXrpV3dsijXXBCV08c9ogbqu!}?=*?u;?%Hs6*#{v$huSVet3e4y>YhxiC-e=+;`^T zhn~)_-yHhdy&uEWUfV~$aleR(TMJZgUlM)!B+j@=~YW%CkKjlg-;U_*?=UVgqV4nG~ zDfY>BT^!8&?>-u!X4F-blPj2~@(*~L662egY(q^)1Z=d1y(Msh z7oPj<)RYz`D?Cl%+opRbhNCYld-G20*JR5uml}Sk=|xHtU@gra+#WMkmJX_V=3o8R zJ8WoG@?K7D#zPg_LeM211$N`E)pvDlJ+E_9x}>=)JJuvKv&B^~Z$!c3h?~m%X%!{% zEp$`0(l@2d%3mi7y^Sxd3RNlJ_*J&yEzP_qE!fa4@(YcM(=p4h>-|AyS!$~<&;fd@ z%n8Y{L!=7TrE7Mp)&xoIfpWmL%AiYfob9zDJ=KGQ@?uNvW4jv6kb3PR$<8`)w{kjy z3gg;1C>2LT;7F*bz2FiOKvr>+kloBEmLR;@;pu z^!9>*=HjYD8WTD?9O@e16r{%$B$lRh$cIXULnyyR)Ptb%gzRn}T5&(T9?PYx(mZ;X zirU92NLO=Sdq`YZBS?8IZNm176u0)Uk0$lALB$a1(Kg$uP<-pU8mlwrGx81{h0i*m5o9_ix|4Jc^4r(bj zXik9og1j;B7R8Bpak3z(z)q{9zK?CK>}*mz$*%KHimb?q9(_m>{h z=k5!oi3ODxI;4S!a!4T#W%DLu5@IS=;Zz$;L zpyVjS;&|jBxad_brC3!J0>zbHuCXA~er58z~I}W1rm~I;e zq7Y!A%m=GKi>^qd`g_BN*4#pyrE2bP?*w7;0rHEXpn#zIjZST+ra-~tVv8Qs8485d)E+vtr39|_qA1MYW>Md5 zjtvfpR8pn$4J!+;1@*&%$2(0uan`PREoj?B=J3idwe>6@2{Bw<6+<4qDsASR!#mvM z63dq%7&`%$Lt`iFP3@{45m1XOE4WhXg$vGv^##vyn-|e>#Q)aGp*EI;C`9=8k33Om zYF?dt;e+cP!5I{XbI&o$>Q0k=!a!m+(R(Ac5<^o;?JGI}Y3zKuGvnnQE<6W^<^-VU z6zIdstm(&Or<%v@#nBE=hj|Q+mN~G_)0E=aQ^qf54o-m*lgTs?&gy_^8*f=DIq=}o z?EQHBvE^;kJevoO=Xer?02k&+Drv%u?wA$z+9WfB_^m7=MdpIXL8xUhWaGrl zFjkKh-|AzDegx!Z#UJlud5$gcN-MWI?0N32@Z?!WMw()*Y_%p>#^PEtGd6xGR z@r^h>RvYAdC+^N0JRd;%^h?1wS&_y&x>y^fYWqlOCpz;f?GLLc6$t$;n+yBvMaNF$ zOExt$E<$2q!L_!HO3PtZQ(gO0Y*S7=yx=6S=}0SQ9{M{X43K0mKxFkIUFOB|BDN-U1&OEd%Db?KRKZZV3DpAaSefoqV0sRHuzDK{sMq*nVXQD4U}f%dpw>l zZ+emkuhI__DGm=n;PV1E43#0b=gM>g+-R`!c7Mz4zlx!n?Q}WtJXlx7hV9Efl9;A# zkx0wAh;|*RyGiF`2@aEvofpPMcdqEOi5rEk2FSTi^NgVo;mtI6ben-9^bx^m%hrye zeTCf+QK{w+5skZ3!2~?2A6CRFlb|y_3w91BE(gzT+3VXOKPmB}Ep2>&k|p8Vi73e@ zx=>}11lcA>Vh^nZN~sW!aHwR7aD8`wM@M=y&4;h*wZ#AT6eMT?x0 z6({dD1porml`hL&fYTmIJaa2|{_9?P&9q1fLJxFhjC;DI<++1DOH9pA;5Meg&ao3t}{VJ0&I9G-mW%J* zt5*MBmtn)c9Q1muxXjZ?C9n+}(f1J0-#)LpvHQD|`2mjG-dpIZRF%V++%22)l5o-} zE_57LqB`p-#ONXS9hRU)3^Hri*_Dm$>+ z$`E)QinZ?oXD|1IJ>ol$`IMZpcWSGpjuJMQI8mYuD)_U(DSf1MVxjcK!X)xLTi*VK zo`jANm!VQzl?R8L4pIOWS7Kt`zRf5>!?MFXQGlR<570&v7(B9LxCN4!Nb$Tk;M^Pu zLN>TFR$%>jcncy)*AN#R5PjP`{B}Ro-}xrh+V@@46-_Wlch z>}+ftoPb)ZPklYEjM~ilVC|Z0gO|sz&hCtV@Yh5%Ffd5yKei zo%zfXMTDg;_+OcUq~DplG8;}@cmQIQ5E>4WWtWt7nsE9_0Ex92IX)RaympS zdNuSs!F8!$F4w=6)^(mOjf1+W7U(sTn&HWrzb_aQkXlBxiEK_DLj!E58B@pz`r1Dw zibi|Pgd7p8#2hu#Y26sak77r*w;JSua7)j^Uo^d>Uov829>Hv7HTO&9aQ zWe34xKSu6)89~cg^{t2xk19j_J2jMNp#0-lyZsALzCot`{ySfTQS~#q_3AwAb@9wd^31 z916OL1)NfZF5iAc6q{}DQos2sv8Rxe2A;1rRVpgPDfmrEag#V2z(Obf!N`J+wVuY7 z=9aoB_->7J0}sf{_`9~Q0uw=;2t4qK;-K3ZDD6iqpybx%*Ov-_SczK~y#bm7IE+pHUx`Uo&b;vB8WJ`;E>uN z&G8H}$dN$Ag~;)o0zelcGU!=RvU7&2Pu#GF5BuvclyC+gIrU&Ff57sEj6P1V+t#vE7V5Y{2%bI#d3mV@>e$v}O2C z94LP5n9d2emI)Bnzmv)t8D>O?6rTw6n|Qo%+ul@7U+Yh1n>n;$euka3PCVuwEfpYI z+XhArbvG}i)}KzcbbTY_FY-uj(#IakJa&C~q@FXwx^bY`Wa)kJ^ZMod8P||grMWyP ze0Y2nEc_RS523J@CiZT*mfk1|6~5mKKe;^cIblUloWyJSg?Bn-ai*uQZ`TnQ`V}Ai&Eb{oCOh=-TCWIS9_^Z zHyM1aWiq??`CS)n|2fP`y1pSTs%Hx07woa~2ucwCDDj-_{D2b^dTU)HMD~(yzmS*t zOWjZ^Pi$Euu{0$BZ20zk3RQbdE*YubtB)s5R&_X>fbWQ3!m~b3dQAo0?{1c zplNhyxD5bNl#WaDInbs;2q0c4=br~7w8g;}D+IpUd}?Y8#Aq>ZLjSZ2(c}RH)S=659(?FPT=_u;>sixu_YNw`XJh| zDcYX4DYc~NDa!KIWW9E zZ&yAh-8S7lxwBq~Bigkpz@|L8?{I_v;_y+T#P`vJce?9R69yXl$FlJ~h0Z2{g@Xy( z4^cwz5Mg`=04Di<4_buBfW@r>Iw!361ydN~uT+5GxtuHg+ybZpV1BMhKtodO2KNgi z(;h$a61^uz_jgUV>c;d{j_s~%wCFG@o1K>d0>)2esJn~MZkZ+tFdr$D>y%iOyk7g5}i(M;X>DSyB!5_a8>DV@%?eqDc2hJ_S|F>%v)# zvr4Zq1SzSL2y9NUIl1iXC4M`$z6<^>f%SkdUFh3q=hx~29{W9)W|rO(>uOe{dg?X& zDxD_E?vqc2c*6S5%|F|+<-2unjxWWFTzlH3yR;mkI=u|j4$M!x(-2`@I7XixgoK!r zuWE27$Ht5HpqBeV$4_z4?}b$Se@i{-oyXz1gyzlBJZ;)cU`!{sLxl)hMNUju;yWm1 z#a7s;JkHC4KK)I{3UhVwa~@-66DwDp9X|g%KZQ=`Sovsc@ z7<)QK zYNDu}`dvfU2=wn~1zgBHlAqSEjm8q`VVpf?HG;HMM@Yt|vbK1rUBSdv`%)mLu#5VAeP(u$N>XdZO~#7TT|&k zj^Tr|fLhbdZ_TI`IabAuRBHiQ+nfq3tV{-)&Oq~P3K-4E^^tD8Ka&zbCcVz{p@PSs2;>XawcEaR5Lt%&o}Ax61?wz*;vl`aNw*x zfo+Vp1k#gU=i^vFW2K%e`8!Y9BY;b1L{2KB47$kRFtI%+%L- ztXs0&v(A2Jkg@6In)tmW`Js@u@9(hFb^8mCUV+HdcvY$SCraA_!lIPrzT<6n*Cq=t zs$^Zs%E%DKyaJ>|LgC+?ZM;6d7{;kGAixQp=IlZhc;2$&9+B&TC{$?ZLQoFtB5SI@UXsckMHRcOFRvAh zYlpKnG+sPiz4y-s{Ylfs$j$W(j#h#x; z)uXdREw_#lSN?1}x(Qwrla6NI&4V%NO+klYewxkNXeYw(x}%-|Ao>Wv5Zp!IKOCu& zTc!jE^(2RI^y{!%Uhpy@SS*d6jr z9S0qeqndN|MzF)=VRphYJrNm#L<}Do)No>H5-{L>N2n4D2F(&eha5hNW`p!!3I#Hd z0nnvrs4M)Bi0O!{Y4EihP$d9fh1cZ>eT_bkWQHFKxt57 z{&)j?bPmo^A^_6QrS0d9YG>hnvVv>=2xrCV#|VIs3?NcJej0=GB_QvwvLnqv9)Mtb z%a~>YTuvYiN#+oR{@ zo|rQ}=8ak+aF(nVFnu)W&Jay3Qt8gsD9K}#S)j{viSr1HL-x}oa8W^SXqxqFw|wN6 z7hcL*ju_82YC;52xf!%9pp6m=Vz@@f*OUk2XSzN{xDsdwKh6S+=x-DlX3ZLVna3UV zMWUGy)5Djzn95=btF?vIo5oe2I1w7M&}AmSvFG-h(%UzbOnFc+YeYTu2CN?rHjT`QPJ-F}U6*X+~7fE}D&|#)r8Msa>a@gK7 z@RNa2<7IkQ`iE=@W6K!VSmJd5!mJ;!V>*Uqo(z6u{_Gwyaob$R858+ZDBLK)NScLr z)p`sq@HLd^azEZB#Bbh&?q1CDsH0NW{fhIG5%L|9NV^_3`&d4YM+L^sr2 zn7iuv(t$oAzQ6oKhNQEpTFEy2BVE}<`GkiDt?2eNL{L@~9a5e!F+|J%piHt^_fbFb{Fu3kg@Y>F8QSS*{CHIwm|tOgvno!cb!71;X%q z#R$=4sCGPpfWF3@H@y#=cxvt#zFp93{>;+((n&O0d#|`vNOsWU(T#%8-Er0PzH$;B z?c`Qo?A}N-*AxaR3kri0)9k*&o?)iLrX^%QVQ9*yslV*T@T>$kujQNdhY-lM3+&Nm z?vzfm>xma|@e>1Rh(y_UlL~S7h7?Sdmp7@#`#z0S0+v27OVq?L`$eKjtVI7X#w}c} z-yqUOW#L{^&CZjL7)15L)ezn%jiL#d4U_Mi=sO9|d?kZJdBXz4U9;n7Sw}#dn=yLq zPobBCT1uF01!l$%By z;3J8pcm@{gl;u!MOyS9J*UXnWqw0|0k3l&0CBF>Du37k5`O+VQltG`ET6lb-NRasD z;ev}VPa@YqbYY$#xYs9{NX1;eKL%Brm?$#KcqqZL!~>|9{4SLEIk7)*rD~bt85rEI zc_wshmK&6?*!+c2m36^x0Q4TqRx1@j0mxB|rE2Q}r8-=jlp!)I6=P23prbDhv^HbF z{5gqdtTV}Y=>uMOcUW*y@xsC5yFz_;XWr*N3|*a7`vN@tT;#Uk*XnM`(B-;Y0`KL8 zUJ;Ha7U(g%J+q%KYD8FTnd*iTx%9RG(L&S1vN1&&|J;G2Z>$w(%Nj8VK|aH%=(I!1 zMc_(snjFcAgaxRxQ%DcpvsyQX5xXWnR4CE6b+Ry)SQP8A_D2viMV6bw$&L1yL^J*A z<2WKxmzqo)Vxj!YH4JVr_7UBhX*6?z&EIG)GHE(ZJko=gck0_P(syDQ^Jm1}qU7E{ zFc7fTH;}f^zJEZ|Yx2)I7Wh9iJZu2ffLfsV|IKAnP&S2T|97*&|H)R;fgOtCvMC~)0;wq?o8q$L{f#Jmo8q$ni){bLWmAB*kOYzoSzh-`|^roe5A%cgMb ze`)r=c^?0|Yzou<7iIrPXaASWrbzAoM%fgOO|jVj(rgOHrl9Qq$+0PXn*y{c3Y&tm z{}tI3noSYe6o~!bDEogSvMG9*0G+Xx*)rf$orC(WgQdiGs1~ftZVcGpu)Y;uJP<{1lXpL0!Nw3a^!Uq!^<3ch%T5a|_x0<4eaqfNirs*VzKQ31( zeWh37$^d4{Ro&GCImN)|FeX3Edk%_B6jFv*cp`OT^3aAqYIuG`fJ5aZ7(ET@BuAFED)_1TBH z2fOp{fHXT!M4mgIPRna7rj}4{wrlVExb9}pTP+3h&P9ej_F$cf(7dTpGIGyiGO~}D zd52OYH%EOkpM@;y%eWak@|2A&p;*-2eP~0~CfU>L-R$FmkT8QR4EDRIpGTwe%j8Jc?}^yMJLpxjLQZ|4 zJbVHBRuE2`=^F*~)pzhf&g+kHT~55q+E5y+FG@bPyyo0|jkB?p)phkR%D-e;2_#E% za(GNt6bA4_X?IwC;O6H0xqjQ8=~TI^s_|NLn^apsgu-5t7%`5j@p^UJJ-_)+{?(lv z!?eCkOY(HSu(enTIR|F%xX8qt5$1YK;_U1nZr&h9+6I`rMOLP}+?WOChdB90*qI)X z@m6wrOt&9Z7qc%y15HatieASkEoEs+MzJuG9+!yUacC;xw>#!p5#~0ZlQemC(D`nZOH=V1-)I z5bT(4v?ilincO>et-99`M)yClAn2gWfgW6EwR1D*1Rh3%mCN8fD*i{V*}^6;GHjdW zuENhXARNxZzYr$nwmV?b?yx4d#NHYJcbS4HdvNMyv+$Klv8UpVxV~(c0`7+1CA_$|%~9 zlWYN-d}W4d65S;H~$w7TlC7<^R_$w_P-`cs& zei|$72n2t5N&Q&eG@tXPt7OXekd%oYR-a3b>%Z(|>rhD{5ja==X zQ&`5#en($bG0lBye&e|@nc2pd)n8~Sg{VI1G;JapJ`b4UY!(YX)O%8W;>8Eup8Pb5 zYgO`LP)34VT2H8amaFbO&sq5P@pTap8huD+m#Ju-H%TiWb~Ht--y)KSzogkkQE775G_!xS>OE{$*8cX(W2{nah+A9Cbv_kiYN=I_50cV+PfFBG3cu|6bS&@9NYBssK%I=2$7;7U zcVcRO)i`n=Uu)Bh%aIRkF6;Ez6W4rho3y5RI||q3c+B2Fdf8%5iZ4CmX&CB~!Wes??unadSrD>N?Tr(s+zGfJ`}8UfHj8ALHHUpWuwL}zc3KHu z>~i+l5|i(9PA7%GDW$(IuP?W(lkOMUv=VFrm$zVkR-EoHSOz&Ta7)kUlX(BpLBO>#GNgFI}WyH(I^Kv0TaND@Avr$_EvimYc=BY#vlZsoEOy5|$|E5179qC&Zgen*pOcN(!_!zBvDgAa?27>3(dgjO zO|b$&&&P618ryhE)2}i@;d)PG!9(r^EO)m}g1b&auGnK`!jm^lvdaOYwqpM7&WUa} zabr)e=FBB7kRw)965XR?4{Z{f1SCdb@+PPEEI@upA>F^2#5E4$!Q2C?n8aV0M17A$ zh&WOCB*|z~?C*Abfkml}H1Q2?)4qagma` zxt&D5rM%f6v$O5{K$*ZW|6moK$|0_?-R#a|gC{?6Ph?I#=uZrod$0me^xIB@#yt7n zoVv&)p$t#%7D_e{lTclT9M?K_n+wjL;;;JB2jt=9eIuF0b@%1d)i@JXo<7G1JXvy1 zvE9;{6igK;SL0~O2tG@aSx*kkN`0c5q)Y(e#XYaiX8=68?HZir*HdR!Goox02u~9$ z{OO;l5@rE@>Sw86egMWG7CtbTz!#{l_t-bS`W?a7Eez(Ni-~v z*|&Ip#WulCSR%D0^OGXZL9_P-hBY3*xS*A-&v|&stO-0Je)11}vY=Bpq za7?V%`YXoPg8Z1|%z+HLiUO{MM6QZ7{gzBC&$JKlf;TON3gszQXSugH^YdB?zfTs_ zlovvc@*6xwx@`mN>wv1K;09u`+QX-aRfxA9y9++m^NFeAm88z^hfJk4y zzBQch28zul&-Ffuz48Xc{f4MpcLd9oq=1!31Le}CNeIF`LFQ&u}on-C5bG&up434D=HA?gg;HVcAez*`>+0Xh7DN(NP z?`ESHE9!d`#T}?$E*lH_;>*%_Q`yrf;?ImThg`+ktB{^BsDCUBaS5Ui^T5@Rwj}-BaGL{laaZ9SVe$(6g2mA2)aT&GjnaDAwWZ4tySS$FLhDXx++PQCutuNHCIdO6xU zmPN42Uh|b4pkfd>g0>CGO}bRsi2p^pMq9^h+!ig@C|U`w%V}V)ty5U6(^;(d_*I`e z)Fi{*q)Z`*c|a<2M!)&mxnJP>L@G`q@SF&Yz90hCkdSi(>7#Me%3=p6k;)be-mUD6 zMs$i8Hz|`lc7ot1+?}VAkdMFGcD);Qu$^zY-)_=&F70)G%W3+wSobl9>igo`rM6D! z@Y}7NPAP8k=3*VJs`E<@`A;SJ7HucL+@6-yL5ctf8{2r zEqC+SljZ38v~v1vC@=qcKxrI68VR1g$mvj9g-CICvIO@i!(e!z;`e~m9=Ukw|D)@_quGrA2L3-GA_$`P zUag{Nw53*Cdq#z-y{X!z_Nv%HXsp_bQre=_D7BJU31aW9wc6UHRn_|DbKk$;eLjDD zzvtvQ*Fhv#&c(TMdA{C{uCs-%l@y#y1gVy-)e=#DG`|&JsCT zj_7TPAR%|Ub8Uw83n|0rq{70^x%NS(A@a9D=KXU5WQag}hs1O~cnd-1h7T1Nk{jB4 z92UFIeIczool3CbSLcJ7QsgH?-RFP$r3%R7HiPt70A)g$&KKxIB5I~XS%wHX7ZD@b zI|I4Zon^d(@{0pspv1R}9c`G=jrLwK-0=P%f|>QCfj3Tlx5KUwD25_P*^GSl9l2rC zX;Doba89rxf4H*rVWSO?tY$V&ow$2GN?SC=Y}4aKv2k_=t`zjMs0{e=4F+|PiWl)~ zp3@T51n#8|;(XmBI~}o@nR`W}Hx@^A&O6G&NByPAEH)$Gt!LcsOez{qSnZPZ{u0dj z>!o=cViEOEhC2SJPVFgADv+m{F@z#0VQ8o6{!#~92>>z*pbXjW0)*kxY(A>9-~W)< z4JT;ZNlCj6*$mTSwqy7B`U7i5+{33Bce(`mmR1UAzEqQDpwqpJ@mQq)|sJNy+oSQ!E2mL7{KYzFM&Q0(W@^9*Edp};fGrxL*cX!U=&UCv<&&Zw6Tj9WQ+tw`UZno-W7wE=r z5e?_=JY99)D1Qs>?kX=IPG`7_Cw25@(VRVW>2u1aqV0&-#ZISa&BUJ2QaaqcZs8@W`LvO(hivQjg_ z#yc&gGQllG#fAjX1J-G9vG7!|&%v1bD4?)?kP!udz(|Zpz}PMo1jc-&X62brBfOp5 zT1^T|1vr%qa3TRtLQF2_8+XII9{Q{i4e{CwBS1#NmB0NW?cFP$P1kMqBZmf!(>DG7 zHnOIUeQBRmT*mDckP}BY{O$~uVMu2}U^eVL4Gau980F<3O2pByVSzR{n#H}&!_iIo zx*f9J-bcosiQzeUAuz}43fG^G+2St@`zvD?wo5ejBb+#zBIJl?+T@t+hoAR}U-ouS z+In^|qrVIemkP*sk$c*z-5J$u68}2%yXYJid*%uUbXFGi1!uyF_mq5gw>%q*a5S2Q zKX;c0tbo0pac%j8cU-szRbv`{Gm~E{g|ob#&7AW{iwxL3VrG zLf|Oe+!>rX3f?Di-f#AOo4o+Y1_RsvCCEbO<9(=$rNP=L-1_&U04c(zbSFdF*|}Zo ze)vzsd5>`6`rX1+^`+S^gRkR7zyjEr3m@19(3$pk&e8$2!gR*Apc71lQjqc08O|OXWrx(_XMI&c9f4fTTamHz94|hM_Eue9#qdUXV6x988 zDEe&S^ZkuVr$z+C5x4hdWa{kiHlXyn23Y-!iGLtt4a*eC=`~9P_^sj?SZ;2^ZWufE zz}aqWv;KmYGx;$I`e4NSAOsD_KZt~HDQ*bFd}?QFD;;782#ny+^1uNMVv~^yJk4h4tj^uHx-&V~hv28B6^n$75nq$^ z(oIrNuOf0aZZG$>9sK@WO2y3sp?muZFU*MMU6n>DX++P!PS{sJJR~yC9ZJ=4=#(&s z&kmI4$<(P{6J}y5liqrfNeBEr^hyZ#T-AdJ2l>oap%Qt})zOKt?rq^0un*BNzXO)C z)-Ed*P-iX(`Yal;p*m-G3-aB~C8JSS9-N@;#V(qiCE`{0H<^Xq7xE2B}0Rc?{!?J0n7L zyK#xq2>TDX2j3yP;<0z{>}Fz{EgDX$Z>83qJcl~jHVzy11w>JDv2-{WQ; zEcO7Vq~ejR3ARhbw_vZR5gEnu?B!oc5RMERkdYScx84t{q+j&At;u(CfLeUxrEl(@Oh7@{0k*C5{ ztQdkE;ezTB3)cV^&Xen-)LhjdDZ&7u%YMrMN#EKzGHuF+X?Vqd!G=QCygy5A`uX1{ z35`3NFx;m)MzCT(sB#t93h82?uJ<8L8a=09u#vfvMypkiQnn{a0Z20lul(GcRCESC zyXi6kEj`*##}dkFOKaMDkEVxnH%6HR zAKf`x3SQ=I!-~oxw7kW8ADa=Kw`5A*2F%GD^Bu>!7Sy^w2!v2akGyjlK#zQ73S8^^ zkQ+ddYL2a%Mk_S&Qo8Rfsd6bTCS%rt7xC3Zt#T_WHFSQ)&H9GF-&O%SIr~Nn`RxZx`e4tGK8N{gx zF5;kMMrTC#J{W5t4-geY7z1yCI}NKdOdMex!khIk66V|`%1jn>%rZNV^~TK#E@l&f z-o6k=i!G~3ybjkLEg%*V2Rr|2iWoj(a~#IV6=aS0xUy=p$Qt>L@nlEp`&a&qUqh!N zQWVaAr&Fm;gsc}Zt=G~j_DOjOLFxc@mqw|0hF4+xB{Y}Z{8BMNx450T3Kg$BxD<&^ z6Sf{>r;-Uo#=_Ay+R++ZN!%YDfB%r`_=f1b0e|E9*HHlW*QiA0W8p!^hR}=5#Qk+O zpv;bz7I#Z@?U4c&PG8O%$3vVL*%U+#>hRGe&jHWDo zR1f63zN&=rX0^kO_Y1^{>#>$&Bs#}3VN@Hi0&fu|d5Cp&T1M6!G)YJ&{hN*uIxb!rkDC*6>06L$Is3Kzp zVqk<>^;>HmN18Bht)Bad!UZUSPf~a3#+v=l$luQ60M8C?StNan-hjo|ZZMWV?*2A& z>49c>jpd;DeCrJO$H3jhV| zl7_#OH$NB(-Q@))lARBqe)O$Y*_zdK7e2r}t`b1XL9d2F0>ByBVcxXPkKgGA|LS1# zlc^K@msU6f+ql}xjtiWZJvaot@KuSNjZ0kBIkPeoe|Bo@q)jrX8WxMI^tI4Za^Pd_ z#lcoDZ0RLU?!&*=6&4^K37auw{tmjdO1NHxHxe8A64Vz{G*Xl#n?$7!WiJV)L95Qt zaj8?ig=caIsRC*L8TR+$2e==X&|W3IQaljn-9mtp*~T!8+5}g}?C`tX_z#h|ZcbvR zrs%skh(JA}m}-@!=cOK+?!#5=9Lg>z8j~jSKBuywcD?_}r$`}o^^6TE-Jex&(5lln zf>KoCP6gG-&Lz*!nO%2ol0zd8J1c*y$UyvaXz9M*c8cYVTNiT5L+41|%m74kUAup- z3r@JzRH5J&3UkNNfFnyY(w>UYrK3GR)QqSKlov3nez=obCp|tW0ORGHbEuFfL9p

}20)Yzs1LjVP%O_EjOw$}iR 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%0A)lM8ZkD^umV9v1S?h?lo-(gNd)prCOmlX0z;Ds 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 wO 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

ds!UK-+)m3yeNp_&o~zTYW$FIM|^% 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 z zvLlLDxxn;l3rkIb5dc1(6=EtU;<)Hzplxh@7=rVuU;p*nNc~TVM*QFVmz==dZ8{tX)(Wd=Yso+w=PRJ?~o z{X+I%3;D4Y*1IJ)v~rZf0C3t%6{ye-a12PREf2%XlEle>KUbx;(C!kGI zTvrk89uW<{A{(JD8u7Wlxj^|Op-zffE^#~@MxO~AX&F6Ci%a{MpOyWI!(^4WtB?Li zGPk3A_PKZ-jK~JlJmG!$OIEVlS6L;uvx`UP?GYR$??(Teew8@-8q-F-fIlIFqvD*t zc`1Dj)A*=ycr1E!9MtO(9{i=|-WiPJ-Qz%HO@FObJL=f4Dm zhud6J<7^xTJ`0;`$b!cQJn|apaaLmN3(3VM&G;QYF^E8X=$e|Q8!x6oK9`S}?2PhA zFudr+)Ri!WOnf5S3Y1RtJVWvxAMqHI^utGHQsjBfFp4)vuBxh{4vD6wp>5|o;&~e! z9!0!xt`Ydfsr!rbR!&0X;d3U?h@?Y<<;zbUDtE3%EPDvT?IE`g;p9tVT#23ugwF|P z0%Fai338VHp8Dn)XySE7}4%A$%GM^rX%BN9>V%a{|Pssk+iw{;KkcW-g=~`Edj3DS3)yRP*H543q9+ zOd5k3tEqIM|Kc7Q)`2M=N75RPCa!7NYtrgzVo<*lBw4?DnznOmw?*MJKl%mGmmIqD zMd*Evo;(2Pn07OtJ7Ur!8MU3C{n7}jYq|SI+4x=ya~dPcM;_{Pl_N717_Q4O+x68j zLR(7-wGV*u1oD}YK7TlMKhrom)>!Tc{CMjR@#W$tw>cIlFFv7Ft38y9?N<(=|1&y5 zCX< zjfNhmr4&`d75A)v|I(Wuk%_%5aGZL&mdNC&!MO@pQW~w&qg}dL12O&`MW9}x$JNfg z)nSPudBH0}&5(87?|bii@$vm>sgTmd(=X?h7$a6PjZU+SY>}s)H{EhAND^7`i&kwv z{7!|30qSTERu5g&84#dorW=qM^BYf+6xK!I=>FpP`iFS~GPcuaE?JiY(*$;6MS z)vhRGTE_8vqBc!eOfd&?3eh%A*BHAY>q(Gq8P2q0R@5NJ{(XAxd#q*velRV!2m0k# zwDFNr^nCpEP9Vp)&X<$`z7UZU#egbeN0L&5N~;3&vw(HImd&liOyQRq#=9qIt{Gg6 zd!&e3Ck>mnld4qW%)F`U1@lKd;}raO@B69bL5BEM8gxYr&s(cX?I`@FZ|doaWJVxEBWy`+_)qm+i#4(s_22bN z!C}bn&U_(Wo%@?gGieDDsqzFDXy!0YVRb4E^ldH|pYqLs4A#cs!=WLmZ3&jQ$D>&+ z(X?ktu*_I-1T=Fqtu%z0o=$HzomF&t*FHMnT!>Jo6O zNlKbD&9@>&A5V#A91D=EQw7~*B+~IJ`!$jKK5sH>$TEJ7+Obo*6`39=kF74t*)>D1BiH2)Lb#tA11a zLVRsZ9=2(|Upn}wECXAWr_UvWj}oGkruXs(U_OZpKA-|&bDaanqlA+Oie0m9K5Ht#@!ldM|(ciD7V&xD=s6b_vlB^i-!#LrS>!XlQhWxc>gd7>(@K%zQ}N$OY{ zcrm7I?ec5ver8;{4J;mY{kOu1<=M}YUqS%>EQkOpzayQK1UF1$-5N$~KgYH3r*kuH|&JXYC=*<+Vb)iDv!SGrN)2x|d#<6&nN z2sNB2s4K87yx64{J}%Cp%z^=b*vgSqb7eM!VYolw2M;F9&Tp*R$Aypgg5Ej2VwR%DAV6l-tt50_6(S`1-^;u z-5B6`tkfML)`X$IQI>aLV14k$Ll`K<=xZW%@a{H8>AbLvZcR1MXWh#_lnR2gBJoLj z@$dHMbPwZ9Dod?K^xYRrB+9n=>B%$v5ia`g6!I_VpMhvcKDdw{tU>|&-FkF)({3H` z=BxdRNq}rz0WMNJm5Qp~@}_&K9xk<~A_Oc&@-s>jZRyfY%~+kWX=D0^q1yTt2--A5 z!EshrW}d$163wm`G(tWzV%znYW}{O5vhv$BaU^yIJ0PlWIQ=v(pY^!l;mq*UczM)c z{#+3^OIM{kacKe0GHMW&I)=Esbf%IOBPKEZy|{##zj6c^nPhbV!Z^QN0cE{~88Z#~ z!Zag+Q7}h{BSWv!Nn&nucir#b8d9o#U~uGU{ta-w?1l4>`N`Dkm{e628g0W)u^~m# zY_iw`MvXr#B}S<=i_@#588CP@rV04rm`!-j3=|h{M=n7{g=uInhUF!xCIbhe`ZKOu zRyj4&WR@5lh_cu%B20J1<>6Jj4Ak^Z3E!*cLH*d9TcH`sGDeGiuXbbD;^CbXniqx@W`yoL7ZWGS}?qieGJ^m%Mb(KR9ccE-APxVa~R_j z9$^o@q9DA*%Q|#F{Hz zd=YA=%g2xBb!nxcrQdAPRklpZmE?0F32>qF z%#~p{+M2Pq`xnK2ESks{o^jFW$~>-B0avM+O|E2csaEMG*8INI$z-%rC_YQJF-?MZ z4zn_gW7J{L3#vP9>kVCc41_=zEmWG?LNQ<{ORqdr=i0>#S6w&=a0Ah@#a9|C*IJw@Sr@|^o1Qm%Fz}b{jYpi>mL#{SisW~7wyx9*bb=83q2Q@D(2 z>l`QQQN-_~+{+9R^Tj$fw`yIUUH`6%dR;1#D7p{e4*_h7R9oLLRiu+F{Z`BV-31bBx{U`#+;tX0bxw!={gi~-_w0pg;DS#*l@ za0}1U1{xcg16gtTy^J|n_uc-68CZz?ux0`sp&rI4ibE7&6dLp} zfeu$A5<&r{J zFJ|-f%T{A`|Ja+WHlAH`oJ{|z%F~82M{G6bq0^-yyZE>;VB6-#%|EcWE`RXUjmvc* zx_u1FJ@f3W67&*h;RATD9k7d9v2WCqDQP~WsyUD$fP`kP@?bD@IT=z~>$j3kQ((en zFB4qkk>0B$^B0TW@*0-!%Q;qzcjcY4h3{DQ$!wnWk(W!Weu!7wj6ZqrL0RkGz1hc9 z!CY{Y0Se{if{r{E7s5l?kkHUK(0gyidk{Axsq11}1Cg5p$1eQGXnxI33Bwafkq{W~ zghcyW@rXo;ttz&N5g|7u3@`yWrGc3vIk@PhMUEvEXr*lzrIV0W#wRclocOK;Yt$TG zlpel=dw9IF)qiJy-5i#MvB-0yzg*8kme}7=usmr8j-9Zk+?7eOkQw?Q+bxHW58 znq!Mj*qJj2M$z=2gj9ObJeS#w*4}<_jY?8&+>R6BJ9?WrboB|IrNb=iIMlwx* zJJo}s06VM)%xr)b%WMy6?&r|TM=K9o1RzW)Ja&_88Z~s?6FiFGGxRC?Di1Am-JkHX z3TBJ9S{s(MI&t9GlH&Cw*7isSa@}mdQbAJ>|44y%TyY3olxbTQr}FHXoq*aR3W%Mk z3U+$BENP8&?%8FFV&9J;v1V>*8w~3k@mjQu>SvBJcpPt?z=pGw>9&v?Zau~$NUbte z`%8Hb#FJ%gZqt3+WZgi*P~s0$KGDBZ#;=VKPmmTy6w$9?7@}NwF9+9bA?O4jQyi$m z>DP6_)hle-V>ry}A@13uWHj_%;{*xdad}Z_zP=W;TKs;+#b2d*iE}O(<5=8BVB-Sz zATPq{QQTP6vknhyoQib#+#97@X|*Rb-uIPIFZ4O6w=!(M742$Z-Z>WTJKOAa%h~NH zzuih?*im3hWjERcvgbczDzRoN;RflWLHboPiXYg}qii$iGfsqB^EtQO^9~L*_jKsJ^zVEF>=#Uebljs&h0s#5MitKgo>z*n*6E)NNmNuU^ z3zqkme$+hS6wWjinL&*{?Q`2go}6eD@R@Riugj1{TXMM!#ed>^do%RwgWQ!8-;=w7 zm3}{6CIru>RsGo0>yB(y`eoVW7`3|C&ZzGKPNm&)GuT5_vC8$znpVkre3lJjjZPM4 zj6s7MsT5LrnxJ-C}GF- zf>2!ZCh{?ZFz|{$#taKb7}wij3~Z%b5wmW4{(~fPK z51>93n_j7W{DC?gny;g?6%2~LX3_~NMz5G#V5_{})IJ|jK#I~S{~Sf_(|3TERi=|L zqrH8~Ny|P@yt&EFjvmO9rhA=FjZ#_-0yIo*o_Lp)GD&P3eBkWDCw+#obP((6JQZqA zkS}CLIDbgok{YYF{(=(p!rc${Agt)>>oM32E6qyi;=(`0P}II5ils8J4GDD;GfI7} z=WC4O`(U+hq?ZxC0n3WmV8mJ4g>4N?xRi6vGHbI`9W;zfPG8Wl2Qz-*8rf6N!+F2l z^R17Mvqyu_qmH0$cwJ%*QkGsA)olN<=(O$*5+hRIF*iT1S&+NBw4#FKutRX2;LBs?Kh8KEsSM&9%d! zEh@FOHZ$iB--NA}_i$e7sP*nf%v(7AP_WF2w5+g*nXdU_~!(Y}xThYaDY-&8sWy{8&*A=E;ElIm-OWolzuU{I30i|dwkm{{P zXU89;T02S*{3PTv2F4b)q%akaf*r?$Nq=7HmZ680GSF}eE5i=O5w+K+;39zFau zW0E}SnJ|(uuyFKima%2(iLkl8EK-R3e__$}!)?fM6ApGc`iJ3jCotUnd7*BSC zhwaY(RfF%18`JxB_V|39na#Rx@4AC%mK`R5aPn?ib#U^ba0E&F`B;rz)-S0r_~Uw! zrK5q>huSu13^pwup;HgsKDHeV4q$2agMpAksjD_GO4o%p%#B$$?2kjvi=!SR zExGvR(@7f~{V){IhRB~Sp&f1ThKvjqPd{ z8VAbL1To{gdso5iN|j<&AFM-NwmJng<12UQudOFxEC@P#-IjiY zB^#w@m6GTZnFAIOEa+rY^k7Hl-R48k!t3q)i&i<9q$OG`G zno6QIP<9kJnKjRc>&PDN18@4NtAh}=AP~i52Rw-&HIHyng zH0YomWwF(pd7Aki?0uNk=l`29o4hzy^embZeJ2K_c2K{cy4*`rs>8DJ4zIz`fc&ZnHPqCSwSGY zx1xA8Y%3z@B_>58pt~;4!P5?n!hs^ND8~SE$iAC<_~XV30^LVFaK6ACLD=Z9h<`Jk z=OB_`EdR%_I@kD>(WR&#=0=+VI4P8vuD$csn#k|wK1o&wo3O%s)lP)ywf9g6{AM2@ z)!M5mU3#nFVfNRC2$F=&O*D_7Nwq7~GetO79|MubKMYK3j1opi)Z*rzd=`!RZE}7m zxNH}4JMHI$3B2<9O5}~|UR`gS8g*)->aFhne)pQ>HP6xviAT)dxA<3NWp9?vrJVhh z9?8J$S9v|Bf5&5ZPUdoR(nY2ecy7i24*HMZ1Erx!Qk~KWIm1ZlVeFp266Oz|netF3gJZjs>!wY~!>>V( z?Ks-!H&@0&y@ZZySRYKQj1LUm4)yv;8=y2MebEfxaVFI*Jwa#G(iZlE&**rT{WeSY zSmdok)wv%jvpk)1Iu+qh(Q;0qW1)Tlt1}n1euYdjk9`kbQ4LV7wvniu~%D97L8xWwQqk3t_J+8WBp=`q0 z7LVHPJ$lmpaLA}Ne2b3`@RL$Ww}BiV<`xcneRg0GGtV^0-nVn^w(!&a#ItaPKTiW$ z4wVgpZ#rGWxG1~|9cm3?kEgtOE%xjCmC*QSqqeV~YNnrOkM>Gh{dvsa)AC;5>$Bfw z46(MYbCcEUYLc`6=;Zml->rdDNv~G)4KI>J<`YGzvz7}bT{Mvi$3I_e{Rx) zmcxaTnO8>zIu)SmUAH!kqlVd+<^xL?`QCpqz)1dpiQe8$WlK0t<}7Tdb2>I*^f?w` zCm*uF1rpiVN42lKCo?iMIqMGiD9fE}vzi=duvvuEDv4X9ar_$Pe;7iWDgw)Zen2QG=Z#~=Cm1Z$pllyOWZ7$*tk=wF*|g>jQ< znI)2!wl|yxmZ=2Dt21H!gb`E5d@zM*wR(}ijCqngx^lPbo?Fa;dHxa~zkxG@fd~4~ zi8h=W(pA)(d=w)=5Ld~$vDwY7``k5k45dFtVLaPVqlr?a-H_z;3s$b7a@1lqMh(sb z&8VQ~8^5eEl?f)jD92Gejd`z>_*G4jEg>=<(-zsQe3kn#T zOrG*J;bb$yxh~)U{8G?t(U1`)!za{Ip;b$)pQ;%3&Cyor2WP}#;OkXZI*2`YnNjZu zZ!}ki`#;|`*p=fC8eV1PS!v?PljSeKuD-@xX_5_*cgn{uF~-@oTrcuts1RR{9oGOP z7o}L=5?^WfVB2M2-s_3huE8H5jd?sw=~8FUrv0v&eQk# zzT!{_t!%7~Z{G5t=is}`7tLNJ(9l4?1A*HA6t1VC0Z##VPW&&V$$$1t zAmKg#kS0|2gsPhSXVPSa`nwPjRM>>7nowm|s%oOC38KO#RMi9lg-}V8e{2(~Wb$8Z zlm7ynQ1z0(ZIge&CdBZbzmb!pK`N6%g-xi)36(ne*Wf@UQF{J0KGgpUHi`WgY!bUc zZ4YJ+0-mF?tNto~Q>g!$H=)`l|2x=(Sl{#iZkrsfY*2ZVxw(!1$(z*g5i#}u4{uTr z!Gia)3W=E5e<3G-zmN!?`-eK&*z2KcCx1JxR0ZW<)CrYFp^7N~P$&O5Co4x(FXn$b zC#@Ca)}B^>Jb16Q@NefNHk^u_{G**vS=9fQI^pJN41ofYfy~S>bO?Ne4oaKOgZnlN z9ZhBe%M$v?01^-(#TOMKsrxvciJ3Xhih`LSGYLeYal?9#a?jD*ITETpA0;!3%g#1Z z07(U`ZnEnHm5FRxF<;qZoJ;zXTUI56R|3zf^lppkISZ7dLG-!jLUeoxVXhfn2Hf)1v2>v%Ie6Hg z*|HjO5?uc?=1JOjAHX;_B7jV!Osw`-LM{!x%@18lq2+E2she+39fb2J_a&ged?!5LoQty{z)bTxyqz{-P4xYlZ0jrbg%!;<)o%kmZZ@uSj(R1;w?f0+lv76Qne^U)3 zaj~L`Mz7i4pGc4}Sx~=)1{Hovkc6cdx>#CX&?vB~jjy9g_z9>-+elvFTjY{k>RofU z;#I$7nBx(l$9%yRSd^?5{RWygy(~R%6~|OZ>!MKf37W(&KO#VHnrE~a@X?oyHWppj zg*fpaH`+(Ii`ZhKXnCuIoOnTYw6t=Ly`zS<{XTeRH9(K#P3{*kJRmsv96^^uequM3 zIl%DQC10pG&;q2a!EFVB@@?nIp*%zaOD~v=&~3&Glz}HheFbg9K6v5{Vx4yi7?pwH#!UY!7#=>D1v8F=tY8Jzk5L#ZB zUkeU`OogL#QGp)M3^eE~7DtdV$L{Uho^M_m@^ruCb&u|JsMQtv5;K;Yr5+>W$JBCI zFrp#o-#NXqwtL} z3-6CBm7-T3+t8Z8&K8^uH+fOdE(OC^ZJ%%1F5!x~bw7pW+*sbht(_>_%V6l6l+~(6 zo$}`|(bpL)Mpe<86*5~ar_A%Vr`TgIm&oOv_YR-R|T{OdZ(2o@ZT^QI9v82;W(7Hd z1fDwX8nB+ch=_6C2hq>UqnNFX%OWJ|k9>97PM(h+J~u1L9>1uT8|ekFezY+ zL1_c0Tq15{r*~V}o5K5I;AMu3$+Fg$kYU1wz{ZS@j_sYOUT|)qY!+yf;KWQ39$Ian z0Xt-Q$#3<#sJO&o@)G-N!jSqw9>y$X7U+K_aK-<>Cvg8Bj{iLzQ?;@GGl%2<5~or- z2bJVA0Q|GE@wduH_3Qpo`KS^fRpq0SeAK{{>hVzxK5ECHj`{xnD%2o=YUEMTy~1#J zD#J&O1gK0N*&Tt=1d+qtsSFru5gDx5b+gd7neg+z#dJv9i$7E%Ka2-ZJqkC?Rwp(1QqJ&?JqL8^0ypz3>A z$Y5a>5lfZm5cOGmM-T`(YY(Fd`TF%}j|}c1gXge#BKC-gEj+^G=kVk#{N5b(C6K)= ze9s&Np9SgJpuT@%BWt2!F6$`kXd~;WV&kX~azs_<$&iUT$OIWe4dY_x<|Z}}JydrP z0_wqodLY;yJeF$R?-5)7KBy;7dZRO(*7v6J%oS+{Q%D(Zt3P zHJrqg>+$4P{2pQte?{@zUK&nZ-w+6{e9AdfD8_j{pav|WIP$Pho`c4 zbCA8czgyY^f(&B!@Yp>F^#`NI{nV*KeSIsn!L3Idt$#O}`n``JNA-}2BgjNOB$j$m zH9sm5I9HFy9+CaCvM?)08(=I34+d{k6#Dnz{d*t?>>vm`*g8nH{Em+B2x{C*JgO&F z)FU8A2uL9{fFx3lz6t76e`0t&G4`kejF^KUh!t~tvDCi<1cDraAcY_Zl~(bu0E6Zr zpsb3ltk^6S45mT_K@5+DRMb;lLH|9x{~p92GKjz)fv`v6conQBh&tiH;=xq(uR;aX zI?v;6iF}3dNAavE(d&DxTOHOT9)_ z{Qbf1co6jx^Cwc3Mo>5r0TXZaVfRS+zQ^tEa*E{cg~DLx`J+0aW*U~hbM&JXYe(& z5gA$>*oisNZ^=)S)ChMj{Qc$T+tt6$p=A6c+%bhZrW_uAKjBHMBbT@y-XiWWuxw@t z%1|p41Z-T*mORTAsXlu4#Gd2qoaRX5Y^Mnv!#evb(D#tODcq=v*cUOvl*xEo#7ZaX zbN`idr4dKf-mk;f5a%Fq&wA`v7@itD7fgIoKPhfHiIC>HzHy!)=D$;BzZuKDydxIG z_K{yKQ7IlJin%+YQIo+|{*B8IDzc0Ag%*MGsp6@+h~Xxghx+ZQm{&M$j}5OrY6E!5 zmm8{_=YlSukN|Kxgy0Gw06W`g_>WKS_OL{}V99i#jdPBQIj-)8(57)Q=CA5Wt_o`j zTpeJOknkF(_@W+s({7ESAus8DV||&70&F+$nqayI#?^4#17yL>2e-Rz^?1JM;?Vt# z;D9fm;0>(l-`UETE6*N#H!{>U6YGf6aPM4Hwa1%+sN(2F)2?O*L>1|-kxX!E`IWi` zz1GQu+5taiSh+HnuWt_0(=gxZ*?9ythT8gCK$pR#fA^|T=}$ZRu?yaWoXA~J^8lDw zcyPz-g-1Tl&Lj;NeeV8vn``-s=|YSpy9PD$bVFZO?-jCfwfk=RVXM9vvy@2eA8WpSN3oC>`ULfMr(EYtZh^^zXjcYHHqL?|)gMoSST3S& zZ6&*YK<)58pKYXLbeQvALk53SvAcD%SZZH0^Fz$tq!;Yo2R96P&)eO7#;CPk@a&KI ztEt;5U(Nfkn_d6qzz>Yq7vC3Iy_w}sLo<@B(E`YjXrQ%^xht&*G^60RHy3WxoT4*W zCusw>9jO@%)vRm`h!6RMD`u08Jib%3!7ZNIg6#s6mWw5`jR3S&TJsYid3|cs7z(W?SAG`?8b>v4j=#AY&&eGqL#k2q zZH~Fl#U%5mPxs%NyB!!*PaMNyHOS6UCJurh%v>ge@^ad&>KjXqFaOALK+x` zYuP%#jw%m9W~lSN$Ohj!Z#!%9$l-PvVk4tOk8Bo+PQFv8K1L+qh7a4dIm>Ka8kX$O zEcnQ$hhqBT8pPobi!wAK8{IA#&e9DHXjAg`B`MSPuP&Ck!27LUV?C3fg_l(S60!9O zv~g$&4eM;-ahLSpbx<)}@P7>x2!sf|x<}E7e*Sr_PS)R)GUVS;2isQ&cDtE7XB{}_ z3B$kRVqcQ~9KQ8TB@&n3$tbO*+Zkq zur;$g+got8$DALE6CVFm+y{M~@-bAg95nrF{CtymTeW$$vYbWjYSe|#wMxzlJE};`t{FzXN99hBfm?TjPdTImyg4%_KH$=E;WXXn_f_lXP*8?T)Fk$y$G}YZ;-mkfRWsJHH8F@0rr+ z7f+}D1L4Z%(FcE?Hr*QBzjQri_355E%<7jPHDlQ0IHkL+Lm`iFm#A#(S1A$8IwR!i z5ff<=MX+m}V_Ec~6&Jl1zz|z5-a56w?OR7@I+Oo&X)UJiFu=-k0DTpkI_i6-%KPw* zRaauD_VSBs4KrijZF92g(^fg4nP^EQ+EjWkyMiXSfvMzUP17d#(Z|{F9B{Gsx|;4- zq!Hh5`@i04?@2I}32`cW@eg@)u{Jyjk)k}ir7qyeMM7El`4Tr|j`tN)z7Gp1im=qx zE~#_IoJ=Px82qU?Jh!Cq(0|1+-_CO`KjwA)FP*;oTIY6tUHfarfPeF^t~R-(hvq`9 z``Wb7>|hU)%T!Utpr^QO_M%K(bh`Y z*QtJlsrr0F*IVhf6`I5qpp@NHSwl0#fI7V>qy;i%=%br2nZ^+>)yZwNpmDi!N;p^5 zyprHS_CiT>Bg$b~Ca%1fkscyQt;Xsr7U4M7C|QhA4j3Ah+5xrI_b+AiqxZd+z$MSG>PMBP&^BqtV&)%kaYaGr9OuXnVaImiq z57V;ckH=8+n0OVrhtvG*2kgo{HO}|9=Q32w)w_y7e%EMG%NYza)xirl(uJb) zjUlzU*R~`lx@GlT?UQaebaavJMxy|}7mFm2t)Jn#X*ZtQ3-}q?1V!)|(~A1OfMxLT zumM8Dker@8rsZz3!N#0V&RJi4qvx4s;yV z)AX1k|46#Q7JgL&NjP=M7f|i^h}K-Ns4w;MB50eQee!_&;Cb_{yS{>rB@9H>^tBiK zzi!D>dZOM(+v*}I zaVb|V#`9@LurU8MUt{g0p7-MgF9a$3z&B{dqeybCsIJKyGd62*ceXkZ3Hu)9&52UZ$GlmH|3%Al9WQ9$=Al4cZIgu3yTz)Nr?-tOy#k6Z zEF^YguvJMWglPgV(4ESb?rxh|_@P;9W!{|ut}hGV4#pdtWb3Bv%d0V5x-p2jjCidt zwU_z%3QioZf08E0h&JmroP|p&r$mQ_>-XCe=tj8`o7FCMH2?Y>^-Epc9~=L|CNIm4 z^9aQMn#Qi=iio7WcxPzo1ti#@+M>fuzf0&S05aER-K{dj(tMNW_H64yzc zXl`*$pBy^9DA^p8{nAw6a+eacLEW80EOzVF~`f_6`QM#=?hf3Cq;>PaRZ46KUiC|tKboUwinRpn`~Ae zigR*AUeq!Ksw09W%-`evA_15)PHvm6?s5(6b61<+)!b=^#ficyZOtKUNs@huCP*to z9cVG-CYTX0HMTf8UJ(D?Upg(ICN55--v?c8ZJTt@6QiY!Ol;W}km)L}`>TRyv|4lH2ET%lo!;Kl$Y_X35l`y%aI>a45C`9=b-stF%- z?t^`()IC&C2dp|ht|44w;v3&mjn}>JIy$SQ`mq)(=$uKdO5(!B4j=hsh*&L3HpLJz zu`hWhgVf(V%(z(NO`AWz?9COVdHuz{^2V3aqVX2ph2oYajkFiiY=sGQqX>1LGU{D0 zxyK6P`Lhgx!U1}W$*4yO)=ANHF-P0TKHwQC{Qkob(D$%Gv#$pA&qYd`&v_!& z&g=`$DXKJ}O$b3c9Ny2r9AAjN?d)oS@me9H=JEgxw#Cy7o-Mw84 ze>NKMkXs97OeFJa?LB7N+z{D~Wu1Hc)yOI;ewMCu*((e%hApSd!jJ2cXVNMr=j1Igg6AS*? zbk3_U#CE33-`8XBh~kCmCA(Gek8GZ_L}P+S%-w9sn27^36G^9LD}m%E79Ogt=rDRG4XX8oKA6`fAgrt1B^c|s(U*R*!Yofjx@6F;&}*5SLlJC93zF1;SA z5UIwynwWUAmnwWg3-XpS?_7%g#8;9%I6-(-YUkiK3WxIUW^_)9^cc|acAa$=Z>b@( zV(FbEB14O9ri6NR{pn;2&p#CExyudYN}?_IYjVda8Sn7{(r_&nd9QWrw`2ML08K!$zwQ}g`Z|TPVZBaDDYd(S zK`q5;zyhf{0|;K*#h}M=yAW$3^Aj%T6DVV#KWUGaOtJ z?zlAGA|)l^@U7h_5Y|*eQY4~YBliM6+o}FzBRzy2|2y>5c2gUA!qk1KwqJ*O;!@UL zjG{@oBO%jy>cjL&5>m+EiY=MO(^?HDnSXuoIUEq{gl&(f{CBl;5cD27jnA-XK#VEW;KS<*vHYUD< zMKIHLckmJA$7fj7_E>H%ZYDdu(2;gKW&uhEVNt$ND&ugJrpvE0DxO;?ri7_O0$s+9ULrcIoM3(6gBGcD-M3|NW|sT6eD z36McnHac>)fyYfbcQ%?7^Vre9C(OGWS7+pc;dGNm?3kh&XweSk^=&!U8c#J;m zaN-Fwl7`~xw{Qk@%(mhzn~1dy^ux`+2-Esdy5?-M4kN)rq|PPbNNgx31~zaFK<}oD z(K{Mr!YV-Maw>5n?R<<7BpPdcYo(evQ)z+?KGg56nv%>6O2RPu|Hh`+2$~T|&^U7s zyC->kD9g9p>oUMH4Onuei!u^wLj=t9@vSH41JlPa1A{C|CF=w-u`hA-?;9uae63E_ z;@Z(h*V_C|DAd&ai%N_b(5u34!f8`WC%vT7PlCo0v>-a6d#KSw=WNWT89^D0(kbhd zbiSql)e|ueZkZS$;H&1OwDHJlqq2c>NM25lR#LIq7Yr{|I@4?m)a6ek2jjh+{zBB zmLc0fPO{<{RptobkSd;NT-)ePEwY31^Y=Pvjl;7jS|KKR-k?Ojso(7gc-r3IHkb_2 zmh-&&(i-2~@uP- ztq|*aF?Kuc*Kq#pyBl4jSM5p3#*+cQO~S}+o8+=J?S{&ZTE(oIB0E647y6ngE>Tm- zwh|Su=x)Y#?DuVl{zefoTiFF#KTOfoX>XQXnk#eY+P+b{!Zj?2WZU{y9(2xrCs}Nw zO42gR+SnzEY^EsEOfKj@pB$sf0FV6kIDfO8LCX;m|MH<3>umqSZvejCNzk^mqFM|%*N{{NKAp4=0R(uFs3J=geimv>{F7$7DW`oDMWgs6)0SYv2TecY~X{F0}-GW~39BIBYLk`rssoav_L>i6b@AA7Ji9$|vE4l3GLVd$z^J-b5 zquhuf5Nt|fU`YU6TJkM=tYo=>MjFa!hLRUqCZPsWqcOQiA+`c$nQG~pa1gVV%#>H= zIN7f0gbX{>93=rtiK@7S4>B%sk=%?FlWH1(03fiHG2@aYQL6Gs6iFiJQW63*ifnfq z;N($Qb)A)`=G%2F>W!_bX{ zPcvq88v>lek$R0QZ*Bt3cSyKL)_oLO-ooQo9>SDqT5y01d5BPRg2o`}?IF-SWlU@q z5~jFIXJnaXIEi`@S#E2Zks+7Ps?`+R|B!5B7y%b20u=k*29hD?{aHSsr3Qj8F|~x2m470LG9Grs}IAQR*Zm*4PJ$#3tZb%EH*Q7+LN| zS01}jTLIgY-90F&Um~i!cAApWI;$zzyX9>phOe!#Y)Fh#;UpuoN3+z+ass326p6qbxmM~sb=hbZI{X{FXmFeZkU=yk7qu_v+WbvA2^ z3r}KNxdE6h__YY`uF5vlKK~MT|2}#VO=8s<9sWtPj>%<^{A_mI!3}p~zk{pZ5JkMH z#FW7uyG>^5D>}4-||e>_ahRN zvo96K5)hK8PKE+)1)uO6tIBiWGXQfS(KvZ zDOc)J8i|j8rgIaK8bp?E{~6sphZn8!;7vzn8j@dP0~#7_3@m=xAD3Xf8Vs$ckL$tq zdJ?A=`)tWbwu-2;i3AcD8=Eoq?&DcO1F&>w&P+c+H^ARpY%ST_;QAJ~yM<>xfwcEM zZbJ%7L4p;XYzib-p%PZ+4Hqi?q@pez!yOqSPThjPd>+P_lJBA)}LBT?-V8FNLUKGG}Ive|2HmO}wtz&8@Vv zx6b|^@4`1-I?g(*vkgnyawDol2NnF~S48`jO4uaN>TpYr&G=8A4r^|<-}M~qZ4+2N z@u^5+Uv@oIHT)-riHZDEjd$^m{Oh{7do1OHA6LnqNcoWJV<(Av5~Z>~vKzV$0GCh! zEsEFxP;i$V$rC%nzXr6wa3Z(GNVBLrjR~;835*&I3_DBNBatJgW>YT@a={`2C-*49 zk_x^K#F7Xs{}Qgrr?_B%7X+v0VU!#6xp1-*nJU6VBaJZ$L7$7e^twWun3AKa!kZzD zHenvbkU?sj4(^%0bvnV5nvN0ynv(jm%^8Yl$`y7|AQgna90VwbTOVIxm9ycY>0>p! zISmadoO;POF4>kgB%M8zw71!=r>ZL&p^OYnl!$^AF%dpTYD8axw3N{u(I6-`gp&1J zuF=psBRM1z6B0s18Gu_LU4s&EYeE6UK2bXe027VUi5pNvGI{|t1mYe}M8>ri>>DdVK3bx`fv^24ix-u1#DH{-KG#Tm(=?%r0I?{N znFUI)4T+8}8JoP2H3`Z}a&(;S_{mAL0OE+2KtdgFnHUSem!`Tfv_iHTxgbhGAf8YU zxey^?=_8ggh!R;B%t9bGggUbDA<}A)uOzV}f(@+Fjj5Q<`y|kKxhv5yuEi)F?+~Js zs0~y^8Tt~Iriv%XEXtM=#+azkX(FIhTTGh7k`Prg2x>$vUp%AD$ zsKeQ#{o(%{_@p`5sL&ydQG_w02w~9Nnhg2utojVnAhWH^s?kx4(!b!G1zHYddASh+ zkm~D^(YX!^k-pO~!%geN#iUJ8c$2Z2Fl#%!IRp@y)3>BsOlZN2V*$Y&vw%8{4WkjS zhNwF{gwwI<8@bxJu{apgWXeJnQjhaC?jRoe95V~hj!OI{j$#s7vO|UvFJV)RLfzC6 zl|X>eNK@smMnp%3DhV{rF@qryP{^o?Sf=a%824<`gdsRLG#@ZjQ)0nG((FI`5LLbO zHVsA7;cBY_X+1~;xX@^?Ry&XHSth4~OvR{E%R)a56Gb&)DaM(!ZNWKyf=s!>QEB@! ztP=kXcX6UK>B(K|F0-4H*W8QB@T7s!K;Li))JQlNI+J7p4|MY`*cgZ_l)`3W#ioED zZmq)P0Z?)5= zh&G7L))ecBqsb@m*g$dfqKj0Bt!g-fy-12Z7QrFOaD@={I#rIC3VnIK?-anuOTPy_ z5X{h-aA8ZFi_0hkPdud(e$5ehvbgQERCd~#o!Ur_q)FIFk)YU0uhKWD;f!iwjsg^x z?Q}wA-7-1(Ct8t?i4j+j;u5SC*B-MJ9Gg*@D!#rtiL_7%qgmNq{MQBHAxeQdH}n6o z^n^Oc6&4FBKP)V%V2M5f{V=~V8p=H;LY=m6I@n^|j~Icb=?IF!*$(GOIB7EvH~EN% zERfxzyWKS!%FW zsxOHOL{dktD!L|Vti`BZ%o&O4U=y(iQUS;<mHBTTF?6UGCmQ)AlZ>qbUuz-5UP>1tR=%+`2OX!KCW zT=wIwJ;8O!BG&+cRx3T1&6r$aACqiFfF2kxOcn(MxKB(L0R@x+3M5x0l-7B-n0Dzr zu4PoE!rLg#1~h4#n2$+um_>Fa@rfrY{M1O?Jm`FzPb7$={%IKr5}VFv)2xh(7*Uo< zm___w=S-B+38Tk&(5X8J?4sXuI<2oHB5*E_glOvW`9NoZhzR++NJ*D-@lX!M8*?TsZ^^B~a`wPPAYI=zoG*X}9=AQ;Zl;gTR;s_-Hh3AERvy(!T$Cx6a8Bx;c zlk&zKU#1~5;x4=Sp61aB#@fYKN+gNCFZBcz#Jnle@y-cRm^ZTk%&HV ey@ymUE~ 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

4xCh4H+O+*>4icDZ0v_T-FS9}uzyBKT` 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

mG2`i^thx1`Lb;ODoWvK75kz-FJqj17 zfwJ=u!8}Y0Inh428VE6a=*e8<24)0$o4JjkPC%PK4YiOc(Ly zF5g>ld<7y==@!eMC%JHQ?E9ClxK$wc^Bhhj{5-@kz=UT!@gZLplD!z%GzDTDTjEQ_ z@}<}_Loz^O*+T!_g*;1C5IM0!7yy!>t+%|-Q%F8VWo2$jPQ6>c>}}vPK~KSF%(6SpoUL=+R*FW; z;YhQdF=Q;ywTR2kyDBS1rRVGF#4^Qw${B-#HQHwEA&2^!Wwopkj1(6lU=}8wZCV}z zA;w=C`Q&ApQe-sMdCyo998A)TK%MB&HjnmGIA~4fMSB@*4iH=`*UGz0l;P2I!N9%iV0L)kpycl^Tag3c=J@)#4MB6DNS;~w;r9adm^nt z)#Wgvo{9gkI7_D#cW972xo;OTXY-^PpP%ZKaC__}J;W_m0P}FL_S*va2I9A|f@F?h zg@T#(IK}39o{%rbGl_mSUqqMZ#T*3Soaqk2d82N;u$$TD3=+dV!yAKTIy&*et#wQ& z5qsB5(Z$lab%KRt7;(nvFu}M^qDd07+}k?zo=I#R#h;^yqCXw@fY_C$v>KZeCRfU6 zg)d`(bflak@i}BKO_Lm<3+clGTC3erympAYhE8rv4_FIwNSpzzHg;_g9D_2CzYAK+ zFB!>|kgT-Dw;ehjx%5U)%c(=lZ!uTmhyyHw=bUX;&!*G&OWbZ(r@5KmQO|Xw#2JDo z3WWb9Hv+Iv>Tc}Xt#S4kX%S8;k5`w&-Szqgedeb-f%|ccK)fc**7L4sGA(&PTi!dm zWOF^LAU6oQ0L9mXkbxcWKqew|w2SbPkXnKo#dlX!WlqN-wxlC=P|DVG*N+iR?Kh4R zfqxaDO2v0}p#mxrvMgnzC0my$fk`+=q&#? zSwSWu>Jt z>!Cy?QWauGh6!;V^THGaQ+rLLhH^19vb05*V;F$MD`eOvo&iX9v{{z{hcPk}E0bte zB~rsRh+jxBoWzE1vJp;EZH%{cF?5)QmWW1CVJmU9iI;Rm7*|SiauU4wdcT+! zP$M3?L5a}#Ew?BtHxd#WFbKMk2P1$0c`yh^K@GjL6k>rG-vC{FAx4&iO;uqabL1t5 z1vY^3VN&B<260S*C13dCIWJLPYeZ7ng%M(iJsv|oH6n&VK_lzvLtr5jwv+!?V#bK{ zC=)K`OM9_D1>ugN!)e|TiAZ870SS32#5pQrAd@9V)zL+Rp(C?(Ll(IuG1EMp<6@I@ zS=vIA^C6PuA&)k3BU5pcJoGq(hZsvCkT>`z??_@6<1!a{5vV0bf(21Y#*cfkj}I9Z zxdiUK4P_Du_T2NnG?BWP@|%C)?#}p z!V^pZ7(FFoS=1;InOXA3cV>lU!evnINLw?Kd0j(4j+q+|(o2@nGD2pcSrnoa$6-i# z8T*wkDA-jY*(0C;VngnSq6oiaYR?_!;|b4pbdH# z(StOJOA{O|VAWh*w1w<8O zxH3!1D}9<^Y_=7Gv#5hKVQdi_s->IKcoCjLhr>jYa}z4zHXU{fE})gFjChlL`4y_e zW`lYc1V)Ar>PdW=Z){;Lf&)G&2NnO>K8gpStYaYG09s3hn@ZJ3egs6CxvcXsJT&24 zZg`Xb$(N!P6lhhbgT+~lsYW#>s09;{vHv5gA7qh4f&+P=6c$BcK~rC<0(t0nSetTK zTM-g6p(C>CHf^dP8}LLL+vJN`I3QVKpg^ssV+7&;=Q2wSQn zavAT%t=0M%>e8eSJ2|YRPNy16lDel{L3Czy5brc7&LWiZ1C@*=t)-ez)a5{0CL>|h z7v6$bKD02M!%Lfbl(7;~6C+LHVX-| zwpVpYpWC}-6G47^Qm^ZU41-sTSQ@l7Pk)DSzR?x)#Cs93OiXinp5YM#1a6DAO*Y6H z+0!n`s=kJ^Oi@ut;gxtk1bYZ1bQEM)e}@__MHt>&S5TzAt%oEaXLMxNLzhbu+1q&+ zF_kVyG1HYEq7qVV#J$lWzJ!60=exf^u`MK_9vn=+2j&z}v%6GTR`K>-KxArpnKKGw z6=>Ufn`AcrroeW^z>#6Y)&EOo&gN7H)`F`7g0!)8in4Zg#lyZ)9S>|Zou$5v)};Of zRz6Hy?F)N`c`kqS9!&VPc)?;q5}CC*!q>rul1apzVkWTHd11S5jP?=Y*>EZh9Do`b zq4Xu#!*cP)CL0j4SvfCW@ve#Y{MNVr-aETgZVkdMdbR5@8n7 z+7m;}ZgQm?9H@Y55*o7-g3d8es?sE=2g55kP(7g|ofFDSm?w-uah{B06&tD2A(?We z4z_+WLZZRx6!YrB`QC3UgUu|vkCu@(^hV6?yU~;*?#wl4s ztAA-3yfM(wx+>p=#bOmhE)kicp&<%XG+_*wW=PW>jHWrGDeDExKx8IXLeaFVGxIYh zp)rHB6Nr^Z0JsH&=|x~@Q(Xi&D~Ur=sr)TH!9cR3ks-i6TMD?HY0iPt^+Iqv^jdo zHKw8|=?JNO6f(-Fe>jQUNsCYkbt*9g8B}4kvNYYbv@Ae67d-3SvR=Pvc1ViwKnq3*e_Y+3Dgs|MwdDC&_Ct*7i2}RcfA&g1pRlzc<8^!MUKjXy3 za;|~KiBl-?NJDf|!9rnljuCJZEbOR16O}h`YDsN>jnJK1}L2f@I zcS(LN=$1a`6?Rouico>Xn8~_zVI+ncSw+?59Vnz-DJJRQ!klekM`R8hfo_rz%!$Us zL?davjy~#D6veDa?81~MCQAST3O=faDjLEY5{pIYGAxcY(7iMlk}DgcAkCoY7jcH zdYLLWA{Ufr9MnUU3|VUuq?Iw_Yl0DwUUEzX5nsI0Js-puTXam+%ax@;a~l~;Fy`+b z%R~u_7TlglolGnNjO(gr;7W~CR_z_RG_j@Q?baR@4U1=N@i67#Z~~7SDAE$0`aov>^i$)icGnkY{)c9a&XAfSrPySzVWcO=-EHsnod4PN zLeXI^M-YAG_BH%ANULHk*j_kv@!Dlm5&W+%DUstFMY{>8; zNQVx-ZQM9Aqr-y`4LI1)@}R=gRnh2byJvfi% zN}@EwMh?di!Agi39sC}s-LF>0A*`Rr&R9KnvOwe4%(&AbsE@zZ7jMrX=h#cHJL(wv z<~*6U%FM9l`ity8`WO>1s)Xh#YC426f)F}~GOWrk>mV8kfq4K-sQ)J9AUZLjyj}y# zwU+)fO0(HK49~Bs#0zf094Ry_qp)OxZNlbAOm8{3AiImg>B@^JEDwR?C`GES+e}H% z3`p=Y=w^G1Bk_g;GARN%A}mFsDuS@L5HcEyDhEbuYfLL0y74hMQ;cYX>)5N3ttXMY z$pJp&>{GES8zPg!#Dtp5p)`f!Qz9g*qzX~ir0gwCHRbv!t;)ocbS1l3B5}Pt4cOqa z${5S^&Ql?+(N4|0{7uz}ike_WH0PPgMV7GCQ&M3q71gOU$)sum_@*2zR!%b)7%zR%3 ztkv7*H3}4W2i`SAdSj9dr7C-4^)i9ZGN8rECIZvF$IP_&8$V zq`v#Qm}8QqB=u64a%zoKtmuq4CWnJWePwXC|6^3cVV5|~e;XL@icwJ{Sb1Pu5U^qRcJ>-KODTu%v2ptGs zPJ`2vp#t$l5z#C}Cmw{ELV^QBq7gBI5K)NBj+Pn#vQThLOkM{GG8dW*jR6!HR~Pw% zMLcy6a+HG92Qhd(4yI*>PH~yv-e|M2W$P&$TL0k=CDkz)QUp#LSr^WFbVF2mk&UyV zoO^;eBviHQJ75Xm8Li?$SGmwGegg>vJ2}A-5vwA9tCH#vFsJYM1WW}R$ltJdl~HoZ z0S3d`CVjIgm#waJqI#EM_H#W~5vZ2C>(w{tgpyqL%!aK@iz-8uAkjz@Bv`o#HU0Lv zhrAGvFagZ|PKixVMr<=J(PWjrL9(B@@*86*80;v?p1vuJnyREoe@Y}Ub%IlqsUpZb z7qv!%vFACjhnA0u>rjSCSJfFj3}^=ERy)g+Mx} zLkbW-a#9dn5-}qsNK6XTugbVYK?5o2c>lP>xnW&KU^!}Obb2#^)x>l$p(~s4Se2BS zwhttR1BFZ(GbPt0rB@U>9YR49mJO_HswWjHXuR1~Siw^_HqqihWXhCdR*0kvAqPa(-BpZ5FI?~z5?D~XP3OR;(Tsl>+q7zqnflrwMvrBk%8dk+1ZmnC9 z7jGtdp19a-VpS2Cy9!bm0)nk~MlDPlJxZd{%;v8akQmN})YXQzq%K^vS)1DTs3Fz$ zAVV4)-AD_amQ}=?`K-!Cyz<)x?KW|ILQl#dL%rO7XI3o%N;nAcy{51;S0>$FORy%q zRT?Kl2O%m#oCULta%GjIi_9O}<^MaL7@&9ReacmiClF8#iJ1n0k4{Ut(^ImFHGr({ zStxm122~|ge7VeZ#v>Q>6cwGGnHy1C(x1^7id*seh)6p*G@XK^s0Q|l-A+>9_&o%s z`mG3v`ZJ`kpd~l;9SBS<>JtY4H8R>;Wl}C5 z`If%T2Eh8{kC*MmWV`U_GFk);1C{z`AX3b>xdgEfF&WJ^pV@9K(K1Tv64p>nB*2Ps zPLt8=mh1S}Z*Hz~&WeW;gXGQ10S^xJZoNF-W?9OHKPE4QF0EFG{7jWprWQ_`m>am& z`hcHyr2y5Jvyv_Oa&$|Isc9`fE3Y{+quCkwt|K0b28%>oHRK;PLbb&Ws3_#j6@e%4 zC%~AJV?`BB8Er!DHgZs_4)d~G8FJ@Af>0o#7EeY)bd_P{4WZe#RNhD&GuE2hzypuj zy8BYkl1=xj3^-l4OS{`Y{o8eI@yKcza^G}^b5oP0=u`9EZhO~{;S%RIbr4fj(h&yH z{Y!EDOyb0pr`ujI2aHw$b(kRL@8L3H_`4dSbe7l*A@BxFn!#O*@LYa9N$Fma+e+5 z1(e>qKdE!p0lV(DSE;h^$}m^=&DyhQbm}}w>oz-G<*f{#m3(I2N&e7u*y47UBpxF; zt9nefy&c2zRP{6(J><36sLYQ&QBe8@TaMC`7g9<0if0vk?#_0jO*Hh9dOVbvBVXIY z_4D?Hrm?yX`IIZZd>Qemr1C|1=4npxX-t)n{%8HL^@PXTr;^{xM*a{59Cf8>2x{mx zYVGZ6I^rrGny^|cJXK9x+)a`7ijhE}jzp;v`0JL=L8bpoLOy`uE#M=SXz9Po*beBb z32u^^d|^8svahzNK(i<#h=D)6s|ka0i44gL4x9@q*^=gi3Luj^^#PKRT9gm03Y$@+ z8A}`a6Q5^W6!I{N&oL;6FpbReA8W&u=QE-qq>|UU93}*kNI|>;Y(b~Eny2dxi&3PK zdx^-IoV{VA?D&f-a*Ha_4wfmMbD4nu=#4(w2+`Xfh48gb;X%auAIOUw9&rh*fW!6k zvvc8=ni{h*Jvbx1;B*g>jw*s^zo9HS} zLB(FIMu7mQVyr0!9HY+?M~FF?J*geiBgU$kI?$54R*bJ~aYk`uMyU&%cf*<4=*Cp6 zI%#}25aOJLvq0&oJ2J95uvwhem=2dg0Kv*8esQ6r5Qy(+p_zLndTKOz!AODF!@3J3 zD#D&c+cbRBI-_Bo7J3p>(jPecjS!?ru!tUr&?1yfk(vCM$w?LS+oAq}F9rNJyP&>| z3`3Rt3KC06JW&u)DIlc7rWPW{&XB`MEWZDVgc&r$pmf`p;<-tylSn#yL$i3LXDrHH zLM*bpvY?E}eiI;>jKpK&Cmmvdr36He0W5lnNOWqZ!+8ri+yEAW!aEEWNP3y|6O0-X zC5!xtOJNPg%sZCYxwS-#u3{Zj43o?370T>Cn8C?*(XxnmFvNJA$6S=d%puykI+ZCn zg7BDu1F~SDxV_{Xl^dJKJPH*PjBps6dO0(aK+44Q%%};?M-d|7Ah2@+H#(_2-4qSi zgf4(8%~l~jG;@`$z{r4M9hV4|p|cJa(n^|;Ff3z@wv;*DTpibRx-d~S)LhB37>`X` zs!Nhh>N&Ao(V{FaE~cUw}NuR0bI$)YL&Js zF8YC?FC!!CP|)3BqL9=d2Q>>f8Vw;a6bp;QocYcKRXHkJ&c0X;B8yBdI-}MAED0kC z2t|%80*#BjP8EVXIZF`>eI?bHI*2&X^c2Q))6lWesrrK#u!so|6)W0F2(0O<-txw` zP$t{7m!g0{=={(#nv09bO}0EB4QtRgAv^Ju!UWl^&`>6%5e%q6Ht6%6+vBK?q@IMZ zp)^#lf?yBt&_VQoz7jc(rSPMj(~+8*Wk6eo3n-+?3b zTZ!A+8LH8dh0V-d0jvLxr3t$j3$v4`AK_O=!3+;fvc5HOcrb)e z8Y1(Qs)$?Th!h}vxVaFDaG;@wxusko01%+T6hw&i#N5Bw)9}jMrdyuVom_wcp<8+? zr+pH>ow|#lK_Il7z_kE)^|04mr*@jVvn`%=OSC-HPRA7tc5J<15?zIGThO?r%T1ua z4JX%C3mhE?cw&_g0D>FP035i1_0<6MWnc6Kg7$@94FG}F&& zR?3JK@FcR(WQ_mG0tpX867rDR{ZP3QgOzYJupmts)^*@q(U27EHU3Q)@-@&zSATLKX(ZjCE3$RKa}wPg!M&1`fXO?2VmOPza_H zKc#U8f-g#!I7|Lvw}gkz zTNpXrCRr04lcUn&|1cwN1XD<}s$`^%di!CgU5ZhW1ro9zY7|GQw9$Cesv?eQeKN zQWpOzj44;<>W2}c$3SJHAS;;EznPiKsiwq>;wh{qhz3HbfwZsjdW?T*LAwwQZ=Dyf zC~JHp7^G0%8hn^FYFGUuYpG^jb-F6Qt{CY2+NdH+!N#;aOPi{@lEp?nyH+I1i4<(o z5KIefhfw3!{N-1XL0M)dRrF$|#sLkeh8@rY*nVw2nC;j8VyA{*Ov+Q^*clfTq$tkE z-O7!?M2ydFnTR@V^?NVmx!IDi%9bH2S<0WKNt6gpo|-y5^uZpdi^E1;(caco^qFP1 zNzv$LUYr>^6{C~#iA?GF9HfF>ySTAnOwr?x9bN656k1V|7{3j=G43YsF&zx2ZE63_ zT2cI-rQ`W;>;~E_y>5tm9qq;+Bb2S7cA~2&G6PU*Ev5!O5QS+Fg%B5k5C?G*7X@ly z?HiB?%?UR#WyTsQ;Xwh6#QSkRtN0-p$BfM6rxe-cxj3W&I~;xDZC3QN z+bd+yt+hXNhczi8xe>u zuT^7NuUTH)yJTkaT9(1k&tMrT2OksqaS18Hsj$ct+bZ*03pb~OA24sCKG#eP_8yssq9xioQb$sl9(rG{z10NAGOY9RGdr|liMhH01vq~2nlBxV1REzN?l zo91$j9_Nw>nuwv)3Q?+z+cIy=+V%Mw9p~^-cw!H)8umt|&9s80P&=zwP0=e_&*dU% zz7evD5G*As+iS-mha9|o-kv@ZHbizHcRd`t`Sk;~GF|15li;R~>UCTn(-MOe>g1Bl z5nYgwxNTghvpS0&@0bE50FZ&AX!oDOhM;p%HLWIJ*y{0iH*a0iN>Y0iZx#1O`(?*% zjrOHxY7m8Lc!v%M`3@lYk~jGd*nw%FhAdWJCwtPCJki%ID3ZnpaPM$d+ zu9Auko|jzrh>Z}|dLnHv%lU+W*Vl|6(v#tNv1S#ky`k6Q; zuAd$pdX=p|BhG`A!`k|4?`^gmsabcDm5X+t=c2)dW(W5(_ZYC6VkZb03lMNOEAty3 zHDGtL>Na1w-Uuz-kPNN535i2S5hj?6o8r;cI6rC^Mr@T02#0FcfN8jfcL@2=2mR0| zdD6!KKG@>*jglk_j1STIl1YkI*&E5CixfjIchTF$BhRNuq(es6hjW*`*{&gm42&TW zOB~Uz`XBubk^YE@ymJ2k z1h+rTkIyO@-0$HeuJDNYe)?{nt2zF6RT#I2|0D+p0|pQXEI9vA;06X82pS*|q9DVA z2)+?Suwlalfe0Q}G+42s0|pZqI)r#oBSixWM{0a%p`*la3=D+4I1vHEZyRphz;R>8 zv>hEfydyfaC{mjSt7-!Qf zCZUKZC?F_=9;u;6K&q4gf*>8FgdTe6MXJ;wRRKXk>C%V;g3TdR|bdYZ_128PoZtZq_F)FK6m^U;BJ3w^-P%0iG< zYJ0~P21(!J7fj8JMYb!thS=N=Gk@j!NPV~xj3lUS)QP9Gi6f5;-ZI!LK30J$9O-s& zKi!+|;bK3({;W_|PQRB2!r}#oT6Z}0EV%24SIFXPrr$7}1vS3uuEKDY+TmU_bxK?= zh_$b|`K1lsg^3;M2!9;re6Gvz^J|FNgX>Q^u1;X;X6{n6JWx|U65@|yr)EY=sEk{^ zj^^4US);SLGV6#t<4j4{OHGw#*$P*sl$2}QV^#AHr)9?OT9!l58IyRni}lYpU*bIa zXfq!aZ0_ql0&k|$_4xYli&YUuS4`jA;*U^y%W24DR=G_k-QWj{QC5T=d!i!S>(uaZ*wGl<9aIl z52+-Fr98#bOS(pnFr(W(HERaGV01B8uPC!?ywN~K$F-I^8Cs*|PoSwbKgX-~;G7~7 zyozkBadZ)x!&H0?`sC*2ZIP8n(^qMOQDd@a_ z`$Y$L*gC`}+`6$R#>cIlH z)rzmQ;vU~7zI$e#)=8Y)MaA}qm0CWiQs?fm4di1i18={2vczDF=8Zw}sMm@ckjG?G zZ)V%@6hoKzfU-0ZYR7l4vZc-Ro&-SS=(vAx-C2=DTVlx<$^8dgB~qW*cF_oEM5KRw zs*BT-K^L6n&WP_yOZg6AtxvAAahN=5OyVNv-Pja(Z$YXrD5e%GP2s2hx=W2r*+1rT zU1NaW(mo6#7QajyK*r-prNLzJIf(04Ep@x&b-tqc&z{Hc^@K&?Lh-3vfQ*(K9-3mz z-_uBVen^?_rl`NL?Rr?pbaOv-NPrdr6>7Snpfo?~^?I%=R*ye(U676FCmVn@kP&I5h@ zW6NvTUbI<8fIvni;F>Rbt)7XKCW zBLF|BT#;HU)55Pyd9*Td{Px{ztK*am)C+w3_$#qB4AwOKp^XgzeulGfsEt^9pewxto|0dS(HI9M)OBn-5u5%InB1gz zxyZKLQSJCOZmyf>_J>KCgQOw3MOv7iO`s|ml~*}uWqaGhmB#MK%4@meg=Eua=a-yK zq=4p=#&Cw{FV7%>Q~9P1nUxX-H1`vp$MmECqe&yxHAF2H6E=J#`ttjlEnf88$tcil zSBdz_0;f?$>ahklDnUfwSdZGaVYgI9g2y%JTQdeZNUO%WGjB-N4l5haJT7IYy&Y57 zFmY*#a?-Cr%Tq}v+z~*`<{Cbc6kLI=9vp{V<+dpTrDr~(pUM5XgO{_H9V`|%E?a^t z-@LSFfA{JGXZK=;NyYFx;``UFM!0GWvFoZXPz&_?@pJM;w&zX;3pIhSP^E9nWJwBf9;nj21qo z?bS8PrqQ8JDZK{k&jn9SG=&0q2Y=OrM1DzxN1Q$D4tXB}oY{EX@;!sJ&`L8a*9$>^ zS}Y&;HC#sbL*iSFNR>`nZd2(&NBEa>)xn?Q$LtXyI!`Lpn1*eW-|Qvzmn^&=E*@=NPZ=HcK6!4O`LhgRdbVrjI9sChp^e4W!RWd z3@tLa=RR%054EY9InZz_1NFRRDF^nKG}V;Mz_?0^dqB|zgk^669c-LPJAFBjaKxtT zHS`cPNZLZn_~$;j4^3uVm~x^+Sv6*Ql$F>K!2E{y1dQYamTD@V}?uJb$24)4cWm}8We_s z9xAw5nW0rB9_4(KHUiDERm%?iu1b93K4`l;D*Scnsdm4zGuX6<=NmUw`D*fqrH=z( zYCUDat5bGQ)CO;rOo$0lD>Fyb%G706&7X2Tsl^+krjMvF7z4TE zhnm6JPX8Sc1$|#Vv~zjRgf6{B&5L+4zLH8f0Q<~rgPNeM1;6 zi8cQ++}~^ul^<8sQ8owCJ#l2YaMp9%Db*1JCw$qYs9xOiAGKVE&lwu5j%+mwIkrg% zuZC}|uG*~4W{rmFJFw7$mdfnmQ?8wbM$?7nq{zny!Upfh)N?NH8`=p!?#i&e0NGKb z0rNLy>s4iU!cp&)QF|nAd)>rwGi7ulfuP72-|1e~mhSIBwt6@eG8|QeqRVNs*E^WJ zizv_i^?!6RXHb!^fr`FnrxIF;-E!b$zaJTos!P+Ec@d{r*HLDzyZ`+N?sRfrH_6yV zub+dOEu#|o?$gR@+k|+Gq)@1i+PX|vI|vk*%mhPFS61xnRXjTRt2ct za5PT63vKAG${-!i@kq(OJ9I&8%(eA%x}!ryg)&;>QsZ_FT1JW8163Ua^iRkW`yRQq zzj)Cul6ai>0-9we4LWX%Kaw#|)6siRqFohghPJ)>D_AE26g$GPSiMZ%Q2y||b;^%~ zJxxY)Yas53|3$DG_`k$-@>?4n!_^6 z2Us?%*(8f|pw92UFf?_IagA>kLKq+QFsw$bv!`a@Qmi?*IJpHLsmQV}(cgJDw{LhGt!&R9pXT2t-dvb0YZ3JZZXC)*&VVUV?$j-Rn^^Ja3tgTm|d8yXek5}#b=qUUqpcW4CfKt}B1 zlGW!l-&!{|5i-Ji?Rk zhk~=9+p19MbLwQe@u_~FuSBb{NBMdfkc;YB+2vem(O#BIYB>u{_JIC}dK!x!*Bfjl z!)}t6btWQ%oSYHXA5LgA_;#uX#T8l-zGG{s)@kVEsdwmer3cZ!)i?--_G=VF$r*c9!FMfLlr2$V$G)ScjL7DdIEH59=?cWu>oz+>;dL!z@zjKE-`@Qb+57 z4))@6&)8;M_{2V@ek?d*J3EdG<<1SQ^|1CZC@T8WLt1;9ukN!Mb$)9sf};L`IfYX# zP;g4L&*RG$qFVpgHK8FbFVpGJHdEt{6iwtrMT(Q!PKj8_zSGg*4bp0(He+A3Dy-Y$ z`4+1Ow*INxO94EvD5;lCu zNzB6y{qUP-^q2AL`Mm@8b>o!7l(S@`O^Q4laZ}_wDuODY6-!V2jY-NQWi1eu@)J$^ z2m1*59IAOtYI%jLWiMl#Ug&18{zZLF(G5q;qqoAm^>J|qj(u&v3Ik7sF6xVaS5n%S zt!jwIid@c%%~Q_d;;9bl_kDZHPmUQ4LZ zB8k#?Dp^As*c;OGz>kYB4edd{a)lXrIaZ(hE$Og=nJpQ|bI2T8V>f)`mF`2|;H8wi zYb;+if z+c;`ufLd>~hch0|%)MWvtU={_srNOBEmbsrsLHCBT<6t%?ng;&=_#5+2P!h#g;Cns z{VfJmS?qa=p?uuHsF19lDY^&r{O!8O` z%GJZKqwQ6dOdMJ*a%=(jak8-Tp3w_PEx~BjBqL_=HS8aID zb(6-_ResdU`yx!fc>>+1b}{qW@>`VCF1m=!e{5Fdk!PiTA0RGiK%Rd6wz{|a_SAWA z*95uY@M%G=iV7opC%QA9Ci!RE!TTPY&;D~V*+-lHSE@?B+!$4?t;j6?_K9}0=z(`H zi}Sa7vxIQiHr4RE4*91Xz_NRoj$GS*4uzY4D%?{Ut3Q7FT82j7(@*WVxIg{_)zFGg zHo#r^A*6lcdPPB{Yrx3E+2*O`da28_o@A`CTBuQ``sPgI{YzaiogOFE;oQ{qH_B*U>9L?MRL}e;;9qYuy&f~n zL#t|6mC(?C8Z`uZ1%Bz0mMj0+LRQ&rBmto-IPtL-9{C9o-^2q<`}gnYSutOBBfukX zGUq$s`c)H`Qe*N`)iS+J{a1Ej;~u306t=Q~Q%x9KvLqgrU*j(7*P^UW3wplJdjwkP zAW)bbKFx>jKgey-UmJq0>%}!AFv-Sg9=nbhOw8A?w2aW9(K_JW9b>n2s;L9F&Y6~` z0IErY^G`Pyvy@Y;9hl}HWUiq?HPFbmoBC>tP_I7Pvo6C&k=D<1xlClB$u%7Z9&hI- z&^jcZ-9>Mc`+r+aA#@!(84~Zl6)4q)eAN0rH+o8&X|xpc`XJ3$4YaEHvFB*baRx60 z3Njff=^A&-$8!3mH}OBfEG3)}qQ1ZWz!@+-L!pW8w8(4w`0XZ_YlD8C@H1bGY|+r5 zsmimXONM*tb+pRYZEOJD(R3hMA>#oXG8J-=Bwuz)%9?5vh$d7}>w3>^ASca@uGWbz zbTp$1r*kaeGkF3PWA!44vHLcL(w?cgh)M9hC+Y3=#nz@rsxj9os~7p09>F4Y8PQ-6 zqVj#Lq*JsqK*oVMcfDhpP&Ss|D2;+yL#C)jL?vHZI)anxc2#$le4^c=_Gu9;gZ0yo z&g@SwG>dJdc!WXlvZdk(?mjmclFx{Q*fEb2xzqa9HY#_vMH?fxPo)y-H~QL`zjdVo zE$=19wN-3}`|?JAP`vpfGThNy&{~^CWCIt%&p9qB>Q~WP=^NcE*XiZj zR}8WgGum&}zj^g!hF1Gf2Qs%yC{O0j4jtq;{rNJbLTWia^p#()1mlg^s{Ep3__h7C zpCWgch3?R|eN{B7l_H^<)NQ}q6cbmveA`spNJ2&m;J+XzR|Eh662uRHg!muhZ4X5u ziG@GN9vXxq7HMyLX>TOd+n%^Z8f6dlMnS!i{8%&!g_6eQqsuWtK_~^Rw>`?9ABQEb zqR{qGm;wmxZQogr<%fXmk^G(IXb=blSAf{V`O!fTv^VjG7!(4Mk46Qd5U?O(fq;V$ z;2;PR-id?|kPs{qf+`O}LEu;f1O|blFnA;e55cq`F)ff$OeYiqfhvG|;gC)&1_`%E zBB13MJOKhhWAHEq$k`bIj|R7(!J}{l5>7zEu>=HS6oJMd@T0`9K=2qu%P0hafwU|W zf8V=|>CGR-5HN&g3?YA+fQ1l7Ap|s}cNEf#h6EAI=xFaUv;_fefq+^NpcV+c1p#k? z5b#Lc-$Gn~5QR!y3lc}%*n%Xq5LXcdOeY8i9>pU^@eniwJ=%gCZ6Piou-@KyG^_;; z!*%AvpkO#$As-1wV{k~qD3X9i=A)6lqsU$~GH7(Uw}sHVOhDiX2y{6DjYHs}cm#pC zBM5N;LV)0Lh!z3_frGRV{w}mYA)TFQ)F=XvMxa4>1PBiqh2Tg3o@omR(h0{S;CKk} zg4rV!P{hksjw7BhjtBj5xy3WI@76PCen z7y=Al&c~u!5U3Ui6y6Dfcj7vGkpuz(0Y!Nukc4t%emN9EfI_fP2n^XvK=u+>QAqD{ zWDp@A3>}3)k@=(eAmZ%+fgl7B1Pg+|KoC?u7&Hn2Ve&DUAdEB&mM;xOdIv%B%OUv$ z6dr-XLr{=TD4YO-6TFE-=PH1Lyrtm?FfyNzFAc)=;>*!3K~P9O0vcqmfI@@4?G=I$ zh#-52Hxvv4Ls0x+EIP=WABOgZqcJEf#v2zzd`6{FD6l;OM0~_hNRYQZ$Qubl*@Ns+ zP!KtQj-31-730RgE5^So#=k4Zzg7&|zZC-rSO@R}9{kS|LqQt!e}cw8iSbWd5J5r2 z#ec8@`M1&fiwh_}2n+`QD>M|OA^%5i!2VNi{F4~O=9~x(A})yB_$Mf!{1755&d$#M z@8ANBY55Og5OG0-#=jEdKg9)+QU5hDh`1mU?7tue28|}-;x8ip8!rAQS%H9n|A)8$ z!NEjg5OMKORuDl!#KnKX3RDmR*-7}{iGlyWV#U9J;{O39h;S$`Z}}%2h?MvzAE0nB z5fMay5GetLV~Ic@vH}Fh{s%6Il=vqu{s{_c5ct1m1%k){d*W#=6N#aK0RJm75ODs# z&_IES-1tw3aS4#JR0gX>-limmq%vIw{1GwK_hc-0QuyVfg(7^$i^2s|BY`raGDrMt z%2Bi$NovZZ^O1=~iV-DYT~{K}G`g;_gJ1zUrbg1Oxw$4=Ev#I3PFZ$J1PM?%hIVaD znT+DGc&F_5>4t6f43NzABQ_IPP!QMiy5V>uyH6EF+&W)1*)sr|62~sfM)1QP3q!2= z8cGkr7OdlTCazc)Eu4@(C!fkpeQmMQc7dh8ij-()x+5fWK8aG)fSvr`<%`|JCP@r>&DdVzU5>RJowE45grcvSwiV&CRwawiYWfMEi1~jsJZM z*|y!~%Qunanz3%IzI_2p*BO`<_0XdHq!)qH?2KV=l)LlYoDqo#7$vu-jg2PNmJ=fh zv!ro^vnn|gDG0Gf3J1A-7s`Q8WvI=8TkBT=RIOUFiAqI2GGMiugR`l44vL76xBZ`j zV~siTqmlYlzGoTMAZ(W^sK~|%bCeH!Z|XR^_s)43|k{ z;UI&qspW@qT|;LS@$(;5<~=d32Ftw>Rufe-Q#o-_Q{wNbGz}HOifN$&s!d!ABQB3i zk@|5y;c7_fM_rHVGpab%9)?aE*lcrLuhFLCe_dm!AEH@h$Syh{AsV8)XNU}E?RR^! zFE4E6MXT6e>qUpSZKe76mBObwdFdkvDKuhg&P&~eMo1kR7quEXd>mUyV!}FA@WOv8 zh(+zmdYK90P1-KBUeKz1NA)b{WD54GZcC-p`m{OEHBjDB=(SDT9Nz%D_YSu4vd+{v zPbj?h!1eZ5Ekwe@C!i<&6CyRsuiuP*@P1;W_Ypt#`w7?XyUplag9_RJnqy^Lh!cyx ztZLvS1%=a(@v6uYwx##C5_%idc(0Cp@&ajNJqpxu(MF|xBTKa!t`?+Q?EU zs^F`%Zd=jTl!4GPVL+RZlQZ}r&wmlxUEj%7mN`6z@1iZ4E`1!K1 zZVpLHRlybbEgtK>J60EyUnkbvbMRXC$quI;*}Zte8y7FOmJyajTI+H87ul zw5;1D+-8Cx72SazPlsMcIE2R4cJGsnG?2X)_(k%JW~2@WJY9tJ{5qM@zejVo>~ceu zD#Gsa^1HptZ$y)Xl~NB0fW-#P0_wVmbKvQfk5f9F>Ed(fi8yVFQK#+ex@;r8GV2-j z`&uRAu=|&1LPf+`q?^bBhsQW+@>f1^ejsHE6kvGAs4gd9oXy`l9vb4BPjb1Z8KI!H z#kwArA^}%s;F?PY$Qn{nfIQz((ydWxVSDKvq^W82>_H{<&zpxf-~Hs);9B>OVq0h+ z^EN-yfV34+9;>GNO^vatg8Ic%T6-lY8I%ReRy4T)9I>AnVghwaog-lPB({n}Gb4s6 z7yFbYl=u_1B`^{@F{*B#30gfD17P`_ekgi_YHgNZ<~S@-5xbLma{n`m1#wRzvHyCZ zaS@q=1>=uYKuqfZnRwLPknP*X(39gySmo>he^+C8ftrZ9#uF`Jlj|V4;78!D2_S zxvw^3#nG`KHNAY7Fmw_Bfq#9OsG(4A1h9*$N4`vqftLlTK<;G3*UP|kzquyf*bx>7 z>Y_H@&k(aH;9>IZJW{C+XRvvkBz%XwE;^T$5vzFnDdkGFwn|{4XiCKL2ZyPG4Ed(= z2LlSvkj=9x;pPL68!paWjD&_u8kN&oS&~b2J$<1m3pIfQNqj}%=3jhGYOVu{dX;w= zOL`OxWQ9Y8RIVVW429G@S1-jCyHhgfj$PL48KgW^nfO|A4rU?LWEL*{TbxxN~3h)iAu}On;Git z#wU}?9IK70+|vOLVPraSSzxl$VAc0t+yQ7i)tmCz;wKpC?}aM9+AM;>D(-j#O6#X4 zh*Vv#mbqwE`JyQuatSK72izJaX{JXF!YM}dR^x&?Do>xX8`VQLS(sy**j@P${oTEZBG}HViq$MDASJK_{Z9lQyVfpaxHS-syulA#AENM zPJbxFQ3;&)L@+Xgy*TvGgZ>ZZlfb^h!cKEGDgz!0gwIaf4Th(RFtlhf$!BY_F7DH( zG?IIjO#40a(-^)@8?v}k;2|}MfLNVRQKqj@yO-k(f2*AHYS{ffrR*yfhmJ=wA6}!m z$eBzOr4zrWc&e-1PJ8kS!UB7$YU8bsjA_9xDA9TN=m)4Oe;^@y?T%$P^i#sJlk$v5 zex&D!CH9^M?nP%=aHZ6by0dYvCVB|-__LDvrDpP~05drz44G`FjFFa5^>7oAxo{Z? z%J67Dt<1z>J%!ysrBQ5=?TDaYbFrCajR z($Yi$43du_iVX^91OiciCh9~uqIpn`9xaF36K#QfOnwlGs9OcuBakp065@>n{%k;isqZqr_7r z5QV8_tTdV^P7(bPqWwU?nz|P zP#BEpPe5Tr@y8oZyi;Hp77PNxU?7+`2uv(6!g4Rs<{%)UNO%yG&;reG=|w`Jy)97U zErSxT0|-QD0sY+w0`<0lh#NsISOwyP0VWWLyG8|hBT+CsQD8y`p|G&O<^@rWYQdmU zNN|uhG~fPjh$n3iAqrB2UNAA@lZJzPaeqCFa-v7(4Teb*Evvt_MZUfC*)+kM_t zfrLs+LtqO02;##TB#j~-z5)Oy4L}hcI--Sf2?z(c+}?U01wA0Q2Ha4$`CvgwC*aUp z&rj^ALi;Lx=V)C$l93VC><`vbOQO=vWRXi)>x(9rx-~p|MB1GqqI8#>s;Rg)i9$8= z7tuvgD->p~lL>4r8Y>ag_uv}3P8VBaE|neoo*$lpGi=Y{K*926a3a-e+7HyfnA2aA zYu*xjooDvizQt=b>=t}hEO^kgEsD)^2KR6<)A4NT@k)zF>5hAc9}d|e(sS#yoeekZ z!PRrT6lCs>A1?lB3fzY^JnBiBNK2dylyrLg;%j^h?$yoB;bz_|nL)^gt!4W=S6{l9 z)VPdwbV&I0jQO61lkq7q1%8_hCMI1@>Os7WWJ zB69}kkS0$qwlwZnUkGKP)8a(Z^+;VmJy(BKI-QHuqbkp`RN%xH8AZE@W?Ks9K(U5^ zT#+(J$Hk*!ofkvhS)r!$JEbBWmlrO@`Bg1q#cOV5F1b}hf#I^#wtfXqr};d?$bmw4 zto`ZGF<)+jP8z}*2cplGgD8c>m!An)o0o)3{OOl$B}+=+4Zn!0DT(1r1KB3+&L0WJ zZnp2^qV`731>PJ#d9#|lb}M`R*->NbYRI=-InU6uG!7xtG-DF-LauDAYn9KV`Ry8x zhkWlf*4!-B3pmCQ+dU>o%+>&-Gu3fln<-;bcC81x5u4#NZcv+%$}oS%E+CjmZ^w_9m<9>2rd zA3jc62Krw_<|o`2Xe*J@x&D5o{m$Wb?$4UGn3s787csSC4~|;DuV4Ea&Y=HgCm*pf z%`xISu}JS_`a-=UwIQC${J83g$fNWp>M6nLrZ-%IS*MxVA5{z9+nq8C>*b_Rzmxaa z{9;FZFc`R*vrfVqamF{&)w9CwcVAcyw9l`6 zOshRnK3&5Lw-lWlKw_H z^>l{@om=GVFhzW?P#j-^M$a1i0=Y0hr&r>mg>|-qbJbg?NAbYo2@{P}rL6`>nGxIj zr%!|jl+*g)YxT>ywd4c%6RDulNNc|DPMw~7V<{2C%K{%?ck2i=K5O+V`!m_7t*Lh- z=t+an39Ra!@!cCKBerECm(D|)ccsXtnOB`poWwQk5Z977sVTjhx>cyZiD!|&5P7bd zKXLMsJAx+jDVHrxK$*bqb1Zw|Gxf_;ZjLP#{au_rO^50A zI$y3LKfapr$!&OS>0N6{7}9%F_#FcbnYWpMXck(1t+!-Gv5fheHQZt=uyd49LyO&( zEN`dWb?twG&x+LOIn+ik@e8{-+voE%gu9PW~s?is?zPx|YtF@aB+oXdP*fYx7q7>;=! z$yqdKz(*AU6CmwjJaEeBxfhx{RU>fS^FG$+l~D_(7?}8;K1W7cP?`axAINDR>3nNA zI#N8BX&{V(sRrLo+*7|=_FZ0dH z-;dTd8>-tbyGZHQuTbSHkzM5o{Vbc8I&|v>EvnhhsaZOGvc5V}AdXCG>FA0QEe8hp zwMij(5}>cRr7SMAimX0g90qxb9Rc%vV`YwrT#1x=^=)2!4bEILI4U4pM*UR+pdylkNIon^E z1~U4&k)3qU&uA!b#7gqm-KLqQOF5OzEFbwQlVGu%dHQB1(!?v_=i+YWqTjLZ!8g8z zHyXM6TN{yqdwz4 z^xy^5P+xAh)|7X;p$Zf&4(84qVt=FTjec$&=e%ydV(pp5ykLH+mq|XXdK4r0bLZu& zw#`YpFZMB4J9}SL-_yHBQt15+uuSLFFeZ88f2O#~SmFB0?l-qpOw)3ouY4m{At9_Z zcw_Us!tLGP#^?SE7AqF|a_O>qWd7`PJHCq(8LUsc^*f^?lE*sNK7~E{MhW!RUwdsf zTYJQ5L(+X1)Z9bEo0X?YSYUbF{^5=9xYPbOhS#P+n;WeTQp=u{DQv-waX*Iq@}ipb z`5QH^?LYZRHglEs_x`SA(0Eoo(p}20xjOee>;9WF&6jK|OOe0&T&{dOE>>#7AGY2d zpFd~aA-il`55bXfg(`+U8YhV&FZ3Zm$^+p3CWFV`JOTLZ_);hkn8P z-63~xORj9mO*sWLi=cj8wIm-umqP$wOkK=9!d^z<4_oFsWT<7hAHclc|SUu%p{kvmez#}>fGiyYKL2FM7J#g%|+aCdMjg%C1i((F#YX+?Q==y`a`+?Rs$wTBgd{oZEoweK(zj-Kd z@WLo#P7+oIo_?yk{ZMQM#boA_O zEEJvGpqVu2ubUA0ED99SWFFZE3S2HrJpm;zH%BfzhILc=zT1uyX$D*$=j{cMon3k| zuv~XP*_LxT*R7ukt*!98mZQ6tnq*_1ysg4}-pV6A7j#da{(JxisEihNkVM467VvRO zJG#?5*uu*AIZ)7_6l}Y57*N~##$3icEa_7tAoUy1UU;T7$O{Wxtuh}*Q+g*^+-Yr$|H%zGR09ng9eDP&c7seXCDu4vV^ynd0Gb zwaF(i4g{W571;Y>2vpcvQ0%2>?3Db|SKD%17joJhN!;<6Qm3S+E`>wK0UI`wqg4e1 zrl>%tBKz!sj4a)GYypq6x5y4}iYIFyfQsD)IA5Rs+zA#6%AIZ2eZb1I?U_skiA1(U zwdLqa8KZM&-E}NV*8M&AvkGK}k|&+qid@R9_vAAA%OW&Owc*7Gh0NWph|u#?p)%Oy zYglNdZmkwC0AA(_hgqD(gwDi~a#pC%>OP$>Z>x&#fAoUqB1YwsgGX8meZwa!wmsK= z@cFaKia#JdncVW7840^;-Idknf$cB8SHe`OUqGD8?BjB#?Ox0ZRT~Qz6@h{U+Zb;`GL*&nd0YP^#oJfwHZZ~Z9W%dLe`MvKeW+nQT*_Sc5T z$9uL#M%&jgyXKV!mZ`MHOjOmSF(-VkDm&ei_=dM)N-4c{SzpR$L)%SFdSF9a8U}oa zXK*pEh`ai{UCh5}=W+Xsn(s5Z>-;1QmARQQa(I=vN%PXIvwGiwin)NSE3WmY^MH-E z==Olv`G^1mnxumlx^_gXQY<;|+&$EyIBw=u8Keo7=l39?MgOY&N78bm8j0-fESm+7 z4M-+eoLt~S93i(Mkf!y8MQK7!!1p#?m%QxE?Pf{#OhRDE!@Oqi1x)HLA0O2XzS_Q{cB$)r9GuVh&f=4pv*wRoV`y6Y=Swb$BfiVV_Q|!*?1ko6 zw(2K@3dyT34C+p1W!$3*E@pq0klw5ngwhbtXv%5cxMYuoR_88eMeY2sN==CMhIa16 z#Ov+r4xCvTC}eT8@@!nBuAtKJhA64eayKGW6N!8kBHpCoyFI!-z7Zkk zIlKL?G$;e3EyrpTvatVHau(|s7p|ODv)kQ0a_qiDlH32tYvD6&hmp*Pk1Fv9AbU|0 z^qH5BkL)cKX^KI4ZB|jxYwI$QAYO2&p7SygsS`Mzu7c?Hw;$h`?l{6tZ5 zY){**ggQ+RS!bBym)IT+w~!e?QDvM{KjyF>dH!87_3zsbNH^s6@Xx|}BNIVpB@H^a+WnO!> zQ5t#SQv$EeE(X_4-?HD&Ksk47X7@{;w9>W?zR$F_JS&j-nF6DHx-pUQK+e6dvDszT zx{oO++YfNPp7+~0{n@G;1DSN+FVaZ?l8AgB!TC3oSvBb4z>TRl%UPa1k2+sf>2f4ZC|GLqMXLCBkc*=T!ZDg||pU!i1`824nv3Nr!&~@h{ zN-?iH(}YrUluU`og*JTS_Tyy#XNwXeYr*eNT|>7>{1S7DrfIXTvL_x*2QQ0^?D|X6 z7figvG>aQ|6jEl@J?fm|3^HE~-#zt?RwX;X?8w^*k9x2-)|pkaCZ0A$JMu1ge76|Y z673%ZZG6v8cAJ)TsYtV*ODN?Ca2D3ya{*upYp)2JvPf(<9+~P1m@;#pvU8uRSeP>U zJ;ef^eyB8UJ2It^Gi_4PZf`Y>keqg+n<3V5Tiuz;pqU4fGd3er2<~ZxoGCBv*(X*r zEZ3(@>1HfCr(&(9{phA0xo4g&%@`ldnk&s@cg{xAO}iINTP@9?3#K2?&6T=OC(_MW zbMsmKHua%W3MzBIf ztGmj|Gb=zp82F-l&OeruXEWza%1%O+^5c^h~G0MR+}c)bBsK*ev(TG zxM}aCZOgY?Ilu9NhYQwA+vOqa5;ldKWr;hn*VZDf*L<(-Jl5TLc8E`)Up)+&4IbH= zvD$Rk+t#<9V!t*u9kP(Ky!O~*FRpM-SZ~L%U}er~b53__S!t(dY4z3JT^jnO%sTqc zrESf(J3;iT@2qwr>Gzl~tyd#2-v0bJs3*?Da-G6;ba{Dcfo^oGh-V$Mv{GxmJ%L*- z9oZ$hyS_TQ9~8QJ8M588G>xNQ`cQZ{m9*94v0hZLz5aHtYvcf)w5vfs1HMZ@cCLT4 z+M@AT#nSJP@E$fDZV(a)J##DV^m|X-*Qo3E#qRENj2$&weQ_As4qV#1!*i5Qe?)1$ zF7?fs)z6>kN$(v2Zq?0H;Fh%hY@sXzAyBDvjUZ1aL{ejc~_m|-rL?nKObHJWb8=-#Qt+cU?p z?~gARa+Rj`Qcf6nPu-p!kx1>)Np06kepi5ew@scJNSyzr^i?ov5kQ>R(S4&b`G;=u z1%m-`OvcIT+nJu!2XzbI{umO|q|@gw*R39&T#W8=Cr{B9wqH9u&innH;^7yY%c;tc z({R1HppjL9dq0j3Rug{{I;Fn9c)sYV_p5JZGwI=y4$u5&hS`p1f9kJo^(OxQh$E0c zJAd%(SSoZLIkHMNx>%=sp89(Q@HOl`Sp>_Gp|Zc{Y8NFX1(VzPIRD)kCdy@Ie+FKa zcrpfsvap7ArDQHT0n1BgMmu=;Ro1(1**EyrqORJ`vs{d?s-;L?u`9DFiXL;Nk^^=AFV&>%GBy zjH+FLw(vekcSroV_~6UTM*{-VXf?4oQaXe9!OkpamWDb3NPJb1P{qCz8Z2^LskK-1 z&808(PvC0wRmLGZAf)&c)AK7H0BU~P!eD1|sLZfkB&AH*)fRBsfb3rAoR{ z6wbkiITE|nwoz{8H+s-c8F_`L6&MLoRy2Cx!>JorhB9#FD?@(b&qzyu|%A|4TSh~_?9;T7y6;Yd1o^b8>^kN1V@a*m2#yxzhGK79H)&Z{hI@g3j9UdbJMS!^PPlhIP`b{2ExrkP-)|P)(Mw78ST&w3QX=US zL==BiY^zB<{rff!INiIG`*fpSWH0x{;h8@9D$akY(q2K^W|QZ9yd|S2AmDcPw32@j z1?UD1$#iytysR)~AO+5U<+t;G#H(8g_Vs;VX=N7KlCvV-5W>xhfPC3M_*?02J1?QE z*|Z*Brdi9lV5z2+c-y$vWq`W|}{G&K+c4#&f+d(iL|@B$|US zWEJ*qWsxcJVL|^YPoM(V8V@-VgDQCFWU#Ew)}2;D!j{N(77n@Ib@e&pfaXDPsp>$) zFE$F&gA9pkzsups9ho09nRB(vbhCco)30Iz`+~eEp_C{(3o%oTE9|7NW#66&gGII@ z=fwwnA{i?qftxkUpxO^5-<7mOISgpNpfl6VR<-%w3Q&EyUQd4#g(CM#Vfd!dB2t zeJN$?rFf5=-^t-=qFE1>;I?YQ)2Ob{VnczuJ>eux9EtLo$YS!4W06uv71G=O zQ4@+}>e4Mc;Tre(8F%^L?PUlVPoyc6mDouDF9gM2s=%9WRB4w=)Q~Ww^c*Q0bht5Y zvR0JDzU&JhsEh(e=`qcd{$kIeE_xh7kY=T@Zm7G`Q*2V~GRE?t8NhOv&s0z#NyCn! zoqdF$TM-yVe*885sue-%hz#!h86>y96P?8W)#P48N>s`(x2TynKu*t|oLg@XSwTC~ zPySpbId9Q=rnV7F+po^3K=00_LSri&@+v=ZoRNf-iyatP#r4qZs`L^}mzB3mH(2LV zUs7l?R#|4YaF60Z8-@~ve+_56dv`*ih^n|eLPO-NVJ@SKA;M%E13=dA&IQ5@M09MR4U7di@PYg3t=(~ z?h&Io`{~qMvct%4xcUMF!RHa>@MO0hvng^zkj%Q+Q@LHfST2=c(b`iIBMi}(P)0Mh z9oDJ+C3j7|K)V>l4~m%B`nI7diNGF;@Qk;0&r~=#OQ$sr^E#;BUY~QnNNGzcO%;!w zV0Ox_&ax=we){0$eNmYCNspYT2u-ts5$&@m0J*i6(MWz-R~bOA#Zr}etBcb45qbKN zyV|oe@p)RluunJT2Q#fN96kOw=I$z}&A(CmeS#A#XmKyaN^zF}EmmBLmQqS_iWG{s z!5xB20t9z=5AJS3OG|;`P{Yg4e?8A$?|Nsw`(W*ZJ^M77%p^1SLFT@{zt1%`ERN&x zzDDtkI$qnX>n2Z;Yjt(*LMb*VgDL%Wz+(Q-N)vqpb#xh)-V7HmClW+k!HsX91}$`k z`r8*Uz3PV2t&;D4u*b&Z1J0Ha{Aif){Np#v&?{ZIkii!&xWn3&xBm27DFk09v zX%7i`Q;jZ>07NNThryRbKd8q!%^LQ-F|)CFOx%{ga|}H9CA} zx>L*ixsMe>Lg~XcmGX>cDG%bDAyAt>2)J1}U2UHi#2t7Wg12-srBuKQV$AgN)1-`RKlk|?`*ez z)P0HRvgRN`*J={iPmUd&`kCBms9B`qf@-Ea8oqsRQO@3f$LoSuoy2V?jdqfITWFz? zO5IJ)j`DeZ7EmH1P-YrUk5k~t@l<^&2rmZOhqc5K2$6dIYQBBmi}Rs3Yx_4lWwzr?YrGGIxnYl-#C;S00<?FJyB^Tr3QoBsBt9C?GE%Lv$( z(&B!{;V?OkaX;bzD+0I&;ylDYi|Fx%x|k&!!-9ijh`^&HZXxvAic$W_!K_=ccoqb{ zu;8o$fx>WKWi1oF4&a#*_ z6aa-eOs`nWlFDhFBjxDX+s~q8^y~F2X!}^@it5PTVKM%gec(s_K=z2mUYRAstSJaw z7&=lifJCOx!Z4$B6%s^)FGT6b@;HydiSm%jOujS_7{$XE-B-_~s|0nG#Q)0yDHNp9 zdQC957L__jc)vx`Z&kycn39tZ07}P(luE@zW8&+EvNGapT1zub=s=~o#RZXL_S}&$ z0CO4StUmdX!|>-z7+YQx7_KT{op60g)RC1f%Le}A_+*ScBLNWIy(PNm7lkvxSUfM) zhe9NLC(!Qa2}jp{P-pSi93BA^EUBpm@K>jSBffG(RVs4DWhBD%Q+lB>urbDfNVS)< z$>(aZkv8pkFzRfp8kYdJ4`wou%#o;obc-OuIfHDA%t-%lF_`;7?(2l`R@!R8#FQo#7y>TfuEbvHah-{4fmNzvz zLFynBBBnK*y!BC!WWq1?$fgcL^>c#a=VWQM6(Nub%wJgSInsbq=#20P^<31ZZltGd z)D2NW19JR@49A}tves4t%Qk|i(%j|~6ZlV=Gj0jw=_YzsiUV&VhYCj+r8y=_Au^a7 zkBYfRkrbcng~FjJwuq?K*ztD$35WHTUC&s!FGOKf^FkPkCXbzNe718-x`8tseKdh0 zj!miMcrrS21dUN5AD&=^=>(_QNk!bhPt%NUvvCL63q`|BsK4<fgPrqXEf zn*>wBA)2vUnptYp_giY=D@1TUGKAkacw;*3th!=s7%WCiZx0aZn<2!d(o`H#%vS*| zs^Su(*Wirv5CVkgTBJ!fb4*nSc|g{dJvERcyOmTL z2WZnBv{{$^mgnKCrz+SZoQ6SKBe8@=xJl>S$c&Ld7otJY5=FcGuJdd?3e=m*NFEA^j$T_N^A{@SV%kEuM zl}~3}nG6BPQ5-9a#E<7@jxvcKkM0SgqaUK9-w@*BMiX@z4%wR$K3s0`QA;d>;+X(G z5%6C#GTev)@bZ>y_XqP!nQl^|>t>|VbV*)P8;6mQjhel{ET%W z(>Dktwjx}L3LKBCt4PA7&K#WRf{>b>r;Lc2t8FB!zJwc1u6jl-aJa9L#2Npbr|bZk zX0n0_2?+jI?M4Ua25bW#{m*MROzMUS-Y}gTrgpe z1#kbQc4PZ@>V`R5hls_bZkXWh|EYGvWN!aDrTJfLH%!v@f2`g9soBnPmWN z9mjAmBilPs0)5Vb1ZG8RVkz=%wP+@zXeu>>tgxx2AZE^DN>lNsPs@qulg*Y+KpH9n7oU z<~2;=M%czR5;J&om28Iw-Zo-50`yOnx0~s={Iu3u-9Hn%-B}BaEuBR5B}skqvbcP2 zT>q-&L;O1M*L?rS6$vf zPynn$JZ@3syDe0ZJkd4d{pE`<3}M)F6>oY3x~4rp9X&fh&^}EfQ5R%gNgvHEj<~|! zw=sY+0PT~Y97a#Ap5tiPYz2TyDB&Rqc z+izKK%R$d*!!6|1AM`ySnB-4n5xS~cUd+g)hUQtH;rq6x3iAP)ht4(K2jweO?_G>4 zt*8E$o74}yqdu-cslfRO>qTXj8wakvs%rb*6|K}%z7wNvA2jPYA*sK{8BG)5yx573 zqM>{HLjFevH{zARpk4O;$p{zfzPRlab+vo*Rx-d5$=xk_&|#b?8}A@gNNGnb7)MWB z>7I`_{hhR5teUoVGz3HE#=R>3?vcQGIPTg*Si|^qSkyegJ%z5pzE0*^yz+--yx{N% z-_(k=mRE7H_l6hp&n#fk5PnUvgr_EVun-nTVj=%?BAOI#9mAx(>fF-xVa;uL^3R&b zvdhJWTQc-w^Y!O@K{C!7uHvB0ur@k6YiB}B32S7Ni{y5g*a!HRLLO4@uTdr0SF4ex zG``!eZ%BR72-O!-)&(q6S8K3@`0KR<>T2ITNAvjBo%)Et{QcJ@+U>{AJ)~Ku5fblY z-I^Ii_Jx~ALI8^;`Jg7R{NMwJr6ndeIUkb?xhg!n5y$=~Og`P!{JsS>d@T;2cWJI$ zlRm;*&psnRuC3Q69B-ZV-2H95dc$&R`Gx^lf6Vhcnc*7iLF;ssOW+yhTE&tI7IwXs ztLxflY^OI2mTf~&oTEi-!te6$Ho_%cC|~2VWGLDf2|9mv+yWBycV9(KGF>!S+0dJ$ z;;7UHGN-&=y>~R}r|yG%iRa?5zydUq<((hDMvQNt2$MbX1+!)5IuVh8qQh6IwR zg>q$}5gQWAj`5ARN)zA!F)MA`s4W57<~4SJImDLn$=SHbE&M(jP`9 zgt6A`iW0R@+fOG1nw+_wAxmmI#u?wf4D!EGbym*{mViP`X&;c1oV*PVpM~ZTT@ zxblQkL{rhbSIm7=!RC&PWi{I8?V6lTtm&KE`deB;T$m@(hO^7=O~6=;V=EMM^l;6} z7rO*n6x7?6x*0kbWW1pbdf&*wROB`>$8R7+9}7aJQ1+YQ2}}H}h=%(_s&#EZA1{U? zIGBFkPjnULVV|%9t+jPWo5+7;&>L!cfam$`akXjkh=&v=<1Yn0u?ho9_90c zM9}O(FvFA}3yNLwuSazuc^h27PdE zaoju~Rrw*(aLS$jZ5+k;ZqLf$2032)BOd0f%g z$5uRGY_$nqmLb7#8D=n$P|{0o>8cFcv1GKRlo7jBfqF2>y=f3M97i=&>)lptCZVJ= z!1SRkw8WNo{KEs8z%%?81^8?0-RMf6F74MYPE6&%Dt(g{|2;uFIp@oq8xr93 zX&`0E=h)2AwQK*;E6FCq4zbAN+pnO)2y}xuG&yc#P13Q=vEiN0gODsIf&`8MRc03* z^GPNdZ@byoLzVCC%)WTe)5~ncH~CpU$LPtvYf<7(?s+Or&vcF*H%PZ>_x%q?b9jwJ zN!$a^yH3k?S{ETSZY3L$L%%pPV-ex!sIVhPK+DQDxwlh^E7PgftD8Red#zR=jjk24 z6Zr^qLP+g-9xN=qJoldFSaPVeEbh6B^vTLh~O7CiW68?tdki}%J07FP~!$v)yv zXeke6J}xv*D90~xU;Y{gm3NNooZ>p4D0n9vpYXt@#=14KEwB;NQOxbG5IKxij3Z z_4mSi?7PKh@p(XJyHQI_<)r%2=6+93B%1~B0$+CGRipDliU0E!H_D~=nclpb-T>6H zy*8c`nCs2yuEU={Z>FBT`l#Y!`_SwQp2J^N>th<1KTEc6((O-L{0%vRz~Rt&Y?Wm; z%pGbnQX1?eLB7NpO4t^uupMy`4dKU&PZk$WiYlMf!e2$J5sbYHeoi63@o&EvuJcRUk>PvaKDxCyS{MTcGy#m;V-nF%a>1IIBgx-`Dd47xVAS-!i+8Xisp4H5S(|uXOPb3V` zy&Ia0j&xiwA-M>R=XPb6@I&KAHtj}zX!Xb-h!}ZbC%6qMy)U`r*-GOV@_yiAP*feL)7co+nvlj*b!h>8^N8DY(*XXi0rLu>kkj*@~ zLv1-&yzp;yAva}NeVGWdG30I(5(k7_;>pK3$i4!+5~U_=w9gW_#;Ul=0`Z27L}i1r zvi?92!WjjBbdjLz0#RO|oMXYUDN^(xOIbR9PpYt+5FxCAR4mVF%`ALsR=DC@C=;Dc z2Fm@*Q@B}HAab3jc#Rn;$ek)H7;`|V@)inT7t)sJ(XJNQMdzCz6w2`y_4*bZMHRlf z&Xc+>6jCd;_bckkEO-@N{7R!h_MqU!y%|z@tWcu7pwhH7!VEc1SNeRg*auV^N?#DJ zk)!2^kpAOBf+Tr-kgxCs2(cR3q>^XRg3}|QaYB@xK(9;T}xPwOeimq&^Nud;IVfU< z=V+`}e90_^IhJTS*6(N5|Gp=Lt4G(PN2@n|>#wqkGw7?scym9sSM+2y?9n$$`ekeK z)|&Y>c3vT~%<9$nnowDA5_3drdHq9pwe(?OmS3UyT0| z!t(|_zFdvNqRH!Gs;mOjL1rp2PLXe&+&Px4S?+fYMEGhgti5*O3W@Dh8$%TG?64xV z0|~3B`6S)OP+pH)(Hc{c!v?PkCCUybYU?&Dn~G@8>7TR(wv zEuL3~N;g^_l%KY@3yzmW!7F!1%QMT{owFKgtO}By%24Kc@eJ^G|CXUccuIT6)br~6 zil$6ZS1nO)qD)8g{aVSSQ)lD8%GtSr1VO7jIpN%Owd-1i{#s+QWwn5Wp=f`l)gAK<{Az%e^&5Wq!xfdF*a8Yz=ju&$%mG5hsYRa`eh7xg z@B;76Yfj61DbAW{W>83m`qh}irkN@pi{7!Q=5lz`47_>pc@8gQQI>S8aC;>QF(Ng( zl~1;J!>^4D+KPW$9MRr0Xx>!4Qu{;}wUO0{f732?+ixUWt+#AU#p(~`bM$s3`#sa4 zAT<;o4Pe~LCU7GeG;hysuSm%v6BWcBz5!5yvGOVq9$83=^_qZ*)~5DGM&}ASBGhl* zUKWkMx%-$AXaBN4V61Ic_%ako0B97H#NLLHiC{h~H8jv>l!M4}ip~2C0nS~Ih(c>r zVoEyb`<5_QN84yud5t$iLAeyE$Qj@_ba)cf1GPY~O~9|tuouc(S!5@i8OrR&k!6H~ zK!)DY`r6$A1nBvh#{+{ zdZMvrl#~rt(FE#najt&E2UI|fQ_M`=-vZcSvut22hG-z&2Ao|Gmv#&EQ+BTUUYAUY z9!r>{go|m4G;XG;vVXCoV)3ZgXS|l!tW8;KrhB5PR;Gy~tAJLp4;MZ{<~B`QIiYwk ze|rU>JtH0UD`8@6UyLmj1ursNls$}ti?CvO_!lY=g|M??u^eU54W-ok)D0pH|G>z| z1#uH&3usYG%Ud7>@$_So=_5#suo`g1k0dUTWEl*PmBZF!8trNW%$Sp@nWlSp}{D?!st*zV9^yTR!RWLr)WU?KHB1G_JlexesUfUwDR1G#GMsOiwU-#L9S@c}l#C;8 z`0N(@c`ELiMP9Yk#`q|@%%YnD8nJwqOadDkA~gD;4xCHPcl0C4(aQ1YbUY^6T7SO& zY7D(>HD4D6NRz9I%{EdS8zO_Q5)cW-Wkr+FtyJ^um{rsmEqM)Bxpu4?xOZm~nnAV)yJ)fxhEHF(>Hl28jJ zWCzs{>?`n03}l5z`sd>2IZ*2tnH%0s&S*{4uPXI9KJDp~oYRc!5i5a>6pLS2lZ$Of zT|@h;N{&Bio)q#=?)F;lvc21r)cRFDiFWGA;$uGV7XZ4$W@R0J!URgr_(KAjk3E={ zjaLtX=#Oc2fk3U{n4Zf;*@d>1y}c;1&sw`03b?&fKlnCx-fXP0fsdn@>cz=QQZz50 zR!<*V{i$-9RGK-L?y0i_=8#C^ewRbXznr(a zcg^OLA3mJ?rr?@$d|S_PjOHhu_D0|$NoP}D=24bk{*DKdpnf0i?>KK9qonTY+IHV` zf4#BjppLgMRhrg+mjz?RzSHe6U?n?@g#&_mjcCZXe|&lWOnHFJc=>5$?W11Hr-Wpj zx+n;CKQS?ZpkaW$>zi({DW@6+OvsTXCR1wli_GIt1(7*B62CrI?8fKU@f$dsF(U9M z(b1ODO|*-Yq?US-GIQ2T1-ksf)8zY`ZQA{@5ZH_7YfvQEm`;8oI7n$USwXOpf#|$^ zFpfRcrnePosTxHyx=Kl&qS76};1YhzK;ig>PPV3=fm>;Fu{~(mrAh6wqAQ#FUS!VY zNP|(Q9n3NkTSlRbn@yplZ}sTsp+iXZCjbo}8_oa=`w#bT0Y601Faj(h#A_qF{s4NO z$WHO5;?M+c1(hRoh6lpCgsH46@w7v6VWtTsU+}5oT~Fjfkgx%8h)2$vck@Xa z8I4uzZeau`D^I)^ryG%2so*6WOXAe~NzrItB>)hcxE9=xd$d2q2&_T$_h&zKVgMB&ROA^A4yk*^tX>|4W&Dvo+f zd#CvQ4uEmCw04YKCDIP$#`GC6oKlEu?p&t@>0^~r{`yC1!YojZN9*?YR27r4_JUA6 z!g8woBJuazgc1O{+mV8wXhuO65N-Q0A3k}Aeam3@JfTGN5(7R5vDy!VGJabV{$L(3 zz$KBVvEXMRO+%$_A)P0?dZ-AqU%cYbZSeQJ>|ke+n9uUTsg=}Tf!q*P9ob3Vg!~%< zHbQpf)&l-ir=@>FeKb5J-9uhTwkxMTDM*6p7@23}*PDgv~3s1^7g7a#5aq6vr0+(JEUhXQ`fh zoU46`=rw{Mk8{k7+`_?aC#8&NtT_Fb=OJ*5cq1cNP9pnHx1Y;>{qTtM`#!sk<1;B9 zCY-ZT$M9l)4T4;h#r_NLKKS6n&%DeFVq%Amo~+r#h*@ zb3T|f>WPdlsDxR0c@DO2>5tVW>4et}o_z=&Wv2hQF3=vZ?l;BW@Q_llub) zCc9`0e5sB}Nx#8(VK!0@5Vr3Jyyqpt*~#z9J*vxBHI1)l;}#x0Jd@3JsWE+GOZ!*} zmFmfTCPWnDs6lJ9@N>VjQbY)BH`E%eV$j+qD0#=;{c)sE8z&`rA;;x?*E^HCXuIK@ zem-fW5;4aIlfT3~D7TYJ{%8o&(}FIw+VUxrvr(w!Q^!e|?LB3oU*yq4R70{eabFVt zRtQIZuWD}P9Cgq@tY~$j`uqAVQ0Bz3;f5mM^++1c4z4=a-l(dyrHy#vN(hq!58LZ_ zj^O0mJ$Zo?bv*BH#R|RUa?Sa@RFEB(mCIeWJ3(f`;n!p^bsIjLsKx10%0V8BAqj=; zr7!l}^*X)0&m=js8uQs1l4sPol=T+IZ1e{PM|Z_f64e=PiukmDkJ+O1sZA?Klv(TX zRZu_Fv_6Ky0xAm_4Qkb~S$&HiCfTwI^AO2Tol&@3?Rg0ORMWP4(Wl@s{<3~_)WIyj zjQV(2u--HgSkcNySgtSLQ;)AJ2!V<9=^K=eCTI)Wu-y~sK{LoYbaBrj@|H}-xnB6r z;S-hcMx(x4XTL^Iqe{eM0A#%6Y$UkQNA*@q`66>vbcO>#yu}W#TAR{(-|9Vt__g=N z`r*1=>%)TX)+PE&7Q;qrB1PF-Kk23YArRvQonxHgKnh8)m6984rQuAz!JM{q-Tvds z&=Piq=y-j0SOS48z&p^?Kn`<2*6UJI=S3du| zH(Rq=T9x?_M$BS9!P#K#;uUFT+T7{8ZU7k}mFR*q0{8Y3-p1>+ z(eBuOD338($oXFSJ4+E;3iP5UuDL!`&VnRlA3d$oikzd0cjVKU@<=?$tzg;=>nbuC z$7?{ox_c6EA@QnK$yNH%ZmGP;?aC6ZPtpA<50R%xbomm(6D70DWm+Q~Pp4Tjs9mKd z_shE=z~g7R!Uwk(p1hxN?L^r{&YrkEjxpmfb4Fo#@mH!G89gCeaP4p+!Q!=jGAC>3 zVpSxZAc$j39N7Q*=lhJ8uWmQDKK@p(bLM(Wwm?4&h@YV?;(vWxYqOVlIBTs^w@R=* z<@yGVl}VV~gi~(Nljf_X%G8jd{`hlPL3#~}^tbkditV5Wx7qU~lu#Z<`(xbsajj>U zjSbsxb$(J$l#V4lV$gOI81~*h$Zpb}RzI`AzM5Tl_{+kEv?BBq!zfmSgaI2-Y8-C* zcpz7tsLaXiwJG<;$V3hBC>HPu+)!D}bsWRq?%>KI^EKi_TOr?|=b#_FKA!ovb!o?{ zHGbAK;)J(5RoE#=+#Jh}MYv*YsRh4dBQ+K5ToyRZs&B<4SiS z$p)0}^t-DKx&?6hrJgF|L@II~wI9P9L@ZhuCUUu*6=dOjk8ZofiMy){L^v&!xjXrI zi2H2XVR-0nK1Te9k}&}s896rulL^?h*WbFi&u7E@hDZt zu-v>J#O*|VP9CuE9DHff-$LL2B{@U55_-rmC}TL#;@ES!4~guhw3b$)TYzDgiV#Jq zD6IF24Zt`Cl+HR>@NZF{MW8>%Rd4_UG90R;-;~t{254lJ1o>6v4ZF#na(Q+taT6<_ z!E-%BY5(RA67^Ql8j9RU1o2r?4cS)$G%WxjqELNA?ltA0b*IQapW5q%8W3ym9}#(+ zT9r;|RSdC!%~@>rO_g}R{j8w^cV^fFN0mfRK9X+O1xMkAefVLcN?YF$LKX@)R5WW; zkx}jm<5aZ?R!e?5cIyP_sPD7MA8s`(_HR^^qS7GO9QKb@t>9DeOHr=uR11<-m!wkt z$=3&MR1oOwmWn}r>1P2+0t7Y3t?A`I!MejI`mgnhZ8iJD1NyeMl?^6(tPvUJhVrue zH8O`GlAX`$C&s@#pWwBaV7t|bkb+*m9vvwh?C1nX`Kq;tD%l(jRj*I*9*vte!th`N zx6dc$Ws8&eHN3|x0H3~Nt1~`}J|B+=7-<=RH5LXLd-m|gPPX94pS>R^Y8+Y|n7H!Q z`szP|*E)Freu${>ImN={K{Cs4K8Pib;$41*?XL)Qq1FulMCMj|n+|=JZ#qe5~$fzim&PjvLOlkMOlUkVa zs3;{AOb7l4)53H}Z<|7%}U@2w0&Q zVJjt6DK@3atV`n`RSP4+VV9H7KYTq;QKu9L;nqHAwqcu zLou+{KcvDK;bYhkD@46lWOwJ?x7M%elnuca^jkFbTA36KW=yEekuTA0-6v!=X+Lr%^pWbjDXV`}lUJ-z(ibm9jT{3egSjz>RX2sd%geYtj4V9;#WC#mCJN< z-1V=V#b!Jl?M}jTn~7i&;!EXghB|Taqnk zvqZiPqNQvNJlLOsgG^p+yia{;E4P?tw1+MtdwI?M-74he+wVxj3&SR)shLnIO5d|L z^#z|71ZTstC@lQ5|0#9jIz%9e%2Z7<+whIzNzpL7=Fzi8r~(mA^KxwV4m$Z`{cnj} zuiw4jzCI7^jVO!}@O{dVLT)thN)P+ll8Ku^bHt{lCB-*RbwV+)xnjgh1YLTvdfEJ^ zIciSW^SdIc89SUn2}?>j0+1!85`Q7uOUU>AOx7Kcey8AKALqLlzT7HUmvnZ(9v44z zVa7i3dKoOGbQSeT1Nq?vBLa`{-VK^4^OkoDNG-<6hv1I~+1N4n+Bp^Z4z@oG@ZW5E zP^Zw&NmcggYesUx?C)ht4NATC;v&f*9G7e&mwk%Lhh-(@PD>9f46>MK)2loOlWeML zv7@BHB}9SYE_DZe9WzPdVhgA4K|wevIrG;SH9ANVqWL1dAvlxrrXkN$AGv{A^XJTi zZtlLXhs3M3#iX50unC?c_y(`&P!6Bm>nka0C?7D)z9!NQt%v%ptm;n5Jfm7I#h1Lb z#Fg3mRjH~(axpjaNGSVs^wJ36mBiPEf}^@uqfxWEAmW;SNW#SLfmL8vWyJ;W<3yc9 z!tWW2EWi2$0vtQAK?31vz8zGCxn$^$Ku}FIlk9unam8wBk#}V zdG}lKsW|hKjmOV)cUH0d9DH%`E!IPahVzmgn5-D{mGhwj?YUJBAkVBssd|2KMRHDC zrjP#DQcS11OU~Ddy&NTH8(6;Y&2%~wPu%QJuS^!~Q`j3Jzc0O->n;DvE_b{kiF}Da z78khh(P!OPGGD56@9^<7Z|ASx)!Yz$*BX{7>N;4ZQ!{MZZB^NP_kgAXxsSuNd6rg0 z52-lQ8~6OPt+~iw@BsLZUyd@_3V*h#H{`pHXUsu-#X(EQ-$W--F(K&TOdZ%0t&1%_ z@kL3XID~d4E?g>f3vzD_&Uw0s!$e;SAi+;kcExdz^47N|ap6{`J2=yZAoGdc?FSiF zVd9z#05CJ{fPnlNCw)dfcv7t&n_n;L`O~iqleB}PLy0kv1$LTD^fO-hL@rlNYm#{% z7(+NwG_@KBWtaV+Tbn!Un@V<4whYy5VwLcyN^6dwEfoco*(jrh*ALSrGeTm862ytM zc$p~Z41T!B*x<0UveAvp@ahYS;!v}VV=Q^gB(@J0oD^Y%gAz3Ju)xrX+jr{x83D%< zI8ki-Ad1d!VLF^t-ytN@FfGsml41Rp3wKC;$~`z)7Bkf#@m@E?y|WdTBpJRT_y{t*qV3Ub0B8CRki^cK_7E0D0(ZC+@6~}mLk77xzl)z9 z^XSFWdm_O*yU&O;W9C@-3GWMwbkKRO?=OPR~G zQT+5(xqilh0i4LlUS*MPCdN-RkM5zJ6EaG!k?sa%Q9sdRW|?3mkiuf*o&SG;-$_f!L59LD0TaV!ezV`>p|x;{qrA%_6=x@+1@GNP>~14F=LC9-@Q*Lxe+M2zUNOv|KZKNzJmZ!zeb5Zv8U#&Y3htI#Ylk3eiN3%cZ{3hoj-xD*thxMRSsL922rAGAAs#5QHzj41Y9pAw9P}0kK`(*mp*bSmS@e}ce zSi0~17>Fc@RggSb09$mtzN$ohgK_7)+jQhjT7ANoSbebq-{OGklk^s18)a3~34zBy zVVUbYkMXZ&lRgR*_p00SHLOgZy#4upnpWaTdYFzFw@w8`T) z9Oh^~)(@@8Oh>M+@U`BdL9v_)7wTAsjl=2>brBnJ&ckbHzS0Y^&8nk!1u|>9;Vrd^ zOlPm(->hW-g8CHQLV}WS=xat=dSmX6KdM@we+Yc&NtZi!`n9&s^triZJo_Y&(*Nt- z{RxT>cK0qe`F2xa@6WJ~fP1pc?Jk?d<Rl;(b@Nwq~u8t3XiQM_e zk^s{6-qrDlH^;H}w_i!friMD?@N-{v$doerx_si@Ck5* z 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

f)-GL?>axB_@K;5RBM{a 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 literal 0 HcmV?d00001 From be40008808c7e5e5557468422b59e857a0d0d505 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 8 Nov 2026 19:26:19 +0100 Subject: [PATCH 362/430] fix(ui): tooltips and popups stay in the main window, and a long tooltip wraps With the panels in separate windows on (the default), a tooltip or a popup that didn't fit in the main window got a window of the system of its own, with an OpenGL context of its own. The editor froze so on 2026-11-08: its main thread stuck for good in the NVIDIA driver while making the context of an invisible window 1925 x 29 px, a tooltip in one line wider than the screen. The Polish texts of the editor have tooltips of up to 360 characters in a line; the one of the curve mode of laying track is 2088 px wide. - io.ConfigViewportsNoAutoDetach (a MaSzyna addition, set with the separate windows) keeps the tooltips and popups shown over the main window inside it too, placed and shrunk as they are without the separate windows: they get no viewport of their own. A panel dragged out of the main window by hand still gets its window, and the tooltips and popups over it may go past its edge as before. - io.ConfigTooltipsWrapWidth (a MaSzyna addition): SetTooltip() wraps its text at this width. The ui sets 40 em, 520 px at the font of 13 px. Checked in the editor on a hidden desktop: the tooltip of the curve mode, full screen 1920 x 1080, and the one of the redo button at the edge of a window 1280 x 720 each made a window of their own before, and none now. Both are drawn in the main window, the long one in five lines. --- application/uilayer.cpp | 2 ++ imgui/imgui.cpp | 12 ++++++++++++ imgui/imgui.h | 3 ++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/application/uilayer.cpp b/application/uilayer.cpp index 5443d158c..1b4962e16 100644 --- a/application/uilayer.cpp +++ b/application/uilayer.cpp @@ -404,6 +404,8 @@ bool ui_layer::init(GLFWwindow *Window) if (!gamepadui) gamepadui = ""; auto const viewportsupport{(m_imguiio->BackendFlags & ImGuiBackendFlags_PlatformHasViewports) && (m_imguiio->BackendFlags & ImGuiBackendFlags_RendererHasViewports) && glfwGetPlatform() != GLFW_PLATFORM_WAYLAND && std::string_view{desktop} != "gamescope" && std::string_view{gamepadui} != "1"}; + // a tooltip as long as a paragraph is wrapped: in one line it can run past the screen + m_imguiio->ConfigTooltipsWrapWidth = std::round(Global.ui_fontsize * 40.0f); if (Global.ui_viewports && viewportsupport) { m_imguiio->ConfigFlags |= ImGuiConfigFlags_ViewportsEnable; diff --git a/imgui/imgui.cpp b/imgui/imgui.cpp index a9026b408..190f89012 100644 --- a/imgui/imgui.cpp +++ b/imgui/imgui.cpp @@ -1491,6 +1491,7 @@ ImGuiIO::ImGuiIO() ConfigViewportsNoDecoration = true; ConfigViewportsNoDefaultParent = false; ConfigViewportsNoAutoDetach = false; + ConfigTooltipsWrapWidth = 0.0f; // Miscellaneous options MouseDrawCursor = false; @@ -12112,7 +12113,14 @@ void ImGui::SetTooltipV(const char* fmt, va_list args) { if (!BeginTooltipEx(ImGuiTooltipFlags_OverridePrevious, ImGuiWindowFlags_None)) return; + // MaSzyna addition: see io.ConfigTooltipsWrapWidth + ImGuiContext& g = *GImGui; + const bool wrap = g.IO.ConfigTooltipsWrapWidth > 0.0f; + if (wrap) + PushTextWrapPos(GetCursorPosX() + g.IO.ConfigTooltipsWrapWidth); TextV(fmt, args); + if (wrap) + PopTextWrapPos(); EndTooltip(); } @@ -16393,6 +16401,10 @@ static void ImGui::WindowSelectViewport(ImGuiWindow* window) window->ViewportAllowPlatformMonitorExtend = FindPlatformMonitorForPos((use_mouse_ref && mouse_valid) ? mouse_ref : NavCalcPreferredRefPos()); else window->ViewportAllowPlatformMonitorExtend = window->Viewport->PlatformMonitor; + // MaSzyna addition: see io.ConfigViewportsNoAutoDetach. Over the main viewport they stay inside it: the late creation of a + // viewport in Begin() needs the extent of the monitor + if (g.IO.ConfigViewportsNoAutoDetach && window->Viewport == main_viewport) + window->ViewportAllowPlatformMonitorExtend = -1; } else if (window->Viewport && window != window->Viewport->Window && window->Viewport->Window && !(flags & ImGuiWindowFlags_ChildWindow) && window->DockNode == NULL) { diff --git a/imgui/imgui.h b/imgui/imgui.h index 6bbc42dec..85f50b79a 100644 --- a/imgui/imgui.h +++ b/imgui/imgui.h @@ -2360,7 +2360,8 @@ struct ImGuiIO bool ConfigViewportsNoTaskBarIcon; // = false // Disable default OS task bar icon flag for secondary viewports. When a viewport doesn't want a task bar icon, ImGuiViewportFlags_NoTaskBarIcon will be set on it. bool ConfigViewportsNoDecoration; // = true // Disable default OS window decoration flag for secondary viewports. When a viewport doesn't want window decorations, ImGuiViewportFlags_NoDecoration will be set on it. Enabling decoration can create subsequent issues at OS levels (e.g. minimum window size). bool ConfigViewportsNoDefaultParent; // = false // Disable default OS parenting to main viewport for secondary viewports. By default, viewports are marked with ParentViewportId = , expecting the platform backend to setup a parent/child relationship between the OS windows (some backend may ignore this). Set to true if you want the default to be 0, then all viewports will be top-level OS windows. - bool ConfigViewportsNoAutoDetach; // = false // MaSzyna addition: a floating window stays inside its host viewport: a resize stops at its edge, and a window left past it, or too big for it, is moved and shrunk to fit. It gets a viewport of its own only when dragged with the mouse cursor past the host viewport. Popups and tooltips are not affected. + bool ConfigViewportsNoAutoDetach; // = false // MaSzyna addition: a floating window stays inside its host viewport: a resize stops at its edge, and a window left past it, or too big for it, is moved and shrunk to fit. It gets a viewport of its own only when dragged with the mouse cursor past the host viewport. Tooltips and popups shown over the main viewport stay inside it too, moved and shrunk to fit, with no viewport of their own. + float ConfigTooltipsWrapWidth; // = 0.0f // MaSzyna addition: the text of SetTooltip() wraps at this width, in pixels; 0: it doesn't wrap. // Miscellaneous options // (you can visualize and interact with all options in 'Demo->Configuration') From 7ba478aea96bc52d59e3610fa077115b329966ec Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 19:30:46 +0100 Subject: [PATCH 363/430] test: reach the mover by reference in the brake handle lambdas (Sonar S2259) The lambdas of the St113 EP brake and the MHZ buttons tests called the mover through test::vehicle::operator->(), which the analyser takes as possibly null; they capture a reference from mover() instead. --- tests/unit/test_brake_handles.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/unit/test_brake_handles.cpp b/tests/unit/test_brake_handles.cpp index 1490e43d8..eeecac75d 100644 --- a/tests/unit/test_brake_handles.cpp +++ b/tests/unit/test_brake_handles.cpp @@ -131,9 +131,10 @@ TEST_CASE("brake handles: the overload and the high pressure buttons of the MHZ real.record(trace); REQUIRE(real->Handle != nullptr); auto &handle{*real->Handle}; - auto const at{[&trace, &real](std::string const &Event, double Position, double Seconds) { + auto &mover{real.mover()}; + auto const at{[&trace, &real, &mover](std::string const &Event, double Position, double Seconds) { trace.mark(Event); - real->BrakeLevelSet(Position); + mover.BrakeLevelSet(Position); test::drive(test::driving(real), {}, Seconds); }}; at("running", handle.GetPos(bh_RP), 60.0); @@ -196,8 +197,9 @@ TEST_CASE("brake handles: the positions of the Knorr St113 EP brake") { auto &cab{unit[0]}; REQUIRE(cab->Handle != nullptr); auto &handle{*cab->Handle}; - auto const ep_at{[&unit, &cab, &handle](double Position) { - cab->BrakeLevelSet(Position); + auto &mover{cab.mover()}; + auto const ep_at{[&unit, &mover, &handle](double Position) { + mover.BrakeLevelSet(Position); unit.run(0.1); return handle.GetEP(); }}; From bbd7d9c5bf62b6ff7453721f8d80ff3a54b8e80b Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 19:38:16 +0100 Subject: [PATCH 364/430] fix: a stopped diesel engine no longer stops the others every frame (eu07/maszyna#80) dizel_Momentum() relayed MainSwitch 0 to the consist every frame while the engine stood still, whatever stopped it. In a train with mixed JointEngineStart flags an engine stopped from mainb_off stopped the engines behind it once it spun down, and the stopped engine of the cab's vehicle knocked out the one started from mainb_on. The stop is now relayed only when the engine stalls while running, as on master an engine stalling in a joint start still stops the others. --- McZapkie/Mover.cpp | 9 +++++-- tests/unit/test_engine_start.cpp | 45 ++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index f6697d934..a09e15192 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -8161,8 +8161,13 @@ double TMoverParameters::dizel_Momentum(double Fill, double n, double dt) if (enrot <= 0 && false == dizel_spinup) { - // a stopped engine doesn't stop those started on their own - MainSwitch(false, MainSwitchRange()); + // an engine stalling stops those started together with it, once. one already stopped, from its own switch or + // another vehicle's, or not started at all, has nothing to stop: it stays quiet, rather than stop every frame + // the engines started on their own or from the separate switches (eu07/maszyna#80) + if (true == Mains) + { + MainSwitch(false, MainSwitchRange()); + } enrot = 0; } diff --git a/tests/unit/test_engine_start.cpp b/tests/unit/test_engine_start.cpp index e763a4404..c721e5a1a 100644 --- a/tests/unit/test_engine_start.cpp +++ b/tests/unit/test_engine_start.cpp @@ -251,3 +251,48 @@ TEST_CASE("engine start: an engine stopping on its own stops the others only whe CHECK(running(second) == (false == joint)); } } + +// a stopped engine stays stopped on its own: only an engine stopping while it ran tells the others, as a joint start's +// engines stop together; one stopped from another vehicle's switch, or not started at all, doesn't stop those running, +// whatever the flags of the vehicles in a mixed train +TEST_CASE("engine start: an engine stopped from its own switch doesn't stop the others when it has spun down") { + consist train; + // the middle railcar keeps the joint start, as a .fiz without the key does. what a vehicle without the cab relays + // goes on away from the cab, so it's the third one that would stop + auto &first{train.add(sn61(false), 1).mover()}; + auto &second{train.add(sn61()).mover()}; + auto &third{train.add(sn61(false)).mover()}; + prepare(train); + engine_start::remote_switch switchb; + engine_start::remote_switch switchc; + first.MainSwitch(true, first.MainSwitchRange()); + hold(train, switchb, engine_start::engine(first, first, 2), 2.0); + hold(train, switchc, engine_start::engine(first, first, 3), 2.0); + train.run(15.0); + REQUIRE(running(first)); + REQUIRE(running(second)); + REQUIRE(running(third)); + // mainb_off + CHECK(engine_start::remote_switch::open(second)); + train.run(30.0); + CHECK_FALSE(second.Mains); + CHECK(second.enrot == 0.0); + CHECK(running(first)); + CHECK(running(third)); +} + +TEST_CASE("engine start: the stopped engine of the cab's vehicle doesn't stop the one started from its switch") { + consist train; + // the cab's railcar keeps the joint start, its engine stopped + auto &first{train.add(sn61(), 1).mover()}; + auto &second{train.add(sn61(false)).mover()}; + prepare(train); + REQUIRE_FALSE(first.Mains); + // mainb_on + engine_start::remote_switch switchb; + hold(train, switchb, engine_start::engine(first, first, 2), 2.0); + train.run(15.0); + CHECK(running(second)); + CHECK_FALSE(first.Mains); + CHECK(first.enrot == 0.0); +} From 8fb596f2186cdbac2ed26d7b25a56f0f57da0ad0 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 19:46:16 +0100 Subject: [PATCH 365/430] fix(simulation): any exception ends a test run with error, other runs as on master main() tells a test run (--test) apart before anything runs. Only a test run catches every exception and installs a std::terminate handler, both ending the run with the error code and a test: line; any other run keeps master's exception handling, so on Linux an uncaught runtime_error aborts at the throw site again. A test run doesn't start the Discord RPC thread: it published the test scenery as the player's presence and held the closing up to 5 s. run.py drops a case scenery's .sbt cache after a run cut short (wall_timeout, error, a crash, killed by run.py), which could have been writing it. The -edit branch of the test command line parser had no effect (a token that isn't an option is ignored either way) and is gone; its test checks what can be seen instead. --- EU07.cpp | 78 +++++++++++++++++++----------- application/application.cpp | 8 ++- simulation/simulationtestrules.cpp | 23 +++++++-- simulation/simulationtestrules.h | 5 ++ tests/scenarios/README.md | 11 +++-- tests/scenarios/run.py | 12 ++++- tests/unit/test_test_mode.cpp | 29 ++++++++++- 7 files changed, 125 insertions(+), 41 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index 4bc453867..20f24aa5a 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -23,7 +23,10 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #include "utilities/Globals.h" #include "utilities/Logs.h" #include -#include +#include +#include +#include +#include #ifdef WITHDUMPGEN #ifdef _WIN32 #include @@ -94,10 +97,45 @@ namespace void finish_log() { StopLogService(); - if (auto const logservice{Global.threads.find("LogService")}; logservice != Global.threads.end() && logservice->second.joinable()) + if (auto const logservice{Global.threads.find("LogService")}; + logservice != Global.threads.end() && logservice->second.joinable() && logservice->second.get_id() != std::this_thread::get_id()) logservice->second.join(); } +// ends a test run with its verdict on the standard output and in the exit code. a test the simulator didn't end +// (a failed start, an exception) ends with the error and Reason +[[noreturn]] void end_test_run(std::string_view const Reason) +{ + simulation::test().conclude(simulation::test_result::error, Reason); + finish_log(); + fflush(stdout); + fflush(stderr); + // skip destructors, there are ordering errors which causes segfaults + std::_Exit(simulation::test().exit_code()); +} + +// a test run (--test): whatever stops it, it ends with its verdict. any other run never gets here and ends as +// it always has +[[noreturn]] void run_test(int argc, char *argv[]) +{ + // for what doesn't reach the catch below: an exception leaving a noexcept function, or on Linux one leaving + // a thread (on Windows the handler is the main thread's only) + std::set_terminate([] { end_test_run(simulation::describe_exception(std::current_exception())); }); + try + { + if (Application.init(argc, argv) == 0) + { + Application.run(); + Application.exit(); + } + } + catch (...) + { + end_test_run(simulation::describe_exception(std::current_exception())); + } + end_test_run("the simulator stopped before the test ended"); +} + } // namespace int main(int argc, char *argv[]) @@ -149,6 +187,11 @@ int main(int argc, char *argv[]) fflush(stderr); std::_Exit(result); } + // unattended test run of a scenery, which says its result in the exit code (eu07/maszyna#541) + else if (simulation::parse_test_command_line(std::vector(argv, argv + argc)).enabled) + { + run_test(argc, argv); + } else { try @@ -164,37 +207,18 @@ int main(int argc, char *argv[]) { ErrorLog("Critical error, memory allocation failure: " + std::string(Error.what())); } +#ifdef _WIN32 catch (std::runtime_error const &Error) { -#ifndef _WIN32 - // outside a test the error ends the program as it always did there, uncaught - if (false == Global.test.enabled) - throw; -#endif - ErrorLog(std::format("Critical error: {}", Error.what())); - // in test mode nobody is there to close the box, the exit code tells of the error - simulation::test().conclude(simulation::test_result::error, std::format("critical error: {}", Error.what())); -#ifdef _WIN32 - if (false == Global.test.enabled) - { - std::string msg = "Simulator crash occured :(\n"; - msg += Error.what(); - MessageBoxA(nullptr, msg.c_str(), "Simulator crashed :(", MB_ICONERROR); - } -#endif + std::string msg = "Simulator crash occured :(\n"; + msg += Error.what(); + MessageBoxA(nullptr, msg.c_str(), "Simulator crashed :(", MB_ICONERROR); } +#endif } #ifndef _WIN32 fflush(stdout); fflush(stderr); #endif - if (Global.test.enabled) - { - // a run that stopped before its test ended (a failed start, an exception) says so like any other end - simulation::test().conclude(simulation::test_result::error, "the simulator stopped before the test ended"); - finish_log(); - } - // skip destructors, there are ordering errors which causes segfaults - // a test run (--test) says its result in the exit code - std::_Exit(Global.test.enabled ? simulation::test().exit_code() : 0); + std::_Exit(0); // skip destructors, there are ordering errors which causes segfaults } diff --git a/application/application.cpp b/application/application.cpp index 860b8a235..75ecde778 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -433,8 +433,12 @@ int eu07_application::init(int Argc, char *Argv[]) #if WITH_DISCORD_RPC // Run DiscordRPC service - std::thread sDiscordRPC(&eu07_application::DiscordRPCService, this); - Global.threads.emplace("DiscordRPC", std::move(sDiscordRPC)); + // not for a test run: it would show the test scenery as the player's presence, and hold up the closing + if (false == Global.test.enabled) + { + std::thread sDiscordRPC(&eu07_application::DiscordRPCService, this); + Global.threads.emplace("DiscordRPC", std::move(sDiscordRPC)); + } #endif if (!init_network()) diff --git a/simulation/simulationtestrules.cpp b/simulation/simulationtestrules.cpp index cdfea0e3b..fcedaed7d 100644 --- a/simulation/simulationtestrules.cpp +++ b/simulation/simulationtestrules.cpp @@ -100,15 +100,28 @@ test_command_line parse_test_command_line(std::span const Arg { ++i; } - else if (option == "-edit" && i + 1 < Arguments.size() && Arguments[i + 1][0] != '-') - { - // the scenery to edit is optional - ++i; - } } return result; } +std::string describe_exception(std::exception_ptr const &Exception) +{ + if (nullptr == Exception) + return "the simulator was terminated"; + try + { + std::rethrow_exception(Exception); + } + catch (std::exception const &Error) + { + return std::format("critical error: {}", Error.what()); + } + catch (...) + { + return "critical error: an exception of unknown type"; + } +} + double wall_clock_limit(std::optional const Given, double const Simulationtimeout) { if (Given.has_value()) diff --git a/simulation/simulationtestrules.h b/simulation/simulationtestrules.h index 153dc8a42..684b90cde 100644 --- a/simulation/simulationtestrules.h +++ b/simulation/simulationtestrules.h @@ -9,6 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once +#include #include #include #include @@ -53,6 +54,10 @@ std::optional parse_seconds(std::string_view Text); // options are skipped, so a scenery named like an option isn't taken for one; options it doesn't know are left alone test_command_line parse_test_command_line(std::span Arguments); +// what ended a test run that the simulator didn't end itself: the exception caught (or being handled when the +// program was terminated), or nothing +std::string describe_exception(std::exception_ptr const &Exception); + // time allowed for loading the scenery, on top of the simulation time, when the real time limit isn't given [s] inline constexpr double wall_timeout_loading_allowance{600.0}; diff --git a/tests/scenarios/README.md b/tests/scenarios/README.md index c1226e637..0a11c6a0a 100644 --- a/tests/scenarios/README.md +++ b/tests/scenarios/README.md @@ -31,7 +31,8 @@ With `--test` the simulator: motion telemetry is off, - gives nothing to the outside either: no keyboard leds, LPT or PoKeys (`feedbackmode`), no messages to a multiplayer server (`multiplayer`), no program run at the end (`execonexit`), - no console window of its own (`showsystemconsole`), and the game's `imgui.ini` stays as it is, + no console window of its own (`showsystemconsole`), no Discord presence, and the game's `imgui.ini` + stays as it is, - keeps all of the above whatever the `config` block of the scenery says: the settings of the test mode are applied again after it, - runs the simulation as fast as it can in fixed steps of 0.03 s of simulation time per @@ -39,8 +40,9 @@ With `--test` the simulator: - seeds its random numbers with a fixed seed unless `-seed` or `randomseed` gives one, so two runs of a scenery come out the same (the physicslogs of two runs are byte for byte equal), - quits when the test ends, and says how it ended in the exit code and in a `test: ...` - line on stdout and in the log. A command line it can't take, or a start that fails, ends - the same way with the `error` code. That line is all there is on stdout: the log goes to + line on stdout and in the log. A command line it can't take, a start that fails, or an + exception thrown by the simulator (of any type, on Linux too) ends the same way, with the + `error` code. That line is all there is on stdout: the log goes to the log file only (`debuglog` doesn't print it on the console in test mode). On Windows the simulator is a windowed program, which the `cmd` prompt and PowerShell don't wait @@ -167,7 +169,8 @@ For each case the runner: The lead vehicle is named `autotest_`, so every case has its own physicslog and log files and cases can run in parallel. The `autotest_*` sceneries (and the simulator's `.sbt` geometry cache of them) stay in the game's `scenery/` dir; the cache is dropped when the base -scenery is newer. +scenery is newer, and after a run cut short (`wall_timeout`, `error`, a crash, or killed by run.py), +which could have been writing it. ## Writing a case diff --git a/tests/scenarios/run.py b/tests/scenarios/run.py index 3757a8249..18b3e3f2e 100644 --- a/tests/scenarios/run.py +++ b/tests/scenarios/run.py @@ -137,6 +137,11 @@ def fill_vars(fragment: str, values: dict, keep=frozenset()) -> str: return re.sub(r"\{\{(\w+)\}\}", value, fragment) +def scenery_cache(game_dir: Path, case_name: str) -> Path: + """The simulator's geometry cache of the case scenery.""" + return game_dir / "scenery" / f"autotest_{case_name}.sbt" + + def build_scenery(case: dict, game_dir: Path, case_name: str, vehicle: str) -> str: """Writes the case scenery into the game's scenery dir and returns its file name.""" scenery_dir = game_dir / "scenery" @@ -174,7 +179,7 @@ def build_scenery(case: dict, game_dir: Path, case_name: str, vehicle: str) -> s # the simulator caches the scenery's static geometry in .sbt and reads it instead of # the terrain in the .scn (tracks, events and trainsets always come from the .scn), so # drop the cache once the base scenery has changed - cache = scenery_dir / f"autotest_{case_name}.sbt" + cache = scenery_cache(game_dir, case_name) if cache.exists() and cache.stat().st_mtime < (scenery_dir / case["base_scenery"]).stat().st_mtime: cache.unlink() return name @@ -548,6 +553,11 @@ def run_case(name: str, exe: Path, game_dir: Path, timespeed: float, watch: bool watchdog = ", from the real time watchdog" if got == WALL_TIMEOUT else "" say(f" {'PASS' if passed else 'FAIL'} exit code {describe_exit(result.exit_code)}{watchdog}, expected {expect}") ok &= passed + # a run cut short (the real time watchdog, an error, a crash, or closed by us) could have been writing + # the scenery's geometry cache; the simulator checks only the header of it, so the next runs would read + # a truncated one. it is written again on the next run + if result.failure or (not watch and got in (None, "error", WALL_TIMEOUT)): + scenery_cache(game_dir, name).unlink(missing_ok=True) if result.failure: say(f" FAIL {result.failure}") ok = False diff --git a/tests/unit/test_test_mode.cpp b/tests/unit/test_test_mode.cpp index a85d73e52..eba641096 100644 --- a/tests/unit/test_test_mode.cpp +++ b/tests/unit/test_test_mode.cpp @@ -4,6 +4,9 @@ #include "simulation/simulationtestrules.h" #include +#include +#include +#include #include // the test mode of the simulator (eu07 --test, eu07/maszyna#541): its exit codes, command line and end conditions @@ -117,10 +120,13 @@ TEST_CASE("test mode: the command line") CHECK_FALSE(commandline.enabled); CHECK(commandline.error.empty()); } - SUBCASE("the scenery of -edit is optional") + SUBCASE("-edit takes no option for its scenery, which is optional") { + // a scenery after -edit or none: the option after it is read either way CHECK(parse({"-edit", "--test", "-s", "td.scn"}).enabled); - CHECK_FALSE(parse({"-edit", "td.scn"}).enabled); + CHECK(parse({"-edit", "td.scn", "--test"}).enabled); + // -edit leaves -s alone, which takes --test for its scenery, as the simulator reads it + CHECK_FALSE(parse({"-edit", "-s", "--test"}).enabled); } } @@ -241,3 +247,22 @@ TEST_CASE("test mode: the end conditions") CHECK(verdict->result == test_result::fail); } } + +TEST_CASE("test mode: what ended a run the simulator didn't end") +{ + SUBCASE("an exception says what it was") + { + CHECK(simulation::describe_exception(std::make_exception_ptr(std::runtime_error("no scenery"))) == "critical error: no scenery"); + // e.g. std::stof on a token of a scenery which isn't a number + CHECK(simulation::describe_exception(std::make_exception_ptr(std::invalid_argument("stof"))) == "critical error: stof"); + CHECK(simulation::describe_exception(std::make_exception_ptr(std::bad_alloc())).starts_with("critical error: ")); + } + SUBCASE("something thrown which isn't a std::exception") + { + CHECK(simulation::describe_exception(std::make_exception_ptr(42)) == "critical error: an exception of unknown type"); + } + SUBCASE("terminated without an exception") + { + CHECK(simulation::describe_exception(nullptr) == "the simulator was terminated"); + } +} From d0ca44cd6751bbfcbc13bdb45ef09dc04d2672a7 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 8 Nov 2026 19:58:48 +0100 Subject: [PATCH 366/430] fix(ui): a popup begun outside any window stays in the main window too A popup begun outside any window, as the context menus of the editor, the dialogs for a new scenery and for opening one and the pause dialog of the driver are, takes no viewport from a parent. It was put into the main window only where it merged there: with the main window minimized, or behind a panel taken out into a window of its own, it got a window of the system of its own, with an OpenGL context of its own, the way the editor froze. With io.ConfigViewportsNoAutoDetach the tooltips and popups stay in the main window there too. The comment of io.ConfigViewportsNoAutoDetach tells how they're placed: as with the viewports off, not shrunk. io.ConfigTooltipsWrapWidth moves to the miscellaneous options, it works with the viewports off as well, and its comment tells that SetItemTooltip() wraps too and BeginTooltip() doesn't. --- imgui/imgui.cpp | 6 ++++-- imgui/imgui.h | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/imgui/imgui.cpp b/imgui/imgui.cpp index 190f89012..2579bf4d6 100644 --- a/imgui/imgui.cpp +++ b/imgui/imgui.cpp @@ -1491,7 +1491,6 @@ ImGuiIO::ImGuiIO() ConfigViewportsNoDecoration = true; ConfigViewportsNoDefaultParent = false; ConfigViewportsNoAutoDetach = false; - ConfigTooltipsWrapWidth = 0.0f; // Miscellaneous options MouseDrawCursor = false; @@ -1509,6 +1508,7 @@ ImGuiIO::ImGuiIO() ConfigWindowsCopyContentsWithCtrlC = false; ConfigScrollbarScrollByPage = true; ConfigMemoryCompactTimer = 60.0f; + ConfigTooltipsWrapWidth = 0.0f; ConfigDebugIsDebuggerPresent = false; ConfigDebugHighlightIdConflicts = true; ConfigDebugHighlightIdConflictsShowItemPicker = true; @@ -16383,9 +16383,11 @@ static void ImGui::WindowSelectViewport(ImGuiWindow* window) } // Fallback: merge in default viewport if z-order matches, otherwise create a new viewport + // MaSzyna addition: with io.ConfigViewportsNoAutoDetach the tooltips and popups stay in the main viewport here too if (window->Viewport == NULL) if (!UpdateTryMergeWindowIntoHostViewport(window, main_viewport)) - window->Viewport = WindowStaysInHostViewport(window, main_viewport) ? main_viewport : AddUpdateViewport(window, window->ID, window->Pos, window->Size, ImGuiViewportFlags_None); + window->Viewport = (WindowStaysInHostViewport(window, main_viewport) || (g.IO.ConfigViewportsNoAutoDetach && (flags & (ImGuiWindowFlags_Popup | ImGuiWindowFlags_Tooltip)))) + ? main_viewport : AddUpdateViewport(window, window->ID, window->Pos, window->Size, ImGuiViewportFlags_None); // Mark window as allowed to protrude outside of its viewport and into the current monitor if (!lock_viewport) diff --git a/imgui/imgui.h b/imgui/imgui.h index 85f50b79a..6988a0127 100644 --- a/imgui/imgui.h +++ b/imgui/imgui.h @@ -2360,8 +2360,7 @@ struct ImGuiIO bool ConfigViewportsNoTaskBarIcon; // = false // Disable default OS task bar icon flag for secondary viewports. When a viewport doesn't want a task bar icon, ImGuiViewportFlags_NoTaskBarIcon will be set on it. bool ConfigViewportsNoDecoration; // = true // Disable default OS window decoration flag for secondary viewports. When a viewport doesn't want window decorations, ImGuiViewportFlags_NoDecoration will be set on it. Enabling decoration can create subsequent issues at OS levels (e.g. minimum window size). bool ConfigViewportsNoDefaultParent; // = false // Disable default OS parenting to main viewport for secondary viewports. By default, viewports are marked with ParentViewportId = , expecting the platform backend to setup a parent/child relationship between the OS windows (some backend may ignore this). Set to true if you want the default to be 0, then all viewports will be top-level OS windows. - bool ConfigViewportsNoAutoDetach; // = false // MaSzyna addition: a floating window stays inside its host viewport: a resize stops at its edge, and a window left past it, or too big for it, is moved and shrunk to fit. It gets a viewport of its own only when dragged with the mouse cursor past the host viewport. Tooltips and popups shown over the main viewport stay inside it too, moved and shrunk to fit, with no viewport of their own. - float ConfigTooltipsWrapWidth; // = 0.0f // MaSzyna addition: the text of SetTooltip() wraps at this width, in pixels; 0: it doesn't wrap. + bool ConfigViewportsNoAutoDetach; // = false // MaSzyna addition: a floating window stays inside its host viewport: a resize stops at its edge, and a window left past it, or too big for it, is moved and shrunk to fit. It gets a viewport of its own only when dragged with the mouse cursor past the host viewport. Tooltips and popups shown over the main viewport, or begun outside any window, get no viewport of their own either: they are placed inside the main viewport as with the viewports off. // Miscellaneous options // (you can visualize and interact with all options in 'Demo->Configuration') @@ -2376,6 +2375,7 @@ struct ImGuiIO bool ConfigWindowsCopyContentsWithCtrlC; // = false // [EXPERIMENTAL] CTRL+C copy the contents of focused window into the clipboard. Experimental because: (1) has known issues with nested Begin/End pairs (2) text output quality varies (3) text output is in submission order rather than spatial order. bool ConfigScrollbarScrollByPage; // = true // Enable scrolling page by page when clicking outside the scrollbar grab. When disabled, always scroll to clicked location. When enabled, Shift+Click scrolls to clicked location. float ConfigMemoryCompactTimer; // = 60.0f // Timer (in seconds) to free transient windows/tables memory buffers when unused. Set to -1.0f to disable. + float ConfigTooltipsWrapWidth; // = 0.0f // MaSzyna addition: the text of SetTooltip() and SetItemTooltip() wraps at this width, in pixels; 0: it doesn't wrap. BeginTooltip() is not affected. // Inputs Behaviors // (other variables, ones which are expected to be tweaked within UI code, are exposed in ImGuiStyle) From 04b55c866a51d95e38e1a63c29df3cd0c2ade2f3 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 20:03:32 +0100 Subject: [PATCH 367/430] fix(render): alpha to coverage only where it is on, full coverage on flat alpha Review of the alpha to coverage change for alpha tested surfaces: - An alpha which is flat over the pixel (fwidth 0) and equal to the opacity threshold got a coverage of 0.5, so e.g. opacity 1 on an opaque or DXT1 texture turned half see-through with multisampling. Without an alpha edge in the pixel the plain test decides now: step(opacity, alpha). - The shaders took the coverage path whenever they were built with multisampling, also where alpha to coverage is off (the reflections pass) or does nothing (the single-sampled model previews), and grew the cut-outs there by about half a pixel. model_ubo gets an alpha_to_coverage flag, set together with the GL state, and the shaders keep the plain alpha test without it. The previews no longer turn alpha to coverage on. The flag takes 4 of the 12 padding bytes after shadow_tone, so the std140 layout and the size of the block stay the same. - The shader validator never set iMultisampling, so it never compiled the alpha to coverage branches. Its "features on" configuration uses the default of 2 now, on desktop GL and GLES. --- ci_shadervalidator/main.cpp | 3 +++ gl/glsl_common.cpp | 16 ++++++++++++---- gl/ubo.h | 6 +++++- rendering/opengl33renderer.cpp | 8 +++++++- 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/ci_shadervalidator/main.cpp b/ci_shadervalidator/main.cpp index 7a4b53aa2..65ad54b2a 100644 --- a/ci_shadervalidator/main.cpp +++ b/ci_shadervalidator/main.cpp @@ -46,6 +46,8 @@ bool check_shader_allopts(std::string filename) Global.gfx_skippipeline = false; Global.gfx_extraeffects = true; Global.gfx_shadergamma = true; + // the default of the simulator, which compiles the alpha to coverage branches of the shaders + Global.iMultisampling = 2; if (!check_shader(filename)) suc = false; @@ -56,6 +58,7 @@ bool check_shader_allopts(std::string filename) Global.gfx_skippipeline = true; Global.gfx_extraeffects = false; Global.gfx_shadergamma = false; + Global.iMultisampling = 0; if (!check_shader(filename)) suc = false; diff --git a/gl/glsl_common.cpp b/gl/glsl_common.cpp index a0d38de63..e621fdc6b 100644 --- a/gl/glsl_common.cpp +++ b/gl/glsl_common.cpp @@ -65,6 +65,7 @@ void gl::glsl_common_setup() float fog_density; float alpha_mult; float shadow_tone; + float alpha_to_coverage; }; layout (std140) uniform scene_ubo @@ -117,12 +118,19 @@ void gl::glsl_common_setup() // multisampling; otherwise the alpha test keeps or drops whole pixels and its edges stay // jagged whatever the multisampling. the alpha is sharpened to go from 0 to 1 over about // a pixel around the test threshold, so the edge keeps the place and sharpness the alpha - // test gave it. computed before any discard, which leaves the derivatives undefined + // test gave it. computed before any discard, which leaves the derivatives undefined. + // alpha_to_coverage of model_ubo tells whether alpha to coverage is on for this draw; where + // it isn't (reflections, previews) the shaders keep the plain alpha test float alpha_coverage(float alpha) { #if ALPHA_TO_COVERAGE_ENABLED - if (opacity > 0.0) - return clamp((alpha - opacity) / max(fwidth(alpha), 0.0001) + 0.5, 0.0, 1.0); + if (opacity > 0.0 && alpha_to_coverage > 0.0) + { + // a flat alpha has no edge in the pixel and gets the plain test, so an alpha equal + // to the threshold stays fully covered + float fw = fwidth(alpha); + return (fw > 0.0 ? clamp((alpha - opacity) / fw + 0.5, 0.0, 1.0) : step(opacity, alpha)); + } #endif return alpha; } @@ -133,7 +141,7 @@ void gl::glsl_common_setup() bool alpha_test_fail(float alpha, float coverage) { #if ALPHA_TO_COVERAGE_ENABLED - if (opacity > 0.0) + if (opacity > 0.0 && alpha_to_coverage > 0.0) return coverage <= 0.0; #endif return (opacity >= 0.0 ? (alpha < opacity) : (alpha >= -opacity)); diff --git a/gl/ubo.h b/gl/ubo.h index 9d2c96912..0e5901cb3 100644 --- a/gl/ubo.h +++ b/gl/ubo.h @@ -76,7 +76,11 @@ namespace gl float fog_density; float alpha_mult; float shadow_tone; - UBS_PAD(12); + // 1.0 while GL_SAMPLE_ALPHA_TO_COVERAGE is on, so the alpha tested shaders write the + // coverage of their test edge; 0.0 keeps their plain alpha test. set together with + // the GL state by opengl33_renderer::setup_alpha_to_coverage() + float alpha_to_coverage; + UBS_PAD(8); void set_modelview(const glm::mat4 &mv) { diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index d577312b5..39c0d865c 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -1822,6 +1822,10 @@ void opengl33_renderer::setup_matrices() void opengl33_renderer::setup_alpha_to_coverage(bool const Enable) { + // the shaders keep the plain alpha test unless told the coverage of their alpha is used; + // uploaded with the rest of the model block at the next draw + model_ubs.alpha_to_coverage = (Enable ? 1.f : 0.f); + if (Enable == m_alphatocoverageenabled) return; @@ -2390,11 +2394,13 @@ void opengl33_renderer::Bind_Material( material_handle const Material, TSubModel // the alpha test drops or keeps whole pixels, so multisampling alone leaves its edges (e.g. sides // of the trackbed textures) jagged. the alpha tested materials of the opaque colour pass get them - // antialiased with alpha to coverage instead; their shaders give the coverage as the alpha + // antialiased with alpha to coverage instead; their shaders give the coverage as the alpha. + // the model previews draw in colour mode too, but to a single-sampled framebuffer setup_alpha_to_coverage( Global.iMultisampling > 0 && false == m_blendingenabled && m_renderpass.draw_mode == rendermode::color + && false == m_previewing && model_ubs.opacity > 0.f && material.shader->alpha_to_coverage ); From eb75089ba2fa5cc961b4a873c60a79fb1db7aafd Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Sun, 8 Nov 2026 21:12:35 +0100 Subject: [PATCH 368/430] Python screens: ship Pillow with the Windows build, and the screen module for Pillow 10+ - The Windows build job installs Pillow into the Python 3.14 whose Lib, with site-packages, CMake copies next to the executable as python64\Lib, as the Linux job already does; the README says the same for a local build. - Both build jobs copy staticFiles/python/local (the Python 3 version of the module every cab screen subclasses) into python/local of the build. - The module puts back what Pillow 10 removed and the screen scripts use: ImageFont.getsize() and ImageDraw.textsize() on top of getbbox() / textbbox(), and Image.ANTIALIAS as LANCZOS. With an older Pillow nothing changes. Part of #300. --- .github/workflows/build_bin.yml | 25 ++++++++++++++++++- README.md | 2 +- .../python/local/abstractscreenrenderer.py | 20 ++++++++++++++- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_bin.yml b/.github/workflows/build_bin.yml index 2f1781ed8..d37817d5c 100644 --- a/.github/workflows/build_bin.yml +++ b/.github/workflows/build_bin.yml @@ -45,6 +45,15 @@ jobs: python-version: "3.14" architecture: "x64" + # the cab screens are drawn with Pillow; CMake copies this Python's Lib, site-packages included, next to the + # executable as python64\Lib, so Pillow has to be installed here to come with the build (as on Linux) + - name: Install Pillow for the screens + shell: pwsh + run: | + $pythonExe = "${{ steps.python.outputs.python-path }}" + & $pythonExe -m pip install --no-cache-dir Pillow + & $pythonExe -c "from PIL import Image; print('Pillow:', Image.__version__)" + - name: Show environment shell: pwsh run: | @@ -114,6 +123,18 @@ jobs: -Recurse ` -Force + # the Python 3 version of the module every cab screen builds on; the game data still has the Python 2 one + New-Item ` + -ItemType Directory ` + -Force ` + -Path "$output/python/local" | Out-Null + + Copy-Item ` + -Path "staticFiles/python/local/*" ` + -Destination "$output/python/local" ` + -Recurse ` + -Force + - name: Upload Windows build uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: @@ -251,9 +272,11 @@ jobs: - name: Copy shaders and translations run: | - mkdir -p build/bin/shaders build/bin/lang + mkdir -p build/bin/shaders build/bin/lang build/bin/python/local cp -R shaders/. build/bin/shaders/ cp -R lang/. build/bin/lang/ + # the Python 3 version of the module every cab screen builds on; the game data still has the Python 2 one + cp -R staticFiles/python/local/. build/bin/python/local/ - name: Upload Linux build uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 diff --git a/README.md b/README.md index 47741a511..675026ccf 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ MaSzyna compiles and runs natively on **Linux** and **Windows**. Other platforms ## Windows -Install **Python 3.14 x64** from [python.org](https://www.python.org/downloads/windows/) and include the optional **Python native development** feature (headers and `.lib` for embedding). Pass `-DPython3_ROOT_DIR="C:\Path\To\Python314"` on the `cmake` line when you want the layout under that directory used for embedding and for copying `Lib` / `DLLs` next to the executable. +Install **Python 3.14 x64** from [python.org](https://www.python.org/downloads/windows/) and include the optional **Python native development** feature (headers and `.lib` for embedding). Pass `-DPython3_ROOT_DIR="C:\Path\To\Python314"` on the `cmake` line when you want the layout under that directory used for embedding and for copying `Lib` / `DLLs` next to the executable. The cab screens are drawn with [Pillow](https://pypi.org/project/pillow/): install it into that Python (`python -m pip install Pillow`) before building, so it is copied along with `Lib`. **AppVeyor CI** builds with the worker image’s preinstalled Python at `C:/Python314-x64` (see [`appveyor.yml`](./appveyor.yml): `-DPython3_ROOT_DIR=...`). diff --git a/staticFiles/python/local/abstractscreenrenderer.py b/staticFiles/python/local/abstractscreenrenderer.py index ea8be2c56..3ebf20813 100644 --- a/staticFiles/python/local/abstractscreenrenderer.py +++ b/staticFiles/python/local/abstractscreenrenderer.py @@ -1,7 +1,25 @@ -from PIL import Image +from PIL import Image, ImageDraw, ImageFont from math import ceil, floor, cos, sin, radians import os +# Pillow 10 removed ImageFont.getsize(), ImageDraw.textsize() and Image.ANTIALIAS, which the screen scripts use; for +# Python 3.14 only a newer Pillow is available, so they are put back, on top of getbbox() / textbbox() and LANCZOS +def _font_getsize(self, text, *args, **kwargs): + box = self.getbbox(text, *args, **kwargs) + return (box[2], box[3]) + +def _draw_textsize(self, text, font=None, *args, **kwargs): + box = self.textbbox((0, 0), text, font, *args, **kwargs) + return (box[2], box[3]) + +for _fontclass in (ImageFont.FreeTypeFont, ImageFont.ImageFont, getattr(ImageFont, 'TransposedFont', None)): + if _fontclass is not None and not hasattr(_fontclass, 'getsize') and hasattr(_fontclass, 'getbbox'): + _fontclass.getsize = _font_getsize +if not hasattr(ImageDraw.ImageDraw, 'textsize'): + ImageDraw.ImageDraw.textsize = _draw_textsize +if not hasattr(Image, 'ANTIALIAS'): + Image.ANTIALIAS = Image.LANCZOS + class abstractscreenrenderer(): def __init__(self, lookup_path): self.width = 0 From db65dfa5f0ef58370dad7802fc0d44d83d628984 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 21:15:12 +0100 Subject: [PATCH 369/430] test: file-local helpers instead of lambdas in the brake handle tests (Sonar S2259) The analyser loses track of references captured by lambdas; the St113 EP and MHZ buttons tests call plain helpers, as ep_brake() and ready_knorr_ep() do, which it doesn't report. --- tests/unit/test_brake_handles.cpp | 49 ++++++++++++++++--------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/tests/unit/test_brake_handles.cpp b/tests/unit/test_brake_handles.cpp index eeecac75d..889beb338 100644 --- a/tests/unit/test_brake_handles.cpp +++ b/tests/unit/test_brake_handles.cpp @@ -59,6 +59,13 @@ void every_position(vehicle &Vehicle, test::trace &Trace) { hold(Vehicle, Trace, "running", handle.GetPos(bh_RP), 60.0); } +// the handle put to the given position and the vehicle driven from its cab for Seconds, marked in the trace +void driven_at(vehicle &Vehicle, test::trace &Trace, std::string const &Event, double Position, double Seconds) { + Trace.mark(Event); + Vehicle->BrakeLevelSet(Position); + test::drive(test::driving(Vehicle), {}, Seconds); +} + } // namespace TEST_CASE("brake handles: every position of the driver's handle of every real vehicle") { @@ -131,25 +138,19 @@ TEST_CASE("brake handles: the overload and the high pressure buttons of the MHZ real.record(trace); REQUIRE(real->Handle != nullptr); auto &handle{*real->Handle}; - auto &mover{real.mover()}; - auto const at{[&trace, &real, &mover](std::string const &Event, double Position, double Seconds) { - trace.mark(Event); - mover.BrakeLevelSet(Position); - test::drive(test::driving(real), {}, Seconds); - }}; - at("running", handle.GetPos(bh_RP), 60.0); + driven_at(real, trace, "running", handle.GetPos(bh_RP), 60.0); auto const running{real->PipePress}; handle.SetUniversalFlag(TUniversalBrake::ub_Overload); - at("overload button", handle.GetPos(bh_RP), 30.0); + driven_at(real, trace, "overload button", handle.GetPos(bh_RP), 30.0); handle.SetUniversalFlag(0); auto const overloaded{real->PipePress}; - at("overload decaying", handle.GetPos(bh_RP), 240.0); + driven_at(real, trace, "overload decaying", handle.GetPos(bh_RP), 240.0); auto const decayed{real->PipePress}; handle.SetUniversalFlag(TUniversalBrake::ub_HighPressure); - at("high pressure button, filling stroke", handle.GetPos(bh_FS), 10.0); + driven_at(real, trace, "high pressure button, filling stroke", handle.GetPos(bh_FS), 10.0); auto const filled{real->PipePress}; handle.SetUniversalFlag(0); - at("running", handle.GetPos(bh_RP), 120.0); + driven_at(real, trace, "running", handle.GetPos(bh_RP), 120.0); CHECK(running == doctest::Approx(5.0).epsilon(0.01)); CHECK(overloaded > running + 0.3); CHECK(decayed < overloaded); @@ -189,6 +190,14 @@ double ep_brake(test::consist &Unit, double Position, double Seconds) { return cab->BrakePress; } +// the EP force the St113 handle of the cab car gives in the given position +double ep_at(test::consist &Unit, double Position) { + auto &cab{Unit[0]}; + cab->BrakeLevelSet(Position); + Unit.run(0.1); + return cab->Handle->GetEP(); +} + } // namespace TEST_CASE("brake handles: the positions of the Knorr St113 EP brake") { @@ -197,20 +206,14 @@ TEST_CASE("brake handles: the positions of the Knorr St113 EP brake") { auto &cab{unit[0]}; REQUIRE(cab->Handle != nullptr); auto &handle{*cab->Handle}; - auto &mover{cab.mover()}; - auto const ep_at{[&unit, &mover, &handle](double Position) { - mover.BrakeLevelSet(Position); - unit.run(0.1); - return handle.GetEP(); - }}; // the keys: Num 6 running, Num 8 the first position on, Num 5 the middle of the handle CHECK(handle.GetPos(bh_RP) == doctest::Approx(0.0)); - CHECK(ep_at(0.0) == doctest::Approx(-1.0)); // EP release - CHECK(ep_at(1.0) == doctest::Approx(1.0)); // EP brake - CHECK(ep_at(cab->BrakeCtrlPosNo / 2) == doctest::Approx(0.0)); // lap, Num 5 - CHECK(ep_at(handle.GetPos(bh_FB)) == doctest::Approx(0.0)); - CHECK(ep_at(handle.GetPos(bh_EPR)) == doctest::Approx(-1.0)); - CHECK(ep_at(handle.GetPos(bh_EPB)) == doctest::Approx(1.0)); + CHECK(ep_at(unit, 0.0) == doctest::Approx(-1.0)); // EP release + CHECK(ep_at(unit, 1.0) == doctest::Approx(1.0)); // EP brake + CHECK(ep_at(unit, cab->BrakeCtrlPosNo / 2) == doctest::Approx(0.0)); // lap, Num 5 + CHECK(ep_at(unit, handle.GetPos(bh_FB)) == doctest::Approx(0.0)); + CHECK(ep_at(unit, handle.GetPos(bh_EPR)) == doctest::Approx(-1.0)); + CHECK(ep_at(unit, handle.GetPos(bh_EPB)) == doctest::Approx(1.0)); } TEST_CASE("brake handles: the Knorr St113 EP brake needs the control of the cab powered") { From 64d1b7f8474e68f33cebf04759a2b94c82d27c69 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 8 Nov 2026 21:38:16 +0100 Subject: [PATCH 370/430] fix: the inspector takes a train below 1 km/h for standing and a bank run for a train (review of #282) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The AI inspects the train while it still creeps to a stop (W4, Shunt to Obey_train) and as it couples, so the 0.05 km/h threshold missed the §19.9 cut-out; it now uses EU07_AI_MOVEMENT. Bank counts as a train, as in the braking tables. --- tests/unit/test_brake_setting.cpp | 48 ++++++++++++++++++++++++++++++- vehicle/Driver.cpp | 9 +++--- vehicle/brakesetting.cpp | 14 +++++++-- vehicle/brakesetting.h | 16 +++++++++-- 4 files changed, 77 insertions(+), 10 deletions(-) diff --git a/tests/unit/test_brake_setting.cpp b/tests/unit/test_brake_setting.cpp index 2d5b02a41..93fb54a76 100644 --- a/tests/unit/test_brake_setting.cpp +++ b/tests/unit/test_brake_setting.cpp @@ -5,6 +5,7 @@ #include "McZapkie/hamulce.h" #include "vehicle.h" #include "vehicle/brakesetting.h" +#include "vehicle/Driver.h" // the brake settings the AI wagon inspector (TController::AutoRewident) chooses for a train, by the // brake instruction Cw-1 (Mw56) §18 and §19 (eu07/maszyna#350) @@ -18,7 +19,7 @@ constexpr int P{bdelay_P}; constexpr int R{bdelay_R}; constexpr int M{bdelay_M}; -// how the AI runs the consist the inspector looks at: as a train (Obey_train), or shunting it +// how the AI runs the consist the inspector looks at: as a train (Obey_train or Bank), or shunting it constexpr bool as_train{true}; constexpr bool shunting{false}; // whether the train stands, as AutoRewident() tells the inspector @@ -345,6 +346,51 @@ TEST_CASE("brake setting: the inspector doesn't cut a brake out on the run, it w CHECK(false == car->BrakeCutOutByInspector); } +TEST_CASE("brake setting: a train creeping to a stop or coupling counts as standing, one on the run doesn't") { + // the AI looks at the train at a W4 and when it switches from shunting to the train run below 1 km/h, and as it + // couples at the coupling speed: the inspector takes those for a standstill + CHECK(brake_setting::at_standstill(0.0)); + CHECK(brake_setting::at_standstill(0.04)); + CHECK(brake_setting::at_standstill(0.9)); + CHECK(brake_setting::at_standstill(-0.9)); + CHECK(false == brake_setting::at_standstill(EU07_AI_MOVEMENT)); + CHECK(false == brake_setting::at_standstill(30.0)); + + // checked at 0.9 km/h: the brake is cut out + test::vehicle creeping{passenger_car_definition()}; + charge_and_apply(creeping); + CHECK(inspect_heavy_train(creeping, as_train, brake_setting::at_standstill(0.9)) == brake_setting::cut_out); + CHECK(brake_setting::is_cut_out(creeping.mover())); + CHECK(creeping->BrakeCutOutByInspector); + // checked at 30 km/h: the car keeps its brake + test::vehicle running{passenger_car_definition()}; + charge_and_apply(running); + CHECK(inspect_heavy_train(running, as_train, brake_setting::at_standstill(30.0)) == brake_setting::cut_out); + CHECK(false == brake_setting::is_cut_out(running.mover())); + CHECK(false == running->BrakeCutOutByInspector); + running.run(5.0); + CHECK(running->BrakePress > 1.0); +} + +TEST_CASE("brake setting: a bank engine's run counts as a train, shunting doesn't") { + CHECK(brake_setting::runs_as_train(Obey_train)); + CHECK(brake_setting::runs_as_train(Bank)); + CHECK(brake_setting::runs_as_train(Obey_train | Connect)); + CHECK(false == brake_setting::runs_as_train(Shunt)); + CHECK(false == brake_setting::runs_as_train(Loose_shunt)); + CHECK(false == brake_setting::runs_as_train(Connect)); + CHECK(false == brake_setting::runs_as_train(Wait_for_orders)); + + // a heavy consist on G banked: the wagon without G has its brake cut out, as in a train + test::vehicle car{passenger_car_definition()}; + charge_and_apply(car); + CHECK(inspect_heavy_train(car, brake_setting::runs_as_train(Bank)) == brake_setting::cut_out); + CHECK(brake_setting::is_cut_out(car.mover())); + // shunted: it's back on P + CHECK(inspect_heavy_train(car, brake_setting::runs_as_train(Shunt)) == P); + CHECK(false == brake_setting::is_cut_out(car.mover())); +} + TEST_CASE("brake setting: R+Mg brakes as hard as R at speed, the rapid stage of an LSt kept") { // the inspector sets R+Mg (Cw-1 §18.2), the bits of R and Mg together: the valves test the bit of R, not // the whole setting, so the high stage of R at speed stays on with Mg. the EU07's LSt given an Mg here diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index b4f790768..0099c799c 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -2167,11 +2167,12 @@ void TController::AutoRewident() consist.emplace_back(brake_setting::describe(*d->MoverParameters, d == pVehicle)); } // 2. Określenie typu pociągu i nastaw: by the brake instruction Cw-1 (eu07/maszyna#350), or as the releases before it did. - // brakes are cut out (Cw-1 §19.9) only in a train, not in a consist being shunted - auto const train{(OrderCurrentGet() & Obey_train) != 0}; + // brakes are cut out (Cw-1 §19.9) only in a train (a bank engine's run included), not in a consist being shunted + auto const train{brake_setting::runs_as_train(OrderCurrentGet())}; auto const settings{Global.AIBrakeSettingCw1 ? brake_setting::choose(consist, train) : brake_setting::choose_legacy(consist)}; - // and only at a standstill: a check on the run (the order changed mid-run) leaves them to the next one - auto const standstill{false == (mvOccupied->Vel > EU07_AI_NOMOVEMENT)}; + // and only at a standstill, the train creeping to a stop or coupling included: a check on the run (the order changed + // mid-run) leaves them to the next one + auto const standstill{brake_setting::at_standstill(mvOccupied->Vel)}; // a light engine counts as a passenger train for the braking below auto const passengertrain{brake_setting::passenger(brake_setting::choose_train_setting(consist))}; // 3. Nastawianie diff --git a/vehicle/brakesetting.cpp b/vehicle/brakesetting.cpp index bafe8a95b..f27c136ca 100644 --- a/vehicle/brakesetting.cpp +++ b/vehicle/brakesetting.cpp @@ -12,8 +12,10 @@ http://mozilla.org/MPL/2.0/. #include "McZapkie/MOVER.h" #include "McZapkie/hamulce.h" +#include "vehicle/Driver.h" #include +#include namespace brake_setting { @@ -156,8 +158,8 @@ std::vector choose(std::vector const &Consist, bool const Train) { } else if (item.powered || item.driven || item.delays == 0 || false == Train) { // a locomotive, or the vehicle the train is driven from, keeps a working brake: on P. a vehicle - // which tells no settings at all is left alone. a consist being shunted isn't a train and §19.9 - // doesn't apply to it: its wagons keep their brakes, on P + // which tells no settings at all is left alone. a consist being shunted isn't a train (a bank + // engine's run is) and §19.9 doesn't apply to it: its wagons keep their brakes, on P settings.emplace_back(pick(item.delays, bdelay_P, bdelay_P)); } else { @@ -171,6 +173,14 @@ std::vector choose(std::vector const &Consist, bool const Train) { return settings; } +bool runs_as_train(int const Orders) { + return (Orders & (Obey_train | Bank)) != 0; +} + +bool at_standstill(double const Velocity) { + return std::abs(Velocity) < EU07_AI_MOVEMENT; +} + std::vector choose_legacy(std::vector const &Consist) { wagon_counts const counts{Consist}; auto length{0.0}; diff --git a/vehicle/brakesetting.h b/vehicle/brakesetting.h index 789f52808..b555850fb 100644 --- a/vehicle/brakesetting.h +++ b/vehicle/brakesetting.h @@ -56,11 +56,21 @@ constexpr bool passenger(train_setting const Setting) { // without the setting the train needs gets the other one of G and P it has, and 0 (left as it is) // when it has neither. In a train on G (freight_g) a wagon without G gets cut_out instead: its brake // is to be cut out (Cw-1 §19.9). A locomotive and the vehicle the train is driven from keep their -// brake working, on P. Train tells the AI runs the consist as a train (Obey_train): §19.9 is about -// trains, so in shunting (or banking) nothing is cut out and a wagon without G brakes on P, which puts -// back a brake the inspector cut out before +// brake working, on P. Train tells the AI runs the consist as a train (runs_as_train()): §19.9 is about +// trains, so in shunting nothing is cut out and a wagon without G brakes on P, which puts back a brake +// the inspector cut out before std::vector choose(std::vector const &Consist, bool Train); +// the AI runs the consist as a train, rather than shunting it: Obey_train, or Bank, which it drives as a +// train run too (with the braking of a train). Orders is the order of the AI (TOrders) +bool runs_as_train(int Orders); + +// the train stands for the inspector: slower than the AI takes for a deliberate movement (EU07_AI_MOVEMENT). +// the AI looks at the train while it still creeps to a stop (at a W4, or switching from shunting to the train +// run) and as it couples (at the coupling speed), so a stricter threshold would miss those checks; a train +// really on the run (an order changed mid-run) stays above it +bool at_standstill(double Velocity); + // the inspector of the releases before eu07/maszyna#350, kept for ai.brakesetting.cw1 no. the settings // are requests: a vehicle which doesn't have the one asked for keeps its own std::vector choose_legacy(std::vector const &Consist); From 58e4bbff49451cb1d6943bb674d9c2532b4cf92e Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 9 Nov 2026 07:56:51 +0100 Subject: [PATCH 371/430] fix(editor): a model turned with the gizmo about the vertical axis no longer jumps back and forth The angles of the whole gizmo matrix were decomposed every frame and the model was turned by their difference from its own. The decomposition gives the angle about the vertical axis only within -90..90 degrees: past 90 it comes out as 180 - angle with the other two axes turned by 180, so a drag one way turned the model back and flipped it. The turn is now taken from the delta matrix of this frame (small, so its angles decompose with no ambiguity) and wrapped to -180..180. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01DDcMn1Q7wdYkbxDUWscNHZ --- application/editormode.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 32f991c55..1ad3ef6ed 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -4804,8 +4804,12 @@ void editor_mode::render_gizmo() snapvalue = glm::vec3(0.1f); float const *snap = Global.ctrlState && snapvalue.x > 0.0f ? glm::value_ptr(snapvalue) : nullptr; + // the change of this frame alone: a turn is taken from it, not from the angles the whole matrix decomposes into, + // which can't tell a turn of more than 90 degrees about the vertical axis (it comes out as 180 - angle with the + // other two axes flipped, and the model turned back and forth while dragged one way) + glm::mat4 delta(1.0f); ImGuizmo::Manipulate(glm::value_ptr(view), glm::value_ptr(projection), - operation, mode, glm::value_ptr(matrix), nullptr, snap); + operation, mode, glm::value_ptr(matrix), glm::value_ptr(delta), snap); if (ImGuizmo::IsUsing()) { @@ -4822,9 +4826,11 @@ void editor_mode::render_gizmo() if (operation == ImGuizmo::ROTATE && model) { - // apply the rotation delta relative to the model's current orientation - glm::vec3 const newangles(newrotation[0], newrotation[1], newrotation[2]); - auto const turned{newangles - model->Angles()}; + // the turn of this frame, small, so its angles decompose with no ambiguity + float deltatranslation[3], deltarotation[3], deltascale[3]; + ImGuizmo::DecomposeMatrixToComponents(glm::value_ptr(delta), deltatranslation, deltarotation, deltascale); + auto const wrapped = [](float Angle) { return Angle - 360.0f * std::floor((Angle + 180.0f) / 360.0f); }; + glm::vec3 const turned{wrapped(deltarotation[0]), wrapped(deltarotation[1]), wrapped(deltarotation[2])}; m_editor.rotate(model, turned, 0.0f); selection_follow(glm::dvec3(0.0), turned, model->location()); } From 963d65192a07e19739cf61d5ef8670067a83a081 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Mon, 9 Nov 2026 11:23:46 +0100 Subject: [PATCH 372/430] fix(render): scale of model instances in the legacy and simple renderers --- rendering/openglrenderer.cpp | 76 ++++++++++++++++++++++++++++-------- rendering/openglrenderer.h | 1 + 2 files changed, 61 insertions(+), 16 deletions(-) diff --git a/rendering/openglrenderer.cpp b/rendering/openglrenderer.cpp index 180dba771..371c26716 100644 --- a/rendering/openglrenderer.cpp +++ b/rendering/openglrenderer.cpp @@ -68,6 +68,28 @@ submodel_material( TSubModel const *Submodel ) { null_handle ); } +bool +is_scaled( glm::vec3 const &Scale ) { + + return ( Scale.x != 1.0f ) || ( Scale.y != 1.0f ) || ( Scale.z != 1.0f ); +} + +// pushes the placement of a scaled model instance: the translation and rotation of Render( TModel3d *, ..., Position, Angle ), +// followed by the scale of the instance, applied before the submodel transforms (as in the opengl 3.3 renderer) +void +push_scaled_instance_transform( glm::dvec3 const &Position, glm::vec3 const &Angle, glm::vec3 const &Scale ) { + + ::glPushMatrix(); + ::glTranslated( Position.x, Position.y, Position.z ); + if( Angle.y != 0.0 ) + ::glRotatef( Angle.y, 0.f, 1.f, 0.f ); + if( Angle.x != 0.0 ) + ::glRotatef( Angle.x, 1.f, 0.f, 0.f ); + if( Angle.z != 0.0 ) + ::glRotatef( Angle.z, 0.f, 0.f, 1.f ); + ::glScalef( Scale.x, Scale.y, Scale.z ); +} + } // namespace float const EU07_OPACITYDEFAULT { 0.5f }; @@ -2475,12 +2497,23 @@ opengl_renderer::Render( TAnimModel *Instance ) { Instance->RaPrepare(); if( Instance->pModel ) { // renderowanie rekurencyjne submodeli - Render( - Instance->pModel, - Instance->Material(), - distancesquared, - Instance->location() - m_renderpass.camera.position(), - Instance->vAngle ); + auto const position { Instance->location() - m_renderpass.camera.position() }; + if( is_scaled( Instance->Scale() ) ) { + // the scale stretches the normals too, they're normalized again for the lighting + push_scaled_instance_transform( position, Instance->vAngle, Instance->Scale() ); + m_normalizenormals = true; + Render( Instance->pModel, Instance->Material(), distancesquared ); + m_normalizenormals = false; + ::glPopMatrix(); + } + else { + Render( + Instance->pModel, + Instance->Material(), + distancesquared, + position, + Instance->vAngle ); + } // debug data ++m_renderpass.draw_stats.models; } @@ -2848,7 +2881,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { break; } } #else - if( true == m_renderspecular ) { + if( ( true == m_renderspecular ) || ( true == m_normalizenormals ) ) { ::glEnable( GL_NORMALIZE ); } #endif @@ -2937,7 +2970,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { break; } } #else - if( true == m_renderspecular ) { + if( ( true == m_renderspecular ) || ( true == m_normalizenormals ) ) { ::glDisable( GL_NORMALIZE ); } #endif @@ -3632,12 +3665,23 @@ opengl_renderer::Render_Alpha( TAnimModel *Instance ) { Instance->RaPrepare(); if( Instance->pModel ) { // renderowanie rekurencyjne submodeli - Render_Alpha( - Instance->pModel, - Instance->Material(), - distancesquared, - Instance->location() - m_renderpass.camera.position(), - Instance->vAngle ); + auto const position { Instance->location() - m_renderpass.camera.position() }; + if( is_scaled( Instance->Scale() ) ) { + // the scale stretches the normals too, they're normalized again for the lighting + push_scaled_instance_transform( position, Instance->vAngle, Instance->Scale() ); + m_normalizenormals = true; + Render_Alpha( Instance->pModel, Instance->Material(), distancesquared ); + m_normalizenormals = false; + ::glPopMatrix(); + } + else { + Render_Alpha( + Instance->pModel, + Instance->Material(), + distancesquared, + position, + Instance->vAngle ); + } } } @@ -3940,7 +3984,7 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { break; } } #else - if( true == m_renderspecular ) { + if( ( true == m_renderspecular ) || ( true == m_normalizenormals ) ) { ::glEnable( GL_NORMALIZE ); } #endif @@ -4010,7 +4054,7 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { break; } } #else - if( true == m_renderspecular ) { + if( ( true == m_renderspecular ) || ( true == m_normalizenormals ) ) { ::glDisable( GL_NORMALIZE ); } #endif diff --git a/rendering/openglrenderer.h b/rendering/openglrenderer.h index 3a3538a6c..15c9e7cdb 100644 --- a/rendering/openglrenderer.h +++ b/rendering/openglrenderer.h @@ -364,6 +364,7 @@ private: float m_specularopaquescalefactor { 1.f }; float m_speculartranslucentscalefactor { 1.f }; bool m_renderspecular{ false }; // controls whether to include specular component in the calculations + bool m_normalizenormals{ false }; // set while a scaled model instance is drawn, its normals need normalizing for the lighting renderpass_config m_renderpass; // parameters for current render pass section_sequence m_sectionqueue; // list of sections in current render pass From e8735f15648ca79a059ff7c4811513c2d24beaf4 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Mon, 9 Nov 2026 15:54:10 +0100 Subject: [PATCH 373/430] fix: the copies of the odometer counter (duplicate: yes) drop their offset too the counter's offset no longer applies once it shows the odometer, the copies of the control which master added kept theirs and showed it on top --- vehicle/Gauge.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vehicle/Gauge.h b/vehicle/Gauge.h index 173c8a9f6..8d27c1144 100644 --- a/vehicle/Gauge.h +++ b/vehicle/Gauge.h @@ -58,11 +58,14 @@ public: // copies of the control animated along with it, from its definitions marked duplicate: yes std::vector const &mirrors() const { return m_mirrors; } - // the value shown is value * scale + offset + // the value shown is value * scale + offset. the copies of the control (mirrors()) show the same value, so they + // get the same offset float offset() const { return m_offset; } void offset( float const Offset ) { - m_offset = Offset; } + m_offset = Offset; + for( auto &mirror : m_mirrors ) { + mirror.m_offset = Offset; } } float scale() const { return m_scale; } // returns offset of submodel associated with the button from the model centre From 729f15e8787f649f362e9bc3c9c6f7d979010290 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Mon, 9 Nov 2026 16:01:16 +0100 Subject: [PATCH 374/430] fix: a test run neither reads nor saves the player's odometer store the autotests (--test, Global.test.enabled) run the vehicles of the player's game: their odometers count from the legacy or made up states in a store of their own, and nothing is written to eu07_odometers.txt --- tests/unit/test_odometer.cpp | 23 +++++++++++++++++++++++ vehicle/odometer.cpp | 13 +++++++++++++ vehicle/odometer.h | 8 ++++++-- 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/tests/unit/test_odometer.cpp b/tests/unit/test_odometer.cpp index 853072d33..4ae5c454a 100644 --- a/tests/unit/test_odometer.cpp +++ b/tests/unit/test_odometer.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "doctest.h" #include "vehicle.h" +#include "utilities/Globals.h" #include "vehicle/odometer.h" #include @@ -360,3 +361,25 @@ TEST_CASE("odometer: two simulations saving one file keep each other's states") CHECK(load().size() == 1); } } + +TEST_CASE("odometer: a test run neither reads nor saves the player's store") { + if (false == Global.test.enabled) + CHECK(odometer::persistent()); + // the autotests (--test) run the vehicles of the player's game, their runs aren't the player's + struct test_mode { + bool const was{Global.test.enabled}; + test_mode() { Global.test.enabled = true; } + test_mode(test_mode const &) = delete; + test_mode &operator=(test_mode const &) = delete; + ~test_mode() { Global.test.enabled = was; } + } const testmode; + // stops before the player's file is touched, if the gate is gone + REQUIRE_FALSE(odometer::persistent()); + + auto &states{odometer::states()}; + states.record("tested", run(1000.0, 5000.0)); + CHECK(states.find("tested").value() == doctest::Approx(1005.0)); + CHECK(odometer::save()); + // a save to the file would have cleared it + CHECK(states.modified()); +} diff --git a/vehicle/odometer.cpp b/vehicle/odometer.cpp index 3584253d3..e7e671d25 100644 --- a/vehicle/odometer.cpp +++ b/vehicle/odometer.cpp @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "vehicle/odometer.h" +#include "utilities/Globals.h" #include "utilities/Logs.h" #include "utilities/utilities.h" @@ -227,7 +228,17 @@ std::filesystem::path file() { return path.empty() ? std::filesystem::path{"eu07_odometers.txt"} : path; } +bool persistent() { + return false == Global.test.enabled; +} + store &states() { + if (false == persistent()) { + // the vehicles of a test run count their odometers as usual, from the guessed or legacy states, with nothing + // read from or saved to the player's file + static store scratch; + return scratch; + } static store odometers = [] { store result; std::ifstream input{file(), std::ios::binary}; @@ -292,6 +303,8 @@ bool save(store &States, std::filesystem::path const &File) { } bool save() { + if (false == persistent()) + return true; return save(states(), file()); } diff --git a/vehicle/odometer.h b/vehicle/odometer.h index 1414548c9..110554ef6 100644 --- a/vehicle/odometer.h +++ b/vehicle/odometer.h @@ -101,14 +101,18 @@ reading starting_state(store const &States, std::string const &Vehicle, std::fil // (the counter shows the odometer). nothing for a counter without an offset std::optional counter_seed(float Offset, float Scale); -// the odometer store of the simulation, read from the user's settings directory on the first use +// the store of the simulation is the player's file: false in a test run (--test, Global.test.enabled), whose vehicles +// neither start from the player's states nor change them +bool persistent(); +// the odometer store of the simulation, read from the user's settings directory on the first use. in a test run an +// empty one, not read from anywhere store &states(); std::filesystem::path file(); // writes the store to the file when anything was recorded since, merged with what other simulations saved in the // file meanwhile. it's written to a file of this process aside first, then put in place. returns false when the // write failed bool save(store &States, std::filesystem::path const &File); -// saves the store of the simulation to its file +// saves the store of the simulation to its file. a test run doesn't save it bool save(); } // namespace odometer From acf0716a9ca1ee1f4459e4f69802f2d875a74146 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Mon, 9 Nov 2026 16:12:13 +0100 Subject: [PATCH 375/430] fix: keep the odometers of the vehicles with a driver's cab only every vehicle which ran got a line in the store, the wagons of the AI's trains in every scenario too. the store records a vehicle with a driver's brake valve (BrakeHandle in the .fiz), which can show its odometer; the locomotives and units the AI runs before a player's cab loads them still get in with their replaceable made up states. the states already in the file stay as they are --- McZapkie/MOVER.h | 7 +++++ tests/unit/test_odometer.cpp | 51 ++++++++++++++++++++++++++++++++++++ vehicle/DynObj.cpp | 4 +-- vehicle/odometer.cpp | 6 +++++ vehicle/odometer.h | 7 +++++ 5 files changed, 73 insertions(+), 2 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index f5de00931..d461269b1 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -2566,6 +2566,13 @@ class TMoverParameters { return JointEngineStart ? range_t::consist : range_t::local; } + // whether the vehicle has a driver's cab: it has the driver's brake valve (BrakeHandle in the Cntrl. section of the + // .fiz), which the wagons and most cars of the units without a cab don't (a few copy the Cntrl. section of the cab + // car, as the EN57 s car does). it's the vehicle type's, unlike the cab the scenario puts a driver in + bool HasDriverCab() const + { + return BrakeHandle != TBrakeHandle::NoHandle; + } // whether the cab command opening the main circuit opens it where the only cab switch of the circuit is the button // closing it: on a diesel that's the starter button, and the command is the one way to stop an engine whose fuel pump // starts on its own (eu07/maszyna#427). the other vehicles with such a button keep ignoring the command diff --git a/tests/unit/test_odometer.cpp b/tests/unit/test_odometer.cpp index 4ae5c454a..5e287116b 100644 --- a/tests/unit/test_odometer.cpp +++ b/tests/unit/test_odometer.cpp @@ -383,3 +383,54 @@ TEST_CASE("odometer: a test run neither reads nor saves the player's store") { // a save to the file would have cleared it CHECK(states.modified()); } + +TEST_CASE("odometer: the vehicles with a driver's cab are the ones with the driver's brake valve") { + // the definitions of the game: a locomotive, cab cars of units, a motor car of a unit without a cab, the wagons + struct expected { + char const *path; + bool cab; + }; + for (auto const &[path, cab] : {expected{"4e_v1/4e", true}, expected{"sm42_v1/6d1", true}, expected{"en57_v1/5bgb", true}, + expected{"21xm_v1/214ma", true}, expected{"impuls_v1/31we-a_pr", true}, + expected{"ed72_v1/6bs-sa", false}, expected{"impuls_v1/31we-b_pr", false}, + expected{"11xa_v2/93a", false}, expected{"bdhpumn_v3/bdhpumn", false}, + expected{"430w_v2/430w", false}}) { + CAPTURE(path); + test::vehicle vehicle{test::definition::fiz(path)}; + CHECK(vehicle->HasDriverCab() == cab); + } + test::vehicle wagon{test::definition::load("wagon")}; + CHECK_FALSE(wagon->HasDriverCab()); + test::vehicle locomotive{test::definition::load("wagon").set("Cntrl", "BrakeHandle", "FV4a")}; + CHECK(locomotive->HasDriverCab()); +} + +TEST_CASE("odometer: only the vehicles with a driver's cab are recorded") { + odometer::store store; + SUBCASE("a wagon which ran doesn't get in") { + odometer::record(store, "wagon", false, run(5000.0, 1000.0)); + CHECK_FALSE(store.find("wagon").has_value()); + CHECK_FALSE(store.modified()); + } + SUBCASE("a locomotive the AI ran before any cab loaded it gets in with its made up state, still replaceable") { + odometer::reading ai; + ai.begin(odometer::guessed_state("ET22-100"), odometer::origin::guessed); + ai.run(2000.0); + odometer::record(store, "ET22-100", true, ai); + CHECK(store.find("ET22-100").value() == doctest::Approx(ai.km)); + CHECK(store.guessed("ET22-100")); + CHECK(store.modified()); + } + SUBCASE("the state of a wagon already in the file stays as it was, and is written back") { + std::stringstream file{"300 old wagon\n"}; + store.read(file); + odometer::record(store, "old wagon", false, run(300.0, 1000.0)); + CHECK(store.find("old wagon").value() == 300.0); + CHECK_FALSE(store.modified()); + std::stringstream written; + store.write(written); + odometer::store read; + CHECK(read.read(written) == 1); + CHECK(read.find("old wagon").value() == 300.0); + } +} diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index 46e634b9f..06955e694 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -8817,7 +8817,7 @@ vehicle_table::save_odometers() { auto &odometers { odometer::states() }; for( auto const *vehicle : m_items ) { if( vehicle->MoverParameters != nullptr ) { - odometers.record( vehicle->name(), vehicle->MoverParameters->Odometer ); + odometer::record( odometers, vehicle->name(), vehicle->MoverParameters->HasDriverCab(), vehicle->MoverParameters->Odometer ); } } odometer::save(); @@ -8970,7 +8970,7 @@ vehicle_table::erase_disabled() { // the distance the vehicle ran goes in the odometer store now, it doesn't depend on the vehicle being // kept on the list until the next save (eu07/maszyna#72) if( vehicle->MoverParameters != nullptr ) { - odometer::states().record( vehicle->name(), vehicle->MoverParameters->Odometer ); + odometer::record( odometer::states(), vehicle->name(), vehicle->MoverParameters->HasDriverCab(), vehicle->MoverParameters->Odometer ); } if( vehicle->MyTrack != nullptr && true == vehicle->MyTrack->RemoveDynamicObject(vehicle) ) { diff --git a/vehicle/odometer.cpp b/vehicle/odometer.cpp index e7e671d25..60c119f12 100644 --- a/vehicle/odometer.cpp +++ b/vehicle/odometer.cpp @@ -158,6 +158,12 @@ void store::record(std::string const &Vehicle, reading const &Odometer) { m_modified = true; } +void record(store &States, std::string const &Vehicle, bool const Drivercab, reading const &Odometer) { + if (false == Drivercab) + return; + States.record(Vehicle, Odometer); +} + void store::merge(store const &Other) { for (auto const &[name, other] : Other.m_states) { auto const [lookup, added] {m_states.try_emplace(name, other)}; diff --git a/vehicle/odometer.h b/vehicle/odometer.h index 110554ef6..083d00d1a 100644 --- a/vehicle/odometer.h +++ b/vehicle/odometer.h @@ -84,6 +84,13 @@ private: bool m_modified{false}; }; +// records the state of a vehicle in the store when it's one the store keeps: a vehicle with a driver's cab +// (TMoverParameters::HasDriverCab()), which can show its odometer on the cab's counter or a python screen. that +// includes the locomotives and units the AI runs before a player's cab loads them, their made up states stay +// replaceable by the cab's counter. the wagons, which make most of the AI's trains, aren't recorded; the states the +// store already holds for any of them stay as they are +void record(store &States, std::string const &Vehicle, bool Drivercab, reading const &Odometer); + // state kept in the file of the python screens before (/kilometry/_przebieg.txt, // where the screens dropped the last character of the vehicle name), when it holds a number std::optional read_legacy(std::istream &Input); From ee42a801883b29b1cef7c59f46ed7811e9ba6ad3 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Mon, 9 Nov 2026 16:12:44 +0100 Subject: [PATCH 376/430] docs: the odometer store is keyed by the vehicle's name in the scenario --- vehicle/odometer.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vehicle/odometer.h b/vehicle/odometer.h index 083d00d1a..84e18b1f1 100644 --- a/vehicle/odometer.h +++ b/vehicle/odometer.h @@ -47,7 +47,11 @@ struct reading { bool moved() const; }; -// the saved odometer states of the vehicles, km by vehicle name +// the saved odometer states of the vehicles, km by vehicle name. the name is the one the scenario gives the vehicle +// (the name of its node, TDynamicObject::name(), e.g. EU07-424), the only identity a vehicle has between the sessions: +// the vehicles of the same name in any scenarios share one state, whatever their type, and a vehicle the scenario +// names otherwise starts over, from the legacy or a made up state. the sceneries name the real vehicles by their +// numbers, so it's the same vehicle as a rule class store { public: // reads the states written by write(). lines " ", "~ " for a state counted From 6f1055e09d869b7c2f7abb76d0e9e535b0185451 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Mon, 9 Nov 2026 16:13:43 +0100 Subject: [PATCH 377/430] fix: a duplicated cab control keeps its scale table MirrorCopy() of a duplicate: yes control (#285) now copies the scaletable: of the duplicate's definition too, so the copy is animated on the same non-uniform scale. --- vehicle/Gauge.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/vehicle/Gauge.cpp b/vehicle/Gauge.cpp index dca3781ae..52bf7795d 100644 --- a/vehicle/Gauge.cpp +++ b/vehicle/Gauge.cpp @@ -467,6 +467,7 @@ TGauge TGauge::MirrorCopy() const { mirror.m_endscale = m_endscale; mirror.m_endvalue = m_endvalue; mirror.m_interpolatescale = m_interpolatescale; + mirror.m_scaletable = m_scaletable; mirror.m_state = m_state; mirror.m_sourcemodel = m_sourcemodel; return mirror; From 8029740770593271d3b1523a50be21c5036a4a9b Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Mon, 9 Nov 2026 16:27:45 +0100 Subject: [PATCH 378/430] fix: read the odometer files of the koliber screens too, say why the unit renderers' drop a letter the renderers of the units (elf_v1, impuls_v1) keep the unit's state, their cars are named after the unit and the letter of the car (EN76-022a .. EN76-022d), so they drop the last character. the koliber screens of scripts/ keep theirs in scripts/kilometry by the whole name, which wasn't read --- tests/unit/test_odometer.cpp | 19 +++++++++++++++++++ vehicle/odometer.cpp | 32 ++++++++++++++++++++++++-------- vehicle/odometer.h | 16 ++++++++++++---- 3 files changed, 55 insertions(+), 12 deletions(-) diff --git a/tests/unit/test_odometer.cpp b/tests/unit/test_odometer.cpp index 5e287116b..5ec1b572f 100644 --- a/tests/unit/test_odometer.cpp +++ b/tests/unit/test_odometer.cpp @@ -434,3 +434,22 @@ TEST_CASE("odometer: only the vehicles with a driver's cab are recorded") { CHECK(read.find("old wagon").value() == 300.0); } } + +TEST_CASE("odometer: the files of both kinds of python screens are read, by the name each used") { + scratch_directory directory{"odometer_legacy_screens"}; + auto const vehicles{directory.path / "dynamic" / "elf_v1"}; + auto const scripts{directory.path / "scripts"}; + // the renderers of the units, next to the .mmd: state['name'][:-1], the cab cars of a unit share the file + write_file(vehicles / "kilometry" / "EN76-022_przebieg.txt", "250000.5"); + CHECK(odometer::legacy_state(vehicles, "EN76-022a", scripts).value() == 250000.5); + CHECK(odometer::legacy_state(vehicles, "EN76-022d", scripts).value() == 250000.5); + // the shared screens of scripts/ (koliber_*): the whole name + write_file(scripts / "kilometry" / "EU07-424_przebieg.txt", "123456.0"); + CHECK(odometer::legacy_state(vehicles, "EU07-424", scripts).value() == 123456.0); + auto const started{odometer::starting_state(odometer::store{}, "EU07-424", vehicles, scripts)}; + CHECK(started.source == odometer::origin::legacy); + CHECK(started.km == 123456.0); + // neither + CHECK_FALSE(odometer::legacy_state(vehicles, "EU07-425", scripts).has_value()); + CHECK_FALSE(odometer::legacy_state(vehicles, "", scripts).has_value()); +} diff --git a/vehicle/odometer.cpp b/vehicle/odometer.cpp index 60c119f12..8ecf9a9c1 100644 --- a/vehicle/odometer.cpp +++ b/vehicle/odometer.cpp @@ -178,19 +178,34 @@ std::optional read_legacy(std::istream &Input) { return parse_number(content.str()); } -std::optional legacy_state(std::filesystem::path const &Vehicledirectory, std::string const &Vehicle) { - if (Vehicle.size() < 2) - return std::nullopt; - auto const path{Vehicledirectory / "kilometry" / (Vehicle.substr(0, Vehicle.size() - 1) + "_przebieg.txt")}; +namespace { + +std::optional read_legacy_file(std::filesystem::path const &Path) { std::error_code error; - if (false == std::filesystem::is_regular_file(path, error)) + if (false == std::filesystem::is_regular_file(Path, error)) return std::nullopt; - std::ifstream input{path, std::ios::binary}; + std::ifstream input{Path, std::ios::binary}; if (false == input.is_open()) return std::nullopt; return read_legacy(input); } +} // namespace + +std::optional legacy_state(std::filesystem::path const &Vehicledirectory, std::string const &Vehicle, + std::filesystem::path const &Scriptsdirectory) { + if (Vehicle.empty()) + return std::nullopt; + // the renderers of the units drop the letter of the car, the file is the unit's (see the header) + if (Vehicle.size() > 1) { + auto const unit{read_legacy_file(Vehicledirectory / "kilometry" / (Vehicle.substr(0, Vehicle.size() - 1) + "_przebieg.txt"))}; + if (unit.has_value()) + return unit; + } + // the shared screens of scripts/ keep the whole name + return read_legacy_file(Scriptsdirectory / "kilometry" / (Vehicle + "_przebieg.txt")); +} + double guessed_state(std::string const &Vehicle) { // FNV-1a, stable between the builds unlike std::hash std::uint64_t hash{14695981039346656037ull}; @@ -201,7 +216,8 @@ double guessed_state(std::string const &Vehicle) { return 10000.0 + static_cast(hash % 490000ull); } -reading starting_state(store const &States, std::string const &Vehicle, std::filesystem::path const &Vehicledirectory) { +reading starting_state(store const &States, std::string const &Vehicle, std::filesystem::path const &Vehicledirectory, + std::filesystem::path const &Scriptsdirectory) { reading result; if (auto const saved{States.find(Vehicle)}; saved.has_value()) { if (States.guessed(Vehicle)) { @@ -212,7 +228,7 @@ reading starting_state(store const &States, std::string const &Vehicle, std::fil } else { result.begin(*saved, origin::saved); } - } else if (auto const legacy{legacy_state(Vehicledirectory, Vehicle)}; legacy.has_value()) { + } else if (auto const legacy{legacy_state(Vehicledirectory, Vehicle, Scriptsdirectory)}; legacy.has_value()) { result.begin(*legacy, origin::legacy); } else { result.begin(guessed_state(Vehicle), origin::guessed); diff --git a/vehicle/odometer.h b/vehicle/odometer.h index 84e18b1f1..83396abfd 100644 --- a/vehicle/odometer.h +++ b/vehicle/odometer.h @@ -95,10 +95,17 @@ private: // store already holds for any of them stay as they are void record(store &States, std::string const &Vehicle, bool Drivercab, reading const &Odometer); -// state kept in the file of the python screens before (/kilometry/_przebieg.txt, -// where the screens dropped the last character of the vehicle name), when it holds a number +// state kept in the file of the python screens before, when it holds a number. the screens opened the file in the +// directory of their script (lookup_path), and two kinds of them kept one: +// - the renderers of the units, next to the .mmd (elf_v1: EN62, EN76, EN96, SKM; impuls_v1: EN63), in +// /kilometry/_przebieg.txt (state['name'][:-1]). the cars of +// these units are named after the unit and the letter of the car (EN76-022a .. EN76-022d, ED78-019A .. ED78-019D), +// so the cab cars at both ends of a unit share one file, the unit's odometer +// - the shared screens in scripts/ (koliber_hasler_elektroniczny, koliber_unicontrols_tramex[_ic]), in +// /kilometry/_przebieg.txt, the whole name std::optional read_legacy(std::istream &Input); -std::optional legacy_state(std::filesystem::path const &Vehicledirectory, std::string const &Vehicle); +std::optional legacy_state(std::filesystem::path const &Vehicledirectory, std::string const &Vehicle, + std::filesystem::path const &Scriptsdirectory = "scripts"); // made up state of a vehicle nothing is known about: a number from the name, in [10 000, 500 000) km, // the same each session until the vehicle runs and gets its state saved @@ -106,7 +113,8 @@ double guessed_state(std::string const &Vehicle); // state a vehicle starts the session with: the saved one, else the legacy one, else a guessed one. a saved state // counted from a guessed one stays guessed, so the cab's counter can still replace the made up part of it -reading starting_state(store const &States, std::string const &Vehicle, std::filesystem::path const &Vehicledirectory); +reading starting_state(store const &States, std::string const &Vehicle, std::filesystem::path const &Vehicledirectory, + std::filesystem::path const &Scriptsdirectory = "scripts"); // state the cab's counter with offset Offset and scale Scale shows, once its offset no longer applies // (the counter shows the odometer). nothing for a counter without an offset From b256c3efa9ea79f47e82052c078b9573bf3a16cd Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Mon, 9 Nov 2026 16:31:43 +0100 Subject: [PATCH 379/430] refactor: MOVER.h includes the odometer's plain data only odometer::reading moves to vehicle/odometerreading.h, the store with its files stays in vehicle/odometer.h, so the physics header doesn't pull in the filesystem and the streams --- McZapkie/MOVER.h | 2 +- vehicle/Train.cpp | 1 + vehicle/odometer.h | 28 ++------------------------ vehicle/odometerreading.h | 42 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 46 insertions(+), 27 deletions(-) create mode 100644 vehicle/odometerreading.h diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index d461269b1..aa64b1cf0 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -15,7 +15,7 @@ http://mozilla.org/MPL/2.0/. #include #include "hamulce.h" #include "scripting/ladderlogic.h" -#include "vehicle/odometer.h" +#include "vehicle/odometerreading.h" class cParser; /* diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index 9987b66b3..128335d17 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -17,6 +17,7 @@ http://mozilla.org/MPL/2.0/. #include "vehicle/horn.h" #include "vehicle/linebreaker.h" #include "vehicle/holdcoillever.h" +#include "vehicle/odometer.h" #include "utilities/Globals.h" #include "simulation/simulation.h" diff --git a/vehicle/odometer.h b/vehicle/odometer.h index 83396abfd..93685d281 100644 --- a/vehicle/odometer.h +++ b/vehicle/odometer.h @@ -15,38 +15,14 @@ http://mozilla.org/MPL/2.0/. #include #include +#include "vehicle/odometerreading.h" + // the odometer of a vehicle: the total distance it has run, kept between the sessions (eu07/maszyna#72). // the analog counters in the cab (distcounter:) and the python screens (state["odometer_total"]) show // this one state, instead of the counters starting from their .mmd offset and the screens each keeping // their own files namespace odometer { -// where the state of a vehicle came from -enum class origin { - saved, // the odometer store of the earlier sessions - legacy, // the file a python screen kept it in before - counter, // the offset of the cab's counter, which used to show it on top of the distance run in the session - guessed // counted from a made up state, which the cab's counter can still replace, also once it was saved -}; - -// odometer of one vehicle -struct reading { - double km{0.0}; // the state, km - double start{0.0}; // the state at the start of the session, km - origin source{origin::guessed}; - double guess{0.0}; // the made up state a guessed one counts from, km - - // sets the state the vehicle starts the session with - void begin(double Km, origin Source); - // replaces the made up state a guessed one counts from with the one the cab's counter showed at the start, - // the distance run on top of it kept, in this session and the earlier ones. a known state stays - void seed(double Km); - // counts the distance run, in metres either way - void run(double Metres); - // the vehicle has run in this session - bool moved() const; -}; - // the saved odometer states of the vehicles, km by vehicle name. the name is the one the scenario gives the vehicle // (the name of its node, TDynamicObject::name(), e.g. EU07-424), the only identity a vehicle has between the sessions: // the vehicles of the same name in any scenarios share one state, whatever their type, and a vehicle the scenario diff --git a/vehicle/odometerreading.h b/vehicle/odometerreading.h new file mode 100644 index 000000000..1b7d028da --- /dev/null +++ b/vehicle/odometerreading.h @@ -0,0 +1,42 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +// the odometer of a vehicle (eu07/maszyna#72), the part the vehicle physics (TMoverParameters::Odometer) keeps: plain +// data, without the store and its files, which are in vehicle/odometer.h +namespace odometer { + +// where the state of a vehicle came from +enum class origin { + saved, // the odometer store of the earlier sessions + legacy, // the file a python screen kept it in before + counter, // the offset of the cab's counter, which used to show it on top of the distance run in the session + guessed // counted from a made up state, which the cab's counter can still replace, also once it was saved +}; + +// odometer of one vehicle +struct reading { + double km{0.0}; // the state, km + double start{0.0}; // the state at the start of the session, km + origin source{origin::guessed}; + double guess{0.0}; // the made up state a guessed one counts from, km + + // sets the state the vehicle starts the session with + void begin(double Km, origin Source); + // replaces the made up state a guessed one counts from with the one the cab's counter showed at the start, + // the distance run on top of it kept, in this session and the earlier ones. a known state stays + void seed(double Km); + // counts the distance run, in metres either way + void run(double Metres); + // the vehicle has run in this session + bool moved() const; +}; + +} // namespace odometer From 6684baefc3d9eee836ed25f6fdda454f502f8fdd Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 9 Nov 2026 23:16:38 +0100 Subject: [PATCH 380/430] feat(editor): the points of the roads picked on the screen, also under the terrain; Alt+drag their height The points where the pieces of a road meet were picked only by the ground clicked: one more than 3 m above or below the ground under the cursor (a road taken down into a cutting, under an embankment) couldn't be picked again. Now the point nearest to the cursor on the screen (within 12 px, the one nearer to the camera of those about as near) is picked first, the ground as before after it. Alt+LMB on a point and dragging up or down changes the height of the selected points (Ctrl: ten times finer); the change shows as yellow lines and a label by the cursor while dragging, and is applied, as one step of the history, when the button is let go. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01DDcMn1Q7wdYkbxDUWscNHZ --- application/editormode.cpp | 12 ++++ application/editormode.h | 12 ++++ application/editormoderoad.cpp | 107 ++++++++++++++++++++++++++++++++- editor/editorRoad.cpp | 18 ++++++ editor/editorRoad.hpp | 2 + 5 files changed, 148 insertions(+), 3 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 32f991c55..991040d3e 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -5518,6 +5518,18 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const // with the road window open the left button works its tools, whichever edit mode is on but the track one if (m_roadtool.window && Button == GLFW_MOUSE_BUTTON_LEFT && ui()->mode() != nodebank_panel::TRACK) { + // Alt+LMB on a point: its height (and the other selected ones') dragged up or down + if (is_press(Action) && Global.altState && false == ImGui::GetIO().WantCaptureMouse && road_lift_start()) + { + m_input.mouse.button(Button, Action); + return; + } + if (false == is_press(Action) && m_roadtool.lifting) + { + road_lift_finish(); + m_input.mouse.button(Button, Action); + return; + } if (is_press(Action)) { // NOTE: the pick is resolved a few frames later, by then it's known whether the press was meant for the UI diff --git a/application/editormode.h b/application/editormode.h index c7dbd3911..e06d79a46 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -1923,6 +1923,11 @@ class editor_mode : public application_mode, private editor_track::observer bool follow{true}; // built roads are led over the ground between the clicked points float crossingspeed{30.f}; // speed limit on the junctions being made float heightstep{0.1f}; // how much the selected points are raised or lowered at a time + // Alt+LMB on a point dragged up or down: the heights of the selected points changed by the drag, applied when let go + bool lifting{false}; + float lift_mouse{0.0f}; // where on the screen the drag began, pixels down + double lift_scale{0.0}; // metres for a pixel at the point picked + std::vector lift_from; // the heights of the selected points when the drag began bool ring{false}; // the build tool makes roundabouts float ringradius{15.f}; // of the middle of the road going around std::string island{"none"}; // what the middle of a roundabout is covered with @@ -1967,6 +1972,13 @@ class editor_mode : public application_mode, private editor_track::observer void draw_road_overlay() const; void update_road_tool(); void road_click(); + // the point where pieces meet or end nearest to the cursor on the screen, within a few pixels; it's found under the + // terrain too, where the click on the ground doesn't get near it + bool road_joint_on_screen(glm::dvec3 &Joint) const; + // Alt+LMB: the drag of the heights of the selected points begun on a point, and finished + bool road_lift_start(); + void road_lift_finish(); + double road_lift_offset() const; void road_select(road_node *Road); void junction_select(junction_node *Junction); void road_apply(); diff --git a/application/editormoderoad.cpp b/application/editormoderoad.cpp index 9b5dc64ac..1c3130697 100644 --- a/application/editormoderoad.cpp +++ b/application/editormoderoad.cpp @@ -23,6 +23,7 @@ http://mozilla.org/MPL/2.0/. #include #include #include +#include namespace { @@ -1106,6 +1107,87 @@ void editor_mode::road_profile(std::vector &Pieces, double const * } } +bool editor_mode::road_joint_on_screen(glm::dvec3 &Joint) const +{ + screen_projection const projection; + auto const mouse{ImGui::GetIO().MousePos}; + float best{12.0f * 12.0f}; + bool found{false}; + glm::dvec3 const camera{Global.pCamera.Pos}; + double nearest{std::numeric_limits::max()}; + for (auto const &joint : editor_road::joints()) + { + ImVec2 screen; + if (false == projection.project(joint, screen)) + continue; + auto const dx{screen.x - mouse.x}; + auto const dy{screen.y - mouse.y}; + auto const distance{dx * dx + dy * dy}; + auto const range{glm::distance(joint, camera)}; + // of the points about as near the cursor, the one nearer to the camera + if (distance < best - 9.0f || (distance <= best + 9.0f && range < nearest)) + { + best = std::min(best, distance); + nearest = range; + Joint = joint; + found = true; + } + } + return found; +} + +bool editor_mode::road_lift_start() +{ + auto &tool{m_roadtool}; + glm::dvec3 joint; + if (tool.tool != 0 || false == road_joint_on_screen(joint)) + return false; + auto const listed{std::find_if(tool.points.begin(), tool.points.end(), [&joint](glm::dvec3 const &Point) { return glm::distance(Point, joint) < 0.25; })}; + if (listed == tool.points.end()) + tool.points.assign(1, joint); + tool.selected = nullptr; + tool.junction = nullptr; + tool.marker = nullptr; + auto const &io{ImGui::GetIO()}; + auto const height{std::max(1.0f, io.DisplaySize.y)}; + if (Global.EditorOrtho) + tool.lift_scale = 2.0 * static_cast(Global.EditorOrthoExtent) / height; + else + tool.lift_scale = glm::distance(joint, glm::dvec3{Global.pCamera.Pos}) * 2.0 * std::tan(glm::radians(Global.FieldOfView / Global.ZoomFactor) * 0.5) / height; + tool.lift_mouse = io.MousePos.y; + tool.lift_from.clear(); + for (auto const &point : tool.points) + tool.lift_from.push_back(point.y); + tool.lifting = true; + tool.status = "Drag up or down, let go to set the heights. Ctrl while dragging: by centimetres"; + return true; +} + +double editor_mode::road_lift_offset() const +{ + auto const &tool{m_roadtool}; + auto offset{(tool.lift_mouse - ImGui::GetIO().MousePos.y) * tool.lift_scale}; + // with Ctrl it's slower, for the fine part + if (Global.ctrlState) + offset *= 0.1; + return std::round(offset * 100.0) / 100.0; +} + +void editor_mode::road_lift_finish() +{ + auto &tool{m_roadtool}; + if (false == tool.lifting) + return; + tool.lifting = false; + auto const offset{road_lift_offset()}; + if (std::abs(offset) < 0.005 || tool.lift_from.size() != tool.points.size()) + return; + std::vector heights; + for (auto const height : tool.lift_from) + heights.push_back(height + offset); + road_point_heights(heights); +} + void editor_mode::road_click() { auto &tool{m_roadtool}; @@ -1135,7 +1217,8 @@ void editor_mode::road_click() } tool.marker = nullptr; glm::dvec3 joint; - if (editor_road::nearest_joint(ground, kPointRadius, joint)) + // by the cursor on the screen first: a point under the terrain can't be got near by the ground clicked + if (road_joint_on_screen(joint) || editor_road::nearest_joint(ground, kPointRadius, joint)) { // a point where pieces meet or end. with Shift it's added to the selected ones, or taken out of them auto const listed{std::find_if(tool.points.begin(), tool.points.end(), [&joint](glm::dvec3 const &Point) { return glm::distance(Point, joint) < 0.25; })}; @@ -2808,8 +2891,26 @@ void editor_mode::draw_road_overlay() const drawpoint(point, kSelectedColor, 6.0f, true); drawpoint(point, kSelectedColor, 11.0f, false); } - hint = tool.marker != nullptr ? "LMB: select a piece, a junction, a point or a marker Del: delete Ctrl+Z: undo" : - false == tool.points.empty() ? "LMB: select a point Shift+LMB: add a point or take it out Del: delete the points Ctrl+Z: undo" : + if (tool.lifting) + { + // where the points go: a line up or down to each, and the change by the cursor + auto const offset{road_lift_offset()}; + ImU32 const lifted{IM_COL32(255, 210, 60, 255)}; + for (auto const &point : tool.points) + { + glm::dvec3 const target{point.x, point.y + offset, point.z}; + projection.line(drawlist, point, target, lifted, 2.0f); + drawpoint(target, lifted, 6.0f, true); + } + auto const mouse{ImGui::GetIO().MousePos}; + char label[64]; + std::snprintf(label, sizeof(label), "%+.2f m, to %.2f m", offset, tool.points.empty() ? 0.0 : tool.points.front().y + offset); + drawlist->AddRectFilled(ImVec2(mouse.x + 14.0f, mouse.y - 4.0f), ImVec2(mouse.x + 22.0f + ImGui::CalcTextSize(label).x, mouse.y + 18.0f), IM_COL32(0, 0, 0, 170), 3.0f); + drawlist->AddText(ImVec2(mouse.x + 18.0f, mouse.y - 2.0f), lifted, label); + } + hint = tool.lifting ? "Drag up or down: the height of the selected points Ctrl: finer let go: set" : + tool.marker != nullptr ? "LMB: select a piece, a junction, a point or a marker Del: delete Ctrl+Z: undo" : + false == tool.points.empty() ? "LMB: select a point (under the terrain too) Shift+LMB: add a point or take it out Alt+LMB drag: the height Del: delete the points Ctrl+Z: undo" : tool.selected != nullptr ? "LMB: select a piece, a junction or a point (white dot) K: split at the cursor Del: delete Ctrl+Z: undo" : tool.junction != nullptr ? "LMB: select a piece, a junction or a point (white dot) Del: delete Ctrl+Z: undo" : "LMB: select a piece, a junction, a point (white dot) or a marker"; diff --git a/editor/editorRoad.cpp b/editor/editorRoad.cpp index 8e2113d17..0def167d9 100644 --- a/editor/editorRoad.cpp +++ b/editor/editorRoad.cpp @@ -1621,6 +1621,24 @@ bool editor_road::nearest_joint(glm::dvec3 const &Point, double const Radius, gl return found; } +std::vector editor_road::joints() +{ + std::vector result; + for (auto const *road : simulation::Roads.sequence()) + { + if (road == nullptr || road->m_editorremoved) + continue; + for (auto const atend : {false, true}) + { + auto const position{axis_end(road->definition(), atend)}; + auto const same = [&position](glm::dvec3 const &Listed) { return glm::distance(Listed, position) < kSamePoint; }; + if (std::none_of(result.begin(), result.end(), same)) + result.push_back(position); + } + } + return result; +} + std::vector editor_road::ends_at(glm::dvec3 const &Point) { std::vector result; diff --git a/editor/editorRoad.hpp b/editor/editorRoad.hpp index 20553b013..7c19b00f5 100644 --- a/editor/editorRoad.hpp +++ b/editor/editorRoad.hpp @@ -128,6 +128,8 @@ class editor_road static junction_node *nearest_junction(glm::dvec3 const &Point); // the point where pieces meet or end which is nearest to specified one, within specified distance from it. returns: false if there's none static bool nearest_joint(glm::dvec3 const &Point, double const Radius, glm::dvec3 &Joint); + // every point where pieces meet or end, each once + static std::vector joints(); // ends of the pieces which meet at specified point static std::vector ends_at(glm::dvec3 const &Point); // junctions with an arm at specified point, each with the number of that arm From fabbfdc782bb837840cd2c84f6c40a618139aa77 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 9 Nov 2026 23:24:50 +0100 Subject: [PATCH 381/430] feat(editor): the wheel held and dragged pans the perspective view too, the ground under the cursor going along with it Pressing the mouse wheel and dragging pans the top view; now it pans the perspective view as well. The camera moves over the ground, its height and its turn kept, by as much of the ground as the cursor crosses where it was pressed: metres to a pixel taken from the distance to what is under the cursor, and a pixel up the screen counted as more of the ground than one across as the camera looks down less steeply. With nothing under the cursor (the sky) it doesn't start. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01DDcMn1Q7wdYkbxDUWscNHZ --- application/editormode.cpp | 19 ++++++++++++++++--- application/editormode.h | 1 + 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 32f991c55..f41c8d190 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -4978,8 +4978,10 @@ void editor_mode::ortho_pan_to(double const Horizontal, double const Vertical) auto const dx{Horizontal - m_ortho_pan_cursor.x}; auto const dy{Vertical - m_ortho_pan_cursor.y}; m_ortho_pan_cursor = {Horizontal, Vertical}; - auto const scale{2.0 * static_cast(Global.EditorOrthoExtent) / static_cast(io.DisplaySize.y)}; - auto const world{RotateY(glm::dvec3{dx * scale, 0.0, dy * scale}, static_cast(Camera.Angle.y))}; + auto const scale{Global.EditorOrtho ? 2.0 * static_cast(Global.EditorOrthoExtent) / static_cast(io.DisplaySize.y) : m_pan_metres}; + // looked at from the side, a pixel up the screen is more of the ground than one across + auto const along{Global.EditorOrtho ? 1.0 : 1.0 / std::max(0.25, std::abs(std::sin(static_cast(Camera.Angle.x))))}; + auto const world{RotateY(glm::dvec3{dx * scale, 0.0, dy * scale * along}, static_cast(Camera.Angle.y))}; Camera.Pos.x -= world.x; Camera.Pos.z -= world.z; Camera.Velocity = {}; @@ -5724,7 +5726,7 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const // game-engine style look: hide & grab the cursor while flying, restore it on release Application.set_cursor(is_press(Action) ? GLFW_CURSOR_DISABLED : GLFW_CURSOR_NORMAL); } - else if (Button == GLFW_MOUSE_BUTTON_MIDDLE && Global.EditorOrtho) + else if (Button == GLFW_MOUSE_BUTTON_MIDDLE) { if (is_press(Action)) { @@ -5732,6 +5734,17 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const m_ortho_pan_cursor = m_input.mouse.position(); m_focus_active = false; Camera.Velocity = {}; + // in the perspective view the ground under the cursor goes along with it: metres of it to a pixel there, as far as it is + m_pan_metres = 0.0; + if (false == Global.EditorOrtho) + { + auto const &io{ImGui::GetIO()}; + auto const distance{glm::length(GfxRenderer->Mouse_Position())}; + if (io.DisplaySize.y > 0.0f && distance > 0.5 && distance < 20000.0) + m_pan_metres = 2.0 * distance * std::tan(glm::radians(Global.FieldOfView / Global.ZoomFactor) * 0.5) / static_cast(io.DisplaySize.y); + else + m_ortho_pan = false; // nothing under the cursor to hold + } } else if (is_release(Action)) ortho_pan_stop(); diff --git a/application/editormode.h b/application/editormode.h index c7dbd3911..27a7019db 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -225,6 +225,7 @@ class editor_mode : public application_mode, private editor_track::observer double m_ortho_pitch{0.0}; bool m_ortho_pan{false}; glm::dvec2 m_ortho_pan_cursor{0.0}; + double m_pan_metres{0.0}; // of the ground to a pixel, held by the panning in the perspective view void ortho_pan_to(double const Horizontal, double const Vertical); void ortho_pan_stop(); // camera fly-mode (right mouse button held); used to flush motion when it's released From c9792672c654eee57dc7709e7a5e1d9dbee74ed7 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Mon, 9 Nov 2026 23:41:14 +0000 Subject: [PATCH 382/430] fix(render): textures of a far vehicle no longer come back black with gfx.resource.move (#308) --- model/Texture.cpp | 90 ++++++++++++++++++++++++++++++++++++----------- model/Texture.h | 3 ++ 2 files changed, 73 insertions(+), 20 deletions(-) diff --git a/model/Texture.cpp b/model/Texture.cpp index 4a7b24792..29787ee8a 100644 --- a/model/Texture.cpp +++ b/model/Texture.cpp @@ -28,6 +28,8 @@ http://mozilla.org/MPL/2.0/. #include "dds-ktx/dds-ktx.h" #include "winheaders.h" +#include + #define EU07_DEFERRED_TEXTURE_UPLOAD #ifndef FOURCC_DX10 @@ -303,6 +305,20 @@ bool bptc_supported() { }(); return supported; } +// format of a compressed texture read back from the gpu, given as the image would have it: the driver tells the srgb variant +// of the format, which the mapping doesn't take. with the components hint of the texture the linear one gives the same gl +// format again on the next upload +GLint readback_format( GLint const Internalformat ) { + switch( Internalformat ) { + case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC: { return GL_COMPRESSED_RGBA8_ETC2_EAC; } + case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT: { return GL_COMPRESSED_RGBA_S3TC_DXT1_EXT; } + case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT: { return GL_COMPRESSED_RGBA_S3TC_DXT3_EXT; } + case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT: { return GL_COMPRESSED_RGBA_S3TC_DXT5_EXT; } + case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM: { return GL_COMPRESSED_RGBA_BPTC_UNORM; } + default: { return Internalformat; } + } +} + } // namespace std::array opengl_texture::units = { 0 }; @@ -1502,29 +1518,13 @@ opengl_texture::release() { } else { ::glBindTexture(target, id ); - GLint datasize {}; GLint iscompressed {}; ::glGetTexLevelParameteriv(target, 0, GL_TEXTURE_COMPRESSED, &iscompressed ); - if( iscompressed == GL_TRUE ) { - // texture is compressed on the gpu side - // query texture details needed to perform the backup... - ::glGetTexLevelParameteriv(target, 0, GL_TEXTURE_INTERNAL_FORMAT, &data_format ); - ::glGetTexLevelParameteriv(target, 0, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &datasize ); - data.resize( datasize ); - // ...fetch the data... - ::glGetCompressedTexImage(target, 0, &data[ 0 ] ); + if( ( iscompressed != GL_TRUE ) + || ( false == read_back_compressed() ) ) { + // the texture didn't get compressed during upload, or got a format the upload doesn't take + read_back_uncompressed(); } - else { - // for whatever reason texture didn't get compressed during upload - // fallback on plain rgba storage... - data_format = GL_RGBA; - data_type = GL_UNSIGNED_BYTE; - data.resize( data_width * data_height * 4 ); - // ...fetch the data... - ::glGetTexImage(target, 0, data_format, GL_UNSIGNED_BYTE, &data[ 0 ] ); - } - // ...and update texture object state - data_mapcount = 1; // we keep copy of only top mipmap level data_state = resource_state::good; } } @@ -1536,6 +1536,56 @@ opengl_texture::release() { return; } +// copies all mipmaps of the compressed gl texture into the data, in the layout of a dds file. returns false, leaving the data as +// it was, when the format can't be uploaded again as it is. all levels are kept since the driver may not generate mipmaps +// of a compressed format; without them the texture would be incomplete and drawn black +bool +opengl_texture::read_back_compressed() { + + GLint internalformat {}; + ::glGetTexLevelParameteriv( target, 0, GL_TEXTURE_INTERNAL_FORMAT, &internalformat ); + auto const format { readback_format( internalformat ) }; + if( ( false == precompressed_formats.contains( format ) ) + || ( false == mapping.contains( format ) ) ) { + return false; + } + auto const levelcount { static_cast( std::bit_width( std::max( data_width, data_height ) ) ) }; + std::vector leveldata; + auto mapcount { 0 }; + while( mapcount < levelcount ) { + GLint levelwidth {}; + GLint levelsize {}; + ::glGetTexLevelParameteriv( target, mapcount, GL_TEXTURE_WIDTH, &levelwidth ); + ::glGetTexLevelParameteriv( target, mapcount, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &levelsize ); + if( ( levelwidth <= 0 ) || ( levelsize <= 0 ) ) { + // the levels past the last one present weren't made + break; + } + auto const offset { leveldata.size() }; + leveldata.resize( offset + static_cast( levelsize ) ); + ::glGetCompressedTexImage( target, mapcount, &leveldata[ offset ] ); + ++mapcount; + } + if( mapcount == 0 ) { + return false; + } + data.swap( leveldata ); + data_format = format; + data_mapcount = static_cast( mapcount ); + return true; +} + +// copies the top level of the gl texture into the data as plain rgba, the mipmaps are generated again on upload +void +opengl_texture::read_back_uncompressed() { + + data_format = GL_RGBA; + data_type = GL_UNSIGNED_BYTE; + data.resize( data_width * data_height * 4 ); + ::glGetTexImage( target, 0, data_format, GL_UNSIGNED_BYTE, &data[ 0 ] ); + data_mapcount = 1; +} + void opengl_texture::alloc_rendertarget( GLint format, GLint components, int width, int height, int l, int s, GLint wrap ) { diff --git a/model/Texture.h b/model/Texture.h index 0a4ae62ec..313d0f6f4 100644 --- a/model/Texture.h +++ b/model/Texture.h @@ -117,6 +117,9 @@ public: // takes over the data read by a worker thread, waiting for it if needed void complete_data(); + // with gfx.resource.move, copies the gl texture back into the data before it's released. requires the texture bound + bool read_back_compressed(); + void read_back_uncompressed(); // members std::shared_ptr request; // data being read by a worker thread From 18c333b08952b537de6f6f4866ea0796769fb571 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Tue, 10 Nov 2026 00:57:37 +0100 Subject: [PATCH 383/430] wasm display support --- .gitmodules | 4 + CMakeLists.txt | 15 + CMake_modules/wamr/CMakeLists.txt | 67 +++ application/application.cpp | 7 + application/application.h | 6 + model/Texture.cpp | 4 + ref/wamr | 1 + scripting/wasmscreenkernels.cpp | 242 ++++++++ scripting/wasmscreenkernels.h | 36 ++ scripting/wasmscreenrules.cpp | 126 ++++ scripting/wasmscreenrules.h | 74 +++ scripting/wasmscreens.cpp | 942 ++++++++++++++++++++++++++++++ scripting/wasmscreens.h | 72 +++ scripting/wasmscreensstub.cpp | 51 ++ tests/unit/CMakeLists.txt | 5 + tests/unit/test_wasm_host.cpp | 288 +++++++++ tests/unit/test_wasm_kernels.cpp | 121 ++++ tests/unit/test_wasm_screens.cpp | 103 ++++ utilities/Globals.cpp | 33 ++ utilities/Globals.h | 4 + vehicle/DynObj.cpp | 77 ++- vehicle/DynObj.h | 13 + vehicle/Train.cpp | 110 +++- vehicle/Train.h | 14 + wasm_screens_doc.md | 129 ++++ 25 files changed, 2521 insertions(+), 23 deletions(-) create mode 100644 CMake_modules/wamr/CMakeLists.txt create mode 160000 ref/wamr create mode 100644 scripting/wasmscreenkernels.cpp create mode 100644 scripting/wasmscreenkernels.h create mode 100644 scripting/wasmscreenrules.cpp create mode 100644 scripting/wasmscreenrules.h create mode 100644 scripting/wasmscreens.cpp create mode 100644 scripting/wasmscreens.h create mode 100644 scripting/wasmscreensstub.cpp create mode 100644 tests/unit/test_wasm_host.cpp create mode 100644 tests/unit/test_wasm_kernels.cpp create mode 100644 tests/unit/test_wasm_screens.cpp create mode 100644 wasm_screens_doc.md diff --git a/.gitmodules b/.gitmodules index df7f5ddaa..55d108a70 100644 --- a/.gitmodules +++ b/.gitmodules @@ -32,3 +32,7 @@ [submodule "betterRenderer/thirdparty/bvh"] path = betterRenderer/thirdparty/bvh url = https://github.com/madmann91/bvh.git +[submodule "ref/wamr"] + path = ref/wamr + url = https://github.com/bytecodealliance/wasm-micro-runtime + shallow = true diff --git a/CMakeLists.txt b/CMakeLists.txt index 7137ab39a..b75f3295b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,6 +72,7 @@ option(WITH_OPENGL_LEGACY "Compile with OpenGL legacy renderer" ON) option(WITH_PYTHON "Python 3.14 embedded scripting" ON) option(WITH_UART "Compile with libserialport" ON) option(WITH_LUA "Compile with lua scripting support" ON) +option(WITH_WASM "WebAssembly screens (wasmscreen:, wasmdestinationsign:), run by the WAMR interpreter in ref/wamr" ON) option(WITH_OPENVR "Compile with OpenVR" OFF) option(WITH_ZMQ "Compile with cppzmq" OFF) option(WITH_CRASHPAD "Compile with crashpad" OFF) @@ -321,6 +322,13 @@ if (WITH_LUA) set(SOURCES ${SOURCES} "scripting/lua.cpp") endif() +if (WITH_WASM) + set(DEFINITIONS ${DEFINITIONS} "WITH_WASM") + set(SOURCES ${SOURCES} "scripting/wasmscreens.cpp") +else() + set(SOURCES ${SOURCES} "scripting/wasmscreensstub.cpp") +endif() + if (WITHDUMPGEN) set(DEFINITIONS ${DEFINITIONS} "WITHDUMPGEN") endif() @@ -463,6 +471,8 @@ set(CORE_SOURCES "utilities/parser.cpp" "utilities/utilities.cpp" "scripting/ladderlogic.cpp" +"scripting/wasmscreenrules.cpp" +"scripting/wasmscreenkernels.cpp" "simulation/simulationtestrules.cpp" "vehicle/enginestart.cpp" "vehicle/handover.cpp" @@ -677,6 +687,11 @@ if(WIN32 AND WITH_PYTHON) ) endif() +if (WITH_WASM) + add_subdirectory("CMake_modules/wamr" "${CMAKE_CURRENT_BINARY_DIR}/wamr") + target_link_libraries(${PROJECT_NAME} eu07_wamr) +endif () + if (WITH_BETTER_RENDERER) add_subdirectory("betterRenderer") set_target_properties(betterRenderer betterRenderer_fsr2 betterRenderer_shaders PROPERTIES FOLDER "renderers") diff --git a/CMake_modules/wamr/CMakeLists.txt b/CMake_modules/wamr/CMakeLists.txt new file mode 100644 index 000000000..74e82358d --- /dev/null +++ b/CMake_modules/wamr/CMakeLists.txt @@ -0,0 +1,67 @@ +# The WebAssembly Micro Runtime (ref/wamr) for the wasm screens (scripting/wasmscreens.cpp). +# +# Built here, in a directory of its own, because the WAMR build scripts set their configuration with +# add_definitions() and include_directories(): kept in this directory, none of it reaches the game's sources. +# Only the interpreter is built (see WAMR_BUILD_FAST_INTERP), with instruction metering so that a screen stuck in a loop +# can't hang the worker thread, and without the signal-based bounds checks, which would compete with the +# game's own crash handling. + +if (WIN32) + set(WAMR_BUILD_PLATFORM "windows") +elseif (APPLE) + set(WAMR_BUILD_PLATFORM "darwin") +else () + set(WAMR_BUILD_PLATFORM "linux") +endif () + +set(WAMR_ROOT_DIR "${CMAKE_SOURCE_DIR}/ref/wamr") + +set(WAMR_BUILD_INTERP 1) +# the fast interpreter counts the instructions only where it dispatches with computed gotos (GCC, Clang): built with +# MSVC it would let a screen stuck in a loop hang the worker. the classic interpreter counts them everywhere +if (MSVC) + set(WAMR_BUILD_FAST_INTERP 0) +else () + set(WAMR_BUILD_FAST_INTERP 1) +endif () +set(WAMR_BUILD_AOT 0) +set(WAMR_BUILD_JIT 0) +set(WAMR_BUILD_FAST_JIT 0) +set(WAMR_BUILD_LIBC_BUILTIN 0) +set(WAMR_BUILD_LIBC_WASI 0) +set(WAMR_BUILD_MULTI_MODULE 0) +set(WAMR_BUILD_LIB_PTHREAD 0) +set(WAMR_BUILD_LIB_WASI_THREADS 0) +set(WAMR_BUILD_THREAD_MGR 0) +set(WAMR_BUILD_SIMD 0) +set(WAMR_BUILD_BULK_MEMORY 1) +set(WAMR_BUILD_REF_TYPES 1) +set(WAMR_BUILD_MINI_LOADER 0) +set(WAMR_BUILD_INSTRUCTION_METERING 1) +# NOTE: the calls into the natives use WAMR's assembler invokeNative (MASM with MSVC). its C version +# (WAMR_BUILD_INVOKE_NATIVE_GENERAL) crashes on Windows x64 as soon as a module runs +set(WAMR_DISABLE_HW_BOUND_CHECK 1) +set(WAMR_DISABLE_STACK_HW_BOUND_CHECK 1) + +find_package(Threads REQUIRED) +include("${WAMR_ROOT_DIR}/build-scripts/runtime_lib.cmake") + +add_library(eu07_wamr STATIC ${WAMR_RUNTIME_LIB_SOURCE}) +target_include_directories(eu07_wamr INTERFACE "${WAMR_ROOT_DIR}/core/iwasm/include") +# with MSVC the WAMR headers declare the API dllimport unless told otherwise; the library is linked statically +target_compile_definitions(eu07_wamr INTERFACE "WASM_RUNTIME_API_EXTERN=") +target_link_libraries(eu07_wamr PRIVATE Threads::Threads) +if (WIN32) + target_link_libraries(eu07_wamr PRIVATE ws2_32 ntdll) +else () + target_link_libraries(eu07_wamr PRIVATE m ${CMAKE_DL_LIBS}) +endif () +if (MSVC) + # third-party code: its warnings are not ours to fix + target_compile_options(eu07_wamr PRIVATE /W0) +else () + target_compile_options(eu07_wamr PRIVATE -w) +endif () +set_target_properties(eu07_wamr PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + FOLDER "libraries") diff --git a/application/application.cpp b/application/application.cpp index a398117c7..98f004a92 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -425,6 +425,11 @@ int eu07_application::init(int Argc, char *Argv[]) { m_taskqueue.init(); } + crashreport_add_info("wasm_enabled", Global.wasm_enabled ? "yes" : "no"); + if (Global.wasm_enabled) + { + m_wasmqueue.init(); + } if ((result = init_modes()) != 0) { ErrorLog("Failed to initialize game modes"); @@ -635,6 +640,7 @@ int eu07_application::run() EditorTerrain.update(Global.pCamera.Pos); m_taskqueue.update(); + m_wasmqueue.update(); opengl_texture::reset_unit_cache(); if (!GfxRenderer->Render()) @@ -732,6 +738,7 @@ void eu07_application::exit() // the python workers detach their GL context on the way out, so they have to be done before the windows they use are destroyed m_taskqueue.exit(); + m_wasmqueue.exit(); step("the windows"); for (auto *window : m_windows) { diff --git a/application/application.h b/application/application.h index 11415603b..4a1d1ad1a 100644 --- a/application/application.h +++ b/application/application.h @@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/. #include "application/applicationmode.h" #include "scripting/PyInt.h" +#include "scripting/wasmscreens.h" #include "network/manager.h" #include "utilities/headtrack.h" #ifdef WITH_UART @@ -49,6 +50,10 @@ public: // frees the python gil and swaps out the main thread void release_python_lock(); + // the screens drawn by WebAssembly modules + wasm_screen_queue & + wasm_screens() { + return m_wasmqueue; } void exit(); void @@ -122,6 +127,7 @@ private: modeptr_array m_modes { nullptr }; // collection of available application behaviour modes mode_stack m_modestack; // current behaviour mode python_taskqueue m_taskqueue; + wasm_screen_queue m_wasmqueue; std::vector m_windows; int m_glfwversion; diff --git a/model/Texture.cpp b/model/Texture.cpp index 4a7b24792..e9dc063de 100644 --- a/model/Texture.cpp +++ b/model/Texture.cpp @@ -722,6 +722,10 @@ void opengl_texture::make_request() { auto const components { Split( name, '?' ) }; + if( components.front().ends_with( ".wasm" ) ) { + // wasm destination signs are drawn by the vehicles showing them (wasm_screen_queue) + return; + } auto dictionary = std::make_shared( components.back() ); diff --git a/ref/wamr b/ref/wamr new file mode 160000 index 000000000..25bd7eb63 --- /dev/null +++ b/ref/wamr @@ -0,0 +1 @@ +Subproject commit 25bd7eb63e828e4bd242cc9b38d260b4b31c6605 diff --git a/scripting/wasmscreenkernels.cpp b/scripting/wasmscreenkernels.cpp new file mode 100644 index 000000000..4353f1894 --- /dev/null +++ b/scripting/wasmscreenkernels.cpp @@ -0,0 +1,242 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "scripting/wasmscreenkernels.h" + +#include +#include +#include +#include +#include + +namespace wasm_screens +{ + +namespace +{ + +constexpr int glow_radius{6}; +constexpr double glow_factor{0.08}; + +using light = std::array; + +// led_util's get_px_str: the light gathered from the diodes around, weighted 1 / (0.08 + distance squared), the sums +// taken in the same order as there to get the very same numbers +light glow_at(std::span const Source, int const Width, int const Height, int const X, int const Y) +{ + std::array sum{}; + auto const left{std::max(X - glow_radius, 0)}; + auto const right{std::min(X + glow_radius + 1, Width)}; + auto const top{std::max(Y - glow_radius, 0)}; + auto const bottom{std::min(Y + glow_radius + 1, Height)}; + for (auto i = left; i < right; ++i) + { + auto const m{glow_factor + static_cast((i - X) * (i - X))}; + if (m > 20.0) + { + continue; + } + for (auto j = top; j < bottom; ++j) + { + auto const s{m + static_cast((j - Y) * (j - Y))}; + if (s > 20.0) + { + continue; + } + auto const *pixel{&Source[(static_cast(j) * Width + i) * 4]}; + for (std::size_t channel = 0; channel < 3; ++channel) + { + sum[channel] += static_cast(pixel[channel]) / s; + } + } + } + return {static_cast(sum[0] * glow_factor), static_cast(sum[1] * glow_factor), static_cast(sum[2] * glow_factor)}; +} + +double sinc(double X) +{ + if (X == 0.0) + { + return 1.0; + } + X *= std::numbers::pi; + return std::sin(X) / X; +} + +double lanczos(double const X) +{ + if (X >= -3.0 && X < 3.0) + { + return sinc(X) * sinc(X / 3.0); + } + return 0.0; +} + +constexpr int precision_bits{32 - 8 - 2}; + +// the fixed-point weights of one pass, as Pillow's Resample.c (precompute_coeffs, normalize_coeffs_8bpc) makes them +struct coefficients +{ + int size{0}; + std::vector> bounds; // first input sample and the number of samples, per output sample + std::vector weights; + + coefficients(int const Input, int const Output) + { + auto const scale{static_cast(Input) / static_cast(Output)}; + auto const filterscale{std::max(scale, 1.0)}; + auto const support{3.0 * filterscale}; + size = static_cast(std::ceil(support)) * 2 + 1; + bounds.reserve(Output); + weights.assign(static_cast(Output) * size, 0); + std::vector prepared(size); + for (auto xx = 0; xx < Output; ++xx) + { + auto const center{(xx + 0.5) * scale}; + auto const ss{1.0 / filterscale}; + auto const xmin{std::max(static_cast(center - support + 0.5), 0)}; + auto const xmax{std::min(static_cast(center + support + 0.5), Input) - xmin}; + auto total{0.0}; + for (auto x = 0; x < xmax; ++x) + { + prepared[x] = lanczos((x + xmin - center + 0.5) * ss); + total += prepared[x]; + } + for (auto x = 0; x < xmax; ++x) + { + if (total != 0.0) + { + prepared[x] /= total; + } + auto const fixed{prepared[x] * static_cast(1 << precision_bits)}; + weights[static_cast(xx) * size + x] = static_cast(prepared[x] < 0.0 ? -0.5 + fixed : 0.5 + fixed); + } + bounds.emplace_back(xmin, xmax); + } + } + + static std::uint8_t clip(std::int64_t const Sum) + { + if (Sum >= (std::int64_t{1} << (precision_bits + 8))) + { + return 255; + } + if (Sum <= 0) + { + return 0; + } + return static_cast(Sum >> precision_bits); + } +}; + +constexpr std::int64_t rounding{std::int64_t{1} << (precision_bits - 1)}; + +// one pass of the resampling, along rows (Step 4: neighbouring pixels) or along columns (Step: a row) +struct pass +{ + coefficients const &weights; + std::size_t step; // bytes between the samples the pass mixes +}; + +std::uint8_t mix(std::uint8_t const *First, pass const &Pass, std::size_t const Index) +{ + auto const count{Pass.weights.bounds[Index].second}; + auto const offset{Index * static_cast(Pass.weights.size)}; + auto sum{rounding}; + for (auto sample = 0; sample < count; ++sample) + { + sum += static_cast(First[sample * Pass.step]) * Pass.weights.weights[offset + sample]; + } + return coefficients::clip(sum); +} + +} // namespace + +bool led_post(std::span const Source, int const Width, int const Height, std::span const Target, bool const Bloom) +{ + auto const targetwidth{Width * 2 + 2}; + auto const targetheight{Height * 2 + 2}; + if (Width <= 0 || Height <= 0 || Source.size() < image_size(Width, Height) || Target.size() < image_size(targetwidth, targetheight)) + { + return false; + } + // the light of every diode; above 255 it is clamped only in the final pixels, as led_util (Pillow) does + std::vector diodes(static_cast(Width) * Height); + for (auto y = 0; y < Height; ++y) + { + for (auto x = 0; x < Width; ++x) + { + auto const at{(static_cast(y) * Width + x) * 4}; + diodes[static_cast(y) * Width + x] = Bloom ? glow_at(Source, Width, Height, x, y) : light{Source[at], Source[at + 1], Source[at + 2]}; + } + } + // a black frame, then the diodes + for (std::size_t idx = 0; idx < image_size(targetwidth, targetheight); ++idx) + { + Target[idx] = idx % 4 == 3 ? 255 : 0; + } + for (auto i = 0; i < Width * 2; ++i) + { + for (auto j = 0; j < Height * 2; ++j) + { + auto const &diode{diodes[static_cast(j / 2) * Width + i / 2]}; + auto const shade{1.0 - static_cast(i % 2 + j % 2) * 0.15}; + auto *pixel{&Target[(static_cast(j + 1) * targetwidth + (i + 1)) * 4]}; + for (std::size_t channel = 0; channel < 3; ++channel) + { + pixel[channel] = static_cast(std::clamp(static_cast(static_cast(diode[channel]) * shade), 0, 255)); + } + } + } + return true; +} + +bool resize_lanczos(std::span const Source, int const Width, int const Height, std::span const Target, int const TargetWidth, + int const TargetHeight) +{ + if (Width <= 0 || Height <= 0 || TargetWidth <= 0 || TargetHeight <= 0 || Source.size() < image_size(Width, Height) || + Target.size() < image_size(TargetWidth, TargetHeight)) + { + return false; + } + coefficients const horizontal{Width, TargetWidth}; + coefficients const vertical{Height, TargetHeight}; + + std::vector temporary(image_size(TargetWidth, Height)); + pass const along_row{horizontal, 4}; + for (auto y = 0; y < Height; ++y) + { + for (auto x = 0; x < TargetWidth; ++x) + { + auto const *first{&Source[(static_cast(y) * Width + horizontal.bounds[x].first) * 4]}; + for (std::size_t channel = 0; channel < 3; ++channel) + { + temporary[(static_cast(y) * TargetWidth + x) * 4 + channel] = mix(first + channel, along_row, x); + } + } + } + pass const along_column{vertical, static_cast(TargetWidth) * 4}; + for (auto y = 0; y < TargetHeight; ++y) + { + for (auto x = 0; x < TargetWidth; ++x) + { + auto const *first{&temporary[(static_cast(vertical.bounds[y].first) * TargetWidth + x) * 4]}; + auto *pixel{&Target[(static_cast(y) * TargetWidth + x) * 4]}; + for (std::size_t channel = 0; channel < 3; ++channel) + { + pixel[channel] = mix(first + channel, along_column, y); + } + pixel[3] = 255; + } + } + return true; +} + +} // namespace wasm_screens diff --git a/scripting/wasmscreenkernels.h b/scripting/wasmscreenkernels.h new file mode 100644 index 000000000..15400e4b6 --- /dev/null +++ b/scripting/wasmscreenkernels.h @@ -0,0 +1,36 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include + +// image filters the wasm screens call through the host (eu07.led_post, eu07.resize_lanczos), run natively rather than +// in the interpreter. they give the very pixels of the Python screens: led_util.render_post() and Pillow's +// resize(..., Image.LANCZOS). the images are RGBA, 4 bytes a pixel, row by row; alpha is ignored and written as 255 +namespace wasm_screens +{ + +// the size in bytes of an RGBA image +constexpr std::size_t image_size(int const Width, int const Height) +{ + return static_cast(Width) * static_cast(Height) * 4; +} + +// led_util's render_post: every diode becomes 2x2 pixels with a darker grid between them, glowing into its neighbours +// (Bloom), in a 1 pixel black frame. Target takes (2 Width + 2) x (2 Height + 2) pixels. returns false for sizes that +// don't fit the spans +bool led_post(std::span Source, int Width, int Height, std::span Target, bool Bloom); + +// Pillow's resize with the Lanczos filter, horizontally then vertically, each pass rounded to 8 bits. returns false +// for sizes that don't fit the spans +bool resize_lanczos(std::span Source, int Width, int Height, std::span Target, int TargetWidth, int TargetHeight); + +} // namespace wasm_screens diff --git a/scripting/wasmscreenrules.cpp b/scripting/wasmscreenrules.cpp new file mode 100644 index 000000000..efd4bf424 --- /dev/null +++ b/scripting/wasmscreenrules.cpp @@ -0,0 +1,126 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "scripting/wasmscreenrules.h" + +#include "utilities/parser.h" + +#include + +namespace wasm_screens +{ + +void screen_config::deserialize(cParser &Input) +{ + while (deserialize_mapping(Input)) + { + // all work done by while() + } +} + +bool screen_config::deserialize_mapping(cParser &Input) +{ + // token can be a key or block end + auto const key{Input.getToken(true, "\n\r\t ,;[]")}; + + if (key.empty() || key == "}") + { + return false; + } + + if (key == "{") + { + script = Input.getToken(); + } + else if (key == "target:") + { + target = Input.getToken(); + } + else if (key == "frames:") + { + frames = Input.getToken(); + } + else if (key == "parameters:") + { + parameters = Input.getToken(); + } + else if (key == "instance:") + { + instancing = Input.getToken(); + } + else if (key == "background:") + { + background = Input.getToken(); + } + else + { + // a key of a later version: skip its value + Input.getToken(); + } + + return true; +} + +frame_schedule::frame_schedule(std::uint64_t const Start, int const Interval, int const Phase) + : m_interval{std::max(Interval, 1)}, m_next{Start + static_cast(std::max(Phase, 0))} +{ +} + +int frame_schedule::effective_interval(int const Configured, int const Requested) +{ + return std::max({Configured, Requested, 1}); +} + +int frame_schedule::phase(std::string_view const Key, int const Interval) +{ + if (Interval <= 1) + { + return 0; + } + // FNV-1a: the same offset for the same name on every compiler + std::uint32_t hash{2166136261u}; + for (auto const character : Key) + { + hash ^= static_cast(character); + hash *= 16777619u; + } + return static_cast(hash % static_cast(Interval)); +} + +bool frame_schedule::poll(std::uint64_t const Frame) +{ + if (Frame < m_next) + { + return false; + } + m_next = Frame + static_cast(m_interval); + return true; +} + +bool is_safe_relative_path(std::string_view const Path) +{ + if (Path.empty() || Path.front() == '/' || Path.front() == '\\' || Path.find(':') != std::string_view::npos) + { + return false; + } + std::size_t start{0}; + while (start <= Path.size()) + { + auto const end{std::min(Path.find_first_of("/\\", start), Path.size())}; + if (Path.substr(start, end - start) == "..") + { + return false; + } + start = end + 1; + } + return true; +} + +} // namespace wasm_screens diff --git a/scripting/wasmscreenrules.h b/scripting/wasmscreenrules.h new file mode 100644 index 000000000..923cf926e --- /dev/null +++ b/scripting/wasmscreenrules.h @@ -0,0 +1,74 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include +#include + +class cParser; + +// the parts of the wasm screens that don't need the runtime: the .mmd entries, the frame schedule and the +// file access rules. kept apart from scripting/wasmscreens.cpp so the unit tests can check them +namespace wasm_screens +{ + +// a wasm screen as the .mmd file describes it: +// wasmscreen: { script.wasm target: submodel frames: 4 parameters: key=value&key=value } +// wasmdestinationsign: { script.wasm frames: 30 instance: name parameters: ... background: texture } +// every key but the script is optional, and an unknown key is skipped along with its value +struct screen_config +{ + std::string script; // the .wasm file, relative to the vehicle folder when it has no path of its own + std::string target{"none"}; // cab screens: the submodel the screen is drawn on + std::string parameters; // extra key=value pairs passed to the screen with the simulation state + std::string instancing; // destination signs: "name" or "type", one sign per vehicle or per vehicle type + std::string background; // destination signs: the texture shown while the sign is off + int frames{0}; // the screen's own refresh interval in frames, used when longer than the one set in eu07.ini + + void deserialize(cParser &Input); + + private: + bool deserialize_mapping(cParser &Input); +}; + +// how often a screen gets fresh data, counted in rendered frames +class frame_schedule +{ + public: + frame_schedule() = default; + // Start: the frame the screen was created on. the first refresh comes Phase frames later + frame_schedule(std::uint64_t Start, int Interval, int Phase); + + // the interval of a screen: the one set in eu07.ini, or the screen's own one when that is longer. at least 1 + static int effective_interval(int Configured, int Requested); + // a fixed offset in [0, Interval) taken from the screen's name, so that the screens sharing an interval + // don't all refresh on the same frame + static int phase(std::string_view Key, int Interval); + + // true when the screen is due on Frame, and then not again until Interval frames later. a screen that + // wasn't asked for a while (a vehicle out of sight) is due on the first frame it is asked again + bool poll(std::uint64_t Frame); + + int interval() const + { + return m_interval; + } + + private: + int m_interval{1}; + std::uint64_t m_next{0}; +}; + +// true for a file a screen may read: a relative path inside the screen's folder, without '..', without a +// drive or a leading separator +bool is_safe_relative_path(std::string_view Path); + +} // namespace wasm_screens diff --git a/scripting/wasmscreens.cpp b/scripting/wasmscreens.cpp new file mode 100644 index 000000000..26521435d --- /dev/null +++ b/scripting/wasmscreens.cpp @@ -0,0 +1,942 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "scripting/wasmscreens.h" +#include "scripting/wasmscreenkernels.h" + +#include "input/command.h" +#include "interfaces/ITexture.h" +#include "utilities/Globals.h" +#include "utilities/Logs.h" +#include "utilities/dictionary.h" +#include "utilities/utilities.h" + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace +{ + +// the wasm stack of a screen, in bytes +constexpr std::uint32_t stack_size{64 * 1024}; +// the most instructions one call into a screen may run, so that a screen stuck in a loop can't hang the worker +constexpr int instruction_limit{200'000'000}; +// the largest side of a screen image, in pixels +constexpr int max_image_side{4096}; +constexpr std::size_t no_texture{std::numeric_limits::max()}; + +// the type of a value in the input of a screen, as eu07.value_type() reports it +enum class value_type : std::int32_t +{ + none = 0, + floating = 1, + integer = 2, + boolean = 3, + string = 4, + vec2_list = 5 +}; + +// the input of one refresh, indexed by key. when two values share a key the later one counts, as it does for the +// python screens, which get the values in the same order +class input_view +{ + public: + struct entry + { + value_type type{value_type::none}; + std::size_t index{0}; + }; + + explicit input_view(dictionary_source const &Source) : m_source{Source} + { + index(Source.floats, value_type::floating); + index(Source.integers, value_type::integer); + index(Source.bools, value_type::boolean); + index(Source.strings, value_type::string); + index(Source.vec2_lists, value_type::vec2_list); + } + + entry find(std::string_view const Key) const + { + if (auto const lookup{m_entries.find(Key)}; lookup != m_entries.end()) + { + return lookup->second; + } + return {}; + } + + dictionary_source const &source() const + { + return m_source; + } + + private: + template void index(Sequence_ const &Values, value_type const Type) + { + for (std::size_t idx = 0; idx < Values.size(); ++idx) + { + m_entries.insert_or_assign(std::string_view{Values[idx].first}, entry{Type, idx}); + } + } + + dictionary_source const &m_source; + std::unordered_map m_entries; +}; + +struct pending_command +{ + std::string name; + std::int32_t param1{0}; + std::int32_t param2{0}; + std::uint32_t vehicle{0}; +}; + +// the length of the UTF-8 sequence starting with the byte, 0 for a byte that can't start one +std::size_t utf8_length(std::uint8_t const Lead) +{ + if (Lead < 0x80) + { + return 1; + } + if (Lead >= 0xC2 && Lead <= 0xDF) + { + return 2; + } + if (Lead >= 0xE0 && Lead <= 0xEF) + { + return 3; + } + if (Lead >= 0xF0 && Lead <= 0xF4) + { + return 4; + } + return 0; +} + +// true for text in valid UTF-8 +bool is_utf8(std::string_view const Text) +{ + std::size_t idx{0}; + while (idx < Text.size()) + { + auto const length{utf8_length(static_cast(Text[idx]))}; + if (length == 0 || idx + length > Text.size()) + { + return false; + } + auto const sequence{Text.substr(idx + 1, length - 1)}; + if (false == std::ranges::all_of(sequence, [](char const Byte) { return (static_cast(Byte) & 0xC0) == 0x80; })) + { + return false; + } + idx += length; + } + return true; +} + +std::int32_t to_int32(double const Value) +{ + if (std::isnan(Value)) + { + return 0; + } + return static_cast(std::clamp(Value, static_cast(std::numeric_limits::min()), static_cast(std::numeric_limits::max()))); +} + +std::int32_t to_int32(std::size_t const Value) +{ + return static_cast(std::min(Value, std::numeric_limits::max())); +} + +} // namespace + +class wasm_screen +{ + public: + wasm_screen(wasm_screen_queue::screen_request const &Request, wasm_screens::frame_schedule const &Schedule) + : kind{Request.kind}, script{Request.script}, folder{substr_path(Request.script)}, texture{Request.texture}, m_schedule{Schedule} + { + } + ~wasm_screen() + { + release_runtime(); + } + wasm_screen(wasm_screen const &) = delete; + wasm_screen &operator=(wasm_screen const &) = delete; + + bool poll(std::uint64_t const Frame) + { + std::scoped_lock lock{m_schedule_mutex}; + return m_schedule.poll(Frame); + } + + // frees the module instance. done by the queue when it stops, as the runtime goes with it + void release_runtime() + { + if (exec_env != nullptr) + { + wasm_runtime_destroy_exec_env(exec_env); + exec_env = nullptr; + } + if (instance != nullptr) + { + wasm_runtime_deinstantiate(instance); + instance = nullptr; + } + failed = true; + } + + // set when made, read-only afterwards + wasm_screen_kind const kind; + std::string const script; + std::string const folder; + ITexture *const texture; + + // set by the worker when the screen can't run (any more); a failed screen isn't refreshed + std::atomic failed{false}; + + // the worker's part + wasm_module_inst_t instance{nullptr}; + wasm_exec_env_t exec_env{nullptr}; + wasm_function_inst_t render{nullptr}; + wasm_function_inst_t width{nullptr}; + wasm_function_inst_t height{nullptr}; + bool commands_ignored{false}; // a screen outside the cab tried to send a command, and it was logged + // the call in progress + input_view const *input{nullptr}; + std::vector *commands{nullptr}; + std::uint32_t vehicle{0}; + + // the image, handed from the worker to the main thread + std::mutex image_mutex; + std::vector image; + int image_width{0}; + int image_height{0}; + bool image_pending{false}; // drawn and not yet uploaded + std::size_t uploaded_texture{no_texture}; // the gl texture the image went to, to upload it again when it's made anew + + private: + std::mutex m_schedule_mutex; + wasm_screens::frame_schedule m_schedule; +}; + +namespace +{ + +wasm_screen *screen_of(wasm_exec_env_t Env) +{ + return static_cast(wasm_runtime_get_custom_data(wasm_runtime_get_module_inst(Env))); +} + +struct lookup_result +{ + input_view const *view{nullptr}; + input_view::entry entry; +}; + +lookup_result lookup(wasm_exec_env_t Env, char const *Key, std::uint32_t const Length) +{ + auto const *screen{screen_of(Env)}; + if (screen == nullptr || screen->input == nullptr || Key == nullptr) + { + return {}; + } + return {screen->input, screen->input->find(std::string_view{Key, Length})}; +} + +// the natives of the "eu07" module, which a screen imports. see wasm_screens_doc.md + +std::int32_t native_value_type(wasm_exec_env_t Env, char const *Key, std::uint32_t const Length) +{ + return static_cast(lookup(Env, Key, Length).entry.type); +} + +double native_get_float(wasm_exec_env_t Env, char const *Key, std::uint32_t const Length) +{ + auto const [view, entry]{lookup(Env, Key, Length)}; + using enum value_type; + switch (entry.type) + { + case floating: + return view->source().floats[entry.index].second; + case integer: + return view->source().integers[entry.index].second; + case boolean: + return view->source().bools[entry.index].second ? 1.0 : 0.0; + default: + return 0.0; + } +} + +std::int32_t native_get_int(wasm_exec_env_t Env, char const *Key, std::uint32_t const Length) +{ + auto const [view, entry]{lookup(Env, Key, Length)}; + using enum value_type; + switch (entry.type) + { + case floating: + return to_int32(view->source().floats[entry.index].second); + case integer: + return view->source().integers[entry.index].second; + case boolean: + return view->source().bools[entry.index].second ? 1 : 0; + default: + return 0; + } +} + +std::int32_t native_get_bool(wasm_exec_env_t Env, char const *Key, std::uint32_t const Length) +{ + auto const [view, entry]{lookup(Env, Key, Length)}; + using enum value_type; + switch (entry.type) + { + case floating: + return view->source().floats[entry.index].second != 0.0 ? 1 : 0; + case integer: + return view->source().integers[entry.index].second != 0 ? 1 : 0; + case boolean: + return view->source().bools[entry.index].second ? 1 : 0; + default: + return 0; + } +} + +// copies the string into the buffer, as UTF-8 (names of sceneries and vehicles may be in windows-1250). +// returns the length of the whole string, which may be more than the buffer took, or -1 when there is no such string +std::int32_t native_get_string(wasm_exec_env_t Env, char const *Key, std::uint32_t const Length, char *Buffer, std::uint32_t const Capacity) +{ + auto const [view, entry]{lookup(Env, Key, Length)}; + if (entry.type != value_type::string) + { + return -1; + } + auto const &value{view->source().strings[entry.index].second}; + auto const text{is_utf8(value) ? value : win1250_to_utf8(value)}; + if (Buffer != nullptr) + { + std::memcpy(Buffer, text.data(), std::min(text.size(), Capacity)); + } + return to_int32(text.size()); +} + +std::int32_t native_get_vec2_count(wasm_exec_env_t Env, char const *Key, std::uint32_t const Length) +{ + auto const [view, entry]{lookup(Env, Key, Length)}; + if (entry.type != value_type::vec2_list) + { + return 0; + } + return to_int32(view->source().vec2_lists[entry.index].second.size()); +} + +// writes the point as two f32 at Output. returns 1 on success, 0 when there is no such point +std::int32_t native_get_vec2(wasm_exec_env_t Env, char const *Key, std::uint32_t const Length, std::int32_t const Index, std::uint32_t const Output) +{ + auto const [view, entry]{lookup(Env, Key, Length)}; + if (entry.type != value_type::vec2_list || Index < 0) + { + return 0; + } + auto const &points{view->source().vec2_lists[entry.index].second}; + if (static_cast(Index) >= points.size()) + { + return 0; + } + auto *instance{wasm_runtime_get_module_inst(Env)}; + std::array const point{points[Index].x, points[Index].y}; + if (false == wasm_runtime_validate_app_addr(instance, Output, sizeof(point))) + { + // the runtime has raised an exception, which ends the call + return 0; + } + std::memcpy(wasm_runtime_addr_app_to_native(instance, Output), point.data(), sizeof(point)); + return 1; +} + +void native_command(wasm_exec_env_t Env, char const *Name, std::uint32_t const Length, std::int32_t const Param1, std::int32_t const Param2) +{ + auto *screen{screen_of(Env)}; + if (screen == nullptr || screen->commands == nullptr || Name == nullptr) + { + return; + } + if (screen->kind != wasm_screen_kind::cab) + { + if (false == screen->commands_ignored) + { + screen->commands_ignored = true; + WriteLog(std::format("WASM screen \"{}\": commands are only taken from screens in the cab", screen->script)); + } + return; + } + screen->commands->emplace_back(std::string{Name, Length}, Param1, Param2, screen->vehicle); +} + +void native_log(wasm_exec_env_t Env, char const *Text, std::uint32_t const Length) +{ + auto const *screen{screen_of(Env)}; + if (screen == nullptr || Text == nullptr) + { + return; + } + WriteLog(std::format("WASM screen \"{}\": {}", screen->script, std::string_view{Text, Length})); +} + +// reads a file from the screen's folder into the buffer. returns the size of the whole file, which may be more +// than the buffer took, or -1 when there is no such file or the path leads outside the folder +std::int32_t native_file_read(wasm_exec_env_t Env, char const *Path, std::uint32_t const Length, char *Buffer, std::uint32_t const Capacity) +{ + auto const *screen{screen_of(Env)}; + if (screen == nullptr || Path == nullptr) + { + return -1; + } + std::string_view const path{Path, Length}; + if (false == wasm_screens::is_safe_relative_path(path)) + { + return -1; + } + std::ifstream file{screen->folder + std::string{path}, std::ios::binary | std::ios::ate}; + if (false == file.is_open()) + { + return -1; + } + auto const size{static_cast(std::max(file.tellg(), 0))}; + if (Buffer != nullptr && Capacity > 0) + { + file.seekg(0); + file.read(Buffer, static_cast(std::min(size, Capacity))); + } + return to_int32(size); +} + +// seconds of a steady clock, the same for every screen, for animations that don't depend on how often the +// screen is refreshed +double native_time(wasm_exec_env_t /*Env*/) +{ + static auto const start{std::chrono::steady_clock::now()}; + return std::chrono::duration(std::chrono::steady_clock::now() - start).count(); +} + +// the bytes of an image in the module's memory; an empty span for one that lies outside (the runtime then raises an +// exception, which ends the call) +std::span module_image(wasm_exec_env_t Env, std::uint32_t const Offset, int const Width, int const Height) +{ + auto *instance{wasm_runtime_get_module_inst(Env)}; + auto const size{wasm_screens::image_size(Width, Height)}; + if (false == wasm_runtime_validate_app_addr(instance, Offset, size)) + { + return {}; + } + return {static_cast(wasm_runtime_addr_app_to_native(instance, Offset)), size}; +} + +bool valid_side(std::int32_t const Side) +{ + return Side > 0 && Side <= max_image_side; +} + +// led_util's render_post, natively: Target takes (2 Width + 2) x (2 Height + 2) pixels. returns 1, or 0 for an image +// that doesn't fit +std::int32_t native_led_post(wasm_exec_env_t Env, std::uint32_t const Source, std::int32_t const Width, std::int32_t const Height, std::uint32_t const Target, std::int32_t const Bloom) +{ + if (false == valid_side(Width) || false == valid_side(Height)) + { + return 0; + } + auto const source{module_image(Env, Source, Width, Height)}; + auto const target{module_image(Env, Target, Width * 2 + 2, Height * 2 + 2)}; + if (source.empty() || target.empty()) + { + return 0; + } + return wasm_screens::led_post(source, Width, Height, target, Bloom != 0) ? 1 : 0; +} + +// Pillow's resize(..., LANCZOS), natively. returns 1, or 0 for an image that doesn't fit +std::int32_t native_resize_lanczos(wasm_exec_env_t Env, std::uint32_t const Source, std::int32_t const Width, std::int32_t const Height, std::uint32_t const Target, + std::int32_t const TargetWidth, std::int32_t const TargetHeight) +{ + if (false == valid_side(Width) || false == valid_side(Height) || false == valid_side(TargetWidth) || false == valid_side(TargetHeight)) + { + return 0; + } + auto const source{module_image(Env, Source, Width, Height)}; + auto const target{module_image(Env, Target, TargetWidth, TargetHeight)}; + if (source.empty() || target.empty()) + { + return 0; + } + return wasm_screens::resize_lanczos(source, Width, Height, target, TargetWidth, TargetHeight) ? 1 : 0; +} + +template NativeSymbol native(char const *Name, Function_ *Function, char const *Signature) +{ + return NativeSymbol{Name, reinterpret_cast(Function), Signature, nullptr}; +} + +} // namespace + +struct wasm_screen_queue::implementation +{ + struct module_entry + { + std::vector bytes; // the runtime reads the module from here as long as it is loaded + wasm_module_t module{nullptr}; + }; + + struct task + { + std::shared_ptr screen; + std::shared_ptr input; + std::uint32_t vehicle{0}; + }; + + implementation() + : natives{native("value_type", &native_value_type, "(*~)i"), + native("get_float", &native_get_float, "(*~)F"), + native("get_int", &native_get_int, "(*~)i"), + native("get_bool", &native_get_bool, "(*~)i"), + native("get_string", &native_get_string, "(*~*~)i"), + native("get_vec2_count", &native_get_vec2_count, "(*~)i"), + native("get_vec2", &native_get_vec2, "(*~ii)i"), + native("command", &native_command, "(*~ii)"), + native("log", &native_log, "(*~)"), + native("file_read", &native_file_read, "(*~*~)i"), + native("time", &native_time, "()F"), + native("led_post", &native_led_post, "(iiiii)i"), + native("resize_lanczos", &native_resize_lanczos, "(iiiiii)i")} + { + } + + void run(std::stop_token const &Stop); + void process(task const &Task); + bool instantiate(wasm_screen &Screen); + wasm_module_t load_module(std::string const &Script); + bool call(wasm_screen &Screen, wasm_function_inst_t Function, std::string_view Name, std::int32_t &Result) const; + void present(wasm_screen &Screen, std::uint32_t Pixels) const; + static void upload(wasm_screen &Screen); + static void execute(pending_command const &Command); + + // the runtime keeps the array and sorts it, so it lives as long as the queue + std::array natives; + bool initialized{false}; + std::atomic frame{0}; + + std::mutex screens_mutex; + std::unordered_map> screens; + + std::mutex tasks_mutex; + std::condition_variable_any tasks_condition; + std::deque tasks; + std::jthread worker; + + std::mutex commands_mutex; + std::vector commands; + + // the worker's, and the queue's once the worker stopped + std::unordered_map modules; +}; + +void wasm_screen_queue::implementation::run(std::stop_token const &Stop) +{ + wasm_runtime_init_thread_env(); + while (false == Stop.stop_requested()) + { + task next; + { + std::unique_lock lock{tasks_mutex}; + if (false == tasks_condition.wait(lock, Stop, [this] { return false == tasks.empty(); })) + { + break; + } + next = std::move(tasks.front()); + tasks.pop_front(); + } + process(next); + } + wasm_runtime_destroy_thread_env(); +} + +void wasm_screen_queue::implementation::process(task const &Task) +{ + auto &screen{*Task.screen}; + if (screen.failed) + { + return; + } + if (screen.instance == nullptr && false == instantiate(screen)) + { + screen.failed = true; + return; + } + + input_view const view{*Task.input}; + std::vector sent; + screen.input = &view; + screen.commands = &sent; + screen.vehicle = Task.vehicle; + std::int32_t pixels{0}; + auto const rendered{call(screen, screen.render, "screen_render", pixels)}; + screen.input = nullptr; + screen.commands = nullptr; + if (false == rendered) + { + return; + } + // 0: the screen didn't change, keep the image there is + if (pixels != 0) + { + present(screen, static_cast(pixels)); + } + if (false == sent.empty()) + { + std::scoped_lock lock{commands_mutex}; + commands.insert(commands.end(), std::make_move_iterator(sent.begin()), std::make_move_iterator(sent.end())); + } +} + +bool wasm_screen_queue::implementation::instantiate(wasm_screen &Screen) +{ + auto *module{load_module(Screen.script)}; + if (module == nullptr) + { + return false; + } + std::array error{}; + Screen.instance = wasm_runtime_instantiate(module, stack_size, 0, error.data(), static_cast(error.size())); + if (Screen.instance == nullptr) + { + ErrorLog(std::format("WASM screen \"{}\": instantiation failed: {}", Screen.script, error.data())); + return false; + } + wasm_runtime_set_custom_data(Screen.instance, &Screen); + Screen.exec_env = wasm_runtime_create_exec_env(Screen.instance, stack_size); + if (Screen.exec_env == nullptr) + { + ErrorLog(std::format("WASM screen \"{}\": failed to create the execution environment", Screen.script)); + return false; + } + Screen.render = wasm_runtime_lookup_function(Screen.instance, "screen_render"); + Screen.width = wasm_runtime_lookup_function(Screen.instance, "screen_width"); + Screen.height = wasm_runtime_lookup_function(Screen.instance, "screen_height"); + if (Screen.render == nullptr || Screen.width == nullptr || Screen.height == nullptr) + { + ErrorLog(std::format("WASM screen \"{}\": the module has to export screen_render, screen_width and screen_height", Screen.script)); + return false; + } + if (auto *init{wasm_runtime_lookup_function(Screen.instance, "screen_init")}; init != nullptr) + { + std::int32_t result{0}; + if (false == call(Screen, init, "screen_init", result)) + { + return false; + } + if (result != 0) + { + ErrorLog(std::format("WASM screen \"{}\": screen_init returned {}", Screen.script, result)); + return false; + } + } + WriteLog(std::format("WASM screen \"{}\": ready", Screen.script)); + return true; +} + +wasm_module_t wasm_screen_queue::implementation::load_module(std::string const &Script) +{ + if (auto const lookup{modules.find(Script)}; lookup != modules.end()) + { + return lookup->second.module; + } + // a failure is kept as well, so the module isn't tried again for every screen using it + auto &entry{modules[Script]}; + std::ifstream file{Script, std::ios::binary}; + if (false == file.is_open()) + { + ErrorLog(std::format("WASM screen \"{}\": file not found", Script)); + return nullptr; + } + entry.bytes.assign(std::istreambuf_iterator{file}, std::istreambuf_iterator{}); + if (entry.bytes.empty() || entry.bytes.size() > std::numeric_limits::max()) + { + ErrorLog(std::format("WASM screen \"{}\": invalid module size", Script)); + return nullptr; + } + std::array error{}; + entry.module = wasm_runtime_load(entry.bytes.data(), static_cast(entry.bytes.size()), error.data(), static_cast(error.size())); + if (entry.module == nullptr) + { + ErrorLog(std::format("WASM screen \"{}\": failed to load the module: {}", Script, error.data())); + } + return entry.module; +} + +// calls a function of the screen that takes nothing and returns an i32. a failed call disables the screen +bool wasm_screen_queue::implementation::call(wasm_screen &Screen, wasm_function_inst_t Function, std::string_view const Name, std::int32_t &Result) const +{ + wasm_runtime_set_instruction_count_limit(Screen.exec_env, instruction_limit); + std::array cells{}; + if (false == wasm_runtime_call_wasm(Screen.exec_env, Function, 0, cells.data())) + { + auto const *exception{wasm_runtime_get_exception(Screen.instance)}; + ErrorLog(std::format("WASM screen \"{}\": {} failed: {}", Screen.script, Name, exception != nullptr ? exception : "unknown error")); + Screen.failed = true; + return false; + } + Result = static_cast(cells[0]); + return true; +} + +// copies the image the screen drew, Pixels being its address in the module's memory +void wasm_screen_queue::implementation::present(wasm_screen &Screen, std::uint32_t const Pixels) const +{ + std::int32_t width{0}; + std::int32_t height{0}; + if (false == call(Screen, Screen.width, "screen_width", width) || false == call(Screen, Screen.height, "screen_height", height)) + { + return; + } + if (width <= 0 || height <= 0 || width > max_image_side || height > max_image_side) + { + ErrorLog(std::format("WASM screen \"{}\": invalid image size {}x{}", Screen.script, width, height)); + Screen.failed = true; + return; + } + auto const size{static_cast(width) * static_cast(height) * 4}; + if (false == wasm_runtime_validate_app_addr(Screen.instance, Pixels, size)) + { + ErrorLog(std::format("WASM screen \"{}\": the image lies outside the module's memory", Screen.script)); + Screen.failed = true; + return; + } + auto const *pixels{static_cast(wasm_runtime_addr_app_to_native(Screen.instance, Pixels))}; + + std::scoped_lock lock{Screen.image_mutex}; + Screen.image.assign(pixels, pixels + size); + Screen.image_width = width; + Screen.image_height = height; + Screen.image_pending = true; +} + +void wasm_screen_queue::implementation::upload(wasm_screen &Screen) +{ + if (Screen.texture == nullptr) + { + return; + } + std::scoped_lock lock{Screen.image_mutex}; + if (Screen.image.empty() || false == Screen.texture->get_is_ready()) + { + // nothing drawn yet, or the texture isn't made yet or was released: the image goes up once it's there + return; + } + if (false == Screen.image_pending && Screen.texture->get_id() == Screen.uploaded_texture) + { + return; + } + Screen.texture->update_from_memory(Screen.image_width, Screen.image_height, Screen.image.data()); + Screen.uploaded_texture = Screen.texture->get_id(); + Screen.image_pending = false; +} + +void wasm_screen_queue::implementation::execute(pending_command const &Command) +{ + auto const lookup{simulation::commandMap.find(Command.name)}; + if (lookup == simulation::commandMap.end()) + { + ErrorLog(std::format("WASM screen: command [{}] not found", Command.name)); + return; + } + command_data data{}; + data.command = lookup->second; + data.action = GLFW_PRESS; + data.param1 = Command.param1; + data.param2 = Command.param2; + WriteLog(std::format("WASM screen: executing command [{}] with params: P1={} P2={} Target ID={}", Command.name, Command.param1, Command.param2, Command.vehicle)); + simulation::Commands.push(data, static_cast(command_target::vehicle) | Command.vehicle); +} + +wasm_screen_queue::wasm_screen_queue() : m_impl{std::make_unique()} {} + +wasm_screen_queue::~wasm_screen_queue() +{ + exit(); +} + +bool wasm_screen_queue::init() +{ + if (m_impl->initialized) + { + return true; + } + RuntimeInitArgs arguments{}; + arguments.mem_alloc_type = Alloc_With_System_Allocator; + arguments.native_module_name = "eu07"; + arguments.native_symbols = m_impl->natives.data(); + arguments.n_native_symbols = static_cast(m_impl->natives.size()); + arguments.running_mode = Mode_Interp; + if (false == wasm_runtime_full_init(&arguments)) + { + ErrorLog("WASM screens: failed to initialize the runtime"); + return false; + } + wasm_runtime_set_log_level(WASM_LOG_LEVEL_ERROR); + m_impl->initialized = true; + auto *impl{m_impl.get()}; + m_impl->worker = std::jthread([impl](std::stop_token const &Stop) { impl->run(Stop); }); + WriteLog(std::format("WASM screens: setup complete, refreshed every {} frames in the cab and every {} frames outside", Global.wasm_cabframes, Global.wasm_externalframes)); + return true; +} + +void wasm_screen_queue::exit() +{ + if (false == m_impl->initialized) + { + return; + } + if (m_impl->worker.joinable()) + { + m_impl->worker.request_stop(); + m_impl->worker.join(); + } + { + std::scoped_lock lock{m_impl->tasks_mutex}; + m_impl->tasks.clear(); + } + { + std::scoped_lock lock{m_impl->commands_mutex}; + m_impl->commands.clear(); + } + { + // the vehicles may hold their screens past this point, but the runtime goes now + std::scoped_lock lock{m_impl->screens_mutex}; + for (auto const &[key, screen] : m_impl->screens) + { + if (auto const live{screen.lock()}; live != nullptr) + { + live->release_runtime(); + } + } + m_impl->screens.clear(); + } + for (auto const &[script, entry] : m_impl->modules) + { + if (entry.module != nullptr) + { + wasm_runtime_unload(entry.module); + } + } + m_impl->modules.clear(); + wasm_runtime_destroy(); + m_impl->initialized = false; +} + +std::shared_ptr wasm_screen_queue::acquire(screen_request const &Request) +{ + if (false == m_impl->initialized || Request.script.empty()) + { + return nullptr; + } + auto const key{Request.key.empty() ? Request.script : Request.key}; + std::scoped_lock lock{m_impl->screens_mutex}; + if (auto const lookup{m_impl->screens.find(key)}; lookup != m_impl->screens.end()) + { + if (auto existing{lookup->second.lock()}; existing != nullptr) + { + return existing; + } + } + auto const configured{Request.kind == wasm_screen_kind::cab ? Global.wasm_cabframes : Global.wasm_externalframes}; + auto const interval{wasm_screens::frame_schedule::effective_interval(configured, Request.frames)}; + auto screen{std::make_shared(Request, wasm_screens::frame_schedule{m_impl->frame.load(), interval, wasm_screens::frame_schedule::phase(key, interval)})}; + m_impl->screens.insert_or_assign(key, screen); + return screen; +} + +bool wasm_screen_queue::due(wasm_screen &Screen) const +{ + if (false == m_impl->initialized || Screen.failed) + { + return false; + } + return Screen.poll(m_impl->frame.load()); +} + +void wasm_screen_queue::submit(std::shared_ptr const &Screen, std::shared_ptr Input, std::uint32_t const Vehicle) +{ + if (false == m_impl->initialized || Screen == nullptr || Input == nullptr || Screen->failed) + { + return; + } + { + std::scoped_lock lock{m_impl->tasks_mutex}; + auto const pending{std::ranges::find(m_impl->tasks, Screen, &implementation::task::screen)}; + if (pending != m_impl->tasks.end()) + { + // the refresh still waiting gets the newer input + pending->input = std::move(Input); + pending->vehicle = Vehicle; + } + else + { + m_impl->tasks.emplace_back(Screen, std::move(Input), Vehicle); + } + } + m_impl->tasks_condition.notify_one(); +} + +void wasm_screen_queue::update() +{ + if (false == m_impl->initialized) + { + return; + } + ++m_impl->frame; + { + std::scoped_lock lock{m_impl->screens_mutex}; + std::erase_if(m_impl->screens, [](auto const &Entry) { return Entry.second.expired(); }); + for (auto const &[key, screen] : m_impl->screens) + { + if (auto const live{screen.lock()}; live != nullptr) + { + implementation::upload(*live); + } + } + } + std::vector sent; + { + std::scoped_lock lock{m_impl->commands_mutex}; + sent.swap(m_impl->commands); + } + for (auto const &command : sent) + { + implementation::execute(command); + } +} diff --git a/scripting/wasmscreens.h b/scripting/wasmscreens.h new file mode 100644 index 000000000..a4933646a --- /dev/null +++ b/scripting/wasmscreens.h @@ -0,0 +1,72 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "scripting/wasmscreenrules.h" + +#include +#include +#include + +struct ITexture; +struct dictionary_source; + +// screens drawn by WebAssembly modules, the counterpart of the python screens (scripting/PyInt.h). +// a module gets the same state the python screens get, returns an RGBA image and may send commands. the +// interface between the two is described in wasm_screens_doc.md. +// unlike the python screens, which refresh after a time, a wasm screen refreshes every so many rendered +// frames: wasm.cabframes in eu07.ini for the screens in the cab, wasm.externalframes for the screens outside +// (destination signs) + +enum class wasm_screen_kind +{ + cab, // in the cab of the driven vehicle: may send commands to it + external // on the outside of a vehicle, such as a destination sign: shows only +}; + +// one screen: a module instance with its own memory, and the image it drew last +class wasm_screen; + +class wasm_screen_queue +{ + public: + struct screen_request + { + wasm_screen_kind kind{wasm_screen_kind::cab}; + std::string script; // the .wasm file + std::string key; // requests with the same key get the same screen, e.g. the destination signs of one train + ITexture *texture{nullptr}; // where the screen is drawn; none for a screen that only sends commands + int frames{0}; // the screen's own refresh interval from the .mmd, used when longer than the eu07.ini one + }; + + wasm_screen_queue(); + ~wasm_screen_queue(); + wasm_screen_queue(wasm_screen_queue const &) = delete; + wasm_screen_queue &operator=(wasm_screen_queue const &) = delete; + + // starts the runtime and its worker thread. returns true on success + bool init(); + // stops the worker and releases every screen, also the ones still held by vehicles + void exit(); + // the screen for the request, made on the first request with its key. nullptr when the wasm screens are off + std::shared_ptr acquire(screen_request const &Request); + // true once per refresh interval of the screen. the caller then gathers the screen's input and submit()s it + bool due(wasm_screen &Screen) const; + // queues a refresh of the screen with the given input, replacing a refresh of it still waiting. + // Vehicle: the vehicle that gets the commands the screen sends; cab screens only + void submit(std::shared_ptr const &Screen, std::shared_ptr Input, std::uint32_t Vehicle); + // main thread, once per rendered frame: uploads the finished images, runs the commands the screens sent and + // counts the frame + void update(); + + private: + struct implementation; + std::unique_ptr m_impl; +}; diff --git a/scripting/wasmscreensstub.cpp b/scripting/wasmscreensstub.cpp new file mode 100644 index 000000000..666b53f29 --- /dev/null +++ b/scripting/wasmscreensstub.cpp @@ -0,0 +1,51 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +// the wasm screens of a build without WITH_WASM: there are none, and the vehicles fall back to what they had before + +#include "stdafx.h" +#include "scripting/wasmscreens.h" + +struct wasm_screen_queue::implementation +{ +}; + +wasm_screen_queue::wasm_screen_queue() : m_impl{std::make_unique()} {} + +wasm_screen_queue::~wasm_screen_queue() = default; + +bool wasm_screen_queue::init() +{ + return false; +} + +void wasm_screen_queue::exit() +{ + // nothing was started +} + +std::shared_ptr wasm_screen_queue::acquire(screen_request const & /*Request*/) +{ + return nullptr; +} + +bool wasm_screen_queue::due(wasm_screen & /*Screen*/) const +{ + return false; +} + +void wasm_screen_queue::submit(std::shared_ptr const & /*Screen*/, std::shared_ptr /*Input*/, std::uint32_t /*Vehicle*/) +{ + // nothing to refresh +} + +void wasm_screen_queue::update() +{ + // nothing to upload +} diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index 17efffa7d..b620cc0ae 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -25,6 +25,11 @@ add_executable(${UNIT_TESTS_NAME} # the core library brings the game's build settings along target_link_libraries(${UNIT_TESTS_NAME} PRIVATE eu07_core) +# the wasm screen host, tested with the real runtime (test_wasm_host.cpp) +if (WITH_WASM) + target_sources(${UNIT_TESTS_NAME} PRIVATE "${CMAKE_SOURCE_DIR}/scripting/wasmscreens.cpp") + target_link_libraries(${UNIT_TESTS_NAME} PRIVATE eu07_wamr) +endif() target_include_directories(${UNIT_TESTS_NAME} PRIVATE "${DEPS_DIR}/doctest") # the names the tests CAPTURE are often C strings, shown as text rather than pointers target_compile_definitions(${UNIT_TESTS_NAME} PRIVATE EU07_UNIT_TESTS_DATA="${CMAKE_CURRENT_SOURCE_DIR}/data" DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING) diff --git a/tests/unit/test_wasm_host.cpp b/tests/unit/test_wasm_host.cpp new file mode 100644 index 000000000..d96ee716d --- /dev/null +++ b/tests/unit/test_wasm_host.cpp @@ -0,0 +1,288 @@ +#include "stdafx.h" +#include "doctest.h" + +// the wasm screen host (scripting/wasmscreens.cpp) with the real runtime: a module reads its input, draws an +// image that goes to the screen's texture and sends a command; a module stuck in a loop is stopped. built with +// WITH_WASM only + +#ifdef WITH_WASM + +#include "scripting/wasmscreens.h" +#include "input/command.h" +#include "interfaces/ITexture.h" +#include "utilities/Globals.h" +#include "utilities/dictionary.h" + +#include +#include +#include +#include +#include +#include +#include +#include + +// the engine's command queue and command names, which the test build doesn't link: the commands the screens send +// are kept here instead + +namespace { + +std::vector> &sent_commands() { + static std::vector> commands; + return commands; +} + +} // namespace + +namespace simulation { +command_queue Commands; // NOSONAR the engine's extern global, input/command.h +std::unordered_map const commandMap{{"cmdtest", user_command::aidriverenable}}; // NOSONAR the engine's extern global, input/command.h +} // namespace simulation + +void command_queue::push(command_data const &Command, uint32_t const Recipient) { // NOSONAR signature from input/command.h + sent_commands().emplace_back(Command, Recipient); +} + +namespace { + +// the modules, encoded by hand. "paint": a 2x2 screen in the colour 0xFF0000vv, vv being the input value +// "speed", which sends the command "cmdtest" with the parameters (vv, 7): +// (import "eu07" "get_float" (func $get_float (param i32 i32) (result f64))) +// (import "eu07" "command" (func $command (param i32 i32 i32 i32))) +// (memory (export "memory") 1) +// (data (i32.const 0) "speed") (data (i32.const 16) "cmdtest") +// (func (export "screen_width") (result i32) i32.const 2) +// (func (export "screen_height") (result i32) i32.const 2) +// (func (export "screen_render") (result i32) (local $v i32) +// (local.set $v (i32.trunc_f64_s (call $get_float (i32.const 0) (i32.const 5)))) +// (i32.store (i32.const 1024) (i32.or (local.get $v) (i32.const 0xFF000000))) ... the same at 1028, 1032, 1036 +// (call $command (i32.const 16) (i32.const 7) (local.get $v) (i32.const 7)) +// (i32.const 1024)) +constexpr std::array paint_module{ + 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x12, 0x03, 0x60, 0x02, 0x7f, 0x7f, 0x01, + 0x7c, 0x60, 0x04, 0x7f, 0x7f, 0x7f, 0x7f, 0x00, 0x60, 0x00, 0x01, 0x7f, 0x02, 0x21, 0x02, 0x04, + 0x65, 0x75, 0x30, 0x37, 0x09, 0x67, 0x65, 0x74, 0x5f, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x00, 0x00, + 0x04, 0x65, 0x75, 0x30, 0x37, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x00, 0x01, 0x03, + 0x04, 0x03, 0x02, 0x02, 0x02, 0x05, 0x03, 0x01, 0x00, 0x01, 0x07, 0x39, 0x04, 0x06, 0x6d, 0x65, + 0x6d, 0x6f, 0x72, 0x79, 0x02, 0x00, 0x0c, 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x5f, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x00, 0x02, 0x0d, 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x5f, 0x68, 0x65, 0x69, + 0x67, 0x68, 0x74, 0x00, 0x03, 0x0d, 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x5f, 0x72, 0x65, 0x6e, + 0x64, 0x65, 0x72, 0x00, 0x04, 0x0a, 0x5e, 0x03, 0x04, 0x00, 0x41, 0x02, 0x0b, 0x04, 0x00, 0x41, + 0x02, 0x0b, 0x52, 0x01, 0x01, 0x7f, 0x41, 0x00, 0x41, 0x05, 0x10, 0x00, 0xaa, 0x21, 0x00, 0x41, + 0x80, 0x08, 0x20, 0x00, 0x41, 0x80, 0x80, 0x80, 0x78, 0x72, 0x36, 0x02, 0x00, 0x41, 0x84, 0x08, + 0x20, 0x00, 0x41, 0x80, 0x80, 0x80, 0x78, 0x72, 0x36, 0x02, 0x00, 0x41, 0x88, 0x08, 0x20, 0x00, + 0x41, 0x80, 0x80, 0x80, 0x78, 0x72, 0x36, 0x02, 0x00, 0x41, 0x8c, 0x08, 0x20, 0x00, 0x41, 0x80, + 0x80, 0x80, 0x78, 0x72, 0x36, 0x02, 0x00, 0x41, 0x10, 0x41, 0x07, 0x20, 0x00, 0x41, 0x07, 0x10, + 0x01, 0x41, 0x80, 0x08, 0x0b, 0x0b, 0x17, 0x02, 0x00, 0x41, 0x00, 0x0b, 0x05, 0x73, 0x70, 0x65, + 0x65, 0x64, 0x00, 0x41, 0x10, 0x0b, 0x07, 0x63, 0x6d, 0x64, 0x74, 0x65, 0x73, 0x74}; + +// "spin": exports the same functions as "paint", but screen_render never returns: (loop $l (br $l)) +constexpr std::array spin_module{ + 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x05, 0x01, 0x60, 0x00, 0x01, 0x7f, 0x03, + 0x04, 0x03, 0x00, 0x00, 0x00, 0x05, 0x03, 0x01, 0x00, 0x01, 0x07, 0x39, 0x04, 0x06, 0x6d, 0x65, + 0x6d, 0x6f, 0x72, 0x79, 0x02, 0x00, 0x0c, 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x5f, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x00, 0x00, 0x0d, 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x5f, 0x68, 0x65, 0x69, + 0x67, 0x68, 0x74, 0x00, 0x01, 0x0d, 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x5f, 0x72, 0x65, 0x6e, + 0x64, 0x65, 0x72, 0x00, 0x02, 0x0a, 0x15, 0x03, 0x04, 0x00, 0x41, 0x02, 0x0b, 0x04, 0x00, 0x41, + 0x02, 0x0b, 0x09, 0x00, 0x03, 0x40, 0x0c, 0x00, 0x0b, 0x41, 0x00, 0x0b}; + +// a texture that keeps what was uploaded to it +struct recording_texture : ITexture { + bool create(bool) override { return true; } + int get_width() const override { return width; } + int get_height() const override { return height; } + size_t get_id() const override { return id; } + void release() override { /* nothing held */ } + void make_stub() override { /* nothing held */ } + std::string_view get_traits() const override { return ""; } + std::string_view get_name() const override { return "recording"; } + std::string_view get_type() const override { return "make:"; } + bool is_stub() const override { return false; } + bool get_has_alpha() const override { return true; } + bool get_is_ready() const override { return ready; } + void set_components_hint(int) override { /* not used */ } + void make_from_memory(size_t const Width, size_t const Height, const uint8_t *Data) override { update_from_memory(Width, Height, Data); } + void update_from_memory(size_t const Width, size_t const Height, const uint8_t *Data) override { + width = static_cast(Width); + height = static_cast(Height); + pixels.assign(Data, Data + Width * Height * 4); + ++uploads; + } + + bool ready{true}; + size_t id{1}; + int width{0}; + int height{0}; + int uploads{0}; + std::vector pixels; +}; + +// writes a module into a folder of its own, removed with the object +class module_file { + public: + template + module_file(std::string const &Name, std::array const &Bytes) + : m_folder{std::filesystem::temp_directory_path() / std::format("eu07_wasm_test_{}", Name)} { + std::filesystem::create_directories(m_folder); + m_path = (m_folder / (Name + ".wasm")).generic_string(); + std::ofstream file{m_path, std::ios::binary}; + file.write(reinterpret_cast(Bytes.data()), static_cast(Bytes.size())); + } + ~module_file() { + std::error_code error; + std::filesystem::remove_all(m_folder, error); + } + module_file(module_file const &) = delete; + module_file &operator=(module_file const &) = delete; + + std::string const &path() const { return m_path; } + + private: + std::filesystem::path m_folder; + std::string m_path; +}; + +// runs frames until the condition holds, or gives up after a few seconds +bool run_until(wasm_screen_queue &Queue, std::function const &Condition) { + auto const deadline{std::chrono::steady_clock::now() + std::chrono::seconds(10)}; + while (std::chrono::steady_clock::now() < deadline) { + Queue.update(); + if (Condition()) { + return true; + } + std::this_thread::sleep_for(std::chrono::milliseconds(5)); + } + return false; +} + +std::shared_ptr speed(double const Value) { + auto input{std::make_shared()}; + input->insert("speed", Value); + return input; +} + +} // namespace + +TEST_CASE("wasm host: a cab screen draws from its input and sends commands to its vehicle") { + sent_commands().clear(); + module_file const module{"paint", paint_module}; + wasm_screen_queue queue; + REQUIRE(queue.init()); + + recording_texture texture; + auto const screen{queue.acquire({.kind = wasm_screen_kind::cab, .script = module.path(), .key = "cab", .texture = &texture, .frames = 0})}; + REQUIRE(screen != nullptr); + // the same key, the same screen + CHECK(queue.acquire({.kind = wasm_screen_kind::cab, .script = module.path(), .key = "cab", .texture = &texture, .frames = 0}) == screen); + + REQUIRE(run_until(queue, [&queue, &screen] { return queue.due(*screen); })); + queue.submit(screen, speed(5.0), 42); + REQUIRE(run_until(queue, [&texture] { return texture.uploads > 0 && false == sent_commands().empty(); })); + + CHECK(texture.width == 2); + CHECK(texture.height == 2); + REQUIRE(texture.pixels.size() == 16); + std::array const expected{0x05, 0x00, 0x00, 0xFF}; + for (std::size_t pixel = 0; pixel < 4; ++pixel) { + CAPTURE(pixel); + CHECK(std::equal(expected.begin(), expected.end(), texture.pixels.begin() + static_cast(pixel * 4))); + } + + REQUIRE(sent_commands().size() == 1); + auto const &[command, recipient]{sent_commands().front()}; + CHECK(command.command == user_command::aidriverenable); + CHECK(command.param1 == 5.0); + CHECK(command.param2 == 7.0); + CHECK(recipient == (static_cast(command_target::vehicle) | 42u)); + + queue.exit(); +} + +TEST_CASE("wasm host: the image goes up again when the texture is made anew, and waits while it isn't there") { + sent_commands().clear(); + module_file const module{"paint", paint_module}; + wasm_screen_queue queue; + REQUIRE(queue.init()); + + recording_texture texture; + texture.ready = false; + auto const screen{queue.acquire({.kind = wasm_screen_kind::cab, .script = module.path(), .key = "cab", .texture = &texture, .frames = 0})}; + REQUIRE(run_until(queue, [&queue, &screen] { return queue.due(*screen); })); + queue.submit(screen, speed(9.0), 1); + REQUIRE(run_until(queue, [] { return false == sent_commands().empty(); })); + queue.update(); + CHECK(texture.uploads == 0); + + texture.ready = true; + queue.update(); + CHECK(texture.uploads == 1); + queue.update(); + CHECK(texture.uploads == 1); + + // released and made again: a new gl texture + texture.id = 2; + queue.update(); + CHECK(texture.uploads == 2); + + queue.exit(); +} + +TEST_CASE("wasm host: a screen outside the cab draws, but its commands are dropped") { + sent_commands().clear(); + module_file const module{"paint", paint_module}; + wasm_screen_queue queue; + REQUIRE(queue.init()); + + recording_texture texture; + auto const screen{queue.acquire({.kind = wasm_screen_kind::external, .script = module.path(), .key = "sign", .texture = &texture, .frames = 0})}; + REQUIRE(run_until(queue, [&queue, &screen] { return queue.due(*screen); })); + queue.submit(screen, speed(3.0), 0); + REQUIRE(run_until(queue, [&texture] { return texture.uploads > 0; })); + queue.update(); + CHECK(sent_commands().empty()); + + queue.exit(); +} + +TEST_CASE("wasm host: a screen stuck in a loop is stopped, and the others keep working") { + sent_commands().clear(); + module_file const spinning{"spin", spin_module}; + module_file const painting{"paint", paint_module}; + wasm_screen_queue queue; + REQUIRE(queue.init()); + + recording_texture stuck; + recording_texture working; + auto const first{queue.acquire({.kind = wasm_screen_kind::cab, .script = spinning.path(), .key = "spin", .texture = &stuck, .frames = 0})}; + auto const second{queue.acquire({.kind = wasm_screen_kind::cab, .script = painting.path(), .key = "paint", .texture = &working, .frames = 0})}; + REQUIRE(run_until(queue, [&queue, &first] { return queue.due(*first); })); + REQUIRE(run_until(queue, [&queue, &second] { return queue.due(*second); })); + queue.submit(first, speed(1.0), 1); + queue.submit(second, speed(2.0), 1); + + REQUIRE(run_until(queue, [&working] { return working.uploads > 0; })); + CHECK(stuck.uploads == 0); + // the stuck screen ran first, into the instruction limit, and isn't due any more + CHECK_FALSE(queue.due(*first)); + + queue.exit(); +} + +TEST_CASE("wasm host: the screens outlive the queue without harm") { + module_file const module{"paint", paint_module}; + std::shared_ptr screen; + recording_texture texture; + { + wasm_screen_queue queue; + REQUIRE(queue.init()); + screen = queue.acquire({.kind = wasm_screen_kind::cab, .script = module.path(), .key = "cab", .texture = &texture, .frames = 0}); + REQUIRE(run_until(queue, [&queue, &screen] { return queue.due(*screen); })); + queue.submit(screen, speed(4.0), 1); + REQUIRE(run_until(queue, [&texture] { return texture.uploads > 0; })); + } + // the queue and the runtime are gone, the vehicle still holds its screen + CHECK(screen != nullptr); + screen.reset(); +} + +#endif diff --git a/tests/unit/test_wasm_kernels.cpp b/tests/unit/test_wasm_kernels.cpp new file mode 100644 index 000000000..618524c74 --- /dev/null +++ b/tests/unit/test_wasm_kernels.cpp @@ -0,0 +1,121 @@ +#include "stdafx.h" +#include "doctest.h" + +#include "scripting/wasmscreenkernels.h" + +#include +#include +#include + +// the image filters the wasm screens call through the host give the pixels of the Python screens: led_util's +// render_post() and Pillow's resize(..., Image.LANCZOS). the expected images were made by them (Pillow 12.2) from a +// 5x3 image of (x*53 + y*97, x*31 + y*17 + 100, x*7 + y*151 + 40) mod 256 + +namespace { + +// RGB as Pillow gives it +constexpr std::array source{ + 0, 100, 40, 53, 131, 47, 106, 162, 54, 159, 193, 61, 212, 224, 68, 97, 117, 191, 150, 148, 198, 203, 179, 205, + 0, 210, 212, 53, 241, 219, 194, 134, 86, 247, 165, 93, 44, 196, 100, 97, 227, 107, 150, 2, 114, +}; +constexpr std::array posted{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 33, 144, 77, 28, 122, 65, 99, 194, 97, + 84, 164, 82, 158, 236, 108, 134, 200, 91, 205, 255, 114, 174, 229, 96, 241, 255, 109, 204, 238, 92, 0, 0, 0, + 0, 0, 0, 28, 122, 65, 23, 100, 53, 84, 164, 82, 69, 135, 67, 134, 200, 91, 110, 165, 75, 174, 229, 96, + 143, 189, 79, 204, 238, 92, 168, 196, 76, 0, 0, 0, 0, 0, 0, 144, 173, 231, 122, 147, 196, 215, 229, 255, + 182, 194, 219, 255, 255, 255, 219, 232, 230, 67, 255, 255, 56, 255, 235, 101, 255, 255, 85, 255, 225, 0, 0, 0, + 0, 0, 0, 122, 147, 196, 100, 121, 161, 182, 194, 219, 150, 160, 180, 219, 232, 230, 180, 191, 189, 56, 255, 235, + 46, 213, 193, 85, 255, 225, 70, 212, 185, 0, 0, 0, 0, 0, 0, 234, 178, 126, 198, 151, 107, 255, 231, 148, + 251, 196, 125, 106, 255, 159, 90, 230, 135, 139, 255, 165, 118, 248, 140, 177, 65, 158, 150, 55, 134, 0, 0, 0, + 0, 0, 0, 198, 151, 107, 163, 124, 88, 251, 196, 125, 207, 161, 103, 90, 230, 135, 74, 189, 111, 118, 248, 140, + 97, 204, 115, 150, 55, 134, 123, 45, 110, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; +constexpr std::array enlarged{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 12, 46, 26, 22, 90, 53, 18, 71, 41, 50, 102, 55, 58, 108, 58, 53, 98, 52, + 88, 131, 65, 87, 128, 62, 84, 119, 58, 114, 144, 69, 102, 139, 63, 106, 133, 60, 136, 144, 67, 139, 144, 68, + 56, 71, 29, 0, 0, 0, 0, 0, 0, 16, 85, 39, 25, 165, 76, 21, 130, 59, 80, 188, 84, 94, 198, 89, + 86, 178, 78, 155, 246, 102, 150, 236, 97, 151, 221, 89, 232, 255, 112, 210, 255, 100, 213, 250, 94, 255, 255, 108, + 255, 255, 107, 113, 129, 44, 0, 0, 0, 0, 0, 0, 19, 67, 38, 31, 130, 74, 25, 100, 57, 72, 148, 78, + 83, 155, 82, 75, 137, 72, 128, 191, 92, 124, 181, 87, 119, 172, 81, 167, 225, 99, 146, 202, 89, 151, 197, 85, + 200, 238, 97, 198, 235, 95, 79, 96, 39, 0, 0, 0, 0, 0, 0, 70, 90, 108, 135, 177, 217, 108, 140, 171, + 172, 198, 208, 188, 211, 215, 167, 186, 192, 218, 235, 219, 227, 238, 214, 175, 222, 204, 95, 245, 222, 62, 245, 213, + 89, 240, 209, 122, 244, 224, 123, 243, 224, 49, 124, 99, 0, 0, 0, 0, 0, 0, 74, 89, 130, 139, 174, 255, + 110, 136, 201, 182, 194, 246, 197, 205, 253, 170, 182, 223, 244, 239, 255, 255, 234, 252, 186, 218, 236, 52, 255, 255, + 15, 245, 249, 49, 244, 240, 72, 255, 255, 73, 255, 255, 29, 130, 113, 0, 0, 0, 0, 0, 0, 76, 82, 96, + 147, 160, 188, 114, 123, 145, 166, 177, 183, 181, 187, 188, 163, 165, 163, 186, 224, 205, 188, 214, 191, 140, 200, 176, + 80, 251, 215, 54, 228, 190, 75, 211, 179, 105, 219, 206, 106, 217, 204, 42, 87, 82, 0, 0, 0, 0, 0, 0, + 124, 96, 69, 250, 189, 137, 195, 149, 108, 225, 207, 138, 250, 221, 143, 237, 195, 127, 134, 244, 156, 80, 245, 148, + 103, 228, 139, 135, 248, 165, 120, 252, 150, 129, 193, 143, 175, 68, 160, 178, 59, 161, 72, 34, 66, 0, 0, 0, + 0, 0, 0, 135, 101, 67, 255, 197, 133, 206, 153, 103, 255, 216, 134, 255, 228, 139, 247, 200, 122, 127, 255, 152, + 67, 255, 144, 98, 237, 134, 147, 255, 162, 131, 255, 146, 138, 187, 138, 189, 48, 157, 190, 37, 156, 76, 26, 64, + 0, 0, 0, 0, 0, 0, 57, 44, 32, 110, 85, 64, 84, 65, 48, 121, 94, 63, 140, 98, 65, 102, 86, 57, + 60, 120, 72, 39, 112, 68, 46, 103, 62, 61, 134, 76, 52, 133, 68, 56, 82, 64, 78, 34, 74, 77, 29, 73, + 31, 16, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; +constexpr std::array reduced{ + 2, 22, 10, 14, 58, 25, 35, 70, 30, 53, 83, 33, 74, 90, 34, 95, 99, 36, 37, 40, 13, 17, 60, 41, + 63, 155, 101, 115, 186, 110, 157, 217, 117, 161, 234, 120, 207, 255, 127, 81, 103, 47, 52, 64, 91, 142, 165, 218, + 186, 193, 220, 217, 219, 227, 58, 229, 227, 70, 251, 241, 32, 101, 90, 92, 72, 57, 230, 184, 137, 233, 214, 144, + 110, 238, 155, 114, 255, 157, 158, 131, 166, 64, 23, 60, 32, 24, 16, 84, 60, 38, 82, 70, 41, 27, 79, 44, + 40, 90, 45, 56, 29, 47, 22, 2, 17, +}; +constexpr std::array plain{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 100, 40, 0, 85, 34, 53, 131, 47, + 45, 111, 39, 106, 162, 54, 90, 137, 45, 159, 193, 61, 135, 164, 51, 212, 224, 68, 180, 190, 57, 0, 0, 0, + 0, 0, 0, 0, 85, 34, 0, 70, 28, 45, 111, 39, 37, 91, 32, 90, 137, 45, 74, 113, 37, 135, 164, 51, + 111, 135, 42, 180, 190, 57, 148, 156, 47, 0, 0, 0, 0, 0, 0, 97, 117, 191, 82, 99, 162, 150, 148, 198, + 127, 125, 168, 203, 179, 205, 172, 152, 174, 0, 210, 212, 0, 178, 180, 53, 241, 219, 45, 204, 186, 0, 0, 0, + 0, 0, 0, 82, 99, 162, 67, 81, 133, 127, 125, 168, 105, 103, 138, 172, 152, 174, 142, 125, 143, 0, 178, 180, + 0, 147, 148, 45, 204, 186, 37, 168, 153, 0, 0, 0, 0, 0, 0, 194, 134, 86, 164, 113, 73, 247, 165, 93, + 209, 140, 79, 44, 196, 100, 37, 166, 85, 97, 227, 107, 82, 192, 90, 150, 2, 114, 127, 1, 96, 0, 0, 0, + 0, 0, 0, 164, 113, 73, 135, 93, 60, 209, 140, 79, 172, 115, 65, 37, 166, 85, 30, 137, 70, 82, 192, 90, + 67, 158, 74, 127, 1, 96, 105, 1, 79, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + +std::vector rgba(std::span const Rgb) { + std::vector result; + for (std::size_t idx = 0; idx < Rgb.size(); idx += 3) { + result.insert(result.end(), {Rgb[idx], Rgb[idx + 1], Rgb[idx + 2], 255}); + } + return result; +} + +} // namespace + +TEST_CASE("wasm kernels: led_post gives the pixels of led_util.render_post") { + auto const input{rgba(source)}; + std::vector output(wasm_screens::image_size(12, 8), 7); + REQUIRE(wasm_screens::led_post(input, 5, 3, output, true)); + CHECK(output == rgba(posted)); + + REQUIRE(wasm_screens::led_post(input, 5, 3, output, false)); + CHECK(output == rgba(plain)); +} + +TEST_CASE("wasm kernels: resize_lanczos gives the pixels of Pillow's resize with LANCZOS") { + auto const input{rgba(posted)}; + std::vector larger(wasm_screens::image_size(17, 11)); + REQUIRE(wasm_screens::resize_lanczos(input, 12, 8, larger, 17, 11)); + CHECK(larger == rgba(enlarged)); + + std::vector smaller(wasm_screens::image_size(7, 5)); + REQUIRE(wasm_screens::resize_lanczos(input, 12, 8, smaller, 7, 5)); + CHECK(smaller == rgba(reduced)); +} + +TEST_CASE("wasm kernels: images that don't fit their buffers are refused") { + std::vector const input(wasm_screens::image_size(5, 3)); + std::vector output(wasm_screens::image_size(12, 8) - 1); + CHECK_FALSE(wasm_screens::led_post(input, 5, 3, output, true)); + CHECK_FALSE(wasm_screens::led_post(input, 0, 3, output, true)); + CHECK_FALSE(wasm_screens::resize_lanczos(input, 5, 3, output, 12, 8)); + CHECK_FALSE(wasm_screens::resize_lanczos(input, 6, 3, output, 2, 2)); +} diff --git a/tests/unit/test_wasm_screens.cpp b/tests/unit/test_wasm_screens.cpp new file mode 100644 index 000000000..5224f4b94 --- /dev/null +++ b/tests/unit/test_wasm_screens.cpp @@ -0,0 +1,103 @@ +#include "stdafx.h" +#include "doctest.h" + +#include "scripting/wasmscreenrules.h" +#include "utilities/parser.h" + +// the parts of the wasm screens that don't need the runtime: the .mmd entries, the refresh schedule counted in +// frames and the files a screen may read + +using wasm_screens::frame_schedule; +using wasm_screens::screen_config; + +TEST_CASE("wasm screens: a cab screen entry with every key") { + cParser parser("{ ekran.wasm target: screen01 frames: 6 parameters: id=1&mode=full } next:", cParser::buffer_TEXT); + screen_config config; + config.deserialize(parser); + + CHECK(config.script == "ekran.wasm"); + CHECK(config.target == "screen01"); + CHECK(config.frames == 6); + CHECK(config.parameters == "id=1&mode=full"); + // the parser stops at the end of the block + CHECK(parser.getToken() == "next:"); +} + +TEST_CASE("wasm screens: the optional keys keep their defaults, an unknown key is skipped with its value") { + cParser parser("{ tablica.wasm later: 12 instance: name background: tablica_off }", cParser::buffer_TEXT); + screen_config config; + config.deserialize(parser); + + CHECK(config.script == "tablica.wasm"); + CHECK(config.target == "none"); + CHECK(config.frames == 0); + CHECK(config.parameters.empty()); + CHECK(config.instancing == "name"); + CHECK(config.background == "tablica_off"); +} + +TEST_CASE("wasm screens: the interval set in eu07.ini, or the screen's own when it is longer") { + CHECK(frame_schedule::effective_interval(4, 0) == 4); + CHECK(frame_schedule::effective_interval(4, 10) == 10); + CHECK(frame_schedule::effective_interval(4, 2) == 4); + // never less than every frame + CHECK(frame_schedule::effective_interval(0, 0) == 1); + CHECK(frame_schedule::effective_interval(-3, -1) == 1); +} + +TEST_CASE("wasm screens: a screen is due once per interval") { + frame_schedule schedule{100, 3, 0}; + CHECK(schedule.poll(100)); + // asked again in the same frame (the vehicle drawn in more than one pass) + CHECK_FALSE(schedule.poll(100)); + CHECK_FALSE(schedule.poll(101)); + CHECK_FALSE(schedule.poll(102)); + CHECK(schedule.poll(103)); + CHECK_FALSE(schedule.poll(105)); + CHECK(schedule.poll(106)); +} + +TEST_CASE("wasm screens: a screen out of sight for a while is due on the first frame it is asked again") { + frame_schedule schedule{0, 5, 0}; + CHECK(schedule.poll(0)); + CHECK(schedule.poll(42)); + CHECK_FALSE(schedule.poll(46)); + CHECK(schedule.poll(47)); +} + +TEST_CASE("wasm screens: the phase spreads the screens over the frames of an interval") { + auto const interval{30}; + auto const phase{frame_schedule::phase("make:dynamic/pkp/ed72/tablica.wasm?$timetable=ed72-001", interval)}; + CHECK(phase >= 0); + CHECK(phase < interval); + // the same name always gets the same phase + CHECK(phase == frame_schedule::phase("make:dynamic/pkp/ed72/tablica.wasm?$timetable=ed72-001", interval)); + // a screen refreshed every frame has no phase + CHECK(frame_schedule::phase("anything", 1) == 0); + + frame_schedule schedule{1000, interval, phase}; + auto first{std::uint64_t{0}}; + for (auto frame = std::uint64_t{1000}; frame < 1000 + interval; ++frame) { + if (schedule.poll(frame)) { + first = frame; + break; + } + } + CHECK(first == 1000 + static_cast(phase)); +} + +TEST_CASE("wasm screens: a screen reads files only below its own folder") { + CHECK(wasm_screens::is_safe_relative_path("font.png")); + CHECK(wasm_screens::is_safe_relative_path("data/font.png")); + CHECK(wasm_screens::is_safe_relative_path("data\\font.png")); + CHECK(wasm_screens::is_safe_relative_path("data/..font.png")); + + CHECK_FALSE(wasm_screens::is_safe_relative_path("")); + CHECK_FALSE(wasm_screens::is_safe_relative_path("../eu07.ini")); + CHECK_FALSE(wasm_screens::is_safe_relative_path("data/../../eu07.ini")); + CHECK_FALSE(wasm_screens::is_safe_relative_path("data\\..\\x")); + CHECK_FALSE(wasm_screens::is_safe_relative_path("..")); + CHECK_FALSE(wasm_screens::is_safe_relative_path("/etc/passwd")); + CHECK_FALSE(wasm_screens::is_safe_relative_path("\\windows")); + CHECK_FALSE(wasm_screens::is_safe_relative_path("c:/windows/win.ini")); +} diff --git a/utilities/Globals.cpp b/utilities/Globals.cpp index ce299ce5d..6f27d6315 100644 --- a/utilities/Globals.cpp +++ b/utilities/Globals.cpp @@ -72,6 +72,10 @@ void global_settings::FinalizeConfig() python_enabled = false; #endif +#ifndef WITH_WASM + wasm_enabled = false; +#endif + #ifdef _WIN32 Console::ModeSet(iFeedbackMode, iFeedbackPort); #endif @@ -877,6 +881,29 @@ bool global_settings::ConfigParseUI(cParser& Parser, const std::string& token) return false; } +bool global_settings::ConfigParseWasm(cParser& Parser, std::string_view const token) +{ + if (token == "wasm.enabled") + { + ParseOne(Parser, wasm_enabled, 1); + return true; + } + + if (token == "wasm.cabframes") + { + ParseOneClamped(Parser, wasm_cabframes, 1, 1000); + return true; + } + + if (token == "wasm.externalframes") + { + ParseOneClamped(Parser, wasm_externalframes, 1, 1000); + return true; + } + + return false; +} + bool global_settings::ConfigParsePython(cParser& Parser, const std::string& token) { if (token == "python.enabled") @@ -1373,6 +1400,9 @@ void global_settings::ConfigParse(cParser& Parser) if (ConfigParsePython(Parser, token)) continue; + if (ConfigParseWasm(Parser, token)) + continue; + if (ConfigParseNetwork(Parser, token)) continue; @@ -1840,6 +1870,9 @@ global_settings::export_as_text( std::ostream &Output ) const { export_as_text( Output, "python.threadedupload", python_threadedupload ); export_as_text( Output, "python.uploadmain", python_uploadmain ); export_as_text( Output, "python.mipmaps", python_mipmaps ); + export_as_text( Output, "wasm.enabled", wasm_enabled ); + export_as_text( Output, "wasm.cabframes", wasm_cabframes ); + export_as_text( Output, "wasm.externalframes", wasm_externalframes ); export_as_text( Output, "async.trainThreads", trainThreads ); for( auto const &server : network_servers ) { Output diff --git a/utilities/Globals.h b/utilities/Globals.h index 872338b46..afa40e854 100644 --- a/utilities/Globals.h +++ b/utilities/Globals.h @@ -296,6 +296,9 @@ struct global_settings { bool python_sharectx = true; bool python_uploadmain = true; std::chrono::duration python_minframetime {0.01f}; + bool wasm_enabled{true}; // screens drawn by WebAssembly modules (wasmscreen:, wasmdestinationsign: in the .mmd) + int wasm_cabframes{4}; // the wasm screens in the cab are refreshed every so many rendered frames + int wasm_externalframes{30}; // the wasm screens outside the cab (destination signs) are refreshed every so many rendered frames bool gfx_skiprendering = false; int gfx_framebuffer_width = -1; @@ -390,6 +393,7 @@ struct global_settings { bool ConfigParseSimulation(cParser& Parser, const std::string& token); bool ConfigParseUI(cParser& Parser, const std::string& token); bool ConfigParsePython(cParser& Parser, const std::string& token); + bool ConfigParseWasm(cParser& Parser, std::string_view token); bool ConfigParseNetwork(cParser& Parser, const std::string& token); bool ConfigParseHardware(cParser& Parser, const std::string& token); bool ConfigParseDebug(cParser& Parser, const std::string& token); diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index b9c55bfac..4842e5b1a 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -35,6 +35,7 @@ http://mozilla.org/MPL/2.0/. #include "rendering/renderer.h" #include "application/uitranscripts.h" #include "input/messaging.h" +#include "application/application.h" #include "vehicle/Driver.h" // Ra: taki zapis funkcjonuje lepiej, ale może nie jest optymalny @@ -3139,6 +3140,20 @@ void TDynamicObject::update_destinations() { && ctOwner != nullptr)) ? // lcd signs are off for carriages without engine, potentially left on a siding DestinationSign.destination : DestinationSign.destination_off; + + update_wasm_destination(); +} + +void TDynamicObject::update_wasm_destination() { + + if( DestinationSign.wasm_sign == nullptr ) { return; } + // only while the sign shows the destination it draws + if( m_materialdata.replacable_skins[ 4 ] != DestinationSign.destination ) { return; } + + auto &queue { Application.wasm_screens() }; + if( false == queue.due( *DestinationSign.wasm_sign ) ) { return; } + // read anew on every refresh, so the sign follows the timetable + queue.submit( DestinationSign.wasm_sign, std::make_shared( DestinationSign.wasm_request ), 0 ); } bool TDynamicObject::Update(double dt, double dt1) @@ -7080,6 +7095,14 @@ void TDynamicObject::LoadMMediaFile( std::string const &TypeName, std::string co DestinationSign.script = asBaseDir + DestinationSign.script; } } + else if( token == "wasmdestinationsign:" ) { + DestinationSign.wasm.deserialize( parser ); + // supply vehicle folder as script path if none is provided + if( false == DestinationSign.wasm.script.empty() + && substr_path( DestinationSign.wasm.script ).empty() ) { + DestinationSign.wasm.script = asBaseDir + DestinationSign.wasm.script; + } + } // NOTE: legacy key, now expected as optional "background:" parameter in pydestinationsign: { parameter block } else if( token == "destinationsignbackground:" ) { parser.getTokens(); @@ -7099,7 +7122,9 @@ void TDynamicObject::LoadMMediaFile( std::string const &TypeName, std::string co if( ReplacableSkin != "none" ) { // potentially set blank destination texture - DestinationSign.destination_off = DestinationFind( DestinationSign.background.empty() ? "nowhere" : DestinationSign.background ); + auto const wasmbackground { Global.wasm_enabled && false == DestinationSign.wasm.script.empty() && false == DestinationSign.wasm.background.empty() }; + auto const &background { wasmbackground ? DestinationSign.wasm.background : DestinationSign.background }; + DestinationSign.destination_off = DestinationFind( background.empty() ? "nowhere" : background ); } // assign default samples to sound emitters which weren't included in the config file @@ -7920,6 +7945,7 @@ void TDynamicObject::DestinationClear() { if( false == DestinationSign.has_light ) { return; } // physical destination signs remain up until manually changed // update_destinations() shows the blank sign in place of the missing destination DestinationSign.destination = null_handle; + DestinationSign.wasm_sign.reset(); } void TDynamicObject::DestinationSet(std::string const &to, std::string const &numer) { @@ -7933,6 +7959,8 @@ void TDynamicObject::DestinationSet(std::string const &to, std::string const &nu if( std::abs( m_materialdata.multi_textures ) >= 4 ) { return; } // jak są 4 tekstury wymienne, to nie zmieniać rozkładem if( DestinationSign.sign == nullptr ) { return; } // no sign submodel, no problem + // a sign drawn for the previous destination + DestinationSign.wasm_sign.reset(); // now see if we can find any version of the destination texture std::vector const destinations = { @@ -7948,21 +7976,27 @@ void TDynamicObject::DestinationSet(std::string const &to, std::string const &nu } } // if we didn't get static texture we might be able to make one + if( true == destination_set_wasm( numer ) ) { return; } if( DestinationSign.script.empty() ) { return; } // no script so no way to make the texture if( numer == "none" ) { return; } // blank or incomplete/malformed timetable, don't bother + DestinationSign.destination = GfxRenderer->Fetch_Material( destination_request( DestinationSign.script, DestinationSign.instancing, DestinationSign.parameters ) ); +} + +std::string TDynamicObject::destination_request( std::string const &Script, std::string const &Instancing, std::string const &Parameters ) const { + auto const trainname { [this]() -> std::string { if( ctOwner != nullptr ) { return ctOwner->TrainName(); } if( Mechanik != nullptr ) { return Mechanik->TrainName(); } return "none"; } }; // shouldn't get here but, eh - auto const instance { [this]() -> std::string { - if( DestinationSign.instancing == "name" ) { return MoverParameters->Name; } - if( DestinationSign.instancing == "type" ) { return MoverParameters->TypeName; } + auto const instance { [this, &Instancing]() -> std::string { + if( Instancing == "name" ) { return MoverParameters->Name; } + if( Instancing == "type" ) { return MoverParameters->TypeName; } return "none"; } }; std::string signrequest { "make:" - + DestinationSign.script + + Script + "?" // timetable include + "$timetable=" + ( @@ -7973,15 +8007,40 @@ void TDynamicObject::DestinationSet(std::string const &to, std::string const &nu // NOTE: underscore doesn't have any magic meaning for the time being, it's just less likely to conflict with regular dictionary keys + "&_id1=" + trainname() }; // TBD, TODO: replace instancing with support for variables in extra parameters string? - if( false == DestinationSign.instancing.empty() ) { + if( false == Instancing.empty() ) { signrequest += "&_id2=" + instance(); } // optionl extra parameters - if( false == DestinationSign.parameters.empty() ) { - signrequest += "&" + DestinationSign.parameters; + if( false == Parameters.empty() ) { + signrequest += "&" + Parameters; } + return signrequest; +} - DestinationSign.destination = GfxRenderer->Fetch_Material( signrequest ); +bool TDynamicObject::destination_set_wasm( std::string const &Numer ) { + + if( false == Global.wasm_enabled ) { return false; } + if( DestinationSign.wasm.script.empty() ) { return false; } // no wasm sign, maybe a python one + if( Numer == "none" ) { return false; } // blank or incomplete/malformed timetable, don't bother + + auto const signrequest { destination_request( DestinationSign.wasm.script, DestinationSign.wasm.instancing, DestinationSign.wasm.parameters ) }; + auto const signmaterial { GfxRenderer->Fetch_Material( signrequest ) }; + if( signmaterial == null_handle ) { return false; } + auto &signtexture { GfxRenderer->Texture( GfxRenderer->Material( signmaterial )->GetTexture( 0 ) ) }; + + // vehicles showing the same request (one train, one instance) share the screen, as they share the texture + auto sign { Application.wasm_screens().acquire( { + .kind = wasm_screen_kind::external, + .script = DestinationSign.wasm.script, + .key = signrequest, + .texture = &signtexture, + .frames = DestinationSign.wasm.frames } ) }; + if( sign == nullptr ) { return false; } // the wasm screens are off + + DestinationSign.destination = signmaterial; + DestinationSign.wasm_sign = std::move( sign ); + DestinationSign.wasm_request = signrequest.substr( signrequest.find( '?' ) + 1 ); + return true; } material_handle TDynamicObject::DestinationFind( std::string Destination ) { diff --git a/vehicle/DynObj.h b/vehicle/DynObj.h index bfd477c4f..feaa548e8 100644 --- a/vehicle/DynObj.h +++ b/vehicle/DynObj.h @@ -22,8 +22,12 @@ http://mozilla.org/MPL/2.0/. #include "audio/sound.h" #include "world/Spring.h" #include "vehicle/mirrors.h" +#include "scripting/wasmscreenrules.h" #include +#include + +class wasm_screen; // scripting/wasmscreens.h #define EU07_SOUND_BOGIESOUNDS @@ -251,6 +255,9 @@ public: int update_rate { 0 }; // -1: per stop, 0: none, >0: fps // TBD, TODO: implement? std::string instancing; // potential method to generate more than one texture per timetable std::string parameters; // potential extra parameters supplied by mmd file + wasm_screens::screen_config wasm; // potential WebAssembly sign (wasmdestinationsign:), used in place of the python one while wasm screens are on + std::shared_ptr wasm_sign; // the wasm screen drawing the current destination + std::string wasm_request; // its input: the key=value pairs a python sign gets for its texture // methods void deserialize( cParser &Input ); private: @@ -726,6 +733,8 @@ private: void update_load_offset(); void shuffle_load_order(); void update_destinations(); + // feeds the wasm destination sign with fresh data, when it is shown and due + void update_wasm_destination(); bool Update(double dt, double dt1); bool FastUpdate(double dt); void Move(double fDistance); @@ -849,6 +858,10 @@ private: // blanks electronic destination sign at the end of the service; physical signs stay until changed void DestinationClear(); material_handle DestinationFind( std::string Destination ); + // the name of a generated destination sign texture: the script, the timetable, the instancing and the parameters + std::string destination_request( std::string const &Script, std::string const &Instancing, std::string const &Parameters ) const; + // makes the destination sign a wasm screen, when the vehicle has one and the wasm screens are on. returns true when it did + bool destination_set_wasm( std::string const &Numer ); void OverheadTrack(float o); glm::dvec3 get_future_movement() const; void move_set(double distance); diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index fb42c85fa..084e65d4d 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -38,6 +38,7 @@ http://mozilla.org/MPL/2.0/. #include #include #include +#include /* namespace input { @@ -10035,7 +10036,10 @@ bool TTrain::Update(double const Deltatime) // screens if (!FreeFlyModeFlag && simulation::Train == this) // don't bother if we're outside + { update_screens(Deltatime); + update_wasm_screens(); + } // update direction relay if (prevBatState != mvOccupied->Power24vIsAvailable) @@ -10564,6 +10568,92 @@ void TTrain::update_screens(double dt) } } +void TTrain::update_wasm_screens() +{ + auto &queue{Application.wasm_screens()}; + for (auto &entry : m_wasmscreens) + { + if (false == queue.due(*entry.screen)) + { + continue; + } + auto input{GetTrainState(entry.parameters)}; + input->insert("touches", *entry.touch_list); + entry.touch_list->clear(); + queue.submit(entry.screen, std::move(input), id()); + } +} + +bool TTrain::find_screen_surface(std::string const &Target, std::string_view const Kind, TSubModel *&Submodel, ITexture *&Texture) const +{ + Submodel = DynamicObject->mdKabina ? DynamicObject->mdKabina->GetFromName(Target) : + DynamicObject->mdLowPolyInt ? DynamicObject->mdLowPolyInt->GetFromName(Target) : + nullptr; + if (Submodel == nullptr) + { + WriteLog(std::format("{}: submodel {} not found - Ignoring screen", Kind, Target)); + return false; + } + auto const material{Submodel->GetMaterial()}; + if (material <= 0) + { + // sub model nie posiada tekstury lub tekstura wymienna - nie obslugiwana + WriteLog(std::format("{}: invalid texture id {} - Ignoring screen", Kind, material)); + return false; + } + + Texture = &GfxRenderer->Texture(GfxRenderer->Material(material)->GetTexture(0)); + return true; +} + +void TTrain::load_wasm_screen(cParser &Parser) +{ + wasm_screen_entry entry; + // the block is read whole even when the wasm screens are off + entry.config.deserialize(Parser); + if (entry.config.script.empty()) + { + return; + } + if (substr_path(entry.config.script).empty()) + { + entry.config.script = DynamicObject->asBaseDir + entry.config.script; + } + + TSubModel *submodel{nullptr}; + ITexture *texture{nullptr}; + if (entry.config.target != "none" && false == find_screen_surface(entry.config.target, "WASM Screen", submodel, texture)) + { + return; + } + + entry.screen = Application.wasm_screens().acquire({.kind = wasm_screen_kind::cab, + .script = entry.config.script, + .key = std::format("cab:{}:{}:{}", DynamicObject->name(), entry.config.target, entry.config.script), + .texture = texture, + .frames = entry.config.frames}); + if (entry.screen == nullptr) + { + // the wasm screens are off + return; + } + if (texture != nullptr) + { + // make the surface static so it doesn't get destroyed by garbage collector if the user spends long time outside cab + texture->create(true); + } + if (false == entry.config.parameters.empty()) + { + entry.parameters = dictionary_source(entry.config.parameters); + } + entry.touch_list = std::make_shared>(); + if (submodel != nullptr) + { + submodel->screen_touch_list = entry.touch_list; + } + m_wasmscreens.emplace_back(std::move(entry)); +} + void TTrain::add_distance(double const Distance) { @@ -10739,6 +10829,7 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) m_controlmapper.clear(); // clear python screens m_screens.clear(); + m_wasmscreens.clear(); // reset sound positions auto const nullvector{glm::vec3()}; std::vector>> sounds = { @@ -10930,23 +11021,10 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) TSubModel *submodel = nullptr; if (screen.target != "none") { - submodel = DynamicObject->mdKabina ? DynamicObject->mdKabina->GetFromName(screen.target) : - DynamicObject->mdLowPolyInt ? DynamicObject->mdLowPolyInt->GetFromName(screen.target) : - nullptr; - if (submodel == nullptr) + if (false == find_screen_surface(screen.target, "Python Screen", submodel, tex)) { - WriteLog("Python Screen: submodel " + screen.target + " not found - Ignoring screen"); continue; } - auto const material{submodel->GetMaterial()}; - if (material <= 0) - { - // sub model nie posiada tekstury lub tekstura wymienna - nie obslugiwana - WriteLog("Python Screen: invalid texture id " + std::to_string(material) + " - Ignoring screen"); - continue; - } - - tex = &GfxRenderer->Texture(GfxRenderer->Material(material)->GetTexture(0)); } else { @@ -10973,6 +11051,10 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) if (Global.python_displaywindows) m_screens.back().viewer = std::make_unique(rt, m_screens.back().touch_list, m_screens.back().script); } + else if (token == "wasmscreen:") + { + load_wasm_screen(parser); + } else if (token == "pyscreenupdatetime:") { parser.getTokens(); diff --git a/vehicle/Train.h b/vehicle/Train.h index dd077e366..1d7e032c6 100644 --- a/vehicle/Train.h +++ b/vehicle/Train.h @@ -19,6 +19,7 @@ http://mozilla.org/MPL/2.0/. #include "scripting/PyInt.h" #include "input/command.h" #include "scripting/pythonscreenviewer.h" +#include "scripting/wasmscreens.h" #include "utilities/dictionary.h" #undef snprintf // pyint.h->python @@ -145,6 +146,14 @@ class TTrain { using screenentry_sequence = std::vector; + // a screen of the cab drawn by a WebAssembly module (wasmscreen: in the .mmd) + struct wasm_screen_entry { + wasm_screens::screen_config config; + dictionary_source parameters; // the config's parameters, pre-processed + std::shared_ptr screen; + std::shared_ptr> touch_list; + }; + // methods bool CabChange(int iDirection); bool ShowNextCurrent{false}; // pokaz przd w podlaczonej lokomotywie (ET41) @@ -233,6 +242,10 @@ class TTrain { end cab_to_end() const { return cab_to_end( iCabn ); } void update_screens(double dt); + void update_wasm_screens(); + // finds the submodel and the texture a cab screen is drawn on. returns false when the screen is to be ignored + bool find_screen_surface(std::string const &Target, std::string_view Kind, TSubModel *&Submodel, ITexture *&Texture) const; + void load_wasm_screen(cParser &Parser); // command handlers // NOTE: we're currently using universal handlers and static handler map but it may be beneficial to have these implemented on individual class instance basis @@ -935,6 +948,7 @@ private: bool m_mastercontrollerinuse { false }; float m_mastercontrollerreturndelay { 0.f }; screenentry_sequence m_screens; + std::vector m_wasmscreens; uint16_t vid { 0 }; // train network recipient id float m_distancecounter { -1.f }; // distance traveled since meter was activated or -1 if inactive double m_brakehandlecp{ 0.0 }; diff --git a/wasm_screens_doc.md b/wasm_screens_doc.md new file mode 100644 index 000000000..494d07c0d --- /dev/null +++ b/wasm_screens_doc.md @@ -0,0 +1,129 @@ +# WebAssembly screens + +Screens drawn by WebAssembly modules, alongside the Python screens (`pyscreen:`, `pydestinationsign:`). A module +gets the same input a Python screen gets (the table in `python_var_doc.md`), returns an RGBA image and, in the cab, +may send commands. The modules run in the WAMR interpreter (`ref/wamr`), in a sandbox: a module reaches nothing but +the functions of the `eu07` module below, and reads files only from its own folder. + +Unlike a Python screen, which refreshes after a time (`python.updatetime`, `updatetime:`), a WebAssembly screen +refreshes every so many rendered frames, set in `eu07.ini`. + +## eu07.ini + +| key | default | meaning | +|-----------------------|---------|--------------------------------------------------------------------------------| +| `wasm.enabled` | 1 | 0: no WebAssembly screens; the vehicles show what they did before | +| `wasm.cabframes` | 4 | a screen in the cab is refreshed every so many frames (1-1000) | +| `wasm.externalframes` | 30 | a screen outside the cab (destination sign) is refreshed every so many frames | + +A screen may ask for a longer interval of its own (`frames:` below); the longer of the two counts. Screens sharing +an interval are spread over its frames, so they don't all refresh on the same one. A screen in the cab is refreshed +only while the player sits in that cab, a screen outside only while its vehicle is drawn. + +## .mmd + +In the cab section, next to `pyscreen:`: + +``` +wasmscreen: { ekran.wasm target: screen01 frames: 6 parameters: id=1&mode=full } +``` + +| key | meaning | +|---------------|---------------------------------------------------------------------------------------------------| +| (first token) | the module, relative to the vehicle folder when it has no path of its own | +| `target:` | the submodel the screen is drawn on (its texture is replaced); `none` for a screen that only sends commands | +| `frames:` | the screen's own refresh interval, used when longer than `wasm.cabframes` | +| `parameters:` | extra `key=value` pairs, `&`-separated, added to the input | + +A touch on the screen's submodel comes in the input as the list of points `touches`, as for the Python screens. + +In `internaldata:`, next to `pydestinationsign:`: + +``` +wasmdestinationsign: { tablica.wasm frames: 60 instance: name background: tablica_off parameters: style=lcd } +``` + +The keys are those of `pydestinationsign:` (`instance:`, `parameters:`, `background:`) and `frames:`. The input is +what a Python sign gets: the timetable (`$timetable`), `_id1` (the train), `_id2` (the instance) and the +parameters, read anew on every refresh, so the sign can follow the journey. The vehicles of one train showing the +same request share one screen and one texture. A static destination texture, when there is one, still comes first. + +A vehicle may have both `pydestinationsign:` and `wasmdestinationsign:`: with the WebAssembly screens on, the +WebAssembly one is used; with them off (or in a release without them) the Python one. An unknown key in either block +is skipped together with its value. + +## The module + +Exports: + +| export | meaning | +|-------------------------------|------------------------------------------------------------------------------------------| +| `memory` | the linear memory | +| `screen_init() -> i32` | optional; called once after loading. anything but 0 disables the screen | +| `screen_render() -> i32` | called on every refresh. returns the address of the image, or 0 to keep the previous one | +| `screen_width() -> i32` | the width of the image, asked after every `screen_render` that returned an image | +| `screen_height() -> i32` | the height of the image, up to 4096 on either side | + +The image is `width * height` pixels of 4 bytes, R G B A, in sRGB, its rows in the order the Python screens give +them (PIL's `tobytes()`). + +Imports, module `eu07` (keys and texts are a pointer and a length in bytes, in the module's memory): + +| import | meaning | +|-----------------------------------------------------------------|-----------------------------------------------------------------| +| `value_type(key, key_len) -> i32` | 0 no such value, 1 float, 2 int, 3 bool, 4 string, 5 list of points | +| `get_float(key, key_len) -> f64` | the value as a number (int and bool too); 0 when there is none | +| `get_int(key, key_len) -> i32` | the value as an integer (a float is truncated) | +| `get_bool(key, key_len) -> i32` | 1 or 0 | +| `get_string(key, key_len, buffer, capacity) -> i32` | copies the text, in UTF-8; returns its whole length, -1 when there is none | +| `get_vec2_count(key, key_len) -> i32` | the number of points in a list (`touches`) | +| `get_vec2(key, key_len, index, out) -> i32` | writes the point as two f32 at `out`; returns 1, or 0 when there is none | +| `command(name, name_len, param1, param2)` | sends a command (the names of `simulation::commandMap`) to the vehicle of the cab; ignored outside the cab | +| `log(text, text_len)` | writes a line to the log | +| `time() -> f64` | seconds of a steady clock shared by all screens, for animations (scrolling) that keep their pace whatever the refresh interval | +| `led_post(source, width, height, target, bloom) -> i32` | `led_util.render_post()` of the Python screens, run natively: each diode of the `width x height` image becomes 2x2 pixels with a darker grid, glowing into its neighbours when `bloom` is not 0, in a 1 pixel black frame; `target` takes `(2 width + 2) x (2 height + 2)`. returns 1, or 0 for sizes over 4096 | +| `resize_lanczos(source, width, height, target, target_width, target_height) -> i32` | Pillow's `resize(..., Image.LANCZOS)`, run natively, giving the same pixels. returns 1, or 0 for sizes over 4096 | +| `file_read(path, path_len, buffer, capacity) -> i32` | reads a file from the module's folder or below; returns the file's whole size, -1 when there is none or the path leads outside | + +`led_post` and `resize_lanczos` take RGBA images in the module's memory and write alpha 255; the source and the +target may overlap. They are what makes LED boards fast enough: in the interpreter the same filters take some 30 +times longer. + +A call into the module may run at most 200 million instructions; a module that traps or runs over is disabled and +the reason goes to the log. The module gets 64 KiB of stack and no heap from the host: it manages its own memory. + +## Building a module + +With clang (any version with the `wasm32` target), no C library: + +```c +// ekran.c +#include + +#define IMPORT(name) __attribute__((import_module("eu07"), import_name(name))) +IMPORT("get_float") double get_float(const char *key, int key_len); +IMPORT("command") void command(const char *name, int name_len, int param1, int param2); + +#define WIDTH 256 +#define HEIGHT 128 +static uint32_t pixels[WIDTH * HEIGHT]; + +__attribute__((export_name("screen_width"))) int screen_width(void) { return WIDTH; } +__attribute__((export_name("screen_height"))) int screen_height(void) { return HEIGHT; } + +__attribute__((export_name("screen_render"))) int screen_render(void) { + double const velocity = get_float("velocity", 8); + int const filled = (int)(velocity * WIDTH / 160.0); + for (int y = 0; y < HEIGHT; ++y) + for (int x = 0; x < WIDTH; ++x) + pixels[y * WIDTH + x] = x < filled ? 0xFF00C000u : 0xFF202020u; // A B G R, little-endian + return (int)(uintptr_t)pixels; +} +``` + +``` +clang --target=wasm32 -O2 -nostdlib -Wl,--no-entry -o ekran.wasm ekran.c +``` + +Any language that compiles to WebAssembly works the same way (Rust `wasm32-unknown-unknown`, Zig, AssemblyScript), +as long as the module imports nothing but the `eu07` functions above. From a73585dca0a70b799cf8ed427edad122fbf4a939 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Tue, 10 Nov 2026 01:05:58 +0100 Subject: [PATCH 384/430] Dont copy entire python env when already present --- CMakeLists.txt | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b75f3295b..bfa580a32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -678,13 +678,29 @@ if (WIN32) endif () if(WIN32 AND WITH_PYTHON) + # the Python runtime next to the game, copied when it isn't there yet or the Python install changed, rather + # than after every link of the game: the library alone is thousands of files. the folder is the game's + # RUNTIME_OUTPUT_DIRECTORY, spelled out: $ here would make this target depend on the game + get_property(EU07_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) + if (EU07_MULTI_CONFIG) + set(EU07_PY_TARGET_DIR "${CMAKE_BINARY_DIR}/bin/$") + else() + set(EU07_PY_TARGET_DIR "${CMAKE_BINARY_DIR}/bin") + endif() + set(EU07_PY_STAMP "${EU07_PY_TARGET_DIR}/python64/python_runtime.stamp") add_custom_command( - TARGET ${PROJECT_NAME} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${EU07_PY_DLL}" "$" - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${EU07_PY_ZLIB}" "$" - COMMAND ${CMAKE_COMMAND} -E copy_directory "${EU07_PY_LIBDIR}" "$/python64/Lib" - COMMAND ${CMAKE_COMMAND} -E copy_directory "${EU07_PY_DLLSDIR}" "$/python64/DLLs" - ) + OUTPUT "${EU07_PY_STAMP}" + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${EU07_PY_DLL}" "${EU07_PY_TARGET_DIR}" + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${EU07_PY_ZLIB}" "${EU07_PY_TARGET_DIR}" + COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different "${EU07_PY_LIBDIR}" "${EU07_PY_TARGET_DIR}/python64/Lib" + COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different "${EU07_PY_DLLSDIR}" "${EU07_PY_TARGET_DIR}/python64/DLLs" + COMMAND ${CMAKE_COMMAND} -E touch "${EU07_PY_STAMP}" + DEPENDS "${EU07_PY_DLL}" "${EU07_PY_ZLIB}" + COMMENT "Copying the Python runtime next to the game" + VERBATIM) + add_custom_target(eu07_python_runtime DEPENDS "${EU07_PY_STAMP}") + set_target_properties(eu07_python_runtime PROPERTIES FOLDER "libraries") + add_dependencies(${PROJECT_NAME} eu07_python_runtime) endif() if (WITH_WASM) From c4924f756da14cc4c3e47ebe5e11b70fdeccf8b4 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Tue, 10 Nov 2026 15:29:25 +0100 Subject: [PATCH 385/430] Lua script screens beside the WebAssembly ones --- CMakeLists.txt | 16 +- CMake_modules/wamr/CMakeLists.txt | 2 +- application/application.cpp | 9 +- application/application.h | 12 +- model/Texture.cpp | 4 +- script_screens_doc.md | 199 ++++ scripting/luaprogram.cpp | 847 ++++++++++++++++ scripting/scriptscreendrawing.cpp | 294 ++++++ scripting/scriptscreendrawing.h | 126 +++ ...eenkernels.cpp => scriptscreenkernels.cpp} | 6 +- ...mscreenkernels.h => scriptscreenkernels.h} | 6 +- scripting/scriptscreenprogram.h | 92 ++ ...mscreenrules.cpp => scriptscreenrules.cpp} | 6 +- ...{wasmscreenrules.h => scriptscreenrules.h} | 17 +- scripting/scriptscreens.cpp | 511 ++++++++++ scripting/scriptscreens.h | 98 ++ scripting/wasmprogram.cpp | 630 ++++++++++++ scripting/wasmscreens.cpp | 942 ------------------ scripting/wasmscreens.h | 72 -- scripting/wasmscreensstub.cpp | 51 - tests/unit/CMakeLists.txt | 12 +- tests/unit/run_tests.cmake | 8 + tests/unit/test_script_screen_drawing.cpp | 120 +++ tests/unit/test_script_screen_host.cpp | 596 +++++++++++ ...els.cpp => test_script_screen_kernels.cpp} | 36 +- ...sm_screens.cpp => test_script_screens.cpp} | 46 +- tests/unit/test_wasm_host.cpp | 288 ------ utilities/Globals.cpp | 28 +- utilities/Globals.h | 7 +- vehicle/DynObj.cpp | 116 ++- vehicle/DynObj.h | 25 +- vehicle/Train.cpp | 45 +- vehicle/Train.h | 16 +- wasm_screens_doc.md | 129 --- 34 files changed, 3777 insertions(+), 1635 deletions(-) create mode 100644 script_screens_doc.md create mode 100644 scripting/luaprogram.cpp create mode 100644 scripting/scriptscreendrawing.cpp create mode 100644 scripting/scriptscreendrawing.h rename scripting/{wasmscreenkernels.cpp => scriptscreenkernels.cpp} (98%) rename scripting/{wasmscreenkernels.h => scriptscreenkernels.h} (88%) create mode 100644 scripting/scriptscreenprogram.h rename scripting/{wasmscreenrules.cpp => scriptscreenrules.cpp} (96%) rename scripting/{wasmscreenrules.h => scriptscreenrules.h} (75%) create mode 100644 scripting/scriptscreens.cpp create mode 100644 scripting/scriptscreens.h create mode 100644 scripting/wasmprogram.cpp delete mode 100644 scripting/wasmscreens.cpp delete mode 100644 scripting/wasmscreens.h delete mode 100644 scripting/wasmscreensstub.cpp create mode 100644 tests/unit/test_script_screen_drawing.cpp create mode 100644 tests/unit/test_script_screen_host.cpp rename tests/unit/{test_wasm_kernels.cpp => test_script_screen_kernels.cpp} (82%) rename tests/unit/{test_wasm_screens.cpp => test_script_screens.cpp} (59%) delete mode 100644 tests/unit/test_wasm_host.cpp delete mode 100644 wasm_screens_doc.md diff --git a/CMakeLists.txt b/CMakeLists.txt index bfa580a32..cbcf185dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,7 +72,7 @@ option(WITH_OPENGL_LEGACY "Compile with OpenGL legacy renderer" ON) option(WITH_PYTHON "Python 3.14 embedded scripting" ON) option(WITH_UART "Compile with libserialport" ON) option(WITH_LUA "Compile with lua scripting support" ON) -option(WITH_WASM "WebAssembly screens (wasmscreen:, wasmdestinationsign:), run by the WAMR interpreter in ref/wamr" ON) +option(WITH_WASM "WebAssembly script screens (wasmscreen:, wasmdestinationsign:), run by the WAMR interpreter in ref/wamr" ON) option(WITH_OPENVR "Compile with OpenVR" OFF) option(WITH_ZMQ "Compile with cppzmq" OFF) option(WITH_CRASHPAD "Compile with crashpad" OFF) @@ -322,11 +322,14 @@ if (WITH_LUA) set(SOURCES ${SOURCES} "scripting/lua.cpp") endif() +# the script screens (scripting/scriptscreens.cpp), with the Lua and the WebAssembly runtime when they're built +set(SOURCES ${SOURCES} "scripting/scriptscreens.cpp") +if (WITH_LUA) + set(SOURCES ${SOURCES} "scripting/luaprogram.cpp") +endif() if (WITH_WASM) set(DEFINITIONS ${DEFINITIONS} "WITH_WASM") - set(SOURCES ${SOURCES} "scripting/wasmscreens.cpp") -else() - set(SOURCES ${SOURCES} "scripting/wasmscreensstub.cpp") + set(SOURCES ${SOURCES} "scripting/wasmprogram.cpp") endif() if (WITHDUMPGEN) @@ -471,8 +474,9 @@ set(CORE_SOURCES "utilities/parser.cpp" "utilities/utilities.cpp" "scripting/ladderlogic.cpp" -"scripting/wasmscreenrules.cpp" -"scripting/wasmscreenkernels.cpp" +"scripting/scriptscreenrules.cpp" +"scripting/scriptscreenkernels.cpp" +"scripting/scriptscreendrawing.cpp" "simulation/simulationtestrules.cpp" "vehicle/enginestart.cpp" "vehicle/handover.cpp" diff --git a/CMake_modules/wamr/CMakeLists.txt b/CMake_modules/wamr/CMakeLists.txt index 74e82358d..d12d48cd4 100644 --- a/CMake_modules/wamr/CMakeLists.txt +++ b/CMake_modules/wamr/CMakeLists.txt @@ -1,4 +1,4 @@ -# The WebAssembly Micro Runtime (ref/wamr) for the wasm screens (scripting/wasmscreens.cpp). +# The WebAssembly Micro Runtime (ref/wamr) for the WebAssembly script screens (scripting/wasmprogram.cpp). # # Built here, in a directory of its own, because the WAMR build scripts set their configuration with # add_definitions() and include_directories(): kept in this directory, none of it reaches the game's sources. diff --git a/application/application.cpp b/application/application.cpp index 98f004a92..136aa0600 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -425,10 +425,11 @@ int eu07_application::init(int Argc, char *Argv[]) { m_taskqueue.init(); } + crashreport_add_info("luascreens_enabled", Global.luascreens_enabled ? "yes" : "no"); crashreport_add_info("wasm_enabled", Global.wasm_enabled ? "yes" : "no"); - if (Global.wasm_enabled) + if (Global.luascreens_enabled || Global.wasm_enabled) { - m_wasmqueue.init(); + m_screenqueue.init(); } if ((result = init_modes()) != 0) { @@ -640,7 +641,7 @@ int eu07_application::run() EditorTerrain.update(Global.pCamera.Pos); m_taskqueue.update(); - m_wasmqueue.update(); + m_screenqueue.update(); opengl_texture::reset_unit_cache(); if (!GfxRenderer->Render()) @@ -738,7 +739,7 @@ void eu07_application::exit() // the python workers detach their GL context on the way out, so they have to be done before the windows they use are destroyed m_taskqueue.exit(); - m_wasmqueue.exit(); + m_screenqueue.exit(); step("the windows"); for (auto *window : m_windows) { diff --git a/application/application.h b/application/application.h index 4a1d1ad1a..850b66e1e 100644 --- a/application/application.h +++ b/application/application.h @@ -11,7 +11,7 @@ http://mozilla.org/MPL/2.0/. #include "application/applicationmode.h" #include "scripting/PyInt.h" -#include "scripting/wasmscreens.h" +#include "scripting/scriptscreens.h" #include "network/manager.h" #include "utilities/headtrack.h" #ifdef WITH_UART @@ -50,10 +50,10 @@ public: // frees the python gil and swaps out the main thread void release_python_lock(); - // the screens drawn by WebAssembly modules - wasm_screen_queue & - wasm_screens() { - return m_wasmqueue; } + // the screens drawn by scripts (Lua, WebAssembly) + script_screen_queue & + screens() { + return m_screenqueue; } void exit(); void @@ -127,7 +127,7 @@ private: modeptr_array m_modes { nullptr }; // collection of available application behaviour modes mode_stack m_modestack; // current behaviour mode python_taskqueue m_taskqueue; - wasm_screen_queue m_wasmqueue; + script_screen_queue m_screenqueue; std::vector m_windows; int m_glfwversion; diff --git a/model/Texture.cpp b/model/Texture.cpp index e9dc063de..67a33f44e 100644 --- a/model/Texture.cpp +++ b/model/Texture.cpp @@ -722,8 +722,8 @@ void opengl_texture::make_request() { auto const components { Split( name, '?' ) }; - if( components.front().ends_with( ".wasm" ) ) { - // wasm destination signs are drawn by the vehicles showing them (wasm_screen_queue) + if( components.front().ends_with( ".lua" ) || components.front().ends_with( ".wasm" ) ) { + // script destination signs are drawn by the vehicles showing them (script_screen_queue) return; } diff --git a/script_screens_doc.md b/script_screens_doc.md new file mode 100644 index 000000000..d8a6811b2 --- /dev/null +++ b/script_screens_doc.md @@ -0,0 +1,199 @@ +# Script screens + +Screens drawn by scripts, alongside the Python screens (`pyscreen:`, `pydestinationsign:`): Lua scripts, run by +LuaJIT, and WebAssembly modules, run by the WAMR interpreter (`ref/wamr`). A script gets the same input a Python +screen gets (the table in `python_var_doc.md`), returns an RGBA image and, in the cab, may send commands. + +A Lua script is text, kept with the vehicles and the `scripts/` folder like the Python screens, and changed with any +editor. A WebAssembly module is compiled from another language (Rust, C, Zig and the like). + +Both run sandboxed: a script reaches only the functions of `eu07` below, and reads files only from its own folder and +below. A Lua script gets no `io`, `os`, `ffi`, `debug` or `require`, and no precompiled code is loaded. + +Unlike a Python screen, which refreshes after a time (`python.updatetime`, `updatetime:`), a script screen refreshes +every so many rendered frames, set in `eu07.ini`. A call into a script may run at most 200 million instructions +(Lua runs without the JIT compiler so that the limit holds). A script that fails, or runs over, is switched off, and +the reason goes to the log. + +## eu07.ini + +| key | default | meaning | +|--------------------------|---------|--------------------------------------------------------------------------------| +| `luascreens.enabled` | 1 | 0: no Lua screens; the vehicles show what they did before | +| `wasm.enabled` | 1 | 0: no WebAssembly screens; the vehicles show what they did before | +| `screens.cabframes` | 4 | a screen in the cab is refreshed every so many frames (1-1000) | +| `screens.externalframes` | 30 | a screen outside the cab (destination sign) is refreshed every so many frames | + +`wasm.cabframes` and `wasm.externalframes`, the first names of the last two, are read as well. + +A screen may ask for a longer interval of its own (`frames:` below); the longer of the two counts. Screens sharing +an interval are spread over its frames, so they don't all refresh on the same one. A screen in the cab is refreshed +only while the player sits in that cab, a screen outside only while its vehicle is drawn. + +## .mmd + +In the cab section, next to `pyscreen:`: + +``` +luascreen: { ekran.lua target: screen01 frames: 6 parameters: id=1&mode=full } +wasmscreen: { ekran.wasm target: screen02 } +``` + +| key | meaning | +|---------------|---------------------------------------------------------------------------------------------------| +| (first token) | the script, relative to the vehicle folder when it has no path of its own | +| `target:` | the submodel the screen is drawn on (its texture is replaced); `none` for a screen that only sends commands | +| `frames:` | the screen's own refresh interval, used when longer than `screens.cabframes` | +| `parameters:` | extra `key=value` pairs, `&`-separated, added to the input | + +A touch on the screen's submodel comes in the input as the list of points `touches`, as for the Python screens. + +In `internaldata:`, next to `pydestinationsign:`: + +``` +luadestinationsign: { scripts/led_111a20.lua parameters: kod_e=IC&kod_p=TLK&kod_o=R instance: name } +destinationsignbackground: make:scripts/led_111a20.lua?dummy=1 +``` + +`luadestinationsign:` and `wasmdestinationsign:` take the keys of `pydestinationsign:` (`instance:`, `parameters:`, +`background:`) and `frames:`. The input is what a Python sign gets: the timetable (`$timetable`), `_id1` (the +train), `_id2` (the instance) and the parameters, read anew on every refresh, so the sign can follow the journey. The +vehicles of one train showing the same request share one screen and one texture. A static destination texture, when +there is one, still comes first. + +A blank sign (`background:`, or the older `destinationsignbackground:`) named `make:

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�@PZ_<-SqVVU4nz9vW*gABV7ODQQFS%7`*-?XILO@Mu=W5QH0l zAEQ5F?(H;v)p-XSDEUd&>I>(dJuK8-W^d!xwR0Cvo`#n^)toA@>33f9PP?z5TG3G6=rmtDQ5O27DJ}`BMoyys0=OzkafP{0+MpIp19bk)cY-eby#3PR>MoKEU4`P_3-@frt2> zUW(mSc3f`vOw=}F$GE_(kyBtAuN&$dF!6Z_c5968+;ySOk;o2vhktQ~AbHLu^Y`qb zMNZ_WLU()riaFBD!zNIWdmIq{O`!%WcGIF5&AF>N27v7?$D5)OkZVImxMBvRfO|Pm zOUw@QqCh%MvjprPU1JD&JM1}qZeg^4*mv_ADn^rp?|2qDuJD=d1s_*IDg6UH{Vh-I zdY7Q3ht|n*7HBM7UMr+M2WAWG)q5~fb(4>vs1Iec$M@78sg+-D(1l+!FdQ&nIHUUz z`pwZ3rrGgH>l(r1r$OsCG=Be{4y$%m9mHSr*NC&qf%-9kS$5H;XL&ev$iW%ques$! zZ!;e?CcS>?eEDRlVf}5|G9@lp9xC<7uRh(xgGzvS#j0eb2LqF@63b6DGJ0c8$>HY{ zR7_ibsr_G+-G@^X&*MM-yCe`gp%Y37y(7JYA@oqBDP2QRX(COfsiF5?M2dzkRk~6Q zy(3LPiUvef1Odf{`pP%&-{&v*&181&E|1k&I!*TsbCc+Jmk|2(0jb_w9Aj4y&kLhpCt%HiY(t%0ReJ@m2s=_a ztXp_@4f9-k`G#}2cT|z;RA2)A=Pg={8NwrmE&)J(y+wz>cmN`7nNq4ogBdis;vxZb zij`P^^-wd6j5mNJFo_rmYy;!a(u8wdGF6Hv?}v&QeRryY@;qiA>PXV6O=J(v0USxF zf6^z{t>_say16#JuGx?@gBSNg;XzQ|ANg!Rsl zRqSk(<4yM-(@*PnH+baxpHTvSirhxu6oQWZ`7s&A@i0VpD*Y`dZ_C4P*I>muQK;ja zK#js~3|9~k$l(eMs}jXFp+gB#acw2k^G0g_Blx*^wON< zNqkSKpcD|P`VyM>>GzbOz|%Wraav3g6~y$u;=w&#yoJP*^x}qzll0Jcalo+|4#L`qnW;2j z8WbVW+>@C^uu8~Hni_tgFI?+qie%tspk?E^Bz)y7+R3F~d}uwP`07XLTS--F6OW3b z&86;V$$fny$Z=Y?;PpPY-YRM{ha?!4+N1nfqeT~tV`S>yNoGo3W0zCr34cCYCx+&L zc5s{c$57a?mqOns!2c~h;=sM(fENE0=(ee!@P55pXF|xE;fO^=%)tdF#-Bv%63JBV zHpZI-N+`j{gn(Bm$PPszR-S@D#n_Za>VNk|(=_eD;;NJJz=r>*uY~v!XK3IM6RDG?#C#tIV z?UWvq09nYFCPYTT>Uj9p`4uhD;`xQ+$~Y!^niqD?{Rw7Cj;`m&-=;8*a*td)DUD~ZGh+XIwSj*X zR_yy;6K0;1oD|Q_`SQd+jL|�uwft(G7s^#29IPZDl#{onpb;JA}?8vEISsVPC>A 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 diff --git a/editor/icons/editor_icons.py b/editor/icons/editor_icons.py index 9b035485a..9ef66aa1d 100644 --- a/editor/icons/editor_icons.py +++ b/editor/icons/editor_icons.py @@ -321,10 +321,53 @@ def turntable(d): line(d, [(32 + math.cos(r) * 24, 32 + math.sin(r) * 24), (32 + math.cos(r) * 31, 32 + math.sin(r) * 31)], W - 4) +# the fields of work of the editor, in the row over the toolbar + + +def work_surroundings(d): + # a tree and a house by it + poly(d, [(18, 4), (32, 30), (4, 30)]) + poly(d, [(18, 14), (34, 44), (2, 44)]) + line(d, [(18, 44), (18, 60)], W - 2) + poly(d, [(36, 34), (49, 22), (62, 34)]) + rect(d, 39, 34, 59, 60) + + +def work_tracks(d): + # the track going away, rails on sleepers + line(d, [(8, 60), (26, 4)], W - 4) + line(d, [(56, 60), (38, 4)], W - 4) + for y, half in ((54, 28), (40, 22), (28, 17), (18, 13), (10, 10)): + line(d, [(32 - half, y), (32 + half, y)], W - 8 if y > 20 else W - 10) + + +def work_roads(d): + # a car seen from its side + poly(d, [(4, 44), (4, 34), (14, 30), (22, 18), (44, 18), (52, 30), (60, 34), (60, 44)]) + circle(d, 17, 46, 8) + circle(d, 47, 46, 8) + + +def work_terrain(d): + # the mesh of the ground over a hill + def at(u, v): + # u across 0..1, v from the back (0) to the front (1) + half = 18 + 12 * v + x = 32 + (u - 0.5) * 2 * half + hill = 18 * math.exp(-((u - 0.5) ** 2) / 0.07 - ((v - 0.35) ** 2) / 0.15) + return (x, 24 + 34 * v - hill) + steps = [i / 12 for i in range(13)] + for v in (0.0, 0.33, 0.66, 1.0): + line(d, [at(u, v) for u in steps], W - 6) + for u in (0.0, 0.33, 0.66, 1.0): + line(d, [at(u, v) for v in steps], W - 6) + + ICONS = [select, insert, brush, area_fill, copy_to_bank, translate, rotate, scale, local_space, ortho, perspective, sculpt, smooth, chunks, orthophoto, road, place, lanes, lay_track, switch, straight, curve, signal, objects, - vehicle, profile, speed, joints, infra, gauge, turntable] + vehicle, profile, speed, joints, infra, gauge, turntable, work_surroundings, + work_tracks, work_roads, work_terrain] def cutouts(name, d): @@ -341,6 +384,18 @@ def cutouts(name, d): rect(d, 10, 27, 20, 35) rect(d, 26, 27, 36, 35) rect(d, 42, 27, 50, 35) + elif name == "work_surroundings": + # the door and the gap between the crowns of the tree + rect(d, 46, 46, 52, 60) + line(d, [(9, 31), (27, 31)], 8) + elif name == "work_roads": + # the windows, and the gaps around the wheels + poly(d, [(25, 22), (31, 22), (31, 30), (19, 30)]) + poly(d, [(35, 22), (42, 22), (47, 30), (35, 30)]) + circle(d, 17, 46, 11, outline=True, width=12) + circle(d, 47, 46, 11, outline=True, width=12) + circle(d, 17, 46, 3) + circle(d, 47, 46, 3) def main(): diff --git a/lang/editor_pl.po b/lang/editor_pl.po index b043f4e21..442756c68 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -5061,3 +5061,23 @@ msgstr "Upuść go na zestaw modeli albo na listę pędzla lub wypełniania obsz msgid "or drag models here from the node bank" msgstr "albo przeciągnij tu modele z banku obiektów" + +# scenery editor: the toolbar with icons, the rows captioned + +msgid "Work modes" +msgstr "Tryby pracy" + +msgid "Tools" +msgstr "Narzędzia" + +msgid "Level crossing" +msgstr "Przejazd kolejowy" + +msgid "Spawn point" +msgstr "Punkt pojawiania" + +msgid "Removal point" +msgstr "Punkt znikania" + +msgid "Pedestrian crossing" +msgstr "Przejście dla pieszych" From 5160ffb87d50c38f94e147a7d17b600c7a275559 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Fri, 9 Oct 2026 13:30:21 +0200 Subject: [PATCH 191/430] Windows macro fixes --- application/editormode.h | 2 +- application/editormodetrack.cpp | 10 +++++----- application/editormodetrackux.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/application/editormode.h b/application/editormode.h index 68cb2df70..af692dbeb 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -712,7 +712,7 @@ class editor_mode : public application_mode, private editor_track::observer // listed spacing of a neighbouring straight the line can snap to, if it is close enough struct parallel_offer { - bool near{false}; + bool nearby{false}; bool snaps{false}; double spacing{0.0}; double distance{0.0}; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index e165c657c..61c130d30 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -2534,7 +2534,7 @@ void editor_mode::draw_straights_overlay() const auto const lateral{across(other.start) + (across(other.end) - across(other.start)) * fraction}; glm::dvec3 const foot{line.start.x + line.direction.x * middle, line.start.y + line.grade * middle, line.start.z + line.direction.y * middle}; glm::dvec3 const target{foot.x + normal.x * lateral, foot.y, foot.z + normal.y * lateral}; - bool const highlighted{offer.near && offer.neighbour == &other}; + bool const highlighted{offer.nearby && offer.neighbour == &other}; auto const tick{highlighted ? (offer.snaps ? IM_COL32(80, 230, 255, 255) : IM_COL32(255, 210, 60, 255)) : IM_COL32(255, 230, 120, 230)}; if (highlighted) projection.line(drawlist, other.start, other.end, tick, 3.0f); @@ -2551,7 +2551,7 @@ void editor_mode::draw_straights_overlay() const drawlist->AddText(screen, highlighted ? tick : IM_COL32(255, 230, 120, 255), label); } } - if (offer.near && false == offer.snaps && std::abs(offer.correction) > 0.02) + if (offer.nearby && false == offer.snaps && std::abs(offer.correction) > 0.02) { auto const shift{glm::dvec3{normal.x, 0.0, normal.y} * offer.correction}; projection.line(drawlist, line.start + shift, line.end + shift, IM_COL32(80, 230, 255, 210), 3.5f); @@ -2613,7 +2613,7 @@ editor_mode::parallel_offer editor_mode::straight_parallel_offer(editor_track::s if (error < best) { best = error; - offer.near = true; + offer.nearby = true; offer.snaps = error < kParallelSnapWindow && angle <= kParallelSnapAngle; offer.spacing = spacing; offer.distance = std::abs(distance); @@ -3532,7 +3532,7 @@ std::vector editor_mode::track_key_hints(bool const All) auto const offer{straight_parallel_offer(m_straights.drag_line, m_straights.preview_start - m_straights.drag_line.start)}; if (offer.snaps) hints = {{"Release", format(STR_C("parallel at %.2f m"), offer.spacing)}, {"Esc", "cancel"}}; - else if (offer.near) + else if (offer.nearby) hints = {{"Near another straight", format(STR_C("snap at %.2f m (%.1f°)"), offer.spacing, offer.angle)}, {"Esc", "cancel"}}; else hints = {{"Drag the diamond", "snaps parallel at 4.00 / 4.50 / 4.75 m"}, {"Esc", "cancel"}}; @@ -3676,7 +3676,7 @@ std::string editor_mode::track_readout() const auto const offer{straight_parallel_offer(grabbed, offset)}; if (offer.snaps) text += "\n" + format(STR_C("parallel %.2f m"), offer.spacing); - else if (offer.near) + else if (offer.nearby) text += "\n" + format(STR_C("close: %.2f m %.1f°"), offer.spacing, offer.angle); return text; } diff --git a/application/editormodetrackux.cpp b/application/editormodetrackux.cpp index 16480e4bc..d9dbb3f58 100644 --- a/application/editormodetrackux.cpp +++ b/application/editormodetrackux.cpp @@ -328,7 +328,7 @@ editor_mode::track_intent editor_mode::track_intent_at(int const Mods) if (hit == 2) { auto const offer{straight_parallel_offer(line, {})}; - if (offer.near) + if (offer.nearby) { intent.action = format(offer.snaps ? STR_C("Drag: shift the straight sideways — snaps parallel at %.2f m") : STR_C("Drag: shift the straight sideways — close: %.2f m %.1f°"), offer.spacing, offer.angle); intent.what = kind::straight_handle; From 1c28809dd7c5daecd9083d5c685cefd179b0304d Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Fri, 9 Oct 2026 14:42:55 +0200 Subject: [PATCH 192/430] Sonar fixes --- application/editormode.cpp | 3 ++- application/editormodeinfra.cpp | 2 +- application/editormodeprofile.cpp | 17 +++++++++++------ application/editormodeselftest.cpp | 8 ++++++-- application/editormodeturntable.cpp | 10 ++++++---- editor/editorSpeed.cpp | 3 ++- 6 files changed, 28 insertions(+), 15 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 3eef93300..a3373e73b 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -3934,7 +3934,8 @@ void editor_mode::render_edit_menu() group_selection(); if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", STR_C("The selected models move together from now on; a click on one selects them all. Shift+LMB adds a model to the selection")); - if (ImGui::MenuItem(STR_C("Ungroup"), "Ctrl+Shift+G", false, selected && m_node->group() > 1)) + // Delete above may have just dropped the node, selected is from before it + if (ImGui::MenuItem(STR_C("Ungroup"), "Ctrl+Shift+G", false, m_node != nullptr && m_node->group() > 1)) ungroup_selection(); if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", STR_C("The models of the group move each by itself again")); diff --git a/application/editormodeinfra.cpp b/application/editormodeinfra.cpp index 1e18d0425..46585e960 100644 --- a/application/editormodeinfra.cpp +++ b/application/editormodeinfra.cpp @@ -1545,7 +1545,7 @@ void editor_mode::render_infra_candidates() if (ImGui::IsItemHovered()) { state.hovered = i; - std::string text{format(STR_C("%s, %s\n%.2f m %s of the axis, %.2f m above the rail top\n%s"), infra::name(candidate.binding.type), anchor.at.track->name().c_str(), std::abs(candidate.offset), + std::string text{format(STR_C("%s, %s\n%.2f m %s of the axis, %.2f m above the rail top\n%s"), infra::name(candidate.binding.type), anchor.at.track != nullptr ? anchor.at.track->name().c_str() : "-", std::abs(candidate.offset), candidate.offset >= 0.0 ? "right" : "left", anchor.height, candidate.reason.c_str())}; if (candidate.reader != nullptr) text += format(STR_C("\nRead by the path %s: event %s, getvalues of the memory cell %s"), candidate.reader->name().c_str(), candidate.event.c_str(), candidate.cell.c_str()) + diff --git a/application/editormodeprofile.cpp b/application/editormodeprofile.cpp index 9c23bd566..16c024f27 100644 --- a/application/editormodeprofile.cpp +++ b/application/editormodeprofile.cpp @@ -1695,16 +1695,19 @@ void editor_mode::draw_profile_canvas(profile_view const &View, ImDrawList &Draw auto const plotbottom{View.plot_bottom()}; auto const step{nice_step(View.across * 110.0)}; - for (auto s = std::ceil((state.view_from + state.origin) / step) * step - state.origin; s <= state.view_to; s += step) + auto const firsts{std::ceil((state.view_from + state.origin) / step) * step - state.origin}; + for (int i = 0; firsts + i * step <= state.view_to; ++i) { + auto const s{firsts + i * step}; auto const x{View.x_of(s)}; Draw.AddLine(ImVec2(x, plottop), ImVec2(x, plotbottom), kGrid); Draw.AddText(ImVec2(x + 3.0f, View.corner.y + 2.0f), kLabel, profile::format_chainage(s + state.origin).c_str()); } auto const heightstep{nice_step(View.vertical * 45.0)}; - for (auto h = std::floor(View.height_of(plotbottom) / heightstep) * heightstep; h <= View.height_of(plottop); h += heightstep) + auto const firsth{std::floor(View.height_of(plotbottom) / heightstep) * heightstep}; + for (int i = 0; firsth + i * heightstep <= View.height_of(plottop); ++i) { - auto const y{View.y_of(h)}; + auto const y{View.y_of(firsth + i * heightstep)}; Draw.AddLine(ImVec2(View.corner.x, y), ImVec2(bottomright.x, y), kGrid); } for (auto const &zone : state.context.switches) @@ -1772,8 +1775,10 @@ void editor_mode::draw_profile_canvas(profile_view const &View, ImDrawList &Draw auto const from{std::max(points.front().chainage, View.chainage_of(View.corner.x))}; auto const to{std::min(points.back().chainage, View.chainage_of(bottomright.x))}; ImVec2 previous{View.x_of(from), View.y_of(profile::elevation(line, from))}; - for (auto x = previous.x + 2.0f; x <= View.x_of(to) + 2.0f; x += 2.0f) + auto const firstx{previous.x}; + for (int i = 1; firstx + 2.0f * i <= View.x_of(to) + 2.0f; ++i) { + auto const x{firstx + 2.0f * i}; auto const chainage{std::min(to, View.chainage_of(x))}; ImVec2 const next{View.x_of(chainage), View.y_of(profile::elevation(line, chainage))}; Draw.AddLine(previous, next, kGradeLine, 2.5f); @@ -1827,8 +1832,8 @@ void editor_mode::draw_profile_canvas(profile_view const &View, ImDrawList &Draw plot_label(Draw, ImVec2(at.x + 8.0f, at.y - 22.0f), overlay_color::marked, text); } // heights along the left edge, over everything else - for (auto h = std::floor(View.height_of(plotbottom) / heightstep) * heightstep; h <= View.height_of(plottop); h += heightstep) - plot_label(Draw, ImVec2(View.corner.x + 4.0f, View.y_of(h) - 8.0f), kLabel, format("%.1f", h)); + for (int i = 0; firsth + i * heightstep <= View.height_of(plottop); ++i) + plot_label(Draw, ImVec2(View.corner.x + 4.0f, View.y_of(firsth + i * heightstep) - 8.0f), kLabel, format("%.1f", firsth + i * heightstep)); for (auto const &issue : state.issues) { auto const x{View.x_of(issue.chainage)}; diff --git a/application/editormodeselftest.cpp b/application/editormodeselftest.cpp index a2281e6c0..c44fd133a 100644 --- a/application/editormodeselftest.cpp +++ b/application/editormodeselftest.cpp @@ -321,8 +321,9 @@ void editor_mode::selftest_step() geometry::bezier const main{track->m_paths[0]}; geometry::bezier const other{track->m_paths[1]}; std::string text; - for (double t = 0.125; t < 1.01; t += 0.125) + for (int i = 1; i <= 8; ++i) { + auto const t{i * 0.125}; auto const point{other.point(t)}; double best{std::numeric_limits::max()}, along{0.0}; for (int k = 0; k <= 2000; ++k) @@ -350,8 +351,11 @@ void editor_mode::selftest_step() if (sweep == nullptr) continue; auto const side{sweep->definition().lateral >= 0.0 ? 1 : 0}; - for (double station = from; station <= to + 1e-9; station += step) + if (step <= 0.0) + continue; + for (int i = 0; from + i * step <= to + 1e-9; ++i) { + auto const station{from + i * step}; auto const at{sweep->frame_at(station)}; WriteLog(format("SELFTEST frame %s %.2f: %.3f %.3f %.3f widening %.4f cant %.4f setback %.4f", name.c_str(), station, at.position.x, at.position.y, at.position.z, at.widening[side], at.cant[side], sweep->setback(at))); } diff --git a/application/editormodeturntable.cpp b/application/editormodeturntable.cpp index 4cd20a8fc..e6b78d9ef 100644 --- a/application/editormodeturntable.cpp +++ b/application/editormodeturntable.cpp @@ -402,8 +402,8 @@ bool editor_mode::turntable_fit_end(editor_track::snap_target const &End, turnta for (auto const heading : {line, line + 180.0}) { auto const radial{heading_vector(heading)}; - for (auto radius{static_cast(tool.radius)}; radius >= kMinimumRadius; radius *= 0.9) - if (auto const candidate{connect(radial, radius)}) + for (int i = 0; tool.radius * std::pow(0.9, i) >= kMinimumRadius; ++i) + if (auto const candidate{connect(radial, tool.radius * std::pow(0.9, i))}) { if (better(*candidate)) best = candidate; @@ -419,8 +419,9 @@ bool editor_mode::turntable_fit_end(editor_track::snap_target const &End, turnta } else { - for (auto radius{static_cast(tool.radius)}; radius >= kMinimumRadius && false == best.has_value(); radius *= 0.9) + for (int r = 0; tool.radius * std::pow(0.9, r) >= kMinimumRadius && false == best.has_value(); ++r) { + auto const radius{tool.radius * std::pow(0.9, r)}; auto const gap = [&](double const S) { auto const vertex{e - t * S}; auto const radial{vertex - c}; @@ -432,8 +433,9 @@ bool editor_mode::turntable_fit_end(editor_track::snap_target const &End, turnta auto const limit{plan_distance(End.position, centre) + 400.0}; double low{0.0}; std::optional high; - for (double s = 0.25; s <= limit; s += 0.25) + for (int i = 1; i * 0.25 <= limit; ++i) { + auto const s{i * 0.25}; if (gap(s) >= 0.0) { high = s; diff --git a/editor/editorSpeed.cpp b/editor/editorSpeed.cpp index bf98e79e3..9f4a449ec 100644 --- a/editor/editorSpeed.cpp +++ b/editor/editorSpeed.cpp @@ -52,8 +52,9 @@ double jerk_limit(double const Curvature, double const Cant, double const Gauge, if (rate(Top) <= Jerk) return Top; double low{0.0}; - for (double speed = 10.0; speed <= Top; speed += 10.0) + for (int i = 1; i * 10.0 <= Top; ++i) { + auto const speed{i * 10.0}; if (rate(speed) > Jerk) { double high{speed}; From e910615bf6ab42ac5002700732b4dfd044f60347 Mon Sep 17 00:00:00 2001 From: maj00r Date: Fri, 9 Oct 2026 15:37:23 +0200 Subject: [PATCH 193/430] removed draw limit in track editor --- application/editormode.cpp | 7 +++- application/editormodetrack.cpp | 23 ++++++----- application/editormodetrackux.cpp | 63 ++++++++++++------------------- rendering/opengl33renderer.cpp | 56 +++++++++++++++++++++++---- rendering/openglrenderer.cpp | 44 +++++++++++++++++++-- utilities/Globals.h | 1 + 6 files changed, 131 insertions(+), 63 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index a3373e73b..cdd953276 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -41,6 +41,7 @@ extern char **environ; #include "rendering/renderer.h" #include "model/AnimModel.h" #include "model/Model3d.h" +#include "world/Track.h" #include "utilities/Float3d.h" #include "scene/scene.h" #include "scene/scenelayers.h" @@ -1192,6 +1193,7 @@ void editor_mode::redo_one() bool editor_mode::update() { + Global.editor_tracks = (current_work_area() == work_area::tracks); selftest_step(); if (m_vehicle.leave) { @@ -4544,6 +4546,7 @@ void editor_mode::enter() void editor_mode::exit() { + Global.editor_tracks = false; EditorModeFlag = false; Global.ControlPicking = m_statebackup.picking; FreeFlyModeFlag = m_statebackup.freefly; @@ -5012,8 +5015,8 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const } } - // ignore picks that are beyond allowed placement distance - if (node) { + // models stay within placement distance; tracks in the track workspace have no range cap + if (node && false == (Global.editor_tracks && dynamic_cast(node) != nullptr)) { double const dist = glm::distance(node->location(), glm::dvec3{Global.pCamera.Pos}); if (dist > static_cast(kMaxPlacementDistance)) { diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 61c130d30..0b264b784 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -222,10 +222,6 @@ void editor_mode::select_track(scene::basic_node *Node) m_track_point = {}; return; } - glm::dvec3 const camera{Global.pCamera.Pos}; - if (glm::distance(glm::dvec3(track->get_nearest_point(camera)), camera) > static_cast(kMaxPlacementDistance)) - return; - if (track != m_node) { m_track_point = {}; @@ -3795,14 +3791,21 @@ void editor_mode::update_build_tools() lay.preview_length = 0.0; if (false == lay.active) return; - auto mouse{ground}; + // geometric ray, same as extend: Mouse_Position() is a delayed depth pick and lags the cursor + screen_projection const lay_projection; + double const height{false == lay.points.empty() ? lay.points.back().y : lay.start.track != nullptr ? lay.start.position.y : 0.0}; + glm::dvec3 mouse{ground}; + if (m_cursor_override.has_value()) + mouse = glm::dvec3{m_cursor_override->x, height, m_cursor_override->z}; + else if (false == lay_projection.on_level(io.MousePos, height, mouse)) + mouse = ground; glm::dvec2 heading; bool const straight{io.KeyShift && lay_heading(heading)}; if (straight) { auto const &last{lay.points.back()}; - auto const along{std::max(0.0, glm::dot(glm::dvec2{ground.x - last.x, ground.z - last.z}, heading))}; - mouse = {last.x + heading.x * along, ground.y, last.z + heading.y * along}; + auto const along{std::max(0.0, glm::dot(glm::dvec2{mouse.x - last.x, mouse.z - last.z}, heading))}; + mouse = {last.x + heading.x * along, mouse.y, last.z + heading.y * along}; } lay.mouse = typed_lay(mouse); lay.mouse_snap = straight ? editor_track::snap_target{} : m_typed.empty() ? snap_free_end(lay.mouse, cursor, nullptr, kRailCategory, {}) : editor_track::find_free_end(nullptr, kRailCategory, lay.mouse, kLaySnapRadius, {}); @@ -3907,7 +3910,7 @@ glm::dvec3 editor_mode::cursor_level(double const Height) const glm::dvec3 const ground{cursor_ground()}; screen_projection const projection; glm::dvec3 level; - if (false == projection.on_level(ImGui::GetIO().MousePos, Height, level) || glm::distance(level, glm::dvec3{Global.pCamera.Pos}) > static_cast(kMaxPlacementDistance)) + if (false == projection.on_level(ImGui::GetIO().MousePos, Height, level) || (false == Global.editor_tracks && glm::distance(level, glm::dvec3{Global.pCamera.Pos}) > static_cast(kMaxPlacementDistance))) return ground; return level; } @@ -5049,15 +5052,11 @@ void editor_mode::draw_build_overlay() const previous = next; } }; - glm::dvec3 const camera{Global.pCamera.Pos}; auto const &display{ImGui::GetIO().DisplaySize}; for (auto const *track : simulation::Paths.sequence()) { if (track == nullptr || track->m_editorremoved || track->m_paths.empty()) continue; - auto const &first{track->m_paths.front().points}; - if (glm::distance(first[segment_data::point::start], camera) > kJointRange && glm::distance(first[segment_data::point::end], camera) > kJointRange) - continue; for (auto const &path : track->m_paths) for (auto const point : {segment_data::point::start, segment_data::point::end}) { diff --git a/application/editormodetrackux.cpp b/application/editormodetrackux.cpp index d9dbb3f58..9e19d1b29 100644 --- a/application/editormodetrackux.cpp +++ b/application/editormodetrackux.cpp @@ -40,8 +40,6 @@ namespace using geometry::bezier; float const kHoverPixels{12.0f}; -double const kHoverReachMin{15.0}; -double const kHoverReachMax{250.0}; double const kHoverLabelDelay{0.35}; // s the cursor rests on a path before its data shows up double const kFocusDistance{25.0}; auto const kContextClick{std::chrono::milliseconds(350)}; @@ -98,50 +96,40 @@ editor_mode::track_hover editor_mode::track_under_cursor() const { track_hover result; auto const &io{ImGui::GetIO()}; - glm::dvec3 const camera{Global.pCamera.Pos}; - glm::dvec3 const ground{cursor_ground()}; - auto const reach{std::clamp(glm::distance(camera, ground) * 0.1, kHoverReachMin, kHoverReachMax)}; screen_projection const projection; glm::vec2 const mouse{io.MousePos.x, io.MousePos.y}; double best{kHoverPixels * kHoverPixels}; - for (auto *section : simulation::Region->sections(ground, static_cast(reach))) + for (auto *track : simulation::Paths.sequence()) { - for (auto const &cell : section->m_cells) + if (track == nullptr || false == rail(*track) || track->m_editorremoved) + continue; + for (int i = 0; i < static_cast(track->m_paths.size()); ++i) { - for (auto *track : cell.m_directories.paths) + bezier const curve{track->m_paths[i]}; + auto const count{std::clamp(static_cast(curve.plan_length() / 3.0), 6, 64)}; + auto previous{curve.point(0.0)}; + ImVec2 from; + bool visible{projection.project(previous, from)}; + for (int k = 1; k <= count; ++k) { - if (track == nullptr || false == rail(*track)) - continue; - for (int i = 0; i < static_cast(track->m_paths.size()); ++i) + auto const next{curve.point(static_cast(k) / count)}; + ImVec2 to; + bool const shown{projection.project(next, to)}; + if (visible && shown) { - bezier const curve{track->m_paths[i]}; - auto const count{std::clamp(static_cast(curve.plan_length() / 3.0), 6, 64)}; - auto previous{curve.point(0.0)}; - ImVec2 from; - bool visible{projection.project(previous, from)}; - for (int k = 1; k <= count; ++k) + double t; + auto const distance{segment_distance2(mouse, {from.x, from.y}, {to.x, to.y}, t)}; + if (distance < best) { - auto const next{curve.point(static_cast(k) / count)}; - ImVec2 to; - bool const shown{projection.project(next, to)}; - if (visible && shown) - { - double t; - auto const distance{segment_distance2(mouse, {from.x, from.y}, {to.x, to.y}, t)}; - auto const point{glm::mix(previous, next, t)}; - if (distance < best && glm::distance(point, camera) <= static_cast(kMaxPlacementDistance)) - { - best = distance; - result.track = track; - result.path = i; - result.point = point; - } - } - previous = next; - from = to; - visible = shown; + best = distance; + result.track = track; + result.path = i; + result.point = glm::mix(previous, next, t); } } + previous = next; + from = to; + visible = shown; } } } @@ -908,14 +896,13 @@ void editor_mode::finish_track_box() glm::vec2 const low{std::min(box.from.x, box.to.x), std::min(box.from.y, box.to.y)}; glm::vec2 const high{std::max(box.from.x, box.to.x), std::max(box.from.y, box.to.y)}; screen_projection const projection; - glm::dvec3 const camera{Global.pCamera.Pos}; track_set_prune(); if (m_track_set.empty()) if (auto *selected{selected_track()}; selected != nullptr) m_track_set.push_back(selected); for (auto *track : simulation::Paths.sequence()) { - if (track == nullptr || false == rail(*track) || in_track_set(track) || glm::distance(track->location(), camera) > static_cast(Global.BaseDrawRange)) + if (track == nullptr || false == rail(*track) || in_track_set(track)) continue; bool inside{false}; for (auto const &path : track->m_paths) diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index d5d403f8b..c429c88fb 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -31,6 +31,28 @@ int constexpr EU07_REFLECTIONFIDELITYOFFSET { 250 }; // artificial increase of r namespace { +float +editor_track_view_range(float const Range, bool const Apply) +{ + if (false == Apply || false == Global.editor_tracks) + return Range; + float extra = 50000.0f; + if (Global.EditorOrtho) + extra = Global.EditorOrthoExtent * 3.0f; + return Range > extra ? Range : extra; +} + +bool +editor_far_tracks_only(bool const Apply, scene::basic_cell const *Cell, glm::dvec3 const &Camera, double const SceneryLimit) +{ + if (false == Apply) + return false; + double nearest = glm::length(Cell->m_area.center - Camera) - static_cast(Cell->m_area.radius); + if (nearest < 0.0) + nearest = 0.0; + return nearest > SceneryLimit; +} + // returns material assigned to the submodel, resolving replacable skins. null_handle if no skin set is bound material_handle submodel_material( TSubModel const *Submodel ) { @@ -1642,8 +1664,10 @@ void opengl33_renderer::setup_pass(viewport_config &Viewport, renderpass_config Config.draw_range = std::max( 2000.f, Config.draw_range ); // projection - auto const zfar = ( Zfar > 1.f ? Zfar : Config.draw_range * Zfar ); + auto zfar = ( Zfar > 1.f ? Zfar : Config.draw_range * Zfar ); auto const znear = ( Znear > 1.f ? Znear : Znear > 0.f ? Znear * zfar : 0.1f * Global.ZoomFactor); + if (EditorModeFlag && Viewport.main) + zfar = editor_track_view_range(zfar, true); camera.projection() = perspective_projection(Viewport.projection, znear, zfar, frustumtest_proj); editor_ortho_projection(Viewport, zfar, camera.projection(), frustumtest_proj); @@ -1726,6 +1750,8 @@ void opengl33_renderer::setup_pass(viewport_config &Viewport, renderpass_config // projection float znear = 0.1f * Global.ZoomFactor; float zfar = Config.draw_range * Global.fDistanceFactor; + if (EditorModeFlag && Viewport.main && Mode == rendermode::pickscenery) + zfar = editor_track_view_range(zfar, true); if (vr) { glm::mat4 transform = vr->get_pick_transform(); @@ -2447,7 +2473,9 @@ void opengl33_renderer::Render(scene::basic_region *Region) glm::vec3 const cameraposition{m_renderpass.pass_camera.position()}; auto const camerax = static_cast(std::floor(cameraposition.x / scene::EU07_SECTIONSIZE + scene::EU07_REGIONSIDESECTIONCOUNT / 2)); auto const cameraz = static_cast(std::floor(cameraposition.z / scene::EU07_SECTIONSIZE + scene::EU07_REGIONSIDESECTIONCOUNT / 2)); - int const segmentcount = 2 * static_cast(std::ceil(m_renderpass.draw_range * Global.fDistanceFactor / scene::EU07_SECTIONSIZE)); + float section_range = m_renderpass.draw_range * Global.fDistanceFactor; + section_range = editor_track_view_range(section_range, EditorModeFlag && (m_renderpass.draw_mode == rendermode::color || m_renderpass.draw_mode == rendermode::pickscenery)); + int const segmentcount = 2 * static_cast(std::ceil(section_range / scene::EU07_SECTIONSIZE)); int const originx = camerax - segmentcount / 2; int const originz = cameraz - segmentcount / 2; @@ -2643,6 +2671,9 @@ void opengl33_renderer::Render(cell_sequence::iterator First, cell_sequence::ite // cache initial iterator for the second sweep auto first{First}; + auto const scenery_limit{static_cast(Global.BaseDrawRange) * Global.fDistanceFactor + 250.0}; + bool const far_paths{EditorModeFlag && Global.editor_tracks && (m_renderpass.draw_mode == rendermode::color || m_renderpass.draw_mode == rendermode::pickscenery)}; + glm::dvec3 const camera{m_renderpass.pass_camera.position()}; // first pass draws elements which we know are located in section banks, to reduce vbo switching while (First != Last) { @@ -2650,6 +2681,7 @@ void opengl33_renderer::Render(cell_sequence::iterator First, cell_sequence::ite auto *cell = First->second; // przeliczenia animacji torów w sektorze cell->RaAnimate(m_framestamp); + bool const tracks_only{editor_far_tracks_only(far_paths, cell, camera, scenery_limit)}; switch (m_renderpass.draw_mode) { @@ -2662,9 +2694,12 @@ void opengl33_renderer::Render(cell_sequence::iterator First, cell_sequence::ite // render // opaque non-instanced shapes - for (auto const &shape : cell->m_shapesopaque) + if (false == tracks_only) { - Render(shape, false); + for (auto const &shape : cell->m_shapesopaque) + { + Render(shape, false); + } } // tracks // TODO: update after path node refactoring @@ -2720,9 +2755,12 @@ void opengl33_renderer::Render(cell_sequence::iterator First, cell_sequence::ite // render // opaque non-instanced shapes // non-interactive scenery elements get neutral colour - model_ubs.param[0] = colors::none; - for (auto const &shape : cell->m_shapesopaque) - Render(shape, false); + if (false == tracks_only) + { + model_ubs.param[0] = colors::none; + for (auto const &shape : cell->m_shapesopaque) + Render(shape, false); + } // tracks for (auto *path : cell->m_paths) { @@ -2753,6 +2791,8 @@ void opengl33_renderer::Render(cell_sequence::iterator First, cell_sequence::ite case rendermode::color: case rendermode::shadows: { + if (editor_far_tracks_only(far_paths, cell, camera, scenery_limit)) + break; // TBD, TODO: refactor in to a method to reuse in branch below? // opaque parts of instanced models -- accumulate this cell's buckets // into the frame-level map; the actual Render_Instanced() calls are @@ -2833,6 +2873,8 @@ void opengl33_renderer::Render(cell_sequence::iterator First, cell_sequence::ite } case rendermode::pickscenery: { + if (editor_far_tracks_only(far_paths, cell, camera, scenery_limit)) + break; // opaque parts of instanced models // same procedure like with regular render, but each node receives custom colour used for picking. // picking always uses the per-instance path because each instance needs a unique pick colour; diff --git a/rendering/openglrenderer.cpp b/rendering/openglrenderer.cpp index b8a73cfb4..59152c64d 100644 --- a/rendering/openglrenderer.cpp +++ b/rendering/openglrenderer.cpp @@ -33,6 +33,28 @@ int constexpr EU07_REFLECTIONFIDELITYOFFSET { 250 }; // artificial increase of r namespace { +float +editor_track_view_range(float const Range, bool const Apply) +{ + if( false == Apply || false == Global.editor_tracks ) + return Range; + float extra = 50000.0f; + if( Global.EditorOrtho ) + extra = Global.EditorOrthoExtent * 3.0f; + return Range > extra ? Range : extra; +} + +bool +editor_far_tracks_only(bool const Apply, scene::basic_cell const *Cell, glm::dvec3 const &Camera, double const SceneryLimit) +{ + if( false == Apply ) + return false; + double nearest = glm::length( Cell->m_area.center - Camera ) - static_cast( Cell->m_area.radius ); + if( nearest < 0.0 ) + nearest = 0.0; + return nearest > SceneryLimit; +} + // returns material assigned to the submodel, resolving replacable skins. null_handle if no skin set is bound material_handle submodel_material( TSubModel const *Submodel ) { @@ -1875,7 +1897,9 @@ opengl_renderer::Render( scene::basic_region *Region ) { glm::vec3 const cameraposition { m_renderpass.camera.position() }; auto const camerax = static_cast( std::floor( cameraposition.x / scene::EU07_SECTIONSIZE + scene::EU07_REGIONSIDESECTIONCOUNT / 2 ) ); auto const cameraz = static_cast( std::floor( cameraposition.z / scene::EU07_SECTIONSIZE + scene::EU07_REGIONSIDESECTIONCOUNT / 2 ) ); - int const segmentcount = 2 * static_cast( std::ceil( m_renderpass.draw_range * Global.fDistanceFactor / scene::EU07_SECTIONSIZE ) ); + float section_range = m_renderpass.draw_range * Global.fDistanceFactor; + section_range = editor_track_view_range( section_range, EditorModeFlag && ( m_renderpass.draw_mode == rendermode::color || m_renderpass.draw_mode == rendermode::pickscenery ) ); + int const segmentcount = 2 * static_cast( std::ceil( section_range / scene::EU07_SECTIONSIZE ) ); int const originx = camerax - segmentcount / 2; int const originz = cameraz - segmentcount / 2; @@ -2040,12 +2064,16 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator // cache initial iterator for the second sweep auto first { First }; + auto const scenery_limit{ static_cast( Global.BaseDrawRange ) * Global.fDistanceFactor + 250.0 }; + bool const far_paths{ EditorModeFlag && Global.editor_tracks && ( m_renderpass.draw_mode == rendermode::color || m_renderpass.draw_mode == rendermode::pickscenery ) }; + glm::dvec3 const camera{ m_renderpass.camera.position() }; // first pass draws elements which we know are located in section banks, to reduce vbo switching while( First != Last ) { auto *cell = First->second; // przeliczenia animacji torów w sektorze cell->RaAnimate( m_framestamp ); + bool const tracks_only{ editor_far_tracks_only( far_paths, cell, camera, scenery_limit ) }; switch( m_renderpass.draw_mode ) { case rendermode::color: { @@ -2056,7 +2084,9 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator // render // opaque non-instanced shapes - for( auto const &shape : cell->m_shapesopaque ) { Render( shape, false ); } + if( false == tracks_only ) { + for( auto const &shape : cell->m_shapesopaque ) { Render( shape, false ); } + } // tracks // TODO: update after path node refactoring Render( std::begin( cell->m_paths ), std::end( cell->m_paths ) ); @@ -2158,8 +2188,10 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator // render // opaque non-instanced shapes // non-interactive scenery elements get neutral colour - ::glColor3fv( glm::value_ptr( colors::none ) ); - for( auto const &shape : cell->m_shapesopaque ) { Render( shape, false ); } + if( false == tracks_only ) { + ::glColor3fv( glm::value_ptr( colors::none ) ); + for( auto const &shape : cell->m_shapesopaque ) { Render( shape, false ); } + } // tracks for( auto *path : cell->m_paths ) { ::glColor3fv( glm::value_ptr( pick_color( m_picksceneryitems.size() + 1 ) ) ); @@ -2188,6 +2220,8 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator case rendermode::color: case rendermode::shadows: case rendermode::cabshadows: { + if( editor_far_tracks_only( far_paths, cell, camera, scenery_limit ) ) + break; // TBD, TODO: refactor in to a method to reuse in branch below? // opaque parts of instanced models for( auto *instance : cell->m_instancesopaque ) { @@ -2230,6 +2264,8 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator break; } case rendermode::pickscenery: { + if( editor_far_tracks_only( far_paths, cell, camera, scenery_limit ) ) + break; // opaque parts of instanced models // same procedure like with regular render, but each node receives custom colour used for picking for( auto *instance : cell->m_instancesopaque ) { diff --git a/utilities/Globals.h b/utilities/Globals.h index 08707d8c3..8f5748c34 100644 --- a/utilities/Globals.h +++ b/utilities/Globals.h @@ -86,6 +86,7 @@ struct global_settings { std::string local_start_vehicle{ "EU07-424" }; std::string editor_enter_vehicle; // vehicle placed in the editor, to be entered when the driving goes on bool editor_session{ false }; // scenery was opened for editing (-edit): loader keeps track of scenery layers and hands over to the editor + bool editor_tracks{ false }; // F3 track workspace: draw and pick tracks without the scenery draw-range cap int iConvertModels{ 0 }; // tworzenie plików binarnych int iConvertIndexRange{ 1000 }; // range of duplicate vertex scan bool file_binary_terrain{ true }; // enable binary terrain (de)serialization From 9935257783c17c29e8d497709058d234bbcb3a6c Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Fri, 9 Oct 2026 18:40:31 +0200 Subject: [PATCH 194/430] Add nosonar tags --- application/application.cpp | 2 +- application/drivermode.cpp | 2 +- application/editormodegauge.cpp | 2 +- application/editormodeinfra.cpp | 2 +- editor/editorIncludeInfo.cpp | 2 +- editor/editorTrack.cpp | 2 +- model/Texture.cpp | 2 +- scene/scenelayers.cpp | 2 +- scene/scenelayerssave.cpp | 6 +++--- tools/editor/signal_headers.py | 10 +++++----- vehicle/Driver.cpp | 2 +- vehicle/DynObj.cpp | 4 ++-- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/application/application.cpp b/application/application.cpp index dec1292d9..a7d098140 100644 --- a/application/application.cpp +++ b/application/application.cpp @@ -569,7 +569,7 @@ int eu07_application::run() if (m_network && m_network->client) { // verify sync - if (sync != slave_sync) + if (sync != slave_sync) // NOSONAR { WriteLog("net: desync! calculated: " + std::to_string(sync) + ", received: " + std::to_string(slave_sync), logtype::net); diff --git a/application/drivermode.cpp b/application/drivermode.cpp index d8581c423..b55d09c2b 100644 --- a/application/drivermode.cpp +++ b/application/drivermode.cpp @@ -704,7 +704,7 @@ void driver_mode::update_camera(double const Deltatime) auto const lr{m_input.keyboard.key(GLFW_KEY_LEFT) != GLFW_RELEASE}; // Camera.Yaw powinno być wyzerowane, aby po powrocie patrzeć do przodu - Camera.Pos = controlled->GetPosition() + simulation::Train->MirrorPosition(lr); // pozycja lusterka + Camera.Pos = controlled->GetPosition() + simulation::Train->MirrorPosition(lr); // pozycja lusterka // NOSONAR Camera.Angle.y = 0; // odchylenie na bok od Camera.LookAt if (simulation::Train->Occupied()->CabOccupied == 0) { diff --git a/application/editormodegauge.cpp b/application/editormodegauge.cpp index 6d6883a0a..298724e70 100644 --- a/application/editormodegauge.cpp +++ b/application/editormodegauge.cpp @@ -344,7 +344,7 @@ void scan_triangle(corridor const &Space, glm::dvec3 const &A, glm::dvec3 const { Hit.depth = found.depth; Hit.point = point; - Hit.track = found.span->track; + Hit.track = found.span->track; // NOSONAR Hit.path = found.span->path; Hit.direction = found.direction; } diff --git a/application/editormodeinfra.cpp b/application/editormodeinfra.cpp index 46585e960..fec28b752 100644 --- a/application/editormodeinfra.cpp +++ b/application/editormodeinfra.cpp @@ -468,7 +468,7 @@ class event_links for (auto *child : multi->children()) { auto const setter{dynamic_cast(child) != nullptr || dynamic_cast(child) != nullptr}; - for (auto *target : child->target_nodes()) + for (auto *target : child->target_nodes()) // NOSONAR { if (models.count(target) > 0 && false == contains(shown, static_cast(target))) shown.push_back(target); diff --git a/editor/editorIncludeInfo.cpp b/editor/editorIncludeInfo.cpp index d5d9ccae0..1a3ea1e67 100644 --- a/editor/editorIncludeInfo.cpp +++ b/editor/editorIncludeInfo.cpp @@ -723,7 +723,7 @@ std::string directive(std::string const &File, include_info const &Info, int con else if (role == "name") { // names have to be unique in the scenery. the default value, or the name of the template, makes them recognizable - static std::mt19937 engine{std::random_device{}()}; + static std::mt19937 engine{std::random_device{}()}; // NOSONAR char suffix[16]; std::snprintf(suffix, sizeof(suffix), "_%08x", static_cast(engine())); value = (value.empty() ? std::filesystem::path(File).stem().string() : value) + suffix; diff --git a/editor/editorTrack.cpp b/editor/editorTrack.cpp index f661e5188..418d908fe 100644 --- a/editor/editorTrack.cpp +++ b/editor/editorTrack.cpp @@ -1176,7 +1176,7 @@ glm::dvec2 direction_at(TTrack const &Track, glm::dvec3 const &Joint, bool const TTrack *neighbour_at(TTrack const &Track, int const Path, bool const Atend) { if (has_switch_paths(Track)) - return Atend ? Track.SwitchExtension->pNexts[Path & 1] : Track.SwitchExtension->pPrevs[Path & 1]; + return Atend ? Track.SwitchExtension->pNexts[Path & 1] : Track.SwitchExtension->pPrevs[Path & 1]; // NOSONAR return Atend ? Track.trNext : Track.trPrev; } diff --git a/model/Texture.cpp b/model/Texture.cpp index 27a8d68c4..f5b57ebb7 100644 --- a/model/Texture.cpp +++ b/model/Texture.cpp @@ -529,7 +529,7 @@ void opengl_texture::update_from_memory(size_t width, size_t height, const uint8 glDeleteTextures(1, &id); id = invalid_id; } - if (id == invalid_id) + if (id == invalid_id) // NOSONAR { data_width = width; data_height = height; diff --git a/scene/scenelayers.cpp b/scene/scenelayers.cpp index e78f9bf17..78a018953 100644 --- a/scene/scenelayers.cpp +++ b/scene/scenelayers.cpp @@ -1125,7 +1125,7 @@ std::string scene::node_layers::check_sources() const if (fine) ++good; else if (++bad <= 5) - report += " [" + node->name() + " " + std::to_string(source.span.begin) + "-" + std::to_string(source.span.end) + ": " + piece.substr(0, 60) + " ... " + (piece.size() > 30 ? piece.substr(piece.size() - 30) : std::string{}) + "]"; + report += " [" + node->name() + " " + std::to_string(source.span.begin) + "-" + std::to_string(source.span.end) + ": " + piece.substr(0, 60) + " ... " + (piece.size() > 30 ? piece.substr(piece.size() - 30) : std::string{}) + "]"; // NOSONAR } return std::to_string(good) + " good, " + std::to_string(bad) + " bad" + report; } diff --git a/scene/scenelayerssave.cpp b/scene/scenelayerssave.cpp index 15197b163..a07e2a3fb 100644 --- a/scene/scenelayerssave.cpp +++ b/scene/scenelayerssave.cpp @@ -714,7 +714,7 @@ save_result node_layers::save(std::vector const &Rootstatements, st auto const renamed{Model != nullptr && m_renamed.find(Node) != m_renamed.end()}; auto const *cell{Model == nullptr ? static_cast(Node) : nullptr}; auto const track{cell != nullptr && cell->Track != nullptr ? cell->Track->name() : std::string{}}; - if (false == (moved || rotated || scaled || renamed || (false == track.empty() && Node->dirty()))) + if (false == (moved || rotated || scaled || renamed || (false == track.empty() && Node->dirty()))) // NOSONAR { return true; } @@ -725,7 +725,7 @@ save_result node_layers::save(std::vector const &Rootstatements, st auto const &content{state.content[source.layer]}; if (source.span.end > static_cast(content.size())) { - state.error = "definition of \"" + Node->name() + "\" is out of bounds of file \"" + layer(source.layer).name + "\""; + state.error = "definition of \"" + Node->name() + "\" is out of bounds of file \"" + layer(source.layer).name + "\""; // NOSONAR return false; } auto text{content.substr(static_cast(source.span.begin), static_cast(source.span.end - source.span.begin))}; @@ -758,7 +758,7 @@ save_result node_layers::save(std::vector const &Rootstatements, st } if (false == patched) { - state.error = error + " of \"" + Node->name() + "\" in file \"" + layer(source.layer).name + "\""; + state.error = error + " of \"" + Node->name() + "\" in file \"" + layer(source.layer).name + "\""; // NOSONAR return false; } if (text.size() == static_cast(source.span.end - source.span.begin) && content.compare(static_cast(source.span.begin), text.size(), text) == 0) diff --git a/tools/editor/signal_headers.py b/tools/editor/signal_headers.py index c208406d1..000195eac 100644 --- a/tools/editor/signal_headers.py +++ b/tools/editor/signal_headers.py @@ -50,7 +50,7 @@ def statements(words, keyword): def examine(path, file): - raw = open(path, 'rb').read() + raw = open(path, 'rb').read() # NOSONAR try: text = raw.decode('utf-8') encoding = 'utf-8' @@ -219,15 +219,15 @@ def main(): if write: backup = os.path.join(sys.argv[1], 'editor_backup') - os.makedirs(backup, exist_ok=True) + os.makedirs(backup, exist_ok=True) # NOSONAR archive = os.path.join(backup, time.strftime('signals_%Y%m%d_%H%M%S.tar')) - with tarfile.open(archive, 'w') as tar: + with tarfile.open(archive, 'w') as tar: # NOSONAR for file, _ in done: - tar.add(os.path.join(root, file), arcname='scenery/' + file) + tar.add(os.path.join(root, file), arcname='scenery/' + file) # NOSONAR for file, info in done: content = rewrite(info) if content != info['raw']: - with open(os.path.join(root, file), 'wb') as out: + with open(os.path.join(root, file), 'wb') as out: # NOSONAR out.write(content) print('written, originals in', archive) return 0 diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index 92d03d570..55311b198 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -1410,7 +1410,7 @@ TController::TableUpdateEvent( double &Velocity, TCommandType &Command, TSpeedPo } // jeśli jest mienięty poprzedni semafor a wcześniej // byl nowy to go dorzucamy do zmiennej, żeby cały czas widział najbliższy - if( SemNextIndex == npos ) { + if( SemNextIndex == npos ) { // NOSONAR SemNextIndex = Pointindex; if( Global.iWriteLogEnabled & 8 ) { WriteLog( "Speed table update for " + OwnerName() + ", next semaphor is " + sSpeedTable[ SemNextIndex ].GetName() ); diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp index 707c13902..32ba307f7 100644 --- a/vehicle/DynObj.cpp +++ b/vehicle/DynObj.cpp @@ -1422,7 +1422,7 @@ TDynamicObject * TDynamicObject::ABuScanNearestObject(glm::vec3 pos, TTrack *Tra ActDist += CurrDist; if (ScanDir > 0) // do przodu { - if (Track->iNextDirection) + if (Track->iNextDirection) // NOSONAR { Track = Track->CurrentNext(); ScanDir = -ScanDir; @@ -1432,7 +1432,7 @@ TDynamicObject * TDynamicObject::ABuScanNearestObject(glm::vec3 pos, TTrack *Tra } else // do tyłu { - if (Track->iPrevDirection) + if (Track->iPrevDirection) // NOSONAR Track = Track->CurrentPrev(); else { From 35bda3778c8b7832fbe88c01e6aea8a8df62f802 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Fri, 9 Oct 2026 21:02:25 +0200 Subject: [PATCH 195/430] Heightmap terrain: .tch chunk packs, streaming with LOD, terrain painting, water and modifiers - terrain//terrain.yaml + _.tch packs of 16x16 chunks (250 m, 0.5/1/2/5 m spacing), slices with crc-32 and optional zstd (vendored zstd 1.5.6 in ref/zstd) - heightmap_terrain [name] endheightmap_terrain directive replaces editorterrain - streamer: worker threads, camera + look-ahead loading, geomipmap LOD with skirts, pooled geometry - mat_terrain shader: up to 8 painted layer materials per chunk via texture arrays (opengl33); other renderers fall back to the dominant material - water bodies (outline + level), terrain modifiers (vertical profile shaping kept non-destructive) - F11 Terrain work mode rebuilt: chunks, sculpt, smooth, paint, point spacing, water tools --- CMakeLists.txt | 8 +- application/editormode.cpp | 1087 +- application/editormode.h | 98 +- application/editormodeprofile.cpp | 292 +- application/editormodeviewport.cpp | 20 +- editor/editorTerrain.cpp | 459 +- editor/editorTerrain.hpp | 135 +- editor/editorTerrainStreamer.cpp | 1590 +- editor/editorTerrainStreamer.hpp | 275 +- model/material.cpp | 22 + model/material.h | 3 + ref/zstd/LICENSE | 30 + ref/zstd/README.txt | 9 + ref/zstd/zstd.c | 45229 +++++++++++++++++++++ ref/zstd/zstd.h | 3089 ++ rendering/opengl33renderer.cpp | 16 + rendering/opengl33renderer.h | 6 + rendering/opengl33terrain.cpp | 423 + rendering/opengl33terrain.h | 85 + rendering/renderer.cpp | 24 + rendering/renderer.h | 18 + scene/heightmapterrain.cpp | 1141 + scene/heightmapterrain.h | 241 + shaders/mat_terrain.frag | 134 + simulation/simulationstateserializer.cpp | 77 +- simulation/simulationstateserializer.h | 1 + 26 files changed, 52888 insertions(+), 1624 deletions(-) create mode 100644 ref/zstd/LICENSE create mode 100644 ref/zstd/README.txt create mode 100644 ref/zstd/zstd.c create mode 100644 ref/zstd/zstd.h create mode 100644 rendering/opengl33terrain.cpp create mode 100644 rendering/opengl33terrain.h create mode 100644 scene/heightmapterrain.cpp create mode 100644 scene/heightmapterrain.h create mode 100644 shaders/mat_terrain.frag diff --git a/CMakeLists.txt b/CMakeLists.txt index 332dd8328..366b2506a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -213,6 +213,7 @@ set(SOURCES "scene/scenelayers.cpp" "scene/scenelayerssave.cpp" "scene/sceneterrain.cpp" +"scene/heightmapterrain.cpp" "scene/scenemodelentries.cpp" "simulation/simulationenvironment.cpp" "simulation/simulationstateserializer.cpp" @@ -243,6 +244,7 @@ set(SOURCES "${DEPS_DIR}/glad/src/glad.c" "${DEPS_DIR}/dds-ktx/src/dds-ktx.c" +"${DEPS_DIR}/zstd/zstd.c" "gl/shader.cpp" "gl/vao.cpp" @@ -333,6 +335,7 @@ if (WITH_OPENGL_MODERN) "rendering/opengl33skydome.cpp" "rendering/opengl33precipitation.cpp" "rendering/opengl33particles.cpp" + "rendering/opengl33terrain.cpp" "rendering/opengl33renderer.cpp") set(DEFINITIONS ${DEFINITIONS} "WITH_OPENGL_MODERN") endif() @@ -460,6 +463,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE "gl" "${DEPS_DIR}/glad/include" "${DEPS_DIR}/dds-ktx/include" + "${DEPS_DIR}/zstd" "${CMAKE_BINARY_DIR}/geninc" "${GLOBAL_INCLUDE_DIR}") @@ -497,7 +501,7 @@ if(NOT ${CMAKE_VERSION} VERSION_LESS "3.16.0") if (USE_PCH) target_precompile_headers(${PROJECT_NAME} PRIVATE "$<$:${CMAKE_CURRENT_SOURCE_DIR}/stdafx.h>") - set_source_files_properties("/glad/src/glad.c" "ref/dds-ktx/src/dds-ktx.c" "stb/stb_image.c" + set_source_files_properties("/glad/src/glad.c" "ref/dds-ktx/src/dds-ktx.c" "ref/zstd/zstd.c" "stb/stb_image.c" "imgui/imgui.cpp" "imgui/imgui_demo.cpp" "imgui/imgui_draw.cpp" "imgui/imgui_widgets.cpp" "imgui/imgui_tables.cpp" "imgui/imgui_impl_glfw.cpp" "imgui/ImGuizmo.cpp" PROPERTIES SKIP_PRECOMPILE_HEADERS TRUE) endif() @@ -693,4 +697,4 @@ if(ENABLE_AVX2) else() target_compile_options(${PROJECT_NAME} PRIVATE -mavx2) endif() -endif() \ No newline at end of file +endif() \ No newline at end of file diff --git a/application/editormode.cpp b/application/editormode.cpp index cdd953276..4bf80d584 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -440,6 +440,8 @@ namespace } } } + // the heightmap terrain answers for itself, with its full grid whatever is drawn of it + EditorTerrain.gather_triangles(Min, Max, Out); trim_ground_meshes(); // going through the scenery is the one thing here which can take long enough to be felt; when it does it's worth knowing auto const elapsed = std::chrono::duration(std::chrono::steady_clock::now() - started).count(); @@ -1310,39 +1312,11 @@ bool editor_mode::update() // note: the streamer is advanced centrally in the application main loop (so it runs in every // mode), using the published Global.pCamera; nothing to do here - // continuous terrain sculpting while the left mouse button is held in sculpt mode - if (m_terrain_sculpt && mouseHold) - handle_terrain_sculpt(deltarealtime); - - // debounced auto mesh simplification: once sculpting has settled for a short while, simplify - // any chunk that was edited. holding the brush keeps the timer reset so we don't churn mid-stroke. - if (m_terrain_auto_optimize) - { - auto const terrains = active_terrains(); - bool any_dirty = false; - for (editor_terrain *terrain : terrains) - if (terrain->dirty()) - { - any_dirty = true; - break; - } - - if (!any_dirty || (m_terrain_sculpt && mouseHold)) - { - m_terrain_idle = 0.0; // actively editing (or nothing pending): hold off - } - else - { - m_terrain_idle += deltarealtime; - if (m_terrain_idle >= 0.5) // settle time - { - for (editor_terrain *terrain : terrains) - if (terrain->dirty()) - terrain->optimize(m_terrain_simplify_error); - m_terrain_idle = 0.0; - } - } - } + // the brush of the terrain works while the left mouse button is held + if (terrain_brush() && mouseHold) + handle_terrain_brush(deltarealtime); + if (m_terrain_open) + draw_terrain_overlay(); // --- geoportal orthophoto: streamed around the camera, drawn beneath the other overlays --- m_orthophoto.update(Camera.Pos); @@ -1480,172 +1454,364 @@ void editor_mode::render_settings() ImGui::End(); } +namespace +{ + // point spacings offered for the chunks, as the user reads them + char const *spacing_label(float const Spacing) + { + return Spacing < 0.75f ? "0.5 m" : Spacing < 1.5f ? "1 m" : Spacing < 3.f ? "2 m" : "5 m"; + } + + bool spacing_combo(char const *Label, float &Spacing) + { + bool changed = false; + ImGui::SetNextItemWidth(120.0f); + if (ImGui::BeginCombo(Label, spacing_label(Spacing))) + { + for (auto const spacing : heightmap::spacings) + if (ImGui::Selectable(spacing_label(spacing), spacing == Spacing)) + { + Spacing = spacing; + changed = true; + } + ImGui::EndCombo(); + } + return changed; + } + + // grid points without a height take the height of the nearest point which has one (by steps along the grid) + void fill_from_nearest(std::vector &Heights, std::vector &Found, std::size_t const Side) + { + std::deque queue; + for (std::size_t index = 0; index < Found.size(); ++index) + if (Found[index] != 0) + queue.push_back(index); + while (false == queue.empty()) + { + auto const index = queue.front(); + queue.pop_front(); + auto const ix = index % Side, iz = index / Side; + auto const visit = [&](std::size_t const Next) { + if (Found[Next] != 0) + return; + Found[Next] = 1; + Heights[Next] = Heights[index]; + queue.push_back(Next); + }; + if (ix > 0) + visit(index - 1); + if (ix + 1 < Side) + visit(index + 1); + if (iz > 0) + visit(index - Side); + if (iz + 1 < Side) + visit(index + Side); + } + } +} // namespace + void editor_mode::render_terrain_ui() { - ImGui::SetNextItemWidth(120.0f); - ImGui::InputInt(STR_C("Grid cells"), &m_terrain_cells); - m_terrain_cells = std::clamp(m_terrain_cells, 1, 512); - ImGui::SetNextItemWidth(120.0f); - ImGui::InputFloat(STR_C("Cell size (m)"), &m_terrain_cellsize); - if (m_terrain_cellsize < 0.1f) - m_terrain_cellsize = 0.1f; - ImGui::SetNextItemWidth(120.0f); - ImGui::InputFloat(STR_C("Base height (m)"), &m_terrain_baseheight); - ImGui::SetNextItemWidth(200.0f); - ImGui::InputText(STR_C("Texture (optional)"), m_terrain_texture, IM_ARRAYSIZE(m_terrain_texture)); - - if (ImGui::Button(STR_C("Create flat terrain"))) + if (false == m_streamer.active()) { - // centre the new patch horizontally on the camera, flat at the requested base height - glm::dvec3 const center(Camera.Pos.x, static_cast(m_terrain_baseheight), Camera.Pos.z); - auto terrain = std::make_unique(); - if (terrain->create(center, m_terrain_cells, m_terrain_cellsize, std::string(m_terrain_texture))) - { - if (m_terrain_auto_optimize) - terrain->optimize(m_terrain_simplify_error); - m_terrains.push_back(std::move(terrain)); - } - else - WriteLog("Editor: failed to create terrain", logtype::generic); + ImGui::TextWrapped("%s", STR_C("The scenery has no heightmap terrain yet. It's kept in the folder terrain// of the simulator, " + "and written there when the scenery is saved.")); + if (ImGui::Button(STR_C("Make heightmap terrain for this scenery"))) + ensure_terrain(); + return; } + ImGui::TextDisabled(STR_C("Folder: %s"), m_streamer.directory().c_str()); + ImGui::TextDisabled(STR_C("Chunks in memory: %zu%s"), m_streamer.resident(), m_streamer.modified() ? STR_C(", changes not saved yet") : ""); - ImGui::SetNextItemWidth(120.0f); - ImGui::InputInt(STR_C("Chunks / side"), &m_terrain_chunks); - m_terrain_chunks = std::clamp(m_terrain_chunks, 1, 32); + // what the left mouse button does + auto tool = static_cast(m_terrain_tool); + auto const radio = [&](char const *Label, terrain_tool const Tool, char const *Tooltip) { + ImGui::RadioButton(Label, &tool, static_cast(Tool)); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", Tooltip); + }; + radio(STR_C("Select"), terrain_tool::none, STR_C("LMB picks the models, as in the surroundings")); ImGui::SameLine(); - if (ImGui::Button(STR_C("Create chunked terrain"))) - create_chunked_terrain(); - ImGui::TextDisabled(STR_C("total %d x %d m, %d chunks"), - static_cast(m_terrain_chunks * m_terrain_cells * m_terrain_cellsize), - static_cast(m_terrain_chunks * m_terrain_cells * m_terrain_cellsize), - m_terrain_chunks * m_terrain_chunks); + radio(STR_C("Chunks"), terrain_tool::chunks, STR_C("LMB adds a chunk shaped as the ground under it, next to the clicked one; Shift+LMB removes the clicked chunk")); + ImGui::SameLine(); + radio(STR_C("Spacing"), terrain_tool::spacing, STR_C("LMB gives the clicked chunk the point spacing chosen below, the ground resampled")); + radio(STR_C("Sculpt"), terrain_tool::sculpt, STR_C("LMB raises the terrain under the brush, Shift+LMB lowers it")); + ImGui::SameLine(); + radio(STR_C("Smooth"), terrain_tool::smooth, STR_C("LMB evens the terrain out under the brush")); + ImGui::SameLine(); + radio(STR_C("Paint"), terrain_tool::paint, STR_C("LMB paints the material chosen in the palette, Shift+LMB the first material of the palette")); + ImGui::SameLine(); + radio(STR_C("Water"), terrain_tool::water, STR_C("LMB adds a point of the outline of a body of water, Shift+LMB takes the last one back")); + m_terrain_tool = static_cast(tool); - if (ImGui::Checkbox(STR_C("Chunk edit mode (LMB add neighbour / Shift = delete)"), &m_chunk_edit)) - if (m_chunk_edit) - m_terrain_sculpt = false; // mutually exclusive with sculpting - ImGui::Text(STR_C("Grid chunks: %zu"), m_grid_chunks.size()); - - ImGui::Separator(); - ImGui::TextUnformatted(STR_C("Streaming (open world, follows camera)")); - ImGui::SetNextItemWidth(120.0f); - ImGui::InputInt(STR_C("Stream radius"), &m_stream_radius); - m_stream_radius = std::clamp(m_stream_radius, 0, 16); - ImGui::Checkbox(STR_C("Persist edits to disk (16-bit)"), &m_stream_persist); - bool streaming = m_streamer.active(); - if (ImGui::Checkbox(STR_C("Stream terrain"), &streaming)) + if (ImGui::CollapsingHeader(STR_C("Chunks"), ImGuiTreeNodeFlags_DefaultOpen)) { - if (streaming) - { - // per-scenery chunk folder so chunks from different sceneries don't collide - std::string scenery = Global.SceneryFile; - auto const slash = scenery.find_last_of("/\\"); - if (slash != std::string::npos) - scenery = scenery.substr(slash + 1); - auto const dot = scenery.find_last_of('.'); - if (dot != std::string::npos) - scenery = scenery.substr(0, dot); - if (scenery.empty()) - scenery = "default"; - m_streamer.directory("editor_terrain/" + scenery); - - m_streamer.configure(m_terrain_cells, m_terrain_cellsize, m_stream_radius, - m_terrain_baseheight, std::string(m_terrain_texture)); - m_streamer.simplify(m_terrain_auto_optimize, m_terrain_simplify_error); - m_streamer.persist(m_stream_persist); - - // hand the authored grid chunks over to streaming: persist them to disk, then drop the - // in-memory meshes so the streamer owns residency (it loads them back within the radius) - for (auto &entry : m_grid_chunks) - if (entry.second) - m_streamer.save_chunk(entry.first.first, entry.first.second, *entry.second); - for (auto &entry : m_grid_chunks) - if (entry.second) - entry.second->destroy(); - m_grid_chunks.clear(); - } - else - { - m_streamer.clear(); // saves modified chunks before dropping them - } - m_streamer.active(streaming); - } - if (m_streamer.active()) - { - // radius / simplify / persist are safe to tweak live; chunk size/base are fixed at toggle - m_streamer.radius(m_stream_radius); - m_streamer.simplify(m_terrain_auto_optimize, m_terrain_simplify_error); - m_streamer.persist(m_stream_persist); - ImGui::Text(STR_C("Resident chunks: %zu (dir: %s)"), m_streamer.resident(), m_streamer.directory().c_str()); - } - - ImGui::Text(STR_C("Patches: %zu"), m_terrains.size()); - - // capture: sample the selected model's geometry into an editable patch and remove the original - if (dynamic_cast(m_node) != nullptr) - { - if (ImGui::Button(STR_C("Capture selected model as terrain"))) - capture_terrain(); - } - else - { - ImGui::TextDisabled(STR_C("Capture: select a model instance first")); - } - - std::vector const terrains = active_terrains(); - if (!terrains.empty()) - { - ImGui::Separator(); - if (ImGui::Checkbox((std::string(m_terrain_brush_smooth ? STR_C("Sculpt mode (LMB smooth)") : STR_C("Sculpt mode (LMB raise / Shift = lower)")) + "###sculptmode").c_str(), &m_terrain_sculpt)) - if (m_terrain_sculpt) - m_chunk_edit = false; // mutually exclusive with chunk editing - int brush = m_terrain_brush_smooth ? 1 : 0; - ImGui::RadioButton(STR_C("Raise / lower"), &brush, 0); + if (spacing_combo(STR_C("Point spacing"), m_terrain_spacing)) + m_streamer.default_spacing(m_terrain_spacing); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Spacing of the grid points of the chunks made, and the one the spacing tool gives the clicked chunk.\n" + "A chunk is 250 x 250 m; finer grids take more memory and time to draw.")); + ImGui::SetNextItemWidth(120.0f); + ImGui::InputFloat(STR_C("Base height (m)"), &m_terrain_baseheight, 0.0f, 0.0f, "%.2f"); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Height of the chunks made where there's no ground under them")); + ImGui::SetNextItemWidth(120.0f); + ImGui::InputInt(STR_C("Chunks along a side"), &m_terrain_add_count); + m_terrain_add_count = std::clamp(m_terrain_add_count, 1, 8); ImGui::SameLine(); - ImGui::RadioButton(STR_C("Smooth"), &brush, 1); - m_terrain_brush_smooth = (brush == 1); - if (m_terrain_brush_smooth && ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("Evens out the ground under the brush: bumps and sharp edges go, the shape stays.\nThe strength sets how fast")); - ImGui::SetNextItemWidth(120.0f); - ImGui::InputFloat(STR_C("Brush radius"), &m_terrain_brush_radius); - if (m_terrain_brush_radius < 0.5f) - m_terrain_brush_radius = 0.5f; - ImGui::SetNextItemWidth(120.0f); - ImGui::InputFloat(STR_C("Brush strength"), &m_terrain_brush_strength); - - // one-shot nudge of the most recent manual patch at its centre, handy for a quick test - if (!m_terrains.empty()) + if (ImGui::Button(STR_C("Add around the camera"))) + add_chunks_around(m_terrain_add_count); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Makes the chunks missing around the camera, shaped as the ground under them")); + render_ground_conversion(); + if (dynamic_cast(m_node) != nullptr) { - auto &terrain = m_terrains.back(); - glm::dvec3 const c = terrain->centre(); - if (ImGui::Button(STR_C("Raise centre"))) - terrain->sculpt(c.x, c.z, m_terrain_brush_radius, m_terrain_brush_strength); + if (ImGui::Button(STR_C("Capture the selected model as terrain"))) + capture_terrain(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("The chunks under the model take its shape, and the model is removed")); + } + } + + if (terrain_brush() && ImGui::CollapsingHeader(STR_C("Brush"), ImGuiTreeNodeFlags_DefaultOpen)) + { + ImGui::SetNextItemWidth(120.0f); + ImGui::DragFloat(STR_C("Radius (m)"), &m_terrain_brush_radius, 0.25f, 0.5f, 500.0f, "%.1f"); + m_terrain_brush_radius = std::max(0.5f, m_terrain_brush_radius); + ImGui::SetNextItemWidth(120.0f); + ImGui::DragFloat(STR_C("Strength"), &m_terrain_brush_strength, 0.05f, 0.05f, 50.0f, "%.2f"); + m_terrain_brush_strength = std::max(0.05f, m_terrain_brush_strength); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Sculpting: metres per second at the middle of the brush; smoothing and painting: how fast they work")); + } + + if (ImGui::CollapsingHeader(STR_C("Materials"), m_terrain_tool == terrain_tool::paint ? ImGuiTreeNodeFlags_DefaultOpen : 0)) + { + auto const &layers{m_streamer.manifest().layers}; + m_terrain_layer = std::clamp(m_terrain_layer, 0, static_cast(layers.size()) - 1); + for (std::size_t i = 0; i < layers.size(); ++i) + { + auto const label{layers[i].size > 0.f ? format("%zu: %s (%.1f m)", i, layers[i].material.c_str(), layers[i].size) : format("%zu: %s", i, layers[i].material.c_str())}; + if (ImGui::Selectable(label.c_str(), static_cast(i) == m_terrain_layer)) + m_terrain_layer = static_cast(i); + } + if (false == layers.empty()) + { + auto size{layers[m_terrain_layer].size}; + ImGui::SetNextItemWidth(120.0f); + ImGui::DragFloat(STR_C("Repeats every (m)"), &size, 0.1f, 0.0f, 200.0f, "%.1f"); + if (ImGui::IsItemDeactivatedAfterEdit()) + m_streamer.layer_size(static_cast(m_terrain_layer), size); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Metres the textures of the chosen material repeat at; 0: as the material gives it, or 8 m")); + } + ImGui::SetNextItemWidth(160.0f); + ImGui::InputText(STR_C("Material"), m_terrain_material, IM_ARRAYSIZE(m_terrain_material)); + ImGui::SameLine(); + if (ImGui::Button(STR_C("Add to the palette")) && m_terrain_material[0] != '\0') + m_terrain_layer = m_streamer.layer(m_terrain_material, m_terrain_material_size); + ImGui::TextDisabled("%s", STR_C("New chunks are covered with the first material. A chunk holds up to 8 of them.")); + } + + if (ImGui::CollapsingHeader(STR_C("Water"), m_terrain_tool == terrain_tool::water ? ImGuiTreeNodeFlags_DefaultOpen : 0)) + { + if (m_terrain_tool == terrain_tool::water) + { + ImGui::Text(STR_C("Outline: %zu points"), m_water_points.size()); + ImGui::SetNextItemWidth(120.0f); + if (ImGui::DragFloat(STR_C("Level (m)"), &m_water_level, 0.01f, -1000.0f, 5000.0f, "%.2f")) + m_water_level_edited = true; + ImGui::SetNextItemWidth(160.0f); + ImGui::InputText(STR_C("Material##water"), m_water_material, IM_ARRAYSIZE(m_water_material)); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip(STR_C("Empty: %s, the water material of the terrain"), m_streamer.manifest().water_material.c_str()); + ImGui::BeginDisabled(m_water_points.size() < 3); + if (ImGui::Button(STR_C("Make the water"))) + { + auto water{m_streamer.water()}; + heightmap::water_body body; + body.name = format("water %zu", water.size() + 1); + body.level = m_water_level; + body.material = m_water_material; + for (auto const &point : m_water_points) + body.outline.emplace_back(point.x, point.z); + water.push_back(std::move(body)); + m_streamer.water(std::move(water)); + m_water_selected = static_cast(m_streamer.water().size()) - 1; + m_water_points.clear(); + m_water_level_edited = false; + } + ImGui::EndDisabled(); ImGui::SameLine(); - if (ImGui::Button(STR_C("Lower centre"))) - terrain->sculpt(c.x, c.z, m_terrain_brush_radius, -m_terrain_brush_strength); + if (ImGui::Button(STR_C("Clear the outline"))) + { + m_water_points.clear(); + m_water_level_edited = false; + } } - - ImGui::Separator(); - ImGui::TextUnformatted(STR_C("Optimize (mesh simplification, all patches)")); - ImGui::SetNextItemWidth(120.0f); - ImGui::InputFloat(STR_C("Flatness tol (m)"), &m_terrain_simplify_error); - if (m_terrain_simplify_error < 0.01f) - m_terrain_simplify_error = 0.01f; - ImGui::Checkbox(STR_C("Auto-optimize after sculpt"), &m_terrain_auto_optimize); - if (ImGui::Button(STR_C("Optimize all"))) - for (editor_terrain *t : terrains) - t->optimize(m_terrain_simplify_error); - ImGui::SameLine(); - if (ImGui::Button(STR_C("Full-res all"))) - for (editor_terrain *t : terrains) - t->unoptimize(); - - std::size_t tris = 0, full = 0; - for (editor_terrain *t : terrains) + auto const &water{m_streamer.water()}; + std::optional removed; + for (std::size_t i = 0; i < water.size(); ++i) { - tris += t->triangles(); - full += t->full_triangles(); + ImGui::PushID(static_cast(i)); + if (ImGui::Selectable(format("%s, %.2f m, %zu points", water[i].name.c_str(), water[i].level, water[i].outline.size()).c_str(), static_cast(i) == m_water_selected)) + m_water_selected = static_cast(i); + ImGui::PopID(); + } + if (m_water_selected >= 0 && m_water_selected < static_cast(water.size())) + { + // the level is changed in the water once the dragging ends + if (false == m_water_level_dragged) + m_water_selected_level = static_cast(water[m_water_selected].level); + ImGui::SetNextItemWidth(120.0f); + ImGui::DragFloat(STR_C("Level of the chosen (m)"), &m_water_selected_level, 0.01f, -1000.0f, 5000.0f, "%.2f"); + m_water_level_dragged = ImGui::IsItemActive(); + if (ImGui::IsItemDeactivatedAfterEdit()) + { + auto changed{water}; + changed[m_water_selected].level = m_water_selected_level; + m_streamer.water(std::move(changed)); + } + if (ImGui::Button(STR_C("Remove the chosen water"))) + removed = static_cast(m_water_selected); + } + if (removed) + { + auto changed{water}; + changed.erase(changed.begin() + *removed); + m_streamer.water(std::move(changed)); + m_water_selected = -1; + } + } + + if (ImGui::CollapsingHeader(STR_C("Modifiers"))) + { + auto const &modifiers{m_streamer.modifiers()}; + if (modifiers.empty()) + ImGui::TextWrapped("%s", STR_C("None. The vertical profile of the tracks makes them: the terrain follows the formation and the slopes of the route.")); + std::optional removed; + for (auto const &modifier : modifiers) + { + ImGui::PushID(modifier.name.c_str()); + ImGui::TextUnformatted(format("%s, %zu points", modifier.name.c_str(), modifier.points.size()).c_str()); + ImGui::SameLine(); + if (ImGui::SmallButton(STR_C("Remove"))) + removed = modifier.name; + ImGui::PopID(); + } + if (removed) + { + m_streamer.remove_modifier(*removed); + ground_tiles.clear(); + forget_ground_shapes(); + } + } + + if (ImGui::CollapsingHeader(STR_C("Drawing and files"))) + { + auto detail{m_streamer.detail()}; + ImGui::SetNextItemWidth(160.0f); + if (ImGui::SliderFloat(STR_C("Detail"), &detail, 30.0f, 400.0f, "%.0f")) + m_streamer.detail(detail); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("How far the full grid of the chunks reaches: metres of distance per metre of the drawn grid. Further away the grid is coarser")); + bool compress{m_streamer.manifest().compress}; + if (ImGui::Checkbox(STR_C("Compress the files (zstd)"), &compress)) + m_streamer.compress(compress); + ImGui::TextDisabled("%s", STR_C("The terrain is written with the scenery (Ctrl+S).")); + } + if (false == m_terrain_status.empty()) + ImGui::TextWrapped("%s", m_terrain_status.c_str()); +} + +void editor_mode::draw_terrain_overlay() +{ + if (false == m_streamer.active()) + return; + screen_projection const projection; + auto *drawlist = ImGui::GetBackgroundDrawList(); + glm::dvec3 const offset = GfxRenderer->Mouse_Position(); + bool const hovering = glm::length(offset) > 1e-3 && false == ImGui::GetIO().WantCaptureMouse; + glm::dvec3 const cursor = Camera.Pos + offset; + auto const ground = [&](double const X, double const Z, double const Fallback) { + double height; + return m_streamer.height_at(X, Z, height) ? height : Fallback; + }; + auto const polyline = [&](std::vector const &Points, ImU32 const Color, bool const Closed, float const Thickness) { + auto const count = Points.size(); + for (std::size_t i = 0; i + (Closed ? 0 : 1) < count; ++i) + { + ImVec2 from, to; + if (projection.project(Points[i], from) && projection.project(Points[(i + 1) % count], to)) + drawlist->AddLine(from, to, Color, Thickness); + } + }; + + if (terrain_brush() && hovering) + { + std::vector circle; + for (int i = 0; i < 64; ++i) + { + auto const angle = i * 6.283185307179586 / 64.0; + auto const x = cursor.x + std::cos(angle) * m_terrain_brush_radius; + auto const z = cursor.z + std::sin(angle) * m_terrain_brush_radius; + circle.emplace_back(x, ground(x, z, cursor.y) + 0.1, z); + } + auto const color = m_terrain_tool == terrain_tool::paint ? IM_COL32(120, 230, 120, 220) : m_terrain_tool == terrain_tool::smooth ? IM_COL32(120, 200, 255, 220) : IM_COL32(255, 180, 80, 220); + polyline(circle, color, true, 2.0f); + } + if ((m_terrain_tool == terrain_tool::chunks || m_terrain_tool == terrain_tool::spacing) && hovering) + { + auto const key = heightmap::chunk_at(cursor.x, cursor.z); + auto const exists = m_streamer.exists(key); + auto const low = heightmap::chunk_corner(key); + std::vector square; + auto const edge = [&](glm::dvec2 const &From, glm::dvec2 const &To) { + for (int i = 0; i < 25; ++i) + { + auto const point = From + (To - From) * (i / 25.0); + square.emplace_back(point.x, ground(point.x, point.y, cursor.y) + 0.2, point.y); + } + }; + auto const size = heightmap::chunk_size; + edge(low, low + glm::dvec2{size, 0.0}); + edge(low + glm::dvec2{size, 0.0}, low + glm::dvec2{size}); + edge(low + glm::dvec2{size}, low + glm::dvec2{0.0, size}); + edge(low + glm::dvec2{0.0, size}, low); + polyline(square, exists ? IM_COL32(255, 255, 255, 200) : IM_COL32(255, 230, 90, 200), true, 2.0f); + ImVec2 label; + if (exists && projection.project(cursor, label)) + { + auto const *chunk = m_streamer.terrain_at(cursor.x, cursor.z); + if (chunk != nullptr) + { + auto const text = (m_terrain_tool == terrain_tool::spacing ? format("%s -> %s", spacing_label(static_cast(chunk->data().spacing())), spacing_label(m_terrain_spacing)) + : std::string(spacing_label(static_cast(chunk->data().spacing())))); + drawlist->AddText(ImVec2(label.x + 14.0f, label.y - 14.0f), IM_COL32(255, 255, 255, 230), text.c_str()); + } + } + } + // the bodies of water, and the one being outlined + auto const &water = m_streamer.water(); + for (std::size_t i = 0; i < water.size(); ++i) + { + std::vector outline; + for (auto const &point : water[i].outline) + outline.emplace_back(point.x, water[i].level, point.y); + polyline(outline, static_cast(i) == m_water_selected ? IM_COL32(120, 200, 255, 255) : IM_COL32(60, 120, 220, 160), true, static_cast(i) == m_water_selected ? 2.5f : 1.5f); + } + if (m_terrain_tool == terrain_tool::water && false == m_water_points.empty()) + { + std::vector outline; + for (auto const &point : m_water_points) + outline.emplace_back(point.x, m_water_level, point.z); + polyline(outline, IM_COL32(120, 220, 255, 255), m_water_points.size() >= 3, 2.0f); + for (auto const &point : outline) + { + ImVec2 dot; + if (projection.project(point, dot)) + drawlist->AddCircleFilled(dot, 4.0f, IM_COL32(120, 220, 255, 255)); } - ImGui::Text(STR_C("Triangles: %zu / %zu"), tris, full); } } @@ -1769,7 +1935,7 @@ void editor_mode::render_orthophoto_ui() if (ImGui::Checkbox(STR_C("Fit to terrain"), &config.drape)) changed = persist = true; if (ImGui::IsItemHovered()) - ImGui::SetTooltip(STR_C("Lays the imagery onto the ground geometry (terrain shapes, terrain tile models, editor terrain).\n" + ImGui::SetTooltip(STR_C("Lays the imagery onto the ground geometry (terrain shapes, terrain tile models, heightmap terrain).\n" "Places without any ground use the height below.")); if (config.drape) { @@ -1926,48 +2092,164 @@ void editor_mode::draw_ortho_compass() const letter("W", west, IM_COL32(230, 230, 230, 230)); } +void editor_mode::forget_ground() +{ + ground_tiles.clear(); + forget_ground_shapes(); +} + editor_terrain *editor_mode::terrain_at(double X, double Z) { - for (auto &terrain : m_terrains) - if (terrain && terrain->contains(X, Z)) - return terrain.get(); - double const size = chunk_grid_size(); - auto const it = m_grid_chunks.find({static_cast(std::floor(X / size)), static_cast(std::floor(Z / size))}); - if (it != m_grid_chunks.end() && it->second && it->second->contains(X, Z)) - return it->second.get(); return m_streamer.terrain_at(X, Z); } std::vector editor_mode::active_terrains() { std::vector out; - out.reserve(m_terrains.size() + m_grid_chunks.size() + m_streamer.resident()); - for (auto &terrain : m_terrains) - if (terrain) - out.push_back(terrain.get()); - for (auto &entry : m_grid_chunks) - if (entry.second) - out.push_back(entry.second.get()); + out.reserve(m_streamer.resident()); m_streamer.collect(out); return out; } -void editor_mode::add_grid_chunk(int Cx, int Cz) +bool editor_mode::ensure_terrain() { - std::pair const key{Cx, Cz}; - if (m_grid_chunks.count(key)) - return; // already occupied + if (m_streamer.active()) + return true; + auto const name = scenery_stem(); + if (name.empty()) + return false; + m_streamer.open(name); + m_terrain_spacing = m_streamer.manifest().spacing; + return m_streamer.active(); +} - double const size = chunk_grid_size(); - int const cells = std::clamp(m_terrain_cells, 1, 256); - glm::dvec3 const center((Cx + 0.5) * size, static_cast(m_terrain_baseheight), (Cz + 0.5) * size); +bool editor_mode::add_chunk_from_ground(heightmap::chunk_key const &Key, float const Spacing, std::uint16_t const Layer) +{ + if (m_streamer.exists(Key)) + return false; + auto const low = heightmap::chunk_corner(Key); + auto const high = low + glm::dvec2{heightmap::chunk_size}; + // the ground under the chunk, the edges of the neighbouring chunks included, so the new one meets them + std::vector triangles; + gather_ground_triangles(low - glm::dvec2{1.0}, high + glm::dvec2{1.0}, true, 50.0f, triangles, true); + triangle_grid const ground(std::move(triangles), low - glm::dvec2{1.0}, high + glm::dvec2{1.0}); + auto const cells = heightmap::cells_for(Spacing); + auto const side = static_cast(cells) + 1; + auto const step = heightmap::chunk_size / cells; + std::vector heights(side * side, 0.0); + std::vector found(side * side, 0); + bool any = false; + for (std::size_t iz = 0; iz < side; ++iz) + for (std::size_t ix = 0; ix < side; ++ix) + { + auto const index = iz * side + ix; + if (ground.height_at(low.x + ix * step, low.y + iz * step, std::numeric_limits::max(), heights[index])) + found[index] = 1, any = true; + } + // past the edge of the ground the chunk is carried on level with the nearest point of it + if (any) + fill_from_nearest(heights, found, side); + else + std::fill(heights.begin(), heights.end(), m_terrain_baseheight); + auto const added = m_streamer.add_chunk(Key.first, Key.second, Spacing, [&](double const X, double const Z) { + auto const ix = static_cast(std::clamp(std::lround((X - low.x) / step), 0, cells)); + auto const iz = static_cast(std::clamp(std::lround((Z - low.y) / step), 0, cells)); + return static_cast(heights[iz * side + ix]); + }, Layer); + if (added) + { + ground_tiles.clear(); + forget_ground_shapes(); + } + return added; +} - auto terrain = std::make_unique(); - if (!terrain->create(center, cells, m_terrain_cellsize, std::string(m_terrain_texture))) +void editor_mode::add_chunks_around(int const Count) +{ + if (false == ensure_terrain()) return; - if (m_terrain_auto_optimize) - terrain->optimize(m_terrain_simplify_error); - m_grid_chunks[key] = std::move(terrain); + auto const centre = heightmap::chunk_at(Camera.Pos.x, Camera.Pos.z); + auto const first = -(Count - 1) / 2; + int made = 0; + for (int dz = 0; dz < Count; ++dz) + for (int dx = 0; dx < Count; ++dx) + if (add_chunk_from_ground({centre.first + first + dx, centre.second + first + dz}, m_terrain_spacing)) + ++made; + m_terrain_status = format(STR_C("%d chunks made"), made); +} + +void editor_mode::handle_terrain_click(bool const Shift) +{ + glm::dvec3 const offset = GfxRenderer->Mouse_Position(); + if (glm::length(offset) < 1e-3) + return; // nothing under the cursor (yet) + glm::dvec3 const world = Camera.Pos + offset; + switch (m_terrain_tool) + { + case terrain_tool::chunks: + { + if (false == ensure_terrain()) + return; + auto const key = heightmap::chunk_at(world.x, world.z); + if (Shift) + { + if (m_streamer.exists(key)) + { + m_streamer.remove_chunk(key.first, key.second); + ground_tiles.clear(); + forget_ground_shapes(); + m_terrain_status = format(STR_C("Chunk %d,%d removed"), key.first, key.second); + } + return; + } + // a click on a chunk adds the neighbour by the nearest edge, a click outside fills the clicked place + auto target = key; + if (m_streamer.exists(key)) + { + auto const low = heightmap::chunk_corner(key); + double const west = world.x - low.x, east = heightmap::chunk_size - west, south = world.z - low.y, north = heightmap::chunk_size - south; + double const nearest = std::min({west, east, south, north}); + if (nearest == west) + --target.first; + else if (nearest == east) + ++target.first; + else if (nearest == south) + --target.second; + else + ++target.second; + } + m_terrain_status = add_chunk_from_ground(target, m_terrain_spacing) ? format(STR_C("Chunk %d,%d made"), target.first, target.second) : std::string(STR_C("There's a chunk there already")); + break; + } + case terrain_tool::spacing: + { + auto const key = heightmap::chunk_at(world.x, world.z); + if (false == m_streamer.exists(key)) + return; + m_streamer.spacing(key.first, key.second, m_terrain_spacing); + ground_tiles.clear(); + forget_ground_shapes(); + m_terrain_status = format(STR_C("Chunk %d,%d has points every %s now"), key.first, key.second, spacing_label(m_terrain_spacing)); + break; + } + case terrain_tool::water: + { + if (Shift) + { + if (false == m_water_points.empty()) + m_water_points.pop_back(); + return; + } + auto const point = placement_on_ground(world); + // the water reaches the lowest point of its shore, unless given by hand + if (false == m_water_level_edited) + m_water_level = m_water_points.empty() ? static_cast(point.y) : std::min(m_water_level, static_cast(point.y)); + m_water_points.push_back(point); + break; + } + default: + break; + } } namespace @@ -2045,16 +2327,14 @@ std::string editor_mode::convert_ground(std::set const &Materia { if (simulation::Region == nullptr || Materials.empty()) return {}; - bool const streaming = m_streamer.active(); - double const size = streaming ? m_streamer.cells() * m_streamer.cellsize() : chunk_grid_size(); - int const cells = streaming ? m_streamer.cells() : std::clamp(m_terrain_cells, 1, 256); + if (false == ensure_terrain()) + return STR_C("The heightmap terrain can't be opened"); + double const size = heightmap::chunk_size; + int const cells = heightmap::cells_for(m_terrain_spacing); double const cellsize = size / cells; - if (size <= 0.0) - return {}; - std::set own; - for (auto *terrain : active_terrains()) - own.insert(geometry_key(terrain->geometry())); + // the shapes of the heightmap terrain hold no triangles of their own, nothing to leave out + std::set const own; std::vector triangles; std::vector materials; glm::dvec2 const everywhere{std::numeric_limits::max() * 0.5}; @@ -2081,7 +2361,7 @@ std::string editor_mode::convert_ground(std::set const &Materia buckets[{x, z}].push_back(i); } - // the terrain of the editor has a single texture, saved with it: the material which covers the most + // the chunks are covered with the material which covers the most; it goes to the palette of the terrain std::map coverage; for (std::size_t i = 0; i < triangles.size(); ++i) { @@ -2089,19 +2369,9 @@ std::string editor_mode::convert_ground(std::set const &Materia coverage[materials[i]] += 0.5 * std::abs((t[1].x - t[0].x) * (t[2].z - t[0].z) - (t[2].x - t[0].x) * (t[1].z - t[0].z)); } auto const dominant = std::max_element(coverage.begin(), coverage.end(), [](auto const &A, auto const &B) { return A.second < B.second; })->first; + std::uint16_t layer = 0; if (auto const *material = GfxRenderer->Material(dominant)) - { - auto const name = material->GetName(); - std::snprintf(m_terrain_texture, sizeof(m_terrain_texture), "%s", name.c_str()); - } - std::string const texture(m_terrain_texture); - // a whole scenery of the full grid would be a lot to draw - m_terrain_auto_optimize = true; - if (streaming) - { - m_streamer.simplify(true, m_terrain_simplify_error); - m_streamer.configure(m_streamer.cells(), m_streamer.cellsize(), m_streamer.radius(), m_terrain_baseheight, texture); - } + layer = m_streamer.layer(material->GetName()); // the old ground goes first, so what's made in its place isn't taken for it auto const dropped = drop_scenery_shapes(own, Materials); @@ -2110,220 +2380,50 @@ std::string editor_mode::convert_ground(std::set const &Materia for (auto const &bucket : buckets) { auto const &key = bucket.first; - glm::dvec2 const low{key.first * size, key.second * size}; - glm::dvec2 const middle{low + glm::dvec2{size * 0.5}}; - if (streaming ? m_streamer.terrain_at(middle.x, middle.y) != nullptr : m_grid_chunks.count(key) > 0) + if (m_streamer.exists(key)) { ++skipped; continue; } + glm::dvec2 const low{key.first * size, key.second * size}; std::vector local; for (auto const i : bucket.second) local.push_back(triangles[i]); triangle_grid const ground(std::move(local), low - glm::dvec2{1.0}, low + glm::dvec2{size + 1.0}); std::vector heights(side * side, 0.0); std::vector found(side * side, 0); - std::vector known; + bool any = false; for (std::size_t iz = 0; iz < side; ++iz) for (std::size_t ix = 0; ix < side; ++ix) { auto const index = iz * side + ix; if (ground.height_at(low.x + ix * cellsize, low.y + iz * cellsize, std::numeric_limits::max(), heights[index])) - { - found[index] = 1; - known.push_back(index); - } + found[index] = 1, any = true; } - if (known.empty()) + if (false == any) continue; - // at the edge of the ground the chunk is carried on level with the nearest point of it - if (known.size() < heights.size()) - for (std::size_t index = 0; index < heights.size(); ++index) - { - if (found[index] != 0) - continue; - double best = std::numeric_limits::max(); - for (auto const other : known) - { - double const dx = static_cast(index % side) - static_cast(other % side); - double const dz = static_cast(index / side) - static_cast(other / side); - if (dx * dx + dz * dz < best) - { - best = dx * dx + dz * dz; - heights[index] = heights[other]; - } - } - } - auto const sampler = [&](double X, double Z, double &OutY) { + fill_from_nearest(heights, found, side); + auto const sampler = [&](double X, double Z) { auto const ix = static_cast(std::clamp(std::lround((X - low.x) / cellsize), 0, cells)); auto const iz = static_cast(std::clamp(std::lround((Z - low.y) / cellsize), 0, cells)); - OutY = heights[iz * side + ix]; - return true; + return static_cast(heights[iz * side + ix]); }; - if (streaming) - { - m_streamer.add_chunk(key.first, key.second); - if (auto *terrain = m_streamer.terrain_at(middle.x, middle.y)) - { - terrain->reshape([&](double X, double Z, float &Height) { - double y; - sampler(X, Z, y); - Height = static_cast(y); - return true; - }); - ++made; - } - } - else - { - auto chunk = std::make_unique(); - if (chunk->create(glm::dvec3{middle.x, m_terrain_baseheight, middle.y}, cells, static_cast(cellsize), texture, sampler)) - { - // the full grid everywhere would be a lot to draw; the simplified one keeps it exact where it matters - chunk->optimize(m_terrain_simplify_error); - m_grid_chunks[key] = std::move(chunk); - ++made; - } - } + if (m_streamer.add_chunk(key.first, key.second, m_terrain_spacing, sampler, layer)) + ++made; } ground_tiles.clear(); forget_ground_shapes(); auto const erased = scene::Layers.erase_shapes(Materials); - auto summary = format(STR_C("Ground converted: %zu chunks of editor terrain made, %zu shapes taken out of the scene, %zu triangle nodes go from the scenery files on save"), made, dropped, erased.first); + auto summary = format(STR_C("Ground converted: %zu chunks of heightmap terrain made, %zu shapes taken out of the scene, %zu triangle nodes go from the scenery files on save"), made, dropped, erased.first); if (skipped > 0) - summary += format(STR_C(", %zu chunks kept as there was editor terrain already"), skipped); + summary += format(STR_C(", %zu chunks kept as there was terrain already"), skipped); if (erased.second > 0) summary += format(STR_C(", %zu nodes stay as their files can't be rewritten"), erased.second); WriteLog("Editor: " + summary, logtype::generic); return summary; } -void editor_mode::remove_grid_chunk(int Cx, int Cz) -{ - auto const it = m_grid_chunks.find({Cx, Cz}); - if (it == m_grid_chunks.end()) - return; - if (it->second) - it->second->destroy(); - m_grid_chunks.erase(it); -} - -void editor_mode::handle_chunk_edit_click(bool DeleteMode) -{ - // world point under the cursor; must land on existing geometry to give a valid depth - glm::dvec3 const world = Camera.Pos + GfxRenderer->Mouse_Position(); - double const size = chunk_grid_size(); - int const cx = static_cast(std::floor(world.x / size)); - int const cz = static_cast(std::floor(world.z / size)); - bool const streaming = m_streamer.active(); - - if (DeleteMode) - { - if (streaming) - m_streamer.remove_chunk(cx, cz); - else - remove_grid_chunk(cx, cz); - return; - } - - // if the clicked cell holds a chunk, target the neighbour nearest the clicked edge (the empty - // side); otherwise fill the clicked cell - bool const occupied = streaming - ? m_streamer.terrain_at(world.x, world.z) != nullptr - : m_grid_chunks.count({cx, cz}) > 0; - int tcx = cx, tcz = cz; - if (occupied) - { - double const lx = world.x - cx * size, lz = world.z - cz * size; - double const dw = lx, de = size - lx, dn = lz, ds = size - lz; - double const nearest = std::min({dw, de, dn, ds}); - if (nearest == dw) - tcx = cx - 1; - else if (nearest == de) - tcx = cx + 1; - else if (nearest == dn) - tcz = cz - 1; - else - tcz = cz + 1; - } - - if (streaming) - m_streamer.add_chunk(tcx, tcz); - else - add_grid_chunk(tcx, tcz); -} - -void editor_mode::create_chunked_terrain() -{ - int const chunks = std::clamp(m_terrain_chunks, 1, 32); - double const size = chunk_grid_size(); - - // snap the field to the global chunk grid (so it aligns with manual/streamed chunks), centred - // on the camera's chunk - int const ccx = static_cast(std::floor(Camera.Pos.x / size)); - int const ccz = static_cast(std::floor(Camera.Pos.z / size)); - int const half = chunks / 2; - - int created = 0; - for (int dz = 0; dz < chunks; ++dz) - for (int dx = 0; dx < chunks; ++dx) - { - int const cx = ccx - half + dx, cz = ccz - half + dz; - if (!m_grid_chunks.count({cx, cz})) - { - add_grid_chunk(cx, cz); - ++created; - } - } - - WriteLog("Editor: created chunked terrain with " + std::to_string(created) + " chunks", logtype::generic); -} - -void editor_mode::save_scene_with_terrain() -{ - commit_terrain(); - - // export scenery; the exported .scm now carries an `editorterrain` directive (streamer is active) - export_scenery(); - WriteLog("Editor: saved scene + terrain", logtype::generic); -} - -void editor_mode::commit_terrain() -{ - // commit authored terrain so the scenery streams it on load. if not already streaming, hand the - // manual grid chunks over to the streamer (same as toggling Stream terrain on) - if (!m_streamer.active()) - { - std::string scenery = Global.SceneryFile; - auto const slash = scenery.find_last_of("/\\"); - if (slash != std::string::npos) - scenery = scenery.substr(slash + 1); - auto const dot = scenery.find_last_of('.'); - if (dot != std::string::npos) - scenery = scenery.substr(0, dot); - if (scenery.empty()) - scenery = "default"; - - m_streamer.directory("editor_terrain/" + scenery); - m_streamer.configure(m_terrain_cells, m_terrain_cellsize, m_stream_radius, m_terrain_baseheight, - std::string(m_terrain_texture)); - m_streamer.simplify(m_terrain_auto_optimize, m_terrain_simplify_error); - m_streamer.persist(true); - - for (auto &entry : m_grid_chunks) - if (entry.second) - m_streamer.save_chunk(entry.first.first, entry.first.second, *entry.second); - for (auto &entry : m_grid_chunks) - if (entry.second) - entry.second->destroy(); - m_grid_chunks.clear(); - m_streamer.active(true); - } - - m_streamer.flush(); // save resident edited chunks to disk -} - bool editor_mode::save() { if (scene::Layers.empty()) @@ -2333,19 +2433,18 @@ bool editor_mode::save() return false; } - // terrain made in the editor is kept in files of its own, the scenery only needs the directive which loads it + // the heightmap terrain is kept in files of its own, the scenery only needs the directive which loads it std::vector rootstatements; - if (m_streamer.active() || false == m_grid_chunks.empty()) + if (m_streamer.active()) { - // the chunks go over to the streamer, what was kept to take back the shaping refers to the ones which are gone - m_profile.earthworks.undo.clear(); - commit_terrain(); - if (false == scene::Layers.terrain_directive()) + std::string error; + if (false == m_streamer.save(&error)) { - rootstatements.emplace_back( - "editorterrain " + m_streamer.directory() + ' ' + std::to_string(m_streamer.cells()) + ' ' + to_string(m_streamer.cellsize(), 3) + ' ' - + std::to_string(m_streamer.radius()) + (m_streamer.texture().empty() ? "" : ' ' + m_streamer.texture()) + " endeditorterrain"); + ui()->set_status(format(STR_C("The terrain couldn't be saved: %s"), error.c_str()), true); + return false; } + if (false == scene::Layers.terrain_directive()) + rootstatements.emplace_back("heightmap_terrain " + m_streamer.name() + " endheightmap_terrain"); } if (m_profile.changed) @@ -2605,49 +2704,39 @@ void editor_mode::export_scenery() scene::Layers.visible(layer, false); } -void editor_mode::handle_terrain_sculpt(double Deltatime) +void editor_mode::handle_terrain_brush(double Deltatime) { // world point under the cursor (Mouse_Position is camera-relative, like the brush placement uses) - glm::dvec3 const world = Camera.Pos + GfxRenderer->Mouse_Position(); - // only sculpt when the cursor is actually over terrain (avoids editing on a stale depth read) + glm::dvec3 const offset = GfxRenderer->Mouse_Position(); + if (glm::length(offset) < 1e-3) + return; + glm::dvec3 const world = Camera.Pos + offset; + // only when the cursor is over the terrain (avoids editing on a stale depth read) if (terrain_at(world.x, world.z) == nullptr) return; - double const rate = m_terrain_brush_strength * Deltatime; // metres applied this frame - if (m_terrain_brush_smooth) + double const rate = m_terrain_brush_strength * Deltatime; + bool shaped = false; + switch (m_terrain_tool) { - // every patch the brush touches is smoothed from the same ground, so the edges they share stay together - auto const terrains = active_terrains(); - double const reach = m_terrain_brush_radius + 2.0 * m_terrain_cellsize + 1.0; - std::vector>> before; - for (editor_terrain *terrain : terrains) - { - auto const centre = terrain->centre(); - double const half = terrain->extent() * 0.5; - if (std::abs(centre.x - world.x) <= half + reach && std::abs(centre.z - world.z) <= half + reach) - before.emplace_back(terrain, terrain->heights()); - } - auto const ground = [&](double X, double Z, double Fallback) { - for (auto const &entry : before) - if (entry.first->contains(X, Z)) - return entry.first->height_in(entry.second, X, Z); - return Fallback; - }; - double const amount = std::min(1.0, rate * 0.5); - for (auto const &entry : before) - entry.first->smooth(world.x, world.z, m_terrain_brush_radius, amount, ground); + case terrain_tool::sculpt: + shaped = m_streamer.sculpt(world.x, world.z, m_terrain_brush_radius, Global.shiftState ? -rate : rate); + break; + case terrain_tool::smooth: + shaped = m_streamer.smooth(world.x, world.z, m_terrain_brush_radius, std::min(1.0, rate * 0.5)); + break; + case terrain_tool::paint: + m_streamer.paint(world.x, world.z, m_terrain_brush_radius, std::min(1.0, rate * 0.25), Global.shiftState ? std::uint16_t{0} : static_cast(m_terrain_layer)); + break; + default: + break; } - else + if (shaped) { - double const signedrate = Global.shiftState ? -rate : rate; - // apply to every chunk the brush touches; each patch clips to its own bounds, so a stroke - // crossing a chunk boundary edits both and shared-edge vertices stay in sync - for (editor_terrain *terrain : active_terrains()) - terrain->sculpt(world.x, world.z, m_terrain_brush_radius, signedrate); + // what the road tools know about the ground is no longer true + ground_tiles.clear(); + forget_ground_shapes(); } - // what the road tools know about the ground is no longer true - ground_tiles.clear(); - forget_ground_shapes(); } void editor_mode::capture_terrain() @@ -2658,6 +2747,8 @@ void editor_mode::capture_terrain() WriteLog("Editor: select a model instance to capture as terrain", logtype::generic); return; } + if (false == ensure_terrain()) + return; std::vector tris; gather_submodel_triangles(model->pModel->Root, instance_matrix(*model), tris); @@ -2668,51 +2759,31 @@ void editor_mode::capture_terrain() } // horizontal bounds of the captured geometry - glm::dvec3 lo(std::numeric_limits::max()); - glm::dvec3 hi(-std::numeric_limits::max()); + glm::dvec2 lo(std::numeric_limits::max()); + glm::dvec2 hi(-std::numeric_limits::max()); for (auto const &t : tris) for (auto const &p : t) { - lo.x = std::min(lo.x, p.x); lo.y = std::min(lo.y, p.y); lo.z = std::min(lo.z, p.z); - hi.x = std::max(hi.x, p.x); hi.y = std::max(hi.y, p.y); hi.z = std::max(hi.z, p.z); + lo = glm::min(lo, glm::dvec2(p.x, p.z)); + hi = glm::max(hi, glm::dvec2(p.x, p.z)); } + triangle_grid const surface(std::move(tris), lo - glm::dvec2(1.0), hi + glm::dvec2(1.0)); - glm::dvec3 const center((lo.x + hi.x) * 0.5, lo.y, (lo.z + hi.z) * 0.5); - double const extent = std::max(hi.x - lo.x, hi.z - lo.z); - int const cells = std::max(1, m_terrain_cells); - float const cellsize = static_cast(std::max(0.1, extent / cells)); - - // sampler: highest captured triangle at (x,z) - auto const sampler = [&tris](double X, double Z, double &OutY) -> bool { - double best = -std::numeric_limits::max(); - bool found = false; - for (auto const &t : tris) - { - double const minx = std::min({t[0].x, t[1].x, t[2].x}); - double const maxx = std::max({t[0].x, t[1].x, t[2].x}); - double const minz = std::min({t[0].z, t[1].z, t[2].z}); - double const maxz = std::max({t[0].z, t[1].z, t[2].z}); - if (X < minx || X > maxx || Z < minz || Z > maxz) - continue; - double y; - if (triangle_height_at(t[0], t[1], t[2], X, Z, y) && (!found || y > best)) - { - best = y; - found = true; - } - } - if (found) - OutY = best; - return found; - }; - - auto terrain = std::make_unique(); - if (!terrain->create(center, cells, cellsize, std::string(m_terrain_texture), sampler)) - { - WriteLog("Editor: terrain capture failed", logtype::generic); - return; - } - m_terrains.push_back(std::move(terrain)); + // the chunks under the model are made where missing, then take its shape wherever it has any + auto const first = heightmap::chunk_at(lo.x, lo.y); + auto const last = heightmap::chunk_at(hi.x, hi.y); + for (int cz = first.second; cz <= last.second; ++cz) + for (int cx = first.first; cx <= last.first; ++cx) + add_chunk_from_ground({cx, cz}, m_terrain_spacing); + m_streamer.reshape(lo, hi, [&](double X, double Z, float &Height) { + double y; + if (false == surface.height_at(X, Z, std::numeric_limits::max(), y)) + return false; + Height = static_cast(y); + return true; + }); + ground_tiles.clear(); + forget_ground_shapes(); // remove the original instance (recorded as a deletion so it can be undone) std::string as_text; @@ -3131,7 +3202,9 @@ void editor_mode::terrain_workspace(bool const Open) { m_terrain_open = Open; if (false == Open) - m_terrain_sculpt = m_chunk_edit = false; + m_terrain_tool = terrain_tool::none; + else if (m_streamer.active()) + m_terrain_spacing = m_streamer.manifest().spacing; } void editor_mode::render_terrain_tool_options() @@ -3855,7 +3928,7 @@ void editor_mode::render_workspaces() {STR_C("Surroundings"), work_area::surroundings, editor_icons::icon::work_surroundings, STR_C("Models around the line: select, insert, brush, area fill, copy to the node bank")}, {STR_C("Tracks"), work_area::tracks, editor_icons::icon::work_tracks, STR_C("Tracks and switches, signals, objects along the track, checks of the line")}, {STR_C("Roads"), work_area::roads, editor_icons::icon::work_roads, STR_C("Roads and junctions, level crossings, the points where the traffic comes and goes")}, - {STR_C("Terrain"), work_area::terrain, editor_icons::icon::work_terrain, STR_C("Terrain patches and chunks, sculpting, streaming, orthophoto")}, + {STR_C("Terrain"), work_area::terrain, editor_icons::icon::work_terrain, STR_C("Heightmap terrain: chunks, sculpting, painting, water, orthophoto")}, }; char const *const keys[] = {"F2", "F3", "F4", "F5"}; auto const current{current_work_area()}; @@ -4079,7 +4152,7 @@ void editor_mode::render_gizmo_options() ImGui::Checkbox(STR_C("Enabled"), &m_gizmo_enabled); if (!m_gizmo_enabled) return; - if (m_terrain_sculpt || m_chunk_edit) + if (terrain_brush() || terrain_clicking()) { ImGui::TextDisabled(STR_C("Suspended while editing terrain")); return; @@ -4118,7 +4191,7 @@ void editor_mode::render_gizmo_options() void editor_mode::render_gizmo() { // the transform gizmo is suppressed while editing terrain, so the brush/chunk tool owns the mouse - if (!m_gizmo_enabled || m_terrain_sculpt || m_chunk_edit) + if (!m_gizmo_enabled || terrain_brush() || terrain_clicking()) { m_gizmo_using = false; return; @@ -4905,17 +4978,17 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const return; } - // in chunk-edit mode the left button adds a neighbouring chunk (Shift = delete the clicked one) - if (m_chunk_edit && Button == GLFW_MOUSE_BUTTON_LEFT) + // the chunk, spacing and water tools of the terrain work on a click (Shift: the other way round) + if (terrain_clicking() && Button == GLFW_MOUSE_BUTTON_LEFT) { if (is_press(Action)) - handle_chunk_edit_click(Global.shiftState); + handle_terrain_click(Global.shiftState); m_input.mouse.button(Button, Action); return; } - // in terrain sculpt mode the left button paints the terrain instead of picking nodes - if (m_terrain_sculpt && Button == GLFW_MOUSE_BUTTON_LEFT) + // with a brush of the terrain the left button works the brush instead of picking nodes + if (terrain_brush() && Button == GLFW_MOUSE_BUTTON_LEFT) { mouseHold = is_press(Action); m_input.mouse.button(Button, Action); diff --git a/application/editormode.h b/application/editormode.h index af692dbeb..ebe40cd7d 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -282,21 +282,40 @@ class editor_mode : public application_mode, private editor_track::observer // unless Alone: then the node goes by itself. Joined: undone together with the change before void snap_to_ground(scene::basic_node *node, bool const Alone = false, bool const Joined = false); - // editable terrain patches created in the editor + // the heightmap terrain of the scenery (terrain//): chunks, sculpting, painting, water void render_terrain_ui(); // the terrain as a field of work of its own: the terrain tools and the orthophoto in the tool options window void render_terrain_tool_options(); - // opens or leaves the terrain; leaving it puts the sculpting and the chunk editing away, so the mouse doesn't stay with them + // opens or leaves the terrain; leaving it puts the terrain tools away, so the mouse doesn't stay with them void terrain_workspace(bool const Open); - // creates a large terrain as a grid of adjacent chunks (each its own editable patch) - void create_chunked_terrain(); - // manual grid-aligned chunks: add/remove single chunks for fine control - float chunk_grid_size() const { return m_terrain_cells * m_terrain_cellsize; } - void add_grid_chunk(int Cx, int Cz); - void remove_grid_chunk(int Cx, int Cz); + // opens the heightmap terrain of the scenery for editing, named after the scenery, if the scenery has none yet. returns: true if it's open + bool ensure_terrain(); + // adds chunks around the camera, Count along a side, at the height of the ground under each grid point where there's any + void add_chunks_around(int const Count); + // adds a chunk of the terrain shaped as the ground under it; where there's no ground, carried on level with the nearest point + // of it, or at the base height. returns: false if there's a chunk already + bool add_chunk_from_ground(heightmap::chunk_key const &Key, float const Spacing, std::uint16_t const Layer = 0); + // the tool of the terrain the left mouse button works + enum class terrain_tool + { + none, // picks the models, as in the surroundings + chunks, // adds a chunk, Shift: removes it + sculpt, // raises the ground, Shift: lowers it + smooth, + paint, // paints the chosen material, Shift: the first material of the palette + spacing, // gives the clicked chunk the chosen point spacing + water // outlines a body of water + }; + terrain_tool m_terrain_tool{terrain_tool::none}; + bool terrain_brush() const { return m_terrain_tool == terrain_tool::sculpt || m_terrain_tool == terrain_tool::smooth || m_terrain_tool == terrain_tool::paint; } + bool terrain_clicking() const { return m_terrain_tool == terrain_tool::chunks || m_terrain_tool == terrain_tool::spacing || m_terrain_tool == terrain_tool::water; } + // the brush, the hovered chunk and the outlines of water drawn over the viewport + void draw_terrain_overlay(); + // forgets what's known about the ground, after the terrain changed + void forget_ground(); // the scenery ground: triangles of each material, the ones the editor makes itself left out std::map ground_materials(); - // replaces the triangles of specified materials with chunks of editor terrain of their shape; the scenery files lose them on save. + // replaces the triangles of specified materials with chunks of heightmap terrain of their shape; the scenery files lose them on save. // returns: summary for the user std::string convert_ground(std::set const &Materials); struct ground_conversion @@ -307,12 +326,8 @@ class editor_mode : public application_mode, private editor_track::observer std::string status; } m_ground_conversion; void render_ground_conversion(); - // handles a click in chunk-edit mode (add a neighbour, or Shift = delete the clicked chunk) - void handle_chunk_edit_click(bool DeleteMode); - // commits authored terrain to disk, enables streaming, and exports the scenery - void save_scene_with_terrain(); - // commits authored terrain to disk and enables streaming - void commit_terrain(); + // handles a click of the chunk, spacing and water tools (Shift: the other way round) + void handle_terrain_click(bool const Shift); // writes the changes to the files of scenery opened for editing (Ctrl+S) bool save(); // places include of specified scenery template at the cursor, in the active layer @@ -333,37 +348,34 @@ class editor_mode : public application_mode, private editor_track::observer void render_include_gizmo(glm::mat4 const &View, glm::mat4 const &Projection, glm::dvec3 const &Camerapos); // exports the scenery in legacy (text) format, with layers hidden in the editor left out of the picture void export_scenery(); - // raises/lowers terrain under the cursor while the left mouse button is held in sculpt mode - void handle_terrain_sculpt(double Deltatime); - // returns the terrain patch (if any) whose footprint covers the given world point + // works the brush of the terrain under the cursor while the left mouse button is held + void handle_terrain_brush(double Deltatime); + // the chunk of the terrain (if any) covering the given world point editor_terrain *terrain_at(double X, double Z); - // gathers every active terrain patch: manually-created ones plus streamed chunks + // the chunks of the terrain held in memory std::vector active_terrains(); - // samples the selected model instance's geometry into a new editable terrain patch, then removes it + // samples the selected model instance's geometry into the chunks of the terrain it covers, then removes it void capture_terrain(); - std::vector> m_terrains; - // grid-aligned manual chunks, keyed by (cx,cz) on the global chunk grid - std::map, std::unique_ptr> m_grid_chunks; - bool m_terrain_sculpt{false}; // when true, LMB sculpts terrain instead of picking - bool m_terrain_brush_smooth{false}; // the brush evens the ground out instead of raising or lowering it bool m_terrain_open{false}; // the terrain is the field of work, chosen in the toolbar - bool m_chunk_edit{false}; // when true, LMB adds/removes whole chunks - int m_terrain_cells{32}; // grid resolution (quads per side) - int m_terrain_chunks{4}; // chunks per side for a chunked terrain - float m_terrain_cellsize{2.0f}; // metres per quad - float m_terrain_baseheight{0.0f}; // flat starting height + float m_terrain_spacing{2.0f}; // point spacing of the chunks made and of the spacing tool + float m_terrain_baseheight{0.0f}; // height of chunks made where there's no ground + int m_terrain_add_count{4}; // chunks along a side added around the camera float m_terrain_brush_radius{12.0f}; - float m_terrain_brush_strength{4.0f}; // metres per second while held (one-shot for the buttons) - float m_terrain_simplify_error{0.5f}; // flatness tolerance (m) for mesh simplification - bool m_terrain_auto_optimize{false}; // auto-simplify edited chunks after sculpting settles - double m_terrain_idle{0.0}; // seconds since the last sculpt edit (debounce timer) - char m_terrain_texture[128]{""}; // optional ground texture name + float m_terrain_brush_strength{4.0f}; // metres per second while held; for the paint, how fast it covers + int m_terrain_layer{0}; // entry of the palette painted + char m_terrain_material[128]{"grass"}; // material added to the palette + float m_terrain_material_size{0.0f}; // metres its textures repeat at, 0: given by the material + std::vector m_water_points; // outline of a body of water being drawn + float m_water_level{0.0f}; + bool m_water_level_edited{false}; // the level was given by hand, the points clicked don't change it + char m_water_material[128]{""}; + int m_water_selected{-1}; + float m_water_selected_level{0.0f}; // level of the chosen water, while it's edited + bool m_water_level_dragged{false}; + std::string m_terrain_status; - // streaming terrain that follows the camera (open-world); the editor shares the single - // simulation-level instance so authored terrain also renders in the driver / other modes + // the heightmap terrain, shared with the scenery loader so it shows in every mode terrain_streamer &m_streamer{EditorTerrain}; - int m_stream_radius{2}; - bool m_stream_persist{true}; // save edited chunks to disk and load them back // geoportal orthophoto layer drawn under the other viewport overlays void render_orthophoto_ui(); @@ -1573,7 +1585,7 @@ class editor_mode : public application_mode, private editor_track::observer double origin{0.0}; // chainage of the start of the route double departure{0.0}; // largest difference between the grade line and the track profile::ground_fit fit; - // the editor terrain led to the grade line: formation under the track, slopes down or up to the ground + // the heightmap terrain led to the grade line by a modifier: formation under the track, slopes down or up to the ground struct earthworks { bool from_ballast{true}; @@ -1582,11 +1594,11 @@ class editor_mode : public application_mode, private editor_track::observer double slope{1.5}; // horizontal run of the slopes per metre of height double reach{60.0}; // m, from the edge of the formation, where the slopes end even if they don't get to the ground double rounding{1.5}; // m, over which the slopes bend into the formation and into the ground - // heights of the terrain before the last shaping - std::vector>> undo; bool generate{true}; + // chunks of terrain made under the route by the last shaping std::vector> generated; - bool generated_streaming{false}; + // the modifier of the terrain made by the last shaping + std::string modifier; } earthworks; double view_from{0.0}; double view_to{100.0}; diff --git a/application/editormodeprofile.cpp b/application/editormodeprofile.cpp index 16c024f27..f23eff532 100644 --- a/application/editormodeprofile.cpp +++ b/application/editormodeprofile.cpp @@ -488,44 +488,53 @@ std::pair editor_mode::profile_generate_ground(std::vector> keys; + auto const size{heightmap::chunk_size}; + std::set keys; for (auto const &sample : samples) { auto const &p{sample.position}; - for (auto x = static_cast(std::floor((p.x - Reach) / size)); x <= static_cast(std::floor((p.x + Reach) / size)); ++x) - for (auto z = static_cast(std::floor((p.z - Reach) / size)); z <= static_cast(std::floor((p.z + Reach) / size)); ++z) + auto const low{heightmap::chunk_at(p.x - Reach, p.z - Reach)}; + auto const high{heightmap::chunk_at(p.x + Reach, p.z + Reach)}; + for (auto x = low.first; x <= high.first; ++x) + for (auto z = low.second; z <= high.second; ++z) keys.insert({x, z}); } - auto const terrains{active_terrains()}; - std::string const texture{m_terrain_texture}; + auto const cells{heightmap::cells_for(m_terrain_spacing)}; + auto const cellsize{size / cells}; + auto const side{static_cast(cells) + 1}; int made{0}, skipped{0}; - std::size_t const side{static_cast(cells) + 1}; for (auto const &key : keys) { - glm::dvec2 const low{key.first * size, key.second * size}; - glm::dvec2 const middle{low + glm::dvec2{size * 0.5}}; - if (streaming ? m_streamer.terrain_at(middle.x, middle.y) != nullptr : m_grid_chunks.count(key) > 0) + if (m_streamer.exists(key)) continue; + auto const low{heightmap::chunk_corner(key)}; + glm::dvec2 const middle{low + glm::dvec2{size * 0.5}}; std::vector around; for (std::size_t i = 0; i < samples.size(); ++i) if (std::abs(samples[i].position.x - middle.x) <= size * 0.5 + Reach && std::abs(samples[i].position.z - middle.y) <= size * 0.5 + Reach) around.push_back(i); if (around.empty()) continue; - std::vector points; - std::vector nearest; - points.reserve(side * side); - nearest.reserve(side * side); + // where the scenery has its own ground, the chunk isn't made: the two would cover each other + std::vector probes; + for (int iz = 1; iz < 10; ++iz) + for (int ix = 1; ix < 10; ++ix) + probes.emplace_back(low.x + ix * size / 10.0, profile::elevation(state.line, samples[around.front()].chainage), low.y + iz * size / 10.0); + std::vector found; + ground_heights(probes, true, &found); + if (std::count(found.begin(), found.end(), 1) * 20 > static_cast(probes.size())) + { + ++skipped; + continue; + } + // the ground of the chunk: the ground under the nearest point of the route, or the formation there + std::vector heights(side * side); for (std::size_t iz = 0; iz < side; ++iz) for (std::size_t ix = 0; ix < side; ++ix) { - glm::dvec3 point{low.x + ix * cellsize, 0.0, low.y + iz * cellsize}; + glm::dvec3 const point{low.x + ix * cellsize, 0.0, low.y + iz * cellsize}; auto best{around.front()}; auto distance{std::numeric_limits::max()}; for (auto const i : around) @@ -537,56 +546,16 @@ std::pair editor_mode::profile_generate_ground(std::vector(best < state.terrain.size() && std::isfinite(state.terrain[best]) ? state.terrain[best] : profile::elevation(state.line, samples[best].chainage) - Beds[best].first); } - std::vector found; - auto heights{ground_heights(points, true, &found)}; - std::size_t own{0}; - for (std::size_t i = 0; i < points.size(); ++i) - if (found[i] != 0 && std::none_of(terrains.begin(), terrains.end(), [&](editor_terrain const *Terrain) { return Terrain->contains(points[i].x, points[i].z); })) - ++own; - if (own * 20 > points.size()) - { - ++skipped; - continue; - } - for (std::size_t i = 0; i < points.size(); ++i) - { - if (found[i] != 0) - continue; - auto const sample{nearest[i]}; - heights[i] = sample < state.terrain.size() && std::isfinite(state.terrain[sample]) ? state.terrain[sample] : profile::elevation(state.line, samples[sample].chainage) - Beds[sample].first; - } - auto const sampler = [&](double const X, double const Z, double &Height) { + auto const added{m_streamer.add_chunk(key.first, key.second, m_terrain_spacing, [&](double const X, double const Z) { auto const ix{static_cast(std::clamp(std::lround((X - low.x) / cellsize), 0, cells))}; auto const iz{static_cast(std::clamp(std::lround((Z - low.y) / cellsize), 0, cells))}; - Height = heights[iz * side + ix]; - return true; - }; - if (streaming) - { - m_streamer.add_chunk(key.first, key.second); - auto *terrain{m_streamer.terrain_at(middle.x, middle.y)}; - if (terrain == nullptr) - continue; - terrain->reshape([&](double const X, double const Z, float &Height) { - double height; - sampler(X, Z, height); - Height = static_cast(height); - return true; - }); - } - else - { - auto chunk{std::make_unique()}; - if (false == chunk->create(glm::dvec3{middle.x, m_terrain_baseheight, middle.y}, cells, static_cast(cellsize), texture, sampler)) - continue; - m_grid_chunks[key] = std::move(chunk); - } + return heights[iz * side + ix]; + })}; + if (false == added) + continue; works.generated.push_back(key); - works.generated_streaming = streaming; ++made; } return {made, skipped}; @@ -599,6 +568,11 @@ void editor_mode::profile_shape_ground() auto const &samples{state.samples}; if (samples.size() < 2 || state.line.points.size() < 2) return; + if (false == ensure_terrain()) + { + state.error = STR_C("The heightmap terrain can't be opened"); + return; + } auto const slope{std::max(0.1, works.slope)}; std::vector> beds(samples.size(), {works.depth, works.half_width}); if (works.from_ballast) @@ -610,137 +584,91 @@ void editor_mode::profile_shape_ground() for (auto const &bed : beds) widest = std::max(widest, bed.second); auto const reach{widest + works.reach}; - works.undo.clear(); works.generated.clear(); auto const generated{works.generate ? profile_generate_ground(beds, reach) : std::pair{0, 0}}; - auto const terrains{active_terrains()}; - if (terrains.empty()) - { - state.error = generated.second > 0 ? STR_C("The scenery has its own ground under the route: convert it to editor terrain first") : STR_C("There's no editor terrain to shape: convert the scenery ground first"); - return; - } - // the pieces of the axis of the route, found by the cell of a grid over the plan - double constexpr cell{16.0}; - auto const key = [&](double const X, double const Z) { return std::make_pair(static_cast(std::floor(X / cell)), static_cast(std::floor(Z / cell))); }; - std::map, std::vector> grid; - glm::dvec2 low{std::numeric_limits::max()}, high{-std::numeric_limits::max()}; - for (std::size_t i = 0; i + 1 < samples.size(); ++i) + // the shaping is a modifier of the terrain: the formation along the axis of the route, followed by the ground + // around it. shaped again, the route replaces its modifier, and the terrain follows the new grade line + heightmap::modifier modifier; + auto const name = [](TTrack const *Track) { return Track != nullptr && false == Track->name().empty() ? Track->name() : std::string{"?"}; }; + modifier.name = "route " + name(state.from) + " - " + name(state.to); + modifier.slope = slope; + modifier.reach = works.reach; + modifier.rounding = std::max(0.0, works.rounding); + std::vector points; + points.reserve(samples.size()); + for (std::size_t i = 0; i < samples.size(); ++i) + points.push_back({{samples[i].position.x, samples[i].position.z}, profile::elevation(state.line, samples[i].chainage) - beds[i].first, beds[i].second}); + // the points the line between their neighbours passes within a few millimetres of are left out + double constexpr tolerance{0.005}; + modifier.points.push_back(points.front()); + std::size_t anchor{0}; + for (std::size_t next = 2; next < points.size(); ++next) { - auto const &a{samples[i].position}; - auto const &b{samples[i + 1].position}; - auto const from{key(std::min(a.x, b.x), std::min(a.z, b.z))}; - auto const to{key(std::max(a.x, b.x), std::max(a.z, b.z))}; - for (auto x = from.first; x <= to.first; ++x) - for (auto z = from.second; z <= to.second; ++z) - grid[{x, z}].push_back(i); - low = glm::min(low, glm::dvec2{std::min(a.x, b.x), std::min(a.z, b.z)}); - high = glm::max(high, glm::dvec2{std::max(a.x, b.x), std::max(a.z, b.z)}); + auto const &a{points[anchor]}; + auto const &b{points[next]}; + auto const run{b.position - a.position}; + auto const length{glm::length(run)}; + bool straight{true}; + for (auto i = anchor + 1; i < next && straight; ++i) + { + auto const t{length > 1e-9 ? glm::dot(points[i].position - a.position, run) / (length * length) : 0.0}; + auto const offset{glm::length(points[i].position - (a.position + run * t))}; + auto const formation{a.formation + (b.formation - a.formation) * t}; + auto const width{a.half_width + (b.half_width - a.half_width) * t}; + straight = offset <= tolerance && std::abs(points[i].formation - formation) <= tolerance && std::abs(points[i].half_width - width) <= tolerance; + } + if (false == straight) + { + anchor = next - 1; + modifier.points.push_back(points[anchor]); + } } + modifier.points.push_back(points.back()); - std::size_t moved{0}; double fill{0.0}, cut{0.0}; - for (auto *terrain : terrains) + for (std::size_t i = 0; i < samples.size(); ++i) { - auto const before{terrain->heights()}; - auto const shaped{terrain->reshape([&](double const X, double const Z, float &Height) { - if (X < low.x - reach || X > high.x + reach || Z < low.y - reach || Z > high.y + reach) - return false; - double distance{reach}; - double chainage{-1.0}; - std::size_t nearest{0}; - auto const from{key(X - reach, Z - reach)}; - auto const to{key(X + reach, Z + reach)}; - for (auto x = from.first; x <= to.first; ++x) - for (auto z = from.second; z <= to.second; ++z) - { - auto const found{grid.find({x, z})}; - if (found == grid.end()) - continue; - for (auto const i : found->second) - { - glm::dvec2 const a{samples[i].position.x, samples[i].position.z}; - glm::dvec2 const b{samples[i + 1].position.x, samples[i + 1].position.z}; - auto const run{b - a}; - auto const length{glm::dot(run, run)}; - auto const t{length > 1e-12 ? std::clamp(glm::dot(glm::dvec2{X, Z} - a, run) / length, 0.0, 1.0) : 0.0}; - auto const offset{glm::length(glm::dvec2{X, Z} - (a + run * t))}; - if (offset < distance) - { - distance = offset; - chainage = samples[i].chainage + (samples[i + 1].chainage - samples[i].chainage) * t; - nearest = t < 0.5 ? i : i + 1; - } - } - } - if (chainage < 0.0) - return false; - auto const &bed{beds[nearest]}; - auto const formation{profile::elevation(state.line, chainage) - bed.first}; - auto const ground{static_cast(Height)}; - // the bends at the edge of the formation and at the foot of the slope are rounded off over the given length - auto const rounding{std::max(0.0, works.rounding)}; - auto const soft_max = [](double const A, double const B, double const K) { - if (K <= 1e-6) - return std::max(A, B); - auto const h{std::max(K - std::abs(A - B), 0.0) / K}; - return std::max(A, B) + h * h * K * 0.25; - }; - auto const beyond{soft_max(0.0, distance - bed.second, rounding)}; - auto const bend{rounding / slope}; - auto const target{ground > formation ? -soft_max(-ground, -(formation + beyond / slope), bend) : soft_max(ground, formation - beyond / slope, bend)}; - if (std::abs(target - ground) < 0.005) - return false; - fill = std::max(fill, target - ground); - cut = std::max(cut, ground - target); - Height = static_cast(target); - ++moved; - return true; - })}; - if (shaped) - works.undo.emplace_back(terrain, before); - } - auto const chunks = [&](std::string Text) { - if (generated.first > 0) - Text += format(STR_C("; %d chunk(s) of terrain made under the route"), generated.first); - if (generated.second > 0) - Text += format(STR_C("; %d chunk(s) left out: the scenery has its own ground there, convert it to shape it"), generated.second); - return Text; - }; - if (moved == 0) - { - state.status = chunks(STR_C("The editor terrain doesn't reach the route, or it's shaped already")); - return; + if (i >= state.terrain.size() || false == std::isfinite(state.terrain[i])) + continue; + fill = std::max(fill, points[i].formation - state.terrain[i]); + cut = std::max(cut, state.terrain[i] - points[i].formation); } + if (false == works.modifier.empty() && works.modifier != modifier.name) + m_streamer.remove_modifier(works.modifier); + works.modifier = modifier.name; + auto const count{modifier.points.size()}; + m_streamer.modifier(std::move(modifier)); + forget_ground(); + + auto status{format(STR_C("Terrain shaped by the modifier \"%s\" (%zu points): embankment up to %.2f m, cutting up to %.2f m"), works.modifier.c_str(), count, fill, cut)}; + if (generated.first > 0) + status += format(STR_C("; %d chunk(s) of terrain made under the route"), generated.first); + if (generated.second > 0) + status += format(STR_C("; %d chunk(s) left out: the scenery has its own ground there, convert it to shape it"), generated.second); state.error.clear(); profile_resample(); - state.status = chunks(format(STR_C("Terrain shaped at %zu points: embankment up to %.2f m, cutting up to %.2f m"), moved, fill, cut)); + state.status = status; WriteLog("Editor: vertical profile - " + state.status, logtype::generic); } void editor_mode::profile_restore_ground() { auto &state{m_profile}; - auto const terrains{active_terrains()}; + auto &works{state.earthworks}; std::size_t restored{0}; - for (auto const &entry : state.earthworks.undo) - if (std::find(terrains.begin(), terrains.end(), entry.first) != terrains.end()) - { - entry.first->restore(entry.second); - ++restored; - } - state.earthworks.undo.clear(); - for (auto const &key : state.earthworks.generated) + if (false == works.modifier.empty() && m_streamer.remove_modifier(works.modifier)) + ++restored; + works.modifier.clear(); + for (auto const &key : works.generated) { - if (state.earthworks.generated_streaming) - m_streamer.remove_chunk(key.first, key.second); - else - remove_grid_chunk(key.first, key.second); + m_streamer.remove_chunk(key.first, key.second); ++restored; } - state.earthworks.generated.clear(); + works.generated.clear(); + forget_ground(); profile_resample(); - state.status = restored > 0 ? STR_C("The terrain is back as it was before the shaping") : STR_C("The shaped terrain isn't loaded any more"); + state.status = restored > 0 ? STR_C("The terrain is back as it was before the shaping") : STR_C("The shaping of the terrain is gone already"); } void editor_mode::render_ground_conversion() @@ -748,7 +676,7 @@ void editor_mode::render_ground_conversion() auto &conversion{m_ground_conversion}; if (false == conversion.open) { - if (ImGui::Button(STR_C("Convert the scenery ground to editor terrain..."))) + if (ImGui::Button(STR_C("Convert the scenery ground to heightmap terrain..."))) { conversion.open = true; conversion.materials = ground_materials(); @@ -759,7 +687,7 @@ void editor_mode::render_ground_conversion() conversion.chosen.insert(most->first); } if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("Replaces the triangles of the chosen materials with editor terrain of the same shape,\nwhich can be shaped and sculpted; the scenery files lose these triangles on save")); + ImGui::SetTooltip("%s", STR_C("Replaces the triangles of the chosen materials with heightmap terrain of the same shape,\nwhich can be shaped, sculpted and painted; the scenery files lose these triangles on save")); if (false == conversion.status.empty()) ImGui::TextWrapped("%s", conversion.status.c_str()); return; @@ -782,7 +710,7 @@ void editor_mode::render_ground_conversion() } ImGui::PopID(); } - ImGui::TextWrapped("%s", STR_C("The terrain gets a single texture: that of the material which covers the most. Until saved, loading the scenery again takes it all back.")); + ImGui::TextWrapped("%s", STR_C("The chunks are covered with the material which covers the most, added to the palette of the terrain. Until saved, loading the scenery again takes it all back.")); if (conversion.chosen.empty()) ImGui::TextDisabled("%s", STR_C("Tick at least one material")); else if (ImGui::Button(STR_C("Convert"))) @@ -802,13 +730,13 @@ void editor_mode::render_profile_earthworks() auto &works{state.earthworks}; if (false == ImGui::TreeNode(STR_C("Shape the terrain to the grade line"))) return; - ImGui::TextWrapped("%s", STR_C("Only the editor terrain changes: a formation under the track and slopes to the ground; the triangles and models of the scenery stay as they are.")); + ImGui::TextWrapped("%s", STR_C("Only the heightmap terrain changes: a formation under the track and slopes to the ground, kept as a modifier of the terrain which follows the grade line when it's shaped again; the triangles and models of the scenery stay as they are.")); render_ground_conversion(); auto const drag = [](char const *Label, double &Value, float const Speed, char const *Format) { return ImGui::DragScalar(STR_C(Label), ImGuiDataType_Double, &Value, Speed, nullptr, nullptr, Format); }; ImGui::PushItemWidth(90.0f); ImGui::Checkbox(STR_C("Make terrain where the route has none"), &works.generate); if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("Chunks of editor terrain are made along the route where there's none, from the ground around,\nthen shaped. Where the scenery has its own ground triangles the chunk is left out: convert them instead")); + ImGui::SetTooltip("%s", STR_C("Chunks of heightmap terrain are made along the route where there's none, from the ground around,\nthen shaped. Where the scenery has its own ground triangles the chunk is left out: convert them instead")); ImGui::Checkbox(STR_C("Formation under the ballast of the track"), &works.from_ballast); if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", STR_C("The terrain goes as deep under the track as its ballast reaches and as wide as its foot,\nread from each path of the route; off: the values given below")); @@ -842,15 +770,15 @@ void editor_mode::render_profile_earthworks() ImGui::TextDisabled("%s", STR_C("Correct the errors of the grade line first")); else if (ImGui::Button(STR_C("Shape the terrain"))) profile_shape_ground(); - if (false == works.undo.empty() || false == works.generated.empty()) + if (false == works.modifier.empty() || false == works.generated.empty()) { ImGui::SameLine(); if (ImGui::Button(STR_C("Restore the terrain"))) profile_restore_ground(); if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("Puts back the terrain as it was before the last shaping, and takes away the terrain it made")); + ImGui::SetTooltip("%s", STR_C("Removes the modifier of the route, and takes away the terrain the shaping made")); } - if (false == active_terrains().empty()) + if (m_streamer.active()) { // the terrain tools take the tool options window over, the profile stays open under them if (ImGui::Button(STR_C("Sculpting..."))) diff --git a/application/editormodeviewport.cpp b/application/editormodeviewport.cpp index 7c9a3491d..46864156e 100644 --- a/application/editormodeviewport.cpp +++ b/application/editormodeviewport.cpp @@ -204,17 +204,15 @@ void editor_mode::work_area_tools(std::vector &Buttons) case work_area::terrain: { // what the left button does on the terrain - auto const choose = [this](bool const Sculpt, bool const Smooth, bool const Chunks) { - return [this, Sculpt, Smooth, Chunks]() { - m_terrain_sculpt = Sculpt; - m_terrain_brush_smooth = Smooth; - m_chunk_edit = Chunks; - }; - }; - Buttons.push_back({icon::select, STR_C("Select"), nullptr, STR_C("LMB picks the models, as in the surroundings"), false == m_terrain_sculpt && false == m_chunk_edit, choose(false, m_terrain_brush_smooth, false)}); - Buttons.push_back({icon::sculpt, STR_C("Sculpt"), nullptr, STR_C("LMB raises the terrain under the brush, Shift+LMB lowers it"), m_terrain_sculpt && false == m_terrain_brush_smooth, choose(true, false, false)}); - Buttons.push_back({icon::smooth, STR_C("Smooth"), nullptr, STR_C("LMB evens the terrain out under the brush"), m_terrain_sculpt && m_terrain_brush_smooth, choose(true, true, false)}); - Buttons.push_back({icon::chunks, STR_C("Chunks"), nullptr, STR_C("LMB adds a chunk next to the clicked one, Shift+LMB deletes it"), m_chunk_edit, choose(false, m_terrain_brush_smooth, true)}); + auto const choose = [this](terrain_tool const Tool) { return [this, Tool]() { m_terrain_tool = Tool; }; }; + auto const chosen = [this](terrain_tool const Tool) { return m_terrain_tool == Tool; }; + Buttons.push_back({icon::select, STR_C("Select"), nullptr, STR_C("LMB picks the models, as in the surroundings"), chosen(terrain_tool::none), choose(terrain_tool::none)}); + Buttons.push_back({icon::sculpt, STR_C("Sculpt"), nullptr, STR_C("LMB raises the terrain under the brush, Shift+LMB lowers it"), chosen(terrain_tool::sculpt), choose(terrain_tool::sculpt)}); + Buttons.push_back({icon::smooth, STR_C("Smooth"), nullptr, STR_C("LMB evens the terrain out under the brush"), chosen(terrain_tool::smooth), choose(terrain_tool::smooth)}); + Buttons.push_back({icon::brush, STR_C("Paint"), nullptr, STR_C("LMB paints the material chosen in the palette, Shift+LMB the first material of the palette"), chosen(terrain_tool::paint), choose(terrain_tool::paint)}); + Buttons.push_back({icon::chunks, STR_C("Chunks"), nullptr, STR_C("LMB adds a chunk next to the clicked one, Shift+LMB removes it"), chosen(terrain_tool::chunks), choose(terrain_tool::chunks)}); + Buttons.push_back({icon::count, STR_C("Point spacing"), nullptr, STR_C("LMB gives the clicked chunk the point spacing chosen in the tool options"), chosen(terrain_tool::spacing), choose(terrain_tool::spacing)}); + Buttons.push_back({icon::area_fill, STR_C("Water"), nullptr, STR_C("LMB adds a point of the outline of a body of water, Shift+LMB takes the last one back"), chosen(terrain_tool::water), choose(terrain_tool::water)}); auto const orthophoto{m_orthophoto.enabled()}; Buttons.push_back({icon::orthophoto, STR_C("Orthophoto"), nullptr, STR_C("Aerial imagery of geoportal.gov.pl under the scenery, laid out by the origin of the scenery"), orthophoto, [this, orthophoto]() { m_orthophoto.enabled(false == orthophoto); }, true}); diff --git a/editor/editorTerrain.cpp b/editor/editorTerrain.cpp index 76e320268..16daaf1e7 100644 --- a/editor/editorTerrain.cpp +++ b/editor/editorTerrain.cpp @@ -10,446 +10,33 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "editor/editorTerrain.hpp" -#include "scene/scene.h" -#include "scene/scenenode.h" -#include "simulation/simulation.h" -#include "rendering/renderer.h" -#include "model/vertex.h" - -#include -#include -#include - -namespace +heightmap::chunk_data &editor_terrain::edit(bool const Shape, bool const Paint) { - constexpr double kPi = 3.14159265358979323846; -} - -bool editor_terrain::create(glm::dvec3 const &Center, int Cells, float CellSize, std::string const &TextureName, - height_sampler const &Sampler) -{ - if (Cells < 1 || CellSize <= 0.0f || simulation::Region == nullptr) - return false; - - m_cells = Cells; - m_cellsize = CellSize; - double const half = 0.5 * static_cast(Cells) * CellSize; - m_x0 = Center.x - half; - m_z0 = Center.z - half; - m_heights.assign(static_cast(Cells + 1) * (Cells + 1), static_cast(Center.y)); - - // optionally seed the grid by sampling whatever geometry is already there (terrain capture) - if (Sampler) - { - for (int iz = 0; iz <= Cells; ++iz) - for (int ix = 0; ix <= Cells; ++ix) - { - double const vx = m_x0 + static_cast(ix) * CellSize; - double const vz = m_z0 + static_cast(iz) * CellSize; - double y; - if (Sampler(vx, vz, y)) - m_heights[index(ix, iz)] = static_cast(y); - } - } - - m_material = TextureName.empty() ? null_handle : GfxRenderer->Fetch_Material(TextureName); - - // section-level shapes are rendered relative to the section centre, so that is our geometry origin - scene::basic_section &sec = simulation::Region->section(Center); - sec.create_geometry(); // ensure existing section geometry is already built (idempotent) - m_origin = sec.m_area.center; - m_section = &sec; - - std::vector verts; - build_vertices(verts, false); - m_vertexcount = verts.size(); - - scene::shape_node shape; - shape.make_terrain(m_material, std::move(verts), m_origin); - - // upload to a dedicated bank; the renderer resolves draw calls by handle regardless of bank - m_bank = GfxRenderer->Create_Bank(); - shape.create_geometry(m_bank); // sets the shape's geometry handle, clears its CPU vertices - m_geometry = shape.data().geometry; - - glm::dvec3 const shapecenter = shape.data().area.center; - float const shaperadius = shape.radius(); // cached inside make_terrain, vertices already gone - - sec.m_shapes.emplace_back(std::move(shape)); - // extend the section bounds so the new terrain isn't frustum-culled at its edges - sec.m_area.radius = std::max( - sec.m_area.radius, - static_cast(glm::length(sec.m_area.center - shapecenter) + shaperadius)); - - return true; -} - -glm::dvec3 editor_terrain::vertex_position(int Ix, int Iz) const -{ - return glm::dvec3( - m_x0 + static_cast(Ix) * m_cellsize, - static_cast(m_heights[index(Ix, Iz)]), - m_z0 + static_cast(Iz) * m_cellsize); -} - -glm::vec3 editor_terrain::vertex_normal(int Ix, int Iz) const -{ - // central differences on the heightfield; clamp to edges - int const xl = std::max(0, Ix - 1), xr = std::min(m_cells, Ix + 1); - int const zl = std::max(0, Iz - 1), zr = std::min(m_cells, Iz + 1); - float const hl = m_heights[index(xl, Iz)], hr = m_heights[index(xr, Iz)]; - float const hd = m_heights[index(Ix, zl)], hu = m_heights[index(Ix, zr)]; - float const dx = static_cast((xr - xl)) * m_cellsize; - float const dz = static_cast((zr - zl)) * m_cellsize; - glm::vec3 n(-(hr - hl) / (dx > 0.f ? dx : 1.f), 1.0f, -(hu - hd) / (dz > 0.f ? dz : 1.f)); - return glm::normalize(n); -} - -world_vertex editor_terrain::make_vertex(int Ix, int Iz) const -{ - world_vertex v; - v.position = vertex_position(Ix, Iz); - v.normal = vertex_normal(Ix, Iz); - v.texture = glm::vec2(static_cast(Ix), static_cast(Iz)); - return v; -} - -// emits one quad (two upward-facing triangles) spanning grid corners (X0,Z0)..(X1,Z1) -void editor_terrain::emit_quad(int X0, int Z0, int X1, int Z1, std::vector &Out) const -{ - world_vertex const v00 = make_vertex(X0, Z0); - world_vertex const v10 = make_vertex(X1, Z0); - world_vertex const v01 = make_vertex(X0, Z1); - world_vertex const v11 = make_vertex(X1, Z1); - - Out.push_back(v00); - Out.push_back(v01); - Out.push_back(v10); - - Out.push_back(v11); - Out.push_back(v10); - Out.push_back(v01); -} - -// true if every grid vertex inside the block stays within Error of the bilinear plane of its corners -bool editor_terrain::block_flat(int X0, int Z0, int X1, int Z1, float Error) const -{ - float const h00 = m_heights[index(X0, Z0)]; - float const h10 = m_heights[index(X1, Z0)]; - float const h01 = m_heights[index(X0, Z1)]; - float const h11 = m_heights[index(X1, Z1)]; - double const wx = X1 - X0, wz = Z1 - Z0; - - for (int iz = Z0; iz <= Z1; ++iz) - for (int ix = X0; ix <= X1; ++ix) - { - double const tx = (wx > 0.0) ? (ix - X0) / wx : 0.0; - double const tz = (wz > 0.0) ? (iz - Z0) / wz : 0.0; - double const top = h00 + tx * (h10 - h00); - double const bot = h01 + tx * (h11 - h01); - double const interp = top + tz * (bot - top); - if (std::abs(static_cast(m_heights[index(ix, iz)]) - interp) > Error) - return false; - } - return true; -} - -// adaptive quadtree: flat blocks stay whole, the others are split into four -void editor_terrain::collect_blocks(int X0, int Z0, int X1, int Z1, float Error, std::vector> &Out) const -{ - bool const splitx = (X1 - X0) > 1; - bool const splitz = (Z1 - Z0) > 1; - - if ((!splitx && !splitz) || block_flat(X0, Z0, X1, Z1, Error)) - { - Out.push_back({X0, Z0, X1, Z1}); - return; - } - - int const xm = splitx ? (X0 + X1) / 2 : X1; - int const zm = splitz ? (Z0 + Z1) / 2 : Z1; - - collect_blocks(X0, Z0, xm, zm, Error, Out); - if (splitx) - collect_blocks(xm, Z0, X1, zm, Error, Out); - if (splitz) - collect_blocks(X0, zm, xm, Z1, Error, Out); - if (splitx && splitz) - collect_blocks(xm, zm, X1, Z1, Error, Out); -} - -void editor_terrain::emit_block(std::array const &Block, std::vector const &Marked, std::vector &Out) const -{ - int const x0 = Block[0], z0 = Block[1], x1 = Block[2], z1 = Block[3]; - // the edges walked the way the quads wind - std::vector> ring; - for (int z = z0; z < z1; ++z) - if (z == z0 || Marked[index(x0, z)] != 0) - ring.push_back({x0, z}); - for (int x = x0; x < x1; ++x) - if (x == x0 || Marked[index(x, z1)] != 0) - ring.push_back({x, z1}); - for (int z = z1; z > z0; --z) - if (z == z1 || Marked[index(x1, z)] != 0) - ring.push_back({x1, z}); - for (int x = x1; x > x0; --x) - if (x == x1 || Marked[index(x, z0)] != 0) - ring.push_back({x, z0}); - if (ring.size() <= 4) - { - emit_quad(x0, z0, x1, z1, Out); - return; - } - - world_vertex centre; - if ((x1 - x0) % 2 == 0 && (z1 - z0) % 2 == 0) - centre = make_vertex((x0 + x1) / 2, (z0 + z1) / 2); - else - { - auto const a = make_vertex(x0, z0), b = make_vertex(x1, z0), c = make_vertex(x0, z1), d = make_vertex(x1, z1); - centre = a; - centre.position = (a.position + b.position + c.position + d.position) * 0.25; - centre.normal = glm::normalize(a.normal + b.normal + c.normal + d.normal); - centre.texture = (a.texture + b.texture + c.texture + d.texture) * 0.25f; - } - for (std::size_t i = 0; i < ring.size(); ++i) - { - auto const &from = ring[i]; - auto const &to = ring[(i + 1) % ring.size()]; - Out.push_back(centre); - Out.push_back(make_vertex(from.first, from.second)); - Out.push_back(make_vertex(to.first, to.second)); - } -} - -void editor_terrain::build_vertices(std::vector &Out, bool Simplify) const -{ - Out.clear(); - Out.reserve(static_cast(m_cells) * m_cells * 6); - - if (Simplify) - { - std::vector> blocks; - collect_blocks(0, 0, m_cells, m_cells, m_simplify_error, blocks); - // the corners of the blocks, and the whole edge of the patch which the neighbouring patch meets in its own way - std::vector marked(static_cast(m_cells + 1) * (m_cells + 1), 0); - for (int i = 0; i <= m_cells; ++i) - marked[index(i, 0)] = marked[index(i, m_cells)] = marked[index(0, i)] = marked[index(m_cells, i)] = 1; - for (auto const &block : blocks) - marked[index(block[0], block[1])] = marked[index(block[2], block[1])] = marked[index(block[0], block[3])] = marked[index(block[2], block[3])] = 1; - for (auto const &block : blocks) - emit_block(block, marked, Out); - return; - } - - for (int iz = 0; iz < m_cells; ++iz) - for (int ix = 0; ix < m_cells; ++ix) - emit_quad(ix, iz, ix + 1, iz + 1, Out); -} - -void editor_terrain::regenerate(bool Simplify) -{ - if (!valid()) - return; - - std::vector verts; - build_vertices(verts, Simplify); - - gfx::vertex_array gpuverts; - gpuverts.reserve(verts.size()); - for (auto const &v : verts) - gpuverts.emplace_back(gfx::basic_vertex::convert(v, m_origin)); - gfx::userdata_array nouserdata; - - // fast path: same vertex count -> in-place swap into the existing chunk - if (gpuverts.size() == m_vertexcount && (m_geometry.bank != 0 || m_geometry.chunk != 0)) - { - GfxRenderer->Replace(gpuverts, nouserdata, m_geometry, GL_TRIANGLES); - return; - } - - // count changed (optimize / un-optimize): upload a fresh chunk and point the shape at it - gfx::geometry_handle const newhandle = GfxRenderer->Insert(gpuverts, nouserdata, m_bank, GL_TRIANGLES); - if (m_section != nullptr) - { - for (auto &shape : m_section->m_shapes) - { - auto const h = shape.data().geometry; - if (h.bank == m_geometry.bank && h.chunk == m_geometry.chunk) - { - shape.geometry(newhandle); - break; - } - } - } - m_geometry = newhandle; - m_vertexcount = gpuverts.size(); -} - -void editor_terrain::optimize(float ErrorMetres) -{ - m_simplify = true; - m_simplify_error = (ErrorMetres > 0.0f ? ErrorMetres : 0.01f); - m_dirty = false; - regenerate(true); -} - -void editor_terrain::unoptimize() -{ - m_simplify = false; - regenerate(false); -} - -void editor_terrain::destroy() -{ - if (m_section != nullptr) - { - // erase the shape whose geometry handle is ours; other shapes keep their handles (so they - // keep rendering), and the geometry GC reclaims our now-undrawn chunk's GPU memory - for (auto it = m_section->m_shapes.begin(); it != m_section->m_shapes.end(); ++it) - { - auto const h = it->data().geometry; - if (h.bank == m_geometry.bank && h.chunk == m_geometry.chunk) - { - m_section->m_shapes.erase(it); - break; - } - } - } - m_section = nullptr; - m_geometry = gfx::geometry_handle{0, 0}; - m_cells = 0; // mark invalid - m_heights.clear(); -} - -bool editor_terrain::contains(double X, double Z) const -{ - double const x1 = m_x0 + static_cast(m_cells) * m_cellsize; - double const z1 = m_z0 + static_cast(m_cells) * m_cellsize; - return (X >= m_x0 && X <= x1 && Z >= m_z0 && Z <= z1); -} - -double editor_terrain::height_at(double X, double Z) const -{ - return height_in(m_heights, X, Z); -} - -double editor_terrain::height_in(std::vector const &Heights, double X, double Z) const -{ - auto const &m_heights = Heights; - double const fx = (X - m_x0) / m_cellsize; - double const fz = (Z - m_z0) / m_cellsize; - int ix = static_cast(std::floor(fx)); - int iz = static_cast(std::floor(fz)); - ix = std::clamp(ix, 0, m_cells - 1); - iz = std::clamp(iz, 0, m_cells - 1); - double const tx = std::clamp(fx - ix, 0.0, 1.0); - double const tz = std::clamp(fz - iz, 0.0, 1.0); - - double const h00 = m_heights[index(ix, iz)]; - double const h10 = m_heights[index(ix + 1, iz)]; - double const h01 = m_heights[index(ix, iz + 1)]; - double const h11 = m_heights[index(ix + 1, iz + 1)]; - - // matches the triangulation in build_vertices - if (tx + tz <= 1.0) - return h00 + tx * (h10 - h00) + tz * (h01 - h00); - return h11 + (1.0 - tx) * (h01 - h11) + (1.0 - tz) * (h10 - h11); -} - -bool editor_terrain::sculpt(double X, double Z, double Radius, double Strength) -{ - if (!valid() || Radius <= 0.0) - return false; - - bool changed = false; - for (int iz = 0; iz <= m_cells; ++iz) - for (int ix = 0; ix <= m_cells; ++ix) - { - double const vx = m_x0 + static_cast(ix) * m_cellsize; - double const vz = m_z0 + static_cast(iz) * m_cellsize; - double const d = std::sqrt((vx - X) * (vx - X) + (vz - Z) * (vz - Z)); - if (d > Radius) - continue; - // smooth cosine falloff: full strength at the centre, zero at the rim - double const falloff = 0.5 * (std::cos(kPi * d / Radius) + 1.0); - m_heights[index(ix, iz)] += static_cast(Strength * falloff); - changed = true; - } - - if (changed) - { - // sculpting edits the full-resolution mesh (fixed vertex count => fast in-place update); - // mark dirty so it can be auto-simplified once the stroke finishes, and modified for saving - m_simplify = false; - m_dirty = true; - m_modified = true; - regenerate(false); - } - return changed; -} - -bool editor_terrain::smooth(double X, double Z, double Radius, double Amount, std::function const &Ground) -{ - if (!valid() || Radius <= 0.0 || Amount <= 0.0) - return false; - double const reach = Radius + m_cellsize; - if (X + reach < m_x0 || X - reach > m_x0 + m_cells * m_cellsize || Z + reach < m_z0 || Z - reach > m_z0 + m_cells * m_cellsize) - return false; - - double const step = m_cellsize; - return reshape([&](double const Vx, double const Vz, float &Height) { - double const d = std::sqrt((Vx - X) * (Vx - X) + (Vz - Z) * (Vz - Z)); - if (d > Radius) - return false; - double const own = Height; - // the neighbours a cell away, read from the ground as it was before the stroke, whichever patch holds them - double const average = (Ground(Vx - step, Vz, own) + Ground(Vx + step, Vz, own) + Ground(Vx, Vz - step, own) + Ground(Vx, Vz + step, own) + own * 4.0) / 8.0; - double const falloff = 0.5 * (std::cos(kPi * d / Radius) + 1.0); - double const smoothed = own + (average - own) * std::min(1.0, Amount * falloff); - if (std::abs(smoothed - own) < 1e-5) - return false; - Height = static_cast(smoothed); - return true; - }); -} - -bool editor_terrain::reshape(std::function const &Shaper) -{ - if (!valid()) - return false; - - bool changed = false; - for (int iz = 0; iz <= m_cells; ++iz) - for (int ix = 0; ix <= m_cells; ++ix) - changed |= Shaper(m_x0 + static_cast(ix) * m_cellsize, m_z0 + static_cast(iz) * m_cellsize, m_heights[index(ix, iz)]); - - if (changed) - { - m_simplify = false; - m_dirty = true; - m_modified = true; - regenerate(false); - } - return changed; -} - -void editor_terrain::restore(std::vector const &Heights) -{ - if (!valid() || Heights.size() != m_heights.size()) - return; - m_heights = Heights; - m_simplify = false; - m_dirty = true; + // a worker may still be making a mesh of the current data, so a copy is changed instead + if (m_data.use_count() > 1) + m_data = std::make_shared(*m_data); m_modified = true; - regenerate(false); + if (Shape) + ++m_shapeversion; + if (Paint) + ++m_paintversion; + // the pointer is to const for everyone else; this chunk is its only holder now + return const_cast(*m_data); +} + +void editor_terrain::replace(heightmap::chunk_ptr Data, bool const Shape, bool const Paint) +{ + m_data = std::move(Data); + m_modified = true; + if (Shape) + ++m_shapeversion; + if (Paint) + ++m_paintversion; } glm::dvec3 editor_terrain::centre() const { - double const c = 0.5 * static_cast(m_cells) * m_cellsize; - double y = 0.0; - if (!m_heights.empty()) - y = m_heights[index(m_cells / 2, m_cells / 2)]; - return glm::dvec3(m_x0 + c, y, m_z0 + c); + auto const low{m_data->corner()}; + auto const half{heightmap::chunk_size * 0.5}; + return {low.x + half, m_data->height_at(low.x + half, low.y + half), low.y + half}; } diff --git a/editor/editorTerrain.hpp b/editor/editorTerrain.hpp index 709cc1ee8..d26c4c521 100644 --- a/editor/editorTerrain.hpp +++ b/editor/editorTerrain.hpp @@ -9,119 +9,72 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include +#include +#include #include -#include -#include #include +#include "scene/heightmapterrain.h" #include "utilities/Classes.h" // material_handle #include "interfaces/ITexture.h" // null_handle -#include "rendering/geometrybank.h" // gfx::geometry_handle / geometrybank_handle +#include "rendering/geometrybank.h" // gfx::geometry_handle namespace scene { class basic_section; } -// Editor-owned, editable terrain patch. +// a chunk of the heightmap terrain held in memory: its data, and what's drawn of it. // -// The engine's scene::shape_node drops its CPU-side vertices the moment it uploads them to the GPU, -// so it can't be edited or raycast after load. This class keeps the authoritative, editable data -// (a regular grid heightmap) on the CPU, generates a shape_node purely for rendering, and answers -// height/raycast queries directly from the heightmap (fast and exact). Sculpting updates the -// heightmap and pushes the new vertex positions into the shape's existing geometry chunk. +// the data is shared with the worker threads making its meshes, so it's never changed in place: an edit gets a copy +// of its own when the current data is in use elsewhere. what's drawn is managed by the terrain streamer class editor_terrain { public: - editor_terrain() = default; + explicit editor_terrain(heightmap::chunk_ptr Data) : m_data(std::move(Data)) {} - // builds an NxN-cell grid centred on Center, each quad CellSize metres across, using the - // material fetched from TextureName (empty => untextured). when Sampler is supplied it provides - // the starting height at each grid vertex (returns false to fall back to Center.y) - used to - // capture existing terrain. returns false on failure. - using height_sampler = std::function; - bool create(glm::dvec3 const &Center, int Cells, float CellSize, std::string const &TextureName, - height_sampler const &Sampler = {}); + heightmap::chunk_data const &data() const { return *m_data; } + heightmap::chunk_ptr const &shared() const { return m_data; } + // the data, to be changed. marks the chunk as edited; Shape: the heights changed, Paint: the materials changed + heightmap::chunk_data &edit(bool const Shape, bool const Paint); + // puts provided data in place of the current one + void replace(heightmap::chunk_ptr Data, bool const Shape, bool const Paint); - // true if (X,Z) lies within the terrain's horizontal footprint - bool contains(double X, double Z) const; - // surface height at (X,Z) (bilinear over the covering quad); only valid when contains() is true - double height_at(double X, double Z) const; + heightmap::chunk_key key() const { return m_data->key; } + // true if (X,Z) lies within the chunk + bool contains(double X, double Z) const { return m_data->contains(X, Z); } + // surface height at (X,Z), the way the full grid is triangulated + double height_at(double X, double Z) const { return m_data->height_at(X, Z); } // the same, from heights taken from heights() earlier - double height_in(std::vector const &Heights, double X, double Z) const; - - // raises/lowers vertices within Radius of (X,Z) by Strength (metres, signed), with a smooth - // falloff; regenerates the rendered geometry (full resolution). returns true if anything changed. - bool sculpt(double X, double Z, double Radius, double Strength); - // gives every grid vertex to Shaper, with its world position and height; Shaper returns true if it changed the height. - // regenerates the rendered geometry (full resolution). returns true if anything changed. - bool reshape(std::function const &Shaper); - // pulls the vertices within Radius of (X,Z) towards the average of their neighbours, Amount (0..1) of the way at the centre, - // with a smooth falloff. Ground gives the height before the stroke at a world point, Fallback where there's no terrain - bool smooth(double X, double Z, double Radius, double Amount, std::function const &Ground); - // puts back heights taken from heights() earlier - void restore(std::vector const &Heights); - - // rebuilds the rendered mesh, collapsing regions flatter than ErrorMetres into larger quads - // (adaptive quadtree). the editable heightmap is untouched, so sculpting/raycast stay exact. - void optimize(float ErrorMetres); - // rebuilds the rendered mesh at full resolution (undoes optimize) - void unoptimize(); - - // removes the rendered shape from its section (stops drawing it); the renderer's geometry - // garbage collector reclaims the GPU memory shortly after. used by terrain streaming to unload. - void destroy(); - - // horizontal centre and extent, handy for the UI / camera framing + double height_in(std::vector const &Heights, double X, double Z) const { return m_data->height_in(Heights, X, Z); } + std::vector const &heights() const { return m_data->heights; } + int cells() const { return m_data->cells; } glm::dvec3 centre() const; - float extent() const { return m_cells * m_cellsize; } - bool valid() const { return m_cells > 0; } + float extent() const { return static_cast(heightmap::chunk_size); } + bool valid() const { return m_data != nullptr && m_data->valid(); } gfx::geometry_handle geometry() const { return m_geometry; } - bool optimized() const { return m_simplify; } - // set by sculpt() when the mesh changed and is currently full-resolution; cleared by optimize(). - // used to auto-simplify only the chunks that were actually edited, once a stroke finishes. - bool dirty() const { return m_dirty; } - // set by sculpt() and never auto-cleared; used by streaming to know a chunk needs saving to disk + // rendered triangle count, and the count of the full grid + std::size_t triangles() const { return m_triangles; } + std::size_t full_triangles() const { return static_cast(cells()) * cells() * 2; } + // changed since it was loaded or saved bool modified() const { return m_modified; } void clear_modified() { m_modified = false; } - // direct access to the editable heightmap (row-major world Y, (cells+1)^2), for save/load - std::vector const &heights() const { return m_heights; } - int cells() const { return m_cells; } - // rendered triangle count (drops after optimize) - std::size_t triangles() const { return m_vertexcount / 3; } - // full-resolution triangle count, for reference - std::size_t full_triangles() const { return static_cast(m_cells) * m_cells * 2; } - private: - int index(int Ix, int Iz) const { return Iz * (m_cells + 1) + Ix; } - glm::dvec3 vertex_position(int Ix, int Iz) const; - glm::vec3 vertex_normal(int Ix, int Iz) const; - world_vertex make_vertex(int Ix, int Iz) const; - // fills Out with the GL_TRIANGLES world-space vertex list; Simplify enables adaptive merging - void build_vertices(std::vector &Out, bool Simplify) const; - // adaptive quadtree helpers (used when Simplify is on) - bool block_flat(int X0, int Z0, int X1, int Z1, float Error) const; - void collect_blocks(int X0, int Z0, int X1, int Z1, float Error, std::vector> &Out) const; - // a block as a fan through the marked grid vertices of its edges, so it meets its smaller neighbours without cracks - void emit_block(std::array const &Block, std::vector const &Marked, std::vector &Out) const; - void emit_quad(int X0, int Z0, int X1, int Z1, std::vector &Out) const; - // rebuilds and re-uploads the rendered geometry (Replace when the count is unchanged, otherwise - // a fresh chunk whose handle is swapped into the shape) - void regenerate(bool Simplify); + friend class terrain_streamer; - int m_cells{0}; // quads per side; (m_cells+1)^2 grid vertices - float m_cellsize{1.0f}; // metres per quad - double m_x0{0.0}, m_z0{0.0}; // world position of grid corner (ix=0, iz=0) - std::vector m_heights; // per-vertex world Y, row-major (m_cells+1)^2 + heightmap::chunk_ptr m_data; + bool m_modified{false}; + std::uint64_t m_shapeversion{1}; // grows with every change of the heights + std::uint64_t m_paintversion{1}; // grows with every change of the paint + // drawn state, managed by the streamer + int m_slot{-1}; // geometry slot holding the mesh + gfx::geometry_handle m_geometry{0, 0}; + std::size_t m_triangles{0}; + int m_stride{0}; // of the mesh in the slot, 0: none yet + std::uint64_t m_builtversion{0}; // shape version the mesh was made from + std::uint64_t m_paintedversion{0}; // paint version the material was made from + bool m_neighbours{false}; // a neighbour came or changed, the edges of the mesh are to be made again + bool m_building{false}; // a mesh is being made by a worker material_handle m_material{null_handle}; - gfx::geometrybank_handle m_bank{0, 0}; // geometry bank owning the rendered chunk - gfx::geometry_handle m_geometry{0, 0}; // rendered chunk - std::size_t m_vertexcount{0}; // current chunk's vertex count (for Replace vs recreate) - glm::dvec3 m_origin{0.0}; // origin the GPU vertices are stored relative to - scene::basic_section *m_section{nullptr}; // section holding the shape, for handle swaps - - bool m_simplify{false}; // whether the rendered mesh is currently simplified - float m_simplify_error{0.5f}; // flatness tolerance used by optimize() - bool m_dirty{false}; // edited since the last optimize (full-res, awaiting simplification) - bool m_modified{false}; // edited since load/save (for streaming persistence) + scene::basic_section *m_section{nullptr}; // holding the shape, null: not drawn + glm::dvec3 m_low{0.0}, m_high{0.0}; // bounds of the drawn mesh }; diff --git a/editor/editorTerrainStreamer.cpp b/editor/editorTerrainStreamer.cpp index a932367f2..bb6293db2 100644 --- a/editor/editorTerrainStreamer.cpp +++ b/editor/editorTerrainStreamer.cpp @@ -10,294 +10,1412 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "editor/editorTerrainStreamer.hpp" +#include "model/vertex.h" +#include "rendering/renderer.h" +#include "scene/scene.h" +#include "simulation/simulation.h" #include "utilities/Globals.h" +#include "utilities/Logs.h" #include #include #include -#include #include -#include -#include -// simulation-level streamer instance (see header) terrain_streamer EditorTerrain; -void terrain_streamer::configure(int Cells, float CellSize, int Radius, float BaseHeight, std::string const &Texture) +namespace { - m_cells = std::max(1, Cells); - m_cellsize = std::max(0.1f, CellSize); - m_radius = std::max(0, Radius); - m_baseheight = BaseHeight; - m_texture = Texture; + +int constexpr worker_count{2}; +std::size_t constexpr max_loading{12}; // chunks asked from the workers at a time +std::size_t constexpr max_meshing{12}; // meshes asked from the workers at a time +double constexpr upload_budget{0.004}; // seconds of a frame for taking over finished work +int constexpr materials_per_frame{6}; +double constexpr look_ahead{8.0}; // seconds; chunks are loaded around where the camera will be by then +double constexpr look_ahead_limit{2000.0}; // metres +double constexpr region_half{scene::EU07_REGIONSIDESECTIONCOUNT * scene::EU07_SECTIONSIZE * 0.5 - heightmap::chunk_size}; +double constexpr kPi{3.14159265358979323846}; + +double steady_seconds() +{ + return std::chrono::duration(std::chrono::steady_clock::now().time_since_epoch()).count(); } -terrain_streamer::chunk_key terrain_streamer::key_at(double X, double Z) const +std::uint64_t geometry_key(gfx::geometry_handle const &Geometry) { - double const size = chunk_world_size(); - return {static_cast(std::floor(X / size)), static_cast(std::floor(Z / size))}; + return (static_cast(Geometry.bank) << 32) | Geometry.chunk; } -glm::dvec3 terrain_streamer::chunk_centre(int Cx, int Cz) const +bool in_region(glm::dvec2 const &Point) { - double const size = chunk_world_size(); - return glm::dvec3((Cx + 0.5) * size, static_cast(m_baseheight), (Cz + 0.5) * size); + return std::abs(Point.x) < region_half && std::abs(Point.y) < region_half; } -std::string terrain_streamer::chunk_path(int Cx, int Cz) const +glm::dvec3 chunk_centre(heightmap::chunk_key const &Key) { - return m_dir + "/chunk_" + std::to_string(Cx) + "_" + std::to_string(Cz) + ".etc"; + auto const low{heightmap::chunk_corner(Key)}; + return {low.x + heightmap::chunk_size * 0.5, 0.0, low.y + heightmap::chunk_size * 0.5}; } -bool terrain_streamer::chunk_on_disk(chunk_key const &Key) +// index range of the grid points (spacing Step from Origin, Count points) within [Low, High] +std::pair index_range(double const Origin, double const Step, int const Count, double const Low, double const High) { - auto const it = m_known.find(Key); - if (it != m_known.end()) - return (it->second & cf_exists_on_disk) != 0; - - std::error_code ec; - bool const exists = std::filesystem::exists(chunk_path(Key.first, Key.second), ec); - m_known[Key] = exists ? cf_exists_on_disk : 0; - return exists; + auto const first{std::max(0, static_cast(std::ceil((Low - Origin) / Step - 1e-9)))}; + auto const last{std::min(Count - 1, static_cast(std::floor((High - Origin) / Step + 1e-9)))}; + return {first, last}; } -// 16-bit chunk file: 'ETC1' | uint16 cells | float baseY | float step | (cells+1)^2 * uint16 -// where worldY = baseY + raw * step (per-chunk auto-scaled to fit the height range losslessly-ish) -bool terrain_streamer::load_heights(int Cx, int Cz, std::vector &Out) const +double falloff(double const Distance, double const Radius) { - std::ifstream f(chunk_path(Cx, Cz), std::ios::binary); - if (!f) - return false; + // smooth cosine falloff: full strength at the centre, zero at the rim + return 0.5 * (std::cos(kPi * Distance / Radius) + 1.0); +} - char magic[4] = {}; - f.read(magic, 4); - if (f.gcount() != 4 || magic[0] != 'E' || magic[1] != 'T' || magic[2] != 'C' || magic[3] != '1') - return false; - - std::uint16_t cells = 0; - float baseY = 0.0f, step = 0.0f; - f.read(reinterpret_cast(&cells), sizeof(cells)); - f.read(reinterpret_cast(&baseY), sizeof(baseY)); - f.read(reinterpret_cast(&step), sizeof(step)); - if (!f || static_cast(cells) != m_cells) - return false; // resolution changed since save: ignore and regenerate - - std::size_t const n = static_cast(cells + 1) * (cells + 1); - Out.resize(n); - for (std::size_t i = 0; i < n; ++i) +void erase_shape(std::vector &Shapes, gfx::geometry_handle const &Geometry) +{ + for (auto it = Shapes.begin(); it != Shapes.end(); ++it) { - std::uint16_t raw = 0; - f.read(reinterpret_cast(&raw), sizeof(raw)); - if (!f) - return false; - Out[i] = baseY + static_cast(raw) * step; + auto const &geometry{it->data().geometry}; + if (geometry.bank == Geometry.bank && geometry.chunk == Geometry.chunk) + { + Shapes.erase(it); + return; + } } +} + +} // namespace + +terrain_streamer::~terrain_streamer() +{ + stop_workers(); +} + +std::string terrain_streamer::pack_path(heightmap::pack_key const &Key) const +{ + return m_directory + heightmap::pack_file_name(Key); +} + +bool terrain_streamer::open(std::string const &Name) +{ + close(); + m_name = Name; + m_directory = "terrain/" + Name + "/"; + m_manifest = heightmap::manifest(); + m_manifestchanged = false; + auto const manifestpath{m_directory + "terrain.yaml"}; + std::error_code ec; + if (std::filesystem::exists(manifestpath, ec)) + { + std::string error; + if (false == heightmap::load_manifest(manifestpath, m_manifest, &error)) + ErrorLog("Bad file: heightmap terrain description \"" + manifestpath + "\": " + error, logtype::file); + } + else if (false == std::filesystem::exists(m_directory, ec)) + WriteLog("Heightmap terrain \"" + m_directory + "\" has no files yet", logtype::generic); + m_active = true; + m_waterchanged = true; + start_workers(); + WriteLog("Heightmap terrain: " + m_directory, logtype::generic); return true; } -void terrain_streamer::save_heights(int Cx, int Cz, editor_terrain const &Terrain) +void terrain_streamer::close() { - auto const &h = Terrain.heights(); - if (h.empty()) - return; - - float minh = h[0], maxh = h[0]; - for (float const v : h) + stop_workers(); + if (simulation::Region != nullptr) { - minh = std::min(minh, v); - maxh = std::max(maxh, v); + for (auto &entry : m_chunks) + undraw(*entry.second); + clear_water(true); } - float const step = (maxh > minh) ? (maxh - minh) / 65535.0f : 0.0f; - - std::error_code ec; - std::filesystem::create_directories(m_dir, ec); - std::ofstream f(chunk_path(Cx, Cz), std::ios::binary | std::ios::trunc); - if (!f) - return; - - char const magic[4] = {'E', 'T', 'C', '1'}; - std::uint16_t const cells = static_cast(Terrain.cells()); - f.write(magic, 4); - f.write(reinterpret_cast(&cells), sizeof(cells)); - f.write(reinterpret_cast(&minh), sizeof(minh)); - f.write(reinterpret_cast(&step), sizeof(step)); - for (float const v : h) - { - std::uint16_t const raw = (step > 0.0f) - ? static_cast(std::lround((v - minh) / step)) - : std::uint16_t{0}; - f.write(reinterpret_cast(&raw), sizeof(raw)); - } -} - -void terrain_streamer::update(glm::dvec3 const &CameraPos) -{ - if (!m_active) - return; - - chunk_key const camera = key_at(CameraPos.x, CameraPos.z); - // the terrain reaches as far as the rest of the scenery is drawn - int const radius = std::max(m_radius, std::min(48, static_cast(std::ceil(Global.BaseDrawRange / std::max(1.0f, chunk_world_size()))))); - - // missing chunks inside the radius, the nearest first, as many as fit in a few milliseconds of the frame - if (m_ring_radius != radius) - { - m_ring.clear(); - for (int dz = -radius; dz <= radius; ++dz) - for (int dx = -radius; dx <= radius; ++dx) - m_ring.push_back({dx, dz}); - std::sort(m_ring.begin(), m_ring.end(), [](chunk_key const &A, chunk_key const &B) { return A.first * A.first + A.second * A.second < B.first * B.first + B.second * B.second; }); - m_ring_radius = radius; - } - auto const started = std::chrono::steady_clock::now(); - for (auto const &offset : m_ring) - { - if (std::chrono::steady_clock::now() - started > std::chrono::milliseconds(4)) - break; - chunk_key const key{camera.first + offset.first, camera.second + offset.second}; - if (m_chunks.count(key)) - continue; - - // only stream chunks that were actually authored (exist on disk); empty space stays empty - std::vector loaded; - if (!chunk_on_disk(key) || !load_heights(key.first, key.second, loaded)) - continue; - - glm::dvec3 const centre = chunk_centre(key.first, key.second); - double const size = chunk_world_size(); - double const x0 = key.first * size, z0 = key.second * size; // chunk corner - int const cells = m_cells; - float const cs = m_cellsize; - editor_terrain::height_sampler sampler = - [&loaded, x0, z0, cells, cs](double X, double Z, double &OutY) -> bool { - int ix = static_cast(std::lround((X - x0) / cs)); - int iz = static_cast(std::lround((Z - z0) / cs)); - ix = std::clamp(ix, 0, cells); - iz = std::clamp(iz, 0, cells); - OutY = loaded[static_cast(iz) * (cells + 1) + ix]; - return true; - }; - - auto terrain = std::make_unique(); - if (terrain->create(centre, m_cells, m_cellsize, m_texture, sampler)) - { - if (m_auto_optimize) - terrain->optimize(m_simplify_error); - m_chunks.emplace(key, std::move(terrain)); - } - } - - // unload chunks that drifted outside the radius - for (auto it = m_chunks.begin(); it != m_chunks.end();) - { - int const dx = it->first.first - camera.first; - int const dz = it->first.second - camera.second; - if (std::abs(dx) > radius || std::abs(dz) > radius) - { - if (it->second) - { - // persist edits before dropping the chunk, so they survive the round-trip - if (m_persist && it->second->modified()) - { - save_heights(it->first.first, it->first.second, *it->second); - m_known[it->first] |= cf_exists_on_disk; - } - it->second->destroy(); - } - it = m_chunks.erase(it); - } - else - ++it; - } -} - -void terrain_streamer::clear() -{ - for (auto &entry : m_chunks) - if (entry.second) - { - if (m_persist && entry.second->modified()) - { - save_heights(entry.first.first, entry.first.second, *entry.second); - m_known[entry.first] |= cf_exists_on_disk; - } - entry.second->destroy(); - } + clear_water(false); m_chunks.clear(); -} - -void terrain_streamer::collect(std::vector &Out) const -{ - for (auto const &entry : m_chunks) - if (entry.second) - Out.push_back(entry.second.get()); -} - -editor_terrain *terrain_streamer::terrain_at(double X, double Z) const -{ - auto const it = m_chunks.find(key_at(X, Z)); - if (it != m_chunks.end() && it->second && it->second->contains(X, Z)) - return it->second.get(); - return nullptr; -} - -void terrain_streamer::save_chunk(int Cx, int Cz, editor_terrain const &Terrain) -{ - save_heights(Cx, Cz, Terrain); - m_known[{Cx, Cz}] |= cf_exists_on_disk; -} - -void terrain_streamer::add_chunk(int Cx, int Cz) -{ - chunk_key const key{Cx, Cz}; - if (m_chunks.count(key)) - return; // already resident - - glm::dvec3 const centre = chunk_centre(Cx, Cz); - auto terrain = std::make_unique(); - if (!terrain->create(centre, m_cells, m_cellsize, m_texture)) // flat - return; - - // persist immediately so it becomes part of the authored, streamable world - save_heights(Cx, Cz, *terrain); - m_known[key] |= cf_exists_on_disk; - - if (m_auto_optimize) - terrain->optimize(m_simplify_error); - m_chunks.emplace(key, std::move(terrain)); + m_packs.clear(); + m_loading.clear(); + m_removed.clear(); + m_palette.clear(); + m_active = false; + m_name.clear(); + m_directory.clear(); } void terrain_streamer::reset() { - // do NOT call editor_terrain::destroy() here: on a scenery reload the sections those chunks - // referenced are already gone. just drop our bookkeeping; the old region freed the shapes. + // the sections the shapes were put in are gone with the old region, they aren't to be touched + stop_workers(); + for (auto &entry : m_chunks) + { + entry.second->m_section = nullptr; + if (entry.second->m_material != null_handle && GfxRenderer) + GfxRenderer->Terrain_Release(entry.second->m_material); + } + for (auto &slot : m_slots) + slot.used = false; m_chunks.clear(); - m_known.clear(); + m_packs.clear(); + m_loading.clear(); + m_removed.clear(); + m_palette.clear(); + clear_water(false); m_active = false; + m_name.clear(); + m_directory.clear(); + m_hascamera = false; } -void terrain_streamer::flush() +// workers + +void terrain_streamer::start_workers() { + if (false == m_workers.empty()) + return; + m_stop = false; + for (int i = 0; i < worker_count; ++i) + m_workers.emplace_back(&terrain_streamer::worker, this); +} + +void terrain_streamer::stop_workers() +{ + { + std::lock_guard lock{m_mutex}; + m_stop = true; + m_jobs.clear(); + } + m_wakeup.notify_all(); + for (auto &worker : m_workers) + if (worker.joinable()) + worker.join(); + m_workers.clear(); + std::lock_guard lock{m_mutex}; + m_results.clear(); + m_busy = 0; + m_stop = false; for (auto &entry : m_chunks) - if (entry.second && entry.second->modified()) + entry.second->m_building = false; +} + +void terrain_streamer::submit(job Job) +{ + { + std::lock_guard lock{m_mutex}; + m_jobs.push_back(std::move(Job)); + } + m_wakeup.notify_one(); +} + +void terrain_streamer::worker() +{ + while (true) + { + job task; { - save_heights(entry.first.first, entry.first.second, *entry.second); - m_known[entry.first] |= cf_exists_on_disk; - entry.second->clear_modified(); + std::unique_lock lock{m_mutex}; + m_wakeup.wait(lock, [this]() { return m_stop || false == m_jobs.empty(); }); + if (m_stop) + return; + // the nearest work first + auto const next{std::min_element(m_jobs.begin(), m_jobs.end(), [](job const &A, job const &B) { return A.priority < B.priority; })}; + task = std::move(*next); + m_jobs.erase(next); + ++m_busy; } + result done; + done.type = task.type; + done.pack = task.pack; + done.chunk = task.chunk; + done.generation = task.generation; + done.stride = task.stride; + done.version = task.version; + switch (task.type) + { + case job::kind::pack: + { + auto const path{pack_path(task.pack)}; + std::error_code ec; + if (std::filesystem::exists(path, ec)) + { + auto file{std::make_shared()}; + std::lock_guard lock{m_filemutex}; + if (file->open(path, &done.error)) + done.file = file; + } + break; + } + case job::kind::chunk: + { + std::lock_guard lock{m_filemutex}; + done.data = task.file->read(task.chunk, &done.error); + break; + } + case job::kind::mesh: + { + auto const &neighbours{task.neighbours}; + heightmap::build_mesh(*task.data, task.stride, task.origin, + [&neighbours](double const X, double const Z, double &Height) { + for (auto const &neighbour : neighbours) + if (neighbour != nullptr && neighbour->contains(X, Z)) + { + Height = neighbour->height_at(X, Z); + return true; + } + return false; + }, + done.mesh); + break; + } + } + std::lock_guard lock{m_mutex}; + m_results.push_back(std::move(done)); + --m_busy; + } +} + +void terrain_streamer::process(result &Result) +{ + switch (Result.type) + { + case job::kind::pack: + { + auto &pack{m_packs[Result.pack]}; + if (Result.generation != pack.generation) + break; // the file was written meanwhile, and is known already + if (Result.file != nullptr) + { + pack.file = std::move(Result.file); + pack.status = pack_state::state::ready; + } + else + { + if (false == Result.error.empty()) + ErrorLog("Bad file: " + Result.error, logtype::file); + pack.status = pack_state::state::missing; + } + break; + } + case job::kind::chunk: + { + m_loading.erase(Result.chunk); + auto const pack{m_packs.find(heightmap::pack_of(Result.chunk))}; + if (pack == m_packs.end() || pack->second.generation != Result.generation) + break; // read from a file which was written anew since + if (Result.data == nullptr) + { + ErrorLog("Bad file: " + Result.error, logtype::file); + break; + } + if (m_chunks.count(Result.chunk) > 0 || m_removed.count(Result.chunk) > 0) + break; + auto chunk{std::make_unique(std::move(Result.data))}; + auto const [low, high]{std::minmax_element(chunk->heights().begin(), chunk->heights().end())}; + auto const corner{chunk->data().corner()}; + chunk->m_low = {corner.x, *low, corner.y}; + chunk->m_high = {corner.x + heightmap::chunk_size, *high, corner.y + heightmap::chunk_size}; + m_chunks.emplace(Result.chunk, std::move(chunk)); + touch_neighbours(Result.chunk); + break; + } + case job::kind::mesh: + { + auto const lookup{m_chunks.find(Result.chunk)}; + if (lookup == m_chunks.end()) + break; + auto &chunk{*lookup->second}; + chunk.m_building = false; + if (Result.version < chunk.m_builtversion) + break; + upload(chunk, Result.mesh, Result.stride); + chunk.m_builtversion = Result.version; + break; + } + } +} + +// drawing + +material_handle terrain_streamer::palette_material(std::uint16_t const Layer) +{ + auto const index{Layer < m_manifest.layers.size() ? Layer : std::uint16_t{0}}; + auto const lookup{m_palette.find(index)}; + if (lookup != m_palette.end()) + return lookup->second; + auto const material{m_manifest.layers.empty() ? null_handle : GfxRenderer->Fetch_Material(m_manifest.layers[index].material)}; + m_palette.emplace(index, material); + return material; +} + +void terrain_streamer::update_material(editor_terrain &Chunk) +{ + auto const &data{Chunk.data()}; + std::vector layers; + auto const count{std::max(1, data.layer_count())}; + for (std::size_t slot = 0; slot < count; ++slot) + { + auto const layer{data.layers[slot] == heightmap::no_layer ? std::uint16_t{0} : data.layers[slot]}; + auto const size{layer < m_manifest.layers.size() ? m_manifest.layers[layer].size : 0.f}; + layers.push_back({palette_material(layer), size}); + } + auto const corner{data.corner()}; + auto const packcorner{heightmap::pack_corner(heightmap::pack_of(data.key))}; + glm::vec3 const placement{static_cast(corner.x - packcorner.x), static_cast(corner.y - packcorner.y), static_cast(heightmap::chunk_size)}; + auto const painted{data.paint > 0 && count > 1}; + auto const material{GfxRenderer->Terrain_Material(Chunk.m_material, layers, painted ? data.paint : 0, painted ? data.weights.data() : nullptr, placement)}; + if (Chunk.m_material != null_handle && Chunk.m_material != material) + GfxRenderer->Terrain_Release(Chunk.m_material); + Chunk.m_material = material; + Chunk.m_paintedversion = Chunk.m_paintversion; +} + +void terrain_streamer::upload(editor_terrain &Chunk, heightmap::mesh &Mesh, int const Stride) +{ + if (simulation::Region == nullptr || Mesh.vertices.empty()) + return; + auto const cells{Chunk.cells()}; + auto const triangles{Mesh.indices.size() / 3}; + gfx::userdata_array nouserdata; + + // the mesh goes to a geometry slot made for its grid; a slot of the same kind is refilled in place + auto fits = [&](geometry_slot const &Slot) { return Slot.cells == cells && Slot.stride == Stride; }; + if (Chunk.m_slot < 0 || false == fits(m_slots[Chunk.m_slot])) + { + if (Chunk.m_slot >= 0) + m_slots[Chunk.m_slot].used = false; + Chunk.m_slot = -1; + for (std::size_t i = 0; i < m_slots.size(); ++i) + if (false == m_slots[i].used && fits(m_slots[i])) + { + Chunk.m_slot = static_cast(i); + break; + } + if (Chunk.m_slot < 0) + { + geometry_slot slot; + slot.bank = GfxRenderer->Create_Bank(); + slot.cells = cells; + slot.stride = Stride; + slot.geometry = GfxRenderer->Insert(Mesh.indices, Mesh.vertices, nouserdata, slot.bank, GL_TRIANGLES); + if (slot.geometry.chunk == 0) + { + // the shape can't keep the geometry it had, it's given back already + undraw(Chunk); + return; + } + slot.used = true; + Chunk.m_slot = static_cast(m_slots.size()); + m_slotofgeometry[geometry_key(slot.geometry)] = Chunk.m_slot; + m_slots.push_back(slot); + } + else + { + m_slots[Chunk.m_slot].used = true; + GfxRenderer->Replace(Mesh.vertices, nouserdata, m_slots[Chunk.m_slot].geometry, GL_TRIANGLES); + } + } + else + { + GfxRenderer->Replace(Mesh.vertices, nouserdata, m_slots[Chunk.m_slot].geometry, GL_TRIANGLES); + } + auto const &slot{m_slots[Chunk.m_slot]}; + + if (Chunk.m_material == null_handle || Chunk.m_paintedversion != Chunk.m_paintversion) + update_material(Chunk); + + // the shape gets just two bounding vertices: they give it its area, and leave no triangles behind for code which + // reads the source vertices of the section shapes; the terrain answers questions about the ground itself + auto const centre{chunk_centre(Chunk.key())}; + auto §ion{simulation::Region->section(centre)}; + // the section makes the geometry of its own shapes once, before it's drawn; done first, it leaves ours alone + section.create_geometry(); + auto const low{Mesh.low}; + auto const high{Mesh.high}; + std::vector bounds(2); + bounds[0].position = low; + bounds[1].position = high; + scene::shape_node shape; + shape.make_terrain(Chunk.m_material, std::move(bounds), section.m_area.center); + shape.geometry(slot.geometry); + + auto replaced{false}; + if (Chunk.m_section != nullptr) + { + for (auto &existing : Chunk.m_section->m_shapes) + { + auto const &geometry{existing.data().geometry}; + if (geometry.bank == Chunk.m_geometry.bank && geometry.chunk == Chunk.m_geometry.chunk) + { + existing = shape; + replaced = true; + break; + } + } + } + if (false == replaced) + section.m_shapes.emplace_back(shape); + // the section reaches far enough for the chunk not to be culled at its edges + section.m_area.radius = std::max(section.m_area.radius, static_cast(glm::length(section.m_area.center - Mesh.centre) + Mesh.radius)); + Chunk.m_section = §ion; + Chunk.m_geometry = slot.geometry; + Chunk.m_triangles = triangles; + Chunk.m_stride = Stride; + Chunk.m_low = low; + Chunk.m_high = high; +} + +void terrain_streamer::undraw(editor_terrain &Chunk) +{ + if (Chunk.m_section != nullptr && simulation::Region != nullptr) + erase_shape(Chunk.m_section->m_shapes, Chunk.m_geometry); + if (Chunk.m_slot >= 0) + m_slots[Chunk.m_slot].used = false; + if (Chunk.m_material != null_handle && GfxRenderer) + GfxRenderer->Terrain_Release(Chunk.m_material); + Chunk.m_slot = -1; + Chunk.m_material = null_handle; + Chunk.m_section = nullptr; + Chunk.m_geometry = gfx::geometry_handle{0, 0}; + Chunk.m_triangles = 0; + Chunk.m_stride = 0; + Chunk.m_builtversion = 0; + Chunk.m_paintedversion = 0; +} + +heightmap::chunk_ptr terrain_streamer::neighbour(chunk_key const &Key) const +{ + auto const lookup{m_chunks.find(Key)}; + return lookup != m_chunks.end() ? lookup->second->shared() : nullptr; +} + +void terrain_streamer::touch_neighbours(chunk_key const &Key) +{ + for (auto const &offset : {chunk_key{-1, 0}, chunk_key{1, 0}, chunk_key{0, -1}, chunk_key{0, 1}}) + { + auto const lookup{m_chunks.find({Key.first + offset.first, Key.second + offset.second})}; + if (lookup != m_chunks.end()) + lookup->second->m_neighbours = true; + } +} + +int terrain_streamer::wanted_stride(editor_terrain const &Chunk, glm::dvec3 const &Camera) const +{ + // distance from the camera to the box of the chunk + glm::dvec3 const offset{std::max({Chunk.m_low.x - Camera.x, 0.0, Camera.x - Chunk.m_high.x}), std::max({Chunk.m_low.y - Camera.y, 0.0, Camera.y - Chunk.m_high.y}), + std::max({Chunk.m_low.z - Camera.z, 0.0, Camera.z - Chunk.m_high.z})}; + auto const distance{glm::length(offset)}; + auto const spacing{Chunk.data().spacing()}; + auto const limit{heightmap::max_stride(Chunk.cells())}; + auto const stride_for = [&](double const Distance) { + auto const edge{Distance / m_detail}; + int stride{1}; + while (stride * 2 <= limit && stride * 2 * spacing <= edge) + stride *= 2; + return stride; + }; + // a margin around the distances the stride changes at, so a camera standing at one doesn't flip it to and fro + if (Chunk.m_stride > 0) + { + auto const finer{stride_for(distance * 0.85)}; + auto const coarser{stride_for(distance * 1.15)}; + if (Chunk.m_stride >= finer && Chunk.m_stride <= coarser) + return Chunk.m_stride; + } + return stride_for(distance); +} + +void terrain_streamer::request_mesh(editor_terrain &Chunk, int const Stride, double const Priority) +{ + auto const centre{chunk_centre(Chunk.key())}; + job task; + task.type = job::kind::mesh; + task.chunk = Chunk.key(); + task.data = Chunk.shared(); + auto const key{Chunk.key()}; + task.neighbours = {neighbour({key.first - 1, key.second}), neighbour({key.first + 1, key.second}), neighbour({key.first, key.second - 1}), neighbour({key.first, key.second + 1})}; + task.stride = Stride; + task.origin = simulation::Region->section(centre).m_area.center; + task.version = Chunk.m_shapeversion; + task.priority = Priority; + Chunk.m_building = true; + Chunk.m_neighbours = false; + submit(std::move(task)); +} + +void terrain_streamer::update(glm::dvec3 const &Camera) +{ + if (false == m_active || simulation::Region == nullptr) + return; + + // where the camera is heading + auto const now{steady_seconds()}; + if (m_hascamera) + { + auto const elapsed{now - m_cameratime}; + if (elapsed > 1e-3) + { + auto velocity{(Camera - m_camera) / elapsed}; + if (glm::length(velocity) > 300.0) + velocity = glm::dvec3{0.0}; // a jump, not a movement + m_velocity = glm::mix(m_velocity, velocity, std::min(1.0, elapsed * 2.0)); + } + } + m_camera = Camera; + m_cameratime = now; + m_hascamera = true; + auto ahead{m_velocity * look_ahead}; + if (glm::length(ahead) > look_ahead_limit) + ahead *= look_ahead_limit / glm::length(ahead); + auto const target{Camera + ahead}; + + if (m_waterchanged) + build_water(); + + // finished work, within a few milliseconds + while (steady_seconds() - now < upload_budget) + { + result done; + { + std::lock_guard lock{m_mutex}; + if (m_results.empty()) + break; + done = std::move(m_results.front()); + m_results.pop_front(); + } + process(done); + } + + // chunks wanted around the camera and around where it's heading + auto const range{std::max(m_radius * heightmap::chunk_size, static_cast(Global.BaseDrawRange) * std::max(1.0, static_cast(Global.fDistanceFactor))) + heightmap::chunk_size * 0.5}; + auto const radius{std::min(64, static_cast(std::ceil(range / heightmap::chunk_size)))}; + if (m_ringradius != radius) + { + m_ring.clear(); + for (int dz = -radius; dz <= radius; ++dz) + for (int dx = -radius; dx <= radius; ++dx) + if (dx * dx + dz * dz <= (radius + 1) * (radius + 1)) + m_ring.emplace_back(dx, dz); + std::sort(m_ring.begin(), m_ring.end(), [](chunk_key const &A, chunk_key const &B) { return A.first * A.first + A.second * A.second < B.first * B.first + B.second * B.second; }); + m_ringradius = radius; + } + auto const here{heightmap::chunk_at(Camera.x, Camera.z)}; + auto const there{heightmap::chunk_at(target.x, target.z)}; + std::vector centres{here}; + if (there != here) + centres.push_back(there); + for (auto const ¢re : centres) + { + for (auto const &offset : m_ring) + { + if (m_loading.size() >= max_loading) + break; + chunk_key const key{centre.first + offset.first, centre.second + offset.second}; + if (m_chunks.count(key) > 0 || m_loading.count(key) > 0 || m_removed.count(key) > 0) + continue; + auto const packkey{heightmap::pack_of(key)}; + auto &pack{m_packs[packkey]}; + auto const distance{std::sqrt(static_cast(offset.first * offset.first + offset.second * offset.second))}; + if (pack.status == pack_state::state::unknown) + { + pack.status = pack_state::state::loading; + job task; + task.type = job::kind::pack; + task.pack = packkey; + task.generation = pack.generation; + task.priority = distance; + submit(std::move(task)); + continue; + } + if (pack.status != pack_state::state::ready || false == pack.file->has(key)) + continue; + job task; + task.type = job::kind::chunk; + task.chunk = key; + task.pack = packkey; + task.file = pack.file; + task.generation = pack.generation; + task.priority = distance; + m_loading.insert(key); + submit(std::move(task)); + } + } + + // chunks gone out of range are dropped, except edited ones, which wait in memory to be saved + auto const outside = [&](chunk_key const &Key, int const Margin) { + auto const near = [&](chunk_key const &Centre) { + auto const dx{Key.first - Centre.first}, dz{Key.second - Centre.second}; + return dx * dx + dz * dz <= (radius + Margin) * (radius + Margin); + }; + return false == near(here) && false == near(there); + }; + for (auto it = m_chunks.begin(); it != m_chunks.end();) + { + auto &chunk{*it->second}; + if (outside(it->first, 2)) + { + if (chunk.m_section != nullptr || chunk.m_slot >= 0) + undraw(chunk); + if (false == chunk.modified() && false == chunk.m_building) + { + it = m_chunks.erase(it); + continue; + } + } + ++it; + } + + // meshes of the grid each chunk's distance asks for, the nearest first + std::size_t meshing{0}; + { + std::lock_guard lock{m_mutex}; + meshing = m_busy; + for (auto const &queued : m_jobs) + if (queued.type == job::kind::mesh) + ++meshing; + } + std::vector> wanted; + int materials{0}; + for (auto &entry : m_chunks) + { + auto &chunk{*entry.second}; + if (outside(entry.first, 1)) + continue; + if (false == in_region(glm::dvec2{chunk_centre(entry.first).x, chunk_centre(entry.first).z})) + continue; + // paint changes go to the material straight away + if (chunk.m_section != nullptr && chunk.m_paintedversion != chunk.m_paintversion && materials < materials_per_frame) + { + update_material(chunk); + upload_shape_material(chunk); + ++materials; + } + if (chunk.m_building) + continue; + auto const stride{wanted_stride(chunk, Camera)}; + if (chunk.m_stride != stride || chunk.m_builtversion != chunk.m_shapeversion || chunk.m_neighbours) + { + auto const centre{chunk_centre(entry.first)}; + wanted.emplace_back(glm::length(glm::dvec2{centre.x - Camera.x, centre.z - Camera.z}), &chunk); + } + } + std::sort(wanted.begin(), wanted.end(), [](auto const &A, auto const &B) { return A.first < B.first; }); + for (auto const &entry : wanted) + { + if (meshing >= max_meshing) + break; + request_mesh(*entry.second, wanted_stride(*entry.second, Camera), entry.first / heightmap::chunk_size); + ++meshing; + } +} + +void terrain_streamer::upload_shape_material(editor_terrain &Chunk) +{ + if (Chunk.m_section == nullptr) + return; + for (auto &existing : Chunk.m_section->m_shapes) + { + auto const &geometry{existing.data().geometry}; + if (geometry.bank == Chunk.m_geometry.bank && geometry.chunk == Chunk.m_geometry.chunk) + { + // the shape is made anew with the new material, the rest of it stays + std::vector bounds(2); + bounds[0].position = Chunk.m_low; + bounds[1].position = Chunk.m_high; + scene::shape_node shape; + shape.make_terrain(Chunk.m_material, std::move(bounds), existing.data().origin); + shape.geometry(Chunk.m_geometry); + existing = shape; + return; + } + } +} + +// queries + +void terrain_streamer::collect(std::vector &Out) const +{ + for (auto const &entry : m_chunks) + Out.push_back(entry.second.get()); +} + +editor_terrain *terrain_streamer::terrain_at(double X, double Z) const +{ + auto const lookup{m_chunks.find(heightmap::chunk_at(X, Z))}; + if (lookup != m_chunks.end() && lookup->second->contains(X, Z)) + return lookup->second.get(); + return nullptr; +} + +bool terrain_streamer::height_at(double X, double Z, double &Height) const +{ + auto const *chunk{terrain_at(X, Z)}; + if (chunk == nullptr) + return false; + Height = chunk->height_at(X, Z); + return true; +} + +void terrain_streamer::gather_triangles(glm::dvec2 const &Min, glm::dvec2 const &Max, std::vector> &Out) const +{ + auto const first{heightmap::chunk_at(Min.x, Min.y)}; + auto const last{heightmap::chunk_at(Max.x, Max.y)}; + for (int cz = first.second; cz <= last.second; ++cz) + for (int cx = first.first; cx <= last.first; ++cx) + { + auto const lookup{m_chunks.find({cx, cz})}; + if (lookup == m_chunks.end()) + continue; + auto const &data{lookup->second->data()}; + auto const low{data.corner()}; + auto const step{data.spacing()}; + // the cells overlapping the rectangle + auto const xs{index_range(low.x, step, data.cells, Min.x - step, Max.x)}; + auto const zs{index_range(low.y, step, data.cells, Min.y - step, Max.y)}; + auto const point = [&](int const Ix, int const Iz) { return glm::dvec3{low.x + Ix * step, data.height(Ix, Iz), low.y + Iz * step}; }; + for (int iz = zs.first; iz <= zs.second && iz < data.cells; ++iz) + for (int ix = xs.first; ix <= xs.second && ix < data.cells; ++ix) + { + auto const v00{point(ix, iz)}, v10{point(ix + 1, iz)}, v01{point(ix, iz + 1)}, v11{point(ix + 1, iz + 1)}; + Out.push_back({v00, v01, v10}); + Out.push_back({v11, v10, v01}); + } + } +} + +bool terrain_streamer::owns(gfx::geometry_handle const &Geometry) const +{ + if (Geometry.bank == 0 && Geometry.chunk == 0) + return false; + if (m_slotofgeometry.count(geometry_key(Geometry)) > 0) + return true; + for (auto const &water : m_watershapes) + if (water.geometry.bank == Geometry.bank && water.geometry.chunk == Geometry.chunk) + return true; + return false; +} + +bool terrain_streamer::exists(chunk_key const &Key) const +{ + if (m_chunks.count(Key) > 0) + return true; + if (m_removed.count(Key) > 0) + return false; + auto const pack{m_packs.find(heightmap::pack_of(Key))}; + return pack != m_packs.end() && pack->second.status == pack_state::state::ready && pack->second.file->has(Key); +} + +// editing + +editor_terrain *terrain_streamer::load_now(chunk_key const &Key) +{ + auto const lookup{m_chunks.find(Key)}; + if (lookup != m_chunks.end()) + return lookup->second.get(); + if (m_removed.count(Key) > 0) + return nullptr; + auto const packkey{heightmap::pack_of(Key)}; + auto &pack{m_packs[packkey]}; + if (pack.status != pack_state::state::ready && pack.status != pack_state::state::missing) + { + // the index is read here and now; a worker reading it meanwhile is ignored by the generation + ++pack.generation; + pack.status = pack_state::state::missing; + auto const path{pack_path(packkey)}; + std::error_code ec; + if (std::filesystem::exists(path, ec)) + { + auto file{std::make_shared()}; + std::string error; + std::lock_guard lock{m_filemutex}; + if (file->open(path, &error)) + { + pack.file = file; + pack.status = pack_state::state::ready; + } + else + ErrorLog("Bad file: " + error, logtype::file); + } + } + if (pack.status != pack_state::state::ready || false == pack.file->has(Key)) + return nullptr; + std::shared_ptr data; + std::string error; + { + std::lock_guard lock{m_filemutex}; + data = pack.file->read(Key, &error); + } + if (data == nullptr) + { + ErrorLog("Bad file: " + error, logtype::file); + return nullptr; + } + auto chunk{std::make_unique(std::move(data))}; + auto const [low, high]{std::minmax_element(chunk->heights().begin(), chunk->heights().end())}; + auto const corner{chunk->data().corner()}; + chunk->m_low = {corner.x, *low, corner.y}; + chunk->m_high = {corner.x + heightmap::chunk_size, *high, corner.y + heightmap::chunk_size}; + auto *result{chunk.get()}; + m_chunks.emplace(Key, std::move(chunk)); + m_loading.erase(Key); + touch_neighbours(Key); + return result; +} + +std::vector terrain_streamer::chunks_in(glm::dvec2 const &Min, glm::dvec2 const &Max, bool const Load) +{ + std::vector result; + auto const first{heightmap::chunk_at(Min.x, Min.y)}; + auto const last{heightmap::chunk_at(Max.x, Max.y)}; + for (int cz = first.second; cz <= last.second; ++cz) + for (int cx = first.first; cx <= last.first; ++cx) + { + auto const lookup{m_chunks.find({cx, cz})}; + if (lookup != m_chunks.end()) + result.push_back(lookup->second.get()); + else if (Load) + { + if (auto *chunk{load_now({cx, cz})}) + result.push_back(chunk); + } + } + return result; +} + +bool terrain_streamer::add_chunk(int Cx, int Cz, float Spacing, float Height, std::uint16_t const Layer) +{ + return add_chunk(Cx, Cz, Spacing, [Height](double, double) { return Height; }, Layer); +} + +bool terrain_streamer::add_chunk(int Cx, int Cz, float Spacing, std::function const &Height, std::uint16_t const Layer) +{ + chunk_key const key{Cx, Cz}; + if (false == m_active || load_now(key) != nullptr || m_chunks.count(key) > 0) + return false; + if (false == in_region(glm::dvec2{chunk_centre(key).x, chunk_centre(key).z})) + return false; + auto data{heightmap::chunk_data::make_flat(key, Spacing, 0.f)}; + data->layers[0] = Layer < m_manifest.layers.size() ? Layer : std::uint16_t{0}; + auto const low{data->corner()}; + auto const step{data->spacing()}; + for (int iz = 0; iz <= data->cells; ++iz) + for (int ix = 0; ix <= data->cells; ++ix) + data->heights[static_cast(iz) * data->side() + ix] = Height(low.x + ix * step, low.y + iz * step); + auto chunk{std::make_unique(std::move(data))}; + chunk->m_modified = true; + auto const [lowest, highest]{std::minmax_element(chunk->heights().begin(), chunk->heights().end())}; + chunk->m_low = {low.x, *lowest, low.y}; + chunk->m_high = {low.x + heightmap::chunk_size, *highest, low.y + heightmap::chunk_size}; + auto &added{*chunk}; + m_chunks.emplace(key, std::move(chunk)); + m_removed.erase(key); + m_loading.erase(key); + apply_modifiers(added, low, low + glm::dvec2{heightmap::chunk_size}); + touch_neighbours(key); + return true; } void terrain_streamer::remove_chunk(int Cx, int Cz) { chunk_key const key{Cx, Cz}; - auto const it = m_chunks.find(key); - if (it != m_chunks.end()) + auto const lookup{m_chunks.find(key)}; + if (lookup != m_chunks.end()) { - if (it->second) - it->second->destroy(); - m_chunks.erase(it); + undraw(*lookup->second); + m_chunks.erase(lookup); + } + m_removed.insert(key); + m_loading.erase(key); + touch_neighbours(key); +} + +void terrain_streamer::spacing(int Cx, int Cz, float Spacing) +{ + auto *chunk{load_now({Cx, Cz})}; + if (chunk == nullptr || heightmap::cells_for(Spacing) == chunk->cells()) + return; + chunk->replace(chunk->data().resampled(Spacing), true, false); + auto const low{chunk->data().corner()}; + apply_modifiers(*chunk, low, low + glm::dvec2{heightmap::chunk_size}); + touch_neighbours(chunk->key()); +} + +bool terrain_streamer::reshape(glm::dvec2 const &Min, glm::dvec2 const &Max, std::function const &Shaper) +{ + bool changed{false}; + for (auto *chunk : chunks_in(Min, Max, true)) + { + auto const ¤t{chunk->data()}; + auto const low{current.corner()}; + auto const step{current.spacing()}; + auto const xs{index_range(low.x, step, current.side(), Min.x, Max.x)}; + auto const zs{index_range(low.y, step, current.side(), Min.y, Max.y)}; + if (xs.first > xs.second || zs.first > zs.second) + continue; + // a copy is shaped, and taken only if anything changed + auto heights{current.base.empty() ? current.heights : current.base}; + bool shaped{false}; + for (int iz = zs.first; iz <= zs.second; ++iz) + for (int ix = xs.first; ix <= xs.second; ++ix) + shaped |= Shaper(low.x + ix * step, low.y + iz * step, heights[static_cast(iz) * current.side() + ix]); + if (false == shaped) + continue; + auto &data{chunk->edit(true, false)}; + (data.base.empty() ? data.heights : data.base) = std::move(heights); + if (false == data.base.empty()) + apply_modifiers(*chunk, Min, Max); + changed = true; + } + return changed; +} + +bool terrain_streamer::sculpt(double X, double Z, double Radius, double Strength) +{ + if (Radius <= 0.0) + return false; + return reshape(glm::dvec2{X - Radius, Z - Radius}, glm::dvec2{X + Radius, Z + Radius}, [&](double const Vx, double const Vz, float &Height) { + auto const distance{std::sqrt((Vx - X) * (Vx - X) + (Vz - Z) * (Vz - Z))}; + if (distance > Radius) + return false; + Height += static_cast(Strength * falloff(distance, Radius)); + return true; + }); +} + +bool terrain_streamer::smooth(double X, double Z, double Radius, double Amount) +{ + if (Radius <= 0.0 || Amount <= 0.0) + return false; + glm::dvec2 const low{X - Radius, Z - Radius}, high{X + Radius, Z + Radius}; + // every chunk the brush touches is smoothed from the same ground, so the edges they share stay together + std::vector>> before; + for (auto *chunk : chunks_in(low - glm::dvec2{6.0}, high + glm::dvec2{6.0}, false)) + before.emplace_back(chunk, chunk->data().base.empty() ? chunk->heights() : chunk->data().base); + auto const ground = [&](double const Gx, double const Gz, double const Fallback) { + for (auto const &entry : before) + if (entry.first->contains(Gx, Gz)) + return entry.first->height_in(entry.second, Gx, Gz); + return Fallback; + }; + auto const finest{std::accumulate(before.begin(), before.end(), heightmap::chunk_size, [](double Value, auto const &Entry) { return std::min(Value, Entry.first->data().spacing()); })}; + return reshape(low, high, [&](double const Vx, double const Vz, float &Height) { + auto const distance{std::sqrt((Vx - X) * (Vx - X) + (Vz - Z) * (Vz - Z))}; + if (distance > Radius) + return false; + auto const own{static_cast(Height)}; + auto const step{finest}; + // the neighbours a cell away, read from the ground as it was before the stroke, whichever chunk holds them + auto const average{(ground(Vx - step, Vz, own) + ground(Vx + step, Vz, own) + ground(Vx, Vz - step, own) + ground(Vx, Vz + step, own) + own * 4.0) / 8.0}; + auto const smoothed{own + (average - own) * std::min(1.0, Amount * falloff(distance, Radius))}; + if (std::abs(smoothed - own) < 1e-5) + return false; + Height = static_cast(smoothed); + return true; + }); +} + +bool terrain_streamer::paint(double X, double Z, double Radius, double Strength, std::uint16_t Layer) +{ + if (Radius <= 0.0 || Strength <= 0.0) + return false; + bool changed{false}; + for (auto *chunk : chunks_in(glm::dvec2{X - Radius, Z - Radius}, glm::dvec2{X + Radius, Z + Radius}, false)) + { + auto const ¤t{chunk->data()}; + auto const samples{current.paint > 0 ? current.paint : heightmap::default_paint_samples}; + auto const step{heightmap::chunk_size / samples}; + auto const low{current.corner()}; + auto const xs{index_range(low.x, step, samples + 1, X - Radius, X + Radius)}; + auto const zs{index_range(low.y, step, samples + 1, Z - Radius, Z + Radius)}; + if (xs.first > xs.second || zs.first > zs.second) + continue; + if (current.paint <= 0 && current.layers[0] == Layer) + continue; // the chunk is all of this material already + auto data{std::make_shared(current)}; + data->ensure_paint(samples); + auto slot{data->slot_of(Layer)}; + if (slot < 0) + { + data->compact_layers(); + data->ensure_paint(samples); + auto const count{data->layer_count()}; + if (count >= heightmap::max_chunk_layers) + { + WriteLog("Editor: chunk " + std::to_string(current.key.first) + "," + std::to_string(current.key.second) + " has " + std::to_string(count) + " materials already, no room for another", + logtype::generic); + continue; + } + slot = static_cast(count); + data->layers[slot] = Layer; + data->weights.resize(data->weights.size() + static_cast(samples + 1) * (samples + 1), 0); + } + auto const plane{static_cast(samples + 1) * (samples + 1)}; + auto const count{data->layer_count()}; + bool painted{false}; + for (int iz = zs.first; iz <= zs.second; ++iz) + for (int ix = xs.first; ix <= xs.second; ++ix) + { + auto const px{low.x + ix * step}, pz{low.y + iz * step}; + auto const distance{std::sqrt((px - X) * (px - X) + (pz - Z) * (pz - Z))}; + if (distance > Radius) + continue; + auto const sample{static_cast(iz) * (samples + 1) + ix}; + auto &own{data->weights[slot * plane + sample]}; + auto const amount{std::clamp(Strength * falloff(distance, Radius), 0.0, 1.0)}; + auto const target{static_cast(std::lround(own + (255 - own) * amount))}; + if (target == own) + continue; + // the other layers give way in proportion to what they have, the weights still adding up to 255 + auto const others{255 - static_cast(own)}; + auto const left{255 - target}; + int given{0}; + for (std::size_t other = 0; other < count; ++other) + { + if (static_cast(other) == slot) + continue; + auto &weight{data->weights[other * plane + sample]}; + auto const scaled{others > 0 ? static_cast(weight) * left / others : 0}; + weight = static_cast(scaled); + given += scaled; + } + own = static_cast(255 - given); + painted = true; + } + if (false == painted) + continue; + data->compact_layers(); + chunk->replace(std::move(data), false, true); + changed = true; + } + return changed; +} + +std::uint16_t terrain_streamer::layer(std::string const &Material, float const Size) +{ + for (std::size_t i = 0; i < m_manifest.layers.size(); ++i) + if (m_manifest.layers[i].material == Material && (Size <= 0.f || m_manifest.layers[i].size == Size)) + return static_cast(i); + m_manifest.layers.push_back({Material, std::max(0.f, Size)}); + m_manifestchanged = true; + return static_cast(m_manifest.layers.size() - 1); +} + +void terrain_streamer::layer_size(std::uint16_t const Layer, float const Size) +{ + if (Layer >= m_manifest.layers.size() || m_manifest.layers[Layer].size == Size) + return; + m_manifest.layers[Layer].size = std::max(0.f, Size); + m_manifestchanged = true; + // the materials of the chunks using it are made again + for (auto &entry : m_chunks) + if (entry.second->data().slot_of(Layer) >= 0) + entry.second->m_paintedversion = 0; +} + +void terrain_streamer::compress(bool const State) +{ + if (m_manifest.compress == State) + return; + m_manifest.compress = State; + m_manifestchanged = true; +} + +void terrain_streamer::default_spacing(float const Spacing) +{ + auto const spacing{heightmap::valid_spacing(Spacing)}; + if (m_manifest.spacing == spacing) + return; + m_manifest.spacing = spacing; + m_manifestchanged = true; +} + +void terrain_streamer::water(std::vector Water) +{ + m_manifest.water = std::move(Water); + m_manifestchanged = true; + m_waterchanged = true; +} + +void terrain_streamer::apply_modifiers(editor_terrain &Chunk, glm::dvec2 const &Min, glm::dvec2 const &Max) +{ + auto const ¤t{Chunk.data()}; + auto const low{current.corner()}; + auto const high{low + glm::dvec2{heightmap::chunk_size}}; + std::vector shapes; + shapes.reserve(m_manifest.modifiers.size()); + bool reachesany{false}; + for (auto const &modifier : m_manifest.modifiers) + { + heightmap::modifier_shape shape{modifier}; + if (false == shape.reaches(low, high)) + continue; + reachesany = true; + if (shape.reaches(Min, Max)) + shapes.push_back(std::move(shape)); + } + if (false == reachesany) + { + // no modifier reaches the chunk (any more): its own heights are what's left + if (false == current.base.empty()) + { + auto &data{Chunk.edit(true, false)}; + data.heights = std::move(data.base); + data.base.clear(); + } + return; + } + auto &data{Chunk.edit(true, false)}; + if (data.base.empty()) + data.base = data.heights; + auto const step{data.spacing()}; + auto const xs{index_range(low.x, step, data.side(), std::max(Min.x, low.x), std::min(Max.x, high.x))}; + auto const zs{index_range(low.y, step, data.side(), std::max(Min.y, low.y), std::min(Max.y, high.y))}; + for (int iz = zs.first; iz <= zs.second; ++iz) + for (int ix = xs.first; ix <= xs.second; ++ix) + { + auto const index{static_cast(iz) * data.side() + ix}; + auto height{data.base[index]}; + auto const x{low.x + ix * step}, z{low.y + iz * step}; + for (auto const &shape : shapes) + shape.apply(x, z, height); + data.heights[index] = height; + } +} + +void terrain_streamer::apply_modifiers(glm::dvec2 const &Min, glm::dvec2 const &Max) +{ + for (auto *chunk : chunks_in(Min, Max, true)) + apply_modifiers(*chunk, Min, Max); +} + +void terrain_streamer::modifier(heightmap::modifier Modifier) +{ + auto bounds{Modifier.bounds()}; + auto const existing{std::find_if(m_manifest.modifiers.begin(), m_manifest.modifiers.end(), [&](heightmap::modifier const &Item) { return Item.name == Modifier.name; })}; + if (existing != m_manifest.modifiers.end()) + { + // the ground it changed before is led anew as well + auto const old{existing->bounds()}; + bounds.first = glm::min(bounds.first, old.first); + bounds.second = glm::max(bounds.second, old.second); + *existing = std::move(Modifier); + } + else + m_manifest.modifiers.push_back(std::move(Modifier)); + m_manifestchanged = true; + apply_modifiers(bounds.first, bounds.second); +} + +bool terrain_streamer::remove_modifier(std::string const &Name) +{ + auto const existing{std::find_if(m_manifest.modifiers.begin(), m_manifest.modifiers.end(), [&](heightmap::modifier const &Item) { return Item.name == Name; })}; + if (existing == m_manifest.modifiers.end()) + return false; + auto const bounds{existing->bounds()}; + m_manifest.modifiers.erase(existing); + m_manifestchanged = true; + apply_modifiers(bounds.first, bounds.second); + return true; +} + +bool terrain_streamer::modified() const +{ + if (m_manifestchanged || false == m_removed.empty()) + return true; + return std::any_of(m_chunks.begin(), m_chunks.end(), [](auto const &Entry) { return Entry.second->modified(); }); +} + +bool terrain_streamer::save(std::string *Error) +{ + if (false == m_active) + return true; + auto const fail = [&](std::string const &Message) { + if (Error != nullptr) + *Error = Message; + ErrorLog("Heightmap terrain: " + Message); + return false; + }; + std::error_code ec; + auto const manifestpath{m_directory + "terrain.yaml"}; + if (m_manifestchanged || modified() || false == std::filesystem::exists(manifestpath, ec)) + { + std::string error; + if (false == heightmap::save_manifest(manifestpath, m_manifest, &error)) + return fail(error); + m_manifestchanged = false; + } + + // the packs holding changed chunks are written whole + std::set packs; + for (auto const &entry : m_chunks) + if (entry.second->modified()) + packs.insert(heightmap::pack_of(entry.first)); + for (auto const &key : m_removed) + packs.insert(heightmap::pack_of(key)); + + for (auto const &packkey : packs) + { + auto const path{pack_path(packkey)}; + std::vector chunks; + std::set taken; + // what's in the file now, unless it's in memory or removed + std::shared_ptr file; + if (std::filesystem::exists(path, ec)) + { + file = std::make_shared(); + std::string error; + std::lock_guard lock{m_filemutex}; + if (false == file->open(path, &error)) + return fail(error); + for (auto const &key : file->chunks()) + { + if (m_removed.count(key) > 0 || m_chunks.count(key) > 0) + continue; + auto data{file->read(key, &error)}; + if (data == nullptr) + return fail(error); + chunks.push_back(std::move(data)); + taken.insert(key); + } + } + for (auto const &entry : m_chunks) + if (heightmap::pack_of(entry.first) == packkey && taken.count(entry.first) == 0) + chunks.push_back(entry.second->shared()); + { + std::lock_guard lock{m_filemutex}; + if (chunks.empty()) + std::filesystem::remove(path, ec); + else + { + std::string error; + if (false == heightmap::write_pack(path, packkey, chunks, m_manifest.compress, &error)) + return fail(error); + } + } + // the file is known anew; what the workers read from the old one is ignored + auto &pack{m_packs[packkey]}; + ++pack.generation; + pack.file.reset(); + pack.status = pack_state::state::missing; + if (false == chunks.empty()) + { + auto reopened{std::make_shared()}; + std::string error; + std::lock_guard lock{m_filemutex}; + if (reopened->open(path, &error)) + { + pack.file = reopened; + pack.status = pack_state::state::ready; + } + } + for (auto it = m_removed.begin(); it != m_removed.end();) + it = (heightmap::pack_of(*it) == packkey ? m_removed.erase(it) : std::next(it)); + for (auto const &entry : m_chunks) + if (heightmap::pack_of(entry.first) == packkey) + entry.second->clear_modified(); + } + WriteLog("Heightmap terrain saved: " + m_directory + " (" + std::to_string(packs.size()) + " pack files written)", logtype::generic); + return true; +} + +// water + +void terrain_streamer::clear_water(bool const Touch) +{ + if (Touch && simulation::Region != nullptr) + for (auto const &water : m_watershapes) + { + if (water.cell != nullptr) + erase_shape(water.cell->m_shapestranslucent, water.geometry); + else if (water.section != nullptr) + erase_shape(water.section->m_shapes, water.geometry); + } + // the geometry stays with the renderer, to be filled anew + for (auto const &water : m_watershapes) + m_waterfree.push_back(water.geometry); + m_watershapes.clear(); +} + +void terrain_streamer::build_water() +{ + m_waterchanged = false; + clear_water(true); + if (simulation::Region == nullptr) + return; + for (auto const &body : m_manifest.water) + { + if (body.outline.size() < 3) + continue; + auto const indices{heightmap::triangulate(body.outline)}; + if (indices.empty()) + continue; + glm::dvec2 centroid{0.0}; + for (auto const &point : body.outline) + centroid += point; + centroid /= static_cast(body.outline.size()); + if (false == in_region(centroid)) + continue; + auto const material{GfxRenderer->Fetch_Material(body.material.empty() ? m_manifest.water_material : body.material)}; + auto const *materialdata{GfxRenderer->Material(material)}; + auto const repeat{(materialdata != nullptr && materialdata->GetSize().x > 0.f) ? static_cast(materialdata->GetSize().x) : 8.0}; + glm::dvec3 const centre{centroid.x, body.level, centroid.y}; + auto §ion{simulation::Region->section(centre)}; + // the section makes the geometry of its own shapes once, before it's drawn; done first, it leaves ours alone + section.create_geometry(); + // translucent water goes with the translucent geometry of the cell around its middle, drawn relative to the cell + auto const translucent{materialdata != nullptr && materialdata->is_translucent()}; + auto &cell{section.cell(centre)}; + auto const origin{translucent ? cell.m_area.center : section.m_area.center}; + gfx::vertex_array vertices; + vertices.reserve(indices.size()); + double reach{0.0}; + // the outline is turned counterclockwise in the plan, the triangles go the other way round to face up + for (std::size_t i = 0; i + 2 < indices.size(); i += 3) + for (auto const index : {indices[i + 2], indices[i + 1], indices[i]}) + { + auto const &point{body.outline[index]}; + gfx::basic_vertex vertex; + vertex.position = glm::vec3(glm::dvec3{point.x, body.level, point.y} - origin); + vertex.normal = {0.f, 1.f, 0.f}; + vertex.texture = {static_cast((point.x - centroid.x) / repeat), static_cast((centroid.y - point.y) / repeat)}; + vertex.tangent = {1.f, 0.f, 0.f, 1.f}; + vertices.push_back(vertex); + reach = std::max(reach, glm::length(point - centroid)); + } + // the geometry of water made before is filled anew, so editing the water doesn't pile up geometry + gfx::userdata_array nouserdata; + water_shape entry; + if (false == m_waterfree.empty()) + { + entry.geometry = m_waterfree.back(); + m_waterfree.pop_back(); + GfxRenderer->Replace(vertices, nouserdata, entry.geometry, GL_TRIANGLES); + } + else + { + if (m_waterbank.bank == 0 && m_waterbank.chunk == 0) + m_waterbank = GfxRenderer->Create_Bank(); + entry.geometry = GfxRenderer->Insert(vertices, nouserdata, m_waterbank, GL_TRIANGLES); + } + if (entry.geometry.chunk == 0) + continue; + // two bounding vertices give the shape its area, the triangles are in the geometry + std::vector bounds(2); + bounds[0].position = glm::dvec3{centroid.x - reach, body.level, centroid.y - reach}; + bounds[1].position = glm::dvec3{centroid.x + reach, body.level, centroid.y + reach}; + scene::shape_node shape; + shape.make_terrain(material, std::move(bounds), origin); + shape.geometry(entry.geometry); + if (translucent) + { + cell.m_shapestranslucent.emplace_back(std::move(shape)); + cell.m_area.radius = std::max(cell.m_area.radius, static_cast(glm::length(cell.m_area.center - centre) + reach)); + cell.m_active = true; + entry.cell = &cell; + } + else + { + section.m_shapes.emplace_back(std::move(shape)); + } + section.m_area.radius = std::max(section.m_area.radius, static_cast(glm::length(section.m_area.center - centre) + reach)); + entry.section = §ion; + m_watershapes.push_back(entry); } - std::error_code ec; - std::filesystem::remove(chunk_path(Cx, Cz), ec); - m_known[key] = 0; // no longer on disk } diff --git a/editor/editorTerrainStreamer.hpp b/editor/editorTerrainStreamer.hpp index a8857d688..90eac7ffe 100644 --- a/editor/editorTerrainStreamer.hpp +++ b/editor/editorTerrainStreamer.hpp @@ -9,112 +9,237 @@ http://mozilla.org/MPL/2.0/. #pragma once +#include +#include #include #include -#include +#include +#include #include +#include +#include #include #include "editor/editorTerrain.hpp" -// Streams editable terrain chunks around the camera for an effectively unbounded world. +struct world_vertex; +namespace scene { class basic_section; class basic_cell; } + +// the heightmap terrain of the scenery (scene/heightmapterrain.h), loaded around the camera. // -// Phase 1: keeps a ring of resident chunks (each an editor_terrain mesh) within a radius of the -// camera; chunks entering the radius are built, chunks leaving it are destroyed (the renderer's -// geometry GC reclaims their GPU memory). Heights are flat + a gentle procedural roll so streaming -// is observable. Phase 2 will add 16-bit on-disk chunk paging, per-chunk flag bits and persistence. +// the pack files are read and the meshes made by worker threads; the main thread only puts finished meshes on the gpu, +// within a few milliseconds of each frame. chunks are loaded around the camera and around the place the camera is heading +// to, so a moving train finds its terrain loaded. each chunk is drawn with a grid as coarse as its distance allows. +// +// the editor changes the chunks in memory; they're written to the pack files when the scenery is saved, until then the +// edited chunks stay in memory, also when they're far from the camera class terrain_streamer { public: - using chunk_key = std::pair; // (cx, cz) chunk coordinate + using chunk_key = heightmap::chunk_key; terrain_streamer() = default; + ~terrain_streamer(); - void active(bool State) { m_active = State; } + // opens the terrain kept in terrain// (the folder may not exist yet). returns: true if there's terrain to show + bool open(std::string const &Name); + // stops showing the terrain + void close(); bool active() const { return m_active; } + std::string const &name() const { return m_name; } + // the folder of the terrain, with a trailing slash + std::string const &directory() const { return m_directory; } - // per-chunk configuration (applied to chunks built from now on) - void configure(int Cells, float CellSize, int Radius, float BaseHeight, std::string const &Texture); - void simplify(bool Auto, float Error) { m_auto_optimize = Auto; m_simplify_error = Error; } - // safe to change while resident (only affects how far chunks load/unload) - void radius(int Radius) { m_radius = Radius < 0 ? 0 : Radius; } - // persist edited chunks to disk on unload, and load them back instead of regenerating - void persist(bool Enable) { m_persist = Enable; } - void directory(std::string const &Dir) - { - if (!Dir.empty() && Dir != m_dir) - { - m_dir = Dir; - m_known.clear(); // existence cache is per-folder; drop it when the folder changes - } - } - std::string const &directory() const { return m_dir; } - - // loads/unloads chunks so the resident set matches the radius around CameraPos - void update(glm::dvec3 const &CameraPos); - // drops all resident chunks (e.g. when streaming is switched off), saving edits first - void clear(); + // loads and unloads the chunks around the camera, and puts finished meshes on the gpu + void update(glm::dvec3 const &Camera); // hard reset used when a new scenery loads: drops everything WITHOUT touching scene sections // (the old region is being torn down, so its section pointers are already dangling) void reset(); - // appends raw pointers to every resident chunk (for sculpt / snap / optimize routing) - void collect(std::vector &Out) const; - // resident chunk whose footprint covers (X,Z), or nullptr - editor_terrain *terrain_at(double X, double Z) const; - - // authoring: create a flat chunk at (Cx,Cz), make it resident and persist it to disk - void add_chunk(int Cx, int Cz); - // authoring: delete the chunk at (Cx,Cz) from memory and disk - void remove_chunk(int Cx, int Cz); - // persist an externally-authored chunk (e.g. a manual grid chunk being handed over to streaming) - void save_chunk(int Cx, int Cz, editor_terrain const &Terrain); - // chunk coordinate covering (X,Z) - chunk_key key_for(double X, double Z) const { return key_at(X, Z); } - - std::size_t resident() const { return m_chunks.size(); } - float chunk_world_size() const { return m_cells * m_cellsize; } - int cells() const { return m_cells; } - float cellsize() const { return m_cellsize; } + // drawn detail: metres of distance per metre of grid spacing (larger: finer grid further away) + void detail(float const Detail) { m_detail = std::max(10.f, Detail); } + float detail() const { return m_detail; } + // smallest distance (chunks) the terrain is loaded to, whatever the draw range + void radius(int const Radius) { m_radius = std::max(0, Radius); } int radius() const { return m_radius; } - std::string const &texture() const { return m_texture; } - // writes every resident, edited chunk to disk (without unloading) - used on save - void flush(); + // chunks held in memory + void collect(std::vector &Out) const; + // chunk covering (X,Z), or nullptr + editor_terrain *terrain_at(double X, double Z) const; + // height of the terrain at (X,Z); false where there's no chunk in memory + bool height_at(double X, double Z, double &Height) const; + // triangles of the full grid of the chunks in memory overlapping the rectangle (x, z) + void gather_triangles(glm::dvec2 const &Min, glm::dvec2 const &Max, std::vector> &Out) const; + // true if the geometry belongs to the terrain (or its water) + bool owns(gfx::geometry_handle const &Geometry) const; + std::size_t resident() const { return m_chunks.size(); } + // chunks in the pack files and in memory, less the removed ones; the files known so far + bool exists(chunk_key const &Key) const; + + // editing; the chunks changed are written to the files by save() + heightmap::manifest const &manifest() const { return m_manifest; } + // a flat chunk at (Cx, Cz) of specified spacing and height, covered with the material of palette entry Layer; + // returns false if there's a chunk already + bool add_chunk(int Cx, int Cz, float Spacing, float Height, std::uint16_t Layer = 0); + // a chunk at (Cx, Cz), heights given for each grid point by Height (from its world position) + bool add_chunk(int Cx, int Cz, float Spacing, std::function const &Height, std::uint16_t Layer = 0); + void remove_chunk(int Cx, int Cz); + // changes the point spacing of the chunk at (Cx, Cz), heights resampled + void spacing(int Cx, int Cz, float Spacing); + // raises (Strength > 0) or lowers the ground within Radius of (X,Z), with a smooth falloff + bool sculpt(double X, double Z, double Radius, double Strength); + // evens out the ground within Radius of (X,Z), Amount (0..1) of the way at the centre + bool smooth(double X, double Z, double Radius, double Amount); + // gives every grid point within the rectangle to Shaper, with its world position and height (before the modifiers); + // Shaper returns true if it changed the height + bool reshape(glm::dvec2 const &Min, glm::dvec2 const &Max, std::function const &Shaper); + // paints the material of the palette entry Layer within Radius of (X,Z), Strength (0..1) of the way at the centre + bool paint(double X, double Z, double Radius, double Strength, std::uint16_t Layer); + // palette entry of the material, added to the palette if needed + std::uint16_t layer(std::string const &Material, float Size = 0.f); + void layer_size(std::uint16_t Layer, float Size); + void compress(bool State); + void default_spacing(float Spacing); + // bodies of water + std::vector const &water() const { return m_manifest.water; } + void water(std::vector Water); + // modifiers: added or replaced by name + void modifier(heightmap::modifier Modifier); + bool remove_modifier(std::string const &Name); + std::vector const &modifiers() const { return m_manifest.modifiers; } + // changed since the last save + bool modified() const; + // writes the description and the changed pack files. returns: true on success, Error describing the failure + bool save(std::string *Error = nullptr); private: - // per-chunk state bits cached so we don't stat the filesystem repeatedly - enum chunk_flag : uint8_t + struct pack_state { - cf_exists_on_disk = 1u << 0, // a saved 16-bit chunk file exists + enum class state + { + unknown, + loading, + ready, + missing + } status{state::unknown}; + std::shared_ptr file; + std::uint32_t generation{0}; + }; + struct job + { + enum class kind + { + pack, + chunk, + mesh + } type{kind::pack}; + heightmap::pack_key pack{0, 0}; + chunk_key chunk{0, 0}; + std::shared_ptr file; + std::uint32_t generation{0}; + heightmap::chunk_ptr data; + std::array neighbours; // -x, +x, -z, +z + int stride{1}; + glm::dvec3 origin{0.0}; + std::uint64_t version{0}; + double priority{0.0}; + }; + struct result + { + job::kind type{job::kind::pack}; + heightmap::pack_key pack{0, 0}; + chunk_key chunk{0, 0}; + std::uint32_t generation{0}; + std::shared_ptr file; + std::shared_ptr data; + heightmap::mesh mesh; + int stride{1}; + std::uint64_t version{0}; + std::string error; + }; + struct geometry_slot + { + gfx::geometrybank_handle bank{0, 0}; + gfx::geometry_handle geometry{0, 0}; + int cells{0}; + int stride{0}; + bool used{false}; + }; + struct water_shape + { + gfx::geometry_handle geometry{0, 0}; + scene::basic_section *section{nullptr}; + scene::basic_cell *cell{nullptr}; }; - chunk_key key_at(double X, double Z) const; - glm::dvec3 chunk_centre(int Cx, int Cz) const; - std::string chunk_path(int Cx, int Cz) const; - bool chunk_on_disk(chunk_key const &Key); // cached existence test - bool load_heights(int Cx, int Cz, std::vector &Out) const; // reads a 16-bit chunk file - void save_heights(int Cx, int Cz, editor_terrain const &Terrain); // writes a 16-bit chunk file + void start_workers(); + void stop_workers(); + void worker(); + void submit(job Job); + void process(result &Result); + // the chunk is drawn: its shape put in the scene, or put back with a new mesh + void upload(editor_terrain &Chunk, heightmap::mesh &Mesh, int const Stride); + void update_material(editor_terrain &Chunk); + // puts the current material of the chunk in its shape + void upload_shape_material(editor_terrain &Chunk); + // takes the chunk out of the scene, its geometry slot and material given back + void undraw(editor_terrain &Chunk); + void request_mesh(editor_terrain &Chunk, int const Stride, double const Priority); + int wanted_stride(editor_terrain const &Chunk, glm::dvec3 const &Camera) const; + heightmap::chunk_ptr neighbour(chunk_key const &Key) const; + void touch_neighbours(chunk_key const &Key); + material_handle palette_material(std::uint16_t const Layer); + // chunk loaded right away from its pack file, for editing far from the camera + editor_terrain *load_now(chunk_key const &Key); + // chunks in memory or in the files overlapping the rectangle, loaded if needed + std::vector chunks_in(glm::dvec2 const &Min, glm::dvec2 const &Max, bool const Load); + // leads the heights of the chunk from its base heights through the modifiers, within the rectangle + void apply_modifiers(editor_terrain &Chunk, glm::dvec2 const &Min, glm::dvec2 const &Max); + void apply_modifiers(glm::dvec2 const &Min, glm::dvec2 const &Max); + void build_water(); + void clear_water(bool const Touch); + std::string pack_path(heightmap::pack_key const &Key) const; bool m_active{false}; - int m_cells{32}; - float m_cellsize{2.0f}; - int m_radius{2}; // chunks loaded around the camera (Chebyshev radius) - float m_baseheight{0.0f}; - std::string m_texture; - bool m_auto_optimize{true}; - float m_simplify_error{0.5f}; - bool m_persist{true}; - std::string m_dir{"editor_terrain"}; // folder for 16-bit chunk files + std::string m_name; + std::string m_directory; + heightmap::manifest m_manifest; + bool m_manifestchanged{false}; + float m_detail{120.f}; + int m_radius{2}; + std::map m_packs; std::map> m_chunks; - std::map m_known; // cached per-chunk flag bits - // offsets of the chunks around the camera, the nearest first, for the radius in effect - std::vector m_ring; - int m_ring_radius{-1}; + std::set m_loading; // asked from a worker + std::set m_removed; // removed in the editor, still in the files until saved + std::vector m_slots; + std::map m_slotofgeometry; // geometry key -> slot + std::map m_palette; + std::vector m_watershapes; + std::vector m_waterfree; // geometry of the water shown before, to be filled anew + gfx::geometrybank_handle m_waterbank{0, 0}; + bool m_waterchanged{false}; + + glm::dvec3 m_camera{0.0}; + glm::dvec3 m_velocity{0.0}; + double m_cameratime{0.0}; + bool m_hascamera{false}; + std::vector m_ring; // offsets of the chunks around a point, the nearest first + int m_ringradius{-1}; + + // shared with the workers, guarded by m_mutex + std::mutex m_mutex; + std::condition_variable m_wakeup; + std::vector m_jobs; + std::deque m_results; + std::size_t m_busy{0}; // jobs taken by the workers and not finished yet + bool m_stop{false}; + std::vector m_workers; + // the pack files are read by the workers and written by save() + std::mutex m_filemutex; }; -// single, simulation-level streamer instance shared by the editor (authoring) and the scenery -// loader (so streamed terrain renders in every mode, including the driver). loaded from the -// `editorterrain` scenery directive and updated each frame with the active camera. +// single, simulation-level instance shared by the editor (authoring) and the scenery loader, so the terrain +// renders in every mode. opened by the `heightmap_terrain` scenery directive and updated each frame with the active camera. extern terrain_streamer EditorTerrain; diff --git a/model/material.cpp b/model/material.cpp index 19fa0b375..dd7598ab1 100644 --- a/model/material.cpp +++ b/model/material.cpp @@ -640,6 +640,28 @@ material_manager::create( std::string const &Filename, bool const Loadnow ) { return materialhandle; }; +material_handle +material_manager::create_from_text( std::string const &Name, std::string const &Definition ) { + + opengl_material material; + cParser materialparser( Definition, cParser::buffer_TEXT ); + if( false == material.deserialize( materialparser, true ) ) { + return null_handle; + } + material.name = Name; + try { + material.finalize( true ); + } + catch( gl::shader_exception const &e ) { + ErrorLog( "invalid shader: " + std::string( e.what() ) ); + return null_handle; + } + auto const materialhandle { static_cast( m_materials.size() ) }; + m_materials.emplace_back( std::move( material ) ); + // not listed under its name: the name isn't a file which could be asked for + return materialhandle; +} + void material_manager::on_weather_change() { diff --git a/model/material.h b/model/material.h index 7e04514cd..f329a3256 100644 --- a/model/material.h +++ b/model/material.h @@ -139,6 +139,9 @@ public: material_handle create( std::string const &Filename, bool const Loadnow ); + // material described by provided text (the content of a .mat file), not kept in a file. returns: handle to the material or null_handle + material_handle + create_from_text( std::string const &Name, std::string const &Definition ); opengl_material const & material( material_handle const Material ) const { return m_materials[ Material ]; } opengl_material & diff --git a/ref/zstd/LICENSE b/ref/zstd/LICENSE new file mode 100644 index 000000000..75800288c --- /dev/null +++ b/ref/zstd/LICENSE @@ -0,0 +1,30 @@ +BSD License + +For Zstandard software + +Copyright (c) Meta Platforms, Inc. and affiliates. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + * Neither the name Facebook, nor Meta, nor the names of its contributors may + be used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/ref/zstd/README.txt b/ref/zstd/README.txt new file mode 100644 index 000000000..8426cb4e1 --- /dev/null +++ b/ref/zstd/README.txt @@ -0,0 +1,9 @@ +Zstandard 1.5.6 (https://github.com/facebook/zstd), BSD licence (see LICENSE). + +zstd.c is the single file amalgamation made with build/single_file_libs/combine.py from +zstd-in.c, without the dictionary builder and without multithreading: + + sed -e "s/^#ifndef __EMSCRIPTEN__$/#if 0/" -e "/dictBuilder/d" zstd-in.c > zstd-maszyna-in.c + python3 combine.py -r ../../lib -x legacy/zstd_legacy.h -o zstd.c zstd-maszyna-in.c + +Used by the heightmap terrain files (.tch). diff --git a/ref/zstd/zstd.c b/ref/zstd/zstd.c new file mode 100644 index 000000000..664ea2b2f --- /dev/null +++ b/ref/zstd/zstd.c @@ -0,0 +1,45229 @@ +/** + * \file zstd.c + * Single-file Zstandard library. + * + * Generate using: + * \code + * python combine.py -r ../../lib -x legacy/zstd_legacy.h -o zstd.c zstd-in.c + * \endcode + */ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ +/* + * Settings to bake for the single library file. + * + * Note: It's important that none of these affects 'zstd.h' (only the + * implementation files we're amalgamating). + * + * Note: MEM_MODULE stops xxhash redefining BYTE, U16, etc., which are also + * defined in mem.h (breaking C99 compatibility). + * + * Note: the undefs for xxHash allow Zstd's implementation to coincide with + * standalone xxHash usage (with global defines). + * + * Note: if you enable ZSTD_LEGACY_SUPPORT the combine.py script will need + * re-running without the "-x legacy/zstd_legacy.h" option (it excludes the + * legacy support at the source level). + * + * Note: multithreading is enabled for all platforms apart from Emscripten. + */ +#define DEBUGLEVEL 0 +#define MEM_MODULE +#undef XXH_NAMESPACE +#define XXH_NAMESPACE ZSTD_ +#undef XXH_PRIVATE_API +#define XXH_PRIVATE_API +#undef XXH_INLINE_ALL +#define XXH_INLINE_ALL +#define ZSTD_LEGACY_SUPPORT 0 +#if 0 /* single threaded build for MaSzyna */ +#define ZSTD_MULTITHREAD +#endif +#define ZSTD_TRACE 0 +/* TODO: Can't amalgamate ASM function */ +#define ZSTD_DISABLE_ASM 1 + +/* Include zstd_deps.h first with all the options we need enabled. */ +#define ZSTD_DEPS_NEED_MALLOC +#define ZSTD_DEPS_NEED_MATH64 +/**** start inlining common/zstd_deps.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +/* This file provides common libc dependencies that zstd requires. + * The purpose is to allow replacing this file with a custom implementation + * to compile zstd without libc support. + */ + +/* Need: + * NULL + * INT_MAX + * UINT_MAX + * ZSTD_memcpy() + * ZSTD_memset() + * ZSTD_memmove() + */ +#ifndef ZSTD_DEPS_COMMON +#define ZSTD_DEPS_COMMON + +#include +#include +#include + +#if defined(__GNUC__) && __GNUC__ >= 4 +# define ZSTD_memcpy(d,s,l) __builtin_memcpy((d),(s),(l)) +# define ZSTD_memmove(d,s,l) __builtin_memmove((d),(s),(l)) +# define ZSTD_memset(p,v,l) __builtin_memset((p),(v),(l)) +#else +# define ZSTD_memcpy(d,s,l) memcpy((d),(s),(l)) +# define ZSTD_memmove(d,s,l) memmove((d),(s),(l)) +# define ZSTD_memset(p,v,l) memset((p),(v),(l)) +#endif + +#endif /* ZSTD_DEPS_COMMON */ + +/* Need: + * ZSTD_malloc() + * ZSTD_free() + * ZSTD_calloc() + */ +#ifdef ZSTD_DEPS_NEED_MALLOC +#ifndef ZSTD_DEPS_MALLOC +#define ZSTD_DEPS_MALLOC + +#include + +#define ZSTD_malloc(s) malloc(s) +#define ZSTD_calloc(n,s) calloc((n), (s)) +#define ZSTD_free(p) free((p)) + +#endif /* ZSTD_DEPS_MALLOC */ +#endif /* ZSTD_DEPS_NEED_MALLOC */ + +/* + * Provides 64-bit math support. + * Need: + * U64 ZSTD_div64(U64 dividend, U32 divisor) + */ +#ifdef ZSTD_DEPS_NEED_MATH64 +#ifndef ZSTD_DEPS_MATH64 +#define ZSTD_DEPS_MATH64 + +#define ZSTD_div64(dividend, divisor) ((dividend) / (divisor)) + +#endif /* ZSTD_DEPS_MATH64 */ +#endif /* ZSTD_DEPS_NEED_MATH64 */ + +/* Need: + * assert() + */ +#ifdef ZSTD_DEPS_NEED_ASSERT +#ifndef ZSTD_DEPS_ASSERT +#define ZSTD_DEPS_ASSERT + +#include + +#endif /* ZSTD_DEPS_ASSERT */ +#endif /* ZSTD_DEPS_NEED_ASSERT */ + +/* Need: + * ZSTD_DEBUG_PRINT() + */ +#ifdef ZSTD_DEPS_NEED_IO +#ifndef ZSTD_DEPS_IO +#define ZSTD_DEPS_IO + +#include +#define ZSTD_DEBUG_PRINT(...) fprintf(stderr, __VA_ARGS__) + +#endif /* ZSTD_DEPS_IO */ +#endif /* ZSTD_DEPS_NEED_IO */ + +/* Only requested when is known to be present. + * Need: + * intptr_t + */ +#ifdef ZSTD_DEPS_NEED_STDINT +#ifndef ZSTD_DEPS_STDINT +#define ZSTD_DEPS_STDINT + +#include + +#endif /* ZSTD_DEPS_STDINT */ +#endif /* ZSTD_DEPS_NEED_STDINT */ +/**** ended inlining common/zstd_deps.h ****/ + +/**** start inlining common/debug.c ****/ +/* ****************************************************************** + * debug + * Part of FSE library + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * You can contact the author at : + * - Source repository : https://github.com/Cyan4973/FiniteStateEntropy + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. +****************************************************************** */ + + +/* + * This module only hosts one global variable + * which can be used to dynamically influence the verbosity of traces, + * such as DEBUGLOG and RAWLOG + */ + +/**** start inlining debug.h ****/ +/* ****************************************************************** + * debug + * Part of FSE library + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * You can contact the author at : + * - Source repository : https://github.com/Cyan4973/FiniteStateEntropy + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. +****************************************************************** */ + + +/* + * The purpose of this header is to enable debug functions. + * They regroup assert(), DEBUGLOG() and RAWLOG() for run-time, + * and DEBUG_STATIC_ASSERT() for compile-time. + * + * By default, DEBUGLEVEL==0, which means run-time debug is disabled. + * + * Level 1 enables assert() only. + * Starting level 2, traces can be generated and pushed to stderr. + * The higher the level, the more verbose the traces. + * + * It's possible to dynamically adjust level using variable g_debug_level, + * which is only declared if DEBUGLEVEL>=2, + * and is a global variable, not multi-thread protected (use with care) + */ + +#ifndef DEBUG_H_12987983217 +#define DEBUG_H_12987983217 + +#if defined (__cplusplus) +extern "C" { +#endif + + +/* static assert is triggered at compile time, leaving no runtime artefact. + * static assert only works with compile-time constants. + * Also, this variant can only be used inside a function. */ +#define DEBUG_STATIC_ASSERT(c) (void)sizeof(char[(c) ? 1 : -1]) + + +/* DEBUGLEVEL is expected to be defined externally, + * typically through compiler command line. + * Value must be a number. */ +#ifndef DEBUGLEVEL +# define DEBUGLEVEL 0 +#endif + + +/* recommended values for DEBUGLEVEL : + * 0 : release mode, no debug, all run-time checks disabled + * 1 : enables assert() only, no display + * 2 : reserved, for currently active debug path + * 3 : events once per object lifetime (CCtx, CDict, etc.) + * 4 : events once per frame + * 5 : events once per block + * 6 : events once per sequence (verbose) + * 7+: events at every position (*very* verbose) + * + * It's generally inconvenient to output traces > 5. + * In which case, it's possible to selectively trigger high verbosity levels + * by modifying g_debug_level. + */ + +#if (DEBUGLEVEL>=1) +# define ZSTD_DEPS_NEED_ASSERT +/**** skipping file: zstd_deps.h ****/ +#else +# ifndef assert /* assert may be already defined, due to prior #include */ +# define assert(condition) ((void)0) /* disable assert (default) */ +# endif +#endif + +#if (DEBUGLEVEL>=2) +# define ZSTD_DEPS_NEED_IO +/**** skipping file: zstd_deps.h ****/ +extern int g_debuglevel; /* the variable is only declared, + it actually lives in debug.c, + and is shared by the whole process. + It's not thread-safe. + It's useful when enabling very verbose levels + on selective conditions (such as position in src) */ + +# define RAWLOG(l, ...) \ + do { \ + if (l<=g_debuglevel) { \ + ZSTD_DEBUG_PRINT(__VA_ARGS__); \ + } \ + } while (0) + +#define STRINGIFY(x) #x +#define TOSTRING(x) STRINGIFY(x) +#define LINE_AS_STRING TOSTRING(__LINE__) + +# define DEBUGLOG(l, ...) \ + do { \ + if (l<=g_debuglevel) { \ + ZSTD_DEBUG_PRINT(__FILE__ ":" LINE_AS_STRING ": " __VA_ARGS__); \ + ZSTD_DEBUG_PRINT(" \n"); \ + } \ + } while (0) +#else +# define RAWLOG(l, ...) do { } while (0) /* disabled */ +# define DEBUGLOG(l, ...) do { } while (0) /* disabled */ +#endif + + +#if defined (__cplusplus) +} +#endif + +#endif /* DEBUG_H_12987983217 */ +/**** ended inlining debug.h ****/ + +#if !defined(ZSTD_LINUX_KERNEL) || (DEBUGLEVEL>=2) +/* We only use this when DEBUGLEVEL>=2, but we get -Werror=pedantic errors if a + * translation unit is empty. So remove this from Linux kernel builds, but + * otherwise just leave it in. + */ +int g_debuglevel = DEBUGLEVEL; +#endif +/**** ended inlining common/debug.c ****/ +/**** start inlining common/entropy_common.c ****/ +/* ****************************************************************** + * Common functions of New Generation Entropy library + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * You can contact the author at : + * - FSE+HUF source repository : https://github.com/Cyan4973/FiniteStateEntropy + * - Public forum : https://groups.google.com/forum/#!forum/lz4c + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. +****************************************************************** */ + +/* ************************************* +* Dependencies +***************************************/ +/**** start inlining mem.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +#ifndef MEM_H_MODULE +#define MEM_H_MODULE + +#if defined (__cplusplus) +extern "C" { +#endif + +/*-**************************************** +* Dependencies +******************************************/ +#include /* size_t, ptrdiff_t */ +/**** start inlining compiler.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +#ifndef ZSTD_COMPILER_H +#define ZSTD_COMPILER_H + +#include + +/**** start inlining portability_macros.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +#ifndef ZSTD_PORTABILITY_MACROS_H +#define ZSTD_PORTABILITY_MACROS_H + +/** + * This header file contains macro definitions to support portability. + * This header is shared between C and ASM code, so it MUST only + * contain macro definitions. It MUST not contain any C code. + * + * This header ONLY defines macros to detect platforms/feature support. + * + */ + + +/* compat. with non-clang compilers */ +#ifndef __has_attribute + #define __has_attribute(x) 0 +#endif + +/* compat. with non-clang compilers */ +#ifndef __has_builtin +# define __has_builtin(x) 0 +#endif + +/* compat. with non-clang compilers */ +#ifndef __has_feature +# define __has_feature(x) 0 +#endif + +/* detects whether we are being compiled under msan */ +#ifndef ZSTD_MEMORY_SANITIZER +# if __has_feature(memory_sanitizer) +# define ZSTD_MEMORY_SANITIZER 1 +# else +# define ZSTD_MEMORY_SANITIZER 0 +# endif +#endif + +/* detects whether we are being compiled under asan */ +#ifndef ZSTD_ADDRESS_SANITIZER +# if __has_feature(address_sanitizer) +# define ZSTD_ADDRESS_SANITIZER 1 +# elif defined(__SANITIZE_ADDRESS__) +# define ZSTD_ADDRESS_SANITIZER 1 +# else +# define ZSTD_ADDRESS_SANITIZER 0 +# endif +#endif + +/* detects whether we are being compiled under dfsan */ +#ifndef ZSTD_DATAFLOW_SANITIZER +# if __has_feature(dataflow_sanitizer) +# define ZSTD_DATAFLOW_SANITIZER 1 +# else +# define ZSTD_DATAFLOW_SANITIZER 0 +# endif +#endif + +/* Mark the internal assembly functions as hidden */ +#ifdef __ELF__ +# define ZSTD_HIDE_ASM_FUNCTION(func) .hidden func +#elif defined(__APPLE__) +# define ZSTD_HIDE_ASM_FUNCTION(func) .private_extern func +#else +# define ZSTD_HIDE_ASM_FUNCTION(func) +#endif + +/* Enable runtime BMI2 dispatch based on the CPU. + * Enabled for clang & gcc >=4.8 on x86 when BMI2 isn't enabled by default. + */ +#ifndef DYNAMIC_BMI2 + #if ((defined(__clang__) && __has_attribute(__target__)) \ + || (defined(__GNUC__) \ + && (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)))) \ + && (defined(__x86_64__) || defined(_M_X64)) \ + && !defined(__BMI2__) + # define DYNAMIC_BMI2 1 + #else + # define DYNAMIC_BMI2 0 + #endif +#endif + +/** + * Only enable assembly for GNUC compatible compilers, + * because other platforms may not support GAS assembly syntax. + * + * Only enable assembly for Linux / MacOS, other platforms may + * work, but they haven't been tested. This could likely be + * extended to BSD systems. + * + * Disable assembly when MSAN is enabled, because MSAN requires + * 100% of code to be instrumented to work. + */ +#if defined(__GNUC__) +# if defined(__linux__) || defined(__linux) || defined(__APPLE__) +# if ZSTD_MEMORY_SANITIZER +# define ZSTD_ASM_SUPPORTED 0 +# elif ZSTD_DATAFLOW_SANITIZER +# define ZSTD_ASM_SUPPORTED 0 +# else +# define ZSTD_ASM_SUPPORTED 1 +# endif +# else +# define ZSTD_ASM_SUPPORTED 0 +# endif +#else +# define ZSTD_ASM_SUPPORTED 0 +#endif + +/** + * Determines whether we should enable assembly for x86-64 + * with BMI2. + * + * Enable if all of the following conditions hold: + * - ASM hasn't been explicitly disabled by defining ZSTD_DISABLE_ASM + * - Assembly is supported + * - We are compiling for x86-64 and either: + * - DYNAMIC_BMI2 is enabled + * - BMI2 is supported at compile time + */ +#if !defined(ZSTD_DISABLE_ASM) && \ + ZSTD_ASM_SUPPORTED && \ + defined(__x86_64__) && \ + (DYNAMIC_BMI2 || defined(__BMI2__)) +# define ZSTD_ENABLE_ASM_X86_64_BMI2 1 +#else +# define ZSTD_ENABLE_ASM_X86_64_BMI2 0 +#endif + +/* + * For x86 ELF targets, add .note.gnu.property section for Intel CET in + * assembly sources when CET is enabled. + * + * Additionally, any function that may be called indirectly must begin + * with ZSTD_CET_ENDBRANCH. + */ +#if defined(__ELF__) && (defined(__x86_64__) || defined(__i386__)) \ + && defined(__has_include) +# if __has_include() +# include +# define ZSTD_CET_ENDBRANCH _CET_ENDBR +# endif +#endif + +#ifndef ZSTD_CET_ENDBRANCH +# define ZSTD_CET_ENDBRANCH +#endif + +#endif /* ZSTD_PORTABILITY_MACROS_H */ +/**** ended inlining portability_macros.h ****/ + +/*-******************************************************* +* Compiler specifics +*********************************************************/ +/* force inlining */ + +#if !defined(ZSTD_NO_INLINE) +#if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || defined(__cplusplus) || defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 */ +# define INLINE_KEYWORD inline +#else +# define INLINE_KEYWORD +#endif + +#if defined(__GNUC__) || defined(__ICCARM__) +# define FORCE_INLINE_ATTR __attribute__((always_inline)) +#elif defined(_MSC_VER) +# define FORCE_INLINE_ATTR __forceinline +#else +# define FORCE_INLINE_ATTR +#endif + +#else + +#define INLINE_KEYWORD +#define FORCE_INLINE_ATTR + +#endif + +/** + On MSVC qsort requires that functions passed into it use the __cdecl calling conversion(CC). + This explicitly marks such functions as __cdecl so that the code will still compile + if a CC other than __cdecl has been made the default. +*/ +#if defined(_MSC_VER) +# define WIN_CDECL __cdecl +#else +# define WIN_CDECL +#endif + +/* UNUSED_ATTR tells the compiler it is okay if the function is unused. */ +#if defined(__GNUC__) +# define UNUSED_ATTR __attribute__((unused)) +#else +# define UNUSED_ATTR +#endif + +/** + * FORCE_INLINE_TEMPLATE is used to define C "templates", which take constant + * parameters. They must be inlined for the compiler to eliminate the constant + * branches. + */ +#define FORCE_INLINE_TEMPLATE static INLINE_KEYWORD FORCE_INLINE_ATTR UNUSED_ATTR +/** + * HINT_INLINE is used to help the compiler generate better code. It is *not* + * used for "templates", so it can be tweaked based on the compilers + * performance. + * + * gcc-4.8 and gcc-4.9 have been shown to benefit from leaving off the + * always_inline attribute. + * + * clang up to 5.0.0 (trunk) benefit tremendously from the always_inline + * attribute. + */ +#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 8 && __GNUC__ < 5 +# define HINT_INLINE static INLINE_KEYWORD +#else +# define HINT_INLINE FORCE_INLINE_TEMPLATE +#endif + +/* "soft" inline : + * The compiler is free to select if it's a good idea to inline or not. + * The main objective is to silence compiler warnings + * when a defined function in included but not used. + * + * Note : this macro is prefixed `MEM_` because it used to be provided by `mem.h` unit. + * Updating the prefix is probably preferable, but requires a fairly large codemod, + * since this name is used everywhere. + */ +#ifndef MEM_STATIC /* already defined in Linux Kernel mem.h */ +#if defined(__GNUC__) +# define MEM_STATIC static __inline UNUSED_ATTR +#elif defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) +# define MEM_STATIC static inline +#elif defined(_MSC_VER) +# define MEM_STATIC static __inline +#else +# define MEM_STATIC static /* this version may generate warnings for unused static functions; disable the relevant warning */ +#endif +#endif + +/* force no inlining */ +#ifdef _MSC_VER +# define FORCE_NOINLINE static __declspec(noinline) +#else +# if defined(__GNUC__) || defined(__ICCARM__) +# define FORCE_NOINLINE static __attribute__((__noinline__)) +# else +# define FORCE_NOINLINE static +# endif +#endif + + +/* target attribute */ +#if defined(__GNUC__) || defined(__ICCARM__) +# define TARGET_ATTRIBUTE(target) __attribute__((__target__(target))) +#else +# define TARGET_ATTRIBUTE(target) +#endif + +/* Target attribute for BMI2 dynamic dispatch. + * Enable lzcnt, bmi, and bmi2. + * We test for bmi1 & bmi2. lzcnt is included in bmi1. + */ +#define BMI2_TARGET_ATTRIBUTE TARGET_ATTRIBUTE("lzcnt,bmi,bmi2") + +/* prefetch + * can be disabled, by declaring NO_PREFETCH build macro */ +#if defined(NO_PREFETCH) +# define PREFETCH_L1(ptr) do { (void)(ptr); } while (0) /* disabled */ +# define PREFETCH_L2(ptr) do { (void)(ptr); } while (0) /* disabled */ +#else +# if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_I86)) && !defined(_M_ARM64EC) /* _mm_prefetch() is not defined outside of x86/x64 */ +# include /* https://msdn.microsoft.com/fr-fr/library/84szxsww(v=vs.90).aspx */ +# define PREFETCH_L1(ptr) _mm_prefetch((const char*)(ptr), _MM_HINT_T0) +# define PREFETCH_L2(ptr) _mm_prefetch((const char*)(ptr), _MM_HINT_T1) +# elif defined(__GNUC__) && ( (__GNUC__ >= 4) || ( (__GNUC__ == 3) && (__GNUC_MINOR__ >= 1) ) ) +# define PREFETCH_L1(ptr) __builtin_prefetch((ptr), 0 /* rw==read */, 3 /* locality */) +# define PREFETCH_L2(ptr) __builtin_prefetch((ptr), 0 /* rw==read */, 2 /* locality */) +# elif defined(__aarch64__) +# define PREFETCH_L1(ptr) do { __asm__ __volatile__("prfm pldl1keep, %0" ::"Q"(*(ptr))); } while (0) +# define PREFETCH_L2(ptr) do { __asm__ __volatile__("prfm pldl2keep, %0" ::"Q"(*(ptr))); } while (0) +# else +# define PREFETCH_L1(ptr) do { (void)(ptr); } while (0) /* disabled */ +# define PREFETCH_L2(ptr) do { (void)(ptr); } while (0) /* disabled */ +# endif +#endif /* NO_PREFETCH */ + +#define CACHELINE_SIZE 64 + +#define PREFETCH_AREA(p, s) \ + do { \ + const char* const _ptr = (const char*)(p); \ + size_t const _size = (size_t)(s); \ + size_t _pos; \ + for (_pos=0; _pos<_size; _pos+=CACHELINE_SIZE) { \ + PREFETCH_L2(_ptr + _pos); \ + } \ + } while (0) + +/* vectorization + * older GCC (pre gcc-4.3 picked as the cutoff) uses a different syntax, + * and some compilers, like Intel ICC and MCST LCC, do not support it at all. */ +#if !defined(__INTEL_COMPILER) && !defined(__clang__) && defined(__GNUC__) && !defined(__LCC__) +# if (__GNUC__ == 4 && __GNUC_MINOR__ > 3) || (__GNUC__ >= 5) +# define DONT_VECTORIZE __attribute__((optimize("no-tree-vectorize"))) +# else +# define DONT_VECTORIZE _Pragma("GCC optimize(\"no-tree-vectorize\")") +# endif +#else +# define DONT_VECTORIZE +#endif + +/* Tell the compiler that a branch is likely or unlikely. + * Only use these macros if it causes the compiler to generate better code. + * If you can remove a LIKELY/UNLIKELY annotation without speed changes in gcc + * and clang, please do. + */ +#if defined(__GNUC__) +#define LIKELY(x) (__builtin_expect((x), 1)) +#define UNLIKELY(x) (__builtin_expect((x), 0)) +#else +#define LIKELY(x) (x) +#define UNLIKELY(x) (x) +#endif + +#if __has_builtin(__builtin_unreachable) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))) +# define ZSTD_UNREACHABLE do { assert(0), __builtin_unreachable(); } while (0) +#else +# define ZSTD_UNREACHABLE do { assert(0); } while (0) +#endif + +/* disable warnings */ +#ifdef _MSC_VER /* Visual Studio */ +# include /* For Visual 2005 */ +# pragma warning(disable : 4100) /* disable: C4100: unreferenced formal parameter */ +# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */ +# pragma warning(disable : 4204) /* disable: C4204: non-constant aggregate initializer */ +# pragma warning(disable : 4214) /* disable: C4214: non-int bitfields */ +# pragma warning(disable : 4324) /* disable: C4324: padded structure */ +#endif + +/*Like DYNAMIC_BMI2 but for compile time determination of BMI2 support*/ +#ifndef STATIC_BMI2 +# if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_I86)) +# ifdef __AVX2__ //MSVC does not have a BMI2 specific flag, but every CPU that supports AVX2 also supports BMI2 +# define STATIC_BMI2 1 +# endif +# elif defined(__BMI2__) && defined(__x86_64__) && defined(__GNUC__) +# define STATIC_BMI2 1 +# endif +#endif + +#ifndef STATIC_BMI2 + #define STATIC_BMI2 0 +#endif + +/* compile time determination of SIMD support */ +#if !defined(ZSTD_NO_INTRINSICS) +# if defined(__SSE2__) || defined(_M_AMD64) || (defined (_M_IX86) && defined(_M_IX86_FP) && (_M_IX86_FP >= 2)) +# define ZSTD_ARCH_X86_SSE2 +# endif +# if defined(__ARM_NEON) || defined(_M_ARM64) +# define ZSTD_ARCH_ARM_NEON +# endif +# +# if defined(ZSTD_ARCH_X86_SSE2) +# include +# elif defined(ZSTD_ARCH_ARM_NEON) +# include +# endif +#endif + +/* C-language Attributes are added in C23. */ +#if defined(__STDC_VERSION__) && (__STDC_VERSION__ > 201710L) && defined(__has_c_attribute) +# define ZSTD_HAS_C_ATTRIBUTE(x) __has_c_attribute(x) +#else +# define ZSTD_HAS_C_ATTRIBUTE(x) 0 +#endif + +/* Only use C++ attributes in C++. Some compilers report support for C++ + * attributes when compiling with C. + */ +#if defined(__cplusplus) && defined(__has_cpp_attribute) +# define ZSTD_HAS_CPP_ATTRIBUTE(x) __has_cpp_attribute(x) +#else +# define ZSTD_HAS_CPP_ATTRIBUTE(x) 0 +#endif + +/* Define ZSTD_FALLTHROUGH macro for annotating switch case with the 'fallthrough' attribute. + * - C23: https://en.cppreference.com/w/c/language/attributes/fallthrough + * - CPP17: https://en.cppreference.com/w/cpp/language/attributes/fallthrough + * - Else: __attribute__((__fallthrough__)) + */ +#ifndef ZSTD_FALLTHROUGH +# if ZSTD_HAS_C_ATTRIBUTE(fallthrough) +# define ZSTD_FALLTHROUGH [[fallthrough]] +# elif ZSTD_HAS_CPP_ATTRIBUTE(fallthrough) +# define ZSTD_FALLTHROUGH [[fallthrough]] +# elif __has_attribute(__fallthrough__) +/* Leading semicolon is to satisfy gcc-11 with -pedantic. Without the semicolon + * gcc complains about: a label can only be part of a statement and a declaration is not a statement. + */ +# define ZSTD_FALLTHROUGH ; __attribute__((__fallthrough__)) +# else +# define ZSTD_FALLTHROUGH +# endif +#endif + +/*-************************************************************** +* Alignment check +*****************************************************************/ + +/* this test was initially positioned in mem.h, + * but this file is removed (or replaced) for linux kernel + * so it's now hosted in compiler.h, + * which remains valid for both user & kernel spaces. + */ + +#ifndef ZSTD_ALIGNOF +# if defined(__GNUC__) || defined(_MSC_VER) +/* covers gcc, clang & MSVC */ +/* note : this section must come first, before C11, + * due to a limitation in the kernel source generator */ +# define ZSTD_ALIGNOF(T) __alignof(T) + +# elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) +/* C11 support */ +# include +# define ZSTD_ALIGNOF(T) alignof(T) + +# else +/* No known support for alignof() - imperfect backup */ +# define ZSTD_ALIGNOF(T) (sizeof(void*) < sizeof(T) ? sizeof(void*) : sizeof(T)) + +# endif +#endif /* ZSTD_ALIGNOF */ + +/*-************************************************************** +* Sanitizer +*****************************************************************/ + +/** + * Zstd relies on pointer overflow in its decompressor. + * We add this attribute to functions that rely on pointer overflow. + */ +#ifndef ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +# if __has_attribute(no_sanitize) +# if !defined(__clang__) && defined(__GNUC__) && __GNUC__ < 8 + /* gcc < 8 only has signed-integer-overlow which triggers on pointer overflow */ +# define ZSTD_ALLOW_POINTER_OVERFLOW_ATTR __attribute__((no_sanitize("signed-integer-overflow"))) +# else + /* older versions of clang [3.7, 5.0) will warn that pointer-overflow is ignored. */ +# define ZSTD_ALLOW_POINTER_OVERFLOW_ATTR __attribute__((no_sanitize("pointer-overflow"))) +# endif +# else +# define ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +# endif +#endif + +/** + * Helper function to perform a wrapped pointer difference without trigging + * UBSAN. + * + * @returns lhs - rhs with wrapping + */ +MEM_STATIC +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +ptrdiff_t ZSTD_wrappedPtrDiff(unsigned char const* lhs, unsigned char const* rhs) +{ + return lhs - rhs; +} + +/** + * Helper function to perform a wrapped pointer add without triggering UBSAN. + * + * @return ptr + add with wrapping + */ +MEM_STATIC +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +unsigned char const* ZSTD_wrappedPtrAdd(unsigned char const* ptr, ptrdiff_t add) +{ + return ptr + add; +} + +/** + * Helper function to perform a wrapped pointer subtraction without triggering + * UBSAN. + * + * @return ptr - sub with wrapping + */ +MEM_STATIC +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +unsigned char const* ZSTD_wrappedPtrSub(unsigned char const* ptr, ptrdiff_t sub) +{ + return ptr - sub; +} + +/** + * Helper function to add to a pointer that works around C's undefined behavior + * of adding 0 to NULL. + * + * @returns `ptr + add` except it defines `NULL + 0 == NULL`. + */ +MEM_STATIC +unsigned char* ZSTD_maybeNullPtrAdd(unsigned char* ptr, ptrdiff_t add) +{ + return add > 0 ? ptr + add : ptr; +} + +/* Issue #3240 reports an ASAN failure on an llvm-mingw build. Out of an + * abundance of caution, disable our custom poisoning on mingw. */ +#ifdef __MINGW32__ +#ifndef ZSTD_ASAN_DONT_POISON_WORKSPACE +#define ZSTD_ASAN_DONT_POISON_WORKSPACE 1 +#endif +#ifndef ZSTD_MSAN_DONT_POISON_WORKSPACE +#define ZSTD_MSAN_DONT_POISON_WORKSPACE 1 +#endif +#endif + +#if ZSTD_MEMORY_SANITIZER && !defined(ZSTD_MSAN_DONT_POISON_WORKSPACE) +/* Not all platforms that support msan provide sanitizers/msan_interface.h. + * We therefore declare the functions we need ourselves, rather than trying to + * include the header file... */ +#include /* size_t */ +#define ZSTD_DEPS_NEED_STDINT +/**** skipping file: zstd_deps.h ****/ + +/* Make memory region fully initialized (without changing its contents). */ +void __msan_unpoison(const volatile void *a, size_t size); + +/* Make memory region fully uninitialized (without changing its contents). + This is a legacy interface that does not update origin information. Use + __msan_allocated_memory() instead. */ +void __msan_poison(const volatile void *a, size_t size); + +/* Returns the offset of the first (at least partially) poisoned byte in the + memory range, or -1 if the whole range is good. */ +intptr_t __msan_test_shadow(const volatile void *x, size_t size); + +/* Print shadow and origin for the memory range to stderr in a human-readable + format. */ +void __msan_print_shadow(const volatile void *x, size_t size); +#endif + +#if ZSTD_ADDRESS_SANITIZER && !defined(ZSTD_ASAN_DONT_POISON_WORKSPACE) +/* Not all platforms that support asan provide sanitizers/asan_interface.h. + * We therefore declare the functions we need ourselves, rather than trying to + * include the header file... */ +#include /* size_t */ + +/** + * Marks a memory region ([addr, addr+size)) as unaddressable. + * + * This memory must be previously allocated by your program. Instrumented + * code is forbidden from accessing addresses in this region until it is + * unpoisoned. This function is not guaranteed to poison the entire region - + * it could poison only a subregion of [addr, addr+size) due to ASan + * alignment restrictions. + * + * \note This function is not thread-safe because no two threads can poison or + * unpoison memory in the same memory region simultaneously. + * + * \param addr Start of memory region. + * \param size Size of memory region. */ +void __asan_poison_memory_region(void const volatile *addr, size_t size); + +/** + * Marks a memory region ([addr, addr+size)) as addressable. + * + * This memory must be previously allocated by your program. Accessing + * addresses in this region is allowed until this region is poisoned again. + * This function could unpoison a super-region of [addr, addr+size) due + * to ASan alignment restrictions. + * + * \note This function is not thread-safe because no two threads can + * poison or unpoison memory in the same memory region simultaneously. + * + * \param addr Start of memory region. + * \param size Size of memory region. */ +void __asan_unpoison_memory_region(void const volatile *addr, size_t size); +#endif + +#endif /* ZSTD_COMPILER_H */ +/**** ended inlining compiler.h ****/ +/**** skipping file: debug.h ****/ +/**** skipping file: zstd_deps.h ****/ + + +/*-**************************************** +* Compiler specifics +******************************************/ +#if defined(_MSC_VER) /* Visual Studio */ +# include /* _byteswap_ulong */ +# include /* _byteswap_* */ +#endif + +/*-************************************************************** +* Basic Types +*****************************************************************/ +#if !defined (__VMS) && (defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) ) +# if defined(_AIX) +# include +# else +# include /* intptr_t */ +# endif + typedef uint8_t BYTE; + typedef uint8_t U8; + typedef int8_t S8; + typedef uint16_t U16; + typedef int16_t S16; + typedef uint32_t U32; + typedef int32_t S32; + typedef uint64_t U64; + typedef int64_t S64; +#else +# include +#if CHAR_BIT != 8 +# error "this implementation requires char to be exactly 8-bit type" +#endif + typedef unsigned char BYTE; + typedef unsigned char U8; + typedef signed char S8; +#if USHRT_MAX != 65535 +# error "this implementation requires short to be exactly 16-bit type" +#endif + typedef unsigned short U16; + typedef signed short S16; +#if UINT_MAX != 4294967295 +# error "this implementation requires int to be exactly 32-bit type" +#endif + typedef unsigned int U32; + typedef signed int S32; +/* note : there are no limits defined for long long type in C90. + * limits exist in C99, however, in such case, is preferred */ + typedef unsigned long long U64; + typedef signed long long S64; +#endif + + +/*-************************************************************** +* Memory I/O API +*****************************************************************/ +/*=== Static platform detection ===*/ +MEM_STATIC unsigned MEM_32bits(void); +MEM_STATIC unsigned MEM_64bits(void); +MEM_STATIC unsigned MEM_isLittleEndian(void); + +/*=== Native unaligned read/write ===*/ +MEM_STATIC U16 MEM_read16(const void* memPtr); +MEM_STATIC U32 MEM_read32(const void* memPtr); +MEM_STATIC U64 MEM_read64(const void* memPtr); +MEM_STATIC size_t MEM_readST(const void* memPtr); + +MEM_STATIC void MEM_write16(void* memPtr, U16 value); +MEM_STATIC void MEM_write32(void* memPtr, U32 value); +MEM_STATIC void MEM_write64(void* memPtr, U64 value); + +/*=== Little endian unaligned read/write ===*/ +MEM_STATIC U16 MEM_readLE16(const void* memPtr); +MEM_STATIC U32 MEM_readLE24(const void* memPtr); +MEM_STATIC U32 MEM_readLE32(const void* memPtr); +MEM_STATIC U64 MEM_readLE64(const void* memPtr); +MEM_STATIC size_t MEM_readLEST(const void* memPtr); + +MEM_STATIC void MEM_writeLE16(void* memPtr, U16 val); +MEM_STATIC void MEM_writeLE24(void* memPtr, U32 val); +MEM_STATIC void MEM_writeLE32(void* memPtr, U32 val32); +MEM_STATIC void MEM_writeLE64(void* memPtr, U64 val64); +MEM_STATIC void MEM_writeLEST(void* memPtr, size_t val); + +/*=== Big endian unaligned read/write ===*/ +MEM_STATIC U32 MEM_readBE32(const void* memPtr); +MEM_STATIC U64 MEM_readBE64(const void* memPtr); +MEM_STATIC size_t MEM_readBEST(const void* memPtr); + +MEM_STATIC void MEM_writeBE32(void* memPtr, U32 val32); +MEM_STATIC void MEM_writeBE64(void* memPtr, U64 val64); +MEM_STATIC void MEM_writeBEST(void* memPtr, size_t val); + +/*=== Byteswap ===*/ +MEM_STATIC U32 MEM_swap32(U32 in); +MEM_STATIC U64 MEM_swap64(U64 in); +MEM_STATIC size_t MEM_swapST(size_t in); + + +/*-************************************************************** +* Memory I/O Implementation +*****************************************************************/ +/* MEM_FORCE_MEMORY_ACCESS : For accessing unaligned memory: + * Method 0 : always use `memcpy()`. Safe and portable. + * Method 1 : Use compiler extension to set unaligned access. + * Method 2 : direct access. This method is portable but violate C standard. + * It can generate buggy code on targets depending on alignment. + * Default : method 1 if supported, else method 0 + */ +#ifndef MEM_FORCE_MEMORY_ACCESS /* can be defined externally, on command line for example */ +# ifdef __GNUC__ +# define MEM_FORCE_MEMORY_ACCESS 1 +# endif +#endif + +MEM_STATIC unsigned MEM_32bits(void) { return sizeof(size_t)==4; } +MEM_STATIC unsigned MEM_64bits(void) { return sizeof(size_t)==8; } + +MEM_STATIC unsigned MEM_isLittleEndian(void) +{ +#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) + return 1; +#elif defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) + return 0; +#elif defined(__clang__) && __LITTLE_ENDIAN__ + return 1; +#elif defined(__clang__) && __BIG_ENDIAN__ + return 0; +#elif defined(_MSC_VER) && (_M_AMD64 || _M_IX86) + return 1; +#elif defined(__DMC__) && defined(_M_IX86) + return 1; +#else + const union { U32 u; BYTE c[4]; } one = { 1 }; /* don't use static : performance detrimental */ + return one.c[0]; +#endif +} + +#if defined(MEM_FORCE_MEMORY_ACCESS) && (MEM_FORCE_MEMORY_ACCESS==2) + +/* violates C standard, by lying on structure alignment. +Only use if no other choice to achieve best performance on target platform */ +MEM_STATIC U16 MEM_read16(const void* memPtr) { return *(const U16*) memPtr; } +MEM_STATIC U32 MEM_read32(const void* memPtr) { return *(const U32*) memPtr; } +MEM_STATIC U64 MEM_read64(const void* memPtr) { return *(const U64*) memPtr; } +MEM_STATIC size_t MEM_readST(const void* memPtr) { return *(const size_t*) memPtr; } + +MEM_STATIC void MEM_write16(void* memPtr, U16 value) { *(U16*)memPtr = value; } +MEM_STATIC void MEM_write32(void* memPtr, U32 value) { *(U32*)memPtr = value; } +MEM_STATIC void MEM_write64(void* memPtr, U64 value) { *(U64*)memPtr = value; } + +#elif defined(MEM_FORCE_MEMORY_ACCESS) && (MEM_FORCE_MEMORY_ACCESS==1) + +typedef __attribute__((aligned(1))) U16 unalign16; +typedef __attribute__((aligned(1))) U32 unalign32; +typedef __attribute__((aligned(1))) U64 unalign64; +typedef __attribute__((aligned(1))) size_t unalignArch; + +MEM_STATIC U16 MEM_read16(const void* ptr) { return *(const unalign16*)ptr; } +MEM_STATIC U32 MEM_read32(const void* ptr) { return *(const unalign32*)ptr; } +MEM_STATIC U64 MEM_read64(const void* ptr) { return *(const unalign64*)ptr; } +MEM_STATIC size_t MEM_readST(const void* ptr) { return *(const unalignArch*)ptr; } + +MEM_STATIC void MEM_write16(void* memPtr, U16 value) { *(unalign16*)memPtr = value; } +MEM_STATIC void MEM_write32(void* memPtr, U32 value) { *(unalign32*)memPtr = value; } +MEM_STATIC void MEM_write64(void* memPtr, U64 value) { *(unalign64*)memPtr = value; } + +#else + +/* default method, safe and standard. + can sometimes prove slower */ + +MEM_STATIC U16 MEM_read16(const void* memPtr) +{ + U16 val; ZSTD_memcpy(&val, memPtr, sizeof(val)); return val; +} + +MEM_STATIC U32 MEM_read32(const void* memPtr) +{ + U32 val; ZSTD_memcpy(&val, memPtr, sizeof(val)); return val; +} + +MEM_STATIC U64 MEM_read64(const void* memPtr) +{ + U64 val; ZSTD_memcpy(&val, memPtr, sizeof(val)); return val; +} + +MEM_STATIC size_t MEM_readST(const void* memPtr) +{ + size_t val; ZSTD_memcpy(&val, memPtr, sizeof(val)); return val; +} + +MEM_STATIC void MEM_write16(void* memPtr, U16 value) +{ + ZSTD_memcpy(memPtr, &value, sizeof(value)); +} + +MEM_STATIC void MEM_write32(void* memPtr, U32 value) +{ + ZSTD_memcpy(memPtr, &value, sizeof(value)); +} + +MEM_STATIC void MEM_write64(void* memPtr, U64 value) +{ + ZSTD_memcpy(memPtr, &value, sizeof(value)); +} + +#endif /* MEM_FORCE_MEMORY_ACCESS */ + +MEM_STATIC U32 MEM_swap32_fallback(U32 in) +{ + return ((in << 24) & 0xff000000 ) | + ((in << 8) & 0x00ff0000 ) | + ((in >> 8) & 0x0000ff00 ) | + ((in >> 24) & 0x000000ff ); +} + +MEM_STATIC U32 MEM_swap32(U32 in) +{ +#if defined(_MSC_VER) /* Visual Studio */ + return _byteswap_ulong(in); +#elif (defined (__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 403)) \ + || (defined(__clang__) && __has_builtin(__builtin_bswap32)) + return __builtin_bswap32(in); +#else + return MEM_swap32_fallback(in); +#endif +} + +MEM_STATIC U64 MEM_swap64_fallback(U64 in) +{ + return ((in << 56) & 0xff00000000000000ULL) | + ((in << 40) & 0x00ff000000000000ULL) | + ((in << 24) & 0x0000ff0000000000ULL) | + ((in << 8) & 0x000000ff00000000ULL) | + ((in >> 8) & 0x00000000ff000000ULL) | + ((in >> 24) & 0x0000000000ff0000ULL) | + ((in >> 40) & 0x000000000000ff00ULL) | + ((in >> 56) & 0x00000000000000ffULL); +} + +MEM_STATIC U64 MEM_swap64(U64 in) +{ +#if defined(_MSC_VER) /* Visual Studio */ + return _byteswap_uint64(in); +#elif (defined (__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 403)) \ + || (defined(__clang__) && __has_builtin(__builtin_bswap64)) + return __builtin_bswap64(in); +#else + return MEM_swap64_fallback(in); +#endif +} + +MEM_STATIC size_t MEM_swapST(size_t in) +{ + if (MEM_32bits()) + return (size_t)MEM_swap32((U32)in); + else + return (size_t)MEM_swap64((U64)in); +} + +/*=== Little endian r/w ===*/ + +MEM_STATIC U16 MEM_readLE16(const void* memPtr) +{ + if (MEM_isLittleEndian()) + return MEM_read16(memPtr); + else { + const BYTE* p = (const BYTE*)memPtr; + return (U16)(p[0] + (p[1]<<8)); + } +} + +MEM_STATIC void MEM_writeLE16(void* memPtr, U16 val) +{ + if (MEM_isLittleEndian()) { + MEM_write16(memPtr, val); + } else { + BYTE* p = (BYTE*)memPtr; + p[0] = (BYTE)val; + p[1] = (BYTE)(val>>8); + } +} + +MEM_STATIC U32 MEM_readLE24(const void* memPtr) +{ + return (U32)MEM_readLE16(memPtr) + ((U32)(((const BYTE*)memPtr)[2]) << 16); +} + +MEM_STATIC void MEM_writeLE24(void* memPtr, U32 val) +{ + MEM_writeLE16(memPtr, (U16)val); + ((BYTE*)memPtr)[2] = (BYTE)(val>>16); +} + +MEM_STATIC U32 MEM_readLE32(const void* memPtr) +{ + if (MEM_isLittleEndian()) + return MEM_read32(memPtr); + else + return MEM_swap32(MEM_read32(memPtr)); +} + +MEM_STATIC void MEM_writeLE32(void* memPtr, U32 val32) +{ + if (MEM_isLittleEndian()) + MEM_write32(memPtr, val32); + else + MEM_write32(memPtr, MEM_swap32(val32)); +} + +MEM_STATIC U64 MEM_readLE64(const void* memPtr) +{ + if (MEM_isLittleEndian()) + return MEM_read64(memPtr); + else + return MEM_swap64(MEM_read64(memPtr)); +} + +MEM_STATIC void MEM_writeLE64(void* memPtr, U64 val64) +{ + if (MEM_isLittleEndian()) + MEM_write64(memPtr, val64); + else + MEM_write64(memPtr, MEM_swap64(val64)); +} + +MEM_STATIC size_t MEM_readLEST(const void* memPtr) +{ + if (MEM_32bits()) + return (size_t)MEM_readLE32(memPtr); + else + return (size_t)MEM_readLE64(memPtr); +} + +MEM_STATIC void MEM_writeLEST(void* memPtr, size_t val) +{ + if (MEM_32bits()) + MEM_writeLE32(memPtr, (U32)val); + else + MEM_writeLE64(memPtr, (U64)val); +} + +/*=== Big endian r/w ===*/ + +MEM_STATIC U32 MEM_readBE32(const void* memPtr) +{ + if (MEM_isLittleEndian()) + return MEM_swap32(MEM_read32(memPtr)); + else + return MEM_read32(memPtr); +} + +MEM_STATIC void MEM_writeBE32(void* memPtr, U32 val32) +{ + if (MEM_isLittleEndian()) + MEM_write32(memPtr, MEM_swap32(val32)); + else + MEM_write32(memPtr, val32); +} + +MEM_STATIC U64 MEM_readBE64(const void* memPtr) +{ + if (MEM_isLittleEndian()) + return MEM_swap64(MEM_read64(memPtr)); + else + return MEM_read64(memPtr); +} + +MEM_STATIC void MEM_writeBE64(void* memPtr, U64 val64) +{ + if (MEM_isLittleEndian()) + MEM_write64(memPtr, MEM_swap64(val64)); + else + MEM_write64(memPtr, val64); +} + +MEM_STATIC size_t MEM_readBEST(const void* memPtr) +{ + if (MEM_32bits()) + return (size_t)MEM_readBE32(memPtr); + else + return (size_t)MEM_readBE64(memPtr); +} + +MEM_STATIC void MEM_writeBEST(void* memPtr, size_t val) +{ + if (MEM_32bits()) + MEM_writeBE32(memPtr, (U32)val); + else + MEM_writeBE64(memPtr, (U64)val); +} + +/* code only tested on 32 and 64 bits systems */ +MEM_STATIC void MEM_check(void) { DEBUG_STATIC_ASSERT((sizeof(size_t)==4) || (sizeof(size_t)==8)); } + + +#if defined (__cplusplus) +} +#endif + +#endif /* MEM_H_MODULE */ +/**** ended inlining mem.h ****/ +/**** start inlining error_private.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +/* Note : this module is expected to remain private, do not expose it */ + +#ifndef ERROR_H_MODULE +#define ERROR_H_MODULE + +#if defined (__cplusplus) +extern "C" { +#endif + + +/* **************************************** +* Dependencies +******************************************/ +/**** start inlining ../zstd_errors.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +#ifndef ZSTD_ERRORS_H_398273423 +#define ZSTD_ERRORS_H_398273423 + +#if defined (__cplusplus) +extern "C" { +#endif + +/*===== dependency =====*/ +#include /* size_t */ + + +/* ===== ZSTDERRORLIB_API : control library symbols visibility ===== */ +#ifndef ZSTDERRORLIB_VISIBLE + /* Backwards compatibility with old macro name */ +# ifdef ZSTDERRORLIB_VISIBILITY +# define ZSTDERRORLIB_VISIBLE ZSTDERRORLIB_VISIBILITY +# elif defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__MINGW32__) +# define ZSTDERRORLIB_VISIBLE __attribute__ ((visibility ("default"))) +# else +# define ZSTDERRORLIB_VISIBLE +# endif +#endif + +#ifndef ZSTDERRORLIB_HIDDEN +# if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__MINGW32__) +# define ZSTDERRORLIB_HIDDEN __attribute__ ((visibility ("hidden"))) +# else +# define ZSTDERRORLIB_HIDDEN +# endif +#endif + +#if defined(ZSTD_DLL_EXPORT) && (ZSTD_DLL_EXPORT==1) +# define ZSTDERRORLIB_API __declspec(dllexport) ZSTDERRORLIB_VISIBLE +#elif defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1) +# define ZSTDERRORLIB_API __declspec(dllimport) ZSTDERRORLIB_VISIBLE /* It isn't required but allows to generate better code, saving a function pointer load from the IAT and an indirect jump.*/ +#else +# define ZSTDERRORLIB_API ZSTDERRORLIB_VISIBLE +#endif + +/*-********************************************* + * Error codes list + *-********************************************* + * Error codes _values_ are pinned down since v1.3.1 only. + * Therefore, don't rely on values if you may link to any version < v1.3.1. + * + * Only values < 100 are considered stable. + * + * note 1 : this API shall be used with static linking only. + * dynamic linking is not yet officially supported. + * note 2 : Prefer relying on the enum than on its value whenever possible + * This is the only supported way to use the error list < v1.3.1 + * note 3 : ZSTD_isError() is always correct, whatever the library version. + **********************************************/ +typedef enum { + ZSTD_error_no_error = 0, + ZSTD_error_GENERIC = 1, + ZSTD_error_prefix_unknown = 10, + ZSTD_error_version_unsupported = 12, + ZSTD_error_frameParameter_unsupported = 14, + ZSTD_error_frameParameter_windowTooLarge = 16, + ZSTD_error_corruption_detected = 20, + ZSTD_error_checksum_wrong = 22, + ZSTD_error_literals_headerWrong = 24, + ZSTD_error_dictionary_corrupted = 30, + ZSTD_error_dictionary_wrong = 32, + ZSTD_error_dictionaryCreation_failed = 34, + ZSTD_error_parameter_unsupported = 40, + ZSTD_error_parameter_combination_unsupported = 41, + ZSTD_error_parameter_outOfBound = 42, + ZSTD_error_tableLog_tooLarge = 44, + ZSTD_error_maxSymbolValue_tooLarge = 46, + ZSTD_error_maxSymbolValue_tooSmall = 48, + ZSTD_error_stabilityCondition_notRespected = 50, + ZSTD_error_stage_wrong = 60, + ZSTD_error_init_missing = 62, + ZSTD_error_memory_allocation = 64, + ZSTD_error_workSpace_tooSmall= 66, + ZSTD_error_dstSize_tooSmall = 70, + ZSTD_error_srcSize_wrong = 72, + ZSTD_error_dstBuffer_null = 74, + ZSTD_error_noForwardProgress_destFull = 80, + ZSTD_error_noForwardProgress_inputEmpty = 82, + /* following error codes are __NOT STABLE__, they can be removed or changed in future versions */ + ZSTD_error_frameIndex_tooLarge = 100, + ZSTD_error_seekableIO = 102, + ZSTD_error_dstBuffer_wrong = 104, + ZSTD_error_srcBuffer_wrong = 105, + ZSTD_error_sequenceProducer_failed = 106, + ZSTD_error_externalSequences_invalid = 107, + ZSTD_error_maxCode = 120 /* never EVER use this value directly, it can change in future versions! Use ZSTD_isError() instead */ +} ZSTD_ErrorCode; + +/*! ZSTD_getErrorCode() : + convert a `size_t` function result into a `ZSTD_ErrorCode` enum type, + which can be used to compare with enum list published above */ +ZSTDERRORLIB_API ZSTD_ErrorCode ZSTD_getErrorCode(size_t functionResult); +ZSTDERRORLIB_API const char* ZSTD_getErrorString(ZSTD_ErrorCode code); /**< Same as ZSTD_getErrorName, but using a `ZSTD_ErrorCode` enum argument */ + + +#if defined (__cplusplus) +} +#endif + +#endif /* ZSTD_ERRORS_H_398273423 */ +/**** ended inlining ../zstd_errors.h ****/ +/**** skipping file: compiler.h ****/ +/**** skipping file: debug.h ****/ +/**** skipping file: zstd_deps.h ****/ + + +/* **************************************** +* Compiler-specific +******************************************/ +#if defined(__GNUC__) +# define ERR_STATIC static __attribute__((unused)) +#elif defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) +# define ERR_STATIC static inline +#elif defined(_MSC_VER) +# define ERR_STATIC static __inline +#else +# define ERR_STATIC static /* this version may generate warnings for unused static functions; disable the relevant warning */ +#endif + + +/*-**************************************** +* Customization (error_public.h) +******************************************/ +typedef ZSTD_ErrorCode ERR_enum; +#define PREFIX(name) ZSTD_error_##name + + +/*-**************************************** +* Error codes handling +******************************************/ +#undef ERROR /* already defined on Visual Studio */ +#define ERROR(name) ZSTD_ERROR(name) +#define ZSTD_ERROR(name) ((size_t)-PREFIX(name)) + +ERR_STATIC unsigned ERR_isError(size_t code) { return (code > ERROR(maxCode)); } + +ERR_STATIC ERR_enum ERR_getErrorCode(size_t code) { if (!ERR_isError(code)) return (ERR_enum)0; return (ERR_enum) (0-code); } + +/* check and forward error code */ +#define CHECK_V_F(e, f) \ + size_t const e = f; \ + do { \ + if (ERR_isError(e)) \ + return e; \ + } while (0) +#define CHECK_F(f) do { CHECK_V_F(_var_err__, f); } while (0) + + +/*-**************************************** +* Error Strings +******************************************/ + +const char* ERR_getErrorString(ERR_enum code); /* error_private.c */ + +ERR_STATIC const char* ERR_getErrorName(size_t code) +{ + return ERR_getErrorString(ERR_getErrorCode(code)); +} + +/** + * Ignore: this is an internal helper. + * + * This is a helper function to help force C99-correctness during compilation. + * Under strict compilation modes, variadic macro arguments can't be empty. + * However, variadic function arguments can be. Using a function therefore lets + * us statically check that at least one (string) argument was passed, + * independent of the compilation flags. + */ +static INLINE_KEYWORD UNUSED_ATTR +void _force_has_format_string(const char *format, ...) { + (void)format; +} + +/** + * Ignore: this is an internal helper. + * + * We want to force this function invocation to be syntactically correct, but + * we don't want to force runtime evaluation of its arguments. + */ +#define _FORCE_HAS_FORMAT_STRING(...) \ + do { \ + if (0) { \ + _force_has_format_string(__VA_ARGS__); \ + } \ + } while (0) + +#define ERR_QUOTE(str) #str + +/** + * Return the specified error if the condition evaluates to true. + * + * In debug modes, prints additional information. + * In order to do that (particularly, printing the conditional that failed), + * this can't just wrap RETURN_ERROR(). + */ +#define RETURN_ERROR_IF(cond, err, ...) \ + do { \ + if (cond) { \ + RAWLOG(3, "%s:%d: ERROR!: check %s failed, returning %s", \ + __FILE__, __LINE__, ERR_QUOTE(cond), ERR_QUOTE(ERROR(err))); \ + _FORCE_HAS_FORMAT_STRING(__VA_ARGS__); \ + RAWLOG(3, ": " __VA_ARGS__); \ + RAWLOG(3, "\n"); \ + return ERROR(err); \ + } \ + } while (0) + +/** + * Unconditionally return the specified error. + * + * In debug modes, prints additional information. + */ +#define RETURN_ERROR(err, ...) \ + do { \ + RAWLOG(3, "%s:%d: ERROR!: unconditional check failed, returning %s", \ + __FILE__, __LINE__, ERR_QUOTE(ERROR(err))); \ + _FORCE_HAS_FORMAT_STRING(__VA_ARGS__); \ + RAWLOG(3, ": " __VA_ARGS__); \ + RAWLOG(3, "\n"); \ + return ERROR(err); \ + } while(0) + +/** + * If the provided expression evaluates to an error code, returns that error code. + * + * In debug modes, prints additional information. + */ +#define FORWARD_IF_ERROR(err, ...) \ + do { \ + size_t const err_code = (err); \ + if (ERR_isError(err_code)) { \ + RAWLOG(3, "%s:%d: ERROR!: forwarding error in %s: %s", \ + __FILE__, __LINE__, ERR_QUOTE(err), ERR_getErrorName(err_code)); \ + _FORCE_HAS_FORMAT_STRING(__VA_ARGS__); \ + RAWLOG(3, ": " __VA_ARGS__); \ + RAWLOG(3, "\n"); \ + return err_code; \ + } \ + } while(0) + +#if defined (__cplusplus) +} +#endif + +#endif /* ERROR_H_MODULE */ +/**** ended inlining error_private.h ****/ +#define FSE_STATIC_LINKING_ONLY /* FSE_MIN_TABLELOG */ +/**** start inlining fse.h ****/ +/* ****************************************************************** + * FSE : Finite State Entropy codec + * Public Prototypes declaration + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * You can contact the author at : + * - Source repository : https://github.com/Cyan4973/FiniteStateEntropy + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. +****************************************************************** */ + +#if defined (__cplusplus) +extern "C" { +#endif + +#ifndef FSE_H +#define FSE_H + + +/*-***************************************** +* Dependencies +******************************************/ +/**** skipping file: zstd_deps.h ****/ + + +/*-***************************************** +* FSE_PUBLIC_API : control library symbols visibility +******************************************/ +#if defined(FSE_DLL_EXPORT) && (FSE_DLL_EXPORT==1) && defined(__GNUC__) && (__GNUC__ >= 4) +# define FSE_PUBLIC_API __attribute__ ((visibility ("default"))) +#elif defined(FSE_DLL_EXPORT) && (FSE_DLL_EXPORT==1) /* Visual expected */ +# define FSE_PUBLIC_API __declspec(dllexport) +#elif defined(FSE_DLL_IMPORT) && (FSE_DLL_IMPORT==1) +# define FSE_PUBLIC_API __declspec(dllimport) /* It isn't required but allows to generate better code, saving a function pointer load from the IAT and an indirect jump.*/ +#else +# define FSE_PUBLIC_API +#endif + +/*------ Version ------*/ +#define FSE_VERSION_MAJOR 0 +#define FSE_VERSION_MINOR 9 +#define FSE_VERSION_RELEASE 0 + +#define FSE_LIB_VERSION FSE_VERSION_MAJOR.FSE_VERSION_MINOR.FSE_VERSION_RELEASE +#define FSE_QUOTE(str) #str +#define FSE_EXPAND_AND_QUOTE(str) FSE_QUOTE(str) +#define FSE_VERSION_STRING FSE_EXPAND_AND_QUOTE(FSE_LIB_VERSION) + +#define FSE_VERSION_NUMBER (FSE_VERSION_MAJOR *100*100 + FSE_VERSION_MINOR *100 + FSE_VERSION_RELEASE) +FSE_PUBLIC_API unsigned FSE_versionNumber(void); /**< library version number; to be used when checking dll version */ + + +/*-***************************************** +* Tool functions +******************************************/ +FSE_PUBLIC_API size_t FSE_compressBound(size_t size); /* maximum compressed size */ + +/* Error Management */ +FSE_PUBLIC_API unsigned FSE_isError(size_t code); /* tells if a return value is an error code */ +FSE_PUBLIC_API const char* FSE_getErrorName(size_t code); /* provides error code string (useful for debugging) */ + + +/*-***************************************** +* FSE detailed API +******************************************/ +/*! +FSE_compress() does the following: +1. count symbol occurrence from source[] into table count[] (see hist.h) +2. normalize counters so that sum(count[]) == Power_of_2 (2^tableLog) +3. save normalized counters to memory buffer using writeNCount() +4. build encoding table 'CTable' from normalized counters +5. encode the data stream using encoding table 'CTable' + +FSE_decompress() does the following: +1. read normalized counters with readNCount() +2. build decoding table 'DTable' from normalized counters +3. decode the data stream using decoding table 'DTable' + +The following API allows targeting specific sub-functions for advanced tasks. +For example, it's possible to compress several blocks using the same 'CTable', +or to save and provide normalized distribution using external method. +*/ + +/* *** COMPRESSION *** */ + +/*! FSE_optimalTableLog(): + dynamically downsize 'tableLog' when conditions are met. + It saves CPU time, by using smaller tables, while preserving or even improving compression ratio. + @return : recommended tableLog (necessarily <= 'maxTableLog') */ +FSE_PUBLIC_API unsigned FSE_optimalTableLog(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue); + +/*! FSE_normalizeCount(): + normalize counts so that sum(count[]) == Power_of_2 (2^tableLog) + 'normalizedCounter' is a table of short, of minimum size (maxSymbolValue+1). + useLowProbCount is a boolean parameter which trades off compressed size for + faster header decoding. When it is set to 1, the compressed data will be slightly + smaller. And when it is set to 0, FSE_readNCount() and FSE_buildDTable() will be + faster. If you are compressing a small amount of data (< 2 KB) then useLowProbCount=0 + is a good default, since header deserialization makes a big speed difference. + Otherwise, useLowProbCount=1 is a good default, since the speed difference is small. + @return : tableLog, + or an errorCode, which can be tested using FSE_isError() */ +FSE_PUBLIC_API size_t FSE_normalizeCount(short* normalizedCounter, unsigned tableLog, + const unsigned* count, size_t srcSize, unsigned maxSymbolValue, unsigned useLowProbCount); + +/*! FSE_NCountWriteBound(): + Provides the maximum possible size of an FSE normalized table, given 'maxSymbolValue' and 'tableLog'. + Typically useful for allocation purpose. */ +FSE_PUBLIC_API size_t FSE_NCountWriteBound(unsigned maxSymbolValue, unsigned tableLog); + +/*! FSE_writeNCount(): + Compactly save 'normalizedCounter' into 'buffer'. + @return : size of the compressed table, + or an errorCode, which can be tested using FSE_isError(). */ +FSE_PUBLIC_API size_t FSE_writeNCount (void* buffer, size_t bufferSize, + const short* normalizedCounter, + unsigned maxSymbolValue, unsigned tableLog); + +/*! Constructor and Destructor of FSE_CTable. + Note that FSE_CTable size depends on 'tableLog' and 'maxSymbolValue' */ +typedef unsigned FSE_CTable; /* don't allocate that. It's only meant to be more restrictive than void* */ + +/*! FSE_buildCTable(): + Builds `ct`, which must be already allocated, using FSE_createCTable(). + @return : 0, or an errorCode, which can be tested using FSE_isError() */ +FSE_PUBLIC_API size_t FSE_buildCTable(FSE_CTable* ct, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog); + +/*! FSE_compress_usingCTable(): + Compress `src` using `ct` into `dst` which must be already allocated. + @return : size of compressed data (<= `dstCapacity`), + or 0 if compressed data could not fit into `dst`, + or an errorCode, which can be tested using FSE_isError() */ +FSE_PUBLIC_API size_t FSE_compress_usingCTable (void* dst, size_t dstCapacity, const void* src, size_t srcSize, const FSE_CTable* ct); + +/*! +Tutorial : +---------- +The first step is to count all symbols. FSE_count() does this job very fast. +Result will be saved into 'count', a table of unsigned int, which must be already allocated, and have 'maxSymbolValuePtr[0]+1' cells. +'src' is a table of bytes of size 'srcSize'. All values within 'src' MUST be <= maxSymbolValuePtr[0] +maxSymbolValuePtr[0] will be updated, with its real value (necessarily <= original value) +FSE_count() will return the number of occurrence of the most frequent symbol. +This can be used to know if there is a single symbol within 'src', and to quickly evaluate its compressibility. +If there is an error, the function will return an ErrorCode (which can be tested using FSE_isError()). + +The next step is to normalize the frequencies. +FSE_normalizeCount() will ensure that sum of frequencies is == 2 ^'tableLog'. +It also guarantees a minimum of 1 to any Symbol with frequency >= 1. +You can use 'tableLog'==0 to mean "use default tableLog value". +If you are unsure of which tableLog value to use, you can ask FSE_optimalTableLog(), +which will provide the optimal valid tableLog given sourceSize, maxSymbolValue, and a user-defined maximum (0 means "default"). + +The result of FSE_normalizeCount() will be saved into a table, +called 'normalizedCounter', which is a table of signed short. +'normalizedCounter' must be already allocated, and have at least 'maxSymbolValue+1' cells. +The return value is tableLog if everything proceeded as expected. +It is 0 if there is a single symbol within distribution. +If there is an error (ex: invalid tableLog value), the function will return an ErrorCode (which can be tested using FSE_isError()). + +'normalizedCounter' can be saved in a compact manner to a memory area using FSE_writeNCount(). +'buffer' must be already allocated. +For guaranteed success, buffer size must be at least FSE_headerBound(). +The result of the function is the number of bytes written into 'buffer'. +If there is an error, the function will return an ErrorCode (which can be tested using FSE_isError(); ex : buffer size too small). + +'normalizedCounter' can then be used to create the compression table 'CTable'. +The space required by 'CTable' must be already allocated, using FSE_createCTable(). +You can then use FSE_buildCTable() to fill 'CTable'. +If there is an error, both functions will return an ErrorCode (which can be tested using FSE_isError()). + +'CTable' can then be used to compress 'src', with FSE_compress_usingCTable(). +Similar to FSE_count(), the convention is that 'src' is assumed to be a table of char of size 'srcSize' +The function returns the size of compressed data (without header), necessarily <= `dstCapacity`. +If it returns '0', compressed data could not fit into 'dst'. +If there is an error, the function will return an ErrorCode (which can be tested using FSE_isError()). +*/ + + +/* *** DECOMPRESSION *** */ + +/*! FSE_readNCount(): + Read compactly saved 'normalizedCounter' from 'rBuffer'. + @return : size read from 'rBuffer', + or an errorCode, which can be tested using FSE_isError(). + maxSymbolValuePtr[0] and tableLogPtr[0] will also be updated with their respective values */ +FSE_PUBLIC_API size_t FSE_readNCount (short* normalizedCounter, + unsigned* maxSymbolValuePtr, unsigned* tableLogPtr, + const void* rBuffer, size_t rBuffSize); + +/*! FSE_readNCount_bmi2(): + * Same as FSE_readNCount() but pass bmi2=1 when your CPU supports BMI2 and 0 otherwise. + */ +FSE_PUBLIC_API size_t FSE_readNCount_bmi2(short* normalizedCounter, + unsigned* maxSymbolValuePtr, unsigned* tableLogPtr, + const void* rBuffer, size_t rBuffSize, int bmi2); + +typedef unsigned FSE_DTable; /* don't allocate that. It's just a way to be more restrictive than void* */ + +/*! +Tutorial : +---------- +(Note : these functions only decompress FSE-compressed blocks. + If block is uncompressed, use memcpy() instead + If block is a single repeated byte, use memset() instead ) + +The first step is to obtain the normalized frequencies of symbols. +This can be performed by FSE_readNCount() if it was saved using FSE_writeNCount(). +'normalizedCounter' must be already allocated, and have at least 'maxSymbolValuePtr[0]+1' cells of signed short. +In practice, that means it's necessary to know 'maxSymbolValue' beforehand, +or size the table to handle worst case situations (typically 256). +FSE_readNCount() will provide 'tableLog' and 'maxSymbolValue'. +The result of FSE_readNCount() is the number of bytes read from 'rBuffer'. +Note that 'rBufferSize' must be at least 4 bytes, even if useful information is less than that. +If there is an error, the function will return an error code, which can be tested using FSE_isError(). + +The next step is to build the decompression tables 'FSE_DTable' from 'normalizedCounter'. +This is performed by the function FSE_buildDTable(). +The space required by 'FSE_DTable' must be already allocated using FSE_createDTable(). +If there is an error, the function will return an error code, which can be tested using FSE_isError(). + +`FSE_DTable` can then be used to decompress `cSrc`, with FSE_decompress_usingDTable(). +`cSrcSize` must be strictly correct, otherwise decompression will fail. +FSE_decompress_usingDTable() result will tell how many bytes were regenerated (<=`dstCapacity`). +If there is an error, the function will return an error code, which can be tested using FSE_isError(). (ex: dst buffer too small) +*/ + +#endif /* FSE_H */ + + +#if defined(FSE_STATIC_LINKING_ONLY) && !defined(FSE_H_FSE_STATIC_LINKING_ONLY) +#define FSE_H_FSE_STATIC_LINKING_ONLY + +/* *** Dependency *** */ +/**** start inlining bitstream.h ****/ +/* ****************************************************************** + * bitstream + * Part of FSE library + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * You can contact the author at : + * - Source repository : https://github.com/Cyan4973/FiniteStateEntropy + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. +****************************************************************** */ +#ifndef BITSTREAM_H_MODULE +#define BITSTREAM_H_MODULE + +#if defined (__cplusplus) +extern "C" { +#endif +/* +* This API consists of small unitary functions, which must be inlined for best performance. +* Since link-time-optimization is not available for all compilers, +* these functions are defined into a .h to be included. +*/ + +/*-**************************************** +* Dependencies +******************************************/ +/**** skipping file: mem.h ****/ +/**** skipping file: compiler.h ****/ +/**** skipping file: debug.h ****/ +/**** skipping file: error_private.h ****/ +/**** start inlining bits.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +#ifndef ZSTD_BITS_H +#define ZSTD_BITS_H + +/**** skipping file: mem.h ****/ + +MEM_STATIC unsigned ZSTD_countTrailingZeros32_fallback(U32 val) +{ + assert(val != 0); + { + static const U32 DeBruijnBytePos[32] = {0, 1, 28, 2, 29, 14, 24, 3, + 30, 22, 20, 15, 25, 17, 4, 8, + 31, 27, 13, 23, 21, 19, 16, 7, + 26, 12, 18, 6, 11, 5, 10, 9}; + return DeBruijnBytePos[((U32) ((val & -(S32) val) * 0x077CB531U)) >> 27]; + } +} + +MEM_STATIC unsigned ZSTD_countTrailingZeros32(U32 val) +{ + assert(val != 0); +# if defined(_MSC_VER) +# if STATIC_BMI2 == 1 + return (unsigned)_tzcnt_u32(val); +# else + if (val != 0) { + unsigned long r; + _BitScanForward(&r, val); + return (unsigned)r; + } else { + /* Should not reach this code path */ + __assume(0); + } +# endif +# elif defined(__GNUC__) && (__GNUC__ >= 4) + return (unsigned)__builtin_ctz(val); +# else + return ZSTD_countTrailingZeros32_fallback(val); +# endif +} + +MEM_STATIC unsigned ZSTD_countLeadingZeros32_fallback(U32 val) { + assert(val != 0); + { + static const U32 DeBruijnClz[32] = {0, 9, 1, 10, 13, 21, 2, 29, + 11, 14, 16, 18, 22, 25, 3, 30, + 8, 12, 20, 28, 15, 17, 24, 7, + 19, 27, 23, 6, 26, 5, 4, 31}; + val |= val >> 1; + val |= val >> 2; + val |= val >> 4; + val |= val >> 8; + val |= val >> 16; + return 31 - DeBruijnClz[(val * 0x07C4ACDDU) >> 27]; + } +} + +MEM_STATIC unsigned ZSTD_countLeadingZeros32(U32 val) +{ + assert(val != 0); +# if defined(_MSC_VER) +# if STATIC_BMI2 == 1 + return (unsigned)_lzcnt_u32(val); +# else + if (val != 0) { + unsigned long r; + _BitScanReverse(&r, val); + return (unsigned)(31 - r); + } else { + /* Should not reach this code path */ + __assume(0); + } +# endif +# elif defined(__GNUC__) && (__GNUC__ >= 4) + return (unsigned)__builtin_clz(val); +# else + return ZSTD_countLeadingZeros32_fallback(val); +# endif +} + +MEM_STATIC unsigned ZSTD_countTrailingZeros64(U64 val) +{ + assert(val != 0); +# if defined(_MSC_VER) && defined(_WIN64) +# if STATIC_BMI2 == 1 + return (unsigned)_tzcnt_u64(val); +# else + if (val != 0) { + unsigned long r; + _BitScanForward64(&r, val); + return (unsigned)r; + } else { + /* Should not reach this code path */ + __assume(0); + } +# endif +# elif defined(__GNUC__) && (__GNUC__ >= 4) && defined(__LP64__) + return (unsigned)__builtin_ctzll(val); +# else + { + U32 mostSignificantWord = (U32)(val >> 32); + U32 leastSignificantWord = (U32)val; + if (leastSignificantWord == 0) { + return 32 + ZSTD_countTrailingZeros32(mostSignificantWord); + } else { + return ZSTD_countTrailingZeros32(leastSignificantWord); + } + } +# endif +} + +MEM_STATIC unsigned ZSTD_countLeadingZeros64(U64 val) +{ + assert(val != 0); +# if defined(_MSC_VER) && defined(_WIN64) +# if STATIC_BMI2 == 1 + return (unsigned)_lzcnt_u64(val); +# else + if (val != 0) { + unsigned long r; + _BitScanReverse64(&r, val); + return (unsigned)(63 - r); + } else { + /* Should not reach this code path */ + __assume(0); + } +# endif +# elif defined(__GNUC__) && (__GNUC__ >= 4) + return (unsigned)(__builtin_clzll(val)); +# else + { + U32 mostSignificantWord = (U32)(val >> 32); + U32 leastSignificantWord = (U32)val; + if (mostSignificantWord == 0) { + return 32 + ZSTD_countLeadingZeros32(leastSignificantWord); + } else { + return ZSTD_countLeadingZeros32(mostSignificantWord); + } + } +# endif +} + +MEM_STATIC unsigned ZSTD_NbCommonBytes(size_t val) +{ + if (MEM_isLittleEndian()) { + if (MEM_64bits()) { + return ZSTD_countTrailingZeros64((U64)val) >> 3; + } else { + return ZSTD_countTrailingZeros32((U32)val) >> 3; + } + } else { /* Big Endian CPU */ + if (MEM_64bits()) { + return ZSTD_countLeadingZeros64((U64)val) >> 3; + } else { + return ZSTD_countLeadingZeros32((U32)val) >> 3; + } + } +} + +MEM_STATIC unsigned ZSTD_highbit32(U32 val) /* compress, dictBuilder, decodeCorpus */ +{ + assert(val != 0); + return 31 - ZSTD_countLeadingZeros32(val); +} + +/* ZSTD_rotateRight_*(): + * Rotates a bitfield to the right by "count" bits. + * https://en.wikipedia.org/w/index.php?title=Circular_shift&oldid=991635599#Implementing_circular_shifts + */ +MEM_STATIC +U64 ZSTD_rotateRight_U64(U64 const value, U32 count) { + assert(count < 64); + count &= 0x3F; /* for fickle pattern recognition */ + return (value >> count) | (U64)(value << ((0U - count) & 0x3F)); +} + +MEM_STATIC +U32 ZSTD_rotateRight_U32(U32 const value, U32 count) { + assert(count < 32); + count &= 0x1F; /* for fickle pattern recognition */ + return (value >> count) | (U32)(value << ((0U - count) & 0x1F)); +} + +MEM_STATIC +U16 ZSTD_rotateRight_U16(U16 const value, U32 count) { + assert(count < 16); + count &= 0x0F; /* for fickle pattern recognition */ + return (value >> count) | (U16)(value << ((0U - count) & 0x0F)); +} + +#endif /* ZSTD_BITS_H */ +/**** ended inlining bits.h ****/ + + +/*========================================= +* Target specific +=========================================*/ +#ifndef ZSTD_NO_INTRINSICS +# if (defined(__BMI__) || defined(__BMI2__)) && defined(__GNUC__) +# include /* support for bextr (experimental)/bzhi */ +# elif defined(__ICCARM__) +# include +# endif +#endif + +#define STREAM_ACCUMULATOR_MIN_32 25 +#define STREAM_ACCUMULATOR_MIN_64 57 +#define STREAM_ACCUMULATOR_MIN ((U32)(MEM_32bits() ? STREAM_ACCUMULATOR_MIN_32 : STREAM_ACCUMULATOR_MIN_64)) + + +/*-****************************************** +* bitStream encoding API (write forward) +********************************************/ +/* bitStream can mix input from multiple sources. + * A critical property of these streams is that they encode and decode in **reverse** direction. + * So the first bit sequence you add will be the last to be read, like a LIFO stack. + */ +typedef struct { + size_t bitContainer; + unsigned bitPos; + char* startPtr; + char* ptr; + char* endPtr; +} BIT_CStream_t; + +MEM_STATIC size_t BIT_initCStream(BIT_CStream_t* bitC, void* dstBuffer, size_t dstCapacity); +MEM_STATIC void BIT_addBits(BIT_CStream_t* bitC, size_t value, unsigned nbBits); +MEM_STATIC void BIT_flushBits(BIT_CStream_t* bitC); +MEM_STATIC size_t BIT_closeCStream(BIT_CStream_t* bitC); + +/* Start with initCStream, providing the size of buffer to write into. +* bitStream will never write outside of this buffer. +* `dstCapacity` must be >= sizeof(bitD->bitContainer), otherwise @return will be an error code. +* +* bits are first added to a local register. +* Local register is size_t, hence 64-bits on 64-bits systems, or 32-bits on 32-bits systems. +* Writing data into memory is an explicit operation, performed by the flushBits function. +* Hence keep track how many bits are potentially stored into local register to avoid register overflow. +* After a flushBits, a maximum of 7 bits might still be stored into local register. +* +* Avoid storing elements of more than 24 bits if you want compatibility with 32-bits bitstream readers. +* +* Last operation is to close the bitStream. +* The function returns the final size of CStream in bytes. +* If data couldn't fit into `dstBuffer`, it will return a 0 ( == not storable) +*/ + + +/*-******************************************** +* bitStream decoding API (read backward) +**********************************************/ +typedef size_t BitContainerType; +typedef struct { + BitContainerType bitContainer; + unsigned bitsConsumed; + const char* ptr; + const char* start; + const char* limitPtr; +} BIT_DStream_t; + +typedef enum { BIT_DStream_unfinished = 0, /* fully refilled */ + BIT_DStream_endOfBuffer = 1, /* still some bits left in bitstream */ + BIT_DStream_completed = 2, /* bitstream entirely consumed, bit-exact */ + BIT_DStream_overflow = 3 /* user requested more bits than present in bitstream */ + } BIT_DStream_status; /* result of BIT_reloadDStream() */ + +MEM_STATIC size_t BIT_initDStream(BIT_DStream_t* bitD, const void* srcBuffer, size_t srcSize); +MEM_STATIC size_t BIT_readBits(BIT_DStream_t* bitD, unsigned nbBits); +MEM_STATIC BIT_DStream_status BIT_reloadDStream(BIT_DStream_t* bitD); +MEM_STATIC unsigned BIT_endOfDStream(const BIT_DStream_t* bitD); + + +/* Start by invoking BIT_initDStream(). +* A chunk of the bitStream is then stored into a local register. +* Local register size is 64-bits on 64-bits systems, 32-bits on 32-bits systems (BitContainerType). +* You can then retrieve bitFields stored into the local register, **in reverse order**. +* Local register is explicitly reloaded from memory by the BIT_reloadDStream() method. +* A reload guarantee a minimum of ((8*sizeof(bitD->bitContainer))-7) bits when its result is BIT_DStream_unfinished. +* Otherwise, it can be less than that, so proceed accordingly. +* Checking if DStream has reached its end can be performed with BIT_endOfDStream(). +*/ + + +/*-**************************************** +* unsafe API +******************************************/ +MEM_STATIC void BIT_addBitsFast(BIT_CStream_t* bitC, size_t value, unsigned nbBits); +/* faster, but works only if value is "clean", meaning all high bits above nbBits are 0 */ + +MEM_STATIC void BIT_flushBitsFast(BIT_CStream_t* bitC); +/* unsafe version; does not check buffer overflow */ + +MEM_STATIC size_t BIT_readBitsFast(BIT_DStream_t* bitD, unsigned nbBits); +/* faster, but works only if nbBits >= 1 */ + +/*===== Local Constants =====*/ +static const unsigned BIT_mask[] = { + 0, 1, 3, 7, 0xF, 0x1F, + 0x3F, 0x7F, 0xFF, 0x1FF, 0x3FF, 0x7FF, + 0xFFF, 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF, 0x1FFFF, + 0x3FFFF, 0x7FFFF, 0xFFFFF, 0x1FFFFF, 0x3FFFFF, 0x7FFFFF, + 0xFFFFFF, 0x1FFFFFF, 0x3FFFFFF, 0x7FFFFFF, 0xFFFFFFF, 0x1FFFFFFF, + 0x3FFFFFFF, 0x7FFFFFFF}; /* up to 31 bits */ +#define BIT_MASK_SIZE (sizeof(BIT_mask) / sizeof(BIT_mask[0])) + +/*-************************************************************** +* bitStream encoding +****************************************************************/ +/*! BIT_initCStream() : + * `dstCapacity` must be > sizeof(size_t) + * @return : 0 if success, + * otherwise an error code (can be tested using ERR_isError()) */ +MEM_STATIC size_t BIT_initCStream(BIT_CStream_t* bitC, + void* startPtr, size_t dstCapacity) +{ + bitC->bitContainer = 0; + bitC->bitPos = 0; + bitC->startPtr = (char*)startPtr; + bitC->ptr = bitC->startPtr; + bitC->endPtr = bitC->startPtr + dstCapacity - sizeof(bitC->bitContainer); + if (dstCapacity <= sizeof(bitC->bitContainer)) return ERROR(dstSize_tooSmall); + return 0; +} + +FORCE_INLINE_TEMPLATE size_t BIT_getLowerBits(size_t bitContainer, U32 const nbBits) +{ +#if defined(STATIC_BMI2) && STATIC_BMI2 == 1 && !defined(ZSTD_NO_INTRINSICS) + return _bzhi_u64(bitContainer, nbBits); +#else + assert(nbBits < BIT_MASK_SIZE); + return bitContainer & BIT_mask[nbBits]; +#endif +} + +/*! BIT_addBits() : + * can add up to 31 bits into `bitC`. + * Note : does not check for register overflow ! */ +MEM_STATIC void BIT_addBits(BIT_CStream_t* bitC, + size_t value, unsigned nbBits) +{ + DEBUG_STATIC_ASSERT(BIT_MASK_SIZE == 32); + assert(nbBits < BIT_MASK_SIZE); + assert(nbBits + bitC->bitPos < sizeof(bitC->bitContainer) * 8); + bitC->bitContainer |= BIT_getLowerBits(value, nbBits) << bitC->bitPos; + bitC->bitPos += nbBits; +} + +/*! BIT_addBitsFast() : + * works only if `value` is _clean_, + * meaning all high bits above nbBits are 0 */ +MEM_STATIC void BIT_addBitsFast(BIT_CStream_t* bitC, + size_t value, unsigned nbBits) +{ + assert((value>>nbBits) == 0); + assert(nbBits + bitC->bitPos < sizeof(bitC->bitContainer) * 8); + bitC->bitContainer |= value << bitC->bitPos; + bitC->bitPos += nbBits; +} + +/*! BIT_flushBitsFast() : + * assumption : bitContainer has not overflowed + * unsafe version; does not check buffer overflow */ +MEM_STATIC void BIT_flushBitsFast(BIT_CStream_t* bitC) +{ + size_t const nbBytes = bitC->bitPos >> 3; + assert(bitC->bitPos < sizeof(bitC->bitContainer) * 8); + assert(bitC->ptr <= bitC->endPtr); + MEM_writeLEST(bitC->ptr, bitC->bitContainer); + bitC->ptr += nbBytes; + bitC->bitPos &= 7; + bitC->bitContainer >>= nbBytes*8; +} + +/*! BIT_flushBits() : + * assumption : bitContainer has not overflowed + * safe version; check for buffer overflow, and prevents it. + * note : does not signal buffer overflow. + * overflow will be revealed later on using BIT_closeCStream() */ +MEM_STATIC void BIT_flushBits(BIT_CStream_t* bitC) +{ + size_t const nbBytes = bitC->bitPos >> 3; + assert(bitC->bitPos < sizeof(bitC->bitContainer) * 8); + assert(bitC->ptr <= bitC->endPtr); + MEM_writeLEST(bitC->ptr, bitC->bitContainer); + bitC->ptr += nbBytes; + if (bitC->ptr > bitC->endPtr) bitC->ptr = bitC->endPtr; + bitC->bitPos &= 7; + bitC->bitContainer >>= nbBytes*8; +} + +/*! BIT_closeCStream() : + * @return : size of CStream, in bytes, + * or 0 if it could not fit into dstBuffer */ +MEM_STATIC size_t BIT_closeCStream(BIT_CStream_t* bitC) +{ + BIT_addBitsFast(bitC, 1, 1); /* endMark */ + BIT_flushBits(bitC); + if (bitC->ptr >= bitC->endPtr) return 0; /* overflow detected */ + return (bitC->ptr - bitC->startPtr) + (bitC->bitPos > 0); +} + + +/*-******************************************************** +* bitStream decoding +**********************************************************/ +/*! BIT_initDStream() : + * Initialize a BIT_DStream_t. + * `bitD` : a pointer to an already allocated BIT_DStream_t structure. + * `srcSize` must be the *exact* size of the bitStream, in bytes. + * @return : size of stream (== srcSize), or an errorCode if a problem is detected + */ +MEM_STATIC size_t BIT_initDStream(BIT_DStream_t* bitD, const void* srcBuffer, size_t srcSize) +{ + if (srcSize < 1) { ZSTD_memset(bitD, 0, sizeof(*bitD)); return ERROR(srcSize_wrong); } + + bitD->start = (const char*)srcBuffer; + bitD->limitPtr = bitD->start + sizeof(bitD->bitContainer); + + if (srcSize >= sizeof(bitD->bitContainer)) { /* normal case */ + bitD->ptr = (const char*)srcBuffer + srcSize - sizeof(bitD->bitContainer); + bitD->bitContainer = MEM_readLEST(bitD->ptr); + { BYTE const lastByte = ((const BYTE*)srcBuffer)[srcSize-1]; + bitD->bitsConsumed = lastByte ? 8 - ZSTD_highbit32(lastByte) : 0; /* ensures bitsConsumed is always set */ + if (lastByte == 0) return ERROR(GENERIC); /* endMark not present */ } + } else { + bitD->ptr = bitD->start; + bitD->bitContainer = *(const BYTE*)(bitD->start); + switch(srcSize) + { + case 7: bitD->bitContainer += (BitContainerType)(((const BYTE*)(srcBuffer))[6]) << (sizeof(bitD->bitContainer)*8 - 16); + ZSTD_FALLTHROUGH; + + case 6: bitD->bitContainer += (BitContainerType)(((const BYTE*)(srcBuffer))[5]) << (sizeof(bitD->bitContainer)*8 - 24); + ZSTD_FALLTHROUGH; + + case 5: bitD->bitContainer += (BitContainerType)(((const BYTE*)(srcBuffer))[4]) << (sizeof(bitD->bitContainer)*8 - 32); + ZSTD_FALLTHROUGH; + + case 4: bitD->bitContainer += (BitContainerType)(((const BYTE*)(srcBuffer))[3]) << 24; + ZSTD_FALLTHROUGH; + + case 3: bitD->bitContainer += (BitContainerType)(((const BYTE*)(srcBuffer))[2]) << 16; + ZSTD_FALLTHROUGH; + + case 2: bitD->bitContainer += (BitContainerType)(((const BYTE*)(srcBuffer))[1]) << 8; + ZSTD_FALLTHROUGH; + + default: break; + } + { BYTE const lastByte = ((const BYTE*)srcBuffer)[srcSize-1]; + bitD->bitsConsumed = lastByte ? 8 - ZSTD_highbit32(lastByte) : 0; + if (lastByte == 0) return ERROR(corruption_detected); /* endMark not present */ + } + bitD->bitsConsumed += (U32)(sizeof(bitD->bitContainer) - srcSize)*8; + } + + return srcSize; +} + +FORCE_INLINE_TEMPLATE size_t BIT_getUpperBits(BitContainerType bitContainer, U32 const start) +{ + return bitContainer >> start; +} + +FORCE_INLINE_TEMPLATE size_t BIT_getMiddleBits(BitContainerType bitContainer, U32 const start, U32 const nbBits) +{ + U32 const regMask = sizeof(bitContainer)*8 - 1; + /* if start > regMask, bitstream is corrupted, and result is undefined */ + assert(nbBits < BIT_MASK_SIZE); + /* x86 transform & ((1 << nbBits) - 1) to bzhi instruction, it is better + * than accessing memory. When bmi2 instruction is not present, we consider + * such cpus old (pre-Haswell, 2013) and their performance is not of that + * importance. + */ +#if defined(__x86_64__) || defined(_M_X86) + return (bitContainer >> (start & regMask)) & ((((U64)1) << nbBits) - 1); +#else + return (bitContainer >> (start & regMask)) & BIT_mask[nbBits]; +#endif +} + +/*! BIT_lookBits() : + * Provides next n bits from local register. + * local register is not modified. + * On 32-bits, maxNbBits==24. + * On 64-bits, maxNbBits==56. + * @return : value extracted */ +FORCE_INLINE_TEMPLATE size_t BIT_lookBits(const BIT_DStream_t* bitD, U32 nbBits) +{ + /* arbitrate between double-shift and shift+mask */ +#if 1 + /* if bitD->bitsConsumed + nbBits > sizeof(bitD->bitContainer)*8, + * bitstream is likely corrupted, and result is undefined */ + return BIT_getMiddleBits(bitD->bitContainer, (sizeof(bitD->bitContainer)*8) - bitD->bitsConsumed - nbBits, nbBits); +#else + /* this code path is slower on my os-x laptop */ + U32 const regMask = sizeof(bitD->bitContainer)*8 - 1; + return ((bitD->bitContainer << (bitD->bitsConsumed & regMask)) >> 1) >> ((regMask-nbBits) & regMask); +#endif +} + +/*! BIT_lookBitsFast() : + * unsafe version; only works if nbBits >= 1 */ +MEM_STATIC size_t BIT_lookBitsFast(const BIT_DStream_t* bitD, U32 nbBits) +{ + U32 const regMask = sizeof(bitD->bitContainer)*8 - 1; + assert(nbBits >= 1); + return (bitD->bitContainer << (bitD->bitsConsumed & regMask)) >> (((regMask+1)-nbBits) & regMask); +} + +FORCE_INLINE_TEMPLATE void BIT_skipBits(BIT_DStream_t* bitD, U32 nbBits) +{ + bitD->bitsConsumed += nbBits; +} + +/*! BIT_readBits() : + * Read (consume) next n bits from local register and update. + * Pay attention to not read more than nbBits contained into local register. + * @return : extracted value. */ +FORCE_INLINE_TEMPLATE size_t BIT_readBits(BIT_DStream_t* bitD, unsigned nbBits) +{ + size_t const value = BIT_lookBits(bitD, nbBits); + BIT_skipBits(bitD, nbBits); + return value; +} + +/*! BIT_readBitsFast() : + * unsafe version; only works if nbBits >= 1 */ +MEM_STATIC size_t BIT_readBitsFast(BIT_DStream_t* bitD, unsigned nbBits) +{ + size_t const value = BIT_lookBitsFast(bitD, nbBits); + assert(nbBits >= 1); + BIT_skipBits(bitD, nbBits); + return value; +} + +/*! BIT_reloadDStream_internal() : + * Simple variant of BIT_reloadDStream(), with two conditions: + * 1. bitstream is valid : bitsConsumed <= sizeof(bitD->bitContainer)*8 + * 2. look window is valid after shifted down : bitD->ptr >= bitD->start + */ +MEM_STATIC BIT_DStream_status BIT_reloadDStream_internal(BIT_DStream_t* bitD) +{ + assert(bitD->bitsConsumed <= sizeof(bitD->bitContainer)*8); + bitD->ptr -= bitD->bitsConsumed >> 3; + assert(bitD->ptr >= bitD->start); + bitD->bitsConsumed &= 7; + bitD->bitContainer = MEM_readLEST(bitD->ptr); + return BIT_DStream_unfinished; +} + +/*! BIT_reloadDStreamFast() : + * Similar to BIT_reloadDStream(), but with two differences: + * 1. bitsConsumed <= sizeof(bitD->bitContainer)*8 must hold! + * 2. Returns BIT_DStream_overflow when bitD->ptr < bitD->limitPtr, at this + * point you must use BIT_reloadDStream() to reload. + */ +MEM_STATIC BIT_DStream_status BIT_reloadDStreamFast(BIT_DStream_t* bitD) +{ + if (UNLIKELY(bitD->ptr < bitD->limitPtr)) + return BIT_DStream_overflow; + return BIT_reloadDStream_internal(bitD); +} + +/*! BIT_reloadDStream() : + * Refill `bitD` from buffer previously set in BIT_initDStream() . + * This function is safe, it guarantees it will not never beyond src buffer. + * @return : status of `BIT_DStream_t` internal register. + * when status == BIT_DStream_unfinished, internal register is filled with at least 25 or 57 bits */ +FORCE_INLINE_TEMPLATE BIT_DStream_status BIT_reloadDStream(BIT_DStream_t* bitD) +{ + /* note : once in overflow mode, a bitstream remains in this mode until it's reset */ + if (UNLIKELY(bitD->bitsConsumed > (sizeof(bitD->bitContainer)*8))) { + static const BitContainerType zeroFilled = 0; + bitD->ptr = (const char*)&zeroFilled; /* aliasing is allowed for char */ + /* overflow detected, erroneous scenario or end of stream: no update */ + return BIT_DStream_overflow; + } + + assert(bitD->ptr >= bitD->start); + + if (bitD->ptr >= bitD->limitPtr) { + return BIT_reloadDStream_internal(bitD); + } + if (bitD->ptr == bitD->start) { + /* reached end of bitStream => no update */ + if (bitD->bitsConsumed < sizeof(bitD->bitContainer)*8) return BIT_DStream_endOfBuffer; + return BIT_DStream_completed; + } + /* start < ptr < limitPtr => cautious update */ + { U32 nbBytes = bitD->bitsConsumed >> 3; + BIT_DStream_status result = BIT_DStream_unfinished; + if (bitD->ptr - nbBytes < bitD->start) { + nbBytes = (U32)(bitD->ptr - bitD->start); /* ptr > start */ + result = BIT_DStream_endOfBuffer; + } + bitD->ptr -= nbBytes; + bitD->bitsConsumed -= nbBytes*8; + bitD->bitContainer = MEM_readLEST(bitD->ptr); /* reminder : srcSize > sizeof(bitD->bitContainer), otherwise bitD->ptr == bitD->start */ + return result; + } +} + +/*! BIT_endOfDStream() : + * @return : 1 if DStream has _exactly_ reached its end (all bits consumed). + */ +MEM_STATIC unsigned BIT_endOfDStream(const BIT_DStream_t* DStream) +{ + return ((DStream->ptr == DStream->start) && (DStream->bitsConsumed == sizeof(DStream->bitContainer)*8)); +} + +#if defined (__cplusplus) +} +#endif + +#endif /* BITSTREAM_H_MODULE */ +/**** ended inlining bitstream.h ****/ + + +/* ***************************************** +* Static allocation +*******************************************/ +/* FSE buffer bounds */ +#define FSE_NCOUNTBOUND 512 +#define FSE_BLOCKBOUND(size) ((size) + ((size)>>7) + 4 /* fse states */ + sizeof(size_t) /* bitContainer */) +#define FSE_COMPRESSBOUND(size) (FSE_NCOUNTBOUND + FSE_BLOCKBOUND(size)) /* Macro version, useful for static allocation */ + +/* It is possible to statically allocate FSE CTable/DTable as a table of FSE_CTable/FSE_DTable using below macros */ +#define FSE_CTABLE_SIZE_U32(maxTableLog, maxSymbolValue) (1 + (1<<((maxTableLog)-1)) + (((maxSymbolValue)+1)*2)) +#define FSE_DTABLE_SIZE_U32(maxTableLog) (1 + (1<<(maxTableLog))) + +/* or use the size to malloc() space directly. Pay attention to alignment restrictions though */ +#define FSE_CTABLE_SIZE(maxTableLog, maxSymbolValue) (FSE_CTABLE_SIZE_U32(maxTableLog, maxSymbolValue) * sizeof(FSE_CTable)) +#define FSE_DTABLE_SIZE(maxTableLog) (FSE_DTABLE_SIZE_U32(maxTableLog) * sizeof(FSE_DTable)) + + +/* ***************************************** + * FSE advanced API + ***************************************** */ + +unsigned FSE_optimalTableLog_internal(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue, unsigned minus); +/**< same as FSE_optimalTableLog(), which used `minus==2` */ + +size_t FSE_buildCTable_rle (FSE_CTable* ct, unsigned char symbolValue); +/**< build a fake FSE_CTable, designed to compress always the same symbolValue */ + +/* FSE_buildCTable_wksp() : + * Same as FSE_buildCTable(), but using an externally allocated scratch buffer (`workSpace`). + * `wkspSize` must be >= `FSE_BUILD_CTABLE_WORKSPACE_SIZE_U32(maxSymbolValue, tableLog)` of `unsigned`. + * See FSE_buildCTable_wksp() for breakdown of workspace usage. + */ +#define FSE_BUILD_CTABLE_WORKSPACE_SIZE_U32(maxSymbolValue, tableLog) (((maxSymbolValue + 2) + (1ull << (tableLog)))/2 + sizeof(U64)/sizeof(U32) /* additional 8 bytes for potential table overwrite */) +#define FSE_BUILD_CTABLE_WORKSPACE_SIZE(maxSymbolValue, tableLog) (sizeof(unsigned) * FSE_BUILD_CTABLE_WORKSPACE_SIZE_U32(maxSymbolValue, tableLog)) +size_t FSE_buildCTable_wksp(FSE_CTable* ct, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog, void* workSpace, size_t wkspSize); + +#define FSE_BUILD_DTABLE_WKSP_SIZE(maxTableLog, maxSymbolValue) (sizeof(short) * (maxSymbolValue + 1) + (1ULL << maxTableLog) + 8) +#define FSE_BUILD_DTABLE_WKSP_SIZE_U32(maxTableLog, maxSymbolValue) ((FSE_BUILD_DTABLE_WKSP_SIZE(maxTableLog, maxSymbolValue) + sizeof(unsigned) - 1) / sizeof(unsigned)) +FSE_PUBLIC_API size_t FSE_buildDTable_wksp(FSE_DTable* dt, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog, void* workSpace, size_t wkspSize); +/**< Same as FSE_buildDTable(), using an externally allocated `workspace` produced with `FSE_BUILD_DTABLE_WKSP_SIZE_U32(maxSymbolValue)` */ + +#define FSE_DECOMPRESS_WKSP_SIZE_U32(maxTableLog, maxSymbolValue) (FSE_DTABLE_SIZE_U32(maxTableLog) + 1 + FSE_BUILD_DTABLE_WKSP_SIZE_U32(maxTableLog, maxSymbolValue) + (FSE_MAX_SYMBOL_VALUE + 1) / 2 + 1) +#define FSE_DECOMPRESS_WKSP_SIZE(maxTableLog, maxSymbolValue) (FSE_DECOMPRESS_WKSP_SIZE_U32(maxTableLog, maxSymbolValue) * sizeof(unsigned)) +size_t FSE_decompress_wksp_bmi2(void* dst, size_t dstCapacity, const void* cSrc, size_t cSrcSize, unsigned maxLog, void* workSpace, size_t wkspSize, int bmi2); +/**< same as FSE_decompress(), using an externally allocated `workSpace` produced with `FSE_DECOMPRESS_WKSP_SIZE_U32(maxLog, maxSymbolValue)`. + * Set bmi2 to 1 if your CPU supports BMI2 or 0 if it doesn't */ + +typedef enum { + FSE_repeat_none, /**< Cannot use the previous table */ + FSE_repeat_check, /**< Can use the previous table but it must be checked */ + FSE_repeat_valid /**< Can use the previous table and it is assumed to be valid */ + } FSE_repeat; + +/* ***************************************** +* FSE symbol compression API +*******************************************/ +/*! + This API consists of small unitary functions, which highly benefit from being inlined. + Hence their body are included in next section. +*/ +typedef struct { + ptrdiff_t value; + const void* stateTable; + const void* symbolTT; + unsigned stateLog; +} FSE_CState_t; + +static void FSE_initCState(FSE_CState_t* CStatePtr, const FSE_CTable* ct); + +static void FSE_encodeSymbol(BIT_CStream_t* bitC, FSE_CState_t* CStatePtr, unsigned symbol); + +static void FSE_flushCState(BIT_CStream_t* bitC, const FSE_CState_t* CStatePtr); + +/**< +These functions are inner components of FSE_compress_usingCTable(). +They allow the creation of custom streams, mixing multiple tables and bit sources. + +A key property to keep in mind is that encoding and decoding are done **in reverse direction**. +So the first symbol you will encode is the last you will decode, like a LIFO stack. + +You will need a few variables to track your CStream. They are : + +FSE_CTable ct; // Provided by FSE_buildCTable() +BIT_CStream_t bitStream; // bitStream tracking structure +FSE_CState_t state; // State tracking structure (can have several) + + +The first thing to do is to init bitStream and state. + size_t errorCode = BIT_initCStream(&bitStream, dstBuffer, maxDstSize); + FSE_initCState(&state, ct); + +Note that BIT_initCStream() can produce an error code, so its result should be tested, using FSE_isError(); +You can then encode your input data, byte after byte. +FSE_encodeSymbol() outputs a maximum of 'tableLog' bits at a time. +Remember decoding will be done in reverse direction. + FSE_encodeByte(&bitStream, &state, symbol); + +At any time, you can also add any bit sequence. +Note : maximum allowed nbBits is 25, for compatibility with 32-bits decoders + BIT_addBits(&bitStream, bitField, nbBits); + +The above methods don't commit data to memory, they just store it into local register, for speed. +Local register size is 64-bits on 64-bits systems, 32-bits on 32-bits systems (size_t). +Writing data to memory is a manual operation, performed by the flushBits function. + BIT_flushBits(&bitStream); + +Your last FSE encoding operation shall be to flush your last state value(s). + FSE_flushState(&bitStream, &state); + +Finally, you must close the bitStream. +The function returns the size of CStream in bytes. +If data couldn't fit into dstBuffer, it will return a 0 ( == not compressible) +If there is an error, it returns an errorCode (which can be tested using FSE_isError()). + size_t size = BIT_closeCStream(&bitStream); +*/ + + +/* ***************************************** +* FSE symbol decompression API +*******************************************/ +typedef struct { + size_t state; + const void* table; /* precise table may vary, depending on U16 */ +} FSE_DState_t; + + +static void FSE_initDState(FSE_DState_t* DStatePtr, BIT_DStream_t* bitD, const FSE_DTable* dt); + +static unsigned char FSE_decodeSymbol(FSE_DState_t* DStatePtr, BIT_DStream_t* bitD); + +static unsigned FSE_endOfDState(const FSE_DState_t* DStatePtr); + +/**< +Let's now decompose FSE_decompress_usingDTable() into its unitary components. +You will decode FSE-encoded symbols from the bitStream, +and also any other bitFields you put in, **in reverse order**. + +You will need a few variables to track your bitStream. They are : + +BIT_DStream_t DStream; // Stream context +FSE_DState_t DState; // State context. Multiple ones are possible +FSE_DTable* DTablePtr; // Decoding table, provided by FSE_buildDTable() + +The first thing to do is to init the bitStream. + errorCode = BIT_initDStream(&DStream, srcBuffer, srcSize); + +You should then retrieve your initial state(s) +(in reverse flushing order if you have several ones) : + errorCode = FSE_initDState(&DState, &DStream, DTablePtr); + +You can then decode your data, symbol after symbol. +For information the maximum number of bits read by FSE_decodeSymbol() is 'tableLog'. +Keep in mind that symbols are decoded in reverse order, like a LIFO stack (last in, first out). + unsigned char symbol = FSE_decodeSymbol(&DState, &DStream); + +You can retrieve any bitfield you eventually stored into the bitStream (in reverse order) +Note : maximum allowed nbBits is 25, for 32-bits compatibility + size_t bitField = BIT_readBits(&DStream, nbBits); + +All above operations only read from local register (which size depends on size_t). +Refueling the register from memory is manually performed by the reload method. + endSignal = FSE_reloadDStream(&DStream); + +BIT_reloadDStream() result tells if there is still some more data to read from DStream. +BIT_DStream_unfinished : there is still some data left into the DStream. +BIT_DStream_endOfBuffer : Dstream reached end of buffer. Its container may no longer be completely filled. +BIT_DStream_completed : Dstream reached its exact end, corresponding in general to decompression completed. +BIT_DStream_tooFar : Dstream went too far. Decompression result is corrupted. + +When reaching end of buffer (BIT_DStream_endOfBuffer), progress slowly, notably if you decode multiple symbols per loop, +to properly detect the exact end of stream. +After each decoded symbol, check if DStream is fully consumed using this simple test : + BIT_reloadDStream(&DStream) >= BIT_DStream_completed + +When it's done, verify decompression is fully completed, by checking both DStream and the relevant states. +Checking if DStream has reached its end is performed by : + BIT_endOfDStream(&DStream); +Check also the states. There might be some symbols left there, if some high probability ones (>50%) are possible. + FSE_endOfDState(&DState); +*/ + + +/* ***************************************** +* FSE unsafe API +*******************************************/ +static unsigned char FSE_decodeSymbolFast(FSE_DState_t* DStatePtr, BIT_DStream_t* bitD); +/* faster, but works only if nbBits is always >= 1 (otherwise, result will be corrupted) */ + + +/* ***************************************** +* Implementation of inlined functions +*******************************************/ +typedef struct { + int deltaFindState; + U32 deltaNbBits; +} FSE_symbolCompressionTransform; /* total 8 bytes */ + +MEM_STATIC void FSE_initCState(FSE_CState_t* statePtr, const FSE_CTable* ct) +{ + const void* ptr = ct; + const U16* u16ptr = (const U16*) ptr; + const U32 tableLog = MEM_read16(ptr); + statePtr->value = (ptrdiff_t)1<stateTable = u16ptr+2; + statePtr->symbolTT = ct + 1 + (tableLog ? (1<<(tableLog-1)) : 1); + statePtr->stateLog = tableLog; +} + + +/*! FSE_initCState2() : +* Same as FSE_initCState(), but the first symbol to include (which will be the last to be read) +* uses the smallest state value possible, saving the cost of this symbol */ +MEM_STATIC void FSE_initCState2(FSE_CState_t* statePtr, const FSE_CTable* ct, U32 symbol) +{ + FSE_initCState(statePtr, ct); + { const FSE_symbolCompressionTransform symbolTT = ((const FSE_symbolCompressionTransform*)(statePtr->symbolTT))[symbol]; + const U16* stateTable = (const U16*)(statePtr->stateTable); + U32 nbBitsOut = (U32)((symbolTT.deltaNbBits + (1<<15)) >> 16); + statePtr->value = (nbBitsOut << 16) - symbolTT.deltaNbBits; + statePtr->value = stateTable[(statePtr->value >> nbBitsOut) + symbolTT.deltaFindState]; + } +} + +MEM_STATIC void FSE_encodeSymbol(BIT_CStream_t* bitC, FSE_CState_t* statePtr, unsigned symbol) +{ + FSE_symbolCompressionTransform const symbolTT = ((const FSE_symbolCompressionTransform*)(statePtr->symbolTT))[symbol]; + const U16* const stateTable = (const U16*)(statePtr->stateTable); + U32 const nbBitsOut = (U32)((statePtr->value + symbolTT.deltaNbBits) >> 16); + BIT_addBits(bitC, (size_t)statePtr->value, nbBitsOut); + statePtr->value = stateTable[ (statePtr->value >> nbBitsOut) + symbolTT.deltaFindState]; +} + +MEM_STATIC void FSE_flushCState(BIT_CStream_t* bitC, const FSE_CState_t* statePtr) +{ + BIT_addBits(bitC, (size_t)statePtr->value, statePtr->stateLog); + BIT_flushBits(bitC); +} + + +/* FSE_getMaxNbBits() : + * Approximate maximum cost of a symbol, in bits. + * Fractional get rounded up (i.e. a symbol with a normalized frequency of 3 gives the same result as a frequency of 2) + * note 1 : assume symbolValue is valid (<= maxSymbolValue) + * note 2 : if freq[symbolValue]==0, @return a fake cost of tableLog+1 bits */ +MEM_STATIC U32 FSE_getMaxNbBits(const void* symbolTTPtr, U32 symbolValue) +{ + const FSE_symbolCompressionTransform* symbolTT = (const FSE_symbolCompressionTransform*) symbolTTPtr; + return (symbolTT[symbolValue].deltaNbBits + ((1<<16)-1)) >> 16; +} + +/* FSE_bitCost() : + * Approximate symbol cost, as fractional value, using fixed-point format (accuracyLog fractional bits) + * note 1 : assume symbolValue is valid (<= maxSymbolValue) + * note 2 : if freq[symbolValue]==0, @return a fake cost of tableLog+1 bits */ +MEM_STATIC U32 FSE_bitCost(const void* symbolTTPtr, U32 tableLog, U32 symbolValue, U32 accuracyLog) +{ + const FSE_symbolCompressionTransform* symbolTT = (const FSE_symbolCompressionTransform*) symbolTTPtr; + U32 const minNbBits = symbolTT[symbolValue].deltaNbBits >> 16; + U32 const threshold = (minNbBits+1) << 16; + assert(tableLog < 16); + assert(accuracyLog < 31-tableLog); /* ensure enough room for renormalization double shift */ + { U32 const tableSize = 1 << tableLog; + U32 const deltaFromThreshold = threshold - (symbolTT[symbolValue].deltaNbBits + tableSize); + U32 const normalizedDeltaFromThreshold = (deltaFromThreshold << accuracyLog) >> tableLog; /* linear interpolation (very approximate) */ + U32 const bitMultiplier = 1 << accuracyLog; + assert(symbolTT[symbolValue].deltaNbBits + tableSize <= threshold); + assert(normalizedDeltaFromThreshold <= bitMultiplier); + return (minNbBits+1)*bitMultiplier - normalizedDeltaFromThreshold; + } +} + + +/* ====== Decompression ====== */ + +typedef struct { + U16 tableLog; + U16 fastMode; +} FSE_DTableHeader; /* sizeof U32 */ + +typedef struct +{ + unsigned short newState; + unsigned char symbol; + unsigned char nbBits; +} FSE_decode_t; /* size == U32 */ + +MEM_STATIC void FSE_initDState(FSE_DState_t* DStatePtr, BIT_DStream_t* bitD, const FSE_DTable* dt) +{ + const void* ptr = dt; + const FSE_DTableHeader* const DTableH = (const FSE_DTableHeader*)ptr; + DStatePtr->state = BIT_readBits(bitD, DTableH->tableLog); + BIT_reloadDStream(bitD); + DStatePtr->table = dt + 1; +} + +MEM_STATIC BYTE FSE_peekSymbol(const FSE_DState_t* DStatePtr) +{ + FSE_decode_t const DInfo = ((const FSE_decode_t*)(DStatePtr->table))[DStatePtr->state]; + return DInfo.symbol; +} + +MEM_STATIC void FSE_updateState(FSE_DState_t* DStatePtr, BIT_DStream_t* bitD) +{ + FSE_decode_t const DInfo = ((const FSE_decode_t*)(DStatePtr->table))[DStatePtr->state]; + U32 const nbBits = DInfo.nbBits; + size_t const lowBits = BIT_readBits(bitD, nbBits); + DStatePtr->state = DInfo.newState + lowBits; +} + +MEM_STATIC BYTE FSE_decodeSymbol(FSE_DState_t* DStatePtr, BIT_DStream_t* bitD) +{ + FSE_decode_t const DInfo = ((const FSE_decode_t*)(DStatePtr->table))[DStatePtr->state]; + U32 const nbBits = DInfo.nbBits; + BYTE const symbol = DInfo.symbol; + size_t const lowBits = BIT_readBits(bitD, nbBits); + + DStatePtr->state = DInfo.newState + lowBits; + return symbol; +} + +/*! FSE_decodeSymbolFast() : + unsafe, only works if no symbol has a probability > 50% */ +MEM_STATIC BYTE FSE_decodeSymbolFast(FSE_DState_t* DStatePtr, BIT_DStream_t* bitD) +{ + FSE_decode_t const DInfo = ((const FSE_decode_t*)(DStatePtr->table))[DStatePtr->state]; + U32 const nbBits = DInfo.nbBits; + BYTE const symbol = DInfo.symbol; + size_t const lowBits = BIT_readBitsFast(bitD, nbBits); + + DStatePtr->state = DInfo.newState + lowBits; + return symbol; +} + +MEM_STATIC unsigned FSE_endOfDState(const FSE_DState_t* DStatePtr) +{ + return DStatePtr->state == 0; +} + + + +#ifndef FSE_COMMONDEFS_ONLY + +/* ************************************************************** +* Tuning parameters +****************************************************************/ +/*!MEMORY_USAGE : +* Memory usage formula : N->2^N Bytes (examples : 10 -> 1KB; 12 -> 4KB ; 16 -> 64KB; 20 -> 1MB; etc.) +* Increasing memory usage improves compression ratio +* Reduced memory usage can improve speed, due to cache effect +* Recommended max value is 14, for 16KB, which nicely fits into Intel x86 L1 cache */ +#ifndef FSE_MAX_MEMORY_USAGE +# define FSE_MAX_MEMORY_USAGE 14 +#endif +#ifndef FSE_DEFAULT_MEMORY_USAGE +# define FSE_DEFAULT_MEMORY_USAGE 13 +#endif +#if (FSE_DEFAULT_MEMORY_USAGE > FSE_MAX_MEMORY_USAGE) +# error "FSE_DEFAULT_MEMORY_USAGE must be <= FSE_MAX_MEMORY_USAGE" +#endif + +/*!FSE_MAX_SYMBOL_VALUE : +* Maximum symbol value authorized. +* Required for proper stack allocation */ +#ifndef FSE_MAX_SYMBOL_VALUE +# define FSE_MAX_SYMBOL_VALUE 255 +#endif + +/* ************************************************************** +* template functions type & suffix +****************************************************************/ +#define FSE_FUNCTION_TYPE BYTE +#define FSE_FUNCTION_EXTENSION +#define FSE_DECODE_TYPE FSE_decode_t + + +#endif /* !FSE_COMMONDEFS_ONLY */ + + +/* *************************************************************** +* Constants +*****************************************************************/ +#define FSE_MAX_TABLELOG (FSE_MAX_MEMORY_USAGE-2) +#define FSE_MAX_TABLESIZE (1U< FSE_TABLELOG_ABSOLUTE_MAX +# error "FSE_MAX_TABLELOG > FSE_TABLELOG_ABSOLUTE_MAX is not supported" +#endif + +#define FSE_TABLESTEP(tableSize) (((tableSize)>>1) + ((tableSize)>>3) + 3) + + +#endif /* FSE_STATIC_LINKING_ONLY */ + + +#if defined (__cplusplus) +} +#endif +/**** ended inlining fse.h ****/ +/**** start inlining huf.h ****/ +/* ****************************************************************** + * huff0 huffman codec, + * part of Finite State Entropy library + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * You can contact the author at : + * - Source repository : https://github.com/Cyan4973/FiniteStateEntropy + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. +****************************************************************** */ + +#if defined (__cplusplus) +extern "C" { +#endif + +#ifndef HUF_H_298734234 +#define HUF_H_298734234 + +/* *** Dependencies *** */ +/**** skipping file: zstd_deps.h ****/ +/**** skipping file: mem.h ****/ +#define FSE_STATIC_LINKING_ONLY +/**** skipping file: fse.h ****/ + + +/* *** Tool functions *** */ +#define HUF_BLOCKSIZE_MAX (128 * 1024) /**< maximum input size for a single block compressed with HUF_compress */ +size_t HUF_compressBound(size_t size); /**< maximum compressed size (worst case) */ + +/* Error Management */ +unsigned HUF_isError(size_t code); /**< tells if a return value is an error code */ +const char* HUF_getErrorName(size_t code); /**< provides error code string (useful for debugging) */ + + +#define HUF_WORKSPACE_SIZE ((8 << 10) + 512 /* sorting scratch space */) +#define HUF_WORKSPACE_SIZE_U64 (HUF_WORKSPACE_SIZE / sizeof(U64)) + +/* *** Constants *** */ +#define HUF_TABLELOG_MAX 12 /* max runtime value of tableLog (due to static allocation); can be modified up to HUF_TABLELOG_ABSOLUTEMAX */ +#define HUF_TABLELOG_DEFAULT 11 /* default tableLog value when none specified */ +#define HUF_SYMBOLVALUE_MAX 255 + +#define HUF_TABLELOG_ABSOLUTEMAX 12 /* absolute limit of HUF_MAX_TABLELOG. Beyond that value, code does not work */ +#if (HUF_TABLELOG_MAX > HUF_TABLELOG_ABSOLUTEMAX) +# error "HUF_TABLELOG_MAX is too large !" +#endif + + +/* **************************************** +* Static allocation +******************************************/ +/* HUF buffer bounds */ +#define HUF_CTABLEBOUND 129 +#define HUF_BLOCKBOUND(size) (size + (size>>8) + 8) /* only true when incompressible is pre-filtered with fast heuristic */ +#define HUF_COMPRESSBOUND(size) (HUF_CTABLEBOUND + HUF_BLOCKBOUND(size)) /* Macro version, useful for static allocation */ + +/* static allocation of HUF's Compression Table */ +/* this is a private definition, just exposed for allocation and strict aliasing purpose. never EVER access its members directly */ +typedef size_t HUF_CElt; /* consider it an incomplete type */ +#define HUF_CTABLE_SIZE_ST(maxSymbolValue) ((maxSymbolValue)+2) /* Use tables of size_t, for proper alignment */ +#define HUF_CTABLE_SIZE(maxSymbolValue) (HUF_CTABLE_SIZE_ST(maxSymbolValue) * sizeof(size_t)) +#define HUF_CREATE_STATIC_CTABLE(name, maxSymbolValue) \ + HUF_CElt name[HUF_CTABLE_SIZE_ST(maxSymbolValue)] /* no final ; */ + +/* static allocation of HUF's DTable */ +typedef U32 HUF_DTable; +#define HUF_DTABLE_SIZE(maxTableLog) (1 + (1<<(maxTableLog))) +#define HUF_CREATE_STATIC_DTABLEX1(DTable, maxTableLog) \ + HUF_DTable DTable[HUF_DTABLE_SIZE((maxTableLog)-1)] = { ((U32)((maxTableLog)-1) * 0x01000001) } +#define HUF_CREATE_STATIC_DTABLEX2(DTable, maxTableLog) \ + HUF_DTable DTable[HUF_DTABLE_SIZE(maxTableLog)] = { ((U32)(maxTableLog) * 0x01000001) } + + +/* **************************************** +* Advanced decompression functions +******************************************/ + +/** + * Huffman flags bitset. + * For all flags, 0 is the default value. + */ +typedef enum { + /** + * If compiled with DYNAMIC_BMI2: Set flag only if the CPU supports BMI2 at runtime. + * Otherwise: Ignored. + */ + HUF_flags_bmi2 = (1 << 0), + /** + * If set: Test possible table depths to find the one that produces the smallest header + encoded size. + * If unset: Use heuristic to find the table depth. + */ + HUF_flags_optimalDepth = (1 << 1), + /** + * If set: If the previous table can encode the input, always reuse the previous table. + * If unset: If the previous table can encode the input, reuse the previous table if it results in a smaller output. + */ + HUF_flags_preferRepeat = (1 << 2), + /** + * If set: Sample the input and check if the sample is uncompressible, if it is then don't attempt to compress. + * If unset: Always histogram the entire input. + */ + HUF_flags_suspectUncompressible = (1 << 3), + /** + * If set: Don't use assembly implementations + * If unset: Allow using assembly implementations + */ + HUF_flags_disableAsm = (1 << 4), + /** + * If set: Don't use the fast decoding loop, always use the fallback decoding loop. + * If unset: Use the fast decoding loop when possible. + */ + HUF_flags_disableFast = (1 << 5) +} HUF_flags_e; + + +/* **************************************** + * HUF detailed API + * ****************************************/ +#define HUF_OPTIMAL_DEPTH_THRESHOLD ZSTD_btultra + +/*! HUF_compress() does the following: + * 1. count symbol occurrence from source[] into table count[] using FSE_count() (exposed within "fse.h") + * 2. (optional) refine tableLog using HUF_optimalTableLog() + * 3. build Huffman table from count using HUF_buildCTable() + * 4. save Huffman table to memory buffer using HUF_writeCTable() + * 5. encode the data stream using HUF_compress4X_usingCTable() + * + * The following API allows targeting specific sub-functions for advanced tasks. + * For example, it's possible to compress several blocks using the same 'CTable', + * or to save and regenerate 'CTable' using external methods. + */ +unsigned HUF_minTableLog(unsigned symbolCardinality); +unsigned HUF_cardinality(const unsigned* count, unsigned maxSymbolValue); +unsigned HUF_optimalTableLog(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue, void* workSpace, + size_t wkspSize, HUF_CElt* table, const unsigned* count, int flags); /* table is used as scratch space for building and testing tables, not a return value */ +size_t HUF_writeCTable_wksp(void* dst, size_t maxDstSize, const HUF_CElt* CTable, unsigned maxSymbolValue, unsigned huffLog, void* workspace, size_t workspaceSize); +size_t HUF_compress4X_usingCTable(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable, int flags); +size_t HUF_estimateCompressedSize(const HUF_CElt* CTable, const unsigned* count, unsigned maxSymbolValue); +int HUF_validateCTable(const HUF_CElt* CTable, const unsigned* count, unsigned maxSymbolValue); + +typedef enum { + HUF_repeat_none, /**< Cannot use the previous table */ + HUF_repeat_check, /**< Can use the previous table but it must be checked. Note : The previous table must have been constructed by HUF_compress{1, 4}X_repeat */ + HUF_repeat_valid /**< Can use the previous table and it is assumed to be valid */ + } HUF_repeat; + +/** HUF_compress4X_repeat() : + * Same as HUF_compress4X_wksp(), but considers using hufTable if *repeat != HUF_repeat_none. + * If it uses hufTable it does not modify hufTable or repeat. + * If it doesn't, it sets *repeat = HUF_repeat_none, and it sets hufTable to the table used. + * If preferRepeat then the old table will always be used if valid. + * If suspectUncompressible then some sampling checks will be run to potentially skip huffman coding */ +size_t HUF_compress4X_repeat(void* dst, size_t dstSize, + const void* src, size_t srcSize, + unsigned maxSymbolValue, unsigned tableLog, + void* workSpace, size_t wkspSize, /**< `workSpace` must be aligned on 4-bytes boundaries, `wkspSize` must be >= HUF_WORKSPACE_SIZE */ + HUF_CElt* hufTable, HUF_repeat* repeat, int flags); + +/** HUF_buildCTable_wksp() : + * Same as HUF_buildCTable(), but using externally allocated scratch buffer. + * `workSpace` must be aligned on 4-bytes boundaries, and its size must be >= HUF_CTABLE_WORKSPACE_SIZE. + */ +#define HUF_CTABLE_WORKSPACE_SIZE_U32 ((4 * (HUF_SYMBOLVALUE_MAX + 1)) + 192) +#define HUF_CTABLE_WORKSPACE_SIZE (HUF_CTABLE_WORKSPACE_SIZE_U32 * sizeof(unsigned)) +size_t HUF_buildCTable_wksp (HUF_CElt* tree, + const unsigned* count, U32 maxSymbolValue, U32 maxNbBits, + void* workSpace, size_t wkspSize); + +/*! HUF_readStats() : + * Read compact Huffman tree, saved by HUF_writeCTable(). + * `huffWeight` is destination buffer. + * @return : size read from `src` , or an error Code . + * Note : Needed by HUF_readCTable() and HUF_readDTableXn() . */ +size_t HUF_readStats(BYTE* huffWeight, size_t hwSize, + U32* rankStats, U32* nbSymbolsPtr, U32* tableLogPtr, + const void* src, size_t srcSize); + +/*! HUF_readStats_wksp() : + * Same as HUF_readStats() but takes an external workspace which must be + * 4-byte aligned and its size must be >= HUF_READ_STATS_WORKSPACE_SIZE. + * If the CPU has BMI2 support, pass bmi2=1, otherwise pass bmi2=0. + */ +#define HUF_READ_STATS_WORKSPACE_SIZE_U32 FSE_DECOMPRESS_WKSP_SIZE_U32(6, HUF_TABLELOG_MAX-1) +#define HUF_READ_STATS_WORKSPACE_SIZE (HUF_READ_STATS_WORKSPACE_SIZE_U32 * sizeof(unsigned)) +size_t HUF_readStats_wksp(BYTE* huffWeight, size_t hwSize, + U32* rankStats, U32* nbSymbolsPtr, U32* tableLogPtr, + const void* src, size_t srcSize, + void* workspace, size_t wkspSize, + int flags); + +/** HUF_readCTable() : + * Loading a CTable saved with HUF_writeCTable() */ +size_t HUF_readCTable (HUF_CElt* CTable, unsigned* maxSymbolValuePtr, const void* src, size_t srcSize, unsigned *hasZeroWeights); + +/** HUF_getNbBitsFromCTable() : + * Read nbBits from CTable symbolTable, for symbol `symbolValue` presumed <= HUF_SYMBOLVALUE_MAX + * Note 1 : If symbolValue > HUF_readCTableHeader(symbolTable).maxSymbolValue, returns 0 + * Note 2 : is not inlined, as HUF_CElt definition is private + */ +U32 HUF_getNbBitsFromCTable(const HUF_CElt* symbolTable, U32 symbolValue); + +typedef struct { + BYTE tableLog; + BYTE maxSymbolValue; + BYTE unused[sizeof(size_t) - 2]; +} HUF_CTableHeader; + +/** HUF_readCTableHeader() : + * @returns The header from the CTable specifying the tableLog and the maxSymbolValue. + */ +HUF_CTableHeader HUF_readCTableHeader(HUF_CElt const* ctable); + +/* + * HUF_decompress() does the following: + * 1. select the decompression algorithm (X1, X2) based on pre-computed heuristics + * 2. build Huffman table from save, using HUF_readDTableX?() + * 3. decode 1 or 4 segments in parallel using HUF_decompress?X?_usingDTable() + */ + +/** HUF_selectDecoder() : + * Tells which decoder is likely to decode faster, + * based on a set of pre-computed metrics. + * @return : 0==HUF_decompress4X1, 1==HUF_decompress4X2 . + * Assumption : 0 < dstSize <= 128 KB */ +U32 HUF_selectDecoder (size_t dstSize, size_t cSrcSize); + +/** + * The minimum workspace size for the `workSpace` used in + * HUF_readDTableX1_wksp() and HUF_readDTableX2_wksp(). + * + * The space used depends on HUF_TABLELOG_MAX, ranging from ~1500 bytes when + * HUF_TABLE_LOG_MAX=12 to ~1850 bytes when HUF_TABLE_LOG_MAX=15. + * Buffer overflow errors may potentially occur if code modifications result in + * a required workspace size greater than that specified in the following + * macro. + */ +#define HUF_DECOMPRESS_WORKSPACE_SIZE ((2 << 10) + (1 << 9)) +#define HUF_DECOMPRESS_WORKSPACE_SIZE_U32 (HUF_DECOMPRESS_WORKSPACE_SIZE / sizeof(U32)) + + +/* ====================== */ +/* single stream variants */ +/* ====================== */ + +size_t HUF_compress1X_usingCTable(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable, int flags); +/** HUF_compress1X_repeat() : + * Same as HUF_compress1X_wksp(), but considers using hufTable if *repeat != HUF_repeat_none. + * If it uses hufTable it does not modify hufTable or repeat. + * If it doesn't, it sets *repeat = HUF_repeat_none, and it sets hufTable to the table used. + * If preferRepeat then the old table will always be used if valid. + * If suspectUncompressible then some sampling checks will be run to potentially skip huffman coding */ +size_t HUF_compress1X_repeat(void* dst, size_t dstSize, + const void* src, size_t srcSize, + unsigned maxSymbolValue, unsigned tableLog, + void* workSpace, size_t wkspSize, /**< `workSpace` must be aligned on 4-bytes boundaries, `wkspSize` must be >= HUF_WORKSPACE_SIZE */ + HUF_CElt* hufTable, HUF_repeat* repeat, int flags); + +size_t HUF_decompress1X_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize, int flags); +#ifndef HUF_FORCE_DECOMPRESS_X1 +size_t HUF_decompress1X2_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize, int flags); /**< double-symbols decoder */ +#endif + +/* BMI2 variants. + * If the CPU has BMI2 support, pass bmi2=1, otherwise pass bmi2=0. + */ +size_t HUF_decompress1X_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable, int flags); +#ifndef HUF_FORCE_DECOMPRESS_X2 +size_t HUF_decompress1X1_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize, int flags); +#endif +size_t HUF_decompress4X_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable, int flags); +size_t HUF_decompress4X_hufOnly_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize, int flags); +#ifndef HUF_FORCE_DECOMPRESS_X2 +size_t HUF_readDTableX1_wksp(HUF_DTable* DTable, const void* src, size_t srcSize, void* workSpace, size_t wkspSize, int flags); +#endif +#ifndef HUF_FORCE_DECOMPRESS_X1 +size_t HUF_readDTableX2_wksp(HUF_DTable* DTable, const void* src, size_t srcSize, void* workSpace, size_t wkspSize, int flags); +#endif + +#endif /* HUF_H_298734234 */ + +#if defined (__cplusplus) +} +#endif +/**** ended inlining huf.h ****/ +/**** skipping file: bits.h ****/ + + +/*=== Version ===*/ +unsigned FSE_versionNumber(void) { return FSE_VERSION_NUMBER; } + + +/*=== Error Management ===*/ +unsigned FSE_isError(size_t code) { return ERR_isError(code); } +const char* FSE_getErrorName(size_t code) { return ERR_getErrorName(code); } + +unsigned HUF_isError(size_t code) { return ERR_isError(code); } +const char* HUF_getErrorName(size_t code) { return ERR_getErrorName(code); } + + +/*-************************************************************** +* FSE NCount encoding-decoding +****************************************************************/ +FORCE_INLINE_TEMPLATE +size_t FSE_readNCount_body(short* normalizedCounter, unsigned* maxSVPtr, unsigned* tableLogPtr, + const void* headerBuffer, size_t hbSize) +{ + const BYTE* const istart = (const BYTE*) headerBuffer; + const BYTE* const iend = istart + hbSize; + const BYTE* ip = istart; + int nbBits; + int remaining; + int threshold; + U32 bitStream; + int bitCount; + unsigned charnum = 0; + unsigned const maxSV1 = *maxSVPtr + 1; + int previous0 = 0; + + if (hbSize < 8) { + /* This function only works when hbSize >= 8 */ + char buffer[8] = {0}; + ZSTD_memcpy(buffer, headerBuffer, hbSize); + { size_t const countSize = FSE_readNCount(normalizedCounter, maxSVPtr, tableLogPtr, + buffer, sizeof(buffer)); + if (FSE_isError(countSize)) return countSize; + if (countSize > hbSize) return ERROR(corruption_detected); + return countSize; + } } + assert(hbSize >= 8); + + /* init */ + ZSTD_memset(normalizedCounter, 0, (*maxSVPtr+1) * sizeof(normalizedCounter[0])); /* all symbols not present in NCount have a frequency of 0 */ + bitStream = MEM_readLE32(ip); + nbBits = (bitStream & 0xF) + FSE_MIN_TABLELOG; /* extract tableLog */ + if (nbBits > FSE_TABLELOG_ABSOLUTE_MAX) return ERROR(tableLog_tooLarge); + bitStream >>= 4; + bitCount = 4; + *tableLogPtr = nbBits; + remaining = (1<> 1; + while (repeats >= 12) { + charnum += 3 * 12; + if (LIKELY(ip <= iend-7)) { + ip += 3; + } else { + bitCount -= (int)(8 * (iend - 7 - ip)); + bitCount &= 31; + ip = iend - 4; + } + bitStream = MEM_readLE32(ip) >> bitCount; + repeats = ZSTD_countTrailingZeros32(~bitStream | 0x80000000) >> 1; + } + charnum += 3 * repeats; + bitStream >>= 2 * repeats; + bitCount += 2 * repeats; + + /* Add the final repeat which isn't 0b11. */ + assert((bitStream & 3) < 3); + charnum += bitStream & 3; + bitCount += 2; + + /* This is an error, but break and return an error + * at the end, because returning out of a loop makes + * it harder for the compiler to optimize. + */ + if (charnum >= maxSV1) break; + + /* We don't need to set the normalized count to 0 + * because we already memset the whole buffer to 0. + */ + + if (LIKELY(ip <= iend-7) || (ip + (bitCount>>3) <= iend-4)) { + assert((bitCount >> 3) <= 3); /* For first condition to work */ + ip += bitCount>>3; + bitCount &= 7; + } else { + bitCount -= (int)(8 * (iend - 4 - ip)); + bitCount &= 31; + ip = iend - 4; + } + bitStream = MEM_readLE32(ip) >> bitCount; + } + { + int const max = (2*threshold-1) - remaining; + int count; + + if ((bitStream & (threshold-1)) < (U32)max) { + count = bitStream & (threshold-1); + bitCount += nbBits-1; + } else { + count = bitStream & (2*threshold-1); + if (count >= threshold) count -= max; + bitCount += nbBits; + } + + count--; /* extra accuracy */ + /* When it matters (small blocks), this is a + * predictable branch, because we don't use -1. + */ + if (count >= 0) { + remaining -= count; + } else { + assert(count == -1); + remaining += count; + } + normalizedCounter[charnum++] = (short)count; + previous0 = !count; + + assert(threshold > 1); + if (remaining < threshold) { + /* This branch can be folded into the + * threshold update condition because we + * know that threshold > 1. + */ + if (remaining <= 1) break; + nbBits = ZSTD_highbit32(remaining) + 1; + threshold = 1 << (nbBits - 1); + } + if (charnum >= maxSV1) break; + + if (LIKELY(ip <= iend-7) || (ip + (bitCount>>3) <= iend-4)) { + ip += bitCount>>3; + bitCount &= 7; + } else { + bitCount -= (int)(8 * (iend - 4 - ip)); + bitCount &= 31; + ip = iend - 4; + } + bitStream = MEM_readLE32(ip) >> bitCount; + } } + if (remaining != 1) return ERROR(corruption_detected); + /* Only possible when there are too many zeros. */ + if (charnum > maxSV1) return ERROR(maxSymbolValue_tooSmall); + if (bitCount > 32) return ERROR(corruption_detected); + *maxSVPtr = charnum-1; + + ip += (bitCount+7)>>3; + return ip-istart; +} + +/* Avoids the FORCE_INLINE of the _body() function. */ +static size_t FSE_readNCount_body_default( + short* normalizedCounter, unsigned* maxSVPtr, unsigned* tableLogPtr, + const void* headerBuffer, size_t hbSize) +{ + return FSE_readNCount_body(normalizedCounter, maxSVPtr, tableLogPtr, headerBuffer, hbSize); +} + +#if DYNAMIC_BMI2 +BMI2_TARGET_ATTRIBUTE static size_t FSE_readNCount_body_bmi2( + short* normalizedCounter, unsigned* maxSVPtr, unsigned* tableLogPtr, + const void* headerBuffer, size_t hbSize) +{ + return FSE_readNCount_body(normalizedCounter, maxSVPtr, tableLogPtr, headerBuffer, hbSize); +} +#endif + +size_t FSE_readNCount_bmi2( + short* normalizedCounter, unsigned* maxSVPtr, unsigned* tableLogPtr, + const void* headerBuffer, size_t hbSize, int bmi2) +{ +#if DYNAMIC_BMI2 + if (bmi2) { + return FSE_readNCount_body_bmi2(normalizedCounter, maxSVPtr, tableLogPtr, headerBuffer, hbSize); + } +#endif + (void)bmi2; + return FSE_readNCount_body_default(normalizedCounter, maxSVPtr, tableLogPtr, headerBuffer, hbSize); +} + +size_t FSE_readNCount( + short* normalizedCounter, unsigned* maxSVPtr, unsigned* tableLogPtr, + const void* headerBuffer, size_t hbSize) +{ + return FSE_readNCount_bmi2(normalizedCounter, maxSVPtr, tableLogPtr, headerBuffer, hbSize, /* bmi2 */ 0); +} + + +/*! HUF_readStats() : + Read compact Huffman tree, saved by HUF_writeCTable(). + `huffWeight` is destination buffer. + `rankStats` is assumed to be a table of at least HUF_TABLELOG_MAX U32. + @return : size read from `src` , or an error Code . + Note : Needed by HUF_readCTable() and HUF_readDTableX?() . +*/ +size_t HUF_readStats(BYTE* huffWeight, size_t hwSize, U32* rankStats, + U32* nbSymbolsPtr, U32* tableLogPtr, + const void* src, size_t srcSize) +{ + U32 wksp[HUF_READ_STATS_WORKSPACE_SIZE_U32]; + return HUF_readStats_wksp(huffWeight, hwSize, rankStats, nbSymbolsPtr, tableLogPtr, src, srcSize, wksp, sizeof(wksp), /* flags */ 0); +} + +FORCE_INLINE_TEMPLATE size_t +HUF_readStats_body(BYTE* huffWeight, size_t hwSize, U32* rankStats, + U32* nbSymbolsPtr, U32* tableLogPtr, + const void* src, size_t srcSize, + void* workSpace, size_t wkspSize, + int bmi2) +{ + U32 weightTotal; + const BYTE* ip = (const BYTE*) src; + size_t iSize; + size_t oSize; + + if (!srcSize) return ERROR(srcSize_wrong); + iSize = ip[0]; + /* ZSTD_memset(huffWeight, 0, hwSize); *//* is not necessary, even though some analyzer complain ... */ + + if (iSize >= 128) { /* special header */ + oSize = iSize - 127; + iSize = ((oSize+1)/2); + if (iSize+1 > srcSize) return ERROR(srcSize_wrong); + if (oSize >= hwSize) return ERROR(corruption_detected); + ip += 1; + { U32 n; + for (n=0; n> 4; + huffWeight[n+1] = ip[n/2] & 15; + } } } + else { /* header compressed with FSE (normal case) */ + if (iSize+1 > srcSize) return ERROR(srcSize_wrong); + /* max (hwSize-1) values decoded, as last one is implied */ + oSize = FSE_decompress_wksp_bmi2(huffWeight, hwSize-1, ip+1, iSize, 6, workSpace, wkspSize, bmi2); + if (FSE_isError(oSize)) return oSize; + } + + /* collect weight stats */ + ZSTD_memset(rankStats, 0, (HUF_TABLELOG_MAX + 1) * sizeof(U32)); + weightTotal = 0; + { U32 n; for (n=0; n HUF_TABLELOG_MAX) return ERROR(corruption_detected); + rankStats[huffWeight[n]]++; + weightTotal += (1 << huffWeight[n]) >> 1; + } } + if (weightTotal == 0) return ERROR(corruption_detected); + + /* get last non-null symbol weight (implied, total must be 2^n) */ + { U32 const tableLog = ZSTD_highbit32(weightTotal) + 1; + if (tableLog > HUF_TABLELOG_MAX) return ERROR(corruption_detected); + *tableLogPtr = tableLog; + /* determine last weight */ + { U32 const total = 1 << tableLog; + U32 const rest = total - weightTotal; + U32 const verif = 1 << ZSTD_highbit32(rest); + U32 const lastWeight = ZSTD_highbit32(rest) + 1; + if (verif != rest) return ERROR(corruption_detected); /* last value must be a clean power of 2 */ + huffWeight[oSize] = (BYTE)lastWeight; + rankStats[lastWeight]++; + } } + + /* check tree construction validity */ + if ((rankStats[1] < 2) || (rankStats[1] & 1)) return ERROR(corruption_detected); /* by construction : at least 2 elts of rank 1, must be even */ + + /* results */ + *nbSymbolsPtr = (U32)(oSize+1); + return iSize+1; +} + +/* Avoids the FORCE_INLINE of the _body() function. */ +static size_t HUF_readStats_body_default(BYTE* huffWeight, size_t hwSize, U32* rankStats, + U32* nbSymbolsPtr, U32* tableLogPtr, + const void* src, size_t srcSize, + void* workSpace, size_t wkspSize) +{ + return HUF_readStats_body(huffWeight, hwSize, rankStats, nbSymbolsPtr, tableLogPtr, src, srcSize, workSpace, wkspSize, 0); +} + +#if DYNAMIC_BMI2 +static BMI2_TARGET_ATTRIBUTE size_t HUF_readStats_body_bmi2(BYTE* huffWeight, size_t hwSize, U32* rankStats, + U32* nbSymbolsPtr, U32* tableLogPtr, + const void* src, size_t srcSize, + void* workSpace, size_t wkspSize) +{ + return HUF_readStats_body(huffWeight, hwSize, rankStats, nbSymbolsPtr, tableLogPtr, src, srcSize, workSpace, wkspSize, 1); +} +#endif + +size_t HUF_readStats_wksp(BYTE* huffWeight, size_t hwSize, U32* rankStats, + U32* nbSymbolsPtr, U32* tableLogPtr, + const void* src, size_t srcSize, + void* workSpace, size_t wkspSize, + int flags) +{ +#if DYNAMIC_BMI2 + if (flags & HUF_flags_bmi2) { + return HUF_readStats_body_bmi2(huffWeight, hwSize, rankStats, nbSymbolsPtr, tableLogPtr, src, srcSize, workSpace, wkspSize); + } +#endif + (void)flags; + return HUF_readStats_body_default(huffWeight, hwSize, rankStats, nbSymbolsPtr, tableLogPtr, src, srcSize, workSpace, wkspSize); +} +/**** ended inlining common/entropy_common.c ****/ +/**** start inlining common/error_private.c ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +/* The purpose of this file is to have a single list of error strings embedded in binary */ + +/**** skipping file: error_private.h ****/ + +const char* ERR_getErrorString(ERR_enum code) +{ +#ifdef ZSTD_STRIP_ERROR_STRINGS + (void)code; + return "Error strings stripped"; +#else + static const char* const notErrorCode = "Unspecified error code"; + switch( code ) + { + case PREFIX(no_error): return "No error detected"; + case PREFIX(GENERIC): return "Error (generic)"; + case PREFIX(prefix_unknown): return "Unknown frame descriptor"; + case PREFIX(version_unsupported): return "Version not supported"; + case PREFIX(frameParameter_unsupported): return "Unsupported frame parameter"; + case PREFIX(frameParameter_windowTooLarge): return "Frame requires too much memory for decoding"; + case PREFIX(corruption_detected): return "Data corruption detected"; + case PREFIX(checksum_wrong): return "Restored data doesn't match checksum"; + case PREFIX(literals_headerWrong): return "Header of Literals' block doesn't respect format specification"; + case PREFIX(parameter_unsupported): return "Unsupported parameter"; + case PREFIX(parameter_combination_unsupported): return "Unsupported combination of parameters"; + case PREFIX(parameter_outOfBound): return "Parameter is out of bound"; + case PREFIX(init_missing): return "Context should be init first"; + case PREFIX(memory_allocation): return "Allocation error : not enough memory"; + case PREFIX(workSpace_tooSmall): return "workSpace buffer is not large enough"; + case PREFIX(stage_wrong): return "Operation not authorized at current processing stage"; + case PREFIX(tableLog_tooLarge): return "tableLog requires too much memory : unsupported"; + case PREFIX(maxSymbolValue_tooLarge): return "Unsupported max Symbol Value : too large"; + case PREFIX(maxSymbolValue_tooSmall): return "Specified maxSymbolValue is too small"; + case PREFIX(stabilityCondition_notRespected): return "pledged buffer stability condition is not respected"; + case PREFIX(dictionary_corrupted): return "Dictionary is corrupted"; + case PREFIX(dictionary_wrong): return "Dictionary mismatch"; + case PREFIX(dictionaryCreation_failed): return "Cannot create Dictionary from provided samples"; + case PREFIX(dstSize_tooSmall): return "Destination buffer is too small"; + case PREFIX(srcSize_wrong): return "Src size is incorrect"; + case PREFIX(dstBuffer_null): return "Operation on NULL destination buffer"; + case PREFIX(noForwardProgress_destFull): return "Operation made no progress over multiple calls, due to output buffer being full"; + case PREFIX(noForwardProgress_inputEmpty): return "Operation made no progress over multiple calls, due to input being empty"; + /* following error codes are not stable and may be removed or changed in a future version */ + case PREFIX(frameIndex_tooLarge): return "Frame index is too large"; + case PREFIX(seekableIO): return "An I/O error occurred when reading/seeking"; + case PREFIX(dstBuffer_wrong): return "Destination buffer is wrong"; + case PREFIX(srcBuffer_wrong): return "Source buffer is wrong"; + case PREFIX(sequenceProducer_failed): return "Block-level external sequence producer returned an error code"; + case PREFIX(externalSequences_invalid): return "External sequences are not valid"; + case PREFIX(maxCode): + default: return notErrorCode; + } +#endif +} +/**** ended inlining common/error_private.c ****/ +/**** start inlining common/fse_decompress.c ****/ +/* ****************************************************************** + * FSE : Finite State Entropy decoder + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * You can contact the author at : + * - FSE source repository : https://github.com/Cyan4973/FiniteStateEntropy + * - Public forum : https://groups.google.com/forum/#!forum/lz4c + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. +****************************************************************** */ + + +/* ************************************************************** +* Includes +****************************************************************/ +/**** skipping file: debug.h ****/ +/**** skipping file: bitstream.h ****/ +/**** skipping file: compiler.h ****/ +#define FSE_STATIC_LINKING_ONLY +/**** skipping file: fse.h ****/ +/**** skipping file: error_private.h ****/ +/**** skipping file: zstd_deps.h ****/ +/**** skipping file: bits.h ****/ + + +/* ************************************************************** +* Error Management +****************************************************************/ +#define FSE_isError ERR_isError +#define FSE_STATIC_ASSERT(c) DEBUG_STATIC_ASSERT(c) /* use only *after* variable declarations */ + + +/* ************************************************************** +* Templates +****************************************************************/ +/* + designed to be included + for type-specific functions (template emulation in C) + Objective is to write these functions only once, for improved maintenance +*/ + +/* safety checks */ +#ifndef FSE_FUNCTION_EXTENSION +# error "FSE_FUNCTION_EXTENSION must be defined" +#endif +#ifndef FSE_FUNCTION_TYPE +# error "FSE_FUNCTION_TYPE must be defined" +#endif + +/* Function names */ +#define FSE_CAT(X,Y) X##Y +#define FSE_FUNCTION_NAME(X,Y) FSE_CAT(X,Y) +#define FSE_TYPE_NAME(X,Y) FSE_CAT(X,Y) + +static size_t FSE_buildDTable_internal(FSE_DTable* dt, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog, void* workSpace, size_t wkspSize) +{ + void* const tdPtr = dt+1; /* because *dt is unsigned, 32-bits aligned on 32-bits */ + FSE_DECODE_TYPE* const tableDecode = (FSE_DECODE_TYPE*) (tdPtr); + U16* symbolNext = (U16*)workSpace; + BYTE* spread = (BYTE*)(symbolNext + maxSymbolValue + 1); + + U32 const maxSV1 = maxSymbolValue + 1; + U32 const tableSize = 1 << tableLog; + U32 highThreshold = tableSize-1; + + /* Sanity Checks */ + if (FSE_BUILD_DTABLE_WKSP_SIZE(tableLog, maxSymbolValue) > wkspSize) return ERROR(maxSymbolValue_tooLarge); + if (maxSymbolValue > FSE_MAX_SYMBOL_VALUE) return ERROR(maxSymbolValue_tooLarge); + if (tableLog > FSE_MAX_TABLELOG) return ERROR(tableLog_tooLarge); + + /* Init, lay down lowprob symbols */ + { FSE_DTableHeader DTableH; + DTableH.tableLog = (U16)tableLog; + DTableH.fastMode = 1; + { S16 const largeLimit= (S16)(1 << (tableLog-1)); + U32 s; + for (s=0; s= largeLimit) DTableH.fastMode=0; + symbolNext[s] = (U16)normalizedCounter[s]; + } } } + ZSTD_memcpy(dt, &DTableH, sizeof(DTableH)); + } + + /* Spread symbols */ + if (highThreshold == tableSize - 1) { + size_t const tableMask = tableSize-1; + size_t const step = FSE_TABLESTEP(tableSize); + /* First lay down the symbols in order. + * We use a uint64_t to lay down 8 bytes at a time. This reduces branch + * misses since small blocks generally have small table logs, so nearly + * all symbols have counts <= 8. We ensure we have 8 bytes at the end of + * our buffer to handle the over-write. + */ + { U64 const add = 0x0101010101010101ull; + size_t pos = 0; + U64 sv = 0; + U32 s; + for (s=0; s highThreshold) position = (position + step) & tableMask; /* lowprob area */ + } } + if (position!=0) return ERROR(GENERIC); /* position must reach all cells once, otherwise normalizedCounter is incorrect */ + } + + /* Build Decoding table */ + { U32 u; + for (u=0; u sizeof(bitD.bitContainer)*8) /* This test must be static */ + BIT_reloadDStream(&bitD); + + op[1] = FSE_GETSYMBOL(&state2); + + if (FSE_MAX_TABLELOG*4+7 > sizeof(bitD.bitContainer)*8) /* This test must be static */ + { if (BIT_reloadDStream(&bitD) > BIT_DStream_unfinished) { op+=2; break; } } + + op[2] = FSE_GETSYMBOL(&state1); + + if (FSE_MAX_TABLELOG*2+7 > sizeof(bitD.bitContainer)*8) /* This test must be static */ + BIT_reloadDStream(&bitD); + + op[3] = FSE_GETSYMBOL(&state2); + } + + /* tail */ + /* note : BIT_reloadDStream(&bitD) >= FSE_DStream_partiallyFilled; Ends at exactly BIT_DStream_completed */ + while (1) { + if (op>(omax-2)) return ERROR(dstSize_tooSmall); + *op++ = FSE_GETSYMBOL(&state1); + if (BIT_reloadDStream(&bitD)==BIT_DStream_overflow) { + *op++ = FSE_GETSYMBOL(&state2); + break; + } + + if (op>(omax-2)) return ERROR(dstSize_tooSmall); + *op++ = FSE_GETSYMBOL(&state2); + if (BIT_reloadDStream(&bitD)==BIT_DStream_overflow) { + *op++ = FSE_GETSYMBOL(&state1); + break; + } } + + assert(op >= ostart); + return (size_t)(op-ostart); +} + +typedef struct { + short ncount[FSE_MAX_SYMBOL_VALUE + 1]; +} FSE_DecompressWksp; + + +FORCE_INLINE_TEMPLATE size_t FSE_decompress_wksp_body( + void* dst, size_t dstCapacity, + const void* cSrc, size_t cSrcSize, + unsigned maxLog, void* workSpace, size_t wkspSize, + int bmi2) +{ + const BYTE* const istart = (const BYTE*)cSrc; + const BYTE* ip = istart; + unsigned tableLog; + unsigned maxSymbolValue = FSE_MAX_SYMBOL_VALUE; + FSE_DecompressWksp* const wksp = (FSE_DecompressWksp*)workSpace; + size_t const dtablePos = sizeof(FSE_DecompressWksp) / sizeof(FSE_DTable); + FSE_DTable* const dtable = (FSE_DTable*)workSpace + dtablePos; + + FSE_STATIC_ASSERT((FSE_MAX_SYMBOL_VALUE + 1) % 2 == 0); + if (wkspSize < sizeof(*wksp)) return ERROR(GENERIC); + + /* correct offset to dtable depends on this property */ + FSE_STATIC_ASSERT(sizeof(FSE_DecompressWksp) % sizeof(FSE_DTable) == 0); + + /* normal FSE decoding mode */ + { size_t const NCountLength = + FSE_readNCount_bmi2(wksp->ncount, &maxSymbolValue, &tableLog, istart, cSrcSize, bmi2); + if (FSE_isError(NCountLength)) return NCountLength; + if (tableLog > maxLog) return ERROR(tableLog_tooLarge); + assert(NCountLength <= cSrcSize); + ip += NCountLength; + cSrcSize -= NCountLength; + } + + if (FSE_DECOMPRESS_WKSP_SIZE(tableLog, maxSymbolValue) > wkspSize) return ERROR(tableLog_tooLarge); + assert(sizeof(*wksp) + FSE_DTABLE_SIZE(tableLog) <= wkspSize); + workSpace = (BYTE*)workSpace + sizeof(*wksp) + FSE_DTABLE_SIZE(tableLog); + wkspSize -= sizeof(*wksp) + FSE_DTABLE_SIZE(tableLog); + + CHECK_F( FSE_buildDTable_internal(dtable, wksp->ncount, maxSymbolValue, tableLog, workSpace, wkspSize) ); + + { + const void* ptr = dtable; + const FSE_DTableHeader* DTableH = (const FSE_DTableHeader*)ptr; + const U32 fastMode = DTableH->fastMode; + + /* select fast mode (static) */ + if (fastMode) return FSE_decompress_usingDTable_generic(dst, dstCapacity, ip, cSrcSize, dtable, 1); + return FSE_decompress_usingDTable_generic(dst, dstCapacity, ip, cSrcSize, dtable, 0); + } +} + +/* Avoids the FORCE_INLINE of the _body() function. */ +static size_t FSE_decompress_wksp_body_default(void* dst, size_t dstCapacity, const void* cSrc, size_t cSrcSize, unsigned maxLog, void* workSpace, size_t wkspSize) +{ + return FSE_decompress_wksp_body(dst, dstCapacity, cSrc, cSrcSize, maxLog, workSpace, wkspSize, 0); +} + +#if DYNAMIC_BMI2 +BMI2_TARGET_ATTRIBUTE static size_t FSE_decompress_wksp_body_bmi2(void* dst, size_t dstCapacity, const void* cSrc, size_t cSrcSize, unsigned maxLog, void* workSpace, size_t wkspSize) +{ + return FSE_decompress_wksp_body(dst, dstCapacity, cSrc, cSrcSize, maxLog, workSpace, wkspSize, 1); +} +#endif + +size_t FSE_decompress_wksp_bmi2(void* dst, size_t dstCapacity, const void* cSrc, size_t cSrcSize, unsigned maxLog, void* workSpace, size_t wkspSize, int bmi2) +{ +#if DYNAMIC_BMI2 + if (bmi2) { + return FSE_decompress_wksp_body_bmi2(dst, dstCapacity, cSrc, cSrcSize, maxLog, workSpace, wkspSize); + } +#endif + (void)bmi2; + return FSE_decompress_wksp_body_default(dst, dstCapacity, cSrc, cSrcSize, maxLog, workSpace, wkspSize); +} + +#endif /* FSE_COMMONDEFS_ONLY */ +/**** ended inlining common/fse_decompress.c ****/ +/**** start inlining common/threading.c ****/ +/** + * Copyright (c) 2016 Tino Reichardt + * All rights reserved. + * + * You can contact the author at: + * - zstdmt source repository: https://github.com/mcmilk/zstdmt + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +/** + * This file will hold wrapper for systems, which do not support pthreads + */ + +/**** start inlining threading.h ****/ +/** + * Copyright (c) 2016 Tino Reichardt + * All rights reserved. + * + * You can contact the author at: + * - zstdmt source repository: https://github.com/mcmilk/zstdmt + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +#ifndef THREADING_H_938743 +#define THREADING_H_938743 + +/**** skipping file: debug.h ****/ + +#if defined (__cplusplus) +extern "C" { +#endif + +#if defined(ZSTD_MULTITHREAD) && defined(_WIN32) + +/** + * Windows minimalist Pthread Wrapper + */ +#ifdef WINVER +# undef WINVER +#endif +#define WINVER 0x0600 + +#ifdef _WIN32_WINNT +# undef _WIN32_WINNT +#endif +#define _WIN32_WINNT 0x0600 + +#ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif + +#undef ERROR /* reported already defined on VS 2015 (Rich Geldreich) */ +#include +#undef ERROR +#define ERROR(name) ZSTD_ERROR(name) + + +/* mutex */ +#define ZSTD_pthread_mutex_t CRITICAL_SECTION +#define ZSTD_pthread_mutex_init(a, b) ((void)(b), InitializeCriticalSection((a)), 0) +#define ZSTD_pthread_mutex_destroy(a) DeleteCriticalSection((a)) +#define ZSTD_pthread_mutex_lock(a) EnterCriticalSection((a)) +#define ZSTD_pthread_mutex_unlock(a) LeaveCriticalSection((a)) + +/* condition variable */ +#define ZSTD_pthread_cond_t CONDITION_VARIABLE +#define ZSTD_pthread_cond_init(a, b) ((void)(b), InitializeConditionVariable((a)), 0) +#define ZSTD_pthread_cond_destroy(a) ((void)(a)) +#define ZSTD_pthread_cond_wait(a, b) SleepConditionVariableCS((a), (b), INFINITE) +#define ZSTD_pthread_cond_signal(a) WakeConditionVariable((a)) +#define ZSTD_pthread_cond_broadcast(a) WakeAllConditionVariable((a)) + +/* ZSTD_pthread_create() and ZSTD_pthread_join() */ +typedef HANDLE ZSTD_pthread_t; + +int ZSTD_pthread_create(ZSTD_pthread_t* thread, const void* unused, + void* (*start_routine) (void*), void* arg); + +int ZSTD_pthread_join(ZSTD_pthread_t thread); + +/** + * add here more wrappers as required + */ + + +#elif defined(ZSTD_MULTITHREAD) /* posix assumed ; need a better detection method */ +/* === POSIX Systems === */ +# include + +#if DEBUGLEVEL < 1 + +#define ZSTD_pthread_mutex_t pthread_mutex_t +#define ZSTD_pthread_mutex_init(a, b) pthread_mutex_init((a), (b)) +#define ZSTD_pthread_mutex_destroy(a) pthread_mutex_destroy((a)) +#define ZSTD_pthread_mutex_lock(a) pthread_mutex_lock((a)) +#define ZSTD_pthread_mutex_unlock(a) pthread_mutex_unlock((a)) + +#define ZSTD_pthread_cond_t pthread_cond_t +#define ZSTD_pthread_cond_init(a, b) pthread_cond_init((a), (b)) +#define ZSTD_pthread_cond_destroy(a) pthread_cond_destroy((a)) +#define ZSTD_pthread_cond_wait(a, b) pthread_cond_wait((a), (b)) +#define ZSTD_pthread_cond_signal(a) pthread_cond_signal((a)) +#define ZSTD_pthread_cond_broadcast(a) pthread_cond_broadcast((a)) + +#define ZSTD_pthread_t pthread_t +#define ZSTD_pthread_create(a, b, c, d) pthread_create((a), (b), (c), (d)) +#define ZSTD_pthread_join(a) pthread_join((a),NULL) + +#else /* DEBUGLEVEL >= 1 */ + +/* Debug implementation of threading. + * In this implementation we use pointers for mutexes and condition variables. + * This way, if we forget to init/destroy them the program will crash or ASAN + * will report leaks. + */ + +#define ZSTD_pthread_mutex_t pthread_mutex_t* +int ZSTD_pthread_mutex_init(ZSTD_pthread_mutex_t* mutex, pthread_mutexattr_t const* attr); +int ZSTD_pthread_mutex_destroy(ZSTD_pthread_mutex_t* mutex); +#define ZSTD_pthread_mutex_lock(a) pthread_mutex_lock(*(a)) +#define ZSTD_pthread_mutex_unlock(a) pthread_mutex_unlock(*(a)) + +#define ZSTD_pthread_cond_t pthread_cond_t* +int ZSTD_pthread_cond_init(ZSTD_pthread_cond_t* cond, pthread_condattr_t const* attr); +int ZSTD_pthread_cond_destroy(ZSTD_pthread_cond_t* cond); +#define ZSTD_pthread_cond_wait(a, b) pthread_cond_wait(*(a), *(b)) +#define ZSTD_pthread_cond_signal(a) pthread_cond_signal(*(a)) +#define ZSTD_pthread_cond_broadcast(a) pthread_cond_broadcast(*(a)) + +#define ZSTD_pthread_t pthread_t +#define ZSTD_pthread_create(a, b, c, d) pthread_create((a), (b), (c), (d)) +#define ZSTD_pthread_join(a) pthread_join((a),NULL) + +#endif + +#else /* ZSTD_MULTITHREAD not defined */ +/* No multithreading support */ + +typedef int ZSTD_pthread_mutex_t; +#define ZSTD_pthread_mutex_init(a, b) ((void)(a), (void)(b), 0) +#define ZSTD_pthread_mutex_destroy(a) ((void)(a)) +#define ZSTD_pthread_mutex_lock(a) ((void)(a)) +#define ZSTD_pthread_mutex_unlock(a) ((void)(a)) + +typedef int ZSTD_pthread_cond_t; +#define ZSTD_pthread_cond_init(a, b) ((void)(a), (void)(b), 0) +#define ZSTD_pthread_cond_destroy(a) ((void)(a)) +#define ZSTD_pthread_cond_wait(a, b) ((void)(a), (void)(b)) +#define ZSTD_pthread_cond_signal(a) ((void)(a)) +#define ZSTD_pthread_cond_broadcast(a) ((void)(a)) + +/* do not use ZSTD_pthread_t */ + +#endif /* ZSTD_MULTITHREAD */ + +#if defined (__cplusplus) +} +#endif + +#endif /* THREADING_H_938743 */ +/**** ended inlining threading.h ****/ + +/* create fake symbol to avoid empty translation unit warning */ +int g_ZSTD_threading_useless_symbol; + +#if defined(ZSTD_MULTITHREAD) && defined(_WIN32) + +/** + * Windows minimalist Pthread Wrapper + */ + + +/* === Dependencies === */ +#include +#include + + +/* === Implementation === */ + +typedef struct { + void* (*start_routine)(void*); + void* arg; + int initialized; + ZSTD_pthread_cond_t initialized_cond; + ZSTD_pthread_mutex_t initialized_mutex; +} ZSTD_thread_params_t; + +static unsigned __stdcall worker(void *arg) +{ + void* (*start_routine)(void*); + void* thread_arg; + + /* Initialized thread_arg and start_routine and signal main thread that we don't need it + * to wait any longer. + */ + { + ZSTD_thread_params_t* thread_param = (ZSTD_thread_params_t*)arg; + thread_arg = thread_param->arg; + start_routine = thread_param->start_routine; + + /* Signal main thread that we are running and do not depend on its memory anymore */ + ZSTD_pthread_mutex_lock(&thread_param->initialized_mutex); + thread_param->initialized = 1; + ZSTD_pthread_cond_signal(&thread_param->initialized_cond); + ZSTD_pthread_mutex_unlock(&thread_param->initialized_mutex); + } + + start_routine(thread_arg); + + return 0; +} + +int ZSTD_pthread_create(ZSTD_pthread_t* thread, const void* unused, + void* (*start_routine) (void*), void* arg) +{ + ZSTD_thread_params_t thread_param; + (void)unused; + + if (thread==NULL) return -1; + *thread = NULL; + + thread_param.start_routine = start_routine; + thread_param.arg = arg; + thread_param.initialized = 0; + + /* Setup thread initialization synchronization */ + if(ZSTD_pthread_cond_init(&thread_param.initialized_cond, NULL)) { + /* Should never happen on Windows */ + return -1; + } + if(ZSTD_pthread_mutex_init(&thread_param.initialized_mutex, NULL)) { + /* Should never happen on Windows */ + ZSTD_pthread_cond_destroy(&thread_param.initialized_cond); + return -1; + } + + /* Spawn thread */ + *thread = (HANDLE)_beginthreadex(NULL, 0, worker, &thread_param, 0, NULL); + if (*thread==NULL) { + ZSTD_pthread_mutex_destroy(&thread_param.initialized_mutex); + ZSTD_pthread_cond_destroy(&thread_param.initialized_cond); + return errno; + } + + /* Wait for thread to be initialized */ + ZSTD_pthread_mutex_lock(&thread_param.initialized_mutex); + while(!thread_param.initialized) { + ZSTD_pthread_cond_wait(&thread_param.initialized_cond, &thread_param.initialized_mutex); + } + ZSTD_pthread_mutex_unlock(&thread_param.initialized_mutex); + ZSTD_pthread_mutex_destroy(&thread_param.initialized_mutex); + ZSTD_pthread_cond_destroy(&thread_param.initialized_cond); + + return 0; +} + +int ZSTD_pthread_join(ZSTD_pthread_t thread) +{ + DWORD result; + + if (!thread) return 0; + + result = WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + switch (result) { + case WAIT_OBJECT_0: + return 0; + case WAIT_ABANDONED: + return EINVAL; + default: + return GetLastError(); + } +} + +#endif /* ZSTD_MULTITHREAD */ + +#if defined(ZSTD_MULTITHREAD) && DEBUGLEVEL >= 1 && !defined(_WIN32) + +#define ZSTD_DEPS_NEED_MALLOC +/**** skipping file: zstd_deps.h ****/ + +int ZSTD_pthread_mutex_init(ZSTD_pthread_mutex_t* mutex, pthread_mutexattr_t const* attr) +{ + assert(mutex != NULL); + *mutex = (pthread_mutex_t*)ZSTD_malloc(sizeof(pthread_mutex_t)); + if (!*mutex) + return 1; + return pthread_mutex_init(*mutex, attr); +} + +int ZSTD_pthread_mutex_destroy(ZSTD_pthread_mutex_t* mutex) +{ + assert(mutex != NULL); + if (!*mutex) + return 0; + { + int const ret = pthread_mutex_destroy(*mutex); + ZSTD_free(*mutex); + return ret; + } +} + +int ZSTD_pthread_cond_init(ZSTD_pthread_cond_t* cond, pthread_condattr_t const* attr) +{ + assert(cond != NULL); + *cond = (pthread_cond_t*)ZSTD_malloc(sizeof(pthread_cond_t)); + if (!*cond) + return 1; + return pthread_cond_init(*cond, attr); +} + +int ZSTD_pthread_cond_destroy(ZSTD_pthread_cond_t* cond) +{ + assert(cond != NULL); + if (!*cond) + return 0; + { + int const ret = pthread_cond_destroy(*cond); + ZSTD_free(*cond); + return ret; + } +} + +#endif +/**** ended inlining common/threading.c ****/ +/**** start inlining common/pool.c ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + + +/* ====== Dependencies ======= */ +/**** start inlining ../common/allocations.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +/* This file provides custom allocation primitives + */ + +#define ZSTD_DEPS_NEED_MALLOC +/**** skipping file: zstd_deps.h ****/ + +/**** skipping file: compiler.h ****/ +#define ZSTD_STATIC_LINKING_ONLY +/**** start inlining ../zstd.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ +#if defined (__cplusplus) +extern "C" { +#endif + +#ifndef ZSTD_H_235446 +#define ZSTD_H_235446 + +/* ====== Dependencies ======*/ +#include /* INT_MAX */ +#include /* size_t */ + + +/* ===== ZSTDLIB_API : control library symbols visibility ===== */ +#ifndef ZSTDLIB_VISIBLE + /* Backwards compatibility with old macro name */ +# ifdef ZSTDLIB_VISIBILITY +# define ZSTDLIB_VISIBLE ZSTDLIB_VISIBILITY +# elif defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__MINGW32__) +# define ZSTDLIB_VISIBLE __attribute__ ((visibility ("default"))) +# else +# define ZSTDLIB_VISIBLE +# endif +#endif + +#ifndef ZSTDLIB_HIDDEN +# if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__MINGW32__) +# define ZSTDLIB_HIDDEN __attribute__ ((visibility ("hidden"))) +# else +# define ZSTDLIB_HIDDEN +# endif +#endif + +#if defined(ZSTD_DLL_EXPORT) && (ZSTD_DLL_EXPORT==1) +# define ZSTDLIB_API __declspec(dllexport) ZSTDLIB_VISIBLE +#elif defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1) +# define ZSTDLIB_API __declspec(dllimport) ZSTDLIB_VISIBLE /* It isn't required but allows to generate better code, saving a function pointer load from the IAT and an indirect jump.*/ +#else +# define ZSTDLIB_API ZSTDLIB_VISIBLE +#endif + +/* Deprecation warnings : + * Should these warnings be a problem, it is generally possible to disable them, + * typically with -Wno-deprecated-declarations for gcc or _CRT_SECURE_NO_WARNINGS in Visual. + * Otherwise, it's also possible to define ZSTD_DISABLE_DEPRECATE_WARNINGS. + */ +#ifdef ZSTD_DISABLE_DEPRECATE_WARNINGS +# define ZSTD_DEPRECATED(message) /* disable deprecation warnings */ +#else +# if defined (__cplusplus) && (__cplusplus >= 201402) /* C++14 or greater */ +# define ZSTD_DEPRECATED(message) [[deprecated(message)]] +# elif (defined(GNUC) && (GNUC > 4 || (GNUC == 4 && GNUC_MINOR >= 5))) || defined(__clang__) +# define ZSTD_DEPRECATED(message) __attribute__((deprecated(message))) +# elif defined(__GNUC__) && (__GNUC__ >= 3) +# define ZSTD_DEPRECATED(message) __attribute__((deprecated)) +# elif defined(_MSC_VER) +# define ZSTD_DEPRECATED(message) __declspec(deprecated(message)) +# else +# pragma message("WARNING: You need to implement ZSTD_DEPRECATED for this compiler") +# define ZSTD_DEPRECATED(message) +# endif +#endif /* ZSTD_DISABLE_DEPRECATE_WARNINGS */ + + +/******************************************************************************* + Introduction + + zstd, short for Zstandard, is a fast lossless compression algorithm, targeting + real-time compression scenarios at zlib-level and better compression ratios. + The zstd compression library provides in-memory compression and decompression + functions. + + The library supports regular compression levels from 1 up to ZSTD_maxCLevel(), + which is currently 22. Levels >= 20, labeled `--ultra`, should be used with + caution, as they require more memory. The library also offers negative + compression levels, which extend the range of speed vs. ratio preferences. + The lower the level, the faster the speed (at the cost of compression). + + Compression can be done in: + - a single step (described as Simple API) + - a single step, reusing a context (described as Explicit context) + - unbounded multiple steps (described as Streaming compression) + + The compression ratio achievable on small data can be highly improved using + a dictionary. Dictionary compression can be performed in: + - a single step (described as Simple dictionary API) + - a single step, reusing a dictionary (described as Bulk-processing + dictionary API) + + Advanced experimental functions can be accessed using + `#define ZSTD_STATIC_LINKING_ONLY` before including zstd.h. + + Advanced experimental APIs should never be used with a dynamically-linked + library. They are not "stable"; their definitions or signatures may change in + the future. Only static linking is allowed. +*******************************************************************************/ + +/*------ Version ------*/ +#define ZSTD_VERSION_MAJOR 1 +#define ZSTD_VERSION_MINOR 5 +#define ZSTD_VERSION_RELEASE 6 +#define ZSTD_VERSION_NUMBER (ZSTD_VERSION_MAJOR *100*100 + ZSTD_VERSION_MINOR *100 + ZSTD_VERSION_RELEASE) + +/*! ZSTD_versionNumber() : + * Return runtime library version, the value is (MAJOR*100*100 + MINOR*100 + RELEASE). */ +ZSTDLIB_API unsigned ZSTD_versionNumber(void); + +#define ZSTD_LIB_VERSION ZSTD_VERSION_MAJOR.ZSTD_VERSION_MINOR.ZSTD_VERSION_RELEASE +#define ZSTD_QUOTE(str) #str +#define ZSTD_EXPAND_AND_QUOTE(str) ZSTD_QUOTE(str) +#define ZSTD_VERSION_STRING ZSTD_EXPAND_AND_QUOTE(ZSTD_LIB_VERSION) + +/*! ZSTD_versionString() : + * Return runtime library version, like "1.4.5". Requires v1.3.0+. */ +ZSTDLIB_API const char* ZSTD_versionString(void); + +/* ************************************* + * Default constant + ***************************************/ +#ifndef ZSTD_CLEVEL_DEFAULT +# define ZSTD_CLEVEL_DEFAULT 3 +#endif + +/* ************************************* + * Constants + ***************************************/ + +/* All magic numbers are supposed read/written to/from files/memory using little-endian convention */ +#define ZSTD_MAGICNUMBER 0xFD2FB528 /* valid since v0.8.0 */ +#define ZSTD_MAGIC_DICTIONARY 0xEC30A437 /* valid since v0.7.0 */ +#define ZSTD_MAGIC_SKIPPABLE_START 0x184D2A50 /* all 16 values, from 0x184D2A50 to 0x184D2A5F, signal the beginning of a skippable frame */ +#define ZSTD_MAGIC_SKIPPABLE_MASK 0xFFFFFFF0 + +#define ZSTD_BLOCKSIZELOG_MAX 17 +#define ZSTD_BLOCKSIZE_MAX (1<= ZSTD_compressBound(srcSize)` guarantees that zstd will have + * enough space to successfully compress the data. + * @return : compressed size written into `dst` (<= `dstCapacity), + * or an error code if it fails (which can be tested using ZSTD_isError()). */ +ZSTDLIB_API size_t ZSTD_compress( void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + int compressionLevel); + +/*! ZSTD_decompress() : + * `compressedSize` : must be the _exact_ size of some number of compressed and/or skippable frames. + * `dstCapacity` is an upper bound of originalSize to regenerate. + * If user cannot imply a maximum upper bound, it's better to use streaming mode to decompress data. + * @return : the number of bytes decompressed into `dst` (<= `dstCapacity`), + * or an errorCode if it fails (which can be tested using ZSTD_isError()). */ +ZSTDLIB_API size_t ZSTD_decompress( void* dst, size_t dstCapacity, + const void* src, size_t compressedSize); + +/*! ZSTD_getFrameContentSize() : requires v1.3.0+ + * `src` should point to the start of a ZSTD encoded frame. + * `srcSize` must be at least as large as the frame header. + * hint : any size >= `ZSTD_frameHeaderSize_max` is large enough. + * @return : - decompressed size of `src` frame content, if known + * - ZSTD_CONTENTSIZE_UNKNOWN if the size cannot be determined + * - ZSTD_CONTENTSIZE_ERROR if an error occurred (e.g. invalid magic number, srcSize too small) + * note 1 : a 0 return value means the frame is valid but "empty". + * note 2 : decompressed size is an optional field, it may not be present, typically in streaming mode. + * When `return==ZSTD_CONTENTSIZE_UNKNOWN`, data to decompress could be any size. + * In which case, it's necessary to use streaming mode to decompress data. + * Optionally, application can rely on some implicit limit, + * as ZSTD_decompress() only needs an upper bound of decompressed size. + * (For example, data could be necessarily cut into blocks <= 16 KB). + * note 3 : decompressed size is always present when compression is completed using single-pass functions, + * such as ZSTD_compress(), ZSTD_compressCCtx() ZSTD_compress_usingDict() or ZSTD_compress_usingCDict(). + * note 4 : decompressed size can be very large (64-bits value), + * potentially larger than what local system can handle as a single memory segment. + * In which case, it's necessary to use streaming mode to decompress data. + * note 5 : If source is untrusted, decompressed size could be wrong or intentionally modified. + * Always ensure return value fits within application's authorized limits. + * Each application can set its own limits. + * note 6 : This function replaces ZSTD_getDecompressedSize() */ +#define ZSTD_CONTENTSIZE_UNKNOWN (0ULL - 1) +#define ZSTD_CONTENTSIZE_ERROR (0ULL - 2) +ZSTDLIB_API unsigned long long ZSTD_getFrameContentSize(const void *src, size_t srcSize); + +/*! ZSTD_getDecompressedSize() : + * NOTE: This function is now obsolete, in favor of ZSTD_getFrameContentSize(). + * Both functions work the same way, but ZSTD_getDecompressedSize() blends + * "empty", "unknown" and "error" results to the same return value (0), + * while ZSTD_getFrameContentSize() gives them separate return values. + * @return : decompressed size of `src` frame content _if known and not empty_, 0 otherwise. */ +ZSTD_DEPRECATED("Replaced by ZSTD_getFrameContentSize") +ZSTDLIB_API +unsigned long long ZSTD_getDecompressedSize(const void* src, size_t srcSize); + +/*! ZSTD_findFrameCompressedSize() : Requires v1.4.0+ + * `src` should point to the start of a ZSTD frame or skippable frame. + * `srcSize` must be >= first frame size + * @return : the compressed size of the first frame starting at `src`, + * suitable to pass as `srcSize` to `ZSTD_decompress` or similar, + * or an error code if input is invalid */ +ZSTDLIB_API size_t ZSTD_findFrameCompressedSize(const void* src, size_t srcSize); + + +/*====== Helper functions ======*/ +/* ZSTD_compressBound() : + * maximum compressed size in worst case single-pass scenario. + * When invoking `ZSTD_compress()` or any other one-pass compression function, + * it's recommended to provide @dstCapacity >= ZSTD_compressBound(srcSize) + * as it eliminates one potential failure scenario, + * aka not enough room in dst buffer to write the compressed frame. + * Note : ZSTD_compressBound() itself can fail, if @srcSize > ZSTD_MAX_INPUT_SIZE . + * In which case, ZSTD_compressBound() will return an error code + * which can be tested using ZSTD_isError(). + * + * ZSTD_COMPRESSBOUND() : + * same as ZSTD_compressBound(), but as a macro. + * It can be used to produce constants, which can be useful for static allocation, + * for example to size a static array on stack. + * Will produce constant value 0 if srcSize too large. + */ +#define ZSTD_MAX_INPUT_SIZE ((sizeof(size_t)==8) ? 0xFF00FF00FF00FF00ULL : 0xFF00FF00U) +#define ZSTD_COMPRESSBOUND(srcSize) (((size_t)(srcSize) >= ZSTD_MAX_INPUT_SIZE) ? 0 : (srcSize) + ((srcSize)>>8) + (((srcSize) < (128<<10)) ? (((128<<10) - (srcSize)) >> 11) /* margin, from 64 to 0 */ : 0)) /* this formula ensures that bound(A) + bound(B) <= bound(A+B) as long as A and B >= 128 KB */ +ZSTDLIB_API size_t ZSTD_compressBound(size_t srcSize); /*!< maximum compressed size in worst case single-pass scenario */ +/* ZSTD_isError() : + * Most ZSTD_* functions returning a size_t value can be tested for error, + * using ZSTD_isError(). + * @return 1 if error, 0 otherwise + */ +ZSTDLIB_API unsigned ZSTD_isError(size_t code); /*!< tells if a `size_t` function result is an error code */ +ZSTDLIB_API const char* ZSTD_getErrorName(size_t code); /*!< provides readable string from an error code */ +ZSTDLIB_API int ZSTD_minCLevel(void); /*!< minimum negative compression level allowed, requires v1.4.0+ */ +ZSTDLIB_API int ZSTD_maxCLevel(void); /*!< maximum compression level available */ +ZSTDLIB_API int ZSTD_defaultCLevel(void); /*!< default compression level, specified by ZSTD_CLEVEL_DEFAULT, requires v1.5.0+ */ + + +/*************************************** +* Explicit context +***************************************/ +/*= Compression context + * When compressing many times, + * it is recommended to allocate a context just once, + * and reuse it for each successive compression operation. + * This will make workload friendlier for system's memory. + * Note : re-using context is just a speed / resource optimization. + * It doesn't change the compression ratio, which remains identical. + * Note 2 : In multi-threaded environments, + * use one different context per thread for parallel execution. + */ +typedef struct ZSTD_CCtx_s ZSTD_CCtx; +ZSTDLIB_API ZSTD_CCtx* ZSTD_createCCtx(void); +ZSTDLIB_API size_t ZSTD_freeCCtx(ZSTD_CCtx* cctx); /* accept NULL pointer */ + +/*! ZSTD_compressCCtx() : + * Same as ZSTD_compress(), using an explicit ZSTD_CCtx. + * Important : in order to mirror `ZSTD_compress()` behavior, + * this function compresses at the requested compression level, + * __ignoring any other advanced parameter__ . + * If any advanced parameter was set using the advanced API, + * they will all be reset. Only `compressionLevel` remains. + */ +ZSTDLIB_API size_t ZSTD_compressCCtx(ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + int compressionLevel); + +/*= Decompression context + * When decompressing many times, + * it is recommended to allocate a context only once, + * and reuse it for each successive compression operation. + * This will make workload friendlier for system's memory. + * Use one context per thread for parallel execution. */ +typedef struct ZSTD_DCtx_s ZSTD_DCtx; +ZSTDLIB_API ZSTD_DCtx* ZSTD_createDCtx(void); +ZSTDLIB_API size_t ZSTD_freeDCtx(ZSTD_DCtx* dctx); /* accept NULL pointer */ + +/*! ZSTD_decompressDCtx() : + * Same as ZSTD_decompress(), + * requires an allocated ZSTD_DCtx. + * Compatible with sticky parameters (see below). + */ +ZSTDLIB_API size_t ZSTD_decompressDCtx(ZSTD_DCtx* dctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize); + + +/********************************************* +* Advanced compression API (Requires v1.4.0+) +**********************************************/ + +/* API design : + * Parameters are pushed one by one into an existing context, + * using ZSTD_CCtx_set*() functions. + * Pushed parameters are sticky : they are valid for next compressed frame, and any subsequent frame. + * "sticky" parameters are applicable to `ZSTD_compress2()` and `ZSTD_compressStream*()` ! + * __They do not apply to one-shot variants such as ZSTD_compressCCtx()__ . + * + * It's possible to reset all parameters to "default" using ZSTD_CCtx_reset(). + * + * This API supersedes all other "advanced" API entry points in the experimental section. + * In the future, we expect to remove API entry points from experimental which are redundant with this API. + */ + + +/* Compression strategies, listed from fastest to strongest */ +typedef enum { ZSTD_fast=1, + ZSTD_dfast=2, + ZSTD_greedy=3, + ZSTD_lazy=4, + ZSTD_lazy2=5, + ZSTD_btlazy2=6, + ZSTD_btopt=7, + ZSTD_btultra=8, + ZSTD_btultra2=9 + /* note : new strategies _might_ be added in the future. + Only the order (from fast to strong) is guaranteed */ +} ZSTD_strategy; + +typedef enum { + + /* compression parameters + * Note: When compressing with a ZSTD_CDict these parameters are superseded + * by the parameters used to construct the ZSTD_CDict. + * See ZSTD_CCtx_refCDict() for more info (superseded-by-cdict). */ + ZSTD_c_compressionLevel=100, /* Set compression parameters according to pre-defined cLevel table. + * Note that exact compression parameters are dynamically determined, + * depending on both compression level and srcSize (when known). + * Default level is ZSTD_CLEVEL_DEFAULT==3. + * Special: value 0 means default, which is controlled by ZSTD_CLEVEL_DEFAULT. + * Note 1 : it's possible to pass a negative compression level. + * Note 2 : setting a level does not automatically set all other compression parameters + * to default. Setting this will however eventually dynamically impact the compression + * parameters which have not been manually set. The manually set + * ones will 'stick'. */ + /* Advanced compression parameters : + * It's possible to pin down compression parameters to some specific values. + * In which case, these values are no longer dynamically selected by the compressor */ + ZSTD_c_windowLog=101, /* Maximum allowed back-reference distance, expressed as power of 2. + * This will set a memory budget for streaming decompression, + * with larger values requiring more memory + * and typically compressing more. + * Must be clamped between ZSTD_WINDOWLOG_MIN and ZSTD_WINDOWLOG_MAX. + * Special: value 0 means "use default windowLog". + * Note: Using a windowLog greater than ZSTD_WINDOWLOG_LIMIT_DEFAULT + * requires explicitly allowing such size at streaming decompression stage. */ + ZSTD_c_hashLog=102, /* Size of the initial probe table, as a power of 2. + * Resulting memory usage is (1 << (hashLog+2)). + * Must be clamped between ZSTD_HASHLOG_MIN and ZSTD_HASHLOG_MAX. + * Larger tables improve compression ratio of strategies <= dFast, + * and improve speed of strategies > dFast. + * Special: value 0 means "use default hashLog". */ + ZSTD_c_chainLog=103, /* Size of the multi-probe search table, as a power of 2. + * Resulting memory usage is (1 << (chainLog+2)). + * Must be clamped between ZSTD_CHAINLOG_MIN and ZSTD_CHAINLOG_MAX. + * Larger tables result in better and slower compression. + * This parameter is useless for "fast" strategy. + * It's still useful when using "dfast" strategy, + * in which case it defines a secondary probe table. + * Special: value 0 means "use default chainLog". */ + ZSTD_c_searchLog=104, /* Number of search attempts, as a power of 2. + * More attempts result in better and slower compression. + * This parameter is useless for "fast" and "dFast" strategies. + * Special: value 0 means "use default searchLog". */ + ZSTD_c_minMatch=105, /* Minimum size of searched matches. + * Note that Zstandard can still find matches of smaller size, + * it just tweaks its search algorithm to look for this size and larger. + * Larger values increase compression and decompression speed, but decrease ratio. + * Must be clamped between ZSTD_MINMATCH_MIN and ZSTD_MINMATCH_MAX. + * Note that currently, for all strategies < btopt, effective minimum is 4. + * , for all strategies > fast, effective maximum is 6. + * Special: value 0 means "use default minMatchLength". */ + ZSTD_c_targetLength=106, /* Impact of this field depends on strategy. + * For strategies btopt, btultra & btultra2: + * Length of Match considered "good enough" to stop search. + * Larger values make compression stronger, and slower. + * For strategy fast: + * Distance between match sampling. + * Larger values make compression faster, and weaker. + * Special: value 0 means "use default targetLength". */ + ZSTD_c_strategy=107, /* See ZSTD_strategy enum definition. + * The higher the value of selected strategy, the more complex it is, + * resulting in stronger and slower compression. + * Special: value 0 means "use default strategy". */ + + ZSTD_c_targetCBlockSize=130, /* v1.5.6+ + * Attempts to fit compressed block size into approximatively targetCBlockSize. + * Bound by ZSTD_TARGETCBLOCKSIZE_MIN and ZSTD_TARGETCBLOCKSIZE_MAX. + * Note that it's not a guarantee, just a convergence target (default:0). + * No target when targetCBlockSize == 0. + * This is helpful in low bandwidth streaming environments to improve end-to-end latency, + * when a client can make use of partial documents (a prominent example being Chrome). + * Note: this parameter is stable since v1.5.6. + * It was present as an experimental parameter in earlier versions, + * but it's not recommended using it with earlier library versions + * due to massive performance regressions. + */ + /* LDM mode parameters */ + ZSTD_c_enableLongDistanceMatching=160, /* Enable long distance matching. + * This parameter is designed to improve compression ratio + * for large inputs, by finding large matches at long distance. + * It increases memory usage and window size. + * Note: enabling this parameter increases default ZSTD_c_windowLog to 128 MB + * except when expressly set to a different value. + * Note: will be enabled by default if ZSTD_c_windowLog >= 128 MB and + * compression strategy >= ZSTD_btopt (== compression level 16+) */ + ZSTD_c_ldmHashLog=161, /* Size of the table for long distance matching, as a power of 2. + * Larger values increase memory usage and compression ratio, + * but decrease compression speed. + * Must be clamped between ZSTD_HASHLOG_MIN and ZSTD_HASHLOG_MAX + * default: windowlog - 7. + * Special: value 0 means "automatically determine hashlog". */ + ZSTD_c_ldmMinMatch=162, /* Minimum match size for long distance matcher. + * Larger/too small values usually decrease compression ratio. + * Must be clamped between ZSTD_LDM_MINMATCH_MIN and ZSTD_LDM_MINMATCH_MAX. + * Special: value 0 means "use default value" (default: 64). */ + ZSTD_c_ldmBucketSizeLog=163, /* Log size of each bucket in the LDM hash table for collision resolution. + * Larger values improve collision resolution but decrease compression speed. + * The maximum value is ZSTD_LDM_BUCKETSIZELOG_MAX. + * Special: value 0 means "use default value" (default: 3). */ + ZSTD_c_ldmHashRateLog=164, /* Frequency of inserting/looking up entries into the LDM hash table. + * Must be clamped between 0 and (ZSTD_WINDOWLOG_MAX - ZSTD_HASHLOG_MIN). + * Default is MAX(0, (windowLog - ldmHashLog)), optimizing hash table usage. + * Larger values improve compression speed. + * Deviating far from default value will likely result in a compression ratio decrease. + * Special: value 0 means "automatically determine hashRateLog". */ + + /* frame parameters */ + ZSTD_c_contentSizeFlag=200, /* Content size will be written into frame header _whenever known_ (default:1) + * Content size must be known at the beginning of compression. + * This is automatically the case when using ZSTD_compress2(), + * For streaming scenarios, content size must be provided with ZSTD_CCtx_setPledgedSrcSize() */ + ZSTD_c_checksumFlag=201, /* A 32-bits checksum of content is written at end of frame (default:0) */ + ZSTD_c_dictIDFlag=202, /* When applicable, dictionary's ID is written into frame header (default:1) */ + + /* multi-threading parameters */ + /* These parameters are only active if multi-threading is enabled (compiled with build macro ZSTD_MULTITHREAD). + * Otherwise, trying to set any other value than default (0) will be a no-op and return an error. + * In a situation where it's unknown if the linked library supports multi-threading or not, + * setting ZSTD_c_nbWorkers to any value >= 1 and consulting the return value provides a quick way to check this property. + */ + ZSTD_c_nbWorkers=400, /* Select how many threads will be spawned to compress in parallel. + * When nbWorkers >= 1, triggers asynchronous mode when invoking ZSTD_compressStream*() : + * ZSTD_compressStream*() consumes input and flush output if possible, but immediately gives back control to caller, + * while compression is performed in parallel, within worker thread(s). + * (note : a strong exception to this rule is when first invocation of ZSTD_compressStream2() sets ZSTD_e_end : + * in which case, ZSTD_compressStream2() delegates to ZSTD_compress2(), which is always a blocking call). + * More workers improve speed, but also increase memory usage. + * Default value is `0`, aka "single-threaded mode" : no worker is spawned, + * compression is performed inside Caller's thread, and all invocations are blocking */ + ZSTD_c_jobSize=401, /* Size of a compression job. This value is enforced only when nbWorkers >= 1. + * Each compression job is completed in parallel, so this value can indirectly impact the nb of active threads. + * 0 means default, which is dynamically determined based on compression parameters. + * Job size must be a minimum of overlap size, or ZSTDMT_JOBSIZE_MIN (= 512 KB), whichever is largest. + * The minimum size is automatically and transparently enforced. */ + ZSTD_c_overlapLog=402, /* Control the overlap size, as a fraction of window size. + * The overlap size is an amount of data reloaded from previous job at the beginning of a new job. + * It helps preserve compression ratio, while each job is compressed in parallel. + * This value is enforced only when nbWorkers >= 1. + * Larger values increase compression ratio, but decrease speed. + * Possible values range from 0 to 9 : + * - 0 means "default" : value will be determined by the library, depending on strategy + * - 1 means "no overlap" + * - 9 means "full overlap", using a full window size. + * Each intermediate rank increases/decreases load size by a factor 2 : + * 9: full window; 8: w/2; 7: w/4; 6: w/8; 5:w/16; 4: w/32; 3:w/64; 2:w/128; 1:no overlap; 0:default + * default value varies between 6 and 9, depending on strategy */ + + /* note : additional experimental parameters are also available + * within the experimental section of the API. + * At the time of this writing, they include : + * ZSTD_c_rsyncable + * ZSTD_c_format + * ZSTD_c_forceMaxWindow + * ZSTD_c_forceAttachDict + * ZSTD_c_literalCompressionMode + * ZSTD_c_srcSizeHint + * ZSTD_c_enableDedicatedDictSearch + * ZSTD_c_stableInBuffer + * ZSTD_c_stableOutBuffer + * ZSTD_c_blockDelimiters + * ZSTD_c_validateSequences + * ZSTD_c_useBlockSplitter + * ZSTD_c_useRowMatchFinder + * ZSTD_c_prefetchCDictTables + * ZSTD_c_enableSeqProducerFallback + * ZSTD_c_maxBlockSize + * Because they are not stable, it's necessary to define ZSTD_STATIC_LINKING_ONLY to access them. + * note : never ever use experimentalParam? names directly; + * also, the enums values themselves are unstable and can still change. + */ + ZSTD_c_experimentalParam1=500, + ZSTD_c_experimentalParam2=10, + ZSTD_c_experimentalParam3=1000, + ZSTD_c_experimentalParam4=1001, + ZSTD_c_experimentalParam5=1002, + /* was ZSTD_c_experimentalParam6=1003; is now ZSTD_c_targetCBlockSize */ + ZSTD_c_experimentalParam7=1004, + ZSTD_c_experimentalParam8=1005, + ZSTD_c_experimentalParam9=1006, + ZSTD_c_experimentalParam10=1007, + ZSTD_c_experimentalParam11=1008, + ZSTD_c_experimentalParam12=1009, + ZSTD_c_experimentalParam13=1010, + ZSTD_c_experimentalParam14=1011, + ZSTD_c_experimentalParam15=1012, + ZSTD_c_experimentalParam16=1013, + ZSTD_c_experimentalParam17=1014, + ZSTD_c_experimentalParam18=1015, + ZSTD_c_experimentalParam19=1016 +} ZSTD_cParameter; + +typedef struct { + size_t error; + int lowerBound; + int upperBound; +} ZSTD_bounds; + +/*! ZSTD_cParam_getBounds() : + * All parameters must belong to an interval with lower and upper bounds, + * otherwise they will either trigger an error or be automatically clamped. + * @return : a structure, ZSTD_bounds, which contains + * - an error status field, which must be tested using ZSTD_isError() + * - lower and upper bounds, both inclusive + */ +ZSTDLIB_API ZSTD_bounds ZSTD_cParam_getBounds(ZSTD_cParameter cParam); + +/*! ZSTD_CCtx_setParameter() : + * Set one compression parameter, selected by enum ZSTD_cParameter. + * All parameters have valid bounds. Bounds can be queried using ZSTD_cParam_getBounds(). + * Providing a value beyond bound will either clamp it, or trigger an error (depending on parameter). + * Setting a parameter is generally only possible during frame initialization (before starting compression). + * Exception : when using multi-threading mode (nbWorkers >= 1), + * the following parameters can be updated _during_ compression (within same frame): + * => compressionLevel, hashLog, chainLog, searchLog, minMatch, targetLength and strategy. + * new parameters will be active for next job only (after a flush()). + * @return : an error code (which can be tested using ZSTD_isError()). + */ +ZSTDLIB_API size_t ZSTD_CCtx_setParameter(ZSTD_CCtx* cctx, ZSTD_cParameter param, int value); + +/*! ZSTD_CCtx_setPledgedSrcSize() : + * Total input data size to be compressed as a single frame. + * Value will be written in frame header, unless if explicitly forbidden using ZSTD_c_contentSizeFlag. + * This value will also be controlled at end of frame, and trigger an error if not respected. + * @result : 0, or an error code (which can be tested with ZSTD_isError()). + * Note 1 : pledgedSrcSize==0 actually means zero, aka an empty frame. + * In order to mean "unknown content size", pass constant ZSTD_CONTENTSIZE_UNKNOWN. + * ZSTD_CONTENTSIZE_UNKNOWN is default value for any new frame. + * Note 2 : pledgedSrcSize is only valid once, for the next frame. + * It's discarded at the end of the frame, and replaced by ZSTD_CONTENTSIZE_UNKNOWN. + * Note 3 : Whenever all input data is provided and consumed in a single round, + * for example with ZSTD_compress2(), + * or invoking immediately ZSTD_compressStream2(,,,ZSTD_e_end), + * this value is automatically overridden by srcSize instead. + */ +ZSTDLIB_API size_t ZSTD_CCtx_setPledgedSrcSize(ZSTD_CCtx* cctx, unsigned long long pledgedSrcSize); + +typedef enum { + ZSTD_reset_session_only = 1, + ZSTD_reset_parameters = 2, + ZSTD_reset_session_and_parameters = 3 +} ZSTD_ResetDirective; + +/*! ZSTD_CCtx_reset() : + * There are 2 different things that can be reset, independently or jointly : + * - The session : will stop compressing current frame, and make CCtx ready to start a new one. + * Useful after an error, or to interrupt any ongoing compression. + * Any internal data not yet flushed is cancelled. + * Compression parameters and dictionary remain unchanged. + * They will be used to compress next frame. + * Resetting session never fails. + * - The parameters : changes all parameters back to "default". + * This also removes any reference to any dictionary or external sequence producer. + * Parameters can only be changed between 2 sessions (i.e. no compression is currently ongoing) + * otherwise the reset fails, and function returns an error value (which can be tested using ZSTD_isError()) + * - Both : similar to resetting the session, followed by resetting parameters. + */ +ZSTDLIB_API size_t ZSTD_CCtx_reset(ZSTD_CCtx* cctx, ZSTD_ResetDirective reset); + +/*! ZSTD_compress2() : + * Behave the same as ZSTD_compressCCtx(), but compression parameters are set using the advanced API. + * (note that this entry point doesn't even expose a compression level parameter). + * ZSTD_compress2() always starts a new frame. + * Should cctx hold data from a previously unfinished frame, everything about it is forgotten. + * - Compression parameters are pushed into CCtx before starting compression, using ZSTD_CCtx_set*() + * - The function is always blocking, returns when compression is completed. + * NOTE: Providing `dstCapacity >= ZSTD_compressBound(srcSize)` guarantees that zstd will have + * enough space to successfully compress the data, though it is possible it fails for other reasons. + * @return : compressed size written into `dst` (<= `dstCapacity), + * or an error code if it fails (which can be tested using ZSTD_isError()). + */ +ZSTDLIB_API size_t ZSTD_compress2( ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize); + + +/*********************************************** +* Advanced decompression API (Requires v1.4.0+) +************************************************/ + +/* The advanced API pushes parameters one by one into an existing DCtx context. + * Parameters are sticky, and remain valid for all following frames + * using the same DCtx context. + * It's possible to reset parameters to default values using ZSTD_DCtx_reset(). + * Note : This API is compatible with existing ZSTD_decompressDCtx() and ZSTD_decompressStream(). + * Therefore, no new decompression function is necessary. + */ + +typedef enum { + + ZSTD_d_windowLogMax=100, /* Select a size limit (in power of 2) beyond which + * the streaming API will refuse to allocate memory buffer + * in order to protect the host from unreasonable memory requirements. + * This parameter is only useful in streaming mode, since no internal buffer is allocated in single-pass mode. + * By default, a decompression context accepts window sizes <= (1 << ZSTD_WINDOWLOG_LIMIT_DEFAULT). + * Special: value 0 means "use default maximum windowLog". */ + + /* note : additional experimental parameters are also available + * within the experimental section of the API. + * At the time of this writing, they include : + * ZSTD_d_format + * ZSTD_d_stableOutBuffer + * ZSTD_d_forceIgnoreChecksum + * ZSTD_d_refMultipleDDicts + * ZSTD_d_disableHuffmanAssembly + * ZSTD_d_maxBlockSize + * Because they are not stable, it's necessary to define ZSTD_STATIC_LINKING_ONLY to access them. + * note : never ever use experimentalParam? names directly + */ + ZSTD_d_experimentalParam1=1000, + ZSTD_d_experimentalParam2=1001, + ZSTD_d_experimentalParam3=1002, + ZSTD_d_experimentalParam4=1003, + ZSTD_d_experimentalParam5=1004, + ZSTD_d_experimentalParam6=1005 + +} ZSTD_dParameter; + +/*! ZSTD_dParam_getBounds() : + * All parameters must belong to an interval with lower and upper bounds, + * otherwise they will either trigger an error or be automatically clamped. + * @return : a structure, ZSTD_bounds, which contains + * - an error status field, which must be tested using ZSTD_isError() + * - both lower and upper bounds, inclusive + */ +ZSTDLIB_API ZSTD_bounds ZSTD_dParam_getBounds(ZSTD_dParameter dParam); + +/*! ZSTD_DCtx_setParameter() : + * Set one compression parameter, selected by enum ZSTD_dParameter. + * All parameters have valid bounds. Bounds can be queried using ZSTD_dParam_getBounds(). + * Providing a value beyond bound will either clamp it, or trigger an error (depending on parameter). + * Setting a parameter is only possible during frame initialization (before starting decompression). + * @return : 0, or an error code (which can be tested using ZSTD_isError()). + */ +ZSTDLIB_API size_t ZSTD_DCtx_setParameter(ZSTD_DCtx* dctx, ZSTD_dParameter param, int value); + +/*! ZSTD_DCtx_reset() : + * Return a DCtx to clean state. + * Session and parameters can be reset jointly or separately. + * Parameters can only be reset when no active frame is being decompressed. + * @return : 0, or an error code, which can be tested with ZSTD_isError() + */ +ZSTDLIB_API size_t ZSTD_DCtx_reset(ZSTD_DCtx* dctx, ZSTD_ResetDirective reset); + + +/**************************** +* Streaming +****************************/ + +typedef struct ZSTD_inBuffer_s { + const void* src; /**< start of input buffer */ + size_t size; /**< size of input buffer */ + size_t pos; /**< position where reading stopped. Will be updated. Necessarily 0 <= pos <= size */ +} ZSTD_inBuffer; + +typedef struct ZSTD_outBuffer_s { + void* dst; /**< start of output buffer */ + size_t size; /**< size of output buffer */ + size_t pos; /**< position where writing stopped. Will be updated. Necessarily 0 <= pos <= size */ +} ZSTD_outBuffer; + + + +/*-*********************************************************************** +* Streaming compression - HowTo +* +* A ZSTD_CStream object is required to track streaming operation. +* Use ZSTD_createCStream() and ZSTD_freeCStream() to create/release resources. +* ZSTD_CStream objects can be reused multiple times on consecutive compression operations. +* It is recommended to reuse ZSTD_CStream since it will play nicer with system's memory, by re-using already allocated memory. +* +* For parallel execution, use one separate ZSTD_CStream per thread. +* +* note : since v1.3.0, ZSTD_CStream and ZSTD_CCtx are the same thing. +* +* Parameters are sticky : when starting a new compression on the same context, +* it will reuse the same sticky parameters as previous compression session. +* When in doubt, it's recommended to fully initialize the context before usage. +* Use ZSTD_CCtx_reset() to reset the context and ZSTD_CCtx_setParameter(), +* ZSTD_CCtx_setPledgedSrcSize(), or ZSTD_CCtx_loadDictionary() and friends to +* set more specific parameters, the pledged source size, or load a dictionary. +* +* Use ZSTD_compressStream2() with ZSTD_e_continue as many times as necessary to +* consume input stream. The function will automatically update both `pos` +* fields within `input` and `output`. +* Note that the function may not consume the entire input, for example, because +* the output buffer is already full, in which case `input.pos < input.size`. +* The caller must check if input has been entirely consumed. +* If not, the caller must make some room to receive more compressed data, +* and then present again remaining input data. +* note: ZSTD_e_continue is guaranteed to make some forward progress when called, +* but doesn't guarantee maximal forward progress. This is especially relevant +* when compressing with multiple threads. The call won't block if it can +* consume some input, but if it can't it will wait for some, but not all, +* output to be flushed. +* @return : provides a minimum amount of data remaining to be flushed from internal buffers +* or an error code, which can be tested using ZSTD_isError(). +* +* At any moment, it's possible to flush whatever data might remain stuck within internal buffer, +* using ZSTD_compressStream2() with ZSTD_e_flush. `output->pos` will be updated. +* Note that, if `output->size` is too small, a single invocation with ZSTD_e_flush might not be enough (return code > 0). +* In which case, make some room to receive more compressed data, and call again ZSTD_compressStream2() with ZSTD_e_flush. +* You must continue calling ZSTD_compressStream2() with ZSTD_e_flush until it returns 0, at which point you can change the +* operation. +* note: ZSTD_e_flush will flush as much output as possible, meaning when compressing with multiple threads, it will +* block until the flush is complete or the output buffer is full. +* @return : 0 if internal buffers are entirely flushed, +* >0 if some data still present within internal buffer (the value is minimal estimation of remaining size), +* or an error code, which can be tested using ZSTD_isError(). +* +* Calling ZSTD_compressStream2() with ZSTD_e_end instructs to finish a frame. +* It will perform a flush and write frame epilogue. +* The epilogue is required for decoders to consider a frame completed. +* flush operation is the same, and follows same rules as calling ZSTD_compressStream2() with ZSTD_e_flush. +* You must continue calling ZSTD_compressStream2() with ZSTD_e_end until it returns 0, at which point you are free to +* start a new frame. +* note: ZSTD_e_end will flush as much output as possible, meaning when compressing with multiple threads, it will +* block until the flush is complete or the output buffer is full. +* @return : 0 if frame fully completed and fully flushed, +* >0 if some data still present within internal buffer (the value is minimal estimation of remaining size), +* or an error code, which can be tested using ZSTD_isError(). +* +* *******************************************************************/ + +typedef ZSTD_CCtx ZSTD_CStream; /**< CCtx and CStream are now effectively same object (>= v1.3.0) */ + /* Continue to distinguish them for compatibility with older versions <= v1.2.0 */ +/*===== ZSTD_CStream management functions =====*/ +ZSTDLIB_API ZSTD_CStream* ZSTD_createCStream(void); +ZSTDLIB_API size_t ZSTD_freeCStream(ZSTD_CStream* zcs); /* accept NULL pointer */ + +/*===== Streaming compression functions =====*/ +typedef enum { + ZSTD_e_continue=0, /* collect more data, encoder decides when to output compressed result, for optimal compression ratio */ + ZSTD_e_flush=1, /* flush any data provided so far, + * it creates (at least) one new block, that can be decoded immediately on reception; + * frame will continue: any future data can still reference previously compressed data, improving compression. + * note : multithreaded compression will block to flush as much output as possible. */ + ZSTD_e_end=2 /* flush any remaining data _and_ close current frame. + * note that frame is only closed after compressed data is fully flushed (return value == 0). + * After that point, any additional data starts a new frame. + * note : each frame is independent (does not reference any content from previous frame). + : note : multithreaded compression will block to flush as much output as possible. */ +} ZSTD_EndDirective; + +/*! ZSTD_compressStream2() : Requires v1.4.0+ + * Behaves about the same as ZSTD_compressStream, with additional control on end directive. + * - Compression parameters are pushed into CCtx before starting compression, using ZSTD_CCtx_set*() + * - Compression parameters cannot be changed once compression is started (save a list of exceptions in multi-threading mode) + * - output->pos must be <= dstCapacity, input->pos must be <= srcSize + * - output->pos and input->pos will be updated. They are guaranteed to remain below their respective limit. + * - endOp must be a valid directive + * - When nbWorkers==0 (default), function is blocking : it completes its job before returning to caller. + * - When nbWorkers>=1, function is non-blocking : it copies a portion of input, distributes jobs to internal worker threads, flush to output whatever is available, + * and then immediately returns, just indicating that there is some data remaining to be flushed. + * The function nonetheless guarantees forward progress : it will return only after it reads or write at least 1+ byte. + * - Exception : if the first call requests a ZSTD_e_end directive and provides enough dstCapacity, the function delegates to ZSTD_compress2() which is always blocking. + * - @return provides a minimum amount of data remaining to be flushed from internal buffers + * or an error code, which can be tested using ZSTD_isError(). + * if @return != 0, flush is not fully completed, there is still some data left within internal buffers. + * This is useful for ZSTD_e_flush, since in this case more flushes are necessary to empty all buffers. + * For ZSTD_e_end, @return == 0 when internal buffers are fully flushed and frame is completed. + * - after a ZSTD_e_end directive, if internal buffer is not fully flushed (@return != 0), + * only ZSTD_e_end or ZSTD_e_flush operations are allowed. + * Before starting a new compression job, or changing compression parameters, + * it is required to fully flush internal buffers. + * - note: if an operation ends with an error, it may leave @cctx in an undefined state. + * Therefore, it's UB to invoke ZSTD_compressStream2() of ZSTD_compressStream() on such a state. + * In order to be re-employed after an error, a state must be reset, + * which can be done explicitly (ZSTD_CCtx_reset()), + * or is sometimes implied by methods starting a new compression job (ZSTD_initCStream(), ZSTD_compressCCtx()) + */ +ZSTDLIB_API size_t ZSTD_compressStream2( ZSTD_CCtx* cctx, + ZSTD_outBuffer* output, + ZSTD_inBuffer* input, + ZSTD_EndDirective endOp); + + +/* These buffer sizes are softly recommended. + * They are not required : ZSTD_compressStream*() happily accepts any buffer size, for both input and output. + * Respecting the recommended size just makes it a bit easier for ZSTD_compressStream*(), + * reducing the amount of memory shuffling and buffering, resulting in minor performance savings. + * + * However, note that these recommendations are from the perspective of a C caller program. + * If the streaming interface is invoked from some other language, + * especially managed ones such as Java or Go, through a foreign function interface such as jni or cgo, + * a major performance rule is to reduce crossing such interface to an absolute minimum. + * It's not rare that performance ends being spent more into the interface, rather than compression itself. + * In which cases, prefer using large buffers, as large as practical, + * for both input and output, to reduce the nb of roundtrips. + */ +ZSTDLIB_API size_t ZSTD_CStreamInSize(void); /**< recommended size for input buffer */ +ZSTDLIB_API size_t ZSTD_CStreamOutSize(void); /**< recommended size for output buffer. Guarantee to successfully flush at least one complete compressed block. */ + + +/* ***************************************************************************** + * This following is a legacy streaming API, available since v1.0+ . + * It can be replaced by ZSTD_CCtx_reset() and ZSTD_compressStream2(). + * It is redundant, but remains fully supported. + ******************************************************************************/ + +/*! + * Equivalent to: + * + * ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only); + * ZSTD_CCtx_refCDict(zcs, NULL); // clear the dictionary (if any) + * ZSTD_CCtx_setParameter(zcs, ZSTD_c_compressionLevel, compressionLevel); + * + * Note that ZSTD_initCStream() clears any previously set dictionary. Use the new API + * to compress with a dictionary. + */ +ZSTDLIB_API size_t ZSTD_initCStream(ZSTD_CStream* zcs, int compressionLevel); +/*! + * Alternative for ZSTD_compressStream2(zcs, output, input, ZSTD_e_continue). + * NOTE: The return value is different. ZSTD_compressStream() returns a hint for + * the next read size (if non-zero and not an error). ZSTD_compressStream2() + * returns the minimum nb of bytes left to flush (if non-zero and not an error). + */ +ZSTDLIB_API size_t ZSTD_compressStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output, ZSTD_inBuffer* input); +/*! Equivalent to ZSTD_compressStream2(zcs, output, &emptyInput, ZSTD_e_flush). */ +ZSTDLIB_API size_t ZSTD_flushStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output); +/*! Equivalent to ZSTD_compressStream2(zcs, output, &emptyInput, ZSTD_e_end). */ +ZSTDLIB_API size_t ZSTD_endStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output); + + +/*-*************************************************************************** +* Streaming decompression - HowTo +* +* A ZSTD_DStream object is required to track streaming operations. +* Use ZSTD_createDStream() and ZSTD_freeDStream() to create/release resources. +* ZSTD_DStream objects can be reused multiple times. +* +* Use ZSTD_initDStream() to start a new decompression operation. +* @return : recommended first input size +* Alternatively, use advanced API to set specific properties. +* +* Use ZSTD_decompressStream() repetitively to consume your input. +* The function will update both `pos` fields. +* If `input.pos < input.size`, some input has not been consumed. +* It's up to the caller to present again remaining data. +* The function tries to flush all data decoded immediately, respecting output buffer size. +* If `output.pos < output.size`, decoder has flushed everything it could. +* But if `output.pos == output.size`, there might be some data left within internal buffers., +* In which case, call ZSTD_decompressStream() again to flush whatever remains in the buffer. +* Note : with no additional input provided, amount of data flushed is necessarily <= ZSTD_BLOCKSIZE_MAX. +* @return : 0 when a frame is completely decoded and fully flushed, +* or an error code, which can be tested using ZSTD_isError(), +* or any other value > 0, which means there is still some decoding or flushing to do to complete current frame : +* the return value is a suggested next input size (just a hint for better latency) +* that will never request more than the remaining frame size. +* *******************************************************************************/ + +typedef ZSTD_DCtx ZSTD_DStream; /**< DCtx and DStream are now effectively same object (>= v1.3.0) */ + /* For compatibility with versions <= v1.2.0, prefer differentiating them. */ +/*===== ZSTD_DStream management functions =====*/ +ZSTDLIB_API ZSTD_DStream* ZSTD_createDStream(void); +ZSTDLIB_API size_t ZSTD_freeDStream(ZSTD_DStream* zds); /* accept NULL pointer */ + +/*===== Streaming decompression functions =====*/ + +/*! ZSTD_initDStream() : + * Initialize/reset DStream state for new decompression operation. + * Call before new decompression operation using same DStream. + * + * Note : This function is redundant with the advanced API and equivalent to: + * ZSTD_DCtx_reset(zds, ZSTD_reset_session_only); + * ZSTD_DCtx_refDDict(zds, NULL); + */ +ZSTDLIB_API size_t ZSTD_initDStream(ZSTD_DStream* zds); + +/*! ZSTD_decompressStream() : + * Streaming decompression function. + * Call repetitively to consume full input updating it as necessary. + * Function will update both input and output `pos` fields exposing current state via these fields: + * - `input.pos < input.size`, some input remaining and caller should provide remaining input + * on the next call. + * - `output.pos < output.size`, decoder finished and flushed all remaining buffers. + * - `output.pos == output.size`, potentially uncflushed data present in the internal buffers, + * call ZSTD_decompressStream() again to flush remaining data to output. + * Note : with no additional input, amount of data flushed <= ZSTD_BLOCKSIZE_MAX. + * + * @return : 0 when a frame is completely decoded and fully flushed, + * or an error code, which can be tested using ZSTD_isError(), + * or any other value > 0, which means there is some decoding or flushing to do to complete current frame. + * + * Note: when an operation returns with an error code, the @zds state may be left in undefined state. + * It's UB to invoke `ZSTD_decompressStream()` on such a state. + * In order to re-use such a state, it must be first reset, + * which can be done explicitly (`ZSTD_DCtx_reset()`), + * or is implied for operations starting some new decompression job (`ZSTD_initDStream`, `ZSTD_decompressDCtx()`, `ZSTD_decompress_usingDict()`) + */ +ZSTDLIB_API size_t ZSTD_decompressStream(ZSTD_DStream* zds, ZSTD_outBuffer* output, ZSTD_inBuffer* input); + +ZSTDLIB_API size_t ZSTD_DStreamInSize(void); /*!< recommended size for input buffer */ +ZSTDLIB_API size_t ZSTD_DStreamOutSize(void); /*!< recommended size for output buffer. Guarantee to successfully flush at least one complete block in all circumstances. */ + + +/************************** +* Simple dictionary API +***************************/ +/*! ZSTD_compress_usingDict() : + * Compression at an explicit compression level using a Dictionary. + * A dictionary can be any arbitrary data segment (also called a prefix), + * or a buffer with specified information (see zdict.h). + * Note : This function loads the dictionary, resulting in significant startup delay. + * It's intended for a dictionary used only once. + * Note 2 : When `dict == NULL || dictSize < 8` no dictionary is used. */ +ZSTDLIB_API size_t ZSTD_compress_usingDict(ZSTD_CCtx* ctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + const void* dict,size_t dictSize, + int compressionLevel); + +/*! ZSTD_decompress_usingDict() : + * Decompression using a known Dictionary. + * Dictionary must be identical to the one used during compression. + * Note : This function loads the dictionary, resulting in significant startup delay. + * It's intended for a dictionary used only once. + * Note : When `dict == NULL || dictSize < 8` no dictionary is used. */ +ZSTDLIB_API size_t ZSTD_decompress_usingDict(ZSTD_DCtx* dctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + const void* dict,size_t dictSize); + + +/*********************************** + * Bulk processing dictionary API + **********************************/ +typedef struct ZSTD_CDict_s ZSTD_CDict; + +/*! ZSTD_createCDict() : + * When compressing multiple messages or blocks using the same dictionary, + * it's recommended to digest the dictionary only once, since it's a costly operation. + * ZSTD_createCDict() will create a state from digesting a dictionary. + * The resulting state can be used for future compression operations with very limited startup cost. + * ZSTD_CDict can be created once and shared by multiple threads concurrently, since its usage is read-only. + * @dictBuffer can be released after ZSTD_CDict creation, because its content is copied within CDict. + * Note 1 : Consider experimental function `ZSTD_createCDict_byReference()` if you prefer to not duplicate @dictBuffer content. + * Note 2 : A ZSTD_CDict can be created from an empty @dictBuffer, + * in which case the only thing that it transports is the @compressionLevel. + * This can be useful in a pipeline featuring ZSTD_compress_usingCDict() exclusively, + * expecting a ZSTD_CDict parameter with any data, including those without a known dictionary. */ +ZSTDLIB_API ZSTD_CDict* ZSTD_createCDict(const void* dictBuffer, size_t dictSize, + int compressionLevel); + +/*! ZSTD_freeCDict() : + * Function frees memory allocated by ZSTD_createCDict(). + * If a NULL pointer is passed, no operation is performed. */ +ZSTDLIB_API size_t ZSTD_freeCDict(ZSTD_CDict* CDict); + +/*! ZSTD_compress_usingCDict() : + * Compression using a digested Dictionary. + * Recommended when same dictionary is used multiple times. + * Note : compression level is _decided at dictionary creation time_, + * and frame parameters are hardcoded (dictID=yes, contentSize=yes, checksum=no) */ +ZSTDLIB_API size_t ZSTD_compress_usingCDict(ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + const ZSTD_CDict* cdict); + + +typedef struct ZSTD_DDict_s ZSTD_DDict; + +/*! ZSTD_createDDict() : + * Create a digested dictionary, ready to start decompression operation without startup delay. + * dictBuffer can be released after DDict creation, as its content is copied inside DDict. */ +ZSTDLIB_API ZSTD_DDict* ZSTD_createDDict(const void* dictBuffer, size_t dictSize); + +/*! ZSTD_freeDDict() : + * Function frees memory allocated with ZSTD_createDDict() + * If a NULL pointer is passed, no operation is performed. */ +ZSTDLIB_API size_t ZSTD_freeDDict(ZSTD_DDict* ddict); + +/*! ZSTD_decompress_usingDDict() : + * Decompression using a digested Dictionary. + * Recommended when same dictionary is used multiple times. */ +ZSTDLIB_API size_t ZSTD_decompress_usingDDict(ZSTD_DCtx* dctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + const ZSTD_DDict* ddict); + + +/******************************** + * Dictionary helper functions + *******************************/ + +/*! ZSTD_getDictID_fromDict() : Requires v1.4.0+ + * Provides the dictID stored within dictionary. + * if @return == 0, the dictionary is not conformant with Zstandard specification. + * It can still be loaded, but as a content-only dictionary. */ +ZSTDLIB_API unsigned ZSTD_getDictID_fromDict(const void* dict, size_t dictSize); + +/*! ZSTD_getDictID_fromCDict() : Requires v1.5.0+ + * Provides the dictID of the dictionary loaded into `cdict`. + * If @return == 0, the dictionary is not conformant to Zstandard specification, or empty. + * Non-conformant dictionaries can still be loaded, but as content-only dictionaries. */ +ZSTDLIB_API unsigned ZSTD_getDictID_fromCDict(const ZSTD_CDict* cdict); + +/*! ZSTD_getDictID_fromDDict() : Requires v1.4.0+ + * Provides the dictID of the dictionary loaded into `ddict`. + * If @return == 0, the dictionary is not conformant to Zstandard specification, or empty. + * Non-conformant dictionaries can still be loaded, but as content-only dictionaries. */ +ZSTDLIB_API unsigned ZSTD_getDictID_fromDDict(const ZSTD_DDict* ddict); + +/*! ZSTD_getDictID_fromFrame() : Requires v1.4.0+ + * Provides the dictID required to decompressed the frame stored within `src`. + * If @return == 0, the dictID could not be decoded. + * This could for one of the following reasons : + * - The frame does not require a dictionary to be decoded (most common case). + * - The frame was built with dictID intentionally removed. Whatever dictionary is necessary is a hidden piece of information. + * Note : this use case also happens when using a non-conformant dictionary. + * - `srcSize` is too small, and as a result, the frame header could not be decoded (only possible if `srcSize < ZSTD_FRAMEHEADERSIZE_MAX`). + * - This is not a Zstandard frame. + * When identifying the exact failure cause, it's possible to use ZSTD_getFrameHeader(), which will provide a more precise error code. */ +ZSTDLIB_API unsigned ZSTD_getDictID_fromFrame(const void* src, size_t srcSize); + + +/******************************************************************************* + * Advanced dictionary and prefix API (Requires v1.4.0+) + * + * This API allows dictionaries to be used with ZSTD_compress2(), + * ZSTD_compressStream2(), and ZSTD_decompressDCtx(). + * Dictionaries are sticky, they remain valid when same context is reused, + * they only reset when the context is reset + * with ZSTD_reset_parameters or ZSTD_reset_session_and_parameters. + * In contrast, Prefixes are single-use. + ******************************************************************************/ + + +/*! ZSTD_CCtx_loadDictionary() : Requires v1.4.0+ + * Create an internal CDict from `dict` buffer. + * Decompression will have to use same dictionary. + * @result : 0, or an error code (which can be tested with ZSTD_isError()). + * Special: Loading a NULL (or 0-size) dictionary invalidates previous dictionary, + * meaning "return to no-dictionary mode". + * Note 1 : Dictionary is sticky, it will be used for all future compressed frames, + * until parameters are reset, a new dictionary is loaded, or the dictionary + * is explicitly invalidated by loading a NULL dictionary. + * Note 2 : Loading a dictionary involves building tables. + * It's also a CPU consuming operation, with non-negligible impact on latency. + * Tables are dependent on compression parameters, and for this reason, + * compression parameters can no longer be changed after loading a dictionary. + * Note 3 :`dict` content will be copied internally. + * Use experimental ZSTD_CCtx_loadDictionary_byReference() to reference content instead. + * In such a case, dictionary buffer must outlive its users. + * Note 4 : Use ZSTD_CCtx_loadDictionary_advanced() + * to precisely select how dictionary content must be interpreted. + * Note 5 : This method does not benefit from LDM (long distance mode). + * If you want to employ LDM on some large dictionary content, + * prefer employing ZSTD_CCtx_refPrefix() described below. + */ +ZSTDLIB_API size_t ZSTD_CCtx_loadDictionary(ZSTD_CCtx* cctx, const void* dict, size_t dictSize); + +/*! ZSTD_CCtx_refCDict() : Requires v1.4.0+ + * Reference a prepared dictionary, to be used for all future compressed frames. + * Note that compression parameters are enforced from within CDict, + * and supersede any compression parameter previously set within CCtx. + * The parameters ignored are labelled as "superseded-by-cdict" in the ZSTD_cParameter enum docs. + * The ignored parameters will be used again if the CCtx is returned to no-dictionary mode. + * The dictionary will remain valid for future compressed frames using same CCtx. + * @result : 0, or an error code (which can be tested with ZSTD_isError()). + * Special : Referencing a NULL CDict means "return to no-dictionary mode". + * Note 1 : Currently, only one dictionary can be managed. + * Referencing a new dictionary effectively "discards" any previous one. + * Note 2 : CDict is just referenced, its lifetime must outlive its usage within CCtx. */ +ZSTDLIB_API size_t ZSTD_CCtx_refCDict(ZSTD_CCtx* cctx, const ZSTD_CDict* cdict); + +/*! ZSTD_CCtx_refPrefix() : Requires v1.4.0+ + * Reference a prefix (single-usage dictionary) for next compressed frame. + * A prefix is **only used once**. Tables are discarded at end of frame (ZSTD_e_end). + * Decompression will need same prefix to properly regenerate data. + * Compressing with a prefix is similar in outcome as performing a diff and compressing it, + * but performs much faster, especially during decompression (compression speed is tunable with compression level). + * This method is compatible with LDM (long distance mode). + * @result : 0, or an error code (which can be tested with ZSTD_isError()). + * Special: Adding any prefix (including NULL) invalidates any previous prefix or dictionary + * Note 1 : Prefix buffer is referenced. It **must** outlive compression. + * Its content must remain unmodified during compression. + * Note 2 : If the intention is to diff some large src data blob with some prior version of itself, + * ensure that the window size is large enough to contain the entire source. + * See ZSTD_c_windowLog. + * Note 3 : Referencing a prefix involves building tables, which are dependent on compression parameters. + * It's a CPU consuming operation, with non-negligible impact on latency. + * If there is a need to use the same prefix multiple times, consider loadDictionary instead. + * Note 4 : By default, the prefix is interpreted as raw content (ZSTD_dct_rawContent). + * Use experimental ZSTD_CCtx_refPrefix_advanced() to alter dictionary interpretation. */ +ZSTDLIB_API size_t ZSTD_CCtx_refPrefix(ZSTD_CCtx* cctx, + const void* prefix, size_t prefixSize); + +/*! ZSTD_DCtx_loadDictionary() : Requires v1.4.0+ + * Create an internal DDict from dict buffer, to be used to decompress all future frames. + * The dictionary remains valid for all future frames, until explicitly invalidated, or + * a new dictionary is loaded. + * @result : 0, or an error code (which can be tested with ZSTD_isError()). + * Special : Adding a NULL (or 0-size) dictionary invalidates any previous dictionary, + * meaning "return to no-dictionary mode". + * Note 1 : Loading a dictionary involves building tables, + * which has a non-negligible impact on CPU usage and latency. + * It's recommended to "load once, use many times", to amortize the cost + * Note 2 :`dict` content will be copied internally, so `dict` can be released after loading. + * Use ZSTD_DCtx_loadDictionary_byReference() to reference dictionary content instead. + * Note 3 : Use ZSTD_DCtx_loadDictionary_advanced() to take control of + * how dictionary content is loaded and interpreted. + */ +ZSTDLIB_API size_t ZSTD_DCtx_loadDictionary(ZSTD_DCtx* dctx, const void* dict, size_t dictSize); + +/*! ZSTD_DCtx_refDDict() : Requires v1.4.0+ + * Reference a prepared dictionary, to be used to decompress next frames. + * The dictionary remains active for decompression of future frames using same DCtx. + * + * If called with ZSTD_d_refMultipleDDicts enabled, repeated calls of this function + * will store the DDict references in a table, and the DDict used for decompression + * will be determined at decompression time, as per the dict ID in the frame. + * The memory for the table is allocated on the first call to refDDict, and can be + * freed with ZSTD_freeDCtx(). + * + * If called with ZSTD_d_refMultipleDDicts disabled (the default), only one dictionary + * will be managed, and referencing a dictionary effectively "discards" any previous one. + * + * @result : 0, or an error code (which can be tested with ZSTD_isError()). + * Special: referencing a NULL DDict means "return to no-dictionary mode". + * Note 2 : DDict is just referenced, its lifetime must outlive its usage from DCtx. + */ +ZSTDLIB_API size_t ZSTD_DCtx_refDDict(ZSTD_DCtx* dctx, const ZSTD_DDict* ddict); + +/*! ZSTD_DCtx_refPrefix() : Requires v1.4.0+ + * Reference a prefix (single-usage dictionary) to decompress next frame. + * This is the reverse operation of ZSTD_CCtx_refPrefix(), + * and must use the same prefix as the one used during compression. + * Prefix is **only used once**. Reference is discarded at end of frame. + * End of frame is reached when ZSTD_decompressStream() returns 0. + * @result : 0, or an error code (which can be tested with ZSTD_isError()). + * Note 1 : Adding any prefix (including NULL) invalidates any previously set prefix or dictionary + * Note 2 : Prefix buffer is referenced. It **must** outlive decompression. + * Prefix buffer must remain unmodified up to the end of frame, + * reached when ZSTD_decompressStream() returns 0. + * Note 3 : By default, the prefix is treated as raw content (ZSTD_dct_rawContent). + * Use ZSTD_CCtx_refPrefix_advanced() to alter dictMode (Experimental section) + * Note 4 : Referencing a raw content prefix has almost no cpu nor memory cost. + * A full dictionary is more costly, as it requires building tables. + */ +ZSTDLIB_API size_t ZSTD_DCtx_refPrefix(ZSTD_DCtx* dctx, + const void* prefix, size_t prefixSize); + +/* === Memory management === */ + +/*! ZSTD_sizeof_*() : Requires v1.4.0+ + * These functions give the _current_ memory usage of selected object. + * Note that object memory usage can evolve (increase or decrease) over time. */ +ZSTDLIB_API size_t ZSTD_sizeof_CCtx(const ZSTD_CCtx* cctx); +ZSTDLIB_API size_t ZSTD_sizeof_DCtx(const ZSTD_DCtx* dctx); +ZSTDLIB_API size_t ZSTD_sizeof_CStream(const ZSTD_CStream* zcs); +ZSTDLIB_API size_t ZSTD_sizeof_DStream(const ZSTD_DStream* zds); +ZSTDLIB_API size_t ZSTD_sizeof_CDict(const ZSTD_CDict* cdict); +ZSTDLIB_API size_t ZSTD_sizeof_DDict(const ZSTD_DDict* ddict); + +#endif /* ZSTD_H_235446 */ + + +/* ************************************************************************************** + * ADVANCED AND EXPERIMENTAL FUNCTIONS + **************************************************************************************** + * The definitions in the following section are considered experimental. + * They are provided for advanced scenarios. + * They should never be used with a dynamic library, as prototypes may change in the future. + * Use them only in association with static linking. + * ***************************************************************************************/ + +#if defined(ZSTD_STATIC_LINKING_ONLY) && !defined(ZSTD_H_ZSTD_STATIC_LINKING_ONLY) +#define ZSTD_H_ZSTD_STATIC_LINKING_ONLY + +/* This can be overridden externally to hide static symbols. */ +#ifndef ZSTDLIB_STATIC_API +# if defined(ZSTD_DLL_EXPORT) && (ZSTD_DLL_EXPORT==1) +# define ZSTDLIB_STATIC_API __declspec(dllexport) ZSTDLIB_VISIBLE +# elif defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1) +# define ZSTDLIB_STATIC_API __declspec(dllimport) ZSTDLIB_VISIBLE +# else +# define ZSTDLIB_STATIC_API ZSTDLIB_VISIBLE +# endif +#endif + +/**************************************************************************************** + * experimental API (static linking only) + **************************************************************************************** + * The following symbols and constants + * are not planned to join "stable API" status in the near future. + * They can still change in future versions. + * Some of them are planned to remain in the static_only section indefinitely. + * Some of them might be removed in the future (especially when redundant with existing stable functions) + * ***************************************************************************************/ + +#define ZSTD_FRAMEHEADERSIZE_PREFIX(format) ((format) == ZSTD_f_zstd1 ? 5 : 1) /* minimum input size required to query frame header size */ +#define ZSTD_FRAMEHEADERSIZE_MIN(format) ((format) == ZSTD_f_zstd1 ? 6 : 2) +#define ZSTD_FRAMEHEADERSIZE_MAX 18 /* can be useful for static allocation */ +#define ZSTD_SKIPPABLEHEADERSIZE 8 + +/* compression parameter bounds */ +#define ZSTD_WINDOWLOG_MAX_32 30 +#define ZSTD_WINDOWLOG_MAX_64 31 +#define ZSTD_WINDOWLOG_MAX ((int)(sizeof(size_t) == 4 ? ZSTD_WINDOWLOG_MAX_32 : ZSTD_WINDOWLOG_MAX_64)) +#define ZSTD_WINDOWLOG_MIN 10 +#define ZSTD_HASHLOG_MAX ((ZSTD_WINDOWLOG_MAX < 30) ? ZSTD_WINDOWLOG_MAX : 30) +#define ZSTD_HASHLOG_MIN 6 +#define ZSTD_CHAINLOG_MAX_32 29 +#define ZSTD_CHAINLOG_MAX_64 30 +#define ZSTD_CHAINLOG_MAX ((int)(sizeof(size_t) == 4 ? ZSTD_CHAINLOG_MAX_32 : ZSTD_CHAINLOG_MAX_64)) +#define ZSTD_CHAINLOG_MIN ZSTD_HASHLOG_MIN +#define ZSTD_SEARCHLOG_MAX (ZSTD_WINDOWLOG_MAX-1) +#define ZSTD_SEARCHLOG_MIN 1 +#define ZSTD_MINMATCH_MAX 7 /* only for ZSTD_fast, other strategies are limited to 6 */ +#define ZSTD_MINMATCH_MIN 3 /* only for ZSTD_btopt+, faster strategies are limited to 4 */ +#define ZSTD_TARGETLENGTH_MAX ZSTD_BLOCKSIZE_MAX +#define ZSTD_TARGETLENGTH_MIN 0 /* note : comparing this constant to an unsigned results in a tautological test */ +#define ZSTD_STRATEGY_MIN ZSTD_fast +#define ZSTD_STRATEGY_MAX ZSTD_btultra2 +#define ZSTD_BLOCKSIZE_MAX_MIN (1 << 10) /* The minimum valid max blocksize. Maximum blocksizes smaller than this make compressBound() inaccurate. */ + + +#define ZSTD_OVERLAPLOG_MIN 0 +#define ZSTD_OVERLAPLOG_MAX 9 + +#define ZSTD_WINDOWLOG_LIMIT_DEFAULT 27 /* by default, the streaming decoder will refuse any frame + * requiring larger than (1< 0: + * If litLength != 0: + * rep == 1 --> offset == repeat_offset_1 + * rep == 2 --> offset == repeat_offset_2 + * rep == 3 --> offset == repeat_offset_3 + * If litLength == 0: + * rep == 1 --> offset == repeat_offset_2 + * rep == 2 --> offset == repeat_offset_3 + * rep == 3 --> offset == repeat_offset_1 - 1 + * + * Note: This field is optional. ZSTD_generateSequences() will calculate the value of + * 'rep', but repeat offsets do not necessarily need to be calculated from an external + * sequence provider's perspective. For example, ZSTD_compressSequences() does not + * use this 'rep' field at all (as of now). + */ +} ZSTD_Sequence; + +typedef struct { + unsigned windowLog; /**< largest match distance : larger == more compression, more memory needed during decompression */ + unsigned chainLog; /**< fully searched segment : larger == more compression, slower, more memory (useless for fast) */ + unsigned hashLog; /**< dispatch table : larger == faster, more memory */ + unsigned searchLog; /**< nb of searches : larger == more compression, slower */ + unsigned minMatch; /**< match length searched : larger == faster decompression, sometimes less compression */ + unsigned targetLength; /**< acceptable match size for optimal parser (only) : larger == more compression, slower */ + ZSTD_strategy strategy; /**< see ZSTD_strategy definition above */ +} ZSTD_compressionParameters; + +typedef struct { + int contentSizeFlag; /**< 1: content size will be in frame header (when known) */ + int checksumFlag; /**< 1: generate a 32-bits checksum using XXH64 algorithm at end of frame, for error detection */ + int noDictIDFlag; /**< 1: no dictID will be saved into frame header (dictID is only useful for dictionary compression) */ +} ZSTD_frameParameters; + +typedef struct { + ZSTD_compressionParameters cParams; + ZSTD_frameParameters fParams; +} ZSTD_parameters; + +typedef enum { + ZSTD_dct_auto = 0, /* dictionary is "full" when starting with ZSTD_MAGIC_DICTIONARY, otherwise it is "rawContent" */ + ZSTD_dct_rawContent = 1, /* ensures dictionary is always loaded as rawContent, even if it starts with ZSTD_MAGIC_DICTIONARY */ + ZSTD_dct_fullDict = 2 /* refuses to load a dictionary if it does not respect Zstandard's specification, starting with ZSTD_MAGIC_DICTIONARY */ +} ZSTD_dictContentType_e; + +typedef enum { + ZSTD_dlm_byCopy = 0, /**< Copy dictionary content internally */ + ZSTD_dlm_byRef = 1 /**< Reference dictionary content -- the dictionary buffer must outlive its users. */ +} ZSTD_dictLoadMethod_e; + +typedef enum { + ZSTD_f_zstd1 = 0, /* zstd frame format, specified in zstd_compression_format.md (default) */ + ZSTD_f_zstd1_magicless = 1 /* Variant of zstd frame format, without initial 4-bytes magic number. + * Useful to save 4 bytes per generated frame. + * Decoder cannot recognise automatically this format, requiring this instruction. */ +} ZSTD_format_e; + +typedef enum { + /* Note: this enum controls ZSTD_d_forceIgnoreChecksum */ + ZSTD_d_validateChecksum = 0, + ZSTD_d_ignoreChecksum = 1 +} ZSTD_forceIgnoreChecksum_e; + +typedef enum { + /* Note: this enum controls ZSTD_d_refMultipleDDicts */ + ZSTD_rmd_refSingleDDict = 0, + ZSTD_rmd_refMultipleDDicts = 1 +} ZSTD_refMultipleDDicts_e; + +typedef enum { + /* Note: this enum and the behavior it controls are effectively internal + * implementation details of the compressor. They are expected to continue + * to evolve and should be considered only in the context of extremely + * advanced performance tuning. + * + * Zstd currently supports the use of a CDict in three ways: + * + * - The contents of the CDict can be copied into the working context. This + * means that the compression can search both the dictionary and input + * while operating on a single set of internal tables. This makes + * the compression faster per-byte of input. However, the initial copy of + * the CDict's tables incurs a fixed cost at the beginning of the + * compression. For small compressions (< 8 KB), that copy can dominate + * the cost of the compression. + * + * - The CDict's tables can be used in-place. In this model, compression is + * slower per input byte, because the compressor has to search two sets of + * tables. However, this model incurs no start-up cost (as long as the + * working context's tables can be reused). For small inputs, this can be + * faster than copying the CDict's tables. + * + * - The CDict's tables are not used at all, and instead we use the working + * context alone to reload the dictionary and use params based on the source + * size. See ZSTD_compress_insertDictionary() and ZSTD_compress_usingDict(). + * This method is effective when the dictionary sizes are very small relative + * to the input size, and the input size is fairly large to begin with. + * + * Zstd has a simple internal heuristic that selects which strategy to use + * at the beginning of a compression. However, if experimentation shows that + * Zstd is making poor choices, it is possible to override that choice with + * this enum. + */ + ZSTD_dictDefaultAttach = 0, /* Use the default heuristic. */ + ZSTD_dictForceAttach = 1, /* Never copy the dictionary. */ + ZSTD_dictForceCopy = 2, /* Always copy the dictionary. */ + ZSTD_dictForceLoad = 3 /* Always reload the dictionary */ +} ZSTD_dictAttachPref_e; + +typedef enum { + ZSTD_lcm_auto = 0, /**< Automatically determine the compression mode based on the compression level. + * Negative compression levels will be uncompressed, and positive compression + * levels will be compressed. */ + ZSTD_lcm_huffman = 1, /**< Always attempt Huffman compression. Uncompressed literals will still be + * emitted if Huffman compression is not profitable. */ + ZSTD_lcm_uncompressed = 2 /**< Always emit uncompressed literals. */ +} ZSTD_literalCompressionMode_e; + +typedef enum { + /* Note: This enum controls features which are conditionally beneficial. Zstd typically will make a final + * decision on whether or not to enable the feature (ZSTD_ps_auto), but setting the switch to ZSTD_ps_enable + * or ZSTD_ps_disable allow for a force enable/disable the feature. + */ + ZSTD_ps_auto = 0, /* Let the library automatically determine whether the feature shall be enabled */ + ZSTD_ps_enable = 1, /* Force-enable the feature */ + ZSTD_ps_disable = 2 /* Do not use the feature */ +} ZSTD_paramSwitch_e; + +/*************************************** +* Frame header and size functions +***************************************/ + +/*! ZSTD_findDecompressedSize() : + * `src` should point to the start of a series of ZSTD encoded and/or skippable frames + * `srcSize` must be the _exact_ size of this series + * (i.e. there should be a frame boundary at `src + srcSize`) + * @return : - decompressed size of all data in all successive frames + * - if the decompressed size cannot be determined: ZSTD_CONTENTSIZE_UNKNOWN + * - if an error occurred: ZSTD_CONTENTSIZE_ERROR + * + * note 1 : decompressed size is an optional field, that may not be present, especially in streaming mode. + * When `return==ZSTD_CONTENTSIZE_UNKNOWN`, data to decompress could be any size. + * In which case, it's necessary to use streaming mode to decompress data. + * note 2 : decompressed size is always present when compression is done with ZSTD_compress() + * note 3 : decompressed size can be very large (64-bits value), + * potentially larger than what local system can handle as a single memory segment. + * In which case, it's necessary to use streaming mode to decompress data. + * note 4 : If source is untrusted, decompressed size could be wrong or intentionally modified. + * Always ensure result fits within application's authorized limits. + * Each application can set its own limits. + * note 5 : ZSTD_findDecompressedSize handles multiple frames, and so it must traverse the input to + * read each contained frame header. This is fast as most of the data is skipped, + * however it does mean that all frame data must be present and valid. */ +ZSTDLIB_STATIC_API unsigned long long ZSTD_findDecompressedSize(const void* src, size_t srcSize); + +/*! ZSTD_decompressBound() : + * `src` should point to the start of a series of ZSTD encoded and/or skippable frames + * `srcSize` must be the _exact_ size of this series + * (i.e. there should be a frame boundary at `src + srcSize`) + * @return : - upper-bound for the decompressed size of all data in all successive frames + * - if an error occurred: ZSTD_CONTENTSIZE_ERROR + * + * note 1 : an error can occur if `src` contains an invalid or incorrectly formatted frame. + * note 2 : the upper-bound is exact when the decompressed size field is available in every ZSTD encoded frame of `src`. + * in this case, `ZSTD_findDecompressedSize` and `ZSTD_decompressBound` return the same value. + * note 3 : when the decompressed size field isn't available, the upper-bound for that frame is calculated by: + * upper-bound = # blocks * min(128 KB, Window_Size) + */ +ZSTDLIB_STATIC_API unsigned long long ZSTD_decompressBound(const void* src, size_t srcSize); + +/*! ZSTD_frameHeaderSize() : + * srcSize must be >= ZSTD_FRAMEHEADERSIZE_PREFIX. + * @return : size of the Frame Header, + * or an error code (if srcSize is too small) */ +ZSTDLIB_STATIC_API size_t ZSTD_frameHeaderSize(const void* src, size_t srcSize); + +typedef enum { ZSTD_frame, ZSTD_skippableFrame } ZSTD_frameType_e; +typedef struct { + unsigned long long frameContentSize; /* if == ZSTD_CONTENTSIZE_UNKNOWN, it means this field is not available. 0 means "empty" */ + unsigned long long windowSize; /* can be very large, up to <= frameContentSize */ + unsigned blockSizeMax; + ZSTD_frameType_e frameType; /* if == ZSTD_skippableFrame, frameContentSize is the size of skippable content */ + unsigned headerSize; + unsigned dictID; + unsigned checksumFlag; + unsigned _reserved1; + unsigned _reserved2; +} ZSTD_frameHeader; + +/*! ZSTD_getFrameHeader() : + * decode Frame Header, or requires larger `srcSize`. + * @return : 0, `zfhPtr` is correctly filled, + * >0, `srcSize` is too small, value is wanted `srcSize` amount, + * or an error code, which can be tested using ZSTD_isError() */ +ZSTDLIB_STATIC_API size_t ZSTD_getFrameHeader(ZSTD_frameHeader* zfhPtr, const void* src, size_t srcSize); /**< doesn't consume input */ +/*! ZSTD_getFrameHeader_advanced() : + * same as ZSTD_getFrameHeader(), + * with added capability to select a format (like ZSTD_f_zstd1_magicless) */ +ZSTDLIB_STATIC_API size_t ZSTD_getFrameHeader_advanced(ZSTD_frameHeader* zfhPtr, const void* src, size_t srcSize, ZSTD_format_e format); + +/*! ZSTD_decompressionMargin() : + * Zstd supports in-place decompression, where the input and output buffers overlap. + * In this case, the output buffer must be at least (Margin + Output_Size) bytes large, + * and the input buffer must be at the end of the output buffer. + * + * _______________________ Output Buffer ________________________ + * | | + * | ____ Input Buffer ____| + * | | | + * v v v + * |---------------------------------------|-----------|----------| + * ^ ^ ^ + * |___________________ Output_Size ___________________|_ Margin _| + * + * NOTE: See also ZSTD_DECOMPRESSION_MARGIN(). + * NOTE: This applies only to single-pass decompression through ZSTD_decompress() or + * ZSTD_decompressDCtx(). + * NOTE: This function supports multi-frame input. + * + * @param src The compressed frame(s) + * @param srcSize The size of the compressed frame(s) + * @returns The decompression margin or an error that can be checked with ZSTD_isError(). + */ +ZSTDLIB_STATIC_API size_t ZSTD_decompressionMargin(const void* src, size_t srcSize); + +/*! ZSTD_DECOMPRESS_MARGIN() : + * Similar to ZSTD_decompressionMargin(), but instead of computing the margin from + * the compressed frame, compute it from the original size and the blockSizeLog. + * See ZSTD_decompressionMargin() for details. + * + * WARNING: This macro does not support multi-frame input, the input must be a single + * zstd frame. If you need that support use the function, or implement it yourself. + * + * @param originalSize The original uncompressed size of the data. + * @param blockSize The block size == MIN(windowSize, ZSTD_BLOCKSIZE_MAX). + * Unless you explicitly set the windowLog smaller than + * ZSTD_BLOCKSIZELOG_MAX you can just use ZSTD_BLOCKSIZE_MAX. + */ +#define ZSTD_DECOMPRESSION_MARGIN(originalSize, blockSize) ((size_t)( \ + ZSTD_FRAMEHEADERSIZE_MAX /* Frame header */ + \ + 4 /* checksum */ + \ + ((originalSize) == 0 ? 0 : 3 * (((originalSize) + (blockSize) - 1) / blockSize)) /* 3 bytes per block */ + \ + (blockSize) /* One block of margin */ \ + )) + +typedef enum { + ZSTD_sf_noBlockDelimiters = 0, /* Representation of ZSTD_Sequence has no block delimiters, sequences only */ + ZSTD_sf_explicitBlockDelimiters = 1 /* Representation of ZSTD_Sequence contains explicit block delimiters */ +} ZSTD_sequenceFormat_e; + +/*! ZSTD_sequenceBound() : + * `srcSize` : size of the input buffer + * @return : upper-bound for the number of sequences that can be generated + * from a buffer of srcSize bytes + * + * note : returns number of sequences - to get bytes, multiply by sizeof(ZSTD_Sequence). + */ +ZSTDLIB_STATIC_API size_t ZSTD_sequenceBound(size_t srcSize); + +/*! ZSTD_generateSequences() : + * WARNING: This function is meant for debugging and informational purposes ONLY! + * Its implementation is flawed, and it will be deleted in a future version. + * It is not guaranteed to succeed, as there are several cases where it will give + * up and fail. You should NOT use this function in production code. + * + * This function is deprecated, and will be removed in a future version. + * + * Generate sequences using ZSTD_compress2(), given a source buffer. + * + * @param zc The compression context to be used for ZSTD_compress2(). Set any + * compression parameters you need on this context. + * @param outSeqs The output sequences buffer of size @p outSeqsSize + * @param outSeqsSize The size of the output sequences buffer. + * ZSTD_sequenceBound(srcSize) is an upper bound on the number + * of sequences that can be generated. + * @param src The source buffer to generate sequences from of size @p srcSize. + * @param srcSize The size of the source buffer. + * + * Each block will end with a dummy sequence + * with offset == 0, matchLength == 0, and litLength == length of last literals. + * litLength may be == 0, and if so, then the sequence of (of: 0 ml: 0 ll: 0) + * simply acts as a block delimiter. + * + * @returns The number of sequences generated, necessarily less than + * ZSTD_sequenceBound(srcSize), or an error code that can be checked + * with ZSTD_isError(). + */ +ZSTD_DEPRECATED("For debugging only, will be replaced by ZSTD_extractSequences()") +ZSTDLIB_STATIC_API size_t +ZSTD_generateSequences(ZSTD_CCtx* zc, + ZSTD_Sequence* outSeqs, size_t outSeqsSize, + const void* src, size_t srcSize); + +/*! ZSTD_mergeBlockDelimiters() : + * Given an array of ZSTD_Sequence, remove all sequences that represent block delimiters/last literals + * by merging them into the literals of the next sequence. + * + * As such, the final generated result has no explicit representation of block boundaries, + * and the final last literals segment is not represented in the sequences. + * + * The output of this function can be fed into ZSTD_compressSequences() with CCtx + * setting of ZSTD_c_blockDelimiters as ZSTD_sf_noBlockDelimiters + * @return : number of sequences left after merging + */ +ZSTDLIB_STATIC_API size_t ZSTD_mergeBlockDelimiters(ZSTD_Sequence* sequences, size_t seqsSize); + +/*! ZSTD_compressSequences() : + * Compress an array of ZSTD_Sequence, associated with @src buffer, into dst. + * @src contains the entire input (not just the literals). + * If @srcSize > sum(sequence.length), the remaining bytes are considered all literals + * If a dictionary is included, then the cctx should reference the dict. (see: ZSTD_CCtx_refCDict(), ZSTD_CCtx_loadDictionary(), etc.) + * The entire source is compressed into a single frame. + * + * The compression behavior changes based on cctx params. In particular: + * If ZSTD_c_blockDelimiters == ZSTD_sf_noBlockDelimiters, the array of ZSTD_Sequence is expected to contain + * no block delimiters (defined in ZSTD_Sequence). Block boundaries are roughly determined based on + * the block size derived from the cctx, and sequences may be split. This is the default setting. + * + * If ZSTD_c_blockDelimiters == ZSTD_sf_explicitBlockDelimiters, the array of ZSTD_Sequence is expected to contain + * block delimiters (defined in ZSTD_Sequence). Behavior is undefined if no block delimiters are provided. + * + * If ZSTD_c_validateSequences == 0, this function will blindly accept the sequences provided. Invalid sequences cause undefined + * behavior. If ZSTD_c_validateSequences == 1, then if sequence is invalid (see doc/zstd_compression_format.md for + * specifics regarding offset/matchlength requirements) then the function will bail out and return an error. + * + * In addition to the two adjustable experimental params, there are other important cctx params. + * - ZSTD_c_minMatch MUST be set as less than or equal to the smallest match generated by the match finder. It has a minimum value of ZSTD_MINMATCH_MIN. + * - ZSTD_c_compressionLevel accordingly adjusts the strength of the entropy coder, as it would in typical compression. + * - ZSTD_c_windowLog affects offset validation: this function will return an error at higher debug levels if a provided offset + * is larger than what the spec allows for a given window log and dictionary (if present). See: doc/zstd_compression_format.md + * + * Note: Repcodes are, as of now, always re-calculated within this function, so ZSTD_Sequence::rep is unused. + * Note 2: Once we integrate ability to ingest repcodes, the explicit block delims mode must respect those repcodes exactly, + * and cannot emit an RLE block that disagrees with the repcode history + * @return : final compressed size, or a ZSTD error code. + */ +ZSTDLIB_STATIC_API size_t +ZSTD_compressSequences( ZSTD_CCtx* cctx, void* dst, size_t dstSize, + const ZSTD_Sequence* inSeqs, size_t inSeqsSize, + const void* src, size_t srcSize); + + +/*! ZSTD_writeSkippableFrame() : + * Generates a zstd skippable frame containing data given by src, and writes it to dst buffer. + * + * Skippable frames begin with a 4-byte magic number. There are 16 possible choices of magic number, + * ranging from ZSTD_MAGIC_SKIPPABLE_START to ZSTD_MAGIC_SKIPPABLE_START+15. + * As such, the parameter magicVariant controls the exact skippable frame magic number variant used, so + * the magic number used will be ZSTD_MAGIC_SKIPPABLE_START + magicVariant. + * + * Returns an error if destination buffer is not large enough, if the source size is not representable + * with a 4-byte unsigned int, or if the parameter magicVariant is greater than 15 (and therefore invalid). + * + * @return : number of bytes written or a ZSTD error. + */ +ZSTDLIB_STATIC_API size_t ZSTD_writeSkippableFrame(void* dst, size_t dstCapacity, + const void* src, size_t srcSize, unsigned magicVariant); + +/*! ZSTD_readSkippableFrame() : + * Retrieves a zstd skippable frame containing data given by src, and writes it to dst buffer. + * + * The parameter magicVariant will receive the magicVariant that was supplied when the frame was written, + * i.e. magicNumber - ZSTD_MAGIC_SKIPPABLE_START. This can be NULL if the caller is not interested + * in the magicVariant. + * + * Returns an error if destination buffer is not large enough, or if the frame is not skippable. + * + * @return : number of bytes written or a ZSTD error. + */ +ZSTDLIB_API size_t ZSTD_readSkippableFrame(void* dst, size_t dstCapacity, unsigned* magicVariant, + const void* src, size_t srcSize); + +/*! ZSTD_isSkippableFrame() : + * Tells if the content of `buffer` starts with a valid Frame Identifier for a skippable frame. + */ +ZSTDLIB_API unsigned ZSTD_isSkippableFrame(const void* buffer, size_t size); + + + +/*************************************** +* Memory management +***************************************/ + +/*! ZSTD_estimate*() : + * These functions make it possible to estimate memory usage + * of a future {D,C}Ctx, before its creation. + * This is useful in combination with ZSTD_initStatic(), + * which makes it possible to employ a static buffer for ZSTD_CCtx* state. + * + * ZSTD_estimateCCtxSize() will provide a memory budget large enough + * to compress data of any size using one-shot compression ZSTD_compressCCtx() or ZSTD_compress2() + * associated with any compression level up to max specified one. + * The estimate will assume the input may be arbitrarily large, + * which is the worst case. + * + * Note that the size estimation is specific for one-shot compression, + * it is not valid for streaming (see ZSTD_estimateCStreamSize*()) + * nor other potential ways of using a ZSTD_CCtx* state. + * + * When srcSize can be bound by a known and rather "small" value, + * this knowledge can be used to provide a tighter budget estimation + * because the ZSTD_CCtx* state will need less memory for small inputs. + * This tighter estimation can be provided by employing more advanced functions + * ZSTD_estimateCCtxSize_usingCParams(), which can be used in tandem with ZSTD_getCParams(), + * and ZSTD_estimateCCtxSize_usingCCtxParams(), which can be used in tandem with ZSTD_CCtxParams_setParameter(). + * Both can be used to estimate memory using custom compression parameters and arbitrary srcSize limits. + * + * Note : only single-threaded compression is supported. + * ZSTD_estimateCCtxSize_usingCCtxParams() will return an error code if ZSTD_c_nbWorkers is >= 1. + */ +ZSTDLIB_STATIC_API size_t ZSTD_estimateCCtxSize(int maxCompressionLevel); +ZSTDLIB_STATIC_API size_t ZSTD_estimateCCtxSize_usingCParams(ZSTD_compressionParameters cParams); +ZSTDLIB_STATIC_API size_t ZSTD_estimateCCtxSize_usingCCtxParams(const ZSTD_CCtx_params* params); +ZSTDLIB_STATIC_API size_t ZSTD_estimateDCtxSize(void); + +/*! ZSTD_estimateCStreamSize() : + * ZSTD_estimateCStreamSize() will provide a memory budget large enough for streaming compression + * using any compression level up to the max specified one. + * It will also consider src size to be arbitrarily "large", which is a worst case scenario. + * If srcSize is known to always be small, ZSTD_estimateCStreamSize_usingCParams() can provide a tighter estimation. + * ZSTD_estimateCStreamSize_usingCParams() can be used in tandem with ZSTD_getCParams() to create cParams from compressionLevel. + * ZSTD_estimateCStreamSize_usingCCtxParams() can be used in tandem with ZSTD_CCtxParams_setParameter(). Only single-threaded compression is supported. This function will return an error code if ZSTD_c_nbWorkers is >= 1. + * Note : CStream size estimation is only correct for single-threaded compression. + * ZSTD_estimateCStreamSize_usingCCtxParams() will return an error code if ZSTD_c_nbWorkers is >= 1. + * Note 2 : ZSTD_estimateCStreamSize* functions are not compatible with the Block-Level Sequence Producer API at this time. + * Size estimates assume that no external sequence producer is registered. + * + * ZSTD_DStream memory budget depends on frame's window Size. + * This information can be passed manually, using ZSTD_estimateDStreamSize, + * or deducted from a valid frame Header, using ZSTD_estimateDStreamSize_fromFrame(); + * Any frame requesting a window size larger than max specified one will be rejected. + * Note : if streaming is init with function ZSTD_init?Stream_usingDict(), + * an internal ?Dict will be created, which additional size is not estimated here. + * In this case, get total size by adding ZSTD_estimate?DictSize + */ +ZSTDLIB_STATIC_API size_t ZSTD_estimateCStreamSize(int maxCompressionLevel); +ZSTDLIB_STATIC_API size_t ZSTD_estimateCStreamSize_usingCParams(ZSTD_compressionParameters cParams); +ZSTDLIB_STATIC_API size_t ZSTD_estimateCStreamSize_usingCCtxParams(const ZSTD_CCtx_params* params); +ZSTDLIB_STATIC_API size_t ZSTD_estimateDStreamSize(size_t maxWindowSize); +ZSTDLIB_STATIC_API size_t ZSTD_estimateDStreamSize_fromFrame(const void* src, size_t srcSize); + +/*! ZSTD_estimate?DictSize() : + * ZSTD_estimateCDictSize() will bet that src size is relatively "small", and content is copied, like ZSTD_createCDict(). + * ZSTD_estimateCDictSize_advanced() makes it possible to control compression parameters precisely, like ZSTD_createCDict_advanced(). + * Note : dictionaries created by reference (`ZSTD_dlm_byRef`) are logically smaller. + */ +ZSTDLIB_STATIC_API size_t ZSTD_estimateCDictSize(size_t dictSize, int compressionLevel); +ZSTDLIB_STATIC_API size_t ZSTD_estimateCDictSize_advanced(size_t dictSize, ZSTD_compressionParameters cParams, ZSTD_dictLoadMethod_e dictLoadMethod); +ZSTDLIB_STATIC_API size_t ZSTD_estimateDDictSize(size_t dictSize, ZSTD_dictLoadMethod_e dictLoadMethod); + +/*! ZSTD_initStatic*() : + * Initialize an object using a pre-allocated fixed-size buffer. + * workspace: The memory area to emplace the object into. + * Provided pointer *must be 8-bytes aligned*. + * Buffer must outlive object. + * workspaceSize: Use ZSTD_estimate*Size() to determine + * how large workspace must be to support target scenario. + * @return : pointer to object (same address as workspace, just different type), + * or NULL if error (size too small, incorrect alignment, etc.) + * Note : zstd will never resize nor malloc() when using a static buffer. + * If the object requires more memory than available, + * zstd will just error out (typically ZSTD_error_memory_allocation). + * Note 2 : there is no corresponding "free" function. + * Since workspace is allocated externally, it must be freed externally too. + * Note 3 : cParams : use ZSTD_getCParams() to convert a compression level + * into its associated cParams. + * Limitation 1 : currently not compatible with internal dictionary creation, triggered by + * ZSTD_CCtx_loadDictionary(), ZSTD_initCStream_usingDict() or ZSTD_initDStream_usingDict(). + * Limitation 2 : static cctx currently not compatible with multi-threading. + * Limitation 3 : static dctx is incompatible with legacy support. + */ +ZSTDLIB_STATIC_API ZSTD_CCtx* ZSTD_initStaticCCtx(void* workspace, size_t workspaceSize); +ZSTDLIB_STATIC_API ZSTD_CStream* ZSTD_initStaticCStream(void* workspace, size_t workspaceSize); /**< same as ZSTD_initStaticCCtx() */ + +ZSTDLIB_STATIC_API ZSTD_DCtx* ZSTD_initStaticDCtx(void* workspace, size_t workspaceSize); +ZSTDLIB_STATIC_API ZSTD_DStream* ZSTD_initStaticDStream(void* workspace, size_t workspaceSize); /**< same as ZSTD_initStaticDCtx() */ + +ZSTDLIB_STATIC_API const ZSTD_CDict* ZSTD_initStaticCDict( + void* workspace, size_t workspaceSize, + const void* dict, size_t dictSize, + ZSTD_dictLoadMethod_e dictLoadMethod, + ZSTD_dictContentType_e dictContentType, + ZSTD_compressionParameters cParams); + +ZSTDLIB_STATIC_API const ZSTD_DDict* ZSTD_initStaticDDict( + void* workspace, size_t workspaceSize, + const void* dict, size_t dictSize, + ZSTD_dictLoadMethod_e dictLoadMethod, + ZSTD_dictContentType_e dictContentType); + + +/*! Custom memory allocation : + * These prototypes make it possible to pass your own allocation/free functions. + * ZSTD_customMem is provided at creation time, using ZSTD_create*_advanced() variants listed below. + * All allocation/free operations will be completed using these custom variants instead of regular ones. + */ +typedef void* (*ZSTD_allocFunction) (void* opaque, size_t size); +typedef void (*ZSTD_freeFunction) (void* opaque, void* address); +typedef struct { ZSTD_allocFunction customAlloc; ZSTD_freeFunction customFree; void* opaque; } ZSTD_customMem; +static +#ifdef __GNUC__ +__attribute__((__unused__)) +#endif +ZSTD_customMem const ZSTD_defaultCMem = { NULL, NULL, NULL }; /**< this constant defers to stdlib's functions */ + +ZSTDLIB_STATIC_API ZSTD_CCtx* ZSTD_createCCtx_advanced(ZSTD_customMem customMem); +ZSTDLIB_STATIC_API ZSTD_CStream* ZSTD_createCStream_advanced(ZSTD_customMem customMem); +ZSTDLIB_STATIC_API ZSTD_DCtx* ZSTD_createDCtx_advanced(ZSTD_customMem customMem); +ZSTDLIB_STATIC_API ZSTD_DStream* ZSTD_createDStream_advanced(ZSTD_customMem customMem); + +ZSTDLIB_STATIC_API ZSTD_CDict* ZSTD_createCDict_advanced(const void* dict, size_t dictSize, + ZSTD_dictLoadMethod_e dictLoadMethod, + ZSTD_dictContentType_e dictContentType, + ZSTD_compressionParameters cParams, + ZSTD_customMem customMem); + +/*! Thread pool : + * These prototypes make it possible to share a thread pool among multiple compression contexts. + * This can limit resources for applications with multiple threads where each one uses + * a threaded compression mode (via ZSTD_c_nbWorkers parameter). + * ZSTD_createThreadPool creates a new thread pool with a given number of threads. + * Note that the lifetime of such pool must exist while being used. + * ZSTD_CCtx_refThreadPool assigns a thread pool to a context (use NULL argument value + * to use an internal thread pool). + * ZSTD_freeThreadPool frees a thread pool, accepts NULL pointer. + */ +typedef struct POOL_ctx_s ZSTD_threadPool; +ZSTDLIB_STATIC_API ZSTD_threadPool* ZSTD_createThreadPool(size_t numThreads); +ZSTDLIB_STATIC_API void ZSTD_freeThreadPool (ZSTD_threadPool* pool); /* accept NULL pointer */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtx_refThreadPool(ZSTD_CCtx* cctx, ZSTD_threadPool* pool); + + +/* + * This API is temporary and is expected to change or disappear in the future! + */ +ZSTDLIB_STATIC_API ZSTD_CDict* ZSTD_createCDict_advanced2( + const void* dict, size_t dictSize, + ZSTD_dictLoadMethod_e dictLoadMethod, + ZSTD_dictContentType_e dictContentType, + const ZSTD_CCtx_params* cctxParams, + ZSTD_customMem customMem); + +ZSTDLIB_STATIC_API ZSTD_DDict* ZSTD_createDDict_advanced( + const void* dict, size_t dictSize, + ZSTD_dictLoadMethod_e dictLoadMethod, + ZSTD_dictContentType_e dictContentType, + ZSTD_customMem customMem); + + +/*************************************** +* Advanced compression functions +***************************************/ + +/*! ZSTD_createCDict_byReference() : + * Create a digested dictionary for compression + * Dictionary content is just referenced, not duplicated. + * As a consequence, `dictBuffer` **must** outlive CDict, + * and its content must remain unmodified throughout the lifetime of CDict. + * note: equivalent to ZSTD_createCDict_advanced(), with dictLoadMethod==ZSTD_dlm_byRef */ +ZSTDLIB_STATIC_API ZSTD_CDict* ZSTD_createCDict_byReference(const void* dictBuffer, size_t dictSize, int compressionLevel); + +/*! ZSTD_getCParams() : + * @return ZSTD_compressionParameters structure for a selected compression level and estimated srcSize. + * `estimatedSrcSize` value is optional, select 0 if not known */ +ZSTDLIB_STATIC_API ZSTD_compressionParameters ZSTD_getCParams(int compressionLevel, unsigned long long estimatedSrcSize, size_t dictSize); + +/*! ZSTD_getParams() : + * same as ZSTD_getCParams(), but @return a full `ZSTD_parameters` object instead of sub-component `ZSTD_compressionParameters`. + * All fields of `ZSTD_frameParameters` are set to default : contentSize=1, checksum=0, noDictID=0 */ +ZSTDLIB_STATIC_API ZSTD_parameters ZSTD_getParams(int compressionLevel, unsigned long long estimatedSrcSize, size_t dictSize); + +/*! ZSTD_checkCParams() : + * Ensure param values remain within authorized range. + * @return 0 on success, or an error code (can be checked with ZSTD_isError()) */ +ZSTDLIB_STATIC_API size_t ZSTD_checkCParams(ZSTD_compressionParameters params); + +/*! ZSTD_adjustCParams() : + * optimize params for a given `srcSize` and `dictSize`. + * `srcSize` can be unknown, in which case use ZSTD_CONTENTSIZE_UNKNOWN. + * `dictSize` must be `0` when there is no dictionary. + * cPar can be invalid : all parameters will be clamped within valid range in the @return struct. + * This function never fails (wide contract) */ +ZSTDLIB_STATIC_API ZSTD_compressionParameters ZSTD_adjustCParams(ZSTD_compressionParameters cPar, unsigned long long srcSize, size_t dictSize); + +/*! ZSTD_CCtx_setCParams() : + * Set all parameters provided within @p cparams into the working @p cctx. + * Note : if modifying parameters during compression (MT mode only), + * note that changes to the .windowLog parameter will be ignored. + * @return 0 on success, or an error code (can be checked with ZSTD_isError()). + * On failure, no parameters are updated. + */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtx_setCParams(ZSTD_CCtx* cctx, ZSTD_compressionParameters cparams); + +/*! ZSTD_CCtx_setFParams() : + * Set all parameters provided within @p fparams into the working @p cctx. + * @return 0 on success, or an error code (can be checked with ZSTD_isError()). + */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtx_setFParams(ZSTD_CCtx* cctx, ZSTD_frameParameters fparams); + +/*! ZSTD_CCtx_setParams() : + * Set all parameters provided within @p params into the working @p cctx. + * @return 0 on success, or an error code (can be checked with ZSTD_isError()). + */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtx_setParams(ZSTD_CCtx* cctx, ZSTD_parameters params); + +/*! ZSTD_compress_advanced() : + * Note : this function is now DEPRECATED. + * It can be replaced by ZSTD_compress2(), in combination with ZSTD_CCtx_setParameter() and other parameter setters. + * This prototype will generate compilation warnings. */ +ZSTD_DEPRECATED("use ZSTD_compress2") +ZSTDLIB_STATIC_API +size_t ZSTD_compress_advanced(ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + const void* dict,size_t dictSize, + ZSTD_parameters params); + +/*! ZSTD_compress_usingCDict_advanced() : + * Note : this function is now DEPRECATED. + * It can be replaced by ZSTD_compress2(), in combination with ZSTD_CCtx_loadDictionary() and other parameter setters. + * This prototype will generate compilation warnings. */ +ZSTD_DEPRECATED("use ZSTD_compress2 with ZSTD_CCtx_loadDictionary") +ZSTDLIB_STATIC_API +size_t ZSTD_compress_usingCDict_advanced(ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + const ZSTD_CDict* cdict, + ZSTD_frameParameters fParams); + + +/*! ZSTD_CCtx_loadDictionary_byReference() : + * Same as ZSTD_CCtx_loadDictionary(), but dictionary content is referenced, instead of being copied into CCtx. + * It saves some memory, but also requires that `dict` outlives its usage within `cctx` */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtx_loadDictionary_byReference(ZSTD_CCtx* cctx, const void* dict, size_t dictSize); + +/*! ZSTD_CCtx_loadDictionary_advanced() : + * Same as ZSTD_CCtx_loadDictionary(), but gives finer control over + * how to load the dictionary (by copy ? by reference ?) + * and how to interpret it (automatic ? force raw mode ? full mode only ?) */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtx_loadDictionary_advanced(ZSTD_CCtx* cctx, const void* dict, size_t dictSize, ZSTD_dictLoadMethod_e dictLoadMethod, ZSTD_dictContentType_e dictContentType); + +/*! ZSTD_CCtx_refPrefix_advanced() : + * Same as ZSTD_CCtx_refPrefix(), but gives finer control over + * how to interpret prefix content (automatic ? force raw mode (default) ? full mode only ?) */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtx_refPrefix_advanced(ZSTD_CCtx* cctx, const void* prefix, size_t prefixSize, ZSTD_dictContentType_e dictContentType); + +/* === experimental parameters === */ +/* these parameters can be used with ZSTD_setParameter() + * they are not guaranteed to remain supported in the future */ + + /* Enables rsyncable mode, + * which makes compressed files more rsync friendly + * by adding periodic synchronization points to the compressed data. + * The target average block size is ZSTD_c_jobSize / 2. + * It's possible to modify the job size to increase or decrease + * the granularity of the synchronization point. + * Once the jobSize is smaller than the window size, + * it will result in compression ratio degradation. + * NOTE 1: rsyncable mode only works when multithreading is enabled. + * NOTE 2: rsyncable performs poorly in combination with long range mode, + * since it will decrease the effectiveness of synchronization points, + * though mileage may vary. + * NOTE 3: Rsyncable mode limits maximum compression speed to ~400 MB/s. + * If the selected compression level is already running significantly slower, + * the overall speed won't be significantly impacted. + */ + #define ZSTD_c_rsyncable ZSTD_c_experimentalParam1 + +/* Select a compression format. + * The value must be of type ZSTD_format_e. + * See ZSTD_format_e enum definition for details */ +#define ZSTD_c_format ZSTD_c_experimentalParam2 + +/* Force back-reference distances to remain < windowSize, + * even when referencing into Dictionary content (default:0) */ +#define ZSTD_c_forceMaxWindow ZSTD_c_experimentalParam3 + +/* Controls whether the contents of a CDict + * are used in place, or copied into the working context. + * Accepts values from the ZSTD_dictAttachPref_e enum. + * See the comments on that enum for an explanation of the feature. */ +#define ZSTD_c_forceAttachDict ZSTD_c_experimentalParam4 + +/* Controlled with ZSTD_paramSwitch_e enum. + * Default is ZSTD_ps_auto. + * Set to ZSTD_ps_disable to never compress literals. + * Set to ZSTD_ps_enable to always compress literals. (Note: uncompressed literals + * may still be emitted if huffman is not beneficial to use.) + * + * By default, in ZSTD_ps_auto, the library will decide at runtime whether to use + * literals compression based on the compression parameters - specifically, + * negative compression levels do not use literal compression. + */ +#define ZSTD_c_literalCompressionMode ZSTD_c_experimentalParam5 + +/* User's best guess of source size. + * Hint is not valid when srcSizeHint == 0. + * There is no guarantee that hint is close to actual source size, + * but compression ratio may regress significantly if guess considerably underestimates */ +#define ZSTD_c_srcSizeHint ZSTD_c_experimentalParam7 + +/* Controls whether the new and experimental "dedicated dictionary search + * structure" can be used. This feature is still rough around the edges, be + * prepared for surprising behavior! + * + * How to use it: + * + * When using a CDict, whether to use this feature or not is controlled at + * CDict creation, and it must be set in a CCtxParams set passed into that + * construction (via ZSTD_createCDict_advanced2()). A compression will then + * use the feature or not based on how the CDict was constructed; the value of + * this param, set in the CCtx, will have no effect. + * + * However, when a dictionary buffer is passed into a CCtx, such as via + * ZSTD_CCtx_loadDictionary(), this param can be set on the CCtx to control + * whether the CDict that is created internally can use the feature or not. + * + * What it does: + * + * Normally, the internal data structures of the CDict are analogous to what + * would be stored in a CCtx after compressing the contents of a dictionary. + * To an approximation, a compression using a dictionary can then use those + * data structures to simply continue what is effectively a streaming + * compression where the simulated compression of the dictionary left off. + * Which is to say, the search structures in the CDict are normally the same + * format as in the CCtx. + * + * It is possible to do better, since the CDict is not like a CCtx: the search + * structures are written once during CDict creation, and then are only read + * after that, while the search structures in the CCtx are both read and + * written as the compression goes along. This means we can choose a search + * structure for the dictionary that is read-optimized. + * + * This feature enables the use of that different structure. + * + * Note that some of the members of the ZSTD_compressionParameters struct have + * different semantics and constraints in the dedicated search structure. It is + * highly recommended that you simply set a compression level in the CCtxParams + * you pass into the CDict creation call, and avoid messing with the cParams + * directly. + * + * Effects: + * + * This will only have any effect when the selected ZSTD_strategy + * implementation supports this feature. Currently, that's limited to + * ZSTD_greedy, ZSTD_lazy, and ZSTD_lazy2. + * + * Note that this means that the CDict tables can no longer be copied into the + * CCtx, so the dict attachment mode ZSTD_dictForceCopy will no longer be + * usable. The dictionary can only be attached or reloaded. + * + * In general, you should expect compression to be faster--sometimes very much + * so--and CDict creation to be slightly slower. Eventually, we will probably + * make this mode the default. + */ +#define ZSTD_c_enableDedicatedDictSearch ZSTD_c_experimentalParam8 + +/* ZSTD_c_stableInBuffer + * Experimental parameter. + * Default is 0 == disabled. Set to 1 to enable. + * + * Tells the compressor that input data presented with ZSTD_inBuffer + * will ALWAYS be the same between calls. + * Technically, the @src pointer must never be changed, + * and the @pos field can only be updated by zstd. + * However, it's possible to increase the @size field, + * allowing scenarios where more data can be appended after compressions starts. + * These conditions are checked by the compressor, + * and compression will fail if they are not respected. + * Also, data in the ZSTD_inBuffer within the range [src, src + pos) + * MUST not be modified during compression or it will result in data corruption. + * + * When this flag is enabled zstd won't allocate an input window buffer, + * because the user guarantees it can reference the ZSTD_inBuffer until + * the frame is complete. But, it will still allocate an output buffer + * large enough to fit a block (see ZSTD_c_stableOutBuffer). This will also + * avoid the memcpy() from the input buffer to the input window buffer. + * + * NOTE: So long as the ZSTD_inBuffer always points to valid memory, using + * this flag is ALWAYS memory safe, and will never access out-of-bounds + * memory. However, compression WILL fail if conditions are not respected. + * + * WARNING: The data in the ZSTD_inBuffer in the range [src, src + pos) MUST + * not be modified during compression or it will result in data corruption. + * This is because zstd needs to reference data in the ZSTD_inBuffer to find + * matches. Normally zstd maintains its own window buffer for this purpose, + * but passing this flag tells zstd to rely on user provided buffer instead. + */ +#define ZSTD_c_stableInBuffer ZSTD_c_experimentalParam9 + +/* ZSTD_c_stableOutBuffer + * Experimental parameter. + * Default is 0 == disabled. Set to 1 to enable. + * + * Tells he compressor that the ZSTD_outBuffer will not be resized between + * calls. Specifically: (out.size - out.pos) will never grow. This gives the + * compressor the freedom to say: If the compressed data doesn't fit in the + * output buffer then return ZSTD_error_dstSizeTooSmall. This allows us to + * always decompress directly into the output buffer, instead of decompressing + * into an internal buffer and copying to the output buffer. + * + * When this flag is enabled zstd won't allocate an output buffer, because + * it can write directly to the ZSTD_outBuffer. It will still allocate the + * input window buffer (see ZSTD_c_stableInBuffer). + * + * Zstd will check that (out.size - out.pos) never grows and return an error + * if it does. While not strictly necessary, this should prevent surprises. + */ +#define ZSTD_c_stableOutBuffer ZSTD_c_experimentalParam10 + +/* ZSTD_c_blockDelimiters + * Default is 0 == ZSTD_sf_noBlockDelimiters. + * + * For use with sequence compression API: ZSTD_compressSequences(). + * + * Designates whether or not the given array of ZSTD_Sequence contains block delimiters + * and last literals, which are defined as sequences with offset == 0 and matchLength == 0. + * See the definition of ZSTD_Sequence for more specifics. + */ +#define ZSTD_c_blockDelimiters ZSTD_c_experimentalParam11 + +/* ZSTD_c_validateSequences + * Default is 0 == disabled. Set to 1 to enable sequence validation. + * + * For use with sequence compression API: ZSTD_compressSequences(). + * Designates whether or not we validate sequences provided to ZSTD_compressSequences() + * during function execution. + * + * Without validation, providing a sequence that does not conform to the zstd spec will cause + * undefined behavior, and may produce a corrupted block. + * + * With validation enabled, if sequence is invalid (see doc/zstd_compression_format.md for + * specifics regarding offset/matchlength requirements) then the function will bail out and + * return an error. + * + */ +#define ZSTD_c_validateSequences ZSTD_c_experimentalParam12 + +/* ZSTD_c_useBlockSplitter + * Controlled with ZSTD_paramSwitch_e enum. + * Default is ZSTD_ps_auto. + * Set to ZSTD_ps_disable to never use block splitter. + * Set to ZSTD_ps_enable to always use block splitter. + * + * By default, in ZSTD_ps_auto, the library will decide at runtime whether to use + * block splitting based on the compression parameters. + */ +#define ZSTD_c_useBlockSplitter ZSTD_c_experimentalParam13 + +/* ZSTD_c_useRowMatchFinder + * Controlled with ZSTD_paramSwitch_e enum. + * Default is ZSTD_ps_auto. + * Set to ZSTD_ps_disable to never use row-based matchfinder. + * Set to ZSTD_ps_enable to force usage of row-based matchfinder. + * + * By default, in ZSTD_ps_auto, the library will decide at runtime whether to use + * the row-based matchfinder based on support for SIMD instructions and the window log. + * Note that this only pertains to compression strategies: greedy, lazy, and lazy2 + */ +#define ZSTD_c_useRowMatchFinder ZSTD_c_experimentalParam14 + +/* ZSTD_c_deterministicRefPrefix + * Default is 0 == disabled. Set to 1 to enable. + * + * Zstd produces different results for prefix compression when the prefix is + * directly adjacent to the data about to be compressed vs. when it isn't. + * This is because zstd detects that the two buffers are contiguous and it can + * use a more efficient match finding algorithm. However, this produces different + * results than when the two buffers are non-contiguous. This flag forces zstd + * to always load the prefix in non-contiguous mode, even if it happens to be + * adjacent to the data, to guarantee determinism. + * + * If you really care about determinism when using a dictionary or prefix, + * like when doing delta compression, you should select this option. It comes + * at a speed penalty of about ~2.5% if the dictionary and data happened to be + * contiguous, and is free if they weren't contiguous. We don't expect that + * intentionally making the dictionary and data contiguous will be worth the + * cost to memcpy() the data. + */ +#define ZSTD_c_deterministicRefPrefix ZSTD_c_experimentalParam15 + +/* ZSTD_c_prefetchCDictTables + * Controlled with ZSTD_paramSwitch_e enum. Default is ZSTD_ps_auto. + * + * In some situations, zstd uses CDict tables in-place rather than copying them + * into the working context. (See docs on ZSTD_dictAttachPref_e above for details). + * In such situations, compression speed is seriously impacted when CDict tables are + * "cold" (outside CPU cache). This parameter instructs zstd to prefetch CDict tables + * when they are used in-place. + * + * For sufficiently small inputs, the cost of the prefetch will outweigh the benefit. + * For sufficiently large inputs, zstd will by default memcpy() CDict tables + * into the working context, so there is no need to prefetch. This parameter is + * targeted at a middle range of input sizes, where a prefetch is cheap enough to be + * useful but memcpy() is too expensive. The exact range of input sizes where this + * makes sense is best determined by careful experimentation. + * + * Note: for this parameter, ZSTD_ps_auto is currently equivalent to ZSTD_ps_disable, + * but in the future zstd may conditionally enable this feature via an auto-detection + * heuristic for cold CDicts. + * Use ZSTD_ps_disable to opt out of prefetching under any circumstances. + */ +#define ZSTD_c_prefetchCDictTables ZSTD_c_experimentalParam16 + +/* ZSTD_c_enableSeqProducerFallback + * Allowed values are 0 (disable) and 1 (enable). The default setting is 0. + * + * Controls whether zstd will fall back to an internal sequence producer if an + * external sequence producer is registered and returns an error code. This fallback + * is block-by-block: the internal sequence producer will only be called for blocks + * where the external sequence producer returns an error code. Fallback parsing will + * follow any other cParam settings, such as compression level, the same as in a + * normal (fully-internal) compression operation. + * + * The user is strongly encouraged to read the full Block-Level Sequence Producer API + * documentation (below) before setting this parameter. */ +#define ZSTD_c_enableSeqProducerFallback ZSTD_c_experimentalParam17 + +/* ZSTD_c_maxBlockSize + * Allowed values are between 1KB and ZSTD_BLOCKSIZE_MAX (128KB). + * The default is ZSTD_BLOCKSIZE_MAX, and setting to 0 will set to the default. + * + * This parameter can be used to set an upper bound on the blocksize + * that overrides the default ZSTD_BLOCKSIZE_MAX. It cannot be used to set upper + * bounds greater than ZSTD_BLOCKSIZE_MAX or bounds lower than 1KB (will make + * compressBound() inaccurate). Only currently meant to be used for testing. + * + */ +#define ZSTD_c_maxBlockSize ZSTD_c_experimentalParam18 + +/* ZSTD_c_searchForExternalRepcodes + * This parameter affects how zstd parses external sequences, such as sequences + * provided through the compressSequences() API or from an external block-level + * sequence producer. + * + * If set to ZSTD_ps_enable, the library will check for repeated offsets in + * external sequences, even if those repcodes are not explicitly indicated in + * the "rep" field. Note that this is the only way to exploit repcode matches + * while using compressSequences() or an external sequence producer, since zstd + * currently ignores the "rep" field of external sequences. + * + * If set to ZSTD_ps_disable, the library will not exploit repeated offsets in + * external sequences, regardless of whether the "rep" field has been set. This + * reduces sequence compression overhead by about 25% while sacrificing some + * compression ratio. + * + * The default value is ZSTD_ps_auto, for which the library will enable/disable + * based on compression level. + * + * Note: for now, this param only has an effect if ZSTD_c_blockDelimiters is + * set to ZSTD_sf_explicitBlockDelimiters. That may change in the future. + */ +#define ZSTD_c_searchForExternalRepcodes ZSTD_c_experimentalParam19 + +/*! ZSTD_CCtx_getParameter() : + * Get the requested compression parameter value, selected by enum ZSTD_cParameter, + * and store it into int* value. + * @return : 0, or an error code (which can be tested with ZSTD_isError()). + */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtx_getParameter(const ZSTD_CCtx* cctx, ZSTD_cParameter param, int* value); + + +/*! ZSTD_CCtx_params : + * Quick howto : + * - ZSTD_createCCtxParams() : Create a ZSTD_CCtx_params structure + * - ZSTD_CCtxParams_setParameter() : Push parameters one by one into + * an existing ZSTD_CCtx_params structure. + * This is similar to + * ZSTD_CCtx_setParameter(). + * - ZSTD_CCtx_setParametersUsingCCtxParams() : Apply parameters to + * an existing CCtx. + * These parameters will be applied to + * all subsequent frames. + * - ZSTD_compressStream2() : Do compression using the CCtx. + * - ZSTD_freeCCtxParams() : Free the memory, accept NULL pointer. + * + * This can be used with ZSTD_estimateCCtxSize_advanced_usingCCtxParams() + * for static allocation of CCtx for single-threaded compression. + */ +ZSTDLIB_STATIC_API ZSTD_CCtx_params* ZSTD_createCCtxParams(void); +ZSTDLIB_STATIC_API size_t ZSTD_freeCCtxParams(ZSTD_CCtx_params* params); /* accept NULL pointer */ + +/*! ZSTD_CCtxParams_reset() : + * Reset params to default values. + */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtxParams_reset(ZSTD_CCtx_params* params); + +/*! ZSTD_CCtxParams_init() : + * Initializes the compression parameters of cctxParams according to + * compression level. All other parameters are reset to their default values. + */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtxParams_init(ZSTD_CCtx_params* cctxParams, int compressionLevel); + +/*! ZSTD_CCtxParams_init_advanced() : + * Initializes the compression and frame parameters of cctxParams according to + * params. All other parameters are reset to their default values. + */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtxParams_init_advanced(ZSTD_CCtx_params* cctxParams, ZSTD_parameters params); + +/*! ZSTD_CCtxParams_setParameter() : Requires v1.4.0+ + * Similar to ZSTD_CCtx_setParameter. + * Set one compression parameter, selected by enum ZSTD_cParameter. + * Parameters must be applied to a ZSTD_CCtx using + * ZSTD_CCtx_setParametersUsingCCtxParams(). + * @result : a code representing success or failure (which can be tested with + * ZSTD_isError()). + */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtxParams_setParameter(ZSTD_CCtx_params* params, ZSTD_cParameter param, int value); + +/*! ZSTD_CCtxParams_getParameter() : + * Similar to ZSTD_CCtx_getParameter. + * Get the requested value of one compression parameter, selected by enum ZSTD_cParameter. + * @result : 0, or an error code (which can be tested with ZSTD_isError()). + */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtxParams_getParameter(const ZSTD_CCtx_params* params, ZSTD_cParameter param, int* value); + +/*! ZSTD_CCtx_setParametersUsingCCtxParams() : + * Apply a set of ZSTD_CCtx_params to the compression context. + * This can be done even after compression is started, + * if nbWorkers==0, this will have no impact until a new compression is started. + * if nbWorkers>=1, new parameters will be picked up at next job, + * with a few restrictions (windowLog, pledgedSrcSize, nbWorkers, jobSize, and overlapLog are not updated). + */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtx_setParametersUsingCCtxParams( + ZSTD_CCtx* cctx, const ZSTD_CCtx_params* params); + +/*! ZSTD_compressStream2_simpleArgs() : + * Same as ZSTD_compressStream2(), + * but using only integral types as arguments. + * This variant might be helpful for binders from dynamic languages + * which have troubles handling structures containing memory pointers. + */ +ZSTDLIB_STATIC_API size_t ZSTD_compressStream2_simpleArgs ( + ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, size_t* dstPos, + const void* src, size_t srcSize, size_t* srcPos, + ZSTD_EndDirective endOp); + + +/*************************************** +* Advanced decompression functions +***************************************/ + +/*! ZSTD_isFrame() : + * Tells if the content of `buffer` starts with a valid Frame Identifier. + * Note : Frame Identifier is 4 bytes. If `size < 4`, @return will always be 0. + * Note 2 : Legacy Frame Identifiers are considered valid only if Legacy Support is enabled. + * Note 3 : Skippable Frame Identifiers are considered valid. */ +ZSTDLIB_STATIC_API unsigned ZSTD_isFrame(const void* buffer, size_t size); + +/*! ZSTD_createDDict_byReference() : + * Create a digested dictionary, ready to start decompression operation without startup delay. + * Dictionary content is referenced, and therefore stays in dictBuffer. + * It is important that dictBuffer outlives DDict, + * it must remain read accessible throughout the lifetime of DDict */ +ZSTDLIB_STATIC_API ZSTD_DDict* ZSTD_createDDict_byReference(const void* dictBuffer, size_t dictSize); + +/*! ZSTD_DCtx_loadDictionary_byReference() : + * Same as ZSTD_DCtx_loadDictionary(), + * but references `dict` content instead of copying it into `dctx`. + * This saves memory if `dict` remains around., + * However, it's imperative that `dict` remains accessible (and unmodified) while being used, so it must outlive decompression. */ +ZSTDLIB_STATIC_API size_t ZSTD_DCtx_loadDictionary_byReference(ZSTD_DCtx* dctx, const void* dict, size_t dictSize); + +/*! ZSTD_DCtx_loadDictionary_advanced() : + * Same as ZSTD_DCtx_loadDictionary(), + * but gives direct control over + * how to load the dictionary (by copy ? by reference ?) + * and how to interpret it (automatic ? force raw mode ? full mode only ?). */ +ZSTDLIB_STATIC_API size_t ZSTD_DCtx_loadDictionary_advanced(ZSTD_DCtx* dctx, const void* dict, size_t dictSize, ZSTD_dictLoadMethod_e dictLoadMethod, ZSTD_dictContentType_e dictContentType); + +/*! ZSTD_DCtx_refPrefix_advanced() : + * Same as ZSTD_DCtx_refPrefix(), but gives finer control over + * how to interpret prefix content (automatic ? force raw mode (default) ? full mode only ?) */ +ZSTDLIB_STATIC_API size_t ZSTD_DCtx_refPrefix_advanced(ZSTD_DCtx* dctx, const void* prefix, size_t prefixSize, ZSTD_dictContentType_e dictContentType); + +/*! ZSTD_DCtx_setMaxWindowSize() : + * Refuses allocating internal buffers for frames requiring a window size larger than provided limit. + * This protects a decoder context from reserving too much memory for itself (potential attack scenario). + * This parameter is only useful in streaming mode, since no internal buffer is allocated in single-pass mode. + * By default, a decompression context accepts all window sizes <= (1 << ZSTD_WINDOWLOG_LIMIT_DEFAULT) + * @return : 0, or an error code (which can be tested using ZSTD_isError()). + */ +ZSTDLIB_STATIC_API size_t ZSTD_DCtx_setMaxWindowSize(ZSTD_DCtx* dctx, size_t maxWindowSize); + +/*! ZSTD_DCtx_getParameter() : + * Get the requested decompression parameter value, selected by enum ZSTD_dParameter, + * and store it into int* value. + * @return : 0, or an error code (which can be tested with ZSTD_isError()). + */ +ZSTDLIB_STATIC_API size_t ZSTD_DCtx_getParameter(ZSTD_DCtx* dctx, ZSTD_dParameter param, int* value); + +/* ZSTD_d_format + * experimental parameter, + * allowing selection between ZSTD_format_e input compression formats + */ +#define ZSTD_d_format ZSTD_d_experimentalParam1 +/* ZSTD_d_stableOutBuffer + * Experimental parameter. + * Default is 0 == disabled. Set to 1 to enable. + * + * Tells the decompressor that the ZSTD_outBuffer will ALWAYS be the same + * between calls, except for the modifications that zstd makes to pos (the + * caller must not modify pos). This is checked by the decompressor, and + * decompression will fail if it ever changes. Therefore the ZSTD_outBuffer + * MUST be large enough to fit the entire decompressed frame. This will be + * checked when the frame content size is known. The data in the ZSTD_outBuffer + * in the range [dst, dst + pos) MUST not be modified during decompression + * or you will get data corruption. + * + * When this flag is enabled zstd won't allocate an output buffer, because + * it can write directly to the ZSTD_outBuffer, but it will still allocate + * an input buffer large enough to fit any compressed block. This will also + * avoid the memcpy() from the internal output buffer to the ZSTD_outBuffer. + * If you need to avoid the input buffer allocation use the buffer-less + * streaming API. + * + * NOTE: So long as the ZSTD_outBuffer always points to valid memory, using + * this flag is ALWAYS memory safe, and will never access out-of-bounds + * memory. However, decompression WILL fail if you violate the preconditions. + * + * WARNING: The data in the ZSTD_outBuffer in the range [dst, dst + pos) MUST + * not be modified during decompression or you will get data corruption. This + * is because zstd needs to reference data in the ZSTD_outBuffer to regenerate + * matches. Normally zstd maintains its own buffer for this purpose, but passing + * this flag tells zstd to use the user provided buffer. + */ +#define ZSTD_d_stableOutBuffer ZSTD_d_experimentalParam2 + +/* ZSTD_d_forceIgnoreChecksum + * Experimental parameter. + * Default is 0 == disabled. Set to 1 to enable + * + * Tells the decompressor to skip checksum validation during decompression, regardless + * of whether checksumming was specified during compression. This offers some + * slight performance benefits, and may be useful for debugging. + * Param has values of type ZSTD_forceIgnoreChecksum_e + */ +#define ZSTD_d_forceIgnoreChecksum ZSTD_d_experimentalParam3 + +/* ZSTD_d_refMultipleDDicts + * Experimental parameter. + * Default is 0 == disabled. Set to 1 to enable + * + * If enabled and dctx is allocated on the heap, then additional memory will be allocated + * to store references to multiple ZSTD_DDict. That is, multiple calls of ZSTD_refDDict() + * using a given ZSTD_DCtx, rather than overwriting the previous DDict reference, will instead + * store all references. At decompression time, the appropriate dictID is selected + * from the set of DDicts based on the dictID in the frame. + * + * Usage is simply calling ZSTD_refDDict() on multiple dict buffers. + * + * Param has values of byte ZSTD_refMultipleDDicts_e + * + * WARNING: Enabling this parameter and calling ZSTD_DCtx_refDDict(), will trigger memory + * allocation for the hash table. ZSTD_freeDCtx() also frees this memory. + * Memory is allocated as per ZSTD_DCtx::customMem. + * + * Although this function allocates memory for the table, the user is still responsible for + * memory management of the underlying ZSTD_DDict* themselves. + */ +#define ZSTD_d_refMultipleDDicts ZSTD_d_experimentalParam4 + +/* ZSTD_d_disableHuffmanAssembly + * Set to 1 to disable the Huffman assembly implementation. + * The default value is 0, which allows zstd to use the Huffman assembly + * implementation if available. + * + * This parameter can be used to disable Huffman assembly at runtime. + * If you want to disable it at compile time you can define the macro + * ZSTD_DISABLE_ASM. + */ +#define ZSTD_d_disableHuffmanAssembly ZSTD_d_experimentalParam5 + +/* ZSTD_d_maxBlockSize + * Allowed values are between 1KB and ZSTD_BLOCKSIZE_MAX (128KB). + * The default is ZSTD_BLOCKSIZE_MAX, and setting to 0 will set to the default. + * + * Forces the decompressor to reject blocks whose content size is + * larger than the configured maxBlockSize. When maxBlockSize is + * larger than the windowSize, the windowSize is used instead. + * This saves memory on the decoder when you know all blocks are small. + * + * This option is typically used in conjunction with ZSTD_c_maxBlockSize. + * + * WARNING: This causes the decoder to reject otherwise valid frames + * that have block sizes larger than the configured maxBlockSize. + */ +#define ZSTD_d_maxBlockSize ZSTD_d_experimentalParam6 + + +/*! ZSTD_DCtx_setFormat() : + * This function is REDUNDANT. Prefer ZSTD_DCtx_setParameter(). + * Instruct the decoder context about what kind of data to decode next. + * This instruction is mandatory to decode data without a fully-formed header, + * such ZSTD_f_zstd1_magicless for example. + * @return : 0, or an error code (which can be tested using ZSTD_isError()). */ +ZSTD_DEPRECATED("use ZSTD_DCtx_setParameter() instead") +ZSTDLIB_STATIC_API +size_t ZSTD_DCtx_setFormat(ZSTD_DCtx* dctx, ZSTD_format_e format); + +/*! ZSTD_decompressStream_simpleArgs() : + * Same as ZSTD_decompressStream(), + * but using only integral types as arguments. + * This can be helpful for binders from dynamic languages + * which have troubles handling structures containing memory pointers. + */ +ZSTDLIB_STATIC_API size_t ZSTD_decompressStream_simpleArgs ( + ZSTD_DCtx* dctx, + void* dst, size_t dstCapacity, size_t* dstPos, + const void* src, size_t srcSize, size_t* srcPos); + + +/******************************************************************** +* Advanced streaming functions +* Warning : most of these functions are now redundant with the Advanced API. +* Once Advanced API reaches "stable" status, +* redundant functions will be deprecated, and then at some point removed. +********************************************************************/ + +/*===== Advanced Streaming compression functions =====*/ + +/*! ZSTD_initCStream_srcSize() : + * This function is DEPRECATED, and equivalent to: + * ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only); + * ZSTD_CCtx_refCDict(zcs, NULL); // clear the dictionary (if any) + * ZSTD_CCtx_setParameter(zcs, ZSTD_c_compressionLevel, compressionLevel); + * ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize); + * + * pledgedSrcSize must be correct. If it is not known at init time, use + * ZSTD_CONTENTSIZE_UNKNOWN. Note that, for compatibility with older programs, + * "0" also disables frame content size field. It may be enabled in the future. + * This prototype will generate compilation warnings. + */ +ZSTD_DEPRECATED("use ZSTD_CCtx_reset, see zstd.h for detailed instructions") +ZSTDLIB_STATIC_API +size_t ZSTD_initCStream_srcSize(ZSTD_CStream* zcs, + int compressionLevel, + unsigned long long pledgedSrcSize); + +/*! ZSTD_initCStream_usingDict() : + * This function is DEPRECATED, and is equivalent to: + * ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only); + * ZSTD_CCtx_setParameter(zcs, ZSTD_c_compressionLevel, compressionLevel); + * ZSTD_CCtx_loadDictionary(zcs, dict, dictSize); + * + * Creates of an internal CDict (incompatible with static CCtx), except if + * dict == NULL or dictSize < 8, in which case no dict is used. + * Note: dict is loaded with ZSTD_dct_auto (treated as a full zstd dictionary if + * it begins with ZSTD_MAGIC_DICTIONARY, else as raw content) and ZSTD_dlm_byCopy. + * This prototype will generate compilation warnings. + */ +ZSTD_DEPRECATED("use ZSTD_CCtx_reset, see zstd.h for detailed instructions") +ZSTDLIB_STATIC_API +size_t ZSTD_initCStream_usingDict(ZSTD_CStream* zcs, + const void* dict, size_t dictSize, + int compressionLevel); + +/*! ZSTD_initCStream_advanced() : + * This function is DEPRECATED, and is equivalent to: + * ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only); + * ZSTD_CCtx_setParams(zcs, params); + * ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize); + * ZSTD_CCtx_loadDictionary(zcs, dict, dictSize); + * + * dict is loaded with ZSTD_dct_auto and ZSTD_dlm_byCopy. + * pledgedSrcSize must be correct. + * If srcSize is not known at init time, use value ZSTD_CONTENTSIZE_UNKNOWN. + * This prototype will generate compilation warnings. + */ +ZSTD_DEPRECATED("use ZSTD_CCtx_reset, see zstd.h for detailed instructions") +ZSTDLIB_STATIC_API +size_t ZSTD_initCStream_advanced(ZSTD_CStream* zcs, + const void* dict, size_t dictSize, + ZSTD_parameters params, + unsigned long long pledgedSrcSize); + +/*! ZSTD_initCStream_usingCDict() : + * This function is DEPRECATED, and equivalent to: + * ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only); + * ZSTD_CCtx_refCDict(zcs, cdict); + * + * note : cdict will just be referenced, and must outlive compression session + * This prototype will generate compilation warnings. + */ +ZSTD_DEPRECATED("use ZSTD_CCtx_reset and ZSTD_CCtx_refCDict, see zstd.h for detailed instructions") +ZSTDLIB_STATIC_API +size_t ZSTD_initCStream_usingCDict(ZSTD_CStream* zcs, const ZSTD_CDict* cdict); + +/*! ZSTD_initCStream_usingCDict_advanced() : + * This function is DEPRECATED, and is equivalent to: + * ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only); + * ZSTD_CCtx_setFParams(zcs, fParams); + * ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize); + * ZSTD_CCtx_refCDict(zcs, cdict); + * + * same as ZSTD_initCStream_usingCDict(), with control over frame parameters. + * pledgedSrcSize must be correct. If srcSize is not known at init time, use + * value ZSTD_CONTENTSIZE_UNKNOWN. + * This prototype will generate compilation warnings. + */ +ZSTD_DEPRECATED("use ZSTD_CCtx_reset and ZSTD_CCtx_refCDict, see zstd.h for detailed instructions") +ZSTDLIB_STATIC_API +size_t ZSTD_initCStream_usingCDict_advanced(ZSTD_CStream* zcs, + const ZSTD_CDict* cdict, + ZSTD_frameParameters fParams, + unsigned long long pledgedSrcSize); + +/*! ZSTD_resetCStream() : + * This function is DEPRECATED, and is equivalent to: + * ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only); + * ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize); + * Note: ZSTD_resetCStream() interprets pledgedSrcSize == 0 as ZSTD_CONTENTSIZE_UNKNOWN, but + * ZSTD_CCtx_setPledgedSrcSize() does not do the same, so ZSTD_CONTENTSIZE_UNKNOWN must be + * explicitly specified. + * + * start a new frame, using same parameters from previous frame. + * This is typically useful to skip dictionary loading stage, since it will reuse it in-place. + * Note that zcs must be init at least once before using ZSTD_resetCStream(). + * If pledgedSrcSize is not known at reset time, use macro ZSTD_CONTENTSIZE_UNKNOWN. + * If pledgedSrcSize > 0, its value must be correct, as it will be written in header, and controlled at the end. + * For the time being, pledgedSrcSize==0 is interpreted as "srcSize unknown" for compatibility with older programs, + * but it will change to mean "empty" in future version, so use macro ZSTD_CONTENTSIZE_UNKNOWN instead. + * @return : 0, or an error code (which can be tested using ZSTD_isError()) + * This prototype will generate compilation warnings. + */ +ZSTD_DEPRECATED("use ZSTD_CCtx_reset, see zstd.h for detailed instructions") +ZSTDLIB_STATIC_API +size_t ZSTD_resetCStream(ZSTD_CStream* zcs, unsigned long long pledgedSrcSize); + + +typedef struct { + unsigned long long ingested; /* nb input bytes read and buffered */ + unsigned long long consumed; /* nb input bytes actually compressed */ + unsigned long long produced; /* nb of compressed bytes generated and buffered */ + unsigned long long flushed; /* nb of compressed bytes flushed : not provided; can be tracked from caller side */ + unsigned currentJobID; /* MT only : latest started job nb */ + unsigned nbActiveWorkers; /* MT only : nb of workers actively compressing at probe time */ +} ZSTD_frameProgression; + +/* ZSTD_getFrameProgression() : + * tells how much data has been ingested (read from input) + * consumed (input actually compressed) and produced (output) for current frame. + * Note : (ingested - consumed) is amount of input data buffered internally, not yet compressed. + * Aggregates progression inside active worker threads. + */ +ZSTDLIB_STATIC_API ZSTD_frameProgression ZSTD_getFrameProgression(const ZSTD_CCtx* cctx); + +/*! ZSTD_toFlushNow() : + * Tell how many bytes are ready to be flushed immediately. + * Useful for multithreading scenarios (nbWorkers >= 1). + * Probe the oldest active job, defined as oldest job not yet entirely flushed, + * and check its output buffer. + * @return : amount of data stored in oldest job and ready to be flushed immediately. + * if @return == 0, it means either : + * + there is no active job (could be checked with ZSTD_frameProgression()), or + * + oldest job is still actively compressing data, + * but everything it has produced has also been flushed so far, + * therefore flush speed is limited by production speed of oldest job + * irrespective of the speed of concurrent (and newer) jobs. + */ +ZSTDLIB_STATIC_API size_t ZSTD_toFlushNow(ZSTD_CCtx* cctx); + + +/*===== Advanced Streaming decompression functions =====*/ + +/*! + * This function is deprecated, and is equivalent to: + * + * ZSTD_DCtx_reset(zds, ZSTD_reset_session_only); + * ZSTD_DCtx_loadDictionary(zds, dict, dictSize); + * + * note: no dictionary will be used if dict == NULL or dictSize < 8 + */ +ZSTD_DEPRECATED("use ZSTD_DCtx_reset + ZSTD_DCtx_loadDictionary, see zstd.h for detailed instructions") +ZSTDLIB_STATIC_API size_t ZSTD_initDStream_usingDict(ZSTD_DStream* zds, const void* dict, size_t dictSize); + +/*! + * This function is deprecated, and is equivalent to: + * + * ZSTD_DCtx_reset(zds, ZSTD_reset_session_only); + * ZSTD_DCtx_refDDict(zds, ddict); + * + * note : ddict is referenced, it must outlive decompression session + */ +ZSTD_DEPRECATED("use ZSTD_DCtx_reset + ZSTD_DCtx_refDDict, see zstd.h for detailed instructions") +ZSTDLIB_STATIC_API size_t ZSTD_initDStream_usingDDict(ZSTD_DStream* zds, const ZSTD_DDict* ddict); + +/*! + * This function is deprecated, and is equivalent to: + * + * ZSTD_DCtx_reset(zds, ZSTD_reset_session_only); + * + * reuse decompression parameters from previous init; saves dictionary loading + */ +ZSTD_DEPRECATED("use ZSTD_DCtx_reset, see zstd.h for detailed instructions") +ZSTDLIB_STATIC_API size_t ZSTD_resetDStream(ZSTD_DStream* zds); + + +/* ********************* BLOCK-LEVEL SEQUENCE PRODUCER API ********************* + * + * *** OVERVIEW *** + * The Block-Level Sequence Producer API allows users to provide their own custom + * sequence producer which libzstd invokes to process each block. The produced list + * of sequences (literals and matches) is then post-processed by libzstd to produce + * valid compressed blocks. + * + * This block-level offload API is a more granular complement of the existing + * frame-level offload API compressSequences() (introduced in v1.5.1). It offers + * an easier migration story for applications already integrated with libzstd: the + * user application continues to invoke the same compression functions + * ZSTD_compress2() or ZSTD_compressStream2() as usual, and transparently benefits + * from the specific advantages of the external sequence producer. For example, + * the sequence producer could be tuned to take advantage of known characteristics + * of the input, to offer better speed / ratio, or could leverage hardware + * acceleration not available within libzstd itself. + * + * See contrib/externalSequenceProducer for an example program employing the + * Block-Level Sequence Producer API. + * + * *** USAGE *** + * The user is responsible for implementing a function of type + * ZSTD_sequenceProducer_F. For each block, zstd will pass the following + * arguments to the user-provided function: + * + * - sequenceProducerState: a pointer to a user-managed state for the sequence + * producer. + * + * - outSeqs, outSeqsCapacity: an output buffer for the sequence producer. + * outSeqsCapacity is guaranteed >= ZSTD_sequenceBound(srcSize). The memory + * backing outSeqs is managed by the CCtx. + * + * - src, srcSize: an input buffer for the sequence producer to parse. + * srcSize is guaranteed to be <= ZSTD_BLOCKSIZE_MAX. + * + * - dict, dictSize: a history buffer, which may be empty, which the sequence + * producer may reference as it parses the src buffer. Currently, zstd will + * always pass dictSize == 0 into external sequence producers, but this will + * change in the future. + * + * - compressionLevel: a signed integer representing the zstd compression level + * set by the user for the current operation. The sequence producer may choose + * to use this information to change its compression strategy and speed/ratio + * tradeoff. Note: the compression level does not reflect zstd parameters set + * through the advanced API. + * + * - windowSize: a size_t representing the maximum allowed offset for external + * sequences. Note that sequence offsets are sometimes allowed to exceed the + * windowSize if a dictionary is present, see doc/zstd_compression_format.md + * for details. + * + * The user-provided function shall return a size_t representing the number of + * sequences written to outSeqs. This return value will be treated as an error + * code if it is greater than outSeqsCapacity. The return value must be non-zero + * if srcSize is non-zero. The ZSTD_SEQUENCE_PRODUCER_ERROR macro is provided + * for convenience, but any value greater than outSeqsCapacity will be treated as + * an error code. + * + * If the user-provided function does not return an error code, the sequences + * written to outSeqs must be a valid parse of the src buffer. Data corruption may + * occur if the parse is not valid. A parse is defined to be valid if the + * following conditions hold: + * - The sum of matchLengths and literalLengths must equal srcSize. + * - All sequences in the parse, except for the final sequence, must have + * matchLength >= ZSTD_MINMATCH_MIN. The final sequence must have + * matchLength >= ZSTD_MINMATCH_MIN or matchLength == 0. + * - All offsets must respect the windowSize parameter as specified in + * doc/zstd_compression_format.md. + * - If the final sequence has matchLength == 0, it must also have offset == 0. + * + * zstd will only validate these conditions (and fail compression if they do not + * hold) if the ZSTD_c_validateSequences cParam is enabled. Note that sequence + * validation has a performance cost. + * + * If the user-provided function returns an error, zstd will either fall back + * to an internal sequence producer or fail the compression operation. The user can + * choose between the two behaviors by setting the ZSTD_c_enableSeqProducerFallback + * cParam. Fallback compression will follow any other cParam settings, such as + * compression level, the same as in a normal compression operation. + * + * The user shall instruct zstd to use a particular ZSTD_sequenceProducer_F + * function by calling + * ZSTD_registerSequenceProducer(cctx, + * sequenceProducerState, + * sequenceProducer) + * This setting will persist until the next parameter reset of the CCtx. + * + * The sequenceProducerState must be initialized by the user before calling + * ZSTD_registerSequenceProducer(). The user is responsible for destroying the + * sequenceProducerState. + * + * *** LIMITATIONS *** + * This API is compatible with all zstd compression APIs which respect advanced parameters. + * However, there are three limitations: + * + * First, the ZSTD_c_enableLongDistanceMatching cParam is not currently supported. + * COMPRESSION WILL FAIL if it is enabled and the user tries to compress with a block-level + * external sequence producer. + * - Note that ZSTD_c_enableLongDistanceMatching is auto-enabled by default in some + * cases (see its documentation for details). Users must explicitly set + * ZSTD_c_enableLongDistanceMatching to ZSTD_ps_disable in such cases if an external + * sequence producer is registered. + * - As of this writing, ZSTD_c_enableLongDistanceMatching is disabled by default + * whenever ZSTD_c_windowLog < 128MB, but that's subject to change. Users should + * check the docs on ZSTD_c_enableLongDistanceMatching whenever the Block-Level Sequence + * Producer API is used in conjunction with advanced settings (like ZSTD_c_windowLog). + * + * Second, history buffers are not currently supported. Concretely, zstd will always pass + * dictSize == 0 to the external sequence producer (for now). This has two implications: + * - Dictionaries are not currently supported. Compression will *not* fail if the user + * references a dictionary, but the dictionary won't have any effect. + * - Stream history is not currently supported. All advanced compression APIs, including + * streaming APIs, work with external sequence producers, but each block is treated as + * an independent chunk without history from previous blocks. + * + * Third, multi-threading within a single compression is not currently supported. In other words, + * COMPRESSION WILL FAIL if ZSTD_c_nbWorkers > 0 and an external sequence producer is registered. + * Multi-threading across compressions is fine: simply create one CCtx per thread. + * + * Long-term, we plan to overcome all three limitations. There is no technical blocker to + * overcoming them. It is purely a question of engineering effort. + */ + +#define ZSTD_SEQUENCE_PRODUCER_ERROR ((size_t)(-1)) + +typedef size_t (*ZSTD_sequenceProducer_F) ( + void* sequenceProducerState, + ZSTD_Sequence* outSeqs, size_t outSeqsCapacity, + const void* src, size_t srcSize, + const void* dict, size_t dictSize, + int compressionLevel, + size_t windowSize +); + +/*! ZSTD_registerSequenceProducer() : + * Instruct zstd to use a block-level external sequence producer function. + * + * The sequenceProducerState must be initialized by the caller, and the caller is + * responsible for managing its lifetime. This parameter is sticky across + * compressions. It will remain set until the user explicitly resets compression + * parameters. + * + * Sequence producer registration is considered to be an "advanced parameter", + * part of the "advanced API". This means it will only have an effect on compression + * APIs which respect advanced parameters, such as compress2() and compressStream2(). + * Older compression APIs such as compressCCtx(), which predate the introduction of + * "advanced parameters", will ignore any external sequence producer setting. + * + * The sequence producer can be "cleared" by registering a NULL function pointer. This + * removes all limitations described above in the "LIMITATIONS" section of the API docs. + * + * The user is strongly encouraged to read the full API documentation (above) before + * calling this function. */ +ZSTDLIB_STATIC_API void +ZSTD_registerSequenceProducer( + ZSTD_CCtx* cctx, + void* sequenceProducerState, + ZSTD_sequenceProducer_F sequenceProducer +); + +/*! ZSTD_CCtxParams_registerSequenceProducer() : + * Same as ZSTD_registerSequenceProducer(), but operates on ZSTD_CCtx_params. + * This is used for accurate size estimation with ZSTD_estimateCCtxSize_usingCCtxParams(), + * which is needed when creating a ZSTD_CCtx with ZSTD_initStaticCCtx(). + * + * If you are using the external sequence producer API in a scenario where ZSTD_initStaticCCtx() + * is required, then this function is for you. Otherwise, you probably don't need it. + * + * See tests/zstreamtest.c for example usage. */ +ZSTDLIB_STATIC_API void +ZSTD_CCtxParams_registerSequenceProducer( + ZSTD_CCtx_params* params, + void* sequenceProducerState, + ZSTD_sequenceProducer_F sequenceProducer +); + + +/********************************************************************* +* Buffer-less and synchronous inner streaming functions (DEPRECATED) +* +* This API is deprecated, and will be removed in a future version. +* It allows streaming (de)compression with user allocated buffers. +* However, it is hard to use, and not as well tested as the rest of +* our API. +* +* Please use the normal streaming API instead: ZSTD_compressStream2, +* and ZSTD_decompressStream. +* If there is functionality that you need, but it doesn't provide, +* please open an issue on our GitHub. +********************************************************************* */ + +/** + Buffer-less streaming compression (synchronous mode) + + A ZSTD_CCtx object is required to track streaming operations. + Use ZSTD_createCCtx() / ZSTD_freeCCtx() to manage resource. + ZSTD_CCtx object can be reused multiple times within successive compression operations. + + Start by initializing a context. + Use ZSTD_compressBegin(), or ZSTD_compressBegin_usingDict() for dictionary compression. + + Then, consume your input using ZSTD_compressContinue(). + There are some important considerations to keep in mind when using this advanced function : + - ZSTD_compressContinue() has no internal buffer. It uses externally provided buffers only. + - Interface is synchronous : input is consumed entirely and produces 1+ compressed blocks. + - Caller must ensure there is enough space in `dst` to store compressed data under worst case scenario. + Worst case evaluation is provided by ZSTD_compressBound(). + ZSTD_compressContinue() doesn't guarantee recover after a failed compression. + - ZSTD_compressContinue() presumes prior input ***is still accessible and unmodified*** (up to maximum distance size, see WindowLog). + It remembers all previous contiguous blocks, plus one separated memory segment (which can itself consists of multiple contiguous blocks) + - ZSTD_compressContinue() detects that prior input has been overwritten when `src` buffer overlaps. + In which case, it will "discard" the relevant memory section from its history. + + Finish a frame with ZSTD_compressEnd(), which will write the last block(s) and optional checksum. + It's possible to use srcSize==0, in which case, it will write a final empty block to end the frame. + Without last block mark, frames are considered unfinished (hence corrupted) by compliant decoders. + + `ZSTD_CCtx` object can be reused (ZSTD_compressBegin()) to compress again. +*/ + +/*===== Buffer-less streaming compression functions =====*/ +ZSTD_DEPRECATED("The buffer-less API is deprecated in favor of the normal streaming API. See docs.") +ZSTDLIB_STATIC_API size_t ZSTD_compressBegin(ZSTD_CCtx* cctx, int compressionLevel); +ZSTD_DEPRECATED("The buffer-less API is deprecated in favor of the normal streaming API. See docs.") +ZSTDLIB_STATIC_API size_t ZSTD_compressBegin_usingDict(ZSTD_CCtx* cctx, const void* dict, size_t dictSize, int compressionLevel); +ZSTD_DEPRECATED("The buffer-less API is deprecated in favor of the normal streaming API. See docs.") +ZSTDLIB_STATIC_API size_t ZSTD_compressBegin_usingCDict(ZSTD_CCtx* cctx, const ZSTD_CDict* cdict); /**< note: fails if cdict==NULL */ + +ZSTD_DEPRECATED("This function will likely be removed in a future release. It is misleading and has very limited utility.") +ZSTDLIB_STATIC_API +size_t ZSTD_copyCCtx(ZSTD_CCtx* cctx, const ZSTD_CCtx* preparedCCtx, unsigned long long pledgedSrcSize); /**< note: if pledgedSrcSize is not known, use ZSTD_CONTENTSIZE_UNKNOWN */ + +ZSTD_DEPRECATED("The buffer-less API is deprecated in favor of the normal streaming API. See docs.") +ZSTDLIB_STATIC_API size_t ZSTD_compressContinue(ZSTD_CCtx* cctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize); +ZSTD_DEPRECATED("The buffer-less API is deprecated in favor of the normal streaming API. See docs.") +ZSTDLIB_STATIC_API size_t ZSTD_compressEnd(ZSTD_CCtx* cctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize); + +/* The ZSTD_compressBegin_advanced() and ZSTD_compressBegin_usingCDict_advanced() are now DEPRECATED and will generate a compiler warning */ +ZSTD_DEPRECATED("use advanced API to access custom parameters") +ZSTDLIB_STATIC_API +size_t ZSTD_compressBegin_advanced(ZSTD_CCtx* cctx, const void* dict, size_t dictSize, ZSTD_parameters params, unsigned long long pledgedSrcSize); /**< pledgedSrcSize : If srcSize is not known at init time, use ZSTD_CONTENTSIZE_UNKNOWN */ +ZSTD_DEPRECATED("use advanced API to access custom parameters") +ZSTDLIB_STATIC_API +size_t ZSTD_compressBegin_usingCDict_advanced(ZSTD_CCtx* const cctx, const ZSTD_CDict* const cdict, ZSTD_frameParameters const fParams, unsigned long long const pledgedSrcSize); /* compression parameters are already set within cdict. pledgedSrcSize must be correct. If srcSize is not known, use macro ZSTD_CONTENTSIZE_UNKNOWN */ +/** + Buffer-less streaming decompression (synchronous mode) + + A ZSTD_DCtx object is required to track streaming operations. + Use ZSTD_createDCtx() / ZSTD_freeDCtx() to manage it. + A ZSTD_DCtx object can be reused multiple times. + + First typical operation is to retrieve frame parameters, using ZSTD_getFrameHeader(). + Frame header is extracted from the beginning of compressed frame, so providing only the frame's beginning is enough. + Data fragment must be large enough to ensure successful decoding. + `ZSTD_frameHeaderSize_max` bytes is guaranteed to always be large enough. + result : 0 : successful decoding, the `ZSTD_frameHeader` structure is correctly filled. + >0 : `srcSize` is too small, please provide at least result bytes on next attempt. + errorCode, which can be tested using ZSTD_isError(). + + It fills a ZSTD_frameHeader structure with important information to correctly decode the frame, + such as the dictionary ID, content size, or maximum back-reference distance (`windowSize`). + Note that these values could be wrong, either because of data corruption, or because a 3rd party deliberately spoofs false information. + As a consequence, check that values remain within valid application range. + For example, do not allocate memory blindly, check that `windowSize` is within expectation. + Each application can set its own limits, depending on local restrictions. + For extended interoperability, it is recommended to support `windowSize` of at least 8 MB. + + ZSTD_decompressContinue() needs previous data blocks during decompression, up to `windowSize` bytes. + ZSTD_decompressContinue() is very sensitive to contiguity, + if 2 blocks don't follow each other, make sure that either the compressor breaks contiguity at the same place, + or that previous contiguous segment is large enough to properly handle maximum back-reference distance. + There are multiple ways to guarantee this condition. + + The most memory efficient way is to use a round buffer of sufficient size. + Sufficient size is determined by invoking ZSTD_decodingBufferSize_min(), + which can return an error code if required value is too large for current system (in 32-bits mode). + In a round buffer methodology, ZSTD_decompressContinue() decompresses each block next to previous one, + up to the moment there is not enough room left in the buffer to guarantee decoding another full block, + which maximum size is provided in `ZSTD_frameHeader` structure, field `blockSizeMax`. + At which point, decoding can resume from the beginning of the buffer. + Note that already decoded data stored in the buffer should be flushed before being overwritten. + + There are alternatives possible, for example using two or more buffers of size `windowSize` each, though they consume more memory. + + Finally, if you control the compression process, you can also ignore all buffer size rules, + as long as the encoder and decoder progress in "lock-step", + aka use exactly the same buffer sizes, break contiguity at the same place, etc. + + Once buffers are setup, start decompression, with ZSTD_decompressBegin(). + If decompression requires a dictionary, use ZSTD_decompressBegin_usingDict() or ZSTD_decompressBegin_usingDDict(). + + Then use ZSTD_nextSrcSizeToDecompress() and ZSTD_decompressContinue() alternatively. + ZSTD_nextSrcSizeToDecompress() tells how many bytes to provide as 'srcSize' to ZSTD_decompressContinue(). + ZSTD_decompressContinue() requires this _exact_ amount of bytes, or it will fail. + + result of ZSTD_decompressContinue() is the number of bytes regenerated within 'dst' (necessarily <= dstCapacity). + It can be zero : it just means ZSTD_decompressContinue() has decoded some metadata item. + It can also be an error code, which can be tested with ZSTD_isError(). + + A frame is fully decoded when ZSTD_nextSrcSizeToDecompress() returns zero. + Context can then be reset to start a new decompression. + + Note : it's possible to know if next input to present is a header or a block, using ZSTD_nextInputType(). + This information is not required to properly decode a frame. + + == Special case : skippable frames == + + Skippable frames allow integration of user-defined data into a flow of concatenated frames. + Skippable frames will be ignored (skipped) by decompressor. + The format of skippable frames is as follows : + a) Skippable frame ID - 4 Bytes, Little endian format, any value from 0x184D2A50 to 0x184D2A5F + b) Frame Size - 4 Bytes, Little endian format, unsigned 32-bits + c) Frame Content - any content (User Data) of length equal to Frame Size + For skippable frames ZSTD_getFrameHeader() returns zfhPtr->frameType==ZSTD_skippableFrame. + For skippable frames ZSTD_decompressContinue() always returns 0 : it only skips the content. +*/ + +/*===== Buffer-less streaming decompression functions =====*/ + +ZSTDLIB_STATIC_API size_t ZSTD_decodingBufferSize_min(unsigned long long windowSize, unsigned long long frameContentSize); /**< when frame content size is not known, pass in frameContentSize == ZSTD_CONTENTSIZE_UNKNOWN */ + +ZSTDLIB_STATIC_API size_t ZSTD_decompressBegin(ZSTD_DCtx* dctx); +ZSTDLIB_STATIC_API size_t ZSTD_decompressBegin_usingDict(ZSTD_DCtx* dctx, const void* dict, size_t dictSize); +ZSTDLIB_STATIC_API size_t ZSTD_decompressBegin_usingDDict(ZSTD_DCtx* dctx, const ZSTD_DDict* ddict); + +ZSTDLIB_STATIC_API size_t ZSTD_nextSrcSizeToDecompress(ZSTD_DCtx* dctx); +ZSTDLIB_STATIC_API size_t ZSTD_decompressContinue(ZSTD_DCtx* dctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize); + +/* misc */ +ZSTD_DEPRECATED("This function will likely be removed in the next minor release. It is misleading and has very limited utility.") +ZSTDLIB_STATIC_API void ZSTD_copyDCtx(ZSTD_DCtx* dctx, const ZSTD_DCtx* preparedDCtx); +typedef enum { ZSTDnit_frameHeader, ZSTDnit_blockHeader, ZSTDnit_block, ZSTDnit_lastBlock, ZSTDnit_checksum, ZSTDnit_skippableFrame } ZSTD_nextInputType_e; +ZSTDLIB_STATIC_API ZSTD_nextInputType_e ZSTD_nextInputType(ZSTD_DCtx* dctx); + + + + +/* ========================================= */ +/** Block level API (DEPRECATED) */ +/* ========================================= */ + +/*! + + This API is deprecated in favor of the regular compression API. + You can get the frame header down to 2 bytes by setting: + - ZSTD_c_format = ZSTD_f_zstd1_magicless + - ZSTD_c_contentSizeFlag = 0 + - ZSTD_c_checksumFlag = 0 + - ZSTD_c_dictIDFlag = 0 + + This API is not as well tested as our normal API, so we recommend not using it. + We will be removing it in a future version. If the normal API doesn't provide + the functionality you need, please open a GitHub issue. + + Block functions produce and decode raw zstd blocks, without frame metadata. + Frame metadata cost is typically ~12 bytes, which can be non-negligible for very small blocks (< 100 bytes). + But users will have to take in charge needed metadata to regenerate data, such as compressed and content sizes. + + A few rules to respect : + - Compressing and decompressing require a context structure + + Use ZSTD_createCCtx() and ZSTD_createDCtx() + - It is necessary to init context before starting + + compression : any ZSTD_compressBegin*() variant, including with dictionary + + decompression : any ZSTD_decompressBegin*() variant, including with dictionary + - Block size is limited, it must be <= ZSTD_getBlockSize() <= ZSTD_BLOCKSIZE_MAX == 128 KB + + If input is larger than a block size, it's necessary to split input data into multiple blocks + + For inputs larger than a single block, consider using regular ZSTD_compress() instead. + Frame metadata is not that costly, and quickly becomes negligible as source size grows larger than a block. + - When a block is considered not compressible enough, ZSTD_compressBlock() result will be 0 (zero) ! + ===> In which case, nothing is produced into `dst` ! + + User __must__ test for such outcome and deal directly with uncompressed data + + A block cannot be declared incompressible if ZSTD_compressBlock() return value was != 0. + Doing so would mess up with statistics history, leading to potential data corruption. + + ZSTD_decompressBlock() _doesn't accept uncompressed data as input_ !! + + In case of multiple successive blocks, should some of them be uncompressed, + decoder must be informed of their existence in order to follow proper history. + Use ZSTD_insertBlock() for such a case. +*/ + +/*===== Raw zstd block functions =====*/ +ZSTD_DEPRECATED("The block API is deprecated in favor of the normal compression API. See docs.") +ZSTDLIB_STATIC_API size_t ZSTD_getBlockSize (const ZSTD_CCtx* cctx); +ZSTD_DEPRECATED("The block API is deprecated in favor of the normal compression API. See docs.") +ZSTDLIB_STATIC_API size_t ZSTD_compressBlock (ZSTD_CCtx* cctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize); +ZSTD_DEPRECATED("The block API is deprecated in favor of the normal compression API. See docs.") +ZSTDLIB_STATIC_API size_t ZSTD_decompressBlock(ZSTD_DCtx* dctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize); +ZSTD_DEPRECATED("The block API is deprecated in favor of the normal compression API. See docs.") +ZSTDLIB_STATIC_API size_t ZSTD_insertBlock (ZSTD_DCtx* dctx, const void* blockStart, size_t blockSize); /**< insert uncompressed block into `dctx` history. Useful for multi-blocks decompression. */ + +#endif /* ZSTD_H_ZSTD_STATIC_LINKING_ONLY */ + +#if defined (__cplusplus) +} +#endif +/**** ended inlining ../zstd.h ****/ + +#ifndef ZSTD_ALLOCATIONS_H +#define ZSTD_ALLOCATIONS_H + +/* custom memory allocation functions */ + +MEM_STATIC void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem) +{ + if (customMem.customAlloc) + return customMem.customAlloc(customMem.opaque, size); + return ZSTD_malloc(size); +} + +MEM_STATIC void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem) +{ + if (customMem.customAlloc) { + /* calloc implemented as malloc+memset; + * not as efficient as calloc, but next best guess for custom malloc */ + void* const ptr = customMem.customAlloc(customMem.opaque, size); + ZSTD_memset(ptr, 0, size); + return ptr; + } + return ZSTD_calloc(1, size); +} + +MEM_STATIC void ZSTD_customFree(void* ptr, ZSTD_customMem customMem) +{ + if (ptr!=NULL) { + if (customMem.customFree) + customMem.customFree(customMem.opaque, ptr); + else + ZSTD_free(ptr); + } +} + +#endif /* ZSTD_ALLOCATIONS_H */ +/**** ended inlining ../common/allocations.h ****/ +/**** skipping file: zstd_deps.h ****/ +/**** skipping file: debug.h ****/ +/**** start inlining pool.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +#ifndef POOL_H +#define POOL_H + +#if defined (__cplusplus) +extern "C" { +#endif + + +/**** skipping file: zstd_deps.h ****/ +#define ZSTD_STATIC_LINKING_ONLY /* ZSTD_customMem */ +/**** skipping file: ../zstd.h ****/ + +typedef struct POOL_ctx_s POOL_ctx; + +/*! POOL_create() : + * Create a thread pool with at most `numThreads` threads. + * `numThreads` must be at least 1. + * The maximum number of queued jobs before blocking is `queueSize`. + * @return : POOL_ctx pointer on success, else NULL. +*/ +POOL_ctx* POOL_create(size_t numThreads, size_t queueSize); + +POOL_ctx* POOL_create_advanced(size_t numThreads, size_t queueSize, + ZSTD_customMem customMem); + +/*! POOL_free() : + * Free a thread pool returned by POOL_create(). + */ +void POOL_free(POOL_ctx* ctx); + + +/*! POOL_joinJobs() : + * Waits for all queued jobs to finish executing. + */ +void POOL_joinJobs(POOL_ctx* ctx); + +/*! POOL_resize() : + * Expands or shrinks pool's number of threads. + * This is more efficient than releasing + creating a new context, + * since it tries to preserve and reuse existing threads. + * `numThreads` must be at least 1. + * @return : 0 when resize was successful, + * !0 (typically 1) if there is an error. + * note : only numThreads can be resized, queueSize remains unchanged. + */ +int POOL_resize(POOL_ctx* ctx, size_t numThreads); + +/*! POOL_sizeof() : + * @return threadpool memory usage + * note : compatible with NULL (returns 0 in this case) + */ +size_t POOL_sizeof(const POOL_ctx* ctx); + +/*! POOL_function : + * The function type that can be added to a thread pool. + */ +typedef void (*POOL_function)(void*); + +/*! POOL_add() : + * Add the job `function(opaque)` to the thread pool. `ctx` must be valid. + * Possibly blocks until there is room in the queue. + * Note : The function may be executed asynchronously, + * therefore, `opaque` must live until function has been completed. + */ +void POOL_add(POOL_ctx* ctx, POOL_function function, void* opaque); + + +/*! POOL_tryAdd() : + * Add the job `function(opaque)` to thread pool _if_ a queue slot is available. + * Returns immediately even if not (does not block). + * @return : 1 if successful, 0 if not. + */ +int POOL_tryAdd(POOL_ctx* ctx, POOL_function function, void* opaque); + + +#if defined (__cplusplus) +} +#endif + +#endif +/**** ended inlining pool.h ****/ + +/* ====== Compiler specifics ====== */ +#if defined(_MSC_VER) +# pragma warning(disable : 4204) /* disable: C4204: non-constant aggregate initializer */ +#endif + + +#ifdef ZSTD_MULTITHREAD + +/**** skipping file: threading.h ****/ + +/* A job is a function and an opaque argument */ +typedef struct POOL_job_s { + POOL_function function; + void *opaque; +} POOL_job; + +struct POOL_ctx_s { + ZSTD_customMem customMem; + /* Keep track of the threads */ + ZSTD_pthread_t* threads; + size_t threadCapacity; + size_t threadLimit; + + /* The queue is a circular buffer */ + POOL_job *queue; + size_t queueHead; + size_t queueTail; + size_t queueSize; + + /* The number of threads working on jobs */ + size_t numThreadsBusy; + /* Indicates if the queue is empty */ + int queueEmpty; + + /* The mutex protects the queue */ + ZSTD_pthread_mutex_t queueMutex; + /* Condition variable for pushers to wait on when the queue is full */ + ZSTD_pthread_cond_t queuePushCond; + /* Condition variables for poppers to wait on when the queue is empty */ + ZSTD_pthread_cond_t queuePopCond; + /* Indicates if the queue is shutting down */ + int shutdown; +}; + +/* POOL_thread() : + * Work thread for the thread pool. + * Waits for jobs and executes them. + * @returns : NULL on failure else non-null. + */ +static void* POOL_thread(void* opaque) { + POOL_ctx* const ctx = (POOL_ctx*)opaque; + if (!ctx) { return NULL; } + for (;;) { + /* Lock the mutex and wait for a non-empty queue or until shutdown */ + ZSTD_pthread_mutex_lock(&ctx->queueMutex); + + while ( ctx->queueEmpty + || (ctx->numThreadsBusy >= ctx->threadLimit) ) { + if (ctx->shutdown) { + /* even if !queueEmpty, (possible if numThreadsBusy >= threadLimit), + * a few threads will be shutdown while !queueEmpty, + * but enough threads will remain active to finish the queue */ + ZSTD_pthread_mutex_unlock(&ctx->queueMutex); + return opaque; + } + ZSTD_pthread_cond_wait(&ctx->queuePopCond, &ctx->queueMutex); + } + /* Pop a job off the queue */ + { POOL_job const job = ctx->queue[ctx->queueHead]; + ctx->queueHead = (ctx->queueHead + 1) % ctx->queueSize; + ctx->numThreadsBusy++; + ctx->queueEmpty = (ctx->queueHead == ctx->queueTail); + /* Unlock the mutex, signal a pusher, and run the job */ + ZSTD_pthread_cond_signal(&ctx->queuePushCond); + ZSTD_pthread_mutex_unlock(&ctx->queueMutex); + + job.function(job.opaque); + + /* If the intended queue size was 0, signal after finishing job */ + ZSTD_pthread_mutex_lock(&ctx->queueMutex); + ctx->numThreadsBusy--; + ZSTD_pthread_cond_signal(&ctx->queuePushCond); + ZSTD_pthread_mutex_unlock(&ctx->queueMutex); + } + } /* for (;;) */ + assert(0); /* Unreachable */ +} + +/* ZSTD_createThreadPool() : public access point */ +POOL_ctx* ZSTD_createThreadPool(size_t numThreads) { + return POOL_create (numThreads, 0); +} + +POOL_ctx* POOL_create(size_t numThreads, size_t queueSize) { + return POOL_create_advanced(numThreads, queueSize, ZSTD_defaultCMem); +} + +POOL_ctx* POOL_create_advanced(size_t numThreads, size_t queueSize, + ZSTD_customMem customMem) +{ + POOL_ctx* ctx; + /* Check parameters */ + if (!numThreads) { return NULL; } + /* Allocate the context and zero initialize */ + ctx = (POOL_ctx*)ZSTD_customCalloc(sizeof(POOL_ctx), customMem); + if (!ctx) { return NULL; } + /* Initialize the job queue. + * It needs one extra space since one space is wasted to differentiate + * empty and full queues. + */ + ctx->queueSize = queueSize + 1; + ctx->queue = (POOL_job*)ZSTD_customCalloc(ctx->queueSize * sizeof(POOL_job), customMem); + ctx->queueHead = 0; + ctx->queueTail = 0; + ctx->numThreadsBusy = 0; + ctx->queueEmpty = 1; + { + int error = 0; + error |= ZSTD_pthread_mutex_init(&ctx->queueMutex, NULL); + error |= ZSTD_pthread_cond_init(&ctx->queuePushCond, NULL); + error |= ZSTD_pthread_cond_init(&ctx->queuePopCond, NULL); + if (error) { POOL_free(ctx); return NULL; } + } + ctx->shutdown = 0; + /* Allocate space for the thread handles */ + ctx->threads = (ZSTD_pthread_t*)ZSTD_customCalloc(numThreads * sizeof(ZSTD_pthread_t), customMem); + ctx->threadCapacity = 0; + ctx->customMem = customMem; + /* Check for errors */ + if (!ctx->threads || !ctx->queue) { POOL_free(ctx); return NULL; } + /* Initialize the threads */ + { size_t i; + for (i = 0; i < numThreads; ++i) { + if (ZSTD_pthread_create(&ctx->threads[i], NULL, &POOL_thread, ctx)) { + ctx->threadCapacity = i; + POOL_free(ctx); + return NULL; + } } + ctx->threadCapacity = numThreads; + ctx->threadLimit = numThreads; + } + return ctx; +} + +/*! POOL_join() : + Shutdown the queue, wake any sleeping threads, and join all of the threads. +*/ +static void POOL_join(POOL_ctx* ctx) { + /* Shut down the queue */ + ZSTD_pthread_mutex_lock(&ctx->queueMutex); + ctx->shutdown = 1; + ZSTD_pthread_mutex_unlock(&ctx->queueMutex); + /* Wake up sleeping threads */ + ZSTD_pthread_cond_broadcast(&ctx->queuePushCond); + ZSTD_pthread_cond_broadcast(&ctx->queuePopCond); + /* Join all of the threads */ + { size_t i; + for (i = 0; i < ctx->threadCapacity; ++i) { + ZSTD_pthread_join(ctx->threads[i]); /* note : could fail */ + } } +} + +void POOL_free(POOL_ctx *ctx) { + if (!ctx) { return; } + POOL_join(ctx); + ZSTD_pthread_mutex_destroy(&ctx->queueMutex); + ZSTD_pthread_cond_destroy(&ctx->queuePushCond); + ZSTD_pthread_cond_destroy(&ctx->queuePopCond); + ZSTD_customFree(ctx->queue, ctx->customMem); + ZSTD_customFree(ctx->threads, ctx->customMem); + ZSTD_customFree(ctx, ctx->customMem); +} + +/*! POOL_joinJobs() : + * Waits for all queued jobs to finish executing. + */ +void POOL_joinJobs(POOL_ctx* ctx) { + ZSTD_pthread_mutex_lock(&ctx->queueMutex); + while(!ctx->queueEmpty || ctx->numThreadsBusy > 0) { + ZSTD_pthread_cond_wait(&ctx->queuePushCond, &ctx->queueMutex); + } + ZSTD_pthread_mutex_unlock(&ctx->queueMutex); +} + +void ZSTD_freeThreadPool (ZSTD_threadPool* pool) { + POOL_free (pool); +} + +size_t POOL_sizeof(const POOL_ctx* ctx) { + if (ctx==NULL) return 0; /* supports sizeof NULL */ + return sizeof(*ctx) + + ctx->queueSize * sizeof(POOL_job) + + ctx->threadCapacity * sizeof(ZSTD_pthread_t); +} + + +/* @return : 0 on success, 1 on error */ +static int POOL_resize_internal(POOL_ctx* ctx, size_t numThreads) +{ + if (numThreads <= ctx->threadCapacity) { + if (!numThreads) return 1; + ctx->threadLimit = numThreads; + return 0; + } + /* numThreads > threadCapacity */ + { ZSTD_pthread_t* const threadPool = (ZSTD_pthread_t*)ZSTD_customCalloc(numThreads * sizeof(ZSTD_pthread_t), ctx->customMem); + if (!threadPool) return 1; + /* replace existing thread pool */ + ZSTD_memcpy(threadPool, ctx->threads, ctx->threadCapacity * sizeof(ZSTD_pthread_t)); + ZSTD_customFree(ctx->threads, ctx->customMem); + ctx->threads = threadPool; + /* Initialize additional threads */ + { size_t threadId; + for (threadId = ctx->threadCapacity; threadId < numThreads; ++threadId) { + if (ZSTD_pthread_create(&threadPool[threadId], NULL, &POOL_thread, ctx)) { + ctx->threadCapacity = threadId; + return 1; + } } + } } + /* successfully expanded */ + ctx->threadCapacity = numThreads; + ctx->threadLimit = numThreads; + return 0; +} + +/* @return : 0 on success, 1 on error */ +int POOL_resize(POOL_ctx* ctx, size_t numThreads) +{ + int result; + if (ctx==NULL) return 1; + ZSTD_pthread_mutex_lock(&ctx->queueMutex); + result = POOL_resize_internal(ctx, numThreads); + ZSTD_pthread_cond_broadcast(&ctx->queuePopCond); + ZSTD_pthread_mutex_unlock(&ctx->queueMutex); + return result; +} + +/** + * Returns 1 if the queue is full and 0 otherwise. + * + * When queueSize is 1 (pool was created with an intended queueSize of 0), + * then a queue is empty if there is a thread free _and_ no job is waiting. + */ +static int isQueueFull(POOL_ctx const* ctx) { + if (ctx->queueSize > 1) { + return ctx->queueHead == ((ctx->queueTail + 1) % ctx->queueSize); + } else { + return (ctx->numThreadsBusy == ctx->threadLimit) || + !ctx->queueEmpty; + } +} + + +static void +POOL_add_internal(POOL_ctx* ctx, POOL_function function, void *opaque) +{ + POOL_job job; + job.function = function; + job.opaque = opaque; + assert(ctx != NULL); + if (ctx->shutdown) return; + + ctx->queueEmpty = 0; + ctx->queue[ctx->queueTail] = job; + ctx->queueTail = (ctx->queueTail + 1) % ctx->queueSize; + ZSTD_pthread_cond_signal(&ctx->queuePopCond); +} + +void POOL_add(POOL_ctx* ctx, POOL_function function, void* opaque) +{ + assert(ctx != NULL); + ZSTD_pthread_mutex_lock(&ctx->queueMutex); + /* Wait until there is space in the queue for the new job */ + while (isQueueFull(ctx) && (!ctx->shutdown)) { + ZSTD_pthread_cond_wait(&ctx->queuePushCond, &ctx->queueMutex); + } + POOL_add_internal(ctx, function, opaque); + ZSTD_pthread_mutex_unlock(&ctx->queueMutex); +} + + +int POOL_tryAdd(POOL_ctx* ctx, POOL_function function, void* opaque) +{ + assert(ctx != NULL); + ZSTD_pthread_mutex_lock(&ctx->queueMutex); + if (isQueueFull(ctx)) { + ZSTD_pthread_mutex_unlock(&ctx->queueMutex); + return 0; + } + POOL_add_internal(ctx, function, opaque); + ZSTD_pthread_mutex_unlock(&ctx->queueMutex); + return 1; +} + + +#else /* ZSTD_MULTITHREAD not defined */ + +/* ========================== */ +/* No multi-threading support */ +/* ========================== */ + + +/* We don't need any data, but if it is empty, malloc() might return NULL. */ +struct POOL_ctx_s { + int dummy; +}; +static POOL_ctx g_poolCtx; + +POOL_ctx* POOL_create(size_t numThreads, size_t queueSize) { + return POOL_create_advanced(numThreads, queueSize, ZSTD_defaultCMem); +} + +POOL_ctx* +POOL_create_advanced(size_t numThreads, size_t queueSize, ZSTD_customMem customMem) +{ + (void)numThreads; + (void)queueSize; + (void)customMem; + return &g_poolCtx; +} + +void POOL_free(POOL_ctx* ctx) { + assert(!ctx || ctx == &g_poolCtx); + (void)ctx; +} + +void POOL_joinJobs(POOL_ctx* ctx){ + assert(!ctx || ctx == &g_poolCtx); + (void)ctx; +} + +int POOL_resize(POOL_ctx* ctx, size_t numThreads) { + (void)ctx; (void)numThreads; + return 0; +} + +void POOL_add(POOL_ctx* ctx, POOL_function function, void* opaque) { + (void)ctx; + function(opaque); +} + +int POOL_tryAdd(POOL_ctx* ctx, POOL_function function, void* opaque) { + (void)ctx; + function(opaque); + return 1; +} + +size_t POOL_sizeof(const POOL_ctx* ctx) { + if (ctx==NULL) return 0; /* supports sizeof NULL */ + assert(ctx == &g_poolCtx); + return sizeof(*ctx); +} + +#endif /* ZSTD_MULTITHREAD */ +/**** ended inlining common/pool.c ****/ +/**** start inlining common/zstd_common.c ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + + + +/*-************************************* +* Dependencies +***************************************/ +#define ZSTD_DEPS_NEED_MALLOC +/**** skipping file: error_private.h ****/ +/**** start inlining zstd_internal.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +#ifndef ZSTD_CCOMMON_H_MODULE +#define ZSTD_CCOMMON_H_MODULE + +/* this module contains definitions which must be identical + * across compression, decompression and dictBuilder. + * It also contains a few functions useful to at least 2 of them + * and which benefit from being inlined */ + +/*-************************************* +* Dependencies +***************************************/ +/**** skipping file: compiler.h ****/ +/**** start inlining cpu.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +#ifndef ZSTD_COMMON_CPU_H +#define ZSTD_COMMON_CPU_H + +/** + * Implementation taken from folly/CpuId.h + * https://github.com/facebook/folly/blob/master/folly/CpuId.h + */ + +/**** skipping file: mem.h ****/ + +#ifdef _MSC_VER +#include +#endif + +typedef struct { + U32 f1c; + U32 f1d; + U32 f7b; + U32 f7c; +} ZSTD_cpuid_t; + +MEM_STATIC ZSTD_cpuid_t ZSTD_cpuid(void) { + U32 f1c = 0; + U32 f1d = 0; + U32 f7b = 0; + U32 f7c = 0; +#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86)) +#if !defined(__clang__) + int reg[4]; + __cpuid((int*)reg, 0); + { + int const n = reg[0]; + if (n >= 1) { + __cpuid((int*)reg, 1); + f1c = (U32)reg[2]; + f1d = (U32)reg[3]; + } + if (n >= 7) { + __cpuidex((int*)reg, 7, 0); + f7b = (U32)reg[1]; + f7c = (U32)reg[2]; + } + } +#else + /* Clang compiler has a bug (fixed in https://reviews.llvm.org/D101338) in + * which the `__cpuid` intrinsic does not save and restore `rbx` as it needs + * to due to being a reserved register. So in that case, do the `cpuid` + * ourselves. Clang supports inline assembly anyway. + */ + U32 n; + __asm__( + "pushq %%rbx\n\t" + "cpuid\n\t" + "popq %%rbx\n\t" + : "=a"(n) + : "a"(0) + : "rcx", "rdx"); + if (n >= 1) { + U32 f1a; + __asm__( + "pushq %%rbx\n\t" + "cpuid\n\t" + "popq %%rbx\n\t" + : "=a"(f1a), "=c"(f1c), "=d"(f1d) + : "a"(1) + :); + } + if (n >= 7) { + __asm__( + "pushq %%rbx\n\t" + "cpuid\n\t" + "movq %%rbx, %%rax\n\t" + "popq %%rbx" + : "=a"(f7b), "=c"(f7c) + : "a"(7), "c"(0) + : "rdx"); + } +#endif +#elif defined(__i386__) && defined(__PIC__) && !defined(__clang__) && defined(__GNUC__) + /* The following block like the normal cpuid branch below, but gcc + * reserves ebx for use of its pic register so we must specially + * handle the save and restore to avoid clobbering the register + */ + U32 n; + __asm__( + "pushl %%ebx\n\t" + "cpuid\n\t" + "popl %%ebx\n\t" + : "=a"(n) + : "a"(0) + : "ecx", "edx"); + if (n >= 1) { + U32 f1a; + __asm__( + "pushl %%ebx\n\t" + "cpuid\n\t" + "popl %%ebx\n\t" + : "=a"(f1a), "=c"(f1c), "=d"(f1d) + : "a"(1)); + } + if (n >= 7) { + __asm__( + "pushl %%ebx\n\t" + "cpuid\n\t" + "movl %%ebx, %%eax\n\t" + "popl %%ebx" + : "=a"(f7b), "=c"(f7c) + : "a"(7), "c"(0) + : "edx"); + } +#elif defined(__x86_64__) || defined(_M_X64) || defined(__i386__) + U32 n; + __asm__("cpuid" : "=a"(n) : "a"(0) : "ebx", "ecx", "edx"); + if (n >= 1) { + U32 f1a; + __asm__("cpuid" : "=a"(f1a), "=c"(f1c), "=d"(f1d) : "a"(1) : "ebx"); + } + if (n >= 7) { + U32 f7a; + __asm__("cpuid" + : "=a"(f7a), "=b"(f7b), "=c"(f7c) + : "a"(7), "c"(0) + : "edx"); + } +#endif + { + ZSTD_cpuid_t cpuid; + cpuid.f1c = f1c; + cpuid.f1d = f1d; + cpuid.f7b = f7b; + cpuid.f7c = f7c; + return cpuid; + } +} + +#define X(name, r, bit) \ + MEM_STATIC int ZSTD_cpuid_##name(ZSTD_cpuid_t const cpuid) { \ + return ((cpuid.r) & (1U << bit)) != 0; \ + } + +/* cpuid(1): Processor Info and Feature Bits. */ +#define C(name, bit) X(name, f1c, bit) + C(sse3, 0) + C(pclmuldq, 1) + C(dtes64, 2) + C(monitor, 3) + C(dscpl, 4) + C(vmx, 5) + C(smx, 6) + C(eist, 7) + C(tm2, 8) + C(ssse3, 9) + C(cnxtid, 10) + C(fma, 12) + C(cx16, 13) + C(xtpr, 14) + C(pdcm, 15) + C(pcid, 17) + C(dca, 18) + C(sse41, 19) + C(sse42, 20) + C(x2apic, 21) + C(movbe, 22) + C(popcnt, 23) + C(tscdeadline, 24) + C(aes, 25) + C(xsave, 26) + C(osxsave, 27) + C(avx, 28) + C(f16c, 29) + C(rdrand, 30) +#undef C +#define D(name, bit) X(name, f1d, bit) + D(fpu, 0) + D(vme, 1) + D(de, 2) + D(pse, 3) + D(tsc, 4) + D(msr, 5) + D(pae, 6) + D(mce, 7) + D(cx8, 8) + D(apic, 9) + D(sep, 11) + D(mtrr, 12) + D(pge, 13) + D(mca, 14) + D(cmov, 15) + D(pat, 16) + D(pse36, 17) + D(psn, 18) + D(clfsh, 19) + D(ds, 21) + D(acpi, 22) + D(mmx, 23) + D(fxsr, 24) + D(sse, 25) + D(sse2, 26) + D(ss, 27) + D(htt, 28) + D(tm, 29) + D(pbe, 31) +#undef D + +/* cpuid(7): Extended Features. */ +#define B(name, bit) X(name, f7b, bit) + B(bmi1, 3) + B(hle, 4) + B(avx2, 5) + B(smep, 7) + B(bmi2, 8) + B(erms, 9) + B(invpcid, 10) + B(rtm, 11) + B(mpx, 14) + B(avx512f, 16) + B(avx512dq, 17) + B(rdseed, 18) + B(adx, 19) + B(smap, 20) + B(avx512ifma, 21) + B(pcommit, 22) + B(clflushopt, 23) + B(clwb, 24) + B(avx512pf, 26) + B(avx512er, 27) + B(avx512cd, 28) + B(sha, 29) + B(avx512bw, 30) + B(avx512vl, 31) +#undef B +#define C(name, bit) X(name, f7c, bit) + C(prefetchwt1, 0) + C(avx512vbmi, 1) +#undef C + +#undef X + +#endif /* ZSTD_COMMON_CPU_H */ +/**** ended inlining cpu.h ****/ +/**** skipping file: mem.h ****/ +/**** skipping file: debug.h ****/ +/**** skipping file: error_private.h ****/ +#define ZSTD_STATIC_LINKING_ONLY +/**** skipping file: ../zstd.h ****/ +#define FSE_STATIC_LINKING_ONLY +/**** skipping file: fse.h ****/ +/**** skipping file: huf.h ****/ +#ifndef XXH_STATIC_LINKING_ONLY +# define XXH_STATIC_LINKING_ONLY /* XXH64_state_t */ +#endif +/**** start inlining xxhash.h ****/ +/* + * xxHash - Extremely Fast Hash algorithm + * Header File + * Copyright (c) Yann Collet - Meta Platforms, Inc + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +/* Local adaptations for Zstandard */ + +#ifndef XXH_NO_XXH3 +# define XXH_NO_XXH3 +#endif + +#ifndef XXH_NAMESPACE +# define XXH_NAMESPACE ZSTD_ +#endif + +/*! + * @mainpage xxHash + * + * xxHash is an extremely fast non-cryptographic hash algorithm, working at RAM speed + * limits. + * + * It is proposed in four flavors, in three families: + * 1. @ref XXH32_family + * - Classic 32-bit hash function. Simple, compact, and runs on almost all + * 32-bit and 64-bit systems. + * 2. @ref XXH64_family + * - Classic 64-bit adaptation of XXH32. Just as simple, and runs well on most + * 64-bit systems (but _not_ 32-bit systems). + * 3. @ref XXH3_family + * - Modern 64-bit and 128-bit hash function family which features improved + * strength and performance across the board, especially on smaller data. + * It benefits greatly from SIMD and 64-bit without requiring it. + * + * Benchmarks + * --- + * The reference system uses an Intel i7-9700K CPU, and runs Ubuntu x64 20.04. + * The open source benchmark program is compiled with clang v10.0 using -O3 flag. + * + * | Hash Name | ISA ext | Width | Large Data Speed | Small Data Velocity | + * | -------------------- | ------- | ----: | ---------------: | ------------------: | + * | XXH3_64bits() | @b AVX2 | 64 | 59.4 GB/s | 133.1 | + * | MeowHash | AES-NI | 128 | 58.2 GB/s | 52.5 | + * | XXH3_128bits() | @b AVX2 | 128 | 57.9 GB/s | 118.1 | + * | CLHash | PCLMUL | 64 | 37.1 GB/s | 58.1 | + * | XXH3_64bits() | @b SSE2 | 64 | 31.5 GB/s | 133.1 | + * | XXH3_128bits() | @b SSE2 | 128 | 29.6 GB/s | 118.1 | + * | RAM sequential read | | N/A | 28.0 GB/s | N/A | + * | ahash | AES-NI | 64 | 22.5 GB/s | 107.2 | + * | City64 | | 64 | 22.0 GB/s | 76.6 | + * | T1ha2 | | 64 | 22.0 GB/s | 99.0 | + * | City128 | | 128 | 21.7 GB/s | 57.7 | + * | FarmHash | AES-NI | 64 | 21.3 GB/s | 71.9 | + * | XXH64() | | 64 | 19.4 GB/s | 71.0 | + * | SpookyHash | | 64 | 19.3 GB/s | 53.2 | + * | Mum | | 64 | 18.0 GB/s | 67.0 | + * | CRC32C | SSE4.2 | 32 | 13.0 GB/s | 57.9 | + * | XXH32() | | 32 | 9.7 GB/s | 71.9 | + * | City32 | | 32 | 9.1 GB/s | 66.0 | + * | Blake3* | @b AVX2 | 256 | 4.4 GB/s | 8.1 | + * | Murmur3 | | 32 | 3.9 GB/s | 56.1 | + * | SipHash* | | 64 | 3.0 GB/s | 43.2 | + * | Blake3* | @b SSE2 | 256 | 2.4 GB/s | 8.1 | + * | HighwayHash | | 64 | 1.4 GB/s | 6.0 | + * | FNV64 | | 64 | 1.2 GB/s | 62.7 | + * | Blake2* | | 256 | 1.1 GB/s | 5.1 | + * | SHA1* | | 160 | 0.8 GB/s | 5.6 | + * | MD5* | | 128 | 0.6 GB/s | 7.8 | + * @note + * - Hashes which require a specific ISA extension are noted. SSE2 is also noted, + * even though it is mandatory on x64. + * - Hashes with an asterisk are cryptographic. Note that MD5 is non-cryptographic + * by modern standards. + * - Small data velocity is a rough average of algorithm's efficiency for small + * data. For more accurate information, see the wiki. + * - More benchmarks and strength tests are found on the wiki: + * https://github.com/Cyan4973/xxHash/wiki + * + * Usage + * ------ + * All xxHash variants use a similar API. Changing the algorithm is a trivial + * substitution. + * + * @pre + * For functions which take an input and length parameter, the following + * requirements are assumed: + * - The range from [`input`, `input + length`) is valid, readable memory. + * - The only exception is if the `length` is `0`, `input` may be `NULL`. + * - For C++, the objects must have the *TriviallyCopyable* property, as the + * functions access bytes directly as if it was an array of `unsigned char`. + * + * @anchor single_shot_example + * **Single Shot** + * + * These functions are stateless functions which hash a contiguous block of memory, + * immediately returning the result. They are the easiest and usually the fastest + * option. + * + * XXH32(), XXH64(), XXH3_64bits(), XXH3_128bits() + * + * @code{.c} + * #include + * #include "xxhash.h" + * + * // Example for a function which hashes a null terminated string with XXH32(). + * XXH32_hash_t hash_string(const char* string, XXH32_hash_t seed) + * { + * // NULL pointers are only valid if the length is zero + * size_t length = (string == NULL) ? 0 : strlen(string); + * return XXH32(string, length, seed); + * } + * @endcode + * + * + * @anchor streaming_example + * **Streaming** + * + * These groups of functions allow incremental hashing of unknown size, even + * more than what would fit in a size_t. + * + * XXH32_reset(), XXH64_reset(), XXH3_64bits_reset(), XXH3_128bits_reset() + * + * @code{.c} + * #include + * #include + * #include "xxhash.h" + * // Example for a function which hashes a FILE incrementally with XXH3_64bits(). + * XXH64_hash_t hashFile(FILE* f) + * { + * // Allocate a state struct. Do not just use malloc() or new. + * XXH3_state_t* state = XXH3_createState(); + * assert(state != NULL && "Out of memory!"); + * // Reset the state to start a new hashing session. + * XXH3_64bits_reset(state); + * char buffer[4096]; + * size_t count; + * // Read the file in chunks + * while ((count = fread(buffer, 1, sizeof(buffer), f)) != 0) { + * // Run update() as many times as necessary to process the data + * XXH3_64bits_update(state, buffer, count); + * } + * // Retrieve the finalized hash. This will not change the state. + * XXH64_hash_t result = XXH3_64bits_digest(state); + * // Free the state. Do not use free(). + * XXH3_freeState(state); + * return result; + * } + * @endcode + * + * Streaming functions generate the xxHash value from an incremental input. + * This method is slower than single-call functions, due to state management. + * For small inputs, prefer `XXH32()` and `XXH64()`, which are better optimized. + * + * An XXH state must first be allocated using `XXH*_createState()`. + * + * Start a new hash by initializing the state with a seed using `XXH*_reset()`. + * + * Then, feed the hash state by calling `XXH*_update()` as many times as necessary. + * + * The function returns an error code, with 0 meaning OK, and any other value + * meaning there is an error. + * + * Finally, a hash value can be produced anytime, by using `XXH*_digest()`. + * This function returns the nn-bits hash as an int or long long. + * + * It's still possible to continue inserting input into the hash state after a + * digest, and generate new hash values later on by invoking `XXH*_digest()`. + * + * When done, release the state using `XXH*_freeState()`. + * + * + * @anchor canonical_representation_example + * **Canonical Representation** + * + * The default return values from XXH functions are unsigned 32, 64 and 128 bit + * integers. + * This the simplest and fastest format for further post-processing. + * + * However, this leaves open the question of what is the order on the byte level, + * since little and big endian conventions will store the same number differently. + * + * The canonical representation settles this issue by mandating big-endian + * convention, the same convention as human-readable numbers (large digits first). + * + * When writing hash values to storage, sending them over a network, or printing + * them, it's highly recommended to use the canonical representation to ensure + * portability across a wider range of systems, present and future. + * + * The following functions allow transformation of hash values to and from + * canonical format. + * + * XXH32_canonicalFromHash(), XXH32_hashFromCanonical(), + * XXH64_canonicalFromHash(), XXH64_hashFromCanonical(), + * XXH128_canonicalFromHash(), XXH128_hashFromCanonical(), + * + * @code{.c} + * #include + * #include "xxhash.h" + * + * // Example for a function which prints XXH32_hash_t in human readable format + * void printXxh32(XXH32_hash_t hash) + * { + * XXH32_canonical_t cano; + * XXH32_canonicalFromHash(&cano, hash); + * size_t i; + * for(i = 0; i < sizeof(cano.digest); ++i) { + * printf("%02x", cano.digest[i]); + * } + * printf("\n"); + * } + * + * // Example for a function which converts XXH32_canonical_t to XXH32_hash_t + * XXH32_hash_t convertCanonicalToXxh32(XXH32_canonical_t cano) + * { + * XXH32_hash_t hash = XXH32_hashFromCanonical(&cano); + * return hash; + * } + * @endcode + * + * + * @file xxhash.h + * xxHash prototypes and implementation + */ + +#if defined (__cplusplus) +extern "C" { +#endif + +/* **************************** + * INLINE mode + ******************************/ +/*! + * @defgroup public Public API + * Contains details on the public xxHash functions. + * @{ + */ +#ifdef XXH_DOXYGEN +/*! + * @brief Gives access to internal state declaration, required for static allocation. + * + * Incompatible with dynamic linking, due to risks of ABI changes. + * + * Usage: + * @code{.c} + * #define XXH_STATIC_LINKING_ONLY + * #include "xxhash.h" + * @endcode + */ +# define XXH_STATIC_LINKING_ONLY +/* Do not undef XXH_STATIC_LINKING_ONLY for Doxygen */ + +/*! + * @brief Gives access to internal definitions. + * + * Usage: + * @code{.c} + * #define XXH_STATIC_LINKING_ONLY + * #define XXH_IMPLEMENTATION + * #include "xxhash.h" + * @endcode + */ +# define XXH_IMPLEMENTATION +/* Do not undef XXH_IMPLEMENTATION for Doxygen */ + +/*! + * @brief Exposes the implementation and marks all functions as `inline`. + * + * Use these build macros to inline xxhash into the target unit. + * Inlining improves performance on small inputs, especially when the length is + * expressed as a compile-time constant: + * + * https://fastcompression.blogspot.com/2018/03/xxhash-for-small-keys-impressive-power.html + * + * It also keeps xxHash symbols private to the unit, so they are not exported. + * + * Usage: + * @code{.c} + * #define XXH_INLINE_ALL + * #include "xxhash.h" + * @endcode + * Do not compile and link xxhash.o as a separate object, as it is not useful. + */ +# define XXH_INLINE_ALL +# undef XXH_INLINE_ALL +/*! + * @brief Exposes the implementation without marking functions as inline. + */ +# define XXH_PRIVATE_API +# undef XXH_PRIVATE_API +/*! + * @brief Emulate a namespace by transparently prefixing all symbols. + * + * If you want to include _and expose_ xxHash functions from within your own + * library, but also want to avoid symbol collisions with other libraries which + * may also include xxHash, you can use @ref XXH_NAMESPACE to automatically prefix + * any public symbol from xxhash library with the value of @ref XXH_NAMESPACE + * (therefore, avoid empty or numeric values). + * + * Note that no change is required within the calling program as long as it + * includes `xxhash.h`: Regular symbol names will be automatically translated + * by this header. + */ +# define XXH_NAMESPACE /* YOUR NAME HERE */ +# undef XXH_NAMESPACE +#endif + +#if (defined(XXH_INLINE_ALL) || defined(XXH_PRIVATE_API)) \ + && !defined(XXH_INLINE_ALL_31684351384) + /* this section should be traversed only once */ +# define XXH_INLINE_ALL_31684351384 + /* give access to the advanced API, required to compile implementations */ +# undef XXH_STATIC_LINKING_ONLY /* avoid macro redef */ +# define XXH_STATIC_LINKING_ONLY + /* make all functions private */ +# undef XXH_PUBLIC_API +# if defined(__GNUC__) +# define XXH_PUBLIC_API static __inline __attribute__((unused)) +# elif defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) +# define XXH_PUBLIC_API static inline +# elif defined(_MSC_VER) +# define XXH_PUBLIC_API static __inline +# else + /* note: this version may generate warnings for unused static functions */ +# define XXH_PUBLIC_API static +# endif + + /* + * This part deals with the special case where a unit wants to inline xxHash, + * but "xxhash.h" has previously been included without XXH_INLINE_ALL, + * such as part of some previously included *.h header file. + * Without further action, the new include would just be ignored, + * and functions would effectively _not_ be inlined (silent failure). + * The following macros solve this situation by prefixing all inlined names, + * avoiding naming collision with previous inclusions. + */ + /* Before that, we unconditionally #undef all symbols, + * in case they were already defined with XXH_NAMESPACE. + * They will then be redefined for XXH_INLINE_ALL + */ +# undef XXH_versionNumber + /* XXH32 */ +# undef XXH32 +# undef XXH32_createState +# undef XXH32_freeState +# undef XXH32_reset +# undef XXH32_update +# undef XXH32_digest +# undef XXH32_copyState +# undef XXH32_canonicalFromHash +# undef XXH32_hashFromCanonical + /* XXH64 */ +# undef XXH64 +# undef XXH64_createState +# undef XXH64_freeState +# undef XXH64_reset +# undef XXH64_update +# undef XXH64_digest +# undef XXH64_copyState +# undef XXH64_canonicalFromHash +# undef XXH64_hashFromCanonical + /* XXH3_64bits */ +# undef XXH3_64bits +# undef XXH3_64bits_withSecret +# undef XXH3_64bits_withSeed +# undef XXH3_64bits_withSecretandSeed +# undef XXH3_createState +# undef XXH3_freeState +# undef XXH3_copyState +# undef XXH3_64bits_reset +# undef XXH3_64bits_reset_withSeed +# undef XXH3_64bits_reset_withSecret +# undef XXH3_64bits_update +# undef XXH3_64bits_digest +# undef XXH3_generateSecret + /* XXH3_128bits */ +# undef XXH128 +# undef XXH3_128bits +# undef XXH3_128bits_withSeed +# undef XXH3_128bits_withSecret +# undef XXH3_128bits_reset +# undef XXH3_128bits_reset_withSeed +# undef XXH3_128bits_reset_withSecret +# undef XXH3_128bits_reset_withSecretandSeed +# undef XXH3_128bits_update +# undef XXH3_128bits_digest +# undef XXH128_isEqual +# undef XXH128_cmp +# undef XXH128_canonicalFromHash +# undef XXH128_hashFromCanonical + /* Finally, free the namespace itself */ +# undef XXH_NAMESPACE + + /* employ the namespace for XXH_INLINE_ALL */ +# define XXH_NAMESPACE XXH_INLINE_ + /* + * Some identifiers (enums, type names) are not symbols, + * but they must nonetheless be renamed to avoid redeclaration. + * Alternative solution: do not redeclare them. + * However, this requires some #ifdefs, and has a more dispersed impact. + * Meanwhile, renaming can be achieved in a single place. + */ +# define XXH_IPREF(Id) XXH_NAMESPACE ## Id +# define XXH_OK XXH_IPREF(XXH_OK) +# define XXH_ERROR XXH_IPREF(XXH_ERROR) +# define XXH_errorcode XXH_IPREF(XXH_errorcode) +# define XXH32_canonical_t XXH_IPREF(XXH32_canonical_t) +# define XXH64_canonical_t XXH_IPREF(XXH64_canonical_t) +# define XXH128_canonical_t XXH_IPREF(XXH128_canonical_t) +# define XXH32_state_s XXH_IPREF(XXH32_state_s) +# define XXH32_state_t XXH_IPREF(XXH32_state_t) +# define XXH64_state_s XXH_IPREF(XXH64_state_s) +# define XXH64_state_t XXH_IPREF(XXH64_state_t) +# define XXH3_state_s XXH_IPREF(XXH3_state_s) +# define XXH3_state_t XXH_IPREF(XXH3_state_t) +# define XXH128_hash_t XXH_IPREF(XXH128_hash_t) + /* Ensure the header is parsed again, even if it was previously included */ +# undef XXHASH_H_5627135585666179 +# undef XXHASH_H_STATIC_13879238742 +#endif /* XXH_INLINE_ALL || XXH_PRIVATE_API */ + +/* **************************************************************** + * Stable API + *****************************************************************/ +#ifndef XXHASH_H_5627135585666179 +#define XXHASH_H_5627135585666179 1 + +/*! @brief Marks a global symbol. */ +#if !defined(XXH_INLINE_ALL) && !defined(XXH_PRIVATE_API) +# if defined(WIN32) && defined(_MSC_VER) && (defined(XXH_IMPORT) || defined(XXH_EXPORT)) +# ifdef XXH_EXPORT +# define XXH_PUBLIC_API __declspec(dllexport) +# elif XXH_IMPORT +# define XXH_PUBLIC_API __declspec(dllimport) +# endif +# else +# define XXH_PUBLIC_API /* do nothing */ +# endif +#endif + +#ifdef XXH_NAMESPACE +# define XXH_CAT(A,B) A##B +# define XXH_NAME2(A,B) XXH_CAT(A,B) +# define XXH_versionNumber XXH_NAME2(XXH_NAMESPACE, XXH_versionNumber) +/* XXH32 */ +# define XXH32 XXH_NAME2(XXH_NAMESPACE, XXH32) +# define XXH32_createState XXH_NAME2(XXH_NAMESPACE, XXH32_createState) +# define XXH32_freeState XXH_NAME2(XXH_NAMESPACE, XXH32_freeState) +# define XXH32_reset XXH_NAME2(XXH_NAMESPACE, XXH32_reset) +# define XXH32_update XXH_NAME2(XXH_NAMESPACE, XXH32_update) +# define XXH32_digest XXH_NAME2(XXH_NAMESPACE, XXH32_digest) +# define XXH32_copyState XXH_NAME2(XXH_NAMESPACE, XXH32_copyState) +# define XXH32_canonicalFromHash XXH_NAME2(XXH_NAMESPACE, XXH32_canonicalFromHash) +# define XXH32_hashFromCanonical XXH_NAME2(XXH_NAMESPACE, XXH32_hashFromCanonical) +/* XXH64 */ +# define XXH64 XXH_NAME2(XXH_NAMESPACE, XXH64) +# define XXH64_createState XXH_NAME2(XXH_NAMESPACE, XXH64_createState) +# define XXH64_freeState XXH_NAME2(XXH_NAMESPACE, XXH64_freeState) +# define XXH64_reset XXH_NAME2(XXH_NAMESPACE, XXH64_reset) +# define XXH64_update XXH_NAME2(XXH_NAMESPACE, XXH64_update) +# define XXH64_digest XXH_NAME2(XXH_NAMESPACE, XXH64_digest) +# define XXH64_copyState XXH_NAME2(XXH_NAMESPACE, XXH64_copyState) +# define XXH64_canonicalFromHash XXH_NAME2(XXH_NAMESPACE, XXH64_canonicalFromHash) +# define XXH64_hashFromCanonical XXH_NAME2(XXH_NAMESPACE, XXH64_hashFromCanonical) +/* XXH3_64bits */ +# define XXH3_64bits XXH_NAME2(XXH_NAMESPACE, XXH3_64bits) +# define XXH3_64bits_withSecret XXH_NAME2(XXH_NAMESPACE, XXH3_64bits_withSecret) +# define XXH3_64bits_withSeed XXH_NAME2(XXH_NAMESPACE, XXH3_64bits_withSeed) +# define XXH3_64bits_withSecretandSeed XXH_NAME2(XXH_NAMESPACE, XXH3_64bits_withSecretandSeed) +# define XXH3_createState XXH_NAME2(XXH_NAMESPACE, XXH3_createState) +# define XXH3_freeState XXH_NAME2(XXH_NAMESPACE, XXH3_freeState) +# define XXH3_copyState XXH_NAME2(XXH_NAMESPACE, XXH3_copyState) +# define XXH3_64bits_reset XXH_NAME2(XXH_NAMESPACE, XXH3_64bits_reset) +# define XXH3_64bits_reset_withSeed XXH_NAME2(XXH_NAMESPACE, XXH3_64bits_reset_withSeed) +# define XXH3_64bits_reset_withSecret XXH_NAME2(XXH_NAMESPACE, XXH3_64bits_reset_withSecret) +# define XXH3_64bits_reset_withSecretandSeed XXH_NAME2(XXH_NAMESPACE, XXH3_64bits_reset_withSecretandSeed) +# define XXH3_64bits_update XXH_NAME2(XXH_NAMESPACE, XXH3_64bits_update) +# define XXH3_64bits_digest XXH_NAME2(XXH_NAMESPACE, XXH3_64bits_digest) +# define XXH3_generateSecret XXH_NAME2(XXH_NAMESPACE, XXH3_generateSecret) +# define XXH3_generateSecret_fromSeed XXH_NAME2(XXH_NAMESPACE, XXH3_generateSecret_fromSeed) +/* XXH3_128bits */ +# define XXH128 XXH_NAME2(XXH_NAMESPACE, XXH128) +# define XXH3_128bits XXH_NAME2(XXH_NAMESPACE, XXH3_128bits) +# define XXH3_128bits_withSeed XXH_NAME2(XXH_NAMESPACE, XXH3_128bits_withSeed) +# define XXH3_128bits_withSecret XXH_NAME2(XXH_NAMESPACE, XXH3_128bits_withSecret) +# define XXH3_128bits_withSecretandSeed XXH_NAME2(XXH_NAMESPACE, XXH3_128bits_withSecretandSeed) +# define XXH3_128bits_reset XXH_NAME2(XXH_NAMESPACE, XXH3_128bits_reset) +# define XXH3_128bits_reset_withSeed XXH_NAME2(XXH_NAMESPACE, XXH3_128bits_reset_withSeed) +# define XXH3_128bits_reset_withSecret XXH_NAME2(XXH_NAMESPACE, XXH3_128bits_reset_withSecret) +# define XXH3_128bits_reset_withSecretandSeed XXH_NAME2(XXH_NAMESPACE, XXH3_128bits_reset_withSecretandSeed) +# define XXH3_128bits_update XXH_NAME2(XXH_NAMESPACE, XXH3_128bits_update) +# define XXH3_128bits_digest XXH_NAME2(XXH_NAMESPACE, XXH3_128bits_digest) +# define XXH128_isEqual XXH_NAME2(XXH_NAMESPACE, XXH128_isEqual) +# define XXH128_cmp XXH_NAME2(XXH_NAMESPACE, XXH128_cmp) +# define XXH128_canonicalFromHash XXH_NAME2(XXH_NAMESPACE, XXH128_canonicalFromHash) +# define XXH128_hashFromCanonical XXH_NAME2(XXH_NAMESPACE, XXH128_hashFromCanonical) +#endif + + +/* ************************************* +* Compiler specifics +***************************************/ + +/* specific declaration modes for Windows */ +#if !defined(XXH_INLINE_ALL) && !defined(XXH_PRIVATE_API) +# if defined(WIN32) && defined(_MSC_VER) && (defined(XXH_IMPORT) || defined(XXH_EXPORT)) +# ifdef XXH_EXPORT +# define XXH_PUBLIC_API __declspec(dllexport) +# elif XXH_IMPORT +# define XXH_PUBLIC_API __declspec(dllimport) +# endif +# else +# define XXH_PUBLIC_API /* do nothing */ +# endif +#endif + +#if defined (__GNUC__) +# define XXH_CONSTF __attribute__((const)) +# define XXH_PUREF __attribute__((pure)) +# define XXH_MALLOCF __attribute__((malloc)) +#else +# define XXH_CONSTF /* disable */ +# define XXH_PUREF +# define XXH_MALLOCF +#endif + +/* ************************************* +* Version +***************************************/ +#define XXH_VERSION_MAJOR 0 +#define XXH_VERSION_MINOR 8 +#define XXH_VERSION_RELEASE 2 +/*! @brief Version number, encoded as two digits each */ +#define XXH_VERSION_NUMBER (XXH_VERSION_MAJOR *100*100 + XXH_VERSION_MINOR *100 + XXH_VERSION_RELEASE) + +/*! + * @brief Obtains the xxHash version. + * + * This is mostly useful when xxHash is compiled as a shared library, + * since the returned value comes from the library, as opposed to header file. + * + * @return @ref XXH_VERSION_NUMBER of the invoked library. + */ +XXH_PUBLIC_API XXH_CONSTF unsigned XXH_versionNumber (void); + + +/* **************************** +* Common basic types +******************************/ +#include /* size_t */ +/*! + * @brief Exit code for the streaming API. + */ +typedef enum { + XXH_OK = 0, /*!< OK */ + XXH_ERROR /*!< Error */ +} XXH_errorcode; + + +/*-********************************************************************** +* 32-bit hash +************************************************************************/ +#if defined(XXH_DOXYGEN) /* Don't show include */ +/*! + * @brief An unsigned 32-bit integer. + * + * Not necessarily defined to `uint32_t` but functionally equivalent. + */ +typedef uint32_t XXH32_hash_t; + +#elif !defined (__VMS) \ + && (defined (__cplusplus) \ + || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) ) +# ifdef _AIX +# include +# else +# include +# endif + typedef uint32_t XXH32_hash_t; + +#else +# include +# if UINT_MAX == 0xFFFFFFFFUL + typedef unsigned int XXH32_hash_t; +# elif ULONG_MAX == 0xFFFFFFFFUL + typedef unsigned long XXH32_hash_t; +# else +# error "unsupported platform: need a 32-bit type" +# endif +#endif + +/*! + * @} + * + * @defgroup XXH32_family XXH32 family + * @ingroup public + * Contains functions used in the classic 32-bit xxHash algorithm. + * + * @note + * XXH32 is useful for older platforms, with no or poor 64-bit performance. + * Note that the @ref XXH3_family provides competitive speed for both 32-bit + * and 64-bit systems, and offers true 64/128 bit hash results. + * + * @see @ref XXH64_family, @ref XXH3_family : Other xxHash families + * @see @ref XXH32_impl for implementation details + * @{ + */ + +/*! + * @brief Calculates the 32-bit hash of @p input using xxHash32. + * + * @param input The block of data to be hashed, at least @p length bytes in size. + * @param length The length of @p input, in bytes. + * @param seed The 32-bit seed to alter the hash's output predictably. + * + * @pre + * The memory between @p input and @p input + @p length must be valid, + * readable, contiguous memory. However, if @p length is `0`, @p input may be + * `NULL`. In C++, this also must be *TriviallyCopyable*. + * + * @return The calculated 32-bit xxHash32 value. + * + * @see @ref single_shot_example "Single Shot Example" for an example. + */ +XXH_PUBLIC_API XXH_PUREF XXH32_hash_t XXH32 (const void* input, size_t length, XXH32_hash_t seed); + +#ifndef XXH_NO_STREAM +/*! + * @typedef struct XXH32_state_s XXH32_state_t + * @brief The opaque state struct for the XXH32 streaming API. + * + * @see XXH32_state_s for details. + */ +typedef struct XXH32_state_s XXH32_state_t; + +/*! + * @brief Allocates an @ref XXH32_state_t. + * + * @return An allocated pointer of @ref XXH32_state_t on success. + * @return `NULL` on failure. + * + * @note Must be freed with XXH32_freeState(). + */ +XXH_PUBLIC_API XXH_MALLOCF XXH32_state_t* XXH32_createState(void); +/*! + * @brief Frees an @ref XXH32_state_t. + * + * @param statePtr A pointer to an @ref XXH32_state_t allocated with @ref XXH32_createState(). + * + * @return @ref XXH_OK. + * + * @note @p statePtr must be allocated with XXH32_createState(). + * + */ +XXH_PUBLIC_API XXH_errorcode XXH32_freeState(XXH32_state_t* statePtr); +/*! + * @brief Copies one @ref XXH32_state_t to another. + * + * @param dst_state The state to copy to. + * @param src_state The state to copy from. + * @pre + * @p dst_state and @p src_state must not be `NULL` and must not overlap. + */ +XXH_PUBLIC_API void XXH32_copyState(XXH32_state_t* dst_state, const XXH32_state_t* src_state); + +/*! + * @brief Resets an @ref XXH32_state_t to begin a new hash. + * + * @param statePtr The state struct to reset. + * @param seed The 32-bit seed to alter the hash result predictably. + * + * @pre + * @p statePtr must not be `NULL`. + * + * @return @ref XXH_OK on success. + * @return @ref XXH_ERROR on failure. + * + * @note This function resets and seeds a state. Call it before @ref XXH32_update(). + */ +XXH_PUBLIC_API XXH_errorcode XXH32_reset (XXH32_state_t* statePtr, XXH32_hash_t seed); + +/*! + * @brief Consumes a block of @p input to an @ref XXH32_state_t. + * + * @param statePtr The state struct to update. + * @param input The block of data to be hashed, at least @p length bytes in size. + * @param length The length of @p input, in bytes. + * + * @pre + * @p statePtr must not be `NULL`. + * @pre + * The memory between @p input and @p input + @p length must be valid, + * readable, contiguous memory. However, if @p length is `0`, @p input may be + * `NULL`. In C++, this also must be *TriviallyCopyable*. + * + * @return @ref XXH_OK on success. + * @return @ref XXH_ERROR on failure. + * + * @note Call this to incrementally consume blocks of data. + */ +XXH_PUBLIC_API XXH_errorcode XXH32_update (XXH32_state_t* statePtr, const void* input, size_t length); + +/*! + * @brief Returns the calculated hash value from an @ref XXH32_state_t. + * + * @param statePtr The state struct to calculate the hash from. + * + * @pre + * @p statePtr must not be `NULL`. + * + * @return The calculated 32-bit xxHash32 value from that state. + * + * @note + * Calling XXH32_digest() will not affect @p statePtr, so you can update, + * digest, and update again. + */ +XXH_PUBLIC_API XXH_PUREF XXH32_hash_t XXH32_digest (const XXH32_state_t* statePtr); +#endif /* !XXH_NO_STREAM */ + +/******* Canonical representation *******/ + +/*! + * @brief Canonical (big endian) representation of @ref XXH32_hash_t. + */ +typedef struct { + unsigned char digest[4]; /*!< Hash bytes, big endian */ +} XXH32_canonical_t; + +/*! + * @brief Converts an @ref XXH32_hash_t to a big endian @ref XXH32_canonical_t. + * + * @param dst The @ref XXH32_canonical_t pointer to be stored to. + * @param hash The @ref XXH32_hash_t to be converted. + * + * @pre + * @p dst must not be `NULL`. + * + * @see @ref canonical_representation_example "Canonical Representation Example" + */ +XXH_PUBLIC_API void XXH32_canonicalFromHash(XXH32_canonical_t* dst, XXH32_hash_t hash); + +/*! + * @brief Converts an @ref XXH32_canonical_t to a native @ref XXH32_hash_t. + * + * @param src The @ref XXH32_canonical_t to convert. + * + * @pre + * @p src must not be `NULL`. + * + * @return The converted hash. + * + * @see @ref canonical_representation_example "Canonical Representation Example" + */ +XXH_PUBLIC_API XXH_PUREF XXH32_hash_t XXH32_hashFromCanonical(const XXH32_canonical_t* src); + + +/*! @cond Doxygen ignores this part */ +#ifdef __has_attribute +# define XXH_HAS_ATTRIBUTE(x) __has_attribute(x) +#else +# define XXH_HAS_ATTRIBUTE(x) 0 +#endif +/*! @endcond */ + +/*! @cond Doxygen ignores this part */ +/* + * C23 __STDC_VERSION__ number hasn't been specified yet. For now + * leave as `201711L` (C17 + 1). + * TODO: Update to correct value when its been specified. + */ +#define XXH_C23_VN 201711L +/*! @endcond */ + +/*! @cond Doxygen ignores this part */ +/* C-language Attributes are added in C23. */ +#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= XXH_C23_VN) && defined(__has_c_attribute) +# define XXH_HAS_C_ATTRIBUTE(x) __has_c_attribute(x) +#else +# define XXH_HAS_C_ATTRIBUTE(x) 0 +#endif +/*! @endcond */ + +/*! @cond Doxygen ignores this part */ +#if defined(__cplusplus) && defined(__has_cpp_attribute) +# define XXH_HAS_CPP_ATTRIBUTE(x) __has_cpp_attribute(x) +#else +# define XXH_HAS_CPP_ATTRIBUTE(x) 0 +#endif +/*! @endcond */ + +/*! @cond Doxygen ignores this part */ +/* + * Define XXH_FALLTHROUGH macro for annotating switch case with the 'fallthrough' attribute + * introduced in CPP17 and C23. + * CPP17 : https://en.cppreference.com/w/cpp/language/attributes/fallthrough + * C23 : https://en.cppreference.com/w/c/language/attributes/fallthrough + */ +#if XXH_HAS_C_ATTRIBUTE(fallthrough) || XXH_HAS_CPP_ATTRIBUTE(fallthrough) +# define XXH_FALLTHROUGH [[fallthrough]] +#elif XXH_HAS_ATTRIBUTE(__fallthrough__) +# define XXH_FALLTHROUGH __attribute__ ((__fallthrough__)) +#else +# define XXH_FALLTHROUGH /* fallthrough */ +#endif +/*! @endcond */ + +/*! @cond Doxygen ignores this part */ +/* + * Define XXH_NOESCAPE for annotated pointers in public API. + * https://clang.llvm.org/docs/AttributeReference.html#noescape + * As of writing this, only supported by clang. + */ +#if XXH_HAS_ATTRIBUTE(noescape) +# define XXH_NOESCAPE __attribute__((noescape)) +#else +# define XXH_NOESCAPE +#endif +/*! @endcond */ + + +/*! + * @} + * @ingroup public + * @{ + */ + +#ifndef XXH_NO_LONG_LONG +/*-********************************************************************** +* 64-bit hash +************************************************************************/ +#if defined(XXH_DOXYGEN) /* don't include */ +/*! + * @brief An unsigned 64-bit integer. + * + * Not necessarily defined to `uint64_t` but functionally equivalent. + */ +typedef uint64_t XXH64_hash_t; +#elif !defined (__VMS) \ + && (defined (__cplusplus) \ + || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) ) +# ifdef _AIX +# include +# else +# include +# endif + typedef uint64_t XXH64_hash_t; +#else +# include +# if defined(__LP64__) && ULONG_MAX == 0xFFFFFFFFFFFFFFFFULL + /* LP64 ABI says uint64_t is unsigned long */ + typedef unsigned long XXH64_hash_t; +# else + /* the following type must have a width of 64-bit */ + typedef unsigned long long XXH64_hash_t; +# endif +#endif + +/*! + * @} + * + * @defgroup XXH64_family XXH64 family + * @ingroup public + * @{ + * Contains functions used in the classic 64-bit xxHash algorithm. + * + * @note + * XXH3 provides competitive speed for both 32-bit and 64-bit systems, + * and offers true 64/128 bit hash results. + * It provides better speed for systems with vector processing capabilities. + */ + +/*! + * @brief Calculates the 64-bit hash of @p input using xxHash64. + * + * @param input The block of data to be hashed, at least @p length bytes in size. + * @param length The length of @p input, in bytes. + * @param seed The 64-bit seed to alter the hash's output predictably. + * + * @pre + * The memory between @p input and @p input + @p length must be valid, + * readable, contiguous memory. However, if @p length is `0`, @p input may be + * `NULL`. In C++, this also must be *TriviallyCopyable*. + * + * @return The calculated 64-bit xxHash64 value. + * + * @see @ref single_shot_example "Single Shot Example" for an example. + */ +XXH_PUBLIC_API XXH_PUREF XXH64_hash_t XXH64(XXH_NOESCAPE const void* input, size_t length, XXH64_hash_t seed); + +/******* Streaming *******/ +#ifndef XXH_NO_STREAM +/*! + * @brief The opaque state struct for the XXH64 streaming API. + * + * @see XXH64_state_s for details. + */ +typedef struct XXH64_state_s XXH64_state_t; /* incomplete type */ + +/*! + * @brief Allocates an @ref XXH64_state_t. + * + * @return An allocated pointer of @ref XXH64_state_t on success. + * @return `NULL` on failure. + * + * @note Must be freed with XXH64_freeState(). + */ +XXH_PUBLIC_API XXH_MALLOCF XXH64_state_t* XXH64_createState(void); + +/*! + * @brief Frees an @ref XXH64_state_t. + * + * @param statePtr A pointer to an @ref XXH64_state_t allocated with @ref XXH64_createState(). + * + * @return @ref XXH_OK. + * + * @note @p statePtr must be allocated with XXH64_createState(). + */ +XXH_PUBLIC_API XXH_errorcode XXH64_freeState(XXH64_state_t* statePtr); + +/*! + * @brief Copies one @ref XXH64_state_t to another. + * + * @param dst_state The state to copy to. + * @param src_state The state to copy from. + * @pre + * @p dst_state and @p src_state must not be `NULL` and must not overlap. + */ +XXH_PUBLIC_API void XXH64_copyState(XXH_NOESCAPE XXH64_state_t* dst_state, const XXH64_state_t* src_state); + +/*! + * @brief Resets an @ref XXH64_state_t to begin a new hash. + * + * @param statePtr The state struct to reset. + * @param seed The 64-bit seed to alter the hash result predictably. + * + * @pre + * @p statePtr must not be `NULL`. + * + * @return @ref XXH_OK on success. + * @return @ref XXH_ERROR on failure. + * + * @note This function resets and seeds a state. Call it before @ref XXH64_update(). + */ +XXH_PUBLIC_API XXH_errorcode XXH64_reset (XXH_NOESCAPE XXH64_state_t* statePtr, XXH64_hash_t seed); + +/*! + * @brief Consumes a block of @p input to an @ref XXH64_state_t. + * + * @param statePtr The state struct to update. + * @param input The block of data to be hashed, at least @p length bytes in size. + * @param length The length of @p input, in bytes. + * + * @pre + * @p statePtr must not be `NULL`. + * @pre + * The memory between @p input and @p input + @p length must be valid, + * readable, contiguous memory. However, if @p length is `0`, @p input may be + * `NULL`. In C++, this also must be *TriviallyCopyable*. + * + * @return @ref XXH_OK on success. + * @return @ref XXH_ERROR on failure. + * + * @note Call this to incrementally consume blocks of data. + */ +XXH_PUBLIC_API XXH_errorcode XXH64_update (XXH_NOESCAPE XXH64_state_t* statePtr, XXH_NOESCAPE const void* input, size_t length); + +/*! + * @brief Returns the calculated hash value from an @ref XXH64_state_t. + * + * @param statePtr The state struct to calculate the hash from. + * + * @pre + * @p statePtr must not be `NULL`. + * + * @return The calculated 64-bit xxHash64 value from that state. + * + * @note + * Calling XXH64_digest() will not affect @p statePtr, so you can update, + * digest, and update again. + */ +XXH_PUBLIC_API XXH_PUREF XXH64_hash_t XXH64_digest (XXH_NOESCAPE const XXH64_state_t* statePtr); +#endif /* !XXH_NO_STREAM */ +/******* Canonical representation *******/ + +/*! + * @brief Canonical (big endian) representation of @ref XXH64_hash_t. + */ +typedef struct { unsigned char digest[sizeof(XXH64_hash_t)]; } XXH64_canonical_t; + +/*! + * @brief Converts an @ref XXH64_hash_t to a big endian @ref XXH64_canonical_t. + * + * @param dst The @ref XXH64_canonical_t pointer to be stored to. + * @param hash The @ref XXH64_hash_t to be converted. + * + * @pre + * @p dst must not be `NULL`. + * + * @see @ref canonical_representation_example "Canonical Representation Example" + */ +XXH_PUBLIC_API void XXH64_canonicalFromHash(XXH_NOESCAPE XXH64_canonical_t* dst, XXH64_hash_t hash); + +/*! + * @brief Converts an @ref XXH64_canonical_t to a native @ref XXH64_hash_t. + * + * @param src The @ref XXH64_canonical_t to convert. + * + * @pre + * @p src must not be `NULL`. + * + * @return The converted hash. + * + * @see @ref canonical_representation_example "Canonical Representation Example" + */ +XXH_PUBLIC_API XXH_PUREF XXH64_hash_t XXH64_hashFromCanonical(XXH_NOESCAPE const XXH64_canonical_t* src); + +#ifndef XXH_NO_XXH3 + +/*! + * @} + * ************************************************************************ + * @defgroup XXH3_family XXH3 family + * @ingroup public + * @{ + * + * XXH3 is a more recent hash algorithm featuring: + * - Improved speed for both small and large inputs + * - True 64-bit and 128-bit outputs + * - SIMD acceleration + * - Improved 32-bit viability + * + * Speed analysis methodology is explained here: + * + * https://fastcompression.blogspot.com/2019/03/presenting-xxh3.html + * + * Compared to XXH64, expect XXH3 to run approximately + * ~2x faster on large inputs and >3x faster on small ones, + * exact differences vary depending on platform. + * + * XXH3's speed benefits greatly from SIMD and 64-bit arithmetic, + * but does not require it. + * Most 32-bit and 64-bit targets that can run XXH32 smoothly can run XXH3 + * at competitive speeds, even without vector support. Further details are + * explained in the implementation. + * + * XXH3 has a fast scalar implementation, but it also includes accelerated SIMD + * implementations for many common platforms: + * - AVX512 + * - AVX2 + * - SSE2 + * - ARM NEON + * - WebAssembly SIMD128 + * - POWER8 VSX + * - s390x ZVector + * This can be controlled via the @ref XXH_VECTOR macro, but it automatically + * selects the best version according to predefined macros. For the x86 family, an + * automatic runtime dispatcher is included separately in @ref xxh_x86dispatch.c. + * + * XXH3 implementation is portable: + * it has a generic C90 formulation that can be compiled on any platform, + * all implementations generate exactly the same hash value on all platforms. + * Starting from v0.8.0, it's also labelled "stable", meaning that + * any future version will also generate the same hash value. + * + * XXH3 offers 2 variants, _64bits and _128bits. + * + * When only 64 bits are needed, prefer invoking the _64bits variant, as it + * reduces the amount of mixing, resulting in faster speed on small inputs. + * It's also generally simpler to manipulate a scalar return type than a struct. + * + * The API supports one-shot hashing, streaming mode, and custom secrets. + */ +/*-********************************************************************** +* XXH3 64-bit variant +************************************************************************/ + +/*! + * @brief Calculates 64-bit unseeded variant of XXH3 hash of @p input. + * + * @param input The block of data to be hashed, at least @p length bytes in size. + * @param length The length of @p input, in bytes. + * + * @pre + * The memory between @p input and @p input + @p length must be valid, + * readable, contiguous memory. However, if @p length is `0`, @p input may be + * `NULL`. In C++, this also must be *TriviallyCopyable*. + * + * @return The calculated 64-bit XXH3 hash value. + * + * @note + * This is equivalent to @ref XXH3_64bits_withSeed() with a seed of `0`, however + * it may have slightly better performance due to constant propagation of the + * defaults. + * + * @see + * XXH3_64bits_withSeed(), XXH3_64bits_withSecret(): other seeding variants + * @see @ref single_shot_example "Single Shot Example" for an example. + */ +XXH_PUBLIC_API XXH_PUREF XXH64_hash_t XXH3_64bits(XXH_NOESCAPE const void* input, size_t length); + +/*! + * @brief Calculates 64-bit seeded variant of XXH3 hash of @p input. + * + * @param input The block of data to be hashed, at least @p length bytes in size. + * @param length The length of @p input, in bytes. + * @param seed The 64-bit seed to alter the hash result predictably. + * + * @pre + * The memory between @p input and @p input + @p length must be valid, + * readable, contiguous memory. However, if @p length is `0`, @p input may be + * `NULL`. In C++, this also must be *TriviallyCopyable*. + * + * @return The calculated 64-bit XXH3 hash value. + * + * @note + * seed == 0 produces the same results as @ref XXH3_64bits(). + * + * This variant generates a custom secret on the fly based on default secret + * altered using the @p seed value. + * + * While this operation is decently fast, note that it's not completely free. + * + * @see @ref single_shot_example "Single Shot Example" for an example. + */ +XXH_PUBLIC_API XXH_PUREF XXH64_hash_t XXH3_64bits_withSeed(XXH_NOESCAPE const void* input, size_t length, XXH64_hash_t seed); + +/*! + * The bare minimum size for a custom secret. + * + * @see + * XXH3_64bits_withSecret(), XXH3_64bits_reset_withSecret(), + * XXH3_128bits_withSecret(), XXH3_128bits_reset_withSecret(). + */ +#define XXH3_SECRET_SIZE_MIN 136 + +/*! + * @brief Calculates 64-bit variant of XXH3 with a custom "secret". + * + * @param data The block of data to be hashed, at least @p len bytes in size. + * @param len The length of @p data, in bytes. + * @param secret The secret data. + * @param secretSize The length of @p secret, in bytes. + * + * @return The calculated 64-bit XXH3 hash value. + * + * @pre + * The memory between @p data and @p data + @p len must be valid, + * readable, contiguous memory. However, if @p length is `0`, @p data may be + * `NULL`. In C++, this also must be *TriviallyCopyable*. + * + * It's possible to provide any blob of bytes as a "secret" to generate the hash. + * This makes it more difficult for an external actor to prepare an intentional collision. + * The main condition is that @p secretSize *must* be large enough (>= @ref XXH3_SECRET_SIZE_MIN). + * However, the quality of the secret impacts the dispersion of the hash algorithm. + * Therefore, the secret _must_ look like a bunch of random bytes. + * Avoid "trivial" or structured data such as repeated sequences or a text document. + * Whenever in doubt about the "randomness" of the blob of bytes, + * consider employing @ref XXH3_generateSecret() instead (see below). + * It will generate a proper high entropy secret derived from the blob of bytes. + * Another advantage of using XXH3_generateSecret() is that + * it guarantees that all bits within the initial blob of bytes + * will impact every bit of the output. + * This is not necessarily the case when using the blob of bytes directly + * because, when hashing _small_ inputs, only a portion of the secret is employed. + * + * @see @ref single_shot_example "Single Shot Example" for an example. + */ +XXH_PUBLIC_API XXH_PUREF XXH64_hash_t XXH3_64bits_withSecret(XXH_NOESCAPE const void* data, size_t len, XXH_NOESCAPE const void* secret, size_t secretSize); + + +/******* Streaming *******/ +#ifndef XXH_NO_STREAM +/* + * Streaming requires state maintenance. + * This operation costs memory and CPU. + * As a consequence, streaming is slower than one-shot hashing. + * For better performance, prefer one-shot functions whenever applicable. + */ + +/*! + * @brief The opaque state struct for the XXH3 streaming API. + * + * @see XXH3_state_s for details. + */ +typedef struct XXH3_state_s XXH3_state_t; +XXH_PUBLIC_API XXH_MALLOCF XXH3_state_t* XXH3_createState(void); +XXH_PUBLIC_API XXH_errorcode XXH3_freeState(XXH3_state_t* statePtr); + +/*! + * @brief Copies one @ref XXH3_state_t to another. + * + * @param dst_state The state to copy to. + * @param src_state The state to copy from. + * @pre + * @p dst_state and @p src_state must not be `NULL` and must not overlap. + */ +XXH_PUBLIC_API void XXH3_copyState(XXH_NOESCAPE XXH3_state_t* dst_state, XXH_NOESCAPE const XXH3_state_t* src_state); + +/*! + * @brief Resets an @ref XXH3_state_t to begin a new hash. + * + * @param statePtr The state struct to reset. + * + * @pre + * @p statePtr must not be `NULL`. + * + * @return @ref XXH_OK on success. + * @return @ref XXH_ERROR on failure. + * + * @note + * - This function resets `statePtr` and generate a secret with default parameters. + * - Call this function before @ref XXH3_64bits_update(). + * - Digest will be equivalent to `XXH3_64bits()`. + * + */ +XXH_PUBLIC_API XXH_errorcode XXH3_64bits_reset(XXH_NOESCAPE XXH3_state_t* statePtr); + +/*! + * @brief Resets an @ref XXH3_state_t with 64-bit seed to begin a new hash. + * + * @param statePtr The state struct to reset. + * @param seed The 64-bit seed to alter the hash result predictably. + * + * @pre + * @p statePtr must not be `NULL`. + * + * @return @ref XXH_OK on success. + * @return @ref XXH_ERROR on failure. + * + * @note + * - This function resets `statePtr` and generate a secret from `seed`. + * - Call this function before @ref XXH3_64bits_update(). + * - Digest will be equivalent to `XXH3_64bits_withSeed()`. + * + */ +XXH_PUBLIC_API XXH_errorcode XXH3_64bits_reset_withSeed(XXH_NOESCAPE XXH3_state_t* statePtr, XXH64_hash_t seed); + +/*! + * @brief Resets an @ref XXH3_state_t with secret data to begin a new hash. + * + * @param statePtr The state struct to reset. + * @param secret The secret data. + * @param secretSize The length of @p secret, in bytes. + * + * @pre + * @p statePtr must not be `NULL`. + * + * @return @ref XXH_OK on success. + * @return @ref XXH_ERROR on failure. + * + * @note + * `secret` is referenced, it _must outlive_ the hash streaming session. + * + * Similar to one-shot API, `secretSize` must be >= @ref XXH3_SECRET_SIZE_MIN, + * and the quality of produced hash values depends on secret's entropy + * (secret's content should look like a bunch of random bytes). + * When in doubt about the randomness of a candidate `secret`, + * consider employing `XXH3_generateSecret()` instead (see below). + */ +XXH_PUBLIC_API XXH_errorcode XXH3_64bits_reset_withSecret(XXH_NOESCAPE XXH3_state_t* statePtr, XXH_NOESCAPE const void* secret, size_t secretSize); + +/*! + * @brief Consumes a block of @p input to an @ref XXH3_state_t. + * + * @param statePtr The state struct to update. + * @param input The block of data to be hashed, at least @p length bytes in size. + * @param length The length of @p input, in bytes. + * + * @pre + * @p statePtr must not be `NULL`. + * @pre + * The memory between @p input and @p input + @p length must be valid, + * readable, contiguous memory. However, if @p length is `0`, @p input may be + * `NULL`. In C++, this also must be *TriviallyCopyable*. + * + * @return @ref XXH_OK on success. + * @return @ref XXH_ERROR on failure. + * + * @note Call this to incrementally consume blocks of data. + */ +XXH_PUBLIC_API XXH_errorcode XXH3_64bits_update (XXH_NOESCAPE XXH3_state_t* statePtr, XXH_NOESCAPE const void* input, size_t length); + +/*! + * @brief Returns the calculated XXH3 64-bit hash value from an @ref XXH3_state_t. + * + * @param statePtr The state struct to calculate the hash from. + * + * @pre + * @p statePtr must not be `NULL`. + * + * @return The calculated XXH3 64-bit hash value from that state. + * + * @note + * Calling XXH3_64bits_digest() will not affect @p statePtr, so you can update, + * digest, and update again. + */ +XXH_PUBLIC_API XXH_PUREF XXH64_hash_t XXH3_64bits_digest (XXH_NOESCAPE const XXH3_state_t* statePtr); +#endif /* !XXH_NO_STREAM */ + +/* note : canonical representation of XXH3 is the same as XXH64 + * since they both produce XXH64_hash_t values */ + + +/*-********************************************************************** +* XXH3 128-bit variant +************************************************************************/ + +/*! + * @brief The return value from 128-bit hashes. + * + * Stored in little endian order, although the fields themselves are in native + * endianness. + */ +typedef struct { + XXH64_hash_t low64; /*!< `value & 0xFFFFFFFFFFFFFFFF` */ + XXH64_hash_t high64; /*!< `value >> 64` */ +} XXH128_hash_t; + +/*! + * @brief Calculates 128-bit unseeded variant of XXH3 of @p data. + * + * @param data The block of data to be hashed, at least @p length bytes in size. + * @param len The length of @p data, in bytes. + * + * @return The calculated 128-bit variant of XXH3 value. + * + * The 128-bit variant of XXH3 has more strength, but it has a bit of overhead + * for shorter inputs. + * + * This is equivalent to @ref XXH3_128bits_withSeed() with a seed of `0`, however + * it may have slightly better performance due to constant propagation of the + * defaults. + * + * @see XXH3_128bits_withSeed(), XXH3_128bits_withSecret(): other seeding variants + * @see @ref single_shot_example "Single Shot Example" for an example. + */ +XXH_PUBLIC_API XXH_PUREF XXH128_hash_t XXH3_128bits(XXH_NOESCAPE const void* data, size_t len); +/*! @brief Calculates 128-bit seeded variant of XXH3 hash of @p data. + * + * @param data The block of data to be hashed, at least @p length bytes in size. + * @param len The length of @p data, in bytes. + * @param seed The 64-bit seed to alter the hash result predictably. + * + * @return The calculated 128-bit variant of XXH3 value. + * + * @note + * seed == 0 produces the same results as @ref XXH3_64bits(). + * + * This variant generates a custom secret on the fly based on default secret + * altered using the @p seed value. + * + * While this operation is decently fast, note that it's not completely free. + * + * @see XXH3_128bits(), XXH3_128bits_withSecret(): other seeding variants + * @see @ref single_shot_example "Single Shot Example" for an example. + */ +XXH_PUBLIC_API XXH_PUREF XXH128_hash_t XXH3_128bits_withSeed(XXH_NOESCAPE const void* data, size_t len, XXH64_hash_t seed); +/*! + * @brief Calculates 128-bit variant of XXH3 with a custom "secret". + * + * @param data The block of data to be hashed, at least @p len bytes in size. + * @param len The length of @p data, in bytes. + * @param secret The secret data. + * @param secretSize The length of @p secret, in bytes. + * + * @return The calculated 128-bit variant of XXH3 value. + * + * It's possible to provide any blob of bytes as a "secret" to generate the hash. + * This makes it more difficult for an external actor to prepare an intentional collision. + * The main condition is that @p secretSize *must* be large enough (>= @ref XXH3_SECRET_SIZE_MIN). + * However, the quality of the secret impacts the dispersion of the hash algorithm. + * Therefore, the secret _must_ look like a bunch of random bytes. + * Avoid "trivial" or structured data such as repeated sequences or a text document. + * Whenever in doubt about the "randomness" of the blob of bytes, + * consider employing @ref XXH3_generateSecret() instead (see below). + * It will generate a proper high entropy secret derived from the blob of bytes. + * Another advantage of using XXH3_generateSecret() is that + * it guarantees that all bits within the initial blob of bytes + * will impact every bit of the output. + * This is not necessarily the case when using the blob of bytes directly + * because, when hashing _small_ inputs, only a portion of the secret is employed. + * + * @see @ref single_shot_example "Single Shot Example" for an example. + */ +XXH_PUBLIC_API XXH_PUREF XXH128_hash_t XXH3_128bits_withSecret(XXH_NOESCAPE const void* data, size_t len, XXH_NOESCAPE const void* secret, size_t secretSize); + +/******* Streaming *******/ +#ifndef XXH_NO_STREAM +/* + * Streaming requires state maintenance. + * This operation costs memory and CPU. + * As a consequence, streaming is slower than one-shot hashing. + * For better performance, prefer one-shot functions whenever applicable. + * + * XXH3_128bits uses the same XXH3_state_t as XXH3_64bits(). + * Use already declared XXH3_createState() and XXH3_freeState(). + * + * All reset and streaming functions have same meaning as their 64-bit counterpart. + */ + +/*! + * @brief Resets an @ref XXH3_state_t to begin a new hash. + * + * @param statePtr The state struct to reset. + * + * @pre + * @p statePtr must not be `NULL`. + * + * @return @ref XXH_OK on success. + * @return @ref XXH_ERROR on failure. + * + * @note + * - This function resets `statePtr` and generate a secret with default parameters. + * - Call it before @ref XXH3_128bits_update(). + * - Digest will be equivalent to `XXH3_128bits()`. + */ +XXH_PUBLIC_API XXH_errorcode XXH3_128bits_reset(XXH_NOESCAPE XXH3_state_t* statePtr); + +/*! + * @brief Resets an @ref XXH3_state_t with 64-bit seed to begin a new hash. + * + * @param statePtr The state struct to reset. + * @param seed The 64-bit seed to alter the hash result predictably. + * + * @pre + * @p statePtr must not be `NULL`. + * + * @return @ref XXH_OK on success. + * @return @ref XXH_ERROR on failure. + * + * @note + * - This function resets `statePtr` and generate a secret from `seed`. + * - Call it before @ref XXH3_128bits_update(). + * - Digest will be equivalent to `XXH3_128bits_withSeed()`. + */ +XXH_PUBLIC_API XXH_errorcode XXH3_128bits_reset_withSeed(XXH_NOESCAPE XXH3_state_t* statePtr, XXH64_hash_t seed); +/*! + * @brief Resets an @ref XXH3_state_t with secret data to begin a new hash. + * + * @param statePtr The state struct to reset. + * @param secret The secret data. + * @param secretSize The length of @p secret, in bytes. + * + * @pre + * @p statePtr must not be `NULL`. + * + * @return @ref XXH_OK on success. + * @return @ref XXH_ERROR on failure. + * + * `secret` is referenced, it _must outlive_ the hash streaming session. + * Similar to one-shot API, `secretSize` must be >= @ref XXH3_SECRET_SIZE_MIN, + * and the quality of produced hash values depends on secret's entropy + * (secret's content should look like a bunch of random bytes). + * When in doubt about the randomness of a candidate `secret`, + * consider employing `XXH3_generateSecret()` instead (see below). + */ +XXH_PUBLIC_API XXH_errorcode XXH3_128bits_reset_withSecret(XXH_NOESCAPE XXH3_state_t* statePtr, XXH_NOESCAPE const void* secret, size_t secretSize); + +/*! + * @brief Consumes a block of @p input to an @ref XXH3_state_t. + * + * Call this to incrementally consume blocks of data. + * + * @param statePtr The state struct to update. + * @param input The block of data to be hashed, at least @p length bytes in size. + * @param length The length of @p input, in bytes. + * + * @pre + * @p statePtr must not be `NULL`. + * + * @return @ref XXH_OK on success. + * @return @ref XXH_ERROR on failure. + * + * @note + * The memory between @p input and @p input + @p length must be valid, + * readable, contiguous memory. However, if @p length is `0`, @p input may be + * `NULL`. In C++, this also must be *TriviallyCopyable*. + * + */ +XXH_PUBLIC_API XXH_errorcode XXH3_128bits_update (XXH_NOESCAPE XXH3_state_t* statePtr, XXH_NOESCAPE const void* input, size_t length); + +/*! + * @brief Returns the calculated XXH3 128-bit hash value from an @ref XXH3_state_t. + * + * @param statePtr The state struct to calculate the hash from. + * + * @pre + * @p statePtr must not be `NULL`. + * + * @return The calculated XXH3 128-bit hash value from that state. + * + * @note + * Calling XXH3_128bits_digest() will not affect @p statePtr, so you can update, + * digest, and update again. + * + */ +XXH_PUBLIC_API XXH_PUREF XXH128_hash_t XXH3_128bits_digest (XXH_NOESCAPE const XXH3_state_t* statePtr); +#endif /* !XXH_NO_STREAM */ + +/* Following helper functions make it possible to compare XXH128_hast_t values. + * Since XXH128_hash_t is a structure, this capability is not offered by the language. + * Note: For better performance, these functions can be inlined using XXH_INLINE_ALL */ + +/*! + * @brief Check equality of two XXH128_hash_t values + * + * @param h1 The 128-bit hash value. + * @param h2 Another 128-bit hash value. + * + * @return `1` if `h1` and `h2` are equal. + * @return `0` if they are not. + */ +XXH_PUBLIC_API XXH_PUREF int XXH128_isEqual(XXH128_hash_t h1, XXH128_hash_t h2); + +/*! + * @brief Compares two @ref XXH128_hash_t + * + * This comparator is compatible with stdlib's `qsort()`/`bsearch()`. + * + * @param h128_1 Left-hand side value + * @param h128_2 Right-hand side value + * + * @return >0 if @p h128_1 > @p h128_2 + * @return =0 if @p h128_1 == @p h128_2 + * @return <0 if @p h128_1 < @p h128_2 + */ +XXH_PUBLIC_API XXH_PUREF int XXH128_cmp(XXH_NOESCAPE const void* h128_1, XXH_NOESCAPE const void* h128_2); + + +/******* Canonical representation *******/ +typedef struct { unsigned char digest[sizeof(XXH128_hash_t)]; } XXH128_canonical_t; + + +/*! + * @brief Converts an @ref XXH128_hash_t to a big endian @ref XXH128_canonical_t. + * + * @param dst The @ref XXH128_canonical_t pointer to be stored to. + * @param hash The @ref XXH128_hash_t to be converted. + * + * @pre + * @p dst must not be `NULL`. + * @see @ref canonical_representation_example "Canonical Representation Example" + */ +XXH_PUBLIC_API void XXH128_canonicalFromHash(XXH_NOESCAPE XXH128_canonical_t* dst, XXH128_hash_t hash); + +/*! + * @brief Converts an @ref XXH128_canonical_t to a native @ref XXH128_hash_t. + * + * @param src The @ref XXH128_canonical_t to convert. + * + * @pre + * @p src must not be `NULL`. + * + * @return The converted hash. + * @see @ref canonical_representation_example "Canonical Representation Example" + */ +XXH_PUBLIC_API XXH_PUREF XXH128_hash_t XXH128_hashFromCanonical(XXH_NOESCAPE const XXH128_canonical_t* src); + + +#endif /* !XXH_NO_XXH3 */ +#endif /* XXH_NO_LONG_LONG */ + +/*! + * @} + */ +#endif /* XXHASH_H_5627135585666179 */ + + + +#if defined(XXH_STATIC_LINKING_ONLY) && !defined(XXHASH_H_STATIC_13879238742) +#define XXHASH_H_STATIC_13879238742 +/* **************************************************************************** + * This section contains declarations which are not guaranteed to remain stable. + * They may change in future versions, becoming incompatible with a different + * version of the library. + * These declarations should only be used with static linking. + * Never use them in association with dynamic linking! + ***************************************************************************** */ + +/* + * These definitions are only present to allow static allocation + * of XXH states, on stack or in a struct, for example. + * Never **ever** access their members directly. + */ + +/*! + * @internal + * @brief Structure for XXH32 streaming API. + * + * @note This is only defined when @ref XXH_STATIC_LINKING_ONLY, + * @ref XXH_INLINE_ALL, or @ref XXH_IMPLEMENTATION is defined. Otherwise it is + * an opaque type. This allows fields to safely be changed. + * + * Typedef'd to @ref XXH32_state_t. + * Do not access the members of this struct directly. + * @see XXH64_state_s, XXH3_state_s + */ +struct XXH32_state_s { + XXH32_hash_t total_len_32; /*!< Total length hashed, modulo 2^32 */ + XXH32_hash_t large_len; /*!< Whether the hash is >= 16 (handles @ref total_len_32 overflow) */ + XXH32_hash_t v[4]; /*!< Accumulator lanes */ + XXH32_hash_t mem32[4]; /*!< Internal buffer for partial reads. Treated as unsigned char[16]. */ + XXH32_hash_t memsize; /*!< Amount of data in @ref mem32 */ + XXH32_hash_t reserved; /*!< Reserved field. Do not read nor write to it. */ +}; /* typedef'd to XXH32_state_t */ + + +#ifndef XXH_NO_LONG_LONG /* defined when there is no 64-bit support */ + +/*! + * @internal + * @brief Structure for XXH64 streaming API. + * + * @note This is only defined when @ref XXH_STATIC_LINKING_ONLY, + * @ref XXH_INLINE_ALL, or @ref XXH_IMPLEMENTATION is defined. Otherwise it is + * an opaque type. This allows fields to safely be changed. + * + * Typedef'd to @ref XXH64_state_t. + * Do not access the members of this struct directly. + * @see XXH32_state_s, XXH3_state_s + */ +struct XXH64_state_s { + XXH64_hash_t total_len; /*!< Total length hashed. This is always 64-bit. */ + XXH64_hash_t v[4]; /*!< Accumulator lanes */ + XXH64_hash_t mem64[4]; /*!< Internal buffer for partial reads. Treated as unsigned char[32]. */ + XXH32_hash_t memsize; /*!< Amount of data in @ref mem64 */ + XXH32_hash_t reserved32; /*!< Reserved field, needed for padding anyways*/ + XXH64_hash_t reserved64; /*!< Reserved field. Do not read or write to it. */ +}; /* typedef'd to XXH64_state_t */ + +#ifndef XXH_NO_XXH3 + +#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* >= C11 */ +# include +# define XXH_ALIGN(n) alignas(n) +#elif defined(__cplusplus) && (__cplusplus >= 201103L) /* >= C++11 */ +/* In C++ alignas() is a keyword */ +# define XXH_ALIGN(n) alignas(n) +#elif defined(__GNUC__) +# define XXH_ALIGN(n) __attribute__ ((aligned(n))) +#elif defined(_MSC_VER) +# define XXH_ALIGN(n) __declspec(align(n)) +#else +# define XXH_ALIGN(n) /* disabled */ +#endif + +/* Old GCC versions only accept the attribute after the type in structures. */ +#if !(defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)) /* C11+ */ \ + && ! (defined(__cplusplus) && (__cplusplus >= 201103L)) /* >= C++11 */ \ + && defined(__GNUC__) +# define XXH_ALIGN_MEMBER(align, type) type XXH_ALIGN(align) +#else +# define XXH_ALIGN_MEMBER(align, type) XXH_ALIGN(align) type +#endif + +/*! + * @brief The size of the internal XXH3 buffer. + * + * This is the optimal update size for incremental hashing. + * + * @see XXH3_64b_update(), XXH3_128b_update(). + */ +#define XXH3_INTERNALBUFFER_SIZE 256 + +/*! + * @internal + * @brief Default size of the secret buffer (and @ref XXH3_kSecret). + * + * This is the size used in @ref XXH3_kSecret and the seeded functions. + * + * Not to be confused with @ref XXH3_SECRET_SIZE_MIN. + */ +#define XXH3_SECRET_DEFAULT_SIZE 192 + +/*! + * @internal + * @brief Structure for XXH3 streaming API. + * + * @note This is only defined when @ref XXH_STATIC_LINKING_ONLY, + * @ref XXH_INLINE_ALL, or @ref XXH_IMPLEMENTATION is defined. + * Otherwise it is an opaque type. + * Never use this definition in combination with dynamic library. + * This allows fields to safely be changed in the future. + * + * @note ** This structure has a strict alignment requirement of 64 bytes!! ** + * Do not allocate this with `malloc()` or `new`, + * it will not be sufficiently aligned. + * Use @ref XXH3_createState() and @ref XXH3_freeState(), or stack allocation. + * + * Typedef'd to @ref XXH3_state_t. + * Do never access the members of this struct directly. + * + * @see XXH3_INITSTATE() for stack initialization. + * @see XXH3_createState(), XXH3_freeState(). + * @see XXH32_state_s, XXH64_state_s + */ +struct XXH3_state_s { + XXH_ALIGN_MEMBER(64, XXH64_hash_t acc[8]); + /*!< The 8 accumulators. See @ref XXH32_state_s::v and @ref XXH64_state_s::v */ + XXH_ALIGN_MEMBER(64, unsigned char customSecret[XXH3_SECRET_DEFAULT_SIZE]); + /*!< Used to store a custom secret generated from a seed. */ + XXH_ALIGN_MEMBER(64, unsigned char buffer[XXH3_INTERNALBUFFER_SIZE]); + /*!< The internal buffer. @see XXH32_state_s::mem32 */ + XXH32_hash_t bufferedSize; + /*!< The amount of memory in @ref buffer, @see XXH32_state_s::memsize */ + XXH32_hash_t useSeed; + /*!< Reserved field. Needed for padding on 64-bit. */ + size_t nbStripesSoFar; + /*!< Number or stripes processed. */ + XXH64_hash_t totalLen; + /*!< Total length hashed. 64-bit even on 32-bit targets. */ + size_t nbStripesPerBlock; + /*!< Number of stripes per block. */ + size_t secretLimit; + /*!< Size of @ref customSecret or @ref extSecret */ + XXH64_hash_t seed; + /*!< Seed for _withSeed variants. Must be zero otherwise, @see XXH3_INITSTATE() */ + XXH64_hash_t reserved64; + /*!< Reserved field. */ + const unsigned char* extSecret; + /*!< Reference to an external secret for the _withSecret variants, NULL + * for other variants. */ + /* note: there may be some padding at the end due to alignment on 64 bytes */ +}; /* typedef'd to XXH3_state_t */ + +#undef XXH_ALIGN_MEMBER + +/*! + * @brief Initializes a stack-allocated `XXH3_state_s`. + * + * When the @ref XXH3_state_t structure is merely emplaced on stack, + * it should be initialized with XXH3_INITSTATE() or a memset() + * in case its first reset uses XXH3_NNbits_reset_withSeed(). + * This init can be omitted if the first reset uses default or _withSecret mode. + * This operation isn't necessary when the state is created with XXH3_createState(). + * Note that this doesn't prepare the state for a streaming operation, + * it's still necessary to use XXH3_NNbits_reset*() afterwards. + */ +#define XXH3_INITSTATE(XXH3_state_ptr) \ + do { \ + XXH3_state_t* tmp_xxh3_state_ptr = (XXH3_state_ptr); \ + tmp_xxh3_state_ptr->seed = 0; \ + tmp_xxh3_state_ptr->extSecret = NULL; \ + } while(0) + + +/*! + * @brief Calculates the 128-bit hash of @p data using XXH3. + * + * @param data The block of data to be hashed, at least @p len bytes in size. + * @param len The length of @p data, in bytes. + * @param seed The 64-bit seed to alter the hash's output predictably. + * + * @pre + * The memory between @p data and @p data + @p len must be valid, + * readable, contiguous memory. However, if @p len is `0`, @p data may be + * `NULL`. In C++, this also must be *TriviallyCopyable*. + * + * @return The calculated 128-bit XXH3 value. + * + * @see @ref single_shot_example "Single Shot Example" for an example. + */ +XXH_PUBLIC_API XXH_PUREF XXH128_hash_t XXH128(XXH_NOESCAPE const void* data, size_t len, XXH64_hash_t seed); + + +/* === Experimental API === */ +/* Symbols defined below must be considered tied to a specific library version. */ + +/*! + * @brief Derive a high-entropy secret from any user-defined content, named customSeed. + * + * @param secretBuffer A writable buffer for derived high-entropy secret data. + * @param secretSize Size of secretBuffer, in bytes. Must be >= XXH3_SECRET_DEFAULT_SIZE. + * @param customSeed A user-defined content. + * @param customSeedSize Size of customSeed, in bytes. + * + * @return @ref XXH_OK on success. + * @return @ref XXH_ERROR on failure. + * + * The generated secret can be used in combination with `*_withSecret()` functions. + * The `_withSecret()` variants are useful to provide a higher level of protection + * than 64-bit seed, as it becomes much more difficult for an external actor to + * guess how to impact the calculation logic. + * + * The function accepts as input a custom seed of any length and any content, + * and derives from it a high-entropy secret of length @p secretSize into an + * already allocated buffer @p secretBuffer. + * + * The generated secret can then be used with any `*_withSecret()` variant. + * The functions @ref XXH3_128bits_withSecret(), @ref XXH3_64bits_withSecret(), + * @ref XXH3_128bits_reset_withSecret() and @ref XXH3_64bits_reset_withSecret() + * are part of this list. They all accept a `secret` parameter + * which must be large enough for implementation reasons (>= @ref XXH3_SECRET_SIZE_MIN) + * _and_ feature very high entropy (consist of random-looking bytes). + * These conditions can be a high bar to meet, so @ref XXH3_generateSecret() can + * be employed to ensure proper quality. + * + * @p customSeed can be anything. It can have any size, even small ones, + * and its content can be anything, even "poor entropy" sources such as a bunch + * of zeroes. The resulting `secret` will nonetheless provide all required qualities. + * + * @pre + * - @p secretSize must be >= @ref XXH3_SECRET_SIZE_MIN + * - When @p customSeedSize > 0, supplying NULL as customSeed is undefined behavior. + * + * Example code: + * @code{.c} + * #include + * #include + * #include + * #define XXH_STATIC_LINKING_ONLY // expose unstable API + * #include "xxhash.h" + * // Hashes argv[2] using the entropy from argv[1]. + * int main(int argc, char* argv[]) + * { + * char secret[XXH3_SECRET_SIZE_MIN]; + * if (argv != 3) { return 1; } + * XXH3_generateSecret(secret, sizeof(secret), argv[1], strlen(argv[1])); + * XXH64_hash_t h = XXH3_64bits_withSecret( + * argv[2], strlen(argv[2]), + * secret, sizeof(secret) + * ); + * printf("%016llx\n", (unsigned long long) h); + * } + * @endcode + */ +XXH_PUBLIC_API XXH_errorcode XXH3_generateSecret(XXH_NOESCAPE void* secretBuffer, size_t secretSize, XXH_NOESCAPE const void* customSeed, size_t customSeedSize); + +/*! + * @brief Generate the same secret as the _withSeed() variants. + * + * @param secretBuffer A writable buffer of @ref XXH3_SECRET_SIZE_MIN bytes + * @param seed The 64-bit seed to alter the hash result predictably. + * + * The generated secret can be used in combination with + *`*_withSecret()` and `_withSecretandSeed()` variants. + * + * Example C++ `std::string` hash class: + * @code{.cpp} + * #include + * #define XXH_STATIC_LINKING_ONLY // expose unstable API + * #include "xxhash.h" + * // Slow, seeds each time + * class HashSlow { + * XXH64_hash_t seed; + * public: + * HashSlow(XXH64_hash_t s) : seed{s} {} + * size_t operator()(const std::string& x) const { + * return size_t{XXH3_64bits_withSeed(x.c_str(), x.length(), seed)}; + * } + * }; + * // Fast, caches the seeded secret for future uses. + * class HashFast { + * unsigned char secret[XXH3_SECRET_SIZE_MIN]; + * public: + * HashFast(XXH64_hash_t s) { + * XXH3_generateSecret_fromSeed(secret, seed); + * } + * size_t operator()(const std::string& x) const { + * return size_t{ + * XXH3_64bits_withSecret(x.c_str(), x.length(), secret, sizeof(secret)) + * }; + * } + * }; + * @endcode + */ +XXH_PUBLIC_API void XXH3_generateSecret_fromSeed(XXH_NOESCAPE void* secretBuffer, XXH64_hash_t seed); + +/*! + * @brief Calculates 64/128-bit seeded variant of XXH3 hash of @p data. + * + * @param data The block of data to be hashed, at least @p len bytes in size. + * @param len The length of @p data, in bytes. + * @param secret The secret data. + * @param secretSize The length of @p secret, in bytes. + * @param seed The 64-bit seed to alter the hash result predictably. + * + * These variants generate hash values using either + * @p seed for "short" keys (< @ref XXH3_MIDSIZE_MAX = 240 bytes) + * or @p secret for "large" keys (>= @ref XXH3_MIDSIZE_MAX). + * + * This generally benefits speed, compared to `_withSeed()` or `_withSecret()`. + * `_withSeed()` has to generate the secret on the fly for "large" keys. + * It's fast, but can be perceptible for "not so large" keys (< 1 KB). + * `_withSecret()` has to generate the masks on the fly for "small" keys, + * which requires more instructions than _withSeed() variants. + * Therefore, _withSecretandSeed variant combines the best of both worlds. + * + * When @p secret has been generated by XXH3_generateSecret_fromSeed(), + * this variant produces *exactly* the same results as `_withSeed()` variant, + * hence offering only a pure speed benefit on "large" input, + * by skipping the need to regenerate the secret for every large input. + * + * Another usage scenario is to hash the secret to a 64-bit hash value, + * for example with XXH3_64bits(), which then becomes the seed, + * and then employ both the seed and the secret in _withSecretandSeed(). + * On top of speed, an added benefit is that each bit in the secret + * has a 50% chance to swap each bit in the output, via its impact to the seed. + * + * This is not guaranteed when using the secret directly in "small data" scenarios, + * because only portions of the secret are employed for small data. + */ +XXH_PUBLIC_API XXH_PUREF XXH64_hash_t +XXH3_64bits_withSecretandSeed(XXH_NOESCAPE const void* data, size_t len, + XXH_NOESCAPE const void* secret, size_t secretSize, + XXH64_hash_t seed); +/*! + * @brief Calculates 128-bit seeded variant of XXH3 hash of @p data. + * + * @param input The block of data to be hashed, at least @p len bytes in size. + * @param length The length of @p data, in bytes. + * @param secret The secret data. + * @param secretSize The length of @p secret, in bytes. + * @param seed64 The 64-bit seed to alter the hash result predictably. + * + * @return @ref XXH_OK on success. + * @return @ref XXH_ERROR on failure. + * + * @see XXH3_64bits_withSecretandSeed() + */ +XXH_PUBLIC_API XXH_PUREF XXH128_hash_t +XXH3_128bits_withSecretandSeed(XXH_NOESCAPE const void* input, size_t length, + XXH_NOESCAPE const void* secret, size_t secretSize, + XXH64_hash_t seed64); +#ifndef XXH_NO_STREAM +/*! + * @brief Resets an @ref XXH3_state_t with secret data to begin a new hash. + * + * @param statePtr A pointer to an @ref XXH3_state_t allocated with @ref XXH3_createState(). + * @param secret The secret data. + * @param secretSize The length of @p secret, in bytes. + * @param seed64 The 64-bit seed to alter the hash result predictably. + * + * @return @ref XXH_OK on success. + * @return @ref XXH_ERROR on failure. + * + * @see XXH3_64bits_withSecretandSeed() + */ +XXH_PUBLIC_API XXH_errorcode +XXH3_64bits_reset_withSecretandSeed(XXH_NOESCAPE XXH3_state_t* statePtr, + XXH_NOESCAPE const void* secret, size_t secretSize, + XXH64_hash_t seed64); +/*! + * @brief Resets an @ref XXH3_state_t with secret data to begin a new hash. + * + * @param statePtr A pointer to an @ref XXH3_state_t allocated with @ref XXH3_createState(). + * @param secret The secret data. + * @param secretSize The length of @p secret, in bytes. + * @param seed64 The 64-bit seed to alter the hash result predictably. + * + * @return @ref XXH_OK on success. + * @return @ref XXH_ERROR on failure. + * + * @see XXH3_64bits_withSecretandSeed() + */ +XXH_PUBLIC_API XXH_errorcode +XXH3_128bits_reset_withSecretandSeed(XXH_NOESCAPE XXH3_state_t* statePtr, + XXH_NOESCAPE const void* secret, size_t secretSize, + XXH64_hash_t seed64); +#endif /* !XXH_NO_STREAM */ + +#endif /* !XXH_NO_XXH3 */ +#endif /* XXH_NO_LONG_LONG */ +#if defined(XXH_INLINE_ALL) || defined(XXH_PRIVATE_API) +# define XXH_IMPLEMENTATION +#endif + +#endif /* defined(XXH_STATIC_LINKING_ONLY) && !defined(XXHASH_H_STATIC_13879238742) */ + + +/* ======================================================================== */ +/* ======================================================================== */ +/* ======================================================================== */ + + +/*-********************************************************************** + * xxHash implementation + *-********************************************************************** + * xxHash's implementation used to be hosted inside xxhash.c. + * + * However, inlining requires implementation to be visible to the compiler, + * hence be included alongside the header. + * Previously, implementation was hosted inside xxhash.c, + * which was then #included when inlining was activated. + * This construction created issues with a few build and install systems, + * as it required xxhash.c to be stored in /include directory. + * + * xxHash implementation is now directly integrated within xxhash.h. + * As a consequence, xxhash.c is no longer needed in /include. + * + * xxhash.c is still available and is still useful. + * In a "normal" setup, when xxhash is not inlined, + * xxhash.h only exposes the prototypes and public symbols, + * while xxhash.c can be built into an object file xxhash.o + * which can then be linked into the final binary. + ************************************************************************/ + +#if ( defined(XXH_INLINE_ALL) || defined(XXH_PRIVATE_API) \ + || defined(XXH_IMPLEMENTATION) ) && !defined(XXH_IMPLEM_13a8737387) +# define XXH_IMPLEM_13a8737387 + +/* ************************************* +* Tuning parameters +***************************************/ + +/*! + * @defgroup tuning Tuning parameters + * @{ + * + * Various macros to control xxHash's behavior. + */ +#ifdef XXH_DOXYGEN +/*! + * @brief Define this to disable 64-bit code. + * + * Useful if only using the @ref XXH32_family and you have a strict C90 compiler. + */ +# define XXH_NO_LONG_LONG +# undef XXH_NO_LONG_LONG /* don't actually */ +/*! + * @brief Controls how unaligned memory is accessed. + * + * By default, access to unaligned memory is controlled by `memcpy()`, which is + * safe and portable. + * + * Unfortunately, on some target/compiler combinations, the generated assembly + * is sub-optimal. + * + * The below switch allow selection of a different access method + * in the search for improved performance. + * + * @par Possible options: + * + * - `XXH_FORCE_MEMORY_ACCESS=0` (default): `memcpy` + * @par + * Use `memcpy()`. Safe and portable. Note that most modern compilers will + * eliminate the function call and treat it as an unaligned access. + * + * - `XXH_FORCE_MEMORY_ACCESS=1`: `__attribute__((aligned(1)))` + * @par + * Depends on compiler extensions and is therefore not portable. + * This method is safe _if_ your compiler supports it, + * and *generally* as fast or faster than `memcpy`. + * + * - `XXH_FORCE_MEMORY_ACCESS=2`: Direct cast + * @par + * Casts directly and dereferences. This method doesn't depend on the + * compiler, but it violates the C standard as it directly dereferences an + * unaligned pointer. It can generate buggy code on targets which do not + * support unaligned memory accesses, but in some circumstances, it's the + * only known way to get the most performance. + * + * - `XXH_FORCE_MEMORY_ACCESS=3`: Byteshift + * @par + * Also portable. This can generate the best code on old compilers which don't + * inline small `memcpy()` calls, and it might also be faster on big-endian + * systems which lack a native byteswap instruction. However, some compilers + * will emit literal byteshifts even if the target supports unaligned access. + * + * + * @warning + * Methods 1 and 2 rely on implementation-defined behavior. Use these with + * care, as what works on one compiler/platform/optimization level may cause + * another to read garbage data or even crash. + * + * See https://fastcompression.blogspot.com/2015/08/accessing-unaligned-memory.html for details. + * + * Prefer these methods in priority order (0 > 3 > 1 > 2) + */ +# define XXH_FORCE_MEMORY_ACCESS 0 + +/*! + * @def XXH_SIZE_OPT + * @brief Controls how much xxHash optimizes for size. + * + * xxHash, when compiled, tends to result in a rather large binary size. This + * is mostly due to heavy usage to forced inlining and constant folding of the + * @ref XXH3_family to increase performance. + * + * However, some developers prefer size over speed. This option can + * significantly reduce the size of the generated code. When using the `-Os` + * or `-Oz` options on GCC or Clang, this is defined to 1 by default, + * otherwise it is defined to 0. + * + * Most of these size optimizations can be controlled manually. + * + * This is a number from 0-2. + * - `XXH_SIZE_OPT` == 0: Default. xxHash makes no size optimizations. Speed + * comes first. + * - `XXH_SIZE_OPT` == 1: Default for `-Os` and `-Oz`. xxHash is more + * conservative and disables hacks that increase code size. It implies the + * options @ref XXH_NO_INLINE_HINTS == 1, @ref XXH_FORCE_ALIGN_CHECK == 0, + * and @ref XXH3_NEON_LANES == 8 if they are not already defined. + * - `XXH_SIZE_OPT` == 2: xxHash tries to make itself as small as possible. + * Performance may cry. For example, the single shot functions just use the + * streaming API. + */ +# define XXH_SIZE_OPT 0 + +/*! + * @def XXH_FORCE_ALIGN_CHECK + * @brief If defined to non-zero, adds a special path for aligned inputs (XXH32() + * and XXH64() only). + * + * This is an important performance trick for architectures without decent + * unaligned memory access performance. + * + * It checks for input alignment, and when conditions are met, uses a "fast + * path" employing direct 32-bit/64-bit reads, resulting in _dramatically + * faster_ read speed. + * + * The check costs one initial branch per hash, which is generally negligible, + * but not zero. + * + * Moreover, it's not useful to generate an additional code path if memory + * access uses the same instruction for both aligned and unaligned + * addresses (e.g. x86 and aarch64). + * + * In these cases, the alignment check can be removed by setting this macro to 0. + * Then the code will always use unaligned memory access. + * Align check is automatically disabled on x86, x64, ARM64, and some ARM chips + * which are platforms known to offer good unaligned memory accesses performance. + * + * It is also disabled by default when @ref XXH_SIZE_OPT >= 1. + * + * This option does not affect XXH3 (only XXH32 and XXH64). + */ +# define XXH_FORCE_ALIGN_CHECK 0 + +/*! + * @def XXH_NO_INLINE_HINTS + * @brief When non-zero, sets all functions to `static`. + * + * By default, xxHash tries to force the compiler to inline almost all internal + * functions. + * + * This can usually improve performance due to reduced jumping and improved + * constant folding, but significantly increases the size of the binary which + * might not be favorable. + * + * Additionally, sometimes the forced inlining can be detrimental to performance, + * depending on the architecture. + * + * XXH_NO_INLINE_HINTS marks all internal functions as static, giving the + * compiler full control on whether to inline or not. + * + * When not optimizing (-O0), using `-fno-inline` with GCC or Clang, or if + * @ref XXH_SIZE_OPT >= 1, this will automatically be defined. + */ +# define XXH_NO_INLINE_HINTS 0 + +/*! + * @def XXH3_INLINE_SECRET + * @brief Determines whether to inline the XXH3 withSecret code. + * + * When the secret size is known, the compiler can improve the performance + * of XXH3_64bits_withSecret() and XXH3_128bits_withSecret(). + * + * However, if the secret size is not known, it doesn't have any benefit. This + * happens when xxHash is compiled into a global symbol. Therefore, if + * @ref XXH_INLINE_ALL is *not* defined, this will be defined to 0. + * + * Additionally, this defaults to 0 on GCC 12+, which has an issue with function pointers + * that are *sometimes* force inline on -Og, and it is impossible to automatically + * detect this optimization level. + */ +# define XXH3_INLINE_SECRET 0 + +/*! + * @def XXH32_ENDJMP + * @brief Whether to use a jump for `XXH32_finalize`. + * + * For performance, `XXH32_finalize` uses multiple branches in the finalizer. + * This is generally preferable for performance, + * but depending on exact architecture, a jmp may be preferable. + * + * This setting is only possibly making a difference for very small inputs. + */ +# define XXH32_ENDJMP 0 + +/*! + * @internal + * @brief Redefines old internal names. + * + * For compatibility with code that uses xxHash's internals before the names + * were changed to improve namespacing. There is no other reason to use this. + */ +# define XXH_OLD_NAMES +# undef XXH_OLD_NAMES /* don't actually use, it is ugly. */ + +/*! + * @def XXH_NO_STREAM + * @brief Disables the streaming API. + * + * When xxHash is not inlined and the streaming functions are not used, disabling + * the streaming functions can improve code size significantly, especially with + * the @ref XXH3_family which tends to make constant folded copies of itself. + */ +# define XXH_NO_STREAM +# undef XXH_NO_STREAM /* don't actually */ +#endif /* XXH_DOXYGEN */ +/*! + * @} + */ + +#ifndef XXH_FORCE_MEMORY_ACCESS /* can be defined externally, on command line for example */ + /* prefer __packed__ structures (method 1) for GCC + * < ARMv7 with unaligned access (e.g. Raspbian armhf) still uses byte shifting, so we use memcpy + * which for some reason does unaligned loads. */ +# if defined(__GNUC__) && !(defined(__ARM_ARCH) && __ARM_ARCH < 7 && defined(__ARM_FEATURE_UNALIGNED)) +# define XXH_FORCE_MEMORY_ACCESS 1 +# endif +#endif + +#ifndef XXH_SIZE_OPT + /* default to 1 for -Os or -Oz */ +# if (defined(__GNUC__) || defined(__clang__)) && defined(__OPTIMIZE_SIZE__) +# define XXH_SIZE_OPT 1 +# else +# define XXH_SIZE_OPT 0 +# endif +#endif + +#ifndef XXH_FORCE_ALIGN_CHECK /* can be defined externally */ + /* don't check on sizeopt, x86, aarch64, or arm when unaligned access is available */ +# if XXH_SIZE_OPT >= 1 || \ + defined(__i386) || defined(__x86_64__) || defined(__aarch64__) || defined(__ARM_FEATURE_UNALIGNED) \ + || defined(_M_IX86) || defined(_M_X64) || defined(_M_ARM64) || defined(_M_ARM) /* visual */ +# define XXH_FORCE_ALIGN_CHECK 0 +# else +# define XXH_FORCE_ALIGN_CHECK 1 +# endif +#endif + +#ifndef XXH_NO_INLINE_HINTS +# if XXH_SIZE_OPT >= 1 || defined(__NO_INLINE__) /* -O0, -fno-inline */ +# define XXH_NO_INLINE_HINTS 1 +# else +# define XXH_NO_INLINE_HINTS 0 +# endif +#endif + +#ifndef XXH3_INLINE_SECRET +# if (defined(__GNUC__) && !defined(__clang__) && __GNUC__ >= 12) \ + || !defined(XXH_INLINE_ALL) +# define XXH3_INLINE_SECRET 0 +# else +# define XXH3_INLINE_SECRET 1 +# endif +#endif + +#ifndef XXH32_ENDJMP +/* generally preferable for performance */ +# define XXH32_ENDJMP 0 +#endif + +/*! + * @defgroup impl Implementation + * @{ + */ + + +/* ************************************* +* Includes & Memory related functions +***************************************/ +#if defined(XXH_NO_STREAM) +/* nothing */ +#elif defined(XXH_NO_STDLIB) + +/* When requesting to disable any mention of stdlib, + * the library loses the ability to invoked malloc / free. + * In practice, it means that functions like `XXH*_createState()` + * will always fail, and return NULL. + * This flag is useful in situations where + * xxhash.h is integrated into some kernel, embedded or limited environment + * without access to dynamic allocation. + */ + +static XXH_CONSTF void* XXH_malloc(size_t s) { (void)s; return NULL; } +static void XXH_free(void* p) { (void)p; } + +#else + +/* + * Modify the local functions below should you wish to use + * different memory routines for malloc() and free() + */ +#include + +/*! + * @internal + * @brief Modify this function to use a different routine than malloc(). + */ +static XXH_MALLOCF void* XXH_malloc(size_t s) { return malloc(s); } + +/*! + * @internal + * @brief Modify this function to use a different routine than free(). + */ +static void XXH_free(void* p) { free(p); } + +#endif /* XXH_NO_STDLIB */ + +#include + +/*! + * @internal + * @brief Modify this function to use a different routine than memcpy(). + */ +static void* XXH_memcpy(void* dest, const void* src, size_t size) +{ + return memcpy(dest,src,size); +} + +#include /* ULLONG_MAX */ + + +/* ************************************* +* Compiler Specific Options +***************************************/ +#ifdef _MSC_VER /* Visual Studio warning fix */ +# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */ +#endif + +#if XXH_NO_INLINE_HINTS /* disable inlining hints */ +# if defined(__GNUC__) || defined(__clang__) +# define XXH_FORCE_INLINE static __attribute__((unused)) +# else +# define XXH_FORCE_INLINE static +# endif +# define XXH_NO_INLINE static +/* enable inlining hints */ +#elif defined(__GNUC__) || defined(__clang__) +# define XXH_FORCE_INLINE static __inline__ __attribute__((always_inline, unused)) +# define XXH_NO_INLINE static __attribute__((noinline)) +#elif defined(_MSC_VER) /* Visual Studio */ +# define XXH_FORCE_INLINE static __forceinline +# define XXH_NO_INLINE static __declspec(noinline) +#elif defined (__cplusplus) \ + || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) /* C99 */ +# define XXH_FORCE_INLINE static inline +# define XXH_NO_INLINE static +#else +# define XXH_FORCE_INLINE static +# define XXH_NO_INLINE static +#endif + +#if XXH3_INLINE_SECRET +# define XXH3_WITH_SECRET_INLINE XXH_FORCE_INLINE +#else +# define XXH3_WITH_SECRET_INLINE XXH_NO_INLINE +#endif + + +/* ************************************* +* Debug +***************************************/ +/*! + * @ingroup tuning + * @def XXH_DEBUGLEVEL + * @brief Sets the debugging level. + * + * XXH_DEBUGLEVEL is expected to be defined externally, typically via the + * compiler's command line options. The value must be a number. + */ +#ifndef XXH_DEBUGLEVEL +# ifdef DEBUGLEVEL /* backwards compat */ +# define XXH_DEBUGLEVEL DEBUGLEVEL +# else +# define XXH_DEBUGLEVEL 0 +# endif +#endif + +#if (XXH_DEBUGLEVEL>=1) +# include /* note: can still be disabled with NDEBUG */ +# define XXH_ASSERT(c) assert(c) +#else +# if defined(__INTEL_COMPILER) +# define XXH_ASSERT(c) XXH_ASSUME((unsigned char) (c)) +# else +# define XXH_ASSERT(c) XXH_ASSUME(c) +# endif +#endif + +/* note: use after variable declarations */ +#ifndef XXH_STATIC_ASSERT +# if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */ +# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { _Static_assert((c),m); } while(0) +# elif defined(__cplusplus) && (__cplusplus >= 201103L) /* C++11 */ +# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) +# else +# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { struct xxh_sa { char x[(c) ? 1 : -1]; }; } while(0) +# endif +# define XXH_STATIC_ASSERT(c) XXH_STATIC_ASSERT_WITH_MESSAGE((c),#c) +#endif + +/*! + * @internal + * @def XXH_COMPILER_GUARD(var) + * @brief Used to prevent unwanted optimizations for @p var. + * + * It uses an empty GCC inline assembly statement with a register constraint + * which forces @p var into a general purpose register (eg eax, ebx, ecx + * on x86) and marks it as modified. + * + * This is used in a few places to avoid unwanted autovectorization (e.g. + * XXH32_round()). All vectorization we want is explicit via intrinsics, + * and _usually_ isn't wanted elsewhere. + * + * We also use it to prevent unwanted constant folding for AArch64 in + * XXH3_initCustomSecret_scalar(). + */ +#if defined(__GNUC__) || defined(__clang__) +# define XXH_COMPILER_GUARD(var) __asm__("" : "+r" (var)) +#else +# define XXH_COMPILER_GUARD(var) ((void)0) +#endif + +/* Specifically for NEON vectors which use the "w" constraint, on + * Clang. */ +#if defined(__clang__) && defined(__ARM_ARCH) && !defined(__wasm__) +# define XXH_COMPILER_GUARD_CLANG_NEON(var) __asm__("" : "+w" (var)) +#else +# define XXH_COMPILER_GUARD_CLANG_NEON(var) ((void)0) +#endif + +/* ************************************* +* Basic Types +***************************************/ +#if !defined (__VMS) \ + && (defined (__cplusplus) \ + || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) ) +# ifdef _AIX +# include +# else +# include +# endif + typedef uint8_t xxh_u8; +#else + typedef unsigned char xxh_u8; +#endif +typedef XXH32_hash_t xxh_u32; + +#ifdef XXH_OLD_NAMES +# warning "XXH_OLD_NAMES is planned to be removed starting v0.9. If the program depends on it, consider moving away from it by employing newer type names directly" +# define BYTE xxh_u8 +# define U8 xxh_u8 +# define U32 xxh_u32 +#endif + +/* *** Memory access *** */ + +/*! + * @internal + * @fn xxh_u32 XXH_read32(const void* ptr) + * @brief Reads an unaligned 32-bit integer from @p ptr in native endianness. + * + * Affected by @ref XXH_FORCE_MEMORY_ACCESS. + * + * @param ptr The pointer to read from. + * @return The 32-bit native endian integer from the bytes at @p ptr. + */ + +/*! + * @internal + * @fn xxh_u32 XXH_readLE32(const void* ptr) + * @brief Reads an unaligned 32-bit little endian integer from @p ptr. + * + * Affected by @ref XXH_FORCE_MEMORY_ACCESS. + * + * @param ptr The pointer to read from. + * @return The 32-bit little endian integer from the bytes at @p ptr. + */ + +/*! + * @internal + * @fn xxh_u32 XXH_readBE32(const void* ptr) + * @brief Reads an unaligned 32-bit big endian integer from @p ptr. + * + * Affected by @ref XXH_FORCE_MEMORY_ACCESS. + * + * @param ptr The pointer to read from. + * @return The 32-bit big endian integer from the bytes at @p ptr. + */ + +/*! + * @internal + * @fn xxh_u32 XXH_readLE32_align(const void* ptr, XXH_alignment align) + * @brief Like @ref XXH_readLE32(), but has an option for aligned reads. + * + * Affected by @ref XXH_FORCE_MEMORY_ACCESS. + * Note that when @ref XXH_FORCE_ALIGN_CHECK == 0, the @p align parameter is + * always @ref XXH_alignment::XXH_unaligned. + * + * @param ptr The pointer to read from. + * @param align Whether @p ptr is aligned. + * @pre + * If @p align == @ref XXH_alignment::XXH_aligned, @p ptr must be 4 byte + * aligned. + * @return The 32-bit little endian integer from the bytes at @p ptr. + */ + +#if (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==3)) +/* + * Manual byteshift. Best for old compilers which don't inline memcpy. + * We actually directly use XXH_readLE32 and XXH_readBE32. + */ +#elif (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==2)) + +/* + * Force direct memory access. Only works on CPU which support unaligned memory + * access in hardware. + */ +static xxh_u32 XXH_read32(const void* memPtr) { return *(const xxh_u32*) memPtr; } + +#elif (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==1)) + +/* + * __attribute__((aligned(1))) is supported by gcc and clang. Originally the + * documentation claimed that it only increased the alignment, but actually it + * can decrease it on gcc, clang, and icc: + * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69502, + * https://gcc.godbolt.org/z/xYez1j67Y. + */ +#ifdef XXH_OLD_NAMES +typedef union { xxh_u32 u32; } __attribute__((packed)) unalign; +#endif +static xxh_u32 XXH_read32(const void* ptr) +{ + typedef __attribute__((aligned(1))) xxh_u32 xxh_unalign32; + return *((const xxh_unalign32*)ptr); +} + +#else + +/* + * Portable and safe solution. Generally efficient. + * see: https://fastcompression.blogspot.com/2015/08/accessing-unaligned-memory.html + */ +static xxh_u32 XXH_read32(const void* memPtr) +{ + xxh_u32 val; + XXH_memcpy(&val, memPtr, sizeof(val)); + return val; +} + +#endif /* XXH_FORCE_DIRECT_MEMORY_ACCESS */ + + +/* *** Endianness *** */ + +/*! + * @ingroup tuning + * @def XXH_CPU_LITTLE_ENDIAN + * @brief Whether the target is little endian. + * + * Defined to 1 if the target is little endian, or 0 if it is big endian. + * It can be defined externally, for example on the compiler command line. + * + * If it is not defined, + * a runtime check (which is usually constant folded) is used instead. + * + * @note + * This is not necessarily defined to an integer constant. + * + * @see XXH_isLittleEndian() for the runtime check. + */ +#ifndef XXH_CPU_LITTLE_ENDIAN +/* + * Try to detect endianness automatically, to avoid the nonstandard behavior + * in `XXH_isLittleEndian()` + */ +# if defined(_WIN32) /* Windows is always little endian */ \ + || defined(__LITTLE_ENDIAN__) \ + || (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) +# define XXH_CPU_LITTLE_ENDIAN 1 +# elif defined(__BIG_ENDIAN__) \ + || (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) +# define XXH_CPU_LITTLE_ENDIAN 0 +# else +/*! + * @internal + * @brief Runtime check for @ref XXH_CPU_LITTLE_ENDIAN. + * + * Most compilers will constant fold this. + */ +static int XXH_isLittleEndian(void) +{ + /* + * Portable and well-defined behavior. + * Don't use static: it is detrimental to performance. + */ + const union { xxh_u32 u; xxh_u8 c[4]; } one = { 1 }; + return one.c[0]; +} +# define XXH_CPU_LITTLE_ENDIAN XXH_isLittleEndian() +# endif +#endif + + + + +/* **************************************** +* Compiler-specific Functions and Macros +******************************************/ +#define XXH_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) + +#ifdef __has_builtin +# define XXH_HAS_BUILTIN(x) __has_builtin(x) +#else +# define XXH_HAS_BUILTIN(x) 0 +#endif + + + +/* + * C23 and future versions have standard "unreachable()". + * Once it has been implemented reliably we can add it as an + * additional case: + * + * ``` + * #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= XXH_C23_VN) + * # include + * # ifdef unreachable + * # define XXH_UNREACHABLE() unreachable() + * # endif + * #endif + * ``` + * + * Note C++23 also has std::unreachable() which can be detected + * as follows: + * ``` + * #if defined(__cpp_lib_unreachable) && (__cpp_lib_unreachable >= 202202L) + * # include + * # define XXH_UNREACHABLE() std::unreachable() + * #endif + * ``` + * NB: `__cpp_lib_unreachable` is defined in the `` header. + * We don't use that as including `` in `extern "C"` blocks + * doesn't work on GCC12 + */ + +#if XXH_HAS_BUILTIN(__builtin_unreachable) +# define XXH_UNREACHABLE() __builtin_unreachable() + +#elif defined(_MSC_VER) +# define XXH_UNREACHABLE() __assume(0) + +#else +# define XXH_UNREACHABLE() +#endif + +#if XXH_HAS_BUILTIN(__builtin_assume) +# define XXH_ASSUME(c) __builtin_assume(c) +#else +# define XXH_ASSUME(c) if (!(c)) { XXH_UNREACHABLE(); } +#endif + +/*! + * @internal + * @def XXH_rotl32(x,r) + * @brief 32-bit rotate left. + * + * @param x The 32-bit integer to be rotated. + * @param r The number of bits to rotate. + * @pre + * @p r > 0 && @p r < 32 + * @note + * @p x and @p r may be evaluated multiple times. + * @return The rotated result. + */ +#if !defined(NO_CLANG_BUILTIN) && XXH_HAS_BUILTIN(__builtin_rotateleft32) \ + && XXH_HAS_BUILTIN(__builtin_rotateleft64) +# define XXH_rotl32 __builtin_rotateleft32 +# define XXH_rotl64 __builtin_rotateleft64 +/* Note: although _rotl exists for minGW (GCC under windows), performance seems poor */ +#elif defined(_MSC_VER) +# define XXH_rotl32(x,r) _rotl(x,r) +# define XXH_rotl64(x,r) _rotl64(x,r) +#else +# define XXH_rotl32(x,r) (((x) << (r)) | ((x) >> (32 - (r)))) +# define XXH_rotl64(x,r) (((x) << (r)) | ((x) >> (64 - (r)))) +#endif + +/*! + * @internal + * @fn xxh_u32 XXH_swap32(xxh_u32 x) + * @brief A 32-bit byteswap. + * + * @param x The 32-bit integer to byteswap. + * @return @p x, byteswapped. + */ +#if defined(_MSC_VER) /* Visual Studio */ +# define XXH_swap32 _byteswap_ulong +#elif XXH_GCC_VERSION >= 403 +# define XXH_swap32 __builtin_bswap32 +#else +static xxh_u32 XXH_swap32 (xxh_u32 x) +{ + return ((x << 24) & 0xff000000 ) | + ((x << 8) & 0x00ff0000 ) | + ((x >> 8) & 0x0000ff00 ) | + ((x >> 24) & 0x000000ff ); +} +#endif + + +/* *************************** +* Memory reads +*****************************/ + +/*! + * @internal + * @brief Enum to indicate whether a pointer is aligned. + */ +typedef enum { + XXH_aligned, /*!< Aligned */ + XXH_unaligned /*!< Possibly unaligned */ +} XXH_alignment; + +/* + * XXH_FORCE_MEMORY_ACCESS==3 is an endian-independent byteshift load. + * + * This is ideal for older compilers which don't inline memcpy. + */ +#if (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==3)) + +XXH_FORCE_INLINE xxh_u32 XXH_readLE32(const void* memPtr) +{ + const xxh_u8* bytePtr = (const xxh_u8 *)memPtr; + return bytePtr[0] + | ((xxh_u32)bytePtr[1] << 8) + | ((xxh_u32)bytePtr[2] << 16) + | ((xxh_u32)bytePtr[3] << 24); +} + +XXH_FORCE_INLINE xxh_u32 XXH_readBE32(const void* memPtr) +{ + const xxh_u8* bytePtr = (const xxh_u8 *)memPtr; + return bytePtr[3] + | ((xxh_u32)bytePtr[2] << 8) + | ((xxh_u32)bytePtr[1] << 16) + | ((xxh_u32)bytePtr[0] << 24); +} + +#else +XXH_FORCE_INLINE xxh_u32 XXH_readLE32(const void* ptr) +{ + return XXH_CPU_LITTLE_ENDIAN ? XXH_read32(ptr) : XXH_swap32(XXH_read32(ptr)); +} + +static xxh_u32 XXH_readBE32(const void* ptr) +{ + return XXH_CPU_LITTLE_ENDIAN ? XXH_swap32(XXH_read32(ptr)) : XXH_read32(ptr); +} +#endif + +XXH_FORCE_INLINE xxh_u32 +XXH_readLE32_align(const void* ptr, XXH_alignment align) +{ + if (align==XXH_unaligned) { + return XXH_readLE32(ptr); + } else { + return XXH_CPU_LITTLE_ENDIAN ? *(const xxh_u32*)ptr : XXH_swap32(*(const xxh_u32*)ptr); + } +} + + +/* ************************************* +* Misc +***************************************/ +/*! @ingroup public */ +XXH_PUBLIC_API unsigned XXH_versionNumber (void) { return XXH_VERSION_NUMBER; } + + +/* ******************************************************************* +* 32-bit hash functions +*********************************************************************/ +/*! + * @} + * @defgroup XXH32_impl XXH32 implementation + * @ingroup impl + * + * Details on the XXH32 implementation. + * @{ + */ + /* #define instead of static const, to be used as initializers */ +#define XXH_PRIME32_1 0x9E3779B1U /*!< 0b10011110001101110111100110110001 */ +#define XXH_PRIME32_2 0x85EBCA77U /*!< 0b10000101111010111100101001110111 */ +#define XXH_PRIME32_3 0xC2B2AE3DU /*!< 0b11000010101100101010111000111101 */ +#define XXH_PRIME32_4 0x27D4EB2FU /*!< 0b00100111110101001110101100101111 */ +#define XXH_PRIME32_5 0x165667B1U /*!< 0b00010110010101100110011110110001 */ + +#ifdef XXH_OLD_NAMES +# define PRIME32_1 XXH_PRIME32_1 +# define PRIME32_2 XXH_PRIME32_2 +# define PRIME32_3 XXH_PRIME32_3 +# define PRIME32_4 XXH_PRIME32_4 +# define PRIME32_5 XXH_PRIME32_5 +#endif + +/*! + * @internal + * @brief Normal stripe processing routine. + * + * This shuffles the bits so that any bit from @p input impacts several bits in + * @p acc. + * + * @param acc The accumulator lane. + * @param input The stripe of input to mix. + * @return The mixed accumulator lane. + */ +static xxh_u32 XXH32_round(xxh_u32 acc, xxh_u32 input) +{ + acc += input * XXH_PRIME32_2; + acc = XXH_rotl32(acc, 13); + acc *= XXH_PRIME32_1; +#if (defined(__SSE4_1__) || defined(__aarch64__) || defined(__wasm_simd128__)) && !defined(XXH_ENABLE_AUTOVECTORIZE) + /* + * UGLY HACK: + * A compiler fence is the only thing that prevents GCC and Clang from + * autovectorizing the XXH32 loop (pragmas and attributes don't work for some + * reason) without globally disabling SSE4.1. + * + * The reason we want to avoid vectorization is because despite working on + * 4 integers at a time, there are multiple factors slowing XXH32 down on + * SSE4: + * - There's a ridiculous amount of lag from pmulld (10 cycles of latency on + * newer chips!) making it slightly slower to multiply four integers at + * once compared to four integers independently. Even when pmulld was + * fastest, Sandy/Ivy Bridge, it is still not worth it to go into SSE + * just to multiply unless doing a long operation. + * + * - Four instructions are required to rotate, + * movqda tmp, v // not required with VEX encoding + * pslld tmp, 13 // tmp <<= 13 + * psrld v, 19 // x >>= 19 + * por v, tmp // x |= tmp + * compared to one for scalar: + * roll v, 13 // reliably fast across the board + * shldl v, v, 13 // Sandy Bridge and later prefer this for some reason + * + * - Instruction level parallelism is actually more beneficial here because + * the SIMD actually serializes this operation: While v1 is rotating, v2 + * can load data, while v3 can multiply. SSE forces them to operate + * together. + * + * This is also enabled on AArch64, as Clang is *very aggressive* in vectorizing + * the loop. NEON is only faster on the A53, and with the newer cores, it is less + * than half the speed. + * + * Additionally, this is used on WASM SIMD128 because it JITs to the same + * SIMD instructions and has the same issue. + */ + XXH_COMPILER_GUARD(acc); +#endif + return acc; +} + +/*! + * @internal + * @brief Mixes all bits to finalize the hash. + * + * The final mix ensures that all input bits have a chance to impact any bit in + * the output digest, resulting in an unbiased distribution. + * + * @param hash The hash to avalanche. + * @return The avalanched hash. + */ +static xxh_u32 XXH32_avalanche(xxh_u32 hash) +{ + hash ^= hash >> 15; + hash *= XXH_PRIME32_2; + hash ^= hash >> 13; + hash *= XXH_PRIME32_3; + hash ^= hash >> 16; + return hash; +} + +#define XXH_get32bits(p) XXH_readLE32_align(p, align) + +/*! + * @internal + * @brief Processes the last 0-15 bytes of @p ptr. + * + * There may be up to 15 bytes remaining to consume from the input. + * This final stage will digest them to ensure that all input bytes are present + * in the final mix. + * + * @param hash The hash to finalize. + * @param ptr The pointer to the remaining input. + * @param len The remaining length, modulo 16. + * @param align Whether @p ptr is aligned. + * @return The finalized hash. + * @see XXH64_finalize(). + */ +static XXH_PUREF xxh_u32 +XXH32_finalize(xxh_u32 hash, const xxh_u8* ptr, size_t len, XXH_alignment align) +{ +#define XXH_PROCESS1 do { \ + hash += (*ptr++) * XXH_PRIME32_5; \ + hash = XXH_rotl32(hash, 11) * XXH_PRIME32_1; \ +} while (0) + +#define XXH_PROCESS4 do { \ + hash += XXH_get32bits(ptr) * XXH_PRIME32_3; \ + ptr += 4; \ + hash = XXH_rotl32(hash, 17) * XXH_PRIME32_4; \ +} while (0) + + if (ptr==NULL) XXH_ASSERT(len == 0); + + /* Compact rerolled version; generally faster */ + if (!XXH32_ENDJMP) { + len &= 15; + while (len >= 4) { + XXH_PROCESS4; + len -= 4; + } + while (len > 0) { + XXH_PROCESS1; + --len; + } + return XXH32_avalanche(hash); + } else { + switch(len&15) /* or switch(bEnd - p) */ { + case 12: XXH_PROCESS4; + XXH_FALLTHROUGH; /* fallthrough */ + case 8: XXH_PROCESS4; + XXH_FALLTHROUGH; /* fallthrough */ + case 4: XXH_PROCESS4; + return XXH32_avalanche(hash); + + case 13: XXH_PROCESS4; + XXH_FALLTHROUGH; /* fallthrough */ + case 9: XXH_PROCESS4; + XXH_FALLTHROUGH; /* fallthrough */ + case 5: XXH_PROCESS4; + XXH_PROCESS1; + return XXH32_avalanche(hash); + + case 14: XXH_PROCESS4; + XXH_FALLTHROUGH; /* fallthrough */ + case 10: XXH_PROCESS4; + XXH_FALLTHROUGH; /* fallthrough */ + case 6: XXH_PROCESS4; + XXH_PROCESS1; + XXH_PROCESS1; + return XXH32_avalanche(hash); + + case 15: XXH_PROCESS4; + XXH_FALLTHROUGH; /* fallthrough */ + case 11: XXH_PROCESS4; + XXH_FALLTHROUGH; /* fallthrough */ + case 7: XXH_PROCESS4; + XXH_FALLTHROUGH; /* fallthrough */ + case 3: XXH_PROCESS1; + XXH_FALLTHROUGH; /* fallthrough */ + case 2: XXH_PROCESS1; + XXH_FALLTHROUGH; /* fallthrough */ + case 1: XXH_PROCESS1; + XXH_FALLTHROUGH; /* fallthrough */ + case 0: return XXH32_avalanche(hash); + } + XXH_ASSERT(0); + return hash; /* reaching this point is deemed impossible */ + } +} + +#ifdef XXH_OLD_NAMES +# define PROCESS1 XXH_PROCESS1 +# define PROCESS4 XXH_PROCESS4 +#else +# undef XXH_PROCESS1 +# undef XXH_PROCESS4 +#endif + +/*! + * @internal + * @brief The implementation for @ref XXH32(). + * + * @param input , len , seed Directly passed from @ref XXH32(). + * @param align Whether @p input is aligned. + * @return The calculated hash. + */ +XXH_FORCE_INLINE XXH_PUREF xxh_u32 +XXH32_endian_align(const xxh_u8* input, size_t len, xxh_u32 seed, XXH_alignment align) +{ + xxh_u32 h32; + + if (input==NULL) XXH_ASSERT(len == 0); + + if (len>=16) { + const xxh_u8* const bEnd = input + len; + const xxh_u8* const limit = bEnd - 15; + xxh_u32 v1 = seed + XXH_PRIME32_1 + XXH_PRIME32_2; + xxh_u32 v2 = seed + XXH_PRIME32_2; + xxh_u32 v3 = seed + 0; + xxh_u32 v4 = seed - XXH_PRIME32_1; + + do { + v1 = XXH32_round(v1, XXH_get32bits(input)); input += 4; + v2 = XXH32_round(v2, XXH_get32bits(input)); input += 4; + v3 = XXH32_round(v3, XXH_get32bits(input)); input += 4; + v4 = XXH32_round(v4, XXH_get32bits(input)); input += 4; + } while (input < limit); + + h32 = XXH_rotl32(v1, 1) + XXH_rotl32(v2, 7) + + XXH_rotl32(v3, 12) + XXH_rotl32(v4, 18); + } else { + h32 = seed + XXH_PRIME32_5; + } + + h32 += (xxh_u32)len; + + return XXH32_finalize(h32, input, len&15, align); +} + +/*! @ingroup XXH32_family */ +XXH_PUBLIC_API XXH32_hash_t XXH32 (const void* input, size_t len, XXH32_hash_t seed) +{ +#if !defined(XXH_NO_STREAM) && XXH_SIZE_OPT >= 2 + /* Simple version, good for code maintenance, but unfortunately slow for small inputs */ + XXH32_state_t state; + XXH32_reset(&state, seed); + XXH32_update(&state, (const xxh_u8*)input, len); + return XXH32_digest(&state); +#else + if (XXH_FORCE_ALIGN_CHECK) { + if ((((size_t)input) & 3) == 0) { /* Input is 4-bytes aligned, leverage the speed benefit */ + return XXH32_endian_align((const xxh_u8*)input, len, seed, XXH_aligned); + } } + + return XXH32_endian_align((const xxh_u8*)input, len, seed, XXH_unaligned); +#endif +} + + + +/******* Hash streaming *******/ +#ifndef XXH_NO_STREAM +/*! @ingroup XXH32_family */ +XXH_PUBLIC_API XXH32_state_t* XXH32_createState(void) +{ + return (XXH32_state_t*)XXH_malloc(sizeof(XXH32_state_t)); +} +/*! @ingroup XXH32_family */ +XXH_PUBLIC_API XXH_errorcode XXH32_freeState(XXH32_state_t* statePtr) +{ + XXH_free(statePtr); + return XXH_OK; +} + +/*! @ingroup XXH32_family */ +XXH_PUBLIC_API void XXH32_copyState(XXH32_state_t* dstState, const XXH32_state_t* srcState) +{ + XXH_memcpy(dstState, srcState, sizeof(*dstState)); +} + +/*! @ingroup XXH32_family */ +XXH_PUBLIC_API XXH_errorcode XXH32_reset(XXH32_state_t* statePtr, XXH32_hash_t seed) +{ + XXH_ASSERT(statePtr != NULL); + memset(statePtr, 0, sizeof(*statePtr)); + statePtr->v[0] = seed + XXH_PRIME32_1 + XXH_PRIME32_2; + statePtr->v[1] = seed + XXH_PRIME32_2; + statePtr->v[2] = seed + 0; + statePtr->v[3] = seed - XXH_PRIME32_1; + return XXH_OK; +} + + +/*! @ingroup XXH32_family */ +XXH_PUBLIC_API XXH_errorcode +XXH32_update(XXH32_state_t* state, const void* input, size_t len) +{ + if (input==NULL) { + XXH_ASSERT(len == 0); + return XXH_OK; + } + + { const xxh_u8* p = (const xxh_u8*)input; + const xxh_u8* const bEnd = p + len; + + state->total_len_32 += (XXH32_hash_t)len; + state->large_len |= (XXH32_hash_t)((len>=16) | (state->total_len_32>=16)); + + if (state->memsize + len < 16) { /* fill in tmp buffer */ + XXH_memcpy((xxh_u8*)(state->mem32) + state->memsize, input, len); + state->memsize += (XXH32_hash_t)len; + return XXH_OK; + } + + if (state->memsize) { /* some data left from previous update */ + XXH_memcpy((xxh_u8*)(state->mem32) + state->memsize, input, 16-state->memsize); + { const xxh_u32* p32 = state->mem32; + state->v[0] = XXH32_round(state->v[0], XXH_readLE32(p32)); p32++; + state->v[1] = XXH32_round(state->v[1], XXH_readLE32(p32)); p32++; + state->v[2] = XXH32_round(state->v[2], XXH_readLE32(p32)); p32++; + state->v[3] = XXH32_round(state->v[3], XXH_readLE32(p32)); + } + p += 16-state->memsize; + state->memsize = 0; + } + + if (p <= bEnd-16) { + const xxh_u8* const limit = bEnd - 16; + + do { + state->v[0] = XXH32_round(state->v[0], XXH_readLE32(p)); p+=4; + state->v[1] = XXH32_round(state->v[1], XXH_readLE32(p)); p+=4; + state->v[2] = XXH32_round(state->v[2], XXH_readLE32(p)); p+=4; + state->v[3] = XXH32_round(state->v[3], XXH_readLE32(p)); p+=4; + } while (p<=limit); + + } + + if (p < bEnd) { + XXH_memcpy(state->mem32, p, (size_t)(bEnd-p)); + state->memsize = (unsigned)(bEnd-p); + } + } + + return XXH_OK; +} + + +/*! @ingroup XXH32_family */ +XXH_PUBLIC_API XXH32_hash_t XXH32_digest(const XXH32_state_t* state) +{ + xxh_u32 h32; + + if (state->large_len) { + h32 = XXH_rotl32(state->v[0], 1) + + XXH_rotl32(state->v[1], 7) + + XXH_rotl32(state->v[2], 12) + + XXH_rotl32(state->v[3], 18); + } else { + h32 = state->v[2] /* == seed */ + XXH_PRIME32_5; + } + + h32 += state->total_len_32; + + return XXH32_finalize(h32, (const xxh_u8*)state->mem32, state->memsize, XXH_aligned); +} +#endif /* !XXH_NO_STREAM */ + +/******* Canonical representation *******/ + +/*! @ingroup XXH32_family */ +XXH_PUBLIC_API void XXH32_canonicalFromHash(XXH32_canonical_t* dst, XXH32_hash_t hash) +{ + XXH_STATIC_ASSERT(sizeof(XXH32_canonical_t) == sizeof(XXH32_hash_t)); + if (XXH_CPU_LITTLE_ENDIAN) hash = XXH_swap32(hash); + XXH_memcpy(dst, &hash, sizeof(*dst)); +} +/*! @ingroup XXH32_family */ +XXH_PUBLIC_API XXH32_hash_t XXH32_hashFromCanonical(const XXH32_canonical_t* src) +{ + return XXH_readBE32(src); +} + + +#ifndef XXH_NO_LONG_LONG + +/* ******************************************************************* +* 64-bit hash functions +*********************************************************************/ +/*! + * @} + * @ingroup impl + * @{ + */ +/******* Memory access *******/ + +typedef XXH64_hash_t xxh_u64; + +#ifdef XXH_OLD_NAMES +# define U64 xxh_u64 +#endif + +#if (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==3)) +/* + * Manual byteshift. Best for old compilers which don't inline memcpy. + * We actually directly use XXH_readLE64 and XXH_readBE64. + */ +#elif (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==2)) + +/* Force direct memory access. Only works on CPU which support unaligned memory access in hardware */ +static xxh_u64 XXH_read64(const void* memPtr) +{ + return *(const xxh_u64*) memPtr; +} + +#elif (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==1)) + +/* + * __attribute__((aligned(1))) is supported by gcc and clang. Originally the + * documentation claimed that it only increased the alignment, but actually it + * can decrease it on gcc, clang, and icc: + * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69502, + * https://gcc.godbolt.org/z/xYez1j67Y. + */ +#ifdef XXH_OLD_NAMES +typedef union { xxh_u32 u32; xxh_u64 u64; } __attribute__((packed)) unalign64; +#endif +static xxh_u64 XXH_read64(const void* ptr) +{ + typedef __attribute__((aligned(1))) xxh_u64 xxh_unalign64; + return *((const xxh_unalign64*)ptr); +} + +#else + +/* + * Portable and safe solution. Generally efficient. + * see: https://fastcompression.blogspot.com/2015/08/accessing-unaligned-memory.html + */ +static xxh_u64 XXH_read64(const void* memPtr) +{ + xxh_u64 val; + XXH_memcpy(&val, memPtr, sizeof(val)); + return val; +} + +#endif /* XXH_FORCE_DIRECT_MEMORY_ACCESS */ + +#if defined(_MSC_VER) /* Visual Studio */ +# define XXH_swap64 _byteswap_uint64 +#elif XXH_GCC_VERSION >= 403 +# define XXH_swap64 __builtin_bswap64 +#else +static xxh_u64 XXH_swap64(xxh_u64 x) +{ + return ((x << 56) & 0xff00000000000000ULL) | + ((x << 40) & 0x00ff000000000000ULL) | + ((x << 24) & 0x0000ff0000000000ULL) | + ((x << 8) & 0x000000ff00000000ULL) | + ((x >> 8) & 0x00000000ff000000ULL) | + ((x >> 24) & 0x0000000000ff0000ULL) | + ((x >> 40) & 0x000000000000ff00ULL) | + ((x >> 56) & 0x00000000000000ffULL); +} +#endif + + +/* XXH_FORCE_MEMORY_ACCESS==3 is an endian-independent byteshift load. */ +#if (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==3)) + +XXH_FORCE_INLINE xxh_u64 XXH_readLE64(const void* memPtr) +{ + const xxh_u8* bytePtr = (const xxh_u8 *)memPtr; + return bytePtr[0] + | ((xxh_u64)bytePtr[1] << 8) + | ((xxh_u64)bytePtr[2] << 16) + | ((xxh_u64)bytePtr[3] << 24) + | ((xxh_u64)bytePtr[4] << 32) + | ((xxh_u64)bytePtr[5] << 40) + | ((xxh_u64)bytePtr[6] << 48) + | ((xxh_u64)bytePtr[7] << 56); +} + +XXH_FORCE_INLINE xxh_u64 XXH_readBE64(const void* memPtr) +{ + const xxh_u8* bytePtr = (const xxh_u8 *)memPtr; + return bytePtr[7] + | ((xxh_u64)bytePtr[6] << 8) + | ((xxh_u64)bytePtr[5] << 16) + | ((xxh_u64)bytePtr[4] << 24) + | ((xxh_u64)bytePtr[3] << 32) + | ((xxh_u64)bytePtr[2] << 40) + | ((xxh_u64)bytePtr[1] << 48) + | ((xxh_u64)bytePtr[0] << 56); +} + +#else +XXH_FORCE_INLINE xxh_u64 XXH_readLE64(const void* ptr) +{ + return XXH_CPU_LITTLE_ENDIAN ? XXH_read64(ptr) : XXH_swap64(XXH_read64(ptr)); +} + +static xxh_u64 XXH_readBE64(const void* ptr) +{ + return XXH_CPU_LITTLE_ENDIAN ? XXH_swap64(XXH_read64(ptr)) : XXH_read64(ptr); +} +#endif + +XXH_FORCE_INLINE xxh_u64 +XXH_readLE64_align(const void* ptr, XXH_alignment align) +{ + if (align==XXH_unaligned) + return XXH_readLE64(ptr); + else + return XXH_CPU_LITTLE_ENDIAN ? *(const xxh_u64*)ptr : XXH_swap64(*(const xxh_u64*)ptr); +} + + +/******* xxh64 *******/ +/*! + * @} + * @defgroup XXH64_impl XXH64 implementation + * @ingroup impl + * + * Details on the XXH64 implementation. + * @{ + */ +/* #define rather that static const, to be used as initializers */ +#define XXH_PRIME64_1 0x9E3779B185EBCA87ULL /*!< 0b1001111000110111011110011011000110000101111010111100101010000111 */ +#define XXH_PRIME64_2 0xC2B2AE3D27D4EB4FULL /*!< 0b1100001010110010101011100011110100100111110101001110101101001111 */ +#define XXH_PRIME64_3 0x165667B19E3779F9ULL /*!< 0b0001011001010110011001111011000110011110001101110111100111111001 */ +#define XXH_PRIME64_4 0x85EBCA77C2B2AE63ULL /*!< 0b1000010111101011110010100111011111000010101100101010111001100011 */ +#define XXH_PRIME64_5 0x27D4EB2F165667C5ULL /*!< 0b0010011111010100111010110010111100010110010101100110011111000101 */ + +#ifdef XXH_OLD_NAMES +# define PRIME64_1 XXH_PRIME64_1 +# define PRIME64_2 XXH_PRIME64_2 +# define PRIME64_3 XXH_PRIME64_3 +# define PRIME64_4 XXH_PRIME64_4 +# define PRIME64_5 XXH_PRIME64_5 +#endif + +/*! @copydoc XXH32_round */ +static xxh_u64 XXH64_round(xxh_u64 acc, xxh_u64 input) +{ + acc += input * XXH_PRIME64_2; + acc = XXH_rotl64(acc, 31); + acc *= XXH_PRIME64_1; +#if (defined(__AVX512F__)) && !defined(XXH_ENABLE_AUTOVECTORIZE) + /* + * DISABLE AUTOVECTORIZATION: + * A compiler fence is used to prevent GCC and Clang from + * autovectorizing the XXH64 loop (pragmas and attributes don't work for some + * reason) without globally disabling AVX512. + * + * Autovectorization of XXH64 tends to be detrimental, + * though the exact outcome may change depending on exact cpu and compiler version. + * For information, it has been reported as detrimental for Skylake-X, + * but possibly beneficial for Zen4. + * + * The default is to disable auto-vectorization, + * but you can select to enable it instead using `XXH_ENABLE_AUTOVECTORIZE` build variable. + */ + XXH_COMPILER_GUARD(acc); +#endif + return acc; +} + +static xxh_u64 XXH64_mergeRound(xxh_u64 acc, xxh_u64 val) +{ + val = XXH64_round(0, val); + acc ^= val; + acc = acc * XXH_PRIME64_1 + XXH_PRIME64_4; + return acc; +} + +/*! @copydoc XXH32_avalanche */ +static xxh_u64 XXH64_avalanche(xxh_u64 hash) +{ + hash ^= hash >> 33; + hash *= XXH_PRIME64_2; + hash ^= hash >> 29; + hash *= XXH_PRIME64_3; + hash ^= hash >> 32; + return hash; +} + + +#define XXH_get64bits(p) XXH_readLE64_align(p, align) + +/*! + * @internal + * @brief Processes the last 0-31 bytes of @p ptr. + * + * There may be up to 31 bytes remaining to consume from the input. + * This final stage will digest them to ensure that all input bytes are present + * in the final mix. + * + * @param hash The hash to finalize. + * @param ptr The pointer to the remaining input. + * @param len The remaining length, modulo 32. + * @param align Whether @p ptr is aligned. + * @return The finalized hash + * @see XXH32_finalize(). + */ +static XXH_PUREF xxh_u64 +XXH64_finalize(xxh_u64 hash, const xxh_u8* ptr, size_t len, XXH_alignment align) +{ + if (ptr==NULL) XXH_ASSERT(len == 0); + len &= 31; + while (len >= 8) { + xxh_u64 const k1 = XXH64_round(0, XXH_get64bits(ptr)); + ptr += 8; + hash ^= k1; + hash = XXH_rotl64(hash,27) * XXH_PRIME64_1 + XXH_PRIME64_4; + len -= 8; + } + if (len >= 4) { + hash ^= (xxh_u64)(XXH_get32bits(ptr)) * XXH_PRIME64_1; + ptr += 4; + hash = XXH_rotl64(hash, 23) * XXH_PRIME64_2 + XXH_PRIME64_3; + len -= 4; + } + while (len > 0) { + hash ^= (*ptr++) * XXH_PRIME64_5; + hash = XXH_rotl64(hash, 11) * XXH_PRIME64_1; + --len; + } + return XXH64_avalanche(hash); +} + +#ifdef XXH_OLD_NAMES +# define PROCESS1_64 XXH_PROCESS1_64 +# define PROCESS4_64 XXH_PROCESS4_64 +# define PROCESS8_64 XXH_PROCESS8_64 +#else +# undef XXH_PROCESS1_64 +# undef XXH_PROCESS4_64 +# undef XXH_PROCESS8_64 +#endif + +/*! + * @internal + * @brief The implementation for @ref XXH64(). + * + * @param input , len , seed Directly passed from @ref XXH64(). + * @param align Whether @p input is aligned. + * @return The calculated hash. + */ +XXH_FORCE_INLINE XXH_PUREF xxh_u64 +XXH64_endian_align(const xxh_u8* input, size_t len, xxh_u64 seed, XXH_alignment align) +{ + xxh_u64 h64; + if (input==NULL) XXH_ASSERT(len == 0); + + if (len>=32) { + const xxh_u8* const bEnd = input + len; + const xxh_u8* const limit = bEnd - 31; + xxh_u64 v1 = seed + XXH_PRIME64_1 + XXH_PRIME64_2; + xxh_u64 v2 = seed + XXH_PRIME64_2; + xxh_u64 v3 = seed + 0; + xxh_u64 v4 = seed - XXH_PRIME64_1; + + do { + v1 = XXH64_round(v1, XXH_get64bits(input)); input+=8; + v2 = XXH64_round(v2, XXH_get64bits(input)); input+=8; + v3 = XXH64_round(v3, XXH_get64bits(input)); input+=8; + v4 = XXH64_round(v4, XXH_get64bits(input)); input+=8; + } while (input= 2 + /* Simple version, good for code maintenance, but unfortunately slow for small inputs */ + XXH64_state_t state; + XXH64_reset(&state, seed); + XXH64_update(&state, (const xxh_u8*)input, len); + return XXH64_digest(&state); +#else + if (XXH_FORCE_ALIGN_CHECK) { + if ((((size_t)input) & 7)==0) { /* Input is aligned, let's leverage the speed advantage */ + return XXH64_endian_align((const xxh_u8*)input, len, seed, XXH_aligned); + } } + + return XXH64_endian_align((const xxh_u8*)input, len, seed, XXH_unaligned); + +#endif +} + +/******* Hash Streaming *******/ +#ifndef XXH_NO_STREAM +/*! @ingroup XXH64_family*/ +XXH_PUBLIC_API XXH64_state_t* XXH64_createState(void) +{ + return (XXH64_state_t*)XXH_malloc(sizeof(XXH64_state_t)); +} +/*! @ingroup XXH64_family */ +XXH_PUBLIC_API XXH_errorcode XXH64_freeState(XXH64_state_t* statePtr) +{ + XXH_free(statePtr); + return XXH_OK; +} + +/*! @ingroup XXH64_family */ +XXH_PUBLIC_API void XXH64_copyState(XXH_NOESCAPE XXH64_state_t* dstState, const XXH64_state_t* srcState) +{ + XXH_memcpy(dstState, srcState, sizeof(*dstState)); +} + +/*! @ingroup XXH64_family */ +XXH_PUBLIC_API XXH_errorcode XXH64_reset(XXH_NOESCAPE XXH64_state_t* statePtr, XXH64_hash_t seed) +{ + XXH_ASSERT(statePtr != NULL); + memset(statePtr, 0, sizeof(*statePtr)); + statePtr->v[0] = seed + XXH_PRIME64_1 + XXH_PRIME64_2; + statePtr->v[1] = seed + XXH_PRIME64_2; + statePtr->v[2] = seed + 0; + statePtr->v[3] = seed - XXH_PRIME64_1; + return XXH_OK; +} + +/*! @ingroup XXH64_family */ +XXH_PUBLIC_API XXH_errorcode +XXH64_update (XXH_NOESCAPE XXH64_state_t* state, XXH_NOESCAPE const void* input, size_t len) +{ + if (input==NULL) { + XXH_ASSERT(len == 0); + return XXH_OK; + } + + { const xxh_u8* p = (const xxh_u8*)input; + const xxh_u8* const bEnd = p + len; + + state->total_len += len; + + if (state->memsize + len < 32) { /* fill in tmp buffer */ + XXH_memcpy(((xxh_u8*)state->mem64) + state->memsize, input, len); + state->memsize += (xxh_u32)len; + return XXH_OK; + } + + if (state->memsize) { /* tmp buffer is full */ + XXH_memcpy(((xxh_u8*)state->mem64) + state->memsize, input, 32-state->memsize); + state->v[0] = XXH64_round(state->v[0], XXH_readLE64(state->mem64+0)); + state->v[1] = XXH64_round(state->v[1], XXH_readLE64(state->mem64+1)); + state->v[2] = XXH64_round(state->v[2], XXH_readLE64(state->mem64+2)); + state->v[3] = XXH64_round(state->v[3], XXH_readLE64(state->mem64+3)); + p += 32 - state->memsize; + state->memsize = 0; + } + + if (p+32 <= bEnd) { + const xxh_u8* const limit = bEnd - 32; + + do { + state->v[0] = XXH64_round(state->v[0], XXH_readLE64(p)); p+=8; + state->v[1] = XXH64_round(state->v[1], XXH_readLE64(p)); p+=8; + state->v[2] = XXH64_round(state->v[2], XXH_readLE64(p)); p+=8; + state->v[3] = XXH64_round(state->v[3], XXH_readLE64(p)); p+=8; + } while (p<=limit); + + } + + if (p < bEnd) { + XXH_memcpy(state->mem64, p, (size_t)(bEnd-p)); + state->memsize = (unsigned)(bEnd-p); + } + } + + return XXH_OK; +} + + +/*! @ingroup XXH64_family */ +XXH_PUBLIC_API XXH64_hash_t XXH64_digest(XXH_NOESCAPE const XXH64_state_t* state) +{ + xxh_u64 h64; + + if (state->total_len >= 32) { + h64 = XXH_rotl64(state->v[0], 1) + XXH_rotl64(state->v[1], 7) + XXH_rotl64(state->v[2], 12) + XXH_rotl64(state->v[3], 18); + h64 = XXH64_mergeRound(h64, state->v[0]); + h64 = XXH64_mergeRound(h64, state->v[1]); + h64 = XXH64_mergeRound(h64, state->v[2]); + h64 = XXH64_mergeRound(h64, state->v[3]); + } else { + h64 = state->v[2] /*seed*/ + XXH_PRIME64_5; + } + + h64 += (xxh_u64) state->total_len; + + return XXH64_finalize(h64, (const xxh_u8*)state->mem64, (size_t)state->total_len, XXH_aligned); +} +#endif /* !XXH_NO_STREAM */ + +/******* Canonical representation *******/ + +/*! @ingroup XXH64_family */ +XXH_PUBLIC_API void XXH64_canonicalFromHash(XXH_NOESCAPE XXH64_canonical_t* dst, XXH64_hash_t hash) +{ + XXH_STATIC_ASSERT(sizeof(XXH64_canonical_t) == sizeof(XXH64_hash_t)); + if (XXH_CPU_LITTLE_ENDIAN) hash = XXH_swap64(hash); + XXH_memcpy(dst, &hash, sizeof(*dst)); +} + +/*! @ingroup XXH64_family */ +XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(XXH_NOESCAPE const XXH64_canonical_t* src) +{ + return XXH_readBE64(src); +} + +#ifndef XXH_NO_XXH3 + +/* ********************************************************************* +* XXH3 +* New generation hash designed for speed on small keys and vectorization +************************************************************************ */ +/*! + * @} + * @defgroup XXH3_impl XXH3 implementation + * @ingroup impl + * @{ + */ + +/* === Compiler specifics === */ + +#if ((defined(sun) || defined(__sun)) && __cplusplus) /* Solaris includes __STDC_VERSION__ with C++. Tested with GCC 5.5 */ +# define XXH_RESTRICT /* disable */ +#elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* >= C99 */ +# define XXH_RESTRICT restrict +#elif (defined (__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))) \ + || (defined (__clang__)) \ + || (defined (_MSC_VER) && (_MSC_VER >= 1400)) \ + || (defined (__INTEL_COMPILER) && (__INTEL_COMPILER >= 1300)) +/* + * There are a LOT more compilers that recognize __restrict but this + * covers the major ones. + */ +# define XXH_RESTRICT __restrict +#else +# define XXH_RESTRICT /* disable */ +#endif + +#if (defined(__GNUC__) && (__GNUC__ >= 3)) \ + || (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 800)) \ + || defined(__clang__) +# define XXH_likely(x) __builtin_expect(x, 1) +# define XXH_unlikely(x) __builtin_expect(x, 0) +#else +# define XXH_likely(x) (x) +# define XXH_unlikely(x) (x) +#endif + +#ifndef XXH_HAS_INCLUDE +# ifdef __has_include +/* + * Not defined as XXH_HAS_INCLUDE(x) (function-like) because + * this causes segfaults in Apple Clang 4.2 (on Mac OS X 10.7 Lion) + */ +# define XXH_HAS_INCLUDE __has_include +# else +# define XXH_HAS_INCLUDE(x) 0 +# endif +#endif + +#if defined(__GNUC__) || defined(__clang__) +# if defined(__ARM_FEATURE_SVE) +# include +# endif +# if defined(__ARM_NEON__) || defined(__ARM_NEON) \ + || (defined(_M_ARM) && _M_ARM >= 7) \ + || defined(_M_ARM64) || defined(_M_ARM64EC) \ + || (defined(__wasm_simd128__) && XXH_HAS_INCLUDE()) /* WASM SIMD128 via SIMDe */ +# define inline __inline__ /* circumvent a clang bug */ +# include +# undef inline +# elif defined(__AVX2__) +# include +# elif defined(__SSE2__) +# include +# endif +#endif + +#if defined(_MSC_VER) +# include +#endif + +/* + * One goal of XXH3 is to make it fast on both 32-bit and 64-bit, while + * remaining a true 64-bit/128-bit hash function. + * + * This is done by prioritizing a subset of 64-bit operations that can be + * emulated without too many steps on the average 32-bit machine. + * + * For example, these two lines seem similar, and run equally fast on 64-bit: + * + * xxh_u64 x; + * x ^= (x >> 47); // good + * x ^= (x >> 13); // bad + * + * However, to a 32-bit machine, there is a major difference. + * + * x ^= (x >> 47) looks like this: + * + * x.lo ^= (x.hi >> (47 - 32)); + * + * while x ^= (x >> 13) looks like this: + * + * // note: funnel shifts are not usually cheap. + * x.lo ^= (x.lo >> 13) | (x.hi << (32 - 13)); + * x.hi ^= (x.hi >> 13); + * + * The first one is significantly faster than the second, simply because the + * shift is larger than 32. This means: + * - All the bits we need are in the upper 32 bits, so we can ignore the lower + * 32 bits in the shift. + * - The shift result will always fit in the lower 32 bits, and therefore, + * we can ignore the upper 32 bits in the xor. + * + * Thanks to this optimization, XXH3 only requires these features to be efficient: + * + * - Usable unaligned access + * - A 32-bit or 64-bit ALU + * - If 32-bit, a decent ADC instruction + * - A 32 or 64-bit multiply with a 64-bit result + * - For the 128-bit variant, a decent byteswap helps short inputs. + * + * The first two are already required by XXH32, and almost all 32-bit and 64-bit + * platforms which can run XXH32 can run XXH3 efficiently. + * + * Thumb-1, the classic 16-bit only subset of ARM's instruction set, is one + * notable exception. + * + * First of all, Thumb-1 lacks support for the UMULL instruction which + * performs the important long multiply. This means numerous __aeabi_lmul + * calls. + * + * Second of all, the 8 functional registers are just not enough. + * Setup for __aeabi_lmul, byteshift loads, pointers, and all arithmetic need + * Lo registers, and this shuffling results in thousands more MOVs than A32. + * + * A32 and T32 don't have this limitation. They can access all 14 registers, + * do a 32->64 multiply with UMULL, and the flexible operand allowing free + * shifts is helpful, too. + * + * Therefore, we do a quick sanity check. + * + * If compiling Thumb-1 for a target which supports ARM instructions, we will + * emit a warning, as it is not a "sane" platform to compile for. + * + * Usually, if this happens, it is because of an accident and you probably need + * to specify -march, as you likely meant to compile for a newer architecture. + * + * Credit: large sections of the vectorial and asm source code paths + * have been contributed by @easyaspi314 + */ +#if defined(__thumb__) && !defined(__thumb2__) && defined(__ARM_ARCH_ISA_ARM) +# warning "XXH3 is highly inefficient without ARM or Thumb-2." +#endif + +/* ========================================== + * Vectorization detection + * ========================================== */ + +#ifdef XXH_DOXYGEN +/*! + * @ingroup tuning + * @brief Overrides the vectorization implementation chosen for XXH3. + * + * Can be defined to 0 to disable SIMD or any of the values mentioned in + * @ref XXH_VECTOR_TYPE. + * + * If this is not defined, it uses predefined macros to determine the best + * implementation. + */ +# define XXH_VECTOR XXH_SCALAR +/*! + * @ingroup tuning + * @brief Possible values for @ref XXH_VECTOR. + * + * Note that these are actually implemented as macros. + * + * If this is not defined, it is detected automatically. + * internal macro XXH_X86DISPATCH overrides this. + */ +enum XXH_VECTOR_TYPE /* fake enum */ { + XXH_SCALAR = 0, /*!< Portable scalar version */ + XXH_SSE2 = 1, /*!< + * SSE2 for Pentium 4, Opteron, all x86_64. + * + * @note SSE2 is also guaranteed on Windows 10, macOS, and + * Android x86. + */ + XXH_AVX2 = 2, /*!< AVX2 for Haswell and Bulldozer */ + XXH_AVX512 = 3, /*!< AVX512 for Skylake and Icelake */ + XXH_NEON = 4, /*!< + * NEON for most ARMv7-A, all AArch64, and WASM SIMD128 + * via the SIMDeverywhere polyfill provided with the + * Emscripten SDK. + */ + XXH_VSX = 5, /*!< VSX and ZVector for POWER8/z13 (64-bit) */ + XXH_SVE = 6, /*!< SVE for some ARMv8-A and ARMv9-A */ +}; +/*! + * @ingroup tuning + * @brief Selects the minimum alignment for XXH3's accumulators. + * + * When using SIMD, this should match the alignment required for said vector + * type, so, for example, 32 for AVX2. + * + * Default: Auto detected. + */ +# define XXH_ACC_ALIGN 8 +#endif + +/* Actual definition */ +#ifndef XXH_DOXYGEN +# define XXH_SCALAR 0 +# define XXH_SSE2 1 +# define XXH_AVX2 2 +# define XXH_AVX512 3 +# define XXH_NEON 4 +# define XXH_VSX 5 +# define XXH_SVE 6 +#endif + +#ifndef XXH_VECTOR /* can be defined on command line */ +# if defined(__ARM_FEATURE_SVE) +# define XXH_VECTOR XXH_SVE +# elif ( \ + defined(__ARM_NEON__) || defined(__ARM_NEON) /* gcc */ \ + || defined(_M_ARM) || defined(_M_ARM64) || defined(_M_ARM64EC) /* msvc */ \ + || (defined(__wasm_simd128__) && XXH_HAS_INCLUDE()) /* wasm simd128 via SIMDe */ \ + ) && ( \ + defined(_WIN32) || defined(__LITTLE_ENDIAN__) /* little endian only */ \ + || (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) \ + ) +# define XXH_VECTOR XXH_NEON +# elif defined(__AVX512F__) +# define XXH_VECTOR XXH_AVX512 +# elif defined(__AVX2__) +# define XXH_VECTOR XXH_AVX2 +# elif defined(__SSE2__) || defined(_M_AMD64) || defined(_M_X64) || (defined(_M_IX86_FP) && (_M_IX86_FP == 2)) +# define XXH_VECTOR XXH_SSE2 +# elif (defined(__PPC64__) && defined(__POWER8_VECTOR__)) \ + || (defined(__s390x__) && defined(__VEC__)) \ + && defined(__GNUC__) /* TODO: IBM XL */ +# define XXH_VECTOR XXH_VSX +# else +# define XXH_VECTOR XXH_SCALAR +# endif +#endif + +/* __ARM_FEATURE_SVE is only supported by GCC & Clang. */ +#if (XXH_VECTOR == XXH_SVE) && !defined(__ARM_FEATURE_SVE) +# ifdef _MSC_VER +# pragma warning(once : 4606) +# else +# warning "__ARM_FEATURE_SVE isn't supported. Use SCALAR instead." +# endif +# undef XXH_VECTOR +# define XXH_VECTOR XXH_SCALAR +#endif + +/* + * Controls the alignment of the accumulator, + * for compatibility with aligned vector loads, which are usually faster. + */ +#ifndef XXH_ACC_ALIGN +# if defined(XXH_X86DISPATCH) +# define XXH_ACC_ALIGN 64 /* for compatibility with avx512 */ +# elif XXH_VECTOR == XXH_SCALAR /* scalar */ +# define XXH_ACC_ALIGN 8 +# elif XXH_VECTOR == XXH_SSE2 /* sse2 */ +# define XXH_ACC_ALIGN 16 +# elif XXH_VECTOR == XXH_AVX2 /* avx2 */ +# define XXH_ACC_ALIGN 32 +# elif XXH_VECTOR == XXH_NEON /* neon */ +# define XXH_ACC_ALIGN 16 +# elif XXH_VECTOR == XXH_VSX /* vsx */ +# define XXH_ACC_ALIGN 16 +# elif XXH_VECTOR == XXH_AVX512 /* avx512 */ +# define XXH_ACC_ALIGN 64 +# elif XXH_VECTOR == XXH_SVE /* sve */ +# define XXH_ACC_ALIGN 64 +# endif +#endif + +#if defined(XXH_X86DISPATCH) || XXH_VECTOR == XXH_SSE2 \ + || XXH_VECTOR == XXH_AVX2 || XXH_VECTOR == XXH_AVX512 +# define XXH_SEC_ALIGN XXH_ACC_ALIGN +#elif XXH_VECTOR == XXH_SVE +# define XXH_SEC_ALIGN XXH_ACC_ALIGN +#else +# define XXH_SEC_ALIGN 8 +#endif + +#if defined(__GNUC__) || defined(__clang__) +# define XXH_ALIASING __attribute__((may_alias)) +#else +# define XXH_ALIASING /* nothing */ +#endif + +/* + * UGLY HACK: + * GCC usually generates the best code with -O3 for xxHash. + * + * However, when targeting AVX2, it is overzealous in its unrolling resulting + * in code roughly 3/4 the speed of Clang. + * + * There are other issues, such as GCC splitting _mm256_loadu_si256 into + * _mm_loadu_si128 + _mm256_inserti128_si256. This is an optimization which + * only applies to Sandy and Ivy Bridge... which don't even support AVX2. + * + * That is why when compiling the AVX2 version, it is recommended to use either + * -O2 -mavx2 -march=haswell + * or + * -O2 -mavx2 -mno-avx256-split-unaligned-load + * for decent performance, or to use Clang instead. + * + * Fortunately, we can control the first one with a pragma that forces GCC into + * -O2, but the other one we can't control without "failed to inline always + * inline function due to target mismatch" warnings. + */ +#if XXH_VECTOR == XXH_AVX2 /* AVX2 */ \ + && defined(__GNUC__) && !defined(__clang__) /* GCC, not Clang */ \ + && defined(__OPTIMIZE__) && XXH_SIZE_OPT <= 0 /* respect -O0 and -Os */ +# pragma GCC push_options +# pragma GCC optimize("-O2") +#endif + +#if XXH_VECTOR == XXH_NEON + +/* + * UGLY HACK: While AArch64 GCC on Linux does not seem to care, on macOS, GCC -O3 + * optimizes out the entire hashLong loop because of the aliasing violation. + * + * However, GCC is also inefficient at load-store optimization with vld1q/vst1q, + * so the only option is to mark it as aliasing. + */ +typedef uint64x2_t xxh_aliasing_uint64x2_t XXH_ALIASING; + +/*! + * @internal + * @brief `vld1q_u64` but faster and alignment-safe. + * + * On AArch64, unaligned access is always safe, but on ARMv7-a, it is only + * *conditionally* safe (`vld1` has an alignment bit like `movdq[ua]` in x86). + * + * GCC for AArch64 sees `vld1q_u8` as an intrinsic instead of a load, so it + * prohibits load-store optimizations. Therefore, a direct dereference is used. + * + * Otherwise, `vld1q_u8` is used with `vreinterpretq_u8_u64` to do a safe + * unaligned load. + */ +#if defined(__aarch64__) && defined(__GNUC__) && !defined(__clang__) +XXH_FORCE_INLINE uint64x2_t XXH_vld1q_u64(void const* ptr) /* silence -Wcast-align */ +{ + return *(xxh_aliasing_uint64x2_t const *)ptr; +} +#else +XXH_FORCE_INLINE uint64x2_t XXH_vld1q_u64(void const* ptr) +{ + return vreinterpretq_u64_u8(vld1q_u8((uint8_t const*)ptr)); +} +#endif + +/*! + * @internal + * @brief `vmlal_u32` on low and high halves of a vector. + * + * This is a workaround for AArch64 GCC < 11 which implemented arm_neon.h with + * inline assembly and were therefore incapable of merging the `vget_{low, high}_u32` + * with `vmlal_u32`. + */ +#if defined(__aarch64__) && defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 11 +XXH_FORCE_INLINE uint64x2_t +XXH_vmlal_low_u32(uint64x2_t acc, uint32x4_t lhs, uint32x4_t rhs) +{ + /* Inline assembly is the only way */ + __asm__("umlal %0.2d, %1.2s, %2.2s" : "+w" (acc) : "w" (lhs), "w" (rhs)); + return acc; +} +XXH_FORCE_INLINE uint64x2_t +XXH_vmlal_high_u32(uint64x2_t acc, uint32x4_t lhs, uint32x4_t rhs) +{ + /* This intrinsic works as expected */ + return vmlal_high_u32(acc, lhs, rhs); +} +#else +/* Portable intrinsic versions */ +XXH_FORCE_INLINE uint64x2_t +XXH_vmlal_low_u32(uint64x2_t acc, uint32x4_t lhs, uint32x4_t rhs) +{ + return vmlal_u32(acc, vget_low_u32(lhs), vget_low_u32(rhs)); +} +/*! @copydoc XXH_vmlal_low_u32 + * Assume the compiler converts this to vmlal_high_u32 on aarch64 */ +XXH_FORCE_INLINE uint64x2_t +XXH_vmlal_high_u32(uint64x2_t acc, uint32x4_t lhs, uint32x4_t rhs) +{ + return vmlal_u32(acc, vget_high_u32(lhs), vget_high_u32(rhs)); +} +#endif + +/*! + * @ingroup tuning + * @brief Controls the NEON to scalar ratio for XXH3 + * + * This can be set to 2, 4, 6, or 8. + * + * ARM Cortex CPUs are _very_ sensitive to how their pipelines are used. + * + * For example, the Cortex-A73 can dispatch 3 micro-ops per cycle, but only 2 of those + * can be NEON. If you are only using NEON instructions, you are only using 2/3 of the CPU + * bandwidth. + * + * This is even more noticeable on the more advanced cores like the Cortex-A76 which + * can dispatch 8 micro-ops per cycle, but still only 2 NEON micro-ops at once. + * + * Therefore, to make the most out of the pipeline, it is beneficial to run 6 NEON lanes + * and 2 scalar lanes, which is chosen by default. + * + * This does not apply to Apple processors or 32-bit processors, which run better with + * full NEON. These will default to 8. Additionally, size-optimized builds run 8 lanes. + * + * This change benefits CPUs with large micro-op buffers without negatively affecting + * most other CPUs: + * + * | Chipset | Dispatch type | NEON only | 6:2 hybrid | Diff. | + * |:----------------------|:--------------------|----------:|-----------:|------:| + * | Snapdragon 730 (A76) | 2 NEON/8 micro-ops | 8.8 GB/s | 10.1 GB/s | ~16% | + * | Snapdragon 835 (A73) | 2 NEON/3 micro-ops | 5.1 GB/s | 5.3 GB/s | ~5% | + * | Marvell PXA1928 (A53) | In-order dual-issue | 1.9 GB/s | 1.9 GB/s | 0% | + * | Apple M1 | 4 NEON/8 micro-ops | 37.3 GB/s | 36.1 GB/s | ~-3% | + * + * It also seems to fix some bad codegen on GCC, making it almost as fast as clang. + * + * When using WASM SIMD128, if this is 2 or 6, SIMDe will scalarize 2 of the lanes meaning + * it effectively becomes worse 4. + * + * @see XXH3_accumulate_512_neon() + */ +# ifndef XXH3_NEON_LANES +# if (defined(__aarch64__) || defined(__arm64__) || defined(_M_ARM64) || defined(_M_ARM64EC)) \ + && !defined(__APPLE__) && XXH_SIZE_OPT <= 0 +# define XXH3_NEON_LANES 6 +# else +# define XXH3_NEON_LANES XXH_ACC_NB +# endif +# endif +#endif /* XXH_VECTOR == XXH_NEON */ + +/* + * VSX and Z Vector helpers. + * + * This is very messy, and any pull requests to clean this up are welcome. + * + * There are a lot of problems with supporting VSX and s390x, due to + * inconsistent intrinsics, spotty coverage, and multiple endiannesses. + */ +#if XXH_VECTOR == XXH_VSX +/* Annoyingly, these headers _may_ define three macros: `bool`, `vector`, + * and `pixel`. This is a problem for obvious reasons. + * + * These keywords are unnecessary; the spec literally says they are + * equivalent to `__bool`, `__vector`, and `__pixel` and may be undef'd + * after including the header. + * + * We use pragma push_macro/pop_macro to keep the namespace clean. */ +# pragma push_macro("bool") +# pragma push_macro("vector") +# pragma push_macro("pixel") +/* silence potential macro redefined warnings */ +# undef bool +# undef vector +# undef pixel + +# if defined(__s390x__) +# include +# else +# include +# endif + +/* Restore the original macro values, if applicable. */ +# pragma pop_macro("pixel") +# pragma pop_macro("vector") +# pragma pop_macro("bool") + +typedef __vector unsigned long long xxh_u64x2; +typedef __vector unsigned char xxh_u8x16; +typedef __vector unsigned xxh_u32x4; + +/* + * UGLY HACK: Similar to aarch64 macOS GCC, s390x GCC has the same aliasing issue. + */ +typedef xxh_u64x2 xxh_aliasing_u64x2 XXH_ALIASING; + +# ifndef XXH_VSX_BE +# if defined(__BIG_ENDIAN__) \ + || (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) +# define XXH_VSX_BE 1 +# elif defined(__VEC_ELEMENT_REG_ORDER__) && __VEC_ELEMENT_REG_ORDER__ == __ORDER_BIG_ENDIAN__ +# warning "-maltivec=be is not recommended. Please use native endianness." +# define XXH_VSX_BE 1 +# else +# define XXH_VSX_BE 0 +# endif +# endif /* !defined(XXH_VSX_BE) */ + +# if XXH_VSX_BE +# if defined(__POWER9_VECTOR__) || (defined(__clang__) && defined(__s390x__)) +# define XXH_vec_revb vec_revb +# else +/*! + * A polyfill for POWER9's vec_revb(). + */ +XXH_FORCE_INLINE xxh_u64x2 XXH_vec_revb(xxh_u64x2 val) +{ + xxh_u8x16 const vByteSwap = { 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, + 0x0F, 0x0E, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08 }; + return vec_perm(val, val, vByteSwap); +} +# endif +# endif /* XXH_VSX_BE */ + +/*! + * Performs an unaligned vector load and byte swaps it on big endian. + */ +XXH_FORCE_INLINE xxh_u64x2 XXH_vec_loadu(const void *ptr) +{ + xxh_u64x2 ret; + XXH_memcpy(&ret, ptr, sizeof(xxh_u64x2)); +# if XXH_VSX_BE + ret = XXH_vec_revb(ret); +# endif + return ret; +} + +/* + * vec_mulo and vec_mule are very problematic intrinsics on PowerPC + * + * These intrinsics weren't added until GCC 8, despite existing for a while, + * and they are endian dependent. Also, their meaning swap depending on version. + * */ +# if defined(__s390x__) + /* s390x is always big endian, no issue on this platform */ +# define XXH_vec_mulo vec_mulo +# define XXH_vec_mule vec_mule +# elif defined(__clang__) && XXH_HAS_BUILTIN(__builtin_altivec_vmuleuw) && !defined(__ibmxl__) +/* Clang has a better way to control this, we can just use the builtin which doesn't swap. */ + /* The IBM XL Compiler (which defined __clang__) only implements the vec_* operations */ +# define XXH_vec_mulo __builtin_altivec_vmulouw +# define XXH_vec_mule __builtin_altivec_vmuleuw +# else +/* gcc needs inline assembly */ +/* Adapted from https://github.com/google/highwayhash/blob/master/highwayhash/hh_vsx.h. */ +XXH_FORCE_INLINE xxh_u64x2 XXH_vec_mulo(xxh_u32x4 a, xxh_u32x4 b) +{ + xxh_u64x2 result; + __asm__("vmulouw %0, %1, %2" : "=v" (result) : "v" (a), "v" (b)); + return result; +} +XXH_FORCE_INLINE xxh_u64x2 XXH_vec_mule(xxh_u32x4 a, xxh_u32x4 b) +{ + xxh_u64x2 result; + __asm__("vmuleuw %0, %1, %2" : "=v" (result) : "v" (a), "v" (b)); + return result; +} +# endif /* XXH_vec_mulo, XXH_vec_mule */ +#endif /* XXH_VECTOR == XXH_VSX */ + +#if XXH_VECTOR == XXH_SVE +#define ACCRND(acc, offset) \ +do { \ + svuint64_t input_vec = svld1_u64(mask, xinput + offset); \ + svuint64_t secret_vec = svld1_u64(mask, xsecret + offset); \ + svuint64_t mixed = sveor_u64_x(mask, secret_vec, input_vec); \ + svuint64_t swapped = svtbl_u64(input_vec, kSwap); \ + svuint64_t mixed_lo = svextw_u64_x(mask, mixed); \ + svuint64_t mixed_hi = svlsr_n_u64_x(mask, mixed, 32); \ + svuint64_t mul = svmad_u64_x(mask, mixed_lo, mixed_hi, swapped); \ + acc = svadd_u64_x(mask, acc, mul); \ +} while (0) +#endif /* XXH_VECTOR == XXH_SVE */ + +/* prefetch + * can be disabled, by declaring XXH_NO_PREFETCH build macro */ +#if defined(XXH_NO_PREFETCH) +# define XXH_PREFETCH(ptr) (void)(ptr) /* disabled */ +#else +# if XXH_SIZE_OPT >= 1 +# define XXH_PREFETCH(ptr) (void)(ptr) +# elif defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86)) /* _mm_prefetch() not defined outside of x86/x64 */ +# include /* https://msdn.microsoft.com/fr-fr/library/84szxsww(v=vs.90).aspx */ +# define XXH_PREFETCH(ptr) _mm_prefetch((const char*)(ptr), _MM_HINT_T0) +# elif defined(__GNUC__) && ( (__GNUC__ >= 4) || ( (__GNUC__ == 3) && (__GNUC_MINOR__ >= 1) ) ) +# define XXH_PREFETCH(ptr) __builtin_prefetch((ptr), 0 /* rw==read */, 3 /* locality */) +# else +# define XXH_PREFETCH(ptr) (void)(ptr) /* disabled */ +# endif +#endif /* XXH_NO_PREFETCH */ + + +/* ========================================== + * XXH3 default settings + * ========================================== */ + +#define XXH_SECRET_DEFAULT_SIZE 192 /* minimum XXH3_SECRET_SIZE_MIN */ + +#if (XXH_SECRET_DEFAULT_SIZE < XXH3_SECRET_SIZE_MIN) +# error "default keyset is not large enough" +#endif + +/*! Pseudorandom secret taken directly from FARSH. */ +XXH_ALIGN(64) static const xxh_u8 XXH3_kSecret[XXH_SECRET_DEFAULT_SIZE] = { + 0xb8, 0xfe, 0x6c, 0x39, 0x23, 0xa4, 0x4b, 0xbe, 0x7c, 0x01, 0x81, 0x2c, 0xf7, 0x21, 0xad, 0x1c, + 0xde, 0xd4, 0x6d, 0xe9, 0x83, 0x90, 0x97, 0xdb, 0x72, 0x40, 0xa4, 0xa4, 0xb7, 0xb3, 0x67, 0x1f, + 0xcb, 0x79, 0xe6, 0x4e, 0xcc, 0xc0, 0xe5, 0x78, 0x82, 0x5a, 0xd0, 0x7d, 0xcc, 0xff, 0x72, 0x21, + 0xb8, 0x08, 0x46, 0x74, 0xf7, 0x43, 0x24, 0x8e, 0xe0, 0x35, 0x90, 0xe6, 0x81, 0x3a, 0x26, 0x4c, + 0x3c, 0x28, 0x52, 0xbb, 0x91, 0xc3, 0x00, 0xcb, 0x88, 0xd0, 0x65, 0x8b, 0x1b, 0x53, 0x2e, 0xa3, + 0x71, 0x64, 0x48, 0x97, 0xa2, 0x0d, 0xf9, 0x4e, 0x38, 0x19, 0xef, 0x46, 0xa9, 0xde, 0xac, 0xd8, + 0xa8, 0xfa, 0x76, 0x3f, 0xe3, 0x9c, 0x34, 0x3f, 0xf9, 0xdc, 0xbb, 0xc7, 0xc7, 0x0b, 0x4f, 0x1d, + 0x8a, 0x51, 0xe0, 0x4b, 0xcd, 0xb4, 0x59, 0x31, 0xc8, 0x9f, 0x7e, 0xc9, 0xd9, 0x78, 0x73, 0x64, + 0xea, 0xc5, 0xac, 0x83, 0x34, 0xd3, 0xeb, 0xc3, 0xc5, 0x81, 0xa0, 0xff, 0xfa, 0x13, 0x63, 0xeb, + 0x17, 0x0d, 0xdd, 0x51, 0xb7, 0xf0, 0xda, 0x49, 0xd3, 0x16, 0x55, 0x26, 0x29, 0xd4, 0x68, 0x9e, + 0x2b, 0x16, 0xbe, 0x58, 0x7d, 0x47, 0xa1, 0xfc, 0x8f, 0xf8, 0xb8, 0xd1, 0x7a, 0xd0, 0x31, 0xce, + 0x45, 0xcb, 0x3a, 0x8f, 0x95, 0x16, 0x04, 0x28, 0xaf, 0xd7, 0xfb, 0xca, 0xbb, 0x4b, 0x40, 0x7e, +}; + +static const xxh_u64 PRIME_MX1 = 0x165667919E3779F9ULL; /*!< 0b0001011001010110011001111001000110011110001101110111100111111001 */ +static const xxh_u64 PRIME_MX2 = 0x9FB21C651E98DF25ULL; /*!< 0b1001111110110010000111000110010100011110100110001101111100100101 */ + +#ifdef XXH_OLD_NAMES +# define kSecret XXH3_kSecret +#endif + +#ifdef XXH_DOXYGEN +/*! + * @brief Calculates a 32-bit to 64-bit long multiply. + * + * Implemented as a macro. + * + * Wraps `__emulu` on MSVC x86 because it tends to call `__allmul` when it doesn't + * need to (but it shouldn't need to anyways, it is about 7 instructions to do + * a 64x64 multiply...). Since we know that this will _always_ emit `MULL`, we + * use that instead of the normal method. + * + * If you are compiling for platforms like Thumb-1 and don't have a better option, + * you may also want to write your own long multiply routine here. + * + * @param x, y Numbers to be multiplied + * @return 64-bit product of the low 32 bits of @p x and @p y. + */ +XXH_FORCE_INLINE xxh_u64 +XXH_mult32to64(xxh_u64 x, xxh_u64 y) +{ + return (x & 0xFFFFFFFF) * (y & 0xFFFFFFFF); +} +#elif defined(_MSC_VER) && defined(_M_IX86) +# define XXH_mult32to64(x, y) __emulu((unsigned)(x), (unsigned)(y)) +#else +/* + * Downcast + upcast is usually better than masking on older compilers like + * GCC 4.2 (especially 32-bit ones), all without affecting newer compilers. + * + * The other method, (x & 0xFFFFFFFF) * (y & 0xFFFFFFFF), will AND both operands + * and perform a full 64x64 multiply -- entirely redundant on 32-bit. + */ +# define XXH_mult32to64(x, y) ((xxh_u64)(xxh_u32)(x) * (xxh_u64)(xxh_u32)(y)) +#endif + +/*! + * @brief Calculates a 64->128-bit long multiply. + * + * Uses `__uint128_t` and `_umul128` if available, otherwise uses a scalar + * version. + * + * @param lhs , rhs The 64-bit integers to be multiplied + * @return The 128-bit result represented in an @ref XXH128_hash_t. + */ +static XXH128_hash_t +XXH_mult64to128(xxh_u64 lhs, xxh_u64 rhs) +{ + /* + * GCC/Clang __uint128_t method. + * + * On most 64-bit targets, GCC and Clang define a __uint128_t type. + * This is usually the best way as it usually uses a native long 64-bit + * multiply, such as MULQ on x86_64 or MUL + UMULH on aarch64. + * + * Usually. + * + * Despite being a 32-bit platform, Clang (and emscripten) define this type + * despite not having the arithmetic for it. This results in a laggy + * compiler builtin call which calculates a full 128-bit multiply. + * In that case it is best to use the portable one. + * https://github.com/Cyan4973/xxHash/issues/211#issuecomment-515575677 + */ +#if (defined(__GNUC__) || defined(__clang__)) && !defined(__wasm__) \ + && defined(__SIZEOF_INT128__) \ + || (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 128) + + __uint128_t const product = (__uint128_t)lhs * (__uint128_t)rhs; + XXH128_hash_t r128; + r128.low64 = (xxh_u64)(product); + r128.high64 = (xxh_u64)(product >> 64); + return r128; + + /* + * MSVC for x64's _umul128 method. + * + * xxh_u64 _umul128(xxh_u64 Multiplier, xxh_u64 Multiplicand, xxh_u64 *HighProduct); + * + * This compiles to single operand MUL on x64. + */ +#elif (defined(_M_X64) || defined(_M_IA64)) && !defined(_M_ARM64EC) + +#ifndef _MSC_VER +# pragma intrinsic(_umul128) +#endif + xxh_u64 product_high; + xxh_u64 const product_low = _umul128(lhs, rhs, &product_high); + XXH128_hash_t r128; + r128.low64 = product_low; + r128.high64 = product_high; + return r128; + + /* + * MSVC for ARM64's __umulh method. + * + * This compiles to the same MUL + UMULH as GCC/Clang's __uint128_t method. + */ +#elif defined(_M_ARM64) || defined(_M_ARM64EC) + +#ifndef _MSC_VER +# pragma intrinsic(__umulh) +#endif + XXH128_hash_t r128; + r128.low64 = lhs * rhs; + r128.high64 = __umulh(lhs, rhs); + return r128; + +#else + /* + * Portable scalar method. Optimized for 32-bit and 64-bit ALUs. + * + * This is a fast and simple grade school multiply, which is shown below + * with base 10 arithmetic instead of base 0x100000000. + * + * 9 3 // D2 lhs = 93 + * x 7 5 // D2 rhs = 75 + * ---------- + * 1 5 // D2 lo_lo = (93 % 10) * (75 % 10) = 15 + * 4 5 | // D2 hi_lo = (93 / 10) * (75 % 10) = 45 + * 2 1 | // D2 lo_hi = (93 % 10) * (75 / 10) = 21 + * + 6 3 | | // D2 hi_hi = (93 / 10) * (75 / 10) = 63 + * --------- + * 2 7 | // D2 cross = (15 / 10) + (45 % 10) + 21 = 27 + * + 6 7 | | // D2 upper = (27 / 10) + (45 / 10) + 63 = 67 + * --------- + * 6 9 7 5 // D4 res = (27 * 10) + (15 % 10) + (67 * 100) = 6975 + * + * The reasons for adding the products like this are: + * 1. It avoids manual carry tracking. Just like how + * (9 * 9) + 9 + 9 = 99, the same applies with this for UINT64_MAX. + * This avoids a lot of complexity. + * + * 2. It hints for, and on Clang, compiles to, the powerful UMAAL + * instruction available in ARM's Digital Signal Processing extension + * in 32-bit ARMv6 and later, which is shown below: + * + * void UMAAL(xxh_u32 *RdLo, xxh_u32 *RdHi, xxh_u32 Rn, xxh_u32 Rm) + * { + * xxh_u64 product = (xxh_u64)*RdLo * (xxh_u64)*RdHi + Rn + Rm; + * *RdLo = (xxh_u32)(product & 0xFFFFFFFF); + * *RdHi = (xxh_u32)(product >> 32); + * } + * + * This instruction was designed for efficient long multiplication, and + * allows this to be calculated in only 4 instructions at speeds + * comparable to some 64-bit ALUs. + * + * 3. It isn't terrible on other platforms. Usually this will be a couple + * of 32-bit ADD/ADCs. + */ + + /* First calculate all of the cross products. */ + xxh_u64 const lo_lo = XXH_mult32to64(lhs & 0xFFFFFFFF, rhs & 0xFFFFFFFF); + xxh_u64 const hi_lo = XXH_mult32to64(lhs >> 32, rhs & 0xFFFFFFFF); + xxh_u64 const lo_hi = XXH_mult32to64(lhs & 0xFFFFFFFF, rhs >> 32); + xxh_u64 const hi_hi = XXH_mult32to64(lhs >> 32, rhs >> 32); + + /* Now add the products together. These will never overflow. */ + xxh_u64 const cross = (lo_lo >> 32) + (hi_lo & 0xFFFFFFFF) + lo_hi; + xxh_u64 const upper = (hi_lo >> 32) + (cross >> 32) + hi_hi; + xxh_u64 const lower = (cross << 32) | (lo_lo & 0xFFFFFFFF); + + XXH128_hash_t r128; + r128.low64 = lower; + r128.high64 = upper; + return r128; +#endif +} + +/*! + * @brief Calculates a 64-bit to 128-bit multiply, then XOR folds it. + * + * The reason for the separate function is to prevent passing too many structs + * around by value. This will hopefully inline the multiply, but we don't force it. + * + * @param lhs , rhs The 64-bit integers to multiply + * @return The low 64 bits of the product XOR'd by the high 64 bits. + * @see XXH_mult64to128() + */ +static xxh_u64 +XXH3_mul128_fold64(xxh_u64 lhs, xxh_u64 rhs) +{ + XXH128_hash_t product = XXH_mult64to128(lhs, rhs); + return product.low64 ^ product.high64; +} + +/*! Seems to produce slightly better code on GCC for some reason. */ +XXH_FORCE_INLINE XXH_CONSTF xxh_u64 XXH_xorshift64(xxh_u64 v64, int shift) +{ + XXH_ASSERT(0 <= shift && shift < 64); + return v64 ^ (v64 >> shift); +} + +/* + * This is a fast avalanche stage, + * suitable when input bits are already partially mixed + */ +static XXH64_hash_t XXH3_avalanche(xxh_u64 h64) +{ + h64 = XXH_xorshift64(h64, 37); + h64 *= PRIME_MX1; + h64 = XXH_xorshift64(h64, 32); + return h64; +} + +/* + * This is a stronger avalanche, + * inspired by Pelle Evensen's rrmxmx + * preferable when input has not been previously mixed + */ +static XXH64_hash_t XXH3_rrmxmx(xxh_u64 h64, xxh_u64 len) +{ + /* this mix is inspired by Pelle Evensen's rrmxmx */ + h64 ^= XXH_rotl64(h64, 49) ^ XXH_rotl64(h64, 24); + h64 *= PRIME_MX2; + h64 ^= (h64 >> 35) + len ; + h64 *= PRIME_MX2; + return XXH_xorshift64(h64, 28); +} + + +/* ========================================== + * Short keys + * ========================================== + * One of the shortcomings of XXH32 and XXH64 was that their performance was + * sub-optimal on short lengths. It used an iterative algorithm which strongly + * favored lengths that were a multiple of 4 or 8. + * + * Instead of iterating over individual inputs, we use a set of single shot + * functions which piece together a range of lengths and operate in constant time. + * + * Additionally, the number of multiplies has been significantly reduced. This + * reduces latency, especially when emulating 64-bit multiplies on 32-bit. + * + * Depending on the platform, this may or may not be faster than XXH32, but it + * is almost guaranteed to be faster than XXH64. + */ + +/* + * At very short lengths, there isn't enough input to fully hide secrets, or use + * the entire secret. + * + * There is also only a limited amount of mixing we can do before significantly + * impacting performance. + * + * Therefore, we use different sections of the secret and always mix two secret + * samples with an XOR. This should have no effect on performance on the + * seedless or withSeed variants because everything _should_ be constant folded + * by modern compilers. + * + * The XOR mixing hides individual parts of the secret and increases entropy. + * + * This adds an extra layer of strength for custom secrets. + */ +XXH_FORCE_INLINE XXH_PUREF XXH64_hash_t +XXH3_len_1to3_64b(const xxh_u8* input, size_t len, const xxh_u8* secret, XXH64_hash_t seed) +{ + XXH_ASSERT(input != NULL); + XXH_ASSERT(1 <= len && len <= 3); + XXH_ASSERT(secret != NULL); + /* + * len = 1: combined = { input[0], 0x01, input[0], input[0] } + * len = 2: combined = { input[1], 0x02, input[0], input[1] } + * len = 3: combined = { input[2], 0x03, input[0], input[1] } + */ + { xxh_u8 const c1 = input[0]; + xxh_u8 const c2 = input[len >> 1]; + xxh_u8 const c3 = input[len - 1]; + xxh_u32 const combined = ((xxh_u32)c1 << 16) | ((xxh_u32)c2 << 24) + | ((xxh_u32)c3 << 0) | ((xxh_u32)len << 8); + xxh_u64 const bitflip = (XXH_readLE32(secret) ^ XXH_readLE32(secret+4)) + seed; + xxh_u64 const keyed = (xxh_u64)combined ^ bitflip; + return XXH64_avalanche(keyed); + } +} + +XXH_FORCE_INLINE XXH_PUREF XXH64_hash_t +XXH3_len_4to8_64b(const xxh_u8* input, size_t len, const xxh_u8* secret, XXH64_hash_t seed) +{ + XXH_ASSERT(input != NULL); + XXH_ASSERT(secret != NULL); + XXH_ASSERT(4 <= len && len <= 8); + seed ^= (xxh_u64)XXH_swap32((xxh_u32)seed) << 32; + { xxh_u32 const input1 = XXH_readLE32(input); + xxh_u32 const input2 = XXH_readLE32(input + len - 4); + xxh_u64 const bitflip = (XXH_readLE64(secret+8) ^ XXH_readLE64(secret+16)) - seed; + xxh_u64 const input64 = input2 + (((xxh_u64)input1) << 32); + xxh_u64 const keyed = input64 ^ bitflip; + return XXH3_rrmxmx(keyed, len); + } +} + +XXH_FORCE_INLINE XXH_PUREF XXH64_hash_t +XXH3_len_9to16_64b(const xxh_u8* input, size_t len, const xxh_u8* secret, XXH64_hash_t seed) +{ + XXH_ASSERT(input != NULL); + XXH_ASSERT(secret != NULL); + XXH_ASSERT(9 <= len && len <= 16); + { xxh_u64 const bitflip1 = (XXH_readLE64(secret+24) ^ XXH_readLE64(secret+32)) + seed; + xxh_u64 const bitflip2 = (XXH_readLE64(secret+40) ^ XXH_readLE64(secret+48)) - seed; + xxh_u64 const input_lo = XXH_readLE64(input) ^ bitflip1; + xxh_u64 const input_hi = XXH_readLE64(input + len - 8) ^ bitflip2; + xxh_u64 const acc = len + + XXH_swap64(input_lo) + input_hi + + XXH3_mul128_fold64(input_lo, input_hi); + return XXH3_avalanche(acc); + } +} + +XXH_FORCE_INLINE XXH_PUREF XXH64_hash_t +XXH3_len_0to16_64b(const xxh_u8* input, size_t len, const xxh_u8* secret, XXH64_hash_t seed) +{ + XXH_ASSERT(len <= 16); + { if (XXH_likely(len > 8)) return XXH3_len_9to16_64b(input, len, secret, seed); + if (XXH_likely(len >= 4)) return XXH3_len_4to8_64b(input, len, secret, seed); + if (len) return XXH3_len_1to3_64b(input, len, secret, seed); + return XXH64_avalanche(seed ^ (XXH_readLE64(secret+56) ^ XXH_readLE64(secret+64))); + } +} + +/* + * DISCLAIMER: There are known *seed-dependent* multicollisions here due to + * multiplication by zero, affecting hashes of lengths 17 to 240. + * + * However, they are very unlikely. + * + * Keep this in mind when using the unseeded XXH3_64bits() variant: As with all + * unseeded non-cryptographic hashes, it does not attempt to defend itself + * against specially crafted inputs, only random inputs. + * + * Compared to classic UMAC where a 1 in 2^31 chance of 4 consecutive bytes + * cancelling out the secret is taken an arbitrary number of times (addressed + * in XXH3_accumulate_512), this collision is very unlikely with random inputs + * and/or proper seeding: + * + * This only has a 1 in 2^63 chance of 8 consecutive bytes cancelling out, in a + * function that is only called up to 16 times per hash with up to 240 bytes of + * input. + * + * This is not too bad for a non-cryptographic hash function, especially with + * only 64 bit outputs. + * + * The 128-bit variant (which trades some speed for strength) is NOT affected + * by this, although it is always a good idea to use a proper seed if you care + * about strength. + */ +XXH_FORCE_INLINE xxh_u64 XXH3_mix16B(const xxh_u8* XXH_RESTRICT input, + const xxh_u8* XXH_RESTRICT secret, xxh_u64 seed64) +{ +#if defined(__GNUC__) && !defined(__clang__) /* GCC, not Clang */ \ + && defined(__i386__) && defined(__SSE2__) /* x86 + SSE2 */ \ + && !defined(XXH_ENABLE_AUTOVECTORIZE) /* Define to disable like XXH32 hack */ + /* + * UGLY HACK: + * GCC for x86 tends to autovectorize the 128-bit multiply, resulting in + * slower code. + * + * By forcing seed64 into a register, we disrupt the cost model and + * cause it to scalarize. See `XXH32_round()` + * + * FIXME: Clang's output is still _much_ faster -- On an AMD Ryzen 3600, + * XXH3_64bits @ len=240 runs at 4.6 GB/s with Clang 9, but 3.3 GB/s on + * GCC 9.2, despite both emitting scalar code. + * + * GCC generates much better scalar code than Clang for the rest of XXH3, + * which is why finding a more optimal codepath is an interest. + */ + XXH_COMPILER_GUARD(seed64); +#endif + { xxh_u64 const input_lo = XXH_readLE64(input); + xxh_u64 const input_hi = XXH_readLE64(input+8); + return XXH3_mul128_fold64( + input_lo ^ (XXH_readLE64(secret) + seed64), + input_hi ^ (XXH_readLE64(secret+8) - seed64) + ); + } +} + +/* For mid range keys, XXH3 uses a Mum-hash variant. */ +XXH_FORCE_INLINE XXH_PUREF XXH64_hash_t +XXH3_len_17to128_64b(const xxh_u8* XXH_RESTRICT input, size_t len, + const xxh_u8* XXH_RESTRICT secret, size_t secretSize, + XXH64_hash_t seed) +{ + XXH_ASSERT(secretSize >= XXH3_SECRET_SIZE_MIN); (void)secretSize; + XXH_ASSERT(16 < len && len <= 128); + + { xxh_u64 acc = len * XXH_PRIME64_1; +#if XXH_SIZE_OPT >= 1 + /* Smaller and cleaner, but slightly slower. */ + unsigned int i = (unsigned int)(len - 1) / 32; + do { + acc += XXH3_mix16B(input+16 * i, secret+32*i, seed); + acc += XXH3_mix16B(input+len-16*(i+1), secret+32*i+16, seed); + } while (i-- != 0); +#else + if (len > 32) { + if (len > 64) { + if (len > 96) { + acc += XXH3_mix16B(input+48, secret+96, seed); + acc += XXH3_mix16B(input+len-64, secret+112, seed); + } + acc += XXH3_mix16B(input+32, secret+64, seed); + acc += XXH3_mix16B(input+len-48, secret+80, seed); + } + acc += XXH3_mix16B(input+16, secret+32, seed); + acc += XXH3_mix16B(input+len-32, secret+48, seed); + } + acc += XXH3_mix16B(input+0, secret+0, seed); + acc += XXH3_mix16B(input+len-16, secret+16, seed); +#endif + return XXH3_avalanche(acc); + } +} + +/*! + * @brief Maximum size of "short" key in bytes. + */ +#define XXH3_MIDSIZE_MAX 240 + +XXH_NO_INLINE XXH_PUREF XXH64_hash_t +XXH3_len_129to240_64b(const xxh_u8* XXH_RESTRICT input, size_t len, + const xxh_u8* XXH_RESTRICT secret, size_t secretSize, + XXH64_hash_t seed) +{ + XXH_ASSERT(secretSize >= XXH3_SECRET_SIZE_MIN); (void)secretSize; + XXH_ASSERT(128 < len && len <= XXH3_MIDSIZE_MAX); + + #define XXH3_MIDSIZE_STARTOFFSET 3 + #define XXH3_MIDSIZE_LASTOFFSET 17 + + { xxh_u64 acc = len * XXH_PRIME64_1; + xxh_u64 acc_end; + unsigned int const nbRounds = (unsigned int)len / 16; + unsigned int i; + XXH_ASSERT(128 < len && len <= XXH3_MIDSIZE_MAX); + for (i=0; i<8; i++) { + acc += XXH3_mix16B(input+(16*i), secret+(16*i), seed); + } + /* last bytes */ + acc_end = XXH3_mix16B(input + len - 16, secret + XXH3_SECRET_SIZE_MIN - XXH3_MIDSIZE_LASTOFFSET, seed); + XXH_ASSERT(nbRounds >= 8); + acc = XXH3_avalanche(acc); +#if defined(__clang__) /* Clang */ \ + && (defined(__ARM_NEON) || defined(__ARM_NEON__)) /* NEON */ \ + && !defined(XXH_ENABLE_AUTOVECTORIZE) /* Define to disable */ + /* + * UGLY HACK: + * Clang for ARMv7-A tries to vectorize this loop, similar to GCC x86. + * In everywhere else, it uses scalar code. + * + * For 64->128-bit multiplies, even if the NEON was 100% optimal, it + * would still be slower than UMAAL (see XXH_mult64to128). + * + * Unfortunately, Clang doesn't handle the long multiplies properly and + * converts them to the nonexistent "vmulq_u64" intrinsic, which is then + * scalarized into an ugly mess of VMOV.32 instructions. + * + * This mess is difficult to avoid without turning autovectorization + * off completely, but they are usually relatively minor and/or not + * worth it to fix. + * + * This loop is the easiest to fix, as unlike XXH32, this pragma + * _actually works_ because it is a loop vectorization instead of an + * SLP vectorization. + */ + #pragma clang loop vectorize(disable) +#endif + for (i=8 ; i < nbRounds; i++) { + /* + * Prevents clang for unrolling the acc loop and interleaving with this one. + */ + XXH_COMPILER_GUARD(acc); + acc_end += XXH3_mix16B(input+(16*i), secret+(16*(i-8)) + XXH3_MIDSIZE_STARTOFFSET, seed); + } + return XXH3_avalanche(acc + acc_end); + } +} + + +/* ======= Long Keys ======= */ + +#define XXH_STRIPE_LEN 64 +#define XXH_SECRET_CONSUME_RATE 8 /* nb of secret bytes consumed at each accumulation */ +#define XXH_ACC_NB (XXH_STRIPE_LEN / sizeof(xxh_u64)) + +#ifdef XXH_OLD_NAMES +# define STRIPE_LEN XXH_STRIPE_LEN +# define ACC_NB XXH_ACC_NB +#endif + +#ifndef XXH_PREFETCH_DIST +# ifdef __clang__ +# define XXH_PREFETCH_DIST 320 +# else +# if (XXH_VECTOR == XXH_AVX512) +# define XXH_PREFETCH_DIST 512 +# else +# define XXH_PREFETCH_DIST 384 +# endif +# endif /* __clang__ */ +#endif /* XXH_PREFETCH_DIST */ + +/* + * These macros are to generate an XXH3_accumulate() function. + * The two arguments select the name suffix and target attribute. + * + * The name of this symbol is XXH3_accumulate_() and it calls + * XXH3_accumulate_512_(). + * + * It may be useful to hand implement this function if the compiler fails to + * optimize the inline function. + */ +#define XXH3_ACCUMULATE_TEMPLATE(name) \ +void \ +XXH3_accumulate_##name(xxh_u64* XXH_RESTRICT acc, \ + const xxh_u8* XXH_RESTRICT input, \ + const xxh_u8* XXH_RESTRICT secret, \ + size_t nbStripes) \ +{ \ + size_t n; \ + for (n = 0; n < nbStripes; n++ ) { \ + const xxh_u8* const in = input + n*XXH_STRIPE_LEN; \ + XXH_PREFETCH(in + XXH_PREFETCH_DIST); \ + XXH3_accumulate_512_##name( \ + acc, \ + in, \ + secret + n*XXH_SECRET_CONSUME_RATE); \ + } \ +} + + +XXH_FORCE_INLINE void XXH_writeLE64(void* dst, xxh_u64 v64) +{ + if (!XXH_CPU_LITTLE_ENDIAN) v64 = XXH_swap64(v64); + XXH_memcpy(dst, &v64, sizeof(v64)); +} + +/* Several intrinsic functions below are supposed to accept __int64 as argument, + * as documented in https://software.intel.com/sites/landingpage/IntrinsicsGuide/ . + * However, several environments do not define __int64 type, + * requiring a workaround. + */ +#if !defined (__VMS) \ + && (defined (__cplusplus) \ + || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) ) + typedef int64_t xxh_i64; +#else + /* the following type must have a width of 64-bit */ + typedef long long xxh_i64; +#endif + + +/* + * XXH3_accumulate_512 is the tightest loop for long inputs, and it is the most optimized. + * + * It is a hardened version of UMAC, based off of FARSH's implementation. + * + * This was chosen because it adapts quite well to 32-bit, 64-bit, and SIMD + * implementations, and it is ridiculously fast. + * + * We harden it by mixing the original input to the accumulators as well as the product. + * + * This means that in the (relatively likely) case of a multiply by zero, the + * original input is preserved. + * + * On 128-bit inputs, we swap 64-bit pairs when we add the input to improve + * cross-pollination, as otherwise the upper and lower halves would be + * essentially independent. + * + * This doesn't matter on 64-bit hashes since they all get merged together in + * the end, so we skip the extra step. + * + * Both XXH3_64bits and XXH3_128bits use this subroutine. + */ + +#if (XXH_VECTOR == XXH_AVX512) \ + || (defined(XXH_DISPATCH_AVX512) && XXH_DISPATCH_AVX512 != 0) + +#ifndef XXH_TARGET_AVX512 +# define XXH_TARGET_AVX512 /* disable attribute target */ +#endif + +XXH_FORCE_INLINE XXH_TARGET_AVX512 void +XXH3_accumulate_512_avx512(void* XXH_RESTRICT acc, + const void* XXH_RESTRICT input, + const void* XXH_RESTRICT secret) +{ + __m512i* const xacc = (__m512i *) acc; + XXH_ASSERT((((size_t)acc) & 63) == 0); + XXH_STATIC_ASSERT(XXH_STRIPE_LEN == sizeof(__m512i)); + + { + /* data_vec = input[0]; */ + __m512i const data_vec = _mm512_loadu_si512 (input); + /* key_vec = secret[0]; */ + __m512i const key_vec = _mm512_loadu_si512 (secret); + /* data_key = data_vec ^ key_vec; */ + __m512i const data_key = _mm512_xor_si512 (data_vec, key_vec); + /* data_key_lo = data_key >> 32; */ + __m512i const data_key_lo = _mm512_srli_epi64 (data_key, 32); + /* product = (data_key & 0xffffffff) * (data_key_lo & 0xffffffff); */ + __m512i const product = _mm512_mul_epu32 (data_key, data_key_lo); + /* xacc[0] += swap(data_vec); */ + __m512i const data_swap = _mm512_shuffle_epi32(data_vec, (_MM_PERM_ENUM)_MM_SHUFFLE(1, 0, 3, 2)); + __m512i const sum = _mm512_add_epi64(*xacc, data_swap); + /* xacc[0] += product; */ + *xacc = _mm512_add_epi64(product, sum); + } +} +XXH_FORCE_INLINE XXH_TARGET_AVX512 XXH3_ACCUMULATE_TEMPLATE(avx512) + +/* + * XXH3_scrambleAcc: Scrambles the accumulators to improve mixing. + * + * Multiplication isn't perfect, as explained by Google in HighwayHash: + * + * // Multiplication mixes/scrambles bytes 0-7 of the 64-bit result to + * // varying degrees. In descending order of goodness, bytes + * // 3 4 2 5 1 6 0 7 have quality 228 224 164 160 100 96 36 32. + * // As expected, the upper and lower bytes are much worse. + * + * Source: https://github.com/google/highwayhash/blob/0aaf66b/highwayhash/hh_avx2.h#L291 + * + * Since our algorithm uses a pseudorandom secret to add some variance into the + * mix, we don't need to (or want to) mix as often or as much as HighwayHash does. + * + * This isn't as tight as XXH3_accumulate, but still written in SIMD to avoid + * extraction. + * + * Both XXH3_64bits and XXH3_128bits use this subroutine. + */ + +XXH_FORCE_INLINE XXH_TARGET_AVX512 void +XXH3_scrambleAcc_avx512(void* XXH_RESTRICT acc, const void* XXH_RESTRICT secret) +{ + XXH_ASSERT((((size_t)acc) & 63) == 0); + XXH_STATIC_ASSERT(XXH_STRIPE_LEN == sizeof(__m512i)); + { __m512i* const xacc = (__m512i*) acc; + const __m512i prime32 = _mm512_set1_epi32((int)XXH_PRIME32_1); + + /* xacc[0] ^= (xacc[0] >> 47) */ + __m512i const acc_vec = *xacc; + __m512i const shifted = _mm512_srli_epi64 (acc_vec, 47); + /* xacc[0] ^= secret; */ + __m512i const key_vec = _mm512_loadu_si512 (secret); + __m512i const data_key = _mm512_ternarylogic_epi32(key_vec, acc_vec, shifted, 0x96 /* key_vec ^ acc_vec ^ shifted */); + + /* xacc[0] *= XXH_PRIME32_1; */ + __m512i const data_key_hi = _mm512_srli_epi64 (data_key, 32); + __m512i const prod_lo = _mm512_mul_epu32 (data_key, prime32); + __m512i const prod_hi = _mm512_mul_epu32 (data_key_hi, prime32); + *xacc = _mm512_add_epi64(prod_lo, _mm512_slli_epi64(prod_hi, 32)); + } +} + +XXH_FORCE_INLINE XXH_TARGET_AVX512 void +XXH3_initCustomSecret_avx512(void* XXH_RESTRICT customSecret, xxh_u64 seed64) +{ + XXH_STATIC_ASSERT((XXH_SECRET_DEFAULT_SIZE & 63) == 0); + XXH_STATIC_ASSERT(XXH_SEC_ALIGN == 64); + XXH_ASSERT(((size_t)customSecret & 63) == 0); + (void)(&XXH_writeLE64); + { int const nbRounds = XXH_SECRET_DEFAULT_SIZE / sizeof(__m512i); + __m512i const seed_pos = _mm512_set1_epi64((xxh_i64)seed64); + __m512i const seed = _mm512_mask_sub_epi64(seed_pos, 0xAA, _mm512_set1_epi8(0), seed_pos); + + const __m512i* const src = (const __m512i*) ((const void*) XXH3_kSecret); + __m512i* const dest = ( __m512i*) customSecret; + int i; + XXH_ASSERT(((size_t)src & 63) == 0); /* control alignment */ + XXH_ASSERT(((size_t)dest & 63) == 0); + for (i=0; i < nbRounds; ++i) { + dest[i] = _mm512_add_epi64(_mm512_load_si512(src + i), seed); + } } +} + +#endif + +#if (XXH_VECTOR == XXH_AVX2) \ + || (defined(XXH_DISPATCH_AVX2) && XXH_DISPATCH_AVX2 != 0) + +#ifndef XXH_TARGET_AVX2 +# define XXH_TARGET_AVX2 /* disable attribute target */ +#endif + +XXH_FORCE_INLINE XXH_TARGET_AVX2 void +XXH3_accumulate_512_avx2( void* XXH_RESTRICT acc, + const void* XXH_RESTRICT input, + const void* XXH_RESTRICT secret) +{ + XXH_ASSERT((((size_t)acc) & 31) == 0); + { __m256i* const xacc = (__m256i *) acc; + /* Unaligned. This is mainly for pointer arithmetic, and because + * _mm256_loadu_si256 requires a const __m256i * pointer for some reason. */ + const __m256i* const xinput = (const __m256i *) input; + /* Unaligned. This is mainly for pointer arithmetic, and because + * _mm256_loadu_si256 requires a const __m256i * pointer for some reason. */ + const __m256i* const xsecret = (const __m256i *) secret; + + size_t i; + for (i=0; i < XXH_STRIPE_LEN/sizeof(__m256i); i++) { + /* data_vec = xinput[i]; */ + __m256i const data_vec = _mm256_loadu_si256 (xinput+i); + /* key_vec = xsecret[i]; */ + __m256i const key_vec = _mm256_loadu_si256 (xsecret+i); + /* data_key = data_vec ^ key_vec; */ + __m256i const data_key = _mm256_xor_si256 (data_vec, key_vec); + /* data_key_lo = data_key >> 32; */ + __m256i const data_key_lo = _mm256_srli_epi64 (data_key, 32); + /* product = (data_key & 0xffffffff) * (data_key_lo & 0xffffffff); */ + __m256i const product = _mm256_mul_epu32 (data_key, data_key_lo); + /* xacc[i] += swap(data_vec); */ + __m256i const data_swap = _mm256_shuffle_epi32(data_vec, _MM_SHUFFLE(1, 0, 3, 2)); + __m256i const sum = _mm256_add_epi64(xacc[i], data_swap); + /* xacc[i] += product; */ + xacc[i] = _mm256_add_epi64(product, sum); + } } +} +XXH_FORCE_INLINE XXH_TARGET_AVX2 XXH3_ACCUMULATE_TEMPLATE(avx2) + +XXH_FORCE_INLINE XXH_TARGET_AVX2 void +XXH3_scrambleAcc_avx2(void* XXH_RESTRICT acc, const void* XXH_RESTRICT secret) +{ + XXH_ASSERT((((size_t)acc) & 31) == 0); + { __m256i* const xacc = (__m256i*) acc; + /* Unaligned. This is mainly for pointer arithmetic, and because + * _mm256_loadu_si256 requires a const __m256i * pointer for some reason. */ + const __m256i* const xsecret = (const __m256i *) secret; + const __m256i prime32 = _mm256_set1_epi32((int)XXH_PRIME32_1); + + size_t i; + for (i=0; i < XXH_STRIPE_LEN/sizeof(__m256i); i++) { + /* xacc[i] ^= (xacc[i] >> 47) */ + __m256i const acc_vec = xacc[i]; + __m256i const shifted = _mm256_srli_epi64 (acc_vec, 47); + __m256i const data_vec = _mm256_xor_si256 (acc_vec, shifted); + /* xacc[i] ^= xsecret; */ + __m256i const key_vec = _mm256_loadu_si256 (xsecret+i); + __m256i const data_key = _mm256_xor_si256 (data_vec, key_vec); + + /* xacc[i] *= XXH_PRIME32_1; */ + __m256i const data_key_hi = _mm256_srli_epi64 (data_key, 32); + __m256i const prod_lo = _mm256_mul_epu32 (data_key, prime32); + __m256i const prod_hi = _mm256_mul_epu32 (data_key_hi, prime32); + xacc[i] = _mm256_add_epi64(prod_lo, _mm256_slli_epi64(prod_hi, 32)); + } + } +} + +XXH_FORCE_INLINE XXH_TARGET_AVX2 void XXH3_initCustomSecret_avx2(void* XXH_RESTRICT customSecret, xxh_u64 seed64) +{ + XXH_STATIC_ASSERT((XXH_SECRET_DEFAULT_SIZE & 31) == 0); + XXH_STATIC_ASSERT((XXH_SECRET_DEFAULT_SIZE / sizeof(__m256i)) == 6); + XXH_STATIC_ASSERT(XXH_SEC_ALIGN <= 64); + (void)(&XXH_writeLE64); + XXH_PREFETCH(customSecret); + { __m256i const seed = _mm256_set_epi64x((xxh_i64)(0U - seed64), (xxh_i64)seed64, (xxh_i64)(0U - seed64), (xxh_i64)seed64); + + const __m256i* const src = (const __m256i*) ((const void*) XXH3_kSecret); + __m256i* dest = ( __m256i*) customSecret; + +# if defined(__GNUC__) || defined(__clang__) + /* + * On GCC & Clang, marking 'dest' as modified will cause the compiler: + * - do not extract the secret from sse registers in the internal loop + * - use less common registers, and avoid pushing these reg into stack + */ + XXH_COMPILER_GUARD(dest); +# endif + XXH_ASSERT(((size_t)src & 31) == 0); /* control alignment */ + XXH_ASSERT(((size_t)dest & 31) == 0); + + /* GCC -O2 need unroll loop manually */ + dest[0] = _mm256_add_epi64(_mm256_load_si256(src+0), seed); + dest[1] = _mm256_add_epi64(_mm256_load_si256(src+1), seed); + dest[2] = _mm256_add_epi64(_mm256_load_si256(src+2), seed); + dest[3] = _mm256_add_epi64(_mm256_load_si256(src+3), seed); + dest[4] = _mm256_add_epi64(_mm256_load_si256(src+4), seed); + dest[5] = _mm256_add_epi64(_mm256_load_si256(src+5), seed); + } +} + +#endif + +/* x86dispatch always generates SSE2 */ +#if (XXH_VECTOR == XXH_SSE2) || defined(XXH_X86DISPATCH) + +#ifndef XXH_TARGET_SSE2 +# define XXH_TARGET_SSE2 /* disable attribute target */ +#endif + +XXH_FORCE_INLINE XXH_TARGET_SSE2 void +XXH3_accumulate_512_sse2( void* XXH_RESTRICT acc, + const void* XXH_RESTRICT input, + const void* XXH_RESTRICT secret) +{ + /* SSE2 is just a half-scale version of the AVX2 version. */ + XXH_ASSERT((((size_t)acc) & 15) == 0); + { __m128i* const xacc = (__m128i *) acc; + /* Unaligned. This is mainly for pointer arithmetic, and because + * _mm_loadu_si128 requires a const __m128i * pointer for some reason. */ + const __m128i* const xinput = (const __m128i *) input; + /* Unaligned. This is mainly for pointer arithmetic, and because + * _mm_loadu_si128 requires a const __m128i * pointer for some reason. */ + const __m128i* const xsecret = (const __m128i *) secret; + + size_t i; + for (i=0; i < XXH_STRIPE_LEN/sizeof(__m128i); i++) { + /* data_vec = xinput[i]; */ + __m128i const data_vec = _mm_loadu_si128 (xinput+i); + /* key_vec = xsecret[i]; */ + __m128i const key_vec = _mm_loadu_si128 (xsecret+i); + /* data_key = data_vec ^ key_vec; */ + __m128i const data_key = _mm_xor_si128 (data_vec, key_vec); + /* data_key_lo = data_key >> 32; */ + __m128i const data_key_lo = _mm_shuffle_epi32 (data_key, _MM_SHUFFLE(0, 3, 0, 1)); + /* product = (data_key & 0xffffffff) * (data_key_lo & 0xffffffff); */ + __m128i const product = _mm_mul_epu32 (data_key, data_key_lo); + /* xacc[i] += swap(data_vec); */ + __m128i const data_swap = _mm_shuffle_epi32(data_vec, _MM_SHUFFLE(1,0,3,2)); + __m128i const sum = _mm_add_epi64(xacc[i], data_swap); + /* xacc[i] += product; */ + xacc[i] = _mm_add_epi64(product, sum); + } } +} +XXH_FORCE_INLINE XXH_TARGET_SSE2 XXH3_ACCUMULATE_TEMPLATE(sse2) + +XXH_FORCE_INLINE XXH_TARGET_SSE2 void +XXH3_scrambleAcc_sse2(void* XXH_RESTRICT acc, const void* XXH_RESTRICT secret) +{ + XXH_ASSERT((((size_t)acc) & 15) == 0); + { __m128i* const xacc = (__m128i*) acc; + /* Unaligned. This is mainly for pointer arithmetic, and because + * _mm_loadu_si128 requires a const __m128i * pointer for some reason. */ + const __m128i* const xsecret = (const __m128i *) secret; + const __m128i prime32 = _mm_set1_epi32((int)XXH_PRIME32_1); + + size_t i; + for (i=0; i < XXH_STRIPE_LEN/sizeof(__m128i); i++) { + /* xacc[i] ^= (xacc[i] >> 47) */ + __m128i const acc_vec = xacc[i]; + __m128i const shifted = _mm_srli_epi64 (acc_vec, 47); + __m128i const data_vec = _mm_xor_si128 (acc_vec, shifted); + /* xacc[i] ^= xsecret[i]; */ + __m128i const key_vec = _mm_loadu_si128 (xsecret+i); + __m128i const data_key = _mm_xor_si128 (data_vec, key_vec); + + /* xacc[i] *= XXH_PRIME32_1; */ + __m128i const data_key_hi = _mm_shuffle_epi32 (data_key, _MM_SHUFFLE(0, 3, 0, 1)); + __m128i const prod_lo = _mm_mul_epu32 (data_key, prime32); + __m128i const prod_hi = _mm_mul_epu32 (data_key_hi, prime32); + xacc[i] = _mm_add_epi64(prod_lo, _mm_slli_epi64(prod_hi, 32)); + } + } +} + +XXH_FORCE_INLINE XXH_TARGET_SSE2 void XXH3_initCustomSecret_sse2(void* XXH_RESTRICT customSecret, xxh_u64 seed64) +{ + XXH_STATIC_ASSERT((XXH_SECRET_DEFAULT_SIZE & 15) == 0); + (void)(&XXH_writeLE64); + { int const nbRounds = XXH_SECRET_DEFAULT_SIZE / sizeof(__m128i); + +# if defined(_MSC_VER) && defined(_M_IX86) && _MSC_VER < 1900 + /* MSVC 32bit mode does not support _mm_set_epi64x before 2015 */ + XXH_ALIGN(16) const xxh_i64 seed64x2[2] = { (xxh_i64)seed64, (xxh_i64)(0U - seed64) }; + __m128i const seed = _mm_load_si128((__m128i const*)seed64x2); +# else + __m128i const seed = _mm_set_epi64x((xxh_i64)(0U - seed64), (xxh_i64)seed64); +# endif + int i; + + const void* const src16 = XXH3_kSecret; + __m128i* dst16 = (__m128i*) customSecret; +# if defined(__GNUC__) || defined(__clang__) + /* + * On GCC & Clang, marking 'dest' as modified will cause the compiler: + * - do not extract the secret from sse registers in the internal loop + * - use less common registers, and avoid pushing these reg into stack + */ + XXH_COMPILER_GUARD(dst16); +# endif + XXH_ASSERT(((size_t)src16 & 15) == 0); /* control alignment */ + XXH_ASSERT(((size_t)dst16 & 15) == 0); + + for (i=0; i < nbRounds; ++i) { + dst16[i] = _mm_add_epi64(_mm_load_si128((const __m128i *)src16+i), seed); + } } +} + +#endif + +#if (XXH_VECTOR == XXH_NEON) + +/* forward declarations for the scalar routines */ +XXH_FORCE_INLINE void +XXH3_scalarRound(void* XXH_RESTRICT acc, void const* XXH_RESTRICT input, + void const* XXH_RESTRICT secret, size_t lane); + +XXH_FORCE_INLINE void +XXH3_scalarScrambleRound(void* XXH_RESTRICT acc, + void const* XXH_RESTRICT secret, size_t lane); + +/*! + * @internal + * @brief The bulk processing loop for NEON and WASM SIMD128. + * + * The NEON code path is actually partially scalar when running on AArch64. This + * is to optimize the pipelining and can have up to 15% speedup depending on the + * CPU, and it also mitigates some GCC codegen issues. + * + * @see XXH3_NEON_LANES for configuring this and details about this optimization. + * + * NEON's 32-bit to 64-bit long multiply takes a half vector of 32-bit + * integers instead of the other platforms which mask full 64-bit vectors, + * so the setup is more complicated than just shifting right. + * + * Additionally, there is an optimization for 4 lanes at once noted below. + * + * Since, as stated, the most optimal amount of lanes for Cortexes is 6, + * there needs to be *three* versions of the accumulate operation used + * for the remaining 2 lanes. + * + * WASM's SIMD128 uses SIMDe's arm_neon.h polyfill because the intrinsics overlap + * nearly perfectly. + */ + +XXH_FORCE_INLINE void +XXH3_accumulate_512_neon( void* XXH_RESTRICT acc, + const void* XXH_RESTRICT input, + const void* XXH_RESTRICT secret) +{ + XXH_ASSERT((((size_t)acc) & 15) == 0); + XXH_STATIC_ASSERT(XXH3_NEON_LANES > 0 && XXH3_NEON_LANES <= XXH_ACC_NB && XXH3_NEON_LANES % 2 == 0); + { /* GCC for darwin arm64 does not like aliasing here */ + xxh_aliasing_uint64x2_t* const xacc = (xxh_aliasing_uint64x2_t*) acc; + /* We don't use a uint32x4_t pointer because it causes bus errors on ARMv7. */ + uint8_t const* xinput = (const uint8_t *) input; + uint8_t const* xsecret = (const uint8_t *) secret; + + size_t i; +#ifdef __wasm_simd128__ + /* + * On WASM SIMD128, Clang emits direct address loads when XXH3_kSecret + * is constant propagated, which results in it converting it to this + * inside the loop: + * + * a = v128.load(XXH3_kSecret + 0 + $secret_offset, offset = 0) + * b = v128.load(XXH3_kSecret + 16 + $secret_offset, offset = 0) + * ... + * + * This requires a full 32-bit address immediate (and therefore a 6 byte + * instruction) as well as an add for each offset. + * + * Putting an asm guard prevents it from folding (at the cost of losing + * the alignment hint), and uses the free offset in `v128.load` instead + * of adding secret_offset each time which overall reduces code size by + * about a kilobyte and improves performance. + */ + XXH_COMPILER_GUARD(xsecret); +#endif + /* Scalar lanes use the normal scalarRound routine */ + for (i = XXH3_NEON_LANES; i < XXH_ACC_NB; i++) { + XXH3_scalarRound(acc, input, secret, i); + } + i = 0; + /* 4 NEON lanes at a time. */ + for (; i+1 < XXH3_NEON_LANES / 2; i+=2) { + /* data_vec = xinput[i]; */ + uint64x2_t data_vec_1 = XXH_vld1q_u64(xinput + (i * 16)); + uint64x2_t data_vec_2 = XXH_vld1q_u64(xinput + ((i+1) * 16)); + /* key_vec = xsecret[i]; */ + uint64x2_t key_vec_1 = XXH_vld1q_u64(xsecret + (i * 16)); + uint64x2_t key_vec_2 = XXH_vld1q_u64(xsecret + ((i+1) * 16)); + /* data_swap = swap(data_vec) */ + uint64x2_t data_swap_1 = vextq_u64(data_vec_1, data_vec_1, 1); + uint64x2_t data_swap_2 = vextq_u64(data_vec_2, data_vec_2, 1); + /* data_key = data_vec ^ key_vec; */ + uint64x2_t data_key_1 = veorq_u64(data_vec_1, key_vec_1); + uint64x2_t data_key_2 = veorq_u64(data_vec_2, key_vec_2); + + /* + * If we reinterpret the 64x2 vectors as 32x4 vectors, we can use a + * de-interleave operation for 4 lanes in 1 step with `vuzpq_u32` to + * get one vector with the low 32 bits of each lane, and one vector + * with the high 32 bits of each lane. + * + * The intrinsic returns a double vector because the original ARMv7-a + * instruction modified both arguments in place. AArch64 and SIMD128 emit + * two instructions from this intrinsic. + * + * [ dk11L | dk11H | dk12L | dk12H ] -> [ dk11L | dk12L | dk21L | dk22L ] + * [ dk21L | dk21H | dk22L | dk22H ] -> [ dk11H | dk12H | dk21H | dk22H ] + */ + uint32x4x2_t unzipped = vuzpq_u32( + vreinterpretq_u32_u64(data_key_1), + vreinterpretq_u32_u64(data_key_2) + ); + /* data_key_lo = data_key & 0xFFFFFFFF */ + uint32x4_t data_key_lo = unzipped.val[0]; + /* data_key_hi = data_key >> 32 */ + uint32x4_t data_key_hi = unzipped.val[1]; + /* + * Then, we can split the vectors horizontally and multiply which, as for most + * widening intrinsics, have a variant that works on both high half vectors + * for free on AArch64. A similar instruction is available on SIMD128. + * + * sum = data_swap + (u64x2) data_key_lo * (u64x2) data_key_hi + */ + uint64x2_t sum_1 = XXH_vmlal_low_u32(data_swap_1, data_key_lo, data_key_hi); + uint64x2_t sum_2 = XXH_vmlal_high_u32(data_swap_2, data_key_lo, data_key_hi); + /* + * Clang reorders + * a += b * c; // umlal swap.2d, dkl.2s, dkh.2s + * c += a; // add acc.2d, acc.2d, swap.2d + * to + * c += a; // add acc.2d, acc.2d, swap.2d + * c += b * c; // umlal acc.2d, dkl.2s, dkh.2s + * + * While it would make sense in theory since the addition is faster, + * for reasons likely related to umlal being limited to certain NEON + * pipelines, this is worse. A compiler guard fixes this. + */ + XXH_COMPILER_GUARD_CLANG_NEON(sum_1); + XXH_COMPILER_GUARD_CLANG_NEON(sum_2); + /* xacc[i] = acc_vec + sum; */ + xacc[i] = vaddq_u64(xacc[i], sum_1); + xacc[i+1] = vaddq_u64(xacc[i+1], sum_2); + } + /* Operate on the remaining NEON lanes 2 at a time. */ + for (; i < XXH3_NEON_LANES / 2; i++) { + /* data_vec = xinput[i]; */ + uint64x2_t data_vec = XXH_vld1q_u64(xinput + (i * 16)); + /* key_vec = xsecret[i]; */ + uint64x2_t key_vec = XXH_vld1q_u64(xsecret + (i * 16)); + /* acc_vec_2 = swap(data_vec) */ + uint64x2_t data_swap = vextq_u64(data_vec, data_vec, 1); + /* data_key = data_vec ^ key_vec; */ + uint64x2_t data_key = veorq_u64(data_vec, key_vec); + /* For two lanes, just use VMOVN and VSHRN. */ + /* data_key_lo = data_key & 0xFFFFFFFF; */ + uint32x2_t data_key_lo = vmovn_u64(data_key); + /* data_key_hi = data_key >> 32; */ + uint32x2_t data_key_hi = vshrn_n_u64(data_key, 32); + /* sum = data_swap + (u64x2) data_key_lo * (u64x2) data_key_hi; */ + uint64x2_t sum = vmlal_u32(data_swap, data_key_lo, data_key_hi); + /* Same Clang workaround as before */ + XXH_COMPILER_GUARD_CLANG_NEON(sum); + /* xacc[i] = acc_vec + sum; */ + xacc[i] = vaddq_u64 (xacc[i], sum); + } + } +} +XXH_FORCE_INLINE XXH3_ACCUMULATE_TEMPLATE(neon) + +XXH_FORCE_INLINE void +XXH3_scrambleAcc_neon(void* XXH_RESTRICT acc, const void* XXH_RESTRICT secret) +{ + XXH_ASSERT((((size_t)acc) & 15) == 0); + + { xxh_aliasing_uint64x2_t* xacc = (xxh_aliasing_uint64x2_t*) acc; + uint8_t const* xsecret = (uint8_t const*) secret; + + size_t i; + /* WASM uses operator overloads and doesn't need these. */ +#ifndef __wasm_simd128__ + /* { prime32_1, prime32_1 } */ + uint32x2_t const kPrimeLo = vdup_n_u32(XXH_PRIME32_1); + /* { 0, prime32_1, 0, prime32_1 } */ + uint32x4_t const kPrimeHi = vreinterpretq_u32_u64(vdupq_n_u64((xxh_u64)XXH_PRIME32_1 << 32)); +#endif + + /* AArch64 uses both scalar and neon at the same time */ + for (i = XXH3_NEON_LANES; i < XXH_ACC_NB; i++) { + XXH3_scalarScrambleRound(acc, secret, i); + } + for (i=0; i < XXH3_NEON_LANES / 2; i++) { + /* xacc[i] ^= (xacc[i] >> 47); */ + uint64x2_t acc_vec = xacc[i]; + uint64x2_t shifted = vshrq_n_u64(acc_vec, 47); + uint64x2_t data_vec = veorq_u64(acc_vec, shifted); + + /* xacc[i] ^= xsecret[i]; */ + uint64x2_t key_vec = XXH_vld1q_u64(xsecret + (i * 16)); + uint64x2_t data_key = veorq_u64(data_vec, key_vec); + /* xacc[i] *= XXH_PRIME32_1 */ +#ifdef __wasm_simd128__ + /* SIMD128 has multiply by u64x2, use it instead of expanding and scalarizing */ + xacc[i] = data_key * XXH_PRIME32_1; +#else + /* + * Expanded version with portable NEON intrinsics + * + * lo(x) * lo(y) + (hi(x) * lo(y) << 32) + * + * prod_hi = hi(data_key) * lo(prime) << 32 + * + * Since we only need 32 bits of this multiply a trick can be used, reinterpreting the vector + * as a uint32x4_t and multiplying by { 0, prime, 0, prime } to cancel out the unwanted bits + * and avoid the shift. + */ + uint32x4_t prod_hi = vmulq_u32 (vreinterpretq_u32_u64(data_key), kPrimeHi); + /* Extract low bits for vmlal_u32 */ + uint32x2_t data_key_lo = vmovn_u64(data_key); + /* xacc[i] = prod_hi + lo(data_key) * XXH_PRIME32_1; */ + xacc[i] = vmlal_u32(vreinterpretq_u64_u32(prod_hi), data_key_lo, kPrimeLo); +#endif + } + } +} +#endif + +#if (XXH_VECTOR == XXH_VSX) + +XXH_FORCE_INLINE void +XXH3_accumulate_512_vsx( void* XXH_RESTRICT acc, + const void* XXH_RESTRICT input, + const void* XXH_RESTRICT secret) +{ + /* presumed aligned */ + xxh_aliasing_u64x2* const xacc = (xxh_aliasing_u64x2*) acc; + xxh_u8 const* const xinput = (xxh_u8 const*) input; /* no alignment restriction */ + xxh_u8 const* const xsecret = (xxh_u8 const*) secret; /* no alignment restriction */ + xxh_u64x2 const v32 = { 32, 32 }; + size_t i; + for (i = 0; i < XXH_STRIPE_LEN / sizeof(xxh_u64x2); i++) { + /* data_vec = xinput[i]; */ + xxh_u64x2 const data_vec = XXH_vec_loadu(xinput + 16*i); + /* key_vec = xsecret[i]; */ + xxh_u64x2 const key_vec = XXH_vec_loadu(xsecret + 16*i); + xxh_u64x2 const data_key = data_vec ^ key_vec; + /* shuffled = (data_key << 32) | (data_key >> 32); */ + xxh_u32x4 const shuffled = (xxh_u32x4)vec_rl(data_key, v32); + /* product = ((xxh_u64x2)data_key & 0xFFFFFFFF) * ((xxh_u64x2)shuffled & 0xFFFFFFFF); */ + xxh_u64x2 const product = XXH_vec_mulo((xxh_u32x4)data_key, shuffled); + /* acc_vec = xacc[i]; */ + xxh_u64x2 acc_vec = xacc[i]; + acc_vec += product; + + /* swap high and low halves */ +#ifdef __s390x__ + acc_vec += vec_permi(data_vec, data_vec, 2); +#else + acc_vec += vec_xxpermdi(data_vec, data_vec, 2); +#endif + xacc[i] = acc_vec; + } +} +XXH_FORCE_INLINE XXH3_ACCUMULATE_TEMPLATE(vsx) + +XXH_FORCE_INLINE void +XXH3_scrambleAcc_vsx(void* XXH_RESTRICT acc, const void* XXH_RESTRICT secret) +{ + XXH_ASSERT((((size_t)acc) & 15) == 0); + + { xxh_aliasing_u64x2* const xacc = (xxh_aliasing_u64x2*) acc; + const xxh_u8* const xsecret = (const xxh_u8*) secret; + /* constants */ + xxh_u64x2 const v32 = { 32, 32 }; + xxh_u64x2 const v47 = { 47, 47 }; + xxh_u32x4 const prime = { XXH_PRIME32_1, XXH_PRIME32_1, XXH_PRIME32_1, XXH_PRIME32_1 }; + size_t i; + for (i = 0; i < XXH_STRIPE_LEN / sizeof(xxh_u64x2); i++) { + /* xacc[i] ^= (xacc[i] >> 47); */ + xxh_u64x2 const acc_vec = xacc[i]; + xxh_u64x2 const data_vec = acc_vec ^ (acc_vec >> v47); + + /* xacc[i] ^= xsecret[i]; */ + xxh_u64x2 const key_vec = XXH_vec_loadu(xsecret + 16*i); + xxh_u64x2 const data_key = data_vec ^ key_vec; + + /* xacc[i] *= XXH_PRIME32_1 */ + /* prod_lo = ((xxh_u64x2)data_key & 0xFFFFFFFF) * ((xxh_u64x2)prime & 0xFFFFFFFF); */ + xxh_u64x2 const prod_even = XXH_vec_mule((xxh_u32x4)data_key, prime); + /* prod_hi = ((xxh_u64x2)data_key >> 32) * ((xxh_u64x2)prime >> 32); */ + xxh_u64x2 const prod_odd = XXH_vec_mulo((xxh_u32x4)data_key, prime); + xacc[i] = prod_odd + (prod_even << v32); + } } +} + +#endif + +#if (XXH_VECTOR == XXH_SVE) + +XXH_FORCE_INLINE void +XXH3_accumulate_512_sve( void* XXH_RESTRICT acc, + const void* XXH_RESTRICT input, + const void* XXH_RESTRICT secret) +{ + uint64_t *xacc = (uint64_t *)acc; + const uint64_t *xinput = (const uint64_t *)(const void *)input; + const uint64_t *xsecret = (const uint64_t *)(const void *)secret; + svuint64_t kSwap = sveor_n_u64_z(svptrue_b64(), svindex_u64(0, 1), 1); + uint64_t element_count = svcntd(); + if (element_count >= 8) { + svbool_t mask = svptrue_pat_b64(SV_VL8); + svuint64_t vacc = svld1_u64(mask, xacc); + ACCRND(vacc, 0); + svst1_u64(mask, xacc, vacc); + } else if (element_count == 2) { /* sve128 */ + svbool_t mask = svptrue_pat_b64(SV_VL2); + svuint64_t acc0 = svld1_u64(mask, xacc + 0); + svuint64_t acc1 = svld1_u64(mask, xacc + 2); + svuint64_t acc2 = svld1_u64(mask, xacc + 4); + svuint64_t acc3 = svld1_u64(mask, xacc + 6); + ACCRND(acc0, 0); + ACCRND(acc1, 2); + ACCRND(acc2, 4); + ACCRND(acc3, 6); + svst1_u64(mask, xacc + 0, acc0); + svst1_u64(mask, xacc + 2, acc1); + svst1_u64(mask, xacc + 4, acc2); + svst1_u64(mask, xacc + 6, acc3); + } else { + svbool_t mask = svptrue_pat_b64(SV_VL4); + svuint64_t acc0 = svld1_u64(mask, xacc + 0); + svuint64_t acc1 = svld1_u64(mask, xacc + 4); + ACCRND(acc0, 0); + ACCRND(acc1, 4); + svst1_u64(mask, xacc + 0, acc0); + svst1_u64(mask, xacc + 4, acc1); + } +} + +XXH_FORCE_INLINE void +XXH3_accumulate_sve(xxh_u64* XXH_RESTRICT acc, + const xxh_u8* XXH_RESTRICT input, + const xxh_u8* XXH_RESTRICT secret, + size_t nbStripes) +{ + if (nbStripes != 0) { + uint64_t *xacc = (uint64_t *)acc; + const uint64_t *xinput = (const uint64_t *)(const void *)input; + const uint64_t *xsecret = (const uint64_t *)(const void *)secret; + svuint64_t kSwap = sveor_n_u64_z(svptrue_b64(), svindex_u64(0, 1), 1); + uint64_t element_count = svcntd(); + if (element_count >= 8) { + svbool_t mask = svptrue_pat_b64(SV_VL8); + svuint64_t vacc = svld1_u64(mask, xacc + 0); + do { + /* svprfd(svbool_t, void *, enum svfprop); */ + svprfd(mask, xinput + 128, SV_PLDL1STRM); + ACCRND(vacc, 0); + xinput += 8; + xsecret += 1; + nbStripes--; + } while (nbStripes != 0); + + svst1_u64(mask, xacc + 0, vacc); + } else if (element_count == 2) { /* sve128 */ + svbool_t mask = svptrue_pat_b64(SV_VL2); + svuint64_t acc0 = svld1_u64(mask, xacc + 0); + svuint64_t acc1 = svld1_u64(mask, xacc + 2); + svuint64_t acc2 = svld1_u64(mask, xacc + 4); + svuint64_t acc3 = svld1_u64(mask, xacc + 6); + do { + svprfd(mask, xinput + 128, SV_PLDL1STRM); + ACCRND(acc0, 0); + ACCRND(acc1, 2); + ACCRND(acc2, 4); + ACCRND(acc3, 6); + xinput += 8; + xsecret += 1; + nbStripes--; + } while (nbStripes != 0); + + svst1_u64(mask, xacc + 0, acc0); + svst1_u64(mask, xacc + 2, acc1); + svst1_u64(mask, xacc + 4, acc2); + svst1_u64(mask, xacc + 6, acc3); + } else { + svbool_t mask = svptrue_pat_b64(SV_VL4); + svuint64_t acc0 = svld1_u64(mask, xacc + 0); + svuint64_t acc1 = svld1_u64(mask, xacc + 4); + do { + svprfd(mask, xinput + 128, SV_PLDL1STRM); + ACCRND(acc0, 0); + ACCRND(acc1, 4); + xinput += 8; + xsecret += 1; + nbStripes--; + } while (nbStripes != 0); + + svst1_u64(mask, xacc + 0, acc0); + svst1_u64(mask, xacc + 4, acc1); + } + } +} + +#endif + +/* scalar variants - universal */ + +#if defined(__aarch64__) && (defined(__GNUC__) || defined(__clang__)) +/* + * In XXH3_scalarRound(), GCC and Clang have a similar codegen issue, where they + * emit an excess mask and a full 64-bit multiply-add (MADD X-form). + * + * While this might not seem like much, as AArch64 is a 64-bit architecture, only + * big Cortex designs have a full 64-bit multiplier. + * + * On the little cores, the smaller 32-bit multiplier is used, and full 64-bit + * multiplies expand to 2-3 multiplies in microcode. This has a major penalty + * of up to 4 latency cycles and 2 stall cycles in the multiply pipeline. + * + * Thankfully, AArch64 still provides the 32-bit long multiply-add (UMADDL) which does + * not have this penalty and does the mask automatically. + */ +XXH_FORCE_INLINE xxh_u64 +XXH_mult32to64_add64(xxh_u64 lhs, xxh_u64 rhs, xxh_u64 acc) +{ + xxh_u64 ret; + /* note: %x = 64-bit register, %w = 32-bit register */ + __asm__("umaddl %x0, %w1, %w2, %x3" : "=r" (ret) : "r" (lhs), "r" (rhs), "r" (acc)); + return ret; +} +#else +XXH_FORCE_INLINE xxh_u64 +XXH_mult32to64_add64(xxh_u64 lhs, xxh_u64 rhs, xxh_u64 acc) +{ + return XXH_mult32to64((xxh_u32)lhs, (xxh_u32)rhs) + acc; +} +#endif + +/*! + * @internal + * @brief Scalar round for @ref XXH3_accumulate_512_scalar(). + * + * This is extracted to its own function because the NEON path uses a combination + * of NEON and scalar. + */ +XXH_FORCE_INLINE void +XXH3_scalarRound(void* XXH_RESTRICT acc, + void const* XXH_RESTRICT input, + void const* XXH_RESTRICT secret, + size_t lane) +{ + xxh_u64* xacc = (xxh_u64*) acc; + xxh_u8 const* xinput = (xxh_u8 const*) input; + xxh_u8 const* xsecret = (xxh_u8 const*) secret; + XXH_ASSERT(lane < XXH_ACC_NB); + XXH_ASSERT(((size_t)acc & (XXH_ACC_ALIGN-1)) == 0); + { + xxh_u64 const data_val = XXH_readLE64(xinput + lane * 8); + xxh_u64 const data_key = data_val ^ XXH_readLE64(xsecret + lane * 8); + xacc[lane ^ 1] += data_val; /* swap adjacent lanes */ + xacc[lane] = XXH_mult32to64_add64(data_key /* & 0xFFFFFFFF */, data_key >> 32, xacc[lane]); + } +} + +/*! + * @internal + * @brief Processes a 64 byte block of data using the scalar path. + */ +XXH_FORCE_INLINE void +XXH3_accumulate_512_scalar(void* XXH_RESTRICT acc, + const void* XXH_RESTRICT input, + const void* XXH_RESTRICT secret) +{ + size_t i; + /* ARM GCC refuses to unroll this loop, resulting in a 24% slowdown on ARMv6. */ +#if defined(__GNUC__) && !defined(__clang__) \ + && (defined(__arm__) || defined(__thumb2__)) \ + && defined(__ARM_FEATURE_UNALIGNED) /* no unaligned access just wastes bytes */ \ + && XXH_SIZE_OPT <= 0 +# pragma GCC unroll 8 +#endif + for (i=0; i < XXH_ACC_NB; i++) { + XXH3_scalarRound(acc, input, secret, i); + } +} +XXH_FORCE_INLINE XXH3_ACCUMULATE_TEMPLATE(scalar) + +/*! + * @internal + * @brief Scalar scramble step for @ref XXH3_scrambleAcc_scalar(). + * + * This is extracted to its own function because the NEON path uses a combination + * of NEON and scalar. + */ +XXH_FORCE_INLINE void +XXH3_scalarScrambleRound(void* XXH_RESTRICT acc, + void const* XXH_RESTRICT secret, + size_t lane) +{ + xxh_u64* const xacc = (xxh_u64*) acc; /* presumed aligned */ + const xxh_u8* const xsecret = (const xxh_u8*) secret; /* no alignment restriction */ + XXH_ASSERT((((size_t)acc) & (XXH_ACC_ALIGN-1)) == 0); + XXH_ASSERT(lane < XXH_ACC_NB); + { + xxh_u64 const key64 = XXH_readLE64(xsecret + lane * 8); + xxh_u64 acc64 = xacc[lane]; + acc64 = XXH_xorshift64(acc64, 47); + acc64 ^= key64; + acc64 *= XXH_PRIME32_1; + xacc[lane] = acc64; + } +} + +/*! + * @internal + * @brief Scrambles the accumulators after a large chunk has been read + */ +XXH_FORCE_INLINE void +XXH3_scrambleAcc_scalar(void* XXH_RESTRICT acc, const void* XXH_RESTRICT secret) +{ + size_t i; + for (i=0; i < XXH_ACC_NB; i++) { + XXH3_scalarScrambleRound(acc, secret, i); + } +} + +XXH_FORCE_INLINE void +XXH3_initCustomSecret_scalar(void* XXH_RESTRICT customSecret, xxh_u64 seed64) +{ + /* + * We need a separate pointer for the hack below, + * which requires a non-const pointer. + * Any decent compiler will optimize this out otherwise. + */ + const xxh_u8* kSecretPtr = XXH3_kSecret; + XXH_STATIC_ASSERT((XXH_SECRET_DEFAULT_SIZE & 15) == 0); + +#if defined(__GNUC__) && defined(__aarch64__) + /* + * UGLY HACK: + * GCC and Clang generate a bunch of MOV/MOVK pairs for aarch64, and they are + * placed sequentially, in order, at the top of the unrolled loop. + * + * While MOVK is great for generating constants (2 cycles for a 64-bit + * constant compared to 4 cycles for LDR), it fights for bandwidth with + * the arithmetic instructions. + * + * I L S + * MOVK + * MOVK + * MOVK + * MOVK + * ADD + * SUB STR + * STR + * By forcing loads from memory (as the asm line causes the compiler to assume + * that XXH3_kSecretPtr has been changed), the pipelines are used more + * efficiently: + * I L S + * LDR + * ADD LDR + * SUB STR + * STR + * + * See XXH3_NEON_LANES for details on the pipsline. + * + * XXH3_64bits_withSeed, len == 256, Snapdragon 835 + * without hack: 2654.4 MB/s + * with hack: 3202.9 MB/s + */ + XXH_COMPILER_GUARD(kSecretPtr); +#endif + { int const nbRounds = XXH_SECRET_DEFAULT_SIZE / 16; + int i; + for (i=0; i < nbRounds; i++) { + /* + * The asm hack causes the compiler to assume that kSecretPtr aliases with + * customSecret, and on aarch64, this prevented LDP from merging two + * loads together for free. Putting the loads together before the stores + * properly generates LDP. + */ + xxh_u64 lo = XXH_readLE64(kSecretPtr + 16*i) + seed64; + xxh_u64 hi = XXH_readLE64(kSecretPtr + 16*i + 8) - seed64; + XXH_writeLE64((xxh_u8*)customSecret + 16*i, lo); + XXH_writeLE64((xxh_u8*)customSecret + 16*i + 8, hi); + } } +} + + +typedef void (*XXH3_f_accumulate)(xxh_u64* XXH_RESTRICT, const xxh_u8* XXH_RESTRICT, const xxh_u8* XXH_RESTRICT, size_t); +typedef void (*XXH3_f_scrambleAcc)(void* XXH_RESTRICT, const void*); +typedef void (*XXH3_f_initCustomSecret)(void* XXH_RESTRICT, xxh_u64); + + +#if (XXH_VECTOR == XXH_AVX512) + +#define XXH3_accumulate_512 XXH3_accumulate_512_avx512 +#define XXH3_accumulate XXH3_accumulate_avx512 +#define XXH3_scrambleAcc XXH3_scrambleAcc_avx512 +#define XXH3_initCustomSecret XXH3_initCustomSecret_avx512 + +#elif (XXH_VECTOR == XXH_AVX2) + +#define XXH3_accumulate_512 XXH3_accumulate_512_avx2 +#define XXH3_accumulate XXH3_accumulate_avx2 +#define XXH3_scrambleAcc XXH3_scrambleAcc_avx2 +#define XXH3_initCustomSecret XXH3_initCustomSecret_avx2 + +#elif (XXH_VECTOR == XXH_SSE2) + +#define XXH3_accumulate_512 XXH3_accumulate_512_sse2 +#define XXH3_accumulate XXH3_accumulate_sse2 +#define XXH3_scrambleAcc XXH3_scrambleAcc_sse2 +#define XXH3_initCustomSecret XXH3_initCustomSecret_sse2 + +#elif (XXH_VECTOR == XXH_NEON) + +#define XXH3_accumulate_512 XXH3_accumulate_512_neon +#define XXH3_accumulate XXH3_accumulate_neon +#define XXH3_scrambleAcc XXH3_scrambleAcc_neon +#define XXH3_initCustomSecret XXH3_initCustomSecret_scalar + +#elif (XXH_VECTOR == XXH_VSX) + +#define XXH3_accumulate_512 XXH3_accumulate_512_vsx +#define XXH3_accumulate XXH3_accumulate_vsx +#define XXH3_scrambleAcc XXH3_scrambleAcc_vsx +#define XXH3_initCustomSecret XXH3_initCustomSecret_scalar + +#elif (XXH_VECTOR == XXH_SVE) +#define XXH3_accumulate_512 XXH3_accumulate_512_sve +#define XXH3_accumulate XXH3_accumulate_sve +#define XXH3_scrambleAcc XXH3_scrambleAcc_scalar +#define XXH3_initCustomSecret XXH3_initCustomSecret_scalar + +#else /* scalar */ + +#define XXH3_accumulate_512 XXH3_accumulate_512_scalar +#define XXH3_accumulate XXH3_accumulate_scalar +#define XXH3_scrambleAcc XXH3_scrambleAcc_scalar +#define XXH3_initCustomSecret XXH3_initCustomSecret_scalar + +#endif + +#if XXH_SIZE_OPT >= 1 /* don't do SIMD for initialization */ +# undef XXH3_initCustomSecret +# define XXH3_initCustomSecret XXH3_initCustomSecret_scalar +#endif + +XXH_FORCE_INLINE void +XXH3_hashLong_internal_loop(xxh_u64* XXH_RESTRICT acc, + const xxh_u8* XXH_RESTRICT input, size_t len, + const xxh_u8* XXH_RESTRICT secret, size_t secretSize, + XXH3_f_accumulate f_acc, + XXH3_f_scrambleAcc f_scramble) +{ + size_t const nbStripesPerBlock = (secretSize - XXH_STRIPE_LEN) / XXH_SECRET_CONSUME_RATE; + size_t const block_len = XXH_STRIPE_LEN * nbStripesPerBlock; + size_t const nb_blocks = (len - 1) / block_len; + + size_t n; + + XXH_ASSERT(secretSize >= XXH3_SECRET_SIZE_MIN); + + for (n = 0; n < nb_blocks; n++) { + f_acc(acc, input + n*block_len, secret, nbStripesPerBlock); + f_scramble(acc, secret + secretSize - XXH_STRIPE_LEN); + } + + /* last partial block */ + XXH_ASSERT(len > XXH_STRIPE_LEN); + { size_t const nbStripes = ((len - 1) - (block_len * nb_blocks)) / XXH_STRIPE_LEN; + XXH_ASSERT(nbStripes <= (secretSize / XXH_SECRET_CONSUME_RATE)); + f_acc(acc, input + nb_blocks*block_len, secret, nbStripes); + + /* last stripe */ + { const xxh_u8* const p = input + len - XXH_STRIPE_LEN; +#define XXH_SECRET_LASTACC_START 7 /* not aligned on 8, last secret is different from acc & scrambler */ + XXH3_accumulate_512(acc, p, secret + secretSize - XXH_STRIPE_LEN - XXH_SECRET_LASTACC_START); + } } +} + +XXH_FORCE_INLINE xxh_u64 +XXH3_mix2Accs(const xxh_u64* XXH_RESTRICT acc, const xxh_u8* XXH_RESTRICT secret) +{ + return XXH3_mul128_fold64( + acc[0] ^ XXH_readLE64(secret), + acc[1] ^ XXH_readLE64(secret+8) ); +} + +static XXH64_hash_t +XXH3_mergeAccs(const xxh_u64* XXH_RESTRICT acc, const xxh_u8* XXH_RESTRICT secret, xxh_u64 start) +{ + xxh_u64 result64 = start; + size_t i = 0; + + for (i = 0; i < 4; i++) { + result64 += XXH3_mix2Accs(acc+2*i, secret + 16*i); +#if defined(__clang__) /* Clang */ \ + && (defined(__arm__) || defined(__thumb__)) /* ARMv7 */ \ + && (defined(__ARM_NEON) || defined(__ARM_NEON__)) /* NEON */ \ + && !defined(XXH_ENABLE_AUTOVECTORIZE) /* Define to disable */ + /* + * UGLY HACK: + * Prevent autovectorization on Clang ARMv7-a. Exact same problem as + * the one in XXH3_len_129to240_64b. Speeds up shorter keys > 240b. + * XXH3_64bits, len == 256, Snapdragon 835: + * without hack: 2063.7 MB/s + * with hack: 2560.7 MB/s + */ + XXH_COMPILER_GUARD(result64); +#endif + } + + return XXH3_avalanche(result64); +} + +#define XXH3_INIT_ACC { XXH_PRIME32_3, XXH_PRIME64_1, XXH_PRIME64_2, XXH_PRIME64_3, \ + XXH_PRIME64_4, XXH_PRIME32_2, XXH_PRIME64_5, XXH_PRIME32_1 } + +XXH_FORCE_INLINE XXH64_hash_t +XXH3_hashLong_64b_internal(const void* XXH_RESTRICT input, size_t len, + const void* XXH_RESTRICT secret, size_t secretSize, + XXH3_f_accumulate f_acc, + XXH3_f_scrambleAcc f_scramble) +{ + XXH_ALIGN(XXH_ACC_ALIGN) xxh_u64 acc[XXH_ACC_NB] = XXH3_INIT_ACC; + + XXH3_hashLong_internal_loop(acc, (const xxh_u8*)input, len, (const xxh_u8*)secret, secretSize, f_acc, f_scramble); + + /* converge into final hash */ + XXH_STATIC_ASSERT(sizeof(acc) == 64); + /* do not align on 8, so that the secret is different from the accumulator */ +#define XXH_SECRET_MERGEACCS_START 11 + XXH_ASSERT(secretSize >= sizeof(acc) + XXH_SECRET_MERGEACCS_START); + return XXH3_mergeAccs(acc, (const xxh_u8*)secret + XXH_SECRET_MERGEACCS_START, (xxh_u64)len * XXH_PRIME64_1); +} + +/* + * It's important for performance to transmit secret's size (when it's static) + * so that the compiler can properly optimize the vectorized loop. + * This makes a big performance difference for "medium" keys (<1 KB) when using AVX instruction set. + * When the secret size is unknown, or on GCC 12 where the mix of NO_INLINE and FORCE_INLINE + * breaks -Og, this is XXH_NO_INLINE. + */ +XXH3_WITH_SECRET_INLINE XXH64_hash_t +XXH3_hashLong_64b_withSecret(const void* XXH_RESTRICT input, size_t len, + XXH64_hash_t seed64, const xxh_u8* XXH_RESTRICT secret, size_t secretLen) +{ + (void)seed64; + return XXH3_hashLong_64b_internal(input, len, secret, secretLen, XXH3_accumulate, XXH3_scrambleAcc); +} + +/* + * It's preferable for performance that XXH3_hashLong is not inlined, + * as it results in a smaller function for small data, easier to the instruction cache. + * Note that inside this no_inline function, we do inline the internal loop, + * and provide a statically defined secret size to allow optimization of vector loop. + */ +XXH_NO_INLINE XXH_PUREF XXH64_hash_t +XXH3_hashLong_64b_default(const void* XXH_RESTRICT input, size_t len, + XXH64_hash_t seed64, const xxh_u8* XXH_RESTRICT secret, size_t secretLen) +{ + (void)seed64; (void)secret; (void)secretLen; + return XXH3_hashLong_64b_internal(input, len, XXH3_kSecret, sizeof(XXH3_kSecret), XXH3_accumulate, XXH3_scrambleAcc); +} + +/* + * XXH3_hashLong_64b_withSeed(): + * Generate a custom key based on alteration of default XXH3_kSecret with the seed, + * and then use this key for long mode hashing. + * + * This operation is decently fast but nonetheless costs a little bit of time. + * Try to avoid it whenever possible (typically when seed==0). + * + * It's important for performance that XXH3_hashLong is not inlined. Not sure + * why (uop cache maybe?), but the difference is large and easily measurable. + */ +XXH_FORCE_INLINE XXH64_hash_t +XXH3_hashLong_64b_withSeed_internal(const void* input, size_t len, + XXH64_hash_t seed, + XXH3_f_accumulate f_acc, + XXH3_f_scrambleAcc f_scramble, + XXH3_f_initCustomSecret f_initSec) +{ +#if XXH_SIZE_OPT <= 0 + if (seed == 0) + return XXH3_hashLong_64b_internal(input, len, + XXH3_kSecret, sizeof(XXH3_kSecret), + f_acc, f_scramble); +#endif + { XXH_ALIGN(XXH_SEC_ALIGN) xxh_u8 secret[XXH_SECRET_DEFAULT_SIZE]; + f_initSec(secret, seed); + return XXH3_hashLong_64b_internal(input, len, secret, sizeof(secret), + f_acc, f_scramble); + } +} + +/* + * It's important for performance that XXH3_hashLong is not inlined. + */ +XXH_NO_INLINE XXH64_hash_t +XXH3_hashLong_64b_withSeed(const void* XXH_RESTRICT input, size_t len, + XXH64_hash_t seed, const xxh_u8* XXH_RESTRICT secret, size_t secretLen) +{ + (void)secret; (void)secretLen; + return XXH3_hashLong_64b_withSeed_internal(input, len, seed, + XXH3_accumulate, XXH3_scrambleAcc, XXH3_initCustomSecret); +} + + +typedef XXH64_hash_t (*XXH3_hashLong64_f)(const void* XXH_RESTRICT, size_t, + XXH64_hash_t, const xxh_u8* XXH_RESTRICT, size_t); + +XXH_FORCE_INLINE XXH64_hash_t +XXH3_64bits_internal(const void* XXH_RESTRICT input, size_t len, + XXH64_hash_t seed64, const void* XXH_RESTRICT secret, size_t secretLen, + XXH3_hashLong64_f f_hashLong) +{ + XXH_ASSERT(secretLen >= XXH3_SECRET_SIZE_MIN); + /* + * If an action is to be taken if `secretLen` condition is not respected, + * it should be done here. + * For now, it's a contract pre-condition. + * Adding a check and a branch here would cost performance at every hash. + * Also, note that function signature doesn't offer room to return an error. + */ + if (len <= 16) + return XXH3_len_0to16_64b((const xxh_u8*)input, len, (const xxh_u8*)secret, seed64); + if (len <= 128) + return XXH3_len_17to128_64b((const xxh_u8*)input, len, (const xxh_u8*)secret, secretLen, seed64); + if (len <= XXH3_MIDSIZE_MAX) + return XXH3_len_129to240_64b((const xxh_u8*)input, len, (const xxh_u8*)secret, secretLen, seed64); + return f_hashLong(input, len, seed64, (const xxh_u8*)secret, secretLen); +} + + +/* === Public entry point === */ + +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API XXH64_hash_t XXH3_64bits(XXH_NOESCAPE const void* input, size_t length) +{ + return XXH3_64bits_internal(input, length, 0, XXH3_kSecret, sizeof(XXH3_kSecret), XXH3_hashLong_64b_default); +} + +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API XXH64_hash_t +XXH3_64bits_withSecret(XXH_NOESCAPE const void* input, size_t length, XXH_NOESCAPE const void* secret, size_t secretSize) +{ + return XXH3_64bits_internal(input, length, 0, secret, secretSize, XXH3_hashLong_64b_withSecret); +} + +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API XXH64_hash_t +XXH3_64bits_withSeed(XXH_NOESCAPE const void* input, size_t length, XXH64_hash_t seed) +{ + return XXH3_64bits_internal(input, length, seed, XXH3_kSecret, sizeof(XXH3_kSecret), XXH3_hashLong_64b_withSeed); +} + +XXH_PUBLIC_API XXH64_hash_t +XXH3_64bits_withSecretandSeed(XXH_NOESCAPE const void* input, size_t length, XXH_NOESCAPE const void* secret, size_t secretSize, XXH64_hash_t seed) +{ + if (length <= XXH3_MIDSIZE_MAX) + return XXH3_64bits_internal(input, length, seed, XXH3_kSecret, sizeof(XXH3_kSecret), NULL); + return XXH3_hashLong_64b_withSecret(input, length, seed, (const xxh_u8*)secret, secretSize); +} + + +/* === XXH3 streaming === */ +#ifndef XXH_NO_STREAM +/* + * Malloc's a pointer that is always aligned to align. + * + * This must be freed with `XXH_alignedFree()`. + * + * malloc typically guarantees 16 byte alignment on 64-bit systems and 8 byte + * alignment on 32-bit. This isn't enough for the 32 byte aligned loads in AVX2 + * or on 32-bit, the 16 byte aligned loads in SSE2 and NEON. + * + * This underalignment previously caused a rather obvious crash which went + * completely unnoticed due to XXH3_createState() not actually being tested. + * Credit to RedSpah for noticing this bug. + * + * The alignment is done manually: Functions like posix_memalign or _mm_malloc + * are avoided: To maintain portability, we would have to write a fallback + * like this anyways, and besides, testing for the existence of library + * functions without relying on external build tools is impossible. + * + * The method is simple: Overallocate, manually align, and store the offset + * to the original behind the returned pointer. + * + * Align must be a power of 2 and 8 <= align <= 128. + */ +static XXH_MALLOCF void* XXH_alignedMalloc(size_t s, size_t align) +{ + XXH_ASSERT(align <= 128 && align >= 8); /* range check */ + XXH_ASSERT((align & (align-1)) == 0); /* power of 2 */ + XXH_ASSERT(s != 0 && s < (s + align)); /* empty/overflow */ + { /* Overallocate to make room for manual realignment and an offset byte */ + xxh_u8* base = (xxh_u8*)XXH_malloc(s + align); + if (base != NULL) { + /* + * Get the offset needed to align this pointer. + * + * Even if the returned pointer is aligned, there will always be + * at least one byte to store the offset to the original pointer. + */ + size_t offset = align - ((size_t)base & (align - 1)); /* base % align */ + /* Add the offset for the now-aligned pointer */ + xxh_u8* ptr = base + offset; + + XXH_ASSERT((size_t)ptr % align == 0); + + /* Store the offset immediately before the returned pointer. */ + ptr[-1] = (xxh_u8)offset; + return ptr; + } + return NULL; + } +} +/* + * Frees an aligned pointer allocated by XXH_alignedMalloc(). Don't pass + * normal malloc'd pointers, XXH_alignedMalloc has a specific data layout. + */ +static void XXH_alignedFree(void* p) +{ + if (p != NULL) { + xxh_u8* ptr = (xxh_u8*)p; + /* Get the offset byte we added in XXH_malloc. */ + xxh_u8 offset = ptr[-1]; + /* Free the original malloc'd pointer */ + xxh_u8* base = ptr - offset; + XXH_free(base); + } +} +/*! @ingroup XXH3_family */ +/*! + * @brief Allocate an @ref XXH3_state_t. + * + * @return An allocated pointer of @ref XXH3_state_t on success. + * @return `NULL` on failure. + * + * @note Must be freed with XXH3_freeState(). + */ +XXH_PUBLIC_API XXH3_state_t* XXH3_createState(void) +{ + XXH3_state_t* const state = (XXH3_state_t*)XXH_alignedMalloc(sizeof(XXH3_state_t), 64); + if (state==NULL) return NULL; + XXH3_INITSTATE(state); + return state; +} + +/*! @ingroup XXH3_family */ +/*! + * @brief Frees an @ref XXH3_state_t. + * + * @param statePtr A pointer to an @ref XXH3_state_t allocated with @ref XXH3_createState(). + * + * @return @ref XXH_OK. + * + * @note Must be allocated with XXH3_createState(). + */ +XXH_PUBLIC_API XXH_errorcode XXH3_freeState(XXH3_state_t* statePtr) +{ + XXH_alignedFree(statePtr); + return XXH_OK; +} + +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API void +XXH3_copyState(XXH_NOESCAPE XXH3_state_t* dst_state, XXH_NOESCAPE const XXH3_state_t* src_state) +{ + XXH_memcpy(dst_state, src_state, sizeof(*dst_state)); +} + +static void +XXH3_reset_internal(XXH3_state_t* statePtr, + XXH64_hash_t seed, + const void* secret, size_t secretSize) +{ + size_t const initStart = offsetof(XXH3_state_t, bufferedSize); + size_t const initLength = offsetof(XXH3_state_t, nbStripesPerBlock) - initStart; + XXH_ASSERT(offsetof(XXH3_state_t, nbStripesPerBlock) > initStart); + XXH_ASSERT(statePtr != NULL); + /* set members from bufferedSize to nbStripesPerBlock (excluded) to 0 */ + memset((char*)statePtr + initStart, 0, initLength); + statePtr->acc[0] = XXH_PRIME32_3; + statePtr->acc[1] = XXH_PRIME64_1; + statePtr->acc[2] = XXH_PRIME64_2; + statePtr->acc[3] = XXH_PRIME64_3; + statePtr->acc[4] = XXH_PRIME64_4; + statePtr->acc[5] = XXH_PRIME32_2; + statePtr->acc[6] = XXH_PRIME64_5; + statePtr->acc[7] = XXH_PRIME32_1; + statePtr->seed = seed; + statePtr->useSeed = (seed != 0); + statePtr->extSecret = (const unsigned char*)secret; + XXH_ASSERT(secretSize >= XXH3_SECRET_SIZE_MIN); + statePtr->secretLimit = secretSize - XXH_STRIPE_LEN; + statePtr->nbStripesPerBlock = statePtr->secretLimit / XXH_SECRET_CONSUME_RATE; +} + +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API XXH_errorcode +XXH3_64bits_reset(XXH_NOESCAPE XXH3_state_t* statePtr) +{ + if (statePtr == NULL) return XXH_ERROR; + XXH3_reset_internal(statePtr, 0, XXH3_kSecret, XXH_SECRET_DEFAULT_SIZE); + return XXH_OK; +} + +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API XXH_errorcode +XXH3_64bits_reset_withSecret(XXH_NOESCAPE XXH3_state_t* statePtr, XXH_NOESCAPE const void* secret, size_t secretSize) +{ + if (statePtr == NULL) return XXH_ERROR; + XXH3_reset_internal(statePtr, 0, secret, secretSize); + if (secret == NULL) return XXH_ERROR; + if (secretSize < XXH3_SECRET_SIZE_MIN) return XXH_ERROR; + return XXH_OK; +} + +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API XXH_errorcode +XXH3_64bits_reset_withSeed(XXH_NOESCAPE XXH3_state_t* statePtr, XXH64_hash_t seed) +{ + if (statePtr == NULL) return XXH_ERROR; + if (seed==0) return XXH3_64bits_reset(statePtr); + if ((seed != statePtr->seed) || (statePtr->extSecret != NULL)) + XXH3_initCustomSecret(statePtr->customSecret, seed); + XXH3_reset_internal(statePtr, seed, NULL, XXH_SECRET_DEFAULT_SIZE); + return XXH_OK; +} + +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API XXH_errorcode +XXH3_64bits_reset_withSecretandSeed(XXH_NOESCAPE XXH3_state_t* statePtr, XXH_NOESCAPE const void* secret, size_t secretSize, XXH64_hash_t seed64) +{ + if (statePtr == NULL) return XXH_ERROR; + if (secret == NULL) return XXH_ERROR; + if (secretSize < XXH3_SECRET_SIZE_MIN) return XXH_ERROR; + XXH3_reset_internal(statePtr, seed64, secret, secretSize); + statePtr->useSeed = 1; /* always, even if seed64==0 */ + return XXH_OK; +} + +/*! + * @internal + * @brief Processes a large input for XXH3_update() and XXH3_digest_long(). + * + * Unlike XXH3_hashLong_internal_loop(), this can process data that overlaps a block. + * + * @param acc Pointer to the 8 accumulator lanes + * @param nbStripesSoFarPtr In/out pointer to the number of leftover stripes in the block* + * @param nbStripesPerBlock Number of stripes in a block + * @param input Input pointer + * @param nbStripes Number of stripes to process + * @param secret Secret pointer + * @param secretLimit Offset of the last block in @p secret + * @param f_acc Pointer to an XXH3_accumulate implementation + * @param f_scramble Pointer to an XXH3_scrambleAcc implementation + * @return Pointer past the end of @p input after processing + */ +XXH_FORCE_INLINE const xxh_u8 * +XXH3_consumeStripes(xxh_u64* XXH_RESTRICT acc, + size_t* XXH_RESTRICT nbStripesSoFarPtr, size_t nbStripesPerBlock, + const xxh_u8* XXH_RESTRICT input, size_t nbStripes, + const xxh_u8* XXH_RESTRICT secret, size_t secretLimit, + XXH3_f_accumulate f_acc, + XXH3_f_scrambleAcc f_scramble) +{ + const xxh_u8* initialSecret = secret + *nbStripesSoFarPtr * XXH_SECRET_CONSUME_RATE; + /* Process full blocks */ + if (nbStripes >= (nbStripesPerBlock - *nbStripesSoFarPtr)) { + /* Process the initial partial block... */ + size_t nbStripesThisIter = nbStripesPerBlock - *nbStripesSoFarPtr; + + do { + /* Accumulate and scramble */ + f_acc(acc, input, initialSecret, nbStripesThisIter); + f_scramble(acc, secret + secretLimit); + input += nbStripesThisIter * XXH_STRIPE_LEN; + nbStripes -= nbStripesThisIter; + /* Then continue the loop with the full block size */ + nbStripesThisIter = nbStripesPerBlock; + initialSecret = secret; + } while (nbStripes >= nbStripesPerBlock); + *nbStripesSoFarPtr = 0; + } + /* Process a partial block */ + if (nbStripes > 0) { + f_acc(acc, input, initialSecret, nbStripes); + input += nbStripes * XXH_STRIPE_LEN; + *nbStripesSoFarPtr += nbStripes; + } + /* Return end pointer */ + return input; +} + +#ifndef XXH3_STREAM_USE_STACK +# if XXH_SIZE_OPT <= 0 && !defined(__clang__) /* clang doesn't need additional stack space */ +# define XXH3_STREAM_USE_STACK 1 +# endif +#endif +/* + * Both XXH3_64bits_update and XXH3_128bits_update use this routine. + */ +XXH_FORCE_INLINE XXH_errorcode +XXH3_update(XXH3_state_t* XXH_RESTRICT const state, + const xxh_u8* XXH_RESTRICT input, size_t len, + XXH3_f_accumulate f_acc, + XXH3_f_scrambleAcc f_scramble) +{ + if (input==NULL) { + XXH_ASSERT(len == 0); + return XXH_OK; + } + + XXH_ASSERT(state != NULL); + { const xxh_u8* const bEnd = input + len; + const unsigned char* const secret = (state->extSecret == NULL) ? state->customSecret : state->extSecret; +#if defined(XXH3_STREAM_USE_STACK) && XXH3_STREAM_USE_STACK >= 1 + /* For some reason, gcc and MSVC seem to suffer greatly + * when operating accumulators directly into state. + * Operating into stack space seems to enable proper optimization. + * clang, on the other hand, doesn't seem to need this trick */ + XXH_ALIGN(XXH_ACC_ALIGN) xxh_u64 acc[8]; + XXH_memcpy(acc, state->acc, sizeof(acc)); +#else + xxh_u64* XXH_RESTRICT const acc = state->acc; +#endif + state->totalLen += len; + XXH_ASSERT(state->bufferedSize <= XXH3_INTERNALBUFFER_SIZE); + + /* small input : just fill in tmp buffer */ + if (len <= XXH3_INTERNALBUFFER_SIZE - state->bufferedSize) { + XXH_memcpy(state->buffer + state->bufferedSize, input, len); + state->bufferedSize += (XXH32_hash_t)len; + return XXH_OK; + } + + /* total input is now > XXH3_INTERNALBUFFER_SIZE */ + #define XXH3_INTERNALBUFFER_STRIPES (XXH3_INTERNALBUFFER_SIZE / XXH_STRIPE_LEN) + XXH_STATIC_ASSERT(XXH3_INTERNALBUFFER_SIZE % XXH_STRIPE_LEN == 0); /* clean multiple */ + + /* + * Internal buffer is partially filled (always, except at beginning) + * Complete it, then consume it. + */ + if (state->bufferedSize) { + size_t const loadSize = XXH3_INTERNALBUFFER_SIZE - state->bufferedSize; + XXH_memcpy(state->buffer + state->bufferedSize, input, loadSize); + input += loadSize; + XXH3_consumeStripes(acc, + &state->nbStripesSoFar, state->nbStripesPerBlock, + state->buffer, XXH3_INTERNALBUFFER_STRIPES, + secret, state->secretLimit, + f_acc, f_scramble); + state->bufferedSize = 0; + } + XXH_ASSERT(input < bEnd); + if (bEnd - input > XXH3_INTERNALBUFFER_SIZE) { + size_t nbStripes = (size_t)(bEnd - 1 - input) / XXH_STRIPE_LEN; + input = XXH3_consumeStripes(acc, + &state->nbStripesSoFar, state->nbStripesPerBlock, + input, nbStripes, + secret, state->secretLimit, + f_acc, f_scramble); + XXH_memcpy(state->buffer + sizeof(state->buffer) - XXH_STRIPE_LEN, input - XXH_STRIPE_LEN, XXH_STRIPE_LEN); + + } + /* Some remaining input (always) : buffer it */ + XXH_ASSERT(input < bEnd); + XXH_ASSERT(bEnd - input <= XXH3_INTERNALBUFFER_SIZE); + XXH_ASSERT(state->bufferedSize == 0); + XXH_memcpy(state->buffer, input, (size_t)(bEnd-input)); + state->bufferedSize = (XXH32_hash_t)(bEnd-input); +#if defined(XXH3_STREAM_USE_STACK) && XXH3_STREAM_USE_STACK >= 1 + /* save stack accumulators into state */ + XXH_memcpy(state->acc, acc, sizeof(acc)); +#endif + } + + return XXH_OK; +} + +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API XXH_errorcode +XXH3_64bits_update(XXH_NOESCAPE XXH3_state_t* state, XXH_NOESCAPE const void* input, size_t len) +{ + return XXH3_update(state, (const xxh_u8*)input, len, + XXH3_accumulate, XXH3_scrambleAcc); +} + + +XXH_FORCE_INLINE void +XXH3_digest_long (XXH64_hash_t* acc, + const XXH3_state_t* state, + const unsigned char* secret) +{ + xxh_u8 lastStripe[XXH_STRIPE_LEN]; + const xxh_u8* lastStripePtr; + + /* + * Digest on a local copy. This way, the state remains unaltered, and it can + * continue ingesting more input afterwards. + */ + XXH_memcpy(acc, state->acc, sizeof(state->acc)); + if (state->bufferedSize >= XXH_STRIPE_LEN) { + /* Consume remaining stripes then point to remaining data in buffer */ + size_t const nbStripes = (state->bufferedSize - 1) / XXH_STRIPE_LEN; + size_t nbStripesSoFar = state->nbStripesSoFar; + XXH3_consumeStripes(acc, + &nbStripesSoFar, state->nbStripesPerBlock, + state->buffer, nbStripes, + secret, state->secretLimit, + XXH3_accumulate, XXH3_scrambleAcc); + lastStripePtr = state->buffer + state->bufferedSize - XXH_STRIPE_LEN; + } else { /* bufferedSize < XXH_STRIPE_LEN */ + /* Copy to temp buffer */ + size_t const catchupSize = XXH_STRIPE_LEN - state->bufferedSize; + XXH_ASSERT(state->bufferedSize > 0); /* there is always some input buffered */ + XXH_memcpy(lastStripe, state->buffer + sizeof(state->buffer) - catchupSize, catchupSize); + XXH_memcpy(lastStripe + catchupSize, state->buffer, state->bufferedSize); + lastStripePtr = lastStripe; + } + /* Last stripe */ + XXH3_accumulate_512(acc, + lastStripePtr, + secret + state->secretLimit - XXH_SECRET_LASTACC_START); +} + +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API XXH64_hash_t XXH3_64bits_digest (XXH_NOESCAPE const XXH3_state_t* state) +{ + const unsigned char* const secret = (state->extSecret == NULL) ? state->customSecret : state->extSecret; + if (state->totalLen > XXH3_MIDSIZE_MAX) { + XXH_ALIGN(XXH_ACC_ALIGN) XXH64_hash_t acc[XXH_ACC_NB]; + XXH3_digest_long(acc, state, secret); + return XXH3_mergeAccs(acc, + secret + XXH_SECRET_MERGEACCS_START, + (xxh_u64)state->totalLen * XXH_PRIME64_1); + } + /* totalLen <= XXH3_MIDSIZE_MAX: digesting a short input */ + if (state->useSeed) + return XXH3_64bits_withSeed(state->buffer, (size_t)state->totalLen, state->seed); + return XXH3_64bits_withSecret(state->buffer, (size_t)(state->totalLen), + secret, state->secretLimit + XXH_STRIPE_LEN); +} +#endif /* !XXH_NO_STREAM */ + + +/* ========================================== + * XXH3 128 bits (a.k.a XXH128) + * ========================================== + * XXH3's 128-bit variant has better mixing and strength than the 64-bit variant, + * even without counting the significantly larger output size. + * + * For example, extra steps are taken to avoid the seed-dependent collisions + * in 17-240 byte inputs (See XXH3_mix16B and XXH128_mix32B). + * + * This strength naturally comes at the cost of some speed, especially on short + * lengths. Note that longer hashes are about as fast as the 64-bit version + * due to it using only a slight modification of the 64-bit loop. + * + * XXH128 is also more oriented towards 64-bit machines. It is still extremely + * fast for a _128-bit_ hash on 32-bit (it usually clears XXH64). + */ + +XXH_FORCE_INLINE XXH_PUREF XXH128_hash_t +XXH3_len_1to3_128b(const xxh_u8* input, size_t len, const xxh_u8* secret, XXH64_hash_t seed) +{ + /* A doubled version of 1to3_64b with different constants. */ + XXH_ASSERT(input != NULL); + XXH_ASSERT(1 <= len && len <= 3); + XXH_ASSERT(secret != NULL); + /* + * len = 1: combinedl = { input[0], 0x01, input[0], input[0] } + * len = 2: combinedl = { input[1], 0x02, input[0], input[1] } + * len = 3: combinedl = { input[2], 0x03, input[0], input[1] } + */ + { xxh_u8 const c1 = input[0]; + xxh_u8 const c2 = input[len >> 1]; + xxh_u8 const c3 = input[len - 1]; + xxh_u32 const combinedl = ((xxh_u32)c1 <<16) | ((xxh_u32)c2 << 24) + | ((xxh_u32)c3 << 0) | ((xxh_u32)len << 8); + xxh_u32 const combinedh = XXH_rotl32(XXH_swap32(combinedl), 13); + xxh_u64 const bitflipl = (XXH_readLE32(secret) ^ XXH_readLE32(secret+4)) + seed; + xxh_u64 const bitfliph = (XXH_readLE32(secret+8) ^ XXH_readLE32(secret+12)) - seed; + xxh_u64 const keyed_lo = (xxh_u64)combinedl ^ bitflipl; + xxh_u64 const keyed_hi = (xxh_u64)combinedh ^ bitfliph; + XXH128_hash_t h128; + h128.low64 = XXH64_avalanche(keyed_lo); + h128.high64 = XXH64_avalanche(keyed_hi); + return h128; + } +} + +XXH_FORCE_INLINE XXH_PUREF XXH128_hash_t +XXH3_len_4to8_128b(const xxh_u8* input, size_t len, const xxh_u8* secret, XXH64_hash_t seed) +{ + XXH_ASSERT(input != NULL); + XXH_ASSERT(secret != NULL); + XXH_ASSERT(4 <= len && len <= 8); + seed ^= (xxh_u64)XXH_swap32((xxh_u32)seed) << 32; + { xxh_u32 const input_lo = XXH_readLE32(input); + xxh_u32 const input_hi = XXH_readLE32(input + len - 4); + xxh_u64 const input_64 = input_lo + ((xxh_u64)input_hi << 32); + xxh_u64 const bitflip = (XXH_readLE64(secret+16) ^ XXH_readLE64(secret+24)) + seed; + xxh_u64 const keyed = input_64 ^ bitflip; + + /* Shift len to the left to ensure it is even, this avoids even multiplies. */ + XXH128_hash_t m128 = XXH_mult64to128(keyed, XXH_PRIME64_1 + (len << 2)); + + m128.high64 += (m128.low64 << 1); + m128.low64 ^= (m128.high64 >> 3); + + m128.low64 = XXH_xorshift64(m128.low64, 35); + m128.low64 *= PRIME_MX2; + m128.low64 = XXH_xorshift64(m128.low64, 28); + m128.high64 = XXH3_avalanche(m128.high64); + return m128; + } +} + +XXH_FORCE_INLINE XXH_PUREF XXH128_hash_t +XXH3_len_9to16_128b(const xxh_u8* input, size_t len, const xxh_u8* secret, XXH64_hash_t seed) +{ + XXH_ASSERT(input != NULL); + XXH_ASSERT(secret != NULL); + XXH_ASSERT(9 <= len && len <= 16); + { xxh_u64 const bitflipl = (XXH_readLE64(secret+32) ^ XXH_readLE64(secret+40)) - seed; + xxh_u64 const bitfliph = (XXH_readLE64(secret+48) ^ XXH_readLE64(secret+56)) + seed; + xxh_u64 const input_lo = XXH_readLE64(input); + xxh_u64 input_hi = XXH_readLE64(input + len - 8); + XXH128_hash_t m128 = XXH_mult64to128(input_lo ^ input_hi ^ bitflipl, XXH_PRIME64_1); + /* + * Put len in the middle of m128 to ensure that the length gets mixed to + * both the low and high bits in the 128x64 multiply below. + */ + m128.low64 += (xxh_u64)(len - 1) << 54; + input_hi ^= bitfliph; + /* + * Add the high 32 bits of input_hi to the high 32 bits of m128, then + * add the long product of the low 32 bits of input_hi and XXH_PRIME32_2 to + * the high 64 bits of m128. + * + * The best approach to this operation is different on 32-bit and 64-bit. + */ + if (sizeof(void *) < sizeof(xxh_u64)) { /* 32-bit */ + /* + * 32-bit optimized version, which is more readable. + * + * On 32-bit, it removes an ADC and delays a dependency between the two + * halves of m128.high64, but it generates an extra mask on 64-bit. + */ + m128.high64 += (input_hi & 0xFFFFFFFF00000000ULL) + XXH_mult32to64((xxh_u32)input_hi, XXH_PRIME32_2); + } else { + /* + * 64-bit optimized (albeit more confusing) version. + * + * Uses some properties of addition and multiplication to remove the mask: + * + * Let: + * a = input_hi.lo = (input_hi & 0x00000000FFFFFFFF) + * b = input_hi.hi = (input_hi & 0xFFFFFFFF00000000) + * c = XXH_PRIME32_2 + * + * a + (b * c) + * Inverse Property: x + y - x == y + * a + (b * (1 + c - 1)) + * Distributive Property: x * (y + z) == (x * y) + (x * z) + * a + (b * 1) + (b * (c - 1)) + * Identity Property: x * 1 == x + * a + b + (b * (c - 1)) + * + * Substitute a, b, and c: + * input_hi.hi + input_hi.lo + ((xxh_u64)input_hi.lo * (XXH_PRIME32_2 - 1)) + * + * Since input_hi.hi + input_hi.lo == input_hi, we get this: + * input_hi + ((xxh_u64)input_hi.lo * (XXH_PRIME32_2 - 1)) + */ + m128.high64 += input_hi + XXH_mult32to64((xxh_u32)input_hi, XXH_PRIME32_2 - 1); + } + /* m128 ^= XXH_swap64(m128 >> 64); */ + m128.low64 ^= XXH_swap64(m128.high64); + + { /* 128x64 multiply: h128 = m128 * XXH_PRIME64_2; */ + XXH128_hash_t h128 = XXH_mult64to128(m128.low64, XXH_PRIME64_2); + h128.high64 += m128.high64 * XXH_PRIME64_2; + + h128.low64 = XXH3_avalanche(h128.low64); + h128.high64 = XXH3_avalanche(h128.high64); + return h128; + } } +} + +/* + * Assumption: `secret` size is >= XXH3_SECRET_SIZE_MIN + */ +XXH_FORCE_INLINE XXH_PUREF XXH128_hash_t +XXH3_len_0to16_128b(const xxh_u8* input, size_t len, const xxh_u8* secret, XXH64_hash_t seed) +{ + XXH_ASSERT(len <= 16); + { if (len > 8) return XXH3_len_9to16_128b(input, len, secret, seed); + if (len >= 4) return XXH3_len_4to8_128b(input, len, secret, seed); + if (len) return XXH3_len_1to3_128b(input, len, secret, seed); + { XXH128_hash_t h128; + xxh_u64 const bitflipl = XXH_readLE64(secret+64) ^ XXH_readLE64(secret+72); + xxh_u64 const bitfliph = XXH_readLE64(secret+80) ^ XXH_readLE64(secret+88); + h128.low64 = XXH64_avalanche(seed ^ bitflipl); + h128.high64 = XXH64_avalanche( seed ^ bitfliph); + return h128; + } } +} + +/* + * A bit slower than XXH3_mix16B, but handles multiply by zero better. + */ +XXH_FORCE_INLINE XXH128_hash_t +XXH128_mix32B(XXH128_hash_t acc, const xxh_u8* input_1, const xxh_u8* input_2, + const xxh_u8* secret, XXH64_hash_t seed) +{ + acc.low64 += XXH3_mix16B (input_1, secret+0, seed); + acc.low64 ^= XXH_readLE64(input_2) + XXH_readLE64(input_2 + 8); + acc.high64 += XXH3_mix16B (input_2, secret+16, seed); + acc.high64 ^= XXH_readLE64(input_1) + XXH_readLE64(input_1 + 8); + return acc; +} + + +XXH_FORCE_INLINE XXH_PUREF XXH128_hash_t +XXH3_len_17to128_128b(const xxh_u8* XXH_RESTRICT input, size_t len, + const xxh_u8* XXH_RESTRICT secret, size_t secretSize, + XXH64_hash_t seed) +{ + XXH_ASSERT(secretSize >= XXH3_SECRET_SIZE_MIN); (void)secretSize; + XXH_ASSERT(16 < len && len <= 128); + + { XXH128_hash_t acc; + acc.low64 = len * XXH_PRIME64_1; + acc.high64 = 0; + +#if XXH_SIZE_OPT >= 1 + { + /* Smaller, but slightly slower. */ + unsigned int i = (unsigned int)(len - 1) / 32; + do { + acc = XXH128_mix32B(acc, input+16*i, input+len-16*(i+1), secret+32*i, seed); + } while (i-- != 0); + } +#else + if (len > 32) { + if (len > 64) { + if (len > 96) { + acc = XXH128_mix32B(acc, input+48, input+len-64, secret+96, seed); + } + acc = XXH128_mix32B(acc, input+32, input+len-48, secret+64, seed); + } + acc = XXH128_mix32B(acc, input+16, input+len-32, secret+32, seed); + } + acc = XXH128_mix32B(acc, input, input+len-16, secret, seed); +#endif + { XXH128_hash_t h128; + h128.low64 = acc.low64 + acc.high64; + h128.high64 = (acc.low64 * XXH_PRIME64_1) + + (acc.high64 * XXH_PRIME64_4) + + ((len - seed) * XXH_PRIME64_2); + h128.low64 = XXH3_avalanche(h128.low64); + h128.high64 = (XXH64_hash_t)0 - XXH3_avalanche(h128.high64); + return h128; + } + } +} + +XXH_NO_INLINE XXH_PUREF XXH128_hash_t +XXH3_len_129to240_128b(const xxh_u8* XXH_RESTRICT input, size_t len, + const xxh_u8* XXH_RESTRICT secret, size_t secretSize, + XXH64_hash_t seed) +{ + XXH_ASSERT(secretSize >= XXH3_SECRET_SIZE_MIN); (void)secretSize; + XXH_ASSERT(128 < len && len <= XXH3_MIDSIZE_MAX); + + { XXH128_hash_t acc; + unsigned i; + acc.low64 = len * XXH_PRIME64_1; + acc.high64 = 0; + /* + * We set as `i` as offset + 32. We do this so that unchanged + * `len` can be used as upper bound. This reaches a sweet spot + * where both x86 and aarch64 get simple agen and good codegen + * for the loop. + */ + for (i = 32; i < 160; i += 32) { + acc = XXH128_mix32B(acc, + input + i - 32, + input + i - 16, + secret + i - 32, + seed); + } + acc.low64 = XXH3_avalanche(acc.low64); + acc.high64 = XXH3_avalanche(acc.high64); + /* + * NB: `i <= len` will duplicate the last 32-bytes if + * len % 32 was zero. This is an unfortunate necessity to keep + * the hash result stable. + */ + for (i=160; i <= len; i += 32) { + acc = XXH128_mix32B(acc, + input + i - 32, + input + i - 16, + secret + XXH3_MIDSIZE_STARTOFFSET + i - 160, + seed); + } + /* last bytes */ + acc = XXH128_mix32B(acc, + input + len - 16, + input + len - 32, + secret + XXH3_SECRET_SIZE_MIN - XXH3_MIDSIZE_LASTOFFSET - 16, + (XXH64_hash_t)0 - seed); + + { XXH128_hash_t h128; + h128.low64 = acc.low64 + acc.high64; + h128.high64 = (acc.low64 * XXH_PRIME64_1) + + (acc.high64 * XXH_PRIME64_4) + + ((len - seed) * XXH_PRIME64_2); + h128.low64 = XXH3_avalanche(h128.low64); + h128.high64 = (XXH64_hash_t)0 - XXH3_avalanche(h128.high64); + return h128; + } + } +} + +XXH_FORCE_INLINE XXH128_hash_t +XXH3_hashLong_128b_internal(const void* XXH_RESTRICT input, size_t len, + const xxh_u8* XXH_RESTRICT secret, size_t secretSize, + XXH3_f_accumulate f_acc, + XXH3_f_scrambleAcc f_scramble) +{ + XXH_ALIGN(XXH_ACC_ALIGN) xxh_u64 acc[XXH_ACC_NB] = XXH3_INIT_ACC; + + XXH3_hashLong_internal_loop(acc, (const xxh_u8*)input, len, secret, secretSize, f_acc, f_scramble); + + /* converge into final hash */ + XXH_STATIC_ASSERT(sizeof(acc) == 64); + XXH_ASSERT(secretSize >= sizeof(acc) + XXH_SECRET_MERGEACCS_START); + { XXH128_hash_t h128; + h128.low64 = XXH3_mergeAccs(acc, + secret + XXH_SECRET_MERGEACCS_START, + (xxh_u64)len * XXH_PRIME64_1); + h128.high64 = XXH3_mergeAccs(acc, + secret + secretSize + - sizeof(acc) - XXH_SECRET_MERGEACCS_START, + ~((xxh_u64)len * XXH_PRIME64_2)); + return h128; + } +} + +/* + * It's important for performance that XXH3_hashLong() is not inlined. + */ +XXH_NO_INLINE XXH_PUREF XXH128_hash_t +XXH3_hashLong_128b_default(const void* XXH_RESTRICT input, size_t len, + XXH64_hash_t seed64, + const void* XXH_RESTRICT secret, size_t secretLen) +{ + (void)seed64; (void)secret; (void)secretLen; + return XXH3_hashLong_128b_internal(input, len, XXH3_kSecret, sizeof(XXH3_kSecret), + XXH3_accumulate, XXH3_scrambleAcc); +} + +/* + * It's important for performance to pass @p secretLen (when it's static) + * to the compiler, so that it can properly optimize the vectorized loop. + * + * When the secret size is unknown, or on GCC 12 where the mix of NO_INLINE and FORCE_INLINE + * breaks -Og, this is XXH_NO_INLINE. + */ +XXH3_WITH_SECRET_INLINE XXH128_hash_t +XXH3_hashLong_128b_withSecret(const void* XXH_RESTRICT input, size_t len, + XXH64_hash_t seed64, + const void* XXH_RESTRICT secret, size_t secretLen) +{ + (void)seed64; + return XXH3_hashLong_128b_internal(input, len, (const xxh_u8*)secret, secretLen, + XXH3_accumulate, XXH3_scrambleAcc); +} + +XXH_FORCE_INLINE XXH128_hash_t +XXH3_hashLong_128b_withSeed_internal(const void* XXH_RESTRICT input, size_t len, + XXH64_hash_t seed64, + XXH3_f_accumulate f_acc, + XXH3_f_scrambleAcc f_scramble, + XXH3_f_initCustomSecret f_initSec) +{ + if (seed64 == 0) + return XXH3_hashLong_128b_internal(input, len, + XXH3_kSecret, sizeof(XXH3_kSecret), + f_acc, f_scramble); + { XXH_ALIGN(XXH_SEC_ALIGN) xxh_u8 secret[XXH_SECRET_DEFAULT_SIZE]; + f_initSec(secret, seed64); + return XXH3_hashLong_128b_internal(input, len, (const xxh_u8*)secret, sizeof(secret), + f_acc, f_scramble); + } +} + +/* + * It's important for performance that XXH3_hashLong is not inlined. + */ +XXH_NO_INLINE XXH128_hash_t +XXH3_hashLong_128b_withSeed(const void* input, size_t len, + XXH64_hash_t seed64, const void* XXH_RESTRICT secret, size_t secretLen) +{ + (void)secret; (void)secretLen; + return XXH3_hashLong_128b_withSeed_internal(input, len, seed64, + XXH3_accumulate, XXH3_scrambleAcc, XXH3_initCustomSecret); +} + +typedef XXH128_hash_t (*XXH3_hashLong128_f)(const void* XXH_RESTRICT, size_t, + XXH64_hash_t, const void* XXH_RESTRICT, size_t); + +XXH_FORCE_INLINE XXH128_hash_t +XXH3_128bits_internal(const void* input, size_t len, + XXH64_hash_t seed64, const void* XXH_RESTRICT secret, size_t secretLen, + XXH3_hashLong128_f f_hl128) +{ + XXH_ASSERT(secretLen >= XXH3_SECRET_SIZE_MIN); + /* + * If an action is to be taken if `secret` conditions are not respected, + * it should be done here. + * For now, it's a contract pre-condition. + * Adding a check and a branch here would cost performance at every hash. + */ + if (len <= 16) + return XXH3_len_0to16_128b((const xxh_u8*)input, len, (const xxh_u8*)secret, seed64); + if (len <= 128) + return XXH3_len_17to128_128b((const xxh_u8*)input, len, (const xxh_u8*)secret, secretLen, seed64); + if (len <= XXH3_MIDSIZE_MAX) + return XXH3_len_129to240_128b((const xxh_u8*)input, len, (const xxh_u8*)secret, secretLen, seed64); + return f_hl128(input, len, seed64, secret, secretLen); +} + + +/* === Public XXH128 API === */ + +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API XXH128_hash_t XXH3_128bits(XXH_NOESCAPE const void* input, size_t len) +{ + return XXH3_128bits_internal(input, len, 0, + XXH3_kSecret, sizeof(XXH3_kSecret), + XXH3_hashLong_128b_default); +} + +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API XXH128_hash_t +XXH3_128bits_withSecret(XXH_NOESCAPE const void* input, size_t len, XXH_NOESCAPE const void* secret, size_t secretSize) +{ + return XXH3_128bits_internal(input, len, 0, + (const xxh_u8*)secret, secretSize, + XXH3_hashLong_128b_withSecret); +} + +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API XXH128_hash_t +XXH3_128bits_withSeed(XXH_NOESCAPE const void* input, size_t len, XXH64_hash_t seed) +{ + return XXH3_128bits_internal(input, len, seed, + XXH3_kSecret, sizeof(XXH3_kSecret), + XXH3_hashLong_128b_withSeed); +} + +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API XXH128_hash_t +XXH3_128bits_withSecretandSeed(XXH_NOESCAPE const void* input, size_t len, XXH_NOESCAPE const void* secret, size_t secretSize, XXH64_hash_t seed) +{ + if (len <= XXH3_MIDSIZE_MAX) + return XXH3_128bits_internal(input, len, seed, XXH3_kSecret, sizeof(XXH3_kSecret), NULL); + return XXH3_hashLong_128b_withSecret(input, len, seed, secret, secretSize); +} + +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API XXH128_hash_t +XXH128(XXH_NOESCAPE const void* input, size_t len, XXH64_hash_t seed) +{ + return XXH3_128bits_withSeed(input, len, seed); +} + + +/* === XXH3 128-bit streaming === */ +#ifndef XXH_NO_STREAM +/* + * All initialization and update functions are identical to 64-bit streaming variant. + * The only difference is the finalization routine. + */ + +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API XXH_errorcode +XXH3_128bits_reset(XXH_NOESCAPE XXH3_state_t* statePtr) +{ + return XXH3_64bits_reset(statePtr); +} + +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API XXH_errorcode +XXH3_128bits_reset_withSecret(XXH_NOESCAPE XXH3_state_t* statePtr, XXH_NOESCAPE const void* secret, size_t secretSize) +{ + return XXH3_64bits_reset_withSecret(statePtr, secret, secretSize); +} + +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API XXH_errorcode +XXH3_128bits_reset_withSeed(XXH_NOESCAPE XXH3_state_t* statePtr, XXH64_hash_t seed) +{ + return XXH3_64bits_reset_withSeed(statePtr, seed); +} + +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API XXH_errorcode +XXH3_128bits_reset_withSecretandSeed(XXH_NOESCAPE XXH3_state_t* statePtr, XXH_NOESCAPE const void* secret, size_t secretSize, XXH64_hash_t seed) +{ + return XXH3_64bits_reset_withSecretandSeed(statePtr, secret, secretSize, seed); +} + +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API XXH_errorcode +XXH3_128bits_update(XXH_NOESCAPE XXH3_state_t* state, XXH_NOESCAPE const void* input, size_t len) +{ + return XXH3_64bits_update(state, input, len); +} + +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API XXH128_hash_t XXH3_128bits_digest (XXH_NOESCAPE const XXH3_state_t* state) +{ + const unsigned char* const secret = (state->extSecret == NULL) ? state->customSecret : state->extSecret; + if (state->totalLen > XXH3_MIDSIZE_MAX) { + XXH_ALIGN(XXH_ACC_ALIGN) XXH64_hash_t acc[XXH_ACC_NB]; + XXH3_digest_long(acc, state, secret); + XXH_ASSERT(state->secretLimit + XXH_STRIPE_LEN >= sizeof(acc) + XXH_SECRET_MERGEACCS_START); + { XXH128_hash_t h128; + h128.low64 = XXH3_mergeAccs(acc, + secret + XXH_SECRET_MERGEACCS_START, + (xxh_u64)state->totalLen * XXH_PRIME64_1); + h128.high64 = XXH3_mergeAccs(acc, + secret + state->secretLimit + XXH_STRIPE_LEN + - sizeof(acc) - XXH_SECRET_MERGEACCS_START, + ~((xxh_u64)state->totalLen * XXH_PRIME64_2)); + return h128; + } + } + /* len <= XXH3_MIDSIZE_MAX : short code */ + if (state->seed) + return XXH3_128bits_withSeed(state->buffer, (size_t)state->totalLen, state->seed); + return XXH3_128bits_withSecret(state->buffer, (size_t)(state->totalLen), + secret, state->secretLimit + XXH_STRIPE_LEN); +} +#endif /* !XXH_NO_STREAM */ +/* 128-bit utility functions */ + +#include /* memcmp, memcpy */ + +/* return : 1 is equal, 0 if different */ +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API int XXH128_isEqual(XXH128_hash_t h1, XXH128_hash_t h2) +{ + /* note : XXH128_hash_t is compact, it has no padding byte */ + return !(memcmp(&h1, &h2, sizeof(h1))); +} + +/* This prototype is compatible with stdlib's qsort(). + * @return : >0 if *h128_1 > *h128_2 + * <0 if *h128_1 < *h128_2 + * =0 if *h128_1 == *h128_2 */ +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API int XXH128_cmp(XXH_NOESCAPE const void* h128_1, XXH_NOESCAPE const void* h128_2) +{ + XXH128_hash_t const h1 = *(const XXH128_hash_t*)h128_1; + XXH128_hash_t const h2 = *(const XXH128_hash_t*)h128_2; + int const hcmp = (h1.high64 > h2.high64) - (h2.high64 > h1.high64); + /* note : bets that, in most cases, hash values are different */ + if (hcmp) return hcmp; + return (h1.low64 > h2.low64) - (h2.low64 > h1.low64); +} + + +/*====== Canonical representation ======*/ +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API void +XXH128_canonicalFromHash(XXH_NOESCAPE XXH128_canonical_t* dst, XXH128_hash_t hash) +{ + XXH_STATIC_ASSERT(sizeof(XXH128_canonical_t) == sizeof(XXH128_hash_t)); + if (XXH_CPU_LITTLE_ENDIAN) { + hash.high64 = XXH_swap64(hash.high64); + hash.low64 = XXH_swap64(hash.low64); + } + XXH_memcpy(dst, &hash.high64, sizeof(hash.high64)); + XXH_memcpy((char*)dst + sizeof(hash.high64), &hash.low64, sizeof(hash.low64)); +} + +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API XXH128_hash_t +XXH128_hashFromCanonical(XXH_NOESCAPE const XXH128_canonical_t* src) +{ + XXH128_hash_t h; + h.high64 = XXH_readBE64(src); + h.low64 = XXH_readBE64(src->digest + 8); + return h; +} + + + +/* ========================================== + * Secret generators + * ========================================== + */ +#define XXH_MIN(x, y) (((x) > (y)) ? (y) : (x)) + +XXH_FORCE_INLINE void XXH3_combine16(void* dst, XXH128_hash_t h128) +{ + XXH_writeLE64( dst, XXH_readLE64(dst) ^ h128.low64 ); + XXH_writeLE64( (char*)dst+8, XXH_readLE64((char*)dst+8) ^ h128.high64 ); +} + +/*! @ingroup XXH3_family */ +XXH_PUBLIC_API XXH_errorcode +XXH3_generateSecret(XXH_NOESCAPE void* secretBuffer, size_t secretSize, XXH_NOESCAPE const void* customSeed, size_t customSeedSize) +{ +#if (XXH_DEBUGLEVEL >= 1) + XXH_ASSERT(secretBuffer != NULL); + XXH_ASSERT(secretSize >= XXH3_SECRET_SIZE_MIN); +#else + /* production mode, assert() are disabled */ + if (secretBuffer == NULL) return XXH_ERROR; + if (secretSize < XXH3_SECRET_SIZE_MIN) return XXH_ERROR; +#endif + + if (customSeedSize == 0) { + customSeed = XXH3_kSecret; + customSeedSize = XXH_SECRET_DEFAULT_SIZE; + } +#if (XXH_DEBUGLEVEL >= 1) + XXH_ASSERT(customSeed != NULL); +#else + if (customSeed == NULL) return XXH_ERROR; +#endif + + /* Fill secretBuffer with a copy of customSeed - repeat as needed */ + { size_t pos = 0; + while (pos < secretSize) { + size_t const toCopy = XXH_MIN((secretSize - pos), customSeedSize); + memcpy((char*)secretBuffer + pos, customSeed, toCopy); + pos += toCopy; + } } + + { size_t const nbSeg16 = secretSize / 16; + size_t n; + XXH128_canonical_t scrambler; + XXH128_canonicalFromHash(&scrambler, XXH128(customSeed, customSeedSize, 0)); + for (n=0; n + +/* weak symbol support + * For now, enable conservatively: + * - Only GNUC + * - Only ELF + * - Only x86-64, i386 and aarch64 + * Also, explicitly disable on platforms known not to work so they aren't + * forgotten in the future. + */ +#if !defined(ZSTD_HAVE_WEAK_SYMBOLS) && \ + defined(__GNUC__) && defined(__ELF__) && \ + (defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86) || defined(__aarch64__)) && \ + !defined(__APPLE__) && !defined(_WIN32) && !defined(__MINGW32__) && \ + !defined(__CYGWIN__) && !defined(_AIX) +# define ZSTD_HAVE_WEAK_SYMBOLS 1 +#else +# define ZSTD_HAVE_WEAK_SYMBOLS 0 +#endif +#if ZSTD_HAVE_WEAK_SYMBOLS +# define ZSTD_WEAK_ATTR __attribute__((__weak__)) +#else +# define ZSTD_WEAK_ATTR +#endif + +/* Only enable tracing when weak symbols are available. */ +#ifndef ZSTD_TRACE +# define ZSTD_TRACE ZSTD_HAVE_WEAK_SYMBOLS +#endif + +#if ZSTD_TRACE + +struct ZSTD_CCtx_s; +struct ZSTD_DCtx_s; +struct ZSTD_CCtx_params_s; + +typedef struct { + /** + * ZSTD_VERSION_NUMBER + * + * This is guaranteed to be the first member of ZSTD_trace. + * Otherwise, this struct is not stable between versions. If + * the version number does not match your expectation, you + * should not interpret the rest of the struct. + */ + unsigned version; + /** + * Non-zero if streaming (de)compression is used. + */ + unsigned streaming; + /** + * The dictionary ID. + */ + unsigned dictionaryID; + /** + * Is the dictionary cold? + * Only set on decompression. + */ + unsigned dictionaryIsCold; + /** + * The dictionary size or zero if no dictionary. + */ + size_t dictionarySize; + /** + * The uncompressed size of the data. + */ + size_t uncompressedSize; + /** + * The compressed size of the data. + */ + size_t compressedSize; + /** + * The fully resolved CCtx parameters (NULL on decompression). + */ + struct ZSTD_CCtx_params_s const* params; + /** + * The ZSTD_CCtx pointer (NULL on decompression). + */ + struct ZSTD_CCtx_s const* cctx; + /** + * The ZSTD_DCtx pointer (NULL on compression). + */ + struct ZSTD_DCtx_s const* dctx; +} ZSTD_Trace; + +/** + * A tracing context. It must be 0 when tracing is disabled. + * Otherwise, any non-zero value returned by a tracing begin() + * function is presented to any subsequent calls to end(). + * + * Any non-zero value is treated as tracing is enabled and not + * interpreted by the library. + * + * Two possible uses are: + * * A timestamp for when the begin() function was called. + * * A unique key identifying the (de)compression, like the + * address of the [dc]ctx pointer if you need to track + * more information than just a timestamp. + */ +typedef unsigned long long ZSTD_TraceCtx; + +/** + * Trace the beginning of a compression call. + * @param cctx The dctx pointer for the compression. + * It can be used as a key to map begin() to end(). + * @returns Non-zero if tracing is enabled. The return value is + * passed to ZSTD_trace_compress_end(). + */ +ZSTD_WEAK_ATTR ZSTD_TraceCtx ZSTD_trace_compress_begin( + struct ZSTD_CCtx_s const* cctx); + +/** + * Trace the end of a compression call. + * @param ctx The return value of ZSTD_trace_compress_begin(). + * @param trace The zstd tracing info. + */ +ZSTD_WEAK_ATTR void ZSTD_trace_compress_end( + ZSTD_TraceCtx ctx, + ZSTD_Trace const* trace); + +/** + * Trace the beginning of a decompression call. + * @param dctx The dctx pointer for the decompression. + * It can be used as a key to map begin() to end(). + * @returns Non-zero if tracing is enabled. The return value is + * passed to ZSTD_trace_compress_end(). + */ +ZSTD_WEAK_ATTR ZSTD_TraceCtx ZSTD_trace_decompress_begin( + struct ZSTD_DCtx_s const* dctx); + +/** + * Trace the end of a decompression call. + * @param ctx The return value of ZSTD_trace_decompress_begin(). + * @param trace The zstd tracing info. + */ +ZSTD_WEAK_ATTR void ZSTD_trace_decompress_end( + ZSTD_TraceCtx ctx, + ZSTD_Trace const* trace); + +#endif /* ZSTD_TRACE */ + +#if defined (__cplusplus) +} +#endif + +#endif /* ZSTD_TRACE_H */ +/**** ended inlining zstd_trace.h ****/ +#else +# define ZSTD_TRACE 0 +#endif + +#if defined (__cplusplus) +extern "C" { +#endif + +/* ---- static assert (debug) --- */ +#define ZSTD_STATIC_ASSERT(c) DEBUG_STATIC_ASSERT(c) +#define ZSTD_isError ERR_isError /* for inlining */ +#define FSE_isError ERR_isError +#define HUF_isError ERR_isError + + +/*-************************************* +* shared macros +***************************************/ +#undef MIN +#undef MAX +#define MIN(a,b) ((a)<(b) ? (a) : (b)) +#define MAX(a,b) ((a)>(b) ? (a) : (b)) +#define BOUNDED(min,val,max) (MAX(min,MIN(val,max))) + + +/*-************************************* +* Common constants +***************************************/ +#define ZSTD_OPT_NUM (1<<12) + +#define ZSTD_REP_NUM 3 /* number of repcodes */ +static UNUSED_ATTR const U32 repStartValue[ZSTD_REP_NUM] = { 1, 4, 8 }; + +#define KB *(1 <<10) +#define MB *(1 <<20) +#define GB *(1U<<30) + +#define BIT7 128 +#define BIT6 64 +#define BIT5 32 +#define BIT4 16 +#define BIT1 2 +#define BIT0 1 + +#define ZSTD_WINDOWLOG_ABSOLUTEMIN 10 +static UNUSED_ATTR const size_t ZSTD_fcs_fieldSize[4] = { 0, 2, 4, 8 }; +static UNUSED_ATTR const size_t ZSTD_did_fieldSize[4] = { 0, 1, 2, 4 }; + +#define ZSTD_FRAMEIDSIZE 4 /* magic number size */ + +#define ZSTD_BLOCKHEADERSIZE 3 /* C standard doesn't allow `static const` variable to be init using another `static const` variable */ +static UNUSED_ATTR const size_t ZSTD_blockHeaderSize = ZSTD_BLOCKHEADERSIZE; +typedef enum { bt_raw, bt_rle, bt_compressed, bt_reserved } blockType_e; + +#define ZSTD_FRAMECHECKSUMSIZE 4 + +#define MIN_SEQUENCES_SIZE 1 /* nbSeq==0 */ +#define MIN_CBLOCK_SIZE (1 /*litCSize*/ + 1 /* RLE or RAW */) /* for a non-null block */ +#define MIN_LITERALS_FOR_4_STREAMS 6 + +typedef enum { set_basic, set_rle, set_compressed, set_repeat } symbolEncodingType_e; + +#define LONGNBSEQ 0x7F00 + +#define MINMATCH 3 + +#define Litbits 8 +#define LitHufLog 11 +#define MaxLit ((1<= WILDCOPY_VECLEN || diff <= -WILDCOPY_VECLEN); + /* Separate out the first COPY16() call because the copy length is + * almost certain to be short, so the branches have different + * probabilities. Since it is almost certain to be short, only do + * one COPY16() in the first call. Then, do two calls per loop since + * at that point it is more likely to have a high trip count. + */ + ZSTD_copy16(op, ip); + if (16 >= length) return; + op += 16; + ip += 16; + do { + COPY16(op, ip); + COPY16(op, ip); + } + while (op < oend); + } +} + +MEM_STATIC size_t ZSTD_limitCopy(void* dst, size_t dstCapacity, const void* src, size_t srcSize) +{ + size_t const length = MIN(dstCapacity, srcSize); + if (length > 0) { + ZSTD_memcpy(dst, src, length); + } + return length; +} + +/* define "workspace is too large" as this number of times larger than needed */ +#define ZSTD_WORKSPACETOOLARGE_FACTOR 3 + +/* when workspace is continuously too large + * during at least this number of times, + * context's memory usage is considered wasteful, + * because it's sized to handle a worst case scenario which rarely happens. + * In which case, resize it down to free some memory */ +#define ZSTD_WORKSPACETOOLARGE_MAXDURATION 128 + +/* Controls whether the input/output buffer is buffered or stable. */ +typedef enum { + ZSTD_bm_buffered = 0, /* Buffer the input/output */ + ZSTD_bm_stable = 1 /* ZSTD_inBuffer/ZSTD_outBuffer is stable */ +} ZSTD_bufferMode_e; + + +/*-******************************************* +* Private declarations +*********************************************/ +typedef struct seqDef_s { + U32 offBase; /* offBase == Offset + ZSTD_REP_NUM, or repcode 1,2,3 */ + U16 litLength; + U16 mlBase; /* mlBase == matchLength - MINMATCH */ +} seqDef; + +/* Controls whether seqStore has a single "long" litLength or matchLength. See seqStore_t. */ +typedef enum { + ZSTD_llt_none = 0, /* no longLengthType */ + ZSTD_llt_literalLength = 1, /* represents a long literal */ + ZSTD_llt_matchLength = 2 /* represents a long match */ +} ZSTD_longLengthType_e; + +typedef struct { + seqDef* sequencesStart; + seqDef* sequences; /* ptr to end of sequences */ + BYTE* litStart; + BYTE* lit; /* ptr to end of literals */ + BYTE* llCode; + BYTE* mlCode; + BYTE* ofCode; + size_t maxNbSeq; + size_t maxNbLit; + + /* longLengthPos and longLengthType to allow us to represent either a single litLength or matchLength + * in the seqStore that has a value larger than U16 (if it exists). To do so, we increment + * the existing value of the litLength or matchLength by 0x10000. + */ + ZSTD_longLengthType_e longLengthType; + U32 longLengthPos; /* Index of the sequence to apply long length modification to */ +} seqStore_t; + +typedef struct { + U32 litLength; + U32 matchLength; +} ZSTD_sequenceLength; + +/** + * Returns the ZSTD_sequenceLength for the given sequences. It handles the decoding of long sequences + * indicated by longLengthPos and longLengthType, and adds MINMATCH back to matchLength. + */ +MEM_STATIC ZSTD_sequenceLength ZSTD_getSequenceLength(seqStore_t const* seqStore, seqDef const* seq) +{ + ZSTD_sequenceLength seqLen; + seqLen.litLength = seq->litLength; + seqLen.matchLength = seq->mlBase + MINMATCH; + if (seqStore->longLengthPos == (U32)(seq - seqStore->sequencesStart)) { + if (seqStore->longLengthType == ZSTD_llt_literalLength) { + seqLen.litLength += 0x10000; + } + if (seqStore->longLengthType == ZSTD_llt_matchLength) { + seqLen.matchLength += 0x10000; + } + } + return seqLen; +} + +/** + * Contains the compressed frame size and an upper-bound for the decompressed frame size. + * Note: before using `compressedSize`, check for errors using ZSTD_isError(). + * similarly, before using `decompressedBound`, check for errors using: + * `decompressedBound != ZSTD_CONTENTSIZE_ERROR` + */ +typedef struct { + size_t nbBlocks; + size_t compressedSize; + unsigned long long decompressedBound; +} ZSTD_frameSizeInfo; /* decompress & legacy */ + +const seqStore_t* ZSTD_getSeqStore(const ZSTD_CCtx* ctx); /* compress & dictBuilder */ +int ZSTD_seqToCodes(const seqStore_t* seqStorePtr); /* compress, dictBuilder, decodeCorpus (shouldn't get its definition from here) */ + + +/* ZSTD_invalidateRepCodes() : + * ensures next compression will not use repcodes from previous block. + * Note : only works with regular variant; + * do not use with extDict variant ! */ +void ZSTD_invalidateRepCodes(ZSTD_CCtx* cctx); /* zstdmt, adaptive_compression (shouldn't get this definition from here) */ + + +typedef struct { + blockType_e blockType; + U32 lastBlock; + U32 origSize; +} blockProperties_t; /* declared here for decompress and fullbench */ + +/*! ZSTD_getcBlockSize() : + * Provides the size of compressed block from block header `src` */ +/* Used by: decompress, fullbench */ +size_t ZSTD_getcBlockSize(const void* src, size_t srcSize, + blockProperties_t* bpPtr); + +/*! ZSTD_decodeSeqHeaders() : + * decode sequence header from src */ +/* Used by: zstd_decompress_block, fullbench */ +size_t ZSTD_decodeSeqHeaders(ZSTD_DCtx* dctx, int* nbSeqPtr, + const void* src, size_t srcSize); + +/** + * @returns true iff the CPU supports dynamic BMI2 dispatch. + */ +MEM_STATIC int ZSTD_cpuSupportsBmi2(void) +{ + ZSTD_cpuid_t cpuid = ZSTD_cpuid(); + return ZSTD_cpuid_bmi1(cpuid) && ZSTD_cpuid_bmi2(cpuid); +} + +#if defined (__cplusplus) +} +#endif + +#endif /* ZSTD_CCOMMON_H_MODULE */ +/**** ended inlining zstd_internal.h ****/ + + +/*-**************************************** +* Version +******************************************/ +unsigned ZSTD_versionNumber(void) { return ZSTD_VERSION_NUMBER; } + +const char* ZSTD_versionString(void) { return ZSTD_VERSION_STRING; } + + +/*-**************************************** +* ZSTD Error Management +******************************************/ +#undef ZSTD_isError /* defined within zstd_internal.h */ +/*! ZSTD_isError() : + * tells if a return value is an error code + * symbol is required for external callers */ +unsigned ZSTD_isError(size_t code) { return ERR_isError(code); } + +/*! ZSTD_getErrorName() : + * provides error code string from function result (useful for debugging) */ +const char* ZSTD_getErrorName(size_t code) { return ERR_getErrorName(code); } + +/*! ZSTD_getError() : + * convert a `size_t` function result into a proper ZSTD_errorCode enum */ +ZSTD_ErrorCode ZSTD_getErrorCode(size_t code) { return ERR_getErrorCode(code); } + +/*! ZSTD_getErrorString() : + * provides error code string from enum */ +const char* ZSTD_getErrorString(ZSTD_ErrorCode code) { return ERR_getErrorString(code); } +/**** ended inlining common/zstd_common.c ****/ + +/**** start inlining compress/fse_compress.c ****/ +/* ****************************************************************** + * FSE : Finite State Entropy encoder + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * You can contact the author at : + * - FSE source repository : https://github.com/Cyan4973/FiniteStateEntropy + * - Public forum : https://groups.google.com/forum/#!forum/lz4c + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. +****************************************************************** */ + +/* ************************************************************** +* Includes +****************************************************************/ +/**** skipping file: ../common/compiler.h ****/ +/**** skipping file: ../common/mem.h ****/ +/**** skipping file: ../common/debug.h ****/ +/**** start inlining hist.h ****/ +/* ****************************************************************** + * hist : Histogram functions + * part of Finite State Entropy project + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * You can contact the author at : + * - FSE source repository : https://github.com/Cyan4973/FiniteStateEntropy + * - Public forum : https://groups.google.com/forum/#!forum/lz4c + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. +****************************************************************** */ + +/* --- dependencies --- */ +/**** skipping file: ../common/zstd_deps.h ****/ + + +/* --- simple histogram functions --- */ + +/*! HIST_count(): + * Provides the precise count of each byte within a table 'count'. + * 'count' is a table of unsigned int, of minimum size (*maxSymbolValuePtr+1). + * Updates *maxSymbolValuePtr with actual largest symbol value detected. + * @return : count of the most frequent symbol (which isn't identified). + * or an error code, which can be tested using HIST_isError(). + * note : if return == srcSize, there is only one symbol. + */ +size_t HIST_count(unsigned* count, unsigned* maxSymbolValuePtr, + const void* src, size_t srcSize); + +unsigned HIST_isError(size_t code); /**< tells if a return value is an error code */ + + +/* --- advanced histogram functions --- */ + +#define HIST_WKSP_SIZE_U32 1024 +#define HIST_WKSP_SIZE (HIST_WKSP_SIZE_U32 * sizeof(unsigned)) +/** HIST_count_wksp() : + * Same as HIST_count(), but using an externally provided scratch buffer. + * Benefit is this function will use very little stack space. + * `workSpace` is a writable buffer which must be 4-bytes aligned, + * `workSpaceSize` must be >= HIST_WKSP_SIZE + */ +size_t HIST_count_wksp(unsigned* count, unsigned* maxSymbolValuePtr, + const void* src, size_t srcSize, + void* workSpace, size_t workSpaceSize); + +/** HIST_countFast() : + * same as HIST_count(), but blindly trusts that all byte values within src are <= *maxSymbolValuePtr. + * This function is unsafe, and will segfault if any value within `src` is `> *maxSymbolValuePtr` + */ +size_t HIST_countFast(unsigned* count, unsigned* maxSymbolValuePtr, + const void* src, size_t srcSize); + +/** HIST_countFast_wksp() : + * Same as HIST_countFast(), but using an externally provided scratch buffer. + * `workSpace` is a writable buffer which must be 4-bytes aligned, + * `workSpaceSize` must be >= HIST_WKSP_SIZE + */ +size_t HIST_countFast_wksp(unsigned* count, unsigned* maxSymbolValuePtr, + const void* src, size_t srcSize, + void* workSpace, size_t workSpaceSize); + +/*! HIST_count_simple() : + * Same as HIST_countFast(), this function is unsafe, + * and will segfault if any value within `src` is `> *maxSymbolValuePtr`. + * It is also a bit slower for large inputs. + * However, it does not need any additional memory (not even on stack). + * @return : count of the most frequent symbol. + * Note this function doesn't produce any error (i.e. it must succeed). + */ +unsigned HIST_count_simple(unsigned* count, unsigned* maxSymbolValuePtr, + const void* src, size_t srcSize); +/**** ended inlining hist.h ****/ +/**** skipping file: ../common/bitstream.h ****/ +#define FSE_STATIC_LINKING_ONLY +/**** skipping file: ../common/fse.h ****/ +/**** skipping file: ../common/error_private.h ****/ +#define ZSTD_DEPS_NEED_MALLOC +#define ZSTD_DEPS_NEED_MATH64 +/**** skipping file: ../common/zstd_deps.h ****/ +/**** skipping file: ../common/bits.h ****/ + + +/* ************************************************************** +* Error Management +****************************************************************/ +#define FSE_isError ERR_isError + + +/* ************************************************************** +* Templates +****************************************************************/ +/* + designed to be included + for type-specific functions (template emulation in C) + Objective is to write these functions only once, for improved maintenance +*/ + +/* safety checks */ +#ifndef FSE_FUNCTION_EXTENSION +# error "FSE_FUNCTION_EXTENSION must be defined" +#endif +#ifndef FSE_FUNCTION_TYPE +# error "FSE_FUNCTION_TYPE must be defined" +#endif + +/* Function names */ +#define FSE_CAT(X,Y) X##Y +#define FSE_FUNCTION_NAME(X,Y) FSE_CAT(X,Y) +#define FSE_TYPE_NAME(X,Y) FSE_CAT(X,Y) + + +/* Function templates */ + +/* FSE_buildCTable_wksp() : + * Same as FSE_buildCTable(), but using an externally allocated scratch buffer (`workSpace`). + * wkspSize should be sized to handle worst case situation, which is `1<>1 : 1) ; + FSE_symbolCompressionTransform* const symbolTT = (FSE_symbolCompressionTransform*) (FSCT); + U32 const step = FSE_TABLESTEP(tableSize); + U32 const maxSV1 = maxSymbolValue+1; + + U16* cumul = (U16*)workSpace; /* size = maxSV1 */ + FSE_FUNCTION_TYPE* const tableSymbol = (FSE_FUNCTION_TYPE*)(cumul + (maxSV1+1)); /* size = tableSize */ + + U32 highThreshold = tableSize-1; + + assert(((size_t)workSpace & 1) == 0); /* Must be 2 bytes-aligned */ + if (FSE_BUILD_CTABLE_WORKSPACE_SIZE(maxSymbolValue, tableLog) > wkspSize) return ERROR(tableLog_tooLarge); + /* CTable header */ + tableU16[-2] = (U16) tableLog; + tableU16[-1] = (U16) maxSymbolValue; + assert(tableLog < 16); /* required for threshold strategy to work */ + + /* For explanations on how to distribute symbol values over the table : + * https://fastcompression.blogspot.fr/2014/02/fse-distributing-symbol-values.html */ + + #ifdef __clang_analyzer__ + ZSTD_memset(tableSymbol, 0, sizeof(*tableSymbol) * tableSize); /* useless initialization, just to keep scan-build happy */ + #endif + + /* symbol start positions */ + { U32 u; + cumul[0] = 0; + for (u=1; u <= maxSV1; u++) { + if (normalizedCounter[u-1]==-1) { /* Low proba symbol */ + cumul[u] = cumul[u-1] + 1; + tableSymbol[highThreshold--] = (FSE_FUNCTION_TYPE)(u-1); + } else { + assert(normalizedCounter[u-1] >= 0); + cumul[u] = cumul[u-1] + (U16)normalizedCounter[u-1]; + assert(cumul[u] >= cumul[u-1]); /* no overflow */ + } } + cumul[maxSV1] = (U16)(tableSize+1); + } + + /* Spread symbols */ + if (highThreshold == tableSize - 1) { + /* Case for no low prob count symbols. Lay down 8 bytes at a time + * to reduce branch misses since we are operating on a small block + */ + BYTE* const spread = tableSymbol + tableSize; /* size = tableSize + 8 (may write beyond tableSize) */ + { U64 const add = 0x0101010101010101ull; + size_t pos = 0; + U64 sv = 0; + U32 s; + for (s=0; s=0); + pos += (size_t)n; + } + } + /* Spread symbols across the table. Lack of lowprob symbols means that + * we don't need variable sized inner loop, so we can unroll the loop and + * reduce branch misses. + */ + { size_t position = 0; + size_t s; + size_t const unroll = 2; /* Experimentally determined optimal unroll */ + assert(tableSize % unroll == 0); /* FSE_MIN_TABLELOG is 5 */ + for (s = 0; s < (size_t)tableSize; s += unroll) { + size_t u; + for (u = 0; u < unroll; ++u) { + size_t const uPosition = (position + (u * step)) & tableMask; + tableSymbol[uPosition] = spread[s + u]; + } + position = (position + (unroll * step)) & tableMask; + } + assert(position == 0); /* Must have initialized all positions */ + } + } else { + U32 position = 0; + U32 symbol; + for (symbol=0; symbol highThreshold) + position = (position + step) & tableMask; /* Low proba area */ + } } + assert(position==0); /* Must have initialized all positions */ + } + + /* Build table */ + { U32 u; for (u=0; u 1); + { U32 const maxBitsOut = tableLog - ZSTD_highbit32 ((U32)normalizedCounter[s]-1); + U32 const minStatePlus = (U32)normalizedCounter[s] << maxBitsOut; + symbolTT[s].deltaNbBits = (maxBitsOut << 16) - minStatePlus; + symbolTT[s].deltaFindState = (int)(total - (unsigned)normalizedCounter[s]); + total += (unsigned)normalizedCounter[s]; + } } } } + +#if 0 /* debug : symbol costs */ + DEBUGLOG(5, "\n --- table statistics : "); + { U32 symbol; + for (symbol=0; symbol<=maxSymbolValue; symbol++) { + DEBUGLOG(5, "%3u: w=%3i, maxBits=%u, fracBits=%.2f", + symbol, normalizedCounter[symbol], + FSE_getMaxNbBits(symbolTT, symbol), + (double)FSE_bitCost(symbolTT, tableLog, symbol, 8) / 256); + } } +#endif + + return 0; +} + + + +#ifndef FSE_COMMONDEFS_ONLY + +/*-************************************************************** +* FSE NCount encoding +****************************************************************/ +size_t FSE_NCountWriteBound(unsigned maxSymbolValue, unsigned tableLog) +{ + size_t const maxHeaderSize = (((maxSymbolValue+1) * tableLog + + 4 /* bitCount initialized at 4 */ + + 2 /* first two symbols may use one additional bit each */) / 8) + + 1 /* round up to whole nb bytes */ + + 2 /* additional two bytes for bitstream flush */; + return maxSymbolValue ? maxHeaderSize : FSE_NCOUNTBOUND; /* maxSymbolValue==0 ? use default */ +} + +static size_t +FSE_writeNCount_generic (void* header, size_t headerBufferSize, + const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog, + unsigned writeIsSafe) +{ + BYTE* const ostart = (BYTE*) header; + BYTE* out = ostart; + BYTE* const oend = ostart + headerBufferSize; + int nbBits; + const int tableSize = 1 << tableLog; + int remaining; + int threshold; + U32 bitStream = 0; + int bitCount = 0; + unsigned symbol = 0; + unsigned const alphabetSize = maxSymbolValue + 1; + int previousIs0 = 0; + + /* Table Size */ + bitStream += (tableLog-FSE_MIN_TABLELOG) << bitCount; + bitCount += 4; + + /* Init */ + remaining = tableSize+1; /* +1 for extra accuracy */ + threshold = tableSize; + nbBits = (int)tableLog+1; + + while ((symbol < alphabetSize) && (remaining>1)) { /* stops at 1 */ + if (previousIs0) { + unsigned start = symbol; + while ((symbol < alphabetSize) && !normalizedCounter[symbol]) symbol++; + if (symbol == alphabetSize) break; /* incorrect distribution */ + while (symbol >= start+24) { + start+=24; + bitStream += 0xFFFFU << bitCount; + if ((!writeIsSafe) && (out > oend-2)) + return ERROR(dstSize_tooSmall); /* Buffer overflow */ + out[0] = (BYTE) bitStream; + out[1] = (BYTE)(bitStream>>8); + out+=2; + bitStream>>=16; + } + while (symbol >= start+3) { + start+=3; + bitStream += 3U << bitCount; + bitCount += 2; + } + bitStream += (symbol-start) << bitCount; + bitCount += 2; + if (bitCount>16) { + if ((!writeIsSafe) && (out > oend - 2)) + return ERROR(dstSize_tooSmall); /* Buffer overflow */ + out[0] = (BYTE)bitStream; + out[1] = (BYTE)(bitStream>>8); + out += 2; + bitStream >>= 16; + bitCount -= 16; + } } + { int count = normalizedCounter[symbol++]; + int const max = (2*threshold-1) - remaining; + remaining -= count < 0 ? -count : count; + count++; /* +1 for extra accuracy */ + if (count>=threshold) + count += max; /* [0..max[ [max..threshold[ (...) [threshold+max 2*threshold[ */ + bitStream += (U32)count << bitCount; + bitCount += nbBits; + bitCount -= (count>=1; } + } + if (bitCount>16) { + if ((!writeIsSafe) && (out > oend - 2)) + return ERROR(dstSize_tooSmall); /* Buffer overflow */ + out[0] = (BYTE)bitStream; + out[1] = (BYTE)(bitStream>>8); + out += 2; + bitStream >>= 16; + bitCount -= 16; + } } + + if (remaining != 1) + return ERROR(GENERIC); /* incorrect normalized distribution */ + assert(symbol <= alphabetSize); + + /* flush remaining bitStream */ + if ((!writeIsSafe) && (out > oend - 2)) + return ERROR(dstSize_tooSmall); /* Buffer overflow */ + out[0] = (BYTE)bitStream; + out[1] = (BYTE)(bitStream>>8); + out+= (bitCount+7) /8; + + assert(out >= ostart); + return (size_t)(out-ostart); +} + + +size_t FSE_writeNCount (void* buffer, size_t bufferSize, + const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog) +{ + if (tableLog > FSE_MAX_TABLELOG) return ERROR(tableLog_tooLarge); /* Unsupported */ + if (tableLog < FSE_MIN_TABLELOG) return ERROR(GENERIC); /* Unsupported */ + + if (bufferSize < FSE_NCountWriteBound(maxSymbolValue, tableLog)) + return FSE_writeNCount_generic(buffer, bufferSize, normalizedCounter, maxSymbolValue, tableLog, 0); + + return FSE_writeNCount_generic(buffer, bufferSize, normalizedCounter, maxSymbolValue, tableLog, 1 /* write in buffer is safe */); +} + + +/*-************************************************************** +* FSE Compression Code +****************************************************************/ + +/* provides the minimum logSize to safely represent a distribution */ +static unsigned FSE_minTableLog(size_t srcSize, unsigned maxSymbolValue) +{ + U32 minBitsSrc = ZSTD_highbit32((U32)(srcSize)) + 1; + U32 minBitsSymbols = ZSTD_highbit32(maxSymbolValue) + 2; + U32 minBits = minBitsSrc < minBitsSymbols ? minBitsSrc : minBitsSymbols; + assert(srcSize > 1); /* Not supported, RLE should be used instead */ + return minBits; +} + +unsigned FSE_optimalTableLog_internal(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue, unsigned minus) +{ + U32 maxBitsSrc = ZSTD_highbit32((U32)(srcSize - 1)) - minus; + U32 tableLog = maxTableLog; + U32 minBits = FSE_minTableLog(srcSize, maxSymbolValue); + assert(srcSize > 1); /* Not supported, RLE should be used instead */ + if (tableLog==0) tableLog = FSE_DEFAULT_TABLELOG; + if (maxBitsSrc < tableLog) tableLog = maxBitsSrc; /* Accuracy can be reduced */ + if (minBits > tableLog) tableLog = minBits; /* Need a minimum to safely represent all symbol values */ + if (tableLog < FSE_MIN_TABLELOG) tableLog = FSE_MIN_TABLELOG; + if (tableLog > FSE_MAX_TABLELOG) tableLog = FSE_MAX_TABLELOG; + return tableLog; +} + +unsigned FSE_optimalTableLog(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue) +{ + return FSE_optimalTableLog_internal(maxTableLog, srcSize, maxSymbolValue, 2); +} + +/* Secondary normalization method. + To be used when primary method fails. */ + +static size_t FSE_normalizeM2(short* norm, U32 tableLog, const unsigned* count, size_t total, U32 maxSymbolValue, short lowProbCount) +{ + short const NOT_YET_ASSIGNED = -2; + U32 s; + U32 distributed = 0; + U32 ToDistribute; + + /* Init */ + U32 const lowThreshold = (U32)(total >> tableLog); + U32 lowOne = (U32)((total * 3) >> (tableLog + 1)); + + for (s=0; s<=maxSymbolValue; s++) { + if (count[s] == 0) { + norm[s]=0; + continue; + } + if (count[s] <= lowThreshold) { + norm[s] = lowProbCount; + distributed++; + total -= count[s]; + continue; + } + if (count[s] <= lowOne) { + norm[s] = 1; + distributed++; + total -= count[s]; + continue; + } + + norm[s]=NOT_YET_ASSIGNED; + } + ToDistribute = (1 << tableLog) - distributed; + + if (ToDistribute == 0) + return 0; + + if ((total / ToDistribute) > lowOne) { + /* risk of rounding to zero */ + lowOne = (U32)((total * 3) / (ToDistribute * 2)); + for (s=0; s<=maxSymbolValue; s++) { + if ((norm[s] == NOT_YET_ASSIGNED) && (count[s] <= lowOne)) { + norm[s] = 1; + distributed++; + total -= count[s]; + continue; + } } + ToDistribute = (1 << tableLog) - distributed; + } + + if (distributed == maxSymbolValue+1) { + /* all values are pretty poor; + probably incompressible data (should have already been detected); + find max, then give all remaining points to max */ + U32 maxV = 0, maxC = 0; + for (s=0; s<=maxSymbolValue; s++) + if (count[s] > maxC) { maxV=s; maxC=count[s]; } + norm[maxV] += (short)ToDistribute; + return 0; + } + + if (total == 0) { + /* all of the symbols were low enough for the lowOne or lowThreshold */ + for (s=0; ToDistribute > 0; s = (s+1)%(maxSymbolValue+1)) + if (norm[s] > 0) { ToDistribute--; norm[s]++; } + return 0; + } + + { U64 const vStepLog = 62 - tableLog; + U64 const mid = (1ULL << (vStepLog-1)) - 1; + U64 const rStep = ZSTD_div64((((U64)1<> vStepLog); + U32 const sEnd = (U32)(end >> vStepLog); + U32 const weight = sEnd - sStart; + if (weight < 1) + return ERROR(GENERIC); + norm[s] = (short)weight; + tmpTotal = end; + } } } + + return 0; +} + +size_t FSE_normalizeCount (short* normalizedCounter, unsigned tableLog, + const unsigned* count, size_t total, + unsigned maxSymbolValue, unsigned useLowProbCount) +{ + /* Sanity checks */ + if (tableLog==0) tableLog = FSE_DEFAULT_TABLELOG; + if (tableLog < FSE_MIN_TABLELOG) return ERROR(GENERIC); /* Unsupported size */ + if (tableLog > FSE_MAX_TABLELOG) return ERROR(tableLog_tooLarge); /* Unsupported size */ + if (tableLog < FSE_minTableLog(total, maxSymbolValue)) return ERROR(GENERIC); /* Too small tableLog, compression potentially impossible */ + + { static U32 const rtbTable[] = { 0, 473195, 504333, 520860, 550000, 700000, 750000, 830000 }; + short const lowProbCount = useLowProbCount ? -1 : 1; + U64 const scale = 62 - tableLog; + U64 const step = ZSTD_div64((U64)1<<62, (U32)total); /* <== here, one division ! */ + U64 const vStep = 1ULL<<(scale-20); + int stillToDistribute = 1<> tableLog); + + for (s=0; s<=maxSymbolValue; s++) { + if (count[s] == total) return 0; /* rle special case */ + if (count[s] == 0) { normalizedCounter[s]=0; continue; } + if (count[s] <= lowThreshold) { + normalizedCounter[s] = lowProbCount; + stillToDistribute--; + } else { + short proba = (short)((count[s]*step) >> scale); + if (proba<8) { + U64 restToBeat = vStep * rtbTable[proba]; + proba += (count[s]*step) - ((U64)proba< restToBeat; + } + if (proba > largestP) { largestP=proba; largest=s; } + normalizedCounter[s] = proba; + stillToDistribute -= proba; + } } + if (-stillToDistribute >= (normalizedCounter[largest] >> 1)) { + /* corner case, need another normalization method */ + size_t const errorCode = FSE_normalizeM2(normalizedCounter, tableLog, count, total, maxSymbolValue, lowProbCount); + if (FSE_isError(errorCode)) return errorCode; + } + else normalizedCounter[largest] += (short)stillToDistribute; + } + +#if 0 + { /* Print Table (debug) */ + U32 s; + U32 nTotal = 0; + for (s=0; s<=maxSymbolValue; s++) + RAWLOG(2, "%3i: %4i \n", s, normalizedCounter[s]); + for (s=0; s<=maxSymbolValue; s++) + nTotal += abs(normalizedCounter[s]); + if (nTotal != (1U< FSE_MAX_TABLELOG*4+7 ) && (srcSize & 2)) { /* test bit 2 */ + FSE_encodeSymbol(&bitC, &CState2, *--ip); + FSE_encodeSymbol(&bitC, &CState1, *--ip); + FSE_FLUSHBITS(&bitC); + } + + /* 2 or 4 encoding per loop */ + while ( ip>istart ) { + + FSE_encodeSymbol(&bitC, &CState2, *--ip); + + if (sizeof(bitC.bitContainer)*8 < FSE_MAX_TABLELOG*2+7 ) /* this test must be static */ + FSE_FLUSHBITS(&bitC); + + FSE_encodeSymbol(&bitC, &CState1, *--ip); + + if (sizeof(bitC.bitContainer)*8 > FSE_MAX_TABLELOG*4+7 ) { /* this test must be static */ + FSE_encodeSymbol(&bitC, &CState2, *--ip); + FSE_encodeSymbol(&bitC, &CState1, *--ip); + } + + FSE_FLUSHBITS(&bitC); + } + + FSE_flushCState(&bitC, &CState2); + FSE_flushCState(&bitC, &CState1); + return BIT_closeCStream(&bitC); +} + +size_t FSE_compress_usingCTable (void* dst, size_t dstSize, + const void* src, size_t srcSize, + const FSE_CTable* ct) +{ + unsigned const fast = (dstSize >= FSE_BLOCKBOUND(srcSize)); + + if (fast) + return FSE_compress_usingCTable_generic(dst, dstSize, src, srcSize, ct, 1); + else + return FSE_compress_usingCTable_generic(dst, dstSize, src, srcSize, ct, 0); +} + + +size_t FSE_compressBound(size_t size) { return FSE_COMPRESSBOUND(size); } + +#endif /* FSE_COMMONDEFS_ONLY */ +/**** ended inlining compress/fse_compress.c ****/ +/**** start inlining compress/hist.c ****/ +/* ****************************************************************** + * hist : Histogram functions + * part of Finite State Entropy project + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * You can contact the author at : + * - FSE source repository : https://github.com/Cyan4973/FiniteStateEntropy + * - Public forum : https://groups.google.com/forum/#!forum/lz4c + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. +****************************************************************** */ + +/* --- dependencies --- */ +/**** skipping file: ../common/mem.h ****/ +/**** skipping file: ../common/debug.h ****/ +/**** skipping file: ../common/error_private.h ****/ +/**** skipping file: hist.h ****/ + + +/* --- Error management --- */ +unsigned HIST_isError(size_t code) { return ERR_isError(code); } + +/*-************************************************************** + * Histogram functions + ****************************************************************/ +unsigned HIST_count_simple(unsigned* count, unsigned* maxSymbolValuePtr, + const void* src, size_t srcSize) +{ + const BYTE* ip = (const BYTE*)src; + const BYTE* const end = ip + srcSize; + unsigned maxSymbolValue = *maxSymbolValuePtr; + unsigned largestCount=0; + + ZSTD_memset(count, 0, (maxSymbolValue+1) * sizeof(*count)); + if (srcSize==0) { *maxSymbolValuePtr = 0; return 0; } + + while (ip largestCount) largestCount = count[s]; + } + + return largestCount; +} + +typedef enum { trustInput, checkMaxSymbolValue } HIST_checkInput_e; + +/* HIST_count_parallel_wksp() : + * store histogram into 4 intermediate tables, recombined at the end. + * this design makes better use of OoO cpus, + * and is noticeably faster when some values are heavily repeated. + * But it needs some additional workspace for intermediate tables. + * `workSpace` must be a U32 table of size >= HIST_WKSP_SIZE_U32. + * @return : largest histogram frequency, + * or an error code (notably when histogram's alphabet is larger than *maxSymbolValuePtr) */ +static size_t HIST_count_parallel_wksp( + unsigned* count, unsigned* maxSymbolValuePtr, + const void* source, size_t sourceSize, + HIST_checkInput_e check, + U32* const workSpace) +{ + const BYTE* ip = (const BYTE*)source; + const BYTE* const iend = ip+sourceSize; + size_t const countSize = (*maxSymbolValuePtr + 1) * sizeof(*count); + unsigned max=0; + U32* const Counting1 = workSpace; + U32* const Counting2 = Counting1 + 256; + U32* const Counting3 = Counting2 + 256; + U32* const Counting4 = Counting3 + 256; + + /* safety checks */ + assert(*maxSymbolValuePtr <= 255); + if (!sourceSize) { + ZSTD_memset(count, 0, countSize); + *maxSymbolValuePtr = 0; + return 0; + } + ZSTD_memset(workSpace, 0, 4*256*sizeof(unsigned)); + + /* by stripes of 16 bytes */ + { U32 cached = MEM_read32(ip); ip += 4; + while (ip < iend-15) { + U32 c = cached; cached = MEM_read32(ip); ip += 4; + Counting1[(BYTE) c ]++; + Counting2[(BYTE)(c>>8) ]++; + Counting3[(BYTE)(c>>16)]++; + Counting4[ c>>24 ]++; + c = cached; cached = MEM_read32(ip); ip += 4; + Counting1[(BYTE) c ]++; + Counting2[(BYTE)(c>>8) ]++; + Counting3[(BYTE)(c>>16)]++; + Counting4[ c>>24 ]++; + c = cached; cached = MEM_read32(ip); ip += 4; + Counting1[(BYTE) c ]++; + Counting2[(BYTE)(c>>8) ]++; + Counting3[(BYTE)(c>>16)]++; + Counting4[ c>>24 ]++; + c = cached; cached = MEM_read32(ip); ip += 4; + Counting1[(BYTE) c ]++; + Counting2[(BYTE)(c>>8) ]++; + Counting3[(BYTE)(c>>16)]++; + Counting4[ c>>24 ]++; + } + ip-=4; + } + + /* finish last symbols */ + while (ip max) max = Counting1[s]; + } } + + { unsigned maxSymbolValue = 255; + while (!Counting1[maxSymbolValue]) maxSymbolValue--; + if (check && maxSymbolValue > *maxSymbolValuePtr) return ERROR(maxSymbolValue_tooSmall); + *maxSymbolValuePtr = maxSymbolValue; + ZSTD_memmove(count, Counting1, countSize); /* in case count & Counting1 are overlapping */ + } + return (size_t)max; +} + +/* HIST_countFast_wksp() : + * Same as HIST_countFast(), but using an externally provided scratch buffer. + * `workSpace` is a writable buffer which must be 4-bytes aligned, + * `workSpaceSize` must be >= HIST_WKSP_SIZE + */ +size_t HIST_countFast_wksp(unsigned* count, unsigned* maxSymbolValuePtr, + const void* source, size_t sourceSize, + void* workSpace, size_t workSpaceSize) +{ + if (sourceSize < 1500) /* heuristic threshold */ + return HIST_count_simple(count, maxSymbolValuePtr, source, sourceSize); + if ((size_t)workSpace & 3) return ERROR(GENERIC); /* must be aligned on 4-bytes boundaries */ + if (workSpaceSize < HIST_WKSP_SIZE) return ERROR(workSpace_tooSmall); + return HIST_count_parallel_wksp(count, maxSymbolValuePtr, source, sourceSize, trustInput, (U32*)workSpace); +} + +/* HIST_count_wksp() : + * Same as HIST_count(), but using an externally provided scratch buffer. + * `workSpace` size must be table of >= HIST_WKSP_SIZE_U32 unsigned */ +size_t HIST_count_wksp(unsigned* count, unsigned* maxSymbolValuePtr, + const void* source, size_t sourceSize, + void* workSpace, size_t workSpaceSize) +{ + if ((size_t)workSpace & 3) return ERROR(GENERIC); /* must be aligned on 4-bytes boundaries */ + if (workSpaceSize < HIST_WKSP_SIZE) return ERROR(workSpace_tooSmall); + if (*maxSymbolValuePtr < 255) + return HIST_count_parallel_wksp(count, maxSymbolValuePtr, source, sourceSize, checkMaxSymbolValue, (U32*)workSpace); + *maxSymbolValuePtr = 255; + return HIST_countFast_wksp(count, maxSymbolValuePtr, source, sourceSize, workSpace, workSpaceSize); +} + +#ifndef ZSTD_NO_UNUSED_FUNCTIONS +/* fast variant (unsafe : won't check if src contains values beyond count[] limit) */ +size_t HIST_countFast(unsigned* count, unsigned* maxSymbolValuePtr, + const void* source, size_t sourceSize) +{ + unsigned tmpCounters[HIST_WKSP_SIZE_U32]; + return HIST_countFast_wksp(count, maxSymbolValuePtr, source, sourceSize, tmpCounters, sizeof(tmpCounters)); +} + +size_t HIST_count(unsigned* count, unsigned* maxSymbolValuePtr, + const void* src, size_t srcSize) +{ + unsigned tmpCounters[HIST_WKSP_SIZE_U32]; + return HIST_count_wksp(count, maxSymbolValuePtr, src, srcSize, tmpCounters, sizeof(tmpCounters)); +} +#endif +/**** ended inlining compress/hist.c ****/ +/**** start inlining compress/huf_compress.c ****/ +/* ****************************************************************** + * Huffman encoder, part of New Generation Entropy library + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * You can contact the author at : + * - FSE+HUF source repository : https://github.com/Cyan4973/FiniteStateEntropy + * - Public forum : https://groups.google.com/forum/#!forum/lz4c + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. +****************************************************************** */ + +/* ************************************************************** +* Compiler specifics +****************************************************************/ +#ifdef _MSC_VER /* Visual Studio */ +# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */ +#endif + + +/* ************************************************************** +* Includes +****************************************************************/ +/**** skipping file: ../common/zstd_deps.h ****/ +/**** skipping file: ../common/compiler.h ****/ +/**** skipping file: ../common/bitstream.h ****/ +/**** skipping file: hist.h ****/ +#define FSE_STATIC_LINKING_ONLY /* FSE_optimalTableLog_internal */ +/**** skipping file: ../common/fse.h ****/ +/**** skipping file: ../common/huf.h ****/ +/**** skipping file: ../common/error_private.h ****/ +/**** skipping file: ../common/bits.h ****/ + + +/* ************************************************************** +* Error Management +****************************************************************/ +#define HUF_isError ERR_isError +#define HUF_STATIC_ASSERT(c) DEBUG_STATIC_ASSERT(c) /* use only *after* variable declarations */ + + +/* ************************************************************** +* Required declarations +****************************************************************/ +typedef struct nodeElt_s { + U32 count; + U16 parent; + BYTE byte; + BYTE nbBits; +} nodeElt; + + +/* ************************************************************** +* Debug Traces +****************************************************************/ + +#if DEBUGLEVEL >= 2 + +static size_t showU32(const U32* arr, size_t size) +{ + size_t u; + for (u=0; u= add) { + assert(add < align); + assert(((size_t)aligned & mask) == 0); + *workspaceSizePtr -= add; + return aligned; + } else { + *workspaceSizePtr = 0; + return NULL; + } +} + + +/* HUF_compressWeights() : + * Same as FSE_compress(), but dedicated to huff0's weights compression. + * The use case needs much less stack memory. + * Note : all elements within weightTable are supposed to be <= HUF_TABLELOG_MAX. + */ +#define MAX_FSE_TABLELOG_FOR_HUFF_HEADER 6 + +typedef struct { + FSE_CTable CTable[FSE_CTABLE_SIZE_U32(MAX_FSE_TABLELOG_FOR_HUFF_HEADER, HUF_TABLELOG_MAX)]; + U32 scratchBuffer[FSE_BUILD_CTABLE_WORKSPACE_SIZE_U32(HUF_TABLELOG_MAX, MAX_FSE_TABLELOG_FOR_HUFF_HEADER)]; + unsigned count[HUF_TABLELOG_MAX+1]; + S16 norm[HUF_TABLELOG_MAX+1]; +} HUF_CompressWeightsWksp; + +static size_t +HUF_compressWeights(void* dst, size_t dstSize, + const void* weightTable, size_t wtSize, + void* workspace, size_t workspaceSize) +{ + BYTE* const ostart = (BYTE*) dst; + BYTE* op = ostart; + BYTE* const oend = ostart + dstSize; + + unsigned maxSymbolValue = HUF_TABLELOG_MAX; + U32 tableLog = MAX_FSE_TABLELOG_FOR_HUFF_HEADER; + HUF_CompressWeightsWksp* wksp = (HUF_CompressWeightsWksp*)HUF_alignUpWorkspace(workspace, &workspaceSize, ZSTD_ALIGNOF(U32)); + + if (workspaceSize < sizeof(HUF_CompressWeightsWksp)) return ERROR(GENERIC); + + /* init conditions */ + if (wtSize <= 1) return 0; /* Not compressible */ + + /* Scan input and build symbol stats */ + { unsigned const maxCount = HIST_count_simple(wksp->count, &maxSymbolValue, weightTable, wtSize); /* never fails */ + if (maxCount == wtSize) return 1; /* only a single symbol in src : rle */ + if (maxCount == 1) return 0; /* each symbol present maximum once => not compressible */ + } + + tableLog = FSE_optimalTableLog(tableLog, wtSize, maxSymbolValue); + CHECK_F( FSE_normalizeCount(wksp->norm, tableLog, wksp->count, wtSize, maxSymbolValue, /* useLowProbCount */ 0) ); + + /* Write table description header */ + { CHECK_V_F(hSize, FSE_writeNCount(op, (size_t)(oend-op), wksp->norm, maxSymbolValue, tableLog) ); + op += hSize; + } + + /* Compress */ + CHECK_F( FSE_buildCTable_wksp(wksp->CTable, wksp->norm, maxSymbolValue, tableLog, wksp->scratchBuffer, sizeof(wksp->scratchBuffer)) ); + { CHECK_V_F(cSize, FSE_compress_usingCTable(op, (size_t)(oend - op), weightTable, wtSize, wksp->CTable) ); + if (cSize == 0) return 0; /* not enough space for compressed data */ + op += cSize; + } + + return (size_t)(op-ostart); +} + +static size_t HUF_getNbBits(HUF_CElt elt) +{ + return elt & 0xFF; +} + +static size_t HUF_getNbBitsFast(HUF_CElt elt) +{ + return elt; +} + +static size_t HUF_getValue(HUF_CElt elt) +{ + return elt & ~(size_t)0xFF; +} + +static size_t HUF_getValueFast(HUF_CElt elt) +{ + return elt; +} + +static void HUF_setNbBits(HUF_CElt* elt, size_t nbBits) +{ + assert(nbBits <= HUF_TABLELOG_ABSOLUTEMAX); + *elt = nbBits; +} + +static void HUF_setValue(HUF_CElt* elt, size_t value) +{ + size_t const nbBits = HUF_getNbBits(*elt); + if (nbBits > 0) { + assert((value >> nbBits) == 0); + *elt |= value << (sizeof(HUF_CElt) * 8 - nbBits); + } +} + +HUF_CTableHeader HUF_readCTableHeader(HUF_CElt const* ctable) +{ + HUF_CTableHeader header; + ZSTD_memcpy(&header, ctable, sizeof(header)); + return header; +} + +static void HUF_writeCTableHeader(HUF_CElt* ctable, U32 tableLog, U32 maxSymbolValue) +{ + HUF_CTableHeader header; + HUF_STATIC_ASSERT(sizeof(ctable[0]) == sizeof(header)); + ZSTD_memset(&header, 0, sizeof(header)); + assert(tableLog < 256); + header.tableLog = (BYTE)tableLog; + assert(maxSymbolValue < 256); + header.maxSymbolValue = (BYTE)maxSymbolValue; + ZSTD_memcpy(ctable, &header, sizeof(header)); +} + +typedef struct { + HUF_CompressWeightsWksp wksp; + BYTE bitsToWeight[HUF_TABLELOG_MAX + 1]; /* precomputed conversion table */ + BYTE huffWeight[HUF_SYMBOLVALUE_MAX]; +} HUF_WriteCTableWksp; + +size_t HUF_writeCTable_wksp(void* dst, size_t maxDstSize, + const HUF_CElt* CTable, unsigned maxSymbolValue, unsigned huffLog, + void* workspace, size_t workspaceSize) +{ + HUF_CElt const* const ct = CTable + 1; + BYTE* op = (BYTE*)dst; + U32 n; + HUF_WriteCTableWksp* wksp = (HUF_WriteCTableWksp*)HUF_alignUpWorkspace(workspace, &workspaceSize, ZSTD_ALIGNOF(U32)); + + HUF_STATIC_ASSERT(HUF_CTABLE_WORKSPACE_SIZE >= sizeof(HUF_WriteCTableWksp)); + + assert(HUF_readCTableHeader(CTable).maxSymbolValue == maxSymbolValue); + assert(HUF_readCTableHeader(CTable).tableLog == huffLog); + + /* check conditions */ + if (workspaceSize < sizeof(HUF_WriteCTableWksp)) return ERROR(GENERIC); + if (maxSymbolValue > HUF_SYMBOLVALUE_MAX) return ERROR(maxSymbolValue_tooLarge); + + /* convert to weight */ + wksp->bitsToWeight[0] = 0; + for (n=1; nbitsToWeight[n] = (BYTE)(huffLog + 1 - n); + for (n=0; nhuffWeight[n] = wksp->bitsToWeight[HUF_getNbBits(ct[n])]; + + /* attempt weights compression by FSE */ + if (maxDstSize < 1) return ERROR(dstSize_tooSmall); + { CHECK_V_F(hSize, HUF_compressWeights(op+1, maxDstSize-1, wksp->huffWeight, maxSymbolValue, &wksp->wksp, sizeof(wksp->wksp)) ); + if ((hSize>1) & (hSize < maxSymbolValue/2)) { /* FSE compressed */ + op[0] = (BYTE)hSize; + return hSize+1; + } } + + /* write raw values as 4-bits (max : 15) */ + if (maxSymbolValue > (256-128)) return ERROR(GENERIC); /* should not happen : likely means source cannot be compressed */ + if (((maxSymbolValue+1)/2) + 1 > maxDstSize) return ERROR(dstSize_tooSmall); /* not enough space within dst buffer */ + op[0] = (BYTE)(128 /*special case*/ + (maxSymbolValue-1)); + wksp->huffWeight[maxSymbolValue] = 0; /* to be sure it doesn't cause msan issue in final combination */ + for (n=0; nhuffWeight[n] << 4) + wksp->huffWeight[n+1]); + return ((maxSymbolValue+1)/2) + 1; +} + + +size_t HUF_readCTable (HUF_CElt* CTable, unsigned* maxSymbolValuePtr, const void* src, size_t srcSize, unsigned* hasZeroWeights) +{ + BYTE huffWeight[HUF_SYMBOLVALUE_MAX + 1]; /* init not required, even though some static analyzer may complain */ + U32 rankVal[HUF_TABLELOG_ABSOLUTEMAX + 1]; /* large enough for values from 0 to 16 */ + U32 tableLog = 0; + U32 nbSymbols = 0; + HUF_CElt* const ct = CTable + 1; + + /* get symbol weights */ + CHECK_V_F(readSize, HUF_readStats(huffWeight, HUF_SYMBOLVALUE_MAX+1, rankVal, &nbSymbols, &tableLog, src, srcSize)); + *hasZeroWeights = (rankVal[0] > 0); + + /* check result */ + if (tableLog > HUF_TABLELOG_MAX) return ERROR(tableLog_tooLarge); + if (nbSymbols > *maxSymbolValuePtr+1) return ERROR(maxSymbolValue_tooSmall); + + *maxSymbolValuePtr = nbSymbols - 1; + + HUF_writeCTableHeader(CTable, tableLog, *maxSymbolValuePtr); + + /* Prepare base value per rank */ + { U32 n, nextRankStart = 0; + for (n=1; n<=tableLog; n++) { + U32 curr = nextRankStart; + nextRankStart += (rankVal[n] << (n-1)); + rankVal[n] = curr; + } } + + /* fill nbBits */ + { U32 n; for (n=0; nn=tableLog+1 */ + U16 valPerRank[HUF_TABLELOG_MAX+2] = {0}; + { U32 n; for (n=0; n0; n--) { /* start at n=tablelog <-> w=1 */ + valPerRank[n] = min; /* get starting value within each rank */ + min += nbPerRank[n]; + min >>= 1; + } } + /* assign value within rank, symbol order */ + { U32 n; for (n=0; n HUF_readCTableHeader(CTable).maxSymbolValue) + return 0; + return (U32)HUF_getNbBits(ct[symbolValue]); +} + + +/** + * HUF_setMaxHeight(): + * Try to enforce @targetNbBits on the Huffman tree described in @huffNode. + * + * It attempts to convert all nodes with nbBits > @targetNbBits + * to employ @targetNbBits instead. Then it adjusts the tree + * so that it remains a valid canonical Huffman tree. + * + * @pre The sum of the ranks of each symbol == 2^largestBits, + * where largestBits == huffNode[lastNonNull].nbBits. + * @post The sum of the ranks of each symbol == 2^largestBits, + * where largestBits is the return value (expected <= targetNbBits). + * + * @param huffNode The Huffman tree modified in place to enforce targetNbBits. + * It's presumed sorted, from most frequent to rarest symbol. + * @param lastNonNull The symbol with the lowest count in the Huffman tree. + * @param targetNbBits The allowed number of bits, which the Huffman tree + * may not respect. After this function the Huffman tree will + * respect targetNbBits. + * @return The maximum number of bits of the Huffman tree after adjustment. + */ +static U32 HUF_setMaxHeight(nodeElt* huffNode, U32 lastNonNull, U32 targetNbBits) +{ + const U32 largestBits = huffNode[lastNonNull].nbBits; + /* early exit : no elt > targetNbBits, so the tree is already valid. */ + if (largestBits <= targetNbBits) return largestBits; + + DEBUGLOG(5, "HUF_setMaxHeight (targetNbBits = %u)", targetNbBits); + + /* there are several too large elements (at least >= 2) */ + { int totalCost = 0; + const U32 baseCost = 1 << (largestBits - targetNbBits); + int n = (int)lastNonNull; + + /* Adjust any ranks > targetNbBits to targetNbBits. + * Compute totalCost, which is how far the sum of the ranks is + * we are over 2^largestBits after adjust the offending ranks. + */ + while (huffNode[n].nbBits > targetNbBits) { + totalCost += baseCost - (1 << (largestBits - huffNode[n].nbBits)); + huffNode[n].nbBits = (BYTE)targetNbBits; + n--; + } + /* n stops at huffNode[n].nbBits <= targetNbBits */ + assert(huffNode[n].nbBits <= targetNbBits); + /* n end at index of smallest symbol using < targetNbBits */ + while (huffNode[n].nbBits == targetNbBits) --n; + + /* renorm totalCost from 2^largestBits to 2^targetNbBits + * note : totalCost is necessarily a multiple of baseCost */ + assert(((U32)totalCost & (baseCost - 1)) == 0); + totalCost >>= (largestBits - targetNbBits); + assert(totalCost > 0); + + /* repay normalized cost */ + { U32 const noSymbol = 0xF0F0F0F0; + U32 rankLast[HUF_TABLELOG_MAX+2]; + + /* Get pos of last (smallest = lowest cum. count) symbol per rank */ + ZSTD_memset(rankLast, 0xF0, sizeof(rankLast)); + { U32 currentNbBits = targetNbBits; + int pos; + for (pos=n ; pos >= 0; pos--) { + if (huffNode[pos].nbBits >= currentNbBits) continue; + currentNbBits = huffNode[pos].nbBits; /* < targetNbBits */ + rankLast[targetNbBits-currentNbBits] = (U32)pos; + } } + + while (totalCost > 0) { + /* Try to reduce the next power of 2 above totalCost because we + * gain back half the rank. + */ + U32 nBitsToDecrease = ZSTD_highbit32((U32)totalCost) + 1; + for ( ; nBitsToDecrease > 1; nBitsToDecrease--) { + U32 const highPos = rankLast[nBitsToDecrease]; + U32 const lowPos = rankLast[nBitsToDecrease-1]; + if (highPos == noSymbol) continue; + /* Decrease highPos if no symbols of lowPos or if it is + * not cheaper to remove 2 lowPos than highPos. + */ + if (lowPos == noSymbol) break; + { U32 const highTotal = huffNode[highPos].count; + U32 const lowTotal = 2 * huffNode[lowPos].count; + if (highTotal <= lowTotal) break; + } } + /* only triggered when no more rank 1 symbol left => find closest one (note : there is necessarily at least one !) */ + assert(rankLast[nBitsToDecrease] != noSymbol || nBitsToDecrease == 1); + /* HUF_MAX_TABLELOG test just to please gcc 5+; but it should not be necessary */ + while ((nBitsToDecrease<=HUF_TABLELOG_MAX) && (rankLast[nBitsToDecrease] == noSymbol)) + nBitsToDecrease++; + assert(rankLast[nBitsToDecrease] != noSymbol); + /* Increase the number of bits to gain back half the rank cost. */ + totalCost -= 1 << (nBitsToDecrease-1); + huffNode[rankLast[nBitsToDecrease]].nbBits++; + + /* Fix up the new rank. + * If the new rank was empty, this symbol is now its smallest. + * Otherwise, this symbol will be the largest in the new rank so no adjustment. + */ + if (rankLast[nBitsToDecrease-1] == noSymbol) + rankLast[nBitsToDecrease-1] = rankLast[nBitsToDecrease]; + /* Fix up the old rank. + * If the symbol was at position 0, meaning it was the highest weight symbol in the tree, + * it must be the only symbol in its rank, so the old rank now has no symbols. + * Otherwise, since the Huffman nodes are sorted by count, the previous position is now + * the smallest node in the rank. If the previous position belongs to a different rank, + * then the rank is now empty. + */ + if (rankLast[nBitsToDecrease] == 0) /* special case, reached largest symbol */ + rankLast[nBitsToDecrease] = noSymbol; + else { + rankLast[nBitsToDecrease]--; + if (huffNode[rankLast[nBitsToDecrease]].nbBits != targetNbBits-nBitsToDecrease) + rankLast[nBitsToDecrease] = noSymbol; /* this rank is now empty */ + } + } /* while (totalCost > 0) */ + + /* If we've removed too much weight, then we have to add it back. + * To avoid overshooting again, we only adjust the smallest rank. + * We take the largest nodes from the lowest rank 0 and move them + * to rank 1. There's guaranteed to be enough rank 0 symbols because + * TODO. + */ + while (totalCost < 0) { /* Sometimes, cost correction overshoot */ + /* special case : no rank 1 symbol (using targetNbBits-1); + * let's create one from largest rank 0 (using targetNbBits). + */ + if (rankLast[1] == noSymbol) { + while (huffNode[n].nbBits == targetNbBits) n--; + huffNode[n+1].nbBits--; + assert(n >= 0); + rankLast[1] = (U32)(n+1); + totalCost++; + continue; + } + huffNode[ rankLast[1] + 1 ].nbBits--; + rankLast[1]++; + totalCost ++; + } + } /* repay normalized cost */ + } /* there are several too large elements (at least >= 2) */ + + return targetNbBits; +} + +typedef struct { + U16 base; + U16 curr; +} rankPos; + +typedef nodeElt huffNodeTable[2 * (HUF_SYMBOLVALUE_MAX + 1)]; + +/* Number of buckets available for HUF_sort() */ +#define RANK_POSITION_TABLE_SIZE 192 + +typedef struct { + huffNodeTable huffNodeTbl; + rankPos rankPosition[RANK_POSITION_TABLE_SIZE]; +} HUF_buildCTable_wksp_tables; + +/* RANK_POSITION_DISTINCT_COUNT_CUTOFF == Cutoff point in HUF_sort() buckets for which we use log2 bucketing. + * Strategy is to use as many buckets as possible for representing distinct + * counts while using the remainder to represent all "large" counts. + * + * To satisfy this requirement for 192 buckets, we can do the following: + * Let buckets 0-166 represent distinct counts of [0, 166] + * Let buckets 166 to 192 represent all remaining counts up to RANK_POSITION_MAX_COUNT_LOG using log2 bucketing. + */ +#define RANK_POSITION_MAX_COUNT_LOG 32 +#define RANK_POSITION_LOG_BUCKETS_BEGIN ((RANK_POSITION_TABLE_SIZE - 1) - RANK_POSITION_MAX_COUNT_LOG - 1 /* == 158 */) +#define RANK_POSITION_DISTINCT_COUNT_CUTOFF (RANK_POSITION_LOG_BUCKETS_BEGIN + ZSTD_highbit32(RANK_POSITION_LOG_BUCKETS_BEGIN) /* == 166 */) + +/* Return the appropriate bucket index for a given count. See definition of + * RANK_POSITION_DISTINCT_COUNT_CUTOFF for explanation of bucketing strategy. + */ +static U32 HUF_getIndex(U32 const count) { + return (count < RANK_POSITION_DISTINCT_COUNT_CUTOFF) + ? count + : ZSTD_highbit32(count) + RANK_POSITION_LOG_BUCKETS_BEGIN; +} + +/* Helper swap function for HUF_quickSortPartition() */ +static void HUF_swapNodes(nodeElt* a, nodeElt* b) { + nodeElt tmp = *a; + *a = *b; + *b = tmp; +} + +/* Returns 0 if the huffNode array is not sorted by descending count */ +MEM_STATIC int HUF_isSorted(nodeElt huffNode[], U32 const maxSymbolValue1) { + U32 i; + for (i = 1; i < maxSymbolValue1; ++i) { + if (huffNode[i].count > huffNode[i-1].count) { + return 0; + } + } + return 1; +} + +/* Insertion sort by descending order */ +HINT_INLINE void HUF_insertionSort(nodeElt huffNode[], int const low, int const high) { + int i; + int const size = high-low+1; + huffNode += low; + for (i = 1; i < size; ++i) { + nodeElt const key = huffNode[i]; + int j = i - 1; + while (j >= 0 && huffNode[j].count < key.count) { + huffNode[j + 1] = huffNode[j]; + j--; + } + huffNode[j + 1] = key; + } +} + +/* Pivot helper function for quicksort. */ +static int HUF_quickSortPartition(nodeElt arr[], int const low, int const high) { + /* Simply select rightmost element as pivot. "Better" selectors like + * median-of-three don't experimentally appear to have any benefit. + */ + U32 const pivot = arr[high].count; + int i = low - 1; + int j = low; + for ( ; j < high; j++) { + if (arr[j].count > pivot) { + i++; + HUF_swapNodes(&arr[i], &arr[j]); + } + } + HUF_swapNodes(&arr[i + 1], &arr[high]); + return i + 1; +} + +/* Classic quicksort by descending with partially iterative calls + * to reduce worst case callstack size. + */ +static void HUF_simpleQuickSort(nodeElt arr[], int low, int high) { + int const kInsertionSortThreshold = 8; + if (high - low < kInsertionSortThreshold) { + HUF_insertionSort(arr, low, high); + return; + } + while (low < high) { + int const idx = HUF_quickSortPartition(arr, low, high); + if (idx - low < high - idx) { + HUF_simpleQuickSort(arr, low, idx - 1); + low = idx + 1; + } else { + HUF_simpleQuickSort(arr, idx + 1, high); + high = idx - 1; + } + } +} + +/** + * HUF_sort(): + * Sorts the symbols [0, maxSymbolValue] by count[symbol] in decreasing order. + * This is a typical bucket sorting strategy that uses either quicksort or insertion sort to sort each bucket. + * + * @param[out] huffNode Sorted symbols by decreasing count. Only members `.count` and `.byte` are filled. + * Must have (maxSymbolValue + 1) entries. + * @param[in] count Histogram of the symbols. + * @param[in] maxSymbolValue Maximum symbol value. + * @param rankPosition This is a scratch workspace. Must have RANK_POSITION_TABLE_SIZE entries. + */ +static void HUF_sort(nodeElt huffNode[], const unsigned count[], U32 const maxSymbolValue, rankPos rankPosition[]) { + U32 n; + U32 const maxSymbolValue1 = maxSymbolValue+1; + + /* Compute base and set curr to base. + * For symbol s let lowerRank = HUF_getIndex(count[n]) and rank = lowerRank + 1. + * See HUF_getIndex to see bucketing strategy. + * We attribute each symbol to lowerRank's base value, because we want to know where + * each rank begins in the output, so for rank R we want to count ranks R+1 and above. + */ + ZSTD_memset(rankPosition, 0, sizeof(*rankPosition) * RANK_POSITION_TABLE_SIZE); + for (n = 0; n < maxSymbolValue1; ++n) { + U32 lowerRank = HUF_getIndex(count[n]); + assert(lowerRank < RANK_POSITION_TABLE_SIZE - 1); + rankPosition[lowerRank].base++; + } + + assert(rankPosition[RANK_POSITION_TABLE_SIZE - 1].base == 0); + /* Set up the rankPosition table */ + for (n = RANK_POSITION_TABLE_SIZE - 1; n > 0; --n) { + rankPosition[n-1].base += rankPosition[n].base; + rankPosition[n-1].curr = rankPosition[n-1].base; + } + + /* Insert each symbol into their appropriate bucket, setting up rankPosition table. */ + for (n = 0; n < maxSymbolValue1; ++n) { + U32 const c = count[n]; + U32 const r = HUF_getIndex(c) + 1; + U32 const pos = rankPosition[r].curr++; + assert(pos < maxSymbolValue1); + huffNode[pos].count = c; + huffNode[pos].byte = (BYTE)n; + } + + /* Sort each bucket. */ + for (n = RANK_POSITION_DISTINCT_COUNT_CUTOFF; n < RANK_POSITION_TABLE_SIZE - 1; ++n) { + int const bucketSize = rankPosition[n].curr - rankPosition[n].base; + U32 const bucketStartIdx = rankPosition[n].base; + if (bucketSize > 1) { + assert(bucketStartIdx < maxSymbolValue1); + HUF_simpleQuickSort(huffNode + bucketStartIdx, 0, bucketSize-1); + } + } + + assert(HUF_isSorted(huffNode, maxSymbolValue1)); +} + + +/** HUF_buildCTable_wksp() : + * Same as HUF_buildCTable(), but using externally allocated scratch buffer. + * `workSpace` must be aligned on 4-bytes boundaries, and be at least as large as sizeof(HUF_buildCTable_wksp_tables). + */ +#define STARTNODE (HUF_SYMBOLVALUE_MAX+1) + +/* HUF_buildTree(): + * Takes the huffNode array sorted by HUF_sort() and builds an unlimited-depth Huffman tree. + * + * @param huffNode The array sorted by HUF_sort(). Builds the Huffman tree in this array. + * @param maxSymbolValue The maximum symbol value. + * @return The smallest node in the Huffman tree (by count). + */ +static int HUF_buildTree(nodeElt* huffNode, U32 maxSymbolValue) +{ + nodeElt* const huffNode0 = huffNode - 1; + int nonNullRank; + int lowS, lowN; + int nodeNb = STARTNODE; + int n, nodeRoot; + DEBUGLOG(5, "HUF_buildTree (alphabet size = %u)", maxSymbolValue + 1); + /* init for parents */ + nonNullRank = (int)maxSymbolValue; + while(huffNode[nonNullRank].count == 0) nonNullRank--; + lowS = nonNullRank; nodeRoot = nodeNb + lowS - 1; lowN = nodeNb; + huffNode[nodeNb].count = huffNode[lowS].count + huffNode[lowS-1].count; + huffNode[lowS].parent = huffNode[lowS-1].parent = (U16)nodeNb; + nodeNb++; lowS-=2; + for (n=nodeNb; n<=nodeRoot; n++) huffNode[n].count = (U32)(1U<<30); + huffNode0[0].count = (U32)(1U<<31); /* fake entry, strong barrier */ + + /* create parents */ + while (nodeNb <= nodeRoot) { + int const n1 = (huffNode[lowS].count < huffNode[lowN].count) ? lowS-- : lowN++; + int const n2 = (huffNode[lowS].count < huffNode[lowN].count) ? lowS-- : lowN++; + huffNode[nodeNb].count = huffNode[n1].count + huffNode[n2].count; + huffNode[n1].parent = huffNode[n2].parent = (U16)nodeNb; + nodeNb++; + } + + /* distribute weights (unlimited tree height) */ + huffNode[nodeRoot].nbBits = 0; + for (n=nodeRoot-1; n>=STARTNODE; n--) + huffNode[n].nbBits = huffNode[ huffNode[n].parent ].nbBits + 1; + for (n=0; n<=nonNullRank; n++) + huffNode[n].nbBits = huffNode[ huffNode[n].parent ].nbBits + 1; + + DEBUGLOG(6, "Initial distribution of bits completed (%zu sorted symbols)", showHNodeBits(huffNode, maxSymbolValue+1)); + + return nonNullRank; +} + +/** + * HUF_buildCTableFromTree(): + * Build the CTable given the Huffman tree in huffNode. + * + * @param[out] CTable The output Huffman CTable. + * @param huffNode The Huffman tree. + * @param nonNullRank The last and smallest node in the Huffman tree. + * @param maxSymbolValue The maximum symbol value. + * @param maxNbBits The exact maximum number of bits used in the Huffman tree. + */ +static void HUF_buildCTableFromTree(HUF_CElt* CTable, nodeElt const* huffNode, int nonNullRank, U32 maxSymbolValue, U32 maxNbBits) +{ + HUF_CElt* const ct = CTable + 1; + /* fill result into ctable (val, nbBits) */ + int n; + U16 nbPerRank[HUF_TABLELOG_MAX+1] = {0}; + U16 valPerRank[HUF_TABLELOG_MAX+1] = {0}; + int const alphabetSize = (int)(maxSymbolValue + 1); + for (n=0; n<=nonNullRank; n++) + nbPerRank[huffNode[n].nbBits]++; + /* determine starting value per rank */ + { U16 min = 0; + for (n=(int)maxNbBits; n>0; n--) { + valPerRank[n] = min; /* get starting value within each rank */ + min += nbPerRank[n]; + min >>= 1; + } } + for (n=0; nhuffNodeTbl; + nodeElt* const huffNode = huffNode0+1; + int nonNullRank; + + HUF_STATIC_ASSERT(HUF_CTABLE_WORKSPACE_SIZE == sizeof(HUF_buildCTable_wksp_tables)); + + DEBUGLOG(5, "HUF_buildCTable_wksp (alphabet size = %u)", maxSymbolValue+1); + + /* safety checks */ + if (wkspSize < sizeof(HUF_buildCTable_wksp_tables)) + return ERROR(workSpace_tooSmall); + if (maxNbBits == 0) maxNbBits = HUF_TABLELOG_DEFAULT; + if (maxSymbolValue > HUF_SYMBOLVALUE_MAX) + return ERROR(maxSymbolValue_tooLarge); + ZSTD_memset(huffNode0, 0, sizeof(huffNodeTable)); + + /* sort, decreasing order */ + HUF_sort(huffNode, count, maxSymbolValue, wksp_tables->rankPosition); + DEBUGLOG(6, "sorted symbols completed (%zu symbols)", showHNodeSymbols(huffNode, maxSymbolValue+1)); + + /* build tree */ + nonNullRank = HUF_buildTree(huffNode, maxSymbolValue); + + /* determine and enforce maxTableLog */ + maxNbBits = HUF_setMaxHeight(huffNode, (U32)nonNullRank, maxNbBits); + if (maxNbBits > HUF_TABLELOG_MAX) return ERROR(GENERIC); /* check fit into table */ + + HUF_buildCTableFromTree(CTable, huffNode, nonNullRank, maxSymbolValue, maxNbBits); + + return maxNbBits; +} + +size_t HUF_estimateCompressedSize(const HUF_CElt* CTable, const unsigned* count, unsigned maxSymbolValue) +{ + HUF_CElt const* ct = CTable + 1; + size_t nbBits = 0; + int s; + for (s = 0; s <= (int)maxSymbolValue; ++s) { + nbBits += HUF_getNbBits(ct[s]) * count[s]; + } + return nbBits >> 3; +} + +int HUF_validateCTable(const HUF_CElt* CTable, const unsigned* count, unsigned maxSymbolValue) { + HUF_CTableHeader header = HUF_readCTableHeader(CTable); + HUF_CElt const* ct = CTable + 1; + int bad = 0; + int s; + + assert(header.tableLog <= HUF_TABLELOG_ABSOLUTEMAX); + + if (header.maxSymbolValue < maxSymbolValue) + return 0; + + for (s = 0; s <= (int)maxSymbolValue; ++s) { + bad |= (count[s] != 0) & (HUF_getNbBits(ct[s]) == 0); + } + return !bad; +} + +size_t HUF_compressBound(size_t size) { return HUF_COMPRESSBOUND(size); } + +/** HUF_CStream_t: + * Huffman uses its own BIT_CStream_t implementation. + * There are three major differences from BIT_CStream_t: + * 1. HUF_addBits() takes a HUF_CElt (size_t) which is + * the pair (nbBits, value) in the format: + * format: + * - Bits [0, 4) = nbBits + * - Bits [4, 64 - nbBits) = 0 + * - Bits [64 - nbBits, 64) = value + * 2. The bitContainer is built from the upper bits and + * right shifted. E.g. to add a new value of N bits + * you right shift the bitContainer by N, then or in + * the new value into the N upper bits. + * 3. The bitstream has two bit containers. You can add + * bits to the second container and merge them into + * the first container. + */ + +#define HUF_BITS_IN_CONTAINER (sizeof(size_t) * 8) + +typedef struct { + size_t bitContainer[2]; + size_t bitPos[2]; + + BYTE* startPtr; + BYTE* ptr; + BYTE* endPtr; +} HUF_CStream_t; + +/**! HUF_initCStream(): + * Initializes the bitstream. + * @returns 0 or an error code. + */ +static size_t HUF_initCStream(HUF_CStream_t* bitC, + void* startPtr, size_t dstCapacity) +{ + ZSTD_memset(bitC, 0, sizeof(*bitC)); + bitC->startPtr = (BYTE*)startPtr; + bitC->ptr = bitC->startPtr; + bitC->endPtr = bitC->startPtr + dstCapacity - sizeof(bitC->bitContainer[0]); + if (dstCapacity <= sizeof(bitC->bitContainer[0])) return ERROR(dstSize_tooSmall); + return 0; +} + +/*! HUF_addBits(): + * Adds the symbol stored in HUF_CElt elt to the bitstream. + * + * @param elt The element we're adding. This is a (nbBits, value) pair. + * See the HUF_CStream_t docs for the format. + * @param idx Insert into the bitstream at this idx. + * @param kFast This is a template parameter. If the bitstream is guaranteed + * to have at least 4 unused bits after this call it may be 1, + * otherwise it must be 0. HUF_addBits() is faster when fast is set. + */ +FORCE_INLINE_TEMPLATE void HUF_addBits(HUF_CStream_t* bitC, HUF_CElt elt, int idx, int kFast) +{ + assert(idx <= 1); + assert(HUF_getNbBits(elt) <= HUF_TABLELOG_ABSOLUTEMAX); + /* This is efficient on x86-64 with BMI2 because shrx + * only reads the low 6 bits of the register. The compiler + * knows this and elides the mask. When fast is set, + * every operation can use the same value loaded from elt. + */ + bitC->bitContainer[idx] >>= HUF_getNbBits(elt); + bitC->bitContainer[idx] |= kFast ? HUF_getValueFast(elt) : HUF_getValue(elt); + /* We only read the low 8 bits of bitC->bitPos[idx] so it + * doesn't matter that the high bits have noise from the value. + */ + bitC->bitPos[idx] += HUF_getNbBitsFast(elt); + assert((bitC->bitPos[idx] & 0xFF) <= HUF_BITS_IN_CONTAINER); + /* The last 4-bits of elt are dirty if fast is set, + * so we must not be overwriting bits that have already been + * inserted into the bit container. + */ +#if DEBUGLEVEL >= 1 + { + size_t const nbBits = HUF_getNbBits(elt); + size_t const dirtyBits = nbBits == 0 ? 0 : ZSTD_highbit32((U32)nbBits) + 1; + (void)dirtyBits; + /* Middle bits are 0. */ + assert(((elt >> dirtyBits) << (dirtyBits + nbBits)) == 0); + /* We didn't overwrite any bits in the bit container. */ + assert(!kFast || (bitC->bitPos[idx] & 0xFF) <= HUF_BITS_IN_CONTAINER); + (void)dirtyBits; + } +#endif +} + +FORCE_INLINE_TEMPLATE void HUF_zeroIndex1(HUF_CStream_t* bitC) +{ + bitC->bitContainer[1] = 0; + bitC->bitPos[1] = 0; +} + +/*! HUF_mergeIndex1() : + * Merges the bit container @ index 1 into the bit container @ index 0 + * and zeros the bit container @ index 1. + */ +FORCE_INLINE_TEMPLATE void HUF_mergeIndex1(HUF_CStream_t* bitC) +{ + assert((bitC->bitPos[1] & 0xFF) < HUF_BITS_IN_CONTAINER); + bitC->bitContainer[0] >>= (bitC->bitPos[1] & 0xFF); + bitC->bitContainer[0] |= bitC->bitContainer[1]; + bitC->bitPos[0] += bitC->bitPos[1]; + assert((bitC->bitPos[0] & 0xFF) <= HUF_BITS_IN_CONTAINER); +} + +/*! HUF_flushBits() : +* Flushes the bits in the bit container @ index 0. +* +* @post bitPos will be < 8. +* @param kFast If kFast is set then we must know a-priori that +* the bit container will not overflow. +*/ +FORCE_INLINE_TEMPLATE void HUF_flushBits(HUF_CStream_t* bitC, int kFast) +{ + /* The upper bits of bitPos are noisy, so we must mask by 0xFF. */ + size_t const nbBits = bitC->bitPos[0] & 0xFF; + size_t const nbBytes = nbBits >> 3; + /* The top nbBits bits of bitContainer are the ones we need. */ + size_t const bitContainer = bitC->bitContainer[0] >> (HUF_BITS_IN_CONTAINER - nbBits); + /* Mask bitPos to account for the bytes we consumed. */ + bitC->bitPos[0] &= 7; + assert(nbBits > 0); + assert(nbBits <= sizeof(bitC->bitContainer[0]) * 8); + assert(bitC->ptr <= bitC->endPtr); + MEM_writeLEST(bitC->ptr, bitContainer); + bitC->ptr += nbBytes; + assert(!kFast || bitC->ptr <= bitC->endPtr); + if (!kFast && bitC->ptr > bitC->endPtr) bitC->ptr = bitC->endPtr; + /* bitContainer doesn't need to be modified because the leftover + * bits are already the top bitPos bits. And we don't care about + * noise in the lower values. + */ +} + +/*! HUF_endMark() + * @returns The Huffman stream end mark: A 1-bit value = 1. + */ +static HUF_CElt HUF_endMark(void) +{ + HUF_CElt endMark; + HUF_setNbBits(&endMark, 1); + HUF_setValue(&endMark, 1); + return endMark; +} + +/*! HUF_closeCStream() : + * @return Size of CStream, in bytes, + * or 0 if it could not fit into dstBuffer */ +static size_t HUF_closeCStream(HUF_CStream_t* bitC) +{ + HUF_addBits(bitC, HUF_endMark(), /* idx */ 0, /* kFast */ 0); + HUF_flushBits(bitC, /* kFast */ 0); + { + size_t const nbBits = bitC->bitPos[0] & 0xFF; + if (bitC->ptr >= bitC->endPtr) return 0; /* overflow detected */ + return (size_t)(bitC->ptr - bitC->startPtr) + (nbBits > 0); + } +} + +FORCE_INLINE_TEMPLATE void +HUF_encodeSymbol(HUF_CStream_t* bitCPtr, U32 symbol, const HUF_CElt* CTable, int idx, int fast) +{ + HUF_addBits(bitCPtr, CTable[symbol], idx, fast); +} + +FORCE_INLINE_TEMPLATE void +HUF_compress1X_usingCTable_internal_body_loop(HUF_CStream_t* bitC, + const BYTE* ip, size_t srcSize, + const HUF_CElt* ct, + int kUnroll, int kFastFlush, int kLastFast) +{ + /* Join to kUnroll */ + int n = (int)srcSize; + int rem = n % kUnroll; + if (rem > 0) { + for (; rem > 0; --rem) { + HUF_encodeSymbol(bitC, ip[--n], ct, 0, /* fast */ 0); + } + HUF_flushBits(bitC, kFastFlush); + } + assert(n % kUnroll == 0); + + /* Join to 2 * kUnroll */ + if (n % (2 * kUnroll)) { + int u; + for (u = 1; u < kUnroll; ++u) { + HUF_encodeSymbol(bitC, ip[n - u], ct, 0, 1); + } + HUF_encodeSymbol(bitC, ip[n - kUnroll], ct, 0, kLastFast); + HUF_flushBits(bitC, kFastFlush); + n -= kUnroll; + } + assert(n % (2 * kUnroll) == 0); + + for (; n>0; n-= 2 * kUnroll) { + /* Encode kUnroll symbols into the bitstream @ index 0. */ + int u; + for (u = 1; u < kUnroll; ++u) { + HUF_encodeSymbol(bitC, ip[n - u], ct, /* idx */ 0, /* fast */ 1); + } + HUF_encodeSymbol(bitC, ip[n - kUnroll], ct, /* idx */ 0, /* fast */ kLastFast); + HUF_flushBits(bitC, kFastFlush); + /* Encode kUnroll symbols into the bitstream @ index 1. + * This allows us to start filling the bit container + * without any data dependencies. + */ + HUF_zeroIndex1(bitC); + for (u = 1; u < kUnroll; ++u) { + HUF_encodeSymbol(bitC, ip[n - kUnroll - u], ct, /* idx */ 1, /* fast */ 1); + } + HUF_encodeSymbol(bitC, ip[n - kUnroll - kUnroll], ct, /* idx */ 1, /* fast */ kLastFast); + /* Merge bitstream @ index 1 into the bitstream @ index 0 */ + HUF_mergeIndex1(bitC); + HUF_flushBits(bitC, kFastFlush); + } + assert(n == 0); + +} + +/** + * Returns a tight upper bound on the output space needed by Huffman + * with 8 bytes buffer to handle over-writes. If the output is at least + * this large we don't need to do bounds checks during Huffman encoding. + */ +static size_t HUF_tightCompressBound(size_t srcSize, size_t tableLog) +{ + return ((srcSize * tableLog) >> 3) + 8; +} + + +FORCE_INLINE_TEMPLATE size_t +HUF_compress1X_usingCTable_internal_body(void* dst, size_t dstSize, + const void* src, size_t srcSize, + const HUF_CElt* CTable) +{ + U32 const tableLog = HUF_readCTableHeader(CTable).tableLog; + HUF_CElt const* ct = CTable + 1; + const BYTE* ip = (const BYTE*) src; + BYTE* const ostart = (BYTE*)dst; + BYTE* const oend = ostart + dstSize; + HUF_CStream_t bitC; + + /* init */ + if (dstSize < 8) return 0; /* not enough space to compress */ + { BYTE* op = ostart; + size_t const initErr = HUF_initCStream(&bitC, op, (size_t)(oend-op)); + if (HUF_isError(initErr)) return 0; } + + if (dstSize < HUF_tightCompressBound(srcSize, (size_t)tableLog) || tableLog > 11) + HUF_compress1X_usingCTable_internal_body_loop(&bitC, ip, srcSize, ct, /* kUnroll */ MEM_32bits() ? 2 : 4, /* kFast */ 0, /* kLastFast */ 0); + else { + if (MEM_32bits()) { + switch (tableLog) { + case 11: + HUF_compress1X_usingCTable_internal_body_loop(&bitC, ip, srcSize, ct, /* kUnroll */ 2, /* kFastFlush */ 1, /* kLastFast */ 0); + break; + case 10: ZSTD_FALLTHROUGH; + case 9: ZSTD_FALLTHROUGH; + case 8: + HUF_compress1X_usingCTable_internal_body_loop(&bitC, ip, srcSize, ct, /* kUnroll */ 2, /* kFastFlush */ 1, /* kLastFast */ 1); + break; + case 7: ZSTD_FALLTHROUGH; + default: + HUF_compress1X_usingCTable_internal_body_loop(&bitC, ip, srcSize, ct, /* kUnroll */ 3, /* kFastFlush */ 1, /* kLastFast */ 1); + break; + } + } else { + switch (tableLog) { + case 11: + HUF_compress1X_usingCTable_internal_body_loop(&bitC, ip, srcSize, ct, /* kUnroll */ 5, /* kFastFlush */ 1, /* kLastFast */ 0); + break; + case 10: + HUF_compress1X_usingCTable_internal_body_loop(&bitC, ip, srcSize, ct, /* kUnroll */ 5, /* kFastFlush */ 1, /* kLastFast */ 1); + break; + case 9: + HUF_compress1X_usingCTable_internal_body_loop(&bitC, ip, srcSize, ct, /* kUnroll */ 6, /* kFastFlush */ 1, /* kLastFast */ 0); + break; + case 8: + HUF_compress1X_usingCTable_internal_body_loop(&bitC, ip, srcSize, ct, /* kUnroll */ 7, /* kFastFlush */ 1, /* kLastFast */ 0); + break; + case 7: + HUF_compress1X_usingCTable_internal_body_loop(&bitC, ip, srcSize, ct, /* kUnroll */ 8, /* kFastFlush */ 1, /* kLastFast */ 0); + break; + case 6: ZSTD_FALLTHROUGH; + default: + HUF_compress1X_usingCTable_internal_body_loop(&bitC, ip, srcSize, ct, /* kUnroll */ 9, /* kFastFlush */ 1, /* kLastFast */ 1); + break; + } + } + } + assert(bitC.ptr <= bitC.endPtr); + + return HUF_closeCStream(&bitC); +} + +#if DYNAMIC_BMI2 + +static BMI2_TARGET_ATTRIBUTE size_t +HUF_compress1X_usingCTable_internal_bmi2(void* dst, size_t dstSize, + const void* src, size_t srcSize, + const HUF_CElt* CTable) +{ + return HUF_compress1X_usingCTable_internal_body(dst, dstSize, src, srcSize, CTable); +} + +static size_t +HUF_compress1X_usingCTable_internal_default(void* dst, size_t dstSize, + const void* src, size_t srcSize, + const HUF_CElt* CTable) +{ + return HUF_compress1X_usingCTable_internal_body(dst, dstSize, src, srcSize, CTable); +} + +static size_t +HUF_compress1X_usingCTable_internal(void* dst, size_t dstSize, + const void* src, size_t srcSize, + const HUF_CElt* CTable, const int flags) +{ + if (flags & HUF_flags_bmi2) { + return HUF_compress1X_usingCTable_internal_bmi2(dst, dstSize, src, srcSize, CTable); + } + return HUF_compress1X_usingCTable_internal_default(dst, dstSize, src, srcSize, CTable); +} + +#else + +static size_t +HUF_compress1X_usingCTable_internal(void* dst, size_t dstSize, + const void* src, size_t srcSize, + const HUF_CElt* CTable, const int flags) +{ + (void)flags; + return HUF_compress1X_usingCTable_internal_body(dst, dstSize, src, srcSize, CTable); +} + +#endif + +size_t HUF_compress1X_usingCTable(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable, int flags) +{ + return HUF_compress1X_usingCTable_internal(dst, dstSize, src, srcSize, CTable, flags); +} + +static size_t +HUF_compress4X_usingCTable_internal(void* dst, size_t dstSize, + const void* src, size_t srcSize, + const HUF_CElt* CTable, int flags) +{ + size_t const segmentSize = (srcSize+3)/4; /* first 3 segments */ + const BYTE* ip = (const BYTE*) src; + const BYTE* const iend = ip + srcSize; + BYTE* const ostart = (BYTE*) dst; + BYTE* const oend = ostart + dstSize; + BYTE* op = ostart; + + if (dstSize < 6 + 1 + 1 + 1 + 8) return 0; /* minimum space to compress successfully */ + if (srcSize < 12) return 0; /* no saving possible : too small input */ + op += 6; /* jumpTable */ + + assert(op <= oend); + { CHECK_V_F(cSize, HUF_compress1X_usingCTable_internal(op, (size_t)(oend-op), ip, segmentSize, CTable, flags) ); + if (cSize == 0 || cSize > 65535) return 0; + MEM_writeLE16(ostart, (U16)cSize); + op += cSize; + } + + ip += segmentSize; + assert(op <= oend); + { CHECK_V_F(cSize, HUF_compress1X_usingCTable_internal(op, (size_t)(oend-op), ip, segmentSize, CTable, flags) ); + if (cSize == 0 || cSize > 65535) return 0; + MEM_writeLE16(ostart+2, (U16)cSize); + op += cSize; + } + + ip += segmentSize; + assert(op <= oend); + { CHECK_V_F(cSize, HUF_compress1X_usingCTable_internal(op, (size_t)(oend-op), ip, segmentSize, CTable, flags) ); + if (cSize == 0 || cSize > 65535) return 0; + MEM_writeLE16(ostart+4, (U16)cSize); + op += cSize; + } + + ip += segmentSize; + assert(op <= oend); + assert(ip <= iend); + { CHECK_V_F(cSize, HUF_compress1X_usingCTable_internal(op, (size_t)(oend-op), ip, (size_t)(iend-ip), CTable, flags) ); + if (cSize == 0 || cSize > 65535) return 0; + op += cSize; + } + + return (size_t)(op-ostart); +} + +size_t HUF_compress4X_usingCTable(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable, int flags) +{ + return HUF_compress4X_usingCTable_internal(dst, dstSize, src, srcSize, CTable, flags); +} + +typedef enum { HUF_singleStream, HUF_fourStreams } HUF_nbStreams_e; + +static size_t HUF_compressCTable_internal( + BYTE* const ostart, BYTE* op, BYTE* const oend, + const void* src, size_t srcSize, + HUF_nbStreams_e nbStreams, const HUF_CElt* CTable, const int flags) +{ + size_t const cSize = (nbStreams==HUF_singleStream) ? + HUF_compress1X_usingCTable_internal(op, (size_t)(oend - op), src, srcSize, CTable, flags) : + HUF_compress4X_usingCTable_internal(op, (size_t)(oend - op), src, srcSize, CTable, flags); + if (HUF_isError(cSize)) { return cSize; } + if (cSize==0) { return 0; } /* uncompressible */ + op += cSize; + /* check compressibility */ + assert(op >= ostart); + if ((size_t)(op-ostart) >= srcSize-1) { return 0; } + return (size_t)(op-ostart); +} + +typedef struct { + unsigned count[HUF_SYMBOLVALUE_MAX + 1]; + HUF_CElt CTable[HUF_CTABLE_SIZE_ST(HUF_SYMBOLVALUE_MAX)]; + union { + HUF_buildCTable_wksp_tables buildCTable_wksp; + HUF_WriteCTableWksp writeCTable_wksp; + U32 hist_wksp[HIST_WKSP_SIZE_U32]; + } wksps; +} HUF_compress_tables_t; + +#define SUSPECT_INCOMPRESSIBLE_SAMPLE_SIZE 4096 +#define SUSPECT_INCOMPRESSIBLE_SAMPLE_RATIO 10 /* Must be >= 2 */ + +unsigned HUF_cardinality(const unsigned* count, unsigned maxSymbolValue) +{ + unsigned cardinality = 0; + unsigned i; + + for (i = 0; i < maxSymbolValue + 1; i++) { + if (count[i] != 0) cardinality += 1; + } + + return cardinality; +} + +unsigned HUF_minTableLog(unsigned symbolCardinality) +{ + U32 minBitsSymbols = ZSTD_highbit32(symbolCardinality) + 1; + return minBitsSymbols; +} + +unsigned HUF_optimalTableLog( + unsigned maxTableLog, + size_t srcSize, + unsigned maxSymbolValue, + void* workSpace, size_t wkspSize, + HUF_CElt* table, + const unsigned* count, + int flags) +{ + assert(srcSize > 1); /* Not supported, RLE should be used instead */ + assert(wkspSize >= sizeof(HUF_buildCTable_wksp_tables)); + + if (!(flags & HUF_flags_optimalDepth)) { + /* cheap evaluation, based on FSE */ + return FSE_optimalTableLog_internal(maxTableLog, srcSize, maxSymbolValue, 1); + } + + { BYTE* dst = (BYTE*)workSpace + sizeof(HUF_WriteCTableWksp); + size_t dstSize = wkspSize - sizeof(HUF_WriteCTableWksp); + size_t hSize, newSize; + const unsigned symbolCardinality = HUF_cardinality(count, maxSymbolValue); + const unsigned minTableLog = HUF_minTableLog(symbolCardinality); + size_t optSize = ((size_t) ~0) - 1; + unsigned optLog = maxTableLog, optLogGuess; + + DEBUGLOG(6, "HUF_optimalTableLog: probing huf depth (srcSize=%zu)", srcSize); + + /* Search until size increases */ + for (optLogGuess = minTableLog; optLogGuess <= maxTableLog; optLogGuess++) { + DEBUGLOG(7, "checking for huffLog=%u", optLogGuess); + + { size_t maxBits = HUF_buildCTable_wksp(table, count, maxSymbolValue, optLogGuess, workSpace, wkspSize); + if (ERR_isError(maxBits)) continue; + + if (maxBits < optLogGuess && optLogGuess > minTableLog) break; + + hSize = HUF_writeCTable_wksp(dst, dstSize, table, maxSymbolValue, (U32)maxBits, workSpace, wkspSize); + } + + if (ERR_isError(hSize)) continue; + + newSize = HUF_estimateCompressedSize(table, count, maxSymbolValue) + hSize; + + if (newSize > optSize + 1) { + break; + } + + if (newSize < optSize) { + optSize = newSize; + optLog = optLogGuess; + } + } + assert(optLog <= HUF_TABLELOG_MAX); + return optLog; + } +} + +/* HUF_compress_internal() : + * `workSpace_align4` must be aligned on 4-bytes boundaries, + * and occupies the same space as a table of HUF_WORKSPACE_SIZE_U64 unsigned */ +static size_t +HUF_compress_internal (void* dst, size_t dstSize, + const void* src, size_t srcSize, + unsigned maxSymbolValue, unsigned huffLog, + HUF_nbStreams_e nbStreams, + void* workSpace, size_t wkspSize, + HUF_CElt* oldHufTable, HUF_repeat* repeat, int flags) +{ + HUF_compress_tables_t* const table = (HUF_compress_tables_t*)HUF_alignUpWorkspace(workSpace, &wkspSize, ZSTD_ALIGNOF(size_t)); + BYTE* const ostart = (BYTE*)dst; + BYTE* const oend = ostart + dstSize; + BYTE* op = ostart; + + DEBUGLOG(5, "HUF_compress_internal (srcSize=%zu)", srcSize); + HUF_STATIC_ASSERT(sizeof(*table) + HUF_WORKSPACE_MAX_ALIGNMENT <= HUF_WORKSPACE_SIZE); + + /* checks & inits */ + if (wkspSize < sizeof(*table)) return ERROR(workSpace_tooSmall); + if (!srcSize) return 0; /* Uncompressed */ + if (!dstSize) return 0; /* cannot fit anything within dst budget */ + if (srcSize > HUF_BLOCKSIZE_MAX) return ERROR(srcSize_wrong); /* current block size limit */ + if (huffLog > HUF_TABLELOG_MAX) return ERROR(tableLog_tooLarge); + if (maxSymbolValue > HUF_SYMBOLVALUE_MAX) return ERROR(maxSymbolValue_tooLarge); + if (!maxSymbolValue) maxSymbolValue = HUF_SYMBOLVALUE_MAX; + if (!huffLog) huffLog = HUF_TABLELOG_DEFAULT; + + /* Heuristic : If old table is valid, use it for small inputs */ + if ((flags & HUF_flags_preferRepeat) && repeat && *repeat == HUF_repeat_valid) { + return HUF_compressCTable_internal(ostart, op, oend, + src, srcSize, + nbStreams, oldHufTable, flags); + } + + /* If uncompressible data is suspected, do a smaller sampling first */ + DEBUG_STATIC_ASSERT(SUSPECT_INCOMPRESSIBLE_SAMPLE_RATIO >= 2); + if ((flags & HUF_flags_suspectUncompressible) && srcSize >= (SUSPECT_INCOMPRESSIBLE_SAMPLE_SIZE * SUSPECT_INCOMPRESSIBLE_SAMPLE_RATIO)) { + size_t largestTotal = 0; + DEBUGLOG(5, "input suspected incompressible : sampling to check"); + { unsigned maxSymbolValueBegin = maxSymbolValue; + CHECK_V_F(largestBegin, HIST_count_simple (table->count, &maxSymbolValueBegin, (const BYTE*)src, SUSPECT_INCOMPRESSIBLE_SAMPLE_SIZE) ); + largestTotal += largestBegin; + } + { unsigned maxSymbolValueEnd = maxSymbolValue; + CHECK_V_F(largestEnd, HIST_count_simple (table->count, &maxSymbolValueEnd, (const BYTE*)src + srcSize - SUSPECT_INCOMPRESSIBLE_SAMPLE_SIZE, SUSPECT_INCOMPRESSIBLE_SAMPLE_SIZE) ); + largestTotal += largestEnd; + } + if (largestTotal <= ((2 * SUSPECT_INCOMPRESSIBLE_SAMPLE_SIZE) >> 7)+4) return 0; /* heuristic : probably not compressible enough */ + } + + /* Scan input and build symbol stats */ + { CHECK_V_F(largest, HIST_count_wksp (table->count, &maxSymbolValue, (const BYTE*)src, srcSize, table->wksps.hist_wksp, sizeof(table->wksps.hist_wksp)) ); + if (largest == srcSize) { *ostart = ((const BYTE*)src)[0]; return 1; } /* single symbol, rle */ + if (largest <= (srcSize >> 7)+4) return 0; /* heuristic : probably not compressible enough */ + } + DEBUGLOG(6, "histogram detail completed (%zu symbols)", showU32(table->count, maxSymbolValue+1)); + + /* Check validity of previous table */ + if ( repeat + && *repeat == HUF_repeat_check + && !HUF_validateCTable(oldHufTable, table->count, maxSymbolValue)) { + *repeat = HUF_repeat_none; + } + /* Heuristic : use existing table for small inputs */ + if ((flags & HUF_flags_preferRepeat) && repeat && *repeat != HUF_repeat_none) { + return HUF_compressCTable_internal(ostart, op, oend, + src, srcSize, + nbStreams, oldHufTable, flags); + } + + /* Build Huffman Tree */ + huffLog = HUF_optimalTableLog(huffLog, srcSize, maxSymbolValue, &table->wksps, sizeof(table->wksps), table->CTable, table->count, flags); + { size_t const maxBits = HUF_buildCTable_wksp(table->CTable, table->count, + maxSymbolValue, huffLog, + &table->wksps.buildCTable_wksp, sizeof(table->wksps.buildCTable_wksp)); + CHECK_F(maxBits); + huffLog = (U32)maxBits; + DEBUGLOG(6, "bit distribution completed (%zu symbols)", showCTableBits(table->CTable + 1, maxSymbolValue+1)); + } + + /* Write table description header */ + { CHECK_V_F(hSize, HUF_writeCTable_wksp(op, dstSize, table->CTable, maxSymbolValue, huffLog, + &table->wksps.writeCTable_wksp, sizeof(table->wksps.writeCTable_wksp)) ); + /* Check if using previous huffman table is beneficial */ + if (repeat && *repeat != HUF_repeat_none) { + size_t const oldSize = HUF_estimateCompressedSize(oldHufTable, table->count, maxSymbolValue); + size_t const newSize = HUF_estimateCompressedSize(table->CTable, table->count, maxSymbolValue); + if (oldSize <= hSize + newSize || hSize + 12 >= srcSize) { + return HUF_compressCTable_internal(ostart, op, oend, + src, srcSize, + nbStreams, oldHufTable, flags); + } } + + /* Use the new huffman table */ + if (hSize + 12ul >= srcSize) { return 0; } + op += hSize; + if (repeat) { *repeat = HUF_repeat_none; } + if (oldHufTable) + ZSTD_memcpy(oldHufTable, table->CTable, sizeof(table->CTable)); /* Save new table */ + } + return HUF_compressCTable_internal(ostart, op, oend, + src, srcSize, + nbStreams, table->CTable, flags); +} + +size_t HUF_compress1X_repeat (void* dst, size_t dstSize, + const void* src, size_t srcSize, + unsigned maxSymbolValue, unsigned huffLog, + void* workSpace, size_t wkspSize, + HUF_CElt* hufTable, HUF_repeat* repeat, int flags) +{ + DEBUGLOG(5, "HUF_compress1X_repeat (srcSize = %zu)", srcSize); + return HUF_compress_internal(dst, dstSize, src, srcSize, + maxSymbolValue, huffLog, HUF_singleStream, + workSpace, wkspSize, hufTable, + repeat, flags); +} + +/* HUF_compress4X_repeat(): + * compress input using 4 streams. + * consider skipping quickly + * reuse an existing huffman compression table */ +size_t HUF_compress4X_repeat (void* dst, size_t dstSize, + const void* src, size_t srcSize, + unsigned maxSymbolValue, unsigned huffLog, + void* workSpace, size_t wkspSize, + HUF_CElt* hufTable, HUF_repeat* repeat, int flags) +{ + DEBUGLOG(5, "HUF_compress4X_repeat (srcSize = %zu)", srcSize); + return HUF_compress_internal(dst, dstSize, src, srcSize, + maxSymbolValue, huffLog, HUF_fourStreams, + workSpace, wkspSize, + hufTable, repeat, flags); +} +/**** ended inlining compress/huf_compress.c ****/ +/**** start inlining compress/zstd_compress_literals.c ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + + /*-************************************* + * Dependencies + ***************************************/ +/**** start inlining zstd_compress_literals.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +#ifndef ZSTD_COMPRESS_LITERALS_H +#define ZSTD_COMPRESS_LITERALS_H + +/**** start inlining zstd_compress_internal.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +/* This header contains definitions + * that shall **only** be used by modules within lib/compress. + */ + +#ifndef ZSTD_COMPRESS_H +#define ZSTD_COMPRESS_H + +/*-************************************* +* Dependencies +***************************************/ +/**** skipping file: ../common/zstd_internal.h ****/ +/**** start inlining zstd_cwksp.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +#ifndef ZSTD_CWKSP_H +#define ZSTD_CWKSP_H + +/*-************************************* +* Dependencies +***************************************/ +/**** skipping file: ../common/allocations.h ****/ +/**** skipping file: ../common/zstd_internal.h ****/ +/**** skipping file: ../common/portability_macros.h ****/ + +#if defined (__cplusplus) +extern "C" { +#endif + +/*-************************************* +* Constants +***************************************/ + +/* Since the workspace is effectively its own little malloc implementation / + * arena, when we run under ASAN, we should similarly insert redzones between + * each internal element of the workspace, so ASAN will catch overruns that + * reach outside an object but that stay inside the workspace. + * + * This defines the size of that redzone. + */ +#ifndef ZSTD_CWKSP_ASAN_REDZONE_SIZE +#define ZSTD_CWKSP_ASAN_REDZONE_SIZE 128 +#endif + + +/* Set our tables and aligneds to align by 64 bytes */ +#define ZSTD_CWKSP_ALIGNMENT_BYTES 64 + +/*-************************************* +* Structures +***************************************/ +typedef enum { + ZSTD_cwksp_alloc_objects, + ZSTD_cwksp_alloc_aligned_init_once, + ZSTD_cwksp_alloc_aligned, + ZSTD_cwksp_alloc_buffers +} ZSTD_cwksp_alloc_phase_e; + +/** + * Used to describe whether the workspace is statically allocated (and will not + * necessarily ever be freed), or if it's dynamically allocated and we can + * expect a well-formed caller to free this. + */ +typedef enum { + ZSTD_cwksp_dynamic_alloc, + ZSTD_cwksp_static_alloc +} ZSTD_cwksp_static_alloc_e; + +/** + * Zstd fits all its internal datastructures into a single continuous buffer, + * so that it only needs to perform a single OS allocation (or so that a buffer + * can be provided to it and it can perform no allocations at all). This buffer + * is called the workspace. + * + * Several optimizations complicate that process of allocating memory ranges + * from this workspace for each internal datastructure: + * + * - These different internal datastructures have different setup requirements: + * + * - The static objects need to be cleared once and can then be trivially + * reused for each compression. + * + * - Various buffers don't need to be initialized at all--they are always + * written into before they're read. + * + * - The matchstate tables have a unique requirement that they don't need + * their memory to be totally cleared, but they do need the memory to have + * some bound, i.e., a guarantee that all values in the memory they've been + * allocated is less than some maximum value (which is the starting value + * for the indices that they will then use for compression). When this + * guarantee is provided to them, they can use the memory without any setup + * work. When it can't, they have to clear the area. + * + * - These buffers also have different alignment requirements. + * + * - We would like to reuse the objects in the workspace for multiple + * compressions without having to perform any expensive reallocation or + * reinitialization work. + * + * - We would like to be able to efficiently reuse the workspace across + * multiple compressions **even when the compression parameters change** and + * we need to resize some of the objects (where possible). + * + * To attempt to manage this buffer, given these constraints, the ZSTD_cwksp + * abstraction was created. It works as follows: + * + * Workspace Layout: + * + * [ ... workspace ... ] + * [objects][tables ->] free space [<- buffers][<- aligned][<- init once] + * + * The various objects that live in the workspace are divided into the + * following categories, and are allocated separately: + * + * - Static objects: this is optionally the enclosing ZSTD_CCtx or ZSTD_CDict, + * so that literally everything fits in a single buffer. Note: if present, + * this must be the first object in the workspace, since ZSTD_customFree{CCtx, + * CDict}() rely on a pointer comparison to see whether one or two frees are + * required. + * + * - Fixed size objects: these are fixed-size, fixed-count objects that are + * nonetheless "dynamically" allocated in the workspace so that we can + * control how they're initialized separately from the broader ZSTD_CCtx. + * Examples: + * - Entropy Workspace + * - 2 x ZSTD_compressedBlockState_t + * - CDict dictionary contents + * + * - Tables: these are any of several different datastructures (hash tables, + * chain tables, binary trees) that all respect a common format: they are + * uint32_t arrays, all of whose values are between 0 and (nextSrc - base). + * Their sizes depend on the cparams. These tables are 64-byte aligned. + * + * - Init once: these buffers require to be initialized at least once before + * use. They should be used when we want to skip memory initialization + * while not triggering memory checkers (like Valgrind) when reading from + * from this memory without writing to it first. + * These buffers should be used carefully as they might contain data + * from previous compressions. + * Buffers are aligned to 64 bytes. + * + * - Aligned: these buffers don't require any initialization before they're + * used. The user of the buffer should make sure they write into a buffer + * location before reading from it. + * Buffers are aligned to 64 bytes. + * + * - Buffers: these buffers are used for various purposes that don't require + * any alignment or initialization before they're used. This means they can + * be moved around at no cost for a new compression. + * + * Allocating Memory: + * + * The various types of objects must be allocated in order, so they can be + * correctly packed into the workspace buffer. That order is: + * + * 1. Objects + * 2. Init once / Tables + * 3. Aligned / Tables + * 4. Buffers / Tables + * + * Attempts to reserve objects of different types out of order will fail. + */ +typedef struct { + void* workspace; + void* workspaceEnd; + + void* objectEnd; + void* tableEnd; + void* tableValidEnd; + void* allocStart; + void* initOnceStart; + + BYTE allocFailed; + int workspaceOversizedDuration; + ZSTD_cwksp_alloc_phase_e phase; + ZSTD_cwksp_static_alloc_e isStatic; +} ZSTD_cwksp; + +/*-************************************* +* Functions +***************************************/ + +MEM_STATIC size_t ZSTD_cwksp_available_space(ZSTD_cwksp* ws); +MEM_STATIC void* ZSTD_cwksp_initialAllocStart(ZSTD_cwksp* ws); + +MEM_STATIC void ZSTD_cwksp_assert_internal_consistency(ZSTD_cwksp* ws) { + (void)ws; + assert(ws->workspace <= ws->objectEnd); + assert(ws->objectEnd <= ws->tableEnd); + assert(ws->objectEnd <= ws->tableValidEnd); + assert(ws->tableEnd <= ws->allocStart); + assert(ws->tableValidEnd <= ws->allocStart); + assert(ws->allocStart <= ws->workspaceEnd); + assert(ws->initOnceStart <= ZSTD_cwksp_initialAllocStart(ws)); + assert(ws->workspace <= ws->initOnceStart); +#if ZSTD_MEMORY_SANITIZER + { + intptr_t const offset = __msan_test_shadow(ws->initOnceStart, + (U8*)ZSTD_cwksp_initialAllocStart(ws) - (U8*)ws->initOnceStart); + (void)offset; +#if defined(ZSTD_MSAN_PRINT) + if(offset!=-1) { + __msan_print_shadow((U8*)ws->initOnceStart + offset - 8, 32); + } +#endif + assert(offset==-1); + }; +#endif +} + +/** + * Align must be a power of 2. + */ +MEM_STATIC size_t ZSTD_cwksp_align(size_t size, size_t const align) { + size_t const mask = align - 1; + assert((align & mask) == 0); + return (size + mask) & ~mask; +} + +/** + * Use this to determine how much space in the workspace we will consume to + * allocate this object. (Normally it should be exactly the size of the object, + * but under special conditions, like ASAN, where we pad each object, it might + * be larger.) + * + * Since tables aren't currently redzoned, you don't need to call through this + * to figure out how much space you need for the matchState tables. Everything + * else is though. + * + * Do not use for sizing aligned buffers. Instead, use ZSTD_cwksp_aligned_alloc_size(). + */ +MEM_STATIC size_t ZSTD_cwksp_alloc_size(size_t size) { + if (size == 0) + return 0; +#if ZSTD_ADDRESS_SANITIZER && !defined (ZSTD_ASAN_DONT_POISON_WORKSPACE) + return size + 2 * ZSTD_CWKSP_ASAN_REDZONE_SIZE; +#else + return size; +#endif +} + +/** + * Returns an adjusted alloc size that is the nearest larger multiple of 64 bytes. + * Used to determine the number of bytes required for a given "aligned". + */ +MEM_STATIC size_t ZSTD_cwksp_aligned_alloc_size(size_t size) { + return ZSTD_cwksp_alloc_size(ZSTD_cwksp_align(size, ZSTD_CWKSP_ALIGNMENT_BYTES)); +} + +/** + * Returns the amount of additional space the cwksp must allocate + * for internal purposes (currently only alignment). + */ +MEM_STATIC size_t ZSTD_cwksp_slack_space_required(void) { + /* For alignment, the wksp will always allocate an additional 2*ZSTD_CWKSP_ALIGNMENT_BYTES + * bytes to align the beginning of tables section and end of buffers; + */ + size_t const slackSpace = ZSTD_CWKSP_ALIGNMENT_BYTES * 2; + return slackSpace; +} + + +/** + * Return the number of additional bytes required to align a pointer to the given number of bytes. + * alignBytes must be a power of two. + */ +MEM_STATIC size_t ZSTD_cwksp_bytes_to_align_ptr(void* ptr, const size_t alignBytes) { + size_t const alignBytesMask = alignBytes - 1; + size_t const bytes = (alignBytes - ((size_t)ptr & (alignBytesMask))) & alignBytesMask; + assert((alignBytes & alignBytesMask) == 0); + assert(bytes < alignBytes); + return bytes; +} + +/** + * Returns the initial value for allocStart which is used to determine the position from + * which we can allocate from the end of the workspace. + */ +MEM_STATIC void* ZSTD_cwksp_initialAllocStart(ZSTD_cwksp* ws) { + return (void*)((size_t)ws->workspaceEnd & ~(ZSTD_CWKSP_ALIGNMENT_BYTES-1)); +} + +/** + * Internal function. Do not use directly. + * Reserves the given number of bytes within the aligned/buffer segment of the wksp, + * which counts from the end of the wksp (as opposed to the object/table segment). + * + * Returns a pointer to the beginning of that space. + */ +MEM_STATIC void* +ZSTD_cwksp_reserve_internal_buffer_space(ZSTD_cwksp* ws, size_t const bytes) +{ + void* const alloc = (BYTE*)ws->allocStart - bytes; + void* const bottom = ws->tableEnd; + DEBUGLOG(5, "cwksp: reserving %p %zd bytes, %zd bytes remaining", + alloc, bytes, ZSTD_cwksp_available_space(ws) - bytes); + ZSTD_cwksp_assert_internal_consistency(ws); + assert(alloc >= bottom); + if (alloc < bottom) { + DEBUGLOG(4, "cwksp: alloc failed!"); + ws->allocFailed = 1; + return NULL; + } + /* the area is reserved from the end of wksp. + * If it overlaps with tableValidEnd, it voids guarantees on values' range */ + if (alloc < ws->tableValidEnd) { + ws->tableValidEnd = alloc; + } + ws->allocStart = alloc; + return alloc; +} + +/** + * Moves the cwksp to the next phase, and does any necessary allocations. + * cwksp initialization must necessarily go through each phase in order. + * Returns a 0 on success, or zstd error + */ +MEM_STATIC size_t +ZSTD_cwksp_internal_advance_phase(ZSTD_cwksp* ws, ZSTD_cwksp_alloc_phase_e phase) +{ + assert(phase >= ws->phase); + if (phase > ws->phase) { + /* Going from allocating objects to allocating initOnce / tables */ + if (ws->phase < ZSTD_cwksp_alloc_aligned_init_once && + phase >= ZSTD_cwksp_alloc_aligned_init_once) { + ws->tableValidEnd = ws->objectEnd; + ws->initOnceStart = ZSTD_cwksp_initialAllocStart(ws); + + { /* Align the start of the tables to 64 bytes. Use [0, 63] bytes */ + void *const alloc = ws->objectEnd; + size_t const bytesToAlign = ZSTD_cwksp_bytes_to_align_ptr(alloc, ZSTD_CWKSP_ALIGNMENT_BYTES); + void *const objectEnd = (BYTE *) alloc + bytesToAlign; + DEBUGLOG(5, "reserving table alignment addtl space: %zu", bytesToAlign); + RETURN_ERROR_IF(objectEnd > ws->workspaceEnd, memory_allocation, + "table phase - alignment initial allocation failed!"); + ws->objectEnd = objectEnd; + ws->tableEnd = objectEnd; /* table area starts being empty */ + if (ws->tableValidEnd < ws->tableEnd) { + ws->tableValidEnd = ws->tableEnd; + } + } + } + ws->phase = phase; + ZSTD_cwksp_assert_internal_consistency(ws); + } + return 0; +} + +/** + * Returns whether this object/buffer/etc was allocated in this workspace. + */ +MEM_STATIC int ZSTD_cwksp_owns_buffer(const ZSTD_cwksp* ws, const void* ptr) +{ + return (ptr != NULL) && (ws->workspace <= ptr) && (ptr < ws->workspaceEnd); +} + +/** + * Internal function. Do not use directly. + */ +MEM_STATIC void* +ZSTD_cwksp_reserve_internal(ZSTD_cwksp* ws, size_t bytes, ZSTD_cwksp_alloc_phase_e phase) +{ + void* alloc; + if (ZSTD_isError(ZSTD_cwksp_internal_advance_phase(ws, phase)) || bytes == 0) { + return NULL; + } + +#if ZSTD_ADDRESS_SANITIZER && !defined (ZSTD_ASAN_DONT_POISON_WORKSPACE) + /* over-reserve space */ + bytes += 2 * ZSTD_CWKSP_ASAN_REDZONE_SIZE; +#endif + + alloc = ZSTD_cwksp_reserve_internal_buffer_space(ws, bytes); + +#if ZSTD_ADDRESS_SANITIZER && !defined (ZSTD_ASAN_DONT_POISON_WORKSPACE) + /* Move alloc so there's ZSTD_CWKSP_ASAN_REDZONE_SIZE unused space on + * either size. */ + if (alloc) { + alloc = (BYTE *)alloc + ZSTD_CWKSP_ASAN_REDZONE_SIZE; + if (ws->isStatic == ZSTD_cwksp_dynamic_alloc) { + /* We need to keep the redzone poisoned while unpoisoning the bytes that + * are actually allocated. */ + __asan_unpoison_memory_region(alloc, bytes - 2 * ZSTD_CWKSP_ASAN_REDZONE_SIZE); + } + } +#endif + + return alloc; +} + +/** + * Reserves and returns unaligned memory. + */ +MEM_STATIC BYTE* ZSTD_cwksp_reserve_buffer(ZSTD_cwksp* ws, size_t bytes) +{ + return (BYTE*)ZSTD_cwksp_reserve_internal(ws, bytes, ZSTD_cwksp_alloc_buffers); +} + +/** + * Reserves and returns memory sized on and aligned on ZSTD_CWKSP_ALIGNMENT_BYTES (64 bytes). + * This memory has been initialized at least once in the past. + * This doesn't mean it has been initialized this time, and it might contain data from previous + * operations. + * The main usage is for algorithms that might need read access into uninitialized memory. + * The algorithm must maintain safety under these conditions and must make sure it doesn't + * leak any of the past data (directly or in side channels). + */ +MEM_STATIC void* ZSTD_cwksp_reserve_aligned_init_once(ZSTD_cwksp* ws, size_t bytes) +{ + size_t const alignedBytes = ZSTD_cwksp_align(bytes, ZSTD_CWKSP_ALIGNMENT_BYTES); + void* ptr = ZSTD_cwksp_reserve_internal(ws, alignedBytes, ZSTD_cwksp_alloc_aligned_init_once); + assert(((size_t)ptr & (ZSTD_CWKSP_ALIGNMENT_BYTES-1))== 0); + if(ptr && ptr < ws->initOnceStart) { + /* We assume the memory following the current allocation is either: + * 1. Not usable as initOnce memory (end of workspace) + * 2. Another initOnce buffer that has been allocated before (and so was previously memset) + * 3. An ASAN redzone, in which case we don't want to write on it + * For these reasons it should be fine to not explicitly zero every byte up to ws->initOnceStart. + * Note that we assume here that MSAN and ASAN cannot run in the same time. */ + ZSTD_memset(ptr, 0, MIN((size_t)((U8*)ws->initOnceStart - (U8*)ptr), alignedBytes)); + ws->initOnceStart = ptr; + } +#if ZSTD_MEMORY_SANITIZER + assert(__msan_test_shadow(ptr, bytes) == -1); +#endif + return ptr; +} + +/** + * Reserves and returns memory sized on and aligned on ZSTD_CWKSP_ALIGNMENT_BYTES (64 bytes). + */ +MEM_STATIC void* ZSTD_cwksp_reserve_aligned(ZSTD_cwksp* ws, size_t bytes) +{ + void* ptr = ZSTD_cwksp_reserve_internal(ws, ZSTD_cwksp_align(bytes, ZSTD_CWKSP_ALIGNMENT_BYTES), + ZSTD_cwksp_alloc_aligned); + assert(((size_t)ptr & (ZSTD_CWKSP_ALIGNMENT_BYTES-1))== 0); + return ptr; +} + +/** + * Aligned on 64 bytes. These buffers have the special property that + * their values remain constrained, allowing us to reuse them without + * memset()-ing them. + */ +MEM_STATIC void* ZSTD_cwksp_reserve_table(ZSTD_cwksp* ws, size_t bytes) +{ + const ZSTD_cwksp_alloc_phase_e phase = ZSTD_cwksp_alloc_aligned_init_once; + void* alloc; + void* end; + void* top; + + /* We can only start allocating tables after we are done reserving space for objects at the + * start of the workspace */ + if(ws->phase < phase) { + if (ZSTD_isError(ZSTD_cwksp_internal_advance_phase(ws, phase))) { + return NULL; + } + } + alloc = ws->tableEnd; + end = (BYTE *)alloc + bytes; + top = ws->allocStart; + + DEBUGLOG(5, "cwksp: reserving %p table %zd bytes, %zd bytes remaining", + alloc, bytes, ZSTD_cwksp_available_space(ws) - bytes); + assert((bytes & (sizeof(U32)-1)) == 0); + ZSTD_cwksp_assert_internal_consistency(ws); + assert(end <= top); + if (end > top) { + DEBUGLOG(4, "cwksp: table alloc failed!"); + ws->allocFailed = 1; + return NULL; + } + ws->tableEnd = end; + +#if ZSTD_ADDRESS_SANITIZER && !defined (ZSTD_ASAN_DONT_POISON_WORKSPACE) + if (ws->isStatic == ZSTD_cwksp_dynamic_alloc) { + __asan_unpoison_memory_region(alloc, bytes); + } +#endif + + assert((bytes & (ZSTD_CWKSP_ALIGNMENT_BYTES-1)) == 0); + assert(((size_t)alloc & (ZSTD_CWKSP_ALIGNMENT_BYTES-1))== 0); + return alloc; +} + +/** + * Aligned on sizeof(void*). + * Note : should happen only once, at workspace first initialization + */ +MEM_STATIC void* ZSTD_cwksp_reserve_object(ZSTD_cwksp* ws, size_t bytes) +{ + size_t const roundedBytes = ZSTD_cwksp_align(bytes, sizeof(void*)); + void* alloc = ws->objectEnd; + void* end = (BYTE*)alloc + roundedBytes; + +#if ZSTD_ADDRESS_SANITIZER && !defined (ZSTD_ASAN_DONT_POISON_WORKSPACE) + /* over-reserve space */ + end = (BYTE *)end + 2 * ZSTD_CWKSP_ASAN_REDZONE_SIZE; +#endif + + DEBUGLOG(4, + "cwksp: reserving %p object %zd bytes (rounded to %zd), %zd bytes remaining", + alloc, bytes, roundedBytes, ZSTD_cwksp_available_space(ws) - roundedBytes); + assert((size_t)alloc % ZSTD_ALIGNOF(void*) == 0); + assert(bytes % ZSTD_ALIGNOF(void*) == 0); + ZSTD_cwksp_assert_internal_consistency(ws); + /* we must be in the first phase, no advance is possible */ + if (ws->phase != ZSTD_cwksp_alloc_objects || end > ws->workspaceEnd) { + DEBUGLOG(3, "cwksp: object alloc failed!"); + ws->allocFailed = 1; + return NULL; + } + ws->objectEnd = end; + ws->tableEnd = end; + ws->tableValidEnd = end; + +#if ZSTD_ADDRESS_SANITIZER && !defined (ZSTD_ASAN_DONT_POISON_WORKSPACE) + /* Move alloc so there's ZSTD_CWKSP_ASAN_REDZONE_SIZE unused space on + * either size. */ + alloc = (BYTE*)alloc + ZSTD_CWKSP_ASAN_REDZONE_SIZE; + if (ws->isStatic == ZSTD_cwksp_dynamic_alloc) { + __asan_unpoison_memory_region(alloc, bytes); + } +#endif + + return alloc; +} + +MEM_STATIC void ZSTD_cwksp_mark_tables_dirty(ZSTD_cwksp* ws) +{ + DEBUGLOG(4, "cwksp: ZSTD_cwksp_mark_tables_dirty"); + +#if ZSTD_MEMORY_SANITIZER && !defined (ZSTD_MSAN_DONT_POISON_WORKSPACE) + /* To validate that the table reuse logic is sound, and that we don't + * access table space that we haven't cleaned, we re-"poison" the table + * space every time we mark it dirty. + * Since tableValidEnd space and initOnce space may overlap we don't poison + * the initOnce portion as it break its promise. This means that this poisoning + * check isn't always applied fully. */ + { + size_t size = (BYTE*)ws->tableValidEnd - (BYTE*)ws->objectEnd; + assert(__msan_test_shadow(ws->objectEnd, size) == -1); + if((BYTE*)ws->tableValidEnd < (BYTE*)ws->initOnceStart) { + __msan_poison(ws->objectEnd, size); + } else { + assert(ws->initOnceStart >= ws->objectEnd); + __msan_poison(ws->objectEnd, (BYTE*)ws->initOnceStart - (BYTE*)ws->objectEnd); + } + } +#endif + + assert(ws->tableValidEnd >= ws->objectEnd); + assert(ws->tableValidEnd <= ws->allocStart); + ws->tableValidEnd = ws->objectEnd; + ZSTD_cwksp_assert_internal_consistency(ws); +} + +MEM_STATIC void ZSTD_cwksp_mark_tables_clean(ZSTD_cwksp* ws) { + DEBUGLOG(4, "cwksp: ZSTD_cwksp_mark_tables_clean"); + assert(ws->tableValidEnd >= ws->objectEnd); + assert(ws->tableValidEnd <= ws->allocStart); + if (ws->tableValidEnd < ws->tableEnd) { + ws->tableValidEnd = ws->tableEnd; + } + ZSTD_cwksp_assert_internal_consistency(ws); +} + +/** + * Zero the part of the allocated tables not already marked clean. + */ +MEM_STATIC void ZSTD_cwksp_clean_tables(ZSTD_cwksp* ws) { + DEBUGLOG(4, "cwksp: ZSTD_cwksp_clean_tables"); + assert(ws->tableValidEnd >= ws->objectEnd); + assert(ws->tableValidEnd <= ws->allocStart); + if (ws->tableValidEnd < ws->tableEnd) { + ZSTD_memset(ws->tableValidEnd, 0, (size_t)((BYTE*)ws->tableEnd - (BYTE*)ws->tableValidEnd)); + } + ZSTD_cwksp_mark_tables_clean(ws); +} + +/** + * Invalidates table allocations. + * All other allocations remain valid. + */ +MEM_STATIC void ZSTD_cwksp_clear_tables(ZSTD_cwksp* ws) { + DEBUGLOG(4, "cwksp: clearing tables!"); + +#if ZSTD_ADDRESS_SANITIZER && !defined (ZSTD_ASAN_DONT_POISON_WORKSPACE) + /* We don't do this when the workspace is statically allocated, because + * when that is the case, we have no capability to hook into the end of the + * workspace's lifecycle to unpoison the memory. + */ + if (ws->isStatic == ZSTD_cwksp_dynamic_alloc) { + size_t size = (BYTE*)ws->tableValidEnd - (BYTE*)ws->objectEnd; + __asan_poison_memory_region(ws->objectEnd, size); + } +#endif + + ws->tableEnd = ws->objectEnd; + ZSTD_cwksp_assert_internal_consistency(ws); +} + +/** + * Invalidates all buffer, aligned, and table allocations. + * Object allocations remain valid. + */ +MEM_STATIC void ZSTD_cwksp_clear(ZSTD_cwksp* ws) { + DEBUGLOG(4, "cwksp: clearing!"); + +#if ZSTD_MEMORY_SANITIZER && !defined (ZSTD_MSAN_DONT_POISON_WORKSPACE) + /* To validate that the context reuse logic is sound, and that we don't + * access stuff that this compression hasn't initialized, we re-"poison" + * the workspace except for the areas in which we expect memory reuse + * without initialization (objects, valid tables area and init once + * memory). */ + { + if((BYTE*)ws->tableValidEnd < (BYTE*)ws->initOnceStart) { + size_t size = (BYTE*)ws->initOnceStart - (BYTE*)ws->tableValidEnd; + __msan_poison(ws->tableValidEnd, size); + } + } +#endif + +#if ZSTD_ADDRESS_SANITIZER && !defined (ZSTD_ASAN_DONT_POISON_WORKSPACE) + /* We don't do this when the workspace is statically allocated, because + * when that is the case, we have no capability to hook into the end of the + * workspace's lifecycle to unpoison the memory. + */ + if (ws->isStatic == ZSTD_cwksp_dynamic_alloc) { + size_t size = (BYTE*)ws->workspaceEnd - (BYTE*)ws->objectEnd; + __asan_poison_memory_region(ws->objectEnd, size); + } +#endif + + ws->tableEnd = ws->objectEnd; + ws->allocStart = ZSTD_cwksp_initialAllocStart(ws); + ws->allocFailed = 0; + if (ws->phase > ZSTD_cwksp_alloc_aligned_init_once) { + ws->phase = ZSTD_cwksp_alloc_aligned_init_once; + } + ZSTD_cwksp_assert_internal_consistency(ws); +} + +MEM_STATIC size_t ZSTD_cwksp_sizeof(const ZSTD_cwksp* ws) { + return (size_t)((BYTE*)ws->workspaceEnd - (BYTE*)ws->workspace); +} + +MEM_STATIC size_t ZSTD_cwksp_used(const ZSTD_cwksp* ws) { + return (size_t)((BYTE*)ws->tableEnd - (BYTE*)ws->workspace) + + (size_t)((BYTE*)ws->workspaceEnd - (BYTE*)ws->allocStart); +} + +/** + * The provided workspace takes ownership of the buffer [start, start+size). + * Any existing values in the workspace are ignored (the previously managed + * buffer, if present, must be separately freed). + */ +MEM_STATIC void ZSTD_cwksp_init(ZSTD_cwksp* ws, void* start, size_t size, ZSTD_cwksp_static_alloc_e isStatic) { + DEBUGLOG(4, "cwksp: init'ing workspace with %zd bytes", size); + assert(((size_t)start & (sizeof(void*)-1)) == 0); /* ensure correct alignment */ + ws->workspace = start; + ws->workspaceEnd = (BYTE*)start + size; + ws->objectEnd = ws->workspace; + ws->tableValidEnd = ws->objectEnd; + ws->initOnceStart = ZSTD_cwksp_initialAllocStart(ws); + ws->phase = ZSTD_cwksp_alloc_objects; + ws->isStatic = isStatic; + ZSTD_cwksp_clear(ws); + ws->workspaceOversizedDuration = 0; + ZSTD_cwksp_assert_internal_consistency(ws); +} + +MEM_STATIC size_t ZSTD_cwksp_create(ZSTD_cwksp* ws, size_t size, ZSTD_customMem customMem) { + void* workspace = ZSTD_customMalloc(size, customMem); + DEBUGLOG(4, "cwksp: creating new workspace with %zd bytes", size); + RETURN_ERROR_IF(workspace == NULL, memory_allocation, "NULL pointer!"); + ZSTD_cwksp_init(ws, workspace, size, ZSTD_cwksp_dynamic_alloc); + return 0; +} + +MEM_STATIC void ZSTD_cwksp_free(ZSTD_cwksp* ws, ZSTD_customMem customMem) { + void *ptr = ws->workspace; + DEBUGLOG(4, "cwksp: freeing workspace"); +#if ZSTD_MEMORY_SANITIZER && !defined(ZSTD_MSAN_DONT_POISON_WORKSPACE) + if (ptr != NULL && customMem.customFree != NULL) { + __msan_unpoison(ptr, ZSTD_cwksp_sizeof(ws)); + } +#endif + ZSTD_memset(ws, 0, sizeof(ZSTD_cwksp)); + ZSTD_customFree(ptr, customMem); +} + +/** + * Moves the management of a workspace from one cwksp to another. The src cwksp + * is left in an invalid state (src must be re-init()'ed before it's used again). + */ +MEM_STATIC void ZSTD_cwksp_move(ZSTD_cwksp* dst, ZSTD_cwksp* src) { + *dst = *src; + ZSTD_memset(src, 0, sizeof(ZSTD_cwksp)); +} + +MEM_STATIC int ZSTD_cwksp_reserve_failed(const ZSTD_cwksp* ws) { + return ws->allocFailed; +} + +/*-************************************* +* Functions Checking Free Space +***************************************/ + +/* ZSTD_alignmentSpaceWithinBounds() : + * Returns if the estimated space needed for a wksp is within an acceptable limit of the + * actual amount of space used. + */ +MEM_STATIC int ZSTD_cwksp_estimated_space_within_bounds(const ZSTD_cwksp *const ws, size_t const estimatedSpace) { + /* We have an alignment space between objects and tables between tables and buffers, so we can have up to twice + * the alignment bytes difference between estimation and actual usage */ + return (estimatedSpace - ZSTD_cwksp_slack_space_required()) <= ZSTD_cwksp_used(ws) && + ZSTD_cwksp_used(ws) <= estimatedSpace; +} + + +MEM_STATIC size_t ZSTD_cwksp_available_space(ZSTD_cwksp* ws) { + return (size_t)((BYTE*)ws->allocStart - (BYTE*)ws->tableEnd); +} + +MEM_STATIC int ZSTD_cwksp_check_available(ZSTD_cwksp* ws, size_t additionalNeededSpace) { + return ZSTD_cwksp_available_space(ws) >= additionalNeededSpace; +} + +MEM_STATIC int ZSTD_cwksp_check_too_large(ZSTD_cwksp* ws, size_t additionalNeededSpace) { + return ZSTD_cwksp_check_available( + ws, additionalNeededSpace * ZSTD_WORKSPACETOOLARGE_FACTOR); +} + +MEM_STATIC int ZSTD_cwksp_check_wasteful(ZSTD_cwksp* ws, size_t additionalNeededSpace) { + return ZSTD_cwksp_check_too_large(ws, additionalNeededSpace) + && ws->workspaceOversizedDuration > ZSTD_WORKSPACETOOLARGE_MAXDURATION; +} + +MEM_STATIC void ZSTD_cwksp_bump_oversized_duration( + ZSTD_cwksp* ws, size_t additionalNeededSpace) { + if (ZSTD_cwksp_check_too_large(ws, additionalNeededSpace)) { + ws->workspaceOversizedDuration++; + } else { + ws->workspaceOversizedDuration = 0; + } +} + +#if defined (__cplusplus) +} +#endif + +#endif /* ZSTD_CWKSP_H */ +/**** ended inlining zstd_cwksp.h ****/ +#ifdef ZSTD_MULTITHREAD +/**** start inlining zstdmt_compress.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + + #ifndef ZSTDMT_COMPRESS_H + #define ZSTDMT_COMPRESS_H + + #if defined (__cplusplus) + extern "C" { + #endif + + +/* Note : This is an internal API. + * These APIs used to be exposed with ZSTDLIB_API, + * because it used to be the only way to invoke MT compression. + * Now, you must use ZSTD_compress2 and ZSTD_compressStream2() instead. + * + * This API requires ZSTD_MULTITHREAD to be defined during compilation, + * otherwise ZSTDMT_createCCtx*() will fail. + */ + +/* === Dependencies === */ +/**** skipping file: ../common/zstd_deps.h ****/ +#define ZSTD_STATIC_LINKING_ONLY /* ZSTD_parameters */ +/**** skipping file: ../zstd.h ****/ + + +/* === Constants === */ +#ifndef ZSTDMT_NBWORKERS_MAX /* a different value can be selected at compile time */ +# define ZSTDMT_NBWORKERS_MAX ((sizeof(void*)==4) /*32-bit*/ ? 64 : 256) +#endif +#ifndef ZSTDMT_JOBSIZE_MIN /* a different value can be selected at compile time */ +# define ZSTDMT_JOBSIZE_MIN (512 KB) +#endif +#define ZSTDMT_JOBLOG_MAX (MEM_32bits() ? 29 : 30) +#define ZSTDMT_JOBSIZE_MAX (MEM_32bits() ? (512 MB) : (1024 MB)) + + +/* ======================================================== + * === Private interface, for use by ZSTD_compress.c === + * === Not exposed in libzstd. Never invoke directly === + * ======================================================== */ + +/* === Memory management === */ +typedef struct ZSTDMT_CCtx_s ZSTDMT_CCtx; +/* Requires ZSTD_MULTITHREAD to be defined during compilation, otherwise it will return NULL. */ +ZSTDMT_CCtx* ZSTDMT_createCCtx_advanced(unsigned nbWorkers, + ZSTD_customMem cMem, + ZSTD_threadPool *pool); +size_t ZSTDMT_freeCCtx(ZSTDMT_CCtx* mtctx); + +size_t ZSTDMT_sizeof_CCtx(ZSTDMT_CCtx* mtctx); + +/* === Streaming functions === */ + +size_t ZSTDMT_nextInputSizeHint(const ZSTDMT_CCtx* mtctx); + +/*! ZSTDMT_initCStream_internal() : + * Private use only. Init streaming operation. + * expects params to be valid. + * must receive dict, or cdict, or none, but not both. + * mtctx can be freshly constructed or reused from a prior compression. + * If mtctx is reused, memory allocations from the prior compression may not be freed, + * even if they are not needed for the current compression. + * @return : 0, or an error code */ +size_t ZSTDMT_initCStream_internal(ZSTDMT_CCtx* mtctx, + const void* dict, size_t dictSize, ZSTD_dictContentType_e dictContentType, + const ZSTD_CDict* cdict, + ZSTD_CCtx_params params, unsigned long long pledgedSrcSize); + +/*! ZSTDMT_compressStream_generic() : + * Combines ZSTDMT_compressStream() with optional ZSTDMT_flushStream() or ZSTDMT_endStream() + * depending on flush directive. + * @return : minimum amount of data still to be flushed + * 0 if fully flushed + * or an error code + * note : needs to be init using any ZSTD_initCStream*() variant */ +size_t ZSTDMT_compressStream_generic(ZSTDMT_CCtx* mtctx, + ZSTD_outBuffer* output, + ZSTD_inBuffer* input, + ZSTD_EndDirective endOp); + + /*! ZSTDMT_toFlushNow() + * Tell how many bytes are ready to be flushed immediately. + * Probe the oldest active job (not yet entirely flushed) and check its output buffer. + * If return 0, it means there is no active job, + * or, it means oldest job is still active, but everything produced has been flushed so far, + * therefore flushing is limited by speed of oldest job. */ +size_t ZSTDMT_toFlushNow(ZSTDMT_CCtx* mtctx); + +/*! ZSTDMT_updateCParams_whileCompressing() : + * Updates only a selected set of compression parameters, to remain compatible with current frame. + * New parameters will be applied to next compression job. */ +void ZSTDMT_updateCParams_whileCompressing(ZSTDMT_CCtx* mtctx, const ZSTD_CCtx_params* cctxParams); + +/*! ZSTDMT_getFrameProgression(): + * tells how much data has been consumed (input) and produced (output) for current frame. + * able to count progression inside worker threads. + */ +ZSTD_frameProgression ZSTDMT_getFrameProgression(ZSTDMT_CCtx* mtctx); + + +#if defined (__cplusplus) +} +#endif + +#endif /* ZSTDMT_COMPRESS_H */ +/**** ended inlining zstdmt_compress.h ****/ +#endif +/**** skipping file: ../common/bits.h ****/ + +#if defined (__cplusplus) +extern "C" { +#endif + +/*-************************************* +* Constants +***************************************/ +#define kSearchStrength 8 +#define HASH_READ_SIZE 8 +#define ZSTD_DUBT_UNSORTED_MARK 1 /* For btlazy2 strategy, index ZSTD_DUBT_UNSORTED_MARK==1 means "unsorted". + It could be confused for a real successor at index "1", if sorted as larger than its predecessor. + It's not a big deal though : candidate will just be sorted again. + Additionally, candidate position 1 will be lost. + But candidate 1 cannot hide a large tree of candidates, so it's a minimal loss. + The benefit is that ZSTD_DUBT_UNSORTED_MARK cannot be mishandled after table reuse with a different strategy. + This constant is required by ZSTD_compressBlock_btlazy2() and ZSTD_reduceTable_internal() */ + + +/*-************************************* +* Context memory management +***************************************/ +typedef enum { ZSTDcs_created=0, ZSTDcs_init, ZSTDcs_ongoing, ZSTDcs_ending } ZSTD_compressionStage_e; +typedef enum { zcss_init=0, zcss_load, zcss_flush } ZSTD_cStreamStage; + +typedef struct ZSTD_prefixDict_s { + const void* dict; + size_t dictSize; + ZSTD_dictContentType_e dictContentType; +} ZSTD_prefixDict; + +typedef struct { + void* dictBuffer; + void const* dict; + size_t dictSize; + ZSTD_dictContentType_e dictContentType; + ZSTD_CDict* cdict; +} ZSTD_localDict; + +typedef struct { + HUF_CElt CTable[HUF_CTABLE_SIZE_ST(255)]; + HUF_repeat repeatMode; +} ZSTD_hufCTables_t; + +typedef struct { + FSE_CTable offcodeCTable[FSE_CTABLE_SIZE_U32(OffFSELog, MaxOff)]; + FSE_CTable matchlengthCTable[FSE_CTABLE_SIZE_U32(MLFSELog, MaxML)]; + FSE_CTable litlengthCTable[FSE_CTABLE_SIZE_U32(LLFSELog, MaxLL)]; + FSE_repeat offcode_repeatMode; + FSE_repeat matchlength_repeatMode; + FSE_repeat litlength_repeatMode; +} ZSTD_fseCTables_t; + +typedef struct { + ZSTD_hufCTables_t huf; + ZSTD_fseCTables_t fse; +} ZSTD_entropyCTables_t; + +/*********************************************** +* Entropy buffer statistics structs and funcs * +***********************************************/ +/** ZSTD_hufCTablesMetadata_t : + * Stores Literals Block Type for a super-block in hType, and + * huffman tree description in hufDesBuffer. + * hufDesSize refers to the size of huffman tree description in bytes. + * This metadata is populated in ZSTD_buildBlockEntropyStats_literals() */ +typedef struct { + symbolEncodingType_e hType; + BYTE hufDesBuffer[ZSTD_MAX_HUF_HEADER_SIZE]; + size_t hufDesSize; +} ZSTD_hufCTablesMetadata_t; + +/** ZSTD_fseCTablesMetadata_t : + * Stores symbol compression modes for a super-block in {ll, ol, ml}Type, and + * fse tables in fseTablesBuffer. + * fseTablesSize refers to the size of fse tables in bytes. + * This metadata is populated in ZSTD_buildBlockEntropyStats_sequences() */ +typedef struct { + symbolEncodingType_e llType; + symbolEncodingType_e ofType; + symbolEncodingType_e mlType; + BYTE fseTablesBuffer[ZSTD_MAX_FSE_HEADERS_SIZE]; + size_t fseTablesSize; + size_t lastCountSize; /* This is to account for bug in 1.3.4. More detail in ZSTD_entropyCompressSeqStore_internal() */ +} ZSTD_fseCTablesMetadata_t; + +typedef struct { + ZSTD_hufCTablesMetadata_t hufMetadata; + ZSTD_fseCTablesMetadata_t fseMetadata; +} ZSTD_entropyCTablesMetadata_t; + +/** ZSTD_buildBlockEntropyStats() : + * Builds entropy for the block. + * @return : 0 on success or error code */ +size_t ZSTD_buildBlockEntropyStats( + const seqStore_t* seqStorePtr, + const ZSTD_entropyCTables_t* prevEntropy, + ZSTD_entropyCTables_t* nextEntropy, + const ZSTD_CCtx_params* cctxParams, + ZSTD_entropyCTablesMetadata_t* entropyMetadata, + void* workspace, size_t wkspSize); + +/********************************* +* Compression internals structs * +*********************************/ + +typedef struct { + U32 off; /* Offset sumtype code for the match, using ZSTD_storeSeq() format */ + U32 len; /* Raw length of match */ +} ZSTD_match_t; + +typedef struct { + U32 offset; /* Offset of sequence */ + U32 litLength; /* Length of literals prior to match */ + U32 matchLength; /* Raw length of match */ +} rawSeq; + +typedef struct { + rawSeq* seq; /* The start of the sequences */ + size_t pos; /* The index in seq where reading stopped. pos <= size. */ + size_t posInSequence; /* The position within the sequence at seq[pos] where reading + stopped. posInSequence <= seq[pos].litLength + seq[pos].matchLength */ + size_t size; /* The number of sequences. <= capacity. */ + size_t capacity; /* The capacity starting from `seq` pointer */ +} rawSeqStore_t; + +typedef struct { + U32 idx; /* Index in array of ZSTD_Sequence */ + U32 posInSequence; /* Position within sequence at idx */ + size_t posInSrc; /* Number of bytes given by sequences provided so far */ +} ZSTD_sequencePosition; + +UNUSED_ATTR static const rawSeqStore_t kNullRawSeqStore = {NULL, 0, 0, 0, 0}; + +typedef struct { + int price; /* price from beginning of segment to this position */ + U32 off; /* offset of previous match */ + U32 mlen; /* length of previous match */ + U32 litlen; /* nb of literals since previous match */ + U32 rep[ZSTD_REP_NUM]; /* offset history after previous match */ +} ZSTD_optimal_t; + +typedef enum { zop_dynamic=0, zop_predef } ZSTD_OptPrice_e; + +#define ZSTD_OPT_SIZE (ZSTD_OPT_NUM+3) +typedef struct { + /* All tables are allocated inside cctx->workspace by ZSTD_resetCCtx_internal() */ + unsigned* litFreq; /* table of literals statistics, of size 256 */ + unsigned* litLengthFreq; /* table of litLength statistics, of size (MaxLL+1) */ + unsigned* matchLengthFreq; /* table of matchLength statistics, of size (MaxML+1) */ + unsigned* offCodeFreq; /* table of offCode statistics, of size (MaxOff+1) */ + ZSTD_match_t* matchTable; /* list of found matches, of size ZSTD_OPT_SIZE */ + ZSTD_optimal_t* priceTable; /* All positions tracked by optimal parser, of size ZSTD_OPT_SIZE */ + + U32 litSum; /* nb of literals */ + U32 litLengthSum; /* nb of litLength codes */ + U32 matchLengthSum; /* nb of matchLength codes */ + U32 offCodeSum; /* nb of offset codes */ + U32 litSumBasePrice; /* to compare to log2(litfreq) */ + U32 litLengthSumBasePrice; /* to compare to log2(llfreq) */ + U32 matchLengthSumBasePrice;/* to compare to log2(mlfreq) */ + U32 offCodeSumBasePrice; /* to compare to log2(offreq) */ + ZSTD_OptPrice_e priceType; /* prices can be determined dynamically, or follow a pre-defined cost structure */ + const ZSTD_entropyCTables_t* symbolCosts; /* pre-calculated dictionary statistics */ + ZSTD_paramSwitch_e literalCompressionMode; +} optState_t; + +typedef struct { + ZSTD_entropyCTables_t entropy; + U32 rep[ZSTD_REP_NUM]; +} ZSTD_compressedBlockState_t; + +typedef struct { + BYTE const* nextSrc; /* next block here to continue on current prefix */ + BYTE const* base; /* All regular indexes relative to this position */ + BYTE const* dictBase; /* extDict indexes relative to this position */ + U32 dictLimit; /* below that point, need extDict */ + U32 lowLimit; /* below that point, no more valid data */ + U32 nbOverflowCorrections; /* Number of times overflow correction has run since + * ZSTD_window_init(). Useful for debugging coredumps + * and for ZSTD_WINDOW_OVERFLOW_CORRECT_FREQUENTLY. + */ +} ZSTD_window_t; + +#define ZSTD_WINDOW_START_INDEX 2 + +typedef struct ZSTD_matchState_t ZSTD_matchState_t; + +#define ZSTD_ROW_HASH_CACHE_SIZE 8 /* Size of prefetching hash cache for row-based matchfinder */ + +struct ZSTD_matchState_t { + ZSTD_window_t window; /* State for window round buffer management */ + U32 loadedDictEnd; /* index of end of dictionary, within context's referential. + * When loadedDictEnd != 0, a dictionary is in use, and still valid. + * This relies on a mechanism to set loadedDictEnd=0 when dictionary is no longer within distance. + * Such mechanism is provided within ZSTD_window_enforceMaxDist() and ZSTD_checkDictValidity(). + * When dict referential is copied into active context (i.e. not attached), + * loadedDictEnd == dictSize, since referential starts from zero. + */ + U32 nextToUpdate; /* index from which to continue table update */ + U32 hashLog3; /* dispatch table for matches of len==3 : larger == faster, more memory */ + + U32 rowHashLog; /* For row-based matchfinder: Hashlog based on nb of rows in the hashTable.*/ + BYTE* tagTable; /* For row-based matchFinder: A row-based table containing the hashes and head index. */ + U32 hashCache[ZSTD_ROW_HASH_CACHE_SIZE]; /* For row-based matchFinder: a cache of hashes to improve speed */ + U64 hashSalt; /* For row-based matchFinder: salts the hash for reuse of tag table */ + U32 hashSaltEntropy; /* For row-based matchFinder: collects entropy for salt generation */ + + U32* hashTable; + U32* hashTable3; + U32* chainTable; + + U32 forceNonContiguous; /* Non-zero if we should force non-contiguous load for the next window update. */ + + int dedicatedDictSearch; /* Indicates whether this matchState is using the + * dedicated dictionary search structure. + */ + optState_t opt; /* optimal parser state */ + const ZSTD_matchState_t* dictMatchState; + ZSTD_compressionParameters cParams; + const rawSeqStore_t* ldmSeqStore; + + /* Controls prefetching in some dictMatchState matchfinders. + * This behavior is controlled from the cctx ms. + * This parameter has no effect in the cdict ms. */ + int prefetchCDictTables; + + /* When == 0, lazy match finders insert every position. + * When != 0, lazy match finders only insert positions they search. + * This allows them to skip much faster over incompressible data, + * at a small cost to compression ratio. + */ + int lazySkipping; +}; + +typedef struct { + ZSTD_compressedBlockState_t* prevCBlock; + ZSTD_compressedBlockState_t* nextCBlock; + ZSTD_matchState_t matchState; +} ZSTD_blockState_t; + +typedef struct { + U32 offset; + U32 checksum; +} ldmEntry_t; + +typedef struct { + BYTE const* split; + U32 hash; + U32 checksum; + ldmEntry_t* bucket; +} ldmMatchCandidate_t; + +#define LDM_BATCH_SIZE 64 + +typedef struct { + ZSTD_window_t window; /* State for the window round buffer management */ + ldmEntry_t* hashTable; + U32 loadedDictEnd; + BYTE* bucketOffsets; /* Next position in bucket to insert entry */ + size_t splitIndices[LDM_BATCH_SIZE]; + ldmMatchCandidate_t matchCandidates[LDM_BATCH_SIZE]; +} ldmState_t; + +typedef struct { + ZSTD_paramSwitch_e enableLdm; /* ZSTD_ps_enable to enable LDM. ZSTD_ps_auto by default */ + U32 hashLog; /* Log size of hashTable */ + U32 bucketSizeLog; /* Log bucket size for collision resolution, at most 8 */ + U32 minMatchLength; /* Minimum match length */ + U32 hashRateLog; /* Log number of entries to skip */ + U32 windowLog; /* Window log for the LDM */ +} ldmParams_t; + +typedef struct { + int collectSequences; + ZSTD_Sequence* seqStart; + size_t seqIndex; + size_t maxSequences; +} SeqCollector; + +struct ZSTD_CCtx_params_s { + ZSTD_format_e format; + ZSTD_compressionParameters cParams; + ZSTD_frameParameters fParams; + + int compressionLevel; + int forceWindow; /* force back-references to respect limit of + * 1< 63) ? ZSTD_highbit32(litLength) + LL_deltaCode : LL_Code[litLength]; +} + +/* ZSTD_MLcode() : + * note : mlBase = matchLength - MINMATCH; + * because it's the format it's stored in seqStore->sequences */ +MEM_STATIC U32 ZSTD_MLcode(U32 mlBase) +{ + static const BYTE ML_Code[128] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, + 32, 32, 33, 33, 34, 34, 35, 35, 36, 36, 36, 36, 37, 37, 37, 37, + 38, 38, 38, 38, 38, 38, 38, 38, 39, 39, 39, 39, 39, 39, 39, 39, + 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42 }; + static const U32 ML_deltaCode = 36; + return (mlBase > 127) ? ZSTD_highbit32(mlBase) + ML_deltaCode : ML_Code[mlBase]; +} + +/* ZSTD_cParam_withinBounds: + * @return 1 if value is within cParam bounds, + * 0 otherwise */ +MEM_STATIC int ZSTD_cParam_withinBounds(ZSTD_cParameter cParam, int value) +{ + ZSTD_bounds const bounds = ZSTD_cParam_getBounds(cParam); + if (ZSTD_isError(bounds.error)) return 0; + if (value < bounds.lowerBound) return 0; + if (value > bounds.upperBound) return 0; + return 1; +} + +/* ZSTD_noCompressBlock() : + * Writes uncompressed block to dst buffer from given src. + * Returns the size of the block */ +MEM_STATIC size_t +ZSTD_noCompressBlock(void* dst, size_t dstCapacity, const void* src, size_t srcSize, U32 lastBlock) +{ + U32 const cBlockHeader24 = lastBlock + (((U32)bt_raw)<<1) + (U32)(srcSize << 3); + DEBUGLOG(5, "ZSTD_noCompressBlock (srcSize=%zu, dstCapacity=%zu)", srcSize, dstCapacity); + RETURN_ERROR_IF(srcSize + ZSTD_blockHeaderSize > dstCapacity, + dstSize_tooSmall, "dst buf too small for uncompressed block"); + MEM_writeLE24(dst, cBlockHeader24); + ZSTD_memcpy((BYTE*)dst + ZSTD_blockHeaderSize, src, srcSize); + return ZSTD_blockHeaderSize + srcSize; +} + +MEM_STATIC size_t +ZSTD_rleCompressBlock(void* dst, size_t dstCapacity, BYTE src, size_t srcSize, U32 lastBlock) +{ + BYTE* const op = (BYTE*)dst; + U32 const cBlockHeader = lastBlock + (((U32)bt_rle)<<1) + (U32)(srcSize << 3); + RETURN_ERROR_IF(dstCapacity < 4, dstSize_tooSmall, ""); + MEM_writeLE24(op, cBlockHeader); + op[3] = src; + return 4; +} + + +/* ZSTD_minGain() : + * minimum compression required + * to generate a compress block or a compressed literals section. + * note : use same formula for both situations */ +MEM_STATIC size_t ZSTD_minGain(size_t srcSize, ZSTD_strategy strat) +{ + U32 const minlog = (strat>=ZSTD_btultra) ? (U32)(strat) - 1 : 6; + ZSTD_STATIC_ASSERT(ZSTD_btultra == 8); + assert(ZSTD_cParam_withinBounds(ZSTD_c_strategy, (int)strat)); + return (srcSize >> minlog) + 2; +} + +MEM_STATIC int ZSTD_literalsCompressionIsDisabled(const ZSTD_CCtx_params* cctxParams) +{ + switch (cctxParams->literalCompressionMode) { + case ZSTD_ps_enable: + return 0; + case ZSTD_ps_disable: + return 1; + default: + assert(0 /* impossible: pre-validated */); + ZSTD_FALLTHROUGH; + case ZSTD_ps_auto: + return (cctxParams->cParams.strategy == ZSTD_fast) && (cctxParams->cParams.targetLength > 0); + } +} + +/*! ZSTD_safecopyLiterals() : + * memcpy() function that won't read beyond more than WILDCOPY_OVERLENGTH bytes past ilimit_w. + * Only called when the sequence ends past ilimit_w, so it only needs to be optimized for single + * large copies. + */ +static void +ZSTD_safecopyLiterals(BYTE* op, BYTE const* ip, BYTE const* const iend, BYTE const* ilimit_w) +{ + assert(iend > ilimit_w); + if (ip <= ilimit_w) { + ZSTD_wildcopy(op, ip, ilimit_w - ip, ZSTD_no_overlap); + op += ilimit_w - ip; + ip = ilimit_w; + } + while (ip < iend) *op++ = *ip++; +} + + +#define REPCODE1_TO_OFFBASE REPCODE_TO_OFFBASE(1) +#define REPCODE2_TO_OFFBASE REPCODE_TO_OFFBASE(2) +#define REPCODE3_TO_OFFBASE REPCODE_TO_OFFBASE(3) +#define REPCODE_TO_OFFBASE(r) (assert((r)>=1), assert((r)<=ZSTD_REP_NUM), (r)) /* accepts IDs 1,2,3 */ +#define OFFSET_TO_OFFBASE(o) (assert((o)>0), o + ZSTD_REP_NUM) +#define OFFBASE_IS_OFFSET(o) ((o) > ZSTD_REP_NUM) +#define OFFBASE_IS_REPCODE(o) ( 1 <= (o) && (o) <= ZSTD_REP_NUM) +#define OFFBASE_TO_OFFSET(o) (assert(OFFBASE_IS_OFFSET(o)), (o) - ZSTD_REP_NUM) +#define OFFBASE_TO_REPCODE(o) (assert(OFFBASE_IS_REPCODE(o)), (o)) /* returns ID 1,2,3 */ + +/*! ZSTD_storeSeq() : + * Store a sequence (litlen, litPtr, offBase and matchLength) into seqStore_t. + * @offBase : Users should employ macros REPCODE_TO_OFFBASE() and OFFSET_TO_OFFBASE(). + * @matchLength : must be >= MINMATCH + * Allowed to over-read literals up to litLimit. +*/ +HINT_INLINE UNUSED_ATTR void +ZSTD_storeSeq(seqStore_t* seqStorePtr, + size_t litLength, const BYTE* literals, const BYTE* litLimit, + U32 offBase, + size_t matchLength) +{ + BYTE const* const litLimit_w = litLimit - WILDCOPY_OVERLENGTH; + BYTE const* const litEnd = literals + litLength; +#if defined(DEBUGLEVEL) && (DEBUGLEVEL >= 6) + static const BYTE* g_start = NULL; + if (g_start==NULL) g_start = (const BYTE*)literals; /* note : index only works for compression within a single segment */ + { U32 const pos = (U32)((const BYTE*)literals - g_start); + DEBUGLOG(6, "Cpos%7u :%3u literals, match%4u bytes at offBase%7u", + pos, (U32)litLength, (U32)matchLength, (U32)offBase); + } +#endif + assert((size_t)(seqStorePtr->sequences - seqStorePtr->sequencesStart) < seqStorePtr->maxNbSeq); + /* copy Literals */ + assert(seqStorePtr->maxNbLit <= 128 KB); + assert(seqStorePtr->lit + litLength <= seqStorePtr->litStart + seqStorePtr->maxNbLit); + assert(literals + litLength <= litLimit); + if (litEnd <= litLimit_w) { + /* Common case we can use wildcopy. + * First copy 16 bytes, because literals are likely short. + */ + ZSTD_STATIC_ASSERT(WILDCOPY_OVERLENGTH >= 16); + ZSTD_copy16(seqStorePtr->lit, literals); + if (litLength > 16) { + ZSTD_wildcopy(seqStorePtr->lit+16, literals+16, (ptrdiff_t)litLength-16, ZSTD_no_overlap); + } + } else { + ZSTD_safecopyLiterals(seqStorePtr->lit, literals, litEnd, litLimit_w); + } + seqStorePtr->lit += litLength; + + /* literal Length */ + if (litLength>0xFFFF) { + assert(seqStorePtr->longLengthType == ZSTD_llt_none); /* there can only be a single long length */ + seqStorePtr->longLengthType = ZSTD_llt_literalLength; + seqStorePtr->longLengthPos = (U32)(seqStorePtr->sequences - seqStorePtr->sequencesStart); + } + seqStorePtr->sequences[0].litLength = (U16)litLength; + + /* match offset */ + seqStorePtr->sequences[0].offBase = offBase; + + /* match Length */ + assert(matchLength >= MINMATCH); + { size_t const mlBase = matchLength - MINMATCH; + if (mlBase>0xFFFF) { + assert(seqStorePtr->longLengthType == ZSTD_llt_none); /* there can only be a single long length */ + seqStorePtr->longLengthType = ZSTD_llt_matchLength; + seqStorePtr->longLengthPos = (U32)(seqStorePtr->sequences - seqStorePtr->sequencesStart); + } + seqStorePtr->sequences[0].mlBase = (U16)mlBase; + } + + seqStorePtr->sequences++; +} + +/* ZSTD_updateRep() : + * updates in-place @rep (array of repeat offsets) + * @offBase : sum-type, using numeric representation of ZSTD_storeSeq() + */ +MEM_STATIC void +ZSTD_updateRep(U32 rep[ZSTD_REP_NUM], U32 const offBase, U32 const ll0) +{ + if (OFFBASE_IS_OFFSET(offBase)) { /* full offset */ + rep[2] = rep[1]; + rep[1] = rep[0]; + rep[0] = OFFBASE_TO_OFFSET(offBase); + } else { /* repcode */ + U32 const repCode = OFFBASE_TO_REPCODE(offBase) - 1 + ll0; + if (repCode > 0) { /* note : if repCode==0, no change */ + U32 const currentOffset = (repCode==ZSTD_REP_NUM) ? (rep[0] - 1) : rep[repCode]; + rep[2] = (repCode >= 2) ? rep[1] : rep[2]; + rep[1] = rep[0]; + rep[0] = currentOffset; + } else { /* repCode == 0 */ + /* nothing to do */ + } + } +} + +typedef struct repcodes_s { + U32 rep[3]; +} repcodes_t; + +MEM_STATIC repcodes_t +ZSTD_newRep(U32 const rep[ZSTD_REP_NUM], U32 const offBase, U32 const ll0) +{ + repcodes_t newReps; + ZSTD_memcpy(&newReps, rep, sizeof(newReps)); + ZSTD_updateRep(newReps.rep, offBase, ll0); + return newReps; +} + + +/*-************************************* +* Match length counter +***************************************/ +MEM_STATIC size_t ZSTD_count(const BYTE* pIn, const BYTE* pMatch, const BYTE* const pInLimit) +{ + const BYTE* const pStart = pIn; + const BYTE* const pInLoopLimit = pInLimit - (sizeof(size_t)-1); + + if (pIn < pInLoopLimit) { + { size_t const diff = MEM_readST(pMatch) ^ MEM_readST(pIn); + if (diff) return ZSTD_NbCommonBytes(diff); } + pIn+=sizeof(size_t); pMatch+=sizeof(size_t); + while (pIn < pInLoopLimit) { + size_t const diff = MEM_readST(pMatch) ^ MEM_readST(pIn); + if (!diff) { pIn+=sizeof(size_t); pMatch+=sizeof(size_t); continue; } + pIn += ZSTD_NbCommonBytes(diff); + return (size_t)(pIn - pStart); + } } + if (MEM_64bits() && (pIn<(pInLimit-3)) && (MEM_read32(pMatch) == MEM_read32(pIn))) { pIn+=4; pMatch+=4; } + if ((pIn<(pInLimit-1)) && (MEM_read16(pMatch) == MEM_read16(pIn))) { pIn+=2; pMatch+=2; } + if ((pIn> (32-h) ; } +MEM_STATIC size_t ZSTD_hash3Ptr(const void* ptr, U32 h) { return ZSTD_hash3(MEM_readLE32(ptr), h, 0); } /* only in zstd_opt.h */ +MEM_STATIC size_t ZSTD_hash3PtrS(const void* ptr, U32 h, U32 s) { return ZSTD_hash3(MEM_readLE32(ptr), h, s); } + +static const U32 prime4bytes = 2654435761U; +static U32 ZSTD_hash4(U32 u, U32 h, U32 s) { assert(h <= 32); return ((u * prime4bytes) ^ s) >> (32-h) ; } +static size_t ZSTD_hash4Ptr(const void* ptr, U32 h) { return ZSTD_hash4(MEM_readLE32(ptr), h, 0); } +static size_t ZSTD_hash4PtrS(const void* ptr, U32 h, U32 s) { return ZSTD_hash4(MEM_readLE32(ptr), h, s); } + +static const U64 prime5bytes = 889523592379ULL; +static size_t ZSTD_hash5(U64 u, U32 h, U64 s) { assert(h <= 64); return (size_t)((((u << (64-40)) * prime5bytes) ^ s) >> (64-h)) ; } +static size_t ZSTD_hash5Ptr(const void* p, U32 h) { return ZSTD_hash5(MEM_readLE64(p), h, 0); } +static size_t ZSTD_hash5PtrS(const void* p, U32 h, U64 s) { return ZSTD_hash5(MEM_readLE64(p), h, s); } + +static const U64 prime6bytes = 227718039650203ULL; +static size_t ZSTD_hash6(U64 u, U32 h, U64 s) { assert(h <= 64); return (size_t)((((u << (64-48)) * prime6bytes) ^ s) >> (64-h)) ; } +static size_t ZSTD_hash6Ptr(const void* p, U32 h) { return ZSTD_hash6(MEM_readLE64(p), h, 0); } +static size_t ZSTD_hash6PtrS(const void* p, U32 h, U64 s) { return ZSTD_hash6(MEM_readLE64(p), h, s); } + +static const U64 prime7bytes = 58295818150454627ULL; +static size_t ZSTD_hash7(U64 u, U32 h, U64 s) { assert(h <= 64); return (size_t)((((u << (64-56)) * prime7bytes) ^ s) >> (64-h)) ; } +static size_t ZSTD_hash7Ptr(const void* p, U32 h) { return ZSTD_hash7(MEM_readLE64(p), h, 0); } +static size_t ZSTD_hash7PtrS(const void* p, U32 h, U64 s) { return ZSTD_hash7(MEM_readLE64(p), h, s); } + +static const U64 prime8bytes = 0xCF1BBCDCB7A56463ULL; +static size_t ZSTD_hash8(U64 u, U32 h, U64 s) { assert(h <= 64); return (size_t)((((u) * prime8bytes) ^ s) >> (64-h)) ; } +static size_t ZSTD_hash8Ptr(const void* p, U32 h) { return ZSTD_hash8(MEM_readLE64(p), h, 0); } +static size_t ZSTD_hash8PtrS(const void* p, U32 h, U64 s) { return ZSTD_hash8(MEM_readLE64(p), h, s); } + + +MEM_STATIC FORCE_INLINE_ATTR +size_t ZSTD_hashPtr(const void* p, U32 hBits, U32 mls) +{ + /* Although some of these hashes do support hBits up to 64, some do not. + * To be on the safe side, always avoid hBits > 32. */ + assert(hBits <= 32); + + switch(mls) + { + default: + case 4: return ZSTD_hash4Ptr(p, hBits); + case 5: return ZSTD_hash5Ptr(p, hBits); + case 6: return ZSTD_hash6Ptr(p, hBits); + case 7: return ZSTD_hash7Ptr(p, hBits); + case 8: return ZSTD_hash8Ptr(p, hBits); + } +} + +MEM_STATIC FORCE_INLINE_ATTR +size_t ZSTD_hashPtrSalted(const void* p, U32 hBits, U32 mls, const U64 hashSalt) { + /* Although some of these hashes do support hBits up to 64, some do not. + * To be on the safe side, always avoid hBits > 32. */ + assert(hBits <= 32); + + switch(mls) + { + default: + case 4: return ZSTD_hash4PtrS(p, hBits, (U32)hashSalt); + case 5: return ZSTD_hash5PtrS(p, hBits, hashSalt); + case 6: return ZSTD_hash6PtrS(p, hBits, hashSalt); + case 7: return ZSTD_hash7PtrS(p, hBits, hashSalt); + case 8: return ZSTD_hash8PtrS(p, hBits, hashSalt); + } +} + + +/** ZSTD_ipow() : + * Return base^exponent. + */ +static U64 ZSTD_ipow(U64 base, U64 exponent) +{ + U64 power = 1; + while (exponent) { + if (exponent & 1) power *= base; + exponent >>= 1; + base *= base; + } + return power; +} + +#define ZSTD_ROLL_HASH_CHAR_OFFSET 10 + +/** ZSTD_rollingHash_append() : + * Add the buffer to the hash value. + */ +static U64 ZSTD_rollingHash_append(U64 hash, void const* buf, size_t size) +{ + BYTE const* istart = (BYTE const*)buf; + size_t pos; + for (pos = 0; pos < size; ++pos) { + hash *= prime8bytes; + hash += istart[pos] + ZSTD_ROLL_HASH_CHAR_OFFSET; + } + return hash; +} + +/** ZSTD_rollingHash_compute() : + * Compute the rolling hash value of the buffer. + */ +MEM_STATIC U64 ZSTD_rollingHash_compute(void const* buf, size_t size) +{ + return ZSTD_rollingHash_append(0, buf, size); +} + +/** ZSTD_rollingHash_primePower() : + * Compute the primePower to be passed to ZSTD_rollingHash_rotate() for a hash + * over a window of length bytes. + */ +MEM_STATIC U64 ZSTD_rollingHash_primePower(U32 length) +{ + return ZSTD_ipow(prime8bytes, length - 1); +} + +/** ZSTD_rollingHash_rotate() : + * Rotate the rolling hash by one byte. + */ +MEM_STATIC U64 ZSTD_rollingHash_rotate(U64 hash, BYTE toRemove, BYTE toAdd, U64 primePower) +{ + hash -= (toRemove + ZSTD_ROLL_HASH_CHAR_OFFSET) * primePower; + hash *= prime8bytes; + hash += toAdd + ZSTD_ROLL_HASH_CHAR_OFFSET; + return hash; +} + +/*-************************************* +* Round buffer management +***************************************/ +#if (ZSTD_WINDOWLOG_MAX_64 > 31) +# error "ZSTD_WINDOWLOG_MAX is too large : would overflow ZSTD_CURRENT_MAX" +#endif +/* Max current allowed */ +#define ZSTD_CURRENT_MAX ((3U << 29) + (1U << ZSTD_WINDOWLOG_MAX)) +/* Maximum chunk size before overflow correction needs to be called again */ +#define ZSTD_CHUNKSIZE_MAX \ + ( ((U32)-1) /* Maximum ending current index */ \ + - ZSTD_CURRENT_MAX) /* Maximum beginning lowLimit */ + +/** + * ZSTD_window_clear(): + * Clears the window containing the history by simply setting it to empty. + */ +MEM_STATIC void ZSTD_window_clear(ZSTD_window_t* window) +{ + size_t const endT = (size_t)(window->nextSrc - window->base); + U32 const end = (U32)endT; + + window->lowLimit = end; + window->dictLimit = end; +} + +MEM_STATIC U32 ZSTD_window_isEmpty(ZSTD_window_t const window) +{ + return window.dictLimit == ZSTD_WINDOW_START_INDEX && + window.lowLimit == ZSTD_WINDOW_START_INDEX && + (window.nextSrc - window.base) == ZSTD_WINDOW_START_INDEX; +} + +/** + * ZSTD_window_hasExtDict(): + * Returns non-zero if the window has a non-empty extDict. + */ +MEM_STATIC U32 ZSTD_window_hasExtDict(ZSTD_window_t const window) +{ + return window.lowLimit < window.dictLimit; +} + +/** + * ZSTD_matchState_dictMode(): + * Inspects the provided matchState and figures out what dictMode should be + * passed to the compressor. + */ +MEM_STATIC ZSTD_dictMode_e ZSTD_matchState_dictMode(const ZSTD_matchState_t *ms) +{ + return ZSTD_window_hasExtDict(ms->window) ? + ZSTD_extDict : + ms->dictMatchState != NULL ? + (ms->dictMatchState->dedicatedDictSearch ? ZSTD_dedicatedDictSearch : ZSTD_dictMatchState) : + ZSTD_noDict; +} + +/* Defining this macro to non-zero tells zstd to run the overflow correction + * code much more frequently. This is very inefficient, and should only be + * used for tests and fuzzers. + */ +#ifndef ZSTD_WINDOW_OVERFLOW_CORRECT_FREQUENTLY +# ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION +# define ZSTD_WINDOW_OVERFLOW_CORRECT_FREQUENTLY 1 +# else +# define ZSTD_WINDOW_OVERFLOW_CORRECT_FREQUENTLY 0 +# endif +#endif + +/** + * ZSTD_window_canOverflowCorrect(): + * Returns non-zero if the indices are large enough for overflow correction + * to work correctly without impacting compression ratio. + */ +MEM_STATIC U32 ZSTD_window_canOverflowCorrect(ZSTD_window_t const window, + U32 cycleLog, + U32 maxDist, + U32 loadedDictEnd, + void const* src) +{ + U32 const cycleSize = 1u << cycleLog; + U32 const curr = (U32)((BYTE const*)src - window.base); + U32 const minIndexToOverflowCorrect = cycleSize + + MAX(maxDist, cycleSize) + + ZSTD_WINDOW_START_INDEX; + + /* Adjust the min index to backoff the overflow correction frequency, + * so we don't waste too much CPU in overflow correction. If this + * computation overflows we don't really care, we just need to make + * sure it is at least minIndexToOverflowCorrect. + */ + U32 const adjustment = window.nbOverflowCorrections + 1; + U32 const adjustedIndex = MAX(minIndexToOverflowCorrect * adjustment, + minIndexToOverflowCorrect); + U32 const indexLargeEnough = curr > adjustedIndex; + + /* Only overflow correct early if the dictionary is invalidated already, + * so we don't hurt compression ratio. + */ + U32 const dictionaryInvalidated = curr > maxDist + loadedDictEnd; + + return indexLargeEnough && dictionaryInvalidated; +} + +/** + * ZSTD_window_needOverflowCorrection(): + * Returns non-zero if the indices are getting too large and need overflow + * protection. + */ +MEM_STATIC U32 ZSTD_window_needOverflowCorrection(ZSTD_window_t const window, + U32 cycleLog, + U32 maxDist, + U32 loadedDictEnd, + void const* src, + void const* srcEnd) +{ + U32 const curr = (U32)((BYTE const*)srcEnd - window.base); + if (ZSTD_WINDOW_OVERFLOW_CORRECT_FREQUENTLY) { + if (ZSTD_window_canOverflowCorrect(window, cycleLog, maxDist, loadedDictEnd, src)) { + return 1; + } + } + return curr > ZSTD_CURRENT_MAX; +} + +/** + * ZSTD_window_correctOverflow(): + * Reduces the indices to protect from index overflow. + * Returns the correction made to the indices, which must be applied to every + * stored index. + * + * The least significant cycleLog bits of the indices must remain the same, + * which may be 0. Every index up to maxDist in the past must be valid. + */ +MEM_STATIC +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +U32 ZSTD_window_correctOverflow(ZSTD_window_t* window, U32 cycleLog, + U32 maxDist, void const* src) +{ + /* preemptive overflow correction: + * 1. correction is large enough: + * lowLimit > (3<<29) ==> current > 3<<29 + 1< (3<<29 + 1< (3<<29) - (1< (3<<29) - (1<<30) (NOTE: chainLog <= 30) + * > 1<<29 + * + * 2. (ip+ZSTD_CHUNKSIZE_MAX - cctx->base) doesn't overflow: + * After correction, current is less than (1<base < 1<<32. + * 3. (cctx->lowLimit + 1< 3<<29 + 1<base); + U32 const currentCycle = curr & cycleMask; + /* Ensure newCurrent - maxDist >= ZSTD_WINDOW_START_INDEX. */ + U32 const currentCycleCorrection = currentCycle < ZSTD_WINDOW_START_INDEX + ? MAX(cycleSize, ZSTD_WINDOW_START_INDEX) + : 0; + U32 const newCurrent = currentCycle + + currentCycleCorrection + + MAX(maxDist, cycleSize); + U32 const correction = curr - newCurrent; + /* maxDist must be a power of two so that: + * (newCurrent & cycleMask) == (curr & cycleMask) + * This is required to not corrupt the chains / binary tree. + */ + assert((maxDist & (maxDist - 1)) == 0); + assert((curr & cycleMask) == (newCurrent & cycleMask)); + assert(curr > newCurrent); + if (!ZSTD_WINDOW_OVERFLOW_CORRECT_FREQUENTLY) { + /* Loose bound, should be around 1<<29 (see above) */ + assert(correction > 1<<28); + } + + window->base += correction; + window->dictBase += correction; + if (window->lowLimit < correction + ZSTD_WINDOW_START_INDEX) { + window->lowLimit = ZSTD_WINDOW_START_INDEX; + } else { + window->lowLimit -= correction; + } + if (window->dictLimit < correction + ZSTD_WINDOW_START_INDEX) { + window->dictLimit = ZSTD_WINDOW_START_INDEX; + } else { + window->dictLimit -= correction; + } + + /* Ensure we can still reference the full window. */ + assert(newCurrent >= maxDist); + assert(newCurrent - maxDist >= ZSTD_WINDOW_START_INDEX); + /* Ensure that lowLimit and dictLimit didn't underflow. */ + assert(window->lowLimit <= newCurrent); + assert(window->dictLimit <= newCurrent); + + ++window->nbOverflowCorrections; + + DEBUGLOG(4, "Correction of 0x%x bytes to lowLimit=0x%x", correction, + window->lowLimit); + return correction; +} + +/** + * ZSTD_window_enforceMaxDist(): + * Updates lowLimit so that: + * (srcEnd - base) - lowLimit == maxDist + loadedDictEnd + * + * It ensures index is valid as long as index >= lowLimit. + * This must be called before a block compression call. + * + * loadedDictEnd is only defined if a dictionary is in use for current compression. + * As the name implies, loadedDictEnd represents the index at end of dictionary. + * The value lies within context's referential, it can be directly compared to blockEndIdx. + * + * If loadedDictEndPtr is NULL, no dictionary is in use, and we use loadedDictEnd == 0. + * If loadedDictEndPtr is not NULL, we set it to zero after updating lowLimit. + * This is because dictionaries are allowed to be referenced fully + * as long as the last byte of the dictionary is in the window. + * Once input has progressed beyond window size, dictionary cannot be referenced anymore. + * + * In normal dict mode, the dictionary lies between lowLimit and dictLimit. + * In dictMatchState mode, lowLimit and dictLimit are the same, + * and the dictionary is below them. + * forceWindow and dictMatchState are therefore incompatible. + */ +MEM_STATIC void +ZSTD_window_enforceMaxDist(ZSTD_window_t* window, + const void* blockEnd, + U32 maxDist, + U32* loadedDictEndPtr, + const ZSTD_matchState_t** dictMatchStatePtr) +{ + U32 const blockEndIdx = (U32)((BYTE const*)blockEnd - window->base); + U32 const loadedDictEnd = (loadedDictEndPtr != NULL) ? *loadedDictEndPtr : 0; + DEBUGLOG(5, "ZSTD_window_enforceMaxDist: blockEndIdx=%u, maxDist=%u, loadedDictEnd=%u", + (unsigned)blockEndIdx, (unsigned)maxDist, (unsigned)loadedDictEnd); + + /* - When there is no dictionary : loadedDictEnd == 0. + In which case, the test (blockEndIdx > maxDist) is merely to avoid + overflowing next operation `newLowLimit = blockEndIdx - maxDist`. + - When there is a standard dictionary : + Index referential is copied from the dictionary, + which means it starts from 0. + In which case, loadedDictEnd == dictSize, + and it makes sense to compare `blockEndIdx > maxDist + dictSize` + since `blockEndIdx` also starts from zero. + - When there is an attached dictionary : + loadedDictEnd is expressed within the referential of the context, + so it can be directly compared against blockEndIdx. + */ + if (blockEndIdx > maxDist + loadedDictEnd) { + U32 const newLowLimit = blockEndIdx - maxDist; + if (window->lowLimit < newLowLimit) window->lowLimit = newLowLimit; + if (window->dictLimit < window->lowLimit) { + DEBUGLOG(5, "Update dictLimit to match lowLimit, from %u to %u", + (unsigned)window->dictLimit, (unsigned)window->lowLimit); + window->dictLimit = window->lowLimit; + } + /* On reaching window size, dictionaries are invalidated */ + if (loadedDictEndPtr) *loadedDictEndPtr = 0; + if (dictMatchStatePtr) *dictMatchStatePtr = NULL; + } +} + +/* Similar to ZSTD_window_enforceMaxDist(), + * but only invalidates dictionary + * when input progresses beyond window size. + * assumption : loadedDictEndPtr and dictMatchStatePtr are valid (non NULL) + * loadedDictEnd uses same referential as window->base + * maxDist is the window size */ +MEM_STATIC void +ZSTD_checkDictValidity(const ZSTD_window_t* window, + const void* blockEnd, + U32 maxDist, + U32* loadedDictEndPtr, + const ZSTD_matchState_t** dictMatchStatePtr) +{ + assert(loadedDictEndPtr != NULL); + assert(dictMatchStatePtr != NULL); + { U32 const blockEndIdx = (U32)((BYTE const*)blockEnd - window->base); + U32 const loadedDictEnd = *loadedDictEndPtr; + DEBUGLOG(5, "ZSTD_checkDictValidity: blockEndIdx=%u, maxDist=%u, loadedDictEnd=%u", + (unsigned)blockEndIdx, (unsigned)maxDist, (unsigned)loadedDictEnd); + assert(blockEndIdx >= loadedDictEnd); + + if (blockEndIdx > loadedDictEnd + maxDist || loadedDictEnd != window->dictLimit) { + /* On reaching window size, dictionaries are invalidated. + * For simplification, if window size is reached anywhere within next block, + * the dictionary is invalidated for the full block. + * + * We also have to invalidate the dictionary if ZSTD_window_update() has detected + * non-contiguous segments, which means that loadedDictEnd != window->dictLimit. + * loadedDictEnd may be 0, if forceWindow is true, but in that case we never use + * dictMatchState, so setting it to NULL is not a problem. + */ + DEBUGLOG(6, "invalidating dictionary for current block (distance > windowSize)"); + *loadedDictEndPtr = 0; + *dictMatchStatePtr = NULL; + } else { + if (*loadedDictEndPtr != 0) { + DEBUGLOG(6, "dictionary considered valid for current block"); + } } } +} + +MEM_STATIC void ZSTD_window_init(ZSTD_window_t* window) { + ZSTD_memset(window, 0, sizeof(*window)); + window->base = (BYTE const*)" "; + window->dictBase = (BYTE const*)" "; + ZSTD_STATIC_ASSERT(ZSTD_DUBT_UNSORTED_MARK < ZSTD_WINDOW_START_INDEX); /* Start above ZSTD_DUBT_UNSORTED_MARK */ + window->dictLimit = ZSTD_WINDOW_START_INDEX; /* start from >0, so that 1st position is valid */ + window->lowLimit = ZSTD_WINDOW_START_INDEX; /* it ensures first and later CCtx usages compress the same */ + window->nextSrc = window->base + ZSTD_WINDOW_START_INDEX; /* see issue #1241 */ + window->nbOverflowCorrections = 0; +} + +/** + * ZSTD_window_update(): + * Updates the window by appending [src, src + srcSize) to the window. + * If it is not contiguous, the current prefix becomes the extDict, and we + * forget about the extDict. Handles overlap of the prefix and extDict. + * Returns non-zero if the segment is contiguous. + */ +MEM_STATIC +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +U32 ZSTD_window_update(ZSTD_window_t* window, + void const* src, size_t srcSize, + int forceNonContiguous) +{ + BYTE const* const ip = (BYTE const*)src; + U32 contiguous = 1; + DEBUGLOG(5, "ZSTD_window_update"); + if (srcSize == 0) + return contiguous; + assert(window->base != NULL); + assert(window->dictBase != NULL); + /* Check if blocks follow each other */ + if (src != window->nextSrc || forceNonContiguous) { + /* not contiguous */ + size_t const distanceFromBase = (size_t)(window->nextSrc - window->base); + DEBUGLOG(5, "Non contiguous blocks, new segment starts at %u", window->dictLimit); + window->lowLimit = window->dictLimit; + assert(distanceFromBase == (size_t)(U32)distanceFromBase); /* should never overflow */ + window->dictLimit = (U32)distanceFromBase; + window->dictBase = window->base; + window->base = ip - distanceFromBase; + /* ms->nextToUpdate = window->dictLimit; */ + if (window->dictLimit - window->lowLimit < HASH_READ_SIZE) window->lowLimit = window->dictLimit; /* too small extDict */ + contiguous = 0; + } + window->nextSrc = ip + srcSize; + /* if input and dictionary overlap : reduce dictionary (area presumed modified by input) */ + if ( (ip+srcSize > window->dictBase + window->lowLimit) + & (ip < window->dictBase + window->dictLimit)) { + ptrdiff_t const highInputIdx = (ip + srcSize) - window->dictBase; + U32 const lowLimitMax = (highInputIdx > (ptrdiff_t)window->dictLimit) ? window->dictLimit : (U32)highInputIdx; + window->lowLimit = lowLimitMax; + DEBUGLOG(5, "Overlapping extDict and input : new lowLimit = %u", window->lowLimit); + } + return contiguous; +} + +/** + * Returns the lowest allowed match index. It may either be in the ext-dict or the prefix. + */ +MEM_STATIC U32 ZSTD_getLowestMatchIndex(const ZSTD_matchState_t* ms, U32 curr, unsigned windowLog) +{ + U32 const maxDistance = 1U << windowLog; + U32 const lowestValid = ms->window.lowLimit; + U32 const withinWindow = (curr - lowestValid > maxDistance) ? curr - maxDistance : lowestValid; + U32 const isDictionary = (ms->loadedDictEnd != 0); + /* When using a dictionary the entire dictionary is valid if a single byte of the dictionary + * is within the window. We invalidate the dictionary (and set loadedDictEnd to 0) when it isn't + * valid for the entire block. So this check is sufficient to find the lowest valid match index. + */ + U32 const matchLowest = isDictionary ? lowestValid : withinWindow; + return matchLowest; +} + +/** + * Returns the lowest allowed match index in the prefix. + */ +MEM_STATIC U32 ZSTD_getLowestPrefixIndex(const ZSTD_matchState_t* ms, U32 curr, unsigned windowLog) +{ + U32 const maxDistance = 1U << windowLog; + U32 const lowestValid = ms->window.dictLimit; + U32 const withinWindow = (curr - lowestValid > maxDistance) ? curr - maxDistance : lowestValid; + U32 const isDictionary = (ms->loadedDictEnd != 0); + /* When computing the lowest prefix index we need to take the dictionary into account to handle + * the edge case where the dictionary and the source are contiguous in memory. + */ + U32 const matchLowest = isDictionary ? lowestValid : withinWindow; + return matchLowest; +} + + + +/* debug functions */ +#if (DEBUGLEVEL>=2) + +MEM_STATIC double ZSTD_fWeight(U32 rawStat) +{ + U32 const fp_accuracy = 8; + U32 const fp_multiplier = (1 << fp_accuracy); + U32 const newStat = rawStat + 1; + U32 const hb = ZSTD_highbit32(newStat); + U32 const BWeight = hb * fp_multiplier; + U32 const FWeight = (newStat << fp_accuracy) >> hb; + U32 const weight = BWeight + FWeight; + assert(hb + fp_accuracy < 31); + return (double)weight / fp_multiplier; +} + +/* display a table content, + * listing each element, its frequency, and its predicted bit cost */ +MEM_STATIC void ZSTD_debugTable(const U32* table, U32 max) +{ + unsigned u, sum; + for (u=0, sum=0; u<=max; u++) sum += table[u]; + DEBUGLOG(2, "total nb elts: %u", sum); + for (u=0; u<=max; u++) { + DEBUGLOG(2, "%2u: %5u (%.2f)", + u, table[u], ZSTD_fWeight(sum) - ZSTD_fWeight(table[u]) ); + } +} + +#endif + +/* Short Cache */ + +/* Normally, zstd matchfinders follow this flow: + * 1. Compute hash at ip + * 2. Load index from hashTable[hash] + * 3. Check if *ip == *(base + index) + * In dictionary compression, loading *(base + index) is often an L2 or even L3 miss. + * + * Short cache is an optimization which allows us to avoid step 3 most of the time + * when the data doesn't actually match. With short cache, the flow becomes: + * 1. Compute (hash, currentTag) at ip. currentTag is an 8-bit independent hash at ip. + * 2. Load (index, matchTag) from hashTable[hash]. See ZSTD_writeTaggedIndex to understand how this works. + * 3. Only if currentTag == matchTag, check *ip == *(base + index). Otherwise, continue. + * + * Currently, short cache is only implemented in CDict hashtables. Thus, its use is limited to + * dictMatchState matchfinders. + */ +#define ZSTD_SHORT_CACHE_TAG_BITS 8 +#define ZSTD_SHORT_CACHE_TAG_MASK ((1u << ZSTD_SHORT_CACHE_TAG_BITS) - 1) + +/* Helper function for ZSTD_fillHashTable and ZSTD_fillDoubleHashTable. + * Unpacks hashAndTag into (hash, tag), then packs (index, tag) into hashTable[hash]. */ +MEM_STATIC void ZSTD_writeTaggedIndex(U32* const hashTable, size_t hashAndTag, U32 index) { + size_t const hash = hashAndTag >> ZSTD_SHORT_CACHE_TAG_BITS; + U32 const tag = (U32)(hashAndTag & ZSTD_SHORT_CACHE_TAG_MASK); + assert(index >> (32 - ZSTD_SHORT_CACHE_TAG_BITS) == 0); + hashTable[hash] = (index << ZSTD_SHORT_CACHE_TAG_BITS) | tag; +} + +/* Helper function for short cache matchfinders. + * Unpacks tag1 and tag2 from lower bits of packedTag1 and packedTag2, then checks if the tags match. */ +MEM_STATIC int ZSTD_comparePackedTags(size_t packedTag1, size_t packedTag2) { + U32 const tag1 = packedTag1 & ZSTD_SHORT_CACHE_TAG_MASK; + U32 const tag2 = packedTag2 & ZSTD_SHORT_CACHE_TAG_MASK; + return tag1 == tag2; +} + +#if defined (__cplusplus) +} +#endif + +/* =============================================================== + * Shared internal declarations + * These prototypes may be called from sources not in lib/compress + * =============================================================== */ + +/* ZSTD_loadCEntropy() : + * dict : must point at beginning of a valid zstd dictionary. + * return : size of dictionary header (size of magic number + dict ID + entropy tables) + * assumptions : magic number supposed already checked + * and dictSize >= 8 */ +size_t ZSTD_loadCEntropy(ZSTD_compressedBlockState_t* bs, void* workspace, + const void* const dict, size_t dictSize); + +void ZSTD_reset_compressedBlockState(ZSTD_compressedBlockState_t* bs); + +/* ============================================================== + * Private declarations + * These prototypes shall only be called from within lib/compress + * ============================================================== */ + +/* ZSTD_getCParamsFromCCtxParams() : + * cParams are built depending on compressionLevel, src size hints, + * LDM and manually set compression parameters. + * Note: srcSizeHint == 0 means 0! + */ +ZSTD_compressionParameters ZSTD_getCParamsFromCCtxParams( + const ZSTD_CCtx_params* CCtxParams, U64 srcSizeHint, size_t dictSize, ZSTD_cParamMode_e mode); + +/*! ZSTD_initCStream_internal() : + * Private use only. Init streaming operation. + * expects params to be valid. + * must receive dict, or cdict, or none, but not both. + * @return : 0, or an error code */ +size_t ZSTD_initCStream_internal(ZSTD_CStream* zcs, + const void* dict, size_t dictSize, + const ZSTD_CDict* cdict, + const ZSTD_CCtx_params* params, unsigned long long pledgedSrcSize); + +void ZSTD_resetSeqStore(seqStore_t* ssPtr); + +/*! ZSTD_getCParamsFromCDict() : + * as the name implies */ +ZSTD_compressionParameters ZSTD_getCParamsFromCDict(const ZSTD_CDict* cdict); + +/* ZSTD_compressBegin_advanced_internal() : + * Private use only. To be called from zstdmt_compress.c. */ +size_t ZSTD_compressBegin_advanced_internal(ZSTD_CCtx* cctx, + const void* dict, size_t dictSize, + ZSTD_dictContentType_e dictContentType, + ZSTD_dictTableLoadMethod_e dtlm, + const ZSTD_CDict* cdict, + const ZSTD_CCtx_params* params, + unsigned long long pledgedSrcSize); + +/* ZSTD_compress_advanced_internal() : + * Private use only. To be called from zstdmt_compress.c. */ +size_t ZSTD_compress_advanced_internal(ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + const void* dict,size_t dictSize, + const ZSTD_CCtx_params* params); + + +/* ZSTD_writeLastEmptyBlock() : + * output an empty Block with end-of-frame mark to complete a frame + * @return : size of data written into `dst` (== ZSTD_blockHeaderSize (defined in zstd_internal.h)) + * or an error code if `dstCapacity` is too small ( 1 */ +U32 ZSTD_cycleLog(U32 hashLog, ZSTD_strategy strat); + +/** ZSTD_CCtx_trace() : + * Trace the end of a compression call. + */ +void ZSTD_CCtx_trace(ZSTD_CCtx* cctx, size_t extraCSize); + +/* Returns 0 on success, and a ZSTD_error otherwise. This function scans through an array of + * ZSTD_Sequence, storing the sequences it finds, until it reaches a block delimiter. + * Note that the block delimiter must include the last literals of the block. + */ +size_t +ZSTD_copySequencesToSeqStoreExplicitBlockDelim(ZSTD_CCtx* cctx, + ZSTD_sequencePosition* seqPos, + const ZSTD_Sequence* const inSeqs, size_t inSeqsSize, + const void* src, size_t blockSize, ZSTD_paramSwitch_e externalRepSearch); + +/* Returns the number of bytes to move the current read position back by. + * Only non-zero if we ended up splitting a sequence. + * Otherwise, it may return a ZSTD error if something went wrong. + * + * This function will attempt to scan through blockSize bytes + * represented by the sequences in @inSeqs, + * storing any (partial) sequences. + * + * Occasionally, we may want to change the actual number of bytes we consumed from inSeqs to + * avoid splitting a match, or to avoid splitting a match such that it would produce a match + * smaller than MINMATCH. In this case, we return the number of bytes that we didn't read from this block. + */ +size_t +ZSTD_copySequencesToSeqStoreNoBlockDelim(ZSTD_CCtx* cctx, ZSTD_sequencePosition* seqPos, + const ZSTD_Sequence* const inSeqs, size_t inSeqsSize, + const void* src, size_t blockSize, ZSTD_paramSwitch_e externalRepSearch); + +/* Returns 1 if an external sequence producer is registered, otherwise returns 0. */ +MEM_STATIC int ZSTD_hasExtSeqProd(const ZSTD_CCtx_params* params) { + return params->extSeqProdFunc != NULL; +} + +/* =============================================================== + * Deprecated definitions that are still used internally to avoid + * deprecation warnings. These functions are exactly equivalent to + * their public variants, but avoid the deprecation warnings. + * =============================================================== */ + +size_t ZSTD_compressBegin_usingCDict_deprecated(ZSTD_CCtx* cctx, const ZSTD_CDict* cdict); + +size_t ZSTD_compressContinue_public(ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize); + +size_t ZSTD_compressEnd_public(ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize); + +size_t ZSTD_compressBlock_deprecated(ZSTD_CCtx* cctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize); + + +#endif /* ZSTD_COMPRESS_H */ +/**** ended inlining zstd_compress_internal.h ****/ + + +size_t ZSTD_noCompressLiterals (void* dst, size_t dstCapacity, const void* src, size_t srcSize); + +/* ZSTD_compressRleLiteralsBlock() : + * Conditions : + * - All bytes in @src are identical + * - dstCapacity >= 4 */ +size_t ZSTD_compressRleLiteralsBlock (void* dst, size_t dstCapacity, const void* src, size_t srcSize); + +/* ZSTD_compressLiterals(): + * @entropyWorkspace: must be aligned on 4-bytes boundaries + * @entropyWorkspaceSize : must be >= HUF_WORKSPACE_SIZE + * @suspectUncompressible: sampling checks, to potentially skip huffman coding + */ +size_t ZSTD_compressLiterals (void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + void* entropyWorkspace, size_t entropyWorkspaceSize, + const ZSTD_hufCTables_t* prevHuf, + ZSTD_hufCTables_t* nextHuf, + ZSTD_strategy strategy, int disableLiteralCompression, + int suspectUncompressible, + int bmi2); + +#endif /* ZSTD_COMPRESS_LITERALS_H */ +/**** ended inlining zstd_compress_literals.h ****/ + + +/* ************************************************************** +* Debug Traces +****************************************************************/ +#if DEBUGLEVEL >= 2 + +static size_t showHexa(const void* src, size_t srcSize) +{ + const BYTE* const ip = (const BYTE*)src; + size_t u; + for (u=0; u31) + (srcSize>4095); + + DEBUGLOG(5, "ZSTD_noCompressLiterals: srcSize=%zu, dstCapacity=%zu", srcSize, dstCapacity); + + RETURN_ERROR_IF(srcSize + flSize > dstCapacity, dstSize_tooSmall, ""); + + switch(flSize) + { + case 1: /* 2 - 1 - 5 */ + ostart[0] = (BYTE)((U32)set_basic + (srcSize<<3)); + break; + case 2: /* 2 - 2 - 12 */ + MEM_writeLE16(ostart, (U16)((U32)set_basic + (1<<2) + (srcSize<<4))); + break; + case 3: /* 2 - 2 - 20 */ + MEM_writeLE32(ostart, (U32)((U32)set_basic + (3<<2) + (srcSize<<4))); + break; + default: /* not necessary : flSize is {1,2,3} */ + assert(0); + } + + ZSTD_memcpy(ostart + flSize, src, srcSize); + DEBUGLOG(5, "Raw (uncompressed) literals: %u -> %u", (U32)srcSize, (U32)(srcSize + flSize)); + return srcSize + flSize; +} + +static int allBytesIdentical(const void* src, size_t srcSize) +{ + assert(srcSize >= 1); + assert(src != NULL); + { const BYTE b = ((const BYTE*)src)[0]; + size_t p; + for (p=1; p31) + (srcSize>4095); + + assert(dstCapacity >= 4); (void)dstCapacity; + assert(allBytesIdentical(src, srcSize)); + + switch(flSize) + { + case 1: /* 2 - 1 - 5 */ + ostart[0] = (BYTE)((U32)set_rle + (srcSize<<3)); + break; + case 2: /* 2 - 2 - 12 */ + MEM_writeLE16(ostart, (U16)((U32)set_rle + (1<<2) + (srcSize<<4))); + break; + case 3: /* 2 - 2 - 20 */ + MEM_writeLE32(ostart, (U32)((U32)set_rle + (3<<2) + (srcSize<<4))); + break; + default: /* not necessary : flSize is {1,2,3} */ + assert(0); + } + + ostart[flSize] = *(const BYTE*)src; + DEBUGLOG(5, "RLE : Repeated Literal (%02X: %u times) -> %u bytes encoded", ((const BYTE*)src)[0], (U32)srcSize, (U32)flSize + 1); + return flSize+1; +} + +/* ZSTD_minLiteralsToCompress() : + * returns minimal amount of literals + * for literal compression to even be attempted. + * Minimum is made tighter as compression strategy increases. + */ +static size_t +ZSTD_minLiteralsToCompress(ZSTD_strategy strategy, HUF_repeat huf_repeat) +{ + assert((int)strategy >= 0); + assert((int)strategy <= 9); + /* btultra2 : min 8 bytes; + * then 2x larger for each successive compression strategy + * max threshold 64 bytes */ + { int const shift = MIN(9-(int)strategy, 3); + size_t const mintc = (huf_repeat == HUF_repeat_valid) ? 6 : (size_t)8 << shift; + DEBUGLOG(7, "minLiteralsToCompress = %zu", mintc); + return mintc; + } +} + +size_t ZSTD_compressLiterals ( + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + void* entropyWorkspace, size_t entropyWorkspaceSize, + const ZSTD_hufCTables_t* prevHuf, + ZSTD_hufCTables_t* nextHuf, + ZSTD_strategy strategy, + int disableLiteralCompression, + int suspectUncompressible, + int bmi2) +{ + size_t const lhSize = 3 + (srcSize >= 1 KB) + (srcSize >= 16 KB); + BYTE* const ostart = (BYTE*)dst; + U32 singleStream = srcSize < 256; + symbolEncodingType_e hType = set_compressed; + size_t cLitSize; + + DEBUGLOG(5,"ZSTD_compressLiterals (disableLiteralCompression=%i, srcSize=%u, dstCapacity=%zu)", + disableLiteralCompression, (U32)srcSize, dstCapacity); + + DEBUGLOG(6, "Completed literals listing (%zu bytes)", showHexa(src, srcSize)); + + /* Prepare nextEntropy assuming reusing the existing table */ + ZSTD_memcpy(nextHuf, prevHuf, sizeof(*prevHuf)); + + if (disableLiteralCompression) + return ZSTD_noCompressLiterals(dst, dstCapacity, src, srcSize); + + /* if too small, don't even attempt compression (speed opt) */ + if (srcSize < ZSTD_minLiteralsToCompress(strategy, prevHuf->repeatMode)) + return ZSTD_noCompressLiterals(dst, dstCapacity, src, srcSize); + + RETURN_ERROR_IF(dstCapacity < lhSize+1, dstSize_tooSmall, "not enough space for compression"); + { HUF_repeat repeat = prevHuf->repeatMode; + int const flags = 0 + | (bmi2 ? HUF_flags_bmi2 : 0) + | (strategy < ZSTD_lazy && srcSize <= 1024 ? HUF_flags_preferRepeat : 0) + | (strategy >= HUF_OPTIMAL_DEPTH_THRESHOLD ? HUF_flags_optimalDepth : 0) + | (suspectUncompressible ? HUF_flags_suspectUncompressible : 0); + + typedef size_t (*huf_compress_f)(void*, size_t, const void*, size_t, unsigned, unsigned, void*, size_t, HUF_CElt*, HUF_repeat*, int); + huf_compress_f huf_compress; + if (repeat == HUF_repeat_valid && lhSize == 3) singleStream = 1; + huf_compress = singleStream ? HUF_compress1X_repeat : HUF_compress4X_repeat; + cLitSize = huf_compress(ostart+lhSize, dstCapacity-lhSize, + src, srcSize, + HUF_SYMBOLVALUE_MAX, LitHufLog, + entropyWorkspace, entropyWorkspaceSize, + (HUF_CElt*)nextHuf->CTable, + &repeat, flags); + DEBUGLOG(5, "%zu literals compressed into %zu bytes (before header)", srcSize, cLitSize); + if (repeat != HUF_repeat_none) { + /* reused the existing table */ + DEBUGLOG(5, "reusing statistics from previous huffman block"); + hType = set_repeat; + } + } + + { size_t const minGain = ZSTD_minGain(srcSize, strategy); + if ((cLitSize==0) || (cLitSize >= srcSize - minGain) || ERR_isError(cLitSize)) { + ZSTD_memcpy(nextHuf, prevHuf, sizeof(*prevHuf)); + return ZSTD_noCompressLiterals(dst, dstCapacity, src, srcSize); + } } + if (cLitSize==1) { + /* A return value of 1 signals that the alphabet consists of a single symbol. + * However, in some rare circumstances, it could be the compressed size (a single byte). + * For that outcome to have a chance to happen, it's necessary that `srcSize < 8`. + * (it's also necessary to not generate statistics). + * Therefore, in such a case, actively check that all bytes are identical. */ + if ((srcSize >= 8) || allBytesIdentical(src, srcSize)) { + ZSTD_memcpy(nextHuf, prevHuf, sizeof(*prevHuf)); + return ZSTD_compressRleLiteralsBlock(dst, dstCapacity, src, srcSize); + } } + + if (hType == set_compressed) { + /* using a newly constructed table */ + nextHuf->repeatMode = HUF_repeat_check; + } + + /* Build header */ + switch(lhSize) + { + case 3: /* 2 - 2 - 10 - 10 */ + if (!singleStream) assert(srcSize >= MIN_LITERALS_FOR_4_STREAMS); + { U32 const lhc = hType + ((U32)(!singleStream) << 2) + ((U32)srcSize<<4) + ((U32)cLitSize<<14); + MEM_writeLE24(ostart, lhc); + break; + } + case 4: /* 2 - 2 - 14 - 14 */ + assert(srcSize >= MIN_LITERALS_FOR_4_STREAMS); + { U32 const lhc = hType + (2 << 2) + ((U32)srcSize<<4) + ((U32)cLitSize<<18); + MEM_writeLE32(ostart, lhc); + break; + } + case 5: /* 2 - 2 - 18 - 18 */ + assert(srcSize >= MIN_LITERALS_FOR_4_STREAMS); + { U32 const lhc = hType + (3 << 2) + ((U32)srcSize<<4) + ((U32)cLitSize<<22); + MEM_writeLE32(ostart, lhc); + ostart[4] = (BYTE)(cLitSize >> 10); + break; + } + default: /* not possible : lhSize is {3,4,5} */ + assert(0); + } + DEBUGLOG(5, "Compressed literals: %u -> %u", (U32)srcSize, (U32)(lhSize+cLitSize)); + return lhSize+cLitSize; +} +/**** ended inlining compress/zstd_compress_literals.c ****/ +/**** start inlining compress/zstd_compress_sequences.c ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + + /*-************************************* + * Dependencies + ***************************************/ +/**** start inlining zstd_compress_sequences.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +#ifndef ZSTD_COMPRESS_SEQUENCES_H +#define ZSTD_COMPRESS_SEQUENCES_H + +/**** skipping file: ../common/fse.h ****/ +/**** skipping file: ../common/zstd_internal.h ****/ + +typedef enum { + ZSTD_defaultDisallowed = 0, + ZSTD_defaultAllowed = 1 +} ZSTD_defaultPolicy_e; + +symbolEncodingType_e +ZSTD_selectEncodingType( + FSE_repeat* repeatMode, unsigned const* count, unsigned const max, + size_t const mostFrequent, size_t nbSeq, unsigned const FSELog, + FSE_CTable const* prevCTable, + short const* defaultNorm, U32 defaultNormLog, + ZSTD_defaultPolicy_e const isDefaultAllowed, + ZSTD_strategy const strategy); + +size_t +ZSTD_buildCTable(void* dst, size_t dstCapacity, + FSE_CTable* nextCTable, U32 FSELog, symbolEncodingType_e type, + unsigned* count, U32 max, + const BYTE* codeTable, size_t nbSeq, + const S16* defaultNorm, U32 defaultNormLog, U32 defaultMax, + const FSE_CTable* prevCTable, size_t prevCTableSize, + void* entropyWorkspace, size_t entropyWorkspaceSize); + +size_t ZSTD_encodeSequences( + void* dst, size_t dstCapacity, + FSE_CTable const* CTable_MatchLength, BYTE const* mlCodeTable, + FSE_CTable const* CTable_OffsetBits, BYTE const* ofCodeTable, + FSE_CTable const* CTable_LitLength, BYTE const* llCodeTable, + seqDef const* sequences, size_t nbSeq, int longOffsets, int bmi2); + +size_t ZSTD_fseBitCost( + FSE_CTable const* ctable, + unsigned const* count, + unsigned const max); + +size_t ZSTD_crossEntropyCost(short const* norm, unsigned accuracyLog, + unsigned const* count, unsigned const max); +#endif /* ZSTD_COMPRESS_SEQUENCES_H */ +/**** ended inlining zstd_compress_sequences.h ****/ + +/** + * -log2(x / 256) lookup table for x in [0, 256). + * If x == 0: Return 0 + * Else: Return floor(-log2(x / 256) * 256) + */ +static unsigned const kInverseProbabilityLog256[256] = { + 0, 2048, 1792, 1642, 1536, 1453, 1386, 1329, 1280, 1236, 1197, 1162, + 1130, 1100, 1073, 1047, 1024, 1001, 980, 960, 941, 923, 906, 889, + 874, 859, 844, 830, 817, 804, 791, 779, 768, 756, 745, 734, + 724, 714, 704, 694, 685, 676, 667, 658, 650, 642, 633, 626, + 618, 610, 603, 595, 588, 581, 574, 567, 561, 554, 548, 542, + 535, 529, 523, 517, 512, 506, 500, 495, 489, 484, 478, 473, + 468, 463, 458, 453, 448, 443, 438, 434, 429, 424, 420, 415, + 411, 407, 402, 398, 394, 390, 386, 382, 377, 373, 370, 366, + 362, 358, 354, 350, 347, 343, 339, 336, 332, 329, 325, 322, + 318, 315, 311, 308, 305, 302, 298, 295, 292, 289, 286, 282, + 279, 276, 273, 270, 267, 264, 261, 258, 256, 253, 250, 247, + 244, 241, 239, 236, 233, 230, 228, 225, 222, 220, 217, 215, + 212, 209, 207, 204, 202, 199, 197, 194, 192, 190, 187, 185, + 182, 180, 178, 175, 173, 171, 168, 166, 164, 162, 159, 157, + 155, 153, 151, 149, 146, 144, 142, 140, 138, 136, 134, 132, + 130, 128, 126, 123, 121, 119, 117, 115, 114, 112, 110, 108, + 106, 104, 102, 100, 98, 96, 94, 93, 91, 89, 87, 85, + 83, 82, 80, 78, 76, 74, 73, 71, 69, 67, 66, 64, + 62, 61, 59, 57, 55, 54, 52, 50, 49, 47, 46, 44, + 42, 41, 39, 37, 36, 34, 33, 31, 30, 28, 26, 25, + 23, 22, 20, 19, 17, 16, 14, 13, 11, 10, 8, 7, + 5, 4, 2, 1, +}; + +static unsigned ZSTD_getFSEMaxSymbolValue(FSE_CTable const* ctable) { + void const* ptr = ctable; + U16 const* u16ptr = (U16 const*)ptr; + U32 const maxSymbolValue = MEM_read16(u16ptr + 1); + return maxSymbolValue; +} + +/** + * Returns true if we should use ncount=-1 else we should + * use ncount=1 for low probability symbols instead. + */ +static unsigned ZSTD_useLowProbCount(size_t const nbSeq) +{ + /* Heuristic: This should cover most blocks <= 16K and + * start to fade out after 16K to about 32K depending on + * compressibility. + */ + return nbSeq >= 2048; +} + +/** + * Returns the cost in bytes of encoding the normalized count header. + * Returns an error if any of the helper functions return an error. + */ +static size_t ZSTD_NCountCost(unsigned const* count, unsigned const max, + size_t const nbSeq, unsigned const FSELog) +{ + BYTE wksp[FSE_NCOUNTBOUND]; + S16 norm[MaxSeq + 1]; + const U32 tableLog = FSE_optimalTableLog(FSELog, nbSeq, max); + FORWARD_IF_ERROR(FSE_normalizeCount(norm, tableLog, count, nbSeq, max, ZSTD_useLowProbCount(nbSeq)), ""); + return FSE_writeNCount(wksp, sizeof(wksp), norm, max, tableLog); +} + +/** + * Returns the cost in bits of encoding the distribution described by count + * using the entropy bound. + */ +static size_t ZSTD_entropyCost(unsigned const* count, unsigned const max, size_t const total) +{ + unsigned cost = 0; + unsigned s; + + assert(total > 0); + for (s = 0; s <= max; ++s) { + unsigned norm = (unsigned)((256 * count[s]) / total); + if (count[s] != 0 && norm == 0) + norm = 1; + assert(count[s] < total); + cost += count[s] * kInverseProbabilityLog256[norm]; + } + return cost >> 8; +} + +/** + * Returns the cost in bits of encoding the distribution in count using ctable. + * Returns an error if ctable cannot represent all the symbols in count. + */ +size_t ZSTD_fseBitCost( + FSE_CTable const* ctable, + unsigned const* count, + unsigned const max) +{ + unsigned const kAccuracyLog = 8; + size_t cost = 0; + unsigned s; + FSE_CState_t cstate; + FSE_initCState(&cstate, ctable); + if (ZSTD_getFSEMaxSymbolValue(ctable) < max) { + DEBUGLOG(5, "Repeat FSE_CTable has maxSymbolValue %u < %u", + ZSTD_getFSEMaxSymbolValue(ctable), max); + return ERROR(GENERIC); + } + for (s = 0; s <= max; ++s) { + unsigned const tableLog = cstate.stateLog; + unsigned const badCost = (tableLog + 1) << kAccuracyLog; + unsigned const bitCost = FSE_bitCost(cstate.symbolTT, tableLog, s, kAccuracyLog); + if (count[s] == 0) + continue; + if (bitCost >= badCost) { + DEBUGLOG(5, "Repeat FSE_CTable has Prob[%u] == 0", s); + return ERROR(GENERIC); + } + cost += (size_t)count[s] * bitCost; + } + return cost >> kAccuracyLog; +} + +/** + * Returns the cost in bits of encoding the distribution in count using the + * table described by norm. The max symbol support by norm is assumed >= max. + * norm must be valid for every symbol with non-zero probability in count. + */ +size_t ZSTD_crossEntropyCost(short const* norm, unsigned accuracyLog, + unsigned const* count, unsigned const max) +{ + unsigned const shift = 8 - accuracyLog; + size_t cost = 0; + unsigned s; + assert(accuracyLog <= 8); + for (s = 0; s <= max; ++s) { + unsigned const normAcc = (norm[s] != -1) ? (unsigned)norm[s] : 1; + unsigned const norm256 = normAcc << shift; + assert(norm256 > 0); + assert(norm256 < 256); + cost += count[s] * kInverseProbabilityLog256[norm256]; + } + return cost >> 8; +} + +symbolEncodingType_e +ZSTD_selectEncodingType( + FSE_repeat* repeatMode, unsigned const* count, unsigned const max, + size_t const mostFrequent, size_t nbSeq, unsigned const FSELog, + FSE_CTable const* prevCTable, + short const* defaultNorm, U32 defaultNormLog, + ZSTD_defaultPolicy_e const isDefaultAllowed, + ZSTD_strategy const strategy) +{ + ZSTD_STATIC_ASSERT(ZSTD_defaultDisallowed == 0 && ZSTD_defaultAllowed != 0); + if (mostFrequent == nbSeq) { + *repeatMode = FSE_repeat_none; + if (isDefaultAllowed && nbSeq <= 2) { + /* Prefer set_basic over set_rle when there are 2 or fewer symbols, + * since RLE uses 1 byte, but set_basic uses 5-6 bits per symbol. + * If basic encoding isn't possible, always choose RLE. + */ + DEBUGLOG(5, "Selected set_basic"); + return set_basic; + } + DEBUGLOG(5, "Selected set_rle"); + return set_rle; + } + if (strategy < ZSTD_lazy) { + if (isDefaultAllowed) { + size_t const staticFse_nbSeq_max = 1000; + size_t const mult = 10 - strategy; + size_t const baseLog = 3; + size_t const dynamicFse_nbSeq_min = (((size_t)1 << defaultNormLog) * mult) >> baseLog; /* 28-36 for offset, 56-72 for lengths */ + assert(defaultNormLog >= 5 && defaultNormLog <= 6); /* xx_DEFAULTNORMLOG */ + assert(mult <= 9 && mult >= 7); + if ( (*repeatMode == FSE_repeat_valid) + && (nbSeq < staticFse_nbSeq_max) ) { + DEBUGLOG(5, "Selected set_repeat"); + return set_repeat; + } + if ( (nbSeq < dynamicFse_nbSeq_min) + || (mostFrequent < (nbSeq >> (defaultNormLog-1))) ) { + DEBUGLOG(5, "Selected set_basic"); + /* The format allows default tables to be repeated, but it isn't useful. + * When using simple heuristics to select encoding type, we don't want + * to confuse these tables with dictionaries. When running more careful + * analysis, we don't need to waste time checking both repeating tables + * and default tables. + */ + *repeatMode = FSE_repeat_none; + return set_basic; + } + } + } else { + size_t const basicCost = isDefaultAllowed ? ZSTD_crossEntropyCost(defaultNorm, defaultNormLog, count, max) : ERROR(GENERIC); + size_t const repeatCost = *repeatMode != FSE_repeat_none ? ZSTD_fseBitCost(prevCTable, count, max) : ERROR(GENERIC); + size_t const NCountCost = ZSTD_NCountCost(count, max, nbSeq, FSELog); + size_t const compressedCost = (NCountCost << 3) + ZSTD_entropyCost(count, max, nbSeq); + + if (isDefaultAllowed) { + assert(!ZSTD_isError(basicCost)); + assert(!(*repeatMode == FSE_repeat_valid && ZSTD_isError(repeatCost))); + } + assert(!ZSTD_isError(NCountCost)); + assert(compressedCost < ERROR(maxCode)); + DEBUGLOG(5, "Estimated bit costs: basic=%u\trepeat=%u\tcompressed=%u", + (unsigned)basicCost, (unsigned)repeatCost, (unsigned)compressedCost); + if (basicCost <= repeatCost && basicCost <= compressedCost) { + DEBUGLOG(5, "Selected set_basic"); + assert(isDefaultAllowed); + *repeatMode = FSE_repeat_none; + return set_basic; + } + if (repeatCost <= compressedCost) { + DEBUGLOG(5, "Selected set_repeat"); + assert(!ZSTD_isError(repeatCost)); + return set_repeat; + } + assert(compressedCost < basicCost && compressedCost < repeatCost); + } + DEBUGLOG(5, "Selected set_compressed"); + *repeatMode = FSE_repeat_check; + return set_compressed; +} + +typedef struct { + S16 norm[MaxSeq + 1]; + U32 wksp[FSE_BUILD_CTABLE_WORKSPACE_SIZE_U32(MaxSeq, MaxFSELog)]; +} ZSTD_BuildCTableWksp; + +size_t +ZSTD_buildCTable(void* dst, size_t dstCapacity, + FSE_CTable* nextCTable, U32 FSELog, symbolEncodingType_e type, + unsigned* count, U32 max, + const BYTE* codeTable, size_t nbSeq, + const S16* defaultNorm, U32 defaultNormLog, U32 defaultMax, + const FSE_CTable* prevCTable, size_t prevCTableSize, + void* entropyWorkspace, size_t entropyWorkspaceSize) +{ + BYTE* op = (BYTE*)dst; + const BYTE* const oend = op + dstCapacity; + DEBUGLOG(6, "ZSTD_buildCTable (dstCapacity=%u)", (unsigned)dstCapacity); + + switch (type) { + case set_rle: + FORWARD_IF_ERROR(FSE_buildCTable_rle(nextCTable, (BYTE)max), ""); + RETURN_ERROR_IF(dstCapacity==0, dstSize_tooSmall, "not enough space"); + *op = codeTable[0]; + return 1; + case set_repeat: + ZSTD_memcpy(nextCTable, prevCTable, prevCTableSize); + return 0; + case set_basic: + FORWARD_IF_ERROR(FSE_buildCTable_wksp(nextCTable, defaultNorm, defaultMax, defaultNormLog, entropyWorkspace, entropyWorkspaceSize), ""); /* note : could be pre-calculated */ + return 0; + case set_compressed: { + ZSTD_BuildCTableWksp* wksp = (ZSTD_BuildCTableWksp*)entropyWorkspace; + size_t nbSeq_1 = nbSeq; + const U32 tableLog = FSE_optimalTableLog(FSELog, nbSeq, max); + if (count[codeTable[nbSeq-1]] > 1) { + count[codeTable[nbSeq-1]]--; + nbSeq_1--; + } + assert(nbSeq_1 > 1); + assert(entropyWorkspaceSize >= sizeof(ZSTD_BuildCTableWksp)); + (void)entropyWorkspaceSize; + FORWARD_IF_ERROR(FSE_normalizeCount(wksp->norm, tableLog, count, nbSeq_1, max, ZSTD_useLowProbCount(nbSeq_1)), "FSE_normalizeCount failed"); + assert(oend >= op); + { size_t const NCountSize = FSE_writeNCount(op, (size_t)(oend - op), wksp->norm, max, tableLog); /* overflow protected */ + FORWARD_IF_ERROR(NCountSize, "FSE_writeNCount failed"); + FORWARD_IF_ERROR(FSE_buildCTable_wksp(nextCTable, wksp->norm, max, tableLog, wksp->wksp, sizeof(wksp->wksp)), "FSE_buildCTable_wksp failed"); + return NCountSize; + } + } + default: assert(0); RETURN_ERROR(GENERIC, "impossible to reach"); + } +} + +FORCE_INLINE_TEMPLATE size_t +ZSTD_encodeSequences_body( + void* dst, size_t dstCapacity, + FSE_CTable const* CTable_MatchLength, BYTE const* mlCodeTable, + FSE_CTable const* CTable_OffsetBits, BYTE const* ofCodeTable, + FSE_CTable const* CTable_LitLength, BYTE const* llCodeTable, + seqDef const* sequences, size_t nbSeq, int longOffsets) +{ + BIT_CStream_t blockStream; + FSE_CState_t stateMatchLength; + FSE_CState_t stateOffsetBits; + FSE_CState_t stateLitLength; + + RETURN_ERROR_IF( + ERR_isError(BIT_initCStream(&blockStream, dst, dstCapacity)), + dstSize_tooSmall, "not enough space remaining"); + DEBUGLOG(6, "available space for bitstream : %i (dstCapacity=%u)", + (int)(blockStream.endPtr - blockStream.startPtr), + (unsigned)dstCapacity); + + /* first symbols */ + FSE_initCState2(&stateMatchLength, CTable_MatchLength, mlCodeTable[nbSeq-1]); + FSE_initCState2(&stateOffsetBits, CTable_OffsetBits, ofCodeTable[nbSeq-1]); + FSE_initCState2(&stateLitLength, CTable_LitLength, llCodeTable[nbSeq-1]); + BIT_addBits(&blockStream, sequences[nbSeq-1].litLength, LL_bits[llCodeTable[nbSeq-1]]); + if (MEM_32bits()) BIT_flushBits(&blockStream); + BIT_addBits(&blockStream, sequences[nbSeq-1].mlBase, ML_bits[mlCodeTable[nbSeq-1]]); + if (MEM_32bits()) BIT_flushBits(&blockStream); + if (longOffsets) { + U32 const ofBits = ofCodeTable[nbSeq-1]; + unsigned const extraBits = ofBits - MIN(ofBits, STREAM_ACCUMULATOR_MIN-1); + if (extraBits) { + BIT_addBits(&blockStream, sequences[nbSeq-1].offBase, extraBits); + BIT_flushBits(&blockStream); + } + BIT_addBits(&blockStream, sequences[nbSeq-1].offBase >> extraBits, + ofBits - extraBits); + } else { + BIT_addBits(&blockStream, sequences[nbSeq-1].offBase, ofCodeTable[nbSeq-1]); + } + BIT_flushBits(&blockStream); + + { size_t n; + for (n=nbSeq-2 ; n= 64-7-(LLFSELog+MLFSELog+OffFSELog))) + BIT_flushBits(&blockStream); /* (7)*/ + BIT_addBits(&blockStream, sequences[n].litLength, llBits); + if (MEM_32bits() && ((llBits+mlBits)>24)) BIT_flushBits(&blockStream); + BIT_addBits(&blockStream, sequences[n].mlBase, mlBits); + if (MEM_32bits() || (ofBits+mlBits+llBits > 56)) BIT_flushBits(&blockStream); + if (longOffsets) { + unsigned const extraBits = ofBits - MIN(ofBits, STREAM_ACCUMULATOR_MIN-1); + if (extraBits) { + BIT_addBits(&blockStream, sequences[n].offBase, extraBits); + BIT_flushBits(&blockStream); /* (7)*/ + } + BIT_addBits(&blockStream, sequences[n].offBase >> extraBits, + ofBits - extraBits); /* 31 */ + } else { + BIT_addBits(&blockStream, sequences[n].offBase, ofBits); /* 31 */ + } + BIT_flushBits(&blockStream); /* (7)*/ + DEBUGLOG(7, "remaining space : %i", (int)(blockStream.endPtr - blockStream.ptr)); + } } + + DEBUGLOG(6, "ZSTD_encodeSequences: flushing ML state with %u bits", stateMatchLength.stateLog); + FSE_flushCState(&blockStream, &stateMatchLength); + DEBUGLOG(6, "ZSTD_encodeSequences: flushing Off state with %u bits", stateOffsetBits.stateLog); + FSE_flushCState(&blockStream, &stateOffsetBits); + DEBUGLOG(6, "ZSTD_encodeSequences: flushing LL state with %u bits", stateLitLength.stateLog); + FSE_flushCState(&blockStream, &stateLitLength); + + { size_t const streamSize = BIT_closeCStream(&blockStream); + RETURN_ERROR_IF(streamSize==0, dstSize_tooSmall, "not enough space"); + return streamSize; + } +} + +static size_t +ZSTD_encodeSequences_default( + void* dst, size_t dstCapacity, + FSE_CTable const* CTable_MatchLength, BYTE const* mlCodeTable, + FSE_CTable const* CTable_OffsetBits, BYTE const* ofCodeTable, + FSE_CTable const* CTable_LitLength, BYTE const* llCodeTable, + seqDef const* sequences, size_t nbSeq, int longOffsets) +{ + return ZSTD_encodeSequences_body(dst, dstCapacity, + CTable_MatchLength, mlCodeTable, + CTable_OffsetBits, ofCodeTable, + CTable_LitLength, llCodeTable, + sequences, nbSeq, longOffsets); +} + + +#if DYNAMIC_BMI2 + +static BMI2_TARGET_ATTRIBUTE size_t +ZSTD_encodeSequences_bmi2( + void* dst, size_t dstCapacity, + FSE_CTable const* CTable_MatchLength, BYTE const* mlCodeTable, + FSE_CTable const* CTable_OffsetBits, BYTE const* ofCodeTable, + FSE_CTable const* CTable_LitLength, BYTE const* llCodeTable, + seqDef const* sequences, size_t nbSeq, int longOffsets) +{ + return ZSTD_encodeSequences_body(dst, dstCapacity, + CTable_MatchLength, mlCodeTable, + CTable_OffsetBits, ofCodeTable, + CTable_LitLength, llCodeTable, + sequences, nbSeq, longOffsets); +} + +#endif + +size_t ZSTD_encodeSequences( + void* dst, size_t dstCapacity, + FSE_CTable const* CTable_MatchLength, BYTE const* mlCodeTable, + FSE_CTable const* CTable_OffsetBits, BYTE const* ofCodeTable, + FSE_CTable const* CTable_LitLength, BYTE const* llCodeTable, + seqDef const* sequences, size_t nbSeq, int longOffsets, int bmi2) +{ + DEBUGLOG(5, "ZSTD_encodeSequences: dstCapacity = %u", (unsigned)dstCapacity); +#if DYNAMIC_BMI2 + if (bmi2) { + return ZSTD_encodeSequences_bmi2(dst, dstCapacity, + CTable_MatchLength, mlCodeTable, + CTable_OffsetBits, ofCodeTable, + CTable_LitLength, llCodeTable, + sequences, nbSeq, longOffsets); + } +#endif + (void)bmi2; + return ZSTD_encodeSequences_default(dst, dstCapacity, + CTable_MatchLength, mlCodeTable, + CTable_OffsetBits, ofCodeTable, + CTable_LitLength, llCodeTable, + sequences, nbSeq, longOffsets); +} +/**** ended inlining compress/zstd_compress_sequences.c ****/ +/**** start inlining compress/zstd_compress_superblock.c ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + + /*-************************************* + * Dependencies + ***************************************/ +/**** start inlining zstd_compress_superblock.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +#ifndef ZSTD_COMPRESS_ADVANCED_H +#define ZSTD_COMPRESS_ADVANCED_H + +/*-************************************* +* Dependencies +***************************************/ + +/**** skipping file: ../zstd.h ****/ + +/*-************************************* +* Target Compressed Block Size +***************************************/ + +/* ZSTD_compressSuperBlock() : + * Used to compress a super block when targetCBlockSize is being used. + * The given block will be compressed into multiple sub blocks that are around targetCBlockSize. */ +size_t ZSTD_compressSuperBlock(ZSTD_CCtx* zc, + void* dst, size_t dstCapacity, + void const* src, size_t srcSize, + unsigned lastBlock); + +#endif /* ZSTD_COMPRESS_ADVANCED_H */ +/**** ended inlining zstd_compress_superblock.h ****/ + +/**** skipping file: ../common/zstd_internal.h ****/ +/**** skipping file: hist.h ****/ +/**** skipping file: zstd_compress_internal.h ****/ +/**** skipping file: zstd_compress_sequences.h ****/ +/**** skipping file: zstd_compress_literals.h ****/ + +/** ZSTD_compressSubBlock_literal() : + * Compresses literals section for a sub-block. + * When we have to write the Huffman table we will sometimes choose a header + * size larger than necessary. This is because we have to pick the header size + * before we know the table size + compressed size, so we have a bound on the + * table size. If we guessed incorrectly, we fall back to uncompressed literals. + * + * We write the header when writeEntropy=1 and set entropyWritten=1 when we succeeded + * in writing the header, otherwise it is set to 0. + * + * hufMetadata->hType has literals block type info. + * If it is set_basic, all sub-blocks literals section will be Raw_Literals_Block. + * If it is set_rle, all sub-blocks literals section will be RLE_Literals_Block. + * If it is set_compressed, first sub-block's literals section will be Compressed_Literals_Block + * If it is set_compressed, first sub-block's literals section will be Treeless_Literals_Block + * and the following sub-blocks' literals sections will be Treeless_Literals_Block. + * @return : compressed size of literals section of a sub-block + * Or 0 if unable to compress. + * Or error code */ +static size_t +ZSTD_compressSubBlock_literal(const HUF_CElt* hufTable, + const ZSTD_hufCTablesMetadata_t* hufMetadata, + const BYTE* literals, size_t litSize, + void* dst, size_t dstSize, + const int bmi2, int writeEntropy, int* entropyWritten) +{ + size_t const header = writeEntropy ? 200 : 0; + size_t const lhSize = 3 + (litSize >= (1 KB - header)) + (litSize >= (16 KB - header)); + BYTE* const ostart = (BYTE*)dst; + BYTE* const oend = ostart + dstSize; + BYTE* op = ostart + lhSize; + U32 const singleStream = lhSize == 3; + symbolEncodingType_e hType = writeEntropy ? hufMetadata->hType : set_repeat; + size_t cLitSize = 0; + + DEBUGLOG(5, "ZSTD_compressSubBlock_literal (litSize=%zu, lhSize=%zu, writeEntropy=%d)", litSize, lhSize, writeEntropy); + + *entropyWritten = 0; + if (litSize == 0 || hufMetadata->hType == set_basic) { + DEBUGLOG(5, "ZSTD_compressSubBlock_literal using raw literal"); + return ZSTD_noCompressLiterals(dst, dstSize, literals, litSize); + } else if (hufMetadata->hType == set_rle) { + DEBUGLOG(5, "ZSTD_compressSubBlock_literal using rle literal"); + return ZSTD_compressRleLiteralsBlock(dst, dstSize, literals, litSize); + } + + assert(litSize > 0); + assert(hufMetadata->hType == set_compressed || hufMetadata->hType == set_repeat); + + if (writeEntropy && hufMetadata->hType == set_compressed) { + ZSTD_memcpy(op, hufMetadata->hufDesBuffer, hufMetadata->hufDesSize); + op += hufMetadata->hufDesSize; + cLitSize += hufMetadata->hufDesSize; + DEBUGLOG(5, "ZSTD_compressSubBlock_literal (hSize=%zu)", hufMetadata->hufDesSize); + } + + { int const flags = bmi2 ? HUF_flags_bmi2 : 0; + const size_t cSize = singleStream ? HUF_compress1X_usingCTable(op, (size_t)(oend-op), literals, litSize, hufTable, flags) + : HUF_compress4X_usingCTable(op, (size_t)(oend-op), literals, litSize, hufTable, flags); + op += cSize; + cLitSize += cSize; + if (cSize == 0 || ERR_isError(cSize)) { + DEBUGLOG(5, "Failed to write entropy tables %s", ZSTD_getErrorName(cSize)); + return 0; + } + /* If we expand and we aren't writing a header then emit uncompressed */ + if (!writeEntropy && cLitSize >= litSize) { + DEBUGLOG(5, "ZSTD_compressSubBlock_literal using raw literal because uncompressible"); + return ZSTD_noCompressLiterals(dst, dstSize, literals, litSize); + } + /* If we are writing headers then allow expansion that doesn't change our header size. */ + if (lhSize < (size_t)(3 + (cLitSize >= 1 KB) + (cLitSize >= 16 KB))) { + assert(cLitSize > litSize); + DEBUGLOG(5, "Literals expanded beyond allowed header size"); + return ZSTD_noCompressLiterals(dst, dstSize, literals, litSize); + } + DEBUGLOG(5, "ZSTD_compressSubBlock_literal (cSize=%zu)", cSize); + } + + /* Build header */ + switch(lhSize) + { + case 3: /* 2 - 2 - 10 - 10 */ + { U32 const lhc = hType + ((U32)(!singleStream) << 2) + ((U32)litSize<<4) + ((U32)cLitSize<<14); + MEM_writeLE24(ostart, lhc); + break; + } + case 4: /* 2 - 2 - 14 - 14 */ + { U32 const lhc = hType + (2 << 2) + ((U32)litSize<<4) + ((U32)cLitSize<<18); + MEM_writeLE32(ostart, lhc); + break; + } + case 5: /* 2 - 2 - 18 - 18 */ + { U32 const lhc = hType + (3 << 2) + ((U32)litSize<<4) + ((U32)cLitSize<<22); + MEM_writeLE32(ostart, lhc); + ostart[4] = (BYTE)(cLitSize >> 10); + break; + } + default: /* not possible : lhSize is {3,4,5} */ + assert(0); + } + *entropyWritten = 1; + DEBUGLOG(5, "Compressed literals: %u -> %u", (U32)litSize, (U32)(op-ostart)); + return (size_t)(op-ostart); +} + +static size_t +ZSTD_seqDecompressedSize(seqStore_t const* seqStore, + const seqDef* sequences, size_t nbSeqs, + size_t litSize, int lastSubBlock) +{ + size_t matchLengthSum = 0; + size_t litLengthSum = 0; + size_t n; + for (n=0; nllType, fseMetadata->ofType, and fseMetadata->mlType have + * symbol compression modes for the super-block. + * The first successfully compressed block will have these in its header. + * We set entropyWritten=1 when we succeed in compressing the sequences. + * The following sub-blocks will always have repeat mode. + * @return : compressed size of sequences section of a sub-block + * Or 0 if it is unable to compress + * Or error code. */ +static size_t +ZSTD_compressSubBlock_sequences(const ZSTD_fseCTables_t* fseTables, + const ZSTD_fseCTablesMetadata_t* fseMetadata, + const seqDef* sequences, size_t nbSeq, + const BYTE* llCode, const BYTE* mlCode, const BYTE* ofCode, + const ZSTD_CCtx_params* cctxParams, + void* dst, size_t dstCapacity, + const int bmi2, int writeEntropy, int* entropyWritten) +{ + const int longOffsets = cctxParams->cParams.windowLog > STREAM_ACCUMULATOR_MIN; + BYTE* const ostart = (BYTE*)dst; + BYTE* const oend = ostart + dstCapacity; + BYTE* op = ostart; + BYTE* seqHead; + + DEBUGLOG(5, "ZSTD_compressSubBlock_sequences (nbSeq=%zu, writeEntropy=%d, longOffsets=%d)", nbSeq, writeEntropy, longOffsets); + + *entropyWritten = 0; + /* Sequences Header */ + RETURN_ERROR_IF((oend-op) < 3 /*max nbSeq Size*/ + 1 /*seqHead*/, + dstSize_tooSmall, ""); + if (nbSeq < 128) + *op++ = (BYTE)nbSeq; + else if (nbSeq < LONGNBSEQ) + op[0] = (BYTE)((nbSeq>>8) + 0x80), op[1] = (BYTE)nbSeq, op+=2; + else + op[0]=0xFF, MEM_writeLE16(op+1, (U16)(nbSeq - LONGNBSEQ)), op+=3; + if (nbSeq==0) { + return (size_t)(op - ostart); + } + + /* seqHead : flags for FSE encoding type */ + seqHead = op++; + + DEBUGLOG(5, "ZSTD_compressSubBlock_sequences (seqHeadSize=%u)", (unsigned)(op-ostart)); + + if (writeEntropy) { + const U32 LLtype = fseMetadata->llType; + const U32 Offtype = fseMetadata->ofType; + const U32 MLtype = fseMetadata->mlType; + DEBUGLOG(5, "ZSTD_compressSubBlock_sequences (fseTablesSize=%zu)", fseMetadata->fseTablesSize); + *seqHead = (BYTE)((LLtype<<6) + (Offtype<<4) + (MLtype<<2)); + ZSTD_memcpy(op, fseMetadata->fseTablesBuffer, fseMetadata->fseTablesSize); + op += fseMetadata->fseTablesSize; + } else { + const U32 repeat = set_repeat; + *seqHead = (BYTE)((repeat<<6) + (repeat<<4) + (repeat<<2)); + } + + { size_t const bitstreamSize = ZSTD_encodeSequences( + op, (size_t)(oend - op), + fseTables->matchlengthCTable, mlCode, + fseTables->offcodeCTable, ofCode, + fseTables->litlengthCTable, llCode, + sequences, nbSeq, + longOffsets, bmi2); + FORWARD_IF_ERROR(bitstreamSize, "ZSTD_encodeSequences failed"); + op += bitstreamSize; + /* zstd versions <= 1.3.4 mistakenly report corruption when + * FSE_readNCount() receives a buffer < 4 bytes. + * Fixed by https://github.com/facebook/zstd/pull/1146. + * This can happen when the last set_compressed table present is 2 + * bytes and the bitstream is only one byte. + * In this exceedingly rare case, we will simply emit an uncompressed + * block, since it isn't worth optimizing. + */ +#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION + if (writeEntropy && fseMetadata->lastCountSize && fseMetadata->lastCountSize + bitstreamSize < 4) { + /* NCountSize >= 2 && bitstreamSize > 0 ==> lastCountSize == 3 */ + assert(fseMetadata->lastCountSize + bitstreamSize == 3); + DEBUGLOG(5, "Avoiding bug in zstd decoder in versions <= 1.3.4 by " + "emitting an uncompressed block."); + return 0; + } +#endif + DEBUGLOG(5, "ZSTD_compressSubBlock_sequences (bitstreamSize=%zu)", bitstreamSize); + } + + /* zstd versions <= 1.4.0 mistakenly report error when + * sequences section body size is less than 3 bytes. + * Fixed by https://github.com/facebook/zstd/pull/1664. + * This can happen when the previous sequences section block is compressed + * with rle mode and the current block's sequences section is compressed + * with repeat mode where sequences section body size can be 1 byte. + */ +#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION + if (op-seqHead < 4) { + DEBUGLOG(5, "Avoiding bug in zstd decoder in versions <= 1.4.0 by emitting " + "an uncompressed block when sequences are < 4 bytes"); + return 0; + } +#endif + + *entropyWritten = 1; + return (size_t)(op - ostart); +} + +/** ZSTD_compressSubBlock() : + * Compresses a single sub-block. + * @return : compressed size of the sub-block + * Or 0 if it failed to compress. */ +static size_t ZSTD_compressSubBlock(const ZSTD_entropyCTables_t* entropy, + const ZSTD_entropyCTablesMetadata_t* entropyMetadata, + const seqDef* sequences, size_t nbSeq, + const BYTE* literals, size_t litSize, + const BYTE* llCode, const BYTE* mlCode, const BYTE* ofCode, + const ZSTD_CCtx_params* cctxParams, + void* dst, size_t dstCapacity, + const int bmi2, + int writeLitEntropy, int writeSeqEntropy, + int* litEntropyWritten, int* seqEntropyWritten, + U32 lastBlock) +{ + BYTE* const ostart = (BYTE*)dst; + BYTE* const oend = ostart + dstCapacity; + BYTE* op = ostart + ZSTD_blockHeaderSize; + DEBUGLOG(5, "ZSTD_compressSubBlock (litSize=%zu, nbSeq=%zu, writeLitEntropy=%d, writeSeqEntropy=%d, lastBlock=%d)", + litSize, nbSeq, writeLitEntropy, writeSeqEntropy, lastBlock); + { size_t cLitSize = ZSTD_compressSubBlock_literal((const HUF_CElt*)entropy->huf.CTable, + &entropyMetadata->hufMetadata, literals, litSize, + op, (size_t)(oend-op), + bmi2, writeLitEntropy, litEntropyWritten); + FORWARD_IF_ERROR(cLitSize, "ZSTD_compressSubBlock_literal failed"); + if (cLitSize == 0) return 0; + op += cLitSize; + } + { size_t cSeqSize = ZSTD_compressSubBlock_sequences(&entropy->fse, + &entropyMetadata->fseMetadata, + sequences, nbSeq, + llCode, mlCode, ofCode, + cctxParams, + op, (size_t)(oend-op), + bmi2, writeSeqEntropy, seqEntropyWritten); + FORWARD_IF_ERROR(cSeqSize, "ZSTD_compressSubBlock_sequences failed"); + if (cSeqSize == 0) return 0; + op += cSeqSize; + } + /* Write block header */ + { size_t cSize = (size_t)(op-ostart) - ZSTD_blockHeaderSize; + U32 const cBlockHeader24 = lastBlock + (((U32)bt_compressed)<<1) + (U32)(cSize << 3); + MEM_writeLE24(ostart, cBlockHeader24); + } + return (size_t)(op-ostart); +} + +static size_t ZSTD_estimateSubBlockSize_literal(const BYTE* literals, size_t litSize, + const ZSTD_hufCTables_t* huf, + const ZSTD_hufCTablesMetadata_t* hufMetadata, + void* workspace, size_t wkspSize, + int writeEntropy) +{ + unsigned* const countWksp = (unsigned*)workspace; + unsigned maxSymbolValue = 255; + size_t literalSectionHeaderSize = 3; /* Use hard coded size of 3 bytes */ + + if (hufMetadata->hType == set_basic) return litSize; + else if (hufMetadata->hType == set_rle) return 1; + else if (hufMetadata->hType == set_compressed || hufMetadata->hType == set_repeat) { + size_t const largest = HIST_count_wksp (countWksp, &maxSymbolValue, (const BYTE*)literals, litSize, workspace, wkspSize); + if (ZSTD_isError(largest)) return litSize; + { size_t cLitSizeEstimate = HUF_estimateCompressedSize((const HUF_CElt*)huf->CTable, countWksp, maxSymbolValue); + if (writeEntropy) cLitSizeEstimate += hufMetadata->hufDesSize; + return cLitSizeEstimate + literalSectionHeaderSize; + } } + assert(0); /* impossible */ + return 0; +} + +static size_t ZSTD_estimateSubBlockSize_symbolType(symbolEncodingType_e type, + const BYTE* codeTable, unsigned maxCode, + size_t nbSeq, const FSE_CTable* fseCTable, + const U8* additionalBits, + short const* defaultNorm, U32 defaultNormLog, U32 defaultMax, + void* workspace, size_t wkspSize) +{ + unsigned* const countWksp = (unsigned*)workspace; + const BYTE* ctp = codeTable; + const BYTE* const ctStart = ctp; + const BYTE* const ctEnd = ctStart + nbSeq; + size_t cSymbolTypeSizeEstimateInBits = 0; + unsigned max = maxCode; + + HIST_countFast_wksp(countWksp, &max, codeTable, nbSeq, workspace, wkspSize); /* can't fail */ + if (type == set_basic) { + /* We selected this encoding type, so it must be valid. */ + assert(max <= defaultMax); + cSymbolTypeSizeEstimateInBits = max <= defaultMax + ? ZSTD_crossEntropyCost(defaultNorm, defaultNormLog, countWksp, max) + : ERROR(GENERIC); + } else if (type == set_rle) { + cSymbolTypeSizeEstimateInBits = 0; + } else if (type == set_compressed || type == set_repeat) { + cSymbolTypeSizeEstimateInBits = ZSTD_fseBitCost(fseCTable, countWksp, max); + } + if (ZSTD_isError(cSymbolTypeSizeEstimateInBits)) return nbSeq * 10; + while (ctp < ctEnd) { + if (additionalBits) cSymbolTypeSizeEstimateInBits += additionalBits[*ctp]; + else cSymbolTypeSizeEstimateInBits += *ctp; /* for offset, offset code is also the number of additional bits */ + ctp++; + } + return cSymbolTypeSizeEstimateInBits / 8; +} + +static size_t ZSTD_estimateSubBlockSize_sequences(const BYTE* ofCodeTable, + const BYTE* llCodeTable, + const BYTE* mlCodeTable, + size_t nbSeq, + const ZSTD_fseCTables_t* fseTables, + const ZSTD_fseCTablesMetadata_t* fseMetadata, + void* workspace, size_t wkspSize, + int writeEntropy) +{ + size_t const sequencesSectionHeaderSize = 3; /* Use hard coded size of 3 bytes */ + size_t cSeqSizeEstimate = 0; + if (nbSeq == 0) return sequencesSectionHeaderSize; + cSeqSizeEstimate += ZSTD_estimateSubBlockSize_symbolType(fseMetadata->ofType, ofCodeTable, MaxOff, + nbSeq, fseTables->offcodeCTable, NULL, + OF_defaultNorm, OF_defaultNormLog, DefaultMaxOff, + workspace, wkspSize); + cSeqSizeEstimate += ZSTD_estimateSubBlockSize_symbolType(fseMetadata->llType, llCodeTable, MaxLL, + nbSeq, fseTables->litlengthCTable, LL_bits, + LL_defaultNorm, LL_defaultNormLog, MaxLL, + workspace, wkspSize); + cSeqSizeEstimate += ZSTD_estimateSubBlockSize_symbolType(fseMetadata->mlType, mlCodeTable, MaxML, + nbSeq, fseTables->matchlengthCTable, ML_bits, + ML_defaultNorm, ML_defaultNormLog, MaxML, + workspace, wkspSize); + if (writeEntropy) cSeqSizeEstimate += fseMetadata->fseTablesSize; + return cSeqSizeEstimate + sequencesSectionHeaderSize; +} + +typedef struct { + size_t estLitSize; + size_t estBlockSize; +} EstimatedBlockSize; +static EstimatedBlockSize ZSTD_estimateSubBlockSize(const BYTE* literals, size_t litSize, + const BYTE* ofCodeTable, + const BYTE* llCodeTable, + const BYTE* mlCodeTable, + size_t nbSeq, + const ZSTD_entropyCTables_t* entropy, + const ZSTD_entropyCTablesMetadata_t* entropyMetadata, + void* workspace, size_t wkspSize, + int writeLitEntropy, int writeSeqEntropy) +{ + EstimatedBlockSize ebs; + ebs.estLitSize = ZSTD_estimateSubBlockSize_literal(literals, litSize, + &entropy->huf, &entropyMetadata->hufMetadata, + workspace, wkspSize, writeLitEntropy); + ebs.estBlockSize = ZSTD_estimateSubBlockSize_sequences(ofCodeTable, llCodeTable, mlCodeTable, + nbSeq, &entropy->fse, &entropyMetadata->fseMetadata, + workspace, wkspSize, writeSeqEntropy); + ebs.estBlockSize += ebs.estLitSize + ZSTD_blockHeaderSize; + return ebs; +} + +static int ZSTD_needSequenceEntropyTables(ZSTD_fseCTablesMetadata_t const* fseMetadata) +{ + if (fseMetadata->llType == set_compressed || fseMetadata->llType == set_rle) + return 1; + if (fseMetadata->mlType == set_compressed || fseMetadata->mlType == set_rle) + return 1; + if (fseMetadata->ofType == set_compressed || fseMetadata->ofType == set_rle) + return 1; + return 0; +} + +static size_t countLiterals(seqStore_t const* seqStore, const seqDef* sp, size_t seqCount) +{ + size_t n, total = 0; + assert(sp != NULL); + for (n=0; n %zu bytes", seqCount, (const void*)sp, total); + return total; +} + +#define BYTESCALE 256 + +static size_t sizeBlockSequences(const seqDef* sp, size_t nbSeqs, + size_t targetBudget, size_t avgLitCost, size_t avgSeqCost, + int firstSubBlock) +{ + size_t n, budget = 0, inSize=0; + /* entropy headers */ + size_t const headerSize = (size_t)firstSubBlock * 120 * BYTESCALE; /* generous estimate */ + assert(firstSubBlock==0 || firstSubBlock==1); + budget += headerSize; + + /* first sequence => at least one sequence*/ + budget += sp[0].litLength * avgLitCost + avgSeqCost; + if (budget > targetBudget) return 1; + inSize = sp[0].litLength + (sp[0].mlBase+MINMATCH); + + /* loop over sequences */ + for (n=1; n targetBudget) + /* though continue to expand until the sub-block is deemed compressible */ + && (budget < inSize * BYTESCALE) ) + break; + } + + return n; +} + +/** ZSTD_compressSubBlock_multi() : + * Breaks super-block into multiple sub-blocks and compresses them. + * Entropy will be written into the first block. + * The following blocks use repeat_mode to compress. + * Sub-blocks are all compressed, except the last one when beneficial. + * @return : compressed size of the super block (which features multiple ZSTD blocks) + * or 0 if it failed to compress. */ +static size_t ZSTD_compressSubBlock_multi(const seqStore_t* seqStorePtr, + const ZSTD_compressedBlockState_t* prevCBlock, + ZSTD_compressedBlockState_t* nextCBlock, + const ZSTD_entropyCTablesMetadata_t* entropyMetadata, + const ZSTD_CCtx_params* cctxParams, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + const int bmi2, U32 lastBlock, + void* workspace, size_t wkspSize) +{ + const seqDef* const sstart = seqStorePtr->sequencesStart; + const seqDef* const send = seqStorePtr->sequences; + const seqDef* sp = sstart; /* tracks progresses within seqStorePtr->sequences */ + size_t const nbSeqs = (size_t)(send - sstart); + const BYTE* const lstart = seqStorePtr->litStart; + const BYTE* const lend = seqStorePtr->lit; + const BYTE* lp = lstart; + size_t const nbLiterals = (size_t)(lend - lstart); + BYTE const* ip = (BYTE const*)src; + BYTE const* const iend = ip + srcSize; + BYTE* const ostart = (BYTE*)dst; + BYTE* const oend = ostart + dstCapacity; + BYTE* op = ostart; + const BYTE* llCodePtr = seqStorePtr->llCode; + const BYTE* mlCodePtr = seqStorePtr->mlCode; + const BYTE* ofCodePtr = seqStorePtr->ofCode; + size_t const minTarget = ZSTD_TARGETCBLOCKSIZE_MIN; /* enforce minimum size, to reduce undesirable side effects */ + size_t const targetCBlockSize = MAX(minTarget, cctxParams->targetCBlockSize); + int writeLitEntropy = (entropyMetadata->hufMetadata.hType == set_compressed); + int writeSeqEntropy = 1; + + DEBUGLOG(5, "ZSTD_compressSubBlock_multi (srcSize=%u, litSize=%u, nbSeq=%u)", + (unsigned)srcSize, (unsigned)(lend-lstart), (unsigned)(send-sstart)); + + /* let's start by a general estimation for the full block */ + if (nbSeqs > 0) { + EstimatedBlockSize const ebs = + ZSTD_estimateSubBlockSize(lp, nbLiterals, + ofCodePtr, llCodePtr, mlCodePtr, nbSeqs, + &nextCBlock->entropy, entropyMetadata, + workspace, wkspSize, + writeLitEntropy, writeSeqEntropy); + /* quick estimation */ + size_t const avgLitCost = nbLiterals ? (ebs.estLitSize * BYTESCALE) / nbLiterals : BYTESCALE; + size_t const avgSeqCost = ((ebs.estBlockSize - ebs.estLitSize) * BYTESCALE) / nbSeqs; + const size_t nbSubBlocks = MAX((ebs.estBlockSize + (targetCBlockSize/2)) / targetCBlockSize, 1); + size_t n, avgBlockBudget, blockBudgetSupp=0; + avgBlockBudget = (ebs.estBlockSize * BYTESCALE) / nbSubBlocks; + DEBUGLOG(5, "estimated fullblock size=%u bytes ; avgLitCost=%.2f ; avgSeqCost=%.2f ; targetCBlockSize=%u, nbSubBlocks=%u ; avgBlockBudget=%.0f bytes", + (unsigned)ebs.estBlockSize, (double)avgLitCost/BYTESCALE, (double)avgSeqCost/BYTESCALE, + (unsigned)targetCBlockSize, (unsigned)nbSubBlocks, (double)avgBlockBudget/BYTESCALE); + /* simplification: if estimates states that the full superblock doesn't compress, just bail out immediately + * this will result in the production of a single uncompressed block covering @srcSize.*/ + if (ebs.estBlockSize > srcSize) return 0; + + /* compress and write sub-blocks */ + assert(nbSubBlocks>0); + for (n=0; n < nbSubBlocks-1; n++) { + /* determine nb of sequences for current sub-block + nbLiterals from next sequence */ + size_t const seqCount = sizeBlockSequences(sp, (size_t)(send-sp), + avgBlockBudget + blockBudgetSupp, avgLitCost, avgSeqCost, n==0); + /* if reached last sequence : break to last sub-block (simplification) */ + assert(seqCount <= (size_t)(send-sp)); + if (sp + seqCount == send) break; + assert(seqCount > 0); + /* compress sub-block */ + { int litEntropyWritten = 0; + int seqEntropyWritten = 0; + size_t litSize = countLiterals(seqStorePtr, sp, seqCount); + const size_t decompressedSize = + ZSTD_seqDecompressedSize(seqStorePtr, sp, seqCount, litSize, 0); + size_t const cSize = ZSTD_compressSubBlock(&nextCBlock->entropy, entropyMetadata, + sp, seqCount, + lp, litSize, + llCodePtr, mlCodePtr, ofCodePtr, + cctxParams, + op, (size_t)(oend-op), + bmi2, writeLitEntropy, writeSeqEntropy, + &litEntropyWritten, &seqEntropyWritten, + 0); + FORWARD_IF_ERROR(cSize, "ZSTD_compressSubBlock failed"); + + /* check compressibility, update state components */ + if (cSize > 0 && cSize < decompressedSize) { + DEBUGLOG(5, "Committed sub-block compressing %u bytes => %u bytes", + (unsigned)decompressedSize, (unsigned)cSize); + assert(ip + decompressedSize <= iend); + ip += decompressedSize; + lp += litSize; + op += cSize; + llCodePtr += seqCount; + mlCodePtr += seqCount; + ofCodePtr += seqCount; + /* Entropy only needs to be written once */ + if (litEntropyWritten) { + writeLitEntropy = 0; + } + if (seqEntropyWritten) { + writeSeqEntropy = 0; + } + sp += seqCount; + blockBudgetSupp = 0; + } } + /* otherwise : do not compress yet, coalesce current sub-block with following one */ + } + } /* if (nbSeqs > 0) */ + + /* write last block */ + DEBUGLOG(5, "Generate last sub-block: %u sequences remaining", (unsigned)(send - sp)); + { int litEntropyWritten = 0; + int seqEntropyWritten = 0; + size_t litSize = (size_t)(lend - lp); + size_t seqCount = (size_t)(send - sp); + const size_t decompressedSize = + ZSTD_seqDecompressedSize(seqStorePtr, sp, seqCount, litSize, 1); + size_t const cSize = ZSTD_compressSubBlock(&nextCBlock->entropy, entropyMetadata, + sp, seqCount, + lp, litSize, + llCodePtr, mlCodePtr, ofCodePtr, + cctxParams, + op, (size_t)(oend-op), + bmi2, writeLitEntropy, writeSeqEntropy, + &litEntropyWritten, &seqEntropyWritten, + lastBlock); + FORWARD_IF_ERROR(cSize, "ZSTD_compressSubBlock failed"); + + /* update pointers, the nb of literals borrowed from next sequence must be preserved */ + if (cSize > 0 && cSize < decompressedSize) { + DEBUGLOG(5, "Last sub-block compressed %u bytes => %u bytes", + (unsigned)decompressedSize, (unsigned)cSize); + assert(ip + decompressedSize <= iend); + ip += decompressedSize; + lp += litSize; + op += cSize; + llCodePtr += seqCount; + mlCodePtr += seqCount; + ofCodePtr += seqCount; + /* Entropy only needs to be written once */ + if (litEntropyWritten) { + writeLitEntropy = 0; + } + if (seqEntropyWritten) { + writeSeqEntropy = 0; + } + sp += seqCount; + } + } + + + if (writeLitEntropy) { + DEBUGLOG(5, "Literal entropy tables were never written"); + ZSTD_memcpy(&nextCBlock->entropy.huf, &prevCBlock->entropy.huf, sizeof(prevCBlock->entropy.huf)); + } + if (writeSeqEntropy && ZSTD_needSequenceEntropyTables(&entropyMetadata->fseMetadata)) { + /* If we haven't written our entropy tables, then we've violated our contract and + * must emit an uncompressed block. + */ + DEBUGLOG(5, "Sequence entropy tables were never written => cancel, emit an uncompressed block"); + return 0; + } + + if (ip < iend) { + /* some data left : last part of the block sent uncompressed */ + size_t const rSize = (size_t)((iend - ip)); + size_t const cSize = ZSTD_noCompressBlock(op, (size_t)(oend - op), ip, rSize, lastBlock); + DEBUGLOG(5, "Generate last uncompressed sub-block of %u bytes", (unsigned)(rSize)); + FORWARD_IF_ERROR(cSize, "ZSTD_noCompressBlock failed"); + assert(cSize != 0); + op += cSize; + /* We have to regenerate the repcodes because we've skipped some sequences */ + if (sp < send) { + const seqDef* seq; + repcodes_t rep; + ZSTD_memcpy(&rep, prevCBlock->rep, sizeof(rep)); + for (seq = sstart; seq < sp; ++seq) { + ZSTD_updateRep(rep.rep, seq->offBase, ZSTD_getSequenceLength(seqStorePtr, seq).litLength == 0); + } + ZSTD_memcpy(nextCBlock->rep, &rep, sizeof(rep)); + } + } + + DEBUGLOG(5, "ZSTD_compressSubBlock_multi compressed all subBlocks: total compressed size = %u", + (unsigned)(op-ostart)); + return (size_t)(op-ostart); +} + +size_t ZSTD_compressSuperBlock(ZSTD_CCtx* zc, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + unsigned lastBlock) +{ + ZSTD_entropyCTablesMetadata_t entropyMetadata; + + FORWARD_IF_ERROR(ZSTD_buildBlockEntropyStats(&zc->seqStore, + &zc->blockState.prevCBlock->entropy, + &zc->blockState.nextCBlock->entropy, + &zc->appliedParams, + &entropyMetadata, + zc->entropyWorkspace, ENTROPY_WORKSPACE_SIZE /* statically allocated in resetCCtx */), ""); + + return ZSTD_compressSubBlock_multi(&zc->seqStore, + zc->blockState.prevCBlock, + zc->blockState.nextCBlock, + &entropyMetadata, + &zc->appliedParams, + dst, dstCapacity, + src, srcSize, + zc->bmi2, lastBlock, + zc->entropyWorkspace, ENTROPY_WORKSPACE_SIZE /* statically allocated in resetCCtx */); +} +/**** ended inlining compress/zstd_compress_superblock.c ****/ +/**** start inlining compress/zstd_compress.c ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +/*-************************************* +* Dependencies +***************************************/ +/**** skipping file: ../common/allocations.h ****/ +/**** skipping file: ../common/zstd_deps.h ****/ +/**** skipping file: ../common/mem.h ****/ +/**** skipping file: hist.h ****/ +#define FSE_STATIC_LINKING_ONLY /* FSE_encodeSymbol */ +/**** skipping file: ../common/fse.h ****/ +/**** skipping file: ../common/huf.h ****/ +/**** skipping file: zstd_compress_internal.h ****/ +/**** skipping file: zstd_compress_sequences.h ****/ +/**** skipping file: zstd_compress_literals.h ****/ +/**** start inlining zstd_fast.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +#ifndef ZSTD_FAST_H +#define ZSTD_FAST_H + +#if defined (__cplusplus) +extern "C" { +#endif + +/**** skipping file: ../common/mem.h ****/ +/**** skipping file: zstd_compress_internal.h ****/ + +void ZSTD_fillHashTable(ZSTD_matchState_t* ms, + void const* end, ZSTD_dictTableLoadMethod_e dtlm, + ZSTD_tableFillPurpose_e tfp); +size_t ZSTD_compressBlock_fast( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_fast_dictMatchState( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_fast_extDict( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); + +#if defined (__cplusplus) +} +#endif + +#endif /* ZSTD_FAST_H */ +/**** ended inlining zstd_fast.h ****/ +/**** start inlining zstd_double_fast.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +#ifndef ZSTD_DOUBLE_FAST_H +#define ZSTD_DOUBLE_FAST_H + +#if defined (__cplusplus) +extern "C" { +#endif + +/**** skipping file: ../common/mem.h ****/ +/**** skipping file: zstd_compress_internal.h ****/ + +#ifndef ZSTD_EXCLUDE_DFAST_BLOCK_COMPRESSOR + +void ZSTD_fillDoubleHashTable(ZSTD_matchState_t* ms, + void const* end, ZSTD_dictTableLoadMethod_e dtlm, + ZSTD_tableFillPurpose_e tfp); + +size_t ZSTD_compressBlock_doubleFast( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_doubleFast_dictMatchState( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_doubleFast_extDict( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); + +#define ZSTD_COMPRESSBLOCK_DOUBLEFAST ZSTD_compressBlock_doubleFast +#define ZSTD_COMPRESSBLOCK_DOUBLEFAST_DICTMATCHSTATE ZSTD_compressBlock_doubleFast_dictMatchState +#define ZSTD_COMPRESSBLOCK_DOUBLEFAST_EXTDICT ZSTD_compressBlock_doubleFast_extDict +#else +#define ZSTD_COMPRESSBLOCK_DOUBLEFAST NULL +#define ZSTD_COMPRESSBLOCK_DOUBLEFAST_DICTMATCHSTATE NULL +#define ZSTD_COMPRESSBLOCK_DOUBLEFAST_EXTDICT NULL +#endif /* ZSTD_EXCLUDE_DFAST_BLOCK_COMPRESSOR */ + +#if defined (__cplusplus) +} +#endif + +#endif /* ZSTD_DOUBLE_FAST_H */ +/**** ended inlining zstd_double_fast.h ****/ +/**** start inlining zstd_lazy.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +#ifndef ZSTD_LAZY_H +#define ZSTD_LAZY_H + +#if defined (__cplusplus) +extern "C" { +#endif + +/**** skipping file: zstd_compress_internal.h ****/ + +/** + * Dedicated Dictionary Search Structure bucket log. In the + * ZSTD_dedicatedDictSearch mode, the hashTable has + * 2 ** ZSTD_LAZY_DDSS_BUCKET_LOG entries in each bucket, rather than just + * one. + */ +#define ZSTD_LAZY_DDSS_BUCKET_LOG 2 + +#define ZSTD_ROW_HASH_TAG_BITS 8 /* nb bits to use for the tag */ + +#if !defined(ZSTD_EXCLUDE_GREEDY_BLOCK_COMPRESSOR) \ + || !defined(ZSTD_EXCLUDE_LAZY_BLOCK_COMPRESSOR) \ + || !defined(ZSTD_EXCLUDE_LAZY2_BLOCK_COMPRESSOR) \ + || !defined(ZSTD_EXCLUDE_BTLAZY2_BLOCK_COMPRESSOR) +U32 ZSTD_insertAndFindFirstIndex(ZSTD_matchState_t* ms, const BYTE* ip); +void ZSTD_row_update(ZSTD_matchState_t* const ms, const BYTE* ip); + +void ZSTD_dedicatedDictSearch_lazy_loadDictionary(ZSTD_matchState_t* ms, const BYTE* const ip); + +void ZSTD_preserveUnsortedMark (U32* const table, U32 const size, U32 const reducerValue); /*! used in ZSTD_reduceIndex(). preemptively increase value of ZSTD_DUBT_UNSORTED_MARK */ +#endif + +#ifndef ZSTD_EXCLUDE_GREEDY_BLOCK_COMPRESSOR +size_t ZSTD_compressBlock_greedy( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_greedy_row( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_greedy_dictMatchState( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_greedy_dictMatchState_row( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_greedy_dedicatedDictSearch( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_greedy_dedicatedDictSearch_row( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_greedy_extDict( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_greedy_extDict_row( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); + +#define ZSTD_COMPRESSBLOCK_GREEDY ZSTD_compressBlock_greedy +#define ZSTD_COMPRESSBLOCK_GREEDY_ROW ZSTD_compressBlock_greedy_row +#define ZSTD_COMPRESSBLOCK_GREEDY_DICTMATCHSTATE ZSTD_compressBlock_greedy_dictMatchState +#define ZSTD_COMPRESSBLOCK_GREEDY_DICTMATCHSTATE_ROW ZSTD_compressBlock_greedy_dictMatchState_row +#define ZSTD_COMPRESSBLOCK_GREEDY_DEDICATEDDICTSEARCH ZSTD_compressBlock_greedy_dedicatedDictSearch +#define ZSTD_COMPRESSBLOCK_GREEDY_DEDICATEDDICTSEARCH_ROW ZSTD_compressBlock_greedy_dedicatedDictSearch_row +#define ZSTD_COMPRESSBLOCK_GREEDY_EXTDICT ZSTD_compressBlock_greedy_extDict +#define ZSTD_COMPRESSBLOCK_GREEDY_EXTDICT_ROW ZSTD_compressBlock_greedy_extDict_row +#else +#define ZSTD_COMPRESSBLOCK_GREEDY NULL +#define ZSTD_COMPRESSBLOCK_GREEDY_ROW NULL +#define ZSTD_COMPRESSBLOCK_GREEDY_DICTMATCHSTATE NULL +#define ZSTD_COMPRESSBLOCK_GREEDY_DICTMATCHSTATE_ROW NULL +#define ZSTD_COMPRESSBLOCK_GREEDY_DEDICATEDDICTSEARCH NULL +#define ZSTD_COMPRESSBLOCK_GREEDY_DEDICATEDDICTSEARCH_ROW NULL +#define ZSTD_COMPRESSBLOCK_GREEDY_EXTDICT NULL +#define ZSTD_COMPRESSBLOCK_GREEDY_EXTDICT_ROW NULL +#endif + +#ifndef ZSTD_EXCLUDE_LAZY_BLOCK_COMPRESSOR +size_t ZSTD_compressBlock_lazy( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_lazy_row( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_lazy_dictMatchState( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_lazy_dictMatchState_row( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_lazy_dedicatedDictSearch( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_lazy_dedicatedDictSearch_row( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_lazy_extDict( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_lazy_extDict_row( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); + +#define ZSTD_COMPRESSBLOCK_LAZY ZSTD_compressBlock_lazy +#define ZSTD_COMPRESSBLOCK_LAZY_ROW ZSTD_compressBlock_lazy_row +#define ZSTD_COMPRESSBLOCK_LAZY_DICTMATCHSTATE ZSTD_compressBlock_lazy_dictMatchState +#define ZSTD_COMPRESSBLOCK_LAZY_DICTMATCHSTATE_ROW ZSTD_compressBlock_lazy_dictMatchState_row +#define ZSTD_COMPRESSBLOCK_LAZY_DEDICATEDDICTSEARCH ZSTD_compressBlock_lazy_dedicatedDictSearch +#define ZSTD_COMPRESSBLOCK_LAZY_DEDICATEDDICTSEARCH_ROW ZSTD_compressBlock_lazy_dedicatedDictSearch_row +#define ZSTD_COMPRESSBLOCK_LAZY_EXTDICT ZSTD_compressBlock_lazy_extDict +#define ZSTD_COMPRESSBLOCK_LAZY_EXTDICT_ROW ZSTD_compressBlock_lazy_extDict_row +#else +#define ZSTD_COMPRESSBLOCK_LAZY NULL +#define ZSTD_COMPRESSBLOCK_LAZY_ROW NULL +#define ZSTD_COMPRESSBLOCK_LAZY_DICTMATCHSTATE NULL +#define ZSTD_COMPRESSBLOCK_LAZY_DICTMATCHSTATE_ROW NULL +#define ZSTD_COMPRESSBLOCK_LAZY_DEDICATEDDICTSEARCH NULL +#define ZSTD_COMPRESSBLOCK_LAZY_DEDICATEDDICTSEARCH_ROW NULL +#define ZSTD_COMPRESSBLOCK_LAZY_EXTDICT NULL +#define ZSTD_COMPRESSBLOCK_LAZY_EXTDICT_ROW NULL +#endif + +#ifndef ZSTD_EXCLUDE_LAZY2_BLOCK_COMPRESSOR +size_t ZSTD_compressBlock_lazy2( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_lazy2_row( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_lazy2_dictMatchState( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_lazy2_dictMatchState_row( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_lazy2_dedicatedDictSearch( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_lazy2_dedicatedDictSearch_row( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_lazy2_extDict( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_lazy2_extDict_row( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); + +#define ZSTD_COMPRESSBLOCK_LAZY2 ZSTD_compressBlock_lazy2 +#define ZSTD_COMPRESSBLOCK_LAZY2_ROW ZSTD_compressBlock_lazy2_row +#define ZSTD_COMPRESSBLOCK_LAZY2_DICTMATCHSTATE ZSTD_compressBlock_lazy2_dictMatchState +#define ZSTD_COMPRESSBLOCK_LAZY2_DICTMATCHSTATE_ROW ZSTD_compressBlock_lazy2_dictMatchState_row +#define ZSTD_COMPRESSBLOCK_LAZY2_DEDICATEDDICTSEARCH ZSTD_compressBlock_lazy2_dedicatedDictSearch +#define ZSTD_COMPRESSBLOCK_LAZY2_DEDICATEDDICTSEARCH_ROW ZSTD_compressBlock_lazy2_dedicatedDictSearch_row +#define ZSTD_COMPRESSBLOCK_LAZY2_EXTDICT ZSTD_compressBlock_lazy2_extDict +#define ZSTD_COMPRESSBLOCK_LAZY2_EXTDICT_ROW ZSTD_compressBlock_lazy2_extDict_row +#else +#define ZSTD_COMPRESSBLOCK_LAZY2 NULL +#define ZSTD_COMPRESSBLOCK_LAZY2_ROW NULL +#define ZSTD_COMPRESSBLOCK_LAZY2_DICTMATCHSTATE NULL +#define ZSTD_COMPRESSBLOCK_LAZY2_DICTMATCHSTATE_ROW NULL +#define ZSTD_COMPRESSBLOCK_LAZY2_DEDICATEDDICTSEARCH NULL +#define ZSTD_COMPRESSBLOCK_LAZY2_DEDICATEDDICTSEARCH_ROW NULL +#define ZSTD_COMPRESSBLOCK_LAZY2_EXTDICT NULL +#define ZSTD_COMPRESSBLOCK_LAZY2_EXTDICT_ROW NULL +#endif + +#ifndef ZSTD_EXCLUDE_BTLAZY2_BLOCK_COMPRESSOR +size_t ZSTD_compressBlock_btlazy2( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_btlazy2_dictMatchState( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_btlazy2_extDict( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); + +#define ZSTD_COMPRESSBLOCK_BTLAZY2 ZSTD_compressBlock_btlazy2 +#define ZSTD_COMPRESSBLOCK_BTLAZY2_DICTMATCHSTATE ZSTD_compressBlock_btlazy2_dictMatchState +#define ZSTD_COMPRESSBLOCK_BTLAZY2_EXTDICT ZSTD_compressBlock_btlazy2_extDict +#else +#define ZSTD_COMPRESSBLOCK_BTLAZY2 NULL +#define ZSTD_COMPRESSBLOCK_BTLAZY2_DICTMATCHSTATE NULL +#define ZSTD_COMPRESSBLOCK_BTLAZY2_EXTDICT NULL +#endif + + +#if defined (__cplusplus) +} +#endif + +#endif /* ZSTD_LAZY_H */ +/**** ended inlining zstd_lazy.h ****/ +/**** start inlining zstd_opt.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +#ifndef ZSTD_OPT_H +#define ZSTD_OPT_H + +#if defined (__cplusplus) +extern "C" { +#endif + +/**** skipping file: zstd_compress_internal.h ****/ + +#if !defined(ZSTD_EXCLUDE_BTLAZY2_BLOCK_COMPRESSOR) \ + || !defined(ZSTD_EXCLUDE_BTOPT_BLOCK_COMPRESSOR) \ + || !defined(ZSTD_EXCLUDE_BTULTRA_BLOCK_COMPRESSOR) +/* used in ZSTD_loadDictionaryContent() */ +void ZSTD_updateTree(ZSTD_matchState_t* ms, const BYTE* ip, const BYTE* iend); +#endif + +#ifndef ZSTD_EXCLUDE_BTOPT_BLOCK_COMPRESSOR +size_t ZSTD_compressBlock_btopt( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_btopt_dictMatchState( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_btopt_extDict( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); + +#define ZSTD_COMPRESSBLOCK_BTOPT ZSTD_compressBlock_btopt +#define ZSTD_COMPRESSBLOCK_BTOPT_DICTMATCHSTATE ZSTD_compressBlock_btopt_dictMatchState +#define ZSTD_COMPRESSBLOCK_BTOPT_EXTDICT ZSTD_compressBlock_btopt_extDict +#else +#define ZSTD_COMPRESSBLOCK_BTOPT NULL +#define ZSTD_COMPRESSBLOCK_BTOPT_DICTMATCHSTATE NULL +#define ZSTD_COMPRESSBLOCK_BTOPT_EXTDICT NULL +#endif + +#ifndef ZSTD_EXCLUDE_BTULTRA_BLOCK_COMPRESSOR +size_t ZSTD_compressBlock_btultra( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_btultra_dictMatchState( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); +size_t ZSTD_compressBlock_btultra_extDict( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); + + /* note : no btultra2 variant for extDict nor dictMatchState, + * because btultra2 is not meant to work with dictionaries + * and is only specific for the first block (no prefix) */ +size_t ZSTD_compressBlock_btultra2( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize); + +#define ZSTD_COMPRESSBLOCK_BTULTRA ZSTD_compressBlock_btultra +#define ZSTD_COMPRESSBLOCK_BTULTRA_DICTMATCHSTATE ZSTD_compressBlock_btultra_dictMatchState +#define ZSTD_COMPRESSBLOCK_BTULTRA_EXTDICT ZSTD_compressBlock_btultra_extDict +#define ZSTD_COMPRESSBLOCK_BTULTRA2 ZSTD_compressBlock_btultra2 +#else +#define ZSTD_COMPRESSBLOCK_BTULTRA NULL +#define ZSTD_COMPRESSBLOCK_BTULTRA_DICTMATCHSTATE NULL +#define ZSTD_COMPRESSBLOCK_BTULTRA_EXTDICT NULL +#define ZSTD_COMPRESSBLOCK_BTULTRA2 NULL +#endif + +#if defined (__cplusplus) +} +#endif + +#endif /* ZSTD_OPT_H */ +/**** ended inlining zstd_opt.h ****/ +/**** start inlining zstd_ldm.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +#ifndef ZSTD_LDM_H +#define ZSTD_LDM_H + +#if defined (__cplusplus) +extern "C" { +#endif + +/**** skipping file: zstd_compress_internal.h ****/ +/**** skipping file: ../zstd.h ****/ + +/*-************************************* +* Long distance matching +***************************************/ + +#define ZSTD_LDM_DEFAULT_WINDOW_LOG ZSTD_WINDOWLOG_LIMIT_DEFAULT + +void ZSTD_ldm_fillHashTable( + ldmState_t* state, const BYTE* ip, + const BYTE* iend, ldmParams_t const* params); + +/** + * ZSTD_ldm_generateSequences(): + * + * Generates the sequences using the long distance match finder. + * Generates long range matching sequences in `sequences`, which parse a prefix + * of the source. `sequences` must be large enough to store every sequence, + * which can be checked with `ZSTD_ldm_getMaxNbSeq()`. + * @returns 0 or an error code. + * + * NOTE: The user must have called ZSTD_window_update() for all of the input + * they have, even if they pass it to ZSTD_ldm_generateSequences() in chunks. + * NOTE: This function returns an error if it runs out of space to store + * sequences. + */ +size_t ZSTD_ldm_generateSequences( + ldmState_t* ldms, rawSeqStore_t* sequences, + ldmParams_t const* params, void const* src, size_t srcSize); + +/** + * ZSTD_ldm_blockCompress(): + * + * Compresses a block using the predefined sequences, along with a secondary + * block compressor. The literals section of every sequence is passed to the + * secondary block compressor, and those sequences are interspersed with the + * predefined sequences. Returns the length of the last literals. + * Updates `rawSeqStore.pos` to indicate how many sequences have been consumed. + * `rawSeqStore.seq` may also be updated to split the last sequence between two + * blocks. + * @return The length of the last literals. + * + * NOTE: The source must be at most the maximum block size, but the predefined + * sequences can be any size, and may be longer than the block. In the case that + * they are longer than the block, the last sequences may need to be split into + * two. We handle that case correctly, and update `rawSeqStore` appropriately. + * NOTE: This function does not return any errors. + */ +size_t ZSTD_ldm_blockCompress(rawSeqStore_t* rawSeqStore, + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + ZSTD_paramSwitch_e useRowMatchFinder, + void const* src, size_t srcSize); + +/** + * ZSTD_ldm_skipSequences(): + * + * Skip past `srcSize` bytes worth of sequences in `rawSeqStore`. + * Avoids emitting matches less than `minMatch` bytes. + * Must be called for data that is not passed to ZSTD_ldm_blockCompress(). + */ +void ZSTD_ldm_skipSequences(rawSeqStore_t* rawSeqStore, size_t srcSize, + U32 const minMatch); + +/* ZSTD_ldm_skipRawSeqStoreBytes(): + * Moves forward in rawSeqStore by nbBytes, updating fields 'pos' and 'posInSequence'. + * Not to be used in conjunction with ZSTD_ldm_skipSequences(). + * Must be called for data with is not passed to ZSTD_ldm_blockCompress(). + */ +void ZSTD_ldm_skipRawSeqStoreBytes(rawSeqStore_t* rawSeqStore, size_t nbBytes); + +/** ZSTD_ldm_getTableSize() : + * Estimate the space needed for long distance matching tables or 0 if LDM is + * disabled. + */ +size_t ZSTD_ldm_getTableSize(ldmParams_t params); + +/** ZSTD_ldm_getSeqSpace() : + * Return an upper bound on the number of sequences that can be produced by + * the long distance matcher, or 0 if LDM is disabled. + */ +size_t ZSTD_ldm_getMaxNbSeq(ldmParams_t params, size_t maxChunkSize); + +/** ZSTD_ldm_adjustParameters() : + * If the params->hashRateLog is not set, set it to its default value based on + * windowLog and params->hashLog. + * + * Ensures that params->bucketSizeLog is <= params->hashLog (setting it to + * params->hashLog if it is not). + * + * Ensures that the minMatchLength >= targetLength during optimal parsing. + */ +void ZSTD_ldm_adjustParameters(ldmParams_t* params, + ZSTD_compressionParameters const* cParams); + +#if defined (__cplusplus) +} +#endif + +#endif /* ZSTD_FAST_H */ +/**** ended inlining zstd_ldm.h ****/ +/**** skipping file: zstd_compress_superblock.h ****/ +/**** skipping file: ../common/bits.h ****/ + +/* *************************************************************** +* Tuning parameters +*****************************************************************/ +/*! + * COMPRESS_HEAPMODE : + * Select how default decompression function ZSTD_compress() allocates its context, + * on stack (0, default), or into heap (1). + * Note that functions with explicit context such as ZSTD_compressCCtx() are unaffected. + */ +#ifndef ZSTD_COMPRESS_HEAPMODE +# define ZSTD_COMPRESS_HEAPMODE 0 +#endif + +/*! + * ZSTD_HASHLOG3_MAX : + * Maximum size of the hash table dedicated to find 3-bytes matches, + * in log format, aka 17 => 1 << 17 == 128Ki positions. + * This structure is only used in zstd_opt. + * Since allocation is centralized for all strategies, it has to be known here. + * The actual (selected) size of the hash table is then stored in ZSTD_matchState_t.hashLog3, + * so that zstd_opt.c doesn't need to know about this constant. + */ +#ifndef ZSTD_HASHLOG3_MAX +# define ZSTD_HASHLOG3_MAX 17 +#endif + +/*-************************************* +* Helper functions +***************************************/ +/* ZSTD_compressBound() + * Note that the result from this function is only valid for + * the one-pass compression functions. + * When employing the streaming mode, + * if flushes are frequently altering the size of blocks, + * the overhead from block headers can make the compressed data larger + * than the return value of ZSTD_compressBound(). + */ +size_t ZSTD_compressBound(size_t srcSize) { + size_t const r = ZSTD_COMPRESSBOUND(srcSize); + if (r==0) return ERROR(srcSize_wrong); + return r; +} + + +/*-************************************* +* Context memory management +***************************************/ +struct ZSTD_CDict_s { + const void* dictContent; + size_t dictContentSize; + ZSTD_dictContentType_e dictContentType; /* The dictContentType the CDict was created with */ + U32* entropyWorkspace; /* entropy workspace of HUF_WORKSPACE_SIZE bytes */ + ZSTD_cwksp workspace; + ZSTD_matchState_t matchState; + ZSTD_compressedBlockState_t cBlockState; + ZSTD_customMem customMem; + U32 dictID; + int compressionLevel; /* 0 indicates that advanced API was used to select CDict params */ + ZSTD_paramSwitch_e useRowMatchFinder; /* Indicates whether the CDict was created with params that would use + * row-based matchfinder. Unless the cdict is reloaded, we will use + * the same greedy/lazy matchfinder at compression time. + */ +}; /* typedef'd to ZSTD_CDict within "zstd.h" */ + +ZSTD_CCtx* ZSTD_createCCtx(void) +{ + return ZSTD_createCCtx_advanced(ZSTD_defaultCMem); +} + +static void ZSTD_initCCtx(ZSTD_CCtx* cctx, ZSTD_customMem memManager) +{ + assert(cctx != NULL); + ZSTD_memset(cctx, 0, sizeof(*cctx)); + cctx->customMem = memManager; + cctx->bmi2 = ZSTD_cpuSupportsBmi2(); + { size_t const err = ZSTD_CCtx_reset(cctx, ZSTD_reset_parameters); + assert(!ZSTD_isError(err)); + (void)err; + } +} + +ZSTD_CCtx* ZSTD_createCCtx_advanced(ZSTD_customMem customMem) +{ + ZSTD_STATIC_ASSERT(zcss_init==0); + ZSTD_STATIC_ASSERT(ZSTD_CONTENTSIZE_UNKNOWN==(0ULL - 1)); + if ((!customMem.customAlloc) ^ (!customMem.customFree)) return NULL; + { ZSTD_CCtx* const cctx = (ZSTD_CCtx*)ZSTD_customMalloc(sizeof(ZSTD_CCtx), customMem); + if (!cctx) return NULL; + ZSTD_initCCtx(cctx, customMem); + return cctx; + } +} + +ZSTD_CCtx* ZSTD_initStaticCCtx(void* workspace, size_t workspaceSize) +{ + ZSTD_cwksp ws; + ZSTD_CCtx* cctx; + if (workspaceSize <= sizeof(ZSTD_CCtx)) return NULL; /* minimum size */ + if ((size_t)workspace & 7) return NULL; /* must be 8-aligned */ + ZSTD_cwksp_init(&ws, workspace, workspaceSize, ZSTD_cwksp_static_alloc); + + cctx = (ZSTD_CCtx*)ZSTD_cwksp_reserve_object(&ws, sizeof(ZSTD_CCtx)); + if (cctx == NULL) return NULL; + + ZSTD_memset(cctx, 0, sizeof(ZSTD_CCtx)); + ZSTD_cwksp_move(&cctx->workspace, &ws); + cctx->staticSize = workspaceSize; + + /* statically sized space. entropyWorkspace never moves (but prev/next block swap places) */ + if (!ZSTD_cwksp_check_available(&cctx->workspace, ENTROPY_WORKSPACE_SIZE + 2 * sizeof(ZSTD_compressedBlockState_t))) return NULL; + cctx->blockState.prevCBlock = (ZSTD_compressedBlockState_t*)ZSTD_cwksp_reserve_object(&cctx->workspace, sizeof(ZSTD_compressedBlockState_t)); + cctx->blockState.nextCBlock = (ZSTD_compressedBlockState_t*)ZSTD_cwksp_reserve_object(&cctx->workspace, sizeof(ZSTD_compressedBlockState_t)); + cctx->entropyWorkspace = (U32*)ZSTD_cwksp_reserve_object(&cctx->workspace, ENTROPY_WORKSPACE_SIZE); + cctx->bmi2 = ZSTD_cpuid_bmi2(ZSTD_cpuid()); + return cctx; +} + +/** + * Clears and frees all of the dictionaries in the CCtx. + */ +static void ZSTD_clearAllDicts(ZSTD_CCtx* cctx) +{ + ZSTD_customFree(cctx->localDict.dictBuffer, cctx->customMem); + ZSTD_freeCDict(cctx->localDict.cdict); + ZSTD_memset(&cctx->localDict, 0, sizeof(cctx->localDict)); + ZSTD_memset(&cctx->prefixDict, 0, sizeof(cctx->prefixDict)); + cctx->cdict = NULL; +} + +static size_t ZSTD_sizeof_localDict(ZSTD_localDict dict) +{ + size_t const bufferSize = dict.dictBuffer != NULL ? dict.dictSize : 0; + size_t const cdictSize = ZSTD_sizeof_CDict(dict.cdict); + return bufferSize + cdictSize; +} + +static void ZSTD_freeCCtxContent(ZSTD_CCtx* cctx) +{ + assert(cctx != NULL); + assert(cctx->staticSize == 0); + ZSTD_clearAllDicts(cctx); +#ifdef ZSTD_MULTITHREAD + ZSTDMT_freeCCtx(cctx->mtctx); cctx->mtctx = NULL; +#endif + ZSTD_cwksp_free(&cctx->workspace, cctx->customMem); +} + +size_t ZSTD_freeCCtx(ZSTD_CCtx* cctx) +{ + DEBUGLOG(3, "ZSTD_freeCCtx (address: %p)", (void*)cctx); + if (cctx==NULL) return 0; /* support free on NULL */ + RETURN_ERROR_IF(cctx->staticSize, memory_allocation, + "not compatible with static CCtx"); + { int cctxInWorkspace = ZSTD_cwksp_owns_buffer(&cctx->workspace, cctx); + ZSTD_freeCCtxContent(cctx); + if (!cctxInWorkspace) ZSTD_customFree(cctx, cctx->customMem); + } + return 0; +} + + +static size_t ZSTD_sizeof_mtctx(const ZSTD_CCtx* cctx) +{ +#ifdef ZSTD_MULTITHREAD + return ZSTDMT_sizeof_CCtx(cctx->mtctx); +#else + (void)cctx; + return 0; +#endif +} + + +size_t ZSTD_sizeof_CCtx(const ZSTD_CCtx* cctx) +{ + if (cctx==NULL) return 0; /* support sizeof on NULL */ + /* cctx may be in the workspace */ + return (cctx->workspace.workspace == cctx ? 0 : sizeof(*cctx)) + + ZSTD_cwksp_sizeof(&cctx->workspace) + + ZSTD_sizeof_localDict(cctx->localDict) + + ZSTD_sizeof_mtctx(cctx); +} + +size_t ZSTD_sizeof_CStream(const ZSTD_CStream* zcs) +{ + return ZSTD_sizeof_CCtx(zcs); /* same object */ +} + +/* private API call, for dictBuilder only */ +const seqStore_t* ZSTD_getSeqStore(const ZSTD_CCtx* ctx) { return &(ctx->seqStore); } + +/* Returns true if the strategy supports using a row based matchfinder */ +static int ZSTD_rowMatchFinderSupported(const ZSTD_strategy strategy) { + return (strategy >= ZSTD_greedy && strategy <= ZSTD_lazy2); +} + +/* Returns true if the strategy and useRowMatchFinder mode indicate that we will use the row based matchfinder + * for this compression. + */ +static int ZSTD_rowMatchFinderUsed(const ZSTD_strategy strategy, const ZSTD_paramSwitch_e mode) { + assert(mode != ZSTD_ps_auto); + return ZSTD_rowMatchFinderSupported(strategy) && (mode == ZSTD_ps_enable); +} + +/* Returns row matchfinder usage given an initial mode and cParams */ +static ZSTD_paramSwitch_e ZSTD_resolveRowMatchFinderMode(ZSTD_paramSwitch_e mode, + const ZSTD_compressionParameters* const cParams) { +#if defined(ZSTD_ARCH_X86_SSE2) || defined(ZSTD_ARCH_ARM_NEON) + int const kHasSIMD128 = 1; +#else + int const kHasSIMD128 = 0; +#endif + if (mode != ZSTD_ps_auto) return mode; /* if requested enabled, but no SIMD, we still will use row matchfinder */ + mode = ZSTD_ps_disable; + if (!ZSTD_rowMatchFinderSupported(cParams->strategy)) return mode; + if (kHasSIMD128) { + if (cParams->windowLog > 14) mode = ZSTD_ps_enable; + } else { + if (cParams->windowLog > 17) mode = ZSTD_ps_enable; + } + return mode; +} + +/* Returns block splitter usage (generally speaking, when using slower/stronger compression modes) */ +static ZSTD_paramSwitch_e ZSTD_resolveBlockSplitterMode(ZSTD_paramSwitch_e mode, + const ZSTD_compressionParameters* const cParams) { + if (mode != ZSTD_ps_auto) return mode; + return (cParams->strategy >= ZSTD_btopt && cParams->windowLog >= 17) ? ZSTD_ps_enable : ZSTD_ps_disable; +} + +/* Returns 1 if the arguments indicate that we should allocate a chainTable, 0 otherwise */ +static int ZSTD_allocateChainTable(const ZSTD_strategy strategy, + const ZSTD_paramSwitch_e useRowMatchFinder, + const U32 forDDSDict) { + assert(useRowMatchFinder != ZSTD_ps_auto); + /* We always should allocate a chaintable if we are allocating a matchstate for a DDS dictionary matchstate. + * We do not allocate a chaintable if we are using ZSTD_fast, or are using the row-based matchfinder. + */ + return forDDSDict || ((strategy != ZSTD_fast) && !ZSTD_rowMatchFinderUsed(strategy, useRowMatchFinder)); +} + +/* Returns ZSTD_ps_enable if compression parameters are such that we should + * enable long distance matching (wlog >= 27, strategy >= btopt). + * Returns ZSTD_ps_disable otherwise. + */ +static ZSTD_paramSwitch_e ZSTD_resolveEnableLdm(ZSTD_paramSwitch_e mode, + const ZSTD_compressionParameters* const cParams) { + if (mode != ZSTD_ps_auto) return mode; + return (cParams->strategy >= ZSTD_btopt && cParams->windowLog >= 27) ? ZSTD_ps_enable : ZSTD_ps_disable; +} + +static int ZSTD_resolveExternalSequenceValidation(int mode) { + return mode; +} + +/* Resolves maxBlockSize to the default if no value is present. */ +static size_t ZSTD_resolveMaxBlockSize(size_t maxBlockSize) { + if (maxBlockSize == 0) { + return ZSTD_BLOCKSIZE_MAX; + } else { + return maxBlockSize; + } +} + +static ZSTD_paramSwitch_e ZSTD_resolveExternalRepcodeSearch(ZSTD_paramSwitch_e value, int cLevel) { + if (value != ZSTD_ps_auto) return value; + if (cLevel < 10) { + return ZSTD_ps_disable; + } else { + return ZSTD_ps_enable; + } +} + +/* Returns 1 if compression parameters are such that CDict hashtable and chaintable indices are tagged. + * If so, the tags need to be removed in ZSTD_resetCCtx_byCopyingCDict. */ +static int ZSTD_CDictIndicesAreTagged(const ZSTD_compressionParameters* const cParams) { + return cParams->strategy == ZSTD_fast || cParams->strategy == ZSTD_dfast; +} + +static ZSTD_CCtx_params ZSTD_makeCCtxParamsFromCParams( + ZSTD_compressionParameters cParams) +{ + ZSTD_CCtx_params cctxParams; + /* should not matter, as all cParams are presumed properly defined */ + ZSTD_CCtxParams_init(&cctxParams, ZSTD_CLEVEL_DEFAULT); + cctxParams.cParams = cParams; + + /* Adjust advanced params according to cParams */ + cctxParams.ldmParams.enableLdm = ZSTD_resolveEnableLdm(cctxParams.ldmParams.enableLdm, &cParams); + if (cctxParams.ldmParams.enableLdm == ZSTD_ps_enable) { + ZSTD_ldm_adjustParameters(&cctxParams.ldmParams, &cParams); + assert(cctxParams.ldmParams.hashLog >= cctxParams.ldmParams.bucketSizeLog); + assert(cctxParams.ldmParams.hashRateLog < 32); + } + cctxParams.useBlockSplitter = ZSTD_resolveBlockSplitterMode(cctxParams.useBlockSplitter, &cParams); + cctxParams.useRowMatchFinder = ZSTD_resolveRowMatchFinderMode(cctxParams.useRowMatchFinder, &cParams); + cctxParams.validateSequences = ZSTD_resolveExternalSequenceValidation(cctxParams.validateSequences); + cctxParams.maxBlockSize = ZSTD_resolveMaxBlockSize(cctxParams.maxBlockSize); + cctxParams.searchForExternalRepcodes = ZSTD_resolveExternalRepcodeSearch(cctxParams.searchForExternalRepcodes, + cctxParams.compressionLevel); + assert(!ZSTD_checkCParams(cParams)); + return cctxParams; +} + +static ZSTD_CCtx_params* ZSTD_createCCtxParams_advanced( + ZSTD_customMem customMem) +{ + ZSTD_CCtx_params* params; + if ((!customMem.customAlloc) ^ (!customMem.customFree)) return NULL; + params = (ZSTD_CCtx_params*)ZSTD_customCalloc( + sizeof(ZSTD_CCtx_params), customMem); + if (!params) { return NULL; } + ZSTD_CCtxParams_init(params, ZSTD_CLEVEL_DEFAULT); + params->customMem = customMem; + return params; +} + +ZSTD_CCtx_params* ZSTD_createCCtxParams(void) +{ + return ZSTD_createCCtxParams_advanced(ZSTD_defaultCMem); +} + +size_t ZSTD_freeCCtxParams(ZSTD_CCtx_params* params) +{ + if (params == NULL) { return 0; } + ZSTD_customFree(params, params->customMem); + return 0; +} + +size_t ZSTD_CCtxParams_reset(ZSTD_CCtx_params* params) +{ + return ZSTD_CCtxParams_init(params, ZSTD_CLEVEL_DEFAULT); +} + +size_t ZSTD_CCtxParams_init(ZSTD_CCtx_params* cctxParams, int compressionLevel) { + RETURN_ERROR_IF(!cctxParams, GENERIC, "NULL pointer!"); + ZSTD_memset(cctxParams, 0, sizeof(*cctxParams)); + cctxParams->compressionLevel = compressionLevel; + cctxParams->fParams.contentSizeFlag = 1; + return 0; +} + +#define ZSTD_NO_CLEVEL 0 + +/** + * Initializes `cctxParams` from `params` and `compressionLevel`. + * @param compressionLevel If params are derived from a compression level then that compression level, otherwise ZSTD_NO_CLEVEL. + */ +static void +ZSTD_CCtxParams_init_internal(ZSTD_CCtx_params* cctxParams, + const ZSTD_parameters* params, + int compressionLevel) +{ + assert(!ZSTD_checkCParams(params->cParams)); + ZSTD_memset(cctxParams, 0, sizeof(*cctxParams)); + cctxParams->cParams = params->cParams; + cctxParams->fParams = params->fParams; + /* Should not matter, as all cParams are presumed properly defined. + * But, set it for tracing anyway. + */ + cctxParams->compressionLevel = compressionLevel; + cctxParams->useRowMatchFinder = ZSTD_resolveRowMatchFinderMode(cctxParams->useRowMatchFinder, ¶ms->cParams); + cctxParams->useBlockSplitter = ZSTD_resolveBlockSplitterMode(cctxParams->useBlockSplitter, ¶ms->cParams); + cctxParams->ldmParams.enableLdm = ZSTD_resolveEnableLdm(cctxParams->ldmParams.enableLdm, ¶ms->cParams); + cctxParams->validateSequences = ZSTD_resolveExternalSequenceValidation(cctxParams->validateSequences); + cctxParams->maxBlockSize = ZSTD_resolveMaxBlockSize(cctxParams->maxBlockSize); + cctxParams->searchForExternalRepcodes = ZSTD_resolveExternalRepcodeSearch(cctxParams->searchForExternalRepcodes, compressionLevel); + DEBUGLOG(4, "ZSTD_CCtxParams_init_internal: useRowMatchFinder=%d, useBlockSplitter=%d ldm=%d", + cctxParams->useRowMatchFinder, cctxParams->useBlockSplitter, cctxParams->ldmParams.enableLdm); +} + +size_t ZSTD_CCtxParams_init_advanced(ZSTD_CCtx_params* cctxParams, ZSTD_parameters params) +{ + RETURN_ERROR_IF(!cctxParams, GENERIC, "NULL pointer!"); + FORWARD_IF_ERROR( ZSTD_checkCParams(params.cParams) , ""); + ZSTD_CCtxParams_init_internal(cctxParams, ¶ms, ZSTD_NO_CLEVEL); + return 0; +} + +/** + * Sets cctxParams' cParams and fParams from params, but otherwise leaves them alone. + * @param params Validated zstd parameters. + */ +static void ZSTD_CCtxParams_setZstdParams( + ZSTD_CCtx_params* cctxParams, const ZSTD_parameters* params) +{ + assert(!ZSTD_checkCParams(params->cParams)); + cctxParams->cParams = params->cParams; + cctxParams->fParams = params->fParams; + /* Should not matter, as all cParams are presumed properly defined. + * But, set it for tracing anyway. + */ + cctxParams->compressionLevel = ZSTD_NO_CLEVEL; +} + +ZSTD_bounds ZSTD_cParam_getBounds(ZSTD_cParameter param) +{ + ZSTD_bounds bounds = { 0, 0, 0 }; + + switch(param) + { + case ZSTD_c_compressionLevel: + bounds.lowerBound = ZSTD_minCLevel(); + bounds.upperBound = ZSTD_maxCLevel(); + return bounds; + + case ZSTD_c_windowLog: + bounds.lowerBound = ZSTD_WINDOWLOG_MIN; + bounds.upperBound = ZSTD_WINDOWLOG_MAX; + return bounds; + + case ZSTD_c_hashLog: + bounds.lowerBound = ZSTD_HASHLOG_MIN; + bounds.upperBound = ZSTD_HASHLOG_MAX; + return bounds; + + case ZSTD_c_chainLog: + bounds.lowerBound = ZSTD_CHAINLOG_MIN; + bounds.upperBound = ZSTD_CHAINLOG_MAX; + return bounds; + + case ZSTD_c_searchLog: + bounds.lowerBound = ZSTD_SEARCHLOG_MIN; + bounds.upperBound = ZSTD_SEARCHLOG_MAX; + return bounds; + + case ZSTD_c_minMatch: + bounds.lowerBound = ZSTD_MINMATCH_MIN; + bounds.upperBound = ZSTD_MINMATCH_MAX; + return bounds; + + case ZSTD_c_targetLength: + bounds.lowerBound = ZSTD_TARGETLENGTH_MIN; + bounds.upperBound = ZSTD_TARGETLENGTH_MAX; + return bounds; + + case ZSTD_c_strategy: + bounds.lowerBound = ZSTD_STRATEGY_MIN; + bounds.upperBound = ZSTD_STRATEGY_MAX; + return bounds; + + case ZSTD_c_contentSizeFlag: + bounds.lowerBound = 0; + bounds.upperBound = 1; + return bounds; + + case ZSTD_c_checksumFlag: + bounds.lowerBound = 0; + bounds.upperBound = 1; + return bounds; + + case ZSTD_c_dictIDFlag: + bounds.lowerBound = 0; + bounds.upperBound = 1; + return bounds; + + case ZSTD_c_nbWorkers: + bounds.lowerBound = 0; +#ifdef ZSTD_MULTITHREAD + bounds.upperBound = ZSTDMT_NBWORKERS_MAX; +#else + bounds.upperBound = 0; +#endif + return bounds; + + case ZSTD_c_jobSize: + bounds.lowerBound = 0; +#ifdef ZSTD_MULTITHREAD + bounds.upperBound = ZSTDMT_JOBSIZE_MAX; +#else + bounds.upperBound = 0; +#endif + return bounds; + + case ZSTD_c_overlapLog: +#ifdef ZSTD_MULTITHREAD + bounds.lowerBound = ZSTD_OVERLAPLOG_MIN; + bounds.upperBound = ZSTD_OVERLAPLOG_MAX; +#else + bounds.lowerBound = 0; + bounds.upperBound = 0; +#endif + return bounds; + + case ZSTD_c_enableDedicatedDictSearch: + bounds.lowerBound = 0; + bounds.upperBound = 1; + return bounds; + + case ZSTD_c_enableLongDistanceMatching: + bounds.lowerBound = (int)ZSTD_ps_auto; + bounds.upperBound = (int)ZSTD_ps_disable; + return bounds; + + case ZSTD_c_ldmHashLog: + bounds.lowerBound = ZSTD_LDM_HASHLOG_MIN; + bounds.upperBound = ZSTD_LDM_HASHLOG_MAX; + return bounds; + + case ZSTD_c_ldmMinMatch: + bounds.lowerBound = ZSTD_LDM_MINMATCH_MIN; + bounds.upperBound = ZSTD_LDM_MINMATCH_MAX; + return bounds; + + case ZSTD_c_ldmBucketSizeLog: + bounds.lowerBound = ZSTD_LDM_BUCKETSIZELOG_MIN; + bounds.upperBound = ZSTD_LDM_BUCKETSIZELOG_MAX; + return bounds; + + case ZSTD_c_ldmHashRateLog: + bounds.lowerBound = ZSTD_LDM_HASHRATELOG_MIN; + bounds.upperBound = ZSTD_LDM_HASHRATELOG_MAX; + return bounds; + + /* experimental parameters */ + case ZSTD_c_rsyncable: + bounds.lowerBound = 0; + bounds.upperBound = 1; + return bounds; + + case ZSTD_c_forceMaxWindow : + bounds.lowerBound = 0; + bounds.upperBound = 1; + return bounds; + + case ZSTD_c_format: + ZSTD_STATIC_ASSERT(ZSTD_f_zstd1 < ZSTD_f_zstd1_magicless); + bounds.lowerBound = ZSTD_f_zstd1; + bounds.upperBound = ZSTD_f_zstd1_magicless; /* note : how to ensure at compile time that this is the highest value enum ? */ + return bounds; + + case ZSTD_c_forceAttachDict: + ZSTD_STATIC_ASSERT(ZSTD_dictDefaultAttach < ZSTD_dictForceLoad); + bounds.lowerBound = ZSTD_dictDefaultAttach; + bounds.upperBound = ZSTD_dictForceLoad; /* note : how to ensure at compile time that this is the highest value enum ? */ + return bounds; + + case ZSTD_c_literalCompressionMode: + ZSTD_STATIC_ASSERT(ZSTD_ps_auto < ZSTD_ps_enable && ZSTD_ps_enable < ZSTD_ps_disable); + bounds.lowerBound = (int)ZSTD_ps_auto; + bounds.upperBound = (int)ZSTD_ps_disable; + return bounds; + + case ZSTD_c_targetCBlockSize: + bounds.lowerBound = ZSTD_TARGETCBLOCKSIZE_MIN; + bounds.upperBound = ZSTD_TARGETCBLOCKSIZE_MAX; + return bounds; + + case ZSTD_c_srcSizeHint: + bounds.lowerBound = ZSTD_SRCSIZEHINT_MIN; + bounds.upperBound = ZSTD_SRCSIZEHINT_MAX; + return bounds; + + case ZSTD_c_stableInBuffer: + case ZSTD_c_stableOutBuffer: + bounds.lowerBound = (int)ZSTD_bm_buffered; + bounds.upperBound = (int)ZSTD_bm_stable; + return bounds; + + case ZSTD_c_blockDelimiters: + bounds.lowerBound = (int)ZSTD_sf_noBlockDelimiters; + bounds.upperBound = (int)ZSTD_sf_explicitBlockDelimiters; + return bounds; + + case ZSTD_c_validateSequences: + bounds.lowerBound = 0; + bounds.upperBound = 1; + return bounds; + + case ZSTD_c_useBlockSplitter: + bounds.lowerBound = (int)ZSTD_ps_auto; + bounds.upperBound = (int)ZSTD_ps_disable; + return bounds; + + case ZSTD_c_useRowMatchFinder: + bounds.lowerBound = (int)ZSTD_ps_auto; + bounds.upperBound = (int)ZSTD_ps_disable; + return bounds; + + case ZSTD_c_deterministicRefPrefix: + bounds.lowerBound = 0; + bounds.upperBound = 1; + return bounds; + + case ZSTD_c_prefetchCDictTables: + bounds.lowerBound = (int)ZSTD_ps_auto; + bounds.upperBound = (int)ZSTD_ps_disable; + return bounds; + + case ZSTD_c_enableSeqProducerFallback: + bounds.lowerBound = 0; + bounds.upperBound = 1; + return bounds; + + case ZSTD_c_maxBlockSize: + bounds.lowerBound = ZSTD_BLOCKSIZE_MAX_MIN; + bounds.upperBound = ZSTD_BLOCKSIZE_MAX; + return bounds; + + case ZSTD_c_searchForExternalRepcodes: + bounds.lowerBound = (int)ZSTD_ps_auto; + bounds.upperBound = (int)ZSTD_ps_disable; + return bounds; + + default: + bounds.error = ERROR(parameter_unsupported); + return bounds; + } +} + +/* ZSTD_cParam_clampBounds: + * Clamps the value into the bounded range. + */ +static size_t ZSTD_cParam_clampBounds(ZSTD_cParameter cParam, int* value) +{ + ZSTD_bounds const bounds = ZSTD_cParam_getBounds(cParam); + if (ZSTD_isError(bounds.error)) return bounds.error; + if (*value < bounds.lowerBound) *value = bounds.lowerBound; + if (*value > bounds.upperBound) *value = bounds.upperBound; + return 0; +} + +#define BOUNDCHECK(cParam, val) \ + do { \ + RETURN_ERROR_IF(!ZSTD_cParam_withinBounds(cParam,val), \ + parameter_outOfBound, "Param out of bounds"); \ + } while (0) + + +static int ZSTD_isUpdateAuthorized(ZSTD_cParameter param) +{ + switch(param) + { + case ZSTD_c_compressionLevel: + case ZSTD_c_hashLog: + case ZSTD_c_chainLog: + case ZSTD_c_searchLog: + case ZSTD_c_minMatch: + case ZSTD_c_targetLength: + case ZSTD_c_strategy: + return 1; + + case ZSTD_c_format: + case ZSTD_c_windowLog: + case ZSTD_c_contentSizeFlag: + case ZSTD_c_checksumFlag: + case ZSTD_c_dictIDFlag: + case ZSTD_c_forceMaxWindow : + case ZSTD_c_nbWorkers: + case ZSTD_c_jobSize: + case ZSTD_c_overlapLog: + case ZSTD_c_rsyncable: + case ZSTD_c_enableDedicatedDictSearch: + case ZSTD_c_enableLongDistanceMatching: + case ZSTD_c_ldmHashLog: + case ZSTD_c_ldmMinMatch: + case ZSTD_c_ldmBucketSizeLog: + case ZSTD_c_ldmHashRateLog: + case ZSTD_c_forceAttachDict: + case ZSTD_c_literalCompressionMode: + case ZSTD_c_targetCBlockSize: + case ZSTD_c_srcSizeHint: + case ZSTD_c_stableInBuffer: + case ZSTD_c_stableOutBuffer: + case ZSTD_c_blockDelimiters: + case ZSTD_c_validateSequences: + case ZSTD_c_useBlockSplitter: + case ZSTD_c_useRowMatchFinder: + case ZSTD_c_deterministicRefPrefix: + case ZSTD_c_prefetchCDictTables: + case ZSTD_c_enableSeqProducerFallback: + case ZSTD_c_maxBlockSize: + case ZSTD_c_searchForExternalRepcodes: + default: + return 0; + } +} + +size_t ZSTD_CCtx_setParameter(ZSTD_CCtx* cctx, ZSTD_cParameter param, int value) +{ + DEBUGLOG(4, "ZSTD_CCtx_setParameter (%i, %i)", (int)param, value); + if (cctx->streamStage != zcss_init) { + if (ZSTD_isUpdateAuthorized(param)) { + cctx->cParamsChanged = 1; + } else { + RETURN_ERROR(stage_wrong, "can only set params in cctx init stage"); + } } + + switch(param) + { + case ZSTD_c_nbWorkers: + RETURN_ERROR_IF((value!=0) && cctx->staticSize, parameter_unsupported, + "MT not compatible with static alloc"); + break; + + case ZSTD_c_compressionLevel: + case ZSTD_c_windowLog: + case ZSTD_c_hashLog: + case ZSTD_c_chainLog: + case ZSTD_c_searchLog: + case ZSTD_c_minMatch: + case ZSTD_c_targetLength: + case ZSTD_c_strategy: + case ZSTD_c_ldmHashRateLog: + case ZSTD_c_format: + case ZSTD_c_contentSizeFlag: + case ZSTD_c_checksumFlag: + case ZSTD_c_dictIDFlag: + case ZSTD_c_forceMaxWindow: + case ZSTD_c_forceAttachDict: + case ZSTD_c_literalCompressionMode: + case ZSTD_c_jobSize: + case ZSTD_c_overlapLog: + case ZSTD_c_rsyncable: + case ZSTD_c_enableDedicatedDictSearch: + case ZSTD_c_enableLongDistanceMatching: + case ZSTD_c_ldmHashLog: + case ZSTD_c_ldmMinMatch: + case ZSTD_c_ldmBucketSizeLog: + case ZSTD_c_targetCBlockSize: + case ZSTD_c_srcSizeHint: + case ZSTD_c_stableInBuffer: + case ZSTD_c_stableOutBuffer: + case ZSTD_c_blockDelimiters: + case ZSTD_c_validateSequences: + case ZSTD_c_useBlockSplitter: + case ZSTD_c_useRowMatchFinder: + case ZSTD_c_deterministicRefPrefix: + case ZSTD_c_prefetchCDictTables: + case ZSTD_c_enableSeqProducerFallback: + case ZSTD_c_maxBlockSize: + case ZSTD_c_searchForExternalRepcodes: + break; + + default: RETURN_ERROR(parameter_unsupported, "unknown parameter"); + } + return ZSTD_CCtxParams_setParameter(&cctx->requestedParams, param, value); +} + +size_t ZSTD_CCtxParams_setParameter(ZSTD_CCtx_params* CCtxParams, + ZSTD_cParameter param, int value) +{ + DEBUGLOG(4, "ZSTD_CCtxParams_setParameter (%i, %i)", (int)param, value); + switch(param) + { + case ZSTD_c_format : + BOUNDCHECK(ZSTD_c_format, value); + CCtxParams->format = (ZSTD_format_e)value; + return (size_t)CCtxParams->format; + + case ZSTD_c_compressionLevel : { + FORWARD_IF_ERROR(ZSTD_cParam_clampBounds(param, &value), ""); + if (value == 0) + CCtxParams->compressionLevel = ZSTD_CLEVEL_DEFAULT; /* 0 == default */ + else + CCtxParams->compressionLevel = value; + if (CCtxParams->compressionLevel >= 0) return (size_t)CCtxParams->compressionLevel; + return 0; /* return type (size_t) cannot represent negative values */ + } + + case ZSTD_c_windowLog : + if (value!=0) /* 0 => use default */ + BOUNDCHECK(ZSTD_c_windowLog, value); + CCtxParams->cParams.windowLog = (U32)value; + return CCtxParams->cParams.windowLog; + + case ZSTD_c_hashLog : + if (value!=0) /* 0 => use default */ + BOUNDCHECK(ZSTD_c_hashLog, value); + CCtxParams->cParams.hashLog = (U32)value; + return CCtxParams->cParams.hashLog; + + case ZSTD_c_chainLog : + if (value!=0) /* 0 => use default */ + BOUNDCHECK(ZSTD_c_chainLog, value); + CCtxParams->cParams.chainLog = (U32)value; + return CCtxParams->cParams.chainLog; + + case ZSTD_c_searchLog : + if (value!=0) /* 0 => use default */ + BOUNDCHECK(ZSTD_c_searchLog, value); + CCtxParams->cParams.searchLog = (U32)value; + return (size_t)value; + + case ZSTD_c_minMatch : + if (value!=0) /* 0 => use default */ + BOUNDCHECK(ZSTD_c_minMatch, value); + CCtxParams->cParams.minMatch = (U32)value; + return CCtxParams->cParams.minMatch; + + case ZSTD_c_targetLength : + BOUNDCHECK(ZSTD_c_targetLength, value); + CCtxParams->cParams.targetLength = (U32)value; + return CCtxParams->cParams.targetLength; + + case ZSTD_c_strategy : + if (value!=0) /* 0 => use default */ + BOUNDCHECK(ZSTD_c_strategy, value); + CCtxParams->cParams.strategy = (ZSTD_strategy)value; + return (size_t)CCtxParams->cParams.strategy; + + case ZSTD_c_contentSizeFlag : + /* Content size written in frame header _when known_ (default:1) */ + DEBUGLOG(4, "set content size flag = %u", (value!=0)); + CCtxParams->fParams.contentSizeFlag = value != 0; + return (size_t)CCtxParams->fParams.contentSizeFlag; + + case ZSTD_c_checksumFlag : + /* A 32-bits content checksum will be calculated and written at end of frame (default:0) */ + CCtxParams->fParams.checksumFlag = value != 0; + return (size_t)CCtxParams->fParams.checksumFlag; + + case ZSTD_c_dictIDFlag : /* When applicable, dictionary's dictID is provided in frame header (default:1) */ + DEBUGLOG(4, "set dictIDFlag = %u", (value!=0)); + CCtxParams->fParams.noDictIDFlag = !value; + return !CCtxParams->fParams.noDictIDFlag; + + case ZSTD_c_forceMaxWindow : + CCtxParams->forceWindow = (value != 0); + return (size_t)CCtxParams->forceWindow; + + case ZSTD_c_forceAttachDict : { + const ZSTD_dictAttachPref_e pref = (ZSTD_dictAttachPref_e)value; + BOUNDCHECK(ZSTD_c_forceAttachDict, (int)pref); + CCtxParams->attachDictPref = pref; + return CCtxParams->attachDictPref; + } + + case ZSTD_c_literalCompressionMode : { + const ZSTD_paramSwitch_e lcm = (ZSTD_paramSwitch_e)value; + BOUNDCHECK(ZSTD_c_literalCompressionMode, (int)lcm); + CCtxParams->literalCompressionMode = lcm; + return CCtxParams->literalCompressionMode; + } + + case ZSTD_c_nbWorkers : +#ifndef ZSTD_MULTITHREAD + RETURN_ERROR_IF(value!=0, parameter_unsupported, "not compiled with multithreading"); + return 0; +#else + FORWARD_IF_ERROR(ZSTD_cParam_clampBounds(param, &value), ""); + CCtxParams->nbWorkers = value; + return (size_t)(CCtxParams->nbWorkers); +#endif + + case ZSTD_c_jobSize : +#ifndef ZSTD_MULTITHREAD + RETURN_ERROR_IF(value!=0, parameter_unsupported, "not compiled with multithreading"); + return 0; +#else + /* Adjust to the minimum non-default value. */ + if (value != 0 && value < ZSTDMT_JOBSIZE_MIN) + value = ZSTDMT_JOBSIZE_MIN; + FORWARD_IF_ERROR(ZSTD_cParam_clampBounds(param, &value), ""); + assert(value >= 0); + CCtxParams->jobSize = value; + return CCtxParams->jobSize; +#endif + + case ZSTD_c_overlapLog : +#ifndef ZSTD_MULTITHREAD + RETURN_ERROR_IF(value!=0, parameter_unsupported, "not compiled with multithreading"); + return 0; +#else + FORWARD_IF_ERROR(ZSTD_cParam_clampBounds(ZSTD_c_overlapLog, &value), ""); + CCtxParams->overlapLog = value; + return (size_t)CCtxParams->overlapLog; +#endif + + case ZSTD_c_rsyncable : +#ifndef ZSTD_MULTITHREAD + RETURN_ERROR_IF(value!=0, parameter_unsupported, "not compiled with multithreading"); + return 0; +#else + FORWARD_IF_ERROR(ZSTD_cParam_clampBounds(ZSTD_c_overlapLog, &value), ""); + CCtxParams->rsyncable = value; + return (size_t)CCtxParams->rsyncable; +#endif + + case ZSTD_c_enableDedicatedDictSearch : + CCtxParams->enableDedicatedDictSearch = (value!=0); + return (size_t)CCtxParams->enableDedicatedDictSearch; + + case ZSTD_c_enableLongDistanceMatching : + BOUNDCHECK(ZSTD_c_enableLongDistanceMatching, value); + CCtxParams->ldmParams.enableLdm = (ZSTD_paramSwitch_e)value; + return CCtxParams->ldmParams.enableLdm; + + case ZSTD_c_ldmHashLog : + if (value!=0) /* 0 ==> auto */ + BOUNDCHECK(ZSTD_c_ldmHashLog, value); + CCtxParams->ldmParams.hashLog = (U32)value; + return CCtxParams->ldmParams.hashLog; + + case ZSTD_c_ldmMinMatch : + if (value!=0) /* 0 ==> default */ + BOUNDCHECK(ZSTD_c_ldmMinMatch, value); + CCtxParams->ldmParams.minMatchLength = (U32)value; + return CCtxParams->ldmParams.minMatchLength; + + case ZSTD_c_ldmBucketSizeLog : + if (value!=0) /* 0 ==> default */ + BOUNDCHECK(ZSTD_c_ldmBucketSizeLog, value); + CCtxParams->ldmParams.bucketSizeLog = (U32)value; + return CCtxParams->ldmParams.bucketSizeLog; + + case ZSTD_c_ldmHashRateLog : + if (value!=0) /* 0 ==> default */ + BOUNDCHECK(ZSTD_c_ldmHashRateLog, value); + CCtxParams->ldmParams.hashRateLog = (U32)value; + return CCtxParams->ldmParams.hashRateLog; + + case ZSTD_c_targetCBlockSize : + if (value!=0) { /* 0 ==> default */ + value = MAX(value, ZSTD_TARGETCBLOCKSIZE_MIN); + BOUNDCHECK(ZSTD_c_targetCBlockSize, value); + } + CCtxParams->targetCBlockSize = (U32)value; + return CCtxParams->targetCBlockSize; + + case ZSTD_c_srcSizeHint : + if (value!=0) /* 0 ==> default */ + BOUNDCHECK(ZSTD_c_srcSizeHint, value); + CCtxParams->srcSizeHint = value; + return (size_t)CCtxParams->srcSizeHint; + + case ZSTD_c_stableInBuffer: + BOUNDCHECK(ZSTD_c_stableInBuffer, value); + CCtxParams->inBufferMode = (ZSTD_bufferMode_e)value; + return CCtxParams->inBufferMode; + + case ZSTD_c_stableOutBuffer: + BOUNDCHECK(ZSTD_c_stableOutBuffer, value); + CCtxParams->outBufferMode = (ZSTD_bufferMode_e)value; + return CCtxParams->outBufferMode; + + case ZSTD_c_blockDelimiters: + BOUNDCHECK(ZSTD_c_blockDelimiters, value); + CCtxParams->blockDelimiters = (ZSTD_sequenceFormat_e)value; + return CCtxParams->blockDelimiters; + + case ZSTD_c_validateSequences: + BOUNDCHECK(ZSTD_c_validateSequences, value); + CCtxParams->validateSequences = value; + return (size_t)CCtxParams->validateSequences; + + case ZSTD_c_useBlockSplitter: + BOUNDCHECK(ZSTD_c_useBlockSplitter, value); + CCtxParams->useBlockSplitter = (ZSTD_paramSwitch_e)value; + return CCtxParams->useBlockSplitter; + + case ZSTD_c_useRowMatchFinder: + BOUNDCHECK(ZSTD_c_useRowMatchFinder, value); + CCtxParams->useRowMatchFinder = (ZSTD_paramSwitch_e)value; + return CCtxParams->useRowMatchFinder; + + case ZSTD_c_deterministicRefPrefix: + BOUNDCHECK(ZSTD_c_deterministicRefPrefix, value); + CCtxParams->deterministicRefPrefix = !!value; + return (size_t)CCtxParams->deterministicRefPrefix; + + case ZSTD_c_prefetchCDictTables: + BOUNDCHECK(ZSTD_c_prefetchCDictTables, value); + CCtxParams->prefetchCDictTables = (ZSTD_paramSwitch_e)value; + return CCtxParams->prefetchCDictTables; + + case ZSTD_c_enableSeqProducerFallback: + BOUNDCHECK(ZSTD_c_enableSeqProducerFallback, value); + CCtxParams->enableMatchFinderFallback = value; + return (size_t)CCtxParams->enableMatchFinderFallback; + + case ZSTD_c_maxBlockSize: + if (value!=0) /* 0 ==> default */ + BOUNDCHECK(ZSTD_c_maxBlockSize, value); + CCtxParams->maxBlockSize = value; + return CCtxParams->maxBlockSize; + + case ZSTD_c_searchForExternalRepcodes: + BOUNDCHECK(ZSTD_c_searchForExternalRepcodes, value); + CCtxParams->searchForExternalRepcodes = (ZSTD_paramSwitch_e)value; + return CCtxParams->searchForExternalRepcodes; + + default: RETURN_ERROR(parameter_unsupported, "unknown parameter"); + } +} + +size_t ZSTD_CCtx_getParameter(ZSTD_CCtx const* cctx, ZSTD_cParameter param, int* value) +{ + return ZSTD_CCtxParams_getParameter(&cctx->requestedParams, param, value); +} + +size_t ZSTD_CCtxParams_getParameter( + ZSTD_CCtx_params const* CCtxParams, ZSTD_cParameter param, int* value) +{ + switch(param) + { + case ZSTD_c_format : + *value = CCtxParams->format; + break; + case ZSTD_c_compressionLevel : + *value = CCtxParams->compressionLevel; + break; + case ZSTD_c_windowLog : + *value = (int)CCtxParams->cParams.windowLog; + break; + case ZSTD_c_hashLog : + *value = (int)CCtxParams->cParams.hashLog; + break; + case ZSTD_c_chainLog : + *value = (int)CCtxParams->cParams.chainLog; + break; + case ZSTD_c_searchLog : + *value = CCtxParams->cParams.searchLog; + break; + case ZSTD_c_minMatch : + *value = CCtxParams->cParams.minMatch; + break; + case ZSTD_c_targetLength : + *value = CCtxParams->cParams.targetLength; + break; + case ZSTD_c_strategy : + *value = (unsigned)CCtxParams->cParams.strategy; + break; + case ZSTD_c_contentSizeFlag : + *value = CCtxParams->fParams.contentSizeFlag; + break; + case ZSTD_c_checksumFlag : + *value = CCtxParams->fParams.checksumFlag; + break; + case ZSTD_c_dictIDFlag : + *value = !CCtxParams->fParams.noDictIDFlag; + break; + case ZSTD_c_forceMaxWindow : + *value = CCtxParams->forceWindow; + break; + case ZSTD_c_forceAttachDict : + *value = CCtxParams->attachDictPref; + break; + case ZSTD_c_literalCompressionMode : + *value = CCtxParams->literalCompressionMode; + break; + case ZSTD_c_nbWorkers : +#ifndef ZSTD_MULTITHREAD + assert(CCtxParams->nbWorkers == 0); +#endif + *value = CCtxParams->nbWorkers; + break; + case ZSTD_c_jobSize : +#ifndef ZSTD_MULTITHREAD + RETURN_ERROR(parameter_unsupported, "not compiled with multithreading"); +#else + assert(CCtxParams->jobSize <= INT_MAX); + *value = (int)CCtxParams->jobSize; + break; +#endif + case ZSTD_c_overlapLog : +#ifndef ZSTD_MULTITHREAD + RETURN_ERROR(parameter_unsupported, "not compiled with multithreading"); +#else + *value = CCtxParams->overlapLog; + break; +#endif + case ZSTD_c_rsyncable : +#ifndef ZSTD_MULTITHREAD + RETURN_ERROR(parameter_unsupported, "not compiled with multithreading"); +#else + *value = CCtxParams->rsyncable; + break; +#endif + case ZSTD_c_enableDedicatedDictSearch : + *value = CCtxParams->enableDedicatedDictSearch; + break; + case ZSTD_c_enableLongDistanceMatching : + *value = CCtxParams->ldmParams.enableLdm; + break; + case ZSTD_c_ldmHashLog : + *value = CCtxParams->ldmParams.hashLog; + break; + case ZSTD_c_ldmMinMatch : + *value = CCtxParams->ldmParams.minMatchLength; + break; + case ZSTD_c_ldmBucketSizeLog : + *value = CCtxParams->ldmParams.bucketSizeLog; + break; + case ZSTD_c_ldmHashRateLog : + *value = CCtxParams->ldmParams.hashRateLog; + break; + case ZSTD_c_targetCBlockSize : + *value = (int)CCtxParams->targetCBlockSize; + break; + case ZSTD_c_srcSizeHint : + *value = (int)CCtxParams->srcSizeHint; + break; + case ZSTD_c_stableInBuffer : + *value = (int)CCtxParams->inBufferMode; + break; + case ZSTD_c_stableOutBuffer : + *value = (int)CCtxParams->outBufferMode; + break; + case ZSTD_c_blockDelimiters : + *value = (int)CCtxParams->blockDelimiters; + break; + case ZSTD_c_validateSequences : + *value = (int)CCtxParams->validateSequences; + break; + case ZSTD_c_useBlockSplitter : + *value = (int)CCtxParams->useBlockSplitter; + break; + case ZSTD_c_useRowMatchFinder : + *value = (int)CCtxParams->useRowMatchFinder; + break; + case ZSTD_c_deterministicRefPrefix: + *value = (int)CCtxParams->deterministicRefPrefix; + break; + case ZSTD_c_prefetchCDictTables: + *value = (int)CCtxParams->prefetchCDictTables; + break; + case ZSTD_c_enableSeqProducerFallback: + *value = CCtxParams->enableMatchFinderFallback; + break; + case ZSTD_c_maxBlockSize: + *value = (int)CCtxParams->maxBlockSize; + break; + case ZSTD_c_searchForExternalRepcodes: + *value = (int)CCtxParams->searchForExternalRepcodes; + break; + default: RETURN_ERROR(parameter_unsupported, "unknown parameter"); + } + return 0; +} + +/** ZSTD_CCtx_setParametersUsingCCtxParams() : + * just applies `params` into `cctx` + * no action is performed, parameters are merely stored. + * If ZSTDMT is enabled, parameters are pushed to cctx->mtctx. + * This is possible even if a compression is ongoing. + * In which case, new parameters will be applied on the fly, starting with next compression job. + */ +size_t ZSTD_CCtx_setParametersUsingCCtxParams( + ZSTD_CCtx* cctx, const ZSTD_CCtx_params* params) +{ + DEBUGLOG(4, "ZSTD_CCtx_setParametersUsingCCtxParams"); + RETURN_ERROR_IF(cctx->streamStage != zcss_init, stage_wrong, + "The context is in the wrong stage!"); + RETURN_ERROR_IF(cctx->cdict, stage_wrong, + "Can't override parameters with cdict attached (some must " + "be inherited from the cdict)."); + + cctx->requestedParams = *params; + return 0; +} + +size_t ZSTD_CCtx_setCParams(ZSTD_CCtx* cctx, ZSTD_compressionParameters cparams) +{ + ZSTD_STATIC_ASSERT(sizeof(cparams) == 7 * 4 /* all params are listed below */); + DEBUGLOG(4, "ZSTD_CCtx_setCParams"); + /* only update if all parameters are valid */ + FORWARD_IF_ERROR(ZSTD_checkCParams(cparams), ""); + FORWARD_IF_ERROR(ZSTD_CCtx_setParameter(cctx, ZSTD_c_windowLog, cparams.windowLog), ""); + FORWARD_IF_ERROR(ZSTD_CCtx_setParameter(cctx, ZSTD_c_chainLog, cparams.chainLog), ""); + FORWARD_IF_ERROR(ZSTD_CCtx_setParameter(cctx, ZSTD_c_hashLog, cparams.hashLog), ""); + FORWARD_IF_ERROR(ZSTD_CCtx_setParameter(cctx, ZSTD_c_searchLog, cparams.searchLog), ""); + FORWARD_IF_ERROR(ZSTD_CCtx_setParameter(cctx, ZSTD_c_minMatch, cparams.minMatch), ""); + FORWARD_IF_ERROR(ZSTD_CCtx_setParameter(cctx, ZSTD_c_targetLength, cparams.targetLength), ""); + FORWARD_IF_ERROR(ZSTD_CCtx_setParameter(cctx, ZSTD_c_strategy, cparams.strategy), ""); + return 0; +} + +size_t ZSTD_CCtx_setFParams(ZSTD_CCtx* cctx, ZSTD_frameParameters fparams) +{ + ZSTD_STATIC_ASSERT(sizeof(fparams) == 3 * 4 /* all params are listed below */); + DEBUGLOG(4, "ZSTD_CCtx_setFParams"); + FORWARD_IF_ERROR(ZSTD_CCtx_setParameter(cctx, ZSTD_c_contentSizeFlag, fparams.contentSizeFlag != 0), ""); + FORWARD_IF_ERROR(ZSTD_CCtx_setParameter(cctx, ZSTD_c_checksumFlag, fparams.checksumFlag != 0), ""); + FORWARD_IF_ERROR(ZSTD_CCtx_setParameter(cctx, ZSTD_c_dictIDFlag, fparams.noDictIDFlag == 0), ""); + return 0; +} + +size_t ZSTD_CCtx_setParams(ZSTD_CCtx* cctx, ZSTD_parameters params) +{ + DEBUGLOG(4, "ZSTD_CCtx_setParams"); + /* First check cParams, because we want to update all or none. */ + FORWARD_IF_ERROR(ZSTD_checkCParams(params.cParams), ""); + /* Next set fParams, because this could fail if the cctx isn't in init stage. */ + FORWARD_IF_ERROR(ZSTD_CCtx_setFParams(cctx, params.fParams), ""); + /* Finally set cParams, which should succeed. */ + FORWARD_IF_ERROR(ZSTD_CCtx_setCParams(cctx, params.cParams), ""); + return 0; +} + +size_t ZSTD_CCtx_setPledgedSrcSize(ZSTD_CCtx* cctx, unsigned long long pledgedSrcSize) +{ + DEBUGLOG(4, "ZSTD_CCtx_setPledgedSrcSize to %llu bytes", pledgedSrcSize); + RETURN_ERROR_IF(cctx->streamStage != zcss_init, stage_wrong, + "Can't set pledgedSrcSize when not in init stage."); + cctx->pledgedSrcSizePlusOne = pledgedSrcSize+1; + return 0; +} + +static ZSTD_compressionParameters ZSTD_dedicatedDictSearch_getCParams( + int const compressionLevel, + size_t const dictSize); +static int ZSTD_dedicatedDictSearch_isSupported( + const ZSTD_compressionParameters* cParams); +static void ZSTD_dedicatedDictSearch_revertCParams( + ZSTD_compressionParameters* cParams); + +/** + * Initializes the local dictionary using requested parameters. + * NOTE: Initialization does not employ the pledged src size, + * because the dictionary may be used for multiple compressions. + */ +static size_t ZSTD_initLocalDict(ZSTD_CCtx* cctx) +{ + ZSTD_localDict* const dl = &cctx->localDict; + if (dl->dict == NULL) { + /* No local dictionary. */ + assert(dl->dictBuffer == NULL); + assert(dl->cdict == NULL); + assert(dl->dictSize == 0); + return 0; + } + if (dl->cdict != NULL) { + /* Local dictionary already initialized. */ + assert(cctx->cdict == dl->cdict); + return 0; + } + assert(dl->dictSize > 0); + assert(cctx->cdict == NULL); + assert(cctx->prefixDict.dict == NULL); + + dl->cdict = ZSTD_createCDict_advanced2( + dl->dict, + dl->dictSize, + ZSTD_dlm_byRef, + dl->dictContentType, + &cctx->requestedParams, + cctx->customMem); + RETURN_ERROR_IF(!dl->cdict, memory_allocation, "ZSTD_createCDict_advanced failed"); + cctx->cdict = dl->cdict; + return 0; +} + +size_t ZSTD_CCtx_loadDictionary_advanced( + ZSTD_CCtx* cctx, + const void* dict, size_t dictSize, + ZSTD_dictLoadMethod_e dictLoadMethod, + ZSTD_dictContentType_e dictContentType) +{ + DEBUGLOG(4, "ZSTD_CCtx_loadDictionary_advanced (size: %u)", (U32)dictSize); + RETURN_ERROR_IF(cctx->streamStage != zcss_init, stage_wrong, + "Can't load a dictionary when cctx is not in init stage."); + ZSTD_clearAllDicts(cctx); /* erase any previously set dictionary */ + if (dict == NULL || dictSize == 0) /* no dictionary */ + return 0; + if (dictLoadMethod == ZSTD_dlm_byRef) { + cctx->localDict.dict = dict; + } else { + /* copy dictionary content inside CCtx to own its lifetime */ + void* dictBuffer; + RETURN_ERROR_IF(cctx->staticSize, memory_allocation, + "static CCtx can't allocate for an internal copy of dictionary"); + dictBuffer = ZSTD_customMalloc(dictSize, cctx->customMem); + RETURN_ERROR_IF(dictBuffer==NULL, memory_allocation, + "allocation failed for dictionary content"); + ZSTD_memcpy(dictBuffer, dict, dictSize); + cctx->localDict.dictBuffer = dictBuffer; /* owned ptr to free */ + cctx->localDict.dict = dictBuffer; /* read-only reference */ + } + cctx->localDict.dictSize = dictSize; + cctx->localDict.dictContentType = dictContentType; + return 0; +} + +size_t ZSTD_CCtx_loadDictionary_byReference( + ZSTD_CCtx* cctx, const void* dict, size_t dictSize) +{ + return ZSTD_CCtx_loadDictionary_advanced( + cctx, dict, dictSize, ZSTD_dlm_byRef, ZSTD_dct_auto); +} + +size_t ZSTD_CCtx_loadDictionary(ZSTD_CCtx* cctx, const void* dict, size_t dictSize) +{ + return ZSTD_CCtx_loadDictionary_advanced( + cctx, dict, dictSize, ZSTD_dlm_byCopy, ZSTD_dct_auto); +} + + +size_t ZSTD_CCtx_refCDict(ZSTD_CCtx* cctx, const ZSTD_CDict* cdict) +{ + RETURN_ERROR_IF(cctx->streamStage != zcss_init, stage_wrong, + "Can't ref a dict when ctx not in init stage."); + /* Free the existing local cdict (if any) to save memory. */ + ZSTD_clearAllDicts(cctx); + cctx->cdict = cdict; + return 0; +} + +size_t ZSTD_CCtx_refThreadPool(ZSTD_CCtx* cctx, ZSTD_threadPool* pool) +{ + RETURN_ERROR_IF(cctx->streamStage != zcss_init, stage_wrong, + "Can't ref a pool when ctx not in init stage."); + cctx->pool = pool; + return 0; +} + +size_t ZSTD_CCtx_refPrefix(ZSTD_CCtx* cctx, const void* prefix, size_t prefixSize) +{ + return ZSTD_CCtx_refPrefix_advanced(cctx, prefix, prefixSize, ZSTD_dct_rawContent); +} + +size_t ZSTD_CCtx_refPrefix_advanced( + ZSTD_CCtx* cctx, const void* prefix, size_t prefixSize, ZSTD_dictContentType_e dictContentType) +{ + RETURN_ERROR_IF(cctx->streamStage != zcss_init, stage_wrong, + "Can't ref a prefix when ctx not in init stage."); + ZSTD_clearAllDicts(cctx); + if (prefix != NULL && prefixSize > 0) { + cctx->prefixDict.dict = prefix; + cctx->prefixDict.dictSize = prefixSize; + cctx->prefixDict.dictContentType = dictContentType; + } + return 0; +} + +/*! ZSTD_CCtx_reset() : + * Also dumps dictionary */ +size_t ZSTD_CCtx_reset(ZSTD_CCtx* cctx, ZSTD_ResetDirective reset) +{ + if ( (reset == ZSTD_reset_session_only) + || (reset == ZSTD_reset_session_and_parameters) ) { + cctx->streamStage = zcss_init; + cctx->pledgedSrcSizePlusOne = 0; + } + if ( (reset == ZSTD_reset_parameters) + || (reset == ZSTD_reset_session_and_parameters) ) { + RETURN_ERROR_IF(cctx->streamStage != zcss_init, stage_wrong, + "Reset parameters is only possible during init stage."); + ZSTD_clearAllDicts(cctx); + return ZSTD_CCtxParams_reset(&cctx->requestedParams); + } + return 0; +} + + +/** ZSTD_checkCParams() : + control CParam values remain within authorized range. + @return : 0, or an error code if one value is beyond authorized range */ +size_t ZSTD_checkCParams(ZSTD_compressionParameters cParams) +{ + BOUNDCHECK(ZSTD_c_windowLog, (int)cParams.windowLog); + BOUNDCHECK(ZSTD_c_chainLog, (int)cParams.chainLog); + BOUNDCHECK(ZSTD_c_hashLog, (int)cParams.hashLog); + BOUNDCHECK(ZSTD_c_searchLog, (int)cParams.searchLog); + BOUNDCHECK(ZSTD_c_minMatch, (int)cParams.minMatch); + BOUNDCHECK(ZSTD_c_targetLength,(int)cParams.targetLength); + BOUNDCHECK(ZSTD_c_strategy, cParams.strategy); + return 0; +} + +/** ZSTD_clampCParams() : + * make CParam values within valid range. + * @return : valid CParams */ +static ZSTD_compressionParameters +ZSTD_clampCParams(ZSTD_compressionParameters cParams) +{ +# define CLAMP_TYPE(cParam, val, type) \ + do { \ + ZSTD_bounds const bounds = ZSTD_cParam_getBounds(cParam); \ + if ((int)valbounds.upperBound) val=(type)bounds.upperBound; \ + } while (0) +# define CLAMP(cParam, val) CLAMP_TYPE(cParam, val, unsigned) + CLAMP(ZSTD_c_windowLog, cParams.windowLog); + CLAMP(ZSTD_c_chainLog, cParams.chainLog); + CLAMP(ZSTD_c_hashLog, cParams.hashLog); + CLAMP(ZSTD_c_searchLog, cParams.searchLog); + CLAMP(ZSTD_c_minMatch, cParams.minMatch); + CLAMP(ZSTD_c_targetLength,cParams.targetLength); + CLAMP_TYPE(ZSTD_c_strategy,cParams.strategy, ZSTD_strategy); + return cParams; +} + +/** ZSTD_cycleLog() : + * condition for correct operation : hashLog > 1 */ +U32 ZSTD_cycleLog(U32 hashLog, ZSTD_strategy strat) +{ + U32 const btScale = ((U32)strat >= (U32)ZSTD_btlazy2); + return hashLog - btScale; +} + +/** ZSTD_dictAndWindowLog() : + * Returns an adjusted window log that is large enough to fit the source and the dictionary. + * The zstd format says that the entire dictionary is valid if one byte of the dictionary + * is within the window. So the hashLog and chainLog should be large enough to reference both + * the dictionary and the window. So we must use this adjusted dictAndWindowLog when downsizing + * the hashLog and windowLog. + * NOTE: srcSize must not be ZSTD_CONTENTSIZE_UNKNOWN. + */ +static U32 ZSTD_dictAndWindowLog(U32 windowLog, U64 srcSize, U64 dictSize) +{ + const U64 maxWindowSize = 1ULL << ZSTD_WINDOWLOG_MAX; + /* No dictionary ==> No change */ + if (dictSize == 0) { + return windowLog; + } + assert(windowLog <= ZSTD_WINDOWLOG_MAX); + assert(srcSize != ZSTD_CONTENTSIZE_UNKNOWN); /* Handled in ZSTD_adjustCParams_internal() */ + { + U64 const windowSize = 1ULL << windowLog; + U64 const dictAndWindowSize = dictSize + windowSize; + /* If the window size is already large enough to fit both the source and the dictionary + * then just use the window size. Otherwise adjust so that it fits the dictionary and + * the window. + */ + if (windowSize >= dictSize + srcSize) { + return windowLog; /* Window size large enough already */ + } else if (dictAndWindowSize >= maxWindowSize) { + return ZSTD_WINDOWLOG_MAX; /* Larger than max window log */ + } else { + return ZSTD_highbit32((U32)dictAndWindowSize - 1) + 1; + } + } +} + +/** ZSTD_adjustCParams_internal() : + * optimize `cPar` for a specified input (`srcSize` and `dictSize`). + * mostly downsize to reduce memory consumption and initialization latency. + * `srcSize` can be ZSTD_CONTENTSIZE_UNKNOWN when not known. + * `mode` is the mode for parameter adjustment. See docs for `ZSTD_cParamMode_e`. + * note : `srcSize==0` means 0! + * condition : cPar is presumed validated (can be checked using ZSTD_checkCParams()). */ +static ZSTD_compressionParameters +ZSTD_adjustCParams_internal(ZSTD_compressionParameters cPar, + unsigned long long srcSize, + size_t dictSize, + ZSTD_cParamMode_e mode, + ZSTD_paramSwitch_e useRowMatchFinder) +{ + const U64 minSrcSize = 513; /* (1<<9) + 1 */ + const U64 maxWindowResize = 1ULL << (ZSTD_WINDOWLOG_MAX-1); + assert(ZSTD_checkCParams(cPar)==0); + + /* Cascade the selected strategy down to the next-highest one built into + * this binary. */ +#ifdef ZSTD_EXCLUDE_BTULTRA_BLOCK_COMPRESSOR + if (cPar.strategy == ZSTD_btultra2) { + cPar.strategy = ZSTD_btultra; + } + if (cPar.strategy == ZSTD_btultra) { + cPar.strategy = ZSTD_btopt; + } +#endif +#ifdef ZSTD_EXCLUDE_BTOPT_BLOCK_COMPRESSOR + if (cPar.strategy == ZSTD_btopt) { + cPar.strategy = ZSTD_btlazy2; + } +#endif +#ifdef ZSTD_EXCLUDE_BTLAZY2_BLOCK_COMPRESSOR + if (cPar.strategy == ZSTD_btlazy2) { + cPar.strategy = ZSTD_lazy2; + } +#endif +#ifdef ZSTD_EXCLUDE_LAZY2_BLOCK_COMPRESSOR + if (cPar.strategy == ZSTD_lazy2) { + cPar.strategy = ZSTD_lazy; + } +#endif +#ifdef ZSTD_EXCLUDE_LAZY_BLOCK_COMPRESSOR + if (cPar.strategy == ZSTD_lazy) { + cPar.strategy = ZSTD_greedy; + } +#endif +#ifdef ZSTD_EXCLUDE_GREEDY_BLOCK_COMPRESSOR + if (cPar.strategy == ZSTD_greedy) { + cPar.strategy = ZSTD_dfast; + } +#endif +#ifdef ZSTD_EXCLUDE_DFAST_BLOCK_COMPRESSOR + if (cPar.strategy == ZSTD_dfast) { + cPar.strategy = ZSTD_fast; + cPar.targetLength = 0; + } +#endif + + switch (mode) { + case ZSTD_cpm_unknown: + case ZSTD_cpm_noAttachDict: + /* If we don't know the source size, don't make any + * assumptions about it. We will already have selected + * smaller parameters if a dictionary is in use. + */ + break; + case ZSTD_cpm_createCDict: + /* Assume a small source size when creating a dictionary + * with an unknown source size. + */ + if (dictSize && srcSize == ZSTD_CONTENTSIZE_UNKNOWN) + srcSize = minSrcSize; + break; + case ZSTD_cpm_attachDict: + /* Dictionary has its own dedicated parameters which have + * already been selected. We are selecting parameters + * for only the source. + */ + dictSize = 0; + break; + default: + assert(0); + break; + } + + /* resize windowLog if input is small enough, to use less memory */ + if ( (srcSize <= maxWindowResize) + && (dictSize <= maxWindowResize) ) { + U32 const tSize = (U32)(srcSize + dictSize); + static U32 const hashSizeMin = 1 << ZSTD_HASHLOG_MIN; + U32 const srcLog = (tSize < hashSizeMin) ? ZSTD_HASHLOG_MIN : + ZSTD_highbit32(tSize-1) + 1; + if (cPar.windowLog > srcLog) cPar.windowLog = srcLog; + } + if (srcSize != ZSTD_CONTENTSIZE_UNKNOWN) { + U32 const dictAndWindowLog = ZSTD_dictAndWindowLog(cPar.windowLog, (U64)srcSize, (U64)dictSize); + U32 const cycleLog = ZSTD_cycleLog(cPar.chainLog, cPar.strategy); + if (cPar.hashLog > dictAndWindowLog+1) cPar.hashLog = dictAndWindowLog+1; + if (cycleLog > dictAndWindowLog) + cPar.chainLog -= (cycleLog - dictAndWindowLog); + } + + if (cPar.windowLog < ZSTD_WINDOWLOG_ABSOLUTEMIN) + cPar.windowLog = ZSTD_WINDOWLOG_ABSOLUTEMIN; /* minimum wlog required for valid frame header */ + + /* We can't use more than 32 bits of hash in total, so that means that we require: + * (hashLog + 8) <= 32 && (chainLog + 8) <= 32 + */ + if (mode == ZSTD_cpm_createCDict && ZSTD_CDictIndicesAreTagged(&cPar)) { + U32 const maxShortCacheHashLog = 32 - ZSTD_SHORT_CACHE_TAG_BITS; + if (cPar.hashLog > maxShortCacheHashLog) { + cPar.hashLog = maxShortCacheHashLog; + } + if (cPar.chainLog > maxShortCacheHashLog) { + cPar.chainLog = maxShortCacheHashLog; + } + } + + + /* At this point, we aren't 100% sure if we are using the row match finder. + * Unless it is explicitly disabled, conservatively assume that it is enabled. + * In this case it will only be disabled for small sources, so shrinking the + * hash log a little bit shouldn't result in any ratio loss. + */ + if (useRowMatchFinder == ZSTD_ps_auto) + useRowMatchFinder = ZSTD_ps_enable; + + /* We can't hash more than 32-bits in total. So that means that we require: + * (hashLog - rowLog + 8) <= 32 + */ + if (ZSTD_rowMatchFinderUsed(cPar.strategy, useRowMatchFinder)) { + /* Switch to 32-entry rows if searchLog is 5 (or more) */ + U32 const rowLog = BOUNDED(4, cPar.searchLog, 6); + U32 const maxRowHashLog = 32 - ZSTD_ROW_HASH_TAG_BITS; + U32 const maxHashLog = maxRowHashLog + rowLog; + assert(cPar.hashLog >= rowLog); + if (cPar.hashLog > maxHashLog) { + cPar.hashLog = maxHashLog; + } + } + + return cPar; +} + +ZSTD_compressionParameters +ZSTD_adjustCParams(ZSTD_compressionParameters cPar, + unsigned long long srcSize, + size_t dictSize) +{ + cPar = ZSTD_clampCParams(cPar); /* resulting cPar is necessarily valid (all parameters within range) */ + if (srcSize == 0) srcSize = ZSTD_CONTENTSIZE_UNKNOWN; + return ZSTD_adjustCParams_internal(cPar, srcSize, dictSize, ZSTD_cpm_unknown, ZSTD_ps_auto); +} + +static ZSTD_compressionParameters ZSTD_getCParams_internal(int compressionLevel, unsigned long long srcSizeHint, size_t dictSize, ZSTD_cParamMode_e mode); +static ZSTD_parameters ZSTD_getParams_internal(int compressionLevel, unsigned long long srcSizeHint, size_t dictSize, ZSTD_cParamMode_e mode); + +static void ZSTD_overrideCParams( + ZSTD_compressionParameters* cParams, + const ZSTD_compressionParameters* overrides) +{ + if (overrides->windowLog) cParams->windowLog = overrides->windowLog; + if (overrides->hashLog) cParams->hashLog = overrides->hashLog; + if (overrides->chainLog) cParams->chainLog = overrides->chainLog; + if (overrides->searchLog) cParams->searchLog = overrides->searchLog; + if (overrides->minMatch) cParams->minMatch = overrides->minMatch; + if (overrides->targetLength) cParams->targetLength = overrides->targetLength; + if (overrides->strategy) cParams->strategy = overrides->strategy; +} + +ZSTD_compressionParameters ZSTD_getCParamsFromCCtxParams( + const ZSTD_CCtx_params* CCtxParams, U64 srcSizeHint, size_t dictSize, ZSTD_cParamMode_e mode) +{ + ZSTD_compressionParameters cParams; + if (srcSizeHint == ZSTD_CONTENTSIZE_UNKNOWN && CCtxParams->srcSizeHint > 0) { + srcSizeHint = CCtxParams->srcSizeHint; + } + cParams = ZSTD_getCParams_internal(CCtxParams->compressionLevel, srcSizeHint, dictSize, mode); + if (CCtxParams->ldmParams.enableLdm == ZSTD_ps_enable) cParams.windowLog = ZSTD_LDM_DEFAULT_WINDOW_LOG; + ZSTD_overrideCParams(&cParams, &CCtxParams->cParams); + assert(!ZSTD_checkCParams(cParams)); + /* srcSizeHint == 0 means 0 */ + return ZSTD_adjustCParams_internal(cParams, srcSizeHint, dictSize, mode, CCtxParams->useRowMatchFinder); +} + +static size_t +ZSTD_sizeof_matchState(const ZSTD_compressionParameters* const cParams, + const ZSTD_paramSwitch_e useRowMatchFinder, + const U32 enableDedicatedDictSearch, + const U32 forCCtx) +{ + /* chain table size should be 0 for fast or row-hash strategies */ + size_t const chainSize = ZSTD_allocateChainTable(cParams->strategy, useRowMatchFinder, enableDedicatedDictSearch && !forCCtx) + ? ((size_t)1 << cParams->chainLog) + : 0; + size_t const hSize = ((size_t)1) << cParams->hashLog; + U32 const hashLog3 = (forCCtx && cParams->minMatch==3) ? MIN(ZSTD_HASHLOG3_MAX, cParams->windowLog) : 0; + size_t const h3Size = hashLog3 ? ((size_t)1) << hashLog3 : 0; + /* We don't use ZSTD_cwksp_alloc_size() here because the tables aren't + * surrounded by redzones in ASAN. */ + size_t const tableSpace = chainSize * sizeof(U32) + + hSize * sizeof(U32) + + h3Size * sizeof(U32); + size_t const optPotentialSpace = + ZSTD_cwksp_aligned_alloc_size((MaxML+1) * sizeof(U32)) + + ZSTD_cwksp_aligned_alloc_size((MaxLL+1) * sizeof(U32)) + + ZSTD_cwksp_aligned_alloc_size((MaxOff+1) * sizeof(U32)) + + ZSTD_cwksp_aligned_alloc_size((1<strategy, useRowMatchFinder) + ? ZSTD_cwksp_aligned_alloc_size(hSize) + : 0; + size_t const optSpace = (forCCtx && (cParams->strategy >= ZSTD_btopt)) + ? optPotentialSpace + : 0; + size_t const slackSpace = ZSTD_cwksp_slack_space_required(); + + /* tables are guaranteed to be sized in multiples of 64 bytes (or 16 uint32_t) */ + ZSTD_STATIC_ASSERT(ZSTD_HASHLOG_MIN >= 4 && ZSTD_WINDOWLOG_MIN >= 4 && ZSTD_CHAINLOG_MIN >= 4); + assert(useRowMatchFinder != ZSTD_ps_auto); + + DEBUGLOG(4, "chainSize: %u - hSize: %u - h3Size: %u", + (U32)chainSize, (U32)hSize, (U32)h3Size); + return tableSpace + optSpace + slackSpace + lazyAdditionalSpace; +} + +/* Helper function for calculating memory requirements. + * Gives a tighter bound than ZSTD_sequenceBound() by taking minMatch into account. */ +static size_t ZSTD_maxNbSeq(size_t blockSize, unsigned minMatch, int useSequenceProducer) { + U32 const divider = (minMatch==3 || useSequenceProducer) ? 3 : 4; + return blockSize / divider; +} + +static size_t ZSTD_estimateCCtxSize_usingCCtxParams_internal( + const ZSTD_compressionParameters* cParams, + const ldmParams_t* ldmParams, + const int isStatic, + const ZSTD_paramSwitch_e useRowMatchFinder, + const size_t buffInSize, + const size_t buffOutSize, + const U64 pledgedSrcSize, + int useSequenceProducer, + size_t maxBlockSize) +{ + size_t const windowSize = (size_t) BOUNDED(1ULL, 1ULL << cParams->windowLog, pledgedSrcSize); + size_t const blockSize = MIN(ZSTD_resolveMaxBlockSize(maxBlockSize), windowSize); + size_t const maxNbSeq = ZSTD_maxNbSeq(blockSize, cParams->minMatch, useSequenceProducer); + size_t const tokenSpace = ZSTD_cwksp_alloc_size(WILDCOPY_OVERLENGTH + blockSize) + + ZSTD_cwksp_aligned_alloc_size(maxNbSeq * sizeof(seqDef)) + + 3 * ZSTD_cwksp_alloc_size(maxNbSeq * sizeof(BYTE)); + size_t const entropySpace = ZSTD_cwksp_alloc_size(ENTROPY_WORKSPACE_SIZE); + size_t const blockStateSpace = 2 * ZSTD_cwksp_alloc_size(sizeof(ZSTD_compressedBlockState_t)); + size_t const matchStateSize = ZSTD_sizeof_matchState(cParams, useRowMatchFinder, /* enableDedicatedDictSearch */ 0, /* forCCtx */ 1); + + size_t const ldmSpace = ZSTD_ldm_getTableSize(*ldmParams); + size_t const maxNbLdmSeq = ZSTD_ldm_getMaxNbSeq(*ldmParams, blockSize); + size_t const ldmSeqSpace = ldmParams->enableLdm == ZSTD_ps_enable ? + ZSTD_cwksp_aligned_alloc_size(maxNbLdmSeq * sizeof(rawSeq)) : 0; + + + size_t const bufferSpace = ZSTD_cwksp_alloc_size(buffInSize) + + ZSTD_cwksp_alloc_size(buffOutSize); + + size_t const cctxSpace = isStatic ? ZSTD_cwksp_alloc_size(sizeof(ZSTD_CCtx)) : 0; + + size_t const maxNbExternalSeq = ZSTD_sequenceBound(blockSize); + size_t const externalSeqSpace = useSequenceProducer + ? ZSTD_cwksp_aligned_alloc_size(maxNbExternalSeq * sizeof(ZSTD_Sequence)) + : 0; + + size_t const neededSpace = + cctxSpace + + entropySpace + + blockStateSpace + + ldmSpace + + ldmSeqSpace + + matchStateSize + + tokenSpace + + bufferSpace + + externalSeqSpace; + + DEBUGLOG(5, "estimate workspace : %u", (U32)neededSpace); + return neededSpace; +} + +size_t ZSTD_estimateCCtxSize_usingCCtxParams(const ZSTD_CCtx_params* params) +{ + ZSTD_compressionParameters const cParams = + ZSTD_getCParamsFromCCtxParams(params, ZSTD_CONTENTSIZE_UNKNOWN, 0, ZSTD_cpm_noAttachDict); + ZSTD_paramSwitch_e const useRowMatchFinder = ZSTD_resolveRowMatchFinderMode(params->useRowMatchFinder, + &cParams); + + RETURN_ERROR_IF(params->nbWorkers > 0, GENERIC, "Estimate CCtx size is supported for single-threaded compression only."); + /* estimateCCtxSize is for one-shot compression. So no buffers should + * be needed. However, we still allocate two 0-sized buffers, which can + * take space under ASAN. */ + return ZSTD_estimateCCtxSize_usingCCtxParams_internal( + &cParams, ¶ms->ldmParams, 1, useRowMatchFinder, 0, 0, ZSTD_CONTENTSIZE_UNKNOWN, ZSTD_hasExtSeqProd(params), params->maxBlockSize); +} + +size_t ZSTD_estimateCCtxSize_usingCParams(ZSTD_compressionParameters cParams) +{ + ZSTD_CCtx_params initialParams = ZSTD_makeCCtxParamsFromCParams(cParams); + if (ZSTD_rowMatchFinderSupported(cParams.strategy)) { + /* Pick bigger of not using and using row-based matchfinder for greedy and lazy strategies */ + size_t noRowCCtxSize; + size_t rowCCtxSize; + initialParams.useRowMatchFinder = ZSTD_ps_disable; + noRowCCtxSize = ZSTD_estimateCCtxSize_usingCCtxParams(&initialParams); + initialParams.useRowMatchFinder = ZSTD_ps_enable; + rowCCtxSize = ZSTD_estimateCCtxSize_usingCCtxParams(&initialParams); + return MAX(noRowCCtxSize, rowCCtxSize); + } else { + return ZSTD_estimateCCtxSize_usingCCtxParams(&initialParams); + } +} + +static size_t ZSTD_estimateCCtxSize_internal(int compressionLevel) +{ + int tier = 0; + size_t largestSize = 0; + static const unsigned long long srcSizeTiers[4] = {16 KB, 128 KB, 256 KB, ZSTD_CONTENTSIZE_UNKNOWN}; + for (; tier < 4; ++tier) { + /* Choose the set of cParams for a given level across all srcSizes that give the largest cctxSize */ + ZSTD_compressionParameters const cParams = ZSTD_getCParams_internal(compressionLevel, srcSizeTiers[tier], 0, ZSTD_cpm_noAttachDict); + largestSize = MAX(ZSTD_estimateCCtxSize_usingCParams(cParams), largestSize); + } + return largestSize; +} + +size_t ZSTD_estimateCCtxSize(int compressionLevel) +{ + int level; + size_t memBudget = 0; + for (level=MIN(compressionLevel, 1); level<=compressionLevel; level++) { + /* Ensure monotonically increasing memory usage as compression level increases */ + size_t const newMB = ZSTD_estimateCCtxSize_internal(level); + if (newMB > memBudget) memBudget = newMB; + } + return memBudget; +} + +size_t ZSTD_estimateCStreamSize_usingCCtxParams(const ZSTD_CCtx_params* params) +{ + RETURN_ERROR_IF(params->nbWorkers > 0, GENERIC, "Estimate CCtx size is supported for single-threaded compression only."); + { ZSTD_compressionParameters const cParams = + ZSTD_getCParamsFromCCtxParams(params, ZSTD_CONTENTSIZE_UNKNOWN, 0, ZSTD_cpm_noAttachDict); + size_t const blockSize = MIN(ZSTD_resolveMaxBlockSize(params->maxBlockSize), (size_t)1 << cParams.windowLog); + size_t const inBuffSize = (params->inBufferMode == ZSTD_bm_buffered) + ? ((size_t)1 << cParams.windowLog) + blockSize + : 0; + size_t const outBuffSize = (params->outBufferMode == ZSTD_bm_buffered) + ? ZSTD_compressBound(blockSize) + 1 + : 0; + ZSTD_paramSwitch_e const useRowMatchFinder = ZSTD_resolveRowMatchFinderMode(params->useRowMatchFinder, ¶ms->cParams); + + return ZSTD_estimateCCtxSize_usingCCtxParams_internal( + &cParams, ¶ms->ldmParams, 1, useRowMatchFinder, inBuffSize, outBuffSize, + ZSTD_CONTENTSIZE_UNKNOWN, ZSTD_hasExtSeqProd(params), params->maxBlockSize); + } +} + +size_t ZSTD_estimateCStreamSize_usingCParams(ZSTD_compressionParameters cParams) +{ + ZSTD_CCtx_params initialParams = ZSTD_makeCCtxParamsFromCParams(cParams); + if (ZSTD_rowMatchFinderSupported(cParams.strategy)) { + /* Pick bigger of not using and using row-based matchfinder for greedy and lazy strategies */ + size_t noRowCCtxSize; + size_t rowCCtxSize; + initialParams.useRowMatchFinder = ZSTD_ps_disable; + noRowCCtxSize = ZSTD_estimateCStreamSize_usingCCtxParams(&initialParams); + initialParams.useRowMatchFinder = ZSTD_ps_enable; + rowCCtxSize = ZSTD_estimateCStreamSize_usingCCtxParams(&initialParams); + return MAX(noRowCCtxSize, rowCCtxSize); + } else { + return ZSTD_estimateCStreamSize_usingCCtxParams(&initialParams); + } +} + +static size_t ZSTD_estimateCStreamSize_internal(int compressionLevel) +{ + ZSTD_compressionParameters const cParams = ZSTD_getCParams_internal(compressionLevel, ZSTD_CONTENTSIZE_UNKNOWN, 0, ZSTD_cpm_noAttachDict); + return ZSTD_estimateCStreamSize_usingCParams(cParams); +} + +size_t ZSTD_estimateCStreamSize(int compressionLevel) +{ + int level; + size_t memBudget = 0; + for (level=MIN(compressionLevel, 1); level<=compressionLevel; level++) { + size_t const newMB = ZSTD_estimateCStreamSize_internal(level); + if (newMB > memBudget) memBudget = newMB; + } + return memBudget; +} + +/* ZSTD_getFrameProgression(): + * tells how much data has been consumed (input) and produced (output) for current frame. + * able to count progression inside worker threads (non-blocking mode). + */ +ZSTD_frameProgression ZSTD_getFrameProgression(const ZSTD_CCtx* cctx) +{ +#ifdef ZSTD_MULTITHREAD + if (cctx->appliedParams.nbWorkers > 0) { + return ZSTDMT_getFrameProgression(cctx->mtctx); + } +#endif + { ZSTD_frameProgression fp; + size_t const buffered = (cctx->inBuff == NULL) ? 0 : + cctx->inBuffPos - cctx->inToCompress; + if (buffered) assert(cctx->inBuffPos >= cctx->inToCompress); + assert(buffered <= ZSTD_BLOCKSIZE_MAX); + fp.ingested = cctx->consumedSrcSize + buffered; + fp.consumed = cctx->consumedSrcSize; + fp.produced = cctx->producedCSize; + fp.flushed = cctx->producedCSize; /* simplified; some data might still be left within streaming output buffer */ + fp.currentJobID = 0; + fp.nbActiveWorkers = 0; + return fp; +} } + +/*! ZSTD_toFlushNow() + * Only useful for multithreading scenarios currently (nbWorkers >= 1). + */ +size_t ZSTD_toFlushNow(ZSTD_CCtx* cctx) +{ +#ifdef ZSTD_MULTITHREAD + if (cctx->appliedParams.nbWorkers > 0) { + return ZSTDMT_toFlushNow(cctx->mtctx); + } +#endif + (void)cctx; + return 0; /* over-simplification; could also check if context is currently running in streaming mode, and in which case, report how many bytes are left to be flushed within output buffer */ +} + +static void ZSTD_assertEqualCParams(ZSTD_compressionParameters cParams1, + ZSTD_compressionParameters cParams2) +{ + (void)cParams1; + (void)cParams2; + assert(cParams1.windowLog == cParams2.windowLog); + assert(cParams1.chainLog == cParams2.chainLog); + assert(cParams1.hashLog == cParams2.hashLog); + assert(cParams1.searchLog == cParams2.searchLog); + assert(cParams1.minMatch == cParams2.minMatch); + assert(cParams1.targetLength == cParams2.targetLength); + assert(cParams1.strategy == cParams2.strategy); +} + +void ZSTD_reset_compressedBlockState(ZSTD_compressedBlockState_t* bs) +{ + int i; + for (i = 0; i < ZSTD_REP_NUM; ++i) + bs->rep[i] = repStartValue[i]; + bs->entropy.huf.repeatMode = HUF_repeat_none; + bs->entropy.fse.offcode_repeatMode = FSE_repeat_none; + bs->entropy.fse.matchlength_repeatMode = FSE_repeat_none; + bs->entropy.fse.litlength_repeatMode = FSE_repeat_none; +} + +/*! ZSTD_invalidateMatchState() + * Invalidate all the matches in the match finder tables. + * Requires nextSrc and base to be set (can be NULL). + */ +static void ZSTD_invalidateMatchState(ZSTD_matchState_t* ms) +{ + ZSTD_window_clear(&ms->window); + + ms->nextToUpdate = ms->window.dictLimit; + ms->loadedDictEnd = 0; + ms->opt.litLengthSum = 0; /* force reset of btopt stats */ + ms->dictMatchState = NULL; +} + +/** + * Controls, for this matchState reset, whether the tables need to be cleared / + * prepared for the coming compression (ZSTDcrp_makeClean), or whether the + * tables can be left unclean (ZSTDcrp_leaveDirty), because we know that a + * subsequent operation will overwrite the table space anyways (e.g., copying + * the matchState contents in from a CDict). + */ +typedef enum { + ZSTDcrp_makeClean, + ZSTDcrp_leaveDirty +} ZSTD_compResetPolicy_e; + +/** + * Controls, for this matchState reset, whether indexing can continue where it + * left off (ZSTDirp_continue), or whether it needs to be restarted from zero + * (ZSTDirp_reset). + */ +typedef enum { + ZSTDirp_continue, + ZSTDirp_reset +} ZSTD_indexResetPolicy_e; + +typedef enum { + ZSTD_resetTarget_CDict, + ZSTD_resetTarget_CCtx +} ZSTD_resetTarget_e; + +/* Mixes bits in a 64 bits in a value, based on XXH3_rrmxmx */ +static U64 ZSTD_bitmix(U64 val, U64 len) { + val ^= ZSTD_rotateRight_U64(val, 49) ^ ZSTD_rotateRight_U64(val, 24); + val *= 0x9FB21C651E98DF25ULL; + val ^= (val >> 35) + len ; + val *= 0x9FB21C651E98DF25ULL; + return val ^ (val >> 28); +} + +/* Mixes in the hashSalt and hashSaltEntropy to create a new hashSalt */ +static void ZSTD_advanceHashSalt(ZSTD_matchState_t* ms) { + ms->hashSalt = ZSTD_bitmix(ms->hashSalt, 8) ^ ZSTD_bitmix((U64) ms->hashSaltEntropy, 4); +} + +static size_t +ZSTD_reset_matchState(ZSTD_matchState_t* ms, + ZSTD_cwksp* ws, + const ZSTD_compressionParameters* cParams, + const ZSTD_paramSwitch_e useRowMatchFinder, + const ZSTD_compResetPolicy_e crp, + const ZSTD_indexResetPolicy_e forceResetIndex, + const ZSTD_resetTarget_e forWho) +{ + /* disable chain table allocation for fast or row-based strategies */ + size_t const chainSize = ZSTD_allocateChainTable(cParams->strategy, useRowMatchFinder, + ms->dedicatedDictSearch && (forWho == ZSTD_resetTarget_CDict)) + ? ((size_t)1 << cParams->chainLog) + : 0; + size_t const hSize = ((size_t)1) << cParams->hashLog; + U32 const hashLog3 = ((forWho == ZSTD_resetTarget_CCtx) && cParams->minMatch==3) ? MIN(ZSTD_HASHLOG3_MAX, cParams->windowLog) : 0; + size_t const h3Size = hashLog3 ? ((size_t)1) << hashLog3 : 0; + + DEBUGLOG(4, "reset indices : %u", forceResetIndex == ZSTDirp_reset); + assert(useRowMatchFinder != ZSTD_ps_auto); + if (forceResetIndex == ZSTDirp_reset) { + ZSTD_window_init(&ms->window); + ZSTD_cwksp_mark_tables_dirty(ws); + } + + ms->hashLog3 = hashLog3; + ms->lazySkipping = 0; + + ZSTD_invalidateMatchState(ms); + + assert(!ZSTD_cwksp_reserve_failed(ws)); /* check that allocation hasn't already failed */ + + ZSTD_cwksp_clear_tables(ws); + + DEBUGLOG(5, "reserving table space"); + /* table Space */ + ms->hashTable = (U32*)ZSTD_cwksp_reserve_table(ws, hSize * sizeof(U32)); + ms->chainTable = (U32*)ZSTD_cwksp_reserve_table(ws, chainSize * sizeof(U32)); + ms->hashTable3 = (U32*)ZSTD_cwksp_reserve_table(ws, h3Size * sizeof(U32)); + RETURN_ERROR_IF(ZSTD_cwksp_reserve_failed(ws), memory_allocation, + "failed a workspace allocation in ZSTD_reset_matchState"); + + DEBUGLOG(4, "reset table : %u", crp!=ZSTDcrp_leaveDirty); + if (crp!=ZSTDcrp_leaveDirty) { + /* reset tables only */ + ZSTD_cwksp_clean_tables(ws); + } + + if (ZSTD_rowMatchFinderUsed(cParams->strategy, useRowMatchFinder)) { + /* Row match finder needs an additional table of hashes ("tags") */ + size_t const tagTableSize = hSize; + /* We want to generate a new salt in case we reset a Cctx, but we always want to use + * 0 when we reset a Cdict */ + if(forWho == ZSTD_resetTarget_CCtx) { + ms->tagTable = (BYTE*) ZSTD_cwksp_reserve_aligned_init_once(ws, tagTableSize); + ZSTD_advanceHashSalt(ms); + } else { + /* When we are not salting we want to always memset the memory */ + ms->tagTable = (BYTE*) ZSTD_cwksp_reserve_aligned(ws, tagTableSize); + ZSTD_memset(ms->tagTable, 0, tagTableSize); + ms->hashSalt = 0; + } + { /* Switch to 32-entry rows if searchLog is 5 (or more) */ + U32 const rowLog = BOUNDED(4, cParams->searchLog, 6); + assert(cParams->hashLog >= rowLog); + ms->rowHashLog = cParams->hashLog - rowLog; + } + } + + /* opt parser space */ + if ((forWho == ZSTD_resetTarget_CCtx) && (cParams->strategy >= ZSTD_btopt)) { + DEBUGLOG(4, "reserving optimal parser space"); + ms->opt.litFreq = (unsigned*)ZSTD_cwksp_reserve_aligned(ws, (1<opt.litLengthFreq = (unsigned*)ZSTD_cwksp_reserve_aligned(ws, (MaxLL+1) * sizeof(unsigned)); + ms->opt.matchLengthFreq = (unsigned*)ZSTD_cwksp_reserve_aligned(ws, (MaxML+1) * sizeof(unsigned)); + ms->opt.offCodeFreq = (unsigned*)ZSTD_cwksp_reserve_aligned(ws, (MaxOff+1) * sizeof(unsigned)); + ms->opt.matchTable = (ZSTD_match_t*)ZSTD_cwksp_reserve_aligned(ws, ZSTD_OPT_SIZE * sizeof(ZSTD_match_t)); + ms->opt.priceTable = (ZSTD_optimal_t*)ZSTD_cwksp_reserve_aligned(ws, ZSTD_OPT_SIZE * sizeof(ZSTD_optimal_t)); + } + + ms->cParams = *cParams; + + RETURN_ERROR_IF(ZSTD_cwksp_reserve_failed(ws), memory_allocation, + "failed a workspace allocation in ZSTD_reset_matchState"); + return 0; +} + +/* ZSTD_indexTooCloseToMax() : + * minor optimization : prefer memset() rather than reduceIndex() + * which is measurably slow in some circumstances (reported for Visual Studio). + * Works when re-using a context for a lot of smallish inputs : + * if all inputs are smaller than ZSTD_INDEXOVERFLOW_MARGIN, + * memset() will be triggered before reduceIndex(). + */ +#define ZSTD_INDEXOVERFLOW_MARGIN (16 MB) +static int ZSTD_indexTooCloseToMax(ZSTD_window_t w) +{ + return (size_t)(w.nextSrc - w.base) > (ZSTD_CURRENT_MAX - ZSTD_INDEXOVERFLOW_MARGIN); +} + +/** ZSTD_dictTooBig(): + * When dictionaries are larger than ZSTD_CHUNKSIZE_MAX they can't be loaded in + * one go generically. So we ensure that in that case we reset the tables to zero, + * so that we can load as much of the dictionary as possible. + */ +static int ZSTD_dictTooBig(size_t const loadedDictSize) +{ + return loadedDictSize > ZSTD_CHUNKSIZE_MAX; +} + +/*! ZSTD_resetCCtx_internal() : + * @param loadedDictSize The size of the dictionary to be loaded + * into the context, if any. If no dictionary is used, or the + * dictionary is being attached / copied, then pass 0. + * note : `params` are assumed fully validated at this stage. + */ +static size_t ZSTD_resetCCtx_internal(ZSTD_CCtx* zc, + ZSTD_CCtx_params const* params, + U64 const pledgedSrcSize, + size_t const loadedDictSize, + ZSTD_compResetPolicy_e const crp, + ZSTD_buffered_policy_e const zbuff) +{ + ZSTD_cwksp* const ws = &zc->workspace; + DEBUGLOG(4, "ZSTD_resetCCtx_internal: pledgedSrcSize=%u, wlog=%u, useRowMatchFinder=%d useBlockSplitter=%d", + (U32)pledgedSrcSize, params->cParams.windowLog, (int)params->useRowMatchFinder, (int)params->useBlockSplitter); + assert(!ZSTD_isError(ZSTD_checkCParams(params->cParams))); + + zc->isFirstBlock = 1; + + /* Set applied params early so we can modify them for LDM, + * and point params at the applied params. + */ + zc->appliedParams = *params; + params = &zc->appliedParams; + + assert(params->useRowMatchFinder != ZSTD_ps_auto); + assert(params->useBlockSplitter != ZSTD_ps_auto); + assert(params->ldmParams.enableLdm != ZSTD_ps_auto); + assert(params->maxBlockSize != 0); + if (params->ldmParams.enableLdm == ZSTD_ps_enable) { + /* Adjust long distance matching parameters */ + ZSTD_ldm_adjustParameters(&zc->appliedParams.ldmParams, ¶ms->cParams); + assert(params->ldmParams.hashLog >= params->ldmParams.bucketSizeLog); + assert(params->ldmParams.hashRateLog < 32); + } + + { size_t const windowSize = MAX(1, (size_t)MIN(((U64)1 << params->cParams.windowLog), pledgedSrcSize)); + size_t const blockSize = MIN(params->maxBlockSize, windowSize); + size_t const maxNbSeq = ZSTD_maxNbSeq(blockSize, params->cParams.minMatch, ZSTD_hasExtSeqProd(params)); + size_t const buffOutSize = (zbuff == ZSTDb_buffered && params->outBufferMode == ZSTD_bm_buffered) + ? ZSTD_compressBound(blockSize) + 1 + : 0; + size_t const buffInSize = (zbuff == ZSTDb_buffered && params->inBufferMode == ZSTD_bm_buffered) + ? windowSize + blockSize + : 0; + size_t const maxNbLdmSeq = ZSTD_ldm_getMaxNbSeq(params->ldmParams, blockSize); + + int const indexTooClose = ZSTD_indexTooCloseToMax(zc->blockState.matchState.window); + int const dictTooBig = ZSTD_dictTooBig(loadedDictSize); + ZSTD_indexResetPolicy_e needsIndexReset = + (indexTooClose || dictTooBig || !zc->initialized) ? ZSTDirp_reset : ZSTDirp_continue; + + size_t const neededSpace = + ZSTD_estimateCCtxSize_usingCCtxParams_internal( + ¶ms->cParams, ¶ms->ldmParams, zc->staticSize != 0, params->useRowMatchFinder, + buffInSize, buffOutSize, pledgedSrcSize, ZSTD_hasExtSeqProd(params), params->maxBlockSize); + + FORWARD_IF_ERROR(neededSpace, "cctx size estimate failed!"); + + if (!zc->staticSize) ZSTD_cwksp_bump_oversized_duration(ws, 0); + + { /* Check if workspace is large enough, alloc a new one if needed */ + int const workspaceTooSmall = ZSTD_cwksp_sizeof(ws) < neededSpace; + int const workspaceWasteful = ZSTD_cwksp_check_wasteful(ws, neededSpace); + int resizeWorkspace = workspaceTooSmall || workspaceWasteful; + DEBUGLOG(4, "Need %zu B workspace", neededSpace); + DEBUGLOG(4, "windowSize: %zu - blockSize: %zu", windowSize, blockSize); + + if (resizeWorkspace) { + DEBUGLOG(4, "Resize workspaceSize from %zuKB to %zuKB", + ZSTD_cwksp_sizeof(ws) >> 10, + neededSpace >> 10); + + RETURN_ERROR_IF(zc->staticSize, memory_allocation, "static cctx : no resize"); + + needsIndexReset = ZSTDirp_reset; + + ZSTD_cwksp_free(ws, zc->customMem); + FORWARD_IF_ERROR(ZSTD_cwksp_create(ws, neededSpace, zc->customMem), ""); + + DEBUGLOG(5, "reserving object space"); + /* Statically sized space. + * entropyWorkspace never moves, + * though prev/next block swap places */ + assert(ZSTD_cwksp_check_available(ws, 2 * sizeof(ZSTD_compressedBlockState_t))); + zc->blockState.prevCBlock = (ZSTD_compressedBlockState_t*) ZSTD_cwksp_reserve_object(ws, sizeof(ZSTD_compressedBlockState_t)); + RETURN_ERROR_IF(zc->blockState.prevCBlock == NULL, memory_allocation, "couldn't allocate prevCBlock"); + zc->blockState.nextCBlock = (ZSTD_compressedBlockState_t*) ZSTD_cwksp_reserve_object(ws, sizeof(ZSTD_compressedBlockState_t)); + RETURN_ERROR_IF(zc->blockState.nextCBlock == NULL, memory_allocation, "couldn't allocate nextCBlock"); + zc->entropyWorkspace = (U32*) ZSTD_cwksp_reserve_object(ws, ENTROPY_WORKSPACE_SIZE); + RETURN_ERROR_IF(zc->entropyWorkspace == NULL, memory_allocation, "couldn't allocate entropyWorkspace"); + } } + + ZSTD_cwksp_clear(ws); + + /* init params */ + zc->blockState.matchState.cParams = params->cParams; + zc->blockState.matchState.prefetchCDictTables = params->prefetchCDictTables == ZSTD_ps_enable; + zc->pledgedSrcSizePlusOne = pledgedSrcSize+1; + zc->consumedSrcSize = 0; + zc->producedCSize = 0; + if (pledgedSrcSize == ZSTD_CONTENTSIZE_UNKNOWN) + zc->appliedParams.fParams.contentSizeFlag = 0; + DEBUGLOG(4, "pledged content size : %u ; flag : %u", + (unsigned)pledgedSrcSize, zc->appliedParams.fParams.contentSizeFlag); + zc->blockSize = blockSize; + + XXH64_reset(&zc->xxhState, 0); + zc->stage = ZSTDcs_init; + zc->dictID = 0; + zc->dictContentSize = 0; + + ZSTD_reset_compressedBlockState(zc->blockState.prevCBlock); + + FORWARD_IF_ERROR(ZSTD_reset_matchState( + &zc->blockState.matchState, + ws, + ¶ms->cParams, + params->useRowMatchFinder, + crp, + needsIndexReset, + ZSTD_resetTarget_CCtx), ""); + + zc->seqStore.sequencesStart = (seqDef*)ZSTD_cwksp_reserve_aligned(ws, maxNbSeq * sizeof(seqDef)); + + /* ldm hash table */ + if (params->ldmParams.enableLdm == ZSTD_ps_enable) { + /* TODO: avoid memset? */ + size_t const ldmHSize = ((size_t)1) << params->ldmParams.hashLog; + zc->ldmState.hashTable = (ldmEntry_t*)ZSTD_cwksp_reserve_aligned(ws, ldmHSize * sizeof(ldmEntry_t)); + ZSTD_memset(zc->ldmState.hashTable, 0, ldmHSize * sizeof(ldmEntry_t)); + zc->ldmSequences = (rawSeq*)ZSTD_cwksp_reserve_aligned(ws, maxNbLdmSeq * sizeof(rawSeq)); + zc->maxNbLdmSequences = maxNbLdmSeq; + + ZSTD_window_init(&zc->ldmState.window); + zc->ldmState.loadedDictEnd = 0; + } + + /* reserve space for block-level external sequences */ + if (ZSTD_hasExtSeqProd(params)) { + size_t const maxNbExternalSeq = ZSTD_sequenceBound(blockSize); + zc->extSeqBufCapacity = maxNbExternalSeq; + zc->extSeqBuf = + (ZSTD_Sequence*)ZSTD_cwksp_reserve_aligned(ws, maxNbExternalSeq * sizeof(ZSTD_Sequence)); + } + + /* buffers */ + + /* ZSTD_wildcopy() is used to copy into the literals buffer, + * so we have to oversize the buffer by WILDCOPY_OVERLENGTH bytes. + */ + zc->seqStore.litStart = ZSTD_cwksp_reserve_buffer(ws, blockSize + WILDCOPY_OVERLENGTH); + zc->seqStore.maxNbLit = blockSize; + + zc->bufferedPolicy = zbuff; + zc->inBuffSize = buffInSize; + zc->inBuff = (char*)ZSTD_cwksp_reserve_buffer(ws, buffInSize); + zc->outBuffSize = buffOutSize; + zc->outBuff = (char*)ZSTD_cwksp_reserve_buffer(ws, buffOutSize); + + /* ldm bucketOffsets table */ + if (params->ldmParams.enableLdm == ZSTD_ps_enable) { + /* TODO: avoid memset? */ + size_t const numBuckets = + ((size_t)1) << (params->ldmParams.hashLog - + params->ldmParams.bucketSizeLog); + zc->ldmState.bucketOffsets = ZSTD_cwksp_reserve_buffer(ws, numBuckets); + ZSTD_memset(zc->ldmState.bucketOffsets, 0, numBuckets); + } + + /* sequences storage */ + ZSTD_referenceExternalSequences(zc, NULL, 0); + zc->seqStore.maxNbSeq = maxNbSeq; + zc->seqStore.llCode = ZSTD_cwksp_reserve_buffer(ws, maxNbSeq * sizeof(BYTE)); + zc->seqStore.mlCode = ZSTD_cwksp_reserve_buffer(ws, maxNbSeq * sizeof(BYTE)); + zc->seqStore.ofCode = ZSTD_cwksp_reserve_buffer(ws, maxNbSeq * sizeof(BYTE)); + + DEBUGLOG(3, "wksp: finished allocating, %zd bytes remain available", ZSTD_cwksp_available_space(ws)); + assert(ZSTD_cwksp_estimated_space_within_bounds(ws, neededSpace)); + + zc->initialized = 1; + + return 0; + } +} + +/* ZSTD_invalidateRepCodes() : + * ensures next compression will not use repcodes from previous block. + * Note : only works with regular variant; + * do not use with extDict variant ! */ +void ZSTD_invalidateRepCodes(ZSTD_CCtx* cctx) { + int i; + for (i=0; iblockState.prevCBlock->rep[i] = 0; + assert(!ZSTD_window_hasExtDict(cctx->blockState.matchState.window)); +} + +/* These are the approximate sizes for each strategy past which copying the + * dictionary tables into the working context is faster than using them + * in-place. + */ +static const size_t attachDictSizeCutoffs[ZSTD_STRATEGY_MAX+1] = { + 8 KB, /* unused */ + 8 KB, /* ZSTD_fast */ + 16 KB, /* ZSTD_dfast */ + 32 KB, /* ZSTD_greedy */ + 32 KB, /* ZSTD_lazy */ + 32 KB, /* ZSTD_lazy2 */ + 32 KB, /* ZSTD_btlazy2 */ + 32 KB, /* ZSTD_btopt */ + 8 KB, /* ZSTD_btultra */ + 8 KB /* ZSTD_btultra2 */ +}; + +static int ZSTD_shouldAttachDict(const ZSTD_CDict* cdict, + const ZSTD_CCtx_params* params, + U64 pledgedSrcSize) +{ + size_t cutoff = attachDictSizeCutoffs[cdict->matchState.cParams.strategy]; + int const dedicatedDictSearch = cdict->matchState.dedicatedDictSearch; + return dedicatedDictSearch + || ( ( pledgedSrcSize <= cutoff + || pledgedSrcSize == ZSTD_CONTENTSIZE_UNKNOWN + || params->attachDictPref == ZSTD_dictForceAttach ) + && params->attachDictPref != ZSTD_dictForceCopy + && !params->forceWindow ); /* dictMatchState isn't correctly + * handled in _enforceMaxDist */ +} + +static size_t +ZSTD_resetCCtx_byAttachingCDict(ZSTD_CCtx* cctx, + const ZSTD_CDict* cdict, + ZSTD_CCtx_params params, + U64 pledgedSrcSize, + ZSTD_buffered_policy_e zbuff) +{ + DEBUGLOG(4, "ZSTD_resetCCtx_byAttachingCDict() pledgedSrcSize=%llu", + (unsigned long long)pledgedSrcSize); + { + ZSTD_compressionParameters adjusted_cdict_cParams = cdict->matchState.cParams; + unsigned const windowLog = params.cParams.windowLog; + assert(windowLog != 0); + /* Resize working context table params for input only, since the dict + * has its own tables. */ + /* pledgedSrcSize == 0 means 0! */ + + if (cdict->matchState.dedicatedDictSearch) { + ZSTD_dedicatedDictSearch_revertCParams(&adjusted_cdict_cParams); + } + + params.cParams = ZSTD_adjustCParams_internal(adjusted_cdict_cParams, pledgedSrcSize, + cdict->dictContentSize, ZSTD_cpm_attachDict, + params.useRowMatchFinder); + params.cParams.windowLog = windowLog; + params.useRowMatchFinder = cdict->useRowMatchFinder; /* cdict overrides */ + FORWARD_IF_ERROR(ZSTD_resetCCtx_internal(cctx, ¶ms, pledgedSrcSize, + /* loadedDictSize */ 0, + ZSTDcrp_makeClean, zbuff), ""); + assert(cctx->appliedParams.cParams.strategy == adjusted_cdict_cParams.strategy); + } + + { const U32 cdictEnd = (U32)( cdict->matchState.window.nextSrc + - cdict->matchState.window.base); + const U32 cdictLen = cdictEnd - cdict->matchState.window.dictLimit; + if (cdictLen == 0) { + /* don't even attach dictionaries with no contents */ + DEBUGLOG(4, "skipping attaching empty dictionary"); + } else { + DEBUGLOG(4, "attaching dictionary into context"); + cctx->blockState.matchState.dictMatchState = &cdict->matchState; + + /* prep working match state so dict matches never have negative indices + * when they are translated to the working context's index space. */ + if (cctx->blockState.matchState.window.dictLimit < cdictEnd) { + cctx->blockState.matchState.window.nextSrc = + cctx->blockState.matchState.window.base + cdictEnd; + ZSTD_window_clear(&cctx->blockState.matchState.window); + } + /* loadedDictEnd is expressed within the referential of the active context */ + cctx->blockState.matchState.loadedDictEnd = cctx->blockState.matchState.window.dictLimit; + } } + + cctx->dictID = cdict->dictID; + cctx->dictContentSize = cdict->dictContentSize; + + /* copy block state */ + ZSTD_memcpy(cctx->blockState.prevCBlock, &cdict->cBlockState, sizeof(cdict->cBlockState)); + + return 0; +} + +static void ZSTD_copyCDictTableIntoCCtx(U32* dst, U32 const* src, size_t tableSize, + ZSTD_compressionParameters const* cParams) { + if (ZSTD_CDictIndicesAreTagged(cParams)){ + /* Remove tags from the CDict table if they are present. + * See docs on "short cache" in zstd_compress_internal.h for context. */ + size_t i; + for (i = 0; i < tableSize; i++) { + U32 const taggedIndex = src[i]; + U32 const index = taggedIndex >> ZSTD_SHORT_CACHE_TAG_BITS; + dst[i] = index; + } + } else { + ZSTD_memcpy(dst, src, tableSize * sizeof(U32)); + } +} + +static size_t ZSTD_resetCCtx_byCopyingCDict(ZSTD_CCtx* cctx, + const ZSTD_CDict* cdict, + ZSTD_CCtx_params params, + U64 pledgedSrcSize, + ZSTD_buffered_policy_e zbuff) +{ + const ZSTD_compressionParameters *cdict_cParams = &cdict->matchState.cParams; + + assert(!cdict->matchState.dedicatedDictSearch); + DEBUGLOG(4, "ZSTD_resetCCtx_byCopyingCDict() pledgedSrcSize=%llu", + (unsigned long long)pledgedSrcSize); + + { unsigned const windowLog = params.cParams.windowLog; + assert(windowLog != 0); + /* Copy only compression parameters related to tables. */ + params.cParams = *cdict_cParams; + params.cParams.windowLog = windowLog; + params.useRowMatchFinder = cdict->useRowMatchFinder; + FORWARD_IF_ERROR(ZSTD_resetCCtx_internal(cctx, ¶ms, pledgedSrcSize, + /* loadedDictSize */ 0, + ZSTDcrp_leaveDirty, zbuff), ""); + assert(cctx->appliedParams.cParams.strategy == cdict_cParams->strategy); + assert(cctx->appliedParams.cParams.hashLog == cdict_cParams->hashLog); + assert(cctx->appliedParams.cParams.chainLog == cdict_cParams->chainLog); + } + + ZSTD_cwksp_mark_tables_dirty(&cctx->workspace); + assert(params.useRowMatchFinder != ZSTD_ps_auto); + + /* copy tables */ + { size_t const chainSize = ZSTD_allocateChainTable(cdict_cParams->strategy, cdict->useRowMatchFinder, 0 /* DDS guaranteed disabled */) + ? ((size_t)1 << cdict_cParams->chainLog) + : 0; + size_t const hSize = (size_t)1 << cdict_cParams->hashLog; + + ZSTD_copyCDictTableIntoCCtx(cctx->blockState.matchState.hashTable, + cdict->matchState.hashTable, + hSize, cdict_cParams); + + /* Do not copy cdict's chainTable if cctx has parameters such that it would not use chainTable */ + if (ZSTD_allocateChainTable(cctx->appliedParams.cParams.strategy, cctx->appliedParams.useRowMatchFinder, 0 /* forDDSDict */)) { + ZSTD_copyCDictTableIntoCCtx(cctx->blockState.matchState.chainTable, + cdict->matchState.chainTable, + chainSize, cdict_cParams); + } + /* copy tag table */ + if (ZSTD_rowMatchFinderUsed(cdict_cParams->strategy, cdict->useRowMatchFinder)) { + size_t const tagTableSize = hSize; + ZSTD_memcpy(cctx->blockState.matchState.tagTable, + cdict->matchState.tagTable, + tagTableSize); + cctx->blockState.matchState.hashSalt = cdict->matchState.hashSalt; + } + } + + /* Zero the hashTable3, since the cdict never fills it */ + { int const h3log = cctx->blockState.matchState.hashLog3; + size_t const h3Size = h3log ? ((size_t)1 << h3log) : 0; + assert(cdict->matchState.hashLog3 == 0); + ZSTD_memset(cctx->blockState.matchState.hashTable3, 0, h3Size * sizeof(U32)); + } + + ZSTD_cwksp_mark_tables_clean(&cctx->workspace); + + /* copy dictionary offsets */ + { ZSTD_matchState_t const* srcMatchState = &cdict->matchState; + ZSTD_matchState_t* dstMatchState = &cctx->blockState.matchState; + dstMatchState->window = srcMatchState->window; + dstMatchState->nextToUpdate = srcMatchState->nextToUpdate; + dstMatchState->loadedDictEnd= srcMatchState->loadedDictEnd; + } + + cctx->dictID = cdict->dictID; + cctx->dictContentSize = cdict->dictContentSize; + + /* copy block state */ + ZSTD_memcpy(cctx->blockState.prevCBlock, &cdict->cBlockState, sizeof(cdict->cBlockState)); + + return 0; +} + +/* We have a choice between copying the dictionary context into the working + * context, or referencing the dictionary context from the working context + * in-place. We decide here which strategy to use. */ +static size_t ZSTD_resetCCtx_usingCDict(ZSTD_CCtx* cctx, + const ZSTD_CDict* cdict, + const ZSTD_CCtx_params* params, + U64 pledgedSrcSize, + ZSTD_buffered_policy_e zbuff) +{ + + DEBUGLOG(4, "ZSTD_resetCCtx_usingCDict (pledgedSrcSize=%u)", + (unsigned)pledgedSrcSize); + + if (ZSTD_shouldAttachDict(cdict, params, pledgedSrcSize)) { + return ZSTD_resetCCtx_byAttachingCDict( + cctx, cdict, *params, pledgedSrcSize, zbuff); + } else { + return ZSTD_resetCCtx_byCopyingCDict( + cctx, cdict, *params, pledgedSrcSize, zbuff); + } +} + +/*! ZSTD_copyCCtx_internal() : + * Duplicate an existing context `srcCCtx` into another one `dstCCtx`. + * Only works during stage ZSTDcs_init (i.e. after creation, but before first call to ZSTD_compressContinue()). + * The "context", in this case, refers to the hash and chain tables, + * entropy tables, and dictionary references. + * `windowLog` value is enforced if != 0, otherwise value is copied from srcCCtx. + * @return : 0, or an error code */ +static size_t ZSTD_copyCCtx_internal(ZSTD_CCtx* dstCCtx, + const ZSTD_CCtx* srcCCtx, + ZSTD_frameParameters fParams, + U64 pledgedSrcSize, + ZSTD_buffered_policy_e zbuff) +{ + RETURN_ERROR_IF(srcCCtx->stage!=ZSTDcs_init, stage_wrong, + "Can't copy a ctx that's not in init stage."); + DEBUGLOG(5, "ZSTD_copyCCtx_internal"); + ZSTD_memcpy(&dstCCtx->customMem, &srcCCtx->customMem, sizeof(ZSTD_customMem)); + { ZSTD_CCtx_params params = dstCCtx->requestedParams; + /* Copy only compression parameters related to tables. */ + params.cParams = srcCCtx->appliedParams.cParams; + assert(srcCCtx->appliedParams.useRowMatchFinder != ZSTD_ps_auto); + assert(srcCCtx->appliedParams.useBlockSplitter != ZSTD_ps_auto); + assert(srcCCtx->appliedParams.ldmParams.enableLdm != ZSTD_ps_auto); + params.useRowMatchFinder = srcCCtx->appliedParams.useRowMatchFinder; + params.useBlockSplitter = srcCCtx->appliedParams.useBlockSplitter; + params.ldmParams = srcCCtx->appliedParams.ldmParams; + params.fParams = fParams; + params.maxBlockSize = srcCCtx->appliedParams.maxBlockSize; + ZSTD_resetCCtx_internal(dstCCtx, ¶ms, pledgedSrcSize, + /* loadedDictSize */ 0, + ZSTDcrp_leaveDirty, zbuff); + assert(dstCCtx->appliedParams.cParams.windowLog == srcCCtx->appliedParams.cParams.windowLog); + assert(dstCCtx->appliedParams.cParams.strategy == srcCCtx->appliedParams.cParams.strategy); + assert(dstCCtx->appliedParams.cParams.hashLog == srcCCtx->appliedParams.cParams.hashLog); + assert(dstCCtx->appliedParams.cParams.chainLog == srcCCtx->appliedParams.cParams.chainLog); + assert(dstCCtx->blockState.matchState.hashLog3 == srcCCtx->blockState.matchState.hashLog3); + } + + ZSTD_cwksp_mark_tables_dirty(&dstCCtx->workspace); + + /* copy tables */ + { size_t const chainSize = ZSTD_allocateChainTable(srcCCtx->appliedParams.cParams.strategy, + srcCCtx->appliedParams.useRowMatchFinder, + 0 /* forDDSDict */) + ? ((size_t)1 << srcCCtx->appliedParams.cParams.chainLog) + : 0; + size_t const hSize = (size_t)1 << srcCCtx->appliedParams.cParams.hashLog; + int const h3log = srcCCtx->blockState.matchState.hashLog3; + size_t const h3Size = h3log ? ((size_t)1 << h3log) : 0; + + ZSTD_memcpy(dstCCtx->blockState.matchState.hashTable, + srcCCtx->blockState.matchState.hashTable, + hSize * sizeof(U32)); + ZSTD_memcpy(dstCCtx->blockState.matchState.chainTable, + srcCCtx->blockState.matchState.chainTable, + chainSize * sizeof(U32)); + ZSTD_memcpy(dstCCtx->blockState.matchState.hashTable3, + srcCCtx->blockState.matchState.hashTable3, + h3Size * sizeof(U32)); + } + + ZSTD_cwksp_mark_tables_clean(&dstCCtx->workspace); + + /* copy dictionary offsets */ + { + const ZSTD_matchState_t* srcMatchState = &srcCCtx->blockState.matchState; + ZSTD_matchState_t* dstMatchState = &dstCCtx->blockState.matchState; + dstMatchState->window = srcMatchState->window; + dstMatchState->nextToUpdate = srcMatchState->nextToUpdate; + dstMatchState->loadedDictEnd= srcMatchState->loadedDictEnd; + } + dstCCtx->dictID = srcCCtx->dictID; + dstCCtx->dictContentSize = srcCCtx->dictContentSize; + + /* copy block state */ + ZSTD_memcpy(dstCCtx->blockState.prevCBlock, srcCCtx->blockState.prevCBlock, sizeof(*srcCCtx->blockState.prevCBlock)); + + return 0; +} + +/*! ZSTD_copyCCtx() : + * Duplicate an existing context `srcCCtx` into another one `dstCCtx`. + * Only works during stage ZSTDcs_init (i.e. after creation, but before first call to ZSTD_compressContinue()). + * pledgedSrcSize==0 means "unknown". +* @return : 0, or an error code */ +size_t ZSTD_copyCCtx(ZSTD_CCtx* dstCCtx, const ZSTD_CCtx* srcCCtx, unsigned long long pledgedSrcSize) +{ + ZSTD_frameParameters fParams = { 1 /*content*/, 0 /*checksum*/, 0 /*noDictID*/ }; + ZSTD_buffered_policy_e const zbuff = srcCCtx->bufferedPolicy; + ZSTD_STATIC_ASSERT((U32)ZSTDb_buffered==1); + if (pledgedSrcSize==0) pledgedSrcSize = ZSTD_CONTENTSIZE_UNKNOWN; + fParams.contentSizeFlag = (pledgedSrcSize != ZSTD_CONTENTSIZE_UNKNOWN); + + return ZSTD_copyCCtx_internal(dstCCtx, srcCCtx, + fParams, pledgedSrcSize, + zbuff); +} + + +#define ZSTD_ROWSIZE 16 +/*! ZSTD_reduceTable() : + * reduce table indexes by `reducerValue`, or squash to zero. + * PreserveMark preserves "unsorted mark" for btlazy2 strategy. + * It must be set to a clear 0/1 value, to remove branch during inlining. + * Presume table size is a multiple of ZSTD_ROWSIZE + * to help auto-vectorization */ +FORCE_INLINE_TEMPLATE void +ZSTD_reduceTable_internal (U32* const table, U32 const size, U32 const reducerValue, int const preserveMark) +{ + int const nbRows = (int)size / ZSTD_ROWSIZE; + int cellNb = 0; + int rowNb; + /* Protect special index values < ZSTD_WINDOW_START_INDEX. */ + U32 const reducerThreshold = reducerValue + ZSTD_WINDOW_START_INDEX; + assert((size & (ZSTD_ROWSIZE-1)) == 0); /* multiple of ZSTD_ROWSIZE */ + assert(size < (1U<<31)); /* can be casted to int */ + +#if ZSTD_MEMORY_SANITIZER && !defined (ZSTD_MSAN_DONT_POISON_WORKSPACE) + /* To validate that the table reuse logic is sound, and that we don't + * access table space that we haven't cleaned, we re-"poison" the table + * space every time we mark it dirty. + * + * This function however is intended to operate on those dirty tables and + * re-clean them. So when this function is used correctly, we can unpoison + * the memory it operated on. This introduces a blind spot though, since + * if we now try to operate on __actually__ poisoned memory, we will not + * detect that. */ + __msan_unpoison(table, size * sizeof(U32)); +#endif + + for (rowNb=0 ; rowNb < nbRows ; rowNb++) { + int column; + for (column=0; columncParams.hashLog; + ZSTD_reduceTable(ms->hashTable, hSize, reducerValue); + } + + if (ZSTD_allocateChainTable(params->cParams.strategy, params->useRowMatchFinder, (U32)ms->dedicatedDictSearch)) { + U32 const chainSize = (U32)1 << params->cParams.chainLog; + if (params->cParams.strategy == ZSTD_btlazy2) + ZSTD_reduceTable_btlazy2(ms->chainTable, chainSize, reducerValue); + else + ZSTD_reduceTable(ms->chainTable, chainSize, reducerValue); + } + + if (ms->hashLog3) { + U32 const h3Size = (U32)1 << ms->hashLog3; + ZSTD_reduceTable(ms->hashTable3, h3Size, reducerValue); + } +} + + +/*-******************************************************* +* Block entropic compression +*********************************************************/ + +/* See doc/zstd_compression_format.md for detailed format description */ + +int ZSTD_seqToCodes(const seqStore_t* seqStorePtr) +{ + const seqDef* const sequences = seqStorePtr->sequencesStart; + BYTE* const llCodeTable = seqStorePtr->llCode; + BYTE* const ofCodeTable = seqStorePtr->ofCode; + BYTE* const mlCodeTable = seqStorePtr->mlCode; + U32 const nbSeq = (U32)(seqStorePtr->sequences - seqStorePtr->sequencesStart); + U32 u; + int longOffsets = 0; + assert(nbSeq <= seqStorePtr->maxNbSeq); + for (u=0; u= STREAM_ACCUMULATOR_MIN)); + if (MEM_32bits() && ofCode >= STREAM_ACCUMULATOR_MIN) + longOffsets = 1; + } + if (seqStorePtr->longLengthType==ZSTD_llt_literalLength) + llCodeTable[seqStorePtr->longLengthPos] = MaxLL; + if (seqStorePtr->longLengthType==ZSTD_llt_matchLength) + mlCodeTable[seqStorePtr->longLengthPos] = MaxML; + return longOffsets; +} + +/* ZSTD_useTargetCBlockSize(): + * Returns if target compressed block size param is being used. + * If used, compression will do best effort to make a compressed block size to be around targetCBlockSize. + * Returns 1 if true, 0 otherwise. */ +static int ZSTD_useTargetCBlockSize(const ZSTD_CCtx_params* cctxParams) +{ + DEBUGLOG(5, "ZSTD_useTargetCBlockSize (targetCBlockSize=%zu)", cctxParams->targetCBlockSize); + return (cctxParams->targetCBlockSize != 0); +} + +/* ZSTD_blockSplitterEnabled(): + * Returns if block splitting param is being used + * If used, compression will do best effort to split a block in order to improve compression ratio. + * At the time this function is called, the parameter must be finalized. + * Returns 1 if true, 0 otherwise. */ +static int ZSTD_blockSplitterEnabled(ZSTD_CCtx_params* cctxParams) +{ + DEBUGLOG(5, "ZSTD_blockSplitterEnabled (useBlockSplitter=%d)", cctxParams->useBlockSplitter); + assert(cctxParams->useBlockSplitter != ZSTD_ps_auto); + return (cctxParams->useBlockSplitter == ZSTD_ps_enable); +} + +/* Type returned by ZSTD_buildSequencesStatistics containing finalized symbol encoding types + * and size of the sequences statistics + */ +typedef struct { + U32 LLtype; + U32 Offtype; + U32 MLtype; + size_t size; + size_t lastCountSize; /* Accounts for bug in 1.3.4. More detail in ZSTD_entropyCompressSeqStore_internal() */ + int longOffsets; +} ZSTD_symbolEncodingTypeStats_t; + +/* ZSTD_buildSequencesStatistics(): + * Returns a ZSTD_symbolEncodingTypeStats_t, or a zstd error code in the `size` field. + * Modifies `nextEntropy` to have the appropriate values as a side effect. + * nbSeq must be greater than 0. + * + * entropyWkspSize must be of size at least ENTROPY_WORKSPACE_SIZE - (MaxSeq + 1)*sizeof(U32) + */ +static ZSTD_symbolEncodingTypeStats_t +ZSTD_buildSequencesStatistics( + const seqStore_t* seqStorePtr, size_t nbSeq, + const ZSTD_fseCTables_t* prevEntropy, ZSTD_fseCTables_t* nextEntropy, + BYTE* dst, const BYTE* const dstEnd, + ZSTD_strategy strategy, unsigned* countWorkspace, + void* entropyWorkspace, size_t entropyWkspSize) +{ + BYTE* const ostart = dst; + const BYTE* const oend = dstEnd; + BYTE* op = ostart; + FSE_CTable* CTable_LitLength = nextEntropy->litlengthCTable; + FSE_CTable* CTable_OffsetBits = nextEntropy->offcodeCTable; + FSE_CTable* CTable_MatchLength = nextEntropy->matchlengthCTable; + const BYTE* const ofCodeTable = seqStorePtr->ofCode; + const BYTE* const llCodeTable = seqStorePtr->llCode; + const BYTE* const mlCodeTable = seqStorePtr->mlCode; + ZSTD_symbolEncodingTypeStats_t stats; + + stats.lastCountSize = 0; + /* convert length/distances into codes */ + stats.longOffsets = ZSTD_seqToCodes(seqStorePtr); + assert(op <= oend); + assert(nbSeq != 0); /* ZSTD_selectEncodingType() divides by nbSeq */ + /* build CTable for Literal Lengths */ + { unsigned max = MaxLL; + size_t const mostFrequent = HIST_countFast_wksp(countWorkspace, &max, llCodeTable, nbSeq, entropyWorkspace, entropyWkspSize); /* can't fail */ + DEBUGLOG(5, "Building LL table"); + nextEntropy->litlength_repeatMode = prevEntropy->litlength_repeatMode; + stats.LLtype = ZSTD_selectEncodingType(&nextEntropy->litlength_repeatMode, + countWorkspace, max, mostFrequent, nbSeq, + LLFSELog, prevEntropy->litlengthCTable, + LL_defaultNorm, LL_defaultNormLog, + ZSTD_defaultAllowed, strategy); + assert(set_basic < set_compressed && set_rle < set_compressed); + assert(!(stats.LLtype < set_compressed && nextEntropy->litlength_repeatMode != FSE_repeat_none)); /* We don't copy tables */ + { size_t const countSize = ZSTD_buildCTable( + op, (size_t)(oend - op), + CTable_LitLength, LLFSELog, (symbolEncodingType_e)stats.LLtype, + countWorkspace, max, llCodeTable, nbSeq, + LL_defaultNorm, LL_defaultNormLog, MaxLL, + prevEntropy->litlengthCTable, + sizeof(prevEntropy->litlengthCTable), + entropyWorkspace, entropyWkspSize); + if (ZSTD_isError(countSize)) { + DEBUGLOG(3, "ZSTD_buildCTable for LitLens failed"); + stats.size = countSize; + return stats; + } + if (stats.LLtype == set_compressed) + stats.lastCountSize = countSize; + op += countSize; + assert(op <= oend); + } } + /* build CTable for Offsets */ + { unsigned max = MaxOff; + size_t const mostFrequent = HIST_countFast_wksp( + countWorkspace, &max, ofCodeTable, nbSeq, entropyWorkspace, entropyWkspSize); /* can't fail */ + /* We can only use the basic table if max <= DefaultMaxOff, otherwise the offsets are too large */ + ZSTD_defaultPolicy_e const defaultPolicy = (max <= DefaultMaxOff) ? ZSTD_defaultAllowed : ZSTD_defaultDisallowed; + DEBUGLOG(5, "Building OF table"); + nextEntropy->offcode_repeatMode = prevEntropy->offcode_repeatMode; + stats.Offtype = ZSTD_selectEncodingType(&nextEntropy->offcode_repeatMode, + countWorkspace, max, mostFrequent, nbSeq, + OffFSELog, prevEntropy->offcodeCTable, + OF_defaultNorm, OF_defaultNormLog, + defaultPolicy, strategy); + assert(!(stats.Offtype < set_compressed && nextEntropy->offcode_repeatMode != FSE_repeat_none)); /* We don't copy tables */ + { size_t const countSize = ZSTD_buildCTable( + op, (size_t)(oend - op), + CTable_OffsetBits, OffFSELog, (symbolEncodingType_e)stats.Offtype, + countWorkspace, max, ofCodeTable, nbSeq, + OF_defaultNorm, OF_defaultNormLog, DefaultMaxOff, + prevEntropy->offcodeCTable, + sizeof(prevEntropy->offcodeCTable), + entropyWorkspace, entropyWkspSize); + if (ZSTD_isError(countSize)) { + DEBUGLOG(3, "ZSTD_buildCTable for Offsets failed"); + stats.size = countSize; + return stats; + } + if (stats.Offtype == set_compressed) + stats.lastCountSize = countSize; + op += countSize; + assert(op <= oend); + } } + /* build CTable for MatchLengths */ + { unsigned max = MaxML; + size_t const mostFrequent = HIST_countFast_wksp( + countWorkspace, &max, mlCodeTable, nbSeq, entropyWorkspace, entropyWkspSize); /* can't fail */ + DEBUGLOG(5, "Building ML table (remaining space : %i)", (int)(oend-op)); + nextEntropy->matchlength_repeatMode = prevEntropy->matchlength_repeatMode; + stats.MLtype = ZSTD_selectEncodingType(&nextEntropy->matchlength_repeatMode, + countWorkspace, max, mostFrequent, nbSeq, + MLFSELog, prevEntropy->matchlengthCTable, + ML_defaultNorm, ML_defaultNormLog, + ZSTD_defaultAllowed, strategy); + assert(!(stats.MLtype < set_compressed && nextEntropy->matchlength_repeatMode != FSE_repeat_none)); /* We don't copy tables */ + { size_t const countSize = ZSTD_buildCTable( + op, (size_t)(oend - op), + CTable_MatchLength, MLFSELog, (symbolEncodingType_e)stats.MLtype, + countWorkspace, max, mlCodeTable, nbSeq, + ML_defaultNorm, ML_defaultNormLog, MaxML, + prevEntropy->matchlengthCTable, + sizeof(prevEntropy->matchlengthCTable), + entropyWorkspace, entropyWkspSize); + if (ZSTD_isError(countSize)) { + DEBUGLOG(3, "ZSTD_buildCTable for MatchLengths failed"); + stats.size = countSize; + return stats; + } + if (stats.MLtype == set_compressed) + stats.lastCountSize = countSize; + op += countSize; + assert(op <= oend); + } } + stats.size = (size_t)(op-ostart); + return stats; +} + +/* ZSTD_entropyCompressSeqStore_internal(): + * compresses both literals and sequences + * Returns compressed size of block, or a zstd error. + */ +#define SUSPECT_UNCOMPRESSIBLE_LITERAL_RATIO 20 +MEM_STATIC size_t +ZSTD_entropyCompressSeqStore_internal( + const seqStore_t* seqStorePtr, + const ZSTD_entropyCTables_t* prevEntropy, + ZSTD_entropyCTables_t* nextEntropy, + const ZSTD_CCtx_params* cctxParams, + void* dst, size_t dstCapacity, + void* entropyWorkspace, size_t entropyWkspSize, + const int bmi2) +{ + ZSTD_strategy const strategy = cctxParams->cParams.strategy; + unsigned* count = (unsigned*)entropyWorkspace; + FSE_CTable* CTable_LitLength = nextEntropy->fse.litlengthCTable; + FSE_CTable* CTable_OffsetBits = nextEntropy->fse.offcodeCTable; + FSE_CTable* CTable_MatchLength = nextEntropy->fse.matchlengthCTable; + const seqDef* const sequences = seqStorePtr->sequencesStart; + const size_t nbSeq = (size_t)(seqStorePtr->sequences - seqStorePtr->sequencesStart); + const BYTE* const ofCodeTable = seqStorePtr->ofCode; + const BYTE* const llCodeTable = seqStorePtr->llCode; + const BYTE* const mlCodeTable = seqStorePtr->mlCode; + BYTE* const ostart = (BYTE*)dst; + BYTE* const oend = ostart + dstCapacity; + BYTE* op = ostart; + size_t lastCountSize; + int longOffsets = 0; + + entropyWorkspace = count + (MaxSeq + 1); + entropyWkspSize -= (MaxSeq + 1) * sizeof(*count); + + DEBUGLOG(5, "ZSTD_entropyCompressSeqStore_internal (nbSeq=%zu, dstCapacity=%zu)", nbSeq, dstCapacity); + ZSTD_STATIC_ASSERT(HUF_WORKSPACE_SIZE >= (1<= HUF_WORKSPACE_SIZE); + + /* Compress literals */ + { const BYTE* const literals = seqStorePtr->litStart; + size_t const numSequences = (size_t)(seqStorePtr->sequences - seqStorePtr->sequencesStart); + size_t const numLiterals = (size_t)(seqStorePtr->lit - seqStorePtr->litStart); + /* Base suspicion of uncompressibility on ratio of literals to sequences */ + unsigned const suspectUncompressible = (numSequences == 0) || (numLiterals / numSequences >= SUSPECT_UNCOMPRESSIBLE_LITERAL_RATIO); + size_t const litSize = (size_t)(seqStorePtr->lit - literals); + + size_t const cSize = ZSTD_compressLiterals( + op, dstCapacity, + literals, litSize, + entropyWorkspace, entropyWkspSize, + &prevEntropy->huf, &nextEntropy->huf, + cctxParams->cParams.strategy, + ZSTD_literalsCompressionIsDisabled(cctxParams), + suspectUncompressible, bmi2); + FORWARD_IF_ERROR(cSize, "ZSTD_compressLiterals failed"); + assert(cSize <= dstCapacity); + op += cSize; + } + + /* Sequences Header */ + RETURN_ERROR_IF((oend-op) < 3 /*max nbSeq Size*/ + 1 /*seqHead*/, + dstSize_tooSmall, "Can't fit seq hdr in output buf!"); + if (nbSeq < 128) { + *op++ = (BYTE)nbSeq; + } else if (nbSeq < LONGNBSEQ) { + op[0] = (BYTE)((nbSeq>>8) + 0x80); + op[1] = (BYTE)nbSeq; + op+=2; + } else { + op[0]=0xFF; + MEM_writeLE16(op+1, (U16)(nbSeq - LONGNBSEQ)); + op+=3; + } + assert(op <= oend); + if (nbSeq==0) { + /* Copy the old tables over as if we repeated them */ + ZSTD_memcpy(&nextEntropy->fse, &prevEntropy->fse, sizeof(prevEntropy->fse)); + return (size_t)(op - ostart); + } + { BYTE* const seqHead = op++; + /* build stats for sequences */ + const ZSTD_symbolEncodingTypeStats_t stats = + ZSTD_buildSequencesStatistics(seqStorePtr, nbSeq, + &prevEntropy->fse, &nextEntropy->fse, + op, oend, + strategy, count, + entropyWorkspace, entropyWkspSize); + FORWARD_IF_ERROR(stats.size, "ZSTD_buildSequencesStatistics failed!"); + *seqHead = (BYTE)((stats.LLtype<<6) + (stats.Offtype<<4) + (stats.MLtype<<2)); + lastCountSize = stats.lastCountSize; + op += stats.size; + longOffsets = stats.longOffsets; + } + + { size_t const bitstreamSize = ZSTD_encodeSequences( + op, (size_t)(oend - op), + CTable_MatchLength, mlCodeTable, + CTable_OffsetBits, ofCodeTable, + CTable_LitLength, llCodeTable, + sequences, nbSeq, + longOffsets, bmi2); + FORWARD_IF_ERROR(bitstreamSize, "ZSTD_encodeSequences failed"); + op += bitstreamSize; + assert(op <= oend); + /* zstd versions <= 1.3.4 mistakenly report corruption when + * FSE_readNCount() receives a buffer < 4 bytes. + * Fixed by https://github.com/facebook/zstd/pull/1146. + * This can happen when the last set_compressed table present is 2 + * bytes and the bitstream is only one byte. + * In this exceedingly rare case, we will simply emit an uncompressed + * block, since it isn't worth optimizing. + */ + if (lastCountSize && (lastCountSize + bitstreamSize) < 4) { + /* lastCountSize >= 2 && bitstreamSize > 0 ==> lastCountSize == 3 */ + assert(lastCountSize + bitstreamSize == 3); + DEBUGLOG(5, "Avoiding bug in zstd decoder in versions <= 1.3.4 by " + "emitting an uncompressed block."); + return 0; + } + } + + DEBUGLOG(5, "compressed block size : %u", (unsigned)(op - ostart)); + return (size_t)(op - ostart); +} + +MEM_STATIC size_t +ZSTD_entropyCompressSeqStore( + const seqStore_t* seqStorePtr, + const ZSTD_entropyCTables_t* prevEntropy, + ZSTD_entropyCTables_t* nextEntropy, + const ZSTD_CCtx_params* cctxParams, + void* dst, size_t dstCapacity, + size_t srcSize, + void* entropyWorkspace, size_t entropyWkspSize, + int bmi2) +{ + size_t const cSize = ZSTD_entropyCompressSeqStore_internal( + seqStorePtr, prevEntropy, nextEntropy, cctxParams, + dst, dstCapacity, + entropyWorkspace, entropyWkspSize, bmi2); + if (cSize == 0) return 0; + /* When srcSize <= dstCapacity, there is enough space to write a raw uncompressed block. + * Since we ran out of space, block must be not compressible, so fall back to raw uncompressed block. + */ + if ((cSize == ERROR(dstSize_tooSmall)) & (srcSize <= dstCapacity)) { + DEBUGLOG(4, "not enough dstCapacity (%zu) for ZSTD_entropyCompressSeqStore_internal()=> do not compress block", dstCapacity); + return 0; /* block not compressed */ + } + FORWARD_IF_ERROR(cSize, "ZSTD_entropyCompressSeqStore_internal failed"); + + /* Check compressibility */ + { size_t const maxCSize = srcSize - ZSTD_minGain(srcSize, cctxParams->cParams.strategy); + if (cSize >= maxCSize) return 0; /* block not compressed */ + } + DEBUGLOG(5, "ZSTD_entropyCompressSeqStore() cSize: %zu", cSize); + /* libzstd decoder before > v1.5.4 is not compatible with compressed blocks of size ZSTD_BLOCKSIZE_MAX exactly. + * This restriction is indirectly already fulfilled by respecting ZSTD_minGain() condition above. + */ + assert(cSize < ZSTD_BLOCKSIZE_MAX); + return cSize; +} + +/* ZSTD_selectBlockCompressor() : + * Not static, but internal use only (used by long distance matcher) + * assumption : strat is a valid strategy */ +ZSTD_blockCompressor ZSTD_selectBlockCompressor(ZSTD_strategy strat, ZSTD_paramSwitch_e useRowMatchFinder, ZSTD_dictMode_e dictMode) +{ + static const ZSTD_blockCompressor blockCompressor[4][ZSTD_STRATEGY_MAX+1] = { + { ZSTD_compressBlock_fast /* default for 0 */, + ZSTD_compressBlock_fast, + ZSTD_COMPRESSBLOCK_DOUBLEFAST, + ZSTD_COMPRESSBLOCK_GREEDY, + ZSTD_COMPRESSBLOCK_LAZY, + ZSTD_COMPRESSBLOCK_LAZY2, + ZSTD_COMPRESSBLOCK_BTLAZY2, + ZSTD_COMPRESSBLOCK_BTOPT, + ZSTD_COMPRESSBLOCK_BTULTRA, + ZSTD_COMPRESSBLOCK_BTULTRA2 + }, + { ZSTD_compressBlock_fast_extDict /* default for 0 */, + ZSTD_compressBlock_fast_extDict, + ZSTD_COMPRESSBLOCK_DOUBLEFAST_EXTDICT, + ZSTD_COMPRESSBLOCK_GREEDY_EXTDICT, + ZSTD_COMPRESSBLOCK_LAZY_EXTDICT, + ZSTD_COMPRESSBLOCK_LAZY2_EXTDICT, + ZSTD_COMPRESSBLOCK_BTLAZY2_EXTDICT, + ZSTD_COMPRESSBLOCK_BTOPT_EXTDICT, + ZSTD_COMPRESSBLOCK_BTULTRA_EXTDICT, + ZSTD_COMPRESSBLOCK_BTULTRA_EXTDICT + }, + { ZSTD_compressBlock_fast_dictMatchState /* default for 0 */, + ZSTD_compressBlock_fast_dictMatchState, + ZSTD_COMPRESSBLOCK_DOUBLEFAST_DICTMATCHSTATE, + ZSTD_COMPRESSBLOCK_GREEDY_DICTMATCHSTATE, + ZSTD_COMPRESSBLOCK_LAZY_DICTMATCHSTATE, + ZSTD_COMPRESSBLOCK_LAZY2_DICTMATCHSTATE, + ZSTD_COMPRESSBLOCK_BTLAZY2_DICTMATCHSTATE, + ZSTD_COMPRESSBLOCK_BTOPT_DICTMATCHSTATE, + ZSTD_COMPRESSBLOCK_BTULTRA_DICTMATCHSTATE, + ZSTD_COMPRESSBLOCK_BTULTRA_DICTMATCHSTATE + }, + { NULL /* default for 0 */, + NULL, + NULL, + ZSTD_COMPRESSBLOCK_GREEDY_DEDICATEDDICTSEARCH, + ZSTD_COMPRESSBLOCK_LAZY_DEDICATEDDICTSEARCH, + ZSTD_COMPRESSBLOCK_LAZY2_DEDICATEDDICTSEARCH, + NULL, + NULL, + NULL, + NULL } + }; + ZSTD_blockCompressor selectedCompressor; + ZSTD_STATIC_ASSERT((unsigned)ZSTD_fast == 1); + + assert(ZSTD_cParam_withinBounds(ZSTD_c_strategy, strat)); + DEBUGLOG(4, "Selected block compressor: dictMode=%d strat=%d rowMatchfinder=%d", (int)dictMode, (int)strat, (int)useRowMatchFinder); + if (ZSTD_rowMatchFinderUsed(strat, useRowMatchFinder)) { + static const ZSTD_blockCompressor rowBasedBlockCompressors[4][3] = { + { + ZSTD_COMPRESSBLOCK_GREEDY_ROW, + ZSTD_COMPRESSBLOCK_LAZY_ROW, + ZSTD_COMPRESSBLOCK_LAZY2_ROW + }, + { + ZSTD_COMPRESSBLOCK_GREEDY_EXTDICT_ROW, + ZSTD_COMPRESSBLOCK_LAZY_EXTDICT_ROW, + ZSTD_COMPRESSBLOCK_LAZY2_EXTDICT_ROW + }, + { + ZSTD_COMPRESSBLOCK_GREEDY_DICTMATCHSTATE_ROW, + ZSTD_COMPRESSBLOCK_LAZY_DICTMATCHSTATE_ROW, + ZSTD_COMPRESSBLOCK_LAZY2_DICTMATCHSTATE_ROW + }, + { + ZSTD_COMPRESSBLOCK_GREEDY_DEDICATEDDICTSEARCH_ROW, + ZSTD_COMPRESSBLOCK_LAZY_DEDICATEDDICTSEARCH_ROW, + ZSTD_COMPRESSBLOCK_LAZY2_DEDICATEDDICTSEARCH_ROW + } + }; + DEBUGLOG(4, "Selecting a row-based matchfinder"); + assert(useRowMatchFinder != ZSTD_ps_auto); + selectedCompressor = rowBasedBlockCompressors[(int)dictMode][(int)strat - (int)ZSTD_greedy]; + } else { + selectedCompressor = blockCompressor[(int)dictMode][(int)strat]; + } + assert(selectedCompressor != NULL); + return selectedCompressor; +} + +static void ZSTD_storeLastLiterals(seqStore_t* seqStorePtr, + const BYTE* anchor, size_t lastLLSize) +{ + ZSTD_memcpy(seqStorePtr->lit, anchor, lastLLSize); + seqStorePtr->lit += lastLLSize; +} + +void ZSTD_resetSeqStore(seqStore_t* ssPtr) +{ + ssPtr->lit = ssPtr->litStart; + ssPtr->sequences = ssPtr->sequencesStart; + ssPtr->longLengthType = ZSTD_llt_none; +} + +/* ZSTD_postProcessSequenceProducerResult() : + * Validates and post-processes sequences obtained through the external matchfinder API: + * - Checks whether nbExternalSeqs represents an error condition. + * - Appends a block delimiter to outSeqs if one is not already present. + * See zstd.h for context regarding block delimiters. + * Returns the number of sequences after post-processing, or an error code. */ +static size_t ZSTD_postProcessSequenceProducerResult( + ZSTD_Sequence* outSeqs, size_t nbExternalSeqs, size_t outSeqsCapacity, size_t srcSize +) { + RETURN_ERROR_IF( + nbExternalSeqs > outSeqsCapacity, + sequenceProducer_failed, + "External sequence producer returned error code %lu", + (unsigned long)nbExternalSeqs + ); + + RETURN_ERROR_IF( + nbExternalSeqs == 0 && srcSize > 0, + sequenceProducer_failed, + "Got zero sequences from external sequence producer for a non-empty src buffer!" + ); + + if (srcSize == 0) { + ZSTD_memset(&outSeqs[0], 0, sizeof(ZSTD_Sequence)); + return 1; + } + + { + ZSTD_Sequence const lastSeq = outSeqs[nbExternalSeqs - 1]; + + /* We can return early if lastSeq is already a block delimiter. */ + if (lastSeq.offset == 0 && lastSeq.matchLength == 0) { + return nbExternalSeqs; + } + + /* This error condition is only possible if the external matchfinder + * produced an invalid parse, by definition of ZSTD_sequenceBound(). */ + RETURN_ERROR_IF( + nbExternalSeqs == outSeqsCapacity, + sequenceProducer_failed, + "nbExternalSeqs == outSeqsCapacity but lastSeq is not a block delimiter!" + ); + + /* lastSeq is not a block delimiter, so we need to append one. */ + ZSTD_memset(&outSeqs[nbExternalSeqs], 0, sizeof(ZSTD_Sequence)); + return nbExternalSeqs + 1; + } +} + +/* ZSTD_fastSequenceLengthSum() : + * Returns sum(litLen) + sum(matchLen) + lastLits for *seqBuf*. + * Similar to another function in zstd_compress.c (determine_blockSize), + * except it doesn't check for a block delimiter to end summation. + * Removing the early exit allows the compiler to auto-vectorize (https://godbolt.org/z/cY1cajz9P). + * This function can be deleted and replaced by determine_blockSize after we resolve issue #3456. */ +static size_t ZSTD_fastSequenceLengthSum(ZSTD_Sequence const* seqBuf, size_t seqBufSize) { + size_t matchLenSum, litLenSum, i; + matchLenSum = 0; + litLenSum = 0; + for (i = 0; i < seqBufSize; i++) { + litLenSum += seqBuf[i].litLength; + matchLenSum += seqBuf[i].matchLength; + } + return litLenSum + matchLenSum; +} + +typedef enum { ZSTDbss_compress, ZSTDbss_noCompress } ZSTD_buildSeqStore_e; + +static size_t ZSTD_buildSeqStore(ZSTD_CCtx* zc, const void* src, size_t srcSize) +{ + ZSTD_matchState_t* const ms = &zc->blockState.matchState; + DEBUGLOG(5, "ZSTD_buildSeqStore (srcSize=%zu)", srcSize); + assert(srcSize <= ZSTD_BLOCKSIZE_MAX); + /* Assert that we have correctly flushed the ctx params into the ms's copy */ + ZSTD_assertEqualCParams(zc->appliedParams.cParams, ms->cParams); + /* TODO: See 3090. We reduced MIN_CBLOCK_SIZE from 3 to 2 so to compensate we are adding + * additional 1. We need to revisit and change this logic to be more consistent */ + if (srcSize < MIN_CBLOCK_SIZE+ZSTD_blockHeaderSize+1+1) { + if (zc->appliedParams.cParams.strategy >= ZSTD_btopt) { + ZSTD_ldm_skipRawSeqStoreBytes(&zc->externSeqStore, srcSize); + } else { + ZSTD_ldm_skipSequences(&zc->externSeqStore, srcSize, zc->appliedParams.cParams.minMatch); + } + return ZSTDbss_noCompress; /* don't even attempt compression below a certain srcSize */ + } + ZSTD_resetSeqStore(&(zc->seqStore)); + /* required for optimal parser to read stats from dictionary */ + ms->opt.symbolCosts = &zc->blockState.prevCBlock->entropy; + /* tell the optimal parser how we expect to compress literals */ + ms->opt.literalCompressionMode = zc->appliedParams.literalCompressionMode; + /* a gap between an attached dict and the current window is not safe, + * they must remain adjacent, + * and when that stops being the case, the dict must be unset */ + assert(ms->dictMatchState == NULL || ms->loadedDictEnd == ms->window.dictLimit); + + /* limited update after a very long match */ + { const BYTE* const base = ms->window.base; + const BYTE* const istart = (const BYTE*)src; + const U32 curr = (U32)(istart-base); + if (sizeof(ptrdiff_t)==8) assert(istart - base < (ptrdiff_t)(U32)(-1)); /* ensure no overflow */ + if (curr > ms->nextToUpdate + 384) + ms->nextToUpdate = curr - MIN(192, (U32)(curr - ms->nextToUpdate - 384)); + } + + /* select and store sequences */ + { ZSTD_dictMode_e const dictMode = ZSTD_matchState_dictMode(ms); + size_t lastLLSize; + { int i; + for (i = 0; i < ZSTD_REP_NUM; ++i) + zc->blockState.nextCBlock->rep[i] = zc->blockState.prevCBlock->rep[i]; + } + if (zc->externSeqStore.pos < zc->externSeqStore.size) { + assert(zc->appliedParams.ldmParams.enableLdm == ZSTD_ps_disable); + + /* External matchfinder + LDM is technically possible, just not implemented yet. + * We need to revisit soon and implement it. */ + RETURN_ERROR_IF( + ZSTD_hasExtSeqProd(&zc->appliedParams), + parameter_combination_unsupported, + "Long-distance matching with external sequence producer enabled is not currently supported." + ); + + /* Updates ldmSeqStore.pos */ + lastLLSize = + ZSTD_ldm_blockCompress(&zc->externSeqStore, + ms, &zc->seqStore, + zc->blockState.nextCBlock->rep, + zc->appliedParams.useRowMatchFinder, + src, srcSize); + assert(zc->externSeqStore.pos <= zc->externSeqStore.size); + } else if (zc->appliedParams.ldmParams.enableLdm == ZSTD_ps_enable) { + rawSeqStore_t ldmSeqStore = kNullRawSeqStore; + + /* External matchfinder + LDM is technically possible, just not implemented yet. + * We need to revisit soon and implement it. */ + RETURN_ERROR_IF( + ZSTD_hasExtSeqProd(&zc->appliedParams), + parameter_combination_unsupported, + "Long-distance matching with external sequence producer enabled is not currently supported." + ); + + ldmSeqStore.seq = zc->ldmSequences; + ldmSeqStore.capacity = zc->maxNbLdmSequences; + /* Updates ldmSeqStore.size */ + FORWARD_IF_ERROR(ZSTD_ldm_generateSequences(&zc->ldmState, &ldmSeqStore, + &zc->appliedParams.ldmParams, + src, srcSize), ""); + /* Updates ldmSeqStore.pos */ + lastLLSize = + ZSTD_ldm_blockCompress(&ldmSeqStore, + ms, &zc->seqStore, + zc->blockState.nextCBlock->rep, + zc->appliedParams.useRowMatchFinder, + src, srcSize); + assert(ldmSeqStore.pos == ldmSeqStore.size); + } else if (ZSTD_hasExtSeqProd(&zc->appliedParams)) { + assert( + zc->extSeqBufCapacity >= ZSTD_sequenceBound(srcSize) + ); + assert(zc->appliedParams.extSeqProdFunc != NULL); + + { U32 const windowSize = (U32)1 << zc->appliedParams.cParams.windowLog; + + size_t const nbExternalSeqs = (zc->appliedParams.extSeqProdFunc)( + zc->appliedParams.extSeqProdState, + zc->extSeqBuf, + zc->extSeqBufCapacity, + src, srcSize, + NULL, 0, /* dict and dictSize, currently not supported */ + zc->appliedParams.compressionLevel, + windowSize + ); + + size_t const nbPostProcessedSeqs = ZSTD_postProcessSequenceProducerResult( + zc->extSeqBuf, + nbExternalSeqs, + zc->extSeqBufCapacity, + srcSize + ); + + /* Return early if there is no error, since we don't need to worry about last literals */ + if (!ZSTD_isError(nbPostProcessedSeqs)) { + ZSTD_sequencePosition seqPos = {0,0,0}; + size_t const seqLenSum = ZSTD_fastSequenceLengthSum(zc->extSeqBuf, nbPostProcessedSeqs); + RETURN_ERROR_IF(seqLenSum > srcSize, externalSequences_invalid, "External sequences imply too large a block!"); + FORWARD_IF_ERROR( + ZSTD_copySequencesToSeqStoreExplicitBlockDelim( + zc, &seqPos, + zc->extSeqBuf, nbPostProcessedSeqs, + src, srcSize, + zc->appliedParams.searchForExternalRepcodes + ), + "Failed to copy external sequences to seqStore!" + ); + ms->ldmSeqStore = NULL; + DEBUGLOG(5, "Copied %lu sequences from external sequence producer to internal seqStore.", (unsigned long)nbExternalSeqs); + return ZSTDbss_compress; + } + + /* Propagate the error if fallback is disabled */ + if (!zc->appliedParams.enableMatchFinderFallback) { + return nbPostProcessedSeqs; + } + + /* Fallback to software matchfinder */ + { ZSTD_blockCompressor const blockCompressor = + ZSTD_selectBlockCompressor( + zc->appliedParams.cParams.strategy, + zc->appliedParams.useRowMatchFinder, + dictMode); + ms->ldmSeqStore = NULL; + DEBUGLOG( + 5, + "External sequence producer returned error code %lu. Falling back to internal parser.", + (unsigned long)nbExternalSeqs + ); + lastLLSize = blockCompressor(ms, &zc->seqStore, zc->blockState.nextCBlock->rep, src, srcSize); + } } + } else { /* not long range mode and no external matchfinder */ + ZSTD_blockCompressor const blockCompressor = ZSTD_selectBlockCompressor( + zc->appliedParams.cParams.strategy, + zc->appliedParams.useRowMatchFinder, + dictMode); + ms->ldmSeqStore = NULL; + lastLLSize = blockCompressor(ms, &zc->seqStore, zc->blockState.nextCBlock->rep, src, srcSize); + } + { const BYTE* const lastLiterals = (const BYTE*)src + srcSize - lastLLSize; + ZSTD_storeLastLiterals(&zc->seqStore, lastLiterals, lastLLSize); + } } + return ZSTDbss_compress; +} + +static size_t ZSTD_copyBlockSequences(SeqCollector* seqCollector, const seqStore_t* seqStore, const U32 prevRepcodes[ZSTD_REP_NUM]) +{ + const seqDef* inSeqs = seqStore->sequencesStart; + const size_t nbInSequences = seqStore->sequences - inSeqs; + const size_t nbInLiterals = (size_t)(seqStore->lit - seqStore->litStart); + + ZSTD_Sequence* outSeqs = seqCollector->seqIndex == 0 ? seqCollector->seqStart : seqCollector->seqStart + seqCollector->seqIndex; + const size_t nbOutSequences = nbInSequences + 1; + size_t nbOutLiterals = 0; + repcodes_t repcodes; + size_t i; + + /* Bounds check that we have enough space for every input sequence + * and the block delimiter + */ + assert(seqCollector->seqIndex <= seqCollector->maxSequences); + RETURN_ERROR_IF( + nbOutSequences > (size_t)(seqCollector->maxSequences - seqCollector->seqIndex), + dstSize_tooSmall, + "Not enough space to copy sequences"); + + ZSTD_memcpy(&repcodes, prevRepcodes, sizeof(repcodes)); + for (i = 0; i < nbInSequences; ++i) { + U32 rawOffset; + outSeqs[i].litLength = inSeqs[i].litLength; + outSeqs[i].matchLength = inSeqs[i].mlBase + MINMATCH; + outSeqs[i].rep = 0; + + /* Handle the possible single length >= 64K + * There can only be one because we add MINMATCH to every match length, + * and blocks are at most 128K. + */ + if (i == seqStore->longLengthPos) { + if (seqStore->longLengthType == ZSTD_llt_literalLength) { + outSeqs[i].litLength += 0x10000; + } else if (seqStore->longLengthType == ZSTD_llt_matchLength) { + outSeqs[i].matchLength += 0x10000; + } + } + + /* Determine the raw offset given the offBase, which may be a repcode. */ + if (OFFBASE_IS_REPCODE(inSeqs[i].offBase)) { + const U32 repcode = OFFBASE_TO_REPCODE(inSeqs[i].offBase); + assert(repcode > 0); + outSeqs[i].rep = repcode; + if (outSeqs[i].litLength != 0) { + rawOffset = repcodes.rep[repcode - 1]; + } else { + if (repcode == 3) { + assert(repcodes.rep[0] > 1); + rawOffset = repcodes.rep[0] - 1; + } else { + rawOffset = repcodes.rep[repcode]; + } + } + } else { + rawOffset = OFFBASE_TO_OFFSET(inSeqs[i].offBase); + } + outSeqs[i].offset = rawOffset; + + /* Update repcode history for the sequence */ + ZSTD_updateRep(repcodes.rep, + inSeqs[i].offBase, + inSeqs[i].litLength == 0); + + nbOutLiterals += outSeqs[i].litLength; + } + /* Insert last literals (if any exist) in the block as a sequence with ml == off == 0. + * If there are no last literals, then we'll emit (of: 0, ml: 0, ll: 0), which is a marker + * for the block boundary, according to the API. + */ + assert(nbInLiterals >= nbOutLiterals); + { + const size_t lastLLSize = nbInLiterals - nbOutLiterals; + outSeqs[nbInSequences].litLength = (U32)lastLLSize; + outSeqs[nbInSequences].matchLength = 0; + outSeqs[nbInSequences].offset = 0; + assert(nbOutSequences == nbInSequences + 1); + } + seqCollector->seqIndex += nbOutSequences; + assert(seqCollector->seqIndex <= seqCollector->maxSequences); + + return 0; +} + +size_t ZSTD_sequenceBound(size_t srcSize) { + const size_t maxNbSeq = (srcSize / ZSTD_MINMATCH_MIN) + 1; + const size_t maxNbDelims = (srcSize / ZSTD_BLOCKSIZE_MAX_MIN) + 1; + return maxNbSeq + maxNbDelims; +} + +size_t ZSTD_generateSequences(ZSTD_CCtx* zc, ZSTD_Sequence* outSeqs, + size_t outSeqsSize, const void* src, size_t srcSize) +{ + const size_t dstCapacity = ZSTD_compressBound(srcSize); + void* dst = ZSTD_customMalloc(dstCapacity, ZSTD_defaultCMem); + SeqCollector seqCollector; + { + int targetCBlockSize; + FORWARD_IF_ERROR(ZSTD_CCtx_getParameter(zc, ZSTD_c_targetCBlockSize, &targetCBlockSize), ""); + RETURN_ERROR_IF(targetCBlockSize != 0, parameter_unsupported, "targetCBlockSize != 0"); + } + { + int nbWorkers; + FORWARD_IF_ERROR(ZSTD_CCtx_getParameter(zc, ZSTD_c_nbWorkers, &nbWorkers), ""); + RETURN_ERROR_IF(nbWorkers != 0, parameter_unsupported, "nbWorkers != 0"); + } + + RETURN_ERROR_IF(dst == NULL, memory_allocation, "NULL pointer!"); + + seqCollector.collectSequences = 1; + seqCollector.seqStart = outSeqs; + seqCollector.seqIndex = 0; + seqCollector.maxSequences = outSeqsSize; + zc->seqCollector = seqCollector; + + { + const size_t ret = ZSTD_compress2(zc, dst, dstCapacity, src, srcSize); + ZSTD_customFree(dst, ZSTD_defaultCMem); + FORWARD_IF_ERROR(ret, "ZSTD_compress2 failed"); + } + assert(zc->seqCollector.seqIndex <= ZSTD_sequenceBound(srcSize)); + return zc->seqCollector.seqIndex; +} + +size_t ZSTD_mergeBlockDelimiters(ZSTD_Sequence* sequences, size_t seqsSize) { + size_t in = 0; + size_t out = 0; + for (; in < seqsSize; ++in) { + if (sequences[in].offset == 0 && sequences[in].matchLength == 0) { + if (in != seqsSize - 1) { + sequences[in+1].litLength += sequences[in].litLength; + } + } else { + sequences[out] = sequences[in]; + ++out; + } + } + return out; +} + +/* Unrolled loop to read four size_ts of input at a time. Returns 1 if is RLE, 0 if not. */ +static int ZSTD_isRLE(const BYTE* src, size_t length) { + const BYTE* ip = src; + const BYTE value = ip[0]; + const size_t valueST = (size_t)((U64)value * 0x0101010101010101ULL); + const size_t unrollSize = sizeof(size_t) * 4; + const size_t unrollMask = unrollSize - 1; + const size_t prefixLength = length & unrollMask; + size_t i; + if (length == 1) return 1; + /* Check if prefix is RLE first before using unrolled loop */ + if (prefixLength && ZSTD_count(ip+1, ip, ip+prefixLength) != prefixLength-1) { + return 0; + } + for (i = prefixLength; i != length; i += unrollSize) { + size_t u; + for (u = 0; u < unrollSize; u += sizeof(size_t)) { + if (MEM_readST(ip + i + u) != valueST) { + return 0; + } } } + return 1; +} + +/* Returns true if the given block may be RLE. + * This is just a heuristic based on the compressibility. + * It may return both false positives and false negatives. + */ +static int ZSTD_maybeRLE(seqStore_t const* seqStore) +{ + size_t const nbSeqs = (size_t)(seqStore->sequences - seqStore->sequencesStart); + size_t const nbLits = (size_t)(seqStore->lit - seqStore->litStart); + + return nbSeqs < 4 && nbLits < 10; +} + +static void +ZSTD_blockState_confirmRepcodesAndEntropyTables(ZSTD_blockState_t* const bs) +{ + ZSTD_compressedBlockState_t* const tmp = bs->prevCBlock; + bs->prevCBlock = bs->nextCBlock; + bs->nextCBlock = tmp; +} + +/* Writes the block header */ +static void +writeBlockHeader(void* op, size_t cSize, size_t blockSize, U32 lastBlock) +{ + U32 const cBlockHeader = cSize == 1 ? + lastBlock + (((U32)bt_rle)<<1) + (U32)(blockSize << 3) : + lastBlock + (((U32)bt_compressed)<<1) + (U32)(cSize << 3); + MEM_writeLE24(op, cBlockHeader); + DEBUGLOG(3, "writeBlockHeader: cSize: %zu blockSize: %zu lastBlock: %u", cSize, blockSize, lastBlock); +} + +/** ZSTD_buildBlockEntropyStats_literals() : + * Builds entropy for the literals. + * Stores literals block type (raw, rle, compressed, repeat) and + * huffman description table to hufMetadata. + * Requires ENTROPY_WORKSPACE_SIZE workspace + * @return : size of huffman description table, or an error code + */ +static size_t +ZSTD_buildBlockEntropyStats_literals(void* const src, size_t srcSize, + const ZSTD_hufCTables_t* prevHuf, + ZSTD_hufCTables_t* nextHuf, + ZSTD_hufCTablesMetadata_t* hufMetadata, + const int literalsCompressionIsDisabled, + void* workspace, size_t wkspSize, + int hufFlags) +{ + BYTE* const wkspStart = (BYTE*)workspace; + BYTE* const wkspEnd = wkspStart + wkspSize; + BYTE* const countWkspStart = wkspStart; + unsigned* const countWksp = (unsigned*)workspace; + const size_t countWkspSize = (HUF_SYMBOLVALUE_MAX + 1) * sizeof(unsigned); + BYTE* const nodeWksp = countWkspStart + countWkspSize; + const size_t nodeWkspSize = (size_t)(wkspEnd - nodeWksp); + unsigned maxSymbolValue = HUF_SYMBOLVALUE_MAX; + unsigned huffLog = LitHufLog; + HUF_repeat repeat = prevHuf->repeatMode; + DEBUGLOG(5, "ZSTD_buildBlockEntropyStats_literals (srcSize=%zu)", srcSize); + + /* Prepare nextEntropy assuming reusing the existing table */ + ZSTD_memcpy(nextHuf, prevHuf, sizeof(*prevHuf)); + + if (literalsCompressionIsDisabled) { + DEBUGLOG(5, "set_basic - disabled"); + hufMetadata->hType = set_basic; + return 0; + } + + /* small ? don't even attempt compression (speed opt) */ +#ifndef COMPRESS_LITERALS_SIZE_MIN +# define COMPRESS_LITERALS_SIZE_MIN 63 /* heuristic */ +#endif + { size_t const minLitSize = (prevHuf->repeatMode == HUF_repeat_valid) ? 6 : COMPRESS_LITERALS_SIZE_MIN; + if (srcSize <= minLitSize) { + DEBUGLOG(5, "set_basic - too small"); + hufMetadata->hType = set_basic; + return 0; + } } + + /* Scan input and build symbol stats */ + { size_t const largest = + HIST_count_wksp (countWksp, &maxSymbolValue, + (const BYTE*)src, srcSize, + workspace, wkspSize); + FORWARD_IF_ERROR(largest, "HIST_count_wksp failed"); + if (largest == srcSize) { + /* only one literal symbol */ + DEBUGLOG(5, "set_rle"); + hufMetadata->hType = set_rle; + return 0; + } + if (largest <= (srcSize >> 7)+4) { + /* heuristic: likely not compressible */ + DEBUGLOG(5, "set_basic - no gain"); + hufMetadata->hType = set_basic; + return 0; + } } + + /* Validate the previous Huffman table */ + if (repeat == HUF_repeat_check + && !HUF_validateCTable((HUF_CElt const*)prevHuf->CTable, countWksp, maxSymbolValue)) { + repeat = HUF_repeat_none; + } + + /* Build Huffman Tree */ + ZSTD_memset(nextHuf->CTable, 0, sizeof(nextHuf->CTable)); + huffLog = HUF_optimalTableLog(huffLog, srcSize, maxSymbolValue, nodeWksp, nodeWkspSize, nextHuf->CTable, countWksp, hufFlags); + assert(huffLog <= LitHufLog); + { size_t const maxBits = HUF_buildCTable_wksp((HUF_CElt*)nextHuf->CTable, countWksp, + maxSymbolValue, huffLog, + nodeWksp, nodeWkspSize); + FORWARD_IF_ERROR(maxBits, "HUF_buildCTable_wksp"); + huffLog = (U32)maxBits; + } + { /* Build and write the CTable */ + size_t const newCSize = HUF_estimateCompressedSize( + (HUF_CElt*)nextHuf->CTable, countWksp, maxSymbolValue); + size_t const hSize = HUF_writeCTable_wksp( + hufMetadata->hufDesBuffer, sizeof(hufMetadata->hufDesBuffer), + (HUF_CElt*)nextHuf->CTable, maxSymbolValue, huffLog, + nodeWksp, nodeWkspSize); + /* Check against repeating the previous CTable */ + if (repeat != HUF_repeat_none) { + size_t const oldCSize = HUF_estimateCompressedSize( + (HUF_CElt const*)prevHuf->CTable, countWksp, maxSymbolValue); + if (oldCSize < srcSize && (oldCSize <= hSize + newCSize || hSize + 12 >= srcSize)) { + DEBUGLOG(5, "set_repeat - smaller"); + ZSTD_memcpy(nextHuf, prevHuf, sizeof(*prevHuf)); + hufMetadata->hType = set_repeat; + return 0; + } } + if (newCSize + hSize >= srcSize) { + DEBUGLOG(5, "set_basic - no gains"); + ZSTD_memcpy(nextHuf, prevHuf, sizeof(*prevHuf)); + hufMetadata->hType = set_basic; + return 0; + } + DEBUGLOG(5, "set_compressed (hSize=%u)", (U32)hSize); + hufMetadata->hType = set_compressed; + nextHuf->repeatMode = HUF_repeat_check; + return hSize; + } +} + + +/* ZSTD_buildDummySequencesStatistics(): + * Returns a ZSTD_symbolEncodingTypeStats_t with all encoding types as set_basic, + * and updates nextEntropy to the appropriate repeatMode. + */ +static ZSTD_symbolEncodingTypeStats_t +ZSTD_buildDummySequencesStatistics(ZSTD_fseCTables_t* nextEntropy) +{ + ZSTD_symbolEncodingTypeStats_t stats = {set_basic, set_basic, set_basic, 0, 0, 0}; + nextEntropy->litlength_repeatMode = FSE_repeat_none; + nextEntropy->offcode_repeatMode = FSE_repeat_none; + nextEntropy->matchlength_repeatMode = FSE_repeat_none; + return stats; +} + +/** ZSTD_buildBlockEntropyStats_sequences() : + * Builds entropy for the sequences. + * Stores symbol compression modes and fse table to fseMetadata. + * Requires ENTROPY_WORKSPACE_SIZE wksp. + * @return : size of fse tables or error code */ +static size_t +ZSTD_buildBlockEntropyStats_sequences( + const seqStore_t* seqStorePtr, + const ZSTD_fseCTables_t* prevEntropy, + ZSTD_fseCTables_t* nextEntropy, + const ZSTD_CCtx_params* cctxParams, + ZSTD_fseCTablesMetadata_t* fseMetadata, + void* workspace, size_t wkspSize) +{ + ZSTD_strategy const strategy = cctxParams->cParams.strategy; + size_t const nbSeq = (size_t)(seqStorePtr->sequences - seqStorePtr->sequencesStart); + BYTE* const ostart = fseMetadata->fseTablesBuffer; + BYTE* const oend = ostart + sizeof(fseMetadata->fseTablesBuffer); + BYTE* op = ostart; + unsigned* countWorkspace = (unsigned*)workspace; + unsigned* entropyWorkspace = countWorkspace + (MaxSeq + 1); + size_t entropyWorkspaceSize = wkspSize - (MaxSeq + 1) * sizeof(*countWorkspace); + ZSTD_symbolEncodingTypeStats_t stats; + + DEBUGLOG(5, "ZSTD_buildBlockEntropyStats_sequences (nbSeq=%zu)", nbSeq); + stats = nbSeq != 0 ? ZSTD_buildSequencesStatistics(seqStorePtr, nbSeq, + prevEntropy, nextEntropy, op, oend, + strategy, countWorkspace, + entropyWorkspace, entropyWorkspaceSize) + : ZSTD_buildDummySequencesStatistics(nextEntropy); + FORWARD_IF_ERROR(stats.size, "ZSTD_buildSequencesStatistics failed!"); + fseMetadata->llType = (symbolEncodingType_e) stats.LLtype; + fseMetadata->ofType = (symbolEncodingType_e) stats.Offtype; + fseMetadata->mlType = (symbolEncodingType_e) stats.MLtype; + fseMetadata->lastCountSize = stats.lastCountSize; + return stats.size; +} + + +/** ZSTD_buildBlockEntropyStats() : + * Builds entropy for the block. + * Requires workspace size ENTROPY_WORKSPACE_SIZE + * @return : 0 on success, or an error code + * Note : also employed in superblock + */ +size_t ZSTD_buildBlockEntropyStats( + const seqStore_t* seqStorePtr, + const ZSTD_entropyCTables_t* prevEntropy, + ZSTD_entropyCTables_t* nextEntropy, + const ZSTD_CCtx_params* cctxParams, + ZSTD_entropyCTablesMetadata_t* entropyMetadata, + void* workspace, size_t wkspSize) +{ + size_t const litSize = (size_t)(seqStorePtr->lit - seqStorePtr->litStart); + int const huf_useOptDepth = (cctxParams->cParams.strategy >= HUF_OPTIMAL_DEPTH_THRESHOLD); + int const hufFlags = huf_useOptDepth ? HUF_flags_optimalDepth : 0; + + entropyMetadata->hufMetadata.hufDesSize = + ZSTD_buildBlockEntropyStats_literals(seqStorePtr->litStart, litSize, + &prevEntropy->huf, &nextEntropy->huf, + &entropyMetadata->hufMetadata, + ZSTD_literalsCompressionIsDisabled(cctxParams), + workspace, wkspSize, hufFlags); + + FORWARD_IF_ERROR(entropyMetadata->hufMetadata.hufDesSize, "ZSTD_buildBlockEntropyStats_literals failed"); + entropyMetadata->fseMetadata.fseTablesSize = + ZSTD_buildBlockEntropyStats_sequences(seqStorePtr, + &prevEntropy->fse, &nextEntropy->fse, + cctxParams, + &entropyMetadata->fseMetadata, + workspace, wkspSize); + FORWARD_IF_ERROR(entropyMetadata->fseMetadata.fseTablesSize, "ZSTD_buildBlockEntropyStats_sequences failed"); + return 0; +} + +/* Returns the size estimate for the literals section (header + content) of a block */ +static size_t +ZSTD_estimateBlockSize_literal(const BYTE* literals, size_t litSize, + const ZSTD_hufCTables_t* huf, + const ZSTD_hufCTablesMetadata_t* hufMetadata, + void* workspace, size_t wkspSize, + int writeEntropy) +{ + unsigned* const countWksp = (unsigned*)workspace; + unsigned maxSymbolValue = HUF_SYMBOLVALUE_MAX; + size_t literalSectionHeaderSize = 3 + (litSize >= 1 KB) + (litSize >= 16 KB); + U32 singleStream = litSize < 256; + + if (hufMetadata->hType == set_basic) return litSize; + else if (hufMetadata->hType == set_rle) return 1; + else if (hufMetadata->hType == set_compressed || hufMetadata->hType == set_repeat) { + size_t const largest = HIST_count_wksp (countWksp, &maxSymbolValue, (const BYTE*)literals, litSize, workspace, wkspSize); + if (ZSTD_isError(largest)) return litSize; + { size_t cLitSizeEstimate = HUF_estimateCompressedSize((const HUF_CElt*)huf->CTable, countWksp, maxSymbolValue); + if (writeEntropy) cLitSizeEstimate += hufMetadata->hufDesSize; + if (!singleStream) cLitSizeEstimate += 6; /* multi-stream huffman uses 6-byte jump table */ + return cLitSizeEstimate + literalSectionHeaderSize; + } } + assert(0); /* impossible */ + return 0; +} + +/* Returns the size estimate for the FSE-compressed symbols (of, ml, ll) of a block */ +static size_t +ZSTD_estimateBlockSize_symbolType(symbolEncodingType_e type, + const BYTE* codeTable, size_t nbSeq, unsigned maxCode, + const FSE_CTable* fseCTable, + const U8* additionalBits, + short const* defaultNorm, U32 defaultNormLog, U32 defaultMax, + void* workspace, size_t wkspSize) +{ + unsigned* const countWksp = (unsigned*)workspace; + const BYTE* ctp = codeTable; + const BYTE* const ctStart = ctp; + const BYTE* const ctEnd = ctStart + nbSeq; + size_t cSymbolTypeSizeEstimateInBits = 0; + unsigned max = maxCode; + + HIST_countFast_wksp(countWksp, &max, codeTable, nbSeq, workspace, wkspSize); /* can't fail */ + if (type == set_basic) { + /* We selected this encoding type, so it must be valid. */ + assert(max <= defaultMax); + (void)defaultMax; + cSymbolTypeSizeEstimateInBits = ZSTD_crossEntropyCost(defaultNorm, defaultNormLog, countWksp, max); + } else if (type == set_rle) { + cSymbolTypeSizeEstimateInBits = 0; + } else if (type == set_compressed || type == set_repeat) { + cSymbolTypeSizeEstimateInBits = ZSTD_fseBitCost(fseCTable, countWksp, max); + } + if (ZSTD_isError(cSymbolTypeSizeEstimateInBits)) { + return nbSeq * 10; + } + while (ctp < ctEnd) { + if (additionalBits) cSymbolTypeSizeEstimateInBits += additionalBits[*ctp]; + else cSymbolTypeSizeEstimateInBits += *ctp; /* for offset, offset code is also the number of additional bits */ + ctp++; + } + return cSymbolTypeSizeEstimateInBits >> 3; +} + +/* Returns the size estimate for the sequences section (header + content) of a block */ +static size_t +ZSTD_estimateBlockSize_sequences(const BYTE* ofCodeTable, + const BYTE* llCodeTable, + const BYTE* mlCodeTable, + size_t nbSeq, + const ZSTD_fseCTables_t* fseTables, + const ZSTD_fseCTablesMetadata_t* fseMetadata, + void* workspace, size_t wkspSize, + int writeEntropy) +{ + size_t sequencesSectionHeaderSize = 1 /* seqHead */ + 1 /* min seqSize size */ + (nbSeq >= 128) + (nbSeq >= LONGNBSEQ); + size_t cSeqSizeEstimate = 0; + cSeqSizeEstimate += ZSTD_estimateBlockSize_symbolType(fseMetadata->ofType, ofCodeTable, nbSeq, MaxOff, + fseTables->offcodeCTable, NULL, + OF_defaultNorm, OF_defaultNormLog, DefaultMaxOff, + workspace, wkspSize); + cSeqSizeEstimate += ZSTD_estimateBlockSize_symbolType(fseMetadata->llType, llCodeTable, nbSeq, MaxLL, + fseTables->litlengthCTable, LL_bits, + LL_defaultNorm, LL_defaultNormLog, MaxLL, + workspace, wkspSize); + cSeqSizeEstimate += ZSTD_estimateBlockSize_symbolType(fseMetadata->mlType, mlCodeTable, nbSeq, MaxML, + fseTables->matchlengthCTable, ML_bits, + ML_defaultNorm, ML_defaultNormLog, MaxML, + workspace, wkspSize); + if (writeEntropy) cSeqSizeEstimate += fseMetadata->fseTablesSize; + return cSeqSizeEstimate + sequencesSectionHeaderSize; +} + +/* Returns the size estimate for a given stream of literals, of, ll, ml */ +static size_t +ZSTD_estimateBlockSize(const BYTE* literals, size_t litSize, + const BYTE* ofCodeTable, + const BYTE* llCodeTable, + const BYTE* mlCodeTable, + size_t nbSeq, + const ZSTD_entropyCTables_t* entropy, + const ZSTD_entropyCTablesMetadata_t* entropyMetadata, + void* workspace, size_t wkspSize, + int writeLitEntropy, int writeSeqEntropy) +{ + size_t const literalsSize = ZSTD_estimateBlockSize_literal(literals, litSize, + &entropy->huf, &entropyMetadata->hufMetadata, + workspace, wkspSize, writeLitEntropy); + size_t const seqSize = ZSTD_estimateBlockSize_sequences(ofCodeTable, llCodeTable, mlCodeTable, + nbSeq, &entropy->fse, &entropyMetadata->fseMetadata, + workspace, wkspSize, writeSeqEntropy); + return seqSize + literalsSize + ZSTD_blockHeaderSize; +} + +/* Builds entropy statistics and uses them for blocksize estimation. + * + * @return: estimated compressed size of the seqStore, or a zstd error. + */ +static size_t +ZSTD_buildEntropyStatisticsAndEstimateSubBlockSize(seqStore_t* seqStore, ZSTD_CCtx* zc) +{ + ZSTD_entropyCTablesMetadata_t* const entropyMetadata = &zc->blockSplitCtx.entropyMetadata; + DEBUGLOG(6, "ZSTD_buildEntropyStatisticsAndEstimateSubBlockSize()"); + FORWARD_IF_ERROR(ZSTD_buildBlockEntropyStats(seqStore, + &zc->blockState.prevCBlock->entropy, + &zc->blockState.nextCBlock->entropy, + &zc->appliedParams, + entropyMetadata, + zc->entropyWorkspace, ENTROPY_WORKSPACE_SIZE), ""); + return ZSTD_estimateBlockSize( + seqStore->litStart, (size_t)(seqStore->lit - seqStore->litStart), + seqStore->ofCode, seqStore->llCode, seqStore->mlCode, + (size_t)(seqStore->sequences - seqStore->sequencesStart), + &zc->blockState.nextCBlock->entropy, + entropyMetadata, + zc->entropyWorkspace, ENTROPY_WORKSPACE_SIZE, + (int)(entropyMetadata->hufMetadata.hType == set_compressed), 1); +} + +/* Returns literals bytes represented in a seqStore */ +static size_t ZSTD_countSeqStoreLiteralsBytes(const seqStore_t* const seqStore) +{ + size_t literalsBytes = 0; + size_t const nbSeqs = (size_t)(seqStore->sequences - seqStore->sequencesStart); + size_t i; + for (i = 0; i < nbSeqs; ++i) { + seqDef const seq = seqStore->sequencesStart[i]; + literalsBytes += seq.litLength; + if (i == seqStore->longLengthPos && seqStore->longLengthType == ZSTD_llt_literalLength) { + literalsBytes += 0x10000; + } } + return literalsBytes; +} + +/* Returns match bytes represented in a seqStore */ +static size_t ZSTD_countSeqStoreMatchBytes(const seqStore_t* const seqStore) +{ + size_t matchBytes = 0; + size_t const nbSeqs = (size_t)(seqStore->sequences - seqStore->sequencesStart); + size_t i; + for (i = 0; i < nbSeqs; ++i) { + seqDef seq = seqStore->sequencesStart[i]; + matchBytes += seq.mlBase + MINMATCH; + if (i == seqStore->longLengthPos && seqStore->longLengthType == ZSTD_llt_matchLength) { + matchBytes += 0x10000; + } } + return matchBytes; +} + +/* Derives the seqStore that is a chunk of the originalSeqStore from [startIdx, endIdx). + * Stores the result in resultSeqStore. + */ +static void ZSTD_deriveSeqStoreChunk(seqStore_t* resultSeqStore, + const seqStore_t* originalSeqStore, + size_t startIdx, size_t endIdx) +{ + *resultSeqStore = *originalSeqStore; + if (startIdx > 0) { + resultSeqStore->sequences = originalSeqStore->sequencesStart + startIdx; + resultSeqStore->litStart += ZSTD_countSeqStoreLiteralsBytes(resultSeqStore); + } + + /* Move longLengthPos into the correct position if necessary */ + if (originalSeqStore->longLengthType != ZSTD_llt_none) { + if (originalSeqStore->longLengthPos < startIdx || originalSeqStore->longLengthPos > endIdx) { + resultSeqStore->longLengthType = ZSTD_llt_none; + } else { + resultSeqStore->longLengthPos -= (U32)startIdx; + } + } + resultSeqStore->sequencesStart = originalSeqStore->sequencesStart + startIdx; + resultSeqStore->sequences = originalSeqStore->sequencesStart + endIdx; + if (endIdx == (size_t)(originalSeqStore->sequences - originalSeqStore->sequencesStart)) { + /* This accounts for possible last literals if the derived chunk reaches the end of the block */ + assert(resultSeqStore->lit == originalSeqStore->lit); + } else { + size_t const literalsBytes = ZSTD_countSeqStoreLiteralsBytes(resultSeqStore); + resultSeqStore->lit = resultSeqStore->litStart + literalsBytes; + } + resultSeqStore->llCode += startIdx; + resultSeqStore->mlCode += startIdx; + resultSeqStore->ofCode += startIdx; +} + +/** + * Returns the raw offset represented by the combination of offBase, ll0, and repcode history. + * offBase must represent a repcode in the numeric representation of ZSTD_storeSeq(). + */ +static U32 +ZSTD_resolveRepcodeToRawOffset(const U32 rep[ZSTD_REP_NUM], const U32 offBase, const U32 ll0) +{ + U32 const adjustedRepCode = OFFBASE_TO_REPCODE(offBase) - 1 + ll0; /* [ 0 - 3 ] */ + assert(OFFBASE_IS_REPCODE(offBase)); + if (adjustedRepCode == ZSTD_REP_NUM) { + assert(ll0); + /* litlength == 0 and offCode == 2 implies selection of first repcode - 1 + * This is only valid if it results in a valid offset value, aka > 0. + * Note : it may happen that `rep[0]==1` in exceptional circumstances. + * In which case this function will return 0, which is an invalid offset. + * It's not an issue though, since this value will be + * compared and discarded within ZSTD_seqStore_resolveOffCodes(). + */ + return rep[0] - 1; + } + return rep[adjustedRepCode]; +} + +/** + * ZSTD_seqStore_resolveOffCodes() reconciles any possible divergences in offset history that may arise + * due to emission of RLE/raw blocks that disturb the offset history, + * and replaces any repcodes within the seqStore that may be invalid. + * + * dRepcodes are updated as would be on the decompression side. + * cRepcodes are updated exactly in accordance with the seqStore. + * + * Note : this function assumes seq->offBase respects the following numbering scheme : + * 0 : invalid + * 1-3 : repcode 1-3 + * 4+ : real_offset+3 + */ +static void +ZSTD_seqStore_resolveOffCodes(repcodes_t* const dRepcodes, repcodes_t* const cRepcodes, + const seqStore_t* const seqStore, U32 const nbSeq) +{ + U32 idx = 0; + U32 const longLitLenIdx = seqStore->longLengthType == ZSTD_llt_literalLength ? seqStore->longLengthPos : nbSeq; + for (; idx < nbSeq; ++idx) { + seqDef* const seq = seqStore->sequencesStart + idx; + U32 const ll0 = (seq->litLength == 0) && (idx != longLitLenIdx); + U32 const offBase = seq->offBase; + assert(offBase > 0); + if (OFFBASE_IS_REPCODE(offBase)) { + U32 const dRawOffset = ZSTD_resolveRepcodeToRawOffset(dRepcodes->rep, offBase, ll0); + U32 const cRawOffset = ZSTD_resolveRepcodeToRawOffset(cRepcodes->rep, offBase, ll0); + /* Adjust simulated decompression repcode history if we come across a mismatch. Replace + * the repcode with the offset it actually references, determined by the compression + * repcode history. + */ + if (dRawOffset != cRawOffset) { + seq->offBase = OFFSET_TO_OFFBASE(cRawOffset); + } + } + /* Compression repcode history is always updated with values directly from the unmodified seqStore. + * Decompression repcode history may use modified seq->offset value taken from compression repcode history. + */ + ZSTD_updateRep(dRepcodes->rep, seq->offBase, ll0); + ZSTD_updateRep(cRepcodes->rep, offBase, ll0); + } +} + +/* ZSTD_compressSeqStore_singleBlock(): + * Compresses a seqStore into a block with a block header, into the buffer dst. + * + * Returns the total size of that block (including header) or a ZSTD error code. + */ +static size_t +ZSTD_compressSeqStore_singleBlock(ZSTD_CCtx* zc, + const seqStore_t* const seqStore, + repcodes_t* const dRep, repcodes_t* const cRep, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + U32 lastBlock, U32 isPartition) +{ + const U32 rleMaxLength = 25; + BYTE* op = (BYTE*)dst; + const BYTE* ip = (const BYTE*)src; + size_t cSize; + size_t cSeqsSize; + + /* In case of an RLE or raw block, the simulated decompression repcode history must be reset */ + repcodes_t const dRepOriginal = *dRep; + DEBUGLOG(5, "ZSTD_compressSeqStore_singleBlock"); + if (isPartition) + ZSTD_seqStore_resolveOffCodes(dRep, cRep, seqStore, (U32)(seqStore->sequences - seqStore->sequencesStart)); + + RETURN_ERROR_IF(dstCapacity < ZSTD_blockHeaderSize, dstSize_tooSmall, "Block header doesn't fit"); + cSeqsSize = ZSTD_entropyCompressSeqStore(seqStore, + &zc->blockState.prevCBlock->entropy, &zc->blockState.nextCBlock->entropy, + &zc->appliedParams, + op + ZSTD_blockHeaderSize, dstCapacity - ZSTD_blockHeaderSize, + srcSize, + zc->entropyWorkspace, ENTROPY_WORKSPACE_SIZE /* statically allocated in resetCCtx */, + zc->bmi2); + FORWARD_IF_ERROR(cSeqsSize, "ZSTD_entropyCompressSeqStore failed!"); + + if (!zc->isFirstBlock && + cSeqsSize < rleMaxLength && + ZSTD_isRLE((BYTE const*)src, srcSize)) { + /* We don't want to emit our first block as a RLE even if it qualifies because + * doing so will cause the decoder (cli only) to throw a "should consume all input error." + * This is only an issue for zstd <= v1.4.3 + */ + cSeqsSize = 1; + } + + /* Sequence collection not supported when block splitting */ + if (zc->seqCollector.collectSequences) { + FORWARD_IF_ERROR(ZSTD_copyBlockSequences(&zc->seqCollector, seqStore, dRepOriginal.rep), "copyBlockSequences failed"); + ZSTD_blockState_confirmRepcodesAndEntropyTables(&zc->blockState); + return 0; + } + + if (cSeqsSize == 0) { + cSize = ZSTD_noCompressBlock(op, dstCapacity, ip, srcSize, lastBlock); + FORWARD_IF_ERROR(cSize, "Nocompress block failed"); + DEBUGLOG(4, "Writing out nocompress block, size: %zu", cSize); + *dRep = dRepOriginal; /* reset simulated decompression repcode history */ + } else if (cSeqsSize == 1) { + cSize = ZSTD_rleCompressBlock(op, dstCapacity, *ip, srcSize, lastBlock); + FORWARD_IF_ERROR(cSize, "RLE compress block failed"); + DEBUGLOG(4, "Writing out RLE block, size: %zu", cSize); + *dRep = dRepOriginal; /* reset simulated decompression repcode history */ + } else { + ZSTD_blockState_confirmRepcodesAndEntropyTables(&zc->blockState); + writeBlockHeader(op, cSeqsSize, srcSize, lastBlock); + cSize = ZSTD_blockHeaderSize + cSeqsSize; + DEBUGLOG(4, "Writing out compressed block, size: %zu", cSize); + } + + if (zc->blockState.prevCBlock->entropy.fse.offcode_repeatMode == FSE_repeat_valid) + zc->blockState.prevCBlock->entropy.fse.offcode_repeatMode = FSE_repeat_check; + + return cSize; +} + +/* Struct to keep track of where we are in our recursive calls. */ +typedef struct { + U32* splitLocations; /* Array of split indices */ + size_t idx; /* The current index within splitLocations being worked on */ +} seqStoreSplits; + +#define MIN_SEQUENCES_BLOCK_SPLITTING 300 + +/* Helper function to perform the recursive search for block splits. + * Estimates the cost of seqStore prior to split, and estimates the cost of splitting the sequences in half. + * If advantageous to split, then we recurse down the two sub-blocks. + * If not, or if an error occurred in estimation, then we do not recurse. + * + * Note: The recursion depth is capped by a heuristic minimum number of sequences, + * defined by MIN_SEQUENCES_BLOCK_SPLITTING. + * In theory, this means the absolute largest recursion depth is 10 == log2(maxNbSeqInBlock/MIN_SEQUENCES_BLOCK_SPLITTING). + * In practice, recursion depth usually doesn't go beyond 4. + * + * Furthermore, the number of splits is capped by ZSTD_MAX_NB_BLOCK_SPLITS. + * At ZSTD_MAX_NB_BLOCK_SPLITS == 196 with the current existing blockSize + * maximum of 128 KB, this value is actually impossible to reach. + */ +static void +ZSTD_deriveBlockSplitsHelper(seqStoreSplits* splits, size_t startIdx, size_t endIdx, + ZSTD_CCtx* zc, const seqStore_t* origSeqStore) +{ + seqStore_t* const fullSeqStoreChunk = &zc->blockSplitCtx.fullSeqStoreChunk; + seqStore_t* const firstHalfSeqStore = &zc->blockSplitCtx.firstHalfSeqStore; + seqStore_t* const secondHalfSeqStore = &zc->blockSplitCtx.secondHalfSeqStore; + size_t estimatedOriginalSize; + size_t estimatedFirstHalfSize; + size_t estimatedSecondHalfSize; + size_t midIdx = (startIdx + endIdx)/2; + + DEBUGLOG(5, "ZSTD_deriveBlockSplitsHelper: startIdx=%zu endIdx=%zu", startIdx, endIdx); + assert(endIdx >= startIdx); + if (endIdx - startIdx < MIN_SEQUENCES_BLOCK_SPLITTING || splits->idx >= ZSTD_MAX_NB_BLOCK_SPLITS) { + DEBUGLOG(6, "ZSTD_deriveBlockSplitsHelper: Too few sequences (%zu)", endIdx - startIdx); + return; + } + ZSTD_deriveSeqStoreChunk(fullSeqStoreChunk, origSeqStore, startIdx, endIdx); + ZSTD_deriveSeqStoreChunk(firstHalfSeqStore, origSeqStore, startIdx, midIdx); + ZSTD_deriveSeqStoreChunk(secondHalfSeqStore, origSeqStore, midIdx, endIdx); + estimatedOriginalSize = ZSTD_buildEntropyStatisticsAndEstimateSubBlockSize(fullSeqStoreChunk, zc); + estimatedFirstHalfSize = ZSTD_buildEntropyStatisticsAndEstimateSubBlockSize(firstHalfSeqStore, zc); + estimatedSecondHalfSize = ZSTD_buildEntropyStatisticsAndEstimateSubBlockSize(secondHalfSeqStore, zc); + DEBUGLOG(5, "Estimated original block size: %zu -- First half split: %zu -- Second half split: %zu", + estimatedOriginalSize, estimatedFirstHalfSize, estimatedSecondHalfSize); + if (ZSTD_isError(estimatedOriginalSize) || ZSTD_isError(estimatedFirstHalfSize) || ZSTD_isError(estimatedSecondHalfSize)) { + return; + } + if (estimatedFirstHalfSize + estimatedSecondHalfSize < estimatedOriginalSize) { + DEBUGLOG(5, "split decided at seqNb:%zu", midIdx); + ZSTD_deriveBlockSplitsHelper(splits, startIdx, midIdx, zc, origSeqStore); + splits->splitLocations[splits->idx] = (U32)midIdx; + splits->idx++; + ZSTD_deriveBlockSplitsHelper(splits, midIdx, endIdx, zc, origSeqStore); + } +} + +/* Base recursive function. + * Populates a table with intra-block partition indices that can improve compression ratio. + * + * @return: number of splits made (which equals the size of the partition table - 1). + */ +static size_t ZSTD_deriveBlockSplits(ZSTD_CCtx* zc, U32 partitions[], U32 nbSeq) +{ + seqStoreSplits splits; + splits.splitLocations = partitions; + splits.idx = 0; + if (nbSeq <= 4) { + DEBUGLOG(5, "ZSTD_deriveBlockSplits: Too few sequences to split (%u <= 4)", nbSeq); + /* Refuse to try and split anything with less than 4 sequences */ + return 0; + } + ZSTD_deriveBlockSplitsHelper(&splits, 0, nbSeq, zc, &zc->seqStore); + splits.splitLocations[splits.idx] = nbSeq; + DEBUGLOG(5, "ZSTD_deriveBlockSplits: final nb partitions: %zu", splits.idx+1); + return splits.idx; +} + +/* ZSTD_compressBlock_splitBlock(): + * Attempts to split a given block into multiple blocks to improve compression ratio. + * + * Returns combined size of all blocks (which includes headers), or a ZSTD error code. + */ +static size_t +ZSTD_compressBlock_splitBlock_internal(ZSTD_CCtx* zc, + void* dst, size_t dstCapacity, + const void* src, size_t blockSize, + U32 lastBlock, U32 nbSeq) +{ + size_t cSize = 0; + const BYTE* ip = (const BYTE*)src; + BYTE* op = (BYTE*)dst; + size_t i = 0; + size_t srcBytesTotal = 0; + U32* const partitions = zc->blockSplitCtx.partitions; /* size == ZSTD_MAX_NB_BLOCK_SPLITS */ + seqStore_t* const nextSeqStore = &zc->blockSplitCtx.nextSeqStore; + seqStore_t* const currSeqStore = &zc->blockSplitCtx.currSeqStore; + size_t const numSplits = ZSTD_deriveBlockSplits(zc, partitions, nbSeq); + + /* If a block is split and some partitions are emitted as RLE/uncompressed, then repcode history + * may become invalid. In order to reconcile potentially invalid repcodes, we keep track of two + * separate repcode histories that simulate repcode history on compression and decompression side, + * and use the histories to determine whether we must replace a particular repcode with its raw offset. + * + * 1) cRep gets updated for each partition, regardless of whether the block was emitted as uncompressed + * or RLE. This allows us to retrieve the offset value that an invalid repcode references within + * a nocompress/RLE block. + * 2) dRep gets updated only for compressed partitions, and when a repcode gets replaced, will use + * the replacement offset value rather than the original repcode to update the repcode history. + * dRep also will be the final repcode history sent to the next block. + * + * See ZSTD_seqStore_resolveOffCodes() for more details. + */ + repcodes_t dRep; + repcodes_t cRep; + ZSTD_memcpy(dRep.rep, zc->blockState.prevCBlock->rep, sizeof(repcodes_t)); + ZSTD_memcpy(cRep.rep, zc->blockState.prevCBlock->rep, sizeof(repcodes_t)); + ZSTD_memset(nextSeqStore, 0, sizeof(seqStore_t)); + + DEBUGLOG(5, "ZSTD_compressBlock_splitBlock_internal (dstCapacity=%u, dictLimit=%u, nextToUpdate=%u)", + (unsigned)dstCapacity, (unsigned)zc->blockState.matchState.window.dictLimit, + (unsigned)zc->blockState.matchState.nextToUpdate); + + if (numSplits == 0) { + size_t cSizeSingleBlock = + ZSTD_compressSeqStore_singleBlock(zc, &zc->seqStore, + &dRep, &cRep, + op, dstCapacity, + ip, blockSize, + lastBlock, 0 /* isPartition */); + FORWARD_IF_ERROR(cSizeSingleBlock, "Compressing single block from splitBlock_internal() failed!"); + DEBUGLOG(5, "ZSTD_compressBlock_splitBlock_internal: No splits"); + assert(zc->blockSize <= ZSTD_BLOCKSIZE_MAX); + assert(cSizeSingleBlock <= zc->blockSize + ZSTD_blockHeaderSize); + return cSizeSingleBlock; + } + + ZSTD_deriveSeqStoreChunk(currSeqStore, &zc->seqStore, 0, partitions[0]); + for (i = 0; i <= numSplits; ++i) { + size_t cSizeChunk; + U32 const lastPartition = (i == numSplits); + U32 lastBlockEntireSrc = 0; + + size_t srcBytes = ZSTD_countSeqStoreLiteralsBytes(currSeqStore) + ZSTD_countSeqStoreMatchBytes(currSeqStore); + srcBytesTotal += srcBytes; + if (lastPartition) { + /* This is the final partition, need to account for possible last literals */ + srcBytes += blockSize - srcBytesTotal; + lastBlockEntireSrc = lastBlock; + } else { + ZSTD_deriveSeqStoreChunk(nextSeqStore, &zc->seqStore, partitions[i], partitions[i+1]); + } + + cSizeChunk = ZSTD_compressSeqStore_singleBlock(zc, currSeqStore, + &dRep, &cRep, + op, dstCapacity, + ip, srcBytes, + lastBlockEntireSrc, 1 /* isPartition */); + DEBUGLOG(5, "Estimated size: %zu vs %zu : actual size", + ZSTD_buildEntropyStatisticsAndEstimateSubBlockSize(currSeqStore, zc), cSizeChunk); + FORWARD_IF_ERROR(cSizeChunk, "Compressing chunk failed!"); + + ip += srcBytes; + op += cSizeChunk; + dstCapacity -= cSizeChunk; + cSize += cSizeChunk; + *currSeqStore = *nextSeqStore; + assert(cSizeChunk <= zc->blockSize + ZSTD_blockHeaderSize); + } + /* cRep and dRep may have diverged during the compression. + * If so, we use the dRep repcodes for the next block. + */ + ZSTD_memcpy(zc->blockState.prevCBlock->rep, dRep.rep, sizeof(repcodes_t)); + return cSize; +} + +static size_t +ZSTD_compressBlock_splitBlock(ZSTD_CCtx* zc, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, U32 lastBlock) +{ + U32 nbSeq; + size_t cSize; + DEBUGLOG(4, "ZSTD_compressBlock_splitBlock"); + assert(zc->appliedParams.useBlockSplitter == ZSTD_ps_enable); + + { const size_t bss = ZSTD_buildSeqStore(zc, src, srcSize); + FORWARD_IF_ERROR(bss, "ZSTD_buildSeqStore failed"); + if (bss == ZSTDbss_noCompress) { + if (zc->blockState.prevCBlock->entropy.fse.offcode_repeatMode == FSE_repeat_valid) + zc->blockState.prevCBlock->entropy.fse.offcode_repeatMode = FSE_repeat_check; + RETURN_ERROR_IF(zc->seqCollector.collectSequences, sequenceProducer_failed, "Uncompressible block"); + cSize = ZSTD_noCompressBlock(dst, dstCapacity, src, srcSize, lastBlock); + FORWARD_IF_ERROR(cSize, "ZSTD_noCompressBlock failed"); + DEBUGLOG(4, "ZSTD_compressBlock_splitBlock: Nocompress block"); + return cSize; + } + nbSeq = (U32)(zc->seqStore.sequences - zc->seqStore.sequencesStart); + } + + cSize = ZSTD_compressBlock_splitBlock_internal(zc, dst, dstCapacity, src, srcSize, lastBlock, nbSeq); + FORWARD_IF_ERROR(cSize, "Splitting blocks failed!"); + return cSize; +} + +static size_t +ZSTD_compressBlock_internal(ZSTD_CCtx* zc, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, U32 frame) +{ + /* This is an estimated upper bound for the length of an rle block. + * This isn't the actual upper bound. + * Finding the real threshold needs further investigation. + */ + const U32 rleMaxLength = 25; + size_t cSize; + const BYTE* ip = (const BYTE*)src; + BYTE* op = (BYTE*)dst; + DEBUGLOG(5, "ZSTD_compressBlock_internal (dstCapacity=%u, dictLimit=%u, nextToUpdate=%u)", + (unsigned)dstCapacity, (unsigned)zc->blockState.matchState.window.dictLimit, + (unsigned)zc->blockState.matchState.nextToUpdate); + + { const size_t bss = ZSTD_buildSeqStore(zc, src, srcSize); + FORWARD_IF_ERROR(bss, "ZSTD_buildSeqStore failed"); + if (bss == ZSTDbss_noCompress) { + RETURN_ERROR_IF(zc->seqCollector.collectSequences, sequenceProducer_failed, "Uncompressible block"); + cSize = 0; + goto out; + } + } + + if (zc->seqCollector.collectSequences) { + FORWARD_IF_ERROR(ZSTD_copyBlockSequences(&zc->seqCollector, ZSTD_getSeqStore(zc), zc->blockState.prevCBlock->rep), "copyBlockSequences failed"); + ZSTD_blockState_confirmRepcodesAndEntropyTables(&zc->blockState); + return 0; + } + + /* encode sequences and literals */ + cSize = ZSTD_entropyCompressSeqStore(&zc->seqStore, + &zc->blockState.prevCBlock->entropy, &zc->blockState.nextCBlock->entropy, + &zc->appliedParams, + dst, dstCapacity, + srcSize, + zc->entropyWorkspace, ENTROPY_WORKSPACE_SIZE /* statically allocated in resetCCtx */, + zc->bmi2); + + if (frame && + /* We don't want to emit our first block as a RLE even if it qualifies because + * doing so will cause the decoder (cli only) to throw a "should consume all input error." + * This is only an issue for zstd <= v1.4.3 + */ + !zc->isFirstBlock && + cSize < rleMaxLength && + ZSTD_isRLE(ip, srcSize)) + { + cSize = 1; + op[0] = ip[0]; + } + +out: + if (!ZSTD_isError(cSize) && cSize > 1) { + ZSTD_blockState_confirmRepcodesAndEntropyTables(&zc->blockState); + } + /* We check that dictionaries have offset codes available for the first + * block. After the first block, the offcode table might not have large + * enough codes to represent the offsets in the data. + */ + if (zc->blockState.prevCBlock->entropy.fse.offcode_repeatMode == FSE_repeat_valid) + zc->blockState.prevCBlock->entropy.fse.offcode_repeatMode = FSE_repeat_check; + + return cSize; +} + +static size_t ZSTD_compressBlock_targetCBlockSize_body(ZSTD_CCtx* zc, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + const size_t bss, U32 lastBlock) +{ + DEBUGLOG(6, "Attempting ZSTD_compressSuperBlock()"); + if (bss == ZSTDbss_compress) { + if (/* We don't want to emit our first block as a RLE even if it qualifies because + * doing so will cause the decoder (cli only) to throw a "should consume all input error." + * This is only an issue for zstd <= v1.4.3 + */ + !zc->isFirstBlock && + ZSTD_maybeRLE(&zc->seqStore) && + ZSTD_isRLE((BYTE const*)src, srcSize)) + { + return ZSTD_rleCompressBlock(dst, dstCapacity, *(BYTE const*)src, srcSize, lastBlock); + } + /* Attempt superblock compression. + * + * Note that compressed size of ZSTD_compressSuperBlock() is not bound by the + * standard ZSTD_compressBound(). This is a problem, because even if we have + * space now, taking an extra byte now could cause us to run out of space later + * and violate ZSTD_compressBound(). + * + * Define blockBound(blockSize) = blockSize + ZSTD_blockHeaderSize. + * + * In order to respect ZSTD_compressBound() we must attempt to emit a raw + * uncompressed block in these cases: + * * cSize == 0: Return code for an uncompressed block. + * * cSize == dstSize_tooSmall: We may have expanded beyond blockBound(srcSize). + * ZSTD_noCompressBlock() will return dstSize_tooSmall if we are really out of + * output space. + * * cSize >= blockBound(srcSize): We have expanded the block too much so + * emit an uncompressed block. + */ + { size_t const cSize = + ZSTD_compressSuperBlock(zc, dst, dstCapacity, src, srcSize, lastBlock); + if (cSize != ERROR(dstSize_tooSmall)) { + size_t const maxCSize = + srcSize - ZSTD_minGain(srcSize, zc->appliedParams.cParams.strategy); + FORWARD_IF_ERROR(cSize, "ZSTD_compressSuperBlock failed"); + if (cSize != 0 && cSize < maxCSize + ZSTD_blockHeaderSize) { + ZSTD_blockState_confirmRepcodesAndEntropyTables(&zc->blockState); + return cSize; + } + } + } + } /* if (bss == ZSTDbss_compress)*/ + + DEBUGLOG(6, "Resorting to ZSTD_noCompressBlock()"); + /* Superblock compression failed, attempt to emit a single no compress block. + * The decoder will be able to stream this block since it is uncompressed. + */ + return ZSTD_noCompressBlock(dst, dstCapacity, src, srcSize, lastBlock); +} + +static size_t ZSTD_compressBlock_targetCBlockSize(ZSTD_CCtx* zc, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + U32 lastBlock) +{ + size_t cSize = 0; + const size_t bss = ZSTD_buildSeqStore(zc, src, srcSize); + DEBUGLOG(5, "ZSTD_compressBlock_targetCBlockSize (dstCapacity=%u, dictLimit=%u, nextToUpdate=%u, srcSize=%zu)", + (unsigned)dstCapacity, (unsigned)zc->blockState.matchState.window.dictLimit, (unsigned)zc->blockState.matchState.nextToUpdate, srcSize); + FORWARD_IF_ERROR(bss, "ZSTD_buildSeqStore failed"); + + cSize = ZSTD_compressBlock_targetCBlockSize_body(zc, dst, dstCapacity, src, srcSize, bss, lastBlock); + FORWARD_IF_ERROR(cSize, "ZSTD_compressBlock_targetCBlockSize_body failed"); + + if (zc->blockState.prevCBlock->entropy.fse.offcode_repeatMode == FSE_repeat_valid) + zc->blockState.prevCBlock->entropy.fse.offcode_repeatMode = FSE_repeat_check; + + return cSize; +} + +static void ZSTD_overflowCorrectIfNeeded(ZSTD_matchState_t* ms, + ZSTD_cwksp* ws, + ZSTD_CCtx_params const* params, + void const* ip, + void const* iend) +{ + U32 const cycleLog = ZSTD_cycleLog(params->cParams.chainLog, params->cParams.strategy); + U32 const maxDist = (U32)1 << params->cParams.windowLog; + if (ZSTD_window_needOverflowCorrection(ms->window, cycleLog, maxDist, ms->loadedDictEnd, ip, iend)) { + U32 const correction = ZSTD_window_correctOverflow(&ms->window, cycleLog, maxDist, ip); + ZSTD_STATIC_ASSERT(ZSTD_CHAINLOG_MAX <= 30); + ZSTD_STATIC_ASSERT(ZSTD_WINDOWLOG_MAX_32 <= 30); + ZSTD_STATIC_ASSERT(ZSTD_WINDOWLOG_MAX <= 31); + ZSTD_cwksp_mark_tables_dirty(ws); + ZSTD_reduceIndex(ms, params, correction); + ZSTD_cwksp_mark_tables_clean(ws); + if (ms->nextToUpdate < correction) ms->nextToUpdate = 0; + else ms->nextToUpdate -= correction; + /* invalidate dictionaries on overflow correction */ + ms->loadedDictEnd = 0; + ms->dictMatchState = NULL; + } +} + +/*! ZSTD_compress_frameChunk() : +* Compress a chunk of data into one or multiple blocks. +* All blocks will be terminated, all input will be consumed. +* Function will issue an error if there is not enough `dstCapacity` to hold the compressed content. +* Frame is supposed already started (header already produced) +* @return : compressed size, or an error code +*/ +static size_t ZSTD_compress_frameChunk(ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + U32 lastFrameChunk) +{ + size_t blockSize = cctx->blockSize; + size_t remaining = srcSize; + const BYTE* ip = (const BYTE*)src; + BYTE* const ostart = (BYTE*)dst; + BYTE* op = ostart; + U32 const maxDist = (U32)1 << cctx->appliedParams.cParams.windowLog; + + assert(cctx->appliedParams.cParams.windowLog <= ZSTD_WINDOWLOG_MAX); + + DEBUGLOG(4, "ZSTD_compress_frameChunk (blockSize=%u)", (unsigned)blockSize); + if (cctx->appliedParams.fParams.checksumFlag && srcSize) + XXH64_update(&cctx->xxhState, src, srcSize); + + while (remaining) { + ZSTD_matchState_t* const ms = &cctx->blockState.matchState; + U32 const lastBlock = lastFrameChunk & (blockSize >= remaining); + + /* TODO: See 3090. We reduced MIN_CBLOCK_SIZE from 3 to 2 so to compensate we are adding + * additional 1. We need to revisit and change this logic to be more consistent */ + RETURN_ERROR_IF(dstCapacity < ZSTD_blockHeaderSize + MIN_CBLOCK_SIZE + 1, + dstSize_tooSmall, + "not enough space to store compressed block"); + if (remaining < blockSize) blockSize = remaining; + + ZSTD_overflowCorrectIfNeeded( + ms, &cctx->workspace, &cctx->appliedParams, ip, ip + blockSize); + ZSTD_checkDictValidity(&ms->window, ip + blockSize, maxDist, &ms->loadedDictEnd, &ms->dictMatchState); + ZSTD_window_enforceMaxDist(&ms->window, ip, maxDist, &ms->loadedDictEnd, &ms->dictMatchState); + + /* Ensure hash/chain table insertion resumes no sooner than lowlimit */ + if (ms->nextToUpdate < ms->window.lowLimit) ms->nextToUpdate = ms->window.lowLimit; + + { size_t cSize; + if (ZSTD_useTargetCBlockSize(&cctx->appliedParams)) { + cSize = ZSTD_compressBlock_targetCBlockSize(cctx, op, dstCapacity, ip, blockSize, lastBlock); + FORWARD_IF_ERROR(cSize, "ZSTD_compressBlock_targetCBlockSize failed"); + assert(cSize > 0); + assert(cSize <= blockSize + ZSTD_blockHeaderSize); + } else if (ZSTD_blockSplitterEnabled(&cctx->appliedParams)) { + cSize = ZSTD_compressBlock_splitBlock(cctx, op, dstCapacity, ip, blockSize, lastBlock); + FORWARD_IF_ERROR(cSize, "ZSTD_compressBlock_splitBlock failed"); + assert(cSize > 0 || cctx->seqCollector.collectSequences == 1); + } else { + cSize = ZSTD_compressBlock_internal(cctx, + op+ZSTD_blockHeaderSize, dstCapacity-ZSTD_blockHeaderSize, + ip, blockSize, 1 /* frame */); + FORWARD_IF_ERROR(cSize, "ZSTD_compressBlock_internal failed"); + + if (cSize == 0) { /* block is not compressible */ + cSize = ZSTD_noCompressBlock(op, dstCapacity, ip, blockSize, lastBlock); + FORWARD_IF_ERROR(cSize, "ZSTD_noCompressBlock failed"); + } else { + U32 const cBlockHeader = cSize == 1 ? + lastBlock + (((U32)bt_rle)<<1) + (U32)(blockSize << 3) : + lastBlock + (((U32)bt_compressed)<<1) + (U32)(cSize << 3); + MEM_writeLE24(op, cBlockHeader); + cSize += ZSTD_blockHeaderSize; + } + } /* if (ZSTD_useTargetCBlockSize(&cctx->appliedParams))*/ + + + ip += blockSize; + assert(remaining >= blockSize); + remaining -= blockSize; + op += cSize; + assert(dstCapacity >= cSize); + dstCapacity -= cSize; + cctx->isFirstBlock = 0; + DEBUGLOG(5, "ZSTD_compress_frameChunk: adding a block of size %u", + (unsigned)cSize); + } } + + if (lastFrameChunk && (op>ostart)) cctx->stage = ZSTDcs_ending; + return (size_t)(op-ostart); +} + + +static size_t ZSTD_writeFrameHeader(void* dst, size_t dstCapacity, + const ZSTD_CCtx_params* params, U64 pledgedSrcSize, U32 dictID) +{ BYTE* const op = (BYTE*)dst; + U32 const dictIDSizeCodeLength = (dictID>0) + (dictID>=256) + (dictID>=65536); /* 0-3 */ + U32 const dictIDSizeCode = params->fParams.noDictIDFlag ? 0 : dictIDSizeCodeLength; /* 0-3 */ + U32 const checksumFlag = params->fParams.checksumFlag>0; + U32 const windowSize = (U32)1 << params->cParams.windowLog; + U32 const singleSegment = params->fParams.contentSizeFlag && (windowSize >= pledgedSrcSize); + BYTE const windowLogByte = (BYTE)((params->cParams.windowLog - ZSTD_WINDOWLOG_ABSOLUTEMIN) << 3); + U32 const fcsCode = params->fParams.contentSizeFlag ? + (pledgedSrcSize>=256) + (pledgedSrcSize>=65536+256) + (pledgedSrcSize>=0xFFFFFFFFU) : 0; /* 0-3 */ + BYTE const frameHeaderDescriptionByte = (BYTE)(dictIDSizeCode + (checksumFlag<<2) + (singleSegment<<5) + (fcsCode<<6) ); + size_t pos=0; + + assert(!(params->fParams.contentSizeFlag && pledgedSrcSize == ZSTD_CONTENTSIZE_UNKNOWN)); + RETURN_ERROR_IF(dstCapacity < ZSTD_FRAMEHEADERSIZE_MAX, dstSize_tooSmall, + "dst buf is too small to fit worst-case frame header size."); + DEBUGLOG(4, "ZSTD_writeFrameHeader : dictIDFlag : %u ; dictID : %u ; dictIDSizeCode : %u", + !params->fParams.noDictIDFlag, (unsigned)dictID, (unsigned)dictIDSizeCode); + if (params->format == ZSTD_f_zstd1) { + MEM_writeLE32(dst, ZSTD_MAGICNUMBER); + pos = 4; + } + op[pos++] = frameHeaderDescriptionByte; + if (!singleSegment) op[pos++] = windowLogByte; + switch(dictIDSizeCode) + { + default: + assert(0); /* impossible */ + ZSTD_FALLTHROUGH; + case 0 : break; + case 1 : op[pos] = (BYTE)(dictID); pos++; break; + case 2 : MEM_writeLE16(op+pos, (U16)dictID); pos+=2; break; + case 3 : MEM_writeLE32(op+pos, dictID); pos+=4; break; + } + switch(fcsCode) + { + default: + assert(0); /* impossible */ + ZSTD_FALLTHROUGH; + case 0 : if (singleSegment) op[pos++] = (BYTE)(pledgedSrcSize); break; + case 1 : MEM_writeLE16(op+pos, (U16)(pledgedSrcSize-256)); pos+=2; break; + case 2 : MEM_writeLE32(op+pos, (U32)(pledgedSrcSize)); pos+=4; break; + case 3 : MEM_writeLE64(op+pos, (U64)(pledgedSrcSize)); pos+=8; break; + } + return pos; +} + +/* ZSTD_writeSkippableFrame_advanced() : + * Writes out a skippable frame with the specified magic number variant (16 are supported), + * from ZSTD_MAGIC_SKIPPABLE_START to ZSTD_MAGIC_SKIPPABLE_START+15, and the desired source data. + * + * Returns the total number of bytes written, or a ZSTD error code. + */ +size_t ZSTD_writeSkippableFrame(void* dst, size_t dstCapacity, + const void* src, size_t srcSize, unsigned magicVariant) { + BYTE* op = (BYTE*)dst; + RETURN_ERROR_IF(dstCapacity < srcSize + ZSTD_SKIPPABLEHEADERSIZE /* Skippable frame overhead */, + dstSize_tooSmall, "Not enough room for skippable frame"); + RETURN_ERROR_IF(srcSize > (unsigned)0xFFFFFFFF, srcSize_wrong, "Src size too large for skippable frame"); + RETURN_ERROR_IF(magicVariant > 15, parameter_outOfBound, "Skippable frame magic number variant not supported"); + + MEM_writeLE32(op, (U32)(ZSTD_MAGIC_SKIPPABLE_START + magicVariant)); + MEM_writeLE32(op+4, (U32)srcSize); + ZSTD_memcpy(op+8, src, srcSize); + return srcSize + ZSTD_SKIPPABLEHEADERSIZE; +} + +/* ZSTD_writeLastEmptyBlock() : + * output an empty Block with end-of-frame mark to complete a frame + * @return : size of data written into `dst` (== ZSTD_blockHeaderSize (defined in zstd_internal.h)) + * or an error code if `dstCapacity` is too small (stage == ZSTDcs_init); + assert(nbSeq == 0 || cctx->appliedParams.ldmParams.enableLdm != ZSTD_ps_enable); + cctx->externSeqStore.seq = seq; + cctx->externSeqStore.size = nbSeq; + cctx->externSeqStore.capacity = nbSeq; + cctx->externSeqStore.pos = 0; + cctx->externSeqStore.posInSequence = 0; +} + + +static size_t ZSTD_compressContinue_internal (ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + U32 frame, U32 lastFrameChunk) +{ + ZSTD_matchState_t* const ms = &cctx->blockState.matchState; + size_t fhSize = 0; + + DEBUGLOG(5, "ZSTD_compressContinue_internal, stage: %u, srcSize: %u", + cctx->stage, (unsigned)srcSize); + RETURN_ERROR_IF(cctx->stage==ZSTDcs_created, stage_wrong, + "missing init (ZSTD_compressBegin)"); + + if (frame && (cctx->stage==ZSTDcs_init)) { + fhSize = ZSTD_writeFrameHeader(dst, dstCapacity, &cctx->appliedParams, + cctx->pledgedSrcSizePlusOne-1, cctx->dictID); + FORWARD_IF_ERROR(fhSize, "ZSTD_writeFrameHeader failed"); + assert(fhSize <= dstCapacity); + dstCapacity -= fhSize; + dst = (char*)dst + fhSize; + cctx->stage = ZSTDcs_ongoing; + } + + if (!srcSize) return fhSize; /* do not generate an empty block if no input */ + + if (!ZSTD_window_update(&ms->window, src, srcSize, ms->forceNonContiguous)) { + ms->forceNonContiguous = 0; + ms->nextToUpdate = ms->window.dictLimit; + } + if (cctx->appliedParams.ldmParams.enableLdm == ZSTD_ps_enable) { + ZSTD_window_update(&cctx->ldmState.window, src, srcSize, /* forceNonContiguous */ 0); + } + + if (!frame) { + /* overflow check and correction for block mode */ + ZSTD_overflowCorrectIfNeeded( + ms, &cctx->workspace, &cctx->appliedParams, + src, (BYTE const*)src + srcSize); + } + + DEBUGLOG(5, "ZSTD_compressContinue_internal (blockSize=%u)", (unsigned)cctx->blockSize); + { size_t const cSize = frame ? + ZSTD_compress_frameChunk (cctx, dst, dstCapacity, src, srcSize, lastFrameChunk) : + ZSTD_compressBlock_internal (cctx, dst, dstCapacity, src, srcSize, 0 /* frame */); + FORWARD_IF_ERROR(cSize, "%s", frame ? "ZSTD_compress_frameChunk failed" : "ZSTD_compressBlock_internal failed"); + cctx->consumedSrcSize += srcSize; + cctx->producedCSize += (cSize + fhSize); + assert(!(cctx->appliedParams.fParams.contentSizeFlag && cctx->pledgedSrcSizePlusOne == 0)); + if (cctx->pledgedSrcSizePlusOne != 0) { /* control src size */ + ZSTD_STATIC_ASSERT(ZSTD_CONTENTSIZE_UNKNOWN == (unsigned long long)-1); + RETURN_ERROR_IF( + cctx->consumedSrcSize+1 > cctx->pledgedSrcSizePlusOne, + srcSize_wrong, + "error : pledgedSrcSize = %u, while realSrcSize >= %u", + (unsigned)cctx->pledgedSrcSizePlusOne-1, + (unsigned)cctx->consumedSrcSize); + } + return cSize + fhSize; + } +} + +size_t ZSTD_compressContinue_public(ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize) +{ + DEBUGLOG(5, "ZSTD_compressContinue (srcSize=%u)", (unsigned)srcSize); + return ZSTD_compressContinue_internal(cctx, dst, dstCapacity, src, srcSize, 1 /* frame mode */, 0 /* last chunk */); +} + +/* NOTE: Must just wrap ZSTD_compressContinue_public() */ +size_t ZSTD_compressContinue(ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize) +{ + return ZSTD_compressContinue_public(cctx, dst, dstCapacity, src, srcSize); +} + +static size_t ZSTD_getBlockSize_deprecated(const ZSTD_CCtx* cctx) +{ + ZSTD_compressionParameters const cParams = cctx->appliedParams.cParams; + assert(!ZSTD_checkCParams(cParams)); + return MIN(cctx->appliedParams.maxBlockSize, (size_t)1 << cParams.windowLog); +} + +/* NOTE: Must just wrap ZSTD_getBlockSize_deprecated() */ +size_t ZSTD_getBlockSize(const ZSTD_CCtx* cctx) +{ + return ZSTD_getBlockSize_deprecated(cctx); +} + +/* NOTE: Must just wrap ZSTD_compressBlock_deprecated() */ +size_t ZSTD_compressBlock_deprecated(ZSTD_CCtx* cctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize) +{ + DEBUGLOG(5, "ZSTD_compressBlock: srcSize = %u", (unsigned)srcSize); + { size_t const blockSizeMax = ZSTD_getBlockSize_deprecated(cctx); + RETURN_ERROR_IF(srcSize > blockSizeMax, srcSize_wrong, "input is larger than a block"); } + + return ZSTD_compressContinue_internal(cctx, dst, dstCapacity, src, srcSize, 0 /* frame mode */, 0 /* last chunk */); +} + +/* NOTE: Must just wrap ZSTD_compressBlock_deprecated() */ +size_t ZSTD_compressBlock(ZSTD_CCtx* cctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize) +{ + return ZSTD_compressBlock_deprecated(cctx, dst, dstCapacity, src, srcSize); +} + +/*! ZSTD_loadDictionaryContent() : + * @return : 0, or an error code + */ +static size_t ZSTD_loadDictionaryContent(ZSTD_matchState_t* ms, + ldmState_t* ls, + ZSTD_cwksp* ws, + ZSTD_CCtx_params const* params, + const void* src, size_t srcSize, + ZSTD_dictTableLoadMethod_e dtlm, + ZSTD_tableFillPurpose_e tfp) +{ + const BYTE* ip = (const BYTE*) src; + const BYTE* const iend = ip + srcSize; + int const loadLdmDict = params->ldmParams.enableLdm == ZSTD_ps_enable && ls != NULL; + + /* Assert that the ms params match the params we're being given */ + ZSTD_assertEqualCParams(params->cParams, ms->cParams); + + { /* Ensure large dictionaries can't cause index overflow */ + + /* Allow the dictionary to set indices up to exactly ZSTD_CURRENT_MAX. + * Dictionaries right at the edge will immediately trigger overflow + * correction, but I don't want to insert extra constraints here. + */ + U32 maxDictSize = ZSTD_CURRENT_MAX - ZSTD_WINDOW_START_INDEX; + + int const CDictTaggedIndices = ZSTD_CDictIndicesAreTagged(¶ms->cParams); + if (CDictTaggedIndices && tfp == ZSTD_tfp_forCDict) { + /* Some dictionary matchfinders in zstd use "short cache", + * which treats the lower ZSTD_SHORT_CACHE_TAG_BITS of each + * CDict hashtable entry as a tag rather than as part of an index. + * When short cache is used, we need to truncate the dictionary + * so that its indices don't overlap with the tag. */ + U32 const shortCacheMaxDictSize = (1u << (32 - ZSTD_SHORT_CACHE_TAG_BITS)) - ZSTD_WINDOW_START_INDEX; + maxDictSize = MIN(maxDictSize, shortCacheMaxDictSize); + assert(!loadLdmDict); + } + + /* If the dictionary is too large, only load the suffix of the dictionary. */ + if (srcSize > maxDictSize) { + ip = iend - maxDictSize; + src = ip; + srcSize = maxDictSize; + } + } + + if (srcSize > ZSTD_CHUNKSIZE_MAX) { + /* We must have cleared our windows when our source is this large. */ + assert(ZSTD_window_isEmpty(ms->window)); + if (loadLdmDict) assert(ZSTD_window_isEmpty(ls->window)); + } + ZSTD_window_update(&ms->window, src, srcSize, /* forceNonContiguous */ 0); + + DEBUGLOG(4, "ZSTD_loadDictionaryContent(): useRowMatchFinder=%d", (int)params->useRowMatchFinder); + + if (loadLdmDict) { /* Load the entire dict into LDM matchfinders. */ + ZSTD_window_update(&ls->window, src, srcSize, /* forceNonContiguous */ 0); + ls->loadedDictEnd = params->forceWindow ? 0 : (U32)(iend - ls->window.base); + ZSTD_ldm_fillHashTable(ls, ip, iend, ¶ms->ldmParams); + } + + /* If the dict is larger than we can reasonably index in our tables, only load the suffix. */ + if (params->cParams.strategy < ZSTD_btultra) { + U32 maxDictSize = 8U << MIN(MAX(params->cParams.hashLog, params->cParams.chainLog), 28); + if (srcSize > maxDictSize) { + ip = iend - maxDictSize; + src = ip; + srcSize = maxDictSize; + } + } + + ms->nextToUpdate = (U32)(ip - ms->window.base); + ms->loadedDictEnd = params->forceWindow ? 0 : (U32)(iend - ms->window.base); + ms->forceNonContiguous = params->deterministicRefPrefix; + + if (srcSize <= HASH_READ_SIZE) return 0; + + ZSTD_overflowCorrectIfNeeded(ms, ws, params, ip, iend); + + switch(params->cParams.strategy) + { + case ZSTD_fast: + ZSTD_fillHashTable(ms, iend, dtlm, tfp); + break; + case ZSTD_dfast: +#ifndef ZSTD_EXCLUDE_DFAST_BLOCK_COMPRESSOR + ZSTD_fillDoubleHashTable(ms, iend, dtlm, tfp); +#else + assert(0); /* shouldn't be called: cparams should've been adjusted. */ +#endif + break; + + case ZSTD_greedy: + case ZSTD_lazy: + case ZSTD_lazy2: +#if !defined(ZSTD_EXCLUDE_GREEDY_BLOCK_COMPRESSOR) \ + || !defined(ZSTD_EXCLUDE_LAZY_BLOCK_COMPRESSOR) \ + || !defined(ZSTD_EXCLUDE_LAZY2_BLOCK_COMPRESSOR) + assert(srcSize >= HASH_READ_SIZE); + if (ms->dedicatedDictSearch) { + assert(ms->chainTable != NULL); + ZSTD_dedicatedDictSearch_lazy_loadDictionary(ms, iend-HASH_READ_SIZE); + } else { + assert(params->useRowMatchFinder != ZSTD_ps_auto); + if (params->useRowMatchFinder == ZSTD_ps_enable) { + size_t const tagTableSize = ((size_t)1 << params->cParams.hashLog); + ZSTD_memset(ms->tagTable, 0, tagTableSize); + ZSTD_row_update(ms, iend-HASH_READ_SIZE); + DEBUGLOG(4, "Using row-based hash table for lazy dict"); + } else { + ZSTD_insertAndFindFirstIndex(ms, iend-HASH_READ_SIZE); + DEBUGLOG(4, "Using chain-based hash table for lazy dict"); + } + } +#else + assert(0); /* shouldn't be called: cparams should've been adjusted. */ +#endif + break; + + case ZSTD_btlazy2: /* we want the dictionary table fully sorted */ + case ZSTD_btopt: + case ZSTD_btultra: + case ZSTD_btultra2: +#if !defined(ZSTD_EXCLUDE_BTLAZY2_BLOCK_COMPRESSOR) \ + || !defined(ZSTD_EXCLUDE_BTOPT_BLOCK_COMPRESSOR) \ + || !defined(ZSTD_EXCLUDE_BTULTRA_BLOCK_COMPRESSOR) + assert(srcSize >= HASH_READ_SIZE); + ZSTD_updateTree(ms, iend-HASH_READ_SIZE, iend); +#else + assert(0); /* shouldn't be called: cparams should've been adjusted. */ +#endif + break; + + default: + assert(0); /* not possible : not a valid strategy id */ + } + + ms->nextToUpdate = (U32)(iend - ms->window.base); + return 0; +} + + +/* Dictionaries that assign zero probability to symbols that show up causes problems + * when FSE encoding. Mark dictionaries with zero probability symbols as FSE_repeat_check + * and only dictionaries with 100% valid symbols can be assumed valid. + */ +static FSE_repeat ZSTD_dictNCountRepeat(short* normalizedCounter, unsigned dictMaxSymbolValue, unsigned maxSymbolValue) +{ + U32 s; + if (dictMaxSymbolValue < maxSymbolValue) { + return FSE_repeat_check; + } + for (s = 0; s <= maxSymbolValue; ++s) { + if (normalizedCounter[s] == 0) { + return FSE_repeat_check; + } + } + return FSE_repeat_valid; +} + +size_t ZSTD_loadCEntropy(ZSTD_compressedBlockState_t* bs, void* workspace, + const void* const dict, size_t dictSize) +{ + short offcodeNCount[MaxOff+1]; + unsigned offcodeMaxValue = MaxOff; + const BYTE* dictPtr = (const BYTE*)dict; /* skip magic num and dict ID */ + const BYTE* const dictEnd = dictPtr + dictSize; + dictPtr += 8; + bs->entropy.huf.repeatMode = HUF_repeat_check; + + { unsigned maxSymbolValue = 255; + unsigned hasZeroWeights = 1; + size_t const hufHeaderSize = HUF_readCTable((HUF_CElt*)bs->entropy.huf.CTable, &maxSymbolValue, dictPtr, + dictEnd-dictPtr, &hasZeroWeights); + + /* We only set the loaded table as valid if it contains all non-zero + * weights. Otherwise, we set it to check */ + if (!hasZeroWeights && maxSymbolValue == 255) + bs->entropy.huf.repeatMode = HUF_repeat_valid; + + RETURN_ERROR_IF(HUF_isError(hufHeaderSize), dictionary_corrupted, ""); + dictPtr += hufHeaderSize; + } + + { unsigned offcodeLog; + size_t const offcodeHeaderSize = FSE_readNCount(offcodeNCount, &offcodeMaxValue, &offcodeLog, dictPtr, dictEnd-dictPtr); + RETURN_ERROR_IF(FSE_isError(offcodeHeaderSize), dictionary_corrupted, ""); + RETURN_ERROR_IF(offcodeLog > OffFSELog, dictionary_corrupted, ""); + /* fill all offset symbols to avoid garbage at end of table */ + RETURN_ERROR_IF(FSE_isError(FSE_buildCTable_wksp( + bs->entropy.fse.offcodeCTable, + offcodeNCount, MaxOff, offcodeLog, + workspace, HUF_WORKSPACE_SIZE)), + dictionary_corrupted, ""); + /* Defer checking offcodeMaxValue because we need to know the size of the dictionary content */ + dictPtr += offcodeHeaderSize; + } + + { short matchlengthNCount[MaxML+1]; + unsigned matchlengthMaxValue = MaxML, matchlengthLog; + size_t const matchlengthHeaderSize = FSE_readNCount(matchlengthNCount, &matchlengthMaxValue, &matchlengthLog, dictPtr, dictEnd-dictPtr); + RETURN_ERROR_IF(FSE_isError(matchlengthHeaderSize), dictionary_corrupted, ""); + RETURN_ERROR_IF(matchlengthLog > MLFSELog, dictionary_corrupted, ""); + RETURN_ERROR_IF(FSE_isError(FSE_buildCTable_wksp( + bs->entropy.fse.matchlengthCTable, + matchlengthNCount, matchlengthMaxValue, matchlengthLog, + workspace, HUF_WORKSPACE_SIZE)), + dictionary_corrupted, ""); + bs->entropy.fse.matchlength_repeatMode = ZSTD_dictNCountRepeat(matchlengthNCount, matchlengthMaxValue, MaxML); + dictPtr += matchlengthHeaderSize; + } + + { short litlengthNCount[MaxLL+1]; + unsigned litlengthMaxValue = MaxLL, litlengthLog; + size_t const litlengthHeaderSize = FSE_readNCount(litlengthNCount, &litlengthMaxValue, &litlengthLog, dictPtr, dictEnd-dictPtr); + RETURN_ERROR_IF(FSE_isError(litlengthHeaderSize), dictionary_corrupted, ""); + RETURN_ERROR_IF(litlengthLog > LLFSELog, dictionary_corrupted, ""); + RETURN_ERROR_IF(FSE_isError(FSE_buildCTable_wksp( + bs->entropy.fse.litlengthCTable, + litlengthNCount, litlengthMaxValue, litlengthLog, + workspace, HUF_WORKSPACE_SIZE)), + dictionary_corrupted, ""); + bs->entropy.fse.litlength_repeatMode = ZSTD_dictNCountRepeat(litlengthNCount, litlengthMaxValue, MaxLL); + dictPtr += litlengthHeaderSize; + } + + RETURN_ERROR_IF(dictPtr+12 > dictEnd, dictionary_corrupted, ""); + bs->rep[0] = MEM_readLE32(dictPtr+0); + bs->rep[1] = MEM_readLE32(dictPtr+4); + bs->rep[2] = MEM_readLE32(dictPtr+8); + dictPtr += 12; + + { size_t const dictContentSize = (size_t)(dictEnd - dictPtr); + U32 offcodeMax = MaxOff; + if (dictContentSize <= ((U32)-1) - 128 KB) { + U32 const maxOffset = (U32)dictContentSize + 128 KB; /* The maximum offset that must be supported */ + offcodeMax = ZSTD_highbit32(maxOffset); /* Calculate minimum offset code required to represent maxOffset */ + } + /* All offset values <= dictContentSize + 128 KB must be representable for a valid table */ + bs->entropy.fse.offcode_repeatMode = ZSTD_dictNCountRepeat(offcodeNCount, offcodeMaxValue, MIN(offcodeMax, MaxOff)); + + /* All repCodes must be <= dictContentSize and != 0 */ + { U32 u; + for (u=0; u<3; u++) { + RETURN_ERROR_IF(bs->rep[u] == 0, dictionary_corrupted, ""); + RETURN_ERROR_IF(bs->rep[u] > dictContentSize, dictionary_corrupted, ""); + } } } + + return dictPtr - (const BYTE*)dict; +} + +/* Dictionary format : + * See : + * https://github.com/facebook/zstd/blob/release/doc/zstd_compression_format.md#dictionary-format + */ +/*! ZSTD_loadZstdDictionary() : + * @return : dictID, or an error code + * assumptions : magic number supposed already checked + * dictSize supposed >= 8 + */ +static size_t ZSTD_loadZstdDictionary(ZSTD_compressedBlockState_t* bs, + ZSTD_matchState_t* ms, + ZSTD_cwksp* ws, + ZSTD_CCtx_params const* params, + const void* dict, size_t dictSize, + ZSTD_dictTableLoadMethod_e dtlm, + ZSTD_tableFillPurpose_e tfp, + void* workspace) +{ + const BYTE* dictPtr = (const BYTE*)dict; + const BYTE* const dictEnd = dictPtr + dictSize; + size_t dictID; + size_t eSize; + ZSTD_STATIC_ASSERT(HUF_WORKSPACE_SIZE >= (1<= 8); + assert(MEM_readLE32(dictPtr) == ZSTD_MAGIC_DICTIONARY); + + dictID = params->fParams.noDictIDFlag ? 0 : MEM_readLE32(dictPtr + 4 /* skip magic number */ ); + eSize = ZSTD_loadCEntropy(bs, workspace, dict, dictSize); + FORWARD_IF_ERROR(eSize, "ZSTD_loadCEntropy failed"); + dictPtr += eSize; + + { + size_t const dictContentSize = (size_t)(dictEnd - dictPtr); + FORWARD_IF_ERROR(ZSTD_loadDictionaryContent( + ms, NULL, ws, params, dictPtr, dictContentSize, dtlm, tfp), ""); + } + return dictID; +} + +/** ZSTD_compress_insertDictionary() : +* @return : dictID, or an error code */ +static size_t +ZSTD_compress_insertDictionary(ZSTD_compressedBlockState_t* bs, + ZSTD_matchState_t* ms, + ldmState_t* ls, + ZSTD_cwksp* ws, + const ZSTD_CCtx_params* params, + const void* dict, size_t dictSize, + ZSTD_dictContentType_e dictContentType, + ZSTD_dictTableLoadMethod_e dtlm, + ZSTD_tableFillPurpose_e tfp, + void* workspace) +{ + DEBUGLOG(4, "ZSTD_compress_insertDictionary (dictSize=%u)", (U32)dictSize); + if ((dict==NULL) || (dictSize<8)) { + RETURN_ERROR_IF(dictContentType == ZSTD_dct_fullDict, dictionary_wrong, ""); + return 0; + } + + ZSTD_reset_compressedBlockState(bs); + + /* dict restricted modes */ + if (dictContentType == ZSTD_dct_rawContent) + return ZSTD_loadDictionaryContent(ms, ls, ws, params, dict, dictSize, dtlm, tfp); + + if (MEM_readLE32(dict) != ZSTD_MAGIC_DICTIONARY) { + if (dictContentType == ZSTD_dct_auto) { + DEBUGLOG(4, "raw content dictionary detected"); + return ZSTD_loadDictionaryContent( + ms, ls, ws, params, dict, dictSize, dtlm, tfp); + } + RETURN_ERROR_IF(dictContentType == ZSTD_dct_fullDict, dictionary_wrong, ""); + assert(0); /* impossible */ + } + + /* dict as full zstd dictionary */ + return ZSTD_loadZstdDictionary( + bs, ms, ws, params, dict, dictSize, dtlm, tfp, workspace); +} + +#define ZSTD_USE_CDICT_PARAMS_SRCSIZE_CUTOFF (128 KB) +#define ZSTD_USE_CDICT_PARAMS_DICTSIZE_MULTIPLIER (6ULL) + +/*! ZSTD_compressBegin_internal() : + * Assumption : either @dict OR @cdict (or none) is non-NULL, never both + * @return : 0, or an error code */ +static size_t ZSTD_compressBegin_internal(ZSTD_CCtx* cctx, + const void* dict, size_t dictSize, + ZSTD_dictContentType_e dictContentType, + ZSTD_dictTableLoadMethod_e dtlm, + const ZSTD_CDict* cdict, + const ZSTD_CCtx_params* params, U64 pledgedSrcSize, + ZSTD_buffered_policy_e zbuff) +{ + size_t const dictContentSize = cdict ? cdict->dictContentSize : dictSize; +#if ZSTD_TRACE + cctx->traceCtx = (ZSTD_trace_compress_begin != NULL) ? ZSTD_trace_compress_begin(cctx) : 0; +#endif + DEBUGLOG(4, "ZSTD_compressBegin_internal: wlog=%u", params->cParams.windowLog); + /* params are supposed to be fully validated at this point */ + assert(!ZSTD_isError(ZSTD_checkCParams(params->cParams))); + assert(!((dict) && (cdict))); /* either dict or cdict, not both */ + if ( (cdict) + && (cdict->dictContentSize > 0) + && ( pledgedSrcSize < ZSTD_USE_CDICT_PARAMS_SRCSIZE_CUTOFF + || pledgedSrcSize < cdict->dictContentSize * ZSTD_USE_CDICT_PARAMS_DICTSIZE_MULTIPLIER + || pledgedSrcSize == ZSTD_CONTENTSIZE_UNKNOWN + || cdict->compressionLevel == 0) + && (params->attachDictPref != ZSTD_dictForceLoad) ) { + return ZSTD_resetCCtx_usingCDict(cctx, cdict, params, pledgedSrcSize, zbuff); + } + + FORWARD_IF_ERROR( ZSTD_resetCCtx_internal(cctx, params, pledgedSrcSize, + dictContentSize, + ZSTDcrp_makeClean, zbuff) , ""); + { size_t const dictID = cdict ? + ZSTD_compress_insertDictionary( + cctx->blockState.prevCBlock, &cctx->blockState.matchState, + &cctx->ldmState, &cctx->workspace, &cctx->appliedParams, cdict->dictContent, + cdict->dictContentSize, cdict->dictContentType, dtlm, + ZSTD_tfp_forCCtx, cctx->entropyWorkspace) + : ZSTD_compress_insertDictionary( + cctx->blockState.prevCBlock, &cctx->blockState.matchState, + &cctx->ldmState, &cctx->workspace, &cctx->appliedParams, dict, dictSize, + dictContentType, dtlm, ZSTD_tfp_forCCtx, cctx->entropyWorkspace); + FORWARD_IF_ERROR(dictID, "ZSTD_compress_insertDictionary failed"); + assert(dictID <= UINT_MAX); + cctx->dictID = (U32)dictID; + cctx->dictContentSize = dictContentSize; + } + return 0; +} + +size_t ZSTD_compressBegin_advanced_internal(ZSTD_CCtx* cctx, + const void* dict, size_t dictSize, + ZSTD_dictContentType_e dictContentType, + ZSTD_dictTableLoadMethod_e dtlm, + const ZSTD_CDict* cdict, + const ZSTD_CCtx_params* params, + unsigned long long pledgedSrcSize) +{ + DEBUGLOG(4, "ZSTD_compressBegin_advanced_internal: wlog=%u", params->cParams.windowLog); + /* compression parameters verification and optimization */ + FORWARD_IF_ERROR( ZSTD_checkCParams(params->cParams) , ""); + return ZSTD_compressBegin_internal(cctx, + dict, dictSize, dictContentType, dtlm, + cdict, + params, pledgedSrcSize, + ZSTDb_not_buffered); +} + +/*! ZSTD_compressBegin_advanced() : +* @return : 0, or an error code */ +size_t ZSTD_compressBegin_advanced(ZSTD_CCtx* cctx, + const void* dict, size_t dictSize, + ZSTD_parameters params, unsigned long long pledgedSrcSize) +{ + ZSTD_CCtx_params cctxParams; + ZSTD_CCtxParams_init_internal(&cctxParams, ¶ms, ZSTD_NO_CLEVEL); + return ZSTD_compressBegin_advanced_internal(cctx, + dict, dictSize, ZSTD_dct_auto, ZSTD_dtlm_fast, + NULL /*cdict*/, + &cctxParams, pledgedSrcSize); +} + +static size_t +ZSTD_compressBegin_usingDict_deprecated(ZSTD_CCtx* cctx, const void* dict, size_t dictSize, int compressionLevel) +{ + ZSTD_CCtx_params cctxParams; + { ZSTD_parameters const params = ZSTD_getParams_internal(compressionLevel, ZSTD_CONTENTSIZE_UNKNOWN, dictSize, ZSTD_cpm_noAttachDict); + ZSTD_CCtxParams_init_internal(&cctxParams, ¶ms, (compressionLevel == 0) ? ZSTD_CLEVEL_DEFAULT : compressionLevel); + } + DEBUGLOG(4, "ZSTD_compressBegin_usingDict (dictSize=%u)", (unsigned)dictSize); + return ZSTD_compressBegin_internal(cctx, dict, dictSize, ZSTD_dct_auto, ZSTD_dtlm_fast, NULL, + &cctxParams, ZSTD_CONTENTSIZE_UNKNOWN, ZSTDb_not_buffered); +} + +size_t +ZSTD_compressBegin_usingDict(ZSTD_CCtx* cctx, const void* dict, size_t dictSize, int compressionLevel) +{ + return ZSTD_compressBegin_usingDict_deprecated(cctx, dict, dictSize, compressionLevel); +} + +size_t ZSTD_compressBegin(ZSTD_CCtx* cctx, int compressionLevel) +{ + return ZSTD_compressBegin_usingDict_deprecated(cctx, NULL, 0, compressionLevel); +} + + +/*! ZSTD_writeEpilogue() : +* Ends a frame. +* @return : nb of bytes written into dst (or an error code) */ +static size_t ZSTD_writeEpilogue(ZSTD_CCtx* cctx, void* dst, size_t dstCapacity) +{ + BYTE* const ostart = (BYTE*)dst; + BYTE* op = ostart; + + DEBUGLOG(4, "ZSTD_writeEpilogue"); + RETURN_ERROR_IF(cctx->stage == ZSTDcs_created, stage_wrong, "init missing"); + + /* special case : empty frame */ + if (cctx->stage == ZSTDcs_init) { + size_t fhSize = ZSTD_writeFrameHeader(dst, dstCapacity, &cctx->appliedParams, 0, 0); + FORWARD_IF_ERROR(fhSize, "ZSTD_writeFrameHeader failed"); + dstCapacity -= fhSize; + op += fhSize; + cctx->stage = ZSTDcs_ongoing; + } + + if (cctx->stage != ZSTDcs_ending) { + /* write one last empty block, make it the "last" block */ + U32 const cBlockHeader24 = 1 /* last block */ + (((U32)bt_raw)<<1) + 0; + ZSTD_STATIC_ASSERT(ZSTD_BLOCKHEADERSIZE == 3); + RETURN_ERROR_IF(dstCapacity<3, dstSize_tooSmall, "no room for epilogue"); + MEM_writeLE24(op, cBlockHeader24); + op += ZSTD_blockHeaderSize; + dstCapacity -= ZSTD_blockHeaderSize; + } + + if (cctx->appliedParams.fParams.checksumFlag) { + U32 const checksum = (U32) XXH64_digest(&cctx->xxhState); + RETURN_ERROR_IF(dstCapacity<4, dstSize_tooSmall, "no room for checksum"); + DEBUGLOG(4, "ZSTD_writeEpilogue: write checksum : %08X", (unsigned)checksum); + MEM_writeLE32(op, checksum); + op += 4; + } + + cctx->stage = ZSTDcs_created; /* return to "created but no init" status */ + return op-ostart; +} + +void ZSTD_CCtx_trace(ZSTD_CCtx* cctx, size_t extraCSize) +{ +#if ZSTD_TRACE + if (cctx->traceCtx && ZSTD_trace_compress_end != NULL) { + int const streaming = cctx->inBuffSize > 0 || cctx->outBuffSize > 0 || cctx->appliedParams.nbWorkers > 0; + ZSTD_Trace trace; + ZSTD_memset(&trace, 0, sizeof(trace)); + trace.version = ZSTD_VERSION_NUMBER; + trace.streaming = streaming; + trace.dictionaryID = cctx->dictID; + trace.dictionarySize = cctx->dictContentSize; + trace.uncompressedSize = cctx->consumedSrcSize; + trace.compressedSize = cctx->producedCSize + extraCSize; + trace.params = &cctx->appliedParams; + trace.cctx = cctx; + ZSTD_trace_compress_end(cctx->traceCtx, &trace); + } + cctx->traceCtx = 0; +#else + (void)cctx; + (void)extraCSize; +#endif +} + +size_t ZSTD_compressEnd_public(ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize) +{ + size_t endResult; + size_t const cSize = ZSTD_compressContinue_internal(cctx, + dst, dstCapacity, src, srcSize, + 1 /* frame mode */, 1 /* last chunk */); + FORWARD_IF_ERROR(cSize, "ZSTD_compressContinue_internal failed"); + endResult = ZSTD_writeEpilogue(cctx, (char*)dst + cSize, dstCapacity-cSize); + FORWARD_IF_ERROR(endResult, "ZSTD_writeEpilogue failed"); + assert(!(cctx->appliedParams.fParams.contentSizeFlag && cctx->pledgedSrcSizePlusOne == 0)); + if (cctx->pledgedSrcSizePlusOne != 0) { /* control src size */ + ZSTD_STATIC_ASSERT(ZSTD_CONTENTSIZE_UNKNOWN == (unsigned long long)-1); + DEBUGLOG(4, "end of frame : controlling src size"); + RETURN_ERROR_IF( + cctx->pledgedSrcSizePlusOne != cctx->consumedSrcSize+1, + srcSize_wrong, + "error : pledgedSrcSize = %u, while realSrcSize = %u", + (unsigned)cctx->pledgedSrcSizePlusOne-1, + (unsigned)cctx->consumedSrcSize); + } + ZSTD_CCtx_trace(cctx, endResult); + return cSize + endResult; +} + +/* NOTE: Must just wrap ZSTD_compressEnd_public() */ +size_t ZSTD_compressEnd(ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize) +{ + return ZSTD_compressEnd_public(cctx, dst, dstCapacity, src, srcSize); +} + +size_t ZSTD_compress_advanced (ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + const void* dict,size_t dictSize, + ZSTD_parameters params) +{ + DEBUGLOG(4, "ZSTD_compress_advanced"); + FORWARD_IF_ERROR(ZSTD_checkCParams(params.cParams), ""); + ZSTD_CCtxParams_init_internal(&cctx->simpleApiParams, ¶ms, ZSTD_NO_CLEVEL); + return ZSTD_compress_advanced_internal(cctx, + dst, dstCapacity, + src, srcSize, + dict, dictSize, + &cctx->simpleApiParams); +} + +/* Internal */ +size_t ZSTD_compress_advanced_internal( + ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + const void* dict,size_t dictSize, + const ZSTD_CCtx_params* params) +{ + DEBUGLOG(4, "ZSTD_compress_advanced_internal (srcSize:%u)", (unsigned)srcSize); + FORWARD_IF_ERROR( ZSTD_compressBegin_internal(cctx, + dict, dictSize, ZSTD_dct_auto, ZSTD_dtlm_fast, NULL, + params, srcSize, ZSTDb_not_buffered) , ""); + return ZSTD_compressEnd_public(cctx, dst, dstCapacity, src, srcSize); +} + +size_t ZSTD_compress_usingDict(ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + const void* dict, size_t dictSize, + int compressionLevel) +{ + { + ZSTD_parameters const params = ZSTD_getParams_internal(compressionLevel, srcSize, dict ? dictSize : 0, ZSTD_cpm_noAttachDict); + assert(params.fParams.contentSizeFlag == 1); + ZSTD_CCtxParams_init_internal(&cctx->simpleApiParams, ¶ms, (compressionLevel == 0) ? ZSTD_CLEVEL_DEFAULT: compressionLevel); + } + DEBUGLOG(4, "ZSTD_compress_usingDict (srcSize=%u)", (unsigned)srcSize); + return ZSTD_compress_advanced_internal(cctx, dst, dstCapacity, src, srcSize, dict, dictSize, &cctx->simpleApiParams); +} + +size_t ZSTD_compressCCtx(ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + int compressionLevel) +{ + DEBUGLOG(4, "ZSTD_compressCCtx (srcSize=%u)", (unsigned)srcSize); + assert(cctx != NULL); + return ZSTD_compress_usingDict(cctx, dst, dstCapacity, src, srcSize, NULL, 0, compressionLevel); +} + +size_t ZSTD_compress(void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + int compressionLevel) +{ + size_t result; +#if ZSTD_COMPRESS_HEAPMODE + ZSTD_CCtx* cctx = ZSTD_createCCtx(); + RETURN_ERROR_IF(!cctx, memory_allocation, "ZSTD_createCCtx failed"); + result = ZSTD_compressCCtx(cctx, dst, dstCapacity, src, srcSize, compressionLevel); + ZSTD_freeCCtx(cctx); +#else + ZSTD_CCtx ctxBody; + ZSTD_initCCtx(&ctxBody, ZSTD_defaultCMem); + result = ZSTD_compressCCtx(&ctxBody, dst, dstCapacity, src, srcSize, compressionLevel); + ZSTD_freeCCtxContent(&ctxBody); /* can't free ctxBody itself, as it's on stack; free only heap content */ +#endif + return result; +} + + +/* ===== Dictionary API ===== */ + +/*! ZSTD_estimateCDictSize_advanced() : + * Estimate amount of memory that will be needed to create a dictionary with following arguments */ +size_t ZSTD_estimateCDictSize_advanced( + size_t dictSize, ZSTD_compressionParameters cParams, + ZSTD_dictLoadMethod_e dictLoadMethod) +{ + DEBUGLOG(5, "sizeof(ZSTD_CDict) : %u", (unsigned)sizeof(ZSTD_CDict)); + return ZSTD_cwksp_alloc_size(sizeof(ZSTD_CDict)) + + ZSTD_cwksp_alloc_size(HUF_WORKSPACE_SIZE) + /* enableDedicatedDictSearch == 1 ensures that CDict estimation will not be too small + * in case we are using DDS with row-hash. */ + + ZSTD_sizeof_matchState(&cParams, ZSTD_resolveRowMatchFinderMode(ZSTD_ps_auto, &cParams), + /* enableDedicatedDictSearch */ 1, /* forCCtx */ 0) + + (dictLoadMethod == ZSTD_dlm_byRef ? 0 + : ZSTD_cwksp_alloc_size(ZSTD_cwksp_align(dictSize, sizeof(void *)))); +} + +size_t ZSTD_estimateCDictSize(size_t dictSize, int compressionLevel) +{ + ZSTD_compressionParameters const cParams = ZSTD_getCParams_internal(compressionLevel, ZSTD_CONTENTSIZE_UNKNOWN, dictSize, ZSTD_cpm_createCDict); + return ZSTD_estimateCDictSize_advanced(dictSize, cParams, ZSTD_dlm_byCopy); +} + +size_t ZSTD_sizeof_CDict(const ZSTD_CDict* cdict) +{ + if (cdict==NULL) return 0; /* support sizeof on NULL */ + DEBUGLOG(5, "sizeof(*cdict) : %u", (unsigned)sizeof(*cdict)); + /* cdict may be in the workspace */ + return (cdict->workspace.workspace == cdict ? 0 : sizeof(*cdict)) + + ZSTD_cwksp_sizeof(&cdict->workspace); +} + +static size_t ZSTD_initCDict_internal( + ZSTD_CDict* cdict, + const void* dictBuffer, size_t dictSize, + ZSTD_dictLoadMethod_e dictLoadMethod, + ZSTD_dictContentType_e dictContentType, + ZSTD_CCtx_params params) +{ + DEBUGLOG(3, "ZSTD_initCDict_internal (dictContentType:%u)", (unsigned)dictContentType); + assert(!ZSTD_checkCParams(params.cParams)); + cdict->matchState.cParams = params.cParams; + cdict->matchState.dedicatedDictSearch = params.enableDedicatedDictSearch; + if ((dictLoadMethod == ZSTD_dlm_byRef) || (!dictBuffer) || (!dictSize)) { + cdict->dictContent = dictBuffer; + } else { + void *internalBuffer = ZSTD_cwksp_reserve_object(&cdict->workspace, ZSTD_cwksp_align(dictSize, sizeof(void*))); + RETURN_ERROR_IF(!internalBuffer, memory_allocation, "NULL pointer!"); + cdict->dictContent = internalBuffer; + ZSTD_memcpy(internalBuffer, dictBuffer, dictSize); + } + cdict->dictContentSize = dictSize; + cdict->dictContentType = dictContentType; + + cdict->entropyWorkspace = (U32*)ZSTD_cwksp_reserve_object(&cdict->workspace, HUF_WORKSPACE_SIZE); + + + /* Reset the state to no dictionary */ + ZSTD_reset_compressedBlockState(&cdict->cBlockState); + FORWARD_IF_ERROR(ZSTD_reset_matchState( + &cdict->matchState, + &cdict->workspace, + ¶ms.cParams, + params.useRowMatchFinder, + ZSTDcrp_makeClean, + ZSTDirp_reset, + ZSTD_resetTarget_CDict), ""); + /* (Maybe) load the dictionary + * Skips loading the dictionary if it is < 8 bytes. + */ + { params.compressionLevel = ZSTD_CLEVEL_DEFAULT; + params.fParams.contentSizeFlag = 1; + { size_t const dictID = ZSTD_compress_insertDictionary( + &cdict->cBlockState, &cdict->matchState, NULL, &cdict->workspace, + ¶ms, cdict->dictContent, cdict->dictContentSize, + dictContentType, ZSTD_dtlm_full, ZSTD_tfp_forCDict, cdict->entropyWorkspace); + FORWARD_IF_ERROR(dictID, "ZSTD_compress_insertDictionary failed"); + assert(dictID <= (size_t)(U32)-1); + cdict->dictID = (U32)dictID; + } + } + + return 0; +} + +static ZSTD_CDict* ZSTD_createCDict_advanced_internal(size_t dictSize, + ZSTD_dictLoadMethod_e dictLoadMethod, + ZSTD_compressionParameters cParams, + ZSTD_paramSwitch_e useRowMatchFinder, + U32 enableDedicatedDictSearch, + ZSTD_customMem customMem) +{ + if ((!customMem.customAlloc) ^ (!customMem.customFree)) return NULL; + + { size_t const workspaceSize = + ZSTD_cwksp_alloc_size(sizeof(ZSTD_CDict)) + + ZSTD_cwksp_alloc_size(HUF_WORKSPACE_SIZE) + + ZSTD_sizeof_matchState(&cParams, useRowMatchFinder, enableDedicatedDictSearch, /* forCCtx */ 0) + + (dictLoadMethod == ZSTD_dlm_byRef ? 0 + : ZSTD_cwksp_alloc_size(ZSTD_cwksp_align(dictSize, sizeof(void*)))); + void* const workspace = ZSTD_customMalloc(workspaceSize, customMem); + ZSTD_cwksp ws; + ZSTD_CDict* cdict; + + if (!workspace) { + ZSTD_customFree(workspace, customMem); + return NULL; + } + + ZSTD_cwksp_init(&ws, workspace, workspaceSize, ZSTD_cwksp_dynamic_alloc); + + cdict = (ZSTD_CDict*)ZSTD_cwksp_reserve_object(&ws, sizeof(ZSTD_CDict)); + assert(cdict != NULL); + ZSTD_cwksp_move(&cdict->workspace, &ws); + cdict->customMem = customMem; + cdict->compressionLevel = ZSTD_NO_CLEVEL; /* signals advanced API usage */ + cdict->useRowMatchFinder = useRowMatchFinder; + return cdict; + } +} + +ZSTD_CDict* ZSTD_createCDict_advanced(const void* dictBuffer, size_t dictSize, + ZSTD_dictLoadMethod_e dictLoadMethod, + ZSTD_dictContentType_e dictContentType, + ZSTD_compressionParameters cParams, + ZSTD_customMem customMem) +{ + ZSTD_CCtx_params cctxParams; + ZSTD_memset(&cctxParams, 0, sizeof(cctxParams)); + ZSTD_CCtxParams_init(&cctxParams, 0); + cctxParams.cParams = cParams; + cctxParams.customMem = customMem; + return ZSTD_createCDict_advanced2( + dictBuffer, dictSize, + dictLoadMethod, dictContentType, + &cctxParams, customMem); +} + +ZSTD_CDict* ZSTD_createCDict_advanced2( + const void* dict, size_t dictSize, + ZSTD_dictLoadMethod_e dictLoadMethod, + ZSTD_dictContentType_e dictContentType, + const ZSTD_CCtx_params* originalCctxParams, + ZSTD_customMem customMem) +{ + ZSTD_CCtx_params cctxParams = *originalCctxParams; + ZSTD_compressionParameters cParams; + ZSTD_CDict* cdict; + + DEBUGLOG(3, "ZSTD_createCDict_advanced2, mode %u", (unsigned)dictContentType); + if (!customMem.customAlloc ^ !customMem.customFree) return NULL; + + if (cctxParams.enableDedicatedDictSearch) { + cParams = ZSTD_dedicatedDictSearch_getCParams( + cctxParams.compressionLevel, dictSize); + ZSTD_overrideCParams(&cParams, &cctxParams.cParams); + } else { + cParams = ZSTD_getCParamsFromCCtxParams( + &cctxParams, ZSTD_CONTENTSIZE_UNKNOWN, dictSize, ZSTD_cpm_createCDict); + } + + if (!ZSTD_dedicatedDictSearch_isSupported(&cParams)) { + /* Fall back to non-DDSS params */ + cctxParams.enableDedicatedDictSearch = 0; + cParams = ZSTD_getCParamsFromCCtxParams( + &cctxParams, ZSTD_CONTENTSIZE_UNKNOWN, dictSize, ZSTD_cpm_createCDict); + } + + DEBUGLOG(3, "ZSTD_createCDict_advanced2: DDS: %u", cctxParams.enableDedicatedDictSearch); + cctxParams.cParams = cParams; + cctxParams.useRowMatchFinder = ZSTD_resolveRowMatchFinderMode(cctxParams.useRowMatchFinder, &cParams); + + cdict = ZSTD_createCDict_advanced_internal(dictSize, + dictLoadMethod, cctxParams.cParams, + cctxParams.useRowMatchFinder, cctxParams.enableDedicatedDictSearch, + customMem); + + if (!cdict || ZSTD_isError( ZSTD_initCDict_internal(cdict, + dict, dictSize, + dictLoadMethod, dictContentType, + cctxParams) )) { + ZSTD_freeCDict(cdict); + return NULL; + } + + return cdict; +} + +ZSTD_CDict* ZSTD_createCDict(const void* dict, size_t dictSize, int compressionLevel) +{ + ZSTD_compressionParameters cParams = ZSTD_getCParams_internal(compressionLevel, ZSTD_CONTENTSIZE_UNKNOWN, dictSize, ZSTD_cpm_createCDict); + ZSTD_CDict* const cdict = ZSTD_createCDict_advanced(dict, dictSize, + ZSTD_dlm_byCopy, ZSTD_dct_auto, + cParams, ZSTD_defaultCMem); + if (cdict) + cdict->compressionLevel = (compressionLevel == 0) ? ZSTD_CLEVEL_DEFAULT : compressionLevel; + return cdict; +} + +ZSTD_CDict* ZSTD_createCDict_byReference(const void* dict, size_t dictSize, int compressionLevel) +{ + ZSTD_compressionParameters cParams = ZSTD_getCParams_internal(compressionLevel, ZSTD_CONTENTSIZE_UNKNOWN, dictSize, ZSTD_cpm_createCDict); + ZSTD_CDict* const cdict = ZSTD_createCDict_advanced(dict, dictSize, + ZSTD_dlm_byRef, ZSTD_dct_auto, + cParams, ZSTD_defaultCMem); + if (cdict) + cdict->compressionLevel = (compressionLevel == 0) ? ZSTD_CLEVEL_DEFAULT : compressionLevel; + return cdict; +} + +size_t ZSTD_freeCDict(ZSTD_CDict* cdict) +{ + if (cdict==NULL) return 0; /* support free on NULL */ + { ZSTD_customMem const cMem = cdict->customMem; + int cdictInWorkspace = ZSTD_cwksp_owns_buffer(&cdict->workspace, cdict); + ZSTD_cwksp_free(&cdict->workspace, cMem); + if (!cdictInWorkspace) { + ZSTD_customFree(cdict, cMem); + } + return 0; + } +} + +/*! ZSTD_initStaticCDict_advanced() : + * Generate a digested dictionary in provided memory area. + * workspace: The memory area to emplace the dictionary into. + * Provided pointer must 8-bytes aligned. + * It must outlive dictionary usage. + * workspaceSize: Use ZSTD_estimateCDictSize() + * to determine how large workspace must be. + * cParams : use ZSTD_getCParams() to transform a compression level + * into its relevants cParams. + * @return : pointer to ZSTD_CDict*, or NULL if error (size too small) + * Note : there is no corresponding "free" function. + * Since workspace was allocated externally, it must be freed externally. + */ +const ZSTD_CDict* ZSTD_initStaticCDict( + void* workspace, size_t workspaceSize, + const void* dict, size_t dictSize, + ZSTD_dictLoadMethod_e dictLoadMethod, + ZSTD_dictContentType_e dictContentType, + ZSTD_compressionParameters cParams) +{ + ZSTD_paramSwitch_e const useRowMatchFinder = ZSTD_resolveRowMatchFinderMode(ZSTD_ps_auto, &cParams); + /* enableDedicatedDictSearch == 1 ensures matchstate is not too small in case this CDict will be used for DDS + row hash */ + size_t const matchStateSize = ZSTD_sizeof_matchState(&cParams, useRowMatchFinder, /* enableDedicatedDictSearch */ 1, /* forCCtx */ 0); + size_t const neededSize = ZSTD_cwksp_alloc_size(sizeof(ZSTD_CDict)) + + (dictLoadMethod == ZSTD_dlm_byRef ? 0 + : ZSTD_cwksp_alloc_size(ZSTD_cwksp_align(dictSize, sizeof(void*)))) + + ZSTD_cwksp_alloc_size(HUF_WORKSPACE_SIZE) + + matchStateSize; + ZSTD_CDict* cdict; + ZSTD_CCtx_params params; + + if ((size_t)workspace & 7) return NULL; /* 8-aligned */ + + { + ZSTD_cwksp ws; + ZSTD_cwksp_init(&ws, workspace, workspaceSize, ZSTD_cwksp_static_alloc); + cdict = (ZSTD_CDict*)ZSTD_cwksp_reserve_object(&ws, sizeof(ZSTD_CDict)); + if (cdict == NULL) return NULL; + ZSTD_cwksp_move(&cdict->workspace, &ws); + } + + DEBUGLOG(4, "(workspaceSize < neededSize) : (%u < %u) => %u", + (unsigned)workspaceSize, (unsigned)neededSize, (unsigned)(workspaceSize < neededSize)); + if (workspaceSize < neededSize) return NULL; + + ZSTD_CCtxParams_init(¶ms, 0); + params.cParams = cParams; + params.useRowMatchFinder = useRowMatchFinder; + cdict->useRowMatchFinder = useRowMatchFinder; + cdict->compressionLevel = ZSTD_NO_CLEVEL; + + if (ZSTD_isError( ZSTD_initCDict_internal(cdict, + dict, dictSize, + dictLoadMethod, dictContentType, + params) )) + return NULL; + + return cdict; +} + +ZSTD_compressionParameters ZSTD_getCParamsFromCDict(const ZSTD_CDict* cdict) +{ + assert(cdict != NULL); + return cdict->matchState.cParams; +} + +/*! ZSTD_getDictID_fromCDict() : + * Provides the dictID of the dictionary loaded into `cdict`. + * If @return == 0, the dictionary is not conformant to Zstandard specification, or empty. + * Non-conformant dictionaries can still be loaded, but as content-only dictionaries. */ +unsigned ZSTD_getDictID_fromCDict(const ZSTD_CDict* cdict) +{ + if (cdict==NULL) return 0; + return cdict->dictID; +} + +/* ZSTD_compressBegin_usingCDict_internal() : + * Implementation of various ZSTD_compressBegin_usingCDict* functions. + */ +static size_t ZSTD_compressBegin_usingCDict_internal( + ZSTD_CCtx* const cctx, const ZSTD_CDict* const cdict, + ZSTD_frameParameters const fParams, unsigned long long const pledgedSrcSize) +{ + ZSTD_CCtx_params cctxParams; + DEBUGLOG(4, "ZSTD_compressBegin_usingCDict_internal"); + RETURN_ERROR_IF(cdict==NULL, dictionary_wrong, "NULL pointer!"); + /* Initialize the cctxParams from the cdict */ + { + ZSTD_parameters params; + params.fParams = fParams; + params.cParams = ( pledgedSrcSize < ZSTD_USE_CDICT_PARAMS_SRCSIZE_CUTOFF + || pledgedSrcSize < cdict->dictContentSize * ZSTD_USE_CDICT_PARAMS_DICTSIZE_MULTIPLIER + || pledgedSrcSize == ZSTD_CONTENTSIZE_UNKNOWN + || cdict->compressionLevel == 0 ) ? + ZSTD_getCParamsFromCDict(cdict) + : ZSTD_getCParams(cdict->compressionLevel, + pledgedSrcSize, + cdict->dictContentSize); + ZSTD_CCtxParams_init_internal(&cctxParams, ¶ms, cdict->compressionLevel); + } + /* Increase window log to fit the entire dictionary and source if the + * source size is known. Limit the increase to 19, which is the + * window log for compression level 1 with the largest source size. + */ + if (pledgedSrcSize != ZSTD_CONTENTSIZE_UNKNOWN) { + U32 const limitedSrcSize = (U32)MIN(pledgedSrcSize, 1U << 19); + U32 const limitedSrcLog = limitedSrcSize > 1 ? ZSTD_highbit32(limitedSrcSize - 1) + 1 : 1; + cctxParams.cParams.windowLog = MAX(cctxParams.cParams.windowLog, limitedSrcLog); + } + return ZSTD_compressBegin_internal(cctx, + NULL, 0, ZSTD_dct_auto, ZSTD_dtlm_fast, + cdict, + &cctxParams, pledgedSrcSize, + ZSTDb_not_buffered); +} + + +/* ZSTD_compressBegin_usingCDict_advanced() : + * This function is DEPRECATED. + * cdict must be != NULL */ +size_t ZSTD_compressBegin_usingCDict_advanced( + ZSTD_CCtx* const cctx, const ZSTD_CDict* const cdict, + ZSTD_frameParameters const fParams, unsigned long long const pledgedSrcSize) +{ + return ZSTD_compressBegin_usingCDict_internal(cctx, cdict, fParams, pledgedSrcSize); +} + +/* ZSTD_compressBegin_usingCDict() : + * cdict must be != NULL */ +size_t ZSTD_compressBegin_usingCDict_deprecated(ZSTD_CCtx* cctx, const ZSTD_CDict* cdict) +{ + ZSTD_frameParameters const fParams = { 0 /*content*/, 0 /*checksum*/, 0 /*noDictID*/ }; + return ZSTD_compressBegin_usingCDict_internal(cctx, cdict, fParams, ZSTD_CONTENTSIZE_UNKNOWN); +} + +size_t ZSTD_compressBegin_usingCDict(ZSTD_CCtx* cctx, const ZSTD_CDict* cdict) +{ + return ZSTD_compressBegin_usingCDict_deprecated(cctx, cdict); +} + +/*! ZSTD_compress_usingCDict_internal(): + * Implementation of various ZSTD_compress_usingCDict* functions. + */ +static size_t ZSTD_compress_usingCDict_internal(ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + const ZSTD_CDict* cdict, ZSTD_frameParameters fParams) +{ + FORWARD_IF_ERROR(ZSTD_compressBegin_usingCDict_internal(cctx, cdict, fParams, srcSize), ""); /* will check if cdict != NULL */ + return ZSTD_compressEnd_public(cctx, dst, dstCapacity, src, srcSize); +} + +/*! ZSTD_compress_usingCDict_advanced(): + * This function is DEPRECATED. + */ +size_t ZSTD_compress_usingCDict_advanced(ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + const ZSTD_CDict* cdict, ZSTD_frameParameters fParams) +{ + return ZSTD_compress_usingCDict_internal(cctx, dst, dstCapacity, src, srcSize, cdict, fParams); +} + +/*! ZSTD_compress_usingCDict() : + * Compression using a digested Dictionary. + * Faster startup than ZSTD_compress_usingDict(), recommended when same dictionary is used multiple times. + * Note that compression parameters are decided at CDict creation time + * while frame parameters are hardcoded */ +size_t ZSTD_compress_usingCDict(ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + const ZSTD_CDict* cdict) +{ + ZSTD_frameParameters const fParams = { 1 /*content*/, 0 /*checksum*/, 0 /*noDictID*/ }; + return ZSTD_compress_usingCDict_internal(cctx, dst, dstCapacity, src, srcSize, cdict, fParams); +} + + + +/* ****************************************************************** +* Streaming +********************************************************************/ + +ZSTD_CStream* ZSTD_createCStream(void) +{ + DEBUGLOG(3, "ZSTD_createCStream"); + return ZSTD_createCStream_advanced(ZSTD_defaultCMem); +} + +ZSTD_CStream* ZSTD_initStaticCStream(void *workspace, size_t workspaceSize) +{ + return ZSTD_initStaticCCtx(workspace, workspaceSize); +} + +ZSTD_CStream* ZSTD_createCStream_advanced(ZSTD_customMem customMem) +{ /* CStream and CCtx are now same object */ + return ZSTD_createCCtx_advanced(customMem); +} + +size_t ZSTD_freeCStream(ZSTD_CStream* zcs) +{ + return ZSTD_freeCCtx(zcs); /* same object */ +} + + + +/*====== Initialization ======*/ + +size_t ZSTD_CStreamInSize(void) { return ZSTD_BLOCKSIZE_MAX; } + +size_t ZSTD_CStreamOutSize(void) +{ + return ZSTD_compressBound(ZSTD_BLOCKSIZE_MAX) + ZSTD_blockHeaderSize + 4 /* 32-bits hash */ ; +} + +static ZSTD_cParamMode_e ZSTD_getCParamMode(ZSTD_CDict const* cdict, ZSTD_CCtx_params const* params, U64 pledgedSrcSize) +{ + if (cdict != NULL && ZSTD_shouldAttachDict(cdict, params, pledgedSrcSize)) + return ZSTD_cpm_attachDict; + else + return ZSTD_cpm_noAttachDict; +} + +/* ZSTD_resetCStream(): + * pledgedSrcSize == 0 means "unknown" */ +size_t ZSTD_resetCStream(ZSTD_CStream* zcs, unsigned long long pss) +{ + /* temporary : 0 interpreted as "unknown" during transition period. + * Users willing to specify "unknown" **must** use ZSTD_CONTENTSIZE_UNKNOWN. + * 0 will be interpreted as "empty" in the future. + */ + U64 const pledgedSrcSize = (pss==0) ? ZSTD_CONTENTSIZE_UNKNOWN : pss; + DEBUGLOG(4, "ZSTD_resetCStream: pledgedSrcSize = %u", (unsigned)pledgedSrcSize); + FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) , ""); + FORWARD_IF_ERROR( ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize) , ""); + return 0; +} + +/*! ZSTD_initCStream_internal() : + * Note : for lib/compress only. Used by zstdmt_compress.c. + * Assumption 1 : params are valid + * Assumption 2 : either dict, or cdict, is defined, not both */ +size_t ZSTD_initCStream_internal(ZSTD_CStream* zcs, + const void* dict, size_t dictSize, const ZSTD_CDict* cdict, + const ZSTD_CCtx_params* params, + unsigned long long pledgedSrcSize) +{ + DEBUGLOG(4, "ZSTD_initCStream_internal"); + FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) , ""); + FORWARD_IF_ERROR( ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize) , ""); + assert(!ZSTD_isError(ZSTD_checkCParams(params->cParams))); + zcs->requestedParams = *params; + assert(!((dict) && (cdict))); /* either dict or cdict, not both */ + if (dict) { + FORWARD_IF_ERROR( ZSTD_CCtx_loadDictionary(zcs, dict, dictSize) , ""); + } else { + /* Dictionary is cleared if !cdict */ + FORWARD_IF_ERROR( ZSTD_CCtx_refCDict(zcs, cdict) , ""); + } + return 0; +} + +/* ZSTD_initCStream_usingCDict_advanced() : + * same as ZSTD_initCStream_usingCDict(), with control over frame parameters */ +size_t ZSTD_initCStream_usingCDict_advanced(ZSTD_CStream* zcs, + const ZSTD_CDict* cdict, + ZSTD_frameParameters fParams, + unsigned long long pledgedSrcSize) +{ + DEBUGLOG(4, "ZSTD_initCStream_usingCDict_advanced"); + FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) , ""); + FORWARD_IF_ERROR( ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize) , ""); + zcs->requestedParams.fParams = fParams; + FORWARD_IF_ERROR( ZSTD_CCtx_refCDict(zcs, cdict) , ""); + return 0; +} + +/* note : cdict must outlive compression session */ +size_t ZSTD_initCStream_usingCDict(ZSTD_CStream* zcs, const ZSTD_CDict* cdict) +{ + DEBUGLOG(4, "ZSTD_initCStream_usingCDict"); + FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) , ""); + FORWARD_IF_ERROR( ZSTD_CCtx_refCDict(zcs, cdict) , ""); + return 0; +} + + +/* ZSTD_initCStream_advanced() : + * pledgedSrcSize must be exact. + * if srcSize is not known at init time, use value ZSTD_CONTENTSIZE_UNKNOWN. + * dict is loaded with default parameters ZSTD_dct_auto and ZSTD_dlm_byCopy. */ +size_t ZSTD_initCStream_advanced(ZSTD_CStream* zcs, + const void* dict, size_t dictSize, + ZSTD_parameters params, unsigned long long pss) +{ + /* for compatibility with older programs relying on this behavior. + * Users should now specify ZSTD_CONTENTSIZE_UNKNOWN. + * This line will be removed in the future. + */ + U64 const pledgedSrcSize = (pss==0 && params.fParams.contentSizeFlag==0) ? ZSTD_CONTENTSIZE_UNKNOWN : pss; + DEBUGLOG(4, "ZSTD_initCStream_advanced"); + FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) , ""); + FORWARD_IF_ERROR( ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize) , ""); + FORWARD_IF_ERROR( ZSTD_checkCParams(params.cParams) , ""); + ZSTD_CCtxParams_setZstdParams(&zcs->requestedParams, ¶ms); + FORWARD_IF_ERROR( ZSTD_CCtx_loadDictionary(zcs, dict, dictSize) , ""); + return 0; +} + +size_t ZSTD_initCStream_usingDict(ZSTD_CStream* zcs, const void* dict, size_t dictSize, int compressionLevel) +{ + DEBUGLOG(4, "ZSTD_initCStream_usingDict"); + FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) , ""); + FORWARD_IF_ERROR( ZSTD_CCtx_setParameter(zcs, ZSTD_c_compressionLevel, compressionLevel) , ""); + FORWARD_IF_ERROR( ZSTD_CCtx_loadDictionary(zcs, dict, dictSize) , ""); + return 0; +} + +size_t ZSTD_initCStream_srcSize(ZSTD_CStream* zcs, int compressionLevel, unsigned long long pss) +{ + /* temporary : 0 interpreted as "unknown" during transition period. + * Users willing to specify "unknown" **must** use ZSTD_CONTENTSIZE_UNKNOWN. + * 0 will be interpreted as "empty" in the future. + */ + U64 const pledgedSrcSize = (pss==0) ? ZSTD_CONTENTSIZE_UNKNOWN : pss; + DEBUGLOG(4, "ZSTD_initCStream_srcSize"); + FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) , ""); + FORWARD_IF_ERROR( ZSTD_CCtx_refCDict(zcs, NULL) , ""); + FORWARD_IF_ERROR( ZSTD_CCtx_setParameter(zcs, ZSTD_c_compressionLevel, compressionLevel) , ""); + FORWARD_IF_ERROR( ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize) , ""); + return 0; +} + +size_t ZSTD_initCStream(ZSTD_CStream* zcs, int compressionLevel) +{ + DEBUGLOG(4, "ZSTD_initCStream"); + FORWARD_IF_ERROR( ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only) , ""); + FORWARD_IF_ERROR( ZSTD_CCtx_refCDict(zcs, NULL) , ""); + FORWARD_IF_ERROR( ZSTD_CCtx_setParameter(zcs, ZSTD_c_compressionLevel, compressionLevel) , ""); + return 0; +} + +/*====== Compression ======*/ + +static size_t ZSTD_nextInputSizeHint(const ZSTD_CCtx* cctx) +{ + if (cctx->appliedParams.inBufferMode == ZSTD_bm_stable) { + return cctx->blockSize - cctx->stableIn_notConsumed; + } + assert(cctx->appliedParams.inBufferMode == ZSTD_bm_buffered); + { size_t hintInSize = cctx->inBuffTarget - cctx->inBuffPos; + if (hintInSize==0) hintInSize = cctx->blockSize; + return hintInSize; + } +} + +/** ZSTD_compressStream_generic(): + * internal function for all *compressStream*() variants + * @return : hint size for next input to complete ongoing block */ +static size_t ZSTD_compressStream_generic(ZSTD_CStream* zcs, + ZSTD_outBuffer* output, + ZSTD_inBuffer* input, + ZSTD_EndDirective const flushMode) +{ + const char* const istart = (assert(input != NULL), (const char*)input->src); + const char* const iend = (istart != NULL) ? istart + input->size : istart; + const char* ip = (istart != NULL) ? istart + input->pos : istart; + char* const ostart = (assert(output != NULL), (char*)output->dst); + char* const oend = (ostart != NULL) ? ostart + output->size : ostart; + char* op = (ostart != NULL) ? ostart + output->pos : ostart; + U32 someMoreWork = 1; + + /* check expectations */ + DEBUGLOG(5, "ZSTD_compressStream_generic, flush=%i, srcSize = %zu", (int)flushMode, input->size - input->pos); + assert(zcs != NULL); + if (zcs->appliedParams.inBufferMode == ZSTD_bm_stable) { + assert(input->pos >= zcs->stableIn_notConsumed); + input->pos -= zcs->stableIn_notConsumed; + if (ip) ip -= zcs->stableIn_notConsumed; + zcs->stableIn_notConsumed = 0; + } + if (zcs->appliedParams.inBufferMode == ZSTD_bm_buffered) { + assert(zcs->inBuff != NULL); + assert(zcs->inBuffSize > 0); + } + if (zcs->appliedParams.outBufferMode == ZSTD_bm_buffered) { + assert(zcs->outBuff != NULL); + assert(zcs->outBuffSize > 0); + } + if (input->src == NULL) assert(input->size == 0); + assert(input->pos <= input->size); + if (output->dst == NULL) assert(output->size == 0); + assert(output->pos <= output->size); + assert((U32)flushMode <= (U32)ZSTD_e_end); + + while (someMoreWork) { + switch(zcs->streamStage) + { + case zcss_init: + RETURN_ERROR(init_missing, "call ZSTD_initCStream() first!"); + + case zcss_load: + if ( (flushMode == ZSTD_e_end) + && ( (size_t)(oend-op) >= ZSTD_compressBound(iend-ip) /* Enough output space */ + || zcs->appliedParams.outBufferMode == ZSTD_bm_stable) /* OR we are allowed to return dstSizeTooSmall */ + && (zcs->inBuffPos == 0) ) { + /* shortcut to compression pass directly into output buffer */ + size_t const cSize = ZSTD_compressEnd_public(zcs, + op, oend-op, ip, iend-ip); + DEBUGLOG(4, "ZSTD_compressEnd : cSize=%u", (unsigned)cSize); + FORWARD_IF_ERROR(cSize, "ZSTD_compressEnd failed"); + ip = iend; + op += cSize; + zcs->frameEnded = 1; + ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only); + someMoreWork = 0; break; + } + /* complete loading into inBuffer in buffered mode */ + if (zcs->appliedParams.inBufferMode == ZSTD_bm_buffered) { + size_t const toLoad = zcs->inBuffTarget - zcs->inBuffPos; + size_t const loaded = ZSTD_limitCopy( + zcs->inBuff + zcs->inBuffPos, toLoad, + ip, iend-ip); + zcs->inBuffPos += loaded; + if (ip) ip += loaded; + if ( (flushMode == ZSTD_e_continue) + && (zcs->inBuffPos < zcs->inBuffTarget) ) { + /* not enough input to fill full block : stop here */ + someMoreWork = 0; break; + } + if ( (flushMode == ZSTD_e_flush) + && (zcs->inBuffPos == zcs->inToCompress) ) { + /* empty */ + someMoreWork = 0; break; + } + } else { + assert(zcs->appliedParams.inBufferMode == ZSTD_bm_stable); + if ( (flushMode == ZSTD_e_continue) + && ( (size_t)(iend - ip) < zcs->blockSize) ) { + /* can't compress a full block : stop here */ + zcs->stableIn_notConsumed = (size_t)(iend - ip); + ip = iend; /* pretend to have consumed input */ + someMoreWork = 0; break; + } + if ( (flushMode == ZSTD_e_flush) + && (ip == iend) ) { + /* empty */ + someMoreWork = 0; break; + } + } + /* compress current block (note : this stage cannot be stopped in the middle) */ + DEBUGLOG(5, "stream compression stage (flushMode==%u)", flushMode); + { int const inputBuffered = (zcs->appliedParams.inBufferMode == ZSTD_bm_buffered); + void* cDst; + size_t cSize; + size_t oSize = oend-op; + size_t const iSize = inputBuffered ? zcs->inBuffPos - zcs->inToCompress + : MIN((size_t)(iend - ip), zcs->blockSize); + if (oSize >= ZSTD_compressBound(iSize) || zcs->appliedParams.outBufferMode == ZSTD_bm_stable) + cDst = op; /* compress into output buffer, to skip flush stage */ + else + cDst = zcs->outBuff, oSize = zcs->outBuffSize; + if (inputBuffered) { + unsigned const lastBlock = (flushMode == ZSTD_e_end) && (ip==iend); + cSize = lastBlock ? + ZSTD_compressEnd_public(zcs, cDst, oSize, + zcs->inBuff + zcs->inToCompress, iSize) : + ZSTD_compressContinue_public(zcs, cDst, oSize, + zcs->inBuff + zcs->inToCompress, iSize); + FORWARD_IF_ERROR(cSize, "%s", lastBlock ? "ZSTD_compressEnd failed" : "ZSTD_compressContinue failed"); + zcs->frameEnded = lastBlock; + /* prepare next block */ + zcs->inBuffTarget = zcs->inBuffPos + zcs->blockSize; + if (zcs->inBuffTarget > zcs->inBuffSize) + zcs->inBuffPos = 0, zcs->inBuffTarget = zcs->blockSize; + DEBUGLOG(5, "inBuffTarget:%u / inBuffSize:%u", + (unsigned)zcs->inBuffTarget, (unsigned)zcs->inBuffSize); + if (!lastBlock) + assert(zcs->inBuffTarget <= zcs->inBuffSize); + zcs->inToCompress = zcs->inBuffPos; + } else { /* !inputBuffered, hence ZSTD_bm_stable */ + unsigned const lastBlock = (flushMode == ZSTD_e_end) && (ip + iSize == iend); + cSize = lastBlock ? + ZSTD_compressEnd_public(zcs, cDst, oSize, ip, iSize) : + ZSTD_compressContinue_public(zcs, cDst, oSize, ip, iSize); + /* Consume the input prior to error checking to mirror buffered mode. */ + if (ip) ip += iSize; + FORWARD_IF_ERROR(cSize, "%s", lastBlock ? "ZSTD_compressEnd failed" : "ZSTD_compressContinue failed"); + zcs->frameEnded = lastBlock; + if (lastBlock) assert(ip == iend); + } + if (cDst == op) { /* no need to flush */ + op += cSize; + if (zcs->frameEnded) { + DEBUGLOG(5, "Frame completed directly in outBuffer"); + someMoreWork = 0; + ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only); + } + break; + } + zcs->outBuffContentSize = cSize; + zcs->outBuffFlushedSize = 0; + zcs->streamStage = zcss_flush; /* pass-through to flush stage */ + } + ZSTD_FALLTHROUGH; + case zcss_flush: + DEBUGLOG(5, "flush stage"); + assert(zcs->appliedParams.outBufferMode == ZSTD_bm_buffered); + { size_t const toFlush = zcs->outBuffContentSize - zcs->outBuffFlushedSize; + size_t const flushed = ZSTD_limitCopy(op, (size_t)(oend-op), + zcs->outBuff + zcs->outBuffFlushedSize, toFlush); + DEBUGLOG(5, "toFlush: %u into %u ==> flushed: %u", + (unsigned)toFlush, (unsigned)(oend-op), (unsigned)flushed); + if (flushed) + op += flushed; + zcs->outBuffFlushedSize += flushed; + if (toFlush!=flushed) { + /* flush not fully completed, presumably because dst is too small */ + assert(op==oend); + someMoreWork = 0; + break; + } + zcs->outBuffContentSize = zcs->outBuffFlushedSize = 0; + if (zcs->frameEnded) { + DEBUGLOG(5, "Frame completed on flush"); + someMoreWork = 0; + ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only); + break; + } + zcs->streamStage = zcss_load; + break; + } + + default: /* impossible */ + assert(0); + } + } + + input->pos = ip - istart; + output->pos = op - ostart; + if (zcs->frameEnded) return 0; + return ZSTD_nextInputSizeHint(zcs); +} + +static size_t ZSTD_nextInputSizeHint_MTorST(const ZSTD_CCtx* cctx) +{ +#ifdef ZSTD_MULTITHREAD + if (cctx->appliedParams.nbWorkers >= 1) { + assert(cctx->mtctx != NULL); + return ZSTDMT_nextInputSizeHint(cctx->mtctx); + } +#endif + return ZSTD_nextInputSizeHint(cctx); + +} + +size_t ZSTD_compressStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output, ZSTD_inBuffer* input) +{ + FORWARD_IF_ERROR( ZSTD_compressStream2(zcs, output, input, ZSTD_e_continue) , ""); + return ZSTD_nextInputSizeHint_MTorST(zcs); +} + +/* After a compression call set the expected input/output buffer. + * This is validated at the start of the next compression call. + */ +static void +ZSTD_setBufferExpectations(ZSTD_CCtx* cctx, const ZSTD_outBuffer* output, const ZSTD_inBuffer* input) +{ + DEBUGLOG(5, "ZSTD_setBufferExpectations (for advanced stable in/out modes)"); + if (cctx->appliedParams.inBufferMode == ZSTD_bm_stable) { + cctx->expectedInBuffer = *input; + } + if (cctx->appliedParams.outBufferMode == ZSTD_bm_stable) { + cctx->expectedOutBufferSize = output->size - output->pos; + } +} + +/* Validate that the input/output buffers match the expectations set by + * ZSTD_setBufferExpectations. + */ +static size_t ZSTD_checkBufferStability(ZSTD_CCtx const* cctx, + ZSTD_outBuffer const* output, + ZSTD_inBuffer const* input, + ZSTD_EndDirective endOp) +{ + if (cctx->appliedParams.inBufferMode == ZSTD_bm_stable) { + ZSTD_inBuffer const expect = cctx->expectedInBuffer; + if (expect.src != input->src || expect.pos != input->pos) + RETURN_ERROR(stabilityCondition_notRespected, "ZSTD_c_stableInBuffer enabled but input differs!"); + } + (void)endOp; + if (cctx->appliedParams.outBufferMode == ZSTD_bm_stable) { + size_t const outBufferSize = output->size - output->pos; + if (cctx->expectedOutBufferSize != outBufferSize) + RETURN_ERROR(stabilityCondition_notRespected, "ZSTD_c_stableOutBuffer enabled but output size differs!"); + } + return 0; +} + +static size_t ZSTD_CCtx_init_compressStream2(ZSTD_CCtx* cctx, + ZSTD_EndDirective endOp, + size_t inSize) +{ + ZSTD_CCtx_params params = cctx->requestedParams; + ZSTD_prefixDict const prefixDict = cctx->prefixDict; + FORWARD_IF_ERROR( ZSTD_initLocalDict(cctx) , ""); /* Init the local dict if present. */ + ZSTD_memset(&cctx->prefixDict, 0, sizeof(cctx->prefixDict)); /* single usage */ + assert(prefixDict.dict==NULL || cctx->cdict==NULL); /* only one can be set */ + if (cctx->cdict && !cctx->localDict.cdict) { + /* Let the cdict's compression level take priority over the requested params. + * But do not take the cdict's compression level if the "cdict" is actually a localDict + * generated from ZSTD_initLocalDict(). + */ + params.compressionLevel = cctx->cdict->compressionLevel; + } + DEBUGLOG(4, "ZSTD_compressStream2 : transparent init stage"); + if (endOp == ZSTD_e_end) cctx->pledgedSrcSizePlusOne = inSize + 1; /* auto-determine pledgedSrcSize */ + + { size_t const dictSize = prefixDict.dict + ? prefixDict.dictSize + : (cctx->cdict ? cctx->cdict->dictContentSize : 0); + ZSTD_cParamMode_e const mode = ZSTD_getCParamMode(cctx->cdict, ¶ms, cctx->pledgedSrcSizePlusOne - 1); + params.cParams = ZSTD_getCParamsFromCCtxParams( + ¶ms, cctx->pledgedSrcSizePlusOne-1, + dictSize, mode); + } + + params.useBlockSplitter = ZSTD_resolveBlockSplitterMode(params.useBlockSplitter, ¶ms.cParams); + params.ldmParams.enableLdm = ZSTD_resolveEnableLdm(params.ldmParams.enableLdm, ¶ms.cParams); + params.useRowMatchFinder = ZSTD_resolveRowMatchFinderMode(params.useRowMatchFinder, ¶ms.cParams); + params.validateSequences = ZSTD_resolveExternalSequenceValidation(params.validateSequences); + params.maxBlockSize = ZSTD_resolveMaxBlockSize(params.maxBlockSize); + params.searchForExternalRepcodes = ZSTD_resolveExternalRepcodeSearch(params.searchForExternalRepcodes, params.compressionLevel); + +#ifdef ZSTD_MULTITHREAD + /* If external matchfinder is enabled, make sure to fail before checking job size (for consistency) */ + RETURN_ERROR_IF( + ZSTD_hasExtSeqProd(¶ms) && params.nbWorkers >= 1, + parameter_combination_unsupported, + "External sequence producer isn't supported with nbWorkers >= 1" + ); + + if ((cctx->pledgedSrcSizePlusOne-1) <= ZSTDMT_JOBSIZE_MIN) { + params.nbWorkers = 0; /* do not invoke multi-threading when src size is too small */ + } + if (params.nbWorkers > 0) { +#if ZSTD_TRACE + cctx->traceCtx = (ZSTD_trace_compress_begin != NULL) ? ZSTD_trace_compress_begin(cctx) : 0; +#endif + /* mt context creation */ + if (cctx->mtctx == NULL) { + DEBUGLOG(4, "ZSTD_compressStream2: creating new mtctx for nbWorkers=%u", + params.nbWorkers); + cctx->mtctx = ZSTDMT_createCCtx_advanced((U32)params.nbWorkers, cctx->customMem, cctx->pool); + RETURN_ERROR_IF(cctx->mtctx == NULL, memory_allocation, "NULL pointer!"); + } + /* mt compression */ + DEBUGLOG(4, "call ZSTDMT_initCStream_internal as nbWorkers=%u", params.nbWorkers); + FORWARD_IF_ERROR( ZSTDMT_initCStream_internal( + cctx->mtctx, + prefixDict.dict, prefixDict.dictSize, prefixDict.dictContentType, + cctx->cdict, params, cctx->pledgedSrcSizePlusOne-1) , ""); + cctx->dictID = cctx->cdict ? cctx->cdict->dictID : 0; + cctx->dictContentSize = cctx->cdict ? cctx->cdict->dictContentSize : prefixDict.dictSize; + cctx->consumedSrcSize = 0; + cctx->producedCSize = 0; + cctx->streamStage = zcss_load; + cctx->appliedParams = params; + } else +#endif /* ZSTD_MULTITHREAD */ + { U64 const pledgedSrcSize = cctx->pledgedSrcSizePlusOne - 1; + assert(!ZSTD_isError(ZSTD_checkCParams(params.cParams))); + FORWARD_IF_ERROR( ZSTD_compressBegin_internal(cctx, + prefixDict.dict, prefixDict.dictSize, prefixDict.dictContentType, ZSTD_dtlm_fast, + cctx->cdict, + ¶ms, pledgedSrcSize, + ZSTDb_buffered) , ""); + assert(cctx->appliedParams.nbWorkers == 0); + cctx->inToCompress = 0; + cctx->inBuffPos = 0; + if (cctx->appliedParams.inBufferMode == ZSTD_bm_buffered) { + /* for small input: avoid automatic flush on reaching end of block, since + * it would require to add a 3-bytes null block to end frame + */ + cctx->inBuffTarget = cctx->blockSize + (cctx->blockSize == pledgedSrcSize); + } else { + cctx->inBuffTarget = 0; + } + cctx->outBuffContentSize = cctx->outBuffFlushedSize = 0; + cctx->streamStage = zcss_load; + cctx->frameEnded = 0; + } + return 0; +} + +/* @return provides a minimum amount of data remaining to be flushed from internal buffers + */ +size_t ZSTD_compressStream2( ZSTD_CCtx* cctx, + ZSTD_outBuffer* output, + ZSTD_inBuffer* input, + ZSTD_EndDirective endOp) +{ + DEBUGLOG(5, "ZSTD_compressStream2, endOp=%u ", (unsigned)endOp); + /* check conditions */ + RETURN_ERROR_IF(output->pos > output->size, dstSize_tooSmall, "invalid output buffer"); + RETURN_ERROR_IF(input->pos > input->size, srcSize_wrong, "invalid input buffer"); + RETURN_ERROR_IF((U32)endOp > (U32)ZSTD_e_end, parameter_outOfBound, "invalid endDirective"); + assert(cctx != NULL); + + /* transparent initialization stage */ + if (cctx->streamStage == zcss_init) { + size_t const inputSize = input->size - input->pos; /* no obligation to start from pos==0 */ + size_t const totalInputSize = inputSize + cctx->stableIn_notConsumed; + if ( (cctx->requestedParams.inBufferMode == ZSTD_bm_stable) /* input is presumed stable, across invocations */ + && (endOp == ZSTD_e_continue) /* no flush requested, more input to come */ + && (totalInputSize < ZSTD_BLOCKSIZE_MAX) ) { /* not even reached one block yet */ + if (cctx->stableIn_notConsumed) { /* not the first time */ + /* check stable source guarantees */ + RETURN_ERROR_IF(input->src != cctx->expectedInBuffer.src, stabilityCondition_notRespected, "stableInBuffer condition not respected: wrong src pointer"); + RETURN_ERROR_IF(input->pos != cctx->expectedInBuffer.size, stabilityCondition_notRespected, "stableInBuffer condition not respected: externally modified pos"); + } + /* pretend input was consumed, to give a sense forward progress */ + input->pos = input->size; + /* save stable inBuffer, for later control, and flush/end */ + cctx->expectedInBuffer = *input; + /* but actually input wasn't consumed, so keep track of position from where compression shall resume */ + cctx->stableIn_notConsumed += inputSize; + /* don't initialize yet, wait for the first block of flush() order, for better parameters adaptation */ + return ZSTD_FRAMEHEADERSIZE_MIN(cctx->requestedParams.format); /* at least some header to produce */ + } + FORWARD_IF_ERROR(ZSTD_CCtx_init_compressStream2(cctx, endOp, totalInputSize), "compressStream2 initialization failed"); + ZSTD_setBufferExpectations(cctx, output, input); /* Set initial buffer expectations now that we've initialized */ + } + /* end of transparent initialization stage */ + + FORWARD_IF_ERROR(ZSTD_checkBufferStability(cctx, output, input, endOp), "invalid buffers"); + /* compression stage */ +#ifdef ZSTD_MULTITHREAD + if (cctx->appliedParams.nbWorkers > 0) { + size_t flushMin; + if (cctx->cParamsChanged) { + ZSTDMT_updateCParams_whileCompressing(cctx->mtctx, &cctx->requestedParams); + cctx->cParamsChanged = 0; + } + if (cctx->stableIn_notConsumed) { + assert(cctx->appliedParams.inBufferMode == ZSTD_bm_stable); + /* some early data was skipped - make it available for consumption */ + assert(input->pos >= cctx->stableIn_notConsumed); + input->pos -= cctx->stableIn_notConsumed; + cctx->stableIn_notConsumed = 0; + } + for (;;) { + size_t const ipos = input->pos; + size_t const opos = output->pos; + flushMin = ZSTDMT_compressStream_generic(cctx->mtctx, output, input, endOp); + cctx->consumedSrcSize += (U64)(input->pos - ipos); + cctx->producedCSize += (U64)(output->pos - opos); + if ( ZSTD_isError(flushMin) + || (endOp == ZSTD_e_end && flushMin == 0) ) { /* compression completed */ + if (flushMin == 0) + ZSTD_CCtx_trace(cctx, 0); + ZSTD_CCtx_reset(cctx, ZSTD_reset_session_only); + } + FORWARD_IF_ERROR(flushMin, "ZSTDMT_compressStream_generic failed"); + + if (endOp == ZSTD_e_continue) { + /* We only require some progress with ZSTD_e_continue, not maximal progress. + * We're done if we've consumed or produced any bytes, or either buffer is + * full. + */ + if (input->pos != ipos || output->pos != opos || input->pos == input->size || output->pos == output->size) + break; + } else { + assert(endOp == ZSTD_e_flush || endOp == ZSTD_e_end); + /* We require maximal progress. We're done when the flush is complete or the + * output buffer is full. + */ + if (flushMin == 0 || output->pos == output->size) + break; + } + } + DEBUGLOG(5, "completed ZSTD_compressStream2 delegating to ZSTDMT_compressStream_generic"); + /* Either we don't require maximum forward progress, we've finished the + * flush, or we are out of output space. + */ + assert(endOp == ZSTD_e_continue || flushMin == 0 || output->pos == output->size); + ZSTD_setBufferExpectations(cctx, output, input); + return flushMin; + } +#endif /* ZSTD_MULTITHREAD */ + FORWARD_IF_ERROR( ZSTD_compressStream_generic(cctx, output, input, endOp) , ""); + DEBUGLOG(5, "completed ZSTD_compressStream2"); + ZSTD_setBufferExpectations(cctx, output, input); + return cctx->outBuffContentSize - cctx->outBuffFlushedSize; /* remaining to flush */ +} + +size_t ZSTD_compressStream2_simpleArgs ( + ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, size_t* dstPos, + const void* src, size_t srcSize, size_t* srcPos, + ZSTD_EndDirective endOp) +{ + ZSTD_outBuffer output; + ZSTD_inBuffer input; + output.dst = dst; + output.size = dstCapacity; + output.pos = *dstPos; + input.src = src; + input.size = srcSize; + input.pos = *srcPos; + /* ZSTD_compressStream2() will check validity of dstPos and srcPos */ + { size_t const cErr = ZSTD_compressStream2(cctx, &output, &input, endOp); + *dstPos = output.pos; + *srcPos = input.pos; + return cErr; + } +} + +size_t ZSTD_compress2(ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize) +{ + ZSTD_bufferMode_e const originalInBufferMode = cctx->requestedParams.inBufferMode; + ZSTD_bufferMode_e const originalOutBufferMode = cctx->requestedParams.outBufferMode; + DEBUGLOG(4, "ZSTD_compress2 (srcSize=%u)", (unsigned)srcSize); + ZSTD_CCtx_reset(cctx, ZSTD_reset_session_only); + /* Enable stable input/output buffers. */ + cctx->requestedParams.inBufferMode = ZSTD_bm_stable; + cctx->requestedParams.outBufferMode = ZSTD_bm_stable; + { size_t oPos = 0; + size_t iPos = 0; + size_t const result = ZSTD_compressStream2_simpleArgs(cctx, + dst, dstCapacity, &oPos, + src, srcSize, &iPos, + ZSTD_e_end); + /* Reset to the original values. */ + cctx->requestedParams.inBufferMode = originalInBufferMode; + cctx->requestedParams.outBufferMode = originalOutBufferMode; + + FORWARD_IF_ERROR(result, "ZSTD_compressStream2_simpleArgs failed"); + if (result != 0) { /* compression not completed, due to lack of output space */ + assert(oPos == dstCapacity); + RETURN_ERROR(dstSize_tooSmall, ""); + } + assert(iPos == srcSize); /* all input is expected consumed */ + return oPos; + } +} + +/* ZSTD_validateSequence() : + * @offCode : is presumed to follow format required by ZSTD_storeSeq() + * @returns a ZSTD error code if sequence is not valid + */ +static size_t +ZSTD_validateSequence(U32 offCode, U32 matchLength, U32 minMatch, + size_t posInSrc, U32 windowLog, size_t dictSize, int useSequenceProducer) +{ + U32 const windowSize = 1u << windowLog; + /* posInSrc represents the amount of data the decoder would decode up to this point. + * As long as the amount of data decoded is less than or equal to window size, offsets may be + * larger than the total length of output decoded in order to reference the dict, even larger than + * window size. After output surpasses windowSize, we're limited to windowSize offsets again. + */ + size_t const offsetBound = posInSrc > windowSize ? (size_t)windowSize : posInSrc + (size_t)dictSize; + size_t const matchLenLowerBound = (minMatch == 3 || useSequenceProducer) ? 3 : 4; + RETURN_ERROR_IF(offCode > OFFSET_TO_OFFBASE(offsetBound), externalSequences_invalid, "Offset too large!"); + /* Validate maxNbSeq is large enough for the given matchLength and minMatch */ + RETURN_ERROR_IF(matchLength < matchLenLowerBound, externalSequences_invalid, "Matchlength too small for the minMatch"); + return 0; +} + +/* Returns an offset code, given a sequence's raw offset, the ongoing repcode array, and whether litLength == 0 */ +static U32 ZSTD_finalizeOffBase(U32 rawOffset, const U32 rep[ZSTD_REP_NUM], U32 ll0) +{ + U32 offBase = OFFSET_TO_OFFBASE(rawOffset); + + if (!ll0 && rawOffset == rep[0]) { + offBase = REPCODE1_TO_OFFBASE; + } else if (rawOffset == rep[1]) { + offBase = REPCODE_TO_OFFBASE(2 - ll0); + } else if (rawOffset == rep[2]) { + offBase = REPCODE_TO_OFFBASE(3 - ll0); + } else if (ll0 && rawOffset == rep[0] - 1) { + offBase = REPCODE3_TO_OFFBASE; + } + return offBase; +} + +size_t +ZSTD_copySequencesToSeqStoreExplicitBlockDelim(ZSTD_CCtx* cctx, + ZSTD_sequencePosition* seqPos, + const ZSTD_Sequence* const inSeqs, size_t inSeqsSize, + const void* src, size_t blockSize, + ZSTD_paramSwitch_e externalRepSearch) +{ + U32 idx = seqPos->idx; + U32 const startIdx = idx; + BYTE const* ip = (BYTE const*)(src); + const BYTE* const iend = ip + blockSize; + repcodes_t updatedRepcodes; + U32 dictSize; + + DEBUGLOG(5, "ZSTD_copySequencesToSeqStoreExplicitBlockDelim (blockSize = %zu)", blockSize); + + if (cctx->cdict) { + dictSize = (U32)cctx->cdict->dictContentSize; + } else if (cctx->prefixDict.dict) { + dictSize = (U32)cctx->prefixDict.dictSize; + } else { + dictSize = 0; + } + ZSTD_memcpy(updatedRepcodes.rep, cctx->blockState.prevCBlock->rep, sizeof(repcodes_t)); + for (; idx < inSeqsSize && (inSeqs[idx].matchLength != 0 || inSeqs[idx].offset != 0); ++idx) { + U32 const litLength = inSeqs[idx].litLength; + U32 const matchLength = inSeqs[idx].matchLength; + U32 offBase; + + if (externalRepSearch == ZSTD_ps_disable) { + offBase = OFFSET_TO_OFFBASE(inSeqs[idx].offset); + } else { + U32 const ll0 = (litLength == 0); + offBase = ZSTD_finalizeOffBase(inSeqs[idx].offset, updatedRepcodes.rep, ll0); + ZSTD_updateRep(updatedRepcodes.rep, offBase, ll0); + } + + DEBUGLOG(6, "Storing sequence: (of: %u, ml: %u, ll: %u)", offBase, matchLength, litLength); + if (cctx->appliedParams.validateSequences) { + seqPos->posInSrc += litLength + matchLength; + FORWARD_IF_ERROR(ZSTD_validateSequence(offBase, matchLength, cctx->appliedParams.cParams.minMatch, seqPos->posInSrc, + cctx->appliedParams.cParams.windowLog, dictSize, ZSTD_hasExtSeqProd(&cctx->appliedParams)), + "Sequence validation failed"); + } + RETURN_ERROR_IF(idx - seqPos->idx >= cctx->seqStore.maxNbSeq, externalSequences_invalid, + "Not enough memory allocated. Try adjusting ZSTD_c_minMatch."); + ZSTD_storeSeq(&cctx->seqStore, litLength, ip, iend, offBase, matchLength); + ip += matchLength + litLength; + } + + /* If we skipped repcode search while parsing, we need to update repcodes now */ + assert(externalRepSearch != ZSTD_ps_auto); + assert(idx >= startIdx); + if (externalRepSearch == ZSTD_ps_disable && idx != startIdx) { + U32* const rep = updatedRepcodes.rep; + U32 lastSeqIdx = idx - 1; /* index of last non-block-delimiter sequence */ + + if (lastSeqIdx >= startIdx + 2) { + rep[2] = inSeqs[lastSeqIdx - 2].offset; + rep[1] = inSeqs[lastSeqIdx - 1].offset; + rep[0] = inSeqs[lastSeqIdx].offset; + } else if (lastSeqIdx == startIdx + 1) { + rep[2] = rep[0]; + rep[1] = inSeqs[lastSeqIdx - 1].offset; + rep[0] = inSeqs[lastSeqIdx].offset; + } else { + assert(lastSeqIdx == startIdx); + rep[2] = rep[1]; + rep[1] = rep[0]; + rep[0] = inSeqs[lastSeqIdx].offset; + } + } + + ZSTD_memcpy(cctx->blockState.nextCBlock->rep, updatedRepcodes.rep, sizeof(repcodes_t)); + + if (inSeqs[idx].litLength) { + DEBUGLOG(6, "Storing last literals of size: %u", inSeqs[idx].litLength); + ZSTD_storeLastLiterals(&cctx->seqStore, ip, inSeqs[idx].litLength); + ip += inSeqs[idx].litLength; + seqPos->posInSrc += inSeqs[idx].litLength; + } + RETURN_ERROR_IF(ip != iend, externalSequences_invalid, "Blocksize doesn't agree with block delimiter!"); + seqPos->idx = idx+1; + return 0; +} + +size_t +ZSTD_copySequencesToSeqStoreNoBlockDelim(ZSTD_CCtx* cctx, ZSTD_sequencePosition* seqPos, + const ZSTD_Sequence* const inSeqs, size_t inSeqsSize, + const void* src, size_t blockSize, ZSTD_paramSwitch_e externalRepSearch) +{ + U32 idx = seqPos->idx; + U32 startPosInSequence = seqPos->posInSequence; + U32 endPosInSequence = seqPos->posInSequence + (U32)blockSize; + size_t dictSize; + BYTE const* ip = (BYTE const*)(src); + BYTE const* iend = ip + blockSize; /* May be adjusted if we decide to process fewer than blockSize bytes */ + repcodes_t updatedRepcodes; + U32 bytesAdjustment = 0; + U32 finalMatchSplit = 0; + + /* TODO(embg) support fast parsing mode in noBlockDelim mode */ + (void)externalRepSearch; + + if (cctx->cdict) { + dictSize = cctx->cdict->dictContentSize; + } else if (cctx->prefixDict.dict) { + dictSize = cctx->prefixDict.dictSize; + } else { + dictSize = 0; + } + DEBUGLOG(5, "ZSTD_copySequencesToSeqStoreNoBlockDelim: idx: %u PIS: %u blockSize: %zu", idx, startPosInSequence, blockSize); + DEBUGLOG(5, "Start seq: idx: %u (of: %u ml: %u ll: %u)", idx, inSeqs[idx].offset, inSeqs[idx].matchLength, inSeqs[idx].litLength); + ZSTD_memcpy(updatedRepcodes.rep, cctx->blockState.prevCBlock->rep, sizeof(repcodes_t)); + while (endPosInSequence && idx < inSeqsSize && !finalMatchSplit) { + const ZSTD_Sequence currSeq = inSeqs[idx]; + U32 litLength = currSeq.litLength; + U32 matchLength = currSeq.matchLength; + U32 const rawOffset = currSeq.offset; + U32 offBase; + + /* Modify the sequence depending on where endPosInSequence lies */ + if (endPosInSequence >= currSeq.litLength + currSeq.matchLength) { + if (startPosInSequence >= litLength) { + startPosInSequence -= litLength; + litLength = 0; + matchLength -= startPosInSequence; + } else { + litLength -= startPosInSequence; + } + /* Move to the next sequence */ + endPosInSequence -= currSeq.litLength + currSeq.matchLength; + startPosInSequence = 0; + } else { + /* This is the final (partial) sequence we're adding from inSeqs, and endPosInSequence + does not reach the end of the match. So, we have to split the sequence */ + DEBUGLOG(6, "Require a split: diff: %u, idx: %u PIS: %u", + currSeq.litLength + currSeq.matchLength - endPosInSequence, idx, endPosInSequence); + if (endPosInSequence > litLength) { + U32 firstHalfMatchLength; + litLength = startPosInSequence >= litLength ? 0 : litLength - startPosInSequence; + firstHalfMatchLength = endPosInSequence - startPosInSequence - litLength; + if (matchLength > blockSize && firstHalfMatchLength >= cctx->appliedParams.cParams.minMatch) { + /* Only ever split the match if it is larger than the block size */ + U32 secondHalfMatchLength = currSeq.matchLength + currSeq.litLength - endPosInSequence; + if (secondHalfMatchLength < cctx->appliedParams.cParams.minMatch) { + /* Move the endPosInSequence backward so that it creates match of minMatch length */ + endPosInSequence -= cctx->appliedParams.cParams.minMatch - secondHalfMatchLength; + bytesAdjustment = cctx->appliedParams.cParams.minMatch - secondHalfMatchLength; + firstHalfMatchLength -= bytesAdjustment; + } + matchLength = firstHalfMatchLength; + /* Flag that we split the last match - after storing the sequence, exit the loop, + but keep the value of endPosInSequence */ + finalMatchSplit = 1; + } else { + /* Move the position in sequence backwards so that we don't split match, and break to store + * the last literals. We use the original currSeq.litLength as a marker for where endPosInSequence + * should go. We prefer to do this whenever it is not necessary to split the match, or if doing so + * would cause the first half of the match to be too small + */ + bytesAdjustment = endPosInSequence - currSeq.litLength; + endPosInSequence = currSeq.litLength; + break; + } + } else { + /* This sequence ends inside the literals, break to store the last literals */ + break; + } + } + /* Check if this offset can be represented with a repcode */ + { U32 const ll0 = (litLength == 0); + offBase = ZSTD_finalizeOffBase(rawOffset, updatedRepcodes.rep, ll0); + ZSTD_updateRep(updatedRepcodes.rep, offBase, ll0); + } + + if (cctx->appliedParams.validateSequences) { + seqPos->posInSrc += litLength + matchLength; + FORWARD_IF_ERROR(ZSTD_validateSequence(offBase, matchLength, cctx->appliedParams.cParams.minMatch, seqPos->posInSrc, + cctx->appliedParams.cParams.windowLog, dictSize, ZSTD_hasExtSeqProd(&cctx->appliedParams)), + "Sequence validation failed"); + } + DEBUGLOG(6, "Storing sequence: (of: %u, ml: %u, ll: %u)", offBase, matchLength, litLength); + RETURN_ERROR_IF(idx - seqPos->idx >= cctx->seqStore.maxNbSeq, externalSequences_invalid, + "Not enough memory allocated. Try adjusting ZSTD_c_minMatch."); + ZSTD_storeSeq(&cctx->seqStore, litLength, ip, iend, offBase, matchLength); + ip += matchLength + litLength; + if (!finalMatchSplit) + idx++; /* Next Sequence */ + } + DEBUGLOG(5, "Ending seq: idx: %u (of: %u ml: %u ll: %u)", idx, inSeqs[idx].offset, inSeqs[idx].matchLength, inSeqs[idx].litLength); + assert(idx == inSeqsSize || endPosInSequence <= inSeqs[idx].litLength + inSeqs[idx].matchLength); + seqPos->idx = idx; + seqPos->posInSequence = endPosInSequence; + ZSTD_memcpy(cctx->blockState.nextCBlock->rep, updatedRepcodes.rep, sizeof(repcodes_t)); + + iend -= bytesAdjustment; + if (ip != iend) { + /* Store any last literals */ + U32 lastLLSize = (U32)(iend - ip); + assert(ip <= iend); + DEBUGLOG(6, "Storing last literals of size: %u", lastLLSize); + ZSTD_storeLastLiterals(&cctx->seqStore, ip, lastLLSize); + seqPos->posInSrc += lastLLSize; + } + + return bytesAdjustment; +} + +typedef size_t (*ZSTD_sequenceCopier) (ZSTD_CCtx* cctx, ZSTD_sequencePosition* seqPos, + const ZSTD_Sequence* const inSeqs, size_t inSeqsSize, + const void* src, size_t blockSize, ZSTD_paramSwitch_e externalRepSearch); +static ZSTD_sequenceCopier ZSTD_selectSequenceCopier(ZSTD_sequenceFormat_e mode) +{ + ZSTD_sequenceCopier sequenceCopier = NULL; + assert(ZSTD_cParam_withinBounds(ZSTD_c_blockDelimiters, mode)); + if (mode == ZSTD_sf_explicitBlockDelimiters) { + return ZSTD_copySequencesToSeqStoreExplicitBlockDelim; + } else if (mode == ZSTD_sf_noBlockDelimiters) { + return ZSTD_copySequencesToSeqStoreNoBlockDelim; + } + assert(sequenceCopier != NULL); + return sequenceCopier; +} + +/* Discover the size of next block by searching for the delimiter. + * Note that a block delimiter **must** exist in this mode, + * otherwise it's an input error. + * The block size retrieved will be later compared to ensure it remains within bounds */ +static size_t +blockSize_explicitDelimiter(const ZSTD_Sequence* inSeqs, size_t inSeqsSize, ZSTD_sequencePosition seqPos) +{ + int end = 0; + size_t blockSize = 0; + size_t spos = seqPos.idx; + DEBUGLOG(6, "blockSize_explicitDelimiter : seq %zu / %zu", spos, inSeqsSize); + assert(spos <= inSeqsSize); + while (spos < inSeqsSize) { + end = (inSeqs[spos].offset == 0); + blockSize += inSeqs[spos].litLength + inSeqs[spos].matchLength; + if (end) { + if (inSeqs[spos].matchLength != 0) + RETURN_ERROR(externalSequences_invalid, "delimiter format error : both matchlength and offset must be == 0"); + break; + } + spos++; + } + if (!end) + RETURN_ERROR(externalSequences_invalid, "Reached end of sequences without finding a block delimiter"); + return blockSize; +} + +/* More a "target" block size */ +static size_t blockSize_noDelimiter(size_t blockSize, size_t remaining) +{ + int const lastBlock = (remaining <= blockSize); + return lastBlock ? remaining : blockSize; +} + +static size_t determine_blockSize(ZSTD_sequenceFormat_e mode, + size_t blockSize, size_t remaining, + const ZSTD_Sequence* inSeqs, size_t inSeqsSize, ZSTD_sequencePosition seqPos) +{ + DEBUGLOG(6, "determine_blockSize : remainingSize = %zu", remaining); + if (mode == ZSTD_sf_noBlockDelimiters) + return blockSize_noDelimiter(blockSize, remaining); + { size_t const explicitBlockSize = blockSize_explicitDelimiter(inSeqs, inSeqsSize, seqPos); + FORWARD_IF_ERROR(explicitBlockSize, "Error while determining block size with explicit delimiters"); + if (explicitBlockSize > blockSize) + RETURN_ERROR(externalSequences_invalid, "sequences incorrectly define a too large block"); + if (explicitBlockSize > remaining) + RETURN_ERROR(externalSequences_invalid, "sequences define a frame longer than source"); + return explicitBlockSize; + } +} + +/* Compress, block-by-block, all of the sequences given. + * + * Returns the cumulative size of all compressed blocks (including their headers), + * otherwise a ZSTD error. + */ +static size_t +ZSTD_compressSequences_internal(ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const ZSTD_Sequence* inSeqs, size_t inSeqsSize, + const void* src, size_t srcSize) +{ + size_t cSize = 0; + size_t remaining = srcSize; + ZSTD_sequencePosition seqPos = {0, 0, 0}; + + BYTE const* ip = (BYTE const*)src; + BYTE* op = (BYTE*)dst; + ZSTD_sequenceCopier const sequenceCopier = ZSTD_selectSequenceCopier(cctx->appliedParams.blockDelimiters); + + DEBUGLOG(4, "ZSTD_compressSequences_internal srcSize: %zu, inSeqsSize: %zu", srcSize, inSeqsSize); + /* Special case: empty frame */ + if (remaining == 0) { + U32 const cBlockHeader24 = 1 /* last block */ + (((U32)bt_raw)<<1); + RETURN_ERROR_IF(dstCapacity<4, dstSize_tooSmall, "No room for empty frame block header"); + MEM_writeLE32(op, cBlockHeader24); + op += ZSTD_blockHeaderSize; + dstCapacity -= ZSTD_blockHeaderSize; + cSize += ZSTD_blockHeaderSize; + } + + while (remaining) { + size_t compressedSeqsSize; + size_t cBlockSize; + size_t additionalByteAdjustment; + size_t blockSize = determine_blockSize(cctx->appliedParams.blockDelimiters, + cctx->blockSize, remaining, + inSeqs, inSeqsSize, seqPos); + U32 const lastBlock = (blockSize == remaining); + FORWARD_IF_ERROR(blockSize, "Error while trying to determine block size"); + assert(blockSize <= remaining); + ZSTD_resetSeqStore(&cctx->seqStore); + DEBUGLOG(5, "Working on new block. Blocksize: %zu (total:%zu)", blockSize, (ip - (const BYTE*)src) + blockSize); + + additionalByteAdjustment = sequenceCopier(cctx, &seqPos, inSeqs, inSeqsSize, ip, blockSize, cctx->appliedParams.searchForExternalRepcodes); + FORWARD_IF_ERROR(additionalByteAdjustment, "Bad sequence copy"); + blockSize -= additionalByteAdjustment; + + /* If blocks are too small, emit as a nocompress block */ + /* TODO: See 3090. We reduced MIN_CBLOCK_SIZE from 3 to 2 so to compensate we are adding + * additional 1. We need to revisit and change this logic to be more consistent */ + if (blockSize < MIN_CBLOCK_SIZE+ZSTD_blockHeaderSize+1+1) { + cBlockSize = ZSTD_noCompressBlock(op, dstCapacity, ip, blockSize, lastBlock); + FORWARD_IF_ERROR(cBlockSize, "Nocompress block failed"); + DEBUGLOG(5, "Block too small, writing out nocompress block: cSize: %zu", cBlockSize); + cSize += cBlockSize; + ip += blockSize; + op += cBlockSize; + remaining -= blockSize; + dstCapacity -= cBlockSize; + continue; + } + + RETURN_ERROR_IF(dstCapacity < ZSTD_blockHeaderSize, dstSize_tooSmall, "not enough dstCapacity to write a new compressed block"); + compressedSeqsSize = ZSTD_entropyCompressSeqStore(&cctx->seqStore, + &cctx->blockState.prevCBlock->entropy, &cctx->blockState.nextCBlock->entropy, + &cctx->appliedParams, + op + ZSTD_blockHeaderSize /* Leave space for block header */, dstCapacity - ZSTD_blockHeaderSize, + blockSize, + cctx->entropyWorkspace, ENTROPY_WORKSPACE_SIZE /* statically allocated in resetCCtx */, + cctx->bmi2); + FORWARD_IF_ERROR(compressedSeqsSize, "Compressing sequences of block failed"); + DEBUGLOG(5, "Compressed sequences size: %zu", compressedSeqsSize); + + if (!cctx->isFirstBlock && + ZSTD_maybeRLE(&cctx->seqStore) && + ZSTD_isRLE(ip, blockSize)) { + /* We don't want to emit our first block as a RLE even if it qualifies because + * doing so will cause the decoder (cli only) to throw a "should consume all input error." + * This is only an issue for zstd <= v1.4.3 + */ + compressedSeqsSize = 1; + } + + if (compressedSeqsSize == 0) { + /* ZSTD_noCompressBlock writes the block header as well */ + cBlockSize = ZSTD_noCompressBlock(op, dstCapacity, ip, blockSize, lastBlock); + FORWARD_IF_ERROR(cBlockSize, "ZSTD_noCompressBlock failed"); + DEBUGLOG(5, "Writing out nocompress block, size: %zu", cBlockSize); + } else if (compressedSeqsSize == 1) { + cBlockSize = ZSTD_rleCompressBlock(op, dstCapacity, *ip, blockSize, lastBlock); + FORWARD_IF_ERROR(cBlockSize, "ZSTD_rleCompressBlock failed"); + DEBUGLOG(5, "Writing out RLE block, size: %zu", cBlockSize); + } else { + U32 cBlockHeader; + /* Error checking and repcodes update */ + ZSTD_blockState_confirmRepcodesAndEntropyTables(&cctx->blockState); + if (cctx->blockState.prevCBlock->entropy.fse.offcode_repeatMode == FSE_repeat_valid) + cctx->blockState.prevCBlock->entropy.fse.offcode_repeatMode = FSE_repeat_check; + + /* Write block header into beginning of block*/ + cBlockHeader = lastBlock + (((U32)bt_compressed)<<1) + (U32)(compressedSeqsSize << 3); + MEM_writeLE24(op, cBlockHeader); + cBlockSize = ZSTD_blockHeaderSize + compressedSeqsSize; + DEBUGLOG(5, "Writing out compressed block, size: %zu", cBlockSize); + } + + cSize += cBlockSize; + + if (lastBlock) { + break; + } else { + ip += blockSize; + op += cBlockSize; + remaining -= blockSize; + dstCapacity -= cBlockSize; + cctx->isFirstBlock = 0; + } + DEBUGLOG(5, "cSize running total: %zu (remaining dstCapacity=%zu)", cSize, dstCapacity); + } + + DEBUGLOG(4, "cSize final total: %zu", cSize); + return cSize; +} + +size_t ZSTD_compressSequences(ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const ZSTD_Sequence* inSeqs, size_t inSeqsSize, + const void* src, size_t srcSize) +{ + BYTE* op = (BYTE*)dst; + size_t cSize = 0; + size_t compressedBlocksSize = 0; + size_t frameHeaderSize = 0; + + /* Transparent initialization stage, same as compressStream2() */ + DEBUGLOG(4, "ZSTD_compressSequences (dstCapacity=%zu)", dstCapacity); + assert(cctx != NULL); + FORWARD_IF_ERROR(ZSTD_CCtx_init_compressStream2(cctx, ZSTD_e_end, srcSize), "CCtx initialization failed"); + /* Begin writing output, starting with frame header */ + frameHeaderSize = ZSTD_writeFrameHeader(op, dstCapacity, &cctx->appliedParams, srcSize, cctx->dictID); + op += frameHeaderSize; + dstCapacity -= frameHeaderSize; + cSize += frameHeaderSize; + if (cctx->appliedParams.fParams.checksumFlag && srcSize) { + XXH64_update(&cctx->xxhState, src, srcSize); + } + /* cSize includes block header size and compressed sequences size */ + compressedBlocksSize = ZSTD_compressSequences_internal(cctx, + op, dstCapacity, + inSeqs, inSeqsSize, + src, srcSize); + FORWARD_IF_ERROR(compressedBlocksSize, "Compressing blocks failed!"); + cSize += compressedBlocksSize; + dstCapacity -= compressedBlocksSize; + + if (cctx->appliedParams.fParams.checksumFlag) { + U32 const checksum = (U32) XXH64_digest(&cctx->xxhState); + RETURN_ERROR_IF(dstCapacity<4, dstSize_tooSmall, "no room for checksum"); + DEBUGLOG(4, "Write checksum : %08X", (unsigned)checksum); + MEM_writeLE32((char*)dst + cSize, checksum); + cSize += 4; + } + + DEBUGLOG(4, "Final compressed size: %zu", cSize); + return cSize; +} + +/*====== Finalize ======*/ + +static ZSTD_inBuffer inBuffer_forEndFlush(const ZSTD_CStream* zcs) +{ + const ZSTD_inBuffer nullInput = { NULL, 0, 0 }; + const int stableInput = (zcs->appliedParams.inBufferMode == ZSTD_bm_stable); + return stableInput ? zcs->expectedInBuffer : nullInput; +} + +/*! ZSTD_flushStream() : + * @return : amount of data remaining to flush */ +size_t ZSTD_flushStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output) +{ + ZSTD_inBuffer input = inBuffer_forEndFlush(zcs); + input.size = input.pos; /* do not ingest more input during flush */ + return ZSTD_compressStream2(zcs, output, &input, ZSTD_e_flush); +} + + +size_t ZSTD_endStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output) +{ + ZSTD_inBuffer input = inBuffer_forEndFlush(zcs); + size_t const remainingToFlush = ZSTD_compressStream2(zcs, output, &input, ZSTD_e_end); + FORWARD_IF_ERROR(remainingToFlush , "ZSTD_compressStream2(,,ZSTD_e_end) failed"); + if (zcs->appliedParams.nbWorkers > 0) return remainingToFlush; /* minimal estimation */ + /* single thread mode : attempt to calculate remaining to flush more precisely */ + { size_t const lastBlockSize = zcs->frameEnded ? 0 : ZSTD_BLOCKHEADERSIZE; + size_t const checksumSize = (size_t)(zcs->frameEnded ? 0 : zcs->appliedParams.fParams.checksumFlag * 4); + size_t const toFlush = remainingToFlush + lastBlockSize + checksumSize; + DEBUGLOG(4, "ZSTD_endStream : remaining to flush : %u", (unsigned)toFlush); + return toFlush; + } +} + + +/*-===== Pre-defined compression levels =====-*/ +/**** start inlining clevels.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +#ifndef ZSTD_CLEVELS_H +#define ZSTD_CLEVELS_H + +#define ZSTD_STATIC_LINKING_ONLY /* ZSTD_compressionParameters */ +/**** skipping file: ../zstd.h ****/ + +/*-===== Pre-defined compression levels =====-*/ + +#define ZSTD_MAX_CLEVEL 22 + +#ifdef __GNUC__ +__attribute__((__unused__)) +#endif + +static const ZSTD_compressionParameters ZSTD_defaultCParameters[4][ZSTD_MAX_CLEVEL+1] = { +{ /* "default" - for any srcSize > 256 KB */ + /* W, C, H, S, L, TL, strat */ + { 19, 12, 13, 1, 6, 1, ZSTD_fast }, /* base for negative levels */ + { 19, 13, 14, 1, 7, 0, ZSTD_fast }, /* level 1 */ + { 20, 15, 16, 1, 6, 0, ZSTD_fast }, /* level 2 */ + { 21, 16, 17, 1, 5, 0, ZSTD_dfast }, /* level 3 */ + { 21, 18, 18, 1, 5, 0, ZSTD_dfast }, /* level 4 */ + { 21, 18, 19, 3, 5, 2, ZSTD_greedy }, /* level 5 */ + { 21, 18, 19, 3, 5, 4, ZSTD_lazy }, /* level 6 */ + { 21, 19, 20, 4, 5, 8, ZSTD_lazy }, /* level 7 */ + { 21, 19, 20, 4, 5, 16, ZSTD_lazy2 }, /* level 8 */ + { 22, 20, 21, 4, 5, 16, ZSTD_lazy2 }, /* level 9 */ + { 22, 21, 22, 5, 5, 16, ZSTD_lazy2 }, /* level 10 */ + { 22, 21, 22, 6, 5, 16, ZSTD_lazy2 }, /* level 11 */ + { 22, 22, 23, 6, 5, 32, ZSTD_lazy2 }, /* level 12 */ + { 22, 22, 22, 4, 5, 32, ZSTD_btlazy2 }, /* level 13 */ + { 22, 22, 23, 5, 5, 32, ZSTD_btlazy2 }, /* level 14 */ + { 22, 23, 23, 6, 5, 32, ZSTD_btlazy2 }, /* level 15 */ + { 22, 22, 22, 5, 5, 48, ZSTD_btopt }, /* level 16 */ + { 23, 23, 22, 5, 4, 64, ZSTD_btopt }, /* level 17 */ + { 23, 23, 22, 6, 3, 64, ZSTD_btultra }, /* level 18 */ + { 23, 24, 22, 7, 3,256, ZSTD_btultra2}, /* level 19 */ + { 25, 25, 23, 7, 3,256, ZSTD_btultra2}, /* level 20 */ + { 26, 26, 24, 7, 3,512, ZSTD_btultra2}, /* level 21 */ + { 27, 27, 25, 9, 3,999, ZSTD_btultra2}, /* level 22 */ +}, +{ /* for srcSize <= 256 KB */ + /* W, C, H, S, L, T, strat */ + { 18, 12, 13, 1, 5, 1, ZSTD_fast }, /* base for negative levels */ + { 18, 13, 14, 1, 6, 0, ZSTD_fast }, /* level 1 */ + { 18, 14, 14, 1, 5, 0, ZSTD_dfast }, /* level 2 */ + { 18, 16, 16, 1, 4, 0, ZSTD_dfast }, /* level 3 */ + { 18, 16, 17, 3, 5, 2, ZSTD_greedy }, /* level 4.*/ + { 18, 17, 18, 5, 5, 2, ZSTD_greedy }, /* level 5.*/ + { 18, 18, 19, 3, 5, 4, ZSTD_lazy }, /* level 6.*/ + { 18, 18, 19, 4, 4, 4, ZSTD_lazy }, /* level 7 */ + { 18, 18, 19, 4, 4, 8, ZSTD_lazy2 }, /* level 8 */ + { 18, 18, 19, 5, 4, 8, ZSTD_lazy2 }, /* level 9 */ + { 18, 18, 19, 6, 4, 8, ZSTD_lazy2 }, /* level 10 */ + { 18, 18, 19, 5, 4, 12, ZSTD_btlazy2 }, /* level 11.*/ + { 18, 19, 19, 7, 4, 12, ZSTD_btlazy2 }, /* level 12.*/ + { 18, 18, 19, 4, 4, 16, ZSTD_btopt }, /* level 13 */ + { 18, 18, 19, 4, 3, 32, ZSTD_btopt }, /* level 14.*/ + { 18, 18, 19, 6, 3,128, ZSTD_btopt }, /* level 15.*/ + { 18, 19, 19, 6, 3,128, ZSTD_btultra }, /* level 16.*/ + { 18, 19, 19, 8, 3,256, ZSTD_btultra }, /* level 17.*/ + { 18, 19, 19, 6, 3,128, ZSTD_btultra2}, /* level 18.*/ + { 18, 19, 19, 8, 3,256, ZSTD_btultra2}, /* level 19.*/ + { 18, 19, 19, 10, 3,512, ZSTD_btultra2}, /* level 20.*/ + { 18, 19, 19, 12, 3,512, ZSTD_btultra2}, /* level 21.*/ + { 18, 19, 19, 13, 3,999, ZSTD_btultra2}, /* level 22.*/ +}, +{ /* for srcSize <= 128 KB */ + /* W, C, H, S, L, T, strat */ + { 17, 12, 12, 1, 5, 1, ZSTD_fast }, /* base for negative levels */ + { 17, 12, 13, 1, 6, 0, ZSTD_fast }, /* level 1 */ + { 17, 13, 15, 1, 5, 0, ZSTD_fast }, /* level 2 */ + { 17, 15, 16, 2, 5, 0, ZSTD_dfast }, /* level 3 */ + { 17, 17, 17, 2, 4, 0, ZSTD_dfast }, /* level 4 */ + { 17, 16, 17, 3, 4, 2, ZSTD_greedy }, /* level 5 */ + { 17, 16, 17, 3, 4, 4, ZSTD_lazy }, /* level 6 */ + { 17, 16, 17, 3, 4, 8, ZSTD_lazy2 }, /* level 7 */ + { 17, 16, 17, 4, 4, 8, ZSTD_lazy2 }, /* level 8 */ + { 17, 16, 17, 5, 4, 8, ZSTD_lazy2 }, /* level 9 */ + { 17, 16, 17, 6, 4, 8, ZSTD_lazy2 }, /* level 10 */ + { 17, 17, 17, 5, 4, 8, ZSTD_btlazy2 }, /* level 11 */ + { 17, 18, 17, 7, 4, 12, ZSTD_btlazy2 }, /* level 12 */ + { 17, 18, 17, 3, 4, 12, ZSTD_btopt }, /* level 13.*/ + { 17, 18, 17, 4, 3, 32, ZSTD_btopt }, /* level 14.*/ + { 17, 18, 17, 6, 3,256, ZSTD_btopt }, /* level 15.*/ + { 17, 18, 17, 6, 3,128, ZSTD_btultra }, /* level 16.*/ + { 17, 18, 17, 8, 3,256, ZSTD_btultra }, /* level 17.*/ + { 17, 18, 17, 10, 3,512, ZSTD_btultra }, /* level 18.*/ + { 17, 18, 17, 5, 3,256, ZSTD_btultra2}, /* level 19.*/ + { 17, 18, 17, 7, 3,512, ZSTD_btultra2}, /* level 20.*/ + { 17, 18, 17, 9, 3,512, ZSTD_btultra2}, /* level 21.*/ + { 17, 18, 17, 11, 3,999, ZSTD_btultra2}, /* level 22.*/ +}, +{ /* for srcSize <= 16 KB */ + /* W, C, H, S, L, T, strat */ + { 14, 12, 13, 1, 5, 1, ZSTD_fast }, /* base for negative levels */ + { 14, 14, 15, 1, 5, 0, ZSTD_fast }, /* level 1 */ + { 14, 14, 15, 1, 4, 0, ZSTD_fast }, /* level 2 */ + { 14, 14, 15, 2, 4, 0, ZSTD_dfast }, /* level 3 */ + { 14, 14, 14, 4, 4, 2, ZSTD_greedy }, /* level 4 */ + { 14, 14, 14, 3, 4, 4, ZSTD_lazy }, /* level 5.*/ + { 14, 14, 14, 4, 4, 8, ZSTD_lazy2 }, /* level 6 */ + { 14, 14, 14, 6, 4, 8, ZSTD_lazy2 }, /* level 7 */ + { 14, 14, 14, 8, 4, 8, ZSTD_lazy2 }, /* level 8.*/ + { 14, 15, 14, 5, 4, 8, ZSTD_btlazy2 }, /* level 9.*/ + { 14, 15, 14, 9, 4, 8, ZSTD_btlazy2 }, /* level 10.*/ + { 14, 15, 14, 3, 4, 12, ZSTD_btopt }, /* level 11.*/ + { 14, 15, 14, 4, 3, 24, ZSTD_btopt }, /* level 12.*/ + { 14, 15, 14, 5, 3, 32, ZSTD_btultra }, /* level 13.*/ + { 14, 15, 15, 6, 3, 64, ZSTD_btultra }, /* level 14.*/ + { 14, 15, 15, 7, 3,256, ZSTD_btultra }, /* level 15.*/ + { 14, 15, 15, 5, 3, 48, ZSTD_btultra2}, /* level 16.*/ + { 14, 15, 15, 6, 3,128, ZSTD_btultra2}, /* level 17.*/ + { 14, 15, 15, 7, 3,256, ZSTD_btultra2}, /* level 18.*/ + { 14, 15, 15, 8, 3,256, ZSTD_btultra2}, /* level 19.*/ + { 14, 15, 15, 8, 3,512, ZSTD_btultra2}, /* level 20.*/ + { 14, 15, 15, 9, 3,512, ZSTD_btultra2}, /* level 21.*/ + { 14, 15, 15, 10, 3,999, ZSTD_btultra2}, /* level 22.*/ +}, +}; + + + +#endif /* ZSTD_CLEVELS_H */ +/**** ended inlining clevels.h ****/ + +int ZSTD_maxCLevel(void) { return ZSTD_MAX_CLEVEL; } +int ZSTD_minCLevel(void) { return (int)-ZSTD_TARGETLENGTH_MAX; } +int ZSTD_defaultCLevel(void) { return ZSTD_CLEVEL_DEFAULT; } + +static ZSTD_compressionParameters ZSTD_dedicatedDictSearch_getCParams(int const compressionLevel, size_t const dictSize) +{ + ZSTD_compressionParameters cParams = ZSTD_getCParams_internal(compressionLevel, 0, dictSize, ZSTD_cpm_createCDict); + switch (cParams.strategy) { + case ZSTD_fast: + case ZSTD_dfast: + break; + case ZSTD_greedy: + case ZSTD_lazy: + case ZSTD_lazy2: + cParams.hashLog += ZSTD_LAZY_DDSS_BUCKET_LOG; + break; + case ZSTD_btlazy2: + case ZSTD_btopt: + case ZSTD_btultra: + case ZSTD_btultra2: + break; + } + return cParams; +} + +static int ZSTD_dedicatedDictSearch_isSupported( + ZSTD_compressionParameters const* cParams) +{ + return (cParams->strategy >= ZSTD_greedy) + && (cParams->strategy <= ZSTD_lazy2) + && (cParams->hashLog > cParams->chainLog) + && (cParams->chainLog <= 24); +} + +/** + * Reverses the adjustment applied to cparams when enabling dedicated dict + * search. This is used to recover the params set to be used in the working + * context. (Otherwise, those tables would also grow.) + */ +static void ZSTD_dedicatedDictSearch_revertCParams( + ZSTD_compressionParameters* cParams) { + switch (cParams->strategy) { + case ZSTD_fast: + case ZSTD_dfast: + break; + case ZSTD_greedy: + case ZSTD_lazy: + case ZSTD_lazy2: + cParams->hashLog -= ZSTD_LAZY_DDSS_BUCKET_LOG; + if (cParams->hashLog < ZSTD_HASHLOG_MIN) { + cParams->hashLog = ZSTD_HASHLOG_MIN; + } + break; + case ZSTD_btlazy2: + case ZSTD_btopt: + case ZSTD_btultra: + case ZSTD_btultra2: + break; + } +} + +static U64 ZSTD_getCParamRowSize(U64 srcSizeHint, size_t dictSize, ZSTD_cParamMode_e mode) +{ + switch (mode) { + case ZSTD_cpm_unknown: + case ZSTD_cpm_noAttachDict: + case ZSTD_cpm_createCDict: + break; + case ZSTD_cpm_attachDict: + dictSize = 0; + break; + default: + assert(0); + break; + } + { int const unknown = srcSizeHint == ZSTD_CONTENTSIZE_UNKNOWN; + size_t const addedSize = unknown && dictSize > 0 ? 500 : 0; + return unknown && dictSize == 0 ? ZSTD_CONTENTSIZE_UNKNOWN : srcSizeHint+dictSize+addedSize; + } +} + +/*! ZSTD_getCParams_internal() : + * @return ZSTD_compressionParameters structure for a selected compression level, srcSize and dictSize. + * Note: srcSizeHint 0 means 0, use ZSTD_CONTENTSIZE_UNKNOWN for unknown. + * Use dictSize == 0 for unknown or unused. + * Note: `mode` controls how we treat the `dictSize`. See docs for `ZSTD_cParamMode_e`. */ +static ZSTD_compressionParameters ZSTD_getCParams_internal(int compressionLevel, unsigned long long srcSizeHint, size_t dictSize, ZSTD_cParamMode_e mode) +{ + U64 const rSize = ZSTD_getCParamRowSize(srcSizeHint, dictSize, mode); + U32 const tableID = (rSize <= 256 KB) + (rSize <= 128 KB) + (rSize <= 16 KB); + int row; + DEBUGLOG(5, "ZSTD_getCParams_internal (cLevel=%i)", compressionLevel); + + /* row */ + if (compressionLevel == 0) row = ZSTD_CLEVEL_DEFAULT; /* 0 == default */ + else if (compressionLevel < 0) row = 0; /* entry 0 is baseline for fast mode */ + else if (compressionLevel > ZSTD_MAX_CLEVEL) row = ZSTD_MAX_CLEVEL; + else row = compressionLevel; + + { ZSTD_compressionParameters cp = ZSTD_defaultCParameters[tableID][row]; + DEBUGLOG(5, "ZSTD_getCParams_internal selected tableID: %u row: %u strat: %u", tableID, row, (U32)cp.strategy); + /* acceleration factor */ + if (compressionLevel < 0) { + int const clampedCompressionLevel = MAX(ZSTD_minCLevel(), compressionLevel); + cp.targetLength = (unsigned)(-clampedCompressionLevel); + } + /* refine parameters based on srcSize & dictSize */ + return ZSTD_adjustCParams_internal(cp, srcSizeHint, dictSize, mode, ZSTD_ps_auto); + } +} + +/*! ZSTD_getCParams() : + * @return ZSTD_compressionParameters structure for a selected compression level, srcSize and dictSize. + * Size values are optional, provide 0 if not known or unused */ +ZSTD_compressionParameters ZSTD_getCParams(int compressionLevel, unsigned long long srcSizeHint, size_t dictSize) +{ + if (srcSizeHint == 0) srcSizeHint = ZSTD_CONTENTSIZE_UNKNOWN; + return ZSTD_getCParams_internal(compressionLevel, srcSizeHint, dictSize, ZSTD_cpm_unknown); +} + +/*! ZSTD_getParams() : + * same idea as ZSTD_getCParams() + * @return a `ZSTD_parameters` structure (instead of `ZSTD_compressionParameters`). + * Fields of `ZSTD_frameParameters` are set to default values */ +static ZSTD_parameters ZSTD_getParams_internal(int compressionLevel, unsigned long long srcSizeHint, size_t dictSize, ZSTD_cParamMode_e mode) { + ZSTD_parameters params; + ZSTD_compressionParameters const cParams = ZSTD_getCParams_internal(compressionLevel, srcSizeHint, dictSize, mode); + DEBUGLOG(5, "ZSTD_getParams (cLevel=%i)", compressionLevel); + ZSTD_memset(¶ms, 0, sizeof(params)); + params.cParams = cParams; + params.fParams.contentSizeFlag = 1; + return params; +} + +/*! ZSTD_getParams() : + * same idea as ZSTD_getCParams() + * @return a `ZSTD_parameters` structure (instead of `ZSTD_compressionParameters`). + * Fields of `ZSTD_frameParameters` are set to default values */ +ZSTD_parameters ZSTD_getParams(int compressionLevel, unsigned long long srcSizeHint, size_t dictSize) { + if (srcSizeHint == 0) srcSizeHint = ZSTD_CONTENTSIZE_UNKNOWN; + return ZSTD_getParams_internal(compressionLevel, srcSizeHint, dictSize, ZSTD_cpm_unknown); +} + +void ZSTD_registerSequenceProducer( + ZSTD_CCtx* zc, + void* extSeqProdState, + ZSTD_sequenceProducer_F extSeqProdFunc +) { + assert(zc != NULL); + ZSTD_CCtxParams_registerSequenceProducer( + &zc->requestedParams, extSeqProdState, extSeqProdFunc + ); +} + +void ZSTD_CCtxParams_registerSequenceProducer( + ZSTD_CCtx_params* params, + void* extSeqProdState, + ZSTD_sequenceProducer_F extSeqProdFunc +) { + assert(params != NULL); + if (extSeqProdFunc != NULL) { + params->extSeqProdFunc = extSeqProdFunc; + params->extSeqProdState = extSeqProdState; + } else { + params->extSeqProdFunc = NULL; + params->extSeqProdState = NULL; + } +} +/**** ended inlining compress/zstd_compress.c ****/ +/**** start inlining compress/zstd_double_fast.c ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +/**** skipping file: zstd_compress_internal.h ****/ +/**** skipping file: zstd_double_fast.h ****/ + +#ifndef ZSTD_EXCLUDE_DFAST_BLOCK_COMPRESSOR + +static +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +void ZSTD_fillDoubleHashTableForCDict(ZSTD_matchState_t* ms, + void const* end, ZSTD_dictTableLoadMethod_e dtlm) +{ + const ZSTD_compressionParameters* const cParams = &ms->cParams; + U32* const hashLarge = ms->hashTable; + U32 const hBitsL = cParams->hashLog + ZSTD_SHORT_CACHE_TAG_BITS; + U32 const mls = cParams->minMatch; + U32* const hashSmall = ms->chainTable; + U32 const hBitsS = cParams->chainLog + ZSTD_SHORT_CACHE_TAG_BITS; + const BYTE* const base = ms->window.base; + const BYTE* ip = base + ms->nextToUpdate; + const BYTE* const iend = ((const BYTE*)end) - HASH_READ_SIZE; + const U32 fastHashFillStep = 3; + + /* Always insert every fastHashFillStep position into the hash tables. + * Insert the other positions into the large hash table if their entry + * is empty. + */ + for (; ip + fastHashFillStep - 1 <= iend; ip += fastHashFillStep) { + U32 const curr = (U32)(ip - base); + U32 i; + for (i = 0; i < fastHashFillStep; ++i) { + size_t const smHashAndTag = ZSTD_hashPtr(ip + i, hBitsS, mls); + size_t const lgHashAndTag = ZSTD_hashPtr(ip + i, hBitsL, 8); + if (i == 0) { + ZSTD_writeTaggedIndex(hashSmall, smHashAndTag, curr + i); + } + if (i == 0 || hashLarge[lgHashAndTag >> ZSTD_SHORT_CACHE_TAG_BITS] == 0) { + ZSTD_writeTaggedIndex(hashLarge, lgHashAndTag, curr + i); + } + /* Only load extra positions for ZSTD_dtlm_full */ + if (dtlm == ZSTD_dtlm_fast) + break; + } } +} + +static +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +void ZSTD_fillDoubleHashTableForCCtx(ZSTD_matchState_t* ms, + void const* end, ZSTD_dictTableLoadMethod_e dtlm) +{ + const ZSTD_compressionParameters* const cParams = &ms->cParams; + U32* const hashLarge = ms->hashTable; + U32 const hBitsL = cParams->hashLog; + U32 const mls = cParams->minMatch; + U32* const hashSmall = ms->chainTable; + U32 const hBitsS = cParams->chainLog; + const BYTE* const base = ms->window.base; + const BYTE* ip = base + ms->nextToUpdate; + const BYTE* const iend = ((const BYTE*)end) - HASH_READ_SIZE; + const U32 fastHashFillStep = 3; + + /* Always insert every fastHashFillStep position into the hash tables. + * Insert the other positions into the large hash table if their entry + * is empty. + */ + for (; ip + fastHashFillStep - 1 <= iend; ip += fastHashFillStep) { + U32 const curr = (U32)(ip - base); + U32 i; + for (i = 0; i < fastHashFillStep; ++i) { + size_t const smHash = ZSTD_hashPtr(ip + i, hBitsS, mls); + size_t const lgHash = ZSTD_hashPtr(ip + i, hBitsL, 8); + if (i == 0) + hashSmall[smHash] = curr + i; + if (i == 0 || hashLarge[lgHash] == 0) + hashLarge[lgHash] = curr + i; + /* Only load extra positions for ZSTD_dtlm_full */ + if (dtlm == ZSTD_dtlm_fast) + break; + } } +} + +void ZSTD_fillDoubleHashTable(ZSTD_matchState_t* ms, + const void* const end, + ZSTD_dictTableLoadMethod_e dtlm, + ZSTD_tableFillPurpose_e tfp) +{ + if (tfp == ZSTD_tfp_forCDict) { + ZSTD_fillDoubleHashTableForCDict(ms, end, dtlm); + } else { + ZSTD_fillDoubleHashTableForCCtx(ms, end, dtlm); + } +} + + +FORCE_INLINE_TEMPLATE +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +size_t ZSTD_compressBlock_doubleFast_noDict_generic( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize, U32 const mls /* template */) +{ + ZSTD_compressionParameters const* cParams = &ms->cParams; + U32* const hashLong = ms->hashTable; + const U32 hBitsL = cParams->hashLog; + U32* const hashSmall = ms->chainTable; + const U32 hBitsS = cParams->chainLog; + const BYTE* const base = ms->window.base; + const BYTE* const istart = (const BYTE*)src; + const BYTE* anchor = istart; + const U32 endIndex = (U32)((size_t)(istart - base) + srcSize); + /* presumes that, if there is a dictionary, it must be using Attach mode */ + const U32 prefixLowestIndex = ZSTD_getLowestPrefixIndex(ms, endIndex, cParams->windowLog); + const BYTE* const prefixLowest = base + prefixLowestIndex; + const BYTE* const iend = istart + srcSize; + const BYTE* const ilimit = iend - HASH_READ_SIZE; + U32 offset_1=rep[0], offset_2=rep[1]; + U32 offsetSaved1 = 0, offsetSaved2 = 0; + + size_t mLength; + U32 offset; + U32 curr; + + /* how many positions to search before increasing step size */ + const size_t kStepIncr = 1 << kSearchStrength; + /* the position at which to increment the step size if no match is found */ + const BYTE* nextStep; + size_t step; /* the current step size */ + + size_t hl0; /* the long hash at ip */ + size_t hl1; /* the long hash at ip1 */ + + U32 idxl0; /* the long match index for ip */ + U32 idxl1; /* the long match index for ip1 */ + + const BYTE* matchl0; /* the long match for ip */ + const BYTE* matchs0; /* the short match for ip */ + const BYTE* matchl1; /* the long match for ip1 */ + + const BYTE* ip = istart; /* the current position */ + const BYTE* ip1; /* the next position */ + + DEBUGLOG(5, "ZSTD_compressBlock_doubleFast_noDict_generic"); + + /* init */ + ip += ((ip - prefixLowest) == 0); + { + U32 const current = (U32)(ip - base); + U32 const windowLow = ZSTD_getLowestPrefixIndex(ms, current, cParams->windowLog); + U32 const maxRep = current - windowLow; + if (offset_2 > maxRep) offsetSaved2 = offset_2, offset_2 = 0; + if (offset_1 > maxRep) offsetSaved1 = offset_1, offset_1 = 0; + } + + /* Outer Loop: one iteration per match found and stored */ + while (1) { + step = 1; + nextStep = ip + kStepIncr; + ip1 = ip + step; + + if (ip1 > ilimit) { + goto _cleanup; + } + + hl0 = ZSTD_hashPtr(ip, hBitsL, 8); + idxl0 = hashLong[hl0]; + matchl0 = base + idxl0; + + /* Inner Loop: one iteration per search / position */ + do { + const size_t hs0 = ZSTD_hashPtr(ip, hBitsS, mls); + const U32 idxs0 = hashSmall[hs0]; + curr = (U32)(ip-base); + matchs0 = base + idxs0; + + hashLong[hl0] = hashSmall[hs0] = curr; /* update hash tables */ + + /* check noDict repcode */ + if ((offset_1 > 0) & (MEM_read32(ip+1-offset_1) == MEM_read32(ip+1))) { + mLength = ZSTD_count(ip+1+4, ip+1+4-offset_1, iend) + 4; + ip++; + ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, REPCODE1_TO_OFFBASE, mLength); + goto _match_stored; + } + + hl1 = ZSTD_hashPtr(ip1, hBitsL, 8); + + if (idxl0 > prefixLowestIndex) { + /* check prefix long match */ + if (MEM_read64(matchl0) == MEM_read64(ip)) { + mLength = ZSTD_count(ip+8, matchl0+8, iend) + 8; + offset = (U32)(ip-matchl0); + while (((ip>anchor) & (matchl0>prefixLowest)) && (ip[-1] == matchl0[-1])) { ip--; matchl0--; mLength++; } /* catch up */ + goto _match_found; + } + } + + idxl1 = hashLong[hl1]; + matchl1 = base + idxl1; + + if (idxs0 > prefixLowestIndex) { + /* check prefix short match */ + if (MEM_read32(matchs0) == MEM_read32(ip)) { + goto _search_next_long; + } + } + + if (ip1 >= nextStep) { + PREFETCH_L1(ip1 + 64); + PREFETCH_L1(ip1 + 128); + step++; + nextStep += kStepIncr; + } + ip = ip1; + ip1 += step; + + hl0 = hl1; + idxl0 = idxl1; + matchl0 = matchl1; + #if defined(__aarch64__) + PREFETCH_L1(ip+256); + #endif + } while (ip1 <= ilimit); + +_cleanup: + /* If offset_1 started invalid (offsetSaved1 != 0) and became valid (offset_1 != 0), + * rotate saved offsets. See comment in ZSTD_compressBlock_fast_noDict for more context. */ + offsetSaved2 = ((offsetSaved1 != 0) && (offset_1 != 0)) ? offsetSaved1 : offsetSaved2; + + /* save reps for next block */ + rep[0] = offset_1 ? offset_1 : offsetSaved1; + rep[1] = offset_2 ? offset_2 : offsetSaved2; + + /* Return the last literals size */ + return (size_t)(iend - anchor); + +_search_next_long: + + /* check prefix long +1 match */ + if (idxl1 > prefixLowestIndex) { + if (MEM_read64(matchl1) == MEM_read64(ip1)) { + ip = ip1; + mLength = ZSTD_count(ip+8, matchl1+8, iend) + 8; + offset = (U32)(ip-matchl1); + while (((ip>anchor) & (matchl1>prefixLowest)) && (ip[-1] == matchl1[-1])) { ip--; matchl1--; mLength++; } /* catch up */ + goto _match_found; + } + } + + /* if no long +1 match, explore the short match we found */ + mLength = ZSTD_count(ip+4, matchs0+4, iend) + 4; + offset = (U32)(ip - matchs0); + while (((ip>anchor) & (matchs0>prefixLowest)) && (ip[-1] == matchs0[-1])) { ip--; matchs0--; mLength++; } /* catch up */ + + /* fall-through */ + +_match_found: /* requires ip, offset, mLength */ + offset_2 = offset_1; + offset_1 = offset; + + if (step < 4) { + /* It is unsafe to write this value back to the hashtable when ip1 is + * greater than or equal to the new ip we will have after we're done + * processing this match. Rather than perform that test directly + * (ip1 >= ip + mLength), which costs speed in practice, we do a simpler + * more predictable test. The minmatch even if we take a short match is + * 4 bytes, so as long as step, the distance between ip and ip1 + * (initially) is less than 4, we know ip1 < new ip. */ + hashLong[hl1] = (U32)(ip1 - base); + } + + ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, OFFSET_TO_OFFBASE(offset), mLength); + +_match_stored: + /* match found */ + ip += mLength; + anchor = ip; + + if (ip <= ilimit) { + /* Complementary insertion */ + /* done after iLimit test, as candidates could be > iend-8 */ + { U32 const indexToInsert = curr+2; + hashLong[ZSTD_hashPtr(base+indexToInsert, hBitsL, 8)] = indexToInsert; + hashLong[ZSTD_hashPtr(ip-2, hBitsL, 8)] = (U32)(ip-2-base); + hashSmall[ZSTD_hashPtr(base+indexToInsert, hBitsS, mls)] = indexToInsert; + hashSmall[ZSTD_hashPtr(ip-1, hBitsS, mls)] = (U32)(ip-1-base); + } + + /* check immediate repcode */ + while ( (ip <= ilimit) + && ( (offset_2>0) + & (MEM_read32(ip) == MEM_read32(ip - offset_2)) )) { + /* store sequence */ + size_t const rLength = ZSTD_count(ip+4, ip+4-offset_2, iend) + 4; + U32 const tmpOff = offset_2; offset_2 = offset_1; offset_1 = tmpOff; /* swap offset_2 <=> offset_1 */ + hashSmall[ZSTD_hashPtr(ip, hBitsS, mls)] = (U32)(ip-base); + hashLong[ZSTD_hashPtr(ip, hBitsL, 8)] = (U32)(ip-base); + ZSTD_storeSeq(seqStore, 0, anchor, iend, REPCODE1_TO_OFFBASE, rLength); + ip += rLength; + anchor = ip; + continue; /* faster when present ... (?) */ + } + } + } +} + + +FORCE_INLINE_TEMPLATE +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +size_t ZSTD_compressBlock_doubleFast_dictMatchState_generic( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize, + U32 const mls /* template */) +{ + ZSTD_compressionParameters const* cParams = &ms->cParams; + U32* const hashLong = ms->hashTable; + const U32 hBitsL = cParams->hashLog; + U32* const hashSmall = ms->chainTable; + const U32 hBitsS = cParams->chainLog; + const BYTE* const base = ms->window.base; + const BYTE* const istart = (const BYTE*)src; + const BYTE* ip = istart; + const BYTE* anchor = istart; + const U32 endIndex = (U32)((size_t)(istart - base) + srcSize); + /* presumes that, if there is a dictionary, it must be using Attach mode */ + const U32 prefixLowestIndex = ZSTD_getLowestPrefixIndex(ms, endIndex, cParams->windowLog); + const BYTE* const prefixLowest = base + prefixLowestIndex; + const BYTE* const iend = istart + srcSize; + const BYTE* const ilimit = iend - HASH_READ_SIZE; + U32 offset_1=rep[0], offset_2=rep[1]; + + const ZSTD_matchState_t* const dms = ms->dictMatchState; + const ZSTD_compressionParameters* const dictCParams = &dms->cParams; + const U32* const dictHashLong = dms->hashTable; + const U32* const dictHashSmall = dms->chainTable; + const U32 dictStartIndex = dms->window.dictLimit; + const BYTE* const dictBase = dms->window.base; + const BYTE* const dictStart = dictBase + dictStartIndex; + const BYTE* const dictEnd = dms->window.nextSrc; + const U32 dictIndexDelta = prefixLowestIndex - (U32)(dictEnd - dictBase); + const U32 dictHBitsL = dictCParams->hashLog + ZSTD_SHORT_CACHE_TAG_BITS; + const U32 dictHBitsS = dictCParams->chainLog + ZSTD_SHORT_CACHE_TAG_BITS; + const U32 dictAndPrefixLength = (U32)((ip - prefixLowest) + (dictEnd - dictStart)); + + DEBUGLOG(5, "ZSTD_compressBlock_doubleFast_dictMatchState_generic"); + + /* if a dictionary is attached, it must be within window range */ + assert(ms->window.dictLimit + (1U << cParams->windowLog) >= endIndex); + + if (ms->prefetchCDictTables) { + size_t const hashTableBytes = (((size_t)1) << dictCParams->hashLog) * sizeof(U32); + size_t const chainTableBytes = (((size_t)1) << dictCParams->chainLog) * sizeof(U32); + PREFETCH_AREA(dictHashLong, hashTableBytes); + PREFETCH_AREA(dictHashSmall, chainTableBytes); + } + + /* init */ + ip += (dictAndPrefixLength == 0); + + /* dictMatchState repCode checks don't currently handle repCode == 0 + * disabling. */ + assert(offset_1 <= dictAndPrefixLength); + assert(offset_2 <= dictAndPrefixLength); + + /* Main Search Loop */ + while (ip < ilimit) { /* < instead of <=, because repcode check at (ip+1) */ + size_t mLength; + U32 offset; + size_t const h2 = ZSTD_hashPtr(ip, hBitsL, 8); + size_t const h = ZSTD_hashPtr(ip, hBitsS, mls); + size_t const dictHashAndTagL = ZSTD_hashPtr(ip, dictHBitsL, 8); + size_t const dictHashAndTagS = ZSTD_hashPtr(ip, dictHBitsS, mls); + U32 const dictMatchIndexAndTagL = dictHashLong[dictHashAndTagL >> ZSTD_SHORT_CACHE_TAG_BITS]; + U32 const dictMatchIndexAndTagS = dictHashSmall[dictHashAndTagS >> ZSTD_SHORT_CACHE_TAG_BITS]; + int const dictTagsMatchL = ZSTD_comparePackedTags(dictMatchIndexAndTagL, dictHashAndTagL); + int const dictTagsMatchS = ZSTD_comparePackedTags(dictMatchIndexAndTagS, dictHashAndTagS); + U32 const curr = (U32)(ip-base); + U32 const matchIndexL = hashLong[h2]; + U32 matchIndexS = hashSmall[h]; + const BYTE* matchLong = base + matchIndexL; + const BYTE* match = base + matchIndexS; + const U32 repIndex = curr + 1 - offset_1; + const BYTE* repMatch = (repIndex < prefixLowestIndex) ? + dictBase + (repIndex - dictIndexDelta) : + base + repIndex; + hashLong[h2] = hashSmall[h] = curr; /* update hash tables */ + + /* check repcode */ + if (((U32)((prefixLowestIndex-1) - repIndex) >= 3 /* intentional underflow */) + && (MEM_read32(repMatch) == MEM_read32(ip+1)) ) { + const BYTE* repMatchEnd = repIndex < prefixLowestIndex ? dictEnd : iend; + mLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repMatchEnd, prefixLowest) + 4; + ip++; + ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, REPCODE1_TO_OFFBASE, mLength); + goto _match_stored; + } + + if (matchIndexL > prefixLowestIndex) { + /* check prefix long match */ + if (MEM_read64(matchLong) == MEM_read64(ip)) { + mLength = ZSTD_count(ip+8, matchLong+8, iend) + 8; + offset = (U32)(ip-matchLong); + while (((ip>anchor) & (matchLong>prefixLowest)) && (ip[-1] == matchLong[-1])) { ip--; matchLong--; mLength++; } /* catch up */ + goto _match_found; + } + } else if (dictTagsMatchL) { + /* check dictMatchState long match */ + U32 const dictMatchIndexL = dictMatchIndexAndTagL >> ZSTD_SHORT_CACHE_TAG_BITS; + const BYTE* dictMatchL = dictBase + dictMatchIndexL; + assert(dictMatchL < dictEnd); + + if (dictMatchL > dictStart && MEM_read64(dictMatchL) == MEM_read64(ip)) { + mLength = ZSTD_count_2segments(ip+8, dictMatchL+8, iend, dictEnd, prefixLowest) + 8; + offset = (U32)(curr - dictMatchIndexL - dictIndexDelta); + while (((ip>anchor) & (dictMatchL>dictStart)) && (ip[-1] == dictMatchL[-1])) { ip--; dictMatchL--; mLength++; } /* catch up */ + goto _match_found; + } } + + if (matchIndexS > prefixLowestIndex) { + /* check prefix short match */ + if (MEM_read32(match) == MEM_read32(ip)) { + goto _search_next_long; + } + } else if (dictTagsMatchS) { + /* check dictMatchState short match */ + U32 const dictMatchIndexS = dictMatchIndexAndTagS >> ZSTD_SHORT_CACHE_TAG_BITS; + match = dictBase + dictMatchIndexS; + matchIndexS = dictMatchIndexS + dictIndexDelta; + + if (match > dictStart && MEM_read32(match) == MEM_read32(ip)) { + goto _search_next_long; + } } + + ip += ((ip-anchor) >> kSearchStrength) + 1; +#if defined(__aarch64__) + PREFETCH_L1(ip+256); +#endif + continue; + +_search_next_long: + { size_t const hl3 = ZSTD_hashPtr(ip+1, hBitsL, 8); + size_t const dictHashAndTagL3 = ZSTD_hashPtr(ip+1, dictHBitsL, 8); + U32 const matchIndexL3 = hashLong[hl3]; + U32 const dictMatchIndexAndTagL3 = dictHashLong[dictHashAndTagL3 >> ZSTD_SHORT_CACHE_TAG_BITS]; + int const dictTagsMatchL3 = ZSTD_comparePackedTags(dictMatchIndexAndTagL3, dictHashAndTagL3); + const BYTE* matchL3 = base + matchIndexL3; + hashLong[hl3] = curr + 1; + + /* check prefix long +1 match */ + if (matchIndexL3 > prefixLowestIndex) { + if (MEM_read64(matchL3) == MEM_read64(ip+1)) { + mLength = ZSTD_count(ip+9, matchL3+8, iend) + 8; + ip++; + offset = (U32)(ip-matchL3); + while (((ip>anchor) & (matchL3>prefixLowest)) && (ip[-1] == matchL3[-1])) { ip--; matchL3--; mLength++; } /* catch up */ + goto _match_found; + } + } else if (dictTagsMatchL3) { + /* check dict long +1 match */ + U32 const dictMatchIndexL3 = dictMatchIndexAndTagL3 >> ZSTD_SHORT_CACHE_TAG_BITS; + const BYTE* dictMatchL3 = dictBase + dictMatchIndexL3; + assert(dictMatchL3 < dictEnd); + if (dictMatchL3 > dictStart && MEM_read64(dictMatchL3) == MEM_read64(ip+1)) { + mLength = ZSTD_count_2segments(ip+1+8, dictMatchL3+8, iend, dictEnd, prefixLowest) + 8; + ip++; + offset = (U32)(curr + 1 - dictMatchIndexL3 - dictIndexDelta); + while (((ip>anchor) & (dictMatchL3>dictStart)) && (ip[-1] == dictMatchL3[-1])) { ip--; dictMatchL3--; mLength++; } /* catch up */ + goto _match_found; + } } } + + /* if no long +1 match, explore the short match we found */ + if (matchIndexS < prefixLowestIndex) { + mLength = ZSTD_count_2segments(ip+4, match+4, iend, dictEnd, prefixLowest) + 4; + offset = (U32)(curr - matchIndexS); + while (((ip>anchor) & (match>dictStart)) && (ip[-1] == match[-1])) { ip--; match--; mLength++; } /* catch up */ + } else { + mLength = ZSTD_count(ip+4, match+4, iend) + 4; + offset = (U32)(ip - match); + while (((ip>anchor) & (match>prefixLowest)) && (ip[-1] == match[-1])) { ip--; match--; mLength++; } /* catch up */ + } + +_match_found: + offset_2 = offset_1; + offset_1 = offset; + + ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, OFFSET_TO_OFFBASE(offset), mLength); + +_match_stored: + /* match found */ + ip += mLength; + anchor = ip; + + if (ip <= ilimit) { + /* Complementary insertion */ + /* done after iLimit test, as candidates could be > iend-8 */ + { U32 const indexToInsert = curr+2; + hashLong[ZSTD_hashPtr(base+indexToInsert, hBitsL, 8)] = indexToInsert; + hashLong[ZSTD_hashPtr(ip-2, hBitsL, 8)] = (U32)(ip-2-base); + hashSmall[ZSTD_hashPtr(base+indexToInsert, hBitsS, mls)] = indexToInsert; + hashSmall[ZSTD_hashPtr(ip-1, hBitsS, mls)] = (U32)(ip-1-base); + } + + /* check immediate repcode */ + while (ip <= ilimit) { + U32 const current2 = (U32)(ip-base); + U32 const repIndex2 = current2 - offset_2; + const BYTE* repMatch2 = repIndex2 < prefixLowestIndex ? + dictBase + repIndex2 - dictIndexDelta : + base + repIndex2; + if ( ((U32)((prefixLowestIndex-1) - (U32)repIndex2) >= 3 /* intentional overflow */) + && (MEM_read32(repMatch2) == MEM_read32(ip)) ) { + const BYTE* const repEnd2 = repIndex2 < prefixLowestIndex ? dictEnd : iend; + size_t const repLength2 = ZSTD_count_2segments(ip+4, repMatch2+4, iend, repEnd2, prefixLowest) + 4; + U32 tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset; /* swap offset_2 <=> offset_1 */ + ZSTD_storeSeq(seqStore, 0, anchor, iend, REPCODE1_TO_OFFBASE, repLength2); + hashSmall[ZSTD_hashPtr(ip, hBitsS, mls)] = current2; + hashLong[ZSTD_hashPtr(ip, hBitsL, 8)] = current2; + ip += repLength2; + anchor = ip; + continue; + } + break; + } + } + } /* while (ip < ilimit) */ + + /* save reps for next block */ + rep[0] = offset_1; + rep[1] = offset_2; + + /* Return the last literals size */ + return (size_t)(iend - anchor); +} + +#define ZSTD_GEN_DFAST_FN(dictMode, mls) \ + static size_t ZSTD_compressBlock_doubleFast_##dictMode##_##mls( \ + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], \ + void const* src, size_t srcSize) \ + { \ + return ZSTD_compressBlock_doubleFast_##dictMode##_generic(ms, seqStore, rep, src, srcSize, mls); \ + } + +ZSTD_GEN_DFAST_FN(noDict, 4) +ZSTD_GEN_DFAST_FN(noDict, 5) +ZSTD_GEN_DFAST_FN(noDict, 6) +ZSTD_GEN_DFAST_FN(noDict, 7) + +ZSTD_GEN_DFAST_FN(dictMatchState, 4) +ZSTD_GEN_DFAST_FN(dictMatchState, 5) +ZSTD_GEN_DFAST_FN(dictMatchState, 6) +ZSTD_GEN_DFAST_FN(dictMatchState, 7) + + +size_t ZSTD_compressBlock_doubleFast( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + const U32 mls = ms->cParams.minMatch; + switch(mls) + { + default: /* includes case 3 */ + case 4 : + return ZSTD_compressBlock_doubleFast_noDict_4(ms, seqStore, rep, src, srcSize); + case 5 : + return ZSTD_compressBlock_doubleFast_noDict_5(ms, seqStore, rep, src, srcSize); + case 6 : + return ZSTD_compressBlock_doubleFast_noDict_6(ms, seqStore, rep, src, srcSize); + case 7 : + return ZSTD_compressBlock_doubleFast_noDict_7(ms, seqStore, rep, src, srcSize); + } +} + + +size_t ZSTD_compressBlock_doubleFast_dictMatchState( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + const U32 mls = ms->cParams.minMatch; + switch(mls) + { + default: /* includes case 3 */ + case 4 : + return ZSTD_compressBlock_doubleFast_dictMatchState_4(ms, seqStore, rep, src, srcSize); + case 5 : + return ZSTD_compressBlock_doubleFast_dictMatchState_5(ms, seqStore, rep, src, srcSize); + case 6 : + return ZSTD_compressBlock_doubleFast_dictMatchState_6(ms, seqStore, rep, src, srcSize); + case 7 : + return ZSTD_compressBlock_doubleFast_dictMatchState_7(ms, seqStore, rep, src, srcSize); + } +} + + +static +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +size_t ZSTD_compressBlock_doubleFast_extDict_generic( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize, + U32 const mls /* template */) +{ + ZSTD_compressionParameters const* cParams = &ms->cParams; + U32* const hashLong = ms->hashTable; + U32 const hBitsL = cParams->hashLog; + U32* const hashSmall = ms->chainTable; + U32 const hBitsS = cParams->chainLog; + const BYTE* const istart = (const BYTE*)src; + const BYTE* ip = istart; + const BYTE* anchor = istart; + const BYTE* const iend = istart + srcSize; + const BYTE* const ilimit = iend - 8; + const BYTE* const base = ms->window.base; + const U32 endIndex = (U32)((size_t)(istart - base) + srcSize); + const U32 lowLimit = ZSTD_getLowestMatchIndex(ms, endIndex, cParams->windowLog); + const U32 dictStartIndex = lowLimit; + const U32 dictLimit = ms->window.dictLimit; + const U32 prefixStartIndex = (dictLimit > lowLimit) ? dictLimit : lowLimit; + const BYTE* const prefixStart = base + prefixStartIndex; + const BYTE* const dictBase = ms->window.dictBase; + const BYTE* const dictStart = dictBase + dictStartIndex; + const BYTE* const dictEnd = dictBase + prefixStartIndex; + U32 offset_1=rep[0], offset_2=rep[1]; + + DEBUGLOG(5, "ZSTD_compressBlock_doubleFast_extDict_generic (srcSize=%zu)", srcSize); + + /* if extDict is invalidated due to maxDistance, switch to "regular" variant */ + if (prefixStartIndex == dictStartIndex) + return ZSTD_compressBlock_doubleFast(ms, seqStore, rep, src, srcSize); + + /* Search Loop */ + while (ip < ilimit) { /* < instead of <=, because (ip+1) */ + const size_t hSmall = ZSTD_hashPtr(ip, hBitsS, mls); + const U32 matchIndex = hashSmall[hSmall]; + const BYTE* const matchBase = matchIndex < prefixStartIndex ? dictBase : base; + const BYTE* match = matchBase + matchIndex; + + const size_t hLong = ZSTD_hashPtr(ip, hBitsL, 8); + const U32 matchLongIndex = hashLong[hLong]; + const BYTE* const matchLongBase = matchLongIndex < prefixStartIndex ? dictBase : base; + const BYTE* matchLong = matchLongBase + matchLongIndex; + + const U32 curr = (U32)(ip-base); + const U32 repIndex = curr + 1 - offset_1; /* offset_1 expected <= curr +1 */ + const BYTE* const repBase = repIndex < prefixStartIndex ? dictBase : base; + const BYTE* const repMatch = repBase + repIndex; + size_t mLength; + hashSmall[hSmall] = hashLong[hLong] = curr; /* update hash table */ + + if ((((U32)((prefixStartIndex-1) - repIndex) >= 3) /* intentional underflow : ensure repIndex doesn't overlap dict + prefix */ + & (offset_1 <= curr+1 - dictStartIndex)) /* note: we are searching at curr+1 */ + && (MEM_read32(repMatch) == MEM_read32(ip+1)) ) { + const BYTE* repMatchEnd = repIndex < prefixStartIndex ? dictEnd : iend; + mLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repMatchEnd, prefixStart) + 4; + ip++; + ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, REPCODE1_TO_OFFBASE, mLength); + } else { + if ((matchLongIndex > dictStartIndex) && (MEM_read64(matchLong) == MEM_read64(ip))) { + const BYTE* const matchEnd = matchLongIndex < prefixStartIndex ? dictEnd : iend; + const BYTE* const lowMatchPtr = matchLongIndex < prefixStartIndex ? dictStart : prefixStart; + U32 offset; + mLength = ZSTD_count_2segments(ip+8, matchLong+8, iend, matchEnd, prefixStart) + 8; + offset = curr - matchLongIndex; + while (((ip>anchor) & (matchLong>lowMatchPtr)) && (ip[-1] == matchLong[-1])) { ip--; matchLong--; mLength++; } /* catch up */ + offset_2 = offset_1; + offset_1 = offset; + ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, OFFSET_TO_OFFBASE(offset), mLength); + + } else if ((matchIndex > dictStartIndex) && (MEM_read32(match) == MEM_read32(ip))) { + size_t const h3 = ZSTD_hashPtr(ip+1, hBitsL, 8); + U32 const matchIndex3 = hashLong[h3]; + const BYTE* const match3Base = matchIndex3 < prefixStartIndex ? dictBase : base; + const BYTE* match3 = match3Base + matchIndex3; + U32 offset; + hashLong[h3] = curr + 1; + if ( (matchIndex3 > dictStartIndex) && (MEM_read64(match3) == MEM_read64(ip+1)) ) { + const BYTE* const matchEnd = matchIndex3 < prefixStartIndex ? dictEnd : iend; + const BYTE* const lowMatchPtr = matchIndex3 < prefixStartIndex ? dictStart : prefixStart; + mLength = ZSTD_count_2segments(ip+9, match3+8, iend, matchEnd, prefixStart) + 8; + ip++; + offset = curr+1 - matchIndex3; + while (((ip>anchor) & (match3>lowMatchPtr)) && (ip[-1] == match3[-1])) { ip--; match3--; mLength++; } /* catch up */ + } else { + const BYTE* const matchEnd = matchIndex < prefixStartIndex ? dictEnd : iend; + const BYTE* const lowMatchPtr = matchIndex < prefixStartIndex ? dictStart : prefixStart; + mLength = ZSTD_count_2segments(ip+4, match+4, iend, matchEnd, prefixStart) + 4; + offset = curr - matchIndex; + while (((ip>anchor) & (match>lowMatchPtr)) && (ip[-1] == match[-1])) { ip--; match--; mLength++; } /* catch up */ + } + offset_2 = offset_1; + offset_1 = offset; + ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, OFFSET_TO_OFFBASE(offset), mLength); + + } else { + ip += ((ip-anchor) >> kSearchStrength) + 1; + continue; + } } + + /* move to next sequence start */ + ip += mLength; + anchor = ip; + + if (ip <= ilimit) { + /* Complementary insertion */ + /* done after iLimit test, as candidates could be > iend-8 */ + { U32 const indexToInsert = curr+2; + hashLong[ZSTD_hashPtr(base+indexToInsert, hBitsL, 8)] = indexToInsert; + hashLong[ZSTD_hashPtr(ip-2, hBitsL, 8)] = (U32)(ip-2-base); + hashSmall[ZSTD_hashPtr(base+indexToInsert, hBitsS, mls)] = indexToInsert; + hashSmall[ZSTD_hashPtr(ip-1, hBitsS, mls)] = (U32)(ip-1-base); + } + + /* check immediate repcode */ + while (ip <= ilimit) { + U32 const current2 = (U32)(ip-base); + U32 const repIndex2 = current2 - offset_2; + const BYTE* repMatch2 = repIndex2 < prefixStartIndex ? dictBase + repIndex2 : base + repIndex2; + if ( (((U32)((prefixStartIndex-1) - repIndex2) >= 3) /* intentional overflow : ensure repIndex2 doesn't overlap dict + prefix */ + & (offset_2 <= current2 - dictStartIndex)) + && (MEM_read32(repMatch2) == MEM_read32(ip)) ) { + const BYTE* const repEnd2 = repIndex2 < prefixStartIndex ? dictEnd : iend; + size_t const repLength2 = ZSTD_count_2segments(ip+4, repMatch2+4, iend, repEnd2, prefixStart) + 4; + U32 const tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset; /* swap offset_2 <=> offset_1 */ + ZSTD_storeSeq(seqStore, 0, anchor, iend, REPCODE1_TO_OFFBASE, repLength2); + hashSmall[ZSTD_hashPtr(ip, hBitsS, mls)] = current2; + hashLong[ZSTD_hashPtr(ip, hBitsL, 8)] = current2; + ip += repLength2; + anchor = ip; + continue; + } + break; + } } } + + /* save reps for next block */ + rep[0] = offset_1; + rep[1] = offset_2; + + /* Return the last literals size */ + return (size_t)(iend - anchor); +} + +ZSTD_GEN_DFAST_FN(extDict, 4) +ZSTD_GEN_DFAST_FN(extDict, 5) +ZSTD_GEN_DFAST_FN(extDict, 6) +ZSTD_GEN_DFAST_FN(extDict, 7) + +size_t ZSTD_compressBlock_doubleFast_extDict( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + U32 const mls = ms->cParams.minMatch; + switch(mls) + { + default: /* includes case 3 */ + case 4 : + return ZSTD_compressBlock_doubleFast_extDict_4(ms, seqStore, rep, src, srcSize); + case 5 : + return ZSTD_compressBlock_doubleFast_extDict_5(ms, seqStore, rep, src, srcSize); + case 6 : + return ZSTD_compressBlock_doubleFast_extDict_6(ms, seqStore, rep, src, srcSize); + case 7 : + return ZSTD_compressBlock_doubleFast_extDict_7(ms, seqStore, rep, src, srcSize); + } +} + +#endif /* ZSTD_EXCLUDE_DFAST_BLOCK_COMPRESSOR */ +/**** ended inlining compress/zstd_double_fast.c ****/ +/**** start inlining compress/zstd_fast.c ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +/**** skipping file: zstd_compress_internal.h ****/ +/**** skipping file: zstd_fast.h ****/ + +static +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +void ZSTD_fillHashTableForCDict(ZSTD_matchState_t* ms, + const void* const end, + ZSTD_dictTableLoadMethod_e dtlm) +{ + const ZSTD_compressionParameters* const cParams = &ms->cParams; + U32* const hashTable = ms->hashTable; + U32 const hBits = cParams->hashLog + ZSTD_SHORT_CACHE_TAG_BITS; + U32 const mls = cParams->minMatch; + const BYTE* const base = ms->window.base; + const BYTE* ip = base + ms->nextToUpdate; + const BYTE* const iend = ((const BYTE*)end) - HASH_READ_SIZE; + const U32 fastHashFillStep = 3; + + /* Currently, we always use ZSTD_dtlm_full for filling CDict tables. + * Feel free to remove this assert if there's a good reason! */ + assert(dtlm == ZSTD_dtlm_full); + + /* Always insert every fastHashFillStep position into the hash table. + * Insert the other positions if their hash entry is empty. + */ + for ( ; ip + fastHashFillStep < iend + 2; ip += fastHashFillStep) { + U32 const curr = (U32)(ip - base); + { size_t const hashAndTag = ZSTD_hashPtr(ip, hBits, mls); + ZSTD_writeTaggedIndex(hashTable, hashAndTag, curr); } + + if (dtlm == ZSTD_dtlm_fast) continue; + /* Only load extra positions for ZSTD_dtlm_full */ + { U32 p; + for (p = 1; p < fastHashFillStep; ++p) { + size_t const hashAndTag = ZSTD_hashPtr(ip + p, hBits, mls); + if (hashTable[hashAndTag >> ZSTD_SHORT_CACHE_TAG_BITS] == 0) { /* not yet filled */ + ZSTD_writeTaggedIndex(hashTable, hashAndTag, curr + p); + } } } } +} + +static +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +void ZSTD_fillHashTableForCCtx(ZSTD_matchState_t* ms, + const void* const end, + ZSTD_dictTableLoadMethod_e dtlm) +{ + const ZSTD_compressionParameters* const cParams = &ms->cParams; + U32* const hashTable = ms->hashTable; + U32 const hBits = cParams->hashLog; + U32 const mls = cParams->minMatch; + const BYTE* const base = ms->window.base; + const BYTE* ip = base + ms->nextToUpdate; + const BYTE* const iend = ((const BYTE*)end) - HASH_READ_SIZE; + const U32 fastHashFillStep = 3; + + /* Currently, we always use ZSTD_dtlm_fast for filling CCtx tables. + * Feel free to remove this assert if there's a good reason! */ + assert(dtlm == ZSTD_dtlm_fast); + + /* Always insert every fastHashFillStep position into the hash table. + * Insert the other positions if their hash entry is empty. + */ + for ( ; ip + fastHashFillStep < iend + 2; ip += fastHashFillStep) { + U32 const curr = (U32)(ip - base); + size_t const hash0 = ZSTD_hashPtr(ip, hBits, mls); + hashTable[hash0] = curr; + if (dtlm == ZSTD_dtlm_fast) continue; + /* Only load extra positions for ZSTD_dtlm_full */ + { U32 p; + for (p = 1; p < fastHashFillStep; ++p) { + size_t const hash = ZSTD_hashPtr(ip + p, hBits, mls); + if (hashTable[hash] == 0) { /* not yet filled */ + hashTable[hash] = curr + p; + } } } } +} + +void ZSTD_fillHashTable(ZSTD_matchState_t* ms, + const void* const end, + ZSTD_dictTableLoadMethod_e dtlm, + ZSTD_tableFillPurpose_e tfp) +{ + if (tfp == ZSTD_tfp_forCDict) { + ZSTD_fillHashTableForCDict(ms, end, dtlm); + } else { + ZSTD_fillHashTableForCCtx(ms, end, dtlm); + } +} + + +/** + * If you squint hard enough (and ignore repcodes), the search operation at any + * given position is broken into 4 stages: + * + * 1. Hash (map position to hash value via input read) + * 2. Lookup (map hash val to index via hashtable read) + * 3. Load (map index to value at that position via input read) + * 4. Compare + * + * Each of these steps involves a memory read at an address which is computed + * from the previous step. This means these steps must be sequenced and their + * latencies are cumulative. + * + * Rather than do 1->2->3->4 sequentially for a single position before moving + * onto the next, this implementation interleaves these operations across the + * next few positions: + * + * R = Repcode Read & Compare + * H = Hash + * T = Table Lookup + * M = Match Read & Compare + * + * Pos | Time --> + * ----+------------------- + * N | ... M + * N+1 | ... TM + * N+2 | R H T M + * N+3 | H TM + * N+4 | R H T M + * N+5 | H ... + * N+6 | R ... + * + * This is very much analogous to the pipelining of execution in a CPU. And just + * like a CPU, we have to dump the pipeline when we find a match (i.e., take a + * branch). + * + * When this happens, we throw away our current state, and do the following prep + * to re-enter the loop: + * + * Pos | Time --> + * ----+------------------- + * N | H T + * N+1 | H + * + * This is also the work we do at the beginning to enter the loop initially. + */ +FORCE_INLINE_TEMPLATE +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +size_t ZSTD_compressBlock_fast_noDict_generic( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize, + U32 const mls, U32 const hasStep) +{ + const ZSTD_compressionParameters* const cParams = &ms->cParams; + U32* const hashTable = ms->hashTable; + U32 const hlog = cParams->hashLog; + /* support stepSize of 0 */ + size_t const stepSize = hasStep ? (cParams->targetLength + !(cParams->targetLength) + 1) : 2; + const BYTE* const base = ms->window.base; + const BYTE* const istart = (const BYTE*)src; + const U32 endIndex = (U32)((size_t)(istart - base) + srcSize); + const U32 prefixStartIndex = ZSTD_getLowestPrefixIndex(ms, endIndex, cParams->windowLog); + const BYTE* const prefixStart = base + prefixStartIndex; + const BYTE* const iend = istart + srcSize; + const BYTE* const ilimit = iend - HASH_READ_SIZE; + + const BYTE* anchor = istart; + const BYTE* ip0 = istart; + const BYTE* ip1; + const BYTE* ip2; + const BYTE* ip3; + U32 current0; + + U32 rep_offset1 = rep[0]; + U32 rep_offset2 = rep[1]; + U32 offsetSaved1 = 0, offsetSaved2 = 0; + + size_t hash0; /* hash for ip0 */ + size_t hash1; /* hash for ip1 */ + U32 idx; /* match idx for ip0 */ + U32 mval; /* src value at match idx */ + + U32 offcode; + const BYTE* match0; + size_t mLength; + + /* ip0 and ip1 are always adjacent. The targetLength skipping and + * uncompressibility acceleration is applied to every other position, + * matching the behavior of #1562. step therefore represents the gap + * between pairs of positions, from ip0 to ip2 or ip1 to ip3. */ + size_t step; + const BYTE* nextStep; + const size_t kStepIncr = (1 << (kSearchStrength - 1)); + + DEBUGLOG(5, "ZSTD_compressBlock_fast_generic"); + ip0 += (ip0 == prefixStart); + { U32 const curr = (U32)(ip0 - base); + U32 const windowLow = ZSTD_getLowestPrefixIndex(ms, curr, cParams->windowLog); + U32 const maxRep = curr - windowLow; + if (rep_offset2 > maxRep) offsetSaved2 = rep_offset2, rep_offset2 = 0; + if (rep_offset1 > maxRep) offsetSaved1 = rep_offset1, rep_offset1 = 0; + } + + /* start each op */ +_start: /* Requires: ip0 */ + + step = stepSize; + nextStep = ip0 + kStepIncr; + + /* calculate positions, ip0 - anchor == 0, so we skip step calc */ + ip1 = ip0 + 1; + ip2 = ip0 + step; + ip3 = ip2 + 1; + + if (ip3 >= ilimit) { + goto _cleanup; + } + + hash0 = ZSTD_hashPtr(ip0, hlog, mls); + hash1 = ZSTD_hashPtr(ip1, hlog, mls); + + idx = hashTable[hash0]; + + do { + /* load repcode match for ip[2]*/ + const U32 rval = MEM_read32(ip2 - rep_offset1); + + /* write back hash table entry */ + current0 = (U32)(ip0 - base); + hashTable[hash0] = current0; + + /* check repcode at ip[2] */ + if ((MEM_read32(ip2) == rval) & (rep_offset1 > 0)) { + ip0 = ip2; + match0 = ip0 - rep_offset1; + mLength = ip0[-1] == match0[-1]; + ip0 -= mLength; + match0 -= mLength; + offcode = REPCODE1_TO_OFFBASE; + mLength += 4; + + /* First write next hash table entry; we've already calculated it. + * This write is known to be safe because the ip1 is before the + * repcode (ip2). */ + hashTable[hash1] = (U32)(ip1 - base); + + goto _match; + } + + /* load match for ip[0] */ + if (idx >= prefixStartIndex) { + mval = MEM_read32(base + idx); + } else { + mval = MEM_read32(ip0) ^ 1; /* guaranteed to not match. */ + } + + /* check match at ip[0] */ + if (MEM_read32(ip0) == mval) { + /* found a match! */ + + /* First write next hash table entry; we've already calculated it. + * This write is known to be safe because the ip1 == ip0 + 1, so + * we know we will resume searching after ip1 */ + hashTable[hash1] = (U32)(ip1 - base); + + goto _offset; + } + + /* lookup ip[1] */ + idx = hashTable[hash1]; + + /* hash ip[2] */ + hash0 = hash1; + hash1 = ZSTD_hashPtr(ip2, hlog, mls); + + /* advance to next positions */ + ip0 = ip1; + ip1 = ip2; + ip2 = ip3; + + /* write back hash table entry */ + current0 = (U32)(ip0 - base); + hashTable[hash0] = current0; + + /* load match for ip[0] */ + if (idx >= prefixStartIndex) { + mval = MEM_read32(base + idx); + } else { + mval = MEM_read32(ip0) ^ 1; /* guaranteed to not match. */ + } + + /* check match at ip[0] */ + if (MEM_read32(ip0) == mval) { + /* found a match! */ + + /* first write next hash table entry; we've already calculated it */ + if (step <= 4) { + /* We need to avoid writing an index into the hash table >= the + * position at which we will pick up our searching after we've + * taken this match. + * + * The minimum possible match has length 4, so the earliest ip0 + * can be after we take this match will be the current ip0 + 4. + * ip1 is ip0 + step - 1. If ip1 is >= ip0 + 4, we can't safely + * write this position. + */ + hashTable[hash1] = (U32)(ip1 - base); + } + + goto _offset; + } + + /* lookup ip[1] */ + idx = hashTable[hash1]; + + /* hash ip[2] */ + hash0 = hash1; + hash1 = ZSTD_hashPtr(ip2, hlog, mls); + + /* advance to next positions */ + ip0 = ip1; + ip1 = ip2; + ip2 = ip0 + step; + ip3 = ip1 + step; + + /* calculate step */ + if (ip2 >= nextStep) { + step++; + PREFETCH_L1(ip1 + 64); + PREFETCH_L1(ip1 + 128); + nextStep += kStepIncr; + } + } while (ip3 < ilimit); + +_cleanup: + /* Note that there are probably still a couple positions we could search. + * However, it seems to be a meaningful performance hit to try to search + * them. So let's not. */ + + /* When the repcodes are outside of the prefix, we set them to zero before the loop. + * When the offsets are still zero, we need to restore them after the block to have a correct + * repcode history. If only one offset was invalid, it is easy. The tricky case is when both + * offsets were invalid. We need to figure out which offset to refill with. + * - If both offsets are zero they are in the same order. + * - If both offsets are non-zero, we won't restore the offsets from `offsetSaved[12]`. + * - If only one is zero, we need to decide which offset to restore. + * - If rep_offset1 is non-zero, then rep_offset2 must be offsetSaved1. + * - It is impossible for rep_offset2 to be non-zero. + * + * So if rep_offset1 started invalid (offsetSaved1 != 0) and became valid (rep_offset1 != 0), then + * set rep[0] = rep_offset1 and rep[1] = offsetSaved1. + */ + offsetSaved2 = ((offsetSaved1 != 0) && (rep_offset1 != 0)) ? offsetSaved1 : offsetSaved2; + + /* save reps for next block */ + rep[0] = rep_offset1 ? rep_offset1 : offsetSaved1; + rep[1] = rep_offset2 ? rep_offset2 : offsetSaved2; + + /* Return the last literals size */ + return (size_t)(iend - anchor); + +_offset: /* Requires: ip0, idx */ + + /* Compute the offset code. */ + match0 = base + idx; + rep_offset2 = rep_offset1; + rep_offset1 = (U32)(ip0-match0); + offcode = OFFSET_TO_OFFBASE(rep_offset1); + mLength = 4; + + /* Count the backwards match length. */ + while (((ip0>anchor) & (match0>prefixStart)) && (ip0[-1] == match0[-1])) { + ip0--; + match0--; + mLength++; + } + +_match: /* Requires: ip0, match0, offcode */ + + /* Count the forward length. */ + mLength += ZSTD_count(ip0 + mLength, match0 + mLength, iend); + + ZSTD_storeSeq(seqStore, (size_t)(ip0 - anchor), anchor, iend, offcode, mLength); + + ip0 += mLength; + anchor = ip0; + + /* Fill table and check for immediate repcode. */ + if (ip0 <= ilimit) { + /* Fill Table */ + assert(base+current0+2 > istart); /* check base overflow */ + hashTable[ZSTD_hashPtr(base+current0+2, hlog, mls)] = current0+2; /* here because current+2 could be > iend-8 */ + hashTable[ZSTD_hashPtr(ip0-2, hlog, mls)] = (U32)(ip0-2-base); + + if (rep_offset2 > 0) { /* rep_offset2==0 means rep_offset2 is invalidated */ + while ( (ip0 <= ilimit) && (MEM_read32(ip0) == MEM_read32(ip0 - rep_offset2)) ) { + /* store sequence */ + size_t const rLength = ZSTD_count(ip0+4, ip0+4-rep_offset2, iend) + 4; + { U32 const tmpOff = rep_offset2; rep_offset2 = rep_offset1; rep_offset1 = tmpOff; } /* swap rep_offset2 <=> rep_offset1 */ + hashTable[ZSTD_hashPtr(ip0, hlog, mls)] = (U32)(ip0-base); + ip0 += rLength; + ZSTD_storeSeq(seqStore, 0 /*litLen*/, anchor, iend, REPCODE1_TO_OFFBASE, rLength); + anchor = ip0; + continue; /* faster when present (confirmed on gcc-8) ... (?) */ + } } } + + goto _start; +} + +#define ZSTD_GEN_FAST_FN(dictMode, mls, step) \ + static size_t ZSTD_compressBlock_fast_##dictMode##_##mls##_##step( \ + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], \ + void const* src, size_t srcSize) \ + { \ + return ZSTD_compressBlock_fast_##dictMode##_generic(ms, seqStore, rep, src, srcSize, mls, step); \ + } + +ZSTD_GEN_FAST_FN(noDict, 4, 1) +ZSTD_GEN_FAST_FN(noDict, 5, 1) +ZSTD_GEN_FAST_FN(noDict, 6, 1) +ZSTD_GEN_FAST_FN(noDict, 7, 1) + +ZSTD_GEN_FAST_FN(noDict, 4, 0) +ZSTD_GEN_FAST_FN(noDict, 5, 0) +ZSTD_GEN_FAST_FN(noDict, 6, 0) +ZSTD_GEN_FAST_FN(noDict, 7, 0) + +size_t ZSTD_compressBlock_fast( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + U32 const mls = ms->cParams.minMatch; + assert(ms->dictMatchState == NULL); + if (ms->cParams.targetLength > 1) { + switch(mls) + { + default: /* includes case 3 */ + case 4 : + return ZSTD_compressBlock_fast_noDict_4_1(ms, seqStore, rep, src, srcSize); + case 5 : + return ZSTD_compressBlock_fast_noDict_5_1(ms, seqStore, rep, src, srcSize); + case 6 : + return ZSTD_compressBlock_fast_noDict_6_1(ms, seqStore, rep, src, srcSize); + case 7 : + return ZSTD_compressBlock_fast_noDict_7_1(ms, seqStore, rep, src, srcSize); + } + } else { + switch(mls) + { + default: /* includes case 3 */ + case 4 : + return ZSTD_compressBlock_fast_noDict_4_0(ms, seqStore, rep, src, srcSize); + case 5 : + return ZSTD_compressBlock_fast_noDict_5_0(ms, seqStore, rep, src, srcSize); + case 6 : + return ZSTD_compressBlock_fast_noDict_6_0(ms, seqStore, rep, src, srcSize); + case 7 : + return ZSTD_compressBlock_fast_noDict_7_0(ms, seqStore, rep, src, srcSize); + } + + } +} + +FORCE_INLINE_TEMPLATE +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +size_t ZSTD_compressBlock_fast_dictMatchState_generic( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize, U32 const mls, U32 const hasStep) +{ + const ZSTD_compressionParameters* const cParams = &ms->cParams; + U32* const hashTable = ms->hashTable; + U32 const hlog = cParams->hashLog; + /* support stepSize of 0 */ + U32 const stepSize = cParams->targetLength + !(cParams->targetLength); + const BYTE* const base = ms->window.base; + const BYTE* const istart = (const BYTE*)src; + const BYTE* ip0 = istart; + const BYTE* ip1 = ip0 + stepSize; /* we assert below that stepSize >= 1 */ + const BYTE* anchor = istart; + const U32 prefixStartIndex = ms->window.dictLimit; + const BYTE* const prefixStart = base + prefixStartIndex; + const BYTE* const iend = istart + srcSize; + const BYTE* const ilimit = iend - HASH_READ_SIZE; + U32 offset_1=rep[0], offset_2=rep[1]; + + const ZSTD_matchState_t* const dms = ms->dictMatchState; + const ZSTD_compressionParameters* const dictCParams = &dms->cParams ; + const U32* const dictHashTable = dms->hashTable; + const U32 dictStartIndex = dms->window.dictLimit; + const BYTE* const dictBase = dms->window.base; + const BYTE* const dictStart = dictBase + dictStartIndex; + const BYTE* const dictEnd = dms->window.nextSrc; + const U32 dictIndexDelta = prefixStartIndex - (U32)(dictEnd - dictBase); + const U32 dictAndPrefixLength = (U32)(istart - prefixStart + dictEnd - dictStart); + const U32 dictHBits = dictCParams->hashLog + ZSTD_SHORT_CACHE_TAG_BITS; + + /* if a dictionary is still attached, it necessarily means that + * it is within window size. So we just check it. */ + const U32 maxDistance = 1U << cParams->windowLog; + const U32 endIndex = (U32)((size_t)(istart - base) + srcSize); + assert(endIndex - prefixStartIndex <= maxDistance); + (void)maxDistance; (void)endIndex; /* these variables are not used when assert() is disabled */ + + (void)hasStep; /* not currently specialized on whether it's accelerated */ + + /* ensure there will be no underflow + * when translating a dict index into a local index */ + assert(prefixStartIndex >= (U32)(dictEnd - dictBase)); + + if (ms->prefetchCDictTables) { + size_t const hashTableBytes = (((size_t)1) << dictCParams->hashLog) * sizeof(U32); + PREFETCH_AREA(dictHashTable, hashTableBytes); + } + + /* init */ + DEBUGLOG(5, "ZSTD_compressBlock_fast_dictMatchState_generic"); + ip0 += (dictAndPrefixLength == 0); + /* dictMatchState repCode checks don't currently handle repCode == 0 + * disabling. */ + assert(offset_1 <= dictAndPrefixLength); + assert(offset_2 <= dictAndPrefixLength); + + /* Outer search loop */ + assert(stepSize >= 1); + while (ip1 <= ilimit) { /* repcode check at (ip0 + 1) is safe because ip0 < ip1 */ + size_t mLength; + size_t hash0 = ZSTD_hashPtr(ip0, hlog, mls); + + size_t const dictHashAndTag0 = ZSTD_hashPtr(ip0, dictHBits, mls); + U32 dictMatchIndexAndTag = dictHashTable[dictHashAndTag0 >> ZSTD_SHORT_CACHE_TAG_BITS]; + int dictTagsMatch = ZSTD_comparePackedTags(dictMatchIndexAndTag, dictHashAndTag0); + + U32 matchIndex = hashTable[hash0]; + U32 curr = (U32)(ip0 - base); + size_t step = stepSize; + const size_t kStepIncr = 1 << kSearchStrength; + const BYTE* nextStep = ip0 + kStepIncr; + + /* Inner search loop */ + while (1) { + const BYTE* match = base + matchIndex; + const U32 repIndex = curr + 1 - offset_1; + const BYTE* repMatch = (repIndex < prefixStartIndex) ? + dictBase + (repIndex - dictIndexDelta) : + base + repIndex; + const size_t hash1 = ZSTD_hashPtr(ip1, hlog, mls); + size_t const dictHashAndTag1 = ZSTD_hashPtr(ip1, dictHBits, mls); + hashTable[hash0] = curr; /* update hash table */ + + if (((U32) ((prefixStartIndex - 1) - repIndex) >= + 3) /* intentional underflow : ensure repIndex isn't overlapping dict + prefix */ + && (MEM_read32(repMatch) == MEM_read32(ip0 + 1))) { + const BYTE* const repMatchEnd = repIndex < prefixStartIndex ? dictEnd : iend; + mLength = ZSTD_count_2segments(ip0 + 1 + 4, repMatch + 4, iend, repMatchEnd, prefixStart) + 4; + ip0++; + ZSTD_storeSeq(seqStore, (size_t) (ip0 - anchor), anchor, iend, REPCODE1_TO_OFFBASE, mLength); + break; + } + + if (dictTagsMatch) { + /* Found a possible dict match */ + const U32 dictMatchIndex = dictMatchIndexAndTag >> ZSTD_SHORT_CACHE_TAG_BITS; + const BYTE* dictMatch = dictBase + dictMatchIndex; + if (dictMatchIndex > dictStartIndex && + MEM_read32(dictMatch) == MEM_read32(ip0)) { + /* To replicate extDict parse behavior, we only use dict matches when the normal matchIndex is invalid */ + if (matchIndex <= prefixStartIndex) { + U32 const offset = (U32) (curr - dictMatchIndex - dictIndexDelta); + mLength = ZSTD_count_2segments(ip0 + 4, dictMatch + 4, iend, dictEnd, prefixStart) + 4; + while (((ip0 > anchor) & (dictMatch > dictStart)) + && (ip0[-1] == dictMatch[-1])) { + ip0--; + dictMatch--; + mLength++; + } /* catch up */ + offset_2 = offset_1; + offset_1 = offset; + ZSTD_storeSeq(seqStore, (size_t) (ip0 - anchor), anchor, iend, OFFSET_TO_OFFBASE(offset), mLength); + break; + } + } + } + + if (matchIndex > prefixStartIndex && MEM_read32(match) == MEM_read32(ip0)) { + /* found a regular match */ + U32 const offset = (U32) (ip0 - match); + mLength = ZSTD_count(ip0 + 4, match + 4, iend) + 4; + while (((ip0 > anchor) & (match > prefixStart)) + && (ip0[-1] == match[-1])) { + ip0--; + match--; + mLength++; + } /* catch up */ + offset_2 = offset_1; + offset_1 = offset; + ZSTD_storeSeq(seqStore, (size_t) (ip0 - anchor), anchor, iend, OFFSET_TO_OFFBASE(offset), mLength); + break; + } + + /* Prepare for next iteration */ + dictMatchIndexAndTag = dictHashTable[dictHashAndTag1 >> ZSTD_SHORT_CACHE_TAG_BITS]; + dictTagsMatch = ZSTD_comparePackedTags(dictMatchIndexAndTag, dictHashAndTag1); + matchIndex = hashTable[hash1]; + + if (ip1 >= nextStep) { + step++; + nextStep += kStepIncr; + } + ip0 = ip1; + ip1 = ip1 + step; + if (ip1 > ilimit) goto _cleanup; + + curr = (U32)(ip0 - base); + hash0 = hash1; + } /* end inner search loop */ + + /* match found */ + assert(mLength); + ip0 += mLength; + anchor = ip0; + + if (ip0 <= ilimit) { + /* Fill Table */ + assert(base+curr+2 > istart); /* check base overflow */ + hashTable[ZSTD_hashPtr(base+curr+2, hlog, mls)] = curr+2; /* here because curr+2 could be > iend-8 */ + hashTable[ZSTD_hashPtr(ip0-2, hlog, mls)] = (U32)(ip0-2-base); + + /* check immediate repcode */ + while (ip0 <= ilimit) { + U32 const current2 = (U32)(ip0-base); + U32 const repIndex2 = current2 - offset_2; + const BYTE* repMatch2 = repIndex2 < prefixStartIndex ? + dictBase - dictIndexDelta + repIndex2 : + base + repIndex2; + if ( ((U32)((prefixStartIndex-1) - (U32)repIndex2) >= 3 /* intentional overflow */) + && (MEM_read32(repMatch2) == MEM_read32(ip0))) { + const BYTE* const repEnd2 = repIndex2 < prefixStartIndex ? dictEnd : iend; + size_t const repLength2 = ZSTD_count_2segments(ip0+4, repMatch2+4, iend, repEnd2, prefixStart) + 4; + U32 tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset; /* swap offset_2 <=> offset_1 */ + ZSTD_storeSeq(seqStore, 0, anchor, iend, REPCODE1_TO_OFFBASE, repLength2); + hashTable[ZSTD_hashPtr(ip0, hlog, mls)] = current2; + ip0 += repLength2; + anchor = ip0; + continue; + } + break; + } + } + + /* Prepare for next iteration */ + assert(ip0 == anchor); + ip1 = ip0 + stepSize; + } + +_cleanup: + /* save reps for next block */ + rep[0] = offset_1; + rep[1] = offset_2; + + /* Return the last literals size */ + return (size_t)(iend - anchor); +} + + +ZSTD_GEN_FAST_FN(dictMatchState, 4, 0) +ZSTD_GEN_FAST_FN(dictMatchState, 5, 0) +ZSTD_GEN_FAST_FN(dictMatchState, 6, 0) +ZSTD_GEN_FAST_FN(dictMatchState, 7, 0) + +size_t ZSTD_compressBlock_fast_dictMatchState( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + U32 const mls = ms->cParams.minMatch; + assert(ms->dictMatchState != NULL); + switch(mls) + { + default: /* includes case 3 */ + case 4 : + return ZSTD_compressBlock_fast_dictMatchState_4_0(ms, seqStore, rep, src, srcSize); + case 5 : + return ZSTD_compressBlock_fast_dictMatchState_5_0(ms, seqStore, rep, src, srcSize); + case 6 : + return ZSTD_compressBlock_fast_dictMatchState_6_0(ms, seqStore, rep, src, srcSize); + case 7 : + return ZSTD_compressBlock_fast_dictMatchState_7_0(ms, seqStore, rep, src, srcSize); + } +} + + +static +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +size_t ZSTD_compressBlock_fast_extDict_generic( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize, U32 const mls, U32 const hasStep) +{ + const ZSTD_compressionParameters* const cParams = &ms->cParams; + U32* const hashTable = ms->hashTable; + U32 const hlog = cParams->hashLog; + /* support stepSize of 0 */ + size_t const stepSize = cParams->targetLength + !(cParams->targetLength) + 1; + const BYTE* const base = ms->window.base; + const BYTE* const dictBase = ms->window.dictBase; + const BYTE* const istart = (const BYTE*)src; + const BYTE* anchor = istart; + const U32 endIndex = (U32)((size_t)(istart - base) + srcSize); + const U32 lowLimit = ZSTD_getLowestMatchIndex(ms, endIndex, cParams->windowLog); + const U32 dictStartIndex = lowLimit; + const BYTE* const dictStart = dictBase + dictStartIndex; + const U32 dictLimit = ms->window.dictLimit; + const U32 prefixStartIndex = dictLimit < lowLimit ? lowLimit : dictLimit; + const BYTE* const prefixStart = base + prefixStartIndex; + const BYTE* const dictEnd = dictBase + prefixStartIndex; + const BYTE* const iend = istart + srcSize; + const BYTE* const ilimit = iend - 8; + U32 offset_1=rep[0], offset_2=rep[1]; + U32 offsetSaved1 = 0, offsetSaved2 = 0; + + const BYTE* ip0 = istart; + const BYTE* ip1; + const BYTE* ip2; + const BYTE* ip3; + U32 current0; + + + size_t hash0; /* hash for ip0 */ + size_t hash1; /* hash for ip1 */ + U32 idx; /* match idx for ip0 */ + const BYTE* idxBase; /* base pointer for idx */ + + U32 offcode; + const BYTE* match0; + size_t mLength; + const BYTE* matchEnd = 0; /* initialize to avoid warning, assert != 0 later */ + + size_t step; + const BYTE* nextStep; + const size_t kStepIncr = (1 << (kSearchStrength - 1)); + + (void)hasStep; /* not currently specialized on whether it's accelerated */ + + DEBUGLOG(5, "ZSTD_compressBlock_fast_extDict_generic (offset_1=%u)", offset_1); + + /* switch to "regular" variant if extDict is invalidated due to maxDistance */ + if (prefixStartIndex == dictStartIndex) + return ZSTD_compressBlock_fast(ms, seqStore, rep, src, srcSize); + + { U32 const curr = (U32)(ip0 - base); + U32 const maxRep = curr - dictStartIndex; + if (offset_2 >= maxRep) offsetSaved2 = offset_2, offset_2 = 0; + if (offset_1 >= maxRep) offsetSaved1 = offset_1, offset_1 = 0; + } + + /* start each op */ +_start: /* Requires: ip0 */ + + step = stepSize; + nextStep = ip0 + kStepIncr; + + /* calculate positions, ip0 - anchor == 0, so we skip step calc */ + ip1 = ip0 + 1; + ip2 = ip0 + step; + ip3 = ip2 + 1; + + if (ip3 >= ilimit) { + goto _cleanup; + } + + hash0 = ZSTD_hashPtr(ip0, hlog, mls); + hash1 = ZSTD_hashPtr(ip1, hlog, mls); + + idx = hashTable[hash0]; + idxBase = idx < prefixStartIndex ? dictBase : base; + + do { + { /* load repcode match for ip[2] */ + U32 const current2 = (U32)(ip2 - base); + U32 const repIndex = current2 - offset_1; + const BYTE* const repBase = repIndex < prefixStartIndex ? dictBase : base; + U32 rval; + if ( ((U32)(prefixStartIndex - repIndex) >= 4) /* intentional underflow */ + & (offset_1 > 0) ) { + rval = MEM_read32(repBase + repIndex); + } else { + rval = MEM_read32(ip2) ^ 1; /* guaranteed to not match. */ + } + + /* write back hash table entry */ + current0 = (U32)(ip0 - base); + hashTable[hash0] = current0; + + /* check repcode at ip[2] */ + if (MEM_read32(ip2) == rval) { + ip0 = ip2; + match0 = repBase + repIndex; + matchEnd = repIndex < prefixStartIndex ? dictEnd : iend; + assert((match0 != prefixStart) & (match0 != dictStart)); + mLength = ip0[-1] == match0[-1]; + ip0 -= mLength; + match0 -= mLength; + offcode = REPCODE1_TO_OFFBASE; + mLength += 4; + goto _match; + } } + + { /* load match for ip[0] */ + U32 const mval = idx >= dictStartIndex ? + MEM_read32(idxBase + idx) : + MEM_read32(ip0) ^ 1; /* guaranteed not to match */ + + /* check match at ip[0] */ + if (MEM_read32(ip0) == mval) { + /* found a match! */ + goto _offset; + } } + + /* lookup ip[1] */ + idx = hashTable[hash1]; + idxBase = idx < prefixStartIndex ? dictBase : base; + + /* hash ip[2] */ + hash0 = hash1; + hash1 = ZSTD_hashPtr(ip2, hlog, mls); + + /* advance to next positions */ + ip0 = ip1; + ip1 = ip2; + ip2 = ip3; + + /* write back hash table entry */ + current0 = (U32)(ip0 - base); + hashTable[hash0] = current0; + + { /* load match for ip[0] */ + U32 const mval = idx >= dictStartIndex ? + MEM_read32(idxBase + idx) : + MEM_read32(ip0) ^ 1; /* guaranteed not to match */ + + /* check match at ip[0] */ + if (MEM_read32(ip0) == mval) { + /* found a match! */ + goto _offset; + } } + + /* lookup ip[1] */ + idx = hashTable[hash1]; + idxBase = idx < prefixStartIndex ? dictBase : base; + + /* hash ip[2] */ + hash0 = hash1; + hash1 = ZSTD_hashPtr(ip2, hlog, mls); + + /* advance to next positions */ + ip0 = ip1; + ip1 = ip2; + ip2 = ip0 + step; + ip3 = ip1 + step; + + /* calculate step */ + if (ip2 >= nextStep) { + step++; + PREFETCH_L1(ip1 + 64); + PREFETCH_L1(ip1 + 128); + nextStep += kStepIncr; + } + } while (ip3 < ilimit); + +_cleanup: + /* Note that there are probably still a couple positions we could search. + * However, it seems to be a meaningful performance hit to try to search + * them. So let's not. */ + + /* If offset_1 started invalid (offsetSaved1 != 0) and became valid (offset_1 != 0), + * rotate saved offsets. See comment in ZSTD_compressBlock_fast_noDict for more context. */ + offsetSaved2 = ((offsetSaved1 != 0) && (offset_1 != 0)) ? offsetSaved1 : offsetSaved2; + + /* save reps for next block */ + rep[0] = offset_1 ? offset_1 : offsetSaved1; + rep[1] = offset_2 ? offset_2 : offsetSaved2; + + /* Return the last literals size */ + return (size_t)(iend - anchor); + +_offset: /* Requires: ip0, idx, idxBase */ + + /* Compute the offset code. */ + { U32 const offset = current0 - idx; + const BYTE* const lowMatchPtr = idx < prefixStartIndex ? dictStart : prefixStart; + matchEnd = idx < prefixStartIndex ? dictEnd : iend; + match0 = idxBase + idx; + offset_2 = offset_1; + offset_1 = offset; + offcode = OFFSET_TO_OFFBASE(offset); + mLength = 4; + + /* Count the backwards match length. */ + while (((ip0>anchor) & (match0>lowMatchPtr)) && (ip0[-1] == match0[-1])) { + ip0--; + match0--; + mLength++; + } } + +_match: /* Requires: ip0, match0, offcode, matchEnd */ + + /* Count the forward length. */ + assert(matchEnd != 0); + mLength += ZSTD_count_2segments(ip0 + mLength, match0 + mLength, iend, matchEnd, prefixStart); + + ZSTD_storeSeq(seqStore, (size_t)(ip0 - anchor), anchor, iend, offcode, mLength); + + ip0 += mLength; + anchor = ip0; + + /* write next hash table entry */ + if (ip1 < ip0) { + hashTable[hash1] = (U32)(ip1 - base); + } + + /* Fill table and check for immediate repcode. */ + if (ip0 <= ilimit) { + /* Fill Table */ + assert(base+current0+2 > istart); /* check base overflow */ + hashTable[ZSTD_hashPtr(base+current0+2, hlog, mls)] = current0+2; /* here because current+2 could be > iend-8 */ + hashTable[ZSTD_hashPtr(ip0-2, hlog, mls)] = (U32)(ip0-2-base); + + while (ip0 <= ilimit) { + U32 const repIndex2 = (U32)(ip0-base) - offset_2; + const BYTE* const repMatch2 = repIndex2 < prefixStartIndex ? dictBase + repIndex2 : base + repIndex2; + if ( (((U32)((prefixStartIndex-1) - repIndex2) >= 3) & (offset_2 > 0)) /* intentional underflow */ + && (MEM_read32(repMatch2) == MEM_read32(ip0)) ) { + const BYTE* const repEnd2 = repIndex2 < prefixStartIndex ? dictEnd : iend; + size_t const repLength2 = ZSTD_count_2segments(ip0+4, repMatch2+4, iend, repEnd2, prefixStart) + 4; + { U32 const tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset; } /* swap offset_2 <=> offset_1 */ + ZSTD_storeSeq(seqStore, 0 /*litlen*/, anchor, iend, REPCODE1_TO_OFFBASE, repLength2); + hashTable[ZSTD_hashPtr(ip0, hlog, mls)] = (U32)(ip0-base); + ip0 += repLength2; + anchor = ip0; + continue; + } + break; + } } + + goto _start; +} + +ZSTD_GEN_FAST_FN(extDict, 4, 0) +ZSTD_GEN_FAST_FN(extDict, 5, 0) +ZSTD_GEN_FAST_FN(extDict, 6, 0) +ZSTD_GEN_FAST_FN(extDict, 7, 0) + +size_t ZSTD_compressBlock_fast_extDict( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + U32 const mls = ms->cParams.minMatch; + assert(ms->dictMatchState == NULL); + switch(mls) + { + default: /* includes case 3 */ + case 4 : + return ZSTD_compressBlock_fast_extDict_4_0(ms, seqStore, rep, src, srcSize); + case 5 : + return ZSTD_compressBlock_fast_extDict_5_0(ms, seqStore, rep, src, srcSize); + case 6 : + return ZSTD_compressBlock_fast_extDict_6_0(ms, seqStore, rep, src, srcSize); + case 7 : + return ZSTD_compressBlock_fast_extDict_7_0(ms, seqStore, rep, src, srcSize); + } +} +/**** ended inlining compress/zstd_fast.c ****/ +/**** start inlining compress/zstd_lazy.c ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +/**** skipping file: zstd_compress_internal.h ****/ +/**** skipping file: zstd_lazy.h ****/ +/**** skipping file: ../common/bits.h ****/ + +#if !defined(ZSTD_EXCLUDE_GREEDY_BLOCK_COMPRESSOR) \ + || !defined(ZSTD_EXCLUDE_LAZY_BLOCK_COMPRESSOR) \ + || !defined(ZSTD_EXCLUDE_LAZY2_BLOCK_COMPRESSOR) \ + || !defined(ZSTD_EXCLUDE_BTLAZY2_BLOCK_COMPRESSOR) + +#define kLazySkippingStep 8 + + +/*-************************************* +* Binary Tree search +***************************************/ + +static +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +void ZSTD_updateDUBT(ZSTD_matchState_t* ms, + const BYTE* ip, const BYTE* iend, + U32 mls) +{ + const ZSTD_compressionParameters* const cParams = &ms->cParams; + U32* const hashTable = ms->hashTable; + U32 const hashLog = cParams->hashLog; + + U32* const bt = ms->chainTable; + U32 const btLog = cParams->chainLog - 1; + U32 const btMask = (1 << btLog) - 1; + + const BYTE* const base = ms->window.base; + U32 const target = (U32)(ip - base); + U32 idx = ms->nextToUpdate; + + if (idx != target) + DEBUGLOG(7, "ZSTD_updateDUBT, from %u to %u (dictLimit:%u)", + idx, target, ms->window.dictLimit); + assert(ip + 8 <= iend); /* condition for ZSTD_hashPtr */ + (void)iend; + + assert(idx >= ms->window.dictLimit); /* condition for valid base+idx */ + for ( ; idx < target ; idx++) { + size_t const h = ZSTD_hashPtr(base + idx, hashLog, mls); /* assumption : ip + 8 <= iend */ + U32 const matchIndex = hashTable[h]; + + U32* const nextCandidatePtr = bt + 2*(idx&btMask); + U32* const sortMarkPtr = nextCandidatePtr + 1; + + DEBUGLOG(8, "ZSTD_updateDUBT: insert %u", idx); + hashTable[h] = idx; /* Update Hash Table */ + *nextCandidatePtr = matchIndex; /* update BT like a chain */ + *sortMarkPtr = ZSTD_DUBT_UNSORTED_MARK; + } + ms->nextToUpdate = target; +} + + +/** ZSTD_insertDUBT1() : + * sort one already inserted but unsorted position + * assumption : curr >= btlow == (curr - btmask) + * doesn't fail */ +static +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +void ZSTD_insertDUBT1(const ZSTD_matchState_t* ms, + U32 curr, const BYTE* inputEnd, + U32 nbCompares, U32 btLow, + const ZSTD_dictMode_e dictMode) +{ + const ZSTD_compressionParameters* const cParams = &ms->cParams; + U32* const bt = ms->chainTable; + U32 const btLog = cParams->chainLog - 1; + U32 const btMask = (1 << btLog) - 1; + size_t commonLengthSmaller=0, commonLengthLarger=0; + const BYTE* const base = ms->window.base; + const BYTE* const dictBase = ms->window.dictBase; + const U32 dictLimit = ms->window.dictLimit; + const BYTE* const ip = (curr>=dictLimit) ? base + curr : dictBase + curr; + const BYTE* const iend = (curr>=dictLimit) ? inputEnd : dictBase + dictLimit; + const BYTE* const dictEnd = dictBase + dictLimit; + const BYTE* const prefixStart = base + dictLimit; + const BYTE* match; + U32* smallerPtr = bt + 2*(curr&btMask); + U32* largerPtr = smallerPtr + 1; + U32 matchIndex = *smallerPtr; /* this candidate is unsorted : next sorted candidate is reached through *smallerPtr, while *largerPtr contains previous unsorted candidate (which is already saved and can be overwritten) */ + U32 dummy32; /* to be nullified at the end */ + U32 const windowValid = ms->window.lowLimit; + U32 const maxDistance = 1U << cParams->windowLog; + U32 const windowLow = (curr - windowValid > maxDistance) ? curr - maxDistance : windowValid; + + + DEBUGLOG(8, "ZSTD_insertDUBT1(%u) (dictLimit=%u, lowLimit=%u)", + curr, dictLimit, windowLow); + assert(curr >= btLow); + assert(ip < iend); /* condition for ZSTD_count */ + + for (; nbCompares && (matchIndex > windowLow); --nbCompares) { + U32* const nextPtr = bt + 2*(matchIndex & btMask); + size_t matchLength = MIN(commonLengthSmaller, commonLengthLarger); /* guaranteed minimum nb of common bytes */ + assert(matchIndex < curr); + /* note : all candidates are now supposed sorted, + * but it's still possible to have nextPtr[1] == ZSTD_DUBT_UNSORTED_MARK + * when a real index has the same value as ZSTD_DUBT_UNSORTED_MARK */ + + if ( (dictMode != ZSTD_extDict) + || (matchIndex+matchLength >= dictLimit) /* both in current segment*/ + || (curr < dictLimit) /* both in extDict */) { + const BYTE* const mBase = ( (dictMode != ZSTD_extDict) + || (matchIndex+matchLength >= dictLimit)) ? + base : dictBase; + assert( (matchIndex+matchLength >= dictLimit) /* might be wrong if extDict is incorrectly set to 0 */ + || (curr < dictLimit) ); + match = mBase + matchIndex; + matchLength += ZSTD_count(ip+matchLength, match+matchLength, iend); + } else { + match = dictBase + matchIndex; + matchLength += ZSTD_count_2segments(ip+matchLength, match+matchLength, iend, dictEnd, prefixStart); + if (matchIndex+matchLength >= dictLimit) + match = base + matchIndex; /* preparation for next read of match[matchLength] */ + } + + DEBUGLOG(8, "ZSTD_insertDUBT1: comparing %u with %u : found %u common bytes ", + curr, matchIndex, (U32)matchLength); + + if (ip+matchLength == iend) { /* equal : no way to know if inf or sup */ + break; /* drop , to guarantee consistency ; miss a bit of compression, but other solutions can corrupt tree */ + } + + if (match[matchLength] < ip[matchLength]) { /* necessarily within buffer */ + /* match is smaller than current */ + *smallerPtr = matchIndex; /* update smaller idx */ + commonLengthSmaller = matchLength; /* all smaller will now have at least this guaranteed common length */ + if (matchIndex <= btLow) { smallerPtr=&dummy32; break; } /* beyond tree size, stop searching */ + DEBUGLOG(8, "ZSTD_insertDUBT1: %u (>btLow=%u) is smaller : next => %u", + matchIndex, btLow, nextPtr[1]); + smallerPtr = nextPtr+1; /* new "candidate" => larger than match, which was smaller than target */ + matchIndex = nextPtr[1]; /* new matchIndex, larger than previous and closer to current */ + } else { + /* match is larger than current */ + *largerPtr = matchIndex; + commonLengthLarger = matchLength; + if (matchIndex <= btLow) { largerPtr=&dummy32; break; } /* beyond tree size, stop searching */ + DEBUGLOG(8, "ZSTD_insertDUBT1: %u (>btLow=%u) is larger => %u", + matchIndex, btLow, nextPtr[0]); + largerPtr = nextPtr; + matchIndex = nextPtr[0]; + } } + + *smallerPtr = *largerPtr = 0; +} + + +static +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +size_t ZSTD_DUBT_findBetterDictMatch ( + const ZSTD_matchState_t* ms, + const BYTE* const ip, const BYTE* const iend, + size_t* offsetPtr, + size_t bestLength, + U32 nbCompares, + U32 const mls, + const ZSTD_dictMode_e dictMode) +{ + const ZSTD_matchState_t * const dms = ms->dictMatchState; + const ZSTD_compressionParameters* const dmsCParams = &dms->cParams; + const U32 * const dictHashTable = dms->hashTable; + U32 const hashLog = dmsCParams->hashLog; + size_t const h = ZSTD_hashPtr(ip, hashLog, mls); + U32 dictMatchIndex = dictHashTable[h]; + + const BYTE* const base = ms->window.base; + const BYTE* const prefixStart = base + ms->window.dictLimit; + U32 const curr = (U32)(ip-base); + const BYTE* const dictBase = dms->window.base; + const BYTE* const dictEnd = dms->window.nextSrc; + U32 const dictHighLimit = (U32)(dms->window.nextSrc - dms->window.base); + U32 const dictLowLimit = dms->window.lowLimit; + U32 const dictIndexDelta = ms->window.lowLimit - dictHighLimit; + + U32* const dictBt = dms->chainTable; + U32 const btLog = dmsCParams->chainLog - 1; + U32 const btMask = (1 << btLog) - 1; + U32 const btLow = (btMask >= dictHighLimit - dictLowLimit) ? dictLowLimit : dictHighLimit - btMask; + + size_t commonLengthSmaller=0, commonLengthLarger=0; + + (void)dictMode; + assert(dictMode == ZSTD_dictMatchState); + + for (; nbCompares && (dictMatchIndex > dictLowLimit); --nbCompares) { + U32* const nextPtr = dictBt + 2*(dictMatchIndex & btMask); + size_t matchLength = MIN(commonLengthSmaller, commonLengthLarger); /* guaranteed minimum nb of common bytes */ + const BYTE* match = dictBase + dictMatchIndex; + matchLength += ZSTD_count_2segments(ip+matchLength, match+matchLength, iend, dictEnd, prefixStart); + if (dictMatchIndex+matchLength >= dictHighLimit) + match = base + dictMatchIndex + dictIndexDelta; /* to prepare for next usage of match[matchLength] */ + + if (matchLength > bestLength) { + U32 matchIndex = dictMatchIndex + dictIndexDelta; + if ( (4*(int)(matchLength-bestLength)) > (int)(ZSTD_highbit32(curr-matchIndex+1) - ZSTD_highbit32((U32)offsetPtr[0]+1)) ) { + DEBUGLOG(9, "ZSTD_DUBT_findBetterDictMatch(%u) : found better match length %u -> %u and offsetCode %u -> %u (dictMatchIndex %u, matchIndex %u)", + curr, (U32)bestLength, (U32)matchLength, (U32)*offsetPtr, OFFSET_TO_OFFBASE(curr - matchIndex), dictMatchIndex, matchIndex); + bestLength = matchLength, *offsetPtr = OFFSET_TO_OFFBASE(curr - matchIndex); + } + if (ip+matchLength == iend) { /* reached end of input : ip[matchLength] is not valid, no way to know if it's larger or smaller than match */ + break; /* drop, to guarantee consistency (miss a little bit of compression) */ + } + } + + if (match[matchLength] < ip[matchLength]) { + if (dictMatchIndex <= btLow) { break; } /* beyond tree size, stop the search */ + commonLengthSmaller = matchLength; /* all smaller will now have at least this guaranteed common length */ + dictMatchIndex = nextPtr[1]; /* new matchIndex larger than previous (closer to current) */ + } else { + /* match is larger than current */ + if (dictMatchIndex <= btLow) { break; } /* beyond tree size, stop the search */ + commonLengthLarger = matchLength; + dictMatchIndex = nextPtr[0]; + } + } + + if (bestLength >= MINMATCH) { + U32 const mIndex = curr - (U32)OFFBASE_TO_OFFSET(*offsetPtr); (void)mIndex; + DEBUGLOG(8, "ZSTD_DUBT_findBetterDictMatch(%u) : found match of length %u and offsetCode %u (pos %u)", + curr, (U32)bestLength, (U32)*offsetPtr, mIndex); + } + return bestLength; + +} + + +static +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +size_t ZSTD_DUBT_findBestMatch(ZSTD_matchState_t* ms, + const BYTE* const ip, const BYTE* const iend, + size_t* offBasePtr, + U32 const mls, + const ZSTD_dictMode_e dictMode) +{ + const ZSTD_compressionParameters* const cParams = &ms->cParams; + U32* const hashTable = ms->hashTable; + U32 const hashLog = cParams->hashLog; + size_t const h = ZSTD_hashPtr(ip, hashLog, mls); + U32 matchIndex = hashTable[h]; + + const BYTE* const base = ms->window.base; + U32 const curr = (U32)(ip-base); + U32 const windowLow = ZSTD_getLowestMatchIndex(ms, curr, cParams->windowLog); + + U32* const bt = ms->chainTable; + U32 const btLog = cParams->chainLog - 1; + U32 const btMask = (1 << btLog) - 1; + U32 const btLow = (btMask >= curr) ? 0 : curr - btMask; + U32 const unsortLimit = MAX(btLow, windowLow); + + U32* nextCandidate = bt + 2*(matchIndex&btMask); + U32* unsortedMark = bt + 2*(matchIndex&btMask) + 1; + U32 nbCompares = 1U << cParams->searchLog; + U32 nbCandidates = nbCompares; + U32 previousCandidate = 0; + + DEBUGLOG(7, "ZSTD_DUBT_findBestMatch (%u) ", curr); + assert(ip <= iend-8); /* required for h calculation */ + assert(dictMode != ZSTD_dedicatedDictSearch); + + /* reach end of unsorted candidates list */ + while ( (matchIndex > unsortLimit) + && (*unsortedMark == ZSTD_DUBT_UNSORTED_MARK) + && (nbCandidates > 1) ) { + DEBUGLOG(8, "ZSTD_DUBT_findBestMatch: candidate %u is unsorted", + matchIndex); + *unsortedMark = previousCandidate; /* the unsortedMark becomes a reversed chain, to move up back to original position */ + previousCandidate = matchIndex; + matchIndex = *nextCandidate; + nextCandidate = bt + 2*(matchIndex&btMask); + unsortedMark = bt + 2*(matchIndex&btMask) + 1; + nbCandidates --; + } + + /* nullify last candidate if it's still unsorted + * simplification, detrimental to compression ratio, beneficial for speed */ + if ( (matchIndex > unsortLimit) + && (*unsortedMark==ZSTD_DUBT_UNSORTED_MARK) ) { + DEBUGLOG(7, "ZSTD_DUBT_findBestMatch: nullify last unsorted candidate %u", + matchIndex); + *nextCandidate = *unsortedMark = 0; + } + + /* batch sort stacked candidates */ + matchIndex = previousCandidate; + while (matchIndex) { /* will end on matchIndex == 0 */ + U32* const nextCandidateIdxPtr = bt + 2*(matchIndex&btMask) + 1; + U32 const nextCandidateIdx = *nextCandidateIdxPtr; + ZSTD_insertDUBT1(ms, matchIndex, iend, + nbCandidates, unsortLimit, dictMode); + matchIndex = nextCandidateIdx; + nbCandidates++; + } + + /* find longest match */ + { size_t commonLengthSmaller = 0, commonLengthLarger = 0; + const BYTE* const dictBase = ms->window.dictBase; + const U32 dictLimit = ms->window.dictLimit; + const BYTE* const dictEnd = dictBase + dictLimit; + const BYTE* const prefixStart = base + dictLimit; + U32* smallerPtr = bt + 2*(curr&btMask); + U32* largerPtr = bt + 2*(curr&btMask) + 1; + U32 matchEndIdx = curr + 8 + 1; + U32 dummy32; /* to be nullified at the end */ + size_t bestLength = 0; + + matchIndex = hashTable[h]; + hashTable[h] = curr; /* Update Hash Table */ + + for (; nbCompares && (matchIndex > windowLow); --nbCompares) { + U32* const nextPtr = bt + 2*(matchIndex & btMask); + size_t matchLength = MIN(commonLengthSmaller, commonLengthLarger); /* guaranteed minimum nb of common bytes */ + const BYTE* match; + + if ((dictMode != ZSTD_extDict) || (matchIndex+matchLength >= dictLimit)) { + match = base + matchIndex; + matchLength += ZSTD_count(ip+matchLength, match+matchLength, iend); + } else { + match = dictBase + matchIndex; + matchLength += ZSTD_count_2segments(ip+matchLength, match+matchLength, iend, dictEnd, prefixStart); + if (matchIndex+matchLength >= dictLimit) + match = base + matchIndex; /* to prepare for next usage of match[matchLength] */ + } + + if (matchLength > bestLength) { + if (matchLength > matchEndIdx - matchIndex) + matchEndIdx = matchIndex + (U32)matchLength; + if ( (4*(int)(matchLength-bestLength)) > (int)(ZSTD_highbit32(curr - matchIndex + 1) - ZSTD_highbit32((U32)*offBasePtr)) ) + bestLength = matchLength, *offBasePtr = OFFSET_TO_OFFBASE(curr - matchIndex); + if (ip+matchLength == iend) { /* equal : no way to know if inf or sup */ + if (dictMode == ZSTD_dictMatchState) { + nbCompares = 0; /* in addition to avoiding checking any + * further in this loop, make sure we + * skip checking in the dictionary. */ + } + break; /* drop, to guarantee consistency (miss a little bit of compression) */ + } + } + + if (match[matchLength] < ip[matchLength]) { + /* match is smaller than current */ + *smallerPtr = matchIndex; /* update smaller idx */ + commonLengthSmaller = matchLength; /* all smaller will now have at least this guaranteed common length */ + if (matchIndex <= btLow) { smallerPtr=&dummy32; break; } /* beyond tree size, stop the search */ + smallerPtr = nextPtr+1; /* new "smaller" => larger of match */ + matchIndex = nextPtr[1]; /* new matchIndex larger than previous (closer to current) */ + } else { + /* match is larger than current */ + *largerPtr = matchIndex; + commonLengthLarger = matchLength; + if (matchIndex <= btLow) { largerPtr=&dummy32; break; } /* beyond tree size, stop the search */ + largerPtr = nextPtr; + matchIndex = nextPtr[0]; + } } + + *smallerPtr = *largerPtr = 0; + + assert(nbCompares <= (1U << ZSTD_SEARCHLOG_MAX)); /* Check we haven't underflowed. */ + if (dictMode == ZSTD_dictMatchState && nbCompares) { + bestLength = ZSTD_DUBT_findBetterDictMatch( + ms, ip, iend, + offBasePtr, bestLength, nbCompares, + mls, dictMode); + } + + assert(matchEndIdx > curr+8); /* ensure nextToUpdate is increased */ + ms->nextToUpdate = matchEndIdx - 8; /* skip repetitive patterns */ + if (bestLength >= MINMATCH) { + U32 const mIndex = curr - (U32)OFFBASE_TO_OFFSET(*offBasePtr); (void)mIndex; + DEBUGLOG(8, "ZSTD_DUBT_findBestMatch(%u) : found match of length %u and offsetCode %u (pos %u)", + curr, (U32)bestLength, (U32)*offBasePtr, mIndex); + } + return bestLength; + } +} + + +/** ZSTD_BtFindBestMatch() : Tree updater, providing best match */ +FORCE_INLINE_TEMPLATE +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +size_t ZSTD_BtFindBestMatch( ZSTD_matchState_t* ms, + const BYTE* const ip, const BYTE* const iLimit, + size_t* offBasePtr, + const U32 mls /* template */, + const ZSTD_dictMode_e dictMode) +{ + DEBUGLOG(7, "ZSTD_BtFindBestMatch"); + if (ip < ms->window.base + ms->nextToUpdate) return 0; /* skipped area */ + ZSTD_updateDUBT(ms, ip, iLimit, mls); + return ZSTD_DUBT_findBestMatch(ms, ip, iLimit, offBasePtr, mls, dictMode); +} + +/*********************************** +* Dedicated dict search +***********************************/ + +void ZSTD_dedicatedDictSearch_lazy_loadDictionary(ZSTD_matchState_t* ms, const BYTE* const ip) +{ + const BYTE* const base = ms->window.base; + U32 const target = (U32)(ip - base); + U32* const hashTable = ms->hashTable; + U32* const chainTable = ms->chainTable; + U32 const chainSize = 1 << ms->cParams.chainLog; + U32 idx = ms->nextToUpdate; + U32 const minChain = chainSize < target - idx ? target - chainSize : idx; + U32 const bucketSize = 1 << ZSTD_LAZY_DDSS_BUCKET_LOG; + U32 const cacheSize = bucketSize - 1; + U32 const chainAttempts = (1 << ms->cParams.searchLog) - cacheSize; + U32 const chainLimit = chainAttempts > 255 ? 255 : chainAttempts; + + /* We know the hashtable is oversized by a factor of `bucketSize`. + * We are going to temporarily pretend `bucketSize == 1`, keeping only a + * single entry. We will use the rest of the space to construct a temporary + * chaintable. + */ + U32 const hashLog = ms->cParams.hashLog - ZSTD_LAZY_DDSS_BUCKET_LOG; + U32* const tmpHashTable = hashTable; + U32* const tmpChainTable = hashTable + ((size_t)1 << hashLog); + U32 const tmpChainSize = (U32)((1 << ZSTD_LAZY_DDSS_BUCKET_LOG) - 1) << hashLog; + U32 const tmpMinChain = tmpChainSize < target ? target - tmpChainSize : idx; + U32 hashIdx; + + assert(ms->cParams.chainLog <= 24); + assert(ms->cParams.hashLog > ms->cParams.chainLog); + assert(idx != 0); + assert(tmpMinChain <= minChain); + + /* fill conventional hash table and conventional chain table */ + for ( ; idx < target; idx++) { + U32 const h = (U32)ZSTD_hashPtr(base + idx, hashLog, ms->cParams.minMatch); + if (idx >= tmpMinChain) { + tmpChainTable[idx - tmpMinChain] = hashTable[h]; + } + tmpHashTable[h] = idx; + } + + /* sort chains into ddss chain table */ + { + U32 chainPos = 0; + for (hashIdx = 0; hashIdx < (1U << hashLog); hashIdx++) { + U32 count; + U32 countBeyondMinChain = 0; + U32 i = tmpHashTable[hashIdx]; + for (count = 0; i >= tmpMinChain && count < cacheSize; count++) { + /* skip through the chain to the first position that won't be + * in the hash cache bucket */ + if (i < minChain) { + countBeyondMinChain++; + } + i = tmpChainTable[i - tmpMinChain]; + } + if (count == cacheSize) { + for (count = 0; count < chainLimit;) { + if (i < minChain) { + if (!i || ++countBeyondMinChain > cacheSize) { + /* only allow pulling `cacheSize` number of entries + * into the cache or chainTable beyond `minChain`, + * to replace the entries pulled out of the + * chainTable into the cache. This lets us reach + * back further without increasing the total number + * of entries in the chainTable, guaranteeing the + * DDSS chain table will fit into the space + * allocated for the regular one. */ + break; + } + } + chainTable[chainPos++] = i; + count++; + if (i < tmpMinChain) { + break; + } + i = tmpChainTable[i - tmpMinChain]; + } + } else { + count = 0; + } + if (count) { + tmpHashTable[hashIdx] = ((chainPos - count) << 8) + count; + } else { + tmpHashTable[hashIdx] = 0; + } + } + assert(chainPos <= chainSize); /* I believe this is guaranteed... */ + } + + /* move chain pointers into the last entry of each hash bucket */ + for (hashIdx = (1 << hashLog); hashIdx; ) { + U32 const bucketIdx = --hashIdx << ZSTD_LAZY_DDSS_BUCKET_LOG; + U32 const chainPackedPointer = tmpHashTable[hashIdx]; + U32 i; + for (i = 0; i < cacheSize; i++) { + hashTable[bucketIdx + i] = 0; + } + hashTable[bucketIdx + bucketSize - 1] = chainPackedPointer; + } + + /* fill the buckets of the hash table */ + for (idx = ms->nextToUpdate; idx < target; idx++) { + U32 const h = (U32)ZSTD_hashPtr(base + idx, hashLog, ms->cParams.minMatch) + << ZSTD_LAZY_DDSS_BUCKET_LOG; + U32 i; + /* Shift hash cache down 1. */ + for (i = cacheSize - 1; i; i--) + hashTable[h + i] = hashTable[h + i - 1]; + hashTable[h] = idx; + } + + ms->nextToUpdate = target; +} + +/* Returns the longest match length found in the dedicated dict search structure. + * If none are longer than the argument ml, then ml will be returned. + */ +FORCE_INLINE_TEMPLATE +size_t ZSTD_dedicatedDictSearch_lazy_search(size_t* offsetPtr, size_t ml, U32 nbAttempts, + const ZSTD_matchState_t* const dms, + const BYTE* const ip, const BYTE* const iLimit, + const BYTE* const prefixStart, const U32 curr, + const U32 dictLimit, const size_t ddsIdx) { + const U32 ddsLowestIndex = dms->window.dictLimit; + const BYTE* const ddsBase = dms->window.base; + const BYTE* const ddsEnd = dms->window.nextSrc; + const U32 ddsSize = (U32)(ddsEnd - ddsBase); + const U32 ddsIndexDelta = dictLimit - ddsSize; + const U32 bucketSize = (1 << ZSTD_LAZY_DDSS_BUCKET_LOG); + const U32 bucketLimit = nbAttempts < bucketSize - 1 ? nbAttempts : bucketSize - 1; + U32 ddsAttempt; + U32 matchIndex; + + for (ddsAttempt = 0; ddsAttempt < bucketSize - 1; ddsAttempt++) { + PREFETCH_L1(ddsBase + dms->hashTable[ddsIdx + ddsAttempt]); + } + + { + U32 const chainPackedPointer = dms->hashTable[ddsIdx + bucketSize - 1]; + U32 const chainIndex = chainPackedPointer >> 8; + + PREFETCH_L1(&dms->chainTable[chainIndex]); + } + + for (ddsAttempt = 0; ddsAttempt < bucketLimit; ddsAttempt++) { + size_t currentMl=0; + const BYTE* match; + matchIndex = dms->hashTable[ddsIdx + ddsAttempt]; + match = ddsBase + matchIndex; + + if (!matchIndex) { + return ml; + } + + /* guaranteed by table construction */ + (void)ddsLowestIndex; + assert(matchIndex >= ddsLowestIndex); + assert(match+4 <= ddsEnd); + if (MEM_read32(match) == MEM_read32(ip)) { + /* assumption : matchIndex <= dictLimit-4 (by table construction) */ + currentMl = ZSTD_count_2segments(ip+4, match+4, iLimit, ddsEnd, prefixStart) + 4; + } + + /* save best solution */ + if (currentMl > ml) { + ml = currentMl; + *offsetPtr = OFFSET_TO_OFFBASE(curr - (matchIndex + ddsIndexDelta)); + if (ip+currentMl == iLimit) { + /* best possible, avoids read overflow on next attempt */ + return ml; + } + } + } + + { + U32 const chainPackedPointer = dms->hashTable[ddsIdx + bucketSize - 1]; + U32 chainIndex = chainPackedPointer >> 8; + U32 const chainLength = chainPackedPointer & 0xFF; + U32 const chainAttempts = nbAttempts - ddsAttempt; + U32 const chainLimit = chainAttempts > chainLength ? chainLength : chainAttempts; + U32 chainAttempt; + + for (chainAttempt = 0 ; chainAttempt < chainLimit; chainAttempt++) { + PREFETCH_L1(ddsBase + dms->chainTable[chainIndex + chainAttempt]); + } + + for (chainAttempt = 0 ; chainAttempt < chainLimit; chainAttempt++, chainIndex++) { + size_t currentMl=0; + const BYTE* match; + matchIndex = dms->chainTable[chainIndex]; + match = ddsBase + matchIndex; + + /* guaranteed by table construction */ + assert(matchIndex >= ddsLowestIndex); + assert(match+4 <= ddsEnd); + if (MEM_read32(match) == MEM_read32(ip)) { + /* assumption : matchIndex <= dictLimit-4 (by table construction) */ + currentMl = ZSTD_count_2segments(ip+4, match+4, iLimit, ddsEnd, prefixStart) + 4; + } + + /* save best solution */ + if (currentMl > ml) { + ml = currentMl; + *offsetPtr = OFFSET_TO_OFFBASE(curr - (matchIndex + ddsIndexDelta)); + if (ip+currentMl == iLimit) break; /* best possible, avoids read overflow on next attempt */ + } + } + } + return ml; +} + + +/* ********************************* +* Hash Chain +***********************************/ +#define NEXT_IN_CHAIN(d, mask) chainTable[(d) & (mask)] + +/* Update chains up to ip (excluded) + Assumption : always within prefix (i.e. not within extDict) */ +FORCE_INLINE_TEMPLATE +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +U32 ZSTD_insertAndFindFirstIndex_internal( + ZSTD_matchState_t* ms, + const ZSTD_compressionParameters* const cParams, + const BYTE* ip, U32 const mls, U32 const lazySkipping) +{ + U32* const hashTable = ms->hashTable; + const U32 hashLog = cParams->hashLog; + U32* const chainTable = ms->chainTable; + const U32 chainMask = (1 << cParams->chainLog) - 1; + const BYTE* const base = ms->window.base; + const U32 target = (U32)(ip - base); + U32 idx = ms->nextToUpdate; + + while(idx < target) { /* catch up */ + size_t const h = ZSTD_hashPtr(base+idx, hashLog, mls); + NEXT_IN_CHAIN(idx, chainMask) = hashTable[h]; + hashTable[h] = idx; + idx++; + /* Stop inserting every position when in the lazy skipping mode. */ + if (lazySkipping) + break; + } + + ms->nextToUpdate = target; + return hashTable[ZSTD_hashPtr(ip, hashLog, mls)]; +} + +U32 ZSTD_insertAndFindFirstIndex(ZSTD_matchState_t* ms, const BYTE* ip) { + const ZSTD_compressionParameters* const cParams = &ms->cParams; + return ZSTD_insertAndFindFirstIndex_internal(ms, cParams, ip, ms->cParams.minMatch, /* lazySkipping*/ 0); +} + +/* inlining is important to hardwire a hot branch (template emulation) */ +FORCE_INLINE_TEMPLATE +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +size_t ZSTD_HcFindBestMatch( + ZSTD_matchState_t* ms, + const BYTE* const ip, const BYTE* const iLimit, + size_t* offsetPtr, + const U32 mls, const ZSTD_dictMode_e dictMode) +{ + const ZSTD_compressionParameters* const cParams = &ms->cParams; + U32* const chainTable = ms->chainTable; + const U32 chainSize = (1 << cParams->chainLog); + const U32 chainMask = chainSize-1; + const BYTE* const base = ms->window.base; + const BYTE* const dictBase = ms->window.dictBase; + const U32 dictLimit = ms->window.dictLimit; + const BYTE* const prefixStart = base + dictLimit; + const BYTE* const dictEnd = dictBase + dictLimit; + const U32 curr = (U32)(ip-base); + const U32 maxDistance = 1U << cParams->windowLog; + const U32 lowestValid = ms->window.lowLimit; + const U32 withinMaxDistance = (curr - lowestValid > maxDistance) ? curr - maxDistance : lowestValid; + const U32 isDictionary = (ms->loadedDictEnd != 0); + const U32 lowLimit = isDictionary ? lowestValid : withinMaxDistance; + const U32 minChain = curr > chainSize ? curr - chainSize : 0; + U32 nbAttempts = 1U << cParams->searchLog; + size_t ml=4-1; + + const ZSTD_matchState_t* const dms = ms->dictMatchState; + const U32 ddsHashLog = dictMode == ZSTD_dedicatedDictSearch + ? dms->cParams.hashLog - ZSTD_LAZY_DDSS_BUCKET_LOG : 0; + const size_t ddsIdx = dictMode == ZSTD_dedicatedDictSearch + ? ZSTD_hashPtr(ip, ddsHashLog, mls) << ZSTD_LAZY_DDSS_BUCKET_LOG : 0; + + U32 matchIndex; + + if (dictMode == ZSTD_dedicatedDictSearch) { + const U32* entry = &dms->hashTable[ddsIdx]; + PREFETCH_L1(entry); + } + + /* HC4 match finder */ + matchIndex = ZSTD_insertAndFindFirstIndex_internal(ms, cParams, ip, mls, ms->lazySkipping); + + for ( ; (matchIndex>=lowLimit) & (nbAttempts>0) ; nbAttempts--) { + size_t currentMl=0; + if ((dictMode != ZSTD_extDict) || matchIndex >= dictLimit) { + const BYTE* const match = base + matchIndex; + assert(matchIndex >= dictLimit); /* ensures this is true if dictMode != ZSTD_extDict */ + /* read 4B starting from (match + ml + 1 - sizeof(U32)) */ + if (MEM_read32(match + ml - 3) == MEM_read32(ip + ml - 3)) /* potentially better */ + currentMl = ZSTD_count(ip, match, iLimit); + } else { + const BYTE* const match = dictBase + matchIndex; + assert(match+4 <= dictEnd); + if (MEM_read32(match) == MEM_read32(ip)) /* assumption : matchIndex <= dictLimit-4 (by table construction) */ + currentMl = ZSTD_count_2segments(ip+4, match+4, iLimit, dictEnd, prefixStart) + 4; + } + + /* save best solution */ + if (currentMl > ml) { + ml = currentMl; + *offsetPtr = OFFSET_TO_OFFBASE(curr - matchIndex); + if (ip+currentMl == iLimit) break; /* best possible, avoids read overflow on next attempt */ + } + + if (matchIndex <= minChain) break; + matchIndex = NEXT_IN_CHAIN(matchIndex, chainMask); + } + + assert(nbAttempts <= (1U << ZSTD_SEARCHLOG_MAX)); /* Check we haven't underflowed. */ + if (dictMode == ZSTD_dedicatedDictSearch) { + ml = ZSTD_dedicatedDictSearch_lazy_search(offsetPtr, ml, nbAttempts, dms, + ip, iLimit, prefixStart, curr, dictLimit, ddsIdx); + } else if (dictMode == ZSTD_dictMatchState) { + const U32* const dmsChainTable = dms->chainTable; + const U32 dmsChainSize = (1 << dms->cParams.chainLog); + const U32 dmsChainMask = dmsChainSize - 1; + const U32 dmsLowestIndex = dms->window.dictLimit; + const BYTE* const dmsBase = dms->window.base; + const BYTE* const dmsEnd = dms->window.nextSrc; + const U32 dmsSize = (U32)(dmsEnd - dmsBase); + const U32 dmsIndexDelta = dictLimit - dmsSize; + const U32 dmsMinChain = dmsSize > dmsChainSize ? dmsSize - dmsChainSize : 0; + + matchIndex = dms->hashTable[ZSTD_hashPtr(ip, dms->cParams.hashLog, mls)]; + + for ( ; (matchIndex>=dmsLowestIndex) & (nbAttempts>0) ; nbAttempts--) { + size_t currentMl=0; + const BYTE* const match = dmsBase + matchIndex; + assert(match+4 <= dmsEnd); + if (MEM_read32(match) == MEM_read32(ip)) /* assumption : matchIndex <= dictLimit-4 (by table construction) */ + currentMl = ZSTD_count_2segments(ip+4, match+4, iLimit, dmsEnd, prefixStart) + 4; + + /* save best solution */ + if (currentMl > ml) { + ml = currentMl; + assert(curr > matchIndex + dmsIndexDelta); + *offsetPtr = OFFSET_TO_OFFBASE(curr - (matchIndex + dmsIndexDelta)); + if (ip+currentMl == iLimit) break; /* best possible, avoids read overflow on next attempt */ + } + + if (matchIndex <= dmsMinChain) break; + + matchIndex = dmsChainTable[matchIndex & dmsChainMask]; + } + } + + return ml; +} + +/* ********************************* +* (SIMD) Row-based matchfinder +***********************************/ +/* Constants for row-based hash */ +#define ZSTD_ROW_HASH_TAG_MASK ((1u << ZSTD_ROW_HASH_TAG_BITS) - 1) +#define ZSTD_ROW_HASH_MAX_ENTRIES 64 /* absolute maximum number of entries per row, for all configurations */ + +#define ZSTD_ROW_HASH_CACHE_MASK (ZSTD_ROW_HASH_CACHE_SIZE - 1) + +typedef U64 ZSTD_VecMask; /* Clarifies when we are interacting with a U64 representing a mask of matches */ + +/* ZSTD_VecMask_next(): + * Starting from the LSB, returns the idx of the next non-zero bit. + * Basically counting the nb of trailing zeroes. + */ +MEM_STATIC U32 ZSTD_VecMask_next(ZSTD_VecMask val) { + return ZSTD_countTrailingZeros64(val); +} + +/* ZSTD_row_nextIndex(): + * Returns the next index to insert at within a tagTable row, and updates the "head" + * value to reflect the update. Essentially cycles backwards from [1, {entries per row}) + */ +FORCE_INLINE_TEMPLATE U32 ZSTD_row_nextIndex(BYTE* const tagRow, U32 const rowMask) { + U32 next = (*tagRow-1) & rowMask; + next += (next == 0) ? rowMask : 0; /* skip first position */ + *tagRow = (BYTE)next; + return next; +} + +/* ZSTD_isAligned(): + * Checks that a pointer is aligned to "align" bytes which must be a power of 2. + */ +MEM_STATIC int ZSTD_isAligned(void const* ptr, size_t align) { + assert((align & (align - 1)) == 0); + return (((size_t)ptr) & (align - 1)) == 0; +} + +/* ZSTD_row_prefetch(): + * Performs prefetching for the hashTable and tagTable at a given row. + */ +FORCE_INLINE_TEMPLATE void ZSTD_row_prefetch(U32 const* hashTable, BYTE const* tagTable, U32 const relRow, U32 const rowLog) { + PREFETCH_L1(hashTable + relRow); + if (rowLog >= 5) { + PREFETCH_L1(hashTable + relRow + 16); + /* Note: prefetching more of the hash table does not appear to be beneficial for 128-entry rows */ + } + PREFETCH_L1(tagTable + relRow); + if (rowLog == 6) { + PREFETCH_L1(tagTable + relRow + 32); + } + assert(rowLog == 4 || rowLog == 5 || rowLog == 6); + assert(ZSTD_isAligned(hashTable + relRow, 64)); /* prefetched hash row always 64-byte aligned */ + assert(ZSTD_isAligned(tagTable + relRow, (size_t)1 << rowLog)); /* prefetched tagRow sits on correct multiple of bytes (32,64,128) */ +} + +/* ZSTD_row_fillHashCache(): + * Fill up the hash cache starting at idx, prefetching up to ZSTD_ROW_HASH_CACHE_SIZE entries, + * but not beyond iLimit. + */ +FORCE_INLINE_TEMPLATE +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +void ZSTD_row_fillHashCache(ZSTD_matchState_t* ms, const BYTE* base, + U32 const rowLog, U32 const mls, + U32 idx, const BYTE* const iLimit) +{ + U32 const* const hashTable = ms->hashTable; + BYTE const* const tagTable = ms->tagTable; + U32 const hashLog = ms->rowHashLog; + U32 const maxElemsToPrefetch = (base + idx) > iLimit ? 0 : (U32)(iLimit - (base + idx) + 1); + U32 const lim = idx + MIN(ZSTD_ROW_HASH_CACHE_SIZE, maxElemsToPrefetch); + + for (; idx < lim; ++idx) { + U32 const hash = (U32)ZSTD_hashPtrSalted(base + idx, hashLog + ZSTD_ROW_HASH_TAG_BITS, mls, ms->hashSalt); + U32 const row = (hash >> ZSTD_ROW_HASH_TAG_BITS) << rowLog; + ZSTD_row_prefetch(hashTable, tagTable, row, rowLog); + ms->hashCache[idx & ZSTD_ROW_HASH_CACHE_MASK] = hash; + } + + DEBUGLOG(6, "ZSTD_row_fillHashCache(): [%u %u %u %u %u %u %u %u]", ms->hashCache[0], ms->hashCache[1], + ms->hashCache[2], ms->hashCache[3], ms->hashCache[4], + ms->hashCache[5], ms->hashCache[6], ms->hashCache[7]); +} + +/* ZSTD_row_nextCachedHash(): + * Returns the hash of base + idx, and replaces the hash in the hash cache with the byte at + * base + idx + ZSTD_ROW_HASH_CACHE_SIZE. Also prefetches the appropriate rows from hashTable and tagTable. + */ +FORCE_INLINE_TEMPLATE +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +U32 ZSTD_row_nextCachedHash(U32* cache, U32 const* hashTable, + BYTE const* tagTable, BYTE const* base, + U32 idx, U32 const hashLog, + U32 const rowLog, U32 const mls, + U64 const hashSalt) +{ + U32 const newHash = (U32)ZSTD_hashPtrSalted(base+idx+ZSTD_ROW_HASH_CACHE_SIZE, hashLog + ZSTD_ROW_HASH_TAG_BITS, mls, hashSalt); + U32 const row = (newHash >> ZSTD_ROW_HASH_TAG_BITS) << rowLog; + ZSTD_row_prefetch(hashTable, tagTable, row, rowLog); + { U32 const hash = cache[idx & ZSTD_ROW_HASH_CACHE_MASK]; + cache[idx & ZSTD_ROW_HASH_CACHE_MASK] = newHash; + return hash; + } +} + +/* ZSTD_row_update_internalImpl(): + * Updates the hash table with positions starting from updateStartIdx until updateEndIdx. + */ +FORCE_INLINE_TEMPLATE +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +void ZSTD_row_update_internalImpl(ZSTD_matchState_t* ms, + U32 updateStartIdx, U32 const updateEndIdx, + U32 const mls, U32 const rowLog, + U32 const rowMask, U32 const useCache) +{ + U32* const hashTable = ms->hashTable; + BYTE* const tagTable = ms->tagTable; + U32 const hashLog = ms->rowHashLog; + const BYTE* const base = ms->window.base; + + DEBUGLOG(6, "ZSTD_row_update_internalImpl(): updateStartIdx=%u, updateEndIdx=%u", updateStartIdx, updateEndIdx); + for (; updateStartIdx < updateEndIdx; ++updateStartIdx) { + U32 const hash = useCache ? ZSTD_row_nextCachedHash(ms->hashCache, hashTable, tagTable, base, updateStartIdx, hashLog, rowLog, mls, ms->hashSalt) + : (U32)ZSTD_hashPtrSalted(base + updateStartIdx, hashLog + ZSTD_ROW_HASH_TAG_BITS, mls, ms->hashSalt); + U32 const relRow = (hash >> ZSTD_ROW_HASH_TAG_BITS) << rowLog; + U32* const row = hashTable + relRow; + BYTE* tagRow = tagTable + relRow; + U32 const pos = ZSTD_row_nextIndex(tagRow, rowMask); + + assert(hash == ZSTD_hashPtrSalted(base + updateStartIdx, hashLog + ZSTD_ROW_HASH_TAG_BITS, mls, ms->hashSalt)); + tagRow[pos] = hash & ZSTD_ROW_HASH_TAG_MASK; + row[pos] = updateStartIdx; + } +} + +/* ZSTD_row_update_internal(): + * Inserts the byte at ip into the appropriate position in the hash table, and updates ms->nextToUpdate. + * Skips sections of long matches as is necessary. + */ +FORCE_INLINE_TEMPLATE +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +void ZSTD_row_update_internal(ZSTD_matchState_t* ms, const BYTE* ip, + U32 const mls, U32 const rowLog, + U32 const rowMask, U32 const useCache) +{ + U32 idx = ms->nextToUpdate; + const BYTE* const base = ms->window.base; + const U32 target = (U32)(ip - base); + const U32 kSkipThreshold = 384; + const U32 kMaxMatchStartPositionsToUpdate = 96; + const U32 kMaxMatchEndPositionsToUpdate = 32; + + if (useCache) { + /* Only skip positions when using hash cache, i.e. + * if we are loading a dict, don't skip anything. + * If we decide to skip, then we only update a set number + * of positions at the beginning and end of the match. + */ + if (UNLIKELY(target - idx > kSkipThreshold)) { + U32 const bound = idx + kMaxMatchStartPositionsToUpdate; + ZSTD_row_update_internalImpl(ms, idx, bound, mls, rowLog, rowMask, useCache); + idx = target - kMaxMatchEndPositionsToUpdate; + ZSTD_row_fillHashCache(ms, base, rowLog, mls, idx, ip+1); + } + } + assert(target >= idx); + ZSTD_row_update_internalImpl(ms, idx, target, mls, rowLog, rowMask, useCache); + ms->nextToUpdate = target; +} + +/* ZSTD_row_update(): + * External wrapper for ZSTD_row_update_internal(). Used for filling the hashtable during dictionary + * processing. + */ +void ZSTD_row_update(ZSTD_matchState_t* const ms, const BYTE* ip) { + const U32 rowLog = BOUNDED(4, ms->cParams.searchLog, 6); + const U32 rowMask = (1u << rowLog) - 1; + const U32 mls = MIN(ms->cParams.minMatch, 6 /* mls caps out at 6 */); + + DEBUGLOG(5, "ZSTD_row_update(), rowLog=%u", rowLog); + ZSTD_row_update_internal(ms, ip, mls, rowLog, rowMask, 0 /* don't use cache */); +} + +/* Returns the mask width of bits group of which will be set to 1. Given not all + * architectures have easy movemask instruction, this helps to iterate over + * groups of bits easier and faster. + */ +FORCE_INLINE_TEMPLATE U32 +ZSTD_row_matchMaskGroupWidth(const U32 rowEntries) +{ + assert((rowEntries == 16) || (rowEntries == 32) || rowEntries == 64); + assert(rowEntries <= ZSTD_ROW_HASH_MAX_ENTRIES); + (void)rowEntries; +#if defined(ZSTD_ARCH_ARM_NEON) + /* NEON path only works for little endian */ + if (!MEM_isLittleEndian()) { + return 1; + } + if (rowEntries == 16) { + return 4; + } + if (rowEntries == 32) { + return 2; + } + if (rowEntries == 64) { + return 1; + } +#endif + return 1; +} + +#if defined(ZSTD_ARCH_X86_SSE2) +FORCE_INLINE_TEMPLATE ZSTD_VecMask +ZSTD_row_getSSEMask(int nbChunks, const BYTE* const src, const BYTE tag, const U32 head) +{ + const __m128i comparisonMask = _mm_set1_epi8((char)tag); + int matches[4] = {0}; + int i; + assert(nbChunks == 1 || nbChunks == 2 || nbChunks == 4); + for (i=0; i> chunkSize; + do { + size_t chunk = MEM_readST(&src[i]); + chunk ^= splatChar; + chunk = (((chunk | x80) - x01) | chunk) & x80; + matches <<= chunkSize; + matches |= (chunk * extractMagic) >> shiftAmount; + i -= chunkSize; + } while (i >= 0); + } else { /* big endian: reverse bits during extraction */ + const size_t msb = xFF ^ (xFF >> 1); + const size_t extractMagic = (msb / 0x1FF) | msb; + do { + size_t chunk = MEM_readST(&src[i]); + chunk ^= splatChar; + chunk = (((chunk | x80) - x01) | chunk) & x80; + matches <<= chunkSize; + matches |= ((chunk >> 7) * extractMagic) >> shiftAmount; + i -= chunkSize; + } while (i >= 0); + } + matches = ~matches; + if (rowEntries == 16) { + return ZSTD_rotateRight_U16((U16)matches, headGrouped); + } else if (rowEntries == 32) { + return ZSTD_rotateRight_U32((U32)matches, headGrouped); + } else { + return ZSTD_rotateRight_U64((U64)matches, headGrouped); + } + } +#endif +} + +/* The high-level approach of the SIMD row based match finder is as follows: + * - Figure out where to insert the new entry: + * - Generate a hash for current input posistion and split it into a one byte of tag and `rowHashLog` bits of index. + * - The hash is salted by a value that changes on every contex reset, so when the same table is used + * we will avoid collisions that would otherwise slow us down by intorducing phantom matches. + * - The hashTable is effectively split into groups or "rows" of 15 or 31 entries of U32, and the index determines + * which row to insert into. + * - Determine the correct position within the row to insert the entry into. Each row of 15 or 31 can + * be considered as a circular buffer with a "head" index that resides in the tagTable (overall 16 or 32 bytes + * per row). + * - Use SIMD to efficiently compare the tags in the tagTable to the 1-byte tag calculated for the position and + * generate a bitfield that we can cycle through to check the collisions in the hash table. + * - Pick the longest match. + * - Insert the tag into the equivalent row and position in the tagTable. + */ +FORCE_INLINE_TEMPLATE +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +size_t ZSTD_RowFindBestMatch( + ZSTD_matchState_t* ms, + const BYTE* const ip, const BYTE* const iLimit, + size_t* offsetPtr, + const U32 mls, const ZSTD_dictMode_e dictMode, + const U32 rowLog) +{ + U32* const hashTable = ms->hashTable; + BYTE* const tagTable = ms->tagTable; + U32* const hashCache = ms->hashCache; + const U32 hashLog = ms->rowHashLog; + const ZSTD_compressionParameters* const cParams = &ms->cParams; + const BYTE* const base = ms->window.base; + const BYTE* const dictBase = ms->window.dictBase; + const U32 dictLimit = ms->window.dictLimit; + const BYTE* const prefixStart = base + dictLimit; + const BYTE* const dictEnd = dictBase + dictLimit; + const U32 curr = (U32)(ip-base); + const U32 maxDistance = 1U << cParams->windowLog; + const U32 lowestValid = ms->window.lowLimit; + const U32 withinMaxDistance = (curr - lowestValid > maxDistance) ? curr - maxDistance : lowestValid; + const U32 isDictionary = (ms->loadedDictEnd != 0); + const U32 lowLimit = isDictionary ? lowestValid : withinMaxDistance; + const U32 rowEntries = (1U << rowLog); + const U32 rowMask = rowEntries - 1; + const U32 cappedSearchLog = MIN(cParams->searchLog, rowLog); /* nb of searches is capped at nb entries per row */ + const U32 groupWidth = ZSTD_row_matchMaskGroupWidth(rowEntries); + const U64 hashSalt = ms->hashSalt; + U32 nbAttempts = 1U << cappedSearchLog; + size_t ml=4-1; + U32 hash; + + /* DMS/DDS variables that may be referenced laster */ + const ZSTD_matchState_t* const dms = ms->dictMatchState; + + /* Initialize the following variables to satisfy static analyzer */ + size_t ddsIdx = 0; + U32 ddsExtraAttempts = 0; /* cctx hash tables are limited in searches, but allow extra searches into DDS */ + U32 dmsTag = 0; + U32* dmsRow = NULL; + BYTE* dmsTagRow = NULL; + + if (dictMode == ZSTD_dedicatedDictSearch) { + const U32 ddsHashLog = dms->cParams.hashLog - ZSTD_LAZY_DDSS_BUCKET_LOG; + { /* Prefetch DDS hashtable entry */ + ddsIdx = ZSTD_hashPtr(ip, ddsHashLog, mls) << ZSTD_LAZY_DDSS_BUCKET_LOG; + PREFETCH_L1(&dms->hashTable[ddsIdx]); + } + ddsExtraAttempts = cParams->searchLog > rowLog ? 1U << (cParams->searchLog - rowLog) : 0; + } + + if (dictMode == ZSTD_dictMatchState) { + /* Prefetch DMS rows */ + U32* const dmsHashTable = dms->hashTable; + BYTE* const dmsTagTable = dms->tagTable; + U32 const dmsHash = (U32)ZSTD_hashPtr(ip, dms->rowHashLog + ZSTD_ROW_HASH_TAG_BITS, mls); + U32 const dmsRelRow = (dmsHash >> ZSTD_ROW_HASH_TAG_BITS) << rowLog; + dmsTag = dmsHash & ZSTD_ROW_HASH_TAG_MASK; + dmsTagRow = (BYTE*)(dmsTagTable + dmsRelRow); + dmsRow = dmsHashTable + dmsRelRow; + ZSTD_row_prefetch(dmsHashTable, dmsTagTable, dmsRelRow, rowLog); + } + + /* Update the hashTable and tagTable up to (but not including) ip */ + if (!ms->lazySkipping) { + ZSTD_row_update_internal(ms, ip, mls, rowLog, rowMask, 1 /* useCache */); + hash = ZSTD_row_nextCachedHash(hashCache, hashTable, tagTable, base, curr, hashLog, rowLog, mls, hashSalt); + } else { + /* Stop inserting every position when in the lazy skipping mode. + * The hash cache is also not kept up to date in this mode. + */ + hash = (U32)ZSTD_hashPtrSalted(ip, hashLog + ZSTD_ROW_HASH_TAG_BITS, mls, hashSalt); + ms->nextToUpdate = curr; + } + ms->hashSaltEntropy += hash; /* collect salt entropy */ + + { /* Get the hash for ip, compute the appropriate row */ + U32 const relRow = (hash >> ZSTD_ROW_HASH_TAG_BITS) << rowLog; + U32 const tag = hash & ZSTD_ROW_HASH_TAG_MASK; + U32* const row = hashTable + relRow; + BYTE* tagRow = (BYTE*)(tagTable + relRow); + U32 const headGrouped = (*tagRow & rowMask) * groupWidth; + U32 matchBuffer[ZSTD_ROW_HASH_MAX_ENTRIES]; + size_t numMatches = 0; + size_t currMatch = 0; + ZSTD_VecMask matches = ZSTD_row_getMatchMask(tagRow, (BYTE)tag, headGrouped, rowEntries); + + /* Cycle through the matches and prefetch */ + for (; (matches > 0) && (nbAttempts > 0); matches &= (matches - 1)) { + U32 const matchPos = ((headGrouped + ZSTD_VecMask_next(matches)) / groupWidth) & rowMask; + U32 const matchIndex = row[matchPos]; + if(matchPos == 0) continue; + assert(numMatches < rowEntries); + if (matchIndex < lowLimit) + break; + if ((dictMode != ZSTD_extDict) || matchIndex >= dictLimit) { + PREFETCH_L1(base + matchIndex); + } else { + PREFETCH_L1(dictBase + matchIndex); + } + matchBuffer[numMatches++] = matchIndex; + --nbAttempts; + } + + /* Speed opt: insert current byte into hashtable too. This allows us to avoid one iteration of the loop + in ZSTD_row_update_internal() at the next search. */ + { + U32 const pos = ZSTD_row_nextIndex(tagRow, rowMask); + tagRow[pos] = (BYTE)tag; + row[pos] = ms->nextToUpdate++; + } + + /* Return the longest match */ + for (; currMatch < numMatches; ++currMatch) { + U32 const matchIndex = matchBuffer[currMatch]; + size_t currentMl=0; + assert(matchIndex < curr); + assert(matchIndex >= lowLimit); + + if ((dictMode != ZSTD_extDict) || matchIndex >= dictLimit) { + const BYTE* const match = base + matchIndex; + assert(matchIndex >= dictLimit); /* ensures this is true if dictMode != ZSTD_extDict */ + /* read 4B starting from (match + ml + 1 - sizeof(U32)) */ + if (MEM_read32(match + ml - 3) == MEM_read32(ip + ml - 3)) /* potentially better */ + currentMl = ZSTD_count(ip, match, iLimit); + } else { + const BYTE* const match = dictBase + matchIndex; + assert(match+4 <= dictEnd); + if (MEM_read32(match) == MEM_read32(ip)) /* assumption : matchIndex <= dictLimit-4 (by table construction) */ + currentMl = ZSTD_count_2segments(ip+4, match+4, iLimit, dictEnd, prefixStart) + 4; + } + + /* Save best solution */ + if (currentMl > ml) { + ml = currentMl; + *offsetPtr = OFFSET_TO_OFFBASE(curr - matchIndex); + if (ip+currentMl == iLimit) break; /* best possible, avoids read overflow on next attempt */ + } + } + } + + assert(nbAttempts <= (1U << ZSTD_SEARCHLOG_MAX)); /* Check we haven't underflowed. */ + if (dictMode == ZSTD_dedicatedDictSearch) { + ml = ZSTD_dedicatedDictSearch_lazy_search(offsetPtr, ml, nbAttempts + ddsExtraAttempts, dms, + ip, iLimit, prefixStart, curr, dictLimit, ddsIdx); + } else if (dictMode == ZSTD_dictMatchState) { + /* TODO: Measure and potentially add prefetching to DMS */ + const U32 dmsLowestIndex = dms->window.dictLimit; + const BYTE* const dmsBase = dms->window.base; + const BYTE* const dmsEnd = dms->window.nextSrc; + const U32 dmsSize = (U32)(dmsEnd - dmsBase); + const U32 dmsIndexDelta = dictLimit - dmsSize; + + { U32 const headGrouped = (*dmsTagRow & rowMask) * groupWidth; + U32 matchBuffer[ZSTD_ROW_HASH_MAX_ENTRIES]; + size_t numMatches = 0; + size_t currMatch = 0; + ZSTD_VecMask matches = ZSTD_row_getMatchMask(dmsTagRow, (BYTE)dmsTag, headGrouped, rowEntries); + + for (; (matches > 0) && (nbAttempts > 0); matches &= (matches - 1)) { + U32 const matchPos = ((headGrouped + ZSTD_VecMask_next(matches)) / groupWidth) & rowMask; + U32 const matchIndex = dmsRow[matchPos]; + if(matchPos == 0) continue; + if (matchIndex < dmsLowestIndex) + break; + PREFETCH_L1(dmsBase + matchIndex); + matchBuffer[numMatches++] = matchIndex; + --nbAttempts; + } + + /* Return the longest match */ + for (; currMatch < numMatches; ++currMatch) { + U32 const matchIndex = matchBuffer[currMatch]; + size_t currentMl=0; + assert(matchIndex >= dmsLowestIndex); + assert(matchIndex < curr); + + { const BYTE* const match = dmsBase + matchIndex; + assert(match+4 <= dmsEnd); + if (MEM_read32(match) == MEM_read32(ip)) + currentMl = ZSTD_count_2segments(ip+4, match+4, iLimit, dmsEnd, prefixStart) + 4; + } + + if (currentMl > ml) { + ml = currentMl; + assert(curr > matchIndex + dmsIndexDelta); + *offsetPtr = OFFSET_TO_OFFBASE(curr - (matchIndex + dmsIndexDelta)); + if (ip+currentMl == iLimit) break; + } + } + } + } + return ml; +} + + +/** + * Generate search functions templated on (dictMode, mls, rowLog). + * These functions are outlined for code size & compilation time. + * ZSTD_searchMax() dispatches to the correct implementation function. + * + * TODO: The start of the search function involves loading and calculating a + * bunch of constants from the ZSTD_matchState_t. These computations could be + * done in an initialization function, and saved somewhere in the match state. + * Then we could pass a pointer to the saved state instead of the match state, + * and avoid duplicate computations. + * + * TODO: Move the match re-winding into searchMax. This improves compression + * ratio, and unlocks further simplifications with the next TODO. + * + * TODO: Try moving the repcode search into searchMax. After the re-winding + * and repcode search are in searchMax, there is no more logic in the match + * finder loop that requires knowledge about the dictMode. So we should be + * able to avoid force inlining it, and we can join the extDict loop with + * the single segment loop. It should go in searchMax instead of its own + * function to avoid having multiple virtual function calls per search. + */ + +#define ZSTD_BT_SEARCH_FN(dictMode, mls) ZSTD_BtFindBestMatch_##dictMode##_##mls +#define ZSTD_HC_SEARCH_FN(dictMode, mls) ZSTD_HcFindBestMatch_##dictMode##_##mls +#define ZSTD_ROW_SEARCH_FN(dictMode, mls, rowLog) ZSTD_RowFindBestMatch_##dictMode##_##mls##_##rowLog + +#define ZSTD_SEARCH_FN_ATTRS FORCE_NOINLINE + +#define GEN_ZSTD_BT_SEARCH_FN(dictMode, mls) \ + ZSTD_SEARCH_FN_ATTRS size_t ZSTD_BT_SEARCH_FN(dictMode, mls)( \ + ZSTD_matchState_t* ms, \ + const BYTE* ip, const BYTE* const iLimit, \ + size_t* offBasePtr) \ + { \ + assert(MAX(4, MIN(6, ms->cParams.minMatch)) == mls); \ + return ZSTD_BtFindBestMatch(ms, ip, iLimit, offBasePtr, mls, ZSTD_##dictMode); \ + } \ + +#define GEN_ZSTD_HC_SEARCH_FN(dictMode, mls) \ + ZSTD_SEARCH_FN_ATTRS size_t ZSTD_HC_SEARCH_FN(dictMode, mls)( \ + ZSTD_matchState_t* ms, \ + const BYTE* ip, const BYTE* const iLimit, \ + size_t* offsetPtr) \ + { \ + assert(MAX(4, MIN(6, ms->cParams.minMatch)) == mls); \ + return ZSTD_HcFindBestMatch(ms, ip, iLimit, offsetPtr, mls, ZSTD_##dictMode); \ + } \ + +#define GEN_ZSTD_ROW_SEARCH_FN(dictMode, mls, rowLog) \ + ZSTD_SEARCH_FN_ATTRS size_t ZSTD_ROW_SEARCH_FN(dictMode, mls, rowLog)( \ + ZSTD_matchState_t* ms, \ + const BYTE* ip, const BYTE* const iLimit, \ + size_t* offsetPtr) \ + { \ + assert(MAX(4, MIN(6, ms->cParams.minMatch)) == mls); \ + assert(MAX(4, MIN(6, ms->cParams.searchLog)) == rowLog); \ + return ZSTD_RowFindBestMatch(ms, ip, iLimit, offsetPtr, mls, ZSTD_##dictMode, rowLog); \ + } \ + +#define ZSTD_FOR_EACH_ROWLOG(X, dictMode, mls) \ + X(dictMode, mls, 4) \ + X(dictMode, mls, 5) \ + X(dictMode, mls, 6) + +#define ZSTD_FOR_EACH_MLS_ROWLOG(X, dictMode) \ + ZSTD_FOR_EACH_ROWLOG(X, dictMode, 4) \ + ZSTD_FOR_EACH_ROWLOG(X, dictMode, 5) \ + ZSTD_FOR_EACH_ROWLOG(X, dictMode, 6) + +#define ZSTD_FOR_EACH_MLS(X, dictMode) \ + X(dictMode, 4) \ + X(dictMode, 5) \ + X(dictMode, 6) + +#define ZSTD_FOR_EACH_DICT_MODE(X, ...) \ + X(__VA_ARGS__, noDict) \ + X(__VA_ARGS__, extDict) \ + X(__VA_ARGS__, dictMatchState) \ + X(__VA_ARGS__, dedicatedDictSearch) + +/* Generate row search fns for each combination of (dictMode, mls, rowLog) */ +ZSTD_FOR_EACH_DICT_MODE(ZSTD_FOR_EACH_MLS_ROWLOG, GEN_ZSTD_ROW_SEARCH_FN) +/* Generate binary Tree search fns for each combination of (dictMode, mls) */ +ZSTD_FOR_EACH_DICT_MODE(ZSTD_FOR_EACH_MLS, GEN_ZSTD_BT_SEARCH_FN) +/* Generate hash chain search fns for each combination of (dictMode, mls) */ +ZSTD_FOR_EACH_DICT_MODE(ZSTD_FOR_EACH_MLS, GEN_ZSTD_HC_SEARCH_FN) + +typedef enum { search_hashChain=0, search_binaryTree=1, search_rowHash=2 } searchMethod_e; + +#define GEN_ZSTD_CALL_BT_SEARCH_FN(dictMode, mls) \ + case mls: \ + return ZSTD_BT_SEARCH_FN(dictMode, mls)(ms, ip, iend, offsetPtr); +#define GEN_ZSTD_CALL_HC_SEARCH_FN(dictMode, mls) \ + case mls: \ + return ZSTD_HC_SEARCH_FN(dictMode, mls)(ms, ip, iend, offsetPtr); +#define GEN_ZSTD_CALL_ROW_SEARCH_FN(dictMode, mls, rowLog) \ + case rowLog: \ + return ZSTD_ROW_SEARCH_FN(dictMode, mls, rowLog)(ms, ip, iend, offsetPtr); + +#define ZSTD_SWITCH_MLS(X, dictMode) \ + switch (mls) { \ + ZSTD_FOR_EACH_MLS(X, dictMode) \ + } + +#define ZSTD_SWITCH_ROWLOG(dictMode, mls) \ + case mls: \ + switch (rowLog) { \ + ZSTD_FOR_EACH_ROWLOG(GEN_ZSTD_CALL_ROW_SEARCH_FN, dictMode, mls) \ + } \ + ZSTD_UNREACHABLE; \ + break; + +#define ZSTD_SWITCH_SEARCH_METHOD(dictMode) \ + switch (searchMethod) { \ + case search_hashChain: \ + ZSTD_SWITCH_MLS(GEN_ZSTD_CALL_HC_SEARCH_FN, dictMode) \ + break; \ + case search_binaryTree: \ + ZSTD_SWITCH_MLS(GEN_ZSTD_CALL_BT_SEARCH_FN, dictMode) \ + break; \ + case search_rowHash: \ + ZSTD_SWITCH_MLS(ZSTD_SWITCH_ROWLOG, dictMode) \ + break; \ + } \ + ZSTD_UNREACHABLE; + +/** + * Searches for the longest match at @p ip. + * Dispatches to the correct implementation function based on the + * (searchMethod, dictMode, mls, rowLog). We use switch statements + * here instead of using an indirect function call through a function + * pointer because after Spectre and Meltdown mitigations, indirect + * function calls can be very costly, especially in the kernel. + * + * NOTE: dictMode and searchMethod should be templated, so those switch + * statements should be optimized out. Only the mls & rowLog switches + * should be left. + * + * @param ms The match state. + * @param ip The position to search at. + * @param iend The end of the input data. + * @param[out] offsetPtr Stores the match offset into this pointer. + * @param mls The minimum search length, in the range [4, 6]. + * @param rowLog The row log (if applicable), in the range [4, 6]. + * @param searchMethod The search method to use (templated). + * @param dictMode The dictMode (templated). + * + * @returns The length of the longest match found, or < mls if no match is found. + * If a match is found its offset is stored in @p offsetPtr. + */ +FORCE_INLINE_TEMPLATE size_t ZSTD_searchMax( + ZSTD_matchState_t* ms, + const BYTE* ip, + const BYTE* iend, + size_t* offsetPtr, + U32 const mls, + U32 const rowLog, + searchMethod_e const searchMethod, + ZSTD_dictMode_e const dictMode) +{ + if (dictMode == ZSTD_noDict) { + ZSTD_SWITCH_SEARCH_METHOD(noDict) + } else if (dictMode == ZSTD_extDict) { + ZSTD_SWITCH_SEARCH_METHOD(extDict) + } else if (dictMode == ZSTD_dictMatchState) { + ZSTD_SWITCH_SEARCH_METHOD(dictMatchState) + } else if (dictMode == ZSTD_dedicatedDictSearch) { + ZSTD_SWITCH_SEARCH_METHOD(dedicatedDictSearch) + } + ZSTD_UNREACHABLE; + return 0; +} + +/* ******************************* +* Common parser - lazy strategy +*********************************/ + +FORCE_INLINE_TEMPLATE +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +size_t ZSTD_compressBlock_lazy_generic( + ZSTD_matchState_t* ms, seqStore_t* seqStore, + U32 rep[ZSTD_REP_NUM], + const void* src, size_t srcSize, + const searchMethod_e searchMethod, const U32 depth, + ZSTD_dictMode_e const dictMode) +{ + const BYTE* const istart = (const BYTE*)src; + const BYTE* ip = istart; + const BYTE* anchor = istart; + const BYTE* const iend = istart + srcSize; + const BYTE* const ilimit = (searchMethod == search_rowHash) ? iend - 8 - ZSTD_ROW_HASH_CACHE_SIZE : iend - 8; + const BYTE* const base = ms->window.base; + const U32 prefixLowestIndex = ms->window.dictLimit; + const BYTE* const prefixLowest = base + prefixLowestIndex; + const U32 mls = BOUNDED(4, ms->cParams.minMatch, 6); + const U32 rowLog = BOUNDED(4, ms->cParams.searchLog, 6); + + U32 offset_1 = rep[0], offset_2 = rep[1]; + U32 offsetSaved1 = 0, offsetSaved2 = 0; + + const int isDMS = dictMode == ZSTD_dictMatchState; + const int isDDS = dictMode == ZSTD_dedicatedDictSearch; + const int isDxS = isDMS || isDDS; + const ZSTD_matchState_t* const dms = ms->dictMatchState; + const U32 dictLowestIndex = isDxS ? dms->window.dictLimit : 0; + const BYTE* const dictBase = isDxS ? dms->window.base : NULL; + const BYTE* const dictLowest = isDxS ? dictBase + dictLowestIndex : NULL; + const BYTE* const dictEnd = isDxS ? dms->window.nextSrc : NULL; + const U32 dictIndexDelta = isDxS ? + prefixLowestIndex - (U32)(dictEnd - dictBase) : + 0; + const U32 dictAndPrefixLength = (U32)((ip - prefixLowest) + (dictEnd - dictLowest)); + + DEBUGLOG(5, "ZSTD_compressBlock_lazy_generic (dictMode=%u) (searchFunc=%u)", (U32)dictMode, (U32)searchMethod); + ip += (dictAndPrefixLength == 0); + if (dictMode == ZSTD_noDict) { + U32 const curr = (U32)(ip - base); + U32 const windowLow = ZSTD_getLowestPrefixIndex(ms, curr, ms->cParams.windowLog); + U32 const maxRep = curr - windowLow; + if (offset_2 > maxRep) offsetSaved2 = offset_2, offset_2 = 0; + if (offset_1 > maxRep) offsetSaved1 = offset_1, offset_1 = 0; + } + if (isDxS) { + /* dictMatchState repCode checks don't currently handle repCode == 0 + * disabling. */ + assert(offset_1 <= dictAndPrefixLength); + assert(offset_2 <= dictAndPrefixLength); + } + + /* Reset the lazy skipping state */ + ms->lazySkipping = 0; + + if (searchMethod == search_rowHash) { + ZSTD_row_fillHashCache(ms, base, rowLog, mls, ms->nextToUpdate, ilimit); + } + + /* Match Loop */ +#if defined(__GNUC__) && defined(__x86_64__) + /* I've measured random a 5% speed loss on levels 5 & 6 (greedy) when the + * code alignment is perturbed. To fix the instability align the loop on 32-bytes. + */ + __asm__(".p2align 5"); +#endif + while (ip < ilimit) { + size_t matchLength=0; + size_t offBase = REPCODE1_TO_OFFBASE; + const BYTE* start=ip+1; + DEBUGLOG(7, "search baseline (depth 0)"); + + /* check repCode */ + if (isDxS) { + const U32 repIndex = (U32)(ip - base) + 1 - offset_1; + const BYTE* repMatch = ((dictMode == ZSTD_dictMatchState || dictMode == ZSTD_dedicatedDictSearch) + && repIndex < prefixLowestIndex) ? + dictBase + (repIndex - dictIndexDelta) : + base + repIndex; + if (((U32)((prefixLowestIndex-1) - repIndex) >= 3 /* intentional underflow */) + && (MEM_read32(repMatch) == MEM_read32(ip+1)) ) { + const BYTE* repMatchEnd = repIndex < prefixLowestIndex ? dictEnd : iend; + matchLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repMatchEnd, prefixLowest) + 4; + if (depth==0) goto _storeSequence; + } + } + if ( dictMode == ZSTD_noDict + && ((offset_1 > 0) & (MEM_read32(ip+1-offset_1) == MEM_read32(ip+1)))) { + matchLength = ZSTD_count(ip+1+4, ip+1+4-offset_1, iend) + 4; + if (depth==0) goto _storeSequence; + } + + /* first search (depth 0) */ + { size_t offbaseFound = 999999999; + size_t const ml2 = ZSTD_searchMax(ms, ip, iend, &offbaseFound, mls, rowLog, searchMethod, dictMode); + if (ml2 > matchLength) + matchLength = ml2, start = ip, offBase = offbaseFound; + } + + if (matchLength < 4) { + size_t const step = ((size_t)(ip-anchor) >> kSearchStrength) + 1; /* jump faster over incompressible sections */; + ip += step; + /* Enter the lazy skipping mode once we are skipping more than 8 bytes at a time. + * In this mode we stop inserting every position into our tables, and only insert + * positions that we search, which is one in step positions. + * The exact cutoff is flexible, I've just chosen a number that is reasonably high, + * so we minimize the compression ratio loss in "normal" scenarios. This mode gets + * triggered once we've gone 2KB without finding any matches. + */ + ms->lazySkipping = step > kLazySkippingStep; + continue; + } + + /* let's try to find a better solution */ + if (depth>=1) + while (ip0) & (MEM_read32(ip) == MEM_read32(ip - offset_1)))) { + size_t const mlRep = ZSTD_count(ip+4, ip+4-offset_1, iend) + 4; + int const gain2 = (int)(mlRep * 3); + int const gain1 = (int)(matchLength*3 - ZSTD_highbit32((U32)offBase) + 1); + if ((mlRep >= 4) && (gain2 > gain1)) + matchLength = mlRep, offBase = REPCODE1_TO_OFFBASE, start = ip; + } + if (isDxS) { + const U32 repIndex = (U32)(ip - base) - offset_1; + const BYTE* repMatch = repIndex < prefixLowestIndex ? + dictBase + (repIndex - dictIndexDelta) : + base + repIndex; + if (((U32)((prefixLowestIndex-1) - repIndex) >= 3 /* intentional underflow */) + && (MEM_read32(repMatch) == MEM_read32(ip)) ) { + const BYTE* repMatchEnd = repIndex < prefixLowestIndex ? dictEnd : iend; + size_t const mlRep = ZSTD_count_2segments(ip+4, repMatch+4, iend, repMatchEnd, prefixLowest) + 4; + int const gain2 = (int)(mlRep * 3); + int const gain1 = (int)(matchLength*3 - ZSTD_highbit32((U32)offBase) + 1); + if ((mlRep >= 4) && (gain2 > gain1)) + matchLength = mlRep, offBase = REPCODE1_TO_OFFBASE, start = ip; + } + } + { size_t ofbCandidate=999999999; + size_t const ml2 = ZSTD_searchMax(ms, ip, iend, &ofbCandidate, mls, rowLog, searchMethod, dictMode); + int const gain2 = (int)(ml2*4 - ZSTD_highbit32((U32)ofbCandidate)); /* raw approx */ + int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offBase) + 4); + if ((ml2 >= 4) && (gain2 > gain1)) { + matchLength = ml2, offBase = ofbCandidate, start = ip; + continue; /* search a better one */ + } } + + /* let's find an even better one */ + if ((depth==2) && (ip0) & (MEM_read32(ip) == MEM_read32(ip - offset_1)))) { + size_t const mlRep = ZSTD_count(ip+4, ip+4-offset_1, iend) + 4; + int const gain2 = (int)(mlRep * 4); + int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offBase) + 1); + if ((mlRep >= 4) && (gain2 > gain1)) + matchLength = mlRep, offBase = REPCODE1_TO_OFFBASE, start = ip; + } + if (isDxS) { + const U32 repIndex = (U32)(ip - base) - offset_1; + const BYTE* repMatch = repIndex < prefixLowestIndex ? + dictBase + (repIndex - dictIndexDelta) : + base + repIndex; + if (((U32)((prefixLowestIndex-1) - repIndex) >= 3 /* intentional underflow */) + && (MEM_read32(repMatch) == MEM_read32(ip)) ) { + const BYTE* repMatchEnd = repIndex < prefixLowestIndex ? dictEnd : iend; + size_t const mlRep = ZSTD_count_2segments(ip+4, repMatch+4, iend, repMatchEnd, prefixLowest) + 4; + int const gain2 = (int)(mlRep * 4); + int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offBase) + 1); + if ((mlRep >= 4) && (gain2 > gain1)) + matchLength = mlRep, offBase = REPCODE1_TO_OFFBASE, start = ip; + } + } + { size_t ofbCandidate=999999999; + size_t const ml2 = ZSTD_searchMax(ms, ip, iend, &ofbCandidate, mls, rowLog, searchMethod, dictMode); + int const gain2 = (int)(ml2*4 - ZSTD_highbit32((U32)ofbCandidate)); /* raw approx */ + int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offBase) + 7); + if ((ml2 >= 4) && (gain2 > gain1)) { + matchLength = ml2, offBase = ofbCandidate, start = ip; + continue; + } } } + break; /* nothing found : store previous solution */ + } + + /* NOTE: + * Pay attention that `start[-value]` can lead to strange undefined behavior + * notably if `value` is unsigned, resulting in a large positive `-value`. + */ + /* catch up */ + if (OFFBASE_IS_OFFSET(offBase)) { + if (dictMode == ZSTD_noDict) { + while ( ((start > anchor) & (start - OFFBASE_TO_OFFSET(offBase) > prefixLowest)) + && (start[-1] == (start-OFFBASE_TO_OFFSET(offBase))[-1]) ) /* only search for offset within prefix */ + { start--; matchLength++; } + } + if (isDxS) { + U32 const matchIndex = (U32)((size_t)(start-base) - OFFBASE_TO_OFFSET(offBase)); + const BYTE* match = (matchIndex < prefixLowestIndex) ? dictBase + matchIndex - dictIndexDelta : base + matchIndex; + const BYTE* const mStart = (matchIndex < prefixLowestIndex) ? dictLowest : prefixLowest; + while ((start>anchor) && (match>mStart) && (start[-1] == match[-1])) { start--; match--; matchLength++; } /* catch up */ + } + offset_2 = offset_1; offset_1 = (U32)OFFBASE_TO_OFFSET(offBase); + } + /* store sequence */ +_storeSequence: + { size_t const litLength = (size_t)(start - anchor); + ZSTD_storeSeq(seqStore, litLength, anchor, iend, (U32)offBase, matchLength); + anchor = ip = start + matchLength; + } + if (ms->lazySkipping) { + /* We've found a match, disable lazy skipping mode, and refill the hash cache. */ + if (searchMethod == search_rowHash) { + ZSTD_row_fillHashCache(ms, base, rowLog, mls, ms->nextToUpdate, ilimit); + } + ms->lazySkipping = 0; + } + + /* check immediate repcode */ + if (isDxS) { + while (ip <= ilimit) { + U32 const current2 = (U32)(ip-base); + U32 const repIndex = current2 - offset_2; + const BYTE* repMatch = repIndex < prefixLowestIndex ? + dictBase - dictIndexDelta + repIndex : + base + repIndex; + if ( ((U32)((prefixLowestIndex-1) - (U32)repIndex) >= 3 /* intentional overflow */) + && (MEM_read32(repMatch) == MEM_read32(ip)) ) { + const BYTE* const repEnd2 = repIndex < prefixLowestIndex ? dictEnd : iend; + matchLength = ZSTD_count_2segments(ip+4, repMatch+4, iend, repEnd2, prefixLowest) + 4; + offBase = offset_2; offset_2 = offset_1; offset_1 = (U32)offBase; /* swap offset_2 <=> offset_1 */ + ZSTD_storeSeq(seqStore, 0, anchor, iend, REPCODE1_TO_OFFBASE, matchLength); + ip += matchLength; + anchor = ip; + continue; + } + break; + } + } + + if (dictMode == ZSTD_noDict) { + while ( ((ip <= ilimit) & (offset_2>0)) + && (MEM_read32(ip) == MEM_read32(ip - offset_2)) ) { + /* store sequence */ + matchLength = ZSTD_count(ip+4, ip+4-offset_2, iend) + 4; + offBase = offset_2; offset_2 = offset_1; offset_1 = (U32)offBase; /* swap repcodes */ + ZSTD_storeSeq(seqStore, 0, anchor, iend, REPCODE1_TO_OFFBASE, matchLength); + ip += matchLength; + anchor = ip; + continue; /* faster when present ... (?) */ + } } } + + /* If offset_1 started invalid (offsetSaved1 != 0) and became valid (offset_1 != 0), + * rotate saved offsets. See comment in ZSTD_compressBlock_fast_noDict for more context. */ + offsetSaved2 = ((offsetSaved1 != 0) && (offset_1 != 0)) ? offsetSaved1 : offsetSaved2; + + /* save reps for next block */ + rep[0] = offset_1 ? offset_1 : offsetSaved1; + rep[1] = offset_2 ? offset_2 : offsetSaved2; + + /* Return the last literals size */ + return (size_t)(iend - anchor); +} +#endif /* build exclusions */ + + +#ifndef ZSTD_EXCLUDE_GREEDY_BLOCK_COMPRESSOR +size_t ZSTD_compressBlock_greedy( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 0, ZSTD_noDict); +} + +size_t ZSTD_compressBlock_greedy_dictMatchState( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 0, ZSTD_dictMatchState); +} + +size_t ZSTD_compressBlock_greedy_dedicatedDictSearch( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 0, ZSTD_dedicatedDictSearch); +} + +size_t ZSTD_compressBlock_greedy_row( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_rowHash, 0, ZSTD_noDict); +} + +size_t ZSTD_compressBlock_greedy_dictMatchState_row( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_rowHash, 0, ZSTD_dictMatchState); +} + +size_t ZSTD_compressBlock_greedy_dedicatedDictSearch_row( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_rowHash, 0, ZSTD_dedicatedDictSearch); +} +#endif + +#ifndef ZSTD_EXCLUDE_LAZY_BLOCK_COMPRESSOR +size_t ZSTD_compressBlock_lazy( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 1, ZSTD_noDict); +} + +size_t ZSTD_compressBlock_lazy_dictMatchState( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 1, ZSTD_dictMatchState); +} + +size_t ZSTD_compressBlock_lazy_dedicatedDictSearch( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 1, ZSTD_dedicatedDictSearch); +} + +size_t ZSTD_compressBlock_lazy_row( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_rowHash, 1, ZSTD_noDict); +} + +size_t ZSTD_compressBlock_lazy_dictMatchState_row( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_rowHash, 1, ZSTD_dictMatchState); +} + +size_t ZSTD_compressBlock_lazy_dedicatedDictSearch_row( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_rowHash, 1, ZSTD_dedicatedDictSearch); +} +#endif + +#ifndef ZSTD_EXCLUDE_LAZY2_BLOCK_COMPRESSOR +size_t ZSTD_compressBlock_lazy2( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 2, ZSTD_noDict); +} + +size_t ZSTD_compressBlock_lazy2_dictMatchState( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 2, ZSTD_dictMatchState); +} + +size_t ZSTD_compressBlock_lazy2_dedicatedDictSearch( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 2, ZSTD_dedicatedDictSearch); +} + +size_t ZSTD_compressBlock_lazy2_row( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_rowHash, 2, ZSTD_noDict); +} + +size_t ZSTD_compressBlock_lazy2_dictMatchState_row( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_rowHash, 2, ZSTD_dictMatchState); +} + +size_t ZSTD_compressBlock_lazy2_dedicatedDictSearch_row( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_rowHash, 2, ZSTD_dedicatedDictSearch); +} +#endif + +#ifndef ZSTD_EXCLUDE_BTLAZY2_BLOCK_COMPRESSOR +size_t ZSTD_compressBlock_btlazy2( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_binaryTree, 2, ZSTD_noDict); +} + +size_t ZSTD_compressBlock_btlazy2_dictMatchState( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + return ZSTD_compressBlock_lazy_generic(ms, seqStore, rep, src, srcSize, search_binaryTree, 2, ZSTD_dictMatchState); +} +#endif + +#if !defined(ZSTD_EXCLUDE_GREEDY_BLOCK_COMPRESSOR) \ + || !defined(ZSTD_EXCLUDE_LAZY_BLOCK_COMPRESSOR) \ + || !defined(ZSTD_EXCLUDE_LAZY2_BLOCK_COMPRESSOR) \ + || !defined(ZSTD_EXCLUDE_BTLAZY2_BLOCK_COMPRESSOR) +FORCE_INLINE_TEMPLATE +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +size_t ZSTD_compressBlock_lazy_extDict_generic( + ZSTD_matchState_t* ms, seqStore_t* seqStore, + U32 rep[ZSTD_REP_NUM], + const void* src, size_t srcSize, + const searchMethod_e searchMethod, const U32 depth) +{ + const BYTE* const istart = (const BYTE*)src; + const BYTE* ip = istart; + const BYTE* anchor = istart; + const BYTE* const iend = istart + srcSize; + const BYTE* const ilimit = searchMethod == search_rowHash ? iend - 8 - ZSTD_ROW_HASH_CACHE_SIZE : iend - 8; + const BYTE* const base = ms->window.base; + const U32 dictLimit = ms->window.dictLimit; + const BYTE* const prefixStart = base + dictLimit; + const BYTE* const dictBase = ms->window.dictBase; + const BYTE* const dictEnd = dictBase + dictLimit; + const BYTE* const dictStart = dictBase + ms->window.lowLimit; + const U32 windowLog = ms->cParams.windowLog; + const U32 mls = BOUNDED(4, ms->cParams.minMatch, 6); + const U32 rowLog = BOUNDED(4, ms->cParams.searchLog, 6); + + U32 offset_1 = rep[0], offset_2 = rep[1]; + + DEBUGLOG(5, "ZSTD_compressBlock_lazy_extDict_generic (searchFunc=%u)", (U32)searchMethod); + + /* Reset the lazy skipping state */ + ms->lazySkipping = 0; + + /* init */ + ip += (ip == prefixStart); + if (searchMethod == search_rowHash) { + ZSTD_row_fillHashCache(ms, base, rowLog, mls, ms->nextToUpdate, ilimit); + } + + /* Match Loop */ +#if defined(__GNUC__) && defined(__x86_64__) + /* I've measured random a 5% speed loss on levels 5 & 6 (greedy) when the + * code alignment is perturbed. To fix the instability align the loop on 32-bytes. + */ + __asm__(".p2align 5"); +#endif + while (ip < ilimit) { + size_t matchLength=0; + size_t offBase = REPCODE1_TO_OFFBASE; + const BYTE* start=ip+1; + U32 curr = (U32)(ip-base); + + /* check repCode */ + { const U32 windowLow = ZSTD_getLowestMatchIndex(ms, curr+1, windowLog); + const U32 repIndex = (U32)(curr+1 - offset_1); + const BYTE* const repBase = repIndex < dictLimit ? dictBase : base; + const BYTE* const repMatch = repBase + repIndex; + if ( ((U32)((dictLimit-1) - repIndex) >= 3) /* intentional overflow */ + & (offset_1 <= curr+1 - windowLow) ) /* note: we are searching at curr+1 */ + if (MEM_read32(ip+1) == MEM_read32(repMatch)) { + /* repcode detected we should take it */ + const BYTE* const repEnd = repIndex < dictLimit ? dictEnd : iend; + matchLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repEnd, prefixStart) + 4; + if (depth==0) goto _storeSequence; + } } + + /* first search (depth 0) */ + { size_t ofbCandidate = 999999999; + size_t const ml2 = ZSTD_searchMax(ms, ip, iend, &ofbCandidate, mls, rowLog, searchMethod, ZSTD_extDict); + if (ml2 > matchLength) + matchLength = ml2, start = ip, offBase = ofbCandidate; + } + + if (matchLength < 4) { + size_t const step = ((size_t)(ip-anchor) >> kSearchStrength); + ip += step + 1; /* jump faster over incompressible sections */ + /* Enter the lazy skipping mode once we are skipping more than 8 bytes at a time. + * In this mode we stop inserting every position into our tables, and only insert + * positions that we search, which is one in step positions. + * The exact cutoff is flexible, I've just chosen a number that is reasonably high, + * so we minimize the compression ratio loss in "normal" scenarios. This mode gets + * triggered once we've gone 2KB without finding any matches. + */ + ms->lazySkipping = step > kLazySkippingStep; + continue; + } + + /* let's try to find a better solution */ + if (depth>=1) + while (ip= 3) /* intentional overflow : do not test positions overlapping 2 memory segments */ + & (offset_1 <= curr - windowLow) ) /* equivalent to `curr > repIndex >= windowLow` */ + if (MEM_read32(ip) == MEM_read32(repMatch)) { + /* repcode detected */ + const BYTE* const repEnd = repIndex < dictLimit ? dictEnd : iend; + size_t const repLength = ZSTD_count_2segments(ip+4, repMatch+4, iend, repEnd, prefixStart) + 4; + int const gain2 = (int)(repLength * 3); + int const gain1 = (int)(matchLength*3 - ZSTD_highbit32((U32)offBase) + 1); + if ((repLength >= 4) && (gain2 > gain1)) + matchLength = repLength, offBase = REPCODE1_TO_OFFBASE, start = ip; + } } + + /* search match, depth 1 */ + { size_t ofbCandidate = 999999999; + size_t const ml2 = ZSTD_searchMax(ms, ip, iend, &ofbCandidate, mls, rowLog, searchMethod, ZSTD_extDict); + int const gain2 = (int)(ml2*4 - ZSTD_highbit32((U32)ofbCandidate)); /* raw approx */ + int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offBase) + 4); + if ((ml2 >= 4) && (gain2 > gain1)) { + matchLength = ml2, offBase = ofbCandidate, start = ip; + continue; /* search a better one */ + } } + + /* let's find an even better one */ + if ((depth==2) && (ip= 3) /* intentional overflow : do not test positions overlapping 2 memory segments */ + & (offset_1 <= curr - windowLow) ) /* equivalent to `curr > repIndex >= windowLow` */ + if (MEM_read32(ip) == MEM_read32(repMatch)) { + /* repcode detected */ + const BYTE* const repEnd = repIndex < dictLimit ? dictEnd : iend; + size_t const repLength = ZSTD_count_2segments(ip+4, repMatch+4, iend, repEnd, prefixStart) + 4; + int const gain2 = (int)(repLength * 4); + int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offBase) + 1); + if ((repLength >= 4) && (gain2 > gain1)) + matchLength = repLength, offBase = REPCODE1_TO_OFFBASE, start = ip; + } } + + /* search match, depth 2 */ + { size_t ofbCandidate = 999999999; + size_t const ml2 = ZSTD_searchMax(ms, ip, iend, &ofbCandidate, mls, rowLog, searchMethod, ZSTD_extDict); + int const gain2 = (int)(ml2*4 - ZSTD_highbit32((U32)ofbCandidate)); /* raw approx */ + int const gain1 = (int)(matchLength*4 - ZSTD_highbit32((U32)offBase) + 7); + if ((ml2 >= 4) && (gain2 > gain1)) { + matchLength = ml2, offBase = ofbCandidate, start = ip; + continue; + } } } + break; /* nothing found : store previous solution */ + } + + /* catch up */ + if (OFFBASE_IS_OFFSET(offBase)) { + U32 const matchIndex = (U32)((size_t)(start-base) - OFFBASE_TO_OFFSET(offBase)); + const BYTE* match = (matchIndex < dictLimit) ? dictBase + matchIndex : base + matchIndex; + const BYTE* const mStart = (matchIndex < dictLimit) ? dictStart : prefixStart; + while ((start>anchor) && (match>mStart) && (start[-1] == match[-1])) { start--; match--; matchLength++; } /* catch up */ + offset_2 = offset_1; offset_1 = (U32)OFFBASE_TO_OFFSET(offBase); + } + + /* store sequence */ +_storeSequence: + { size_t const litLength = (size_t)(start - anchor); + ZSTD_storeSeq(seqStore, litLength, anchor, iend, (U32)offBase, matchLength); + anchor = ip = start + matchLength; + } + if (ms->lazySkipping) { + /* We've found a match, disable lazy skipping mode, and refill the hash cache. */ + if (searchMethod == search_rowHash) { + ZSTD_row_fillHashCache(ms, base, rowLog, mls, ms->nextToUpdate, ilimit); + } + ms->lazySkipping = 0; + } + + /* check immediate repcode */ + while (ip <= ilimit) { + const U32 repCurrent = (U32)(ip-base); + const U32 windowLow = ZSTD_getLowestMatchIndex(ms, repCurrent, windowLog); + const U32 repIndex = repCurrent - offset_2; + const BYTE* const repBase = repIndex < dictLimit ? dictBase : base; + const BYTE* const repMatch = repBase + repIndex; + if ( ((U32)((dictLimit-1) - repIndex) >= 3) /* intentional overflow : do not test positions overlapping 2 memory segments */ + & (offset_2 <= repCurrent - windowLow) ) /* equivalent to `curr > repIndex >= windowLow` */ + if (MEM_read32(ip) == MEM_read32(repMatch)) { + /* repcode detected we should take it */ + const BYTE* const repEnd = repIndex < dictLimit ? dictEnd : iend; + matchLength = ZSTD_count_2segments(ip+4, repMatch+4, iend, repEnd, prefixStart) + 4; + offBase = offset_2; offset_2 = offset_1; offset_1 = (U32)offBase; /* swap offset history */ + ZSTD_storeSeq(seqStore, 0, anchor, iend, REPCODE1_TO_OFFBASE, matchLength); + ip += matchLength; + anchor = ip; + continue; /* faster when present ... (?) */ + } + break; + } } + + /* Save reps for next block */ + rep[0] = offset_1; + rep[1] = offset_2; + + /* Return the last literals size */ + return (size_t)(iend - anchor); +} +#endif /* build exclusions */ + +#ifndef ZSTD_EXCLUDE_GREEDY_BLOCK_COMPRESSOR +size_t ZSTD_compressBlock_greedy_extDict( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + return ZSTD_compressBlock_lazy_extDict_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 0); +} + +size_t ZSTD_compressBlock_greedy_extDict_row( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + return ZSTD_compressBlock_lazy_extDict_generic(ms, seqStore, rep, src, srcSize, search_rowHash, 0); +} +#endif + +#ifndef ZSTD_EXCLUDE_LAZY_BLOCK_COMPRESSOR +size_t ZSTD_compressBlock_lazy_extDict( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) + +{ + return ZSTD_compressBlock_lazy_extDict_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 1); +} + +size_t ZSTD_compressBlock_lazy_extDict_row( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) + +{ + return ZSTD_compressBlock_lazy_extDict_generic(ms, seqStore, rep, src, srcSize, search_rowHash, 1); +} +#endif + +#ifndef ZSTD_EXCLUDE_LAZY2_BLOCK_COMPRESSOR +size_t ZSTD_compressBlock_lazy2_extDict( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) + +{ + return ZSTD_compressBlock_lazy_extDict_generic(ms, seqStore, rep, src, srcSize, search_hashChain, 2); +} + +size_t ZSTD_compressBlock_lazy2_extDict_row( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) +{ + return ZSTD_compressBlock_lazy_extDict_generic(ms, seqStore, rep, src, srcSize, search_rowHash, 2); +} +#endif + +#ifndef ZSTD_EXCLUDE_BTLAZY2_BLOCK_COMPRESSOR +size_t ZSTD_compressBlock_btlazy2_extDict( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + void const* src, size_t srcSize) + +{ + return ZSTD_compressBlock_lazy_extDict_generic(ms, seqStore, rep, src, srcSize, search_binaryTree, 2); +} +#endif +/**** ended inlining compress/zstd_lazy.c ****/ +/**** start inlining compress/zstd_ldm.c ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +/**** skipping file: zstd_ldm.h ****/ + +/**** skipping file: ../common/debug.h ****/ +/**** skipping file: ../common/xxhash.h ****/ +/**** skipping file: zstd_fast.h ****/ +/**** skipping file: zstd_double_fast.h ****/ +/**** start inlining zstd_ldm_geartab.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +#ifndef ZSTD_LDM_GEARTAB_H +#define ZSTD_LDM_GEARTAB_H + +/**** skipping file: ../common/compiler.h ****/ +/**** skipping file: ../common/mem.h ****/ + +static UNUSED_ATTR const U64 ZSTD_ldm_gearTab[256] = { + 0xf5b8f72c5f77775c, 0x84935f266b7ac412, 0xb647ada9ca730ccc, + 0xb065bb4b114fb1de, 0x34584e7e8c3a9fd0, 0x4e97e17c6ae26b05, + 0x3a03d743bc99a604, 0xcecd042422c4044f, 0x76de76c58524259e, + 0x9c8528f65badeaca, 0x86563706e2097529, 0x2902475fa375d889, + 0xafb32a9739a5ebe6, 0xce2714da3883e639, 0x21eaf821722e69e, + 0x37b628620b628, 0x49a8d455d88caf5, 0x8556d711e6958140, + 0x4f7ae74fc605c1f, 0x829f0c3468bd3a20, 0x4ffdc885c625179e, + 0x8473de048a3daf1b, 0x51008822b05646b2, 0x69d75d12b2d1cc5f, + 0x8c9d4a19159154bc, 0xc3cc10f4abbd4003, 0xd06ddc1cecb97391, + 0xbe48e6e7ed80302e, 0x3481db31cee03547, 0xacc3f67cdaa1d210, + 0x65cb771d8c7f96cc, 0x8eb27177055723dd, 0xc789950d44cd94be, + 0x934feadc3700b12b, 0x5e485f11edbdf182, 0x1e2e2a46fd64767a, + 0x2969ca71d82efa7c, 0x9d46e9935ebbba2e, 0xe056b67e05e6822b, + 0x94d73f55739d03a0, 0xcd7010bdb69b5a03, 0x455ef9fcd79b82f4, + 0x869cb54a8749c161, 0x38d1a4fa6185d225, 0xb475166f94bbe9bb, + 0xa4143548720959f1, 0x7aed4780ba6b26ba, 0xd0ce264439e02312, + 0x84366d746078d508, 0xa8ce973c72ed17be, 0x21c323a29a430b01, + 0x9962d617e3af80ee, 0xab0ce91d9c8cf75b, 0x530e8ee6d19a4dbc, + 0x2ef68c0cf53f5d72, 0xc03a681640a85506, 0x496e4e9f9c310967, + 0x78580472b59b14a0, 0x273824c23b388577, 0x66bf923ad45cb553, + 0x47ae1a5a2492ba86, 0x35e304569e229659, 0x4765182a46870b6f, + 0x6cbab625e9099412, 0xddac9a2e598522c1, 0x7172086e666624f2, + 0xdf5003ca503b7837, 0x88c0c1db78563d09, 0x58d51865acfc289d, + 0x177671aec65224f1, 0xfb79d8a241e967d7, 0x2be1e101cad9a49a, + 0x6625682f6e29186b, 0x399553457ac06e50, 0x35dffb4c23abb74, + 0x429db2591f54aade, 0xc52802a8037d1009, 0x6acb27381f0b25f3, + 0xf45e2551ee4f823b, 0x8b0ea2d99580c2f7, 0x3bed519cbcb4e1e1, + 0xff452823dbb010a, 0x9d42ed614f3dd267, 0x5b9313c06257c57b, + 0xa114b8008b5e1442, 0xc1fe311c11c13d4b, 0x66e8763ea34c5568, + 0x8b982af1c262f05d, 0xee8876faaa75fbb7, 0x8a62a4d0d172bb2a, + 0xc13d94a3b7449a97, 0x6dbbba9dc15d037c, 0xc786101f1d92e0f1, + 0xd78681a907a0b79b, 0xf61aaf2962c9abb9, 0x2cfd16fcd3cb7ad9, + 0x868c5b6744624d21, 0x25e650899c74ddd7, 0xba042af4a7c37463, + 0x4eb1a539465a3eca, 0xbe09dbf03b05d5ca, 0x774e5a362b5472ba, + 0x47a1221229d183cd, 0x504b0ca18ef5a2df, 0xdffbdfbde2456eb9, + 0x46cd2b2fbee34634, 0xf2aef8fe819d98c3, 0x357f5276d4599d61, + 0x24a5483879c453e3, 0x88026889192b4b9, 0x28da96671782dbec, + 0x4ef37c40588e9aaa, 0x8837b90651bc9fb3, 0xc164f741d3f0e5d6, + 0xbc135a0a704b70ba, 0x69cd868f7622ada, 0xbc37ba89e0b9c0ab, + 0x47c14a01323552f6, 0x4f00794bacee98bb, 0x7107de7d637a69d5, + 0x88af793bb6f2255e, 0xf3c6466b8799b598, 0xc288c616aa7f3b59, + 0x81ca63cf42fca3fd, 0x88d85ace36a2674b, 0xd056bd3792389e7, + 0xe55c396c4e9dd32d, 0xbefb504571e6c0a6, 0x96ab32115e91e8cc, + 0xbf8acb18de8f38d1, 0x66dae58801672606, 0x833b6017872317fb, + 0xb87c16f2d1c92864, 0xdb766a74e58b669c, 0x89659f85c61417be, + 0xc8daad856011ea0c, 0x76a4b565b6fe7eae, 0xa469d085f6237312, + 0xaaf0365683a3e96c, 0x4dbb746f8424f7b8, 0x638755af4e4acc1, + 0x3d7807f5bde64486, 0x17be6d8f5bbb7639, 0x903f0cd44dc35dc, + 0x67b672eafdf1196c, 0xa676ff93ed4c82f1, 0x521d1004c5053d9d, + 0x37ba9ad09ccc9202, 0x84e54d297aacfb51, 0xa0b4b776a143445, + 0x820d471e20b348e, 0x1874383cb83d46dc, 0x97edeec7a1efe11c, + 0xb330e50b1bdc42aa, 0x1dd91955ce70e032, 0xa514cdb88f2939d5, + 0x2791233fd90db9d3, 0x7b670a4cc50f7a9b, 0x77c07d2a05c6dfa5, + 0xe3778b6646d0a6fa, 0xb39c8eda47b56749, 0x933ed448addbef28, + 0xaf846af6ab7d0bf4, 0xe5af208eb666e49, 0x5e6622f73534cd6a, + 0x297daeca42ef5b6e, 0x862daef3d35539a6, 0xe68722498f8e1ea9, + 0x981c53093dc0d572, 0xfa09b0bfbf86fbf5, 0x30b1e96166219f15, + 0x70e7d466bdc4fb83, 0x5a66736e35f2a8e9, 0xcddb59d2b7c1baef, + 0xd6c7d247d26d8996, 0xea4e39eac8de1ba3, 0x539c8bb19fa3aff2, + 0x9f90e4c5fd508d8, 0xa34e5956fbaf3385, 0x2e2f8e151d3ef375, + 0x173691e9b83faec1, 0xb85a8d56bf016379, 0x8382381267408ae3, + 0xb90f901bbdc0096d, 0x7c6ad32933bcec65, 0x76bb5e2f2c8ad595, + 0x390f851a6cf46d28, 0xc3e6064da1c2da72, 0xc52a0c101cfa5389, + 0xd78eaf84a3fbc530, 0x3781b9e2288b997e, 0x73c2f6dea83d05c4, + 0x4228e364c5b5ed7, 0x9d7a3edf0da43911, 0x8edcfeda24686756, + 0x5e7667a7b7a9b3a1, 0x4c4f389fa143791d, 0xb08bc1023da7cddc, + 0x7ab4be3ae529b1cc, 0x754e6132dbe74ff9, 0x71635442a839df45, + 0x2f6fb1643fbe52de, 0x961e0a42cf7a8177, 0xf3b45d83d89ef2ea, + 0xee3de4cf4a6e3e9b, 0xcd6848542c3295e7, 0xe4cee1664c78662f, + 0x9947548b474c68c4, 0x25d73777a5ed8b0b, 0xc915b1d636b7fc, + 0x21c2ba75d9b0d2da, 0x5f6b5dcf608a64a1, 0xdcf333255ff9570c, + 0x633b922418ced4ee, 0xc136dde0b004b34a, 0x58cc83b05d4b2f5a, + 0x5eb424dda28e42d2, 0x62df47369739cd98, 0xb4e0b42485e4ce17, + 0x16e1f0c1f9a8d1e7, 0x8ec3916707560ebf, 0x62ba6e2df2cc9db3, + 0xcbf9f4ff77d83a16, 0x78d9d7d07d2bbcc4, 0xef554ce1e02c41f4, + 0x8d7581127eccf94d, 0xa9b53336cb3c8a05, 0x38c42c0bf45c4f91, + 0x640893cdf4488863, 0x80ec34bc575ea568, 0x39f324f5b48eaa40, + 0xe9d9ed1f8eff527f, 0x9224fc058cc5a214, 0xbaba00b04cfe7741, + 0x309a9f120fcf52af, 0xa558f3ec65626212, 0x424bec8b7adabe2f, + 0x41622513a6aea433, 0xb88da2d5324ca798, 0xd287733b245528a4, + 0x9a44697e6d68aec3, 0x7b1093be2f49bb28, 0x50bbec632e3d8aad, + 0x6cd90723e1ea8283, 0x897b9e7431b02bf3, 0x219efdcb338a7047, + 0x3b0311f0a27c0656, 0xdb17bf91c0db96e7, 0x8cd4fd6b4e85a5b2, + 0xfab071054ba6409d, 0x40d6fe831fa9dfd9, 0xaf358debad7d791e, + 0xeb8d0e25a65e3e58, 0xbbcbd3df14e08580, 0xcf751f27ecdab2b, + 0x2b4da14f2613d8f4 +}; + +#endif /* ZSTD_LDM_GEARTAB_H */ +/**** ended inlining zstd_ldm_geartab.h ****/ + +#define LDM_BUCKET_SIZE_LOG 3 +#define LDM_MIN_MATCH_LENGTH 64 +#define LDM_HASH_RLOG 7 + +typedef struct { + U64 rolling; + U64 stopMask; +} ldmRollingHashState_t; + +/** ZSTD_ldm_gear_init(): + * + * Initializes the rolling hash state such that it will honor the + * settings in params. */ +static void ZSTD_ldm_gear_init(ldmRollingHashState_t* state, ldmParams_t const* params) +{ + unsigned maxBitsInMask = MIN(params->minMatchLength, 64); + unsigned hashRateLog = params->hashRateLog; + + state->rolling = ~(U32)0; + + /* The choice of the splitting criterion is subject to two conditions: + * 1. it has to trigger on average every 2^(hashRateLog) bytes; + * 2. ideally, it has to depend on a window of minMatchLength bytes. + * + * In the gear hash algorithm, bit n depends on the last n bytes; + * so in order to obtain a good quality splitting criterion it is + * preferable to use bits with high weight. + * + * To match condition 1 we use a mask with hashRateLog bits set + * and, because of the previous remark, we make sure these bits + * have the highest possible weight while still respecting + * condition 2. + */ + if (hashRateLog > 0 && hashRateLog <= maxBitsInMask) { + state->stopMask = (((U64)1 << hashRateLog) - 1) << (maxBitsInMask - hashRateLog); + } else { + /* In this degenerate case we simply honor the hash rate. */ + state->stopMask = ((U64)1 << hashRateLog) - 1; + } +} + +/** ZSTD_ldm_gear_reset() + * Feeds [data, data + minMatchLength) into the hash without registering any + * splits. This effectively resets the hash state. This is used when skipping + * over data, either at the beginning of a block, or skipping sections. + */ +static void ZSTD_ldm_gear_reset(ldmRollingHashState_t* state, + BYTE const* data, size_t minMatchLength) +{ + U64 hash = state->rolling; + size_t n = 0; + +#define GEAR_ITER_ONCE() do { \ + hash = (hash << 1) + ZSTD_ldm_gearTab[data[n] & 0xff]; \ + n += 1; \ + } while (0) + while (n + 3 < minMatchLength) { + GEAR_ITER_ONCE(); + GEAR_ITER_ONCE(); + GEAR_ITER_ONCE(); + GEAR_ITER_ONCE(); + } + while (n < minMatchLength) { + GEAR_ITER_ONCE(); + } +#undef GEAR_ITER_ONCE +} + +/** ZSTD_ldm_gear_feed(): + * + * Registers in the splits array all the split points found in the first + * size bytes following the data pointer. This function terminates when + * either all the data has been processed or LDM_BATCH_SIZE splits are + * present in the splits array. + * + * Precondition: The splits array must not be full. + * Returns: The number of bytes processed. */ +static size_t ZSTD_ldm_gear_feed(ldmRollingHashState_t* state, + BYTE const* data, size_t size, + size_t* splits, unsigned* numSplits) +{ + size_t n; + U64 hash, mask; + + hash = state->rolling; + mask = state->stopMask; + n = 0; + +#define GEAR_ITER_ONCE() do { \ + hash = (hash << 1) + ZSTD_ldm_gearTab[data[n] & 0xff]; \ + n += 1; \ + if (UNLIKELY((hash & mask) == 0)) { \ + splits[*numSplits] = n; \ + *numSplits += 1; \ + if (*numSplits == LDM_BATCH_SIZE) \ + goto done; \ + } \ + } while (0) + + while (n + 3 < size) { + GEAR_ITER_ONCE(); + GEAR_ITER_ONCE(); + GEAR_ITER_ONCE(); + GEAR_ITER_ONCE(); + } + while (n < size) { + GEAR_ITER_ONCE(); + } + +#undef GEAR_ITER_ONCE + +done: + state->rolling = hash; + return n; +} + +void ZSTD_ldm_adjustParameters(ldmParams_t* params, + ZSTD_compressionParameters const* cParams) +{ + params->windowLog = cParams->windowLog; + ZSTD_STATIC_ASSERT(LDM_BUCKET_SIZE_LOG <= ZSTD_LDM_BUCKETSIZELOG_MAX); + DEBUGLOG(4, "ZSTD_ldm_adjustParameters"); + if (!params->bucketSizeLog) params->bucketSizeLog = LDM_BUCKET_SIZE_LOG; + if (!params->minMatchLength) params->minMatchLength = LDM_MIN_MATCH_LENGTH; + if (params->hashLog == 0) { + params->hashLog = MAX(ZSTD_HASHLOG_MIN, params->windowLog - LDM_HASH_RLOG); + assert(params->hashLog <= ZSTD_HASHLOG_MAX); + } + if (params->hashRateLog == 0) { + params->hashRateLog = params->windowLog < params->hashLog + ? 0 + : params->windowLog - params->hashLog; + } + params->bucketSizeLog = MIN(params->bucketSizeLog, params->hashLog); +} + +size_t ZSTD_ldm_getTableSize(ldmParams_t params) +{ + size_t const ldmHSize = ((size_t)1) << params.hashLog; + size_t const ldmBucketSizeLog = MIN(params.bucketSizeLog, params.hashLog); + size_t const ldmBucketSize = ((size_t)1) << (params.hashLog - ldmBucketSizeLog); + size_t const totalSize = ZSTD_cwksp_alloc_size(ldmBucketSize) + + ZSTD_cwksp_alloc_size(ldmHSize * sizeof(ldmEntry_t)); + return params.enableLdm == ZSTD_ps_enable ? totalSize : 0; +} + +size_t ZSTD_ldm_getMaxNbSeq(ldmParams_t params, size_t maxChunkSize) +{ + return params.enableLdm == ZSTD_ps_enable ? (maxChunkSize / params.minMatchLength) : 0; +} + +/** ZSTD_ldm_getBucket() : + * Returns a pointer to the start of the bucket associated with hash. */ +static ldmEntry_t* ZSTD_ldm_getBucket( + ldmState_t* ldmState, size_t hash, ldmParams_t const ldmParams) +{ + return ldmState->hashTable + (hash << ldmParams.bucketSizeLog); +} + +/** ZSTD_ldm_insertEntry() : + * Insert the entry with corresponding hash into the hash table */ +static void ZSTD_ldm_insertEntry(ldmState_t* ldmState, + size_t const hash, const ldmEntry_t entry, + ldmParams_t const ldmParams) +{ + BYTE* const pOffset = ldmState->bucketOffsets + hash; + unsigned const offset = *pOffset; + + *(ZSTD_ldm_getBucket(ldmState, hash, ldmParams) + offset) = entry; + *pOffset = (BYTE)((offset + 1) & ((1u << ldmParams.bucketSizeLog) - 1)); + +} + +/** ZSTD_ldm_countBackwardsMatch() : + * Returns the number of bytes that match backwards before pIn and pMatch. + * + * We count only bytes where pMatch >= pBase and pIn >= pAnchor. */ +static size_t ZSTD_ldm_countBackwardsMatch( + const BYTE* pIn, const BYTE* pAnchor, + const BYTE* pMatch, const BYTE* pMatchBase) +{ + size_t matchLength = 0; + while (pIn > pAnchor && pMatch > pMatchBase && pIn[-1] == pMatch[-1]) { + pIn--; + pMatch--; + matchLength++; + } + return matchLength; +} + +/** ZSTD_ldm_countBackwardsMatch_2segments() : + * Returns the number of bytes that match backwards from pMatch, + * even with the backwards match spanning 2 different segments. + * + * On reaching `pMatchBase`, start counting from mEnd */ +static size_t ZSTD_ldm_countBackwardsMatch_2segments( + const BYTE* pIn, const BYTE* pAnchor, + const BYTE* pMatch, const BYTE* pMatchBase, + const BYTE* pExtDictStart, const BYTE* pExtDictEnd) +{ + size_t matchLength = ZSTD_ldm_countBackwardsMatch(pIn, pAnchor, pMatch, pMatchBase); + if (pMatch - matchLength != pMatchBase || pMatchBase == pExtDictStart) { + /* If backwards match is entirely in the extDict or prefix, immediately return */ + return matchLength; + } + DEBUGLOG(7, "ZSTD_ldm_countBackwardsMatch_2segments: found 2-parts backwards match (length in prefix==%zu)", matchLength); + matchLength += ZSTD_ldm_countBackwardsMatch(pIn - matchLength, pAnchor, pExtDictEnd, pExtDictStart); + DEBUGLOG(7, "final backwards match length = %zu", matchLength); + return matchLength; +} + +/** ZSTD_ldm_fillFastTables() : + * + * Fills the relevant tables for the ZSTD_fast and ZSTD_dfast strategies. + * This is similar to ZSTD_loadDictionaryContent. + * + * The tables for the other strategies are filled within their + * block compressors. */ +static size_t ZSTD_ldm_fillFastTables(ZSTD_matchState_t* ms, + void const* end) +{ + const BYTE* const iend = (const BYTE*)end; + + switch(ms->cParams.strategy) + { + case ZSTD_fast: + ZSTD_fillHashTable(ms, iend, ZSTD_dtlm_fast, ZSTD_tfp_forCCtx); + break; + + case ZSTD_dfast: +#ifndef ZSTD_EXCLUDE_DFAST_BLOCK_COMPRESSOR + ZSTD_fillDoubleHashTable(ms, iend, ZSTD_dtlm_fast, ZSTD_tfp_forCCtx); +#else + assert(0); /* shouldn't be called: cparams should've been adjusted. */ +#endif + break; + + case ZSTD_greedy: + case ZSTD_lazy: + case ZSTD_lazy2: + case ZSTD_btlazy2: + case ZSTD_btopt: + case ZSTD_btultra: + case ZSTD_btultra2: + break; + default: + assert(0); /* not possible : not a valid strategy id */ + } + + return 0; +} + +void ZSTD_ldm_fillHashTable( + ldmState_t* ldmState, const BYTE* ip, + const BYTE* iend, ldmParams_t const* params) +{ + U32 const minMatchLength = params->minMatchLength; + U32 const hBits = params->hashLog - params->bucketSizeLog; + BYTE const* const base = ldmState->window.base; + BYTE const* const istart = ip; + ldmRollingHashState_t hashState; + size_t* const splits = ldmState->splitIndices; + unsigned numSplits; + + DEBUGLOG(5, "ZSTD_ldm_fillHashTable"); + + ZSTD_ldm_gear_init(&hashState, params); + while (ip < iend) { + size_t hashed; + unsigned n; + + numSplits = 0; + hashed = ZSTD_ldm_gear_feed(&hashState, ip, iend - ip, splits, &numSplits); + + for (n = 0; n < numSplits; n++) { + if (ip + splits[n] >= istart + minMatchLength) { + BYTE const* const split = ip + splits[n] - minMatchLength; + U64 const xxhash = XXH64(split, minMatchLength, 0); + U32 const hash = (U32)(xxhash & (((U32)1 << hBits) - 1)); + ldmEntry_t entry; + + entry.offset = (U32)(split - base); + entry.checksum = (U32)(xxhash >> 32); + ZSTD_ldm_insertEntry(ldmState, hash, entry, *params); + } + } + + ip += hashed; + } +} + + +/** ZSTD_ldm_limitTableUpdate() : + * + * Sets cctx->nextToUpdate to a position corresponding closer to anchor + * if it is far way + * (after a long match, only update tables a limited amount). */ +static void ZSTD_ldm_limitTableUpdate(ZSTD_matchState_t* ms, const BYTE* anchor) +{ + U32 const curr = (U32)(anchor - ms->window.base); + if (curr > ms->nextToUpdate + 1024) { + ms->nextToUpdate = + curr - MIN(512, curr - ms->nextToUpdate - 1024); + } +} + +static +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +size_t ZSTD_ldm_generateSequences_internal( + ldmState_t* ldmState, rawSeqStore_t* rawSeqStore, + ldmParams_t const* params, void const* src, size_t srcSize) +{ + /* LDM parameters */ + int const extDict = ZSTD_window_hasExtDict(ldmState->window); + U32 const minMatchLength = params->minMatchLength; + U32 const entsPerBucket = 1U << params->bucketSizeLog; + U32 const hBits = params->hashLog - params->bucketSizeLog; + /* Prefix and extDict parameters */ + U32 const dictLimit = ldmState->window.dictLimit; + U32 const lowestIndex = extDict ? ldmState->window.lowLimit : dictLimit; + BYTE const* const base = ldmState->window.base; + BYTE const* const dictBase = extDict ? ldmState->window.dictBase : NULL; + BYTE const* const dictStart = extDict ? dictBase + lowestIndex : NULL; + BYTE const* const dictEnd = extDict ? dictBase + dictLimit : NULL; + BYTE const* const lowPrefixPtr = base + dictLimit; + /* Input bounds */ + BYTE const* const istart = (BYTE const*)src; + BYTE const* const iend = istart + srcSize; + BYTE const* const ilimit = iend - HASH_READ_SIZE; + /* Input positions */ + BYTE const* anchor = istart; + BYTE const* ip = istart; + /* Rolling hash state */ + ldmRollingHashState_t hashState; + /* Arrays for staged-processing */ + size_t* const splits = ldmState->splitIndices; + ldmMatchCandidate_t* const candidates = ldmState->matchCandidates; + unsigned numSplits; + + if (srcSize < minMatchLength) + return iend - anchor; + + /* Initialize the rolling hash state with the first minMatchLength bytes */ + ZSTD_ldm_gear_init(&hashState, params); + ZSTD_ldm_gear_reset(&hashState, ip, minMatchLength); + ip += minMatchLength; + + while (ip < ilimit) { + size_t hashed; + unsigned n; + + numSplits = 0; + hashed = ZSTD_ldm_gear_feed(&hashState, ip, ilimit - ip, + splits, &numSplits); + + for (n = 0; n < numSplits; n++) { + BYTE const* const split = ip + splits[n] - minMatchLength; + U64 const xxhash = XXH64(split, minMatchLength, 0); + U32 const hash = (U32)(xxhash & (((U32)1 << hBits) - 1)); + + candidates[n].split = split; + candidates[n].hash = hash; + candidates[n].checksum = (U32)(xxhash >> 32); + candidates[n].bucket = ZSTD_ldm_getBucket(ldmState, hash, *params); + PREFETCH_L1(candidates[n].bucket); + } + + for (n = 0; n < numSplits; n++) { + size_t forwardMatchLength = 0, backwardMatchLength = 0, + bestMatchLength = 0, mLength; + U32 offset; + BYTE const* const split = candidates[n].split; + U32 const checksum = candidates[n].checksum; + U32 const hash = candidates[n].hash; + ldmEntry_t* const bucket = candidates[n].bucket; + ldmEntry_t const* cur; + ldmEntry_t const* bestEntry = NULL; + ldmEntry_t newEntry; + + newEntry.offset = (U32)(split - base); + newEntry.checksum = checksum; + + /* If a split point would generate a sequence overlapping with + * the previous one, we merely register it in the hash table and + * move on */ + if (split < anchor) { + ZSTD_ldm_insertEntry(ldmState, hash, newEntry, *params); + continue; + } + + for (cur = bucket; cur < bucket + entsPerBucket; cur++) { + size_t curForwardMatchLength, curBackwardMatchLength, + curTotalMatchLength; + if (cur->checksum != checksum || cur->offset <= lowestIndex) { + continue; + } + if (extDict) { + BYTE const* const curMatchBase = + cur->offset < dictLimit ? dictBase : base; + BYTE const* const pMatch = curMatchBase + cur->offset; + BYTE const* const matchEnd = + cur->offset < dictLimit ? dictEnd : iend; + BYTE const* const lowMatchPtr = + cur->offset < dictLimit ? dictStart : lowPrefixPtr; + curForwardMatchLength = + ZSTD_count_2segments(split, pMatch, iend, matchEnd, lowPrefixPtr); + if (curForwardMatchLength < minMatchLength) { + continue; + } + curBackwardMatchLength = ZSTD_ldm_countBackwardsMatch_2segments( + split, anchor, pMatch, lowMatchPtr, dictStart, dictEnd); + } else { /* !extDict */ + BYTE const* const pMatch = base + cur->offset; + curForwardMatchLength = ZSTD_count(split, pMatch, iend); + if (curForwardMatchLength < minMatchLength) { + continue; + } + curBackwardMatchLength = + ZSTD_ldm_countBackwardsMatch(split, anchor, pMatch, lowPrefixPtr); + } + curTotalMatchLength = curForwardMatchLength + curBackwardMatchLength; + + if (curTotalMatchLength > bestMatchLength) { + bestMatchLength = curTotalMatchLength; + forwardMatchLength = curForwardMatchLength; + backwardMatchLength = curBackwardMatchLength; + bestEntry = cur; + } + } + + /* No match found -- insert an entry into the hash table + * and process the next candidate match */ + if (bestEntry == NULL) { + ZSTD_ldm_insertEntry(ldmState, hash, newEntry, *params); + continue; + } + + /* Match found */ + offset = (U32)(split - base) - bestEntry->offset; + mLength = forwardMatchLength + backwardMatchLength; + { + rawSeq* const seq = rawSeqStore->seq + rawSeqStore->size; + + /* Out of sequence storage */ + if (rawSeqStore->size == rawSeqStore->capacity) + return ERROR(dstSize_tooSmall); + seq->litLength = (U32)(split - backwardMatchLength - anchor); + seq->matchLength = (U32)mLength; + seq->offset = offset; + rawSeqStore->size++; + } + + /* Insert the current entry into the hash table --- it must be + * done after the previous block to avoid clobbering bestEntry */ + ZSTD_ldm_insertEntry(ldmState, hash, newEntry, *params); + + anchor = split + forwardMatchLength; + + /* If we find a match that ends after the data that we've hashed + * then we have a repeating, overlapping, pattern. E.g. all zeros. + * If one repetition of the pattern matches our `stopMask` then all + * repetitions will. We don't need to insert them all into out table, + * only the first one. So skip over overlapping matches. + * This is a major speed boost (20x) for compressing a single byte + * repeated, when that byte ends up in the table. + */ + if (anchor > ip + hashed) { + ZSTD_ldm_gear_reset(&hashState, anchor - minMatchLength, minMatchLength); + /* Continue the outer loop at anchor (ip + hashed == anchor). */ + ip = anchor - hashed; + break; + } + } + + ip += hashed; + } + + return iend - anchor; +} + +/*! ZSTD_ldm_reduceTable() : + * reduce table indexes by `reducerValue` */ +static void ZSTD_ldm_reduceTable(ldmEntry_t* const table, U32 const size, + U32 const reducerValue) +{ + U32 u; + for (u = 0; u < size; u++) { + if (table[u].offset < reducerValue) table[u].offset = 0; + else table[u].offset -= reducerValue; + } +} + +size_t ZSTD_ldm_generateSequences( + ldmState_t* ldmState, rawSeqStore_t* sequences, + ldmParams_t const* params, void const* src, size_t srcSize) +{ + U32 const maxDist = 1U << params->windowLog; + BYTE const* const istart = (BYTE const*)src; + BYTE const* const iend = istart + srcSize; + size_t const kMaxChunkSize = 1 << 20; + size_t const nbChunks = (srcSize / kMaxChunkSize) + ((srcSize % kMaxChunkSize) != 0); + size_t chunk; + size_t leftoverSize = 0; + + assert(ZSTD_CHUNKSIZE_MAX >= kMaxChunkSize); + /* Check that ZSTD_window_update() has been called for this chunk prior + * to passing it to this function. + */ + assert(ldmState->window.nextSrc >= (BYTE const*)src + srcSize); + /* The input could be very large (in zstdmt), so it must be broken up into + * chunks to enforce the maximum distance and handle overflow correction. + */ + assert(sequences->pos <= sequences->size); + assert(sequences->size <= sequences->capacity); + for (chunk = 0; chunk < nbChunks && sequences->size < sequences->capacity; ++chunk) { + BYTE const* const chunkStart = istart + chunk * kMaxChunkSize; + size_t const remaining = (size_t)(iend - chunkStart); + BYTE const *const chunkEnd = + (remaining < kMaxChunkSize) ? iend : chunkStart + kMaxChunkSize; + size_t const chunkSize = chunkEnd - chunkStart; + size_t newLeftoverSize; + size_t const prevSize = sequences->size; + + assert(chunkStart < iend); + /* 1. Perform overflow correction if necessary. */ + if (ZSTD_window_needOverflowCorrection(ldmState->window, 0, maxDist, ldmState->loadedDictEnd, chunkStart, chunkEnd)) { + U32 const ldmHSize = 1U << params->hashLog; + U32 const correction = ZSTD_window_correctOverflow( + &ldmState->window, /* cycleLog */ 0, maxDist, chunkStart); + ZSTD_ldm_reduceTable(ldmState->hashTable, ldmHSize, correction); + /* invalidate dictionaries on overflow correction */ + ldmState->loadedDictEnd = 0; + } + /* 2. We enforce the maximum offset allowed. + * + * kMaxChunkSize should be small enough that we don't lose too much of + * the window through early invalidation. + * TODO: * Test the chunk size. + * * Try invalidation after the sequence generation and test the + * offset against maxDist directly. + * + * NOTE: Because of dictionaries + sequence splitting we MUST make sure + * that any offset used is valid at the END of the sequence, since it may + * be split into two sequences. This condition holds when using + * ZSTD_window_enforceMaxDist(), but if we move to checking offsets + * against maxDist directly, we'll have to carefully handle that case. + */ + ZSTD_window_enforceMaxDist(&ldmState->window, chunkEnd, maxDist, &ldmState->loadedDictEnd, NULL); + /* 3. Generate the sequences for the chunk, and get newLeftoverSize. */ + newLeftoverSize = ZSTD_ldm_generateSequences_internal( + ldmState, sequences, params, chunkStart, chunkSize); + if (ZSTD_isError(newLeftoverSize)) + return newLeftoverSize; + /* 4. We add the leftover literals from previous iterations to the first + * newly generated sequence, or add the `newLeftoverSize` if none are + * generated. + */ + /* Prepend the leftover literals from the last call */ + if (prevSize < sequences->size) { + sequences->seq[prevSize].litLength += (U32)leftoverSize; + leftoverSize = newLeftoverSize; + } else { + assert(newLeftoverSize == chunkSize); + leftoverSize += chunkSize; + } + } + return 0; +} + +void +ZSTD_ldm_skipSequences(rawSeqStore_t* rawSeqStore, size_t srcSize, U32 const minMatch) +{ + while (srcSize > 0 && rawSeqStore->pos < rawSeqStore->size) { + rawSeq* seq = rawSeqStore->seq + rawSeqStore->pos; + if (srcSize <= seq->litLength) { + /* Skip past srcSize literals */ + seq->litLength -= (U32)srcSize; + return; + } + srcSize -= seq->litLength; + seq->litLength = 0; + if (srcSize < seq->matchLength) { + /* Skip past the first srcSize of the match */ + seq->matchLength -= (U32)srcSize; + if (seq->matchLength < minMatch) { + /* The match is too short, omit it */ + if (rawSeqStore->pos + 1 < rawSeqStore->size) { + seq[1].litLength += seq[0].matchLength; + } + rawSeqStore->pos++; + } + return; + } + srcSize -= seq->matchLength; + seq->matchLength = 0; + rawSeqStore->pos++; + } +} + +/** + * If the sequence length is longer than remaining then the sequence is split + * between this block and the next. + * + * Returns the current sequence to handle, or if the rest of the block should + * be literals, it returns a sequence with offset == 0. + */ +static rawSeq maybeSplitSequence(rawSeqStore_t* rawSeqStore, + U32 const remaining, U32 const minMatch) +{ + rawSeq sequence = rawSeqStore->seq[rawSeqStore->pos]; + assert(sequence.offset > 0); + /* Likely: No partial sequence */ + if (remaining >= sequence.litLength + sequence.matchLength) { + rawSeqStore->pos++; + return sequence; + } + /* Cut the sequence short (offset == 0 ==> rest is literals). */ + if (remaining <= sequence.litLength) { + sequence.offset = 0; + } else if (remaining < sequence.litLength + sequence.matchLength) { + sequence.matchLength = remaining - sequence.litLength; + if (sequence.matchLength < minMatch) { + sequence.offset = 0; + } + } + /* Skip past `remaining` bytes for the future sequences. */ + ZSTD_ldm_skipSequences(rawSeqStore, remaining, minMatch); + return sequence; +} + +void ZSTD_ldm_skipRawSeqStoreBytes(rawSeqStore_t* rawSeqStore, size_t nbBytes) { + U32 currPos = (U32)(rawSeqStore->posInSequence + nbBytes); + while (currPos && rawSeqStore->pos < rawSeqStore->size) { + rawSeq currSeq = rawSeqStore->seq[rawSeqStore->pos]; + if (currPos >= currSeq.litLength + currSeq.matchLength) { + currPos -= currSeq.litLength + currSeq.matchLength; + rawSeqStore->pos++; + } else { + rawSeqStore->posInSequence = currPos; + break; + } + } + if (currPos == 0 || rawSeqStore->pos == rawSeqStore->size) { + rawSeqStore->posInSequence = 0; + } +} + +size_t ZSTD_ldm_blockCompress(rawSeqStore_t* rawSeqStore, + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + ZSTD_paramSwitch_e useRowMatchFinder, + void const* src, size_t srcSize) +{ + const ZSTD_compressionParameters* const cParams = &ms->cParams; + unsigned const minMatch = cParams->minMatch; + ZSTD_blockCompressor const blockCompressor = + ZSTD_selectBlockCompressor(cParams->strategy, useRowMatchFinder, ZSTD_matchState_dictMode(ms)); + /* Input bounds */ + BYTE const* const istart = (BYTE const*)src; + BYTE const* const iend = istart + srcSize; + /* Input positions */ + BYTE const* ip = istart; + + DEBUGLOG(5, "ZSTD_ldm_blockCompress: srcSize=%zu", srcSize); + /* If using opt parser, use LDMs only as candidates rather than always accepting them */ + if (cParams->strategy >= ZSTD_btopt) { + size_t lastLLSize; + ms->ldmSeqStore = rawSeqStore; + lastLLSize = blockCompressor(ms, seqStore, rep, src, srcSize); + ZSTD_ldm_skipRawSeqStoreBytes(rawSeqStore, srcSize); + return lastLLSize; + } + + assert(rawSeqStore->pos <= rawSeqStore->size); + assert(rawSeqStore->size <= rawSeqStore->capacity); + /* Loop through each sequence and apply the block compressor to the literals */ + while (rawSeqStore->pos < rawSeqStore->size && ip < iend) { + /* maybeSplitSequence updates rawSeqStore->pos */ + rawSeq const sequence = maybeSplitSequence(rawSeqStore, + (U32)(iend - ip), minMatch); + /* End signal */ + if (sequence.offset == 0) + break; + + assert(ip + sequence.litLength + sequence.matchLength <= iend); + + /* Fill tables for block compressor */ + ZSTD_ldm_limitTableUpdate(ms, ip); + ZSTD_ldm_fillFastTables(ms, ip); + /* Run the block compressor */ + DEBUGLOG(5, "pos %u : calling block compressor on segment of size %u", (unsigned)(ip-istart), sequence.litLength); + { + int i; + size_t const newLitLength = + blockCompressor(ms, seqStore, rep, ip, sequence.litLength); + ip += sequence.litLength; + /* Update the repcodes */ + for (i = ZSTD_REP_NUM - 1; i > 0; i--) + rep[i] = rep[i-1]; + rep[0] = sequence.offset; + /* Store the sequence */ + ZSTD_storeSeq(seqStore, newLitLength, ip - newLitLength, iend, + OFFSET_TO_OFFBASE(sequence.offset), + sequence.matchLength); + ip += sequence.matchLength; + } + } + /* Fill the tables for the block compressor */ + ZSTD_ldm_limitTableUpdate(ms, ip); + ZSTD_ldm_fillFastTables(ms, ip); + /* Compress the last literals */ + return blockCompressor(ms, seqStore, rep, ip, iend - ip); +} +/**** ended inlining compress/zstd_ldm.c ****/ +/**** start inlining compress/zstd_opt.c ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +/**** skipping file: zstd_compress_internal.h ****/ +/**** skipping file: hist.h ****/ +/**** skipping file: zstd_opt.h ****/ + +#if !defined(ZSTD_EXCLUDE_BTLAZY2_BLOCK_COMPRESSOR) \ + || !defined(ZSTD_EXCLUDE_BTOPT_BLOCK_COMPRESSOR) \ + || !defined(ZSTD_EXCLUDE_BTULTRA_BLOCK_COMPRESSOR) + +#define ZSTD_LITFREQ_ADD 2 /* scaling factor for litFreq, so that frequencies adapt faster to new stats */ +#define ZSTD_MAX_PRICE (1<<30) + +#define ZSTD_PREDEF_THRESHOLD 8 /* if srcSize < ZSTD_PREDEF_THRESHOLD, symbols' cost is assumed static, directly determined by pre-defined distributions */ + + +/*-************************************* +* Price functions for optimal parser +***************************************/ + +#if 0 /* approximation at bit level (for tests) */ +# define BITCOST_ACCURACY 0 +# define BITCOST_MULTIPLIER (1 << BITCOST_ACCURACY) +# define WEIGHT(stat, opt) ((void)(opt), ZSTD_bitWeight(stat)) +#elif 0 /* fractional bit accuracy (for tests) */ +# define BITCOST_ACCURACY 8 +# define BITCOST_MULTIPLIER (1 << BITCOST_ACCURACY) +# define WEIGHT(stat,opt) ((void)(opt), ZSTD_fracWeight(stat)) +#else /* opt==approx, ultra==accurate */ +# define BITCOST_ACCURACY 8 +# define BITCOST_MULTIPLIER (1 << BITCOST_ACCURACY) +# define WEIGHT(stat,opt) ((opt) ? ZSTD_fracWeight(stat) : ZSTD_bitWeight(stat)) +#endif + +/* ZSTD_bitWeight() : + * provide estimated "cost" of a stat in full bits only */ +MEM_STATIC U32 ZSTD_bitWeight(U32 stat) +{ + return (ZSTD_highbit32(stat+1) * BITCOST_MULTIPLIER); +} + +/* ZSTD_fracWeight() : + * provide fractional-bit "cost" of a stat, + * using linear interpolation approximation */ +MEM_STATIC U32 ZSTD_fracWeight(U32 rawStat) +{ + U32 const stat = rawStat + 1; + U32 const hb = ZSTD_highbit32(stat); + U32 const BWeight = hb * BITCOST_MULTIPLIER; + /* Fweight was meant for "Fractional weight" + * but it's effectively a value between 1 and 2 + * using fixed point arithmetic */ + U32 const FWeight = (stat << BITCOST_ACCURACY) >> hb; + U32 const weight = BWeight + FWeight; + assert(hb + BITCOST_ACCURACY < 31); + return weight; +} + +#if (DEBUGLEVEL>=2) +/* debugging function, + * @return price in bytes as fractional value + * for debug messages only */ +MEM_STATIC double ZSTD_fCost(int price) +{ + return (double)price / (BITCOST_MULTIPLIER*8); +} +#endif + +static int ZSTD_compressedLiterals(optState_t const* const optPtr) +{ + return optPtr->literalCompressionMode != ZSTD_ps_disable; +} + +static void ZSTD_setBasePrices(optState_t* optPtr, int optLevel) +{ + if (ZSTD_compressedLiterals(optPtr)) + optPtr->litSumBasePrice = WEIGHT(optPtr->litSum, optLevel); + optPtr->litLengthSumBasePrice = WEIGHT(optPtr->litLengthSum, optLevel); + optPtr->matchLengthSumBasePrice = WEIGHT(optPtr->matchLengthSum, optLevel); + optPtr->offCodeSumBasePrice = WEIGHT(optPtr->offCodeSum, optLevel); +} + + +static U32 sum_u32(const unsigned table[], size_t nbElts) +{ + size_t n; + U32 total = 0; + for (n=0; n0); + unsigned const newStat = base + (table[s] >> shift); + sum += newStat; + table[s] = newStat; + } + return sum; +} + +/* ZSTD_scaleStats() : + * reduce all elt frequencies in table if sum too large + * return the resulting sum of elements */ +static U32 ZSTD_scaleStats(unsigned* table, U32 lastEltIndex, U32 logTarget) +{ + U32 const prevsum = sum_u32(table, lastEltIndex+1); + U32 const factor = prevsum >> logTarget; + DEBUGLOG(5, "ZSTD_scaleStats (nbElts=%u, target=%u)", (unsigned)lastEltIndex+1, (unsigned)logTarget); + assert(logTarget < 30); + if (factor <= 1) return prevsum; + return ZSTD_downscaleStats(table, lastEltIndex, ZSTD_highbit32(factor), base_1guaranteed); +} + +/* ZSTD_rescaleFreqs() : + * if first block (detected by optPtr->litLengthSum == 0) : init statistics + * take hints from dictionary if there is one + * and init from zero if there is none, + * using src for literals stats, and baseline stats for sequence symbols + * otherwise downscale existing stats, to be used as seed for next block. + */ +static void +ZSTD_rescaleFreqs(optState_t* const optPtr, + const BYTE* const src, size_t const srcSize, + int const optLevel) +{ + int const compressedLiterals = ZSTD_compressedLiterals(optPtr); + DEBUGLOG(5, "ZSTD_rescaleFreqs (srcSize=%u)", (unsigned)srcSize); + optPtr->priceType = zop_dynamic; + + if (optPtr->litLengthSum == 0) { /* no literals stats collected -> first block assumed -> init */ + + /* heuristic: use pre-defined stats for too small inputs */ + if (srcSize <= ZSTD_PREDEF_THRESHOLD) { + DEBUGLOG(5, "srcSize <= %i : use predefined stats", ZSTD_PREDEF_THRESHOLD); + optPtr->priceType = zop_predef; + } + + assert(optPtr->symbolCosts != NULL); + if (optPtr->symbolCosts->huf.repeatMode == HUF_repeat_valid) { + + /* huffman stats covering the full value set : table presumed generated by dictionary */ + optPtr->priceType = zop_dynamic; + + if (compressedLiterals) { + /* generate literals statistics from huffman table */ + unsigned lit; + assert(optPtr->litFreq != NULL); + optPtr->litSum = 0; + for (lit=0; lit<=MaxLit; lit++) { + U32 const scaleLog = 11; /* scale to 2K */ + U32 const bitCost = HUF_getNbBitsFromCTable(optPtr->symbolCosts->huf.CTable, lit); + assert(bitCost <= scaleLog); + optPtr->litFreq[lit] = bitCost ? 1 << (scaleLog-bitCost) : 1 /*minimum to calculate cost*/; + optPtr->litSum += optPtr->litFreq[lit]; + } } + + { unsigned ll; + FSE_CState_t llstate; + FSE_initCState(&llstate, optPtr->symbolCosts->fse.litlengthCTable); + optPtr->litLengthSum = 0; + for (ll=0; ll<=MaxLL; ll++) { + U32 const scaleLog = 10; /* scale to 1K */ + U32 const bitCost = FSE_getMaxNbBits(llstate.symbolTT, ll); + assert(bitCost < scaleLog); + optPtr->litLengthFreq[ll] = bitCost ? 1 << (scaleLog-bitCost) : 1 /*minimum to calculate cost*/; + optPtr->litLengthSum += optPtr->litLengthFreq[ll]; + } } + + { unsigned ml; + FSE_CState_t mlstate; + FSE_initCState(&mlstate, optPtr->symbolCosts->fse.matchlengthCTable); + optPtr->matchLengthSum = 0; + for (ml=0; ml<=MaxML; ml++) { + U32 const scaleLog = 10; + U32 const bitCost = FSE_getMaxNbBits(mlstate.symbolTT, ml); + assert(bitCost < scaleLog); + optPtr->matchLengthFreq[ml] = bitCost ? 1 << (scaleLog-bitCost) : 1 /*minimum to calculate cost*/; + optPtr->matchLengthSum += optPtr->matchLengthFreq[ml]; + } } + + { unsigned of; + FSE_CState_t ofstate; + FSE_initCState(&ofstate, optPtr->symbolCosts->fse.offcodeCTable); + optPtr->offCodeSum = 0; + for (of=0; of<=MaxOff; of++) { + U32 const scaleLog = 10; + U32 const bitCost = FSE_getMaxNbBits(ofstate.symbolTT, of); + assert(bitCost < scaleLog); + optPtr->offCodeFreq[of] = bitCost ? 1 << (scaleLog-bitCost) : 1 /*minimum to calculate cost*/; + optPtr->offCodeSum += optPtr->offCodeFreq[of]; + } } + + } else { /* first block, no dictionary */ + + assert(optPtr->litFreq != NULL); + if (compressedLiterals) { + /* base initial cost of literals on direct frequency within src */ + unsigned lit = MaxLit; + HIST_count_simple(optPtr->litFreq, &lit, src, srcSize); /* use raw first block to init statistics */ + optPtr->litSum = ZSTD_downscaleStats(optPtr->litFreq, MaxLit, 8, base_0possible); + } + + { unsigned const baseLLfreqs[MaxLL+1] = { + 4, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1 + }; + ZSTD_memcpy(optPtr->litLengthFreq, baseLLfreqs, sizeof(baseLLfreqs)); + optPtr->litLengthSum = sum_u32(baseLLfreqs, MaxLL+1); + } + + { unsigned ml; + for (ml=0; ml<=MaxML; ml++) + optPtr->matchLengthFreq[ml] = 1; + } + optPtr->matchLengthSum = MaxML+1; + + { unsigned const baseOFCfreqs[MaxOff+1] = { + 6, 2, 1, 1, 2, 3, 4, 4, + 4, 3, 2, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1 + }; + ZSTD_memcpy(optPtr->offCodeFreq, baseOFCfreqs, sizeof(baseOFCfreqs)); + optPtr->offCodeSum = sum_u32(baseOFCfreqs, MaxOff+1); + } + + } + + } else { /* new block : scale down accumulated statistics */ + + if (compressedLiterals) + optPtr->litSum = ZSTD_scaleStats(optPtr->litFreq, MaxLit, 12); + optPtr->litLengthSum = ZSTD_scaleStats(optPtr->litLengthFreq, MaxLL, 11); + optPtr->matchLengthSum = ZSTD_scaleStats(optPtr->matchLengthFreq, MaxML, 11); + optPtr->offCodeSum = ZSTD_scaleStats(optPtr->offCodeFreq, MaxOff, 11); + } + + ZSTD_setBasePrices(optPtr, optLevel); +} + +/* ZSTD_rawLiteralsCost() : + * price of literals (only) in specified segment (which length can be 0). + * does not include price of literalLength symbol */ +static U32 ZSTD_rawLiteralsCost(const BYTE* const literals, U32 const litLength, + const optState_t* const optPtr, + int optLevel) +{ + DEBUGLOG(8, "ZSTD_rawLiteralsCost (%u literals)", litLength); + if (litLength == 0) return 0; + + if (!ZSTD_compressedLiterals(optPtr)) + return (litLength << 3) * BITCOST_MULTIPLIER; /* Uncompressed - 8 bytes per literal. */ + + if (optPtr->priceType == zop_predef) + return (litLength*6) * BITCOST_MULTIPLIER; /* 6 bit per literal - no statistic used */ + + /* dynamic statistics */ + { U32 price = optPtr->litSumBasePrice * litLength; + U32 const litPriceMax = optPtr->litSumBasePrice - BITCOST_MULTIPLIER; + U32 u; + assert(optPtr->litSumBasePrice >= BITCOST_MULTIPLIER); + for (u=0; u < litLength; u++) { + U32 litPrice = WEIGHT(optPtr->litFreq[literals[u]], optLevel); + if (UNLIKELY(litPrice > litPriceMax)) litPrice = litPriceMax; + price -= litPrice; + } + return price; + } +} + +/* ZSTD_litLengthPrice() : + * cost of literalLength symbol */ +static U32 ZSTD_litLengthPrice(U32 const litLength, const optState_t* const optPtr, int optLevel) +{ + assert(litLength <= ZSTD_BLOCKSIZE_MAX); + if (optPtr->priceType == zop_predef) + return WEIGHT(litLength, optLevel); + + /* ZSTD_LLcode() can't compute litLength price for sizes >= ZSTD_BLOCKSIZE_MAX + * because it isn't representable in the zstd format. + * So instead just pretend it would cost 1 bit more than ZSTD_BLOCKSIZE_MAX - 1. + * In such a case, the block would be all literals. + */ + if (litLength == ZSTD_BLOCKSIZE_MAX) + return BITCOST_MULTIPLIER + ZSTD_litLengthPrice(ZSTD_BLOCKSIZE_MAX - 1, optPtr, optLevel); + + /* dynamic statistics */ + { U32 const llCode = ZSTD_LLcode(litLength); + return (LL_bits[llCode] * BITCOST_MULTIPLIER) + + optPtr->litLengthSumBasePrice + - WEIGHT(optPtr->litLengthFreq[llCode], optLevel); + } +} + +/* ZSTD_getMatchPrice() : + * Provides the cost of the match part (offset + matchLength) of a sequence. + * Must be combined with ZSTD_fullLiteralsCost() to get the full cost of a sequence. + * @offBase : sumtype, representing an offset or a repcode, and using numeric representation of ZSTD_storeSeq() + * @optLevel: when <2, favors small offset for decompression speed (improved cache efficiency) + */ +FORCE_INLINE_TEMPLATE U32 +ZSTD_getMatchPrice(U32 const offBase, + U32 const matchLength, + const optState_t* const optPtr, + int const optLevel) +{ + U32 price; + U32 const offCode = ZSTD_highbit32(offBase); + U32 const mlBase = matchLength - MINMATCH; + assert(matchLength >= MINMATCH); + + if (optPtr->priceType == zop_predef) /* fixed scheme, does not use statistics */ + return WEIGHT(mlBase, optLevel) + + ((16 + offCode) * BITCOST_MULTIPLIER); /* emulated offset cost */ + + /* dynamic statistics */ + price = (offCode * BITCOST_MULTIPLIER) + (optPtr->offCodeSumBasePrice - WEIGHT(optPtr->offCodeFreq[offCode], optLevel)); + if ((optLevel<2) /*static*/ && offCode >= 20) + price += (offCode-19)*2 * BITCOST_MULTIPLIER; /* handicap for long distance offsets, favor decompression speed */ + + /* match Length */ + { U32 const mlCode = ZSTD_MLcode(mlBase); + price += (ML_bits[mlCode] * BITCOST_MULTIPLIER) + (optPtr->matchLengthSumBasePrice - WEIGHT(optPtr->matchLengthFreq[mlCode], optLevel)); + } + + price += BITCOST_MULTIPLIER / 5; /* heuristic : make matches a bit more costly to favor less sequences -> faster decompression speed */ + + DEBUGLOG(8, "ZSTD_getMatchPrice(ml:%u) = %u", matchLength, price); + return price; +} + +/* ZSTD_updateStats() : + * assumption : literals + litLength <= iend */ +static void ZSTD_updateStats(optState_t* const optPtr, + U32 litLength, const BYTE* literals, + U32 offBase, U32 matchLength) +{ + /* literals */ + if (ZSTD_compressedLiterals(optPtr)) { + U32 u; + for (u=0; u < litLength; u++) + optPtr->litFreq[literals[u]] += ZSTD_LITFREQ_ADD; + optPtr->litSum += litLength*ZSTD_LITFREQ_ADD; + } + + /* literal Length */ + { U32 const llCode = ZSTD_LLcode(litLength); + optPtr->litLengthFreq[llCode]++; + optPtr->litLengthSum++; + } + + /* offset code : follows storeSeq() numeric representation */ + { U32 const offCode = ZSTD_highbit32(offBase); + assert(offCode <= MaxOff); + optPtr->offCodeFreq[offCode]++; + optPtr->offCodeSum++; + } + + /* match Length */ + { U32 const mlBase = matchLength - MINMATCH; + U32 const mlCode = ZSTD_MLcode(mlBase); + optPtr->matchLengthFreq[mlCode]++; + optPtr->matchLengthSum++; + } +} + + +/* ZSTD_readMINMATCH() : + * function safe only for comparisons + * assumption : memPtr must be at least 4 bytes before end of buffer */ +MEM_STATIC U32 ZSTD_readMINMATCH(const void* memPtr, U32 length) +{ + switch (length) + { + default : + case 4 : return MEM_read32(memPtr); + case 3 : if (MEM_isLittleEndian()) + return MEM_read32(memPtr)<<8; + else + return MEM_read32(memPtr)>>8; + } +} + + +/* Update hashTable3 up to ip (excluded) + Assumption : always within prefix (i.e. not within extDict) */ +static +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +U32 ZSTD_insertAndFindFirstIndexHash3 (const ZSTD_matchState_t* ms, + U32* nextToUpdate3, + const BYTE* const ip) +{ + U32* const hashTable3 = ms->hashTable3; + U32 const hashLog3 = ms->hashLog3; + const BYTE* const base = ms->window.base; + U32 idx = *nextToUpdate3; + U32 const target = (U32)(ip - base); + size_t const hash3 = ZSTD_hash3Ptr(ip, hashLog3); + assert(hashLog3 > 0); + + while(idx < target) { + hashTable3[ZSTD_hash3Ptr(base+idx, hashLog3)] = idx; + idx++; + } + + *nextToUpdate3 = target; + return hashTable3[hash3]; +} + + +/*-************************************* +* Binary Tree search +***************************************/ +/** ZSTD_insertBt1() : add one or multiple positions to tree. + * @param ip assumed <= iend-8 . + * @param target The target of ZSTD_updateTree_internal() - we are filling to this position + * @return : nb of positions added */ +static +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +U32 ZSTD_insertBt1( + const ZSTD_matchState_t* ms, + const BYTE* const ip, const BYTE* const iend, + U32 const target, + U32 const mls, const int extDict) +{ + const ZSTD_compressionParameters* const cParams = &ms->cParams; + U32* const hashTable = ms->hashTable; + U32 const hashLog = cParams->hashLog; + size_t const h = ZSTD_hashPtr(ip, hashLog, mls); + U32* const bt = ms->chainTable; + U32 const btLog = cParams->chainLog - 1; + U32 const btMask = (1 << btLog) - 1; + U32 matchIndex = hashTable[h]; + size_t commonLengthSmaller=0, commonLengthLarger=0; + const BYTE* const base = ms->window.base; + const BYTE* const dictBase = ms->window.dictBase; + const U32 dictLimit = ms->window.dictLimit; + const BYTE* const dictEnd = dictBase + dictLimit; + const BYTE* const prefixStart = base + dictLimit; + const BYTE* match; + const U32 curr = (U32)(ip-base); + const U32 btLow = btMask >= curr ? 0 : curr - btMask; + U32* smallerPtr = bt + 2*(curr&btMask); + U32* largerPtr = smallerPtr + 1; + U32 dummy32; /* to be nullified at the end */ + /* windowLow is based on target because + * we only need positions that will be in the window at the end of the tree update. + */ + U32 const windowLow = ZSTD_getLowestMatchIndex(ms, target, cParams->windowLog); + U32 matchEndIdx = curr+8+1; + size_t bestLength = 8; + U32 nbCompares = 1U << cParams->searchLog; +#ifdef ZSTD_C_PREDICT + U32 predictedSmall = *(bt + 2*((curr-1)&btMask) + 0); + U32 predictedLarge = *(bt + 2*((curr-1)&btMask) + 1); + predictedSmall += (predictedSmall>0); + predictedLarge += (predictedLarge>0); +#endif /* ZSTD_C_PREDICT */ + + DEBUGLOG(8, "ZSTD_insertBt1 (%u)", curr); + + assert(curr <= target); + assert(ip <= iend-8); /* required for h calculation */ + hashTable[h] = curr; /* Update Hash Table */ + + assert(windowLow > 0); + for (; nbCompares && (matchIndex >= windowLow); --nbCompares) { + U32* const nextPtr = bt + 2*(matchIndex & btMask); + size_t matchLength = MIN(commonLengthSmaller, commonLengthLarger); /* guaranteed minimum nb of common bytes */ + assert(matchIndex < curr); + +#ifdef ZSTD_C_PREDICT /* note : can create issues when hlog small <= 11 */ + const U32* predictPtr = bt + 2*((matchIndex-1) & btMask); /* written this way, as bt is a roll buffer */ + if (matchIndex == predictedSmall) { + /* no need to check length, result known */ + *smallerPtr = matchIndex; + if (matchIndex <= btLow) { smallerPtr=&dummy32; break; } /* beyond tree size, stop the search */ + smallerPtr = nextPtr+1; /* new "smaller" => larger of match */ + matchIndex = nextPtr[1]; /* new matchIndex larger than previous (closer to current) */ + predictedSmall = predictPtr[1] + (predictPtr[1]>0); + continue; + } + if (matchIndex == predictedLarge) { + *largerPtr = matchIndex; + if (matchIndex <= btLow) { largerPtr=&dummy32; break; } /* beyond tree size, stop the search */ + largerPtr = nextPtr; + matchIndex = nextPtr[0]; + predictedLarge = predictPtr[0] + (predictPtr[0]>0); + continue; + } +#endif + + if (!extDict || (matchIndex+matchLength >= dictLimit)) { + assert(matchIndex+matchLength >= dictLimit); /* might be wrong if actually extDict */ + match = base + matchIndex; + matchLength += ZSTD_count(ip+matchLength, match+matchLength, iend); + } else { + match = dictBase + matchIndex; + matchLength += ZSTD_count_2segments(ip+matchLength, match+matchLength, iend, dictEnd, prefixStart); + if (matchIndex+matchLength >= dictLimit) + match = base + matchIndex; /* to prepare for next usage of match[matchLength] */ + } + + if (matchLength > bestLength) { + bestLength = matchLength; + if (matchLength > matchEndIdx - matchIndex) + matchEndIdx = matchIndex + (U32)matchLength; + } + + if (ip+matchLength == iend) { /* equal : no way to know if inf or sup */ + break; /* drop , to guarantee consistency ; miss a bit of compression, but other solutions can corrupt tree */ + } + + if (match[matchLength] < ip[matchLength]) { /* necessarily within buffer */ + /* match is smaller than current */ + *smallerPtr = matchIndex; /* update smaller idx */ + commonLengthSmaller = matchLength; /* all smaller will now have at least this guaranteed common length */ + if (matchIndex <= btLow) { smallerPtr=&dummy32; break; } /* beyond tree size, stop searching */ + smallerPtr = nextPtr+1; /* new "candidate" => larger than match, which was smaller than target */ + matchIndex = nextPtr[1]; /* new matchIndex, larger than previous and closer to current */ + } else { + /* match is larger than current */ + *largerPtr = matchIndex; + commonLengthLarger = matchLength; + if (matchIndex <= btLow) { largerPtr=&dummy32; break; } /* beyond tree size, stop searching */ + largerPtr = nextPtr; + matchIndex = nextPtr[0]; + } } + + *smallerPtr = *largerPtr = 0; + { U32 positions = 0; + if (bestLength > 384) positions = MIN(192, (U32)(bestLength - 384)); /* speed optimization */ + assert(matchEndIdx > curr + 8); + return MAX(positions, matchEndIdx - (curr + 8)); + } +} + +FORCE_INLINE_TEMPLATE +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +void ZSTD_updateTree_internal( + ZSTD_matchState_t* ms, + const BYTE* const ip, const BYTE* const iend, + const U32 mls, const ZSTD_dictMode_e dictMode) +{ + const BYTE* const base = ms->window.base; + U32 const target = (U32)(ip - base); + U32 idx = ms->nextToUpdate; + DEBUGLOG(7, "ZSTD_updateTree_internal, from %u to %u (dictMode:%u)", + idx, target, dictMode); + + while(idx < target) { + U32 const forward = ZSTD_insertBt1(ms, base+idx, iend, target, mls, dictMode == ZSTD_extDict); + assert(idx < (U32)(idx + forward)); + idx += forward; + } + assert((size_t)(ip - base) <= (size_t)(U32)(-1)); + assert((size_t)(iend - base) <= (size_t)(U32)(-1)); + ms->nextToUpdate = target; +} + +void ZSTD_updateTree(ZSTD_matchState_t* ms, const BYTE* ip, const BYTE* iend) { + ZSTD_updateTree_internal(ms, ip, iend, ms->cParams.minMatch, ZSTD_noDict); +} + +FORCE_INLINE_TEMPLATE +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +U32 +ZSTD_insertBtAndGetAllMatches ( + ZSTD_match_t* matches, /* store result (found matches) in this table (presumed large enough) */ + ZSTD_matchState_t* ms, + U32* nextToUpdate3, + const BYTE* const ip, const BYTE* const iLimit, + const ZSTD_dictMode_e dictMode, + const U32 rep[ZSTD_REP_NUM], + const U32 ll0, /* tells if associated literal length is 0 or not. This value must be 0 or 1 */ + const U32 lengthToBeat, + const U32 mls /* template */) +{ + const ZSTD_compressionParameters* const cParams = &ms->cParams; + U32 const sufficient_len = MIN(cParams->targetLength, ZSTD_OPT_NUM -1); + const BYTE* const base = ms->window.base; + U32 const curr = (U32)(ip-base); + U32 const hashLog = cParams->hashLog; + U32 const minMatch = (mls==3) ? 3 : 4; + U32* const hashTable = ms->hashTable; + size_t const h = ZSTD_hashPtr(ip, hashLog, mls); + U32 matchIndex = hashTable[h]; + U32* const bt = ms->chainTable; + U32 const btLog = cParams->chainLog - 1; + U32 const btMask= (1U << btLog) - 1; + size_t commonLengthSmaller=0, commonLengthLarger=0; + const BYTE* const dictBase = ms->window.dictBase; + U32 const dictLimit = ms->window.dictLimit; + const BYTE* const dictEnd = dictBase + dictLimit; + const BYTE* const prefixStart = base + dictLimit; + U32 const btLow = (btMask >= curr) ? 0 : curr - btMask; + U32 const windowLow = ZSTD_getLowestMatchIndex(ms, curr, cParams->windowLog); + U32 const matchLow = windowLow ? windowLow : 1; + U32* smallerPtr = bt + 2*(curr&btMask); + U32* largerPtr = bt + 2*(curr&btMask) + 1; + U32 matchEndIdx = curr+8+1; /* farthest referenced position of any match => detects repetitive patterns */ + U32 dummy32; /* to be nullified at the end */ + U32 mnum = 0; + U32 nbCompares = 1U << cParams->searchLog; + + const ZSTD_matchState_t* dms = dictMode == ZSTD_dictMatchState ? ms->dictMatchState : NULL; + const ZSTD_compressionParameters* const dmsCParams = + dictMode == ZSTD_dictMatchState ? &dms->cParams : NULL; + const BYTE* const dmsBase = dictMode == ZSTD_dictMatchState ? dms->window.base : NULL; + const BYTE* const dmsEnd = dictMode == ZSTD_dictMatchState ? dms->window.nextSrc : NULL; + U32 const dmsHighLimit = dictMode == ZSTD_dictMatchState ? (U32)(dmsEnd - dmsBase) : 0; + U32 const dmsLowLimit = dictMode == ZSTD_dictMatchState ? dms->window.lowLimit : 0; + U32 const dmsIndexDelta = dictMode == ZSTD_dictMatchState ? windowLow - dmsHighLimit : 0; + U32 const dmsHashLog = dictMode == ZSTD_dictMatchState ? dmsCParams->hashLog : hashLog; + U32 const dmsBtLog = dictMode == ZSTD_dictMatchState ? dmsCParams->chainLog - 1 : btLog; + U32 const dmsBtMask = dictMode == ZSTD_dictMatchState ? (1U << dmsBtLog) - 1 : 0; + U32 const dmsBtLow = dictMode == ZSTD_dictMatchState && dmsBtMask < dmsHighLimit - dmsLowLimit ? dmsHighLimit - dmsBtMask : dmsLowLimit; + + size_t bestLength = lengthToBeat-1; + DEBUGLOG(8, "ZSTD_insertBtAndGetAllMatches: current=%u", curr); + + /* check repCode */ + assert(ll0 <= 1); /* necessarily 1 or 0 */ + { U32 const lastR = ZSTD_REP_NUM + ll0; + U32 repCode; + for (repCode = ll0; repCode < lastR; repCode++) { + U32 const repOffset = (repCode==ZSTD_REP_NUM) ? (rep[0] - 1) : rep[repCode]; + U32 const repIndex = curr - repOffset; + U32 repLen = 0; + assert(curr >= dictLimit); + if (repOffset-1 /* intentional overflow, discards 0 and -1 */ < curr-dictLimit) { /* equivalent to `curr > repIndex >= dictLimit` */ + /* We must validate the repcode offset because when we're using a dictionary the + * valid offset range shrinks when the dictionary goes out of bounds. + */ + if ((repIndex >= windowLow) & (ZSTD_readMINMATCH(ip, minMatch) == ZSTD_readMINMATCH(ip - repOffset, minMatch))) { + repLen = (U32)ZSTD_count(ip+minMatch, ip+minMatch-repOffset, iLimit) + minMatch; + } + } else { /* repIndex < dictLimit || repIndex >= curr */ + const BYTE* const repMatch = dictMode == ZSTD_dictMatchState ? + dmsBase + repIndex - dmsIndexDelta : + dictBase + repIndex; + assert(curr >= windowLow); + if ( dictMode == ZSTD_extDict + && ( ((repOffset-1) /*intentional overflow*/ < curr - windowLow) /* equivalent to `curr > repIndex >= windowLow` */ + & (((U32)((dictLimit-1) - repIndex) >= 3) ) /* intentional overflow : do not test positions overlapping 2 memory segments */) + && (ZSTD_readMINMATCH(ip, minMatch) == ZSTD_readMINMATCH(repMatch, minMatch)) ) { + repLen = (U32)ZSTD_count_2segments(ip+minMatch, repMatch+minMatch, iLimit, dictEnd, prefixStart) + minMatch; + } + if (dictMode == ZSTD_dictMatchState + && ( ((repOffset-1) /*intentional overflow*/ < curr - (dmsLowLimit + dmsIndexDelta)) /* equivalent to `curr > repIndex >= dmsLowLimit` */ + & ((U32)((dictLimit-1) - repIndex) >= 3) ) /* intentional overflow : do not test positions overlapping 2 memory segments */ + && (ZSTD_readMINMATCH(ip, minMatch) == ZSTD_readMINMATCH(repMatch, minMatch)) ) { + repLen = (U32)ZSTD_count_2segments(ip+minMatch, repMatch+minMatch, iLimit, dmsEnd, prefixStart) + minMatch; + } } + /* save longer solution */ + if (repLen > bestLength) { + DEBUGLOG(8, "found repCode %u (ll0:%u, offset:%u) of length %u", + repCode, ll0, repOffset, repLen); + bestLength = repLen; + matches[mnum].off = REPCODE_TO_OFFBASE(repCode - ll0 + 1); /* expect value between 1 and 3 */ + matches[mnum].len = (U32)repLen; + mnum++; + if ( (repLen > sufficient_len) + | (ip+repLen == iLimit) ) { /* best possible */ + return mnum; + } } } } + + /* HC3 match finder */ + if ((mls == 3) /*static*/ && (bestLength < mls)) { + U32 const matchIndex3 = ZSTD_insertAndFindFirstIndexHash3(ms, nextToUpdate3, ip); + if ((matchIndex3 >= matchLow) + & (curr - matchIndex3 < (1<<18)) /*heuristic : longer distance likely too expensive*/ ) { + size_t mlen; + if ((dictMode == ZSTD_noDict) /*static*/ || (dictMode == ZSTD_dictMatchState) /*static*/ || (matchIndex3 >= dictLimit)) { + const BYTE* const match = base + matchIndex3; + mlen = ZSTD_count(ip, match, iLimit); + } else { + const BYTE* const match = dictBase + matchIndex3; + mlen = ZSTD_count_2segments(ip, match, iLimit, dictEnd, prefixStart); + } + + /* save best solution */ + if (mlen >= mls /* == 3 > bestLength */) { + DEBUGLOG(8, "found small match with hlog3, of length %u", + (U32)mlen); + bestLength = mlen; + assert(curr > matchIndex3); + assert(mnum==0); /* no prior solution */ + matches[0].off = OFFSET_TO_OFFBASE(curr - matchIndex3); + matches[0].len = (U32)mlen; + mnum = 1; + if ( (mlen > sufficient_len) | + (ip+mlen == iLimit) ) { /* best possible length */ + ms->nextToUpdate = curr+1; /* skip insertion */ + return 1; + } } } + /* no dictMatchState lookup: dicts don't have a populated HC3 table */ + } /* if (mls == 3) */ + + hashTable[h] = curr; /* Update Hash Table */ + + for (; nbCompares && (matchIndex >= matchLow); --nbCompares) { + U32* const nextPtr = bt + 2*(matchIndex & btMask); + const BYTE* match; + size_t matchLength = MIN(commonLengthSmaller, commonLengthLarger); /* guaranteed minimum nb of common bytes */ + assert(curr > matchIndex); + + if ((dictMode == ZSTD_noDict) || (dictMode == ZSTD_dictMatchState) || (matchIndex+matchLength >= dictLimit)) { + assert(matchIndex+matchLength >= dictLimit); /* ensure the condition is correct when !extDict */ + match = base + matchIndex; + if (matchIndex >= dictLimit) assert(memcmp(match, ip, matchLength) == 0); /* ensure early section of match is equal as expected */ + matchLength += ZSTD_count(ip+matchLength, match+matchLength, iLimit); + } else { + match = dictBase + matchIndex; + assert(memcmp(match, ip, matchLength) == 0); /* ensure early section of match is equal as expected */ + matchLength += ZSTD_count_2segments(ip+matchLength, match+matchLength, iLimit, dictEnd, prefixStart); + if (matchIndex+matchLength >= dictLimit) + match = base + matchIndex; /* prepare for match[matchLength] read */ + } + + if (matchLength > bestLength) { + DEBUGLOG(8, "found match of length %u at distance %u (offBase=%u)", + (U32)matchLength, curr - matchIndex, OFFSET_TO_OFFBASE(curr - matchIndex)); + assert(matchEndIdx > matchIndex); + if (matchLength > matchEndIdx - matchIndex) + matchEndIdx = matchIndex + (U32)matchLength; + bestLength = matchLength; + matches[mnum].off = OFFSET_TO_OFFBASE(curr - matchIndex); + matches[mnum].len = (U32)matchLength; + mnum++; + if ( (matchLength > ZSTD_OPT_NUM) + | (ip+matchLength == iLimit) /* equal : no way to know if inf or sup */) { + if (dictMode == ZSTD_dictMatchState) nbCompares = 0; /* break should also skip searching dms */ + break; /* drop, to preserve bt consistency (miss a little bit of compression) */ + } } + + if (match[matchLength] < ip[matchLength]) { + /* match smaller than current */ + *smallerPtr = matchIndex; /* update smaller idx */ + commonLengthSmaller = matchLength; /* all smaller will now have at least this guaranteed common length */ + if (matchIndex <= btLow) { smallerPtr=&dummy32; break; } /* beyond tree size, stop the search */ + smallerPtr = nextPtr+1; /* new candidate => larger than match, which was smaller than current */ + matchIndex = nextPtr[1]; /* new matchIndex, larger than previous, closer to current */ + } else { + *largerPtr = matchIndex; + commonLengthLarger = matchLength; + if (matchIndex <= btLow) { largerPtr=&dummy32; break; } /* beyond tree size, stop the search */ + largerPtr = nextPtr; + matchIndex = nextPtr[0]; + } } + + *smallerPtr = *largerPtr = 0; + + assert(nbCompares <= (1U << ZSTD_SEARCHLOG_MAX)); /* Check we haven't underflowed. */ + if (dictMode == ZSTD_dictMatchState && nbCompares) { + size_t const dmsH = ZSTD_hashPtr(ip, dmsHashLog, mls); + U32 dictMatchIndex = dms->hashTable[dmsH]; + const U32* const dmsBt = dms->chainTable; + commonLengthSmaller = commonLengthLarger = 0; + for (; nbCompares && (dictMatchIndex > dmsLowLimit); --nbCompares) { + const U32* const nextPtr = dmsBt + 2*(dictMatchIndex & dmsBtMask); + size_t matchLength = MIN(commonLengthSmaller, commonLengthLarger); /* guaranteed minimum nb of common bytes */ + const BYTE* match = dmsBase + dictMatchIndex; + matchLength += ZSTD_count_2segments(ip+matchLength, match+matchLength, iLimit, dmsEnd, prefixStart); + if (dictMatchIndex+matchLength >= dmsHighLimit) + match = base + dictMatchIndex + dmsIndexDelta; /* to prepare for next usage of match[matchLength] */ + + if (matchLength > bestLength) { + matchIndex = dictMatchIndex + dmsIndexDelta; + DEBUGLOG(8, "found dms match of length %u at distance %u (offBase=%u)", + (U32)matchLength, curr - matchIndex, OFFSET_TO_OFFBASE(curr - matchIndex)); + if (matchLength > matchEndIdx - matchIndex) + matchEndIdx = matchIndex + (U32)matchLength; + bestLength = matchLength; + matches[mnum].off = OFFSET_TO_OFFBASE(curr - matchIndex); + matches[mnum].len = (U32)matchLength; + mnum++; + if ( (matchLength > ZSTD_OPT_NUM) + | (ip+matchLength == iLimit) /* equal : no way to know if inf or sup */) { + break; /* drop, to guarantee consistency (miss a little bit of compression) */ + } } + + if (dictMatchIndex <= dmsBtLow) { break; } /* beyond tree size, stop the search */ + if (match[matchLength] < ip[matchLength]) { + commonLengthSmaller = matchLength; /* all smaller will now have at least this guaranteed common length */ + dictMatchIndex = nextPtr[1]; /* new matchIndex larger than previous (closer to current) */ + } else { + /* match is larger than current */ + commonLengthLarger = matchLength; + dictMatchIndex = nextPtr[0]; + } } } /* if (dictMode == ZSTD_dictMatchState) */ + + assert(matchEndIdx > curr+8); + ms->nextToUpdate = matchEndIdx - 8; /* skip repetitive patterns */ + return mnum; +} + +typedef U32 (*ZSTD_getAllMatchesFn)( + ZSTD_match_t*, + ZSTD_matchState_t*, + U32*, + const BYTE*, + const BYTE*, + const U32 rep[ZSTD_REP_NUM], + U32 const ll0, + U32 const lengthToBeat); + +FORCE_INLINE_TEMPLATE +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +U32 ZSTD_btGetAllMatches_internal( + ZSTD_match_t* matches, + ZSTD_matchState_t* ms, + U32* nextToUpdate3, + const BYTE* ip, + const BYTE* const iHighLimit, + const U32 rep[ZSTD_REP_NUM], + U32 const ll0, + U32 const lengthToBeat, + const ZSTD_dictMode_e dictMode, + const U32 mls) +{ + assert(BOUNDED(3, ms->cParams.minMatch, 6) == mls); + DEBUGLOG(8, "ZSTD_BtGetAllMatches(dictMode=%d, mls=%u)", (int)dictMode, mls); + if (ip < ms->window.base + ms->nextToUpdate) + return 0; /* skipped area */ + ZSTD_updateTree_internal(ms, ip, iHighLimit, mls, dictMode); + return ZSTD_insertBtAndGetAllMatches(matches, ms, nextToUpdate3, ip, iHighLimit, dictMode, rep, ll0, lengthToBeat, mls); +} + +#define ZSTD_BT_GET_ALL_MATCHES_FN(dictMode, mls) ZSTD_btGetAllMatches_##dictMode##_##mls + +#define GEN_ZSTD_BT_GET_ALL_MATCHES_(dictMode, mls) \ + static U32 ZSTD_BT_GET_ALL_MATCHES_FN(dictMode, mls)( \ + ZSTD_match_t* matches, \ + ZSTD_matchState_t* ms, \ + U32* nextToUpdate3, \ + const BYTE* ip, \ + const BYTE* const iHighLimit, \ + const U32 rep[ZSTD_REP_NUM], \ + U32 const ll0, \ + U32 const lengthToBeat) \ + { \ + return ZSTD_btGetAllMatches_internal( \ + matches, ms, nextToUpdate3, ip, iHighLimit, \ + rep, ll0, lengthToBeat, ZSTD_##dictMode, mls); \ + } + +#define GEN_ZSTD_BT_GET_ALL_MATCHES(dictMode) \ + GEN_ZSTD_BT_GET_ALL_MATCHES_(dictMode, 3) \ + GEN_ZSTD_BT_GET_ALL_MATCHES_(dictMode, 4) \ + GEN_ZSTD_BT_GET_ALL_MATCHES_(dictMode, 5) \ + GEN_ZSTD_BT_GET_ALL_MATCHES_(dictMode, 6) + +GEN_ZSTD_BT_GET_ALL_MATCHES(noDict) +GEN_ZSTD_BT_GET_ALL_MATCHES(extDict) +GEN_ZSTD_BT_GET_ALL_MATCHES(dictMatchState) + +#define ZSTD_BT_GET_ALL_MATCHES_ARRAY(dictMode) \ + { \ + ZSTD_BT_GET_ALL_MATCHES_FN(dictMode, 3), \ + ZSTD_BT_GET_ALL_MATCHES_FN(dictMode, 4), \ + ZSTD_BT_GET_ALL_MATCHES_FN(dictMode, 5), \ + ZSTD_BT_GET_ALL_MATCHES_FN(dictMode, 6) \ + } + +static ZSTD_getAllMatchesFn +ZSTD_selectBtGetAllMatches(ZSTD_matchState_t const* ms, ZSTD_dictMode_e const dictMode) +{ + ZSTD_getAllMatchesFn const getAllMatchesFns[3][4] = { + ZSTD_BT_GET_ALL_MATCHES_ARRAY(noDict), + ZSTD_BT_GET_ALL_MATCHES_ARRAY(extDict), + ZSTD_BT_GET_ALL_MATCHES_ARRAY(dictMatchState) + }; + U32 const mls = BOUNDED(3, ms->cParams.minMatch, 6); + assert((U32)dictMode < 3); + assert(mls - 3 < 4); + return getAllMatchesFns[(int)dictMode][mls - 3]; +} + +/************************* +* LDM helper functions * +*************************/ + +/* Struct containing info needed to make decision about ldm inclusion */ +typedef struct { + rawSeqStore_t seqStore; /* External match candidates store for this block */ + U32 startPosInBlock; /* Start position of the current match candidate */ + U32 endPosInBlock; /* End position of the current match candidate */ + U32 offset; /* Offset of the match candidate */ +} ZSTD_optLdm_t; + +/* ZSTD_optLdm_skipRawSeqStoreBytes(): + * Moves forward in @rawSeqStore by @nbBytes, + * which will update the fields 'pos' and 'posInSequence'. + */ +static void ZSTD_optLdm_skipRawSeqStoreBytes(rawSeqStore_t* rawSeqStore, size_t nbBytes) +{ + U32 currPos = (U32)(rawSeqStore->posInSequence + nbBytes); + while (currPos && rawSeqStore->pos < rawSeqStore->size) { + rawSeq currSeq = rawSeqStore->seq[rawSeqStore->pos]; + if (currPos >= currSeq.litLength + currSeq.matchLength) { + currPos -= currSeq.litLength + currSeq.matchLength; + rawSeqStore->pos++; + } else { + rawSeqStore->posInSequence = currPos; + break; + } + } + if (currPos == 0 || rawSeqStore->pos == rawSeqStore->size) { + rawSeqStore->posInSequence = 0; + } +} + +/* ZSTD_opt_getNextMatchAndUpdateSeqStore(): + * Calculates the beginning and end of the next match in the current block. + * Updates 'pos' and 'posInSequence' of the ldmSeqStore. + */ +static void +ZSTD_opt_getNextMatchAndUpdateSeqStore(ZSTD_optLdm_t* optLdm, U32 currPosInBlock, + U32 blockBytesRemaining) +{ + rawSeq currSeq; + U32 currBlockEndPos; + U32 literalsBytesRemaining; + U32 matchBytesRemaining; + + /* Setting match end position to MAX to ensure we never use an LDM during this block */ + if (optLdm->seqStore.size == 0 || optLdm->seqStore.pos >= optLdm->seqStore.size) { + optLdm->startPosInBlock = UINT_MAX; + optLdm->endPosInBlock = UINT_MAX; + return; + } + /* Calculate appropriate bytes left in matchLength and litLength + * after adjusting based on ldmSeqStore->posInSequence */ + currSeq = optLdm->seqStore.seq[optLdm->seqStore.pos]; + assert(optLdm->seqStore.posInSequence <= currSeq.litLength + currSeq.matchLength); + currBlockEndPos = currPosInBlock + blockBytesRemaining; + literalsBytesRemaining = (optLdm->seqStore.posInSequence < currSeq.litLength) ? + currSeq.litLength - (U32)optLdm->seqStore.posInSequence : + 0; + matchBytesRemaining = (literalsBytesRemaining == 0) ? + currSeq.matchLength - ((U32)optLdm->seqStore.posInSequence - currSeq.litLength) : + currSeq.matchLength; + + /* If there are more literal bytes than bytes remaining in block, no ldm is possible */ + if (literalsBytesRemaining >= blockBytesRemaining) { + optLdm->startPosInBlock = UINT_MAX; + optLdm->endPosInBlock = UINT_MAX; + ZSTD_optLdm_skipRawSeqStoreBytes(&optLdm->seqStore, blockBytesRemaining); + return; + } + + /* Matches may be < MINMATCH by this process. In that case, we will reject them + when we are deciding whether or not to add the ldm */ + optLdm->startPosInBlock = currPosInBlock + literalsBytesRemaining; + optLdm->endPosInBlock = optLdm->startPosInBlock + matchBytesRemaining; + optLdm->offset = currSeq.offset; + + if (optLdm->endPosInBlock > currBlockEndPos) { + /* Match ends after the block ends, we can't use the whole match */ + optLdm->endPosInBlock = currBlockEndPos; + ZSTD_optLdm_skipRawSeqStoreBytes(&optLdm->seqStore, currBlockEndPos - currPosInBlock); + } else { + /* Consume nb of bytes equal to size of sequence left */ + ZSTD_optLdm_skipRawSeqStoreBytes(&optLdm->seqStore, literalsBytesRemaining + matchBytesRemaining); + } +} + +/* ZSTD_optLdm_maybeAddMatch(): + * Adds a match if it's long enough, + * based on it's 'matchStartPosInBlock' and 'matchEndPosInBlock', + * into 'matches'. Maintains the correct ordering of 'matches'. + */ +static void ZSTD_optLdm_maybeAddMatch(ZSTD_match_t* matches, U32* nbMatches, + const ZSTD_optLdm_t* optLdm, U32 currPosInBlock) +{ + U32 const posDiff = currPosInBlock - optLdm->startPosInBlock; + /* Note: ZSTD_match_t actually contains offBase and matchLength (before subtracting MINMATCH) */ + U32 const candidateMatchLength = optLdm->endPosInBlock - optLdm->startPosInBlock - posDiff; + + /* Ensure that current block position is not outside of the match */ + if (currPosInBlock < optLdm->startPosInBlock + || currPosInBlock >= optLdm->endPosInBlock + || candidateMatchLength < MINMATCH) { + return; + } + + if (*nbMatches == 0 || ((candidateMatchLength > matches[*nbMatches-1].len) && *nbMatches < ZSTD_OPT_NUM)) { + U32 const candidateOffBase = OFFSET_TO_OFFBASE(optLdm->offset); + DEBUGLOG(6, "ZSTD_optLdm_maybeAddMatch(): Adding ldm candidate match (offBase: %u matchLength %u) at block position=%u", + candidateOffBase, candidateMatchLength, currPosInBlock); + matches[*nbMatches].len = candidateMatchLength; + matches[*nbMatches].off = candidateOffBase; + (*nbMatches)++; + } +} + +/* ZSTD_optLdm_processMatchCandidate(): + * Wrapper function to update ldm seq store and call ldm functions as necessary. + */ +static void +ZSTD_optLdm_processMatchCandidate(ZSTD_optLdm_t* optLdm, + ZSTD_match_t* matches, U32* nbMatches, + U32 currPosInBlock, U32 remainingBytes) +{ + if (optLdm->seqStore.size == 0 || optLdm->seqStore.pos >= optLdm->seqStore.size) { + return; + } + + if (currPosInBlock >= optLdm->endPosInBlock) { + if (currPosInBlock > optLdm->endPosInBlock) { + /* The position at which ZSTD_optLdm_processMatchCandidate() is called is not necessarily + * at the end of a match from the ldm seq store, and will often be some bytes + * over beyond matchEndPosInBlock. As such, we need to correct for these "overshoots" + */ + U32 const posOvershoot = currPosInBlock - optLdm->endPosInBlock; + ZSTD_optLdm_skipRawSeqStoreBytes(&optLdm->seqStore, posOvershoot); + } + ZSTD_opt_getNextMatchAndUpdateSeqStore(optLdm, currPosInBlock, remainingBytes); + } + ZSTD_optLdm_maybeAddMatch(matches, nbMatches, optLdm, currPosInBlock); +} + + +/*-******************************* +* Optimal parser +*********************************/ + +#if 0 /* debug */ + +static void +listStats(const U32* table, int lastEltID) +{ + int const nbElts = lastEltID + 1; + int enb; + for (enb=0; enb < nbElts; enb++) { + (void)table; + /* RAWLOG(2, "%3i:%3i, ", enb, table[enb]); */ + RAWLOG(2, "%4i,", table[enb]); + } + RAWLOG(2, " \n"); +} + +#endif + +#define LIT_PRICE(_p) (int)ZSTD_rawLiteralsCost(_p, 1, optStatePtr, optLevel) +#define LL_PRICE(_l) (int)ZSTD_litLengthPrice(_l, optStatePtr, optLevel) +#define LL_INCPRICE(_l) (LL_PRICE(_l) - LL_PRICE(_l-1)) + +FORCE_INLINE_TEMPLATE +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +size_t +ZSTD_compressBlock_opt_generic(ZSTD_matchState_t* ms, + seqStore_t* seqStore, + U32 rep[ZSTD_REP_NUM], + const void* src, size_t srcSize, + const int optLevel, + const ZSTD_dictMode_e dictMode) +{ + optState_t* const optStatePtr = &ms->opt; + const BYTE* const istart = (const BYTE*)src; + const BYTE* ip = istart; + const BYTE* anchor = istart; + const BYTE* const iend = istart + srcSize; + const BYTE* const ilimit = iend - 8; + const BYTE* const base = ms->window.base; + const BYTE* const prefixStart = base + ms->window.dictLimit; + const ZSTD_compressionParameters* const cParams = &ms->cParams; + + ZSTD_getAllMatchesFn getAllMatches = ZSTD_selectBtGetAllMatches(ms, dictMode); + + U32 const sufficient_len = MIN(cParams->targetLength, ZSTD_OPT_NUM -1); + U32 const minMatch = (cParams->minMatch == 3) ? 3 : 4; + U32 nextToUpdate3 = ms->nextToUpdate; + + ZSTD_optimal_t* const opt = optStatePtr->priceTable; + ZSTD_match_t* const matches = optStatePtr->matchTable; + ZSTD_optimal_t lastStretch; + ZSTD_optLdm_t optLdm; + + ZSTD_memset(&lastStretch, 0, sizeof(ZSTD_optimal_t)); + + optLdm.seqStore = ms->ldmSeqStore ? *ms->ldmSeqStore : kNullRawSeqStore; + optLdm.endPosInBlock = optLdm.startPosInBlock = optLdm.offset = 0; + ZSTD_opt_getNextMatchAndUpdateSeqStore(&optLdm, (U32)(ip-istart), (U32)(iend-ip)); + + /* init */ + DEBUGLOG(5, "ZSTD_compressBlock_opt_generic: current=%u, prefix=%u, nextToUpdate=%u", + (U32)(ip - base), ms->window.dictLimit, ms->nextToUpdate); + assert(optLevel <= 2); + ZSTD_rescaleFreqs(optStatePtr, (const BYTE*)src, srcSize, optLevel); + ip += (ip==prefixStart); + + /* Match Loop */ + while (ip < ilimit) { + U32 cur, last_pos = 0; + + /* find first match */ + { U32 const litlen = (U32)(ip - anchor); + U32 const ll0 = !litlen; + U32 nbMatches = getAllMatches(matches, ms, &nextToUpdate3, ip, iend, rep, ll0, minMatch); + ZSTD_optLdm_processMatchCandidate(&optLdm, matches, &nbMatches, + (U32)(ip-istart), (U32)(iend-ip)); + if (!nbMatches) { + DEBUGLOG(8, "no match found at cPos %u", (unsigned)(ip-istart)); + ip++; + continue; + } + + /* Match found: let's store this solution, and eventually find more candidates. + * During this forward pass, @opt is used to store stretches, + * defined as "a match followed by N literals". + * Note how this is different from a Sequence, which is "N literals followed by a match". + * Storing stretches allows us to store different match predecessors + * for each literal position part of a literals run. */ + + /* initialize opt[0] */ + opt[0].mlen = 0; /* there are only literals so far */ + opt[0].litlen = litlen; + /* No need to include the actual price of the literals before the first match + * because it is static for the duration of the forward pass, and is included + * in every subsequent price. But, we include the literal length because + * the cost variation of litlen depends on the value of litlen. + */ + opt[0].price = LL_PRICE(litlen); + ZSTD_STATIC_ASSERT(sizeof(opt[0].rep[0]) == sizeof(rep[0])); + ZSTD_memcpy(&opt[0].rep, rep, sizeof(opt[0].rep)); + + /* large match -> immediate encoding */ + { U32 const maxML = matches[nbMatches-1].len; + U32 const maxOffBase = matches[nbMatches-1].off; + DEBUGLOG(6, "found %u matches of maxLength=%u and maxOffBase=%u at cPos=%u => start new series", + nbMatches, maxML, maxOffBase, (U32)(ip-prefixStart)); + + if (maxML > sufficient_len) { + lastStretch.litlen = 0; + lastStretch.mlen = maxML; + lastStretch.off = maxOffBase; + DEBUGLOG(6, "large match (%u>%u) => immediate encoding", + maxML, sufficient_len); + cur = 0; + last_pos = maxML; + goto _shortestPath; + } } + + /* set prices for first matches starting position == 0 */ + assert(opt[0].price >= 0); + { U32 pos; + U32 matchNb; + for (pos = 1; pos < minMatch; pos++) { + opt[pos].price = ZSTD_MAX_PRICE; + opt[pos].mlen = 0; + opt[pos].litlen = litlen + pos; + } + for (matchNb = 0; matchNb < nbMatches; matchNb++) { + U32 const offBase = matches[matchNb].off; + U32 const end = matches[matchNb].len; + for ( ; pos <= end ; pos++ ) { + int const matchPrice = (int)ZSTD_getMatchPrice(offBase, pos, optStatePtr, optLevel); + int const sequencePrice = opt[0].price + matchPrice; + DEBUGLOG(7, "rPos:%u => set initial price : %.2f", + pos, ZSTD_fCost(sequencePrice)); + opt[pos].mlen = pos; + opt[pos].off = offBase; + opt[pos].litlen = 0; /* end of match */ + opt[pos].price = sequencePrice + LL_PRICE(0); + } + } + last_pos = pos-1; + opt[pos].price = ZSTD_MAX_PRICE; + } + } + + /* check further positions */ + for (cur = 1; cur <= last_pos; cur++) { + const BYTE* const inr = ip + cur; + assert(cur <= ZSTD_OPT_NUM); + DEBUGLOG(7, "cPos:%zi==rPos:%u", inr-istart, cur); + + /* Fix current position with one literal if cheaper */ + { U32 const litlen = opt[cur-1].litlen + 1; + int const price = opt[cur-1].price + + LIT_PRICE(ip+cur-1) + + LL_INCPRICE(litlen); + assert(price < 1000000000); /* overflow check */ + if (price <= opt[cur].price) { + ZSTD_optimal_t const prevMatch = opt[cur]; + DEBUGLOG(7, "cPos:%zi==rPos:%u : better price (%.2f<=%.2f) using literal (ll==%u) (hist:%u,%u,%u)", + inr-istart, cur, ZSTD_fCost(price), ZSTD_fCost(opt[cur].price), litlen, + opt[cur-1].rep[0], opt[cur-1].rep[1], opt[cur-1].rep[2]); + opt[cur] = opt[cur-1]; + opt[cur].litlen = litlen; + opt[cur].price = price; + if ( (optLevel >= 1) /* additional check only for higher modes */ + && (prevMatch.litlen == 0) /* replace a match */ + && (LL_INCPRICE(1) < 0) /* ll1 is cheaper than ll0 */ + && LIKELY(ip + cur < iend) + ) { + /* check next position, in case it would be cheaper */ + int with1literal = prevMatch.price + LIT_PRICE(ip+cur) + LL_INCPRICE(1); + int withMoreLiterals = price + LIT_PRICE(ip+cur) + LL_INCPRICE(litlen+1); + DEBUGLOG(7, "then at next rPos %u : match+1lit %.2f vs %ulits %.2f", + cur+1, ZSTD_fCost(with1literal), litlen+1, ZSTD_fCost(withMoreLiterals)); + if ( (with1literal < withMoreLiterals) + && (with1literal < opt[cur+1].price) ) { + /* update offset history - before it disappears */ + U32 const prev = cur - prevMatch.mlen; + repcodes_t const newReps = ZSTD_newRep(opt[prev].rep, prevMatch.off, opt[prev].litlen==0); + assert(cur >= prevMatch.mlen); + DEBUGLOG(7, "==> match+1lit is cheaper (%.2f < %.2f) (hist:%u,%u,%u) !", + ZSTD_fCost(with1literal), ZSTD_fCost(withMoreLiterals), + newReps.rep[0], newReps.rep[1], newReps.rep[2] ); + opt[cur+1] = prevMatch; /* mlen & offbase */ + ZSTD_memcpy(opt[cur+1].rep, &newReps, sizeof(repcodes_t)); + opt[cur+1].litlen = 1; + opt[cur+1].price = with1literal; + if (last_pos < cur+1) last_pos = cur+1; + } + } + } else { + DEBUGLOG(7, "cPos:%zi==rPos:%u : literal would cost more (%.2f>%.2f)", + inr-istart, cur, ZSTD_fCost(price), ZSTD_fCost(opt[cur].price)); + } + } + + /* Offset history is not updated during match comparison. + * Do it here, now that the match is selected and confirmed. + */ + ZSTD_STATIC_ASSERT(sizeof(opt[cur].rep) == sizeof(repcodes_t)); + assert(cur >= opt[cur].mlen); + if (opt[cur].litlen == 0) { + /* just finished a match => alter offset history */ + U32 const prev = cur - opt[cur].mlen; + repcodes_t const newReps = ZSTD_newRep(opt[prev].rep, opt[cur].off, opt[prev].litlen==0); + ZSTD_memcpy(opt[cur].rep, &newReps, sizeof(repcodes_t)); + } + + /* last match must start at a minimum distance of 8 from oend */ + if (inr > ilimit) continue; + + if (cur == last_pos) break; + + if ( (optLevel==0) /*static_test*/ + && (opt[cur+1].price <= opt[cur].price + (BITCOST_MULTIPLIER/2)) ) { + DEBUGLOG(7, "skip current position : next rPos(%u) price is cheaper", cur+1); + continue; /* skip unpromising positions; about ~+6% speed, -0.01 ratio */ + } + + assert(opt[cur].price >= 0); + { U32 const ll0 = (opt[cur].litlen == 0); + int const previousPrice = opt[cur].price; + int const basePrice = previousPrice + LL_PRICE(0); + U32 nbMatches = getAllMatches(matches, ms, &nextToUpdate3, inr, iend, opt[cur].rep, ll0, minMatch); + U32 matchNb; + + ZSTD_optLdm_processMatchCandidate(&optLdm, matches, &nbMatches, + (U32)(inr-istart), (U32)(iend-inr)); + + if (!nbMatches) { + DEBUGLOG(7, "rPos:%u : no match found", cur); + continue; + } + + { U32 const longestML = matches[nbMatches-1].len; + DEBUGLOG(7, "cPos:%zi==rPos:%u, found %u matches, of longest ML=%u", + inr-istart, cur, nbMatches, longestML); + + if ( (longestML > sufficient_len) + || (cur + longestML >= ZSTD_OPT_NUM) + || (ip + cur + longestML >= iend) ) { + lastStretch.mlen = longestML; + lastStretch.off = matches[nbMatches-1].off; + lastStretch.litlen = 0; + last_pos = cur + longestML; + goto _shortestPath; + } } + + /* set prices using matches found at position == cur */ + for (matchNb = 0; matchNb < nbMatches; matchNb++) { + U32 const offset = matches[matchNb].off; + U32 const lastML = matches[matchNb].len; + U32 const startML = (matchNb>0) ? matches[matchNb-1].len+1 : minMatch; + U32 mlen; + + DEBUGLOG(7, "testing match %u => offBase=%4u, mlen=%2u, llen=%2u", + matchNb, matches[matchNb].off, lastML, opt[cur].litlen); + + for (mlen = lastML; mlen >= startML; mlen--) { /* scan downward */ + U32 const pos = cur + mlen; + int const price = basePrice + (int)ZSTD_getMatchPrice(offset, mlen, optStatePtr, optLevel); + + if ((pos > last_pos) || (price < opt[pos].price)) { + DEBUGLOG(7, "rPos:%u (ml=%2u) => new better price (%.2f<%.2f)", + pos, mlen, ZSTD_fCost(price), ZSTD_fCost(opt[pos].price)); + while (last_pos < pos) { + /* fill empty positions, for future comparisons */ + last_pos++; + opt[last_pos].price = ZSTD_MAX_PRICE; + opt[last_pos].litlen = !0; /* just needs to be != 0, to mean "not an end of match" */ + } + opt[pos].mlen = mlen; + opt[pos].off = offset; + opt[pos].litlen = 0; + opt[pos].price = price; + } else { + DEBUGLOG(7, "rPos:%u (ml=%2u) => new price is worse (%.2f>=%.2f)", + pos, mlen, ZSTD_fCost(price), ZSTD_fCost(opt[pos].price)); + if (optLevel==0) break; /* early update abort; gets ~+10% speed for about -0.01 ratio loss */ + } + } } } + opt[last_pos+1].price = ZSTD_MAX_PRICE; + } /* for (cur = 1; cur <= last_pos; cur++) */ + + lastStretch = opt[last_pos]; + assert(cur >= lastStretch.mlen); + cur = last_pos - lastStretch.mlen; + +_shortestPath: /* cur, last_pos, best_mlen, best_off have to be set */ + assert(opt[0].mlen == 0); + assert(last_pos >= lastStretch.mlen); + assert(cur == last_pos - lastStretch.mlen); + + if (lastStretch.mlen==0) { + /* no solution : all matches have been converted into literals */ + assert(lastStretch.litlen == (ip - anchor) + last_pos); + ip += last_pos; + continue; + } + assert(lastStretch.off > 0); + + /* Update offset history */ + if (lastStretch.litlen == 0) { + /* finishing on a match : update offset history */ + repcodes_t const reps = ZSTD_newRep(opt[cur].rep, lastStretch.off, opt[cur].litlen==0); + ZSTD_memcpy(rep, &reps, sizeof(repcodes_t)); + } else { + ZSTD_memcpy(rep, lastStretch.rep, sizeof(repcodes_t)); + assert(cur >= lastStretch.litlen); + cur -= lastStretch.litlen; + } + + /* Let's write the shortest path solution. + * It is stored in @opt in reverse order, + * starting from @storeEnd (==cur+2), + * effectively partially @opt overwriting. + * Content is changed too: + * - So far, @opt stored stretches, aka a match followed by literals + * - Now, it will store sequences, aka literals followed by a match + */ + { U32 const storeEnd = cur + 2; + U32 storeStart = storeEnd; + U32 stretchPos = cur; + + DEBUGLOG(6, "start reverse traversal (last_pos:%u, cur:%u)", + last_pos, cur); (void)last_pos; + assert(storeEnd < ZSTD_OPT_SIZE); + DEBUGLOG(6, "last stretch copied into pos=%u (llen=%u,mlen=%u,ofc=%u)", + storeEnd, lastStretch.litlen, lastStretch.mlen, lastStretch.off); + if (lastStretch.litlen > 0) { + /* last "sequence" is unfinished: just a bunch of literals */ + opt[storeEnd].litlen = lastStretch.litlen; + opt[storeEnd].mlen = 0; + storeStart = storeEnd-1; + opt[storeStart] = lastStretch; + } { + opt[storeEnd] = lastStretch; /* note: litlen will be fixed */ + storeStart = storeEnd; + } + while (1) { + ZSTD_optimal_t nextStretch = opt[stretchPos]; + opt[storeStart].litlen = nextStretch.litlen; + DEBUGLOG(6, "selected sequence (llen=%u,mlen=%u,ofc=%u)", + opt[storeStart].litlen, opt[storeStart].mlen, opt[storeStart].off); + if (nextStretch.mlen == 0) { + /* reaching beginning of segment */ + break; + } + storeStart--; + opt[storeStart] = nextStretch; /* note: litlen will be fixed */ + assert(nextStretch.litlen + nextStretch.mlen <= stretchPos); + stretchPos -= nextStretch.litlen + nextStretch.mlen; + } + + /* save sequences */ + DEBUGLOG(6, "sending selected sequences into seqStore"); + { U32 storePos; + for (storePos=storeStart; storePos <= storeEnd; storePos++) { + U32 const llen = opt[storePos].litlen; + U32 const mlen = opt[storePos].mlen; + U32 const offBase = opt[storePos].off; + U32 const advance = llen + mlen; + DEBUGLOG(6, "considering seq starting at %zi, llen=%u, mlen=%u", + anchor - istart, (unsigned)llen, (unsigned)mlen); + + if (mlen==0) { /* only literals => must be last "sequence", actually starting a new stream of sequences */ + assert(storePos == storeEnd); /* must be last sequence */ + ip = anchor + llen; /* last "sequence" is a bunch of literals => don't progress anchor */ + continue; /* will finish */ + } + + assert(anchor + llen <= iend); + ZSTD_updateStats(optStatePtr, llen, anchor, offBase, mlen); + ZSTD_storeSeq(seqStore, llen, anchor, iend, offBase, mlen); + anchor += advance; + ip = anchor; + } } + DEBUGLOG(7, "new offset history : %u, %u, %u", rep[0], rep[1], rep[2]); + + /* update all costs */ + ZSTD_setBasePrices(optStatePtr, optLevel); + } + } /* while (ip < ilimit) */ + + /* Return the last literals size */ + return (size_t)(iend - anchor); +} +#endif /* build exclusions */ + +#ifndef ZSTD_EXCLUDE_BTOPT_BLOCK_COMPRESSOR +static size_t ZSTD_compressBlock_opt0( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + const void* src, size_t srcSize, const ZSTD_dictMode_e dictMode) +{ + return ZSTD_compressBlock_opt_generic(ms, seqStore, rep, src, srcSize, 0 /* optLevel */, dictMode); +} +#endif + +#ifndef ZSTD_EXCLUDE_BTULTRA_BLOCK_COMPRESSOR +static size_t ZSTD_compressBlock_opt2( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + const void* src, size_t srcSize, const ZSTD_dictMode_e dictMode) +{ + return ZSTD_compressBlock_opt_generic(ms, seqStore, rep, src, srcSize, 2 /* optLevel */, dictMode); +} +#endif + +#ifndef ZSTD_EXCLUDE_BTOPT_BLOCK_COMPRESSOR +size_t ZSTD_compressBlock_btopt( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + const void* src, size_t srcSize) +{ + DEBUGLOG(5, "ZSTD_compressBlock_btopt"); + return ZSTD_compressBlock_opt0(ms, seqStore, rep, src, srcSize, ZSTD_noDict); +} +#endif + + + + +#ifndef ZSTD_EXCLUDE_BTULTRA_BLOCK_COMPRESSOR +/* ZSTD_initStats_ultra(): + * make a first compression pass, just to seed stats with more accurate starting values. + * only works on first block, with no dictionary and no ldm. + * this function cannot error out, its narrow contract must be respected. + */ +static +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +void ZSTD_initStats_ultra(ZSTD_matchState_t* ms, + seqStore_t* seqStore, + U32 rep[ZSTD_REP_NUM], + const void* src, size_t srcSize) +{ + U32 tmpRep[ZSTD_REP_NUM]; /* updated rep codes will sink here */ + ZSTD_memcpy(tmpRep, rep, sizeof(tmpRep)); + + DEBUGLOG(4, "ZSTD_initStats_ultra (srcSize=%zu)", srcSize); + assert(ms->opt.litLengthSum == 0); /* first block */ + assert(seqStore->sequences == seqStore->sequencesStart); /* no ldm */ + assert(ms->window.dictLimit == ms->window.lowLimit); /* no dictionary */ + assert(ms->window.dictLimit - ms->nextToUpdate <= 1); /* no prefix (note: intentional overflow, defined as 2-complement) */ + + ZSTD_compressBlock_opt2(ms, seqStore, tmpRep, src, srcSize, ZSTD_noDict); /* generate stats into ms->opt*/ + + /* invalidate first scan from history, only keep entropy stats */ + ZSTD_resetSeqStore(seqStore); + ms->window.base -= srcSize; + ms->window.dictLimit += (U32)srcSize; + ms->window.lowLimit = ms->window.dictLimit; + ms->nextToUpdate = ms->window.dictLimit; + +} + +size_t ZSTD_compressBlock_btultra( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + const void* src, size_t srcSize) +{ + DEBUGLOG(5, "ZSTD_compressBlock_btultra (srcSize=%zu)", srcSize); + return ZSTD_compressBlock_opt2(ms, seqStore, rep, src, srcSize, ZSTD_noDict); +} + +size_t ZSTD_compressBlock_btultra2( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + const void* src, size_t srcSize) +{ + U32 const curr = (U32)((const BYTE*)src - ms->window.base); + DEBUGLOG(5, "ZSTD_compressBlock_btultra2 (srcSize=%zu)", srcSize); + + /* 2-passes strategy: + * this strategy makes a first pass over first block to collect statistics + * in order to seed next round's statistics with it. + * After 1st pass, function forgets history, and starts a new block. + * Consequently, this can only work if no data has been previously loaded in tables, + * aka, no dictionary, no prefix, no ldm preprocessing. + * The compression ratio gain is generally small (~0.5% on first block), + * the cost is 2x cpu time on first block. */ + assert(srcSize <= ZSTD_BLOCKSIZE_MAX); + if ( (ms->opt.litLengthSum==0) /* first block */ + && (seqStore->sequences == seqStore->sequencesStart) /* no ldm */ + && (ms->window.dictLimit == ms->window.lowLimit) /* no dictionary */ + && (curr == ms->window.dictLimit) /* start of frame, nothing already loaded nor skipped */ + && (srcSize > ZSTD_PREDEF_THRESHOLD) /* input large enough to not employ default stats */ + ) { + ZSTD_initStats_ultra(ms, seqStore, rep, src, srcSize); + } + + return ZSTD_compressBlock_opt2(ms, seqStore, rep, src, srcSize, ZSTD_noDict); +} +#endif + +#ifndef ZSTD_EXCLUDE_BTOPT_BLOCK_COMPRESSOR +size_t ZSTD_compressBlock_btopt_dictMatchState( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + const void* src, size_t srcSize) +{ + return ZSTD_compressBlock_opt0(ms, seqStore, rep, src, srcSize, ZSTD_dictMatchState); +} + +size_t ZSTD_compressBlock_btopt_extDict( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + const void* src, size_t srcSize) +{ + return ZSTD_compressBlock_opt0(ms, seqStore, rep, src, srcSize, ZSTD_extDict); +} +#endif + +#ifndef ZSTD_EXCLUDE_BTULTRA_BLOCK_COMPRESSOR +size_t ZSTD_compressBlock_btultra_dictMatchState( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + const void* src, size_t srcSize) +{ + return ZSTD_compressBlock_opt2(ms, seqStore, rep, src, srcSize, ZSTD_dictMatchState); +} + +size_t ZSTD_compressBlock_btultra_extDict( + ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], + const void* src, size_t srcSize) +{ + return ZSTD_compressBlock_opt2(ms, seqStore, rep, src, srcSize, ZSTD_extDict); +} +#endif + +/* note : no btultra2 variant for extDict nor dictMatchState, + * because btultra2 is not meant to work with dictionaries + * and is only specific for the first block (no prefix) */ +/**** ended inlining compress/zstd_opt.c ****/ +#ifdef ZSTD_MULTITHREAD +/**** start inlining compress/zstdmt_compress.c ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + + +/* ====== Compiler specifics ====== */ +#if defined(_MSC_VER) +# pragma warning(disable : 4204) /* disable: C4204: non-constant aggregate initializer */ +#endif + + +/* ====== Dependencies ====== */ +/**** skipping file: ../common/allocations.h ****/ +/**** skipping file: ../common/zstd_deps.h ****/ +/**** skipping file: ../common/mem.h ****/ +/**** skipping file: ../common/pool.h ****/ +/**** skipping file: ../common/threading.h ****/ +/**** skipping file: zstd_compress_internal.h ****/ +/**** skipping file: zstd_ldm.h ****/ +/**** skipping file: zstdmt_compress.h ****/ + +/* Guards code to support resizing the SeqPool. + * We will want to resize the SeqPool to save memory in the future. + * Until then, comment the code out since it is unused. + */ +#define ZSTD_RESIZE_SEQPOOL 0 + +/* ====== Debug ====== */ +#if defined(DEBUGLEVEL) && (DEBUGLEVEL>=2) \ + && !defined(_MSC_VER) \ + && !defined(__MINGW32__) + +# include +# include +# include + +# define DEBUG_PRINTHEX(l,p,n) \ + do { \ + unsigned debug_u; \ + for (debug_u=0; debug_u<(n); debug_u++) \ + RAWLOG(l, "%02X ", ((const unsigned char*)(p))[debug_u]); \ + RAWLOG(l, " \n"); \ + } while (0) + +static unsigned long long GetCurrentClockTimeMicroseconds(void) +{ + static clock_t _ticksPerSecond = 0; + if (_ticksPerSecond <= 0) _ticksPerSecond = sysconf(_SC_CLK_TCK); + + { struct tms junk; clock_t newTicks = (clock_t) times(&junk); + return ((((unsigned long long)newTicks)*(1000000))/_ticksPerSecond); +} } + +#define MUTEX_WAIT_TIME_DLEVEL 6 +#define ZSTD_PTHREAD_MUTEX_LOCK(mutex) \ + do { \ + if (DEBUGLEVEL >= MUTEX_WAIT_TIME_DLEVEL) { \ + unsigned long long const beforeTime = GetCurrentClockTimeMicroseconds(); \ + ZSTD_pthread_mutex_lock(mutex); \ + { unsigned long long const afterTime = GetCurrentClockTimeMicroseconds(); \ + unsigned long long const elapsedTime = (afterTime-beforeTime); \ + if (elapsedTime > 1000) { \ + /* or whatever threshold you like; I'm using 1 millisecond here */ \ + DEBUGLOG(MUTEX_WAIT_TIME_DLEVEL, \ + "Thread took %llu microseconds to acquire mutex %s \n", \ + elapsedTime, #mutex); \ + } } \ + } else { \ + ZSTD_pthread_mutex_lock(mutex); \ + } \ + } while (0) + +#else + +# define ZSTD_PTHREAD_MUTEX_LOCK(m) ZSTD_pthread_mutex_lock(m) +# define DEBUG_PRINTHEX(l,p,n) do { } while (0) + +#endif + + +/* ===== Buffer Pool ===== */ +/* a single Buffer Pool can be invoked from multiple threads in parallel */ + +typedef struct buffer_s { + void* start; + size_t capacity; +} buffer_t; + +static const buffer_t g_nullBuffer = { NULL, 0 }; + +typedef struct ZSTDMT_bufferPool_s { + ZSTD_pthread_mutex_t poolMutex; + size_t bufferSize; + unsigned totalBuffers; + unsigned nbBuffers; + ZSTD_customMem cMem; + buffer_t* buffers; +} ZSTDMT_bufferPool; + +static void ZSTDMT_freeBufferPool(ZSTDMT_bufferPool* bufPool) +{ + DEBUGLOG(3, "ZSTDMT_freeBufferPool (address:%08X)", (U32)(size_t)bufPool); + if (!bufPool) return; /* compatibility with free on NULL */ + if (bufPool->buffers) { + unsigned u; + for (u=0; utotalBuffers; u++) { + DEBUGLOG(4, "free buffer %2u (address:%08X)", u, (U32)(size_t)bufPool->buffers[u].start); + ZSTD_customFree(bufPool->buffers[u].start, bufPool->cMem); + } + ZSTD_customFree(bufPool->buffers, bufPool->cMem); + } + ZSTD_pthread_mutex_destroy(&bufPool->poolMutex); + ZSTD_customFree(bufPool, bufPool->cMem); +} + +static ZSTDMT_bufferPool* ZSTDMT_createBufferPool(unsigned maxNbBuffers, ZSTD_customMem cMem) +{ + ZSTDMT_bufferPool* const bufPool = + (ZSTDMT_bufferPool*)ZSTD_customCalloc(sizeof(ZSTDMT_bufferPool), cMem); + if (bufPool==NULL) return NULL; + if (ZSTD_pthread_mutex_init(&bufPool->poolMutex, NULL)) { + ZSTD_customFree(bufPool, cMem); + return NULL; + } + bufPool->buffers = (buffer_t*)ZSTD_customCalloc(maxNbBuffers * sizeof(buffer_t), cMem); + if (bufPool->buffers==NULL) { + ZSTDMT_freeBufferPool(bufPool); + return NULL; + } + bufPool->bufferSize = 64 KB; + bufPool->totalBuffers = maxNbBuffers; + bufPool->nbBuffers = 0; + bufPool->cMem = cMem; + return bufPool; +} + +/* only works at initialization, not during compression */ +static size_t ZSTDMT_sizeof_bufferPool(ZSTDMT_bufferPool* bufPool) +{ + size_t const poolSize = sizeof(*bufPool); + size_t const arraySize = bufPool->totalBuffers * sizeof(buffer_t); + unsigned u; + size_t totalBufferSize = 0; + ZSTD_pthread_mutex_lock(&bufPool->poolMutex); + for (u=0; utotalBuffers; u++) + totalBufferSize += bufPool->buffers[u].capacity; + ZSTD_pthread_mutex_unlock(&bufPool->poolMutex); + + return poolSize + arraySize + totalBufferSize; +} + +/* ZSTDMT_setBufferSize() : + * all future buffers provided by this buffer pool will have _at least_ this size + * note : it's better for all buffers to have same size, + * as they become freely interchangeable, reducing malloc/free usages and memory fragmentation */ +static void ZSTDMT_setBufferSize(ZSTDMT_bufferPool* const bufPool, size_t const bSize) +{ + ZSTD_pthread_mutex_lock(&bufPool->poolMutex); + DEBUGLOG(4, "ZSTDMT_setBufferSize: bSize = %u", (U32)bSize); + bufPool->bufferSize = bSize; + ZSTD_pthread_mutex_unlock(&bufPool->poolMutex); +} + + +static ZSTDMT_bufferPool* ZSTDMT_expandBufferPool(ZSTDMT_bufferPool* srcBufPool, unsigned maxNbBuffers) +{ + if (srcBufPool==NULL) return NULL; + if (srcBufPool->totalBuffers >= maxNbBuffers) /* good enough */ + return srcBufPool; + /* need a larger buffer pool */ + { ZSTD_customMem const cMem = srcBufPool->cMem; + size_t const bSize = srcBufPool->bufferSize; /* forward parameters */ + ZSTDMT_bufferPool* newBufPool; + ZSTDMT_freeBufferPool(srcBufPool); + newBufPool = ZSTDMT_createBufferPool(maxNbBuffers, cMem); + if (newBufPool==NULL) return newBufPool; + ZSTDMT_setBufferSize(newBufPool, bSize); + return newBufPool; + } +} + +/** ZSTDMT_getBuffer() : + * assumption : bufPool must be valid + * @return : a buffer, with start pointer and size + * note: allocation may fail, in this case, start==NULL and size==0 */ +static buffer_t ZSTDMT_getBuffer(ZSTDMT_bufferPool* bufPool) +{ + size_t const bSize = bufPool->bufferSize; + DEBUGLOG(5, "ZSTDMT_getBuffer: bSize = %u", (U32)bufPool->bufferSize); + ZSTD_pthread_mutex_lock(&bufPool->poolMutex); + if (bufPool->nbBuffers) { /* try to use an existing buffer */ + buffer_t const buf = bufPool->buffers[--(bufPool->nbBuffers)]; + size_t const availBufferSize = buf.capacity; + bufPool->buffers[bufPool->nbBuffers] = g_nullBuffer; + if ((availBufferSize >= bSize) & ((availBufferSize>>3) <= bSize)) { + /* large enough, but not too much */ + DEBUGLOG(5, "ZSTDMT_getBuffer: provide buffer %u of size %u", + bufPool->nbBuffers, (U32)buf.capacity); + ZSTD_pthread_mutex_unlock(&bufPool->poolMutex); + return buf; + } + /* size conditions not respected : scratch this buffer, create new one */ + DEBUGLOG(5, "ZSTDMT_getBuffer: existing buffer does not meet size conditions => freeing"); + ZSTD_customFree(buf.start, bufPool->cMem); + } + ZSTD_pthread_mutex_unlock(&bufPool->poolMutex); + /* create new buffer */ + DEBUGLOG(5, "ZSTDMT_getBuffer: create a new buffer"); + { buffer_t buffer; + void* const start = ZSTD_customMalloc(bSize, bufPool->cMem); + buffer.start = start; /* note : start can be NULL if malloc fails ! */ + buffer.capacity = (start==NULL) ? 0 : bSize; + if (start==NULL) { + DEBUGLOG(5, "ZSTDMT_getBuffer: buffer allocation failure !!"); + } else { + DEBUGLOG(5, "ZSTDMT_getBuffer: created buffer of size %u", (U32)bSize); + } + return buffer; + } +} + +#if ZSTD_RESIZE_SEQPOOL +/** ZSTDMT_resizeBuffer() : + * assumption : bufPool must be valid + * @return : a buffer that is at least the buffer pool buffer size. + * If a reallocation happens, the data in the input buffer is copied. + */ +static buffer_t ZSTDMT_resizeBuffer(ZSTDMT_bufferPool* bufPool, buffer_t buffer) +{ + size_t const bSize = bufPool->bufferSize; + if (buffer.capacity < bSize) { + void* const start = ZSTD_customMalloc(bSize, bufPool->cMem); + buffer_t newBuffer; + newBuffer.start = start; + newBuffer.capacity = start == NULL ? 0 : bSize; + if (start != NULL) { + assert(newBuffer.capacity >= buffer.capacity); + ZSTD_memcpy(newBuffer.start, buffer.start, buffer.capacity); + DEBUGLOG(5, "ZSTDMT_resizeBuffer: created buffer of size %u", (U32)bSize); + return newBuffer; + } + DEBUGLOG(5, "ZSTDMT_resizeBuffer: buffer allocation failure !!"); + } + return buffer; +} +#endif + +/* store buffer for later re-use, up to pool capacity */ +static void ZSTDMT_releaseBuffer(ZSTDMT_bufferPool* bufPool, buffer_t buf) +{ + DEBUGLOG(5, "ZSTDMT_releaseBuffer"); + if (buf.start == NULL) return; /* compatible with release on NULL */ + ZSTD_pthread_mutex_lock(&bufPool->poolMutex); + if (bufPool->nbBuffers < bufPool->totalBuffers) { + bufPool->buffers[bufPool->nbBuffers++] = buf; /* stored for later use */ + DEBUGLOG(5, "ZSTDMT_releaseBuffer: stored buffer of size %u in slot %u", + (U32)buf.capacity, (U32)(bufPool->nbBuffers-1)); + ZSTD_pthread_mutex_unlock(&bufPool->poolMutex); + return; + } + ZSTD_pthread_mutex_unlock(&bufPool->poolMutex); + /* Reached bufferPool capacity (note: should not happen) */ + DEBUGLOG(5, "ZSTDMT_releaseBuffer: pool capacity reached => freeing "); + ZSTD_customFree(buf.start, bufPool->cMem); +} + +/* We need 2 output buffers per worker since each dstBuff must be flushed after it is released. + * The 3 additional buffers are as follows: + * 1 buffer for input loading + * 1 buffer for "next input" when submitting current one + * 1 buffer stuck in queue */ +#define BUF_POOL_MAX_NB_BUFFERS(nbWorkers) (2*(nbWorkers) + 3) + +/* After a worker releases its rawSeqStore, it is immediately ready for reuse. + * So we only need one seq buffer per worker. */ +#define SEQ_POOL_MAX_NB_BUFFERS(nbWorkers) (nbWorkers) + +/* ===== Seq Pool Wrapper ====== */ + +typedef ZSTDMT_bufferPool ZSTDMT_seqPool; + +static size_t ZSTDMT_sizeof_seqPool(ZSTDMT_seqPool* seqPool) +{ + return ZSTDMT_sizeof_bufferPool(seqPool); +} + +static rawSeqStore_t bufferToSeq(buffer_t buffer) +{ + rawSeqStore_t seq = kNullRawSeqStore; + seq.seq = (rawSeq*)buffer.start; + seq.capacity = buffer.capacity / sizeof(rawSeq); + return seq; +} + +static buffer_t seqToBuffer(rawSeqStore_t seq) +{ + buffer_t buffer; + buffer.start = seq.seq; + buffer.capacity = seq.capacity * sizeof(rawSeq); + return buffer; +} + +static rawSeqStore_t ZSTDMT_getSeq(ZSTDMT_seqPool* seqPool) +{ + if (seqPool->bufferSize == 0) { + return kNullRawSeqStore; + } + return bufferToSeq(ZSTDMT_getBuffer(seqPool)); +} + +#if ZSTD_RESIZE_SEQPOOL +static rawSeqStore_t ZSTDMT_resizeSeq(ZSTDMT_seqPool* seqPool, rawSeqStore_t seq) +{ + return bufferToSeq(ZSTDMT_resizeBuffer(seqPool, seqToBuffer(seq))); +} +#endif + +static void ZSTDMT_releaseSeq(ZSTDMT_seqPool* seqPool, rawSeqStore_t seq) +{ + ZSTDMT_releaseBuffer(seqPool, seqToBuffer(seq)); +} + +static void ZSTDMT_setNbSeq(ZSTDMT_seqPool* const seqPool, size_t const nbSeq) +{ + ZSTDMT_setBufferSize(seqPool, nbSeq * sizeof(rawSeq)); +} + +static ZSTDMT_seqPool* ZSTDMT_createSeqPool(unsigned nbWorkers, ZSTD_customMem cMem) +{ + ZSTDMT_seqPool* const seqPool = ZSTDMT_createBufferPool(SEQ_POOL_MAX_NB_BUFFERS(nbWorkers), cMem); + if (seqPool == NULL) return NULL; + ZSTDMT_setNbSeq(seqPool, 0); + return seqPool; +} + +static void ZSTDMT_freeSeqPool(ZSTDMT_seqPool* seqPool) +{ + ZSTDMT_freeBufferPool(seqPool); +} + +static ZSTDMT_seqPool* ZSTDMT_expandSeqPool(ZSTDMT_seqPool* pool, U32 nbWorkers) +{ + return ZSTDMT_expandBufferPool(pool, SEQ_POOL_MAX_NB_BUFFERS(nbWorkers)); +} + + +/* ===== CCtx Pool ===== */ +/* a single CCtx Pool can be invoked from multiple threads in parallel */ + +typedef struct { + ZSTD_pthread_mutex_t poolMutex; + int totalCCtx; + int availCCtx; + ZSTD_customMem cMem; + ZSTD_CCtx** cctxs; +} ZSTDMT_CCtxPool; + +/* note : all CCtx borrowed from the pool must be reverted back to the pool _before_ freeing the pool */ +static void ZSTDMT_freeCCtxPool(ZSTDMT_CCtxPool* pool) +{ + if (!pool) return; + ZSTD_pthread_mutex_destroy(&pool->poolMutex); + if (pool->cctxs) { + int cid; + for (cid=0; cidtotalCCtx; cid++) + ZSTD_freeCCtx(pool->cctxs[cid]); /* free compatible with NULL */ + ZSTD_customFree(pool->cctxs, pool->cMem); + } + ZSTD_customFree(pool, pool->cMem); +} + +/* ZSTDMT_createCCtxPool() : + * implies nbWorkers >= 1 , checked by caller ZSTDMT_createCCtx() */ +static ZSTDMT_CCtxPool* ZSTDMT_createCCtxPool(int nbWorkers, + ZSTD_customMem cMem) +{ + ZSTDMT_CCtxPool* const cctxPool = + (ZSTDMT_CCtxPool*) ZSTD_customCalloc(sizeof(ZSTDMT_CCtxPool), cMem); + assert(nbWorkers > 0); + if (!cctxPool) return NULL; + if (ZSTD_pthread_mutex_init(&cctxPool->poolMutex, NULL)) { + ZSTD_customFree(cctxPool, cMem); + return NULL; + } + cctxPool->totalCCtx = nbWorkers; + cctxPool->cctxs = (ZSTD_CCtx**)ZSTD_customCalloc(nbWorkers * sizeof(ZSTD_CCtx*), cMem); + if (!cctxPool->cctxs) { + ZSTDMT_freeCCtxPool(cctxPool); + return NULL; + } + cctxPool->cMem = cMem; + cctxPool->cctxs[0] = ZSTD_createCCtx_advanced(cMem); + if (!cctxPool->cctxs[0]) { ZSTDMT_freeCCtxPool(cctxPool); return NULL; } + cctxPool->availCCtx = 1; /* at least one cctx for single-thread mode */ + DEBUGLOG(3, "cctxPool created, with %u workers", nbWorkers); + return cctxPool; +} + +static ZSTDMT_CCtxPool* ZSTDMT_expandCCtxPool(ZSTDMT_CCtxPool* srcPool, + int nbWorkers) +{ + if (srcPool==NULL) return NULL; + if (nbWorkers <= srcPool->totalCCtx) return srcPool; /* good enough */ + /* need a larger cctx pool */ + { ZSTD_customMem const cMem = srcPool->cMem; + ZSTDMT_freeCCtxPool(srcPool); + return ZSTDMT_createCCtxPool(nbWorkers, cMem); + } +} + +/* only works during initialization phase, not during compression */ +static size_t ZSTDMT_sizeof_CCtxPool(ZSTDMT_CCtxPool* cctxPool) +{ + ZSTD_pthread_mutex_lock(&cctxPool->poolMutex); + { unsigned const nbWorkers = cctxPool->totalCCtx; + size_t const poolSize = sizeof(*cctxPool); + size_t const arraySize = cctxPool->totalCCtx * sizeof(ZSTD_CCtx*); + size_t totalCCtxSize = 0; + unsigned u; + for (u=0; ucctxs[u]); + } + ZSTD_pthread_mutex_unlock(&cctxPool->poolMutex); + assert(nbWorkers > 0); + return poolSize + arraySize + totalCCtxSize; + } +} + +static ZSTD_CCtx* ZSTDMT_getCCtx(ZSTDMT_CCtxPool* cctxPool) +{ + DEBUGLOG(5, "ZSTDMT_getCCtx"); + ZSTD_pthread_mutex_lock(&cctxPool->poolMutex); + if (cctxPool->availCCtx) { + cctxPool->availCCtx--; + { ZSTD_CCtx* const cctx = cctxPool->cctxs[cctxPool->availCCtx]; + ZSTD_pthread_mutex_unlock(&cctxPool->poolMutex); + return cctx; + } } + ZSTD_pthread_mutex_unlock(&cctxPool->poolMutex); + DEBUGLOG(5, "create one more CCtx"); + return ZSTD_createCCtx_advanced(cctxPool->cMem); /* note : can be NULL, when creation fails ! */ +} + +static void ZSTDMT_releaseCCtx(ZSTDMT_CCtxPool* pool, ZSTD_CCtx* cctx) +{ + if (cctx==NULL) return; /* compatibility with release on NULL */ + ZSTD_pthread_mutex_lock(&pool->poolMutex); + if (pool->availCCtx < pool->totalCCtx) + pool->cctxs[pool->availCCtx++] = cctx; + else { + /* pool overflow : should not happen, since totalCCtx==nbWorkers */ + DEBUGLOG(4, "CCtx pool overflow : free cctx"); + ZSTD_freeCCtx(cctx); + } + ZSTD_pthread_mutex_unlock(&pool->poolMutex); +} + +/* ==== Serial State ==== */ + +typedef struct { + void const* start; + size_t size; +} range_t; + +typedef struct { + /* All variables in the struct are protected by mutex. */ + ZSTD_pthread_mutex_t mutex; + ZSTD_pthread_cond_t cond; + ZSTD_CCtx_params params; + ldmState_t ldmState; + XXH64_state_t xxhState; + unsigned nextJobID; + /* Protects ldmWindow. + * Must be acquired after the main mutex when acquiring both. + */ + ZSTD_pthread_mutex_t ldmWindowMutex; + ZSTD_pthread_cond_t ldmWindowCond; /* Signaled when ldmWindow is updated */ + ZSTD_window_t ldmWindow; /* A thread-safe copy of ldmState.window */ +} serialState_t; + +static int +ZSTDMT_serialState_reset(serialState_t* serialState, + ZSTDMT_seqPool* seqPool, + ZSTD_CCtx_params params, + size_t jobSize, + const void* dict, size_t const dictSize, + ZSTD_dictContentType_e dictContentType) +{ + /* Adjust parameters */ + if (params.ldmParams.enableLdm == ZSTD_ps_enable) { + DEBUGLOG(4, "LDM window size = %u KB", (1U << params.cParams.windowLog) >> 10); + ZSTD_ldm_adjustParameters(¶ms.ldmParams, ¶ms.cParams); + assert(params.ldmParams.hashLog >= params.ldmParams.bucketSizeLog); + assert(params.ldmParams.hashRateLog < 32); + } else { + ZSTD_memset(¶ms.ldmParams, 0, sizeof(params.ldmParams)); + } + serialState->nextJobID = 0; + if (params.fParams.checksumFlag) + XXH64_reset(&serialState->xxhState, 0); + if (params.ldmParams.enableLdm == ZSTD_ps_enable) { + ZSTD_customMem cMem = params.customMem; + unsigned const hashLog = params.ldmParams.hashLog; + size_t const hashSize = ((size_t)1 << hashLog) * sizeof(ldmEntry_t); + unsigned const bucketLog = + params.ldmParams.hashLog - params.ldmParams.bucketSizeLog; + unsigned const prevBucketLog = + serialState->params.ldmParams.hashLog - + serialState->params.ldmParams.bucketSizeLog; + size_t const numBuckets = (size_t)1 << bucketLog; + /* Size the seq pool tables */ + ZSTDMT_setNbSeq(seqPool, ZSTD_ldm_getMaxNbSeq(params.ldmParams, jobSize)); + /* Reset the window */ + ZSTD_window_init(&serialState->ldmState.window); + /* Resize tables and output space if necessary. */ + if (serialState->ldmState.hashTable == NULL || serialState->params.ldmParams.hashLog < hashLog) { + ZSTD_customFree(serialState->ldmState.hashTable, cMem); + serialState->ldmState.hashTable = (ldmEntry_t*)ZSTD_customMalloc(hashSize, cMem); + } + if (serialState->ldmState.bucketOffsets == NULL || prevBucketLog < bucketLog) { + ZSTD_customFree(serialState->ldmState.bucketOffsets, cMem); + serialState->ldmState.bucketOffsets = (BYTE*)ZSTD_customMalloc(numBuckets, cMem); + } + if (!serialState->ldmState.hashTable || !serialState->ldmState.bucketOffsets) + return 1; + /* Zero the tables */ + ZSTD_memset(serialState->ldmState.hashTable, 0, hashSize); + ZSTD_memset(serialState->ldmState.bucketOffsets, 0, numBuckets); + + /* Update window state and fill hash table with dict */ + serialState->ldmState.loadedDictEnd = 0; + if (dictSize > 0) { + if (dictContentType == ZSTD_dct_rawContent) { + BYTE const* const dictEnd = (const BYTE*)dict + dictSize; + ZSTD_window_update(&serialState->ldmState.window, dict, dictSize, /* forceNonContiguous */ 0); + ZSTD_ldm_fillHashTable(&serialState->ldmState, (const BYTE*)dict, dictEnd, ¶ms.ldmParams); + serialState->ldmState.loadedDictEnd = params.forceWindow ? 0 : (U32)(dictEnd - serialState->ldmState.window.base); + } else { + /* don't even load anything */ + } + } + + /* Initialize serialState's copy of ldmWindow. */ + serialState->ldmWindow = serialState->ldmState.window; + } + + serialState->params = params; + serialState->params.jobSize = (U32)jobSize; + return 0; +} + +static int ZSTDMT_serialState_init(serialState_t* serialState) +{ + int initError = 0; + ZSTD_memset(serialState, 0, sizeof(*serialState)); + initError |= ZSTD_pthread_mutex_init(&serialState->mutex, NULL); + initError |= ZSTD_pthread_cond_init(&serialState->cond, NULL); + initError |= ZSTD_pthread_mutex_init(&serialState->ldmWindowMutex, NULL); + initError |= ZSTD_pthread_cond_init(&serialState->ldmWindowCond, NULL); + return initError; +} + +static void ZSTDMT_serialState_free(serialState_t* serialState) +{ + ZSTD_customMem cMem = serialState->params.customMem; + ZSTD_pthread_mutex_destroy(&serialState->mutex); + ZSTD_pthread_cond_destroy(&serialState->cond); + ZSTD_pthread_mutex_destroy(&serialState->ldmWindowMutex); + ZSTD_pthread_cond_destroy(&serialState->ldmWindowCond); + ZSTD_customFree(serialState->ldmState.hashTable, cMem); + ZSTD_customFree(serialState->ldmState.bucketOffsets, cMem); +} + +static void ZSTDMT_serialState_update(serialState_t* serialState, + ZSTD_CCtx* jobCCtx, rawSeqStore_t seqStore, + range_t src, unsigned jobID) +{ + /* Wait for our turn */ + ZSTD_PTHREAD_MUTEX_LOCK(&serialState->mutex); + while (serialState->nextJobID < jobID) { + DEBUGLOG(5, "wait for serialState->cond"); + ZSTD_pthread_cond_wait(&serialState->cond, &serialState->mutex); + } + /* A future job may error and skip our job */ + if (serialState->nextJobID == jobID) { + /* It is now our turn, do any processing necessary */ + if (serialState->params.ldmParams.enableLdm == ZSTD_ps_enable) { + size_t error; + assert(seqStore.seq != NULL && seqStore.pos == 0 && + seqStore.size == 0 && seqStore.capacity > 0); + assert(src.size <= serialState->params.jobSize); + ZSTD_window_update(&serialState->ldmState.window, src.start, src.size, /* forceNonContiguous */ 0); + error = ZSTD_ldm_generateSequences( + &serialState->ldmState, &seqStore, + &serialState->params.ldmParams, src.start, src.size); + /* We provide a large enough buffer to never fail. */ + assert(!ZSTD_isError(error)); (void)error; + /* Update ldmWindow to match the ldmState.window and signal the main + * thread if it is waiting for a buffer. + */ + ZSTD_PTHREAD_MUTEX_LOCK(&serialState->ldmWindowMutex); + serialState->ldmWindow = serialState->ldmState.window; + ZSTD_pthread_cond_signal(&serialState->ldmWindowCond); + ZSTD_pthread_mutex_unlock(&serialState->ldmWindowMutex); + } + if (serialState->params.fParams.checksumFlag && src.size > 0) + XXH64_update(&serialState->xxhState, src.start, src.size); + } + /* Now it is the next jobs turn */ + serialState->nextJobID++; + ZSTD_pthread_cond_broadcast(&serialState->cond); + ZSTD_pthread_mutex_unlock(&serialState->mutex); + + if (seqStore.size > 0) { + ZSTD_referenceExternalSequences(jobCCtx, seqStore.seq, seqStore.size); + assert(serialState->params.ldmParams.enableLdm == ZSTD_ps_enable); + } +} + +static void ZSTDMT_serialState_ensureFinished(serialState_t* serialState, + unsigned jobID, size_t cSize) +{ + ZSTD_PTHREAD_MUTEX_LOCK(&serialState->mutex); + if (serialState->nextJobID <= jobID) { + assert(ZSTD_isError(cSize)); (void)cSize; + DEBUGLOG(5, "Skipping past job %u because of error", jobID); + serialState->nextJobID = jobID + 1; + ZSTD_pthread_cond_broadcast(&serialState->cond); + + ZSTD_PTHREAD_MUTEX_LOCK(&serialState->ldmWindowMutex); + ZSTD_window_clear(&serialState->ldmWindow); + ZSTD_pthread_cond_signal(&serialState->ldmWindowCond); + ZSTD_pthread_mutex_unlock(&serialState->ldmWindowMutex); + } + ZSTD_pthread_mutex_unlock(&serialState->mutex); + +} + + +/* ------------------------------------------ */ +/* ===== Worker thread ===== */ +/* ------------------------------------------ */ + +static const range_t kNullRange = { NULL, 0 }; + +typedef struct { + size_t consumed; /* SHARED - set0 by mtctx, then modified by worker AND read by mtctx */ + size_t cSize; /* SHARED - set0 by mtctx, then modified by worker AND read by mtctx, then set0 by mtctx */ + ZSTD_pthread_mutex_t job_mutex; /* Thread-safe - used by mtctx and worker */ + ZSTD_pthread_cond_t job_cond; /* Thread-safe - used by mtctx and worker */ + ZSTDMT_CCtxPool* cctxPool; /* Thread-safe - used by mtctx and (all) workers */ + ZSTDMT_bufferPool* bufPool; /* Thread-safe - used by mtctx and (all) workers */ + ZSTDMT_seqPool* seqPool; /* Thread-safe - used by mtctx and (all) workers */ + serialState_t* serial; /* Thread-safe - used by mtctx and (all) workers */ + buffer_t dstBuff; /* set by worker (or mtctx), then read by worker & mtctx, then modified by mtctx => no barrier */ + range_t prefix; /* set by mtctx, then read by worker & mtctx => no barrier */ + range_t src; /* set by mtctx, then read by worker & mtctx => no barrier */ + unsigned jobID; /* set by mtctx, then read by worker => no barrier */ + unsigned firstJob; /* set by mtctx, then read by worker => no barrier */ + unsigned lastJob; /* set by mtctx, then read by worker => no barrier */ + ZSTD_CCtx_params params; /* set by mtctx, then read by worker => no barrier */ + const ZSTD_CDict* cdict; /* set by mtctx, then read by worker => no barrier */ + unsigned long long fullFrameSize; /* set by mtctx, then read by worker => no barrier */ + size_t dstFlushed; /* used only by mtctx */ + unsigned frameChecksumNeeded; /* used only by mtctx */ +} ZSTDMT_jobDescription; + +#define JOB_ERROR(e) \ + do { \ + ZSTD_PTHREAD_MUTEX_LOCK(&job->job_mutex); \ + job->cSize = e; \ + ZSTD_pthread_mutex_unlock(&job->job_mutex); \ + goto _endJob; \ + } while (0) + +/* ZSTDMT_compressionJob() is a POOL_function type */ +static void ZSTDMT_compressionJob(void* jobDescription) +{ + ZSTDMT_jobDescription* const job = (ZSTDMT_jobDescription*)jobDescription; + ZSTD_CCtx_params jobParams = job->params; /* do not modify job->params ! copy it, modify the copy */ + ZSTD_CCtx* const cctx = ZSTDMT_getCCtx(job->cctxPool); + rawSeqStore_t rawSeqStore = ZSTDMT_getSeq(job->seqPool); + buffer_t dstBuff = job->dstBuff; + size_t lastCBlockSize = 0; + + /* resources */ + if (cctx==NULL) JOB_ERROR(ERROR(memory_allocation)); + if (dstBuff.start == NULL) { /* streaming job : doesn't provide a dstBuffer */ + dstBuff = ZSTDMT_getBuffer(job->bufPool); + if (dstBuff.start==NULL) JOB_ERROR(ERROR(memory_allocation)); + job->dstBuff = dstBuff; /* this value can be read in ZSTDMT_flush, when it copies the whole job */ + } + if (jobParams.ldmParams.enableLdm == ZSTD_ps_enable && rawSeqStore.seq == NULL) + JOB_ERROR(ERROR(memory_allocation)); + + /* Don't compute the checksum for chunks, since we compute it externally, + * but write it in the header. + */ + if (job->jobID != 0) jobParams.fParams.checksumFlag = 0; + /* Don't run LDM for the chunks, since we handle it externally */ + jobParams.ldmParams.enableLdm = ZSTD_ps_disable; + /* Correct nbWorkers to 0. */ + jobParams.nbWorkers = 0; + + + /* init */ + if (job->cdict) { + size_t const initError = ZSTD_compressBegin_advanced_internal(cctx, NULL, 0, ZSTD_dct_auto, ZSTD_dtlm_fast, job->cdict, &jobParams, job->fullFrameSize); + assert(job->firstJob); /* only allowed for first job */ + if (ZSTD_isError(initError)) JOB_ERROR(initError); + } else { /* srcStart points at reloaded section */ + U64 const pledgedSrcSize = job->firstJob ? job->fullFrameSize : job->src.size; + { size_t const forceWindowError = ZSTD_CCtxParams_setParameter(&jobParams, ZSTD_c_forceMaxWindow, !job->firstJob); + if (ZSTD_isError(forceWindowError)) JOB_ERROR(forceWindowError); + } + if (!job->firstJob) { + size_t const err = ZSTD_CCtxParams_setParameter(&jobParams, ZSTD_c_deterministicRefPrefix, 0); + if (ZSTD_isError(err)) JOB_ERROR(err); + } + { size_t const initError = ZSTD_compressBegin_advanced_internal(cctx, + job->prefix.start, job->prefix.size, ZSTD_dct_rawContent, /* load dictionary in "content-only" mode (no header analysis) */ + ZSTD_dtlm_fast, + NULL, /*cdict*/ + &jobParams, pledgedSrcSize); + if (ZSTD_isError(initError)) JOB_ERROR(initError); + } } + + /* Perform serial step as early as possible, but after CCtx initialization */ + ZSTDMT_serialState_update(job->serial, cctx, rawSeqStore, job->src, job->jobID); + + if (!job->firstJob) { /* flush and overwrite frame header when it's not first job */ + size_t const hSize = ZSTD_compressContinue_public(cctx, dstBuff.start, dstBuff.capacity, job->src.start, 0); + if (ZSTD_isError(hSize)) JOB_ERROR(hSize); + DEBUGLOG(5, "ZSTDMT_compressionJob: flush and overwrite %u bytes of frame header (not first job)", (U32)hSize); + ZSTD_invalidateRepCodes(cctx); + } + + /* compress */ + { size_t const chunkSize = 4*ZSTD_BLOCKSIZE_MAX; + int const nbChunks = (int)((job->src.size + (chunkSize-1)) / chunkSize); + const BYTE* ip = (const BYTE*) job->src.start; + BYTE* const ostart = (BYTE*)dstBuff.start; + BYTE* op = ostart; + BYTE* oend = op + dstBuff.capacity; + int chunkNb; + if (sizeof(size_t) > sizeof(int)) assert(job->src.size < ((size_t)INT_MAX) * chunkSize); /* check overflow */ + DEBUGLOG(5, "ZSTDMT_compressionJob: compress %u bytes in %i blocks", (U32)job->src.size, nbChunks); + assert(job->cSize == 0); + for (chunkNb = 1; chunkNb < nbChunks; chunkNb++) { + size_t const cSize = ZSTD_compressContinue_public(cctx, op, oend-op, ip, chunkSize); + if (ZSTD_isError(cSize)) JOB_ERROR(cSize); + ip += chunkSize; + op += cSize; assert(op < oend); + /* stats */ + ZSTD_PTHREAD_MUTEX_LOCK(&job->job_mutex); + job->cSize += cSize; + job->consumed = chunkSize * chunkNb; + DEBUGLOG(5, "ZSTDMT_compressionJob: compress new block : cSize==%u bytes (total: %u)", + (U32)cSize, (U32)job->cSize); + ZSTD_pthread_cond_signal(&job->job_cond); /* warns some more data is ready to be flushed */ + ZSTD_pthread_mutex_unlock(&job->job_mutex); + } + /* last block */ + assert(chunkSize > 0); + assert((chunkSize & (chunkSize - 1)) == 0); /* chunkSize must be power of 2 for mask==(chunkSize-1) to work */ + if ((nbChunks > 0) | job->lastJob /*must output a "last block" flag*/ ) { + size_t const lastBlockSize1 = job->src.size & (chunkSize-1); + size_t const lastBlockSize = ((lastBlockSize1==0) & (job->src.size>=chunkSize)) ? chunkSize : lastBlockSize1; + size_t const cSize = (job->lastJob) ? + ZSTD_compressEnd_public(cctx, op, oend-op, ip, lastBlockSize) : + ZSTD_compressContinue_public(cctx, op, oend-op, ip, lastBlockSize); + if (ZSTD_isError(cSize)) JOB_ERROR(cSize); + lastCBlockSize = cSize; + } } + if (!job->firstJob) { + /* Double check that we don't have an ext-dict, because then our + * repcode invalidation doesn't work. + */ + assert(!ZSTD_window_hasExtDict(cctx->blockState.matchState.window)); + } + ZSTD_CCtx_trace(cctx, 0); + +_endJob: + ZSTDMT_serialState_ensureFinished(job->serial, job->jobID, job->cSize); + if (job->prefix.size > 0) + DEBUGLOG(5, "Finished with prefix: %zx", (size_t)job->prefix.start); + DEBUGLOG(5, "Finished with source: %zx", (size_t)job->src.start); + /* release resources */ + ZSTDMT_releaseSeq(job->seqPool, rawSeqStore); + ZSTDMT_releaseCCtx(job->cctxPool, cctx); + /* report */ + ZSTD_PTHREAD_MUTEX_LOCK(&job->job_mutex); + if (ZSTD_isError(job->cSize)) assert(lastCBlockSize == 0); + job->cSize += lastCBlockSize; + job->consumed = job->src.size; /* when job->consumed == job->src.size , compression job is presumed completed */ + ZSTD_pthread_cond_signal(&job->job_cond); + ZSTD_pthread_mutex_unlock(&job->job_mutex); +} + + +/* ------------------------------------------ */ +/* ===== Multi-threaded compression ===== */ +/* ------------------------------------------ */ + +typedef struct { + range_t prefix; /* read-only non-owned prefix buffer */ + buffer_t buffer; + size_t filled; +} inBuff_t; + +typedef struct { + BYTE* buffer; /* The round input buffer. All jobs get references + * to pieces of the buffer. ZSTDMT_tryGetInputRange() + * handles handing out job input buffers, and makes + * sure it doesn't overlap with any pieces still in use. + */ + size_t capacity; /* The capacity of buffer. */ + size_t pos; /* The position of the current inBuff in the round + * buffer. Updated past the end if the inBuff once + * the inBuff is sent to the worker thread. + * pos <= capacity. + */ +} roundBuff_t; + +static const roundBuff_t kNullRoundBuff = {NULL, 0, 0}; + +#define RSYNC_LENGTH 32 +/* Don't create chunks smaller than the zstd block size. + * This stops us from regressing compression ratio too much, + * and ensures our output fits in ZSTD_compressBound(). + * + * If this is shrunk < ZSTD_BLOCKSIZELOG_MIN then + * ZSTD_COMPRESSBOUND() will need to be updated. + */ +#define RSYNC_MIN_BLOCK_LOG ZSTD_BLOCKSIZELOG_MAX +#define RSYNC_MIN_BLOCK_SIZE (1< one job is already prepared, but pool has shortage of workers. Don't create a new job. */ + inBuff_t inBuff; + roundBuff_t roundBuff; + serialState_t serial; + rsyncState_t rsync; + unsigned jobIDMask; + unsigned doneJobID; + unsigned nextJobID; + unsigned frameEnded; + unsigned allJobsCompleted; + unsigned long long frameContentSize; + unsigned long long consumed; + unsigned long long produced; + ZSTD_customMem cMem; + ZSTD_CDict* cdictLocal; + const ZSTD_CDict* cdict; + unsigned providedFactory: 1; +}; + +static void ZSTDMT_freeJobsTable(ZSTDMT_jobDescription* jobTable, U32 nbJobs, ZSTD_customMem cMem) +{ + U32 jobNb; + if (jobTable == NULL) return; + for (jobNb=0; jobNb mtctx->jobIDMask+1) { /* need more job capacity */ + ZSTDMT_freeJobsTable(mtctx->jobs, mtctx->jobIDMask+1, mtctx->cMem); + mtctx->jobIDMask = 0; + mtctx->jobs = ZSTDMT_createJobsTable(&nbJobs, mtctx->cMem); + if (mtctx->jobs==NULL) return ERROR(memory_allocation); + assert((nbJobs != 0) && ((nbJobs & (nbJobs - 1)) == 0)); /* ensure nbJobs is a power of 2 */ + mtctx->jobIDMask = nbJobs - 1; + } + return 0; +} + + +/* ZSTDMT_CCtxParam_setNbWorkers(): + * Internal use only */ +static size_t ZSTDMT_CCtxParam_setNbWorkers(ZSTD_CCtx_params* params, unsigned nbWorkers) +{ + return ZSTD_CCtxParams_setParameter(params, ZSTD_c_nbWorkers, (int)nbWorkers); +} + +MEM_STATIC ZSTDMT_CCtx* ZSTDMT_createCCtx_advanced_internal(unsigned nbWorkers, ZSTD_customMem cMem, ZSTD_threadPool* pool) +{ + ZSTDMT_CCtx* mtctx; + U32 nbJobs = nbWorkers + 2; + int initError; + DEBUGLOG(3, "ZSTDMT_createCCtx_advanced (nbWorkers = %u)", nbWorkers); + + if (nbWorkers < 1) return NULL; + nbWorkers = MIN(nbWorkers , ZSTDMT_NBWORKERS_MAX); + if ((cMem.customAlloc!=NULL) ^ (cMem.customFree!=NULL)) + /* invalid custom allocator */ + return NULL; + + mtctx = (ZSTDMT_CCtx*) ZSTD_customCalloc(sizeof(ZSTDMT_CCtx), cMem); + if (!mtctx) return NULL; + ZSTDMT_CCtxParam_setNbWorkers(&mtctx->params, nbWorkers); + mtctx->cMem = cMem; + mtctx->allJobsCompleted = 1; + if (pool != NULL) { + mtctx->factory = pool; + mtctx->providedFactory = 1; + } + else { + mtctx->factory = POOL_create_advanced(nbWorkers, 0, cMem); + mtctx->providedFactory = 0; + } + mtctx->jobs = ZSTDMT_createJobsTable(&nbJobs, cMem); + assert(nbJobs > 0); assert((nbJobs & (nbJobs - 1)) == 0); /* ensure nbJobs is a power of 2 */ + mtctx->jobIDMask = nbJobs - 1; + mtctx->bufPool = ZSTDMT_createBufferPool(BUF_POOL_MAX_NB_BUFFERS(nbWorkers), cMem); + mtctx->cctxPool = ZSTDMT_createCCtxPool(nbWorkers, cMem); + mtctx->seqPool = ZSTDMT_createSeqPool(nbWorkers, cMem); + initError = ZSTDMT_serialState_init(&mtctx->serial); + mtctx->roundBuff = kNullRoundBuff; + if (!mtctx->factory | !mtctx->jobs | !mtctx->bufPool | !mtctx->cctxPool | !mtctx->seqPool | initError) { + ZSTDMT_freeCCtx(mtctx); + return NULL; + } + DEBUGLOG(3, "mt_cctx created, for %u threads", nbWorkers); + return mtctx; +} + +ZSTDMT_CCtx* ZSTDMT_createCCtx_advanced(unsigned nbWorkers, ZSTD_customMem cMem, ZSTD_threadPool* pool) +{ +#ifdef ZSTD_MULTITHREAD + return ZSTDMT_createCCtx_advanced_internal(nbWorkers, cMem, pool); +#else + (void)nbWorkers; + (void)cMem; + (void)pool; + return NULL; +#endif +} + + +/* ZSTDMT_releaseAllJobResources() : + * note : ensure all workers are killed first ! */ +static void ZSTDMT_releaseAllJobResources(ZSTDMT_CCtx* mtctx) +{ + unsigned jobID; + DEBUGLOG(3, "ZSTDMT_releaseAllJobResources"); + for (jobID=0; jobID <= mtctx->jobIDMask; jobID++) { + /* Copy the mutex/cond out */ + ZSTD_pthread_mutex_t const mutex = mtctx->jobs[jobID].job_mutex; + ZSTD_pthread_cond_t const cond = mtctx->jobs[jobID].job_cond; + + DEBUGLOG(4, "job%02u: release dst address %08X", jobID, (U32)(size_t)mtctx->jobs[jobID].dstBuff.start); + ZSTDMT_releaseBuffer(mtctx->bufPool, mtctx->jobs[jobID].dstBuff); + + /* Clear the job description, but keep the mutex/cond */ + ZSTD_memset(&mtctx->jobs[jobID], 0, sizeof(mtctx->jobs[jobID])); + mtctx->jobs[jobID].job_mutex = mutex; + mtctx->jobs[jobID].job_cond = cond; + } + mtctx->inBuff.buffer = g_nullBuffer; + mtctx->inBuff.filled = 0; + mtctx->allJobsCompleted = 1; +} + +static void ZSTDMT_waitForAllJobsCompleted(ZSTDMT_CCtx* mtctx) +{ + DEBUGLOG(4, "ZSTDMT_waitForAllJobsCompleted"); + while (mtctx->doneJobID < mtctx->nextJobID) { + unsigned const jobID = mtctx->doneJobID & mtctx->jobIDMask; + ZSTD_PTHREAD_MUTEX_LOCK(&mtctx->jobs[jobID].job_mutex); + while (mtctx->jobs[jobID].consumed < mtctx->jobs[jobID].src.size) { + DEBUGLOG(4, "waiting for jobCompleted signal from job %u", mtctx->doneJobID); /* we want to block when waiting for data to flush */ + ZSTD_pthread_cond_wait(&mtctx->jobs[jobID].job_cond, &mtctx->jobs[jobID].job_mutex); + } + ZSTD_pthread_mutex_unlock(&mtctx->jobs[jobID].job_mutex); + mtctx->doneJobID++; + } +} + +size_t ZSTDMT_freeCCtx(ZSTDMT_CCtx* mtctx) +{ + if (mtctx==NULL) return 0; /* compatible with free on NULL */ + if (!mtctx->providedFactory) + POOL_free(mtctx->factory); /* stop and free worker threads */ + ZSTDMT_releaseAllJobResources(mtctx); /* release job resources into pools first */ + ZSTDMT_freeJobsTable(mtctx->jobs, mtctx->jobIDMask+1, mtctx->cMem); + ZSTDMT_freeBufferPool(mtctx->bufPool); + ZSTDMT_freeCCtxPool(mtctx->cctxPool); + ZSTDMT_freeSeqPool(mtctx->seqPool); + ZSTDMT_serialState_free(&mtctx->serial); + ZSTD_freeCDict(mtctx->cdictLocal); + if (mtctx->roundBuff.buffer) + ZSTD_customFree(mtctx->roundBuff.buffer, mtctx->cMem); + ZSTD_customFree(mtctx, mtctx->cMem); + return 0; +} + +size_t ZSTDMT_sizeof_CCtx(ZSTDMT_CCtx* mtctx) +{ + if (mtctx == NULL) return 0; /* supports sizeof NULL */ + return sizeof(*mtctx) + + POOL_sizeof(mtctx->factory) + + ZSTDMT_sizeof_bufferPool(mtctx->bufPool) + + (mtctx->jobIDMask+1) * sizeof(ZSTDMT_jobDescription) + + ZSTDMT_sizeof_CCtxPool(mtctx->cctxPool) + + ZSTDMT_sizeof_seqPool(mtctx->seqPool) + + ZSTD_sizeof_CDict(mtctx->cdictLocal) + + mtctx->roundBuff.capacity; +} + + +/* ZSTDMT_resize() : + * @return : error code if fails, 0 on success */ +static size_t ZSTDMT_resize(ZSTDMT_CCtx* mtctx, unsigned nbWorkers) +{ + if (POOL_resize(mtctx->factory, nbWorkers)) return ERROR(memory_allocation); + FORWARD_IF_ERROR( ZSTDMT_expandJobsTable(mtctx, nbWorkers) , ""); + mtctx->bufPool = ZSTDMT_expandBufferPool(mtctx->bufPool, BUF_POOL_MAX_NB_BUFFERS(nbWorkers)); + if (mtctx->bufPool == NULL) return ERROR(memory_allocation); + mtctx->cctxPool = ZSTDMT_expandCCtxPool(mtctx->cctxPool, nbWorkers); + if (mtctx->cctxPool == NULL) return ERROR(memory_allocation); + mtctx->seqPool = ZSTDMT_expandSeqPool(mtctx->seqPool, nbWorkers); + if (mtctx->seqPool == NULL) return ERROR(memory_allocation); + ZSTDMT_CCtxParam_setNbWorkers(&mtctx->params, nbWorkers); + return 0; +} + + +/*! ZSTDMT_updateCParams_whileCompressing() : + * Updates a selected set of compression parameters, remaining compatible with currently active frame. + * New parameters will be applied to next compression job. */ +void ZSTDMT_updateCParams_whileCompressing(ZSTDMT_CCtx* mtctx, const ZSTD_CCtx_params* cctxParams) +{ + U32 const saved_wlog = mtctx->params.cParams.windowLog; /* Do not modify windowLog while compressing */ + int const compressionLevel = cctxParams->compressionLevel; + DEBUGLOG(5, "ZSTDMT_updateCParams_whileCompressing (level:%i)", + compressionLevel); + mtctx->params.compressionLevel = compressionLevel; + { ZSTD_compressionParameters cParams = ZSTD_getCParamsFromCCtxParams(cctxParams, ZSTD_CONTENTSIZE_UNKNOWN, 0, ZSTD_cpm_noAttachDict); + cParams.windowLog = saved_wlog; + mtctx->params.cParams = cParams; + } +} + +/* ZSTDMT_getFrameProgression(): + * tells how much data has been consumed (input) and produced (output) for current frame. + * able to count progression inside worker threads. + * Note : mutex will be acquired during statistics collection inside workers. */ +ZSTD_frameProgression ZSTDMT_getFrameProgression(ZSTDMT_CCtx* mtctx) +{ + ZSTD_frameProgression fps; + DEBUGLOG(5, "ZSTDMT_getFrameProgression"); + fps.ingested = mtctx->consumed + mtctx->inBuff.filled; + fps.consumed = mtctx->consumed; + fps.produced = fps.flushed = mtctx->produced; + fps.currentJobID = mtctx->nextJobID; + fps.nbActiveWorkers = 0; + { unsigned jobNb; + unsigned lastJobNb = mtctx->nextJobID + mtctx->jobReady; assert(mtctx->jobReady <= 1); + DEBUGLOG(6, "ZSTDMT_getFrameProgression: jobs: from %u to <%u (jobReady:%u)", + mtctx->doneJobID, lastJobNb, mtctx->jobReady); + for (jobNb = mtctx->doneJobID ; jobNb < lastJobNb ; jobNb++) { + unsigned const wJobID = jobNb & mtctx->jobIDMask; + ZSTDMT_jobDescription* jobPtr = &mtctx->jobs[wJobID]; + ZSTD_pthread_mutex_lock(&jobPtr->job_mutex); + { size_t const cResult = jobPtr->cSize; + size_t const produced = ZSTD_isError(cResult) ? 0 : cResult; + size_t const flushed = ZSTD_isError(cResult) ? 0 : jobPtr->dstFlushed; + assert(flushed <= produced); + fps.ingested += jobPtr->src.size; + fps.consumed += jobPtr->consumed; + fps.produced += produced; + fps.flushed += flushed; + fps.nbActiveWorkers += (jobPtr->consumed < jobPtr->src.size); + } + ZSTD_pthread_mutex_unlock(&mtctx->jobs[wJobID].job_mutex); + } + } + return fps; +} + + +size_t ZSTDMT_toFlushNow(ZSTDMT_CCtx* mtctx) +{ + size_t toFlush; + unsigned const jobID = mtctx->doneJobID; + assert(jobID <= mtctx->nextJobID); + if (jobID == mtctx->nextJobID) return 0; /* no active job => nothing to flush */ + + /* look into oldest non-fully-flushed job */ + { unsigned const wJobID = jobID & mtctx->jobIDMask; + ZSTDMT_jobDescription* const jobPtr = &mtctx->jobs[wJobID]; + ZSTD_pthread_mutex_lock(&jobPtr->job_mutex); + { size_t const cResult = jobPtr->cSize; + size_t const produced = ZSTD_isError(cResult) ? 0 : cResult; + size_t const flushed = ZSTD_isError(cResult) ? 0 : jobPtr->dstFlushed; + assert(flushed <= produced); + assert(jobPtr->consumed <= jobPtr->src.size); + toFlush = produced - flushed; + /* if toFlush==0, nothing is available to flush. + * However, jobID is expected to still be active: + * if jobID was already completed and fully flushed, + * ZSTDMT_flushProduced() should have already moved onto next job. + * Therefore, some input has not yet been consumed. */ + if (toFlush==0) { + assert(jobPtr->consumed < jobPtr->src.size); + } + } + ZSTD_pthread_mutex_unlock(&mtctx->jobs[wJobID].job_mutex); + } + + return toFlush; +} + + +/* ------------------------------------------ */ +/* ===== Multi-threaded compression ===== */ +/* ------------------------------------------ */ + +static unsigned ZSTDMT_computeTargetJobLog(const ZSTD_CCtx_params* params) +{ + unsigned jobLog; + if (params->ldmParams.enableLdm == ZSTD_ps_enable) { + /* In Long Range Mode, the windowLog is typically oversized. + * In which case, it's preferable to determine the jobSize + * based on cycleLog instead. */ + jobLog = MAX(21, ZSTD_cycleLog(params->cParams.chainLog, params->cParams.strategy) + 3); + } else { + jobLog = MAX(20, params->cParams.windowLog + 2); + } + return MIN(jobLog, (unsigned)ZSTDMT_JOBLOG_MAX); +} + +static int ZSTDMT_overlapLog_default(ZSTD_strategy strat) +{ + switch(strat) + { + case ZSTD_btultra2: + return 9; + case ZSTD_btultra: + case ZSTD_btopt: + return 8; + case ZSTD_btlazy2: + case ZSTD_lazy2: + return 7; + case ZSTD_lazy: + case ZSTD_greedy: + case ZSTD_dfast: + case ZSTD_fast: + default:; + } + return 6; +} + +static int ZSTDMT_overlapLog(int ovlog, ZSTD_strategy strat) +{ + assert(0 <= ovlog && ovlog <= 9); + if (ovlog == 0) return ZSTDMT_overlapLog_default(strat); + return ovlog; +} + +static size_t ZSTDMT_computeOverlapSize(const ZSTD_CCtx_params* params) +{ + int const overlapRLog = 9 - ZSTDMT_overlapLog(params->overlapLog, params->cParams.strategy); + int ovLog = (overlapRLog >= 8) ? 0 : (params->cParams.windowLog - overlapRLog); + assert(0 <= overlapRLog && overlapRLog <= 8); + if (params->ldmParams.enableLdm == ZSTD_ps_enable) { + /* In Long Range Mode, the windowLog is typically oversized. + * In which case, it's preferable to determine the jobSize + * based on chainLog instead. + * Then, ovLog becomes a fraction of the jobSize, rather than windowSize */ + ovLog = MIN(params->cParams.windowLog, ZSTDMT_computeTargetJobLog(params) - 2) + - overlapRLog; + } + assert(0 <= ovLog && ovLog <= ZSTD_WINDOWLOG_MAX); + DEBUGLOG(4, "overlapLog : %i", params->overlapLog); + DEBUGLOG(4, "overlap size : %i", 1 << ovLog); + return (ovLog==0) ? 0 : (size_t)1 << ovLog; +} + +/* ====================================== */ +/* ======= Streaming API ======= */ +/* ====================================== */ + +size_t ZSTDMT_initCStream_internal( + ZSTDMT_CCtx* mtctx, + const void* dict, size_t dictSize, ZSTD_dictContentType_e dictContentType, + const ZSTD_CDict* cdict, ZSTD_CCtx_params params, + unsigned long long pledgedSrcSize) +{ + DEBUGLOG(4, "ZSTDMT_initCStream_internal (pledgedSrcSize=%u, nbWorkers=%u, cctxPool=%u)", + (U32)pledgedSrcSize, params.nbWorkers, mtctx->cctxPool->totalCCtx); + + /* params supposed partially fully validated at this point */ + assert(!ZSTD_isError(ZSTD_checkCParams(params.cParams))); + assert(!((dict) && (cdict))); /* either dict or cdict, not both */ + + /* init */ + if (params.nbWorkers != mtctx->params.nbWorkers) + FORWARD_IF_ERROR( ZSTDMT_resize(mtctx, params.nbWorkers) , ""); + + if (params.jobSize != 0 && params.jobSize < ZSTDMT_JOBSIZE_MIN) params.jobSize = ZSTDMT_JOBSIZE_MIN; + if (params.jobSize > (size_t)ZSTDMT_JOBSIZE_MAX) params.jobSize = (size_t)ZSTDMT_JOBSIZE_MAX; + + DEBUGLOG(4, "ZSTDMT_initCStream_internal: %u workers", params.nbWorkers); + + if (mtctx->allJobsCompleted == 0) { /* previous compression not correctly finished */ + ZSTDMT_waitForAllJobsCompleted(mtctx); + ZSTDMT_releaseAllJobResources(mtctx); + mtctx->allJobsCompleted = 1; + } + + mtctx->params = params; + mtctx->frameContentSize = pledgedSrcSize; + if (dict) { + ZSTD_freeCDict(mtctx->cdictLocal); + mtctx->cdictLocal = ZSTD_createCDict_advanced(dict, dictSize, + ZSTD_dlm_byCopy, dictContentType, /* note : a loadPrefix becomes an internal CDict */ + params.cParams, mtctx->cMem); + mtctx->cdict = mtctx->cdictLocal; + if (mtctx->cdictLocal == NULL) return ERROR(memory_allocation); + } else { + ZSTD_freeCDict(mtctx->cdictLocal); + mtctx->cdictLocal = NULL; + mtctx->cdict = cdict; + } + + mtctx->targetPrefixSize = ZSTDMT_computeOverlapSize(¶ms); + DEBUGLOG(4, "overlapLog=%i => %u KB", params.overlapLog, (U32)(mtctx->targetPrefixSize>>10)); + mtctx->targetSectionSize = params.jobSize; + if (mtctx->targetSectionSize == 0) { + mtctx->targetSectionSize = 1ULL << ZSTDMT_computeTargetJobLog(¶ms); + } + assert(mtctx->targetSectionSize <= (size_t)ZSTDMT_JOBSIZE_MAX); + + if (params.rsyncable) { + /* Aim for the targetsectionSize as the average job size. */ + U32 const jobSizeKB = (U32)(mtctx->targetSectionSize >> 10); + U32 const rsyncBits = (assert(jobSizeKB >= 1), ZSTD_highbit32(jobSizeKB) + 10); + /* We refuse to create jobs < RSYNC_MIN_BLOCK_SIZE bytes, so make sure our + * expected job size is at least 4x larger. */ + assert(rsyncBits >= RSYNC_MIN_BLOCK_LOG + 2); + DEBUGLOG(4, "rsyncLog = %u", rsyncBits); + mtctx->rsync.hash = 0; + mtctx->rsync.hitMask = (1ULL << rsyncBits) - 1; + mtctx->rsync.primePower = ZSTD_rollingHash_primePower(RSYNC_LENGTH); + } + if (mtctx->targetSectionSize < mtctx->targetPrefixSize) mtctx->targetSectionSize = mtctx->targetPrefixSize; /* job size must be >= overlap size */ + DEBUGLOG(4, "Job Size : %u KB (note : set to %u)", (U32)(mtctx->targetSectionSize>>10), (U32)params.jobSize); + DEBUGLOG(4, "inBuff Size : %u KB", (U32)(mtctx->targetSectionSize>>10)); + ZSTDMT_setBufferSize(mtctx->bufPool, ZSTD_compressBound(mtctx->targetSectionSize)); + { + /* If ldm is enabled we need windowSize space. */ + size_t const windowSize = mtctx->params.ldmParams.enableLdm == ZSTD_ps_enable ? (1U << mtctx->params.cParams.windowLog) : 0; + /* Two buffers of slack, plus extra space for the overlap + * This is the minimum slack that LDM works with. One extra because + * flush might waste up to targetSectionSize-1 bytes. Another extra + * for the overlap (if > 0), then one to fill which doesn't overlap + * with the LDM window. + */ + size_t const nbSlackBuffers = 2 + (mtctx->targetPrefixSize > 0); + size_t const slackSize = mtctx->targetSectionSize * nbSlackBuffers; + /* Compute the total size, and always have enough slack */ + size_t const nbWorkers = MAX(mtctx->params.nbWorkers, 1); + size_t const sectionsSize = mtctx->targetSectionSize * nbWorkers; + size_t const capacity = MAX(windowSize, sectionsSize) + slackSize; + if (mtctx->roundBuff.capacity < capacity) { + if (mtctx->roundBuff.buffer) + ZSTD_customFree(mtctx->roundBuff.buffer, mtctx->cMem); + mtctx->roundBuff.buffer = (BYTE*)ZSTD_customMalloc(capacity, mtctx->cMem); + if (mtctx->roundBuff.buffer == NULL) { + mtctx->roundBuff.capacity = 0; + return ERROR(memory_allocation); + } + mtctx->roundBuff.capacity = capacity; + } + } + DEBUGLOG(4, "roundBuff capacity : %u KB", (U32)(mtctx->roundBuff.capacity>>10)); + mtctx->roundBuff.pos = 0; + mtctx->inBuff.buffer = g_nullBuffer; + mtctx->inBuff.filled = 0; + mtctx->inBuff.prefix = kNullRange; + mtctx->doneJobID = 0; + mtctx->nextJobID = 0; + mtctx->frameEnded = 0; + mtctx->allJobsCompleted = 0; + mtctx->consumed = 0; + mtctx->produced = 0; + if (ZSTDMT_serialState_reset(&mtctx->serial, mtctx->seqPool, params, mtctx->targetSectionSize, + dict, dictSize, dictContentType)) + return ERROR(memory_allocation); + return 0; +} + + +/* ZSTDMT_writeLastEmptyBlock() + * Write a single empty block with an end-of-frame to finish a frame. + * Job must be created from streaming variant. + * This function is always successful if expected conditions are fulfilled. + */ +static void ZSTDMT_writeLastEmptyBlock(ZSTDMT_jobDescription* job) +{ + assert(job->lastJob == 1); + assert(job->src.size == 0); /* last job is empty -> will be simplified into a last empty block */ + assert(job->firstJob == 0); /* cannot be first job, as it also needs to create frame header */ + assert(job->dstBuff.start == NULL); /* invoked from streaming variant only (otherwise, dstBuff might be user's output) */ + job->dstBuff = ZSTDMT_getBuffer(job->bufPool); + if (job->dstBuff.start == NULL) { + job->cSize = ERROR(memory_allocation); + return; + } + assert(job->dstBuff.capacity >= ZSTD_blockHeaderSize); /* no buffer should ever be that small */ + job->src = kNullRange; + job->cSize = ZSTD_writeLastEmptyBlock(job->dstBuff.start, job->dstBuff.capacity); + assert(!ZSTD_isError(job->cSize)); + assert(job->consumed == 0); +} + +static size_t ZSTDMT_createCompressionJob(ZSTDMT_CCtx* mtctx, size_t srcSize, ZSTD_EndDirective endOp) +{ + unsigned const jobID = mtctx->nextJobID & mtctx->jobIDMask; + int const endFrame = (endOp == ZSTD_e_end); + + if (mtctx->nextJobID > mtctx->doneJobID + mtctx->jobIDMask) { + DEBUGLOG(5, "ZSTDMT_createCompressionJob: will not create new job : table is full"); + assert((mtctx->nextJobID & mtctx->jobIDMask) == (mtctx->doneJobID & mtctx->jobIDMask)); + return 0; + } + + if (!mtctx->jobReady) { + BYTE const* src = (BYTE const*)mtctx->inBuff.buffer.start; + DEBUGLOG(5, "ZSTDMT_createCompressionJob: preparing job %u to compress %u bytes with %u preload ", + mtctx->nextJobID, (U32)srcSize, (U32)mtctx->inBuff.prefix.size); + mtctx->jobs[jobID].src.start = src; + mtctx->jobs[jobID].src.size = srcSize; + assert(mtctx->inBuff.filled >= srcSize); + mtctx->jobs[jobID].prefix = mtctx->inBuff.prefix; + mtctx->jobs[jobID].consumed = 0; + mtctx->jobs[jobID].cSize = 0; + mtctx->jobs[jobID].params = mtctx->params; + mtctx->jobs[jobID].cdict = mtctx->nextJobID==0 ? mtctx->cdict : NULL; + mtctx->jobs[jobID].fullFrameSize = mtctx->frameContentSize; + mtctx->jobs[jobID].dstBuff = g_nullBuffer; + mtctx->jobs[jobID].cctxPool = mtctx->cctxPool; + mtctx->jobs[jobID].bufPool = mtctx->bufPool; + mtctx->jobs[jobID].seqPool = mtctx->seqPool; + mtctx->jobs[jobID].serial = &mtctx->serial; + mtctx->jobs[jobID].jobID = mtctx->nextJobID; + mtctx->jobs[jobID].firstJob = (mtctx->nextJobID==0); + mtctx->jobs[jobID].lastJob = endFrame; + mtctx->jobs[jobID].frameChecksumNeeded = mtctx->params.fParams.checksumFlag && endFrame && (mtctx->nextJobID>0); + mtctx->jobs[jobID].dstFlushed = 0; + + /* Update the round buffer pos and clear the input buffer to be reset */ + mtctx->roundBuff.pos += srcSize; + mtctx->inBuff.buffer = g_nullBuffer; + mtctx->inBuff.filled = 0; + /* Set the prefix */ + if (!endFrame) { + size_t const newPrefixSize = MIN(srcSize, mtctx->targetPrefixSize); + mtctx->inBuff.prefix.start = src + srcSize - newPrefixSize; + mtctx->inBuff.prefix.size = newPrefixSize; + } else { /* endFrame==1 => no need for another input buffer */ + mtctx->inBuff.prefix = kNullRange; + mtctx->frameEnded = endFrame; + if (mtctx->nextJobID == 0) { + /* single job exception : checksum is already calculated directly within worker thread */ + mtctx->params.fParams.checksumFlag = 0; + } } + + if ( (srcSize == 0) + && (mtctx->nextJobID>0)/*single job must also write frame header*/ ) { + DEBUGLOG(5, "ZSTDMT_createCompressionJob: creating a last empty block to end frame"); + assert(endOp == ZSTD_e_end); /* only possible case : need to end the frame with an empty last block */ + ZSTDMT_writeLastEmptyBlock(mtctx->jobs + jobID); + mtctx->nextJobID++; + return 0; + } + } + + DEBUGLOG(5, "ZSTDMT_createCompressionJob: posting job %u : %u bytes (end:%u, jobNb == %u (mod:%u))", + mtctx->nextJobID, + (U32)mtctx->jobs[jobID].src.size, + mtctx->jobs[jobID].lastJob, + mtctx->nextJobID, + jobID); + if (POOL_tryAdd(mtctx->factory, ZSTDMT_compressionJob, &mtctx->jobs[jobID])) { + mtctx->nextJobID++; + mtctx->jobReady = 0; + } else { + DEBUGLOG(5, "ZSTDMT_createCompressionJob: no worker available for job %u", mtctx->nextJobID); + mtctx->jobReady = 1; + } + return 0; +} + + +/*! ZSTDMT_flushProduced() : + * flush whatever data has been produced but not yet flushed in current job. + * move to next job if current one is fully flushed. + * `output` : `pos` will be updated with amount of data flushed . + * `blockToFlush` : if >0, the function will block and wait if there is no data available to flush . + * @return : amount of data remaining within internal buffer, 0 if no more, 1 if unknown but > 0, or an error code */ +static size_t ZSTDMT_flushProduced(ZSTDMT_CCtx* mtctx, ZSTD_outBuffer* output, unsigned blockToFlush, ZSTD_EndDirective end) +{ + unsigned const wJobID = mtctx->doneJobID & mtctx->jobIDMask; + DEBUGLOG(5, "ZSTDMT_flushProduced (blocking:%u , job %u <= %u)", + blockToFlush, mtctx->doneJobID, mtctx->nextJobID); + assert(output->size >= output->pos); + + ZSTD_PTHREAD_MUTEX_LOCK(&mtctx->jobs[wJobID].job_mutex); + if ( blockToFlush + && (mtctx->doneJobID < mtctx->nextJobID) ) { + assert(mtctx->jobs[wJobID].dstFlushed <= mtctx->jobs[wJobID].cSize); + while (mtctx->jobs[wJobID].dstFlushed == mtctx->jobs[wJobID].cSize) { /* nothing to flush */ + if (mtctx->jobs[wJobID].consumed == mtctx->jobs[wJobID].src.size) { + DEBUGLOG(5, "job %u is completely consumed (%u == %u) => don't wait for cond, there will be none", + mtctx->doneJobID, (U32)mtctx->jobs[wJobID].consumed, (U32)mtctx->jobs[wJobID].src.size); + break; + } + DEBUGLOG(5, "waiting for something to flush from job %u (currently flushed: %u bytes)", + mtctx->doneJobID, (U32)mtctx->jobs[wJobID].dstFlushed); + ZSTD_pthread_cond_wait(&mtctx->jobs[wJobID].job_cond, &mtctx->jobs[wJobID].job_mutex); /* block when nothing to flush but some to come */ + } } + + /* try to flush something */ + { size_t cSize = mtctx->jobs[wJobID].cSize; /* shared */ + size_t const srcConsumed = mtctx->jobs[wJobID].consumed; /* shared */ + size_t const srcSize = mtctx->jobs[wJobID].src.size; /* read-only, could be done after mutex lock, but no-declaration-after-statement */ + ZSTD_pthread_mutex_unlock(&mtctx->jobs[wJobID].job_mutex); + if (ZSTD_isError(cSize)) { + DEBUGLOG(5, "ZSTDMT_flushProduced: job %u : compression error detected : %s", + mtctx->doneJobID, ZSTD_getErrorName(cSize)); + ZSTDMT_waitForAllJobsCompleted(mtctx); + ZSTDMT_releaseAllJobResources(mtctx); + return cSize; + } + /* add frame checksum if necessary (can only happen once) */ + assert(srcConsumed <= srcSize); + if ( (srcConsumed == srcSize) /* job completed -> worker no longer active */ + && mtctx->jobs[wJobID].frameChecksumNeeded ) { + U32 const checksum = (U32)XXH64_digest(&mtctx->serial.xxhState); + DEBUGLOG(4, "ZSTDMT_flushProduced: writing checksum : %08X \n", checksum); + MEM_writeLE32((char*)mtctx->jobs[wJobID].dstBuff.start + mtctx->jobs[wJobID].cSize, checksum); + cSize += 4; + mtctx->jobs[wJobID].cSize += 4; /* can write this shared value, as worker is no longer active */ + mtctx->jobs[wJobID].frameChecksumNeeded = 0; + } + + if (cSize > 0) { /* compression is ongoing or completed */ + size_t const toFlush = MIN(cSize - mtctx->jobs[wJobID].dstFlushed, output->size - output->pos); + DEBUGLOG(5, "ZSTDMT_flushProduced: Flushing %u bytes from job %u (completion:%u/%u, generated:%u)", + (U32)toFlush, mtctx->doneJobID, (U32)srcConsumed, (U32)srcSize, (U32)cSize); + assert(mtctx->doneJobID < mtctx->nextJobID); + assert(cSize >= mtctx->jobs[wJobID].dstFlushed); + assert(mtctx->jobs[wJobID].dstBuff.start != NULL); + if (toFlush > 0) { + ZSTD_memcpy((char*)output->dst + output->pos, + (const char*)mtctx->jobs[wJobID].dstBuff.start + mtctx->jobs[wJobID].dstFlushed, + toFlush); + } + output->pos += toFlush; + mtctx->jobs[wJobID].dstFlushed += toFlush; /* can write : this value is only used by mtctx */ + + if ( (srcConsumed == srcSize) /* job is completed */ + && (mtctx->jobs[wJobID].dstFlushed == cSize) ) { /* output buffer fully flushed => free this job position */ + DEBUGLOG(5, "Job %u completed (%u bytes), moving to next one", + mtctx->doneJobID, (U32)mtctx->jobs[wJobID].dstFlushed); + ZSTDMT_releaseBuffer(mtctx->bufPool, mtctx->jobs[wJobID].dstBuff); + DEBUGLOG(5, "dstBuffer released"); + mtctx->jobs[wJobID].dstBuff = g_nullBuffer; + mtctx->jobs[wJobID].cSize = 0; /* ensure this job slot is considered "not started" in future check */ + mtctx->consumed += srcSize; + mtctx->produced += cSize; + mtctx->doneJobID++; + } } + + /* return value : how many bytes left in buffer ; fake it to 1 when unknown but >0 */ + if (cSize > mtctx->jobs[wJobID].dstFlushed) return (cSize - mtctx->jobs[wJobID].dstFlushed); + if (srcSize > srcConsumed) return 1; /* current job not completely compressed */ + } + if (mtctx->doneJobID < mtctx->nextJobID) return 1; /* some more jobs ongoing */ + if (mtctx->jobReady) return 1; /* one job is ready to push, just not yet in the list */ + if (mtctx->inBuff.filled > 0) return 1; /* input is not empty, and still needs to be converted into a job */ + mtctx->allJobsCompleted = mtctx->frameEnded; /* all jobs are entirely flushed => if this one is last one, frame is completed */ + if (end == ZSTD_e_end) return !mtctx->frameEnded; /* for ZSTD_e_end, question becomes : is frame completed ? instead of : are internal buffers fully flushed ? */ + return 0; /* internal buffers fully flushed */ +} + +/** + * Returns the range of data used by the earliest job that is not yet complete. + * If the data of the first job is broken up into two segments, we cover both + * sections. + */ +static range_t ZSTDMT_getInputDataInUse(ZSTDMT_CCtx* mtctx) +{ + unsigned const firstJobID = mtctx->doneJobID; + unsigned const lastJobID = mtctx->nextJobID; + unsigned jobID; + + for (jobID = firstJobID; jobID < lastJobID; ++jobID) { + unsigned const wJobID = jobID & mtctx->jobIDMask; + size_t consumed; + + ZSTD_PTHREAD_MUTEX_LOCK(&mtctx->jobs[wJobID].job_mutex); + consumed = mtctx->jobs[wJobID].consumed; + ZSTD_pthread_mutex_unlock(&mtctx->jobs[wJobID].job_mutex); + + if (consumed < mtctx->jobs[wJobID].src.size) { + range_t range = mtctx->jobs[wJobID].prefix; + if (range.size == 0) { + /* Empty prefix */ + range = mtctx->jobs[wJobID].src; + } + /* Job source in multiple segments not supported yet */ + assert(range.start <= mtctx->jobs[wJobID].src.start); + return range; + } + } + return kNullRange; +} + +/** + * Returns non-zero iff buffer and range overlap. + */ +static int ZSTDMT_isOverlapped(buffer_t buffer, range_t range) +{ + BYTE const* const bufferStart = (BYTE const*)buffer.start; + BYTE const* const rangeStart = (BYTE const*)range.start; + + if (rangeStart == NULL || bufferStart == NULL) + return 0; + + { + BYTE const* const bufferEnd = bufferStart + buffer.capacity; + BYTE const* const rangeEnd = rangeStart + range.size; + + /* Empty ranges cannot overlap */ + if (bufferStart == bufferEnd || rangeStart == rangeEnd) + return 0; + + return bufferStart < rangeEnd && rangeStart < bufferEnd; + } +} + +static int ZSTDMT_doesOverlapWindow(buffer_t buffer, ZSTD_window_t window) +{ + range_t extDict; + range_t prefix; + + DEBUGLOG(5, "ZSTDMT_doesOverlapWindow"); + extDict.start = window.dictBase + window.lowLimit; + extDict.size = window.dictLimit - window.lowLimit; + + prefix.start = window.base + window.dictLimit; + prefix.size = window.nextSrc - (window.base + window.dictLimit); + DEBUGLOG(5, "extDict [0x%zx, 0x%zx)", + (size_t)extDict.start, + (size_t)extDict.start + extDict.size); + DEBUGLOG(5, "prefix [0x%zx, 0x%zx)", + (size_t)prefix.start, + (size_t)prefix.start + prefix.size); + + return ZSTDMT_isOverlapped(buffer, extDict) + || ZSTDMT_isOverlapped(buffer, prefix); +} + +static void ZSTDMT_waitForLdmComplete(ZSTDMT_CCtx* mtctx, buffer_t buffer) +{ + if (mtctx->params.ldmParams.enableLdm == ZSTD_ps_enable) { + ZSTD_pthread_mutex_t* mutex = &mtctx->serial.ldmWindowMutex; + DEBUGLOG(5, "ZSTDMT_waitForLdmComplete"); + DEBUGLOG(5, "source [0x%zx, 0x%zx)", + (size_t)buffer.start, + (size_t)buffer.start + buffer.capacity); + ZSTD_PTHREAD_MUTEX_LOCK(mutex); + while (ZSTDMT_doesOverlapWindow(buffer, mtctx->serial.ldmWindow)) { + DEBUGLOG(5, "Waiting for LDM to finish..."); + ZSTD_pthread_cond_wait(&mtctx->serial.ldmWindowCond, mutex); + } + DEBUGLOG(6, "Done waiting for LDM to finish"); + ZSTD_pthread_mutex_unlock(mutex); + } +} + +/** + * Attempts to set the inBuff to the next section to fill. + * If any part of the new section is still in use we give up. + * Returns non-zero if the buffer is filled. + */ +static int ZSTDMT_tryGetInputRange(ZSTDMT_CCtx* mtctx) +{ + range_t const inUse = ZSTDMT_getInputDataInUse(mtctx); + size_t const spaceLeft = mtctx->roundBuff.capacity - mtctx->roundBuff.pos; + size_t const target = mtctx->targetSectionSize; + buffer_t buffer; + + DEBUGLOG(5, "ZSTDMT_tryGetInputRange"); + assert(mtctx->inBuff.buffer.start == NULL); + assert(mtctx->roundBuff.capacity >= target); + + if (spaceLeft < target) { + /* ZSTD_invalidateRepCodes() doesn't work for extDict variants. + * Simply copy the prefix to the beginning in that case. + */ + BYTE* const start = (BYTE*)mtctx->roundBuff.buffer; + size_t const prefixSize = mtctx->inBuff.prefix.size; + + buffer.start = start; + buffer.capacity = prefixSize; + if (ZSTDMT_isOverlapped(buffer, inUse)) { + DEBUGLOG(5, "Waiting for buffer..."); + return 0; + } + ZSTDMT_waitForLdmComplete(mtctx, buffer); + ZSTD_memmove(start, mtctx->inBuff.prefix.start, prefixSize); + mtctx->inBuff.prefix.start = start; + mtctx->roundBuff.pos = prefixSize; + } + buffer.start = mtctx->roundBuff.buffer + mtctx->roundBuff.pos; + buffer.capacity = target; + + if (ZSTDMT_isOverlapped(buffer, inUse)) { + DEBUGLOG(5, "Waiting for buffer..."); + return 0; + } + assert(!ZSTDMT_isOverlapped(buffer, mtctx->inBuff.prefix)); + + ZSTDMT_waitForLdmComplete(mtctx, buffer); + + DEBUGLOG(5, "Using prefix range [%zx, %zx)", + (size_t)mtctx->inBuff.prefix.start, + (size_t)mtctx->inBuff.prefix.start + mtctx->inBuff.prefix.size); + DEBUGLOG(5, "Using source range [%zx, %zx)", + (size_t)buffer.start, + (size_t)buffer.start + buffer.capacity); + + + mtctx->inBuff.buffer = buffer; + mtctx->inBuff.filled = 0; + assert(mtctx->roundBuff.pos + buffer.capacity <= mtctx->roundBuff.capacity); + return 1; +} + +typedef struct { + size_t toLoad; /* The number of bytes to load from the input. */ + int flush; /* Boolean declaring if we must flush because we found a synchronization point. */ +} syncPoint_t; + +/** + * Searches through the input for a synchronization point. If one is found, we + * will instruct the caller to flush, and return the number of bytes to load. + * Otherwise, we will load as many bytes as possible and instruct the caller + * to continue as normal. + */ +static syncPoint_t +findSynchronizationPoint(ZSTDMT_CCtx const* mtctx, ZSTD_inBuffer const input) +{ + BYTE const* const istart = (BYTE const*)input.src + input.pos; + U64 const primePower = mtctx->rsync.primePower; + U64 const hitMask = mtctx->rsync.hitMask; + + syncPoint_t syncPoint; + U64 hash; + BYTE const* prev; + size_t pos; + + syncPoint.toLoad = MIN(input.size - input.pos, mtctx->targetSectionSize - mtctx->inBuff.filled); + syncPoint.flush = 0; + if (!mtctx->params.rsyncable) + /* Rsync is disabled. */ + return syncPoint; + if (mtctx->inBuff.filled + input.size - input.pos < RSYNC_MIN_BLOCK_SIZE) + /* We don't emit synchronization points if it would produce too small blocks. + * We don't have enough input to find a synchronization point, so don't look. + */ + return syncPoint; + if (mtctx->inBuff.filled + syncPoint.toLoad < RSYNC_LENGTH) + /* Not enough to compute the hash. + * We will miss any synchronization points in this RSYNC_LENGTH byte + * window. However, since it depends only in the internal buffers, if the + * state is already synchronized, we will remain synchronized. + * Additionally, the probability that we miss a synchronization point is + * low: RSYNC_LENGTH / targetSectionSize. + */ + return syncPoint; + /* Initialize the loop variables. */ + if (mtctx->inBuff.filled < RSYNC_MIN_BLOCK_SIZE) { + /* We don't need to scan the first RSYNC_MIN_BLOCK_SIZE positions + * because they can't possibly be a sync point. So we can start + * part way through the input buffer. + */ + pos = RSYNC_MIN_BLOCK_SIZE - mtctx->inBuff.filled; + if (pos >= RSYNC_LENGTH) { + prev = istart + pos - RSYNC_LENGTH; + hash = ZSTD_rollingHash_compute(prev, RSYNC_LENGTH); + } else { + assert(mtctx->inBuff.filled >= RSYNC_LENGTH); + prev = (BYTE const*)mtctx->inBuff.buffer.start + mtctx->inBuff.filled - RSYNC_LENGTH; + hash = ZSTD_rollingHash_compute(prev + pos, (RSYNC_LENGTH - pos)); + hash = ZSTD_rollingHash_append(hash, istart, pos); + } + } else { + /* We have enough bytes buffered to initialize the hash, + * and have processed enough bytes to find a sync point. + * Start scanning at the beginning of the input. + */ + assert(mtctx->inBuff.filled >= RSYNC_MIN_BLOCK_SIZE); + assert(RSYNC_MIN_BLOCK_SIZE >= RSYNC_LENGTH); + pos = 0; + prev = (BYTE const*)mtctx->inBuff.buffer.start + mtctx->inBuff.filled - RSYNC_LENGTH; + hash = ZSTD_rollingHash_compute(prev, RSYNC_LENGTH); + if ((hash & hitMask) == hitMask) { + /* We're already at a sync point so don't load any more until + * we're able to flush this sync point. + * This likely happened because the job table was full so we + * couldn't add our job. + */ + syncPoint.toLoad = 0; + syncPoint.flush = 1; + return syncPoint; + } + } + /* Starting with the hash of the previous RSYNC_LENGTH bytes, roll + * through the input. If we hit a synchronization point, then cut the + * job off, and tell the compressor to flush the job. Otherwise, load + * all the bytes and continue as normal. + * If we go too long without a synchronization point (targetSectionSize) + * then a block will be emitted anyways, but this is okay, since if we + * are already synchronized we will remain synchronized. + */ + assert(pos < RSYNC_LENGTH || ZSTD_rollingHash_compute(istart + pos - RSYNC_LENGTH, RSYNC_LENGTH) == hash); + for (; pos < syncPoint.toLoad; ++pos) { + BYTE const toRemove = pos < RSYNC_LENGTH ? prev[pos] : istart[pos - RSYNC_LENGTH]; + /* This assert is very expensive, and Debian compiles with asserts enabled. + * So disable it for now. We can get similar coverage by checking it at the + * beginning & end of the loop. + * assert(pos < RSYNC_LENGTH || ZSTD_rollingHash_compute(istart + pos - RSYNC_LENGTH, RSYNC_LENGTH) == hash); + */ + hash = ZSTD_rollingHash_rotate(hash, toRemove, istart[pos], primePower); + assert(mtctx->inBuff.filled + pos >= RSYNC_MIN_BLOCK_SIZE); + if ((hash & hitMask) == hitMask) { + syncPoint.toLoad = pos + 1; + syncPoint.flush = 1; + ++pos; /* for assert */ + break; + } + } + assert(pos < RSYNC_LENGTH || ZSTD_rollingHash_compute(istart + pos - RSYNC_LENGTH, RSYNC_LENGTH) == hash); + return syncPoint; +} + +size_t ZSTDMT_nextInputSizeHint(const ZSTDMT_CCtx* mtctx) +{ + size_t hintInSize = mtctx->targetSectionSize - mtctx->inBuff.filled; + if (hintInSize==0) hintInSize = mtctx->targetSectionSize; + return hintInSize; +} + +/** ZSTDMT_compressStream_generic() : + * internal use only - exposed to be invoked from zstd_compress.c + * assumption : output and input are valid (pos <= size) + * @return : minimum amount of data remaining to flush, 0 if none */ +size_t ZSTDMT_compressStream_generic(ZSTDMT_CCtx* mtctx, + ZSTD_outBuffer* output, + ZSTD_inBuffer* input, + ZSTD_EndDirective endOp) +{ + unsigned forwardInputProgress = 0; + DEBUGLOG(5, "ZSTDMT_compressStream_generic (endOp=%u, srcSize=%u)", + (U32)endOp, (U32)(input->size - input->pos)); + assert(output->pos <= output->size); + assert(input->pos <= input->size); + + if ((mtctx->frameEnded) && (endOp==ZSTD_e_continue)) { + /* current frame being ended. Only flush/end are allowed */ + return ERROR(stage_wrong); + } + + /* fill input buffer */ + if ( (!mtctx->jobReady) + && (input->size > input->pos) ) { /* support NULL input */ + if (mtctx->inBuff.buffer.start == NULL) { + assert(mtctx->inBuff.filled == 0); /* Can't fill an empty buffer */ + if (!ZSTDMT_tryGetInputRange(mtctx)) { + /* It is only possible for this operation to fail if there are + * still compression jobs ongoing. + */ + DEBUGLOG(5, "ZSTDMT_tryGetInputRange failed"); + assert(mtctx->doneJobID != mtctx->nextJobID); + } else + DEBUGLOG(5, "ZSTDMT_tryGetInputRange completed successfully : mtctx->inBuff.buffer.start = %p", mtctx->inBuff.buffer.start); + } + if (mtctx->inBuff.buffer.start != NULL) { + syncPoint_t const syncPoint = findSynchronizationPoint(mtctx, *input); + if (syncPoint.flush && endOp == ZSTD_e_continue) { + endOp = ZSTD_e_flush; + } + assert(mtctx->inBuff.buffer.capacity >= mtctx->targetSectionSize); + DEBUGLOG(5, "ZSTDMT_compressStream_generic: adding %u bytes on top of %u to buffer of size %u", + (U32)syncPoint.toLoad, (U32)mtctx->inBuff.filled, (U32)mtctx->targetSectionSize); + ZSTD_memcpy((char*)mtctx->inBuff.buffer.start + mtctx->inBuff.filled, (const char*)input->src + input->pos, syncPoint.toLoad); + input->pos += syncPoint.toLoad; + mtctx->inBuff.filled += syncPoint.toLoad; + forwardInputProgress = syncPoint.toLoad>0; + } + } + if ((input->pos < input->size) && (endOp == ZSTD_e_end)) { + /* Can't end yet because the input is not fully consumed. + * We are in one of these cases: + * - mtctx->inBuff is NULL & empty: we couldn't get an input buffer so don't create a new job. + * - We filled the input buffer: flush this job but don't end the frame. + * - We hit a synchronization point: flush this job but don't end the frame. + */ + assert(mtctx->inBuff.filled == 0 || mtctx->inBuff.filled == mtctx->targetSectionSize || mtctx->params.rsyncable); + endOp = ZSTD_e_flush; + } + + if ( (mtctx->jobReady) + || (mtctx->inBuff.filled >= mtctx->targetSectionSize) /* filled enough : let's compress */ + || ((endOp != ZSTD_e_continue) && (mtctx->inBuff.filled > 0)) /* something to flush : let's go */ + || ((endOp == ZSTD_e_end) && (!mtctx->frameEnded)) ) { /* must finish the frame with a zero-size block */ + size_t const jobSize = mtctx->inBuff.filled; + assert(mtctx->inBuff.filled <= mtctx->targetSectionSize); + FORWARD_IF_ERROR( ZSTDMT_createCompressionJob(mtctx, jobSize, endOp) , ""); + } + + /* check for potential compressed data ready to be flushed */ + { size_t const remainingToFlush = ZSTDMT_flushProduced(mtctx, output, !forwardInputProgress, endOp); /* block if there was no forward input progress */ + if (input->pos < input->size) return MAX(remainingToFlush, 1); /* input not consumed : do not end flush yet */ + DEBUGLOG(5, "end of ZSTDMT_compressStream_generic: remainingToFlush = %u", (U32)remainingToFlush); + return remainingToFlush; + } +} +/**** ended inlining compress/zstdmt_compress.c ****/ +#endif + +/**** start inlining decompress/huf_decompress.c ****/ +/* ****************************************************************** + * huff0 huffman decoder, + * part of Finite State Entropy library + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * You can contact the author at : + * - FSE+HUF source repository : https://github.com/Cyan4973/FiniteStateEntropy + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. +****************************************************************** */ + +/* ************************************************************** +* Dependencies +****************************************************************/ +/**** skipping file: ../common/zstd_deps.h ****/ +/**** skipping file: ../common/compiler.h ****/ +/**** skipping file: ../common/bitstream.h ****/ +/**** skipping file: ../common/fse.h ****/ +/**** skipping file: ../common/huf.h ****/ +/**** skipping file: ../common/error_private.h ****/ +/**** skipping file: ../common/zstd_internal.h ****/ +/**** skipping file: ../common/bits.h ****/ + +/* ************************************************************** +* Constants +****************************************************************/ + +#define HUF_DECODER_FAST_TABLELOG 11 + +/* ************************************************************** +* Macros +****************************************************************/ + +#ifdef HUF_DISABLE_FAST_DECODE +# define HUF_ENABLE_FAST_DECODE 0 +#else +# define HUF_ENABLE_FAST_DECODE 1 +#endif + +/* These two optional macros force the use one way or another of the two + * Huffman decompression implementations. You can't force in both directions + * at the same time. + */ +#if defined(HUF_FORCE_DECOMPRESS_X1) && \ + defined(HUF_FORCE_DECOMPRESS_X2) +#error "Cannot force the use of the X1 and X2 decoders at the same time!" +#endif + +/* When DYNAMIC_BMI2 is enabled, fast decoders are only called when bmi2 is + * supported at runtime, so we can add the BMI2 target attribute. + * When it is disabled, we will still get BMI2 if it is enabled statically. + */ +#if DYNAMIC_BMI2 +# define HUF_FAST_BMI2_ATTRS BMI2_TARGET_ATTRIBUTE +#else +# define HUF_FAST_BMI2_ATTRS +#endif + +#ifdef __cplusplus +# define HUF_EXTERN_C extern "C" +#else +# define HUF_EXTERN_C +#endif +#define HUF_ASM_DECL HUF_EXTERN_C + +#if DYNAMIC_BMI2 +# define HUF_NEED_BMI2_FUNCTION 1 +#else +# define HUF_NEED_BMI2_FUNCTION 0 +#endif + +/* ************************************************************** +* Error Management +****************************************************************/ +#define HUF_isError ERR_isError + + +/* ************************************************************** +* Byte alignment for workSpace management +****************************************************************/ +#define HUF_ALIGN(x, a) HUF_ALIGN_MASK((x), (a) - 1) +#define HUF_ALIGN_MASK(x, mask) (((x) + (mask)) & ~(mask)) + + +/* ************************************************************** +* BMI2 Variant Wrappers +****************************************************************/ +typedef size_t (*HUF_DecompressUsingDTableFn)(void *dst, size_t dstSize, + const void *cSrc, + size_t cSrcSize, + const HUF_DTable *DTable); + +#if DYNAMIC_BMI2 + +#define HUF_DGEN(fn) \ + \ + static size_t fn##_default( \ + void* dst, size_t dstSize, \ + const void* cSrc, size_t cSrcSize, \ + const HUF_DTable* DTable) \ + { \ + return fn##_body(dst, dstSize, cSrc, cSrcSize, DTable); \ + } \ + \ + static BMI2_TARGET_ATTRIBUTE size_t fn##_bmi2( \ + void* dst, size_t dstSize, \ + const void* cSrc, size_t cSrcSize, \ + const HUF_DTable* DTable) \ + { \ + return fn##_body(dst, dstSize, cSrc, cSrcSize, DTable); \ + } \ + \ + static size_t fn(void* dst, size_t dstSize, void const* cSrc, \ + size_t cSrcSize, HUF_DTable const* DTable, int flags) \ + { \ + if (flags & HUF_flags_bmi2) { \ + return fn##_bmi2(dst, dstSize, cSrc, cSrcSize, DTable); \ + } \ + return fn##_default(dst, dstSize, cSrc, cSrcSize, DTable); \ + } + +#else + +#define HUF_DGEN(fn) \ + static size_t fn(void* dst, size_t dstSize, void const* cSrc, \ + size_t cSrcSize, HUF_DTable const* DTable, int flags) \ + { \ + (void)flags; \ + return fn##_body(dst, dstSize, cSrc, cSrcSize, DTable); \ + } + +#endif + + +/*-***************************/ +/* generic DTableDesc */ +/*-***************************/ +typedef struct { BYTE maxTableLog; BYTE tableType; BYTE tableLog; BYTE reserved; } DTableDesc; + +static DTableDesc HUF_getDTableDesc(const HUF_DTable* table) +{ + DTableDesc dtd; + ZSTD_memcpy(&dtd, table, sizeof(dtd)); + return dtd; +} + +static size_t HUF_initFastDStream(BYTE const* ip) { + BYTE const lastByte = ip[7]; + size_t const bitsConsumed = lastByte ? 8 - ZSTD_highbit32(lastByte) : 0; + size_t const value = MEM_readLEST(ip) | 1; + assert(bitsConsumed <= 8); + assert(sizeof(size_t) == 8); + return value << bitsConsumed; +} + + +/** + * The input/output arguments to the Huffman fast decoding loop: + * + * ip [in/out] - The input pointers, must be updated to reflect what is consumed. + * op [in/out] - The output pointers, must be updated to reflect what is written. + * bits [in/out] - The bitstream containers, must be updated to reflect the current state. + * dt [in] - The decoding table. + * ilowest [in] - The beginning of the valid range of the input. Decoders may read + * down to this pointer. It may be below iend[0]. + * oend [in] - The end of the output stream. op[3] must not cross oend. + * iend [in] - The end of each input stream. ip[i] may cross iend[i], + * as long as it is above ilowest, but that indicates corruption. + */ +typedef struct { + BYTE const* ip[4]; + BYTE* op[4]; + U64 bits[4]; + void const* dt; + BYTE const* ilowest; + BYTE* oend; + BYTE const* iend[4]; +} HUF_DecompressFastArgs; + +typedef void (*HUF_DecompressFastLoopFn)(HUF_DecompressFastArgs*); + +/** + * Initializes args for the fast decoding loop. + * @returns 1 on success + * 0 if the fallback implementation should be used. + * Or an error code on failure. + */ +static size_t HUF_DecompressFastArgs_init(HUF_DecompressFastArgs* args, void* dst, size_t dstSize, void const* src, size_t srcSize, const HUF_DTable* DTable) +{ + void const* dt = DTable + 1; + U32 const dtLog = HUF_getDTableDesc(DTable).tableLog; + + const BYTE* const istart = (const BYTE*)src; + + BYTE* const oend = ZSTD_maybeNullPtrAdd((BYTE*)dst, dstSize); + + /* The fast decoding loop assumes 64-bit little-endian. + * This condition is false on x32. + */ + if (!MEM_isLittleEndian() || MEM_32bits()) + return 0; + + /* Avoid nullptr addition */ + if (dstSize == 0) + return 0; + assert(dst != NULL); + + /* strict minimum : jump table + 1 byte per stream */ + if (srcSize < 10) + return ERROR(corruption_detected); + + /* Must have at least 8 bytes per stream because we don't handle initializing smaller bit containers. + * If table log is not correct at this point, fallback to the old decoder. + * On small inputs we don't have enough data to trigger the fast loop, so use the old decoder. + */ + if (dtLog != HUF_DECODER_FAST_TABLELOG) + return 0; + + /* Read the jump table. */ + { + size_t const length1 = MEM_readLE16(istart); + size_t const length2 = MEM_readLE16(istart+2); + size_t const length3 = MEM_readLE16(istart+4); + size_t const length4 = srcSize - (length1 + length2 + length3 + 6); + args->iend[0] = istart + 6; /* jumpTable */ + args->iend[1] = args->iend[0] + length1; + args->iend[2] = args->iend[1] + length2; + args->iend[3] = args->iend[2] + length3; + + /* HUF_initFastDStream() requires this, and this small of an input + * won't benefit from the ASM loop anyways. + */ + if (length1 < 8 || length2 < 8 || length3 < 8 || length4 < 8) + return 0; + if (length4 > srcSize) return ERROR(corruption_detected); /* overflow */ + } + /* ip[] contains the position that is currently loaded into bits[]. */ + args->ip[0] = args->iend[1] - sizeof(U64); + args->ip[1] = args->iend[2] - sizeof(U64); + args->ip[2] = args->iend[3] - sizeof(U64); + args->ip[3] = (BYTE const*)src + srcSize - sizeof(U64); + + /* op[] contains the output pointers. */ + args->op[0] = (BYTE*)dst; + args->op[1] = args->op[0] + (dstSize+3)/4; + args->op[2] = args->op[1] + (dstSize+3)/4; + args->op[3] = args->op[2] + (dstSize+3)/4; + + /* No point to call the ASM loop for tiny outputs. */ + if (args->op[3] >= oend) + return 0; + + /* bits[] is the bit container. + * It is read from the MSB down to the LSB. + * It is shifted left as it is read, and zeros are + * shifted in. After the lowest valid bit a 1 is + * set, so that CountTrailingZeros(bits[]) can be used + * to count how many bits we've consumed. + */ + args->bits[0] = HUF_initFastDStream(args->ip[0]); + args->bits[1] = HUF_initFastDStream(args->ip[1]); + args->bits[2] = HUF_initFastDStream(args->ip[2]); + args->bits[3] = HUF_initFastDStream(args->ip[3]); + + /* The decoders must be sure to never read beyond ilowest. + * This is lower than iend[0], but allowing decoders to read + * down to ilowest can allow an extra iteration or two in the + * fast loop. + */ + args->ilowest = istart; + + args->oend = oend; + args->dt = dt; + + return 1; +} + +static size_t HUF_initRemainingDStream(BIT_DStream_t* bit, HUF_DecompressFastArgs const* args, int stream, BYTE* segmentEnd) +{ + /* Validate that we haven't overwritten. */ + if (args->op[stream] > segmentEnd) + return ERROR(corruption_detected); + /* Validate that we haven't read beyond iend[]. + * Note that ip[] may be < iend[] because the MSB is + * the next bit to read, and we may have consumed 100% + * of the stream, so down to iend[i] - 8 is valid. + */ + if (args->ip[stream] < args->iend[stream] - 8) + return ERROR(corruption_detected); + + /* Construct the BIT_DStream_t. */ + assert(sizeof(size_t) == 8); + bit->bitContainer = MEM_readLEST(args->ip[stream]); + bit->bitsConsumed = ZSTD_countTrailingZeros64(args->bits[stream]); + bit->start = (const char*)args->ilowest; + bit->limitPtr = bit->start + sizeof(size_t); + bit->ptr = (const char*)args->ip[stream]; + + return 0; +} + +/* Calls X(N) for each stream 0, 1, 2, 3. */ +#define HUF_4X_FOR_EACH_STREAM(X) \ + do { \ + X(0); \ + X(1); \ + X(2); \ + X(3); \ + } while (0) + +/* Calls X(N, var) for each stream 0, 1, 2, 3. */ +#define HUF_4X_FOR_EACH_STREAM_WITH_VAR(X, var) \ + do { \ + X(0, (var)); \ + X(1, (var)); \ + X(2, (var)); \ + X(3, (var)); \ + } while (0) + + +#ifndef HUF_FORCE_DECOMPRESS_X2 + +/*-***************************/ +/* single-symbol decoding */ +/*-***************************/ +typedef struct { BYTE nbBits; BYTE byte; } HUF_DEltX1; /* single-symbol decoding */ + +/** + * Packs 4 HUF_DEltX1 structs into a U64. This is used to lay down 4 entries at + * a time. + */ +static U64 HUF_DEltX1_set4(BYTE symbol, BYTE nbBits) { + U64 D4; + if (MEM_isLittleEndian()) { + D4 = (U64)((symbol << 8) + nbBits); + } else { + D4 = (U64)(symbol + (nbBits << 8)); + } + assert(D4 < (1U << 16)); + D4 *= 0x0001000100010001ULL; + return D4; +} + +/** + * Increase the tableLog to targetTableLog and rescales the stats. + * If tableLog > targetTableLog this is a no-op. + * @returns New tableLog + */ +static U32 HUF_rescaleStats(BYTE* huffWeight, U32* rankVal, U32 nbSymbols, U32 tableLog, U32 targetTableLog) +{ + if (tableLog > targetTableLog) + return tableLog; + if (tableLog < targetTableLog) { + U32 const scale = targetTableLog - tableLog; + U32 s; + /* Increase the weight for all non-zero probability symbols by scale. */ + for (s = 0; s < nbSymbols; ++s) { + huffWeight[s] += (BYTE)((huffWeight[s] == 0) ? 0 : scale); + } + /* Update rankVal to reflect the new weights. + * All weights except 0 get moved to weight + scale. + * Weights [1, scale] are empty. + */ + for (s = targetTableLog; s > scale; --s) { + rankVal[s] = rankVal[s - scale]; + } + for (s = scale; s > 0; --s) { + rankVal[s] = 0; + } + } + return targetTableLog; +} + +typedef struct { + U32 rankVal[HUF_TABLELOG_ABSOLUTEMAX + 1]; + U32 rankStart[HUF_TABLELOG_ABSOLUTEMAX + 1]; + U32 statsWksp[HUF_READ_STATS_WORKSPACE_SIZE_U32]; + BYTE symbols[HUF_SYMBOLVALUE_MAX + 1]; + BYTE huffWeight[HUF_SYMBOLVALUE_MAX + 1]; +} HUF_ReadDTableX1_Workspace; + +size_t HUF_readDTableX1_wksp(HUF_DTable* DTable, const void* src, size_t srcSize, void* workSpace, size_t wkspSize, int flags) +{ + U32 tableLog = 0; + U32 nbSymbols = 0; + size_t iSize; + void* const dtPtr = DTable + 1; + HUF_DEltX1* const dt = (HUF_DEltX1*)dtPtr; + HUF_ReadDTableX1_Workspace* wksp = (HUF_ReadDTableX1_Workspace*)workSpace; + + DEBUG_STATIC_ASSERT(HUF_DECOMPRESS_WORKSPACE_SIZE >= sizeof(*wksp)); + if (sizeof(*wksp) > wkspSize) return ERROR(tableLog_tooLarge); + + DEBUG_STATIC_ASSERT(sizeof(DTableDesc) == sizeof(HUF_DTable)); + /* ZSTD_memset(huffWeight, 0, sizeof(huffWeight)); */ /* is not necessary, even though some analyzer complain ... */ + + iSize = HUF_readStats_wksp(wksp->huffWeight, HUF_SYMBOLVALUE_MAX + 1, wksp->rankVal, &nbSymbols, &tableLog, src, srcSize, wksp->statsWksp, sizeof(wksp->statsWksp), flags); + if (HUF_isError(iSize)) return iSize; + + + /* Table header */ + { DTableDesc dtd = HUF_getDTableDesc(DTable); + U32 const maxTableLog = dtd.maxTableLog + 1; + U32 const targetTableLog = MIN(maxTableLog, HUF_DECODER_FAST_TABLELOG); + tableLog = HUF_rescaleStats(wksp->huffWeight, wksp->rankVal, nbSymbols, tableLog, targetTableLog); + if (tableLog > (U32)(dtd.maxTableLog+1)) return ERROR(tableLog_tooLarge); /* DTable too small, Huffman tree cannot fit in */ + dtd.tableType = 0; + dtd.tableLog = (BYTE)tableLog; + ZSTD_memcpy(DTable, &dtd, sizeof(dtd)); + } + + /* Compute symbols and rankStart given rankVal: + * + * rankVal already contains the number of values of each weight. + * + * symbols contains the symbols ordered by weight. First are the rankVal[0] + * weight 0 symbols, followed by the rankVal[1] weight 1 symbols, and so on. + * symbols[0] is filled (but unused) to avoid a branch. + * + * rankStart contains the offset where each rank belongs in the DTable. + * rankStart[0] is not filled because there are no entries in the table for + * weight 0. + */ + { int n; + U32 nextRankStart = 0; + int const unroll = 4; + int const nLimit = (int)nbSymbols - unroll + 1; + for (n=0; n<(int)tableLog+1; n++) { + U32 const curr = nextRankStart; + nextRankStart += wksp->rankVal[n]; + wksp->rankStart[n] = curr; + } + for (n=0; n < nLimit; n += unroll) { + int u; + for (u=0; u < unroll; ++u) { + size_t const w = wksp->huffWeight[n+u]; + wksp->symbols[wksp->rankStart[w]++] = (BYTE)(n+u); + } + } + for (; n < (int)nbSymbols; ++n) { + size_t const w = wksp->huffWeight[n]; + wksp->symbols[wksp->rankStart[w]++] = (BYTE)n; + } + } + + /* fill DTable + * We fill all entries of each weight in order. + * That way length is a constant for each iteration of the outer loop. + * We can switch based on the length to a different inner loop which is + * optimized for that particular case. + */ + { U32 w; + int symbol = wksp->rankVal[0]; + int rankStart = 0; + for (w=1; wrankVal[w]; + int const length = (1 << w) >> 1; + int uStart = rankStart; + BYTE const nbBits = (BYTE)(tableLog + 1 - w); + int s; + int u; + switch (length) { + case 1: + for (s=0; ssymbols[symbol + s]; + D.nbBits = nbBits; + dt[uStart] = D; + uStart += 1; + } + break; + case 2: + for (s=0; ssymbols[symbol + s]; + D.nbBits = nbBits; + dt[uStart+0] = D; + dt[uStart+1] = D; + uStart += 2; + } + break; + case 4: + for (s=0; ssymbols[symbol + s], nbBits); + MEM_write64(dt + uStart, D4); + uStart += 4; + } + break; + case 8: + for (s=0; ssymbols[symbol + s], nbBits); + MEM_write64(dt + uStart, D4); + MEM_write64(dt + uStart + 4, D4); + uStart += 8; + } + break; + default: + for (s=0; ssymbols[symbol + s], nbBits); + for (u=0; u < length; u += 16) { + MEM_write64(dt + uStart + u + 0, D4); + MEM_write64(dt + uStart + u + 4, D4); + MEM_write64(dt + uStart + u + 8, D4); + MEM_write64(dt + uStart + u + 12, D4); + } + assert(u == length); + uStart += length; + } + break; + } + symbol += symbolCount; + rankStart += symbolCount * length; + } + } + return iSize; +} + +FORCE_INLINE_TEMPLATE BYTE +HUF_decodeSymbolX1(BIT_DStream_t* Dstream, const HUF_DEltX1* dt, const U32 dtLog) +{ + size_t const val = BIT_lookBitsFast(Dstream, dtLog); /* note : dtLog >= 1 */ + BYTE const c = dt[val].byte; + BIT_skipBits(Dstream, dt[val].nbBits); + return c; +} + +#define HUF_DECODE_SYMBOLX1_0(ptr, DStreamPtr) \ + do { *ptr++ = HUF_decodeSymbolX1(DStreamPtr, dt, dtLog); } while (0) + +#define HUF_DECODE_SYMBOLX1_1(ptr, DStreamPtr) \ + do { \ + if (MEM_64bits() || (HUF_TABLELOG_MAX<=12)) \ + HUF_DECODE_SYMBOLX1_0(ptr, DStreamPtr); \ + } while (0) + +#define HUF_DECODE_SYMBOLX1_2(ptr, DStreamPtr) \ + do { \ + if (MEM_64bits()) \ + HUF_DECODE_SYMBOLX1_0(ptr, DStreamPtr); \ + } while (0) + +HINT_INLINE size_t +HUF_decodeStreamX1(BYTE* p, BIT_DStream_t* const bitDPtr, BYTE* const pEnd, const HUF_DEltX1* const dt, const U32 dtLog) +{ + BYTE* const pStart = p; + + /* up to 4 symbols at a time */ + if ((pEnd - p) > 3) { + while ((BIT_reloadDStream(bitDPtr) == BIT_DStream_unfinished) & (p < pEnd-3)) { + HUF_DECODE_SYMBOLX1_2(p, bitDPtr); + HUF_DECODE_SYMBOLX1_1(p, bitDPtr); + HUF_DECODE_SYMBOLX1_2(p, bitDPtr); + HUF_DECODE_SYMBOLX1_0(p, bitDPtr); + } + } else { + BIT_reloadDStream(bitDPtr); + } + + /* [0-3] symbols remaining */ + if (MEM_32bits()) + while ((BIT_reloadDStream(bitDPtr) == BIT_DStream_unfinished) & (p < pEnd)) + HUF_DECODE_SYMBOLX1_0(p, bitDPtr); + + /* no more data to retrieve from bitstream, no need to reload */ + while (p < pEnd) + HUF_DECODE_SYMBOLX1_0(p, bitDPtr); + + return (size_t)(pEnd-pStart); +} + +FORCE_INLINE_TEMPLATE size_t +HUF_decompress1X1_usingDTable_internal_body( + void* dst, size_t dstSize, + const void* cSrc, size_t cSrcSize, + const HUF_DTable* DTable) +{ + BYTE* op = (BYTE*)dst; + BYTE* const oend = ZSTD_maybeNullPtrAdd(op, dstSize); + const void* dtPtr = DTable + 1; + const HUF_DEltX1* const dt = (const HUF_DEltX1*)dtPtr; + BIT_DStream_t bitD; + DTableDesc const dtd = HUF_getDTableDesc(DTable); + U32 const dtLog = dtd.tableLog; + + CHECK_F( BIT_initDStream(&bitD, cSrc, cSrcSize) ); + + HUF_decodeStreamX1(op, &bitD, oend, dt, dtLog); + + if (!BIT_endOfDStream(&bitD)) return ERROR(corruption_detected); + + return dstSize; +} + +/* HUF_decompress4X1_usingDTable_internal_body(): + * Conditions : + * @dstSize >= 6 + */ +FORCE_INLINE_TEMPLATE size_t +HUF_decompress4X1_usingDTable_internal_body( + void* dst, size_t dstSize, + const void* cSrc, size_t cSrcSize, + const HUF_DTable* DTable) +{ + /* Check */ + if (cSrcSize < 10) return ERROR(corruption_detected); /* strict minimum : jump table + 1 byte per stream */ + if (dstSize < 6) return ERROR(corruption_detected); /* stream 4-split doesn't work */ + + { const BYTE* const istart = (const BYTE*) cSrc; + BYTE* const ostart = (BYTE*) dst; + BYTE* const oend = ostart + dstSize; + BYTE* const olimit = oend - 3; + const void* const dtPtr = DTable + 1; + const HUF_DEltX1* const dt = (const HUF_DEltX1*)dtPtr; + + /* Init */ + BIT_DStream_t bitD1; + BIT_DStream_t bitD2; + BIT_DStream_t bitD3; + BIT_DStream_t bitD4; + size_t const length1 = MEM_readLE16(istart); + size_t const length2 = MEM_readLE16(istart+2); + size_t const length3 = MEM_readLE16(istart+4); + size_t const length4 = cSrcSize - (length1 + length2 + length3 + 6); + const BYTE* const istart1 = istart + 6; /* jumpTable */ + const BYTE* const istart2 = istart1 + length1; + const BYTE* const istart3 = istart2 + length2; + const BYTE* const istart4 = istart3 + length3; + const size_t segmentSize = (dstSize+3) / 4; + BYTE* const opStart2 = ostart + segmentSize; + BYTE* const opStart3 = opStart2 + segmentSize; + BYTE* const opStart4 = opStart3 + segmentSize; + BYTE* op1 = ostart; + BYTE* op2 = opStart2; + BYTE* op3 = opStart3; + BYTE* op4 = opStart4; + DTableDesc const dtd = HUF_getDTableDesc(DTable); + U32 const dtLog = dtd.tableLog; + U32 endSignal = 1; + + if (length4 > cSrcSize) return ERROR(corruption_detected); /* overflow */ + if (opStart4 > oend) return ERROR(corruption_detected); /* overflow */ + assert(dstSize >= 6); /* validated above */ + CHECK_F( BIT_initDStream(&bitD1, istart1, length1) ); + CHECK_F( BIT_initDStream(&bitD2, istart2, length2) ); + CHECK_F( BIT_initDStream(&bitD3, istart3, length3) ); + CHECK_F( BIT_initDStream(&bitD4, istart4, length4) ); + + /* up to 16 symbols per loop (4 symbols per stream) in 64-bit mode */ + if ((size_t)(oend - op4) >= sizeof(size_t)) { + for ( ; (endSignal) & (op4 < olimit) ; ) { + HUF_DECODE_SYMBOLX1_2(op1, &bitD1); + HUF_DECODE_SYMBOLX1_2(op2, &bitD2); + HUF_DECODE_SYMBOLX1_2(op3, &bitD3); + HUF_DECODE_SYMBOLX1_2(op4, &bitD4); + HUF_DECODE_SYMBOLX1_1(op1, &bitD1); + HUF_DECODE_SYMBOLX1_1(op2, &bitD2); + HUF_DECODE_SYMBOLX1_1(op3, &bitD3); + HUF_DECODE_SYMBOLX1_1(op4, &bitD4); + HUF_DECODE_SYMBOLX1_2(op1, &bitD1); + HUF_DECODE_SYMBOLX1_2(op2, &bitD2); + HUF_DECODE_SYMBOLX1_2(op3, &bitD3); + HUF_DECODE_SYMBOLX1_2(op4, &bitD4); + HUF_DECODE_SYMBOLX1_0(op1, &bitD1); + HUF_DECODE_SYMBOLX1_0(op2, &bitD2); + HUF_DECODE_SYMBOLX1_0(op3, &bitD3); + HUF_DECODE_SYMBOLX1_0(op4, &bitD4); + endSignal &= BIT_reloadDStreamFast(&bitD1) == BIT_DStream_unfinished; + endSignal &= BIT_reloadDStreamFast(&bitD2) == BIT_DStream_unfinished; + endSignal &= BIT_reloadDStreamFast(&bitD3) == BIT_DStream_unfinished; + endSignal &= BIT_reloadDStreamFast(&bitD4) == BIT_DStream_unfinished; + } + } + + /* check corruption */ + /* note : should not be necessary : op# advance in lock step, and we control op4. + * but curiously, binary generated by gcc 7.2 & 7.3 with -mbmi2 runs faster when >=1 test is present */ + if (op1 > opStart2) return ERROR(corruption_detected); + if (op2 > opStart3) return ERROR(corruption_detected); + if (op3 > opStart4) return ERROR(corruption_detected); + /* note : op4 supposed already verified within main loop */ + + /* finish bitStreams one by one */ + HUF_decodeStreamX1(op1, &bitD1, opStart2, dt, dtLog); + HUF_decodeStreamX1(op2, &bitD2, opStart3, dt, dtLog); + HUF_decodeStreamX1(op3, &bitD3, opStart4, dt, dtLog); + HUF_decodeStreamX1(op4, &bitD4, oend, dt, dtLog); + + /* check */ + { U32 const endCheck = BIT_endOfDStream(&bitD1) & BIT_endOfDStream(&bitD2) & BIT_endOfDStream(&bitD3) & BIT_endOfDStream(&bitD4); + if (!endCheck) return ERROR(corruption_detected); } + + /* decoded size */ + return dstSize; + } +} + +#if HUF_NEED_BMI2_FUNCTION +static BMI2_TARGET_ATTRIBUTE +size_t HUF_decompress4X1_usingDTable_internal_bmi2(void* dst, size_t dstSize, void const* cSrc, + size_t cSrcSize, HUF_DTable const* DTable) { + return HUF_decompress4X1_usingDTable_internal_body(dst, dstSize, cSrc, cSrcSize, DTable); +} +#endif + +static +size_t HUF_decompress4X1_usingDTable_internal_default(void* dst, size_t dstSize, void const* cSrc, + size_t cSrcSize, HUF_DTable const* DTable) { + return HUF_decompress4X1_usingDTable_internal_body(dst, dstSize, cSrc, cSrcSize, DTable); +} + +#if ZSTD_ENABLE_ASM_X86_64_BMI2 + +HUF_ASM_DECL void HUF_decompress4X1_usingDTable_internal_fast_asm_loop(HUF_DecompressFastArgs* args) ZSTDLIB_HIDDEN; + +#endif + +static HUF_FAST_BMI2_ATTRS +void HUF_decompress4X1_usingDTable_internal_fast_c_loop(HUF_DecompressFastArgs* args) +{ + U64 bits[4]; + BYTE const* ip[4]; + BYTE* op[4]; + U16 const* const dtable = (U16 const*)args->dt; + BYTE* const oend = args->oend; + BYTE const* const ilowest = args->ilowest; + + /* Copy the arguments to local variables */ + ZSTD_memcpy(&bits, &args->bits, sizeof(bits)); + ZSTD_memcpy((void*)(&ip), &args->ip, sizeof(ip)); + ZSTD_memcpy(&op, &args->op, sizeof(op)); + + assert(MEM_isLittleEndian()); + assert(!MEM_32bits()); + + for (;;) { + BYTE* olimit; + int stream; + + /* Assert loop preconditions */ +#ifndef NDEBUG + for (stream = 0; stream < 4; ++stream) { + assert(op[stream] <= (stream == 3 ? oend : op[stream + 1])); + assert(ip[stream] >= ilowest); + } +#endif + /* Compute olimit */ + { + /* Each iteration produces 5 output symbols per stream */ + size_t const oiters = (size_t)(oend - op[3]) / 5; + /* Each iteration consumes up to 11 bits * 5 = 55 bits < 7 bytes + * per stream. + */ + size_t const iiters = (size_t)(ip[0] - ilowest) / 7; + /* We can safely run iters iterations before running bounds checks */ + size_t const iters = MIN(oiters, iiters); + size_t const symbols = iters * 5; + + /* We can simply check that op[3] < olimit, instead of checking all + * of our bounds, since we can't hit the other bounds until we've run + * iters iterations, which only happens when op[3] == olimit. + */ + olimit = op[3] + symbols; + + /* Exit fast decoding loop once we reach the end. */ + if (op[3] == olimit) + break; + + /* Exit the decoding loop if any input pointer has crossed the + * previous one. This indicates corruption, and a precondition + * to our loop is that ip[i] >= ip[0]. + */ + for (stream = 1; stream < 4; ++stream) { + if (ip[stream] < ip[stream - 1]) + goto _out; + } + } + +#ifndef NDEBUG + for (stream = 1; stream < 4; ++stream) { + assert(ip[stream] >= ip[stream - 1]); + } +#endif + +#define HUF_4X1_DECODE_SYMBOL(_stream, _symbol) \ + do { \ + int const index = (int)(bits[(_stream)] >> 53); \ + int const entry = (int)dtable[index]; \ + bits[(_stream)] <<= (entry & 0x3F); \ + op[(_stream)][(_symbol)] = (BYTE)((entry >> 8) & 0xFF); \ + } while (0) + +#define HUF_4X1_RELOAD_STREAM(_stream) \ + do { \ + int const ctz = ZSTD_countTrailingZeros64(bits[(_stream)]); \ + int const nbBits = ctz & 7; \ + int const nbBytes = ctz >> 3; \ + op[(_stream)] += 5; \ + ip[(_stream)] -= nbBytes; \ + bits[(_stream)] = MEM_read64(ip[(_stream)]) | 1; \ + bits[(_stream)] <<= nbBits; \ + } while (0) + + /* Manually unroll the loop because compilers don't consistently + * unroll the inner loops, which destroys performance. + */ + do { + /* Decode 5 symbols in each of the 4 streams */ + HUF_4X_FOR_EACH_STREAM_WITH_VAR(HUF_4X1_DECODE_SYMBOL, 0); + HUF_4X_FOR_EACH_STREAM_WITH_VAR(HUF_4X1_DECODE_SYMBOL, 1); + HUF_4X_FOR_EACH_STREAM_WITH_VAR(HUF_4X1_DECODE_SYMBOL, 2); + HUF_4X_FOR_EACH_STREAM_WITH_VAR(HUF_4X1_DECODE_SYMBOL, 3); + HUF_4X_FOR_EACH_STREAM_WITH_VAR(HUF_4X1_DECODE_SYMBOL, 4); + + /* Reload each of the 4 the bitstreams */ + HUF_4X_FOR_EACH_STREAM(HUF_4X1_RELOAD_STREAM); + } while (op[3] < olimit); + +#undef HUF_4X1_DECODE_SYMBOL +#undef HUF_4X1_RELOAD_STREAM + } + +_out: + + /* Save the final values of each of the state variables back to args. */ + ZSTD_memcpy(&args->bits, &bits, sizeof(bits)); + ZSTD_memcpy((void*)(&args->ip), &ip, sizeof(ip)); + ZSTD_memcpy(&args->op, &op, sizeof(op)); +} + +/** + * @returns @p dstSize on success (>= 6) + * 0 if the fallback implementation should be used + * An error if an error occurred + */ +static HUF_FAST_BMI2_ATTRS +size_t +HUF_decompress4X1_usingDTable_internal_fast( + void* dst, size_t dstSize, + const void* cSrc, size_t cSrcSize, + const HUF_DTable* DTable, + HUF_DecompressFastLoopFn loopFn) +{ + void const* dt = DTable + 1; + BYTE const* const ilowest = (BYTE const*)cSrc; + BYTE* const oend = ZSTD_maybeNullPtrAdd((BYTE*)dst, dstSize); + HUF_DecompressFastArgs args; + { size_t const ret = HUF_DecompressFastArgs_init(&args, dst, dstSize, cSrc, cSrcSize, DTable); + FORWARD_IF_ERROR(ret, "Failed to init fast loop args"); + if (ret == 0) + return 0; + } + + assert(args.ip[0] >= args.ilowest); + loopFn(&args); + + /* Our loop guarantees that ip[] >= ilowest and that we haven't + * overwritten any op[]. + */ + assert(args.ip[0] >= ilowest); + assert(args.ip[0] >= ilowest); + assert(args.ip[1] >= ilowest); + assert(args.ip[2] >= ilowest); + assert(args.ip[3] >= ilowest); + assert(args.op[3] <= oend); + + assert(ilowest == args.ilowest); + assert(ilowest + 6 == args.iend[0]); + (void)ilowest; + + /* finish bit streams one by one. */ + { size_t const segmentSize = (dstSize+3) / 4; + BYTE* segmentEnd = (BYTE*)dst; + int i; + for (i = 0; i < 4; ++i) { + BIT_DStream_t bit; + if (segmentSize <= (size_t)(oend - segmentEnd)) + segmentEnd += segmentSize; + else + segmentEnd = oend; + FORWARD_IF_ERROR(HUF_initRemainingDStream(&bit, &args, i, segmentEnd), "corruption"); + /* Decompress and validate that we've produced exactly the expected length. */ + args.op[i] += HUF_decodeStreamX1(args.op[i], &bit, segmentEnd, (HUF_DEltX1 const*)dt, HUF_DECODER_FAST_TABLELOG); + if (args.op[i] != segmentEnd) return ERROR(corruption_detected); + } + } + + /* decoded size */ + assert(dstSize != 0); + return dstSize; +} + +HUF_DGEN(HUF_decompress1X1_usingDTable_internal) + +static size_t HUF_decompress4X1_usingDTable_internal(void* dst, size_t dstSize, void const* cSrc, + size_t cSrcSize, HUF_DTable const* DTable, int flags) +{ + HUF_DecompressUsingDTableFn fallbackFn = HUF_decompress4X1_usingDTable_internal_default; + HUF_DecompressFastLoopFn loopFn = HUF_decompress4X1_usingDTable_internal_fast_c_loop; + +#if DYNAMIC_BMI2 + if (flags & HUF_flags_bmi2) { + fallbackFn = HUF_decompress4X1_usingDTable_internal_bmi2; +# if ZSTD_ENABLE_ASM_X86_64_BMI2 + if (!(flags & HUF_flags_disableAsm)) { + loopFn = HUF_decompress4X1_usingDTable_internal_fast_asm_loop; + } +# endif + } else { + return fallbackFn(dst, dstSize, cSrc, cSrcSize, DTable); + } +#endif + +#if ZSTD_ENABLE_ASM_X86_64_BMI2 && defined(__BMI2__) + if (!(flags & HUF_flags_disableAsm)) { + loopFn = HUF_decompress4X1_usingDTable_internal_fast_asm_loop; + } +#endif + + if (HUF_ENABLE_FAST_DECODE && !(flags & HUF_flags_disableFast)) { + size_t const ret = HUF_decompress4X1_usingDTable_internal_fast(dst, dstSize, cSrc, cSrcSize, DTable, loopFn); + if (ret != 0) + return ret; + } + return fallbackFn(dst, dstSize, cSrc, cSrcSize, DTable); +} + +static size_t HUF_decompress4X1_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, + const void* cSrc, size_t cSrcSize, + void* workSpace, size_t wkspSize, int flags) +{ + const BYTE* ip = (const BYTE*) cSrc; + + size_t const hSize = HUF_readDTableX1_wksp(dctx, cSrc, cSrcSize, workSpace, wkspSize, flags); + if (HUF_isError(hSize)) return hSize; + if (hSize >= cSrcSize) return ERROR(srcSize_wrong); + ip += hSize; cSrcSize -= hSize; + + return HUF_decompress4X1_usingDTable_internal(dst, dstSize, ip, cSrcSize, dctx, flags); +} + +#endif /* HUF_FORCE_DECOMPRESS_X2 */ + + +#ifndef HUF_FORCE_DECOMPRESS_X1 + +/* *************************/ +/* double-symbols decoding */ +/* *************************/ + +typedef struct { U16 sequence; BYTE nbBits; BYTE length; } HUF_DEltX2; /* double-symbols decoding */ +typedef struct { BYTE symbol; } sortedSymbol_t; +typedef U32 rankValCol_t[HUF_TABLELOG_MAX + 1]; +typedef rankValCol_t rankVal_t[HUF_TABLELOG_MAX]; + +/** + * Constructs a HUF_DEltX2 in a U32. + */ +static U32 HUF_buildDEltX2U32(U32 symbol, U32 nbBits, U32 baseSeq, int level) +{ + U32 seq; + DEBUG_STATIC_ASSERT(offsetof(HUF_DEltX2, sequence) == 0); + DEBUG_STATIC_ASSERT(offsetof(HUF_DEltX2, nbBits) == 2); + DEBUG_STATIC_ASSERT(offsetof(HUF_DEltX2, length) == 3); + DEBUG_STATIC_ASSERT(sizeof(HUF_DEltX2) == sizeof(U32)); + if (MEM_isLittleEndian()) { + seq = level == 1 ? symbol : (baseSeq + (symbol << 8)); + return seq + (nbBits << 16) + ((U32)level << 24); + } else { + seq = level == 1 ? (symbol << 8) : ((baseSeq << 8) + symbol); + return (seq << 16) + (nbBits << 8) + (U32)level; + } +} + +/** + * Constructs a HUF_DEltX2. + */ +static HUF_DEltX2 HUF_buildDEltX2(U32 symbol, U32 nbBits, U32 baseSeq, int level) +{ + HUF_DEltX2 DElt; + U32 const val = HUF_buildDEltX2U32(symbol, nbBits, baseSeq, level); + DEBUG_STATIC_ASSERT(sizeof(DElt) == sizeof(val)); + ZSTD_memcpy(&DElt, &val, sizeof(val)); + return DElt; +} + +/** + * Constructs 2 HUF_DEltX2s and packs them into a U64. + */ +static U64 HUF_buildDEltX2U64(U32 symbol, U32 nbBits, U16 baseSeq, int level) +{ + U32 DElt = HUF_buildDEltX2U32(symbol, nbBits, baseSeq, level); + return (U64)DElt + ((U64)DElt << 32); +} + +/** + * Fills the DTable rank with all the symbols from [begin, end) that are each + * nbBits long. + * + * @param DTableRank The start of the rank in the DTable. + * @param begin The first symbol to fill (inclusive). + * @param end The last symbol to fill (exclusive). + * @param nbBits Each symbol is nbBits long. + * @param tableLog The table log. + * @param baseSeq If level == 1 { 0 } else { the first level symbol } + * @param level The level in the table. Must be 1 or 2. + */ +static void HUF_fillDTableX2ForWeight( + HUF_DEltX2* DTableRank, + sortedSymbol_t const* begin, sortedSymbol_t const* end, + U32 nbBits, U32 tableLog, + U16 baseSeq, int const level) +{ + U32 const length = 1U << ((tableLog - nbBits) & 0x1F /* quiet static-analyzer */); + const sortedSymbol_t* ptr; + assert(level >= 1 && level <= 2); + switch (length) { + case 1: + for (ptr = begin; ptr != end; ++ptr) { + HUF_DEltX2 const DElt = HUF_buildDEltX2(ptr->symbol, nbBits, baseSeq, level); + *DTableRank++ = DElt; + } + break; + case 2: + for (ptr = begin; ptr != end; ++ptr) { + HUF_DEltX2 const DElt = HUF_buildDEltX2(ptr->symbol, nbBits, baseSeq, level); + DTableRank[0] = DElt; + DTableRank[1] = DElt; + DTableRank += 2; + } + break; + case 4: + for (ptr = begin; ptr != end; ++ptr) { + U64 const DEltX2 = HUF_buildDEltX2U64(ptr->symbol, nbBits, baseSeq, level); + ZSTD_memcpy(DTableRank + 0, &DEltX2, sizeof(DEltX2)); + ZSTD_memcpy(DTableRank + 2, &DEltX2, sizeof(DEltX2)); + DTableRank += 4; + } + break; + case 8: + for (ptr = begin; ptr != end; ++ptr) { + U64 const DEltX2 = HUF_buildDEltX2U64(ptr->symbol, nbBits, baseSeq, level); + ZSTD_memcpy(DTableRank + 0, &DEltX2, sizeof(DEltX2)); + ZSTD_memcpy(DTableRank + 2, &DEltX2, sizeof(DEltX2)); + ZSTD_memcpy(DTableRank + 4, &DEltX2, sizeof(DEltX2)); + ZSTD_memcpy(DTableRank + 6, &DEltX2, sizeof(DEltX2)); + DTableRank += 8; + } + break; + default: + for (ptr = begin; ptr != end; ++ptr) { + U64 const DEltX2 = HUF_buildDEltX2U64(ptr->symbol, nbBits, baseSeq, level); + HUF_DEltX2* const DTableRankEnd = DTableRank + length; + for (; DTableRank != DTableRankEnd; DTableRank += 8) { + ZSTD_memcpy(DTableRank + 0, &DEltX2, sizeof(DEltX2)); + ZSTD_memcpy(DTableRank + 2, &DEltX2, sizeof(DEltX2)); + ZSTD_memcpy(DTableRank + 4, &DEltX2, sizeof(DEltX2)); + ZSTD_memcpy(DTableRank + 6, &DEltX2, sizeof(DEltX2)); + } + } + break; + } +} + +/* HUF_fillDTableX2Level2() : + * `rankValOrigin` must be a table of at least (HUF_TABLELOG_MAX + 1) U32 */ +static void HUF_fillDTableX2Level2(HUF_DEltX2* DTable, U32 targetLog, const U32 consumedBits, + const U32* rankVal, const int minWeight, const int maxWeight1, + const sortedSymbol_t* sortedSymbols, U32 const* rankStart, + U32 nbBitsBaseline, U16 baseSeq) +{ + /* Fill skipped values (all positions up to rankVal[minWeight]). + * These are positions only get a single symbol because the combined weight + * is too large. + */ + if (minWeight>1) { + U32 const length = 1U << ((targetLog - consumedBits) & 0x1F /* quiet static-analyzer */); + U64 const DEltX2 = HUF_buildDEltX2U64(baseSeq, consumedBits, /* baseSeq */ 0, /* level */ 1); + int const skipSize = rankVal[minWeight]; + assert(length > 1); + assert((U32)skipSize < length); + switch (length) { + case 2: + assert(skipSize == 1); + ZSTD_memcpy(DTable, &DEltX2, sizeof(DEltX2)); + break; + case 4: + assert(skipSize <= 4); + ZSTD_memcpy(DTable + 0, &DEltX2, sizeof(DEltX2)); + ZSTD_memcpy(DTable + 2, &DEltX2, sizeof(DEltX2)); + break; + default: + { + int i; + for (i = 0; i < skipSize; i += 8) { + ZSTD_memcpy(DTable + i + 0, &DEltX2, sizeof(DEltX2)); + ZSTD_memcpy(DTable + i + 2, &DEltX2, sizeof(DEltX2)); + ZSTD_memcpy(DTable + i + 4, &DEltX2, sizeof(DEltX2)); + ZSTD_memcpy(DTable + i + 6, &DEltX2, sizeof(DEltX2)); + } + } + } + } + + /* Fill each of the second level symbols by weight. */ + { + int w; + for (w = minWeight; w < maxWeight1; ++w) { + int const begin = rankStart[w]; + int const end = rankStart[w+1]; + U32 const nbBits = nbBitsBaseline - w; + U32 const totalBits = nbBits + consumedBits; + HUF_fillDTableX2ForWeight( + DTable + rankVal[w], + sortedSymbols + begin, sortedSymbols + end, + totalBits, targetLog, + baseSeq, /* level */ 2); + } + } +} + +static void HUF_fillDTableX2(HUF_DEltX2* DTable, const U32 targetLog, + const sortedSymbol_t* sortedList, + const U32* rankStart, rankValCol_t* rankValOrigin, const U32 maxWeight, + const U32 nbBitsBaseline) +{ + U32* const rankVal = rankValOrigin[0]; + const int scaleLog = nbBitsBaseline - targetLog; /* note : targetLog >= srcLog, hence scaleLog <= 1 */ + const U32 minBits = nbBitsBaseline - maxWeight; + int w; + int const wEnd = (int)maxWeight + 1; + + /* Fill DTable in order of weight. */ + for (w = 1; w < wEnd; ++w) { + int const begin = (int)rankStart[w]; + int const end = (int)rankStart[w+1]; + U32 const nbBits = nbBitsBaseline - w; + + if (targetLog-nbBits >= minBits) { + /* Enough room for a second symbol. */ + int start = rankVal[w]; + U32 const length = 1U << ((targetLog - nbBits) & 0x1F /* quiet static-analyzer */); + int minWeight = nbBits + scaleLog; + int s; + if (minWeight < 1) minWeight = 1; + /* Fill the DTable for every symbol of weight w. + * These symbols get at least 1 second symbol. + */ + for (s = begin; s != end; ++s) { + HUF_fillDTableX2Level2( + DTable + start, targetLog, nbBits, + rankValOrigin[nbBits], minWeight, wEnd, + sortedList, rankStart, + nbBitsBaseline, sortedList[s].symbol); + start += length; + } + } else { + /* Only a single symbol. */ + HUF_fillDTableX2ForWeight( + DTable + rankVal[w], + sortedList + begin, sortedList + end, + nbBits, targetLog, + /* baseSeq */ 0, /* level */ 1); + } + } +} + +typedef struct { + rankValCol_t rankVal[HUF_TABLELOG_MAX]; + U32 rankStats[HUF_TABLELOG_MAX + 1]; + U32 rankStart0[HUF_TABLELOG_MAX + 3]; + sortedSymbol_t sortedSymbol[HUF_SYMBOLVALUE_MAX + 1]; + BYTE weightList[HUF_SYMBOLVALUE_MAX + 1]; + U32 calleeWksp[HUF_READ_STATS_WORKSPACE_SIZE_U32]; +} HUF_ReadDTableX2_Workspace; + +size_t HUF_readDTableX2_wksp(HUF_DTable* DTable, + const void* src, size_t srcSize, + void* workSpace, size_t wkspSize, int flags) +{ + U32 tableLog, maxW, nbSymbols; + DTableDesc dtd = HUF_getDTableDesc(DTable); + U32 maxTableLog = dtd.maxTableLog; + size_t iSize; + void* dtPtr = DTable+1; /* force compiler to avoid strict-aliasing */ + HUF_DEltX2* const dt = (HUF_DEltX2*)dtPtr; + U32 *rankStart; + + HUF_ReadDTableX2_Workspace* const wksp = (HUF_ReadDTableX2_Workspace*)workSpace; + + if (sizeof(*wksp) > wkspSize) return ERROR(GENERIC); + + rankStart = wksp->rankStart0 + 1; + ZSTD_memset(wksp->rankStats, 0, sizeof(wksp->rankStats)); + ZSTD_memset(wksp->rankStart0, 0, sizeof(wksp->rankStart0)); + + DEBUG_STATIC_ASSERT(sizeof(HUF_DEltX2) == sizeof(HUF_DTable)); /* if compiler fails here, assertion is wrong */ + if (maxTableLog > HUF_TABLELOG_MAX) return ERROR(tableLog_tooLarge); + /* ZSTD_memset(weightList, 0, sizeof(weightList)); */ /* is not necessary, even though some analyzer complain ... */ + + iSize = HUF_readStats_wksp(wksp->weightList, HUF_SYMBOLVALUE_MAX + 1, wksp->rankStats, &nbSymbols, &tableLog, src, srcSize, wksp->calleeWksp, sizeof(wksp->calleeWksp), flags); + if (HUF_isError(iSize)) return iSize; + + /* check result */ + if (tableLog > maxTableLog) return ERROR(tableLog_tooLarge); /* DTable can't fit code depth */ + if (tableLog <= HUF_DECODER_FAST_TABLELOG && maxTableLog > HUF_DECODER_FAST_TABLELOG) maxTableLog = HUF_DECODER_FAST_TABLELOG; + + /* find maxWeight */ + for (maxW = tableLog; wksp->rankStats[maxW]==0; maxW--) {} /* necessarily finds a solution before 0 */ + + /* Get start index of each weight */ + { U32 w, nextRankStart = 0; + for (w=1; wrankStats[w]; + rankStart[w] = curr; + } + rankStart[0] = nextRankStart; /* put all 0w symbols at the end of sorted list*/ + rankStart[maxW+1] = nextRankStart; + } + + /* sort symbols by weight */ + { U32 s; + for (s=0; sweightList[s]; + U32 const r = rankStart[w]++; + wksp->sortedSymbol[r].symbol = (BYTE)s; + } + rankStart[0] = 0; /* forget 0w symbols; this is beginning of weight(1) */ + } + + /* Build rankVal */ + { U32* const rankVal0 = wksp->rankVal[0]; + { int const rescale = (maxTableLog-tableLog) - 1; /* tableLog <= maxTableLog */ + U32 nextRankVal = 0; + U32 w; + for (w=1; wrankStats[w] << (w+rescale); + rankVal0[w] = curr; + } } + { U32 const minBits = tableLog+1 - maxW; + U32 consumed; + for (consumed = minBits; consumed < maxTableLog - minBits + 1; consumed++) { + U32* const rankValPtr = wksp->rankVal[consumed]; + U32 w; + for (w = 1; w < maxW+1; w++) { + rankValPtr[w] = rankVal0[w] >> consumed; + } } } } + + HUF_fillDTableX2(dt, maxTableLog, + wksp->sortedSymbol, + wksp->rankStart0, wksp->rankVal, maxW, + tableLog+1); + + dtd.tableLog = (BYTE)maxTableLog; + dtd.tableType = 1; + ZSTD_memcpy(DTable, &dtd, sizeof(dtd)); + return iSize; +} + + +FORCE_INLINE_TEMPLATE U32 +HUF_decodeSymbolX2(void* op, BIT_DStream_t* DStream, const HUF_DEltX2* dt, const U32 dtLog) +{ + size_t const val = BIT_lookBitsFast(DStream, dtLog); /* note : dtLog >= 1 */ + ZSTD_memcpy(op, &dt[val].sequence, 2); + BIT_skipBits(DStream, dt[val].nbBits); + return dt[val].length; +} + +FORCE_INLINE_TEMPLATE U32 +HUF_decodeLastSymbolX2(void* op, BIT_DStream_t* DStream, const HUF_DEltX2* dt, const U32 dtLog) +{ + size_t const val = BIT_lookBitsFast(DStream, dtLog); /* note : dtLog >= 1 */ + ZSTD_memcpy(op, &dt[val].sequence, 1); + if (dt[val].length==1) { + BIT_skipBits(DStream, dt[val].nbBits); + } else { + if (DStream->bitsConsumed < (sizeof(DStream->bitContainer)*8)) { + BIT_skipBits(DStream, dt[val].nbBits); + if (DStream->bitsConsumed > (sizeof(DStream->bitContainer)*8)) + /* ugly hack; works only because it's the last symbol. Note : can't easily extract nbBits from just this symbol */ + DStream->bitsConsumed = (sizeof(DStream->bitContainer)*8); + } + } + return 1; +} + +#define HUF_DECODE_SYMBOLX2_0(ptr, DStreamPtr) \ + do { ptr += HUF_decodeSymbolX2(ptr, DStreamPtr, dt, dtLog); } while (0) + +#define HUF_DECODE_SYMBOLX2_1(ptr, DStreamPtr) \ + do { \ + if (MEM_64bits() || (HUF_TABLELOG_MAX<=12)) \ + ptr += HUF_decodeSymbolX2(ptr, DStreamPtr, dt, dtLog); \ + } while (0) + +#define HUF_DECODE_SYMBOLX2_2(ptr, DStreamPtr) \ + do { \ + if (MEM_64bits()) \ + ptr += HUF_decodeSymbolX2(ptr, DStreamPtr, dt, dtLog); \ + } while (0) + +HINT_INLINE size_t +HUF_decodeStreamX2(BYTE* p, BIT_DStream_t* bitDPtr, BYTE* const pEnd, + const HUF_DEltX2* const dt, const U32 dtLog) +{ + BYTE* const pStart = p; + + /* up to 8 symbols at a time */ + if ((size_t)(pEnd - p) >= sizeof(bitDPtr->bitContainer)) { + if (dtLog <= 11 && MEM_64bits()) { + /* up to 10 symbols at a time */ + while ((BIT_reloadDStream(bitDPtr) == BIT_DStream_unfinished) & (p < pEnd-9)) { + HUF_DECODE_SYMBOLX2_0(p, bitDPtr); + HUF_DECODE_SYMBOLX2_0(p, bitDPtr); + HUF_DECODE_SYMBOLX2_0(p, bitDPtr); + HUF_DECODE_SYMBOLX2_0(p, bitDPtr); + HUF_DECODE_SYMBOLX2_0(p, bitDPtr); + } + } else { + /* up to 8 symbols at a time */ + while ((BIT_reloadDStream(bitDPtr) == BIT_DStream_unfinished) & (p < pEnd-(sizeof(bitDPtr->bitContainer)-1))) { + HUF_DECODE_SYMBOLX2_2(p, bitDPtr); + HUF_DECODE_SYMBOLX2_1(p, bitDPtr); + HUF_DECODE_SYMBOLX2_2(p, bitDPtr); + HUF_DECODE_SYMBOLX2_0(p, bitDPtr); + } + } + } else { + BIT_reloadDStream(bitDPtr); + } + + /* closer to end : up to 2 symbols at a time */ + if ((size_t)(pEnd - p) >= 2) { + while ((BIT_reloadDStream(bitDPtr) == BIT_DStream_unfinished) & (p <= pEnd-2)) + HUF_DECODE_SYMBOLX2_0(p, bitDPtr); + + while (p <= pEnd-2) + HUF_DECODE_SYMBOLX2_0(p, bitDPtr); /* no need to reload : reached the end of DStream */ + } + + if (p < pEnd) + p += HUF_decodeLastSymbolX2(p, bitDPtr, dt, dtLog); + + return p-pStart; +} + +FORCE_INLINE_TEMPLATE size_t +HUF_decompress1X2_usingDTable_internal_body( + void* dst, size_t dstSize, + const void* cSrc, size_t cSrcSize, + const HUF_DTable* DTable) +{ + BIT_DStream_t bitD; + + /* Init */ + CHECK_F( BIT_initDStream(&bitD, cSrc, cSrcSize) ); + + /* decode */ + { BYTE* const ostart = (BYTE*) dst; + BYTE* const oend = ZSTD_maybeNullPtrAdd(ostart, dstSize); + const void* const dtPtr = DTable+1; /* force compiler to not use strict-aliasing */ + const HUF_DEltX2* const dt = (const HUF_DEltX2*)dtPtr; + DTableDesc const dtd = HUF_getDTableDesc(DTable); + HUF_decodeStreamX2(ostart, &bitD, oend, dt, dtd.tableLog); + } + + /* check */ + if (!BIT_endOfDStream(&bitD)) return ERROR(corruption_detected); + + /* decoded size */ + return dstSize; +} + +/* HUF_decompress4X2_usingDTable_internal_body(): + * Conditions: + * @dstSize >= 6 + */ +FORCE_INLINE_TEMPLATE size_t +HUF_decompress4X2_usingDTable_internal_body( + void* dst, size_t dstSize, + const void* cSrc, size_t cSrcSize, + const HUF_DTable* DTable) +{ + if (cSrcSize < 10) return ERROR(corruption_detected); /* strict minimum : jump table + 1 byte per stream */ + if (dstSize < 6) return ERROR(corruption_detected); /* stream 4-split doesn't work */ + + { const BYTE* const istart = (const BYTE*) cSrc; + BYTE* const ostart = (BYTE*) dst; + BYTE* const oend = ostart + dstSize; + BYTE* const olimit = oend - (sizeof(size_t)-1); + const void* const dtPtr = DTable+1; + const HUF_DEltX2* const dt = (const HUF_DEltX2*)dtPtr; + + /* Init */ + BIT_DStream_t bitD1; + BIT_DStream_t bitD2; + BIT_DStream_t bitD3; + BIT_DStream_t bitD4; + size_t const length1 = MEM_readLE16(istart); + size_t const length2 = MEM_readLE16(istart+2); + size_t const length3 = MEM_readLE16(istart+4); + size_t const length4 = cSrcSize - (length1 + length2 + length3 + 6); + const BYTE* const istart1 = istart + 6; /* jumpTable */ + const BYTE* const istart2 = istart1 + length1; + const BYTE* const istart3 = istart2 + length2; + const BYTE* const istart4 = istart3 + length3; + size_t const segmentSize = (dstSize+3) / 4; + BYTE* const opStart2 = ostart + segmentSize; + BYTE* const opStart3 = opStart2 + segmentSize; + BYTE* const opStart4 = opStart3 + segmentSize; + BYTE* op1 = ostart; + BYTE* op2 = opStart2; + BYTE* op3 = opStart3; + BYTE* op4 = opStart4; + U32 endSignal = 1; + DTableDesc const dtd = HUF_getDTableDesc(DTable); + U32 const dtLog = dtd.tableLog; + + if (length4 > cSrcSize) return ERROR(corruption_detected); /* overflow */ + if (opStart4 > oend) return ERROR(corruption_detected); /* overflow */ + assert(dstSize >= 6 /* validated above */); + CHECK_F( BIT_initDStream(&bitD1, istart1, length1) ); + CHECK_F( BIT_initDStream(&bitD2, istart2, length2) ); + CHECK_F( BIT_initDStream(&bitD3, istart3, length3) ); + CHECK_F( BIT_initDStream(&bitD4, istart4, length4) ); + + /* 16-32 symbols per loop (4-8 symbols per stream) */ + if ((size_t)(oend - op4) >= sizeof(size_t)) { + for ( ; (endSignal) & (op4 < olimit); ) { +#if defined(__clang__) && (defined(__x86_64__) || defined(__i386__)) + HUF_DECODE_SYMBOLX2_2(op1, &bitD1); + HUF_DECODE_SYMBOLX2_1(op1, &bitD1); + HUF_DECODE_SYMBOLX2_2(op1, &bitD1); + HUF_DECODE_SYMBOLX2_0(op1, &bitD1); + HUF_DECODE_SYMBOLX2_2(op2, &bitD2); + HUF_DECODE_SYMBOLX2_1(op2, &bitD2); + HUF_DECODE_SYMBOLX2_2(op2, &bitD2); + HUF_DECODE_SYMBOLX2_0(op2, &bitD2); + endSignal &= BIT_reloadDStreamFast(&bitD1) == BIT_DStream_unfinished; + endSignal &= BIT_reloadDStreamFast(&bitD2) == BIT_DStream_unfinished; + HUF_DECODE_SYMBOLX2_2(op3, &bitD3); + HUF_DECODE_SYMBOLX2_1(op3, &bitD3); + HUF_DECODE_SYMBOLX2_2(op3, &bitD3); + HUF_DECODE_SYMBOLX2_0(op3, &bitD3); + HUF_DECODE_SYMBOLX2_2(op4, &bitD4); + HUF_DECODE_SYMBOLX2_1(op4, &bitD4); + HUF_DECODE_SYMBOLX2_2(op4, &bitD4); + HUF_DECODE_SYMBOLX2_0(op4, &bitD4); + endSignal &= BIT_reloadDStreamFast(&bitD3) == BIT_DStream_unfinished; + endSignal &= BIT_reloadDStreamFast(&bitD4) == BIT_DStream_unfinished; +#else + HUF_DECODE_SYMBOLX2_2(op1, &bitD1); + HUF_DECODE_SYMBOLX2_2(op2, &bitD2); + HUF_DECODE_SYMBOLX2_2(op3, &bitD3); + HUF_DECODE_SYMBOLX2_2(op4, &bitD4); + HUF_DECODE_SYMBOLX2_1(op1, &bitD1); + HUF_DECODE_SYMBOLX2_1(op2, &bitD2); + HUF_DECODE_SYMBOLX2_1(op3, &bitD3); + HUF_DECODE_SYMBOLX2_1(op4, &bitD4); + HUF_DECODE_SYMBOLX2_2(op1, &bitD1); + HUF_DECODE_SYMBOLX2_2(op2, &bitD2); + HUF_DECODE_SYMBOLX2_2(op3, &bitD3); + HUF_DECODE_SYMBOLX2_2(op4, &bitD4); + HUF_DECODE_SYMBOLX2_0(op1, &bitD1); + HUF_DECODE_SYMBOLX2_0(op2, &bitD2); + HUF_DECODE_SYMBOLX2_0(op3, &bitD3); + HUF_DECODE_SYMBOLX2_0(op4, &bitD4); + endSignal = (U32)LIKELY((U32) + (BIT_reloadDStreamFast(&bitD1) == BIT_DStream_unfinished) + & (BIT_reloadDStreamFast(&bitD2) == BIT_DStream_unfinished) + & (BIT_reloadDStreamFast(&bitD3) == BIT_DStream_unfinished) + & (BIT_reloadDStreamFast(&bitD4) == BIT_DStream_unfinished)); +#endif + } + } + + /* check corruption */ + if (op1 > opStart2) return ERROR(corruption_detected); + if (op2 > opStart3) return ERROR(corruption_detected); + if (op3 > opStart4) return ERROR(corruption_detected); + /* note : op4 already verified within main loop */ + + /* finish bitStreams one by one */ + HUF_decodeStreamX2(op1, &bitD1, opStart2, dt, dtLog); + HUF_decodeStreamX2(op2, &bitD2, opStart3, dt, dtLog); + HUF_decodeStreamX2(op3, &bitD3, opStart4, dt, dtLog); + HUF_decodeStreamX2(op4, &bitD4, oend, dt, dtLog); + + /* check */ + { U32 const endCheck = BIT_endOfDStream(&bitD1) & BIT_endOfDStream(&bitD2) & BIT_endOfDStream(&bitD3) & BIT_endOfDStream(&bitD4); + if (!endCheck) return ERROR(corruption_detected); } + + /* decoded size */ + return dstSize; + } +} + +#if HUF_NEED_BMI2_FUNCTION +static BMI2_TARGET_ATTRIBUTE +size_t HUF_decompress4X2_usingDTable_internal_bmi2(void* dst, size_t dstSize, void const* cSrc, + size_t cSrcSize, HUF_DTable const* DTable) { + return HUF_decompress4X2_usingDTable_internal_body(dst, dstSize, cSrc, cSrcSize, DTable); +} +#endif + +static +size_t HUF_decompress4X2_usingDTable_internal_default(void* dst, size_t dstSize, void const* cSrc, + size_t cSrcSize, HUF_DTable const* DTable) { + return HUF_decompress4X2_usingDTable_internal_body(dst, dstSize, cSrc, cSrcSize, DTable); +} + +#if ZSTD_ENABLE_ASM_X86_64_BMI2 + +HUF_ASM_DECL void HUF_decompress4X2_usingDTable_internal_fast_asm_loop(HUF_DecompressFastArgs* args) ZSTDLIB_HIDDEN; + +#endif + +static HUF_FAST_BMI2_ATTRS +void HUF_decompress4X2_usingDTable_internal_fast_c_loop(HUF_DecompressFastArgs* args) +{ + U64 bits[4]; + BYTE const* ip[4]; + BYTE* op[4]; + BYTE* oend[4]; + HUF_DEltX2 const* const dtable = (HUF_DEltX2 const*)args->dt; + BYTE const* const ilowest = args->ilowest; + + /* Copy the arguments to local registers. */ + ZSTD_memcpy(&bits, &args->bits, sizeof(bits)); + ZSTD_memcpy((void*)(&ip), &args->ip, sizeof(ip)); + ZSTD_memcpy(&op, &args->op, sizeof(op)); + + oend[0] = op[1]; + oend[1] = op[2]; + oend[2] = op[3]; + oend[3] = args->oend; + + assert(MEM_isLittleEndian()); + assert(!MEM_32bits()); + + for (;;) { + BYTE* olimit; + int stream; + + /* Assert loop preconditions */ +#ifndef NDEBUG + for (stream = 0; stream < 4; ++stream) { + assert(op[stream] <= oend[stream]); + assert(ip[stream] >= ilowest); + } +#endif + /* Compute olimit */ + { + /* Each loop does 5 table lookups for each of the 4 streams. + * Each table lookup consumes up to 11 bits of input, and produces + * up to 2 bytes of output. + */ + /* We can consume up to 7 bytes of input per iteration per stream. + * We also know that each input pointer is >= ip[0]. So we can run + * iters loops before running out of input. + */ + size_t iters = (size_t)(ip[0] - ilowest) / 7; + /* Each iteration can produce up to 10 bytes of output per stream. + * Each output stream my advance at different rates. So take the + * minimum number of safe iterations among all the output streams. + */ + for (stream = 0; stream < 4; ++stream) { + size_t const oiters = (size_t)(oend[stream] - op[stream]) / 10; + iters = MIN(iters, oiters); + } + + /* Each iteration produces at least 5 output symbols. So until + * op[3] crosses olimit, we know we haven't executed iters + * iterations yet. This saves us maintaining an iters counter, + * at the expense of computing the remaining # of iterations + * more frequently. + */ + olimit = op[3] + (iters * 5); + + /* Exit the fast decoding loop once we reach the end. */ + if (op[3] == olimit) + break; + + /* Exit the decoding loop if any input pointer has crossed the + * previous one. This indicates corruption, and a precondition + * to our loop is that ip[i] >= ip[0]. + */ + for (stream = 1; stream < 4; ++stream) { + if (ip[stream] < ip[stream - 1]) + goto _out; + } + } + +#ifndef NDEBUG + for (stream = 1; stream < 4; ++stream) { + assert(ip[stream] >= ip[stream - 1]); + } +#endif + +#define HUF_4X2_DECODE_SYMBOL(_stream, _decode3) \ + do { \ + if ((_decode3) || (_stream) != 3) { \ + int const index = (int)(bits[(_stream)] >> 53); \ + HUF_DEltX2 const entry = dtable[index]; \ + MEM_write16(op[(_stream)], entry.sequence); \ + bits[(_stream)] <<= (entry.nbBits) & 0x3F; \ + op[(_stream)] += (entry.length); \ + } \ + } while (0) + +#define HUF_4X2_RELOAD_STREAM(_stream) \ + do { \ + HUF_4X2_DECODE_SYMBOL(3, 1); \ + { \ + int const ctz = ZSTD_countTrailingZeros64(bits[(_stream)]); \ + int const nbBits = ctz & 7; \ + int const nbBytes = ctz >> 3; \ + ip[(_stream)] -= nbBytes; \ + bits[(_stream)] = MEM_read64(ip[(_stream)]) | 1; \ + bits[(_stream)] <<= nbBits; \ + } \ + } while (0) + + /* Manually unroll the loop because compilers don't consistently + * unroll the inner loops, which destroys performance. + */ + do { + /* Decode 5 symbols from each of the first 3 streams. + * The final stream will be decoded during the reload phase + * to reduce register pressure. + */ + HUF_4X_FOR_EACH_STREAM_WITH_VAR(HUF_4X2_DECODE_SYMBOL, 0); + HUF_4X_FOR_EACH_STREAM_WITH_VAR(HUF_4X2_DECODE_SYMBOL, 0); + HUF_4X_FOR_EACH_STREAM_WITH_VAR(HUF_4X2_DECODE_SYMBOL, 0); + HUF_4X_FOR_EACH_STREAM_WITH_VAR(HUF_4X2_DECODE_SYMBOL, 0); + HUF_4X_FOR_EACH_STREAM_WITH_VAR(HUF_4X2_DECODE_SYMBOL, 0); + + /* Decode one symbol from the final stream */ + HUF_4X2_DECODE_SYMBOL(3, 1); + + /* Decode 4 symbols from the final stream & reload bitstreams. + * The final stream is reloaded last, meaning that all 5 symbols + * are decoded from the final stream before it is reloaded. + */ + HUF_4X_FOR_EACH_STREAM(HUF_4X2_RELOAD_STREAM); + } while (op[3] < olimit); + } + +#undef HUF_4X2_DECODE_SYMBOL +#undef HUF_4X2_RELOAD_STREAM + +_out: + + /* Save the final values of each of the state variables back to args. */ + ZSTD_memcpy(&args->bits, &bits, sizeof(bits)); + ZSTD_memcpy((void*)(&args->ip), &ip, sizeof(ip)); + ZSTD_memcpy(&args->op, &op, sizeof(op)); +} + + +static HUF_FAST_BMI2_ATTRS size_t +HUF_decompress4X2_usingDTable_internal_fast( + void* dst, size_t dstSize, + const void* cSrc, size_t cSrcSize, + const HUF_DTable* DTable, + HUF_DecompressFastLoopFn loopFn) { + void const* dt = DTable + 1; + const BYTE* const ilowest = (const BYTE*)cSrc; + BYTE* const oend = ZSTD_maybeNullPtrAdd((BYTE*)dst, dstSize); + HUF_DecompressFastArgs args; + { + size_t const ret = HUF_DecompressFastArgs_init(&args, dst, dstSize, cSrc, cSrcSize, DTable); + FORWARD_IF_ERROR(ret, "Failed to init asm args"); + if (ret == 0) + return 0; + } + + assert(args.ip[0] >= args.ilowest); + loopFn(&args); + + /* note : op4 already verified within main loop */ + assert(args.ip[0] >= ilowest); + assert(args.ip[1] >= ilowest); + assert(args.ip[2] >= ilowest); + assert(args.ip[3] >= ilowest); + assert(args.op[3] <= oend); + + assert(ilowest == args.ilowest); + assert(ilowest + 6 == args.iend[0]); + (void)ilowest; + + /* finish bitStreams one by one */ + { + size_t const segmentSize = (dstSize+3) / 4; + BYTE* segmentEnd = (BYTE*)dst; + int i; + for (i = 0; i < 4; ++i) { + BIT_DStream_t bit; + if (segmentSize <= (size_t)(oend - segmentEnd)) + segmentEnd += segmentSize; + else + segmentEnd = oend; + FORWARD_IF_ERROR(HUF_initRemainingDStream(&bit, &args, i, segmentEnd), "corruption"); + args.op[i] += HUF_decodeStreamX2(args.op[i], &bit, segmentEnd, (HUF_DEltX2 const*)dt, HUF_DECODER_FAST_TABLELOG); + if (args.op[i] != segmentEnd) + return ERROR(corruption_detected); + } + } + + /* decoded size */ + return dstSize; +} + +static size_t HUF_decompress4X2_usingDTable_internal(void* dst, size_t dstSize, void const* cSrc, + size_t cSrcSize, HUF_DTable const* DTable, int flags) +{ + HUF_DecompressUsingDTableFn fallbackFn = HUF_decompress4X2_usingDTable_internal_default; + HUF_DecompressFastLoopFn loopFn = HUF_decompress4X2_usingDTable_internal_fast_c_loop; + +#if DYNAMIC_BMI2 + if (flags & HUF_flags_bmi2) { + fallbackFn = HUF_decompress4X2_usingDTable_internal_bmi2; +# if ZSTD_ENABLE_ASM_X86_64_BMI2 + if (!(flags & HUF_flags_disableAsm)) { + loopFn = HUF_decompress4X2_usingDTable_internal_fast_asm_loop; + } +# endif + } else { + return fallbackFn(dst, dstSize, cSrc, cSrcSize, DTable); + } +#endif + +#if ZSTD_ENABLE_ASM_X86_64_BMI2 && defined(__BMI2__) + if (!(flags & HUF_flags_disableAsm)) { + loopFn = HUF_decompress4X2_usingDTable_internal_fast_asm_loop; + } +#endif + + if (HUF_ENABLE_FAST_DECODE && !(flags & HUF_flags_disableFast)) { + size_t const ret = HUF_decompress4X2_usingDTable_internal_fast(dst, dstSize, cSrc, cSrcSize, DTable, loopFn); + if (ret != 0) + return ret; + } + return fallbackFn(dst, dstSize, cSrc, cSrcSize, DTable); +} + +HUF_DGEN(HUF_decompress1X2_usingDTable_internal) + +size_t HUF_decompress1X2_DCtx_wksp(HUF_DTable* DCtx, void* dst, size_t dstSize, + const void* cSrc, size_t cSrcSize, + void* workSpace, size_t wkspSize, int flags) +{ + const BYTE* ip = (const BYTE*) cSrc; + + size_t const hSize = HUF_readDTableX2_wksp(DCtx, cSrc, cSrcSize, + workSpace, wkspSize, flags); + if (HUF_isError(hSize)) return hSize; + if (hSize >= cSrcSize) return ERROR(srcSize_wrong); + ip += hSize; cSrcSize -= hSize; + + return HUF_decompress1X2_usingDTable_internal(dst, dstSize, ip, cSrcSize, DCtx, flags); +} + +static size_t HUF_decompress4X2_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, + const void* cSrc, size_t cSrcSize, + void* workSpace, size_t wkspSize, int flags) +{ + const BYTE* ip = (const BYTE*) cSrc; + + size_t hSize = HUF_readDTableX2_wksp(dctx, cSrc, cSrcSize, + workSpace, wkspSize, flags); + if (HUF_isError(hSize)) return hSize; + if (hSize >= cSrcSize) return ERROR(srcSize_wrong); + ip += hSize; cSrcSize -= hSize; + + return HUF_decompress4X2_usingDTable_internal(dst, dstSize, ip, cSrcSize, dctx, flags); +} + +#endif /* HUF_FORCE_DECOMPRESS_X1 */ + + +/* ***********************************/ +/* Universal decompression selectors */ +/* ***********************************/ + + +#if !defined(HUF_FORCE_DECOMPRESS_X1) && !defined(HUF_FORCE_DECOMPRESS_X2) +typedef struct { U32 tableTime; U32 decode256Time; } algo_time_t; +static const algo_time_t algoTime[16 /* Quantization */][2 /* single, double */] = +{ + /* single, double, quad */ + {{0,0}, {1,1}}, /* Q==0 : impossible */ + {{0,0}, {1,1}}, /* Q==1 : impossible */ + {{ 150,216}, { 381,119}}, /* Q == 2 : 12-18% */ + {{ 170,205}, { 514,112}}, /* Q == 3 : 18-25% */ + {{ 177,199}, { 539,110}}, /* Q == 4 : 25-32% */ + {{ 197,194}, { 644,107}}, /* Q == 5 : 32-38% */ + {{ 221,192}, { 735,107}}, /* Q == 6 : 38-44% */ + {{ 256,189}, { 881,106}}, /* Q == 7 : 44-50% */ + {{ 359,188}, {1167,109}}, /* Q == 8 : 50-56% */ + {{ 582,187}, {1570,114}}, /* Q == 9 : 56-62% */ + {{ 688,187}, {1712,122}}, /* Q ==10 : 62-69% */ + {{ 825,186}, {1965,136}}, /* Q ==11 : 69-75% */ + {{ 976,185}, {2131,150}}, /* Q ==12 : 75-81% */ + {{1180,186}, {2070,175}}, /* Q ==13 : 81-87% */ + {{1377,185}, {1731,202}}, /* Q ==14 : 87-93% */ + {{1412,185}, {1695,202}}, /* Q ==15 : 93-99% */ +}; +#endif + +/** HUF_selectDecoder() : + * Tells which decoder is likely to decode faster, + * based on a set of pre-computed metrics. + * @return : 0==HUF_decompress4X1, 1==HUF_decompress4X2 . + * Assumption : 0 < dstSize <= 128 KB */ +U32 HUF_selectDecoder (size_t dstSize, size_t cSrcSize) +{ + assert(dstSize > 0); + assert(dstSize <= 128*1024); +#if defined(HUF_FORCE_DECOMPRESS_X1) + (void)dstSize; + (void)cSrcSize; + return 0; +#elif defined(HUF_FORCE_DECOMPRESS_X2) + (void)dstSize; + (void)cSrcSize; + return 1; +#else + /* decoder timing evaluation */ + { U32 const Q = (cSrcSize >= dstSize) ? 15 : (U32)(cSrcSize * 16 / dstSize); /* Q < 16 */ + U32 const D256 = (U32)(dstSize >> 8); + U32 const DTime0 = algoTime[Q][0].tableTime + (algoTime[Q][0].decode256Time * D256); + U32 DTime1 = algoTime[Q][1].tableTime + (algoTime[Q][1].decode256Time * D256); + DTime1 += DTime1 >> 5; /* small advantage to algorithm using less memory, to reduce cache eviction */ + return DTime1 < DTime0; + } +#endif +} + +size_t HUF_decompress1X_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, + const void* cSrc, size_t cSrcSize, + void* workSpace, size_t wkspSize, int flags) +{ + /* validation checks */ + if (dstSize == 0) return ERROR(dstSize_tooSmall); + if (cSrcSize > dstSize) return ERROR(corruption_detected); /* invalid */ + if (cSrcSize == dstSize) { ZSTD_memcpy(dst, cSrc, dstSize); return dstSize; } /* not compressed */ + if (cSrcSize == 1) { ZSTD_memset(dst, *(const BYTE*)cSrc, dstSize); return dstSize; } /* RLE */ + + { U32 const algoNb = HUF_selectDecoder(dstSize, cSrcSize); +#if defined(HUF_FORCE_DECOMPRESS_X1) + (void)algoNb; + assert(algoNb == 0); + return HUF_decompress1X1_DCtx_wksp(dctx, dst, dstSize, cSrc, + cSrcSize, workSpace, wkspSize, flags); +#elif defined(HUF_FORCE_DECOMPRESS_X2) + (void)algoNb; + assert(algoNb == 1); + return HUF_decompress1X2_DCtx_wksp(dctx, dst, dstSize, cSrc, + cSrcSize, workSpace, wkspSize, flags); +#else + return algoNb ? HUF_decompress1X2_DCtx_wksp(dctx, dst, dstSize, cSrc, + cSrcSize, workSpace, wkspSize, flags): + HUF_decompress1X1_DCtx_wksp(dctx, dst, dstSize, cSrc, + cSrcSize, workSpace, wkspSize, flags); +#endif + } +} + + +size_t HUF_decompress1X_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable, int flags) +{ + DTableDesc const dtd = HUF_getDTableDesc(DTable); +#if defined(HUF_FORCE_DECOMPRESS_X1) + (void)dtd; + assert(dtd.tableType == 0); + return HUF_decompress1X1_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, flags); +#elif defined(HUF_FORCE_DECOMPRESS_X2) + (void)dtd; + assert(dtd.tableType == 1); + return HUF_decompress1X2_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, flags); +#else + return dtd.tableType ? HUF_decompress1X2_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, flags) : + HUF_decompress1X1_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, flags); +#endif +} + +#ifndef HUF_FORCE_DECOMPRESS_X2 +size_t HUF_decompress1X1_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize, int flags) +{ + const BYTE* ip = (const BYTE*) cSrc; + + size_t const hSize = HUF_readDTableX1_wksp(dctx, cSrc, cSrcSize, workSpace, wkspSize, flags); + if (HUF_isError(hSize)) return hSize; + if (hSize >= cSrcSize) return ERROR(srcSize_wrong); + ip += hSize; cSrcSize -= hSize; + + return HUF_decompress1X1_usingDTable_internal(dst, dstSize, ip, cSrcSize, dctx, flags); +} +#endif + +size_t HUF_decompress4X_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable, int flags) +{ + DTableDesc const dtd = HUF_getDTableDesc(DTable); +#if defined(HUF_FORCE_DECOMPRESS_X1) + (void)dtd; + assert(dtd.tableType == 0); + return HUF_decompress4X1_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, flags); +#elif defined(HUF_FORCE_DECOMPRESS_X2) + (void)dtd; + assert(dtd.tableType == 1); + return HUF_decompress4X2_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, flags); +#else + return dtd.tableType ? HUF_decompress4X2_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, flags) : + HUF_decompress4X1_usingDTable_internal(dst, maxDstSize, cSrc, cSrcSize, DTable, flags); +#endif +} + +size_t HUF_decompress4X_hufOnly_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize, int flags) +{ + /* validation checks */ + if (dstSize == 0) return ERROR(dstSize_tooSmall); + if (cSrcSize == 0) return ERROR(corruption_detected); + + { U32 const algoNb = HUF_selectDecoder(dstSize, cSrcSize); +#if defined(HUF_FORCE_DECOMPRESS_X1) + (void)algoNb; + assert(algoNb == 0); + return HUF_decompress4X1_DCtx_wksp(dctx, dst, dstSize, cSrc, cSrcSize, workSpace, wkspSize, flags); +#elif defined(HUF_FORCE_DECOMPRESS_X2) + (void)algoNb; + assert(algoNb == 1); + return HUF_decompress4X2_DCtx_wksp(dctx, dst, dstSize, cSrc, cSrcSize, workSpace, wkspSize, flags); +#else + return algoNb ? HUF_decompress4X2_DCtx_wksp(dctx, dst, dstSize, cSrc, cSrcSize, workSpace, wkspSize, flags) : + HUF_decompress4X1_DCtx_wksp(dctx, dst, dstSize, cSrc, cSrcSize, workSpace, wkspSize, flags); +#endif + } +} +/**** ended inlining decompress/huf_decompress.c ****/ +/**** start inlining decompress/zstd_ddict.c ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +/* zstd_ddict.c : + * concentrates all logic that needs to know the internals of ZSTD_DDict object */ + +/*-******************************************************* +* Dependencies +*********************************************************/ +/**** skipping file: ../common/allocations.h ****/ +/**** skipping file: ../common/zstd_deps.h ****/ +/**** skipping file: ../common/cpu.h ****/ +/**** skipping file: ../common/mem.h ****/ +#define FSE_STATIC_LINKING_ONLY +/**** skipping file: ../common/fse.h ****/ +/**** skipping file: ../common/huf.h ****/ +/**** start inlining zstd_decompress_internal.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + + +/* zstd_decompress_internal: + * objects and definitions shared within lib/decompress modules */ + + #ifndef ZSTD_DECOMPRESS_INTERNAL_H + #define ZSTD_DECOMPRESS_INTERNAL_H + + +/*-******************************************************* + * Dependencies + *********************************************************/ +/**** skipping file: ../common/mem.h ****/ +/**** skipping file: ../common/zstd_internal.h ****/ + + + +/*-******************************************************* + * Constants + *********************************************************/ +static UNUSED_ATTR const U32 LL_base[MaxLL+1] = { + 0, 1, 2, 3, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 14, 15, + 16, 18, 20, 22, 24, 28, 32, 40, + 48, 64, 0x80, 0x100, 0x200, 0x400, 0x800, 0x1000, + 0x2000, 0x4000, 0x8000, 0x10000 }; + +static UNUSED_ATTR const U32 OF_base[MaxOff+1] = { + 0, 1, 1, 5, 0xD, 0x1D, 0x3D, 0x7D, + 0xFD, 0x1FD, 0x3FD, 0x7FD, 0xFFD, 0x1FFD, 0x3FFD, 0x7FFD, + 0xFFFD, 0x1FFFD, 0x3FFFD, 0x7FFFD, 0xFFFFD, 0x1FFFFD, 0x3FFFFD, 0x7FFFFD, + 0xFFFFFD, 0x1FFFFFD, 0x3FFFFFD, 0x7FFFFFD, 0xFFFFFFD, 0x1FFFFFFD, 0x3FFFFFFD, 0x7FFFFFFD }; + +static UNUSED_ATTR const U8 OF_bits[MaxOff+1] = { + 0, 1, 2, 3, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 30, 31 }; + +static UNUSED_ATTR const U32 ML_base[MaxML+1] = { + 3, 4, 5, 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, + 19, 20, 21, 22, 23, 24, 25, 26, + 27, 28, 29, 30, 31, 32, 33, 34, + 35, 37, 39, 41, 43, 47, 51, 59, + 67, 83, 99, 0x83, 0x103, 0x203, 0x403, 0x803, + 0x1003, 0x2003, 0x4003, 0x8003, 0x10003 }; + + +/*-******************************************************* + * Decompression types + *********************************************************/ + typedef struct { + U32 fastMode; + U32 tableLog; + } ZSTD_seqSymbol_header; + + typedef struct { + U16 nextState; + BYTE nbAdditionalBits; + BYTE nbBits; + U32 baseValue; + } ZSTD_seqSymbol; + + #define SEQSYMBOL_TABLE_SIZE(log) (1 + (1 << (log))) + +#define ZSTD_BUILD_FSE_TABLE_WKSP_SIZE (sizeof(S16) * (MaxSeq + 1) + (1u << MaxFSELog) + sizeof(U64)) +#define ZSTD_BUILD_FSE_TABLE_WKSP_SIZE_U32 ((ZSTD_BUILD_FSE_TABLE_WKSP_SIZE + sizeof(U32) - 1) / sizeof(U32)) +#define ZSTD_HUFFDTABLE_CAPACITY_LOG 12 + +typedef struct { + ZSTD_seqSymbol LLTable[SEQSYMBOL_TABLE_SIZE(LLFSELog)]; /* Note : Space reserved for FSE Tables */ + ZSTD_seqSymbol OFTable[SEQSYMBOL_TABLE_SIZE(OffFSELog)]; /* is also used as temporary workspace while building hufTable during DDict creation */ + ZSTD_seqSymbol MLTable[SEQSYMBOL_TABLE_SIZE(MLFSELog)]; /* and therefore must be at least HUF_DECOMPRESS_WORKSPACE_SIZE large */ + HUF_DTable hufTable[HUF_DTABLE_SIZE(ZSTD_HUFFDTABLE_CAPACITY_LOG)]; /* can accommodate HUF_decompress4X */ + U32 rep[ZSTD_REP_NUM]; + U32 workspace[ZSTD_BUILD_FSE_TABLE_WKSP_SIZE_U32]; +} ZSTD_entropyDTables_t; + +typedef enum { ZSTDds_getFrameHeaderSize, ZSTDds_decodeFrameHeader, + ZSTDds_decodeBlockHeader, ZSTDds_decompressBlock, + ZSTDds_decompressLastBlock, ZSTDds_checkChecksum, + ZSTDds_decodeSkippableHeader, ZSTDds_skipFrame } ZSTD_dStage; + +typedef enum { zdss_init=0, zdss_loadHeader, + zdss_read, zdss_load, zdss_flush } ZSTD_dStreamStage; + +typedef enum { + ZSTD_use_indefinitely = -1, /* Use the dictionary indefinitely */ + ZSTD_dont_use = 0, /* Do not use the dictionary (if one exists free it) */ + ZSTD_use_once = 1 /* Use the dictionary once and set to ZSTD_dont_use */ +} ZSTD_dictUses_e; + +/* Hashset for storing references to multiple ZSTD_DDict within ZSTD_DCtx */ +typedef struct { + const ZSTD_DDict** ddictPtrTable; + size_t ddictPtrTableSize; + size_t ddictPtrCount; +} ZSTD_DDictHashSet; + +#ifndef ZSTD_DECODER_INTERNAL_BUFFER +# define ZSTD_DECODER_INTERNAL_BUFFER (1 << 16) +#endif + +#define ZSTD_LBMIN 64 +#define ZSTD_LBMAX (128 << 10) + +/* extra buffer, compensates when dst is not large enough to store litBuffer */ +#define ZSTD_LITBUFFEREXTRASIZE BOUNDED(ZSTD_LBMIN, ZSTD_DECODER_INTERNAL_BUFFER, ZSTD_LBMAX) + +typedef enum { + ZSTD_not_in_dst = 0, /* Stored entirely within litExtraBuffer */ + ZSTD_in_dst = 1, /* Stored entirely within dst (in memory after current output write) */ + ZSTD_split = 2 /* Split between litExtraBuffer and dst */ +} ZSTD_litLocation_e; + +struct ZSTD_DCtx_s +{ + const ZSTD_seqSymbol* LLTptr; + const ZSTD_seqSymbol* MLTptr; + const ZSTD_seqSymbol* OFTptr; + const HUF_DTable* HUFptr; + ZSTD_entropyDTables_t entropy; + U32 workspace[HUF_DECOMPRESS_WORKSPACE_SIZE_U32]; /* space needed when building huffman tables */ + const void* previousDstEnd; /* detect continuity */ + const void* prefixStart; /* start of current segment */ + const void* virtualStart; /* virtual start of previous segment if it was just before current one */ + const void* dictEnd; /* end of previous segment */ + size_t expected; + ZSTD_frameHeader fParams; + U64 processedCSize; + U64 decodedSize; + blockType_e bType; /* used in ZSTD_decompressContinue(), store blockType between block header decoding and block decompression stages */ + ZSTD_dStage stage; + U32 litEntropy; + U32 fseEntropy; + XXH64_state_t xxhState; + size_t headerSize; + ZSTD_format_e format; + ZSTD_forceIgnoreChecksum_e forceIgnoreChecksum; /* User specified: if == 1, will ignore checksums in compressed frame. Default == 0 */ + U32 validateChecksum; /* if == 1, will validate checksum. Is == 1 if (fParams.checksumFlag == 1) and (forceIgnoreChecksum == 0). */ + const BYTE* litPtr; + ZSTD_customMem customMem; + size_t litSize; + size_t rleSize; + size_t staticSize; + int isFrameDecompression; +#if DYNAMIC_BMI2 != 0 + int bmi2; /* == 1 if the CPU supports BMI2 and 0 otherwise. CPU support is determined dynamically once per context lifetime. */ +#endif + + /* dictionary */ + ZSTD_DDict* ddictLocal; + const ZSTD_DDict* ddict; /* set by ZSTD_initDStream_usingDDict(), or ZSTD_DCtx_refDDict() */ + U32 dictID; + int ddictIsCold; /* if == 1 : dictionary is "new" for working context, and presumed "cold" (not in cpu cache) */ + ZSTD_dictUses_e dictUses; + ZSTD_DDictHashSet* ddictSet; /* Hash set for multiple ddicts */ + ZSTD_refMultipleDDicts_e refMultipleDDicts; /* User specified: if == 1, will allow references to multiple DDicts. Default == 0 (disabled) */ + int disableHufAsm; + int maxBlockSizeParam; + + /* streaming */ + ZSTD_dStreamStage streamStage; + char* inBuff; + size_t inBuffSize; + size_t inPos; + size_t maxWindowSize; + char* outBuff; + size_t outBuffSize; + size_t outStart; + size_t outEnd; + size_t lhSize; +#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT>=1) + void* legacyContext; + U32 previousLegacyVersion; + U32 legacyVersion; +#endif + U32 hostageByte; + int noForwardProgress; + ZSTD_bufferMode_e outBufferMode; + ZSTD_outBuffer expectedOutBuffer; + + /* workspace */ + BYTE* litBuffer; + const BYTE* litBufferEnd; + ZSTD_litLocation_e litBufferLocation; + BYTE litExtraBuffer[ZSTD_LITBUFFEREXTRASIZE + WILDCOPY_OVERLENGTH]; /* literal buffer can be split between storage within dst and within this scratch buffer */ + BYTE headerBuffer[ZSTD_FRAMEHEADERSIZE_MAX]; + + size_t oversizedDuration; + +#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION + void const* dictContentBeginForFuzzing; + void const* dictContentEndForFuzzing; +#endif + + /* Tracing */ +#if ZSTD_TRACE + ZSTD_TraceCtx traceCtx; +#endif +}; /* typedef'd to ZSTD_DCtx within "zstd.h" */ + +MEM_STATIC int ZSTD_DCtx_get_bmi2(const struct ZSTD_DCtx_s *dctx) { +#if DYNAMIC_BMI2 != 0 + return dctx->bmi2; +#else + (void)dctx; + return 0; +#endif +} + +/*-******************************************************* + * Shared internal functions + *********************************************************/ + +/*! ZSTD_loadDEntropy() : + * dict : must point at beginning of a valid zstd dictionary. + * @return : size of dictionary header (size of magic number + dict ID + entropy tables) */ +size_t ZSTD_loadDEntropy(ZSTD_entropyDTables_t* entropy, + const void* const dict, size_t const dictSize); + +/*! ZSTD_checkContinuity() : + * check if next `dst` follows previous position, where decompression ended. + * If yes, do nothing (continue on current segment). + * If not, classify previous segment as "external dictionary", and start a new segment. + * This function cannot fail. */ +void ZSTD_checkContinuity(ZSTD_DCtx* dctx, const void* dst, size_t dstSize); + + +#endif /* ZSTD_DECOMPRESS_INTERNAL_H */ +/**** ended inlining zstd_decompress_internal.h ****/ +/**** start inlining zstd_ddict.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + + +#ifndef ZSTD_DDICT_H +#define ZSTD_DDICT_H + +/*-******************************************************* + * Dependencies + *********************************************************/ +/**** skipping file: ../common/zstd_deps.h ****/ +/**** skipping file: ../zstd.h ****/ + + +/*-******************************************************* + * Interface + *********************************************************/ + +/* note: several prototypes are already published in `zstd.h` : + * ZSTD_createDDict() + * ZSTD_createDDict_byReference() + * ZSTD_createDDict_advanced() + * ZSTD_freeDDict() + * ZSTD_initStaticDDict() + * ZSTD_sizeof_DDict() + * ZSTD_estimateDDictSize() + * ZSTD_getDictID_fromDict() + */ + +const void* ZSTD_DDict_dictContent(const ZSTD_DDict* ddict); +size_t ZSTD_DDict_dictSize(const ZSTD_DDict* ddict); + +void ZSTD_copyDDictParameters(ZSTD_DCtx* dctx, const ZSTD_DDict* ddict); + + + +#endif /* ZSTD_DDICT_H */ +/**** ended inlining zstd_ddict.h ****/ + +#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT>=1) +#error Using excluded file: ../legacy/zstd_legacy.h (re-amalgamate source to fix) +#endif + + + +/*-******************************************************* +* Types +*********************************************************/ +struct ZSTD_DDict_s { + void* dictBuffer; + const void* dictContent; + size_t dictSize; + ZSTD_entropyDTables_t entropy; + U32 dictID; + U32 entropyPresent; + ZSTD_customMem cMem; +}; /* typedef'd to ZSTD_DDict within "zstd.h" */ + +const void* ZSTD_DDict_dictContent(const ZSTD_DDict* ddict) +{ + assert(ddict != NULL); + return ddict->dictContent; +} + +size_t ZSTD_DDict_dictSize(const ZSTD_DDict* ddict) +{ + assert(ddict != NULL); + return ddict->dictSize; +} + +void ZSTD_copyDDictParameters(ZSTD_DCtx* dctx, const ZSTD_DDict* ddict) +{ + DEBUGLOG(4, "ZSTD_copyDDictParameters"); + assert(dctx != NULL); + assert(ddict != NULL); + dctx->dictID = ddict->dictID; + dctx->prefixStart = ddict->dictContent; + dctx->virtualStart = ddict->dictContent; + dctx->dictEnd = (const BYTE*)ddict->dictContent + ddict->dictSize; + dctx->previousDstEnd = dctx->dictEnd; +#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION + dctx->dictContentBeginForFuzzing = dctx->prefixStart; + dctx->dictContentEndForFuzzing = dctx->previousDstEnd; +#endif + if (ddict->entropyPresent) { + dctx->litEntropy = 1; + dctx->fseEntropy = 1; + dctx->LLTptr = ddict->entropy.LLTable; + dctx->MLTptr = ddict->entropy.MLTable; + dctx->OFTptr = ddict->entropy.OFTable; + dctx->HUFptr = ddict->entropy.hufTable; + dctx->entropy.rep[0] = ddict->entropy.rep[0]; + dctx->entropy.rep[1] = ddict->entropy.rep[1]; + dctx->entropy.rep[2] = ddict->entropy.rep[2]; + } else { + dctx->litEntropy = 0; + dctx->fseEntropy = 0; + } +} + + +static size_t +ZSTD_loadEntropy_intoDDict(ZSTD_DDict* ddict, + ZSTD_dictContentType_e dictContentType) +{ + ddict->dictID = 0; + ddict->entropyPresent = 0; + if (dictContentType == ZSTD_dct_rawContent) return 0; + + if (ddict->dictSize < 8) { + if (dictContentType == ZSTD_dct_fullDict) + return ERROR(dictionary_corrupted); /* only accept specified dictionaries */ + return 0; /* pure content mode */ + } + { U32 const magic = MEM_readLE32(ddict->dictContent); + if (magic != ZSTD_MAGIC_DICTIONARY) { + if (dictContentType == ZSTD_dct_fullDict) + return ERROR(dictionary_corrupted); /* only accept specified dictionaries */ + return 0; /* pure content mode */ + } + } + ddict->dictID = MEM_readLE32((const char*)ddict->dictContent + ZSTD_FRAMEIDSIZE); + + /* load entropy tables */ + RETURN_ERROR_IF(ZSTD_isError(ZSTD_loadDEntropy( + &ddict->entropy, ddict->dictContent, ddict->dictSize)), + dictionary_corrupted, ""); + ddict->entropyPresent = 1; + return 0; +} + + +static size_t ZSTD_initDDict_internal(ZSTD_DDict* ddict, + const void* dict, size_t dictSize, + ZSTD_dictLoadMethod_e dictLoadMethod, + ZSTD_dictContentType_e dictContentType) +{ + if ((dictLoadMethod == ZSTD_dlm_byRef) || (!dict) || (!dictSize)) { + ddict->dictBuffer = NULL; + ddict->dictContent = dict; + if (!dict) dictSize = 0; + } else { + void* const internalBuffer = ZSTD_customMalloc(dictSize, ddict->cMem); + ddict->dictBuffer = internalBuffer; + ddict->dictContent = internalBuffer; + if (!internalBuffer) return ERROR(memory_allocation); + ZSTD_memcpy(internalBuffer, dict, dictSize); + } + ddict->dictSize = dictSize; + ddict->entropy.hufTable[0] = (HUF_DTable)((ZSTD_HUFFDTABLE_CAPACITY_LOG)*0x1000001); /* cover both little and big endian */ + + /* parse dictionary content */ + FORWARD_IF_ERROR( ZSTD_loadEntropy_intoDDict(ddict, dictContentType) , ""); + + return 0; +} + +ZSTD_DDict* ZSTD_createDDict_advanced(const void* dict, size_t dictSize, + ZSTD_dictLoadMethod_e dictLoadMethod, + ZSTD_dictContentType_e dictContentType, + ZSTD_customMem customMem) +{ + if ((!customMem.customAlloc) ^ (!customMem.customFree)) return NULL; + + { ZSTD_DDict* const ddict = (ZSTD_DDict*) ZSTD_customMalloc(sizeof(ZSTD_DDict), customMem); + if (ddict == NULL) return NULL; + ddict->cMem = customMem; + { size_t const initResult = ZSTD_initDDict_internal(ddict, + dict, dictSize, + dictLoadMethod, dictContentType); + if (ZSTD_isError(initResult)) { + ZSTD_freeDDict(ddict); + return NULL; + } } + return ddict; + } +} + +/*! ZSTD_createDDict() : +* Create a digested dictionary, to start decompression without startup delay. +* `dict` content is copied inside DDict. +* Consequently, `dict` can be released after `ZSTD_DDict` creation */ +ZSTD_DDict* ZSTD_createDDict(const void* dict, size_t dictSize) +{ + ZSTD_customMem const allocator = { NULL, NULL, NULL }; + return ZSTD_createDDict_advanced(dict, dictSize, ZSTD_dlm_byCopy, ZSTD_dct_auto, allocator); +} + +/*! ZSTD_createDDict_byReference() : + * Create a digested dictionary, to start decompression without startup delay. + * Dictionary content is simply referenced, it will be accessed during decompression. + * Warning : dictBuffer must outlive DDict (DDict must be freed before dictBuffer) */ +ZSTD_DDict* ZSTD_createDDict_byReference(const void* dictBuffer, size_t dictSize) +{ + ZSTD_customMem const allocator = { NULL, NULL, NULL }; + return ZSTD_createDDict_advanced(dictBuffer, dictSize, ZSTD_dlm_byRef, ZSTD_dct_auto, allocator); +} + + +const ZSTD_DDict* ZSTD_initStaticDDict( + void* sBuffer, size_t sBufferSize, + const void* dict, size_t dictSize, + ZSTD_dictLoadMethod_e dictLoadMethod, + ZSTD_dictContentType_e dictContentType) +{ + size_t const neededSpace = sizeof(ZSTD_DDict) + + (dictLoadMethod == ZSTD_dlm_byRef ? 0 : dictSize); + ZSTD_DDict* const ddict = (ZSTD_DDict*)sBuffer; + assert(sBuffer != NULL); + assert(dict != NULL); + if ((size_t)sBuffer & 7) return NULL; /* 8-aligned */ + if (sBufferSize < neededSpace) return NULL; + if (dictLoadMethod == ZSTD_dlm_byCopy) { + ZSTD_memcpy(ddict+1, dict, dictSize); /* local copy */ + dict = ddict+1; + } + if (ZSTD_isError( ZSTD_initDDict_internal(ddict, + dict, dictSize, + ZSTD_dlm_byRef, dictContentType) )) + return NULL; + return ddict; +} + + +size_t ZSTD_freeDDict(ZSTD_DDict* ddict) +{ + if (ddict==NULL) return 0; /* support free on NULL */ + { ZSTD_customMem const cMem = ddict->cMem; + ZSTD_customFree(ddict->dictBuffer, cMem); + ZSTD_customFree(ddict, cMem); + return 0; + } +} + +/*! ZSTD_estimateDDictSize() : + * Estimate amount of memory that will be needed to create a dictionary for decompression. + * Note : dictionary created by reference using ZSTD_dlm_byRef are smaller */ +size_t ZSTD_estimateDDictSize(size_t dictSize, ZSTD_dictLoadMethod_e dictLoadMethod) +{ + return sizeof(ZSTD_DDict) + (dictLoadMethod == ZSTD_dlm_byRef ? 0 : dictSize); +} + +size_t ZSTD_sizeof_DDict(const ZSTD_DDict* ddict) +{ + if (ddict==NULL) return 0; /* support sizeof on NULL */ + return sizeof(*ddict) + (ddict->dictBuffer ? ddict->dictSize : 0) ; +} + +/*! ZSTD_getDictID_fromDDict() : + * Provides the dictID of the dictionary loaded into `ddict`. + * If @return == 0, the dictionary is not conformant to Zstandard specification, or empty. + * Non-conformant dictionaries can still be loaded, but as content-only dictionaries. */ +unsigned ZSTD_getDictID_fromDDict(const ZSTD_DDict* ddict) +{ + if (ddict==NULL) return 0; + return ddict->dictID; +} +/**** ended inlining decompress/zstd_ddict.c ****/ +/**** start inlining decompress/zstd_decompress.c ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + + +/* *************************************************************** +* Tuning parameters +*****************************************************************/ +/*! + * HEAPMODE : + * Select how default decompression function ZSTD_decompress() allocates its context, + * on stack (0), or into heap (1, default; requires malloc()). + * Note that functions with explicit context such as ZSTD_decompressDCtx() are unaffected. + */ +#ifndef ZSTD_HEAPMODE +# define ZSTD_HEAPMODE 1 +#endif + +/*! +* LEGACY_SUPPORT : +* if set to 1+, ZSTD_decompress() can decode older formats (v0.1+) +*/ +#ifndef ZSTD_LEGACY_SUPPORT +# define ZSTD_LEGACY_SUPPORT 0 +#endif + +/*! + * MAXWINDOWSIZE_DEFAULT : + * maximum window size accepted by DStream __by default__. + * Frames requiring more memory will be rejected. + * It's possible to set a different limit using ZSTD_DCtx_setMaxWindowSize(). + */ +#ifndef ZSTD_MAXWINDOWSIZE_DEFAULT +# define ZSTD_MAXWINDOWSIZE_DEFAULT (((U32)1 << ZSTD_WINDOWLOG_LIMIT_DEFAULT) + 1) +#endif + +/*! + * NO_FORWARD_PROGRESS_MAX : + * maximum allowed nb of calls to ZSTD_decompressStream() + * without any forward progress + * (defined as: no byte read from input, and no byte flushed to output) + * before triggering an error. + */ +#ifndef ZSTD_NO_FORWARD_PROGRESS_MAX +# define ZSTD_NO_FORWARD_PROGRESS_MAX 16 +#endif + + +/*-******************************************************* +* Dependencies +*********************************************************/ +/**** skipping file: ../common/zstd_deps.h ****/ +/**** skipping file: ../common/allocations.h ****/ +/**** skipping file: ../common/error_private.h ****/ +/**** skipping file: ../common/zstd_internal.h ****/ +/**** skipping file: ../common/mem.h ****/ +/**** skipping file: ../common/bits.h ****/ +#define FSE_STATIC_LINKING_ONLY +/**** skipping file: ../common/fse.h ****/ +/**** skipping file: ../common/huf.h ****/ +/**** skipping file: ../common/xxhash.h ****/ +/**** skipping file: zstd_decompress_internal.h ****/ +/**** skipping file: zstd_ddict.h ****/ +/**** start inlining zstd_decompress_block.h ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + + +#ifndef ZSTD_DEC_BLOCK_H +#define ZSTD_DEC_BLOCK_H + +/*-******************************************************* + * Dependencies + *********************************************************/ +/**** skipping file: ../common/zstd_deps.h ****/ +/**** skipping file: ../zstd.h ****/ +/**** skipping file: ../common/zstd_internal.h ****/ +/**** skipping file: zstd_decompress_internal.h ****/ + + +/* === Prototypes === */ + +/* note: prototypes already published within `zstd.h` : + * ZSTD_decompressBlock() + */ + +/* note: prototypes already published within `zstd_internal.h` : + * ZSTD_getcBlockSize() + * ZSTD_decodeSeqHeaders() + */ + + + /* Streaming state is used to inform allocation of the literal buffer */ +typedef enum { + not_streaming = 0, + is_streaming = 1 +} streaming_operation; + +/* ZSTD_decompressBlock_internal() : + * decompress block, starting at `src`, + * into destination buffer `dst`. + * @return : decompressed block size, + * or an error code (which can be tested using ZSTD_isError()) + */ +size_t ZSTD_decompressBlock_internal(ZSTD_DCtx* dctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, const streaming_operation streaming); + +/* ZSTD_buildFSETable() : + * generate FSE decoding table for one symbol (ll, ml or off) + * this function must be called with valid parameters only + * (dt is large enough, normalizedCounter distribution total is a power of 2, max is within range, etc.) + * in which case it cannot fail. + * The workspace must be 4-byte aligned and at least ZSTD_BUILD_FSE_TABLE_WKSP_SIZE bytes, which is + * defined in zstd_decompress_internal.h. + * Internal use only. + */ +void ZSTD_buildFSETable(ZSTD_seqSymbol* dt, + const short* normalizedCounter, unsigned maxSymbolValue, + const U32* baseValue, const U8* nbAdditionalBits, + unsigned tableLog, void* wksp, size_t wkspSize, + int bmi2); + +/* Internal definition of ZSTD_decompressBlock() to avoid deprecation warnings. */ +size_t ZSTD_decompressBlock_deprecated(ZSTD_DCtx* dctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize); + + +#endif /* ZSTD_DEC_BLOCK_H */ +/**** ended inlining zstd_decompress_block.h ****/ + +#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT>=1) +#error Using excluded file: ../legacy/zstd_legacy.h (re-amalgamate source to fix) +#endif + + + +/************************************* + * Multiple DDicts Hashset internals * + *************************************/ + +#define DDICT_HASHSET_MAX_LOAD_FACTOR_COUNT_MULT 4 +#define DDICT_HASHSET_MAX_LOAD_FACTOR_SIZE_MULT 3 /* These two constants represent SIZE_MULT/COUNT_MULT load factor without using a float. + * Currently, that means a 0.75 load factor. + * So, if count * COUNT_MULT / size * SIZE_MULT != 0, then we've exceeded + * the load factor of the ddict hash set. + */ + +#define DDICT_HASHSET_TABLE_BASE_SIZE 64 +#define DDICT_HASHSET_RESIZE_FACTOR 2 + +/* Hash function to determine starting position of dict insertion within the table + * Returns an index between [0, hashSet->ddictPtrTableSize] + */ +static size_t ZSTD_DDictHashSet_getIndex(const ZSTD_DDictHashSet* hashSet, U32 dictID) { + const U64 hash = XXH64(&dictID, sizeof(U32), 0); + /* DDict ptr table size is a multiple of 2, use size - 1 as mask to get index within [0, hashSet->ddictPtrTableSize) */ + return hash & (hashSet->ddictPtrTableSize - 1); +} + +/* Adds DDict to a hashset without resizing it. + * If inserting a DDict with a dictID that already exists in the set, replaces the one in the set. + * Returns 0 if successful, or a zstd error code if something went wrong. + */ +static size_t ZSTD_DDictHashSet_emplaceDDict(ZSTD_DDictHashSet* hashSet, const ZSTD_DDict* ddict) { + const U32 dictID = ZSTD_getDictID_fromDDict(ddict); + size_t idx = ZSTD_DDictHashSet_getIndex(hashSet, dictID); + const size_t idxRangeMask = hashSet->ddictPtrTableSize - 1; + RETURN_ERROR_IF(hashSet->ddictPtrCount == hashSet->ddictPtrTableSize, GENERIC, "Hash set is full!"); + DEBUGLOG(4, "Hashed index: for dictID: %u is %zu", dictID, idx); + while (hashSet->ddictPtrTable[idx] != NULL) { + /* Replace existing ddict if inserting ddict with same dictID */ + if (ZSTD_getDictID_fromDDict(hashSet->ddictPtrTable[idx]) == dictID) { + DEBUGLOG(4, "DictID already exists, replacing rather than adding"); + hashSet->ddictPtrTable[idx] = ddict; + return 0; + } + idx &= idxRangeMask; + idx++; + } + DEBUGLOG(4, "Final idx after probing for dictID %u is: %zu", dictID, idx); + hashSet->ddictPtrTable[idx] = ddict; + hashSet->ddictPtrCount++; + return 0; +} + +/* Expands hash table by factor of DDICT_HASHSET_RESIZE_FACTOR and + * rehashes all values, allocates new table, frees old table. + * Returns 0 on success, otherwise a zstd error code. + */ +static size_t ZSTD_DDictHashSet_expand(ZSTD_DDictHashSet* hashSet, ZSTD_customMem customMem) { + size_t newTableSize = hashSet->ddictPtrTableSize * DDICT_HASHSET_RESIZE_FACTOR; + const ZSTD_DDict** newTable = (const ZSTD_DDict**)ZSTD_customCalloc(sizeof(ZSTD_DDict*) * newTableSize, customMem); + const ZSTD_DDict** oldTable = hashSet->ddictPtrTable; + size_t oldTableSize = hashSet->ddictPtrTableSize; + size_t i; + + DEBUGLOG(4, "Expanding DDict hash table! Old size: %zu new size: %zu", oldTableSize, newTableSize); + RETURN_ERROR_IF(!newTable, memory_allocation, "Expanded hashset allocation failed!"); + hashSet->ddictPtrTable = newTable; + hashSet->ddictPtrTableSize = newTableSize; + hashSet->ddictPtrCount = 0; + for (i = 0; i < oldTableSize; ++i) { + if (oldTable[i] != NULL) { + FORWARD_IF_ERROR(ZSTD_DDictHashSet_emplaceDDict(hashSet, oldTable[i]), ""); + } + } + ZSTD_customFree((void*)oldTable, customMem); + DEBUGLOG(4, "Finished re-hash"); + return 0; +} + +/* Fetches a DDict with the given dictID + * Returns the ZSTD_DDict* with the requested dictID. If it doesn't exist, then returns NULL. + */ +static const ZSTD_DDict* ZSTD_DDictHashSet_getDDict(ZSTD_DDictHashSet* hashSet, U32 dictID) { + size_t idx = ZSTD_DDictHashSet_getIndex(hashSet, dictID); + const size_t idxRangeMask = hashSet->ddictPtrTableSize - 1; + DEBUGLOG(4, "Hashed index: for dictID: %u is %zu", dictID, idx); + for (;;) { + size_t currDictID = ZSTD_getDictID_fromDDict(hashSet->ddictPtrTable[idx]); + if (currDictID == dictID || currDictID == 0) { + /* currDictID == 0 implies a NULL ddict entry */ + break; + } else { + idx &= idxRangeMask; /* Goes to start of table when we reach the end */ + idx++; + } + } + DEBUGLOG(4, "Final idx after probing for dictID %u is: %zu", dictID, idx); + return hashSet->ddictPtrTable[idx]; +} + +/* Allocates space for and returns a ddict hash set + * The hash set's ZSTD_DDict* table has all values automatically set to NULL to begin with. + * Returns NULL if allocation failed. + */ +static ZSTD_DDictHashSet* ZSTD_createDDictHashSet(ZSTD_customMem customMem) { + ZSTD_DDictHashSet* ret = (ZSTD_DDictHashSet*)ZSTD_customMalloc(sizeof(ZSTD_DDictHashSet), customMem); + DEBUGLOG(4, "Allocating new hash set"); + if (!ret) + return NULL; + ret->ddictPtrTable = (const ZSTD_DDict**)ZSTD_customCalloc(DDICT_HASHSET_TABLE_BASE_SIZE * sizeof(ZSTD_DDict*), customMem); + if (!ret->ddictPtrTable) { + ZSTD_customFree(ret, customMem); + return NULL; + } + ret->ddictPtrTableSize = DDICT_HASHSET_TABLE_BASE_SIZE; + ret->ddictPtrCount = 0; + return ret; +} + +/* Frees the table of ZSTD_DDict* within a hashset, then frees the hashset itself. + * Note: The ZSTD_DDict* within the table are NOT freed. + */ +static void ZSTD_freeDDictHashSet(ZSTD_DDictHashSet* hashSet, ZSTD_customMem customMem) { + DEBUGLOG(4, "Freeing ddict hash set"); + if (hashSet && hashSet->ddictPtrTable) { + ZSTD_customFree((void*)hashSet->ddictPtrTable, customMem); + } + if (hashSet) { + ZSTD_customFree(hashSet, customMem); + } +} + +/* Public function: Adds a DDict into the ZSTD_DDictHashSet, possibly triggering a resize of the hash set. + * Returns 0 on success, or a ZSTD error. + */ +static size_t ZSTD_DDictHashSet_addDDict(ZSTD_DDictHashSet* hashSet, const ZSTD_DDict* ddict, ZSTD_customMem customMem) { + DEBUGLOG(4, "Adding dict ID: %u to hashset with - Count: %zu Tablesize: %zu", ZSTD_getDictID_fromDDict(ddict), hashSet->ddictPtrCount, hashSet->ddictPtrTableSize); + if (hashSet->ddictPtrCount * DDICT_HASHSET_MAX_LOAD_FACTOR_COUNT_MULT / hashSet->ddictPtrTableSize * DDICT_HASHSET_MAX_LOAD_FACTOR_SIZE_MULT != 0) { + FORWARD_IF_ERROR(ZSTD_DDictHashSet_expand(hashSet, customMem), ""); + } + FORWARD_IF_ERROR(ZSTD_DDictHashSet_emplaceDDict(hashSet, ddict), ""); + return 0; +} + +/*-************************************************************* +* Context management +***************************************************************/ +size_t ZSTD_sizeof_DCtx (const ZSTD_DCtx* dctx) +{ + if (dctx==NULL) return 0; /* support sizeof NULL */ + return sizeof(*dctx) + + ZSTD_sizeof_DDict(dctx->ddictLocal) + + dctx->inBuffSize + dctx->outBuffSize; +} + +size_t ZSTD_estimateDCtxSize(void) { return sizeof(ZSTD_DCtx); } + + +static size_t ZSTD_startingInputLength(ZSTD_format_e format) +{ + size_t const startingInputLength = ZSTD_FRAMEHEADERSIZE_PREFIX(format); + /* only supports formats ZSTD_f_zstd1 and ZSTD_f_zstd1_magicless */ + assert( (format == ZSTD_f_zstd1) || (format == ZSTD_f_zstd1_magicless) ); + return startingInputLength; +} + +static void ZSTD_DCtx_resetParameters(ZSTD_DCtx* dctx) +{ + assert(dctx->streamStage == zdss_init); + dctx->format = ZSTD_f_zstd1; + dctx->maxWindowSize = ZSTD_MAXWINDOWSIZE_DEFAULT; + dctx->outBufferMode = ZSTD_bm_buffered; + dctx->forceIgnoreChecksum = ZSTD_d_validateChecksum; + dctx->refMultipleDDicts = ZSTD_rmd_refSingleDDict; + dctx->disableHufAsm = 0; + dctx->maxBlockSizeParam = 0; +} + +static void ZSTD_initDCtx_internal(ZSTD_DCtx* dctx) +{ + dctx->staticSize = 0; + dctx->ddict = NULL; + dctx->ddictLocal = NULL; + dctx->dictEnd = NULL; + dctx->ddictIsCold = 0; + dctx->dictUses = ZSTD_dont_use; + dctx->inBuff = NULL; + dctx->inBuffSize = 0; + dctx->outBuffSize = 0; + dctx->streamStage = zdss_init; +#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT>=1) + dctx->legacyContext = NULL; + dctx->previousLegacyVersion = 0; +#endif + dctx->noForwardProgress = 0; + dctx->oversizedDuration = 0; + dctx->isFrameDecompression = 1; +#if DYNAMIC_BMI2 + dctx->bmi2 = ZSTD_cpuSupportsBmi2(); +#endif + dctx->ddictSet = NULL; + ZSTD_DCtx_resetParameters(dctx); +#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION + dctx->dictContentEndForFuzzing = NULL; +#endif +} + +ZSTD_DCtx* ZSTD_initStaticDCtx(void *workspace, size_t workspaceSize) +{ + ZSTD_DCtx* const dctx = (ZSTD_DCtx*) workspace; + + if ((size_t)workspace & 7) return NULL; /* 8-aligned */ + if (workspaceSize < sizeof(ZSTD_DCtx)) return NULL; /* minimum size */ + + ZSTD_initDCtx_internal(dctx); + dctx->staticSize = workspaceSize; + dctx->inBuff = (char*)(dctx+1); + return dctx; +} + +static ZSTD_DCtx* ZSTD_createDCtx_internal(ZSTD_customMem customMem) { + if ((!customMem.customAlloc) ^ (!customMem.customFree)) return NULL; + + { ZSTD_DCtx* const dctx = (ZSTD_DCtx*)ZSTD_customMalloc(sizeof(*dctx), customMem); + if (!dctx) return NULL; + dctx->customMem = customMem; + ZSTD_initDCtx_internal(dctx); + return dctx; + } +} + +ZSTD_DCtx* ZSTD_createDCtx_advanced(ZSTD_customMem customMem) +{ + return ZSTD_createDCtx_internal(customMem); +} + +ZSTD_DCtx* ZSTD_createDCtx(void) +{ + DEBUGLOG(3, "ZSTD_createDCtx"); + return ZSTD_createDCtx_internal(ZSTD_defaultCMem); +} + +static void ZSTD_clearDict(ZSTD_DCtx* dctx) +{ + ZSTD_freeDDict(dctx->ddictLocal); + dctx->ddictLocal = NULL; + dctx->ddict = NULL; + dctx->dictUses = ZSTD_dont_use; +} + +size_t ZSTD_freeDCtx(ZSTD_DCtx* dctx) +{ + if (dctx==NULL) return 0; /* support free on NULL */ + RETURN_ERROR_IF(dctx->staticSize, memory_allocation, "not compatible with static DCtx"); + { ZSTD_customMem const cMem = dctx->customMem; + ZSTD_clearDict(dctx); + ZSTD_customFree(dctx->inBuff, cMem); + dctx->inBuff = NULL; +#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT >= 1) + if (dctx->legacyContext) + ZSTD_freeLegacyStreamContext(dctx->legacyContext, dctx->previousLegacyVersion); +#endif + if (dctx->ddictSet) { + ZSTD_freeDDictHashSet(dctx->ddictSet, cMem); + dctx->ddictSet = NULL; + } + ZSTD_customFree(dctx, cMem); + return 0; + } +} + +/* no longer useful */ +void ZSTD_copyDCtx(ZSTD_DCtx* dstDCtx, const ZSTD_DCtx* srcDCtx) +{ + size_t const toCopy = (size_t)((char*)(&dstDCtx->inBuff) - (char*)dstDCtx); + ZSTD_memcpy(dstDCtx, srcDCtx, toCopy); /* no need to copy workspace */ +} + +/* Given a dctx with a digested frame params, re-selects the correct ZSTD_DDict based on + * the requested dict ID from the frame. If there exists a reference to the correct ZSTD_DDict, then + * accordingly sets the ddict to be used to decompress the frame. + * + * If no DDict is found, then no action is taken, and the ZSTD_DCtx::ddict remains as-is. + * + * ZSTD_d_refMultipleDDicts must be enabled for this function to be called. + */ +static void ZSTD_DCtx_selectFrameDDict(ZSTD_DCtx* dctx) { + assert(dctx->refMultipleDDicts && dctx->ddictSet); + DEBUGLOG(4, "Adjusting DDict based on requested dict ID from frame"); + if (dctx->ddict) { + const ZSTD_DDict* frameDDict = ZSTD_DDictHashSet_getDDict(dctx->ddictSet, dctx->fParams.dictID); + if (frameDDict) { + DEBUGLOG(4, "DDict found!"); + ZSTD_clearDict(dctx); + dctx->dictID = dctx->fParams.dictID; + dctx->ddict = frameDDict; + dctx->dictUses = ZSTD_use_indefinitely; + } + } +} + + +/*-************************************************************* + * Frame header decoding + ***************************************************************/ + +/*! ZSTD_isFrame() : + * Tells if the content of `buffer` starts with a valid Frame Identifier. + * Note : Frame Identifier is 4 bytes. If `size < 4`, @return will always be 0. + * Note 2 : Legacy Frame Identifiers are considered valid only if Legacy Support is enabled. + * Note 3 : Skippable Frame Identifiers are considered valid. */ +unsigned ZSTD_isFrame(const void* buffer, size_t size) +{ + if (size < ZSTD_FRAMEIDSIZE) return 0; + { U32 const magic = MEM_readLE32(buffer); + if (magic == ZSTD_MAGICNUMBER) return 1; + if ((magic & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) return 1; + } +#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT >= 1) + if (ZSTD_isLegacy(buffer, size)) return 1; +#endif + return 0; +} + +/*! ZSTD_isSkippableFrame() : + * Tells if the content of `buffer` starts with a valid Frame Identifier for a skippable frame. + * Note : Frame Identifier is 4 bytes. If `size < 4`, @return will always be 0. + */ +unsigned ZSTD_isSkippableFrame(const void* buffer, size_t size) +{ + if (size < ZSTD_FRAMEIDSIZE) return 0; + { U32 const magic = MEM_readLE32(buffer); + if ((magic & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) return 1; + } + return 0; +} + +/** ZSTD_frameHeaderSize_internal() : + * srcSize must be large enough to reach header size fields. + * note : only works for formats ZSTD_f_zstd1 and ZSTD_f_zstd1_magicless. + * @return : size of the Frame Header + * or an error code, which can be tested with ZSTD_isError() */ +static size_t ZSTD_frameHeaderSize_internal(const void* src, size_t srcSize, ZSTD_format_e format) +{ + size_t const minInputSize = ZSTD_startingInputLength(format); + RETURN_ERROR_IF(srcSize < minInputSize, srcSize_wrong, ""); + + { BYTE const fhd = ((const BYTE*)src)[minInputSize-1]; + U32 const dictID= fhd & 3; + U32 const singleSegment = (fhd >> 5) & 1; + U32 const fcsId = fhd >> 6; + return minInputSize + !singleSegment + + ZSTD_did_fieldSize[dictID] + ZSTD_fcs_fieldSize[fcsId] + + (singleSegment && !fcsId); + } +} + +/** ZSTD_frameHeaderSize() : + * srcSize must be >= ZSTD_frameHeaderSize_prefix. + * @return : size of the Frame Header, + * or an error code (if srcSize is too small) */ +size_t ZSTD_frameHeaderSize(const void* src, size_t srcSize) +{ + return ZSTD_frameHeaderSize_internal(src, srcSize, ZSTD_f_zstd1); +} + + +/** ZSTD_getFrameHeader_advanced() : + * decode Frame Header, or require larger `srcSize`. + * note : only works for formats ZSTD_f_zstd1 and ZSTD_f_zstd1_magicless + * @return : 0, `zfhPtr` is correctly filled, + * >0, `srcSize` is too small, value is wanted `srcSize` amount, +** or an error code, which can be tested using ZSTD_isError() */ +size_t ZSTD_getFrameHeader_advanced(ZSTD_frameHeader* zfhPtr, const void* src, size_t srcSize, ZSTD_format_e format) +{ + const BYTE* ip = (const BYTE*)src; + size_t const minInputSize = ZSTD_startingInputLength(format); + + DEBUGLOG(5, "ZSTD_getFrameHeader_advanced: minInputSize = %zu, srcSize = %zu", minInputSize, srcSize); + + if (srcSize > 0) { + /* note : technically could be considered an assert(), since it's an invalid entry */ + RETURN_ERROR_IF(src==NULL, GENERIC, "invalid parameter : src==NULL, but srcSize>0"); + } + if (srcSize < minInputSize) { + if (srcSize > 0 && format != ZSTD_f_zstd1_magicless) { + /* when receiving less than @minInputSize bytes, + * control these bytes at least correspond to a supported magic number + * in order to error out early if they don't. + **/ + size_t const toCopy = MIN(4, srcSize); + unsigned char hbuf[4]; MEM_writeLE32(hbuf, ZSTD_MAGICNUMBER); + assert(src != NULL); + ZSTD_memcpy(hbuf, src, toCopy); + if ( MEM_readLE32(hbuf) != ZSTD_MAGICNUMBER ) { + /* not a zstd frame : let's check if it's a skippable frame */ + MEM_writeLE32(hbuf, ZSTD_MAGIC_SKIPPABLE_START); + ZSTD_memcpy(hbuf, src, toCopy); + if ((MEM_readLE32(hbuf) & ZSTD_MAGIC_SKIPPABLE_MASK) != ZSTD_MAGIC_SKIPPABLE_START) { + RETURN_ERROR(prefix_unknown, + "first bytes don't correspond to any supported magic number"); + } } } + return minInputSize; + } + + ZSTD_memset(zfhPtr, 0, sizeof(*zfhPtr)); /* not strictly necessary, but static analyzers may not understand that zfhPtr will be read only if return value is zero, since they are 2 different signals */ + if ( (format != ZSTD_f_zstd1_magicless) + && (MEM_readLE32(src) != ZSTD_MAGICNUMBER) ) { + if ((MEM_readLE32(src) & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) { + /* skippable frame */ + if (srcSize < ZSTD_SKIPPABLEHEADERSIZE) + return ZSTD_SKIPPABLEHEADERSIZE; /* magic number + frame length */ + ZSTD_memset(zfhPtr, 0, sizeof(*zfhPtr)); + zfhPtr->frameContentSize = MEM_readLE32((const char *)src + ZSTD_FRAMEIDSIZE); + zfhPtr->frameType = ZSTD_skippableFrame; + return 0; + } + RETURN_ERROR(prefix_unknown, ""); + } + + /* ensure there is enough `srcSize` to fully read/decode frame header */ + { size_t const fhsize = ZSTD_frameHeaderSize_internal(src, srcSize, format); + if (srcSize < fhsize) return fhsize; + zfhPtr->headerSize = (U32)fhsize; + } + + { BYTE const fhdByte = ip[minInputSize-1]; + size_t pos = minInputSize; + U32 const dictIDSizeCode = fhdByte&3; + U32 const checksumFlag = (fhdByte>>2)&1; + U32 const singleSegment = (fhdByte>>5)&1; + U32 const fcsID = fhdByte>>6; + U64 windowSize = 0; + U32 dictID = 0; + U64 frameContentSize = ZSTD_CONTENTSIZE_UNKNOWN; + RETURN_ERROR_IF((fhdByte & 0x08) != 0, frameParameter_unsupported, + "reserved bits, must be zero"); + + if (!singleSegment) { + BYTE const wlByte = ip[pos++]; + U32 const windowLog = (wlByte >> 3) + ZSTD_WINDOWLOG_ABSOLUTEMIN; + RETURN_ERROR_IF(windowLog > ZSTD_WINDOWLOG_MAX, frameParameter_windowTooLarge, ""); + windowSize = (1ULL << windowLog); + windowSize += (windowSize >> 3) * (wlByte&7); + } + switch(dictIDSizeCode) + { + default: + assert(0); /* impossible */ + ZSTD_FALLTHROUGH; + case 0 : break; + case 1 : dictID = ip[pos]; pos++; break; + case 2 : dictID = MEM_readLE16(ip+pos); pos+=2; break; + case 3 : dictID = MEM_readLE32(ip+pos); pos+=4; break; + } + switch(fcsID) + { + default: + assert(0); /* impossible */ + ZSTD_FALLTHROUGH; + case 0 : if (singleSegment) frameContentSize = ip[pos]; break; + case 1 : frameContentSize = MEM_readLE16(ip+pos)+256; break; + case 2 : frameContentSize = MEM_readLE32(ip+pos); break; + case 3 : frameContentSize = MEM_readLE64(ip+pos); break; + } + if (singleSegment) windowSize = frameContentSize; + + zfhPtr->frameType = ZSTD_frame; + zfhPtr->frameContentSize = frameContentSize; + zfhPtr->windowSize = windowSize; + zfhPtr->blockSizeMax = (unsigned) MIN(windowSize, ZSTD_BLOCKSIZE_MAX); + zfhPtr->dictID = dictID; + zfhPtr->checksumFlag = checksumFlag; + } + return 0; +} + +/** ZSTD_getFrameHeader() : + * decode Frame Header, or require larger `srcSize`. + * note : this function does not consume input, it only reads it. + * @return : 0, `zfhPtr` is correctly filled, + * >0, `srcSize` is too small, value is wanted `srcSize` amount, + * or an error code, which can be tested using ZSTD_isError() */ +size_t ZSTD_getFrameHeader(ZSTD_frameHeader* zfhPtr, const void* src, size_t srcSize) +{ + return ZSTD_getFrameHeader_advanced(zfhPtr, src, srcSize, ZSTD_f_zstd1); +} + +/** ZSTD_getFrameContentSize() : + * compatible with legacy mode + * @return : decompressed size of the single frame pointed to be `src` if known, otherwise + * - ZSTD_CONTENTSIZE_UNKNOWN if the size cannot be determined + * - ZSTD_CONTENTSIZE_ERROR if an error occurred (e.g. invalid magic number, srcSize too small) */ +unsigned long long ZSTD_getFrameContentSize(const void *src, size_t srcSize) +{ +#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT >= 1) + if (ZSTD_isLegacy(src, srcSize)) { + unsigned long long const ret = ZSTD_getDecompressedSize_legacy(src, srcSize); + return ret == 0 ? ZSTD_CONTENTSIZE_UNKNOWN : ret; + } +#endif + { ZSTD_frameHeader zfh; + if (ZSTD_getFrameHeader(&zfh, src, srcSize) != 0) + return ZSTD_CONTENTSIZE_ERROR; + if (zfh.frameType == ZSTD_skippableFrame) { + return 0; + } else { + return zfh.frameContentSize; + } } +} + +static size_t readSkippableFrameSize(void const* src, size_t srcSize) +{ + size_t const skippableHeaderSize = ZSTD_SKIPPABLEHEADERSIZE; + U32 sizeU32; + + RETURN_ERROR_IF(srcSize < ZSTD_SKIPPABLEHEADERSIZE, srcSize_wrong, ""); + + sizeU32 = MEM_readLE32((BYTE const*)src + ZSTD_FRAMEIDSIZE); + RETURN_ERROR_IF((U32)(sizeU32 + ZSTD_SKIPPABLEHEADERSIZE) < sizeU32, + frameParameter_unsupported, ""); + { size_t const skippableSize = skippableHeaderSize + sizeU32; + RETURN_ERROR_IF(skippableSize > srcSize, srcSize_wrong, ""); + return skippableSize; + } +} + +/*! ZSTD_readSkippableFrame() : + * Retrieves content of a skippable frame, and writes it to dst buffer. + * + * The parameter magicVariant will receive the magicVariant that was supplied when the frame was written, + * i.e. magicNumber - ZSTD_MAGIC_SKIPPABLE_START. This can be NULL if the caller is not interested + * in the magicVariant. + * + * Returns an error if destination buffer is not large enough, or if this is not a valid skippable frame. + * + * @return : number of bytes written or a ZSTD error. + */ +size_t ZSTD_readSkippableFrame(void* dst, size_t dstCapacity, + unsigned* magicVariant, /* optional, can be NULL */ + const void* src, size_t srcSize) +{ + RETURN_ERROR_IF(srcSize < ZSTD_SKIPPABLEHEADERSIZE, srcSize_wrong, ""); + + { U32 const magicNumber = MEM_readLE32(src); + size_t skippableFrameSize = readSkippableFrameSize(src, srcSize); + size_t skippableContentSize = skippableFrameSize - ZSTD_SKIPPABLEHEADERSIZE; + + /* check input validity */ + RETURN_ERROR_IF(!ZSTD_isSkippableFrame(src, srcSize), frameParameter_unsupported, ""); + RETURN_ERROR_IF(skippableFrameSize < ZSTD_SKIPPABLEHEADERSIZE || skippableFrameSize > srcSize, srcSize_wrong, ""); + RETURN_ERROR_IF(skippableContentSize > dstCapacity, dstSize_tooSmall, ""); + + /* deliver payload */ + if (skippableContentSize > 0 && dst != NULL) + ZSTD_memcpy(dst, (const BYTE *)src + ZSTD_SKIPPABLEHEADERSIZE, skippableContentSize); + if (magicVariant != NULL) + *magicVariant = magicNumber - ZSTD_MAGIC_SKIPPABLE_START; + return skippableContentSize; + } +} + +/** ZSTD_findDecompressedSize() : + * `srcSize` must be the exact length of some number of ZSTD compressed and/or + * skippable frames + * note: compatible with legacy mode + * @return : decompressed size of the frames contained */ +unsigned long long ZSTD_findDecompressedSize(const void* src, size_t srcSize) +{ + unsigned long long totalDstSize = 0; + + while (srcSize >= ZSTD_startingInputLength(ZSTD_f_zstd1)) { + U32 const magicNumber = MEM_readLE32(src); + + if ((magicNumber & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) { + size_t const skippableSize = readSkippableFrameSize(src, srcSize); + if (ZSTD_isError(skippableSize)) return ZSTD_CONTENTSIZE_ERROR; + assert(skippableSize <= srcSize); + + src = (const BYTE *)src + skippableSize; + srcSize -= skippableSize; + continue; + } + + { unsigned long long const fcs = ZSTD_getFrameContentSize(src, srcSize); + if (fcs >= ZSTD_CONTENTSIZE_ERROR) return fcs; + + if (totalDstSize + fcs < totalDstSize) + return ZSTD_CONTENTSIZE_ERROR; /* check for overflow */ + totalDstSize += fcs; + } + /* skip to next frame */ + { size_t const frameSrcSize = ZSTD_findFrameCompressedSize(src, srcSize); + if (ZSTD_isError(frameSrcSize)) return ZSTD_CONTENTSIZE_ERROR; + assert(frameSrcSize <= srcSize); + + src = (const BYTE *)src + frameSrcSize; + srcSize -= frameSrcSize; + } + } /* while (srcSize >= ZSTD_frameHeaderSize_prefix) */ + + if (srcSize) return ZSTD_CONTENTSIZE_ERROR; + + return totalDstSize; +} + +/** ZSTD_getDecompressedSize() : + * compatible with legacy mode + * @return : decompressed size if known, 0 otherwise + note : 0 can mean any of the following : + - frame content is empty + - decompressed size field is not present in frame header + - frame header unknown / not supported + - frame header not complete (`srcSize` too small) */ +unsigned long long ZSTD_getDecompressedSize(const void* src, size_t srcSize) +{ + unsigned long long const ret = ZSTD_getFrameContentSize(src, srcSize); + ZSTD_STATIC_ASSERT(ZSTD_CONTENTSIZE_ERROR < ZSTD_CONTENTSIZE_UNKNOWN); + return (ret >= ZSTD_CONTENTSIZE_ERROR) ? 0 : ret; +} + + +/** ZSTD_decodeFrameHeader() : + * `headerSize` must be the size provided by ZSTD_frameHeaderSize(). + * If multiple DDict references are enabled, also will choose the correct DDict to use. + * @return : 0 if success, or an error code, which can be tested using ZSTD_isError() */ +static size_t ZSTD_decodeFrameHeader(ZSTD_DCtx* dctx, const void* src, size_t headerSize) +{ + size_t const result = ZSTD_getFrameHeader_advanced(&(dctx->fParams), src, headerSize, dctx->format); + if (ZSTD_isError(result)) return result; /* invalid header */ + RETURN_ERROR_IF(result>0, srcSize_wrong, "headerSize too small"); + + /* Reference DDict requested by frame if dctx references multiple ddicts */ + if (dctx->refMultipleDDicts == ZSTD_rmd_refMultipleDDicts && dctx->ddictSet) { + ZSTD_DCtx_selectFrameDDict(dctx); + } + +#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION + /* Skip the dictID check in fuzzing mode, because it makes the search + * harder. + */ + RETURN_ERROR_IF(dctx->fParams.dictID && (dctx->dictID != dctx->fParams.dictID), + dictionary_wrong, ""); +#endif + dctx->validateChecksum = (dctx->fParams.checksumFlag && !dctx->forceIgnoreChecksum) ? 1 : 0; + if (dctx->validateChecksum) XXH64_reset(&dctx->xxhState, 0); + dctx->processedCSize += headerSize; + return 0; +} + +static ZSTD_frameSizeInfo ZSTD_errorFrameSizeInfo(size_t ret) +{ + ZSTD_frameSizeInfo frameSizeInfo; + frameSizeInfo.compressedSize = ret; + frameSizeInfo.decompressedBound = ZSTD_CONTENTSIZE_ERROR; + return frameSizeInfo; +} + +static ZSTD_frameSizeInfo ZSTD_findFrameSizeInfo(const void* src, size_t srcSize, ZSTD_format_e format) +{ + ZSTD_frameSizeInfo frameSizeInfo; + ZSTD_memset(&frameSizeInfo, 0, sizeof(ZSTD_frameSizeInfo)); + +#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT >= 1) + if (format == ZSTD_f_zstd1 && ZSTD_isLegacy(src, srcSize)) + return ZSTD_findFrameSizeInfoLegacy(src, srcSize); +#endif + + if (format == ZSTD_f_zstd1 && (srcSize >= ZSTD_SKIPPABLEHEADERSIZE) + && (MEM_readLE32(src) & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) { + frameSizeInfo.compressedSize = readSkippableFrameSize(src, srcSize); + assert(ZSTD_isError(frameSizeInfo.compressedSize) || + frameSizeInfo.compressedSize <= srcSize); + return frameSizeInfo; + } else { + const BYTE* ip = (const BYTE*)src; + const BYTE* const ipstart = ip; + size_t remainingSize = srcSize; + size_t nbBlocks = 0; + ZSTD_frameHeader zfh; + + /* Extract Frame Header */ + { size_t const ret = ZSTD_getFrameHeader_advanced(&zfh, src, srcSize, format); + if (ZSTD_isError(ret)) + return ZSTD_errorFrameSizeInfo(ret); + if (ret > 0) + return ZSTD_errorFrameSizeInfo(ERROR(srcSize_wrong)); + } + + ip += zfh.headerSize; + remainingSize -= zfh.headerSize; + + /* Iterate over each block */ + while (1) { + blockProperties_t blockProperties; + size_t const cBlockSize = ZSTD_getcBlockSize(ip, remainingSize, &blockProperties); + if (ZSTD_isError(cBlockSize)) + return ZSTD_errorFrameSizeInfo(cBlockSize); + + if (ZSTD_blockHeaderSize + cBlockSize > remainingSize) + return ZSTD_errorFrameSizeInfo(ERROR(srcSize_wrong)); + + ip += ZSTD_blockHeaderSize + cBlockSize; + remainingSize -= ZSTD_blockHeaderSize + cBlockSize; + nbBlocks++; + + if (blockProperties.lastBlock) break; + } + + /* Final frame content checksum */ + if (zfh.checksumFlag) { + if (remainingSize < 4) + return ZSTD_errorFrameSizeInfo(ERROR(srcSize_wrong)); + ip += 4; + } + + frameSizeInfo.nbBlocks = nbBlocks; + frameSizeInfo.compressedSize = (size_t)(ip - ipstart); + frameSizeInfo.decompressedBound = (zfh.frameContentSize != ZSTD_CONTENTSIZE_UNKNOWN) + ? zfh.frameContentSize + : (unsigned long long)nbBlocks * zfh.blockSizeMax; + return frameSizeInfo; + } +} + +static size_t ZSTD_findFrameCompressedSize_advanced(const void *src, size_t srcSize, ZSTD_format_e format) { + ZSTD_frameSizeInfo const frameSizeInfo = ZSTD_findFrameSizeInfo(src, srcSize, format); + return frameSizeInfo.compressedSize; +} + +/** ZSTD_findFrameCompressedSize() : + * See docs in zstd.h + * Note: compatible with legacy mode */ +size_t ZSTD_findFrameCompressedSize(const void *src, size_t srcSize) +{ + return ZSTD_findFrameCompressedSize_advanced(src, srcSize, ZSTD_f_zstd1); +} + +/** ZSTD_decompressBound() : + * compatible with legacy mode + * `src` must point to the start of a ZSTD frame or a skippeable frame + * `srcSize` must be at least as large as the frame contained + * @return : the maximum decompressed size of the compressed source + */ +unsigned long long ZSTD_decompressBound(const void* src, size_t srcSize) +{ + unsigned long long bound = 0; + /* Iterate over each frame */ + while (srcSize > 0) { + ZSTD_frameSizeInfo const frameSizeInfo = ZSTD_findFrameSizeInfo(src, srcSize, ZSTD_f_zstd1); + size_t const compressedSize = frameSizeInfo.compressedSize; + unsigned long long const decompressedBound = frameSizeInfo.decompressedBound; + if (ZSTD_isError(compressedSize) || decompressedBound == ZSTD_CONTENTSIZE_ERROR) + return ZSTD_CONTENTSIZE_ERROR; + assert(srcSize >= compressedSize); + src = (const BYTE*)src + compressedSize; + srcSize -= compressedSize; + bound += decompressedBound; + } + return bound; +} + +size_t ZSTD_decompressionMargin(void const* src, size_t srcSize) +{ + size_t margin = 0; + unsigned maxBlockSize = 0; + + /* Iterate over each frame */ + while (srcSize > 0) { + ZSTD_frameSizeInfo const frameSizeInfo = ZSTD_findFrameSizeInfo(src, srcSize, ZSTD_f_zstd1); + size_t const compressedSize = frameSizeInfo.compressedSize; + unsigned long long const decompressedBound = frameSizeInfo.decompressedBound; + ZSTD_frameHeader zfh; + + FORWARD_IF_ERROR(ZSTD_getFrameHeader(&zfh, src, srcSize), ""); + if (ZSTD_isError(compressedSize) || decompressedBound == ZSTD_CONTENTSIZE_ERROR) + return ERROR(corruption_detected); + + if (zfh.frameType == ZSTD_frame) { + /* Add the frame header to our margin */ + margin += zfh.headerSize; + /* Add the checksum to our margin */ + margin += zfh.checksumFlag ? 4 : 0; + /* Add 3 bytes per block */ + margin += 3 * frameSizeInfo.nbBlocks; + + /* Compute the max block size */ + maxBlockSize = MAX(maxBlockSize, zfh.blockSizeMax); + } else { + assert(zfh.frameType == ZSTD_skippableFrame); + /* Add the entire skippable frame size to our margin. */ + margin += compressedSize; + } + + assert(srcSize >= compressedSize); + src = (const BYTE*)src + compressedSize; + srcSize -= compressedSize; + } + + /* Add the max block size back to the margin. */ + margin += maxBlockSize; + + return margin; +} + +/*-************************************************************* + * Frame decoding + ***************************************************************/ + +/** ZSTD_insertBlock() : + * insert `src` block into `dctx` history. Useful to track uncompressed blocks. */ +size_t ZSTD_insertBlock(ZSTD_DCtx* dctx, const void* blockStart, size_t blockSize) +{ + DEBUGLOG(5, "ZSTD_insertBlock: %u bytes", (unsigned)blockSize); + ZSTD_checkContinuity(dctx, blockStart, blockSize); + dctx->previousDstEnd = (const char*)blockStart + blockSize; + return blockSize; +} + + +static size_t ZSTD_copyRawBlock(void* dst, size_t dstCapacity, + const void* src, size_t srcSize) +{ + DEBUGLOG(5, "ZSTD_copyRawBlock"); + RETURN_ERROR_IF(srcSize > dstCapacity, dstSize_tooSmall, ""); + if (dst == NULL) { + if (srcSize == 0) return 0; + RETURN_ERROR(dstBuffer_null, ""); + } + ZSTD_memmove(dst, src, srcSize); + return srcSize; +} + +static size_t ZSTD_setRleBlock(void* dst, size_t dstCapacity, + BYTE b, + size_t regenSize) +{ + RETURN_ERROR_IF(regenSize > dstCapacity, dstSize_tooSmall, ""); + if (dst == NULL) { + if (regenSize == 0) return 0; + RETURN_ERROR(dstBuffer_null, ""); + } + ZSTD_memset(dst, b, regenSize); + return regenSize; +} + +static void ZSTD_DCtx_trace_end(ZSTD_DCtx const* dctx, U64 uncompressedSize, U64 compressedSize, unsigned streaming) +{ +#if ZSTD_TRACE + if (dctx->traceCtx && ZSTD_trace_decompress_end != NULL) { + ZSTD_Trace trace; + ZSTD_memset(&trace, 0, sizeof(trace)); + trace.version = ZSTD_VERSION_NUMBER; + trace.streaming = streaming; + if (dctx->ddict) { + trace.dictionaryID = ZSTD_getDictID_fromDDict(dctx->ddict); + trace.dictionarySize = ZSTD_DDict_dictSize(dctx->ddict); + trace.dictionaryIsCold = dctx->ddictIsCold; + } + trace.uncompressedSize = (size_t)uncompressedSize; + trace.compressedSize = (size_t)compressedSize; + trace.dctx = dctx; + ZSTD_trace_decompress_end(dctx->traceCtx, &trace); + } +#else + (void)dctx; + (void)uncompressedSize; + (void)compressedSize; + (void)streaming; +#endif +} + + +/*! ZSTD_decompressFrame() : + * @dctx must be properly initialized + * will update *srcPtr and *srcSizePtr, + * to make *srcPtr progress by one frame. */ +static size_t ZSTD_decompressFrame(ZSTD_DCtx* dctx, + void* dst, size_t dstCapacity, + const void** srcPtr, size_t *srcSizePtr) +{ + const BYTE* const istart = (const BYTE*)(*srcPtr); + const BYTE* ip = istart; + BYTE* const ostart = (BYTE*)dst; + BYTE* const oend = dstCapacity != 0 ? ostart + dstCapacity : ostart; + BYTE* op = ostart; + size_t remainingSrcSize = *srcSizePtr; + + DEBUGLOG(4, "ZSTD_decompressFrame (srcSize:%i)", (int)*srcSizePtr); + + /* check */ + RETURN_ERROR_IF( + remainingSrcSize < ZSTD_FRAMEHEADERSIZE_MIN(dctx->format)+ZSTD_blockHeaderSize, + srcSize_wrong, ""); + + /* Frame Header */ + { size_t const frameHeaderSize = ZSTD_frameHeaderSize_internal( + ip, ZSTD_FRAMEHEADERSIZE_PREFIX(dctx->format), dctx->format); + if (ZSTD_isError(frameHeaderSize)) return frameHeaderSize; + RETURN_ERROR_IF(remainingSrcSize < frameHeaderSize+ZSTD_blockHeaderSize, + srcSize_wrong, ""); + FORWARD_IF_ERROR( ZSTD_decodeFrameHeader(dctx, ip, frameHeaderSize) , ""); + ip += frameHeaderSize; remainingSrcSize -= frameHeaderSize; + } + + /* Shrink the blockSizeMax if enabled */ + if (dctx->maxBlockSizeParam != 0) + dctx->fParams.blockSizeMax = MIN(dctx->fParams.blockSizeMax, (unsigned)dctx->maxBlockSizeParam); + + /* Loop on each block */ + while (1) { + BYTE* oBlockEnd = oend; + size_t decodedSize; + blockProperties_t blockProperties; + size_t const cBlockSize = ZSTD_getcBlockSize(ip, remainingSrcSize, &blockProperties); + if (ZSTD_isError(cBlockSize)) return cBlockSize; + + ip += ZSTD_blockHeaderSize; + remainingSrcSize -= ZSTD_blockHeaderSize; + RETURN_ERROR_IF(cBlockSize > remainingSrcSize, srcSize_wrong, ""); + + if (ip >= op && ip < oBlockEnd) { + /* We are decompressing in-place. Limit the output pointer so that we + * don't overwrite the block that we are currently reading. This will + * fail decompression if the input & output pointers aren't spaced + * far enough apart. + * + * This is important to set, even when the pointers are far enough + * apart, because ZSTD_decompressBlock_internal() can decide to store + * literals in the output buffer, after the block it is decompressing. + * Since we don't want anything to overwrite our input, we have to tell + * ZSTD_decompressBlock_internal to never write past ip. + * + * See ZSTD_allocateLiteralsBuffer() for reference. + */ + oBlockEnd = op + (ip - op); + } + + switch(blockProperties.blockType) + { + case bt_compressed: + assert(dctx->isFrameDecompression == 1); + decodedSize = ZSTD_decompressBlock_internal(dctx, op, (size_t)(oBlockEnd-op), ip, cBlockSize, not_streaming); + break; + case bt_raw : + /* Use oend instead of oBlockEnd because this function is safe to overlap. It uses memmove. */ + decodedSize = ZSTD_copyRawBlock(op, (size_t)(oend-op), ip, cBlockSize); + break; + case bt_rle : + decodedSize = ZSTD_setRleBlock(op, (size_t)(oBlockEnd-op), *ip, blockProperties.origSize); + break; + case bt_reserved : + default: + RETURN_ERROR(corruption_detected, "invalid block type"); + } + FORWARD_IF_ERROR(decodedSize, "Block decompression failure"); + DEBUGLOG(5, "Decompressed block of dSize = %u", (unsigned)decodedSize); + if (dctx->validateChecksum) { + XXH64_update(&dctx->xxhState, op, decodedSize); + } + if (decodedSize) /* support dst = NULL,0 */ { + op += decodedSize; + } + assert(ip != NULL); + ip += cBlockSize; + remainingSrcSize -= cBlockSize; + if (blockProperties.lastBlock) break; + } + + if (dctx->fParams.frameContentSize != ZSTD_CONTENTSIZE_UNKNOWN) { + RETURN_ERROR_IF((U64)(op-ostart) != dctx->fParams.frameContentSize, + corruption_detected, ""); + } + if (dctx->fParams.checksumFlag) { /* Frame content checksum verification */ + RETURN_ERROR_IF(remainingSrcSize<4, checksum_wrong, ""); + if (!dctx->forceIgnoreChecksum) { + U32 const checkCalc = (U32)XXH64_digest(&dctx->xxhState); + U32 checkRead; + checkRead = MEM_readLE32(ip); + RETURN_ERROR_IF(checkRead != checkCalc, checksum_wrong, ""); + } + ip += 4; + remainingSrcSize -= 4; + } + ZSTD_DCtx_trace_end(dctx, (U64)(op-ostart), (U64)(ip-istart), /* streaming */ 0); + /* Allow caller to get size read */ + DEBUGLOG(4, "ZSTD_decompressFrame: decompressed frame of size %zi, consuming %zi bytes of input", op-ostart, ip - (const BYTE*)*srcPtr); + *srcPtr = ip; + *srcSizePtr = remainingSrcSize; + return (size_t)(op-ostart); +} + +static +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +size_t ZSTD_decompressMultiFrame(ZSTD_DCtx* dctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + const void* dict, size_t dictSize, + const ZSTD_DDict* ddict) +{ + void* const dststart = dst; + int moreThan1Frame = 0; + + DEBUGLOG(5, "ZSTD_decompressMultiFrame"); + assert(dict==NULL || ddict==NULL); /* either dict or ddict set, not both */ + + if (ddict) { + dict = ZSTD_DDict_dictContent(ddict); + dictSize = ZSTD_DDict_dictSize(ddict); + } + + while (srcSize >= ZSTD_startingInputLength(dctx->format)) { + +#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT >= 1) + if (dctx->format == ZSTD_f_zstd1 && ZSTD_isLegacy(src, srcSize)) { + size_t decodedSize; + size_t const frameSize = ZSTD_findFrameCompressedSizeLegacy(src, srcSize); + if (ZSTD_isError(frameSize)) return frameSize; + RETURN_ERROR_IF(dctx->staticSize, memory_allocation, + "legacy support is not compatible with static dctx"); + + decodedSize = ZSTD_decompressLegacy(dst, dstCapacity, src, frameSize, dict, dictSize); + if (ZSTD_isError(decodedSize)) return decodedSize; + + { + unsigned long long const expectedSize = ZSTD_getFrameContentSize(src, srcSize); + RETURN_ERROR_IF(expectedSize == ZSTD_CONTENTSIZE_ERROR, corruption_detected, "Corrupted frame header!"); + if (expectedSize != ZSTD_CONTENTSIZE_UNKNOWN) { + RETURN_ERROR_IF(expectedSize != decodedSize, corruption_detected, + "Frame header size does not match decoded size!"); + } + } + + assert(decodedSize <= dstCapacity); + dst = (BYTE*)dst + decodedSize; + dstCapacity -= decodedSize; + + src = (const BYTE*)src + frameSize; + srcSize -= frameSize; + + continue; + } +#endif + + if (dctx->format == ZSTD_f_zstd1 && srcSize >= 4) { + U32 const magicNumber = MEM_readLE32(src); + DEBUGLOG(5, "reading magic number %08X", (unsigned)magicNumber); + if ((magicNumber & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) { + /* skippable frame detected : skip it */ + size_t const skippableSize = readSkippableFrameSize(src, srcSize); + FORWARD_IF_ERROR(skippableSize, "invalid skippable frame"); + assert(skippableSize <= srcSize); + + src = (const BYTE *)src + skippableSize; + srcSize -= skippableSize; + continue; /* check next frame */ + } } + + if (ddict) { + /* we were called from ZSTD_decompress_usingDDict */ + FORWARD_IF_ERROR(ZSTD_decompressBegin_usingDDict(dctx, ddict), ""); + } else { + /* this will initialize correctly with no dict if dict == NULL, so + * use this in all cases but ddict */ + FORWARD_IF_ERROR(ZSTD_decompressBegin_usingDict(dctx, dict, dictSize), ""); + } + ZSTD_checkContinuity(dctx, dst, dstCapacity); + + { const size_t res = ZSTD_decompressFrame(dctx, dst, dstCapacity, + &src, &srcSize); + RETURN_ERROR_IF( + (ZSTD_getErrorCode(res) == ZSTD_error_prefix_unknown) + && (moreThan1Frame==1), + srcSize_wrong, + "At least one frame successfully completed, " + "but following bytes are garbage: " + "it's more likely to be a srcSize error, " + "specifying more input bytes than size of frame(s). " + "Note: one could be unlucky, it might be a corruption error instead, " + "happening right at the place where we expect zstd magic bytes. " + "But this is _much_ less likely than a srcSize field error."); + if (ZSTD_isError(res)) return res; + assert(res <= dstCapacity); + if (res != 0) + dst = (BYTE*)dst + res; + dstCapacity -= res; + } + moreThan1Frame = 1; + } /* while (srcSize >= ZSTD_frameHeaderSize_prefix) */ + + RETURN_ERROR_IF(srcSize, srcSize_wrong, "input not entirely consumed"); + + return (size_t)((BYTE*)dst - (BYTE*)dststart); +} + +size_t ZSTD_decompress_usingDict(ZSTD_DCtx* dctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + const void* dict, size_t dictSize) +{ + return ZSTD_decompressMultiFrame(dctx, dst, dstCapacity, src, srcSize, dict, dictSize, NULL); +} + + +static ZSTD_DDict const* ZSTD_getDDict(ZSTD_DCtx* dctx) +{ + switch (dctx->dictUses) { + default: + assert(0 /* Impossible */); + ZSTD_FALLTHROUGH; + case ZSTD_dont_use: + ZSTD_clearDict(dctx); + return NULL; + case ZSTD_use_indefinitely: + return dctx->ddict; + case ZSTD_use_once: + dctx->dictUses = ZSTD_dont_use; + return dctx->ddict; + } +} + +size_t ZSTD_decompressDCtx(ZSTD_DCtx* dctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize) +{ + return ZSTD_decompress_usingDDict(dctx, dst, dstCapacity, src, srcSize, ZSTD_getDDict(dctx)); +} + + +size_t ZSTD_decompress(void* dst, size_t dstCapacity, const void* src, size_t srcSize) +{ +#if defined(ZSTD_HEAPMODE) && (ZSTD_HEAPMODE>=1) + size_t regenSize; + ZSTD_DCtx* const dctx = ZSTD_createDCtx_internal(ZSTD_defaultCMem); + RETURN_ERROR_IF(dctx==NULL, memory_allocation, "NULL pointer!"); + regenSize = ZSTD_decompressDCtx(dctx, dst, dstCapacity, src, srcSize); + ZSTD_freeDCtx(dctx); + return regenSize; +#else /* stack mode */ + ZSTD_DCtx dctx; + ZSTD_initDCtx_internal(&dctx); + return ZSTD_decompressDCtx(&dctx, dst, dstCapacity, src, srcSize); +#endif +} + + +/*-************************************** +* Advanced Streaming Decompression API +* Bufferless and synchronous +****************************************/ +size_t ZSTD_nextSrcSizeToDecompress(ZSTD_DCtx* dctx) { return dctx->expected; } + +/** + * Similar to ZSTD_nextSrcSizeToDecompress(), but when a block input can be streamed, we + * allow taking a partial block as the input. Currently only raw uncompressed blocks can + * be streamed. + * + * For blocks that can be streamed, this allows us to reduce the latency until we produce + * output, and avoid copying the input. + * + * @param inputSize - The total amount of input that the caller currently has. + */ +static size_t ZSTD_nextSrcSizeToDecompressWithInputSize(ZSTD_DCtx* dctx, size_t inputSize) { + if (!(dctx->stage == ZSTDds_decompressBlock || dctx->stage == ZSTDds_decompressLastBlock)) + return dctx->expected; + if (dctx->bType != bt_raw) + return dctx->expected; + return BOUNDED(1, inputSize, dctx->expected); +} + +ZSTD_nextInputType_e ZSTD_nextInputType(ZSTD_DCtx* dctx) { + switch(dctx->stage) + { + default: /* should not happen */ + assert(0); + ZSTD_FALLTHROUGH; + case ZSTDds_getFrameHeaderSize: + ZSTD_FALLTHROUGH; + case ZSTDds_decodeFrameHeader: + return ZSTDnit_frameHeader; + case ZSTDds_decodeBlockHeader: + return ZSTDnit_blockHeader; + case ZSTDds_decompressBlock: + return ZSTDnit_block; + case ZSTDds_decompressLastBlock: + return ZSTDnit_lastBlock; + case ZSTDds_checkChecksum: + return ZSTDnit_checksum; + case ZSTDds_decodeSkippableHeader: + ZSTD_FALLTHROUGH; + case ZSTDds_skipFrame: + return ZSTDnit_skippableFrame; + } +} + +static int ZSTD_isSkipFrame(ZSTD_DCtx* dctx) { return dctx->stage == ZSTDds_skipFrame; } + +/** ZSTD_decompressContinue() : + * srcSize : must be the exact nb of bytes expected (see ZSTD_nextSrcSizeToDecompress()) + * @return : nb of bytes generated into `dst` (necessarily <= `dstCapacity) + * or an error code, which can be tested using ZSTD_isError() */ +size_t ZSTD_decompressContinue(ZSTD_DCtx* dctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize) +{ + DEBUGLOG(5, "ZSTD_decompressContinue (srcSize:%u)", (unsigned)srcSize); + /* Sanity check */ + RETURN_ERROR_IF(srcSize != ZSTD_nextSrcSizeToDecompressWithInputSize(dctx, srcSize), srcSize_wrong, "not allowed"); + ZSTD_checkContinuity(dctx, dst, dstCapacity); + + dctx->processedCSize += srcSize; + + switch (dctx->stage) + { + case ZSTDds_getFrameHeaderSize : + assert(src != NULL); + if (dctx->format == ZSTD_f_zstd1) { /* allows header */ + assert(srcSize >= ZSTD_FRAMEIDSIZE); /* to read skippable magic number */ + if ((MEM_readLE32(src) & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) { /* skippable frame */ + ZSTD_memcpy(dctx->headerBuffer, src, srcSize); + dctx->expected = ZSTD_SKIPPABLEHEADERSIZE - srcSize; /* remaining to load to get full skippable frame header */ + dctx->stage = ZSTDds_decodeSkippableHeader; + return 0; + } } + dctx->headerSize = ZSTD_frameHeaderSize_internal(src, srcSize, dctx->format); + if (ZSTD_isError(dctx->headerSize)) return dctx->headerSize; + ZSTD_memcpy(dctx->headerBuffer, src, srcSize); + dctx->expected = dctx->headerSize - srcSize; + dctx->stage = ZSTDds_decodeFrameHeader; + return 0; + + case ZSTDds_decodeFrameHeader: + assert(src != NULL); + ZSTD_memcpy(dctx->headerBuffer + (dctx->headerSize - srcSize), src, srcSize); + FORWARD_IF_ERROR(ZSTD_decodeFrameHeader(dctx, dctx->headerBuffer, dctx->headerSize), ""); + dctx->expected = ZSTD_blockHeaderSize; + dctx->stage = ZSTDds_decodeBlockHeader; + return 0; + + case ZSTDds_decodeBlockHeader: + { blockProperties_t bp; + size_t const cBlockSize = ZSTD_getcBlockSize(src, ZSTD_blockHeaderSize, &bp); + if (ZSTD_isError(cBlockSize)) return cBlockSize; + RETURN_ERROR_IF(cBlockSize > dctx->fParams.blockSizeMax, corruption_detected, "Block Size Exceeds Maximum"); + dctx->expected = cBlockSize; + dctx->bType = bp.blockType; + dctx->rleSize = bp.origSize; + if (cBlockSize) { + dctx->stage = bp.lastBlock ? ZSTDds_decompressLastBlock : ZSTDds_decompressBlock; + return 0; + } + /* empty block */ + if (bp.lastBlock) { + if (dctx->fParams.checksumFlag) { + dctx->expected = 4; + dctx->stage = ZSTDds_checkChecksum; + } else { + dctx->expected = 0; /* end of frame */ + dctx->stage = ZSTDds_getFrameHeaderSize; + } + } else { + dctx->expected = ZSTD_blockHeaderSize; /* jump to next header */ + dctx->stage = ZSTDds_decodeBlockHeader; + } + return 0; + } + + case ZSTDds_decompressLastBlock: + case ZSTDds_decompressBlock: + DEBUGLOG(5, "ZSTD_decompressContinue: case ZSTDds_decompressBlock"); + { size_t rSize; + switch(dctx->bType) + { + case bt_compressed: + DEBUGLOG(5, "ZSTD_decompressContinue: case bt_compressed"); + assert(dctx->isFrameDecompression == 1); + rSize = ZSTD_decompressBlock_internal(dctx, dst, dstCapacity, src, srcSize, is_streaming); + dctx->expected = 0; /* Streaming not supported */ + break; + case bt_raw : + assert(srcSize <= dctx->expected); + rSize = ZSTD_copyRawBlock(dst, dstCapacity, src, srcSize); + FORWARD_IF_ERROR(rSize, "ZSTD_copyRawBlock failed"); + assert(rSize == srcSize); + dctx->expected -= rSize; + break; + case bt_rle : + rSize = ZSTD_setRleBlock(dst, dstCapacity, *(const BYTE*)src, dctx->rleSize); + dctx->expected = 0; /* Streaming not supported */ + break; + case bt_reserved : /* should never happen */ + default: + RETURN_ERROR(corruption_detected, "invalid block type"); + } + FORWARD_IF_ERROR(rSize, ""); + RETURN_ERROR_IF(rSize > dctx->fParams.blockSizeMax, corruption_detected, "Decompressed Block Size Exceeds Maximum"); + DEBUGLOG(5, "ZSTD_decompressContinue: decoded size from block : %u", (unsigned)rSize); + dctx->decodedSize += rSize; + if (dctx->validateChecksum) XXH64_update(&dctx->xxhState, dst, rSize); + dctx->previousDstEnd = (char*)dst + rSize; + + /* Stay on the same stage until we are finished streaming the block. */ + if (dctx->expected > 0) { + return rSize; + } + + if (dctx->stage == ZSTDds_decompressLastBlock) { /* end of frame */ + DEBUGLOG(4, "ZSTD_decompressContinue: decoded size from frame : %u", (unsigned)dctx->decodedSize); + RETURN_ERROR_IF( + dctx->fParams.frameContentSize != ZSTD_CONTENTSIZE_UNKNOWN + && dctx->decodedSize != dctx->fParams.frameContentSize, + corruption_detected, ""); + if (dctx->fParams.checksumFlag) { /* another round for frame checksum */ + dctx->expected = 4; + dctx->stage = ZSTDds_checkChecksum; + } else { + ZSTD_DCtx_trace_end(dctx, dctx->decodedSize, dctx->processedCSize, /* streaming */ 1); + dctx->expected = 0; /* ends here */ + dctx->stage = ZSTDds_getFrameHeaderSize; + } + } else { + dctx->stage = ZSTDds_decodeBlockHeader; + dctx->expected = ZSTD_blockHeaderSize; + } + return rSize; + } + + case ZSTDds_checkChecksum: + assert(srcSize == 4); /* guaranteed by dctx->expected */ + { + if (dctx->validateChecksum) { + U32 const h32 = (U32)XXH64_digest(&dctx->xxhState); + U32 const check32 = MEM_readLE32(src); + DEBUGLOG(4, "ZSTD_decompressContinue: checksum : calculated %08X :: %08X read", (unsigned)h32, (unsigned)check32); + RETURN_ERROR_IF(check32 != h32, checksum_wrong, ""); + } + ZSTD_DCtx_trace_end(dctx, dctx->decodedSize, dctx->processedCSize, /* streaming */ 1); + dctx->expected = 0; + dctx->stage = ZSTDds_getFrameHeaderSize; + return 0; + } + + case ZSTDds_decodeSkippableHeader: + assert(src != NULL); + assert(srcSize <= ZSTD_SKIPPABLEHEADERSIZE); + assert(dctx->format != ZSTD_f_zstd1_magicless); + ZSTD_memcpy(dctx->headerBuffer + (ZSTD_SKIPPABLEHEADERSIZE - srcSize), src, srcSize); /* complete skippable header */ + dctx->expected = MEM_readLE32(dctx->headerBuffer + ZSTD_FRAMEIDSIZE); /* note : dctx->expected can grow seriously large, beyond local buffer size */ + dctx->stage = ZSTDds_skipFrame; + return 0; + + case ZSTDds_skipFrame: + dctx->expected = 0; + dctx->stage = ZSTDds_getFrameHeaderSize; + return 0; + + default: + assert(0); /* impossible */ + RETURN_ERROR(GENERIC, "impossible to reach"); /* some compilers require default to do something */ + } +} + + +static size_t ZSTD_refDictContent(ZSTD_DCtx* dctx, const void* dict, size_t dictSize) +{ + dctx->dictEnd = dctx->previousDstEnd; + dctx->virtualStart = (const char*)dict - ((const char*)(dctx->previousDstEnd) - (const char*)(dctx->prefixStart)); + dctx->prefixStart = dict; + dctx->previousDstEnd = (const char*)dict + dictSize; +#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION + dctx->dictContentBeginForFuzzing = dctx->prefixStart; + dctx->dictContentEndForFuzzing = dctx->previousDstEnd; +#endif + return 0; +} + +/*! ZSTD_loadDEntropy() : + * dict : must point at beginning of a valid zstd dictionary. + * @return : size of entropy tables read */ +size_t +ZSTD_loadDEntropy(ZSTD_entropyDTables_t* entropy, + const void* const dict, size_t const dictSize) +{ + const BYTE* dictPtr = (const BYTE*)dict; + const BYTE* const dictEnd = dictPtr + dictSize; + + RETURN_ERROR_IF(dictSize <= 8, dictionary_corrupted, "dict is too small"); + assert(MEM_readLE32(dict) == ZSTD_MAGIC_DICTIONARY); /* dict must be valid */ + dictPtr += 8; /* skip header = magic + dictID */ + + ZSTD_STATIC_ASSERT(offsetof(ZSTD_entropyDTables_t, OFTable) == offsetof(ZSTD_entropyDTables_t, LLTable) + sizeof(entropy->LLTable)); + ZSTD_STATIC_ASSERT(offsetof(ZSTD_entropyDTables_t, MLTable) == offsetof(ZSTD_entropyDTables_t, OFTable) + sizeof(entropy->OFTable)); + ZSTD_STATIC_ASSERT(sizeof(entropy->LLTable) + sizeof(entropy->OFTable) + sizeof(entropy->MLTable) >= HUF_DECOMPRESS_WORKSPACE_SIZE); + { void* const workspace = &entropy->LLTable; /* use fse tables as temporary workspace; implies fse tables are grouped together */ + size_t const workspaceSize = sizeof(entropy->LLTable) + sizeof(entropy->OFTable) + sizeof(entropy->MLTable); +#ifdef HUF_FORCE_DECOMPRESS_X1 + /* in minimal huffman, we always use X1 variants */ + size_t const hSize = HUF_readDTableX1_wksp(entropy->hufTable, + dictPtr, dictEnd - dictPtr, + workspace, workspaceSize, /* flags */ 0); +#else + size_t const hSize = HUF_readDTableX2_wksp(entropy->hufTable, + dictPtr, (size_t)(dictEnd - dictPtr), + workspace, workspaceSize, /* flags */ 0); +#endif + RETURN_ERROR_IF(HUF_isError(hSize), dictionary_corrupted, ""); + dictPtr += hSize; + } + + { short offcodeNCount[MaxOff+1]; + unsigned offcodeMaxValue = MaxOff, offcodeLog; + size_t const offcodeHeaderSize = FSE_readNCount(offcodeNCount, &offcodeMaxValue, &offcodeLog, dictPtr, (size_t)(dictEnd-dictPtr)); + RETURN_ERROR_IF(FSE_isError(offcodeHeaderSize), dictionary_corrupted, ""); + RETURN_ERROR_IF(offcodeMaxValue > MaxOff, dictionary_corrupted, ""); + RETURN_ERROR_IF(offcodeLog > OffFSELog, dictionary_corrupted, ""); + ZSTD_buildFSETable( entropy->OFTable, + offcodeNCount, offcodeMaxValue, + OF_base, OF_bits, + offcodeLog, + entropy->workspace, sizeof(entropy->workspace), + /* bmi2 */0); + dictPtr += offcodeHeaderSize; + } + + { short matchlengthNCount[MaxML+1]; + unsigned matchlengthMaxValue = MaxML, matchlengthLog; + size_t const matchlengthHeaderSize = FSE_readNCount(matchlengthNCount, &matchlengthMaxValue, &matchlengthLog, dictPtr, (size_t)(dictEnd-dictPtr)); + RETURN_ERROR_IF(FSE_isError(matchlengthHeaderSize), dictionary_corrupted, ""); + RETURN_ERROR_IF(matchlengthMaxValue > MaxML, dictionary_corrupted, ""); + RETURN_ERROR_IF(matchlengthLog > MLFSELog, dictionary_corrupted, ""); + ZSTD_buildFSETable( entropy->MLTable, + matchlengthNCount, matchlengthMaxValue, + ML_base, ML_bits, + matchlengthLog, + entropy->workspace, sizeof(entropy->workspace), + /* bmi2 */ 0); + dictPtr += matchlengthHeaderSize; + } + + { short litlengthNCount[MaxLL+1]; + unsigned litlengthMaxValue = MaxLL, litlengthLog; + size_t const litlengthHeaderSize = FSE_readNCount(litlengthNCount, &litlengthMaxValue, &litlengthLog, dictPtr, (size_t)(dictEnd-dictPtr)); + RETURN_ERROR_IF(FSE_isError(litlengthHeaderSize), dictionary_corrupted, ""); + RETURN_ERROR_IF(litlengthMaxValue > MaxLL, dictionary_corrupted, ""); + RETURN_ERROR_IF(litlengthLog > LLFSELog, dictionary_corrupted, ""); + ZSTD_buildFSETable( entropy->LLTable, + litlengthNCount, litlengthMaxValue, + LL_base, LL_bits, + litlengthLog, + entropy->workspace, sizeof(entropy->workspace), + /* bmi2 */ 0); + dictPtr += litlengthHeaderSize; + } + + RETURN_ERROR_IF(dictPtr+12 > dictEnd, dictionary_corrupted, ""); + { int i; + size_t const dictContentSize = (size_t)(dictEnd - (dictPtr+12)); + for (i=0; i<3; i++) { + U32 const rep = MEM_readLE32(dictPtr); dictPtr += 4; + RETURN_ERROR_IF(rep==0 || rep > dictContentSize, + dictionary_corrupted, ""); + entropy->rep[i] = rep; + } } + + return (size_t)(dictPtr - (const BYTE*)dict); +} + +static size_t ZSTD_decompress_insertDictionary(ZSTD_DCtx* dctx, const void* dict, size_t dictSize) +{ + if (dictSize < 8) return ZSTD_refDictContent(dctx, dict, dictSize); + { U32 const magic = MEM_readLE32(dict); + if (magic != ZSTD_MAGIC_DICTIONARY) { + return ZSTD_refDictContent(dctx, dict, dictSize); /* pure content mode */ + } } + dctx->dictID = MEM_readLE32((const char*)dict + ZSTD_FRAMEIDSIZE); + + /* load entropy tables */ + { size_t const eSize = ZSTD_loadDEntropy(&dctx->entropy, dict, dictSize); + RETURN_ERROR_IF(ZSTD_isError(eSize), dictionary_corrupted, ""); + dict = (const char*)dict + eSize; + dictSize -= eSize; + } + dctx->litEntropy = dctx->fseEntropy = 1; + + /* reference dictionary content */ + return ZSTD_refDictContent(dctx, dict, dictSize); +} + +size_t ZSTD_decompressBegin(ZSTD_DCtx* dctx) +{ + assert(dctx != NULL); +#if ZSTD_TRACE + dctx->traceCtx = (ZSTD_trace_decompress_begin != NULL) ? ZSTD_trace_decompress_begin(dctx) : 0; +#endif + dctx->expected = ZSTD_startingInputLength(dctx->format); /* dctx->format must be properly set */ + dctx->stage = ZSTDds_getFrameHeaderSize; + dctx->processedCSize = 0; + dctx->decodedSize = 0; + dctx->previousDstEnd = NULL; + dctx->prefixStart = NULL; + dctx->virtualStart = NULL; + dctx->dictEnd = NULL; + dctx->entropy.hufTable[0] = (HUF_DTable)((ZSTD_HUFFDTABLE_CAPACITY_LOG)*0x1000001); /* cover both little and big endian */ + dctx->litEntropy = dctx->fseEntropy = 0; + dctx->dictID = 0; + dctx->bType = bt_reserved; + dctx->isFrameDecompression = 1; + ZSTD_STATIC_ASSERT(sizeof(dctx->entropy.rep) == sizeof(repStartValue)); + ZSTD_memcpy(dctx->entropy.rep, repStartValue, sizeof(repStartValue)); /* initial repcodes */ + dctx->LLTptr = dctx->entropy.LLTable; + dctx->MLTptr = dctx->entropy.MLTable; + dctx->OFTptr = dctx->entropy.OFTable; + dctx->HUFptr = dctx->entropy.hufTable; + return 0; +} + +size_t ZSTD_decompressBegin_usingDict(ZSTD_DCtx* dctx, const void* dict, size_t dictSize) +{ + FORWARD_IF_ERROR( ZSTD_decompressBegin(dctx) , ""); + if (dict && dictSize) + RETURN_ERROR_IF( + ZSTD_isError(ZSTD_decompress_insertDictionary(dctx, dict, dictSize)), + dictionary_corrupted, ""); + return 0; +} + + +/* ====== ZSTD_DDict ====== */ + +size_t ZSTD_decompressBegin_usingDDict(ZSTD_DCtx* dctx, const ZSTD_DDict* ddict) +{ + DEBUGLOG(4, "ZSTD_decompressBegin_usingDDict"); + assert(dctx != NULL); + if (ddict) { + const char* const dictStart = (const char*)ZSTD_DDict_dictContent(ddict); + size_t const dictSize = ZSTD_DDict_dictSize(ddict); + const void* const dictEnd = dictStart + dictSize; + dctx->ddictIsCold = (dctx->dictEnd != dictEnd); + DEBUGLOG(4, "DDict is %s", + dctx->ddictIsCold ? "~cold~" : "hot!"); + } + FORWARD_IF_ERROR( ZSTD_decompressBegin(dctx) , ""); + if (ddict) { /* NULL ddict is equivalent to no dictionary */ + ZSTD_copyDDictParameters(dctx, ddict); + } + return 0; +} + +/*! ZSTD_getDictID_fromDict() : + * Provides the dictID stored within dictionary. + * if @return == 0, the dictionary is not conformant with Zstandard specification. + * It can still be loaded, but as a content-only dictionary. */ +unsigned ZSTD_getDictID_fromDict(const void* dict, size_t dictSize) +{ + if (dictSize < 8) return 0; + if (MEM_readLE32(dict) != ZSTD_MAGIC_DICTIONARY) return 0; + return MEM_readLE32((const char*)dict + ZSTD_FRAMEIDSIZE); +} + +/*! ZSTD_getDictID_fromFrame() : + * Provides the dictID required to decompress frame stored within `src`. + * If @return == 0, the dictID could not be decoded. + * This could for one of the following reasons : + * - The frame does not require a dictionary (most common case). + * - The frame was built with dictID intentionally removed. + * Needed dictionary is a hidden piece of information. + * Note : this use case also happens when using a non-conformant dictionary. + * - `srcSize` is too small, and as a result, frame header could not be decoded. + * Note : possible if `srcSize < ZSTD_FRAMEHEADERSIZE_MAX`. + * - This is not a Zstandard frame. + * When identifying the exact failure cause, it's possible to use + * ZSTD_getFrameHeader(), which will provide a more precise error code. */ +unsigned ZSTD_getDictID_fromFrame(const void* src, size_t srcSize) +{ + ZSTD_frameHeader zfp = { 0, 0, 0, ZSTD_frame, 0, 0, 0, 0, 0 }; + size_t const hError = ZSTD_getFrameHeader(&zfp, src, srcSize); + if (ZSTD_isError(hError)) return 0; + return zfp.dictID; +} + + +/*! ZSTD_decompress_usingDDict() : +* Decompression using a pre-digested Dictionary +* Use dictionary without significant overhead. */ +size_t ZSTD_decompress_usingDDict(ZSTD_DCtx* dctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + const ZSTD_DDict* ddict) +{ + /* pass content and size in case legacy frames are encountered */ + return ZSTD_decompressMultiFrame(dctx, dst, dstCapacity, src, srcSize, + NULL, 0, + ddict); +} + + +/*===================================== +* Streaming decompression +*====================================*/ + +ZSTD_DStream* ZSTD_createDStream(void) +{ + DEBUGLOG(3, "ZSTD_createDStream"); + return ZSTD_createDCtx_internal(ZSTD_defaultCMem); +} + +ZSTD_DStream* ZSTD_initStaticDStream(void *workspace, size_t workspaceSize) +{ + return ZSTD_initStaticDCtx(workspace, workspaceSize); +} + +ZSTD_DStream* ZSTD_createDStream_advanced(ZSTD_customMem customMem) +{ + return ZSTD_createDCtx_internal(customMem); +} + +size_t ZSTD_freeDStream(ZSTD_DStream* zds) +{ + return ZSTD_freeDCtx(zds); +} + + +/* *** Initialization *** */ + +size_t ZSTD_DStreamInSize(void) { return ZSTD_BLOCKSIZE_MAX + ZSTD_blockHeaderSize; } +size_t ZSTD_DStreamOutSize(void) { return ZSTD_BLOCKSIZE_MAX; } + +size_t ZSTD_DCtx_loadDictionary_advanced(ZSTD_DCtx* dctx, + const void* dict, size_t dictSize, + ZSTD_dictLoadMethod_e dictLoadMethod, + ZSTD_dictContentType_e dictContentType) +{ + RETURN_ERROR_IF(dctx->streamStage != zdss_init, stage_wrong, ""); + ZSTD_clearDict(dctx); + if (dict && dictSize != 0) { + dctx->ddictLocal = ZSTD_createDDict_advanced(dict, dictSize, dictLoadMethod, dictContentType, dctx->customMem); + RETURN_ERROR_IF(dctx->ddictLocal == NULL, memory_allocation, "NULL pointer!"); + dctx->ddict = dctx->ddictLocal; + dctx->dictUses = ZSTD_use_indefinitely; + } + return 0; +} + +size_t ZSTD_DCtx_loadDictionary_byReference(ZSTD_DCtx* dctx, const void* dict, size_t dictSize) +{ + return ZSTD_DCtx_loadDictionary_advanced(dctx, dict, dictSize, ZSTD_dlm_byRef, ZSTD_dct_auto); +} + +size_t ZSTD_DCtx_loadDictionary(ZSTD_DCtx* dctx, const void* dict, size_t dictSize) +{ + return ZSTD_DCtx_loadDictionary_advanced(dctx, dict, dictSize, ZSTD_dlm_byCopy, ZSTD_dct_auto); +} + +size_t ZSTD_DCtx_refPrefix_advanced(ZSTD_DCtx* dctx, const void* prefix, size_t prefixSize, ZSTD_dictContentType_e dictContentType) +{ + FORWARD_IF_ERROR(ZSTD_DCtx_loadDictionary_advanced(dctx, prefix, prefixSize, ZSTD_dlm_byRef, dictContentType), ""); + dctx->dictUses = ZSTD_use_once; + return 0; +} + +size_t ZSTD_DCtx_refPrefix(ZSTD_DCtx* dctx, const void* prefix, size_t prefixSize) +{ + return ZSTD_DCtx_refPrefix_advanced(dctx, prefix, prefixSize, ZSTD_dct_rawContent); +} + + +/* ZSTD_initDStream_usingDict() : + * return : expected size, aka ZSTD_startingInputLength(). + * this function cannot fail */ +size_t ZSTD_initDStream_usingDict(ZSTD_DStream* zds, const void* dict, size_t dictSize) +{ + DEBUGLOG(4, "ZSTD_initDStream_usingDict"); + FORWARD_IF_ERROR( ZSTD_DCtx_reset(zds, ZSTD_reset_session_only) , ""); + FORWARD_IF_ERROR( ZSTD_DCtx_loadDictionary(zds, dict, dictSize) , ""); + return ZSTD_startingInputLength(zds->format); +} + +/* note : this variant can't fail */ +size_t ZSTD_initDStream(ZSTD_DStream* zds) +{ + DEBUGLOG(4, "ZSTD_initDStream"); + FORWARD_IF_ERROR(ZSTD_DCtx_reset(zds, ZSTD_reset_session_only), ""); + FORWARD_IF_ERROR(ZSTD_DCtx_refDDict(zds, NULL), ""); + return ZSTD_startingInputLength(zds->format); +} + +/* ZSTD_initDStream_usingDDict() : + * ddict will just be referenced, and must outlive decompression session + * this function cannot fail */ +size_t ZSTD_initDStream_usingDDict(ZSTD_DStream* dctx, const ZSTD_DDict* ddict) +{ + DEBUGLOG(4, "ZSTD_initDStream_usingDDict"); + FORWARD_IF_ERROR( ZSTD_DCtx_reset(dctx, ZSTD_reset_session_only) , ""); + FORWARD_IF_ERROR( ZSTD_DCtx_refDDict(dctx, ddict) , ""); + return ZSTD_startingInputLength(dctx->format); +} + +/* ZSTD_resetDStream() : + * return : expected size, aka ZSTD_startingInputLength(). + * this function cannot fail */ +size_t ZSTD_resetDStream(ZSTD_DStream* dctx) +{ + DEBUGLOG(4, "ZSTD_resetDStream"); + FORWARD_IF_ERROR(ZSTD_DCtx_reset(dctx, ZSTD_reset_session_only), ""); + return ZSTD_startingInputLength(dctx->format); +} + + +size_t ZSTD_DCtx_refDDict(ZSTD_DCtx* dctx, const ZSTD_DDict* ddict) +{ + RETURN_ERROR_IF(dctx->streamStage != zdss_init, stage_wrong, ""); + ZSTD_clearDict(dctx); + if (ddict) { + dctx->ddict = ddict; + dctx->dictUses = ZSTD_use_indefinitely; + if (dctx->refMultipleDDicts == ZSTD_rmd_refMultipleDDicts) { + if (dctx->ddictSet == NULL) { + dctx->ddictSet = ZSTD_createDDictHashSet(dctx->customMem); + if (!dctx->ddictSet) { + RETURN_ERROR(memory_allocation, "Failed to allocate memory for hash set!"); + } + } + assert(!dctx->staticSize); /* Impossible: ddictSet cannot have been allocated if static dctx */ + FORWARD_IF_ERROR(ZSTD_DDictHashSet_addDDict(dctx->ddictSet, ddict, dctx->customMem), ""); + } + } + return 0; +} + +/* ZSTD_DCtx_setMaxWindowSize() : + * note : no direct equivalence in ZSTD_DCtx_setParameter, + * since this version sets windowSize, and the other sets windowLog */ +size_t ZSTD_DCtx_setMaxWindowSize(ZSTD_DCtx* dctx, size_t maxWindowSize) +{ + ZSTD_bounds const bounds = ZSTD_dParam_getBounds(ZSTD_d_windowLogMax); + size_t const min = (size_t)1 << bounds.lowerBound; + size_t const max = (size_t)1 << bounds.upperBound; + RETURN_ERROR_IF(dctx->streamStage != zdss_init, stage_wrong, ""); + RETURN_ERROR_IF(maxWindowSize < min, parameter_outOfBound, ""); + RETURN_ERROR_IF(maxWindowSize > max, parameter_outOfBound, ""); + dctx->maxWindowSize = maxWindowSize; + return 0; +} + +size_t ZSTD_DCtx_setFormat(ZSTD_DCtx* dctx, ZSTD_format_e format) +{ + return ZSTD_DCtx_setParameter(dctx, ZSTD_d_format, (int)format); +} + +ZSTD_bounds ZSTD_dParam_getBounds(ZSTD_dParameter dParam) +{ + ZSTD_bounds bounds = { 0, 0, 0 }; + switch(dParam) { + case ZSTD_d_windowLogMax: + bounds.lowerBound = ZSTD_WINDOWLOG_ABSOLUTEMIN; + bounds.upperBound = ZSTD_WINDOWLOG_MAX; + return bounds; + case ZSTD_d_format: + bounds.lowerBound = (int)ZSTD_f_zstd1; + bounds.upperBound = (int)ZSTD_f_zstd1_magicless; + ZSTD_STATIC_ASSERT(ZSTD_f_zstd1 < ZSTD_f_zstd1_magicless); + return bounds; + case ZSTD_d_stableOutBuffer: + bounds.lowerBound = (int)ZSTD_bm_buffered; + bounds.upperBound = (int)ZSTD_bm_stable; + return bounds; + case ZSTD_d_forceIgnoreChecksum: + bounds.lowerBound = (int)ZSTD_d_validateChecksum; + bounds.upperBound = (int)ZSTD_d_ignoreChecksum; + return bounds; + case ZSTD_d_refMultipleDDicts: + bounds.lowerBound = (int)ZSTD_rmd_refSingleDDict; + bounds.upperBound = (int)ZSTD_rmd_refMultipleDDicts; + return bounds; + case ZSTD_d_disableHuffmanAssembly: + bounds.lowerBound = 0; + bounds.upperBound = 1; + return bounds; + case ZSTD_d_maxBlockSize: + bounds.lowerBound = ZSTD_BLOCKSIZE_MAX_MIN; + bounds.upperBound = ZSTD_BLOCKSIZE_MAX; + return bounds; + + default:; + } + bounds.error = ERROR(parameter_unsupported); + return bounds; +} + +/* ZSTD_dParam_withinBounds: + * @return 1 if value is within dParam bounds, + * 0 otherwise */ +static int ZSTD_dParam_withinBounds(ZSTD_dParameter dParam, int value) +{ + ZSTD_bounds const bounds = ZSTD_dParam_getBounds(dParam); + if (ZSTD_isError(bounds.error)) return 0; + if (value < bounds.lowerBound) return 0; + if (value > bounds.upperBound) return 0; + return 1; +} + +#define CHECK_DBOUNDS(p,v) { \ + RETURN_ERROR_IF(!ZSTD_dParam_withinBounds(p, v), parameter_outOfBound, ""); \ +} + +size_t ZSTD_DCtx_getParameter(ZSTD_DCtx* dctx, ZSTD_dParameter param, int* value) +{ + switch (param) { + case ZSTD_d_windowLogMax: + *value = (int)ZSTD_highbit32((U32)dctx->maxWindowSize); + return 0; + case ZSTD_d_format: + *value = (int)dctx->format; + return 0; + case ZSTD_d_stableOutBuffer: + *value = (int)dctx->outBufferMode; + return 0; + case ZSTD_d_forceIgnoreChecksum: + *value = (int)dctx->forceIgnoreChecksum; + return 0; + case ZSTD_d_refMultipleDDicts: + *value = (int)dctx->refMultipleDDicts; + return 0; + case ZSTD_d_disableHuffmanAssembly: + *value = (int)dctx->disableHufAsm; + return 0; + case ZSTD_d_maxBlockSize: + *value = dctx->maxBlockSizeParam; + return 0; + default:; + } + RETURN_ERROR(parameter_unsupported, ""); +} + +size_t ZSTD_DCtx_setParameter(ZSTD_DCtx* dctx, ZSTD_dParameter dParam, int value) +{ + RETURN_ERROR_IF(dctx->streamStage != zdss_init, stage_wrong, ""); + switch(dParam) { + case ZSTD_d_windowLogMax: + if (value == 0) value = ZSTD_WINDOWLOG_LIMIT_DEFAULT; + CHECK_DBOUNDS(ZSTD_d_windowLogMax, value); + dctx->maxWindowSize = ((size_t)1) << value; + return 0; + case ZSTD_d_format: + CHECK_DBOUNDS(ZSTD_d_format, value); + dctx->format = (ZSTD_format_e)value; + return 0; + case ZSTD_d_stableOutBuffer: + CHECK_DBOUNDS(ZSTD_d_stableOutBuffer, value); + dctx->outBufferMode = (ZSTD_bufferMode_e)value; + return 0; + case ZSTD_d_forceIgnoreChecksum: + CHECK_DBOUNDS(ZSTD_d_forceIgnoreChecksum, value); + dctx->forceIgnoreChecksum = (ZSTD_forceIgnoreChecksum_e)value; + return 0; + case ZSTD_d_refMultipleDDicts: + CHECK_DBOUNDS(ZSTD_d_refMultipleDDicts, value); + if (dctx->staticSize != 0) { + RETURN_ERROR(parameter_unsupported, "Static dctx does not support multiple DDicts!"); + } + dctx->refMultipleDDicts = (ZSTD_refMultipleDDicts_e)value; + return 0; + case ZSTD_d_disableHuffmanAssembly: + CHECK_DBOUNDS(ZSTD_d_disableHuffmanAssembly, value); + dctx->disableHufAsm = value != 0; + return 0; + case ZSTD_d_maxBlockSize: + if (value != 0) CHECK_DBOUNDS(ZSTD_d_maxBlockSize, value); + dctx->maxBlockSizeParam = value; + return 0; + default:; + } + RETURN_ERROR(parameter_unsupported, ""); +} + +size_t ZSTD_DCtx_reset(ZSTD_DCtx* dctx, ZSTD_ResetDirective reset) +{ + if ( (reset == ZSTD_reset_session_only) + || (reset == ZSTD_reset_session_and_parameters) ) { + dctx->streamStage = zdss_init; + dctx->noForwardProgress = 0; + dctx->isFrameDecompression = 1; + } + if ( (reset == ZSTD_reset_parameters) + || (reset == ZSTD_reset_session_and_parameters) ) { + RETURN_ERROR_IF(dctx->streamStage != zdss_init, stage_wrong, ""); + ZSTD_clearDict(dctx); + ZSTD_DCtx_resetParameters(dctx); + } + return 0; +} + + +size_t ZSTD_sizeof_DStream(const ZSTD_DStream* dctx) +{ + return ZSTD_sizeof_DCtx(dctx); +} + +static size_t ZSTD_decodingBufferSize_internal(unsigned long long windowSize, unsigned long long frameContentSize, size_t blockSizeMax) +{ + size_t const blockSize = MIN((size_t)MIN(windowSize, ZSTD_BLOCKSIZE_MAX), blockSizeMax); + /* We need blockSize + WILDCOPY_OVERLENGTH worth of buffer so that if a block + * ends at windowSize + WILDCOPY_OVERLENGTH + 1 bytes, we can start writing + * the block at the beginning of the output buffer, and maintain a full window. + * + * We need another blockSize worth of buffer so that we can store split + * literals at the end of the block without overwriting the extDict window. + */ + unsigned long long const neededRBSize = windowSize + (blockSize * 2) + (WILDCOPY_OVERLENGTH * 2); + unsigned long long const neededSize = MIN(frameContentSize, neededRBSize); + size_t const minRBSize = (size_t) neededSize; + RETURN_ERROR_IF((unsigned long long)minRBSize != neededSize, + frameParameter_windowTooLarge, ""); + return minRBSize; +} + +size_t ZSTD_decodingBufferSize_min(unsigned long long windowSize, unsigned long long frameContentSize) +{ + return ZSTD_decodingBufferSize_internal(windowSize, frameContentSize, ZSTD_BLOCKSIZE_MAX); +} + +size_t ZSTD_estimateDStreamSize(size_t windowSize) +{ + size_t const blockSize = MIN(windowSize, ZSTD_BLOCKSIZE_MAX); + size_t const inBuffSize = blockSize; /* no block can be larger */ + size_t const outBuffSize = ZSTD_decodingBufferSize_min(windowSize, ZSTD_CONTENTSIZE_UNKNOWN); + return ZSTD_estimateDCtxSize() + inBuffSize + outBuffSize; +} + +size_t ZSTD_estimateDStreamSize_fromFrame(const void* src, size_t srcSize) +{ + U32 const windowSizeMax = 1U << ZSTD_WINDOWLOG_MAX; /* note : should be user-selectable, but requires an additional parameter (or a dctx) */ + ZSTD_frameHeader zfh; + size_t const err = ZSTD_getFrameHeader(&zfh, src, srcSize); + if (ZSTD_isError(err)) return err; + RETURN_ERROR_IF(err>0, srcSize_wrong, ""); + RETURN_ERROR_IF(zfh.windowSize > windowSizeMax, + frameParameter_windowTooLarge, ""); + return ZSTD_estimateDStreamSize((size_t)zfh.windowSize); +} + + +/* ***** Decompression ***** */ + +static int ZSTD_DCtx_isOverflow(ZSTD_DStream* zds, size_t const neededInBuffSize, size_t const neededOutBuffSize) +{ + return (zds->inBuffSize + zds->outBuffSize) >= (neededInBuffSize + neededOutBuffSize) * ZSTD_WORKSPACETOOLARGE_FACTOR; +} + +static void ZSTD_DCtx_updateOversizedDuration(ZSTD_DStream* zds, size_t const neededInBuffSize, size_t const neededOutBuffSize) +{ + if (ZSTD_DCtx_isOverflow(zds, neededInBuffSize, neededOutBuffSize)) + zds->oversizedDuration++; + else + zds->oversizedDuration = 0; +} + +static int ZSTD_DCtx_isOversizedTooLong(ZSTD_DStream* zds) +{ + return zds->oversizedDuration >= ZSTD_WORKSPACETOOLARGE_MAXDURATION; +} + +/* Checks that the output buffer hasn't changed if ZSTD_obm_stable is used. */ +static size_t ZSTD_checkOutBuffer(ZSTD_DStream const* zds, ZSTD_outBuffer const* output) +{ + ZSTD_outBuffer const expect = zds->expectedOutBuffer; + /* No requirement when ZSTD_obm_stable is not enabled. */ + if (zds->outBufferMode != ZSTD_bm_stable) + return 0; + /* Any buffer is allowed in zdss_init, this must be the same for every other call until + * the context is reset. + */ + if (zds->streamStage == zdss_init) + return 0; + /* The buffer must match our expectation exactly. */ + if (expect.dst == output->dst && expect.pos == output->pos && expect.size == output->size) + return 0; + RETURN_ERROR(dstBuffer_wrong, "ZSTD_d_stableOutBuffer enabled but output differs!"); +} + +/* Calls ZSTD_decompressContinue() with the right parameters for ZSTD_decompressStream() + * and updates the stage and the output buffer state. This call is extracted so it can be + * used both when reading directly from the ZSTD_inBuffer, and in buffered input mode. + * NOTE: You must break after calling this function since the streamStage is modified. + */ +static size_t ZSTD_decompressContinueStream( + ZSTD_DStream* zds, char** op, char* oend, + void const* src, size_t srcSize) { + int const isSkipFrame = ZSTD_isSkipFrame(zds); + if (zds->outBufferMode == ZSTD_bm_buffered) { + size_t const dstSize = isSkipFrame ? 0 : zds->outBuffSize - zds->outStart; + size_t const decodedSize = ZSTD_decompressContinue(zds, + zds->outBuff + zds->outStart, dstSize, src, srcSize); + FORWARD_IF_ERROR(decodedSize, ""); + if (!decodedSize && !isSkipFrame) { + zds->streamStage = zdss_read; + } else { + zds->outEnd = zds->outStart + decodedSize; + zds->streamStage = zdss_flush; + } + } else { + /* Write directly into the output buffer */ + size_t const dstSize = isSkipFrame ? 0 : (size_t)(oend - *op); + size_t const decodedSize = ZSTD_decompressContinue(zds, *op, dstSize, src, srcSize); + FORWARD_IF_ERROR(decodedSize, ""); + *op += decodedSize; + /* Flushing is not needed. */ + zds->streamStage = zdss_read; + assert(*op <= oend); + assert(zds->outBufferMode == ZSTD_bm_stable); + } + return 0; +} + +size_t ZSTD_decompressStream(ZSTD_DStream* zds, ZSTD_outBuffer* output, ZSTD_inBuffer* input) +{ + const char* const src = (const char*)input->src; + const char* const istart = input->pos != 0 ? src + input->pos : src; + const char* const iend = input->size != 0 ? src + input->size : src; + const char* ip = istart; + char* const dst = (char*)output->dst; + char* const ostart = output->pos != 0 ? dst + output->pos : dst; + char* const oend = output->size != 0 ? dst + output->size : dst; + char* op = ostart; + U32 someMoreWork = 1; + + DEBUGLOG(5, "ZSTD_decompressStream"); + RETURN_ERROR_IF( + input->pos > input->size, + srcSize_wrong, + "forbidden. in: pos: %u vs size: %u", + (U32)input->pos, (U32)input->size); + RETURN_ERROR_IF( + output->pos > output->size, + dstSize_tooSmall, + "forbidden. out: pos: %u vs size: %u", + (U32)output->pos, (U32)output->size); + DEBUGLOG(5, "input size : %u", (U32)(input->size - input->pos)); + FORWARD_IF_ERROR(ZSTD_checkOutBuffer(zds, output), ""); + + while (someMoreWork) { + switch(zds->streamStage) + { + case zdss_init : + DEBUGLOG(5, "stage zdss_init => transparent reset "); + zds->streamStage = zdss_loadHeader; + zds->lhSize = zds->inPos = zds->outStart = zds->outEnd = 0; +#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT>=1) + zds->legacyVersion = 0; +#endif + zds->hostageByte = 0; + zds->expectedOutBuffer = *output; + ZSTD_FALLTHROUGH; + + case zdss_loadHeader : + DEBUGLOG(5, "stage zdss_loadHeader (srcSize : %u)", (U32)(iend - ip)); +#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT>=1) + if (zds->legacyVersion) { + RETURN_ERROR_IF(zds->staticSize, memory_allocation, + "legacy support is incompatible with static dctx"); + { size_t const hint = ZSTD_decompressLegacyStream(zds->legacyContext, zds->legacyVersion, output, input); + if (hint==0) zds->streamStage = zdss_init; + return hint; + } } +#endif + { size_t const hSize = ZSTD_getFrameHeader_advanced(&zds->fParams, zds->headerBuffer, zds->lhSize, zds->format); + if (zds->refMultipleDDicts && zds->ddictSet) { + ZSTD_DCtx_selectFrameDDict(zds); + } + if (ZSTD_isError(hSize)) { +#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT>=1) + U32 const legacyVersion = ZSTD_isLegacy(istart, iend-istart); + if (legacyVersion) { + ZSTD_DDict const* const ddict = ZSTD_getDDict(zds); + const void* const dict = ddict ? ZSTD_DDict_dictContent(ddict) : NULL; + size_t const dictSize = ddict ? ZSTD_DDict_dictSize(ddict) : 0; + DEBUGLOG(5, "ZSTD_decompressStream: detected legacy version v0.%u", legacyVersion); + RETURN_ERROR_IF(zds->staticSize, memory_allocation, + "legacy support is incompatible with static dctx"); + FORWARD_IF_ERROR(ZSTD_initLegacyStream(&zds->legacyContext, + zds->previousLegacyVersion, legacyVersion, + dict, dictSize), ""); + zds->legacyVersion = zds->previousLegacyVersion = legacyVersion; + { size_t const hint = ZSTD_decompressLegacyStream(zds->legacyContext, legacyVersion, output, input); + if (hint==0) zds->streamStage = zdss_init; /* or stay in stage zdss_loadHeader */ + return hint; + } } +#endif + return hSize; /* error */ + } + if (hSize != 0) { /* need more input */ + size_t const toLoad = hSize - zds->lhSize; /* if hSize!=0, hSize > zds->lhSize */ + size_t const remainingInput = (size_t)(iend-ip); + assert(iend >= ip); + if (toLoad > remainingInput) { /* not enough input to load full header */ + if (remainingInput > 0) { + ZSTD_memcpy(zds->headerBuffer + zds->lhSize, ip, remainingInput); + zds->lhSize += remainingInput; + } + input->pos = input->size; + /* check first few bytes */ + FORWARD_IF_ERROR( + ZSTD_getFrameHeader_advanced(&zds->fParams, zds->headerBuffer, zds->lhSize, zds->format), + "First few bytes detected incorrect" ); + /* return hint input size */ + return (MAX((size_t)ZSTD_FRAMEHEADERSIZE_MIN(zds->format), hSize) - zds->lhSize) + ZSTD_blockHeaderSize; /* remaining header bytes + next block header */ + } + assert(ip != NULL); + ZSTD_memcpy(zds->headerBuffer + zds->lhSize, ip, toLoad); zds->lhSize = hSize; ip += toLoad; + break; + } } + + /* check for single-pass mode opportunity */ + if (zds->fParams.frameContentSize != ZSTD_CONTENTSIZE_UNKNOWN + && zds->fParams.frameType != ZSTD_skippableFrame + && (U64)(size_t)(oend-op) >= zds->fParams.frameContentSize) { + size_t const cSize = ZSTD_findFrameCompressedSize_advanced(istart, (size_t)(iend-istart), zds->format); + if (cSize <= (size_t)(iend-istart)) { + /* shortcut : using single-pass mode */ + size_t const decompressedSize = ZSTD_decompress_usingDDict(zds, op, (size_t)(oend-op), istart, cSize, ZSTD_getDDict(zds)); + if (ZSTD_isError(decompressedSize)) return decompressedSize; + DEBUGLOG(4, "shortcut to single-pass ZSTD_decompress_usingDDict()"); + assert(istart != NULL); + ip = istart + cSize; + op = op ? op + decompressedSize : op; /* can occur if frameContentSize = 0 (empty frame) */ + zds->expected = 0; + zds->streamStage = zdss_init; + someMoreWork = 0; + break; + } } + + /* Check output buffer is large enough for ZSTD_odm_stable. */ + if (zds->outBufferMode == ZSTD_bm_stable + && zds->fParams.frameType != ZSTD_skippableFrame + && zds->fParams.frameContentSize != ZSTD_CONTENTSIZE_UNKNOWN + && (U64)(size_t)(oend-op) < zds->fParams.frameContentSize) { + RETURN_ERROR(dstSize_tooSmall, "ZSTD_obm_stable passed but ZSTD_outBuffer is too small"); + } + + /* Consume header (see ZSTDds_decodeFrameHeader) */ + DEBUGLOG(4, "Consume header"); + FORWARD_IF_ERROR(ZSTD_decompressBegin_usingDDict(zds, ZSTD_getDDict(zds)), ""); + + if (zds->format == ZSTD_f_zstd1 + && (MEM_readLE32(zds->headerBuffer) & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) { /* skippable frame */ + zds->expected = MEM_readLE32(zds->headerBuffer + ZSTD_FRAMEIDSIZE); + zds->stage = ZSTDds_skipFrame; + } else { + FORWARD_IF_ERROR(ZSTD_decodeFrameHeader(zds, zds->headerBuffer, zds->lhSize), ""); + zds->expected = ZSTD_blockHeaderSize; + zds->stage = ZSTDds_decodeBlockHeader; + } + + /* control buffer memory usage */ + DEBUGLOG(4, "Control max memory usage (%u KB <= max %u KB)", + (U32)(zds->fParams.windowSize >>10), + (U32)(zds->maxWindowSize >> 10) ); + zds->fParams.windowSize = MAX(zds->fParams.windowSize, 1U << ZSTD_WINDOWLOG_ABSOLUTEMIN); + RETURN_ERROR_IF(zds->fParams.windowSize > zds->maxWindowSize, + frameParameter_windowTooLarge, ""); + if (zds->maxBlockSizeParam != 0) + zds->fParams.blockSizeMax = MIN(zds->fParams.blockSizeMax, (unsigned)zds->maxBlockSizeParam); + + /* Adapt buffer sizes to frame header instructions */ + { size_t const neededInBuffSize = MAX(zds->fParams.blockSizeMax, 4 /* frame checksum */); + size_t const neededOutBuffSize = zds->outBufferMode == ZSTD_bm_buffered + ? ZSTD_decodingBufferSize_internal(zds->fParams.windowSize, zds->fParams.frameContentSize, zds->fParams.blockSizeMax) + : 0; + + ZSTD_DCtx_updateOversizedDuration(zds, neededInBuffSize, neededOutBuffSize); + + { int const tooSmall = (zds->inBuffSize < neededInBuffSize) || (zds->outBuffSize < neededOutBuffSize); + int const tooLarge = ZSTD_DCtx_isOversizedTooLong(zds); + + if (tooSmall || tooLarge) { + size_t const bufferSize = neededInBuffSize + neededOutBuffSize; + DEBUGLOG(4, "inBuff : from %u to %u", + (U32)zds->inBuffSize, (U32)neededInBuffSize); + DEBUGLOG(4, "outBuff : from %u to %u", + (U32)zds->outBuffSize, (U32)neededOutBuffSize); + if (zds->staticSize) { /* static DCtx */ + DEBUGLOG(4, "staticSize : %u", (U32)zds->staticSize); + assert(zds->staticSize >= sizeof(ZSTD_DCtx)); /* controlled at init */ + RETURN_ERROR_IF( + bufferSize > zds->staticSize - sizeof(ZSTD_DCtx), + memory_allocation, ""); + } else { + ZSTD_customFree(zds->inBuff, zds->customMem); + zds->inBuffSize = 0; + zds->outBuffSize = 0; + zds->inBuff = (char*)ZSTD_customMalloc(bufferSize, zds->customMem); + RETURN_ERROR_IF(zds->inBuff == NULL, memory_allocation, ""); + } + zds->inBuffSize = neededInBuffSize; + zds->outBuff = zds->inBuff + zds->inBuffSize; + zds->outBuffSize = neededOutBuffSize; + } } } + zds->streamStage = zdss_read; + ZSTD_FALLTHROUGH; + + case zdss_read: + DEBUGLOG(5, "stage zdss_read"); + { size_t const neededInSize = ZSTD_nextSrcSizeToDecompressWithInputSize(zds, (size_t)(iend - ip)); + DEBUGLOG(5, "neededInSize = %u", (U32)neededInSize); + if (neededInSize==0) { /* end of frame */ + zds->streamStage = zdss_init; + someMoreWork = 0; + break; + } + if ((size_t)(iend-ip) >= neededInSize) { /* decode directly from src */ + FORWARD_IF_ERROR(ZSTD_decompressContinueStream(zds, &op, oend, ip, neededInSize), ""); + assert(ip != NULL); + ip += neededInSize; + /* Function modifies the stage so we must break */ + break; + } } + if (ip==iend) { someMoreWork = 0; break; } /* no more input */ + zds->streamStage = zdss_load; + ZSTD_FALLTHROUGH; + + case zdss_load: + { size_t const neededInSize = ZSTD_nextSrcSizeToDecompress(zds); + size_t const toLoad = neededInSize - zds->inPos; + int const isSkipFrame = ZSTD_isSkipFrame(zds); + size_t loadedSize; + /* At this point we shouldn't be decompressing a block that we can stream. */ + assert(neededInSize == ZSTD_nextSrcSizeToDecompressWithInputSize(zds, (size_t)(iend - ip))); + if (isSkipFrame) { + loadedSize = MIN(toLoad, (size_t)(iend-ip)); + } else { + RETURN_ERROR_IF(toLoad > zds->inBuffSize - zds->inPos, + corruption_detected, + "should never happen"); + loadedSize = ZSTD_limitCopy(zds->inBuff + zds->inPos, toLoad, ip, (size_t)(iend-ip)); + } + if (loadedSize != 0) { + /* ip may be NULL */ + ip += loadedSize; + zds->inPos += loadedSize; + } + if (loadedSize < toLoad) { someMoreWork = 0; break; } /* not enough input, wait for more */ + + /* decode loaded input */ + zds->inPos = 0; /* input is consumed */ + FORWARD_IF_ERROR(ZSTD_decompressContinueStream(zds, &op, oend, zds->inBuff, neededInSize), ""); + /* Function modifies the stage so we must break */ + break; + } + case zdss_flush: + { + size_t const toFlushSize = zds->outEnd - zds->outStart; + size_t const flushedSize = ZSTD_limitCopy(op, (size_t)(oend-op), zds->outBuff + zds->outStart, toFlushSize); + + op = op ? op + flushedSize : op; + + zds->outStart += flushedSize; + if (flushedSize == toFlushSize) { /* flush completed */ + zds->streamStage = zdss_read; + if ( (zds->outBuffSize < zds->fParams.frameContentSize) + && (zds->outStart + zds->fParams.blockSizeMax > zds->outBuffSize) ) { + DEBUGLOG(5, "restart filling outBuff from beginning (left:%i, needed:%u)", + (int)(zds->outBuffSize - zds->outStart), + (U32)zds->fParams.blockSizeMax); + zds->outStart = zds->outEnd = 0; + } + break; + } } + /* cannot complete flush */ + someMoreWork = 0; + break; + + default: + assert(0); /* impossible */ + RETURN_ERROR(GENERIC, "impossible to reach"); /* some compilers require default to do something */ + } } + + /* result */ + input->pos = (size_t)(ip - (const char*)(input->src)); + output->pos = (size_t)(op - (char*)(output->dst)); + + /* Update the expected output buffer for ZSTD_obm_stable. */ + zds->expectedOutBuffer = *output; + + if ((ip==istart) && (op==ostart)) { /* no forward progress */ + zds->noForwardProgress ++; + if (zds->noForwardProgress >= ZSTD_NO_FORWARD_PROGRESS_MAX) { + RETURN_ERROR_IF(op==oend, noForwardProgress_destFull, ""); + RETURN_ERROR_IF(ip==iend, noForwardProgress_inputEmpty, ""); + assert(0); + } + } else { + zds->noForwardProgress = 0; + } + { size_t nextSrcSizeHint = ZSTD_nextSrcSizeToDecompress(zds); + if (!nextSrcSizeHint) { /* frame fully decoded */ + if (zds->outEnd == zds->outStart) { /* output fully flushed */ + if (zds->hostageByte) { + if (input->pos >= input->size) { + /* can't release hostage (not present) */ + zds->streamStage = zdss_read; + return 1; + } + input->pos++; /* release hostage */ + } /* zds->hostageByte */ + return 0; + } /* zds->outEnd == zds->outStart */ + if (!zds->hostageByte) { /* output not fully flushed; keep last byte as hostage; will be released when all output is flushed */ + input->pos--; /* note : pos > 0, otherwise, impossible to finish reading last block */ + zds->hostageByte=1; + } + return 1; + } /* nextSrcSizeHint==0 */ + nextSrcSizeHint += ZSTD_blockHeaderSize * (ZSTD_nextInputType(zds) == ZSTDnit_block); /* preload header of next block */ + assert(zds->inPos <= nextSrcSizeHint); + nextSrcSizeHint -= zds->inPos; /* part already loaded*/ + return nextSrcSizeHint; + } +} + +size_t ZSTD_decompressStream_simpleArgs ( + ZSTD_DCtx* dctx, + void* dst, size_t dstCapacity, size_t* dstPos, + const void* src, size_t srcSize, size_t* srcPos) +{ + ZSTD_outBuffer output; + ZSTD_inBuffer input; + output.dst = dst; + output.size = dstCapacity; + output.pos = *dstPos; + input.src = src; + input.size = srcSize; + input.pos = *srcPos; + { size_t const cErr = ZSTD_decompressStream(dctx, &output, &input); + *dstPos = output.pos; + *srcPos = input.pos; + return cErr; + } +} +/**** ended inlining decompress/zstd_decompress.c ****/ +/**** start inlining decompress/zstd_decompress_block.c ****/ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ + +/* zstd_decompress_block : + * this module takes care of decompressing _compressed_ block */ + +/*-******************************************************* +* Dependencies +*********************************************************/ +/**** skipping file: ../common/zstd_deps.h ****/ +/**** skipping file: ../common/compiler.h ****/ +/**** skipping file: ../common/cpu.h ****/ +/**** skipping file: ../common/mem.h ****/ +#define FSE_STATIC_LINKING_ONLY +/**** skipping file: ../common/fse.h ****/ +/**** skipping file: ../common/huf.h ****/ +/**** skipping file: ../common/zstd_internal.h ****/ +/**** skipping file: zstd_decompress_internal.h ****/ +/**** skipping file: zstd_ddict.h ****/ +/**** skipping file: zstd_decompress_block.h ****/ +/**** skipping file: ../common/bits.h ****/ + +/*_******************************************************* +* Macros +**********************************************************/ + +/* These two optional macros force the use one way or another of the two + * ZSTD_decompressSequences implementations. You can't force in both directions + * at the same time. + */ +#if defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT) && \ + defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG) +#error "Cannot force the use of the short and the long ZSTD_decompressSequences variants!" +#endif + + +/*_******************************************************* +* Memory operations +**********************************************************/ +static void ZSTD_copy4(void* dst, const void* src) { ZSTD_memcpy(dst, src, 4); } + + +/*-************************************************************* + * Block decoding + ***************************************************************/ + +static size_t ZSTD_blockSizeMax(ZSTD_DCtx const* dctx) +{ + size_t const blockSizeMax = dctx->isFrameDecompression ? dctx->fParams.blockSizeMax : ZSTD_BLOCKSIZE_MAX; + assert(blockSizeMax <= ZSTD_BLOCKSIZE_MAX); + return blockSizeMax; +} + +/*! ZSTD_getcBlockSize() : + * Provides the size of compressed block from block header `src` */ +size_t ZSTD_getcBlockSize(const void* src, size_t srcSize, + blockProperties_t* bpPtr) +{ + RETURN_ERROR_IF(srcSize < ZSTD_blockHeaderSize, srcSize_wrong, ""); + + { U32 const cBlockHeader = MEM_readLE24(src); + U32 const cSize = cBlockHeader >> 3; + bpPtr->lastBlock = cBlockHeader & 1; + bpPtr->blockType = (blockType_e)((cBlockHeader >> 1) & 3); + bpPtr->origSize = cSize; /* only useful for RLE */ + if (bpPtr->blockType == bt_rle) return 1; + RETURN_ERROR_IF(bpPtr->blockType == bt_reserved, corruption_detected, ""); + return cSize; + } +} + +/* Allocate buffer for literals, either overlapping current dst, or split between dst and litExtraBuffer, or stored entirely within litExtraBuffer */ +static void ZSTD_allocateLiteralsBuffer(ZSTD_DCtx* dctx, void* const dst, const size_t dstCapacity, const size_t litSize, + const streaming_operation streaming, const size_t expectedWriteSize, const unsigned splitImmediately) +{ + size_t const blockSizeMax = ZSTD_blockSizeMax(dctx); + assert(litSize <= blockSizeMax); + assert(dctx->isFrameDecompression || streaming == not_streaming); + assert(expectedWriteSize <= blockSizeMax); + if (streaming == not_streaming && dstCapacity > blockSizeMax + WILDCOPY_OVERLENGTH + litSize + WILDCOPY_OVERLENGTH) { + /* If we aren't streaming, we can just put the literals after the output + * of the current block. We don't need to worry about overwriting the + * extDict of our window, because it doesn't exist. + * So if we have space after the end of the block, just put it there. + */ + dctx->litBuffer = (BYTE*)dst + blockSizeMax + WILDCOPY_OVERLENGTH; + dctx->litBufferEnd = dctx->litBuffer + litSize; + dctx->litBufferLocation = ZSTD_in_dst; + } else if (litSize <= ZSTD_LITBUFFEREXTRASIZE) { + /* Literals fit entirely within the extra buffer, put them there to avoid + * having to split the literals. + */ + dctx->litBuffer = dctx->litExtraBuffer; + dctx->litBufferEnd = dctx->litBuffer + litSize; + dctx->litBufferLocation = ZSTD_not_in_dst; + } else { + assert(blockSizeMax > ZSTD_LITBUFFEREXTRASIZE); + /* Literals must be split between the output block and the extra lit + * buffer. We fill the extra lit buffer with the tail of the literals, + * and put the rest of the literals at the end of the block, with + * WILDCOPY_OVERLENGTH of buffer room to allow for overreads. + * This MUST not write more than our maxBlockSize beyond dst, because in + * streaming mode, that could overwrite part of our extDict window. + */ + if (splitImmediately) { + /* won't fit in litExtraBuffer, so it will be split between end of dst and extra buffer */ + dctx->litBuffer = (BYTE*)dst + expectedWriteSize - litSize + ZSTD_LITBUFFEREXTRASIZE - WILDCOPY_OVERLENGTH; + dctx->litBufferEnd = dctx->litBuffer + litSize - ZSTD_LITBUFFEREXTRASIZE; + } else { + /* initially this will be stored entirely in dst during huffman decoding, it will partially be shifted to litExtraBuffer after */ + dctx->litBuffer = (BYTE*)dst + expectedWriteSize - litSize; + dctx->litBufferEnd = (BYTE*)dst + expectedWriteSize; + } + dctx->litBufferLocation = ZSTD_split; + assert(dctx->litBufferEnd <= (BYTE*)dst + expectedWriteSize); + } +} + +/*! ZSTD_decodeLiteralsBlock() : + * Where it is possible to do so without being stomped by the output during decompression, the literals block will be stored + * in the dstBuffer. If there is room to do so, it will be stored in full in the excess dst space after where the current + * block will be output. Otherwise it will be stored at the end of the current dst blockspace, with a small portion being + * stored in dctx->litExtraBuffer to help keep it "ahead" of the current output write. + * + * @return : nb of bytes read from src (< srcSize ) + * note : symbol not declared but exposed for fullbench */ +static size_t ZSTD_decodeLiteralsBlock(ZSTD_DCtx* dctx, + const void* src, size_t srcSize, /* note : srcSize < BLOCKSIZE */ + void* dst, size_t dstCapacity, const streaming_operation streaming) +{ + DEBUGLOG(5, "ZSTD_decodeLiteralsBlock"); + RETURN_ERROR_IF(srcSize < MIN_CBLOCK_SIZE, corruption_detected, ""); + + { const BYTE* const istart = (const BYTE*) src; + symbolEncodingType_e const litEncType = (symbolEncodingType_e)(istart[0] & 3); + size_t const blockSizeMax = ZSTD_blockSizeMax(dctx); + + switch(litEncType) + { + case set_repeat: + DEBUGLOG(5, "set_repeat flag : re-using stats from previous compressed literals block"); + RETURN_ERROR_IF(dctx->litEntropy==0, dictionary_corrupted, ""); + ZSTD_FALLTHROUGH; + + case set_compressed: + RETURN_ERROR_IF(srcSize < 5, corruption_detected, "srcSize >= MIN_CBLOCK_SIZE == 2; here we need up to 5 for case 3"); + { size_t lhSize, litSize, litCSize; + U32 singleStream=0; + U32 const lhlCode = (istart[0] >> 2) & 3; + U32 const lhc = MEM_readLE32(istart); + size_t hufSuccess; + size_t expectedWriteSize = MIN(blockSizeMax, dstCapacity); + int const flags = 0 + | (ZSTD_DCtx_get_bmi2(dctx) ? HUF_flags_bmi2 : 0) + | (dctx->disableHufAsm ? HUF_flags_disableAsm : 0); + switch(lhlCode) + { + case 0: case 1: default: /* note : default is impossible, since lhlCode into [0..3] */ + /* 2 - 2 - 10 - 10 */ + singleStream = !lhlCode; + lhSize = 3; + litSize = (lhc >> 4) & 0x3FF; + litCSize = (lhc >> 14) & 0x3FF; + break; + case 2: + /* 2 - 2 - 14 - 14 */ + lhSize = 4; + litSize = (lhc >> 4) & 0x3FFF; + litCSize = lhc >> 18; + break; + case 3: + /* 2 - 2 - 18 - 18 */ + lhSize = 5; + litSize = (lhc >> 4) & 0x3FFFF; + litCSize = (lhc >> 22) + ((size_t)istart[4] << 10); + break; + } + RETURN_ERROR_IF(litSize > 0 && dst == NULL, dstSize_tooSmall, "NULL not handled"); + RETURN_ERROR_IF(litSize > blockSizeMax, corruption_detected, ""); + if (!singleStream) + RETURN_ERROR_IF(litSize < MIN_LITERALS_FOR_4_STREAMS, literals_headerWrong, + "Not enough literals (%zu) for the 4-streams mode (min %u)", + litSize, MIN_LITERALS_FOR_4_STREAMS); + RETURN_ERROR_IF(litCSize + lhSize > srcSize, corruption_detected, ""); + RETURN_ERROR_IF(expectedWriteSize < litSize , dstSize_tooSmall, ""); + ZSTD_allocateLiteralsBuffer(dctx, dst, dstCapacity, litSize, streaming, expectedWriteSize, 0); + + /* prefetch huffman table if cold */ + if (dctx->ddictIsCold && (litSize > 768 /* heuristic */)) { + PREFETCH_AREA(dctx->HUFptr, sizeof(dctx->entropy.hufTable)); + } + + if (litEncType==set_repeat) { + if (singleStream) { + hufSuccess = HUF_decompress1X_usingDTable( + dctx->litBuffer, litSize, istart+lhSize, litCSize, + dctx->HUFptr, flags); + } else { + assert(litSize >= MIN_LITERALS_FOR_4_STREAMS); + hufSuccess = HUF_decompress4X_usingDTable( + dctx->litBuffer, litSize, istart+lhSize, litCSize, + dctx->HUFptr, flags); + } + } else { + if (singleStream) { +#if defined(HUF_FORCE_DECOMPRESS_X2) + hufSuccess = HUF_decompress1X_DCtx_wksp( + dctx->entropy.hufTable, dctx->litBuffer, litSize, + istart+lhSize, litCSize, dctx->workspace, + sizeof(dctx->workspace), flags); +#else + hufSuccess = HUF_decompress1X1_DCtx_wksp( + dctx->entropy.hufTable, dctx->litBuffer, litSize, + istart+lhSize, litCSize, dctx->workspace, + sizeof(dctx->workspace), flags); +#endif + } else { + hufSuccess = HUF_decompress4X_hufOnly_wksp( + dctx->entropy.hufTable, dctx->litBuffer, litSize, + istart+lhSize, litCSize, dctx->workspace, + sizeof(dctx->workspace), flags); + } + } + if (dctx->litBufferLocation == ZSTD_split) + { + assert(litSize > ZSTD_LITBUFFEREXTRASIZE); + ZSTD_memcpy(dctx->litExtraBuffer, dctx->litBufferEnd - ZSTD_LITBUFFEREXTRASIZE, ZSTD_LITBUFFEREXTRASIZE); + ZSTD_memmove(dctx->litBuffer + ZSTD_LITBUFFEREXTRASIZE - WILDCOPY_OVERLENGTH, dctx->litBuffer, litSize - ZSTD_LITBUFFEREXTRASIZE); + dctx->litBuffer += ZSTD_LITBUFFEREXTRASIZE - WILDCOPY_OVERLENGTH; + dctx->litBufferEnd -= WILDCOPY_OVERLENGTH; + assert(dctx->litBufferEnd <= (BYTE*)dst + blockSizeMax); + } + + RETURN_ERROR_IF(HUF_isError(hufSuccess), corruption_detected, ""); + + dctx->litPtr = dctx->litBuffer; + dctx->litSize = litSize; + dctx->litEntropy = 1; + if (litEncType==set_compressed) dctx->HUFptr = dctx->entropy.hufTable; + return litCSize + lhSize; + } + + case set_basic: + { size_t litSize, lhSize; + U32 const lhlCode = ((istart[0]) >> 2) & 3; + size_t expectedWriteSize = MIN(blockSizeMax, dstCapacity); + switch(lhlCode) + { + case 0: case 2: default: /* note : default is impossible, since lhlCode into [0..3] */ + lhSize = 1; + litSize = istart[0] >> 3; + break; + case 1: + lhSize = 2; + litSize = MEM_readLE16(istart) >> 4; + break; + case 3: + lhSize = 3; + RETURN_ERROR_IF(srcSize<3, corruption_detected, "srcSize >= MIN_CBLOCK_SIZE == 2; here we need lhSize = 3"); + litSize = MEM_readLE24(istart) >> 4; + break; + } + + RETURN_ERROR_IF(litSize > 0 && dst == NULL, dstSize_tooSmall, "NULL not handled"); + RETURN_ERROR_IF(litSize > blockSizeMax, corruption_detected, ""); + RETURN_ERROR_IF(expectedWriteSize < litSize, dstSize_tooSmall, ""); + ZSTD_allocateLiteralsBuffer(dctx, dst, dstCapacity, litSize, streaming, expectedWriteSize, 1); + if (lhSize+litSize+WILDCOPY_OVERLENGTH > srcSize) { /* risk reading beyond src buffer with wildcopy */ + RETURN_ERROR_IF(litSize+lhSize > srcSize, corruption_detected, ""); + if (dctx->litBufferLocation == ZSTD_split) + { + ZSTD_memcpy(dctx->litBuffer, istart + lhSize, litSize - ZSTD_LITBUFFEREXTRASIZE); + ZSTD_memcpy(dctx->litExtraBuffer, istart + lhSize + litSize - ZSTD_LITBUFFEREXTRASIZE, ZSTD_LITBUFFEREXTRASIZE); + } + else + { + ZSTD_memcpy(dctx->litBuffer, istart + lhSize, litSize); + } + dctx->litPtr = dctx->litBuffer; + dctx->litSize = litSize; + return lhSize+litSize; + } + /* direct reference into compressed stream */ + dctx->litPtr = istart+lhSize; + dctx->litSize = litSize; + dctx->litBufferEnd = dctx->litPtr + litSize; + dctx->litBufferLocation = ZSTD_not_in_dst; + return lhSize+litSize; + } + + case set_rle: + { U32 const lhlCode = ((istart[0]) >> 2) & 3; + size_t litSize, lhSize; + size_t expectedWriteSize = MIN(blockSizeMax, dstCapacity); + switch(lhlCode) + { + case 0: case 2: default: /* note : default is impossible, since lhlCode into [0..3] */ + lhSize = 1; + litSize = istart[0] >> 3; + break; + case 1: + lhSize = 2; + RETURN_ERROR_IF(srcSize<3, corruption_detected, "srcSize >= MIN_CBLOCK_SIZE == 2; here we need lhSize+1 = 3"); + litSize = MEM_readLE16(istart) >> 4; + break; + case 3: + lhSize = 3; + RETURN_ERROR_IF(srcSize<4, corruption_detected, "srcSize >= MIN_CBLOCK_SIZE == 2; here we need lhSize+1 = 4"); + litSize = MEM_readLE24(istart) >> 4; + break; + } + RETURN_ERROR_IF(litSize > 0 && dst == NULL, dstSize_tooSmall, "NULL not handled"); + RETURN_ERROR_IF(litSize > blockSizeMax, corruption_detected, ""); + RETURN_ERROR_IF(expectedWriteSize < litSize, dstSize_tooSmall, ""); + ZSTD_allocateLiteralsBuffer(dctx, dst, dstCapacity, litSize, streaming, expectedWriteSize, 1); + if (dctx->litBufferLocation == ZSTD_split) + { + ZSTD_memset(dctx->litBuffer, istart[lhSize], litSize - ZSTD_LITBUFFEREXTRASIZE); + ZSTD_memset(dctx->litExtraBuffer, istart[lhSize], ZSTD_LITBUFFEREXTRASIZE); + } + else + { + ZSTD_memset(dctx->litBuffer, istart[lhSize], litSize); + } + dctx->litPtr = dctx->litBuffer; + dctx->litSize = litSize; + return lhSize+1; + } + default: + RETURN_ERROR(corruption_detected, "impossible"); + } + } +} + +/* Hidden declaration for fullbench */ +size_t ZSTD_decodeLiteralsBlock_wrapper(ZSTD_DCtx* dctx, + const void* src, size_t srcSize, + void* dst, size_t dstCapacity); +size_t ZSTD_decodeLiteralsBlock_wrapper(ZSTD_DCtx* dctx, + const void* src, size_t srcSize, + void* dst, size_t dstCapacity) +{ + dctx->isFrameDecompression = 0; + return ZSTD_decodeLiteralsBlock(dctx, src, srcSize, dst, dstCapacity, not_streaming); +} + +/* Default FSE distribution tables. + * These are pre-calculated FSE decoding tables using default distributions as defined in specification : + * https://github.com/facebook/zstd/blob/release/doc/zstd_compression_format.md#default-distributions + * They were generated programmatically with following method : + * - start from default distributions, present in /lib/common/zstd_internal.h + * - generate tables normally, using ZSTD_buildFSETable() + * - printout the content of tables + * - pretify output, report below, test with fuzzer to ensure it's correct */ + +/* Default FSE distribution table for Literal Lengths */ +static const ZSTD_seqSymbol LL_defaultDTable[(1<tableLog = 0; + DTableH->fastMode = 0; + + cell->nbBits = 0; + cell->nextState = 0; + assert(nbAddBits < 255); + cell->nbAdditionalBits = nbAddBits; + cell->baseValue = baseValue; +} + + +/* ZSTD_buildFSETable() : + * generate FSE decoding table for one symbol (ll, ml or off) + * cannot fail if input is valid => + * all inputs are presumed validated at this stage */ +FORCE_INLINE_TEMPLATE +void ZSTD_buildFSETable_body(ZSTD_seqSymbol* dt, + const short* normalizedCounter, unsigned maxSymbolValue, + const U32* baseValue, const U8* nbAdditionalBits, + unsigned tableLog, void* wksp, size_t wkspSize) +{ + ZSTD_seqSymbol* const tableDecode = dt+1; + U32 const maxSV1 = maxSymbolValue + 1; + U32 const tableSize = 1 << tableLog; + + U16* symbolNext = (U16*)wksp; + BYTE* spread = (BYTE*)(symbolNext + MaxSeq + 1); + U32 highThreshold = tableSize - 1; + + + /* Sanity Checks */ + assert(maxSymbolValue <= MaxSeq); + assert(tableLog <= MaxFSELog); + assert(wkspSize >= ZSTD_BUILD_FSE_TABLE_WKSP_SIZE); + (void)wkspSize; + /* Init, lay down lowprob symbols */ + { ZSTD_seqSymbol_header DTableH; + DTableH.tableLog = tableLog; + DTableH.fastMode = 1; + { S16 const largeLimit= (S16)(1 << (tableLog-1)); + U32 s; + for (s=0; s= largeLimit) DTableH.fastMode=0; + assert(normalizedCounter[s]>=0); + symbolNext[s] = (U16)normalizedCounter[s]; + } } } + ZSTD_memcpy(dt, &DTableH, sizeof(DTableH)); + } + + /* Spread symbols */ + assert(tableSize <= 512); + /* Specialized symbol spreading for the case when there are + * no low probability (-1 count) symbols. When compressing + * small blocks we avoid low probability symbols to hit this + * case, since header decoding speed matters more. + */ + if (highThreshold == tableSize - 1) { + size_t const tableMask = tableSize-1; + size_t const step = FSE_TABLESTEP(tableSize); + /* First lay down the symbols in order. + * We use a uint64_t to lay down 8 bytes at a time. This reduces branch + * misses since small blocks generally have small table logs, so nearly + * all symbols have counts <= 8. We ensure we have 8 bytes at the end of + * our buffer to handle the over-write. + */ + { + U64 const add = 0x0101010101010101ull; + size_t pos = 0; + U64 sv = 0; + U32 s; + for (s=0; s=0); + pos += (size_t)n; + } + } + /* Now we spread those positions across the table. + * The benefit of doing it in two stages is that we avoid the + * variable size inner loop, which caused lots of branch misses. + * Now we can run through all the positions without any branch misses. + * We unroll the loop twice, since that is what empirically worked best. + */ + { + size_t position = 0; + size_t s; + size_t const unroll = 2; + assert(tableSize % unroll == 0); /* FSE_MIN_TABLELOG is 5 */ + for (s = 0; s < (size_t)tableSize; s += unroll) { + size_t u; + for (u = 0; u < unroll; ++u) { + size_t const uPosition = (position + (u * step)) & tableMask; + tableDecode[uPosition].baseValue = spread[s + u]; + } + position = (position + (unroll * step)) & tableMask; + } + assert(position == 0); + } + } else { + U32 const tableMask = tableSize-1; + U32 const step = FSE_TABLESTEP(tableSize); + U32 s, position = 0; + for (s=0; s highThreshold)) position = (position + step) & tableMask; /* lowprob area */ + } } + assert(position == 0); /* position must reach all cells once, otherwise normalizedCounter is incorrect */ + } + + /* Build Decoding table */ + { + U32 u; + for (u=0; u max, corruption_detected, ""); + { U32 const symbol = *(const BYTE*)src; + U32 const baseline = baseValue[symbol]; + U8 const nbBits = nbAdditionalBits[symbol]; + ZSTD_buildSeqTable_rle(DTableSpace, baseline, nbBits); + } + *DTablePtr = DTableSpace; + return 1; + case set_basic : + *DTablePtr = defaultTable; + return 0; + case set_repeat: + RETURN_ERROR_IF(!flagRepeatTable, corruption_detected, ""); + /* prefetch FSE table if used */ + if (ddictIsCold && (nbSeq > 24 /* heuristic */)) { + const void* const pStart = *DTablePtr; + size_t const pSize = sizeof(ZSTD_seqSymbol) * (SEQSYMBOL_TABLE_SIZE(maxLog)); + PREFETCH_AREA(pStart, pSize); + } + return 0; + case set_compressed : + { unsigned tableLog; + S16 norm[MaxSeq+1]; + size_t const headerSize = FSE_readNCount(norm, &max, &tableLog, src, srcSize); + RETURN_ERROR_IF(FSE_isError(headerSize), corruption_detected, ""); + RETURN_ERROR_IF(tableLog > maxLog, corruption_detected, ""); + ZSTD_buildFSETable(DTableSpace, norm, max, baseValue, nbAdditionalBits, tableLog, wksp, wkspSize, bmi2); + *DTablePtr = DTableSpace; + return headerSize; + } + default : + assert(0); + RETURN_ERROR(GENERIC, "impossible"); + } +} + +size_t ZSTD_decodeSeqHeaders(ZSTD_DCtx* dctx, int* nbSeqPtr, + const void* src, size_t srcSize) +{ + const BYTE* const istart = (const BYTE*)src; + const BYTE* const iend = istart + srcSize; + const BYTE* ip = istart; + int nbSeq; + DEBUGLOG(5, "ZSTD_decodeSeqHeaders"); + + /* check */ + RETURN_ERROR_IF(srcSize < MIN_SEQUENCES_SIZE, srcSize_wrong, ""); + + /* SeqHead */ + nbSeq = *ip++; + if (nbSeq > 0x7F) { + if (nbSeq == 0xFF) { + RETURN_ERROR_IF(ip+2 > iend, srcSize_wrong, ""); + nbSeq = MEM_readLE16(ip) + LONGNBSEQ; + ip+=2; + } else { + RETURN_ERROR_IF(ip >= iend, srcSize_wrong, ""); + nbSeq = ((nbSeq-0x80)<<8) + *ip++; + } + } + *nbSeqPtr = nbSeq; + + if (nbSeq == 0) { + /* No sequence : section ends immediately */ + RETURN_ERROR_IF(ip != iend, corruption_detected, + "extraneous data present in the Sequences section"); + return (size_t)(ip - istart); + } + + /* FSE table descriptors */ + RETURN_ERROR_IF(ip+1 > iend, srcSize_wrong, ""); /* minimum possible size: 1 byte for symbol encoding types */ + RETURN_ERROR_IF(*ip & 3, corruption_detected, ""); /* The last field, Reserved, must be all-zeroes. */ + { symbolEncodingType_e const LLtype = (symbolEncodingType_e)(*ip >> 6); + symbolEncodingType_e const OFtype = (symbolEncodingType_e)((*ip >> 4) & 3); + symbolEncodingType_e const MLtype = (symbolEncodingType_e)((*ip >> 2) & 3); + ip++; + + /* Build DTables */ + { size_t const llhSize = ZSTD_buildSeqTable(dctx->entropy.LLTable, &dctx->LLTptr, + LLtype, MaxLL, LLFSELog, + ip, iend-ip, + LL_base, LL_bits, + LL_defaultDTable, dctx->fseEntropy, + dctx->ddictIsCold, nbSeq, + dctx->workspace, sizeof(dctx->workspace), + ZSTD_DCtx_get_bmi2(dctx)); + RETURN_ERROR_IF(ZSTD_isError(llhSize), corruption_detected, "ZSTD_buildSeqTable failed"); + ip += llhSize; + } + + { size_t const ofhSize = ZSTD_buildSeqTable(dctx->entropy.OFTable, &dctx->OFTptr, + OFtype, MaxOff, OffFSELog, + ip, iend-ip, + OF_base, OF_bits, + OF_defaultDTable, dctx->fseEntropy, + dctx->ddictIsCold, nbSeq, + dctx->workspace, sizeof(dctx->workspace), + ZSTD_DCtx_get_bmi2(dctx)); + RETURN_ERROR_IF(ZSTD_isError(ofhSize), corruption_detected, "ZSTD_buildSeqTable failed"); + ip += ofhSize; + } + + { size_t const mlhSize = ZSTD_buildSeqTable(dctx->entropy.MLTable, &dctx->MLTptr, + MLtype, MaxML, MLFSELog, + ip, iend-ip, + ML_base, ML_bits, + ML_defaultDTable, dctx->fseEntropy, + dctx->ddictIsCold, nbSeq, + dctx->workspace, sizeof(dctx->workspace), + ZSTD_DCtx_get_bmi2(dctx)); + RETURN_ERROR_IF(ZSTD_isError(mlhSize), corruption_detected, "ZSTD_buildSeqTable failed"); + ip += mlhSize; + } + } + + return ip-istart; +} + + +typedef struct { + size_t litLength; + size_t matchLength; + size_t offset; +} seq_t; + +typedef struct { + size_t state; + const ZSTD_seqSymbol* table; +} ZSTD_fseState; + +typedef struct { + BIT_DStream_t DStream; + ZSTD_fseState stateLL; + ZSTD_fseState stateOffb; + ZSTD_fseState stateML; + size_t prevOffset[ZSTD_REP_NUM]; +} seqState_t; + +/*! ZSTD_overlapCopy8() : + * Copies 8 bytes from ip to op and updates op and ip where ip <= op. + * If the offset is < 8 then the offset is spread to at least 8 bytes. + * + * Precondition: *ip <= *op + * Postcondition: *op - *op >= 8 + */ +HINT_INLINE void ZSTD_overlapCopy8(BYTE** op, BYTE const** ip, size_t offset) { + assert(*ip <= *op); + if (offset < 8) { + /* close range match, overlap */ + static const U32 dec32table[] = { 0, 1, 2, 1, 4, 4, 4, 4 }; /* added */ + static const int dec64table[] = { 8, 8, 8, 7, 8, 9,10,11 }; /* subtracted */ + int const sub2 = dec64table[offset]; + (*op)[0] = (*ip)[0]; + (*op)[1] = (*ip)[1]; + (*op)[2] = (*ip)[2]; + (*op)[3] = (*ip)[3]; + *ip += dec32table[offset]; + ZSTD_copy4(*op+4, *ip); + *ip -= sub2; + } else { + ZSTD_copy8(*op, *ip); + } + *ip += 8; + *op += 8; + assert(*op - *ip >= 8); +} + +/*! ZSTD_safecopy() : + * Specialized version of memcpy() that is allowed to READ up to WILDCOPY_OVERLENGTH past the input buffer + * and write up to 16 bytes past oend_w (op >= oend_w is allowed). + * This function is only called in the uncommon case where the sequence is near the end of the block. It + * should be fast for a single long sequence, but can be slow for several short sequences. + * + * @param ovtype controls the overlap detection + * - ZSTD_no_overlap: The source and destination are guaranteed to be at least WILDCOPY_VECLEN bytes apart. + * - ZSTD_overlap_src_before_dst: The src and dst may overlap and may be any distance apart. + * The src buffer must be before the dst buffer. + */ +static void ZSTD_safecopy(BYTE* op, const BYTE* const oend_w, BYTE const* ip, ptrdiff_t length, ZSTD_overlap_e ovtype) { + ptrdiff_t const diff = op - ip; + BYTE* const oend = op + length; + + assert((ovtype == ZSTD_no_overlap && (diff <= -8 || diff >= 8 || op >= oend_w)) || + (ovtype == ZSTD_overlap_src_before_dst && diff >= 0)); + + if (length < 8) { + /* Handle short lengths. */ + while (op < oend) *op++ = *ip++; + return; + } + if (ovtype == ZSTD_overlap_src_before_dst) { + /* Copy 8 bytes and ensure the offset >= 8 when there can be overlap. */ + assert(length >= 8); + ZSTD_overlapCopy8(&op, &ip, diff); + length -= 8; + assert(op - ip >= 8); + assert(op <= oend); + } + + if (oend <= oend_w) { + /* No risk of overwrite. */ + ZSTD_wildcopy(op, ip, length, ovtype); + return; + } + if (op <= oend_w) { + /* Wildcopy until we get close to the end. */ + assert(oend > oend_w); + ZSTD_wildcopy(op, ip, oend_w - op, ovtype); + ip += oend_w - op; + op += oend_w - op; + } + /* Handle the leftovers. */ + while (op < oend) *op++ = *ip++; +} + +/* ZSTD_safecopyDstBeforeSrc(): + * This version allows overlap with dst before src, or handles the non-overlap case with dst after src + * Kept separate from more common ZSTD_safecopy case to avoid performance impact to the safecopy common case */ +static void ZSTD_safecopyDstBeforeSrc(BYTE* op, const BYTE* ip, ptrdiff_t length) { + ptrdiff_t const diff = op - ip; + BYTE* const oend = op + length; + + if (length < 8 || diff > -8) { + /* Handle short lengths, close overlaps, and dst not before src. */ + while (op < oend) *op++ = *ip++; + return; + } + + if (op <= oend - WILDCOPY_OVERLENGTH && diff < -WILDCOPY_VECLEN) { + ZSTD_wildcopy(op, ip, oend - WILDCOPY_OVERLENGTH - op, ZSTD_no_overlap); + ip += oend - WILDCOPY_OVERLENGTH - op; + op += oend - WILDCOPY_OVERLENGTH - op; + } + + /* Handle the leftovers. */ + while (op < oend) *op++ = *ip++; +} + +/* ZSTD_execSequenceEnd(): + * This version handles cases that are near the end of the output buffer. It requires + * more careful checks to make sure there is no overflow. By separating out these hard + * and unlikely cases, we can speed up the common cases. + * + * NOTE: This function needs to be fast for a single long sequence, but doesn't need + * to be optimized for many small sequences, since those fall into ZSTD_execSequence(). + */ +FORCE_NOINLINE +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +size_t ZSTD_execSequenceEnd(BYTE* op, + BYTE* const oend, seq_t sequence, + const BYTE** litPtr, const BYTE* const litLimit, + const BYTE* const prefixStart, const BYTE* const virtualStart, const BYTE* const dictEnd) +{ + BYTE* const oLitEnd = op + sequence.litLength; + size_t const sequenceLength = sequence.litLength + sequence.matchLength; + const BYTE* const iLitEnd = *litPtr + sequence.litLength; + const BYTE* match = oLitEnd - sequence.offset; + BYTE* const oend_w = oend - WILDCOPY_OVERLENGTH; + + /* bounds checks : careful of address space overflow in 32-bit mode */ + RETURN_ERROR_IF(sequenceLength > (size_t)(oend - op), dstSize_tooSmall, "last match must fit within dstBuffer"); + RETURN_ERROR_IF(sequence.litLength > (size_t)(litLimit - *litPtr), corruption_detected, "try to read beyond literal buffer"); + assert(op < op + sequenceLength); + assert(oLitEnd < op + sequenceLength); + + /* copy literals */ + ZSTD_safecopy(op, oend_w, *litPtr, sequence.litLength, ZSTD_no_overlap); + op = oLitEnd; + *litPtr = iLitEnd; + + /* copy Match */ + if (sequence.offset > (size_t)(oLitEnd - prefixStart)) { + /* offset beyond prefix */ + RETURN_ERROR_IF(sequence.offset > (size_t)(oLitEnd - virtualStart), corruption_detected, ""); + match = dictEnd - (prefixStart - match); + if (match + sequence.matchLength <= dictEnd) { + ZSTD_memmove(oLitEnd, match, sequence.matchLength); + return sequenceLength; + } + /* span extDict & currentPrefixSegment */ + { size_t const length1 = dictEnd - match; + ZSTD_memmove(oLitEnd, match, length1); + op = oLitEnd + length1; + sequence.matchLength -= length1; + match = prefixStart; + } + } + ZSTD_safecopy(op, oend_w, match, sequence.matchLength, ZSTD_overlap_src_before_dst); + return sequenceLength; +} + +/* ZSTD_execSequenceEndSplitLitBuffer(): + * This version is intended to be used during instances where the litBuffer is still split. It is kept separate to avoid performance impact for the good case. + */ +FORCE_NOINLINE +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +size_t ZSTD_execSequenceEndSplitLitBuffer(BYTE* op, + BYTE* const oend, const BYTE* const oend_w, seq_t sequence, + const BYTE** litPtr, const BYTE* const litLimit, + const BYTE* const prefixStart, const BYTE* const virtualStart, const BYTE* const dictEnd) +{ + BYTE* const oLitEnd = op + sequence.litLength; + size_t const sequenceLength = sequence.litLength + sequence.matchLength; + const BYTE* const iLitEnd = *litPtr + sequence.litLength; + const BYTE* match = oLitEnd - sequence.offset; + + + /* bounds checks : careful of address space overflow in 32-bit mode */ + RETURN_ERROR_IF(sequenceLength > (size_t)(oend - op), dstSize_tooSmall, "last match must fit within dstBuffer"); + RETURN_ERROR_IF(sequence.litLength > (size_t)(litLimit - *litPtr), corruption_detected, "try to read beyond literal buffer"); + assert(op < op + sequenceLength); + assert(oLitEnd < op + sequenceLength); + + /* copy literals */ + RETURN_ERROR_IF(op > *litPtr && op < *litPtr + sequence.litLength, dstSize_tooSmall, "output should not catch up to and overwrite literal buffer"); + ZSTD_safecopyDstBeforeSrc(op, *litPtr, sequence.litLength); + op = oLitEnd; + *litPtr = iLitEnd; + + /* copy Match */ + if (sequence.offset > (size_t)(oLitEnd - prefixStart)) { + /* offset beyond prefix */ + RETURN_ERROR_IF(sequence.offset > (size_t)(oLitEnd - virtualStart), corruption_detected, ""); + match = dictEnd - (prefixStart - match); + if (match + sequence.matchLength <= dictEnd) { + ZSTD_memmove(oLitEnd, match, sequence.matchLength); + return sequenceLength; + } + /* span extDict & currentPrefixSegment */ + { size_t const length1 = dictEnd - match; + ZSTD_memmove(oLitEnd, match, length1); + op = oLitEnd + length1; + sequence.matchLength -= length1; + match = prefixStart; + } + } + ZSTD_safecopy(op, oend_w, match, sequence.matchLength, ZSTD_overlap_src_before_dst); + return sequenceLength; +} + +HINT_INLINE +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +size_t ZSTD_execSequence(BYTE* op, + BYTE* const oend, seq_t sequence, + const BYTE** litPtr, const BYTE* const litLimit, + const BYTE* const prefixStart, const BYTE* const virtualStart, const BYTE* const dictEnd) +{ + BYTE* const oLitEnd = op + sequence.litLength; + size_t const sequenceLength = sequence.litLength + sequence.matchLength; + BYTE* const oMatchEnd = op + sequenceLength; /* risk : address space overflow (32-bits) */ + BYTE* const oend_w = oend - WILDCOPY_OVERLENGTH; /* risk : address space underflow on oend=NULL */ + const BYTE* const iLitEnd = *litPtr + sequence.litLength; + const BYTE* match = oLitEnd - sequence.offset; + + assert(op != NULL /* Precondition */); + assert(oend_w < oend /* No underflow */); + +#if defined(__aarch64__) + /* prefetch sequence starting from match that will be used for copy later */ + PREFETCH_L1(match); +#endif + /* Handle edge cases in a slow path: + * - Read beyond end of literals + * - Match end is within WILDCOPY_OVERLIMIT of oend + * - 32-bit mode and the match length overflows + */ + if (UNLIKELY( + iLitEnd > litLimit || + oMatchEnd > oend_w || + (MEM_32bits() && (size_t)(oend - op) < sequenceLength + WILDCOPY_OVERLENGTH))) + return ZSTD_execSequenceEnd(op, oend, sequence, litPtr, litLimit, prefixStart, virtualStart, dictEnd); + + /* Assumptions (everything else goes into ZSTD_execSequenceEnd()) */ + assert(op <= oLitEnd /* No overflow */); + assert(oLitEnd < oMatchEnd /* Non-zero match & no overflow */); + assert(oMatchEnd <= oend /* No underflow */); + assert(iLitEnd <= litLimit /* Literal length is in bounds */); + assert(oLitEnd <= oend_w /* Can wildcopy literals */); + assert(oMatchEnd <= oend_w /* Can wildcopy matches */); + + /* Copy Literals: + * Split out litLength <= 16 since it is nearly always true. +1.6% on gcc-9. + * We likely don't need the full 32-byte wildcopy. + */ + assert(WILDCOPY_OVERLENGTH >= 16); + ZSTD_copy16(op, (*litPtr)); + if (UNLIKELY(sequence.litLength > 16)) { + ZSTD_wildcopy(op + 16, (*litPtr) + 16, sequence.litLength - 16, ZSTD_no_overlap); + } + op = oLitEnd; + *litPtr = iLitEnd; /* update for next sequence */ + + /* Copy Match */ + if (sequence.offset > (size_t)(oLitEnd - prefixStart)) { + /* offset beyond prefix -> go into extDict */ + RETURN_ERROR_IF(UNLIKELY(sequence.offset > (size_t)(oLitEnd - virtualStart)), corruption_detected, ""); + match = dictEnd + (match - prefixStart); + if (match + sequence.matchLength <= dictEnd) { + ZSTD_memmove(oLitEnd, match, sequence.matchLength); + return sequenceLength; + } + /* span extDict & currentPrefixSegment */ + { size_t const length1 = dictEnd - match; + ZSTD_memmove(oLitEnd, match, length1); + op = oLitEnd + length1; + sequence.matchLength -= length1; + match = prefixStart; + } + } + /* Match within prefix of 1 or more bytes */ + assert(op <= oMatchEnd); + assert(oMatchEnd <= oend_w); + assert(match >= prefixStart); + assert(sequence.matchLength >= 1); + + /* Nearly all offsets are >= WILDCOPY_VECLEN bytes, which means we can use wildcopy + * without overlap checking. + */ + if (LIKELY(sequence.offset >= WILDCOPY_VECLEN)) { + /* We bet on a full wildcopy for matches, since we expect matches to be + * longer than literals (in general). In silesia, ~10% of matches are longer + * than 16 bytes. + */ + ZSTD_wildcopy(op, match, (ptrdiff_t)sequence.matchLength, ZSTD_no_overlap); + return sequenceLength; + } + assert(sequence.offset < WILDCOPY_VECLEN); + + /* Copy 8 bytes and spread the offset to be >= 8. */ + ZSTD_overlapCopy8(&op, &match, sequence.offset); + + /* If the match length is > 8 bytes, then continue with the wildcopy. */ + if (sequence.matchLength > 8) { + assert(op < oMatchEnd); + ZSTD_wildcopy(op, match, (ptrdiff_t)sequence.matchLength - 8, ZSTD_overlap_src_before_dst); + } + return sequenceLength; +} + +HINT_INLINE +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +size_t ZSTD_execSequenceSplitLitBuffer(BYTE* op, + BYTE* const oend, const BYTE* const oend_w, seq_t sequence, + const BYTE** litPtr, const BYTE* const litLimit, + const BYTE* const prefixStart, const BYTE* const virtualStart, const BYTE* const dictEnd) +{ + BYTE* const oLitEnd = op + sequence.litLength; + size_t const sequenceLength = sequence.litLength + sequence.matchLength; + BYTE* const oMatchEnd = op + sequenceLength; /* risk : address space overflow (32-bits) */ + const BYTE* const iLitEnd = *litPtr + sequence.litLength; + const BYTE* match = oLitEnd - sequence.offset; + + assert(op != NULL /* Precondition */); + assert(oend_w < oend /* No underflow */); + /* Handle edge cases in a slow path: + * - Read beyond end of literals + * - Match end is within WILDCOPY_OVERLIMIT of oend + * - 32-bit mode and the match length overflows + */ + if (UNLIKELY( + iLitEnd > litLimit || + oMatchEnd > oend_w || + (MEM_32bits() && (size_t)(oend - op) < sequenceLength + WILDCOPY_OVERLENGTH))) + return ZSTD_execSequenceEndSplitLitBuffer(op, oend, oend_w, sequence, litPtr, litLimit, prefixStart, virtualStart, dictEnd); + + /* Assumptions (everything else goes into ZSTD_execSequenceEnd()) */ + assert(op <= oLitEnd /* No overflow */); + assert(oLitEnd < oMatchEnd /* Non-zero match & no overflow */); + assert(oMatchEnd <= oend /* No underflow */); + assert(iLitEnd <= litLimit /* Literal length is in bounds */); + assert(oLitEnd <= oend_w /* Can wildcopy literals */); + assert(oMatchEnd <= oend_w /* Can wildcopy matches */); + + /* Copy Literals: + * Split out litLength <= 16 since it is nearly always true. +1.6% on gcc-9. + * We likely don't need the full 32-byte wildcopy. + */ + assert(WILDCOPY_OVERLENGTH >= 16); + ZSTD_copy16(op, (*litPtr)); + if (UNLIKELY(sequence.litLength > 16)) { + ZSTD_wildcopy(op+16, (*litPtr)+16, sequence.litLength-16, ZSTD_no_overlap); + } + op = oLitEnd; + *litPtr = iLitEnd; /* update for next sequence */ + + /* Copy Match */ + if (sequence.offset > (size_t)(oLitEnd - prefixStart)) { + /* offset beyond prefix -> go into extDict */ + RETURN_ERROR_IF(UNLIKELY(sequence.offset > (size_t)(oLitEnd - virtualStart)), corruption_detected, ""); + match = dictEnd + (match - prefixStart); + if (match + sequence.matchLength <= dictEnd) { + ZSTD_memmove(oLitEnd, match, sequence.matchLength); + return sequenceLength; + } + /* span extDict & currentPrefixSegment */ + { size_t const length1 = dictEnd - match; + ZSTD_memmove(oLitEnd, match, length1); + op = oLitEnd + length1; + sequence.matchLength -= length1; + match = prefixStart; + } } + /* Match within prefix of 1 or more bytes */ + assert(op <= oMatchEnd); + assert(oMatchEnd <= oend_w); + assert(match >= prefixStart); + assert(sequence.matchLength >= 1); + + /* Nearly all offsets are >= WILDCOPY_VECLEN bytes, which means we can use wildcopy + * without overlap checking. + */ + if (LIKELY(sequence.offset >= WILDCOPY_VECLEN)) { + /* We bet on a full wildcopy for matches, since we expect matches to be + * longer than literals (in general). In silesia, ~10% of matches are longer + * than 16 bytes. + */ + ZSTD_wildcopy(op, match, (ptrdiff_t)sequence.matchLength, ZSTD_no_overlap); + return sequenceLength; + } + assert(sequence.offset < WILDCOPY_VECLEN); + + /* Copy 8 bytes and spread the offset to be >= 8. */ + ZSTD_overlapCopy8(&op, &match, sequence.offset); + + /* If the match length is > 8 bytes, then continue with the wildcopy. */ + if (sequence.matchLength > 8) { + assert(op < oMatchEnd); + ZSTD_wildcopy(op, match, (ptrdiff_t)sequence.matchLength-8, ZSTD_overlap_src_before_dst); + } + return sequenceLength; +} + + +static void +ZSTD_initFseState(ZSTD_fseState* DStatePtr, BIT_DStream_t* bitD, const ZSTD_seqSymbol* dt) +{ + const void* ptr = dt; + const ZSTD_seqSymbol_header* const DTableH = (const ZSTD_seqSymbol_header*)ptr; + DStatePtr->state = BIT_readBits(bitD, DTableH->tableLog); + DEBUGLOG(6, "ZSTD_initFseState : val=%u using %u bits", + (U32)DStatePtr->state, DTableH->tableLog); + BIT_reloadDStream(bitD); + DStatePtr->table = dt + 1; +} + +FORCE_INLINE_TEMPLATE void +ZSTD_updateFseStateWithDInfo(ZSTD_fseState* DStatePtr, BIT_DStream_t* bitD, U16 nextState, U32 nbBits) +{ + size_t const lowBits = BIT_readBits(bitD, nbBits); + DStatePtr->state = nextState + lowBits; +} + +/* We need to add at most (ZSTD_WINDOWLOG_MAX_32 - 1) bits to read the maximum + * offset bits. But we can only read at most STREAM_ACCUMULATOR_MIN_32 + * bits before reloading. This value is the maximum number of bytes we read + * after reloading when we are decoding long offsets. + */ +#define LONG_OFFSETS_MAX_EXTRA_BITS_32 \ + (ZSTD_WINDOWLOG_MAX_32 > STREAM_ACCUMULATOR_MIN_32 \ + ? ZSTD_WINDOWLOG_MAX_32 - STREAM_ACCUMULATOR_MIN_32 \ + : 0) + +typedef enum { ZSTD_lo_isRegularOffset, ZSTD_lo_isLongOffset=1 } ZSTD_longOffset_e; + +/** + * ZSTD_decodeSequence(): + * @p longOffsets : tells the decoder to reload more bit while decoding large offsets + * only used in 32-bit mode + * @return : Sequence (litL + matchL + offset) + */ +FORCE_INLINE_TEMPLATE seq_t +ZSTD_decodeSequence(seqState_t* seqState, const ZSTD_longOffset_e longOffsets, const int isLastSeq) +{ + seq_t seq; + /* + * ZSTD_seqSymbol is a 64 bits wide structure. + * It can be loaded in one operation + * and its fields extracted by simply shifting or bit-extracting on aarch64. + * GCC doesn't recognize this and generates more unnecessary ldr/ldrb/ldrh + * operations that cause performance drop. This can be avoided by using this + * ZSTD_memcpy hack. + */ +#if defined(__aarch64__) && (defined(__GNUC__) && !defined(__clang__)) + ZSTD_seqSymbol llDInfoS, mlDInfoS, ofDInfoS; + ZSTD_seqSymbol* const llDInfo = &llDInfoS; + ZSTD_seqSymbol* const mlDInfo = &mlDInfoS; + ZSTD_seqSymbol* const ofDInfo = &ofDInfoS; + ZSTD_memcpy(llDInfo, seqState->stateLL.table + seqState->stateLL.state, sizeof(ZSTD_seqSymbol)); + ZSTD_memcpy(mlDInfo, seqState->stateML.table + seqState->stateML.state, sizeof(ZSTD_seqSymbol)); + ZSTD_memcpy(ofDInfo, seqState->stateOffb.table + seqState->stateOffb.state, sizeof(ZSTD_seqSymbol)); +#else + const ZSTD_seqSymbol* const llDInfo = seqState->stateLL.table + seqState->stateLL.state; + const ZSTD_seqSymbol* const mlDInfo = seqState->stateML.table + seqState->stateML.state; + const ZSTD_seqSymbol* const ofDInfo = seqState->stateOffb.table + seqState->stateOffb.state; +#endif + seq.matchLength = mlDInfo->baseValue; + seq.litLength = llDInfo->baseValue; + { U32 const ofBase = ofDInfo->baseValue; + BYTE const llBits = llDInfo->nbAdditionalBits; + BYTE const mlBits = mlDInfo->nbAdditionalBits; + BYTE const ofBits = ofDInfo->nbAdditionalBits; + BYTE const totalBits = llBits+mlBits+ofBits; + + U16 const llNext = llDInfo->nextState; + U16 const mlNext = mlDInfo->nextState; + U16 const ofNext = ofDInfo->nextState; + U32 const llnbBits = llDInfo->nbBits; + U32 const mlnbBits = mlDInfo->nbBits; + U32 const ofnbBits = ofDInfo->nbBits; + + assert(llBits <= MaxLLBits); + assert(mlBits <= MaxMLBits); + assert(ofBits <= MaxOff); + /* + * As gcc has better branch and block analyzers, sometimes it is only + * valuable to mark likeliness for clang, it gives around 3-4% of + * performance. + */ + + /* sequence */ + { size_t offset; + if (ofBits > 1) { + ZSTD_STATIC_ASSERT(ZSTD_lo_isLongOffset == 1); + ZSTD_STATIC_ASSERT(LONG_OFFSETS_MAX_EXTRA_BITS_32 == 5); + ZSTD_STATIC_ASSERT(STREAM_ACCUMULATOR_MIN_32 > LONG_OFFSETS_MAX_EXTRA_BITS_32); + ZSTD_STATIC_ASSERT(STREAM_ACCUMULATOR_MIN_32 - LONG_OFFSETS_MAX_EXTRA_BITS_32 >= MaxMLBits); + if (MEM_32bits() && longOffsets && (ofBits >= STREAM_ACCUMULATOR_MIN_32)) { + /* Always read extra bits, this keeps the logic simple, + * avoids branches, and avoids accidentally reading 0 bits. + */ + U32 const extraBits = LONG_OFFSETS_MAX_EXTRA_BITS_32; + offset = ofBase + (BIT_readBitsFast(&seqState->DStream, ofBits - extraBits) << extraBits); + BIT_reloadDStream(&seqState->DStream); + offset += BIT_readBitsFast(&seqState->DStream, extraBits); + } else { + offset = ofBase + BIT_readBitsFast(&seqState->DStream, ofBits/*>0*/); /* <= (ZSTD_WINDOWLOG_MAX-1) bits */ + if (MEM_32bits()) BIT_reloadDStream(&seqState->DStream); + } + seqState->prevOffset[2] = seqState->prevOffset[1]; + seqState->prevOffset[1] = seqState->prevOffset[0]; + seqState->prevOffset[0] = offset; + } else { + U32 const ll0 = (llDInfo->baseValue == 0); + if (LIKELY((ofBits == 0))) { + offset = seqState->prevOffset[ll0]; + seqState->prevOffset[1] = seqState->prevOffset[!ll0]; + seqState->prevOffset[0] = offset; + } else { + offset = ofBase + ll0 + BIT_readBitsFast(&seqState->DStream, 1); + { size_t temp = (offset==3) ? seqState->prevOffset[0] - 1 : seqState->prevOffset[offset]; + temp -= !temp; /* 0 is not valid: input corrupted => force offset to -1 => corruption detected at execSequence */ + if (offset != 1) seqState->prevOffset[2] = seqState->prevOffset[1]; + seqState->prevOffset[1] = seqState->prevOffset[0]; + seqState->prevOffset[0] = offset = temp; + } } } + seq.offset = offset; + } + + if (mlBits > 0) + seq.matchLength += BIT_readBitsFast(&seqState->DStream, mlBits/*>0*/); + + if (MEM_32bits() && (mlBits+llBits >= STREAM_ACCUMULATOR_MIN_32-LONG_OFFSETS_MAX_EXTRA_BITS_32)) + BIT_reloadDStream(&seqState->DStream); + if (MEM_64bits() && UNLIKELY(totalBits >= STREAM_ACCUMULATOR_MIN_64-(LLFSELog+MLFSELog+OffFSELog))) + BIT_reloadDStream(&seqState->DStream); + /* Ensure there are enough bits to read the rest of data in 64-bit mode. */ + ZSTD_STATIC_ASSERT(16+LLFSELog+MLFSELog+OffFSELog < STREAM_ACCUMULATOR_MIN_64); + + if (llBits > 0) + seq.litLength += BIT_readBitsFast(&seqState->DStream, llBits/*>0*/); + + if (MEM_32bits()) + BIT_reloadDStream(&seqState->DStream); + + DEBUGLOG(6, "seq: litL=%u, matchL=%u, offset=%u", + (U32)seq.litLength, (U32)seq.matchLength, (U32)seq.offset); + + if (!isLastSeq) { + /* don't update FSE state for last Sequence */ + ZSTD_updateFseStateWithDInfo(&seqState->stateLL, &seqState->DStream, llNext, llnbBits); /* <= 9 bits */ + ZSTD_updateFseStateWithDInfo(&seqState->stateML, &seqState->DStream, mlNext, mlnbBits); /* <= 9 bits */ + if (MEM_32bits()) BIT_reloadDStream(&seqState->DStream); /* <= 18 bits */ + ZSTD_updateFseStateWithDInfo(&seqState->stateOffb, &seqState->DStream, ofNext, ofnbBits); /* <= 8 bits */ + BIT_reloadDStream(&seqState->DStream); + } + } + + return seq; +} + +#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) && defined(FUZZING_ASSERT_VALID_SEQUENCE) +#if DEBUGLEVEL >= 1 +static int ZSTD_dictionaryIsActive(ZSTD_DCtx const* dctx, BYTE const* prefixStart, BYTE const* oLitEnd) +{ + size_t const windowSize = dctx->fParams.windowSize; + /* No dictionary used. */ + if (dctx->dictContentEndForFuzzing == NULL) return 0; + /* Dictionary is our prefix. */ + if (prefixStart == dctx->dictContentBeginForFuzzing) return 1; + /* Dictionary is not our ext-dict. */ + if (dctx->dictEnd != dctx->dictContentEndForFuzzing) return 0; + /* Dictionary is not within our window size. */ + if ((size_t)(oLitEnd - prefixStart) >= windowSize) return 0; + /* Dictionary is active. */ + return 1; +} +#endif + +static void ZSTD_assertValidSequence( + ZSTD_DCtx const* dctx, + BYTE const* op, BYTE const* oend, + seq_t const seq, + BYTE const* prefixStart, BYTE const* virtualStart) +{ +#if DEBUGLEVEL >= 1 + if (dctx->isFrameDecompression) { + size_t const windowSize = dctx->fParams.windowSize; + size_t const sequenceSize = seq.litLength + seq.matchLength; + BYTE const* const oLitEnd = op + seq.litLength; + DEBUGLOG(6, "Checking sequence: litL=%u matchL=%u offset=%u", + (U32)seq.litLength, (U32)seq.matchLength, (U32)seq.offset); + assert(op <= oend); + assert((size_t)(oend - op) >= sequenceSize); + assert(sequenceSize <= ZSTD_blockSizeMax(dctx)); + if (ZSTD_dictionaryIsActive(dctx, prefixStart, oLitEnd)) { + size_t const dictSize = (size_t)((char const*)dctx->dictContentEndForFuzzing - (char const*)dctx->dictContentBeginForFuzzing); + /* Offset must be within the dictionary. */ + assert(seq.offset <= (size_t)(oLitEnd - virtualStart)); + assert(seq.offset <= windowSize + dictSize); + } else { + /* Offset must be within our window. */ + assert(seq.offset <= windowSize); + } + } +#else + (void)dctx, (void)op, (void)oend, (void)seq, (void)prefixStart, (void)virtualStart; +#endif +} +#endif + +#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG + + +FORCE_INLINE_TEMPLATE size_t +DONT_VECTORIZE +ZSTD_decompressSequences_bodySplitLitBuffer( ZSTD_DCtx* dctx, + void* dst, size_t maxDstSize, + const void* seqStart, size_t seqSize, int nbSeq, + const ZSTD_longOffset_e isLongOffset) +{ + const BYTE* ip = (const BYTE*)seqStart; + const BYTE* const iend = ip + seqSize; + BYTE* const ostart = (BYTE*)dst; + BYTE* const oend = ZSTD_maybeNullPtrAdd(ostart, maxDstSize); + BYTE* op = ostart; + const BYTE* litPtr = dctx->litPtr; + const BYTE* litBufferEnd = dctx->litBufferEnd; + const BYTE* const prefixStart = (const BYTE*) (dctx->prefixStart); + const BYTE* const vBase = (const BYTE*) (dctx->virtualStart); + const BYTE* const dictEnd = (const BYTE*) (dctx->dictEnd); + DEBUGLOG(5, "ZSTD_decompressSequences_bodySplitLitBuffer (%i seqs)", nbSeq); + + /* Literals are split between internal buffer & output buffer */ + if (nbSeq) { + seqState_t seqState; + dctx->fseEntropy = 1; + { U32 i; for (i=0; ientropy.rep[i]; } + RETURN_ERROR_IF( + ERR_isError(BIT_initDStream(&seqState.DStream, ip, iend-ip)), + corruption_detected, ""); + ZSTD_initFseState(&seqState.stateLL, &seqState.DStream, dctx->LLTptr); + ZSTD_initFseState(&seqState.stateOffb, &seqState.DStream, dctx->OFTptr); + ZSTD_initFseState(&seqState.stateML, &seqState.DStream, dctx->MLTptr); + assert(dst != NULL); + + ZSTD_STATIC_ASSERT( + BIT_DStream_unfinished < BIT_DStream_completed && + BIT_DStream_endOfBuffer < BIT_DStream_completed && + BIT_DStream_completed < BIT_DStream_overflow); + + /* decompress without overrunning litPtr begins */ + { seq_t sequence = {0,0,0}; /* some static analyzer believe that @sequence is not initialized (it necessarily is, since for(;;) loop as at least one iteration) */ + /* Align the decompression loop to 32 + 16 bytes. + * + * zstd compiled with gcc-9 on an Intel i9-9900k shows 10% decompression + * speed swings based on the alignment of the decompression loop. This + * performance swing is caused by parts of the decompression loop falling + * out of the DSB. The entire decompression loop should fit in the DSB, + * when it can't we get much worse performance. You can measure if you've + * hit the good case or the bad case with this perf command for some + * compressed file test.zst: + * + * perf stat -e cycles -e instructions -e idq.all_dsb_cycles_any_uops \ + * -e idq.all_mite_cycles_any_uops -- ./zstd -tq test.zst + * + * If you see most cycles served out of the MITE you've hit the bad case. + * If you see most cycles served out of the DSB you've hit the good case. + * If it is pretty even then you may be in an okay case. + * + * This issue has been reproduced on the following CPUs: + * - Kabylake: Macbook Pro (15-inch, 2019) 2.4 GHz Intel Core i9 + * Use Instruments->Counters to get DSB/MITE cycles. + * I never got performance swings, but I was able to + * go from the good case of mostly DSB to half of the + * cycles served from MITE. + * - Coffeelake: Intel i9-9900k + * - Coffeelake: Intel i7-9700k + * + * I haven't been able to reproduce the instability or DSB misses on any + * of the following CPUS: + * - Haswell + * - Broadwell: Intel(R) Xeon(R) CPU E5-2680 v4 @ 2.40GH + * - Skylake + * + * Alignment is done for each of the three major decompression loops: + * - ZSTD_decompressSequences_bodySplitLitBuffer - presplit section of the literal buffer + * - ZSTD_decompressSequences_bodySplitLitBuffer - postsplit section of the literal buffer + * - ZSTD_decompressSequences_body + * Alignment choices are made to minimize large swings on bad cases and influence on performance + * from changes external to this code, rather than to overoptimize on the current commit. + * + * If you are seeing performance stability this script can help test. + * It tests on 4 commits in zstd where I saw performance change. + * + * https://gist.github.com/terrelln/9889fc06a423fd5ca6e99351564473f4 + */ +#if defined(__GNUC__) && defined(__x86_64__) + __asm__(".p2align 6"); +# if __GNUC__ >= 7 + /* good for gcc-7, gcc-9, and gcc-11 */ + __asm__("nop"); + __asm__(".p2align 5"); + __asm__("nop"); + __asm__(".p2align 4"); +# if __GNUC__ == 8 || __GNUC__ == 10 + /* good for gcc-8 and gcc-10 */ + __asm__("nop"); + __asm__(".p2align 3"); +# endif +# endif +#endif + + /* Handle the initial state where litBuffer is currently split between dst and litExtraBuffer */ + for ( ; nbSeq; nbSeq--) { + sequence = ZSTD_decodeSequence(&seqState, isLongOffset, nbSeq==1); + if (litPtr + sequence.litLength > dctx->litBufferEnd) break; + { size_t const oneSeqSize = ZSTD_execSequenceSplitLitBuffer(op, oend, litPtr + sequence.litLength - WILDCOPY_OVERLENGTH, sequence, &litPtr, litBufferEnd, prefixStart, vBase, dictEnd); +#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) && defined(FUZZING_ASSERT_VALID_SEQUENCE) + assert(!ZSTD_isError(oneSeqSize)); + ZSTD_assertValidSequence(dctx, op, oend, sequence, prefixStart, vBase); +#endif + if (UNLIKELY(ZSTD_isError(oneSeqSize))) + return oneSeqSize; + DEBUGLOG(6, "regenerated sequence size : %u", (U32)oneSeqSize); + op += oneSeqSize; + } } + DEBUGLOG(6, "reached: (litPtr + sequence.litLength > dctx->litBufferEnd)"); + + /* If there are more sequences, they will need to read literals from litExtraBuffer; copy over the remainder from dst and update litPtr and litEnd */ + if (nbSeq > 0) { + const size_t leftoverLit = dctx->litBufferEnd - litPtr; + DEBUGLOG(6, "There are %i sequences left, and %zu/%zu literals left in buffer", nbSeq, leftoverLit, sequence.litLength); + if (leftoverLit) { + RETURN_ERROR_IF(leftoverLit > (size_t)(oend - op), dstSize_tooSmall, "remaining lit must fit within dstBuffer"); + ZSTD_safecopyDstBeforeSrc(op, litPtr, leftoverLit); + sequence.litLength -= leftoverLit; + op += leftoverLit; + } + litPtr = dctx->litExtraBuffer; + litBufferEnd = dctx->litExtraBuffer + ZSTD_LITBUFFEREXTRASIZE; + dctx->litBufferLocation = ZSTD_not_in_dst; + { size_t const oneSeqSize = ZSTD_execSequence(op, oend, sequence, &litPtr, litBufferEnd, prefixStart, vBase, dictEnd); +#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) && defined(FUZZING_ASSERT_VALID_SEQUENCE) + assert(!ZSTD_isError(oneSeqSize)); + ZSTD_assertValidSequence(dctx, op, oend, sequence, prefixStart, vBase); +#endif + if (UNLIKELY(ZSTD_isError(oneSeqSize))) + return oneSeqSize; + DEBUGLOG(6, "regenerated sequence size : %u", (U32)oneSeqSize); + op += oneSeqSize; + } + nbSeq--; + } + } + + if (nbSeq > 0) { + /* there is remaining lit from extra buffer */ + +#if defined(__GNUC__) && defined(__x86_64__) + __asm__(".p2align 6"); + __asm__("nop"); +# if __GNUC__ != 7 + /* worse for gcc-7 better for gcc-8, gcc-9, and gcc-10 and clang */ + __asm__(".p2align 4"); + __asm__("nop"); + __asm__(".p2align 3"); +# elif __GNUC__ >= 11 + __asm__(".p2align 3"); +# else + __asm__(".p2align 5"); + __asm__("nop"); + __asm__(".p2align 3"); +# endif +#endif + + for ( ; nbSeq ; nbSeq--) { + seq_t const sequence = ZSTD_decodeSequence(&seqState, isLongOffset, nbSeq==1); + size_t const oneSeqSize = ZSTD_execSequence(op, oend, sequence, &litPtr, litBufferEnd, prefixStart, vBase, dictEnd); +#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) && defined(FUZZING_ASSERT_VALID_SEQUENCE) + assert(!ZSTD_isError(oneSeqSize)); + ZSTD_assertValidSequence(dctx, op, oend, sequence, prefixStart, vBase); +#endif + if (UNLIKELY(ZSTD_isError(oneSeqSize))) + return oneSeqSize; + DEBUGLOG(6, "regenerated sequence size : %u", (U32)oneSeqSize); + op += oneSeqSize; + } + } + + /* check if reached exact end */ + DEBUGLOG(5, "ZSTD_decompressSequences_bodySplitLitBuffer: after decode loop, remaining nbSeq : %i", nbSeq); + RETURN_ERROR_IF(nbSeq, corruption_detected, ""); + DEBUGLOG(5, "bitStream : start=%p, ptr=%p, bitsConsumed=%u", seqState.DStream.start, seqState.DStream.ptr, seqState.DStream.bitsConsumed); + RETURN_ERROR_IF(!BIT_endOfDStream(&seqState.DStream), corruption_detected, ""); + /* save reps for next block */ + { U32 i; for (i=0; ientropy.rep[i] = (U32)(seqState.prevOffset[i]); } + } + + /* last literal segment */ + if (dctx->litBufferLocation == ZSTD_split) { + /* split hasn't been reached yet, first get dst then copy litExtraBuffer */ + size_t const lastLLSize = (size_t)(litBufferEnd - litPtr); + DEBUGLOG(6, "copy last literals from segment : %u", (U32)lastLLSize); + RETURN_ERROR_IF(lastLLSize > (size_t)(oend - op), dstSize_tooSmall, ""); + if (op != NULL) { + ZSTD_memmove(op, litPtr, lastLLSize); + op += lastLLSize; + } + litPtr = dctx->litExtraBuffer; + litBufferEnd = dctx->litExtraBuffer + ZSTD_LITBUFFEREXTRASIZE; + dctx->litBufferLocation = ZSTD_not_in_dst; + } + /* copy last literals from internal buffer */ + { size_t const lastLLSize = (size_t)(litBufferEnd - litPtr); + DEBUGLOG(6, "copy last literals from internal buffer : %u", (U32)lastLLSize); + RETURN_ERROR_IF(lastLLSize > (size_t)(oend-op), dstSize_tooSmall, ""); + if (op != NULL) { + ZSTD_memcpy(op, litPtr, lastLLSize); + op += lastLLSize; + } } + + DEBUGLOG(6, "decoded block of size %u bytes", (U32)(op - ostart)); + return (size_t)(op - ostart); +} + +FORCE_INLINE_TEMPLATE size_t +DONT_VECTORIZE +ZSTD_decompressSequences_body(ZSTD_DCtx* dctx, + void* dst, size_t maxDstSize, + const void* seqStart, size_t seqSize, int nbSeq, + const ZSTD_longOffset_e isLongOffset) +{ + const BYTE* ip = (const BYTE*)seqStart; + const BYTE* const iend = ip + seqSize; + BYTE* const ostart = (BYTE*)dst; + BYTE* const oend = dctx->litBufferLocation == ZSTD_not_in_dst ? ZSTD_maybeNullPtrAdd(ostart, maxDstSize) : dctx->litBuffer; + BYTE* op = ostart; + const BYTE* litPtr = dctx->litPtr; + const BYTE* const litEnd = litPtr + dctx->litSize; + const BYTE* const prefixStart = (const BYTE*)(dctx->prefixStart); + const BYTE* const vBase = (const BYTE*)(dctx->virtualStart); + const BYTE* const dictEnd = (const BYTE*)(dctx->dictEnd); + DEBUGLOG(5, "ZSTD_decompressSequences_body: nbSeq = %d", nbSeq); + + /* Regen sequences */ + if (nbSeq) { + seqState_t seqState; + dctx->fseEntropy = 1; + { U32 i; for (i = 0; i < ZSTD_REP_NUM; i++) seqState.prevOffset[i] = dctx->entropy.rep[i]; } + RETURN_ERROR_IF( + ERR_isError(BIT_initDStream(&seqState.DStream, ip, iend - ip)), + corruption_detected, ""); + ZSTD_initFseState(&seqState.stateLL, &seqState.DStream, dctx->LLTptr); + ZSTD_initFseState(&seqState.stateOffb, &seqState.DStream, dctx->OFTptr); + ZSTD_initFseState(&seqState.stateML, &seqState.DStream, dctx->MLTptr); + assert(dst != NULL); + +#if defined(__GNUC__) && defined(__x86_64__) + __asm__(".p2align 6"); + __asm__("nop"); +# if __GNUC__ >= 7 + __asm__(".p2align 5"); + __asm__("nop"); + __asm__(".p2align 3"); +# else + __asm__(".p2align 4"); + __asm__("nop"); + __asm__(".p2align 3"); +# endif +#endif + + for ( ; nbSeq ; nbSeq--) { + seq_t const sequence = ZSTD_decodeSequence(&seqState, isLongOffset, nbSeq==1); + size_t const oneSeqSize = ZSTD_execSequence(op, oend, sequence, &litPtr, litEnd, prefixStart, vBase, dictEnd); +#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) && defined(FUZZING_ASSERT_VALID_SEQUENCE) + assert(!ZSTD_isError(oneSeqSize)); + ZSTD_assertValidSequence(dctx, op, oend, sequence, prefixStart, vBase); +#endif + if (UNLIKELY(ZSTD_isError(oneSeqSize))) + return oneSeqSize; + DEBUGLOG(6, "regenerated sequence size : %u", (U32)oneSeqSize); + op += oneSeqSize; + } + + /* check if reached exact end */ + assert(nbSeq == 0); + RETURN_ERROR_IF(!BIT_endOfDStream(&seqState.DStream), corruption_detected, ""); + /* save reps for next block */ + { U32 i; for (i=0; ientropy.rep[i] = (U32)(seqState.prevOffset[i]); } + } + + /* last literal segment */ + { size_t const lastLLSize = (size_t)(litEnd - litPtr); + DEBUGLOG(6, "copy last literals : %u", (U32)lastLLSize); + RETURN_ERROR_IF(lastLLSize > (size_t)(oend-op), dstSize_tooSmall, ""); + if (op != NULL) { + ZSTD_memcpy(op, litPtr, lastLLSize); + op += lastLLSize; + } } + + DEBUGLOG(6, "decoded block of size %u bytes", (U32)(op - ostart)); + return (size_t)(op - ostart); +} + +static size_t +ZSTD_decompressSequences_default(ZSTD_DCtx* dctx, + void* dst, size_t maxDstSize, + const void* seqStart, size_t seqSize, int nbSeq, + const ZSTD_longOffset_e isLongOffset) +{ + return ZSTD_decompressSequences_body(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset); +} + +static size_t +ZSTD_decompressSequencesSplitLitBuffer_default(ZSTD_DCtx* dctx, + void* dst, size_t maxDstSize, + const void* seqStart, size_t seqSize, int nbSeq, + const ZSTD_longOffset_e isLongOffset) +{ + return ZSTD_decompressSequences_bodySplitLitBuffer(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset); +} +#endif /* ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG */ + +#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT + +FORCE_INLINE_TEMPLATE + +size_t ZSTD_prefetchMatch(size_t prefetchPos, seq_t const sequence, + const BYTE* const prefixStart, const BYTE* const dictEnd) +{ + prefetchPos += sequence.litLength; + { const BYTE* const matchBase = (sequence.offset > prefetchPos) ? dictEnd : prefixStart; + /* note : this operation can overflow when seq.offset is really too large, which can only happen when input is corrupted. + * No consequence though : memory address is only used for prefetching, not for dereferencing */ + const BYTE* const match = ZSTD_wrappedPtrSub(ZSTD_wrappedPtrAdd(matchBase, prefetchPos), sequence.offset); + PREFETCH_L1(match); PREFETCH_L1(match+CACHELINE_SIZE); /* note : it's safe to invoke PREFETCH() on any memory address, including invalid ones */ + } + return prefetchPos + sequence.matchLength; +} + +/* This decoding function employs prefetching + * to reduce latency impact of cache misses. + * It's generally employed when block contains a significant portion of long-distance matches + * or when coupled with a "cold" dictionary */ +FORCE_INLINE_TEMPLATE size_t +ZSTD_decompressSequencesLong_body( + ZSTD_DCtx* dctx, + void* dst, size_t maxDstSize, + const void* seqStart, size_t seqSize, int nbSeq, + const ZSTD_longOffset_e isLongOffset) +{ + const BYTE* ip = (const BYTE*)seqStart; + const BYTE* const iend = ip + seqSize; + BYTE* const ostart = (BYTE*)dst; + BYTE* const oend = dctx->litBufferLocation == ZSTD_in_dst ? dctx->litBuffer : ZSTD_maybeNullPtrAdd(ostart, maxDstSize); + BYTE* op = ostart; + const BYTE* litPtr = dctx->litPtr; + const BYTE* litBufferEnd = dctx->litBufferEnd; + const BYTE* const prefixStart = (const BYTE*) (dctx->prefixStart); + const BYTE* const dictStart = (const BYTE*) (dctx->virtualStart); + const BYTE* const dictEnd = (const BYTE*) (dctx->dictEnd); + + /* Regen sequences */ + if (nbSeq) { +#define STORED_SEQS 8 +#define STORED_SEQS_MASK (STORED_SEQS-1) +#define ADVANCED_SEQS STORED_SEQS + seq_t sequences[STORED_SEQS]; + int const seqAdvance = MIN(nbSeq, ADVANCED_SEQS); + seqState_t seqState; + int seqNb; + size_t prefetchPos = (size_t)(op-prefixStart); /* track position relative to prefixStart */ + + dctx->fseEntropy = 1; + { int i; for (i=0; ientropy.rep[i]; } + assert(dst != NULL); + assert(iend >= ip); + RETURN_ERROR_IF( + ERR_isError(BIT_initDStream(&seqState.DStream, ip, iend-ip)), + corruption_detected, ""); + ZSTD_initFseState(&seqState.stateLL, &seqState.DStream, dctx->LLTptr); + ZSTD_initFseState(&seqState.stateOffb, &seqState.DStream, dctx->OFTptr); + ZSTD_initFseState(&seqState.stateML, &seqState.DStream, dctx->MLTptr); + + /* prepare in advance */ + for (seqNb=0; seqNblitBufferLocation == ZSTD_split && litPtr + sequences[(seqNb - ADVANCED_SEQS) & STORED_SEQS_MASK].litLength > dctx->litBufferEnd) { + /* lit buffer is reaching split point, empty out the first buffer and transition to litExtraBuffer */ + const size_t leftoverLit = dctx->litBufferEnd - litPtr; + if (leftoverLit) + { + RETURN_ERROR_IF(leftoverLit > (size_t)(oend - op), dstSize_tooSmall, "remaining lit must fit within dstBuffer"); + ZSTD_safecopyDstBeforeSrc(op, litPtr, leftoverLit); + sequences[(seqNb - ADVANCED_SEQS) & STORED_SEQS_MASK].litLength -= leftoverLit; + op += leftoverLit; + } + litPtr = dctx->litExtraBuffer; + litBufferEnd = dctx->litExtraBuffer + ZSTD_LITBUFFEREXTRASIZE; + dctx->litBufferLocation = ZSTD_not_in_dst; + { size_t const oneSeqSize = ZSTD_execSequence(op, oend, sequences[(seqNb - ADVANCED_SEQS) & STORED_SEQS_MASK], &litPtr, litBufferEnd, prefixStart, dictStart, dictEnd); +#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) && defined(FUZZING_ASSERT_VALID_SEQUENCE) + assert(!ZSTD_isError(oneSeqSize)); + ZSTD_assertValidSequence(dctx, op, oend, sequences[(seqNb - ADVANCED_SEQS) & STORED_SEQS_MASK], prefixStart, dictStart); +#endif + if (ZSTD_isError(oneSeqSize)) return oneSeqSize; + + prefetchPos = ZSTD_prefetchMatch(prefetchPos, sequence, prefixStart, dictEnd); + sequences[seqNb & STORED_SEQS_MASK] = sequence; + op += oneSeqSize; + } } + else + { + /* lit buffer is either wholly contained in first or second split, or not split at all*/ + size_t const oneSeqSize = dctx->litBufferLocation == ZSTD_split ? + ZSTD_execSequenceSplitLitBuffer(op, oend, litPtr + sequences[(seqNb - ADVANCED_SEQS) & STORED_SEQS_MASK].litLength - WILDCOPY_OVERLENGTH, sequences[(seqNb - ADVANCED_SEQS) & STORED_SEQS_MASK], &litPtr, litBufferEnd, prefixStart, dictStart, dictEnd) : + ZSTD_execSequence(op, oend, sequences[(seqNb - ADVANCED_SEQS) & STORED_SEQS_MASK], &litPtr, litBufferEnd, prefixStart, dictStart, dictEnd); +#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) && defined(FUZZING_ASSERT_VALID_SEQUENCE) + assert(!ZSTD_isError(oneSeqSize)); + ZSTD_assertValidSequence(dctx, op, oend, sequences[(seqNb - ADVANCED_SEQS) & STORED_SEQS_MASK], prefixStart, dictStart); +#endif + if (ZSTD_isError(oneSeqSize)) return oneSeqSize; + + prefetchPos = ZSTD_prefetchMatch(prefetchPos, sequence, prefixStart, dictEnd); + sequences[seqNb & STORED_SEQS_MASK] = sequence; + op += oneSeqSize; + } + } + RETURN_ERROR_IF(!BIT_endOfDStream(&seqState.DStream), corruption_detected, ""); + + /* finish queue */ + seqNb -= seqAdvance; + for ( ; seqNblitBufferLocation == ZSTD_split && litPtr + sequence->litLength > dctx->litBufferEnd) { + const size_t leftoverLit = dctx->litBufferEnd - litPtr; + if (leftoverLit) { + RETURN_ERROR_IF(leftoverLit > (size_t)(oend - op), dstSize_tooSmall, "remaining lit must fit within dstBuffer"); + ZSTD_safecopyDstBeforeSrc(op, litPtr, leftoverLit); + sequence->litLength -= leftoverLit; + op += leftoverLit; + } + litPtr = dctx->litExtraBuffer; + litBufferEnd = dctx->litExtraBuffer + ZSTD_LITBUFFEREXTRASIZE; + dctx->litBufferLocation = ZSTD_not_in_dst; + { size_t const oneSeqSize = ZSTD_execSequence(op, oend, *sequence, &litPtr, litBufferEnd, prefixStart, dictStart, dictEnd); +#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) && defined(FUZZING_ASSERT_VALID_SEQUENCE) + assert(!ZSTD_isError(oneSeqSize)); + ZSTD_assertValidSequence(dctx, op, oend, sequences[seqNb&STORED_SEQS_MASK], prefixStart, dictStart); +#endif + if (ZSTD_isError(oneSeqSize)) return oneSeqSize; + op += oneSeqSize; + } + } + else + { + size_t const oneSeqSize = dctx->litBufferLocation == ZSTD_split ? + ZSTD_execSequenceSplitLitBuffer(op, oend, litPtr + sequence->litLength - WILDCOPY_OVERLENGTH, *sequence, &litPtr, litBufferEnd, prefixStart, dictStart, dictEnd) : + ZSTD_execSequence(op, oend, *sequence, &litPtr, litBufferEnd, prefixStart, dictStart, dictEnd); +#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) && defined(FUZZING_ASSERT_VALID_SEQUENCE) + assert(!ZSTD_isError(oneSeqSize)); + ZSTD_assertValidSequence(dctx, op, oend, sequences[seqNb&STORED_SEQS_MASK], prefixStart, dictStart); +#endif + if (ZSTD_isError(oneSeqSize)) return oneSeqSize; + op += oneSeqSize; + } + } + + /* save reps for next block */ + { U32 i; for (i=0; ientropy.rep[i] = (U32)(seqState.prevOffset[i]); } + } + + /* last literal segment */ + if (dctx->litBufferLocation == ZSTD_split) { /* first deplete literal buffer in dst, then copy litExtraBuffer */ + size_t const lastLLSize = litBufferEnd - litPtr; + RETURN_ERROR_IF(lastLLSize > (size_t)(oend - op), dstSize_tooSmall, ""); + if (op != NULL) { + ZSTD_memmove(op, litPtr, lastLLSize); + op += lastLLSize; + } + litPtr = dctx->litExtraBuffer; + litBufferEnd = dctx->litExtraBuffer + ZSTD_LITBUFFEREXTRASIZE; + } + { size_t const lastLLSize = litBufferEnd - litPtr; + RETURN_ERROR_IF(lastLLSize > (size_t)(oend-op), dstSize_tooSmall, ""); + if (op != NULL) { + ZSTD_memmove(op, litPtr, lastLLSize); + op += lastLLSize; + } + } + + return (size_t)(op - ostart); +} + +static size_t +ZSTD_decompressSequencesLong_default(ZSTD_DCtx* dctx, + void* dst, size_t maxDstSize, + const void* seqStart, size_t seqSize, int nbSeq, + const ZSTD_longOffset_e isLongOffset) +{ + return ZSTD_decompressSequencesLong_body(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset); +} +#endif /* ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT */ + + + +#if DYNAMIC_BMI2 + +#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG +static BMI2_TARGET_ATTRIBUTE size_t +DONT_VECTORIZE +ZSTD_decompressSequences_bmi2(ZSTD_DCtx* dctx, + void* dst, size_t maxDstSize, + const void* seqStart, size_t seqSize, int nbSeq, + const ZSTD_longOffset_e isLongOffset) +{ + return ZSTD_decompressSequences_body(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset); +} +static BMI2_TARGET_ATTRIBUTE size_t +DONT_VECTORIZE +ZSTD_decompressSequencesSplitLitBuffer_bmi2(ZSTD_DCtx* dctx, + void* dst, size_t maxDstSize, + const void* seqStart, size_t seqSize, int nbSeq, + const ZSTD_longOffset_e isLongOffset) +{ + return ZSTD_decompressSequences_bodySplitLitBuffer(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset); +} +#endif /* ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG */ + +#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT +static BMI2_TARGET_ATTRIBUTE size_t +ZSTD_decompressSequencesLong_bmi2(ZSTD_DCtx* dctx, + void* dst, size_t maxDstSize, + const void* seqStart, size_t seqSize, int nbSeq, + const ZSTD_longOffset_e isLongOffset) +{ + return ZSTD_decompressSequencesLong_body(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset); +} +#endif /* ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT */ + +#endif /* DYNAMIC_BMI2 */ + +typedef size_t (*ZSTD_decompressSequences_t)( + ZSTD_DCtx* dctx, + void* dst, size_t maxDstSize, + const void* seqStart, size_t seqSize, int nbSeq, + const ZSTD_longOffset_e isLongOffset); + +#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG +static size_t +ZSTD_decompressSequences(ZSTD_DCtx* dctx, void* dst, size_t maxDstSize, + const void* seqStart, size_t seqSize, int nbSeq, + const ZSTD_longOffset_e isLongOffset) +{ + DEBUGLOG(5, "ZSTD_decompressSequences"); +#if DYNAMIC_BMI2 + if (ZSTD_DCtx_get_bmi2(dctx)) { + return ZSTD_decompressSequences_bmi2(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset); + } +#endif + return ZSTD_decompressSequences_default(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset); +} +static size_t +ZSTD_decompressSequencesSplitLitBuffer(ZSTD_DCtx* dctx, void* dst, size_t maxDstSize, + const void* seqStart, size_t seqSize, int nbSeq, + const ZSTD_longOffset_e isLongOffset) +{ + DEBUGLOG(5, "ZSTD_decompressSequencesSplitLitBuffer"); +#if DYNAMIC_BMI2 + if (ZSTD_DCtx_get_bmi2(dctx)) { + return ZSTD_decompressSequencesSplitLitBuffer_bmi2(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset); + } +#endif + return ZSTD_decompressSequencesSplitLitBuffer_default(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset); +} +#endif /* ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG */ + + +#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT +/* ZSTD_decompressSequencesLong() : + * decompression function triggered when a minimum share of offsets is considered "long", + * aka out of cache. + * note : "long" definition seems overloaded here, sometimes meaning "wider than bitstream register", and sometimes meaning "farther than memory cache distance". + * This function will try to mitigate main memory latency through the use of prefetching */ +static size_t +ZSTD_decompressSequencesLong(ZSTD_DCtx* dctx, + void* dst, size_t maxDstSize, + const void* seqStart, size_t seqSize, int nbSeq, + const ZSTD_longOffset_e isLongOffset) +{ + DEBUGLOG(5, "ZSTD_decompressSequencesLong"); +#if DYNAMIC_BMI2 + if (ZSTD_DCtx_get_bmi2(dctx)) { + return ZSTD_decompressSequencesLong_bmi2(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset); + } +#endif + return ZSTD_decompressSequencesLong_default(dctx, dst, maxDstSize, seqStart, seqSize, nbSeq, isLongOffset); +} +#endif /* ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT */ + + +/** + * @returns The total size of the history referenceable by zstd, including + * both the prefix and the extDict. At @p op any offset larger than this + * is invalid. + */ +static size_t ZSTD_totalHistorySize(BYTE* op, BYTE const* virtualStart) +{ + return (size_t)(op - virtualStart); +} + +typedef struct { + unsigned longOffsetShare; + unsigned maxNbAdditionalBits; +} ZSTD_OffsetInfo; + +/* ZSTD_getOffsetInfo() : + * condition : offTable must be valid + * @return : "share" of long offsets (arbitrarily defined as > (1<<23)) + * compared to maximum possible of (1< 22) info.longOffsetShare += 1; + } + + assert(tableLog <= OffFSELog); + info.longOffsetShare <<= (OffFSELog - tableLog); /* scale to OffFSELog */ + } + + return info; +} + +/** + * @returns The maximum offset we can decode in one read of our bitstream, without + * reloading more bits in the middle of the offset bits read. Any offsets larger + * than this must use the long offset decoder. + */ +static size_t ZSTD_maxShortOffset(void) +{ + if (MEM_64bits()) { + /* We can decode any offset without reloading bits. + * This might change if the max window size grows. + */ + ZSTD_STATIC_ASSERT(ZSTD_WINDOWLOG_MAX <= 31); + return (size_t)-1; + } else { + /* The maximum offBase is (1 << (STREAM_ACCUMULATOR_MIN + 1)) - 1. + * This offBase would require STREAM_ACCUMULATOR_MIN extra bits. + * Then we have to subtract ZSTD_REP_NUM to get the maximum possible offset. + */ + size_t const maxOffbase = ((size_t)1 << (STREAM_ACCUMULATOR_MIN + 1)) - 1; + size_t const maxOffset = maxOffbase - ZSTD_REP_NUM; + assert(ZSTD_highbit32((U32)maxOffbase) == STREAM_ACCUMULATOR_MIN); + return maxOffset; + } +} + +size_t +ZSTD_decompressBlock_internal(ZSTD_DCtx* dctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, const streaming_operation streaming) +{ /* blockType == blockCompressed */ + const BYTE* ip = (const BYTE*)src; + DEBUGLOG(5, "ZSTD_decompressBlock_internal (cSize : %u)", (unsigned)srcSize); + + /* Note : the wording of the specification + * allows compressed block to be sized exactly ZSTD_blockSizeMax(dctx). + * This generally does not happen, as it makes little sense, + * since an uncompressed block would feature same size and have no decompression cost. + * Also, note that decoder from reference libzstd before < v1.5.4 + * would consider this edge case as an error. + * As a consequence, avoid generating compressed blocks of size ZSTD_blockSizeMax(dctx) + * for broader compatibility with the deployed ecosystem of zstd decoders */ + RETURN_ERROR_IF(srcSize > ZSTD_blockSizeMax(dctx), srcSize_wrong, ""); + + /* Decode literals section */ + { size_t const litCSize = ZSTD_decodeLiteralsBlock(dctx, src, srcSize, dst, dstCapacity, streaming); + DEBUGLOG(5, "ZSTD_decodeLiteralsBlock : cSize=%u, nbLiterals=%zu", (U32)litCSize, dctx->litSize); + if (ZSTD_isError(litCSize)) return litCSize; + ip += litCSize; + srcSize -= litCSize; + } + + /* Build Decoding Tables */ + { + /* Compute the maximum block size, which must also work when !frame and fParams are unset. + * Additionally, take the min with dstCapacity to ensure that the totalHistorySize fits in a size_t. + */ + size_t const blockSizeMax = MIN(dstCapacity, ZSTD_blockSizeMax(dctx)); + size_t const totalHistorySize = ZSTD_totalHistorySize(ZSTD_maybeNullPtrAdd((BYTE*)dst, blockSizeMax), (BYTE const*)dctx->virtualStart); + /* isLongOffset must be true if there are long offsets. + * Offsets are long if they are larger than ZSTD_maxShortOffset(). + * We don't expect that to be the case in 64-bit mode. + * + * We check here to see if our history is large enough to allow long offsets. + * If it isn't, then we can't possible have (valid) long offsets. If the offset + * is invalid, then it is okay to read it incorrectly. + * + * If isLongOffsets is true, then we will later check our decoding table to see + * if it is even possible to generate long offsets. + */ + ZSTD_longOffset_e isLongOffset = (ZSTD_longOffset_e)(MEM_32bits() && (totalHistorySize > ZSTD_maxShortOffset())); + /* These macros control at build-time which decompressor implementation + * we use. If neither is defined, we do some inspection and dispatch at + * runtime. + */ +#if !defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT) && \ + !defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG) + int usePrefetchDecoder = dctx->ddictIsCold; +#else + /* Set to 1 to avoid computing offset info if we don't need to. + * Otherwise this value is ignored. + */ + int usePrefetchDecoder = 1; +#endif + int nbSeq; + size_t const seqHSize = ZSTD_decodeSeqHeaders(dctx, &nbSeq, ip, srcSize); + if (ZSTD_isError(seqHSize)) return seqHSize; + ip += seqHSize; + srcSize -= seqHSize; + + RETURN_ERROR_IF((dst == NULL || dstCapacity == 0) && nbSeq > 0, dstSize_tooSmall, "NULL not handled"); + RETURN_ERROR_IF(MEM_64bits() && sizeof(size_t) == sizeof(void*) && (size_t)(-1) - (size_t)dst < (size_t)(1 << 20), dstSize_tooSmall, + "invalid dst"); + + /* If we could potentially have long offsets, or we might want to use the prefetch decoder, + * compute information about the share of long offsets, and the maximum nbAdditionalBits. + * NOTE: could probably use a larger nbSeq limit + */ + if (isLongOffset || (!usePrefetchDecoder && (totalHistorySize > (1u << 24)) && (nbSeq > 8))) { + ZSTD_OffsetInfo const info = ZSTD_getOffsetInfo(dctx->OFTptr, nbSeq); + if (isLongOffset && info.maxNbAdditionalBits <= STREAM_ACCUMULATOR_MIN) { + /* If isLongOffset, but the maximum number of additional bits that we see in our table is small + * enough, then we know it is impossible to have too long an offset in this block, so we can + * use the regular offset decoder. + */ + isLongOffset = ZSTD_lo_isRegularOffset; + } + if (!usePrefetchDecoder) { + U32 const minShare = MEM_64bits() ? 7 : 20; /* heuristic values, correspond to 2.73% and 7.81% */ + usePrefetchDecoder = (info.longOffsetShare >= minShare); + } + } + + dctx->ddictIsCold = 0; + +#if !defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT) && \ + !defined(ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG) + if (usePrefetchDecoder) { +#else + (void)usePrefetchDecoder; + { +#endif +#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT + return ZSTD_decompressSequencesLong(dctx, dst, dstCapacity, ip, srcSize, nbSeq, isLongOffset); +#endif + } + +#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG + /* else */ + if (dctx->litBufferLocation == ZSTD_split) + return ZSTD_decompressSequencesSplitLitBuffer(dctx, dst, dstCapacity, ip, srcSize, nbSeq, isLongOffset); + else + return ZSTD_decompressSequences(dctx, dst, dstCapacity, ip, srcSize, nbSeq, isLongOffset); +#endif + } +} + + +ZSTD_ALLOW_POINTER_OVERFLOW_ATTR +void ZSTD_checkContinuity(ZSTD_DCtx* dctx, const void* dst, size_t dstSize) +{ + if (dst != dctx->previousDstEnd && dstSize > 0) { /* not contiguous */ + dctx->dictEnd = dctx->previousDstEnd; + dctx->virtualStart = (const char*)dst - ((const char*)(dctx->previousDstEnd) - (const char*)(dctx->prefixStart)); + dctx->prefixStart = dst; + dctx->previousDstEnd = dst; + } +} + + +size_t ZSTD_decompressBlock_deprecated(ZSTD_DCtx* dctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize) +{ + size_t dSize; + dctx->isFrameDecompression = 0; + ZSTD_checkContinuity(dctx, dst, dstCapacity); + dSize = ZSTD_decompressBlock_internal(dctx, dst, dstCapacity, src, srcSize, not_streaming); + FORWARD_IF_ERROR(dSize, ""); + dctx->previousDstEnd = (char*)dst + dSize; + return dSize; +} + + +/* NOTE: Must just wrap ZSTD_decompressBlock_deprecated() */ +size_t ZSTD_decompressBlock(ZSTD_DCtx* dctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize) +{ + return ZSTD_decompressBlock_deprecated(dctx, dst, dstCapacity, src, srcSize); +} +/**** ended inlining decompress/zstd_decompress_block.c ****/ + diff --git a/ref/zstd/zstd.h b/ref/zstd/zstd.h new file mode 100644 index 000000000..5d1fef8a6 --- /dev/null +++ b/ref/zstd/zstd.h @@ -0,0 +1,3089 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * All rights reserved. + * + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. + */ +#if defined (__cplusplus) +extern "C" { +#endif + +#ifndef ZSTD_H_235446 +#define ZSTD_H_235446 + +/* ====== Dependencies ======*/ +#include /* INT_MAX */ +#include /* size_t */ + + +/* ===== ZSTDLIB_API : control library symbols visibility ===== */ +#ifndef ZSTDLIB_VISIBLE + /* Backwards compatibility with old macro name */ +# ifdef ZSTDLIB_VISIBILITY +# define ZSTDLIB_VISIBLE ZSTDLIB_VISIBILITY +# elif defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__MINGW32__) +# define ZSTDLIB_VISIBLE __attribute__ ((visibility ("default"))) +# else +# define ZSTDLIB_VISIBLE +# endif +#endif + +#ifndef ZSTDLIB_HIDDEN +# if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__MINGW32__) +# define ZSTDLIB_HIDDEN __attribute__ ((visibility ("hidden"))) +# else +# define ZSTDLIB_HIDDEN +# endif +#endif + +#if defined(ZSTD_DLL_EXPORT) && (ZSTD_DLL_EXPORT==1) +# define ZSTDLIB_API __declspec(dllexport) ZSTDLIB_VISIBLE +#elif defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1) +# define ZSTDLIB_API __declspec(dllimport) ZSTDLIB_VISIBLE /* It isn't required but allows to generate better code, saving a function pointer load from the IAT and an indirect jump.*/ +#else +# define ZSTDLIB_API ZSTDLIB_VISIBLE +#endif + +/* Deprecation warnings : + * Should these warnings be a problem, it is generally possible to disable them, + * typically with -Wno-deprecated-declarations for gcc or _CRT_SECURE_NO_WARNINGS in Visual. + * Otherwise, it's also possible to define ZSTD_DISABLE_DEPRECATE_WARNINGS. + */ +#ifdef ZSTD_DISABLE_DEPRECATE_WARNINGS +# define ZSTD_DEPRECATED(message) /* disable deprecation warnings */ +#else +# if defined (__cplusplus) && (__cplusplus >= 201402) /* C++14 or greater */ +# define ZSTD_DEPRECATED(message) [[deprecated(message)]] +# elif (defined(GNUC) && (GNUC > 4 || (GNUC == 4 && GNUC_MINOR >= 5))) || defined(__clang__) +# define ZSTD_DEPRECATED(message) __attribute__((deprecated(message))) +# elif defined(__GNUC__) && (__GNUC__ >= 3) +# define ZSTD_DEPRECATED(message) __attribute__((deprecated)) +# elif defined(_MSC_VER) +# define ZSTD_DEPRECATED(message) __declspec(deprecated(message)) +# else +# pragma message("WARNING: You need to implement ZSTD_DEPRECATED for this compiler") +# define ZSTD_DEPRECATED(message) +# endif +#endif /* ZSTD_DISABLE_DEPRECATE_WARNINGS */ + + +/******************************************************************************* + Introduction + + zstd, short for Zstandard, is a fast lossless compression algorithm, targeting + real-time compression scenarios at zlib-level and better compression ratios. + The zstd compression library provides in-memory compression and decompression + functions. + + The library supports regular compression levels from 1 up to ZSTD_maxCLevel(), + which is currently 22. Levels >= 20, labeled `--ultra`, should be used with + caution, as they require more memory. The library also offers negative + compression levels, which extend the range of speed vs. ratio preferences. + The lower the level, the faster the speed (at the cost of compression). + + Compression can be done in: + - a single step (described as Simple API) + - a single step, reusing a context (described as Explicit context) + - unbounded multiple steps (described as Streaming compression) + + The compression ratio achievable on small data can be highly improved using + a dictionary. Dictionary compression can be performed in: + - a single step (described as Simple dictionary API) + - a single step, reusing a dictionary (described as Bulk-processing + dictionary API) + + Advanced experimental functions can be accessed using + `#define ZSTD_STATIC_LINKING_ONLY` before including zstd.h. + + Advanced experimental APIs should never be used with a dynamically-linked + library. They are not "stable"; their definitions or signatures may change in + the future. Only static linking is allowed. +*******************************************************************************/ + +/*------ Version ------*/ +#define ZSTD_VERSION_MAJOR 1 +#define ZSTD_VERSION_MINOR 5 +#define ZSTD_VERSION_RELEASE 6 +#define ZSTD_VERSION_NUMBER (ZSTD_VERSION_MAJOR *100*100 + ZSTD_VERSION_MINOR *100 + ZSTD_VERSION_RELEASE) + +/*! ZSTD_versionNumber() : + * Return runtime library version, the value is (MAJOR*100*100 + MINOR*100 + RELEASE). */ +ZSTDLIB_API unsigned ZSTD_versionNumber(void); + +#define ZSTD_LIB_VERSION ZSTD_VERSION_MAJOR.ZSTD_VERSION_MINOR.ZSTD_VERSION_RELEASE +#define ZSTD_QUOTE(str) #str +#define ZSTD_EXPAND_AND_QUOTE(str) ZSTD_QUOTE(str) +#define ZSTD_VERSION_STRING ZSTD_EXPAND_AND_QUOTE(ZSTD_LIB_VERSION) + +/*! ZSTD_versionString() : + * Return runtime library version, like "1.4.5". Requires v1.3.0+. */ +ZSTDLIB_API const char* ZSTD_versionString(void); + +/* ************************************* + * Default constant + ***************************************/ +#ifndef ZSTD_CLEVEL_DEFAULT +# define ZSTD_CLEVEL_DEFAULT 3 +#endif + +/* ************************************* + * Constants + ***************************************/ + +/* All magic numbers are supposed read/written to/from files/memory using little-endian convention */ +#define ZSTD_MAGICNUMBER 0xFD2FB528 /* valid since v0.8.0 */ +#define ZSTD_MAGIC_DICTIONARY 0xEC30A437 /* valid since v0.7.0 */ +#define ZSTD_MAGIC_SKIPPABLE_START 0x184D2A50 /* all 16 values, from 0x184D2A50 to 0x184D2A5F, signal the beginning of a skippable frame */ +#define ZSTD_MAGIC_SKIPPABLE_MASK 0xFFFFFFF0 + +#define ZSTD_BLOCKSIZELOG_MAX 17 +#define ZSTD_BLOCKSIZE_MAX (1<= ZSTD_compressBound(srcSize)` guarantees that zstd will have + * enough space to successfully compress the data. + * @return : compressed size written into `dst` (<= `dstCapacity), + * or an error code if it fails (which can be tested using ZSTD_isError()). */ +ZSTDLIB_API size_t ZSTD_compress( void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + int compressionLevel); + +/*! ZSTD_decompress() : + * `compressedSize` : must be the _exact_ size of some number of compressed and/or skippable frames. + * `dstCapacity` is an upper bound of originalSize to regenerate. + * If user cannot imply a maximum upper bound, it's better to use streaming mode to decompress data. + * @return : the number of bytes decompressed into `dst` (<= `dstCapacity`), + * or an errorCode if it fails (which can be tested using ZSTD_isError()). */ +ZSTDLIB_API size_t ZSTD_decompress( void* dst, size_t dstCapacity, + const void* src, size_t compressedSize); + +/*! ZSTD_getFrameContentSize() : requires v1.3.0+ + * `src` should point to the start of a ZSTD encoded frame. + * `srcSize` must be at least as large as the frame header. + * hint : any size >= `ZSTD_frameHeaderSize_max` is large enough. + * @return : - decompressed size of `src` frame content, if known + * - ZSTD_CONTENTSIZE_UNKNOWN if the size cannot be determined + * - ZSTD_CONTENTSIZE_ERROR if an error occurred (e.g. invalid magic number, srcSize too small) + * note 1 : a 0 return value means the frame is valid but "empty". + * note 2 : decompressed size is an optional field, it may not be present, typically in streaming mode. + * When `return==ZSTD_CONTENTSIZE_UNKNOWN`, data to decompress could be any size. + * In which case, it's necessary to use streaming mode to decompress data. + * Optionally, application can rely on some implicit limit, + * as ZSTD_decompress() only needs an upper bound of decompressed size. + * (For example, data could be necessarily cut into blocks <= 16 KB). + * note 3 : decompressed size is always present when compression is completed using single-pass functions, + * such as ZSTD_compress(), ZSTD_compressCCtx() ZSTD_compress_usingDict() or ZSTD_compress_usingCDict(). + * note 4 : decompressed size can be very large (64-bits value), + * potentially larger than what local system can handle as a single memory segment. + * In which case, it's necessary to use streaming mode to decompress data. + * note 5 : If source is untrusted, decompressed size could be wrong or intentionally modified. + * Always ensure return value fits within application's authorized limits. + * Each application can set its own limits. + * note 6 : This function replaces ZSTD_getDecompressedSize() */ +#define ZSTD_CONTENTSIZE_UNKNOWN (0ULL - 1) +#define ZSTD_CONTENTSIZE_ERROR (0ULL - 2) +ZSTDLIB_API unsigned long long ZSTD_getFrameContentSize(const void *src, size_t srcSize); + +/*! ZSTD_getDecompressedSize() : + * NOTE: This function is now obsolete, in favor of ZSTD_getFrameContentSize(). + * Both functions work the same way, but ZSTD_getDecompressedSize() blends + * "empty", "unknown" and "error" results to the same return value (0), + * while ZSTD_getFrameContentSize() gives them separate return values. + * @return : decompressed size of `src` frame content _if known and not empty_, 0 otherwise. */ +ZSTD_DEPRECATED("Replaced by ZSTD_getFrameContentSize") +ZSTDLIB_API +unsigned long long ZSTD_getDecompressedSize(const void* src, size_t srcSize); + +/*! ZSTD_findFrameCompressedSize() : Requires v1.4.0+ + * `src` should point to the start of a ZSTD frame or skippable frame. + * `srcSize` must be >= first frame size + * @return : the compressed size of the first frame starting at `src`, + * suitable to pass as `srcSize` to `ZSTD_decompress` or similar, + * or an error code if input is invalid */ +ZSTDLIB_API size_t ZSTD_findFrameCompressedSize(const void* src, size_t srcSize); + + +/*====== Helper functions ======*/ +/* ZSTD_compressBound() : + * maximum compressed size in worst case single-pass scenario. + * When invoking `ZSTD_compress()` or any other one-pass compression function, + * it's recommended to provide @dstCapacity >= ZSTD_compressBound(srcSize) + * as it eliminates one potential failure scenario, + * aka not enough room in dst buffer to write the compressed frame. + * Note : ZSTD_compressBound() itself can fail, if @srcSize > ZSTD_MAX_INPUT_SIZE . + * In which case, ZSTD_compressBound() will return an error code + * which can be tested using ZSTD_isError(). + * + * ZSTD_COMPRESSBOUND() : + * same as ZSTD_compressBound(), but as a macro. + * It can be used to produce constants, which can be useful for static allocation, + * for example to size a static array on stack. + * Will produce constant value 0 if srcSize too large. + */ +#define ZSTD_MAX_INPUT_SIZE ((sizeof(size_t)==8) ? 0xFF00FF00FF00FF00ULL : 0xFF00FF00U) +#define ZSTD_COMPRESSBOUND(srcSize) (((size_t)(srcSize) >= ZSTD_MAX_INPUT_SIZE) ? 0 : (srcSize) + ((srcSize)>>8) + (((srcSize) < (128<<10)) ? (((128<<10) - (srcSize)) >> 11) /* margin, from 64 to 0 */ : 0)) /* this formula ensures that bound(A) + bound(B) <= bound(A+B) as long as A and B >= 128 KB */ +ZSTDLIB_API size_t ZSTD_compressBound(size_t srcSize); /*!< maximum compressed size in worst case single-pass scenario */ +/* ZSTD_isError() : + * Most ZSTD_* functions returning a size_t value can be tested for error, + * using ZSTD_isError(). + * @return 1 if error, 0 otherwise + */ +ZSTDLIB_API unsigned ZSTD_isError(size_t code); /*!< tells if a `size_t` function result is an error code */ +ZSTDLIB_API const char* ZSTD_getErrorName(size_t code); /*!< provides readable string from an error code */ +ZSTDLIB_API int ZSTD_minCLevel(void); /*!< minimum negative compression level allowed, requires v1.4.0+ */ +ZSTDLIB_API int ZSTD_maxCLevel(void); /*!< maximum compression level available */ +ZSTDLIB_API int ZSTD_defaultCLevel(void); /*!< default compression level, specified by ZSTD_CLEVEL_DEFAULT, requires v1.5.0+ */ + + +/*************************************** +* Explicit context +***************************************/ +/*= Compression context + * When compressing many times, + * it is recommended to allocate a context just once, + * and reuse it for each successive compression operation. + * This will make workload friendlier for system's memory. + * Note : re-using context is just a speed / resource optimization. + * It doesn't change the compression ratio, which remains identical. + * Note 2 : In multi-threaded environments, + * use one different context per thread for parallel execution. + */ +typedef struct ZSTD_CCtx_s ZSTD_CCtx; +ZSTDLIB_API ZSTD_CCtx* ZSTD_createCCtx(void); +ZSTDLIB_API size_t ZSTD_freeCCtx(ZSTD_CCtx* cctx); /* accept NULL pointer */ + +/*! ZSTD_compressCCtx() : + * Same as ZSTD_compress(), using an explicit ZSTD_CCtx. + * Important : in order to mirror `ZSTD_compress()` behavior, + * this function compresses at the requested compression level, + * __ignoring any other advanced parameter__ . + * If any advanced parameter was set using the advanced API, + * they will all be reset. Only `compressionLevel` remains. + */ +ZSTDLIB_API size_t ZSTD_compressCCtx(ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + int compressionLevel); + +/*= Decompression context + * When decompressing many times, + * it is recommended to allocate a context only once, + * and reuse it for each successive compression operation. + * This will make workload friendlier for system's memory. + * Use one context per thread for parallel execution. */ +typedef struct ZSTD_DCtx_s ZSTD_DCtx; +ZSTDLIB_API ZSTD_DCtx* ZSTD_createDCtx(void); +ZSTDLIB_API size_t ZSTD_freeDCtx(ZSTD_DCtx* dctx); /* accept NULL pointer */ + +/*! ZSTD_decompressDCtx() : + * Same as ZSTD_decompress(), + * requires an allocated ZSTD_DCtx. + * Compatible with sticky parameters (see below). + */ +ZSTDLIB_API size_t ZSTD_decompressDCtx(ZSTD_DCtx* dctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize); + + +/********************************************* +* Advanced compression API (Requires v1.4.0+) +**********************************************/ + +/* API design : + * Parameters are pushed one by one into an existing context, + * using ZSTD_CCtx_set*() functions. + * Pushed parameters are sticky : they are valid for next compressed frame, and any subsequent frame. + * "sticky" parameters are applicable to `ZSTD_compress2()` and `ZSTD_compressStream*()` ! + * __They do not apply to one-shot variants such as ZSTD_compressCCtx()__ . + * + * It's possible to reset all parameters to "default" using ZSTD_CCtx_reset(). + * + * This API supersedes all other "advanced" API entry points in the experimental section. + * In the future, we expect to remove API entry points from experimental which are redundant with this API. + */ + + +/* Compression strategies, listed from fastest to strongest */ +typedef enum { ZSTD_fast=1, + ZSTD_dfast=2, + ZSTD_greedy=3, + ZSTD_lazy=4, + ZSTD_lazy2=5, + ZSTD_btlazy2=6, + ZSTD_btopt=7, + ZSTD_btultra=8, + ZSTD_btultra2=9 + /* note : new strategies _might_ be added in the future. + Only the order (from fast to strong) is guaranteed */ +} ZSTD_strategy; + +typedef enum { + + /* compression parameters + * Note: When compressing with a ZSTD_CDict these parameters are superseded + * by the parameters used to construct the ZSTD_CDict. + * See ZSTD_CCtx_refCDict() for more info (superseded-by-cdict). */ + ZSTD_c_compressionLevel=100, /* Set compression parameters according to pre-defined cLevel table. + * Note that exact compression parameters are dynamically determined, + * depending on both compression level and srcSize (when known). + * Default level is ZSTD_CLEVEL_DEFAULT==3. + * Special: value 0 means default, which is controlled by ZSTD_CLEVEL_DEFAULT. + * Note 1 : it's possible to pass a negative compression level. + * Note 2 : setting a level does not automatically set all other compression parameters + * to default. Setting this will however eventually dynamically impact the compression + * parameters which have not been manually set. The manually set + * ones will 'stick'. */ + /* Advanced compression parameters : + * It's possible to pin down compression parameters to some specific values. + * In which case, these values are no longer dynamically selected by the compressor */ + ZSTD_c_windowLog=101, /* Maximum allowed back-reference distance, expressed as power of 2. + * This will set a memory budget for streaming decompression, + * with larger values requiring more memory + * and typically compressing more. + * Must be clamped between ZSTD_WINDOWLOG_MIN and ZSTD_WINDOWLOG_MAX. + * Special: value 0 means "use default windowLog". + * Note: Using a windowLog greater than ZSTD_WINDOWLOG_LIMIT_DEFAULT + * requires explicitly allowing such size at streaming decompression stage. */ + ZSTD_c_hashLog=102, /* Size of the initial probe table, as a power of 2. + * Resulting memory usage is (1 << (hashLog+2)). + * Must be clamped between ZSTD_HASHLOG_MIN and ZSTD_HASHLOG_MAX. + * Larger tables improve compression ratio of strategies <= dFast, + * and improve speed of strategies > dFast. + * Special: value 0 means "use default hashLog". */ + ZSTD_c_chainLog=103, /* Size of the multi-probe search table, as a power of 2. + * Resulting memory usage is (1 << (chainLog+2)). + * Must be clamped between ZSTD_CHAINLOG_MIN and ZSTD_CHAINLOG_MAX. + * Larger tables result in better and slower compression. + * This parameter is useless for "fast" strategy. + * It's still useful when using "dfast" strategy, + * in which case it defines a secondary probe table. + * Special: value 0 means "use default chainLog". */ + ZSTD_c_searchLog=104, /* Number of search attempts, as a power of 2. + * More attempts result in better and slower compression. + * This parameter is useless for "fast" and "dFast" strategies. + * Special: value 0 means "use default searchLog". */ + ZSTD_c_minMatch=105, /* Minimum size of searched matches. + * Note that Zstandard can still find matches of smaller size, + * it just tweaks its search algorithm to look for this size and larger. + * Larger values increase compression and decompression speed, but decrease ratio. + * Must be clamped between ZSTD_MINMATCH_MIN and ZSTD_MINMATCH_MAX. + * Note that currently, for all strategies < btopt, effective minimum is 4. + * , for all strategies > fast, effective maximum is 6. + * Special: value 0 means "use default minMatchLength". */ + ZSTD_c_targetLength=106, /* Impact of this field depends on strategy. + * For strategies btopt, btultra & btultra2: + * Length of Match considered "good enough" to stop search. + * Larger values make compression stronger, and slower. + * For strategy fast: + * Distance between match sampling. + * Larger values make compression faster, and weaker. + * Special: value 0 means "use default targetLength". */ + ZSTD_c_strategy=107, /* See ZSTD_strategy enum definition. + * The higher the value of selected strategy, the more complex it is, + * resulting in stronger and slower compression. + * Special: value 0 means "use default strategy". */ + + ZSTD_c_targetCBlockSize=130, /* v1.5.6+ + * Attempts to fit compressed block size into approximatively targetCBlockSize. + * Bound by ZSTD_TARGETCBLOCKSIZE_MIN and ZSTD_TARGETCBLOCKSIZE_MAX. + * Note that it's not a guarantee, just a convergence target (default:0). + * No target when targetCBlockSize == 0. + * This is helpful in low bandwidth streaming environments to improve end-to-end latency, + * when a client can make use of partial documents (a prominent example being Chrome). + * Note: this parameter is stable since v1.5.6. + * It was present as an experimental parameter in earlier versions, + * but it's not recommended using it with earlier library versions + * due to massive performance regressions. + */ + /* LDM mode parameters */ + ZSTD_c_enableLongDistanceMatching=160, /* Enable long distance matching. + * This parameter is designed to improve compression ratio + * for large inputs, by finding large matches at long distance. + * It increases memory usage and window size. + * Note: enabling this parameter increases default ZSTD_c_windowLog to 128 MB + * except when expressly set to a different value. + * Note: will be enabled by default if ZSTD_c_windowLog >= 128 MB and + * compression strategy >= ZSTD_btopt (== compression level 16+) */ + ZSTD_c_ldmHashLog=161, /* Size of the table for long distance matching, as a power of 2. + * Larger values increase memory usage and compression ratio, + * but decrease compression speed. + * Must be clamped between ZSTD_HASHLOG_MIN and ZSTD_HASHLOG_MAX + * default: windowlog - 7. + * Special: value 0 means "automatically determine hashlog". */ + ZSTD_c_ldmMinMatch=162, /* Minimum match size for long distance matcher. + * Larger/too small values usually decrease compression ratio. + * Must be clamped between ZSTD_LDM_MINMATCH_MIN and ZSTD_LDM_MINMATCH_MAX. + * Special: value 0 means "use default value" (default: 64). */ + ZSTD_c_ldmBucketSizeLog=163, /* Log size of each bucket in the LDM hash table for collision resolution. + * Larger values improve collision resolution but decrease compression speed. + * The maximum value is ZSTD_LDM_BUCKETSIZELOG_MAX. + * Special: value 0 means "use default value" (default: 3). */ + ZSTD_c_ldmHashRateLog=164, /* Frequency of inserting/looking up entries into the LDM hash table. + * Must be clamped between 0 and (ZSTD_WINDOWLOG_MAX - ZSTD_HASHLOG_MIN). + * Default is MAX(0, (windowLog - ldmHashLog)), optimizing hash table usage. + * Larger values improve compression speed. + * Deviating far from default value will likely result in a compression ratio decrease. + * Special: value 0 means "automatically determine hashRateLog". */ + + /* frame parameters */ + ZSTD_c_contentSizeFlag=200, /* Content size will be written into frame header _whenever known_ (default:1) + * Content size must be known at the beginning of compression. + * This is automatically the case when using ZSTD_compress2(), + * For streaming scenarios, content size must be provided with ZSTD_CCtx_setPledgedSrcSize() */ + ZSTD_c_checksumFlag=201, /* A 32-bits checksum of content is written at end of frame (default:0) */ + ZSTD_c_dictIDFlag=202, /* When applicable, dictionary's ID is written into frame header (default:1) */ + + /* multi-threading parameters */ + /* These parameters are only active if multi-threading is enabled (compiled with build macro ZSTD_MULTITHREAD). + * Otherwise, trying to set any other value than default (0) will be a no-op and return an error. + * In a situation where it's unknown if the linked library supports multi-threading or not, + * setting ZSTD_c_nbWorkers to any value >= 1 and consulting the return value provides a quick way to check this property. + */ + ZSTD_c_nbWorkers=400, /* Select how many threads will be spawned to compress in parallel. + * When nbWorkers >= 1, triggers asynchronous mode when invoking ZSTD_compressStream*() : + * ZSTD_compressStream*() consumes input and flush output if possible, but immediately gives back control to caller, + * while compression is performed in parallel, within worker thread(s). + * (note : a strong exception to this rule is when first invocation of ZSTD_compressStream2() sets ZSTD_e_end : + * in which case, ZSTD_compressStream2() delegates to ZSTD_compress2(), which is always a blocking call). + * More workers improve speed, but also increase memory usage. + * Default value is `0`, aka "single-threaded mode" : no worker is spawned, + * compression is performed inside Caller's thread, and all invocations are blocking */ + ZSTD_c_jobSize=401, /* Size of a compression job. This value is enforced only when nbWorkers >= 1. + * Each compression job is completed in parallel, so this value can indirectly impact the nb of active threads. + * 0 means default, which is dynamically determined based on compression parameters. + * Job size must be a minimum of overlap size, or ZSTDMT_JOBSIZE_MIN (= 512 KB), whichever is largest. + * The minimum size is automatically and transparently enforced. */ + ZSTD_c_overlapLog=402, /* Control the overlap size, as a fraction of window size. + * The overlap size is an amount of data reloaded from previous job at the beginning of a new job. + * It helps preserve compression ratio, while each job is compressed in parallel. + * This value is enforced only when nbWorkers >= 1. + * Larger values increase compression ratio, but decrease speed. + * Possible values range from 0 to 9 : + * - 0 means "default" : value will be determined by the library, depending on strategy + * - 1 means "no overlap" + * - 9 means "full overlap", using a full window size. + * Each intermediate rank increases/decreases load size by a factor 2 : + * 9: full window; 8: w/2; 7: w/4; 6: w/8; 5:w/16; 4: w/32; 3:w/64; 2:w/128; 1:no overlap; 0:default + * default value varies between 6 and 9, depending on strategy */ + + /* note : additional experimental parameters are also available + * within the experimental section of the API. + * At the time of this writing, they include : + * ZSTD_c_rsyncable + * ZSTD_c_format + * ZSTD_c_forceMaxWindow + * ZSTD_c_forceAttachDict + * ZSTD_c_literalCompressionMode + * ZSTD_c_srcSizeHint + * ZSTD_c_enableDedicatedDictSearch + * ZSTD_c_stableInBuffer + * ZSTD_c_stableOutBuffer + * ZSTD_c_blockDelimiters + * ZSTD_c_validateSequences + * ZSTD_c_useBlockSplitter + * ZSTD_c_useRowMatchFinder + * ZSTD_c_prefetchCDictTables + * ZSTD_c_enableSeqProducerFallback + * ZSTD_c_maxBlockSize + * Because they are not stable, it's necessary to define ZSTD_STATIC_LINKING_ONLY to access them. + * note : never ever use experimentalParam? names directly; + * also, the enums values themselves are unstable and can still change. + */ + ZSTD_c_experimentalParam1=500, + ZSTD_c_experimentalParam2=10, + ZSTD_c_experimentalParam3=1000, + ZSTD_c_experimentalParam4=1001, + ZSTD_c_experimentalParam5=1002, + /* was ZSTD_c_experimentalParam6=1003; is now ZSTD_c_targetCBlockSize */ + ZSTD_c_experimentalParam7=1004, + ZSTD_c_experimentalParam8=1005, + ZSTD_c_experimentalParam9=1006, + ZSTD_c_experimentalParam10=1007, + ZSTD_c_experimentalParam11=1008, + ZSTD_c_experimentalParam12=1009, + ZSTD_c_experimentalParam13=1010, + ZSTD_c_experimentalParam14=1011, + ZSTD_c_experimentalParam15=1012, + ZSTD_c_experimentalParam16=1013, + ZSTD_c_experimentalParam17=1014, + ZSTD_c_experimentalParam18=1015, + ZSTD_c_experimentalParam19=1016 +} ZSTD_cParameter; + +typedef struct { + size_t error; + int lowerBound; + int upperBound; +} ZSTD_bounds; + +/*! ZSTD_cParam_getBounds() : + * All parameters must belong to an interval with lower and upper bounds, + * otherwise they will either trigger an error or be automatically clamped. + * @return : a structure, ZSTD_bounds, which contains + * - an error status field, which must be tested using ZSTD_isError() + * - lower and upper bounds, both inclusive + */ +ZSTDLIB_API ZSTD_bounds ZSTD_cParam_getBounds(ZSTD_cParameter cParam); + +/*! ZSTD_CCtx_setParameter() : + * Set one compression parameter, selected by enum ZSTD_cParameter. + * All parameters have valid bounds. Bounds can be queried using ZSTD_cParam_getBounds(). + * Providing a value beyond bound will either clamp it, or trigger an error (depending on parameter). + * Setting a parameter is generally only possible during frame initialization (before starting compression). + * Exception : when using multi-threading mode (nbWorkers >= 1), + * the following parameters can be updated _during_ compression (within same frame): + * => compressionLevel, hashLog, chainLog, searchLog, minMatch, targetLength and strategy. + * new parameters will be active for next job only (after a flush()). + * @return : an error code (which can be tested using ZSTD_isError()). + */ +ZSTDLIB_API size_t ZSTD_CCtx_setParameter(ZSTD_CCtx* cctx, ZSTD_cParameter param, int value); + +/*! ZSTD_CCtx_setPledgedSrcSize() : + * Total input data size to be compressed as a single frame. + * Value will be written in frame header, unless if explicitly forbidden using ZSTD_c_contentSizeFlag. + * This value will also be controlled at end of frame, and trigger an error if not respected. + * @result : 0, or an error code (which can be tested with ZSTD_isError()). + * Note 1 : pledgedSrcSize==0 actually means zero, aka an empty frame. + * In order to mean "unknown content size", pass constant ZSTD_CONTENTSIZE_UNKNOWN. + * ZSTD_CONTENTSIZE_UNKNOWN is default value for any new frame. + * Note 2 : pledgedSrcSize is only valid once, for the next frame. + * It's discarded at the end of the frame, and replaced by ZSTD_CONTENTSIZE_UNKNOWN. + * Note 3 : Whenever all input data is provided and consumed in a single round, + * for example with ZSTD_compress2(), + * or invoking immediately ZSTD_compressStream2(,,,ZSTD_e_end), + * this value is automatically overridden by srcSize instead. + */ +ZSTDLIB_API size_t ZSTD_CCtx_setPledgedSrcSize(ZSTD_CCtx* cctx, unsigned long long pledgedSrcSize); + +typedef enum { + ZSTD_reset_session_only = 1, + ZSTD_reset_parameters = 2, + ZSTD_reset_session_and_parameters = 3 +} ZSTD_ResetDirective; + +/*! ZSTD_CCtx_reset() : + * There are 2 different things that can be reset, independently or jointly : + * - The session : will stop compressing current frame, and make CCtx ready to start a new one. + * Useful after an error, or to interrupt any ongoing compression. + * Any internal data not yet flushed is cancelled. + * Compression parameters and dictionary remain unchanged. + * They will be used to compress next frame. + * Resetting session never fails. + * - The parameters : changes all parameters back to "default". + * This also removes any reference to any dictionary or external sequence producer. + * Parameters can only be changed between 2 sessions (i.e. no compression is currently ongoing) + * otherwise the reset fails, and function returns an error value (which can be tested using ZSTD_isError()) + * - Both : similar to resetting the session, followed by resetting parameters. + */ +ZSTDLIB_API size_t ZSTD_CCtx_reset(ZSTD_CCtx* cctx, ZSTD_ResetDirective reset); + +/*! ZSTD_compress2() : + * Behave the same as ZSTD_compressCCtx(), but compression parameters are set using the advanced API. + * (note that this entry point doesn't even expose a compression level parameter). + * ZSTD_compress2() always starts a new frame. + * Should cctx hold data from a previously unfinished frame, everything about it is forgotten. + * - Compression parameters are pushed into CCtx before starting compression, using ZSTD_CCtx_set*() + * - The function is always blocking, returns when compression is completed. + * NOTE: Providing `dstCapacity >= ZSTD_compressBound(srcSize)` guarantees that zstd will have + * enough space to successfully compress the data, though it is possible it fails for other reasons. + * @return : compressed size written into `dst` (<= `dstCapacity), + * or an error code if it fails (which can be tested using ZSTD_isError()). + */ +ZSTDLIB_API size_t ZSTD_compress2( ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize); + + +/*********************************************** +* Advanced decompression API (Requires v1.4.0+) +************************************************/ + +/* The advanced API pushes parameters one by one into an existing DCtx context. + * Parameters are sticky, and remain valid for all following frames + * using the same DCtx context. + * It's possible to reset parameters to default values using ZSTD_DCtx_reset(). + * Note : This API is compatible with existing ZSTD_decompressDCtx() and ZSTD_decompressStream(). + * Therefore, no new decompression function is necessary. + */ + +typedef enum { + + ZSTD_d_windowLogMax=100, /* Select a size limit (in power of 2) beyond which + * the streaming API will refuse to allocate memory buffer + * in order to protect the host from unreasonable memory requirements. + * This parameter is only useful in streaming mode, since no internal buffer is allocated in single-pass mode. + * By default, a decompression context accepts window sizes <= (1 << ZSTD_WINDOWLOG_LIMIT_DEFAULT). + * Special: value 0 means "use default maximum windowLog". */ + + /* note : additional experimental parameters are also available + * within the experimental section of the API. + * At the time of this writing, they include : + * ZSTD_d_format + * ZSTD_d_stableOutBuffer + * ZSTD_d_forceIgnoreChecksum + * ZSTD_d_refMultipleDDicts + * ZSTD_d_disableHuffmanAssembly + * ZSTD_d_maxBlockSize + * Because they are not stable, it's necessary to define ZSTD_STATIC_LINKING_ONLY to access them. + * note : never ever use experimentalParam? names directly + */ + ZSTD_d_experimentalParam1=1000, + ZSTD_d_experimentalParam2=1001, + ZSTD_d_experimentalParam3=1002, + ZSTD_d_experimentalParam4=1003, + ZSTD_d_experimentalParam5=1004, + ZSTD_d_experimentalParam6=1005 + +} ZSTD_dParameter; + +/*! ZSTD_dParam_getBounds() : + * All parameters must belong to an interval with lower and upper bounds, + * otherwise they will either trigger an error or be automatically clamped. + * @return : a structure, ZSTD_bounds, which contains + * - an error status field, which must be tested using ZSTD_isError() + * - both lower and upper bounds, inclusive + */ +ZSTDLIB_API ZSTD_bounds ZSTD_dParam_getBounds(ZSTD_dParameter dParam); + +/*! ZSTD_DCtx_setParameter() : + * Set one compression parameter, selected by enum ZSTD_dParameter. + * All parameters have valid bounds. Bounds can be queried using ZSTD_dParam_getBounds(). + * Providing a value beyond bound will either clamp it, or trigger an error (depending on parameter). + * Setting a parameter is only possible during frame initialization (before starting decompression). + * @return : 0, or an error code (which can be tested using ZSTD_isError()). + */ +ZSTDLIB_API size_t ZSTD_DCtx_setParameter(ZSTD_DCtx* dctx, ZSTD_dParameter param, int value); + +/*! ZSTD_DCtx_reset() : + * Return a DCtx to clean state. + * Session and parameters can be reset jointly or separately. + * Parameters can only be reset when no active frame is being decompressed. + * @return : 0, or an error code, which can be tested with ZSTD_isError() + */ +ZSTDLIB_API size_t ZSTD_DCtx_reset(ZSTD_DCtx* dctx, ZSTD_ResetDirective reset); + + +/**************************** +* Streaming +****************************/ + +typedef struct ZSTD_inBuffer_s { + const void* src; /**< start of input buffer */ + size_t size; /**< size of input buffer */ + size_t pos; /**< position where reading stopped. Will be updated. Necessarily 0 <= pos <= size */ +} ZSTD_inBuffer; + +typedef struct ZSTD_outBuffer_s { + void* dst; /**< start of output buffer */ + size_t size; /**< size of output buffer */ + size_t pos; /**< position where writing stopped. Will be updated. Necessarily 0 <= pos <= size */ +} ZSTD_outBuffer; + + + +/*-*********************************************************************** +* Streaming compression - HowTo +* +* A ZSTD_CStream object is required to track streaming operation. +* Use ZSTD_createCStream() and ZSTD_freeCStream() to create/release resources. +* ZSTD_CStream objects can be reused multiple times on consecutive compression operations. +* It is recommended to reuse ZSTD_CStream since it will play nicer with system's memory, by re-using already allocated memory. +* +* For parallel execution, use one separate ZSTD_CStream per thread. +* +* note : since v1.3.0, ZSTD_CStream and ZSTD_CCtx are the same thing. +* +* Parameters are sticky : when starting a new compression on the same context, +* it will reuse the same sticky parameters as previous compression session. +* When in doubt, it's recommended to fully initialize the context before usage. +* Use ZSTD_CCtx_reset() to reset the context and ZSTD_CCtx_setParameter(), +* ZSTD_CCtx_setPledgedSrcSize(), or ZSTD_CCtx_loadDictionary() and friends to +* set more specific parameters, the pledged source size, or load a dictionary. +* +* Use ZSTD_compressStream2() with ZSTD_e_continue as many times as necessary to +* consume input stream. The function will automatically update both `pos` +* fields within `input` and `output`. +* Note that the function may not consume the entire input, for example, because +* the output buffer is already full, in which case `input.pos < input.size`. +* The caller must check if input has been entirely consumed. +* If not, the caller must make some room to receive more compressed data, +* and then present again remaining input data. +* note: ZSTD_e_continue is guaranteed to make some forward progress when called, +* but doesn't guarantee maximal forward progress. This is especially relevant +* when compressing with multiple threads. The call won't block if it can +* consume some input, but if it can't it will wait for some, but not all, +* output to be flushed. +* @return : provides a minimum amount of data remaining to be flushed from internal buffers +* or an error code, which can be tested using ZSTD_isError(). +* +* At any moment, it's possible to flush whatever data might remain stuck within internal buffer, +* using ZSTD_compressStream2() with ZSTD_e_flush. `output->pos` will be updated. +* Note that, if `output->size` is too small, a single invocation with ZSTD_e_flush might not be enough (return code > 0). +* In which case, make some room to receive more compressed data, and call again ZSTD_compressStream2() with ZSTD_e_flush. +* You must continue calling ZSTD_compressStream2() with ZSTD_e_flush until it returns 0, at which point you can change the +* operation. +* note: ZSTD_e_flush will flush as much output as possible, meaning when compressing with multiple threads, it will +* block until the flush is complete or the output buffer is full. +* @return : 0 if internal buffers are entirely flushed, +* >0 if some data still present within internal buffer (the value is minimal estimation of remaining size), +* or an error code, which can be tested using ZSTD_isError(). +* +* Calling ZSTD_compressStream2() with ZSTD_e_end instructs to finish a frame. +* It will perform a flush and write frame epilogue. +* The epilogue is required for decoders to consider a frame completed. +* flush operation is the same, and follows same rules as calling ZSTD_compressStream2() with ZSTD_e_flush. +* You must continue calling ZSTD_compressStream2() with ZSTD_e_end until it returns 0, at which point you are free to +* start a new frame. +* note: ZSTD_e_end will flush as much output as possible, meaning when compressing with multiple threads, it will +* block until the flush is complete or the output buffer is full. +* @return : 0 if frame fully completed and fully flushed, +* >0 if some data still present within internal buffer (the value is minimal estimation of remaining size), +* or an error code, which can be tested using ZSTD_isError(). +* +* *******************************************************************/ + +typedef ZSTD_CCtx ZSTD_CStream; /**< CCtx and CStream are now effectively same object (>= v1.3.0) */ + /* Continue to distinguish them for compatibility with older versions <= v1.2.0 */ +/*===== ZSTD_CStream management functions =====*/ +ZSTDLIB_API ZSTD_CStream* ZSTD_createCStream(void); +ZSTDLIB_API size_t ZSTD_freeCStream(ZSTD_CStream* zcs); /* accept NULL pointer */ + +/*===== Streaming compression functions =====*/ +typedef enum { + ZSTD_e_continue=0, /* collect more data, encoder decides when to output compressed result, for optimal compression ratio */ + ZSTD_e_flush=1, /* flush any data provided so far, + * it creates (at least) one new block, that can be decoded immediately on reception; + * frame will continue: any future data can still reference previously compressed data, improving compression. + * note : multithreaded compression will block to flush as much output as possible. */ + ZSTD_e_end=2 /* flush any remaining data _and_ close current frame. + * note that frame is only closed after compressed data is fully flushed (return value == 0). + * After that point, any additional data starts a new frame. + * note : each frame is independent (does not reference any content from previous frame). + : note : multithreaded compression will block to flush as much output as possible. */ +} ZSTD_EndDirective; + +/*! ZSTD_compressStream2() : Requires v1.4.0+ + * Behaves about the same as ZSTD_compressStream, with additional control on end directive. + * - Compression parameters are pushed into CCtx before starting compression, using ZSTD_CCtx_set*() + * - Compression parameters cannot be changed once compression is started (save a list of exceptions in multi-threading mode) + * - output->pos must be <= dstCapacity, input->pos must be <= srcSize + * - output->pos and input->pos will be updated. They are guaranteed to remain below their respective limit. + * - endOp must be a valid directive + * - When nbWorkers==0 (default), function is blocking : it completes its job before returning to caller. + * - When nbWorkers>=1, function is non-blocking : it copies a portion of input, distributes jobs to internal worker threads, flush to output whatever is available, + * and then immediately returns, just indicating that there is some data remaining to be flushed. + * The function nonetheless guarantees forward progress : it will return only after it reads or write at least 1+ byte. + * - Exception : if the first call requests a ZSTD_e_end directive and provides enough dstCapacity, the function delegates to ZSTD_compress2() which is always blocking. + * - @return provides a minimum amount of data remaining to be flushed from internal buffers + * or an error code, which can be tested using ZSTD_isError(). + * if @return != 0, flush is not fully completed, there is still some data left within internal buffers. + * This is useful for ZSTD_e_flush, since in this case more flushes are necessary to empty all buffers. + * For ZSTD_e_end, @return == 0 when internal buffers are fully flushed and frame is completed. + * - after a ZSTD_e_end directive, if internal buffer is not fully flushed (@return != 0), + * only ZSTD_e_end or ZSTD_e_flush operations are allowed. + * Before starting a new compression job, or changing compression parameters, + * it is required to fully flush internal buffers. + * - note: if an operation ends with an error, it may leave @cctx in an undefined state. + * Therefore, it's UB to invoke ZSTD_compressStream2() of ZSTD_compressStream() on such a state. + * In order to be re-employed after an error, a state must be reset, + * which can be done explicitly (ZSTD_CCtx_reset()), + * or is sometimes implied by methods starting a new compression job (ZSTD_initCStream(), ZSTD_compressCCtx()) + */ +ZSTDLIB_API size_t ZSTD_compressStream2( ZSTD_CCtx* cctx, + ZSTD_outBuffer* output, + ZSTD_inBuffer* input, + ZSTD_EndDirective endOp); + + +/* These buffer sizes are softly recommended. + * They are not required : ZSTD_compressStream*() happily accepts any buffer size, for both input and output. + * Respecting the recommended size just makes it a bit easier for ZSTD_compressStream*(), + * reducing the amount of memory shuffling and buffering, resulting in minor performance savings. + * + * However, note that these recommendations are from the perspective of a C caller program. + * If the streaming interface is invoked from some other language, + * especially managed ones such as Java or Go, through a foreign function interface such as jni or cgo, + * a major performance rule is to reduce crossing such interface to an absolute minimum. + * It's not rare that performance ends being spent more into the interface, rather than compression itself. + * In which cases, prefer using large buffers, as large as practical, + * for both input and output, to reduce the nb of roundtrips. + */ +ZSTDLIB_API size_t ZSTD_CStreamInSize(void); /**< recommended size for input buffer */ +ZSTDLIB_API size_t ZSTD_CStreamOutSize(void); /**< recommended size for output buffer. Guarantee to successfully flush at least one complete compressed block. */ + + +/* ***************************************************************************** + * This following is a legacy streaming API, available since v1.0+ . + * It can be replaced by ZSTD_CCtx_reset() and ZSTD_compressStream2(). + * It is redundant, but remains fully supported. + ******************************************************************************/ + +/*! + * Equivalent to: + * + * ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only); + * ZSTD_CCtx_refCDict(zcs, NULL); // clear the dictionary (if any) + * ZSTD_CCtx_setParameter(zcs, ZSTD_c_compressionLevel, compressionLevel); + * + * Note that ZSTD_initCStream() clears any previously set dictionary. Use the new API + * to compress with a dictionary. + */ +ZSTDLIB_API size_t ZSTD_initCStream(ZSTD_CStream* zcs, int compressionLevel); +/*! + * Alternative for ZSTD_compressStream2(zcs, output, input, ZSTD_e_continue). + * NOTE: The return value is different. ZSTD_compressStream() returns a hint for + * the next read size (if non-zero and not an error). ZSTD_compressStream2() + * returns the minimum nb of bytes left to flush (if non-zero and not an error). + */ +ZSTDLIB_API size_t ZSTD_compressStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output, ZSTD_inBuffer* input); +/*! Equivalent to ZSTD_compressStream2(zcs, output, &emptyInput, ZSTD_e_flush). */ +ZSTDLIB_API size_t ZSTD_flushStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output); +/*! Equivalent to ZSTD_compressStream2(zcs, output, &emptyInput, ZSTD_e_end). */ +ZSTDLIB_API size_t ZSTD_endStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output); + + +/*-*************************************************************************** +* Streaming decompression - HowTo +* +* A ZSTD_DStream object is required to track streaming operations. +* Use ZSTD_createDStream() and ZSTD_freeDStream() to create/release resources. +* ZSTD_DStream objects can be reused multiple times. +* +* Use ZSTD_initDStream() to start a new decompression operation. +* @return : recommended first input size +* Alternatively, use advanced API to set specific properties. +* +* Use ZSTD_decompressStream() repetitively to consume your input. +* The function will update both `pos` fields. +* If `input.pos < input.size`, some input has not been consumed. +* It's up to the caller to present again remaining data. +* The function tries to flush all data decoded immediately, respecting output buffer size. +* If `output.pos < output.size`, decoder has flushed everything it could. +* But if `output.pos == output.size`, there might be some data left within internal buffers., +* In which case, call ZSTD_decompressStream() again to flush whatever remains in the buffer. +* Note : with no additional input provided, amount of data flushed is necessarily <= ZSTD_BLOCKSIZE_MAX. +* @return : 0 when a frame is completely decoded and fully flushed, +* or an error code, which can be tested using ZSTD_isError(), +* or any other value > 0, which means there is still some decoding or flushing to do to complete current frame : +* the return value is a suggested next input size (just a hint for better latency) +* that will never request more than the remaining frame size. +* *******************************************************************************/ + +typedef ZSTD_DCtx ZSTD_DStream; /**< DCtx and DStream are now effectively same object (>= v1.3.0) */ + /* For compatibility with versions <= v1.2.0, prefer differentiating them. */ +/*===== ZSTD_DStream management functions =====*/ +ZSTDLIB_API ZSTD_DStream* ZSTD_createDStream(void); +ZSTDLIB_API size_t ZSTD_freeDStream(ZSTD_DStream* zds); /* accept NULL pointer */ + +/*===== Streaming decompression functions =====*/ + +/*! ZSTD_initDStream() : + * Initialize/reset DStream state for new decompression operation. + * Call before new decompression operation using same DStream. + * + * Note : This function is redundant with the advanced API and equivalent to: + * ZSTD_DCtx_reset(zds, ZSTD_reset_session_only); + * ZSTD_DCtx_refDDict(zds, NULL); + */ +ZSTDLIB_API size_t ZSTD_initDStream(ZSTD_DStream* zds); + +/*! ZSTD_decompressStream() : + * Streaming decompression function. + * Call repetitively to consume full input updating it as necessary. + * Function will update both input and output `pos` fields exposing current state via these fields: + * - `input.pos < input.size`, some input remaining and caller should provide remaining input + * on the next call. + * - `output.pos < output.size`, decoder finished and flushed all remaining buffers. + * - `output.pos == output.size`, potentially uncflushed data present in the internal buffers, + * call ZSTD_decompressStream() again to flush remaining data to output. + * Note : with no additional input, amount of data flushed <= ZSTD_BLOCKSIZE_MAX. + * + * @return : 0 when a frame is completely decoded and fully flushed, + * or an error code, which can be tested using ZSTD_isError(), + * or any other value > 0, which means there is some decoding or flushing to do to complete current frame. + * + * Note: when an operation returns with an error code, the @zds state may be left in undefined state. + * It's UB to invoke `ZSTD_decompressStream()` on such a state. + * In order to re-use such a state, it must be first reset, + * which can be done explicitly (`ZSTD_DCtx_reset()`), + * or is implied for operations starting some new decompression job (`ZSTD_initDStream`, `ZSTD_decompressDCtx()`, `ZSTD_decompress_usingDict()`) + */ +ZSTDLIB_API size_t ZSTD_decompressStream(ZSTD_DStream* zds, ZSTD_outBuffer* output, ZSTD_inBuffer* input); + +ZSTDLIB_API size_t ZSTD_DStreamInSize(void); /*!< recommended size for input buffer */ +ZSTDLIB_API size_t ZSTD_DStreamOutSize(void); /*!< recommended size for output buffer. Guarantee to successfully flush at least one complete block in all circumstances. */ + + +/************************** +* Simple dictionary API +***************************/ +/*! ZSTD_compress_usingDict() : + * Compression at an explicit compression level using a Dictionary. + * A dictionary can be any arbitrary data segment (also called a prefix), + * or a buffer with specified information (see zdict.h). + * Note : This function loads the dictionary, resulting in significant startup delay. + * It's intended for a dictionary used only once. + * Note 2 : When `dict == NULL || dictSize < 8` no dictionary is used. */ +ZSTDLIB_API size_t ZSTD_compress_usingDict(ZSTD_CCtx* ctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + const void* dict,size_t dictSize, + int compressionLevel); + +/*! ZSTD_decompress_usingDict() : + * Decompression using a known Dictionary. + * Dictionary must be identical to the one used during compression. + * Note : This function loads the dictionary, resulting in significant startup delay. + * It's intended for a dictionary used only once. + * Note : When `dict == NULL || dictSize < 8` no dictionary is used. */ +ZSTDLIB_API size_t ZSTD_decompress_usingDict(ZSTD_DCtx* dctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + const void* dict,size_t dictSize); + + +/*********************************** + * Bulk processing dictionary API + **********************************/ +typedef struct ZSTD_CDict_s ZSTD_CDict; + +/*! ZSTD_createCDict() : + * When compressing multiple messages or blocks using the same dictionary, + * it's recommended to digest the dictionary only once, since it's a costly operation. + * ZSTD_createCDict() will create a state from digesting a dictionary. + * The resulting state can be used for future compression operations with very limited startup cost. + * ZSTD_CDict can be created once and shared by multiple threads concurrently, since its usage is read-only. + * @dictBuffer can be released after ZSTD_CDict creation, because its content is copied within CDict. + * Note 1 : Consider experimental function `ZSTD_createCDict_byReference()` if you prefer to not duplicate @dictBuffer content. + * Note 2 : A ZSTD_CDict can be created from an empty @dictBuffer, + * in which case the only thing that it transports is the @compressionLevel. + * This can be useful in a pipeline featuring ZSTD_compress_usingCDict() exclusively, + * expecting a ZSTD_CDict parameter with any data, including those without a known dictionary. */ +ZSTDLIB_API ZSTD_CDict* ZSTD_createCDict(const void* dictBuffer, size_t dictSize, + int compressionLevel); + +/*! ZSTD_freeCDict() : + * Function frees memory allocated by ZSTD_createCDict(). + * If a NULL pointer is passed, no operation is performed. */ +ZSTDLIB_API size_t ZSTD_freeCDict(ZSTD_CDict* CDict); + +/*! ZSTD_compress_usingCDict() : + * Compression using a digested Dictionary. + * Recommended when same dictionary is used multiple times. + * Note : compression level is _decided at dictionary creation time_, + * and frame parameters are hardcoded (dictID=yes, contentSize=yes, checksum=no) */ +ZSTDLIB_API size_t ZSTD_compress_usingCDict(ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + const ZSTD_CDict* cdict); + + +typedef struct ZSTD_DDict_s ZSTD_DDict; + +/*! ZSTD_createDDict() : + * Create a digested dictionary, ready to start decompression operation without startup delay. + * dictBuffer can be released after DDict creation, as its content is copied inside DDict. */ +ZSTDLIB_API ZSTD_DDict* ZSTD_createDDict(const void* dictBuffer, size_t dictSize); + +/*! ZSTD_freeDDict() : + * Function frees memory allocated with ZSTD_createDDict() + * If a NULL pointer is passed, no operation is performed. */ +ZSTDLIB_API size_t ZSTD_freeDDict(ZSTD_DDict* ddict); + +/*! ZSTD_decompress_usingDDict() : + * Decompression using a digested Dictionary. + * Recommended when same dictionary is used multiple times. */ +ZSTDLIB_API size_t ZSTD_decompress_usingDDict(ZSTD_DCtx* dctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + const ZSTD_DDict* ddict); + + +/******************************** + * Dictionary helper functions + *******************************/ + +/*! ZSTD_getDictID_fromDict() : Requires v1.4.0+ + * Provides the dictID stored within dictionary. + * if @return == 0, the dictionary is not conformant with Zstandard specification. + * It can still be loaded, but as a content-only dictionary. */ +ZSTDLIB_API unsigned ZSTD_getDictID_fromDict(const void* dict, size_t dictSize); + +/*! ZSTD_getDictID_fromCDict() : Requires v1.5.0+ + * Provides the dictID of the dictionary loaded into `cdict`. + * If @return == 0, the dictionary is not conformant to Zstandard specification, or empty. + * Non-conformant dictionaries can still be loaded, but as content-only dictionaries. */ +ZSTDLIB_API unsigned ZSTD_getDictID_fromCDict(const ZSTD_CDict* cdict); + +/*! ZSTD_getDictID_fromDDict() : Requires v1.4.0+ + * Provides the dictID of the dictionary loaded into `ddict`. + * If @return == 0, the dictionary is not conformant to Zstandard specification, or empty. + * Non-conformant dictionaries can still be loaded, but as content-only dictionaries. */ +ZSTDLIB_API unsigned ZSTD_getDictID_fromDDict(const ZSTD_DDict* ddict); + +/*! ZSTD_getDictID_fromFrame() : Requires v1.4.0+ + * Provides the dictID required to decompressed the frame stored within `src`. + * If @return == 0, the dictID could not be decoded. + * This could for one of the following reasons : + * - The frame does not require a dictionary to be decoded (most common case). + * - The frame was built with dictID intentionally removed. Whatever dictionary is necessary is a hidden piece of information. + * Note : this use case also happens when using a non-conformant dictionary. + * - `srcSize` is too small, and as a result, the frame header could not be decoded (only possible if `srcSize < ZSTD_FRAMEHEADERSIZE_MAX`). + * - This is not a Zstandard frame. + * When identifying the exact failure cause, it's possible to use ZSTD_getFrameHeader(), which will provide a more precise error code. */ +ZSTDLIB_API unsigned ZSTD_getDictID_fromFrame(const void* src, size_t srcSize); + + +/******************************************************************************* + * Advanced dictionary and prefix API (Requires v1.4.0+) + * + * This API allows dictionaries to be used with ZSTD_compress2(), + * ZSTD_compressStream2(), and ZSTD_decompressDCtx(). + * Dictionaries are sticky, they remain valid when same context is reused, + * they only reset when the context is reset + * with ZSTD_reset_parameters or ZSTD_reset_session_and_parameters. + * In contrast, Prefixes are single-use. + ******************************************************************************/ + + +/*! ZSTD_CCtx_loadDictionary() : Requires v1.4.0+ + * Create an internal CDict from `dict` buffer. + * Decompression will have to use same dictionary. + * @result : 0, or an error code (which can be tested with ZSTD_isError()). + * Special: Loading a NULL (or 0-size) dictionary invalidates previous dictionary, + * meaning "return to no-dictionary mode". + * Note 1 : Dictionary is sticky, it will be used for all future compressed frames, + * until parameters are reset, a new dictionary is loaded, or the dictionary + * is explicitly invalidated by loading a NULL dictionary. + * Note 2 : Loading a dictionary involves building tables. + * It's also a CPU consuming operation, with non-negligible impact on latency. + * Tables are dependent on compression parameters, and for this reason, + * compression parameters can no longer be changed after loading a dictionary. + * Note 3 :`dict` content will be copied internally. + * Use experimental ZSTD_CCtx_loadDictionary_byReference() to reference content instead. + * In such a case, dictionary buffer must outlive its users. + * Note 4 : Use ZSTD_CCtx_loadDictionary_advanced() + * to precisely select how dictionary content must be interpreted. + * Note 5 : This method does not benefit from LDM (long distance mode). + * If you want to employ LDM on some large dictionary content, + * prefer employing ZSTD_CCtx_refPrefix() described below. + */ +ZSTDLIB_API size_t ZSTD_CCtx_loadDictionary(ZSTD_CCtx* cctx, const void* dict, size_t dictSize); + +/*! ZSTD_CCtx_refCDict() : Requires v1.4.0+ + * Reference a prepared dictionary, to be used for all future compressed frames. + * Note that compression parameters are enforced from within CDict, + * and supersede any compression parameter previously set within CCtx. + * The parameters ignored are labelled as "superseded-by-cdict" in the ZSTD_cParameter enum docs. + * The ignored parameters will be used again if the CCtx is returned to no-dictionary mode. + * The dictionary will remain valid for future compressed frames using same CCtx. + * @result : 0, or an error code (which can be tested with ZSTD_isError()). + * Special : Referencing a NULL CDict means "return to no-dictionary mode". + * Note 1 : Currently, only one dictionary can be managed. + * Referencing a new dictionary effectively "discards" any previous one. + * Note 2 : CDict is just referenced, its lifetime must outlive its usage within CCtx. */ +ZSTDLIB_API size_t ZSTD_CCtx_refCDict(ZSTD_CCtx* cctx, const ZSTD_CDict* cdict); + +/*! ZSTD_CCtx_refPrefix() : Requires v1.4.0+ + * Reference a prefix (single-usage dictionary) for next compressed frame. + * A prefix is **only used once**. Tables are discarded at end of frame (ZSTD_e_end). + * Decompression will need same prefix to properly regenerate data. + * Compressing with a prefix is similar in outcome as performing a diff and compressing it, + * but performs much faster, especially during decompression (compression speed is tunable with compression level). + * This method is compatible with LDM (long distance mode). + * @result : 0, or an error code (which can be tested with ZSTD_isError()). + * Special: Adding any prefix (including NULL) invalidates any previous prefix or dictionary + * Note 1 : Prefix buffer is referenced. It **must** outlive compression. + * Its content must remain unmodified during compression. + * Note 2 : If the intention is to diff some large src data blob with some prior version of itself, + * ensure that the window size is large enough to contain the entire source. + * See ZSTD_c_windowLog. + * Note 3 : Referencing a prefix involves building tables, which are dependent on compression parameters. + * It's a CPU consuming operation, with non-negligible impact on latency. + * If there is a need to use the same prefix multiple times, consider loadDictionary instead. + * Note 4 : By default, the prefix is interpreted as raw content (ZSTD_dct_rawContent). + * Use experimental ZSTD_CCtx_refPrefix_advanced() to alter dictionary interpretation. */ +ZSTDLIB_API size_t ZSTD_CCtx_refPrefix(ZSTD_CCtx* cctx, + const void* prefix, size_t prefixSize); + +/*! ZSTD_DCtx_loadDictionary() : Requires v1.4.0+ + * Create an internal DDict from dict buffer, to be used to decompress all future frames. + * The dictionary remains valid for all future frames, until explicitly invalidated, or + * a new dictionary is loaded. + * @result : 0, or an error code (which can be tested with ZSTD_isError()). + * Special : Adding a NULL (or 0-size) dictionary invalidates any previous dictionary, + * meaning "return to no-dictionary mode". + * Note 1 : Loading a dictionary involves building tables, + * which has a non-negligible impact on CPU usage and latency. + * It's recommended to "load once, use many times", to amortize the cost + * Note 2 :`dict` content will be copied internally, so `dict` can be released after loading. + * Use ZSTD_DCtx_loadDictionary_byReference() to reference dictionary content instead. + * Note 3 : Use ZSTD_DCtx_loadDictionary_advanced() to take control of + * how dictionary content is loaded and interpreted. + */ +ZSTDLIB_API size_t ZSTD_DCtx_loadDictionary(ZSTD_DCtx* dctx, const void* dict, size_t dictSize); + +/*! ZSTD_DCtx_refDDict() : Requires v1.4.0+ + * Reference a prepared dictionary, to be used to decompress next frames. + * The dictionary remains active for decompression of future frames using same DCtx. + * + * If called with ZSTD_d_refMultipleDDicts enabled, repeated calls of this function + * will store the DDict references in a table, and the DDict used for decompression + * will be determined at decompression time, as per the dict ID in the frame. + * The memory for the table is allocated on the first call to refDDict, and can be + * freed with ZSTD_freeDCtx(). + * + * If called with ZSTD_d_refMultipleDDicts disabled (the default), only one dictionary + * will be managed, and referencing a dictionary effectively "discards" any previous one. + * + * @result : 0, or an error code (which can be tested with ZSTD_isError()). + * Special: referencing a NULL DDict means "return to no-dictionary mode". + * Note 2 : DDict is just referenced, its lifetime must outlive its usage from DCtx. + */ +ZSTDLIB_API size_t ZSTD_DCtx_refDDict(ZSTD_DCtx* dctx, const ZSTD_DDict* ddict); + +/*! ZSTD_DCtx_refPrefix() : Requires v1.4.0+ + * Reference a prefix (single-usage dictionary) to decompress next frame. + * This is the reverse operation of ZSTD_CCtx_refPrefix(), + * and must use the same prefix as the one used during compression. + * Prefix is **only used once**. Reference is discarded at end of frame. + * End of frame is reached when ZSTD_decompressStream() returns 0. + * @result : 0, or an error code (which can be tested with ZSTD_isError()). + * Note 1 : Adding any prefix (including NULL) invalidates any previously set prefix or dictionary + * Note 2 : Prefix buffer is referenced. It **must** outlive decompression. + * Prefix buffer must remain unmodified up to the end of frame, + * reached when ZSTD_decompressStream() returns 0. + * Note 3 : By default, the prefix is treated as raw content (ZSTD_dct_rawContent). + * Use ZSTD_CCtx_refPrefix_advanced() to alter dictMode (Experimental section) + * Note 4 : Referencing a raw content prefix has almost no cpu nor memory cost. + * A full dictionary is more costly, as it requires building tables. + */ +ZSTDLIB_API size_t ZSTD_DCtx_refPrefix(ZSTD_DCtx* dctx, + const void* prefix, size_t prefixSize); + +/* === Memory management === */ + +/*! ZSTD_sizeof_*() : Requires v1.4.0+ + * These functions give the _current_ memory usage of selected object. + * Note that object memory usage can evolve (increase or decrease) over time. */ +ZSTDLIB_API size_t ZSTD_sizeof_CCtx(const ZSTD_CCtx* cctx); +ZSTDLIB_API size_t ZSTD_sizeof_DCtx(const ZSTD_DCtx* dctx); +ZSTDLIB_API size_t ZSTD_sizeof_CStream(const ZSTD_CStream* zcs); +ZSTDLIB_API size_t ZSTD_sizeof_DStream(const ZSTD_DStream* zds); +ZSTDLIB_API size_t ZSTD_sizeof_CDict(const ZSTD_CDict* cdict); +ZSTDLIB_API size_t ZSTD_sizeof_DDict(const ZSTD_DDict* ddict); + +#endif /* ZSTD_H_235446 */ + + +/* ************************************************************************************** + * ADVANCED AND EXPERIMENTAL FUNCTIONS + **************************************************************************************** + * The definitions in the following section are considered experimental. + * They are provided for advanced scenarios. + * They should never be used with a dynamic library, as prototypes may change in the future. + * Use them only in association with static linking. + * ***************************************************************************************/ + +#if defined(ZSTD_STATIC_LINKING_ONLY) && !defined(ZSTD_H_ZSTD_STATIC_LINKING_ONLY) +#define ZSTD_H_ZSTD_STATIC_LINKING_ONLY + +/* This can be overridden externally to hide static symbols. */ +#ifndef ZSTDLIB_STATIC_API +# if defined(ZSTD_DLL_EXPORT) && (ZSTD_DLL_EXPORT==1) +# define ZSTDLIB_STATIC_API __declspec(dllexport) ZSTDLIB_VISIBLE +# elif defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1) +# define ZSTDLIB_STATIC_API __declspec(dllimport) ZSTDLIB_VISIBLE +# else +# define ZSTDLIB_STATIC_API ZSTDLIB_VISIBLE +# endif +#endif + +/**************************************************************************************** + * experimental API (static linking only) + **************************************************************************************** + * The following symbols and constants + * are not planned to join "stable API" status in the near future. + * They can still change in future versions. + * Some of them are planned to remain in the static_only section indefinitely. + * Some of them might be removed in the future (especially when redundant with existing stable functions) + * ***************************************************************************************/ + +#define ZSTD_FRAMEHEADERSIZE_PREFIX(format) ((format) == ZSTD_f_zstd1 ? 5 : 1) /* minimum input size required to query frame header size */ +#define ZSTD_FRAMEHEADERSIZE_MIN(format) ((format) == ZSTD_f_zstd1 ? 6 : 2) +#define ZSTD_FRAMEHEADERSIZE_MAX 18 /* can be useful for static allocation */ +#define ZSTD_SKIPPABLEHEADERSIZE 8 + +/* compression parameter bounds */ +#define ZSTD_WINDOWLOG_MAX_32 30 +#define ZSTD_WINDOWLOG_MAX_64 31 +#define ZSTD_WINDOWLOG_MAX ((int)(sizeof(size_t) == 4 ? ZSTD_WINDOWLOG_MAX_32 : ZSTD_WINDOWLOG_MAX_64)) +#define ZSTD_WINDOWLOG_MIN 10 +#define ZSTD_HASHLOG_MAX ((ZSTD_WINDOWLOG_MAX < 30) ? ZSTD_WINDOWLOG_MAX : 30) +#define ZSTD_HASHLOG_MIN 6 +#define ZSTD_CHAINLOG_MAX_32 29 +#define ZSTD_CHAINLOG_MAX_64 30 +#define ZSTD_CHAINLOG_MAX ((int)(sizeof(size_t) == 4 ? ZSTD_CHAINLOG_MAX_32 : ZSTD_CHAINLOG_MAX_64)) +#define ZSTD_CHAINLOG_MIN ZSTD_HASHLOG_MIN +#define ZSTD_SEARCHLOG_MAX (ZSTD_WINDOWLOG_MAX-1) +#define ZSTD_SEARCHLOG_MIN 1 +#define ZSTD_MINMATCH_MAX 7 /* only for ZSTD_fast, other strategies are limited to 6 */ +#define ZSTD_MINMATCH_MIN 3 /* only for ZSTD_btopt+, faster strategies are limited to 4 */ +#define ZSTD_TARGETLENGTH_MAX ZSTD_BLOCKSIZE_MAX +#define ZSTD_TARGETLENGTH_MIN 0 /* note : comparing this constant to an unsigned results in a tautological test */ +#define ZSTD_STRATEGY_MIN ZSTD_fast +#define ZSTD_STRATEGY_MAX ZSTD_btultra2 +#define ZSTD_BLOCKSIZE_MAX_MIN (1 << 10) /* The minimum valid max blocksize. Maximum blocksizes smaller than this make compressBound() inaccurate. */ + + +#define ZSTD_OVERLAPLOG_MIN 0 +#define ZSTD_OVERLAPLOG_MAX 9 + +#define ZSTD_WINDOWLOG_LIMIT_DEFAULT 27 /* by default, the streaming decoder will refuse any frame + * requiring larger than (1< 0: + * If litLength != 0: + * rep == 1 --> offset == repeat_offset_1 + * rep == 2 --> offset == repeat_offset_2 + * rep == 3 --> offset == repeat_offset_3 + * If litLength == 0: + * rep == 1 --> offset == repeat_offset_2 + * rep == 2 --> offset == repeat_offset_3 + * rep == 3 --> offset == repeat_offset_1 - 1 + * + * Note: This field is optional. ZSTD_generateSequences() will calculate the value of + * 'rep', but repeat offsets do not necessarily need to be calculated from an external + * sequence provider's perspective. For example, ZSTD_compressSequences() does not + * use this 'rep' field at all (as of now). + */ +} ZSTD_Sequence; + +typedef struct { + unsigned windowLog; /**< largest match distance : larger == more compression, more memory needed during decompression */ + unsigned chainLog; /**< fully searched segment : larger == more compression, slower, more memory (useless for fast) */ + unsigned hashLog; /**< dispatch table : larger == faster, more memory */ + unsigned searchLog; /**< nb of searches : larger == more compression, slower */ + unsigned minMatch; /**< match length searched : larger == faster decompression, sometimes less compression */ + unsigned targetLength; /**< acceptable match size for optimal parser (only) : larger == more compression, slower */ + ZSTD_strategy strategy; /**< see ZSTD_strategy definition above */ +} ZSTD_compressionParameters; + +typedef struct { + int contentSizeFlag; /**< 1: content size will be in frame header (when known) */ + int checksumFlag; /**< 1: generate a 32-bits checksum using XXH64 algorithm at end of frame, for error detection */ + int noDictIDFlag; /**< 1: no dictID will be saved into frame header (dictID is only useful for dictionary compression) */ +} ZSTD_frameParameters; + +typedef struct { + ZSTD_compressionParameters cParams; + ZSTD_frameParameters fParams; +} ZSTD_parameters; + +typedef enum { + ZSTD_dct_auto = 0, /* dictionary is "full" when starting with ZSTD_MAGIC_DICTIONARY, otherwise it is "rawContent" */ + ZSTD_dct_rawContent = 1, /* ensures dictionary is always loaded as rawContent, even if it starts with ZSTD_MAGIC_DICTIONARY */ + ZSTD_dct_fullDict = 2 /* refuses to load a dictionary if it does not respect Zstandard's specification, starting with ZSTD_MAGIC_DICTIONARY */ +} ZSTD_dictContentType_e; + +typedef enum { + ZSTD_dlm_byCopy = 0, /**< Copy dictionary content internally */ + ZSTD_dlm_byRef = 1 /**< Reference dictionary content -- the dictionary buffer must outlive its users. */ +} ZSTD_dictLoadMethod_e; + +typedef enum { + ZSTD_f_zstd1 = 0, /* zstd frame format, specified in zstd_compression_format.md (default) */ + ZSTD_f_zstd1_magicless = 1 /* Variant of zstd frame format, without initial 4-bytes magic number. + * Useful to save 4 bytes per generated frame. + * Decoder cannot recognise automatically this format, requiring this instruction. */ +} ZSTD_format_e; + +typedef enum { + /* Note: this enum controls ZSTD_d_forceIgnoreChecksum */ + ZSTD_d_validateChecksum = 0, + ZSTD_d_ignoreChecksum = 1 +} ZSTD_forceIgnoreChecksum_e; + +typedef enum { + /* Note: this enum controls ZSTD_d_refMultipleDDicts */ + ZSTD_rmd_refSingleDDict = 0, + ZSTD_rmd_refMultipleDDicts = 1 +} ZSTD_refMultipleDDicts_e; + +typedef enum { + /* Note: this enum and the behavior it controls are effectively internal + * implementation details of the compressor. They are expected to continue + * to evolve and should be considered only in the context of extremely + * advanced performance tuning. + * + * Zstd currently supports the use of a CDict in three ways: + * + * - The contents of the CDict can be copied into the working context. This + * means that the compression can search both the dictionary and input + * while operating on a single set of internal tables. This makes + * the compression faster per-byte of input. However, the initial copy of + * the CDict's tables incurs a fixed cost at the beginning of the + * compression. For small compressions (< 8 KB), that copy can dominate + * the cost of the compression. + * + * - The CDict's tables can be used in-place. In this model, compression is + * slower per input byte, because the compressor has to search two sets of + * tables. However, this model incurs no start-up cost (as long as the + * working context's tables can be reused). For small inputs, this can be + * faster than copying the CDict's tables. + * + * - The CDict's tables are not used at all, and instead we use the working + * context alone to reload the dictionary and use params based on the source + * size. See ZSTD_compress_insertDictionary() and ZSTD_compress_usingDict(). + * This method is effective when the dictionary sizes are very small relative + * to the input size, and the input size is fairly large to begin with. + * + * Zstd has a simple internal heuristic that selects which strategy to use + * at the beginning of a compression. However, if experimentation shows that + * Zstd is making poor choices, it is possible to override that choice with + * this enum. + */ + ZSTD_dictDefaultAttach = 0, /* Use the default heuristic. */ + ZSTD_dictForceAttach = 1, /* Never copy the dictionary. */ + ZSTD_dictForceCopy = 2, /* Always copy the dictionary. */ + ZSTD_dictForceLoad = 3 /* Always reload the dictionary */ +} ZSTD_dictAttachPref_e; + +typedef enum { + ZSTD_lcm_auto = 0, /**< Automatically determine the compression mode based on the compression level. + * Negative compression levels will be uncompressed, and positive compression + * levels will be compressed. */ + ZSTD_lcm_huffman = 1, /**< Always attempt Huffman compression. Uncompressed literals will still be + * emitted if Huffman compression is not profitable. */ + ZSTD_lcm_uncompressed = 2 /**< Always emit uncompressed literals. */ +} ZSTD_literalCompressionMode_e; + +typedef enum { + /* Note: This enum controls features which are conditionally beneficial. Zstd typically will make a final + * decision on whether or not to enable the feature (ZSTD_ps_auto), but setting the switch to ZSTD_ps_enable + * or ZSTD_ps_disable allow for a force enable/disable the feature. + */ + ZSTD_ps_auto = 0, /* Let the library automatically determine whether the feature shall be enabled */ + ZSTD_ps_enable = 1, /* Force-enable the feature */ + ZSTD_ps_disable = 2 /* Do not use the feature */ +} ZSTD_paramSwitch_e; + +/*************************************** +* Frame header and size functions +***************************************/ + +/*! ZSTD_findDecompressedSize() : + * `src` should point to the start of a series of ZSTD encoded and/or skippable frames + * `srcSize` must be the _exact_ size of this series + * (i.e. there should be a frame boundary at `src + srcSize`) + * @return : - decompressed size of all data in all successive frames + * - if the decompressed size cannot be determined: ZSTD_CONTENTSIZE_UNKNOWN + * - if an error occurred: ZSTD_CONTENTSIZE_ERROR + * + * note 1 : decompressed size is an optional field, that may not be present, especially in streaming mode. + * When `return==ZSTD_CONTENTSIZE_UNKNOWN`, data to decompress could be any size. + * In which case, it's necessary to use streaming mode to decompress data. + * note 2 : decompressed size is always present when compression is done with ZSTD_compress() + * note 3 : decompressed size can be very large (64-bits value), + * potentially larger than what local system can handle as a single memory segment. + * In which case, it's necessary to use streaming mode to decompress data. + * note 4 : If source is untrusted, decompressed size could be wrong or intentionally modified. + * Always ensure result fits within application's authorized limits. + * Each application can set its own limits. + * note 5 : ZSTD_findDecompressedSize handles multiple frames, and so it must traverse the input to + * read each contained frame header. This is fast as most of the data is skipped, + * however it does mean that all frame data must be present and valid. */ +ZSTDLIB_STATIC_API unsigned long long ZSTD_findDecompressedSize(const void* src, size_t srcSize); + +/*! ZSTD_decompressBound() : + * `src` should point to the start of a series of ZSTD encoded and/or skippable frames + * `srcSize` must be the _exact_ size of this series + * (i.e. there should be a frame boundary at `src + srcSize`) + * @return : - upper-bound for the decompressed size of all data in all successive frames + * - if an error occurred: ZSTD_CONTENTSIZE_ERROR + * + * note 1 : an error can occur if `src` contains an invalid or incorrectly formatted frame. + * note 2 : the upper-bound is exact when the decompressed size field is available in every ZSTD encoded frame of `src`. + * in this case, `ZSTD_findDecompressedSize` and `ZSTD_decompressBound` return the same value. + * note 3 : when the decompressed size field isn't available, the upper-bound for that frame is calculated by: + * upper-bound = # blocks * min(128 KB, Window_Size) + */ +ZSTDLIB_STATIC_API unsigned long long ZSTD_decompressBound(const void* src, size_t srcSize); + +/*! ZSTD_frameHeaderSize() : + * srcSize must be >= ZSTD_FRAMEHEADERSIZE_PREFIX. + * @return : size of the Frame Header, + * or an error code (if srcSize is too small) */ +ZSTDLIB_STATIC_API size_t ZSTD_frameHeaderSize(const void* src, size_t srcSize); + +typedef enum { ZSTD_frame, ZSTD_skippableFrame } ZSTD_frameType_e; +typedef struct { + unsigned long long frameContentSize; /* if == ZSTD_CONTENTSIZE_UNKNOWN, it means this field is not available. 0 means "empty" */ + unsigned long long windowSize; /* can be very large, up to <= frameContentSize */ + unsigned blockSizeMax; + ZSTD_frameType_e frameType; /* if == ZSTD_skippableFrame, frameContentSize is the size of skippable content */ + unsigned headerSize; + unsigned dictID; + unsigned checksumFlag; + unsigned _reserved1; + unsigned _reserved2; +} ZSTD_frameHeader; + +/*! ZSTD_getFrameHeader() : + * decode Frame Header, or requires larger `srcSize`. + * @return : 0, `zfhPtr` is correctly filled, + * >0, `srcSize` is too small, value is wanted `srcSize` amount, + * or an error code, which can be tested using ZSTD_isError() */ +ZSTDLIB_STATIC_API size_t ZSTD_getFrameHeader(ZSTD_frameHeader* zfhPtr, const void* src, size_t srcSize); /**< doesn't consume input */ +/*! ZSTD_getFrameHeader_advanced() : + * same as ZSTD_getFrameHeader(), + * with added capability to select a format (like ZSTD_f_zstd1_magicless) */ +ZSTDLIB_STATIC_API size_t ZSTD_getFrameHeader_advanced(ZSTD_frameHeader* zfhPtr, const void* src, size_t srcSize, ZSTD_format_e format); + +/*! ZSTD_decompressionMargin() : + * Zstd supports in-place decompression, where the input and output buffers overlap. + * In this case, the output buffer must be at least (Margin + Output_Size) bytes large, + * and the input buffer must be at the end of the output buffer. + * + * _______________________ Output Buffer ________________________ + * | | + * | ____ Input Buffer ____| + * | | | + * v v v + * |---------------------------------------|-----------|----------| + * ^ ^ ^ + * |___________________ Output_Size ___________________|_ Margin _| + * + * NOTE: See also ZSTD_DECOMPRESSION_MARGIN(). + * NOTE: This applies only to single-pass decompression through ZSTD_decompress() or + * ZSTD_decompressDCtx(). + * NOTE: This function supports multi-frame input. + * + * @param src The compressed frame(s) + * @param srcSize The size of the compressed frame(s) + * @returns The decompression margin or an error that can be checked with ZSTD_isError(). + */ +ZSTDLIB_STATIC_API size_t ZSTD_decompressionMargin(const void* src, size_t srcSize); + +/*! ZSTD_DECOMPRESS_MARGIN() : + * Similar to ZSTD_decompressionMargin(), but instead of computing the margin from + * the compressed frame, compute it from the original size and the blockSizeLog. + * See ZSTD_decompressionMargin() for details. + * + * WARNING: This macro does not support multi-frame input, the input must be a single + * zstd frame. If you need that support use the function, or implement it yourself. + * + * @param originalSize The original uncompressed size of the data. + * @param blockSize The block size == MIN(windowSize, ZSTD_BLOCKSIZE_MAX). + * Unless you explicitly set the windowLog smaller than + * ZSTD_BLOCKSIZELOG_MAX you can just use ZSTD_BLOCKSIZE_MAX. + */ +#define ZSTD_DECOMPRESSION_MARGIN(originalSize, blockSize) ((size_t)( \ + ZSTD_FRAMEHEADERSIZE_MAX /* Frame header */ + \ + 4 /* checksum */ + \ + ((originalSize) == 0 ? 0 : 3 * (((originalSize) + (blockSize) - 1) / blockSize)) /* 3 bytes per block */ + \ + (blockSize) /* One block of margin */ \ + )) + +typedef enum { + ZSTD_sf_noBlockDelimiters = 0, /* Representation of ZSTD_Sequence has no block delimiters, sequences only */ + ZSTD_sf_explicitBlockDelimiters = 1 /* Representation of ZSTD_Sequence contains explicit block delimiters */ +} ZSTD_sequenceFormat_e; + +/*! ZSTD_sequenceBound() : + * `srcSize` : size of the input buffer + * @return : upper-bound for the number of sequences that can be generated + * from a buffer of srcSize bytes + * + * note : returns number of sequences - to get bytes, multiply by sizeof(ZSTD_Sequence). + */ +ZSTDLIB_STATIC_API size_t ZSTD_sequenceBound(size_t srcSize); + +/*! ZSTD_generateSequences() : + * WARNING: This function is meant for debugging and informational purposes ONLY! + * Its implementation is flawed, and it will be deleted in a future version. + * It is not guaranteed to succeed, as there are several cases where it will give + * up and fail. You should NOT use this function in production code. + * + * This function is deprecated, and will be removed in a future version. + * + * Generate sequences using ZSTD_compress2(), given a source buffer. + * + * @param zc The compression context to be used for ZSTD_compress2(). Set any + * compression parameters you need on this context. + * @param outSeqs The output sequences buffer of size @p outSeqsSize + * @param outSeqsSize The size of the output sequences buffer. + * ZSTD_sequenceBound(srcSize) is an upper bound on the number + * of sequences that can be generated. + * @param src The source buffer to generate sequences from of size @p srcSize. + * @param srcSize The size of the source buffer. + * + * Each block will end with a dummy sequence + * with offset == 0, matchLength == 0, and litLength == length of last literals. + * litLength may be == 0, and if so, then the sequence of (of: 0 ml: 0 ll: 0) + * simply acts as a block delimiter. + * + * @returns The number of sequences generated, necessarily less than + * ZSTD_sequenceBound(srcSize), or an error code that can be checked + * with ZSTD_isError(). + */ +ZSTD_DEPRECATED("For debugging only, will be replaced by ZSTD_extractSequences()") +ZSTDLIB_STATIC_API size_t +ZSTD_generateSequences(ZSTD_CCtx* zc, + ZSTD_Sequence* outSeqs, size_t outSeqsSize, + const void* src, size_t srcSize); + +/*! ZSTD_mergeBlockDelimiters() : + * Given an array of ZSTD_Sequence, remove all sequences that represent block delimiters/last literals + * by merging them into the literals of the next sequence. + * + * As such, the final generated result has no explicit representation of block boundaries, + * and the final last literals segment is not represented in the sequences. + * + * The output of this function can be fed into ZSTD_compressSequences() with CCtx + * setting of ZSTD_c_blockDelimiters as ZSTD_sf_noBlockDelimiters + * @return : number of sequences left after merging + */ +ZSTDLIB_STATIC_API size_t ZSTD_mergeBlockDelimiters(ZSTD_Sequence* sequences, size_t seqsSize); + +/*! ZSTD_compressSequences() : + * Compress an array of ZSTD_Sequence, associated with @src buffer, into dst. + * @src contains the entire input (not just the literals). + * If @srcSize > sum(sequence.length), the remaining bytes are considered all literals + * If a dictionary is included, then the cctx should reference the dict. (see: ZSTD_CCtx_refCDict(), ZSTD_CCtx_loadDictionary(), etc.) + * The entire source is compressed into a single frame. + * + * The compression behavior changes based on cctx params. In particular: + * If ZSTD_c_blockDelimiters == ZSTD_sf_noBlockDelimiters, the array of ZSTD_Sequence is expected to contain + * no block delimiters (defined in ZSTD_Sequence). Block boundaries are roughly determined based on + * the block size derived from the cctx, and sequences may be split. This is the default setting. + * + * If ZSTD_c_blockDelimiters == ZSTD_sf_explicitBlockDelimiters, the array of ZSTD_Sequence is expected to contain + * block delimiters (defined in ZSTD_Sequence). Behavior is undefined if no block delimiters are provided. + * + * If ZSTD_c_validateSequences == 0, this function will blindly accept the sequences provided. Invalid sequences cause undefined + * behavior. If ZSTD_c_validateSequences == 1, then if sequence is invalid (see doc/zstd_compression_format.md for + * specifics regarding offset/matchlength requirements) then the function will bail out and return an error. + * + * In addition to the two adjustable experimental params, there are other important cctx params. + * - ZSTD_c_minMatch MUST be set as less than or equal to the smallest match generated by the match finder. It has a minimum value of ZSTD_MINMATCH_MIN. + * - ZSTD_c_compressionLevel accordingly adjusts the strength of the entropy coder, as it would in typical compression. + * - ZSTD_c_windowLog affects offset validation: this function will return an error at higher debug levels if a provided offset + * is larger than what the spec allows for a given window log and dictionary (if present). See: doc/zstd_compression_format.md + * + * Note: Repcodes are, as of now, always re-calculated within this function, so ZSTD_Sequence::rep is unused. + * Note 2: Once we integrate ability to ingest repcodes, the explicit block delims mode must respect those repcodes exactly, + * and cannot emit an RLE block that disagrees with the repcode history + * @return : final compressed size, or a ZSTD error code. + */ +ZSTDLIB_STATIC_API size_t +ZSTD_compressSequences( ZSTD_CCtx* cctx, void* dst, size_t dstSize, + const ZSTD_Sequence* inSeqs, size_t inSeqsSize, + const void* src, size_t srcSize); + + +/*! ZSTD_writeSkippableFrame() : + * Generates a zstd skippable frame containing data given by src, and writes it to dst buffer. + * + * Skippable frames begin with a 4-byte magic number. There are 16 possible choices of magic number, + * ranging from ZSTD_MAGIC_SKIPPABLE_START to ZSTD_MAGIC_SKIPPABLE_START+15. + * As such, the parameter magicVariant controls the exact skippable frame magic number variant used, so + * the magic number used will be ZSTD_MAGIC_SKIPPABLE_START + magicVariant. + * + * Returns an error if destination buffer is not large enough, if the source size is not representable + * with a 4-byte unsigned int, or if the parameter magicVariant is greater than 15 (and therefore invalid). + * + * @return : number of bytes written or a ZSTD error. + */ +ZSTDLIB_STATIC_API size_t ZSTD_writeSkippableFrame(void* dst, size_t dstCapacity, + const void* src, size_t srcSize, unsigned magicVariant); + +/*! ZSTD_readSkippableFrame() : + * Retrieves a zstd skippable frame containing data given by src, and writes it to dst buffer. + * + * The parameter magicVariant will receive the magicVariant that was supplied when the frame was written, + * i.e. magicNumber - ZSTD_MAGIC_SKIPPABLE_START. This can be NULL if the caller is not interested + * in the magicVariant. + * + * Returns an error if destination buffer is not large enough, or if the frame is not skippable. + * + * @return : number of bytes written or a ZSTD error. + */ +ZSTDLIB_API size_t ZSTD_readSkippableFrame(void* dst, size_t dstCapacity, unsigned* magicVariant, + const void* src, size_t srcSize); + +/*! ZSTD_isSkippableFrame() : + * Tells if the content of `buffer` starts with a valid Frame Identifier for a skippable frame. + */ +ZSTDLIB_API unsigned ZSTD_isSkippableFrame(const void* buffer, size_t size); + + + +/*************************************** +* Memory management +***************************************/ + +/*! ZSTD_estimate*() : + * These functions make it possible to estimate memory usage + * of a future {D,C}Ctx, before its creation. + * This is useful in combination with ZSTD_initStatic(), + * which makes it possible to employ a static buffer for ZSTD_CCtx* state. + * + * ZSTD_estimateCCtxSize() will provide a memory budget large enough + * to compress data of any size using one-shot compression ZSTD_compressCCtx() or ZSTD_compress2() + * associated with any compression level up to max specified one. + * The estimate will assume the input may be arbitrarily large, + * which is the worst case. + * + * Note that the size estimation is specific for one-shot compression, + * it is not valid for streaming (see ZSTD_estimateCStreamSize*()) + * nor other potential ways of using a ZSTD_CCtx* state. + * + * When srcSize can be bound by a known and rather "small" value, + * this knowledge can be used to provide a tighter budget estimation + * because the ZSTD_CCtx* state will need less memory for small inputs. + * This tighter estimation can be provided by employing more advanced functions + * ZSTD_estimateCCtxSize_usingCParams(), which can be used in tandem with ZSTD_getCParams(), + * and ZSTD_estimateCCtxSize_usingCCtxParams(), which can be used in tandem with ZSTD_CCtxParams_setParameter(). + * Both can be used to estimate memory using custom compression parameters and arbitrary srcSize limits. + * + * Note : only single-threaded compression is supported. + * ZSTD_estimateCCtxSize_usingCCtxParams() will return an error code if ZSTD_c_nbWorkers is >= 1. + */ +ZSTDLIB_STATIC_API size_t ZSTD_estimateCCtxSize(int maxCompressionLevel); +ZSTDLIB_STATIC_API size_t ZSTD_estimateCCtxSize_usingCParams(ZSTD_compressionParameters cParams); +ZSTDLIB_STATIC_API size_t ZSTD_estimateCCtxSize_usingCCtxParams(const ZSTD_CCtx_params* params); +ZSTDLIB_STATIC_API size_t ZSTD_estimateDCtxSize(void); + +/*! ZSTD_estimateCStreamSize() : + * ZSTD_estimateCStreamSize() will provide a memory budget large enough for streaming compression + * using any compression level up to the max specified one. + * It will also consider src size to be arbitrarily "large", which is a worst case scenario. + * If srcSize is known to always be small, ZSTD_estimateCStreamSize_usingCParams() can provide a tighter estimation. + * ZSTD_estimateCStreamSize_usingCParams() can be used in tandem with ZSTD_getCParams() to create cParams from compressionLevel. + * ZSTD_estimateCStreamSize_usingCCtxParams() can be used in tandem with ZSTD_CCtxParams_setParameter(). Only single-threaded compression is supported. This function will return an error code if ZSTD_c_nbWorkers is >= 1. + * Note : CStream size estimation is only correct for single-threaded compression. + * ZSTD_estimateCStreamSize_usingCCtxParams() will return an error code if ZSTD_c_nbWorkers is >= 1. + * Note 2 : ZSTD_estimateCStreamSize* functions are not compatible with the Block-Level Sequence Producer API at this time. + * Size estimates assume that no external sequence producer is registered. + * + * ZSTD_DStream memory budget depends on frame's window Size. + * This information can be passed manually, using ZSTD_estimateDStreamSize, + * or deducted from a valid frame Header, using ZSTD_estimateDStreamSize_fromFrame(); + * Any frame requesting a window size larger than max specified one will be rejected. + * Note : if streaming is init with function ZSTD_init?Stream_usingDict(), + * an internal ?Dict will be created, which additional size is not estimated here. + * In this case, get total size by adding ZSTD_estimate?DictSize + */ +ZSTDLIB_STATIC_API size_t ZSTD_estimateCStreamSize(int maxCompressionLevel); +ZSTDLIB_STATIC_API size_t ZSTD_estimateCStreamSize_usingCParams(ZSTD_compressionParameters cParams); +ZSTDLIB_STATIC_API size_t ZSTD_estimateCStreamSize_usingCCtxParams(const ZSTD_CCtx_params* params); +ZSTDLIB_STATIC_API size_t ZSTD_estimateDStreamSize(size_t maxWindowSize); +ZSTDLIB_STATIC_API size_t ZSTD_estimateDStreamSize_fromFrame(const void* src, size_t srcSize); + +/*! ZSTD_estimate?DictSize() : + * ZSTD_estimateCDictSize() will bet that src size is relatively "small", and content is copied, like ZSTD_createCDict(). + * ZSTD_estimateCDictSize_advanced() makes it possible to control compression parameters precisely, like ZSTD_createCDict_advanced(). + * Note : dictionaries created by reference (`ZSTD_dlm_byRef`) are logically smaller. + */ +ZSTDLIB_STATIC_API size_t ZSTD_estimateCDictSize(size_t dictSize, int compressionLevel); +ZSTDLIB_STATIC_API size_t ZSTD_estimateCDictSize_advanced(size_t dictSize, ZSTD_compressionParameters cParams, ZSTD_dictLoadMethod_e dictLoadMethod); +ZSTDLIB_STATIC_API size_t ZSTD_estimateDDictSize(size_t dictSize, ZSTD_dictLoadMethod_e dictLoadMethod); + +/*! ZSTD_initStatic*() : + * Initialize an object using a pre-allocated fixed-size buffer. + * workspace: The memory area to emplace the object into. + * Provided pointer *must be 8-bytes aligned*. + * Buffer must outlive object. + * workspaceSize: Use ZSTD_estimate*Size() to determine + * how large workspace must be to support target scenario. + * @return : pointer to object (same address as workspace, just different type), + * or NULL if error (size too small, incorrect alignment, etc.) + * Note : zstd will never resize nor malloc() when using a static buffer. + * If the object requires more memory than available, + * zstd will just error out (typically ZSTD_error_memory_allocation). + * Note 2 : there is no corresponding "free" function. + * Since workspace is allocated externally, it must be freed externally too. + * Note 3 : cParams : use ZSTD_getCParams() to convert a compression level + * into its associated cParams. + * Limitation 1 : currently not compatible with internal dictionary creation, triggered by + * ZSTD_CCtx_loadDictionary(), ZSTD_initCStream_usingDict() or ZSTD_initDStream_usingDict(). + * Limitation 2 : static cctx currently not compatible with multi-threading. + * Limitation 3 : static dctx is incompatible with legacy support. + */ +ZSTDLIB_STATIC_API ZSTD_CCtx* ZSTD_initStaticCCtx(void* workspace, size_t workspaceSize); +ZSTDLIB_STATIC_API ZSTD_CStream* ZSTD_initStaticCStream(void* workspace, size_t workspaceSize); /**< same as ZSTD_initStaticCCtx() */ + +ZSTDLIB_STATIC_API ZSTD_DCtx* ZSTD_initStaticDCtx(void* workspace, size_t workspaceSize); +ZSTDLIB_STATIC_API ZSTD_DStream* ZSTD_initStaticDStream(void* workspace, size_t workspaceSize); /**< same as ZSTD_initStaticDCtx() */ + +ZSTDLIB_STATIC_API const ZSTD_CDict* ZSTD_initStaticCDict( + void* workspace, size_t workspaceSize, + const void* dict, size_t dictSize, + ZSTD_dictLoadMethod_e dictLoadMethod, + ZSTD_dictContentType_e dictContentType, + ZSTD_compressionParameters cParams); + +ZSTDLIB_STATIC_API const ZSTD_DDict* ZSTD_initStaticDDict( + void* workspace, size_t workspaceSize, + const void* dict, size_t dictSize, + ZSTD_dictLoadMethod_e dictLoadMethod, + ZSTD_dictContentType_e dictContentType); + + +/*! Custom memory allocation : + * These prototypes make it possible to pass your own allocation/free functions. + * ZSTD_customMem is provided at creation time, using ZSTD_create*_advanced() variants listed below. + * All allocation/free operations will be completed using these custom variants instead of regular ones. + */ +typedef void* (*ZSTD_allocFunction) (void* opaque, size_t size); +typedef void (*ZSTD_freeFunction) (void* opaque, void* address); +typedef struct { ZSTD_allocFunction customAlloc; ZSTD_freeFunction customFree; void* opaque; } ZSTD_customMem; +static +#ifdef __GNUC__ +__attribute__((__unused__)) +#endif +ZSTD_customMem const ZSTD_defaultCMem = { NULL, NULL, NULL }; /**< this constant defers to stdlib's functions */ + +ZSTDLIB_STATIC_API ZSTD_CCtx* ZSTD_createCCtx_advanced(ZSTD_customMem customMem); +ZSTDLIB_STATIC_API ZSTD_CStream* ZSTD_createCStream_advanced(ZSTD_customMem customMem); +ZSTDLIB_STATIC_API ZSTD_DCtx* ZSTD_createDCtx_advanced(ZSTD_customMem customMem); +ZSTDLIB_STATIC_API ZSTD_DStream* ZSTD_createDStream_advanced(ZSTD_customMem customMem); + +ZSTDLIB_STATIC_API ZSTD_CDict* ZSTD_createCDict_advanced(const void* dict, size_t dictSize, + ZSTD_dictLoadMethod_e dictLoadMethod, + ZSTD_dictContentType_e dictContentType, + ZSTD_compressionParameters cParams, + ZSTD_customMem customMem); + +/*! Thread pool : + * These prototypes make it possible to share a thread pool among multiple compression contexts. + * This can limit resources for applications with multiple threads where each one uses + * a threaded compression mode (via ZSTD_c_nbWorkers parameter). + * ZSTD_createThreadPool creates a new thread pool with a given number of threads. + * Note that the lifetime of such pool must exist while being used. + * ZSTD_CCtx_refThreadPool assigns a thread pool to a context (use NULL argument value + * to use an internal thread pool). + * ZSTD_freeThreadPool frees a thread pool, accepts NULL pointer. + */ +typedef struct POOL_ctx_s ZSTD_threadPool; +ZSTDLIB_STATIC_API ZSTD_threadPool* ZSTD_createThreadPool(size_t numThreads); +ZSTDLIB_STATIC_API void ZSTD_freeThreadPool (ZSTD_threadPool* pool); /* accept NULL pointer */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtx_refThreadPool(ZSTD_CCtx* cctx, ZSTD_threadPool* pool); + + +/* + * This API is temporary and is expected to change or disappear in the future! + */ +ZSTDLIB_STATIC_API ZSTD_CDict* ZSTD_createCDict_advanced2( + const void* dict, size_t dictSize, + ZSTD_dictLoadMethod_e dictLoadMethod, + ZSTD_dictContentType_e dictContentType, + const ZSTD_CCtx_params* cctxParams, + ZSTD_customMem customMem); + +ZSTDLIB_STATIC_API ZSTD_DDict* ZSTD_createDDict_advanced( + const void* dict, size_t dictSize, + ZSTD_dictLoadMethod_e dictLoadMethod, + ZSTD_dictContentType_e dictContentType, + ZSTD_customMem customMem); + + +/*************************************** +* Advanced compression functions +***************************************/ + +/*! ZSTD_createCDict_byReference() : + * Create a digested dictionary for compression + * Dictionary content is just referenced, not duplicated. + * As a consequence, `dictBuffer` **must** outlive CDict, + * and its content must remain unmodified throughout the lifetime of CDict. + * note: equivalent to ZSTD_createCDict_advanced(), with dictLoadMethod==ZSTD_dlm_byRef */ +ZSTDLIB_STATIC_API ZSTD_CDict* ZSTD_createCDict_byReference(const void* dictBuffer, size_t dictSize, int compressionLevel); + +/*! ZSTD_getCParams() : + * @return ZSTD_compressionParameters structure for a selected compression level and estimated srcSize. + * `estimatedSrcSize` value is optional, select 0 if not known */ +ZSTDLIB_STATIC_API ZSTD_compressionParameters ZSTD_getCParams(int compressionLevel, unsigned long long estimatedSrcSize, size_t dictSize); + +/*! ZSTD_getParams() : + * same as ZSTD_getCParams(), but @return a full `ZSTD_parameters` object instead of sub-component `ZSTD_compressionParameters`. + * All fields of `ZSTD_frameParameters` are set to default : contentSize=1, checksum=0, noDictID=0 */ +ZSTDLIB_STATIC_API ZSTD_parameters ZSTD_getParams(int compressionLevel, unsigned long long estimatedSrcSize, size_t dictSize); + +/*! ZSTD_checkCParams() : + * Ensure param values remain within authorized range. + * @return 0 on success, or an error code (can be checked with ZSTD_isError()) */ +ZSTDLIB_STATIC_API size_t ZSTD_checkCParams(ZSTD_compressionParameters params); + +/*! ZSTD_adjustCParams() : + * optimize params for a given `srcSize` and `dictSize`. + * `srcSize` can be unknown, in which case use ZSTD_CONTENTSIZE_UNKNOWN. + * `dictSize` must be `0` when there is no dictionary. + * cPar can be invalid : all parameters will be clamped within valid range in the @return struct. + * This function never fails (wide contract) */ +ZSTDLIB_STATIC_API ZSTD_compressionParameters ZSTD_adjustCParams(ZSTD_compressionParameters cPar, unsigned long long srcSize, size_t dictSize); + +/*! ZSTD_CCtx_setCParams() : + * Set all parameters provided within @p cparams into the working @p cctx. + * Note : if modifying parameters during compression (MT mode only), + * note that changes to the .windowLog parameter will be ignored. + * @return 0 on success, or an error code (can be checked with ZSTD_isError()). + * On failure, no parameters are updated. + */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtx_setCParams(ZSTD_CCtx* cctx, ZSTD_compressionParameters cparams); + +/*! ZSTD_CCtx_setFParams() : + * Set all parameters provided within @p fparams into the working @p cctx. + * @return 0 on success, or an error code (can be checked with ZSTD_isError()). + */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtx_setFParams(ZSTD_CCtx* cctx, ZSTD_frameParameters fparams); + +/*! ZSTD_CCtx_setParams() : + * Set all parameters provided within @p params into the working @p cctx. + * @return 0 on success, or an error code (can be checked with ZSTD_isError()). + */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtx_setParams(ZSTD_CCtx* cctx, ZSTD_parameters params); + +/*! ZSTD_compress_advanced() : + * Note : this function is now DEPRECATED. + * It can be replaced by ZSTD_compress2(), in combination with ZSTD_CCtx_setParameter() and other parameter setters. + * This prototype will generate compilation warnings. */ +ZSTD_DEPRECATED("use ZSTD_compress2") +ZSTDLIB_STATIC_API +size_t ZSTD_compress_advanced(ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + const void* dict,size_t dictSize, + ZSTD_parameters params); + +/*! ZSTD_compress_usingCDict_advanced() : + * Note : this function is now DEPRECATED. + * It can be replaced by ZSTD_compress2(), in combination with ZSTD_CCtx_loadDictionary() and other parameter setters. + * This prototype will generate compilation warnings. */ +ZSTD_DEPRECATED("use ZSTD_compress2 with ZSTD_CCtx_loadDictionary") +ZSTDLIB_STATIC_API +size_t ZSTD_compress_usingCDict_advanced(ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, + const void* src, size_t srcSize, + const ZSTD_CDict* cdict, + ZSTD_frameParameters fParams); + + +/*! ZSTD_CCtx_loadDictionary_byReference() : + * Same as ZSTD_CCtx_loadDictionary(), but dictionary content is referenced, instead of being copied into CCtx. + * It saves some memory, but also requires that `dict` outlives its usage within `cctx` */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtx_loadDictionary_byReference(ZSTD_CCtx* cctx, const void* dict, size_t dictSize); + +/*! ZSTD_CCtx_loadDictionary_advanced() : + * Same as ZSTD_CCtx_loadDictionary(), but gives finer control over + * how to load the dictionary (by copy ? by reference ?) + * and how to interpret it (automatic ? force raw mode ? full mode only ?) */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtx_loadDictionary_advanced(ZSTD_CCtx* cctx, const void* dict, size_t dictSize, ZSTD_dictLoadMethod_e dictLoadMethod, ZSTD_dictContentType_e dictContentType); + +/*! ZSTD_CCtx_refPrefix_advanced() : + * Same as ZSTD_CCtx_refPrefix(), but gives finer control over + * how to interpret prefix content (automatic ? force raw mode (default) ? full mode only ?) */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtx_refPrefix_advanced(ZSTD_CCtx* cctx, const void* prefix, size_t prefixSize, ZSTD_dictContentType_e dictContentType); + +/* === experimental parameters === */ +/* these parameters can be used with ZSTD_setParameter() + * they are not guaranteed to remain supported in the future */ + + /* Enables rsyncable mode, + * which makes compressed files more rsync friendly + * by adding periodic synchronization points to the compressed data. + * The target average block size is ZSTD_c_jobSize / 2. + * It's possible to modify the job size to increase or decrease + * the granularity of the synchronization point. + * Once the jobSize is smaller than the window size, + * it will result in compression ratio degradation. + * NOTE 1: rsyncable mode only works when multithreading is enabled. + * NOTE 2: rsyncable performs poorly in combination with long range mode, + * since it will decrease the effectiveness of synchronization points, + * though mileage may vary. + * NOTE 3: Rsyncable mode limits maximum compression speed to ~400 MB/s. + * If the selected compression level is already running significantly slower, + * the overall speed won't be significantly impacted. + */ + #define ZSTD_c_rsyncable ZSTD_c_experimentalParam1 + +/* Select a compression format. + * The value must be of type ZSTD_format_e. + * See ZSTD_format_e enum definition for details */ +#define ZSTD_c_format ZSTD_c_experimentalParam2 + +/* Force back-reference distances to remain < windowSize, + * even when referencing into Dictionary content (default:0) */ +#define ZSTD_c_forceMaxWindow ZSTD_c_experimentalParam3 + +/* Controls whether the contents of a CDict + * are used in place, or copied into the working context. + * Accepts values from the ZSTD_dictAttachPref_e enum. + * See the comments on that enum for an explanation of the feature. */ +#define ZSTD_c_forceAttachDict ZSTD_c_experimentalParam4 + +/* Controlled with ZSTD_paramSwitch_e enum. + * Default is ZSTD_ps_auto. + * Set to ZSTD_ps_disable to never compress literals. + * Set to ZSTD_ps_enable to always compress literals. (Note: uncompressed literals + * may still be emitted if huffman is not beneficial to use.) + * + * By default, in ZSTD_ps_auto, the library will decide at runtime whether to use + * literals compression based on the compression parameters - specifically, + * negative compression levels do not use literal compression. + */ +#define ZSTD_c_literalCompressionMode ZSTD_c_experimentalParam5 + +/* User's best guess of source size. + * Hint is not valid when srcSizeHint == 0. + * There is no guarantee that hint is close to actual source size, + * but compression ratio may regress significantly if guess considerably underestimates */ +#define ZSTD_c_srcSizeHint ZSTD_c_experimentalParam7 + +/* Controls whether the new and experimental "dedicated dictionary search + * structure" can be used. This feature is still rough around the edges, be + * prepared for surprising behavior! + * + * How to use it: + * + * When using a CDict, whether to use this feature or not is controlled at + * CDict creation, and it must be set in a CCtxParams set passed into that + * construction (via ZSTD_createCDict_advanced2()). A compression will then + * use the feature or not based on how the CDict was constructed; the value of + * this param, set in the CCtx, will have no effect. + * + * However, when a dictionary buffer is passed into a CCtx, such as via + * ZSTD_CCtx_loadDictionary(), this param can be set on the CCtx to control + * whether the CDict that is created internally can use the feature or not. + * + * What it does: + * + * Normally, the internal data structures of the CDict are analogous to what + * would be stored in a CCtx after compressing the contents of a dictionary. + * To an approximation, a compression using a dictionary can then use those + * data structures to simply continue what is effectively a streaming + * compression where the simulated compression of the dictionary left off. + * Which is to say, the search structures in the CDict are normally the same + * format as in the CCtx. + * + * It is possible to do better, since the CDict is not like a CCtx: the search + * structures are written once during CDict creation, and then are only read + * after that, while the search structures in the CCtx are both read and + * written as the compression goes along. This means we can choose a search + * structure for the dictionary that is read-optimized. + * + * This feature enables the use of that different structure. + * + * Note that some of the members of the ZSTD_compressionParameters struct have + * different semantics and constraints in the dedicated search structure. It is + * highly recommended that you simply set a compression level in the CCtxParams + * you pass into the CDict creation call, and avoid messing with the cParams + * directly. + * + * Effects: + * + * This will only have any effect when the selected ZSTD_strategy + * implementation supports this feature. Currently, that's limited to + * ZSTD_greedy, ZSTD_lazy, and ZSTD_lazy2. + * + * Note that this means that the CDict tables can no longer be copied into the + * CCtx, so the dict attachment mode ZSTD_dictForceCopy will no longer be + * usable. The dictionary can only be attached or reloaded. + * + * In general, you should expect compression to be faster--sometimes very much + * so--and CDict creation to be slightly slower. Eventually, we will probably + * make this mode the default. + */ +#define ZSTD_c_enableDedicatedDictSearch ZSTD_c_experimentalParam8 + +/* ZSTD_c_stableInBuffer + * Experimental parameter. + * Default is 0 == disabled. Set to 1 to enable. + * + * Tells the compressor that input data presented with ZSTD_inBuffer + * will ALWAYS be the same between calls. + * Technically, the @src pointer must never be changed, + * and the @pos field can only be updated by zstd. + * However, it's possible to increase the @size field, + * allowing scenarios where more data can be appended after compressions starts. + * These conditions are checked by the compressor, + * and compression will fail if they are not respected. + * Also, data in the ZSTD_inBuffer within the range [src, src + pos) + * MUST not be modified during compression or it will result in data corruption. + * + * When this flag is enabled zstd won't allocate an input window buffer, + * because the user guarantees it can reference the ZSTD_inBuffer until + * the frame is complete. But, it will still allocate an output buffer + * large enough to fit a block (see ZSTD_c_stableOutBuffer). This will also + * avoid the memcpy() from the input buffer to the input window buffer. + * + * NOTE: So long as the ZSTD_inBuffer always points to valid memory, using + * this flag is ALWAYS memory safe, and will never access out-of-bounds + * memory. However, compression WILL fail if conditions are not respected. + * + * WARNING: The data in the ZSTD_inBuffer in the range [src, src + pos) MUST + * not be modified during compression or it will result in data corruption. + * This is because zstd needs to reference data in the ZSTD_inBuffer to find + * matches. Normally zstd maintains its own window buffer for this purpose, + * but passing this flag tells zstd to rely on user provided buffer instead. + */ +#define ZSTD_c_stableInBuffer ZSTD_c_experimentalParam9 + +/* ZSTD_c_stableOutBuffer + * Experimental parameter. + * Default is 0 == disabled. Set to 1 to enable. + * + * Tells he compressor that the ZSTD_outBuffer will not be resized between + * calls. Specifically: (out.size - out.pos) will never grow. This gives the + * compressor the freedom to say: If the compressed data doesn't fit in the + * output buffer then return ZSTD_error_dstSizeTooSmall. This allows us to + * always decompress directly into the output buffer, instead of decompressing + * into an internal buffer and copying to the output buffer. + * + * When this flag is enabled zstd won't allocate an output buffer, because + * it can write directly to the ZSTD_outBuffer. It will still allocate the + * input window buffer (see ZSTD_c_stableInBuffer). + * + * Zstd will check that (out.size - out.pos) never grows and return an error + * if it does. While not strictly necessary, this should prevent surprises. + */ +#define ZSTD_c_stableOutBuffer ZSTD_c_experimentalParam10 + +/* ZSTD_c_blockDelimiters + * Default is 0 == ZSTD_sf_noBlockDelimiters. + * + * For use with sequence compression API: ZSTD_compressSequences(). + * + * Designates whether or not the given array of ZSTD_Sequence contains block delimiters + * and last literals, which are defined as sequences with offset == 0 and matchLength == 0. + * See the definition of ZSTD_Sequence for more specifics. + */ +#define ZSTD_c_blockDelimiters ZSTD_c_experimentalParam11 + +/* ZSTD_c_validateSequences + * Default is 0 == disabled. Set to 1 to enable sequence validation. + * + * For use with sequence compression API: ZSTD_compressSequences(). + * Designates whether or not we validate sequences provided to ZSTD_compressSequences() + * during function execution. + * + * Without validation, providing a sequence that does not conform to the zstd spec will cause + * undefined behavior, and may produce a corrupted block. + * + * With validation enabled, if sequence is invalid (see doc/zstd_compression_format.md for + * specifics regarding offset/matchlength requirements) then the function will bail out and + * return an error. + * + */ +#define ZSTD_c_validateSequences ZSTD_c_experimentalParam12 + +/* ZSTD_c_useBlockSplitter + * Controlled with ZSTD_paramSwitch_e enum. + * Default is ZSTD_ps_auto. + * Set to ZSTD_ps_disable to never use block splitter. + * Set to ZSTD_ps_enable to always use block splitter. + * + * By default, in ZSTD_ps_auto, the library will decide at runtime whether to use + * block splitting based on the compression parameters. + */ +#define ZSTD_c_useBlockSplitter ZSTD_c_experimentalParam13 + +/* ZSTD_c_useRowMatchFinder + * Controlled with ZSTD_paramSwitch_e enum. + * Default is ZSTD_ps_auto. + * Set to ZSTD_ps_disable to never use row-based matchfinder. + * Set to ZSTD_ps_enable to force usage of row-based matchfinder. + * + * By default, in ZSTD_ps_auto, the library will decide at runtime whether to use + * the row-based matchfinder based on support for SIMD instructions and the window log. + * Note that this only pertains to compression strategies: greedy, lazy, and lazy2 + */ +#define ZSTD_c_useRowMatchFinder ZSTD_c_experimentalParam14 + +/* ZSTD_c_deterministicRefPrefix + * Default is 0 == disabled. Set to 1 to enable. + * + * Zstd produces different results for prefix compression when the prefix is + * directly adjacent to the data about to be compressed vs. when it isn't. + * This is because zstd detects that the two buffers are contiguous and it can + * use a more efficient match finding algorithm. However, this produces different + * results than when the two buffers are non-contiguous. This flag forces zstd + * to always load the prefix in non-contiguous mode, even if it happens to be + * adjacent to the data, to guarantee determinism. + * + * If you really care about determinism when using a dictionary or prefix, + * like when doing delta compression, you should select this option. It comes + * at a speed penalty of about ~2.5% if the dictionary and data happened to be + * contiguous, and is free if they weren't contiguous. We don't expect that + * intentionally making the dictionary and data contiguous will be worth the + * cost to memcpy() the data. + */ +#define ZSTD_c_deterministicRefPrefix ZSTD_c_experimentalParam15 + +/* ZSTD_c_prefetchCDictTables + * Controlled with ZSTD_paramSwitch_e enum. Default is ZSTD_ps_auto. + * + * In some situations, zstd uses CDict tables in-place rather than copying them + * into the working context. (See docs on ZSTD_dictAttachPref_e above for details). + * In such situations, compression speed is seriously impacted when CDict tables are + * "cold" (outside CPU cache). This parameter instructs zstd to prefetch CDict tables + * when they are used in-place. + * + * For sufficiently small inputs, the cost of the prefetch will outweigh the benefit. + * For sufficiently large inputs, zstd will by default memcpy() CDict tables + * into the working context, so there is no need to prefetch. This parameter is + * targeted at a middle range of input sizes, where a prefetch is cheap enough to be + * useful but memcpy() is too expensive. The exact range of input sizes where this + * makes sense is best determined by careful experimentation. + * + * Note: for this parameter, ZSTD_ps_auto is currently equivalent to ZSTD_ps_disable, + * but in the future zstd may conditionally enable this feature via an auto-detection + * heuristic for cold CDicts. + * Use ZSTD_ps_disable to opt out of prefetching under any circumstances. + */ +#define ZSTD_c_prefetchCDictTables ZSTD_c_experimentalParam16 + +/* ZSTD_c_enableSeqProducerFallback + * Allowed values are 0 (disable) and 1 (enable). The default setting is 0. + * + * Controls whether zstd will fall back to an internal sequence producer if an + * external sequence producer is registered and returns an error code. This fallback + * is block-by-block: the internal sequence producer will only be called for blocks + * where the external sequence producer returns an error code. Fallback parsing will + * follow any other cParam settings, such as compression level, the same as in a + * normal (fully-internal) compression operation. + * + * The user is strongly encouraged to read the full Block-Level Sequence Producer API + * documentation (below) before setting this parameter. */ +#define ZSTD_c_enableSeqProducerFallback ZSTD_c_experimentalParam17 + +/* ZSTD_c_maxBlockSize + * Allowed values are between 1KB and ZSTD_BLOCKSIZE_MAX (128KB). + * The default is ZSTD_BLOCKSIZE_MAX, and setting to 0 will set to the default. + * + * This parameter can be used to set an upper bound on the blocksize + * that overrides the default ZSTD_BLOCKSIZE_MAX. It cannot be used to set upper + * bounds greater than ZSTD_BLOCKSIZE_MAX or bounds lower than 1KB (will make + * compressBound() inaccurate). Only currently meant to be used for testing. + * + */ +#define ZSTD_c_maxBlockSize ZSTD_c_experimentalParam18 + +/* ZSTD_c_searchForExternalRepcodes + * This parameter affects how zstd parses external sequences, such as sequences + * provided through the compressSequences() API or from an external block-level + * sequence producer. + * + * If set to ZSTD_ps_enable, the library will check for repeated offsets in + * external sequences, even if those repcodes are not explicitly indicated in + * the "rep" field. Note that this is the only way to exploit repcode matches + * while using compressSequences() or an external sequence producer, since zstd + * currently ignores the "rep" field of external sequences. + * + * If set to ZSTD_ps_disable, the library will not exploit repeated offsets in + * external sequences, regardless of whether the "rep" field has been set. This + * reduces sequence compression overhead by about 25% while sacrificing some + * compression ratio. + * + * The default value is ZSTD_ps_auto, for which the library will enable/disable + * based on compression level. + * + * Note: for now, this param only has an effect if ZSTD_c_blockDelimiters is + * set to ZSTD_sf_explicitBlockDelimiters. That may change in the future. + */ +#define ZSTD_c_searchForExternalRepcodes ZSTD_c_experimentalParam19 + +/*! ZSTD_CCtx_getParameter() : + * Get the requested compression parameter value, selected by enum ZSTD_cParameter, + * and store it into int* value. + * @return : 0, or an error code (which can be tested with ZSTD_isError()). + */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtx_getParameter(const ZSTD_CCtx* cctx, ZSTD_cParameter param, int* value); + + +/*! ZSTD_CCtx_params : + * Quick howto : + * - ZSTD_createCCtxParams() : Create a ZSTD_CCtx_params structure + * - ZSTD_CCtxParams_setParameter() : Push parameters one by one into + * an existing ZSTD_CCtx_params structure. + * This is similar to + * ZSTD_CCtx_setParameter(). + * - ZSTD_CCtx_setParametersUsingCCtxParams() : Apply parameters to + * an existing CCtx. + * These parameters will be applied to + * all subsequent frames. + * - ZSTD_compressStream2() : Do compression using the CCtx. + * - ZSTD_freeCCtxParams() : Free the memory, accept NULL pointer. + * + * This can be used with ZSTD_estimateCCtxSize_advanced_usingCCtxParams() + * for static allocation of CCtx for single-threaded compression. + */ +ZSTDLIB_STATIC_API ZSTD_CCtx_params* ZSTD_createCCtxParams(void); +ZSTDLIB_STATIC_API size_t ZSTD_freeCCtxParams(ZSTD_CCtx_params* params); /* accept NULL pointer */ + +/*! ZSTD_CCtxParams_reset() : + * Reset params to default values. + */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtxParams_reset(ZSTD_CCtx_params* params); + +/*! ZSTD_CCtxParams_init() : + * Initializes the compression parameters of cctxParams according to + * compression level. All other parameters are reset to their default values. + */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtxParams_init(ZSTD_CCtx_params* cctxParams, int compressionLevel); + +/*! ZSTD_CCtxParams_init_advanced() : + * Initializes the compression and frame parameters of cctxParams according to + * params. All other parameters are reset to their default values. + */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtxParams_init_advanced(ZSTD_CCtx_params* cctxParams, ZSTD_parameters params); + +/*! ZSTD_CCtxParams_setParameter() : Requires v1.4.0+ + * Similar to ZSTD_CCtx_setParameter. + * Set one compression parameter, selected by enum ZSTD_cParameter. + * Parameters must be applied to a ZSTD_CCtx using + * ZSTD_CCtx_setParametersUsingCCtxParams(). + * @result : a code representing success or failure (which can be tested with + * ZSTD_isError()). + */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtxParams_setParameter(ZSTD_CCtx_params* params, ZSTD_cParameter param, int value); + +/*! ZSTD_CCtxParams_getParameter() : + * Similar to ZSTD_CCtx_getParameter. + * Get the requested value of one compression parameter, selected by enum ZSTD_cParameter. + * @result : 0, or an error code (which can be tested with ZSTD_isError()). + */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtxParams_getParameter(const ZSTD_CCtx_params* params, ZSTD_cParameter param, int* value); + +/*! ZSTD_CCtx_setParametersUsingCCtxParams() : + * Apply a set of ZSTD_CCtx_params to the compression context. + * This can be done even after compression is started, + * if nbWorkers==0, this will have no impact until a new compression is started. + * if nbWorkers>=1, new parameters will be picked up at next job, + * with a few restrictions (windowLog, pledgedSrcSize, nbWorkers, jobSize, and overlapLog are not updated). + */ +ZSTDLIB_STATIC_API size_t ZSTD_CCtx_setParametersUsingCCtxParams( + ZSTD_CCtx* cctx, const ZSTD_CCtx_params* params); + +/*! ZSTD_compressStream2_simpleArgs() : + * Same as ZSTD_compressStream2(), + * but using only integral types as arguments. + * This variant might be helpful for binders from dynamic languages + * which have troubles handling structures containing memory pointers. + */ +ZSTDLIB_STATIC_API size_t ZSTD_compressStream2_simpleArgs ( + ZSTD_CCtx* cctx, + void* dst, size_t dstCapacity, size_t* dstPos, + const void* src, size_t srcSize, size_t* srcPos, + ZSTD_EndDirective endOp); + + +/*************************************** +* Advanced decompression functions +***************************************/ + +/*! ZSTD_isFrame() : + * Tells if the content of `buffer` starts with a valid Frame Identifier. + * Note : Frame Identifier is 4 bytes. If `size < 4`, @return will always be 0. + * Note 2 : Legacy Frame Identifiers are considered valid only if Legacy Support is enabled. + * Note 3 : Skippable Frame Identifiers are considered valid. */ +ZSTDLIB_STATIC_API unsigned ZSTD_isFrame(const void* buffer, size_t size); + +/*! ZSTD_createDDict_byReference() : + * Create a digested dictionary, ready to start decompression operation without startup delay. + * Dictionary content is referenced, and therefore stays in dictBuffer. + * It is important that dictBuffer outlives DDict, + * it must remain read accessible throughout the lifetime of DDict */ +ZSTDLIB_STATIC_API ZSTD_DDict* ZSTD_createDDict_byReference(const void* dictBuffer, size_t dictSize); + +/*! ZSTD_DCtx_loadDictionary_byReference() : + * Same as ZSTD_DCtx_loadDictionary(), + * but references `dict` content instead of copying it into `dctx`. + * This saves memory if `dict` remains around., + * However, it's imperative that `dict` remains accessible (and unmodified) while being used, so it must outlive decompression. */ +ZSTDLIB_STATIC_API size_t ZSTD_DCtx_loadDictionary_byReference(ZSTD_DCtx* dctx, const void* dict, size_t dictSize); + +/*! ZSTD_DCtx_loadDictionary_advanced() : + * Same as ZSTD_DCtx_loadDictionary(), + * but gives direct control over + * how to load the dictionary (by copy ? by reference ?) + * and how to interpret it (automatic ? force raw mode ? full mode only ?). */ +ZSTDLIB_STATIC_API size_t ZSTD_DCtx_loadDictionary_advanced(ZSTD_DCtx* dctx, const void* dict, size_t dictSize, ZSTD_dictLoadMethod_e dictLoadMethod, ZSTD_dictContentType_e dictContentType); + +/*! ZSTD_DCtx_refPrefix_advanced() : + * Same as ZSTD_DCtx_refPrefix(), but gives finer control over + * how to interpret prefix content (automatic ? force raw mode (default) ? full mode only ?) */ +ZSTDLIB_STATIC_API size_t ZSTD_DCtx_refPrefix_advanced(ZSTD_DCtx* dctx, const void* prefix, size_t prefixSize, ZSTD_dictContentType_e dictContentType); + +/*! ZSTD_DCtx_setMaxWindowSize() : + * Refuses allocating internal buffers for frames requiring a window size larger than provided limit. + * This protects a decoder context from reserving too much memory for itself (potential attack scenario). + * This parameter is only useful in streaming mode, since no internal buffer is allocated in single-pass mode. + * By default, a decompression context accepts all window sizes <= (1 << ZSTD_WINDOWLOG_LIMIT_DEFAULT) + * @return : 0, or an error code (which can be tested using ZSTD_isError()). + */ +ZSTDLIB_STATIC_API size_t ZSTD_DCtx_setMaxWindowSize(ZSTD_DCtx* dctx, size_t maxWindowSize); + +/*! ZSTD_DCtx_getParameter() : + * Get the requested decompression parameter value, selected by enum ZSTD_dParameter, + * and store it into int* value. + * @return : 0, or an error code (which can be tested with ZSTD_isError()). + */ +ZSTDLIB_STATIC_API size_t ZSTD_DCtx_getParameter(ZSTD_DCtx* dctx, ZSTD_dParameter param, int* value); + +/* ZSTD_d_format + * experimental parameter, + * allowing selection between ZSTD_format_e input compression formats + */ +#define ZSTD_d_format ZSTD_d_experimentalParam1 +/* ZSTD_d_stableOutBuffer + * Experimental parameter. + * Default is 0 == disabled. Set to 1 to enable. + * + * Tells the decompressor that the ZSTD_outBuffer will ALWAYS be the same + * between calls, except for the modifications that zstd makes to pos (the + * caller must not modify pos). This is checked by the decompressor, and + * decompression will fail if it ever changes. Therefore the ZSTD_outBuffer + * MUST be large enough to fit the entire decompressed frame. This will be + * checked when the frame content size is known. The data in the ZSTD_outBuffer + * in the range [dst, dst + pos) MUST not be modified during decompression + * or you will get data corruption. + * + * When this flag is enabled zstd won't allocate an output buffer, because + * it can write directly to the ZSTD_outBuffer, but it will still allocate + * an input buffer large enough to fit any compressed block. This will also + * avoid the memcpy() from the internal output buffer to the ZSTD_outBuffer. + * If you need to avoid the input buffer allocation use the buffer-less + * streaming API. + * + * NOTE: So long as the ZSTD_outBuffer always points to valid memory, using + * this flag is ALWAYS memory safe, and will never access out-of-bounds + * memory. However, decompression WILL fail if you violate the preconditions. + * + * WARNING: The data in the ZSTD_outBuffer in the range [dst, dst + pos) MUST + * not be modified during decompression or you will get data corruption. This + * is because zstd needs to reference data in the ZSTD_outBuffer to regenerate + * matches. Normally zstd maintains its own buffer for this purpose, but passing + * this flag tells zstd to use the user provided buffer. + */ +#define ZSTD_d_stableOutBuffer ZSTD_d_experimentalParam2 + +/* ZSTD_d_forceIgnoreChecksum + * Experimental parameter. + * Default is 0 == disabled. Set to 1 to enable + * + * Tells the decompressor to skip checksum validation during decompression, regardless + * of whether checksumming was specified during compression. This offers some + * slight performance benefits, and may be useful for debugging. + * Param has values of type ZSTD_forceIgnoreChecksum_e + */ +#define ZSTD_d_forceIgnoreChecksum ZSTD_d_experimentalParam3 + +/* ZSTD_d_refMultipleDDicts + * Experimental parameter. + * Default is 0 == disabled. Set to 1 to enable + * + * If enabled and dctx is allocated on the heap, then additional memory will be allocated + * to store references to multiple ZSTD_DDict. That is, multiple calls of ZSTD_refDDict() + * using a given ZSTD_DCtx, rather than overwriting the previous DDict reference, will instead + * store all references. At decompression time, the appropriate dictID is selected + * from the set of DDicts based on the dictID in the frame. + * + * Usage is simply calling ZSTD_refDDict() on multiple dict buffers. + * + * Param has values of byte ZSTD_refMultipleDDicts_e + * + * WARNING: Enabling this parameter and calling ZSTD_DCtx_refDDict(), will trigger memory + * allocation for the hash table. ZSTD_freeDCtx() also frees this memory. + * Memory is allocated as per ZSTD_DCtx::customMem. + * + * Although this function allocates memory for the table, the user is still responsible for + * memory management of the underlying ZSTD_DDict* themselves. + */ +#define ZSTD_d_refMultipleDDicts ZSTD_d_experimentalParam4 + +/* ZSTD_d_disableHuffmanAssembly + * Set to 1 to disable the Huffman assembly implementation. + * The default value is 0, which allows zstd to use the Huffman assembly + * implementation if available. + * + * This parameter can be used to disable Huffman assembly at runtime. + * If you want to disable it at compile time you can define the macro + * ZSTD_DISABLE_ASM. + */ +#define ZSTD_d_disableHuffmanAssembly ZSTD_d_experimentalParam5 + +/* ZSTD_d_maxBlockSize + * Allowed values are between 1KB and ZSTD_BLOCKSIZE_MAX (128KB). + * The default is ZSTD_BLOCKSIZE_MAX, and setting to 0 will set to the default. + * + * Forces the decompressor to reject blocks whose content size is + * larger than the configured maxBlockSize. When maxBlockSize is + * larger than the windowSize, the windowSize is used instead. + * This saves memory on the decoder when you know all blocks are small. + * + * This option is typically used in conjunction with ZSTD_c_maxBlockSize. + * + * WARNING: This causes the decoder to reject otherwise valid frames + * that have block sizes larger than the configured maxBlockSize. + */ +#define ZSTD_d_maxBlockSize ZSTD_d_experimentalParam6 + + +/*! ZSTD_DCtx_setFormat() : + * This function is REDUNDANT. Prefer ZSTD_DCtx_setParameter(). + * Instruct the decoder context about what kind of data to decode next. + * This instruction is mandatory to decode data without a fully-formed header, + * such ZSTD_f_zstd1_magicless for example. + * @return : 0, or an error code (which can be tested using ZSTD_isError()). */ +ZSTD_DEPRECATED("use ZSTD_DCtx_setParameter() instead") +ZSTDLIB_STATIC_API +size_t ZSTD_DCtx_setFormat(ZSTD_DCtx* dctx, ZSTD_format_e format); + +/*! ZSTD_decompressStream_simpleArgs() : + * Same as ZSTD_decompressStream(), + * but using only integral types as arguments. + * This can be helpful for binders from dynamic languages + * which have troubles handling structures containing memory pointers. + */ +ZSTDLIB_STATIC_API size_t ZSTD_decompressStream_simpleArgs ( + ZSTD_DCtx* dctx, + void* dst, size_t dstCapacity, size_t* dstPos, + const void* src, size_t srcSize, size_t* srcPos); + + +/******************************************************************** +* Advanced streaming functions +* Warning : most of these functions are now redundant with the Advanced API. +* Once Advanced API reaches "stable" status, +* redundant functions will be deprecated, and then at some point removed. +********************************************************************/ + +/*===== Advanced Streaming compression functions =====*/ + +/*! ZSTD_initCStream_srcSize() : + * This function is DEPRECATED, and equivalent to: + * ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only); + * ZSTD_CCtx_refCDict(zcs, NULL); // clear the dictionary (if any) + * ZSTD_CCtx_setParameter(zcs, ZSTD_c_compressionLevel, compressionLevel); + * ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize); + * + * pledgedSrcSize must be correct. If it is not known at init time, use + * ZSTD_CONTENTSIZE_UNKNOWN. Note that, for compatibility with older programs, + * "0" also disables frame content size field. It may be enabled in the future. + * This prototype will generate compilation warnings. + */ +ZSTD_DEPRECATED("use ZSTD_CCtx_reset, see zstd.h for detailed instructions") +ZSTDLIB_STATIC_API +size_t ZSTD_initCStream_srcSize(ZSTD_CStream* zcs, + int compressionLevel, + unsigned long long pledgedSrcSize); + +/*! ZSTD_initCStream_usingDict() : + * This function is DEPRECATED, and is equivalent to: + * ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only); + * ZSTD_CCtx_setParameter(zcs, ZSTD_c_compressionLevel, compressionLevel); + * ZSTD_CCtx_loadDictionary(zcs, dict, dictSize); + * + * Creates of an internal CDict (incompatible with static CCtx), except if + * dict == NULL or dictSize < 8, in which case no dict is used. + * Note: dict is loaded with ZSTD_dct_auto (treated as a full zstd dictionary if + * it begins with ZSTD_MAGIC_DICTIONARY, else as raw content) and ZSTD_dlm_byCopy. + * This prototype will generate compilation warnings. + */ +ZSTD_DEPRECATED("use ZSTD_CCtx_reset, see zstd.h for detailed instructions") +ZSTDLIB_STATIC_API +size_t ZSTD_initCStream_usingDict(ZSTD_CStream* zcs, + const void* dict, size_t dictSize, + int compressionLevel); + +/*! ZSTD_initCStream_advanced() : + * This function is DEPRECATED, and is equivalent to: + * ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only); + * ZSTD_CCtx_setParams(zcs, params); + * ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize); + * ZSTD_CCtx_loadDictionary(zcs, dict, dictSize); + * + * dict is loaded with ZSTD_dct_auto and ZSTD_dlm_byCopy. + * pledgedSrcSize must be correct. + * If srcSize is not known at init time, use value ZSTD_CONTENTSIZE_UNKNOWN. + * This prototype will generate compilation warnings. + */ +ZSTD_DEPRECATED("use ZSTD_CCtx_reset, see zstd.h for detailed instructions") +ZSTDLIB_STATIC_API +size_t ZSTD_initCStream_advanced(ZSTD_CStream* zcs, + const void* dict, size_t dictSize, + ZSTD_parameters params, + unsigned long long pledgedSrcSize); + +/*! ZSTD_initCStream_usingCDict() : + * This function is DEPRECATED, and equivalent to: + * ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only); + * ZSTD_CCtx_refCDict(zcs, cdict); + * + * note : cdict will just be referenced, and must outlive compression session + * This prototype will generate compilation warnings. + */ +ZSTD_DEPRECATED("use ZSTD_CCtx_reset and ZSTD_CCtx_refCDict, see zstd.h for detailed instructions") +ZSTDLIB_STATIC_API +size_t ZSTD_initCStream_usingCDict(ZSTD_CStream* zcs, const ZSTD_CDict* cdict); + +/*! ZSTD_initCStream_usingCDict_advanced() : + * This function is DEPRECATED, and is equivalent to: + * ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only); + * ZSTD_CCtx_setFParams(zcs, fParams); + * ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize); + * ZSTD_CCtx_refCDict(zcs, cdict); + * + * same as ZSTD_initCStream_usingCDict(), with control over frame parameters. + * pledgedSrcSize must be correct. If srcSize is not known at init time, use + * value ZSTD_CONTENTSIZE_UNKNOWN. + * This prototype will generate compilation warnings. + */ +ZSTD_DEPRECATED("use ZSTD_CCtx_reset and ZSTD_CCtx_refCDict, see zstd.h for detailed instructions") +ZSTDLIB_STATIC_API +size_t ZSTD_initCStream_usingCDict_advanced(ZSTD_CStream* zcs, + const ZSTD_CDict* cdict, + ZSTD_frameParameters fParams, + unsigned long long pledgedSrcSize); + +/*! ZSTD_resetCStream() : + * This function is DEPRECATED, and is equivalent to: + * ZSTD_CCtx_reset(zcs, ZSTD_reset_session_only); + * ZSTD_CCtx_setPledgedSrcSize(zcs, pledgedSrcSize); + * Note: ZSTD_resetCStream() interprets pledgedSrcSize == 0 as ZSTD_CONTENTSIZE_UNKNOWN, but + * ZSTD_CCtx_setPledgedSrcSize() does not do the same, so ZSTD_CONTENTSIZE_UNKNOWN must be + * explicitly specified. + * + * start a new frame, using same parameters from previous frame. + * This is typically useful to skip dictionary loading stage, since it will reuse it in-place. + * Note that zcs must be init at least once before using ZSTD_resetCStream(). + * If pledgedSrcSize is not known at reset time, use macro ZSTD_CONTENTSIZE_UNKNOWN. + * If pledgedSrcSize > 0, its value must be correct, as it will be written in header, and controlled at the end. + * For the time being, pledgedSrcSize==0 is interpreted as "srcSize unknown" for compatibility with older programs, + * but it will change to mean "empty" in future version, so use macro ZSTD_CONTENTSIZE_UNKNOWN instead. + * @return : 0, or an error code (which can be tested using ZSTD_isError()) + * This prototype will generate compilation warnings. + */ +ZSTD_DEPRECATED("use ZSTD_CCtx_reset, see zstd.h for detailed instructions") +ZSTDLIB_STATIC_API +size_t ZSTD_resetCStream(ZSTD_CStream* zcs, unsigned long long pledgedSrcSize); + + +typedef struct { + unsigned long long ingested; /* nb input bytes read and buffered */ + unsigned long long consumed; /* nb input bytes actually compressed */ + unsigned long long produced; /* nb of compressed bytes generated and buffered */ + unsigned long long flushed; /* nb of compressed bytes flushed : not provided; can be tracked from caller side */ + unsigned currentJobID; /* MT only : latest started job nb */ + unsigned nbActiveWorkers; /* MT only : nb of workers actively compressing at probe time */ +} ZSTD_frameProgression; + +/* ZSTD_getFrameProgression() : + * tells how much data has been ingested (read from input) + * consumed (input actually compressed) and produced (output) for current frame. + * Note : (ingested - consumed) is amount of input data buffered internally, not yet compressed. + * Aggregates progression inside active worker threads. + */ +ZSTDLIB_STATIC_API ZSTD_frameProgression ZSTD_getFrameProgression(const ZSTD_CCtx* cctx); + +/*! ZSTD_toFlushNow() : + * Tell how many bytes are ready to be flushed immediately. + * Useful for multithreading scenarios (nbWorkers >= 1). + * Probe the oldest active job, defined as oldest job not yet entirely flushed, + * and check its output buffer. + * @return : amount of data stored in oldest job and ready to be flushed immediately. + * if @return == 0, it means either : + * + there is no active job (could be checked with ZSTD_frameProgression()), or + * + oldest job is still actively compressing data, + * but everything it has produced has also been flushed so far, + * therefore flush speed is limited by production speed of oldest job + * irrespective of the speed of concurrent (and newer) jobs. + */ +ZSTDLIB_STATIC_API size_t ZSTD_toFlushNow(ZSTD_CCtx* cctx); + + +/*===== Advanced Streaming decompression functions =====*/ + +/*! + * This function is deprecated, and is equivalent to: + * + * ZSTD_DCtx_reset(zds, ZSTD_reset_session_only); + * ZSTD_DCtx_loadDictionary(zds, dict, dictSize); + * + * note: no dictionary will be used if dict == NULL or dictSize < 8 + */ +ZSTD_DEPRECATED("use ZSTD_DCtx_reset + ZSTD_DCtx_loadDictionary, see zstd.h for detailed instructions") +ZSTDLIB_STATIC_API size_t ZSTD_initDStream_usingDict(ZSTD_DStream* zds, const void* dict, size_t dictSize); + +/*! + * This function is deprecated, and is equivalent to: + * + * ZSTD_DCtx_reset(zds, ZSTD_reset_session_only); + * ZSTD_DCtx_refDDict(zds, ddict); + * + * note : ddict is referenced, it must outlive decompression session + */ +ZSTD_DEPRECATED("use ZSTD_DCtx_reset + ZSTD_DCtx_refDDict, see zstd.h for detailed instructions") +ZSTDLIB_STATIC_API size_t ZSTD_initDStream_usingDDict(ZSTD_DStream* zds, const ZSTD_DDict* ddict); + +/*! + * This function is deprecated, and is equivalent to: + * + * ZSTD_DCtx_reset(zds, ZSTD_reset_session_only); + * + * reuse decompression parameters from previous init; saves dictionary loading + */ +ZSTD_DEPRECATED("use ZSTD_DCtx_reset, see zstd.h for detailed instructions") +ZSTDLIB_STATIC_API size_t ZSTD_resetDStream(ZSTD_DStream* zds); + + +/* ********************* BLOCK-LEVEL SEQUENCE PRODUCER API ********************* + * + * *** OVERVIEW *** + * The Block-Level Sequence Producer API allows users to provide their own custom + * sequence producer which libzstd invokes to process each block. The produced list + * of sequences (literals and matches) is then post-processed by libzstd to produce + * valid compressed blocks. + * + * This block-level offload API is a more granular complement of the existing + * frame-level offload API compressSequences() (introduced in v1.5.1). It offers + * an easier migration story for applications already integrated with libzstd: the + * user application continues to invoke the same compression functions + * ZSTD_compress2() or ZSTD_compressStream2() as usual, and transparently benefits + * from the specific advantages of the external sequence producer. For example, + * the sequence producer could be tuned to take advantage of known characteristics + * of the input, to offer better speed / ratio, or could leverage hardware + * acceleration not available within libzstd itself. + * + * See contrib/externalSequenceProducer for an example program employing the + * Block-Level Sequence Producer API. + * + * *** USAGE *** + * The user is responsible for implementing a function of type + * ZSTD_sequenceProducer_F. For each block, zstd will pass the following + * arguments to the user-provided function: + * + * - sequenceProducerState: a pointer to a user-managed state for the sequence + * producer. + * + * - outSeqs, outSeqsCapacity: an output buffer for the sequence producer. + * outSeqsCapacity is guaranteed >= ZSTD_sequenceBound(srcSize). The memory + * backing outSeqs is managed by the CCtx. + * + * - src, srcSize: an input buffer for the sequence producer to parse. + * srcSize is guaranteed to be <= ZSTD_BLOCKSIZE_MAX. + * + * - dict, dictSize: a history buffer, which may be empty, which the sequence + * producer may reference as it parses the src buffer. Currently, zstd will + * always pass dictSize == 0 into external sequence producers, but this will + * change in the future. + * + * - compressionLevel: a signed integer representing the zstd compression level + * set by the user for the current operation. The sequence producer may choose + * to use this information to change its compression strategy and speed/ratio + * tradeoff. Note: the compression level does not reflect zstd parameters set + * through the advanced API. + * + * - windowSize: a size_t representing the maximum allowed offset for external + * sequences. Note that sequence offsets are sometimes allowed to exceed the + * windowSize if a dictionary is present, see doc/zstd_compression_format.md + * for details. + * + * The user-provided function shall return a size_t representing the number of + * sequences written to outSeqs. This return value will be treated as an error + * code if it is greater than outSeqsCapacity. The return value must be non-zero + * if srcSize is non-zero. The ZSTD_SEQUENCE_PRODUCER_ERROR macro is provided + * for convenience, but any value greater than outSeqsCapacity will be treated as + * an error code. + * + * If the user-provided function does not return an error code, the sequences + * written to outSeqs must be a valid parse of the src buffer. Data corruption may + * occur if the parse is not valid. A parse is defined to be valid if the + * following conditions hold: + * - The sum of matchLengths and literalLengths must equal srcSize. + * - All sequences in the parse, except for the final sequence, must have + * matchLength >= ZSTD_MINMATCH_MIN. The final sequence must have + * matchLength >= ZSTD_MINMATCH_MIN or matchLength == 0. + * - All offsets must respect the windowSize parameter as specified in + * doc/zstd_compression_format.md. + * - If the final sequence has matchLength == 0, it must also have offset == 0. + * + * zstd will only validate these conditions (and fail compression if they do not + * hold) if the ZSTD_c_validateSequences cParam is enabled. Note that sequence + * validation has a performance cost. + * + * If the user-provided function returns an error, zstd will either fall back + * to an internal sequence producer or fail the compression operation. The user can + * choose between the two behaviors by setting the ZSTD_c_enableSeqProducerFallback + * cParam. Fallback compression will follow any other cParam settings, such as + * compression level, the same as in a normal compression operation. + * + * The user shall instruct zstd to use a particular ZSTD_sequenceProducer_F + * function by calling + * ZSTD_registerSequenceProducer(cctx, + * sequenceProducerState, + * sequenceProducer) + * This setting will persist until the next parameter reset of the CCtx. + * + * The sequenceProducerState must be initialized by the user before calling + * ZSTD_registerSequenceProducer(). The user is responsible for destroying the + * sequenceProducerState. + * + * *** LIMITATIONS *** + * This API is compatible with all zstd compression APIs which respect advanced parameters. + * However, there are three limitations: + * + * First, the ZSTD_c_enableLongDistanceMatching cParam is not currently supported. + * COMPRESSION WILL FAIL if it is enabled and the user tries to compress with a block-level + * external sequence producer. + * - Note that ZSTD_c_enableLongDistanceMatching is auto-enabled by default in some + * cases (see its documentation for details). Users must explicitly set + * ZSTD_c_enableLongDistanceMatching to ZSTD_ps_disable in such cases if an external + * sequence producer is registered. + * - As of this writing, ZSTD_c_enableLongDistanceMatching is disabled by default + * whenever ZSTD_c_windowLog < 128MB, but that's subject to change. Users should + * check the docs on ZSTD_c_enableLongDistanceMatching whenever the Block-Level Sequence + * Producer API is used in conjunction with advanced settings (like ZSTD_c_windowLog). + * + * Second, history buffers are not currently supported. Concretely, zstd will always pass + * dictSize == 0 to the external sequence producer (for now). This has two implications: + * - Dictionaries are not currently supported. Compression will *not* fail if the user + * references a dictionary, but the dictionary won't have any effect. + * - Stream history is not currently supported. All advanced compression APIs, including + * streaming APIs, work with external sequence producers, but each block is treated as + * an independent chunk without history from previous blocks. + * + * Third, multi-threading within a single compression is not currently supported. In other words, + * COMPRESSION WILL FAIL if ZSTD_c_nbWorkers > 0 and an external sequence producer is registered. + * Multi-threading across compressions is fine: simply create one CCtx per thread. + * + * Long-term, we plan to overcome all three limitations. There is no technical blocker to + * overcoming them. It is purely a question of engineering effort. + */ + +#define ZSTD_SEQUENCE_PRODUCER_ERROR ((size_t)(-1)) + +typedef size_t (*ZSTD_sequenceProducer_F) ( + void* sequenceProducerState, + ZSTD_Sequence* outSeqs, size_t outSeqsCapacity, + const void* src, size_t srcSize, + const void* dict, size_t dictSize, + int compressionLevel, + size_t windowSize +); + +/*! ZSTD_registerSequenceProducer() : + * Instruct zstd to use a block-level external sequence producer function. + * + * The sequenceProducerState must be initialized by the caller, and the caller is + * responsible for managing its lifetime. This parameter is sticky across + * compressions. It will remain set until the user explicitly resets compression + * parameters. + * + * Sequence producer registration is considered to be an "advanced parameter", + * part of the "advanced API". This means it will only have an effect on compression + * APIs which respect advanced parameters, such as compress2() and compressStream2(). + * Older compression APIs such as compressCCtx(), which predate the introduction of + * "advanced parameters", will ignore any external sequence producer setting. + * + * The sequence producer can be "cleared" by registering a NULL function pointer. This + * removes all limitations described above in the "LIMITATIONS" section of the API docs. + * + * The user is strongly encouraged to read the full API documentation (above) before + * calling this function. */ +ZSTDLIB_STATIC_API void +ZSTD_registerSequenceProducer( + ZSTD_CCtx* cctx, + void* sequenceProducerState, + ZSTD_sequenceProducer_F sequenceProducer +); + +/*! ZSTD_CCtxParams_registerSequenceProducer() : + * Same as ZSTD_registerSequenceProducer(), but operates on ZSTD_CCtx_params. + * This is used for accurate size estimation with ZSTD_estimateCCtxSize_usingCCtxParams(), + * which is needed when creating a ZSTD_CCtx with ZSTD_initStaticCCtx(). + * + * If you are using the external sequence producer API in a scenario where ZSTD_initStaticCCtx() + * is required, then this function is for you. Otherwise, you probably don't need it. + * + * See tests/zstreamtest.c for example usage. */ +ZSTDLIB_STATIC_API void +ZSTD_CCtxParams_registerSequenceProducer( + ZSTD_CCtx_params* params, + void* sequenceProducerState, + ZSTD_sequenceProducer_F sequenceProducer +); + + +/********************************************************************* +* Buffer-less and synchronous inner streaming functions (DEPRECATED) +* +* This API is deprecated, and will be removed in a future version. +* It allows streaming (de)compression with user allocated buffers. +* However, it is hard to use, and not as well tested as the rest of +* our API. +* +* Please use the normal streaming API instead: ZSTD_compressStream2, +* and ZSTD_decompressStream. +* If there is functionality that you need, but it doesn't provide, +* please open an issue on our GitHub. +********************************************************************* */ + +/** + Buffer-less streaming compression (synchronous mode) + + A ZSTD_CCtx object is required to track streaming operations. + Use ZSTD_createCCtx() / ZSTD_freeCCtx() to manage resource. + ZSTD_CCtx object can be reused multiple times within successive compression operations. + + Start by initializing a context. + Use ZSTD_compressBegin(), or ZSTD_compressBegin_usingDict() for dictionary compression. + + Then, consume your input using ZSTD_compressContinue(). + There are some important considerations to keep in mind when using this advanced function : + - ZSTD_compressContinue() has no internal buffer. It uses externally provided buffers only. + - Interface is synchronous : input is consumed entirely and produces 1+ compressed blocks. + - Caller must ensure there is enough space in `dst` to store compressed data under worst case scenario. + Worst case evaluation is provided by ZSTD_compressBound(). + ZSTD_compressContinue() doesn't guarantee recover after a failed compression. + - ZSTD_compressContinue() presumes prior input ***is still accessible and unmodified*** (up to maximum distance size, see WindowLog). + It remembers all previous contiguous blocks, plus one separated memory segment (which can itself consists of multiple contiguous blocks) + - ZSTD_compressContinue() detects that prior input has been overwritten when `src` buffer overlaps. + In which case, it will "discard" the relevant memory section from its history. + + Finish a frame with ZSTD_compressEnd(), which will write the last block(s) and optional checksum. + It's possible to use srcSize==0, in which case, it will write a final empty block to end the frame. + Without last block mark, frames are considered unfinished (hence corrupted) by compliant decoders. + + `ZSTD_CCtx` object can be reused (ZSTD_compressBegin()) to compress again. +*/ + +/*===== Buffer-less streaming compression functions =====*/ +ZSTD_DEPRECATED("The buffer-less API is deprecated in favor of the normal streaming API. See docs.") +ZSTDLIB_STATIC_API size_t ZSTD_compressBegin(ZSTD_CCtx* cctx, int compressionLevel); +ZSTD_DEPRECATED("The buffer-less API is deprecated in favor of the normal streaming API. See docs.") +ZSTDLIB_STATIC_API size_t ZSTD_compressBegin_usingDict(ZSTD_CCtx* cctx, const void* dict, size_t dictSize, int compressionLevel); +ZSTD_DEPRECATED("The buffer-less API is deprecated in favor of the normal streaming API. See docs.") +ZSTDLIB_STATIC_API size_t ZSTD_compressBegin_usingCDict(ZSTD_CCtx* cctx, const ZSTD_CDict* cdict); /**< note: fails if cdict==NULL */ + +ZSTD_DEPRECATED("This function will likely be removed in a future release. It is misleading and has very limited utility.") +ZSTDLIB_STATIC_API +size_t ZSTD_copyCCtx(ZSTD_CCtx* cctx, const ZSTD_CCtx* preparedCCtx, unsigned long long pledgedSrcSize); /**< note: if pledgedSrcSize is not known, use ZSTD_CONTENTSIZE_UNKNOWN */ + +ZSTD_DEPRECATED("The buffer-less API is deprecated in favor of the normal streaming API. See docs.") +ZSTDLIB_STATIC_API size_t ZSTD_compressContinue(ZSTD_CCtx* cctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize); +ZSTD_DEPRECATED("The buffer-less API is deprecated in favor of the normal streaming API. See docs.") +ZSTDLIB_STATIC_API size_t ZSTD_compressEnd(ZSTD_CCtx* cctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize); + +/* The ZSTD_compressBegin_advanced() and ZSTD_compressBegin_usingCDict_advanced() are now DEPRECATED and will generate a compiler warning */ +ZSTD_DEPRECATED("use advanced API to access custom parameters") +ZSTDLIB_STATIC_API +size_t ZSTD_compressBegin_advanced(ZSTD_CCtx* cctx, const void* dict, size_t dictSize, ZSTD_parameters params, unsigned long long pledgedSrcSize); /**< pledgedSrcSize : If srcSize is not known at init time, use ZSTD_CONTENTSIZE_UNKNOWN */ +ZSTD_DEPRECATED("use advanced API to access custom parameters") +ZSTDLIB_STATIC_API +size_t ZSTD_compressBegin_usingCDict_advanced(ZSTD_CCtx* const cctx, const ZSTD_CDict* const cdict, ZSTD_frameParameters const fParams, unsigned long long const pledgedSrcSize); /* compression parameters are already set within cdict. pledgedSrcSize must be correct. If srcSize is not known, use macro ZSTD_CONTENTSIZE_UNKNOWN */ +/** + Buffer-less streaming decompression (synchronous mode) + + A ZSTD_DCtx object is required to track streaming operations. + Use ZSTD_createDCtx() / ZSTD_freeDCtx() to manage it. + A ZSTD_DCtx object can be reused multiple times. + + First typical operation is to retrieve frame parameters, using ZSTD_getFrameHeader(). + Frame header is extracted from the beginning of compressed frame, so providing only the frame's beginning is enough. + Data fragment must be large enough to ensure successful decoding. + `ZSTD_frameHeaderSize_max` bytes is guaranteed to always be large enough. + result : 0 : successful decoding, the `ZSTD_frameHeader` structure is correctly filled. + >0 : `srcSize` is too small, please provide at least result bytes on next attempt. + errorCode, which can be tested using ZSTD_isError(). + + It fills a ZSTD_frameHeader structure with important information to correctly decode the frame, + such as the dictionary ID, content size, or maximum back-reference distance (`windowSize`). + Note that these values could be wrong, either because of data corruption, or because a 3rd party deliberately spoofs false information. + As a consequence, check that values remain within valid application range. + For example, do not allocate memory blindly, check that `windowSize` is within expectation. + Each application can set its own limits, depending on local restrictions. + For extended interoperability, it is recommended to support `windowSize` of at least 8 MB. + + ZSTD_decompressContinue() needs previous data blocks during decompression, up to `windowSize` bytes. + ZSTD_decompressContinue() is very sensitive to contiguity, + if 2 blocks don't follow each other, make sure that either the compressor breaks contiguity at the same place, + or that previous contiguous segment is large enough to properly handle maximum back-reference distance. + There are multiple ways to guarantee this condition. + + The most memory efficient way is to use a round buffer of sufficient size. + Sufficient size is determined by invoking ZSTD_decodingBufferSize_min(), + which can return an error code if required value is too large for current system (in 32-bits mode). + In a round buffer methodology, ZSTD_decompressContinue() decompresses each block next to previous one, + up to the moment there is not enough room left in the buffer to guarantee decoding another full block, + which maximum size is provided in `ZSTD_frameHeader` structure, field `blockSizeMax`. + At which point, decoding can resume from the beginning of the buffer. + Note that already decoded data stored in the buffer should be flushed before being overwritten. + + There are alternatives possible, for example using two or more buffers of size `windowSize` each, though they consume more memory. + + Finally, if you control the compression process, you can also ignore all buffer size rules, + as long as the encoder and decoder progress in "lock-step", + aka use exactly the same buffer sizes, break contiguity at the same place, etc. + + Once buffers are setup, start decompression, with ZSTD_decompressBegin(). + If decompression requires a dictionary, use ZSTD_decompressBegin_usingDict() or ZSTD_decompressBegin_usingDDict(). + + Then use ZSTD_nextSrcSizeToDecompress() and ZSTD_decompressContinue() alternatively. + ZSTD_nextSrcSizeToDecompress() tells how many bytes to provide as 'srcSize' to ZSTD_decompressContinue(). + ZSTD_decompressContinue() requires this _exact_ amount of bytes, or it will fail. + + result of ZSTD_decompressContinue() is the number of bytes regenerated within 'dst' (necessarily <= dstCapacity). + It can be zero : it just means ZSTD_decompressContinue() has decoded some metadata item. + It can also be an error code, which can be tested with ZSTD_isError(). + + A frame is fully decoded when ZSTD_nextSrcSizeToDecompress() returns zero. + Context can then be reset to start a new decompression. + + Note : it's possible to know if next input to present is a header or a block, using ZSTD_nextInputType(). + This information is not required to properly decode a frame. + + == Special case : skippable frames == + + Skippable frames allow integration of user-defined data into a flow of concatenated frames. + Skippable frames will be ignored (skipped) by decompressor. + The format of skippable frames is as follows : + a) Skippable frame ID - 4 Bytes, Little endian format, any value from 0x184D2A50 to 0x184D2A5F + b) Frame Size - 4 Bytes, Little endian format, unsigned 32-bits + c) Frame Content - any content (User Data) of length equal to Frame Size + For skippable frames ZSTD_getFrameHeader() returns zfhPtr->frameType==ZSTD_skippableFrame. + For skippable frames ZSTD_decompressContinue() always returns 0 : it only skips the content. +*/ + +/*===== Buffer-less streaming decompression functions =====*/ + +ZSTDLIB_STATIC_API size_t ZSTD_decodingBufferSize_min(unsigned long long windowSize, unsigned long long frameContentSize); /**< when frame content size is not known, pass in frameContentSize == ZSTD_CONTENTSIZE_UNKNOWN */ + +ZSTDLIB_STATIC_API size_t ZSTD_decompressBegin(ZSTD_DCtx* dctx); +ZSTDLIB_STATIC_API size_t ZSTD_decompressBegin_usingDict(ZSTD_DCtx* dctx, const void* dict, size_t dictSize); +ZSTDLIB_STATIC_API size_t ZSTD_decompressBegin_usingDDict(ZSTD_DCtx* dctx, const ZSTD_DDict* ddict); + +ZSTDLIB_STATIC_API size_t ZSTD_nextSrcSizeToDecompress(ZSTD_DCtx* dctx); +ZSTDLIB_STATIC_API size_t ZSTD_decompressContinue(ZSTD_DCtx* dctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize); + +/* misc */ +ZSTD_DEPRECATED("This function will likely be removed in the next minor release. It is misleading and has very limited utility.") +ZSTDLIB_STATIC_API void ZSTD_copyDCtx(ZSTD_DCtx* dctx, const ZSTD_DCtx* preparedDCtx); +typedef enum { ZSTDnit_frameHeader, ZSTDnit_blockHeader, ZSTDnit_block, ZSTDnit_lastBlock, ZSTDnit_checksum, ZSTDnit_skippableFrame } ZSTD_nextInputType_e; +ZSTDLIB_STATIC_API ZSTD_nextInputType_e ZSTD_nextInputType(ZSTD_DCtx* dctx); + + + + +/* ========================================= */ +/** Block level API (DEPRECATED) */ +/* ========================================= */ + +/*! + + This API is deprecated in favor of the regular compression API. + You can get the frame header down to 2 bytes by setting: + - ZSTD_c_format = ZSTD_f_zstd1_magicless + - ZSTD_c_contentSizeFlag = 0 + - ZSTD_c_checksumFlag = 0 + - ZSTD_c_dictIDFlag = 0 + + This API is not as well tested as our normal API, so we recommend not using it. + We will be removing it in a future version. If the normal API doesn't provide + the functionality you need, please open a GitHub issue. + + Block functions produce and decode raw zstd blocks, without frame metadata. + Frame metadata cost is typically ~12 bytes, which can be non-negligible for very small blocks (< 100 bytes). + But users will have to take in charge needed metadata to regenerate data, such as compressed and content sizes. + + A few rules to respect : + - Compressing and decompressing require a context structure + + Use ZSTD_createCCtx() and ZSTD_createDCtx() + - It is necessary to init context before starting + + compression : any ZSTD_compressBegin*() variant, including with dictionary + + decompression : any ZSTD_decompressBegin*() variant, including with dictionary + - Block size is limited, it must be <= ZSTD_getBlockSize() <= ZSTD_BLOCKSIZE_MAX == 128 KB + + If input is larger than a block size, it's necessary to split input data into multiple blocks + + For inputs larger than a single block, consider using regular ZSTD_compress() instead. + Frame metadata is not that costly, and quickly becomes negligible as source size grows larger than a block. + - When a block is considered not compressible enough, ZSTD_compressBlock() result will be 0 (zero) ! + ===> In which case, nothing is produced into `dst` ! + + User __must__ test for such outcome and deal directly with uncompressed data + + A block cannot be declared incompressible if ZSTD_compressBlock() return value was != 0. + Doing so would mess up with statistics history, leading to potential data corruption. + + ZSTD_decompressBlock() _doesn't accept uncompressed data as input_ !! + + In case of multiple successive blocks, should some of them be uncompressed, + decoder must be informed of their existence in order to follow proper history. + Use ZSTD_insertBlock() for such a case. +*/ + +/*===== Raw zstd block functions =====*/ +ZSTD_DEPRECATED("The block API is deprecated in favor of the normal compression API. See docs.") +ZSTDLIB_STATIC_API size_t ZSTD_getBlockSize (const ZSTD_CCtx* cctx); +ZSTD_DEPRECATED("The block API is deprecated in favor of the normal compression API. See docs.") +ZSTDLIB_STATIC_API size_t ZSTD_compressBlock (ZSTD_CCtx* cctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize); +ZSTD_DEPRECATED("The block API is deprecated in favor of the normal compression API. See docs.") +ZSTDLIB_STATIC_API size_t ZSTD_decompressBlock(ZSTD_DCtx* dctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize); +ZSTD_DEPRECATED("The block API is deprecated in favor of the normal compression API. See docs.") +ZSTDLIB_STATIC_API size_t ZSTD_insertBlock (ZSTD_DCtx* dctx, const void* blockStart, size_t blockSize); /**< insert uncompressed block into `dctx` history. Useful for multi-blocks decompression. */ + +#endif /* ZSTD_H_ZSTD_STATIC_LINKING_ONLY */ + +#if defined (__cplusplus) +} +#endif diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index c429c88fb..9421c200d 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -616,6 +616,8 @@ bool opengl33_renderer::Render() } // generate new frame opengl_texture::reset_unit_cache(); + // textures of new heightmap terrain layers go to the arrays the terrain shader reads them from + m_terrainmaterials.update(); if( EditorModeFlag ) { // the editor moves and resizes model instances in place, which leaves the copies of their bounds out of date ++m_instanceboundsversion; @@ -2417,6 +2419,20 @@ IMaterial const *opengl33_renderer::Material(material_handle const Material) con return &m_materials.material(Material); } +material_handle opengl33_renderer::Terrain_Material(material_handle const Reuse, std::vector const &Layers, int const Samples, std::uint8_t const *Weights, glm::vec3 const &Placement) +{ + auto const material{m_terrainmaterials.make(Reuse, Layers, Samples, Weights, Placement)}; + if (material != null_handle) + return material; + // the terrain shader can't be used, the chunk makes do with a plain material + return gfx_renderer::Terrain_Material(Reuse, Layers, Samples, Weights, Placement); +} + +void opengl33_renderer::Terrain_Release(material_handle const Material) +{ + m_terrainmaterials.release(Material); +} + opengl_material &opengl33_renderer::Material(material_handle const Material) { return m_materials.material(Material); diff --git a/rendering/opengl33renderer.h b/rendering/opengl33renderer.h index 6d16cb2fb..64574420f 100644 --- a/rendering/opengl33renderer.h +++ b/rendering/opengl33renderer.h @@ -29,6 +29,7 @@ http://mozilla.org/MPL/2.0/. #include "gl/glsl_common.h" #include "gl/pbo.h" #include "gl/query.h" +#include "rendering/opengl33terrain.h" // bare-bones render controller, in lack of anything better yet class opengl33_renderer : public gfx_renderer { @@ -81,6 +82,10 @@ class opengl33_renderer : public gfx_renderer { Bind_Material( material_handle const Material, TSubModel const *sm = nullptr, lighting_data const *lighting = nullptr ) override; IMaterial const * Material( material_handle const Material ) const override; + material_handle + Terrain_Material( material_handle const Reuse, std::vector const &Layers, int const Samples, std::uint8_t const *Weights, glm::vec3 const &Placement ) override; + void + Terrain_Release( material_handle const Material ) override; // shader methods auto Fetch_Shader( std::string const &name ) -> std::shared_ptr override; // texture methods @@ -350,6 +355,7 @@ class opengl33_renderer : public gfx_renderer { gfx::geometrybank_manager m_geometry; material_manager m_materials; texture_manager m_textures; + opengl33_terrain_materials m_terrainmaterials{m_materials, m_textures}; opengl33_light m_sunlight; opengllight_array m_lights; /* diff --git a/rendering/opengl33terrain.cpp b/rendering/opengl33terrain.cpp new file mode 100644 index 000000000..48faccfe0 --- /dev/null +++ b/rendering/opengl33terrain.cpp @@ -0,0 +1,423 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "rendering/opengl33terrain.h" + +#include "rendering/opengl33geometrybank.h" +#include "utilities/Globals.h" +#include "utilities/Logs.h" + +namespace +{ + +std::size_t constexpr max_layers{8}; +int constexpr initial_capacity{8}; +int constexpr copy_attempts{600}; // frames to wait for the textures of a layer to load before it's left with what it has +float constexpr default_repeat{8.f}; + +// array textures: diffuse, normal maps, specular/gloss maps +std::array constexpr array_sizes{1024, 512, 256}; + +void bind_for_upload(opengl_texture const &Texture) +{ + ::glActiveTexture(GL_TEXTURE0); + ::glBindTexture(Texture.target, Texture.id); +} + +void set_anisotropy(GLenum const Target) +{ + if (Global.AnisotropicFiltering >= 0 && (GLAD_GL_EXT_texture_filter_anisotropic || GLAD_GL_ARB_texture_filter_anisotropic)) + ::glTexParameterf(Target, GL_TEXTURE_MAX_ANISOTROPY_EXT, Global.AnisotropicFiltering); +} + +} // namespace + +bool opengl33_terrain_materials::init() +{ + if (m_state != 0) + return m_state > 0; + m_state = -1; + try + { + m_copy = std::make_unique(gl::shader("copy.frag")); + } + catch (gl::shader_exception const &e) + { + ErrorLog("heightmap terrain: can't use the copy shader: " + std::string(e.what())); + return false; + } + m_framebuffer = std::make_unique(); + + m_white = make_texture("internal_src:terrain/white", GL_TEXTURE_2D); + { + auto const &white{m_textures.texture(m_white)}; + std::uint8_t const texel[4]{255, 255, 255, 255}; + bind_for_upload(white); + ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + ::glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, texel); + } + char const *names[]{"internal_src:terrain/layers_diffuse", "internal_src:terrain/layers_normal", "internal_src:terrain/layers_specgloss"}; + for (std::size_t i = 0; i < m_arrays.size(); ++i) + { + auto &array{m_arrays[i]}; + array.handle = make_texture(names[i], GL_TEXTURE_2D_ARRAY); + array.size = array_sizes[i]; + array.srgb = (i == 0); + array.format = (array.srgb ? GL_SRGB8_ALPHA8 : GL_RGBA8); + make_storage(array, initial_capacity); + } + m_capacity = initial_capacity; + opengl_texture::reset_unit_cache(); + + // the shader is checked now, so a broken one makes the terrain fall back on plain materials instead of the failure indicator + try + { + GfxRenderer->Fetch_Shader("terrain"); + } + catch (gl::shader_exception const &e) + { + ErrorLog("heightmap terrain: can't use the terrain shader: " + std::string(e.what())); + return false; + } + m_state = 1; + return true; +} + +texture_handle opengl33_terrain_materials::make_texture(std::string const &Name, GLenum const Target) +{ + auto const handle{m_textures.create(Name, false, GL_RGBA)}; + auto &texture{m_textures.texture(handle)}; + if (texture.id == opengl_texture::invalid_id) + ::glGenTextures(1, &texture.id); + texture.target = Target; + // the content is supplied here, the texture manager isn't to load, release or replace it + texture.is_ready = true; + texture.is_static = true; + texture.is_rendertarget = true; + texture.is_texstub = false; + texture.data_state = resource_state::good; + return handle; +} + +void opengl33_terrain_materials::make_storage(texture_array &Array, int const Layers) +{ + auto &texture{m_textures.texture(Array.handle)}; + bind_for_upload(texture); + ::glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); + ::glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + ::glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_S, GL_REPEAT); + ::glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_T, GL_REPEAT); + set_anisotropy(GL_TEXTURE_2D_ARRAY); + ::glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, Array.format, Array.size, Array.size, Layers, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr); + texture.data_width = Array.size; + texture.data_height = Array.size; + texture.layers = Layers; + texture.data_format = Array.format; + texture.data_components = GL_RGBA; +} + +int opengl33_terrain_materials::layer_index(gfx::terrain_layer const &Layer) +{ + for (auto const &existing : m_layers) + if (existing.material == Layer.material && existing.size == Layer.size) + return existing.index; + + layer entry; + entry.material = Layer.material; + entry.size = Layer.size; + entry.index = static_cast(m_layers.size()); + auto const &material{m_materials.material(Layer.material)}; + entry.repeat = (Layer.size > 0.f ? Layer.size : (material.size.x > 0.f ? material.size.x : default_repeat)); + if (material.shader) + { + entry.normalmap = material.shader->texture_conf.count("normalmap") > 0; + entry.specgloss = material.shader->texture_conf.count("specgloss") > 0; + } + entry.reflection = (std::isfinite(material.params[1].z) ? material.params[1].z : 0.f); + m_layers.push_back(entry); + m_pending = true; + + if (static_cast(m_layers.size()) > m_capacity) + { + // more room: the arrays are made anew, and every layer copied again + auto const capacity{m_capacity * 2}; + for (auto &array : m_arrays) + { + auto &texture{m_textures.texture(array.handle)}; + ::glDeleteTextures(1, &texture.id); + ::glGenTextures(1, &texture.id); + make_storage(array, capacity); + } + m_capacity = capacity; + for (auto &existing : m_layers) + { + existing.copied = false; + existing.attempts = 0; + } + opengl_texture::reset_unit_cache(); + } + return entry.index; +} + +std::size_t opengl33_terrain_materials::acquire_slot(material_handle const Reuse) +{ + if (Reuse != null_handle) + { + auto const lookup{m_slotof.find(Reuse)}; + if (lookup != m_slotof.end()) + { + m_slots[lookup->second].used = true; + return lookup->second; + } + } + if (false == m_free.empty()) + { + auto const index{m_free.back()}; + m_free.pop_back(); + m_slots[index].used = true; + return index; + } + auto const index{m_slots.size()}; + auto const suffix{std::to_string(index)}; + slot entry; + entry.weights[0] = make_texture("internal_src:terrain/weights0_" + suffix, GL_TEXTURE_2D); + entry.weights[1] = make_texture("internal_src:terrain/weights1_" + suffix, GL_TEXTURE_2D); + entry.table = make_texture("internal_src:terrain/table_" + suffix, GL_TEXTURE_2D); + // the textures get their content before the material is made of them, which checks they're there + std::uint8_t const blank[4]{0, 0, 0, 0}; + for (auto const handle : entry.weights) + { + bind_for_upload(m_textures.texture(handle)); + ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); + ::glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, blank); + ::glGenerateMipmap(GL_TEXTURE_2D); + } + { + bind_for_upload(m_textures.texture(entry.table)); + ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + std::array const zeros{}; + ::glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, static_cast(max_layers), 2, 0, GL_RGBA, GL_FLOAT, zeros.data()); + } + opengl_texture::reset_unit_cache(); + auto const name = [&](texture_handle const Handle) { return "internal_src:" + m_textures.texture(Handle).name; }; + std::string const definition{ + "shader: terrain\n" + "texture1: " + name(m_white) + "\n" + "texture2: " + name(entry.weights[0]) + "\n" + "texture3: " + name(entry.weights[1]) + "\n" + "texture4: " + name(m_arrays[0].handle) + "\n" + "texture5: " + name(m_arrays[1].handle) + "\n" + "texture6: " + name(m_arrays[2].handle) + "\n" + "texture7: " + name(entry.table) + "\n"}; + entry.material = m_materials.create_from_text("internal_src:terrain/chunk_" + suffix, definition); + if (entry.material == null_handle || false == m_materials.material(entry.material).is_good) + { + ErrorLog("heightmap terrain: can't make the material of a chunk"); + m_state = -1; + return static_cast(-1); + } + entry.used = true; + m_slots.push_back(entry); + m_slotof.emplace(entry.material, index); + return index; +} + +material_handle opengl33_terrain_materials::make(material_handle const Reuse, std::vector const &Layers, int const Samples, std::uint8_t const *Weights, glm::vec3 const &Placement) +{ + if (Layers.empty() || false == init()) + return null_handle; + auto const count{std::min(Layers.size(), max_layers)}; + std::array indices{}; + for (std::size_t i = 0; i < count; ++i) + { + if (Layers[i].material == null_handle) + return null_handle; + indices[i] = layer_index(Layers[i]); + } + auto const slotindex{acquire_slot(Reuse)}; + if (slotindex == static_cast(-1)) + return null_handle; + auto &entry{m_slots[slotindex]}; + + // weights, four layers to a texture + auto const painted{Weights != nullptr && Samples > 0 && count > 1}; + auto const side{painted ? Samples + 1 : 1}; + auto const samples{static_cast(side) * side}; + std::vector texels(samples * 4); + for (std::size_t texture = 0; texture < 2; ++texture) + { + std::fill(texels.begin(), texels.end(), 0); + for (std::size_t channel = 0; channel < 4; ++channel) + { + auto const layer{texture * 4 + channel}; + if (layer >= count) + break; + if (false == painted) + { + if (layer == 0) + texels[channel] = 255; + continue; + } + auto const *source{Weights + layer * samples}; + for (std::size_t i = 0; i < samples; ++i) + texels[i * 4 + channel] = source[i]; + } + bind_for_upload(m_textures.texture(entry.weights[texture])); + ::glPixelStorei(GL_UNPACK_ALIGNMENT, 4); + ::glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, side, side, 0, GL_RGBA, GL_UNSIGNED_BYTE, texels.data()); + ::glGenerateMipmap(GL_TEXTURE_2D); + } + // what the layers are: index in the arrays, repeat, which maps they have, reflection + std::array table{}; + for (std::size_t i = 0; i < count; ++i) + { + auto const &layer{m_layers[indices[i]]}; + table[i * 4 + 0] = static_cast(layer.index); + table[i * 4 + 1] = 1.f / std::max(0.01f, layer.repeat); + table[i * 4 + 2] = layer.normalmap ? 1.f : 0.f; + table[i * 4 + 3] = layer.specgloss ? 1.f : 0.f; + table[(max_layers + i) * 4 + 0] = layer.reflection; + } + bind_for_upload(m_textures.texture(entry.table)); + ::glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, static_cast(max_layers), 2, 0, GL_RGBA, GL_FLOAT, table.data()); + opengl_texture::reset_unit_cache(); + + auto &material{m_materials.material(entry.material)}; + material.params[2] = glm::vec4(Placement.x, Placement.y, 1.f / std::max(1.f, Placement.z), static_cast(side - 1)); + return entry.material; +} + +void opengl33_terrain_materials::release(material_handle const Material) +{ + auto const lookup{m_slotof.find(Material)}; + if (lookup == m_slotof.end() || false == m_slots[lookup->second].used) + return; + m_slots[lookup->second].used = false; + m_free.push_back(lookup->second); +} + +bool opengl33_terrain_materials::copy_layer(layer &Layer) +{ + auto const &material{m_materials.material(Layer.material)}; + auto const slot = [&](char const *Name, int const Fallback) { + if (material.shader) + { + auto const lookup{material.shader->texture_conf.find(Name)}; + if (lookup != material.shader->texture_conf.end()) + return static_cast(lookup->second.id); + return -1; + } + return Fallback; + }; + std::array const slots{slot("diffuse", 0), Layer.normalmap ? slot("normalmap", 1) : -1, Layer.specgloss ? slot("specgloss", 2) : -1}; + // all maps of the layer have to be ready, so they go together + std::array sources{}; + for (std::size_t i = 0; i < slots.size(); ++i) + { + if (slots[i] < 0 || material.textures[slots[i]] == null_handle) + continue; + auto &texture{m_textures.mark_as_used(material.textures[slots[i]])}; + if (false == texture.create()) + { + if (++Layer.attempts < copy_attempts) + return false; + continue; // waited long enough, the layer goes without it + } + sources[i] = &texture; + } + // defaults for maps the layer doesn't have: grey, flat, without specular reflections + std::array, 3> const defaults{{{0.5f, 0.5f, 0.5f, 1.f}, {0.5f, 0.5f, 1.f, 1.f}, {0.f, 1.f, 0.f, 1.f}}}; + for (std::size_t i = 0; i < m_arrays.size(); ++i) + { + auto const &array{m_arrays[i]}; + auto &target{m_textures.texture(array.handle)}; + m_framebuffer->attach(target, GL_COLOR_ATTACHMENT0, Layer.index); + m_framebuffer->setup_drawing(1); + ::glViewport(0, 0, array.size, array.size); + if (sources[i] == nullptr) + { + ::glClearBufferfv(GL_COLOR, 0, defaults[i].data()); + continue; + } + if (false == Global.gfx_usegles) + { + if (array.srgb) + ::glEnable(GL_FRAMEBUFFER_SRGB); + else + ::glDisable(GL_FRAMEBUFFER_SRGB); + } + m_copy->apply(*sources[i], m_framebuffer.get()); + } + Layer.copied = true; + return true; +} + +void opengl33_terrain_materials::update() +{ + if (false == m_pending || m_state <= 0) + return; + + auto const blend{::glIsEnabled(GL_BLEND)}; + auto const scissor{::glIsEnabled(GL_SCISSOR_TEST)}; + auto const cull{::glIsEnabled(GL_CULL_FACE)}; + auto const depth{::glIsEnabled(GL_DEPTH_TEST)}; + auto const srgb{(false == Global.gfx_usegles) && ::glIsEnabled(GL_FRAMEBUFFER_SRGB)}; + ::glDisable(GL_BLEND); + ::glDisable(GL_SCISSOR_TEST); + ::glDisable(GL_CULL_FACE); + + bool copied{false}; + m_pending = false; + for (auto &layer : m_layers) + { + if (layer.copied) + continue; + if (copy_layer(layer)) + copied = true; + else + m_pending = true; + } + if (copied) + { + for (auto const &array : m_arrays) + { + bind_for_upload(m_textures.texture(array.handle)); + ::glGenerateMipmap(GL_TEXTURE_2D_ARRAY); + } + } + + // leave the state as the rest of the renderer knows it + gl::framebuffer::unbind(); + if (blend) + ::glEnable(GL_BLEND); + if (scissor) + ::glEnable(GL_SCISSOR_TEST); + if (cull) + ::glEnable(GL_CULL_FACE); + if (depth) + ::glEnable(GL_DEPTH_TEST); + else + ::glDisable(GL_DEPTH_TEST); + if (false == Global.gfx_usegles) + { + if (srgb) + ::glEnable(GL_FRAMEBUFFER_SRGB); + else + ::glDisable(GL_FRAMEBUFFER_SRGB); + } + ::glDepthMask(GL_TRUE); + opengl_texture::reset_unit_cache(); + gfx::opengl33_vaogeometrybank::reset(); +} diff --git a/rendering/opengl33terrain.h b/rendering/opengl33terrain.h new file mode 100644 index 000000000..60d12113d --- /dev/null +++ b/rendering/opengl33terrain.h @@ -0,0 +1,85 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include +#include +#include + +#include "rendering/renderer.h" +#include "model/material.h" +#include "model/Texture.h" +#include "gl/framebuffer.h" +#include "gl/postfx.h" + +// materials of the heightmap terrain for the opengl 3.3 renderer (shader mat_terrain). +// the textures of the layer materials are copied into texture arrays shared by all chunks; each chunk gets a material +// of its own, with textures holding the weights of its layers and a table of what its layers are +class opengl33_terrain_materials +{ + public: + opengl33_terrain_materials(material_manager &Materials, texture_manager &Textures) : m_materials(Materials), m_textures(Textures) {} + + // see gfx_renderer::Terrain_Material. returns null_handle if the terrain shader can't be used + material_handle make(material_handle const Reuse, std::vector const &Layers, int const Samples, std::uint8_t const *Weights, glm::vec3 const &Placement); + void release(material_handle const Material); + // copies the textures of new layers into the arrays; to be called before the frame is drawn + void update(); + + private: + struct layer + { + material_handle material{null_handle}; + float size{0.f}; // as given by the chunk + float repeat{8.f}; // metres the textures are repeated at + int index{0}; // in the arrays + bool normalmap{false}; + bool specgloss{false}; + float reflection{0.f}; + bool copied{false}; + int attempts{0}; + }; + struct texture_array + { + texture_handle handle{null_handle}; + int size{0}; + GLint format{0}; + bool srgb{false}; + }; + struct slot + { + material_handle material{null_handle}; + std::array weights{null_handle, null_handle}; + texture_handle table{null_handle}; + bool used{false}; + }; + + bool init(); + texture_handle make_texture(std::string const &Name, GLenum const Target); + void make_storage(texture_array &Array, int const Layers); + int layer_index(gfx::terrain_layer const &Layer); + bool copy_layer(layer &Layer); + std::size_t acquire_slot(material_handle const Reuse); + + material_manager &m_materials; + texture_manager &m_textures; + int m_state{0}; // 0: not set up yet, 1: ready, -1: can't be used + texture_handle m_white{null_handle}; + std::array m_arrays; // diffuse, normal maps, specular/gloss + int m_capacity{0}; // layers the arrays have room for + std::vector m_layers; + bool m_pending{false}; + std::vector m_slots; + std::vector m_free; + std::unordered_map m_slotof; + std::unique_ptr m_copy; + std::unique_ptr m_framebuffer; +}; diff --git a/rendering/renderer.cpp b/rendering/renderer.cpp index 610473a31..d9d4b5df0 100644 --- a/rendering/renderer.cpp +++ b/rendering/renderer.cpp @@ -39,5 +39,29 @@ gfx_renderer_factory *gfx_renderer_factory::get_instance() gfx_renderer_factory *gfx_renderer_factory::instance; +material_handle gfx_renderer::Terrain_Material( material_handle const Reuse, std::vector const &Layers, int const Samples, std::uint8_t const *Weights, glm::vec3 const &Placement ) +{ + // without blending the chunk gets the material which covers the most of it + if( Layers.empty() ) { + return null_handle; + } + std::size_t best { 0 }; + if( ( Weights != nullptr ) && ( Samples > 0 ) ) { + auto const samples { static_cast( Samples + 1 ) * ( Samples + 1 ) }; + std::uint64_t bestsum { 0 }; + for( std::size_t layer = 0; layer < Layers.size(); ++layer ) { + std::uint64_t sum { 0 }; + for( std::size_t i = 0; i < samples; ++i ) { + sum += Weights[ layer * samples + i ]; + } + if( sum > bestsum ) { + bestsum = sum; + best = layer; + } + } + } + return Layers[ best ].material; +} + //--------------------------------------------------------------------------- diff --git a/rendering/renderer.h b/rendering/renderer.h index 6e8e7d464..57d7365eb 100644 --- a/rendering/renderer.h +++ b/rendering/renderer.h @@ -21,6 +21,16 @@ namespace gl class program; } +namespace gfx +{ +// material painted over the heightmap terrain, and the size (metres) its textures are repeated at; 0: the size given by the material, or 8 m +struct terrain_layer +{ + material_handle material{null_handle}; + float size{0.f}; +}; +} // namespace gfx + class gfx_renderer { public: @@ -58,6 +68,14 @@ public: virtual auto Fetch_Material( std::string const &Filename, bool const Loadnow = true ) -> material_handle = 0; virtual void Bind_Material( material_handle const Material, TSubModel const *sm = nullptr, lighting_data const *lighting = nullptr ) = 0; virtual auto Material( material_handle const Material ) const -> IMaterial const * = 0; + // heightmap terrain: material of a chunk blending the materials of up to 8 layers by their weights. + // Weights: (Samples + 1)^2 values per layer, planar, rows of growing z, the weights of a sample adding up to 255; null with a single layer. + // Placement: corner of the chunk (x, z) in the texture coordinates of its mesh, and the size of the chunk. + // Reuse: a material made by this call before, to be filled anew, or null_handle. + // returns: the material. backends which can't blend give back the material of the layer covering the most + virtual auto Terrain_Material( material_handle const Reuse, std::vector const &Layers, int const Samples, std::uint8_t const *Weights, glm::vec3 const &Placement ) -> material_handle; + // gives back a material made by Terrain_Material, once its chunk is gone + virtual void Terrain_Release( material_handle const Material ) {} // shader methods virtual auto Fetch_Shader( std::string const &name ) -> std::shared_ptr = 0; // texture methods diff --git a/scene/heightmapterrain.cpp b/scene/heightmapterrain.cpp new file mode 100644 index 000000000..ea2bde069 --- /dev/null +++ b/scene/heightmapterrain.cpp @@ -0,0 +1,1141 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "scene/heightmapterrain.h" + +#include "scene/sceneterrain.h" + +#include +#include +#include +#include +#include +#include + +#include +#include "zstd.h" + +namespace heightmap +{ + +namespace +{ + +std::uint32_t constexpr fourcc(char const A, char const B, char const C, char const D) +{ + return static_cast(static_cast(A)) | (static_cast(static_cast(B)) << 8) | + (static_cast(static_cast(C)) << 16) | (static_cast(static_cast(D)) << 24); +} + +std::uint32_t constexpr tag_chunk{fourcc('C', 'H', 'N', 'K')}; +std::uint32_t constexpr tag_heights{fourcc('H', 'G', 'H', 'T')}; +std::uint32_t constexpr tag_base{fourcc('H', 'B', 'A', 'S')}; +std::uint32_t constexpr tag_paint{fourcc('S', 'P', 'L', 'T')}; + +std::uint32_t constexpr pack_magic{fourcc('T', 'C', 'H', '1')}; +std::uint32_t constexpr pack_version{1}; +std::size_t constexpr header_size{64}; +std::size_t constexpr index_entry_size{16}; +std::size_t constexpr slice_entry_size{32}; +std::uint32_t constexpr codec_stored{0}; +std::uint32_t constexpr codec_zstd{1}; +int constexpr zstd_level{3}; // light and fast, the data is simple + +// the slices are small, a slice larger than this is taken for a damaged file +std::uint32_t constexpr max_slice_size{256u * 1024u * 1024u}; + +template void put(std::vector &Out, Type_ const Value) +{ + auto const offset{Out.size()}; + Out.resize(offset + sizeof(Type_)); + std::memcpy(Out.data() + offset, &Value, sizeof(Type_)); +} + +template void put_at(std::vector &Out, std::size_t const Offset, Type_ const Value) +{ + std::memcpy(Out.data() + Offset, &Value, sizeof(Type_)); +} + +// reads values from a block of data, without going past its end +class reader +{ + public: + reader(std::uint8_t const *Data, std::size_t const Size) : m_data(Data), m_size(Size) {} + template bool get(Type_ &Value) + { + if (m_offset + sizeof(Type_) > m_size) + return false; + std::memcpy(&Value, m_data + m_offset, sizeof(Type_)); + m_offset += sizeof(Type_); + return true; + } + bool get(void *Out, std::size_t const Size) + { + if (m_offset + Size > m_size) + return false; + std::memcpy(Out, m_data + m_offset, Size); + m_offset += Size; + return true; + } + std::size_t left() const { return m_size - m_offset; } + + private: + std::uint8_t const *m_data; + std::size_t m_size; + std::size_t m_offset{0}; +}; + +void encode_heights(std::vector const &Heights, std::vector &Out) +{ + if (Heights.empty()) + return; + auto const [low, high]{std::minmax_element(Heights.begin(), Heights.end())}; + auto const base{static_cast(std::floor(*low / height_step))}; + auto const top{static_cast(std::ceil(*high / height_step))}; + if (top - base > 0xffff || base < std::numeric_limits::min() || top > std::numeric_limits::max()) + { + // too high a range for the steps: kept as they are + put(Out, 1); + for (auto const height : Heights) + put(Out, height); + return; + } + put(Out, 0); + put(Out, static_cast(base)); + // differences of the neighbouring points are small and repeat a lot, which compresses well + std::uint16_t previous{0}; + for (auto const height : Heights) + { + auto const steps{static_cast(std::clamp(std::llround(height / height_step) - base, 0, 0xffff))}; + put(Out, static_cast(steps - previous)); + previous = steps; + } +} + +bool decode_heights(std::vector const &Data, std::size_t const Count, std::vector &Out) +{ + reader input{Data.data(), Data.size()}; + std::uint8_t encoding{0}; + if (false == input.get(encoding)) + return false; + Out.resize(Count); + if (encoding == 1) + { + if (input.left() != Count * sizeof(float)) + return false; + return input.get(Out.data(), Count * sizeof(float)); + } + if (encoding != 0) + return false; + std::int32_t base{0}; + if (false == input.get(base) || input.left() != Count * sizeof(std::uint16_t)) + return false; + std::uint16_t value{0}; + for (std::size_t i = 0; i < Count; ++i) + { + std::uint16_t delta{0}; + input.get(delta); + value = static_cast(value + delta); + Out[i] = static_cast((static_cast(base) + value) * height_step); + } + return true; +} + +std::uint32_t checksum(std::vector const &Data) +{ + return scene::terrain_file::checksum(reinterpret_cast(Data.data()), Data.size()); +} + +int floor_div(int const Value, int const Divisor) +{ + return (Value >= 0 ? Value / Divisor : -((-Value + Divisor - 1) / Divisor)); +} + +// the larger of two values, the corner between them rounded off over K +double soft_max(double const A, double const B, double const K) +{ + if (K <= 1e-6) + return std::max(A, B); + auto const h{std::max(K - std::abs(A - B), 0.0) / K}; + return std::max(A, B) + h * h * K * 0.25; +} + +} // namespace + +int cells_for(float const Spacing) +{ + return static_cast(std::lround(chunk_size / valid_spacing(Spacing))); +} + +float valid_spacing(float const Spacing) +{ + float best{default_spacing}; + float distance{std::numeric_limits::max()}; + for (auto const spacing : spacings) + if (std::abs(spacing - Spacing) < distance) + { + distance = std::abs(spacing - Spacing); + best = spacing; + } + return best; +} + +chunk_key chunk_at(double const X, double const Z) +{ + return {static_cast(std::floor(X / chunk_size)), static_cast(std::floor(Z / chunk_size))}; +} + +glm::dvec2 chunk_corner(chunk_key const &Key) +{ + return {Key.first * chunk_size, Key.second * chunk_size}; +} + +pack_key pack_of(chunk_key const &Key) +{ + return {floor_div(Key.first, pack_side), floor_div(Key.second, pack_side)}; +} + +glm::dvec2 pack_corner(pack_key const &Key) +{ + return {Key.first * pack_side * chunk_size, Key.second * pack_side * chunk_size}; +} + +std::string pack_file_name(pack_key const &Key) +{ + return std::to_string(Key.first) + "_" + std::to_string(Key.second) + ".tch"; +} + +// chunk_data + +std::size_t chunk_data::layer_count() const +{ + std::size_t count{0}; + while (count < layers.size() && layers[count] != no_layer) + ++count; + return count; +} + +bool chunk_data::contains(double const X, double const Z) const +{ + auto const low{corner()}; + return X >= low.x && X <= low.x + chunk_size && Z >= low.y && Z <= low.y + chunk_size; +} + +double chunk_data::height_at(double const X, double const Z) const +{ + return height_in(heights, X, Z); +} + +double chunk_data::height_in(std::vector const &Heights, double const X, double const Z) const +{ + if (cells <= 0 || Heights.size() != static_cast(side()) * side()) + return 0.0; + auto const low{corner()}; + auto const fx{(X - low.x) / spacing()}; + auto const fz{(Z - low.y) / spacing()}; + auto const ix{std::clamp(static_cast(std::floor(fx)), 0, cells - 1)}; + auto const iz{std::clamp(static_cast(std::floor(fz)), 0, cells - 1)}; + auto const tx{std::clamp(fx - ix, 0.0, 1.0)}; + auto const tz{std::clamp(fz - iz, 0.0, 1.0)}; + auto const at = [&](int const X_, int const Z_) { return static_cast(Heights[static_cast(Z_) * side() + X_]); }; + auto const h00{at(ix, iz)}, h10{at(ix + 1, iz)}, h01{at(ix, iz + 1)}, h11{at(ix + 1, iz + 1)}; + // the quads are cut along the diagonal from (x0, z1) to (x1, z0), as the mesh is made + if (tx + tz <= 1.0) + return h00 + tx * (h10 - h00) + tz * (h01 - h00); + return h11 + (1.0 - tx) * (h01 - h11) + (1.0 - tz) * (h10 - h11); +} + +std::shared_ptr chunk_data::make_flat(chunk_key const &Key, float const Spacing, float const Height) +{ + auto chunk{std::make_shared()}; + chunk->key = Key; + chunk->cells = cells_for(Spacing); + chunk->heights.assign(static_cast(chunk->side()) * chunk->side(), Height); + chunk->layers[0] = 0; + return chunk; +} + +std::shared_ptr chunk_data::resampled(float const Spacing) const +{ + auto chunk{std::make_shared(*this)}; + chunk->cells = cells_for(Spacing); + if (chunk->cells == cells) + return chunk; + auto const low{corner()}; + auto const step{chunk->spacing()}; + auto const resample = [&](std::vector const &Source, std::vector &Target) { + Target.resize(static_cast(chunk->side()) * chunk->side()); + for (int iz = 0; iz <= chunk->cells; ++iz) + for (int ix = 0; ix <= chunk->cells; ++ix) + Target[static_cast(iz) * chunk->side() + ix] = static_cast(height_in(Source, low.x + ix * step, low.y + iz * step)); + }; + resample(heights, chunk->heights); + if (false == base.empty()) + resample(base, chunk->base); + return chunk; +} + +std::uint8_t chunk_data::weight(std::size_t const Slot, int const Ix, int const Iz) const +{ + if (paint <= 0) + return Slot == 0 ? 255 : 0; + auto const samples{static_cast(paint + 1) * (paint + 1)}; + auto const index{Slot * samples + static_cast(Iz) * (paint + 1) + Ix}; + return index < weights.size() ? weights[index] : 0; +} + +int chunk_data::slot_of(std::uint16_t const Layer) const +{ + for (std::size_t slot = 0; slot < layers.size(); ++slot) + if (layers[slot] == Layer) + return static_cast(slot); + return -1; +} + +std::size_t chunk_data::dominant_slot() const +{ + auto const count{layer_count()}; + if (paint <= 0 || count < 2) + return 0; + auto const samples{static_cast(paint + 1) * (paint + 1)}; + std::size_t best{0}; + std::uint64_t bestsum{0}; + for (std::size_t slot = 0; slot < count; ++slot) + { + std::uint64_t sum{0}; + for (std::size_t i = 0; i < samples && slot * samples + i < weights.size(); ++i) + sum += weights[slot * samples + i]; + if (sum > bestsum) + { + bestsum = sum; + best = slot; + } + } + return best; +} + +void chunk_data::ensure_paint(int const Samples) +{ + if (paint > 0) + return; + if (layers[0] == no_layer) + layers[0] = 0; + paint = std::max(1, Samples); + auto const samples{static_cast(paint + 1) * (paint + 1)}; + weights.assign(samples * layer_count(), 0); + std::fill(weights.begin(), weights.begin() + samples, 255); +} + +void chunk_data::compact_layers() +{ + if (paint <= 0) + return; + auto const samples{static_cast(paint + 1) * (paint + 1)}; + auto const count{layer_count()}; + std::vector kept; + std::array keptlayers; + keptlayers.fill(no_layer); + std::size_t used{0}; + for (std::size_t slot = 0; slot < count; ++slot) + { + auto const begin{weights.begin() + slot * samples}; + if (std::all_of(begin, begin + samples, [](std::uint8_t const Weight) { return Weight == 0; })) + continue; + kept.insert(kept.end(), begin, begin + samples); + keptlayers[used++] = layers[slot]; + } + if (used == 0) + { + // nothing painted at all; shouldn't happen, but the chunk can't be left without a material + keptlayers[0] = layers[0] == no_layer ? 0 : layers[0]; + used = 1; + kept.clear(); + } + layers = keptlayers; + if (used == 1) + { + paint = 0; + weights.clear(); + return; + } + weights = std::move(kept); +} + +// modifiers + +std::pair modifier::bounds() const +{ + glm::dvec2 low{std::numeric_limits::max()}, high{-std::numeric_limits::max()}; + double widest{0.0}; + for (auto const &point : points) + { + low = glm::min(low, point.position); + high = glm::max(high, point.position); + widest = std::max(widest, point.half_width); + } + if (points.empty()) + return {glm::dvec2{0.0}, glm::dvec2{0.0}}; + auto const margin{widest + reach}; + return {low - glm::dvec2{margin}, high + glm::dvec2{margin}}; +} + +namespace +{ +std::uint64_t grid_key(int const X, int const Z) +{ + return (static_cast(static_cast(X)) << 32) | static_cast(Z); +} +} // namespace + +modifier_shape::modifier_shape(modifier const &Modifier) : m_modifier(Modifier) +{ + for (auto const &point : Modifier.points) + m_widest = std::max(m_widest, point.half_width); + auto const bounds{Modifier.bounds()}; + m_min = bounds.first; + m_max = bounds.second; + auto const &points{Modifier.points}; + for (std::size_t i = 0; i + 1 < points.size(); ++i) + { + auto const &a{points[i].position}; + auto const &b{points[i + 1].position}; + auto const x0{static_cast(std::floor(std::min(a.x, b.x) / m_cell))}, x1{static_cast(std::floor(std::max(a.x, b.x) / m_cell))}; + auto const z0{static_cast(std::floor(std::min(a.y, b.y) / m_cell))}, z1{static_cast(std::floor(std::max(a.y, b.y) / m_cell))}; + for (auto x = x0; x <= x1; ++x) + for (auto z = z0; z <= z1; ++z) + m_grid.emplace_back(grid_key(x, z), static_cast(i)); + } + std::sort(m_grid.begin(), m_grid.end()); +} + +bool modifier_shape::reaches(glm::dvec2 const &Min, glm::dvec2 const &Max) const +{ + return false == m_grid.empty() && Max.x >= m_min.x && Min.x <= m_max.x && Max.y >= m_min.y && Min.y <= m_max.y; +} + +bool modifier_shape::apply(double const X, double const Z, float &Height) const +{ + if (m_grid.empty() || X < m_min.x || X > m_max.x || Z < m_min.y || Z > m_max.y) + return false; + auto const &points{m_modifier.points}; + auto const reach{m_widest + m_modifier.reach}; + auto distance{reach}; + double formation{0.0}, halfwidth{0.0}; + bool found{false}; + auto const x0{static_cast(std::floor((X - reach) / m_cell))}, x1{static_cast(std::floor((X + reach) / m_cell))}; + auto const z0{static_cast(std::floor((Z - reach) / m_cell))}, z1{static_cast(std::floor((Z + reach) / m_cell))}; + glm::dvec2 const point{X, Z}; + for (auto x = x0; x <= x1; ++x) + for (auto z = z0; z <= z1; ++z) + { + auto const key{grid_key(x, z)}; + auto it{std::lower_bound(m_grid.begin(), m_grid.end(), std::make_pair(key, std::uint32_t{0}))}; + for (; it != m_grid.end() && it->first == key; ++it) + { + auto const i{it->second}; + auto const &a{points[i].position}; + auto const &b{points[i + 1].position}; + auto const run{b - a}; + auto const length{glm::dot(run, run)}; + auto const t{length > 1e-12 ? std::clamp(glm::dot(point - a, run) / length, 0.0, 1.0) : 0.0}; + auto const offset{glm::length(point - (a + run * t))}; + if (offset < distance) + { + distance = offset; + formation = points[i].formation + (points[i + 1].formation - points[i].formation) * t; + halfwidth = points[i].half_width + (points[i + 1].half_width - points[i].half_width) * t; + found = true; + } + } + } + if (false == found) + return false; + // the formation under the axis, slopes from its edges down or up to the ground, the bends rounded off + auto const slope{std::max(0.1, m_modifier.slope)}; + auto const rounding{std::max(0.0, m_modifier.rounding)}; + auto const ground{static_cast(Height)}; + auto const beyond{soft_max(0.0, distance - halfwidth, rounding)}; + auto const bend{rounding / slope}; + auto const target{ground > formation ? -soft_max(-ground, -(formation + beyond / slope), bend) : soft_max(ground, formation - beyond / slope, bend)}; + if (std::abs(target - ground) < 0.001) + return false; + Height = static_cast(target); + return true; +} + +// manifest + +bool load_manifest(std::string const &Path, manifest &Manifest, std::string *Error) +{ + try + { + auto const document{YAML::LoadFile(Path)}; + manifest result; + result.layers.clear(); + if (auto const node{document["version"]}) + result.version = node.as(); + if (auto const node{document["compress"]}) + result.compress = node.as(); + if (auto const node{document["spacing"]}) + result.spacing = valid_spacing(node.as()); + if (auto const node{document["water_material"]}) + result.water_material = node.as(); + if (auto const node{document["layers"]}; node && node.IsSequence()) + for (auto const &layer : node) + { + // a material name, or a map with the material and the size its textures repeat at + if (layer.IsMap()) + { + layer_def entry; + if (auto const material{layer["material"]}) + entry.material = material.as(); + if (auto const size{layer["size"]}) + entry.size = std::max(0.f, size.as()); + if (false == entry.material.empty()) + result.layers.push_back(entry); + } + else + result.layers.push_back({layer.as(), 0.f}); + } + if (result.layers.empty()) + result.layers.push_back({"grass", 0.f}); + if (auto const node{document["water"]}; node && node.IsSequence()) + for (auto const &entry : node) + { + water_body water; + if (auto const name{entry["name"]}) + water.name = name.as(); + if (auto const level{entry["level"]}) + water.level = level.as(); + if (auto const material{entry["material"]}) + water.material = material.as(); + if (auto const outline{entry["outline"]}; outline && outline.IsSequence()) + for (auto const &point : outline) + if (point.IsSequence() && point.size() >= 2) + water.outline.emplace_back(point[0].as(), point[1].as()); + if (water.outline.size() >= 3) + result.water.push_back(std::move(water)); + } + if (auto const node{document["modifiers"]}; node && node.IsSequence()) + for (auto const &entry : node) + { + modifier item; + if (auto const name{entry["name"]}) + item.name = name.as(); + if (auto const slope{entry["slope"]}) + item.slope = slope.as(); + if (auto const reach{entry["reach"]}) + item.reach = reach.as(); + if (auto const rounding{entry["rounding"]}) + item.rounding = rounding.as(); + if (auto const points{entry["points"]}; points && points.IsSequence()) + for (auto const &point : points) + if (point.IsSequence() && point.size() >= 4) + item.points.push_back({{point[0].as(), point[1].as()}, point[2].as(), point[3].as()}); + if (item.points.size() >= 2) + result.modifiers.push_back(std::move(item)); + } + Manifest = std::move(result); + return true; + } + catch (YAML::Exception const &exception) + { + if (Error != nullptr) + *Error = exception.what(); + return false; + } +} + +bool save_manifest(std::string const &Path, manifest const &Manifest, std::string *Error) +{ + YAML::Emitter out; + out.SetDoublePrecision(12); + out.SetFloatPrecision(7); + out << YAML::Comment("MaSzyna heightmap terrain; the chunks are in the .tch files next to this one"); + out << YAML::BeginMap; + out << YAML::Key << "version" << YAML::Value << Manifest.version; + out << YAML::Key << "compress" << YAML::Value << Manifest.compress; + out << YAML::Key << "spacing" << YAML::Value << Manifest.spacing; + out << YAML::Key << "water_material" << YAML::Value << Manifest.water_material; + out << YAML::Key << "layers" << YAML::Value << YAML::BeginSeq; + for (auto const &layer : Manifest.layers) + { + if (layer.size > 0.f) + out << YAML::Flow << YAML::BeginMap << YAML::Key << "material" << YAML::Value << layer.material << YAML::Key << "size" << YAML::Value << layer.size << YAML::EndMap; + else + out << layer.material; + } + out << YAML::EndSeq; + if (false == Manifest.water.empty()) + { + out << YAML::Key << "water" << YAML::Value << YAML::BeginSeq; + for (auto const &water : Manifest.water) + { + out << YAML::BeginMap; + out << YAML::Key << "name" << YAML::Value << water.name; + out << YAML::Key << "level" << YAML::Value << water.level; + if (false == water.material.empty()) + out << YAML::Key << "material" << YAML::Value << water.material; + out << YAML::Key << "outline" << YAML::Value << YAML::BeginSeq; + for (auto const &point : water.outline) + out << YAML::Flow << YAML::BeginSeq << point.x << point.y << YAML::EndSeq; + out << YAML::EndSeq; + out << YAML::EndMap; + } + out << YAML::EndSeq; + } + if (false == Manifest.modifiers.empty()) + { + out << YAML::Key << "modifiers" << YAML::Value << YAML::BeginSeq; + for (auto const &item : Manifest.modifiers) + { + out << YAML::BeginMap; + out << YAML::Key << "name" << YAML::Value << item.name; + out << YAML::Key << "slope" << YAML::Value << item.slope; + out << YAML::Key << "reach" << YAML::Value << item.reach; + out << YAML::Key << "rounding" << YAML::Value << item.rounding; + out << YAML::Key << "points" << YAML::Value << YAML::BeginSeq; + for (auto const &point : item.points) + out << YAML::Flow << YAML::BeginSeq << point.position.x << point.position.y << point.formation << point.half_width << YAML::EndSeq; + out << YAML::EndSeq; + out << YAML::EndMap; + } + out << YAML::EndSeq; + } + out << YAML::EndMap; + if (false == out.good()) + { + if (Error != nullptr) + *Error = out.GetLastError(); + return false; + } + std::error_code ec; + std::filesystem::create_directories(std::filesystem::path(Path).parent_path(), ec); + std::ofstream file{Path, std::ios::binary | std::ios::trunc}; + file << out.c_str() << '\n'; + if (false == file.good()) + { + if (Error != nullptr) + *Error = "can't write " + Path; + return false; + } + return true; +} + +// pack files + +bool pack_file::open(std::string const &Path, std::string *Error) +{ + auto const fail = [&](std::string const &Message) { + if (Error != nullptr) + *Error = Path + ": " + Message; + return false; + }; + m_path = Path; + for (auto &slices : m_slices) + slices.clear(); + std::ifstream file{Path, std::ios::binary}; + if (false == file.good()) + return fail("can't open the file"); + std::vector header(header_size); + file.read(reinterpret_cast(header.data()), header.size()); + if (file.gcount() != static_cast(header.size())) + return fail("the file is too short"); + reader input{header.data(), header.size()}; + std::uint32_t magic{0}, version{0}, side{0}; + std::int32_t px{0}, pz{0}; + float size{0.f}; + std::uint64_t indexoffset{0}; + input.get(magic); + input.get(version); + input.get(px); + input.get(pz); + input.get(side); + input.get(size); + input.get(indexoffset); + if (magic != pack_magic) + return fail("not a terrain chunks file"); + if (version != pack_version) + return fail("unsupported version " + std::to_string(version)); + if (side != pack_side || std::abs(size - chunk_size) > 1e-3) + return fail("unsupported chunk layout"); + m_key = {px, pz}; + + std::vector index(pack_side * pack_side * index_entry_size); + file.seekg(static_cast(indexoffset)); + file.read(reinterpret_cast(index.data()), index.size()); + if (file.gcount() != static_cast(index.size())) + return fail("damaged chunk index"); + reader entries{index.data(), index.size()}; + for (auto &slices : m_slices) + { + std::uint64_t tableoffset{0}; + std::uint32_t count{0}, reserved{0}; + entries.get(tableoffset); + entries.get(count); + entries.get(reserved); + if (tableoffset == 0 || count == 0) + continue; + if (count > 64) + return fail("damaged chunk index"); + std::vector table(count * slice_entry_size); + file.seekg(static_cast(tableoffset)); + file.read(reinterpret_cast(table.data()), table.size()); + if (file.gcount() != static_cast(table.size())) + return fail("damaged slice table"); + reader tableinput{table.data(), table.size()}; + slices.resize(count); + for (auto &slice : slices) + { + std::uint32_t reserved2{0}; + tableinput.get(slice.tag); + tableinput.get(slice.codec); + tableinput.get(slice.offset); + tableinput.get(slice.stored); + tableinput.get(slice.size); + tableinput.get(slice.crc); + tableinput.get(reserved2); + if (slice.stored > max_slice_size || slice.size > max_slice_size) + return fail("damaged slice table"); + } + } + return true; +} + +bool pack_file::has(chunk_key const &Key) const +{ + if (pack_of(Key) != m_key) + return false; + auto const x{Key.first - m_key.first * pack_side}; + auto const z{Key.second - m_key.second * pack_side}; + return false == m_slices[static_cast(z) * pack_side + x].empty(); +} + +std::vector pack_file::chunks() const +{ + std::vector result; + for (int z = 0; z < pack_side; ++z) + for (int x = 0; x < pack_side; ++x) + if (false == m_slices[static_cast(z) * pack_side + x].empty()) + result.emplace_back(m_key.first * pack_side + x, m_key.second * pack_side + z); + return result; +} + +std::shared_ptr pack_file::read(chunk_key const &Key, std::string *Error) const +{ + auto const fail = [&](std::string const &Message) -> std::shared_ptr { + if (Error != nullptr) + *Error = m_path + ": chunk " + std::to_string(Key.first) + "," + std::to_string(Key.second) + ": " + Message; + return nullptr; + }; + if (false == has(Key)) + return fail("not in the file"); + auto const &slices{m_slices[static_cast(Key.second - m_key.second * pack_side) * pack_side + (Key.first - m_key.first * pack_side)]}; + std::ifstream file{m_path, std::ios::binary}; + if (false == file.good()) + return fail("can't open the file"); + + auto const load = [&](slice const &Slice, std::vector &Out) { + std::vector stored(Slice.stored); + file.seekg(static_cast(Slice.offset)); + file.read(reinterpret_cast(stored.data()), stored.size()); + if (file.gcount() != static_cast(stored.size())) + return false; + if (Slice.codec == codec_stored) + Out = std::move(stored); + else if (Slice.codec == codec_zstd) + { + Out.resize(Slice.size); + auto const result{ZSTD_decompress(Out.data(), Out.size(), stored.data(), stored.size())}; + if (ZSTD_isError(result) || result != Slice.size) + return false; + } + else + return false; + return Out.size() == Slice.size && checksum(Out) == Slice.crc; + }; + + auto chunk{std::make_shared()}; + chunk->key = Key; + slice const *heights{nullptr}, *base{nullptr}, *paint{nullptr}; + bool header{false}; + for (auto const &slice : slices) + { + if (slice.tag == tag_chunk) + { + std::vector data; + if (false == load(slice, data)) + return fail("damaged chunk header"); + reader input{data.data(), data.size()}; + std::uint16_t cells{0}, samples{0}; + input.get(cells); + input.get(samples); + for (auto &layer : chunk->layers) + input.get(layer); + chunk->cells = cells; + chunk->paint = samples; + header = true; + } + else if (slice.tag == tag_heights) + heights = &slice; + else if (slice.tag == tag_base) + base = &slice; + else if (slice.tag == tag_paint) + paint = &slice; + // slices of unknown kinds are left for newer versions of the simulator + } + if (false == header || heights == nullptr || chunk->cells <= 0 || chunk->cells > 4096) + return fail("incomplete chunk"); + if (chunk->layers[0] == no_layer) + chunk->layers[0] = 0; + auto const count{static_cast(chunk->side()) * chunk->side()}; + std::vector data; + if (false == load(*heights, data) || false == decode_heights(data, count, chunk->heights)) + return fail("damaged heights"); + if (base != nullptr && (false == load(*base, data) || false == decode_heights(data, count, chunk->base))) + return fail("damaged base heights"); + if (chunk->paint > 0) + { + auto const expected{static_cast(chunk->paint + 1) * (chunk->paint + 1) * chunk->layer_count()}; + if (paint == nullptr || false == load(*paint, chunk->weights) || chunk->weights.size() != expected) + return fail("damaged paint"); + } + return chunk; +} + +bool write_pack(std::string const &Path, pack_key const &Key, std::vector const &Chunks, bool const Compress, std::string *Error) +{ + struct slice_record + { + std::uint32_t tag; + std::uint32_t codec; + std::uint64_t offset; + std::uint32_t stored; + std::uint32_t size; + std::uint32_t crc; + }; + std::array, pack_side * pack_side> tables; + std::vector payload; // slice data, placed after the header + + auto const add = [&](std::vector &Table, std::uint32_t const Tag, std::vector const &Data) { + slice_record record{Tag, codec_stored, header_size + payload.size(), static_cast(Data.size()), static_cast(Data.size()), checksum(Data)}; + if (Compress && Data.size() > 64) + { + std::vector packed(ZSTD_compressBound(Data.size())); + auto const result{ZSTD_compress(packed.data(), packed.size(), Data.data(), Data.size(), zstd_level)}; + if (false == ZSTD_isError(result) && result < Data.size()) + { + packed.resize(result); + record.codec = codec_zstd; + record.stored = static_cast(packed.size()); + payload.insert(payload.end(), packed.begin(), packed.end()); + Table.push_back(record); + return; + } + } + payload.insert(payload.end(), Data.begin(), Data.end()); + Table.push_back(record); + }; + + for (auto const &chunk : Chunks) + { + if (chunk == nullptr || false == chunk->valid() || pack_of(chunk->key) != Key) + continue; + auto &table{tables[static_cast(chunk->key.second - Key.second * pack_side) * pack_side + (chunk->key.first - Key.first * pack_side)]}; + table.clear(); + std::vector data; + put(data, static_cast(chunk->cells)); + put(data, static_cast(chunk->layer_count() > 1 ? chunk->paint : 0)); + for (auto const layer : chunk->layers) + put(data, layer); + add(table, tag_chunk, data); + data.clear(); + encode_heights(chunk->heights, data); + add(table, tag_heights, data); + if (chunk->base.size() == chunk->heights.size()) + { + data.clear(); + encode_heights(chunk->base, data); + add(table, tag_base, data); + } + if (chunk->paint > 0 && chunk->layer_count() > 1) + add(table, tag_paint, chunk->weights); + } + + std::vector file; + file.reserve(header_size + payload.size() + 4096); + put(file, pack_magic); + put(file, pack_version); + put(file, Key.first); + put(file, Key.second); + put(file, pack_side); + put(file, static_cast(chunk_size)); + auto const indexfield{file.size()}; + put(file, 0); + file.resize(header_size, 0); + file.insert(file.end(), payload.begin(), payload.end()); + // slice tables + std::array tableoffsets{}; + for (std::size_t i = 0; i < tables.size(); ++i) + { + if (tables[i].empty()) + continue; + tableoffsets[i] = file.size(); + for (auto const &record : tables[i]) + { + put(file, record.tag); + put(file, record.codec); + put(file, record.offset); + put(file, record.stored); + put(file, record.size); + put(file, record.crc); + put(file, 0); + } + } + // chunk index + put_at(file, indexfield, file.size()); + for (std::size_t i = 0; i < tables.size(); ++i) + { + put(file, tableoffsets[i]); + put(file, static_cast(tables[i].size())); + put(file, 0); + } + + // written next to the old file first, so a failed write doesn't take the old content with it + std::error_code ec; + std::filesystem::create_directories(std::filesystem::path(Path).parent_path(), ec); + auto const temporary{Path + ".tmp"}; + { + std::ofstream out{temporary, std::ios::binary | std::ios::trunc}; + out.write(reinterpret_cast(file.data()), file.size()); + if (false == out.good()) + { + if (Error != nullptr) + *Error = "can't write " + temporary; + return false; + } + } + std::filesystem::rename(temporary, Path, ec); + if (ec) + { + // some systems won't replace an existing file with rename + std::filesystem::remove(Path, ec); + std::filesystem::rename(temporary, Path, ec); + if (ec) + { + if (Error != nullptr) + *Error = "can't replace " + Path + ": " + ec.message(); + return false; + } + } + return true; +} + +std::vector triangulate(std::vector const &Outline) +{ + std::vector result; + auto const count{Outline.size()}; + if (count < 3) + return result; + // ear clipping, the outline turned counterclockwise first + double area{0.0}; + for (std::size_t i = 0; i < count; ++i) + { + auto const &a{Outline[i]}; + auto const &b{Outline[(i + 1) % count]}; + area += a.x * b.y - b.x * a.y; + } + std::vector ring(count); + for (std::size_t i = 0; i < count; ++i) + ring[i] = static_cast(area >= 0.0 ? i : count - 1 - i); + auto const cross = [](glm::dvec2 const &O, glm::dvec2 const &A, glm::dvec2 const &B) { return (A.x - O.x) * (B.y - O.y) - (A.y - O.y) * (B.x - O.x); }; + auto const inside = [&](glm::dvec2 const &P, glm::dvec2 const &A, glm::dvec2 const &B, glm::dvec2 const &C) { + return cross(A, B, P) >= 0.0 && cross(B, C, P) >= 0.0 && cross(C, A, P) >= 0.0; + }; + std::size_t guard{0}; + while (ring.size() > 3 && guard < count * count) + { + ++guard; + bool clipped{false}; + for (std::size_t i = 0; i < ring.size(); ++i) + { + auto const prev{ring[(i + ring.size() - 1) % ring.size()]}; + auto const curr{ring[i]}; + auto const next{ring[(i + 1) % ring.size()]}; + auto const &a{Outline[prev]}; + auto const &b{Outline[curr]}; + auto const &c{Outline[next]}; + if (cross(a, b, c) <= 1e-12) + continue; // reflex or degenerate corner + bool ear{true}; + for (auto const other : ring) + { + if (other == prev || other == curr || other == next) + continue; + if (inside(Outline[other], a, b, c)) + { + ear = false; + break; + } + } + if (false == ear) + continue; + result.insert(result.end(), {prev, curr, next}); + ring.erase(ring.begin() + i); + clipped = true; + break; + } + if (false == clipped) + break; // a self-crossing outline; what's left goes as a fan + } + for (std::size_t i = 1; i + 1 < ring.size(); ++i) + result.insert(result.end(), {ring[0], ring[i], ring[i + 1]}); + return result; +} + +// meshes + +int max_stride(int const Cells) +{ + int stride{1}; + while (stride * 4 <= Cells) + stride *= 2; + return stride; +} + +namespace +{ +int segments(int const Cells, int const Stride) +{ + return (Cells + Stride - 1) / Stride; +} +} // namespace + +std::size_t mesh_vertex_count(int const Cells, int const Stride) +{ + auto const n{static_cast(segments(Cells, Stride))}; + return (n + 1) * (n + 1) + 4 * (n + 1); +} + +void build_indices(int const Cells, int const Stride, gfx::index_array &Out) +{ + auto const n{static_cast(segments(Cells, Stride))}; + auto const row{n + 1}; + auto const grid{row * row}; + Out.clear(); + Out.reserve(static_cast(n) * n * 6 + static_cast(n) * 24); + auto const at = [&](gfx::basic_index const I, gfx::basic_index const J) { return J * row + I; }; + for (gfx::basic_index j = 0; j < n; ++j) + for (gfx::basic_index i = 0; i < n; ++i) + { + auto const v00{at(i, j)}, v10{at(i + 1, j)}, v01{at(i, j + 1)}, v11{at(i + 1, j + 1)}; + Out.insert(Out.end(), {v00, v01, v10, v11, v10, v01}); + } + // skirts: south (low z) and east face the way the edge is walked turns them, north and west are turned around + auto const skirt = [&](gfx::basic_index const Skirt, auto const &Edge, bool const Flip) { + for (gfx::basic_index k = 0; k < n; ++k) + { + auto const a{Edge(k)}, b{Edge(k + 1)}, la{Skirt + k}, lb{Skirt + k + 1}; + if (Flip) + Out.insert(Out.end(), {la, b, a, la, lb, b}); + else + Out.insert(Out.end(), {a, b, la, b, lb, la}); + } + }; + skirt(grid, [&](gfx::basic_index const K) { return at(K, 0); }, false); + skirt(grid + row, [&](gfx::basic_index const K) { return at(K, n); }, true); + skirt(grid + 2 * row, [&](gfx::basic_index const K) { return at(0, K); }, true); + skirt(grid + 3 * row, [&](gfx::basic_index const K) { return at(n, K); }, false); +} + +void build_mesh(chunk_data const &Chunk, int const Stride, glm::dvec3 const &Origin, height_source const &Outside, mesh &Out) +{ + auto const cells{Chunk.cells}; + auto const stride{std::clamp(Stride, 1, max_stride(cells))}; + auto const n{segments(cells, stride)}; + auto const spacing{Chunk.spacing()}; + auto const low{Chunk.corner()}; + auto const texturebase{pack_corner(pack_of(Chunk.key))}; + auto const coordinate = [&](int const I) { return std::min(I * stride, cells); }; + + // heights of the grid points, the neighbouring chunks asked about the points past the edges + auto const sample = [&](int const Ix, int const Iz) -> double { + if (Ix >= 0 && Ix <= cells && Iz >= 0 && Iz <= cells) + return Chunk.height(Ix, Iz); + double height; + if (Outside && Outside(low.x + Ix * spacing, low.y + Iz * spacing, height)) + return height; + return Chunk.height(std::clamp(Ix, 0, cells), std::clamp(Iz, 0, cells)); + }; + // normals from the differences over the stride, so the distant, coarse grid is lit as it's drawn + auto const normal = [&](int const Ix, int const Iz) { + auto const dx{(sample(Ix + stride, Iz) - sample(Ix - stride, Iz)) / (2.0 * stride * spacing)}; + auto const dz{(sample(Ix, Iz + stride) - sample(Ix, Iz - stride)) / (2.0 * stride * spacing)}; + return glm::normalize(glm::vec3(static_cast(-dx), 1.f, static_cast(-dz))); + }; + + // the skirt has to reach below the edge of a neighbour drawn with a coarser grid + double deviation{0.0}; + { + auto const coarse{std::min(stride * 4, cells)}; + auto const edge = [&](auto const &Height) { + for (int start = 0; start < cells; start += coarse) + { + auto const end{std::min(start + coarse, cells)}; + auto const a{Height(start)}, b{Height(end)}; + for (int k = start + 1; k < end; ++k) + deviation = std::max(deviation, std::abs(Height(k) - (a + (b - a) * (k - start) / double(end - start)))); + } + }; + edge([&](int const K) { return static_cast(Chunk.height(K, 0)); }); + edge([&](int const K) { return static_cast(Chunk.height(K, cells)); }); + edge([&](int const K) { return static_cast(Chunk.height(0, K)); }); + edge([&](int const K) { return static_cast(Chunk.height(cells, K)); }); + } + auto const skirtdepth{static_cast(0.5 + 2.0 * deviation + 0.05 * stride * spacing)}; + + Out.vertices.clear(); + Out.vertices.reserve(mesh_vertex_count(cells, stride)); + glm::dvec3 lowest{std::numeric_limits::max()}, highest{-std::numeric_limits::max()}; + auto const vertex = [&](int const Ix, int const Iz, float const Drop) { + gfx::basic_vertex v; + glm::dvec3 const world{low.x + Ix * spacing, Chunk.height(Ix, Iz), low.y + Iz * spacing}; + lowest = glm::min(lowest, world); + highest = glm::max(highest, world); + v.position = glm::vec3(world - Origin); + v.position.y -= Drop; + v.normal = normal(Ix, Iz); + // texture coordinates in metres from the corner of the pack: small enough for floats, and seamless for any + // texture repeating a whole number of times over the pack. v runs along -z, the way the tangent space expects it + v.texture = glm::vec2(static_cast(world.x - texturebase.x), static_cast(texturebase.y - world.z)); + auto const tangent{glm::vec3(1.f, 0.f, 0.f) - v.normal * v.normal.x}; + v.tangent = glm::vec4(glm::length(tangent) > 1e-6f ? glm::normalize(tangent) : glm::vec3(1.f, 0.f, 0.f), 1.f); + Out.vertices.push_back(v); + }; + for (int j = 0; j <= n; ++j) + for (int i = 0; i <= n; ++i) + vertex(coordinate(i), coordinate(j), 0.f); + for (int k = 0; k <= n; ++k) + vertex(coordinate(k), 0, skirtdepth); + for (int k = 0; k <= n; ++k) + vertex(coordinate(k), cells, skirtdepth); + for (int k = 0; k <= n; ++k) + vertex(0, coordinate(k), skirtdepth); + for (int k = 0; k <= n; ++k) + vertex(cells, coordinate(k), skirtdepth); + + build_indices(cells, stride, Out.indices); + Out.centre = (lowest + highest) * 0.5; + Out.radius = static_cast(glm::length(highest - lowest) * 0.5 + skirtdepth); + Out.low = lowest - glm::dvec3{0.0, skirtdepth, 0.0}; + Out.high = highest; +} + +} // namespace heightmap diff --git a/scene/heightmapterrain.h b/scene/heightmapterrain.h new file mode 100644 index 000000000..cc938b3aa --- /dev/null +++ b/scene/heightmapterrain.h @@ -0,0 +1,241 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "rendering/geometrybank.h" + +// heightmap terrain: the ground of a scenery as a grid of square chunks of heights, kept in the folder +// terrain// of the simulator: a description of the terrain (terrain.yaml) and pack files (.tch, terrain chunks) +// holding 16 x 16 chunks each. the chunks are loaded around the camera as they're needed. +// +// a chunk has its own point spacing (0.5, 1, 2 or 5 m), heights of its grid points including the points of its edges +// (shared with the neighbouring chunk), and weights of the materials painted over it, up to 8 of them per chunk. +namespace heightmap +{ + +double constexpr chunk_size{250.0}; // metres, side of a chunk; whole cells of every allowed spacing, and of the scene +int constexpr pack_side{16}; // chunks along the side of a pack file +double constexpr height_step{0.005}; // metres, quantum of the stored heights +std::size_t constexpr max_chunk_layers{8}; // materials painted over a single chunk +std::uint16_t constexpr no_layer{0xffff}; +int constexpr default_paint_samples{250}; // paint samples along the side of a chunk, less one: a sample per metre + +// point spacings a chunk can have, finest first +std::array constexpr spacings{0.5f, 1.f, 2.f, 5.f}; +float constexpr default_spacing{2.f}; +// cells along the side of a chunk with specified point spacing +int cells_for(float const Spacing); +// the allowed spacing closest to specified one +float valid_spacing(float const Spacing); + +using chunk_key = std::pair; +using pack_key = std::pair; + +// chunk covering specified point +chunk_key chunk_at(double const X, double const Z); +// corner of the chunk with the lowest coordinates +glm::dvec2 chunk_corner(chunk_key const &Key); +// pack holding specified chunk +pack_key pack_of(chunk_key const &Key); +// corner of the pack with the lowest coordinates; texture coordinates of the terrain start over at it +glm::dvec2 pack_corner(pack_key const &Key); +// name of the file of specified pack +std::string pack_file_name(pack_key const &Key); + +struct chunk_data +{ + chunk_key key{0, 0}; + int cells{0}; // quads along a side; (cells + 1)^2 grid points + std::vector heights; // world y of the grid points, rows of growing z, from the lowest x + std::vector base; // the heights before the modifiers were applied; empty where no modifier reaches the chunk + int paint{0}; // paint samples along a side, less one. 0: the chunk is covered with its first layer alone + std::array layers; // indices of the materials in the terrain palette, no_layer for unused + std::vector weights; // planar, (paint + 1)^2 per used layer, rows like the heights; weights of a sample add up to 255 + + chunk_data() { layers.fill(no_layer); } + + int side() const { return cells + 1; } + double spacing() const { return chunk_size / cells; } + glm::dvec2 corner() const { return chunk_corner(key); } + bool valid() const { return cells > 0 && heights.size() == static_cast(side()) * side(); } + // number of layers in use, the used ones come first + std::size_t layer_count() const; + float height(int const Ix, int const Iz) const { return heights[static_cast(Iz) * side() + Ix]; } + // height of the surface at specified world point, the way the full grid is triangulated; points outside are clamped to the chunk + double height_at(double const X, double const Z) const; + // as above, from provided heights of the grid points of the chunk + double height_in(std::vector const &Heights, double const X, double const Z) const; + bool contains(double const X, double const Z) const; + // a flat chunk of specified spacing at specified height, covered with the first material of the palette + static std::shared_ptr make_flat(chunk_key const &Key, float const Spacing, float const Height); + // the same chunk with the grid of another spacing, heights and paint taken over + std::shared_ptr resampled(float const Spacing) const; + // weight of specified layer slot at paint sample (Ix, Iz) + std::uint8_t weight(std::size_t const Slot, int const Ix, int const Iz) const; + // layer slot of specified palette index, or -1 + int slot_of(std::uint16_t const Layer) const; + // layer slot of the material covering the most of the chunk + std::size_t dominant_slot() const; + // gives the chunk paint samples (with its first layer as the only one painted) if it has none yet + void ensure_paint(int const Samples = default_paint_samples); + // drops the layers left without weight anywhere, and the paint samples altogether when a single layer is left + void compact_layers(); +}; + +using chunk_ptr = std::shared_ptr; + +// body of water: a level surface within an outline +struct water_body +{ + std::string name; + double level{0.0}; + std::string material; // empty: the default water material + std::vector outline; // x, z +}; + +// modifier of the terrain: a corridor along a line (axis of a track or a road) with a formation of specified +// height and width, and slopes from its edges to the ground +struct corridor_point +{ + glm::dvec2 position{0.0}; // x, z + double formation{0.0}; // height of the formation + double half_width{3.5}; // from the axis to the edge of the formation +}; + +struct modifier +{ + std::string name; + double slope{1.5}; // horizontal run of the slopes per metre of height + double reach{60.0}; // from the edge of the formation, where the slopes end even if they don't get to the ground + double rounding{1.5}; // over which the slopes bend into the formation and into the ground + std::vector points; + + // rectangle (x, z) the modifier can change the ground in + std::pair bounds() const; +}; + +// modifier prepared for many questions +class modifier_shape +{ + public: + explicit modifier_shape(modifier const &Modifier); + // leads Height at specified point the way the modifier does; returns: true if the height changed + bool apply(double const X, double const Z, float &Height) const; + bool reaches(glm::dvec2 const &Min, glm::dvec2 const &Max) const; + + private: + modifier const &m_modifier; + double m_widest{0.0}; + glm::dvec2 m_min{0.0}, m_max{0.0}; + double m_cell{16.0}; + std::vector> m_grid; // (cell key, segment), sorted +}; + +// material of the palette, and the size (metres) its textures repeat at; 0: the size given by the material, or 8 m +struct layer_def +{ + std::string material; + float size{0.f}; +}; + +// description of the terrain, terrain.yaml +struct manifest +{ + int version{1}; + std::vector layers{{"grass", 0.f}}; // the palette of materials, the first covers new chunks + std::string water_material{"water"}; // of the bodies of water which don't name their own + bool compress{true}; // pack files store their data compressed with zstd + float spacing{default_spacing}; // point spacing of new chunks + std::vector water; + std::vector modifiers; +}; + +bool load_manifest(std::string const &Path, manifest &Manifest, std::string *Error = nullptr); +bool save_manifest(std::string const &Path, manifest const &Manifest, std::string *Error = nullptr); + +// pack file (.tch), little endian: +// +// header, 64 bytes: 'TCH1', uint32 version, int32 pack x, int32 pack z, uint32 chunks along a side, float chunk size, +// uint64 offset of the chunk index, reserved +// chunk index: per chunk (rows of growing z): uint64 offset of its slice table (0: no chunk), uint32 slice count, uint32 reserved +// slice tables: per slice: uint32 tag, uint32 codec (0: stored, 1: zstd), uint64 offset, uint32 stored size, uint32 size, +// uint32 crc-32 of the data, uint32 reserved +// slice data +// +// slices of a chunk: +// 'CHNK' uint16 cells, uint16 paint samples less one, uint16 layers[8] +// 'HGHT' heights: uint8 encoding (0: int32 base and uint16 steps of height_step above it, delta coded in row order; +// 1: float32), then the values +// 'HBAS' heights before the modifiers, as 'HGHT' +// 'SPLT' paint weights: uint8 per sample per used layer, planar +class pack_file +{ + public: + // reads the header and the index of specified file. returns: true on success + bool open(std::string const &Path, std::string *Error = nullptr); + bool has(chunk_key const &Key) const; + // chunks the file holds + std::vector chunks() const; + // reads specified chunk. returns: the chunk, or null on failure + std::shared_ptr read(chunk_key const &Key, std::string *Error = nullptr) const; + pack_key key() const { return m_key; } + + private: + struct slice + { + std::uint32_t tag{0}; + std::uint32_t codec{0}; + std::uint64_t offset{0}; + std::uint32_t stored{0}; + std::uint32_t size{0}; + std::uint32_t crc{0}; + }; + std::string m_path; + pack_key m_key{0, 0}; + std::array, pack_side * pack_side> m_slices; +}; + +// writes specified chunks (all of the same pack) to the pack file. returns: true on success +bool write_pack(std::string const &Path, pack_key const &Key, std::vector const &Chunks, bool const Compress, std::string *Error = nullptr); + +// triangles (indices of the points, three to a triangle) covering a simple polygon in the XZ plane +std::vector triangulate(std::vector const &Outline); + +// samples the height of the ground outside of a chunk; returns false where it doesn't know +using height_source = std::function; + +// geometry of a chunk at specified level of detail: grid points taken every Stride points of the grid, with a skirt +// along the edges hiding the gaps to the neighbours drawn with another grid. positions relative to Origin +struct mesh +{ + gfx::vertex_array vertices; + gfx::index_array indices; + float radius{0.f}; // from the centre of the vertices + glm::dvec3 centre{0.0}; + glm::dvec3 low{0.0}, high{0.0}; // world bounds of the grid, the skirts included +}; +// strides the grid of a chunk with specified cells can be drawn with +int max_stride(int const Cells); +void build_mesh(chunk_data const &Chunk, int const Stride, glm::dvec3 const &Origin, height_source const &Outside, mesh &Out); +// indices of the mesh of a chunk with specified cells and stride; the same for every chunk of these +void build_indices(int const Cells, int const Stride, gfx::index_array &Out); +// vertices the mesh of a chunk with specified cells and stride has +std::size_t mesh_vertex_count(int const Cells, int const Stride); + +} // namespace heightmap diff --git a/shaders/mat_terrain.frag b/shaders/mat_terrain.frag new file mode 100644 index 000000000..46e454fe2 --- /dev/null +++ b/shaders/mat_terrain.frag @@ -0,0 +1,134 @@ +in vec3 f_normal; +in vec2 f_coord; +in vec4 f_pos; +in mat3 f_tbn; + +in vec4 f_clip_pos; +in vec4 f_clip_future_pos; + +#include + +layout(location = 0) out vec4 out_color; +#if MOTIONBLUR_ENABLED +layout(location = 1) out vec4 out_motion; +#endif + +// heightmap terrain: up to 8 materials (layers) painted over a chunk, blended by their weights. +// the textures of all layers of the terrain are kept in texture arrays; the table of the chunk tells which layers it has: +// row 0, per layer: index in the arrays, 1 / metres the textures repeat at, has normal map, has specular/gloss map +// row 1, per layer: reflection +// f_coord holds metres from the corner of the pack of chunks, along x and -z + +#param (color, 0, 0, 4, diffuse) +#param (diffuse, 1, 0, 1, diffuse) +#param (specular, 1, 1, 1, specular) +#param (reflection, 1, 2, 1, one) +#param (glossiness, 1, 3, 1, glossiness) +// corner of the chunk (x, z) in texture coordinates, 1 / size of the chunk, paint samples along a side less one +#param (placement, 2, 0, 4, zero) + +#texture (opaque, 0, RGBA) +uniform sampler2D opaque; +#texture (weights0, 1, RGBA) +uniform sampler2D weights0; +#texture (weights1, 2, RGBA) +uniform sampler2D weights1; +#texture (layerdiffuse, 3, sRGB_A) +uniform highp sampler2DArray layerdiffuse; +#texture (layernormal, 4, RGBA) +uniform highp sampler2DArray layernormal; +#texture (layerspecgloss, 5, RGBA) +uniform highp sampler2DArray layerspecgloss; +#texture (layertable, 6, RGBA) +uniform highp sampler2D layertable; + +#define NORMALMAP +#include +#include +#include + +void main() +{ + // place within the chunk, 0..1 along x and z, and the paint samples around it + vec2 local = clamp(vec2(f_coord.x - param[2].x, -f_coord.y - param[2].y) * param[2].z, 0.0, 1.0); + float samples = param[2].w; + vec2 paintcoord = (local * samples + 0.5) / (samples + 1.0); + vec4 w0 = texture(weights0, paintcoord); + vec4 w1 = texture(weights1, paintcoord); + float weights[8] = float[8](w0.r, w0.g, w0.b, w0.a, w1.r, w1.g, w1.b, w1.a); + float painted = dot(w0, vec4(1.0)) + dot(w1, vec4(1.0)); + + // the layers are sampled only where they're painted, so the gradients are taken here, where every pixel gets them + vec2 coorddx = dFdx(f_coord); + vec2 coorddy = dFdy(f_coord); + + vec3 albedo = vec3(0.0); + vec3 normal = vec3(0.0); + float reflectivity = 0.0; + float specularity = 0.0; + float gloss = 0.0; + float metal = 0.0; + float total = 0.0; + for (int i = 0; i < 8; ++i) + { + // a chunk without weights shows its first layer + float weight = (painted < 0.004 ? (i == 0 ? 1.0 : 0.0) : weights[i]); + if (weight < 0.004) + continue; + vec4 info = texelFetch(layertable, ivec2(i, 0), 0); + vec4 extra = texelFetch(layertable, ivec2(i, 1), 0); + vec3 coord = vec3(f_coord * info.y, info.x); + vec2 dx = coorddx * info.y; + vec2 dy = coorddy * info.y; + albedo += textureGrad(layerdiffuse, coord, dx, dy).rgb * weight; + vec3 layernormal_ts = vec3(0.0, 0.0, 1.0); + float layerreflection = extra.x; + if (info.z > 0.5) + { + vec4 normalmap = textureGrad(layernormal, coord, dx, dy); + layernormal_ts.xy = normalmap.rg * 2.0 - 1.0; + layernormal_ts.z = sqrt(1.0 - clamp(dot(layernormal_ts.xy, layernormal_ts.xy), 0.0, 1.0)); + layerreflection *= normalmap.a; + } + normal += layernormal_ts * weight; + if (info.w > 0.5) + { + vec4 specgloss = textureGrad(layerspecgloss, coord, dx, dy); + specularity += specgloss.r * weight; + gloss += specgloss.g * weight; + metal += specgloss.b * weight; + } + else + { + gloss += weight; + } + reflectivity += layerreflection * weight; + total += weight; + } + total = max(total, 0.004); + albedo /= total; + specularity /= total; + metal /= total; + reflectivity = param[1].z * reflectivity / total; + glossiness = (gloss / total) * abs(param[1].w); + metalic = metal; + + vec3 fragnormal = normalize(f_tbn * normalize(normal)); + vec3 fragcolor = ambient; + fragcolor = apply_lights(fragcolor, fragnormal, albedo, reflectivity, specularity, shadow_tone); + + vec4 color = vec4(apply_fog(fragcolor), alpha_mult); +#if POSTFX_ENABLED + out_color = color; +#else + out_color = tonemap(color); +#endif +#if MOTIONBLUR_ENABLED + { + vec2 a = (f_clip_future_pos.xy / f_clip_future_pos.w) * 0.5 + 0.5; + vec2 b = (f_clip_pos.xy / f_clip_pos.w) * 0.5 + 0.5; + + out_motion = vec4(a - b, 0.0f, 0.0f); + } +#endif +} diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index 2c80eada7..1f96d151a 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -134,6 +134,7 @@ state_serializer::deserialize_begin( std::string const &Scenariofile ) { { "time", &state_serializer::deserialize_time }, { "trainset", &state_serializer::deserialize_trainset }, { "terrain", &state_serializer::deserialize_terrain }, + { "heightmap_terrain", &state_serializer::deserialize_heightmapterrain }, { "editorterrain", &state_serializer::deserialize_editorterrain }, { "endtrainset", &state_serializer::deserialize_endtrainset }, { "reversed", &state_serializer::deserialize_reversed } }; @@ -1296,37 +1297,43 @@ state_serializer::deserialize_terrain(cParser &Input, scene::scratch_data &Scrat } void -state_serializer::deserialize_editorterrain(cParser &Input, scene::scratch_data &Scratchpad) +state_serializer::deserialize_heightmapterrain(cParser &Input, scene::scratch_data &Scratchpad) { - // editor-authored streaming terrain. format: - // editorterrain [texture] endeditorterrain - // the global streamer loads its 16-bit chunk files around the camera in every mode - std::string folder; - int cells = 32; - float cellsize = 2.0f; - int radius = 4; - Input.getTokens(4); - Input >> folder >> cells >> cellsize >> radius; - std::string texture { Input.getToken() }; - if( texture == "endeditorterrain" ) { - texture.clear(); + // heightmap terrain, kept in terrain// of the simulator. format: + // heightmap_terrain [name] endheightmap_terrain + // without the name the terrain is named after the scenery file. the chunks are loaded around the camera in every mode + std::string name; + while( true ) { + auto const token { Input.getToken( false ) }; + if( token.empty() || token == "endheightmap_terrain" ) { + break; + } + if( name.empty() ) { + name = token; + } } - else { - skip_until(Input, "endeditorterrain"); + if( name.empty() ) { + name = Global.SceneryFile; + auto const slash { name.find_last_of( "/\\" ) }; + if( slash != std::string::npos ) { + name.erase( 0, slash + 1 ); + } + erase_extension( name ); } scene::Layers.terrain_directive(true); - - if (!folder.empty() && cells > 0 && cellsize > 0.0f) - { - EditorTerrain.directory(folder); - EditorTerrain.configure(cells, cellsize, radius < 0 ? 0 : radius, 0.0f, texture); - EditorTerrain.active(true); - WriteLog("Editor terrain stream enabled: " + folder + " (cells " + std::to_string(cells) - + ", cellsize " + std::to_string(cellsize) + ", radius " + std::to_string(radius) + ")", - logtype::generic); + if( false == name.empty() ) { + EditorTerrain.open( name ); } } +void +state_serializer::deserialize_editorterrain(cParser &Input, scene::scratch_data &Scratchpad) +{ + // the chunk files of the first editor terrain were replaced with the heightmap terrain before they were used in sceneries + skip_until(Input, "endeditorterrain"); + WriteLog("Bad scenario: obsolete \"editorterrain\" directive ignored, the editor terrain is \"heightmap_terrain\" now", logtype::generic); +} + void state_serializer::deserialize_endtrainset( cParser &Input, scene::scratch_data &Scratchpad ) { @@ -1711,14 +1718,9 @@ state_serializer::export_as_text(std::string const &Scenariofile) const { scmfile << "// sounds\n"; Region->export_as_text( scmfile ); - // editor-authored streaming terrain: emit a directive pointing at its 16-bit chunk folder so the - // scenery streams it on load (in every mode) + // heightmap terrain: the directive which opens its folder, so the scenery streams it on load (in every mode) if( EditorTerrain.active() ) { - scmfile << "// editor terrain\neditorterrain " - << EditorTerrain.directory() << ' ' - << EditorTerrain.cells() << ' ' - << EditorTerrain.cellsize() << ' ' - << EditorTerrain.radius() << " endeditorterrain\n"; + scmfile << "// heightmap terrain\nheightmap_terrain " << EditorTerrain.name() << " endheightmap_terrain\n"; } scmfile << "// modified objects\ninclude " << filename << "_export_dirty.scm\n"; @@ -1768,16 +1770,9 @@ state_serializer::export_as_text(std::string const &Scenariofile) const { scmfile << "// sounds\n"; Region->export_as_text( scmfile ); - // editor-authored streaming terrain: emit a directive pointing at its 16-bit chunk folder so the - // scenery streams it on load (in every mode) + // heightmap terrain: the directive which opens its folder, so the scenery streams it on load (in every mode) if( EditorTerrain.active() ) { - scmfile << "// editor terrain\neditorterrain " - << EditorTerrain.directory() << ' ' - << EditorTerrain.cells() << ' ' - << EditorTerrain.cellsize() << ' ' - << EditorTerrain.radius() - << ( EditorTerrain.texture().empty() ? "" : " " + EditorTerrain.texture() ) - << " endeditorterrain\n"; + scmfile << "// heightmap terrain\nheightmap_terrain " << EditorTerrain.name() << " endheightmap_terrain\n"; } scmfile << "// modified objects\ninclude " << filename << "_export_dirty.scm\n"; @@ -1921,7 +1916,7 @@ std::pair state_serializer::preview_include(std::string const &Directi static std::unordered_map const statementends { { "event", "endevent" }, { "trainset", "endtrainset" }, { "isolated", "endisolated" }, { "area", "endarea" }, { "assignment", "endassignment" }, { "atmo", "endatmo" }, { "camera", "endcamera" }, { "config", "endconfig" }, { "description", "enddescription" }, { "light", "endlight" }, - { "sky", "endsky" }, { "test", "endtest" }, { "time", "endtime" }, { "terrain", "endterrain" }, { "editorterrain", "endeditorterrain" } }; + { "sky", "endsky" }, { "test", "endtest" }, { "time", "endtime" }, { "terrain", "endterrain" }, { "heightmap_terrain", "endheightmap_terrain" }, { "editorterrain", "endeditorterrain" } }; cParser parser(Directive, cParser::buffer_TEXT, Global.asCurrentSceneryPath, Global.bLoadTraction); // the template is processed with the placement its directive is going to be loaded with diff --git a/simulation/simulationstateserializer.h b/simulation/simulationstateserializer.h index a5cbc32fa..897749e7e 100644 --- a/simulation/simulationstateserializer.h +++ b/simulation/simulationstateserializer.h @@ -80,6 +80,7 @@ private: void deserialize_time( cParser &Input, scene::scratch_data &Scratchpad ); void deserialize_trainset( cParser &Input, scene::scratch_data &Scratchpad ); void deserialize_terrain( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_heightmapterrain( cParser &Input, scene::scratch_data &Scratchpad ); void deserialize_editorterrain( cParser &Input, scene::scratch_data &Scratchpad ); void deserialize_endtrainset( cParser &Input, scene::scratch_data &Scratchpad ); void deserialize_reversed( cParser &Input, scene::scratch_data &Scratchpad ); From 5716bc16696ddc301fda014473e7cede30be4253 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Fri, 9 Oct 2026 21:16:34 +0200 Subject: [PATCH 196/430] Fix windows compilation --- editor/editorTerrainStreamer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/editor/editorTerrainStreamer.cpp b/editor/editorTerrainStreamer.cpp index bb6293db2..482f436ab 100644 --- a/editor/editorTerrainStreamer.cpp +++ b/editor/editorTerrainStreamer.cpp @@ -640,11 +640,11 @@ void terrain_streamer::update(glm::dvec3 const &Camera) // chunks gone out of range are dropped, except edited ones, which wait in memory to be saved auto const outside = [&](chunk_key const &Key, int const Margin) { - auto const near = [&](chunk_key const &Centre) { + auto const within = [&](chunk_key const &Centre) { auto const dx{Key.first - Centre.first}, dz{Key.second - Centre.second}; return dx * dx + dz * dz <= (radius + Margin) * (radius + Margin); }; - return false == near(here) && false == near(there); + return false == within(here) && false == within(there); }; for (auto it = m_chunks.begin(); it != m_chunks.end();) { From 8cd0bab27bf63ea717c08aeefd7ce2bec6838d78 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Fri, 9 Oct 2026 23:39:26 +0200 Subject: [PATCH 197/430] Editor terrain: texture browser, undo, conversion from terrain files - Terrain work mode shows a browser of the textures folder in place of the node bank; textures/materials can be dragged onto the palette entries (replacing the material), the material field and the water material field - Ctrl+Z/Ctrl+Y for heightmap terrain changes: a brush stroke or an operation is one step of the editor history - Ground conversion reads only the files of the terrain directives (.txtf with origin/rotate, or .btf without text), paints the chunks with the materials of the triangles, drops only the shapes of those files - Fix: ground grids converted out-of-range floats to int, so whole-scene queries returned the triangles of a single cell (shifted chunks) - Fix: terrain layers copied from textures already uploaded without their data stayed grey - Fix: ImGui ID conflict between terrain tool radios and section headers - Fix: layers of terrain .txtf files named with the scenery/ prefix and could not be saved - Editor selftest commands for the terrain --- CMakeLists.txt | 1 + application/editormode.cpp | 362 ++++++++++++++++------- application/editormode.h | 64 +++- application/editormodeprofile.cpp | 78 +++-- application/editormodeselftest.cpp | 51 ++++ application/editormodetextures.cpp | 279 +++++++++++++++++ application/editoruilayer.h | 8 + application/editoruipanels.cpp | 8 + application/editoruipanels.h | 11 +- editor/editorGroundMesh.hpp | 6 +- editor/editorTerrainStreamer.cpp | 148 +++++++++ editor/editorTerrainStreamer.hpp | 31 ++ rendering/opengl33terrain.cpp | 21 +- scene/scenelayers.cpp | 4 +- scene/scenelayers.h | 4 +- scene/scenenode.cpp | 4 +- scene/scenenode.h | 5 + scene/sceneterrain.cpp | 232 +++++++++++++++ scene/sceneterrain.h | 21 ++ simulation/simulationstateserializer.cpp | 9 + utilities/parser.cpp | 9 +- 21 files changed, 1211 insertions(+), 145 deletions(-) create mode 100644 application/editormodetextures.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 366b2506a..62b41aa55 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -191,6 +191,7 @@ set(SOURCES "application/editormodetrackux.cpp" "application/editormoderoad.cpp" "application/editormodeprofile.cpp" +"application/editormodetextures.cpp" "application/editormodegauge.cpp" "application/editormodeinfra.cpp" "application/editormodespeed.cpp" diff --git a/application/editormode.cpp b/application/editormode.cpp index 4bf80d584..73916325e 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -45,6 +45,7 @@ extern char **environ; #include "utilities/Float3d.h" #include "scene/scene.h" #include "scene/scenelayers.h" +#include "scene/sceneterrain.h" #include "utilities/parser.h" #include "utilities/utilities.h" @@ -213,8 +214,8 @@ namespace } } - // highest surface at (X,Z) that isn't above Ceiling. returns: true if there is one - bool height_at(double const X, double const Z, double const Ceiling, double &OutY) const + // highest surface at (X,Z) that isn't above Ceiling. returns: true if there is one, and which triangle it is in Index if asked + bool height_at(double const X, double const Z, double const Ceiling, double &OutY, std::uint32_t *Index = nullptr) const { bool found = false; for (auto const idx : m_cells[static_cast(row(Z)) * m_columns + column(X)]) @@ -225,6 +226,8 @@ namespace { OutY = y; found = true; + if (Index != nullptr) + *Index = idx; } } return found; @@ -233,11 +236,11 @@ namespace private: int column(double const X) const { - return std::clamp(static_cast(std::floor((X - m_min.x) / m_cellsize)), 0, m_columns - 1); + return static_cast(std::clamp(std::floor((X - m_min.x) / m_cellsize), 0.0, static_cast(m_columns - 1))); } int row(double const Z) const { - return std::clamp(static_cast(std::floor((Z - m_min.y) / m_cellsize)), 0, m_rows - 1); + return static_cast(std::clamp(std::floor((Z - m_min.y) / m_cellsize), 0.0, static_cast(m_rows - 1))); } std::vector m_triangles; @@ -498,6 +501,7 @@ editor_mode::editor_mode() { ui()->set_track_options([this]() { render_track_tool_options(); }, [this]() { render_track_selection(); }); ui()->set_workspace_options(editor_ui::workspace::roads, [this]() { render_road_tool_options(); }, [this]() { render_road_selection(); }); ui()->set_workspace_options(editor_ui::workspace::terrain, [this]() { render_terrain_tool_options(); }); + ui()->set_workspace_bank(editor_ui::workspace::terrain, [this]() { render_texture_browser(); }, STR("Textures")); // a node picked in the scene window is selected as if clicked in the view; a double click flies the camera to it ui()->set_scene_select([this](scene::basic_node *Node, bool const Focus) { if (Focus) @@ -876,8 +880,50 @@ void editor_mode::nullify_history_pointers(scene::basic_node *node) m_array.base = nullptr; } +void editor_mode::terrain_history_step() +{ + if (false == m_streamer.active()) + return; + if (m_streamer.recording()) + { + if (terrain_brush() && mouseHold && false == m_history_busy) + return; // the stroke goes on + auto change{m_streamer.end_change()}; + if (false == change.empty()) + { + trim_history(); + EditorSnapshot snap; + snap.action = EditorSnapshot::Action::Terrain; + snap.node_name = STR("terrain"); + if (false == change.chunks.empty()) + { + auto const centre{heightmap::chunk_corner(change.chunks.begin()->first) + glm::dvec2{heightmap::chunk_size * 0.5}}; + snap.position = {centre.x, 0.0, centre.y}; + } + snap.terrain = std::make_shared(std::move(change)); + m_history.push_back(std::move(snap)); + g_redo.clear(); + } + } + m_streamer.begin_change(); +} + +void editor_mode::restore_terrain(EditorSnapshot &Snapshot) +{ + if (Snapshot.terrain == nullptr) + return; + auto opposite{m_streamer.restore(*Snapshot.terrain)}; + Snapshot.terrain = std::make_shared(std::move(opposite)); + forget_ground(); + m_water_selected = -1; +} + void editor_mode::undo_last() { + // a change of the terrain made a moment ago is a step of its own before it's taken back + m_history_busy = true; + terrain_history_step(); + m_history_busy = false; // the changes made together are taken back together, and their models are the selection again std::vector touched; while (false == m_history.empty()) @@ -906,6 +952,13 @@ void editor_mode::undo_one() EditorSnapshot snap = m_history.back(); m_history.pop_back(); + if (snap.action == EditorSnapshot::Action::Terrain) + { + restore_terrain(snap); + g_redo.push_back(std::move(snap)); + return; + } + if (snap.action == EditorSnapshot::Action::Bend) { restore_bend(snap, true); @@ -1036,6 +1089,10 @@ void editor_mode::undo_one() void editor_mode::redo_last() { + // a change of the terrain made since the undo goes to the history, and the redo steps are dropped with it + m_history_busy = true; + terrain_history_step(); + m_history_busy = false; // the first of the changes made together is on the top, the others follow it std::vector touched; do @@ -1060,6 +1117,13 @@ void editor_mode::redo_one() EditorSnapshot snap = g_redo.back(); g_redo.pop_back(); + if (snap.action == EditorSnapshot::Action::Terrain) + { + restore_terrain(snap); + m_history.push_back(std::move(snap)); + return; + } + if (snap.action == EditorSnapshot::Action::Bend) { restore_bend(snap, false); @@ -1238,6 +1302,7 @@ bool editor_mode::update() m_dragging = false; m_input.mouse.button(GLFW_MOUSE_BUTTON_LEFT, GLFW_RELEASE); } + terrain_history_step(); // fixed step render time routines (50 Hz) fTime50Hz += deltarealtime; // accumulate even when paused to keep frame reads stable @@ -1479,8 +1544,8 @@ namespace return changed; } - // grid points without a height take the height of the nearest point which has one (by steps along the grid) - void fill_from_nearest(std::vector &Heights, std::vector &Found, std::size_t const Side) + // grid points without a height (or another value) take the one of the nearest point which has it (by steps along the grid) + template void fill_from_nearest(std::vector &Heights, std::vector &Found, std::size_t const Side) { std::deque queue; for (std::size_t index = 0; index < Found.size(); ++index) @@ -1530,6 +1595,8 @@ void editor_mode::render_terrain_ui() if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", Tooltip); }; + // the tools are named like the headers below, which would give them the same IDs + ImGui::PushID("terrain_tools"); radio(STR_C("Select"), terrain_tool::none, STR_C("LMB picks the models, as in the surroundings")); ImGui::SameLine(); radio(STR_C("Chunks"), terrain_tool::chunks, STR_C("LMB adds a chunk shaped as the ground under it, next to the clicked one; Shift+LMB removes the clicked chunk")); @@ -1542,6 +1609,7 @@ void editor_mode::render_terrain_ui() radio(STR_C("Paint"), terrain_tool::paint, STR_C("LMB paints the material chosen in the palette, Shift+LMB the first material of the palette")); ImGui::SameLine(); radio(STR_C("Water"), terrain_tool::water, STR_C("LMB adds a point of the outline of a body of water, Shift+LMB takes the last one back")); + ImGui::PopID(); m_terrain_tool = static_cast(tool); if (ImGui::CollapsingHeader(STR_C("Chunks"), ImGuiTreeNodeFlags_DefaultOpen)) @@ -1594,6 +1662,10 @@ void editor_mode::render_terrain_ui() auto const label{layers[i].size > 0.f ? format("%zu: %s (%.1f m)", i, layers[i].material.c_str(), layers[i].size) : format("%zu: %s", i, layers[i].material.c_str())}; if (ImGui::Selectable(label.c_str(), static_cast(i) == m_terrain_layer)) m_terrain_layer = static_cast(i); + // a material dropped on an entry takes its place, on every chunk painted with it + std::string dropped; + if (material_drop(dropped)) + m_streamer.layer_material(static_cast(i), dropped); } if (false == layers.empty()) { @@ -1607,10 +1679,12 @@ void editor_mode::render_terrain_ui() } ImGui::SetNextItemWidth(160.0f); ImGui::InputText(STR_C("Material"), m_terrain_material, IM_ARRAYSIZE(m_terrain_material)); + material_drop(m_terrain_material, IM_ARRAYSIZE(m_terrain_material)); ImGui::SameLine(); if (ImGui::Button(STR_C("Add to the palette")) && m_terrain_material[0] != '\0') m_terrain_layer = m_streamer.layer(m_terrain_material, m_terrain_material_size); - ImGui::TextDisabled("%s", STR_C("New chunks are covered with the first material. A chunk holds up to 8 of them.")); + ImGui::TextDisabled("%s", STR_C("New chunks are covered with the first material. A chunk holds up to 8 of them. " + "A texture dragged from the browser onto an entry of the palette takes its place.")); } if (ImGui::CollapsingHeader(STR_C("Water"), m_terrain_tool == terrain_tool::water ? ImGuiTreeNodeFlags_DefaultOpen : 0)) @@ -1623,6 +1697,7 @@ void editor_mode::render_terrain_ui() m_water_level_edited = true; ImGui::SetNextItemWidth(160.0f); ImGui::InputText(STR_C("Material##water"), m_water_material, IM_ARRAYSIZE(m_water_material)); + material_drop(m_water_material, IM_ARRAYSIZE(m_water_material)); if (ImGui::IsItemHovered()) ImGui::SetTooltip(STR_C("Empty: %s, the water material of the terrain"), m_streamer.manifest().water_material.c_str()); ImGui::BeginDisabled(m_water_points.size() < 3); @@ -2254,41 +2329,13 @@ void editor_mode::handle_terrain_click(bool const Shift) namespace { - std::uint64_t geometry_key(gfx::geometry_handle const &Geometry) - { - return (static_cast(Geometry.bank) << 32) | Geometry.chunk; - } - - // the shapes of the scenery which can be ground: the ones the editor makes itself (its terrain, roads, imagery) left out - template void visit_scenery_shapes(std::set const &Own, Visitor const &Visit) - { - auto const scenery = [&](scene::shape_node const &Shape) { - auto const &data = Shape.data(); - return Own.count(geometry_key(data.geometry)) == 0 && false == editor_orthophoto::owns(data.geometry) && false == owned_shapes::owns(data.geometry); - }; - for (std::size_t i = 0; i < sq(scene::EU07_REGIONSIDESECTIONCOUNT); ++i) - { - auto *section = simulation::Region->get_section(i); - if (section == nullptr) - continue; - for (auto &shape : section->m_shapes) - if (scenery(shape)) - Visit(shape); - for (auto &cell : section->m_cells) - for (auto &shape : cell.m_shapesopaque) - if (scenery(shape)) - Visit(shape); - } - } - - // takes the shapes of specified materials out of the scene - std::size_t drop_scenery_shapes(std::set const &Own, std::set const &Materials) + // takes the shapes of specified terrain files and materials out of the scene. returns: the count of the shapes + std::size_t drop_terrain_shapes(std::set const &Files, std::set const &Materials) { std::size_t dropped = 0; auto const dropping = [&](scene::shape_node const &Shape) { auto const &data = Shape.data(); - bool const drop = Materials.count(data.material) != 0 && Own.count(geometry_key(data.geometry)) == 0 && false == editor_orthophoto::owns(data.geometry) && - false == owned_shapes::owns(data.geometry); + bool const drop = Files.count(data.terrainfile) != 0 && Materials.count(data.material) != 0; dropped += drop ? 1 : 0; return drop; }; @@ -2299,33 +2346,63 @@ namespace continue; section->m_shapes.erase(std::remove_if(section->m_shapes.begin(), section->m_shapes.end(), dropping), section->m_shapes.end()); for (auto &cell : section->m_cells) + { cell.m_shapesopaque.erase(std::remove_if(cell.m_shapesopaque.begin(), cell.m_shapesopaque.end(), dropping), cell.m_shapesopaque.end()); + cell.m_shapestranslucent.erase(std::remove_if(cell.m_shapestranslucent.begin(), cell.m_shapestranslucent.end(), dropping), cell.m_shapestranslucent.end()); + } } return dropped; } } // namespace -std::map editor_mode::ground_materials() +void editor_mode::load_ground_files() { - std::map result; - if (simulation::Region == nullptr) - return result; - std::set own; - for (auto *terrain : active_terrains()) - own.insert(geometry_key(terrain->geometry())); - glm::dvec2 const everywhere{std::numeric_limits::max() * 0.5}; - visit_scenery_shapes(own, [&](scene::shape_node const &Shape) { - std::vector triangles; - gather_shape_triangles(Shape, -everywhere, everywhere, triangles, true); - if (false == triangles.empty()) - result[Shape.data().material] += triangles.size(); - }); - return result; + auto &conversion{m_ground_conversion}; + conversion.files.clear(); + conversion.triangles.clear(); + conversion.materials.clear(); + conversion.names.clear(); + conversion.chosen.clear(); + std::map lookup; + auto const &references{scene::terrain_file::references()}; + for (std::size_t index = 0; index < references.size(); ++index) + { + ground_conversion::source source; + source.file = references[index].file; + source.reference = static_cast(index + 1); + source.first = conversion.triangles.size(); + source.good = scene::terrain_file::read_triangles( + references[index], + [&](std::string const &Material, std::array const &Triangle) { + auto found{lookup.find(Material)}; + if (found == lookup.end()) + { + found = lookup.emplace(Material, static_cast(conversion.names.size())).first; + conversion.names.push_back(Material); + } + conversion.triangles.push_back(Triangle); + conversion.materials.push_back(found->second); + }, + &source.message, &source.text); + if (false == source.good) + { + // what was read before the failure doesn't count + conversion.triangles.resize(source.first); + conversion.materials.resize(source.first); + source.chosen = false; + } + source.count = conversion.triangles.size() - source.first; + conversion.files.push_back(std::move(source)); + } + // the terrain files hold the ground, all of it is taken unless told otherwise + for (std::size_t index = 0; index < conversion.names.size(); ++index) + conversion.chosen.insert(index); } -std::string editor_mode::convert_ground(std::set const &Materials) +std::string editor_mode::convert_ground() { - if (simulation::Region == nullptr || Materials.empty()) + auto &conversion{m_ground_conversion}; + if (simulation::Region == nullptr || conversion.chosen.empty()) return {}; if (false == ensure_terrain()) return STR_C("The heightmap terrain can't be opened"); @@ -2333,50 +2410,56 @@ std::string editor_mode::convert_ground(std::set const &Materia int const cells = heightmap::cells_for(m_terrain_spacing); double const cellsize = size / cells; - // the shapes of the heightmap terrain hold no triangles of their own, nothing to leave out - std::set const own; + // the chosen triangles of the chosen files std::vector triangles; - std::vector materials; - glm::dvec2 const everywhere{std::numeric_limits::max() * 0.5}; - visit_scenery_shapes(own, [&](scene::shape_node const &Shape) { - if (Materials.count(Shape.data().material) == 0) - return; - gather_shape_triangles(Shape, -everywhere, everywhere, triangles, true); - materials.resize(triangles.size(), Shape.data().material); - }); + std::vector materials; + std::set files; + for (auto const &source : conversion.files) + { + if (false == source.good || false == source.chosen) + continue; + files.insert(source.reference); + for (auto index = source.first; index < source.first + source.count; ++index) + { + if (conversion.chosen.count(conversion.materials[index]) == 0) + continue; + triangles.push_back(conversion.triangles[index]); + materials.push_back(conversion.materials[index]); + } + } if (triangles.empty()) - return STR_C("The chosen materials have no triangles"); + return STR_C("The chosen files and materials have no triangles"); // the triangles reaching each chunk - std::map, std::vector> buckets; + std::map> buckets; for (std::uint32_t i = 0; i < triangles.size(); ++i) { auto const &t = triangles[i]; - int const x0 = static_cast(std::floor(std::min({t[0].x, t[1].x, t[2].x}) / size)); - int const x1 = static_cast(std::floor(std::max({t[0].x, t[1].x, t[2].x}) / size)); - int const z0 = static_cast(std::floor(std::min({t[0].z, t[1].z, t[2].z}) / size)); - int const z1 = static_cast(std::floor(std::max({t[0].z, t[1].z, t[2].z}) / size)); - for (int x = x0; x <= x1; ++x) - for (int z = z0; z <= z1; ++z) + // a triangle which only touches the edge of a chunk gives it nothing but the edge, which the chunk on the other side has + auto const margin{1e-3}; + auto const low{heightmap::chunk_at(std::min({t[0].x, t[1].x, t[2].x}) + margin, std::min({t[0].z, t[1].z, t[2].z}) + margin)}; + auto const high{heightmap::chunk_at(std::max({t[0].x, t[1].x, t[2].x}) - margin, std::max({t[0].z, t[1].z, t[2].z}) - margin)}; + for (int x = low.first; x <= high.first; ++x) + for (int z = low.second; z <= high.second; ++z) buckets[{x, z}].push_back(i); } - // the chunks are covered with the material which covers the most; it goes to the palette of the terrain - std::map coverage; - for (std::size_t i = 0; i < triangles.size(); ++i) - { - auto const &t = triangles[i]; - coverage[materials[i]] += 0.5 * std::abs((t[1].x - t[0].x) * (t[2].z - t[0].z) - (t[2].x - t[0].x) * (t[1].z - t[0].z)); - } - auto const dominant = std::max_element(coverage.begin(), coverage.end(), [](auto const &A, auto const &B) { return A.second < B.second; })->first; - std::uint16_t layer = 0; - if (auto const *material = GfxRenderer->Material(dominant)) - layer = m_streamer.layer(material->GetName()); + // palette entries of the materials, added as they're needed + std::map palette; + auto const layer_of = [&](std::uint16_t const Material) { + auto const found{palette.find(Material)}; + if (found != palette.end()) + return found->second; + auto const layer{m_streamer.layer(conversion.names[Material])}; + palette.emplace(Material, layer); + return layer; + }; - // the old ground goes first, so what's made in its place isn't taken for it - auto const dropped = drop_scenery_shapes(own, Materials); std::size_t made = 0, skipped = 0; std::size_t const side = static_cast(cells) + 1; + auto const samples{heightmap::default_paint_samples}; + std::size_t const paintside = static_cast(samples) + 1; + double const paintstep = size / samples; for (auto const &bucket : buckets) { auto const &key = bucket.first; @@ -2385,11 +2468,17 @@ std::string editor_mode::convert_ground(std::set const &Materia ++skipped; continue; } - glm::dvec2 const low{key.first * size, key.second * size}; + auto const low{heightmap::chunk_corner(key)}; std::vector local; + std::vector localmaterials; for (auto const i : bucket.second) + { local.push_back(triangles[i]); + localmaterials.push_back(materials[i]); + } triangle_grid const ground(std::move(local), low - glm::dvec2{1.0}, low + glm::dvec2{size + 1.0}); + auto const ceiling{std::numeric_limits::max()}; + // heights of the grid points; where there's no ground they're taken from the nearest point which has some std::vector heights(side * side, 0.0); std::vector found(side * side, 0); bool any = false; @@ -2397,29 +2486,103 @@ std::string editor_mode::convert_ground(std::set const &Materia for (std::size_t ix = 0; ix < side; ++ix) { auto const index = iz * side + ix; - if (ground.height_at(low.x + ix * cellsize, low.y + iz * cellsize, std::numeric_limits::max(), heights[index])) + if (ground.height_at(low.x + ix * cellsize, low.y + iz * cellsize, ceiling, heights[index])) found[index] = 1, any = true; } if (false == any) continue; fill_from_nearest(heights, found, side); - auto const sampler = [&](double X, double Z) { - auto const ix = static_cast(std::clamp(std::lround((X - low.x) / cellsize), 0, cells)); - auto const iz = static_cast(std::clamp(std::lround((Z - low.y) / cellsize), 0, cells)); - return static_cast(heights[iz * side + ix]); - }; - if (m_streamer.add_chunk(key.first, key.second, m_terrain_spacing, sampler, layer)) + // the material on top at each paint sample + std::vector paint(paintside * paintside, 0); + std::vector painted(paintside * paintside, 0); + std::map counts; + for (std::size_t iz = 0; iz < paintside; ++iz) + for (std::size_t ix = 0; ix < paintside; ++ix) + { + double height; + std::uint32_t triangle; + if (false == ground.height_at(low.x + ix * paintstep, low.y + iz * paintstep, ceiling, height, &triangle)) + continue; + auto const index = iz * paintside + ix; + paint[index] = localmaterials[triangle]; + painted[index] = 1; + ++counts[paint[index]]; + } + if (counts.empty()) + { + // the points of the grid hit the ground, the samples in between didn't; the nearest triangle covers the chunk + counts[localmaterials.front()] = 1; + std::fill(paint.begin(), paint.end(), localmaterials.front()); + } + else + fill_from_nearest(paint, painted, paintside); + // a chunk holds up to 8 materials, the ones covering the most; the rest is given to the one covering the most + std::vector> ranking; + for (auto const &count : counts) + ranking.emplace_back(count.second, count.first); + std::sort(ranking.begin(), ranking.end(), [](auto const &A, auto const &B) { return A.first > B.first; }); + if (ranking.size() > heightmap::max_chunk_layers) + ranking.resize(heightmap::max_chunk_layers); + + auto data{heightmap::chunk_data::make_flat(key, m_terrain_spacing, 0.f)}; + for (std::size_t index = 0; index < data->heights.size(); ++index) + data->heights[index] = static_cast(heights[index]); + std::map slots; + for (std::size_t slot = 0; slot < ranking.size(); ++slot) + { + data->layers[slot] = layer_of(ranking[slot].second); + slots.emplace(ranking[slot].second, slot); + } + if (ranking.size() > 1) + { + auto const plane{paintside * paintside}; + data->paint = samples; + data->weights.assign(plane * ranking.size(), 0); + for (std::size_t index = 0; index < plane; ++index) + { + auto const slot{slots.find(paint[index])}; + data->weights[(slot != slots.end() ? slot->second : 0) * plane + index] = 255; + } + } + if (m_streamer.add_chunk(std::move(data))) ++made; } - ground_tiles.clear(); - forget_ground_shapes(); + forget_ground(); - auto const erased = scene::Layers.erase_shapes(Materials); - auto summary = format(STR_C("Ground converted: %zu chunks of heightmap terrain made, %zu shapes taken out of the scene, %zu triangle nodes go from the scenery files on save"), made, dropped, erased.first); + // the converted ground goes from the scene, and from the text files on save + std::set handles; + for (auto const material : conversion.chosen) + if (material < conversion.names.size()) + handles.insert(GfxRenderer->Fetch_Material(conversion.names[material])); + auto const dropped = drop_terrain_shapes(files, handles); + std::set layers; + std::size_t binary = 0; + for (auto const &source : conversion.files) + { + if (false == source.good || false == source.chosen) + continue; + if (false == source.text) + { + ++binary; + continue; + } + auto const textfile{source.file + ".txtf"}; + for (std::size_t layer = 1; layer <= scene::Layers.size(); ++layer) + { + auto name{scene::Layers.layer(static_cast(layer)).name}; + replace_slashes(name); + if (name.ends_with(textfile)) + layers.insert(static_cast(layer)); + } + } + auto const erased = scene::Layers.erase_shapes(handles, &layers); + auto summary = format(STR_C("Ground converted: %zu chunks of heightmap terrain made, %zu shapes taken out of the scene, %zu triangle nodes go from the terrain files on save"), made, dropped, erased.first); if (skipped > 0) summary += format(STR_C(", %zu chunks kept as there was terrain already"), skipped); if (erased.second > 0) summary += format(STR_C(", %zu nodes stay as their files can't be rewritten"), erased.second); + if (binary > 0) + summary += format(STR_C(". %zu of the files are binary (.btf) without their text: their triangles come back with the next load, until the files are taken out of the terrain directive"), binary); WriteLog("Editor: " + summary, logtype::generic); return summary; } @@ -5261,7 +5424,8 @@ void editor_mode::render_change_history(){ s.action == EditorSnapshot::Action::Scale ? "SCA" : s.action == EditorSnapshot::Action::TrackEdit ? "TRK" : s.action == EditorSnapshot::Action::RoadEdit ? "ROAD" : - s.action == EditorSnapshot::Action::Array ? "ARR" : "OTH", + s.action == EditorSnapshot::Action::Array ? "ARR" : + s.action == EditorSnapshot::Action::Terrain ? "TER" : "OTH", s.node_name.empty() ? "(noname)" : s.node_name.c_str(), s.position.x, s.position.y, s.position.z); diff --git a/application/editormode.h b/application/editormode.h index ebe40cd7d..35a5645d5 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -132,7 +132,7 @@ class editor_mode : public application_mode, private editor_track::observer struct stored_profile; struct EditorSnapshot { - enum class Action { Move, Rotate, Scale, Add, Delete, TrackEdit, Other, RoadEdit, Array, Bend }; + enum class Action { Move, Rotate, Scale, Add, Delete, TrackEdit, Other, RoadEdit, Array, Bend, Terrain }; // copy of a model an array made struct array_copy { @@ -170,6 +170,7 @@ class editor_mode : public application_mode, private editor_track::observer std::vector profile_library; std::vector copies; // models an array added to the one it was made of bool joined{false}; // undone and redone together with the change before it + std::shared_ptr terrain; // the heightmap terrain from before the change (Action::Terrain) }; void push_snapshot(scene::basic_node *node, EditorSnapshot::Action Action = EditorSnapshot::Action::Move, std::string const &Serialized = std::string()); @@ -183,6 +184,12 @@ class editor_mode : public application_mode, private editor_track::observer // a single step of the history, see undo_last() void undo_one(); void redo_one(); + // the changes of the heightmap terrain since the last step become a step of the history: a stroke of the brush, + // or what a frame did; the next change is recorded from now on + void terrain_history_step(); + // puts the terrain back as the step recorded it, the step left with the state it replaced + void restore_terrain(EditorSnapshot &Snapshot); + bool m_history_busy{false}; // undo or redo under way void handle_brush_mouse_hold(int Action, int Button); void apply_rotation_for_new_node(scene::basic_node *node, int rotation_mode, float fixed_rotation_value); // members @@ -313,18 +320,59 @@ class editor_mode : public application_mode, private editor_track::observer void draw_terrain_overlay(); // forgets what's known about the ground, after the terrain changed void forget_ground(); - // the scenery ground: triangles of each material, the ones the editor makes itself left out - std::map ground_materials(); - // replaces the triangles of specified materials with chunks of heightmap terrain of their shape; the scenery files lose them on save. - // returns: summary for the user - std::string convert_ground(std::set const &Materials); + // conversion of the ground of the terrain files of the scenery (terrain directive, .txtf/.btf) to heightmap terrain struct ground_conversion { + struct source + { + std::string file; // as the terrain directive names it + std::uint16_t reference{0}; // see scene::terrain_file::reference_of() + bool text{false}; // read from the text file, rather than the binary one + bool good{false}; + bool chosen{true}; + std::string message; + std::size_t first{0}, count{0}; // its triangles + }; bool open{false}; - std::map materials; - std::set chosen; + std::vector files; + std::vector> triangles; + std::vector materials; // of the triangles: index of the name + std::vector names; // of the materials + std::set chosen; // materials to convert std::string status; } m_ground_conversion; + // reads the triangles of the terrain files of the scenery for the conversion + void load_ground_files(); + // the folder of the textures as a browser, in the window of the node bank while the terrain is edited: the textures and the + // materials can be dragged onto the fields which take a material + struct texture_browser + { + struct item + { + std::string name; // as the materials are named: relative to the folder of the textures, without the extension + std::string label; // the file, without the folder + bool material{false}; // there's a .mat file of the name + }; + std::string folder; // relative to the folder of the textures, empty or with a trailing slash + std::vector folders; // under the current one + std::vector items; + bool listed{false}; + char filter[64]{}; + float size{96.f}; // of the images, pixels + std::string selected; + std::map thumbnails; // texture shown for the item of the name, 0: none + int loads{0}; // textures read in the frame, a few at most so the browser doesn't stall the editor + } m_textures; + void render_texture_browser(); + // texture of the image of the item of the browser, 0 while there's none + std::uint64_t texture_thumbnail(texture_browser::item const &Item); + // takes a material dragged from the texture browser onto the item drawn last. returns: true if one was dropped, its name in Name + static bool material_drop(std::string &Name); + // the same, for a text field + static bool material_drop(char *Buffer, std::size_t Size); + // replaces the chosen triangles of the chosen terrain files with chunks of heightmap terrain of their shape, painted with + // their materials; the files lose them on save. returns: summary for the user + std::string convert_ground(); void render_ground_conversion(); // handles a click of the chunk, spacing and water tools (Shift: the other way round) void handle_terrain_click(bool const Shift); diff --git a/application/editormodeprofile.cpp b/application/editormodeprofile.cpp index f23eff532..4fafe1d3c 100644 --- a/application/editormodeprofile.cpp +++ b/application/editormodeprofile.cpp @@ -674,54 +674,84 @@ void editor_mode::profile_restore_ground() void editor_mode::render_ground_conversion() { auto &conversion{m_ground_conversion}; + ImGui::PushID("ground_conversion"); if (false == conversion.open) { - if (ImGui::Button(STR_C("Convert the scenery ground to heightmap terrain..."))) + if (ImGui::Button(STR_C("Convert the terrain files to heightmap terrain..."))) { conversion.open = true; - conversion.materials = ground_materials(); - conversion.chosen.clear(); - // the material with the most triangles is the ground, most likely - auto const most{std::max_element(conversion.materials.begin(), conversion.materials.end(), [](auto const &A, auto const &B) { return A.second < B.second; })}; - if (most != conversion.materials.end()) - conversion.chosen.insert(most->first); + load_ground_files(); } if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("Replaces the triangles of the chosen materials with heightmap terrain of the same shape,\nwhich can be shaped, sculpted and painted; the scenery files lose these triangles on save")); + ImGui::SetTooltip("%s", STR_C("Replaces the triangles of the terrain files of the scenery (terrain directive, .txtf/.btf) with heightmap terrain\n" + "of the same shape, painted with their materials; the files lose these triangles on save")); if (false == conversion.status.empty()) ImGui::TextWrapped("%s", conversion.status.c_str()); + ImGui::PopID(); return; } - ImGui::TextWrapped("%s", STR_C("Materials of the scenery triangles: tick the ones which are the ground")); - if (conversion.materials.empty()) - ImGui::TextDisabled("%s", STR_C("The scenery has no triangles")); - for (auto const &entry : conversion.materials) + if (conversion.files.empty()) + ImGui::TextWrapped("%s", STR_C("The scenery has no terrain files: no terrain directive names a .txtf or .btf file")); + else + ImGui::TextUnformatted(STR_C("Terrain files of the scenery:")); + for (std::size_t index = 0; index < conversion.files.size(); ++index) { - auto const *material{GfxRenderer->Material(entry.first)}; - auto const name{material != nullptr ? material->GetName() : std::string{"?"}}; - bool chosen{conversion.chosen.count(entry.first) != 0}; - ImGui::PushID(static_cast(entry.first)); - if (ImGui::Checkbox(format(STR_C("%s (%zu triangles)"), name.c_str(), entry.second).c_str(), &chosen)) + auto &source{conversion.files[index]}; + ImGui::PushID(static_cast(index)); + ImGui::BeginDisabled(false == source.good); + ImGui::Checkbox(source.file.c_str(), &source.chosen); + ImGui::EndDisabled(); + ImGui::SameLine(); + if (source.good) + ImGui::TextDisabled(source.text ? STR_C("(text, %zu triangles)") : STR_C("(binary, %zu triangles)"), source.count); + else + ImGui::TextDisabled("(%s)", source.message.c_str()); + ImGui::PopID(); + } + // the materials of the chosen files + std::vector counts(conversion.names.size(), 0); + for (auto const &source : conversion.files) + if (source.good && source.chosen) + for (auto index = source.first; index < source.first + source.count; ++index) + ++counts[conversion.materials[index]]; + if (false == conversion.names.empty()) + ImGui::TextUnformatted(STR_C("Materials: tick the ones which are the ground")); + for (std::size_t index = 0; index < conversion.names.size(); ++index) + { + if (counts[index] == 0) + continue; + bool chosen{conversion.chosen.count(index) != 0}; + ImGui::PushID(static_cast(index) + 0x10000); + if (ImGui::Checkbox(format(STR_C("%s (%zu triangles)"), conversion.names[index].c_str(), counts[index]).c_str(), &chosen)) { if (chosen) - conversion.chosen.insert(entry.first); + conversion.chosen.insert(index); else - conversion.chosen.erase(entry.first); + conversion.chosen.erase(index); } ImGui::PopID(); } - ImGui::TextWrapped("%s", STR_C("The chunks are covered with the material which covers the most, added to the palette of the terrain. Until saved, loading the scenery again takes it all back.")); - if (conversion.chosen.empty()) - ImGui::TextDisabled("%s", STR_C("Tick at least one material")); - else if (ImGui::Button(STR_C("Convert"))) + ImGui::TextWrapped("%s", STR_C("The chunks are painted with the materials of the triangles, up to 8 of them per chunk, added to the palette of the terrain. " + "Until saved, loading the scenery again takes it all back.")); + auto const ready{std::any_of(conversion.files.begin(), conversion.files.end(), [](auto const &Source) { return Source.good && Source.chosen; }) && false == conversion.chosen.empty()}; + ImGui::BeginDisabled(false == ready); + if (ImGui::Button(STR_C("Convert"))) { - conversion.status = convert_ground(conversion.chosen); + conversion.status = convert_ground(); conversion.open = false; profile_resample(); } + ImGui::EndDisabled(); ImGui::SameLine(); if (ImGui::Button(STR_C("Cancel"))) conversion.open = false; + if (false == conversion.open) + { + // the triangles take memory, they're read again the next time + conversion.triangles = {}; + conversion.materials = {}; + } + ImGui::PopID(); } void editor_mode::render_profile_earthworks() diff --git a/application/editormodeselftest.cpp b/application/editormodeselftest.cpp index c44fd133a..3052df406 100644 --- a/application/editormodeselftest.cpp +++ b/application/editormodeselftest.cpp @@ -72,6 +72,10 @@ http://mozilla.org/MPL/2.0/. // spread logs the paths the spread from the track takes // newscenery the editor starts again with the wizard of a new scenery // vehicles logs each vehicle: its head, facing, and what its couplers hold +// terrainmode the terrain field of work, with its texture browser +// terrainsculpt , terrainpaint as a stroke of the brush +// terrainprobe logs the height of the heightmap terrain and the materials of the chunk +// terrainconvert converts every material of the terrain files of the scenery // screenshot // save // log @@ -1134,6 +1138,53 @@ void editor_mode::selftest_step() } } } + else if (command == "terrainmode") + { + m_terrain_open = true; + WriteLog("SELFTEST terrainmode"); + } + else if (command == "terrainsculpt" || command == "terrainpaint") + { + double x{0.0}, z{0.0}, radius{10.0}, value{1.0}; + words >> x >> z >> radius >> value; + auto const changed{command == "terrainsculpt" ? m_streamer.sculpt(x, z, radius, value) : m_streamer.paint(x, z, radius, 1.0, static_cast(value))}; + forget_ground(); + WriteLog(format("SELFTEST %s %.1f %.1f: %s", command.c_str(), x, z, changed ? "changed" : "nothing changed")); + } + else if (command == "terrainprobe") + { + double x{0.0}, z{0.0}, height{0.0}; + words >> x >> z; + auto const *chunk{m_streamer.terrain_at(x, z)}; + std::string materials; + if (chunk != nullptr) + for (std::size_t slot = 0; slot < std::max(1, chunk->data().layer_count()); ++slot) + { + auto const layer{chunk->data().layers[slot]}; + auto const &palette{m_streamer.manifest().layers}; + materials += (layer < palette.size() ? palette[layer].material : std::string{"?"}) + " "; + } + auto const found{m_streamer.height_at(x, z, height)}; + WriteLog(format("SELFTEST terrainprobe %.1f %.1f: %s %.3f, %zu chunks, materials %s", x, z, found ? "height" : "no terrain", height, m_streamer.resident(), materials.c_str())); + } + else if (command == "terrainconvert") + { + load_ground_files(); + for (auto const &source : m_ground_conversion.files) + { + glm::dvec3 low{1e30}, high{-1e30}; + for (auto index = source.first; index < source.first + source.count; ++index) + for (auto const &vertex : m_ground_conversion.triangles[index]) + { + low = glm::min(low, vertex); + high = glm::max(high, vertex); + } + WriteLog("SELFTEST terrain file " + source.file + (source.text ? " (text): " : " (binary): ") + source.message + + format(", from %.1f %.1f %.1f to %.1f %.1f %.1f", low.x, low.y, low.z, high.x, high.y, high.z)); + } + m_ground_conversion.status = convert_ground(); + WriteLog("SELFTEST terrainconvert: " + m_ground_conversion.status); + } else if (command == "quit") { if (false == test.quitting) diff --git a/application/editormodetextures.cpp b/application/editormodetextures.cpp new file mode 100644 index 000000000..f18dff0af --- /dev/null +++ b/application/editormodetextures.cpp @@ -0,0 +1,279 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "application/editormode.h" +#include "rendering/renderer.h" +#include "utilities/Globals.h" +#include "utilities/utilities.h" +#include "utilities/translation.h" +#include "imgui/imgui.h" +#include +#include +#include +#include +#include +#include + +namespace +{ + +// payload of a material dragged from the texture browser: its name, with the terminating zero +char const *const material_payload{"EU07_MATERIAL"}; + +// files the browser shows: textures, and the materials, which are kept with them +bool texture_file(std::string const &Extension) +{ + return Extension == ".dds" || Extension == ".tga" || Extension == ".png" || Extension == ".bmp" || Extension == ".jpg" || Extension == ".ktx" || Extension == ".tex"; +} + +std::string lowercase(std::string Text) +{ + std::transform(Text.begin(), Text.end(), Text.begin(), [](unsigned char const Character) { return static_cast(std::tolower(Character)); }); + return Text; +} + +// the text cut to fit the width, with an ellipsis +std::string fitted(std::string const &Text, float const Width) +{ + if (ImGui::CalcTextSize(Text.c_str()).x <= Width) + return Text; + auto result{Text}; + while (false == result.empty() && ImGui::CalcTextSize((result + "...").c_str()).x > Width) + result.pop_back(); + return result + "..."; +} + +} // namespace + +bool editor_mode::material_drop(std::string &Name) +{ + if (false == ImGui::BeginDragDropTarget()) + return false; + auto dropped{false}; + if (auto const *payload{ImGui::AcceptDragDropPayload(material_payload)}) + { + auto const *data{static_cast(payload->Data)}; + Name.assign(data, std::find(data, data + payload->DataSize, '\0')); + dropped = false == Name.empty(); + } + ImGui::EndDragDropTarget(); + return dropped; +} + +bool editor_mode::material_drop(char *Buffer, std::size_t const Size) +{ + std::string name; + if (Size == 0 || false == material_drop(name)) + return false; + auto const length{std::min(name.size(), Size - 1)}; + std::memcpy(Buffer, name.data(), length); + Buffer[length] = '\0'; + return true; +} + +std::uint64_t editor_mode::texture_thumbnail(texture_browser::item const &Item) +{ + auto &browser{m_textures}; + auto lookup{browser.thumbnails.find(Item.name)}; + if (lookup == browser.thumbnails.end()) + { + // reading a texture takes a moment, a few of them go in a frame + if (browser.loads >= 2) + return 0; + ++browser.loads; + texture_handle texture{null_handle}; + if (Item.material) + { + auto const material{GfxRenderer->Fetch_Material(Item.name)}; + if (auto const *data{GfxRenderer->Material(material)}; material != null_handle && data != nullptr) + texture = data->GetTexture(0); + } + else + texture = GfxRenderer->Fetch_Texture(Item.name, true); + lookup = browser.thumbnails.emplace(Item.name, texture).first; + } + if (lookup->second == null_handle) + return 0; + auto &texture{GfxRenderer->Texture(lookup->second)}; + if (false == texture.get_is_ready()) + texture.create(); + return texture.get_is_ready() ? static_cast(texture.get_id()) : 0; +} + +void editor_mode::render_texture_browser() +{ + auto &browser{m_textures}; + browser.loads = 0; + if (false == browser.listed) + { + browser.listed = true; + browser.folders.clear(); + browser.items.clear(); + std::map items; + std::error_code error; + for (std::filesystem::directory_iterator entry{std::string{paths::textures} + browser.folder, error}, end; false == static_cast(error) && entry != end; entry.increment(error)) + { + auto const path{entry->path()}; + if (entry->is_directory(error)) + { + browser.folders.push_back(path.filename().string()); + continue; + } + auto const extension{lowercase(path.extension().string())}; + auto const material{extension == ".mat"}; + if (false == material && false == texture_file(extension)) + continue; + auto const stem{path.stem().string()}; + auto &item{items[stem]}; + item.name = browser.folder + stem; + item.label = stem; + item.material |= material; + } + for (auto &item : items) + browser.items.push_back(std::move(item.second)); + std::sort(browser.folders.begin(), browser.folders.end()); + } + + // where the browser is, and the folders under it + ImGui::BeginDisabled(browser.folder.empty()); + if (ImGui::Button(STR_C("Up"))) + { + auto folder{browser.folder}; + if (false == folder.empty()) + folder.pop_back(); + auto const slash{folder.rfind('/')}; + browser.folder = (slash == std::string::npos ? std::string{} : folder.substr(0, slash + 1)); + browser.listed = false; + } + ImGui::EndDisabled(); + ImGui::SameLine(); + if (ImGui::Button(STR_C("Refresh"))) + { + browser.listed = false; + browser.thumbnails.clear(); + } + ImGui::SameLine(); + ImGui::TextUnformatted((std::string{paths::textures} + browser.folder).c_str()); + ImGui::SetNextItemWidth(std::max(80.0f, ImGui::GetContentRegionAvail().x * 0.5f)); + ImGui::InputTextWithHint("##texturefilter", STR_C("Filter"), browser.filter, IM_ARRAYSIZE(browser.filter)); + ImGui::SameLine(); + ImGui::SetNextItemWidth(std::max(60.0f, ImGui::GetContentRegionAvail().x)); + ImGui::SliderFloat("##texturesize", &browser.size, 48.0f, 256.0f, "%.0f px"); + if (false == browser.folders.empty()) + { + // the folders flow along the width of the window + auto const right{ImGui::GetCursorScreenPos().x + ImGui::GetContentRegionAvail().x}; + for (std::size_t index = 0; index < browser.folders.size(); ++index) + { + auto const label{"[" + browser.folders[index] + "]"}; + auto const width{ImGui::CalcTextSize(label.c_str()).x + ImGui::GetStyle().FramePadding.x * 2.0f}; + if (index > 0) + { + ImGui::SameLine(); + if (ImGui::GetCursorScreenPos().x + width > right) + ImGui::NewLine(); + } + ImGui::PushID(static_cast(index)); + if (ImGui::SmallButton(label.c_str())) + { + browser.folder += browser.folders[index] + "/"; + browser.listed = false; + } + ImGui::PopID(); + } + if (false == browser.listed) + { + // the list is made anew in the next frame + return; + } + } + ImGui::Separator(); + + std::vector shown; + auto const filter{lowercase(browser.filter)}; + for (auto const &item : browser.items) + if (filter.empty() || lowercase(item.label).find(filter) != std::string::npos) + shown.push_back(&item); + if (shown.empty()) + { + ImGui::TextDisabled("%s", STR_C("No textures here")); + return; + } + ImGui::TextDisabled("%s", STR_C("Drag a texture onto a field of a material; double click: add it to the palette of the terrain")); + + ImGui::BeginChild("##texturecards"); + auto const &style{ImGui::GetStyle()}; + auto const side{std::max(16.0f, browser.size * std::max(1.0f, Global.ui_scale))}; + auto const cellheight{side + ImGui::GetTextLineHeight() + style.ItemInnerSpacing.y}; + auto const columns{std::max(1, static_cast((ImGui::GetContentRegionAvail().x + style.ItemSpacing.x) / (side + style.ItemSpacing.x)))}; + auto const rows{(static_cast(shown.size()) + columns - 1) / columns}; + auto *drawlist{ImGui::GetWindowDrawList()}; + ImGuiListClipper clipper; + clipper.Begin(rows, cellheight + style.ItemSpacing.y); + while (clipper.Step()) + { + for (int row = clipper.DisplayStart; row < clipper.DisplayEnd; ++row) + { + for (int column = 0; column < columns; ++column) + { + auto const index{static_cast(row) * columns + column}; + if (index >= shown.size()) + break; + auto const &item{*shown[index]}; + if (column > 0) + ImGui::SameLine(); + ImGui::PushID(item.name.c_str()); + ImGui::BeginGroup(); + auto const corner{ImGui::GetCursorScreenPos()}; + ImGui::InvisibleButton("##card", ImVec2(side, cellheight)); + auto const hovered{ImGui::IsItemHovered()}; + if (ImGui::IsItemClicked(ImGuiMouseButton_Left)) + { + browser.selected = item.name; + std::snprintf(m_terrain_material, IM_ARRAYSIZE(m_terrain_material), "%s", item.name.c_str()); + } + if (hovered && ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left) && m_streamer.active()) + m_terrain_layer = m_streamer.layer(item.name, m_terrain_material_size); + auto const texture{texture_thumbnail(item)}; + if (ImGui::BeginDragDropSource()) + { + ImGui::SetDragDropPayload(material_payload, item.name.c_str(), item.name.size() + 1); + if (texture != 0) + ImGui::Image(static_cast(texture), ImVec2(64.0f, 64.0f), ImVec2(0, 1), ImVec2(1, 0)); + ImGui::TextUnformatted(item.name.c_str()); + ImGui::EndDragDropSource(); + } + ImVec2 const low{corner.x, corner.y}, high{corner.x + side, corner.y + side}; + if (texture != 0) + drawlist->AddImage(static_cast(texture), low, high, ImVec2(0, 1), ImVec2(1, 0)); + else + { + drawlist->AddRectFilled(low, high, ImGui::GetColorU32(ImGuiCol_FrameBg)); + drawlist->AddText(ImVec2(low.x + style.FramePadding.x, low.y + style.FramePadding.y), ImGui::GetColorU32(ImGuiCol_TextDisabled), "..."); + } + if (item.material) + drawlist->AddText(ImVec2(low.x + style.FramePadding.x, high.y - ImGui::GetTextLineHeight() - style.FramePadding.y), IM_COL32(255, 220, 120, 255), "mat"); + if (browser.selected == item.name || hovered) + drawlist->AddRect(low, high, ImGui::GetColorU32(browser.selected == item.name ? ImGuiCol_ButtonActive : ImGuiCol_ButtonHovered), 0.0f, 0, 2.0f); + drawlist->AddText(ImVec2(low.x, high.y + style.ItemInnerSpacing.y), ImGui::GetColorU32(ImGuiCol_Text), fitted(item.label, side).c_str()); + if (hovered) + { + ImGui::BeginTooltip(); + ImGui::TextUnformatted(item.name.c_str()); + ImGui::TextDisabled("%s", item.material ? STR_C("material") : STR_C("texture")); + ImGui::EndTooltip(); + } + ImGui::EndGroup(); + ImGui::PopID(); + } + } + } + ImGui::EndChild(); +} diff --git a/application/editoruilayer.h b/application/editoruilayer.h index deb58bfb5..020fd4be6 100644 --- a/application/editoruilayer.h +++ b/application/editoruilayer.h @@ -128,6 +128,13 @@ class editor_ui : public ui_layer void set_workspace(workspace const Workspace) { m_workspace = Workspace; + auto const &bank{m_workspacebank[static_cast(Workspace)]}; + m_nodebankpanel.stand_in(bank.first, bank.second); + } + // content of the window of the node bank while the field of work is chosen, in place of the node bank + void set_workspace_bank(workspace const Workspace, std::function Content, std::string Title) + { + m_workspacebank[static_cast(Workspace)] = {std::move(Content), std::move(Title)}; } void set_workspace_options(workspace const Workspace, std::function Tools, std::function Selection = {}) { @@ -205,6 +212,7 @@ class editor_ui : public ui_layer workspace m_workspace{workspace::none}; std::array, static_cast(workspace::count_)> m_workspacetools; std::array, static_cast(workspace::count_)> m_workspaceselection; + std::array, std::string>, static_cast(workspace::count_)> m_workspacebank; // scene window: the models of the scenery by layer and group, rebuilt when their number changes struct scene_entry { diff --git a/application/editoruipanels.cpp b/application/editoruipanels.cpp index 2e177f427..79808c2d6 100644 --- a/application/editoruipanels.cpp +++ b/application/editoruipanels.cpp @@ -934,6 +934,14 @@ void nodebank_panel::render() { ImGui::SetNextWindowSizeConstraints(ImVec2S(size_min.x, size_min.y), ImVec2S(size_max.x, size_max.y)); } + if (m_standin) + { + // the same window, so it keeps its place in the dock + if (ImGui::Begin((m_standintitle + "###" + name()).c_str(), nullptr, flags)) + m_standin(); + ImGui::End(); + return; + } auto const panelname{(title.empty() ? name() : title) + "###" + name()}; if (true == ImGui::Begin(panelname.c_str(), nullptr, flags)) diff --git a/application/editoruipanels.h b/application/editoruipanels.h index dbb3f8bc8..f79946b4b 100644 --- a/application/editoruipanels.h +++ b/application/editoruipanels.h @@ -156,6 +156,13 @@ class nodebank_panel : public ui_panel std::string set_name(model_set_ref const &Ref, char const *Manuallabel) const; // shows the set manager window, optionally with specified user set selected void open_sets_window(int const Setid = 0); + // content drawn in the window of the node bank in its place, with its own title (a field of work of the editor uses the window + // for its own browser); none: the node bank + void stand_in(std::function Content, std::string Title) + { + m_standin = std::move(Content); + m_standintitle = std::move(Title); + } private: @@ -183,6 +190,8 @@ class nodebank_panel : public ui_panel // true if the node bank selection is a definition of a node, which the hand-made lists and the model sets can take bool node_selected() const; // members: + std::function m_standin; + std::string m_standintitle; std::vector>> m_nodebank; char m_nodesearch[128]; std::shared_ptr m_selectedtemplate; @@ -295,4 +304,4 @@ class functions_panel : public ui_panel scene::group_handle m_grouphandle{null_handle}; // scene group bound to the panel std::string m_groupprefix; std::vector m_grouplines; -}; \ No newline at end of file +}; \ No newline at end of file diff --git a/editor/editorGroundMesh.hpp b/editor/editorGroundMesh.hpp index 068b3fbbb..4fc3f10bd 100644 --- a/editor/editorGroundMesh.hpp +++ b/editor/editorGroundMesh.hpp @@ -120,13 +120,15 @@ class ground_mesh } private: + // NOTE: clamped before the conversion: a rectangle asked about can reach far beyond the mesh (to infinity even), + // and a float out of the range of int doesn't turn into anything sensible int column(float const X) const { - return std::clamp(static_cast(std::floor((X - m_low.x) / m_cellsize)), 0, m_columns - 1); + return static_cast(std::clamp(std::floor((X - m_low.x) / m_cellsize), 0.f, static_cast(m_columns - 1))); } int row(float const Z) const { - return std::clamp(static_cast(std::floor((Z - m_low.y) / m_cellsize)), 0, m_rows - 1); + return static_cast(std::clamp(std::floor((Z - m_low.y) / m_cellsize), 0.f, static_cast(m_rows - 1))); } // cells the bounds of a triangle reach: first column, first row, last column, last row std::array cells(triangle const &Triangle) const diff --git a/editor/editorTerrainStreamer.cpp b/editor/editorTerrainStreamer.cpp index 482f436ab..a6b8606d2 100644 --- a/editor/editorTerrainStreamer.cpp +++ b/editor/editorTerrainStreamer.cpp @@ -136,6 +136,8 @@ void terrain_streamer::close() m_loading.clear(); m_removed.clear(); m_palette.clear(); + m_recording = 0; + m_change = change(); m_active = false; m_name.clear(); m_directory.clear(); @@ -159,6 +161,8 @@ void terrain_streamer::reset() m_removed.clear(); m_palette.clear(); clear_water(false); + m_recording = 0; + m_change = change(); m_active = false; m_name.clear(); m_directory.clear(); @@ -898,6 +902,24 @@ bool terrain_streamer::add_chunk(int Cx, int Cz, float Spacing, std::functioncells; ++iz) for (int ix = 0; ix <= data->cells; ++ix) data->heights[static_cast(iz) * data->side() + ix] = Height(low.x + ix * step, low.y + iz * step); + return add_chunk(std::move(data)); +} + +bool terrain_streamer::add_chunk(std::shared_ptr Data) +{ + if (Data == nullptr || false == Data->valid()) + return false; + auto const key{Data->key}; + if (false == m_active || load_now(key) != nullptr || m_chunks.count(key) > 0) + return false; + if (false == in_region(glm::dvec2{chunk_centre(key).x, chunk_centre(key).z})) + return false; + for (auto &layer : Data->layers) + if (layer != heightmap::no_layer && layer >= m_manifest.layers.size()) + layer = 0; + auto data{std::move(Data)}; + auto const low{data->corner()}; + remember(key, nullptr); auto chunk{std::make_unique(std::move(data))}; chunk->m_modified = true; auto const [lowest, highest]{std::minmax_element(chunk->heights().begin(), chunk->heights().end())}; @@ -915,6 +937,12 @@ bool terrain_streamer::add_chunk(int Cx, int Cz, float Spacing, std::functioncells()) return; + remember(*chunk); chunk->replace(chunk->data().resampled(Spacing), true, false); auto const low{chunk->data().corner()}; apply_modifiers(*chunk, low, low + glm::dvec2{heightmap::chunk_size}); @@ -957,6 +986,7 @@ bool terrain_streamer::reshape(glm::dvec2 const &Min, glm::dvec2 const &Max, std shaped |= Shaper(low.x + ix * step, low.y + iz * step, heights[static_cast(iz) * current.side() + ix]); if (false == shaped) continue; + remember(*chunk); auto &data{chunk->edit(true, false)}; (data.base.empty() ? data.heights : data.base) = std::move(heights); if (false == data.base.empty()) @@ -1081,6 +1111,7 @@ bool terrain_streamer::paint(double X, double Z, double Radius, double Strength, if (false == painted) continue; data->compact_layers(); + remember(*chunk); chunk->replace(std::move(data), false, true); changed = true; } @@ -1092,6 +1123,7 @@ std::uint16_t terrain_streamer::layer(std::string const &Material, float const S for (std::size_t i = 0; i < m_manifest.layers.size(); ++i) if (m_manifest.layers[i].material == Material && (Size <= 0.f || m_manifest.layers[i].size == Size)) return static_cast(i); + remember_manifest(); m_manifest.layers.push_back({Material, std::max(0.f, Size)}); m_manifestchanged = true; return static_cast(m_manifest.layers.size() - 1); @@ -1101,6 +1133,7 @@ void terrain_streamer::layer_size(std::uint16_t const Layer, float const Size) { if (Layer >= m_manifest.layers.size() || m_manifest.layers[Layer].size == Size) return; + remember_manifest(); m_manifest.layers[Layer].size = std::max(0.f, Size); m_manifestchanged = true; // the materials of the chunks using it are made again @@ -1109,6 +1142,19 @@ void terrain_streamer::layer_size(std::uint16_t const Layer, float const Size) entry.second->m_paintedversion = 0; } +void terrain_streamer::layer_material(std::uint16_t const Layer, std::string const &Material) +{ + if (Layer >= m_manifest.layers.size() || Material.empty() || m_manifest.layers[Layer].material == Material) + return; + remember_manifest(); + m_manifest.layers[Layer].material = Material; + m_manifestchanged = true; + m_palette.erase(Layer); + for (auto &entry : m_chunks) + if (entry.second->data().slot_of(Layer) >= 0 || (Layer == 0 && entry.second->data().layer_count() == 0)) + entry.second->m_paintedversion = 0; +} + void terrain_streamer::compress(bool const State) { if (m_manifest.compress == State) @@ -1128,6 +1174,7 @@ void terrain_streamer::default_spacing(float const Spacing) void terrain_streamer::water(std::vector Water) { + remember_manifest(); m_manifest.water = std::move(Water); m_manifestchanged = true; m_waterchanged = true; @@ -1155,12 +1202,14 @@ void terrain_streamer::apply_modifiers(editor_terrain &Chunk, glm::dvec2 const & // no modifier reaches the chunk (any more): its own heights are what's left if (false == current.base.empty()) { + remember(Chunk); auto &data{Chunk.edit(true, false)}; data.heights = std::move(data.base); data.base.clear(); } return; } + remember(Chunk); auto &data{Chunk.edit(true, false)}; if (data.base.empty()) data.base = data.heights; @@ -1187,6 +1236,7 @@ void terrain_streamer::apply_modifiers(glm::dvec2 const &Min, glm::dvec2 const & void terrain_streamer::modifier(heightmap::modifier Modifier) { + remember_manifest(); auto bounds{Modifier.bounds()}; auto const existing{std::find_if(m_manifest.modifiers.begin(), m_manifest.modifiers.end(), [&](heightmap::modifier const &Item) { return Item.name == Modifier.name; })}; if (existing != m_manifest.modifiers.end()) @@ -1208,6 +1258,7 @@ bool terrain_streamer::remove_modifier(std::string const &Name) auto const existing{std::find_if(m_manifest.modifiers.begin(), m_manifest.modifiers.end(), [&](heightmap::modifier const &Item) { return Item.name == Name; })}; if (existing == m_manifest.modifiers.end()) return false; + remember_manifest(); auto const bounds{existing->bounds()}; m_manifest.modifiers.erase(existing); m_manifestchanged = true; @@ -1222,6 +1273,103 @@ bool terrain_streamer::modified() const return std::any_of(m_chunks.begin(), m_chunks.end(), [](auto const &Entry) { return Entry.second->modified(); }); } +// undo + +void terrain_streamer::begin_change() +{ + if (m_recording++ == 0) + m_change = change(); +} + +terrain_streamer::change terrain_streamer::end_change() +{ + if (m_recording == 0) + return change(); + if (--m_recording > 0) + return change(); // the outer change goes on + change result{std::move(m_change)}; + m_change = change(); + return result; +} + +void terrain_streamer::remember(chunk_key const &Key, heightmap::chunk_ptr const &Data) +{ + if (m_recording > 0) + m_change.chunks.emplace(Key, Data); // only the first state counts +} + +void terrain_streamer::remember_manifest() +{ + if (m_recording == 0 || m_change.manifest) + return; + m_change.manifest = true; + m_change.layers = m_manifest.layers; + m_change.water = m_manifest.water; + m_change.modifiers = m_manifest.modifiers; +} + +terrain_streamer::change terrain_streamer::restore(change const &Change) +{ + change opposite; + if (false == m_active) + return opposite; + for (auto const &[key, data] : Change.chunks) + { + auto *current{load_now(key)}; + opposite.chunks.emplace(key, current != nullptr ? current->shared() : nullptr); + if (data == nullptr) + { + if (current != nullptr) + { + undraw(*current); + m_chunks.erase(key); + m_removed.insert(key); + touch_neighbours(key); + } + continue; + } + if (current != nullptr) + { + current->replace(data, true, true); + } + else + { + auto chunk{std::make_unique(data)}; + chunk->m_modified = true; + auto const [low, high]{std::minmax_element(chunk->heights().begin(), chunk->heights().end())}; + auto const corner{data->corner()}; + chunk->m_low = {corner.x, *low, corner.y}; + chunk->m_high = {corner.x + heightmap::chunk_size, *high, corner.y + heightmap::chunk_size}; + m_chunks.emplace(key, std::move(chunk)); + m_removed.erase(key); + m_loading.erase(key); + } + touch_neighbours(key); + } + if (Change.manifest) + { + opposite.manifest = true; + opposite.layers = m_manifest.layers; + opposite.water = m_manifest.water; + opposite.modifiers = m_manifest.modifiers; + auto const samelayers{std::equal(Change.layers.begin(), Change.layers.end(), m_manifest.layers.begin(), m_manifest.layers.end(), + [](heightmap::layer_def const &A, heightmap::layer_def const &B) { return A.material == B.material && A.size == B.size; })}; + m_manifest.layers = Change.layers; + m_manifest.modifiers = Change.modifiers; + m_manifest.water = Change.water; + m_manifestchanged = true; + m_waterchanged = true; + if (false == samelayers) + { + // the materials of the chunks are made anew from the palette as it was + m_palette.clear(); + for (auto &entry : m_chunks) + entry.second->m_paintedversion = 0; + } + } + return opposite; +} + bool terrain_streamer::save(std::string *Error) { if (false == m_active) diff --git a/editor/editorTerrainStreamer.hpp b/editor/editorTerrainStreamer.hpp index 90eac7ffe..2e99e449f 100644 --- a/editor/editorTerrainStreamer.hpp +++ b/editor/editorTerrainStreamer.hpp @@ -84,6 +84,8 @@ class terrain_streamer bool add_chunk(int Cx, int Cz, float Spacing, float Height, std::uint16_t Layer = 0); // a chunk at (Cx, Cz), heights given for each grid point by Height (from its world position) bool add_chunk(int Cx, int Cz, float Spacing, std::function const &Height, std::uint16_t Layer = 0); + // a chunk made elsewhere, at the place its key says; its layers are indices of the palette + bool add_chunk(std::shared_ptr Data); void remove_chunk(int Cx, int Cz); // changes the point spacing of the chunk at (Cx, Cz), heights resampled void spacing(int Cx, int Cz, float Spacing); @@ -99,6 +101,8 @@ class terrain_streamer // palette entry of the material, added to the palette if needed std::uint16_t layer(std::string const &Material, float Size = 0.f); void layer_size(std::uint16_t Layer, float Size); + // gives the palette entry Layer another material; the chunks painted with it change with it + void layer_material(std::uint16_t Layer, std::string const &Material); void compress(bool State); void default_spacing(float Spacing); // bodies of water @@ -110,6 +114,26 @@ class terrain_streamer std::vector const &modifiers() const { return m_manifest.modifiers; } // changed since the last save bool modified() const; + + // undo: the state of what a change touched, from before it + struct change + { + std::map chunks; // the data the chunks had; null: there was no chunk + bool manifest{false}; // the palette, the water and the modifiers below were changed + std::vector layers; + std::vector water; + std::vector modifiers; + + bool empty() const { return chunks.empty() && false == manifest; } + }; + // from now on the state of what's changed is kept, until end_change(); nested calls join the change in progress + void begin_change(); + // returns: the state from before the changes made since begin_change() (empty if nothing changed) + change end_change(); + bool recording() const { return m_recording > 0; } + // puts the terrain back in the state recorded. returns: the state it replaced, to go forward again + change restore(change const &Change); + // writes the description and the changed pack files. returns: true on success, Error describing the failure bool save(std::string *Error = nullptr); @@ -200,6 +224,10 @@ class terrain_streamer void build_water(); void clear_water(bool const Touch); std::string pack_path(heightmap::pack_key const &Key) const; + // the state of a chunk (null: no chunk) or of the description is kept for the change in progress, if it's the first time + void remember(chunk_key const &Key, heightmap::chunk_ptr const &Data); + void remember(editor_terrain const &Chunk) { remember(Chunk.key(), Chunk.shared()); } + void remember_manifest(); bool m_active{false}; std::string m_name; @@ -221,6 +249,9 @@ class terrain_streamer gfx::geometrybank_handle m_waterbank{0, 0}; bool m_waterchanged{false}; + int m_recording{0}; + change m_change; + glm::dvec3 m_camera{0.0}; glm::dvec3 m_velocity{0.0}; double m_cameratime{0.0}; diff --git a/rendering/opengl33terrain.cpp b/rendering/opengl33terrain.cpp index 48faccfe0..35c3fd61d 100644 --- a/rendering/opengl33terrain.cpp +++ b/rendering/opengl33terrain.cpp @@ -329,11 +329,24 @@ bool opengl33_terrain_materials::copy_layer(layer &Layer) if (slots[i] < 0 || material.textures[slots[i]] == null_handle) continue; auto &texture{m_textures.mark_as_used(material.textures[slots[i]])}; - if (false == texture.create()) + if (false == texture.is_ready) { - if (++Layer.attempts < copy_attempts) - return false; - continue; // waited long enough, the layer goes without it + // a texture which is on the card already may have dropped its data after the upload (create() would refuse it then), + // one released by the sweep or never read has to be read first + if (texture.data_state == resource_state::none) + { + texture.reload_on_use = false; + texture.load(); + } + if (texture.data_state == resource_state::failed) + continue; + if (false == texture.create()) + { + if (++Layer.attempts < copy_attempts) + return false; + WriteLog("heightmap terrain: texture \"" + texture.name + "\" isn't ready, the terrain goes without it"); + continue; // waited long enough, the layer goes without it + } } sources[i] = &texture; } diff --git a/scene/scenelayers.cpp b/scene/scenelayers.cpp index 78a018953..b735e3447 100644 --- a/scene/scenelayers.cpp +++ b/scene/scenelayers.cpp @@ -499,12 +499,12 @@ void node_layers::shape(material_handle const Material, source_span const &Span) m_shapes.push_back({current, Span, Material, false}); } -std::pair node_layers::erase_shapes(std::set const &Materials) +std::pair node_layers::erase_shapes(std::set const &Materials, std::set const *Layers) { std::pair result{0, 0}; for (auto &shape : m_shapes) { - if (shape.erased || Materials.count(shape.material) == 0) + if (shape.erased || Materials.count(shape.material) == 0 || (Layers != nullptr && Layers->count(shape.layer) == 0)) { continue; } diff --git a/scene/scenelayers.h b/scene/scenelayers.h index fc5ec082d..daf3c587a 100644 --- a/scene/scenelayers.h +++ b/scene/scenelayers.h @@ -267,9 +267,9 @@ class node_layers { return m_shapes; } - // drops the definitions of the shapes of specified materials from the writable layer files on save. + // drops the definitions of the shapes of specified materials from the writable layer files on save; only from specified layers, if given. // returns: amount of the shapes to drop, and of the ones which stay as their files can't be rewritten - std::pair erase_shapes(std::set const &Materials); + std::pair erase_shapes(std::set const &Materials, std::set const *Layers = nullptr); // indicates the scenario initialization (FirstInit) is being performed. Span: location of the directive. // Infile: the directive comes straight from the layer file being loaded void initialization(source_span const &Span, bool Infile); diff --git a/scene/scenenode.cpp b/scene/scenenode.cpp index 18f9e0476..301b6ea18 100644 --- a/scene/scenenode.cpp +++ b/scene/scenenode.cpp @@ -429,7 +429,9 @@ bool shape_node::merge( shape_node &Shape ) { if( m_data.material != Shape.m_data.material - || m_data.lighting != Shape.m_data.lighting ) { + || m_data.lighting != Shape.m_data.lighting + || m_data.terrainfile != Shape.m_data.terrainfile ) { + // (shapes of different terrain files are kept apart, so the editor can tell which file the geometry comes from) // can't merge nodes with different appearance return false; } diff --git a/scene/scenenode.h b/scene/scenenode.h index b7fa9fdaf..48dad5b6f 100644 --- a/scene/scenenode.h +++ b/scene/scenenode.h @@ -99,6 +99,8 @@ public: gfx::geometry_handle geometry { 0, 0 }; // relative origin-centered chunk of geometry held by gfx renderer std::vector vertices; // world space source data of the geometry gfx::userdata_array userdata; + // terrain file the shape comes from, see scene::terrain_file::reference_of(); 0: none, or not known (only the editor asks) + std::uint16_t terrainfile { 0 }; // methods: // sends content of the struct to provided stream void @@ -152,6 +154,9 @@ public: // sets whether the shape is drawn with the translucent geometry (used by generated geometry) void translucent( bool const Translucent ); + // notes the terrain file the shape comes from + void + source_file( std::uint16_t const Reference ) { m_data.terrainfile = Reference; } // data access shapenode_data const & data() const; diff --git a/scene/sceneterrain.cpp b/scene/sceneterrain.cpp index db0135d3c..d0453f2b3 100644 --- a/scene/sceneterrain.cpp +++ b/scene/sceneterrain.cpp @@ -23,6 +23,8 @@ http://mozilla.org/MPL/2.0/. #include #include #include +#include +#include #include /* @@ -75,6 +77,7 @@ struct terrain_source }; std::string file; std::vector materials; + std::uint16_t reference{0}; // see terrain_file::reference_of() }; namespace @@ -739,6 +742,233 @@ std::string terrain_file::extra(std::string const &Binaryfile) return text; } +std::vector &terrain_file::references() +{ + static std::vector references; + return references; +} + +std::uint16_t terrain_file::reference_of(std::string const &File) +{ + auto file{File}; + replace_slashes(file); + auto const &list{references()}; + for (std::size_t index{0}; index < list.size() && index < std::numeric_limits::max(); ++index) + { + auto const base{Global.asCurrentSceneryPath + list[index].file}; + if (file.ends_with(base + ".txtf") || file.ends_with(base + ".btf")) + { + return static_cast(index + 1); + } + } + return 0; +} + +namespace +{ + +// world position of a vertex of a shape placed with specified rotation and offset, the way basic_region::insert() does it +glm::dvec3 place_vertex(glm::dvec3 Position, glm::vec3 const &Rotation, glm::dvec3 const &Offset) +{ + if (Rotation != glm::vec3(0.f)) + { + auto const rotation{glm::radians(glm::dvec3{Rotation})}; + Position = glm::rotateZ(Position, rotation.z); + Position = glm::rotateX(Position, rotation.x); + Position = glm::rotateY(Position, rotation.y); + } + return Position + Offset; +} + +bool read_text_triangles(std::string const &Text, terrain_reference const &Reference, terrain_file::triangle_visitor const &Visit, std::string &Message) +{ + conversion_scope scope; + std::stack offsets; + offsets.push(Reference.offset); + auto rotation{Reference.rotation}; + std::size_t count{0}; + cParser input{Text, cParser::buffer_TEXT}; + input.expandIncludes = false; + auto token{input.getToken()}; + while (false == token.empty()) + { + if (token == "node") + { + node_data nodedata; + input.getTokens(4); + input >> nodedata.range_max >> nodedata.range_min >> nodedata.name >> nodedata.type; + if (nodedata.type == "triangles" || nodedata.type == "triangle_strip" || nodedata.type == "triangle_fan") + { + auto const shape{shape_node().import(input, nodedata)}; + auto const &data{shape.data()}; + auto const *material{GfxRenderer->Material(data.material)}; + auto const name{material != nullptr ? material->GetName() : std::string{}}; + for (std::size_t index{0}; index + 2 < data.vertices.size(); index += 3) + { + Visit(name, {place_vertex(data.vertices[index].position, rotation, offsets.top()), place_vertex(data.vertices[index + 1].position, rotation, offsets.top()), + place_vertex(data.vertices[index + 2].position, rotation, offsets.top())}); + ++count; + } + } + else + { + // anything else the file holds (the editor keeps sweeps there) is of no interest here + auto const end{"end" + nodedata.type}; + auto rest{input.getToken()}; + while (false == rest.empty() && rest != end) + rest = input.getToken(); + } + } + else if (token == "origin") + { + glm::dvec3 offset; + input.getTokens(3); + input >> offset.x >> offset.y >> offset.z; + offsets.push(offset + offsets.top()); + } + else if (token == "endorigin") + { + if (offsets.size() > 1) + { + offsets.pop(); + } + } + else if (token == "rotate") + { + input.getTokens(3); + input >> rotation.x >> rotation.y >> rotation.z; + } + token = input.getToken(); + } + Message = std::to_string(count) + " triangle(s)"; + return true; +} + +bool read_binary_triangles(std::string const &Binaryfile, terrain_file::triangle_visitor const &Visit, std::string &Message) +{ + std::string content; + if (false == read_file(Binaryfile, content)) + { + Message = "can't read the file"; + return false; + } + std::istringstream stream{content}; + file_header header; + if (false == read_header(stream, header)) + { + Message = "the file is of either unrecognized type or version"; + return false; + } + std::vector materials; + for (std::uint32_t index{0}; index < header.materialcount; ++index) + { + std::string name; + if (false == static_cast(std::getline(stream, name, '\0'))) + { + Message = "the file is damaged"; + return false; + } + materials.emplace_back(std::move(name)); + } + auto const directorystart{static_cast(stream.tellg())}; + std::size_t const entrysize{sizeof(std::uint32_t) + sizeof(std::uint64_t) + sizeof(std::uint32_t) + sizeof(float)}; + if (directorystart > content.size() || content.size() - directorystart < header.sectioncount * entrysize) + { + Message = "the file is damaged"; + return false; + } + data_reader directory{content.data() + directorystart, header.sectioncount * entrysize}; + std::size_t count{0}; + for (std::uint32_t entry{0}; entry < header.sectioncount; ++entry) + { + auto const sectionindex{directory.get()}; + auto const offset{directory.get()}; + auto const size{directory.get()}; + directory.get(); + if (false == directory.good() || offset > content.size() || content.size() - offset < size) + { + Message = "the file is damaged"; + return false; + } + // the vertices are relative to the centre of their section, see attach() + auto const column{static_cast(sectionindex % EU07_REGIONSIDESECTIONCOUNT)}; + auto const row{static_cast(sectionindex / EU07_REGIONSIDESECTIONCOUNT)}; + auto const centeroffset{-(EU07_REGIONSIDESECTIONCOUNT / 2 * EU07_SECTIONSIZE) + EU07_SECTIONSIZE / 2}; + glm::dvec3 const centre{static_cast(centeroffset + column * EU07_SECTIONSIZE), 0.0, static_cast(centeroffset + row * EU07_SECTIONSIZE)}; + data_reader reader{content.data() + offset, size}; + if (reader.get() != EU07_TERRAINBLOCK) + { + Message = "the file is damaged"; + return false; + } + reader.get(); // section index + auto shapecount{reader.get()}; + while (shapecount-- > 0 && reader.good()) + { + auto const materialindex{reader.get()}; + // cell, ranges, colours, centre and radius + reader.skip(sizeof(std::uint32_t) + 2 * sizeof(double) + 12 * sizeof(float) + 3 * sizeof(double) + sizeof(float)); + auto const vertexcount{reader.get()}; + if (false == reader.good() || false == reader.has(static_cast(vertexcount) * EU07_TERRAINVERTEXSIZE) || materialindex >= materials.size()) + { + Message = "the file is damaged"; + return false; + } + std::array triangle; + for (std::uint32_t vertex{0}; vertex < vertexcount; ++vertex) + { + float values[8]; + reader.get(values, 8); + triangle[vertex % 3] = centre + glm::dvec3{values[0], values[1], values[2]}; + if (vertex % 3 == 2) + { + Visit(materials[materialindex], triangle); + ++count; + } + } + } + if (false == reader.good()) + { + Message = "the file is damaged"; + return false; + } + } + Message = std::to_string(count) + " triangle(s)"; + return true; +} + +} // namespace + +bool terrain_file::read_triangles(terrain_reference const &Reference, triangle_visitor const &Visit, std::string *Message, bool *Text) +{ + auto const textfile{Global.asCurrentSceneryPath + Reference.file + ".txtf"}; + auto const binaryfile{Global.asCurrentSceneryPath + Reference.file + ".btf"}; + std::string message; + auto result{false}; + auto const fromtext{FileExists(textfile)}; + if (fromtext) + { + std::string text; + result = read_file(textfile, text) && read_text_triangles(text, Reference, Visit, message); + if (message.empty()) + message = "can't read the file"; + } + else if (FileExists(binaryfile)) + { + // the binary file holds the geometry where the text alone puts it; it stands in for files placed without offset or rotation only + result = read_binary_triangles(binaryfile, Visit, message); + } + else + { + message = "the file is missing"; + } + if (Message != nullptr) + *Message = message; + if (Text != nullptr) + *Text = fromtext; + return result; +} + // makes content of specified binary terrain file a part of provided region bool terrain_file::attach(std::string const &Binaryfile, basic_region &Region, bool Deferred) { @@ -751,6 +981,7 @@ bool terrain_file::attach(std::string const &Binaryfile, basic_region &Region, b } auto source{std::make_shared()}; source->file = Binaryfile; + source->reference = reference_of(Binaryfile); source->materials.reserve(header.materialcount); for (std::uint32_t index{0}; index < header.materialcount; ++index) { @@ -878,6 +1109,7 @@ void terrain_file::load(basic_section &Section, terrain_block const &Block) } shapedata.material = material.handle; shapedata.translucent = material.translucent; + shapedata.terrainfile = source.reference; shapedata.vertices.resize(vertexcount); for (auto &vertex : shapedata.vertices) { diff --git a/scene/sceneterrain.h b/scene/sceneterrain.h index 07359fbd4..7291ed928 100644 --- a/scene/sceneterrain.h +++ b/scene/sceneterrain.h @@ -9,8 +9,12 @@ http://mozilla.org/MPL/2.0/. #pragma once +#include #include +#include #include +#include +#include namespace scene { @@ -22,10 +26,20 @@ struct terrain_block; // binary terrain file (.btf): static geometry of a text terrain file (.txtf), arranged by the sections // of the scene so each can be loaded on its own, when it comes into use. // the binary file records length and checksum of the text it was made from, and is made anew when these don't match +// terrain file named by a terrain directive of the scenery, with the placement it was loaded with +struct terrain_reference +{ + std::string file; // name relative to the scenery folder, without extension + glm::dvec3 offset{0.0}; + glm::vec3 rotation{0.f}; +}; + class terrain_file { public: // types + // receives a triangle of a terrain file: name of its material, the vertices in the world + using triangle_visitor = std::function const &Triangle)>; // what a scenery is left with for a terrain file it refers to enum class state { @@ -47,6 +61,13 @@ class terrain_file // loads specified piece of a binary terrain file into provided section static void load(basic_section &Section, terrain_block const &Block); static std::string extra(std::string const &Binaryfile); + // terrain files used by the scenery being loaded or shown, in the order the directives named them + static std::vector &references(); + // number (counted from 1) of the reference whose text or binary file is the specified file, 0 if there's none + static std::uint16_t reference_of(std::string const &File); + // goes through the triangles of the terrain file of specified reference, read from the text file if it's there, + // otherwise from the binary one. returns: true on success, Message describing what was read or the failure + static bool read_triangles(terrain_reference const &Reference, triangle_visitor const &Visit, std::string *Message = nullptr, bool *Text = nullptr); private: // converts provided content of a text terrain file to binary format and stores it in specified file. returns: true on success, false otherwise diff --git a/simulation/simulationstateserializer.cpp b/simulation/simulationstateserializer.cpp index 1f96d151a..1ff771d1d 100644 --- a/simulation/simulationstateserializer.cpp +++ b/simulation/simulationstateserializer.cpp @@ -57,6 +57,7 @@ state_serializer::deserialize_begin( std::string const &Scenariofile ) { // drop any streamed editor terrain from a previously loaded scenery before the old region (and // its sections, which those chunks referenced) is destroyed below EditorTerrain.reset(); + scene::terrain_file::references().clear(); // TODO: move initialization to separate routine so we can reuse it SafeDelete( Region ); @@ -722,6 +723,9 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch ++Scratchpad.binary.geometry_imported; auto shape { scene::shape_node().import( Input, nodedata ) }; material = shape.data().material; + if( true == Global.editor_session ) { + shape.source_file( scene::terrain_file::reference_of( Input.Name() ) ); + } simulation::Region->insert( std::move( shape ), Scratchpad, @@ -1188,6 +1192,11 @@ include_terrain_file( std::string File, std::string &Includes, scene::scratch_da return; } binary.terrain_textfiles.emplace_back( File ); + // the editor converts the triangles of the terrain files to heightmap terrain, it has to know them and where they're placed + scene::terrain_file::references().push_back( { + File, + ( Scratchpad.location.offset.empty() ? glm::dvec3( 0.0 ) : Scratchpad.location.offset.top() ), + Scratchpad.location.rotation } ); auto const textfile { Global.asCurrentSceneryPath + File + ".txtf" }; auto const binaryfile { Global.asCurrentSceneryPath + File + ".btf" }; diff --git a/utilities/parser.cpp b/utilities/parser.cpp index 5c4ed31bc..b64aee39b 100644 --- a/utilities/parser.cpp +++ b/utilities/parser.cpp @@ -485,6 +485,11 @@ void cParser::startIncludeFromParser(cParser& srcParser, bool ToLower, std::stri return; } + // layers are named by their files relative to the scenery folder; the terrain files (.txtf) come from includes made up by + // the loader, relative to the folder of the simulator + auto layername{mPath + includefile}; + layername = (layername.starts_with(Global.asCurrentSceneryPath) ? layername.substr(Global.asCurrentSceneryPath.size()) : includefile); + const bool isTerrain = contains(includefile, "_ter.scm"); if (isTerrain && true == Global.file_binary_terrain_state) { WriteLog("SBT found, ignoring: " + includefile); @@ -493,7 +498,7 @@ void cParser::startIncludeFromParser(cParser& srcParser, bool ToLower, std::stri if (sceneryLayers) { // the file is still a part of the scenery, even though its content comes from the binary terrain file - scene::Layers.layer(scene::Layers.open(includefile, include_site())).binary = true; + scene::Layers.layer(scene::Layers.open(layername, include_site())).binary = true; scene::Layers.close(); } return; @@ -537,7 +542,7 @@ void cParser::startIncludeFromParser(cParser& srcParser, bool ToLower, std::stri { auto site{include_site()}; site.parameters = false == mIncludeParser->parameters.empty(); - scene::Layers.open(includefile, site); + scene::Layers.open(layername, site); mIncludeParser->mLayerFile = true; } } From 243ce636a7cdaec703d50675f8bd558c75b5f66a Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Sat, 10 Oct 2026 01:27:48 +0200 Subject: [PATCH 198/430] Editor terrain: level brush with height picker, faster orthophoto fit --- application/editormode.cpp | 89 +++++++++++++++++++++++++-- application/editormode.h | 11 +++- application/editormodeselftest.cpp | 34 +++++++++-- application/editormodeviewport.cpp | 2 + editor/editorOrthophoto.cpp | 98 +++++++++++++++++++++++------- editor/editorOrthophoto.hpp | 9 ++- editor/editorTerrainStreamer.cpp | 21 +++++++ editor/editorTerrainStreamer.hpp | 3 + 8 files changed, 233 insertions(+), 34 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 73916325e..5f92461b6 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -391,7 +391,9 @@ namespace // ground triangles overlapping an XZ rectangle (Min/Max are x,z). shapes hold the (legacy) terrain, // model instances at least ModelRadius large (if ModelsAsGround) the terrain tiles - void gather_ground_triangles(glm::dvec2 const &Min, glm::dvec2 const &Max, bool const ModelsAsGround, float const ModelRadius, std::vector &Out, bool const Skiproads = false) + // Heightmap: the heightmap terrain is given as triangles too (for the ones which can ask the terrain for heights, it's a waste) + void gather_ground_triangles(glm::dvec2 const &Min, glm::dvec2 const &Max, bool const ModelsAsGround, float const ModelRadius, std::vector &Out, bool const Skiproads = false, + bool const Heightmap = true) { auto const started = std::chrono::steady_clock::now(); ++ground_question; @@ -444,7 +446,8 @@ namespace } } // the heightmap terrain answers for itself, with its full grid whatever is drawn of it - EditorTerrain.gather_triangles(Min, Max, Out); + if (Heightmap) + EditorTerrain.gather_triangles(Min, Max, Out); trim_ground_meshes(); // going through the scenery is the one thing here which can take long enough to be felt; when it does it's worth knowing auto const elapsed = std::chrono::duration(std::chrono::steady_clock::now() - started).count(); @@ -533,9 +536,10 @@ editor_mode::editor_mode() { road_select(nullptr); // the orthophoto is fitted onto the same ground as the area fill uses, terrain tile models included // the roads built in the editor aren't ground: the imagery goes under them - m_orthophoto.ground_source([](glm::dvec2 const &Min, glm::dvec2 const &Max, std::vector &Out) { - gather_ground_triangles(Min, Max, true, 50.0f, Out, true); + m_orthophoto.ground_source([](glm::dvec2 const &Min, glm::dvec2 const &Max, bool const Heightmap, std::vector &Out) { + gather_ground_triangles(Min, Max, true, 50.0f, Out, true, Heightmap); }); + m_orthophoto.height_source([](double const X, double const Z, double &Height) { return EditorTerrain.height_at(X, Z, Height); }); editor_track::observe(this); } @@ -1380,6 +1384,8 @@ bool editor_mode::update() // the brush of the terrain works while the left mouse button is held if (terrain_brush() && mouseHold) handle_terrain_brush(deltarealtime); + else + m_terrain_stroke = false; if (m_terrain_open) draw_terrain_overlay(); @@ -1606,6 +1612,8 @@ void editor_mode::render_terrain_ui() ImGui::SameLine(); radio(STR_C("Smooth"), terrain_tool::smooth, STR_C("LMB evens the terrain out under the brush")); ImGui::SameLine(); + radio(STR_C("Level"), terrain_tool::level, STR_C("LMB leads the terrain under the brush to the target height, Ctrl+LMB takes the target height from what's under the cursor")); + ImGui::SameLine(); radio(STR_C("Paint"), terrain_tool::paint, STR_C("LMB paints the material chosen in the palette, Shift+LMB the first material of the palette")); ImGui::SameLine(); radio(STR_C("Water"), terrain_tool::water, STR_C("LMB adds a point of the outline of a body of water, Shift+LMB takes the last one back")); @@ -1650,7 +1658,23 @@ void editor_mode::render_terrain_ui() ImGui::DragFloat(STR_C("Strength"), &m_terrain_brush_strength, 0.05f, 0.05f, 50.0f, "%.2f"); m_terrain_brush_strength = std::max(0.05f, m_terrain_brush_strength); if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("Sculpting: metres per second at the middle of the brush; smoothing and painting: how fast they work")); + ImGui::SetTooltip("%s", STR_C("Sculpting: metres per second at the middle of the brush; smoothing, levelling and painting: how fast they work")); + if (m_terrain_tool == terrain_tool::level) + { + ImGui::SetNextItemWidth(120.0f); + ImGui::DragFloat(STR_C("Target height (m)"), &m_terrain_target, 0.05f, -1000.0f, 5000.0f, "%.2f"); + ImGui::SameLine(); + if (ImGui::Button(m_terrain_picking ? STR_C("Click in the view...") : STR_C("Pick"))) + m_terrain_picking = false == m_terrain_picking; + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("The next click takes the height of whatever is under the cursor: terrain, a track, a model.\nCtrl+LMB does the same at any time")); + char const *modes[]{STR_C("Raise and lower"), STR_C("Only raise"), STR_C("Only lower")}; + ImGui::SetNextItemWidth(160.0f); + ImGui::Combo("##levelmode", &m_terrain_level_mode, modes, IM_ARRAYSIZE(modes)); + ImGui::Checkbox(STR_C("Target where the stroke starts"), &m_terrain_target_from_stroke); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Each stroke takes the height of the terrain under the cursor where it starts as its target,\nand drags it along: the ground stroked over is levelled with that point")); + } } if (ImGui::CollapsingHeader(STR_C("Materials"), m_terrain_tool == terrain_tool::paint ? ImGuiTreeNodeFlags_DefaultOpen : 0)) @@ -1834,6 +1858,30 @@ void editor_mode::draw_terrain_overlay() } auto const color = m_terrain_tool == terrain_tool::paint ? IM_COL32(120, 230, 120, 220) : m_terrain_tool == terrain_tool::smooth ? IM_COL32(120, 200, 255, 220) : IM_COL32(255, 180, 80, 220); polyline(circle, color, true, 2.0f); + if (m_terrain_tool == terrain_tool::level) + { + // the target: the rim of the brush at its height, joined with the ground, and the height by the cursor + auto const target = static_cast(m_terrain_target); + std::vector level; + for (auto const &point : circle) + level.emplace_back(point.x, target, point.z); + ImU32 const levelcolor = IM_COL32(255, 230, 90, 230); + polyline(level, levelcolor, true, 1.5f); + for (std::size_t i = 0; i < circle.size(); i += circle.size() / 8) + { + ImVec2 from, to; + if (projection.project(circle[i], from) && projection.project(level[i], to)) + drawlist->AddLine(from, to, IM_COL32(255, 230, 90, 120), 1.0f); + } + ImVec2 label; + if (projection.project(glm::dvec3{cursor.x, target, cursor.z}, label)) + { + double ground{cursor.y}; + m_streamer.height_at(cursor.x, cursor.z, ground); + auto const text = format("%.2f m (%+.2f)", target, target - ground); + drawlist->AddText(ImVec2(label.x + 12.0f, label.y - 8.0f), levelcolor, text.c_str()); + } + } } if ((m_terrain_tool == terrain_tool::chunks || m_terrain_tool == terrain_tool::spacing) && hovering) { @@ -2888,6 +2936,18 @@ void editor_mode::handle_terrain_brush(double Deltatime) case terrain_tool::smooth: shaped = m_streamer.smooth(world.x, world.z, m_terrain_brush_radius, std::min(1.0, rate * 0.5)); break; + case terrain_tool::level: + { + if (false == m_terrain_stroke && m_terrain_target_from_stroke) + { + double height; + if (m_streamer.height_at(world.x, world.z, height)) + m_terrain_target = static_cast(height); + } + m_terrain_stroke = true; + shaped = m_streamer.level(world.x, world.z, m_terrain_brush_radius, m_terrain_target, std::min(1.0, rate * 0.5), m_terrain_level_mode); + break; + } case terrain_tool::paint: m_streamer.paint(world.x, world.z, m_terrain_brush_radius, std::min(1.0, rate * 0.25), Global.shiftState ? std::uint16_t{0} : static_cast(m_terrain_layer)); break; @@ -2902,6 +2962,16 @@ void editor_mode::handle_terrain_brush(double Deltatime) } } +bool editor_mode::pick_terrain_target() +{ + glm::dvec3 const offset = GfxRenderer->Mouse_Position(); + if (glm::length(offset) < 1e-3) + return false; // nothing under the cursor + m_terrain_target = static_cast(Camera.Pos.y + offset.y); + m_terrain_status = format(STR_C("Target height: %.2f m"), m_terrain_target); + return true; +} + void editor_mode::capture_terrain() { TAnimModel *model = dynamic_cast(m_node); @@ -5153,6 +5223,15 @@ void editor_mode::on_mouse_button(int const Button, int const Action, int const // with a brush of the terrain the left button works the brush instead of picking nodes if (terrain_brush() && Button == GLFW_MOUSE_BUTTON_LEFT) { + if (m_terrain_tool == terrain_tool::level && is_press(Action) && (Global.ctrlState || m_terrain_picking)) + { + // a click which picks the target height doesn't level anything + pick_terrain_target(); + m_terrain_picking = false; + mouseHold = false; + m_input.mouse.button(Button, Action); + return; + } mouseHold = is_press(Action); m_input.mouse.button(Button, Action); return; diff --git a/application/editormode.h b/application/editormode.h index 35a5645d5..e6258fee5 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -309,12 +309,15 @@ class editor_mode : public application_mode, private editor_track::observer chunks, // adds a chunk, Shift: removes it sculpt, // raises the ground, Shift: lowers it smooth, + level, // leads the ground to the target height, Ctrl: picks the target height under the cursor paint, // paints the chosen material, Shift: the first material of the palette spacing, // gives the clicked chunk the chosen point spacing water // outlines a body of water }; terrain_tool m_terrain_tool{terrain_tool::none}; - bool terrain_brush() const { return m_terrain_tool == terrain_tool::sculpt || m_terrain_tool == terrain_tool::smooth || m_terrain_tool == terrain_tool::paint; } + bool terrain_brush() const { return m_terrain_tool == terrain_tool::sculpt || m_terrain_tool == terrain_tool::smooth || m_terrain_tool == terrain_tool::level || m_terrain_tool == terrain_tool::paint; } + // takes the height of whatever is under the cursor (terrain, track, model) for the target of the level brush. returns: false if there's nothing + bool pick_terrain_target(); bool terrain_clicking() const { return m_terrain_tool == terrain_tool::chunks || m_terrain_tool == terrain_tool::spacing || m_terrain_tool == terrain_tool::water; } // the brush, the hovered chunk and the outlines of water drawn over the viewport void draw_terrain_overlay(); @@ -410,6 +413,12 @@ class editor_mode : public application_mode, private editor_track::observer int m_terrain_add_count{4}; // chunks along a side added around the camera float m_terrain_brush_radius{12.0f}; float m_terrain_brush_strength{4.0f}; // metres per second while held; for the paint, how fast it covers + // the level brush + float m_terrain_target{0.0f}; // height the ground is led to + int m_terrain_level_mode{0}; // 0: up and down, 1: only raises, 2: only lowers + bool m_terrain_target_from_stroke{false}; // the target is the height where a stroke starts + bool m_terrain_stroke{false}; // a stroke of the brush is under way + bool m_terrain_picking{false}; // the next click picks the target height int m_terrain_layer{0}; // entry of the palette painted char m_terrain_material[128]{"grass"}; // material added to the palette float m_terrain_material_size{0.0f}; // metres its textures repeat at, 0: given by the material diff --git a/application/editormodeselftest.cpp b/application/editormodeselftest.cpp index 3052df406..5cb2fe204 100644 --- a/application/editormodeselftest.cpp +++ b/application/editormodeselftest.cpp @@ -73,9 +73,12 @@ http://mozilla.org/MPL/2.0/. // newscenery the editor starts again with the wizard of a new scenery // vehicles logs each vehicle: its head, facing, and what its couplers hold // terrainmode the terrain field of work, with its texture browser -// terrainsculpt , terrainpaint as a stroke of the brush +// terrainsculpt , terrainpaint , +// terrainlevel [mode] as a stroke of the brush +// terrainadd chunks made around the camera, count x count, as the button of the chunks panel does it // terrainprobe logs the height of the heightmap terrain and the materials of the chunk // terrainconvert converts every material of the terrain files of the scenery +// orthophoto [in scene 0|1] the imagery layer on, placed and fitted as given // screenshot // save // log @@ -1138,19 +1141,42 @@ void editor_mode::selftest_step() } } } + else if (command == "orthophoto") + { + auto config{m_orthophoto.settings()}; + int fit{1}, inscene{0}; + words >> config.north >> config.east >> config.radius >> fit >> inscene; + config.drape = fit != 0; + config.in_scene = inscene != 0; + m_orthophoto.settings(config); + m_orthophoto.enabled(true); + WriteLog(format("SELFTEST orthophoto at %.0f %.0f, radius %d, %s%s", config.north, config.east, config.radius, config.drape ? "fitted" : "flat", config.in_scene ? ", in the scene" : "")); + } else if (command == "terrainmode") { m_terrain_open = true; WriteLog("SELFTEST terrainmode"); } - else if (command == "terrainsculpt" || command == "terrainpaint") + else if (command == "terrainsculpt" || command == "terrainpaint" || command == "terrainlevel") { double x{0.0}, z{0.0}, radius{10.0}, value{1.0}; - words >> x >> z >> radius >> value; - auto const changed{command == "terrainsculpt" ? m_streamer.sculpt(x, z, radius, value) : m_streamer.paint(x, z, radius, 1.0, static_cast(value))}; + int mode{0}; + words >> x >> z >> radius >> value >> mode; + auto const changed{command == "terrainsculpt" ? m_streamer.sculpt(x, z, radius, value) + : command == "terrainlevel" ? m_streamer.level(x, z, radius, value, 1.0, mode) + : m_streamer.paint(x, z, radius, 1.0, static_cast(value))}; forget_ground(); WriteLog(format("SELFTEST %s %.1f %.1f: %s", command.c_str(), x, z, changed ? "changed" : "nothing changed")); } + else if (command == "terrainadd") + { + int count{1}; + float spacing{m_terrain_spacing}; + words >> count >> spacing; + m_terrain_spacing = heightmap::valid_spacing(spacing); + add_chunks_around(std::clamp(count, 1, 8)); + WriteLog("SELFTEST terrainadd: " + m_terrain_status); + } else if (command == "terrainprobe") { double x{0.0}, z{0.0}, height{0.0}; diff --git a/application/editormodeviewport.cpp b/application/editormodeviewport.cpp index 46864156e..847ba8e4d 100644 --- a/application/editormodeviewport.cpp +++ b/application/editormodeviewport.cpp @@ -209,6 +209,8 @@ void editor_mode::work_area_tools(std::vector &Buttons) Buttons.push_back({icon::select, STR_C("Select"), nullptr, STR_C("LMB picks the models, as in the surroundings"), chosen(terrain_tool::none), choose(terrain_tool::none)}); Buttons.push_back({icon::sculpt, STR_C("Sculpt"), nullptr, STR_C("LMB raises the terrain under the brush, Shift+LMB lowers it"), chosen(terrain_tool::sculpt), choose(terrain_tool::sculpt)}); Buttons.push_back({icon::smooth, STR_C("Smooth"), nullptr, STR_C("LMB evens the terrain out under the brush"), chosen(terrain_tool::smooth), choose(terrain_tool::smooth)}); + Buttons.push_back({icon::profile, STR_C("Level"), nullptr, STR_C("LMB leads the terrain under the brush to the target height, Ctrl+LMB takes the target height from what's under the cursor"), + chosen(terrain_tool::level), choose(terrain_tool::level)}); Buttons.push_back({icon::brush, STR_C("Paint"), nullptr, STR_C("LMB paints the material chosen in the palette, Shift+LMB the first material of the palette"), chosen(terrain_tool::paint), choose(terrain_tool::paint)}); Buttons.push_back({icon::chunks, STR_C("Chunks"), nullptr, STR_C("LMB adds a chunk next to the clicked one, Shift+LMB removes it"), chosen(terrain_tool::chunks), choose(terrain_tool::chunks)}); Buttons.push_back({icon::count, STR_C("Point spacing"), nullptr, STR_C("LMB gives the clicked chunk the point spacing chosen in the tool options"), chosen(terrain_tool::spacing), choose(terrain_tool::spacing)}); diff --git a/editor/editorOrthophoto.cpp b/editor/editorOrthophoto.cpp index 6c194b90d..4710f494c 100644 --- a/editor/editorOrthophoto.cpp +++ b/editor/editorOrthophoto.cpp @@ -698,7 +698,11 @@ void editor_orthophoto::settings(config const &Config) { bool const sourcechanged = (Config.year != m_config.year || Config.hires != m_config.hires); bool const shapechanged = (Config.height != m_config.height || Config.drape != m_config.drape || Config.in_scene != m_config.in_scene || Config.lift != m_config.lift); + // the surface of the ground is gathered only for the geometry in the scene, the overlay makes do with the heights + bool const groundchanged = (Config.in_scene != m_config.in_scene); m_config = Config; + if (groundchanged) + refit(); m_config.lift = std::clamp(m_config.lift, 0.0f, 50.0f); m_config.radius = std::clamp(m_config.radius, 0, max_radius); m_config.opacity = std::clamp(m_config.opacity, 0.0f, 1.0f); @@ -914,12 +918,23 @@ void editor_orthophoto::sample_ground(tile_key const &Key, tile &Tile) glm::dvec2 const corner = tile_corner(Key); glm::dvec2 const min(corner.x - tile_size, corner.y - tile_size); glm::dvec2 const max(corner.x, corner.y); + // the clipped surface is drawn only by the geometry in the scene. the overlay needs just the heights, and the heightmap + // terrain gives these straight away: its triangles (hundreds of thousands in a tile) aren't gathered for it + bool const surface = m_config.in_scene || !m_height; std::vector triangles; - m_ground(min, max, triangles); + m_ground(min, max, surface, triangles); int constexpr samples{ground_grid + 1}; double constexpr step{tile_size / ground_grid}; std::vector heights(static_cast(samples) * samples, no_height); + if (!surface) + for (int j = 0; j < samples; ++j) + for (int i = 0; i < samples; ++i) + { + double y; + if (m_height(corner.x - i * step, corner.y - j * step, y)) + heights[static_cast(j) * samples + i] = static_cast(y); + } for (auto const &triangle : triangles) { @@ -935,17 +950,20 @@ void editor_orthophoto::sample_ground(tile_key const &Key, tile &Tile) if (length < 1e-9 || normal.y / length < steepest_ground) continue; // walls and the like don't receive the imagery - glm::dvec3 polygon[8] = {a, b, c}; - glm::dvec3 scratch[8]; - int count = clip_xz(polygon, 3, scratch, 0, max.x, true); - count = clip_xz(scratch, count, polygon, 0, min.x, false); - count = clip_xz(polygon, count, scratch, 2, max.y, true); - count = clip_xz(scratch, count, polygon, 2, min.y, false); - for (int k = 1; k + 1 < count; ++k) + if (surface) { - Tile.surface.push_back(polygon[0]); - Tile.surface.push_back(polygon[k]); - Tile.surface.push_back(polygon[k + 1]); + glm::dvec3 polygon[8] = {a, b, c}; + glm::dvec3 scratch[8]; + int count = clip_xz(polygon, 3, scratch, 0, max.x, true); + count = clip_xz(scratch, count, polygon, 0, min.x, false); + count = clip_xz(polygon, count, scratch, 2, max.y, true); + count = clip_xz(scratch, count, polygon, 2, min.y, false); + for (int k = 1; k + 1 < count; ++k) + { + Tile.surface.push_back(polygon[0]); + Tile.surface.push_back(polygon[k]); + Tile.surface.push_back(polygon[k + 1]); + } } // heightfield samples under the (whole) triangle, the highest surface wins @@ -1415,7 +1433,33 @@ void editor_orthophoto::draw(glm::mat4 const &ViewProjection, glm::dvec3 const & if (draped) segments = std::max(segments, distance < 300.0 ? ground_grid : distance < 800.0 ? ground_grid / 2 : ground_grid / 4); float const segmentsize = 1.0f / static_cast(segments); - auto const height_at = [&](float U, float V) { return draped ? sample_heights(t.heights, U, V) + lift : flat; }; + // the grid points of the heights are taken as they are where the segments fall on them + int const stride = (draped && ground_grid % segments == 0) ? ground_grid / segments : 0; + auto const height_at = [&](int I, int J) { + if (!draped) + return flat; + if (stride > 0) + return static_cast(t.heights[static_cast(J * stride) * (ground_grid + 1) + I * stride]) + lift; + return sample_heights(t.heights, I * segmentsize, J * segmentsize) + lift; + }; + + // each point of the grid is projected once, with the sides of the view it's beyond: a quad wholly inside goes + // straight to the draw list, one wholly beyond a side is skipped, only the ones across an edge are clipped + int const side = segments + 1; + static std::vector points; + static std::vector codes; + points.resize(static_cast(side) * side); + codes.resize(points.size()); + for (int j = 0; j < side; ++j) + for (int i = 0; i < side; ++i) + { + auto const index = static_cast(j) * side + i; + float const u = i * segmentsize, v = j * segmentsize; + glm::vec4 const position = clip(u, v, height_at(i, j)); + points[index] = {position, {u, v}}; + codes[index] = static_cast((position.w < near_w ? 1 : 0) | (position.x > position.w * guard ? 2 : 0) | (position.x < -position.w * guard ? 4 : 0) | + (position.y > position.w * guard ? 8 : 0) | (position.y < -position.w * guard ? 16 : 0)); + } drawlist->PushTextureID((ImTextureID)(intptr_t)(textureid)); for (int j = 0; j < segments; ++j) @@ -1426,19 +1470,29 @@ void editor_orthophoto::draw(glm::mat4 const &ViewProjection, glm::dvec3 const & drawlist->PopTextureID(); return; } - float const u0 = i * segmentsize, u1 = (i + 1) * segmentsize; - float const v0 = j * segmentsize, v1 = (j + 1) * segmentsize; - clip_vertex quad[4] = { - {clip(u0, v0, height_at(u0, v0)), {u0, v0}}, - {clip(u1, v0, height_at(u1, v0)), {u1, v0}}, - {clip(u1, v1, height_at(u1, v1)), {u1, v1}}, - {clip(u0, v1, height_at(u0, v1)), {u0, v1}}, - }; - glm::vec4 const positions[4] = {quad[0].position, quad[1].position, quad[2].position, quad[3].position}; - if (outside(positions, 4)) + std::size_t const corners[4] = {static_cast(j) * side + i, static_cast(j) * side + i + 1, static_cast(j + 1) * side + i + 1, + static_cast(j + 1) * side + i}; + auto const all = codes[corners[0]] & codes[corners[1]] & codes[corners[2]] & codes[corners[3]]; + if (all != 0) + continue; // beyond one side of the view + auto const any = codes[corners[0]] | codes[corners[1]] | codes[corners[2]] | codes[corners[3]]; + if (any == 0) + { + drawlist->PrimReserve(6, 4); + auto const base = static_cast(drawlist->_VtxCurrentIdx); + drawlist->PrimWriteIdx(base); + drawlist->PrimWriteIdx(static_cast(base + 1)); + drawlist->PrimWriteIdx(static_cast(base + 2)); + drawlist->PrimWriteIdx(base); + drawlist->PrimWriteIdx(static_cast(base + 2)); + drawlist->PrimWriteIdx(static_cast(base + 3)); + for (auto const corner : corners) + drawlist->PrimWriteVtx(toscreen(points[corner].position), ImVec2(points[corner].uv.x, points[corner].uv.y), color); continue; + } // clip against the near plane and the (slightly widened) sides of the view + clip_vertex quad[4] = {points[corners[0]], points[corners[1]], points[corners[2]], points[corners[3]]}; clip_vertex buffer0[12], buffer1[12]; int count = clip_polygon(quad, 4, buffer0, [](glm::vec4 const &v) { return v.w - near_w; }); count = clip_polygon(buffer0, count, buffer1, [&](glm::vec4 const &v) { return v.w * guard - v.x; }); diff --git a/editor/editorOrthophoto.hpp b/editor/editorOrthophoto.hpp index dd0810215..8d7d942f4 100644 --- a/editor/editorOrthophoto.hpp +++ b/editor/editorOrthophoto.hpp @@ -67,8 +67,11 @@ class editor_orthophoto }; using world_triangle = std::array; - // supplies the ground triangles overlapping an XZ rectangle (Min/Max are x,z); used to drape the imagery - using ground_query = std::function &Out)>; + // supplies the ground triangles overlapping an XZ rectangle (Min/Max are x,z); used to drape the imagery. + // Heightmap: the heightmap terrain as triangles too; without it the terrain is asked through the height query alone + using ground_query = std::function &Out)>; + // height of the heightmap terrain at a point, false where there's none + using height_query = std::function; struct statistics { @@ -93,6 +96,7 @@ class editor_orthophoto // changes of year / resolution invalidate resident tiles, the rest applies immediately void settings(config const &Config); void ground_source(ground_query Query) { m_ground = std::move(Query); } + void height_source(height_query Query) { m_height = std::move(Query); } // samples the ground again (after it was edited); tiles are refitted progressively void refit(); // takes the scene geometry out of the region (e.g. when the editor is left); it's re-created on the next update @@ -202,6 +206,7 @@ class editor_orthophoto std::vector m_free_slots; // pool of textures, reused between tiles int m_texture_count{0}; ground_query m_ground; + height_query m_height; scene::basic_region *m_region{nullptr}; // region the scene geometry was put into std::multimap m_free_chunks; // geometry chunks by capacity, reused between tiles // the scene opacity is baked into the textures, which means reading the tiles again; applied once the value settles diff --git a/editor/editorTerrainStreamer.cpp b/editor/editorTerrainStreamer.cpp index a6b8606d2..27d75a959 100644 --- a/editor/editorTerrainStreamer.cpp +++ b/editor/editorTerrainStreamer.cpp @@ -1041,6 +1041,27 @@ bool terrain_streamer::smooth(double X, double Z, double Radius, double Amount) }); } +bool terrain_streamer::level(double X, double Z, double Radius, double Target, double Amount, int const Mode) +{ + if (Radius <= 0.0 || Amount <= 0.0) + return false; + return reshape(glm::dvec2{X - Radius, Z - Radius}, glm::dvec2{X + Radius, Z + Radius}, [&](double const Vx, double const Vz, float &Height) { + auto const distance{std::sqrt((Vx - X) * (Vx - X) + (Vz - Z) * (Vz - Z))}; + if (distance > Radius) + return false; + auto const own{static_cast(Height)}; + if ((Mode == 1 && own >= Target) || (Mode == 2 && own <= Target)) + return false; + // the middle of the brush gets there, the rim follows less; what's within the step of the stored heights is there already + auto const levelled{own + (Target - own) * std::min(1.0, Amount * falloff(distance, Radius))}; + auto const result{std::abs(Target - levelled) < heightmap::height_step ? Target : levelled}; + if (std::abs(result - own) < 1e-5) + return false; + Height = static_cast(result); + return true; + }); +} + bool terrain_streamer::paint(double X, double Z, double Radius, double Strength, std::uint16_t Layer) { if (Radius <= 0.0 || Strength <= 0.0) diff --git a/editor/editorTerrainStreamer.hpp b/editor/editorTerrainStreamer.hpp index 2e99e449f..62e3cd9e7 100644 --- a/editor/editorTerrainStreamer.hpp +++ b/editor/editorTerrainStreamer.hpp @@ -93,6 +93,9 @@ class terrain_streamer bool sculpt(double X, double Z, double Radius, double Strength); // evens out the ground within Radius of (X,Z), Amount (0..1) of the way at the centre bool smooth(double X, double Z, double Radius, double Amount); + // leads the ground within Radius of (X,Z) towards the height Target, Amount (0..1) of the way at the centre; + // Mode: 0 up and down, 1 only raises it, 2 only lowers it + bool level(double X, double Z, double Radius, double Target, double Amount, int Mode = 0); // gives every grid point within the rectangle to Shaper, with its world position and height (before the modifiers); // Shaper returns true if it changed the height bool reshape(glm::dvec2 const &Min, glm::dvec2 const &Max, std::function const &Shaper); From 63302c1acef9e5014274b054f6a74ce9babc7d66 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Sat, 10 Oct 2026 16:08:12 +0200 Subject: [PATCH 199/430] Editor terrain: soft stitching to tracks, chunk resolution conversion, water materials --- application/editormode.cpp | 212 ++++++++++++++++++++++++++--- application/editormode.h | 21 ++- application/editormodeselftest.cpp | 104 +++++++++++++- application/editormodeviewport.cpp | 5 +- editor/editorTerrainStreamer.cpp | 187 +++++++++++++++++++++++-- editor/editorTerrainStreamer.hpp | 28 +++- scene/heightmapterrain.cpp | 106 +++++++++++++-- scene/heightmapterrain.h | 11 +- 8 files changed, 613 insertions(+), 61 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 5f92461b6..653563a11 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -920,6 +920,7 @@ void editor_mode::restore_terrain(EditorSnapshot &Snapshot) Snapshot.terrain = std::make_shared(std::move(opposite)); forget_ground(); m_water_selected = -1; + m_water_material_of = -1; } void editor_mode::undo_last() @@ -1607,7 +1608,9 @@ void editor_mode::render_terrain_ui() ImGui::SameLine(); radio(STR_C("Chunks"), terrain_tool::chunks, STR_C("LMB adds a chunk shaped as the ground under it, next to the clicked one; Shift+LMB removes the clicked chunk")); ImGui::SameLine(); - radio(STR_C("Spacing"), terrain_tool::spacing, STR_C("LMB gives the clicked chunk the point spacing chosen below, the ground resampled")); + radio(STR_C("Spacing"), terrain_tool::spacing, STR_C("LMB selects the clicked chunk, Ctrl+LMB adds it to the selection or takes it away;\nthe point spacing of the selected chunks is converted in \"Chunk resolution\" below")); + ImGui::SameLine(); + radio(STR_C("Restore"), terrain_tool::restore, STR_C("LMB takes back the touch-ups made over the tracks under the brush:\nthe terrain returns to the shape the modifiers (tracks) give it")); radio(STR_C("Sculpt"), terrain_tool::sculpt, STR_C("LMB raises the terrain under the brush, Shift+LMB lowers it")); ImGui::SameLine(); radio(STR_C("Smooth"), terrain_tool::smooth, STR_C("LMB evens the terrain out under the brush")); @@ -1625,7 +1628,7 @@ void editor_mode::render_terrain_ui() if (spacing_combo(STR_C("Point spacing"), m_terrain_spacing)) m_streamer.default_spacing(m_terrain_spacing); if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("Spacing of the grid points of the chunks made, and the one the spacing tool gives the clicked chunk.\n" + ImGui::SetTooltip("%s", STR_C("Spacing of the grid points of the chunks made.\n" "A chunk is 250 x 250 m; finer grids take more memory and time to draw.")); ImGui::SetNextItemWidth(120.0f); ImGui::InputFloat(STR_C("Base height (m)"), &m_terrain_baseheight, 0.0f, 0.0f, "%.2f"); @@ -1649,6 +1652,56 @@ void editor_mode::render_terrain_ui() } } + if (ImGui::CollapsingHeader(STR_C("Chunk resolution"), m_terrain_tool == terrain_tool::spacing ? ImGuiTreeNodeFlags_DefaultOpen : 0)) + { + // chunks removed since are no longer selected + for (auto it = m_terrain_selection.begin(); it != m_terrain_selection.end();) + it = m_streamer.exists(*it) ? std::next(it) : m_terrain_selection.erase(it); + if (m_terrain_selection.empty()) + ImGui::TextWrapped("%s", STR_C("No chunk selected. With the Spacing tool LMB selects the clicked chunk, Ctrl+LMB adds one or takes it away.")); + else + { + bool coarser = false; + std::size_t points = 0, after = 0; + int const cells = heightmap::cells_for(m_terrain_convert_spacing); + ImGui::BeginChild("##chunkselection", ImVec2(0.0f, ImGui::GetTextLineHeightWithSpacing() * std::min(6.0f, static_cast(m_terrain_selection.size()) + 0.5f)), true); + for (auto const &key : m_terrain_selection) + { + auto const centre = heightmap::chunk_corner(key) + glm::dvec2{heightmap::chunk_size * 0.5}; + auto const *chunk = m_streamer.terrain_at(centre.x, centre.y); + if (chunk == nullptr) + { + ImGui::TextDisabled(STR_C("%d,%d: not loaded"), key.first, key.second); + continue; + } + auto const &data = chunk->data(); + coarser |= cells < data.cells; + points += static_cast(data.side()) * data.side(); + after += static_cast(cells + 1) * (cells + 1); + auto const paint = data.paint > 0 ? format(STR_C(", paint every %.2f m"), heightmap::chunk_size / data.paint) : std::string(STR_C(", one material")); + auto const touchups = data.adjust.empty() ? std::string() : std::string(STR_C(", touch-ups")); + ImGui::Text("%d,%d: %s%s%s", key.first, key.second, spacing_label(static_cast(data.spacing())), paint.c_str(), touchups.c_str()); + } + ImGui::EndChild(); + spacing_combo(STR_C("Convert to"), m_terrain_convert_spacing); + ImGui::SameLine(); + if (ImGui::Button(STR_C("Convert"))) + convert_selected_chunks(); + ImGui::SameLine(); + if (ImGui::Button(STR_C("Clear the selection"))) + m_terrain_selection.clear(); + ImGui::Checkbox(STR_C("Paint every 0.5 m with 0.5 m spacing"), &m_terrain_convert_paint); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Chunks converted to 0.5 m get their paint samples every 0.5 m as well (every metre otherwise),\n" + "so the materials can be painted as finely as the ground is shaped")); + if (points > 0) + ImGui::TextDisabled(STR_C("Grid points: %zu -> %zu"), points, after); + if (coarser) + ImGui::TextWrapped("%s", STR_C("A coarser grid can't hold the shapes smaller than its spacing: they're averaged out. " + "The edges of the chunks keep their heights, so the neighbours still meet them. Ctrl+Z takes it back.")); + } + } + if (terrain_brush() && ImGui::CollapsingHeader(STR_C("Brush"), ImGuiTreeNodeFlags_DefaultOpen)) { ImGui::SetNextItemWidth(120.0f); @@ -1658,7 +1711,18 @@ void editor_mode::render_terrain_ui() ImGui::DragFloat(STR_C("Strength"), &m_terrain_brush_strength, 0.05f, 0.05f, 50.0f, "%.2f"); m_terrain_brush_strength = std::max(0.05f, m_terrain_brush_strength); if (ImGui::IsItemHovered()) - ImGui::SetTooltip("%s", STR_C("Sculpting: metres per second at the middle of the brush; smoothing, levelling and painting: how fast they work")); + ImGui::SetTooltip("%s", STR_C("Sculpting: metres per second at the middle of the brush; smoothing, levelling, painting and restoring: how fast they work")); + if (m_terrain_tool == terrain_tool::sculpt || m_terrain_tool == terrain_tool::smooth || m_terrain_tool == terrain_tool::level) + { + auto touchup = m_streamer.touch_up(); + if (ImGui::Checkbox(STR_C("Touch up over the tracks"), &touchup)) + m_streamer.touch_up(touchup); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("On: the brush shapes the terrain as it's seen, also where the tracks (modifiers) shape it;\n" + "the changes there are kept as touch-ups over the modifiers, and stay when the track changes.\n" + "The Restore tool takes them back.\n" + "Off: the brush shapes only the ground under the modifiers, the tracks keep their formation and slopes.")); + } if (m_terrain_tool == terrain_tool::level) { ImGui::SetNextItemWidth(120.0f); @@ -1750,13 +1814,27 @@ void editor_mode::render_terrain_ui() } auto const &water{m_streamer.water()}; std::optional removed; + std::optional> dropped; for (std::size_t i = 0; i < water.size(); ++i) { ImGui::PushID(static_cast(i)); - if (ImGui::Selectable(format("%s, %.2f m, %zu points", water[i].name.c_str(), water[i].level, water[i].outline.size()).c_str(), static_cast(i) == m_water_selected)) + auto const material = water[i].material.empty() ? std::string(STR_C("default material")) : water[i].material; + if (ImGui::Selectable(format("%s, %.2f m, %zu points, %s", water[i].name.c_str(), water[i].level, water[i].outline.size(), material.c_str()).c_str(), static_cast(i) == m_water_selected)) m_water_selected = static_cast(i); + // a texture dropped on an entry becomes the material of that water + std::string name; + if (material_drop(name)) + dropped = std::make_pair(i, name); ImGui::PopID(); } + if (dropped) + { + auto changed{water}; + changed[dropped->first].material = dropped->second; + m_streamer.water(std::move(changed)); + m_water_selected = static_cast(dropped->first); + m_water_material_of = -1; + } if (m_water_selected >= 0 && m_water_selected < static_cast(water.size())) { // the level is changed in the water once the dragging ends @@ -1771,6 +1849,33 @@ void editor_mode::render_terrain_ui() changed[m_water_selected].level = m_water_selected_level; m_streamer.water(std::move(changed)); } + // the material and the repeat of its texture, changed once the field is left (or a texture dropped on it) + if (m_water_material_of != m_water_selected) + { + std::snprintf(m_water_selected_material, sizeof(m_water_selected_material), "%s", water[m_water_selected].material.c_str()); + m_water_selected_size = water[m_water_selected].size; + m_water_material_of = m_water_selected; + } + bool retexture = false; + ImGui::SetNextItemWidth(160.0f); + ImGui::InputText(STR_C("Material of the chosen"), m_water_selected_material, IM_ARRAYSIZE(m_water_selected_material)); + retexture |= ImGui::IsItemDeactivatedAfterEdit(); + retexture |= material_drop(m_water_selected_material, IM_ARRAYSIZE(m_water_selected_material)); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip(STR_C("A material or a texture (drag one from the texture browser).\nEmpty: %s, the water material of the terrain"), m_streamer.manifest().water_material.c_str()); + ImGui::SetNextItemWidth(120.0f); + ImGui::DragFloat(STR_C("Texture repeats every (m)##water"), &m_water_selected_size, 0.1f, 0.0f, 500.0f, "%.1f"); + m_water_selected_size = std::max(0.0f, m_water_selected_size); + retexture |= ImGui::IsItemDeactivatedAfterEdit(); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Metres the texture of the water repeats at; 0: as the material gives it, or 8 m")); + if (retexture) + { + auto changed{water}; + changed[m_water_selected].material = m_water_selected_material; + changed[m_water_selected].size = m_water_selected_size; + m_streamer.water(std::move(changed)); + } if (ImGui::Button(STR_C("Remove the chosen water"))) removed = static_cast(m_water_selected); } @@ -1780,7 +1885,20 @@ void editor_mode::render_terrain_ui() changed.erase(changed.begin() + *removed); m_streamer.water(std::move(changed)); m_water_selected = -1; + m_water_material_of = -1; } + // the material of the bodies of water which don't name their own + if (false == m_water_default_edited) + std::snprintf(m_water_default_material, sizeof(m_water_default_material), "%s", m_streamer.manifest().water_material.c_str()); + ImGui::SetNextItemWidth(160.0f); + ImGui::InputText(STR_C("Default water material"), m_water_default_material, IM_ARRAYSIZE(m_water_default_material)); + m_water_default_edited = ImGui::IsItemActive(); + bool redefault = ImGui::IsItemDeactivatedAfterEdit(); + redefault |= material_drop(m_water_default_material, IM_ARRAYSIZE(m_water_default_material)); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Material of the bodies of water which don't name their own")); + if (redefault) + m_streamer.water_material(m_water_default_material); } if (ImGui::CollapsingHeader(STR_C("Modifiers"))) @@ -1788,16 +1906,30 @@ void editor_mode::render_terrain_ui() auto const &modifiers{m_streamer.modifiers()}; if (modifiers.empty()) ImGui::TextWrapped("%s", STR_C("None. The vertical profile of the tracks makes them: the terrain follows the formation and the slopes of the route.")); - std::optional removed; + std::optional removed, baked; for (auto const &modifier : modifiers) { ImGui::PushID(modifier.name.c_str()); ImGui::TextUnformatted(format("%s, %zu points", modifier.name.c_str(), modifier.points.size()).c_str()); ImGui::SameLine(); + if (ImGui::SmallButton(STR_C("Bake"))) + baked = modifier.name; + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("The ground keeps the shape the modifier gives it, and the modifier is removed:\n" + "from then on the terrain there is shaped by hand like anywhere else, and no longer follows the track")); + ImGui::SameLine(); if (ImGui::SmallButton(STR_C("Remove"))) removed = modifier.name; ImGui::PopID(); } + if (auto const touchups = m_streamer.touched_up(); touchups > 0) + ImGui::TextDisabled(STR_C("Touch-ups over the modifiers: %zu points (of the chunks in memory)"), touchups); + if (baked) + { + m_streamer.bake_modifier(*baked); + ground_tiles.clear(); + forget_ground_shapes(); + } if (removed) { m_streamer.remove_modifier(*removed); @@ -1856,7 +1988,10 @@ void editor_mode::draw_terrain_overlay() auto const z = cursor.z + std::sin(angle) * m_terrain_brush_radius; circle.emplace_back(x, ground(x, z, cursor.y) + 0.1, z); } - auto const color = m_terrain_tool == terrain_tool::paint ? IM_COL32(120, 230, 120, 220) : m_terrain_tool == terrain_tool::smooth ? IM_COL32(120, 200, 255, 220) : IM_COL32(255, 180, 80, 220); + auto const color = m_terrain_tool == terrain_tool::paint ? IM_COL32(120, 230, 120, 220) + : m_terrain_tool == terrain_tool::smooth ? IM_COL32(120, 200, 255, 220) + : m_terrain_tool == terrain_tool::restore ? IM_COL32(230, 120, 230, 220) + : IM_COL32(255, 180, 80, 220); polyline(circle, color, true, 2.0f); if (m_terrain_tool == terrain_tool::level) { @@ -1883,17 +2018,15 @@ void editor_mode::draw_terrain_overlay() } } } - if ((m_terrain_tool == terrain_tool::chunks || m_terrain_tool == terrain_tool::spacing) && hovering) - { - auto const key = heightmap::chunk_at(cursor.x, cursor.z); - auto const exists = m_streamer.exists(key); - auto const low = heightmap::chunk_corner(key); + // outline of a chunk, laid over the ground + auto const chunk_outline = [&](heightmap::chunk_key const &Key, double const Fallback, ImU32 const Color, float const Thickness) { + auto const low = heightmap::chunk_corner(Key); std::vector square; auto const edge = [&](glm::dvec2 const &From, glm::dvec2 const &To) { for (int i = 0; i < 25; ++i) { auto const point = From + (To - From) * (i / 25.0); - square.emplace_back(point.x, ground(point.x, point.y, cursor.y) + 0.2, point.y); + square.emplace_back(point.x, ground(point.x, point.y, Fallback) + 0.2, point.y); } }; auto const size = heightmap::chunk_size; @@ -1901,15 +2034,31 @@ void editor_mode::draw_terrain_overlay() edge(low + glm::dvec2{size, 0.0}, low + glm::dvec2{size}); edge(low + glm::dvec2{size}, low + glm::dvec2{0.0, size}); edge(low + glm::dvec2{0.0, size}, low); - polyline(square, exists ? IM_COL32(255, 255, 255, 200) : IM_COL32(255, 230, 90, 200), true, 2.0f); + polyline(square, Color, true, Thickness); + }; + if (m_terrain_tool == terrain_tool::spacing) + for (auto const &key : m_terrain_selection) + chunk_outline(key, cursor.y, IM_COL32(90, 220, 255, 230), 3.0f); + if ((m_terrain_tool == terrain_tool::chunks || m_terrain_tool == terrain_tool::spacing) && hovering) + { + auto const key = heightmap::chunk_at(cursor.x, cursor.z); + auto const exists = m_streamer.exists(key); + chunk_outline(key, cursor.y, exists ? IM_COL32(255, 255, 255, 200) : IM_COL32(255, 230, 90, 200), 2.0f); ImVec2 label; if (exists && projection.project(cursor, label)) { auto const *chunk = m_streamer.terrain_at(cursor.x, cursor.z); if (chunk != nullptr) { - auto const text = (m_terrain_tool == terrain_tool::spacing ? format("%s -> %s", spacing_label(static_cast(chunk->data().spacing())), spacing_label(m_terrain_spacing)) - : std::string(spacing_label(static_cast(chunk->data().spacing())))); + auto const &data = chunk->data(); + auto text = std::string(spacing_label(static_cast(data.spacing()))); + if (m_terrain_tool == terrain_tool::spacing) + { + if (data.paint > 0) + text += format(STR_C(", paint every %.2f m"), heightmap::chunk_size / data.paint); + if (m_terrain_selection.count(key) != 0) + text += STR(" (selected)"); + } drawlist->AddText(ImVec2(label.x + 14.0f, label.y - 14.0f), IM_COL32(255, 255, 255, 230), text.c_str()); } } @@ -2346,13 +2495,19 @@ void editor_mode::handle_terrain_click(bool const Shift) } case terrain_tool::spacing: { + // a click selects the chunk, Ctrl adds it to the selection or takes it away auto const key = heightmap::chunk_at(world.x, world.z); if (false == m_streamer.exists(key)) + { + if (false == Global.ctrlState) + m_terrain_selection.clear(); return; - m_streamer.spacing(key.first, key.second, m_terrain_spacing); - ground_tiles.clear(); - forget_ground_shapes(); - m_terrain_status = format(STR_C("Chunk %d,%d has points every %s now"), key.first, key.second, spacing_label(m_terrain_spacing)); + } + if (false == Global.ctrlState) + m_terrain_selection = {key}; + else if (m_terrain_selection.erase(key) == 0) + m_terrain_selection.insert(key); + m_terrain_status = format(STR_C("Chunks selected: %zu"), m_terrain_selection.size()); break; } case terrain_tool::water: @@ -2951,6 +3106,9 @@ void editor_mode::handle_terrain_brush(double Deltatime) case terrain_tool::paint: m_streamer.paint(world.x, world.z, m_terrain_brush_radius, std::min(1.0, rate * 0.25), Global.shiftState ? std::uint16_t{0} : static_cast(m_terrain_layer)); break; + case terrain_tool::restore: + shaped = m_streamer.restore_stitching(world.x, world.z, m_terrain_brush_radius, std::min(1.0, rate * 0.5)); + break; default: break; } @@ -2962,6 +3120,22 @@ void editor_mode::handle_terrain_brush(double Deltatime) } } +void editor_mode::convert_selected_chunks() +{ + // with 0.5 m spacing the paint can be as fine, the other spacings keep a sample per metre + auto const paint = m_terrain_convert_paint ? (m_terrain_convert_spacing < 0.75f ? heightmap::default_paint_samples * 2 : heightmap::default_paint_samples) : 0; + std::size_t converted = 0; + for (auto const &key : m_terrain_selection) + if (m_streamer.spacing(key.first, key.second, m_terrain_convert_spacing, paint)) + ++converted; + if (converted > 0) + { + ground_tiles.clear(); + forget_ground_shapes(); + } + m_terrain_status = format(STR_C("Chunks converted to %s: %zu of %zu"), spacing_label(m_terrain_convert_spacing), converted, m_terrain_selection.size()); +} + bool editor_mode::pick_terrain_target() { glm::dvec3 const offset = GfxRenderer->Mouse_Position(); diff --git a/application/editormode.h b/application/editormode.h index e6258fee5..6b21786c1 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -311,11 +311,18 @@ class editor_mode : public application_mode, private editor_track::observer smooth, level, // leads the ground to the target height, Ctrl: picks the target height under the cursor paint, // paints the chosen material, Shift: the first material of the palette - spacing, // gives the clicked chunk the chosen point spacing - water // outlines a body of water + spacing, // selects chunks (Ctrl: adds or takes away one), whose point spacing is then converted + water, // outlines a body of water + restore // takes the touch-ups over the modifiers back }; terrain_tool m_terrain_tool{terrain_tool::none}; - bool terrain_brush() const { return m_terrain_tool == terrain_tool::sculpt || m_terrain_tool == terrain_tool::smooth || m_terrain_tool == terrain_tool::level || m_terrain_tool == terrain_tool::paint; } + bool terrain_brush() const + { + return m_terrain_tool == terrain_tool::sculpt || m_terrain_tool == terrain_tool::smooth || m_terrain_tool == terrain_tool::level || m_terrain_tool == terrain_tool::paint || + m_terrain_tool == terrain_tool::restore; + } + // converts the point spacing of the selected chunks to m_terrain_convert_spacing + void convert_selected_chunks(); // takes the height of whatever is under the cursor (terrain, track, model) for the target of the level brush. returns: false if there's nothing bool pick_terrain_target(); bool terrain_clicking() const { return m_terrain_tool == terrain_tool::chunks || m_terrain_tool == terrain_tool::spacing || m_terrain_tool == terrain_tool::water; } @@ -427,6 +434,14 @@ class editor_mode : public application_mode, private editor_track::observer bool m_water_level_edited{false}; // the level was given by hand, the points clicked don't change it char m_water_material[128]{""}; int m_water_selected{-1}; + char m_water_selected_material[128]{""}; // material of the chosen water, while it's edited + int m_water_material_of{-1}; // the water whose material is in the field above + float m_water_selected_size{0.0f}; // metres its texture repeats at, 0: given by the material + char m_water_default_material[128]{""}; // of the waters which don't name their own, while it's edited + bool m_water_default_edited{false}; + std::set m_terrain_selection; // chunks chosen with the spacing tool + float m_terrain_convert_spacing{1.0f}; // point spacing the selected chunks are converted to + bool m_terrain_convert_paint{true}; // chunks converted to 0.5 m get paint samples every 0.5 m too float m_water_selected_level{0.0f}; // level of the chosen water, while it's edited bool m_water_level_dragged{false}; std::string m_terrain_status; diff --git a/application/editormodeselftest.cpp b/application/editormodeselftest.cpp index 5cb2fe204..cd138fcca 100644 --- a/application/editormodeselftest.cpp +++ b/application/editormodeselftest.cpp @@ -78,6 +78,13 @@ http://mozilla.org/MPL/2.0/. // terrainadd chunks made around the camera, count x count, as the button of the chunks panel does it // terrainprobe logs the height of the heightmap terrain and the materials of the chunk // terrainconvert converts every material of the terrain files of the scenery +// terrainmodifier a straight modifier, as the vertical profile makes them +// terraintouchup <0|1> the brushes touch up over the modifiers, or shape the ground under them +// terrainrestore a stroke of the restore brush +// terrainbake the modifier baked into the ground +// terrainselect [add] the chunk selected with the spacing tool (add: Ctrl) +// terrainresolution [paint 0|1] the selected chunks converted, as the button of the resolution panel does it +// terrainwater [size] material and repeat of a body of water; terrainwaterdefault // orthophoto [in scene 0|1] the imagery layer on, placed and fitted as given // screenshot // save @@ -1168,6 +1175,90 @@ void editor_mode::selftest_step() forget_ground(); WriteLog(format("SELFTEST %s %.1f %.1f: %s", command.c_str(), x, z, changed ? "changed" : "nothing changed")); } + else if (command == "terrainmodifier") + { + heightmap::modifier modifier; + heightmap::corridor_point a, b; + double formation{0.0}, halfwidth{3.5}; + words >> modifier.name >> a.position.x >> a.position.y >> b.position.x >> b.position.y >> formation >> halfwidth; + a.formation = b.formation = formation; + a.half_width = b.half_width = halfwidth; + modifier.points = {a, b}; + m_streamer.modifier(std::move(modifier)); + forget_ground(); + WriteLog(format("SELFTEST terrainmodifier: %zu modifiers", m_streamer.modifiers().size())); + } + else if (command == "terraintouchup") + { + int state{1}; + words >> state; + m_streamer.touch_up(state != 0); + WriteLog(format("SELFTEST terraintouchup %d", state)); + } + else if (command == "terrainrestore") + { + double x{0.0}, z{0.0}, radius{10.0}; + words >> x >> z >> radius; + auto const changed{m_streamer.restore_stitching(x, z, radius, 1.0)}; + forget_ground(); + WriteLog(format("SELFTEST terrainrestore %.1f %.1f: %s, touch-ups left %zu", x, z, changed ? "changed" : "nothing changed", m_streamer.touched_up())); + } + else if (command == "terrainbake") + { + std::string name; + words >> name; + auto const baked{m_streamer.bake_modifier(name)}; + forget_ground(); + WriteLog(format("SELFTEST terrainbake %s: %s, %zu modifiers left", name.c_str(), baked ? "baked" : "not found", m_streamer.modifiers().size())); + } + else if (command == "terrainselect") + { + int cx{0}, cz{0}; + std::string add; + words >> cx >> cz >> add; + if (add != "add") + m_terrain_selection.clear(); + if (m_streamer.exists({cx, cz})) + m_terrain_selection.insert({cx, cz}); + WriteLog(format("SELFTEST terrainselect: %zu selected", m_terrain_selection.size())); + } + else if (command == "terrainresolution") + { + float spacing{1.f}; + int paint{1}; + words >> spacing >> paint; + m_terrain_convert_spacing = heightmap::valid_spacing(spacing); + m_terrain_convert_paint = paint != 0; + convert_selected_chunks(); + WriteLog("SELFTEST terrainresolution: " + m_terrain_status); + } + else if (command == "terrainwater" || command == "terrainwaterdefault") + { + if (command == "terrainwaterdefault") + { + std::string material; + words >> material; + m_streamer.water_material(material); + } + else + { + std::size_t index{0}; + std::string material; + float size{0.f}; + words >> index >> material >> size; + auto water{m_streamer.water()}; + if (index < water.size()) + { + water[index].material = material == "-" ? std::string{} : material; + water[index].size = size; + m_streamer.water(std::move(water)); + } + } + std::string list; + for (auto const &body : m_streamer.water()) + list += format(" [%s: %s, %.1f m]", body.name.c_str(), body.material.empty() ? "default" : body.material.c_str(), body.size); + WriteLog("SELFTEST " + command + ": default " + m_streamer.manifest().water_material + list); + } else if (command == "terrainadd") { int count{1}; @@ -1191,7 +1282,18 @@ void editor_mode::selftest_step() materials += (layer < palette.size() ? palette[layer].material : std::string{"?"}) + " "; } auto const found{m_streamer.height_at(x, z, height)}; - WriteLog(format("SELFTEST terrainprobe %.1f %.1f: %s %.3f, %zu chunks, materials %s", x, z, found ? "height" : "no terrain", height, m_streamer.resident(), materials.c_str())); + std::string grid; + if (chunk != nullptr) + { + auto const &data{chunk->data()}; + double base{0.0}, adjust{0.0}; + if (false == data.base.empty()) + base = data.height_in(data.base, x, z); + if (false == data.adjust.empty()) + adjust = data.height_in(data.adjust, x, z); + grid = format(", spacing %.1f, paint %d, base %s %.3f, touch-up %.3f", data.spacing(), data.paint, data.base.empty() ? "none" : "", base, adjust); + } + WriteLog(format("SELFTEST terrainprobe %.1f %.1f: %s %.3f, %zu chunks, materials %s%s", x, z, found ? "height" : "no terrain", height, m_streamer.resident(), materials.c_str(), grid.c_str())); } else if (command == "terrainconvert") { diff --git a/application/editormodeviewport.cpp b/application/editormodeviewport.cpp index 847ba8e4d..8a9052d94 100644 --- a/application/editormodeviewport.cpp +++ b/application/editormodeviewport.cpp @@ -213,8 +213,11 @@ void editor_mode::work_area_tools(std::vector &Buttons) chosen(terrain_tool::level), choose(terrain_tool::level)}); Buttons.push_back({icon::brush, STR_C("Paint"), nullptr, STR_C("LMB paints the material chosen in the palette, Shift+LMB the first material of the palette"), chosen(terrain_tool::paint), choose(terrain_tool::paint)}); Buttons.push_back({icon::chunks, STR_C("Chunks"), nullptr, STR_C("LMB adds a chunk next to the clicked one, Shift+LMB removes it"), chosen(terrain_tool::chunks), choose(terrain_tool::chunks)}); - Buttons.push_back({icon::count, STR_C("Point spacing"), nullptr, STR_C("LMB gives the clicked chunk the point spacing chosen in the tool options"), chosen(terrain_tool::spacing), choose(terrain_tool::spacing)}); + Buttons.push_back({icon::count, STR_C("Point spacing"), nullptr, STR_C("LMB selects the clicked chunk, Ctrl+LMB adds one or takes it away; the tool options convert the point spacing of the selected"), + chosen(terrain_tool::spacing), choose(terrain_tool::spacing)}); Buttons.push_back({icon::area_fill, STR_C("Water"), nullptr, STR_C("LMB adds a point of the outline of a body of water, Shift+LMB takes the last one back"), chosen(terrain_tool::water), choose(terrain_tool::water)}); + Buttons.push_back({icon::joints, STR_C("Restore"), nullptr, STR_C("LMB takes back the touch-ups made over the tracks: the terrain returns to the shape the tracks give it"), chosen(terrain_tool::restore), + choose(terrain_tool::restore)}); auto const orthophoto{m_orthophoto.enabled()}; Buttons.push_back({icon::orthophoto, STR_C("Orthophoto"), nullptr, STR_C("Aerial imagery of geoportal.gov.pl under the scenery, laid out by the origin of the scenery"), orthophoto, [this, orthophoto]() { m_orthophoto.enabled(false == orthophoto); }, true}); diff --git a/editor/editorTerrainStreamer.cpp b/editor/editorTerrainStreamer.cpp index 27d75a959..7a6dbab2b 100644 --- a/editor/editorTerrainStreamer.cpp +++ b/editor/editorTerrainStreamer.cpp @@ -954,16 +954,21 @@ void terrain_streamer::remove_chunk(int Cx, int Cz) touch_neighbours(key); } -void terrain_streamer::spacing(int Cx, int Cz, float Spacing) +bool terrain_streamer::spacing(int Cx, int Cz, float Spacing, int Paint) { auto *chunk{load_now({Cx, Cz})}; - if (chunk == nullptr || heightmap::cells_for(Spacing) == chunk->cells()) - return; + if (chunk == nullptr) + return false; + auto const ¤t{chunk->data()}; + auto const repaint{Paint > 0 && current.paint > 0 && Paint != current.paint}; + if (heightmap::cells_for(Spacing) == current.cells && false == repaint) + return false; remember(*chunk); - chunk->replace(chunk->data().resampled(Spacing), true, false); + chunk->replace(current.resampled(Spacing, Paint), true, repaint); auto const low{chunk->data().corner()}; apply_modifiers(*chunk, low, low + glm::dvec2{heightmap::chunk_size}); touch_neighbours(chunk->key()); + return true; } bool terrain_streamer::reshape(glm::dvec2 const &Min, glm::dvec2 const &Max, std::function const &Shaper) @@ -978,24 +983,119 @@ bool terrain_streamer::reshape(glm::dvec2 const &Min, glm::dvec2 const &Max, std auto const zs{index_range(low.y, step, current.side(), Min.y, Max.y)}; if (xs.first > xs.second || zs.first > zs.second) continue; - // a copy is shaped, and taken only if anything changed - auto heights{current.base.empty() ? current.heights : current.base}; - bool shaped{false}; + if (current.base.empty() || false == m_touchup) + { + // a copy is shaped, and taken only if anything changed + auto heights{current.base.empty() ? current.heights : current.base}; + bool shaped{false}; + for (int iz = zs.first; iz <= zs.second; ++iz) + for (int ix = xs.first; ix <= xs.second; ++ix) + shaped |= Shaper(low.x + ix * step, low.y + iz * step, heights[static_cast(iz) * current.side() + ix]); + if (false == shaped) + continue; + remember(*chunk); + auto &data{chunk->edit(true, false)}; + (data.base.empty() ? data.heights : data.base) = std::move(heights); + if (false == data.base.empty()) + apply_modifiers(*chunk, Min, Max); + changed = true; + continue; + } + // the terrain as it's seen is shaped. where a modifier shapes the ground (or a touch-up is there already) the change + // is a touch-up over it, elsewhere it's the ground under the modifiers, which may then reach further + auto heights{current.heights}; + auto base{current.base}; + auto adjust{current.adjust.empty() ? std::vector(heights.size(), 0.f) : current.adjust}; + bool shaped{false}, touched{false}; for (int iz = zs.first; iz <= zs.second; ++iz) for (int ix = xs.first; ix <= xs.second; ++ix) - shaped |= Shaper(low.x + ix * step, low.y + iz * step, heights[static_cast(iz) * current.side() + ix]); + { + auto const index{static_cast(iz) * current.side() + ix}; + auto height{heights[index]}; + if (false == Shaper(low.x + ix * step, low.y + iz * step, height)) + continue; + shaped = true; + auto const change{height - heights[index]}; + auto const shapedbymodifier{std::abs(heights[index] - adjust[index] - base[index]) > 0.0005f}; + if (shapedbymodifier || adjust[index] != 0.f) + { + adjust[index] += change; + touched = true; + } + else + base[index] += change; + heights[index] = height; + } if (false == shaped) continue; remember(*chunk); auto &data{chunk->edit(true, false)}; - (data.base.empty() ? data.heights : data.base) = std::move(heights); - if (false == data.base.empty()) - apply_modifiers(*chunk, Min, Max); + data.base = std::move(base); + if (touched) + data.adjust = std::move(adjust); + data.heights = std::move(heights); + apply_modifiers(*chunk, Min, Max); changed = true; } return changed; } +bool terrain_streamer::restore_stitching(double X, double Z, double Radius, double Amount) +{ + if (Radius <= 0.0 || Amount <= 0.0) + return false; + glm::dvec2 const low{X - Radius, Z - Radius}, high{X + Radius, Z + Radius}; + bool changed{false}; + for (auto *chunk : chunks_in(low, high, false)) + { + auto const ¤t{chunk->data()}; + if (current.adjust.empty()) + continue; + auto const corner{current.corner()}; + auto const step{current.spacing()}; + auto const xs{index_range(corner.x, step, current.side(), low.x, high.x)}; + auto const zs{index_range(corner.y, step, current.side(), low.y, high.y)}; + auto adjust{current.adjust}; + bool restored{false}; + for (int iz = zs.first; iz <= zs.second; ++iz) + for (int ix = xs.first; ix <= xs.second; ++ix) + { + auto const vx{corner.x + ix * step}, vz{corner.y + iz * step}; + auto const distance{std::sqrt((vx - X) * (vx - X) + (vz - Z) * (vz - Z))}; + auto &value{adjust[static_cast(iz) * current.side() + ix]}; + if (distance > Radius || value == 0.f) + continue; + value *= static_cast(1.0 - std::min(1.0, Amount * falloff(distance, Radius))); + // what's below the step of the stored heights is gone + if (std::abs(value) < heightmap::height_step * 0.5) + value = 0.f; + restored = true; + } + if (false == restored) + continue; + remember(*chunk); + auto &data{chunk->edit(true, false)}; + if (std::all_of(adjust.begin(), adjust.end(), [](float const Value) { return Value == 0.f; })) + data.adjust.clear(); + else + data.adjust = std::move(adjust); + apply_modifiers(*chunk, low, high); + changed = true; + } + return changed; +} + +std::size_t terrain_streamer::touched_up() const +{ + std::size_t count{0}; + for (auto const &entry : m_chunks) + { + auto const &adjust{entry.second->data().adjust}; + count += static_cast(std::count_if(adjust.begin(), adjust.end(), [](float const Value) { return Value != 0.f; })); + } + return count; +} + bool terrain_streamer::sculpt(double X, double Z, double Radius, double Strength) { if (Radius <= 0.0) @@ -1017,7 +1117,7 @@ bool terrain_streamer::smooth(double X, double Z, double Radius, double Amount) // every chunk the brush touches is smoothed from the same ground, so the edges they share stay together std::vector>> before; for (auto *chunk : chunks_in(low - glm::dvec2{6.0}, high + glm::dvec2{6.0}, false)) - before.emplace_back(chunk, chunk->data().base.empty() ? chunk->heights() : chunk->data().base); + before.emplace_back(chunk, (chunk->data().base.empty() || m_touchup) ? chunk->heights() : chunk->data().base); auto const ground = [&](double const Gx, double const Gz, double const Fallback) { for (auto const &entry : before) if (entry.first->contains(Gx, Gz)) @@ -1201,6 +1301,16 @@ void terrain_streamer::water(std::vector Water) m_waterchanged = true; } +void terrain_streamer::water_material(std::string const &Material) +{ + if (Material.empty() || Material == m_manifest.water_material) + return; + remember_manifest(); + m_manifest.water_material = Material; + m_manifestchanged = true; + m_waterchanged = true; +} + void terrain_streamer::apply_modifiers(editor_terrain &Chunk, glm::dvec2 const &Min, glm::dvec2 const &Max) { auto const ¤t{Chunk.data()}; @@ -1220,20 +1330,28 @@ void terrain_streamer::apply_modifiers(editor_terrain &Chunk, glm::dvec2 const & } if (false == reachesany) { - // no modifier reaches the chunk (any more): its own heights are what's left + // no modifier reaches the chunk (any more): its own heights are what's left, with the touch-ups made over the modifiers if (false == current.base.empty()) { remember(Chunk); auto &data{Chunk.edit(true, false)}; data.heights = std::move(data.base); + if (data.adjust.size() == data.heights.size()) + for (std::size_t index = 0; index < data.heights.size(); ++index) + data.heights[index] += data.adjust[index]; data.base.clear(); + data.adjust.clear(); } return; } remember(Chunk); auto &data{Chunk.edit(true, false)}; if (data.base.empty()) + { data.base = data.heights; + data.adjust.clear(); + } + auto const touchups{data.adjust.size() == data.heights.size()}; auto const step{data.spacing()}; auto const xs{index_range(low.x, step, data.side(), std::max(Min.x, low.x), std::min(Max.x, high.x))}; auto const zs{index_range(low.y, step, data.side(), std::max(Min.y, low.y), std::min(Max.y, high.y))}; @@ -1245,7 +1363,7 @@ void terrain_streamer::apply_modifiers(editor_terrain &Chunk, glm::dvec2 const & auto const x{low.x + ix * step}, z{low.y + iz * step}; for (auto const &shape : shapes) shape.apply(x, z, height); - data.heights[index] = height; + data.heights[index] = touchups ? height + data.adjust[index] : height; } } @@ -1287,6 +1405,41 @@ bool terrain_streamer::remove_modifier(std::string const &Name) return true; } +bool terrain_streamer::bake_modifier(std::string const &Name) +{ + auto const existing{std::find_if(m_manifest.modifiers.begin(), m_manifest.modifiers.end(), [&](heightmap::modifier const &Item) { return Item.name == Name; })}; + if (existing == m_manifest.modifiers.end()) + return false; + remember_manifest(); + auto const baked{*existing}; + auto const bounds{baked.bounds()}; + heightmap::modifier_shape const shape{baked}; + // the ground under the modifiers takes the shape this one gives it; the other modifiers and the touch-ups go on top + for (auto *chunk : chunks_in(bounds.first, bounds.second, true)) + { + auto const ¤t{chunk->data()}; + if (current.base.empty()) + continue; + auto const low{current.corner()}; + auto const step{current.spacing()}; + auto const xs{index_range(low.x, step, current.side(), bounds.first.x, bounds.second.x)}; + auto const zs{index_range(low.y, step, current.side(), bounds.first.y, bounds.second.y)}; + auto base{current.base}; + bool shaped{false}; + for (int iz = zs.first; iz <= zs.second; ++iz) + for (int ix = xs.first; ix <= xs.second; ++ix) + shaped |= shape.apply(low.x + ix * step, low.y + iz * step, base[static_cast(iz) * current.side() + ix]); + if (false == shaped) + continue; + remember(*chunk); + chunk->edit(true, false).base = std::move(base); + } + m_manifest.modifiers.erase(std::find_if(m_manifest.modifiers.begin(), m_manifest.modifiers.end(), [&](heightmap::modifier const &Item) { return Item.name == Name; })); + m_manifestchanged = true; + apply_modifiers(bounds.first, bounds.second); + return true; +} + bool terrain_streamer::modified() const { if (m_manifestchanged || false == m_removed.empty()) @@ -1326,6 +1479,7 @@ void terrain_streamer::remember_manifest() m_change.manifest = true; m_change.layers = m_manifest.layers; m_change.water = m_manifest.water; + m_change.water_material = m_manifest.water_material; m_change.modifiers = m_manifest.modifiers; } @@ -1372,12 +1526,15 @@ terrain_streamer::change terrain_streamer::restore(change const &Change) opposite.manifest = true; opposite.layers = m_manifest.layers; opposite.water = m_manifest.water; + opposite.water_material = m_manifest.water_material; opposite.modifiers = m_manifest.modifiers; auto const samelayers{std::equal(Change.layers.begin(), Change.layers.end(), m_manifest.layers.begin(), m_manifest.layers.end(), [](heightmap::layer_def const &A, heightmap::layer_def const &B) { return A.material == B.material && A.size == B.size; })}; m_manifest.layers = Change.layers; m_manifest.modifiers = Change.modifiers; m_manifest.water = Change.water; + if (false == Change.water_material.empty()) + m_manifest.water_material = Change.water_material; m_manifestchanged = true; m_waterchanged = true; if (false == samelayers) @@ -1523,7 +1680,7 @@ void terrain_streamer::build_water() continue; auto const material{GfxRenderer->Fetch_Material(body.material.empty() ? m_manifest.water_material : body.material)}; auto const *materialdata{GfxRenderer->Material(material)}; - auto const repeat{(materialdata != nullptr && materialdata->GetSize().x > 0.f) ? static_cast(materialdata->GetSize().x) : 8.0}; + auto const repeat{body.size > 0.f ? static_cast(body.size) : (materialdata != nullptr && materialdata->GetSize().x > 0.f) ? static_cast(materialdata->GetSize().x) : 8.0}; glm::dvec3 const centre{centroid.x, body.level, centroid.y}; auto §ion{simulation::Region->section(centre)}; // the section makes the geometry of its own shapes once, before it's drawn; done first, it leaves ours alone diff --git a/editor/editorTerrainStreamer.hpp b/editor/editorTerrainStreamer.hpp index 62e3cd9e7..7fc44813d 100644 --- a/editor/editorTerrainStreamer.hpp +++ b/editor/editorTerrainStreamer.hpp @@ -87,8 +87,9 @@ class terrain_streamer // a chunk made elsewhere, at the place its key says; its layers are indices of the palette bool add_chunk(std::shared_ptr Data); void remove_chunk(int Cx, int Cz); - // changes the point spacing of the chunk at (Cx, Cz), heights resampled - void spacing(int Cx, int Cz, float Spacing); + // changes the point spacing of the chunk at (Cx, Cz), heights resampled; Paint: paint samples along a side less one + // the chunk gets, 0 keeps the ones it has. returns: true if the chunk changed + bool spacing(int Cx, int Cz, float Spacing, int Paint = 0); // raises (Strength > 0) or lowers the ground within Radius of (X,Z), with a smooth falloff bool sculpt(double X, double Z, double Radius, double Strength); // evens out the ground within Radius of (X,Z), Amount (0..1) of the way at the centre @@ -96,9 +97,19 @@ class terrain_streamer // leads the ground within Radius of (X,Z) towards the height Target, Amount (0..1) of the way at the centre; // Mode: 0 up and down, 1 only raises it, 2 only lowers it bool level(double X, double Z, double Radius, double Target, double Amount, int Mode = 0); - // gives every grid point within the rectangle to Shaper, with its world position and height (before the modifiers); - // Shaper returns true if it changed the height + // gives every grid point within the rectangle to Shaper, with its world position and height; Shaper returns true if it + // changed the height. where the modifiers shape the ground the change is a touch-up kept over them (see touch_up()), + // elsewhere it changes the ground under them bool reshape(glm::dvec2 const &Min, glm::dvec2 const &Max, std::function const &Shaper); + // true: the brushes shape the terrain as it's seen, also where the modifiers (tracks) shape it, the changes kept there + // as touch-ups over the modifiers; false: the brushes shape only the ground under the modifiers, which keep their shape + void touch_up(bool const State) { m_touchup = State; } + bool touch_up() const { return m_touchup; } + // takes the touch-ups within Radius of (X,Z) back, Amount (0..1) of the way at the centre: the terrain goes back to the + // shape the modifiers give it + bool restore_stitching(double X, double Z, double Radius, double Amount); + // grid points with touch-ups over the modifiers, in the chunks in memory + std::size_t touched_up() const; // paints the material of the palette entry Layer within Radius of (X,Z), Strength (0..1) of the way at the centre bool paint(double X, double Z, double Radius, double Strength, std::uint16_t Layer); // palette entry of the material, added to the palette if needed @@ -111,9 +122,14 @@ class terrain_streamer // bodies of water std::vector const &water() const { return m_manifest.water; } void water(std::vector Water); + // material of the bodies of water which don't name their own + void water_material(std::string const &Material); // modifiers: added or replaced by name void modifier(heightmap::modifier Modifier); bool remove_modifier(std::string const &Name); + // the ground takes the shape the modifier gives it for good, and the modifier is removed: from then on the + // terrain there is shaped by hand like anywhere else + bool bake_modifier(std::string const &Name); std::vector const &modifiers() const { return m_manifest.modifiers; } // changed since the last save bool modified() const; @@ -122,9 +138,10 @@ class terrain_streamer struct change { std::map chunks; // the data the chunks had; null: there was no chunk - bool manifest{false}; // the palette, the water and the modifiers below were changed + bool manifest{false}; // the palette, the water (and its material) and the modifiers below were changed std::vector layers; std::vector water; + std::string water_material; std::vector modifiers; bool empty() const { return chunks.empty() && false == manifest; } @@ -238,6 +255,7 @@ class terrain_streamer heightmap::manifest m_manifest; bool m_manifestchanged{false}; float m_detail{120.f}; + bool m_touchup{true}; int m_radius{2}; std::map m_packs; diff --git a/scene/heightmapterrain.cpp b/scene/heightmapterrain.cpp index ea2bde069..e2e508ac4 100644 --- a/scene/heightmapterrain.cpp +++ b/scene/heightmapterrain.cpp @@ -38,6 +38,7 @@ std::uint32_t constexpr tag_chunk{fourcc('C', 'H', 'N', 'K')}; std::uint32_t constexpr tag_heights{fourcc('H', 'G', 'H', 'T')}; std::uint32_t constexpr tag_base{fourcc('H', 'B', 'A', 'S')}; std::uint32_t constexpr tag_paint{fourcc('S', 'P', 'L', 'T')}; +std::uint32_t constexpr tag_adjust{fourcc('H', 'A', 'D', 'J')}; std::uint32_t constexpr pack_magic{fourcc('T', 'C', 'H', '1')}; std::uint32_t constexpr pack_version{1}; @@ -262,23 +263,83 @@ std::shared_ptr chunk_data::make_flat(chunk_key const &Key, float co return chunk; } -std::shared_ptr chunk_data::resampled(float const Spacing) const +std::shared_ptr chunk_data::resampled(float const Spacing, int const Paint) const { auto chunk{std::make_shared(*this)}; chunk->cells = cells_for(Spacing); - if (chunk->cells == cells) - return chunk; - auto const low{corner()}; - auto const step{chunk->spacing()}; - auto const resample = [&](std::vector const &Source, std::vector &Target) { - Target.resize(static_cast(chunk->side()) * chunk->side()); - for (int iz = 0; iz <= chunk->cells; ++iz) - for (int ix = 0; ix <= chunk->cells; ++ix) - Target[static_cast(iz) * chunk->side() + ix] = static_cast(height_in(Source, low.x + ix * step, low.y + iz * step)); - }; - resample(heights, chunk->heights); - if (false == base.empty()) - resample(base, chunk->base); + if (chunk->cells != cells) + { + auto const low{corner()}; + auto const step{chunk->spacing()}; + // a coarser grid would otherwise pick single points of the finer one: each point inside the chunk takes the average of + // the ground around it (a tent of the size of its cell). the points of the edges are the ground itself, as they're + // shared with the neighbours, which keep theirs + auto const reach{chunk->cells < cells ? step * 0.5 : 0.0}; + auto const taps{reach > 0.0 ? std::max(1, static_cast(std::ceil(reach / spacing()))) : 0}; + auto const resample = [&](std::vector const &Source, std::vector &Target) { + Target.resize(static_cast(chunk->side()) * chunk->side()); + for (int iz = 0; iz <= chunk->cells; ++iz) + for (int ix = 0; ix <= chunk->cells; ++ix) + { + auto const x{low.x + ix * step}, z{low.y + iz * step}; + auto value{height_in(Source, x, z)}; + if (taps > 0 && ix > 0 && iz > 0 && ix < chunk->cells && iz < chunk->cells) + { + double sum{0.0}, weights{0.0}; + for (int dz = -taps; dz <= taps; ++dz) + for (int dx = -taps; dx <= taps; ++dx) + { + auto const weight{static_cast((taps + 1 - std::abs(dx)) * (taps + 1 - std::abs(dz)))}; + sum += weight * height_in(Source, x + dx * reach / taps, z + dz * reach / taps); + weights += weight; + } + value = sum / weights; + } + Target[static_cast(iz) * chunk->side() + ix] = static_cast(value); + } + }; + resample(heights, chunk->heights); + if (false == base.empty()) + resample(base, chunk->base); + if (false == adjust.empty()) + resample(adjust, chunk->adjust); + } + if (Paint > 0 && paint > 0 && Paint != paint) + { + // the weights of the samples between the old ones blended from them, and brought back to 255 a sample + auto const count{layer_count()}; + auto const oldside{static_cast(paint + 1)}; + auto const newside{static_cast(Paint + 1)}; + chunk->paint = Paint; + chunk->weights.assign(newside * newside * count, 0); + std::vector values(count); + for (std::size_t iz = 0; iz < newside; ++iz) + for (std::size_t ix = 0; ix < newside; ++ix) + { + auto const fx{static_cast(ix) * paint / Paint}, fz{static_cast(iz) * paint / Paint}; + auto const x0{std::min(static_cast(fx), oldside - 2)}, z0{std::min(static_cast(fz), oldside - 2)}; + auto const tx{fx - x0}, tz{fz - z0}; + double total{0.0}; + for (std::size_t slot = 0; slot < count; ++slot) + { + auto const at = [&](std::size_t const X, std::size_t const Z) { return static_cast(weights[slot * oldside * oldside + Z * oldside + X]); }; + values[slot] = (at(x0, z0) * (1.0 - tx) + at(x0 + 1, z0) * tx) * (1.0 - tz) + (at(x0, z0 + 1) * (1.0 - tx) + at(x0 + 1, z0 + 1) * tx) * tz; + total += values[slot]; + } + // rounded down, what's left of 255 goes to the heaviest + int sum{0}; + std::size_t heaviest{0}; + for (std::size_t slot = 0; slot < count; ++slot) + { + auto const weight{total > 0.0 ? static_cast(values[slot] * 255.0 / total) : (slot == 0 ? 255 : 0)}; + chunk->weights[slot * newside * newside + iz * newside + ix] = static_cast(weight); + sum += weight; + if (values[slot] > values[heaviest]) + heaviest = slot; + } + chunk->weights[heaviest * newside * newside + iz * newside + ix] += static_cast(255 - sum); + } + } return chunk; } @@ -516,6 +577,8 @@ bool load_manifest(std::string const &Path, manifest &Manifest, std::string *Err water.level = level.as(); if (auto const material{entry["material"]}) water.material = material.as(); + if (auto const size{entry["size"]}) + water.size = std::max(0.f, size.as()); if (auto const outline{entry["outline"]}; outline && outline.IsSequence()) for (auto const &point : outline) if (point.IsSequence() && point.size() >= 2) @@ -583,6 +646,8 @@ bool save_manifest(std::string const &Path, manifest const &Manifest, std::strin out << YAML::Key << "level" << YAML::Value << water.level; if (false == water.material.empty()) out << YAML::Key << "material" << YAML::Value << water.material; + if (water.size > 0.f) + out << YAML::Key << "size" << YAML::Value << water.size; out << YAML::Key << "outline" << YAML::Value << YAML::BeginSeq; for (auto const &point : water.outline) out << YAML::Flow << YAML::BeginSeq << point.x << point.y << YAML::EndSeq; @@ -764,7 +829,7 @@ std::shared_ptr pack_file::read(chunk_key const &Key, std::string *E auto chunk{std::make_shared()}; chunk->key = Key; - slice const *heights{nullptr}, *base{nullptr}, *paint{nullptr}; + slice const *heights{nullptr}, *base{nullptr}, *adjust{nullptr}, *paint{nullptr}; bool header{false}; for (auto const &slice : slices) { @@ -787,6 +852,8 @@ std::shared_ptr pack_file::read(chunk_key const &Key, std::string *E heights = &slice; else if (slice.tag == tag_base) base = &slice; + else if (slice.tag == tag_adjust) + adjust = &slice; else if (slice.tag == tag_paint) paint = &slice; // slices of unknown kinds are left for newer versions of the simulator @@ -801,6 +868,9 @@ std::shared_ptr pack_file::read(chunk_key const &Key, std::string *E return fail("damaged heights"); if (base != nullptr && (false == load(*base, data) || false == decode_heights(data, count, chunk->base))) return fail("damaged base heights"); + // touch-ups go with the base heights only + if (adjust != nullptr && false == chunk->base.empty() && (false == load(*adjust, data) || false == decode_heights(data, count, chunk->adjust))) + return fail("damaged touch-ups"); if (chunk->paint > 0) { auto const expected{static_cast(chunk->paint + 1) * (chunk->paint + 1) * chunk->layer_count()}; @@ -864,6 +934,12 @@ bool write_pack(std::string const &Path, pack_key const &Key, std::vectorbase, data); add(table, tag_base, data); + if (chunk->adjust.size() == chunk->heights.size()) + { + data.clear(); + encode_heights(chunk->adjust, data); + add(table, tag_adjust, data); + } } if (chunk->paint > 0 && chunk->layer_count() > 1) add(table, tag_paint, chunk->weights); diff --git a/scene/heightmapterrain.h b/scene/heightmapterrain.h index cc938b3aa..8b2c17b94 100644 --- a/scene/heightmapterrain.h +++ b/scene/heightmapterrain.h @@ -64,6 +64,9 @@ struct chunk_data int cells{0}; // quads along a side; (cells + 1)^2 grid points std::vector heights; // world y of the grid points, rows of growing z, from the lowest x std::vector base; // the heights before the modifiers were applied; empty where no modifier reaches the chunk + // touch-ups made by hand over what the modifiers give, added to it: heights = modifiers(base) + adjust. + // empty when there are none, and always when base is empty + std::vector adjust; int paint{0}; // paint samples along a side, less one. 0: the chunk is covered with its first layer alone std::array layers; // indices of the materials in the terrain palette, no_layer for unused std::vector weights; // planar, (paint + 1)^2 per used layer, rows like the heights; weights of a sample add up to 255 @@ -84,8 +87,10 @@ struct chunk_data bool contains(double const X, double const Z) const; // a flat chunk of specified spacing at specified height, covered with the first material of the palette static std::shared_ptr make_flat(chunk_key const &Key, float const Spacing, float const Height); - // the same chunk with the grid of another spacing, heights and paint taken over - std::shared_ptr resampled(float const Spacing) const; + // the same chunk with the grid of another spacing, heights and paint taken over. a coarser grid takes the average + // of the ground around each of its points (the finer one only its own heights). Paint: paint samples along a side + // less one the chunk gets, 0 keeps the ones it has + std::shared_ptr resampled(float const Spacing, int const Paint = 0) const; // weight of specified layer slot at paint sample (Ix, Iz) std::uint8_t weight(std::size_t const Slot, int const Ix, int const Iz) const; // layer slot of specified palette index, or -1 @@ -106,6 +111,7 @@ struct water_body std::string name; double level{0.0}; std::string material; // empty: the default water material + float size{0.f}; // metres the texture repeats at; 0: the size given by the material, or 8 m std::vector outline; // x, z }; @@ -183,6 +189,7 @@ bool save_manifest(std::string const &Path, manifest const &Manifest, std::strin // 'HGHT' heights: uint8 encoding (0: int32 base and uint16 steps of height_step above it, delta coded in row order; // 1: float32), then the values // 'HBAS' heights before the modifiers, as 'HGHT' +// 'HADJ' touch-ups over the modifiers, as 'HGHT' (only with 'HBAS'; older versions skip it and keep the heights) // 'SPLT' paint weights: uint8 per sample per used layer, planar class pack_file { From 7b9eaf1ccb6c1383745798ce5d85eccf129160b6 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Sat, 10 Oct 2026 17:35:52 +0200 Subject: [PATCH 200/430] Editor terrain: area fill with blurred or sharp edge, texture rotation --- application/editormode.cpp | 104 ++++++++++++++++++++++++++++- application/editormode.h | 10 ++- application/editormodeselftest.cpp | 35 ++++++++++ application/editormodeviewport.cpp | 2 + editor/editorTerrainStreamer.cpp | 83 +++++++++++++++++++---- editor/editorTerrainStreamer.hpp | 13 +++- rendering/opengl33terrain.cpp | 4 ++ rendering/renderer.h | 1 + scene/heightmapterrain.cpp | 13 +++- scene/heightmapterrain.h | 4 +- shaders/mat_terrain.frag | 13 ++-- 11 files changed, 255 insertions(+), 27 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 653563a11..2b70bafaa 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -1604,13 +1604,16 @@ void editor_mode::render_terrain_ui() }; // the tools are named like the headers below, which would give them the same IDs ImGui::PushID("terrain_tools"); + // the tools working on a click, then the brushes radio(STR_C("Select"), terrain_tool::none, STR_C("LMB picks the models, as in the surroundings")); ImGui::SameLine(); radio(STR_C("Chunks"), terrain_tool::chunks, STR_C("LMB adds a chunk shaped as the ground under it, next to the clicked one; Shift+LMB removes the clicked chunk")); ImGui::SameLine(); radio(STR_C("Spacing"), terrain_tool::spacing, STR_C("LMB selects the clicked chunk, Ctrl+LMB adds it to the selection or takes it away;\nthe point spacing of the selected chunks is converted in \"Chunk resolution\" below")); ImGui::SameLine(); - radio(STR_C("Restore"), terrain_tool::restore, STR_C("LMB takes back the touch-ups made over the tracks under the brush:\nthe terrain returns to the shape the modifiers (tracks) give it")); + radio(STR_C("Water"), terrain_tool::water, STR_C("LMB adds a point of the outline of a body of water, Shift+LMB takes the last one back")); + ImGui::SameLine(); + radio(STR_C("Fill"), terrain_tool::fill, STR_C("LMB adds a point of the outline of an area to fill with a material, Shift+LMB takes the last one back")); radio(STR_C("Sculpt"), terrain_tool::sculpt, STR_C("LMB raises the terrain under the brush, Shift+LMB lowers it")); ImGui::SameLine(); radio(STR_C("Smooth"), terrain_tool::smooth, STR_C("LMB evens the terrain out under the brush")); @@ -1619,7 +1622,7 @@ void editor_mode::render_terrain_ui() ImGui::SameLine(); radio(STR_C("Paint"), terrain_tool::paint, STR_C("LMB paints the material chosen in the palette, Shift+LMB the first material of the palette")); ImGui::SameLine(); - radio(STR_C("Water"), terrain_tool::water, STR_C("LMB adds a point of the outline of a body of water, Shift+LMB takes the last one back")); + radio(STR_C("Restore"), terrain_tool::restore, STR_C("LMB takes back the touch-ups made over the tracks under the brush:\nthe terrain returns to the shape the modifiers (tracks) give it")); ImGui::PopID(); m_terrain_tool = static_cast(tool); @@ -1747,7 +1750,9 @@ void editor_mode::render_terrain_ui() m_terrain_layer = std::clamp(m_terrain_layer, 0, static_cast(layers.size()) - 1); for (std::size_t i = 0; i < layers.size(); ++i) { - auto const label{layers[i].size > 0.f ? format("%zu: %s (%.1f m)", i, layers[i].material.c_str(), layers[i].size) : format("%zu: %s", i, layers[i].material.c_str())}; + auto label{layers[i].size > 0.f ? format("%zu: %s (%.1f m)", i, layers[i].material.c_str(), layers[i].size) : format("%zu: %s", i, layers[i].material.c_str())}; + if (layers[i].rotation != 0.f) + label += format(STR_C(", turned %.0f deg"), layers[i].rotation); if (ImGui::Selectable(label.c_str(), static_cast(i) == m_terrain_layer)) m_terrain_layer = static_cast(i); // a material dropped on an entry takes its place, on every chunk painted with it @@ -1764,6 +1769,14 @@ void editor_mode::render_terrain_ui() m_streamer.layer_size(static_cast(m_terrain_layer), size); if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", STR_C("Metres the textures of the chosen material repeat at; 0: as the material gives it, or 8 m")); + auto rotation{layers[m_terrain_layer].rotation}; + ImGui::SetNextItemWidth(120.0f); + ImGui::SliderFloat(STR_C("Turned by (deg)"), &rotation, -180.0f, 180.0f, "%.0f"); + if (ImGui::IsItemDeactivatedAfterEdit()) + m_streamer.layer_rotation(static_cast(m_terrain_layer), rotation); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Angle the textures of the chosen material are turned by, on every chunk painted with it.\n" + "Ctrl+click to type it. To have the material turned in one place only, fill it there with an angle of its own.")); } ImGui::SetNextItemWidth(160.0f); ImGui::InputText(STR_C("Material"), m_terrain_material, IM_ARRAYSIZE(m_terrain_material)); @@ -1775,6 +1788,35 @@ void editor_mode::render_terrain_ui() "A texture dragged from the browser onto an entry of the palette takes its place.")); } + if (ImGui::CollapsingHeader(STR_C("Fill"), m_terrain_tool == terrain_tool::fill ? ImGuiTreeNodeFlags_DefaultOpen : 0)) + { + auto const &layers{m_streamer.manifest().layers}; + if (false == layers.empty()) + { + auto const &chosen{layers[std::clamp(m_terrain_layer, 0, static_cast(layers.size()) - 1)]}; + ImGui::Text(STR_C("Material: %s (chosen in the palette below)"), chosen.material.c_str()); + } + ImGui::Text(STR_C("Outline: %zu points"), m_paint_outline.size()); + ImGui::SetNextItemWidth(120.0f); + ImGui::DragFloat(STR_C("Edge blur (m)"), &m_paint_feather, 0.1f, 0.0f, 100.0f, m_paint_feather > 0.0f ? "%.1f" : STR_C("sharp")); + m_paint_feather = std::max(0.0f, m_paint_feather); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("Metres across the outline the material blends in over, half of them inside the area.\n" + "0: a sharp edge, as sharp as the paint samples go: every metre, or every 0.5 m in chunks converted to 0.5 m with fine paint")); + ImGui::SetNextItemWidth(120.0f); + ImGui::SliderFloat(STR_C("Texture turned by (deg)"), &m_paint_rotation, -180.0f, 180.0f, "%.0f"); + if (ImGui::IsItemHovered()) + ImGui::SetTooltip("%s", STR_C("The area gets the material turned by this angle: an entry of the palette with the material at that angle\n" + "is used, or added. Ctrl+click to type it")); + ImGui::BeginDisabled(m_paint_outline.size() < 3 || layers.empty()); + if (ImGui::Button(STR_C("Fill the area"))) + fill_terrain_area(); + ImGui::EndDisabled(); + ImGui::SameLine(); + if (ImGui::Button(STR_C("Clear the outline##fill"))) + m_paint_outline.clear(); + } + if (ImGui::CollapsingHeader(STR_C("Water"), m_terrain_tool == terrain_tool::water ? ImGuiTreeNodeFlags_DefaultOpen : 0)) { if (m_terrain_tool == terrain_tool::water) @@ -2072,6 +2114,32 @@ void editor_mode::draw_terrain_overlay() outline.emplace_back(point.x, water[i].level, point.y); polyline(outline, static_cast(i) == m_water_selected ? IM_COL32(120, 200, 255, 255) : IM_COL32(60, 120, 220, 160), true, static_cast(i) == m_water_selected ? 2.5f : 1.5f); } + if (m_terrain_tool == terrain_tool::fill && false == m_paint_outline.empty()) + { + // laid over the ground, the edges followed every few metres + std::vector outline; + auto const closed = m_paint_outline.size() >= 3; + for (std::size_t i = 0; i + (closed ? 0 : 1) < m_paint_outline.size(); ++i) + { + auto const &from = m_paint_outline[i]; + auto const &to = m_paint_outline[(i + 1) % m_paint_outline.size()]; + auto const steps = std::clamp(static_cast(glm::distance(glm::dvec2{from.x, from.z}, glm::dvec2{to.x, to.z}) / 4.0), 1, 200); + for (int k = 0; k < steps; ++k) + { + auto const point = from + (to - from) * (static_cast(k) / steps); + outline.emplace_back(point.x, ground(point.x, point.z, point.y) + 0.15, point.z); + } + } + if (false == closed) + outline.push_back(m_paint_outline.back() + glm::dvec3{0.0, 0.15, 0.0}); + polyline(outline, IM_COL32(250, 200, 90, 255), false, 2.0f); + for (auto const &point : m_paint_outline) + { + ImVec2 dot; + if (projection.project(point + glm::dvec3{0.0, 0.15, 0.0}, dot)) + drawlist->AddCircleFilled(dot, 4.0f, IM_COL32(250, 200, 90, 255)); + } + } if (m_terrain_tool == terrain_tool::water && false == m_water_points.empty()) { std::vector outline; @@ -2510,6 +2578,17 @@ void editor_mode::handle_terrain_click(bool const Shift) m_terrain_status = format(STR_C("Chunks selected: %zu"), m_terrain_selection.size()); break; } + case terrain_tool::fill: + { + if (Shift) + { + if (false == m_paint_outline.empty()) + m_paint_outline.pop_back(); + return; + } + m_paint_outline.push_back(placement_on_ground(world)); + break; + } case terrain_tool::water: { if (Shift) @@ -3120,6 +3199,25 @@ void editor_mode::handle_terrain_brush(double Deltatime) } } +void editor_mode::fill_terrain_area() +{ + auto const &layers = m_streamer.manifest().layers; + if (m_paint_outline.size() < 3 || layers.empty()) + return; + auto const chosen = layers[std::clamp(m_terrain_layer, 0, static_cast(layers.size()) - 1)]; + // the material turned by its own angle is another entry of the palette + auto const rotation = static_cast(std::remainder(static_cast(m_paint_rotation), 360.0)); + auto const layer = chosen.rotation == rotation ? static_cast(std::clamp(m_terrain_layer, 0, static_cast(layers.size()) - 1)) + : m_streamer.layer(chosen.material, chosen.size, rotation); + std::vector outline; + for (auto const &point : m_paint_outline) + outline.emplace_back(point.x, point.z); + auto const filled = m_streamer.fill(outline, m_paint_feather, layer); + m_terrain_status = filled ? format(STR_C("Area filled with %s"), chosen.material.c_str()) : std::string(STR_C("Nothing filled: no chunk under the outline, or no room for another material")); + if (filled) + m_paint_outline.clear(); +} + void editor_mode::convert_selected_chunks() { // with 0.5 m spacing the paint can be as fine, the other spacings keep a sample per metre diff --git a/application/editormode.h b/application/editormode.h index 6b21786c1..03a533122 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -313,7 +313,8 @@ class editor_mode : public application_mode, private editor_track::observer paint, // paints the chosen material, Shift: the first material of the palette spacing, // selects chunks (Ctrl: adds or takes away one), whose point spacing is then converted water, // outlines a body of water - restore // takes the touch-ups over the modifiers back + restore, // takes the touch-ups over the modifiers back + fill // outlines an area filled with a material }; terrain_tool m_terrain_tool{terrain_tool::none}; bool terrain_brush() const @@ -325,7 +326,9 @@ class editor_mode : public application_mode, private editor_track::observer void convert_selected_chunks(); // takes the height of whatever is under the cursor (terrain, track, model) for the target of the level brush. returns: false if there's nothing bool pick_terrain_target(); - bool terrain_clicking() const { return m_terrain_tool == terrain_tool::chunks || m_terrain_tool == terrain_tool::spacing || m_terrain_tool == terrain_tool::water; } + bool terrain_clicking() const { return m_terrain_tool == terrain_tool::chunks || m_terrain_tool == terrain_tool::spacing || m_terrain_tool == terrain_tool::water || m_terrain_tool == terrain_tool::fill; } + // fills the outlined area with the material of the chosen palette entry, turned by m_paint_rotation + void fill_terrain_area(); // the brush, the hovered chunk and the outlines of water drawn over the viewport void draw_terrain_overlay(); // forgets what's known about the ground, after the terrain changed @@ -442,6 +445,9 @@ class editor_mode : public application_mode, private editor_track::observer std::set m_terrain_selection; // chunks chosen with the spacing tool float m_terrain_convert_spacing{1.0f}; // point spacing the selected chunks are converted to bool m_terrain_convert_paint{true}; // chunks converted to 0.5 m get paint samples every 0.5 m too + std::vector m_paint_outline; // of the area filled with a material + float m_paint_feather{0.0f}; // metres the filled material blends in over across the outline, 0: sharp + float m_paint_rotation{0.0f}; // degrees the textures of the filled material are turned by float m_water_selected_level{0.0f}; // level of the chosen water, while it's edited bool m_water_level_dragged{false}; std::string m_terrain_status; diff --git a/application/editormodeselftest.cpp b/application/editormodeselftest.cpp index cd138fcca..98d4a1e2d 100644 --- a/application/editormodeselftest.cpp +++ b/application/editormodeselftest.cpp @@ -84,6 +84,8 @@ http://mozilla.org/MPL/2.0/. // terrainbake the modifier baked into the ground // terrainselect [add] the chunk selected with the spacing tool (add: Ctrl) // terrainresolution [paint 0|1] the selected chunks converted, as the button of the resolution panel does it +// terrainfill ... the area outlined filled, as the fill tool does it +// terrainturn the textures of the palette entry turned // terrainwater [size] material and repeat of a body of water; terrainwaterdefault // orthophoto [in scene 0|1] the imagery layer on, placed and fitted as given // screenshot @@ -1188,6 +1190,29 @@ void editor_mode::selftest_step() forget_ground(); WriteLog(format("SELFTEST terrainmodifier: %zu modifiers", m_streamer.modifiers().size())); } + else if (command == "terrainfill") + { + int layer{0}; + words >> layer >> m_paint_feather >> m_paint_rotation; + m_terrain_layer = layer; + m_paint_outline.clear(); + double x, z; + while (words >> x >> z) + m_paint_outline.emplace_back(x, 0.0, z); + fill_terrain_area(); + std::string palette; + for (auto const &entry : m_streamer.manifest().layers) + palette += format(" [%s %.1f m %.0f deg]", entry.material.c_str(), entry.size, entry.rotation); + WriteLog("SELFTEST terrainfill: " + m_terrain_status + ", palette" + palette); + } + else if (command == "terrainturn") + { + int layer{0}; + float degrees{0.f}; + words >> layer >> degrees; + m_streamer.layer_rotation(static_cast(layer), degrees); + WriteLog(format("SELFTEST terrainturn %d: %.1f deg", layer, m_streamer.manifest().layers.at(layer).rotation)); + } else if (command == "terraintouchup") { int state{1}; @@ -1292,6 +1317,16 @@ void editor_mode::selftest_step() if (false == data.adjust.empty()) adjust = data.height_in(data.adjust, x, z); grid = format(", spacing %.1f, paint %d, base %s %.3f, touch-up %.3f", data.spacing(), data.paint, data.base.empty() ? "none" : "", base, adjust); + if (data.paint > 0) + { + // weights at the paint sample nearest the point + auto const corner{data.corner()}; + auto const ix{static_cast(std::lround((x - corner.x) / heightmap::chunk_size * data.paint))}; + auto const iz{static_cast(std::lround((z - corner.y) / heightmap::chunk_size * data.paint))}; + grid += ", weights"; + for (std::size_t slot = 0; slot < data.layer_count(); ++slot) + grid += format(" %d", data.weight(slot, std::clamp(ix, 0, data.paint), std::clamp(iz, 0, data.paint))); + } } WriteLog(format("SELFTEST terrainprobe %.1f %.1f: %s %.3f, %zu chunks, materials %s%s", x, z, found ? "height" : "no terrain", height, m_streamer.resident(), materials.c_str(), grid.c_str())); } diff --git a/application/editormodeviewport.cpp b/application/editormodeviewport.cpp index 8a9052d94..817658e30 100644 --- a/application/editormodeviewport.cpp +++ b/application/editormodeviewport.cpp @@ -216,6 +216,8 @@ void editor_mode::work_area_tools(std::vector &Buttons) Buttons.push_back({icon::count, STR_C("Point spacing"), nullptr, STR_C("LMB selects the clicked chunk, Ctrl+LMB adds one or takes it away; the tool options convert the point spacing of the selected"), chosen(terrain_tool::spacing), choose(terrain_tool::spacing)}); Buttons.push_back({icon::area_fill, STR_C("Water"), nullptr, STR_C("LMB adds a point of the outline of a body of water, Shift+LMB takes the last one back"), chosen(terrain_tool::water), choose(terrain_tool::water)}); + Buttons.push_back({icon::count, STR_C("Fill"), nullptr, STR_C("LMB adds a point of the outline of an area to fill with a material, Shift+LMB takes the last one back"), chosen(terrain_tool::fill), + choose(terrain_tool::fill)}); Buttons.push_back({icon::joints, STR_C("Restore"), nullptr, STR_C("LMB takes back the touch-ups made over the tracks: the terrain returns to the shape the tracks give it"), chosen(terrain_tool::restore), choose(terrain_tool::restore)}); auto const orthophoto{m_orthophoto.enabled()}; diff --git a/editor/editorTerrainStreamer.cpp b/editor/editorTerrainStreamer.cpp index 7a6dbab2b..0c0a8161b 100644 --- a/editor/editorTerrainStreamer.cpp +++ b/editor/editorTerrainStreamer.cpp @@ -358,7 +358,8 @@ void terrain_streamer::update_material(editor_terrain &Chunk) { auto const layer{data.layers[slot] == heightmap::no_layer ? std::uint16_t{0} : data.layers[slot]}; auto const size{layer < m_manifest.layers.size() ? m_manifest.layers[layer].size : 0.f}; - layers.push_back({palette_material(layer), size}); + auto const rotation{layer < m_manifest.layers.size() ? m_manifest.layers[layer].rotation : 0.f}; + layers.push_back({palette_material(layer), size, rotation}); } auto const corner{data.corner()}; auto const packcorner{heightmap::pack_corner(heightmap::pack_of(data.key))}; @@ -1166,15 +1167,62 @@ bool terrain_streamer::paint(double X, double Z, double Radius, double Strength, { if (Radius <= 0.0 || Strength <= 0.0) return false; + return paint_area(glm::dvec2{X - Radius, Z - Radius}, glm::dvec2{X + Radius, Z + Radius}, Layer, false, [&](double const Px, double const Pz) { + auto const distance{std::sqrt((Px - X) * (Px - X) + (Pz - Z) * (Pz - Z))}; + return distance > Radius ? 0.0 : Strength * falloff(distance, Radius); + }); +} + +bool terrain_streamer::fill(std::vector const &Outline, double Feather, std::uint16_t Layer, double Strength) +{ + if (Outline.size() < 3 || Strength <= 0.0) + return false; + Feather = std::max(0.0, Feather); + glm::dvec2 low{std::numeric_limits::max()}, high{-std::numeric_limits::max()}; + for (auto const &point : Outline) + { + low = glm::min(low, point); + high = glm::max(high, point); + } + // the blend runs across the outline, half of it inside + auto const margin{Feather * 0.5}; + return paint_area(low - glm::dvec2{margin}, high + glm::dvec2{margin}, Layer, true, [&](double const Px, double const Pz) { + glm::dvec2 const point{Px, Pz}; + bool inside{false}; + auto nearest{std::numeric_limits::max()}; + for (std::size_t i = 0, j = Outline.size() - 1; i < Outline.size(); j = i++) + { + auto const &a{Outline[i]}; + auto const &b{Outline[j]}; + if ((a.y > Pz) != (b.y > Pz) && Px < (b.x - a.x) * (Pz - a.y) / (b.y - a.y) + a.x) + inside = !inside; + if (Feather > 0.0) + { + auto const run{b - a}; + auto const length{glm::dot(run, run)}; + auto const t{length > 1e-12 ? std::clamp(glm::dot(point - a, run) / length, 0.0, 1.0) : 0.0}; + nearest = std::min(nearest, glm::length(point - (a + run * t))); + } + } + if (Feather <= 0.0) + return inside ? Strength : 0.0; + // signed distance from the outline, inside positive, led smoothly through the blend + auto const t{std::clamp(((inside ? nearest : -nearest) + margin) / Feather, 0.0, 1.0)}; + return Strength * t * t * (3.0 - 2.0 * t); + }); +} + +bool terrain_streamer::paint_area(glm::dvec2 const &Min, glm::dvec2 const &Max, std::uint16_t const Layer, bool const Load, std::function const &Amount) +{ bool changed{false}; - for (auto *chunk : chunks_in(glm::dvec2{X - Radius, Z - Radius}, glm::dvec2{X + Radius, Z + Radius}, false)) + for (auto *chunk : chunks_in(Min, Max, Load)) { auto const ¤t{chunk->data()}; auto const samples{current.paint > 0 ? current.paint : heightmap::default_paint_samples}; auto const step{heightmap::chunk_size / samples}; auto const low{current.corner()}; - auto const xs{index_range(low.x, step, samples + 1, X - Radius, X + Radius)}; - auto const zs{index_range(low.y, step, samples + 1, Z - Radius, Z + Radius)}; + auto const xs{index_range(low.x, step, samples + 1, Min.x, Max.x)}; + auto const zs{index_range(low.y, step, samples + 1, Min.y, Max.y)}; if (xs.first > xs.second || zs.first > zs.second) continue; if (current.paint <= 0 && current.layers[0] == Layer) @@ -1203,13 +1251,11 @@ bool terrain_streamer::paint(double X, double Z, double Radius, double Strength, for (int iz = zs.first; iz <= zs.second; ++iz) for (int ix = xs.first; ix <= xs.second; ++ix) { - auto const px{low.x + ix * step}, pz{low.y + iz * step}; - auto const distance{std::sqrt((px - X) * (px - X) + (pz - Z) * (pz - Z))}; - if (distance > Radius) + auto const amount{std::clamp(Amount(low.x + ix * step, low.y + iz * step), 0.0, 1.0)}; + if (amount <= 0.0) continue; auto const sample{static_cast(iz) * (samples + 1) + ix}; auto &own{data->weights[slot * plane + sample]}; - auto const amount{std::clamp(Strength * falloff(distance, Radius), 0.0, 1.0)}; auto const target{static_cast(std::lround(own + (255 - own) * amount))}; if (target == own) continue; @@ -1239,13 +1285,13 @@ bool terrain_streamer::paint(double X, double Z, double Radius, double Strength, return changed; } -std::uint16_t terrain_streamer::layer(std::string const &Material, float const Size) +std::uint16_t terrain_streamer::layer(std::string const &Material, float const Size, float const Rotation) { for (std::size_t i = 0; i < m_manifest.layers.size(); ++i) - if (m_manifest.layers[i].material == Material && (Size <= 0.f || m_manifest.layers[i].size == Size)) + if (m_manifest.layers[i].material == Material && (Size <= 0.f || m_manifest.layers[i].size == Size) && m_manifest.layers[i].rotation == Rotation) return static_cast(i); remember_manifest(); - m_manifest.layers.push_back({Material, std::max(0.f, Size)}); + m_manifest.layers.push_back({Material, std::max(0.f, Size), Rotation}); m_manifestchanged = true; return static_cast(m_manifest.layers.size() - 1); } @@ -1263,6 +1309,19 @@ void terrain_streamer::layer_size(std::uint16_t const Layer, float const Size) entry.second->m_paintedversion = 0; } +void terrain_streamer::layer_rotation(std::uint16_t const Layer, float Rotation) +{ + Rotation = static_cast(std::remainder(static_cast(Rotation), 360.0)); + if (Layer >= m_manifest.layers.size() || m_manifest.layers[Layer].rotation == Rotation) + return; + remember_manifest(); + m_manifest.layers[Layer].rotation = Rotation; + m_manifestchanged = true; + for (auto &entry : m_chunks) + if (entry.second->data().slot_of(Layer) >= 0 || (Layer == 0 && entry.second->data().layer_count() == 0)) + entry.second->m_paintedversion = 0; +} + void terrain_streamer::layer_material(std::uint16_t const Layer, std::string const &Material) { if (Layer >= m_manifest.layers.size() || Material.empty() || m_manifest.layers[Layer].material == Material) @@ -1529,7 +1588,7 @@ terrain_streamer::change terrain_streamer::restore(change const &Change) opposite.water_material = m_manifest.water_material; opposite.modifiers = m_manifest.modifiers; auto const samelayers{std::equal(Change.layers.begin(), Change.layers.end(), m_manifest.layers.begin(), m_manifest.layers.end(), - [](heightmap::layer_def const &A, heightmap::layer_def const &B) { return A.material == B.material && A.size == B.size; })}; + [](heightmap::layer_def const &A, heightmap::layer_def const &B) { return A.material == B.material && A.size == B.size && A.rotation == B.rotation; })}; m_manifest.layers = Change.layers; m_manifest.modifiers = Change.modifiers; m_manifest.water = Change.water; diff --git a/editor/editorTerrainStreamer.hpp b/editor/editorTerrainStreamer.hpp index 7fc44813d..d29451e7c 100644 --- a/editor/editorTerrainStreamer.hpp +++ b/editor/editorTerrainStreamer.hpp @@ -112,9 +112,15 @@ class terrain_streamer std::size_t touched_up() const; // paints the material of the palette entry Layer within Radius of (X,Z), Strength (0..1) of the way at the centre bool paint(double X, double Z, double Radius, double Strength, std::uint16_t Layer); - // palette entry of the material, added to the palette if needed - std::uint16_t layer(std::string const &Material, float Size = 0.f); + // fills the area within Outline (x, z) with the material of the palette entry Layer, Strength (0..1) of the way. + // Feather: metres across the outline the material blends in over, half of them inside; 0: a sharp edge, as sharp as + // the paint samples of the chunks go. the chunks are loaded where needed + bool fill(std::vector const &Outline, double Feather, std::uint16_t Layer, double Strength = 1.0); + // palette entry of the material (repeated at Size, 0: any, turned by Rotation degrees), added to the palette if needed + std::uint16_t layer(std::string const &Material, float Size = 0.f, float Rotation = 0.f); void layer_size(std::uint16_t Layer, float Size); + // turns the textures of the palette entry Layer by Rotation degrees, on every chunk painted with it + void layer_rotation(std::uint16_t Layer, float Rotation); // gives the palette entry Layer another material; the chunks painted with it change with it void layer_material(std::uint16_t Layer, std::string const &Material); void compress(bool State); @@ -234,6 +240,9 @@ class terrain_streamer heightmap::chunk_ptr neighbour(chunk_key const &Key) const; void touch_neighbours(chunk_key const &Key); material_handle palette_material(std::uint16_t const Layer); + // paints the material of the palette entry Layer over the paint samples within the rectangle, Amount (0..1) of the way + // at each, as Amount gives it for the place of the sample. Load: chunks not in memory are loaded + bool paint_area(glm::dvec2 const &Min, glm::dvec2 const &Max, std::uint16_t Layer, bool Load, std::function const &Amount); // chunk loaded right away from its pack file, for editing far from the camera editor_terrain *load_now(chunk_key const &Key); // chunks in memory or in the files overlapping the rectangle, loaded if needed diff --git a/rendering/opengl33terrain.cpp b/rendering/opengl33terrain.cpp index 35c3fd61d..e8ab570b6 100644 --- a/rendering/opengl33terrain.cpp +++ b/rendering/opengl33terrain.cpp @@ -289,6 +289,10 @@ material_handle opengl33_terrain_materials::make(material_handle const Reuse, st table[i * 4 + 2] = layer.normalmap ? 1.f : 0.f; table[i * 4 + 3] = layer.specgloss ? 1.f : 0.f; table[(max_layers + i) * 4 + 0] = layer.reflection; + // the textures turned by the layer of the chunk (the same material can be turned differently in another layer) + auto const angle{glm::radians(static_cast(Layers[i].rotation))}; + table[(max_layers + i) * 4 + 1] = static_cast(std::cos(angle)); + table[(max_layers + i) * 4 + 2] = static_cast(std::sin(angle)); } bind_for_upload(m_textures.texture(entry.table)); ::glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, static_cast(max_layers), 2, 0, GL_RGBA, GL_FLOAT, table.data()); diff --git a/rendering/renderer.h b/rendering/renderer.h index 57d7365eb..0b9eb60f4 100644 --- a/rendering/renderer.h +++ b/rendering/renderer.h @@ -28,6 +28,7 @@ struct terrain_layer { material_handle material{null_handle}; float size{0.f}; + float rotation{0.f}; // degrees the textures are turned by }; } // namespace gfx diff --git a/scene/heightmapterrain.cpp b/scene/heightmapterrain.cpp index e2e508ac4..a2bc6a2f1 100644 --- a/scene/heightmapterrain.cpp +++ b/scene/heightmapterrain.cpp @@ -551,7 +551,7 @@ bool load_manifest(std::string const &Path, manifest &Manifest, std::string *Err if (auto const node{document["layers"]}; node && node.IsSequence()) for (auto const &layer : node) { - // a material name, or a map with the material and the size its textures repeat at + // a material name, or a map with the material, the size its textures repeat at and the angle they're turned by if (layer.IsMap()) { layer_def entry; @@ -559,6 +559,8 @@ bool load_manifest(std::string const &Path, manifest &Manifest, std::string *Err entry.material = material.as(); if (auto const size{layer["size"]}) entry.size = std::max(0.f, size.as()); + if (auto const rotation{layer["rotation"]}) + entry.rotation = rotation.as(); if (false == entry.material.empty()) result.layers.push_back(entry); } @@ -630,8 +632,13 @@ bool save_manifest(std::string const &Path, manifest const &Manifest, std::strin out << YAML::Key << "layers" << YAML::Value << YAML::BeginSeq; for (auto const &layer : Manifest.layers) { - if (layer.size > 0.f) - out << YAML::Flow << YAML::BeginMap << YAML::Key << "material" << YAML::Value << layer.material << YAML::Key << "size" << YAML::Value << layer.size << YAML::EndMap; + if (layer.size > 0.f || layer.rotation != 0.f) + { + out << YAML::Flow << YAML::BeginMap << YAML::Key << "material" << YAML::Value << layer.material << YAML::Key << "size" << YAML::Value << layer.size; + if (layer.rotation != 0.f) + out << YAML::Key << "rotation" << YAML::Value << layer.rotation; + out << YAML::EndMap; + } else out << layer.material; } diff --git a/scene/heightmapterrain.h b/scene/heightmapterrain.h index 8b2c17b94..c578e78f1 100644 --- a/scene/heightmapterrain.h +++ b/scene/heightmapterrain.h @@ -153,11 +153,13 @@ class modifier_shape std::vector> m_grid; // (cell key, segment), sorted }; -// material of the palette, and the size (metres) its textures repeat at; 0: the size given by the material, or 8 m +// material of the palette, and the size (metres) its textures repeat at; 0: the size given by the material, or 8 m. +// the same material can be in the palette more than once, e.g. turned by another angle struct layer_def { std::string material; float size{0.f}; + float rotation{0.f}; // degrees the textures are turned by, counterclockwise seen from above }; // description of the terrain, terrain.yaml diff --git a/shaders/mat_terrain.frag b/shaders/mat_terrain.frag index 46e454fe2..77519e1cb 100644 --- a/shaders/mat_terrain.frag +++ b/shaders/mat_terrain.frag @@ -16,7 +16,7 @@ layout(location = 1) out vec4 out_motion; // heightmap terrain: up to 8 materials (layers) painted over a chunk, blended by their weights. // the textures of all layers of the terrain are kept in texture arrays; the table of the chunk tells which layers it has: // row 0, per layer: index in the arrays, 1 / metres the textures repeat at, has normal map, has specular/gloss map -// row 1, per layer: reflection +// row 1, per layer: reflection, cosine and sine of the angle the textures are turned by // f_coord holds metres from the corner of the pack of chunks, along x and -z #param (color, 0, 0, 4, diffuse) @@ -77,9 +77,12 @@ void main() continue; vec4 info = texelFetch(layertable, ivec2(i, 0), 0); vec4 extra = texelFetch(layertable, ivec2(i, 1), 0); - vec3 coord = vec3(f_coord * info.y, info.x); - vec2 dx = coorddx * info.y; - vec2 dy = coorddy * info.y; + // turned counterclockwise seen from above; f_coord runs along x and -z, so that's clockwise in it + vec2 turn = (extra.y == 0.0 && extra.z == 0.0) ? vec2(1.0, 0.0) : extra.yz; + mat2 rotation = mat2(turn.x, -turn.y, turn.y, turn.x); + vec3 coord = vec3(rotation * f_coord * info.y, info.x); + vec2 dx = rotation * coorddx * info.y; + vec2 dy = rotation * coorddy * info.y; albedo += textureGrad(layerdiffuse, coord, dx, dy).rgb * weight; vec3 layernormal_ts = vec3(0.0, 0.0, 1.0); float layerreflection = extra.x; @@ -88,6 +91,8 @@ void main() vec4 normalmap = textureGrad(layernormal, coord, dx, dy); layernormal_ts.xy = normalmap.rg * 2.0 - 1.0; layernormal_ts.z = sqrt(1.0 - clamp(dot(layernormal_ts.xy, layernormal_ts.xy), 0.0, 1.0)); + // the normal map leans along the turned texture; turned back to the axes of the terrain + layernormal_ts.xy = layernormal_ts.xy * rotation; layerreflection *= normalmap.a; } normal += layernormal_ts * weight; From dab227d16db080b37828923cea1b226e928630cf Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Sat, 10 Oct 2026 18:19:10 +0200 Subject: [PATCH 201/430] Editor: keep the terrain palette rotation/repeat values when the slider is released --- application/editormode.cpp | 18 ++++++++++++------ application/editormode.h | 4 ++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 2b70bafaa..32f991c55 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -1762,18 +1762,24 @@ void editor_mode::render_terrain_ui() } if (false == layers.empty()) { - auto size{layers[m_terrain_layer].size}; + // the values are kept while dragged and given to the palette once the dragging ends; + // read back from the palette every frame, the release would hand it the old value + if (false == m_terrain_layer_size_dragged) + m_terrain_layer_size = layers[m_terrain_layer].size; ImGui::SetNextItemWidth(120.0f); - ImGui::DragFloat(STR_C("Repeats every (m)"), &size, 0.1f, 0.0f, 200.0f, "%.1f"); + ImGui::DragFloat(STR_C("Repeats every (m)"), &m_terrain_layer_size, 0.1f, 0.0f, 200.0f, "%.1f"); + m_terrain_layer_size_dragged = ImGui::IsItemActive(); if (ImGui::IsItemDeactivatedAfterEdit()) - m_streamer.layer_size(static_cast(m_terrain_layer), size); + m_streamer.layer_size(static_cast(m_terrain_layer), m_terrain_layer_size); if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", STR_C("Metres the textures of the chosen material repeat at; 0: as the material gives it, or 8 m")); - auto rotation{layers[m_terrain_layer].rotation}; + if (false == m_terrain_layer_rotation_dragged) + m_terrain_layer_rotation = layers[m_terrain_layer].rotation; ImGui::SetNextItemWidth(120.0f); - ImGui::SliderFloat(STR_C("Turned by (deg)"), &rotation, -180.0f, 180.0f, "%.0f"); + ImGui::SliderFloat(STR_C("Turned by (deg)"), &m_terrain_layer_rotation, -180.0f, 180.0f, "%.0f"); + m_terrain_layer_rotation_dragged = ImGui::IsItemActive(); if (ImGui::IsItemDeactivatedAfterEdit()) - m_streamer.layer_rotation(static_cast(m_terrain_layer), rotation); + m_streamer.layer_rotation(static_cast(m_terrain_layer), m_terrain_layer_rotation); if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", STR_C("Angle the textures of the chosen material are turned by, on every chunk painted with it.\n" "Ctrl+click to type it. To have the material turned in one place only, fill it there with an angle of its own.")); diff --git a/application/editormode.h b/application/editormode.h index 03a533122..c7dbd3911 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -432,6 +432,10 @@ class editor_mode : public application_mode, private editor_track::observer int m_terrain_layer{0}; // entry of the palette painted char m_terrain_material[128]{"grass"}; // material added to the palette float m_terrain_material_size{0.0f}; // metres its textures repeat at, 0: given by the material + float m_terrain_layer_size{0.0f}; // repeat of the chosen palette entry, while it's dragged + bool m_terrain_layer_size_dragged{false}; + float m_terrain_layer_rotation{0.0f}; // angle of the chosen palette entry, while it's dragged + bool m_terrain_layer_rotation_dragged{false}; std::vector m_water_points; // outline of a body of water being drawn float m_water_level{0.0f}; bool m_water_level_edited{false}; // the level was given by hand, the points clicked don't change it From 21445507ccb6ac6edba6b2d1300b2156aa545a16 Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Sat, 10 Oct 2026 18:24:26 +0200 Subject: [PATCH 202/430] Editor orthophoto: own geometry bank per scene tile, per-frame vertex budget --- editor/editorOrthophoto.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/editor/editorOrthophoto.cpp b/editor/editorOrthophoto.cpp index 4710f494c..f7646e293 100644 --- a/editor/editorOrthophoto.cpp +++ b/editor/editorOrthophoto.cpp @@ -571,7 +571,9 @@ constexpr int ground_grid{32}; // ground samples per tile side (8 m) fo constexpr double steepest_ground{0.3}; // minimal normal.y of ground triangles receiving the imagery constexpr float no_height{-std::numeric_limits::max()}; -gfx::geometrybank_handle scene_bank{0, 0}; // created on first use, shared by every tile +// a bank of its own for every geometry chunk: adding a chunk to a bank makes the renderer upload the whole bank again, +// and the tiles fitted onto a heightmap terrain carry its full grid (hundreds of thousands of vertices each) +std::vector scene_banks; std::string slot_name(int Index) { @@ -672,7 +674,7 @@ std::string editor_orthophoto::cache_directory() bool editor_orthophoto::owns(gfx::geometry_handle const &Geometry) { - return scene_bank.bank != 0 && Geometry.bank == scene_bank.bank; + return Geometry.bank != 0 && std::find(scene_banks.begin(), scene_banks.end(), Geometry.bank) != scene_banks.end(); } void editor_orthophoto::enabled(bool State) @@ -1139,9 +1141,9 @@ void editor_orthophoto::build_shape(tile_key const &Key, tile &Tile) } else { - if (scene_bank.bank == 0) - scene_bank = GfxRenderer->Create_Bank(); - Tile.geometry = GfxRenderer->Insert(gpuvertices, userdata, scene_bank, GL_TRIANGLES); + auto const bank = GfxRenderer->Create_Bank(); + scene_banks.push_back(bank.bank); + Tile.geometry = GfxRenderer->Insert(gpuvertices, userdata, bank, GL_TRIANGLES); Tile.capacity = capacity; if (Tile.geometry.chunk == 0) { @@ -1194,7 +1196,9 @@ void editor_orthophoto::update_scene() if (simulation::Region == nullptr) return; - int built{0}; + // vertices handed to the renderer per frame; at least one tile goes in every frame however large it is + std::size_t constexpr vertex_budget_scene{256u * 1024u}; + std::size_t built{0}; for (auto &entry : m_tiles) { tile &t = entry.second; @@ -1205,7 +1209,8 @@ void editor_orthophoto::update_scene() if (m_config.drape && !t.grounded && m_ground) continue; // wait for the ground fit; a shape already in place stays until then build_shape(entry.first, t); - if (++built >= 8) + built += std::max(t.capacity, 1); + if (built >= vertex_budget_scene) break; // the rest next frame } } From 7d331ee65ac6061a148f6fbda576f7e83f45b31d Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Sat, 10 Oct 2026 19:55:50 +0200 Subject: [PATCH 203/430] Editor: brace ImGui clipper loops, rename scenery wizard file name field --- application/editormodeinfra.cpp | 106 +++++++++++++++++--------------- launcher/scenery_wizard.cpp | 6 +- launcher/scenery_wizard.h | 2 +- 3 files changed, 59 insertions(+), 55 deletions(-) diff --git a/application/editormodeinfra.cpp b/application/editormodeinfra.cpp index fec28b752..e805c5452 100644 --- a/application/editormodeinfra.cpp +++ b/application/editormodeinfra.cpp @@ -1529,52 +1529,54 @@ void editor_mode::render_infra_candidates() ImGuiListClipper clipper; clipper.Begin(static_cast(rows.size())); while (clipper.Step()) - for (int row = clipper.DisplayStart; row < clipper.DisplayEnd; ++row) { - auto const i{rows[row]}; - auto &candidate{candidates[i]}; - auto const &anchor{candidate.binding.anchors.front()}; - ImGui::PushID(i); - if (candidate.bound) - ImGui::TextDisabled(STR_C("[bound]")); - else - ImGui::Checkbox("##chosen", &candidate.chosen); - ImGui::SameLine(); - if (ImGui::Selectable(candidate.binding.label.c_str(), false, ImGuiSelectableFlags_None, ImVec2(ImGui::CalcTextSize(candidate.binding.label.c_str()).x, 0.f)) && anchor.at.track != nullptr) - focus_track(*anchor.at.track, anchor.at.path, anchor.foot); - if (ImGui::IsItemHovered()) + for (int row = clipper.DisplayStart; row < clipper.DisplayEnd; ++row) { - state.hovered = i; - std::string text{format(STR_C("%s, %s\n%.2f m %s of the axis, %.2f m above the rail top\n%s"), infra::name(candidate.binding.type), anchor.at.track != nullptr ? anchor.at.track->name().c_str() : "-", std::abs(candidate.offset), - candidate.offset >= 0.0 ? "right" : "left", anchor.height, candidate.reason.c_str())}; + auto const i{rows[row]}; + auto &candidate{candidates[i]}; + auto const &anchor{candidate.binding.anchors.front()}; + ImGui::PushID(i); + if (candidate.bound) + ImGui::TextDisabled(STR_C("[bound]")); + else + ImGui::Checkbox("##chosen", &candidate.chosen); + ImGui::SameLine(); + if (ImGui::Selectable(candidate.binding.label.c_str(), false, ImGuiSelectableFlags_None, ImVec2(ImGui::CalcTextSize(candidate.binding.label.c_str()).x, 0.f)) && anchor.at.track != nullptr) + focus_track(*anchor.at.track, anchor.at.path, anchor.foot); + if (ImGui::IsItemHovered()) + { + state.hovered = i; + std::string text{format(STR_C("%s, %s\n%.2f m %s of the axis, %.2f m above the rail top\n%s"), infra::name(candidate.binding.type), anchor.at.track != nullptr ? anchor.at.track->name().c_str() : "-", std::abs(candidate.offset), + candidate.offset >= 0.0 ? "right" : "left", anchor.height, candidate.reason.c_str())}; + if (candidate.reader != nullptr) + text += format(STR_C("\nRead by the path %s: event %s, getvalues of the memory cell %s"), candidate.reader->name().c_str(), candidate.event.c_str(), candidate.cell.c_str()) + + (candidate.loose ? STR(" (written loose, the path takes it by the name)") : std::string{}); + if (candidate.nearer != nullptr) + text += format(STR_C("\nThe path %s is nearer, but it doesn't read the object"), candidate.nearer->name().c_str()); + if (candidate.unread) + text += STR("\nNo path reads the memory cell of the signal"); + text += STR("\nClick to look at it"); + ImGui::SetTooltip("%s", text.c_str()); + } + ImGui::SameLine(); + ImGui::TextDisabled("%s %+.1f m", infra::name(candidate.binding.type), candidate.offset); if (candidate.reader != nullptr) - text += format(STR_C("\nRead by the path %s: event %s, getvalues of the memory cell %s"), candidate.reader->name().c_str(), candidate.event.c_str(), candidate.cell.c_str()) + - (candidate.loose ? STR(" (written loose, the path takes it by the name)") : std::string{}); + { + ImGui::SameLine(); + ImGui::TextColored(readcolour, STR_C("read by %s"), candidate.reader->name().c_str()); + } if (candidate.nearer != nullptr) - text += format(STR_C("\nThe path %s is nearer, but it doesn't read the object"), candidate.nearer->name().c_str()); + { + ImGui::SameLine(); + ImGui::TextColored(warncolour, STR_C("(nearer: %s)"), candidate.nearer->name().c_str()); + } if (candidate.unread) - text += STR("\nNo path reads the memory cell of the signal"); - text += STR("\nClick to look at it"); - ImGui::SetTooltip("%s", text.c_str()); + { + ImGui::SameLine(); + ImGui::TextColored(warncolour, "%s", STR_C("not read")); + } + ImGui::PopID(); } - ImGui::SameLine(); - ImGui::TextDisabled("%s %+.1f m", infra::name(candidate.binding.type), candidate.offset); - if (candidate.reader != nullptr) - { - ImGui::SameLine(); - ImGui::TextColored(readcolour, STR_C("read by %s"), candidate.reader->name().c_str()); - } - if (candidate.nearer != nullptr) - { - ImGui::SameLine(); - ImGui::TextColored(warncolour, STR_C("(nearer: %s)"), candidate.nearer->name().c_str()); - } - if (candidate.unread) - { - ImGui::SameLine(); - ImGui::TextColored(warncolour, "%s", STR_C("not read")); - } - ImGui::PopID(); } ImGui::TreePop(); } @@ -1606,18 +1608,20 @@ void editor_mode::render_infra_bound() ImGuiListClipper clipper; clipper.Begin(static_cast(along.size())); while (clipper.Step()) - for (int row = clipper.DisplayStart; row < clipper.DisplayEnd; ++row) { - auto const index{along[row]}; - auto const &binding{m_bindings[index]}; - ImGui::PushID(static_cast(index)); - if (ImGui::SmallButton(STR_C("unbind"))) - unbind = index; - ImGui::SameLine(); - ImGui::PushStyleColor(ImGuiCol_Text, ImGui::ColorConvertU32ToFloat4(binding.lost ? IM_COL32(255, 80, 70, 255) : colour(binding.group))); - ImGui::Text("%s%s", binding.label.c_str(), binding.lost ? STR_C(" (no path to follow)") : ""); - ImGui::PopStyleColor(); - ImGui::PopID(); + for (int row = clipper.DisplayStart; row < clipper.DisplayEnd; ++row) + { + auto const index{along[row]}; + auto const &binding{m_bindings[index]}; + ImGui::PushID(static_cast(index)); + if (ImGui::SmallButton(STR_C("unbind"))) + unbind = index; + ImGui::SameLine(); + ImGui::PushStyleColor(ImGuiCol_Text, ImGui::ColorConvertU32ToFloat4(binding.lost ? IM_COL32(255, 80, 70, 255) : colour(binding.group))); + ImGui::Text("%s%s", binding.label.c_str(), binding.lost ? STR_C(" (no path to follow)") : ""); + ImGui::PopStyleColor(); + ImGui::PopID(); + } } ImGui::EndChild(); if (unbind) diff --git a/launcher/scenery_wizard.cpp b/launcher/scenery_wizard.cpp index d22438b2c..01485203f 100644 --- a/launcher/scenery_wizard.cpp +++ b/launcher/scenery_wizard.cpp @@ -274,8 +274,8 @@ void ui::scenerywizard_panel::render_form() ImGui::Spacing(); ImGui::SetNextItemWidth(-1.f); - ImGui::InputTextWithHint("##name", STR_C("file name, e.g. my_line"), m_name, sizeof(m_name), ImGuiInputTextFlags_CharsNoBlank); - std::string name{m_name}; + ImGui::InputTextWithHint("##name", STR_C("file name, e.g. my_line"), m_filename, sizeof(m_filename), ImGuiInputTextFlags_CharsNoBlank); + std::string name{m_filename}; std::transform(name.begin(), name.end(), name.begin(), [](unsigned char const Character) { return static_cast(std::tolower(Character)); }); auto const path{Global.asCurrentSceneryPath + name + ".scn"}; auto const named{valid_name(name)}; @@ -352,7 +352,7 @@ void ui::scenerywizard_panel::render_form() bool ui::scenerywizard_panel::create_scenery() { - std::string name{m_name}; + std::string name{m_filename}; std::transform(name.begin(), name.end(), name.begin(), [](unsigned char const Character) { return static_cast(std::tolower(Character)); }); auto const file{name + ".scn"}; std::ofstream output(Global.asCurrentSceneryPath + file, std::ios::binary); diff --git a/launcher/scenery_wizard.h b/launcher/scenery_wizard.h index d47362d05..fb120c31e 100644 --- a/launcher/scenery_wizard.h +++ b/launcher/scenery_wizard.h @@ -61,7 +61,7 @@ class scenerywizard_panel : public ui_panel bool m_picked{false}; glm::dvec2 m_point{0.0}; - char m_name[64]{}; + char m_filename[64]{}; char m_title[128]{}; char m_latlon[64]{}; std::string m_status; From 504d69b26a1be53aa4e6121685eda395ff10e47c Mon Sep 17 00:00:00 2001 From: pwarszawski Date: Sat, 10 Oct 2026 23:39:19 +0200 Subject: [PATCH 204/430] AI braking: keep braking for a lower speed inside the proximity range Inside the proximity range only a stop had a final approach of its own; for a lower speed ahead that branch set nothing, so AccDesired stayed at the preferred acceleration. With the range at 50 m, which this PR uses so that trains stop 8-15 m short of a signal, the AI stopped braking within the last 50 m before a speed restriction and even took power: EMUs reached a 20 km/h restriction at 25 km/h. On master the range is 15-40 m, which kept this mostly out of sight. A lower speed ahead now keeps the braking curve right up to where it begins. Stops are unchanged. Measured in real time on current master (with #199), with a 20 km/h restriction one coach long, two runs of 32 consists each: over 22 km/h in the restriction on the flat 9 on master, 15 before this change, 1 after (a 36WEa at 22.1 km/h); on the 20 per mille descent 15, 0 and 0. Stops 8-15 m short of the signal stay as they were (flat 57 and 55 of 64, descent 44 and 42), no overruns. --- vehicle/Driver.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp index c0e78b7cd..a5272b392 100644 --- a/vehicle/Driver.cpp +++ b/vehicle/Driver.cpp @@ -7518,7 +7518,10 @@ TController::adjust_desired_speed_for_target_speed( double const Range ) { } else if (ActualProximityDist > fMinProximityDist) { // jedzie szybciej, niż trzeba na końcu ActualProximityDist, ale jeszcze jest daleko - if (ActualProximityDist < fMaxProximityDist) { + // only a stop has a final approach of its own inside the proximity range; a lower speed ahead + // keeps the braking curve below right up to where it begins, or the train would stop braking + // (and even take power) that far out + if( ( VelNext == 0.0 ) && ( ActualProximityDist < fMaxProximityDist ) ) { // jak minął już maksymalny dystans po prostu hamuj (niski stopień) // ma stanąć, a jest w drodze hamowania albo ma jechać /* From 6263fe539bb3e55647826db4716601fa5da2a9f9 Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sun, 11 Oct 2026 13:22:33 +0200 Subject: [PATCH 205/430] Fix/sonar maintainability rebased (#209) * refactor(sonar): use override instead of redundant virtual (cpp:S3471) * refactor(sonar): remove empty statements, one declaration per statement (cpp:S1116, cpp:S1659) * refactor(sonar): drop redundant lambda return types (cpp:S3574) * refactor(sonar): prefer using over typedef (cpp:S5416) * refactor(sonar): use =default for trivial special members (cpp:S3490) * refactor(sonar): use nullptr literal (cpp:S4962) * refactor(sonar): remove redundant access specifiers (cpp:S3539) * refactor(sonar): remove redundant casts (cpp:S1905) * refactor(sonar): use std::scoped_lock instead of std::lock_guard (cpp:S5997) * refactor(sonar): construct elements in place with emplace_back (cpp:S6003) * refactor(sonar): make narrowing conversions explicit (cpp:S5276) * refactor(sonar): mark unused parameters (cpp:S1172) Unused names are commented out; parameters used only on some platforms are marked [[maybe_unused]]. * refactor(sonar): declare non-mutating member functions const (cpp:S5817) Virtual functions are left untouched so overrides keep matching. * refactor(sonar): merge collapsible nested if statements (cpp:S1066) Comments that preceded the inner if are kept above the merged statement. * refactor(sonar): scope single-use variables in if init-statements (cpp:S6004) * fix(sonar): give polymorphic base classes virtual destructors (cpp:S1235) * refactor(sonar): use try_emplace for map insertion (cpp:S6030) * refactor(sonar): use auto where the type is spelled out on the right (cpp:S5827) * refactor(sonar): remove redundant parentheses (cpp:S1110) * refactor(sonar): document intentionally empty functions (cpp:S1186) * refactor(sonar): remove dead stores (cpp:S1854) Side effects (e.g. LISTLINE++) are kept. * refactor(sonar): remove unused variables, captures and private fields (cpp:S1481, cpp:S1068) * refactor(sonar): use structured bindings for pair access (cpp:S6005) * refactor(sonar): use range-based loops and ranges algorithms (cpp:S5566) * refactor(sonar): split chained assignments (cpp:S1121) * refactor(sonar): add default cases to switch statements (cpp:S3562) * refactor(sonar): use std::size for array lengths (cpp:S7127) * refactor(sonar): use std::ranges algorithms and std::erase(_if) (cpp:S6197) * refactor(sonar): access static members through the class (cpp:S2209) * refactor(sonar): add braces around nested if-else (cpp:S5261) * refactor(sonar): avoid side effects inside typeid operands (cpp:S5279) * refactor(sonar): drop top-level const from by-value return types (cpp:S5951) * refactor(sonar): declare variables separately from their type definitions (cpp:S3646) * refactor(sonar): declare loop counters in the for statement (cpp:S5955) * refactor(sonar): rely on class template argument deduction (cpp:S6012) * refactor(sonar): inherit base constructors instead of forwarding them (cpp:S5952) * refactor(sonar): rename locals that shadow outer declarations (cpp:S1117) Only local variables and definition parameters are renamed; shadowing struct fields and enumerators in headers are left for a separate change. * refactor(sonar): reduce enum qualification with using enum (cpp:S6177) Applied only where no unqualified name in the block could be captured by the introduced enumerators. * refactor(sonar): mark converting constructors explicit (cpp:S1709) sound_source and the gl::object conversion operators stay implicit; they are relied upon by copy-list-initialisation and GL calls. * refactor(sonar): initialise members in initialiser lists or declarations (cpp:S3230) * refactor(sonar): make read-only local references and pointers const (cpp:S5350) * refactor(sonar): take read-only pointer and reference parameters as const (cpp:S995) TTrain command handlers keep their signature, it is fixed by the handler table. * refactor(sonar): pass expensive-to-copy parameters by const reference (cpp:S1238) Signatures declared in files touched by PR 206 (Driver.h, EU07.cpp) and virtual overrides are left unchanged. * refactor(sonar): use transparent comparators for string-keyed maps (cpp:S6045) std::unordered_map instances and map types exposed in headers used by other modules are left as they are. * fix(sonar): do not use UI text as a printf format string (cpp:S5281) Text lines containing '%' would otherwise be interpreted as format specifiers by ImGui::TextColored. * refactor(sonar): use std::bind_front for callbacks (cpp:S5995) * refactor(sonar): drop const_cast on string literals passed to the Python C API (cpp:S859) * refactor(sonar): take read-only string parameters as std::string_view (cpp:S6009) The Windows messaging helpers keep std::string, they need c_str(). * refactor(sonar): make read-only global tables const (cpp:S5421) Mutable global state (flags, timers, singletons) is left as is. * refactor(sonar): replace single-case switch statements with if (cpp:S1301) * refactor(sonar): format UUIDs and log timestamps with std::format (cpp:S6494, cpp:S5945) * refactor(sonar): use std::array for local fixed-size arrays (cpp:S5945) Arrays that are class members or part of headers are left unchanged. * fix(sonar): test the bearing damage bit, not bit 0 (cpp:S872) 'DamageFlag & dtrain_bearing > 0' parsed as 'DamageFlag & (dtrain_bearing > 0)', i.e. DamageFlag & 1, so bearing friction reacted to the wrong damage flag. * refactor(sonar): assorted small fixes - empty() instead of size() comparisons (cpp:S1155) - member initialisers in declaration order (cpp:S3229) - no redundant c_str() when a std::string is accepted (cpp:S7121) - contains() on associative containers (cpp:S6171) - const reference instead of a copying range-for (cpp:S6032) - starts_with() for prefix checks (cpp:S6178) - no std::move on temporaries (cpp:S5274) - has_value() on std::optional (cpp:S7172) - bool literals for bool members (cpp:S5820) - inline only on the definition (cpp:S3548) - explicit base access specifier (cpp:S5965) - explicit element access instead of dereferencing an array (cpp:S7116) - rely on the C++20 rewritten operator!= (cpp:S6186) * refactor(sonar): more small fixes - std::format instead of iostream manipulators in to_string/to_hex_str (cpp:S6495); output verified identical, negative hex values keep the unsigned form - remove an empty compound statement (cpp:S108) - drop an always-false unsigned < 0 branch (cpp:S1768) - explicit lambda capture (cpp:S3608) - std::make_unique (cpp:S5950) * chore: strip stray carriage returns left in TTrain constructor comments * fix: keep quantize() in its own value type The S5276 change cast the result of the generic quantize() to unsigned int, which truncated float/double callers (shadow angle slider, editor rotation snapping, AI speed control steps) and broke negative values. * fix(sonar): use integer loop counters in segment sampling (cpp:S2193) * refactor(sonar): clean up issues reported on PR 209 - remove locals left unused after the dead-store cleanup (cpp:S1481, cpp:S1854) - unnamed unused parameter (cpp:S1172) - single-use declarations moved into if init-statements (cpp:S6004) - auto for casted initialisers (cpp:S5827) - const references and pointers where nothing is modified (cpp:S5350) - rename structured bindings shadowed by inner declarations (cpp:S1117) --- Console.h | 3 +- McZapkie/MOVER.h | 118 +- McZapkie/Mover.cpp | 1758 ++++++++++++------------- McZapkie/Oerlikon_ESt.cpp | 36 +- McZapkie/Oerlikon_ESt.h | 71 +- McZapkie/friction.h | 21 +- McZapkie/hamulce.cpp | 182 +-- McZapkie/hamulce.h | 361 +++-- application/applicationmode.h | 8 +- application/driverhints.cpp | 283 ++-- application/driverhints.h | 2 +- application/driveruipanels.cpp | 219 ++- application/driveruipanels.h | 46 +- application/uitranscripts.cpp | 15 +- application/uitranscripts.h | 2 +- audio/sound.cpp | 116 +- audio/sound.h | 8 +- environment/moon.cpp | 24 +- environment/skydome.cpp | 53 +- environment/skydome.h | 17 +- environment/sun.cpp | 15 +- extras/piped_proc.cpp | 8 +- extras/piped_proc.h | 4 +- gl/buffer.cpp | 10 +- gl/buffer.h | 4 +- gl/cubemap.cpp | 6 +- gl/cubemap.h | 6 +- gl/framebuffer.cpp | 12 +- gl/framebuffer.h | 2 +- gl/object.h | 4 +- gl/pbo.cpp | 2 +- gl/postfx.h | 4 +- gl/query.cpp | 6 +- gl/query.h | 4 +- gl/shader.cpp | 86 +- gl/shader.h | 8 +- gl/ubo.cpp | 3 +- gl/ubo.h | 2 +- gl/vao.cpp | 8 +- gl/vao.h | 2 +- global_include/interfaces/IMaterial.h | 24 +- global_include/interfaces/ITexture.h | 38 +- input/command.cpp | 32 +- input/command.h | 11 +- input/driverkeyboardinput.cpp | 301 ++--- input/driverkeyboardinput.h | 2 +- input/drivermouseinput.cpp | 960 +++++++------- input/drivermouseinput.h | 4 +- input/editorkeyboardinput.cpp | 25 +- input/gamepadinput.cpp | 106 +- input/gamepadinput.h | 2 +- input/keyboardinput.cpp | 41 +- input/keyboardinput.h | 4 +- input/messaging.cpp | 64 +- input/messaging.h | 2 +- launcher/deferred_image.h | 8 +- launcher/launchermode.cpp | 2 +- launcher/launchermode.h | 8 +- launcher/textures_scanner.cpp | 77 +- launcher/textures_scanner.h | 2 +- model/MdlMngr.cpp | 15 +- model/MdlMngr.h | 5 +- model/vertex.h | 2 +- network/backend/asio.cpp | 46 +- network/backend/asio.h | 22 +- network/manager.cpp | 12 +- network/manager.h | 4 +- network/message.cpp | 16 +- network/message.h | 25 +- network/network.cpp | 26 +- network/network.h | 17 +- rendering/flip-s3tc.h | 74 +- rendering/frustum.cpp | 115 +- rendering/lightarray.cpp | 15 +- rendering/lightarray.h | 2 +- rendering/nullrenderer.cpp | 2 +- rendering/nullrenderer.h | 36 +- rendering/opengl33light.cpp | 2 +- rendering/opengl33light.h | 2 +- rendering/opengl33particles.cpp | 28 +- rendering/opengl33precipitation.cpp | 6 +- rendering/opengl33skydome.cpp | 12 +- rendering/opengl33skydome.h | 2 +- rendering/openglcamera.cpp | 2 +- rendering/openglcamera.h | 2 +- rendering/openglgeometrybank.cpp | 19 +- rendering/openglgeometrybank.h | 4 +- rendering/openglmatrixstack.h | 2 +- rendering/openglparticles.cpp | 16 +- rendering/openglprecipitation.cpp | 2 +- rendering/openglskydome.cpp | 24 +- rendering/particles.cpp | 73 +- rendering/particles.h | 6 +- rendering/screenshot.cpp | 8 +- scene/sceneeditor.cpp | 25 +- scene/sceneeditor.h | 13 +- scene/sn_utils.cpp | 134 +- scene/sn_utils.h | 2 +- scripting/PyInt.cpp | 129 +- scripting/PyInt.h | 10 +- scripting/ladderlogic.cpp | 42 +- scripting/ladderlogic.h | 12 +- scripting/lua.cpp | 16 +- scripting/pythonscreenviewer.cpp | 51 +- scripting/pythonscreenviewer.h | 10 +- simulation/simulationenvironment.cpp | 17 +- simulation/simulationenvironment.h | 2 +- simulation/simulationtime.cpp | 54 +- simulation/simulationtime.h | 2 +- utilities/Float3d.cpp | 28 +- utilities/Float3d.h | 91 +- utilities/Logs.cpp | 41 +- utilities/Timer.cpp | 9 +- utilities/Timer.h | 2 +- utilities/color.h | 10 +- utilities/comparison.h | 54 +- utilities/dictionary.h | 6 +- utilities/headtrack.cpp | 13 +- utilities/headtrack.h | 2 +- utilities/motiontelemetry.cpp | 47 +- utilities/uart.cpp | 45 +- utilities/uart.h | 2 +- utilities/utilities.cpp | 48 +- utilities/utilities.h | 13 +- vehicle/AirCoupler.cpp | 8 +- vehicle/AirCoupler.h | 8 +- vehicle/Button.cpp | 5 +- vehicle/Button.h | 9 +- vehicle/Camera.cpp | 26 +- vehicle/Camera.h | 2 +- vehicle/Gauge.cpp | 85 +- vehicle/Gauge.h | 6 +- vehicle/Train.cpp | 1128 +++++++--------- vehicle/Train.h | 81 +- vr/vr_interface.cpp | 3 +- widgets/cameraview_extcam.cpp | 23 +- widgets/map_objects.cpp | 6 +- widgets/map_objects.h | 13 +- widgets/perfgraphs.cpp | 6 +- widgets/popup.cpp | 2 +- widgets/popup.h | 2 +- widgets/time.cpp | 9 +- widgets/trainingcard.cpp | 26 +- widgets/trainingcard.h | 2 +- widgets/vehiclelist.cpp | 6 +- widgets/vehiclelist.h | 2 +- world/EvLaunch.cpp | 34 +- world/EvLaunch.h | 12 +- world/MemCell.cpp | 47 +- world/MemCell.h | 12 +- world/Segment.cpp | 119 +- world/Segment.h | 18 +- world/Spring.cpp | 9 +- world/Spring.h | 2 +- world/Traction.cpp | 136 +- world/Traction.h | 16 +- world/TractionPower.cpp | 2 +- world/TractionPower.h | 8 +- world/mtable.cpp | 93 +- world/mtable.h | 20 +- world/station.cpp | 4 +- world/station.h | 2 +- 162 files changed, 4220 insertions(+), 4598 deletions(-) diff --git a/Console.h b/Console.h index e99beb4b9..1f7f9e2b1 100644 --- a/Console.h +++ b/Console.h @@ -20,7 +20,8 @@ class TLPT; class TKeyTrans { // przekodowanie kodu naciśnięcia i zwolnienia klawisza public: - short int iDown, iUp; + short int iDown; + short int iUp; }; class Console diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index accbbbaab..228834b40 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -764,7 +764,7 @@ enum class TLocalBrake HydraulicBrake }; ///